{"commit":"3437e886f32275ba385dfc7ae2c2473ed672c01d","subject":"special case the asm.js memory growth function","message":"special case the asm.js memory growth function\n","repos":"WebAssembly\/binaryen,ddcc\/binaryen,yurydelendik\/binaryen,ddcc\/binaryen,WebAssembly\/binaryen,WebAssembly\/binaryen,yurydelendik\/binaryen,ddcc\/binaryen,ddcc\/binaryen,WebAssembly\/binaryen,yurydelendik\/binaryen,yurydelendik\/binaryen,ddcc\/binaryen,WebAssembly\/binaryen,yurydelendik\/binaryen","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/asm2wasm.h\n+++ src\/asm2wasm.h\n@@ -641,11 +641,17 @@\n for (unsigned k = 0; k < contents->size(); k++) {\n Ref pair = contents[k];\n IString key = pair[0]->getIString();\n- Ref value = pair[1];\n- assert(value[0] == NAME);\n+ assert(pair[1][0] == NAME);\n+ IString value = pair[1][1]->getIString();\n+ if (key == Name(\"_emscripten_replace_memory\")) {\n+ \/\/ asm.js memory growth provides this special non-asm function, which we don't need (we use grow_memory)\n+ assert(wasm.functionsMap.find(value) == wasm.functionsMap.end());\n+ continue;\n+ }\n+ assert(wasm.functionsMap.find(value) != wasm.functionsMap.end());\n auto export_ = allocator.alloc();\n export_->name = key;\n- export_->value = value[1]->getIString();\n+ export_->value = value;\n wasm.addExport(export_);\n }\n }\n"} {"commit":"db2b19f5f702d5fbe3fe9503795626cc923a1d2d","subject":"Add handler for functions not found","message":"Add handler for functions not found\n\nWithout this, the entire program would SIGSEGV and crash laco. It's also far\nmore helpful to the end user if there is a simple error message to say what\nis wrong when looking up a function name.\n","repos":"sourrust\/laco","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/commands\/debugger.c\n+++ src\/commands\/debugger.c\n@@ -22,7 +22,15 @@\n \/* Walk down the namespace if there is something to go down *\/\n for(i = 0; (namespace = namespaces[i]); i++) {\n lua_getfield(L, index, namespace);\n+\n index = lua_gettop(L);\n+\n+ if(lua_type(L, index) == LUA_TNIL) {\n+ printf(\"Couldn't find the function named \\\"%s\\\"\\n\", function_name);\n+ lua_pop(L, i + 1);\n+\n+ return;\n+ }\n }\n \n lua_getinfo(L, \">Sl\", &debug_info);\n"} {"commit":"9b600825f0c30b963134868609763a4bf1d92293","subject":"Recursively scanning sub-directories works now","message":"Recursively scanning sub-directories works now\n","repos":"wiemerc\/VADM","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- amifind.c\n+++ amifind.c\n@@ -1,10 +1,15 @@\n #include \n #include \n+#include \n #include \n #include \n #include \n #include \n #include \n+\n+\n+#define MAX_DEPTH 16\n+#define MAX_PATH_LEN 1024\n \n \n int printf(const char *str, ...)\n@@ -20,44 +25,51 @@\n }\n \n \n-void search(const char *path)\n+void search(const char *dir)\n {\n- BPTR lock;\n+ BPTR lock;\n struct FileInfoBlock *fib;\n+ char newdir[MAX_PATH_LEN];\n+ static unsigned int depth = 0;\n \n- if ((lock = Lock (path, ACCESS_READ)) != 0) {\n+ if ((lock = Lock (dir, ACCESS_READ)) != 0) {\n if ((fib = AllocVec(sizeof(struct FileInfoBlock), MEMF_CLEAR)) != NULL) {\n if (Examine(lock, fib)) {\n if (fib->fib_DirEntryType > 0) {\n- printf(\"examing directory '%s'\\n\", path);\n- while (ExNext(lock, fib)) {\n- if(fib->fib_DirEntryType > 0) {\n- \/\/ another directory => call ourself recursively\n- \/\/ TODO: add initial path\n- search(fib->fib_FileName);\n+ ++depth;\n+ if (depth <= MAX_DEPTH) {\n+ printf(\"examing directory '%s' (depth = %d)\\n\", dir, depth);\n+ while (ExNext(lock, fib)) {\n+ if(fib->fib_DirEntryType > 0) {\n+ \/\/ another directory => call ourselves recursively\n+ strncpy(newdir, dir, MAX_PATH_LEN - 1);\n+ strncat(newdir, fib->fib_FileName, MAX_PATH_LEN - 1 - strlen(dir));\n+ search(newdir);\n+ }\n+ else {\n+ \/\/ plain file => just output file name and size for now\n+ printf(\"%-30s%-ld\\n\", fib->fib_FileName, fib->fib_Size);\n+ }\n }\n- else {\n- \/\/ plain file => just output file name and size for now\n- printf(\"%-30s%-ld\\n\", fib->fib_FileName, fib->fib_Size);\n- }\n+ if (IoErr() != ERROR_NO_MORE_ENTRIES)\n+ printf(\"error occurred while examing directory '%s': %ld\\n\", dir, IoErr());\n }\n- if (IoErr() != ERROR_NO_MORE_ENTRIES)\n- printf(\"error occurred while examing directory '%s': %ld\\n\", path, IoErr());\n+ else\n+ printf(\"maximum recursion depth reached - aborting\\n\");\n }\n- else {\n+ else\n printf(\"search() was called on a file - aborting\\n\");\n- }\n }\n FreeVec(fib);\n }\n- else {\n+ else\n printf(\"could not allocate memory for FileInfoBlock\\n\");\n- }\n+\n UnLock(lock);\n }\n- else {\n- printf(\"could not obtain lock for directory %s\\n\", path);\n- }\n+ else\n+ printf(\"could not obtain lock for directory %s\\n\", dir);\n+\n return;\n }\n \n"} {"commit":"2ed0bcf646452f2b1f5358010f1a69004e263c0d","subject":"#10245 TESTS_RAN: manual Check cname before logging in fdf_open_container","message":"#10245\nTESTS_RAN: manual\nCheck cname before logging in fdf_open_container\n\n\ngit-svn-id: d1c2905f61b4ba12f871876155ef23cf296c0275@1376 01a69087-22d5-4a29-8152-8a1d5e10e5e9\n","repos":"SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- api\/fdf.c\n+++ api\/fdf.c\n@@ -1050,8 +1050,6 @@\n struct shard\t\t\t\t*shard\t\t= NULL;\n #endif \/* SDFAPIONLY *\/\n \n- plat_log_msg( 20819, LOG_CAT, LOG_INFO, \"%s\", cname );\n-\n SDFStartSerializeContainerOp( pai );\n \n if ( ISEMPTY( cname ) ) { \n@@ -1059,6 +1057,8 @@\n \t\t*cguid = SDF_NULL_CGUID;\n \t\treturn status;\n \t}\n+\n+ plat_log_msg( 20819, LOG_CAT, LOG_INFO, \"%s\", cname );\n \n if ( strcmp( cname, CMC_PATH ) != 0 ) {\n \t\ti_ctnr = fdf_get_ctnr_from_cname( cname );\n"} {"commit":"226758abca8f4cf35e8f05ae96aaa30c6768acf5","subject":"[common] Check for primary flag instead of string. JB#42564","message":"[common] Check for primary flag instead of string. JB#42564\n\nUse flags for determining if output is primary instead of\nmatching a string. For inputs there really isn't a primary\ninput flag in HAL side but for our needs just looking for\nprefix is enough.\n","repos":"jusa\/pulseaudio-modules-droid,jusa\/pulseaudio-modules-droid,mer-hybris\/pulseaudio-modules-droid,mer-hybris\/pulseaudio-modules-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/common\/droid-util.c\n+++ src\/common\/droid-util.c\n@@ -640,13 +640,13 @@\n \n if (am->direction == PA_DIRECTION_OUTPUT) {\n pa_assert(am->output);\n- return pa_streq(am->output->name, PA_DROID_PRIMARY_DEVICE);\n+ return am->output->flags & AUDIO_OUTPUT_FLAG_PRIMARY;\n } else {\n pa_assert(am->input);\n \/* merged input mapping is always primary *\/\n if (am->input && am->input2)\n return true;\n- return pa_streq(am->input->name, PA_DROID_PRIMARY_DEVICE);\n+ return pa_startswith(am->input->name, PA_DROID_PRIMARY_DEVICE);\n }\n }\n \n"} {"commit":"709b745ad1ede1f8a3d28de32ffca196a9710a4b","subject":"removed unused code","message":"removed unused code\n","repos":"xdsopl\/appchoo,porst17\/appchoo","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- appchoo.c\n+++ appchoo.c\n@@ -19,8 +19,6 @@\n \tint fx = (image->w + (w-1)) \/ w;\n \tint fy = (image->h + (h-1)) \/ h;\n \tint f = fx > fy ? fx : fy;\n-\tw = image->w;\n-\th = image->h;\n \tint pitch = image->pitch;\n \timage->clip_rect.w = image->w \/= f;\n \timage->clip_rect.h = image->h \/= f;\n"} {"commit":"90dcb0b840b1088e51eb41402de45266095a2443","subject":"Avoid creating the fixture when not needed in the plugin-manager tests","message":"Avoid creating the fixture when not needed in the plugin-manager tests\n","repos":"GNOME\/libpeas,chergert\/libpeas,gregier\/libpeas,Distrotech\/libpeas,chergert\/libpeas,GNOME\/libpeas,gregier\/libpeas,Distrotech\/libpeas,gregier\/libpeas,chergert\/libpeas,Distrotech\/libpeas,gregier\/libpeas","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/libpeas-gtk\/plugin-manager.c\n+++ tests\/libpeas-gtk\/plugin-manager.c\n@@ -394,7 +394,7 @@\n }\n \n static void\n-test_gtk_plugin_manager_gtkbuilder (TestFixture *fixture)\n+test_gtk_plugin_manager_gtkbuilder (void)\n {\n GtkBuilder *builder;\n GError *error = NULL;\n@@ -442,6 +442,10 @@\n (gpointer) test_gtk_plugin_manager_##ftest, \\\n test_setup, test_runner, test_teardown)\n \n+#define TEST_FUNC(path, ftest) \\\n+ g_test_add_func (\"\/gtk\/plugin-manager\/\" path, \\\n+ test_gtk_plugin_manager_##ftest)\n+\n TEST (\"about-button-sensitivity\", about_button_sensitivity);\n TEST (\"configure-button-sensitivity\", configure_button_sensitivity);\n \n@@ -451,7 +455,7 @@\n TEST (\"about-dialog\", about_dialog);\n TEST (\"configure-dialog\", configure_dialog);\n \n- TEST (\"gtkbuilder\", gtkbuilder);\n+ TEST_FUNC (\"gtkbuilder\", gtkbuilder);\n \n #undef TEST\n \n"} {"commit":"e53520a8ec6d7838423fea56e1b028ced9558f59","subject":"[ar] Implement merge() used for -m","message":"[ar] Implement merge() used for -m\n\nThis function merges the content of the two temporary files used in -m.\n","repos":"k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- ar\/main.c\n+++ ar\/main.c\n@@ -229,6 +229,21 @@\n static void\n merge(struct arop *op, char *list[])\n {\n+\tint c;\n+\n+\tif (strcmp(op->fname, posname)) {\n+\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n+\t\treturn;\n+\t}\n+\n+\tif (aflag)\n+\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n+\n+\twhile ((c = getc(op->tmp)) != EOF)\n+\t\tputc(c, op->dst);\n+\n+\tif (bflag || iflag)\n+\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n }\n \n static void\n@@ -238,15 +253,15 @@\n \t\tcopy(&op->hdr, op->size, op->src, op->dst);\n \t\treturn;\n \t}\n-\tif (bflag || iflag) {\n-\t\tfor ( ; *list; ++list)\n-\t\t\tarchive(*list, op->dst, 'a');\n-\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n-\t} else {\n-\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n-\t\tfor ( ; *list; ++list)\n-\t\t\tarchive(*list, op->dst, 'a');\n-\t}\n+\n+\tif (aflag)\n+\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n+\n+\tfor ( ; *list; ++list)\n+\t\tarchive(*list, op->dst, 'a');\n+\n+\tif (bflag || iflag)\n+\t\tcopy(&op->hdr, op->size, op->src, op->dst);\n }\n \n static void\n"} {"commit":"7eb8557714883d999da4afeb8cca3e4aeec36e0d","subject":"small log correction","message":"small log correction\n","repos":"AnisB\/Donut,AnisB\/Donut,AnisB\/Donut,AnisB\/Donut","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/base\/log.h\n+++ src\/base\/log.h\n@@ -51,7 +51,7 @@\n \n \t\/\/ Access the default logger\n \tTLoggerInterface* DefaultLogger();\n-\tTLoggerInterface* SetDefaultLogger();\n+\tvoid SetDefaultLogger(TLoggerInterface* _loggerInterface);\n \n \t\/\/ General print macro\n \t#define PRINT_GENERAL(LEVEL, TAG, ENONCE)\\\n"} {"commit":"c2e8c3a6a3b2715471aab7e723e7e0b37f0db3d8","subject":"","message":"\n\nfix transitions.\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@32225 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_bg.c\n+++ src\/bin\/e_bg.c\n@@ -209,6 +209,7 @@\n \t }\n \to = edje_object_add(zone->container->bg_evas);\n \tzone->transition_object = o;\n+\t\/* FIXME: segv if zone is deleted while up??? *\/\n \tevas_object_data_set(o, \"e_zone\", zone);\n \tsnprintf(buf, sizeof(buf), \"e\/transitions\/%s\", trans);\n \te_theme_edje_object_set(o, \"base\/theme\/transitions\", buf);\n@@ -222,17 +223,24 @@\n o = edje_object_add(zone->container->bg_evas);\n zone->bg_object = o;\n evas_object_data_set(o, \"e_zone\", zone);\n- evas_object_move(o, zone->x, zone->y);\n- evas_object_resize(o, zone->w, zone->h);\n edje_object_file_set(o, bgfile, \"e\/desktop\/background\");\n- evas_object_layer_set(o, -1);\n+ if (transition == E_BG_TRANSITION_NONE)\n+ {\n+\tevas_object_move(o, zone->x, zone->y);\n+\tevas_object_resize(o, zone->w, zone->h);\n+\tevas_object_layer_set(o, -1);\n+ }\n evas_object_clip_set(o, zone->bg_clip_object);\n evas_object_show(o);\n \n if (transition != E_BG_TRANSITION_NONE)\n {\n+\tedje_extern_object_max_size_set(zone->prev_bg_object, 65536, 65536);\n+\tedje_extern_object_min_size_set(zone->prev_bg_object, 0, 0);\n \tedje_object_part_swallow(zone->transition_object, \"e.swallow.bg.old\",\n \t\t\t\t zone->prev_bg_object);\n+\tedje_extern_object_max_size_set(zone->bg_object, 65536, 65536);\n+\tedje_extern_object_min_size_set(zone->bg_object, 0, 0);\n \tedje_object_part_swallow(zone->transition_object, \"e.swallow.bg.new\",\n \t\t\t\t zone->bg_object);\n \tedje_object_signal_emit(zone->transition_object, \"e,action,start\", \"e\");\n"} {"commit":"ae0aa2ed8b4e70d6dc5aeac0b05a2b3546e23078","subject":"less noise\/debug.","message":"less noise\/debug.\n\n\nSVN revision: 39547\n","repos":"rvandegrift\/e,FlorentRevest\/Enlightenment,tasn\/enlightenment,rvandegrift\/e,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,FlorentRevest\/Enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_fm.c\n+++ src\/bin\/e_fm.c\n@@ -2421,7 +2421,6 @@\n _e_fm_client_file_move(const char *args, Evas_Object *e_fm)\n {\n int id = _e_fm_client_send_new(E_FM_OP_MOVE, (void *)args, strlen(args) + 1);\n- printf(\"REQUEST CLIENT TO MOVE: %s, id=%d, op=%d\\n\", args, id, E_FM_OP_MOVE);\n e_fm2_op_registry_entry_add(id, e_fm, E_FM_OP_MOVE);\n return id;\n }\n@@ -2486,7 +2485,6 @@\n _e_fm_client_file_copy(const char *args, Evas_Object *e_fm)\n {\n int id = _e_fm_client_send_new(E_FM_OP_COPY, (void *)args, strlen(args) + 1);\n- printf(\"REQUEST CLIENT TO COPY: %s, id=%d, op=%d\\n\", args, id, E_FM_OP_COPY);\n e_fm2_op_registry_entry_add(id, e_fm, E_FM_OP_COPY);\n return id;\n }\n"} {"commit":"7837076f84479008afd1330e6c9e29a1334e528d","subject":"Include the right header file.","message":"Include the right header file.\n","repos":"meeh420\/csync,gco\/csync,meeh420\/csync,gco\/csync,meeh420\/csync,gco\/csync,gco\/csync","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/std_tests\/check_std_c_time.c\n+++ tests\/std_tests\/check_std_c_time.c\n@@ -2,7 +2,7 @@\n \n #include \"support.h\"\n \n-#include \"std\/c_path.h\"\n+#include \"std\/c_time.h\"\n \n START_TEST (check_c_tspecdiff)\n {\n"} {"commit":"eeb071c8199fde55c7703710f4c835408b6786f3","subject":"efm now supports F5 for refresh","message":"efm now supports F5 for refresh\n\n\nSVN revision: 78535\n","repos":"FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,rvandegrift\/e,rvandegrift\/e,FlorentRevest\/Enlightenment,tasn\/enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_fm.c\n+++ src\/bin\/e_fm.c\n@@ -7431,6 +7431,8 @@\n }\n }\n }\n+ else if (!strcmp(ev->key, \"F5\"))\n+ e_fm2_refresh(obj);\n else if (!strcmp(ev->key, \"Insert\"))\n {\n \/* dunno what to do with this yet *\/\n"} {"commit":"6245db9a18bf02b3b3072adee449a2eb00d6fc00","subject":"CDRIVER-2229 test causal consistency","message":"CDRIVER-2229 test causal consistency\n","repos":"remicollet\/mongo-c-driver,mongodb\/mongo-c-driver,ajdavis\/mongo-c-driver,ajdavis\/mongo-c-driver,derickr\/mongo-c-driver,ajdavis\/mongo-c-driver,mongodb\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,ajdavis\/mongo-c-driver,jmikola\/mongo-c-driver,rcsanchez97\/mongo-c-driver,acmorrow\/mongo-c-driver,beingmeta\/mongo-c-driver,remicollet\/mongo-c-driver,remicollet\/mongo-c-driver,mongodb\/mongo-c-driver,mongodb\/mongo-c-driver,beingmeta\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,derickr\/mongo-c-driver,acmorrow\/mongo-c-driver,acmorrow\/mongo-c-driver,acmorrow\/mongo-c-driver,jmikola\/mongo-c-driver,acmorrow\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,jmikola\/mongo-c-driver,jmikola\/mongo-c-driver,rcsanchez97\/mongo-c-driver,jmikola\/mongo-c-driver,ajdavis\/mongo-c-driver,mongodb\/mongo-c-driver,mongodb\/mongo-c-driver,derickr\/mongo-c-driver,remicollet\/mongo-c-driver,derickr\/mongo-c-driver,beingmeta\/mongo-c-driver,derickr\/mongo-c-driver,jmikola\/mongo-c-driver,remicollet\/mongo-c-driver,rcsanchez97\/mongo-c-driver,rcsanchez97\/mongo-c-driver,remicollet\/mongo-c-driver,beingmeta\/mongo-c-driver,ajdavis\/mongo-c-driver,rcsanchez97\/mongo-c-driver,rcsanchez97\/mongo-c-driver,ajdavis\/mongo-c-driver,beingmeta\/mongo-c-driver,derickr\/mongo-c-driver,derickr\/mongo-c-driver,remicollet\/mongo-c-driver,beingmeta\/mongo-c-driver,rcsanchez97\/mongo-c-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/test-mongoc-client-session.c\n+++ tests\/test-mongoc-client-session.c\n@@ -763,7 +763,6 @@\n ASSERT_CMPUINT32 (t, ==, 0);\n ASSERT_CMPUINT32 (t, ==, 0);\n \n-\n mongoc_client_session_advance_operation_time (cs, 1, 1);\n \n _test_advance_operation_time (cs, 1, 0, false);\n@@ -776,7 +775,19 @@\n }\n \n \n+typedef enum {\n+ CORRECT_CLIENT,\n+ INCORRECT_CLIENT,\n+} session_test_correct_t;\n+\n+\n+typedef enum {\n+ CAUSAL,\n+ NOT_CAUSAL,\n+} session_test_causal_t;\n+\n typedef struct {\n+ bool verbose;\n mongoc_client_t *session_client, *client;\n mongoc_database_t *session_db, *db;\n mongoc_collection_t *session_collection, *collection;\n@@ -788,6 +799,8 @@\n int n_succeeded;\n bool expect_explicit_lsid;\n bool succeeded;\n+ mongoc_array_t cmds;\n+ mongoc_array_t replies;\n bson_t sent_lsid;\n bson_t sent_cluster_time;\n bson_t received_cluster_time;\n@@ -803,13 +816,20 @@\n bson_t cluster_time;\n bson_t lsid;\n const bson_t *client_session_lsid;\n- const bson_t *cmd = mongoc_apm_command_started_get_command (event);\n+ bson_t *cmd = bson_copy (mongoc_apm_command_started_get_command (event));\n const char *cmd_name = mongoc_apm_command_started_get_command_name (event);\n session_test_t *test =\n (session_test_t *) mongoc_apm_command_started_get_context (event);\n \n+ if (test->verbose) {\n+ char *s = bson_as_json (cmd, NULL);\n+ printf (\"%s\\n\", s);\n+ bson_free (s);\n+ }\n+\n if (!strcmp (cmd_name, \"endSessions\")) {\n BSON_ASSERT (!bson_has_field (cmd, \"lsid\"));\n+ bson_destroy (cmd);\n return;\n }\n \n@@ -858,6 +878,7 @@\n bson_iter_bson (&iter, &cluster_time);\n bson_destroy (&test->sent_cluster_time);\n bson_copy_to (&cluster_time, &test->sent_cluster_time);\n+ _mongoc_array_append_vals (&test->cmds, &cmd, 1);\n \n test->n_started++;\n }\n@@ -868,17 +889,24 @@\n {\n bson_iter_t iter;\n bson_t cluster_time;\n- const bson_t *reply = mongoc_apm_command_succeeded_get_reply (event);\n+ bson_t *reply = bson_copy (mongoc_apm_command_succeeded_get_reply (event));\n const char *cmd_name = mongoc_apm_command_succeeded_get_command_name (event);\n session_test_t *test =\n (session_test_t *) mongoc_apm_command_succeeded_get_context (event);\n \n+ if (test->verbose) {\n+ char *s = bson_as_json (reply, NULL);\n+ printf (\"<-- %s\\n\", s);\n+ bson_free (s);\n+ }\n+\n if (!bson_iter_init_find (&iter, reply, \"$clusterTime\")) {\n fprintf (stderr, \"no $clusterTime in reply to command %s\\n\", cmd_name);\n abort ();\n }\n \n if (strcmp (cmd_name, \"endSessions\") == 0) {\n+ bson_destroy (reply);\n return;\n }\n \n@@ -886,6 +914,7 @@\n bson_iter_bson (&iter, &cluster_time);\n bson_destroy (&test->received_cluster_time);\n bson_copy_to (&cluster_time, &test->received_cluster_time);\n+ _mongoc_array_append_vals (&test->replies, &reply, 1);\n \n test->n_succeeded++;\n }\n@@ -906,16 +935,22 @@\n \n \n static session_test_t *\n-session_test_new (bool correct_client)\n+session_test_new (session_test_correct_t correct_client,\n+ session_test_causal_t causal)\n {\n session_test_t *test;\n+ mongoc_session_opt_t *cs_opts;\n bson_error_t error;\n \n test = bson_malloc0 (sizeof (session_test_t));\n+\n+ test->verbose = test_framework_getenv_bool (\"MONGOC_TEST_SESSION_VERBOSE\");\n \n test->n_started = 0;\n test->expect_explicit_lsid = true;\n test->succeeded = false;\n+ _mongoc_array_init (&test->cmds, sizeof (bson_t *));\n+ _mongoc_array_init (&test->replies, sizeof (bson_t *));\n bson_init (&test->sent_cluster_time);\n bson_init (&test->received_cluster_time);\n bson_init (&test->sent_lsid);\n@@ -928,7 +963,7 @@\n \n bson_init (&test->opts);\n \n- if (correct_client) {\n+ if (correct_client == CORRECT_CLIENT) {\n test->client = test->session_client;\n test->db = test->session_db;\n test->collection = test->session_collection;\n@@ -946,8 +981,13 @@\n \n set_session_test_callbacks (test);\n \n- test->cs = mongoc_client_start_session (test->session_client, NULL, &error);\n+ cs_opts = mongoc_session_opts_new ();\n+ mongoc_session_opts_set_causal_consistency (cs_opts, causal == CAUSAL);\n+ test->cs =\n+ mongoc_client_start_session (test->session_client, cs_opts, &error);\n ASSERT_OR_PRINT (test->cs, error);\n+\n+ mongoc_session_opts_destroy (cs_opts);\n \n return test;\n }\n@@ -978,11 +1018,65 @@\n }\n }\n \n+static const bson_t *\n+first_cmd (session_test_t *test)\n+{\n+ ASSERT_CMPSIZE_T (test->cmds.len, >, (size_t) 0);\n+ return _mongoc_array_index (&test->cmds, bson_t *, 0);\n+}\n+\n+\n+static const bson_t *\n+last_non_getmore_cmd (session_test_t *test)\n+{\n+ ssize_t i;\n+ const bson_t *cmd;\n+\n+ ASSERT_CMPSIZE_T (test->cmds.len, >, (size_t) 0);\n+\n+ for (i = test->replies.len - 1; i >= 0; i--) {\n+ cmd = _mongoc_array_index (&test->cmds, bson_t *, i);\n+ if (strcmp (_mongoc_get_command_name (cmd), \"getMore\") != 0) {\n+ return cmd;\n+ }\n+ }\n+\n+ fprintf (stderr, \"No commands besides getMore were recorded\\n\");\n+ abort ();\n+}\n+\n+\n+static const bson_t *\n+last_reply (session_test_t *test)\n+{\n+ ASSERT_CMPSIZE_T (test->replies.len, >, (size_t) 0);\n+ return _mongoc_array_index (&test->replies, bson_t *, test->replies.len - 1);\n+}\n+\n+\n+static void\n+clear_history (session_test_t *test)\n+{\n+ size_t i;\n+\n+ for (i = 0; i < test->cmds.len; i++) {\n+ bson_destroy (_mongoc_array_index (&test->cmds, bson_t *, i));\n+ }\n+\n+ for (i = 0; i < test->replies.len; i++) {\n+ bson_destroy (_mongoc_array_index (&test->replies, bson_t *, i));\n+ }\n+\n+ test->cmds.len = 0;\n+ test->replies.len = 0;\n+}\n+\n \n static void\n session_test_destroy (session_test_t *test)\n {\n bson_t session_lsid;\n+ size_t i;\n \n bson_copy_to (mongoc_client_session_get_lsid (test->cs), &session_lsid);\n \n@@ -1009,12 +1103,24 @@\n bson_destroy (&test->received_cluster_time);\n bson_destroy (&test->sent_lsid);\n \n+ for (i = 0; i < test->cmds.len; i++) {\n+ bson_destroy (_mongoc_array_index (&test->cmds, bson_t *, i));\n+ }\n+\n+ _mongoc_array_destroy (&test->cmds);\n+\n+ for (i = 0; i < test->replies.len; i++) {\n+ bson_destroy (_mongoc_array_index (&test->replies, bson_t *, i));\n+ }\n+\n+ _mongoc_array_destroy (&test->replies);\n+\n bson_free (test);\n }\n \n \n static void\n-check_success (session_test_t *test)\n+check_success_no_commands (session_test_t *test)\n {\n if (test->session_client != test->client) {\n BSON_ASSERT (!test->succeeded);\n@@ -1031,6 +1137,18 @@\n \n \n static void\n+check_success (session_test_t *test)\n+{\n+ check_success_no_commands (test);\n+\n+ if (test->session_client == test->client) {\n+ ASSERT_CMPINT (test->n_started, >, 0);\n+ ASSERT_CMPINT (test->n_succeeded, >, 0);\n+ }\n+}\n+\n+\n+static void\n check_cluster_time (session_test_t *test)\n {\n const bson_t *session_time;\n@@ -1055,9 +1173,8 @@\n \n \n static void\n-run_session_test (void *ctx)\n-{\n- session_test_fn_t test_fn = (session_test_fn_t) ctx;\n+lsid_test (session_test_fn_t test_fn)\n+{\n session_test_t *test;\n bson_error_t error;\n int64_t start;\n@@ -1068,7 +1185,7 @@\n * use the same client for the session and the operation, expect success\n *\n *\/\n- test = session_test_new (true);\n+ test = session_test_new (CORRECT_CLIENT, NOT_CAUSAL);\n ASSERT_CMPINT64 (test->cs->server_session->last_used_usec, ==, (int64_t) -1);\n ASSERT_OR_PRINT (\n mongoc_client_session_append (test->cs, &test->opts, &error), error);\n@@ -1108,8 +1225,6 @@\n test->n_succeeded = 0;\n start = bson_get_monotonic_time ();\n test_fn (test);\n- ASSERT_CMPINT (test->n_started, >, 0);\n- ASSERT_CMPINT (test->n_succeeded, >, 0);\n check_success (test);\n if (_mongoc_cluster_time_greater (&cluster_time, &test->sent_cluster_time)) {\n fprintf (stderr,\n@@ -1126,7 +1241,7 @@\n * use a session from the wrong client, expect failure. this is the\n * \"session argument is for right client\" test from Driver Sessions Spec\n *\/\n- test = session_test_new (false \/* correct_client *\/);\n+ test = session_test_new (INCORRECT_CLIENT, NOT_CAUSAL);\n ASSERT_OR_PRINT (\n mongoc_client_session_append (test->cs, &test->opts, &error), error);\n \n@@ -1138,7 +1253,7 @@\n \/*\n * implicit session - all commands should use an internally-acquired lsid\n *\/\n- test = session_test_new (true \/* correct_client *\/);\n+ test = session_test_new (CORRECT_CLIENT, NOT_CAUSAL);\n test->expect_explicit_lsid = false;\n start = bson_get_monotonic_time ();\n test_fn (test);\n@@ -1152,6 +1267,99 @@\n }\n \n \n+typedef struct {\n+ uint32_t t;\n+ uint32_t i;\n+} op_time_t;\n+\n+\n+static void\n+parse_read_concern_time (const bson_t *cmd, op_time_t *op_time)\n+{\n+ bson_iter_t iter;\n+ bson_iter_t rc;\n+\n+ BSON_ASSERT (bson_iter_init_find (&iter, cmd, \"readConcern\"));\n+ BSON_ASSERT (bson_iter_recurse (&iter, &rc));\n+ BSON_ASSERT (bson_iter_find (&rc, \"afterClusterTime\"));\n+ BSON_ASSERT (BSON_ITER_HOLDS_TIMESTAMP (&rc));\n+ bson_iter_timestamp (&rc, &op_time->t, &op_time->i);\n+}\n+\n+\n+static void\n+parse_reply_time (const bson_t *reply, op_time_t *op_time)\n+{\n+ bson_iter_t iter;\n+\n+ BSON_ASSERT (bson_iter_init_find (&iter, reply, \"operationTime\"));\n+ BSON_ASSERT (BSON_ITER_HOLDS_TIMESTAMP (&iter));\n+ bson_iter_timestamp (&iter, &op_time->t, &op_time->i);\n+}\n+\n+\n+#define ASSERT_OP_TIMES_EQUAL(_a, _b) \\\n+ if ((_a).t != (_b).t || (_a).i != (_b).i) { \\\n+ fprintf (stderr, \\\n+ #_a \" (%d, %d) does not match \" #_b \" (%d, %d)\\n\", \\\n+ (_a).t, \\\n+ (_a).i, \\\n+ (_b).t, \\\n+ (_b).i); \\\n+ abort (); \\\n+ }\n+\n+\n+static void\n+causal_test (session_test_fn_t test_fn)\n+{\n+ session_test_t *test;\n+ op_time_t session_time, read_concern_time, reply_time;\n+ bson_error_t error;\n+\n+ \/*\n+ * first causal exchange: don't send readConcern, receive opTime\n+ *\/\n+ test = session_test_new (CORRECT_CLIENT, CAUSAL);\n+ ASSERT_OR_PRINT (\n+ mongoc_client_session_append (test->cs, &test->opts, &error), error);\n+\n+ test_fn (test);\n+ check_success (test);\n+ BSON_ASSERT (!bson_has_field (first_cmd (test), \"readConcern\"));\n+ mongoc_client_session_get_operation_time (\n+ test->cs, &session_time.t, &session_time.i);\n+ BSON_ASSERT (session_time.t != 0);\n+ parse_reply_time (last_reply (test), &reply_time);\n+ ASSERT_OP_TIMES_EQUAL (session_time, reply_time);\n+\n+ \/*\n+ * second exchange: send previous opTime in readConcern, receive opTime\n+ *\/\n+ clear_history (test);\n+ test_fn (test);\n+ check_success (test);\n+ parse_read_concern_time (first_cmd (test), &read_concern_time);\n+ ASSERT_OP_TIMES_EQUAL (reply_time, read_concern_time);\n+ mongoc_client_session_get_operation_time (\n+ test->cs, &session_time.t, &session_time.i);\n+ BSON_ASSERT (session_time.t != 0);\n+ parse_reply_time (last_reply (test), &reply_time);\n+ ASSERT_OP_TIMES_EQUAL (session_time, reply_time);\n+\n+ session_test_destroy (test);\n+}\n+\n+\n+static void\n+run_session_test (void *ctx)\n+{\n+ session_test_fn_t test_fn = (session_test_fn_t) ctx;\n+ lsid_test (test_fn);\n+ causal_test (test_fn);\n+}\n+\n+\n static void\n insert_10_docs (session_test_t *test)\n {\n@@ -1177,13 +1385,14 @@\n static void\n test_cmd (session_test_t *test)\n {\n- test->succeeded = mongoc_client_command_with_opts (test->client,\n- \"db\",\n- tmp_bson (\"{'ping': 1}\"),\n- NULL,\n- &test->opts,\n- NULL,\n- &test->error);\n+ test->succeeded =\n+ mongoc_client_command_with_opts (test->client,\n+ \"db\",\n+ tmp_bson (\"{'listCollections': 1}\"),\n+ NULL,\n+ &test->opts,\n+ NULL,\n+ &test->error);\n }\n \n \n@@ -1193,7 +1402,7 @@\n test->succeeded =\n mongoc_client_read_command_with_opts (test->client,\n \"db\",\n- tmp_bson (\"{'ping': 1}\"),\n+ tmp_bson (\"{'listCollections': 1}\"),\n NULL,\n &test->opts,\n NULL,\n@@ -1206,7 +1415,7 @@\n {\n test->succeeded =\n mongoc_database_command_with_opts (test->db,\n- tmp_bson (\"{'ping': 1}\"),\n+ tmp_bson (\"{'listCollections': 1}\"),\n NULL,\n &test->opts,\n NULL,\n@@ -1586,7 +1795,7 @@\n \n test->succeeded = mongoc_bulk_operation_insert_with_opts (\n bulk, tmp_bson (\"{}\"), NULL, &test->error);\n- check_success (test);\n+ check_success_no_commands (test);\n \n test->succeeded = mongoc_bulk_operation_update_one_with_opts (\n bulk,\n@@ -1594,11 +1803,11 @@\n tmp_bson (\"{'$set': {'x': 1}}\"),\n NULL,\n &test->error);\n- check_success (test);\n+ check_success_no_commands (test);\n \n test->succeeded = mongoc_bulk_operation_remove_one_with_opts (\n bulk, tmp_bson (\"{}\"), NULL, &test->error);\n- check_success (test);\n+ check_success_no_commands (test);\n \n i = mongoc_bulk_operation_execute (bulk, NULL, &test->error);\n test->succeeded = (i != 0);\n@@ -1622,6 +1831,128 @@\n mongoc_cursor_next (cursor, &doc);\n test->succeeded = !mongoc_cursor_error (cursor, &test->error);\n mongoc_cursor_destroy (cursor);\n+}\n+\n+\n+static void\n+test_cmd_error (void *ctx)\n+{\n+ session_test_t *test;\n+ bson_error_t error;\n+\n+ test = session_test_new (CORRECT_CLIENT, CAUSAL);\n+\n+ \/*\n+ * explicit session. command error still updates operation time\n+ *\/\n+ test->expect_explicit_lsid = true;\n+ ASSERT_OR_PRINT (\n+ mongoc_client_session_append (test->cs, &test->opts, &error), error);\n+\n+ BSON_ASSERT (test->cs->operation_timestamp == 0);\n+ BSON_ASSERT (!mongoc_client_command_with_opts (test->session_client,\n+ \"db\",\n+ tmp_bson (\"{'bad': 1}\"),\n+ NULL,\n+ &test->opts,\n+ NULL,\n+ NULL));\n+\n+ BSON_ASSERT (test->cs->operation_timestamp != 0);\n+\n+ session_test_destroy (test);\n+}\n+\n+\n+static void\n+test_read_concern (void *ctx)\n+{\n+ session_test_t *test;\n+ mongoc_read_concern_t *rc;\n+ mongoc_session_opt_t *cs_opts;\n+ bson_error_t error;\n+\n+ test = session_test_new (CORRECT_CLIENT, CAUSAL);\n+ test->expect_explicit_lsid = true;\n+ ASSERT_OR_PRINT (\n+ mongoc_client_session_append (test->cs, &test->opts, &error), error);\n+\n+ \/* first exchange sets session's operationTime *\/\n+ test_cmd (test);\n+ check_success (test);\n+ BSON_ASSERT (!bson_has_field (last_non_getmore_cmd (test), \"readConcern\"));\n+\n+ \/*\n+ * default: no explicit read concern, driver sends afterClusterTime\n+ *\/\n+ test_cmd (test);\n+ check_success (test);\n+ ASSERT_MATCH (last_non_getmore_cmd (test),\n+ \"{\"\n+ \" 'readConcern': {\"\n+ \" 'level': {'$exists': false},\"\n+ \" 'afterClusterTime': {'$exists': true}\"\n+ \" }\"\n+ \"}\");\n+\n+ \/*\n+ * explicit read concern\n+ *\/\n+ rc = mongoc_read_concern_new ();\n+ mongoc_read_concern_set_level (rc, MONGOC_READ_CONCERN_LEVEL_LOCAL);\n+ BSON_ASSERT (mongoc_read_concern_append (rc, &test->opts));\n+ test_cmd (test);\n+ check_success (test);\n+ ASSERT_MATCH (last_non_getmore_cmd (test),\n+ \"{\"\n+ \" 'readConcern': {\"\n+ \" 'level': 'local',\"\n+ \" 'afterClusterTime': {'$exists': true}\"\n+ \" }\"\n+ \"}\");\n+\n+ \/*\n+ * explicit read concern, not causal\n+ *\/\n+ cs_opts = mongoc_session_opts_new ();\n+ mongoc_session_opts_set_causal_consistency (cs_opts, false);\n+ mongoc_client_session_destroy (test->cs);\n+ test->cs = mongoc_client_start_session (test->client, cs_opts, &error);\n+ ASSERT_OR_PRINT (test->cs, error);\n+ bson_reinit (&test->opts);\n+ ASSERT_OR_PRINT (\n+ mongoc_client_session_append (test->cs, &test->opts, &error), error);\n+ BSON_ASSERT (mongoc_read_concern_append (rc, &test->opts));\n+ \/* set new session's operationTime *\/\n+ test_cmd (test);\n+ check_success (test);\n+ ASSERT_CMPUINT32 (test->cs->operation_timestamp, >, (uint32_t) 0);\n+ \/* afterClusterTime is not sent *\/\n+ test_cmd (test);\n+ check_success (test);\n+ ASSERT_MATCH (last_non_getmore_cmd (test),\n+ \"{\"\n+ \" 'readConcern': {\"\n+ \" 'level': 'local',\"\n+ \" 'afterClusterTime': {'$exists': false}\"\n+ \" }\"\n+ \"}\");\n+\n+ \/*\n+ * no read concern, not causal\n+ *\/\n+ bson_reinit (&test->opts);\n+ ASSERT_OR_PRINT (\n+ mongoc_client_session_append (test->cs, &test->opts, &error), error);\n+ \/* afterClusterTime is not sent *\/\n+ test_cmd (test);\n+ check_success (test);\n+ ASSERT_MATCH (last_non_getmore_cmd (test),\n+ \"{'readConcern': {'$exists': false}}\");\n+\n+ mongoc_session_opts_destroy (cs_opts);\n+ mongoc_read_concern_destroy (rc);\n+ session_test_destroy (test);\n }\n \n \n@@ -1792,4 +2123,18 @@\n add_session_test (suite, \"\/Session\/collection_names\", test_collection_names);\n add_session_test (suite, \"\/Session\/bulk\", test_bulk);\n add_session_test (suite, \"\/Session\/find_indexes\", test_find_indexes);\n-}\n+ TestSuite_AddFull (suite,\n+ \"\/Session\/cmd_error\",\n+ test_cmd_error,\n+ NULL,\n+ NULL,\n+ test_framework_skip_if_no_cluster_time,\n+ test_framework_skip_if_no_crypto);\n+ TestSuite_AddFull (suite,\n+ \"\/Session\/read_concern\",\n+ test_read_concern,\n+ NULL,\n+ NULL,\n+ test_framework_skip_if_no_cluster_time,\n+ test_framework_skip_if_no_crypto);\n+}\n"} {"commit":"de632e8367d00389619ea1e38383c5ca211dd461","subject":"run #2 of ecrustify, plus a manual edit to correctly make a function pointer * now aligns with function prototype name, a couple other tiny spacing fixes","message":"run #2 of ecrustify, plus a manual edit to correctly make a function pointer\n* now aligns with function prototype name, a couple other tiny spacing fixes\n\n\nSVN revision: 53798\n","repos":"tasn\/enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,rvandegrift\/e,rvandegrift\/e,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_fm.c\n+++ src\/bin\/e_fm.c\n@@ -214,7 +214,7 @@\n E_Fm2_Mime_Handler *handler;\n };\n \n-static const char * _e_fm2_dev_path_map(const char *dev, const char *path);\n+static const char *_e_fm2_dev_path_map(const char *dev, const char *path);\n static void _e_fm2_file_add(Evas_Object *obj, const char *file, int unique, const char *file_rel, int after, E_Fm2_Finfo *finf);\n static void _e_fm2_file_del(Evas_Object *obj, const char *file);\n static void _e_fm2_queue_process(Evas_Object *obj);\n@@ -229,13 +229,13 @@\n static void _e_fm2_dir_load_props(E_Fm2_Smart_Data *sd);\n static void _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd);\n \n-static Evas_Object * _e_fm2_file_fm2_find(const char *file);\n-static E_Fm2_Icon * _e_fm2_icon_find(Evas_Object *obj, const char *file);\n-static const char * _e_fm2_uri_escape(const char *path);\n-static Eina_List * _e_fm2_uri_path_list_get(Eina_List *uri_list);\n-static Eina_List * _e_fm2_uri_icon_list_get(Eina_List *uri);\n-\n-static E_Fm2_Icon * _e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file, E_Fm2_Finfo *finf);\n+static Evas_Object *_e_fm2_file_fm2_find(const char *file);\n+static E_Fm2_Icon *_e_fm2_icon_find(Evas_Object *obj, const char *file);\n+static const char *_e_fm2_uri_escape(const char *path);\n+static Eina_List *_e_fm2_uri_path_list_get(Eina_List *uri_list);\n+static Eina_List *_e_fm2_uri_icon_list_get(Eina_List *uri);\n+\n+static E_Fm2_Icon *_e_fm2_icon_new(E_Fm2_Smart_Data *sd, const char *file, E_Fm2_Finfo *finf);\n static void _e_fm2_icon_unfill(E_Fm2_Icon *ic);\n static int _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf);\n static void _e_fm2_icon_free(E_Fm2_Icon *ic);\n@@ -243,7 +243,7 @@\n static void _e_fm2_icon_unrealize(E_Fm2_Icon *ic);\n static Eina_Bool _e_fm2_icon_visible(const E_Fm2_Icon *ic);\n static void _e_fm2_icon_label_set(E_Fm2_Icon *ic, Evas_Object *obj);\n-static Evas_Object * _e_fm2_icon_icon_direct_set(E_Fm2_Icon *ic, Evas_Object *o, Evas_Smart_Cb gen_func, void *data, int force_gen);\n+static Evas_Object *_e_fm2_icon_icon_direct_set(E_Fm2_Icon *ic, Evas_Object *o, Evas_Smart_Cb gen_func, void *data, int force_gen);\n static void _e_fm2_icon_icon_set(E_Fm2_Icon *ic);\n static void _e_fm2_icon_thumb(const E_Fm2_Icon *ic, Evas_Object *oic, int force);\n static void _e_fm2_icon_select(E_Fm2_Icon *ic);\n@@ -258,8 +258,8 @@\n \n static void _e_fm2_icon_make_visible(E_Fm2_Icon *ic);\n static void _e_fm2_icon_desel_any(Evas_Object *obj);\n-static E_Fm2_Icon * _e_fm2_icon_first_selected_find(Evas_Object *obj);\n-static E_Fm2_Icon * _e_fm2_icon_next_find(Evas_Object *obj, int next, int match_func(E_Fm2_Icon * ic, void *data), void *data);\n+static E_Fm2_Icon *_e_fm2_icon_first_selected_find(Evas_Object *obj);\n+static E_Fm2_Icon *_e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *ic, void *data), void *data);\n \n static void _e_fm2_icon_sel_first(Evas_Object *obj);\n static void _e_fm2_icon_sel_last(Evas_Object *obj);\n@@ -343,24 +343,24 @@\n static void _e_fm2_file_properties_delete_cb(void *obj);\n static void _e_fm2_file_do_rename(const char *text, E_Fm2_Icon *ic);\n \n-static Evas_Object * _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic);\n+static Evas_Object *_e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic);\n static void _e_fm2_icon_entry_widget_del(E_Fm2_Icon *ic);\n static void _e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);\n static void _e_fm2_icon_entry_widget_accept(E_Fm2_Icon *ic);\n \n-static E_Dialog * _e_fm_retry_abort_dialog(int pid, const char *str);\n+static E_Dialog *_e_fm_retry_abort_dialog(int pid, const char *str);\n static void _e_fm_retry_abort_delete_cb(void *obj);\n static void _e_fm_retry_abort_retry_cb(void *data, E_Dialog *dialog);\n static void _e_fm_retry_abort_abort_cb(void *data, E_Dialog *dialog);\n \n-static E_Dialog * _e_fm_overwrite_dialog(int pid, const char *str);\n+static E_Dialog *_e_fm_overwrite_dialog(int pid, const char *str);\n static void _e_fm_overwrite_delete_cb(void *obj);\n static void _e_fm_overwrite_no_cb(void *data, E_Dialog *dialog);\n static void _e_fm_overwrite_no_all_cb(void *data, E_Dialog *dialog);\n static void _e_fm_overwrite_yes_cb(void *data, E_Dialog *dialog);\n static void _e_fm_overwrite_yes_all_cb(void *data, E_Dialog *dialog);\n \n-static E_Dialog * _e_fm_error_dialog(int pid, const char *str);\n+static E_Dialog *_e_fm_error_dialog(int pid, const char *str);\n static void _e_fm_error_delete_cb(void *obj);\n static void _e_fm_error_retry_cb(void *data, E_Dialog *dialog);\n static void _e_fm_error_abort_cb(void *data, E_Dialog *dialog);\n@@ -415,8 +415,8 @@\n static inline void _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic);\n static int _e_fm2_context_list_sort(const void *data1, const void *data2);\n \n-static char * _e_fm_string_append_char(char *str, size_t *size, size_t *len, char c);\n-static char * _e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);\n+static char *_e_fm_string_append_char(char *str, size_t *size, size_t *len, char c);\n+static char *_e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);\n \n void _e_fm2_path_parent_set(Evas_Object *obj, const char *path);\n \n@@ -510,8 +510,8 @@\n return 0;\n \n ext++;\n- return ((strcasecmp(ext, \"esktop\") == 0) ||\n- (strcasecmp(ext, \"irectory\") == 0));\n+ return (strcasecmp(ext, \"esktop\") == 0) ||\n+ (strcasecmp(ext, \"irectory\") == 0);\n #endif\n }\n \n@@ -526,7 +526,7 @@\n else\n return 0;\n #else\n- return (strcasecmp(ext, \"imc\") == 0);\n+ return strcasecmp(ext, \"imc\") == 0;\n #endif\n }\n \n@@ -534,14 +534,14 @@\n _e_fm2_file_is_edje(const char *file)\n {\n const char *p = strrchr(file, '.');\n- return ((p) && (_e_fm2_ext_is_edje(p + 1)));\n+ return (p) && (_e_fm2_ext_is_edje(p + 1));\n }\n \n static inline Eina_Bool\n _e_fm2_file_is_desktop(const char *file)\n {\n const char *p = strrchr(file, '.');\n- return ((p) && (_e_fm2_ext_is_desktop(p + 1)));\n+ return (p) && (_e_fm2_ext_is_desktop(p + 1));\n }\n \n static inline char\n@@ -5172,7 +5172,7 @@\n }\n \n static E_Fm2_Icon *\n-_e_fm2_icon_next_find(Evas_Object *obj, int next, int match_func(E_Fm2_Icon *ic, void *data), void *data)\n+_e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *ic, void *data), void *data)\n {\n E_Fm2_Smart_Data *sd;\n Eina_List *l;\n@@ -5569,10 +5569,10 @@\n _e_fm2_typebuf_match_func(E_Fm2_Icon *ic, void *data)\n {\n char *tb = data;\n- return (((ic->info.label) &&\n- (e_util_glob_case_match(ic->info.label, tb))) ||\n- ((ic->info.file) &&\n- (e_util_glob_case_match(ic->info.file, tb))));\n+ return ((ic->info.label) &&\n+ (e_util_glob_case_match(ic->info.label, tb))) ||\n+ ((ic->info.file) &&\n+ (e_util_glob_case_match(ic->info.file, tb)));\n }\n \n static Eina_Bool\n@@ -7772,7 +7772,7 @@\n {\n mi = e_menu_item_new(mn);\n e_menu_item_label_set(mi, _(\"Show Hidden Files\"));\n- e_util_menu_item_theme_icon_set(mi,\"view-refresh\");\n+ e_util_menu_item_theme_icon_set(mi, \"view-refresh\");\n e_menu_item_check_set(mi, 1);\n e_menu_item_toggle_set(mi, sd->show_hidden_files);\n e_menu_item_callback_set(mi, _e_fm2_toggle_hidden_files, sd);\n@@ -8239,7 +8239,7 @@\n if (!d1->label) return 1;\n d2 = data2;\n if (!d2->label) return -1;\n- return (strcmp(d1->label, d2->label));\n+ return strcmp(d1->label, d2->label);\n }\n \n static void\n"} {"commit":"741a25205f59a23103ec6f3d3e28969b1508b792","subject":"silence implicit function decl warning","message":"silence implicit function decl warning\n","repos":"jeffhammond\/oshmpi,jeffhammond\/oshmpi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/test_shmem_synchronization.c\n+++ tests\/test_shmem_synchronization.c\n@@ -49,6 +49,7 @@\n \n #include \n #include \n+#include \n #include \n #include \n #include \n"} {"commit":"ab5693df7486a417307b130cbbe028f2f7be9527","subject":"test: removed unused codes.","message":"test: removed unused codes.\n\n- this button is not used any more because we you changed,user signal of\nentry.\n","repos":"tasn\/elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bin\/test.c\n+++ src\/bin\/test.c\n@@ -348,16 +348,6 @@\n _menu_create(str);\n }\n \n-#if 0\n-static void\n-_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)\n-{\n- const char *str = elm_entry_entry_get(data);\n- if (!str) return;\n- _menu_create(str);\n-}\n-#endif\n-\n static char *\n _space_removed_string_get(const char *name)\n {\n@@ -385,7 +375,6 @@\n {\n Evas_Object *bg = NULL, *bx0 = NULL, *bx1 = NULL, *lb = NULL;\n Evas_Object *fr = NULL, *tg = NULL, *sc = NULL, *en = NULL;\n- \/\/Evas_Object *btn = NULL;\n Eina_List *l = NULL;\n struct elm_test *t = NULL;\n \n@@ -495,14 +484,6 @@\n elm_box_pack_end(bx1, en);\n evas_object_show(en);\n elm_object_focus_set(en, EINA_TRUE);\n-\n-#if 0\n- btn = elm_button_add(win);\n- elm_object_text_set(btn, \"Go\");\n- evas_object_smart_callback_add(btn, \"clicked\", _btn_clicked_cb, en);\n- elm_box_pack_end(bx1, btn);\n- evas_object_show(btn);\n- #endif\n \n sc = elm_scroller_add(win);\n elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);\n"} {"commit":"e789f2bb71818b55255790e479b7db8853e03b5c","subject":"Cleanup compiler warnings","message":"Cleanup compiler warnings\n\nocpayload:\nThe `tcpPort` was unused in the in the `OCCopyResource` function\nThe only place the `OCCopyResource` function was called from was\nfrom the `OCDiscoveryPayloadAddNewResource`.\n[-Wunused-parameter]\n\nChange-Id: Icb17930e730c8154fbf10d54dd9b5e3857e3e1db\nSigned-off-by: George Nash \nReviewed-on: https:\/\/gerrit.iotivity.org\/gerrit\/8423\nTested-by: jenkins-iotivity <09cb29e8a2b473a2c978382eec13ee06fa017bda@opendaylight.org>\nReviewed-by: Jon A. Cruz <44f878afe53efc66b76772bd845eb65944ed8232@joncruz.org>\n","repos":"iotivity\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- resource\/csdk\/stack\/src\/ocpayload.c\n+++ resource\/csdk\/stack\/src\/ocpayload.c\n@@ -1394,8 +1394,7 @@\n return NULL;\n }\n \n-static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t securePort,\n- uint16_t tcpPort)\n+static OCResourcePayload* OCCopyResource(const OCResource* res, uint16_t securePort)\n {\n OCResourcePayload* pl = (OCResourcePayload*)OICCalloc(1, sizeof(OCResourcePayload));\n if (!pl)\n@@ -1500,7 +1499,8 @@\n void OCDiscoveryPayloadAddResource(OCDiscoveryPayload* payload, const OCResource* res,\n uint16_t securePort, uint16_t tcpPort)\n {\n- OCDiscoveryPayloadAddNewResource(payload, OCCopyResource(res, securePort, tcpPort));\n+ OC_UNUSED(tcpPort);\n+ OCDiscoveryPayloadAddNewResource(payload, OCCopyResource(res, securePort));\n }\n \n bool OCResourcePayloadAddStringLL(OCStringLL **stringLL, const char *value)\n"} {"commit":"b51cf0ce314afa7d4bea9ff1929e9e657e6e8631","subject":"Handle always 32 bits to fix MSVC 14.1","message":"Handle always 32 bits to fix MSVC 14.1\n","repos":"degenerated1123\/ZenLib,degenerated1123\/ZenLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- utils\/staticReferencedAllocator.h\n+++ utils\/staticReferencedAllocator.h\n@@ -85,7 +85,8 @@\n class StaticReferencedAllocator\n {\n public:\n- typedef GenericHandle Handle;\n+ \/\/typedef GenericHandle Handle;\n+ typedef GenericHandle Handle;\n \n \/**\n * Outside-Mirror for the type this can create\n"} {"commit":"24caa15c779777ffbedbb5dc0ccaaac9f0fa7682","subject":"Rule engine: Minor code cleanups.","message":"Rule engine: Minor code cleanups.\n\nSigned-off-by: Sam Baskinger <92680496c5c59d70b57cd3ee4f9f043ae62749b6@qualys.com>\n","repos":"ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- engine\/rule_engine.c\n+++ engine\/rule_engine.c\n@@ -100,32 +100,6 @@\n ib_flags_t required_op_flags;\n ib_state_event_type_t event;\n };\n-\n-\/**\n- * Function to produce the default error page.\n- *\n- * @param[in] tx Ignored.\n- * @param[out] body The default error body is placed here.\n- * @param[out] length The default error body length is placed here.\n- * @param[in] cbdata Ignored.\n- *\n- * @returns IB_OK.\n- *\/\n-static ib_status_t default_error_page_fn(\n- ib_tx_t *tx,\n- const uint8_t **body,\n- size_t *length,\n- void *cbdata\n-)\n-{\n- assert(body != NULL);\n- assert(length != NULL);\n-\n- *body = default_block_document;\n- *length = default_block_document_len;\n-\n- return IB_OK;\n-}\n \n \/* Rule definition data *\/\n static const ib_rule_phase_meta_t rule_phase_meta[] =\n@@ -345,62 +319,6 @@\n }\n };\n \n-ib_status_t ib_rule_set_invert(ib_rule_t *rule, bool invert)\n-{\n- assert(rule != NULL);\n- assert(rule->opinst != NULL);\n-\n- rule->opinst->invert = invert;\n-\n- return IB_OK;\n-}\n-\n-ib_status_t ib_rule_set_op_params(ib_rule_t *rule, const char *params)\n-{\n- assert(rule != NULL);\n- assert(rule->ctx != NULL);\n- assert(rule->opinst != NULL);\n- assert(params != NULL);\n-\n- ib_status_t rc;\n-\n- rule->opinst->params = ib_mm_strdup(rule->ctx->mm, params);\n- if (rule->opinst->params == NULL) {\n- return IB_EALLOC;\n- }\n-\n- rc = ib_field_create_bytestr_alias(\n- &(rule->opinst->fparam),\n- rule->ctx->mm,\n- \"\",\n- 0,\n- (uint8_t *)rule->opinst->params,\n- strlen(rule->opinst->params));\n- if (rc != IB_OK) {\n- return rc;\n- }\n-\n-\n- return IB_OK;\n-}\n-\n-ib_rule_phase_num_t ib_rule_lookup_phase(\n- const char *name,\n- bool is_stream)\n-{\n- const ib_rule_phase_meta_t *item;\n-\n- for (item = rule_phase_meta; item->phase_num != IB_PHASE_INVALID; ++item) {\n- if ( (item->name != NULL) && (strcasecmp(name, item->name) == 0) ) {\n- if (item->is_stream != is_stream) {\n- return IB_PHASE_INVALID;\n- }\n- return item->phase_num;\n- }\n- }\n- return IB_PHASE_INVALID;\n-}\n-\n \/**\n * Items on the rule execution object stack\n *\/\n@@ -417,6 +335,88 @@\n *\/\n #define MAX_LIST_RECURSION (5) \/**< Max list recursion limit *\/\n #define MAX_CHAIN_RECURSION (10) \/**< Max chain recursion limit *\/\n+\n+ib_status_t ib_rule_set_invert(ib_rule_t *rule, bool invert)\n+{\n+ assert(rule != NULL);\n+ assert(rule->opinst != NULL);\n+\n+ rule->opinst->invert = invert;\n+\n+ return IB_OK;\n+}\n+\n+ib_status_t ib_rule_set_op_params(ib_rule_t *rule, const char *params)\n+{\n+ assert(rule != NULL);\n+ assert(rule->ctx != NULL);\n+ assert(rule->opinst != NULL);\n+ assert(params != NULL);\n+\n+ ib_status_t rc;\n+\n+ rule->opinst->params = ib_mm_strdup(rule->ctx->mm, params);\n+ if (rule->opinst->params == NULL) {\n+ return IB_EALLOC;\n+ }\n+\n+ rc = ib_field_create_bytestr_alias(\n+ &(rule->opinst->fparam),\n+ rule->ctx->mm,\n+ \"\",\n+ 0,\n+ (uint8_t *)rule->opinst->params,\n+ strlen(rule->opinst->params));\n+ if (rc != IB_OK) {\n+ return rc;\n+ }\n+\n+\n+ return IB_OK;\n+}\n+\n+ib_rule_phase_num_t ib_rule_lookup_phase(\n+ const char *name,\n+ bool is_stream)\n+{\n+ const ib_rule_phase_meta_t *item;\n+\n+ for (item = rule_phase_meta; item->phase_num != IB_PHASE_INVALID; ++item) {\n+ if ( (item->name != NULL) && (strcasecmp(name, item->name) == 0) ) {\n+ if (item->is_stream != is_stream) {\n+ return IB_PHASE_INVALID;\n+ }\n+ return item->phase_num;\n+ }\n+ }\n+ return IB_PHASE_INVALID;\n+}\n+\n+\/**\n+ * Function to produce the default error page.\n+ *\n+ * @param[in] tx Ignored.\n+ * @param[out] body The default error body is placed here.\n+ * @param[out] length The default error body length is placed here.\n+ * @param[in] cbdata Ignored.\n+ *\n+ * @returns IB_OK.\n+ *\/\n+static ib_status_t default_error_page_fn(\n+ ib_tx_t *tx,\n+ const uint8_t **body,\n+ size_t *length,\n+ void *cbdata\n+)\n+{\n+ assert(body != NULL);\n+ assert(length != NULL);\n+\n+ *body = default_block_document;\n+ *length = default_block_document_len;\n+\n+ return IB_OK;\n+}\n \n \/**\n * Test the validity of a phase number\n"} {"commit":"c8e7d77bbe737ebace29b3b16bb6acf46e9e7446","subject":"FIX - added field name to information to external service","message":"FIX - added field name to information to external service\n","repos":"FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- core\/system\/user\/user_manager_web.c\n+++ core\/system\/user\/user_manager_web.c\n@@ -176,13 +176,13 @@\n \t\n \tif( usr->u_Status == USER_STATUS_DISABLED )\n \t{\n-\t\tmsize = snprintf( msg, sizeof(msg), \"{\\\"userid\\\":\\\"%s\\\",\\\"isdisabled\\\":true,\\\"lastupdate\\\":%lu,\\\"groups\\\":[\", usr->u_UUID, usr->u_ModifyTime );\n+\t\tmsize = snprintf( msg, sizeof(msg), \"{\\\"userid\\\":\\\"%s\\\",\\\"isdisabled\\\":true,\\\"lastupdate\\\":%lu,\\\"name\\\":\\\"%s\\\",\\\"groups\\\":[\", usr->u_UUID, usr->u_ModifyTime, usr->u_Name );\n \t\tBufStringAddSize( bs, msg, msize );\n \t\t\/\/UGMGetUserGroupsDB( l->sl_UGM, usr->u_ID, bs );\n \t}\n \telse\n \t{\n-\t\tmsize = snprintf( msg, sizeof(msg), \"{\\\"userid\\\":\\\"%s\\\",\\\"isdisabled\\\":false,\\\"lastupdate\\\":%lu,\\\"groups\\\":[\", usr->u_UUID, usr->u_ModifyTime );\n+\t\tmsize = snprintf( msg, sizeof(msg), \"{\\\"userid\\\":\\\"%s\\\",\\\"isdisabled\\\":false,\\\"lastupdate\\\":%lu,\\\"name\\\":\\\"%s\\\",\\\"groups\\\":[\", usr->u_UUID, usr->u_ModifyTime, usr->u_Name );\n \t\tBufStringAddSize( bs, msg, msize );\n \t\tUGMGetUserGroupsDB( l->sl_UGM, usr->u_ID, bs );\n \t}\n"} {"commit":"b098e5957fe53a78786a627a950f1ca9eded4f3e","subject":"CrankLightableARanged: Improved GLSL snippet for some bits.","message":"CrankLightableARanged: Improved GLSL snippet for some bits.\n","repos":"WSID\/crank-system,WSID\/crank-system,WSID\/crank-system","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crankvisual\/cranklightablearanged.c\n+++ crankvisual\/cranklightablearanged.c\n@@ -42,6 +42,7 @@\n #include \"crankshape.h\"\n \n #include \"crankprojection.h\"\n+#include \"crankmaterial.h\"\n #include \"crankmeshutil.h\"\n \n #include \"cranklightable.h\"\n@@ -49,51 +50,61 @@\n \n \/\/\/\/\/\/\/\/ GLSL Snippet code. \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n-\n+static CoglUserDataKey key_template;\n+\n+static CoglSnippet *vert_snippet;\n static gchar *vert_decl =\n-\"uniform CrankProjection crank_deferr_proj;\\n\"\n-\"varying vec3 crank_deferr_near;\\n\"\n-\"varying vec3 crank_deferr_far;\";\n-\n-static gchar *vert_replace =\n-\"cogl_position_out = cogl_modelview_projection_matrix * cogl_position_in;\\n\"\n-\"cogl_tex_coord0_out = vec4 (0, 0, 0, 1);\\n\"\n-\"cogl_tex_coord0_out.xy = vec2 (0.5) + cogl_position_out.xy \/ cogl_position_out.w * 0.5;\\n\"\n-\n-\"float nf = mix (1,\"\n-\" crank_projection_get_far (crank_deferr_proj) \/\\n\"\n-\" crank_projection_get_near (crank_deferr_proj),\\n\"\n-\" crank_deferr_proj.proj_type);\\n\"\n-\n-\"vec2 base_lb = vec2 (crank_projection_get_left (crank_deferr_proj),\\n\"\n-\" crank_projection_get_top (crank_deferr_proj));\\n\"\n-\"vec2 base_rt = vec2 (crank_projection_get_right (crank_deferr_proj),\\n\"\n-\" crank_projection_get_bottom (crank_deferr_proj));\\n\"\n-\"vec2 base_xy = mix (base_lb, base_rt, cogl_tex_coord0_out.xy);\\n\"\n-\n-\"crank_deferr_near = vec3 (base_xy,\\n\"\n-\" -crank_projection_get_near (crank_deferr_proj));\\n\"\n-\n-\"crank_deferr_far = vec3 (base_xy * nf,\\n\"\n-\" -crank_projection_get_far (crank_deferr_proj));\\n\";\n+\"uniform CrankProjection crank_render_projection;\\n\"\n+\"varying vec3 crank_render_tex_coord_vert;\\n\"\n+\"varying vec3 crank_frag_near;\\n\"\n+\"varying vec3 crank_frag_far;\\n\"\n+\n+\"#define crank_render_tex_coord_out crank_render_tex_coord_vert\\n\";\n+\n+static gchar *vert_post =\n+\"crank_render_tex_coord_out.xy = cogl_position_out.xy +\\n\"\n+\" vec2 (cogl_position_out.w);\\n\"\n+\"crank_render_tex_coord_out.z = cogl_position_out.w * 2;\"\n+\n+\"float nf = mix (1,\\n\"\n+\" crank_projection_get_far (crank_render_projection) \/\\n\"\n+\" crank_projection_get_near (crank_render_projection),\\n\"\n+\" crank_render_projection.proj_type);\\n\"\n+\n+\"vec2 base_lb = vec2 (crank_projection_get_left (crank_render_projection),\\n\"\n+\" crank_projection_get_bottom (crank_render_projection));\\n\"\n+\"vec2 base_rt = vec2 (crank_projection_get_right (crank_render_projection),\\n\"\n+\" crank_projection_get_top (crank_render_projection));\\n\"\n+\"vec2 base_xy = mix (base_lb, base_rt, crank_render_tex_coord_out.xy);\\n\"\n+\n+\"crank_frag_near = vec3 (base_xy,\\n\"\n+\" -crank_projection_get_near (crank_render_projection));\\n\"\n+\n+\"crank_frag_far = vec3 (base_xy * nf,\\n\"\n+\" -crank_projection_get_far (crank_render_projection));\\n\";\n \n \n static gchar *frag_decl =\n-\"uniform CrankProjection crank_deferr_proj;\\n\"\n-\"varying vec3 crank_deferr_near;\\n\"\n-\"varying vec3 crank_deferr_far;\\n\"\n-\"uniform sampler2D crank_deferr_geom;\\n\"\n-\"uniform sampler2D crank_deferr_color;\";\n-\n-static gchar *frag_replace =\n-\"vec4 crank_geom_value = texture2D (crank_deferr_geom, cogl_tex_coord0_in.xy);\\n\"\n-\"float crank_depth = dot (crank_geom_value.ba, vec2 (1, 1 \/ 256));\\n\"\n-\"vec3 crank_normal = vec3 (crank_geom_value.rg, 0);\\n\"\n-\"crank_normal.z = sqrt (1 - dot (crank_normal.xy, crank_normal.xy));\\n\"\n-\n-\"vec3 crank_frag_position = mix (crank_deferr_near, crank_deferr_far, crank_depth);\\n\"\n-\n-\"cogl_color_out = texture2D (crank_deferr_color, cogl_tex_coord0_in.xy);\"\n+\"uniform CrankProjection crank_render_projection;\\n\"\n+\"varying vec3 crank_render_tex_coord_vert;\\n\"\n+\"varying vec3 crank_frag_near;\\n\"\n+\"varying vec3 crank_frag_far;\\n\"\n+\"uniform sampler2D crank_render_geom;\\n\"\n+\"uniform sampler2D crank_render_color;\\n\"\n+\"uniform vec3 crank_lightable_position;\\n\"\n+\"float crank_frag_depth;\\n\"\n+\"vec3 crank_frag_normal;\\n\"\n+\"vec3 crank_frag_pos;\\n\";\n+\n+static gchar *frag_post =\n+\"vec2 tc = crank_render_tex_coord_vert.xy \/ crank_render_tex_coord_vert.z;\\n\"\n+\"vec4 crank_geom_value = texture2D (crank_render_geom, tc);\\n\"\n+\"crank_geom_unpack (crank_geom_value, crank_frag_normal, crank_frag_depth);\\n\"\n+\n+\"crank_frag_pos = mix (crank_frag_near, crank_frag_far, crank_frag_depth);\\n\"\n+\n+\n+\"cogl_color_out = vec4 (crank_frag_near, 1);\"\n ;\n \n \/\/\/\/\/\/\/\/ List of virtual functions \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n@@ -130,6 +141,14 @@\n const gfloat lscale,\n CoglFramebuffer *framebuffer);\n \n+\n+\n+\/\/\/\/\/\/\/\/ Private functions \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+static void\n+crank_lightable_a_ranged_temp_free (gpointer data);\n+\n+\n \/\/\/\/\/\/\/\/ Properties and signals \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n enum {\n@@ -146,6 +165,12 @@\n \n \/\/\/\/\/\/\/\/ Type Definitions \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n+typedef struct _CrankLightableARangedTemp\n+{\n+ CoglPipeline *pipeline;\n+ CoglPrimitive *bounding_volume;\n+} CrankLightableARangedTemp;\n+\n struct _CrankLightableARanged\n {\n CrankLightable _parent;\n@@ -156,6 +181,9 @@\n CoglContext *cogl_context;\n CoglPipeline *pipe_line;\n CoglPrimitive *bound_volume;\n+\n+ gint uniform_render_projection[2];\n+ gint uniform_lightable_position;\n };\n \n G_DEFINE_TYPE (CrankLightableARanged,\n@@ -212,14 +240,11 @@\n static void\n crank_lightable_a_ranged_constructed (GObject *object)\n {\n+ GObjectClass *pc_gobject;\n+\n CrankLightableARanged *lightable;\n- GObjectClass *pc_gobject;\n-\n- CoglSnippet *snippet_vert;\n- CoglSnippet *snippet_frag;\n-\n+ CrankLightableARangedTemp *template;\n pc_gobject = (GObjectClass*)crank_lightable_a_ranged_parent_class;\n-\n pc_gobject->constructed (object);\n \n lightable = (CrankLightableARanged*) object;\n@@ -227,32 +252,58 @@\n if (lightable->cogl_context == NULL)\n g_error (\"CrankLightableARanged: Requires cogl-context at construction.\");\n \n- lightable->pipe_line = cogl_pipeline_new (lightable->cogl_context);\n- lightable->bound_volume = crank_make_mesh_sphere_uv_p3n3 (lightable->cogl_context, 10, 10);\n-\n- snippet_vert = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,\n- vert_decl,\n- NULL);\n- cogl_snippet_set_replace (snippet_vert, vert_replace);\n-\n- snippet_frag = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,\n- frag_decl,\n- NULL);\n- cogl_snippet_set_replace (snippet_frag, frag_replace);\n-\n- cogl_pipeline_set_layer_null_texture (lightable->pipe_line, 0, COGL_TEXTURE_TYPE_2D);\n- cogl_pipeline_set_layer_null_texture (lightable->pipe_line, 1, COGL_TEXTURE_TYPE_2D);\n-\n- cogl_pipeline_add_snippet (lightable->pipe_line,\n- crank_projection_get_snippet_def (COGL_SNIPPET_HOOK_VERTEX));\n- cogl_pipeline_add_snippet (lightable->pipe_line,\n- crank_projection_get_snippet_def (COGL_SNIPPET_HOOK_FRAGMENT));\n-\n- cogl_pipeline_add_snippet (lightable->pipe_line, snippet_vert);\n- cogl_pipeline_add_snippet (lightable->pipe_line, snippet_frag);\n-\n- cogl_object_unref (snippet_vert);\n- cogl_object_unref (snippet_frag);\n+ template = cogl_object_get_user_data ((CoglObject*) lightable->cogl_context,\n+ &key_template);\n+\n+ if (template == NULL)\n+ {\n+ CoglSnippet *snippet_frag;\n+\n+ template = g_new (CrankLightableARangedTemp, 1);\n+\n+ template->pipeline = cogl_pipeline_new (lightable->cogl_context);\n+ cogl_pipeline_set_cull_face_mode (template->pipeline,\n+ COGL_PIPELINE_CULL_FACE_MODE_FRONT);\n+ template->bounding_volume = crank_make_mesh_sphere_uv_p3n3 (lightable->cogl_context, 10, 10);\n+\n+ vert_snippet = cogl_snippet_new (COGL_SNIPPET_HOOK_VERTEX,\n+ vert_decl,\n+ vert_post);\n+\n+ snippet_frag = cogl_snippet_new (COGL_SNIPPET_HOOK_FRAGMENT,\n+ frag_decl,\n+ frag_post);\n+\n+ cogl_pipeline_set_layer_null_texture (template->pipeline, 0, COGL_TEXTURE_TYPE_2D);\n+ cogl_pipeline_set_layer_null_texture (template->pipeline, 1, COGL_TEXTURE_TYPE_2D);\n+\n+ cogl_pipeline_add_snippet (template->pipeline,\n+ crank_material_get_snippet_geom_unpack ());\n+ cogl_pipeline_add_snippet (template->pipeline,\n+ crank_projection_get_snippet_def (COGL_SNIPPET_HOOK_VERTEX));\n+ cogl_pipeline_add_snippet (template->pipeline,\n+ crank_projection_get_snippet_def (COGL_SNIPPET_HOOK_FRAGMENT));\n+\n+ cogl_pipeline_add_snippet (template->pipeline, vert_snippet);\n+ cogl_pipeline_add_snippet (template->pipeline, snippet_frag);\n+\n+ cogl_object_unref (snippet_frag);\n+\n+ cogl_object_set_user_data ((CoglObject*) lightable->cogl_context,\n+ &key_template,\n+ template,\n+ crank_lightable_a_ranged_temp_free);\n+ }\n+\n+ lightable->pipe_line = template->pipeline;\n+ lightable->bound_volume = template->bounding_volume;\n+\n+ crank_projection_get_uniform_locations (lightable->pipe_line,\n+ \"crank_render_projection\",\n+ lightable->uniform_render_projection);\n+ lightable->uniform_lightable_position =\n+ cogl_pipeline_get_uniform_location (lightable->pipe_line,\n+ \"crank_lightable_position\");\n }\n \n static void\n@@ -346,6 +397,7 @@\n \n CrankMatFloat4 mv_matrix;\n \n+ position->mscl *= self->radius;\n crank_trans3_to_matrix_transpose (position, & mv_matrix);\n \n cogl_framebuffer_set_modelview_matrix (framebuffer, (CoglMatrix*)&mv_matrix);\n@@ -353,9 +405,33 @@\n cogl_pipeline_set_layer_texture (self->pipe_line, 0, tex_geom);\n cogl_pipeline_set_layer_texture (self->pipe_line, 1, tex_color);\n \n- cogl_primitive_draw (self->bound_volume, framebuffer, self->pipe_line);\n-}\n-\n+ crank_projection_set_uniform_value (projection,\n+ self->pipe_line,\n+ self->uniform_render_projection);\n+\n+ cogl_pipeline_set_uniform_float (self->pipe_line,\n+ self->uniform_lightable_position,\n+ 3, 1, (gfloat*) & position->mtrans);\n+\n+\n+ \/\/cogl_primitive_draw (self->bound_volume, framebuffer, self->pipe_line);\n+}\n+\n+\n+\n+\n+\/\/\/\/\/\/\/\/ Private functions \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+static void\n+crank_lightable_a_ranged_temp_free (gpointer data)\n+{\n+ CrankLightableARangedTemp *template = (CrankLightableARangedTemp*) data;\n+\n+ cogl_object_unref (template->pipeline);\n+ cogl_object_unref (template->bounding_volume);\n+\n+ g_free (data);\n+}\n \n \n \/\/\/\/\/\/\/\/ Constructors \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n"} {"commit":"c09ddfe6d31b84a682a993bfad23c50fe7c41faf","subject":"Remove spurious return","message":"Remove spurious return\n","repos":"Distrotech\/sox,MageSlayer\/sox,uklauer\/sox,CaptainHayashi\/sox,cbagwell\/sox,MageSlayer\/sox,MageSlayer\/sox,uklauer\/sox,jacksonh\/sox,uklauer\/sox,MageSlayer\/sox,Distrotech\/sox,pcqpcq\/sox,pcqpcq\/sox,cbagwell\/sox,davel\/sox,uklauer\/sox,CaptainHayashi\/sox,MageSlayer\/sox,mhartzel\/sox_personal_fork,mhartzel\/sox_personal_fork,jacksonh\/sox,Distrotech\/sox,pcqpcq\/sox,Motiejus\/sox,pcqpcq\/sox,mhartzel\/sox_personal_fork,cbagwell\/sox,davel\/sox,mhartzel\/sox_personal_fork,davel\/sox,Motiejus\/sox,Motiejus\/sox,davel\/sox,cbagwell\/sox,jacksonh\/sox,Motiejus\/sox,CaptainHayashi\/sox,jacksonh\/sox,CaptainHayashi\/sox,Distrotech\/sox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/btrworth.c\n+++ src\/btrworth.c\n@@ -71,7 +71,6 @@\n , butterworth->b[0]\n , butterworth->b[1]\n );\n- return ST_EOF;\n }\n }\n \n"} {"commit":"195b62d89fa85440a7589bf3719138d1cd9a2da5","subject":"handle signals in the system call and return the correct exit status","message":"handle signals in the system call and return the correct exit status\n","repos":"timoc\/colm,timoc\/colm,timoc\/colm,timoc\/colm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bytecode.c\n+++ src\/bytecode.c\n@@ -3386,12 +3386,16 @@\n \t\t\tmemcpy( cmd0, cmd->value->data, cmd->value->length );\n \t\t\tcmd0[cmd->value->length] = 0;\n \n-\t\t\tint r = system( cmd0 );\n+\t\t\tint res = system( cmd0 );\n+\n+\t\t\tif ( WIFSIGNALED( res ) )\n+\t\t\t\traise( WTERMSIG( res ) );\n+\t\t\tres = WEXITSTATUS( res );\n \n \t\t\ttreeDownref( prg, sp, (Tree*)cmd );\n \n-\t\t\tValue result = r;\n-\t\t\tvm_push_value( result );\n+\t\t\tValue val = res;\n+\t\t\tvm_push_value( val );\n \t\t\tbreak;\n \t\t}\n \n"} {"commit":"60335d427cf37d947f81f0686f08c1810262893e","subject":"Rename {upval} -> {upvar}.","message":"Rename {upval} -> {upvar}.\n","repos":"kwiskia\/chinnu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bytecode.h\n+++ src\/bytecode.h\n@@ -43,8 +43,8 @@\n \n typedef enum {\n OP_MOVE, \/\/ R(A) := RK(B)\n- OP_GETUPVAL, \/\/ R(A) := UpValue[B]\n- OP_SETUPVAL, \/\/ UpValue[B] := R(A)\n+ OP_GETUPVAR, \/\/ R(A) := UpVar[B]\n+ OP_SETUPVAR, \/\/ UpVar[B] := R(A)\n \n OP_ADD, \/\/ R(A) := RK(B) + RK(C)\n OP_SUB, \/\/ R(A) := RK(B) - RK(C)\n"} {"commit":"0aea7f1c99dc88533df56126378a9b19bb5533a8","subject":"Fix identation.","message":"Fix identation.\n\nSigned-off-by: Fernando J. Pereda \n","repos":"fpereda\/lsys,fpereda\/lsys","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lsysutil\/test\/stack-simple.c\n+++ lsysutil\/test\/stack-simple.c\n@@ -48,7 +48,7 @@\n \n void run_test(void)\n {\n- stack *s = stack_alloc_init(NULL);\n+\tstack *s = stack_alloc_init(NULL);\n \tCTME_CHECK(stack_empty(s));\n \tCTME_CHECK_EQUAL(stack_peek(s), NULL);\n \tstack_destroy(s);\n"} {"commit":"bca28b1456987f65c9dee9ee472e003becf35661","subject":"Off-by-one on warning","message":"Off-by-one on warning\n","repos":"8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/fold.c\n+++ src\/cc1\/fold.c\n@@ -117,7 +117,7 @@\n \t\t\t\t\tchar buf[DECL_STATIC_BUFSIZ];\n \t\t\t\t\tstrcpy(buf, decl_to_str(iter_arg[i]->tree_type));\n \t\t\t\t\twarn_at(&e->where, \"mismatching arguments for arg %d to %s: got %s, expected %s\",\n-\t\t\t\t\t\t\ti, df->spel, buf, decl_to_str(iter_decl[i]));\n+\t\t\t\t\t\t\ti + 1, df->spel, buf, decl_to_str(iter_decl[i]));\n \t\t\t\t}\n \t\t\t}\n \t\t}\n"} {"commit":"5dc80c7e7bdd79fb06223f14751b3e5d63103c80","subject":"Fixed static decl inits not being folded and implicit func-calling","message":"Fixed static decl inits not being folded and implicit func-calling\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/fold.c\n+++ src\/cc1\/fold.c\n@@ -42,10 +42,13 @@\n \tconst int count_b = dynarray_count((void **)args_b->arglist);\n \tint i;\n \n-\tif(!(check_vari && args_a->variadic ? count_a <= count_b : count_a == count_b)){\n+\tif(count_a == 0 && !args_a->args_void){\n+\t\t\/* a() *\/\n+\t}else if(!(check_vari && args_a->variadic ? count_a <= count_b : count_a == count_b)){\n \t\tchar wbuf[WHERE_BUF_SIZ];\n \t\tstrcpy(wbuf, where_str(&args_a->where));\n-\t\tdie_at(w, \"mismatching argument counts for function %s (%s)\", func_spel, wbuf);\n+\t\tdie_at(w, \"mismatching argument counts (%d vs %d) for %s (%s)\",\n+\t\t\t\tcount_a, count_b, func_spel, wbuf);\n \t}\n \n \tif(!count_a)\n@@ -194,6 +197,16 @@\n \t\t\tbreak;\n \t}\n \n+\tif(d->init){\n+\t\tif(d->type->store == store_extern)\n+\t\t\tdie_at(&d->where, \"error: externs can't be initalised\");\n+\n+\t\tif(d->type->store == store_static)\n+\t\t\tfold_expr(d->init, stab); \/* else it's done as part of the stmt code *\/\n+\n+\t\tif(!stab->parent && const_fold(d->init)) \/* global + not constant *\/\n+\t\t\tdie_at(&d->init->where, \"error: not a constant expression (initialiser is %s)\", d->init->f_str());\n+\t}\n \n \tif(d->funcargs)\n \t\tfold_funcargs(d->funcargs, stab, d->spel);\n@@ -211,17 +224,7 @@\n \n void fold_decl_global(decl *d, symtable *stab)\n {\n-\tif(d->init){\n-\t\tif(d->type->store == store_extern)\n-\t\t\t\/* only need this check for globals, since block-decls aren't initalised *\/\n-\t\t\tdie_at(&d->where, \"externs can't be initalised\");\n-\n-\t\tfold_expr(d->init, stab);\n-\n-\t\tif(const_fold(d->init))\n-\t\t\tdie_at(&d->init->where, \"not a constant expression (initialiser is %s)\", d->init->f_str());\n-\n-\t}else if(d->type->store == store_extern){\n+\tif(d->type->store == store_extern){\n \t\t\/* we have an extern, check if it's overridden *\/\n \t\tchar *const spel = d->spel;\n \t\tdecl **dit;\n"} {"commit":"ebb2d4a798807b5940095394afc6492a875ab2fa","subject":"Move VLA_* enums out of struct type","message":"Move VLA_* enums out of struct type\n\nThis avoids a gcc (bogus) warning.\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/type.h\n+++ src\/cc1\/type.h\n@@ -5,6 +5,11 @@\n #include \"btype.h\"\n \n typedef struct type type;\n+\n+enum\n+{\n+\tVLA = 1, VLA_STAR = 2\n+};\n \n struct type\n {\n@@ -51,10 +56,6 @@\n \t\t{\n \t\t\tunsigned is_static : 1;\n \t\t\tunsigned is_vla : 2;\n-\t\t\tenum\n-\t\t\t{\n-\t\t\t\tVLA = 1, VLA_STAR = 2\n-\t\t\t};\n \t\t\tstruct expr *size;\n \t\t\t\/* when we decay\n \t\t\t * f(int x[2]) -> f(int *x)\n"} {"commit":"51595f1f496ef99ccbe325f1984f46575fd46ea8","subject":"CCL: fix spell error in message","message":"CCL: fix spell error in message\n","repos":"nla\/yaz,nla\/yaz,nla\/yaz,nla\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cclerrms.c\n+++ src\/cclerrms.c\n@@ -30,7 +30,7 @@\n \"Both left - and right truncation not supported\",\n \"Right truncation not supported\",\n \"Embedded truncation not supported\",\n- \"Single charcacter mask not supported\"\n+ \"Single character mask not supported\"\n };\n \n const char *ccl_err_msg(int ccl_errno)\n"} {"commit":"fb8f2cd11b938f0b1fe660df7630c0eee47b27ff","subject":"channels: Fix ssh_channel_from_local()","message":"channels: Fix ssh_channel_from_local()\n\nIt only worked if the first channel in the list was equivalent to we\nwere looking for.\n(cherry picked from commit 39f962c91eb4575a65edc7d984ce3f1a699097b8)\n","repos":"mwgoldsmith\/libssh,mwgoldsmith\/libssh,mwgoldsmith\/ssh,mwgoldsmith\/libssh,mwgoldsmith\/ssh,mwgoldsmith\/ssh,mwgoldsmith\/ssh,mwgoldsmith\/libssh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/channels.c\n+++ src\/channels.c\n@@ -300,24 +300,25 @@\n return err;\n }\n \n-\/* get ssh channel from local session? *\/\n+\/* return channel with corresponding local id, or NULL if not found *\/\n ssh_channel ssh_channel_from_local(ssh_session session, uint32_t id) {\n- ssh_channel initchan = session->channels;\n- ssh_channel channel;\n-\n- \/* We assume we are always the local *\/\n- if (initchan == NULL) {\n+ ssh_channel initchan = session->channels;\n+ ssh_channel channel = initchan;\n+\n+ for (;;) {\n+ if (channel == NULL) {\n+ return NULL;\n+ }\n+ if (channel->local_channel == id) {\n+ return channel;\n+ }\n+ if (channel->next == initchan) {\n+ return NULL;\n+ }\n+ channel = channel->next;\n+ }\n+\n return NULL;\n- }\n-\n- for (channel = initchan; channel->local_channel != id;\n- channel=channel->next) {\n- if (channel->next == initchan) {\n- return NULL;\n- }\n- }\n-\n- return channel;\n }\n \n \/**\n"} {"commit":"506e11fa8b10ad275824303959b92924b0355922","subject":"buffers: adapt channels.c to ssh_buffer_(un)pack()","message":"buffers: adapt channels.c to ssh_buffer_(un)pack()\n\nReviewed-by: Andreas Schneider <5be00ddc76278cf6077f5047ca3384a88460c671@samba.org>\n","repos":"wangshawn\/libssh,mwgoldsmith\/ssh,sebadoom\/libssh,kedazo\/libssh,DouglasHeriot\/libssh,sebadoom\/libssh,nviennot\/libssh,DouglasHeriot\/libssh,DouglasHeriot\/libssh,Distrotech\/libssh,robxu9\/libssh,sebadoom\/libssh,taikoo\/libssh,nviennot\/libssh,robxu9\/libssh,pouete\/libssh,nviennot\/libssh,mwgoldsmith\/ssh,pouete\/libssh,mwgoldsmith\/libssh,robxu9\/libssh,robxu9\/libssh,mwgoldsmith\/ssh,Distrotech\/libssh,kedazo\/libssh,kedazo\/libssh,pouete\/libssh,Distrotech\/libssh,pouete\/libssh,wangshawn\/libssh,taikoo\/libssh,sebadoom\/libssh,kedazo\/libssh,mwgoldsmith\/libssh,wangshawn\/libssh,mwgoldsmith\/ssh,nviennot\/libssh,Distrotech\/libssh,mwgoldsmith\/libssh,taikoo\/libssh,DouglasHeriot\/libssh,mwgoldsmith\/libssh,taikoo\/libssh,wangshawn\/libssh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/channels.c\n+++ src\/channels.c\n@@ -139,15 +139,16 @@\n *\/\n SSH_PACKET_CALLBACK(ssh_packet_channel_open_conf){\n uint32_t channelid=0;\n- uint32_t tmp;\n ssh_channel channel;\n+ int rc;\n (void)type;\n (void)user;\n \n SSH_LOG(SSH_LOG_PACKET,\"Received SSH2_MSG_CHANNEL_OPEN_CONFIRMATION\");\n \n- buffer_get_u32(packet, &channelid);\n- channelid=ntohl(channelid);\n+ rc = ssh_buffer_unpack(packet, \"d\", &channelid);\n+ if (rc != SSH_OK)\n+ goto error;\n channel=ssh_channel_from_local(session,channelid);\n if(channel==NULL){\n ssh_set_error(session, SSH_FATAL,\n@@ -158,14 +159,12 @@\n return SSH_PACKET_USED;\n }\n \n- buffer_get_u32(packet, &tmp);\n- channel->remote_channel = ntohl(tmp);\n-\n- buffer_get_u32(packet, &tmp);\n- channel->remote_window = ntohl(tmp);\n-\n- buffer_get_u32(packet,&tmp);\n- channel->remote_maxpacket=ntohl(tmp);\n+ rc = ssh_buffer_unpack(packet, \"ddd\",\n+ &channel->remote_channel,\n+ &channel->remote_window,\n+ &channel->remote_maxpacket);\n+ if (rc != SSH_OK)\n+ goto error;\n \n SSH_LOG(SSH_LOG_PROTOCOL,\n \"Received a CHANNEL_OPEN_CONFIRMATION for channel %d:%d\",\n@@ -178,8 +177,11 @@\n \n channel->state = SSH_CHANNEL_STATE_OPEN;\n channel->flags &= ~SSH_CHANNEL_FLAG_NOT_BOUND;\n-\n return SSH_PACKET_USED;\n+\n+error:\n+ ssh_set_error(session, SSH_FATAL, \"Invalid packet\");\n+ return SSH_PACKET_USED;\n }\n \n \/**\n@@ -190,31 +192,28 @@\n SSH_PACKET_CALLBACK(ssh_packet_channel_open_fail){\n \n ssh_channel channel;\n- ssh_string error_s;\n char *error = NULL;\n uint32_t code;\n+ int rc;\n (void)user;\n (void)type;\n+\n channel=channel_from_msg(session,packet);\n if(channel==NULL){\n SSH_LOG(SSH_LOG_RARE,\"Invalid channel in packet\");\n return SSH_PACKET_USED;\n }\n- buffer_get_u32(packet, &code);\n-\n- error_s = buffer_get_ssh_string(packet);\n- if(error_s != NULL)\n- error = ssh_string_to_char(error_s);\n- ssh_string_free(error_s);\n- if (error == NULL) {\n- ssh_set_error_oom(session);\n- return SSH_PACKET_USED;\n+\n+ rc = ssh_buffer_unpack(packet, \"ds\", &code, &error);\n+ if (rc != SSH_OK){\n+ ssh_set_error(session, SSH_FATAL, \"Invalid packet\");\n+ return SSH_PACKET_USED;\n }\n \n ssh_set_error(session, SSH_REQUEST_DENIED,\n \"Channel opening failure: channel %u error (%lu) %s\",\n channel->local_channel,\n- (long unsigned int) ntohl(code),\n+ (long unsigned int) code,\n error);\n SAFE_FREE(error);\n channel->state=SSH_CHANNEL_STATE_OPEN_DENIED;\n@@ -238,7 +237,7 @@\n *\n * @param[in] channel The current channel.\n *\n- * @param[in] type_c A C string describing the kind of channel (e.g. \"exec\").\n+ * @param[in] type A C string describing the kind of channel (e.g. \"exec\").\n *\n * @param[in] window The receiving window of the channel. The window is the\n * maximum size of data that can stay in buffers and\n@@ -248,11 +247,11 @@\n *\n * @param[in] payload The buffer containing additional payload for the query.\n *\/\n-static int channel_open(ssh_channel channel, const char *type_c, int window,\n+static int channel_open(ssh_channel channel, const char *type, int window,\n int maxpacket, ssh_buffer payload) {\n ssh_session session = channel->session;\n- ssh_string type = NULL;\n int err=SSH_ERROR;\n+ int rc;\n \n switch(channel->state){\n case SSH_CHANNEL_STATE_NOT_OPEN:\n@@ -274,25 +273,17 @@\n \"Creating a channel %d with %d window and %d max packet\",\n channel->local_channel, window, maxpacket);\n \n- type = ssh_string_from_char(type_c);\n- if (type == NULL) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bsddd\",\n+ SSH2_MSG_CHANNEL_OPEN,\n+ type,\n+ channel->local_channel,\n+ channel->local_window,\n+ channel->local_maxpacket);\n+ if (rc != SSH_OK){\n ssh_set_error_oom(session);\n-\n return err;\n }\n-\n- if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_OPEN) < 0 ||\n- buffer_add_ssh_string(session->out_buffer,type) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->local_channel)) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->local_window)) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->local_maxpacket)) < 0) {\n- ssh_set_error_oom(session);\n- ssh_string_free(type);\n-\n- return err;\n- }\n-\n- ssh_string_free(type);\n \n if (payload != NULL) {\n if (buffer_add_buffer(session->out_buffer, payload) < 0) {\n@@ -309,7 +300,7 @@\n \n SSH_LOG(SSH_LOG_PACKET,\n \"Sent a SSH_MSG_CHANNEL_OPEN type %s for channel %d\",\n- type_c, channel->local_channel);\n+ type, channel->local_channel);\n pending:\n \/* wait until channel is opened by server *\/\n err = ssh_handle_packets_termination(session,\n@@ -353,6 +344,7 @@\n *\/\n static int grow_window(ssh_session session, ssh_channel channel, int minimumsize) {\n uint32_t new_window = minimumsize > WINDOWBASE ? minimumsize : WINDOWBASE;\n+ int rc;\n \n #ifdef WITH_SSH1\n if (session->version == 1){\n@@ -372,9 +364,12 @@\n \/* WINDOW_ADJUST packet needs a relative increment rather than an absolute\n * value, so we give here the missing bytes needed to reach new_window\n *\/\n- if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_WINDOW_ADJUST) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->remote_channel)) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(new_window - channel->local_window)) < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bdd\",\n+ SSH2_MSG_CHANNEL_WINDOW_ADJUST,\n+ channel->remote_channel,\n+ new_window - channel->local_window);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -416,22 +411,24 @@\n static ssh_channel channel_from_msg(ssh_session session, ssh_buffer packet) {\n ssh_channel channel;\n uint32_t chan;\n+ int rc;\n #ifdef WITH_SSH1\n \/* With SSH1, the channel is always the first one *\/\n if(session->version==1)\n return ssh_get_channel1(session);\n #endif\n- if (buffer_get_u32(packet, &chan) != sizeof(uint32_t)) {\n+ rc = ssh_buffer_unpack(packet,\"d\",&chan);\n+ if (rc != SSH_OK) {\n ssh_set_error(session, SSH_FATAL,\n \"Getting channel from message: short read\");\n return NULL;\n }\n \n- channel = ssh_channel_from_local(session, ntohl(chan));\n+ channel = ssh_channel_from_local(session, chan);\n if (channel == NULL) {\n ssh_set_error(session, SSH_FATAL,\n \"Server specified invalid channel %lu\",\n- (long unsigned int) ntohl(chan));\n+ (long unsigned int) chan);\n }\n \n return channel;\n@@ -449,15 +446,14 @@\n SSH_LOG(SSH_LOG_FUNCTIONS, \"%s\", ssh_get_error(session));\n }\n \n- rc = buffer_get_u32(packet, &bytes);\n- if (channel == NULL || rc != sizeof(uint32_t)) {\n+ rc = ssh_buffer_unpack(packet, \"d\", &bytes);\n+ if (channel == NULL || rc != SSH_OK) {\n SSH_LOG(SSH_LOG_PACKET,\n \"Error getting a window adjust message: invalid packet\");\n \n return SSH_PACKET_USED;\n }\n \n- bytes = ntohl(bytes);\n SSH_LOG(SSH_LOG_PROTOCOL,\n \"Adding %d bytes to channel (%d:%d) (from %d bytes)\",\n bytes,\n@@ -647,8 +643,7 @@\n \n SSH_PACKET_CALLBACK(channel_rcv_request) {\n \tssh_channel channel;\n-\tssh_string request_s;\n-\tchar *request;\n+\tchar *request=NULL;\n uint8_t status;\n int rc;\n \t(void)user;\n@@ -657,32 +652,22 @@\n \tchannel = channel_from_msg(session,packet);\n \tif (channel == NULL) {\n \t\tSSH_LOG(SSH_LOG_FUNCTIONS,\"%s\", ssh_get_error(session));\n-\n \t\treturn SSH_PACKET_USED;\n \t}\n \n-\trequest_s = buffer_get_ssh_string(packet);\n-\tif (request_s == NULL) {\n+\trc = ssh_buffer_unpack(packet, \"sb\",\n+\t &request,\n+\t &status);\n+\tif (rc != SSH_OK) {\n \t\tSSH_LOG(SSH_LOG_PACKET, \"Invalid MSG_CHANNEL_REQUEST\");\n-\n \t\treturn SSH_PACKET_USED;\n \t}\n \n-\trequest = ssh_string_to_char(request_s);\n-\tssh_string_free(request_s);\n-\tif (request == NULL) {\n-\n-\t\treturn SSH_PACKET_USED;\n-\t}\n-\n-\tbuffer_get_u8(packet, (uint8_t *) &status);\n-\n \tif (strcmp(request,\"exit-status\") == 0) {\n uint32_t exit_status = 0;\n \n \t\tSAFE_FREE(request);\n- buffer_get_u32(packet, &exit_status);\n- channel->exit_status = ntohl(exit_status);\n+ rc = ssh_buffer_unpack(packet, \"d\", &exit_status);\n \t\tSSH_LOG(SSH_LOG_PACKET, \"received exit-status %d\", channel->exit_status);\n \n if(ssh_callbacks_exists(channel->callbacks, channel_exit_status_function)) {\n@@ -696,26 +681,16 @@\n \t}\n \n \tif (strcmp(request,\"signal\") == 0) {\n-\t\tssh_string signal_str;\n- char *sig;\n+ char *sig = NULL;\n \n \t\tSAFE_FREE(request);\n \t\tSSH_LOG(SSH_LOG_PACKET, \"received signal\");\n \n-\t\tsignal_str = buffer_get_ssh_string(packet);\n-\t\tif (signal_str == NULL) {\n+\t\trc = ssh_buffer_unpack(packet, \"s\", &sig);\n+\t\tif (rc != SSH_OK) {\n \t\t\tSSH_LOG(SSH_LOG_PACKET, \"Invalid MSG_CHANNEL_REQUEST\");\n-\n \t\t\treturn SSH_PACKET_USED;\n \t\t}\n-\n-\t\tsig = ssh_string_to_char(signal_str);\n-\t\tssh_string_free(signal_str);\n-\t\tif (sig == NULL) {\n-\n-\t\t\treturn SSH_PACKET_USED;\n-\t\t}\n-\n \n \t\tSSH_LOG(SSH_LOG_PACKET,\n \t\t\t\t\"Remote connection sent a signal SIG %s\", sig);\n@@ -732,65 +707,25 @@\n \n \tif (strcmp(request, \"exit-signal\") == 0) {\n \t\tconst char *core = \"(core dumped)\";\n-\t\tssh_string tmp;\n-\t\tchar *sig;\n+\t\tchar *sig = NULL;\n \t\tchar *errmsg = NULL;\n \t\tchar *lang = NULL;\n-\t\tuint8_t i;\n+\t\tuint8_t core_dumped;\n \n \t\tSAFE_FREE(request);\n \n-\t\ttmp = buffer_get_ssh_string(packet);\n-\t\tif (tmp == NULL) {\n+\t\trc = ssh_buffer_unpack(packet, \"sbs\",\n+\t\t &sig, \/* signal name *\/\n+\t\t &core_dumped, \/* core dumped *\/\n+\t\t &errmsg, \/* error message *\/\n+\t\t &lang);\n+\t\tif (rc != SSH_OK) {\n \t\t\tSSH_LOG(SSH_LOG_PACKET, \"Invalid MSG_CHANNEL_REQUEST\");\n-\n \t\t\treturn SSH_PACKET_USED;\n \t\t}\n \n-\t\tsig = ssh_string_to_char(tmp);\n-\t\tssh_string_free(tmp);\n-\t\tif (sig == NULL) {\n-\n-\t\t\treturn SSH_PACKET_USED;\n-\t\t}\n-\n-\t\tbuffer_get_u8(packet, &i);\n-\t\tif (i == 0) {\n+\t\tif (core_dumped == 0) {\n \t\t\tcore = \"\";\n-\t\t}\n-\n-\t\ttmp = buffer_get_ssh_string(packet);\n-\t\tif (tmp == NULL) {\n-\t\t\tSSH_LOG(SSH_LOG_PACKET, \"Invalid MSG_CHANNEL_REQUEST\");\n- SAFE_FREE(sig);\n-\n-\t\t\treturn SSH_PACKET_USED;\n-\t\t}\n-\n-\t\terrmsg = ssh_string_to_char(tmp);\n-\t\tssh_string_free(tmp);\n-\t\tif (errmsg == NULL) {\n- SAFE_FREE(sig);\n-\n-\t\t\treturn SSH_PACKET_USED;\n-\t\t}\n-\n-\t\ttmp = buffer_get_ssh_string(packet);\n-\t\tif (tmp == NULL) {\n-\t\t\tSSH_LOG(SSH_LOG_PACKET, \"Invalid MSG_CHANNEL_REQUEST\");\n- SAFE_FREE(errmsg);\n- SAFE_FREE(sig);\n-\n-\t\t\treturn SSH_PACKET_USED;\n-\t\t}\n-\n-\t\tlang = ssh_string_to_char(tmp);\n-\t\tssh_string_free(tmp);\n-\t\tif (lang == NULL) {\n- SAFE_FREE(errmsg);\n- SAFE_FREE(sig);\n-\n-\t\t\treturn SSH_PACKET_USED;\n \t\t}\n \n \t\tSSH_LOG(SSH_LOG_PACKET,\n@@ -798,7 +733,7 @@\n if(ssh_callbacks_exists(channel->callbacks, channel_exit_signal_function)) {\n channel->callbacks->channel_exit_signal_function(channel->session,\n channel,\n- sig, i, errmsg, lang,\n+ sig, core_dumped, errmsg, lang,\n channel->callbacks->userdata);\n }\n \n@@ -811,12 +746,12 @@\n \tif(strcmp(request,\"keepalive@openssh.com\")==0){\n \t SAFE_FREE(request);\n \t SSH_LOG(SSH_LOG_PROTOCOL,\"Responding to Openssh's keepalive\");\n-\t rc = buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_FAILURE);\n- if (rc < 0) {\n- return SSH_PACKET_USED;\n- }\n- rc = buffer_add_u32(session->out_buffer, htonl(channel->remote_channel));\n- if (rc < 0) {\n+\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bd\",\n+ SSH2_MSG_CHANNEL_FAILURE,\n+ channel->remote_channel);\n+ if (rc != SSH_OK) {\n return SSH_PACKET_USED;\n }\n \t packet_send(session);\n@@ -1024,27 +959,14 @@\n ssh_set_error_oom(session);\n goto error;\n }\n- str = ssh_string_from_char(remotehost);\n- if (str == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(payload, str) < 0 ||\n- buffer_add_u32(payload,htonl(remoteport)) < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- ssh_string_free(str);\n- str = ssh_string_from_char(sourcehost);\n- if (str == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(payload, str) < 0 ||\n- buffer_add_u32(payload,htonl(localport)) < 0) {\n+\n+ rc = ssh_buffer_pack(payload,\n+ \"sdsd\",\n+ remotehost,\n+ remoteport,\n+ sourcehost,\n+ localport);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -1145,6 +1067,7 @@\n int ssh_channel_send_eof(ssh_channel channel){\n ssh_session session;\n int rc = SSH_ERROR;\n+ int err;\n \n if(channel == NULL) {\n return rc;\n@@ -1152,14 +1075,15 @@\n \n session = channel->session;\n \n- if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_EOF) < 0) {\n+ err = ssh_buffer_pack(session->out_buffer,\n+ \"bd\",\n+ SSH2_MSG_CHANNEL_EOF,\n+ channel->remote_channel);\n+ if (err != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n- if (buffer_add_u32(session->out_buffer,htonl(channel->remote_channel)) < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n+\n rc = packet_send(session);\n SSH_LOG(SSH_LOG_PACKET,\n \"Sent a EOF on client channel (%d:%d)\",\n@@ -1210,8 +1134,11 @@\n return rc;\n }\n \n- if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_CLOSE) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->remote_channel)) < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bd\",\n+ SSH2_MSG_CHANNEL_CLOSE,\n+ channel->remote_channel);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -1363,39 +1290,32 @@\n \n effectivelen = MIN(effectivelen, maxpacketlen);;\n \n- rc = buffer_add_u8(session->out_buffer,\n- is_stderr ? SSH2_MSG_CHANNEL_EXTENDED_DATA\n- : SSH2_MSG_CHANNEL_DATA);\n- if (rc < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bd\",\n+ is_stderr ? SSH2_MSG_CHANNEL_EXTENDED_DATA : SSH2_MSG_CHANNEL_DATA,\n+ channel->remote_channel);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n \n- rc = buffer_add_u32(session->out_buffer, htonl(channel->remote_channel));\n- if (rc < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n \/* stderr message has an extra field *\/\n if (is_stderr) {\n- rc = buffer_add_u32(session->out_buffer,\n- htonl(SSH2_EXTENDED_DATA_STDERR));\n- if (rc < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"d\",\n+ SSH2_EXTENDED_DATA_STDERR);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n }\n \n \/* append payload data *\/\n- rc = buffer_add_u32(session->out_buffer, htonl(effectivelen));\n- if (rc < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- rc = ssh_buffer_add_data(session->out_buffer, data, effectivelen);\n- if (rc < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"dP\",\n+ effectivelen,\n+ (size_t)effectivelen, data);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -1600,8 +1520,8 @@\n static int channel_request(ssh_channel channel, const char *request,\n ssh_buffer buffer, int reply) {\n ssh_session session = channel->session;\n- ssh_string req = NULL;\n int rc = SSH_ERROR;\n+ int ret;\n \n switch(channel->request_state){\n case SSH_CHANNEL_REQ_STATE_NONE:\n@@ -1610,21 +1530,16 @@\n goto pending;\n }\n \n- req = ssh_string_from_char(request);\n- if (req == NULL) {\n+ ret = ssh_buffer_pack(session->out_buffer,\n+ \"bdsb\",\n+ SSH2_MSG_CHANNEL_REQUEST,\n+ channel->remote_channel,\n+ request,\n+ reply == 0 ? 0 : 1);\n+ if (ret != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n-\n- if (buffer_add_u8(session->out_buffer, SSH2_MSG_CHANNEL_REQUEST) < 0 ||\n- buffer_add_u32(session->out_buffer, htonl(channel->remote_channel)) < 0 ||\n- buffer_add_ssh_string(session->out_buffer, req) < 0 ||\n- buffer_add_u8(session->out_buffer, reply == 0 ? 0 : 1) < 0) {\n- ssh_set_error_oom(session);\n- ssh_string_free(req);\n- goto error;\n- }\n- ssh_string_free(req);\n \n if (buffer != NULL) {\n if (ssh_buffer_add_data(session->out_buffer, buffer_get_rest(buffer),\n@@ -1705,7 +1620,6 @@\n int ssh_channel_request_pty_size(ssh_channel channel, const char *terminal,\n int col, int row) {\n ssh_session session;\n- ssh_string term = NULL;\n ssh_buffer buffer = NULL;\n int rc = SSH_ERROR;\n \n@@ -1739,19 +1653,17 @@\n goto error;\n }\n \n- term = ssh_string_from_char(terminal);\n- if (term == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, term) < 0 ||\n- buffer_add_u32(buffer, htonl(col)) < 0 ||\n- buffer_add_u32(buffer, htonl(row)) < 0 ||\n- buffer_add_u32(buffer, 0) < 0 ||\n- buffer_add_u32(buffer, 0) < 0 ||\n- buffer_add_u32(buffer, htonl(1)) < 0 || \/* Add a 0byte string *\/\n- buffer_add_u8(buffer, 0) < 0) {\n+ rc = ssh_buffer_pack(buffer,\n+ \"sdddddb\",\n+ terminal,\n+ col,\n+ row,\n+ 0, \/* pix *\/\n+ 0, \/* pix *\/\n+ 1, \/* add a 0byte string *\/\n+ 0);\n+\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -1759,7 +1671,6 @@\n rc = channel_request(channel, \"pty-req\", buffer, 1);\n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(term);\n \n return rc;\n }\n@@ -1814,10 +1725,13 @@\n goto error;\n }\n \n- if (buffer_add_u32(buffer, htonl(cols)) < 0 ||\n- buffer_add_u32(buffer, htonl(rows)) < 0 ||\n- buffer_add_u32(buffer, 0) < 0 ||\n- buffer_add_u32(buffer, 0) < 0) {\n+ rc = ssh_buffer_pack(buffer,\n+ \"dddd\",\n+ cols,\n+ rows,\n+ 0, \/* pix *\/\n+ 0 \/* pix *\/);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -1867,7 +1781,6 @@\n *\/\n int ssh_channel_request_subsystem(ssh_channel channel, const char *subsys) {\n ssh_buffer buffer = NULL;\n- ssh_string subsystem = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -1890,13 +1803,8 @@\n goto error;\n }\n \n- subsystem = ssh_string_from_char(subsys);\n- if (subsystem == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, subsystem) < 0) {\n+ rc = ssh_buffer_pack(buffer, \"s\", subsys);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -1904,7 +1812,6 @@\n rc = channel_request(channel, \"subsystem\", buffer, 1);\n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(subsystem);\n \n return rc;\n }\n@@ -1916,7 +1823,7 @@\n return ssh_channel_request_subsystem(channel, \"sftp\");\n }\n \n-static ssh_string generate_cookie(void) {\n+static char *generate_cookie(void) {\n static const char *hex = \"0123456789abcdef\";\n char s[36];\n unsigned char rnd[16];\n@@ -1928,7 +1835,7 @@\n s[i*2+1] = hex[rnd[i] >> 4];\n }\n s[32] = '\\0';\n- return ssh_string_from_char(s);\n+ return strdup(s);\n }\n \n \/**\n@@ -1959,8 +1866,7 @@\n int ssh_channel_request_x11(ssh_channel channel, int single_connection, const char *protocol,\n const char *cookie, int screen_number) {\n ssh_buffer buffer = NULL;\n- ssh_string p = NULL;\n- ssh_string c = NULL;\n+ char *c = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -1979,36 +1885,32 @@\n goto error;\n }\n \n- p = ssh_string_from_char(protocol ? protocol : \"MIT-MAGIC-COOKIE-1\");\n- if (p == NULL) {\n+ if (cookie == NULL) {\n+ c = generate_cookie();\n+ if (c == NULL) {\n+ ssh_set_error_oom(channel->session);\n+ goto error;\n+ }\n+ }\n+\n+ rc = ssh_buffer_pack(buffer,\n+ \"bssd\",\n+ single_connection == 0 ? 0 : 1,\n+ protocol ? protocol : \"MIT-MAGIC-COOKIE-1\",\n+ cookie ? cookie : c,\n+ screen_number);\n+ if (c != NULL){\n+ SAFE_FREE(c);\n+ }\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n-\n- if (cookie) {\n- c = ssh_string_from_char(cookie);\n- } else {\n- c = generate_cookie();\n- }\n- if (c == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_u8(buffer, single_connection == 0 ? 0 : 1) < 0 ||\n- buffer_add_ssh_string(buffer, p) < 0 ||\n- buffer_add_ssh_string(buffer, c) < 0 ||\n- buffer_add_u32(buffer, htonl(screen_number)) < 0) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n pending:\n rc = channel_request(channel, \"x11-req\", buffer, 1);\n \n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(p);\n- ssh_string_free(c);\n return rc;\n }\n \n@@ -2158,7 +2060,6 @@\n *\/\n static int global_request(ssh_session session, const char *request,\n ssh_buffer buffer, int reply) {\n- ssh_string req = NULL;\n int rc;\n \n switch (session->global_req_state) {\n@@ -2168,28 +2069,12 @@\n goto pending;\n }\n \n- rc = buffer_add_u8(session->out_buffer, SSH2_MSG_GLOBAL_REQUEST);\n- if (rc < 0) {\n- goto error;\n- }\n-\n- req = ssh_string_from_char(request);\n- if (req == NULL) {\n- ssh_set_error_oom(session);\n- rc = SSH_ERROR;\n- goto error;\n- }\n-\n- rc = buffer_add_ssh_string(session->out_buffer, req);\n- ssh_string_free(req);\n- if (rc < 0) {\n- ssh_set_error_oom(session);\n- rc = SSH_ERROR;\n- goto error;\n- }\n-\n- rc = buffer_add_u8(session->out_buffer, reply == 0 ? 0 : 1);\n- if (rc < 0) {\n+ rc = ssh_buffer_pack(session->out_buffer,\n+ \"bsb\",\n+ SSH2_MSG_GLOBAL_REQUEST,\n+ request,\n+ reply == 0 ? 0 : 1);\n+ if (rc != SSH_OK){\n ssh_set_error_oom(session);\n rc = SSH_ERROR;\n goto error;\n@@ -2285,9 +2170,7 @@\n int *bound_port)\n {\n ssh_buffer buffer = NULL;\n- ssh_string addr = NULL;\n int rc = SSH_ERROR;\n- uint32_t tmp;\n \n if(session->global_req_state != SSH_CHANNEL_REQ_STATE_NONE)\n goto pending;\n@@ -2298,30 +2181,27 @@\n goto error;\n }\n \n- addr = ssh_string_from_char(address ? address : \"\");\n- if (addr == NULL) {\n+ rc = ssh_buffer_pack(buffer,\n+ \"sd\",\n+ address ? address : \"\",\n+ port);\n+ if (rc != SSH_OK){\n ssh_set_error_oom(session);\n goto error;\n }\n-\n- if (buffer_add_ssh_string(buffer, addr) < 0 ||\n- buffer_add_u32(buffer, htonl(port)) < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n pending:\n rc = global_request(session, \"tcpip-forward\", buffer, 1);\n \n \/* TODO: FIXME no guarantee the last packet we received contains\n * that info *\/\n- if (rc == SSH_OK && port == 0 && bound_port) {\n- buffer_get_u32(session->in_buffer, &tmp);\n- *bound_port = ntohl(tmp);\n+ if (rc == SSH_OK && port == 0 && bound_port != NULL) {\n+ rc = ssh_buffer_unpack(session->in_buffer, \"d\", bound_port);\n+ if (rc != SSH_OK)\n+ *bound_port = 0;\n }\n \n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(addr);\n return rc;\n }\n \n@@ -2366,7 +2246,6 @@\n int port)\n {\n ssh_buffer buffer = NULL;\n- ssh_string addr = NULL;\n int rc = SSH_ERROR;\n \n if(session->global_req_state != SSH_CHANNEL_REQ_STATE_NONE)\n@@ -2378,23 +2257,18 @@\n goto error;\n }\n \n- addr = ssh_string_from_char(address ? address : \"\");\n- if (addr == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, addr) < 0 ||\n- buffer_add_u32(buffer, htonl(port)) < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n+ rc = ssh_buffer_pack(buffer, \"sd\",\n+ address ? address : \"\",\n+ port);\n+ if (rc != SSH_OK){\n+ ssh_set_error_oom(session);\n+ goto error;\n }\n pending:\n rc = global_request(session, \"cancel-tcpip-forward\", buffer, 1);\n \n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(addr);\n return rc;\n }\n \n@@ -2419,7 +2293,6 @@\n *\/\n int ssh_channel_request_env(ssh_channel channel, const char *name, const char *value) {\n ssh_buffer buffer = NULL;\n- ssh_string str = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -2441,25 +2314,11 @@\n goto error;\n }\n \n- str = ssh_string_from_char(name);\n- if (str == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, str) < 0) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- ssh_string_free(str);\n- str = ssh_string_from_char(value);\n- if (str == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, str) < 0) {\n+ rc = ssh_buffer_pack(buffer,\n+ \"ss\",\n+ name,\n+ value);\n+ if (rc != SSH_OK){\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -2467,7 +2326,6 @@\n rc = channel_request(channel, \"env\", buffer,1);\n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(str);\n \n return rc;\n }\n@@ -2505,7 +2363,6 @@\n *\/\n int ssh_channel_request_exec(ssh_channel channel, const char *cmd) {\n ssh_buffer buffer = NULL;\n- ssh_string command = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -2533,13 +2390,9 @@\n goto error;\n }\n \n- command = ssh_string_from_char(cmd);\n- if (command == NULL) {\n- goto error;\n- ssh_set_error_oom(channel->session);\n- }\n-\n- if (buffer_add_ssh_string(buffer, command) < 0) {\n+ rc = ssh_buffer_pack(buffer, \"s\", cmd);\n+\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -2547,7 +2400,6 @@\n rc = channel_request(channel, \"exec\", buffer, 1);\n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(command);\n return rc;\n }\n \n@@ -2586,7 +2438,6 @@\n *\/\n int ssh_channel_request_send_signal(ssh_channel channel, const char *sig) {\n ssh_buffer buffer = NULL;\n- ssh_string encoded_signal = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -2609,13 +2460,8 @@\n goto error;\n }\n \n- encoded_signal = ssh_string_from_char(sig);\n- if (encoded_signal == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(buffer, encoded_signal) < 0) {\n+ rc = ssh_buffer_pack(buffer, \"s\", sig);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -2623,7 +2469,6 @@\n rc = channel_request(channel, \"signal\", buffer, 0);\n error:\n ssh_buffer_free(buffer);\n- ssh_string_free(encoded_signal);\n return rc;\n }\n \n@@ -3356,7 +3201,6 @@\n int remoteport, const char *sourcehost, int localport) {\n ssh_session session;\n ssh_buffer payload = NULL;\n- ssh_string str = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -3366,7 +3210,6 @@\n ssh_set_error_invalid(channel->session);\n return rc;\n }\n-\n \n session = channel->session;\n \n@@ -3377,27 +3220,13 @@\n ssh_set_error_oom(session);\n goto error;\n }\n- str = ssh_string_from_char(remotehost);\n- if (str == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(payload, str) < 0 ||\n- buffer_add_u32(payload,htonl(remoteport)) < 0) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- ssh_string_free(str);\n- str = ssh_string_from_char(sourcehost);\n- if (str == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(payload, str) < 0 ||\n- buffer_add_u32(payload,htonl(localport)) < 0) {\n+ rc = ssh_buffer_pack(payload,\n+ \"sdsd\",\n+ remotehost,\n+ remoteport,\n+ sourcehost,\n+ localport);\n+ if (rc != SSH_OK){\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -3410,7 +3239,6 @@\n \n error:\n ssh_buffer_free(payload);\n- ssh_string_free(str);\n \n return rc;\n }\n@@ -3433,10 +3261,9 @@\n * use channel_read and channel_write for this.\n *\/\n int ssh_channel_open_x11(ssh_channel channel, \n- const char *orig_addr, int orig_port) {\n+ const char *orig_addr, int orig_port) {\n ssh_session session;\n ssh_buffer payload = NULL;\n- ssh_string str = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -3457,14 +3284,11 @@\n goto error;\n }\n \n- str = ssh_string_from_char(orig_addr);\n- if (str == NULL) {\n- ssh_set_error_oom(session);\n- goto error;\n- }\n-\n- if (buffer_add_ssh_string(payload, str) < 0 ||\n- buffer_add_u32(payload,htonl(orig_port)) < 0) {\n+ rc = ssh_buffer_pack(payload,\n+ \"sd\",\n+ orig_addr,\n+ orig_port);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(session);\n goto error;\n }\n@@ -3477,7 +3301,6 @@\n \n error:\n ssh_buffer_free(payload);\n- ssh_string_free(str);\n \n return rc;\n }\n@@ -3516,7 +3339,8 @@\n goto error;\n }\n \n- if (buffer_add_u32(buffer, ntohl(exit_status)) < 0) {\n+ rc = ssh_buffer_pack(buffer, \"d\", exit_status);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -3549,7 +3373,6 @@\n int ssh_channel_request_send_exit_signal(ssh_channel channel, const char *sig,\n int core, const char *errmsg, const char *lang) {\n ssh_buffer buffer = NULL;\n- ssh_string tmp = NULL;\n int rc = SSH_ERROR;\n \n if(channel == NULL) {\n@@ -3571,39 +3394,13 @@\n goto error;\n }\n \n- tmp = ssh_string_from_char(sig);\n- if (tmp == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n- if (buffer_add_ssh_string(buffer, tmp) < 0) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- if (buffer_add_u8(buffer, core?1:0) < 0) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- ssh_string_free(tmp);\n- tmp = ssh_string_from_char(errmsg);\n- if (tmp == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n- if (buffer_add_ssh_string(buffer, tmp) < 0) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n-\n- ssh_string_free(tmp);\n- tmp = ssh_string_from_char(lang);\n- if (tmp == NULL) {\n- ssh_set_error_oom(channel->session);\n- goto error;\n- }\n- if (buffer_add_ssh_string(buffer, tmp) < 0) {\n+ rc = ssh_buffer_pack(buffer,\n+ \"sbss\",\n+ sig,\n+ core ? 1 : 0,\n+ errmsg,\n+ lang);\n+ if (rc != SSH_OK) {\n ssh_set_error_oom(channel->session);\n goto error;\n }\n@@ -3611,8 +3408,6 @@\n rc = channel_request(channel, \"exit-signal\", buffer, 0);\n error:\n ssh_buffer_free(buffer);\n- if(tmp)\n- ssh_string_free(tmp);\n return rc;\n }\n \n"} {"commit":"892abf93157ea576fc3f2ccac118045a6a47247c","subject":"checkout: allow workdir to contain checkout target","message":"checkout: allow workdir to contain checkout target\n\nWhen checking out some file 'foo' that has been modified in the\nworking directory, allow the checkout to proceed (do not conflict)\nif 'foo' is identical to the target of the checkout.\n","repos":"claudelee\/libgit2,sim0629\/libgit2,yosefhackmon\/libgit2,ardumont\/libgit2,magnus98\/TEST,sygool\/libgit2,JIghtuse\/libgit2,kenprice\/libgit2,falqas\/libgit2,yongthecoder\/libgit2,stewid\/libgit2,yongthecoder\/libgit2,dleehr\/libgit2,KTXSoftware\/libgit2,sygool\/libgit2,yongthecoder\/libgit2,kenprice\/libgit2,JIghtuse\/libgit2,jeffhostetler\/public_libgit2,Tousiph\/Demo1,MrHacky\/libgit2,mhp\/libgit2,t0xicCode\/libgit2,JIghtuse\/libgit2,kissthink\/libgit2,mrksrm\/Mingijura,mingyaaaa\/libgit2,saurabhsuniljain\/libgit2,iankronquist\/libgit2,JIghtuse\/libgit2,nokiddin\/libgit2,JIghtuse\/libgit2,spraints\/libgit2,spraints\/libgit2,spraints\/libgit2,iankronquist\/libgit2,JIghtuse\/libgit2,falqas\/libgit2,iankronquist\/libgit2,Corillian\/libgit2,mcanthony\/libgit2,magnus98\/TEST,falqas\/libgit2,stewid\/libgit2,mhp\/libgit2,sygool\/libgit2,mcanthony\/libgit2,kissthink\/libgit2,skabel\/manguse,mrksrm\/Mingijura,mhp\/libgit2,skabel\/manguse,Corillian\/libgit2,mhp\/libgit2,Corillian\/libgit2,spraints\/libgit2,claudelee\/libgit2,mcanthony\/libgit2,linquize\/libgit2,dleehr\/libgit2,nokiddin\/libgit2,KTXSoftware\/libgit2,t0xicCode\/libgit2,nokiddin\/libgit2,claudelee\/libgit2,falqas\/libgit2,kenprice\/libgit2,joshtriplett\/libgit2,jeffhostetler\/public_libgit2,MrHacky\/libgit2,linquize\/libgit2,t0xicCode\/libgit2,sim0629\/libgit2,leoyanggit\/libgit2,yosefhackmon\/libgit2,jeffhostetler\/public_libgit2,sim0629\/libgit2,mcanthony\/libgit2,mingyaaaa\/libgit2,mingyaaaa\/libgit2,joshtriplett\/libgit2,kissthink\/libgit2,mingyaaaa\/libgit2,saurabhsuniljain\/libgit2,mrksrm\/Mingijura,mingyaaaa\/libgit2,Tousiph\/Demo1,joshtriplett\/libgit2,Corillian\/libgit2,skabel\/manguse,oaastest\/libgit2,oaastest\/libgit2,Tousiph\/Demo1,claudelee\/libgit2,kenprice\/libgit2,t0xicCode\/libgit2,yosefhackmon\/libgit2,Tousiph\/Demo1,mrksrm\/Mingijura,MrHacky\/libgit2,skabel\/manguse,KTXSoftware\/libgit2,mingyaaaa\/libgit2,since2014\/libgit2,nokiddin\/libgit2,spraints\/libgit2,claudelee\/libgit2,since2014\/libgit2,skabel\/manguse,magnus98\/TEST,falqas\/libgit2,saurabhsuniljain\/libgit2,yosefhackmon\/libgit2,falqas\/libgit2,ardumont\/libgit2,saurabhsuniljain\/libgit2,Tousiph\/Demo1,KTXSoftware\/libgit2,linquize\/libgit2,ardumont\/libgit2,magnus98\/TEST,oaastest\/libgit2,kissthink\/libgit2,sim0629\/libgit2,sim0629\/libgit2,MrHacky\/libgit2,KTXSoftware\/libgit2,linquize\/libgit2,magnus98\/TEST,yosefhackmon\/libgit2,sim0629\/libgit2,stewid\/libgit2,mhp\/libgit2,yongthecoder\/libgit2,mcanthony\/libgit2,nokiddin\/libgit2,jeffhostetler\/public_libgit2,mhp\/libgit2,yongthecoder\/libgit2,ardumont\/libgit2,mcanthony\/libgit2,MrHacky\/libgit2,kenprice\/libgit2,dleehr\/libgit2,Corillian\/libgit2,stewid\/libgit2,KTXSoftware\/libgit2,dleehr\/libgit2,joshtriplett\/libgit2,iankronquist\/libgit2,linquize\/libgit2,jeffhostetler\/public_libgit2,Corillian\/libgit2,saurabhsuniljain\/libgit2,ardumont\/libgit2,yosefhackmon\/libgit2,mrksrm\/Mingijura,iankronquist\/libgit2,stewid\/libgit2,iankronquist\/libgit2,saurabhsuniljain\/libgit2,leoyanggit\/libgit2,ardumont\/libgit2,kenprice\/libgit2,since2014\/libgit2,kissthink\/libgit2,dleehr\/libgit2,MrHacky\/libgit2,mrksrm\/Mingijura,t0xicCode\/libgit2,joshtriplett\/libgit2,since2014\/libgit2,linquize\/libgit2,since2014\/libgit2,nokiddin\/libgit2,oaastest\/libgit2,oaastest\/libgit2,t0xicCode\/libgit2,yongthecoder\/libgit2,leoyanggit\/libgit2,spraints\/libgit2,claudelee\/libgit2,skabel\/manguse,Tousiph\/Demo1,since2014\/libgit2,dleehr\/libgit2,jeffhostetler\/public_libgit2,stewid\/libgit2,leoyanggit\/libgit2,leoyanggit\/libgit2,sygool\/libgit2,magnus98\/TEST,oaastest\/libgit2,kissthink\/libgit2,joshtriplett\/libgit2,sygool\/libgit2,sygool\/libgit2,leoyanggit\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/checkout.c\n+++ src\/checkout.c\n@@ -150,6 +150,15 @@\n \t}\n }\n \n+GIT_INLINE(bool) is_workdir_base_or_new(\n+\tconst git_oid *workdir_id,\n+\tconst git_diff_file *baseitem,\n+\tconst git_diff_file *newitem)\n+{\n+\treturn (git_oid__cmp(&baseitem->id, workdir_id) == 0 ||\n+\t\tgit_oid__cmp(&newitem->id, workdir_id) == 0);\n+}\n+\n static bool checkout_is_workdir_modified(\n \tcheckout_data *data,\n \tconst git_diff_file *baseitem,\n@@ -193,8 +202,7 @@\n \t\tif (wditem->mtime.seconds == ie->mtime.seconds &&\n \t\t\twditem->mtime.nanoseconds == ie->mtime.nanoseconds &&\n \t\t\twditem->file_size == ie->file_size)\n-\t\t\treturn (git_oid__cmp(&baseitem->id, &ie->id) != 0 &&\n-\t\t\t\tgit_oid_cmp(&newitem->id, &ie->id) != 0);\n+\t\t\treturn !is_workdir_base_or_new(&ie->id, baseitem, newitem);\n \t}\n \n \t\/* depending on where base is coming from, we may or may not know\n@@ -206,7 +214,10 @@\n \tif (git_diff__oid_for_entry(&oid, data->diff, wditem, NULL) < 0)\n \t\treturn false;\n \n-\treturn (git_oid__cmp(&baseitem->id, &oid) != 0);\n+\t\/* Allow the checkout if the workdir is not modified *or* if the checkout\n+\t * target's contents are already in the working directory.\n+\t *\/\n+\treturn !is_workdir_base_or_new(&oid, baseitem, newitem);\n }\n \n #define CHECKOUT_ACTION_IF(FLAG,YES,NO) \\\n"} {"commit":"63afb005e86d49e0f84d135d3d8dddae085a003f","subject":"Remove third stage from checkout progress reporting","message":"Remove third stage from checkout progress reporting\n\nAlso, now only reporting checkout progress for files that\nare actually being added or removed.\n","repos":"mrksrm\/Mingijura,mhp\/libgit2,oaastest\/libgit2,mhp\/libgit2,swisspol\/DEMO-libgit2,raybrad\/libit2,Tousiph\/Demo1,kenprice\/libgit2,jeffhostetler\/public_libgit2,yongthecoder\/libgit2,kenprice\/libgit2,magnus98\/TEST,whoisj\/libgit2,saurabhsuniljain\/libgit2,jeffhostetler\/public_libgit2,stewid\/libgit2,iankronquist\/libgit2,chiayolin\/libgit2,yongthecoder\/libgit2,t0xicCode\/libgit2,evhan\/libgit2,joshtriplett\/libgit2,leoyanggit\/libgit2,falqas\/libgit2,nacho\/libgit2,dleehr\/libgit2,maxiaoqian\/libgit2,rcorre\/libgit2,joshtriplett\/libgit2,falqas\/libgit2,mhp\/libgit2,Aorjoa\/libgit2_maked_lib,mingyaaaa\/libgit2,Snazz2001\/libgit2,leoyanggit\/libgit2,stewid\/libgit2,swisspol\/DEMO-libgit2,KTXSoftware\/libgit2,kenprice\/libgit2,sygool\/libgit2,jflesch\/libgit2-mariadb,chiayolin\/libgit2,ardumont\/libgit2,evhan\/libgit2,leoyanggit\/libgit2,yongthecoder\/libgit2,jflesch\/libgit2-mariadb,joshtriplett\/libgit2,jflesch\/libgit2-mariadb,mcanthony\/libgit2,mhp\/libgit2,jflesch\/libgit2-mariadb,t0xicCode\/libgit2,magnus98\/TEST,rcorre\/libgit2,yosefhackmon\/libgit2,maxiaoqian\/libgit2,dleehr\/libgit2,amyvmiwei\/libgit2,sygool\/libgit2,skabel\/manguse,mingyaaaa\/libgit2,yosefhackmon\/libgit2,since2014\/libgit2,swisspol\/DEMO-libgit2,chiayolin\/libgit2,sygool\/libgit2,linquize\/libgit2,iankronquist\/libgit2,falqas\/libgit2,magnus98\/TEST,maxiaoqian\/libgit2,jamieleecool\/ptest,KTXSoftware\/libgit2,stewid\/libgit2,amyvmiwei\/libgit2,skabel\/manguse,ardumont\/libgit2,spraints\/libgit2,t0xicCode\/libgit2,mrksrm\/Mingijura,raybrad\/libit2,maxiaoqian\/libgit2,jamieleecool\/ptest,sim0629\/libgit2,zodiac\/libgit2.js,falqas\/libgit2,Aorjoa\/libgit2_maked_lib,sim0629\/libgit2,raybrad\/libit2,kissthink\/libgit2,mcanthony\/libgit2,claudelee\/libgit2,MrHacky\/libgit2,JIghtuse\/libgit2,JIghtuse\/libgit2,linquize\/libgit2,MrHacky\/libgit2,sim0629\/libgit2,yosefhackmon\/libgit2,t0xicCode\/libgit2,amyvmiwei\/libgit2,swisspol\/DEMO-libgit2,sygool\/libgit2,sim0629\/libgit2,whoisj\/libgit2,mingyaaaa\/libgit2,yongthecoder\/libgit2,skabel\/manguse,Snazz2001\/libgit2,since2014\/libgit2,Corillian\/libgit2,yongthecoder\/libgit2,mcanthony\/libgit2,iankronquist\/libgit2,KTXSoftware\/libgit2,claudelee\/libgit2,JIghtuse\/libgit2,dleehr\/libgit2,jeffhostetler\/public_libgit2,zodiac\/libgit2.js,leoyanggit\/libgit2,evhan\/libgit2,joshtriplett\/libgit2,MrHacky\/libgit2,yosefhackmon\/libgit2,oaastest\/libgit2,maxiaoqian\/libgit2,maxiaoqian\/libgit2,KTXSoftware\/libgit2,mrksrm\/Mingijura,nokiddin\/libgit2,kissthink\/libgit2,Corillian\/libgit2,skabel\/manguse,iankronquist\/libgit2,saurabhsuniljain\/libgit2,rcorre\/libgit2,yongthecoder\/libgit2,iankronquist\/libgit2,claudelee\/libgit2,mcanthony\/libgit2,kissthink\/libgit2,skabel\/manguse,dleehr\/libgit2,t0xicCode\/libgit2,claudelee\/libgit2,JIghtuse\/libgit2,spraints\/libgit2,chiayolin\/libgit2,jeffhostetler\/public_libgit2,spraints\/libgit2,mcanthony\/libgit2,kissthink\/libgit2,JIghtuse\/libgit2,whoisj\/libgit2,sim0629\/libgit2,nokiddin\/libgit2,Tousiph\/Demo1,mrksrm\/Mingijura,mrksrm\/Mingijura,spraints\/libgit2,amyvmiwei\/libgit2,swisspol\/DEMO-libgit2,dleehr\/libgit2,Tousiph\/Demo1,linquize\/libgit2,linquize\/libgit2,ardumont\/libgit2,ardumont\/libgit2,magnus98\/TEST,since2014\/libgit2,KTXSoftware\/libgit2,leoyanggit\/libgit2,stewid\/libgit2,claudelee\/libgit2,nokiddin\/libgit2,rcorre\/libgit2,whoisj\/libgit2,ardumont\/libgit2,oaastest\/libgit2,skabel\/manguse,magnus98\/TEST,jeffhostetler\/public_libgit2,dleehr\/libgit2,raybrad\/libit2,linquize\/libgit2,sim0629\/libgit2,JIghtuse\/libgit2,leoyanggit\/libgit2,Aorjoa\/libgit2_maked_lib,spraints\/libgit2,sygool\/libgit2,Corillian\/libgit2,nacho\/libgit2,swisspol\/DEMO-libgit2,ardumont\/libgit2,mrksrm\/Mingijura,Corillian\/libgit2,yosefhackmon\/libgit2,since2014\/libgit2,sygool\/libgit2,saurabhsuniljain\/libgit2,falqas\/libgit2,t0xicCode\/libgit2,mingyaaaa\/libgit2,amyvmiwei\/libgit2,since2014\/libgit2,jflesch\/libgit2-mariadb,jamieleecool\/ptest,amyvmiwei\/libgit2,joshtriplett\/libgit2,jflesch\/libgit2-mariadb,stewid\/libgit2,nokiddin\/libgit2,MrHacky\/libgit2,oaastest\/libgit2,whoisj\/libgit2,joshtriplett\/libgit2,nokiddin\/libgit2,nokiddin\/libgit2,iankronquist\/libgit2,nacho\/libgit2,Aorjoa\/libgit2_maked_lib,stewid\/libgit2,kissthink\/libgit2,falqas\/libgit2,Snazz2001\/libgit2,mingyaaaa\/libgit2,chiayolin\/libgit2,nacho\/libgit2,zodiac\/libgit2.js,raybrad\/libit2,Corillian\/libgit2,saurabhsuniljain\/libgit2,chiayolin\/libgit2,saurabhsuniljain\/libgit2,kenprice\/libgit2,Snazz2001\/libgit2,magnus98\/TEST,Corillian\/libgit2,claudelee\/libgit2,mcanthony\/libgit2,rcorre\/libgit2,kenprice\/libgit2,Aorjoa\/libgit2_maked_lib,jamieleecool\/ptest,Snazz2001\/libgit2,since2014\/libgit2,whoisj\/libgit2,MrHacky\/libgit2,yosefhackmon\/libgit2,kissthink\/libgit2,spraints\/libgit2,mhp\/libgit2,saurabhsuniljain\/libgit2,kenprice\/libgit2,oaastest\/libgit2,rcorre\/libgit2,Tousiph\/Demo1,KTXSoftware\/libgit2,oaastest\/libgit2,linquize\/libgit2,evhan\/libgit2,jeffhostetler\/public_libgit2,Tousiph\/Demo1,mhp\/libgit2,mingyaaaa\/libgit2,zodiac\/libgit2.js,MrHacky\/libgit2,Tousiph\/Demo1,zodiac\/libgit2.js,Snazz2001\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/checkout.c\n+++ src\/checkout.c\n@@ -31,7 +31,6 @@\n \tbool can_symlink;\n \tbool found_submodules;\n \tbool create_submodules;\n-\tint num_stages;\n \tint error;\n };\n \n@@ -164,7 +163,7 @@\n \t\tstruct checkout_diff_data *data,\n \t\tconst char *path)\n {\n-\tfloat per_stage_progress = 1.f\/data->num_stages;\n+\tfloat per_stage_progress = 0.5;\n \tfloat overall_progress = (stage-1)*per_stage_progress +\n \t\tstage_progress*per_stage_progress;\n \n@@ -177,7 +176,8 @@\n \n static int checkout_blob(\n \tstruct checkout_diff_data *data,\n-\tconst git_diff_file *file)\n+\tconst git_diff_file *file,\n+\tfloat progress)\n {\n \tgit_blob *blob;\n \tint error;\n@@ -196,6 +196,7 @@\n \t\terror = blob_content_to_file(\n \t\t\tblob, git_buf_cstr(data->path), file->mode, data->checkout_opts);\n \n+\treport_progress(2, progress, data, file->path);\n \tgit_blob_free(blob);\n \n \treturn error;\n@@ -218,9 +219,9 @@\n \t\t\tdelta->new_file.path,\n \t\t\tgit_repository_workdir(data->owner),\n \t\t\tGIT_DIRREMOVAL_FILES_AND_DIRS);\n-\t}\n-\n-\treport_progress(1, progress, data, delta->new_file.path);\n+\n+\t\treport_progress(1, progress, data, delta->new_file.path);\n+\t}\n \n \treturn data->error;\n }\n@@ -262,18 +263,14 @@\n \n \t\tif (is_submodule) {\n \t\t\tdata->found_submodules = true;\n-\t\t\tdata->num_stages = 3;\n \t\t}\n \n \t\tif (!is_submodule && !data->create_submodules) {\n-\t\t\terror = checkout_blob(data, &delta->old_file);\n-\t\t\treport_progress(2, progress, data, delta->old_file.path);\n-\n+\t\t\terror = checkout_blob(data, &delta->old_file, progress);\n \t\t}\n \n \t\telse if (is_submodule && data->create_submodules) {\n \t\t\terror = checkout_submodule(data, &delta->old_file);\n-\t\t\treport_progress(3, progress, data, delta->old_file.path);\n \t\t}\n \n \t}\n@@ -368,7 +365,6 @@\n \tdata.workdir_len = git_buf_len(&workdir);\n \tdata.checkout_opts = &checkout_opts;\n \tdata.owner = repo;\n-\tdata.num_stages = 2;\n \n \tif ((error = retrieve_symlink_capabilities(repo, &data.can_symlink)) < 0)\n \t\tgoto cleanup;\n@@ -396,7 +392,7 @@\n \t\t\tdiff, &data, checkout_create_the_new, NULL, NULL);\n \t}\n \n-\treport_progress(data.num_stages, 1.f, &data, NULL);\n+\treport_progress(2, 1.f, &data, NULL);\n \n cleanup:\n \tif (error == GIT_EUSER)\n"} {"commit":"c716f9b044f4c89287505ad4750a4503994d04a4","subject":"add chnroute","message":"add chnroute\n","repos":"QSCTech\/ChinaDNS-C,QSCTech\/ChinaDNS-C,QSCTech\/ChinaDNS-C,LazyZhu\/ChinaDNS,LazyZhu\/ChinaDNS,LazyZhu\/ChinaDNS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/chinadns.c\n+++ src\/chinadns.c\n@@ -90,7 +90,7 @@\n static void dns_handle_remote();\n \n static const char *hostname_from_question(ns_msg msg);\n-static int should_filter_query(ns_msg msg);\n+static int should_filter_query(ns_msg msg, struct in_addr dns_addr);\n \n static void queue_add(id_addr_t id_addr);\n static id_addr_t *queue_lookup(uint16_t id);\n@@ -405,24 +405,6 @@\n qsort(chnroute_list.nets, chnroute_list.entries, sizeof(net_mask_t),\n cmp_net_mask);\n \n- \/\/ test code\n- for (i = 0; i < chnroute_list.entries; i++) {\n- DLOG(\"%s, %di\\n\", inet_ntoa(chnroute_list.nets[i].net),\n- chnroute_list.nets[i].mask);\n- }\n- struct in_addr test_ip;\n- \/\/inet_aton(\"8.8.8.8\", &test_ip);\n- \/\/inet_aton(\"114.114.114.114\", &test_ip);\n- \/\/ taobao:\n- \/\/inet_aton(\"42.120.194.11\", &test_ip);\n- \/\/ google:\n- \/\/inet_aton(\"173.194.127.41\", &test_ip);\n- \/\/ twitter:\n- \/\/inet_aton(\"199.59.150.39\", &test_ip);\n- int test = test_ip_in_list(test_ip, &chnroute_list);\n- DLOG(\"%d\\n\", test);\n- \/\/ test code\n-\n fclose(fp);\n return 0;\n }\n@@ -431,6 +413,8 @@\n \/\/ binary search\n int l = 0, r = netlist->entries - 1;\n int m, cmp;\n+ if (netlist->entries == 0)\n+ return 0;\n net_mask_t ip_net;\n ip_net.net = ip;\n while (l != r) {\n@@ -451,7 +435,6 @@\n DLOG(\"%s, %d\\n\", inet_ntoa(netlist->nets[m].net),\n netlist->nets[m].mask);\n }\n- DLOG(\"%d\\n\", ntohl(netlist->nets[l].net.s_addr ^ ip.s_addr));\n if ((ntohl(netlist->nets[l].net.s_addr) ^ ntohl(ip.s_addr)) &\n (0xFFFF - netlist->nets[l].mask)) {\n return 0;\n@@ -543,11 +526,10 @@\n inet_ntoa(((struct sockaddr_in *)src_addr)->sin_addr),\n htons(((struct sockaddr_in *)src_addr)->sin_port));\n }\n- free(src_addr);\n id_addr_t *id_addr = queue_lookup(query_id);\n if (id_addr) {\n id_addr->addr->sa_family = AF_INET;\n- r = should_filter_query(msg);\n+ r = should_filter_query(msg, ((struct sockaddr_in *)src_addr)->sin_addr);\n if (r == 0) {\n if (verbose)\n printf(\"pass\\n\");\n@@ -566,6 +548,7 @@\n if (verbose)\n printf(\"skip\\n\");\n }\n+ free(src_addr);\n }\n else\n ERR(\"recvfrom\");\n@@ -616,10 +599,13 @@\n return NULL;\n }\n \n-static int should_filter_query(ns_msg msg) {\n+static int should_filter_query(ns_msg msg, struct in_addr dns_addr) {\n ns_rr rr;\n int rrnum, rrmax;\n void *r;\n+ \/\/ TODO cache result for each dns server\n+ int dns_is_chn = (dns_servers_len > 1) &&\n+ test_ip_in_list(dns_addr, &chnroute_list);\n rrmax = ns_msg_count(msg, ns_s_an);\n if (rrmax == 0)\n return -1;\n@@ -639,6 +625,11 @@\n cmp_in_addr);\n if (r)\n return 1;\n+ if (dns_is_chn) {\n+ \/\/ filter DNS result from chn dns if result is outside chn\n+ if (!test_ip_in_list(*(struct in_addr *)rd, &chnroute_list))\n+ return 1;\n+ }\n }\n }\n return 0;\n"} {"commit":"ca3b2c14dba98b61c4b35f71c5869f773391dc1a","subject":"Extract random number generator from websocket client code","message":"Extract random number generator from websocket client code\n","repos":"GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/civetweb.c\n+++ src\/civetweb.c\n@@ -1570,6 +1570,33 @@\n \tmg_vsnprintf(conn, truncated, buf, buflen, fmt, ap);\n \tva_end(ap);\n }\n+\n+\n+static int64_t\n+get_random(void)\n+{\n+ static uint64_t lfsr = 0;\n+ static uint64_t lcg = 0;\n+ struct timespec now;\n+\n+ memset(&now, 0, sizeof(now));\n+ clock_gettime(CLOCK_MONOTONIC, &now);\n+\n+ if (lfsr == 0) {\n+ lfsr = (((uint64_t)now.tv_sec) << 21) ^ (uint64_t)now.tv_nsec\n+ ^ (uint64_t)(ptrdiff_t)&now;\n+ lcg = (((uint64_t)now.tv_sec) << 25) + (uint64_t)now.tv_nsec\n+ + (uint64_t)(ptrdiff_t)&now;\n+ } else {\n+ lfsr = (lfsr >> 1)\n+ | ((((lfsr >> 0) ^ (lfsr >> 1) ^ (lfsr >> 3) ^ (lfsr >> 4)) & 1)\n+ << 63);\n+ lcg = lcg * 6364136223846793005 + 1442695040888963407;\n+ }\n+\n+ return (lfsr ^ lcg ^ now.tv_nsec);\n+}\n+\n \n static int\n get_option_index(const char *name)\n@@ -8262,27 +8289,7 @@\n {\n \tint retval = -1;\n \tchar *masked_data = (char *)mg_malloc(((dataLen + 7) \/ 4) * 4);\n-\tuint32_t masking_key;\n-\tstatic uint64_t lfsr = 0;\n-\tstatic uint64_t lcg = 0;\n-\tstruct timespec now;\n-\n-\tmemset(&now, 0, sizeof(now));\n-\tclock_gettime(CLOCK_MONOTONIC, &now);\n-\n-\tif (lfsr == 0) {\n-\t\tlfsr = (((uint64_t)now.tv_sec) << 21) ^ (uint64_t)now.tv_nsec\n-\t\t ^ (uint64_t)&dataLen;\n-\t\tlcg = (((uint64_t)now.tv_sec) << 25) + (uint64_t)now.tv_nsec\n-\t\t + (uint64_t)data;\n-\t} else {\n-\t\tlfsr = (lfsr >> 1)\n-\t\t | ((((lfsr >> 0) ^ (lfsr >> 1) ^ (lfsr >> 3) ^ (lfsr >> 4)) & 1)\n-\t\t << 63);\n-\t\tlcg = lcg * 6364136223846793005 + 1442695040888963407;\n-\t}\n-\n-\tmasking_key = (uint32_t)lfsr ^ (uint32_t)lcg ^ (uint32_t)now.tv_nsec;\n+ uint32_t masking_key = (uint32_t)get_random();\n \n \tif (masked_data == NULL) {\n \t\t\/* Return -1 in an error case *\/\n@@ -11852,6 +11859,9 @@\n \t\treturn NULL;\n \t}\n \n+ \/* Random number generator will initialize at the first call *\/\n+ (void)get_random();\n+\n \tif (mg_atomic_inc(&sTlsInit) == 1) {\n \n #if defined(_WIN32) && !defined(__SYMBIAN32__)\n"} {"commit":"ddf3a35d17e7bc52345137d9f9c5f577fcbf219c","subject":"Actually, option available from gcc 4.9","message":"Actually, option available from gcc 4.9","repos":"GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/civetweb.c\n+++ src\/civetweb.c\n@@ -19046,7 +19046,7 @@\n \t\/* Build date *\/\n \t{\n #if defined(GCC_DIAGNOSTIC)\n-#if GCC_VERSION >= 50000\n+#if GCC_VERSION >= 40900\n #pragma GCC diagnostic push\n \/* Disable bogus compiler warning -Wdate-time, appeared in gcc5 *\/\n #pragma GCC diagnostic ignored \"-Wdate-time\"\n@@ -19061,7 +19061,7 @@\n \t\t eol);\n \n #if defined(GCC_DIAGNOSTIC)\n-#if GCC_VERSION >= 50000\n+#if GCC_VERSION >= 40900\n #pragma GCC diagnostic pop\n #endif\n #endif\n"} {"commit":"6a5f94e787e2d6b568d89b88e29f57166317e339","subject":"Fix USE_TIMERS for CGI","message":"Fix USE_TIMERS for CGI\n","repos":"GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/civetweb.c\n+++ src\/civetweb.c\n@@ -425,7 +425,7 @@\n \"size_t data type size check\");\n \n #if defined(_WIN32) && !defined(__SYMBIAN32__) \/* WINDOWS include block *\/\n-#include \/* DTL add for SO_EXCLUSIVE *\/\n+#include \/* DTL add for SO_EXCLUSIVE *\/\n #include \n #include \n \n@@ -5508,6 +5508,7 @@\n #if !defined(NO_CGI)\n #define SIGKILL (0)\n \n+\n static int\n kill(pid_t pid, int sig_num)\n {\n@@ -5516,11 +5517,12 @@\n \treturn 0;\n }\n \n+\n #ifndef WNOHANG\n #define WNOHANG (1)\n #endif\n \n-#if defined(USE_TIMERS)\n+\n pid_t\n waitpid(pid_t pid, int *status, int flags)\n {\n@@ -5542,7 +5544,6 @@\n \t}\n \treturn (pid_t)-1;\n }\n-#endif \/* USE_TIMERS *\/\n \n \n static void\n@@ -5723,6 +5724,7 @@\n \tunsigned long non_blocking = 1;\n \treturn ioctlsocket(sock, (long)FIONBIO, &non_blocking);\n }\n+\n #else\n \n static int\n@@ -10774,6 +10776,9 @@\n #define TIMER_API static\n #include \"timer.inl\"\n \n+#endif \/* USE_TIMERS *\/\n+\n+\n static int\n abort_process(void *data)\n {\n@@ -10797,8 +10802,6 @@\n \t}\n \treturn 0;\n }\n-\n-#endif \/* USE_TIMERS *\/\n \n \n static void\n@@ -10882,8 +10885,12 @@\n \n #if defined(USE_TIMERS)\n \t\/\/ TODO (#618): set a timeout\n-\ttimer_add(\n-\t conn->phys_ctx, \/* one minute *\/ 60.0, 0.0, 1, abort_process, (void*)pid);\n+\ttimer_add(conn->phys_ctx,\n+\t \/* one minute *\/ 60.0,\n+\t 0.0,\n+\t 1,\n+\t abort_process,\n+\t (void *)pid);\n #endif\n \n \t\/* Make sure child closes all pipe descriptors. It must dup them to 0,1\n@@ -11085,13 +11092,10 @@\n \tmg_free(blk.var);\n \tmg_free(blk.buf);\n \n-#if defined(USE_TIMERS)\n \tif (pid != (pid_t)-1) {\n-#if defined(USE_TIMERS)\n \t\tabort_process((void *)pid);\n-#endif\n-\t}\n-#endif \/* USE_TIMERS *\/\n+\t}\n+\n \tif (fdin[0] != -1) {\n \t\tclose(fdin[0]);\n \t}\n"} {"commit":"7e02c3474ab866e13fffaa68d811326827bf351a","subject":"proc dir","message":"proc dir\n","repos":"qwarnant\/ASA-KernelModule,qwarnant\/ASA-KernelModule","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ase_cmd.c\n+++ ase_cmd.c\n@@ -10,13 +10,16 @@\n \n #define JIFFIES_BUFFER_LEN 7\n static char jiffies_buffer[JIFFIES_BUFFER_LEN];\n+\n static struct proc_dir_entry *proc_dir;\n-static int jiffies_flag = 0;\n+static struct proc_dir_entry *proc_current_proc_file;\n+\n+static int proc_current_pid = 0;\n \n static int \n jiffies_proc_show(struct seq_file *m, void *v)\n {\n- if (jiffies_flag)\n+ if (proc_current_pid)\n seq_printf(m, \"%llu\\n\",\n (unsigned long long) get_jiffies_64());\n return 0;\n@@ -28,11 +31,17 @@\n return single_open(file, jiffies_proc_show, NULL);\n }\n \n+static const struct file_operations proc_current_fops = {\n+ .owner = THIS_MODULE,\n+ .open = jiffies_proc_open\n+};\n+\n static ssize_t\n jiffies_proc_write(struct file *filp, const char __user *buff,\n size_t len, loff_t *data)\n {\n long res;\n+\n printk(KERN_INFO \"ASE_CMD : Input from user detected\\n\");\n if (len > (JIFFIES_BUFFER_LEN - 1)) {\n printk(KERN_INFO \"ASE_CMD: error, input too long\\n\");\n@@ -43,11 +52,15 @@\n }\n jiffies_buffer[len] = 0;\n \n- printk(KERN_INFO \"ASE_CMD: PID received : %s\\n\", jiffies_buffer);\n+ kstrtol(jiffies_buffer, 0, &res);\n \n- kstrtol(jiffies_buffer, 0, &res);\n- jiffies_flag = res;\n+ proc_current_pid = res;\n+ printk(KERN_INFO \"ASE_CMD: PID received : %ld\\n\", proc_current_pid);\n \n+ if(proc_dir != NULL) {\n+ \tprintk(KERN_INFO \"Create current proc file in ase directory\\n\");\n+ \tproc_current_proc_file = proc_create(jiffies_buffer,0666,proc_dir, &proc_current_fops);\t\n+ }\n return len;\n }\n \n@@ -65,6 +78,10 @@\n {\n proc_create(\"ase_cmd\", 0666, NULL, &jiffies_proc_fops);\n proc_dir = proc_mkdir(\"ase\", NULL);\n+\n+ if(proc_dir == NULL)\n+\tprintk(KERN_ERR \"Failed to create the ase proc directory\\n\");\n+\n return 0;\n }\n \n@@ -72,6 +89,7 @@\n jiffies_proc_exit(void)\n {\n remove_proc_entry(\"ase_cmd\", NULL);\n+ remove_proc_entry(\"ase\", NULL);\n }\n \n module_init(jiffies_proc_init);\n"} {"commit":"1a7e8ec4639f014f4fdbdefbef0a820fbae2d6e0","subject":"Atomics library: provide operations for __int128 when it is available.","message":"Atomics library: provide operations for __int128 when it is available.\n\n\ngit-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@285265 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/builtins\/atomic.c\n+++ lib\/builtins\/atomic.c\n@@ -229,13 +229,20 @@\n \/\/ Where the size is known at compile time, the compiler may emit calls to\n \/\/ specialised versions of the above functions.\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+#ifdef __SIZEOF_INT128__\n #define OPTIMISED_CASES\\\n OPTIMISED_CASE(1, IS_LOCK_FREE_1, uint8_t)\\\n OPTIMISED_CASE(2, IS_LOCK_FREE_2, uint16_t)\\\n OPTIMISED_CASE(4, IS_LOCK_FREE_4, uint32_t)\\\n OPTIMISED_CASE(8, IS_LOCK_FREE_8, uint64_t)\\\n- \/* FIXME: __uint128_t isn't available on 32 bit platforms.\n- OPTIMISED_CASE(16, IS_LOCK_FREE_16, __uint128_t)*\/\\\n+ OPTIMISED_CASE(16, IS_LOCK_FREE_16, __uint128_t)\n+#else\n+#define OPTIMISED_CASES\\\n+ OPTIMISED_CASE(1, IS_LOCK_FREE_1, uint8_t)\\\n+ OPTIMISED_CASE(2, IS_LOCK_FREE_2, uint16_t)\\\n+ OPTIMISED_CASE(4, IS_LOCK_FREE_4, uint32_t)\\\n+ OPTIMISED_CASE(8, IS_LOCK_FREE_8, uint64_t)\n+#endif\n \n #define OPTIMISED_CASE(n, lockfree, type)\\\n type __atomic_load_##n(type *src, int model) {\\\n"} {"commit":"13f7a7b86b52e3db3ab5968503eae5cf57f13004","subject":"zephyr\/mpconfigport.h: Move less important params to the bottom.","message":"zephyr\/mpconfigport.h: Move less important params to the bottom.\n","repos":"adafruit\/circuitpython,oopy\/micropython,tobbad\/micropython,infinnovation\/micropython,selste\/micropython,adafruit\/micropython,alex-robbins\/micropython,puuu\/micropython,cwyark\/micropython,torwag\/micropython,ryannathans\/micropython,trezor\/micropython,pozetroninc\/micropython,lowRISC\/micropython,tralamazza\/micropython,jmarcelino\/pycom-micropython,MrSurly\/micropython,MrSurly\/micropython,ryannathans\/micropython,cwyark\/micropython,hiway\/micropython,Timmenem\/micropython,pozetroninc\/micropython,puuu\/micropython,trezor\/micropython,cwyark\/micropython,TDAbboud\/micropython,matthewelse\/micropython,PappaPeppar\/micropython,TDAbboud\/micropython,tralamazza\/micropython,adafruit\/micropython,TDAbboud\/micropython,deshipu\/micropython,MrSurly\/micropython-esp32,AriZuu\/micropython,tobbad\/micropython,dmazzella\/micropython,Peetz0r\/micropython-esp32,toolmacher\/micropython,deshipu\/micropython,kerneltask\/micropython,swegener\/micropython,tuc-osg\/micropython,bvernoux\/micropython,HenrikSolver\/micropython,tralamazza\/micropython,adafruit\/circuitpython,infinnovation\/micropython,henriknelson\/micropython,adafruit\/circuitpython,henriknelson\/micropython,lowRISC\/micropython,mhoffma\/micropython,deshipu\/micropython,HenrikSolver\/micropython,MrSurly\/micropython-esp32,hiway\/micropython,toolmacher\/micropython,PappaPeppar\/micropython,pfalcon\/micropython,matthewelse\/micropython,pramasoul\/micropython,mhoffma\/micropython,torwag\/micropython,MrSurly\/micropython-esp32,selste\/micropython,mhoffma\/micropython,pfalcon\/micropython,oopy\/micropython,jmarcelino\/pycom-micropython,micropython\/micropython-esp32,cwyark\/micropython,micropython\/micropython-esp32,micropython\/micropython-esp32,trezor\/micropython,matthewelse\/micropython,Peetz0r\/micropython-esp32,selste\/micropython,Peetz0r\/micropython-esp32,henriknelson\/micropython,mhoffma\/micropython,adafruit\/circuitpython,alex-robbins\/micropython,Timmenem\/micropython,PappaPeppar\/micropython,AriZuu\/micropython,lowRISC\/micropython,tuc-osg\/micropython,henriknelson\/micropython,kerneltask\/micropython,swegener\/micropython,jmarcelino\/pycom-micropython,toolmacher\/micropython,dmazzella\/micropython,selste\/micropython,pfalcon\/micropython,chrisdearman\/micropython,tobbad\/micropython,Timmenem\/micropython,HenrikSolver\/micropython,swegener\/micropython,dmazzella\/micropython,adafruit\/micropython,torwag\/micropython,ryannathans\/micropython,pfalcon\/micropython,AriZuu\/micropython,chrisdearman\/micropython,toolmacher\/micropython,TDAbboud\/micropython,pramasoul\/micropython,kerneltask\/micropython,jmarcelino\/pycom-micropython,blazewicz\/micropython,puuu\/micropython,Timmenem\/micropython,bvernoux\/micropython,pramasoul\/micropython,tobbad\/micropython,chrisdearman\/micropython,HenrikSolver\/micropython,alex-robbins\/micropython,adafruit\/circuitpython,blazewicz\/micropython,toolmacher\/micropython,bvernoux\/micropython,kerneltask\/micropython,micropython\/micropython-esp32,tuc-osg\/micropython,selste\/micropython,Timmenem\/micropython,TDAbboud\/micropython,kerneltask\/micropython,micropython\/micropython-esp32,lowRISC\/micropython,oopy\/micropython,Peetz0r\/micropython-esp32,torwag\/micropython,SHA2017-badge\/micropython-esp32,MrSurly\/micropython,torwag\/micropython,puuu\/micropython,oopy\/micropython,hiway\/micropython,henriknelson\/micropython,PappaPeppar\/micropython,tobbad\/micropython,dmazzella\/micropython,oopy\/micropython,cwyark\/micropython,deshipu\/micropython,hiway\/micropython,infinnovation\/micropython,SHA2017-badge\/micropython-esp32,blazewicz\/micropython,swegener\/micropython,Peetz0r\/micropython-esp32,blazewicz\/micropython,chrisdearman\/micropython,swegener\/micropython,SHA2017-badge\/micropython-esp32,pfalcon\/micropython,blazewicz\/micropython,tralamazza\/micropython,trezor\/micropython,matthewelse\/micropython,infinnovation\/micropython,adafruit\/micropython,bvernoux\/micropython,pozetroninc\/micropython,AriZuu\/micropython,MrSurly\/micropython,tuc-osg\/micropython,pozetroninc\/micropython,infinnovation\/micropython,alex-robbins\/micropython,PappaPeppar\/micropython,adafruit\/micropython,pozetroninc\/micropython,lowRISC\/micropython,HenrikSolver\/micropython,bvernoux\/micropython,jmarcelino\/pycom-micropython,matthewelse\/micropython,pramasoul\/micropython,matthewelse\/micropython,mhoffma\/micropython,chrisdearman\/micropython,MrSurly\/micropython,pramasoul\/micropython,ryannathans\/micropython,MrSurly\/micropython-esp32,MrSurly\/micropython-esp32,trezor\/micropython,ryannathans\/micropython,puuu\/micropython,SHA2017-badge\/micropython-esp32,deshipu\/micropython,adafruit\/circuitpython,tuc-osg\/micropython,AriZuu\/micropython,hiway\/micropython,alex-robbins\/micropython,SHA2017-badge\/micropython-esp32","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- zephyr\/mpconfigport.h\n+++ zephyr\/mpconfigport.h\n@@ -28,11 +28,6 @@\n \/\/ Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles\n #include \"autoconf.h\"\n \n-\/\/ Saving extra crumbs to make sure binary fits in 128K\n-#define MICROPY_COMP_CONST_FOLDING (0)\n-#define MICROPY_COMP_CONST (0)\n-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)\n-\n #define MICROPY_STACK_CHECK (1)\n #define MICROPY_ENABLE_GC (1)\n #define MICROPY_HELPER_REPL (1)\n@@ -62,6 +57,11 @@\n #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)\n #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)\n #define MICROPY_PY_BUILTINS_COMPLEX (0)\n+\n+\/\/ Saving extra crumbs to make sure binary fits in 128K\n+#define MICROPY_COMP_CONST_FOLDING (0)\n+#define MICROPY_COMP_CONST (0)\n+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)\n \n #ifdef CONFIG_BOARD\n #define MICROPY_HW_BOARD_NAME \"zephyr-\" CONFIG_BOARD\n"} {"commit":"eb15bb261a09c7e87707da042887ccfd7ef58417","subject":"Revert \"Add missing error string to syslog logging in epmd\"","message":"Revert \"Add missing error string to syslog logging in epmd\"\n\nThis reverts commit e2c11e89563f0c11794c91193b29bce00ca9c740.\n","repos":"Teino1978-Corp\/otp,sammoth-wazoku\/otp,bernardd\/otp,RichMorin\/otp,riverrun\/otp,erlang\/otp,weisslj\/otp,NOMORECOFFEE\/otp,entropiae\/otp,dumbbell\/otp,matwey\/otp,lhslll\/otp,bjorng\/otp,yangchengjian\/otp,theom\/otp,jemsbhai\/otp,sdebnath\/otp,jinshana\/otp,uabboli\/otp,jj1bdx\/otp,cobusc\/otp,gjaldon\/otp,electricimp\/otp,ferd\/otp,g-andrade\/otp,lianghaivv\/otp,Teino1978-Corp\/erlang-otp,bugs-erlang-org\/otp,RaimoNiskanen\/otp,ahmedshafeeq\/otp,goertzenator\/otp,psyeugenic\/otp,release-project\/otp,gjaldon\/otp,msantos\/otp,mujiatong\/otp,uabboli\/otp,sammoth-wazoku\/otp,emile\/otp,lianghaivv\/otp,vinoski\/otp,stolen\/otp,lightcyphers\/otp,isvilen\/otp,dgud\/otp,msantos\/otp,NOMORECOFFEE\/otp,beni55\/otp,sitexa\/otp,GinjaNinja32\/otp,ahmedshafeeq\/otp,johanclaesson\/otp,sdebnath\/otp,isvilen\/otp,VincentHHL\/otp,psyeugenic\/otp,rlipscombe\/otp,paladim\/otp,bsmr-erlang\/otp,VincentHHL\/otp,cobusc\/otp,schlagert\/otp,RGafiyatullin\/otp,hairyhum\/otp,lrascao\/otp,lhslll\/otp,msantos\/otp,dgud\/otp,vinoski\/otp,lightcyphers\/otp,lhslll\/otp,erlang\/otp,release-project\/otp,Teino1978-Corp\/otp,RaimoNiskanen\/otp,lianghaivv\/otp,potatosalad\/otp,RJ\/otp,marquisthunder\/otp,mikpe\/otp,msantos\/otp,ferd\/otp,release-project\/otp,johanclaesson\/otp,benoitc\/otp-1,NOMORECOFFEE\/otp,basho\/otp,potatosalad\/otp,jj1bdx\/otp,ferd\/otp,derek121\/otp,dumbbell\/otp,c-rack\/otp,vic\/otp,RGafiyatullin\/otp,weisslj\/otp,RichMorin\/otp,Teino1978-Corp\/otp,bsmr-erlang\/otp,GinjaNinja32\/otp,marquisthunder\/otp,erlang\/otp,ferd\/otp,johanclaesson\/otp,bernardd\/otp,lrascao\/otp,weisslj\/otp,erlang\/otp,basho\/otp,massemanet\/otp,fenollp\/otp,haguenau\/otp,msantos\/otp,paladim\/otp,RJ\/otp,isvilen\/otp,NOMORECOFFEE\/otp,sitexa\/otp,bugs-erlang-org\/otp,jinshana\/otp,palas\/otp,paladim\/otp,vladdu\/otp,emacsmirror\/erlang,goertzenator\/otp,lantti\/otp,jj1bdx\/otp,lemenkov\/otp,isvilen\/otp,klarna\/otp,bugs-erlang-org\/otp,lightcyphers\/otp,saleyn\/otp,vic\/otp,haguenau\/otp,basho\/otp,theom\/otp,matwey\/otp,bjorng\/otp,aboroska\/otp,basho\/otp,dgud\/otp,ahmedshafeeq\/otp,bernardd\/otp,rlipscombe\/otp,emile\/otp,benoitc\/otp-1,GinjaNinja32\/otp,hairyhum\/otp,RoadRunnr\/otp,getong\/otp,paulcager\/otp,dgud\/otp,potatosalad\/otp,lightcyphers\/otp,jj1bdx\/otp,enikki\/otp,tuncer\/otp,neeraj9\/otp,jinshana\/otp,bugs-erlang-org\/otp,basho\/otp,isvilen\/otp,ader1990\/otp,lucafavatella\/otp,psyeugenic\/otp,bjorng\/otp,mikpe\/otp,cobusc\/otp,lianghaivv\/otp,sammoth-wazoku\/otp,lianghaivv\/otp,uabboli\/otp,theom\/otp,RGafiyatullin\/otp,Teino1978-Corp\/erlang-otp,g-andrade\/otp,haguenau\/otp,psyeugenic\/otp,krishnakumar4a4\/otp,isvilen\/otp,gjaldon\/otp,electricimp\/otp,riverrun\/otp,c-rack\/otp,neeraj9\/otp,schlagert\/otp,Teino1978-Corp\/erlang-otp,lhslll\/otp,Teino1978-Corp\/otp,bjorng\/otp,platinumthinker\/otp,RoadRunnr\/otp,vladdu\/otp,lhslll\/otp,enikki\/otp,dgud\/otp,dumbbell\/otp,weisslj\/otp,gjaldon\/otp,RoadRunnr\/otp,enikki\/otp,emile\/otp,RichMorin\/otp,emile\/otp,ferd\/otp,rlipscombe\/otp,vinoski\/otp,c-rack\/otp,entropiae\/otp,release-project\/otp,schlagert\/otp,VincentHHL\/otp,g-andrade\/otp,kvakvs\/otp,weisslj\/otp,entropiae\/otp,jj1bdx\/otp,vic\/otp,jamesruan\/otp,cnbin\/otp,ferd\/otp,lianghaivv\/otp,Teino1978-Corp\/otp,enikki\/otp,jamesruan\/otp,RaimoNiskanen\/otp,beni55\/otp,falkevik\/otp,lemenkov\/otp,release-project\/otp,klarna\/otp,aboroska\/otp,massemanet\/otp,uabboli\/otp,Teino1978-Corp\/otp,ferd\/otp,potatosalad\/otp,erlang\/otp,haguenau\/otp,Teino1978-Corp\/erlang-otp,getong\/otp,lantti\/otp,riverrun\/otp,getong\/otp,g-andrade\/otp,sdebnath\/otp,emile\/otp,emacsmirror\/erlang,stolen\/otp,paladim\/otp,g-andrade\/otp,emile\/otp,kvakvs\/otp,hairyhum\/otp,VincentHHL\/otp,tuncer\/otp,klarna\/otp,electricimp\/otp,kvakvs\/otp,palas\/otp,jemsbhai\/otp,krishnakumar4a4\/otp,awetzel\/otp,lantti\/otp,VincentHHL\/otp,potatosalad\/otp,ader1990\/otp,bsmr-erlang\/otp,ferd\/otp,awetzel\/otp,RGafiyatullin\/otp,enikki\/otp,beni55\/otp,saleyn\/otp,rlipscombe\/otp,neeraj9\/otp,RaimoNiskanen\/otp,sitexa\/otp,electricimp\/otp,awetzel\/otp,NOMORECOFFEE\/otp,g-andrade\/otp,yangchengjian\/otp,schlagert\/otp,dumbbell\/otp,entropiae\/otp,falkevik\/otp,falkevik\/otp,aboroska\/otp,yangchengjian\/otp,theom\/otp,electricimp\/otp,rlipscombe\/otp,neeraj9\/otp,falkevik\/otp,goertzenator\/otp,paulcager\/otp,matwey\/otp,psyeugenic\/otp,bugs-erlang-org\/otp,mikpe\/otp,mikpe\/otp,vinoski\/otp,sdebnath\/otp,cobusc\/otp,sitexa\/otp,jemsbhai\/otp,erlang\/otp,isvilen\/otp,potatosalad\/otp,kvakvs\/otp,cnbin\/otp,ader1990\/otp,RJ\/otp,emacsmirror\/erlang,bugs-erlang-org\/otp,uabboli\/otp,fenollp\/otp,bernardd\/otp,lantti\/otp,saleyn\/otp,haguenau\/otp,massemanet\/otp,beni55\/otp,lightcyphers\/otp,klarna\/otp,marquisthunder\/otp,RaimoNiskanen\/otp,saleyn\/otp,uabboli\/otp,jinshana\/otp,krishnakumar4a4\/otp,NOMORECOFFEE\/otp,Teino1978-Corp\/erlang-otp,aboroska\/otp,jamesruan\/otp,benoitc\/otp-1,RGafiyatullin\/otp,neeraj9\/otp,jj1bdx\/otp,platinumthinker\/otp,johanclaesson\/otp,palas\/otp,bsmr-erlang\/otp,bsmr-erlang\/otp,platinumthinker\/otp,legoscia\/otp,theom\/otp,yangchengjian\/otp,g-andrade\/otp,lhslll\/otp,weisslj\/otp,derek121\/otp,lucafavatella\/otp,benoitc\/otp-1,jj1bdx\/otp,jamesruan\/otp,paulcager\/otp,Teino1978-Corp\/otp,dgud\/otp,awetzel\/otp,haguenau\/otp,mujiatong\/otp,kvakvs\/otp,dgud\/otp,awetzel\/otp,vladdu\/otp,lantti\/otp,saleyn\/otp,benoitc\/otp-1,gjaldon\/otp,lrascao\/otp,lhslll\/otp,dumbbell\/otp,neeraj9\/otp,lucafavatella\/otp,fenollp\/otp,ahmedshafeeq\/otp,platinumthinker\/otp,cnbin\/otp,theom\/otp,jinshana\/otp,theom\/otp,klarna\/otp,awetzel\/otp,beni55\/otp,legoscia\/otp,sammoth-wazoku\/otp,lrascao\/otp,saleyn\/otp,mikpe\/otp,schlagert\/otp,c-rack\/otp,cnbin\/otp,gjaldon\/otp,release-project\/otp,kvakvs\/otp,marquisthunder\/otp,riverrun\/otp,theom\/otp,emacsmirror\/erlang,matwey\/otp,lhslll\/otp,mujiatong\/otp,lrascao\/otp,vinoski\/otp,derek121\/otp,vladdu\/otp,matwey\/otp,mujiatong\/otp,krishnakumar4a4\/otp,erlang\/otp,palas\/otp,neeraj9\/otp,vic\/otp,enikki\/otp,getong\/otp,sammoth-wazoku\/otp,lemenkov\/otp,erlang\/otp,mikpe\/otp,Teino1978-Corp\/erlang-otp,c-rack\/otp,emacsmirror\/erlang,g-andrade\/otp,bsmr-erlang\/otp,tuncer\/otp,lucafavatella\/otp,lemenkov\/otp,bsmr-erlang\/otp,bernardd\/otp,massemanet\/otp,legoscia\/otp,msantos\/otp,mujiatong\/otp,getong\/otp,uabboli\/otp,cnbin\/otp,stolen\/otp,entropiae\/otp,RJ\/otp,release-project\/otp,legoscia\/otp,tuncer\/otp,palas\/otp,electricimp\/otp,platinumthinker\/otp,emacsmirror\/erlang,goertzenator\/otp,rlipscombe\/otp,bsmr-erlang\/otp,RGafiyatullin\/otp,lantti\/otp,saleyn\/otp,bjorng\/otp,RaimoNiskanen\/otp,fenollp\/otp,massemanet\/otp,dgud\/otp,jemsbhai\/otp,RoadRunnr\/otp,ahmedshafeeq\/otp,krishnakumar4a4\/otp,awetzel\/otp,RoadRunnr\/otp,getong\/otp,potatosalad\/otp,vladdu\/otp,falkevik\/otp,paulcager\/otp,jamesruan\/otp,uabboli\/otp,getong\/otp,Teino1978-Corp\/erlang-otp,entropiae\/otp,haguenau\/otp,benoitc\/otp-1,bernardd\/otp,sammoth-wazoku\/otp,cobusc\/otp,tuncer\/otp,johanclaesson\/otp,electricimp\/otp,sdebnath\/otp,platinumthinker\/otp,emile\/otp,RoadRunnr\/otp,saleyn\/otp,msantos\/otp,basho\/otp,legoscia\/otp,bjorng\/otp,krishnakumar4a4\/otp,dumbbell\/otp,mujiatong\/otp,emacsmirror\/erlang,cobusc\/otp,vic\/otp,jj1bdx\/otp,vic\/otp,goertzenator\/otp,enikki\/otp,Teino1978-Corp\/erlang-otp,lianghaivv\/otp,GinjaNinja32\/otp,krishnakumar4a4\/otp,yangchengjian\/otp,hairyhum\/otp,emacsmirror\/erlang,fenollp\/otp,derek121\/otp,paulcager\/otp,bjorng\/otp,c-rack\/otp,bjorng\/otp,vinoski\/otp,vinoski\/otp,VincentHHL\/otp,massemanet\/otp,bernardd\/otp,johanclaesson\/otp,massemanet\/otp,lightcyphers\/otp,ahmedshafeeq\/otp,entropiae\/otp,VincentHHL\/otp,lucafavatella\/otp,dgud\/otp,goertzenator\/otp,paulcager\/otp,vladdu\/otp,potatosalad\/otp,legoscia\/otp,electricimp\/otp,release-project\/otp,jemsbhai\/otp,fenollp\/otp,NOMORECOFFEE\/otp,marquisthunder\/otp,c-rack\/otp,ahmedshafeeq\/otp,vladdu\/otp,RoadRunnr\/otp,beni55\/otp,matwey\/otp,vladdu\/otp,cobusc\/otp,c-rack\/otp,paulcager\/otp,beni55\/otp,bjorng\/otp,lemenkov\/otp,vic\/otp,neeraj9\/otp,weisslj\/otp,lemenkov\/otp,derek121\/otp,vladdu\/otp,vic\/otp,jamesruan\/otp,lightcyphers\/otp,isvilen\/otp,sdebnath\/otp,ader1990\/otp,weisslj\/otp,lightcyphers\/otp,schlagert\/otp,sitexa\/otp,basho\/otp,ahmedshafeeq\/otp,GinjaNinja32\/otp,RichMorin\/otp,hairyhum\/otp,yangchengjian\/otp,weisslj\/otp,tuncer\/otp,palas\/otp,jj1bdx\/otp,paladim\/otp,jamesruan\/otp,platinumthinker\/otp,RJ\/otp,legoscia\/otp,RichMorin\/otp,lucafavatella\/otp,cobusc\/otp,riverrun\/otp,emile\/otp,bugs-erlang-org\/otp,ader1990\/otp,goertzenator\/otp,isvilen\/otp,johanclaesson\/otp,dumbbell\/otp,RichMorin\/otp,emacsmirror\/erlang,palas\/otp,paladim\/otp,jemsbhai\/otp,marquisthunder\/otp,fenollp\/otp,bernardd\/otp,marquisthunder\/otp,klarna\/otp,kvakvs\/otp,lrascao\/otp,lantti\/otp,GinjaNinja32\/otp,massemanet\/otp,psyeugenic\/otp,basho\/otp,lrascao\/otp,isvilen\/otp,matwey\/otp,riverrun\/otp,fenollp\/otp,sdebnath\/otp,sitexa\/otp,falkevik\/otp,bernardd\/otp,jamesruan\/otp,tuncer\/otp,RoadRunnr\/otp,rlipscombe\/otp,erlang\/otp,RoadRunnr\/otp,mikpe\/otp,dumbbell\/otp,goertzenator\/otp,release-project\/otp,palas\/otp,RGafiyatullin\/otp,krishnakumar4a4\/otp,goertzenator\/otp,benoitc\/otp-1,jj1bdx\/otp,psyeugenic\/otp,getong\/otp,basho\/otp,stolen\/otp,lemenkov\/otp,msantos\/otp,lrascao\/otp,kvakvs\/otp,vinoski\/otp,dumbbell\/otp,RaimoNiskanen\/otp,lianghaivv\/otp,lucafavatella\/otp,aboroska\/otp,potatosalad\/otp,erlang\/otp,g-andrade\/otp,hairyhum\/otp,mujiatong\/otp,uabboli\/otp,RaimoNiskanen\/otp,rlipscombe\/otp,yangchengjian\/otp,Teino1978-Corp\/otp,mikpe\/otp,ader1990\/otp,VincentHHL\/otp,entropiae\/otp,dgud\/otp,mujiatong\/otp,psyeugenic\/otp,sdebnath\/otp,platinumthinker\/otp,emacsmirror\/erlang,RJ\/otp,lucafavatella\/otp,awetzel\/otp,electricimp\/otp,jinshana\/otp,lemenkov\/otp,hairyhum\/otp,matwey\/otp,cnbin\/otp,gjaldon\/otp,matwey\/otp,sitexa\/otp,benoitc\/otp-1,fenollp\/otp,schlagert\/otp,bugs-erlang-org\/otp,GinjaNinja32\/otp,johanclaesson\/otp,tuncer\/otp,riverrun\/otp,bjorng\/otp,stolen\/otp,RJ\/otp,RGafiyatullin\/otp,kvakvs\/otp,ader1990\/otp,aboroska\/otp,derek121\/otp,ahmedshafeeq\/otp,falkevik\/otp,stolen\/otp,lrascao\/otp,getong\/otp,riverrun\/otp,legoscia\/otp,bsmr-erlang\/otp,ader1990\/otp,cnbin\/otp,lantti\/otp,haguenau\/otp,RichMorin\/otp,paladim\/otp,vinoski\/otp,stolen\/otp,sammoth-wazoku\/otp,vinoski\/otp,RJ\/otp,schlagert\/otp,NOMORECOFFEE\/otp,aboroska\/otp,sitexa\/otp,jemsbhai\/otp,aboroska\/otp,g-andrade\/otp,jinshana\/otp,aboroska\/otp,derek121\/otp,jemsbhai\/otp,RichMorin\/otp,massemanet\/otp,potatosalad\/otp,stolen\/otp,derek121\/otp,RaimoNiskanen\/otp,sammoth-wazoku\/otp,klarna\/otp,rlipscombe\/otp,falkevik\/otp,getong\/otp,paulcager\/otp,tuncer\/otp,saleyn\/otp,emile\/otp,hairyhum\/otp,dumbbell\/otp,mikpe\/otp,yangchengjian\/otp,legoscia\/otp,beni55\/otp,paladim\/otp,marquisthunder\/otp,jinshana\/otp,falkevik\/otp,GinjaNinja32\/otp,rlipscombe\/otp,mikpe\/otp,klarna\/otp,ferd\/otp,gjaldon\/otp,enikki\/otp,cnbin\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/epmd\/src\/epmd.c\n+++ erts\/epmd\/src\/epmd.c\n@@ -498,11 +498,7 @@\n #ifdef HAVE_SYSLOG_H\n if (onsyslog)\n \t{\n-\t int len;\n-\t len = erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);\n-\t if (perr != 0 && len < sizeof(buf)) {\n-\t erts_snprintf(buf+len, sizeof(buf)-len, \": %s\", strerror(perr));\n-\t }\n+\t erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);\n \t syslog(LOG_ERR,\"epmd: %s\",buf);\n \t}\n #endif\n"} {"commit":"89f91f079dffb17f8f8307c0b9b8ebf4d9d80cc5","subject":"Only populate pitches_mem once when growing loop_mem.","message":"Only populate pitches_mem once when growing loop_mem.\n\nAlso only call grow_loop_mem when recalculate_offsets == 1.\n","repos":"awatry\/libvpx.opencl,awatry\/libvpx.opencl,awatry\/libvpx.opencl,awatry\/libvpx.opencl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp8\/common\/opencl\/loopfilter_cl.c\n+++ vp8\/common\/opencl\/loopfilter_cl.c\n@@ -172,9 +172,7 @@\n \n int err;\n \n- int num_blocks = cm->mb_cols \/ 2 + cm->mb_cols % 2;\n- if (num_blocks > cm->mb_rows)\n- num_blocks = cm->mb_rows;\n+ int num_blocks = cm->MBs;\n \n \/\/Don't reallocate if the memory is already large enough\n if (num_blocks <= loop_mem.num_blocks)\n@@ -579,7 +577,6 @@\n else if (frame_type != cm->last_frame_type)\n vp8_frame_init_loop_filter(lfi, frame_type);\n \n- cl_grow_loop_mem(mbd, post, cm);\n priority_offset = 0;\n filter_offset = 0;\n \n@@ -625,7 +622,10 @@\n recalculate_offsets = 1;\n \n if (recalculate_offsets == 1){\n- cl_populate_loop_mem(mbd, post); \/\/populate pitches_mem\n+ if (cm->MBs <= loop_mem.num_blocks)\n+ cl_populate_loop_mem(mbd, post); \/\/populate pitches_mem\n+ else\n+ cl_grow_loop_mem(mbd, post, cm);\n \n if (priority_offsets != NULL)\n free(priority_offsets);\n"} {"commit":"6be4711c22053a0be84c19b0ad1e7020dc2793d4","subject":"gnutls: buffer app data received during a rehandshake request","message":"gnutls: buffer app data received during a rehandshake request\n\nIf a server requests a rehandshake but then receives application data,\ngnutls 2.x silently buffers that data, but gnutls 3.x returns a\n(non-fatal) error. Do the buffering inside GTlsConnectionGnutls so\nthat 2.x and 3.x end up behaving the same.\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=695062\n","repos":"GNOME\/glib-networking,GNOME\/glib-networking,Distrotech\/glib-networking,Distrotech\/glib-networking,Distrotech\/glib-networking,GNOME\/glib-networking","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tls\/gnutls\/gtlsconnection-gnutls.c\n+++ tls\/gnutls\/gtlsconnection-gnutls.c\n@@ -134,6 +134,7 @@\n gboolean started_handshake, handshaking, ever_handshaked;\n GTask *implicit_handshake;\n GError *handshake_error;\n+ GByteArray *app_data_buf;\n \n gboolean closing, closed;\n \n@@ -296,6 +297,8 @@\n g_clear_object (&gnutls->priv->certificate);\n g_clear_object (&gnutls->priv->peer_certificate);\n g_clear_object (&gnutls->priv->peer_certificate_tmp);\n+\n+ g_clear_pointer (&gnutls->priv->app_data_buf, g_byte_array_unref);\n \n #ifdef HAVE_PKCS11\n p11_kit_pin_unregister_callback (gnutls->priv->interaction_id,\n@@ -735,11 +738,6 @@\n \tgnutls->priv->need_handshake = TRUE;\n g_mutex_unlock (&gnutls->priv->op_mutex);\n return status;\n- }\n- else if (status == GNUTLS_E_GOT_APPLICATION_DATA)\n- {\n- if (gnutls->priv->handshaking && G_IS_TLS_SERVER_CONNECTION (gnutls))\n-\treturn GNUTLS_E_AGAIN;\n }\n else if (\n #ifdef GNUTLS_E_PREMATURE_TERMINATION\n@@ -1167,6 +1165,20 @@\n \n BEGIN_GNUTLS_IO (gnutls, G_IO_IN | G_IO_OUT, TRUE, cancellable);\n ret = gnutls_handshake (gnutls->priv->session);\n+ if (ret == GNUTLS_E_GOT_APPLICATION_DATA)\n+ {\n+ guint8 buf[1024];\n+\n+ \/* Got app data while waiting for rehandshake; buffer it and try again *\/\n+ ret = gnutls_record_recv (gnutls->priv->session, buf, sizeof (buf));\n+ if (ret > -1)\n+\t{\n+\t if (!gnutls->priv->app_data_buf)\n+\t gnutls->priv->app_data_buf = g_byte_array_new ();\n+\t g_byte_array_append (gnutls->priv->app_data_buf, buf, ret);\n+\t ret = GNUTLS_E_AGAIN;\n+\t}\n+ }\n END_GNUTLS_IO (gnutls, G_IO_IN | G_IO_OUT, ret,\n \t\t _(\"Error performing TLS handshake: %s\"), &error);\n \n@@ -1438,6 +1450,17 @@\n {\n gssize ret;\n \n+ if (gnutls->priv->app_data_buf && !gnutls->priv->handshaking)\n+ {\n+ ret = MIN (count, gnutls->priv->app_data_buf->len);\n+ memcpy (buffer, gnutls->priv->app_data_buf->data, ret);\n+ if (ret == gnutls->priv->app_data_buf->len)\n+\tg_clear_pointer (&gnutls->priv->app_data_buf, g_byte_array_unref);\n+ else\n+\tg_byte_array_remove_range (gnutls->priv->app_data_buf, 0, ret);\n+ return ret;\n+ }\n+\n again:\n if (!claim_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_READ,\n \t\t blocking, cancellable, error))\n"} {"commit":"69c4e4e8b4ca8440e5cbb66219a179e73f7b9e9a","subject":"Bluetooth: Fix responding to invalid L2CAP signaling commands","message":"Bluetooth: Fix responding to invalid L2CAP signaling commands\n\nWhen we have an LE link we should not respond to any data on the BR\/EDR\nL2CAP signaling channel (0x0001) and vice-versa when we have a BR\/EDR\nlink we should not respond to LE L2CAP (CID 0x0005) signaling commands.\nThis patch fixes this issue by checking for a valid link type and\nignores data if it is wrong.\n\nSigned-off-by: Johan Hedberg <628991c7b0a19c384f9b99c21ec330ce952bb838@intel.com>\nAcked-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\nSigned-off-by: Gustavo Padovan <029a69b25713d0799b81c0a39685b4c040fa1425@collabora.co.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/bluetooth\/l2cap_core.c\n+++ net\/bluetooth\/l2cap_core.c\n@@ -5311,12 +5311,16 @@\n static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,\n \t\t\t\t\tstruct sk_buff *skb)\n {\n+\tstruct hci_conn *hcon = conn->hcon;\n \tu8 *data = skb->data;\n \tint len = skb->len;\n \tstruct l2cap_cmd_hdr cmd;\n \tint err;\n \n \tl2cap_raw_recv(conn, skb);\n+\n+\tif (hcon->type != LE_LINK)\n+\t\treturn;\n \n \twhile (len >= L2CAP_CMD_HDR_SIZE) {\n \t\tu16 cmd_len;\n@@ -5355,12 +5359,16 @@\n static inline void l2cap_sig_channel(struct l2cap_conn *conn,\n \t\t\t\t struct sk_buff *skb)\n {\n+\tstruct hci_conn *hcon = conn->hcon;\n \tu8 *data = skb->data;\n \tint len = skb->len;\n \tstruct l2cap_cmd_hdr cmd;\n \tint err;\n \n \tl2cap_raw_recv(conn, skb);\n+\n+\tif (hcon->type != ACL_LINK)\n+\t\treturn;\n \n \twhile (len >= L2CAP_CMD_HDR_SIZE) {\n \t\tu16 cmd_len;\n"} {"commit":"eed4b3b6f8dc33592dd6130bdba624eade6d9d21","subject":"Update RenderPass.h","message":"Update RenderPass.h","repos":"hpicgs\/gloperate,cginternals\/gloperate,cginternals\/gloperate,hpicgs\/gloperate,j-o\/gloperate,j-o\/gloperate,cginternals\/gloperate,hpicgs\/gloperate,j-o\/gloperate,hpicgs\/gloperate,hpicgs\/gloperate,cginternals\/gloperate,j-o\/gloperate","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/gloperate\/include\/gloperate\/rendering\/RenderPass.h\n+++ source\/gloperate\/include\/gloperate\/rendering\/RenderPass.h\n@@ -538,7 +538,7 @@\n \n protected:\n globjects::ref_ptr m_stateBefore; \/\/\/< State applied before rendering\n- globjects::ref_ptr m_stateAfter ; \/\/\/< State applied after rendering\n+ globjects::ref_ptr m_stateAfter; \/\/\/< State applied after rendering\n globjects::ref_ptr m_geometry; \/\/\/< Geometry rendered by the render pass\n globjects::ref_ptr m_program; \/\/\/< Program used for rendering\n globjects::ref_ptr m_programPipeline; \/\/\/< Program pipeline used for rendering\n"} {"commit":"cace738093348cb8b1c12b26a83d527c0a92c667","subject":"check for invalid cnv","message":"check for invalid cnv\n","repos":"dellytools\/delly,dellytools\/delly,dellytools\/delly","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/classify.h\n+++ src\/classify.h\n@@ -144,7 +144,12 @@\n typedef std::vector TSampleDist;\n TSampleDist control;\n TSampleDist tumor;\n+ bool invalidCNV = false;\n for (int i = 0; i < bcf_hdr_nsamples(hdr); ++i) {\n+ if ((!std::isfinite(rdcn[i])) || (rdcn[i] == -1)) {\n+\tinvalidCNV = true;\n+\tbreak;\n+ }\n if ((germline) || (c.controlSet.find(hdr->samples[i]) != c.controlSet.end())) {\n \t\/\/ Control or population genomics\n \tcontrol.push_back(std::make_pair(rdcn[i], rdsd[i]));\n@@ -153,6 +158,7 @@\n \ttumor.push_back(std::make_pair(rdcn[i], rdsd[i]));\n }\n }\n+ if (invalidCNV) continue;\n \n \/\/ Classify\n if (!germline) {\n"} {"commit":"dc23835793e208961d1198a1f5acfc283be99aab","subject":"Testing cruft","message":"Testing cruft\n","repos":"SHA2017-badge\/micropython-esp32,SHA2017-badge\/micropython-esp32,SHA2017-badge\/micropython-esp32,SHA2017-badge\/micropython-esp32,SHA2017-badge\/micropython-esp32","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- esp32\/mpconfigport.h\n+++ esp32\/mpconfigport.h\n@@ -87,7 +87,6 @@\n #define MICROPY_PY_BUILTINS_HELP_MODULES (1)\n #define MICROPY_PY___FILE__ (1)\n #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)\n-#define MICROPY_PY_OS_DUPTERM (1)\n #define MICROPY_PY_ARRAY (1)\n #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)\n #define MICROPY_PY_ATTRTUPLE (1)\n@@ -139,8 +138,6 @@\n #define MICROPY_PY_USSL (1)\n #define MICROPY_SSL_MBEDTLS (1)\n #define MICROPY_PY_WEBSOCKET (0)\n-#define MICROPY_PY_WEBREPL (1)\n-#define MICROPY_PY_WEBREPL_DELAY (20)\n #define MICROPY_PY_FRAMEBUF (1)\n #define MICROPY_PY_BTREE (0)\n \n"} {"commit":"677b5375aa3ae07ca07fb73d3dbe6c7ec8dd660c","subject":"vp9_temporal_filter.c static analysis issue resolution","message":"vp9_temporal_filter.c static analysis issue resolution\n\nChange-Id: I08a4364672cf8171932e8e85fb74fcbfa4b27d2d\n","repos":"jacklicn\/webm.libvpx,matanbs\/vp982,abwiz0086\/webm.libvpx,webmproject\/libvpx,kim42083\/webm.libvpx,shacklettbp\/aom,ittiamvpx\/libvpx-1,mwgoldsmith\/vpx,ShiftMediaProject\/libvpx,Topopiccione\/libvpx,openpeer\/libvpx_new,Topopiccione\/libvpx,hsueceumd\/test_hui,hsueceumd\/test_hui,VTCSecureLLC\/libvpx,gshORTON\/webm.libvpx,mbebenita\/aom,Suvarna1488\/webm.libvpx,zofuthan\/libvpx,pcwalton\/libvpx,jmvalin\/aom,Distrotech\/libvpx,running770\/libvpx,pcwalton\/libvpx,shacklettbp\/aom,shareefalis\/libvpx,shacklettbp\/aom,luctrudeau\/aom,ShiftMediaProject\/libvpx,felipebetancur\/libvpx,thdav\/aom,thdav\/aom,gshORTON\/webm.libvpx,Suvarna1488\/webm.libvpx,matanbs\/vp982,luctrudeau\/aom,iniwf\/webm.libvpx,Topopiccione\/libvpx,liqianggao\/libvpx,stewnorriss\/libvpx,Topopiccione\/libvpx,goodleixiao\/vpx,jdm\/libvpx,charup\/https---github.com-webmproject-libvpx-,Acidburn0zzz\/webm.libvpx,ittiamvpx\/libvpx,kim42083\/webm.libvpx,stewnorriss\/libvpx,stewnorriss\/libvpx,kalli123\/webm.libvpx,altogother\/webm.libvpx,gshORTON\/webm.libvpx,VTCSecureLLC\/libvpx,ittiamvpx\/libvpx-1,jdm\/libvpx,liqianggao\/libvpx,WebRTC-Labs\/libvpx,running770\/libvpx,mbebenita\/aom,altogother\/webm.libvpx,goodleixiao\/vpx,mwgoldsmith\/vpx,jacklicn\/webm.libvpx,Acidburn0zzz\/webm.libvpx,hsueceumd\/test_hui,Topopiccione\/libvpx,reimaginemedia\/webm.libvpx,mbebenita\/aom,kleopatra999\/webm.libvpx,jmvalin\/aom,stewnorriss\/libvpx,ittiamvpx\/libvpx-1,VTCSecureLLC\/libvpx,zofuthan\/libvpx,stewnorriss\/libvpx,felipebetancur\/libvpx,matanbs\/vp982,Distrotech\/libvpx,Suvarna1488\/webm.libvpx,mwgoldsmith\/libvpx,lyx2014\/libvpx_c,mbebenita\/aom,kleopatra999\/webm.libvpx,iniwf\/webm.libvpx,matanbs\/webm.libvpx,smarter\/aom,mwgoldsmith\/libvpx,charup\/https---github.com-webmproject-libvpx-,mbebenita\/aom,kleopatra999\/webm.libvpx,Maria1099\/webm.libvpx,kleopatra999\/webm.libvpx,jmvalin\/aom,kim42083\/webm.libvpx,ShiftMediaProject\/libvpx,matanbs\/webm.libvpx,mwgoldsmith\/libvpx,Maria1099\/webm.libvpx,abwiz0086\/webm.libvpx,ittiamvpx\/libvpx-1,stewnorriss\/libvpx,WebRTC-Labs\/libvpx,jmvalin\/aom,zofuthan\/libvpx,WebRTC-Labs\/libvpx,matanbs\/vp982,jacklicn\/webm.libvpx,VTCSecureLLC\/libvpx,gshORTON\/webm.libvpx,Laknot\/libvpx,matanbs\/webm.libvpx,n4t\/libvpx,reimaginemedia\/webm.libvpx,Maria1099\/webm.libvpx,liqianggao\/libvpx,hsueceumd\/test_hui,kleopatra999\/webm.libvpx,n4t\/libvpx,GrokImageCompression\/aom,matanbs\/webm.libvpx,webmproject\/libvpx,jacklicn\/webm.libvpx,pcwalton\/libvpx,matanbs\/webm.libvpx,zofuthan\/libvpx,kalli123\/webm.libvpx,ittiamvpx\/libvpx,charup\/https---github.com-webmproject-libvpx-,felipebetancur\/libvpx,thdav\/aom,pcwalton\/libvpx,shyamalschandra\/libvpx,smarter\/aom,n4t\/libvpx,shareefalis\/libvpx,openpeer\/libvpx_new,running770\/libvpx,reimaginemedia\/webm.libvpx,mbebenita\/aom,reimaginemedia\/webm.libvpx,Suvarna1488\/webm.libvpx,liqianggao\/libvpx,Laknot\/libvpx,mwgoldsmith\/vpx,jmvalin\/aom,ittiamvpx\/libvpx,webmproject\/libvpx,Laknot\/libvpx,GrokImageCompression\/aom,shyamalschandra\/libvpx,Acidburn0zzz\/webm.libvpx,hsueceumd\/test_hui,GrokImageCompression\/aom,jacklicn\/webm.libvpx,jdm\/libvpx,VTCSecureLLC\/libvpx,lyx2014\/libvpx_c,ittiamvpx\/libvpx,mbebenita\/aom,abwiz0086\/webm.libvpx,luctrudeau\/aom,ShiftMediaProject\/libvpx,abwiz0086\/webm.libvpx,Suvarna1488\/webm.libvpx,gshORTON\/webm.libvpx,kalli123\/webm.libvpx,altogother\/webm.libvpx,shacklettbp\/aom,jdm\/libvpx,Acidburn0zzz\/webm.libvpx,GrokImageCompression\/aom,Distrotech\/libvpx,luctrudeau\/aom,matanbs\/vp982,thdav\/aom,running770\/libvpx,ittiamvpx\/libvpx,n4t\/libvpx,shyamalschandra\/libvpx,VTCSecureLLC\/libvpx,WebRTC-Labs\/libvpx,mwgoldsmith\/vpx,jdm\/libvpx,lyx2014\/libvpx_c,zofuthan\/libvpx,thdav\/aom,kim42083\/webm.libvpx,kalli123\/webm.libvpx,ittiamvpx\/libvpx-1,Maria1099\/webm.libvpx,kim42083\/webm.libvpx,kalli123\/webm.libvpx,mwgoldsmith\/libvpx,shyamalschandra\/libvpx,Distrotech\/libvpx,lyx2014\/libvpx_c,lyx2014\/libvpx_c,kleopatra999\/webm.libvpx,matanbs\/vp982,hsueceumd\/test_hui,iniwf\/webm.libvpx,zofuthan\/libvpx,pcwalton\/libvpx,goodleixiao\/vpx,n4t\/libvpx,openpeer\/libvpx_new,openpeer\/libvpx_new,charup\/https---github.com-webmproject-libvpx-,shareefalis\/libvpx,shyamalschandra\/libvpx,iniwf\/webm.libvpx,jmvalin\/aom,mbebenita\/aom,iniwf\/webm.libvpx,iniwf\/webm.libvpx,lyx2014\/libvpx_c,shareefalis\/libvpx,mwgoldsmith\/vpx,openpeer\/libvpx_new,felipebetancur\/libvpx,Laknot\/libvpx,liqianggao\/libvpx,mwgoldsmith\/vpx,smarter\/aom,webmproject\/libvpx,abwiz0086\/webm.libvpx,mwgoldsmith\/libvpx,ittiamvpx\/libvpx-1,running770\/libvpx,Suvarna1488\/webm.libvpx,openpeer\/libvpx_new,webmproject\/libvpx,goodleixiao\/vpx,altogother\/webm.libvpx,felipebetancur\/libvpx,Distrotech\/libvpx,goodleixiao\/vpx,Acidburn0zzz\/webm.libvpx,altogother\/webm.libvpx,jacklicn\/webm.libvpx,Distrotech\/libvpx,luctrudeau\/aom,shareefalis\/libvpx,matanbs\/vp982,reimaginemedia\/webm.libvpx,shacklettbp\/aom,mbebenita\/aom,webmproject\/libvpx,ShiftMediaProject\/libvpx,jdm\/libvpx,Laknot\/libvpx,smarter\/aom,luctrudeau\/aom,kalli123\/webm.libvpx,GrokImageCompression\/aom,charup\/https---github.com-webmproject-libvpx-,Maria1099\/webm.libvpx,smarter\/aom,GrokImageCompression\/aom,matanbs\/webm.libvpx,liqianggao\/libvpx,felipebetancur\/libvpx,goodleixiao\/vpx,charup\/https---github.com-webmproject-libvpx-,WebRTC-Labs\/libvpx,kim42083\/webm.libvpx,smarter\/aom,altogother\/webm.libvpx,shacklettbp\/aom,ittiamvpx\/libvpx,shyamalschandra\/libvpx,pcwalton\/libvpx,Maria1099\/webm.libvpx,Topopiccione\/libvpx,reimaginemedia\/webm.libvpx,running770\/libvpx,gshORTON\/webm.libvpx,abwiz0086\/webm.libvpx,Laknot\/libvpx,shareefalis\/libvpx,thdav\/aom,mwgoldsmith\/libvpx,Acidburn0zzz\/webm.libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_temporal_filter.c\n+++ vp9\/encoder\/vp9_temporal_filter.c\n@@ -29,7 +29,6 @@\n #include \"vpx_scale\/vpx_scale.h\"\n \n #define ALT_REF_MC_ENABLED 1 \/\/ dis\/enable MC in AltRef filtering\n-#define ALT_REF_SUBPEL_ENABLED 1 \/\/ dis\/enable subpel in MC AltRef filtering\n \n static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd,\n uint8_t *y_mb_ptr,\n@@ -160,11 +159,9 @@\n \n \/*cpi->sf.search_method == HEX*\/\n \/\/ Ignore mv costing by sending NULL pointer instead of cost arrays\n- bestsme = vp9_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1,\n- &cpi->fn_ptr[BLOCK_16X16],\n- 0, &best_ref_mv1, ref_mv);\n-\n-#if ALT_REF_SUBPEL_ENABLED\n+ vp9_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1,\n+ &cpi->fn_ptr[BLOCK_16X16], 0, &best_ref_mv1, ref_mv);\n+\n \/\/ Try sub-pixel MC?\n \/\/ if (bestsme > error_thresh && bestsme < INT_MAX)\n {\n@@ -180,7 +177,6 @@\n NULL, NULL,\n &distortion, &sse);\n }\n-#endif\n \n \/\/ Restore input state\n x->plane[0].src = src;\n"} {"commit":"4c89b6aad5b7c5c56dadca66af6ceae0addbf2bf","subject":"Bluetooth: Factor out common L2CAP connection code","message":"Bluetooth: Factor out common L2CAP connection code\n\nL2CAP connect requests and create channel requests share a significant\namount of code. This change moves common code to a new function.\n\nSigned-off-by: Mat Martineau \nSigned-off-by: Andrei Emeltchenko \nAcked-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\nSigned-off-by: Gustavo Padovan <029a69b25713d0799b81c0a39685b4c040fa1425@collabora.co.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/bluetooth\/l2cap_core.c\n+++ net\/bluetooth\/l2cap_core.c\n@@ -3394,7 +3394,8 @@\n \treturn 0;\n }\n \n-static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u8 *data)\n+static void __l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd,\n+\t\t\t u8 *data, u8 rsp_code, u8 amp_id)\n {\n \tstruct l2cap_conn_req *req = (struct l2cap_conn_req *) data;\n \tstruct l2cap_conn_rsp rsp;\n@@ -3488,7 +3489,7 @@\n \trsp.dcid = cpu_to_le16(dcid);\n \trsp.result = cpu_to_le16(result);\n \trsp.status = cpu_to_le16(status);\n-\tl2cap_send_cmd(conn, cmd->ident, L2CAP_CONN_RSP, sizeof(rsp), &rsp);\n+\tl2cap_send_cmd(conn, cmd->ident, rsp_code, sizeof(rsp), &rsp);\n \n \tif (result == L2CAP_CR_PEND && status == L2CAP_CS_NO_INFO) {\n \t\tstruct l2cap_info_req info;\n@@ -3511,7 +3512,12 @@\n \t\t\t\t\tl2cap_build_conf_req(chan, buf), buf);\n \t\tchan->num_conf_req++;\n \t}\n-\n+}\n+\n+static int l2cap_connect_req(struct l2cap_conn *conn,\n+\t\t\t struct l2cap_cmd_hdr *cmd, u8 *data)\n+{\n+\t__l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);\n \treturn 0;\n }\n \n"} {"commit":"192910a6cca5e50e5bd6cbd1da0e7376c7adfe62","subject":"net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST","message":"net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST\n\ncontrolling igmp_max_membership is useful even when IP_MULTICAST\nis off.\nQuagga(an OSPF deamon) uses multicast addresses for all interfaces\nusing a single socket and hits igmp_max_membership limit when\nthere are 20 interfaces or more.\nAlways export sysctl igmp_max_memberships in proc, just like\nigmp_max_msf\n\nSigned-off-by: Joakim Tjernlund <28ec1adb181e0f7ff73a9ed1532c061a187559fb@transmode.se>\nSigned-off-by: David S. Miller \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/ipv4\/sysctl_net_ipv4.c\n+++ net\/ipv4\/sysctl_net_ipv4.c\n@@ -311,7 +311,6 @@\n \t\t.mode\t\t= 0644,\n \t\t.proc_handler\t= proc_do_large_bitmap,\n \t},\n-#ifdef CONFIG_IP_MULTICAST\n \t{\n \t\t.procname\t= \"igmp_max_memberships\",\n \t\t.data\t\t= &sysctl_igmp_max_memberships,\n@@ -319,8 +318,6 @@\n \t\t.mode\t\t= 0644,\n \t\t.proc_handler\t= proc_dointvec\n \t},\n-\n-#endif\n \t{\n \t\t.procname\t= \"igmp_max_msf\",\n \t\t.data\t\t= &sysctl_igmp_max_msf,\n"} {"commit":"bee0b40c0621396326d1c17b81833f59118a2d80","subject":"[IPSEC] beet: Fix extension header support on output","message":"[IPSEC] beet: Fix extension header support on output\n\nThe beet output function completely kills any extension headers by replacing\nthem with the IPv6 header. This is because it essentially ignores the\nresult of ip6_find_1stfragopt by simply acting as if there aren't any\nextension headers.\n\nSigned-off-by: Herbert Xu \nSigned-off-by: David S. Miller \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/ipv6\/xfrm6_mode_beet.c\n+++ net\/ipv6\/xfrm6_mode_beet.c\n@@ -44,9 +44,9 @@\n \thdr_len = ip6_find_1stfragopt(skb, &prevhdr);\n \tmemmove(skb->data, iph, hdr_len);\n \n-\tskb_set_mac_header(skb, offsetof(struct ipv6hdr, nexthdr));\n+\tskb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);\n \tskb_reset_network_header(skb);\n-\tskb_set_transport_header(skb, sizeof(struct ipv6hdr));\n+\tskb_set_transport_header(skb, hdr_len);\n \ttop_iph = ipv6_hdr(skb);\n \n \tipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);\n"} {"commit":"5c6761adc77c131ef1601016f9ebbad0a9ae6d1a","subject":"mac80211: remove unnecessary null test before debugfs_remove()","message":"mac80211: remove unnecessary null test before debugfs_remove()\n\nThe debugfs_remove() function can safely take NULL parameters\nso the additionally null test isn't required, and there's no\nother reason to have it here, so remove it.\n\nSigned-off-by: Fabian Frederick <3efd2a027b14fd890cd23a9ef6d1134b4e5ad850@skynet.be>\n[rewrite commit message, re-introduce blank line after assert]\nSigned-off-by: Johannes Berg \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"22e0e62cd09dcf56fe1a7be66698b6e130e4314c","subject":"[NETFILTER]: xt_iprange: fix sparse warnings","message":"[NETFILTER]: xt_iprange: fix sparse warnings\n\n CHECK net\/netfilter\/xt_iprange.c\nnet\/netfilter\/xt_iprange.c:104:19: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:37: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:19: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:37: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:19: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:37: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:19: warning: restricted degrades to integer\nnet\/netfilter\/xt_iprange.c:104:37: warning: restricted degrades to integer\n\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\nSigned-off-by: David S. Miller \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/netfilter\/xt_iprange.c\n+++ net\/netfilter\/xt_iprange.c\n@@ -101,7 +101,7 @@\n \tint r;\n \n \tfor (i = 0; i < 4; ++i) {\n-\t\tr = a->s6_addr32[i] - b->s6_addr32[i];\n+\t\tr = (__force u32)a->s6_addr32[i] - (__force u32)b->s6_addr32[i];\n \t\tif (r != 0)\n \t\t\treturn r;\n \t}\n"} {"commit":"f422e25608b7a37d7a7056715957d926f93adc88","subject":"With adding ipsec tags and exporting flow filters via sysctl SADB_GET needs to be allowed to export that information too. Thus, adjust sadb_exts_allowed_out[] accordingly.","message":"With adding ipsec tags and exporting flow filters via sysctl SADB_GET\nneeds to be allowed to export that information too. Thus, adjust\nsadb_exts_allowed_out[] accordingly.\n\nThis fixes isakmpd not being able to get the in-kernel last-used-counters\nof SAs, which are needed for DPD.\n\nok ho@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net\/pfkeyv2_parsemessage.c\n+++ net\/pfkeyv2_parsemessage.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: pfkeyv2_parsemessage.c,v 1.41 2006\/11\/24 13:52:14 reyk Exp $\t*\/\n+\/*\t$OpenBSD: pfkeyv2_parsemessage.c,v 1.42 2007\/07\/30 11:43:59 hshoexer Exp $\t*\/\n \n \/*\n *\t@(#)COPYRIGHT\t1.1 (NRL) 17 January 1995\n@@ -217,7 +217,7 @@\n \t\/* DELETE *\/\n \tBITMAP_SA | BITMAP_ADDRESS_SRC | BITMAP_ADDRESS_DST,\n \t\/* GET *\/\n-\tBITMAP_SA | BITMAP_LIFETIME | BITMAP_ADDRESS | BITMAP_KEY | BITMAP_IDENTITY | BITMAP_X_CREDENTIALS | BITMAP_X_UDPENCAP | BITMAP_X_LIFETIME_LASTUSE,\n+\tBITMAP_SA | BITMAP_LIFETIME | BITMAP_ADDRESS | BITMAP_KEY | BITMAP_IDENTITY | BITMAP_X_CREDENTIALS | BITMAP_X_UDPENCAP | BITMAP_X_LIFETIME_LASTUSE | BITMAP_X_SRC_MASK | BITMAP_X_DST_MASK | BITMAP_X_PROTOCOL | BITMAP_X_FLOW_TYPE | BITMAP_X_SRC_FLOW | BITMAP_X_DST_FLOW | BITMAP_X_TAG,\n \t\/* ACQUIRE *\/\n \tBITMAP_ADDRESS_SRC | BITMAP_ADDRESS_DST | BITMAP_IDENTITY | BITMAP_PROPOSAL | BITMAP_X_CREDENTIALS,\n \t\/* REGISTER *\/\n"} {"commit":"7c7c339bbf2ffc425f7a1af3e929983d8d91819b","subject":"Fix comment in IMP-361","message":"Fix comment in IMP-361\n","repos":"gistic\/PublicSpatialImpala,XiaominZhang\/Impala,andybab\/Impala,AtScaleInc\/Impala,grundprinzip\/Impala,lirui-intel\/Impala,gerashegalov\/Impala,rampage644\/impala-cut,bratatidas9\/Impala-1,henryr\/Impala,lirui-intel\/Impala,ImpalaToGo\/ImpalaToGo,mapr\/impala,grundprinzip\/Impala,grundprinzip\/Impala,rampage644\/impala-cut,mapr\/impala,bowlofstew\/Impala,grundprinzip\/Impala,andybab\/Impala,theyaa\/Impala,rdblue\/Impala,theyaa\/Impala,tempbottle\/Impala,bratatidas9\/Impala-1,placrosse\/ImpalaToGo,tempbottle\/Impala,cloudera\/recordservice,placrosse\/ImpalaToGo,lirui-intel\/Impala,ibmsoe\/ImpalaPPC,henryr\/Impala,rdblue\/Impala,tempbottle\/Impala,mapr\/impala,scalingdata\/Impala,cchanning\/Impala,lnliuxing\/Impala,caseyching\/Impala,gerashegalov\/Impala,rampage644\/impala-cut,tempbottle\/Impala,lnliuxing\/Impala,theyaa\/Impala,lnliuxing\/Impala,gerashegalov\/Impala,kapilrastogi\/Impala,AtScaleInc\/Impala,cgvarela\/Impala,kapilrastogi\/Impala,bratatidas9\/Impala-1,cchanning\/Impala,XiaominZhang\/Impala,placrosse\/ImpalaToGo,gerashegalov\/Impala,gistic\/PublicSpatialImpala,cchanning\/Impala,brightchen\/Impala,cchanning\/Impala,caseyching\/Impala,brightchen\/Impala,gerashegalov\/Impala,bowlofstew\/Impala,rdblue\/Impala,XiaominZhang\/Impala,cloudera\/recordservice,caseyching\/Impala,ImpalaToGo\/ImpalaToGo,theyaa\/Impala,lnliuxing\/Impala,tempbottle\/Impala,rampage644\/impala-cut,cloudera\/recordservice,andybab\/Impala,kapilrastogi\/Impala,tempbottle\/Impala,kapilrastogi\/Impala,theyaa\/Impala,rampage644\/impala-cut,gistic\/PublicSpatialImpala,caseyching\/Impala,cloudera\/recordservice,tempbottle\/Impala,ibmsoe\/ImpalaPPC,scalingdata\/Impala,andybab\/Impala,ibmsoe\/ImpalaPPC,kapilrastogi\/Impala,brightchen\/Impala,bratatidas9\/Impala-1,lnliuxing\/Impala,scalingdata\/Impala,XiaominZhang\/Impala,lnliuxing\/Impala,bratatidas9\/Impala-1,bowlofstew\/Impala,mapr\/impala,ibmsoe\/ImpalaPPC,cgvarela\/Impala,grundprinzip\/Impala,placrosse\/ImpalaToGo,rampage644\/impala-cut,rdblue\/Impala,andybab\/Impala,gistic\/PublicSpatialImpala,cloudera\/recordservice,brightchen\/Impala,ImpalaToGo\/ImpalaToGo,XiaominZhang\/Impala,henryr\/Impala,bratatidas9\/Impala-1,XiaominZhang\/Impala,ibmsoe\/ImpalaPPC,AtScaleInc\/Impala,rdblue\/Impala,scalingdata\/Impala,caseyching\/Impala,henryr\/Impala,caseyching\/Impala,brightchen\/Impala,bowlofstew\/Impala,scalingdata\/Impala,cloudera\/recordservice,mapr\/impala,henryr\/Impala,theyaa\/Impala,bowlofstew\/Impala,lnliuxing\/Impala,lirui-intel\/Impala,gistic\/PublicSpatialImpala,rdblue\/Impala,bowlofstew\/Impala,cgvarela\/Impala,kapilrastogi\/Impala,placrosse\/ImpalaToGo,bowlofstew\/Impala,cloudera\/recordservice,placrosse\/ImpalaToGo,cgvarela\/Impala,cchanning\/Impala,kapilrastogi\/Impala,cgvarela\/Impala,ImpalaToGo\/ImpalaToGo,gistic\/PublicSpatialImpala,ibmsoe\/ImpalaPPC,brightchen\/Impala,cchanning\/Impala,brightchen\/Impala,AtScaleInc\/Impala,scalingdata\/Impala,ImpalaToGo\/ImpalaToGo,cchanning\/Impala,theyaa\/Impala,ImpalaToGo\/ImpalaToGo,caseyching\/Impala,cgvarela\/Impala,andybab\/Impala,cgvarela\/Impala,XiaominZhang\/Impala,AtScaleInc\/Impala,lirui-intel\/Impala,bratatidas9\/Impala-1,gerashegalov\/Impala,lirui-intel\/Impala,henryr\/Impala,AtScaleInc\/Impala,gerashegalov\/Impala,lirui-intel\/Impala,ibmsoe\/ImpalaPPC,grundprinzip\/Impala,rdblue\/Impala","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- be\/src\/service\/impala-server.h\n+++ be\/src\/service\/impala-server.h\n@@ -644,7 +644,7 @@\n \/\/ Must be called with profile_log_file_lock_ held.\n Status OpenProfileLogFile(bool reopen);\n \n- \/\/ Runs once every 5s to flush the query archival file to disk.\n+ \/\/ Runs once every 5s to flush the profile log file to disk.\n void LogFileFlushThread();\n \n \/\/ Copies a query's state into the query log. Called immediately prior to a\n"} {"commit":"b697a298454b178dfa307059edaf6ba665a72262","subject":"Check the LOCAL_AUTH payload.","message":"Check the LOCAL_AUTH payload.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net\/pfkeyv2_parsemessage.c\n+++ net\/pfkeyv2_parsemessage.c\n@@ -60,9 +60,10 @@\n #define BITMAP_X_SA2 (1 << SADB_X_EXT_SA2)\n #define BITMAP_X_DST2 (1 << SADB_X_EXT_DST2)\n #define BITMAP_X_POLICY (1 << SADB_X_EXT_POLICY)\n-#define BITMAP_X_LOCAL_CREDENTIALS (1 << SADB_X_EXT_LOCAL_CREDENTIALS)\n-#define BITMAP_X_REMOTE_CREDENTIALS (1 << SADB_X_EXT_REMOTE_CREDENTIALS)\n-#define BITMAP_X_CREDENTIALS (BITMAP_X_LOCAL_CREDENTIALS | BITMAP_X_REMOTE_CREDENTIALS)\n+#define BITMAP_X_LOCAL_CREDENTIALS (1 << SADB_X_EXT_LOCAL_CREDENTIALS)\n+#define BITMAP_X_REMOTE_CREDENTIALS (1 << SADB_X_EXT_REMOTE_CREDENTIALS)\n+#define BITMAP_X_LOCAL_AUTH (1 << SADB_X_EXT_LOCAL_AUTH)\n+#define BITMAP_X_CREDENTIALS (BITMAP_X_LOCAL_CREDENTIALS | BITMAP_X_REMOTE_CREDENTIALS | BITMAP_X_LOCAL_AUTH)\n #define BITMAP_X_FLOW (BITMAP_X_SRC_MASK | BITMAP_X_DST_MASK | BITMAP_X_PROTOCOL | BITMAP_X_SRC_FLOW | BITMAP_X_DST_FLOW)\n \n uint32_t sadb_exts_allowed_in[SADB_MAX+1] =\n@@ -418,6 +419,20 @@\n \t return EINVAL;\n \t}\n \tbreak;\n+ case SADB_X_EXT_LOCAL_AUTH:\n+ {\n+\t struct sadb_cred *sadb_cred = (struct sadb_cred *)p;\n+\n+\t if (i < sizeof(struct sadb_cred))\n+\t return EINVAL;\n+\n+\t if (sadb_cred->sadb_cred_type > SADB_AUTHTYPE_MAX)\n+\t return EINVAL;\n+\n+\t if (sadb_cred->sadb_cred_reserved)\n+\t return EINVAL;\n+\t}\n+\tbreak;\n case SADB_X_EXT_LOCAL_CREDENTIALS:\n case SADB_X_EXT_REMOTE_CREDENTIALS:\n \t{\n"} {"commit":"1041572769566375e4a91dc27e7c95caf1129201","subject":"Remove commented-out code.","message":"Remove commented-out code.\n","repos":"shdown\/i3,stapelberg\/i3,Matmusia\/i3,avrelaun\/i3,strake\/i3,acrisci\/i3,cornerman\/i3,i3\/i3,Airblader\/i3,Chr1stoph\/i3,Airblader\/i3,Airblader\/i3,Airblader\/i3,MForster\/i3,Airblader\/i3-original,Airblader\/i3-original,strake\/i3,strake\/i3,Airblader\/i3-original,Matmusia\/i3,avrelaun\/i3,EvilPudding\/i3,EvilPudding\/i3,stapelberg\/i3,acrisci\/i3,MForster\/i3,Chr1stoph\/i3,Airblader\/i3-original,i3\/i3,shdown\/i3,cornerman\/i3,stapelberg\/i3,cornerman\/i3,acrisci\/i3,stapelberg\/i3,MForster\/i3,acrisci\/i3,avrelaun\/i3,MForster\/i3,shdown\/i3,cornerman\/i3,strake\/i3,shdown\/i3,EvilPudding\/i3,i3\/i3,i3\/i3,Airblader\/i3-original,Matmusia\/i3,strake\/i3,Chr1stoph\/i3,Chr1stoph\/i3,avrelaun\/i3,EvilPudding\/i3,acrisci\/i3,Matmusia\/i3","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/commands.c\n+++ src\/commands.c\n@@ -142,102 +142,6 @@\n return workspace;\n }\n \n-\/\/ This code is commented out because we might recycle it for popping up error\n-\/\/ messages on parser errors.\n-#if 0\n-static pid_t migration_pid = -1;\n-\n-\/*\n- * Handler which will be called when we get a SIGCHLD for the nagbar, meaning\n- * it exited (or could not be started, depending on the exit code).\n- *\n- *\/\n-static void nagbar_exited(EV_P_ ev_child *watcher, int revents) {\n- ev_child_stop(EV_A_ watcher);\n- if (!WIFEXITED(watcher->rstatus)) {\n- fprintf(stderr, \"ERROR: i3-nagbar did not exit normally.\\n\");\n- return;\n- }\n-\n- int exitcode = WEXITSTATUS(watcher->rstatus);\n- printf(\"i3-nagbar process exited with status %d\\n\", exitcode);\n- if (exitcode == 2) {\n- fprintf(stderr, \"ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\\n\");\n- }\n-\n- migration_pid = -1;\n-}\n-\n-\/* We need ev >= 4 for the following code. Since it is not *that* important (it\n- * only makes sure that there are no i3-nagbar instances left behind) we still\n- * support old systems with libev 3. *\/\n-#if EV_VERSION_MAJOR >= 4\n-\/*\n- * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal\n- * SIGKILL (9) to make sure there are no left-over i3-nagbar processes.\n- *\n- *\/\n-static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) {\n- if (migration_pid != -1) {\n- LOG(\"Sending SIGKILL (9) to i3-nagbar with PID %d\\n\", migration_pid);\n- kill(migration_pid, SIGKILL);\n- }\n-}\n-#endif\n-\n-void cmd_MIGRATION_start_nagbar(void) {\n- if (migration_pid != -1) {\n- fprintf(stderr, \"i3-nagbar already running.\\n\");\n- return;\n- }\n- fprintf(stderr, \"Starting i3-nagbar, command parsing differs from expected output.\\n\");\n- ELOG(\"Please report this on IRC or in the bugtracker. Make sure to include the full debug level logfile:\\n\");\n- ELOG(\"i3-dump-log | gzip -9c > \/tmp\/i3.log.gz\\n\");\n- ELOG(\"FYI: Your i3 version is \" I3_VERSION \"\\n\");\n- migration_pid = fork();\n- if (migration_pid == -1) {\n- warn(\"Could not fork()\");\n- return;\n- }\n-\n- \/* child *\/\n- if (migration_pid == 0) {\n- char *pageraction;\n- sasprintf(&pageraction, \"i3-sensible-terminal -e i3-sensible-pager \\\"%s\\\"\", errorfilename);\n- char *argv[] = {\n- NULL, \/* will be replaced by the executable path *\/\n- \"-t\",\n- \"error\",\n- \"-m\",\n- \"You found a parsing error. Please, please, please, report it!\",\n- \"-b\",\n- \"show errors\",\n- pageraction,\n- NULL\n- };\n- exec_i3_utility(\"i3-nagbar\", argv);\n- }\n-\n- \/* parent *\/\n- \/* install a child watcher *\/\n- ev_child *child = smalloc(sizeof(ev_child));\n- ev_child_init(child, &nagbar_exited, migration_pid, 0);\n- ev_child_start(main_loop, child);\n-\n-\/* We need ev >= 4 for the following code. Since it is not *that* important (it\n- * only makes sure that there are no i3-nagbar instances left behind) we still\n- * support old systems with libev 3. *\/\n-#if EV_VERSION_MAJOR >= 4\n- \/* install a cleanup watcher (will be called when i3 exits and i3-nagbar is\n- * still running) *\/\n- ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup));\n- ev_cleanup_init(cleanup, nagbar_cleanup);\n- ev_cleanup_start(main_loop, cleanup);\n-#endif\n-}\n-\n-#endif\n-\n \/*******************************************************************************\n * Criteria functions.\n ******************************************************************************\/\n"} {"commit":"2f0a3f2a82e2305d8223dab456a57e7f5751d786","subject":"Goodbye lobby lobby comments.","message":"Goodbye lobby lobby comments.\n","repos":"Sylverant\/ship_server,Sylverant\/ship_server","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/commands.c\n+++ src\/commands.c\n@@ -61,7 +61,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -94,7 +94,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -150,7 +150,7 @@\n int lvl;\n lobby_t *l = c->cur_lobby;\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type == LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -195,7 +195,7 @@\n int lvl;\n lobby_t *l = c->cur_lobby;\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type == LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -265,7 +265,7 @@\n \"you can do that.\"));\n }\n \n- \/* Make sure that the requester is in a lobby lobby, not a game lobby *\/\n+ \/* Make sure that the requester is in a lobby, not a team *\/\n if(l->type != LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Not valid in a game.\"));\n }\n@@ -310,7 +310,7 @@\n \"you can do that.\"));\n }\n \n- \/* Make sure that the requester is in a lobby lobby, not a game lobby *\/\n+ \/* Make sure that the requester is in a lobby, not a team *\/\n if(l->type != LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Not valid in a game.\"));\n }\n@@ -498,7 +498,7 @@\n lobby_t *l = c->cur_lobby;\n int len = strlen(params), i;\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type == LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -536,7 +536,7 @@\n static int handle_lname(ship_client_t *c, const char *params) {\n lobby_t *l = c->cur_lobby;\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type == LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -835,7 +835,7 @@\n \/* Lock the lobby mutex... we've got some work to do. *\/\n pthread_mutex_lock(&l->mutex);\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n pthread_mutex_unlock(&l->mutex);\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n@@ -1054,7 +1054,7 @@\n \/* Lock the lobby mutex... we've got some work to do. *\/\n pthread_mutex_lock(&l->mutex);\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n pthread_mutex_unlock(&l->mutex);\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n@@ -1103,7 +1103,7 @@\n \/* Lock the lobby mutex... we've got some work to do. *\/\n pthread_mutex_lock(&l->mutex);\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n pthread_mutex_unlock(&l->mutex);\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n@@ -1252,7 +1252,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -1311,7 +1311,7 @@\n \n pthread_mutex_lock(&l->mutex);\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n pthread_mutex_unlock(&l->mutex);\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n@@ -1378,7 +1378,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -1578,7 +1578,7 @@\n \/* Lock the lobby mutex... we've got some work to do. *\/\n pthread_mutex_lock(&l->mutex);\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME) {\n pthread_mutex_unlock(&l->mutex);\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n@@ -2386,7 +2386,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a lobby lobby, not a game lobby *\/\n+ \/* Make sure that the requester is in a lobby, not a team *\/\n if(l->type != LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Not valid in a game.\"));\n }\n@@ -2568,7 +2568,7 @@\n \"you can do that.\"));\n }\n \n- \/* Make sure that the requester is in a lobby lobby, not a game lobby *\/\n+ \/* Make sure that the requester is in a lobby, not a team *\/\n if(l->type != LOBBY_TYPE_DEFAULT) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Not valid in a game.\"));\n }\n@@ -2633,7 +2633,7 @@\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n }\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby *\/\n+ \/* Make sure that the requester is in a team, not a lobby *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -2666,7 +2666,7 @@\n }\n \n if(c->version == CLIENT_VERSION_BB) {\n- \/* Make sure that the requester is in a game lobby, not a lobby lobby *\/\n+ \/* Make sure that the requester is in a team, not a lobby *\/\n if(l->type != LOBBY_TYPE_GAME) {\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n }\n@@ -2852,7 +2852,7 @@\n if(!LOCAL_GM(c))\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n \n- \/* Make sure that the requester is in a lobby lobby, not a game lobby *\/\n+ \/* Make sure that the requester is in a lobby, not a team *\/\n if(l->type != LOBBY_TYPE_DEFAULT)\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Not valid in a game.\"));\n \n@@ -3120,7 +3120,7 @@\n if(!LOCAL_GM(c))\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Nice try.\"));\n \n- \/* Make sure that the requester is in a game lobby, not a lobby lobby. *\/\n+ \/* Make sure that the requester is in a team, not a lobby. *\/\n if(l->type != LOBBY_TYPE_GAME)\n return send_txt(c, \"%s\", __(c, \"\\tE\\tC7Only valid in a game.\"));\n \n"} {"commit":"f608372d7b7cc38c8bd24233669174f52974d499","subject":"Make support strftime() syntax, and any timezone.","message":"Make support strftime() syntax, and any timezone.\n","repos":"Subsentient\/aqu4bot,Subsentient\/aqu4bot","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- src\/commands.c\n+++ src\/commands.c\n@@ -56,7 +56,8 @@\n \t\t\t{ \"guessinggame\", \"A simple number-guessing game where you guess from one to ten. \"\n \t\t\t\t\"The first guess starts the game.\", REQARG, ANY },\n \t\t\t{ \"sr\", \"A goofy command that returns whatever text you give it backwards.\", REQARG, ANY },\n-\t\t\t{ \"time\", \"Displays the current time in either utc24, utc12, lt12, or lt24 times. Default is utc24.\", OPTARG, ANY },\n+\t\t\t{ \"time\", \"Displays the current time in a specified timezone, or UTC if omitted or not found. \"\n+\t\t\t\t\"After the timezone, you can specify strftime()-style syntax for custom output.\", OPTARG, ANY },\n \t\t\t{ \"seen\", \"Used to get information about the last time I have seen a nickname speak.\", REQARG, ANY },\n \t\t\t{ \"tell\", \"Used to tell someone a message the next time they enter a channel or speak.\", REQARG, ANY },\n \t\t\t{ \"sticky\", \"Used to save a sticky note. sticky save saves it, sticky read reads it, sticky delete \"\n@@ -703,44 +704,43 @@\n \t{\n \t\ttime_t CurrentTime = time(NULL);\n \t\tstruct tm TimeStruct;\n-\t\tchar TimeString[256] = \"Current time: \";\n+\t\tchar TimeString[256] = { '\\0' };\n \t\tstruct tm *(*TimeFunc)(const time_t *Timer, struct tm *Struct) = gmtime_r;\n-\t\tBool TwelveHour = false;\n+\t\tchar TZ[32] = { '\\0' };\n+\t\tchar TimeFormat[128] = \"%a %Y-%m-%d %I:%M:%S %p\";\n \t\t\n \t\tif (*Argument != '\\0')\n \t\t{\n-\t\t\tif (!strcmp(Argument, \"lt12\"))\n-\t\t\t{\n-\t\t\t\tTimeFunc = localtime_r;\n-\t\t\t\tTwelveHour = true;\n-\t\t\t}\n-\t\t\telse if (!strcmp(Argument, \"lt24\"))\n-\t\t\t{\n-\t\t\t\tTimeFunc = localtime_r;\n-\t\t\t\tTwelveHour = false;\n-\t\t\t}\n-\t\t\telse if (!strcmp(Argument, \"utc12\"))\n-\t\t\t{\n-\t\t\t\tTimeFunc = gmtime_r;\n-\t\t\t\tTwelveHour = true;\n-\t\t\t}\n-\t\t\telse if (!strcmp(Argument, \"utc24\"))\n-\t\t\t{\n-\t\t\t\tTimeFunc = gmtime_r;\n-\t\t\t\tTwelveHour = false;\n-\t\t\t}\n-\t\t\telse\n-\t\t\t{\n-\t\t\t\tIRC_Message(SendTo, \"Bad argument to time command.\");\n-\t\t\t\treturn;\n-\t\t\t}\n+\t\t\tconst char *Worker = Argument;\n+\t\t\t\n+\t\t\tfor (Inc = 0; Worker[Inc] != ' ' && Worker[Inc] != '\\0' && Inc < sizeof TZ - 1; ++Inc)\n+\t\t\t{\n+\t\t\t\tTZ[Inc] = Worker[Inc];\n+\t\t\t}\n+\t\t\tTZ[Inc] = '\\0';\n+\t\t\t\n+\t\t\tif ((Worker = SubStrings.Line.WhitespaceJump(Worker)))\n+\t\t\t{\n+\t\t\t\tfor (Inc = 0; Worker[Inc] != '\\0' && Inc < sizeof TimeFormat - 1; ++Inc)\n+\t\t\t\t{\n+\t\t\t\t\tTimeFormat[Inc] = Worker[Inc];\n+\t\t\t\t}\n+\t\t\t\tTimeFormat[Inc] = '\\0';\n+\t\t\t}\n+\t\t\t\n+\t\t\tTimeFunc = localtime_r;\n+\t\t\tsetenv(\"TZ\", TZ, true);\n+\t\t\ttzset();\n \t\t}\n \t\t\n \t\tTimeFunc(&CurrentTime, &TimeStruct);\n-\t\tstrftime(TimeString + strlen(TimeString), sizeof TimeString - strlen(TimeString), TwelveHour ? \"%a %Y-%m-%d %I:%M:%S %p\" : \"%a %Y-%m-%d %H:%M:%S\", &TimeStruct);\n+\t\t\n+\t\tif (*TZ) unsetenv(\"TZ\"); \/*Restore to normalcy.*\/\n+\t\t\n+\t\tstrftime(TimeString, sizeof TimeString, TimeFormat, &TimeStruct);\n \t\t\n \t\tif (TimeFunc == gmtime_r) strcat(TimeString, \" UTC\");\n-\t\telse strcat(TimeString, \" local time\");\n+\t\telse strcat(TimeString, \" \"), strcat(TimeString, TZ);\n \t\t\n \t\tIRC_Message(SendTo, TimeString);\n \t}\n"} {"commit":"915c00de2c06ee5ec88645d8918d8a03d0119201","subject":"Just use strcmp, rather than streq.","message":"Just use strcmp, rather than streq.\n","repos":"ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- lib\/common\/colxlate.c\n+++ lib\/common\/colxlate.c\n@@ -27,7 +27,6 @@\n #include \"color.h\"\n #include \"colorprocs.h\"\n #include \"colortbl.h\"\n-#include \"macros.h\"\n #include \"memory.h\"\n \n static char* colorscheme;\n@@ -229,9 +228,9 @@\n char* ss; \/* second slash *\/\n char* c2; \/* second char *\/\n \n- if (streq(str, \"black\")) return str;\n- if (streq(str, \"white\")) return str;\n- if (streq(str, \"lightgrey\")) return str;\n+ if (!strcmp(str, \"black\")) return str;\n+ if (!strcmp(str, \"white\")) return str;\n+ if (!strcmp(str, \"lightgrey\")) return str;\n if (*str == '\/') { \/* if begins with '\/' *\/\n \tc2 = str+1;\n if ((ss = strchr(c2, '\/'))) { \/* if has second '\/' *\/\n"} {"commit":"20df3beaf751b6c3fe7c9e2fc90524510bee1c44","subject":"more cgraph merging","message":"more cgraph merging\n","repos":"MjAbuz\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,kbrock\/graphviz,pixelglow\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,ellson\/graphviz,tkelman\/graphviz,tkelman\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,ellson\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,pixelglow\/graphviz,ellson\/graphviz,ellson\/graphviz,kbrock\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,ellson\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,jho1965us\/graphviz,kbrock\/graphviz,tkelman\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,kbrock\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,kbrock\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- lib\/common\/postproc.c\n+++ lib\/common\/postproc.c\n@@ -97,13 +97,8 @@\n \n if (ED_spl(e) == NULL) {\n \tif ((Concentrate == FALSE) || (ED_edge_type(e) != IGNORED))\n-#ifndef WITH_CGRAPH\n-\t agerr(AGERR, \"lost %s %s edge\\n\", e->tail->name,\n-\t\t e->head->name);\n-#else \/* WITH_CGRAPH *\/\n \t agerr(AGERR, \"lost %s %s edge\\n\",agnameof(agtail(e)),\r\n \t\t agnameof(aghead(e)));\r\n-#endif \/* WITH_CGRAPH *\/\n \treturn;\n }\n for (j = 0; j < ED_spl(e)->size; j++) {\n"} {"commit":"4f17f85a9c4d59bae2f4667c67b6370a08d2730d","subject":"[libu] array example wip","message":"[libu] array example wip\n","repos":"koanlogic\/libu,xunmengfeng\/libu,xunmengfeng\/libu,koanlogic\/libu","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example\/array\/main.c\n+++ example\/array\/main.c\n@@ -6,10 +6,16 @@\n {\n u_array_t *a = NULL;\n \n- con_err_if (u_array_create(10, &a));\n- con_err_if (u_array_set_n(a, 12, (void *) 1234, NULL));\n- con_err_if (u_array_set_n(a, 20, (void *) 1234, NULL));\n- con_err_if (u_array_set_n(a, 100, (void *) 1234, NULL));\n+ con_err_if (u_array_create(5, &a));\n+\n+ \/* insert at high locations to force auto resize *\/\n+ con_err_if (u_array_set_n(a, 7, (void *) 7, NULL));\n+ con_err_if (u_array_set_n(a, 10, (void *) 10, NULL));\n+ con_err_if (u_array_set_n(a, 30, (void *) 30, NULL));\n+\n+ \/* dump data *\/\n+ u_array_print(a);\n+\n u_array_free(a);\n \n return 0;\n"} {"commit":"42e4da04ad4740ab12e955f67c36b557d8a56169","subject":"Remove errant comment from copypasta","message":"Remove errant comment from copypasta\n","repos":"billhoffman\/drake,sheim\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- drake\/solvers\/LinearSystemSolver.h\n+++ drake\/solvers\/LinearSystemSolver.h\n@@ -10,8 +10,6 @@\n class DRAKEOPTIMIZATION_EXPORT LinearSystemSolver :\n public MathematicalProgramSolverInterface {\n public:\n- \/\/ This solver is implemented in various pieces depending on if\n- \/\/ Ipopt was available during compilation.\n bool available() const override;\n SolutionResult Solve(OptimizationProblem& prog) const override;\n };\n"} {"commit":"0570065b41ca2429c43fabb5124f089da68cb368","subject":"Basic error handling","message":"Basic error handling\n","repos":"vkholodkov\/nginx-mogilefs-module","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ngx_http_mogilefs_module.c\n+++ ngx_http_mogilefs_module.c\n@@ -170,7 +170,7 @@\n \n escape = 2 * ngx_escape_uri(NULL, vv->data, vv->len, NGX_ESCAPE_MEMCACHED);\n \n- len = sizeof(\"get_paths \") - 1 + vv->len + escape + sizeof(CRLF) - 1;\n+ len = sizeof(\"get_paths \") - 1 + 20 + vv->len + escape + sizeof(CRLF) - 1;\n \n b = ngx_create_temp_buf(r->pool, len);\n if (b == NULL) {\n@@ -191,6 +191,15 @@\n *b->last++ = 'p'; *b->last++ = 'a'; *b->last++ = 't'; *b->last++ = 'h';\n *b->last++ = 's'; *b->last++ = ' ';\n \n+ *b->last++ = 'd'; *b->last++ = 'o'; *b->last++ = 'm'; *b->last++ = 'a';\n+ *b->last++ = 'i'; *b->last++ = 'n'; *b->last++ = '='; *b->last++ = 'd';\n+ *b->last++ = 'e'; *b->last++ = 'f'; *b->last++ = 'a'; *b->last++ = 'u';\n+ *b->last++ = 'l'; *b->last++ = 't';\n+\n+ *b->last++ = '&';\n+\n+ *b->last++ = 'k'; *b->last++ = 'e'; *b->last++ = 'y'; *b->last++ = '=';\n+\n ctx = ngx_http_get_module_ctx(r, ngx_http_mogilefs_module);\n \n ctx->key.data = b->last;\n@@ -216,6 +225,27 @@\n static ngx_int_t\n ngx_http_mogilefs_reinit_request(ngx_http_request_t *r)\n {\n+ return NGX_OK;\n+}\n+\n+static ngx_int_t\n+ngx_http_mogilefs_process_errorneous_header(ngx_http_request_t *r, ngx_http_upstream_t *u, ngx_str_t *line)\n+{\n+ ngx_int_t status;\n+\n+ if (line->len >= sizeof(\"unknown_key\") - 1 && ngx_strncmp(line->data, \"unknown_key\", sizeof(\"unknown_key\") - 1) == 0) {\n+ status = 404;\n+ } else if (line->len >= sizeof(\"domain_not_found\") - 1 && ngx_strncmp(line->data, \"domain_not_found\", sizeof(\"domain_not_found\") - 1) == 0) {\n+ status = 404;\n+ }\n+\n+ r->headers_out.content_length_n = 0;\n+ u->headers_in.status_n = status;\n+ u->state->status = status;\n+\n+ \/\/ Return no content\n+ u->buffer.pos = u->buffer.pos;\n+\n return NGX_OK;\n }\n \n@@ -249,7 +279,17 @@\n \n ctx = ngx_http_get_module_ctx(r, ngx_http_mogilefs_module);\n \n- if (line.len < sizeof(\"paths \") - 1 || ngx_strncmp(p, \"paths \", sizeof(\"paths \") - 1) != 0) {\n+ if (line.len >= sizeof(\"ERR \") - 1 && ngx_strncmp(p, \"ERR \", sizeof(\"ERR \") - 1) == 0) {\n+ line.data += sizeof(\"ERR \") - 1;\n+ line.len -= sizeof(\"ERR \") - 1;\n+\n+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,\n+ \"mogilefs response: \\\"%V\\\"\", &line);\n+\n+ return ngx_http_mogilefs_process_errorneous_header(r, u, &line);\n+ }\n+\n+ if (line.len < sizeof(\"OK \") - 1 || ngx_strncmp(p, \"OK \", sizeof(\"OK \") - 1) != 0) {\n ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,\n \"mogilefs tracker has sent invalid response: \\\"%V\\\"\", &line);\n \n@@ -290,7 +330,7 @@\n u->headers_in.status_n = 200;\n u->state->status = 200;\n \n- \/\/ Produce no content\n+ \/\/ Return no content\n u->buffer.pos = u->buffer.pos;\n \n return NGX_OK;\n@@ -491,7 +531,7 @@\n \n if (ngx_strncasecmp(url->data, (u_char *) \"mogilefs:\/\/\", 11) == 0) {\n add = 11;\n- port = 7501;\n+ port = 6001;\n } else {\n ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, \"invalid URL prefix\");\n return NGX_CONF_ERROR;\n"} {"commit":"71eca59ae682e36e0239e5c96460e5c6f9b94fae","subject":"Fix for CPIMPORT in source tree.","message":"Fix for CPIMPORT in source tree.\n","repos":"dsroche\/flint2,dsroche\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,jpflori\/flint2,wbhart\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,wbhart\/flint2,jpflori\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,dsroche\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- qadic\/ctx_init_conway.c\n+++ qadic\/ctx_init_conway.c\n@@ -30,8 +30,10 @@\n #include \"padic.h\"\n #include \"qadic.h\"\n \n+#define FLINT_SRC_CPIMPORT \"..\/qadic\/CPimport.txt\"\n+\n #ifndef FLINT_CPIMPORT\n-#define FLINT_CPIMPORT \"\/home\/user\/FLINT\/flint-2\/qadic\/CPimport.txt\"\n+#define FLINT_CPIMPORT FLINT_SRC_CPIMPORT\n #endif\n \n void qadic_ctx_init_conway(qadic_ctx_t ctx,\n@@ -50,6 +52,9 @@\n \n buf = flint_malloc(832);\n file = fopen(FLINT_CPIMPORT, \"r\");\n+\n+ if (!file)\n+ file = fopen(FLINT_SRC_CPIMPORT, \"r\");\n \n if (!file)\n {\n"} {"commit":"e85bcf0ebef7fb07c5d48bedae09bdef335b15ec","subject":"Add rectangle fill in addition to area clear.","message":"Add rectangle fill in addition to area clear.\n","repos":"jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- battery.c\n+++ battery.c\n@@ -64,6 +64,7 @@\n \t++r.y;\n \tr.height -= 2;\n \txcb_clear_area(c, true, win, r.x, r.y, r.width, r.height);\n+\txcb_poly_fill_rectangle(c, win, b->gc.bg, 1, &r);\n \txcb_flush(c);\n }\n \n"} {"commit":"111f09d9e2257bbe2b45363cd01dece22d159575","subject":"Broke long lines. Use one-line expression in get_gc.","message":"Broke long lines. Use one-line expression in get_gc.\n","repos":"jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- battery.c\n+++ battery.c\n@@ -27,9 +27,11 @@\n \tchar str_pct[sl];\n \tsl=snprintf(str_pct, sl, \"%d%%\", b->pct);\n \tconst Widget * w = &b->widget;\n-\tconst uint16_t center = w->geometry.x + (w->geometry.width>>1);\n-\tXFillRectangle(w->X->d, w->window, b->gc.bg, center-PAD, 0,\n-\t\tXTextWidth(w->X->font, str_pct, sl)+(PAD<<1), HEIGHT);\n+\tconst uint16_t center = w->geometry.x\n+\t\t+ (w->geometry.width>>1);\n+\tXFillRectangle(w->X->d, w->window, b->gc.bg,\n+\t\tcenter-PAD, 0, XTextWidth(w->X->font,\n+\t\tstr_pct, sl)+(PAD<<1), HEIGHT);\n \tXDrawString(w->X->d, w->window, gc, center,\n \t\tfont_y(w->X->font), str_pct, sl);\n }\n@@ -55,16 +57,12 @@\n \t\tg->width, g->height, g->x, g->y);\n }\n \n-\/* Selects a gc to use based on ac\/battery status, assigns it to b->widget.gc\n- * and returns it. *\/\n+\/* Selects a gc to use based on ac\/battery status,\n+ assigns it to b->widget.gc and returns it. *\/\n static GC get_gc(Battery * restrict b)\n {\n-\tGC gc=b->gc.bat;\n-\tif(sysval(ACSYSFILE))\n-\t\t gc=b->gc.ac;\n-\telse if(b->pct < CRIT_PCT)\n-\t\t gc=b->gc.crit;\n-\treturn gc;\n+\treturn sysval(ACSYSFILE) ? b->gc.ac : b->pct\n+\t\t< CRIT_PCT ? b->gc.crit : b->gc.bat;\n }\n \n static void draw(Battery * restrict b)\n@@ -83,8 +81,8 @@\n void setup_battery(Battery * restrict b, XData * restrict X)\n {\n \tb->widget.X=X;\n-\t\/* Battery is a \"gadget\", so the parent and the Battery window are one\n- \t * and the same. *\/\n+\t\/* Battery is a \"gadget\", so the parent and the\n+\t Battery window are identical. *\/\n \tb->widget.window=X->w;\n \tsetup_gcs(b);\n \tb->draw=&draw;\n"} {"commit":"dfafcc8a7ba120492ae2a27b6ec774aa3224903b","subject":"drbd: Separate connection state changes from minor dev state changes #1","message":"drbd: Separate connection state changes from minor dev state changes #1\n\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nSigned-off-by: Lars Ellenberg <31df9cacdc65c624cc60c2dcd22bbf92dc230e16@linbit.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/block\/drbd\/drbd_receiver.c\n+++ drivers\/block\/drbd\/drbd_receiver.c\n@@ -3331,15 +3331,35 @@\n \tmask = convert_state(mask);\n \tval = convert_state(val);\n \n-\tif (cmd == P_CONN_ST_CHG_REQ) {\n-\t\trv = conn_request_state(mdev->tconn, mask, val, CS_VERBOSE | CS_LOCAL_ONLY);\n-\t\tconn_send_sr_reply(mdev->tconn, rv);\n-\t} else {\n-\t\trv = drbd_change_state(mdev, CS_VERBOSE, mask, val);\n-\t\tdrbd_send_sr_reply(mdev, rv);\n-\t}\n+\trv = drbd_change_state(mdev, CS_VERBOSE, mask, val);\n+\tdrbd_send_sr_reply(mdev, rv);\n \n \tdrbd_md_sync(mdev);\n+\n+\treturn true;\n+}\n+\n+static int receive_req_conn_state(struct drbd_tconn *tconn, enum drbd_packet cmd,\n+\t\t\t\t unsigned int data_size)\n+{\n+\tstruct p_req_state *p = &tconn->data.rbuf.req_state;\n+\tunion drbd_state mask, val;\n+\tenum drbd_state_rv rv;\n+\n+\tmask.i = be32_to_cpu(p->mask);\n+\tval.i = be32_to_cpu(p->val);\n+\n+\tif (test_bit(DISCARD_CONCURRENT, &tconn->flags) &&\n+\t mutex_is_locked(&tconn->cstate_mutex)) {\n+\t\tconn_send_sr_reply(tconn, SS_CONCURRENT_ST_CHG);\n+\t\treturn true;\n+\t}\n+\n+\tmask = convert_state(mask);\n+\tval = convert_state(val);\n+\n+\trv = conn_request_state(tconn, mask, val, CS_VERBOSE | CS_LOCAL_ONLY);\n+\tconn_send_sr_reply(tconn, rv);\n \n \treturn true;\n }\n@@ -3891,7 +3911,7 @@\n \t[P_CSUM_RS_REQUEST] = { 1, sizeof(struct p_block_req), MDEV, { receive_DataRequest } },\n \t[P_DELAY_PROBE] = { 0, sizeof(struct p_delay_probe93), MDEV, { receive_skip } },\n \t[P_OUT_OF_SYNC] = { 0, sizeof(struct p_block_desc), MDEV, { receive_out_of_sync } },\n-\t[P_CONN_ST_CHG_REQ] = { 0, sizeof(struct p_req_state), MDEV, { receive_req_state } },\n+\t[P_CONN_ST_CHG_REQ] = { 0, sizeof(struct p_req_state), CONN, { .conn_fn = receive_req_conn_state } },\n };\n \n \/* All handler functions that expect a sub-header get that sub-heder in\n"} {"commit":"d7b4f68b0c70471f875eeaa93493139b97c41ee1","subject":"winpr\/sysinfo: cleaned up cpu flag tests","message":"winpr\/sysinfo: cleaned up cpu flag tests\n","repos":"Testinos\/Freerdp,clivest\/FreeRDP,bmiklautz\/FreeRDP,nfedera\/FreeRDP,takenit2far\/FreeRDP_SSL,xhaakon\/FreeRDP,peterh\/FreeRDP,chipitsine\/FreeRDP,hyacinthes\/FreeRDP,rjcorrig\/FreeRDP,zavadovsky\/FreeRDP,everhopingandwaiting\/FreeRDP,nanxiongchao\/FreeRDP,rjcorrig\/FreeRDP,ilammy\/FreeRDP,tc-anssi\/FreeRDP,zhangximin\/FreeRDP,oshogbo\/FreeRDP,Testinos\/Freerdp,FreeRDP\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,bsagal\/FreeRDP,realjiangms\/FreeRDP,RolKau\/FreeRDP,peterh\/FreeRDP,tc-anssi\/FreeRDP,xhaakon\/FreeRDP,everhopingandwaiting\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,ondrejholy\/FreeRDP,dvincent-devolutions\/FreeRDP,lmcro\/FreeRDP,xproax\/FreeRDP,hyacinthes\/FreeRDP,xproax\/FreeRDP,vworkspace\/FreeRDP,yurashek\/FreeRDP,nanxiongchao\/FreeRDP,colemickens\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,nfedera\/FreeRDP,tc-anssi\/FreeRDP,MartinHaimberger\/FreeRDP,infelt\/FreeRDP,FreeRDP\/FreeRDP,kingland\/FreeRDP,dvincent-devolutions\/FreeRDP,llyzs\/FreeRDP,realjiangms\/FreeRDP,massuda-marcelo\/FreeRDP,vworkspace\/FreeRDP,colemickens\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,tc-anssi\/FreeRDP,ivan-83\/FreeRDP,ondrejholy\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,ssieb\/FreeRDP,briggsbog\/FreeRDP,mfleisz\/FreeRDP,rjcorrig\/FreeRDP,Distrotech\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,bmiklautz\/FreeRDP,chipitsine\/FreeRDP,mcnestrb\/FreeRDP,xproax\/FreeRDP,akallabeth\/FreeRDP,takenit2far\/FreeRDP_SSL,takenit2far\/FreeRDP,FreeRDP\/FreeRDP,vaginessa\/FreeRDP,lmcro\/FreeRDP,briggsbog\/FreeRDP,zhangximin\/FreeRDP,tc-anssi\/FreeRDP,infelt\/FreeRDP,Distrotech\/FreeRDP,colemickens\/FreeRDP,chipitsine\/FreeRDP,peterh\/FreeRDP,nfedera\/FreeRDP,vaginessa\/FreeRDP,clivest\/FreeRDP,ssieb\/FreeRDP,everhopingandwaiting\/FreeRDP,realjiangms\/FreeRDP,dvincent-devolutions\/FreeRDP,akallabeth\/FreeRDP,bmiklautz\/FreeRDP,rjcorrig\/FreeRDP,everhopingandwaiting\/FreeRDP,massuda-marcelo\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,peterh\/FreeRDP,xhaakon\/FreeRDP,bceverly\/FreeRDP,ssieb\/FreeRDP,yurashek\/FreeRDP,anjoah\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,mcnestrb\/FreeRDP,Distrotech\/FreeRDP,takenit2far\/FreeRDP,MartinHaimberger\/FreeRDP,rjcorrig\/FreeRDP,ivan-83\/FreeRDP,bmiklautz\/FreeRDP,erbth\/FreeRDP,daneshih1125\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,xproax\/FreeRDP,llyzs\/FreeRDP,bsagal\/FreeRDP,everhopingandwaiting\/FreeRDP,eledoux\/FreeRDP,cedrozor\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,xhaakon\/FreeRDP,eledoux\/FreeRDP,massuda-marcelo\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,nanxiongchao\/FreeRDP,tinixx\/FreeRDP,Devolutions\/FreeRDP,ondrejholy\/FreeRDP,FreeRDP\/FreeRDP,realjiangms\/FreeRDP,daneshih1125\/FreeRDP,lmcro\/FreeRDP,RangeeGmbH\/FreeRDP,RolKau\/FreeRDP,oshogbo\/FreeRDP,bceverly\/FreeRDP,vaginessa\/FreeRDP,aballier\/FreeRDP,anjoah\/FreeRDP,peterh\/FreeRDP,RolKau\/FreeRDP,briggsbog\/FreeRDP,llyzs\/FreeRDP,bceverly\/FreeRDP,bjcollins\/FreeRDP,takenit2far\/FreeRDP_SSL,DavBfr\/FreeRDP,bceverly\/FreeRDP,RolKau\/FreeRDP,tinixx\/FreeRDP,mcnestrb\/FreeRDP,awakecoding\/FreeRDP,vworkspace\/FreeRDP,RangeeGmbH\/FreeRDP,peterh\/FreeRDP,vworkspace\/FreeRDP,tc-anssi\/FreeRDP,RangeeGmbH\/FreeRDP,hyacinthes\/FreeRDP,MartinHaimberger\/FreeRDP,bjcollins\/FreeRDP,weinyzhou\/FreeRDP,vworkspace\/FreeRDP,briggsbog\/FreeRDP,bsagal\/FreeRDP,xproax\/FreeRDP,akallabeth\/FreeRDP,vaginessa\/FreeRDP,xproax\/FreeRDP,Testinos\/Freerdp,Devolutions\/FreeRDP,daneshih1125\/FreeRDP,massuda-marcelo\/FreeRDP,zhangximin\/FreeRDP,RolKau\/FreeRDP,infelt\/FreeRDP,dvincent-devolutions\/FreeRDP,tinixx\/FreeRDP,oshogbo\/FreeRDP,anjoah\/FreeRDP,mfleisz\/FreeRDP,awakecoding\/FreeRDP,tc-anssi\/FreeRDP,bmiklautz\/FreeRDP,erbth\/FreeRDP,MartinHaimberger\/FreeRDP,mfleisz\/FreeRDP,kingland\/FreeRDP,MartinHaimberger\/FreeRDP,oshogbo\/FreeRDP,everhopingandwaiting\/FreeRDP,Devolutions\/FreeRDP,clivest\/FreeRDP,zhangximin\/FreeRDP,tinixx\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,takenit2far\/FreeRDP_SSL,Distrotech\/FreeRDP,daneshih1125\/FreeRDP,bjcollins\/FreeRDP,xproax\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,peterh\/FreeRDP,cloudbase\/FreeRDP-dev,lmcro\/FreeRDP,daneshih1125\/FreeRDP,FreeRDP\/FreeRDP,Distrotech\/FreeRDP,weinyzhou\/FreeRDP,vaginessa\/FreeRDP,chipitsine\/FreeRDP,zavadovsky\/FreeRDP,MartinHaimberger\/FreeRDP,Devolutions\/FreeRDP,vaginessa\/FreeRDP,ondrejholy\/FreeRDP,zavadovsky\/FreeRDP,ondrejholy\/FreeRDP,takenit2far\/FreeRDP_SSL,ssieb\/FreeRDP,vworkspace\/FreeRDP,takenit2far\/FreeRDP,nanxiongchao\/FreeRDP,Distrotech\/FreeRDP,cedrozor\/FreeRDP,aballier\/FreeRDP,dvincent-devolutions\/FreeRDP,BUGgs\/FreeRDP,anjoah\/FreeRDP,Devolutions\/FreeRDP,zavadovsky\/FreeRDP,ondrejholy\/FreeRDP,cloudbase\/FreeRDP-dev,vaginessa\/FreeRDP,anjoah\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,lmcro\/FreeRDP,tinixx\/FreeRDP,yurashek\/FreeRDP,oshogbo\/FreeRDP,massuda-marcelo\/FreeRDP,dvincent-devolutions\/FreeRDP,kingland\/FreeRDP,eledoux\/FreeRDP,anjoah\/FreeRDP,Testinos\/Freerdp,hyacinthes\/FreeRDP,realjiangms\/FreeRDP,eledoux\/FreeRDP,chipitsine\/FreeRDP,lmcro\/FreeRDP,ssieb\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,yurashek\/FreeRDP,everhopingandwaiting\/FreeRDP,zhangximin\/FreeRDP,massuda-marcelo\/FreeRDP,aballier\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,daneshih1125\/FreeRDP,FreeRDP\/FreeRDP,Distrotech\/FreeRDP,oshogbo\/FreeRDP,ilammy\/FreeRDP,FreeRDP\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,ssieb\/FreeRDP,mcnestrb\/FreeRDP,eledoux\/FreeRDP,bsagal\/FreeRDP,xhaakon\/FreeRDP,nanxiongchao\/FreeRDP,hyacinthes\/FreeRDP,ssieb\/FreeRDP,dvincent-devolutions\/FreeRDP,kingland\/FreeRDP,erbth\/FreeRDP,weinyzhou\/FreeRDP,Testinos\/Freerdp,eledoux\/FreeRDP,oshogbo\/FreeRDP,colemickens\/FreeRDP,briggsbog\/FreeRDP,nfedera\/FreeRDP,zhangximin\/FreeRDP,chipitsine\/FreeRDP,dvincent-devolutions\/FreeRDP,colemickens\/FreeRDP,xhaakon\/FreeRDP,Distrotech\/FreeRDP,anjoah\/FreeRDP,nanxiongchao\/FreeRDP,rjcorrig\/FreeRDP,colemickens\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,ondrejholy\/FreeRDP,daneshih1125\/FreeRDP,takenit2far\/FreeRDP,massuda-marcelo\/FreeRDP,erbth\/FreeRDP,bceverly\/FreeRDP,llyzs\/FreeRDP,bsagal\/FreeRDP,akallabeth\/FreeRDP,infelt\/FreeRDP,llyzs\/FreeRDP,RolKau\/FreeRDP,massuda-marcelo\/FreeRDP,RolKau\/FreeRDP,rjcorrig\/FreeRDP,aballier\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,everhopingandwaiting\/FreeRDP,weinyzhou\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,tinixx\/FreeRDP,aballier\/FreeRDP,bceverly\/FreeRDP,bceverly\/FreeRDP,bsagal\/FreeRDP,takenit2far\/FreeRDP,RolKau\/FreeRDP,DavBfr\/FreeRDP,cedrozor\/FreeRDP,ivan-83\/FreeRDP,nfedera\/FreeRDP,peterh\/FreeRDP,weinyzhou\/FreeRDP,llyzs\/FreeRDP,BUGgs\/FreeRDP,daneshih1125\/FreeRDP,yurashek\/FreeRDP,infelt\/FreeRDP,yurashek\/FreeRDP,mfleisz\/FreeRDP,BUGgs\/FreeRDP,BUGgs\/FreeRDP,akallabeth\/FreeRDP,nanxiongchao\/FreeRDP,yurashek\/FreeRDP,xhaakon\/FreeRDP,bceverly\/FreeRDP,mcnestrb\/FreeRDP,nfedera\/FreeRDP,infelt\/FreeRDP,clivest\/FreeRDP,tc-anssi\/FreeRDP,realjiangms\/FreeRDP,zavadovsky\/FreeRDP,vworkspace\/FreeRDP,aballier\/FreeRDP,llyzs\/FreeRDP,takenit2far\/FreeRDP_SSL,bsagal\/FreeRDP,RangeeGmbH\/FreeRDP,bjcollins\/FreeRDP,ssieb\/FreeRDP,nfedera\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,ondrejholy\/FreeRDP,realjiangms\/FreeRDP,nanxiongchao\/FreeRDP,infelt\/FreeRDP,bmiklautz\/FreeRDP,awakecoding\/FreeRDP,kingland\/FreeRDP,clivest\/FreeRDP,cedrozor\/FreeRDP,DavBfr\/FreeRDP,briggsbog\/FreeRDP,bmiklautz\/FreeRDP,tinixx\/FreeRDP,oshogbo\/FreeRDP,briggsbog\/FreeRDP,tinixx\/FreeRDP,MartinHaimberger\/FreeRDP,MartinHaimberger\/FreeRDP,hyacinthes\/FreeRDP,rjcorrig\/FreeRDP,Testinos\/Freerdp,mcnestrb\/FreeRDP,awakecoding\/FreeRDP,briggsbog\/FreeRDP,ilammy\/FreeRDP,kingland\/FreeRDP,eledoux\/FreeRDP,cloudbase\/FreeRDP-dev,cloudbase\/FreeRDP-dev,ilammy\/FreeRDP,BUGgs\/FreeRDP,clivest\/FreeRDP,DavBfr\/FreeRDP,zhangximin\/FreeRDP,mcnestrb\/FreeRDP,colemickens\/FreeRDP,xhaakon\/FreeRDP,lmcro\/FreeRDP,mcnestrb\/FreeRDP,vaginessa\/FreeRDP,weinyzhou\/FreeRDP,aballier\/FreeRDP,BUGgs\/FreeRDP,vworkspace\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,weinyzhou\/FreeRDP,llyzs\/FreeRDP,BUGgs\/FreeRDP,cedrozor\/FreeRDP,Testinos\/Freerdp,clivest\/FreeRDP,takenit2far\/FreeRDP_SSL,realjiangms\/FreeRDP,hyacinthes\/FreeRDP,chipitsine\/FreeRDP,infelt\/FreeRDP,cloudbase\/FreeRDP-dev,bjcollins\/FreeRDP,zhangximin\/FreeRDP,lmcro\/FreeRDP,bsagal\/FreeRDP,erbth\/FreeRDP,BUGgs\/FreeRDP,erbth\/FreeRDP,clivest\/FreeRDP,takenit2far\/FreeRDP,yurashek\/FreeRDP,kingland\/FreeRDP,kingland\/FreeRDP,xproax\/FreeRDP,weinyzhou\/FreeRDP,takenit2far\/FreeRDP,colemickens\/FreeRDP,RangeeGmbH\/FreeRDP,cloudbase\/FreeRDP-dev,anjoah\/FreeRDP,aballier\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- winpr\/libwinpr\/sysinfo\/test\/TestCPUFeatures.c\n+++ winpr\/libwinpr\/sysinfo\/test\/TestCPUFeatures.c\n@@ -3,43 +3,45 @@\n #include \n #include \n \n+#define TEST_FEATURE(feature) printf(\"\\t\" #feature \": %s\\n\", IsProcessorFeaturePresent(feature) ? \"yes\" : \"no\")\n+#define TEST_FEATURE_EX(feature) printf(\"\\t\" #feature \": %s\\n\", IsProcessorFeaturePresentEx(feature) ? \"yes\" : \"no\")\n int TestCPUFeatures(int argc, char* argv[])\n {\n \tprintf(\"Base CPU Flags:\\n\");\n #ifdef _M_IX86_AMD64\n-\tprintf(\"\\tPF_MMX_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_XMMI_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_XMMI64_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_3DNOW_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_SSE3_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n+\tTEST_FEATURE(PF_MMX_INSTRUCTIONS_AVAILABLE);\n+\tTEST_FEATURE(PF_XMMI_INSTRUCTIONS_AVAILABLE);\n+\tTEST_FEATURE(PF_XMMI64_INSTRUCTIONS_AVAILABLE);\n+\tTEST_FEATURE(PF_3DNOW_INSTRUCTIONS_AVAILABLE);\n+\tTEST_FEATURE(PF_SSE3_INSTRUCTIONS_AVAILABLE);\n \tprintf(\"\\n\");\n \tprintf(\"Extended CPU Flags (not found in windows API):\\n\");\n-\tprintf(\"\\tPF_EX_3DNOW_PREFETCH: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_3DNOW_PREFETCH) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_SSSE3: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_SSSE3) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_SSE41: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_SSE41) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_SSE42: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_SSE42) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_AVX: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_AVX) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_FMA: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_FMA) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_AVX_AES: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_AVX_AES) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_AVX_PCLMULQDQD: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_AVX_PCLMULQDQ) ? \"yes\" : \"no\");\n+\tTEST_FEATURE_EX(PF_EX_3DNOW_PREFETCH);\n+\tTEST_FEATURE_EX(PF_EX_SSSE3);\n+\tTEST_FEATURE_EX(PF_EX_SSE41);\n+\tTEST_FEATURE_EX(PF_EX_SSE42);\n+\tTEST_FEATURE_EX(PF_EX_AVX);\n+\tTEST_FEATURE_EX(PF_EX_FMA);\n+\tTEST_FEATURE_EX(PF_EX_AVX_AES);\n+\tTEST_FEATURE_EX(PF_EX_AVX_PCLMULQDQ);\n #elif defined(_M_ARM)\n-\tprintf(\"\\tPF_ARM_NEON_INSTRUCTIONS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_THUMB: %s\\n\", IsProcessorFeaturePresent(PF_ARM_THUMB) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_VFP_32_REGISTERS_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_ARM_VFP_32_REGISTERS_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_DIVIDE_INSTRUCTION_AVAILABLE: %s\\n\", IsProcessorFeaturePresent(PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_VFP3: %s\\n\", IsProcessorFeaturePresent(PF_ARM_VFP3) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_THUMB: %s\\n\", IsProcessorFeaturePresent(PF_ARM_THUMB) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_JAZELLE: %s\\n\", IsProcessorFeaturePresent(PF_ARM_JAZELLE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_DSP: %s\\n\", IsProcessorFeaturePresent(PF_ARM_DSP) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_THUMB2: %s\\n\", IsProcessorFeaturePresent(PF_ARM_THUMB2) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_T2EE: %s\\n\", IsProcessorFeaturePresent(PF_ARM_T2EE) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_ARM_INTEL_WMMX: %s\\n\", IsProcessorFeaturePresent(PF_ARM_INTEL_WMMX) ? \"yes\" : \"no\");\n+\tTEST_FEATURE(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE);\n+\tTEST_FEATURE(PF_ARM_THUMB);\n+\tTEST_FEATURE(PF_ARM_VFP_32_REGISTERS_AVAILABLE);\n+\tTEST_FEATURE(PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE);\n+\tTEST_FEATURE(PF_ARM_VFP3);\n+\tTEST_FEATURE(PF_ARM_THUMB);\n+\tTEST_FEATURE(PF_ARM_JAZELLE);\n+\tTEST_FEATURE(PF_ARM_DSP);\n+\tTEST_FEATURE(PF_ARM_THUMB2);\n+\tTEST_FEATURE(PF_ARM_T2EE);\n+\tTEST_FEATURE(PF_ARM_INTEL_WMMX);\n \tprintf(\"Extended CPU Flags (not found in windows API):\\n\");\n-\tprintf(\"\\tPF_EX_ARM_VFP1: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_ARM_VFP1) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_ARM_VFP3D16: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_ARM_VFP3D16) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_ARM_VFP4: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_ARM_VFP4) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_ARM_IDIVA: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_ARM_IDIVA) ? \"yes\" : \"no\");\n-\tprintf(\"\\tPF_EX_ARM_IDIVT: %s\\n\", IsProcessorFeaturePresentEx(PF_EX_ARM_IDIVT) ? \"yes\" : \"no\");\n+\tTEST_FEATURE_EX(PF_EX_ARM_VFP1);\n+\tTEST_FEATURE_EX(PF_EX_ARM_VFP3D16);\n+\tTEST_FEATURE_EX(PF_EX_ARM_VFP4);\n+\tTEST_FEATURE_EX(PF_EX_ARM_IDIVA);\n+\tTEST_FEATURE_EX(PF_EX_ARM_IDIVT);\n #endif\n \tprintf(\"\\n\");\n \treturn 0;\n"} {"commit":"dcd400db2e1ef1acf6bc5dea0683fd41adede042","subject":"Updated debug messages","message":"Updated debug messages\n","repos":"smithjessk\/CapSolv,smithjessk\/CapSolv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/contours.h\n+++ src\/contours.h\n@@ -122,8 +122,12 @@\n \n num_contours_ = contour_counter - missing.n_elem;\n \n+ cout << \"Number contours: \" << num_contours << endl;\n+\n \/\/ Creating the map.\n map_ = uvec(num_contours_);\n+\n+ cout << \"Here3.5\" << endl;\n \n \/\/ Index of missing currently being considered.\n int map_index, missing_index;\n"} {"commit":"c9bfb25184cb2c91178d172dba9b72da6a895231","subject":"drivers: counter: mcux: Convert clock control to use DEVICE_DT_GET","message":"drivers: counter: mcux: Convert clock control to use DEVICE_DT_GET\n\nReplace device_get_binding with DEVICE_DT_GET for getting access\nto the clock controller device.\n\nSigned-off-by: Kumar Gala \n","repos":"Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,galak\/zephyr,nashif\/zephyr,nashif\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,galak\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/counter\/counter_mcux_gpt.c\n+++ drivers\/counter\/counter_mcux_gpt.c\n@@ -16,7 +16,7 @@\n struct mcux_gpt_config {\n \t\/* info must be first element *\/\n \tstruct counter_config_info info;\n-\tchar *clock_name;\n+\tconst struct device *clock_dev;\n \tclock_control_subsys_t clock_subsys;\n \tGPT_Type *base;\n \tclock_name_t clock_source;\n@@ -172,16 +172,10 @@\n static int mcux_gpt_init(const struct device *dev)\n {\n \tconst struct mcux_gpt_config *config = dev->config;\n-\tconst struct device *clock_dev;\n \tgpt_config_t gptConfig;\n \tuint32_t clock_freq;\n \n-\tclock_dev = device_get_binding(config->clock_name);\n-\tif (clock_dev == NULL) {\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tif (clock_control_get_rate(clock_dev, config->clock_subsys,\n+\tif (clock_control_get_rate(config->clock_dev, config->clock_subsys,\n \t\t\t\t &clock_freq)) {\n \t\treturn -EINVAL;\n \t}\n@@ -219,7 +213,7 @@\n \t\t\t\t\t\t\t\t\t\\\n \tstatic const struct mcux_gpt_config mcux_gpt_config_ ## n = {\t\\\n \t\t.base = (void *)DT_INST_REG_ADDR(n),\t\t\t\\\n-\t\t.clock_name = DT_INST_CLOCKS_LABEL(n),\t\t\t\\\n+\t\t.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(n)),\t\\\n \t\t.clock_subsys =\t\t\t\t\t\t\\\n \t\t\t(clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\\\n \t\t.info = {\t\t\t\t\t\t\\\n"} {"commit":"a72c49590a1f9e5d26a71c3f807dbb8958c93513","subject":"cpufreq: governor: Avoid invalid states with additional checks","message":"cpufreq: governor: Avoid invalid states with additional checks\n\nThere can be races where the request has come to a wrong state. For\nexample INIT followed by STOP (instead of START) or START followed by\nEXIT (instead of STOP).\n\nAddress these races by making sure the state-machine never gets into\nany invalid state. Also return an error if an invalid state-transition\nis requested.\n\nReviewed-and-tested-by: Preeti U Murthy <437f8f4633f3d09bf55bbcfb98d29bc10a99c7d0@linux.vnet.ibm.com>\nSigned-off-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpufreq\/cpufreq_governor.c\n+++ drivers\/cpufreq\/cpufreq_governor.c\n@@ -305,6 +305,10 @@\n \tunsigned int latency;\n \tint ret;\n \n+\t\/* State should be equivalent to EXIT *\/\n+\tif (policy->governor_data)\n+\t\treturn -EBUSY;\n+\n \tif (dbs_data) {\n \t\tif (WARN_ON(have_governor_per_policy()))\n \t\t\treturn -EINVAL;\n@@ -375,10 +379,15 @@\n \treturn ret;\n }\n \n-static void cpufreq_governor_exit(struct cpufreq_policy *policy,\n-\t\t\t\t struct dbs_data *dbs_data)\n+static int cpufreq_governor_exit(struct cpufreq_policy *policy,\n+\t\t\t\t struct dbs_data *dbs_data)\n {\n \tstruct common_dbs_data *cdata = dbs_data->cdata;\n+\tstruct cpu_dbs_info *cdbs = cdata->get_cpu_cdbs(policy->cpu);\n+\n+\t\/* State should be equivalent to INIT *\/\n+\tif (!cdbs->shared || cdbs->shared->policy)\n+\t\treturn -EBUSY;\n \n \tpolicy->governor_data = NULL;\n \tif (!--dbs_data->usage_count) {\n@@ -395,6 +404,7 @@\n \t}\n \n \tfree_common_dbs_info(policy, cdata);\n+\treturn 0;\n }\n \n static int cpufreq_governor_start(struct cpufreq_policy *policy,\n@@ -408,6 +418,10 @@\n \n \tif (!policy->cur)\n \t\treturn -EINVAL;\n+\n+\t\/* State should be equivalent to INIT *\/\n+\tif (!shared || shared->policy)\n+\t\treturn -EBUSY;\n \n \tif (cdata->governor == GOV_CONSERVATIVE) {\n \t\tstruct cs_dbs_tuners *cs_tuners = dbs_data->tuners;\n@@ -465,14 +479,18 @@\n \treturn 0;\n }\n \n-static void cpufreq_governor_stop(struct cpufreq_policy *policy,\n-\t\t\t\t struct dbs_data *dbs_data)\n+static int cpufreq_governor_stop(struct cpufreq_policy *policy,\n+\t\t\t\t struct dbs_data *dbs_data)\n {\n \tstruct common_dbs_data *cdata = dbs_data->cdata;\n \tunsigned int cpu = policy->cpu;\n \tstruct cpu_dbs_info *cdbs = cdata->get_cpu_cdbs(cpu);\n \tstruct cpu_common_dbs_info *shared = cdbs->shared;\n \n+\t\/* State should be equivalent to START *\/\n+\tif (!shared || !shared->policy)\n+\t\treturn -EBUSY;\n+\n \tgov_cancel_work(dbs_data, policy);\n \n \tif (cdata->governor == GOV_CONSERVATIVE) {\n@@ -484,17 +502,19 @@\n \n \tshared->policy = NULL;\n \tmutex_destroy(&shared->timer_mutex);\n-}\n-\n-static void cpufreq_governor_limits(struct cpufreq_policy *policy,\n-\t\t\t\t struct dbs_data *dbs_data)\n+\treturn 0;\n+}\n+\n+static int cpufreq_governor_limits(struct cpufreq_policy *policy,\n+\t\t\t\t struct dbs_data *dbs_data)\n {\n \tstruct common_dbs_data *cdata = dbs_data->cdata;\n \tunsigned int cpu = policy->cpu;\n \tstruct cpu_dbs_info *cdbs = cdata->get_cpu_cdbs(cpu);\n \n+\t\/* State should be equivalent to START *\/\n \tif (!cdbs->shared || !cdbs->shared->policy)\n-\t\treturn;\n+\t\treturn -EBUSY;\n \n \tmutex_lock(&cdbs->shared->timer_mutex);\n \tif (policy->max < cdbs->shared->policy->cur)\n@@ -505,13 +525,15 @@\n \t\t\t\t\tCPUFREQ_RELATION_L);\n \tdbs_check_cpu(dbs_data, cpu);\n \tmutex_unlock(&cdbs->shared->timer_mutex);\n+\n+\treturn 0;\n }\n \n int cpufreq_governor_dbs(struct cpufreq_policy *policy,\n \t\t\t struct common_dbs_data *cdata, unsigned int event)\n {\n \tstruct dbs_data *dbs_data;\n-\tint ret = 0;\n+\tint ret;\n \n \t\/* Lock governor to block concurrent initialization of governor *\/\n \tmutex_lock(&cdata->mutex);\n@@ -531,17 +553,19 @@\n \t\tret = cpufreq_governor_init(policy, dbs_data, cdata);\n \t\tbreak;\n \tcase CPUFREQ_GOV_POLICY_EXIT:\n-\t\tcpufreq_governor_exit(policy, dbs_data);\n+\t\tret = cpufreq_governor_exit(policy, dbs_data);\n \t\tbreak;\n \tcase CPUFREQ_GOV_START:\n \t\tret = cpufreq_governor_start(policy, dbs_data);\n \t\tbreak;\n \tcase CPUFREQ_GOV_STOP:\n-\t\tcpufreq_governor_stop(policy, dbs_data);\n+\t\tret = cpufreq_governor_stop(policy, dbs_data);\n \t\tbreak;\n \tcase CPUFREQ_GOV_LIMITS:\n-\t\tcpufreq_governor_limits(policy, dbs_data);\n+\t\tret = cpufreq_governor_limits(policy, dbs_data);\n \t\tbreak;\n+\tdefault:\n+\t\tret = -EINVAL;\n \t}\n \n unlock:\n"} {"commit":"a8fc38797593f288ee3f2a71b40780473b22f3e9","subject":"algorithms: Add basic binary search implementation","message":"algorithms: Add basic binary search implementation\n","repos":"nsubtil\/lift,chuckseberino\/lift,chuckseberino\/lift,nsubtil\/lift,chuckseberino\/lift,nsubtil\/lift","returncode":1,"stderr":"error: pathspec 'algorithms\/binsearch.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- algorithms\/binsearch.h\n+++ algorithms\/binsearch.h\n@@ -0,0 +1,72 @@\n+\/*\n+ * Copyright (c) 2014-2015, NVIDIA CORPORATION\n+ * Copyright (c) 2015, Nuno Subtil \n+ * Copyright (c) 2015, Roche Molecular Systems Inc.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions are met:\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in the\n+ * documentation and\/or other materials provided with the distribution.\n+ * * Neither the name of the copyright holders nor the names of its\n+ * contributors may be used to endorse or promote products derived from\n+ * this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND\n+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\n+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\n+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE\n+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ *\/\n+\n+#pragma once\n+\n+#include \"..\/types.h\"\n+\n+namespace lift {\n+\n+\/\/ perform a binary search on a sorted array\n+\/\/ returns the index of any element in the array that is equal to val, or -1 if not found\n+template \n+CUDA_HOST_DEVICE uint32 binary_search(const T *data, uint32 size, const T val)\n+{\n+ uint32 first = 0;\n+ uint32 last = size;\n+\n+ while(last - first > 0)\n+ {\n+ uint32 i = first + ((last - first) \/ 2);\n+\n+ if (data[i] == val)\n+ return i;\n+\n+ if (data[i] < val)\n+ {\n+ if (i == first)\n+ {\n+ first++;\n+ } else {\n+ first = i;\n+ }\n+ } else {\n+ if (i == last)\n+ {\n+ last--;\n+ } else {\n+ last = i;\n+ }\n+ }\n+ }\n+\n+ return uint32(-1);\n+}\n+\n+} \/\/ namespace lift\n"} {"commit":"6d01ce34e6615945a80f82269448b1ba0ed2df9f","subject":"Added processPacket function","message":"Added processPacket function\n","repos":"dev-osrose\/osIROSE-new,RavenX8\/osIROSE-new,dev-osrose\/osIROSE-new,RavenX8\/osIROSE-new,dev-osrose\/osIROSE-new,RavenX8\/osIROSE-new","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/map\/include\/entitySystems.h\n+++ src\/map\/include\/entitySystems.h\n@@ -3,6 +3,7 @@\n # define _ENTITYSYSTEMS_H_\n \n #include \"entityComponents.h\"\n+#include \"mappackets.h\"\n #include \n \n class EntitySystem;\n@@ -12,6 +13,11 @@\n virtual ~System() {}\n \n virtual void update(EntityManager&, double dt) = 0;\n+\n+ virtual void processPacket(Entity receiver, std::unique_ptr&& packet) {\n+ (void)receiver;\n+ (void)packet;\n+ }\n };\n \n class MovementSystem : public System {\n"} {"commit":"7b1aeec9cd8c9b790d452eaf769ccbce51627908","subject":"glapi: Duplicate GLES1 prototypes in glapi_dispatch.c","message":"glapi: Duplicate GLES1 prototypes in glapi_dispatch.c\n\nThese prototypes are necessary because GLES1 library builds will create\ndispatch functions for them. We can't directly include GLES\/gl.h\nbecause it would conflict the previously-included GL\/gl.h. Since GLES1\nABI is not expected to every add more functions, the path of least\nresistance is to just duplicate the prototypes for the functions that\naren't already in desktop OpenGL.\n\nSigned-off-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\nBugzilla: https:\/\/bugs.freedesktop.org\/show_bug.cgi?id=79294\nAcked-by: Matt Turner <789b315743a28dd066a4ba1459c35951c291d8a6@gmail.com>\nTested-by: Andreas Boll <041cac00e0cb793452cecf5c52a77db13d069cf3@gmail.com>\nCc: \"10.2\" <59f39c0db42d4479a46b02d4d2bc11120e37bb44@lists.freedesktop.org>\n","repos":"wolf96\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mapi\/glapi\/glapi_dispatch.c\n+++ src\/mapi\/glapi\/glapi_dispatch.c\n@@ -87,6 +87,63 @@\n \/* those link to libglapi.a should provide the entry points *\/\n #define _GLAPI_SKIP_PROTO_ENTRY_POINTS\n #endif\n+\n+\/* These prototypes are necessary because GLES1 library builds will create\n+ * dispatch functions for them. We can't directly include GLES\/gl.h because\n+ * it would conflict the previously-included GL\/gl.h. Since GLES1 ABI is not\n+ * expected to every add more functions, the path of least resistance is to\n+ * just duplicate the prototypes for the functions that aren't already in\n+ * desktop OpenGL.\n+ *\/\n+#include \n+\n+GL_API void GL_APIENTRY glClearDepthf (GLclampf depth);\n+GL_API void GL_APIENTRY glClipPlanef (GLenum plane, const GLfloat *equation);\n+GL_API void GL_APIENTRY glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);\n+GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, GLfloat eqn[4]);\n+GL_API void GL_APIENTRY glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);\n+\n+GL_API void GL_APIENTRY glAlphaFuncx (GLenum func, GLclampx ref);\n+GL_API void GL_APIENTRY glClearColorx (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);\n+GL_API void GL_APIENTRY glClearDepthx (GLclampx depth);\n+GL_API void GL_APIENTRY glClipPlanex (GLenum plane, const GLfixed *equation);\n+GL_API void GL_APIENTRY glColor4x (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);\n+GL_API void GL_APIENTRY glDepthRangex (GLclampx zNear, GLclampx zFar);\n+GL_API void GL_APIENTRY glFogx (GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glFogxv (GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);\n+GL_API void GL_APIENTRY glGetClipPlanex (GLenum pname, GLfixed eqn[4]);\n+GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params);\n+GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params);\n+GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);\n+GL_API void GL_APIENTRY glGetTexEnvxv (GLenum env, GLenum pname, GLfixed *params);\n+GL_API void GL_APIENTRY glGetTexParameterxv (GLenum target, GLenum pname, GLfixed *params);\n+GL_API void GL_APIENTRY glLightModelx (GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glLightModelxv (GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glLightx (GLenum light, GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glLightxv (GLenum light, GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glLineWidthx (GLfixed width);\n+GL_API void GL_APIENTRY glLoadMatrixx (const GLfixed *m);\n+GL_API void GL_APIENTRY glMaterialx (GLenum face, GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glMaterialxv (GLenum face, GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glMultMatrixx (const GLfixed *m);\n+GL_API void GL_APIENTRY glMultiTexCoord4x (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);\n+GL_API void GL_APIENTRY glNormal3x (GLfixed nx, GLfixed ny, GLfixed nz);\n+GL_API void GL_APIENTRY glOrthox (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);\n+GL_API void GL_APIENTRY glPointParameterx (GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glPointParameterxv (GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glPointSizex (GLfixed size);\n+GL_API void GL_APIENTRY glPolygonOffsetx (GLfixed factor, GLfixed units);\n+GL_API void GL_APIENTRY glRotatex (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);\n+GL_API void GL_APIENTRY glSampleCoveragex (GLclampx value, GLboolean invert);\n+GL_API void GL_APIENTRY glScalex (GLfixed x, GLfixed y, GLfixed z);\n+GL_API void GL_APIENTRY glTexEnvx (GLenum target, GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glTexEnvxv (GLenum target, GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glTexParameterx (GLenum target, GLenum pname, GLfixed param);\n+GL_API void GL_APIENTRY glTexParameterxv (GLenum target, GLenum pname, const GLfixed *params);\n+GL_API void GL_APIENTRY glTranslatex (GLfixed x, GLfixed y, GLfixed z);\n+GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, const GLvoid *pointer);\n+\n #include \"glapi\/glapitemp.h\"\n \n #endif \/* USE_X86_ASM *\/\n"} {"commit":"6b731a65c86119da808b3687e0bbb8f18ab137ad","subject":"drm\/i915: avoid hanging on to a stale pointer to raw_edid.","message":"drm\/i915: avoid hanging on to a stale pointer to raw_edid.\n\ndrm_get_edid will store edid into raw_edid, so when freeing edid memory,\nat the same time clean raw_edid pointer.\n\nSigned-off-by: Ma Ling \n[anholt: Note that raw_edid is not currently used anywhere]\nSigned-off-by: Eric Anholt <96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@anholt.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_modes.c\n+++ drivers\/gpu\/drm\/i915\/intel_modes.c\n@@ -76,6 +76,7 @@\n \t\tdrm_mode_connector_update_edid_property(&intel_output->base,\n \t\t\t\t\t\t\tedid);\n \t\tret = drm_add_edid_modes(&intel_output->base, edid);\n+\t\tintel_output->base.display_info.raw_edid = NULL;\n \t\tkfree(edid);\n \t}\n \n"} {"commit":"64bd2d16116df3796d5a4a3658635df3addc965a","subject":"Comment out db cleanup function until reimplemented.","message":"Comment out db cleanup function until reimplemented.\n","repos":"tempbottle\/mosquitto,tempbottle\/mosquitto,tempbottle\/mosquitto,tempbottle\/mosquitto,tempbottle\/mosquitto","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/database.c\n+++ src\/database.c\n@@ -629,6 +629,8 @@\n \n \tif(!db) return 1;\n \n+#if 0\n+\/\/ FIXME - reimplement for new db\n \tquery = sqlite3_mprintf(\"UPDATE clients SET sock=-1\");\n \tif(query){\n \t\tif(sqlite3_exec(db, query, NULL, NULL, &errmsg) != SQLITE_OK){\n@@ -687,7 +689,7 @@\n \t}else{\n \t\treturn 1;\n \t}\n-\n+#endif\n \treturn rc;\n }\n \n"} {"commit":"533518a43ab9d662c864a9b63a6723050bfea488","subject":"drm\/radeon\/dce6: set correct number of audio pins","message":"drm\/radeon\/dce6: set correct number of audio pins\n\nDCE6.0, 8.x has 6\nDCE6.1 has 4\n\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/dce6_afmt.c\n+++ drivers\/gpu\/drm\/radeon\/dce6_afmt.c\n@@ -308,7 +308,9 @@\n \trdev->audio.enabled = true;\n \n \tif (ASIC_IS_DCE8(rdev))\n-\t\trdev->audio.num_pins = 7;\n+\t\trdev->audio.num_pins = 6;\n+\telse if (ASIC_IS_DCE61(rdev))\n+\t\trdev->audio.num_pins = 4;\n \telse\n \t\trdev->audio.num_pins = 6;\n \n"} {"commit":"b88e3bfd29d3403ffb8004ec6305788eef4b93a2","subject":"check for the verbosity level in the query plan function instead of the caller","message":"check for the verbosity level in the query plan function instead of the caller\n","repos":"GeeXboX\/libvalhalla,GeeXboX\/libvalhalla,GeeXboX\/libvalhalla,GeeXboX\/libvalhalla,GeeXboX\/libvalhalla","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/database.c\n+++ src\/database.c\n@@ -360,6 +360,9 @@\n const char *plan = \"EXPLAIN QUERY PLAN \";\n valhalla_db_stmt_t *vhstmt;\n \n+ if (!vh_log_test (VALHALLA_MSG_VERBOSE))\n+ return;\n+\n if (!sql)\n return;\n \n@@ -417,8 +420,7 @@\n * The query plan is useful in order to found the best way for indexing\n * the tables.\n *\/\n- if (vh_log_test (VALHALLA_MSG_VERBOSE))\n- database_query_plan (database, database->stmts[i].sql);\n+ database_query_plan (database, database->stmts[i].sql);\n }\n \n return 0;\n"} {"commit":"b8313b6da7e2e7c7f47d93d8561969a3ff9ba0ea","subject":"dm log: remove incorrect field from userspace table output","message":"dm log: remove incorrect field from userspace table output\n\nThe output of 'dmsetup table' includes an internal field that should not\nbe there. This patch removes it. To make the fix simpler, we first\nreorder a constructor argument\n\nThe 'device size' argument is generated internally. Currently it is\nplaced as the last space-separated word of the constructor string.\nHowever, we need to use a version of the string without this word, so we\nmove it to the beginning instead so it is trivial to skip past it.\n\nWe keep a copy of the arguments passed to userspace for creating a log,\njust in case we need to resend them. These are the same arguments that\nare desired in the STATUSTYPE_TABLE request, except for one. When\ncreating the userspace log, the userspace daemon must know the size of\nthe mirror, so that is added to the arguments given in the constructor\ntable. We were printing this extra argument out as well, which is a\nmistake.\n\nSigned-off-by: Jonathan Brassow \nSigned-off-by: Alasdair G Kergon <620085386a2c64ec2f1d43bef997c15003f13da2@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/md\/dm-log-userspace-base.c\n+++ drivers\/md\/dm-log-userspace-base.c\n@@ -111,10 +111,9 @@\n \t\treturn -ENOMEM;\n \t}\n \n-\tfor (i = 0, str_size = 0; i < argc; i++)\n-\t\tstr_size += sprintf(str + str_size, \"%s \", argv[i]);\n-\tstr_size += sprintf(str + str_size, \"%llu\",\n-\t\t\t (unsigned long long)ti->len);\n+\tstr_size = sprintf(str, \"%llu\", (unsigned long long)ti->len);\n+\tfor (i = 0; i < argc; i++)\n+\t\tstr_size += sprintf(str + str_size, \" %s\", argv[i]);\n \n \t*ctr_str = str;\n \treturn str_size;\n@@ -561,6 +560,7 @@\n \t\t\t char *result, unsigned maxlen)\n {\n \tint r = 0;\n+\tchar *table_args;\n \tsize_t sz = (size_t)maxlen;\n \tstruct log_c *lc = log->context;\n \n@@ -577,8 +577,12 @@\n \t\tbreak;\n \tcase STATUSTYPE_TABLE:\n \t\tsz = 0;\n-\t\tDMEMIT(\"%s %u %s %s \", log->type->name, lc->usr_argc + 1,\n-\t\t lc->uuid, lc->usr_argv_str);\n+\t\ttable_args = strstr(lc->usr_argv_str, \" \");\n+\t\tBUG_ON(!table_args); \/* There will always be a ' ' *\/\n+\t\ttable_args++;\n+\n+\t\tDMEMIT(\"%s %u %s %s \", log->type->name, lc->usr_argc,\n+\t\t lc->uuid, table_args);\n \t\tbreak;\n \t}\n \treturn (r) ? 0 : (int)sz;\n"} {"commit":"a4463e3690eff846ccebe3641d106270ec5c9e92","subject":"Correct comment.","message":"Correct comment.\n","repos":"jnealtowns\/infra,jnealtowns\/infra,jnealtowns\/infra","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- modules\/AIM\/module\/inc\/AIM\/aim_time.h\n+++ modules\/AIM\/module\/inc\/AIM\/aim_time.h\n@@ -39,7 +39,7 @@\n uint64_t aim_time_monotonic(void);\n \n \/**\n- * @brief Current time in ms.\n+ * @brief Current time in us.\n *\/\n uint64_t aim_time_realtime(void);\n \n"} {"commit":"cfec570c152089dba264f30c6d7a102a0c644616","subject":"maintain foreign key constraint when delete from referenced table","message":"maintain foreign key constraint when delete from referenced table\n","repos":"JamisHoo\/OurSQL-DBMS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/db_query.h\n+++ src\/db_query.h\n@@ -180,6 +180,10 @@\n } catch (const UpdateFailed& error) {\n err << \"Error: \";\n err << error.getInfo() << std::endl;\n+ } catch (const RecordReferenced& error) {\n+ err << \"Error: \";\n+ err << \"Table \\\"\" << error.table_name << \"\\\" references it. \"\n+ << std::endl;\n }\n \n return 1;\n@@ -820,6 +824,25 @@\n \n \/\/ select records\n auto rids = selectRID(table_manager, conditions);\n+ \n+\n+ \/\/ check foreign key constraint\n+ std::unique_ptr record_buff(new char[fields_desc.recordLength()]);\n+ for (const auto rid: rids) {\n+ assert(table_manager->selectRecord(rid, record_buff.get()) == 0);\n+ auto eqr = referenced_tables.equal_range(query.table_name);\n+ for (auto ite = eqr.first; ite != eqr.second; ++ite) {\n+ DBTableManager* foreign_table_manager = openTable(std::get<1>(ite->second));\n+ assert(foreign_table_manager);\n+ assert(fields_desc.primary_key_field_id() == std::get<0>(ite->second));\n+ Condition cond(2, std::get<2>(ite->second),\n+ std::numeric_limits::max(), \"=\",\n+ std::string(record_buff.get() + fields_desc.offset()[std::get<0>(ite->second)],\n+ fields_desc.field_length()[std::get<0>(ite->second)]));\n+ if (selectRID(foreign_table_manager, std::vector(1, cond)).size())\n+ throw RecordReferenced(std::get<1>(ite->second));\n+ }\n+ }\n \n \/\/ remove rids\n for (const auto& rid: rids)\n@@ -910,6 +933,7 @@\n if (pointer_convert(args[ite2 - modify_field_ids.begin()])[0] == '\\x00')\n continue;\n DBTableManager* foreign_table_manager = openTable(std::get<1>(ite->second));\n+ assert(foreign_table_manager);\n Condition cond(2, std::get<2>(ite->second),\n std::numeric_limits::max(), \"=\",\n std::string(pointer_convert(args[ite2 - modify_field_ids.begin()]),\n@@ -1275,6 +1299,7 @@\n if (pointer_convert(args[std::get<0>(ite->second)])[0] == '\\x00')\n continue;\n DBTableManager* foreign_table_manager = openTable(std::get<1>(ite->second));\n+ assert(foreign_table_manager);\n Condition cond(2, std::get<2>(ite->second), \n std::numeric_limits::max(), \"=\", \n std::string(pointer_convert(args[std::get<0>(ite->second)]), \n@@ -1670,6 +1695,10 @@\n return \"Against foreign key constraint. \";\n }\n };\n+ struct RecordReferenced {\n+ std::string table_name;\n+ RecordReferenced(const std::string& tn): table_name(tn) { }\n+ };\n };\n \n \n"} {"commit":"32f8aca4affc9cc5699a8e45b3ce08e76d7b847b","subject":"Revert \"V4L\/DVB: az6027: az6027_read_mac_addr is currently unused\"","message":"Revert \"V4L\/DVB: az6027: az6027_read_mac_addr is currently unused\"\n\nThis reverts commit 1e08370814e8902074d59cc57f2b4c1a62f00ee8.\n\nPatch were wrongly applied.\n\nSigned-off-by: Mauro Carvalho Chehab \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/az6027.c\n+++ drivers\/media\/dvb\/dvb-usb\/az6027.c\n@@ -754,13 +754,13 @@\n \treturn 0;\n }\n \n-#if 0\n+\n static int az6027_read_mac_addr(struct dvb_usb_device *d, u8 mac[6])\n {\n \taz6027_usb_in_op(d, 0xb7, 6, 0, &mac[0], 6);\n \treturn 0;\n }\n-#endif\n+\n \n static int az6027_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)\n {\n"} {"commit":"2fb8840663cf0e476549104a2c09caa0fb3b4bc9","subject":"V4L\/DVB (7062): radio-si570x: Some fixes and new USB ID addition","message":"V4L\/DVB (7062): radio-si570x: Some fixes and new USB ID addition\n\n- avoid poss. locking when doing copy_to_user which may sleep\n- RDS is automatically activated on read now\n- code cleaned of unnecessary rds_commands\n- USB Vendor\/Product ID for ADS\/Tech FM Radio Receiver verified\n (thanks to Guillaume RAMOUSSE)\n\nSigned-off-by: Tobias Lorenz <7a856af69e3c02a6f9b70fd57eac5c40b7d73c0c@gmx.net>\nSigned-off-by: Mauro Carvalho Chehab \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/radio\/radio-si470x.c\n+++ drivers\/media\/radio\/radio-si470x.c\n@@ -55,13 +55,17 @@\n *\t\t- applied all checkpatch.pl v1.12 suggestions\n *\t\t except the warning about the too long lines with bit comments\n *\t\t- renamed FMRADIO to RADIO to cut line length (checkpatch.pl)\n+ * 2008-01-22\tTobias Lorenz \n+ *\t\tVersion 1.0.4\n+ *\t\t- avoid poss. locking when doing copy_to_user which may sleep\n+ *\t\t- RDS is automatically activated on read now\n+ *\t\t- code cleaned of unnecessary rds_commands\n+ *\t\t- USB Vendor\/Product ID for ADS\/Tech FM Radio Receiver verified\n+ *\t\t (thanks to Guillaume RAMOUSSE)\n *\n * ToDo:\n- * - check USB Vendor\/Product ID for ADS\/Tech FM Radio Receiver\n- * (formerly Instant FM Music) (RDX-155-EF) is 06e1:a155\n * - add seeking support\n * - add firmware download\/update support\n- * - add possibility to switch off RDS\n * - RDS support: interrupt mode, instead of polling\n * - add LED status output (check if that's not already done in firmware)\n *\/\n@@ -70,7 +74,7 @@\n \/* driver definitions *\/\n #define DRIVER_AUTHOR \"Tobias Lorenz \"\n #define DRIVER_NAME \"radio-si470x\"\n-#define DRIVER_VERSION KERNEL_VERSION(1, 0, 3)\n+#define DRIVER_VERSION KERNEL_VERSION(1, 0, 4)\n #define DRIVER_CARD \"Silicon Labs Si470x FM Radio Receiver\"\n #define DRIVER_DESC \"USB radio driver for Si470x FM Radio Receivers\"\n \n@@ -93,6 +97,8 @@\n static struct usb_device_id si470x_usb_driver_id_table[] = {\n \t\/* Silicon Labs USB FM Radio Reference Design *\/\n \t{ USB_DEVICE_AND_INTERFACE_INFO(0x10c4, 0x818a,\tUSB_CLASS_HID, 0, 0) },\n+\t\/* ADS\/Tech FM Radio Receiver (formerly Instant FM Music) *\/\n+\t{ USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155,\tUSB_CLASS_HID, 0, 0) },\n \t\/* Terminating entry *\/\n \t{ }\n };\n@@ -159,6 +165,7 @@\n \/* RDS poll frequency *\/\n static int rds_poll_time = 40;\n \/* 40 is used by the original USBRadio.exe *\/\n+\/* 50 is used by radio-cadet *\/\n \/* 75 should be okay *\/\n \/* 80 is the usual RDS receive interval *\/\n module_param(rds_poll_time, int, 0);\n@@ -399,16 +406,13 @@\n \n \t\/* RDS receive buffer *\/\n \tstruct work_struct work;\n+\twait_queue_head_t read_queue;\n \tstruct timer_list timer;\n \tspinlock_t lock;\t\t\/* buffer locking *\/\n-\tunsigned char *buffer;\n+\tunsigned char *buffer;\t\t\/* size is always multiple of three *\/\n \tunsigned int buf_size;\n \tunsigned int rd_index;\n \tunsigned int wr_index;\n-\tunsigned int block_count;\n-\tunsigned char last_blocknum;\n-\twait_queue_head_t read_queue;\n-\tint data_available_for_read;\n };\n \n \n@@ -658,8 +662,7 @@\n \t\treturn retval;\n \n \t\/* sysconfig 1 *\/\n-\tradio->registers[SYSCONFIG1] =\n-\t\tSYSCONFIG1_DE | SYSCONFIG1_RDS;\n+\tradio->registers[SYSCONFIG1] = SYSCONFIG1_DE;\n \tretval = si470x_set_register(radio, SYSCONFIG1);\n \tif (retval < 0)\n \t\treturn retval;\n@@ -685,6 +688,14 @@\n *\/\n static int si470x_stop(struct si470x_device *radio)\n {\n+\tint retval;\n+\n+\t\/* sysconfig 1 *\/\n+\tradio->registers[SYSCONFIG1] &= ~SYSCONFIG1_RDS;\n+\tretval = si470x_set_register(radio, SYSCONFIG1);\n+\tif (retval < 0)\n+\t\treturn retval;\n+\n \t\/* powercfg *\/\n \tradio->registers[POWERCFG] &= ~POWERCFG_DMUTE;\n \t\/* POWERCFG_ENABLE has to automatically go low *\/\n@@ -693,6 +704,17 @@\n }\n \n \n+\/*\n+ * si470x_rds_on - switch on rds reception\n+ *\/\n+static int si470x_rds_on(struct si470x_device *radio)\n+{\n+\t\/* sysconfig 1 *\/\n+\tradio->registers[SYSCONFIG1] |= SYSCONFIG1_RDS;\n+\treturn si470x_set_register(radio, SYSCONFIG1);\n+}\n+\n+\n \n \/**************************************************************************\n * RDS Driver Functions\n@@ -703,15 +725,13 @@\n *\/\n static void si470x_rds(struct si470x_device *radio)\n {\n-\tunsigned long flags;\n \tunsigned char tmpbuf[3];\n \tunsigned char blocknum;\n-\tunsigned char bler; \/* RDS block errors *\/\n+\tunsigned char bler; \/* rds block errors *\/\n \tunsigned short rds;\n \tunsigned int i;\n \n-\tif (radio->users == 0)\n-\t\treturn;\n+\t\/* get rds blocks *\/\n \tif (si470x_get_rds_registers(radio) < 0)\n \t\treturn;\n \tif ((radio->registers[STATUSRSSI] & STATUSRSSI_RDSR) == 0) {\n@@ -723,152 +743,155 @@\n \t\treturn;\n \t}\n \n-\tfor (blocknum = 0; blocknum < 4; blocknum++) {\n-\t\tswitch (blocknum) {\n-\t\tdefault:\n-\t\t\tbler = (radio->registers[STATUSRSSI] &\n-\t\t\t\t\tSTATUSRSSI_BLERA) >> 9;\n-\t\t\trds = radio->registers[RDSA];\n-\t\t\tbreak;\n-\t\tcase 1:\n-\t\t\tbler = (radio->registers[READCHAN] &\n-\t\t\t\t\tREADCHAN_BLERB) >> 14;\n-\t\t\trds = radio->registers[RDSB];\n-\t\t\tbreak;\n-\t\tcase 2:\n-\t\t\tbler = (radio->registers[READCHAN] &\n-\t\t\t\t\tREADCHAN_BLERC) >> 12;\n-\t\t\trds = radio->registers[RDSC];\n-\t\t\tbreak;\n-\t\tcase 3:\n-\t\t\tbler = (radio->registers[READCHAN] &\n-\t\t\t\t\tREADCHAN_BLERD) >> 10;\n-\t\t\trds = radio->registers[RDSD];\n-\t\t\tbreak;\n-\t\t};\n-\n-\t\t\/* Fill the V4L2 RDS buffer *\/\n-\t\ttmpbuf[0] = rds & 0x00ff;\t\/* LSB *\/\n-\t\ttmpbuf[1] = (rds & 0xff00) >> 8;\/* MSB *\/\n-\t\ttmpbuf[2] = blocknum;\t\t\/* offset name *\/\n-\t\ttmpbuf[2] |= blocknum << 3;\t\/* received offset *\/\n-\t\tif (bler > max_rds_errors)\n-\t\t\ttmpbuf[2] |= 0x80;\t\/* uncorrectable errors *\/\n-\t\telse if (bler > 0)\n-\t\t\ttmpbuf[2] |= 0x40;\t\/* corrected error(s) *\/\n-\n-\t\tspin_lock_irqsave(&radio->lock, flags);\n-\n-\t\t\/* copy RDS block to internal buffer *\/\n-\t\tfor (i = 0; i < 3; i++) {\n-\t\t\tradio->buffer[radio->wr_index] = tmpbuf[i];\n-\t\t\tradio->wr_index++;\n+\t\/* copy four RDS blocks to internal buffer *\/\n+\tif (spin_trylock(&radio->lock)) {\n+\t\t\/* process each rds block *\/\n+\t\tfor (blocknum = 0; blocknum < 4; blocknum++) {\n+\t\t\tswitch (blocknum) {\n+\t\t\tdefault:\n+\t\t\t\tbler = (radio->registers[STATUSRSSI] &\n+\t\t\t\t\t\tSTATUSRSSI_BLERA) >> 9;\n+\t\t\t\trds = radio->registers[RDSA];\n+\t\t\t\tbreak;\n+\t\t\tcase 1:\n+\t\t\t\tbler = (radio->registers[READCHAN] &\n+\t\t\t\t\t\tREADCHAN_BLERB) >> 14;\n+\t\t\t\trds = radio->registers[RDSB];\n+\t\t\t\tbreak;\n+\t\t\tcase 2:\n+\t\t\t\tbler = (radio->registers[READCHAN] &\n+\t\t\t\t\t\tREADCHAN_BLERC) >> 12;\n+\t\t\t\trds = radio->registers[RDSC];\n+\t\t\t\tbreak;\n+\t\t\tcase 3:\n+\t\t\t\tbler = (radio->registers[READCHAN] &\n+\t\t\t\t\t\tREADCHAN_BLERD) >> 10;\n+\t\t\t\trds = radio->registers[RDSD];\n+\t\t\t\tbreak;\n+\t\t\t};\n+\n+\t\t\t\/* Fill the V4L2 RDS buffer *\/\n+\t\t\ttmpbuf[0] = rds & 0x00ff;\t\/* LSB *\/\n+\t\t\ttmpbuf[1] = (rds & 0xff00) >> 8;\/* MSB *\/\n+\t\t\ttmpbuf[2] = blocknum;\t\t\/* offset name *\/\n+\t\t\ttmpbuf[2] |= blocknum << 3;\t\/* received offset *\/\n+\t\t\tif (bler > max_rds_errors)\n+\t\t\t\ttmpbuf[2] |= 0x80; \/* uncorrectable errors *\/\n+\t\t\telse if (bler > 0)\n+\t\t\t\ttmpbuf[2] |= 0x40; \/* corrected error(s) *\/\n+\n+\t\t\t\/* copy RDS block to internal buffer *\/\n+\t\t\tfor (i = 0; i < 3; i++) {\n+\t\t\t\tradio->buffer[radio->wr_index] = tmpbuf[i];\n+\t\t\t\tradio->wr_index++;\n+\t\t\t}\n+\n+\t\t\t\/* wrap write pointer *\/\n+\t\t\tif (radio->wr_index >= radio->buf_size)\n+\t\t\t\tradio->wr_index = 0;\n+\n+\t\t\t\/* check for overflow *\/\n+\t\t\tif (radio->wr_index == radio->rd_index) {\n+\t\t\t\t\/* increment and wrap read pointer *\/\n+\t\t\t\tradio->rd_index += 3;\n+\t\t\t\tif (radio->rd_index >= radio->buf_size)\n+\t\t\t\t\tradio->rd_index = 0;\n+\t\t\t}\n \t\t}\n-\n-\t\tif (radio->wr_index >= radio->buf_size)\n-\t\t\tradio->wr_index = 0;\n-\n-\t\tif (radio->wr_index == radio->rd_index) {\n+\t\tspin_unlock(&radio->lock);\n+\t}\n+\n+\t\/* wake up read queue *\/\n+\tif (radio->wr_index != radio->rd_index)\n+\t\twake_up_interruptible(&radio->read_queue);\n+}\n+\n+\n+\/*\n+ * si470x_timer - rds timer function\n+ *\/\n+static void si470x_timer(unsigned long data)\n+{\n+\tstruct si470x_device *radio = (struct si470x_device *) data;\n+\n+\tschedule_work(&radio->work);\n+}\n+\n+\n+\/*\n+ * si470x_work - rds work function\n+ *\/\n+static void si470x_work(struct work_struct *work)\n+{\n+\tstruct si470x_device *radio = container_of(work, struct si470x_device,\n+\t\twork);\n+\n+\tif ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)\n+\t\treturn;\n+\n+\tsi470x_rds(radio);\n+\tmod_timer(&radio->timer, jiffies + msecs_to_jiffies(rds_poll_time));\n+}\n+\n+\n+\n+\/**************************************************************************\n+ * File Operations Interface\n+ **************************************************************************\/\n+\n+\/*\n+ * si470x_fops_read - read RDS data\n+ *\/\n+static ssize_t si470x_fops_read(struct file *file, char __user *buf,\n+\t\tsize_t count, loff_t *ppos)\n+{\n+\tstruct si470x_device *radio = video_get_drvdata(video_devdata(file));\n+\tint retval = 0;\n+\tunsigned int block_count = 0;\n+\n+\t\/* switch on rds reception *\/\n+\tif ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0) {\n+\t\tsi470x_rds_on(radio);\n+\t\tschedule_work(&radio->work);\n+\t}\n+\n+\t\/* block if no new data available *\/\n+\twhile (radio->wr_index == radio->rd_index) {\n+\t\tif (file->f_flags & O_NONBLOCK)\n+\t\t\treturn -EWOULDBLOCK;\n+\t\tinterruptible_sleep_on(&radio->read_queue);\n+\t}\n+\n+\t\/* calculate block count from byte count *\/\n+\tcount \/= 3;\n+\n+\t\/* copy RDS block out of internal buffer and to user buffer *\/\n+\tif (spin_trylock(&radio->lock)) {\n+\t\twhile (block_count < count) {\n+\t\t\tif (radio->rd_index == radio->wr_index)\n+\t\t\t\tbreak;\n+\n+\t\t\t\/* always transfer rds complete blocks *\/\n+\t\t\tif (copy_to_user(buf,\n+\t\t\t\t\t&radio->buffer[radio->rd_index], 3))\n+\t\t\t\t\/* retval = -EFAULT; *\/\n+\t\t\t\tbreak;\n+\n+\t\t\t\/* increment and wrap read pointer *\/\n \t\t\tradio->rd_index += 3;\n \t\t\tif (radio->rd_index >= radio->buf_size)\n \t\t\t\tradio->rd_index = 0;\n-\t\t} else\n-\t\t\tradio->block_count++;\n-\n-\t\tspin_unlock_irqrestore(&radio->lock, flags);\n-\t}\n-\n-\tradio->data_available_for_read = 1;\n-\twake_up_interruptible(&radio->read_queue);\n-}\n-\n-\n-\/*\n- * si470x_timer - rds timer function\n- *\/\n-static void si470x_timer(unsigned long data)\n-{\n-\tstruct si470x_device *radio = (struct si470x_device *) data;\n-\n-\tschedule_work(&radio->work);\n-}\n-\n-\n-\/*\n- * si470x_timer - rds work function\n- *\/\n-static void si470x_work(struct work_struct *work)\n-{\n-\tstruct si470x_device *radio = container_of(work, struct si470x_device,\n-\t\twork);\n-\n-\tif (radio->users == 0)\n-\t\treturn;\n-\n-\tsi470x_rds(radio);\n-\tmod_timer(&radio->timer, jiffies + msecs_to_jiffies(rds_poll_time));\n-}\n-\n-\n-\n-\/**************************************************************************\n- * File Operations Interface\n- **************************************************************************\/\n-\n-\/*\n- * si470x_fops_read - read RDS data\n- *\/\n-static ssize_t si470x_fops_read(struct file *file, char __user *buf,\n-\t\tsize_t count, loff_t *ppos)\n-{\n-\tstruct si470x_device *radio = video_get_drvdata(video_devdata(file));\n-\tstruct rds_command cmd;\n-\tunsigned long flags;\n-\tunsigned int i;\n-\tunsigned int rd_blocks;\n-\n-\tcmd.block_count = count \/ 3; \/* each RDS block needs 3 bytes *\/\n-\tcmd.result = 0;\n-\tcmd.buffer = buf;\n-\tcmd.instance = file;\n-\n-\t\/* copy RDS block out of internal buffer *\/\n-\twhile (!radio->data_available_for_read) {\n-\t\tif (wait_event_interruptible(radio->read_queue,\n-\t\t\t\t radio->data_available_for_read) < 0)\n-\t\t\treturn -EINTR;\n-\t}\n-\n-\tspin_lock_irqsave(&radio->lock, flags);\n-\trd_blocks = cmd.block_count;\n-\tif (rd_blocks > radio->block_count)\n-\t\trd_blocks = radio->block_count;\n-\n-\tif (!rd_blocks) {\n-\t\tspin_unlock_irqrestore(&radio->lock, flags);\n-\t\treturn cmd.result;\n-\t}\n-\n-\tfor (i = 0; i < rd_blocks; i++) {\n-\t\t\/* copy RDS block to user buffer *\/\n-\t\tif (radio->rd_index == radio->wr_index)\n-\t\t\tbreak;\n-\n-\t\tif (copy_to_user(buf, &radio->buffer[radio->rd_index], 3))\n-\t\t\tbreak;\n-\n-\t\tradio->rd_index += 3;\n-\t\tif (radio->rd_index >= radio->buf_size)\n-\t\t\tradio->rd_index = 0;\n-\t\tradio->block_count--;\n-\n-\t\tbuf += 3;\n-\t\tcmd.result += 3;\n-\t}\n-\tradio->data_available_for_read = (radio->block_count > 0);\n-\tspin_unlock_irqrestore(&radio->lock, flags);\n-\n-\treturn cmd.result;\n+\n+\t\t\t\/* increment counters *\/\n+\t\t\tblock_count++;\n+\t\t\tbuf += 3;\n+\t\t\tretval += 3;\n+\t\t}\n+\n+\t\tspin_unlock(&radio->lock);\n+\t}\n+\n+\treturn retval;\n }\n \n \n@@ -879,14 +902,19 @@\n \t\tstruct poll_table_struct *pts)\n {\n \tstruct si470x_device *radio = video_get_drvdata(video_devdata(file));\n-\tint retval;\n-\n-\tretval = 0;\n-\tif (radio->data_available_for_read)\n-\t\tretval = POLLIN | POLLRDNORM;\n+\n+\t\/* switch on rds reception *\/\n+\tif ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0) {\n+\t\tsi470x_rds_on(radio);\n+\t\tschedule_work(&radio->work);\n+\t}\n+\n \tpoll_wait(file, &radio->read_queue, pts);\n \n-\treturn retval;\n+\tif (radio->rd_index != radio->wr_index)\n+\t\treturn POLLIN | POLLRDNORM;\n+\n+\treturn 0;\n }\n \n \n@@ -895,17 +923,11 @@\n *\/\n static int si470x_fops_open(struct inode *inode, struct file *file)\n {\n-\tint retval;\n \tstruct si470x_device *radio = video_get_drvdata(video_devdata(file));\n \n \tradio->users++;\n-\tif (radio->users == 1) {\n-\t\tretval = si470x_start(radio);\n-\t\tif (retval < 0)\n-\t\t\treturn retval;\n-\n-\t\tschedule_work(&radio->work);\n-\t}\n+\tif (radio->users == 1)\n+\t\treturn si470x_start(radio);\n \n \treturn 0;\n }\n@@ -916,7 +938,6 @@\n *\/\n static int si470x_fops_release(struct inode *inode, struct file *file)\n {\n-\tint retval;\n \tstruct si470x_device *radio = video_get_drvdata(video_devdata(file));\n \n \tif (!radio)\n@@ -924,12 +945,14 @@\n \n \tradio->users--;\n \tif (radio->users == 0) {\n-\t\tradio->data_available_for_read = 1;\t\t\/* ? *\/\n-\t\twake_up_interruptible(&radio->read_queue);\t\/* ? *\/\n-\n-\t\tretval = si470x_stop(radio);\n-\t\tif (retval < 0)\n-\t\t\treturn retval;\n+\t\t\/* stop rds reception *\/\n+\t\tdel_timer_sync(&radio->timer);\n+\t\tflush_scheduled_work();\n+\n+\t\t\/* cancel read processes *\/\n+\t\twake_up_interruptible(&radio->read_queue);\n+\n+\t\treturn si470x_stop(radio);\n \t}\n \n \treturn 0;\n@@ -1314,9 +1337,10 @@\n \t\t\t< RADIO_SW_VERSION_CURRENT)\n \t\tprintk(KERN_WARNING DRIVER_NAME\n \t\t\t\": This driver is known to work with chip version %d, \"\n-\t\t\t\"but the device has firmware %d. If you have some \"\n-\t\t\t\"trouble using this driver, please report to V4L ML \"\n-\t\t\t\"at video4linux-list@redhat.com\\n\",\n+\t\t\t\"but the device has firmware %d.\\n\"\n+\t\t\tDRIVER_NAME\n+\t\t\t\"If you have some trouble using this driver, please \"\n+\t\t\t\"report to V4L ML at video4linux-list@redhat.com\\n\",\n \t\t\tradio->registers[CHIPID] & CHIPID_FIRMWARE,\n \t\t\tRADIO_SW_VERSION_CURRENT);\n \n@@ -1331,12 +1355,9 @@\n \t\tkfree(radio);\n \t\treturn -ENOMEM;\n \t}\n-\tradio->block_count = 0;\n \tradio->wr_index = 0;\n \tradio->rd_index = 0;\n-\tradio->last_blocknum = 0xff;\n \tinit_waitqueue_head(&radio->read_queue);\n-\tradio->data_available_for_read = 0;\n \n \t\/* prepare polling via eventd *\/\n \tINIT_WORK(&radio->work, si470x_work);\n@@ -1408,4 +1429,4 @@\n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(DRIVER_AUTHOR);\n MODULE_DESCRIPTION(DRIVER_DESC);\n-MODULE_VERSION(\"1.0.3\");\n+MODULE_VERSION(\"1.0.4\");\n"} {"commit":"f63b635c0c32788a2476a47c1a890e5dc5950079","subject":"log_xxd(): replace strlen(c) by 3 since the string length is constant (gain a few CPU cycles)","message":"log_xxd(): replace strlen(c) by 3 since the string length is constant\n(gain a few CPU cycles)\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@2050 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/debuglog.c\n+++ src\/debuglog.c\n@@ -128,7 +128,7 @@\n \tfor (i = 0; (i < len) && (c < debug_buf_end); ++i)\n \t{\n \t\tsprintf(c, \"%02X \", buffer[i]);\n-\t\tc += strlen(c);\n+\t\tc += 3;\n \t}\n \n \t\/* the buffer is too small so end it with \"...\" *\/\n"} {"commit":"6a5b63b3cbf774f6a576133fccb92f54cc8a23e1","subject":"[media] s2255drv: fix for return code not checked","message":"[media] s2255drv: fix for return code not checked\n\nStart acquisition return code was not being checked. Return error\nif start acquisition fails.\n\nSigned-off-by: Dean Anderson \nSigned-off-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nSigned-off-by: Mauro Carvalho Chehab <0cae1d1e981e84d16b82ca3d17be8a7f826608d3@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/usb\/s2255\/s2255drv.c\n+++ drivers\/media\/usb\/s2255\/s2255drv.c\n@@ -1230,12 +1230,16 @@\n \t\tvc->buffer.frame[j].cur_size = 0;\n \t}\n \tres = videobuf_streamon(&fh->vb_vidq);\n-\tif (res == 0) {\n-\t\ts2255_start_acquire(vc);\n-\t\tvc->b_acquire = 1;\n-\t} else\n+\tif (res != 0) {\n \t\tres_free(fh);\n-\n+\t\treturn res;\n+\t}\n+\tres = s2255_start_acquire(vc);\n+\tif (res != 0) {\n+\t\tres_free(fh);\n+\t\treturn res;\n+\t}\n+\tvc->b_acquire = 1;\n \treturn res;\n }\n \n@@ -2373,7 +2377,7 @@\n \n \tdprintk(dev, 2, \"start acquire exit[%d] %d\\n\", vc->idx, res);\n \tmutex_unlock(&dev->cmdlock);\n-\treturn 0;\n+\treturn res;\n }\n \n static int s2255_stop_acquire(struct s2255_vc *vc)\n"} {"commit":"75b79ffcc37c6bd05fa895f85d2d6426a9e4c3f1","subject":"[media] gspca - sonixb: Clenup source","message":"[media] gspca - sonixb: Clenup source\n\n- update copyright and module author\n- set the sensor table as constant\n\nSigned-off-by: Jean-Fran\u00e7ois Moine \nSigned-off-by: Mauro Carvalho Chehab \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sonixb.c\n+++ drivers\/media\/video\/gspca\/sonixb.c\n@@ -1,9 +1,9 @@\n \/*\n *\t\tsonix sn9c102 (bayer) library\n- *\t\tCopyright (C) 2003 2004 Michel Xhaard mxhaard@magic.fr\n+ *\n+ * Copyright (C) 2009-2011 Jean-Fran\u00e7ois Moine \n+ * Copyright (C) 2003 2004 Michel Xhaard mxhaard@magic.fr\n * Add Pas106 Stefano Mozzi (C) 2004\n- *\n- * V4L2 by Jean-Francois Moine \n *\n * This program is free software; you can redistribute it and\/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -52,7 +52,7 @@\n #include \n #include \"gspca.h\"\n \n-MODULE_AUTHOR(\"Michel Xhaard \");\n+MODULE_AUTHOR(\"Jean-Fran\u00e7ois Moine \");\n MODULE_DESCRIPTION(\"GSPCA\/SN9C102 USB Camera Driver\");\n MODULE_LICENSE(\"GPL\");\n \n@@ -531,7 +531,7 @@\n \t{0x30, 0x11, 0x02, 0x20, 0x70, 0x00, 0x00, 0x10},\n };\n \n-static struct sensor_data sensor_data[] = {\n+static const struct sensor_data sensor_data[] = {\n SENS(initHv7131d, hv7131d_sensor_init, F_GAIN, NO_BRIGHTNESS|NO_FREQ, 0),\n SENS(initHv7131r, hv7131r_sensor_init, 0, NO_BRIGHTNESS|NO_EXPO|NO_FREQ, 0),\n SENS(initOv6650, ov6650_sensor_init, F_GAIN|F_SIF, 0, 0x60),\n"} {"commit":"9d5c1251bfc10a0e864352f45e272331f65b3420","subject":"V4L\/DVB (8665): gspca: Fix the 640x480 resolution of the webcam 093a:2621.","message":"V4L\/DVB (8665): gspca: Fix the 640x480 resolution of the webcam 093a:2621.\n\nSigned-off-by: Jean-Francois Moine \nSigned-off-by: Mauro Carvalho Chehab \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sonixj.c\n+++ drivers\/media\/video\/gspca\/sonixj.c\n@@ -1136,7 +1136,6 @@\n \t\tbreak;\n \tcase SENSOR_OM6802:\n \t\tom6802_InitSensor(gspca_dev);\n-\t\treg1 = 0x46;\t\t\/* 640 clk 24Mz *\/\n \t\treg17 = 0x64;\t\t\/* 640 MCKSIZE *\/\n \t\tbreak;\n \tcase SENSOR_OV7648:\n"} {"commit":"90200d2b7f526128671a971ab29db38973bf3f51","subject":"V4L\/DVB (3239): reorganize tuner-simple threshold structure.","message":"V4L\/DVB (3239): reorganize tuner-simple threshold structure.\n\n\n- Create an array containing frequency threshold and control byte.\n- allows for an arbitrary amount of\nfrequency ranges to be set, like dvb-pll.\n- improves code readability.\n\nSigned-off-by: Michael Krufky <00524723a60798c74a43fcc620c25dd7b9ece078@m1k.net>\nSigned-off-by: Mauro Carvalho Chehab \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/tuner-simple.c\n+++ drivers\/media\/video\/tuner-simple.c\n@@ -79,17 +79,19 @@\n #define TUNER_PLL_LOCKED 0x40\n #define TUNER_STEREO_MK3 0x04\n \n+#define TUNER_MAX_RANGES 3\n+\n \/* ---------------------------------------------------------------------- *\/\n \n struct tunertype\n {\n \tchar *name;\n \n-\tunsigned short thresh1; \/* band switch VHF_LO <=> VHF_HI *\/\n-\tunsigned short thresh2; \/* band switch VHF_HI <=> UHF *\/\n-\tunsigned char VHF_L;\n-\tunsigned char VHF_H;\n-\tunsigned char UHF;\n+\tint count;\n+\tstruct {\n+\t\tunsigned short thresh;\n+\t\tunsigned char cb;\n+\t} ranges[TUNER_MAX_RANGES];\n \tunsigned char config;\n };\n \n@@ -102,305 +104,336 @@\n \t\/* 0-9 *\/\n \t[TUNER_TEMIC_PAL] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL (4002 FH5)\",\n-\t\t.thresh1= 16 * 140.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x02,\n-\t\t.VHF_H = 0x04,\n-\t\t.UHF = 0x01,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 140.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x04, },\n+\t\t\t{ 16 * 999.99 , 0x01, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_PAL_I] = { \/* Philips PAL_I *\/\n \t\t.name = \"Philips PAL_I (FI1246 and compatibles)\",\n-\t\t.thresh1= 16 * 140.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 140.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_NTSC] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips NTSC (FI1236,FM1236 and compatibles)\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 451.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 451.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_SECAM] = { \/* Philips SECAM *\/\n \t\t.name = \"Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)\",\n-\t\t.thresh1= 16 * 168.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 447.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa7,\n-\t\t.VHF_H = 0x97,\n-\t\t.UHF = 0x37,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 168.25 \/*MHz*\/, 0xa7, },\n+\t\t\t{ 16 * 447.25 \/*MHz*\/, 0x97, },\n+\t\t\t{ 16 * 999.99 , 0x37, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ABSENT] = { \/* Tuner Absent *\/\n \t\t.name = \"NoTuner\",\n-\t\t.thresh1= 0 \/*MHz*\/,\n-\t\t.thresh2= 0 \/*MHz*\/,\n-\t\t.VHF_L = 0x00,\n-\t\t.VHF_H = 0x00,\n-\t\t.UHF = 0x00,\n+\t\t.count = 1,\n+\t\t.ranges = {\n+\t\t\t{ 0, 0x00, },\n+\t\t},\n \t\t.config = 0x00,\n \t},\n \t[TUNER_PHILIPS_PAL] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL_BG (FI1216 and compatibles)\",\n-\t\t.thresh1= 16 * 168.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 447.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 168.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 447.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_NTSC] = { \/* TEMIC NTSC *\/\n \t\t.name = \"Temic NTSC (4032 FY5)\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x02,\n-\t\t.VHF_H = 0x04,\n-\t\t.UHF = 0x01,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x04, },\n+\t\t\t{ 16 * 999.99 , 0x01, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_PAL_I] = { \/* TEMIC PAL_I *\/\n \t\t.name = \"Temic PAL_I (4062 FY5)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x02,\n-\t\t.VHF_H = 0x04,\n-\t\t.UHF = 0x01,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x04, },\n+\t\t\t{ 16 * 999.99 , 0x01, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4036FY5_NTSC] = { \/* TEMIC NTSC *\/\n \t\t.name = \"Temic NTSC (4036 FY5)\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ALPS_TSBH1_NTSC] = { \/* TEMIC NTSC *\/\n \t\t.name = \"Alps HSBH1\",\n-\t\t.thresh1= 16 * 137.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 385.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 137.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 385.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n \t\/* 10-19 *\/\n \t[TUNER_ALPS_TSBE1_PAL] = { \/* TEMIC PAL *\/\n \t\t.name = \"Alps TSBE1\",\n-\t\t.thresh1= 16 * 137.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 385.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 137.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 385.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ALPS_TSBB5_PAL_I] = { \/* Alps PAL_I *\/\n \t\t.name = \"Alps TSBB5\",\n-\t\t.thresh1= 16 * 133.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 351.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 133.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 351.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ALPS_TSBE5_PAL] = { \/* Alps PAL *\/\n \t\t.name = \"Alps TSBE5\",\n-\t\t.thresh1= 16 * 133.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 351.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 133.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 351.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ALPS_TSBC5_PAL] = { \/* Alps PAL *\/\n \t\t.name = \"Alps TSBC5\",\n-\t\t.thresh1= 16 * 133.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 351.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 133.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 351.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4006FH5_PAL] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL_BG (4006FH5)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_ALPS_TSHC6_NTSC] = { \/* Alps NTSC *\/\n \t\t.name = \"Alps TSCH6\",\n-\t\t.thresh1= 16 * 137.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 385.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x14,\n-\t\t.VHF_H = 0x12,\n-\t\t.UHF = 0x11,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 137.25 \/*MHz*\/, 0x14, },\n+\t\t\t{ 16 * 385.25 \/*MHz*\/, 0x12, },\n+\t\t\t{ 16 * 999.99 , 0x11, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_PAL_DK] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL_DK (4016 FY5)\",\n-\t\t.thresh1= 16 * 168.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 456.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 168.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 456.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_NTSC_M] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips NTSC_M (MK2)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4066FY5_PAL_I] = { \/* TEMIC PAL_I *\/\n \t\t.name = \"Temic PAL_I (4066 FY5)\",\n-\t\t.thresh1= 16 * 169.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 169.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4006FN5_MULTI_PAL] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL* auto (4006 FN5)\",\n-\t\t.thresh1= 16 * 169.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 169.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n \t\/* 20-29 *\/\n \t[TUNER_TEMIC_4009FR5_PAL] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)\",\n-\t\t.thresh1= 16 * 141.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 141.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 464.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4039FR5_NTSC] = { \/* TEMIC NTSC *\/\n \t\t.name = \"Temic NTSC (4039 FR5)\",\n-\t\t.thresh1= 16 * 158.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 453.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 158.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 453.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4046FM5] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL\/SECAM multi (4046 FM5)\",\n-\t\t.thresh1= 16 * 169.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 169.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_PAL_DK] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL_DK (FI1256 and compatibles)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_FQ1216ME] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL\/SECAM multi (FQ1216ME)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_PAL_I_FM] = { \/* LGINNOTEK PAL_I *\/\n \t\t.name = \"LG PAL_I+FM (TAPC-I001D)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_PAL_I] = { \/* LGINNOTEK PAL_I *\/\n \t\t.name = \"LG PAL_I (TAPC-I701D)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_NTSC_FM] = { \/* LGINNOTEK NTSC *\/\n \t\t.name = \"LG NTSC+FM (TPI8NSR01F)\",\n-\t\t.thresh1= 16 * 210.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 497.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 210.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 497.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_PAL_FM] = { \/* LGINNOTEK PAL *\/\n \t\t.name = \"LG PAL_BG+FM (TPI8PSB01D)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_PAL] = { \/* LGINNOTEK PAL *\/\n \t\t.name = \"LG PAL_BG (TPI8PSB11D)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n \t\/* 30-39 *\/\n \t[TUNER_TEMIC_4009FN5_MULTI_PAL_FM] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL* auto + FM (4009 FN5)\",\n-\t\t.thresh1= 16 * 141.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 141.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 464.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_SHARP_2U5JF5540_NTSC] = { \/* SHARP NTSC *\/\n \t\t.name = \"SHARP NTSC_JP (2U5JF5540)\",\n-\t\t.thresh1= 16 * 137.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 317.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 137.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 317.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_Samsung_PAL_TCPM9091PD27] = { \/* Samsung PAL *\/\n \t\t.name = \"Samsung PAL TCPM9091PD27\",\n-\t\t.thresh1= 16 * 169 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 169 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 464 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_MT2032] = { \/* Microtune PAL|NTSC *\/\n@@ -408,186 +441,206 @@\n \t \/* see mt20xx.c for details *\/ },\n \t[TUNER_TEMIC_4106FH5] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL_BG (4106 FH5)\",\n-\t\t.thresh1= 16 * 141.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 141.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 464.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4012FY5] = { \/* TEMIC PAL *\/\n \t\t.name = \"Temic PAL_DK\/SECAM_L (4012 FY5)\",\n-\t\t.thresh1= 16 * 140.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x02,\n-\t\t.VHF_H = 0x04,\n-\t\t.UHF = 0x01,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 140.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x04, },\n+\t\t\t{ 16 * 999.99 , 0x01, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEMIC_4136FY5] = { \/* TEMIC NTSC *\/\n \t\t.name = \"Temic NTSC (4136 FY5)\",\n-\t\t.thresh1= 16 * 158.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 453.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 158.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 453.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_PAL_NEW_TAPC] = { \/* LGINNOTEK PAL *\/\n \t\t.name = \"LG PAL (newer TAPC series)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_FM1216ME_MK3] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL\/SECAM multi (FM1216ME MK3)\",\n-\t\t.thresh1= 16 * 158.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 158.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_NTSC_NEW_TAPC] = { \/* LGINNOTEK NTSC *\/\n \t\t.name = \"LG NTSC (newer TAPC series)\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n \t\/* 40-49 *\/\n \t[TUNER_HITACHI_NTSC] = { \/* HITACHI NTSC *\/\n \t\t.name = \"HITACHI V7-J180AT\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_PAL_MK] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL_MK (FI1216 MK)\",\n-\t\t.thresh1= 16 * 140.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0xc2,\n-\t\t.UHF = 0xcf,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 140.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0xc2, },\n+\t\t\t{ 16 * 999.99 , 0xcf, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_ATSC] = { \/* Philips ATSC *\/\n \t\t.name = \"Philips 1236D ATSC\/NTSC dual in\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_FM1236_MK3] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips NTSC MK3 (FM1236MK3 or FM1236\/F)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_4IN1] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips 4 in 1 (ATI TV Wonder Pro\/Conexant)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_MICROTUNE_4049FM5] = { \/* Microtune PAL *\/\n \t\t.name = \"Microtune 4049 FM5\",\n-\t\t.thresh1= 16 * 141.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 141.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 464.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PANASONIC_VP27] = { \/* Panasonic NTSC *\/\n \t\t.name = \"Panasonic VP27s\/ENGE4324D\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0xce,\n \t},\n \t[TUNER_LG_NTSC_TAPE] = { \/* LGINNOTEK NTSC *\/\n \t\t.name = \"LG NTSC (TAPE series)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TNF_8831BGFF] = { \/* Philips PAL *\/\n \t\t.name = \"Tenna TNF 8831 BGFF)\",\n-\t\t.thresh1= 16 * 161.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 463.25 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 161.25 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 463.25 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_MICROTUNE_4042FI5] = { \/* Microtune NTSC *\/\n \t\t.name = \"Microtune 4042 FI5 ATSC\/NTSC dual in\",\n-\t\t.thresh1= 16 * 162.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 457.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa2,\n-\t\t.VHF_H = 0x94,\n-\t\t.UHF = 0x31,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 162.00 \/*MHz*\/, 0xa2, },\n+\t\t\t{ 16 * 457.00 \/*MHz*\/, 0x94, },\n+\t\t\t{ 16 * 999.99 , 0x31, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n \t\/* 50-59 *\/\n \t[TUNER_TCL_2002N] = { \/* TCL NTSC *\/\n \t\t.name = \"TCL 2002N\",\n-\t\t.thresh1= 16 * 172.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 448.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 172.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 448.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_FM1256_IH3] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL\/SECAM_D (FM 1256 I-H3)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_THOMSON_DTT7610] = { \/* THOMSON ATSC *\/\n \t\t.name = \"Thomson DTT 7610 (ATSC\/NTSC)\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x39,\n-\t\t.VHF_H = 0x3a,\n-\t\t.UHF = 0x3c,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0x39, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x3a, },\n+\t\t\t{ 16 * 999.99 , 0x3c, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_FQ1286] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips FQ1286\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x41,\n-\t\t.VHF_H = 0x42,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x41, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x42, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_TDA8290] = { \/* Philips PAL|NTSC *\/\n@@ -595,47 +648,52 @@\n \t \/* see tda8290.c for details *\/ },\n \t[TUNER_TCL_2002MB] = { \/* TCL PAL *\/\n \t\t.name = \"TCL 2002MB\",\n-\t\t.thresh1= 16 * 170.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 450.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 170.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 450.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0xce,\n \t},\n \t[TUNER_PHILIPS_FQ1216AME_MK4] = { \/* Philips PAL *\/\n \t\t.name = \"Philips PAL\/SECAM multi (FQ1216AME MK4)\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0xce,\n \t},\n \t[TUNER_PHILIPS_FQ1236A_MK4] = { \/* Philips NTSC *\/\n \t\t.name = \"Philips FQ1236A MK4\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_YMEC_TVF_8531MF] = { \/* Philips NTSC *\/\n \t\t.name = \"Ymec TVision TVF-8531MF\/8831MF\/8731MF\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa0,\n-\t\t.VHF_H = 0x90,\n-\t\t.UHF = 0x30,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0xa0, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x90, },\n+\t\t\t{ 16 * 999.99 , 0x30, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_YMEC_TVF_5533MF] = { \/* Philips NTSC *\/\n \t\t.name = \"Ymec TVision TVF-5533MF\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \n@@ -643,20 +701,22 @@\n \t[TUNER_THOMSON_DTT761X] = { \/* THOMSON ATSC *\/\n \t\t\/* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A *\/\n \t\t.name = \"Thomson DTT 761X (ATSC\/NTSC)\",\n-\t\t.thresh1= 16 * 145.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 415.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x39,\n-\t\t.VHF_H = 0x3a,\n-\t\t.UHF = 0x3c,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 145.25 \/*MHz*\/, 0x39, },\n+\t\t\t{ 16 * 415.25 \/*MHz*\/, 0x3a, },\n+\t\t\t{ 16 * 999.99 , 0x3c, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TENA_9533_DI] = { \/* Philips PAL *\/\n \t\t.name = \"Tena TNF9533-D\/IF\/TNF9533-B\/DF\",\n-\t\t.thresh1= 16 * 160.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 464.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_TEA5767] = { \/* Philips RADIO *\/\n@@ -664,65 +724,72 @@\n \t \/* see tea5767.c for details *\/},\n \t[TUNER_PHILIPS_FMD1216ME_MK3] = { \/* Philips PAL *\/\n \t\t.name = \"Philips FMD1216ME MK3 Hybrid Tuner\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x51,\n-\t\t.VHF_H = 0x52,\n-\t\t.UHF = 0x54,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x51, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0x52, },\n+\t\t\t{ 16 * 999.99 , 0x54, },\n+\t\t},\n \t\t.config = 0x86,\n \t},\n \t[TUNER_LG_TDVS_H062F] = { \/* LGINNOTEK ATSC *\/\n \t\t.name = \"LG TDVS-H062F\/TUA6034\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 455.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0x01 },\n+\t\t\t{ 16 * 455.00 \/*MHz*\/, 0x02 },\n+\t\t\t{ 16 * 999.99 , 0x04 },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_YMEC_TVF66T5_B_DFF] = { \/* Philips PAL *\/\n \t\t.name = \"Ymec TVF66T5-B\/DFF\",\n-\t\t.thresh1= 16 * 160.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 464.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 464.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_LG_NTSC_TALN_MINI] = { \/* LGINNOTEK NTSC *\/\n \t\t.name = \"LG NTSC (TALN mini series)\",\n-\t\t.thresh1= 16 * 137.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 373.25 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x08,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 137.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 373.25 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x08, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n \t[TUNER_PHILIPS_TD1316] = { \/* Philips PAL *\/\n \t\t.name = \"Philips TD1316 Hybrid Tuner\",\n-\t\t.thresh1= 16 * 160.00 \/*MHz*\/,\n-\t\t.thresh2= 16 * 442.00 \/*MHz*\/,\n-\t\t.VHF_L = 0xa1,\n-\t\t.VHF_H = 0xa2,\n-\t\t.UHF = 0xa4,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 160.00 \/*MHz*\/, 0xa1, },\n+\t\t\t{ 16 * 442.00 \/*MHz*\/, 0xa2, },\n+\t\t\t{ 16 * 999.99 , 0xa4, },\n+\t\t},\n \t\t.config = 0xc8,\n \t},\n \t[TUNER_PHILIPS_TUV1236D] = { \/* Philips ATSC *\/\n \t\t.name = \"Philips TUV1236D ATSC\/NTSC dual in\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0xce,\n \t},\n \t[TUNER_TNF_5335MF] = { \/* Philips NTSC *\/\n \t\t.name = \"Tena TNF 5335 MF\",\n-\t\t.thresh1= 16 * 157.25 \/*MHz*\/,\n-\t\t.thresh2= 16 * 454.00 \/*MHz*\/,\n-\t\t.VHF_L = 0x01,\n-\t\t.VHF_H = 0x02,\n-\t\t.UHF = 0x04,\n+\t\t.count = 3,\n+\t\t.ranges = {\n+\t\t\t{ 16 * 157.25 \/*MHz*\/, 0x01, },\n+\t\t\t{ 16 * 454.00 \/*MHz*\/, 0x02, },\n+\t\t\t{ 16 * 999.99 , 0x04, },\n+\t\t},\n \t\t.config = 0x8e,\n \t},\n };\n@@ -776,20 +843,19 @@\n \tu16 div;\n \tstruct tunertype *tun;\n \tunsigned char buffer[4];\n-\tint rc, IFPCoff;\n+\tint rc, IFPCoff, i;\n \n \ttun = &tuners[t->type];\n-\tif (freq < tun->thresh1) {\n-\t\tconfig = tun->VHF_L;\n-\t\ttuner_dbg(\"tv: VHF lowrange\\n\");\n-\t} else if (freq < tun->thresh2) {\n-\t\tconfig = tun->VHF_H;\n-\t\ttuner_dbg(\"tv: VHF high range\\n\");\n-\t} else {\n-\t\tconfig = tun->UHF;\n-\t\ttuner_dbg(\"tv: UHF range\\n\");\n+\tfor (i = 0; i < tun->count; i++) {\n+\t\tif (freq > tun->ranges[i].thresh)\n+\t\t\tcontinue;\n+\t\tbreak;\n \t}\n-\n+\tconfig = tun->ranges[i].cb;\n+\t\/* i == 0 -> VHF_LO *\/\n+\t\/* i == 1 -> VHF_HI *\/\n+\t\/* i == 2 -> UHF *\/\n+\ttuner_dbg(\"tv: range %d\\n\",i);\n \n \t\/* tv norm specific stuff for multi-norm tuners *\/\n \tswitch (t->type) {\n"} {"commit":"eeed7026b4b2840dcc771c3a23783425b50bd6ef","subject":"mmc: sdhci-esdhc-imx: silence a false curly braces warning","message":"mmc: sdhci-esdhc-imx: silence a false curly braces warning\n\nStatic checkers suggest that probably we intended to put curly braces\naround the writel() to make it part of the else path. But, I think\nactually the indenting is off and the code works fine as is.\n\nThe stray tab was introduced in 0322191e6298 ('mmc: sdhci-esdhc-imx: add\nsd3.0 SDR clock tuning support')\n\nSigned-off-by: Dan Carpenter \nAcked-by: Dong Aisheng \nSigned-off-by: Ulf Hansson \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mmc\/host\/sdhci-esdhc-imx.c\n+++ drivers\/mmc\/host\/sdhci-esdhc-imx.c\n@@ -416,7 +416,7 @@\n \t\t\tnew_val |= ESDHC_VENDOR_SPEC_FRC_SDCLK_ON;\n \t\telse\n \t\t\tnew_val &= ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON;\n-\t\t\twritel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);\n+\t\twritel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);\n \t\treturn;\n \tcase SDHCI_HOST_CONTROL2:\n \t\tnew_val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);\n"} {"commit":"e727d384432d8b527a596ed17faa7ab5482e9d97","subject":"OVSDriver: remove incorrect log message","message":"OVSDriver: remove incorrect log message\n","repos":"floodlight\/ivs,vezril\/ivs,floodlight\/ivs,vezril\/ivs,floodlight\/ivs,vezril\/ivs","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- modules\/OVSDriver\/module\/src\/pktout.c\n+++ modules\/OVSDriver\/module\/src\/pktout.c\n@@ -176,7 +176,6 @@\n break;\n }\n default:\n- LOG_ERROR(\"unsupported action %s\", of_object_id_str[action.object_id]);\n return false;\n }\n }\n"} {"commit":"40fa04c611b8bd287cf9006d8bfa673d196fad1e","subject":"Revert \"* [android] Use rint on getFloatByViewport.\" (#1404)","message":"Revert \"* [android] Use rint on getFloatByViewport.\" (#1404)\n\nThis reverts commit 4bffbd284817f61f95a367a8a66d8b7b7e3f7f6d.","repos":"Hanks10100\/incubator-weex,alibaba\/weex,acton393\/incubator-weex,acton393\/incubator-weex,alibaba\/weex,KalicyZhou\/incubator-weex,Hanks10100\/incubator-weex,acton393\/incubator-weex,KalicyZhou\/incubator-weex,alibaba\/weex,Hanks10100\/incubator-weex,Hanks10100\/incubator-weex,alibaba\/weex,Hanks10100\/incubator-weex,acton393\/incubator-weex,alibaba\/weex,KalicyZhou\/incubator-weex,alibaba\/weex,alibaba\/weex,acton393\/incubator-weex,Hanks10100\/incubator-weex,acton393\/incubator-weex,Hanks10100\/incubator-weex,acton393\/incubator-weex,KalicyZhou\/incubator-weex,Hanks10100\/incubator-weex,KalicyZhou\/incubator-weex,KalicyZhou\/incubator-weex,acton393\/incubator-weex","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- weex_core\/Source\/base\/ViewUtils.h\n+++ weex_core\/Source\/base\/ViewUtils.h\n@@ -64,7 +64,7 @@\n \n float realPx = (src * WXCoreEnvironment::getInstance()->DeviceWidth() \/\n viewport);\n- float result = realPx > 0.005 && realPx < 1 ? 1.0f : rint(realPx);\n+ float result = realPx > 0.005 && realPx < 1 ? 1.0f : realPx;\n return result;\n }\n \n"} {"commit":"e9e9b8ed5c3960961b9bf38bff3877e00b847a46","subject":"[M23] Fix CThunk error on Cortex-M23","message":"[M23] Fix CThunk error on Cortex-M23\n\nCortex-M23 doesn't support ARMv8-M Main Extension and so doesn't support:\nldm r0, {r0, r1, r2, pc}\n\nFix it by going Cortex-M0\/M0+ way:\nldm r0, {r0, r1, r2, r3}\nbx r3\n","repos":"betzw\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,kjbracey-arm\/mbed,mbedmicro\/mbed,kjbracey-arm\/mbed,kjbracey-arm\/mbed,betzw\/mbed-os,c1728p9\/mbed-os,c1728p9\/mbed-os,c1728p9\/mbed-os,c1728p9\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,betzw\/mbed-os,c1728p9\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,andcor02\/mbed-os,mbedmicro\/mbed,betzw\/mbed-os,c1728p9\/mbed-os,betzw\/mbed-os,kjbracey-arm\/mbed,betzw\/mbed-os,mbedmicro\/mbed","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- platform\/CThunk.h\n+++ platform\/CThunk.h\n@@ -42,7 +42,7 @@\n #define CTHUNK_VARIABLES volatile uint32_t code[2]\n \n #if (defined(__CORTEX_M3) || defined(__CORTEX_M4) || defined(__CORTEX_M7) || defined(__CORTEX_A9) \\\n- || defined(__CORTEX_M23) || defined(__CORTEX_M33))\n+ || defined(__CORTEX_M33))\n \/**\n * CTHUNK disassembly for Cortex-M3\/M4\/M7\/A9 (thumb2):\n * * adr r0, #4\n@@ -59,7 +59,7 @@\n m_thunk.code[1] = 0x00008007; \\\n } while (0)\n \n-#elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0))\n+#elif (defined(__CORTEX_M0PLUS) || defined(__CORTEX_M0) || defined(__CORTEX_M23))\n \/*\n * CTHUNK disassembly for Cortex M0\/M0+ (thumb):\n * * adr r0, #4\n"} {"commit":"8ab49cb027c071bd6ee19fc4168719f2a92cd173","subject":"Remove cruft","message":"Remove cruft\n","repos":"dials\/dials,dials\/dials,dials\/dials,dials\/dials,dials\/dials","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- algorithms\/integration\/fit\/fitting.h\n+++ algorithms\/integration\/fit\/fitting.h\n@@ -141,23 +141,6 @@\n }\n }\n return vec2(sum2 != 0 ? sum1 \/ sum2 : 0.0, sumv);\n-\n- \/\/double df = 0.0, d2f = 0.0, sum_v = 0.0;\n- \/\/for (std::size_t i = 0; i < p.size(); ++i) {\n- \/\/if (m[i]) {\n- \/\/double v = std::abs(b[i]) + std::abs(p[i] * I);\n- \/\/double v2 = v*v;\n- \/\/double v3 = v2*v;\n- \/\/double c2 = c[i] * c[i];\n- \/\/double p2 = p[i] * p[i];\n- \/\/if (v > 0) {\n- \/\/df += p[i] * (1.0 - c2 \/ v2);\n- \/\/d2f += 2.0 * p2 * c2 \/ v3;\n- \/\/sum_v += v;\n- \/\/}\n- \/\/}\n- \/\/}\n- \/*return vec2(I - (d2f != 0 ? df \/ d2f : 0.0), sum_v);*\/\n }\n \n \/**\n"} {"commit":"d378fcf925aafaa8ba8b005139ee126955b060bf","subject":"We alread have the needed ioctl fd open at drv_init time.","message":"We alread have the needed ioctl fd open at drv_init time.\n","repos":"seanbruno\/fbsd-netcf,seanbruno\/fbsd-netcf,seanbruno\/fbsd-netcf","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/drv_fbsd.c\n+++ src\/drv_fbsd.c\n@@ -50,28 +50,18 @@\n #include \"dutil_fbsd.h\"\n \n \/*\n- * Note: doing an SIOCIGIFFLAGS scribbles on the union portion\n- * of the ifreq structure, which may confuse other parts of ifconfig.\n- * Make a private copy so we can avoid that.\n+ * Liberally ripped off from sbin\/ifconfig\/ifconfig.c\n *\/\n static int\n-setifflags(const char *vname, int value)\n+setifflags(const char *vname, int value, int ioctl_fd)\n {\n struct ifreq my_ifr;\n int flags;\n- int s;\n \n memset(&my_ifr, 0, sizeof(my_ifr));\n (void) strlcpy(my_ifr.ifr_name, vname, sizeof(my_ifr.ifr_name));\n \n- if ((s = socket(my_ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0 &&\n- (errno != EPROTONOSUPPORT ||\n- (s = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0)) {\n- printf(\"socket(family %u,SOCK_DGRAM\", my_ifr.ifr_addr.sa_family);\n- return (-1);\n- }\n-\n- if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&my_ifr) < 0) {\n+ if (ioctl(ioctl_fd, SIOCGIFFLAGS, (caddr_t)&my_ifr) < 0) {\n printf(\"ioctl (SIOCGIFFLAGS)\");\n return(-1);\n }\n@@ -84,7 +74,7 @@\n flags |= value;\n my_ifr.ifr_flags = flags & 0xffff;\n my_ifr.ifr_flagshigh = flags >> 16;\n- if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&my_ifr) < 0) {\n+ if (ioctl(ioctl_fd, SIOCSIFFLAGS, (caddr_t)&my_ifr) < 0) {\n return(-1);\n }\n return 0;\n@@ -246,14 +236,14 @@\n }\n \n int drv_if_down(struct netcf_if *nif) {\n- setifflags(nif->name, -IFF_UP);\n+ setifflags(nif->name, -IFF_UP, nif->ncf->driver->ioctl_fd);\n return 0;\n }\n \n int drv_if_up(struct netcf_if *nif) {\n \n \n- setifflags(nif->name, IFF_UP);\n+ setifflags(nif->name, IFF_UP, nif->ncf->driver->ioctl_fd);\n return 0;\n }\n \n"} {"commit":"e6bb22238a9c920e4a4373da1d9c756884543028","subject":"protocol\/server: Do gf_flock to flock conversion at the right place","message":"protocol\/server: Do gf_flock to flock conversion at the right place\n\nSigned-off-by: Vijay Bellur \nSigned-off-by: Anand V. Avati \n\nBUG: 708 (solaris : ping pong test hangs)\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=708\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/protocol\/server\/src\/server-protocol.c\n+++ xlators\/protocol\/server\/src\/server-protocol.c\n@@ -4938,6 +4938,8 @@\n break;\n }\n \n+ gf_flock_to_flock (&req->flock, &state->flock);\n+\n switch (state->type) {\n case GF_LK_F_RDLCK:\n state->flock.l_type = F_RDLCK;\n@@ -4955,7 +4957,6 @@\n break;\n }\n \n- gf_flock_to_flock (&req->flock, &state->flock);\n \n resolve_and_resume (frame, server_lk_resume);\n \n"} {"commit":"0082b81c450bf1715dc17447334941a3d156f578","subject":"Fix android -Wshorten-64-to-32 error: https:\/\/logs.chromium.org\/logs\/chromium\/buildbucket\/cr-buildbucket.appspot.com\/8844689770192651952\/+\/u\/compile__with_patch_\/raw_io.output_failure_summary_","message":"Fix android -Wshorten-64-to-32 error: https:\/\/logs.chromium.org\/logs\/chromium\/buildbucket\/cr-buildbucket.appspot.com\/8844689770192651952\/+\/u\/compile__with_patch_\/raw_io.output_failure_summary_\n\nThe compiler option is not added to default_copts because it breaks too many other quic and spdy code. This fix only makes the chromium bot green.\n\nPiperOrigin-RevId: 379252123\n","repos":"google\/quiche,google\/quiche,google\/quiche,google\/quiche","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- quic\/core\/quic_stream.h\n+++ quic\/core\/quic_stream.h\n@@ -478,7 +478,7 @@\n explicit MemSliceSpanWrapper(absl::Span span) : new_(span) {}\n \n bool empty() { return old_.has_value() ? old_->empty() : new_.empty(); }\n- size_t SaveTo(QuicStreamSendBuffer& send_buffer) {\n+ QuicByteCount SaveTo(QuicStreamSendBuffer& send_buffer) {\n if (old_.has_value()) {\n return send_buffer.SaveMemSliceSpan(*old_);\n }\n"} {"commit":"9b74e1556871553f49bc1e5c06fbdfd075bd4784","subject":"Fix the temporary evaluation of the 'isLower' and 'isUpper' functions for dense matrices","message":"Fix the temporary evaluation of the 'isLower' and 'isUpper' functions for dense matrices\n","repos":"Manu343726\/blaze-lib,byzhang\/blaze-lib,byzhang\/blaze,benjamingr\/blaze-lib,byzhang\/blaze-lib,gnzlbg\/blaze-lib,wdv4758h\/blaze-lib,Manu343726\/blaze-lib,wsavoie\/blaze-lib,benjamingr\/blaze-lib,byzhang\/blaze,amaniak\/blaze-lib,wsavoie\/blaze-lib,yzxyzh\/blaze-lib,ceramos\/blaze-lib,davidebaltieri31\/blaze-lib,davidebaltieri31\/blaze-lib,Manu343726\/blaze-lib,yzxyzh\/blaze-lib,honnibal\/blaze-lib,gnzlbg\/blaze-lib,nyotis\/blaze-lib,dorofiykolya\/blaze-lib,dylanede\/blaze-lib,yzxyzh\/blaze-lib,benjamingr\/blaze-lib,dorofiykolya\/blaze-lib,davidebaltieri31\/blaze-lib,dylanede\/blaze-lib,lsalamon\/blaze-lib,ceramos\/blaze-lib,amaniak\/blaze-lib,ColinGilbert\/blaze-lib,amaniak\/blaze-lib,honnibal\/blaze-lib,honnibal\/blaze-lib,wdv4758h\/blaze-lib,lsalamon\/blaze-lib,dorofiykolya\/blaze-lib,ceramos\/blaze-lib,ironm73\/blaze-lib,wdv4758h\/blaze-lib,byzhang\/blaze-lib,dylanede\/blaze-lib,ColinGilbert\/blaze-lib,nyotis\/blaze-lib,ironm73\/blaze-lib,lsalamon\/blaze-lib,ironm73\/blaze-lib,ColinGilbert\/blaze-lib,nyotis\/blaze-lib,gnzlbg\/blaze-lib,byzhang\/blaze,wsavoie\/blaze-lib","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/dense\/DenseMatrix.h\n+++ blaze\/math\/dense\/DenseMatrix.h\n@@ -47,10 +47,12 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -750,18 +752,14 @@\n {\n typedef typename MT::CompositeType CT;\n \n- \/\/ Early exit in case the matrix is guaranteed to be symmetric at compile time\n if( IsSymmetric::value )\n return true;\n \n- \/\/ Early exit in case the matrix is not square\n if( !isSquare( ~dm ) )\n return false;\n \n- \/\/ Evaluation of the dense matrix operand\n- CT A( ~dm );\n-\n- \/\/ Run time evaluation whether the matrix is symmetric\n+ CT A( ~dm ); \/\/ Evaluation of the dense matrix operand\n+\n if( SO == rowMajor ) {\n for( size_t i=1UL; i \/\/ Storage order\n bool isLower( const DenseMatrix& dm )\n {\n+ typedef typename MT::ResultType RT;\n+ typedef typename MT::ReturnType RN;\n typedef typename MT::CompositeType CT;\n+ typedef typename If< IsExpression, const RT, CT >::Type Tmp;\n \n if( !isSquare( ~dm ) )\n return false;\n@@ -832,7 +833,7 @@\n if( (~dm).rows() < 2UL )\n return true;\n \n- CT A( ~dm ); \/\/ Evaluation of the dense matrix operand\n+ Tmp A( ~dm ); \/\/ Evaluation of the dense matrix operand\n \n if( SO == rowMajor ) {\n for( size_t i=0UL; i \/\/ Storage order\n bool isUpper( const DenseMatrix& dm )\n {\n+ typedef typename MT::ResultType RT;\n+ typedef typename MT::ReturnType RN;\n typedef typename MT::CompositeType CT;\n+ typedef typename If< IsExpression, const RT, CT >::Type Tmp;\n \n if( !isSquare( ~dm ) )\n return false;\n@@ -904,7 +908,7 @@\n if( (~dm).rows() < 2UL )\n return true;\n \n- CT A( ~dm ); \/\/ Evaluation of the dense matrix operand\n+ Tmp A( ~dm ); \/\/ Evaluation of the dense matrix operand\n \n if( SO == rowMajor ) {\n for( size_t i=1UL; i MP_32BIT_MAX\n \/*\n * we can guarentee that GSM won't overlfow if we limit the input to\n@@ -1304,6 +1305,7 @@\n \/* if we can't pass in a 32_bit number, then no such check needed *\/\n PR_STATIC_ASSERT(sizeof(unsigned int) <= 4);\n #endif\n+ }\n \n return (*cx->worker)(cx->worker_cx, output, outputLen, maxOutputLen,\t\n input, inputLen, blocksize);\n"} {"commit":"fa6cba88c012728e991fd5b9b08329f757b00834","subject":"fix compile bug.","message":"fix compile bug.\n\n\ngit-svn-id: e98c317c6679dcf055eb388f05b44c3a6d6b38c6@1643 152afb58-edef-0310-8abb-c4023f1b3aa9\n","repos":"pinkflozd\/lighttpd,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct,Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct,Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,pinkflozd\/lighttpd,Fumon\/lighttpd-Basic-auth-hack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/network_solaris_sendfilev.c\n+++ src\/network_solaris_sendfilev.c\n@@ -48,7 +48,7 @@\n \n \t\tswitch(c->type) {\n \t\tcase MEM_CHUNK:\n-\t\t\tret = network_write_chunkqueue_writev_mem(srv, con, fd, cq, &c);\n+\t\t\tret = network_write_chunkqueue_writev_mem(srv, con, sock, cq, &c);\n \n \t\t\tif (ret != NETWORK_STATUS_SUCCESS) {\n \t\t\t\treturn ret;\n"} {"commit":"3248c1d7393dfc3292fef3941041869aa8706ed8","subject":"msm: net: ecm: remove driver version printings","message":"msm: net: ecm: remove driver version printings\n\nChange was made in order to avoid the case where a new\ncommit is introduced but the driver version update is\nnot incremented by accident.\nInstead, the actual driver version can be fetch\nby looking at the build version.\n\nChange-Id: I54286d3bebc45738c24a8057b4545f1aded8e3f6\nSigned-off-by: Talel Atias <7002fdff16c3aef9ae79c633dab0356b91a8c2e4@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/msm\/ecm_ipa.c\n+++ drivers\/net\/ethernet\/msm\/ecm_ipa.c\n@@ -22,7 +22,6 @@\n #include \n \n #define DRIVER_NAME \"ecm_ipa\"\n-#define DRIVER_VERSION \"20-Mar-2013\"\n #define ECM_IPA_IPV4_HDR_NAME \"ecm_eth_ipv4\"\n #define ECM_IPA_IPV6_HDR_NAME \"ecm_eth_ipv6\"\n #define IPA_TO_USB_CLIENT\tIPA_CLIENT_USB_CONS\n@@ -206,7 +205,7 @@\n \tstruct net_device *net;\n \tstruct ecm_ipa_dev *dev;\n \tECM_IPA_LOG_ENTRY();\n-\tpr_debug(\"%s version %s\\n\", DRIVER_NAME, DRIVER_VERSION);\n+\tpr_debug(\"%s initializing\\n\", DRIVER_NAME);\n \tNULL_CHECK(ecm_ipa_rx_dp_notify);\n \tNULL_CHECK(ecm_ipa_tx_dp_notify);\n \tNULL_CHECK(priv);\n@@ -1021,7 +1020,6 @@\n {\n \tECM_IPA_LOG_ENTRY();\n \tstrlcpy(drv_info->driver, DRIVER_NAME, sizeof(drv_info->driver));\n-\tstrlcpy(drv_info->version, DRIVER_VERSION, sizeof(drv_info->version));\n \tECM_IPA_LOG_EXIT();\n }\n \n"} {"commit":"4e706d7f2cb79df257809b45c033b3bcf5822edf","subject":"fileio: Error in compression on read errors","message":"fileio: Error in compression on read errors\n\nWe can write a corrupted file if the input file errors during a read.\nWe should return a non-zero error code in this case.\n","repos":"Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- programs\/fileio.c\n+++ programs\/fileio.c\n@@ -796,6 +796,14 @@\n }\n }\n } while (directive != ZSTD_e_end);\n+\n+ if (ferror(srcFile)) {\n+ EXM_THROW(26, \"Read error : I\/O error\");\n+ }\n+ if (fileSize != UTIL_FILESIZE_UNKNOWN && *readsize != fileSize) {\n+ EXM_THROW(27, \"Read error : Incomplete read : %llu \/ %llu B\",\n+ (unsigned long long)*readsize, (unsigned long long)fileSize);\n+ }\n \n return compressedfilesize;\n }\n"} {"commit":"31f0f48130fb68908413e710d960c5d7c6476b45","subject":"protocol\/server: server_stub_resume should check for failure of lookup when oldloc.parent is NULL.","message":"protocol\/server: server_stub_resume should check for failure of lookup when oldloc.parent is NULL.\n\nSigned-off-by: Anand V. Avati \n\nBUG: 215 (crash on ib-verbs in 2.0.6-rc4)\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=215\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/protocol\/server\/src\/server-protocol.c\n+++ xlators\/protocol\/server\/src\/server-protocol.c\n@@ -2837,7 +2837,8 @@\n \n \tcase GF_FOP_LINK:\n \t{\n-\t\tif (stub->args.link.oldloc.inode == NULL) {\n+\t\tif ((stub->args.link.oldloc.inode == NULL)\n+ || (stub->args.link.oldloc.parent == NULL)) {\n \t\t\tif (op_ret < 0) {\n \t\t\t\tgf_log (stub->frame->this->name, GF_LOG_DEBUG,\n \t\t\t\t\t\"%\"PRId64\": LINK (%s -> %s) on %s returning \"\n"} {"commit":"2f9954b6ff9096cc22044743844c1f688ea0b0ca","subject":"Extend the 'DenseColumn' class template with 'tryAddAssign', 'trySubAssign', and 'tryMultAssign'","message":"Extend the 'DenseColumn' class template with 'tryAddAssign', 'trySubAssign', and 'tryMultAssign'\n","repos":"byzhang\/blaze,byzhang\/blaze,byzhang\/blaze","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/views\/DenseColumn.h\n+++ blaze\/math\/views\/DenseColumn.h\n@@ -427,7 +427,8 @@\n template< typename VT > inline DenseColumn& operator= ( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator+=( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator-=( const Vector& rhs );\n- template< typename VT > inline DenseColumn& operator*=( const Vector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const DenseVector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const SparseVector& rhs );\n \n template< typename Other >\n inline typename EnableIf< IsNumeric, DenseColumn >::Type&\n@@ -584,6 +585,15 @@\n \n template< typename MT2, bool SO2, bool SF2, typename VT >\n friend bool tryAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryAddAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool trySubAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryMultAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n \n template< typename MT2, bool SO2, bool SF2 >\n friend typename DerestrictTrait< DenseColumn >::Type\n@@ -971,7 +981,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !tryAddAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -1020,7 +1030,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !trySubAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -1042,12 +1052,13 @@\n \n \n \/\/*************************************************************************************************\n-\/*!\\brief Multiplication assignment operator for the multiplication of a vector\n+\/*!\\brief Multiplication assignment operator for the multiplication of a dense vector\n \/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n \/\/\n-\/\/ \\param rhs The right-hand side vector to be multiplied with the dense column.\n+\/\/ \\param rhs The right-hand side dense vector to be multiplied with the dense column.\n \/\/ \\return Reference to the assigned column.\n \/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n \/\/\n \/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n \/\/ is thrown.\n@@ -1055,8 +1066,8 @@\n template< typename MT \/\/ Type of the dense matrix\n , bool SO \/\/ Storage order\n , bool SF > \/\/ Symmetry flag\n-template< typename VT > \/\/ Type of the right-hand side vector\n-inline DenseColumn& DenseColumn::operator*=( const Vector& rhs )\n+template< typename VT > \/\/ Type of the right-hand side dense vector\n+inline DenseColumn& DenseColumn::operator*=( const DenseVector& rhs )\n {\n BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( typename VT::ResultType );\n BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( typename VT::ResultType );\n@@ -1064,15 +1075,63 @@\n if( size() != (~rhs).size() )\n throw std::invalid_argument( \"Vector sizes do not match\" );\n \n+ typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n+ Right right( ~rhs );\n+\n+ if( !tryMultAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n typename DerestrictTrait::Type left( derestrict( *this ) );\n \n- if( (~rhs).canAlias( &matrix_ ) || IsSparseVector::value ) {\n- const ResultType tmp( *this * (~rhs) );\n- smpAssign( left, tmp );\n+ if( IsReference::value && right.canAlias( &matrix_ ) ) {\n+ const typename VT::ResultType tmp( right );\n+ smpMultAssign( left, tmp );\n }\n else {\n- smpMultAssign( left, ~rhs );\n- }\n+ smpMultAssign( left, right );\n+ }\n+\n+ BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n+ BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n+\n+ return *this;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Multiplication assignment operator for the multiplication of a sparse vector\n+\/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n+\/\/\n+\/\/ \\param rhs The right-hand side sparse vector to be multiplied with the dense column.\n+\/\/ \\return Reference to the assigned column.\n+\/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n+\/\/\n+\/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n+\/\/ is thrown.\n+*\/\n+template< typename MT \/\/ Type of the dense matrix\n+ , bool SO \/\/ Storage order\n+ , bool SF > \/\/ Symmetry flag\n+template< typename VT > \/\/ Type of the right-hand side sparse vector\n+inline DenseColumn& DenseColumn::operator*=( const SparseVector& rhs )\n+{\n+ BLAZE_CONSTRAINT_MUST_BE_DENSE_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( ResultType );\n+\n+ if( size() != (~rhs).size() )\n+ throw std::invalid_argument( \"Vector sizes do not match\" );\n+\n+ const ResultType right( *this * (~rhs) );\n+\n+ if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n+ typename DerestrictTrait::Type left( derestrict( *this ) );\n+\n+ smpAssign( left, right );\n \n BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n@@ -2310,7 +2369,8 @@\n template< typename VT > inline DenseColumn& operator= ( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator+=( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator-=( const Vector& rhs );\n- template< typename VT > inline DenseColumn& operator*=( const Vector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const DenseVector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const SparseVector& rhs );\n \n template< typename Other >\n inline typename EnableIf< IsNumeric, DenseColumn >::Type&\n@@ -2380,6 +2440,15 @@\n \n template< typename MT2, bool SO2, bool SF2, typename VT >\n friend bool tryAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryAddAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool trySubAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryMultAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n \n template< typename MT2, bool SO2, bool SF2 >\n friend typename DerestrictTrait< DenseColumn >::Type\n@@ -2741,7 +2810,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !tryAddAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -2791,7 +2860,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !trySubAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -2815,20 +2884,21 @@\n \n \/\/*************************************************************************************************\n \/*! \\cond BLAZE_INTERNAL *\/\n-\/*!\\brief Multiplication assignment operator for the multiplication of a vector\n+\/*!\\brief Multiplication assignment operator for the multiplication of a dense vector\n \/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n \/\/\n-\/\/ \\param rhs The right-hand side vector to be multiplied with the dense column.\n+\/\/ \\param rhs The right-hand side dense vector to be multiplied with the dense column.\n \/\/ \\return Reference to the assigned column.\n \/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n \/\/\n \/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n \/\/ is thrown.\n *\/\n template< typename MT > \/\/ Type of the dense matrix\n-template< typename VT > \/\/ Type of the right-hand side vector\n+template< typename VT > \/\/ Type of the right-hand side dense vector\n inline DenseColumn&\n- DenseColumn::operator*=( const Vector& rhs )\n+ DenseColumn::operator*=( const DenseVector& rhs )\n {\n BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( typename VT::ResultType );\n BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( typename VT::ResultType );\n@@ -2836,15 +2906,64 @@\n if( size() != (~rhs).size() )\n throw std::invalid_argument( \"Vector sizes do not match\" );\n \n+ typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n+ Right right( ~rhs );\n+\n+ if( !tryMultAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n typename DerestrictTrait::Type left( derestrict( *this ) );\n \n- if( (~rhs).canAlias( &matrix_ ) || IsSparseVector::value ) {\n- const ResultType tmp( *this * (~rhs) );\n- smpAssign( left, tmp );\n+ if( IsReference::value && right.canAlias( &matrix_ ) ) {\n+ const typename VT::ResultType tmp( right );\n+ smpMultAssign( left, tmp );\n }\n else {\n- smpMultAssign( left, ~rhs );\n- }\n+ smpMultAssign( left, right );\n+ }\n+\n+ BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n+ BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n+\n+ return *this;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Multiplication assignment operator for the multiplication of a sparse vector\n+\/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n+\/\/\n+\/\/ \\param rhs The right-hand side sparse vector to be multiplied with the dense column.\n+\/\/ \\return Reference to the assigned column.\n+\/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n+\/\/\n+\/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n+\/\/ is thrown.\n+*\/\n+template< typename MT > \/\/ Type of the dense matrix\n+template< typename VT > \/\/ Type of the right-hand side sparse vector\n+inline DenseColumn&\n+ DenseColumn::operator*=( const SparseVector& rhs )\n+{\n+ BLAZE_CONSTRAINT_MUST_BE_DENSE_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( ResultType );\n+\n+ if( size() != (~rhs).size() )\n+ throw std::invalid_argument( \"Vector sizes do not match\" );\n+\n+ const ResultType right( *this * (~rhs) );\n+\n+ if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n+ typename DerestrictTrait::Type left( derestrict( *this ) );\n+\n+ smpAssign( left, right );\n \n BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n@@ -3514,7 +3633,8 @@\n template< typename VT > inline DenseColumn& operator= ( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator+=( const Vector& rhs );\n template< typename VT > inline DenseColumn& operator-=( const Vector& rhs );\n- template< typename VT > inline DenseColumn& operator*=( const Vector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const DenseVector& rhs );\n+ template< typename VT > inline DenseColumn& operator*=( const SparseVector& rhs );\n \n template< typename Other >\n inline typename EnableIf< IsNumeric, DenseColumn >::Type&\n@@ -3662,6 +3782,15 @@\n \n template< typename MT2, bool SO2, bool SF2, typename VT >\n friend bool tryAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryAddAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool trySubAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n+\n+ template< typename MT2, bool SO2, bool SF2, typename VT >\n+ friend bool tryMultAssign( const DenseColumn& lhs, const Vector& rhs, size_t index );\n \n template< typename MT2, bool SO2, bool SF2 >\n friend typename DerestrictTrait< DenseColumn >::Type\n@@ -4046,7 +4175,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !tryAddAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -4096,7 +4225,7 @@\n typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n Right right( ~rhs );\n \n- if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ if( !trySubAssign( matrix_, right, 0UL, col_ ) )\n throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n \n typename DerestrictTrait::Type left( derestrict( *this ) );\n@@ -4120,20 +4249,21 @@\n \n \/\/*************************************************************************************************\n \/*! \\cond BLAZE_INTERNAL *\/\n-\/*!\\brief Multiplication assignment operator for the multiplication of a vector\n+\/*!\\brief Multiplication assignment operator for the multiplication of a dense vector\n \/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n \/\/\n-\/\/ \\param rhs The right-hand side vector to be multiplied with the dense column.\n+\/\/ \\param rhs The right-hand side dense vector to be multiplied with the dense column.\n \/\/ \\return Reference to the assigned column.\n \/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n \/\/\n \/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n \/\/ is thrown.\n *\/\n template< typename MT > \/\/ Type of the dense matrix\n-template< typename VT > \/\/ Type of the right-hand side vector\n+template< typename VT > \/\/ Type of the right-hand side dense vector\n inline DenseColumn&\n- DenseColumn::operator*=( const Vector& rhs )\n+ DenseColumn::operator*=( const DenseVector& rhs )\n {\n BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( typename VT::ResultType );\n BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( typename VT::ResultType );\n@@ -4141,15 +4271,64 @@\n if( size() != (~rhs).size() )\n throw std::invalid_argument( \"Vector sizes do not match\" );\n \n+ typedef typename If< IsRestricted, typename VT::CompositeType, const VT& >::Type Right;\n+ Right right( ~rhs );\n+\n+ if( !tryMultAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n typename DerestrictTrait::Type left( derestrict( *this ) );\n \n- if( (~rhs).canAlias( &matrix_ ) || IsSparseVector::value ) {\n- const ResultType tmp( *this * (~rhs) );\n- smpAssign( left, tmp );\n+ if( IsReference::value && right.canAlias( &matrix_ ) ) {\n+ const typename VT::ResultType tmp( right );\n+ smpMultAssign( left, tmp );\n }\n else {\n- smpMultAssign( left, ~rhs );\n- }\n+ smpMultAssign( left, right );\n+ }\n+\n+ BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n+ BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n+\n+ return *this;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Multiplication assignment operator for the multiplication of a sparse vector\n+\/\/ (\\f$ \\vec{a}*=\\vec{b} \\f$).\n+\/\/\n+\/\/ \\param rhs The right-hand side sparse vector to be multiplied with the dense column.\n+\/\/ \\return Reference to the assigned column.\n+\/\/ \\exception std::invalid_argument Vector sizes do not match.\n+\/\/ \\exception std::invalid_argument Invalid assignment to restricted matrix.\n+\/\/\n+\/\/ In case the current sizes of the two vectors don't match, a \\a std::invalid_argument exception\n+\/\/ is thrown.\n+*\/\n+template< typename MT > \/\/ Type of the dense matrix\n+template< typename VT > \/\/ Type of the right-hand side sparse vector\n+inline DenseColumn&\n+ DenseColumn::operator*=( const SparseVector& rhs )\n+{\n+ BLAZE_CONSTRAINT_MUST_BE_DENSE_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_BE_COLUMN_VECTOR_TYPE ( ResultType );\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( ResultType );\n+\n+ if( size() != (~rhs).size() )\n+ throw std::invalid_argument( \"Vector sizes do not match\" );\n+\n+ const ResultType right( *this * (~rhs) );\n+\n+ if( !tryAssign( matrix_, right, 0UL, col_ ) )\n+ throw std::invalid_argument( \"Invalid assignment to restricted matrix\" );\n+\n+ typename DerestrictTrait::Type left( derestrict( *this ) );\n+\n+ smpAssign( left, right );\n \n BLAZE_INTERNAL_ASSERT( !IsLower::value || isLower( derestrict( matrix_ ) ), \"Lower violation detected\" );\n BLAZE_INTERNAL_ASSERT( !IsUpper::value || isUpper( derestrict( matrix_ ) ), \"Upper violation detected\" );\n@@ -5122,6 +5301,96 @@\n \n \/\/*************************************************************************************************\n \/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the addition assignment of a vector to a dense column.\n+\/\/ \\ingroup dense_column\n+\/\/\n+\/\/ \\param lhs The target left-hand side dense column.\n+\/\/ \\param rhs The right-hand side vector to be added.\n+\/\/ \\param index The index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the dense matrix\n+ , bool SO \/\/ Storage order\n+ , bool SF \/\/ Symmetry flag\n+ , typename VT > \/\/ Type of the right-hand side vector\n+inline bool tryAddAssign( const DenseColumn& lhs, const Vector& rhs, size_t index )\n+{\n+ BLAZE_INTERNAL_ASSERT( index <= lhs.size(), \"Invalid vector access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.size() - index, \"Invalid vector size\" );\n+\n+ return tryAddAssign( lhs.matrix_, ~rhs, index, lhs.col_ );\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the subtraction assignment of a vector to a dense column.\n+\/\/ \\ingroup dense_column\n+\/\/\n+\/\/ \\param lhs The target left-hand side dense column.\n+\/\/ \\param rhs The right-hand side vector to be subtracted.\n+\/\/ \\param index The index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the dense matrix\n+ , bool SO \/\/ Storage order\n+ , bool SF \/\/ Symmetry flag\n+ , typename VT > \/\/ Type of the right-hand side vector\n+inline bool trySubAssign( const DenseColumn& lhs, const Vector& rhs, size_t index )\n+{\n+ BLAZE_INTERNAL_ASSERT( index <= lhs.size(), \"Invalid vector access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.size() - index, \"Invalid vector size\" );\n+\n+ return trySubAssign( lhs.matrix_, ~rhs, index, lhs.col_ );\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the multiplication assignment of a vector to a dense column.\n+\/\/ \\ingroup dense_column\n+\/\/\n+\/\/ \\param lhs The target left-hand side dense column.\n+\/\/ \\param rhs The right-hand side vector to be multiplied.\n+\/\/ \\param index The index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the dense matrix\n+ , bool SO \/\/ Storage order\n+ , bool SF \/\/ Symmetry flag\n+ , typename VT > \/\/ Type of the right-hand side vector\n+inline bool tryMultAssign( const DenseColumn& lhs, const Vector& rhs, size_t index )\n+{\n+ BLAZE_INTERNAL_ASSERT( index <= lhs.size(), \"Invalid vector access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.size() - index, \"Invalid vector size\" );\n+\n+ return tryMultAssign( lhs.matrix_, ~rhs, index, lhs.col_ );\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n \/*!\\brief Removal of all restrictions on the data access to the given dense column.\n \/\/ \\ingroup dense_column\n \/\/\n"} {"commit":"c1b22c18decc0f90d80d8d6736cd48468c99fe46","subject":"net\/ice: fix flow director rule duplication check","message":"net\/ice: fix flow director rule duplication check\n\nWhen FDIR filter detects duplicated rule and then returns EEXIST, ice\nflow will capture this error and return immediately.\n\nFixes: 4e27d3ed02bd (\"net\/ice: fix flow API framework\")\n\nSigned-off-by: Yahui Cao <974a0e30dad0833a2d5c9ab21872ffa6c6306d8b@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ice\/ice_generic_flow.c\n+++ drivers\/net\/ice\/ice_generic_flow.c\n@@ -1698,6 +1698,8 @@\n \tvoid *temp;\n \n \tTAILQ_FOREACH_SAFE(parser_node, parser_list, node, temp) {\n+\t\tint ret;\n+\n \t\tif (parser_node->parser->parse_pattern_action(ad,\n \t\t\t\tparser_node->parser->array,\n \t\t\t\tparser_node->parser->array_len,\n@@ -1712,8 +1714,11 @@\n \t\t\tcontinue;\n \t\t}\n \n-\t\tif (!(engine->create(ad, flow, *meta, error)))\n+\t\tret = engine->create(ad, flow, *meta, error);\n+\t\tif (ret == 0)\n \t\t\treturn engine;\n+\t\telse if (ret == -EEXIST)\n+\t\t\treturn NULL;\n \t}\n \treturn NULL;\n }\n"} {"commit":"578da31839519361c7272ba2523dcfa540f6f0a5","subject":"lazy hack workaround","message":"lazy hack workaround\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- windrv\/dosboxpi\/win3x98\/dboxmpi.c\n+++ windrv\/dosboxpi\/win3x98\/dboxmpi.c\n@@ -129,6 +129,9 @@\n value [al]\n \n WORD MiniLibMain(void) {\n+ \/\/ PC-98 hack FIXME\n+ dosbox_id_baseio = 0xDB28U;\t\/\/ Default ports 0xDB28 - 0xDB2B\n+\n \/* we must return 1.\n * returning 0 makes Windows drop back to DOS.\n * Microsoft DDK example code always returns 1 so that failure to detect mouse\n"} {"commit":"d872e17acdcf58b3e8ca7237738bdd4725c69932","subject":"fixed minor bug in collision callback, thanks to Ertan Deniz","message":"fixed minor bug in collision callback, thanks to Ertan Deniz\n\n\ngit-svn-id: 83d585846b3bb6dc23aa7649400c5e2e04e3d09e@675 685f7672-210f-0410-90b4-fe3ad19314fe\n","repos":"vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ode\/ode\/test\/test_chain1.c\n+++ ode\/ode\/test\/test_chain1.c\n@@ -70,7 +70,7 @@\n \n b1 = dGeomGetBody(o1);\n b2 = dGeomGetBody(o2);\n- if (b2 && b2 && dAreConnected (b1,b2)) return;\n+ if (b1 && b2 && dAreConnected (b1,b2)) return;\n \n contact.surface.mode = 0;\n contact.surface.mu = 0.1;\n"} {"commit":"2b8b7e29c4e282edadfeda70e739694594efb7b5","subject":"ieee802154\/at86rf230: Fix typo unkown -> unknown","message":"ieee802154\/at86rf230: Fix typo unkown -> unknown\n\nSigned-off-by: Stefan Schmidt <30b9c4f094c892e5b20349164e275524094ed7be@samsung.com>\nAcked-by: Alexander Aring \nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ieee802154\/at86rf230.c\n+++ drivers\/net\/ieee802154\/at86rf230.c\n@@ -1474,7 +1474,7 @@\n \t\tlp->hw->phy->symbol_duration = 16;\n \t\tbreak;\n \tdefault:\n-\t\tchip = \"unkown\";\n+\t\tchip = \"unknown\";\n \t\trc = -ENOTSUPP;\n \t\tbreak;\n \t}\n"} {"commit":"a9bcc07d23bffbd4dcfad17c1fac2f749d0b3459","subject":"fix [winpr\/sspi]: export symbols on all systems","message":"fix [winpr\/sspi]: export symbols on all systems\n","repos":"ivan-83\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,ivan-83\/FreeRDP,oshogbo\/FreeRDP,akallabeth\/FreeRDP,cedrozor\/FreeRDP,oshogbo\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,mfleisz\/FreeRDP,chipitsine\/FreeRDP,cedrozor\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,cloudbase\/FreeRDP-dev,mfleisz\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,mfleisz\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,mfleisz\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,ivan-83\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,akallabeth\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,oshogbo\/FreeRDP,Devolutions\/FreeRDP,ivan-83\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,oshogbo\/FreeRDP,cloudbase\/FreeRDP-dev,DavBfr\/FreeRDP,akallabeth\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,cloudbase\/FreeRDP-dev,awakecoding\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,ivan-83\/FreeRDP,erbth\/FreeRDP,chipitsine\/FreeRDP,oshogbo\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- winpr\/libwinpr\/sspi\/sspi_export.c\n+++ winpr\/libwinpr\/sspi\/sspi_export.c\n@@ -25,12 +25,15 @@\n #define SEC_ENTRY __stdcall\n #define SSPI_EXPORT\t__declspec(dllexport)\n #else\n+#include \n #define SEC_ENTRY\n-#define SSPI_EXPORT\n+#define SSPI_EXPORT WINPR_API\n #endif\n \n+#ifdef _WIN32\n typedef long LONG;\n typedef unsigned long ULONG;\n+#endif\n typedef LONG SECURITY_STATUS;\n \n \/**\n"} {"commit":"8b902aea40544bc9e4de913b491dc3a3411fd5d0","subject":"NetXen: Bug fix for Jumbo frames on XG card","message":"NetXen: Bug fix for Jumbo frames on XG card\n\nNetXen: Set the MTU for the right port depending upon the port number\nfor XG cards.\n\nSigned-off by: Mithlesh Thukral \n\nSigned-off-by: Jeff Garzik \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_hw.c\n+++ drivers\/net\/netxen\/netxen_nic_hw.c\n@@ -822,7 +822,10 @@\n {\n \tstruct netxen_adapter *adapter = port->adapter;\n \tnew_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;\n-\tnetxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);\n+\tif (port->portnum == 0)\n+\t netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);\n+\telse if (port->portnum == 1)\n+\t netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);\n \treturn 0;\n }\n \n"} {"commit":"11d7bc9ff074dc5e37dd9ab51bb365669d08c3d6","subject":"net\/virtio: report maximum MTU in device info","message":"net\/virtio: report maximum MTU in device info\n\nFix the driver to report maximum MTU obtained from config if\nVIRTIO_NET_F_MTU is supported or calculated based on maximum\nRx packet length.\n\nFixes: ad97ceece12c (\"ethdev: add min\/max MTU to device info\")\nCc: stable@dpdk.org\n\nSigned-off-by: Ivan Ilchenko <4969abd0c74f7021df835829a1e4d724acdbdb27@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <4155e7bf8e0185127625dac6d84336299844982f@oktetlabs.ru>\nReviewed-by: Maxime Coquelin <9a2667dee3b90866bbc9c2696cff2b7d5616c95a@redhat.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/virtio\/virtio_ethdev.c\n+++ drivers\/net\/virtio\/virtio_ethdev.c\n@@ -2504,6 +2504,7 @@\n \tdev_info->min_rx_bufsize = VIRTIO_MIN_RX_BUFSIZE;\n \tdev_info->max_rx_pktlen = VIRTIO_MAX_RX_PKTLEN;\n \tdev_info->max_mac_addrs = VIRTIO_MAX_MAC_ADDRS;\n+\tdev_info->max_mtu = hw->max_mtu;\n \n \thost_features = VIRTIO_OPS(hw)->get_features(hw);\n \tdev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;\n"} {"commit":"86760088a7c51ccc263ec3b8039ec9a7400a6d70","subject":"[PATCH] libertas: more endianness fixes, in tx.c this time","message":"[PATCH] libertas: more endianness fixes, in tx.c this time\n\nNow we finally get connectivity. For a while, before something else dies...\n\nSigned-off-by: David Woodhouse <97b3379caa91f4ee97e44013ae4dc6350540fa9d@infradead.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/libertas\/tx.c\n+++ drivers\/net\/wireless\/libertas\/tx.c\n@@ -110,7 +110,7 @@\n \t\t\/* skip the radiotap header *\/\n \t\tp802x_hdr += sizeof(struct tx_radiotap_hdr);\n \t\tplocaltxpd->tx_packet_length =\n-\t\t\tcpu_to_le32(le32_to_cpu(plocaltxpd->tx_packet_length)\n+\t\t\tcpu_to_le16(le16_to_cpu(plocaltxpd->tx_packet_length)\n \t\t\t\t - sizeof(struct tx_radiotap_hdr));\n \n \t}\n@@ -130,11 +130,11 @@\n \n \tptr += sizeof(struct txpd);\n \n-\tlbs_dbg_hex(\"Tx Data\", (u8 *) p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length));\n-\tmemcpy(ptr, p802x_hdr, le32_to_cpu(plocaltxpd->tx_packet_length));\n+\tlbs_dbg_hex(\"Tx Data\", (u8 *) p802x_hdr, le16_to_cpu(plocaltxpd->tx_packet_length));\n+\tmemcpy(ptr, p802x_hdr, le16_to_cpu(plocaltxpd->tx_packet_length));\n \tret = priv->hw_host_to_card(priv, MVMS_DAT,\n \t\t\t\t priv->adapter->tmptxbuf,\n-\t\t\t\t le32_to_cpu(plocaltxpd->tx_packet_length) +\n+\t\t\t\t le16_to_cpu(plocaltxpd->tx_packet_length) +\n \t\t\t\t sizeof(struct txpd));\n \n \tif (ret) {\n"} {"commit":"4c9cfa780643dc3f609366b85fec2444a67cad64","subject":"wl12xx: add hw configuration for max supported AMDPU size","message":"wl12xx: add hw configuration for max supported AMDPU size\n\nThe wl12xx chips do the AMDPU aggregation work in the firmware, but it\nsupports a maximum of 8 frames per block. Configure the mac80211 hw\nstructure accordingly.\n\nSigned-off-by: Luciano Coelho \nTested-by: Juuso Oikarinen \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/wl12xx\/main.c\n+++ drivers\/net\/wireless\/wl12xx\/main.c\n@@ -3180,6 +3180,8 @@\n \n \twl->hw->sta_data_size = sizeof(struct wl1271_station);\n \n+\twl->hw->max_rx_aggregation_subframes = 8;\n+\n \treturn 0;\n }\n EXPORT_SYMBOL_GPL(wl1271_init_ieee80211);\n"} {"commit":"a2d5dd24af1308d35329d78e74a1a3a94a1c1344","subject":"asus-laptop: add some keys found on Lenovo SL500","message":"asus-laptop: add some keys found on Lenovo SL500\n\nSigned-off-by: Corentin Chary <4153b5fcec9d8639b77e759711dc8338f0db8708@gmail.com>\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/platform\/x86\/asus-laptop.c\n+++ drivers\/platform\/x86\/asus-laptop.c\n@@ -297,6 +297,7 @@\n \t{KE_KEY, 0x02, { KEY_SCREENLOCK } },\n \t{KE_KEY, 0x05, { KEY_WLAN } },\n \t{KE_KEY, 0x08, { KEY_F13 } },\n+\t{KE_KEY, 0x09, { KEY_PROG2 } }, \/* Dock *\/\n \t{KE_KEY, 0x17, { KEY_ZOOM } },\n \t{KE_KEY, 0x1f, { KEY_BATTERY } },\n \t\/* End of Lenovo SL Specific keycodes *\/\n@@ -322,6 +323,8 @@\n \t{KE_KEY, 0x62, { KEY_SWITCHVIDEOMODE } },\n \t{KE_KEY, 0x63, { KEY_SWITCHVIDEOMODE } },\n \t{KE_KEY, 0x6B, { KEY_F13 } }, \/* Lock Touchpad *\/\n+\t{KE_KEY, 0x6C, { KEY_SLEEP } }, \/* Suspend *\/\n+\t{KE_KEY, 0x6D, { KEY_SLEEP } }, \/* Hibernate *\/\n \t{KE_KEY, 0x7E, { KEY_BLUETOOTH } },\n \t{KE_KEY, 0x7D, { KEY_BLUETOOTH } },\n \t{KE_KEY, 0x82, { KEY_CAMERA } },\n"} {"commit":"f095303cc3138a0e637b5a631ddd014b4cd1b49e","subject":"regulator: qpnp-regulator: add support for low-noise LDO type regulators","message":"regulator: qpnp-regulator: add support for low-noise LDO type regulators\n\nAdd support for QPNP PMIC low-noise (LN) LDO type regulators.\nThis type of regulator provides very clean and constant voltage\nat low current. LN LDOs are used to power oscillators and RF\nbuffers.\n\nChange-Id: Ibda540899b93bbb750f554e728d118b635bdbc0f\nSigned-off-by: David Collins <0dc5b64a0a004c3a10b37a64ec99148749baaf8b@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/regulator\/qpnp-regulator.c\n+++ drivers\/regulator\/qpnp-regulator.c\n@@ -57,6 +57,7 @@\n \tQPNP_REGULATOR_LOGICAL_TYPE_BOOST,\n \tQPNP_REGULATOR_LOGICAL_TYPE_FTSMPS,\n \tQPNP_REGULATOR_LOGICAL_TYPE_BOOST_BYP,\n+\tQPNP_REGULATOR_LOGICAL_TYPE_LN_LDO,\n };\n \n enum qpnp_regulator_type {\n@@ -83,6 +84,7 @@\n \tQPNP_REGULATOR_SUBTYPE_P300\t\t= 0x0A,\n \tQPNP_REGULATOR_SUBTYPE_P600\t\t= 0x0B,\n \tQPNP_REGULATOR_SUBTYPE_P1200\t\t= 0x0C,\n+\tQPNP_REGULATOR_SUBTYPE_LN\t\t= 0x10,\n \tQPNP_REGULATOR_SUBTYPE_LV_P50\t\t= 0x28,\n \tQPNP_REGULATOR_SUBTYPE_LV_P150\t\t= 0x29,\n \tQPNP_REGULATOR_SUBTYPE_LV_P300\t\t= 0x2A,\n@@ -326,6 +328,11 @@\n \tVOLTAGE_RANGE(2, 750000, 0, 0, 1537500, 12500),\n };\n \n+static struct qpnp_voltage_range ln_ldo_ranges[] = {\n+\tVOLTAGE_RANGE(1, 690000, 690000, 1110000, 1110000, 60000),\n+\tVOLTAGE_RANGE(0, 1380000, 1380000, 2220000, 2220000, 120000),\n+};\n+\n static struct qpnp_voltage_range smps_ranges[] = {\n \tVOLTAGE_RANGE(0, 375000, 375000, 1562500, 1562500, 12500),\n \tVOLTAGE_RANGE(1, 1550000, 1575000, 3125000, 3125000, 25000),\n@@ -351,6 +358,8 @@\n \t\t\t\t\t= SET_POINTS(nldo2_ranges);\n static struct qpnp_voltage_set_points nldo3_set_points\n \t\t\t\t\t= SET_POINTS(nldo3_ranges);\n+static struct qpnp_voltage_set_points ln_ldo_set_points\n+\t\t\t\t\t= SET_POINTS(ln_ldo_ranges);\n static struct qpnp_voltage_set_points smps_set_points = SET_POINTS(smps_ranges);\n static struct qpnp_voltage_set_points ftsmps_set_points\n \t\t\t\t\t= SET_POINTS(ftsmps_ranges);\n@@ -365,6 +374,7 @@\n \t&nldo1_set_points,\n \t&nldo2_set_points,\n \t&nldo3_set_points,\n+\t&ln_ldo_set_points,\n \t&smps_set_points,\n \t&ftsmps_set_points,\n \t&boost_set_points,\n@@ -1024,6 +1034,7 @@\n \n \tif (type == QPNP_REGULATOR_LOGICAL_TYPE_SMPS\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_LN_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_FTSMPS)\n \t\tuV = qpnp_regulator_common_get_voltage(rdev);\n \n@@ -1096,6 +1107,15 @@\n \t\t\taction_label, vreg->rdesc.name, enable_label, uV,\n \t\t\tmode_label, pc_enable_label, pc_mode_label);\n \t\tbreak;\n+\tcase QPNP_REGULATOR_LOGICAL_TYPE_LN_LDO:\n+\t\tmode_reg = vreg->ctrl_reg[QPNP_COMMON_IDX_MODE];\n+\t\tpc_mode_label[0] =\n+\t\t mode_reg & QPNP_COMMON_MODE_BYPASS_MASK ? 'B' : '_';\n+\n+\t\tpr_info(\"%s %-11s: %s, v=%7d uV, alt_mode=%s\\n\",\n+\t\t\taction_label, vreg->rdesc.name, enable_label, uV,\n+\t\t\tpc_mode_label);\n+\t\tbreak;\n \tcase QPNP_REGULATOR_LOGICAL_TYPE_VS:\n \t\tmode_reg = vreg->ctrl_reg[QPNP_COMMON_IDX_MODE];\n \t\tpc_mode_label[0] =\n@@ -1152,6 +1172,16 @@\n \t.set_mode\t\t= qpnp_regulator_common_set_mode,\n \t.get_mode\t\t= qpnp_regulator_common_get_mode,\n \t.get_optimum_mode\t= qpnp_regulator_common_get_optimum_mode,\n+\t.enable_time\t\t= qpnp_regulator_common_enable_time,\n+};\n+\n+static struct regulator_ops qpnp_ln_ldo_ops = {\n+\t.enable\t\t\t= qpnp_regulator_common_enable,\n+\t.disable\t\t= qpnp_regulator_common_disable,\n+\t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n+\t.set_voltage\t\t= qpnp_regulator_common_set_voltage,\n+\t.get_voltage\t\t= qpnp_regulator_common_get_voltage,\n+\t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n \t.enable_time\t\t= qpnp_regulator_common_enable_time,\n };\n \n@@ -1205,6 +1235,7 @@\n \tQPNP_VREG_MAP(LDO, P300, 0, INF, LDO, ldo, pldo, 10000),\n \tQPNP_VREG_MAP(LDO, P600, 0, INF, LDO, ldo, pldo, 10000),\n \tQPNP_VREG_MAP(LDO, P1200, 0, INF, LDO, ldo, pldo, 10000),\n+\tQPNP_VREG_MAP(LDO, LN, 0, INF, LN_LDO, ln_ldo, ln_ldo, 0),\n \tQPNP_VREG_MAP(LDO, LV_P50, 0, INF, LDO, ldo, pldo, 5000),\n \tQPNP_VREG_MAP(LDO, LV_P150, 0, INF, LDO, ldo, pldo, 10000),\n \tQPNP_VREG_MAP(LDO, LV_P300, 0, INF, LDO, ldo, pldo, 10000),\n@@ -1346,8 +1377,9 @@\n \t\t pdata->pin_ctrl_hpm & QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK;\n \t}\n \n-\tif (type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n-\t && pdata->bypass_mode_enable != QPNP_REGULATOR_USE_HW_DEFAULT) {\n+\tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_LN_LDO)\n+\t && pdata->bypass_mode_enable != QPNP_REGULATOR_USE_HW_DEFAULT) {\n \t\tctrl_reg[QPNP_COMMON_IDX_MODE] &=\n \t\t\t~QPNP_COMMON_MODE_BYPASS_MASK;\n \t\tctrl_reg[QPNP_COMMON_IDX_MODE] |=\n"} {"commit":"a4c04135730bcfd8445b8b6ac3f2d5490facbd5b","subject":"regulator: qpnp-regulator: Add support for ULT LDO and SMPS regulators","message":"regulator: qpnp-regulator: Add support for ULT LDO and SMPS regulators\n\nAdd support for QPNP PMIC ULT LDO and SMPS regulators.\nULT LDO\/SMPS are regulators designed for PMIC chips with minimal\nset of features to achieve better area efficiency.\n\nChange-Id: I52ef77d5c60713c9bd2dfc5e3cde5f4df44ebacd\nSigned-off-by: Ashay Jaiswal <221b44264b34c4c2680fd1c85801ea1a2d0a4da6@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/regulator\/qpnp-regulator.c\n+++ drivers\/regulator\/qpnp-regulator.c\n@@ -58,6 +58,9 @@\n \tQPNP_REGULATOR_LOGICAL_TYPE_FTSMPS,\n \tQPNP_REGULATOR_LOGICAL_TYPE_BOOST_BYP,\n \tQPNP_REGULATOR_LOGICAL_TYPE_LN_LDO,\n+\tQPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS,\n+\tQPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS,\n+\tQPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO,\n };\n \n enum qpnp_regulator_type {\n@@ -67,6 +70,8 @@\n \tQPNP_REGULATOR_TYPE_BOOST\t\t= 0x1B,\n \tQPNP_REGULATOR_TYPE_FTS\t\t\t= 0x1C,\n \tQPNP_REGULATOR_TYPE_BOOST_BYP\t\t= 0x1F,\n+\tQPNP_REGULATOR_TYPE_ULT_LDO\t\t= 0x21,\n+\tQPNP_REGULATOR_TYPE_ULT_BUCK\t\t= 0x22,\n };\n \n enum qpnp_regulator_subtype {\n@@ -79,6 +84,7 @@\n \tQPNP_REGULATOR_SUBTYPE_N1200\t\t= 0x05,\n \tQPNP_REGULATOR_SUBTYPE_N600_ST\t\t= 0x06,\n \tQPNP_REGULATOR_SUBTYPE_N1200_ST\t\t= 0x07,\n+\tQPNP_REGULATOR_SUBTYPE_N300_ST\t\t= 0x15,\n \tQPNP_REGULATOR_SUBTYPE_P50\t\t= 0x08,\n \tQPNP_REGULATOR_SUBTYPE_P150\t\t= 0x09,\n \tQPNP_REGULATOR_SUBTYPE_P300\t\t= 0x0A,\n@@ -99,6 +105,10 @@\n \tQPNP_REGULATOR_SUBTYPE_5V_BOOST\t\t= 0x01,\n \tQPNP_REGULATOR_SUBTYPE_FTS_CTL\t\t= 0x08,\n \tQPNP_REGULATOR_SUBTYPE_BB_2A\t\t= 0x01,\n+\tQPNP_REGULATOR_SUBTYPE_ULT_HF_CTL1\t= 0x0D,\n+\tQPNP_REGULATOR_SUBTYPE_ULT_HF_CTL2\t= 0x0E,\n+\tQPNP_REGULATOR_SUBTYPE_ULT_HF_CTL3\t= 0x0F,\n+\tQPNP_REGULATOR_SUBTYPE_ULT_HF_CTL4\t= 0x10,\n };\n \n enum qpnp_common_regulator_registers {\n@@ -190,6 +200,9 @@\n * framework treats a 0 uV voltage as an error.\n *\/\n #define VOLTAGE_UNKNOWN 1\n+\n+\/* VSET value to decide the range of ULT SMPS *\/\n+#define ULT_SMPS_RANGE_SPLIT 0x60\n \n \/**\n * struct qpnp_voltage_range - regulator set point voltage mapping description\n@@ -351,6 +364,23 @@\n \tVOLTAGE_RANGE(0, 2500000, 2500000, 5200000, 5650000, 50000),\n };\n \n+static struct qpnp_voltage_range ult_lo_smps_ranges[] = {\n+\tVOLTAGE_RANGE(0, 375000, 375000, 1562500, 1562500, 12500),\n+\tVOLTAGE_RANGE(1, 750000, 0, 0, 1525000, 25000),\n+};\n+\n+static struct qpnp_voltage_range ult_ho_smps_ranges[] = {\n+\tVOLTAGE_RANGE(0, 1550000, 1550000, 2325000, 2325000, 25000),\n+};\n+\n+static struct qpnp_voltage_range ult_nldo_ranges[] = {\n+\tVOLTAGE_RANGE(0, 375000, 375000, 1537500, 1537500, 12500),\n+};\n+\n+static struct qpnp_voltage_range ult_pldo_ranges[] = {\n+\tVOLTAGE_RANGE(0, 1750000, 1750000, 3337500, 3337500, 12500),\n+};\n+\n static struct qpnp_voltage_set_points pldo_set_points = SET_POINTS(pldo_ranges);\n static struct qpnp_voltage_set_points nldo1_set_points\n \t\t\t\t\t= SET_POINTS(nldo1_ranges);\n@@ -367,6 +397,14 @@\n \t\t\t\t\t= SET_POINTS(boost_ranges);\n static struct qpnp_voltage_set_points boost_byp_set_points\n \t\t\t\t\t= SET_POINTS(boost_byp_ranges);\n+static struct qpnp_voltage_set_points ult_lo_smps_set_points\n+\t\t\t\t\t= SET_POINTS(ult_lo_smps_ranges);\n+static struct qpnp_voltage_set_points ult_ho_smps_set_points\n+\t\t\t\t\t= SET_POINTS(ult_ho_smps_ranges);\n+static struct qpnp_voltage_set_points ult_nldo_set_points\n+\t\t\t\t\t= SET_POINTS(ult_nldo_ranges);\n+static struct qpnp_voltage_set_points ult_pldo_set_points\n+\t\t\t\t\t= SET_POINTS(ult_pldo_ranges);\n static struct qpnp_voltage_set_points none_set_points;\n \n static struct qpnp_voltage_set_points *all_set_points[] = {\n@@ -379,6 +417,10 @@\n \t&ftsmps_set_points,\n \t&boost_set_points,\n \t&boost_byp_set_points,\n+\t&ult_lo_smps_set_points,\n+\t&ult_ho_smps_set_points,\n+\t&ult_nldo_set_points,\n+\t&ult_pldo_set_points,\n };\n \n \/* Determines which label to add to a debug print statement. *\/\n@@ -794,7 +836,7 @@\n \treturn range->step_uV * voltage_sel + range->min_uV;\n }\n \n-static int qpnp_regulator_boost_set_voltage(struct regulator_dev *rdev,\n+static int qpnp_regulator_single_range_set_voltage(struct regulator_dev *rdev,\n \t\tint min_uV, int max_uV, unsigned *selector)\n {\n \tstruct qpnp_regulator *vreg = rdev_get_drvdata(rdev);\n@@ -808,8 +850,8 @@\n \t}\n \n \t\/*\n-\t * Boost type regulators do not have range select register so only\n-\t * voltage set register needs to be written.\n+\t * Certain types of regulators do not have a range select register so\n+\t * only voltage set register needs to be written.\n \t *\/\n \trc = qpnp_vreg_masked_write(vreg, QPNP_COMMON_REG_VOLTAGE_SET,\n \t voltage_sel, 0xFF, &vreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_SET]);\n@@ -822,11 +864,81 @@\n \treturn rc;\n }\n \n-static int qpnp_regulator_boost_get_voltage(struct regulator_dev *rdev)\n+static int qpnp_regulator_single_range_get_voltage(struct regulator_dev *rdev)\n {\n \tstruct qpnp_regulator *vreg = rdev_get_drvdata(rdev);\n \tstruct qpnp_voltage_range *range = &vreg->set_points->range[0];\n \tint voltage_sel = vreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_SET];\n+\n+\treturn range->step_uV * voltage_sel + range->min_uV;\n+}\n+\n+static int qpnp_regulator_ult_lo_smps_set_voltage(struct regulator_dev *rdev,\n+\t\tint min_uV, int max_uV, unsigned *selector)\n+{\n+\tstruct qpnp_regulator *vreg = rdev_get_drvdata(rdev);\n+\tint rc, range_sel, voltage_sel;\n+\n+\t\/*\n+\t * Favor staying in the current voltage range if possible. This avoids\n+\t * voltage spikes that occur when changing the voltage range.\n+\t *\/\n+\trc = qpnp_regulator_select_voltage_same_range(vreg, min_uV, max_uV,\n+\t\t&range_sel, &voltage_sel, selector);\n+\tif (rc == 0)\n+\t\trc = qpnp_regulator_select_voltage(vreg, min_uV, max_uV,\n+\t\t\t&range_sel, &voltage_sel, selector);\n+\tif (rc < 0) {\n+\t\tvreg_err(vreg, \"could not set voltage, rc=%d\\n\", rc);\n+\t\treturn rc;\n+\t}\n+\n+\t\/*\n+\t * Calculate VSET based on range\n+\t * In case of range 0: voltage_sel is a 7 bit value, can be written\n+\t *\t\t\twitout any modification.\n+\t * In case of range 1: voltage_sel is a 5 bit value, bits[7-5] set to\n+\t *\t\t\t[011].\n+\t *\/\n+\tif (range_sel == 1)\n+\t\tvoltage_sel |= ULT_SMPS_RANGE_SPLIT;\n+\n+\trc = qpnp_vreg_masked_write(vreg, QPNP_COMMON_REG_VOLTAGE_SET,\n+\t voltage_sel, 0xFF, &vreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_SET]);\n+\tif (rc) {\n+\t\tvreg_err(vreg, \"SPMI write failed, rc=%d\\n\", rc);\n+\t} else {\n+\t\tvreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_RANGE] = range_sel;\n+\t\tqpnp_vreg_show_state(rdev, QPNP_REGULATOR_ACTION_VOLTAGE);\n+\t}\n+\n+\treturn rc;\n+}\n+\n+static int qpnp_regulator_ult_lo_smps_get_voltage(struct regulator_dev *rdev)\n+{\n+\tstruct qpnp_regulator *vreg = rdev_get_drvdata(rdev);\n+\tstruct qpnp_voltage_range *range = NULL;\n+\tint range_sel, voltage_sel, i;\n+\n+\trange_sel = vreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_RANGE];\n+\tvoltage_sel = vreg->ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_SET];\n+\n+\tfor (i = 0; i < vreg->set_points->count; i++) {\n+\t\tif (vreg->set_points->range[i].range_sel == range_sel) {\n+\t\t\trange = &vreg->set_points->range[i];\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (!range) {\n+\t\tvreg_err(vreg, \"voltage unknown, range %d is invalid\\n\",\n+\t\t\trange_sel);\n+\t\treturn VOLTAGE_UNKNOWN;\n+\t}\n+\n+\tif (range_sel == 1)\n+\t\tvoltage_sel &= ~ULT_SMPS_RANGE_SPLIT;\n \n \treturn range->step_uV * voltage_sel + range->min_uV;\n }\n@@ -1039,12 +1151,20 @@\n \t\tuV = qpnp_regulator_common_get_voltage(rdev);\n \n \tif (type == QPNP_REGULATOR_LOGICAL_TYPE_BOOST\n-\t || type == QPNP_REGULATOR_LOGICAL_TYPE_BOOST_BYP)\n-\t\tuV = qpnp_regulator_boost_get_voltage(rdev);\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_BOOST_BYP\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO)\n+\t\tuV = qpnp_regulator_single_range_get_voltage(rdev);\n+\n+\tif (type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS)\n+\t\tuV = qpnp_regulator_ult_lo_smps_get_voltage(rdev);\n \n \tif (type == QPNP_REGULATOR_LOGICAL_TYPE_SMPS\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_FTSMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_VS) {\n \t\tmode = qpnp_regulator_common_get_mode(rdev);\n \t\tmode_label = mode == REGULATOR_MODE_NORMAL ? \"HPM\" : \"LPM\";\n@@ -1144,6 +1264,25 @@\n \t\t\taction_label, vreg->rdesc.name, enable_label, uV,\n \t\t\tmode_label, pc_mode_label);\n \t\tbreak;\n+\tcase QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS:\n+\tcase QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS:\n+\t\tmode_reg = vreg->ctrl_reg[QPNP_COMMON_IDX_MODE];\n+\t\tpc_mode_label[0] =\n+\t\t mode_reg & QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK ? 'W' : '_';\n+\t\tpr_info(\"%s %-11s: %s, v=%7d uV, mode=%s, alt_mode=%s\\n\",\n+\t\t\taction_label, vreg->rdesc.name, enable_label, uV,\n+\t\t\tmode_label, pc_mode_label);\n+\t\tbreak;\n+\tcase QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO:\n+\t\tmode_reg = vreg->ctrl_reg[QPNP_COMMON_IDX_MODE];\n+\t\tpc_mode_label[0] =\n+\t\t mode_reg & QPNP_COMMON_MODE_BYPASS_MASK ? 'B' : '_';\n+\t\tpc_mode_label[1] =\n+\t\t mode_reg & QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK ? 'W' : '_';\n+\t\tpr_info(\"%s %-11s: %s, v=%7d uV, mode=%s, alt_mode=%s\\n\",\n+\t\t\taction_label, vreg->rdesc.name, enable_label, uV,\n+\t\t\tmode_label, pc_mode_label);\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n@@ -1196,8 +1335,8 @@\n \t.enable\t\t\t= qpnp_regulator_common_enable,\n \t.disable\t\t= qpnp_regulator_common_disable,\n \t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n-\t.set_voltage\t\t= qpnp_regulator_boost_set_voltage,\n-\t.get_voltage\t\t= qpnp_regulator_boost_get_voltage,\n+\t.set_voltage\t\t= qpnp_regulator_single_range_set_voltage,\n+\t.get_voltage\t\t= qpnp_regulator_single_range_get_voltage,\n \t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n \t.enable_time\t\t= qpnp_regulator_common_enable_time,\n };\n@@ -1208,6 +1347,45 @@\n \t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n \t.set_voltage\t\t= qpnp_regulator_common_set_voltage,\n \t.get_voltage\t\t= qpnp_regulator_common_get_voltage,\n+\t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n+\t.set_mode\t\t= qpnp_regulator_common_set_mode,\n+\t.get_mode\t\t= qpnp_regulator_common_get_mode,\n+\t.get_optimum_mode\t= qpnp_regulator_common_get_optimum_mode,\n+\t.enable_time\t\t= qpnp_regulator_common_enable_time,\n+};\n+\n+static struct regulator_ops qpnp_ult_lo_smps_ops = {\n+\t.enable\t\t\t= qpnp_regulator_common_enable,\n+\t.disable\t\t= qpnp_regulator_common_disable,\n+\t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n+\t.set_voltage\t\t= qpnp_regulator_ult_lo_smps_set_voltage,\n+\t.get_voltage\t\t= qpnp_regulator_ult_lo_smps_get_voltage,\n+\t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n+\t.set_mode\t\t= qpnp_regulator_common_set_mode,\n+\t.get_mode\t\t= qpnp_regulator_common_get_mode,\n+\t.get_optimum_mode\t= qpnp_regulator_common_get_optimum_mode,\n+\t.enable_time\t\t= qpnp_regulator_common_enable_time,\n+};\n+\n+static struct regulator_ops qpnp_ult_ho_smps_ops = {\n+\t.enable\t\t\t= qpnp_regulator_common_enable,\n+\t.disable\t\t= qpnp_regulator_common_disable,\n+\t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n+\t.set_voltage\t\t= qpnp_regulator_single_range_set_voltage,\n+\t.get_voltage\t\t= qpnp_regulator_single_range_get_voltage,\n+\t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n+\t.set_mode\t\t= qpnp_regulator_common_set_mode,\n+\t.get_mode\t\t= qpnp_regulator_common_get_mode,\n+\t.get_optimum_mode\t= qpnp_regulator_common_get_optimum_mode,\n+\t.enable_time\t\t= qpnp_regulator_common_enable_time,\n+};\n+\n+static struct regulator_ops qpnp_ult_ldo_ops = {\n+\t.enable\t\t\t= qpnp_regulator_common_enable,\n+\t.disable\t\t= qpnp_regulator_common_disable,\n+\t.is_enabled\t\t= qpnp_regulator_common_is_enabled,\n+\t.set_voltage\t\t= qpnp_regulator_single_range_set_voltage,\n+\t.get_voltage\t\t= qpnp_regulator_single_range_get_voltage,\n \t.list_voltage\t\t= qpnp_regulator_common_list_voltage,\n \t.set_mode\t\t= qpnp_regulator_common_set_mode,\n \t.get_mode\t\t= qpnp_regulator_common_get_mode,\n@@ -1250,6 +1428,30 @@\n \tQPNP_VREG_MAP(BOOST, 5V_BOOST, 0, INF, BOOST, boost, boost, 0),\n \tQPNP_VREG_MAP(FTS, FTS_CTL, 0, INF, FTSMPS, ftsmps, ftsmps, 100000),\n \tQPNP_VREG_MAP(BOOST_BYP, BB_2A, 0, INF, BOOST_BYP, boost, boost_byp, 0),\n+\tQPNP_VREG_MAP(ULT_BUCK, ULT_HF_CTL1, 0, INF, ULT_LO_SMPS, ult_lo_smps,\n+\t\t\t\t\t\t\tult_lo_smps, 100000),\n+\tQPNP_VREG_MAP(ULT_BUCK, ULT_HF_CTL2, 0, INF, ULT_LO_SMPS, ult_lo_smps,\n+\t\t\t\t\t\t\tult_lo_smps, 100000),\n+\tQPNP_VREG_MAP(ULT_BUCK, ULT_HF_CTL3, 0, INF, ULT_LO_SMPS, ult_lo_smps,\n+\t\t\t\t\t\t\tult_lo_smps, 100000),\n+\tQPNP_VREG_MAP(ULT_BUCK, ULT_HF_CTL4, 0, INF, ULT_HO_SMPS, ult_ho_smps,\n+\t\t\t\t\t\t\tult_ho_smps, 100000),\n+\tQPNP_VREG_MAP(ULT_LDO, N300_ST, 0, INF, ULT_LDO, ult_ldo, ult_nldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, N600_ST, 0, INF, ULT_LDO, ult_ldo, ult_nldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, N1200_ST, 0, INF, ULT_LDO, ult_ldo, ult_nldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, LV_P150, 0, INF, ULT_LDO, ult_ldo, ult_pldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, LV_P300, 0, INF, ULT_LDO, ult_ldo, ult_pldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, P600, 0, INF, ULT_LDO, ult_ldo, ult_pldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, P150, 0, INF, ULT_LDO, ult_ldo, ult_pldo,\n+\t\t\t\t\t\t\t\t\t10000),\n+\tQPNP_VREG_MAP(ULT_LDO, P50, 0, INF, ULT_LDO, ult_ldo, ult_pldo,\n+\t\t\t\t\t\t\t\t\t 5000),\n };\n \n static int qpnp_regulator_match(struct qpnp_regulator *vreg)\n@@ -1337,6 +1539,9 @@\n \n \t\/* Set up HPM control. *\/\n \tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_VS\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_FTSMPS)\n@@ -1377,8 +1582,20 @@\n \t\t pdata->pin_ctrl_hpm & QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK;\n \t}\n \n+\tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS\n+\t\t|| type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS\n+\t\t|| type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO)\n+\t\t&& !(pdata->pin_ctrl_hpm\n+\t\t\t& QPNP_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {\n+\t\tctrl_reg[QPNP_COMMON_IDX_MODE] &=\n+\t\t\t~QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK;\n+\t\tctrl_reg[QPNP_COMMON_IDX_MODE] |=\n+\t\t pdata->pin_ctrl_hpm & QPNP_COMMON_MODE_FOLLOW_AWAKE_MASK;\n+\t}\n+\n \tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n-\t || type == QPNP_REGULATOR_LOGICAL_TYPE_LN_LDO)\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_LN_LDO\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO)\n \t && pdata->bypass_mode_enable != QPNP_REGULATOR_USE_HW_DEFAULT) {\n \t\tctrl_reg[QPNP_COMMON_IDX_MODE] &=\n \t\t\t~QPNP_COMMON_MODE_BYPASS_MASK;\n@@ -1413,8 +1630,18 @@\n \t\treturn rc;\n \t}\n \n+\t\/* Setup initial range for ULT_LO_SMPS *\/\n+\tif (type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS) {\n+\t\tctrl_reg[QPNP_COMMON_IDX_VOLTAGE_RANGE] =\n+\t\t\t(ctrl_reg[QPNP_COMMON_IDX_VOLTAGE_SET]\n+\t\t\t < ULT_SMPS_RANGE_SPLIT) ? 0 : 1;\n+\t}\n+\n \t\/* Set pull down. *\/\n \tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n \t || type == QPNP_REGULATOR_LOGICAL_TYPE_VS)\n \t && pdata->pull_down_enable != QPNP_REGULATOR_USE_HW_DEFAULT) {\n@@ -1442,7 +1669,8 @@\n \t}\n \n \t\/* Set soft start for LDO. *\/\n-\tif (type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n+\tif ((type == QPNP_REGULATOR_LOGICAL_TYPE_LDO\n+\t || type == QPNP_REGULATOR_LOGICAL_TYPE_ULT_LDO)\n \t && pdata->soft_start_enable != QPNP_REGULATOR_USE_HW_DEFAULT) {\n \t\treg = pdata->soft_start_enable\n \t\t\t? QPNP_LDO_SOFT_START_ENABLE_MASK : 0;\n"} {"commit":"d297a5d576d549d97dce456ba4bd01e5a47e899c","subject":"aic94xx_sds: rename FLASH_SIZE","message":"aic94xx_sds: rename FLASH_SIZE\n\narm:\n\ndrivers\/scsi\/aic94xx\/aic94xx_sds.c:381:1: warning: \"FLASH_SIZE\" redefined\nIn file included from include\/asm\/arch\/irqs.h:22,\n from include\/asm\/irq.h:4,\n from include\/asm\/hardirq.h:6,\n from include\/linux\/hardirq.h:7,\n from include\/asm-generic\/local.h:5,\n from include\/asm\/local.h:1,\n from include\/linux\/module.h:19,\n from include\/linux\/device.h:21,\n from include\/linux\/pci.h:52,\n from drivers\/scsi\/aic94xx\/aic94xx_sds.c:28:\ninclude\/asm\/arch\/platform.h:444:1: warning: this is the location of the previous definition\n\nCc: Gilbert Wu <28de591b5e667beeaf88e29d89a3fb148bc5cf75@adaptec.com>\nCc: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@HansenPartnership.com>\nCc: Russell King \nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/aic94xx\/aic94xx_sds.c\n+++ drivers\/scsi\/aic94xx\/aic94xx_sds.c\n@@ -377,7 +377,7 @@\n \n #define FLASH_RESET\t\t\t0xF0\n \n-#define FLASH_SIZE 0x200000\n+#define ASD_FLASH_SIZE 0x200000\n #define FLASH_DIR_COOKIE \"*** ADAPTEC FLASH DIRECTORY *** \"\n #define FLASH_NEXT_ENTRY_OFFS\t\t0x2000\n #define FLASH_MAX_DIR_ENTRIES\t\t32\n@@ -609,7 +609,7 @@\n \t\t\t struct asd_flash_dir *flash_dir)\n {\n \tu32 v;\n-\tfor (v = 0; v < FLASH_SIZE; v += FLASH_NEXT_ENTRY_OFFS) {\n+\tfor (v = 0; v < ASD_FLASH_SIZE; v += FLASH_NEXT_ENTRY_OFFS) {\n \t\tasd_read_flash_seg(asd_ha, flash_dir, v,\n \t\t\t\t sizeof(FLASH_DIR_COOKIE)-1);\n \t\tif (memcmp(flash_dir->cookie, FLASH_DIR_COOKIE,\n"} {"commit":"418a8cfe69c3b6bd4598e9870b9f412e2c247214","subject":"fcoe: fix the link error status block sparse warnings","message":"fcoe: fix the link error status block sparse warnings\n\nBoth fcoe_fc_els_lesb and fc_els_lesb are in __be32 already, and both are\nexactly the same size in bytes, with somewhat different member names to\nreflect the fact the former is for Ethernet media the latter is for Fiber\nChannel, so, remove conversion and use __be32 directly. This fixes the warning\nfrom sparse check.\n\nSigned-off-by: Yi Zou <5b3a821cf7a153d601945bbe257e1150110342e4@intel.com>\nReported-by: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nTested-by: Jack Morgan \nSigned-off-by: Robert Love \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/fcoe\/fcoe_transport.c\n+++ drivers\/scsi\/fcoe\/fcoe_transport.c\n@@ -180,24 +180,10 @@\n {\n \tstruct fcoe_ctlr *fip = fcoe_ctlr_device_priv(ctlr_dev);\n \tstruct net_device *netdev = fcoe_get_netdev(fip->lp);\n-\tstruct fcoe_fc_els_lesb *fcoe_lesb;\n-\tstruct fc_els_lesb fc_lesb;\n-\n-\t__fcoe_get_lesb(fip->lp, &fc_lesb, netdev);\n-\tfcoe_lesb = (struct fcoe_fc_els_lesb *)(&fc_lesb);\n-\n-\tctlr_dev->lesb.lesb_link_fail =\n-\t\tntohl(fcoe_lesb->lesb_link_fail);\n-\tctlr_dev->lesb.lesb_vlink_fail =\n-\t\tntohl(fcoe_lesb->lesb_vlink_fail);\n-\tctlr_dev->lesb.lesb_miss_fka =\n-\t\tntohl(fcoe_lesb->lesb_miss_fka);\n-\tctlr_dev->lesb.lesb_symb_err =\n-\t\tntohl(fcoe_lesb->lesb_symb_err);\n-\tctlr_dev->lesb.lesb_err_block =\n-\t\tntohl(fcoe_lesb->lesb_err_block);\n-\tctlr_dev->lesb.lesb_fcs_error =\n-\t\tntohl(fcoe_lesb->lesb_fcs_error);\n+\tstruct fc_els_lesb *fc_lesb;\n+\n+\tfc_lesb = (struct fc_els_lesb *)(&ctlr_dev->lesb);\n+\t__fcoe_get_lesb(fip->lp, fc_lesb, netdev);\n }\n EXPORT_SYMBOL_GPL(fcoe_ctlr_get_lesb);\n \n"} {"commit":"198439e4afec431d2fa2cab9a4dcca87e5adc7a5","subject":"[SCSI] libsas: do not set res = 0 in sas_ex_discover_dev()","message":"[SCSI] libsas: do not set res = 0 in sas_ex_discover_dev()\n\nWe should not set res to 0 in function sas_ex_discover_dev in order to let\nit discover it further when wide port hotplug in .\n\nSigned-off-by: Tom Peng <1a121421c93b2186bfca421b41fa561370164038@usish.com>\nSigned-off-by: Jack Wang \nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/libsas\/sas_expander.c\n+++ drivers\/scsi\/libsas\/sas_expander.c\n@@ -960,7 +960,6 @@\n \n \t\t\t}\n \t\t}\n-\t\tres = 0;\n \t}\n \n \treturn res;\n"} {"commit":"7e7bc1d998d5b80c34375c19b8f14aa86cf03876","subject":"corrected header file names","message":"corrected header file names\n","repos":"iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal,iakov\/qreal","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/robots\/common\/kitBase\/include\/kitBase\/robotModel\/robotParts\/accelerometerSensor.h\n+++ plugins\/robots\/common\/kitBase\/include\/kitBase\/robotModel\/robotParts\/accelerometerSensor.h\n@@ -14,7 +14,7 @@\n \n #pragma once\n \n-#include \"VectorSensor.h\"\n+#include \"vectorSensor.h\"\n #include \"kitBase\/kitBaseDeclSpec.h\"\n \n namespace kitBase {\n"} {"commit":"7ab70cd39b167833117625194bfb5606cb77c686","subject":"Converting progress report to C: t+","message":"Converting progress report to C: t+\n","repos":"jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/kollos,pczarn\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos,jeffreykegler\/kollos,jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/libmarpa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- r2\/libmarpa\/dev\/marpa.w\n+++ r2\/libmarpa\/dev\/marpa.w\n@@ -9727,34 +9727,17 @@\n }\n \n @*0 Leo or-nodes.\n-@ = {\n- SRCL source_link = NULL;\n- EIM cause_earley_item = NULL;\n- LIM leo_predecessor = NULL;\n- switch (Source_Type_of_EIM(work_earley_item))\n- {\n- case SOURCE_IS_LEO:\n- leo_predecessor = Predecessor_of_EIM (work_earley_item);\n- cause_earley_item = Cause_of_EIM (work_earley_item);\n- break;\n- case SOURCE_IS_AMBIGUOUS:\n- source_link = LV_First_Leo_SRCL_of_EIM (work_earley_item);\n- if (source_link)\n-\t{\n-\t leo_predecessor = Predecessor_of_SRCL (source_link);\n-\t cause_earley_item = Cause_of_SRCL (source_link);\n-\t source_link = Next_SRCL_of_SRCL (source_link);\n-\t}\n- break;\n- }\n- if (leo_predecessor) {\n-\tfor (;;) { \/* for each Leo source link *\/\n-\t @@;\n-\t if (!source_link) break;\n-\t leo_predecessor = Predecessor_of_SRCL (source_link);\n-\t cause_earley_item = Cause_of_SRCL (source_link);\n-\t source_link = Next_SRCL_of_SRCL (source_link);\n-\t}\n+@ =\n+{\n+ SRCL source_link;\n+ for (source_link = First_Leo_SRCL_of_EIM (work_earley_item);\n+ source_link; source_link = Next_SRCL_of_SRCL (source_link))\n+ {\n+ EIM cause_earley_item = Cause_of_SRCL (source_link);\n+ LIM leo_predecessor = Predecessor_of_SRCL (source_link);\n+ if (leo_predecessor) {\n+\t@@;\n+ }\n }\n }\n \n"} {"commit":"6a539d911b47cac1ebaf793a956f2e593f6b9737","subject":"Clean up a bit freetype.","message":"Clean up a bit freetype.\n","repos":"vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/misc\/text_renderer\/freetype.c\n+++ modules\/misc\/text_renderer\/freetype.c\n@@ -540,8 +540,7 @@\n uint8_t *p_dst;\n video_format_t fmt;\n int i, x, y, i_pitch;\n- uint8_t i_y; \/* YUV values, derived from incoming RGB *\/\n- int8_t i_u, i_v;\n+ uint8_t i_y, i_u, i_v; \/* YUV values, derived from incoming RGB *\/\n \n \/* Create a new subpicture region *\/\n memset( &fmt, 0, sizeof(video_format_t) );\n@@ -564,12 +563,10 @@\n p_region->fmt = fmt;\n \n \/* Calculate text color components *\/\n- i_y = (uint8_t)(( 66 * p_line->i_red + 129 * p_line->i_green +\n- 25 * p_line->i_blue + 128) >> 8) + 16;\n- i_u = (int8_t)(( -38 * p_line->i_red - 74 * p_line->i_green +\n- 112 * p_line->i_blue + 128) >> 8) + 128;\n- i_v = (int8_t)(( 112 * p_line->i_red - 94 * p_line->i_green -\n- 18 * p_line->i_blue + 128) >> 8) + 128;\n+ YUVFromRGB( (p_line->i_red << 16) |\n+ (p_line->i_green << 8) |\n+ (p_line->i_blue ),\n+ &i_y, &i_u, &i_v);\n \n \/* Build palette *\/\n fmt.p_palette->i_entries = 16;\n@@ -986,30 +983,30 @@\n uint32_t i_font_color, uint32_t i_karaoke_bg_color, bool b_bold,\n bool b_italic, bool b_uline, bool b_through )\n {\n- ft_style_t *p_style = malloc( sizeof( ft_style_t ));\n-\n- if( p_style )\n- {\n- p_style->i_font_size = i_font_size;\n- p_style->i_font_color = i_font_color;\n- p_style->i_karaoke_bg_color = i_karaoke_bg_color;\n- p_style->b_italic = b_italic;\n- p_style->b_bold = b_bold;\n- p_style->b_underline = b_uline;\n- p_style->b_through = b_through;\n-\n- p_style->psz_fontname = strdup( psz_fontname );\n- }\n+ ft_style_t *p_style = malloc( sizeof( *p_style ));\n+ if( !p_style )\n+ return NULL;\n+\n+ p_style->i_font_size = i_font_size;\n+ p_style->i_font_color = i_font_color;\n+ p_style->i_karaoke_bg_color = i_karaoke_bg_color;\n+ p_style->b_italic = b_italic;\n+ p_style->b_bold = b_bold;\n+ p_style->b_underline = b_uline;\n+ p_style->b_through = b_through;\n+\n+ p_style->psz_fontname = strdup( psz_fontname );\n+\n return p_style;\n }\n \n static void DeleteStyle( ft_style_t *p_style )\n {\n- if( p_style )\n- {\n- free( p_style->psz_fontname );\n- free( p_style );\n- }\n+ if( !p_style )\n+ return;\n+\n+ free( p_style->psz_fontname );\n+ free( p_style );\n }\n \n static bool StyleEquals( ft_style_t *s1, ft_style_t *s2 )\n@@ -1033,10 +1030,10 @@\n }\n \n static void IconvText( filter_t *p_filter, const char *psz_string,\n- size_t *i_string_length, uint32_t **ppsz_unicode )\n+ size_t *i_string_length, uint32_t *psz_unicode )\n {\n *i_string_length = 0;\n- if( *ppsz_unicode == NULL )\n+ if( psz_unicode == NULL )\n return;\n \n size_t i_length;\n@@ -1051,30 +1048,28 @@\n msg_Warn( p_filter, \"failed to convert string to unicode (%m)\" );\n return;\n }\n- memcpy( *ppsz_unicode, psz_tmp, i_length );\n+ memcpy( psz_unicode, psz_tmp, i_length );\n *i_string_length = i_length \/ 4;\n \n free( psz_tmp );\n }\n \n static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys,\n- font_stack_t **p_fonts, bool b_bold, bool b_italic,\n- bool b_uline, bool b_through )\n-{\n- ft_style_t *p_style = NULL;\n-\n+ font_stack_t **p_fonts,\n+ bool b_bold, bool b_italic,\n+ bool b_uline, bool b_through )\n+{\n char *psz_fontname = NULL;\n uint32_t i_font_color = p_sys->i_font_color & 0x00ffffff;\n uint32_t i_karaoke_bg_color = i_font_color;\n int i_font_size = p_sys->i_font_size;\n \n- if( VLC_SUCCESS == PeekFont( p_fonts, &psz_fontname, &i_font_size,\n- &i_font_color, &i_karaoke_bg_color ))\n- {\n- p_style = CreateStyle( psz_fontname, i_font_size, i_font_color,\n- i_karaoke_bg_color, b_bold, b_italic, b_uline, b_through );\n- }\n- return p_style;\n+ if( PeekFont( p_fonts, &psz_fontname, &i_font_size,\n+ &i_font_color, &i_karaoke_bg_color ) )\n+ return NULL;\n+\n+ return CreateStyle( psz_fontname, i_font_size, i_font_color,\n+ i_karaoke_bg_color, b_bold, b_italic, b_uline, b_through );\n }\n \n static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,\n@@ -1280,14 +1275,14 @@\n }\n \n static void SetupLine( filter_t *p_filter, const char *psz_text_in,\n- uint32_t **psz_text_out, uint32_t *pi_runs,\n+ uint32_t **ppsz_text_out, uint32_t *pi_runs,\n uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles,\n ft_style_t *p_style )\n {\n size_t i_string_length;\n \n- IconvText( p_filter, psz_text_in, &i_string_length, psz_text_out );\n- *psz_text_out += i_string_length;\n+ IconvText( p_filter, psz_text_in, &i_string_length, *ppsz_text_out );\n+ *ppsz_text_out += i_string_length;\n \n if( ppp_styles && ppi_run_lengths )\n {\n@@ -1335,7 +1330,7 @@\n \/* If we couldn't use the p_style argument due to memory allocation\n * problems above, release it here.\n *\/\n- if( p_style ) DeleteStyle( p_style );\n+ DeleteStyle( p_style );\n }\n \n static int CheckForEmbeddedFont( filter_sys_t *p_sys, FT_Face *pp_face, ft_style_t *p_style )\n@@ -1949,7 +1944,7 @@\n {\n \n size_t i_iconv_length;\n- IconvText( p_filter, p_region_in->psz_text, &i_iconv_length, &psz_text );\n+ IconvText( p_filter, p_region_in->psz_text, &i_iconv_length, psz_text );\n i_text_length = i_iconv_length;\n \n int i_scale = 1000;\n"} {"commit":"22938a93ef781f3775ee1936b69c4a465b4dfc43","subject":"lpc43xx: fix some compile warnings","message":"lpc43xx: fix some compile warnings\n","repos":"gbcwbz\/rt-thread,igou\/rt-thread,armink\/rt-thread,geniusgogo\/rt-thread,wolfgangz2013\/rt-thread,FlyLu\/rt-thread,weety\/rt-thread,ArdaFu\/rt-thread,yongli3\/rt-thread,yongli3\/rt-thread,igou\/rt-thread,nongxiaoming\/rt-thread,zhaojuntao\/rt-thread,AubrCool\/rt-thread,RT-Thread\/rt-thread,yongli3\/rt-thread,FlyLu\/rt-thread,yongli3\/rt-thread,igou\/rt-thread,weiyuliang\/rt-thread,RT-Thread\/rt-thread,wolfgangz2013\/rt-thread,ArdaFu\/rt-thread,zhaojuntao\/rt-thread,zhaojuntao\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,ArdaFu\/rt-thread,ArdaFu\/rt-thread,wolfgangz2013\/rt-thread,FlyLu\/rt-thread,AubrCool\/rt-thread,weety\/rt-thread,AubrCool\/rt-thread,geniusgogo\/rt-thread,weiyuliang\/rt-thread,zhaojuntao\/rt-thread,AubrCool\/rt-thread,yongli3\/rt-thread,armink\/rt-thread,hezlog\/rt-thread,gbcwbz\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,ArdaFu\/rt-thread,AubrCool\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,armink\/rt-thread,RT-Thread\/rt-thread,wolfgangz2013\/rt-thread,hezlog\/rt-thread,weiyuliang\/rt-thread,gbcwbz\/rt-thread,wolfgangz2013\/rt-thread,gbcwbz\/rt-thread,igou\/rt-thread,geniusgogo\/rt-thread,weety\/rt-thread,hezlog\/rt-thread,weety\/rt-thread,zhaojuntao\/rt-thread,gbcwbz\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,gbcwbz\/rt-thread,RT-Thread\/rt-thread,yongli3\/rt-thread,ArdaFu\/rt-thread,RT-Thread\/rt-thread,geniusgogo\/rt-thread,AubrCool\/rt-thread,weiyuliang\/rt-thread,wolfgangz2013\/rt-thread,wolfgangz2013\/rt-thread,geniusgogo\/rt-thread,zhaojuntao\/rt-thread,FlyLu\/rt-thread,nongxiaoming\/rt-thread,nongxiaoming\/rt-thread,FlyLu\/rt-thread,weiyuliang\/rt-thread,igou\/rt-thread,FlyLu\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,igou\/rt-thread,zhaojuntao\/rt-thread,FlyLu\/rt-thread,hezlog\/rt-thread,armink\/rt-thread,armink\/rt-thread,armink\/rt-thread,weety\/rt-thread,hezlog\/rt-thread,yongli3\/rt-thread,ArdaFu\/rt-thread,gbcwbz\/rt-thread,igou\/rt-thread,weiyuliang\/rt-thread,AubrCool\/rt-thread,RT-Thread\/rt-thread,hezlog\/rt-thread,weiyuliang\/rt-thread,hezlog\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bsp\/lpc43xx\/drivers\/drv_uart.c\n+++ bsp\/lpc43xx\/drivers\/drv_uart.c\n@@ -86,7 +86,7 @@\n static void _do_uart_isr(struct rt_serial_device *sdev)\n {\n struct lpc_uart *uart;\n- volatile uint32_t intsrc, temp;\n+ uint32_t intsrc;\n \n uart = sdev->parent.user_data;\n \n@@ -102,7 +102,7 @@\n \/* Receive an error data *\/\n if (intsrc & UART_LSR_PE)\n {\n- temp = uart->USART->RBR;\n+ uart->USART->RBR;\n }\n break;\n case UART_IIR_INTID_RDA:\n"} {"commit":"00d28538e4d71a71ab35c5e942911af759dbdc86","subject":"close connection after sending last ack.","message":"close connection after sending last ack.\n","repos":"aragorn\/wisebot,aragorn\/wisebot,aragorn\/wisebot,aragorn\/wisebot,aragorn\/wisebot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- modules\/mod_protocol4\/mod_protocol4.c\n+++ modules\/mod_protocol4\/mod_protocol4.c\n@@ -1155,6 +1155,8 @@\n \t\terror(\"cannot send OP_ACK\");\n \t\tsb_run_buffer_freebuf(&var_buf); \n \t\treturn FAIL;\n+\t} else {\n+\t\tsb_run_tcp_close(sockfd);\n \t}\n \n \t\/* below codes is not allowed to send nak op_code,\n"} {"commit":"471f00a8d111f177cb81015a3c439cd3e65148bd","subject":"move some code so it is easier to run in simulator","message":"move some code so it is easier to run in simulator\n","repos":"denisbohm\/firefly-ice-firmware,denisbohm\/firefly-ice-firmware,denisbohm\/firefly-ice-firmware","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/fd_event.c\n+++ src\/fd_event.c\n@@ -108,18 +108,20 @@\n }\n }\n }\n+ if (pending == 0) {\n+ for (uint32_t i = 0; i < fd_event_em2_check_count; ++i) {\n+ fd_event_em2_check_t em2_check = fd_event_em2_checks[i];\n+ if (!em2_check()) {\n+ return true;\n+ }\n+ }\n+ }\n return pending != 0;\n }\n \n void fd_event_process(void) {\n bool pending = fd_event_process_pending();\n if (!pending) {\n- for (uint32_t i = 0; i < fd_event_em2_check_count; ++i) {\n- fd_event_em2_check_t em2_check = fd_event_em2_checks[i];\n- if (!em2_check()) {\n- return;\n- }\n- }\n fd_hal_processor_wait();\n }\n }\n"} {"commit":"09f52e0fae029c58e62db2d717ff4a60b1513ec5","subject":"Fixed this header to compile with gcc -pedantic -Werror (removed comma at end of enum).","message":"Fixed this header to compile with gcc -pedantic -Werror (removed comma\nat end of enum).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libdisk\/libdisk.h\n+++ lib\/libdisk\/libdisk.h\n@@ -6,7 +6,7 @@\n * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp\n * ----------------------------------------------------------------------------\n *\n-* $Id$\n+* $Id: libdisk.h,v 1.26 1997\/02\/22 15:06:35 peter Exp $\n *\n *\/\n \n@@ -20,7 +20,7 @@\n \tfreebsd,\n \textended,\n \tpart,\n-\tunused,\n+\tunused\n } chunk_e;\n \n __BEGIN_DECLS\n"} {"commit":"6d76222e1a57deaba1562ce3d3312b5f21888bd1","subject":"[SCSI] qla4xxx: Update driver version to 5.02.00-k16","message":"[SCSI] qla4xxx: Update driver version to 5.02.00-k16\n\nSigned-off-by: Vikas Chaudhary \nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Parallels.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/qla4xxx\/ql4_version.h\n+++ drivers\/scsi\/qla4xxx\/ql4_version.h\n@@ -5,4 +5,4 @@\n * See LICENSE.qla4xxx for copyright and licensing details.\n *\/\n \n-#define QLA4XXX_DRIVER_VERSION\t\"5.02.00-k15\"\n+#define QLA4XXX_DRIVER_VERSION\t\"5.02.00-k16\"\n"} {"commit":"8818723646aeb013dd39fca1c6e1162c7636b67f","subject":"Bug 609326 - Complex script shaping failed in the FT2 backend on Windows","message":"Bug 609326 - Complex script shaping failed in the FT2 backend on Windows\n\nCheck for face->stream->read == NULL instead of face->stream->base != NULL.\n","repos":"kari-lentz\/alpha-pango,kari-lentz\/alpha-pango,danny-ku\/pango,Distrotech\/pango,kari-lentz\/alpha-pango,danny-ku\/pango,kari-lentz\/alpha-pango,Distrotech\/pango,Distrotech\/pango,danny-ku\/pango","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pango\/pango-ot-info.c\n+++ pango\/pango-ot-info.c\n@@ -144,13 +144,7 @@\n \n info->face = face;\n \n- if (\n-#ifdef G_OS_WIN32\n-\t FALSE &&\t\t\/* Work around possible bug in FreeType, FT_StreamRec::base\n-\t\t\t\t * can be non-NULL even if the stream is not memory-based.\n-\t\t\t\t *\/\n-#endif\n-\t face->stream->base != NULL) {\n+ if (face->stream->read == NULL) {\n \thb_blob_t *blob;\n \n \tblob = hb_blob_create ((const char *) face->stream->base,\n"} {"commit":"7255863cbb22f3d41fb948b76ce35f8f63dbbdb6","subject":"feedback.c: malloc() size argument overflow fixed","message":"feedback.c: malloc() size argument overflow fixed\n\nsrc\/feedback.c:46:40: warning: the computation of the size of the memory\nallocation may overflow\n if ((env_argv = malloc((env_count + 1)*sizeof(char *))) != NULL) {\n ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~\n","repos":"ndmsystems\/libndm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/feedback.c\n+++ src\/feedback.c\n@@ -43,7 +43,14 @@\n \t\t}\n \t}\n \n-\tif ((env_argv = malloc((env_count + 1)*sizeof(char *))) != NULL) {\n+\t++env_count; \/* NULL terminator *\/\n+\n+\tif (env_count > SIZE_MAX \/ sizeof(char *)) {\n+\t\t\/* too many environment variables *\/\n+\t\tenv_argv = NULL;\n+\t\terrno = ENOMEM;\n+\t} else\n+\tif ((env_argv = malloc(env_count * sizeof(char *))) != NULL) {\n \t\tint env_index = 0;\n \t\tchar *env_start = env;\n \t\tbool valid_format = true;\n"} {"commit":"677ee31a3c7f374ef1da58d3e39c7f9d723673cf","subject":"Remove an errant `#define dprintf printf'. It seems to be leftover debugging code that nothing depends on. (I've had this in my tree for years without issue.)","message":"Remove an errant `#define dprintf printf'. It seems to be leftover\ndebugging code that nothing depends on. (I've had this in my tree for\nyears without issue.)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"56163c233d35c20698a9de0d4f640bb02251a926","subject":"[SCSI] qla4xxx: Update driver version to 5.03.00-k0","message":"[SCSI] qla4xxx: Update driver version to 5.03.00-k0\n\nSigned-off-by: Vikas Chaudhary \nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Parallels.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/qla4xxx\/ql4_version.h\n+++ drivers\/scsi\/qla4xxx\/ql4_version.h\n@@ -5,4 +5,4 @@\n * See LICENSE.qla4xxx for copyright and licensing details.\n *\/\n \n-#define QLA4XXX_DRIVER_VERSION\t\"5.02.00-k20\"\n+#define QLA4XXX_DRIVER_VERSION\t\"5.03.00-k0\"\n"} {"commit":"a4ce0e7e6e7e8dfe00b6aed03dfb52e242cbc68b","subject":"staging: xgifb: vb_setmode: delete IF_DEF_YPbPr checks","message":"staging: xgifb: vb_setmode: delete IF_DEF_YPbPr checks\n\nCode checking for IF_DEF_YPbPr is only executed for chips < XG20, and\nthere IF_DEF_YPbPr is always true, so the flag is redundant.\n\nSigned-off-by: Aaro Koskinen <13423a3f3006b5859cfceae66d59451f5eb4e205@iki.fi>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/xgifb\/vb_setmode.c\n+++ drivers\/staging\/xgifb\/vb_setmode.c\n@@ -1960,20 +1960,17 @@\n \t\t}\n \t}\n \n-\tif (pVBInfo->IF_DEF_YPbPr == 1) {\n-\t\tif (pVBInfo->VBType & (VB_SIS301LV|VB_SIS302LV|VB_XGI301C)) {\n-\t\t\tif (temp & SetYPbPr) {\n-\t\t\t\tif (pVBInfo->IF_DEF_HiVision == 1) {\n-\t\t\t\t\t\/* shampoo add for new scratch *\/\n-\t\t\t\t\ttemp = xgifb_reg_get(pVBInfo->P3d4,\n-\t\t\t\t\t\t\t 0x35);\n-\t\t\t\t\ttemp &= YPbPrMode;\n-\t\t\t\t\ttempbx |= SetCRT2ToHiVision;\n-\n-\t\t\t\t\tif (temp != YPbPrMode1080i) {\n-\t\t\t\t\t\ttempbx &= (~SetCRT2ToHiVision);\n-\t\t\t\t\t\ttempbx |= SetCRT2ToYPbPr525750;\n-\t\t\t\t\t}\n+\tif (pVBInfo->VBType & (VB_SIS301LV|VB_SIS302LV|VB_XGI301C)) {\n+\t\tif (temp & SetYPbPr) {\n+\t\t\tif (pVBInfo->IF_DEF_HiVision == 1) {\n+\t\t\t\t\/* shampoo add for new scratch *\/\n+\t\t\t\ttemp = xgifb_reg_get(pVBInfo->P3d4, 0x35);\n+\t\t\t\ttemp &= YPbPrMode;\n+\t\t\t\ttempbx |= SetCRT2ToHiVision;\n+\n+\t\t\t\tif (temp != YPbPrMode1080i) {\n+\t\t\t\t\ttempbx &= (~SetCRT2ToHiVision);\n+\t\t\t\t\ttempbx |= SetCRT2ToYPbPr525750;\n \t\t\t\t}\n \t\t\t}\n \t\t}\n@@ -1981,16 +1978,10 @@\n \n \ttempax = push; \/* restore CR31 *\/\n \n-\tif (pVBInfo->IF_DEF_YPbPr == 1) {\n-\t\tif (pVBInfo->IF_DEF_HiVision == 1)\n-\t\t\ttemp = 0x09FC;\n-\t\telse\n-\t\t\ttemp = 0x097C;\n-\t} else if (pVBInfo->IF_DEF_HiVision == 1) {\n-\t\ttemp = 0x01FC;\n-\t} else {\n-\t\ttemp = 0x017C;\n-\t}\n+\tif (pVBInfo->IF_DEF_HiVision == 1)\n+\t\ttemp = 0x09FC;\n+\telse\n+\t\ttemp = 0x097C;\n \n \tif (!(tempbx & temp)) {\n \t\ttempax |= DisableCRT2Display;\n@@ -2037,10 +2028,8 @@\n \t\ttempbx &= (0x00FF | (~SetCRT2ToYPbPr525750));\n \t}\n \n-\tif (pVBInfo->IF_DEF_YPbPr == 1) {\n-\t\tif (tempbx & SetCRT2ToYPbPr525750)\n-\t\t\ttempbx &= (0xFF00 | SwitchCRT2 | SetSimuScanMode);\n-\t}\n+\tif (tempbx & SetCRT2ToYPbPr525750)\n+\t\ttempbx &= (0xFF00 | SwitchCRT2 | SetSimuScanMode);\n \n \tif (pVBInfo->IF_DEF_HiVision == 1) {\n \t\tif (tempbx & SetCRT2ToHiVision)\n@@ -2097,19 +2086,17 @@\n \t\tif (pVBInfo->VBInfo & SetCRT2ToSCART)\n \t\t\ttempbx |= TVSetPAL;\n \n-\t\tif (pVBInfo->IF_DEF_YPbPr == 1) {\n-\t\t\tif (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {\n-\t\t\t\tindex1 = xgifb_reg_get(pVBInfo->P3d4, 0x35);\n-\t\t\t\tindex1 &= YPbPrMode;\n-\n-\t\t\t\tif (index1 == YPbPrMode525i)\n-\t\t\t\t\ttempbx |= TVSetYPbPr525i;\n-\n-\t\t\t\tif (index1 == YPbPrMode525p)\n-\t\t\t\t\ttempbx = tempbx | TVSetYPbPr525p;\n-\t\t\t\tif (index1 == YPbPrMode750p)\n-\t\t\t\t\ttempbx = tempbx | TVSetYPbPr750p;\n-\t\t\t}\n+\t\tif (pVBInfo->VBInfo & SetCRT2ToYPbPr525750) {\n+\t\t\tindex1 = xgifb_reg_get(pVBInfo->P3d4, 0x35);\n+\t\t\tindex1 &= YPbPrMode;\n+\n+\t\t\tif (index1 == YPbPrMode525i)\n+\t\t\t\ttempbx |= TVSetYPbPr525i;\n+\n+\t\t\tif (index1 == YPbPrMode525p)\n+\t\t\t\ttempbx = tempbx | TVSetYPbPr525p;\n+\t\t\tif (index1 == YPbPrMode750p)\n+\t\t\t\ttempbx = tempbx | TVSetYPbPr750p;\n \t\t}\n \n \t\tif (pVBInfo->IF_DEF_HiVision == 1) {\n@@ -5573,12 +5560,10 @@\n \tpVBInfo->IF_DEF_LVDS = 0;\n \n \tif (HwDeviceExtension->jChipType >= XG20) {\n-\t\tpVBInfo->IF_DEF_YPbPr = 0;\n \t\tpVBInfo->IF_DEF_HiVision = 0;\n \t\tpVBInfo->IF_DEF_CRT2Monitor = 0;\n \t\tpVBInfo->VBType = 0; \/*set VBType default 0*\/\n \t} else {\n-\t\tpVBInfo->IF_DEF_YPbPr = 1;\n \t\tpVBInfo->IF_DEF_HiVision = 1;\n \t\tpVBInfo->IF_DEF_CRT2Monitor = 1;\n \t}\n"} {"commit":"7709fad9c0b9bf8e0225fc6fb10b9da1df31245d","subject":"finish add IO functions (resolves #33)","message":"finish add IO functions (resolves #33)\n","repos":"gentryx\/BigMPI,gentryx\/BigMPI,gentryx\/BigMPI,jeffhammond\/BigMPI,jeffhammond\/BigMPI,jeffhammond\/BigMPI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/fileio_x.c\n+++ src\/fileio_x.c\n@@ -147,28 +147,307 @@\n return rc;\n }\n \n-#if 0\n int MPIX_File_iread_at_x(MPI_File fh, MPI_Offset offset, void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iread_at(fh, offset, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iread_at(fh, offset, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iread_x(MPI_File fh, void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iread(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iread(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iread_shared_x(MPI_File fh, void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iread_shared(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iread_shared(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iread_at_all_x(MPI_File fh, MPI_Offset offset, void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iread_at_all(fh, offset, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iread_at_all(fh, offset, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iread_all_x(MPI_File fh, void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iread_all(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iread_all(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n \n int MPIX_File_write_at_x(MPI_File fh, MPI_Offset offset, const void * buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_at(fh, offset, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_at(fh, offset, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_at_all_x(MPI_File fh, MPI_Offset offset, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_at_all(fh, offset, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_at_all(fh, offset, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_at_all_begin_x(MPI_File fh, MPI_Offset offset, const void *buf, MPI_Count count, MPI_Datatype datatype)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_at_all_begin(fh, offset, buf, (int)count, datatype);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_at_all_begin(fh, offset, buf, 1, newtype);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n \n int MPIX_File_write_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write(fh, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write(fh, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_all_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_all(fh, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_all(fh, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_shared_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_shared(fh, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_shared(fh, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_ordered_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Status *status)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_ordered(fh, buf, (int)count, datatype, status);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_ordered(fh, buf, 1, newtype, status);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_all_begin_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_all_begin(fh, buf, (int)count, datatype);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_all_begin(fh, buf, 1, newtype);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_write_ordered_begin_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_write_ordered_begin(fh, buf, (int)count, datatype);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_write_ordered_begin(fh, buf, 1, newtype);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n \n int MPIX_File_iwrite_at_x(MPI_File fh, MPI_Offset offset, const void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iwrite_at(fh, offset, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iwrite_at(fh, offset, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iwrite_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iwrite(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iwrite(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iwrite_shared_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPIO_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iwrite_shared(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iwrite_shared(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iwrite_at_all_x(MPI_File fh, MPI_Offset offset, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Request *request)\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iwrite_at_all(fh, offset, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iwrite_at_all(fh, offset, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n+\n int MPIX_File_iwrite_all_x(MPI_File fh, const void *buf, MPI_Count count, MPI_Datatype datatype, MPI_Request *request)\n-#endif\n-\n+{\n+ int rc = MPI_SUCCESS;\n+\n+ if (likely (count <= bigmpi_int_max )) {\n+ rc = MPI_File_iwrite_all(fh, buf, (int)count, datatype, request);\n+ } else {\n+ MPI_Datatype newtype;\n+ MPIX_Type_contiguous_x(0,count, datatype, &newtype);\n+ MPI_Type_commit(&newtype);\n+ rc = MPI_File_iwrite_all(fh, buf, 1, newtype, request);\n+ MPI_Type_free(&newtype);\n+ }\n+ return rc;\n+}\n"} {"commit":"b9318fc5037261eb1c8f118d04a8dee3b4b3059b","subject":"msm_serial_hs: Wait for discard flush completion for UART Rx channel","message":"msm_serial_hs: Wait for discard flush completion for UART Rx channel\n\nCompletion of requested flush command with ADM driver is having more\nlatency then previously. Hence now it is required to wait for discard\nflush complete if there is more events expected with UART driver which\nwould go out of sync without it. Below are 2 instances where it is must\nto wait for discard flush completion requested on UART Rx channel.\n\n1. Changing Baud Rate of UART\nUART application can send baud rate change request based on its requirement\nof communication with connected device on remote uart. Serial core also\ndoes set by default baud rate when application is opening the uart port. As\nRx command is queued always with ADM driver from UART driver, for above\nevents it is required to flush the same after setting the baud rate. Not\nwaiting for completion of Rx flush would allow application to send command\non Tx or any other ioctl which would reach to connected device but response\nmay not be received as Rx flush completion is not received to queue next Rx\ncommand to ADM. Hence with this there are chances that received data with\nUART wil be lost when Rx flush completion is not received in-time. Hence\nwait for Rx flush completion from set_termios() with timeout as 300 jiffie.\nRx flush completion time is non-deterministic as it depends on number of\ncommands queued to ADM driver from ADM client drivers.\n\n2. While going for UART clock off\nUART clock off has multiple state machines and before going into last\nstate it makes sure that there are no pending data in UART Tx and Rx FIFO.\nAlthough there would be one Rx command queued which is flushed before\nmoving to last state and going ahead with UART clock off. If UART clock is\nturned off before Rx flush request is being executed and ADM tried to flush\nRx command, ADM encounters data bus error on UART Rx Channel. Hence with\nwaiting for Rx flush completion, and then doing UART clock off on receving\nthe same would resolve ADM data bus error issue on UART Rx channel.\n\nCRs-Fixed: 457769\nChange-Id: I7ee4f394180e982f875fe58a6e0aabe152dccfd7\nSigned-off-by: Mayank Rana \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/tty\/serial\/msm_serial_hs.c\n+++ drivers\/tty\/serial\/msm_serial_hs.c\n@@ -218,6 +218,7 @@\n \tu32 bus_perf_client;\n \t\/* BLSP UART required BUS Scaling data *\/\n \tstruct msm_bus_scale_pdata *bus_scale_table;\n+\tbool rx_discard_flush_issued;\n };\n \n #define MSM_UARTDM_BURST_SIZE 16 \/* DM burst size (in bytes) *\/\n@@ -229,6 +230,7 @@\n #define BAM_PIPE_MAX 11\n #define BUS_SCALING 1\n #define BUS_RESET 0\n+#define RX_FLUSH_COMPLETE_TIMEOUT 300 \/* In jiffies *\/\n \n static struct dentry *debug_base;\n static struct msm_hs_port q_uart_port[UARTDM_NR];\n@@ -849,6 +851,7 @@\n {\n \tunsigned int bps;\n \tunsigned long data;\n+\tint ret;\n \tunsigned int c_cflag = termios->c_cflag;\n \tstruct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);\n \tstruct msm_hs_rx *rx = &msm_uport->rx;\n@@ -969,8 +972,17 @@\n \t\t\tmsm_hs_spsconnect_rx(uport);\n \t\t\tmsm_serial_hs_rx_tlet((unsigned long) &rx->tlet);\n \t\t} else {\n+\t\t\tmsm_uport->rx_discard_flush_issued = true;\n \t\t\t\/* do discard flush *\/\n \t\t\tmsm_dmov_flush(msm_uport->dma_rx_channel, 0);\n+\t\t\tpr_debug(\"%s(): wainting for flush completion.\\n\",\n+\t\t\t\t\t\t\t\t__func__);\n+\t\t\tret = wait_event_timeout(msm_uport->rx.wait,\n+\t\t\t\tmsm_uport->rx_discard_flush_issued == false,\n+\t\t\t\tRX_FLUSH_COMPLETE_TIMEOUT);\n+\t\t\tif (!ret)\n+\t\t\t\tpr_err(\"%s(): Discard flush pending.\\n\",\n+\t\t\t\t\t\t\t\t__func__);\n \t\t}\n \t}\n \n@@ -1515,8 +1527,23 @@\n \t\t\t\t\tstruct msm_dmov_errdata *err)\n {\n \tstruct msm_hs_port *msm_uport;\n+\tstruct uart_port *uport;\n+\tunsigned long flags;\n \n \tmsm_uport = container_of(cmd_ptr, struct msm_hs_port, rx.xfer);\n+\tuport = &(msm_uport->uport);\n+\n+\tpr_debug(\"%s(): called result:%x\\n\", __func__, result);\n+\tif (!(result & DMOV_RSLT_ERROR)) {\n+\t\tif (result & DMOV_RSLT_FLUSH) {\n+\t\t\tif (msm_uport->rx_discard_flush_issued) {\n+\t\t\t\tspin_lock_irqsave(&uport->lock, flags);\n+\t\t\t\tmsm_uport->rx_discard_flush_issued = false;\n+\t\t\t\tspin_unlock_irqrestore(&uport->lock, flags);\n+\t\t\t\twake_up(&msm_uport->rx.wait);\n+\t\t\t}\n+\t\t}\n+\t}\n \n \ttasklet_schedule(&msm_uport->rx.tlet);\n }\n@@ -1662,6 +1689,7 @@\n {\n \tunsigned long sr_status;\n \tunsigned long flags;\n+\tint ret;\n \tstruct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);\n \tstruct circ_buf *tx_buf = &uport->state->xmit;\n \n@@ -1717,10 +1745,23 @@\n \t}\n \n \tif (msm_uport->rx.flush != FLUSH_SHUTDOWN) {\n-\t\tif (msm_uport->rx.flush == FLUSH_NONE)\n+\t\tif (msm_uport->rx.flush == FLUSH_NONE) {\n \t\t\tmsm_hs_stop_rx_locked(uport);\n+\t\t\tmsm_uport->rx_discard_flush_issued = true;\n+\t\t}\n \n \t\tspin_unlock_irqrestore(&uport->lock, flags);\n+\t\tif (msm_uport->rx_discard_flush_issued) {\n+\t\t\tpr_debug(\"%s(): wainting for flush completion.\\n\",\n+\t\t\t\t\t\t\t\t__func__);\n+\t\t\tret = wait_event_timeout(msm_uport->rx.wait,\n+\t\t\t\tmsm_uport->rx_discard_flush_issued == false,\n+\t\t\t\tRX_FLUSH_COMPLETE_TIMEOUT);\n+\t\t\tif (!ret)\n+\t\t\t\tpr_err(\"%s(): Flush complete pending.\\n\",\n+\t\t\t\t\t\t\t\t__func__);\n+\t\t}\n+\n \t\tmutex_unlock(&msm_uport->clk_mutex);\n \t\treturn 0; \/* come back later to really clock off *\/\n \t}\n"} {"commit":"6731af573ac28de2297002992f38caa760e3dadf","subject":"tty: xuartps: Fix tx_emtpy() callback","message":"tty: xuartps: Fix tx_emtpy() callback\n\nThe tx_empty() callback currently checks the TXEMPTY bit in the interrupt\nstatus register to decided whether the FIFO should be reported as empty or\nnot. The bit in this register gets set when the FIFO state transitions from\nnon-empty to empty but is cleared again in the interrupt handler. This means\nit is not suitable to be used to decided whether the FIFO is currently empty\nor not. Instead use the TXEMPTY bit from the status register which will be\nset as long as the FIFO is empty.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nAcked-by: Soren Brinkmann \nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/tty\/serial\/xilinx_uartps.c\n+++ drivers\/tty\/serial\/xilinx_uartps.c\n@@ -581,7 +581,7 @@\n {\n \tunsigned int status;\n \n-\tstatus = cdns_uart_readl(CDNS_UART_ISR_OFFSET) & CDNS_UART_IXR_TXEMPTY;\n+\tstatus = cdns_uart_readl(CDNS_UART_SR_OFFSET) & CDNS_UART_SR_TXEMPTY;\n \treturn status ? TIOCSER_TEMT : 0;\n }\n \n"} {"commit":"5a3b5899f190a365eed806302f4b58a493233f96","subject":"[PATCH] intelfbdrv naming fix","message":"[PATCH] intelfbdrv naming fix\n\nCan't use this fancy name, because it's used to generate a sysfs filename:\n\nkobject_register failed for Intel(R) 830M\/845G\/852GM\/855GM\/865G\/915G\n Framebuffer Driver (-13)\n [] kobject_register+0x43\/0x70\n [] bus_add_driver+0x52\/0xa0\n [] pci_device_shutdown+0x0\/0x20\n [] pci_register_driver+0x61\/0x80\n [] intelfb_init+0x59\/0x70\n [] do_initcalls+0x2c\/0xc0\n [] kern_mount+0x15\/0x17\n [] init+0x0\/0x100\n [] init+0x2a\/0x100\n [] kernel_thread_helper+0x0\/0x18\n [] kernel_thread_helper+0x5\/0x18\n\nCc: \"Antonino A. Daplas\" \nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/intelfb\/intelfbdrv.c\n+++ drivers\/video\/intelfb\/intelfbdrv.c\n@@ -214,7 +214,7 @@\n \n \/* PCI driver module table *\/\n static struct pci_driver intelfb_driver = {\n-\t.name =\t\t\"Intel(R) \" SUPPORTED_CHIPSETS \" Framebuffer Driver\",\n+\t.name =\t\t\"intelfb\",\n \t.id_table =\tintelfb_pci_table,\n \t.probe =\tintelfb_pci_register,\n \t.remove =\t__devexit_p(intelfb_pci_unregister)\n"} {"commit":"da71718b0211dbb45a2b34211f7cdac57556cef9","subject":"Chase pmc API changes.","message":"Chase pmc API changes.\n","repos":"kbyanc\/dyntrace,kbyanc\/dyntrace","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- dyntrace\/dyntrace\/target_freebsd.c\n+++ dyntrace\/dyntrace\/target_freebsd.c\n@@ -23,7 +23,7 @@\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n * \n- * $kbyanc: dyntrace\/dyntrace\/target_freebsd.c,v 1.10 2005\/05\/17 00:34:55 kbyanc Exp $\n+ * $kbyanc: dyntrace\/dyntrace\/target_freebsd.c,v 1.11 2005\/05\/19 21:58:31 kbyanc Exp $\n *\/\n \n #include \"config.h\"\n@@ -103,7 +103,7 @@\n \t\t\tfatal(EX_OSERR, \"pmc_cpuinfo: %m\");\n \n \t\tfor (i = 0; i < cpuinfo->pm_nclass; i++) {\n-\t\t\tpmclass = cpuinfo->pm_classes[i];\n+\t\t\tpmclass = cpuinfo->pm_classes[i].pm_class;\n \n \t\t\tif (pmclass == PMC_CLASS_P4) {\n \t\t\t\t\/* Intel Pentium 4 *\/\n"} {"commit":"e1a4acec9f39a1f7081d56b69c851747caada807","subject":"GB Audio: Rearrange WriteNR14 and fix GBC timing","message":"GB Audio: Rearrange WriteNR14 and fix GBC timing\n","repos":"Touched\/mgba,Iniquitatis\/mgba,iracigt\/mgba,Anty-Lemon\/mgba,sergiobenrocha2\/mgba,libretro\/mgba,sergiobenrocha2\/mgba,Touched\/mgba,jeremyherbert\/mgba,sergiobenrocha2\/mgba,fr500\/mgba,Anty-Lemon\/mgba,Touched\/mgba,jeremyherbert\/mgba,fr500\/mgba,libretro\/mgba,sergiobenrocha2\/mgba,Iniquitatis\/mgba,MerryMage\/mgba,mgba-emu\/mgba,MerryMage\/mgba,jeremyherbert\/mgba,mgba-emu\/mgba,mgba-emu\/mgba,MerryMage\/mgba,sergiobenrocha2\/mgba,iracigt\/mgba,iracigt\/mgba,jeremyherbert\/mgba,Iniquitatis\/mgba,libretro\/mgba,fr500\/mgba,Anty-Lemon\/mgba,iracigt\/mgba,Iniquitatis\/mgba,libretro\/mgba,mgba-emu\/mgba,fr500\/mgba,Anty-Lemon\/mgba,libretro\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/gb\/audio.c\n+++ src\/gb\/audio.c\n@@ -144,13 +144,6 @@\n \t\t}\n \t}\n \tif (GBAudioRegisterControlIsRestart(value << 8)) {\n-\t\tif (audio->nextEvent == INT_MAX) {\n-\t\t\taudio->eventDiff = 0;\n-\t\t}\n-\t\tif (audio->playingCh1) {\n-\t\t\taudio->ch1.control.hi = !audio->ch1.control.hi;\n-\t\t}\n-\t\taudio->nextCh1 = audio->eventDiff;\n \t\taudio->playingCh1 = audio->ch1.envelope.initialVolume || audio->ch1.envelope.direction;\n \t\taudio->ch1.envelope.currentVolume = audio->ch1.envelope.initialVolume;\n \t\tif (audio->ch1.envelope.currentVolume > 0) {\n@@ -158,6 +151,14 @@\n \t\t} else {\n \t\t\taudio->ch1.envelope.dead = audio->ch1.envelope.stepTime ? 0 : 2;\n \t\t}\n+\t\tif (audio->nextEvent == INT_MAX) {\n+\t\t\taudio->eventDiff = 0;\n+\t\t}\n+\t\tif (audio->playingCh1) {\n+\t\t\taudio->ch1.control.hi = !audio->ch1.control.hi;\n+\t\t}\n+\t\taudio->nextCh1 = audio->eventDiff;\n+\n \t\taudio->ch1.realFrequency = audio->ch1.control.frequency;\n \t\taudio->ch1.sweepStep = audio->ch1.time;\n \t\taudio->ch1.sweepEnable = (audio->ch1.sweepStep != 8) || audio->ch1.shift;\n@@ -855,7 +856,7 @@\n \t\/\/ TODO: Don't need p\n \tif (audio->p) {\n \t\taudio->nextEvent = audio->p->cpu->cycles >> audio->p->doubleSpeed;\n-\t\taudio->p->cpu->nextEvent = audio->nextEvent;\n+\t\taudio->p->cpu->nextEvent = audio->p->cpu->cycles;\n \t} else {\n \t\taudio->nextEvent = 0;\n \t}\n"} {"commit":"8d458a9e0b502529c044028ea5afdb70ca095aa6","subject":"Ensure we simply update the UI once after tailing multiple files.","message":"Ensure we simply update the UI once after tailing multiple files.\n","repos":"allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/goaccess.c\n+++ src\/goaccess.c\n@@ -806,8 +806,8 @@\n \n \/* Process appended log data\n *\n- * If nothing changed, 1 is returned.\n- * If log file changed, 0 is returned. *\/\n+ * If nothing changed, 0 is returned.\n+ * If log file changed, 1 is returned. *\/\n static int\n perform_tail_follow (GLog * glog) {\n FILE *fp = NULL;\n@@ -819,7 +819,7 @@\n parse_tail_follow (glog, glog->pipe);\n \/* did we read something from the pipe? *\/\n if (0 == glog->bytes)\n- return 1;\n+ return 0;\n \n glog->length += glog->bytes;\n goto out;\n@@ -831,7 +831,7 @@\n \/* ###NOTE: This assumes the log file being read can be of smaller size, e.g.,\n * rotated\/truncated file or larger when data is appended *\/\n if (length == glog->length)\n- return 1;\n+ return 0;\n \n if (!(fp = fopen (glog->filename, \"r\")))\n FATAL (\"Unable to read the specified log file '%s'. %s\", glog->filename, strerror (errno));\n@@ -866,7 +866,7 @@\n \n out:\n \n- return 0;\n+ return 1;\n }\n \n \/* Loop over and perform a follow for the given logs *\/\n@@ -882,10 +882,10 @@\n if (conf.stop_processing)\n break;\n \n- for (i = 0; i < logs->size; ++i)\n- ret = perform_tail_follow (&logs->glog[i]); \/* 0.2 secs *\/\n-\n- if (0 == ret)\n+ for (i = 0, ret = 0; i < logs->size; ++i)\n+ ret |= perform_tail_follow (&logs->glog[i]); \/* 0.2 secs *\/\n+\n+ if (1 == ret)\n tail_html ();\n \n if (nanosleep (&refresh, NULL) == -1 && errno != EINTR)\n"} {"commit":"325f0508bafec1b26db4a1c133fb5d059eb91c66","subject":"Added missing function comments to goaccess.c.","message":"Added missing function comments to goaccess.c.\n","repos":"Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/goaccess.c\n+++ src\/goaccess.c\n@@ -99,7 +99,8 @@\n };\n \/* *INDENT-ON* *\/\n \n-static void\n+\/* Free malloc'd data across the whole program *\/ .\n+ static void\n house_keeping (void)\n {\n #ifdef TCB_MEMHASH\n@@ -152,7 +153,8 @@\n free_cmd_args ();\n }\n \n-\/* allocate memory for an instance of holder *\/\n+\/* Extract data from the given module hash structure and allocate +\n+ * load data from the hash table into an instance of GHolder *\/\n static void\n allocate_holder_by_module (GModule module)\n {\n@@ -168,7 +170,8 @@\n load_holder_data (raw_data, holder + module, module, module_sort[module]);\n }\n \n-\/* allocate memory for an instance of holder *\/\n+\/* Iterate over all modules\/panels and extract data from hash\n+ * structures and load it into an instance of GHolder *\/\n static void\n allocate_holder (void)\n {\n@@ -180,7 +183,8 @@\n }\n }\n \n-\/* allocate memory for an instance of dashboard *\/\n+\/* Iterate over all modules\/panels and extract data from the modules\n+ * GHolder structure and load it into the terminal dashboard *\/\n static void\n allocate_data (void)\n {\n@@ -279,7 +283,7 @@\n }\n }\n \n-\/* render all windows *\/\n+\/* A wrapper to render all windows within the dashboard. *\/\n static void\n render_screens (void)\n {\n@@ -313,7 +317,7 @@\n display_content (main_win, logger, dash, &gscroll);\n }\n \n-\/* collapse the current expanded module *\/\n+\/* Collapse the current expanded module *\/\n static void\n collapse_current_module (void)\n {\n@@ -327,6 +331,8 @@\n render_screens ();\n }\n \n+\/* Display message a the bottom of the terminal dashboard that panel\n+ * is disabled *\/\n static void\n disabled_panel_msg (GModule module)\n {\n@@ -338,6 +344,7 @@\n color_error);\n }\n \n+\/* Set the current module\/panel *\/\n static void\n set_module_to (GScroll * scrll, GModule module)\n {\n@@ -351,6 +358,7 @@\n render_screens ();\n }\n \n+\/* Scroll expanded panel to the top *\/\n static void\n scroll_to_first_line (void)\n {\n@@ -362,6 +370,7 @@\n }\n }\n \n+\/* Scroll expanded panel to the last row *\/\n static void\n scroll_to_last_line (void)\n {\n@@ -379,6 +388,7 @@\n }\n }\n \n+\/* Load the user-agent window given the selected IP *\/\n static void\n load_ip_agent_list (void)\n {\n@@ -391,6 +401,7 @@\n load_agent_list (main_win, item.metrics->data);\n }\n \n+\/* Expand the selected module *\/\n static void\n expand_current_module (void)\n {\n@@ -399,6 +410,7 @@\n return;\n }\n \n+ \/* expanded, nothing to do... *\/\n if (gscroll.expanded)\n return;\n \n@@ -411,6 +423,7 @@\n allocate_data ();\n }\n \n+\/* Expand the clicked module *\/\n static void\n expand_on_mouse_click (void)\n {\n"} {"commit":"8714c0b86ad3285b481582d9e1eb6c3802a793fd","subject":"compare_rr_rrset: use strncasecmp rather than memcmp","message":"compare_rr_rrset: use strncasecmp rather than memcmp\n","repos":"hstern\/nmsg,hstern\/nmsg,hstern\/nmsg,hstern\/nmsg,hstern\/nmsg","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- wreck\/wdns\/msg\/compare_rr_rrset.c\n+++ wreck\/wdns\/msg\/compare_rr_rrset.c\n@@ -17,7 +17,7 @@\n \t rr->rrtype == rrset->rrtype &&\n \t rr->rrclass == rrset->rrclass)\n \t{\n-\t\treturn (memcmp(rr->name.data, rrset->name.data, rr->name.len) == 0);\n+\t\treturn (strncasecmp(rr->name.data, rrset->name.data, rr->name.len) == 0);\n \t}\n \n \treturn (false);\n"} {"commit":"b86bad705d760d52951db9ba439956827356e995","subject":"r12413\/sofa-dev : Add C = alpha * tr(A) * B + beta * C operation in cudamatrixutils","message":"r12413\/sofa-dev : Add C = alpha * tr(A) * B + beta * C operation in cudamatrixutils\n\n \/\/partial sync (1\/3 changes)\/\/\n\n\nFormer-commit-id: db0cb27e0bf3b9db665eb7772f002a74dcf35ec7","repos":"Anatoscope\/sofa,hdeling\/sofa,Anatoscope\/sofa,FabienPean\/sofa,FabienPean\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,Anatoscope\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,Anatoscope\/sofa,hdeling\/sofa,FabienPean\/sofa,hdeling\/sofa,hdeling\/sofa,hdeling\/sofa,hdeling\/sofa,FabienPean\/sofa,FabienPean\/sofa,FabienPean\/sofa,hdeling\/sofa,hdeling\/sofa,FabienPean\/sofa,Anatoscope\/sofa,FabienPean\/sofa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/sofa\/gpu\/cuda\/CudaTypesBase.h\n+++ modules\/sofa\/gpu\/cuda\/CudaTypesBase.h\n@@ -481,6 +481,11 @@\n return nnz;\n }\n \n+ void setNnz()\n+ {\n+ nnz = colptr[rowsize];\n+ }\n+\n static const char* Name();\n \n protected :\n"} {"commit":"f56a508a101086533de4d3174677ce167472a3fe","subject":"OpenCV: remove unneeded headers and variables","message":"OpenCV: remove unneeded headers and variables\n","repos":"vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/video_filter\/opencv_wrapper.c\n+++ modules\/video_filter\/opencv_wrapper.c\n@@ -35,12 +35,8 @@\n #include \n #include \n \n-#include \n-#include \n-\n #include \n #include \n-#include \n #include \"filter_picture.h\"\n \n #include \n@@ -155,7 +151,7 @@\n static int Create( vlc_object_t *p_this )\n {\n filter_t* p_filter = (filter_t*)p_this;\n- char *psz_chroma, *psz_output, *psz_verbosity;\n+ char *psz_chroma, *psz_output;\n \n \/* Allocate structure *\/\n p_filter->p_sys = malloc( sizeof( filter_sys_t ) );\n@@ -323,7 +319,6 @@\n \/\/ input video size\n CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height));\n video_format_t fmt_out;\n- double duration;\n filter_sys_t* p_sys = p_filter->p_sys;\n \n memset( &fmt_out, 0, sizeof(video_format_t) );\n"} {"commit":"b18ed8b16ab3696fa45bcf335b4624950b5ac823","subject":"MS:","message":"MS:\n\nBUG: did not pass dimension by reference\n\n","repos":"ITKTools\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,ITKTools\/ITKTools,sderaedt\/ITKTools,ITKTools\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,ITKTools\/ITKTools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/binaryimageoperator\/BinaryImageOperatorMainHelper.h\n+++ src\/binaryimageoperator\/BinaryImageOperatorMainHelper.h\n@@ -78,7 +78,7 @@\n std::string & ComponentTypeIn1,\n std::string & ComponentTypeIn2,\n std::string & ComponentTypeOut,\n- unsigned int inputDimension )\n+ unsigned int & inputDimension )\n {\n \/** Determine image properties of image 1. *\/\n std::string\tinputPixelType1 = \"\";\n"} {"commit":"bd3718f7b912b686bb39e27147111323235bbda3","subject":"pass remote (string) to %s on dprintf","message":"pass remote (string) to %s on dprintf\n","repos":"bbockelm\/condor-network-accounting,mambelli\/osg-bosco-marco,djw8605\/condor,neurodebian\/htcondor,clalancette\/condor-dcloud,neurodebian\/htcondor,mambelli\/osg-bosco-marco,bbockelm\/condor-network-accounting,bbockelm\/condor-network-accounting,clalancette\/condor-dcloud,zhangzhehust\/htcondor,djw8605\/htcondor,neurodebian\/htcondor,clalancette\/condor-dcloud,neurodebian\/htcondor,djw8605\/condor,htcondor\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,djw8605\/condor,mambelli\/osg-bosco-marco,htcondor\/htcondor,bbockelm\/condor-network-accounting,neurodebian\/htcondor,zhangzhehust\/htcondor,djw8605\/htcondor,zhangzhehust\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,djw8605\/condor,neurodebian\/htcondor,djw8605\/htcondor,bbockelm\/condor-network-accounting,zhangzhehust\/htcondor,neurodebian\/htcondor,clalancette\/condor-dcloud,zhangzhehust\/htcondor,mambelli\/osg-bosco-marco,htcondor\/htcondor,bbockelm\/condor-network-accounting,djw8605\/condor,clalancette\/condor-dcloud,djw8605\/condor,mambelli\/osg-bosco-marco,bbockelm\/condor-network-accounting,htcondor\/htcondor,bbockelm\/condor-network-accounting,htcondor\/htcondor,htcondor\/htcondor,djw8605\/htcondor,djw8605\/htcondor,zhangzhehust\/htcondor,djw8605\/condor,djw8605\/htcondor,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,clalancette\/condor-dcloud,djw8605\/htcondor,htcondor\/htcondor,zhangzhehust\/htcondor,zhangzhehust\/htcondor,djw8605\/htcondor,djw8605\/htcondor,clalancette\/condor-dcloud,djw8605\/condor,htcondor\/htcondor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/condor_syscall_lib\/xfer_file.c\n+++ src\/condor_syscall_lib\/xfer_file.c\n@@ -135,7 +135,7 @@\n \tremote_fd = open_file_stream( remote, O_RDONLY, &len );\n \tif( remote_fd < 0 ) {\n \t\tdprintf( D_ALWAYS, \"open_file_stream(%s,O_RDONLY,0x%x) failed\\n\",\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\tremote_fd, &len );\n+\t\t\t\t\t\t\t\t\t\t\t\t\t\tremote, &len );\n \t}\n \n \t\t\/* open the local file *\/\n"} {"commit":"293b873a81e0729151cd00b900587f1591579cb6","subject":"Do the check for NULL source string earlier; it is not that serious since mpg123_copy_string checks for that, though.","message":"Do the check for NULL source string earlier; it is not that serious since mpg123_copy_string checks for that, though.\n\n\ngit-svn-id: 793bb72743a407948e3701719c462b6a765bc435@1245 35dc7657-300d-0410-a2e5-dc2837fedb53\n","repos":"Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/id3print.c\n+++ src\/id3print.c\n@@ -13,6 +13,12 @@\n static void utf8_ascii(mpg123_string *dest, mpg123_string *source);\n static void transform(mpg123_string *dest, mpg123_string *source)\n {\n+\tdebug(\"transform!\");\n+\tif(source == NULL)\n+\t{\n+\t\tmpg123_set_string(dest, \"\");\n+\t\treturn;\n+\t}\n \tif(utf8env) mpg123_copy_string(source, dest);\n \telse utf8_ascii(dest, source);\n }\n@@ -276,11 +282,6 @@\n \tsize_t spos = 0;\n \tsize_t dlen = 0;\n \tchar *p;\n-\tif(source == NULL)\n-\t{\n-\t\tmpg123_set_string(dest, \"\");\n-\t\treturn;\n-\t}\n \t\/* Find length, continuation bytes don't count. *\/\n \tfor(spos=0; spos < source->fill; ++spos)\n \tif((source->p[spos] & 0xc0) == 0x80) continue;\n"} {"commit":"b1d3b36e3d93d4b3d06d81ecc0ea9a156c70450a","subject":"Add affinity to ev_poll_posix","message":"Add affinity to ev_poll_posix\n","repos":"hstefan\/grpc,PeterFaiman\/ruby-grpc-minimal,fuchsia-mirror\/third_party-grpc,royalharsh\/grpc,thinkerou\/grpc,MakMukhi\/grpc,quizlet\/grpc,leifurhauks\/grpc,quizlet\/grpc,malexzx\/grpc,chrisdunelm\/grpc,mehrdada\/grpc,royalharsh\/grpc,yugui\/grpc,hstefan\/grpc,donnadionne\/grpc,royalharsh\/grpc,ejona86\/grpc,carl-mastrangelo\/grpc,royalharsh\/grpc,nicolasnoble\/grpc,adelez\/grpc,matt-kwong\/grpc,perumaalgoog\/grpc,matt-kwong\/grpc,apolcyn\/grpc,a11r\/grpc,jtattermusch\/grpc,MakMukhi\/grpc,mehrdada\/grpc,pmarks-net\/grpc,a11r\/grpc,yugui\/grpc,kriswuollett\/grpc,thinkerou\/grpc,a-veitch\/grpc,kskalski\/grpc,wcevans\/grpc,leifurhauks\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,grpc\/grpc,yang-g\/grpc,kumaralokgithub\/grpc,soltanmm-google\/grpc,fuchsia-mirror\/third_party-grpc,grani\/grpc,grpc\/grpc,kpayson64\/grpc,kskalski\/grpc,geffzhang\/grpc,yongni\/grpc,ejona86\/grpc,Vizerai\/grpc,firebase\/grpc,muxi\/grpc,greasypizza\/grpc,bogdandrutu\/grpc,stanley-cheung\/grpc,philcleveland\/grpc,murgatroid99\/grpc,carl-mastrangelo\/grpc,mehrdada\/grpc,muxi\/grpc,nicolasnoble\/grpc,grpc\/grpc,grani\/grpc,pszemus\/grpc,pszemus\/grpc,baylabs\/grpc,bogdandrutu\/grpc,thinkerou\/grpc,ppietrasa\/grpc,msmania\/grpc,thinkerou\/grpc,grpc\/grpc,chrisdunelm\/grpc,PeterFaiman\/ruby-grpc-minimal,vsco\/grpc,jtattermusch\/grpc,apolcyn\/grpc,rjshade\/grpc,kpayson64\/grpc,daniel-j-born\/grpc,sreecha\/grpc,murgatroid99\/grpc,kumaralokgithub\/grpc,donnadionne\/grpc,philcleveland\/grpc,baylabs\/grpc,sreecha\/grpc,andrewpollock\/grpc,royalharsh\/grpc,ctiller\/grpc,pmarks-net\/grpc,thinkerou\/grpc,perumaalgoog\/grpc,makdharma\/grpc,mehrdada\/grpc,firebase\/grpc,podsvirov\/grpc,Vizerai\/grpc,dgquintas\/grpc,stanley-cheung\/grpc,Vizerai\/grpc,pmarks-net\/grpc,nicolasnoble\/grpc,ppietrasa\/grpc,jtattermusch\/grpc,PeterFaiman\/ruby-grpc-minimal,yang-g\/grpc,kpayson64\/grpc,msmania\/grpc,perumaalgoog\/grpc,infinit\/grpc,carl-mastrangelo\/grpc,firebase\/grpc,nicolasnoble\/grpc,kpayson64\/grpc,yang-g\/grpc,quizlet\/grpc,adelez\/grpc,vjpai\/grpc,7anner\/grpc,fuchsia-mirror\/third_party-grpc,a11r\/grpc,donnadionne\/grpc,baylabs\/grpc,ncteisen\/grpc,thinkerou\/grpc,dklempner\/grpc,quizlet\/grpc,Crevil\/grpc,ncteisen\/grpc,carl-mastrangelo\/grpc,adelez\/grpc,bogdandrutu\/grpc,zhimingxie\/grpc,dgquintas\/grpc,vjpai\/grpc,infinit\/grpc,andrewpollock\/grpc,adelez\/grpc,LuminateWireless\/grpc,infinit\/grpc,firebase\/grpc,carl-mastrangelo\/grpc,pmarks-net\/grpc,Vizerai\/grpc,perumaalgoog\/grpc,murgatroid99\/grpc,kskalski\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,a-veitch\/grpc,Vizerai\/grpc,podsvirov\/grpc,ctiller\/grpc,a11r\/grpc,pmarks-net\/grpc,dklempner\/grpc,kpayson64\/grpc,kriswuollett\/grpc,rjshade\/grpc,thunderboltsid\/grpc,stanley-cheung\/grpc,pszemus\/grpc,tengyifei\/grpc,sreecha\/grpc,podsvirov\/grpc,royalharsh\/grpc,7anner\/grpc,yongni\/grpc,kriswuollett\/grpc,yongni\/grpc,ipylypiv\/grpc,LuminateWireless\/grpc,bogdandrutu\/grpc,zhimingxie\/grpc,mehrdada\/grpc,greasypizza\/grpc,ctiller\/grpc,nicolasnoble\/grpc,jcanizales\/grpc,pszemus\/grpc,nicolasnoble\/grpc,yang-g\/grpc,muxi\/grpc,y-zeng\/grpc,ctiller\/grpc,chrisdunelm\/grpc,muxi\/grpc,rjshade\/grpc,perumaalgoog\/grpc,zhimingxie\/grpc,soltanmm\/grpc,7anner\/grpc,jtattermusch\/grpc,kskalski\/grpc,nicolasnoble\/grpc,kumaralokgithub\/grpc,dklempner\/grpc,arkmaxim\/grpc,geffzhang\/grpc,adelez\/grpc,MakMukhi\/grpc,wcevans\/grpc,sreecha\/grpc,yongni\/grpc,ctiller\/grpc,mehrdada\/grpc,jcanizales\/grpc,andrewpollock\/grpc,grpc\/grpc,deepaklukose\/grpc,ipylypiv\/grpc,podsvirov\/grpc,grani\/grpc,a11r\/grpc,PeterFaiman\/ruby-grpc-minimal,vsco\/grpc,bogdandrutu\/grpc,jboeuf\/grpc,thunderboltsid\/grpc,pszemus\/grpc,greasypizza\/grpc,a11r\/grpc,rjshade\/grpc,a-veitch\/grpc,jboeuf\/grpc,PeterFaiman\/ruby-grpc-minimal,pmarks-net\/grpc,firebase\/grpc,geffzhang\/grpc,greasypizza\/grpc,ejona86\/grpc,ppietrasa\/grpc,royalharsh\/grpc,tengyifei\/grpc,msmania\/grpc,arkmaxim\/grpc,yugui\/grpc,donnadionne\/grpc,7anner\/grpc,wcevans\/grpc,Vizerai\/grpc,soltanmm\/grpc,infinit\/grpc,thunderboltsid\/grpc,kumaralokgithub\/grpc,yugui\/grpc,MakMukhi\/grpc,grpc\/grpc,chrisdunelm\/grpc,fuchsia-mirror\/third_party-grpc,bogdandrutu\/grpc,dklempner\/grpc,zhimingxie\/grpc,mehrdada\/grpc,arkmaxim\/grpc,wcevans\/grpc,daniel-j-born\/grpc,malexzx\/grpc,greasypizza\/grpc,geffzhang\/grpc,makdharma\/grpc,leifurhauks\/grpc,ipylypiv\/grpc,7anner\/grpc,soltanmm\/grpc,muxi\/grpc,thunderboltsid\/grpc,jtattermusch\/grpc,carl-mastrangelo\/grpc,matt-kwong\/grpc,ncteisen\/grpc,LuminateWireless\/grpc,sreecha\/grpc,ctiller\/grpc,murgatroid99\/grpc,ncteisen\/grpc,jboeuf\/grpc,simonkuang\/grpc,infinit\/grpc,daniel-j-born\/grpc,LuminateWireless\/grpc,kskalski\/grpc,thunderboltsid\/grpc,jboeuf\/grpc,jboeuf\/grpc,carl-mastrangelo\/grpc,yongni\/grpc,daniel-j-born\/grpc,zhimingxie\/grpc,vjpai\/grpc,soltanmm-google\/grpc,mehrdada\/grpc,jtattermusch\/grpc,geffzhang\/grpc,donnadionne\/grpc,jtattermusch\/grpc,kumaralokgithub\/grpc,hstefan\/grpc,donnadionne\/grpc,ncteisen\/grpc,donnadionne\/grpc,philcleveland\/grpc,zhimingxie\/grpc,simonkuang\/grpc,muxi\/grpc,soltanmm\/grpc,ncteisen\/grpc,donnadionne\/grpc,ejona86\/grpc,fuchsia-mirror\/third_party-grpc,kskalski\/grpc,carl-mastrangelo\/grpc,msmania\/grpc,ppietrasa\/grpc,soltanmm\/grpc,stanley-cheung\/grpc,donnadionne\/grpc,vjpai\/grpc,simonkuang\/grpc,Crevil\/grpc,malexzx\/grpc,philcleveland\/grpc,malexzx\/grpc,matt-kwong\/grpc,wcevans\/grpc,LuminateWireless\/grpc,perumaalgoog\/grpc,a11r\/grpc,makdharma\/grpc,pmarks-net\/grpc,ncteisen\/grpc,ipylypiv\/grpc,LuminateWireless\/grpc,kriswuollett\/grpc,podsvirov\/grpc,stanley-cheung\/grpc,philcleveland\/grpc,PeterFaiman\/ruby-grpc-minimal,PeterFaiman\/ruby-grpc-minimal,sreecha\/grpc,fuchsia-mirror\/third_party-grpc,andrewpollock\/grpc,ejona86\/grpc,donnadionne\/grpc,quizlet\/grpc,yugui\/grpc,zhimingxie\/grpc,dklempner\/grpc,ejona86\/grpc,malexzx\/grpc,kskalski\/grpc,murgatroid99\/grpc,jtattermusch\/grpc,pmarks-net\/grpc,podsvirov\/grpc,nicolasnoble\/grpc,andrewpollock\/grpc,podsvirov\/grpc,simonkuang\/grpc,philcleveland\/grpc,kriswuollett\/grpc,jtattermusch\/grpc,Vizerai\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,muxi\/grpc,thinkerou\/grpc,murgatroid99\/grpc,a-veitch\/grpc,carl-mastrangelo\/grpc,grpc\/grpc,a-veitch\/grpc,chrisdunelm\/grpc,Crevil\/grpc,thinkerou\/grpc,jtattermusch\/grpc,ejona86\/grpc,carl-mastrangelo\/grpc,chrisdunelm\/grpc,yugui\/grpc,LuminateWireless\/grpc,a-veitch\/grpc,Vizerai\/grpc,ipylypiv\/grpc,leifurhauks\/grpc,hstefan\/grpc,jboeuf\/grpc,arkmaxim\/grpc,deepaklukose\/grpc,apolcyn\/grpc,ncteisen\/grpc,mehrdada\/grpc,andrewpollock\/grpc,thinkerou\/grpc,quizlet\/grpc,soltanmm-google\/grpc,msmania\/grpc,Vizerai\/grpc,yang-g\/grpc,adelez\/grpc,thunderboltsid\/grpc,msmania\/grpc,yugui\/grpc,vsco\/grpc,yang-g\/grpc,soltanmm-google\/grpc,chrisdunelm\/grpc,ipylypiv\/grpc,sreecha\/grpc,wcevans\/grpc,yongni\/grpc,apolcyn\/grpc,rjshade\/grpc,a-veitch\/grpc,daniel-j-born\/grpc,simonkuang\/grpc,ejona86\/grpc,apolcyn\/grpc,ejona86\/grpc,chrisdunelm\/grpc,arkmaxim\/grpc,podsvirov\/grpc,vsco\/grpc,dgquintas\/grpc,perumaalgoog\/grpc,ncteisen\/grpc,geffzhang\/grpc,stanley-cheung\/grpc,apolcyn\/grpc,wcevans\/grpc,infinit\/grpc,vjpai\/grpc,y-zeng\/grpc,firebase\/grpc,dklempner\/grpc,jcanizales\/grpc,nicolasnoble\/grpc,deepaklukose\/grpc,jcanizales\/grpc,msmania\/grpc,a11r\/grpc,muxi\/grpc,kpayson64\/grpc,donnadionne\/grpc,matt-kwong\/grpc,stanley-cheung\/grpc,Crevil\/grpc,geffzhang\/grpc,murgatroid99\/grpc,rjshade\/grpc,dgquintas\/grpc,baylabs\/grpc,nicolasnoble\/grpc,firebase\/grpc,apolcyn\/grpc,infinit\/grpc,muxi\/grpc,greasypizza\/grpc,Crevil\/grpc,kriswuollett\/grpc,msmania\/grpc,dklempner\/grpc,arkmaxim\/grpc,daniel-j-born\/grpc,malexzx\/grpc,soltanmm-google\/grpc,baylabs\/grpc,daniel-j-born\/grpc,vjpai\/grpc,baylabs\/grpc,y-zeng\/grpc,leifurhauks\/grpc,ctiller\/grpc,ppietrasa\/grpc,ctiller\/grpc,vsco\/grpc,deepaklukose\/grpc,arkmaxim\/grpc,vsco\/grpc,grani\/grpc,soltanmm-google\/grpc,muxi\/grpc,muxi\/grpc,jcanizales\/grpc,royalharsh\/grpc,grpc\/grpc,sreecha\/grpc,wcevans\/grpc,y-zeng\/grpc,ncteisen\/grpc,chrisdunelm\/grpc,pszemus\/grpc,sreecha\/grpc,vjpai\/grpc,a-veitch\/grpc,pmarks-net\/grpc,ppietrasa\/grpc,Crevil\/grpc,adelez\/grpc,tengyifei\/grpc,dklempner\/grpc,grpc\/grpc,malexzx\/grpc,stanley-cheung\/grpc,baylabs\/grpc,simonkuang\/grpc,royalharsh\/grpc,grani\/grpc,thinkerou\/grpc,jcanizales\/grpc,carl-mastrangelo\/grpc,grpc\/grpc,MakMukhi\/grpc,jboeuf\/grpc,tengyifei\/grpc,bogdandrutu\/grpc,andrewpollock\/grpc,soltanmm-google\/grpc,arkmaxim\/grpc,Crevil\/grpc,philcleveland\/grpc,PeterFaiman\/ruby-grpc-minimal,ipylypiv\/grpc,pszemus\/grpc,kpayson64\/grpc,quizlet\/grpc,grpc\/grpc,apolcyn\/grpc,deepaklukose\/grpc,perumaalgoog\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,thunderboltsid\/grpc,vsco\/grpc,dgquintas\/grpc,soltanmm-google\/grpc,vjpai\/grpc,geffzhang\/grpc,firebase\/grpc,ctiller\/grpc,yongni\/grpc,kriswuollett\/grpc,greasypizza\/grpc,greasypizza\/grpc,matt-kwong\/grpc,quizlet\/grpc,soltanmm\/grpc,y-zeng\/grpc,7anner\/grpc,firebase\/grpc,hstefan\/grpc,wcevans\/grpc,quizlet\/grpc,kpayson64\/grpc,perumaalgoog\/grpc,y-zeng\/grpc,jboeuf\/grpc,makdharma\/grpc,LuminateWireless\/grpc,murgatroid99\/grpc,malexzx\/grpc,tengyifei\/grpc,vjpai\/grpc,carl-mastrangelo\/grpc,grani\/grpc,murgatroid99\/grpc,jboeuf\/grpc,deepaklukose\/grpc,thinkerou\/grpc,donnadionne\/grpc,Crevil\/grpc,soltanmm\/grpc,infinit\/grpc,yang-g\/grpc,bogdandrutu\/grpc,philcleveland\/grpc,philcleveland\/grpc,grani\/grpc,kriswuollett\/grpc,greasypizza\/grpc,y-zeng\/grpc,tengyifei\/grpc,vsco\/grpc,Vizerai\/grpc,vsco\/grpc,leifurhauks\/grpc,yang-g\/grpc,yongni\/grpc,kumaralokgithub\/grpc,ejona86\/grpc,firebase\/grpc,a11r\/grpc,baylabs\/grpc,baylabs\/grpc,7anner\/grpc,pszemus\/grpc,zhimingxie\/grpc,jcanizales\/grpc,ncteisen\/grpc,PeterFaiman\/ruby-grpc-minimal,firebase\/grpc,leifurhauks\/grpc,fuchsia-mirror\/third_party-grpc,soltanmm\/grpc,grpc\/grpc,sreecha\/grpc,makdharma\/grpc,matt-kwong\/grpc,deepaklukose\/grpc,leifurhauks\/grpc,kpayson64\/grpc,simonkuang\/grpc,7anner\/grpc,podsvirov\/grpc,yang-g\/grpc,msmania\/grpc,dgquintas\/grpc,jcanizales\/grpc,y-zeng\/grpc,rjshade\/grpc,y-zeng\/grpc,stanley-cheung\/grpc,makdharma\/grpc,rjshade\/grpc,dklempner\/grpc,LuminateWireless\/grpc,soltanmm-google\/grpc,MakMukhi\/grpc,ctiller\/grpc,yugui\/grpc,makdharma\/grpc,dgquintas\/grpc,makdharma\/grpc,leifurhauks\/grpc,tengyifei\/grpc,hstefan\/grpc,ppietrasa\/grpc,daniel-j-born\/grpc,kriswuollett\/grpc,jboeuf\/grpc,ncteisen\/grpc,simonkuang\/grpc,matt-kwong\/grpc,kumaralokgithub\/grpc,chrisdunelm\/grpc,hstefan\/grpc,zhimingxie\/grpc,ipylypiv\/grpc,sreecha\/grpc,jtattermusch\/grpc,pszemus\/grpc,grani\/grpc,fuchsia-mirror\/third_party-grpc,kskalski\/grpc,thinkerou\/grpc,yugui\/grpc,andrewpollock\/grpc,grani\/grpc,jtattermusch\/grpc,pszemus\/grpc,a-veitch\/grpc,MakMukhi\/grpc,MakMukhi\/grpc,thunderboltsid\/grpc,tengyifei\/grpc,Vizerai\/grpc,malexzx\/grpc,ctiller\/grpc,kumaralokgithub\/grpc,mehrdada\/grpc,pszemus\/grpc,adelez\/grpc,ppietrasa\/grpc,infinit\/grpc,vjpai\/grpc,arkmaxim\/grpc,andrewpollock\/grpc,firebase\/grpc,dgquintas\/grpc,kumaralokgithub\/grpc,bogdandrutu\/grpc,yongni\/grpc,ctiller\/grpc,simonkuang\/grpc,ejona86\/grpc,kskalski\/grpc,7anner\/grpc,dgquintas\/grpc,jcanizales\/grpc,deepaklukose\/grpc,MakMukhi\/grpc,mehrdada\/grpc,hstefan\/grpc,PeterFaiman\/ruby-grpc-minimal,ejona86\/grpc,mehrdada\/grpc,apolcyn\/grpc,muxi\/grpc,matt-kwong\/grpc,fuchsia-mirror\/third_party-grpc,soltanmm\/grpc,daniel-j-born\/grpc,ppietrasa\/grpc,murgatroid99\/grpc,Crevil\/grpc,adelez\/grpc,chrisdunelm\/grpc,thunderboltsid\/grpc,kpayson64\/grpc,jboeuf\/grpc,makdharma\/grpc,jboeuf\/grpc,kpayson64\/grpc,pszemus\/grpc,deepaklukose\/grpc,sreecha\/grpc,tengyifei\/grpc,dgquintas\/grpc,vjpai\/grpc,nicolasnoble\/grpc,hstefan\/grpc,geffzhang\/grpc,rjshade\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/lib\/iomgr\/ev_poll_posix.c\n+++ src\/core\/lib\/iomgr\/ev_poll_posix.c\n@@ -113,6 +113,9 @@\n grpc_closure *on_done_closure;\n \n grpc_iomgr_object iomgr_object;\n+\n+ \/* The pollset that last noticed and notified that the fd is readable *\/\n+ grpc_pollset *read_notifier_pollset;\n };\n \n \/* Begin polling on an fd.\n@@ -134,7 +137,8 @@\n if got_read or got_write are 1, also does the become_{readable,writable} as\n appropriate. *\/\n static void fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *rec,\n- int got_read, int got_write);\n+ int got_read, int got_write,\n+ grpc_pollset *read_notifier_pollset);\n \n \/* Return 1 if this fd is orphaned, 0 otherwise *\/\n static bool fd_is_orphaned(grpc_fd *fd);\n@@ -301,6 +305,7 @@\n r->on_done_closure = NULL;\n r->closed = 0;\n r->released = 0;\n+ r->read_notifier_pollset = NULL;\n \n char *name2;\n gpr_asprintf(&name2, \"%s fd=%d\", name, fd);\n@@ -314,6 +319,18 @@\n \n static bool fd_is_orphaned(grpc_fd *fd) {\n return (gpr_atm_acq_load(&fd->refst) & 1) == 0;\n+}\n+\n+\/* Return the read-notifier pollset *\/\n+static grpc_pollset *fd_get_read_notifier_pollset(grpc_exec_ctx *exec_ctx,\n+ grpc_fd *fd) {\n+ grpc_pollset *notifier = NULL;\n+\n+ gpr_mu_lock(&fd->mu);\n+ notifier = fd->read_notifier_pollset;\n+ gpr_mu_unlock(&fd->mu);\n+\n+ return notifier;\n }\n \n static void pollset_kick_locked(grpc_fd_watcher *watcher) {\n@@ -444,6 +461,11 @@\n }\n }\n \n+static void set_read_notifier_pollset_locked(\n+ grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_pollset *read_notifier_pollset) {\n+ fd->read_notifier_pollset = read_notifier_pollset;\n+}\n+\n static void fd_shutdown(grpc_exec_ctx *exec_ctx, grpc_fd *fd) {\n gpr_mu_lock(&fd->mu);\n GPR_ASSERT(!fd->shutdown);\n@@ -519,7 +541,8 @@\n }\n \n static void fd_end_poll(grpc_exec_ctx *exec_ctx, grpc_fd_watcher *watcher,\n- int got_read, int got_write) {\n+ int got_read, int got_write,\n+ grpc_pollset *read_notifier_pollset) {\n int was_polling = 0;\n int kick = 0;\n grpc_fd *fd = watcher->fd;\n@@ -554,6 +577,9 @@\n if (got_read) {\n if (set_ready_locked(exec_ctx, fd, &fd->read_closure)) {\n kick = 1;\n+ }\n+ if (read_notifier_pollset != NULL) {\n+ set_read_notifier_pollset_locked(exec_ctx, fd, read_notifier_pollset);\n }\n }\n if (got_write) {\n@@ -899,11 +925,11 @@\n gpr_log(GPR_ERROR, \"poll() failed: %s\", strerror(errno));\n }\n for (i = 2; i < pfd_count; i++) {\n- fd_end_poll(exec_ctx, &watchers[i], 0, 0);\n+ fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL);\n }\n } else if (r == 0) {\n for (i = 2; i < pfd_count; i++) {\n- fd_end_poll(exec_ctx, &watchers[i], 0, 0);\n+ fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL);\n }\n } else {\n if (pfds[0].revents & POLLIN_CHECK) {\n@@ -914,10 +940,10 @@\n }\n for (i = 2; i < pfd_count; i++) {\n if (watchers[i].fd == NULL) {\n- fd_end_poll(exec_ctx, &watchers[i], 0, 0);\n+ fd_end_poll(exec_ctx, &watchers[i], 0, 0, NULL);\n } else {\n fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN_CHECK,\n- pfds[i].revents & POLLOUT_CHECK);\n+ pfds[i].revents & POLLOUT_CHECK, pollset);\n }\n }\n }\n@@ -1181,6 +1207,7 @@\n .fd_shutdown = fd_shutdown,\n .fd_notify_on_read = fd_notify_on_read,\n .fd_notify_on_write = fd_notify_on_write,\n+ .fd_get_read_notifier_pollset = fd_get_read_notifier_pollset,\n \n .pollset_init = pollset_init,\n .pollset_shutdown = pollset_shutdown,\n"} {"commit":"622b9df98ffe8145f7568e400b803f46c69416b8","subject":"refactor cuda binary math ops","message":"refactor cuda binary math ops\n","repos":"nudles\/incubator-singa,apache\/incubator-singa,apache\/incubator-singa,nudles\/incubator-singa,nudles\/incubator-singa,apache\/incubator-singa,apache\/incubator-singa,apache\/incubator-singa,nudles\/incubator-singa,nudles\/incubator-singa","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/tensor\/tensor_math_cuda.h\n+++ src\/core\/tensor\/tensor_math_cuda.h\n@@ -207,95 +207,6 @@\n return in1Bc;\n }\n \n-\/\/\/ out = in1 + in2\n-template <>\n-void Add(const Tensor& in1,\n- const Tensor& in2, Tensor* out, Context* ctx) {\n-\n- float alpha1 = 1.0;\n- float alpha2 = 1.0;\n- float beta = 0.0;\n-\n- const float* inPtr1 = static_cast(in1.block()->data());\n- const float* inPtr2 = static_cast(in2.block()->data());\n- float* outPtr = static_cast(out->block()->mutable_data());\n-\n- \/\/ In the simplest case, use the most efficient cuda math kernal\n- if ((!in1.transpose() && !in2.transpose()) && (in1.stride() == in2.stride()) && in1.nDim() == in2.nDim()){\n- cuda::add(in1.Size(), inPtr1, inPtr2, outPtr, ctx->stream);\n- } \n- else { \/\/ else we use the cudnn with broadcast function\n- \/\/ if stride has 0, the tensor is broadcasted.\n- int strideProduct = 1;\n- for(const auto &i: in1.stride())\n- strideProduct *= i;\n- for(const auto &i: in2.stride())\n- strideProduct *= i;\n-\n- const float* _inPtr1;\n- cudnnTensorDescriptor_t in1NdDesc;\n- if (strideProduct != 0) {\n- _inPtr1 = inPtr1;\n- in1NdDesc = generate_tensor_nd_desc(in1);\n- } else {\n- Tensor in1Bc = get_broadcasted_tensor(in1, ctx);\n- _inPtr1 = static_cast(in1Bc.block()->data());\n- in1NdDesc = generate_tensor_nd_desc(in1Bc);\n- }\n-\n- check_cudnn(cudnnOpTensor(ctx->cudnn_handle, generate_op_desc(CUDNN_OP_TENSOR_ADD),\n- (void*)(&alpha1), in1NdDesc, _inPtr1,\n- (void*)(&alpha2), generate_tensor_nd_desc(in2), inPtr2,\n- (void*)(&beta), generate_tensor_nd_desc(*out), outPtr\n- ));\n- }\n-\n-}\n-\n-\/\/\/ out = in1 - in2\n-template <>\n-void Sub(const Tensor& in1,\n- const Tensor& in2, Tensor* out, Context* ctx) {\n- float alpha1 = 1.0;\n- float alpha2 = -1.0;\n- float beta = 0.0;\n-\n- const float* inPtr1 = static_cast(in1.block()->data());\n- const float* inPtr2 = static_cast(in2.block()->data());\n- float* outPtr = static_cast(out->block()->mutable_data());\n-\n- \/\/ In the simplest case, use the most efficient cuda math kernal\n- if ((!in1.transpose() && !in2.transpose()) && (in1.stride() == in2.stride()) && in1.nDim() == in2.nDim()){\n- cuda::sub(in1.Size(), inPtr1, inPtr2, outPtr, ctx->stream);\n- } \n- else { \/\/ else we use the cudnn with broadcast function\n- \/\/ if stride has 0, the tensor is broadcasted.\n- int strideProduct = 1;\n- for(const auto &i: in1.stride())\n- strideProduct *= i;\n- for(const auto &i: in2.stride())\n- strideProduct *= i;\n-\n- const float* _inPtr1;\n- cudnnTensorDescriptor_t in1NdDesc;\n- if (strideProduct != 0) {\n- _inPtr1 = inPtr1;\n- in1NdDesc = generate_tensor_nd_desc(in1);\n- } else {\n- Tensor in1Bc = get_broadcasted_tensor(in1, ctx);\n- _inPtr1 = static_cast(in1Bc.block()->data());\n- in1NdDesc = generate_tensor_nd_desc(in1Bc);\n- }\n-\n- check_cudnn(cudnnOpTensor(ctx->cudnn_handle, generate_op_desc(CUDNN_OP_TENSOR_ADD),\n- (void*)(&alpha1), in1NdDesc, _inPtr1,\n- (void*)(&alpha2), generate_tensor_nd_desc(in2), inPtr2,\n- (void*)(&beta), generate_tensor_nd_desc(*out), outPtr\n- ));\n- }\n-\n-}\n-\n template <>\n void Transform(const Tensor& in, Tensor* out,\n Context* ctx) {\n@@ -312,6 +223,75 @@\n \n }\n \n+\/\/\/ add sub div mul pow on two tensors\n+#define GenBinaryMathFn(fn, kernel) \\\n+ template <> \\\n+ void fn(const Tensor &in1, const Tensor &in2, \\\n+ Tensor *out, Context *ctx) { \\\n+ const float *inPtr1 = static_cast(in1.block()->data()); \\\n+ const float *inPtr2 = static_cast(in2.block()->data()); \\\n+ float *outPtr = static_cast(out->block()->mutable_data()); \\\n+ const size_t num = out->Size(); \\\n+ \\\n+ int strideProduct1 = 1; \\\n+ for (const auto &i : in1.stride()) \\\n+ strideProduct1 *= i; \\\n+ \\\n+ int strideProduct2 = 1; \\\n+ for (const auto &i : in2.stride()) \\\n+ strideProduct2 *= i; \\\n+ \\\n+ if ((strideProduct1 * strideProduct2) != 0) { \\\n+ \\\n+ if (!in1.transpose() && !in2.transpose() && \\\n+ (in1.stride() == in2.stride())) { \\\n+ kernel(num, inPtr1, inPtr2, outPtr, ctx->stream); \\\n+ } else { \\\n+ if (in1.transpose() && in2.transpose()) { \\\n+ Tensor t(in1.shape(), in1.device(), in1.data_type()); \\\n+ Transform(in1, &t, ctx); \\\n+ Transform(in2, out, ctx); \\\n+ \\\n+ float *tPtr = static_cast(t.block()->mutable_data()); \\\n+ kernel(num, tPtr, outPtr, outPtr, ctx->stream); \\\n+ } else if (in1.transpose()) { \\\n+ Transform(in1, out, ctx); \\\n+ kernel(num, outPtr, inPtr2, outPtr, ctx->stream); \\\n+ } else if (in2.transpose()) { \\\n+ Transform(in2, out, ctx); \\\n+ kernel(num, inPtr1, outPtr, outPtr, ctx->stream); \\\n+ } \\\n+ } \\\n+ } else { \\\n+ \\\n+ Tensor in1Bc; \\\n+ Tensor in2Bc; \\\n+ if (strideProduct1 == 0) { \\\n+ in1Bc = get_broadcasted_tensor(in1, ctx); \\\n+ inPtr1 = static_cast(in1Bc.block()->data()); \\\n+ } \\\n+ \\\n+ if (strideProduct2 == 0) { \\\n+ in2Bc = get_broadcasted_tensor(in2, ctx); \\\n+ inPtr2 = static_cast(in2Bc.block()->data()); \\\n+ } \\\n+ \\\n+ kernel(num, inPtr1, inPtr2, outPtr, ctx->stream); \\\n+ } \\\n+ }\n+\n+\/\/\/ out = in1 * in2\n+GenBinaryMathFn(EltwiseMult, cuda::mult);\n+\/\/\/ out = in1 + in2\n+GenBinaryMathFn(Add, cuda::add);\n+\/\/\/ out = in1 - in2\n+GenBinaryMathFn(Sub, cuda::sub);\n+\/\/\/ out = in1 \/ in2\n+GenBinaryMathFn(Div, cuda::div);\n+\/\/\/ out = in1 ^ in2\n+GenBinaryMathFn(Pow, cuda::pow);\n+\n+\n \/\/\/ Element-wise operation, clamp every element into [low, high]\n \/\/\/ if x>high, then x=high; if x\n@@ -330,63 +310,6 @@\n }\n }\n \n-\/\/\/ out = in1 \/ in2\n-template <>\n-void Div(const Tensor& in1,\n- const Tensor& in2, Tensor* out, Context* ctx) {\n- const float* inPtr1 = static_cast(in1.block()->data());\n- const float* inPtr2 = static_cast(in2.block()->data());\n- float* outPtr = static_cast(out->block()->mutable_data());\n- const size_t num = out->Size();\n-\n- int strideProduct1 = 1;\n- for(const auto &i: in1.stride())\n- strideProduct1 *= i;\n-\n- int strideProduct2 = 1;\n- for(const auto &i: in2.stride())\n- strideProduct2 *= i;\n-\n- const float* _inPtr1;\n- cudnnTensorDescriptor_t in1NdDesc;\n- if ( (strideProduct1 * strideProduct2) != 0) { \/\/When there is no need to broadcast, use the efficient kernal\n-\n- if (!in1.transpose() && !in2.transpose() && (in1.stride() == in2.stride())) {\n- cuda::div(num, inPtr1, inPtr2, outPtr, ctx->stream);\n- } else { \/\/else we check whether in1 or in2 or both are transposed\n- if (in1.transpose() && in2.transpose()) {\n- Tensor t(in1.shape(), in1.device(), in1.data_type());\n- Transform(in1, &t, ctx);\n- Transform(in2, out, ctx);\n-\n- float* tPtr = static_cast(t.block()->mutable_data());\n- cuda::div(num, tPtr, outPtr, outPtr, ctx->stream);\n- } else if (in1.transpose()) {\n- Transform(in1, out, ctx);\n- cuda::div(num, outPtr, inPtr2, outPtr, ctx->stream);\n- } else if (in2.transpose()) {\n- Transform(in2, out, ctx);\n- cuda::div(num, inPtr1, outPtr, outPtr, ctx->stream);\n- }\n- }\n- } else { \/\/When we need broadcasting:\n-\n- Tensor in1Bc;\n- Tensor in2Bc;\n- if(strideProduct1 == 0){\n- in1Bc = get_broadcasted_tensor(in1,ctx);\n- inPtr1 = static_cast(in1Bc.block()->data());\n- }\n-\n- if(strideProduct2 == 0){\n- in2Bc = get_broadcasted_tensor(in2,ctx);\n- inPtr2 = static_cast(in2Bc.block()->data());\n- }\n-\n- cuda::div(num, inPtr1, inPtr2, outPtr, ctx->stream);\n- }\n-}\n-\n template <>\n void Div(const float x, const Tensor& in,\n Tensor* out, Context* ctx) {\n@@ -410,64 +333,6 @@\n float* outPtr = static_cast(out->block()->mutable_data());\n const size_t num = in.Size();\n cuda::mult(num, inPtr, x, outPtr, ctx->stream);\n-}\n-\n-\/\/\/ out = in1 * in2\n-template <>\n-void EltwiseMult(const Tensor& in1,\n- const Tensor& in2, Tensor* out,\n- Context* ctx) {\n- const float* inPtr1 = static_cast(in1.block()->data());\n- const float* inPtr2 = static_cast(in2.block()->data());\n- float* outPtr = static_cast(out->block()->mutable_data());\n- const size_t num = out->Size();\n-\n- int strideProduct1 = 1;\n- for(const auto &i: in1.stride())\n- strideProduct1 *= i;\n-\n- int strideProduct2 = 1;\n- for(const auto &i: in2.stride())\n- strideProduct2 *= i;\n-\n- const float* _inPtr1;\n- cudnnTensorDescriptor_t in1NdDesc;\n- if ( (strideProduct1 * strideProduct2) != 0) { \/\/When there is no need to broadcast, use the efficient kernal\n-\n- if (!in1.transpose() && !in2.transpose() && (in1.stride() == in2.stride())) {\n- cuda::mult(num, inPtr1, inPtr2, outPtr, ctx->stream);\n- } else { \/\/else we check whether in1 or in2 or both are transposed\n- if (in1.transpose() && in2.transpose()) {\n- Tensor t(in1.shape(), in1.device(), in1.data_type());\n- Transform(in1, &t, ctx);\n- Transform(in2, out, ctx);\n-\n- float* tPtr = static_cast(t.block()->mutable_data());\n- cuda::mult(num, tPtr, outPtr, outPtr, ctx->stream);\n- } else if (in1.transpose()) {\n- Transform(in1, out, ctx);\n- cuda::mult(num, outPtr, inPtr2, outPtr, ctx->stream);\n- } else if (in2.transpose()) {\n- Transform(in2, out, ctx);\n- cuda::mult(num, inPtr1, outPtr, outPtr, ctx->stream);\n- }\n- }\n- } else { \/\/When we need broadcasting:\n-\n- Tensor in1Bc;\n- Tensor in2Bc;\n- if(strideProduct1 == 0){\n- in1Bc = get_broadcasted_tensor(in1,ctx);\n- inPtr1 = static_cast(in1Bc.block()->data());\n- }\n-\n- if(strideProduct2 == 0){\n- in2Bc = get_broadcasted_tensor(in2,ctx);\n- inPtr2 = static_cast(in2Bc.block()->data());\n- }\n-\n- cuda::mult(num, inPtr1, inPtr2, outPtr, ctx->stream);\n- }\n }\n \n \n@@ -609,62 +474,6 @@\n } else { \/\/else we transform in to out to store first\n Transform(in, out, ctx);\n cuda::pow(num, outPtr, x, outPtr, ctx->stream);\n- }\n-}\n-\/\/\/ Element-wise operation, out[i] = in1[i]^in2[i]\n-template <>\n-void Pow(const Tensor& in1,\n- const Tensor& in2, Tensor* out, Context* ctx) {\n- const float* inPtr1 = static_cast(in1.block()->data());\n- const float* inPtr2 = static_cast(in2.block()->data());\n- float* outPtr = static_cast(out->block()->mutable_data());\n- const size_t num = out->Size();\n-\n- int strideProduct1 = 1;\n- for(const auto &i: in1.stride())\n- strideProduct1 *= i;\n-\n- int strideProduct2 = 1;\n- for(const auto &i: in2.stride())\n- strideProduct2 *= i;\n-\n- const float* _inPtr1;\n- cudnnTensorDescriptor_t in1NdDesc;\n- if ( (strideProduct1 * strideProduct2) != 0) { \/\/When there is no need to broadcast, use the efficient kernal\n-\n- if (!in1.transpose() && !in2.transpose() && (in1.stride() == in2.stride())) {\n- cuda::pow(num, inPtr1, inPtr2, outPtr, ctx->stream);\n- } else { \/\/else we check whether in1 or in2 or both are transposed\n- if (in1.transpose() && in2.transpose()) {\n- Tensor t(in1.shape(), in1.device(), in1.data_type());\n- Transform(in1, &t, ctx);\n- Transform(in2, out, ctx);\n-\n- float* tPtr = static_cast(t.block()->mutable_data());\n- cuda::pow(num, tPtr, outPtr, outPtr, ctx->stream);\n- } else if (in1.transpose()) {\n- Transform(in1, out, ctx);\n- cuda::pow(num, outPtr, inPtr2, outPtr, ctx->stream);\n- } else if (in2.transpose()) {\n- Transform(in2, out, ctx);\n- cuda::pow(num, inPtr1, outPtr, outPtr, ctx->stream);\n- }\n- }\n- } else { \/\/When we need broadcasting:\n-\n- Tensor in1Bc;\n- Tensor in2Bc;\n- if(strideProduct1 == 0){\n- in1Bc = get_broadcasted_tensor(in1,ctx);\n- inPtr1 = static_cast(in1Bc.block()->data());\n- }\n-\n- if(strideProduct2 == 0){\n- in2Bc = get_broadcasted_tensor(in2,ctx);\n- inPtr2 = static_cast(in2Bc.block()->data());\n- }\n-\n- cuda::pow(num, inPtr1, inPtr2, outPtr, ctx->stream);\n }\n }\n \n@@ -1146,7 +955,7 @@\n if (axis < 0) axis = in.shape().size() + axis;\n \n Shape coerced_shape = {1, 1};\n- for (int i = 0; i < in.shape().size(); i++) {\n+ for (std::size_t i = 0, max = in.shape().size(); i != max; ++i) {\n if (i < axis)\n coerced_shape[0] *= in.shape()[i];\n else\n"} {"commit":"aff44bcc16aa6aaf3c7efcef907ca25cbdb4ec8c","subject":"erts: Refactor erl_db_catree.c","message":"erts: Refactor erl_db_catree.c\n\nwith some code moving and removed obsolete comments.\n","repos":"ferd\/otp,mikpe\/otp,electricimp\/otp,uabboli\/otp,dgud\/otp,erlang\/otp,electricimp\/otp,emacsmirror\/erlang,vinoski\/otp,dumbbell\/otp,dumbbell\/otp,jj1bdx\/otp,aboroska\/otp,potatosalad\/otp,lrascao\/otp,potatosalad\/otp,rlipscombe\/otp,RoadRunnr\/otp,potatosalad\/otp,bjorng\/otp,ferd\/otp,getong\/otp,uabboli\/otp,mikpe\/otp,g-andrade\/otp,vladdu\/otp,emacsmirror\/erlang,emacsmirror\/erlang,mikpe\/otp,vinoski\/otp,legoscia\/otp,potatosalad\/otp,rlipscombe\/otp,ferd\/otp,dgud\/otp,erlang\/otp,vladdu\/otp,emacsmirror\/erlang,dgud\/otp,potatosalad\/otp,lrascao\/otp,vinoski\/otp,vinoski\/otp,g-andrade\/otp,dumbbell\/otp,bsmr-erlang\/otp,jj1bdx\/otp,mikpe\/otp,kvakvs\/otp,uabboli\/otp,electricimp\/otp,dumbbell\/otp,jj1bdx\/otp,rlipscombe\/otp,jj1bdx\/otp,getong\/otp,isvilen\/otp,aboroska\/otp,g-andrade\/otp,mikpe\/otp,vinoski\/otp,jj1bdx\/otp,aboroska\/otp,isvilen\/otp,dgud\/otp,legoscia\/otp,uabboli\/otp,dgud\/otp,RoadRunnr\/otp,electricimp\/otp,mikpe\/otp,legoscia\/otp,vladdu\/otp,ferd\/otp,rlipscombe\/otp,ferd\/otp,dumbbell\/otp,g-andrade\/otp,legoscia\/otp,dgud\/otp,vladdu\/otp,uabboli\/otp,RoadRunnr\/otp,kvakvs\/otp,vladdu\/otp,erlang\/otp,bsmr-erlang\/otp,aboroska\/otp,jj1bdx\/otp,aboroska\/otp,emacsmirror\/erlang,kvakvs\/otp,bsmr-erlang\/otp,jj1bdx\/otp,bsmr-erlang\/otp,electricimp\/otp,g-andrade\/otp,getong\/otp,isvilen\/otp,RoadRunnr\/otp,kvakvs\/otp,legoscia\/otp,getong\/otp,dumbbell\/otp,bsmr-erlang\/otp,aboroska\/otp,erlang\/otp,g-andrade\/otp,bjorng\/otp,rlipscombe\/otp,jj1bdx\/otp,getong\/otp,vinoski\/otp,bjorng\/otp,bsmr-erlang\/otp,getong\/otp,electricimp\/otp,potatosalad\/otp,isvilen\/otp,bsmr-erlang\/otp,bsmr-erlang\/otp,vinoski\/otp,bjorng\/otp,vinoski\/otp,dumbbell\/otp,ferd\/otp,RoadRunnr\/otp,rlipscombe\/otp,jj1bdx\/otp,dgud\/otp,g-andrade\/otp,rlipscombe\/otp,lrascao\/otp,isvilen\/otp,aboroska\/otp,vinoski\/otp,bsmr-erlang\/otp,ferd\/otp,kvakvs\/otp,dumbbell\/otp,RoadRunnr\/otp,isvilen\/otp,legoscia\/otp,legoscia\/otp,vladdu\/otp,uabboli\/otp,uabboli\/otp,isvilen\/otp,mikpe\/otp,erlang\/otp,ferd\/otp,RoadRunnr\/otp,electricimp\/otp,vladdu\/otp,dgud\/otp,jj1bdx\/otp,getong\/otp,aboroska\/otp,kvakvs\/otp,aboroska\/otp,dumbbell\/otp,g-andrade\/otp,emacsmirror\/erlang,g-andrade\/otp,bjorng\/otp,mikpe\/otp,RoadRunnr\/otp,ferd\/otp,bjorng\/otp,vladdu\/otp,potatosalad\/otp,emacsmirror\/erlang,rlipscombe\/otp,potatosalad\/otp,bjorng\/otp,bjorng\/otp,getong\/otp,kvakvs\/otp,kvakvs\/otp,lrascao\/otp,potatosalad\/otp,uabboli\/otp,uabboli\/otp,isvilen\/otp,vladdu\/otp,potatosalad\/otp,legoscia\/otp,mikpe\/otp,legoscia\/otp,lrascao\/otp,emacsmirror\/erlang,isvilen\/otp,lrascao\/otp,erlang\/otp,erlang\/otp,lrascao\/otp,RoadRunnr\/otp,bjorng\/otp,emacsmirror\/erlang,isvilen\/otp,dgud\/otp,vinoski\/otp,mikpe\/otp,rlipscombe\/otp,lrascao\/otp,g-andrade\/otp,getong\/otp,bjorng\/otp,emacsmirror\/erlang,getong\/otp,erlang\/otp,electricimp\/otp,kvakvs\/otp,rlipscombe\/otp,erlang\/otp,electricimp\/otp,lrascao\/otp,dumbbell\/otp,dgud\/otp,erlang\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/emulator\/beam\/erl_db_catree.c\n+++ erts\/emulator\/beam\/erl_db_catree.c\n@@ -48,24 +48,8 @@\n * activated when the options {write_concurrency, true}, public and\n * ordered_set are passed to the ets:new\/2 function. This\n * implementation is expected to scale better than the default\n- * implementation (located in \"erl_db_tree.c\") when concurrent\n- * processes use the following ETS operations to operate on a table:\n+ * implementation located in \"erl_db_tree.c\".\n * \n- * delete\/2, delete_object\/2, first\/1, insert\/2 (single object),\n- * insert_new\/2 (single object), lookup\/2, lookup_element\/2, member\/2,\n- * next\/2, take\/2 and update_element\/3 (single object).\n- *\n- * Currently, the implementation does not have scalable support for\n- * the other operations (e.g., select\/2). These operations are handled\n- * by merging all locks so that all terms get protected by a single\n- * lock. This implementation may thus perform worse than the default\n- * implementation in some scenarios. For example, when concurrent\n- * processes access a table with the operations insert\/2, delete\/2 and\n- * select\/2, the insert\/2 and delete\/2 operations will trigger splits\n- * of locks (to get more fine-grained synchronization) but this will\n- * quickly be undone by the select\/2 operation if this operation is\n- * also called frequently.\n- *\n * The default implementation has a static stack optimization (see\n * get_static_stack in erl_db_tree.c). This implementation does not\n * have such an optimization as it induces bad scalability when\n@@ -232,7 +216,7 @@\n \/* Helpers for reading and writing shared atomic variables *\/\n \n \/* No memory barrier *\/\n-#define GET_ROOT(tb) ((DbTableCATreeNode*)erts_atomic_read_nob(&(tb->root)))\n+#define GET_ROOT(tb) ((DbTableCATreeNode*)erts_atomic_read_nob(&((tb)->root)))\n #define GET_LEFT(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_nob(&(ca_tree_route_node->u.route.left)))\n #define GET_RIGHT(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_nob(&(ca_tree_route_node->u.route.right)))\n #define SET_ROOT(tb, v) erts_atomic_set_nob(&((tb)->root), (erts_aint_t)(v))\n@@ -241,7 +225,7 @@\n \n \n \/* Release or acquire barriers *\/\n-#define GET_ROOT_ACQB(tb) ((DbTableCATreeNode*)erts_atomic_read_acqb(&(tb->root)))\n+#define GET_ROOT_ACQB(tb) ((DbTableCATreeNode*)erts_atomic_read_acqb(&((tb)->root)))\n #define GET_LEFT_ACQB(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_acqb(&(ca_tree_route_node->u.route.left)))\n #define GET_RIGHT_ACQB(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_acqb(&(ca_tree_route_node->u.route.right)))\n #define SET_ROOT_RELB(tb, v) erts_atomic_set_relb(&((tb)->root), (erts_aint_t)(v))\n@@ -751,6 +735,35 @@\n }\n \n static ERTS_INLINE\n+Eterm copy_route_key(DbRouteKey* dst, Eterm key, Uint key_size)\n+{\n+ dst->size = key_size;\n+ if (key_size != 0) {\n+ Eterm* hp = &dst->heap[0];\n+ ErlOffHeap tmp_offheap;\n+ tmp_offheap.first = NULL;\n+ dst->term = copy_struct(key, key_size, &hp, &tmp_offheap);\n+ dst->oh = tmp_offheap.first;\n+ }\n+ else {\n+ ASSERT(is_immed(key));\n+ dst->term = key;\n+ dst->oh = NULL;\n+ }\n+ return dst->term;\n+}\n+\n+static ERTS_INLINE\n+void destroy_route_key(DbRouteKey* key)\n+{\n+ if (key->oh) {\n+ ErlOffHeap oh;\n+ oh.first = key->oh;\n+ erts_cleanup_offheap(&oh);\n+ }\n+}\n+\n+static ERTS_INLINE\n void init_root_iterator(DbTableCATree* tb, CATreeRootIterator* iter,\n int read_only)\n {\n@@ -862,36 +875,6 @@\n }\n return base_node;\n }\n-\n-static ERTS_INLINE\n-Eterm copy_route_key(DbRouteKey* dst, Eterm key, Uint key_size)\n-{\n- dst->size = key_size;\n- if (key_size != 0) {\n- Eterm* hp = &dst->heap[0];\n- ErlOffHeap tmp_offheap;\n- tmp_offheap.first = NULL;\n- dst->term = copy_struct(key, key_size, &hp, &tmp_offheap);\n- dst->oh = tmp_offheap.first;\n- }\n- else {\n- ASSERT(is_immed(key));\n- dst->term = key;\n- dst->oh = NULL;\n- }\n- return dst->term;\n-}\n-\n-static ERTS_INLINE\n-void destroy_route_key(DbRouteKey* key)\n-{\n- if (key->oh) {\n- ErlOffHeap oh;\n- oh.first = key->oh;\n- erts_cleanup_offheap(&oh);\n- }\n-}\n-\n \n #ifdef ERTS_ENABLE_LOCK_CHECK\n # define LC_ORDER(ORDER) ORDER\n"} {"commit":"a3d5eb9b2a08190528b1e024bdfbff41c0a6b88f","subject":"storage\/posix: Change janitor sleep duration to 10 minutes.","message":"storage\/posix: Change janitor sleep duration to 10 minutes.\n\nSigned-off-by: Vikas Gorur \nSigned-off-by: Anand V. Avati \n\nBUG: 227 (replicate selfheal does not remove directory with contents in it)\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=227\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/storage\/posix\/src\/posix.c\n+++ xlators\/storage\/posix\/src\/posix.c\n@@ -1354,7 +1354,7 @@\n }\n \n \n-#define JANITOR_SLEEP_DURATION 2\n+#define JANITOR_SLEEP_DURATION 600\n \n static void *\n posix_janitor_thread_proc (void *data)\n"} {"commit":"27abf58daa51b182bee863c31cd2823f56e06685","subject":"Expand doc to add some more historical information.","message":"Expand doc to add some more historical information.\n","repos":"davidlt\/root,zzxuanyuan\/root,buuck\/root,Y--\/root,vukasinmilosevic\/root,olifre\/root,sbinet\/cxx-root,satyarth934\/root,gganis\/root,jrtomps\/root,beniz\/root,mhuwiler\/rootauto,agarciamontoro\/root,veprbl\/root,thomaskeck\/root,jrtomps\/root,omazapa\/root-old,gbitzes\/root,zzxuanyuan\/root-compressor-dummy,perovic\/root,pspe\/root,Y--\/root,lgiommi\/root,karies\/root,jrtomps\/root,zzxuanyuan\/root,perovic\/root,Y--\/root,dfunke\/root,karies\/root,BerserkerTroll\/root,agarciamontoro\/root,omazapa\/root,zzxuanyuan\/root,jrtomps\/root,esakellari\/root,sbinet\/cxx-root,pspe\/root,omazapa\/root,smarinac\/root,thomaskeck\/root,gbitzes\/root,perovic\/root,satyarth934\/root,omazapa\/root-old,bbockelm\/root,olifre\/root,bbockelm\/root,pspe\/root,root-mirror\/root,nilqed\/root,gbitzes\/root,jrtomps\/root,zzxuanyuan\/root,sirinath\/root,Y--\/root,davidlt\/root,nilqed\/root,sawenzel\/root,dfunke\/root,thomaskeck\/root,Y--\/root,simonpf\/root,gbitzes\/root,root-mirror\/root,esakellari\/root,gganis\/root,davidlt\/root,esakellari\/root,nilqed\/root,buuck\/root,vukasinmilosevic\/root,gganis\/root,satyarth934\/root,nilqed\/root,dfunke\/root,vukasinmilosevic\/root,dfunke\/root,nilqed\/root,sbinet\/cxx-root,jrtomps\/root,zzxuanyuan\/root-compressor-dummy,dfunke\/root,mattkretz\/root,perovic\/root,CristinaCristescu\/root,esakellari\/root,karies\/root,Duraznos\/root,evgeny-boger\/root,evgeny-boger\/root,beniz\/root,mkret2\/root,gbitzes\/root,buuck\/root,arch1tect0r\/root,davidlt\/root,esakellari\/my_root_for_test,bbockelm\/root,simonpf\/root,Duraznos\/root,nilqed\/root,CristinaCristescu\/root,bbockelm\/root,0x0all\/ROOT,krafczyk\/root,bbockelm\/root,perovic\/root,omazapa\/root-old,0x0all\/ROOT,buuck\/root,georgtroska\/root,vukasinmilosevic\/root,omazapa\/root,arch1tect0r\/root,dfunke\/root,root-mirror\/root,karies\/root,Y--\/root,Duraznos\/root,arch1tect0r\/root,vukasinmilosevic\/root,smarinac\/root,Y--\/root,krafczyk\/root,esakellari\/my_root_for_test,olifre\/root,georgtroska\/root,lgiommi\/root,sawenzel\/root,dfunke\/root,Duraznos\/root,buuck\/root,mhuwiler\/rootauto,arch1tect0r\/root,georgtroska\/root,abhinavmoudgil95\/root,root-mirror\/root,arch1tect0r\/root,zzxuanyuan\/root,zzxuanyuan\/root-compressor-dummy,abhinavmoudgil95\/root,georgtroska\/root,mattkretz\/root,vukasinmilosevic\/root,omazapa\/root-old,beniz\/root,sirinath\/root,beniz\/root,esakellari\/my_root_for_test,zzxuanyuan\/root,mattkretz\/root,evgeny-boger\/root,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root-compressor-dummy,dfunke\/root,veprbl\/root,mhuwiler\/rootauto,olifre\/root,lgiommi\/root,Y--\/root,0x0all\/ROOT,nilqed\/root,simonpf\/root,Duraznos\/root,thomaskeck\/root,beniz\/root,arch1tect0r\/root,sirinath\/root,Duraznos\/root,mattkretz\/root,mattkretz\/root,mkret2\/root,perovic\/root,abhinavmoudgil95\/root,bbockelm\/root,olifre\/root,lgiommi\/root,karies\/root,lgiommi\/root,dfunke\/root,omazapa\/root,mhuwiler\/rootauto,karies\/root,omazapa\/root-old,thomaskeck\/root,jrtomps\/root,gbitzes\/root,zzxuanyuan\/root,vukasinmilosevic\/root,sawenzel\/root,evgeny-boger\/root,CristinaCristescu\/root,veprbl\/root,davidlt\/root,sirinath\/root,thomaskeck\/root,satyarth934\/root,pspe\/root,agarciamontoro\/root,arch1tect0r\/root,krafczyk\/root,esakellari\/my_root_for_test,beniz\/root,omazapa\/root-old,omazapa\/root-old,perovic\/root,simonpf\/root,0x0all\/ROOT,BerserkerTroll\/root,olifre\/root,gbitzes\/root,mhuwiler\/rootauto,sbinet\/cxx-root,simonpf\/root,Duraznos\/root,veprbl\/root,mhuwiler\/rootauto,0x0all\/ROOT,perovic\/root,simonpf\/root,0x0all\/ROOT,root-mirror\/root,agarciamontoro\/root,mkret2\/root,pspe\/root,vukasinmilosevic\/root,zzxuanyuan\/root,buuck\/root,0x0all\/ROOT,georgtroska\/root,satyarth934\/root,gbitzes\/root,buuck\/root,root-mirror\/root,evgeny-boger\/root,esakellari\/my_root_for_test,CristinaCristescu\/root,smarinac\/root,mattkretz\/root,sbinet\/cxx-root,omazapa\/root,thomaskeck\/root,sirinath\/root,zzxuanyuan\/root,esakellari\/root,lgiommi\/root,smarinac\/root,lgiommi\/root,abhinavmoudgil95\/root,zzxuanyuan\/root-compressor-dummy,abhinavmoudgil95\/root,sirinath\/root,davidlt\/root,evgeny-boger\/root,satyarth934\/root,zzxuanyuan\/root-compressor-dummy,jrtomps\/root,thomaskeck\/root,CristinaCristescu\/root,mkret2\/root,BerserkerTroll\/root,CristinaCristescu\/root,arch1tect0r\/root,abhinavmoudgil95\/root,sawenzel\/root,lgiommi\/root,abhinavmoudgil95\/root,esakellari\/root,bbockelm\/root,BerserkerTroll\/root,mhuwiler\/rootauto,0x0all\/ROOT,nilqed\/root,zzxuanyuan\/root,satyarth934\/root,satyarth934\/root,simonpf\/root,veprbl\/root,arch1tect0r\/root,olifre\/root,vukasinmilosevic\/root,mkret2\/root,karies\/root,satyarth934\/root,BerserkerTroll\/root,pspe\/root,0x0all\/ROOT,thomaskeck\/root,olifre\/root,BerserkerTroll\/root,krafczyk\/root,olifre\/root,sawenzel\/root,krafczyk\/root,lgiommi\/root,sirinath\/root,veprbl\/root,lgiommi\/root,mattkretz\/root,CristinaCristescu\/root,mhuwiler\/rootauto,arch1tect0r\/root,georgtroska\/root,agarciamontoro\/root,BerserkerTroll\/root,esakellari\/root,BerserkerTroll\/root,gganis\/root,Y--\/root,Y--\/root,simonpf\/root,buuck\/root,sirinath\/root,Duraznos\/root,agarciamontoro\/root,bbockelm\/root,sawenzel\/root,esakellari\/my_root_for_test,gganis\/root,zzxuanyuan\/root-compressor-dummy,esakellari\/my_root_for_test,dfunke\/root,evgeny-boger\/root,davidlt\/root,esakellari\/my_root_for_test,evgeny-boger\/root,mkret2\/root,root-mirror\/root,davidlt\/root,bbockelm\/root,pspe\/root,root-mirror\/root,georgtroska\/root,veprbl\/root,karies\/root,lgiommi\/root,davidlt\/root,esakellari\/my_root_for_test,nilqed\/root,krafczyk\/root,smarinac\/root,esakellari\/root,BerserkerTroll\/root,georgtroska\/root,abhinavmoudgil95\/root,buuck\/root,gganis\/root,smarinac\/root,mattkretz\/root,sirinath\/root,zzxuanyuan\/root-compressor-dummy,perovic\/root,mattkretz\/root,sirinath\/root,abhinavmoudgil95\/root,mattkretz\/root,omazapa\/root-old,mhuwiler\/rootauto,gganis\/root,nilqed\/root,arch1tect0r\/root,jrtomps\/root,beniz\/root,omazapa\/root,omazapa\/root,veprbl\/root,simonpf\/root,zzxuanyuan\/root-compressor-dummy,georgtroska\/root,Duraznos\/root,bbockelm\/root,pspe\/root,veprbl\/root,gganis\/root,gbitzes\/root,sawenzel\/root,sawenzel\/root,jrtomps\/root,Y--\/root,bbockelm\/root,olifre\/root,CristinaCristescu\/root,georgtroska\/root,sawenzel\/root,BerserkerTroll\/root,perovic\/root,evgeny-boger\/root,CristinaCristescu\/root,zzxuanyuan\/root,gbitzes\/root,agarciamontoro\/root,omazapa\/root-old,agarciamontoro\/root,sbinet\/cxx-root,dfunke\/root,smarinac\/root,sbinet\/cxx-root,satyarth934\/root,krafczyk\/root,root-mirror\/root,krafczyk\/root,esakellari\/root,evgeny-boger\/root,sawenzel\/root,beniz\/root,mhuwiler\/rootauto,zzxuanyuan\/root,smarinac\/root,beniz\/root,gganis\/root,nilqed\/root,agarciamontoro\/root,krafczyk\/root,thomaskeck\/root,veprbl\/root,olifre\/root,simonpf\/root,sbinet\/cxx-root,CristinaCristescu\/root,georgtroska\/root,beniz\/root,pspe\/root,CristinaCristescu\/root,karies\/root,evgeny-boger\/root,abhinavmoudgil95\/root,karies\/root,mhuwiler\/rootauto,root-mirror\/root,esakellari\/root,root-mirror\/root,buuck\/root,esakellari\/root,Duraznos\/root,buuck\/root,esakellari\/my_root_for_test,abhinavmoudgil95\/root,veprbl\/root,sbinet\/cxx-root,mkret2\/root,mkret2\/root,pspe\/root,krafczyk\/root,vukasinmilosevic\/root,Duraznos\/root,omazapa\/root,jrtomps\/root,sbinet\/cxx-root,gbitzes\/root,smarinac\/root,krafczyk\/root,omazapa\/root,mkret2\/root,mkret2\/root,agarciamontoro\/root,gganis\/root,davidlt\/root,agarciamontoro\/root,mkret2\/root,gganis\/root,smarinac\/root,BerserkerTroll\/root,simonpf\/root,karies\/root,satyarth934\/root,sawenzel\/root,davidlt\/root,omazapa\/root-old,zzxuanyuan\/root-compressor-dummy,mattkretz\/root,omazapa\/root,omazapa\/root,vukasinmilosevic\/root,pspe\/root,sbinet\/cxx-root,omazapa\/root-old,perovic\/root,beniz\/root,sirinath\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/meta\/inc\/TClass.h\n+++ core\/meta\/inc\/TClass.h\n@@ -100,8 +100,8 @@\n enum ENewType { kRealNew = 0, kClassNew, kDummyNew };\n enum ELegacyCheckSum {\n kCurrent = 0,\n- kNoEnum = 1,\n- kNoRange = 2,\n+ kNoEnum = 1, \/\/ Used since v3.3\n+ kNoRange = 2, \/\/ Up to v5.17\n kWithTypeDef = 3, \/\/ Up to v5.34\/13 and v5.99\/03\n kLegacyCheckSum = 4\n };\n"} {"commit":"864c24f7b9a4d2dd1ff452c7a3c993ac644e2a76","subject":"android\/client: Add hidhost handshake callback","message":"android\/client: Add hidhost handshake callback\n","repos":"mapfau\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,silent-snowman\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,mapfau\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- android\/client\/if-hh.c\n+++ android\/client\/if-hh.c\n@@ -100,6 +100,18 @@\n \t\t\t\t\t\tbthh_status_t2str(hh_status));\n }\n \n+\/* Callback for Android 5.0 handshake api. *\/\n+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)\n+static void handshake_cb(bt_bdaddr_t *bd_addr, bthh_status_t hh_status)\n+{\n+\tchar addr[MAX_ADDR_STR_LEN];\n+\n+\thaltest_info(\"%s: bd_addr=%s hh_status=%s\\n\", __func__,\n+\t\t\t\t\t\tbt_bdaddr_t2str(bd_addr, addr),\n+\t\t\t\t\t\tbthh_status_t2str(hh_status));\n+}\n+#endif\n+\n \/*\n * Callback for get hid info\n * hid_info will contain attr_mask, sub_class, app_id, vendor_id, product_id,\n@@ -163,7 +175,10 @@\n \t.protocol_mode_cb = protocol_mode_cb,\n \t.idle_time_cb = idle_time_cb,\n \t.get_report_cb = get_report_cb,\n-\t.virtual_unplug_cb = virtual_unplug_cb\n+\t.virtual_unplug_cb = virtual_unplug_cb,\n+#if ANDROID_VERSION >= PLATFORM_VER(5, 0, 0)\n+\t.handshake_cb = handshake_cb\n+#endif\n };\n \n \/* init *\/\n"} {"commit":"fc178dab876ea8ac72f4c0f1395fea1f71f9df81","subject":"rpl_print_neighbor_list(): cast clock_time_t to unsigned for portable printout","message":"rpl_print_neighbor_list(): cast clock_time_t to unsigned for portable printout\n","repos":"MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/net\/rpl\/rpl-dag.c\n+++ core\/net\/rpl\/rpl-dag.c\n@@ -100,7 +100,7 @@\n p->rank, nbr ? nbr->link_metric : 0,\n default_instance->of->calculate_rank(p, 0),\n p == default_instance->current_dag->preferred_parent ? '*' : ' ',\n- (now - p->last_tx_time) \/ (60 * CLOCK_SECOND));\n+ (unsigned)((now - p->last_tx_time) \/ (60 * CLOCK_SECOND)));\n p = nbr_table_next(rpl_parents, p);\n }\n printf(\"RPL: end of list\\n\");\n"} {"commit":"9dd5af78c845b1081634d010df6e7261e317f0dd","subject":"fix: default routes are removed correctly if no DAG with preferred parent is available","message":"fix: default routes are removed correctly if no DAG with preferred parent is available\n","repos":"MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/net\/rpl\/rpl-dag.c\n+++ core\/net\/rpl\/rpl-dag.c\n@@ -703,7 +703,9 @@\n void\n rpl_nullify_parent(rpl_dag_t *dag, rpl_parent_t *parent)\n {\n- if(parent == dag->preferred_parent) {\n+ \/\/ local repair calls nullification because the preferred parent is NULL!\n+ \/\/ So check if parent is NULL to trigger uip_ds6_defrt_rm.\n+ if(parent == dag->preferred_parent || dag->preferred_parent == NULL) {\n dag->preferred_parent = NULL;\n dag->rank = INFINITE_RANK;\n if(dag->joined) {\n"} {"commit":"a80cf51b530dd820b1bb3aea1cfdeb547f8f46dc","subject":"Fixed the set comparator for the QMF schedd plugin proc counter","message":"Fixed the set comparator for the QMF schedd plugin proc counter\n","repos":"bbockelm\/condor-network-accounting,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,djw8605\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,mambelli\/osg-bosco-marco,bbockelm\/condor-network-accounting,bbockelm\/condor-network-accounting,htcondor\/htcondor,mambelli\/osg-bosco-marco,djw8605\/htcondor,djw8605\/htcondor,zhangzhehust\/htcondor,bbockelm\/condor-network-accounting,djw8605\/htcondor,mambelli\/osg-bosco-marco,neurodebian\/htcondor,bbockelm\/condor-network-accounting,djw8605\/condor,bbockelm\/condor-network-accounting,djw8605\/htcondor,mambelli\/osg-bosco-marco,djw8605\/condor,djw8605\/condor,htcondor\/htcondor,neurodebian\/htcondor,djw8605\/condor,zhangzhehust\/htcondor,bbockelm\/condor-network-accounting,neurodebian\/htcondor,htcondor\/htcondor,djw8605\/htcondor,htcondor\/htcondor,djw8605\/condor,neurodebian\/htcondor,bbockelm\/condor-network-accounting,zhangzhehust\/htcondor,htcondor\/htcondor,htcondor\/htcondor,zhangzhehust\/htcondor,djw8605\/condor,djw8605\/condor,djw8605\/htcondor,neurodebian\/htcondor,htcondor\/htcondor,htcondor\/htcondor,zhangzhehust\/htcondor,djw8605\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,neurodebian\/htcondor,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,neurodebian\/htcondor,djw8605\/htcondor,zhangzhehust\/htcondor,zhangzhehust\/htcondor,djw8605\/condor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/condor_contrib\/mgmt\/qmf\/plugins\/SubmissionObject.h\n+++ src\/condor_contrib\/mgmt\/qmf\/plugins\/SubmissionObject.h\n@@ -44,7 +44,7 @@\n \n struct cmpprocid {\n bool operator()(PROC_ID a, PROC_ID b) const {\n- return a.proc < b.proc;\n+\t\t return (a.cluster < b.cluster) || ((a.cluster == b.cluster) && (a.proc < b.proc));\n }\n };\n \n"} {"commit":"563ca5ad13a67dbbdf916690969eb9e7863ed3b1","subject":"removed unneeded comment","message":"removed unneeded comment\n","repos":"ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/util\/juliantime.h\n+++ core\/util\/juliantime.h\n@@ -69,7 +69,6 @@\n *\n * @param isostring the isostring with the time\n *\/\n- \/\/TODO link to isostring docu?\n Time(const QString& isostring);\n Time(const char * isostring);\n \n"} {"commit":"06ba08d735a5af35754774887d4bed1127459bb5","subject":"produce more readable indentation","message":"produce more readable indentation\n","repos":"nexusformat\/code,chrisemblhh\/nexus,chrisemblhh\/nexus,nexusformat\/code,chrisemblhh\/nexus,chrisemblhh\/nexus,chrisemblhh\/nexus,nexusformat\/code,nexusformat\/code,nexusformat\/code","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applications\/NXbrowse\/NXbrowse.c\n+++ applications\/NXbrowse\/NXbrowse.c\n@@ -298,30 +298,25 @@\n strcpy (path, \"NX\");\n do {\n sprintf (prompt, \"%s> \", path);\n- if (getenv(\"NO_READLINE\") != NULL)\n- {\n+ if (getenv(\"NO_READLINE\") != NULL) {\n inputText = my_readline(prompt);\n- }\n- else\n- {\n+ } else {\n inputText = readline(prompt);\n }\n- if (inputText == NULL)\n- {\n+ if (inputText == NULL) {\n inputText = strdup(\"EXIT\");\n }\n- if (*inputText)\n- {\n+ if (*inputText) {\n add_history(inputText);\n }\n command = strtok(inputText,\" \");\n \/* Check if a command has been given *\/\n if (command == NULL) command = \" \";\n \/* Convert it to upper case characters *\/\n- ConvertUpperCase (command);\n+ ConvertUpperCase(command);\n \/* Command is to print a directory of the current group *\/\n if (StrEq(command, \"DIR\") || StrEq(command, \"LS\")) {\n- status = NXBdir (the_fileId);\n+ status = NXBdir(the_fileId);\n } \n \/* Command is to open the specified group *\/\n if (StrEq(command, \"OPEN\") || StrEq(command, \"CD\")) {\n@@ -339,8 +334,7 @@\n \t\t\t\t\t groupLevel++;\n \t\t\t\t }\n \t\t\t }\n- }\n- else {\n+ } else {\n fprintf (rl_outstream, \"NX_ERROR: Specify a group\\n\");\n }\n }\n@@ -353,12 +347,10 @@\n if (stringPtr != NULL) {\n strcpy (fileName, stringPtr);\n status = NXBdump (the_fileId, dataName, fileName);\n- }\n- else {\n+ } else {\n fprintf (rl_outstream, \"NX_ERROR: Specify a dump file name \\n\");\n }\n- }\n- else {\n+ } else {\n fprintf (rl_outstream, \"NX_ERROR: Specify a data item\\n\");\n }\n }\n@@ -369,8 +361,7 @@\n strcpy (dataName, stringPtr);\n dimensions = strtok(NULL, \"[]\");\n status = NXBread (the_fileId, dataName, dimensions);\n- }\n- else {\n+ } else {\n fprintf (rl_outstream, \"NX_ERROR: Specify a data item\\n\");\n }\n }\n@@ -384,8 +375,7 @@\n *stringPtr = '\\0'; \/* terminate the string there *\/\n groupLevel--;\n }\n- }\n- else {\n+ } else {\n fprintf (rl_outstream, \"NX_WARNING: Already at root level of file\\n\");\n }\n }\n@@ -419,7 +409,7 @@\n \/* Command is to exit the program *\/\n if (StrEq(command, \"EXIT\") || StrEq(command, \"QUIT\")) {\n for (i = groupLevel; i > 0; i--) NXclosegroup (the_fileId);\n- NXclose (&the_fileId);\n+ NXclose(&the_fileId);\n return NX_OK;\n }\n status = NX_OK;\n@@ -542,9 +532,8 @@\n printf (\"NX_ERROR: Data rank = %d\\n\", dataRank);\n return NX_ERROR;\n }\n- }\n+ } else {\n \/* Otherwise, allocate enough space for the first 3 elements of each dimension *\/\n- else {\n for (i = 0; i < dataRank; i++) {\n if (dataDimensions[i] > 3 && dataType != NX_CHAR) {\n start[i] = 0;\n@@ -557,16 +546,14 @@\n }\n }\n total_size = 1;\n- for(i = 0; i < dataRank; i++)\n- {\n+ for(i = 0; i < dataRank; i++) {\n total_size *= dataDimensions[i];\n }\n if (NXmalloc((void**)&dataBuffer, dataRank, size, dataType) != NX_OK) return NX_ERROR;\n \/* Read in the data with NXgetslab *\/\n if (dataType == NX_CHAR) {\n if (NXgetdata(fileId, dataBuffer) != NX_OK) return NX_ERROR;\n- }\n- else {\n+ } else {\n if (NXgetslab (fileId, dataBuffer, start, size) != NX_OK) return NX_ERROR;\n }\n \/* Output data name, dimensions and type *\/\n"} {"commit":"9ea5fa82193c872c061d1d4306f733179e13db62","subject":"[bouqueau] add safety check for marker box","message":"[bouqueau] add safety check for marker box\n\ngit-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@4570 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"psteinb\/gpac,psteinb\/gpac,rbouqueau\/gpac,drakeguan\/gpac,drakeguan\/gpac,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac,porcelijn\/gpac,epam\/gpac,aymanelyaagoubi\/gpac,canatella\/gpac,epam\/gpac,emmanouil\/gpac,DmitrySigaev\/gpac,RodolpheFouquet\/gpac,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,canatella\/gpac,vladimir-kazakov\/gpac,DmitrySigaev\/gpac,rbouqueau\/gpac,Bevara\/Access-open,rbouqueau\/gpac_brew_travis,aymanelyaagoubi\/gpac,drakeguan\/gpac,vladimir-kazakov\/gpac,ARSekkat\/gpac,rauf\/gpac,aymanelyaagoubi\/gpac,psteinb\/gpac,aymanelyaagoubi\/gpac,rauf\/gpac,nguyen-viet-thanh-trung\/gpac,canatella\/gpac,Bevara\/Access-open,DmitrySigaev\/gpac,gpac\/gpac,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,DmitrySigaev\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,rauf\/gpac,canatella\/gpac,epam\/gpac,gpac\/gpac,canatella\/gpac,vladimir-kazakov\/gpac,psteinb\/gpac,rauf\/gpac,psteinb\/gpac,gpac\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,vladimir-kazakov\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,Bevara\/Access-open,rauf\/gpac,drakeguan\/gpac,rbouqueau\/gpac_brew_travis,epam\/gpac,RodolpheFouquet\/gpac,nguyen-viet-thanh-trung\/gpac,porcelijn\/gpac,emmanouil\/gpac,gpac\/gpac,drakeguan\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,vladimir-kazakov\/gpac,Bevara\/Access-open,epam\/gpac,rbouqueau\/gpac,rauf\/gpac,RodolpheFouquet\/gpac,drakeguan\/gpac,emmanouil\/gpac,epam\/gpac,nguyen-viet-thanh-trung\/gpac,porcelijn\/gpac,vladimir-kazakov\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,emmanouil\/gpac,gpac\/gpac,canatella\/gpac,rbouqueau\/gpac,DmitrySigaev\/gpac,DmitrySigaev\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,Bevara\/Access-open,Bevara\/Access-open,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac,psteinb\/gpac,gpac\/gpac,canatella\/gpac,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applications\/dashcast\/cmd_data.c\n+++ applications\/dashcast\/cmd_data.c\n@@ -363,7 +363,12 @@\n \t\t\t\treturn -1;\n \t\t\t}\n \t\t\tchar * m = p_argv[i];\n-\t\t\tp_cmdd->i_seg_marker = GF_4CC(m[0], m[1], m[2], m[3]);\n+\t\t\tif (strlen(m) == 4) {\n+\t\t\t\tp_cmdd->i_seg_marker = GF_4CC(m[0], m[1], m[2], m[3]);\n+\t\t\t} else {\n+\t\t\t\tprintf(\"Invalid marker box name specified: %s\\n\", m);\n+\t\t\t\treturn -1;\n+\t\t\t}\n \n \t\t\ti++;\n \n"} {"commit":"2aff61dfeade00f0afe930759aaccb06695dc200","subject":"Removed PPI from example of COMP peripheral in single ended mode","message":"Removed PPI from example of COMP peripheral in single ended mode\n","repos":"andenore\/NordicSnippets","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/comp\/main.c\n+++ examples\/comp\/main.c\n@@ -1,7 +1,4 @@\n #include \n-\n-#define PPI_CHANNEL (0)\n-#define PIN_GPIO (23)\n \n void single_ended_comp_init(void)\n {\n@@ -23,23 +20,9 @@\n \/\/Enable\n NRF_COMP->ENABLE = (COMP_ENABLE_ENABLE_Enabled << COMP_ENABLE_ENABLE_Pos);\n \n- \/\/ Configure COMP->EVENTS_CROSS to toggle PIN_GPIO\n- NRF_GPIOTE->CONFIG[0] = (GPIOTE_CONFIG_MODE_Task << GPIOTE_CONFIG_MODE_Pos) |\n- (GPIOTE_CONFIG_OUTINIT_High << GPIOTE_CONFIG_OUTINIT_Pos) |\n- (GPIOTE_CONFIG_POLARITY_Toggle << GPIOTE_CONFIG_POLARITY_Pos) |\n- (PIN_GPIO << GPIOTE_CONFIG_PSEL_Pos);\n-\n- \/\/ Configure PPI channel with connection between COMP->EVENTS_CROSS and GPIOTE->TASKS_OUT[0]\n- NRF_PPI->CH[PPI_CHANNEL].EEP = (uint32_t)&NRF_COMP->EVENTS_CROSS;\n- NRF_PPI->CH[PPI_CHANNEL].TEP = (uint32_t)&NRF_GPIOTE->TASKS_OUT[0];\n- \n- \/\/ Enable PPI channel\n- NRF_PPI->CHENSET = (1UL << PPI_CHANNEL);\n- \n \/\/Start the comparator\n NRF_COMP->TASKS_START=1;\n- while(!NRF_COMP->EVENTS_READY);\n- \n+ while(!NRF_COMP->EVENTS_READY); \n }\n \n int main(void)\n"} {"commit":"802c5786121622dddf51d95355e4d8a6837535a1","subject":"fixed warning","message":"fixed warning\n","repos":"rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applications\/mp4box\/fileimport.c\n+++ applications\/mp4box\/fileimport.c\n@@ -2463,7 +2463,7 @@\n \t\tszLine[0] = 0;\n \t\tif (!fgets(szLine, 10000, pl)) break;\n \t\tif (szLine[0]=='#') continue;\n-\t\tlen = strlen(szLine);\n+\t\tlen = (u32) strlen(szLine);\n \t\twhile (len && strchr(\"\\r\\n \\t\", szLine[len-1])) {\n \t\t\tszLine[len-1] = 0;\n \t\t\tlen--;\n"} {"commit":"e7e5cbcea1b506953267e07528eb42f4090664ac","subject":"fix parsing when multiple unrecognized options","message":"fix parsing when multiple unrecognized options\n","repos":"porcelijn\/gpac,gpac\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,porcelijn\/gpac,rbouqueau\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,gpac\/gpac,porcelijn\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,porcelijn\/gpac,rbouqueau\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applications\/mp4box\/fileimport.c\n+++ applications\/mp4box\/fileimport.c\n@@ -680,6 +680,7 @@\n \t\t\/*unrecognized, assume name has colon in it*\/\n \t\telse {\n \t\t\tfprintf(stderr, \"Unrecognized import option %s, ignoring\\n\", ext+1);\n+\t\t\tif (ext2) ext2[0] = ':';\n \t\t\text = ext2;\n \t\t\tcontinue;\n \t\t}\n"} {"commit":"4089ce9513a0b4e598215dab2fd627c942a7fe42","subject":"audiofx: remove unused variable","message":"audiofx: remove unused variable\n\nRemove unsued variable have_coeffs in audiofxbaseiirfilter\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=756905\n","repos":"hizukiayaka\/gst-plugins-good,Kurento\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,GStreamer\/gst-plugins-good,stfl\/gst-plugins-good,StreamUtils\/gst-plugins-good,stfl\/gst-plugins-good,stfl\/gst-plugins-good,StreamUtils\/gst-plugins-good,GStreamer\/gst-plugins-good,Kurento\/gst-plugins-good,StreamUtils\/gst-plugins-good,StreamUtils\/gst-plugins-good,stfl\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,Kurento\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,pexip\/gst-plugins-good,hizukiayaka\/gst-plugins-good,hizukiayaka\/gst-plugins-good,hizukiayaka\/gst-plugins-good,Kurento\/gst-plugins-good,Kurento\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,GStreamer\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/audiofx\/audiofxbaseiirfilter.h\n+++ gst\/audiofx\/audiofxbaseiirfilter.h\n@@ -54,7 +54,6 @@\n \/* < private > *\/\n GstAudioFXBaseIIRFilterProcessFunc process;\n \n- gboolean have_coeffs;\n gdouble *a;\n guint na;\n gdouble *b;\n"} {"commit":"2e709efbf79126df0413d6cb484a3e300e3a3f22","subject":"make sure mem is not NULL before calling gst_memory_is_type","message":"make sure mem is not NULL before calling gst_memory_is_type\n","repos":"sailfishos\/gst-droid,foolab\/gst-droid,mlehtima\/gst-droid,foolab\/gst-droid,sledges\/gst-droid,sledges\/gst-droid,sledges\/gst-droid,mlehtima\/gst-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/droideglsink\/gstdroideglsink.c\n+++ gst\/droideglsink\/gstdroideglsink.c\n@@ -379,7 +379,7 @@\n for (x = 0; x < num; x++) {\n GstMemory *mem = gst_buffer_get_memory (buffer, x);\n \n- if (gst_memory_is_type (mem, GST_ALLOCATOR_GRALLOC)) {\n+ if (mem && gst_memory_is_type (mem, GST_ALLOCATOR_GRALLOC)) {\n gst_memory_unref (mem);\n return TRUE;\n }\n"} {"commit":"b2732550d609355c18544d2338313f0c57b4de71","subject":"redirections support for the pwd builtin","message":"redirections support for the pwd builtin\n","repos":"ziirish\/shelldone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- builtin.c\n+++ builtin.c\n@@ -80,13 +80,16 @@\n FILE *fdout, *fderr;\n char *pwd;\n \n- if (out != 1)\n- fdout = fdopen (out, \"a\");\n+ if (out != STDOUT_FILENO)\n+ if (out == err)\n+ fdout = stderr;\n+ else\n+ fdout = fdopen (out, \"a\");\n else\n fdout = stdout;\n if (err == out)\n fderr = fdout;\n- else if (err != 2)\n+ else if (err != STDERR_FILENO)\n fderr = fdopen (err, \"a\");\n else\n fderr = stderr;\n@@ -95,9 +98,9 @@\n {\n fprintf (fderr, \"ERROR: too many arguments\\n\");\n fprintf (fderr, \"usage: pwd\\n\");\n- if (out != 1)\n+ if (out != STDOUT_FILENO)\n fclose (fdout);\n- if (err != 2 && err != out)\n+ if (err != STDERR_FILENO && err != out)\n fclose (fderr);\n \/* _exit (1); *\/\n return 1;\n@@ -107,9 +110,9 @@\n fprintf (fdout, \"%s\\n\", \/*getenv (\"PWD\")*\/pwd);\n xfree (pwd);\n \n- if (out != 1)\n+ if (out != STDOUT_FILENO)\n fclose (fdout);\n- if (err != 2 && err != out)\n+ if (err != STDERR_FILENO && err != out)\n fclose (fderr);\n \n (void) argv;\n"} {"commit":"ab02644a7bae40cab87c28afbc327e469fa45645","subject":"added barrier_all before shm-memory functions return according to the spec...and modified shmemalign according to spec","message":"added barrier_all before shm-memory functions return according to the spec...and modified shmemalign according to spec\n","repos":"jeffhammond\/oshmpi,jeffhammond\/oshmpi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bmalloc.c\n+++ bmalloc.c\n@@ -49,6 +49,8 @@\n \t\n \tshmem_sheap_current_ptr += size;\n \n+\tshmem_barrier_all();\n+\t\n \treturn ptr;\n }\n \n@@ -79,6 +81,8 @@\n \t\tfree (curr);\n \t}\n \n+\tshmem_barrier_all();\n+\t\n \treturn;\n }\n \n@@ -108,6 +112,8 @@\n \tmemcpy (new_ptr, ptr, size);\n \tbmem_free (ptr); \/* free old pointer *\/\n \n+\tshmem_barrier_all();\n+\t\n \treturn new_ptr;\t\n }\n \n@@ -117,16 +123,23 @@\n *\/\n void * bmem_align (size_t alignment, size_t size)\n {\n+\t\/* OpenSHMEM 1.0 spec says nothing about this case *\/\n+\tif (alignment > size) {\n+\t\treturn NULL;\n+\t}\n+\t\/* Allocate enough memory *\/\t\n+\tshmem_sheap_current_ptr += (size + alignment - 1);\n+\t\n \t\/* Notes: Sayan: This will flip the bits *\/\n \tuintptr_t mask = ~(uintptr_t)(alignment - 1);\n \tvoid * ptr = shmem_sheap_current_ptr;\n-\tshmem_sheap_current_ptr += size;\n-\t\n-\tif ((unsigned long)shmem_sheap_current_ptr > (unsigned long)shmem_sheap_size) {\n- __shmem_abort(size, \"[E] Address not within symm heap range\");\n-\t}\n-\t\n-\t\/* Notes: Sayan: Add alignment to the first pointer, suppose it\n+\t\/*\n+\t The parameter size must be less than or equal to the amount of symmetric heap space\n+\t available for the calling PE; otherwise shmemalign returns NULL. - OpenSHMEM 1.0 spec\n+\t *\/\n+\tif ((unsigned long)shmem_sheap_current_ptr > (unsigned long)shmem_sheap_size) return NULL;\n+\n+\t\/* Notes: Sayan: Add alignment to the first pointer, suppose it (size+alignment-1)\n \treturns a bad alignment, then fix it by and-ing with mask, eg: 1+0 = 0 *\/\n \tvoid * mem = (void *)(((uintptr_t)ptr + alignment - 1) & mask);\n \t\t\n@@ -145,5 +158,11 @@\n \t\tshmallocd_ptrs_sizes = curr;\n \t}\n \n+\t\/*\n+\tshmemalign() calls shmem_barrier_all() before returning to ensure that all the PEs par-\n+\tticipate - (same for shmalloc, shrealloc and shfree) : OpenSHMEM spec 1.0\n+\t*\/\n+\tshmem_barrier_all();\n+\n \treturn mem;\n }\n"} {"commit":"49fdc23fc9287bff67667cf1193180a29a822d33","subject":"updating hw2.c in gvasilev folder","message":"updating hw2.c in gvasilev folder\n","repos":"domexbg\/web,domexbg\/web,domexbg\/web,domexbg\/web,domexbg\/web,domexbg\/web,domexbg\/web","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpp\/gvasilev\/hw2\/hw2.c\n+++ cpp\/gvasilev\/hw2\/hw2.c\n@@ -8,50 +8,54 @@\n \n int max3(int a, int b, int c)\n {\n-if (a>b)\n-\t{if (a>c)\n-\treturn a;\n-\telse\n-\treturn c;}\n-else\n-\t{if (b>c)\n-\treturn b;\n-\telse\n-\treturn c;}\t\/* Write your code here*\/\n+ if (a>b)\n+ {\n+ if (a>c)\n+ return a;\n+ else\n+ return c;\n+ }\n+ else\n+ {\n+ if (b>c)\n+ return b;\n+ else\n+ return c;\n+ }\t\/* Write your code here*\/\n \n }\n \n-int main(int argc, char** argv) \n+int main(int argc, char** argv)\n {\n-\tint i = 1;\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(0, 0, 0) == 0);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(0, 1, 0) == 1);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(100, -1, 10) == 100);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(-40, -5, -1) == -1);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(60, -100, 70) == 70);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(0, 9, 9) == 9);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\tfprintf(stdout, \"Test %d: \", i++);\n-\tassert( max3(-139, -139, -139) == -139);\n-\tfprintf(stdout, \"OK\\n\");\n-\t\n-\treturn 0;\n+ int i = 1;\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(0, 0, 0) == 0);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(0, 1, 0) == 1);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(100, -1, 10) == 100);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(-40, -5, -1) == -1);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(60, -100, 70) == 70);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(0, 9, 9) == 9);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ fprintf(stdout, \"Test %d: \", i++);\n+ assert( max3(-139, -139, -139) == -139);\n+ fprintf(stdout, \"OK\\n\");\n+\n+ return 0;\n }\n"} {"commit":"468426e3a72c74dcd9eceb90a9f21e68cb539f7b","subject":"templating solver for speed up with only real parameters","message":"templating solver for speed up with only real parameters\n","repos":"ericagol\/GenRP,dfm\/celerite,ericagol\/celerite,ericagol\/celerite,ericagol\/GenRP,dfm\/celerite,ericagol\/GenRP,ericagol\/celerite,dfm\/celerite","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpp\/include\/genrp\/gp.h\n+++ cpp\/include\/genrp\/gp.h\n@@ -17,7 +17,6 @@\n \/\/ 0.5 * log(2 * pi)\n #define GP_CONSTANT 0.91893853320467267\n \n-template \n class GaussianProcess {\n public:\n GaussianProcess (Kernel kernel) : kernel_(kernel), dim_(0), computed_(false) {}\n@@ -32,32 +31,29 @@\n \n private:\n Kernel kernel_;\n- SolverType solver_;\n+ GRPSolver > solver_;\n size_t dim_;\n bool computed_;\n Eigen::VectorXd x_;\n \n };\n \n-template \n-void GaussianProcess::compute (\n+void GaussianProcess::compute (\n const Eigen::VectorXd& params, const Eigen::VectorXd& x, const Eigen::VectorXd& yerr) {\n kernel_.params(params);\n compute(x, yerr);\n }\n \n-template \n-void GaussianProcess::compute (\n+void GaussianProcess::compute (\n const Eigen::VectorXd x, const Eigen::VectorXd& yerr) {\n x_ = x;\n dim_ = x.rows();\n- solver_ = SolverType(kernel_.alpha(), kernel_.beta());\n+ solver_ = GRPSolver >(kernel_.alpha(), kernel_.beta());\n solver_.compute(x, yerr.array() * yerr.array());\n computed_ = true;\n }\n \n-template \n-double GaussianProcess::log_likelihood (const Eigen::VectorXd& y) const {\n+double GaussianProcess::log_likelihood (const Eigen::VectorXd& y) const {\n if (!computed_) throw GP_MUST_COMPUTE;\n if (y.rows() != dim_) throw GP_DIMENSION_MISMATCH;\n Eigen::VectorXd alpha(dim_);\n@@ -67,8 +63,7 @@\n return ll;\n }\n \n-template \n-double GaussianProcess::grad_log_likelihood (const Eigen::VectorXd& y, double* grad) const {\n+double GaussianProcess::grad_log_likelihood (const Eigen::VectorXd& y, double* grad) const {\n if (!computed_) throw GP_MUST_COMPUTE;\n if (y.rows() != dim_) throw GP_DIMENSION_MISMATCH;\n Eigen::VectorXd alpha(dim_);\n"} {"commit":"d059d8c29df1a83966a5a890b50b7bf226b6bdab","subject":"This callback is created by void PipelineImpl::FilterStateTransitionTask() and the ownership is transferred to Filter, filter should delete this callback.","message":"This callback is created by\nvoid PipelineImpl::FilterStateTransitionTask() and the ownership is transferred to Filter, filter should delete this callback.\n\nReview URL: http:\/\/codereview.chromium.org\/2845044\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@52565 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"Pluto-tv\/chromium-crosswalk,keishi\/chromium,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,anirudhSK\/chromium,dednal\/chromium.src,bright-sparks\/chromium-spacewalk,M4sse\/chromium.src,keishi\/chromium,anirudhSK\/chromium,chuan9\/chromium-crosswalk,jaruba\/chromium.src,robclark\/chromium,mogoweb\/chromium-crosswalk,hgl888\/chromium-crosswalk,dushu1203\/chromium.src,hgl888\/chromium-crosswalk-efl,dednal\/chromium.src,junmin-zhu\/chromium-rivertrail,anirudhSK\/chromium,timopulkkinen\/BubbleFish,mogoweb\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,timopulkkinen\/BubbleFish,hujiajie\/pa-chromium,axinging\/chromium-crosswalk,zcbenz\/cefode-chromium,ondra-novak\/chromium.src,axinging\/chromium-crosswalk,Jonekee\/chromium.src,Chilledheart\/chromium,hujiajie\/pa-chromium,hujiajie\/pa-chromium,zcbenz\/cefode-chromium,rogerwang\/chromium,krieger-od\/nwjs_chromium.src,dushu1203\/chromium.src,timopulkkinen\/BubbleFish,Fireblend\/chromium-crosswalk,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,krieger-od\/nwjs_chromium.src,markYoungH\/chromium.src,mohamed--abdel-maksoud\/chromium.src,krieger-od\/nwjs_chromium.src,dednal\/chromium.src,nacl-webkit\/chrome_deps,jaruba\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,Chilledheart\/chromium,markYoungH\/chromium.src,mogoweb\/chromium-crosswalk,axinging\/chromium-crosswalk,littlstar\/chromium.src,M4sse\/chromium.src,bright-sparks\/chromium-spacewalk,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk,axinging\/chromium-crosswalk,littlstar\/chromium.src,mohamed--abdel-maksoud\/chromium.src,TheTypoMaster\/chromium-crosswalk,dushu1203\/chromium.src,Pluto-tv\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,zcbenz\/cefode-chromium,Just-D\/chromium-1,bright-sparks\/chromium-spacewalk,keishi\/chromium,junmin-zhu\/chromium-rivertrail,nacl-webkit\/chrome_deps,nacl-webkit\/chrome_deps,crosswalk-project\/chromium-crosswalk-efl,littlstar\/chromium.src,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,keishi\/chromium,ondra-novak\/chromium.src,ChromiumWebApps\/chromium,robclark\/chromium,pozdnyakov\/chromium-crosswalk,patrickm\/chromium.src,fujunwei\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,axinging\/chromium-crosswalk,Jonekee\/chromium.src,hgl888\/chromium-crosswalk-efl,hujiajie\/pa-chromium,markYoungH\/chromium.src,Just-D\/chromium-1,Just-D\/chromium-1,dushu1203\/chromium.src,pozdnyakov\/chromium-crosswalk,ondra-novak\/chromium.src,chuan9\/chromium-crosswalk,patrickm\/chromium.src,dednal\/chromium.src,hujiajie\/pa-chromium,Jonekee\/chromium.src,junmin-zhu\/chromium-rivertrail,M4sse\/chromium.src,TheTypoMaster\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,robclark\/chromium,Just-D\/chromium-1,littlstar\/chromium.src,hgl888\/chromium-crosswalk,zcbenz\/cefode-chromium,crosswalk-project\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,keishi\/chromium,axinging\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,nacl-webkit\/chrome_deps,rogerwang\/chromium,PeterWangIntel\/chromium-crosswalk,timopulkkinen\/BubbleFish,zcbenz\/cefode-chromium,ChromiumWebApps\/chromium,krieger-od\/nwjs_chromium.src,nacl-webkit\/chrome_deps,keishi\/chromium,robclark\/chromium,Jonekee\/chromium.src,littlstar\/chromium.src,pozdnyakov\/chromium-crosswalk,fujunwei\/chromium-crosswalk,Just-D\/chromium-1,hgl888\/chromium-crosswalk-efl,markYoungH\/chromium.src,pozdnyakov\/chromium-crosswalk,timopulkkinen\/BubbleFish,patrickm\/chromium.src,hgl888\/chromium-crosswalk,mogoweb\/chromium-crosswalk,hgl888\/chromium-crosswalk,anirudhSK\/chromium,hujiajie\/pa-chromium,patrickm\/chromium.src,hgl888\/chromium-crosswalk-efl,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,bright-sparks\/chromium-spacewalk,mohamed--abdel-maksoud\/chromium.src,TheTypoMaster\/chromium-crosswalk,Jonekee\/chromium.src,dushu1203\/chromium.src,Fireblend\/chromium-crosswalk,ChromiumWebApps\/chromium,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,patrickm\/chromium.src,fujunwei\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,bright-sparks\/chromium-spacewalk,Chilledheart\/chromium,mogoweb\/chromium-crosswalk,anirudhSK\/chromium,Fireblend\/chromium-crosswalk,ondra-novak\/chromium.src,fujunwei\/chromium-crosswalk,axinging\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,patrickm\/chromium.src,junmin-zhu\/chromium-rivertrail,pozdnyakov\/chromium-crosswalk,ondra-novak\/chromium.src,markYoungH\/chromium.src,keishi\/chromium,timopulkkinen\/BubbleFish,mogoweb\/chromium-crosswalk,Chilledheart\/chromium,Chilledheart\/chromium,anirudhSK\/chromium,hujiajie\/pa-chromium,fujunwei\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,M4sse\/chromium.src,Chilledheart\/chromium,zcbenz\/cefode-chromium,littlstar\/chromium.src,jaruba\/chromium.src,robclark\/chromium,krieger-od\/nwjs_chromium.src,zcbenz\/cefode-chromium,dednal\/chromium.src,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk,ltilve\/chromium,ltilve\/chromium,ChromiumWebApps\/chromium,TheTypoMaster\/chromium-crosswalk,anirudhSK\/chromium,ltilve\/chromium,PeterWangIntel\/chromium-crosswalk,Fireblend\/chromium-crosswalk,axinging\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,markYoungH\/chromium.src,hgl888\/chromium-crosswalk-efl,anirudhSK\/chromium,littlstar\/chromium.src,bright-sparks\/chromium-spacewalk,fujunwei\/chromium-crosswalk,ondra-novak\/chromium.src,timopulkkinen\/BubbleFish,Jonekee\/chromium.src,jaruba\/chromium.src,M4sse\/chromium.src,timopulkkinen\/BubbleFish,dushu1203\/chromium.src,markYoungH\/chromium.src,krieger-od\/nwjs_chromium.src,timopulkkinen\/BubbleFish,crosswalk-project\/chromium-crosswalk-efl,junmin-zhu\/chromium-rivertrail,axinging\/chromium-crosswalk,fujunwei\/chromium-crosswalk,patrickm\/chromium.src,hgl888\/chromium-crosswalk-efl,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,mohamed--abdel-maksoud\/chromium.src,M4sse\/chromium.src,ltilve\/chromium,hgl888\/chromium-crosswalk-efl,ltilve\/chromium,nacl-webkit\/chrome_deps,mohamed--abdel-maksoud\/chromium.src,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,anirudhSK\/chromium,M4sse\/chromium.src,M4sse\/chromium.src,Just-D\/chromium-1,Jonekee\/chromium.src,nacl-webkit\/chrome_deps,Pluto-tv\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,robclark\/chromium,zcbenz\/cefode-chromium,Pluto-tv\/chromium-crosswalk,mogoweb\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,anirudhSK\/chromium,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,pozdnyakov\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,zcbenz\/cefode-chromium,dednal\/chromium.src,fujunwei\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,nacl-webkit\/chrome_deps,dednal\/chromium.src,pozdnyakov\/chromium-crosswalk,ChromiumWebApps\/chromium,mohamed--abdel-maksoud\/chromium.src,chuan9\/chromium-crosswalk,markYoungH\/chromium.src,mohamed--abdel-maksoud\/chromium.src,junmin-zhu\/chromium-rivertrail,Chilledheart\/chromium,mohamed--abdel-maksoud\/chromium.src,zcbenz\/cefode-chromium,nacl-webkit\/chrome_deps,rogerwang\/chromium,jaruba\/chromium.src,pozdnyakov\/chromium-crosswalk,ltilve\/chromium,ltilve\/chromium,Just-D\/chromium-1,rogerwang\/chromium,PeterWangIntel\/chromium-crosswalk,ChromiumWebApps\/chromium,robclark\/chromium,jaruba\/chromium.src,timopulkkinen\/BubbleFish,ondra-novak\/chromium.src,Just-D\/chromium-1,Jonekee\/chromium.src,pozdnyakov\/chromium-crosswalk,rogerwang\/chromium,TheTypoMaster\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,chuan9\/chromium-crosswalk,dednal\/chromium.src,TheTypoMaster\/chromium-crosswalk,Jonekee\/chromium.src,ChromiumWebApps\/chromium,mogoweb\/chromium-crosswalk,Fireblend\/chromium-crosswalk,littlstar\/chromium.src,Just-D\/chromium-1,keishi\/chromium,nacl-webkit\/chrome_deps,chuan9\/chromium-crosswalk,anirudhSK\/chromium,ChromiumWebApps\/chromium,Fireblend\/chromium-crosswalk,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,nacl-webkit\/chrome_deps,M4sse\/chromium.src,dushu1203\/chromium.src,dednal\/chromium.src,dednal\/chromium.src,keishi\/chromium,jaruba\/chromium.src,anirudhSK\/chromium,patrickm\/chromium.src,ltilve\/chromium,robclark\/chromium,crosswalk-project\/chromium-crosswalk-efl,dushu1203\/chromium.src,robclark\/chromium,chuan9\/chromium-crosswalk,zcbenz\/cefode-chromium,crosswalk-project\/chromium-crosswalk-efl,jaruba\/chromium.src,dednal\/chromium.src,M4sse\/chromium.src,Chilledheart\/chromium,Fireblend\/chromium-crosswalk,markYoungH\/chromium.src,robclark\/chromium,hujiajie\/pa-chromium,Jonekee\/chromium.src,junmin-zhu\/chromium-rivertrail,ChromiumWebApps\/chromium,jaruba\/chromium.src,Fireblend\/chromium-crosswalk,ChromiumWebApps\/chromium,keishi\/chromium,junmin-zhu\/chromium-rivertrail,krieger-od\/nwjs_chromium.src,Pluto-tv\/chromium-crosswalk,dushu1203\/chromium.src,patrickm\/chromium.src,pozdnyakov\/chromium-crosswalk,ltilve\/chromium,dushu1203\/chromium.src,chuan9\/chromium-crosswalk,fujunwei\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk,Jonekee\/chromium.src,PeterWangIntel\/chromium-crosswalk,rogerwang\/chromium,hujiajie\/pa-chromium,chuan9\/chromium-crosswalk,axinging\/chromium-crosswalk,M4sse\/chromium.src,TheTypoMaster\/chromium-crosswalk,jaruba\/chromium.src,krieger-od\/nwjs_chromium.src,jaruba\/chromium.src,Chilledheart\/chromium,rogerwang\/chromium,markYoungH\/chromium.src,rogerwang\/chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- media\/filters\/decoder_base.h\n+++ media\/filters\/decoder_base.h\n@@ -27,7 +27,6 @@\n template \n class DecoderBase : public Decoder {\n public:\n- typedef CallbackRunner< Tuple1 > ReadCallback;\n \n \/\/ MediaFilter implementation.\n virtual void Stop(FilterCallback* callback) {\n@@ -188,7 +187,10 @@\n expecting_discontinuous_ = true;\n \n \/\/ Signal that we're done seeking.\n- callback->Run();\n+ if (callback) {\n+ callback->Run();\n+ delete callback;\n+ }\n }\n \n void InitializeTask(DemuxerStream* demuxer_stream, FilterCallback* callback) {\n@@ -302,9 +304,6 @@\n typedef std::deque > ResultQueue;\n ResultQueue result_queue_;\n \n- \/\/ Pause callback.\n- scoped_ptr pause_callback_;\n-\n \/\/ Simple state tracking variable.\n enum State {\n kUninitialized,\n"} {"commit":"42f09a4dbf2c6314be469273bc8592f18e516f61","subject":"sfdp def is added to windows config","message":"sfdp def is added to windows config\n","repos":"jho1965us\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,ellson\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,tkelman\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,tkelman\/graphviz,kbrock\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,jho1965us\/graphviz,kbrock\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,kbrock\/graphviz,ellson\/graphviz,kbrock\/graphviz,tkelman\/graphviz,tkelman\/graphviz,tkelman\/graphviz,kbrock\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,ellson\/graphviz,tkelman\/graphviz,tkelman\/graphviz,tkelman\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,pixelglow\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- windows\/config.h\n+++ windows\/config.h\n@@ -440,6 +440,7 @@\n #define PATHSEPARATOR \":\"\n \n \/* Define if you want SFDP *\/\n+#define SFDP 1\n \/* #undef SFDP *\/\n \n \/* Define if you want SMYRNA *\/\n"} {"commit":"b022f15b534c87cb3dddcd34e46da1bdae7d7ddd","subject":"marpa.w: marpa_g_rule_is_loop(): check if precomputed before rule validation","message":"marpa.w: marpa_g_rule_is_loop(): check if precomputed before rule validation\n","repos":"jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/libmarpa,jeffreykegler\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/kollos,jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- work\/dev\/marpa.w\n+++ work\/dev\/marpa.w\n@@ -2773,9 +2773,9 @@\n {\n @@;\n @@;\n+ @@;\n @@;\n @@;\n- @@;\n return XRL_by_ID(xrl_id)->t_is_loop;\n }\n \n"} {"commit":"312639bb1bc65abca243a6cee6e5364663d2dd7a","subject":"Revert \"[CRYPTO] cast6: inline bloat--\"","message":"Revert \"[CRYPTO] cast6: inline bloat--\"\n\nThis reverts commit e6ccc727f30a02670f6a00df6d548942bc988f43.\n\nAbove commit caused performance regression for CAST6. Reverting gives\nfollowing increase in tcrypt speed tests (revert-vs-old ratios).\n\nAMD Phenom II X6 1055T, x86-64:\n\nsize ecb cbc ctr lrw xts\n enc dec enc dec enc dec enc dec enc dec\n16b 1.15x 1.17x 1.16x 1.17x 1.16x 1.16x 1.14x 1.19x 1.05x 1.07x\n64b 1.19x 1.23x 1.20x 1.22x 1.19x 1.19x 1.16x 1.24x 1.12x 1.12x\n256b 1.21x 1.24x 1.22x 1.24x 1.20x 1.20x 1.17x 1.21x 1.16x 1.14x\n1kb 1.21x 1.25x 1.22x 1.24x 1.21x 1.21x 1.18x 1.22x 1.17x 1.15x\n8kb 1.21x 1.25x 1.22x 1.24x 1.21x 1.21x 1.18x 1.22x 1.18x 1.15x\n\nCc: Ilpo J\u00e4rvinen <5801dcaebe162b451612454667e6a167cf0222c1@helsinki.fi>\nSigned-off-by: Jussi Kivilinna <1f0aa498f7c1bee2bd6061b97aca51d7b122cec0@mbnet.fi>\nSigned-off-by: Herbert Xu \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crypto\/cast6_generic.c\n+++ crypto\/cast6_generic.c\n@@ -370,7 +370,7 @@\n };\n \n \/* forward octave *\/\n-static void W(u32 *key, unsigned int i)\n+static inline void W(u32 *key, unsigned int i)\n {\n \tu32 I;\n \tkey[6] ^= F1(key[7], Tr[i % 4][0], Tm[i][0]);\n@@ -434,7 +434,7 @@\n EXPORT_SYMBOL_GPL(cast6_setkey);\n \n \/*forward quad round*\/\n-static void Q(u32 *block, u8 *Kr, u32 *Km)\n+static inline void Q(u32 *block, u8 *Kr, u32 *Km)\n {\n \tu32 I;\n \tblock[2] ^= F1(block[3], Kr[0], Km[0]);\n@@ -444,7 +444,7 @@\n }\n \n \/*reverse quad round*\/\n-static void QBAR(u32 *block, u8 *Kr, u32 *Km)\n+static inline void QBAR(u32 *block, u8 *Kr, u32 *Km)\n {\n \tu32 I;\n \tblock[3] ^= F1(block[0], Kr[3], Km[3]);\n"} {"commit":"a6b57a534d5462cdc8656549218a3a031d77b174","subject":"examples\/ipsec_secgw: fix security session","message":"examples\/ipsec_secgw: fix security session\n\nFixes: 3da37f682173 (\"examples\/ipsec_secgw: create session mempools for ethdevs\")\n\nSome NICs do not have the rte_security context, this patch fixes the segment fault\ncaused by this.\n\nSigned-off-by: Fan Zhang \nAcked-by: Radu Nicolau \n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/ipsec-secgw\/ipsec-secgw.c\n+++ examples\/ipsec-secgw\/ipsec-secgw.c\n@@ -1384,10 +1384,16 @@\n \t\t\tmax_sess_sz = sess_sz;\n \t}\n \tfor (port_id = 0; port_id < rte_eth_dev_count(); port_id++) {\n+\t\tvoid *sec_ctx;\n+\n \t\tif ((enabled_port_mask & (1 << port_id)) == 0)\n \t\t\tcontinue;\n-\t\tsess_sz = rte_security_session_get_size(\n-\t\t\t\trte_eth_dev_get_sec_ctx(port_id));\n+\n+\t\tsec_ctx = rte_eth_dev_get_sec_ctx(port_id);\n+\t\tif (sec_ctx == NULL)\n+\t\t\tcontinue;\n+\n+\t\tsess_sz = rte_security_session_get_size(sec_ctx);\n \t\tif (sess_sz > max_sess_sz)\n \t\t\tmax_sess_sz = sess_sz;\n \t}\n"} {"commit":"fd4747d185f3b35d909bbedc7c70fe5d0ff63e17","subject":"SIFT: Fix TDI SH image output","message":"SIFT: Fix TDI SH image output\n","repos":"MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/dwi\/tractography\/SIFT\/output.h\n+++ src\/dwi\/tractography\/SIFT\/output.h\n@@ -167,7 +167,7 @@\n H_sh.stride (3) = 0;\n auto out = Image::create (path, H_sh);\n VoxelAccessor v (accessor());\n- for (auto l = Loop (out) (out, v); l; ++l) {\n+ for (auto l = Loop (v) (out, v); l; ++l) {\n if (v.value()) {\n Eigen::Matrix sum = Eigen::Matrix::Zero (N);\n for (typename Fixel_map::ConstIterator i = begin (v); i; ++i) {\n"} {"commit":"bde4aa8dc1946dff189c89396814a98d1052262d","subject":"Fix Coverity CID 1466708 - correct pointer calculation in one case","message":"Fix Coverity CID 1466708 - correct pointer calculation in one case\n\nReviewed-by: Paul Dale \n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/12894)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/http\/http_lib.c\n+++ crypto\/http\/http_lib.c\n@@ -89,7 +89,7 @@\n if (pport_num == NULL) {\n p = strchr(port, '\/');\n if (p == NULL)\n- p = p + strlen(port);\n+ p = host_end + 1 + strlen(port);\n } else { \/* make sure a numerical port value is given *\/\n portnum = strtol(port, &p, 10);\n if (p == port || (*p != '\\0' && *p != '\/'))\n"} {"commit":"e28e42a549a57fd2e6ac09cf9d99f90e90bb7854","subject":"Use sk_*_new_null() instead of sk_*_new(NULL). That avoids getting lots of silly warnings from the compiler.","message":"Use sk_*_new_null() instead of sk_*_new(NULL). That avoids getting\nlots of silly warnings from the compiler.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/ocsp\/ocsp_ext.c\n+++ crypto\/ocsp\/ocsp_ext.c\n@@ -447,7 +447,7 @@\n \tASN1_OBJECT *o = NULL;\n X509_EXTENSION *x = NULL;\n \n-\tif (!(sk = sk_ASN1_OBJECT_new(NULL))) goto err;\n+\tif (!(sk = sk_ASN1_OBJECT_new_null())) goto err;\n \twhile (oids && *oids)\n \t {\n \t\tif ((nid=OBJ_txt2nid(*oids))!=NID_undef&&(o=OBJ_nid2obj(nid))) \n@@ -500,7 +500,7 @@\n \t\n \tif (!(sloc = OCSP_SERVICELOC_new())) goto err;\n \tif (!(sloc->issuer = X509_NAME_dup(issuer))) goto err;\n-\tif (urls && *urls && !(sloc->locator = sk_ACCESS_DESCRIPTION_new(NULL))) goto err;\n+\tif (urls && *urls && !(sloc->locator = sk_ACCESS_DESCRIPTION_new_null())) goto err;\n \twhile (urls && *urls)\n \t {\n \t\tif (!(ad = ACCESS_DESCRIPTION_new())) goto err;\n"} {"commit":"499e159c089579eb4a3572e76d1b8171cb9c34aa","subject":"Don't put truncated hostnames in utmp","message":"Don't put truncated hostnames in utmp\n\nApproved by: jkh\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- crypto\/openssh\/login.c\n+++ crypto\/openssh\/login.c\n@@ -87,7 +87,7 @@\n \tstrncpy(u.ut_line, ttyname + 5, sizeof(u.ut_line));\n \tu.ut_time = time(NULL);\n \tstrncpy(u.ut_name, user, sizeof(u.ut_name));\n-\tstrncpy(u.ut_host, host, sizeof(u.ut_host));\n+\trealhostname_sa(u.ut_host, sizeof(u.ut_host), addr, addr->sa_len);\n \n \t\/* Figure out the file names. *\/\n \tutmp = _PATH_UTMP;\n"} {"commit":"53d2260c4078fed562cd7ce30e62817070fa39d6","subject":"Don't allow PKCS#7\/CMS encrypt with PSS.","message":"Don't allow PKCS#7\/CMS encrypt with PSS.\n\nReviewed-by: Rich Salz \nReviewed-by: Matt Caswell <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/2177)","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/rsa\/rsa_ameth.c\n+++ crypto\/rsa\/rsa_ameth.c\n@@ -413,6 +413,8 @@\n break;\n \n case ASN1_PKEY_CTRL_PKCS7_ENCRYPT:\n+ if (pkey_is_pss(pkey))\n+ return -2;\n if (arg1 == 0)\n PKCS7_RECIP_INFO_get0_alg(arg2, &alg);\n break;\n@@ -425,6 +427,8 @@\n break;\n \n case ASN1_PKEY_CTRL_CMS_ENVELOPE:\n+ if (pkey_is_pss(pkey))\n+ return -2;\n if (arg1 == 0)\n return rsa_cms_encrypt(arg2);\n else if (arg1 == 1)\n@@ -432,6 +436,8 @@\n break;\n \n case ASN1_PKEY_CTRL_CMS_RI_TYPE:\n+ if (pkey_is_pss(pkey))\n+ return -2;\n *(int *)arg2 = CMS_RECIPINFO_TRANS;\n return 1;\n #endif\n"} {"commit":"790555d6756285b3ec18e3efbb195cf33f217d8f","subject":"Don't check any revocation info on proxy certificates","message":"Don't check any revocation info on proxy certificates\n\nBecause proxy certificates typically come without any CRL information,\ntrying to check revocation on them will fail. Better not to try\nchecking such information for them at all.\n\nReviewed-by: Rich Salz \n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/x509\/x509_vfy.c\n+++ crypto\/x509\/x509_vfy.c\n@@ -843,6 +843,9 @@\n ctx->current_issuer = NULL;\n ctx->current_crl_score = 0;\n ctx->current_reasons = 0;\n+\n+ if (x->ex_flags & EXFLAG_PROXY)\n+ return 1;\n \n while (ctx->current_reasons != CRLDP_ALL_REASONS) {\n unsigned int last_reasons = ctx->current_reasons;\n"} {"commit":"7337fff2bfd88d4edbd1ad3e277aeea215e6aa6d","subject":"pfix-srsd: cleanup.","message":"pfix-srsd: cleanup.\n\nSigned-off-by: Florent Bruneau <5d0958454f46908a14eb42e25abfc486c9e7cb2c@intersec.com>\n","repos":"Fruneau\/pfixtools,Fruneau\/pfixtools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pfix-srsd\/main-srsd.c\n+++ pfix-srsd\/main-srsd.c\n@@ -68,8 +68,14 @@\n \/* Server {{{1\n *\/\n \n-static listener_t *decoder_ptr = NULL;\n-static listener_t *encoder_ptr = NULL;\n+static struct {\n+ listener_t *decoder_ptr;\n+ listener_t *encoder_ptr;\n+\n+ srs_config_t config;\n+} pfixsrsd_g;\n+#define _G pfixsrsd_g\n+\n \n static void *srsd_starter(listener_t *server)\n {\n@@ -106,7 +112,7 @@\n srs_config_t *config = vconfig;\n buffer_t *ibuf = client_input_buffer(srsd);\n buffer_t *obuf = client_output_buffer(srsd);\n- bool decoder = (client_data(srsd) == decoder_ptr);\n+ bool decoder = (client_data(srsd) == _G.decoder_ptr);\n int res = client_read(srsd);\n \n if ((res < 0 && errno != EINTR && errno != EAGAIN) || res == 0)\n@@ -191,13 +197,6 @@\n \/* config {{{1\n *\/\n \n-static srs_config_t config = {\n- .srs = NULL,\n- .domain = NULL,\n- .domainlen = 0,\n- .ignore_ext = false,\n- .separator = '\\0'\n-};\n \n \/** overload srs_free since the lib is not properly maintained.\n *\/\n@@ -217,9 +216,9 @@\n \n static void config_shutdown(void)\n {\n- if (config.srs) {\n- srs_free(config.srs);\n- config.srs = NULL;\n+ if (_G.config.srs) {\n+ srs_free(_G.config.srs);\n+ _G.config.srs = NULL;\n }\n }\n \n@@ -302,7 +301,7 @@\n { NULL, 0, NULL, 0 }\n };\n \n- for (int c = 0; (c = getopt_long(argc, argv, COMMON_DAEMON_OPTION_SHORTLIST \"Ie:d:s:\", longopts, NULL)) >= 0; ) {\n+ for (int c = 0; (c = getopt_long(argc, argv, COMMON_DAEMON_OPTION_SHORTLIST \"Ie:d:s:\", longopts, NULL)) >= 0;) {\n switch (c) {\n case 'e':\n port_enc = atoi(optarg);\n@@ -311,16 +310,16 @@\n port_dec = atoi(optarg);\n break;\n case 'I':\n- config.ignore_ext = true;\n+ _G.config.ignore_ext = true;\n break;\n case 's':\n if (m_strlen(optarg) != 1) {\n usage();\n return EXIT_FAILURE;\n }\n- config.separator = *optarg;\n- if (config.separator != '+' && config.separator != '-'\n- && config.separator != '=') {\n+ _G.config.separator = *optarg;\n+ if (_G.config.separator != '+' && _G.config.separator != '-'\n+ && _G.config.separator != '=') {\n usage();\n return EXIT_FAILURE;\n }\n@@ -336,23 +335,23 @@\n \n notice(\"%s v%s...\", DAEMON_NAME, DAEMON_VERSION);\n \n- config.domain = argv[optind];\n- config.domainlen = strlen(config.domain);\n- config.srs = srs_read_secrets(argv[optind + 1]);\n- if (config.srs == NULL) {\n+ _G.config.domain = argv[optind];\n+ _G.config.domainlen = strlen(_G.config.domain);\n+ _G.config.srs = srs_read_secrets(argv[optind + 1]);\n+ if (_G.config.srs == NULL) {\n return EXIT_FAILURE;\n }\n- if (config.separator != '\\0'\n- && srs_set_separator(config.srs, config.separator) == SRS_ESEPARATORINVALID) {\n+ if (_G.config.separator != '\\0'\n+ && srs_set_separator(_G.config.srs, _G.config.separator) == SRS_ESEPARATORINVALID) {\n return EXIT_FAILURE;\n }\n if (common_setup(pidfile, unsafe, RUNAS_USER, RUNAS_GROUP,\n daemonize) != EXIT_SUCCESS\n- || (encoder_ptr = start_listener(port_enc)) == NULL\n- || (decoder_ptr = start_listener(port_dec)) == NULL) {\n+ || (_G.encoder_ptr = start_listener(port_enc)) == NULL\n+ || (_G.decoder_ptr = start_listener(port_dec)) == NULL) {\n return EXIT_FAILURE;\n }\n- return server_loop(srsd_starter, NULL, process_srs, NULL, &config);\n+ return server_loop(srsd_starter, NULL, process_srs, NULL, &_G.config);\n }\n \n \/* vim:set et sw=4 sts=4 sws=4: *\/\n"} {"commit":"5c8233a1ac0138164b286da493096df38e7381a1","subject":"Bump the bugfix version number","message":"Bump the bugfix version number\n","repos":"box\/augmented_types,box\/augmented_types,box\/augmented_types","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- php_augmented_types.h\n+++ php_augmented_types.h\n@@ -1,7 +1,7 @@\n #ifndef PHP_AUGMENTED_TYPES_H\n #define PHP_AUGMENTED_TYPES_H\n \n-#define PHP_AUGMENTED_TYPES_VERSION \"0.5.3\"\n+#define PHP_AUGMENTED_TYPES_VERSION \"0.5.4\"\n #define PHP_AUGMENTED_TYPES_EXTNAME \"augmented_types\"\n \n #ifdef HAVE_CONFIG_H\n"} {"commit":"d0434864d65a3469b2cee7b97922d00dd3a7bb51","subject":"Fixed LazyList erratum","message":"Fixed LazyList erratum\n","repos":"eugenyk\/libcds,eugenyk\/libcds,eugenyk\/libcds,eugenyk\/libcds,eugenyk\/libcds","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- cds\/intrusive\/impl\/lazy_list.h\n+++ cds\/intrusive\/impl\/lazy_list.h\n@@ -1260,7 +1260,7 @@\n }\n \n m_Stat.onValidationFailed();\n- return true;\n+ return false;\n }\n \n static bool validate_link( node_type * pPred, node_type * pCur ) CDS_NOEXCEPT\n"} {"commit":"57c05296714bbb68ac627a5d45464d428fe641f9","subject":"fixed windows build break","message":"fixed windows build break\n\ngit-svn-id: fbb392d5347ebc45c06187f72dfd8bab02595dbf@566655 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/transport\/http\/server\/apache2\/apache2_stream.c\n+++ src\/core\/transport\/http\/server\/apache2\/apache2_stream.c\n@@ -105,7 +105,7 @@\n \n while ( count - len > 0 )\n {\n- read = ap_get_client_block(stream_impl->request, buffer + len, count - len);\n+ read = ap_get_client_block(stream_impl->request, (size_t)buffer + len, count - len);\n if (read > 0)\n {\n len += read;\n"} {"commit":"be57ad88877fe8babd2c932dee19aacfaecd5412","subject":"quota: Recalculation now also counts the namespace prefix mailbox's quota if it exists.","message":"quota: Recalculation now also counts the namespace prefix mailbox's quota if it exists.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/quota\/quota-count.c\n+++ src\/plugins\/quota\/quota-count.c\n@@ -83,7 +83,12 @@\n \t}\n \tif (mailbox_list_iter_deinit(&ctx) < 0)\n \t\tret = -1;\n-\n+\tif (ns->prefix_len > 0 && ret == 0 &&\n+\t (ns->prefix_len != 6 || strncasecmp(ns->prefix, \"INBOX\", 5) != 0)) {\n+\t\t\/* if the namespace prefix itself exists, count it also *\/\n+\t\tconst char *name = t_strndup(ns->prefix, ns->prefix_len-1);\n+\t\tret = quota_count_mailbox(root, ns, name, bytes, count);\n+\t}\n \treturn ret;\n }\n \n"} {"commit":"034d202759a2fa78bb5747c67717fa30d0a4be64","subject":"fix compile warning","message":"fix compile warning\n","repos":"e1528532\/libelektra,mpranj\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,e1528532\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/template\/template.c\n+++ src\/plugins\/template\/template.c\n@@ -69,7 +69,7 @@\n \treturn 1; \/\/ success\n }\n \n-int elektraTemplateCheckConfig (Key * errorKey, KeySet * conf)\n+int elektraTemplateCheckConfig (Key * errorKey ELEKTRA_UNUSED, KeySet * conf ELEKTRA_UNUSED)\n {\n \t\/\/ validate plugin configuration\n \t\/\/ this function is optional\n"} {"commit":"9ffd4511ad49ed3c9932579e17b5eca262ab5a0f","subject":"BUG(946): Make xmms_vorbis_read return -1 on error, not vorbis error code.","message":"BUG(946): Make xmms_vorbis_read return -1 on error, not vorbis error code.\n","repos":"oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,dreamerc\/xmms2,xmms2\/xmms2-stable,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman,xmms2\/xmms2-stable,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,theefer\/xmms2,six600110\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,chrippa\/xmms2,theefer\/xmms2,dreamerc\/xmms2,oneman\/xmms2-oneman,dreamerc\/xmms2,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,chrippa\/xmms2,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,six600110\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,six600110\/xmms2,dreamerc\/xmms2,chrippa\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/vorbis\/vorbisfile.c\n+++ src\/plugins\/vorbis\/vorbisfile.c\n@@ -369,17 +369,19 @@\n \tdata = xmms_xform_private_data_get (xform);\n \tg_return_val_if_fail (data, -1);\n \n-\tret = ov_read (&data->vorbisfile, (gchar *) buf, len,\n-\t G_BYTE_ORDER == G_BIG_ENDIAN,\n-\t xmms_sample_size_get (XMMS_SAMPLE_FORMAT_S16),\n-\t\t\t\t 1,\n-\t &c);\n-\n-\tif (!ret || ret < 0) {\n-\t\treturn ret;\n-\t}\n-\n-\tif (c != data->current) {\n+\tdo {\n+\t\tret = ov_read (&data->vorbisfile, (gchar *) buf, len,\n+\t\t G_BYTE_ORDER == G_BIG_ENDIAN,\n+\t\t xmms_sample_size_get (XMMS_SAMPLE_FORMAT_S16),\n+\t\t 1,\n+\t\t &c);\n+\t} while (ret == OV_HOLE);\n+\n+\tif (ret < 0) {\n+\t\treturn -1;\n+\t}\n+\n+\tif (ret && c != data->current) {\n \t\txmms_vorbis_read_metadata (xform, data);\n \t\tdata->current = c;\n \t}\n"} {"commit":"4cb333ed6a93591dd95c4cd4ddb84feb8092b002","subject":"fix security PR1101: unprivileged access to linux proc.* metrics on modern kernel","message":"fix security PR1101: unprivileged access to linux proc.* metrics on modern kernel\n\nSwitching to setres[ug]id(ID,ID,-1) from the prior sete[ug]id(ID)\nappears to make kernel 3.17.4 behave as prior ones did, so as to\nreject access by unprivileged pcp clients to others' \/proc\/$pid\/ data.\n(The open(2) still succeeds, but the subsequent read(2) gets EACCES.)\n","repos":"adfernandes\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,andyvand\/cygpcpfans,adfernandes\/pcp,tjanez\/pcp,prasincs\/pcp,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,prasincs\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,wuliming\/pcp,andyvand\/cygpcpfans,prasincs\/pcp,tjanez\/pcp,adfernandes\/pcp,tjanez\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,andyvand\/cygpcpfans,prasincs\/pcp,tjanez\/pcp,tjanez\/pcp,edwardt\/pcp,wuliming\/pcp,prasincs\/pcp,tjanez\/pcp,prasincs\/pcp,adfernandes\/pcp,wuliming\/pcp,adfernandes\/pcp,adfernandes\/pcp,edwardt\/pcp,edwardt\/pcp,aeg-aeg\/pcpfans,adfernandes\/pcp,wuliming\/pcp,prasincs\/pcp,edwardt\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,edwardt\/pcp,aeg-aeg\/pcpfans,edwardt\/pcp,wuliming\/pcp,wuliming\/pcp,wuliming\/pcp,tjanez\/pcp,andyvand\/cygpcpfans,edwardt\/pcp,prasincs\/pcp,edwardt\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pmdas\/linux_proc\/contexts.c\n+++ src\/pmdas\/linux_proc\/contexts.c\n@@ -133,8 +133,8 @@\n if (pp->state & CTX_GROUPID) {\n \taccessible++;\n \tif (basegid != pp->gid) {\n-\t if (setegid(pp->gid) < 0) {\n-\t\t__pmNotifyErr(LOG_ERR, \"setegid(%d) access failed: %s\\n\",\n+\t if (setresgid(pp->gid,pp->gid,-1) < 0) {\n+\t\t__pmNotifyErr(LOG_ERR, \"set*gid(%d) access failed: %s\\n\",\n \t\t\t pp->gid, osstrerror());\n \t\taccessible--;\n \t }\n@@ -143,8 +143,8 @@\n if (pp->state & CTX_USERID) {\n \taccessible++;\n \tif (baseuid != pp->uid) {\n-\t if (seteuid(pp->uid) < 0) {\n-\t\t__pmNotifyErr(LOG_ERR, \"seteuid(%d) access failed: %s\\n\",\n+\t if (setresuid(pp->uid,pp->uid,-1) < 0) {\n+\t\t__pmNotifyErr(LOG_ERR, \"set*uid(%d) access failed: %s\\n\",\n \t\t\t pp->uid, osstrerror());\n \t\taccessible--;\n \t }\n@@ -165,13 +165,13 @@\n \treturn 0;\n \n if ((pp->state & CTX_USERID) && baseuid != pp->uid) {\n-\tif (seteuid(baseuid) < 0)\n-\t __pmNotifyErr(LOG_ERR, \"seteuid(%d) revert failed: %s\\n\",\n+\tif (setresuid(baseuid,baseuid,-1) < 0)\n+\t __pmNotifyErr(LOG_ERR, \"set*uid(%d) revert failed: %s\\n\",\n \t\t\t baseuid, osstrerror());\n }\n if ((pp->state & CTX_GROUPID) && basegid != pp->gid) {\n-\tif (setegid(basegid) < 0)\n-\t __pmNotifyErr(LOG_ERR, \"setegid(%d) revert failed: %s\\n\",\n+\tif (setresgid(basegid,basegid,-1) < 0)\n+\t __pmNotifyErr(LOG_ERR, \"set*gid(%d) revert failed: %s\\n\",\n \t\t\t basegid, osstrerror());\n }\n return 0;\n"} {"commit":"a0c5ccad4ff912dbe8cf580495ea9e54710dd808","subject":"pmlogextract: minor code refactor to avoid coverity warning","message":"pmlogextract: minor code refactor to avoid coverity warning\n","repos":"adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pmlogextract\/pmlogextract.c\n+++ src\/pmlogextract\/pmlogextract.c\n@@ -391,9 +391,10 @@\n \t fprintf(stderr, \"skip_metric: Error: cannot realloc %ld bytes for skip_ml[]\\n\",\n \t\t (long)skip_ml_numpmid*sizeof(pmID));\n \t abandon_extract();\n-\t}\n-\tskip_ml = skip_ml_tmp;\n-\tskip_ml[skip_ml_numpmid-1] = pmid;\n+\t} else {\n+\t skip_ml = skip_ml_tmp;\n+\t skip_ml[skip_ml_numpmid-1] = pmid;\n+\t}\n }\n }\n \n"} {"commit":"37e1295c61f6b0c6d7ef3b97d7eec8fdd3bdb67c","subject":"refactor vp9 svc example encoder.","message":"refactor vp9 svc example encoder.\n\nPut rc stats related code into a separate function.\n\nChange-Id: I11808bb947079b5fd9e53dfa5894bf227ed0c4c6\n","repos":"webmproject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/vp9_spatial_svc_encoder.c\n+++ examples\/vp9_spatial_svc_encoder.c\n@@ -749,6 +749,96 @@\n }\n }\n \n+#if OUTPUT_RC_STATS\n+static void svc_output_rc_stats(\n+ vpx_codec_ctx_t *codec, vpx_codec_enc_cfg_t *enc_cfg,\n+ vpx_svc_layer_id_t *layer_id, const vpx_codec_cx_pkt_t *cx_pkt,\n+ struct RateControlStats *rc, VpxVideoWriter **outfile,\n+ const uint32_t frame_cnt, const double framerate) {\n+ int num_layers_encoded = 0;\n+ unsigned int sl, tl;\n+ uint64_t sizes[8];\n+ uint64_t sizes_parsed[8];\n+ int count = 0;\n+ double sum_bitrate = 0.0;\n+ double sum_bitrate2 = 0.0;\n+ vp9_zero(sizes);\n+ vp9_zero(sizes_parsed);\n+ vpx_codec_control(codec, VP9E_GET_SVC_LAYER_ID, layer_id);\n+ parse_superframe_index(cx_pkt->data.frame.buf, cx_pkt->data.frame.sz,\n+ sizes_parsed, &count);\n+ if (enc_cfg->ss_number_layers == 1) sizes[0] = cx_pkt->data.frame.sz;\n+ for (sl = 0; sl < enc_cfg->ss_number_layers; ++sl) {\n+ sizes[sl] = 0;\n+ if (cx_pkt->data.frame.spatial_layer_encoded[sl]) {\n+ sizes[sl] = sizes_parsed[num_layers_encoded];\n+ num_layers_encoded++;\n+ }\n+ }\n+ for (sl = 0; sl < enc_cfg->ss_number_layers; ++sl) {\n+ unsigned int sl2;\n+ uint64_t tot_size = 0;\n+ for (sl2 = 0; sl2 <= sl; ++sl2) {\n+ if (cx_pkt->data.frame.spatial_layer_encoded[sl2]) tot_size += sizes[sl2];\n+ }\n+ if (tot_size > 0)\n+ vpx_video_writer_write_frame(outfile[sl], cx_pkt->data.frame.buf,\n+ (size_t)(tot_size), cx_pkt->data.frame.pts);\n+ }\n+ for (sl = 0; sl < enc_cfg->ss_number_layers; ++sl) {\n+ if (cx_pkt->data.frame.spatial_layer_encoded[sl]) {\n+ for (tl = layer_id->temporal_layer_id; tl < enc_cfg->ts_number_layers;\n+ ++tl) {\n+ const int layer = sl * enc_cfg->ts_number_layers + tl;\n+ ++rc->layer_tot_enc_frames[layer];\n+ rc->layer_encoding_bitrate[layer] += 8.0 * sizes[sl];\n+ \/\/ Keep count of rate control stats per layer, for non-key\n+ \/\/ frames.\n+ if (tl == (unsigned int)layer_id->temporal_layer_id &&\n+ !(cx_pkt->data.frame.flags & VPX_FRAME_IS_KEY)) {\n+ rc->layer_avg_frame_size[layer] += 8.0 * sizes[sl];\n+ rc->layer_avg_rate_mismatch[layer] +=\n+ fabs(8.0 * sizes[sl] - rc->layer_pfb[layer]) \/\n+ rc->layer_pfb[layer];\n+ ++rc->layer_enc_frames[layer];\n+ }\n+ }\n+ }\n+ }\n+\n+ \/\/ Update for short-time encoding bitrate states, for moving\n+ \/\/ window of size rc->window, shifted by rc->window \/ 2.\n+ \/\/ Ignore first window segment, due to key frame.\n+ if (frame_cnt > (unsigned int)rc->window_size) {\n+ for (sl = 0; sl < enc_cfg->ss_number_layers; ++sl) {\n+ if (cx_pkt->data.frame.spatial_layer_encoded[sl])\n+ sum_bitrate += 0.001 * 8.0 * sizes[sl] * framerate;\n+ }\n+ if (frame_cnt % rc->window_size == 0) {\n+ rc->window_count += 1;\n+ rc->avg_st_encoding_bitrate += sum_bitrate \/ rc->window_size;\n+ rc->variance_st_encoding_bitrate +=\n+ (sum_bitrate \/ rc->window_size) * (sum_bitrate \/ rc->window_size);\n+ }\n+ }\n+\n+ \/\/ Second shifted window.\n+ if (frame_cnt > (unsigned int)(rc->window_size + rc->window_size \/ 2)) {\n+ for (sl = 0; sl < enc_cfg->ss_number_layers; ++sl) {\n+ sum_bitrate2 += 0.001 * 8.0 * sizes[sl] * framerate;\n+ }\n+\n+ if (frame_cnt > (unsigned int)(2 * rc->window_size) &&\n+ frame_cnt % rc->window_size == 0) {\n+ rc->window_count += 1;\n+ rc->avg_st_encoding_bitrate += sum_bitrate2 \/ rc->window_size;\n+ rc->variance_st_encoding_bitrate +=\n+ (sum_bitrate2 \/ rc->window_size) * (sum_bitrate2 \/ rc->window_size);\n+ }\n+ }\n+}\n+#endif\n+\n int main(int argc, const char **argv) {\n AppInput app_input;\n VpxVideoWriter *writer = NULL;\n@@ -770,9 +860,7 @@\n struct RateControlStats rc;\n vpx_svc_layer_id_t layer_id;\n vpx_svc_ref_frame_config_t ref_frame_config;\n- unsigned int sl, tl;\n- double sum_bitrate = 0.0;\n- double sum_bitrate2 = 0.0;\n+ unsigned int sl;\n double framerate = 30.0;\n #endif\n struct vpx_usec_timer timer;\n@@ -988,101 +1076,13 @@\n case VPX_CODEC_CX_FRAME_PKT: {\n SvcInternal_t *const si = (SvcInternal_t *)svc_ctx.internal;\n if (cx_pkt->data.frame.sz > 0) {\n-#if OUTPUT_RC_STATS\n- uint64_t sizes[8];\n- uint64_t sizes_parsed[8];\n- int count = 0;\n- vp9_zero(sizes);\n- vp9_zero(sizes_parsed);\n-#endif\n vpx_video_writer_write_frame(writer, cx_pkt->data.frame.buf,\n cx_pkt->data.frame.sz,\n cx_pkt->data.frame.pts);\n #if OUTPUT_RC_STATS\n- \/\/ TODO(marpan): Put this (to line728) in separate function.\n if (svc_ctx.output_rc_stat) {\n- int num_layers_encoded = 0;\n- vpx_codec_control(&codec, VP9E_GET_SVC_LAYER_ID, &layer_id);\n- parse_superframe_index(cx_pkt->data.frame.buf,\n- cx_pkt->data.frame.sz, sizes_parsed,\n- &count);\n- if (enc_cfg.ss_number_layers == 1)\n- sizes[0] = cx_pkt->data.frame.sz;\n- for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {\n- sizes[sl] = 0;\n- if (cx_pkt->data.frame.spatial_layer_encoded[sl]) {\n- sizes[sl] = sizes_parsed[num_layers_encoded];\n- num_layers_encoded++;\n- }\n- }\n- for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {\n- unsigned int sl2;\n- uint64_t tot_size = 0;\n- for (sl2 = 0; sl2 <= sl; ++sl2) {\n- if (cx_pkt->data.frame.spatial_layer_encoded[sl2])\n- tot_size += sizes[sl2];\n- }\n- if (tot_size > 0)\n- vpx_video_writer_write_frame(\n- outfile[sl], cx_pkt->data.frame.buf, (size_t)(tot_size),\n- cx_pkt->data.frame.pts);\n- }\n- for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {\n- if (cx_pkt->data.frame.spatial_layer_encoded[sl]) {\n- for (tl = layer_id.temporal_layer_id;\n- tl < enc_cfg.ts_number_layers; ++tl) {\n- const int layer = sl * enc_cfg.ts_number_layers + tl;\n- ++rc.layer_tot_enc_frames[layer];\n- rc.layer_encoding_bitrate[layer] += 8.0 * sizes[sl];\n- \/\/ Keep count of rate control stats per layer, for non-key\n- \/\/ frames.\n- if (tl == (unsigned int)layer_id.temporal_layer_id &&\n- !(cx_pkt->data.frame.flags & VPX_FRAME_IS_KEY)) {\n- rc.layer_avg_frame_size[layer] += 8.0 * sizes[sl];\n- rc.layer_avg_rate_mismatch[layer] +=\n- fabs(8.0 * sizes[sl] - rc.layer_pfb[layer]) \/\n- rc.layer_pfb[layer];\n- ++rc.layer_enc_frames[layer];\n- }\n- }\n- }\n- }\n-\n- \/\/ Update for short-time encoding bitrate states, for moving\n- \/\/ window of size rc->window, shifted by rc->window \/ 2.\n- \/\/ Ignore first window segment, due to key frame.\n- if (frame_cnt > (unsigned int)rc.window_size) {\n- for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {\n- if (cx_pkt->data.frame.spatial_layer_encoded[sl])\n- sum_bitrate += 0.001 * 8.0 * sizes[sl] * framerate;\n- }\n- if (frame_cnt % rc.window_size == 0) {\n- rc.window_count += 1;\n- rc.avg_st_encoding_bitrate += sum_bitrate \/ rc.window_size;\n- rc.variance_st_encoding_bitrate +=\n- (sum_bitrate \/ rc.window_size) *\n- (sum_bitrate \/ rc.window_size);\n- sum_bitrate = 0.0;\n- }\n- }\n-\n- \/\/ Second shifted window.\n- if (frame_cnt >\n- (unsigned int)(rc.window_size + rc.window_size \/ 2)) {\n- for (sl = 0; sl < enc_cfg.ss_number_layers; ++sl) {\n- sum_bitrate2 += 0.001 * 8.0 * sizes[sl] * framerate;\n- }\n-\n- if (frame_cnt > (unsigned int)(2 * rc.window_size) &&\n- frame_cnt % rc.window_size == 0) {\n- rc.window_count += 1;\n- rc.avg_st_encoding_bitrate += sum_bitrate2 \/ rc.window_size;\n- rc.variance_st_encoding_bitrate +=\n- (sum_bitrate2 \/ rc.window_size) *\n- (sum_bitrate2 \/ rc.window_size);\n- sum_bitrate2 = 0.0;\n- }\n- }\n+ svc_output_rc_stats(&codec, &enc_cfg, &layer_id, cx_pkt, &rc,\n+ outfile, frame_cnt, framerate);\n }\n #endif\n }\n"} {"commit":"4940ae24b83938e7ce5b87319f65050bf60b8e7b","subject":"Fix typo","message":"Fix typo\n","repos":"keisuke-umezawa\/chainer,aonotas\/chainer,jnishi\/chainer,ktnyt\/chainer,cemoody\/chainer,kikusu\/chainer,keisuke-umezawa\/chainer,keisuke-umezawa\/chainer,ronekko\/chainer,niboshi\/chainer,kiyukuta\/chainer,benob\/chainer,rezoo\/chainer,kashif\/chainer,wkentaro\/chainer,okuta\/chainer,pfnet\/chainer,chainer\/chainer,jnishi\/chainer,anaruse\/chainer,ktnyt\/chainer,cupy\/cupy,delta2323\/chainer,jnishi\/chainer,cupy\/cupy,AlpacaDB\/chainer,keisuke-umezawa\/chainer,niboshi\/chainer,ktnyt\/chainer,okuta\/chainer,AlpacaDB\/chainer,tkerola\/chainer,kikusu\/chainer,niboshi\/chainer,chainer\/chainer,cupy\/cupy,ktnyt\/chainer,chainer\/chainer,niboshi\/chainer,jnishi\/chainer,wkentaro\/chainer,chainer\/chainer,hvy\/chainer,hvy\/chainer,okuta\/chainer,wkentaro\/chainer,ysekky\/chainer,cupy\/cupy,okuta\/chainer,wkentaro\/chainer,hvy\/chainer,hvy\/chainer,benob\/chainer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cupy\/cuda\/cupy_cudnn.h\n+++ cupy\/cuda\/cupy_cudnn.h\n@@ -24,7 +24,7 @@\n const cudnnTensorDescriptor_t dyDesc, const void* dy,\n const cudnnConvolutionDescriptor_t convDesc,\n cudnnConvolutionBwdFilterAlgo_t algo,\n- void* workSpace, size_t workSpaceSizeInBytes, constt void* beta,\n+ void* workSpace, size_t workSpaceSizeInBytes, const void* beta,\n const cudnnFilterDescriptor_t dwDesc, void* dw);\n \n cudnnStatus_t CUDNNWINAPI cudnnGetConvolutionBackwardFilterWorkspaceSize(\n@@ -32,7 +32,7 @@\n const cudnnTensorDescriptor_t dyDesc,\n const cudnnConvolutionDescriptor_t convDes,\n const cudnnFilterDescriptor_t gradDes,\n- cudnnConvolutionBwdFilterAlgo_t algo,size_t* sizeInBytes);\n+ cudnnConvolutionBwdFilterAlgo_t algo, size_t* sizeInBytes);\n \n cudnnStatus_t cudnnGetConvolutionBackwardFilterAlgorithm(\n cudnnHandle_t handle, const cudnnTensorDescriptor_t xDesc,\n"} {"commit":"957ad9ed2778591a8edc8d4ac6eebd8f0a0f871b","subject":"afp: fixup retrieval of user id and uuid.","message":"afp: fixup retrieval of user id and uuid.\n\nSeems like the afp server in OS X will give invalid replies to the\nFPGetUserInfo command when asking for the group id. Therefore we know try to\nretrieve the group id in a separate request so that we atleast are able to get\nthe user id and uuid.\n","repos":"philipl\/gvfs,gicmo\/gvfs,halfline\/gvfs,xkahn\/gvfs-cmis,gicmo\/gvfs,philipl\/gvfs,xkahn\/gvfs-cmis,xkahn\/gvfs-cmis,gicmo\/gvfs,xkahn\/gvfs-cmis,gicmo\/gvfs,halfline\/gvfs,philipl\/gvfs,halfline\/gvfs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- daemon\/gvfsafpserver.c\n+++ daemon\/gvfsafpserver.c\n@@ -47,6 +47,7 @@\n \n guint32 user_id;\n guint32 group_id;\n+ guint64 uuid;\n };\n \n #define AFP_UAM_NO_USER \"No User Authent\"\n@@ -864,33 +865,31 @@\n return FALSE;\n }\n \n-static gboolean\n-get_userinfo (GVfsAfpServer *server,\n- GCancellable *cancellable,\n- GError **error)\n+static GVfsAfpReply *\n+command_get_user_info (GVfsAfpServer *server,\n+ guint16 bitmap,\n+ GCancellable *cancellable,\n+ GError **error)\n {\n GVfsAfpServerPrivate *priv = server->priv;\n \n GVfsAfpCommand *comm;\n- guint16 bitmap;\n-\n GVfsAfpReply *reply;\n AfpResultCode res_code;\n-\n+ \n comm = g_vfs_afp_command_new (AFP_COMMAND_GET_USER_INFO);\n \/* Flags, ThisUser = 1 *\/\n g_vfs_afp_command_put_byte (comm, 0x01);\n \/* UserId *\/\n g_vfs_afp_command_put_int32 (comm, 0);\n \/* Bitmap *\/\n- bitmap = AFP_GET_USER_INFO_BITMAP_GET_UID_BIT | AFP_GET_USER_INFO_BITMAP_GET_GID_BIT;\n g_vfs_afp_command_put_uint16 (comm, bitmap);\n \n reply = g_vfs_afp_connection_send_command_sync (priv->conn, comm, cancellable,\n error);\n g_object_unref (comm);\n if (!reply)\n- return FALSE;\n+ return NULL;\n \n res_code = g_vfs_afp_reply_get_result_code (reply);\n if (res_code != AFP_RESULT_NO_ERROR)\n@@ -921,26 +920,63 @@\n g_propagate_error (error, afp_result_code_to_gerror (res_code));\n break;\n }\n- return FALSE;\n- }\n-\n+ return NULL;\n+ }\n+\n+ return reply;\n+}\n+\n+static gboolean\n+get_userinfo (GVfsAfpServer *server,\n+ GCancellable *cancellable,\n+ GError **error)\n+{\n+ GVfsAfpServerPrivate *priv = server->priv;\n+\n+ gboolean res = FALSE;\n+ GVfsAfpReply *reply = NULL;\n+ guint16 bitmap;\n+\n+ bitmap = AFP_GET_USER_INFO_BITMAP_GET_UID_BIT | AFP_GET_USER_INFO_BITMAP_GET_UUID_BIT;\n+ reply = command_get_user_info (server, bitmap, cancellable, error);\n+ if (!reply)\n+ goto done;\n+ \n \/* Bitmap *\/\n REPLY_READ_UINT16 (reply, &bitmap);\n-\n- if (bitmap & AFP_GET_USER_INFO_BITMAP_GET_UID_BIT)\n- REPLY_READ_UINT16 (reply, &priv->user_id);\n- \n- if (bitmap & AFP_GET_USER_INFO_BITMAP_GET_GID_BIT)\n- REPLY_READ_UINT16 (reply, &priv->group_id);\n- \n- g_object_unref (reply);\n- \n- return TRUE;\n+ if (bitmap != (AFP_GET_USER_INFO_BITMAP_GET_UID_BIT | AFP_GET_USER_INFO_BITMAP_GET_UUID_BIT))\n+ goto invalid_reply;\n+\n+ REPLY_READ_UINT32 (reply, &priv->user_id);\n+ REPLY_READ_UINT64 (reply, &priv->uuid);\n+\n+ g_clear_object (&reply);\n+\n+ \/* We try to get the group id separately since seems to give an invalid reply\n+ * on some OS X versions. *\/\n+ bitmap = AFP_GET_USER_INFO_BITMAP_GET_GID_BIT;\n+ reply = command_get_user_info (server, bitmap, cancellable, error);\n+ if (!reply)\n+ goto done;\n+\n+ \/* Bitmap *\/\n+ REPLY_READ_UINT16 (reply, &bitmap);\n+ if (bitmap != AFP_GET_USER_INFO_BITMAP_GET_GID_BIT)\n+ goto invalid_reply;\n+\n+ \/* Don't check for errors since it's known to fail on some servers. *\/\n+ g_vfs_afp_reply_read_uint32 (reply, &priv->group_id);\n+\n+ res = TRUE;\n+\n+done:\n+ g_clear_object (&reply);\n+ return res;\n \n invalid_reply:\n g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,\n _(\"Received invalid reply from server\"));\n- return FALSE;\n+ goto done;\n }\n \n gboolean\n"} {"commit":"f0aeb8bff0fe9de50e1e4093ef86ff8f17a9b1b0","subject":"ARM: kprobes: Reject probing of SETEND instructions","message":"ARM: kprobes: Reject probing of SETEND instructions\n\nThe emulation of SETEND was broken as it changed the endianess for\nthe running kprobes handling code. Rather than adding a new simulation\nroutine to fix this we'll just reject probing of SETEND as these should\nbe very rare in the kernel.\n\nNote, the function emulate_none is now unused but it is left in the\nsource code as future patches will use it.\n\nSigned-off-by: Jon Medhurst <90cd1a2bf502062a09a1a38db4b5d470886df04b@yxit.co.uk>\nSigned-off-by: Nicolas Pitre <408789a210b05fb3b46935e815320d62ba00a06e@linaro.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/kernel\/kprobes-decode.c\n+++ arch\/arm\/kernel\/kprobes-decode.c\n@@ -956,11 +956,6 @@\n \t}\n \n \t\/* SETEND : 1111 0001 0000 0001 xxxx xxxx 0000 xxxx *\/\n-\tif ((insn & 0xffff00f0) == 0xf1010000) {\n-\t\tasi->insn[0] = insn;\n-\t\tasi->insn_handler = emulate_none;\n-\t\treturn INSN_GOOD;\n-\t}\n \n \t\/* Coprocessor instructions... *\/\n \t\/* MCRR2 : 1111 1100 0100 xxxx xxxx xxxx xxxx xxxx : (Rd != Rn) *\/\n"} {"commit":"c9aafd23d6c1b466f37f554e9916886e7d4645d0","subject":"ARM: OMAP2+: hwmod: provide a function to return the address space of the MPU RT","message":"ARM: OMAP2+: hwmod: provide a function to return the address space of the MPU RT\n\nA subsequent patch will need to know the struct omap_hwmod_addr_space\nrecord corresponding to the module's register target, used by the MPU.\nSo, convert _find_mpu_rt_base() into _find_mpu_rt_addr_space(). Then\nmodify its sole current user, _populate_mpu_rt_base(), to extract the\nMPU RT base address itself from the struct omap_hwmod_addr_space record.\n\nSigned-off-by: Paul Walmsley \nCc: Beno\u00eet Cousson <1f57ac750b0b4fd69f24c35d4e23093b91dc3e77@ti.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-omap2\/omap_hwmod.c\n+++ arch\/arm\/mach-omap2\/omap_hwmod.c\n@@ -884,24 +884,22 @@\n }\n \n \/**\n- * _find_mpu_rt_base - find hwmod register target base addr accessible by MPU\n- * @oh: struct omap_hwmod *\n- *\n- * Return the virtual address of the base of the register target of\n- * device @oh, or NULL on error.\n- *\/\n-static void __iomem * __init _find_mpu_rt_base(struct omap_hwmod *oh, u8 index)\n+ * _find_mpu_rt_addr_space - return MPU register target address space for @oh\n+ * @oh: struct omap_hwmod *\n+ *\n+ * Returns a pointer to the struct omap_hwmod_addr_space record representing\n+ * the register target MPU address space; or returns NULL upon error.\n+ *\/\n+static struct omap_hwmod_addr_space * __init _find_mpu_rt_addr_space(struct omap_hwmod *oh)\n {\n \tstruct omap_hwmod_ocp_if *os;\n \tstruct omap_hwmod_addr_space *mem;\n-\tint i = 0, found = 0;\n-\tvoid __iomem *va_start;\n-\n-\tif (!oh || oh->slaves_cnt == 0)\n+\tint found = 0, i = 0;\n+\n+\tif (!oh || oh->_int_flags & _HWMOD_NO_MPU_PORT || oh->slaves_cnt == 0)\n \t\treturn NULL;\n \n-\tos = oh->slaves[index];\n-\n+\tos = oh->slaves[oh->_mpu_port_index];\n \tif (!os->addr)\n \t\treturn NULL;\n \n@@ -911,20 +909,7 @@\n \t\t\tfound = 1;\n \t} while (!found && mem->pa_start != mem->pa_end);\n \n-\tif (found) {\n-\t\tva_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);\n-\t\tif (!va_start) {\n-\t\t\tpr_err(\"omap_hwmod: %s: Could not ioremap\\n\", oh->name);\n-\t\t\treturn NULL;\n-\t\t}\n-\t\tpr_debug(\"omap_hwmod: %s: MPU register target at va %p\\n\",\n-\t\t\t oh->name, va_start);\n-\t} else {\n-\t\tpr_debug(\"omap_hwmod: %s: no MPU register target found\\n\",\n-\t\t\t oh->name);\n-\t}\n-\n-\treturn (found) ? va_start : NULL;\n+\treturn (found) ? mem : NULL;\n }\n \n \/**\n@@ -1813,10 +1798,32 @@\n *\/\n static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)\n {\n+\tstruct omap_hwmod_addr_space *mem;\n+\tvoid __iomem *va_start;\n+\n+\tif (!oh)\n+\t\treturn;\n+\n \tif (oh->_int_flags & _HWMOD_NO_MPU_PORT)\n \t\treturn;\n \n-\toh->_mpu_rt_va = _find_mpu_rt_base(oh, oh->_mpu_port_index);\n+\tmem = _find_mpu_rt_addr_space(oh);\n+\tif (!mem) {\n+\t\tpr_debug(\"omap_hwmod: %s: no MPU register target found\\n\",\n+\t\t\t oh->name);\n+\t\treturn;\n+\t}\n+\n+\tva_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);\n+\tif (!va_start) {\n+\t\tpr_err(\"omap_hwmod: %s: Could not ioremap\\n\", oh->name);\n+\t\treturn;\n+\t}\n+\n+\tpr_debug(\"omap_hwmod: %s: MPU register target at va %p\\n\",\n+\t\t oh->name, va_start);\n+\n+\toh->_mpu_rt_va = va_start;\n }\n \n \/**\n"} {"commit":"57775e09995210e650ad555770e3f6fdbd3a2284","subject":"example: update for new caps","message":"example: update for new caps\n","repos":"barisdemiray\/gst-rtsp-server,hsteinhaus\/gst-rtsp-server,thaytan\/gst-rtsp-server,barisdemiray\/gst-rtsp-server,thaytan\/gst-rtsp-server,Lachann\/gst-rtsp-server,surround-io\/gst-rtsp-server,hsteinhaus\/gst-rtsp-server,hsteinhaus\/gst-rtsp-server,thaytan\/gst-rtsp-server,Lachann\/gst-rtsp-server,surround-io\/gst-rtsp-server,surround-io\/gst-rtsp-server,Lachann\/gst-rtsp-server,barisdemiray\/gst-rtsp-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/test-auth.c\n+++ examples\/test-auth.c\n@@ -62,9 +62,9 @@\n * element with pay%d names will be a stream *\/\n factory = gst_rtsp_media_factory_new ();\n gst_rtsp_media_factory_set_launch (factory, \"( \"\n- \"videotestsrc ! video\/x-raw-yuv,width=352,height=288,framerate=15\/1 ! \"\n+ \"videotestsrc ! video\/x-raw,width=352,height=288,framerate=15\/1 ! \"\n \"x264enc ! rtph264pay name=pay0 pt=96 \"\n- \"audiotestsrc ! audio\/x-raw-int,rate=8000 ! \"\n+ \"audiotestsrc ! audio\/x-raw,rate=8000 ! \"\n \"alawenc ! rtppcmapay name=pay1 pt=97 \" \")\");\n \n \/* make a new authentication manager *\/\n@@ -80,7 +80,7 @@\n \/* make another factory *\/\n factory = gst_rtsp_media_factory_new ();\n gst_rtsp_media_factory_set_launch (factory, \"( \"\n- \"videotestsrc ! video\/x-raw-yuv,width=352,height=288,framerate=30\/1 ! \"\n+ \"videotestsrc ! video\/x-raw,width=352,height=288,framerate=30\/1 ! \"\n \"x264enc ! rtph264pay name=pay0 pt=96 )\");\n \/* make a new authentication manager *\/\n auth = gst_rtsp_auth_new ();\n"} {"commit":"8f40dcebefd4a9e8fa24d2ac5e3fd5e410eea58d","subject":"cris: arch-v10: kgdb: Use BAR instead of DTP0 for register P12","message":"cris: arch-v10: kgdb: Use BAR instead of DTP0 for register P12\n\nFor arch-v10, there is no DTP0 register, and at present, assembler know\nBAR, so use BAR instead of DTP0, the related error (with allmodconfig):\n\n CC arch\/cris\/arch-v10\/kernel\/kgdb.o\n {standard input}: Assembler messages:\n {standard input}:6: Error: Illegal operands\n {standard input}:6: Error: Illegal operands\n\nSigned-off-by: Chen Gang <080e0242401949f8c1dfb399e414be816846daae@gmail.com>\nAcked-by: Hans-Peter Nilsson \nSigned-off-by: Jesper Nilsson \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/cris\/arch-v10\/kernel\/kgdb.c\n+++ arch\/cris\/arch-v10\/kernel\/kgdb.c\n@@ -953,7 +953,7 @@\n \" move $ibr,[cris_reg+0x4E] ; P9,\\n\"\n \" move $irp,[cris_reg+0x52] ; P10,\\n\"\n \" move $srp,[cris_reg+0x56] ; P11,\\n\"\n-\" move $dtp0,[cris_reg+0x5A] ; P12, register BAR, assembler might not know BAR\\n\"\n+\" move $bar,[cris_reg+0x5A] ; P12,\\n\"\n \" ; P13, register DCCR already saved\\n\"\n \";; Due to the old assembler-versions BRP might not be recognized\\n\"\n \" .word 0xE670 ; move brp,r0\\n\"\n@@ -1046,7 +1046,7 @@\n \" move $ibr,[cris_reg+0x4E] ; P9,\\n\"\n \" move $irp,[cris_reg+0x52] ; P10,\\n\"\n \" move $srp,[cris_reg+0x56] ; P11,\\n\"\n-\" move $dtp0,[cris_reg+0x5A] ; P12, register BAR, assembler might not know BAR\\n\"\n+\" move $bar,[cris_reg+0x5A] ; P12,\\n\"\n \" ; P13, register DCCR already saved\\n\"\n \";; Due to the old assembler-versions BRP might not be recognized\\n\"\n \" .word 0xE670 ; move brp,r0\\n\"\n"} {"commit":"2f9ee82c2a1af01966cedaa9cb144acb6fca9932","subject":"MIPS: Add MIPS R5 config5 register.","message":"MIPS: Add MIPS R5 config5 register.\n\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/mips\/include\/asm\/mipsregs.h\n+++ arch\/mips\/include\/asm\/mipsregs.h\n@@ -602,6 +602,13 @@\n #define MIPS_CONF4_MMUSIZEEXT\t(_ULCAST_(255) << 0)\n #define MIPS_CONF4_MMUEXTDEF\t(_ULCAST_(3) << 14)\n #define MIPS_CONF4_MMUEXTDEF_MMUSIZEEXT (_ULCAST_(1) << 14)\n+\n+#define MIPS_CONF5_NF\t\t(_ULCAST_(1) << 0)\n+#define MIPS_CONF5_UFR\t\t(_ULCAST_(1) << 2)\n+#define MIPS_CONF5_MSAEN\t(_ULCAST_(1) << 27)\n+#define MIPS_CONF5_EVA\t\t(_ULCAST_(1) << 28)\n+#define MIPS_CONF5_CV\t\t(_ULCAST_(1) << 29)\n+#define MIPS_CONF5_K\t\t(_ULCAST_(1) << 30)\n \n #define MIPS_CONF6_SYND\t\t(_ULCAST_(1) << 13)\n \n"} {"commit":"fa8d9d74c360726fe743b08af00ee3d0e0eb8bc1","subject":"OpenRISC: Remove memory_start\/end prototypes","message":"OpenRISC: Remove memory_start\/end prototypes\n\nOpenRISC does not have global memory_start and memory_end\nsymbols.\nThe prototypes are in vain.\n\nSigned-off-by: Richard Weinberger <320bca71fc381a4a025636043ca86e734e31cf8b@nod.at>\nSigned-off-by: Jonas Bonn <35a2c6fae61f8077aab61faa4019722abf05093c@southpole.se>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/openrisc\/include\/asm\/page.h\n+++ arch\/openrisc\/include\/asm\/page.h\n@@ -71,9 +71,6 @@\n #define __pgd(x)\t((pgd_t) { (x) })\n #define __pgprot(x)\t((pgprot_t) { (x) })\n \n-extern unsigned long memory_start;\n-extern unsigned long memory_end;\n-\n #endif \/* !__ASSEMBLY__ *\/\n \n \n"} {"commit":"3f9455d488ca97f68a1c99c7473c26030261b713","subject":"PCI: powerpc: use generic pci_swizzle_interrupt_pin()","message":"PCI: powerpc: use generic pci_swizzle_interrupt_pin()\n\nUse the generic pci_swizzle_interrupt_pin() instead of arch-specific code.\n\nAcked-by: Benjamin Herrenschmidt \nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nSigned-off-by: Jesse Barnes \n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/powerpc\/kernel\/prom_parse.c\n+++ arch\/powerpc\/kernel\/prom_parse.c\n@@ -231,11 +231,6 @@\n \treturn __of_address_to_resource(dev, addrp, size, flags, r);\n }\n EXPORT_SYMBOL_GPL(of_pci_address_to_resource);\n-\n-static u8 of_irq_pci_swizzle(u8 slot, u8 pin)\n-{\n-\treturn (((pin - 1) + slot) % 4) + 1;\n-}\n \n int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq)\n {\n@@ -306,7 +301,7 @@\n \t\t\/* We can only get here if we hit a P2P bridge with no node,\n \t\t * let's do standard swizzling and try again\n \t\t *\/\n-\t\tlspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec);\n+\t\tlspec = pci_swizzle_interrupt_pin(pdev, lspec);\n \t\tpdev = ppdev;\n \t}\n \n"} {"commit":"19242b240793ac769f5b91b68a5e43dd39f0c530","subject":"[PATCH] powerpc: Fix 64k pages on non-partitioned machines","message":"[PATCH] powerpc: Fix 64k pages on non-partitioned machines\n\nThe page size encoding passed to tlbie is incorrect for new-style\nlarge pages. This fixes it. This doesn't affect anything on older\nmachines because mmu_psize_defs[psize].penc (the page size encoding)\nis 0 for 4k and 16M pages (the two are distinguished by a separate \"is\na large page\" bit).\n\nSigned-off-by: Benjamin Herrenschmidt \nSigned-off-by: Arnd Bergmann <31ce0e01d6a887319e98c2278af71350d5f64c4f@de.ibm.com>\nSigned-off-by: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/powerpc\/mm\/hash_native_64.c\n+++ arch\/powerpc\/mm\/hash_native_64.c\n@@ -52,7 +52,7 @@\n \tdefault:\n \t\tpenc = mmu_psize_defs[psize].penc;\n \t\tva &= ~((1ul << mmu_psize_defs[psize].shift) - 1);\n-\t\tva |= (0x7f >> (8 - penc)) << 12;\n+\t\tva |= penc << 12;\n \t\tasm volatile(\"tlbie %0,1\" : : \"r\" (va) : \"memory\");\n \t\tbreak;\n \t}\n@@ -74,7 +74,7 @@\n \tdefault:\n \t\tpenc = mmu_psize_defs[psize].penc;\n \t\tva &= ~((1ul << mmu_psize_defs[psize].shift) - 1);\n-\t\tva |= (0x7f >> (8 - penc)) << 12;\n+\t\tva |= penc << 12;\n \t\tasm volatile(\".long 0x7c000224 | (%0 << 11) | (1 << 21)\"\n \t\t\t : : \"r\"(va) : \"memory\");\n \t\tbreak;\n"} {"commit":"bfc906d885762cd5e9381c1815b18bd7753cedf5","subject":"SH: pci-sh7780: enable big-endian operation.","message":"SH: pci-sh7780: enable big-endian operation.\n\nIf in big-endian mode, switch the PCI bus, too.\n\nTested on both litte-endian and big-endian sh7785lcr.\n\nSigned-off-by: Thomas Schwinge <5f50a84c1fa3bcff146405017f36aec1a10a9e38@codesourcery.com>\nCc: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\nCc: 44787936a129ada0ae74fc72686d393c1cd5ee40@vger.kernel.org\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/sh\/drivers\/pci\/pci-sh7780.c\n+++ arch\/sh\/drivers\/pci\/pci-sh7780.c\n@@ -20,6 +20,13 @@\n #include \"pci-sh4.h\"\n #include \n #include \n+\n+#if defined(CONFIG_CPU_BIG_ENDIAN)\n+# define PCICR_ENDIANNESS SH4_PCICR_BSWP\n+#else\n+# define PCICR_ENDIANNESS 0\n+#endif\n+\n \n static struct resource sh7785_pci_resources[] = {\n \t{\n@@ -254,7 +261,7 @@\n \t__raw_writel(PCIECR_ENBL, PCIECR);\n \n \t\/* Reset *\/\n-\t__raw_writel(SH4_PCICR_PREFIX | SH4_PCICR_PRST,\n+\t__raw_writel(SH4_PCICR_PREFIX | SH4_PCICR_PRST | PCICR_ENDIANNESS,\n \t\t chan->reg_base + SH4_PCICR);\n \n \t\/*\n@@ -290,7 +297,8 @@\n \t * Now throw it in to register initialization mode and\n \t * start the real work.\n \t *\/\n-\t__raw_writel(SH4_PCICR_PREFIX, chan->reg_base + SH4_PCICR);\n+\t__raw_writel(SH4_PCICR_PREFIX | PCICR_ENDIANNESS,\n+\t\t chan->reg_base + SH4_PCICR);\n \n \tmemphys = __pa(memory_start);\n \tmemsize = roundup_pow_of_two(memory_end - memory_start);\n@@ -380,7 +388,8 @@\n \t * Initialization mode complete, release the control register and\n \t * enable round robin mode to stop device overruns\/starvation.\n \t *\/\n-\t__raw_writel(SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO,\n+\t__raw_writel(SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_FTO |\n+\t\t PCICR_ENDIANNESS,\n \t\t chan->reg_base + SH4_PCICR);\n \n \tret = register_pci_controller(chan);\n"} {"commit":"0898a26a28318c782a20499fdec6329326c5400c","subject":"unused, bye bye.","message":"unused, bye bye.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/sparc\/include\/bsd_audioio.h\n+++ arch\/sparc\/include\/bsd_audioio.h\n@@ -1,136 +0,0 @@\n-\/*\t$OpenBSD: bsd_audioio.h,v 1.2 1997\/08\/08 08:26:05 downsj Exp $\t*\/\n-\/*\t$NetBSD: bsd_audioio.h,v 1.3 1995\/03\/04 09:58:45 pk Exp $ *\/\n-\n-\/*\n- * Copyright (c) 1991, 1992, 1993\n- *\tThe Regents of the University of California. All rights reserved.\n- *\n- * This software was developed by the Computer Systems Engineering group\n- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and\n- * contributed to Berkeley.\n- *\n- * All advertising materials mentioning features or use of this software\n- * must display the following acknowledgement:\n- *\tThis product includes software developed by the University of\n- *\tCalifornia, Lawrence Berkeley Laboratory.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- * 1. Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * 2. Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in the\n- * documentation and\/or other materials provided with the distribution.\n- * 3. All advertising materials mentioning features or use of this software\n- * must display the following acknowledgement:\n- *\tThis product includes software developed by the University of\n- *\tCalifornia, Berkeley and its contributors.\n- * 4. Neither the name of the University nor the names of its contributors\n- * may be used to endorse or promote products derived from this software\n- * without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND\n- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE\n- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n- * SUCH DAMAGE.\n- *\n- *\t@(#)bsd_audioio.h\t8.1 (Berkeley) 6\/11\/93\n- *\/\n-\n-#ifndef _BSD_AUDIOIO_H_\n-#define _BSD_AUDIOIO_H_\n-\n-\/*\n- * \/dev\/audio ioctls. needs comments!\n- *\/\n-#define AUDIO_MIN_GAIN (0)\n-#define AUDIO_MAX_GAIN (255)\n-\n-#define AUDIO_ENCODING_ULAW (1)\n-#define AUDIO_ENCODING_ALAW (2)\n-\n-struct audio_prinfo {\n-\tu_int\tsample_rate;\n-\tu_int\tchannels;\n-\tu_int\tprecision;\n-\tu_int\tencoding;\n-\tu_int\tgain;\n-\tu_int\tport;\n-\tu_long\tseek;\t\t\/* BSD extension *\/\n-\tu_int\tispare[3];\n-\tu_int\tsamples;\n-\tu_int\teof;\n-\n-\tu_char\tpause;\n-\tu_char\terror;\n-\tu_char\twaiting;\n-\tu_char\tcspare[3];\n-\tu_char\topen;\n-\tu_char\tactive;\n-\n-};\n-\n-struct audio_info {\n-\tstruct\taudio_prinfo play;\n-\tstruct\taudio_prinfo record;\n-\tu_int\tmonitor_gain;\n-\t\/* BSD extensions *\/\n-\tu_int\tblocksize;\t\/* input blocking threshold *\/\n-\tu_int\thiwat;\t\t\/* output high water mark *\/\n-\tu_int\tlowat;\t\t\/* output low water mark *\/\n-\tu_int\tbacklog;\t\/* samples of output backlog to gen. *\/\n-\tu_int\tmode;\n-};\n-typedef struct audio_info audio_info_t;\n-\n-#define AUDIO_INITINFO(p)\\\n-\t(void)memset((void *)(p), 0xff, sizeof(struct audio_info))\n-\n-#if (defined(sun) || defined(ibm032)) && !defined(__GNUC__)\n-#define AUDIO_GETINFO\t_IOR(A, 21, struct audio_info)\n-#define AUDIO_SETINFO\t_IOWR(A, 22, struct audio_info)\n-#define AUDIO_DRAIN\t_IO(A, 23)\n-#define AUDIO_FLUSH\t_IO(A, 24)\n-#define AUDIO_WSEEK\t_IOR(A, 25, u_long)\n-#define AUDIO_RERROR\t_IOR(A, 26, int)\n-#define AUDIO_GETMAP\t_IOR(A, 27, struct mapreg)\n-#define\tAUDIO_SETMAP\t_IOW(A, 28, struct mapreg)\n-#else\n-#define AUDIO_GETINFO\t_IOR('A', 21, struct audio_info)\n-#define AUDIO_SETINFO\t_IOWR('A', 22, struct audio_info)\n-#define AUDIO_DRAIN\t_IO('A', 23)\n-#define AUDIO_FLUSH\t_IO('A', 24)\n-#define AUDIO_WSEEK\t_IOR('A', 25, u_long)\n-#define AUDIO_RERROR\t_IOR('A', 26, int)\n-#define AUDIO_GETMAP\t_IOR('A', 27, struct mapreg)\n-#define\tAUDIO_SETMAP\t_IOW('A', 28, struct mapreg)\n-#endif\n-\n-#define AUDIO_SPEAKER \t1\n-#define AUDIO_HEADPHONE\t\t2\n-\n-\/*\n- * Low level interface.\n- *\/\n-struct mapreg {\n-\tu_short\tmr_x[8];\n-\tu_short\tmr_r[8];\n-\tu_short\tmr_gx;\n-\tu_short\tmr_gr;\n-\tu_short\tmr_ger;\n-\tu_short\tmr_stgr;\n-\tu_short\tmr_ftgr;\n-\tu_short\tmr_atgr;\n-\tu_char\tmr_mmr1;\n-\tu_char\tmr_mmr2;\n-};\n-\n-#endif \/* _BSD_AUDIOIO_H_ *\/\n"} {"commit":"70a479cbe80296d3113e65cc2f713a5101061daf","subject":"x86, efi: Fix display detection in EFI boot stub","message":"x86, efi: Fix display detection in EFI boot stub\n\nWhen booting under OVMF we have precisely one GOP device, and it\nimplements the ConOut protocol.\n\nWe break out of the loop when we look at it... and then promptly abort\nbecause 'first_gop' never gets set. We should set first_gop *before*\nbreaking out of the loop. Yes, it doesn't really mean \"first\" any more,\nbut that doesn't matter. It's only a flag to indicate that a suitable\nGOP was found.\n\nIn fact, we'd do just as well to initialise 'width' to zero in this\nfunction, then just check *that* instead of first_gop. But I'll do the\nminimal fix for now (and for stable@).\n\nSigned-off-by: David Woodhouse \nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nLink: ffadbbeead279731ca429aeb2e869de3b5093477@shinybook.infradead.org\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@linux.intel.com>\nCc: Matt Fleming \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/boot\/compressed\/eboot.c\n+++ arch\/x86\/boot\/compressed\/eboot.c\n@@ -432,10 +432,9 @@\n \t\t\t * Once we've found a GOP supporting ConOut,\n \t\t\t * don't bother looking any further.\n \t\t\t *\/\n+\t\t\tfirst_gop = gop;\n \t\t\tif (conout_found)\n \t\t\t\tbreak;\n-\n-\t\t\tfirst_gop = gop;\n \t\t}\n \t}\n \n"} {"commit":"47f9fe26299ae022ac1e3fa12e7e73def62b7898","subject":"x86-64: Don't export init_level4_pgt","message":"x86-64: Don't export init_level4_pgt\n\nIt's not used by any module, and i386 (as well as some other arches)\nalso doesn't export its equivalent (swapper_pg_dir).\n\nSigned-off-by: Jan Beulich <01de09643e0ae62e116f8bd77de435799874b456@novell.com>\nLKML-Reference: <1349b67cd3f42b74b386924c85dd89e04d026458@vpn.id2.novell.com>\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kernel\/x8664_ksyms_64.c\n+++ arch\/x86\/kernel\/x8664_ksyms_64.c\n@@ -54,7 +54,6 @@\n EXPORT_SYMBOL(__memcpy);\n \n EXPORT_SYMBOL(empty_zero_page);\n-EXPORT_SYMBOL(init_level4_pgt);\n #ifndef CONFIG_PARAVIRT\n EXPORT_SYMBOL(native_load_gs_index);\n #endif\n"} {"commit":"89baaaa98a10cad5cc8516c7208b02d9fc711890","subject":"oprofile\/x86: remove node check in AMD IBS initialization","message":"oprofile\/x86: remove node check in AMD IBS initialization\n\nStandard AMD systems have the same number of nodes as there are\nnorthbridge devices. However, there may kernel configurations\n(especially for 32 bit) or system setups exist, where the node number\nis different or it can not be detected properly. Thus the check is not\nreliable and may fail though IBS setup was fine. For this reason it is\nbetter to remove the check.\n\nCc: stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Robert Richter <22a70fd9773e4de05b12c05075e9bcd605577f4d@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/oprofile\/op_model_amd.c\n+++ arch\/x86\/oprofile\/op_model_amd.c\n@@ -389,16 +389,6 @@\n \t\treturn 1;\n \t}\n \n-#ifdef CONFIG_NUMA\n-\t\/* Sanity check *\/\n-\t\/* Works only for 64bit with proper numa implementation. *\/\n-\tif (nodes != num_possible_nodes()) {\n-\t\tprintk(KERN_DEBUG \"Failed to setup CPU node(s) for IBS, \"\n-\t\t\t\"found: %d, expected %d\",\n-\t\t\tnodes, num_possible_nodes());\n-\t\treturn 1;\n-\t}\n-#endif\n \treturn 0;\n }\n \n"} {"commit":"b1eae86412e49af8c96a8734b517a624d8dceb30","subject":"Tweak error handling in FIELD SQL function.","message":"Tweak error handling in FIELD SQL function.\n","repos":"deerwalk\/voltdb,ingted\/voltdb,zuowang\/voltdb,migue\/voltdb,migue\/voltdb,migue\/voltdb,wolffcm\/voltdb,ingted\/voltdb,ingted\/voltdb,zuowang\/voltdb,creative-quant\/voltdb,deerwalk\/voltdb,wolffcm\/voltdb,kumarrus\/voltdb,VoltDB\/voltdb,paulmartel\/voltdb,flybird119\/voltdb,zuowang\/voltdb,wolffcm\/voltdb,simonzhangsm\/voltdb,zuowang\/voltdb,migue\/voltdb,paulmartel\/voltdb,simonzhangsm\/voltdb,ingted\/voltdb,simonzhangsm\/voltdb,paulmartel\/voltdb,kumarrus\/voltdb,VoltDB\/voltdb,migue\/voltdb,kumarrus\/voltdb,wolffcm\/voltdb,VoltDB\/voltdb,paulmartel\/voltdb,zuowang\/voltdb,flybird119\/voltdb,zuowang\/voltdb,zuowang\/voltdb,deerwalk\/voltdb,creative-quant\/voltdb,flybird119\/voltdb,ingted\/voltdb,simonzhangsm\/voltdb,creative-quant\/voltdb,migue\/voltdb,migue\/voltdb,kumarrus\/voltdb,ingted\/voltdb,simonzhangsm\/voltdb,wolffcm\/voltdb,kumarrus\/voltdb,ingted\/voltdb,VoltDB\/voltdb,paulmartel\/voltdb,paulmartel\/voltdb,migue\/voltdb,wolffcm\/voltdb,deerwalk\/voltdb,wolffcm\/voltdb,deerwalk\/voltdb,simonzhangsm\/voltdb,VoltDB\/voltdb,paulmartel\/voltdb,simonzhangsm\/voltdb,deerwalk\/voltdb,creative-quant\/voltdb,kumarrus\/voltdb,creative-quant\/voltdb,flybird119\/voltdb,paulmartel\/voltdb,flybird119\/voltdb,flybird119\/voltdb,zuowang\/voltdb,creative-quant\/voltdb,deerwalk\/voltdb,VoltDB\/voltdb,creative-quant\/voltdb,creative-quant\/voltdb,kumarrus\/voltdb,ingted\/voltdb,simonzhangsm\/voltdb,deerwalk\/voltdb,VoltDB\/voltdb,wolffcm\/voltdb,flybird119\/voltdb,kumarrus\/voltdb,flybird119\/voltdb","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/ee\/expressions\/jsonfunctions.h\n+++ src\/ee\/expressions\/jsonfunctions.h\n@@ -180,25 +180,31 @@\n throwInvalidPathError(\"Unexpected character in array index\");\n }\n \/\/ atoi while advancing our pointer\n- int32_t arrayIndex = c - '0';\n- bool success = false;\n+ int64_t arrayIndex = c - '0';\n+ bool terminated = false;\n while (readChar(c)) {\n if (c == ']') {\n- success = true;\n+ terminated = true;\n break;\n } else if (c < '0' || c > '9') {\n throwInvalidPathError(\"Unexpected character in array index\");\n }\n arrayIndex = 10 * arrayIndex + (c - '0');\n+ if (arrayIndex > static_cast(INT32_MAX)) {\n+ throwInvalidPathError(\"Invalid array index greater than the maximum integer value\");\n+ }\n+ }\n+ if ( ! terminated ) {\n+ throwInvalidPathError(\"Missing ']' after array index\");\n }\n if (neg) {\n \/\/ other than the special '-1' case, negative indices aren't allowed\n if (arrayIndex != 1) {\n- throwInvalidPathError(\"Invalid array index\");\n+ throwInvalidPathError(\"Invalid array index less than -1\");\n }\n arrayIndex = ARRAY_TAIL;\n }\n- path.push_back(arrayIndex);\n+ path.push_back(static_cast(arrayIndex));\n expectArrayIndex = false;\n } else if (c == '[') {\n \/\/ handle the case of empty field names. for example, getting the first element of the array\n@@ -287,32 +293,31 @@\n const NValue& docNVal = arguments[0];\n const NValue& pathNVal = arguments[1];\n \n- int32_t lenDoc = -1;\n- const char* docChars = NULL;\n- if (!docNVal.isNull()) {\n- if (docNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n- }\n- lenDoc = docNVal.getObjectLength_withoutNull();\n- docChars = reinterpret_cast(docNVal.getObjectValue_withoutNull());\n- }\n-\n- int32_t lenPath = -1;\n- const char* pathChars = NULL;\n- if (!pathNVal.isNull()) {\n- if (pathNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (pathNVal.getValueType(), VALUE_TYPE_VARCHAR);\n- }\n- lenPath = pathNVal.getObjectLength_withoutNull();\n- pathChars = reinterpret_cast(pathNVal.getObjectValue_withoutNull());\n- }\n-\n+ if (docNVal.isNull()) {\n+ return docNVal;\n+ }\n+ if (pathNVal.isNull()) {\n+ throw SQLException(SQLException::data_exception_invalid_parameter, \"Invalid FIELD path argument (SQL null)\");\n+ }\n+\n+ if (docNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n+ throwCastSQLException(docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ }\n+ if (pathNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n+ throwCastSQLException(pathNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ }\n+\n+ int32_t lenDoc = docNVal.getObjectLength_withoutNull();\n+ const char* docChars = reinterpret_cast(docNVal.getObjectValue_withoutNull());\n JsonDocument doc(docChars, lenDoc);\n- std::string value;\n- if (!doc.get(pathChars, lenPath, value)) {\n- return getNullStringValue();\n- }\n- return getTempStringValue(value.c_str(), value.length() - 1);\n+\n+ int32_t lenPath = pathNVal.getObjectLength_withoutNull();\n+ const char* pathChars = reinterpret_cast(pathNVal.getObjectValue_withoutNull());\n+ std::string result;\n+ if (doc.get(pathChars, lenPath, result)) {\n+ return getTempStringValue(result.c_str(), result.length() - 1);\n+ }\n+ return getNullStringValue();\n }\n \n \/** implement the 2-argument SQL ARRAY_ELEMENT function *\/\n@@ -324,7 +329,7 @@\n return getNullStringValue();\n }\n if (docNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ throwCastSQLException(docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n }\n \n const NValue& indexNVal = arguments[1];\n@@ -388,7 +393,7 @@\n return getNullValue(VALUE_TYPE_INTEGER);\n }\n if (getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (getValueType(), VALUE_TYPE_VARCHAR);\n+ throwCastSQLException(getValueType(), VALUE_TYPE_VARCHAR);\n }\n \n int32_t lenDoc = getObjectLength_withoutNull();\n@@ -427,37 +432,36 @@\n const NValue& pathNVal = arguments[1];\n const NValue& valueNVal = arguments[2];\n \n- int32_t lenDoc = -1;\n- const char* docChars = NULL;\n- if (!docNVal.isNull()) {\n- if (docNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n- }\n- lenDoc = docNVal.getObjectLength_withoutNull();\n- docChars = reinterpret_cast(docNVal.getObjectValue_withoutNull());\n- }\n-\n- int32_t lenPath = -1;\n- const char* pathChars = NULL;\n- if (!pathNVal.isNull()) {\n- if (pathNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (pathNVal.getValueType(), VALUE_TYPE_VARCHAR);\n- }\n- lenPath = pathNVal.getObjectLength_withoutNull();\n- pathChars = reinterpret_cast(pathNVal.getObjectValue_withoutNull());\n- }\n-\n- int32_t lenValue = -1;\n- const char* valueChars = NULL;\n- if (!valueNVal.isNull()) {\n- if (valueNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n- throwCastSQLException (valueNVal.getValueType(), VALUE_TYPE_VARCHAR);\n- }\n- lenValue = valueNVal.getObjectLength_withoutNull();\n- valueChars = reinterpret_cast(valueNVal.getObjectValue_withoutNull());\n- }\n-\n+ if (docNVal.isNull()) {\n+ return docNVal;\n+ }\n+ if (pathNVal.isNull()) {\n+ throw SQLException(SQLException::data_exception_invalid_parameter, \"Invalid SET_FIELD path argument (SQL null)\");\n+ }\n+ if (valueNVal.isNull()) {\n+ throw SQLException(SQLException::data_exception_invalid_parameter, \"Invalid SET_FIELD value argument (SQL null)\");\n+ }\n+\n+ if (docNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n+ throwCastSQLException(docNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ }\n+\n+ if (pathNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n+ throwCastSQLException(pathNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ }\n+\n+ if (valueNVal.getValueType() != VALUE_TYPE_VARCHAR) {\n+ throwCastSQLException(valueNVal.getValueType(), VALUE_TYPE_VARCHAR);\n+ }\n+\n+ int32_t lenDoc = docNVal.getObjectLength_withoutNull();\n+ const char* docChars = reinterpret_cast(docNVal.getObjectValue_withoutNull());\n JsonDocument doc(docChars, lenDoc);\n+\n+ int32_t lenPath = pathNVal.getObjectLength_withoutNull();\n+ const char* pathChars = reinterpret_cast(pathNVal.getObjectValue_withoutNull());\n+ int32_t lenValue = valueNVal.getObjectLength_withoutNull();\n+ const char* valueChars = reinterpret_cast(valueNVal.getObjectValue_withoutNull());\n doc.set(pathChars, lenPath, valueChars, lenValue);\n \n std::string value = doc.value();\n"} {"commit":"883007c05d323b032fa91b7b838aa7a962e8be55","subject":"Catch another case of feed markup not being converted to text","message":"Catch another case of feed markup not being converted to text\n","repos":"OoberMick\/Midori,OoberMick\/Midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- extensions\/feed-panel\/feed-parse.c\n+++ extensions\/feed-panel\/feed-parse.c\n@@ -29,7 +29,6 @@\n *\/\n return g_strdup (\" \");\n }\n-\n return (gchar*)xmlNodeListGetString (fparser->doc, node->children, 1);\n }\n \n@@ -74,6 +73,14 @@\n feed_get_element_markup (FeedParser* fparser)\n {\n gchar* markup;\n+ xmlNodePtr node = fparser->node;\n+\n+ if (node->children &&\n+ !xmlIsBlankNode (node->children) &&\n+ node->children->type == XML_ELEMENT_NODE)\n+ {\n+ return (gchar*) xmlNodeGetContent (node->children);\n+ }\n \n markup = feed_get_element_string (fparser);\n return feed_remove_markup (markup);\n"} {"commit":"eac439b1a6f8aa9332b5f8d51b1e7061465fa759","subject":"add nullability annotations to BBTokenTextViewDelegate.h","message":"add nullability annotations to BBTokenTextViewDelegate.h\n","repos":"BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- BBFrameworks\/BBToken\/BBTokenTextViewDelegate.h\n+++ BBFrameworks\/BBToken\/BBTokenTextViewDelegate.h\n@@ -15,6 +15,8 @@\n \n #import \n \n+NS_ASSUME_NONNULL_BEGIN\n+\n @protocol BBTokenCompletion;\n \n \/**\n@@ -22,7 +24,7 @@\n \n @param completions An array of objects conforming to BBTokenCompletion\n *\/\n-typedef void(^BBTokenTextViewCompletionBlock)(NSArray *completions);\n+typedef void(^BBTokenTextViewCompletionBlock)(NSArray *_Nullable completions);\n \n @class BBTokenTextView;\n \n@@ -47,7 +49,7 @@\n @param editingText The current editing text\n @return The represented object for editing text\n *\/\n-- (id)tokenTextView:(BBTokenTextView *)tokenTextView representedObjectForEditingText:(NSString *)editingText;\n+- (nullable id)tokenTextView:(BBTokenTextView *)tokenTextView representedObjectForEditingText:(NSString *)editingText;\n \/**\n Return the display text for the provided represented object. If this method is not implemented or returns nil, the return value of the represented object's description method is used.\n \n@@ -55,7 +57,7 @@\n @param representedObject The represented object\n @return The display text for the represented object\n *\/\n-- (NSString *)tokenTextView:(BBTokenTextView *)tokenTextView displayTextForRepresentedObject:(id)representedObject;\n+- (nullable NSString *)tokenTextView:(BBTokenTextView *)tokenTextView displayTextForRepresentedObject:(id)representedObject;\n \n \/**\n Called when an array of represented objects are added to the receiver at the provided index.\n@@ -83,7 +85,7 @@\n @param sender The object asking to perform action\n @return YES if the token text can perform action, NO otherwise\n *\/\n-- (BOOL)tokenTextView:(BBTokenTextView *)tokenTextView canPerformAction:(SEL)action withSender:(id)sender;\n+- (BOOL)tokenTextView:(BBTokenTextView *)tokenTextView canPerformAction:(SEL)action withSender:(nullable id)sender;\n \n \/**\n Called when the cut: or copy: commands are chosen from the context menu. The delegate should return YES if it intends to handle the writing of the represented objects to the pasteboard. Otherwise, return NO and the token text view will write the display string for each represented object to the pasteboard.\n@@ -101,7 +103,7 @@\n @param pasteboard The pasteboard to read from\n @return An array of represented objects created by reading from pasteboard\n *\/\n-- (NSArray *)tokenTextView:(BBTokenTextView *)tokenTextView readFromPasteboard:(UIPasteboard *)pasteboard;\n+- (nullable NSArray *)tokenTextView:(BBTokenTextView *)tokenTextView readFromPasteboard:(UIPasteboard *)pasteboard;\n \n \/**\n Called when the receiver's delegate should display the completions table view.\n@@ -140,7 +142,7 @@\n *\/\n - (void)tokenTextView:(BBTokenTextView *)tokenTextView completionsForSubstring:(NSString *)substring indexOfRepresentedObject:(NSInteger)index completion:(BBTokenTextViewCompletionBlock)completion;\n \/**\n- Called when the user selects a row in the completions table view. This method should return the corresponding represented object for the selected completion object.\n+ Called when the user selects a row in the completions table view. This method should return the corresponding represented object for the selected completion object.\n \n @param tokenTextView The token text view that sent the message\n @param completion The completion that was selected\n@@ -148,3 +150,5 @@\n *\/\n - (id)tokenTextView:(BBTokenTextView *)tokenTextView representedObjectForCompletion:(id)completion;\n @end\n+\n+NS_ASSUME_NONNULL_END\n"} {"commit":"71b7982dcb40148707157556d535995002c93ae9","subject":"removed 3 interfaces (read_h5_scan,string2datetime, and printhelp) that had no corresponding part in the c file","message":"removed 3 interfaces (read_h5_scan,string2datetime, and printhelp) that had no corresponding part in the c file\n","repos":"NLeSC\/enram,NLeSC\/enram,NLeSC\/enram,NLeSC\/enram","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ncradar\/lib\/libvol2bird\/libvol2bird.h\n+++ ncradar\/lib\/libvol2bird\/libvol2bird.h\n@@ -123,9 +123,6 @@\n \/*Prototypes of local functions: *\/\n \/******************************************************************************\/\n \n-int read_h5_scan(hid_t file,int iscan,char type,SCANMETA *meta,unsigned char *data[]);\n-void string2datetime(char *string,int *date,int *time);\n-void printhelp(int argc,char *argv[]);\n void texture(unsigned char *teximg,unsigned char *vimage, unsigned char *zimage,\n \t\tSCANMETA *texmeta,SCANMETA *vmeta,SCANMETA *zmeta,\n \t\tunsigned char ntexrang,unsigned char ntexazim,\n"} {"commit":"a58cc1ccfeb7c08ac0614ebebc6db01b19488dcb","subject":"Add todos to flatfile2.0","message":"Add todos to flatfile2.0\n","repos":"iondbproject\/iondb,iondbproject\/iondb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/dictionary\/flat_file\/flat_file_dictionary_handler.c\n+++ src\/dictionary\/flat_file\/flat_file_dictionary_handler.c\n@@ -145,6 +145,7 @@\n \n \tion_key_size_t key_size = dictionary->instance->record.key_size;\n \n+\t\/* TODO: Implement sorted mode search here *\/\n \tswitch (predicate->type) {\n \t\tcase predicate_equality: {\n \t\t\tion_key_t target_key = predicate->statement.equality.equality_value;\n@@ -288,6 +289,7 @@\n \t\t\tion_flat_file_row_t throwaway_row;\n \t\t\tion_err_t\t\t\terr = err_uninitialized;\n \n+\t\t\t\/* TODO: Implement sorted mode search *\/\n \t\t\tswitch (cursor->predicate->type) {\n \t\t\t\tcase predicate_equality: {\n \t\t\t\t\terr = flat_file_scan(flat_file, flat_file_cursor->current_location + 1, &flat_file_cursor->current_location, &throwaway_row, boolean_true, flat_file_predicate_key_match, cursor->predicate->statement.equality.equality_value);\n"} {"commit":"a7462cae9c1abaf26b588f0dfd1652960a4d6b5a","subject":"Needed sqrt optimisation to make this speedy","message":"Needed sqrt optimisation to make this speedy\n","repos":"guynan\/project_euler,guynan\/project_euler","returncode":1,"stderr":"error: pathspec 'src\/prime_generating_integers.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- src\/prime_generating_integers.c\n+++ src\/prime_generating_integers.c\n@@ -0,0 +1,87 @@\n+\/* Consider the divisors of 30: 1,2,3,5,6,10,15,30.\n+ * It can be seen that for every divisor d of 30, d+30\/d is prime.\n+ * Find the sum of all positive integers n not exceeding 100 000 000\n+ * such that for every divisor d of n, d+n\/d is prime.\n+ *\n+ * Problem 357\n+ *\n+ * Answer *\/\n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#define MAX 100000000\n+\n+int primegen(uint32_t i, uint64_t* sieve);\n+int main(int argc, char** argv);\n+uint64_t* sieve(uint64_t max);\n+\n+\n+int main(int argc, char** argv)\n+{\n+ (void) argc;\n+ (void) argv;\n+\n+ uint64_t sum = 0;\n+\n+ uint64_t* s = sieve(2 * MAX);\n+\n+ for(uint32_t i = 0; i <= MAX; i++){\n+ sum += (primegen(i, s)) ? i : 0;\n+ }\n+\n+ printf(\"%\"PRIu64\"\\n\", sum);\n+\n+ return 0;\n+\n+}\n+\n+\n+int primegen(uint32_t n, uint64_t* sieve)\n+{\n+\n+ for(uint32_t i = 1; i * i <= n; i++){\n+\n+ if(n % i == 0){\n+\n+ if(!sieve[i + n\/i])\n+ return 0;\n+\n+ }\n+ }\n+\n+ return 1;\n+}\n+\n+\n+\/* Takes one argument of an integer and returns a pointer to an array of\n+ * integers with booleans for each index that indicate whether that integer is \n+ * indeed a prime number. *\/\n+uint64_t* sieve(uint64_t max)\n+{\n+ uint64_t i = 0; uint64_t j = 0;\n+\n+\tuint64_t *se = malloc((max + 1)* sizeof(uint64_t));\n+\n+ memset(se, 1, (max + 1) * sizeof(uint64_t));\n+\n+ se[0] = 0; se[1] = 0;\n+\n+ \/* Start the sieve *\/\n+\tfor(i = 2; i <= max; i++){\n+\t\tif(se[i]) {\n+\t\t\tfor (j = i; (i * j) <= max; j++) {\n+\t\t\t\tse[(i * j)] = 0;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn se;\n+\n+}\n+\n+ \n"} {"commit":"82362df9fbd4653dcb96453f48e9fee98edf267f","subject":"art_scarakins.c: reverse the direction for AXIS_3 to AXIS_2 compensation TODO: need verfication on real SCARA","message":"art_scarakins.c: reverse the direction for AXIS_3 to AXIS_2 compensation\nTODO: need verfication on real SCARA\n","repos":"araisrobo\/linuxcnc,araisrobo\/linuxcnc,yishinli\/emc2,yishinli\/emc2,araisrobo\/linuxcnc,araisrobo\/linuxcnc,yishinli\/emc2,yishinli\/emc2,araisrobo\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/emc\/kinematics\/art_scarakins.c\n+++ src\/emc\/kinematics\/art_scarakins.c\n@@ -117,7 +117,7 @@\n y = D2*sin(a0) + D4*sin(a1) + D6*sin(a3);\n \/\/TODO: confirm if it should be \"(-\/+)joint[3]\" in real SCARA\n \/\/PPD: pitch per degree\n- z = D1 + D3 - joint[2] - D5 - joint[3]*PPD; \n+ z = D1 + D3 - joint[2] - D5 + joint[3]*PPD; \n c = a3;\n \t\n *iflags = 0;\n@@ -207,8 +207,10 @@\n joint[1] = q1;\n joint[3] = c - (q0 + q1);\n \/\/TODO: confirm if it should be \"(-\/+)joint[3]\" in real SCARA\n+ \/\/ysli: before 2009-09-18, it's (-)joint[3]\n+ \/\/ysli: after 2009-09-18, it's (+)joint[3]\n \/\/PPD: pitch per degree\n- joint[2] = D1 + D3 - D5 - z - joint[3]*PPD;\n+ joint[2] = D1 + D3 - D5 - z + joint[3]*PPD;\n joint[4] = world->a;\n joint[5] = world->b;\n \n"} {"commit":"499ac6f78d61eed1f536e37a2ec705976c414b54","subject":"galaktos: add an option for the size (just finish one piece of code).","message":"galaktos: add an option for the size (just finish one piece of code).\n","repos":"jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/visualization\/galaktos\/plugin.c\n+++ modules\/visualization\/galaktos\/plugin.c\n@@ -44,11 +44,23 @@\n static int Open ( vlc_object_t * );\n static void Close ( vlc_object_t * );\n \n+\n+#define WIDTH_TEXT N_(\"Video width\")\n+#define WIDTH_LONGTEXT N_(\"The width of the video window, in pixels.\")\n+\n+#define HEIGHT_TEXT N_(\"Video height\")\n+#define HEIGHT_LONGTEXT N_(\"The height of the video window, in pixels.\")\n+\n+\n vlc_module_begin ()\n set_description( N_(\"GaLaktos visualization\") )\n set_capability( \"visualization\", 0 )\n set_callbacks( Open, Close )\n add_shortcut( \"galaktos\" )\n+ add_integer( \"galaktos-width\", 640, NULL, WIDTH_TEXT, WIDTH_LONGTEXT,\n+ false )\n+ add_integer( \"galaktos-height\", 480, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,\n+ false )\n vlc_module_end ()\n \n \/*****************************************************************************\n@@ -102,17 +114,11 @@\n vlc_object_create( p_filter, sizeof( galaktos_thread_t ) );\n vlc_object_attach( p_thread, p_this );\n \n-\/*\n- var_Create( p_thread, \"galaktos-width\", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );\n- var_Get( p_thread, \"galaktos-width\", &width );\n- var_Create( p_thread, \"galaktos-height\", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );\n- var_Get( p_thread, \"galaktos-height\", &height );\n-*\/\n p_thread->i_cur_sample = 0;\n bzero( p_thread->p_data, 2*2*512 );\n \n- p_thread->i_width = 600;\n- p_thread->i_height = 600;\n+ p_thread->i_width = var_CreateGetInteger( p_thread, \"galaktos-width\" );\n+ p_thread->i_height = var_CreateGetInteger( p_thread, \"galaktos-height\" );\n p_thread->b_fullscreen = 0;\n galaktos_init( p_thread );\n \n"} {"commit":"d53db3e49d371151b472ffb5aea651c819a101fb","subject":"MFT r20651, r20662:","message":"MFT r20651, r20662:\n\n Make the code more conformant with the coding standard and typical C++\n usage guidelines. The following changes have been made:\n\n * Use unsigned int instead of just unsigned for clarity.\n * Use C++ casting instead of C-style casting.\n * Const-ify.\n\n No functional changes.\n\n\ngit-svn-id: 586995f25b72854838fe1e42a2812ba84a3d5c5f@20667 23c62cac-4e0f-0410-93ea-c11bc791b11d\n","repos":"rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs,rpavlik\/vrjuggler-2.2-debs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/vrjuggler\/vrj\/Draw\/OSG\/OsgApp.h\n+++ modules\/vrjuggler\/vrj\/Draw\/OSG\/OsgApp.h\n@@ -429,10 +429,14 @@\n gl_manager->currentUserData()->getGlWindow()->getOriginSize(w_ox, w_oy, w_width, w_height);\n \n \/\/ compute unsigned versions of the viewport info (for passing to glViewport)\n- unsigned ll_x = unsigned(vp_ox*float(w_width));\n- unsigned ll_y = unsigned(vp_oy*float(w_height));\n- unsigned x_size = unsigned(vp_sx*float(w_width));\n- unsigned y_size = unsigned(vp_sy*float(w_height));\n+ const unsigned int ll_x =\n+ static_cast(vp_ox * static_cast(w_width));\n+ const unsigned int ll_y =\n+ static_cast(vp_oy * static_cast(w_height));\n+ const unsigned int x_size =\n+ static_cast(vp_sx * static_cast(w_width));\n+ const unsigned int y_size =\n+ static_cast(vp_sy * static_cast(w_height));\n \n \/\/sv->setCalcNearFar(false);\n sv->setComputeNearFarMode(osgUtil::CullVisitor::DO_NOT_COMPUTE_NEAR_FAR);\n"} {"commit":"bc47d4cecf2d29dc0d58f311e048220b63051417","subject":"Typo in command help","message":"Typo in command help\n","repos":"neilstephens\/opendatacon,neilstephens\/opendatacon,neilstephens\/opendatacon,neilstephens\/opendatacon,neilstephens\/opendatacon,neilstephens\/opendatacon,neilstephens\/opendatacon","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Ports\/CBPort\/CBOutStationPortCollection.h\n+++ Code\/Ports\/CBPort\/CBOutStationPortCollection.h\n@@ -80,12 +80,12 @@\n \t\t\t\t\/\/param 0: Probability 0 to 1\n \t\t\t\tif (params.count(\"0\") == 0)\n \t\t\t\t{\n-\t\t\t\t\treturn IUIResponder::GenerateResult(\"Bad parameter - Pass in the Probability of a dropped packet range 0 to 1\");\n+\t\t\t\t return IUIResponder::GenerateResult(\"Bad parameter - Pass in the Probability of a dropped packet range 0 to 1\");\n \t\t\t\t}\n \t\t\t\tauto probability = params.at(\"0\");\n \t\t\t\treturn target->UIRandomReponseDrops(probability) ? IUIResponder::GenerateResult(\"Success\") : IUIResponder::GenerateResult(\"Bad Parameter\");\n \n-\t\t\t}, \"Sets the probability of a bit flip in the response packet and returns if the operation was successful. Syntax: 'RandomResponseDrops \");\n+\t\t\t}, \"Sets the probability of a dropped response packet and returns if the operation was successful. Syntax: 'RandomResponseDrops \");\n \t}\n \n \tvoid Add(std::shared_ptr p, const std::string& Name)\n"} {"commit":"e4ff957e42007a288ed3b063abb1cf95bd275034","subject":"xbps_find_pkg_orphans: fix regression adding false positives.","message":"xbps_find_pkg_orphans: fix regression adding false positives.\n","repos":"datenwolf\/xbps,ebfe\/xbps,datenwolf\/xbps,stpx\/xbps,ebfe\/xbps,ebfe\/xbps,stpx\/xbps,stpx\/xbps,datenwolf\/xbps","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/package_orphans.c\n+++ lib\/package_orphans.c\n@@ -99,6 +99,7 @@\n \t\t\/*\n \t\t * Skip packages that were not installed automatically.\n \t\t *\/\n+\t\tautomatic = false;\n \t\txbps_dictionary_get_bool(pkgd, \"automatic-install\", &automatic);\n \t\tif (!automatic)\n \t\t\tcontinue;\n@@ -137,6 +138,7 @@\n \t\t\t}\n \t\t\tif (cnt == reqbycnt) {\n \t\t\t\tdeppkgd = xbps_pkgdb_get_pkg(xhp, deppkgver);\n+\t\t\t\tautomatic = false;\n \t\t\t\txbps_dictionary_get_bool(deppkgd, \"automatic-install\", &automatic);\n \t\t\t\tif (automatic)\n \t\t\t\t\txbps_array_add(array, deppkgd);\n"} {"commit":"bdcab3d12130593706f49215de1fda47914b80f4","subject":"STYLE: Fixing indentations.","message":"STYLE: Fixing indentations.\n","repos":"Kitware\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,stnava\/ITK,richardbeare\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,hendradarwin\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,wkjeong\/ITK,Kitware\/ITK,vfonov\/ITK,vfonov\/ITK,itkvideo\/ITK,spinicist\/ITK,paulnovo\/ITK,CapeDrew\/DITK,biotrump\/ITK,jcfr\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,hjmjohnson\/ITK,jcfr\/ITK,jcfr\/ITK,biotrump\/ITK,stnava\/ITK,stnava\/ITK,richardbeare\/ITK,BRAINSia\/ITK,InsightSoftwareConsortium\/ITK,paulnovo\/ITK,BlueBrain\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,spinicist\/ITK,eile\/ITK,eile\/ITK,fbudin69500\/ITK,malaterre\/ITK,heimdali\/ITK,wkjeong\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,CapeDrew\/DCMTK-ITK,biotrump\/ITK,atsnyder\/ITK,jmerkow\/ITK,LucHermitte\/ITK,blowekamp\/ITK,ajjl\/ITK,CapeDrew\/DCMTK-ITK,LucHermitte\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,malaterre\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,vfonov\/ITK,LucHermitte\/ITK,hinerm\/ITK,ajjl\/ITK,LucHermitte\/ITK,CapeDrew\/DITK,stnava\/ITK,hjmjohnson\/ITK,fedral\/ITK,stnava\/ITK,CapeDrew\/DITK,hjmjohnson\/ITK,LucasGandel\/ITK,blowekamp\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,BlueBrain\/ITK,eile\/ITK,itkvideo\/ITK,hinerm\/ITK,atsnyder\/ITK,fedral\/ITK,itkvideo\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,hinerm\/ITK,cpatrick\/ITK-RemoteIO,eile\/ITK,GEHC-Surgery\/ITK,eile\/ITK,hendradarwin\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,hendradarwin\/ITK,paulnovo\/ITK,CapeDrew\/DITK,malaterre\/ITK,LucasGandel\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,hjmjohnson\/ITK,msmolens\/ITK,msmolens\/ITK,ajjl\/ITK,jmerkow\/ITK,heimdali\/ITK,ajjl\/ITK,hinerm\/ITK,hjmjohnson\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,fbudin69500\/ITK,eile\/ITK,ajjl\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,ajjl\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,fbudin69500\/ITK,Kitware\/ITK,richardbeare\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,jmerkow\/ITK,blowekamp\/ITK,itkvideo\/ITK,CapeDrew\/DITK,blowekamp\/ITK,GEHC-Surgery\/ITK,msmolens\/ITK,zachary-williamson\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,thewtex\/ITK,stnava\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,ajjl\/ITK,hinerm\/ITK,thewtex\/ITK,spinicist\/ITK,jcfr\/ITK,jmerkow\/ITK,jcfr\/ITK,fedral\/ITK,biotrump\/ITK,CapeDrew\/DCMTK-ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,hinerm\/ITK,BRAINSia\/ITK,BRAINSia\/ITK,blowekamp\/ITK,heimdali\/ITK,Kitware\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,paulnovo\/ITK,LucasGandel\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,rhgong\/itk-with-dom,heimdali\/ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,stnava\/ITK,ajjl\/ITK,vfonov\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,eile\/ITK,thewtex\/ITK,hinerm\/ITK,fedral\/ITK,BRAINSia\/ITK,paulnovo\/ITK,vfonov\/ITK,wkjeong\/ITK,wkjeong\/ITK,heimdali\/ITK,LucasGandel\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,zachary-williamson\/ITK,BlueBrain\/ITK,Kitware\/ITK,PlutoniumHeart\/ITK,rhgong\/itk-with-dom,GEHC-Surgery\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,itkvideo\/ITK,msmolens\/ITK,LucHermitte\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,itkvideo\/ITK,spinicist\/ITK,atsnyder\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,malaterre\/ITK,fedral\/ITK,thewtex\/ITK,vfonov\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,daviddoria\/itkHoughTransform,wkjeong\/ITK,spinicist\/ITK,eile\/ITK,thewtex\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,malaterre\/ITK,daviddoria\/itkHoughTransform,LucasGandel\/ITK,paulnovo\/ITK,wkjeong\/ITK,itkvideo\/ITK,fbudin69500\/ITK,malaterre\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,rhgong\/itk-with-dom,biotrump\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,stnava\/ITK,fedral\/ITK,hinerm\/ITK,msmolens\/ITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DCMTK-ITK,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,atsnyder\/ITK,fbudin69500\/ITK,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,thewtex\/ITK,jmerkow\/ITK,CapeDrew\/DITK,msmolens\/ITK,malaterre\/ITK,hjmjohnson\/ITK,malaterre\/ITK,eile\/ITK,paulnovo\/ITK,heimdali\/ITK,LucHermitte\/ITK,CapeDrew\/DITK,PlutoniumHeart\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,jmerkow\/ITK,thewtex\/ITK,blowekamp\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,biotrump\/ITK,Kitware\/ITK,stnava\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Review\/itkQuadEdgeMeshQuadricDecimation.h\n+++ Code\/Review\/itkQuadEdgeMeshQuadricDecimation.h\n@@ -1,3 +1,20 @@\n+\/*=========================================================================\n+\n+ Program: Insight Segmentation & Registration Toolkit\n+ Module: itkQuadEdgeMeshQuadricDecimation.h\n+ Language: C++\n+ Date: $Date$\n+ Version: $Revision$\n+\n+ Copyright (c) Insight Software Consortium. All rights reserved.\n+ See ITKCopyright.txt or http:\/\/www.itk.org\/HTML\/Copyright.htm for details.\n+\n+ This software is distributed WITHOUT ANY WARRANTY; without even\n+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\n+ PURPOSE. See the above copyright notices for more information.\n+\n+=========================================================================*\/\n+\n #ifndef __itkQuadEdgeMeshQuadricDecimation_h\n #define __itkQuadEdgeMeshQuadricDecimation_h\n \n@@ -5,159 +22,157 @@\n #include \"itkQuadEdgeMeshDecimationQuadricElementHelper.h\"\n \n namespace itk\n- {\n- \/**\n- * \\class QuadEdgeMeshQuadricDecimation\n- * \\brief\n- *\/\n- template< class TInput, class TOutput, class TCriterion >\n- class QuadEdgeMeshQuadricDecimation :\n- public QuadEdgeMeshEdgeMergeDecimationFilter< TInput, TOutput, TCriterion >\n- {\n- public:\n- typedef QuadEdgeMeshQuadricDecimation Self;\n- typedef SmartPointer< Self > Pointer;\n- typedef SmartPointer< const Self > ConstPointer;\n- typedef QuadEdgeMeshEdgeMergeDecimationFilter< TInput, TOutput,\n- TCriterion > Superclass;\n+{\n+\/**\n+ * \\class QuadEdgeMeshQuadricDecimation\n+ * \\brief\n+ *\/\n+template< class TInput, class TOutput, class TCriterion >\n+class QuadEdgeMeshQuadricDecimation :\n+ public QuadEdgeMeshEdgeMergeDecimationFilter< TInput, TOutput, TCriterion >\n+{\n+public:\n+ typedef QuadEdgeMeshQuadricDecimation Self;\n+ typedef SmartPointer< Self > Pointer;\n+ typedef SmartPointer< const Self > ConstPointer;\n+ typedef QuadEdgeMeshEdgeMergeDecimationFilter< \n+ TInput, TOutput, TCriterion > Superclass;\n \n- \/** Run-time type information (and related methods). *\/\n- itkTypeMacro( QuadEdgeMeshQuadricDecimation,\n- QuadEdgeMeshEdgeMergeDecimationFilter );\n+ \/** Run-time type information (and related methods). *\/\n+ itkTypeMacro( QuadEdgeMeshQuadricDecimation, QuadEdgeMeshEdgeMergeDecimationFilter );\n \n- \/** New macro for creation of through a Smart Pointer *\/\n- itkNewMacro( Self );\n+ \/** New macro for creation of through a Smart Pointer *\/\n+ itkNewMacro( Self );\n \n- typedef TInput InputMeshType;\n- typedef typename InputMeshType::Pointer InputMeshPointer;\n+ typedef TInput InputMeshType;\n+ typedef typename InputMeshType::Pointer InputMeshPointer;\n \n- typedef TOutput OutputMeshType;\n- typedef typename OutputMeshType::Pointer OutputMeshPointer;\n- typedef typename OutputMeshType::PointIdentifier OutputPointIdentifier;\n- typedef typename OutputMeshType::PointType OutputPointType;\n- typedef typename OutputPointType::CoordRepType OutputCoordType;\n- typedef typename OutputMeshType::QEType OutputQEType;\n- typedef typename OutputMeshType::EdgeCellType OutputEdgeCellType;\n- typedef typename OutputMeshType::CellsContainerIterator\n- OutputCellsContainerIterator;\n- typedef typename OutputMeshType::PointsContainerPointer\n- OutputPointsContainerPointer;\n- typedef typename OutputMeshType::PointsContainerIterator\n- OutputPointsContainerIterator;\n- \n- itkStaticConstMacro( OutputPointDimension, unsigned int,\n- OutputMeshType::PointDimension );\n+ typedef TOutput OutputMeshType;\n+ typedef typename OutputMeshType::Pointer OutputMeshPointer;\n+ typedef typename OutputMeshType::PointIdentifier OutputPointIdentifier;\n+ typedef typename OutputMeshType::PointType OutputPointType;\n+ typedef typename OutputPointType::CoordRepType OutputCoordType;\n+ typedef typename OutputMeshType::QEType OutputQEType;\n+ typedef typename OutputMeshType::EdgeCellType OutputEdgeCellType;\n+ typedef typename OutputMeshType::CellsContainerIterator OutputCellsContainerIterator;\n+ typedef typename OutputMeshType::PointsContainerPointer OutputPointsContainerPointer;\n+ typedef typename OutputMeshType::PointsContainerIterator OutputPointsContainerIterator;\n+ \n+ itkStaticConstMacro( OutputPointDimension, unsigned int, OutputMeshType::PointDimension );\n \n \n- typedef TCriterion CriterionType;\n- typedef typename CriterionType::MeasureType MeasureType;\n+ typedef TCriterion CriterionType;\n+ typedef typename CriterionType::MeasureType MeasureType;\n \n- typedef typename Superclass::PriorityType PriorityType;\n- typedef typename Superclass::PriorityQueueItemType PriorityQueueItemType;\n- typedef typename Superclass::PriorityQueueType PriorityQueueType;\n- typedef typename Superclass::PriorityQueuePointer PriorityQueuePointer;\n+ typedef typename Superclass::PriorityType PriorityType;\n+ typedef typename Superclass::PriorityQueueItemType PriorityQueueItemType;\n+ typedef typename Superclass::PriorityQueueType PriorityQueueType;\n+ typedef typename Superclass::PriorityQueuePointer PriorityQueuePointer;\n \n- typedef typename Superclass::QueueMapType QueueMapType;\n- typedef typename Superclass::QueueMapIterator QueueMapIterator;\n+ typedef typename Superclass::QueueMapType QueueMapType;\n+ typedef typename Superclass::QueueMapIterator QueueMapIterator;\n \n- typedef typename Superclass::OperatorType OperatorType;\n- typedef typename Superclass::OperatorPointer OperatorPointer;\n+ typedef typename Superclass::OperatorType OperatorType;\n+ typedef typename Superclass::OperatorPointer OperatorPointer;\n \n- typedef QuadEdgeMeshDecimationQuadricElementHelper< OutputPointType > \n- QuadricElementType;\n- typedef std::map< OutputPointIdentifier, QuadricElementType > \n- QuadricElementMapType;\n- typedef typename QuadricElementMapType::iterator\n- QuadricElementMapIterator;\n- \n- protected:\n+ typedef QuadEdgeMeshDecimationQuadricElementHelper< OutputPointType > \n+ QuadricElementType;\n \n- QuadEdgeMeshQuadricDecimation() : Superclass( ) {}\n- virtual ~QuadEdgeMeshQuadricDecimation() {}\n+ typedef std::map< OutputPointIdentifier, QuadricElementType > \n+ QuadricElementMapType;\n+\n+ typedef typename QuadricElementMapType::iterator QuadricElementMapIterator;\n \n- QuadricElementMapType m_Quadric;\n+protected:\n \n- virtual void Initialize()\n+ QuadEdgeMeshQuadricDecimation() {}\n+ virtual ~QuadEdgeMeshQuadricDecimation() {}\n+ \n+ QuadricElementMapType m_Quadric;\n+\n+ virtual void Initialize()\n+ {\n+ OutputMeshPointer output = this->GetOutput();\n+ OutputPointsContainerPointer points = output->GetPoints();\n+ OutputPointsContainerIterator it = points->Begin();\n+ OutputPointIdentifier p_id;\n+ OutputQEType * qe;\n+ OutputQEType * qe_it;\n+ \n+ while( it != points->End() )\n {\n- OutputMeshPointer output = this->GetOutput();\n- OutputPointsContainerPointer points = output->GetPoints();\n- OutputPointsContainerIterator it = points->Begin();\n- OutputPointIdentifier p_id;\n- OutputQEType* qe;\n- OutputQEType* qe_it;\n- \n- for( ; it != points->End(); it++ )\n+ p_id = it->Index();\n+ \n+ qe = output->FindEdge( p_id );\n+ if( qe != 0 )\n+ {\n+ qe_it = qe;\n+ do\n {\n- p_id = it->Index();\n- \n- qe = output->FindEdge( p_id );\n- if( qe != 0 )\n- {\n- qe_it = qe;\n- do\n- {\n- QuadricAtOrigin( qe_it, m_Quadric[p_id] );\n- qe_it = qe_it->GetOnext();\n- } while( qe_it != qe );\n- }\n- }\n+ QuadricAtOrigin( qe_it, m_Quadric[p_id] );\n+ qe_it = qe_it->GetOnext();\n+ } while( qe_it != qe );\n+ }\n+ it++;\n+ }\n+ }\n+ \n+ inline void QuadricAtOrigin( OutputQEType* iEdge, QuadricElementType& oQ ) \n+ {\n+ OutputMeshPointer output = this->GetOutput();\n+ \n+ OutputPointIdentifier id[3];\n+ id[0] = iEdge->GetOrigin();\n+ id[1] = iEdge->GetDestination();\n+ id[2] = iEdge->GetOnext()->GetDestination();\n+ \n+ OutputPointType p[3];\n+ \n+ for( int i = 0; i < 3; i++ )\n+ {\n+ p[i] = output->GetPoint( id[i] );\n }\n \n- inline void QuadricAtOrigin( OutputQEType* iEdge,\n- QuadricElementType& oQ ) \n- {\n- OutputMeshPointer output = this->GetOutput();\n- \n- OutputPointIdentifier id[3];\n- id[0] = iEdge->GetOrigin();\n- id[1] = iEdge->GetDestination();\n- id[2] = iEdge->GetOnext()->GetDestination();\n- \n- OutputPointType p[3];\n- \n- for( int i = 0; i < 3; i++ )\n- p[i] = output->GetPoint( id[i] );\n- \n- oQ.AddTriangle( p[0], p[1], p[2] );\n- }\n- \n- \/**\n- * \\brief Compute the measure value for iEdge\n- * \\param[in] iEdge\n- * \\return measure value, here the squared edge length\n- *\/\n- inline MeasureType MeasureEdge( OutputQEType* iEdge )\n- {\n- OutputPointIdentifier id_org = iEdge->GetOrigin();\n- OutputPointIdentifier id_dest = iEdge->GetDestination();\n- QuadricElementType Q = m_Quadric[ id_org ] + m_Quadric[ id_dest ];\n- return static_cast< MeasureType >( Q.ComputeErrorAtOptimalLocation() );\n- }\n- \n- virtual void DeletePoint( const OutputPointIdentifier& iIdToBeDeleted,\n- const OutputPointIdentifier& iRemaining )\n- {\n- Superclass::DeletePoint( iIdToBeDeleted, iRemaining );\n- m_Quadric[iRemaining] += m_Quadric[iIdToBeDeleted];\n- }\n+ oQ.AddTriangle( p[0], p[1], p[2] );\n+ }\n+ \n+ \/**\n+ * \\brief Compute the measure value for iEdge\n+ * \\param[in] iEdge\n+ * \\return measure value, here the squared edge length\n+ *\/\n+ inline MeasureType MeasureEdge( OutputQEType* iEdge )\n+ {\n+ OutputPointIdentifier id_org = iEdge->GetOrigin();\n+ OutputPointIdentifier id_dest = iEdge->GetDestination();\n+ QuadricElementType Q = m_Quadric[ id_org ] + m_Quadric[ id_dest ];\n+ return static_cast< MeasureType >( Q.ComputeErrorAtOptimalLocation() );\n+ }\n+ \n+ virtual void DeletePoint( const OutputPointIdentifier& iIdToBeDeleted,\n+ const OutputPointIdentifier& iRemaining )\n+ {\n+ Superclass::DeletePoint( iIdToBeDeleted, iRemaining );\n+ m_Quadric[iRemaining] += m_Quadric[iIdToBeDeleted];\n+ }\n \n- \/**\n- * \\brief\n- * \\param[in]\n- * \\return\n- *\/\n- OutputPointType Relocate( OutputQEType* iEdge )\n- {\n- OutputPointIdentifier id_org = iEdge->GetOrigin();\n- OutputPointIdentifier id_dest = iEdge->GetDestination();\n- QuadricElementType Q = m_Quadric[ id_org ] + m_Quadric[ id_dest ];\n- return Q.ComputeOptimalLocation();\n- }\n+ \/**\n+ * \\brief\n+ * \\param[in]\n+ * \\return\n+ *\/\n+ OutputPointType Relocate( OutputQEType* iEdge )\n+ {\n+ OutputPointIdentifier id_org = iEdge->GetOrigin();\n+ OutputPointIdentifier id_dest = iEdge->GetDestination();\n+ QuadricElementType Q = m_Quadric[ id_org ] + m_Quadric[ id_dest ];\n+ return Q.ComputeOptimalLocation();\n+ }\n \n- private:\n- QuadEdgeMeshQuadricDecimation( const Self& );\n- void operator = ( const Self& );\n- };\n+private:\n+ QuadEdgeMeshQuadricDecimation( const Self& );\n+ void operator = ( const Self& );\n+};\n \n }\n #endif\n"} {"commit":"5e9dd373dea43f61f5d3ce8b6667377a02c6fd42","subject":"percpu_refcount: export symbols","message":"percpu_refcount: export symbols\n\nExport the interface to be used within modules.\n\nSigned-off-by: Matias Bjorling <6b0d31c0d563223024da45691584643ac78c96e8@bjorling.me>\nAcked-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6c1010e46a89750f537d05bf4f69f1c48416d8b1","subject":"Update doc","message":"Update doc\n","repos":"mayeut\/yabmp,mayeut\/yabmp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/yabmp\/inc\/yabmp.h\n+++ lib\/yabmp\/inc\/yabmp.h\n@@ -350,6 +350,18 @@\n *\n *\/\n YABMP_API(yabmp_status, yabmp_set_invert_scan_direction, (yabmp* instance));\n+\/**\n+ * Expand to BGR(A).\n+ *\n+ * Image rows will be read in BGR(A) format.\n+ *\n+ * @param[in] instance Pointer to the reader object.\n+ *\n+ * @return\n+ * #YABMP_OK on success.\\n\n+ * #YABMP_ERR_INVALID_ARGS when invalid arguments are provided.\\n\n+ *\n+ *\/\n YABMP_API(yabmp_status, yabmp_set_expand_to_bgrx, (yabmp* instance));\n YABMP_API(yabmp_status, yabmp_set_expand_to_grayscale, (yabmp* instance));\n \t\t\n"} {"commit":"e5f7b559ab4eeb2f5b7ade0e10102975eab2c207","subject":"Adapt the patch to more recent FFmpeg habits","message":"Adapt the patch to more recent FFmpeg habits\n\n- Indentation\n- Use av_log instead of fprintf\n- Removed strdup of the device name. It was unused\n- Cleaned things a bit \n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@7294 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/x11grab.c\n+++ libavformat\/x11grab.c\n@@ -1,14 +1,14 @@\n \/*\n * X11 video grab interface\n- * Copyright (c) 2006 Clemens Fruhwirth\n- * \n+ * Copyright (C) 2006 Clemens Fruhwirth\n+ *\n * A quick note on licensing. This file is a mixture of LGPL code\n * (ffmpeg) and GPL code (xvidcap). The result is a file that must\n * abid both licenses. As they are compatible and GPL is more\n * strict, this code has an \"effective\" GPL license.\n * \n * This file contains code from grab.c:\n- * Copyright (c) 2000,2001 Fabrice Bellard \n+ * Copyright (c) 2000, 2001 Fabrice Bellard \n *\n * This library is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU Lesser General Public\n@@ -42,6 +42,7 @@\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n *\/\n+\n #include \"avformat.h\"\n #include \n #include \n@@ -59,345 +60,361 @@\n #include \n #include \n \n-\n-typedef struct {\n- Display *dpy;\n- int frame_format;\n- int frame_size;\n- int frame_rate;\n- int frame_rate_base;\n- int64_t time_frame;\n-\n- int height;\n- int width;\n- int x_off;\n- int y_off;\n- XImage *image;\n- int use_shm;\n- XShmSegmentInfo shminfo;\n- int mouse_wanted;\n+typedef struct\n+{\n+\tDisplay *dpy;\n+\tint frame_format;\n+\tint frame_size;\n+\tint frame_rate;\n+\tint frame_rate_base;\n+\tint64_t time_frame;\n+\n+\tint height;\n+\tint width;\n+\tint x_off;\n+\tint y_off;\n+\tXImage *image;\n+\tint use_shm;\n+\tXShmSegmentInfo shminfo;\n+\tint mouse_wanted;\n } X11Grab;\n \n-static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)\n-{\n- X11Grab *x11grab=s1->priv_data;\n- Display *dpy;\n- AVStream *st;\n- int width, height;\n- int frame_rate, frame_rate_base, frame_size;\n- int input_pixfmt;\n- XImage *image;\n- int x_off=0; int y_off = 0;\n- char *device_parsing = strdup(ap->device);\n- int use_shm;\n-\n- dpy = XOpenDisplay(NULL);\n-\n- if(!dpy)\n- goto fail;\n-\n- sscanf(device_parsing,\"x11:%d,%d\",&x_off, &y_off);\n- fprintf(stderr,\"device: %s -> x: %d y: %d width: %d height: %d\\n\", ap->device, x_off, y_off, ap->width, ap->height);\n- \n- if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {\n- fprintf(stderr,\"x11grab: AVParameters don't have any video size. Use -s.\\n\");\n- return AVERROR_IO; \n- }\n- width = ap->width;\n- height = ap->height;\n- frame_rate = ap->time_base.den;\n- frame_rate_base = ap->time_base.num;\n-\n- st = av_new_stream(s1, 0);\n- if (!st)\n- return -ENOMEM;\n- av_set_pts_info(st, 48, 1, 1000000); \/* 48 bits pts in us *\/\n-\n- use_shm = XShmQueryExtension(dpy);\n- fprintf(stderr,\"x11grab: shared memory extension %s\\n\",use_shm?\"found\":\"not found\");\n- if(use_shm) {\n- int scr = XDefaultScreen(dpy);\n- image = XShmCreateImage(dpy, \n-\t\t\t DefaultVisual(dpy,scr), \n-\t\t\t DefaultDepth(dpy,scr), \n-\t\t\t ZPixmap, NULL,\n-\t\t\t &x11grab->shminfo, ap->width, ap->height);\n- x11grab->shminfo.shmid = shmget(IPC_PRIVATE,\n-\t\t\t\t image->bytes_per_line * image->height, IPC_CREAT|0777);\n- if (x11grab->shminfo.shmid == -1) {\n- fprintf(stderr,\"Fatal: Can't get shared memory!\\n\");\n- return -ENOMEM;\n- }\n- x11grab->shminfo.shmaddr = image->data = shmat(x11grab->shminfo.shmid, 0, 0);\n- x11grab->shminfo.readOnly = False;\n+static int\n+x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)\n+{\n+\tX11Grab *x11grab = s1->priv_data;\n+\tDisplay *dpy;\n+\tAVStream *st = NULL;\n+\tint width, height;\n+\tint frame_rate, frame_rate_base, frame_size;\n+\tint input_pixfmt;\n+\tXImage *image;\n+\tint x_off=0; int y_off = 0;\n+\tint use_shm;\n+\n+\tdpy = XOpenDisplay(NULL);\n+\tif(!dpy) {\n+\t\tgoto fail;\n+\t}\n+\n+\tsscanf(ap->device, \"x11:%d,%d\", &x_off, &y_off);\n+\tav_log(s1, AV_LOG_INFO, \"device: %s -> x: %d y: %d width: %d height: %d\\n\", ap->device, x_off, y_off, ap->width, ap->height);\n+ \n+\tif (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {\n+\t\tav_log(s1, AV_LOG_ERROR, \"AVParameters don't have any video size. Use -s.\\n\");\n+\t\treturn AVERROR_IO; \n+\t}\n+\n+\twidth = ap->width;\n+\theight = ap->height;\n+\tframe_rate = ap->time_base.den;\n+\tframe_rate_base = ap->time_base.num;\n+\n+\tst = av_new_stream(s1, 0);\n+\tif (!st) {\n+\t\treturn -ENOMEM;\n+\t}\n+\tav_set_pts_info(st, 48, 1, 1000000); \/* 48 bits pts in us *\/\n+\n+\tuse_shm = XShmQueryExtension(dpy);\n+\tav_log(s1, AV_LOG_INFO, \"shared memory extension %s\\n\", use_shm ? \"found\" : \"not found\");\n+\n+\tif(use_shm) {\n+\t\tint scr = XDefaultScreen(dpy);\n+\t\timage = XShmCreateImage(dpy,\n+\t\t\t\t\tDefaultVisual(dpy,scr),\n+\t\t\t\t\tDefaultDepth(dpy,scr),\n+\t\t\t\t\tZPixmap,\n+\t\t\t\t\tNULL,\n+\t\t\t\t\t&x11grab->shminfo,\n+\t\t\t\t\tap->width, ap->height);\n+\t\tx11grab->shminfo.shmid = shmget(IPC_PRIVATE,\n+\t\t\t\t\t\timage->bytes_per_line * image->height,\n+\t\t\t\t\t\tIPC_CREAT|0777);\n+\t\tif (x11grab->shminfo.shmid == -1) {\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"Fatal: Can't get shared memory!\\n\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t\tx11grab->shminfo.shmaddr = image->data = shmat(x11grab->shminfo.shmid, 0, 0);\n+\t\tx11grab->shminfo.readOnly = False;\n \n- if (XShmAttach(dpy, &x11grab->shminfo) == 0) {\n- fprintf(stderr,\"Fatal: Failed to attach shared memory!\\n\");\n- \/* needs some better error subroutine :) *\/\n- return AVERROR_IO; \n- }\n- }\n- else {\n- image = XGetImage(dpy, RootWindow(dpy, DefaultScreen(dpy)),\n-\t\t x_off,y_off,\n-\t\t ap->width,ap->height,\n-\t\t AllPlanes, ZPixmap); \n- }\n- \n- switch (image->bits_per_pixel) {\n- case 8:\n- fprintf (stderr, \"x11grab: 8 bit pallete\\n\");\n- input_pixfmt = PIX_FMT_PAL8;\n- break;\n- case 16:\n- if ( image->red_mask == 0xF800 && image->green_mask == 0x07E0\n-\t && image->blue_mask == 0x1F ) {\n- fprintf (stderr, \"x11grab: 16 bit RGB565\\n\");\n- input_pixfmt = PIX_FMT_RGB565;\n- } else if ( image->red_mask == 0x7C00 && \n-\t\timage->green_mask == 0x03E0 && \n-\t\timage->blue_mask == 0x1F ) {\n- fprintf (stderr, \"x11grab: 16 bit RGB555\\n\");\n- input_pixfmt = PIX_FMT_RGB555;\n- } else {\n- fprintf (stderr, \"x11grab: RGB ordering at image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n- fprintf (stderr, \"x11grab: color masks: r 0x%.6X g 0x%.6X b 0x%.6X\\n\", image->red_mask, image->green_mask, image->blue_mask);\n- return AVERROR_IO; \n- }\n- break;\n- case 24:\n- if ( image->red_mask == 0xFF0000 && \n-\t image->green_mask == 0xFF00\n-\t && image->blue_mask == 0xFF ) {\n- input_pixfmt = PIX_FMT_BGR24;\n- } else if ( image->red_mask == 0xFF && image->green_mask == 0xFF00\n- && image->blue_mask == 0xFF0000 ) {\n- input_pixfmt = PIX_FMT_RGB24;\n- } else {\n- fprintf (stderr, \"xtoffmpeg.XImageToFFMPEG(): rgb ordering at image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n- fprintf (stderr, \"xtoffmpeg.XImageToFFMPEG(): color masks: r 0x%.6X g 0x%.6X b 0x%.6X\\n\", image->red_mask, image->green_mask, image->blue_mask);\n- return AVERROR_IO; \n- }\n- break;\n- case 32:\n+\t\tif (!XShmAttach(dpy, &x11grab->shminfo)) {\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"Fatal: Failed to attach shared memory!\\n\");\n+\t\t\t\/* needs some better error subroutine :) *\/\n+\t\t\treturn AVERROR_IO; \n+\t\t}\n+\t} else {\n+\t\timage = XGetImage(dpy, RootWindow(dpy, DefaultScreen(dpy)),\n+\t\t\t\t x_off,y_off,\n+\t\t\t\t ap->width,ap->height,\n+\t\t\t\t AllPlanes, ZPixmap); \n+\t}\n+ \n+\tswitch (image->bits_per_pixel) {\n+\tcase 8:\n+\t\tav_log (s1, AV_LOG_DEBUG, \"8 bit pallete\\n\");\n+\t\tinput_pixfmt = PIX_FMT_PAL8;\n+\t\tbreak;\n+\tcase 16:\n+\t\tif ( image->red_mask == 0xF800 && image->green_mask == 0x07E0\n+\t\t && image->blue_mask == 0x1F ) {\n+\t\t\tav_log (s1, AV_LOG_DEBUG, \"16 bit RGB565\\n\");\n+\t\t\tinput_pixfmt = PIX_FMT_RGB565;\n+\t\t} else if ( image->red_mask == 0x7C00 && \n+\t\t\t image->green_mask == 0x03E0 && \n+\t\t\t image->blue_mask == 0x1F ) {\n+\t\t\tav_log(s1, AV_LOG_DEBUG, \"16 bit RGB555\\n\");\n+\t\t\tinput_pixfmt = PIX_FMT_RGB555;\n+\t\t} else {\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"RGB ordering at image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\\n\", image->red_mask, image->green_mask, image->blue_mask);\n+\t\t\treturn AVERROR_IO; \n+\t\t}\n+\t\tbreak;\n+\tcase 24:\n+\t\tif ( image->red_mask == 0xFF0000 && \n+\t\t image->green_mask == 0xFF00\n+\t\t && image->blue_mask == 0xFF ) {\n+\t\t\tinput_pixfmt = PIX_FMT_BGR24;\n+\t\t} else if ( image->red_mask == 0xFF && image->green_mask == 0xFF00\n+\t\t\t && image->blue_mask == 0xFF0000 ) {\n+\t\t\tinput_pixfmt = PIX_FMT_RGB24;\n+\t\t} else {\n+\t\t\tav_log(s1, AV_LOG_ERROR,\"rgb ordering at image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\\n\", image->red_mask, image->green_mask, image->blue_mask);\n+\t\t\treturn AVERROR_IO; \n+\t\t}\n+\t\tbreak;\n+\tcase 32:\n #if 0\n- GetColorInfo (image, &c_info);\n- if ( c_info.alpha_mask == 0xFF000000 && image->green_mask == 0xFF00 ) {\n- \/\/ byte order is relevant here, not endianness\n- \/\/ endianness is handled by avcodec, but atm no such thing\n- \/\/ as having ABGR, instead of ARGB in a word. Since we\n- \/\/ need this for Solaris\/SPARC, but need to do the conversion\n- \/\/ for every frame we do it outside of this loop, cf. below\n- \/\/ this matches both ARGB32 and ABGR32\n- input_pixfmt = PIX_FMT_ARGB32;\n- } else {\n- fprintf (stderr, \"xtoffmpeg.XImageToFFMPEG(): image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n- return AVERROR_IO; \n- }\n+\t\tGetColorInfo (image, &c_info);\n+\t\tif ( c_info.alpha_mask == 0xFF000000 && image->green_mask == 0xFF00 ) {\n+\t\t\t\/\/ byte order is relevant here, not endianness\n+\t\t\t\/\/ endianness is handled by avcodec, but atm no such thing\n+\t\t\t\/\/ as having ABGR, instead of ARGB in a word. Since we\n+\t\t\t\/\/ need this for Solaris\/SPARC, but need to do the conversion\n+\t\t\t\/\/ for every frame we do it outside of this loop, cf. below\n+\t\t\t\/\/ this matches both ARGB32 and ABGR32\n+\t\t\tinput_pixfmt = PIX_FMT_ARGB32;\n+\t\t} else {\n+\t\t\tav_log(s1, AV_LOG_ERROR,\"image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n+\t\t\treturn AVERROR_IO; \n+\t\t}\n #endif\n- input_pixfmt = PIX_FMT_RGBA32;\n- break;\n- default:\n- fprintf (stderr, \"xtoffmpeg.XImageToFFMPEG(): image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n- return -1;\n- }\n-\n- frame_size = width * height * image->bits_per_pixel\/8;\n- x11grab->frame_size = frame_size;\n- x11grab->dpy = dpy;\n- x11grab->width = ap->width;\n- x11grab->height = ap->height;\n- x11grab->frame_rate = frame_rate;\n- x11grab->frame_rate_base = frame_rate_base;\n- x11grab->time_frame = av_gettime() * frame_rate \/ frame_rate_base;\n- x11grab->x_off = x_off;\n- x11grab->y_off = y_off;\n- x11grab->image = image;\n- x11grab->use_shm = use_shm;\n- x11grab->mouse_wanted = 1;\n-\n- st->codec->codec_type = CODEC_TYPE_VIDEO;\n- st->codec->codec_id = CODEC_ID_RAWVIDEO;\n- st->codec->width = width;\n- st->codec->height = height;\n- st->codec->pix_fmt = input_pixfmt;\n- st->codec->time_base.den = frame_rate;\n- st->codec->time_base.num = frame_rate_base;\n- st->codec->bit_rate = frame_size * 1\/av_q2d(st->codec->time_base) * 8;\n- \n- return 0;\n- fail:\n- av_free(st);\n- av_free(device_parsing);\n- return AVERROR_IO; \n+\t\tinput_pixfmt = PIX_FMT_RGBA32;\n+\t\tbreak;\n+\tdefault:\n+\t\tav_log(s1, AV_LOG_ERROR, \"image depth %i not supported ... aborting\\n\", image->bits_per_pixel);\n+\t\treturn -1;\n+\t}\n+\n+\tframe_size = width * height * image->bits_per_pixel\/8;\n+\tx11grab->frame_size = frame_size;\n+\tx11grab->dpy = dpy;\n+\tx11grab->width = ap->width;\n+\tx11grab->height = ap->height;\n+\tx11grab->frame_rate = frame_rate;\n+\tx11grab->frame_rate_base = frame_rate_base;\n+\tx11grab->time_frame = av_gettime() * frame_rate \/ frame_rate_base;\n+\tx11grab->x_off = x_off;\n+\tx11grab->y_off = y_off;\n+\tx11grab->image = image;\n+\tx11grab->use_shm = use_shm;\n+\tx11grab->mouse_wanted = 1;\n+\n+\tst->codec->codec_type = CODEC_TYPE_VIDEO;\n+\tst->codec->codec_id = CODEC_ID_RAWVIDEO;\n+\tst->codec->width = width;\n+\tst->codec->height = height;\n+\tst->codec->pix_fmt = input_pixfmt;\n+\tst->codec->time_base.den = frame_rate;\n+\tst->codec->time_base.num = frame_rate_base;\n+\tst->codec->bit_rate = frame_size * 1\/av_q2d(st->codec->time_base) * 8;\n+ \n+\treturn 0;\n+fail:\n+\tav_free(st);\n+\treturn AVERROR_IO; \n }\n \n-uint16_t mousePointerBlack[] = { 0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832,\n-33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0 };\n-uint16_t mousePointerWhite[] = { 0, 0, 16384, 24576, 28672, 30720, 31744, 32256, 32512, 32640, 31744,\n-27648, 17920, 1536, 768, 768, 384, 384, 0, 0 };\n-\n-static void getCurrentPointer(X11Grab *s, int *x, int *y) {\n- Window mrootwindow, childwindow;\n- int dummy;\n- Display *dpy = s->dpy;\n- \n- mrootwindow = DefaultRootWindow(dpy);\n- \n- if (XQueryPointer(dpy, mrootwindow, &mrootwindow, &childwindow,\n-\t\t x, y, &dummy, &dummy, &dummy)) {\n- } else {\n- fprintf(stderr,\"couldn't find mouse pointer\\n\");\n- *x = -1;\n- *y = -1;\n- }\n+static const uint16_t mousePointerBlack[] =\n+{\n+\t0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832,\n+\t33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0\n+};\n+\n+static const uint16_t mousePointerWhite[] =\n+{\n+\t0, 0, 16384, 24576, 28672, 30720, 31744, 32256, 32512, 32640, 31744,\n+\t27648, 17920, 1536, 768, 768, 384, 384, 0, 0\n+};\n+\n+static void\n+getCurrentPointer(AVFormatContext *s1, X11Grab *s, int *x, int *y)\n+{\n+\tWindow mrootwindow, childwindow;\n+\tint dummy;\n+\tDisplay *dpy = s->dpy;\n+ \n+\tmrootwindow = DefaultRootWindow(dpy);\n+ \n+\tif (XQueryPointer(dpy, mrootwindow, &mrootwindow, &childwindow,\n+\t\t\t x, y, &dummy, &dummy, (unsigned int*)&dummy)) {\n+\t} else {\n+\t\tav_log(s1, AV_LOG_INFO, \"couldn't find mouse pointer\\n\");\n+\t\t*x = -1;\n+\t\t*y = -1;\n+\t}\n }\n \n-static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {\n- int x_off = s->x_off;\n- int y_off = s->y_off;\n- int width = s->width;\n- int height = s->height;\n-\n- if ((*x - x_off) >= 0 && \n- *x < (width + x_off) && \n- (*y - y_off) >= 0 && \n- *y < (height + y_off) ) { \n- int line;\n- uint8_t *im_data = image->data;\n+static void\n+paintMousePointer(AVFormatContext *s1, X11Grab *s, int *x, int *y, XImage *image)\n+{\n+\tint x_off = s->x_off;\n+\tint y_off = s->y_off;\n+\tint width = s->width;\n+\tint height = s->height;\n+\n+\tif ( (*x - x_off) >= 0 && *x < (width + x_off)\n+\t && (*y - y_off) >= 0 && *y < (height + y_off) ) { \n+\t\tint line;\n+\t\tuint8_t *im_data = (uint8_t*)image->data;\n \n- im_data += (image->bytes_per_line * (*y - y_off)); \/\/ shift to right line\n- im_data += (image->bits_per_pixel \/ 8 * (*x - x_off)); \/\/ shift to right pixel\n+\t\tim_data += (image->bytes_per_line * (*y - y_off)); \/\/ shift to right line\n+\t\tim_data += (image->bits_per_pixel \/ 8 * (*x - x_off)); \/\/ shift to right pixel\n \n- switch(image->bits_per_pixel) {\n- case 32: \n- {\n-\tuint32_t *cursor;\n-\tint width_cursor;\n-\tuint16_t bm_b, bm_w, mask;\n+\t\tswitch(image->bits_per_pixel) {\n+\t\tcase 32: \n+\t\t{\n+\t\t\tuint32_t *cursor;\n+\t\t\tint width_cursor;\n+\t\t\tuint16_t bm_b, bm_w, mask;\n \n-\tfor (line = 0; line < 20; line++ ) {\n-\t if (s->mouse_wanted == 1) {\n-\t bm_b = mousePointerBlack[line];\n-\t bm_w = mousePointerWhite[line];\n-\t } else {\n-\t bm_b = mousePointerWhite[line];\n-\t bm_w = mousePointerBlack[line];\n-\t }\n-\t mask = ( 0x0001 << 15 );\n+\t\t\tfor (line = 0; line < min(20, (y_off + height) - *y); line++ ) {\n+\t\t\t\tif (s->mouse_wanted == 1) {\n+\t\t\t\t\tbm_b = mousePointerBlack[line];\n+\t\t\t\t\tbm_w = mousePointerWhite[line];\n+\t\t\t\t} else {\n+\t\t\t\t\tbm_b = mousePointerWhite[line];\n+\t\t\t\t\tbm_w = mousePointerBlack[line];\n+\t\t\t\t}\n+\t\t\t\tmask = (0x0001 << 15);\n \t \n-\t for (cursor = (uint32_t*) im_data, width_cursor = 0; \n-\t ((width_cursor + *x) < (width + x_off) && width_cursor < 16);\n-\t cursor++, width_cursor++) {\n-\t \/\/\t\t\t\t\t\t\tBoolean pointer_b_bit, pointer_w_bit;\t \n-\t \/\/\t\t\t\t\t\t\tpointer_b_bit = ( ( bm_b & mask ) > 0 );\n-\t \/\/\t\t\t\t\t\t\tpointer_w_bit = ( ( bm_w & mask ) > 0 );\n-\t \/\/\t\t\t\t\t\t\tprintf(\"%i \", pointer_b_bit, pointer_w_bit );\n-\t \n-\t if ( ( bm_b & mask ) > 0 ) {\n-\t *cursor &= ((~ image->red_mask) & (~ image->green_mask) & (~image->blue_mask ));\n-\t } else if ( ( bm_w & mask ) > 0 ) {\n-\t *cursor |= (image->red_mask | image->green_mask | image->blue_mask );\n-\t }\n-\t mask >>= 1;\n-\t }\n-\t \/\/\t\t\t\t\t\tprintf(\"\\n\");\n-\t im_data += image->bytes_per_line;\n-\t}\n- }\n- break;\n+\t\t\t\tfor (cursor = (uint32_t*) im_data, width_cursor = 0; \n+\t\t\t\t ((width_cursor + *x) < (width + x_off) && width_cursor < 16);\n+\t\t\t\t cursor++, width_cursor++) {\n+\t\t\t\t\t\/\/ Boolean pointer_b_bit, pointer_w_bit;\t \n+\t\t\t\t\t\/\/ pointer_b_bit = ( ( bm_b & mask ) > 0 );\n+\t\t\t\t\t\/\/ pointer_w_bit = ( ( bm_w & mask ) > 0 );\n+\t\t\t\t\t\/\/ printf(\"%i \", pointer_b_bit, pointer_w_bit );\n+\t\t\t\t\tif (( bm_b & mask) > 0 ) {\n+\t\t\t\t\t\t*cursor &= ( (~image->red_mask)\n+\t\t\t\t\t\t\t & (~image->green_mask)\n+\t\t\t\t\t\t\t & (~image->blue_mask));\n+\t\t\t\t\t} else if (( bm_w & mask) > 0 ) {\n+\t\t\t\t\t\t*cursor |= ( image->red_mask\n+\t\t\t\t\t\t\t | image->green_mask\n+\t\t\t\t\t\t\t | image->blue_mask );\n+\t\t\t\t\t}\n+\t\t\t\t\tmask >>= 1;\n+\t\t\t\t}\n+\t\t\t\t\/\/\t\t\t\t\t\tprintf(\"\\n\");\n+\t\t\t\tim_data += image->bytes_per_line;\n+\t\t\t}\n+\t\t}\n+\t\tbreak;\n #if 0\n- case 24: \/\/ not sure this can occur at all ..........\n- fprintf(stderr,\"input image bits_per_pixel %i not implemented with mouse pointer capture ... aborting!\\n\",\n- image->bits_per_pixel);\n- fprintf(stderr,\"Please file a bug at http:\/\/www.sourceforge.net\/projects\/xvidcap\/\\n\");\n- exit(1);\n- break;\n- case 16: {\n- uint16_t *cursor;\n- int width;\n- uint16_t bm_b, bm_w, mask;\n+\t\tcase 24: \/\/ not sure this can occur at all ..........\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"input image bits_per_pixel %i not implemented with mouse pointer capture ... aborting!\\n\",\n+\t\t\t\timage->bits_per_pixel);\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"Please file a bug at http:\/\/www.sourceforge.net\/projects\/xvidcap\/\\n\");\n+\t\t\texit(1);\n+\t\t\tbreak;\n+\t\tcase 16:\n+\t\t{\n+\t\t\tuint16_t *cursor;\n+\t\t\tint width;\n+\t\t\tuint16_t bm_b, bm_w, mask;\n \n- for (line = 0; line < 16; line++ ) {\n- if (mjob->mouseWanted == 1) {\n- bm_b = mousePointerBlack[line];\n- bm_w = mousePointerWhite[line];\n- } else {\n- bm_b = mousePointerWhite[line];\n- bm_w = mousePointerBlack[line];\n- }\n- mask = ( 0x0001 << 15 );\n+\t\t\tfor (line = 0; line < 16; line++) {\n+\t\t\t\tif (mjob->mouseWanted == 1) {\n+\t\t\t\t\tbm_b = mousePointerBlack[line];\n+\t\t\t\t\tbm_w = mousePointerWhite[line];\n+\t\t\t\t} else {\n+\t\t\t\t\tbm_b = mousePointerWhite[line];\n+\t\t\t\t\tbm_w = mousePointerBlack[line];\n+\t\t\t\t}\n+\t\t\t\tmask = (0x0001 << 15);\n \n- for (cursor = (uint16_t*) im_data, width = 0;\n- ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);\n- cursor++, width++) {\n- \/\/\t\t\t\t\t\t\tBoolean pointer_b_bit, pointer_w_bit;\n+\t\t\t\tfor (cursor = (uint16_t*) im_data, width = 0;\n+\t\t\t\t ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);\n+\t\t\t\t cursor++, width++) {\n+\t\t\t\t\t\/\/ Boolean pointer_b_bit, pointer_w_bit;\n+\t\t\t\t\t\/\/ pointer_b_bit = ( ( bm_b & mask ) > 0 );\n+\t\t\t\t\t\/\/ pointer_w_bit = ( ( bm_w & mask ) > 0 );\n+\t\t\t\t\t\/\/ printf(\"%i \", pointer_b_bit, pointer_w_bit );\n+\t\t\t\t\tif (( bm_b & mask ) > 0 ) {\n+\t\t\t\t\t\t*cursor &= ( (~image->red_mask)\n+\t\t\t\t\t\t\t & (~image->green_mask)\n+\t\t\t\t\t\t\t & (~image->blue_mask));\n+\t\t\t\t\t} else if (( bm_w & mask ) > 0 ) {\n+\t\t\t\t\t\t*cursor |= ( image->red_mask\n+\t\t\t\t\t\t\t | image->green_mask\n+\t\t\t\t\t\t\t | image->blue_mask );\n+\t\t\t\t\t}\n+\t\t\t\t\tmask >>= 1;\n+\t\t\t\t}\n+\t\t\t\t\/\/ printf(\"\\n\");\n+ \n+\t\t\t\tim_data += image->bytes_per_line;\n+\t\t\t}\n+\t\t}\n+\t\t\tbreak;\n+\t\tcase 8:\n+\t\t{\n+\t\t\tuint8_t *cursor;\n+\t\t\tint width;\n+\t\t\tuint16_t bm_b, bm_w, mask;\n+ \n+\t\t\tfor (line = 0; line < 16; line++ ) {\n+\t\t\t\tif (mjob->mouseWanted == 1) {\n+\t\t\t\t\tbm_b = mousePointerBlack[line];\n+\t\t\t\t\tbm_w = mousePointerWhite[line];\n+\t\t\t\t} else {\n+\t\t\t\t\tbm_b = mousePointerWhite[line];\n+\t\t\t\t\tbm_w = mousePointerBlack[line];\n+\t\t\t\t}\n+\t\t\t\tmask = ( 0x0001 << 15 );\n+ \n+\t\t\t\tfor (cursor = im_data, width = 0;\n+\t\t\t\t ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);\n+\t\t\t\t cursor++, width++) {\n+\t\t\t\t\t\/\/ Boolean pointer_b_bit, pointer_w_bit;\n+\t\t\t\t\t\/\/ pointer_b_bit = ( ( bm_b & mask ) > 0 );\n+\t\t\t\t\t\/\/ pointer_w_bit = ( ( bm_w & mask ) > 0 );\n+\t\t\t\t\t\/\/ printf(\"%i \", pointer_b_bit, pointer_w_bit );\n+\t\t\t\t\tif ((bm_b & mask) > 0 ) {\n+\t\t\t\t\t\t*cursor = 0;\n+\t\t\t\t\t} else if (( bm_w & mask) > 0 ) {\n+\t\t\t\t\t\t*cursor = 1;\n+\t\t\t\t\t}\n+\t\t\t\t\tmask >>= 1;\n \n- \/\/\t\t\t\t\t\t\tpointer_b_bit = ( ( bm_b & mask ) > 0 );\n- \/\/\t\t\t\t\t\t\tpointer_w_bit = ( ( bm_w & mask ) > 0 );\n- \/\/\t\t\t\t\t\t\tprintf(\"%i \", pointer_b_bit, pointer_w_bit );\n- \n- if ( ( bm_b & mask ) > 0 ) {\n- *cursor &= ((~ image->red_mask) & (~ image->green_mask) & (~\n- image->blue_mask ));\n- } else if ( ( bm_w & mask ) > 0 ) {\n- *cursor |= (image->red_mask | image->green_mask | image->blue_mask );\n- }\n- mask >>= 1;\n- \n- }\n- \/\/\t\t\t\t\t\tprintf(\"\\n\");\n+\t\t\t\t}\n+\t\t\t\t\/\/ printf(\"\\n\");\n \n- im_data += image->bytes_per_line;\n- }\n- }\n- break;\n- case 8: {\n- uint8_t *cursor;\n- int width;\n- uint16_t bm_b, bm_w, mask;\n- \n- for (line = 0; line < 16; line++ ) {\n- if (mjob->mouseWanted == 1) {\n- bm_b = mousePointerBlack[line];\n- bm_w = mousePointerWhite[line];\n- } else {\n- bm_b = mousePointerWhite[line];\n- bm_w = mousePointerBlack[line];\n- }\n- mask = ( 0x0001 << 15 );\n- \n- for (cursor = im_data, width = 0;\n- ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);\n- cursor++, width++) {\n- \/\/\t\t\t\t\t\t\tBoolean pointer_b_bit, pointer_w_bit;\n- \n- \/\/\t\t\t\t\t\t\tpointer_b_bit = ( ( bm_b & mask ) > 0 );\n- \/\/\t\t\t\t\t\t\tpointer_w_bit = ( ( bm_w & mask ) > 0 );\n- \/\/\t\t\t\t\t\t\tprintf(\"%i \", pointer_b_bit, pointer_w_bit );\n- \n- if ( ( bm_b & mask ) > 0 ) {\n- *cursor = 0;\n- } else if ( ( bm_w & mask ) > 0 ) {\n- *cursor = 1;\n- }\n- mask >>= 1;\n- \n- }\n- \/\/\t\t\t\t\t\tprintf(\"\\n\");\n- \n- im_data += image->bytes_per_line;\n- }\n- }\n- break;\n- default:\n- fprintf(stderr,\"input image bits_per_pixel %i not supported with mouse pointer capture ... aborting!\\n\",\n- image->bits_per_pixel);\n- exit(1);\n+\t\t\t\tim_data += image->bytes_per_line;\n+\t\t\t}\n+\t\t}\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tav_log(s1, AV_LOG_ERROR, \"input image bits_per_pixel %i not supported with mouse pointer capture ... aborting!\\n\",\n+\t\t\t image->bits_per_pixel);\n+\t\t\texit(1);\n \n #endif \n- }\n- }\n+\t\t}\n+\t}\n }\n \n \n"} {"commit":"ddee5a294a286db487292cac9f0a19a37aa3df21","subject":"sync some fixes from glibc","message":"sync some fixes from glibc\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/inet\/rpc\/rexec.c\n+++ libc\/inet\/rpc\/rexec.c\n@@ -87,7 +87,7 @@\n \tsnprintf(servbuff, sizeof(servbuff), \"%d\", ntohs(rport));\n \tservbuff[sizeof(servbuff) - 1] = '\\0';\n \n-\tmemset(&hints, 0, sizeof(hints));\n+\tmemset(&hints, '\\0', sizeof(hints));\n \thints.ai_family = af;\n \thints.ai_socktype = SOCK_STREAM;\n \thints.ai_flags = AI_CANONNAME;\n@@ -104,6 +104,8 @@\n \t}\n \telse{\n \t\t*ahost = NULL;\n+\t\t__set_errno (ENOENT);\n+\t\treturn -1;\n \t}\n \truserpass(res0->ai_canonname, &name, &pass);\n retry:\n@@ -127,7 +129,8 @@\n \t\tport = 0;\n \t} else {\n \t\tchar num[32];\n-\t\tint s2, sa2len;\n+\t\tint s2;\n+\t\tsocklen_t sa2len;\n \n \t\ts2 = socket(res0->ai_family, res0->ai_socktype, 0);\n \t\tif (s2 < 0) {\n@@ -153,7 +156,8 @@\n \t\t(void) sprintf(num, \"%u\", port);\n \t\t(void) write(s, num, strlen(num)+1);\n \t\t{ socklen_t len = sizeof (from);\n-\t\t s3 = accept(s2, (struct sockaddr *)&from, &len);\n+\t\t s3 = TEMP_FAILURE_RETRY (accept(s2, (struct sockaddr *)&from,\n+\t\t\t\t\t\t &len));\n \t\t close(s2);\n \t\t if (s3 < 0) {\n \t\t\tperror(\"accept\");\n"} {"commit":"38a7f0011d33a41214a717192055613c8a112b01","subject":"include unistd.h for smallint","message":"include unistd.h for smallint\n\nSigned-off-by: Yoshinori Sato \nSigned-off-by: Bernhard Reutner-Fischer \n(cherry picked from commit df9130a0dc1c9e3553fcfee68bb8a809e4f4a458)\n\nSigned-off-by: Carmelo Amoroso <532378793705a04edd56deb76ad8c0442834d55d@st.com>\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/signal\/sigwait.c\n+++ libc\/signal\/sigwait.c\n@@ -22,6 +22,7 @@\n #include \n #include \n #include \n+#include \n \n #ifdef __UCLIBC_HAS_THREADS_NATIVE__\n # include \n"} {"commit":"b450ed48aefb143509125de567d66cabda1f5111","subject":"Removed unnecessary calls to log2Amp()","message":"Removed unnecessary calls to log2Amp()\n","repos":"oneman\/opus-oneman,oneman\/opus-oneman,oneman\/opus-oneman,Distrotech\/celt,mumble-voip\/celt-0.11.0,mumble-voip\/celt-0.11.0,mumble-voip\/celt-0.11.0,dezelin\/celt,Distrotech\/celt,dezelin\/celt,Distrotech\/celt,dezelin\/celt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libcelt\/quant_bands.c\n+++ libcelt\/quant_bands.c\n@@ -172,7 +172,6 @@\n #endif\n oldEBands[i+c*m->nbEBands] += offset;\n error[i+c*m->nbEBands] -= offset;\n- eBands[i+c*m->nbEBands] = log2Amp(oldEBands[i+c*m->nbEBands]);\n \/*printf (\"%f \", error[i] - offset);*\/\n } while (++c < C);\n }\n@@ -204,13 +203,13 @@\n offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f\/16384);\n #endif\n oldEBands[i+c*m->nbEBands] += offset;\n+ eBands[i+c*m->nbEBands] = log2Amp(oldEBands[i+c*m->nbEBands]);\n bits_left--;\n } while (++c < C);\n }\n }\n for (i=start;inbEBands;i++)\n {\n- eBands[i] = log2Amp(oldEBands[i]);\n if (oldEBands[i] < -QCONST16(7.f,DB_SHIFT))\n oldEBands[i] = -QCONST16(7.f,DB_SHIFT);\n }\n@@ -303,13 +302,13 @@\n offset = (q2-.5f)*(1<<(14-fine_quant[i]-1))*(1.f\/16384);\n #endif\n oldEBands[i+c*m->nbEBands] += offset;\n+ eBands[i+c*m->nbEBands] = log2Amp(oldEBands[i+c*m->nbEBands]);\n bits_left--;\n } while (++c < C);\n }\n }\n for (i=start;inbEBands;i++)\n {\n- eBands[i] = log2Amp(oldEBands[i]);\n if (oldEBands[i] < -QCONST16(7.f,DB_SHIFT))\n oldEBands[i] = -QCONST16(7.f,DB_SHIFT);\n }\n"} {"commit":"35175d59d5b8cae0e5efcb6596d638bc53ab2a1c","subject":"Use gst_object_unref() instead of g_object_unref()","message":"Use gst_object_unref() instead of g_object_unref()\n","repos":"wmvanvliet\/Chimara,wmvanvliet\/Chimara,wmvanvliet\/Chimara,wmvanvliet\/Chimara,wmvanvliet\/Chimara","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libchimara\/schannel.c\n+++ libchimara\/schannel.c\n@@ -92,7 +92,7 @@\n \t}\n \t\n \tif(chan->pipeline)\n-\t\tg_object_unref(chan->pipeline);\n+\t\tgst_object_unref(chan->pipeline);\n \t\n \tchan->magic = MAGIC_FREE;\n \tg_free(chan);\n"} {"commit":"30137c9e62ad5115675ec7c9f09276528e1131d4","subject":"libdisk\/psygnosis_a: Fix header comment to remove Rainbird releases.","message":"libdisk\/psygnosis_a: Fix header comment to remove Rainbird releases.\n","repos":"keirf\/Disk-Utilities,keirf\/Disk-Utilities","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- libdisk\/psygnosis_a.c\n+++ libdisk\/psygnosis_a.c\n@@ -4,9 +4,6 @@\n * Custom format as used by various Psygnosis releases:\n * Amnios\n * Aquaventura (sync 0x4429)\n- * Betrayal\n- * Carrier Command\n- * Midwinter\n * \n * Sometimes a single release will use both this and Psygnosis B.\n * \n"} {"commit":"b41093be209abe8f5ef0c3f0fe123b423bbf60ce","subject":"Fixed missing NULL set","message":"Fixed missing NULL set\n","repos":"awakecoding\/FreeRDP,awakecoding\/FreeRDP,akallabeth\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/core\/rdp.c\n+++ libfreerdp\/core\/rdp.c\n@@ -1946,10 +1946,19 @@\n \t}\n \n \tmcs_free(rdp->mcs);\n+\trdp->mcs = NULL;\n+\n \tnego_free(rdp->nego);\n+\trdp->nego = NULL;\n+\n \tlicense_free(rdp->license);\n+\trdp->license = NULL;\n+\n \ttransport_free(rdp->transport);\n+\trdp->transport = NULL;\n+\n \tfastpath_free(rdp->fastpath);\n+\trdp->fastpath = NULL;\n \n \trdp->transport = transport_new(context);\n \tif (rdp->transport)\n"} {"commit":"d2f415ef2e63b3b004103fe798df4d3ef69c8106","subject":"Some coding rule corrections and incorporating reviews","message":"Some coding rule corrections and incorporating reviews\n","repos":"heejin-kim\/TizenRT,jsdosa\/TizenRT,sunghan-chang\/TizenRT,JeongJunSik\/TizenRT,chanijjani\/TizenRT,chanijjani\/TizenRT,Samsung\/TizenRT,Samsung\/TizenRT,yashwanth686007\/TizenRTOS,heejin-kim\/TizenRT,davidfather\/TizenRT,heejin-kim\/TizenRT,lokeshbv\/TizenRT,JeongJunSik\/TizenRT,Samsung\/TizenRT,JeongJunSik\/TizenRT,sangwon03\/TizenRT,JeonginKim\/TizenRT,davidfather\/TizenRT,pillip8282\/TizenRT,sangwon03\/TizenRT,jeongchanKim\/TizenRT,yashwanth686007\/TizenRTOS,jsdosa\/TizenRT,HONGCHAEHEE\/TizenRT,jeongchanKim\/TizenRT,pillip8282\/TizenRT,davidfather\/TizenRT,chanijjani\/TizenRT,Samsung\/TizenRT,btheosam\/TizenRT,an4967\/TizenRT,junmin-kim\/TizenRT,lokeshbv\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,JeongJunSik\/TizenRT,jeongarmy\/TizenRT,jeongchanKim\/TizenRT,davidfather\/TizenRT,btheosam\/TizenRT,JeongJunSik\/TizenRT,jeongarmy\/TizenRT,HONGCHAEHEE\/TizenRT,shivgarg\/TizenRT,jeongchanKim\/TizenRT,pillip8282\/TizenRT,Samsung\/TizenRT,sangwon03\/TizenRT,pillip8282\/TizenRT,an4967\/TizenRT,an4967\/TizenRT,jeongchanKim\/TizenRT,davidfather\/TizenRT,heejin-kim\/TizenRT,jsdosa\/TizenRT,davidfather\/TizenRT,shivgarg\/TizenRT,sangwon03\/TizenRT,JeonginKim\/TizenRT,lokeshbv\/TizenRT,sunghan-chang\/TizenRT,davidfather\/TizenRT,heejin-kim\/TizenRT,yashwanth686007\/TizenRTOS,junmin-kim\/TizenRT,jeongarmy\/TizenRT,pillip8282\/TizenRT,jeongarmy\/TizenRT,yashwanth686007\/TizenRTOS,chanijjani\/TizenRT,pillip8282\/TizenRT,junmin-kim\/TizenRT,jeongarmy\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,lokeshbv\/TizenRT,jeongarmy\/TizenRT,btheosam\/TizenRT,jeongchanKim\/TizenRT,HONGCHAEHEE\/TizenRT,HONGCHAEHEE\/TizenRT,jeongchanKim\/TizenRT,sangwon03\/TizenRT,yashwanth686007\/TizenRTOS,yashwanth686007\/TizenRTOS,btheosam\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,HONGCHAEHEE\/TizenRT,pillip8282\/TizenRT,JeonginKim\/TizenRT,sunghan-chang\/TizenRT,Parkjihooni6186\/TizenRT,Parkjihooni6186\/TizenRT,jsdosa\/TizenRT,btheosam\/TizenRT,btheosam\/TizenRT,Samsung\/TizenRT,JeonginKim\/TizenRT,Parkjihooni6186\/TizenRT,shivgarg\/TizenRT,heejin-kim\/TizenRT,JeongJunSik\/TizenRT,Parkjihooni6186\/TizenRT,Parkjihooni6186\/TizenRT,Samsung\/TizenRT,an4967\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,lokeshbv\/TizenRT,JeonginKim\/TizenRT,chanijjani\/TizenRT,shivgarg\/TizenRT,jsdosa\/TizenRT,jeongarmy\/TizenRT,an4967\/TizenRT,sangwon03\/TizenRT,HONGCHAEHEE\/TizenRT,lokeshbv\/TizenRT,chanijjani\/TizenRT,chanijjani\/TizenRT,jsdosa\/TizenRT,junmin-kim\/TizenRT,an4967\/TizenRT,shivgarg\/TizenRT,Parkjihooni6186\/TizenRT,JeonginKim\/TizenRT,shivgarg\/TizenRT","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- os\/drivers\/audio\/alc5658.c\n+++ os\/drivers\/audio\/alc5658.c\n@@ -95,10 +95,10 @@\n * Pre-processor Definitions\n ****************************************************************************\/\n \n-#define ALC5658_DEFAULT_SAMPRATE \t48000\n-#define ALC5658_DEFAULT_NCHANNELS \t2\n-#define ALC5658_DEFAULT_BPSAMP \t\t16\n-#define FAIL\t0xFFFF\n+#define ALC5658_DEFAULT_SAMPRATE\t48000\n+#define ALC5658_DEFAULT_NCHANNELS\t2\n+#define ALC5658_DEFAULT_BPSAMP\t\t16\n+#define FAIL\t\t\t\t0xFFFF\n \n \/****************************************************************************\n * Private Function Prototypes\n"} {"commit":"e7e343e21b1b02a0771276ef94969f15c10b0e75","subject":"Removed non UTF8 char.","message":"Removed non UTF8 char.\n\ngit-svn-id: 30f789d7039adee4ab6dc5f7dbec2df9251e516b@2680 35acf78f-673a-0410-8e92-d51de3d6d3f4\n","repos":"roboknight\/chibios-lpc43xx,roboknight\/chibios-lpc43xx","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":""} {"commit":"6d0735056035798ba8c0bd1c4cefc668d6476689","subject":"Fix conversion.","message":"Fix conversion.\n","repos":"amzeratul\/halley,amzeratul\/halley,amzeratul\/halley","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/engine\/utils\/include\/halley\/bytes\/byte_serializer.h\n+++ src\/engine\/utils\/include\/halley\/bytes\/byte_serializer.h\n@@ -457,7 +457,7 @@\n \t\t\t\tuint64_t temp;\n \t\t\t\tdeserializeVariableInteger(temp, sign, std::is_signed_v);\n \t\t\t\tif (sign) {\n-\t\t\t\t\tint64_t signedTemp = -temp - 1;\n+\t\t\t\t\tint64_t signedTemp = -int64_t(temp) - 1;\n \t\t\t\t\tval = static_cast(signedTemp);\n \t\t\t\t} else {\n \t\t\t\t\tval = static_cast(temp);\n"} {"commit":"61c54c04d483bd96ae4847c447617ea6ca1aefa8","subject":"Add so that int32_t is defined on i386 platforms. Fixes Launchpad build for i386 target.","message":"Add so that int32_t is defined on i386 platforms. Fixes Launchpad build for i386 target.\n","repos":"jlay11\/sharecoin,jlay11\/sharecoin,jlay11\/sharecoin,jlay11\/sharecoin,jlay11\/sharecoin,jlay11\/sharecoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/qt\/transactionfilterproxy.h\n+++ src\/qt\/transactionfilterproxy.h\n@@ -3,6 +3,8 @@\n \n #include \n #include \n+\n+#include \n \n \/** Filter the transaction list according to pre-specified rules. *\/\n class TransactionFilterProxy : public QSortFilterProxyModel\n"} {"commit":"896e50420ff3e8ad1104b55ab8d74ebfbaa0fea3","subject":"Unify close wait patternt","message":"Unify close wait patternt\n","repos":"fredrikwidlund\/libreactor,fredrikwidlund\/libreactor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/reactor_core\/reactor_desc.c\n+++ src\/reactor_core\/reactor_desc.c\n@@ -12,7 +12,8 @@\n \n static inline void reactor_desc_close_final(reactor_desc *desc)\n {\n- if (desc->state == REACTOR_DESC_CLOSE_WAIT && !desc->ref)\n+ if (desc->state == REACTOR_DESC_CLOSE_WAIT &&\n+ desc->ref == 0)\n {\n reactor_user_dispatch(&desc->user, REACTOR_DESC_CLOSE, NULL);\n desc->state = REACTOR_DESC_CLOSED;\n"} {"commit":"bc65c731485632d66b6a481fb70eddcee0835872","subject":"Fixed bug triggering double click when dumping with UI trace","message":"Fixed bug triggering double click when dumping with UI trace\n","repos":"ARSekkat\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,porcelijn\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,porcelijn\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac,porcelijn\/gpac,gpac\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/compositor\/events.c\n+++ src\/compositor\/events.c\n@@ -1974,9 +1974,9 @@\n \tif ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) {\n \t\tu32 now;\n \t\tGF_Event event;\n-\t\t\/*emulate doubleclick*\/\n+\t\t\/*emulate doubleclick unless in step mode*\/\n \t\tnow = gf_sys_clock();\n-\t\tif (now - compositor->last_click_time < DOUBLECLICK_TIME_MS) {\n+\t\tif (!compositor->step_mode && (now - compositor->last_click_time < DOUBLECLICK_TIME_MS)) {\n \t\t\tevent.type = GF_EVENT_DBLCLICK;\n \t\t\tevent.mouse.key_states = compositor->key_states;\n \t\t\tevent.mouse.x = ev->mouse.x;\n"} {"commit":"6acd2117c1b5700077b2220623a06d89fa5c14a7","subject":"r300g: more informative warning in END_CS","message":"r300g: more informative warning in END_CS\n","repos":"bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_cs.h\n+++ src\/gallium\/drivers\/r300\/r300_cs.h\n@@ -55,12 +55,16 @@\n CS_DEBUG(cs_count = size;) \\\n } while (0)\n \n+#ifdef DEBUG\n #define END_CS do { \\\n- CS_DEBUG(if (cs_count != 0) \\\n- debug_printf(\"r300: Warning: cs_count off by %d\\n\", cs_count);) \\\n- CS_DEBUG(cs_count = 0;) \\\n+ if (cs_count != 0) \\\n+ debug_printf(\"r300: Warning: cs_count off by %d at (%s, %s:%i)\\n\", \\\n+ cs_count, __FUNCTION__, __FILE__, __LINE__); \\\n+ cs_count = 0; \\\n } while (0)\n-\n+#else\n+#define END_CS\n+#endif\n \n \/**\n * Writing pure DWORDs.\n"} {"commit":"a4eff86f4afb6618aff488e9da5600e33d97a9c3","subject":"vc4: Fix accidental scissoring when scissor is disabled.","message":"vc4: Fix accidental scissoring when scissor is disabled.\n\nEven if the rasterizer has scissor disabled, we'll have whatever\nvc4->scissor bounds were last set when someone set up a scissor, so we\nshouldn't clip to them in that case.\n\nFixes piglit fbo-blit-rect, and a lot of MSAA tests once they're enabled.\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/vc4\/vc4_emit.c\n+++ src\/gallium\/drivers\/vc4\/vc4_emit.c\n@@ -29,17 +29,35 @@\n struct vc4_context *vc4 = vc4_context(pctx);\n \n struct vc4_cl_out *bcl = cl_start(&vc4->bcl);\n- if (vc4->dirty & (VC4_DIRTY_SCISSOR | VC4_DIRTY_VIEWPORT)) {\n+ if (vc4->dirty & (VC4_DIRTY_SCISSOR | VC4_DIRTY_VIEWPORT |\n+ VC4_DIRTY_RASTERIZER)) {\n float *vpscale = vc4->viewport.scale;\n float *vptranslate = vc4->viewport.translate;\n float vp_minx = -fabsf(vpscale[0]) + vptranslate[0];\n float vp_maxx = fabsf(vpscale[0]) + vptranslate[0];\n float vp_miny = -fabsf(vpscale[1]) + vptranslate[1];\n float vp_maxy = fabsf(vpscale[1]) + vptranslate[1];\n- uint32_t minx = MAX2(vc4->scissor.minx, vp_minx);\n- uint32_t miny = MAX2(vc4->scissor.miny, vp_miny);\n- uint32_t maxx = MIN2(vc4->scissor.maxx, vp_maxx);\n- uint32_t maxy = MIN2(vc4->scissor.maxy, vp_maxy);\n+\n+ \/* Clip to the scissor if it's enabled, but still clip to the\n+ * drawable regardless since that controls where the binner\n+ * tries to put things.\n+ *\n+ * Additionally, always clip the rendering to the viewport,\n+ * since the hardware does guardband clipping, meaning\n+ * primitives would rasterize outside of the view volume.\n+ *\/\n+ uint32_t minx, miny, maxx, maxy;\n+ if (!vc4->rasterizer->base.scissor) {\n+ minx = MAX2(vp_minx, 0);\n+ miny = MAX2(vp_miny, 0);\n+ maxx = MIN2(vp_maxx, vc4->draw_width);\n+ maxy = MIN2(vp_maxy, vc4->draw_height);\n+ } else {\n+ minx = MAX2(vp_minx, vc4->scissor.minx);\n+ miny = MAX2(vp_miny, vc4->scissor.miny);\n+ maxx = MIN2(vp_maxx, vc4->scissor.maxx);\n+ maxy = MIN2(vp_maxy, vc4->scissor.maxy);\n+ }\n \n cl_u8(&bcl, VC4_PACKET_CLIP_WINDOW);\n cl_u16(&bcl, minx);\n"} {"commit":"02b352e2ace126e880d7df6a8c669e181b76e05f","subject":"gallium: reorder fields of pipe_rasterizer_state to pack it more tightly","message":"gallium: reorder fields of pipe_rasterizer_state to pack it more tightly\n\nsizeof(struct pipe_rasterizer_state):\n Before: 32 bytes\n After: 28 bytes\n\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmare.com>\n","repos":"bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/include\/pipe\/p_state.h\n+++ src\/gallium\/include\/pipe\/p_state.h\n@@ -94,24 +94,21 @@\n unsigned poly_smooth:1;\n unsigned poly_stipple_enable:1;\n unsigned point_smooth:1;\n- unsigned sprite_coord_enable:PIPE_MAX_SHADER_OUTPUTS;\n unsigned sprite_coord_mode:1; \/**< PIPE_SPRITE_COORD_ *\/\n unsigned point_quad_rasterization:1; \/** points rasterized as quads or points *\/\n unsigned point_size_per_vertex:1; \/**< size computed in vertex shader *\/\n unsigned multisample:1; \/* XXX maybe more ms state in future *\/\n unsigned line_smooth:1;\n unsigned line_stipple_enable:1;\n- unsigned line_stipple_factor:8; \/**< [1..256] actually *\/\n- unsigned line_stipple_pattern:16;\n unsigned line_last_pixel:1;\n \n- \/** \n+ \/**\n * Use the first vertex of a primitive as the provoking vertex for\n * flat shading.\n *\/\n- unsigned flatshade_first:1; \n-\n- \/** \n+ unsigned flatshade_first:1;\n+\n+ \/**\n * When true, triangle rasterization uses (0.5, 0.5) pixel centers\n * for determining pixel ownership.\n *\n@@ -123,6 +120,11 @@\n * center for that test.\n *\/\n unsigned gl_rasterization_rules:1;\n+\n+ unsigned line_stipple_factor:8; \/**< [1..256] actually *\/\n+ unsigned line_stipple_pattern:16;\n+\n+ unsigned sprite_coord_enable:PIPE_MAX_SHADER_OUTPUTS;\n \n float line_width;\n float point_size; \/**< used when no per-vertex size *\/\n"} {"commit":"aa405a2a77d51a4f807c5c2f63cbc76eb660e489","subject":"wgl: Query the screen for supported formats.","message":"wgl: Query the screen for supported formats.\n","repos":"wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/state_trackers\/wgl\/shared\/stw_pixelformat.c\n+++ src\/gallium\/state_trackers\/wgl\/shared\/stw_pixelformat.c\n@@ -25,6 +25,10 @@\n * \n **************************************************************************\/\n \n+#include \"pipe\/p_format.h\"\n+#include \"pipe\/p_defines.h\"\n+#include \"pipe\/p_screen.h\"\n+\n #include \"util\/u_debug.h\"\n #include \"util\/u_memory.h\"\n \n@@ -36,6 +40,7 @@\n \n struct stw_pf_color_info\n {\n+ enum pipe_format format;\n struct {\n unsigned char red;\n unsigned char green;\n@@ -52,6 +57,7 @@\n \n struct stw_pf_depth_info\n {\n+ enum pipe_format format;\n struct {\n unsigned char depth;\n unsigned char stencil;\n@@ -59,23 +65,47 @@\n };\n \n \n-static const struct stw_pf_color_info \n+\/* NOTE: order matters, since in otherwise equal circunstances the first\n+ * format listed will get chosen *\/\n+\n+static const struct stw_pf_color_info\n stw_pf_color[] = {\n- { {8, 8, 8, 0}, { 0, 8, 16, 0} },\n- { {8, 8, 8, 8}, { 0, 8, 16, 24} }\n-};\n+ \/* no-alpha *\/\n+ { PIPE_FORMAT_R5G6B5_UNORM, { 5, 6, 5, 0}, {11, 5, 0, 0} },\n+ { PIPE_FORMAT_X8R8G8B8_UNORM, { 8, 8, 8, 0}, {16, 8, 0, 0} },\n+ { PIPE_FORMAT_B8G8R8X8_UNORM, { 8, 8, 8, 0}, { 8, 16, 24, 0} },\n+ \/* alpha *\/\n+ { PIPE_FORMAT_A1R5G5B5_UNORM, { 5, 5, 5, 1}, {10, 5, 0, 15} },\n+ { PIPE_FORMAT_A4R4G4B4_UNORM, { 4, 4, 4, 4}, {16, 4, 0, 12} },\n+ { PIPE_FORMAT_A8R8G8B8_UNORM, { 8, 8, 8, 8}, {16, 8, 0, 24} },\n+ { PIPE_FORMAT_B8G8R8A8_UNORM, { 8, 8, 8, 8}, { 8, 16, 24, 0} }\n+#if 0\n+ { PIPE_FORMAT_A2B10G10R10_UNORM, {10, 10, 10, 2}, { 0, 10, 20, 30} }\n+#endif\n+};\n+\n \n static const struct stw_pf_depth_info \n stw_pf_depth_stencil[] = {\n- { {16, 0} },\n- { {24, 8} }\n-};\n+ \/* pure depth *\/\n+ { PIPE_FORMAT_Z16_UNORM, {16, 0} },\n+ { PIPE_FORMAT_Z24X8_UNORM, {24, 0} },\n+ { PIPE_FORMAT_X8Z24_UNORM, {24, 0} },\n+ { PIPE_FORMAT_Z32_UNORM, {32, 0} },\n+ \/* pure stencil *\/\n+ { PIPE_FORMAT_S8_UNORM, { 0, 8} },\n+ \/* combined depth-stencil *\/\n+ { PIPE_FORMAT_S8Z24_UNORM, {24, 8} },\n+ { PIPE_FORMAT_Z24S8_UNORM, {24, 8} }\n+};\n+\n \n static const boolean \n stw_pf_doublebuffer[] = {\n FALSE,\n TRUE,\n };\n+\n \n const unsigned \n stw_pf_multisample[] = {\n@@ -97,10 +127,6 @@\n \n assert(stw_dev->pixelformat_extended_count < STW_MAX_PIXELFORMATS);\n if(stw_dev->pixelformat_extended_count >= STW_MAX_PIXELFORMATS)\n- return;\n- \n- \/* FIXME: re-enabled MSAA when we can query it *\/\n- if(samples)\n return;\n \n pfi = &stw_dev->pixelformats[stw_dev->pixelformat_extended_count];\n@@ -160,6 +186,7 @@\n void\n stw_pixelformat_init( void )\n {\n+ struct pipe_screen *screen = stw_dev->screen;\n unsigned i, j, k, l;\n \n assert( !stw_dev->pixelformat_count );\n@@ -167,12 +194,28 @@\n \n for(i = 0; i < Elements(stw_pf_multisample); ++i) {\n unsigned samples = stw_pf_multisample[i];\n+ \n+ \/* FIXME: re-enabled MSAA when we can query it *\/\n+ if(samples)\n+ continue;\n+\n for(j = 0; j < Elements(stw_pf_color); ++j) {\n const struct stw_pf_color_info *color = &stw_pf_color[j];\n+ \n+ if(!screen->is_format_supported(screen, color->format, PIPE_TEXTURE_2D, \n+ PIPE_TEXTURE_USAGE_RENDER_TARGET, 0))\n+ continue;\n+ \n for(k = 0; k < Elements(stw_pf_doublebuffer); ++k) {\n unsigned doublebuffer = stw_pf_doublebuffer[k];\n+ \n for(l = 0; l < Elements(stw_pf_depth_stencil); ++l) {\n const struct stw_pf_depth_info *depth = &stw_pf_depth_stencil[l];\n+ \n+ if(!screen->is_format_supported(screen, depth->format, PIPE_TEXTURE_2D, \n+ PIPE_TEXTURE_USAGE_DEPTH_STENCIL, 0))\n+ continue;\n+\n stw_pixelformat_add( stw_dev, color, depth, doublebuffer, samples );\n }\n }\n"} {"commit":"c6eb6f98b8856e73a868dc7ed43195149a4817ba","subject":"Fix typos in documentation (#1747)","message":"Fix typos in documentation (#1747)\n\nThe variable is called LOG_ENABLED, not ENABLE_LOGGING. Fix the\r\ndocumentation in json_iterator.h.","repos":"lemire\/simdjson,lemire\/simdjson,lemire\/simdjson,lemire\/simdjson,lemire\/simdjson,lemire\/simdjson","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/generic\/stage2\/json_iterator.h\n+++ src\/generic\/stage2\/json_iterator.h\n@@ -80,25 +80,25 @@\n \/**\n * Log that a value has been found.\n *\n- * Set ENABLE_LOGGING=true in logger.h to see logging.\n+ * Set LOG_ENABLED=true in logger.h to see logging.\n *\/\n simdjson_really_inline void log_value(const char *type) const noexcept;\n \/**\n * Log the start of a multipart value.\n *\n- * Set ENABLE_LOGGING=true in logger.h to see logging.\n+ * Set LOG_ENABLED=true in logger.h to see logging.\n *\/\n simdjson_really_inline void log_start_value(const char *type) const noexcept;\n \/**\n * Log the end of a multipart value.\n *\n- * Set ENABLE_LOGGING=true in logger.h to see logging.\n+ * Set LOG_ENABLED=true in logger.h to see logging.\n *\/\n simdjson_really_inline void log_end_value(const char *type) const noexcept;\n \/**\n * Log an error.\n *\n- * Set ENABLE_LOGGING=true in logger.h to see logging.\n+ * Set LOG_ENABLED=true in logger.h to see logging.\n *\/\n simdjson_really_inline void log_error(const char *error) const noexcept;\n \n"} {"commit":"9225b4f1169d0618c4294db6352fe6e72b991045","subject":"conf: capabilities: use g_new0","message":"conf: capabilities: use g_new0\n\nSigned-off-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\nReviewed-by: Neal Gompa <8135daa3762340227c0c67f1c47ad07a127bd3a3@gmail.com>\nReviewed-by: Erik Skultety <2c14d38fa47c8799f1b9c16280abe27f8edfec6e@redhat.com>\n","repos":"libvirt\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,crobinso\/libvirt,libvirt\/libvirt,olafhering\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,libvirt\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/capabilities.c\n+++ src\/conf\/capabilities.c\n@@ -382,14 +382,10 @@\n virCapsGuestMachinePtr *machines;\n size_t i;\n \n- if (VIR_ALLOC_N(machines, nnames) < 0)\n- return NULL;\n+ machines = g_new0(virCapsGuestMachinePtr, nnames);\n \n for (i = 0; i < nnames; i++) {\n- if (VIR_ALLOC(machines[i]) < 0) {\n- virCapabilitiesFreeMachines(machines, nnames);\n- return NULL;\n- }\n+ machines[i] = g_new0(virCapsGuestMachine, 1);\n machines[i]->name = g_strdup(names[i]);\n }\n \n@@ -442,8 +438,7 @@\n {\n virCapsGuestPtr guest;\n \n- if (VIR_ALLOC(guest) < 0)\n- goto error;\n+ guest = g_new0(virCapsGuest, 1);\n \n guest->ostype = ostype;\n guest->arch.id = arch;\n@@ -492,8 +487,7 @@\n {\n virCapsGuestDomainPtr dom;\n \n- if (VIR_ALLOC(dom) < 0)\n- goto error;\n+ dom = g_new0(virCapsGuestDomain, 1);\n \n dom->type = hvtype;\n dom->info.emulator = g_strdup(emulator);\n@@ -728,8 +722,7 @@\n return ret;\n }\n \n- if (VIR_ALLOC(ret) < 0)\n- return ret;\n+ ret = g_new0(virCapsDomainData, 1);\n \n ret->ostype = foundguest->ostype;\n ret->arch = foundguest->arch.id;\n@@ -806,8 +799,7 @@\n {\n virCapsStoragePoolPtr pool;\n \n- if (VIR_ALLOC(pool) < 0)\n- goto error;\n+ pool = g_new0(virCapsStoragePool, 1);\n \n pool->type = poolType;\n \n@@ -1493,8 +1485,7 @@\n return 0;\n }\n \n- if (VIR_ALLOC_N(tmp, ndistances) < 0)\n- goto cleanup;\n+ tmp = g_new0(virCapsHostNUMACellSiblingInfo, ndistances);\n \n for (i = 0; i < ndistances; i++) {\n if (!distances[i])\n@@ -1532,8 +1523,7 @@\n if (virNumaGetPages(node, &pages_size, &pages_avail, NULL, &npages) < 0)\n goto cleanup;\n \n- if (VIR_ALLOC_N(*pageinfo, npages) < 0)\n- goto cleanup;\n+ *pageinfo = g_new0(virCapsHostNUMACellPageInfo, npages);\n *npageinfo = npages;\n \n for (i = 0; i < npages; i++) {\n@@ -1572,8 +1562,7 @@\n int nodecpus = nodeinfo.sockets * nodeinfo.cores * nodeinfo.threads;\n cid = 0;\n \n- if (VIR_ALLOC_N(cpus, nodecpus) < 0)\n- return -1;\n+ cpus = g_new0(virCapsHostNUMACellCPU, nodecpus);\n \n for (s = 0; s < nodeinfo.sockets; s++) {\n for (c = 0; c < nodeinfo.cores; c++) {\n@@ -1644,8 +1633,7 @@\n goto cleanup;\n }\n \n- if (VIR_ALLOC_N(cpus, ncpus) < 0)\n- goto cleanup;\n+ cpus = g_new0(virCapsHostNUMACellCPU, ncpus);\n cpu = 0;\n \n for (i = 0; i < virBitmapSize(cpumap); i++) {\n@@ -1816,8 +1804,7 @@\n \n for (i = 0; i < caps->host.cache.nbanks; i++) {\n virCapsHostCacheBankPtr bank = caps->host.cache.banks[i];\n- if (VIR_ALLOC(node) < 0)\n- goto cleanup;\n+ node = g_new0(virCapsHostMemBWNode, 1);\n \n if (virResctrlInfoGetMemoryBandwidth(caps->host.resctrl,\n bank->level, &node->control) > 0) {\n@@ -1901,9 +1888,7 @@\n if (level < cache_min_level)\n continue;\n \n- if (VIR_ALLOC(bank) < 0)\n- goto cleanup;\n-\n+ bank = g_new0(virCapsHostCacheBank, 1);\n bank->level = level;\n \n if (virFileReadValueUint(&bank->id,\n"} {"commit":"09b64bf7306df02fe8d6d0c944e251b19e046256","subject":"Do not expect Windows-specific project files","message":"Do not expect Windows-specific project files\n","repos":"DeforaOS\/configure,DeforaOS\/configure","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/makefile.c\n+++ src\/makefile.c\n@@ -2740,25 +2740,23 @@\n \t\tchar const * directory, char const * mode,\n \t\tchar const * filename)\n {\n-\tchar sep = (configure_get_os(makefile->configure) != HO_WIN32)\n-\t\t? '\/' : '\\\\';\n \tString * p;\n \tchar const * q;\n \n-\tif(strchr(filename, sep) != NULL)\n+\tif(strchr(filename, '\/') != NULL)\n \t{\n \t\tif((p = string_new(filename)) == NULL)\n \t\t\treturn -1;\n \t\tq = dirname(p);\n-\t\t\/* FIXME keep track of the directories created *\/\n-\t\t_makefile_print(makefile, \"%s%s%c%s\\n\", \"\\t$(MKDIR) $(DESTDIR)\",\n-\t\t\t\tdirectory, sep, q);\n+\t\t\/* TODO keep track of the directories created *\/\n+\t\t_makefile_print(makefile, \"%s%s\/%s\\n\", \"\\t$(MKDIR) $(DESTDIR)\",\n+\t\t\t\tdirectory, q);\n \t\tstring_delete(p);\n \t}\n \telse\n \t\t_makefile_mkdir(makefile, directory);\n-\t_makefile_print(makefile, \"%s%s%s%s%s%s%c%s\\n\", \"\\t$(INSTALL) -m \",\n-\t\t\tmode, \" \", filename, \" $(DESTDIR)\", directory, sep,\n+\t_makefile_print(makefile, \"%s%s%s%s%s%s\/%s\\n\", \"\\t$(INSTALL) -m \",\n+\t\t\tmode, \" \", filename, \" $(DESTDIR)\", directory,\n \t\t\tfilename);\n \treturn 0;\n }\n"} {"commit":"521add056e69b82001cc2ceb4d8940ffabe6dee9","subject":"storage: Add duplicate host check for Sheepdog pool def","message":"storage: Add duplicate host check for Sheepdog pool def\n\nCheck the proposed pool source host XML definition against existing sheepdog\npools to ensure the incoming definition doesn't use the same source host XML\ndefinition as an existing pool.\n","repos":"datto\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,rlaager\/libvirt,eskultety\/libvirt,jfehlig\/libvirt,VenkatDatta\/libvirt,VenkatDatta\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,agx\/libvirt,olafhering\/libvirt,rlaager\/libvirt,zippy2\/libvirt,taget\/libvirt,datto\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,rlaager\/libvirt,jardasgit\/libvirt,datto\/libvirt,crobinso\/libvirt,eskultety\/libvirt,zippy2\/libvirt,libvirt\/libvirt,eskultety\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,agx\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,taget\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,rlaager\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt,agx\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,taget\/libvirt,taget\/libvirt,jardasgit\/libvirt,rlaager\/libvirt,zippy2\/libvirt,agx\/libvirt,andreabolognani\/libvirt,agx\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/storage_conf.c\n+++ src\/conf\/storage_conf.c\n@@ -2544,9 +2544,13 @@\n case VIR_STORAGE_POOL_DISK:\n matchpool = virStoragePoolSourceFindDuplicateDevices(pool, def);\n break;\n+ case VIR_STORAGE_POOL_SHEEPDOG:\n+ if (virStoragePoolSourceMatchSingleHost(&pool->def->source,\n+ &def->source))\n+ matchpool = pool;\n+ break;\n case VIR_STORAGE_POOL_MPATH:\n case VIR_STORAGE_POOL_RBD:\n- case VIR_STORAGE_POOL_SHEEPDOG:\n case VIR_STORAGE_POOL_GLUSTER:\n case VIR_STORAGE_POOL_ZFS:\n case VIR_STORAGE_POOL_LAST:\n"} {"commit":"6cadfaaf5f74c91be13d4beca7e8ffbedc3058b6","subject":"Don't use RTTI in down_cast if GOOGLE_PROTOBUF_NO_RTTI is defined. Patch from Chris Masone (of Google).","message":"Don't use RTTI in down_cast if GOOGLE_PROTOBUF_NO_RTTI is defined. Patch from Chris Masone (of Google).\n\ngit-svn-id: 6df6fa3ddd728f578ea1442598151d5900a6ed44@219 630680e5-0e50-0410-840e-4b1c322b438d\n","repos":"patrickhartling\/protobuf,mpapierski\/protobuf,svn2github\/protobuf-mirror,Distrotech\/protobuf,Distrotech\/protobuf,GreatFruitOmsk\/protobuf-py3,machinalis\/protobuf-python3,mkrautz\/external-protobuf,machinalis\/protobuf-python3,machinalis\/protobuf-python3,patrickhartling\/protobuf,mpapierski\/protobuf,GreatFruitOmsk\/protobuf-py3,da2ce7\/protobuf,svn2github\/protobuf-mirror,patrickhartling\/protobuf,svn2github\/google-protobuf,mikelikespie\/protobuf,mkrautz\/external-protobuf,lcy03406\/protobuf,GreatFruitOmsk\/protobuf-py3,svn2github\/protobuf-mirror,chandlerc\/protobuf-llvm,patrickhartling\/protobuf,spilgames\/protobuf,datacratic\/protobuf,lcy03406\/protobuf,beyang\/protobuf,mkrautz\/external-protobuf,da2ce7\/protobuf,da2ce7\/protobuf,datacratic\/protobuf,beyang\/protobuf,svn2github\/google-protobuf,Distrotech\/protobuf,kastnerkyle\/protobuf-py3,chandlerc\/protobuf-llvm,mpapierski\/protobuf,aidansteele\/protobuf-mirror,mikelikespie\/protobuf,machinalis\/protobuf-python3,kastnerkyle\/protobuf-py3,GreatFruitOmsk\/protobuf-py3,lcy03406\/protobuf,mkrautz\/external-protobuf,mkrautz\/external-protobuf,kastnerkyle\/protobuf-py3,svn2github\/protobuf-mirror,mikelikespie\/protobuf,spilgames\/protobuf,lcy03406\/protobuf,patrickhartling\/protobuf,spilgames\/protobuf,datacratic\/protobuf,aidansteele\/protobuf-mirror,mpapierski\/protobuf,da2ce7\/protobuf,kastnerkyle\/protobuf-py3,spilgames\/protobuf,beyang\/protobuf,beyang\/protobuf,aidansteele\/protobuf-mirror,chandlerc\/protobuf-llvm,aidansteele\/protobuf-mirror,svn2github\/google-protobuf,datacratic\/protobuf,GreatFruitOmsk\/protobuf-py3,mikelikespie\/protobuf,svn2github\/google-protobuf,Distrotech\/protobuf,spilgames\/protobuf,svn2github\/google-protobuf,datacratic\/protobuf,Distrotech\/protobuf,beyang\/protobuf,mpapierski\/protobuf,mikelikespie\/protobuf,da2ce7\/protobuf,aidansteele\/protobuf-mirror,chandlerc\/protobuf-llvm,kastnerkyle\/protobuf-py3,lcy03406\/protobuf,chandlerc\/protobuf-llvm,svn2github\/protobuf-mirror","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/google\/protobuf\/stubs\/common.h\n+++ src\/google\/protobuf\/stubs\/common.h\n@@ -283,7 +283,9 @@\n implicit_cast(0);\n }\n \n+#if !defined(NDEBUG) && !defined(GOOGLE_PROTOBUF_NO_RTTI)\n assert(f == NULL || dynamic_cast(f) != NULL); \/\/ RTTI: debug mode only!\n+#endif\n return static_cast(f);\n }\n \n"} {"commit":"36455ff4c4559173570e95616c84848f13e4b537","subject":"fix modbus i\/o setup page to display properly and update after loading a new ladder program","message":"fix modbus i\/o setup page to display properly and update after loading a new ladder program\n","repos":"Cid427\/machinekit,RunningLight\/machinekit,araisrobo\/machinekit,Cid427\/machinekit,cdsteinkuehler\/linuxcnc,kinsamanka\/machinekit,yishinli\/emc2,Cid427\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/linuxcnc,araisrobo\/machinekit,RunningLight\/machinekit,bobvanderlinden\/machinekit,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,unseenlaser\/machinekit,kinsamanka\/machinekit,strahlex\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/MachineKit,cdsteinkuehler\/linuxcnc,RunningLight\/machinekit,EqAfrica\/machinekit,ianmcmahon\/linuxcnc-mirror,bobvanderlinden\/machinekit,bmwiedemann\/linuxcnc-mirror,ArcEye\/MK-Qt5,cnc-club\/linuxcnc,cnc-club\/linuxcnc,ianmcmahon\/linuxcnc-mirror,strahlex\/machinekit,ianmcmahon\/linuxcnc-mirror,kinsamanka\/machinekit,cnc-club\/linuxcnc,aschiffler\/linuxcnc,ArcEye\/MK-Qt5,araisrobo\/linuxcnc,araisrobo\/linuxcnc,cdsteinkuehler\/linuxcnc,bmwiedemann\/linuxcnc-mirror,Cid427\/machinekit,EqAfrica\/machinekit,EqAfrica\/machinekit,araisrobo\/linuxcnc,mhaberler\/machinekit,unseenlaser\/linuxcnc,araisrobo\/machinekit,EqAfrica\/machinekit,ArcEye\/machinekit-testing,cdsteinkuehler\/linuxcnc,ArcEye\/MK-Qt5,ArcEye\/MK-Qt5,bobvanderlinden\/machinekit,ikcalB\/linuxcnc-mirror,ArcEye\/machinekit-testing,narogon\/linuxcnc,ArcEye\/MK-Qt5,ikcalB\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,narogon\/linuxcnc,ianmcmahon\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,EqAfrica\/machinekit,ArcEye\/machinekit-testing,strahlex\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,unseenlaser\/machinekit,yishinli\/emc2,kinsamanka\/machinekit,unseenlaser\/linuxcnc,unseenlaser\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,Cid427\/machinekit,ikcalB\/linuxcnc-mirror,strahlex\/machinekit,Cid427\/machinekit,ianmcmahon\/linuxcnc-mirror,bobvanderlinden\/machinekit,bobvanderlinden\/machinekit,unseenlaser\/linuxcnc,araisrobo\/linuxcnc,cdsteinkuehler\/MachineKit,ianmcmahon\/linuxcnc-mirror,RunningLight\/machinekit,ikcalB\/linuxcnc-mirror,unseenlaser\/machinekit,unseenlaser\/linuxcnc,strahlex\/machinekit,ikcalB\/linuxcnc-mirror,araisrobo\/machinekit,unseenlaser\/machinekit,yishinli\/emc2,cnc-club\/linuxcnc,araisrobo\/machinekit,ArcEye\/MK-Qt5,unseenlaser\/linuxcnc,mhaberler\/machinekit,araisrobo\/machinekit,mhaberler\/machinekit,cnc-club\/linuxcnc,mhaberler\/machinekit,Cid427\/machinekit,EqAfrica\/machinekit,araisrobo\/machinekit,mhaberler\/machinekit,aschiffler\/linuxcnc,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,narogon\/linuxcnc,ArcEye\/machinekit-testing,RunningLight\/machinekit,ikcalB\/linuxcnc-mirror,ArcEye\/machinekit-testing,aschiffler\/linuxcnc,cnc-club\/linuxcnc,jaguarcat79\/ILC-with-LinuxCNC,jaguarcat79\/ILC-with-LinuxCNC,ianmcmahon\/linuxcnc-mirror,yishinli\/emc2,mhaberler\/machinekit,kinsamanka\/machinekit,cdsteinkuehler\/linuxcnc,araisrobo\/linuxcnc,cdsteinkuehler\/MachineKit,cdsteinkuehler\/MachineKit,bobvanderlinden\/machinekit,narogon\/linuxcnc,mhaberler\/machinekit,EqAfrica\/machinekit,kinsamanka\/machinekit,cdsteinkuehler\/MachineKit,aschiffler\/linuxcnc,araisrobo\/machinekit,RunningLight\/machinekit,ikcalB\/linuxcnc-mirror,ArcEye\/machinekit-testing,strahlex\/machinekit,araisrobo\/machinekit,unseenlaser\/machinekit,RunningLight\/machinekit,strahlex\/machinekit,unseenlaser\/machinekit,aschiffler\/linuxcnc,bmwiedemann\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,mhaberler\/machinekit,cdsteinkuehler\/MachineKit,jaguarcat79\/ILC-with-LinuxCNC,RunningLight\/machinekit,Cid427\/machinekit,bmwiedemann\/linuxcnc-mirror,narogon\/linuxcnc,kinsamanka\/machinekit,EqAfrica\/machinekit,cnc-club\/linuxcnc,unseenlaser\/machinekit,kinsamanka\/machinekit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/hal\/classicladder\/config_gtk.c\n+++ src\/hal\/classicladder\/config_gtk.c\n@@ -254,26 +254,24 @@\n \tstatic char * Labels[] = { \"Slave Address\", \"TypeAccess\", \"1st Register #\", \"# of Regs\", \"Logic\", \"1st I\/Q\/W Mapped\" };\n \tGtkWidget *vbox;\n \tGtkWidget *hbox[ NBR_MODBUS_MASTER_REQ+2 ];\n-\tint NumObj;\n-\tint NumLine;\n+\tint NumObj, NumLine, i,ScanDev = 0;\n \tGList * ItemsDevices = NULL;\n-\tint ScanDev = 0;\n \tStrModbusMasterReq * pConf;\n \tchar BuffValue[ 40 ];\n \tGtkWidget *ModbusParamLabel[ NBR_MODBUS_PARAMS];\t\n \tGtkWidget *SerialPortLabel;\n \t\n \n- \tif(nomodbus) \n+ \tif(modmaster==FALSE) \n {\n vbox = gtk_vbox_new (FALSE, 0);\n gtk_widget_show (vbox);\n SerialPortLabel = gtk_label_new( \"\\n To use modbus you must specify a modbus configure file\\n\"\n-\t\t\" when loading classicladder use: \\n \\n loadusr classicladder myprogram.clp --config=myconfigfile \" );\n+\t\t\" when loading classicladder use: \\n \\n loadusr classicladder --modmaster myprogram.clp \" );\n gtk_box_pack_start(GTK_BOX (vbox), SerialPortLabel, FALSE, FALSE, 0);\n gtk_widget_show( SerialPortLabel ); \n return vbox;\n- }\n+ }\n \n \tdo\n \t{\n@@ -284,18 +282,19 @@\n \tvbox = gtk_vbox_new (FALSE, 0);\n \tgtk_widget_show (vbox);\n \n-\tfor (NumLine=(page*16); NumLineentry, ModbusReqType[ ValueToDisplay ]);\n \t\t\t\t\t\t\tgtk_editable_set_editable( GTK_EDITABLE((GtkEntry*)((GtkCombo *)*IOParamDevice)->entry),FALSE);\n@@ -347,7 +346,7 @@\n \t\t\t\t\t\t\tGtkWidget **IOParamFlag = &ModbusParamEntry[ NumLine ][ NumObj ];\n \t\t\t\t\t\t\t*IOParamFlag = gtk_check_button_new_with_label( \"Inverted\" );\n \t\t\t\t\t\t\tgtk_widget_set_usize( *IOParamFlag,100,0 );\n-\t\t\t\t\t\t\tgtk_box_pack_start( GTK_BOX (hbox[NumLine+2]), *IOParamFlag, FALSE, FALSE, 0 );\n+\t\t\t\t\t\t\tgtk_box_pack_start( GTK_BOX (hbox[NumLine]), *IOParamFlag, FALSE, FALSE, 0 );\n \t\t\t\t\t\t\tgtk_widget_show ( *IOParamFlag );\n \t\t\t\t\t\t\tif ( pConf->LogicInverted )\n \t\t\t\t\t\t\t\tgtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( *IOParamFlag ), TRUE );\n@@ -379,7 +378,7 @@\n \t\t\t\t\t\t\t\tGtkWidget **IOParamEntry = &ModbusParamEntry[ NumLine ][ NumObj ];\n \t\t\t\t\t\t\t\t*IOParamEntry = gtk_entry_new( );\n \t\t\t\t\t\t\t\tgtk_widget_set_usize( *IOParamEntry,length,0 );\n-\t\t\t\t\t\t\t\tgtk_box_pack_start( GTK_BOX (hbox[NumLine+2]), *IOParamEntry, FALSE, FALSE, 0 );\n+\t\t\t\t\t\t\t\tgtk_box_pack_start( GTK_BOX (hbox[NumLine]), *IOParamEntry, FALSE, FALSE, 0 );\n \t\t\t\t\t\t\t\tgtk_widget_show ( *IOParamEntry );\n \t\t\t\t\t\t\t\tgtk_entry_set_text( GTK_ENTRY(*IOParamEntry), BuffValue );\n \t\t\t\t\t\t\t}\n@@ -403,7 +402,7 @@\n \n \tfor (NumLine=1; NumLineSlaveAdr, \"\" );\n \t\tpConf->LogicInverted = 0;\n@@ -536,12 +535,12 @@\n \tchar BuffLabel[ 50 ];\n \tchar BuffValue[ 20 ];\n \n- if(nomodbus) \n+ if(modmaster==FALSE) \n {\n vbox = gtk_vbox_new (FALSE, 0);\n gtk_widget_show (vbox);\n LabelComParam[ 0 ] = gtk_label_new( \"\\n To use modbus you must specify a modbus configure file\\n\"\n-\t\t\" when loading classicladder use: \\n \\n loadusr classicladder myprogram.clp --config=myconfigfile \" );\n+\t\t\" when loading classicladder use: \\n \\n loadusr classicladder --modmaster myprogram.clp \" );\n gtk_box_pack_start(GTK_BOX (vbox),LabelComParam[ 0 ] , FALSE, FALSE, 0);\n gtk_widget_show( LabelComParam[ 0 ] ); \n return vbox;\n@@ -710,7 +709,7 @@\n void GetSettings( void )\n {\t\n #ifdef MODBUS_IO_MASTER\n-if(!nomodbus) { GetModbusComParameters( ); \n+if(modmaster) { GetModbusComParameters( ); \n GetModbusModulesIOSettings( ); }\n #endif\n #ifndef RT_SUPPORT\n@@ -744,6 +743,12 @@\n \t\/\/ we do not want that the window be destroyed.\n \treturn TRUE;\n }\n+\n+void destroyConfigWindow()\n+{\n+ gtk_widget_destroy ( ConfigWindow );\n+}\n+\n void IntConfigWindowGtk()\n {\n \t\n"} {"commit":"6c1e86e7756e7a0b59cdc47e9a732753804945bc","subject":"Pull in additional headers only on windows.","message":"Pull in additional headers only on windows.\n","repos":"sansumbrella\/suBox2D,sansumbrella\/suBox2D","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/sansumbrella\/box2d\/Common.h\n+++ src\/sansumbrella\/box2d\/Common.h\n@@ -32,11 +32,14 @@\n #include \n #include \n \n+#if defined(CINDER_MSW) || defined(CINDER_WINRT)\n+\/\/ Additional headers for Windows platform that lacks pch.\n #include \n #include \n #include \"cinder\/Vector.h\"\n #include \"cinder\/app\/App.h\"\n #include \"cinder\/gl\/gl.h\"\n+#endif\n \n namespace box2d\n {\n"} {"commit":"ef43993f29fd34ad06bc566c03ef52d79d4c4e06","subject":"[bouqueau] set correct timings on imported streams when processing ODU\/ESDU from BT\/XMT-A","message":"[bouqueau] set correct timings on imported streams when processing ODU\/ESDU from BT\/XMT-A\n\n\ngit-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@1510 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"Bevara\/Access-open,emmanouil\/gpac,emmanouil\/gpac,nguyen-viet-thanh-trung\/gpac,rbouqueau\/gpac,canatella\/gpac,porcelijn\/gpac,rauf\/gpac,aymanelyaagoubi\/gpac,rauf\/gpac,drakeguan\/gpac,psteinb\/gpac,canatella\/gpac,DmitrySigaev\/gpac,rauf\/gpac,RodolpheFouquet\/gpac,epam\/gpac,rauf\/gpac,DmitrySigaev\/gpac,RodolpheFouquet\/gpac,canatella\/gpac,gpac\/gpac,rauf\/gpac,psteinb\/gpac,rbouqueau\/gpac,porcelijn\/gpac,drakeguan\/gpac,nguyen-viet-thanh-trung\/gpac,vladimir-kazakov\/gpac,nguyen-viet-thanh-trung\/gpac,DmitrySigaev\/gpac,canatella\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,epam\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac_brew_travis,gpac\/gpac,DmitrySigaev\/gpac,drakeguan\/gpac,psteinb\/gpac,vladimir-kazakov\/gpac,emmanouil\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,DmitrySigaev\/gpac,psteinb\/gpac,psteinb\/gpac,canatella\/gpac,epam\/gpac,emmanouil\/gpac,Bevara\/Access-open,porcelijn\/gpac,drakeguan\/gpac,psteinb\/gpac,aymanelyaagoubi\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,ARSekkat\/gpac,DmitrySigaev\/gpac,porcelijn\/gpac,vladimir-kazakov\/gpac,rauf\/gpac,ARSekkat\/gpac,vladimir-kazakov\/gpac,Bevara\/Access-open,nguyen-viet-thanh-trung\/gpac,rbouqueau\/gpac_brew_travis,epam\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,ARSekkat\/gpac,epam\/gpac,porcelijn\/gpac,aymanelyaagoubi\/gpac,Bevara\/Access-open,drakeguan\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,epam\/gpac,ARSekkat\/gpac,Bevara\/Access-open,gpac\/gpac,RodolpheFouquet\/gpac,canatella\/gpac,ARSekkat\/gpac,rbouqueau\/gpac_brew_travis,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,emmanouil\/gpac,emmanouil\/gpac,rbouqueau\/gpac,gpac\/gpac,nguyen-viet-thanh-trung\/gpac,vladimir-kazakov\/gpac,Bevara\/Access-open,vladimir-kazakov\/gpac,ARSekkat\/gpac,gpac\/gpac,drakeguan\/gpac,rbouqueau\/gpac_brew_travis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/scene_manager\/encode_isom.c\n+++ src\/scene_manager\/encode_isom.c\n@@ -114,7 +114,7 @@\n \treturn gf_isom_new_mpeg4_description(mp4, len, src, NULL, NULL, &i);\n }\n \n-static GF_Err gf_sm_import_stream(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_ESD *src, char *mediaSource)\n+static GF_Err gf_sm_import_stream(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_ESD *src, Double imp_time, char *mediaSource)\n {\n \tu32 track, di;\n \tGF_Err e;\n@@ -253,6 +253,7 @@\n \timport.flags = mux->import_flags;\n \timport.video_fps = mux->frame_rate;\n \timport.in_name = szName;\n+\timport.initial_time_offset = imp_time;\n \te = gf_media_import(&import);\n \tif (e) return e;\n \n@@ -550,7 +551,7 @@\n \t\tif (!au && !esd->URLString) {\n \t\t\t\/*if not in IOD, the stream will be imported when encoding the OD stream*\/\n \t\t\tif (!is_in_iod) continue;\n-\t\t\te = gf_sm_import_stream(ctx, mp4, esd, NULL);\n+\t\t\te = gf_sm_import_stream(ctx, mp4, esd, au->timing_sec, NULL);\n \t\t\tif (e) goto exit;\n \t\t\tgf_sm_finalize_mux(mp4, esd, 0);\n \t\t\tgf_isom_add_track_to_root_od(mp4, gf_isom_get_track_by_id(mp4, esd->ESID));\n@@ -1004,6 +1005,10 @@\n \t\twhile ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {\n \t\t\tGF_ODCom *com;\n \t\t\tu32 k = 0;\n+\n+\t\t\tif (au->timing_sec) au->timing = (u64) (au->timing_sec * esd->slConfig->timestampResolution + 0.0005);\n+\t\t\telse au->timing_sec = (s64) (au->timing \/ esd->slConfig->timestampResolution);\n+\n \t\t\twhile ((com = gf_list_enum(au->commands, &k))) {\n \n \t\t\t\t\/*only updates commandes need to be parsed for import*\/\n@@ -1019,7 +1024,7 @@\n \t\t\t\t\t\twhile ((imp_esd = (GF_ESD*)gf_list_enum(od->ESDescriptors, &m))) {\n \t\t\t\t\t\t\tswitch (imp_esd->tag) {\n \t\t\t\t\t\t\tcase GF_ODF_ESD_TAG:\n-\t\t\t\t\t\t\t\te = gf_sm_import_stream(ctx, mp4, imp_esd, mediaSource);\n+\t\t\t\t\t\t\t\te = gf_sm_import_stream(ctx, mp4, imp_esd, au->timing_sec, mediaSource);\n \t\t\t\t\t\t\t\tif (e) {\n \t\t\t\t\t\t\t\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, (\"[ISO File Encode] cannot import stream %d (error %s)\\n\", imp_esd->ESID, gf_error_to_string(e)));\n \t\t\t\t\t\t\t\t\tgf_odf_com_del(&com);\n@@ -1048,7 +1053,7 @@\n \t\t\t\t\twhile ((imp_esd = (GF_ESD*)gf_list_enum(esdU->ESDescriptors, &m))) {\n \t\t\t\t\t\tswitch (imp_esd->tag) {\n \t\t\t\t\t\tcase GF_ODF_ESD_TAG:\n-\t\t\t\t\t\t\te = gf_sm_import_stream(ctx, mp4, imp_esd, mediaSource);\n+\t\t\t\t\t\t\te = gf_sm_import_stream(ctx, mp4, imp_esd, au->timing_sec, mediaSource);\n \t\t\t\t\t\t\tif (e) {\n \t\t\t\t\t\t\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, (\"[ISO File Encode] cannot import stream %d (error %s)\\n\", imp_esd->ESID, gf_error_to_string(e)));\n \t\t\t\t\t\t\t\tgf_odf_com_del(&com);\n@@ -1083,9 +1088,6 @@\n \t\t\te = gf_odf_codec_encode(codec, 0);\n \t\t\tif (e) goto err_exit;\n \n-\t\t\t\/*time in sec conversion*\/\n-\t\t\tif (au->timing_sec) au->timing = (u64) (au->timing_sec * esd->slConfig->timestampResolution + 0.0005);\n-\n \t\t\tif (j==1) init_offset = au->timing;\n \n \t\t\tsamp = gf_isom_sample_new();\n"} {"commit":"add6b939a04efad09c88d5f57242abf0cbfb486d","subject":"(unw_set_caching_policy): Let ia64_init() clear unw.needs_initialization.","message":"(unw_set_caching_policy): Let ia64_init() clear unw.needs_initialization.\n\n(Logical change 1.111)\n","repos":"igprof\/libunwind,SyndicateRogue\/libunwind,tkelman\/libunwind,zliu2014\/libunwind-tilegx,vegard\/libunwind,android-ia\/platform_external_libunwind,CyanogenMod\/android_external_libunwind,pathscale\/libunwind,lat\/libunwind,igprof\/libunwind,0xlab\/0xdroid-external_libunwind,adsharma\/libunwind,ehsan\/libunwind,evaautomation\/libunwind,tony\/libunwind,fdoray\/libunwind,CyanogenMod\/android_external_libunwind,rntz\/libunwind,project-zerus\/libunwind,rogwfu\/libunwind,geekboxzone\/lollipop_external_libunwind,krytarowski\/libunwind,zliu2014\/libunwind-tilegx,project-zerus\/libunwind,CyanogenMod\/android_external_libunwind,tkelman\/libunwind,rantala\/libunwind,martyone\/libunwind,dropbox\/libunwind,cms-externals\/libunwind,joyent\/libunwind,tony\/libunwind,dreal-deps\/libunwind,vtjnash\/libunwind,djwatson\/libunwind,libunwind\/libunwind,Keno\/libunwind,fillexen\/libunwind,fillexen\/libunwind,zeldin\/platform_external_libunwind,geekboxzone\/lollipop_external_libunwind,rogwfu\/libunwind,DroidSim\/platform_external_libunwind,project-zerus\/libunwind,tony\/libunwind,0xlab\/0xdroid-external_libunwind,djwatson\/libunwind,joyent\/libunwind,Keno\/libunwind,dropbox\/libunwind,ehsan\/libunwind,martyone\/libunwind,geekboxzone\/mmallow_external_libunwind,DroidSim\/platform_external_libunwind,androidarmv6\/android_external_libunwind,joyent\/libunwind,dagar\/libunwind,cloudius-systems\/libunwind,DroidSim\/platform_external_libunwind,dagar\/libunwind,wdv4758h\/libunwind,Chilledheart\/libunwind,libunwind\/libunwind,maltek\/platform_external_libunwind,atanasyan\/libunwind,yuyichao\/libunwind,atanasyan\/libunwind,android-ia\/platform_external_libunwind,unkadoug\/libunwind,pathscale\/libunwind,rntz\/libunwind,martyone\/libunwind,bo-on-software\/libunwind,wdv4758h\/libunwind,krytarowski\/libunwind,zeldin\/platform_external_libunwind,rogwfu\/libunwind,cms-externals\/libunwind,olibc\/libunwind,jrmuizel\/libunwind,SyndicateRogue\/libunwind,krytarowski\/libunwind,androidarmv6\/android_external_libunwind,geekboxzone\/lollipop_external_libunwind,wdv4758h\/libunwind,frida\/libunwind,Keno\/libunwind,ehsan\/libunwind,mpercy\/libunwind,tronical\/libunwind,unkadoug\/libunwind,pathscale\/libunwind,evaautomation\/libunwind,frida\/libunwind,unkadoug\/libunwind,0xlab\/0xdroid-external_libunwind,cloudius-systems\/libunwind,jrmuizel\/libunwind,Chilledheart\/libunwind,fdoray\/libunwind,maltek\/platform_external_libunwind,SyndicateRogue\/libunwind,fdoray\/libunwind,atanasyan\/libunwind,jrmuizel\/libunwind,igprof\/libunwind,libunwind\/libunwind,atanasyan\/libunwind-android,vtjnash\/libunwind,bo-on-software\/libunwind,vtjnash\/libunwind,adsharma\/libunwind,frida\/libunwind,mpercy\/libunwind,evaautomation\/libunwind,maltek\/platform_external_libunwind,tronical\/libunwind,Chilledheart\/libunwind,dreal-deps\/libunwind,djwatson\/libunwind,olibc\/libunwind,rntz\/libunwind,yuyichao\/libunwind,tkelman\/libunwind,atanasyan\/libunwind-android,adsharma\/libunwind,cloudius-systems\/libunwind,rantala\/libunwind,zeldin\/platform_external_libunwind,tronical\/libunwind,yuyichao\/libunwind,android-ia\/platform_external_libunwind,atanasyan\/libunwind-android,dropbox\/libunwind,androidarmv6\/android_external_libunwind,fillexen\/libunwind,vegard\/libunwind,geekboxzone\/mmallow_external_libunwind,geekboxzone\/mmallow_external_libunwind,rantala\/libunwind,dreal-deps\/libunwind,mpercy\/libunwind,vegard\/libunwind,olibc\/libunwind,cms-externals\/libunwind,lat\/libunwind,bo-on-software\/libunwind,dagar\/libunwind,zliu2014\/libunwind-tilegx,lat\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ia64\/set_caching_policy-ia64.c\n+++ src\/ia64\/set_caching_policy-ia64.c\n@@ -29,10 +29,7 @@\n unw_set_caching_policy (unw_addr_space_t as, unw_caching_policy_t policy)\n {\n if (unw.needs_initialization)\n- {\n- unw.needs_initialization = 0;\n- ia64_init ();\n- }\n+ ia64_init ();\n \n #ifndef HAVE___THREAD\n if (policy == UNW_CACHE_PER_THREAD)\n"} {"commit":"67b4f920c26ba0f307b426b19426f411d11b765e","subject":"speed up filelist matching by pre-matching the basename first","message":"speed up filelist matching by pre-matching the basename first\n","repos":"jsilhan\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/repodata.c\n+++ src\/repodata.c\n@@ -1061,6 +1061,28 @@\n \t ma->flags = (flags & ~SEARCH_STRINGMASK) | SEARCH_ERROR;\n \t}\n }\n+ if ((flags & SEARCH_FILES) != 0 && match)\n+ {\n+ \/* prepare basename check *\/\n+ if ((flags & SEARCH_STRINGMASK) == SEARCH_STRING)\n+\t{\n+\t const char *p = strrchr(match, '\/');\n+\t ma->matchdata = (void *)(p ? p + 1 : match);\n+\t}\n+ else if ((flags & SEARCH_STRINGMASK) == SEARCH_STRINGEND)\n+\t{\n+\t const char *p = strrchr(match, '\/');\n+\t ma->matchdata = (void *)(p ? p + 1 : 0);\n+\t}\n+ else if ((flags & SEARCH_STRINGMASK) == SEARCH_GLOB)\n+\t{\n+\t const char *p;\n+\t for (p = match + strlen(match) - 1; p >= match; p--)\n+\t if (*p == '[' || *p == ']' || *p == '*' || *p == '?' || *p == '\/')\n+\t break;\n+\t ma->matchdata = (void *)(p + 1);\n+\t}\n+ }\n return ma->error;\n }\n \n@@ -1070,8 +1092,9 @@\n if ((ma->flags & SEARCH_STRINGMASK) == SEARCH_REGEX && ma->matchdata)\n {\n regfree(ma->matchdata);\n- ma->matchdata = solv_free(ma->matchdata);\n- }\n+ solv_free(ma->matchdata);\n+ }\n+ ma->matchdata = 0;\n }\n \n int\n@@ -1143,6 +1166,49 @@\n return 0;\n }\n return 1;\n+}\n+\n+\/* check if the matcher can match the provides basename *\/\n+\n+static int\n+datamatcher_checkbasename(Datamatcher *ma, const char *basename)\n+{\n+ int l;\n+ const char *match = ma->match;\n+ switch (ma->flags & SEARCH_STRINGMASK)\n+ {\n+ case SEARCH_STRING:\n+ match = ma->matchdata;\n+ break;\n+ case SEARCH_STRINGEND:\n+ if (ma->matchdata)\n+\t{\n+\t match = ma->matchdata;\t\/* have slash *\/\n+\t break;\n+\t}\n+ l = strlen(basename) - strlen(match);\n+ if (l < 0)\n+\treturn 0;\n+ basename += l;\n+ break;\n+ case SEARCH_GLOB:\n+ match = ma->matchdata;\n+ if (!match)\n+\treturn 1;\n+ l = strlen(basename) - strlen(match);\n+ if (l < 0)\n+\treturn 0;\n+ basename += l;\n+ break;\n+ default:\n+ return 1;\t\/* maybe matches *\/\n+ }\n+ if (!match)\n+ return 1;\n+ if ((ma->flags & SEARCH_NOCASE) != 0)\n+ return !strcasecmp(match, basename);\n+ else\n+ return !strcmp(match, basename);\n }\n \n int\n@@ -1578,12 +1644,9 @@\n if (di->matcher.match)\n \t{\n \t \/* simple pre-check so that we don't need to stringify *\/\n-\t if (di->keyname == SOLVABLE_FILELIST && di->key->type == REPOKEY_TYPE_DIRSTRARRAY && di->matcher.match && (di->matcher.flags & (SEARCH_FILES|SEARCH_NOCASE|SEARCH_STRINGMASK)) == (SEARCH_FILES|SEARCH_STRING))\n-\t {\n-\t int l = strlen(di->matcher.match) - strlen(di->kv.str);\n-\t if (l < 0 || strcmp(di->matcher.match + l, di->kv.str))\n-\t\tcontinue;\n-\t }\n+\t if (di->keyname == SOLVABLE_FILELIST && di->key->type == REPOKEY_TYPE_DIRSTRARRAY && (di->matcher.flags & SEARCH_FILES) != 0)\n+\t if (!datamatcher_checkbasename(&di->matcher, di->kv.str))\n+\t continue;\n \t if (!repodata_stringify(di->pool, di->data, di->key, &di->kv, di->flags))\n \t {\n \t if (di->keyname && (di->key->type == REPOKEY_TYPE_FIXARRAY || di->key->type == REPOKEY_TYPE_FLEXARRAY))\n"} {"commit":"63fca2082c9e89278d98b008e2b5c1eadb50aca4","subject":"Sentinel: sentinelRefreshInstanceInfo() minor refactoring.","message":"Sentinel: sentinelRefreshInstanceInfo() minor refactoring.\n\nTest sentinel.tilt condition on top and return if it is true.\nThis allows to remove the check for the tilt condition in the remaining\ncode paths of the function.\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/sentinel.c\n+++ src\/sentinel.c\n@@ -1882,6 +1882,10 @@\n ri->flags & SRI_MASTER ? \"master\" : \"slave\");\n }\n \n+ \/* None of the following conditions are processed when in tilt mode, so\n+ * return asap. *\/\n+ if (sentinel.tilt) return;\n+\n \/* Handle master -> slave role switch. *\/\n if ((ri->flags & SRI_MASTER) && role == SRI_SLAVE) {\n \/* Nothing to do, but masters claiming to be slaves are\n@@ -1893,8 +1897,7 @@\n if ((ri->flags & SRI_SLAVE) && role == SRI_MASTER) {\n \/* If this is a promoted slave we can change state to the\n * failover state machine. *\/\n- if (!sentinel.tilt &&\n- (ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&\n+ if ((ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&\n (ri->master->failover_state ==\n SENTINEL_FAILOVER_STATE_WAIT_PROMOTION))\n {\n@@ -1912,7 +1915,7 @@\n ri->master,\"%@\");\n sentinelCallClientReconfScript(ri->master,SENTINEL_LEADER,\n \"start\",ri->master->addr,ri->addr);\n- } else if (!sentinel.tilt) {\n+ } else {\n \/* A slave turned into a master. We want to force our view and\n * reconfigure as slave. Wait some time after the change before\n * going forward, to receive new configs if any. *\/\n@@ -1932,7 +1935,7 @@\n }\n \n \/* Handle slaves replicating to a different master address. *\/\n- if ((ri->flags & SRI_SLAVE) && !sentinel.tilt &&\n+ if ((ri->flags & SRI_SLAVE) &&\n role == SRI_SLAVE &&\n (ri->slave_master_port != ri->master->addr->port ||\n strcasecmp(ri->slave_master_host,ri->master->addr->ip)))\n@@ -1952,10 +1955,6 @@\n sentinelEvent(REDIS_NOTICE,\"+fix-slave-config\",ri,\"%@\");\n }\n }\n-\n- \/* None of the following conditions are processed when in tilt mode, so\n- * return asap. *\/\n- if (sentinel.tilt) return;\n \n \/* Detect if the slave that is in the process of being reconfigured\n * changed state. *\/\n"} {"commit":"9db5cc829f6bd7ba09f3bf0bf057b7162d05d037","subject":"anv\/cmd_buffer: Enable stencil-only HZ clears","message":"anv\/cmd_buffer: Enable stencil-only HZ clears\n\nThe HZ sequence modifies less state than the blorp path and requires\nless CPU time to generate the necessary packets.\n\nSigned-off-by: Nanley Chery \nReviewed-by: Jason Ekstrand <68c46a606457643eab92053c1c05574abb26f861@jlekstrand.net>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/intel\/vulkan\/gen8_cmd_buffer.c\n+++ src\/intel\/vulkan\/gen8_cmd_buffer.c\n@@ -350,15 +350,19 @@\n assert(cmd_state->render_area.offset.x == 0 &&\n cmd_state->render_area.offset.y == 0);\n \n+ bool depth_clear;\n+ bool stencil_clear;\n+\n \/* This variable corresponds to the Pixel Dim column in the table below *\/\n struct isl_extent2d px_dim;\n \n \/* Validate that we can perform the HZ operation and that it's necessary. *\/\n switch (op) {\n case BLORP_HIZ_OP_DEPTH_CLEAR:\n- if (cmd_buffer->state.pass->attachments[ds].load_op !=\n- VK_ATTACHMENT_LOAD_OP_CLEAR)\n- return;\n+ stencil_clear = VK_IMAGE_ASPECT_STENCIL_BIT &\n+ cmd_state->attachments[ds].pending_clear_aspects;\n+ depth_clear = VK_IMAGE_ASPECT_DEPTH_BIT &\n+ cmd_state->attachments[ds].pending_clear_aspects;\n \n \/* Apply alignment restrictions. Despite the BDW PRM mentioning this is\n * only needed for a depth buffer surface type of D16_UNORM, testing\n@@ -396,7 +400,7 @@\n px_dim = (struct isl_extent2d) { .w = 8, .h = 4};\n #endif\n \n- if (!full_surface_op) {\n+ if (depth_clear && !full_surface_op) {\n \/* Fast depth clears clear an entire sample block at a time. As a\n * result, the rectangle must be aligned to the pixel dimensions of\n * a sample block for a successful operation.\n@@ -409,15 +413,25 @@\n *\/\n if (cmd_state->render_area.offset.x % px_dim.w ||\n cmd_state->render_area.offset.y % px_dim.h)\n- return;\n+ depth_clear = false;\n if (cmd_state->render_area.offset.x +\n cmd_state->render_area.extent.width != iview->extent.width &&\n cmd_state->render_area.extent.width % px_dim.w)\n- return;\n+ depth_clear = false;\n if (cmd_state->render_area.offset.y +\n cmd_state->render_area.extent.height != iview->extent.height &&\n cmd_state->render_area.extent.height % px_dim.h)\n+ depth_clear = false;\n+ }\n+\n+ if (!depth_clear) {\n+ if (stencil_clear) {\n+ \/* Stencil has no alignment requirements *\/\n+ px_dim = (struct isl_extent2d) { .w = 1, .h = 1};\n+ } else {\n+ \/* Nothing to clear *\/\n return;\n+ }\n }\n break;\n case BLORP_HIZ_OP_DEPTH_RESOLVE:\n@@ -448,10 +462,8 @@\n anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_WM_HZ_OP), hzp) {\n switch (op) {\n case BLORP_HIZ_OP_DEPTH_CLEAR:\n- hzp.StencilBufferClearEnable = VK_IMAGE_ASPECT_STENCIL_BIT &\n- cmd_state->attachments[ds].pending_clear_aspects;\n- hzp.DepthBufferClearEnable = VK_IMAGE_ASPECT_DEPTH_BIT &\n- cmd_state->attachments[ds].pending_clear_aspects;\n+ hzp.StencilBufferClearEnable = stencil_clear;\n+ hzp.DepthBufferClearEnable = depth_clear;\n hzp.FullSurfaceDepthandStencilClear = full_surface_op;\n hzp.StencilClearValue =\n cmd_state->attachments[ds].clear_value.depthStencil.stencil & 0xff;\n@@ -503,16 +515,24 @@\n \n anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_WM_HZ_OP), hzp);\n \n+ \/* Perform clear specific flushing and state updates *\/\n if (op == BLORP_HIZ_OP_DEPTH_CLEAR) {\n- if (!full_surface_op) {\n+ if (depth_clear && !full_surface_op) {\n anv_batch_emit(&cmd_buffer->batch, GENX(PIPE_CONTROL), pc) {\n pc.DepthStallEnable = true;\n pc.DepthCacheFlushEnable = true;\n }\n }\n \n- \/* Mark aspects as cleared *\/\n- cmd_state->attachments[ds].pending_clear_aspects = 0;\n+ \/* Remove cleared aspects from the pending mask *\/\n+ if (stencil_clear) {\n+ cmd_state->attachments[ds].pending_clear_aspects &=\n+ ~VK_IMAGE_ASPECT_STENCIL_BIT;\n+ }\n+ if (depth_clear) {\n+ cmd_state->attachments[ds].pending_clear_aspects &=\n+ ~VK_IMAGE_ASPECT_DEPTH_BIT;\n+ }\n }\n }\n \n"} {"commit":"5080f2d69908e2324311f03224a5dc7c98322569","subject":"Sentinel: help subcommand in simulate-failure command","message":"Sentinel: help subcommand in simulate-failure command\n","repos":"cusspvz\/redis,rouzier\/redis,ouyangkongtong\/redis,kmiku7\/redis,healerkx\/redis,davidradunz\/redis,MasahikoSawada\/redis,pcarrier\/redis,healerkx\/redis,GrimDerp\/redis,taoguan\/redis,mgk\/redis,soveran\/redis,july2993\/redis,riyan8250\/redis,kaushik94\/redis,programmecat\/redis,zhiliaoniu\/redis,linfangrong\/redis,mcanthony\/redis,elkingtonmcb\/redis,arijitvt\/redis,jackyan\/redis,OmarQunsul\/graph-redis,colstrom\/redis,ErikDubbelboer\/redis,vincent-vivian-liu\/redis,zguangyu\/redis,tjschuck\/redis,gaoxianglong\/redis,wangyikai\/redis,supasate\/redis,supasate\/redis,pmem\/redis,LongXQ\/redis,z-fork\/redis,a-pavlov\/redis,mumingv\/redis,holstvoogd\/redis,NBSW\/redis,sunheehnus\/redis,GrimDerp\/redis,NBSW\/redis,arijitvt\/redis,nnog\/redis,honestme\/redis,cloudrain21\/redis,wenxueliu\/redis_comment,tjschuck\/redis,4396\/redis,SummonY\/redis,pedigree\/redis,fengshao0907\/redis,hgl888\/redis,ofirluzon\/redis,JoeWoo\/redis,AplayER\/redis,davidradunz\/redis,spinlock\/redis,tanghaodong25\/redis,xuguruogu\/redis,OmarQunsul\/graph-redis,simplestbest\/redis,seppo0010\/redis,Markgorden\/redis,modulexcite\/redis,spinlock\/redis,valdsJohn\/redis,xlzhan\/redis,july2993\/redis,aim-for-better\/redis,soveran\/redis,GrimDerp\/redis,izhoujie\/redis,badboy\/redis,jingjidejuren\/redis,tellapart\/redis,harrisonfeng\/redis,yossigo\/redis,blackmady\/redis,oranagra\/redis,Markgorden\/redis,soveran\/redis,pedigree\/redis,janekmi\/redis,tellapart\/redis,rogerlz\/redis,harrisonfeng\/redis,vincent-vivian-liu\/redis,mingyaaaa\/redis,ytjiang\/redis,mcanthony\/redis,ton31337\/redis,StevenTsai\/redis,dayuoba\/redis,charsyam\/redis,GitHubMota\/redis,Wangyao14cyy\/redis,itugs\/redis,atreeyang\/redis,PKRoma\/redis,rogerlz\/redis,aim-for-better\/redis,devaos\/redis,OmarQunsul\/graph-redis,seppo0010\/redis,taoguan\/redis,davidradunz\/redis,h0x91b\/redis,twskipper\/redis,valdsJohn\/redis,neomantra\/redis,jingjidejuren\/redis,ouyangkongtong\/redis,mingyaaaa\/redis,xujunhai1991\/redis,netroby\/redis,yuhc\/redis-benchmark-enhanced,AplayER\/redis,davidradunz\/redis,cusspvz\/redis,janekmi\/redis,atreeyang\/redis,SyntaxStacks\/redis,gaoxianglong\/redis,ErikDubbelboer\/redis,GrimDerp\/redis,itamarhaber\/redis,Aliceljm1\/redis,csuhawk\/redis,neomantra\/redis,shreesundara\/redis,hgl888\/redis,july2993\/redis,programmecat\/redis,kensou97\/redis,xuguruogu\/redis,itamarhaber\/redis,190235047\/redis,JoeWoo\/redis,yuhc\/redis-benchmark-enhanced,xujunhai1991\/redis,Aliceljm1\/redis,mumingv\/redis,wangyikai\/redis,blackmady\/redis,PKRoma\/redis,gaoxianglong\/redis,seandsky\/redis,devaos\/redis,seandsky\/redis,ofirluzon\/redis,tanghaodong25\/redis,mgk\/redis,janekmi\/redis,itamarhaber\/redis,valdsJohn\/redis,weizijun\/redis,zhcy\/redis,spinlock\/redis,spinlock\/redis,StevenTsai\/redis,duanx\/redis,xlzhan\/redis,saisai\/redis,honestme\/redis,pkdevbox\/redis,oranagra\/redis,ytjiang\/redis,rogerchina\/redis,zguangyu\/redis,hornen\/redis,AALEKH\/redis,ipmobiletech\/redis,JoeWoo\/redis,qiyang0221\/redis,YongMan\/redis,arijitvt\/redis,modulexcite\/redis,holstvoogd\/redis,mengyou0304\/redis,pkdevbox\/redis,hornen\/redis,YongMan\/redis,ituncle\/redis,SummonY\/redis,kmiku7\/redis,twskipper\/redis,kaushik94\/redis,ton31337\/redis,shining-yang\/redis,YuraLukashik\/redis,kensou97\/redis,kensou97\/redis,simplestbest\/redis,mengyou0304\/redis,tellapart\/redis,kmiku7\/redis,brg-liuwei\/redis,pmem\/redis,taoguan\/redis,jackyan\/redis,hornen\/redis,hornen\/redis,seppo0010\/redis,gaoxianglong\/redis,mgk\/redis,neomantra\/redis,NBSW\/redis,CodeJuan\/redis,guker\/redis,ctripcorp\/redis,h0x91b\/redis,MasahikoSawada\/redis,qiyang0221\/redis,francischan714\/redis,hedisdb\/hedis,4396\/redis,saisai\/redis,charsyam\/redis,antirez\/redis,izhoujie\/redis,SummonY\/redis,YuraLukashik\/redis,antirez\/redis,YuanZhewei\/redis,badboy\/redis,LongXQ\/redis,wenxueliu\/redis_comment,soloestoy\/redis,YuraLukashik\/redis,NBSW\/redis,neomantra\/redis,ctripcorp\/redis,colstrom\/redis,nnog\/redis,dayuoba\/redis,antirez\/redis,CodeJuan\/redis,valdsJohn\/redis,weizijun\/redis,fengshao0907\/redis,MasahikoSawada\/redis,simplestbest\/redis,jackyan\/redis,francischan714\/redis,zczhuohuo\/redis,allengaller\/redis,Sciumo\/redis,mverrilli\/redis,antirez\/redis,flashbuckets\/redis,mgk\/redis,francischan714\/redis,universsky\/redis,YuanZhewei\/redis,universsky\/redis,takeshineshiro\/redis,charsyam\/redis,SyntaxStacks\/redis,jingjidejuren\/redis,ofirluzon\/redis,soloestoy\/redis,mumingv\/redis,riyan8250\/redis,wbailey5\/redis,allengaller\/redis,shreesundara\/redis,PradheepShrinivasan\/redis,tjschuck\/redis,zczhuohuo\/redis,SummonY\/redis,netroby\/redis,guker\/redis,clamoriniere1A\/redis,hedisdb\/hedis,jackyan\/redis,shreesundara\/redis,Markgorden\/redis,pmem\/redis,thomasdarimont\/redis,GitHubMota\/redis,xujunhai1991\/redis,elkingtonmcb\/redis,ituncle\/redis,xuguruogu\/redis,programmecat\/redis,simplestbest\/redis,itugs\/redis,tanghaodong25\/redis,guker\/redis,rouzier\/redis,h0x91b\/redis,dayuoba\/redis,sunheehnus\/redis,hedisdb\/hedis,oranagra\/redis,yuhc\/redis-benchmark-enhanced,StevenTsai\/redis,zczhuohuo\/redis,kaushik94\/redis,4396\/redis,colstrom\/redis,huyuezheng\/redis,190235047\/redis,dreamquster\/redis,dreamquster\/redis,Aliceljm1\/redis,StevenTsai\/redis,mingyaaaa\/redis,twskipper\/redis,mengyou0304\/redis,yossigo\/redis,oranagra\/redis,nnog\/redis,YuanZhewei\/redis,harrisonfeng\/redis,vincent-vivian-liu\/redis,zhcy\/redis,Soledad89\/redis,badboy\/redis,zhiliaoniu\/redis,yossigo\/redis,4396\/redis,seandsky\/redis,linfangrong\/redis,rogerchina\/redis,hawkchch\/redis,pmem\/redis,z-fork\/redis,SyntaxStacks\/redis,xujunhai1991\/redis,yuhc\/redis-benchmark-enhanced,soveran\/redis,hgl888\/redis,twskipper\/redis,csuhawk\/redis,ton31337\/redis,duanx\/redis,kensou97\/redis,sunheehnus\/redis,huyuezheng\/redis,clamoriniere1A\/redis,GitHubMota\/redis,mingyaaaa\/redis,riyan8250\/redis,thomasdarimont\/redis,rogerlz\/redis,zguangyu\/redis,AALEKH\/redis,AALEKH\/redis,z-fork\/redis,ytjiang\/redis,PradheepShrinivasan\/redis,zhcy\/redis,clamoriniere1A\/redis,mengyou0304\/redis,yossigo\/redis,brg-liuwei\/redis,huyuezheng\/redis,rouzier\/redis,harrisonfeng\/redis,Markgorden\/redis,shining-yang\/redis,atreeyang\/redis,linfangrong\/redis,wbailey5\/redis,weizijun\/redis,weizijun\/redis,flashbuckets\/redis,thomasdarimont\/redis,francischan714\/redis,qiyang0221\/redis,ipmobiletech\/redis,PradheepShrinivasan\/redis,shining-yang\/redis,soloestoy\/redis,YongMan\/redis,devaos\/redis,pedigree\/redis,tjschuck\/redis,Wangyao14cyy\/redis,soloestoy\/redis,xlzhan\/redis,flashbuckets\/redis,AplayER\/redis,wangyikai\/redis,modulexcite\/redis,ErikDubbelboer\/redis,mcanthony\/redis,rogerchina\/redis,cloudrain21\/redis,arijitvt\/redis,Wangyao14cyy\/redis,Aliceljm1\/redis,cnbin\/redis,AALEKH\/redis,ytjiang\/redis,dayuoba\/redis,blackmady\/redis,LongXQ\/redis,ituncle\/redis,cusspvz\/redis,ipmobiletech\/redis,july2993\/redis,duanx\/redis,holstvoogd\/redis,zhcy\/redis,hgl888\/redis,ctripcorp\/redis,hawkchch\/redis,neomantra\/redis,wprice\/redis,charsyam\/redis,tanghaodong25\/redis,yossigo\/redis,taoguan\/redis,honestme\/redis,izhoujie\/redis,wprice\/redis,AplayER\/redis,honestme\/redis,fengshao0907\/redis,YuraLukashik\/redis,hedisdb\/hedis,PKRoma\/redis,badboy\/redis,cloudrain21\/redis,Sciumo\/redis,kaushik94\/redis,wangyikai\/redis,Sciumo\/redis,wenxueliu\/redis_comment,soloestoy\/redis,ipmobiletech\/redis,mverrilli\/redis,rouzier\/redis,PKRoma\/redis,duanx\/redis,a-pavlov\/redis,pkdevbox\/redis,GitHubMota\/redis,a-pavlov\/redis,shreesundara\/redis,Soledad89\/redis,itamarhaber\/redis,YongMan\/redis,hawkchch\/redis,programmecat\/redis,ituncle\/redis,itugs\/redis,rogerchina\/redis,healerkx\/redis,pkdevbox\/redis,xuguruogu\/redis,takeshineshiro\/redis,190235047\/redis,190235047\/redis,aim-for-better\/redis,ofirluzon\/redis,mcanthony\/redis,holstvoogd\/redis,dreamquster\/redis,guker\/redis,itugs\/redis,a-pavlov\/redis,zguangyu\/redis,Soledad89\/redis,riyan8250\/redis,cnbin\/redis,kmiku7\/redis,YuanZhewei\/redis,allengaller\/redis,PKRoma\/redis,ouyangkongtong\/redis,Sciumo\/redis,zczhuohuo\/redis,Soledad89\/redis,seppo0010\/redis,h0x91b\/redis,sunheehnus\/redis,colstrom\/redis,jingjidejuren\/redis,healerkx\/redis,wprice\/redis,netroby\/redis,allengaller\/redis,PradheepShrinivasan\/redis,clamoriniere1A\/redis,janekmi\/redis,thomasdarimont\/redis,takeshineshiro\/redis,hawkchch\/redis,modulexcite\/redis,mumingv\/redis,pcarrier\/redis,nnog\/redis,supasate\/redis,flashbuckets\/redis,zhiliaoniu\/redis,huyuezheng\/redis,MasahikoSawada\/redis,cnbin\/redis,qiyang0221\/redis,ErikDubbelboer\/redis,izhoujie\/redis,saisai\/redis,wbailey5\/redis,linfangrong\/redis,wenxueliu\/redis_comment,cnbin\/redis,SyntaxStacks\/redis,shining-yang\/redis,LongXQ\/redis,ouyangkongtong\/redis,JoeWoo\/redis,universsky\/redis,csuhawk\/redis,aim-for-better\/redis,OmarQunsul\/graph-redis,oranagra\/redis,ctripcorp\/redis,rogerlz\/redis,saisai\/redis,mverrilli\/redis,devaos\/redis,brg-liuwei\/redis,vincent-vivian-liu\/redis,wbailey5\/redis,pedigree\/redis,charsyam\/redis,elkingtonmcb\/redis,csuhawk\/redis,brg-liuwei\/redis,universsky\/redis,atreeyang\/redis,mverrilli\/redis,seandsky\/redis,blackmady\/redis,CodeJuan\/redis,pcarrier\/redis,z-fork\/redis,fengshao0907\/redis,takeshineshiro\/redis,supasate\/redis,ofirluzon\/redis,cusspvz\/redis,pcarrier\/redis,wprice\/redis,Wangyao14cyy\/redis,ton31337\/redis,CodeJuan\/redis,elkingtonmcb\/redis,xlzhan\/redis,cloudrain21\/redis,dreamquster\/redis,tellapart\/redis,zhiliaoniu\/redis,netroby\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/sentinel.c\n+++ src\/sentinel.c\n@@ -3138,6 +3138,10 @@\n SENTINEL_SIMFAILURE_CRASH_AFTER_PROMOTION;\n redisLog(REDIS_WARNING,\"Failure simulation: this Sentinel \"\n \"will crash after promoting the selected slave to master\");\n+ } else if (!strcasecmp(c->argv[j]->ptr,\"help\")) {\n+ addReplyMultiBulkLen(c,2);\n+ addReplyBulkCString(c,\"crash-after-election\");\n+ addReplyBulkCString(c,\"crash-after-promotion\");\n } else {\n addReplyError(c,\"Unknown failure simulation specified\");\n return;\n"} {"commit":"be27ccee5b20a912292e057d07f23c4445397e32","subject":"libtracker-miner: documented how the processing pool works","message":"libtracker-miner: documented how the processing pool works\n","repos":"outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libtracker-miner\/tracker-miner-fs-processing-pool.c\n+++ src\/libtracker-miner\/tracker-miner-fs-processing-pool.c\n@@ -15,6 +15,86 @@\n * License along with this library; if not, write to the\n * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n * Boston, MA 02110-1301, USA.\n+ *\/\n+\n+\n+\/*\n+ * How the processing pool works.\n+ *\n+ * 1. This processing pool is used to determine which files are being currently\n+ * processed by tracker-miner-fs, and there are currently 2 kind of tasks\n+ * considered in this pool:\n+ * 1.1. \"WAIT\" tasks are those used to specify tasks which still do not have a\n+ * full SPARQL built. Currently, tasks in the WAIT status could be:\n+ * o Tasks added while checking if the upper layer needs to process the\n+ * given file (checked using the 'process-file' or\n+ * 'process-file-attributes' signals in TrackerMinerFS).\n+ * o Tasks added while the upper layer is actually processing the given\n+ * files (until the tracker_miner_fs_file_notify() is called by the\n+ * upper layer).\n+ * 1.2. \"PROCESS\" tasks are those used to specify tasks which have a proper\n+ * SPARQL string ready to be pushed to tracker-store.\n+ *\n+ * 2. The current possible flows for tasks added to the processing pool are:\n+ * 2.1. Full SPARQL is ready before pushing the task to the pool. This is\n+ * currently the case for DELETED or MOVED events, and the flow would be\n+ * like this:\n+ * - processing_task_new() to create a new task\n+ * - processing_task_set_sparql() to set the full SPARQL in the task.\n+ * - processing_pool_process_task() to push the newly created task\n+ * into the processing pool as a \"PROCESS\" task.\n+ *\n+ * 2.2. The full SPARQL is still not available, as the upper layers need to\n+ * process the file (like extracting metadata using tracker-extract\n+ * in the case of TrackerMinerFiles). This case would correspond to\n+ * CREATED or UPDATED events:\n+ * - processing_task_new() to create a new task\n+ * - processing_pool_wait_task() to push the newly created task into\n+ * the processing pool as a \"WAIT\" task.\n+ * - processing_task_set_sparql() to set the full SPARQL in the task\n+ * (when the upper layers finished building it).\n+ * - processing_pool_process_task() to push the newly created task\n+ * into the processing pool as a \"PROCESS\" task.\n+ *\n+ * 3. The number of tasks pushed to the pull as \"WAIT\" tasks is limited to the\n+ * number set while creating the pool. This value corresponds to the\n+ * \"wait-pool-limit\" property in the TrackerMinerFS object, and currently is\n+ * set to 1 for TrackerMinerApplications and to 10 to TrackerMinerFiles. In\n+ * the case of TrackerMinerFiles, this number specifies the maximum number of\n+ * extraction requests that can be managed in parallel.\n+ *\n+ * 4. The number of tasks pushed to the pull as \"PROCESS\" tasks is limited to\n+ * the number set while creating the pool. This value corresponds to the\n+ * \"process-pool-limit\" property in the TrackerMinerFS object, and currently\n+ * is set to 1 for TrackerMinerApplications and to 100 to TrackerMinerFiles.\n+ * In the case of TrackerMinerFiles, this number specifies the maximum number\n+ * of SPARQL updates that can be merged into a single multi-insert SPARQL\n+ * connection.\n+ *\n+ * 5. When a task is pushed to the pool as a \"PROCESS\" task, the pool will be in\n+ * charge of executing the SPARQL update into the store.\n+ *\n+ * 6. If buffering was requested when processing_pool_process_task() was used to\n+ * push the new task in the pool as a \"PROCESS\" task, this task will be added\n+ * internally into a SPARQL buffer. This SPARQL buffer will be flushed\n+ * (pushing all collected SPARQL updates into the store) if one of these\n+ * conditions is met:\n+ * (a) The file corresponding to the task pushed doesn't have a parent.\n+ * (b) The parent of the file corresponding to the task pushed is different\n+ * to the parent of the last file pushed to the buffer.\n+ * (c) The limit for \"PROCESS\" tasks in the pool was reached.\n+ * (d) The buffer was not flushed in the last MAX_SPARQL_BUFFER_TIME (=15)\n+ * seconds.\n+ * The buffer is flushed using a single multi-insert SPARQL connection. This\n+ * means that an array of SPARQLs is sent to tracker-store, which replies\n+ * with an array of GErrors specifying which update failed, if any.\n+ *\n+ * 7. If buffering is not requested when processing_pool_process_task() is\n+ * called, first the previous buffer is flushed (if any) and then the current\n+ * task is updated in the store.\n+ *\n+ * 8. May the gods be with you if you need to fix a bug in here.\n+ *\n *\/\n \n #include \"config.h\"\n"} {"commit":"5fd0b40ff4168993956a10df99e27e850a9b436d","subject":"security: manager: Avoid forward decl of virSecurityManagerDispose","message":"security: manager: Avoid forward decl of virSecurityManagerDispose\n","repos":"datto\/libvirt,VenkatDatta\/libvirt,andreabolognani\/libvirt,shugaoye\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,shugaoye\/libvirt,agx\/libvirt,zippy2\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,rlaager\/libvirt,rlaager\/libvirt,taget\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,libvirt\/libvirt,eskultety\/libvirt,jfehlig\/libvirt,shugaoye\/libvirt,crobinso\/libvirt,datto\/libvirt,eskultety\/libvirt,elmarco\/libvirt,agx\/libvirt,libvirt\/libvirt,rlaager\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,elmarco\/libvirt,jardasgit\/libvirt,elmarco\/libvirt,elmarco\/libvirt,crobinso\/libvirt,taget\/libvirt,elmarco\/libvirt,jfehlig\/libvirt,shugaoye\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,olafhering\/libvirt,eskultety\/libvirt,datto\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,taget\/libvirt,datto\/libvirt,shugaoye\/libvirt,agx\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,fabianfreyer\/libvirt,rlaager\/libvirt,rlaager\/libvirt,zippy2\/libvirt,taget\/libvirt,agx\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/security\/security_manager.c\n+++ src\/security\/security_manager.c\n@@ -48,7 +48,17 @@\n \n static virClassPtr virSecurityManagerClass;\n \n-static void virSecurityManagerDispose(void *obj);\n+\n+static\n+void virSecurityManagerDispose(void *obj)\n+{\n+ virSecurityManagerPtr mgr = obj;\n+\n+ if (mgr->drv->close)\n+ mgr->drv->close(mgr);\n+ VIR_FREE(mgr->privateData);\n+}\n+\n \n static int virSecurityManagerOnceInit(void)\n {\n@@ -230,15 +240,6 @@\n return mgr->privateData;\n }\n \n-\n-static void virSecurityManagerDispose(void *obj)\n-{\n- virSecurityManagerPtr mgr = obj;\n-\n- if (mgr->drv->close)\n- mgr->drv->close(mgr);\n- VIR_FREE(mgr->privateData);\n-}\n \n const char *\n virSecurityManagerGetDriver(virSecurityManagerPtr mgr)\n"} {"commit":"a03ddeba13103ebf58cc2ad18423383f7e9d4806","subject":"* src\/maemo\/modest-connection-specific-smtp-edit-window.c: * Now the dialog fields are inside a scrolled window, and then, vkb does not spoil the dialog layout (fixes NB#80471).","message":"* src\/maemo\/modest-connection-specific-smtp-edit-window.c:\n * Now the dialog fields are inside a scrolled window, and then,\n vkb does not spoil the dialog layout (fixes NB#80471).\n\npmo-trunk-r4157\n","repos":"community-ssu\/modest,community-ssu\/modest,community-ssu\/modest,community-ssu\/modest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/maemo\/modest-connection-specific-smtp-edit-window.c\n+++ src\/maemo\/modest-connection-specific-smtp-edit-window.c\n@@ -266,12 +266,16 @@\n static void\n modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEditWindow *self)\n {\n-\tModestConnectionSpecificSmtpEditWindowPrivate *priv = \n-\t\tCONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);\n-\t\n-\tGtkWidget *box = GTK_DIALOG(self)->vbox; \/* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); *\/\n-\tgtk_box_set_spacing (GTK_BOX (box), MODEST_MARGIN_NONE);\n-\tgtk_container_set_border_width (GTK_CONTAINER (box), MODEST_MARGIN_HALF);\n+\tModestConnectionSpecificSmtpEditWindowPrivate *priv; \n+\tGtkWidget *dialog_box;\n+\tGtkWidget *scrolled_window, *vbox;\n+\n+\tpriv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);\n+\tdialog_box = GTK_DIALOG(self)->vbox; \/* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); *\/\n+\tgtk_box_set_spacing (GTK_BOX (dialog_box), MODEST_MARGIN_NONE);\n+\tgtk_container_set_border_width (GTK_CONTAINER (dialog_box), MODEST_MARGIN_HALF);\n+\n+\tvbox = gtk_vbox_new (FALSE, 0);\n \t\n \t\/* Create a size group to be used by all captions.\n \t * Note that HildonCaption does not create a default size group if we do not specify one.\n@@ -288,7 +292,7 @@\n \tGtkWidget *caption = hildon_caption_new (sizegroup, \n \t\t_(\"mcen_li_emailsetup_smtp\"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);\n \tgtk_widget_show (priv->entry_outgoingserver);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* The secure authentication widgets: *\/\n@@ -298,7 +302,7 @@\n \t\tpriv->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);\n \tg_signal_connect (G_OBJECT (priv->combo_outgoing_auth), \"changed\", G_CALLBACK(on_change), self);\n \tgtk_widget_show (priv->combo_outgoing_auth);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* The username widgets: *\/\t\n@@ -309,7 +313,7 @@\n \t\tpriv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);\n \tg_signal_connect(G_OBJECT(priv->entry_user_username), \"changed\", G_CALLBACK(on_change), self);\n \tgtk_widget_show (priv->entry_user_username);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* Prevent the use of some characters in the username, \n@@ -332,7 +336,7 @@\n \t\t_(\"mail_fi_password\"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);\n \tg_signal_connect(G_OBJECT(priv->entry_user_password), \"changed\", G_CALLBACK(on_change), self);\n \tgtk_widget_show (priv->entry_user_password);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* The secure connection widgets: *\/\t\n@@ -345,7 +349,7 @@\n \tcaption = hildon_caption_new (sizegroup, _(\"mcen_li_emailsetup_secure_connection\"), \n \t\tpriv->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);\n \tgtk_widget_show (priv->combo_outgoing_security);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* The port number widgets: *\/\n@@ -357,7 +361,7 @@\n \tg_signal_connect(G_OBJECT(priv->entry_port), \"range-error\", G_CALLBACK(on_range_error), self);\n \tg_signal_connect(G_OBJECT(priv->entry_port), \"notify::value\", G_CALLBACK(on_value_changed), self);\n \tgtk_widget_show (priv->entry_port);\n-\tgtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n+\tgtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);\n \tgtk_widget_show (caption);\n \t\n \t\/* Show a default port number when the security method changes, as per the UI spec: *\/\n@@ -371,12 +375,20 @@\n \tpriv->is_dirty = FALSE;\n \tpriv->range_error_occured = FALSE;\n \tg_signal_connect(G_OBJECT(self), \"response\", G_CALLBACK(on_response), self);\n-\tg_signal_connect(G_OBJECT(box), \"set-focus-child\", G_CALLBACK(on_set_focus_child), self);\n+\tg_signal_connect(G_OBJECT(vbox), \"set-focus-child\", G_CALLBACK(on_set_focus_child), self);\n \n \tpriv->range_error_banner_timeout = 0;\n \tpriv->account_name = NULL;\n-\t\n-\tgtk_widget_show (box);\n+\n+\tscrolled_window = gtk_scrolled_window_new (NULL, NULL);\n+\tgtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), vbox);\n+\tgtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);\n+\tgtk_box_pack_start (GTK_BOX (dialog_box), scrolled_window, TRUE, TRUE, 0);\n+\tgtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), \n+\t\t\t\t\t gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));\n+\t\n+\tgtk_widget_show_all (dialog_box);\n+\tgtk_window_set_default_size (GTK_WINDOW (self), -1, 220);\n \t\n \t\n \t\/* When this window is shown, hibernation should not be possible, \n"} {"commit":"cc601d394f7bcf401dad5661e5bdd44a0e911dd6","subject":"Remove the objregd watcher for now, will rewrite it from scratch","message":"Remove the objregd watcher for now, will rewrite it from scratch\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/oregwatchd.c\n+++ mudlib\/mud\/home\/System\/sys\/oregwatchd.c\n@@ -1,82 +0,0 @@\n-\/*\n- * This file is part of Kotaka, a mud library for DGD\n- * http:\/\/github.com\/shentino\/kotaka\n- *\n- * Copyright (C) 2013 Raymond Jennings\n- *\n- * This program is free software: you can redistribute it and\/or modify\n- * it under the terms of the GNU Affero General Public License as\n- * published by the Free Software Foundation, either version 3 of the\n- * License, or (at your option) any later version.\n- *\n- * This program is distributed in the hope that it will be useful,\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n- * GNU Affero General Public License for more details.\n- *\n- * You should have received a copy of the GNU Affero General Public License\n- * along with this program. If not, see .\n- *\/\n-#include \n-\n-#include \n-#include \n-#include \n-#include \n-\n-#include \n-\n-#include \n-#include \n-\n-inherit SECOND_AUTO;\n-\n-static void create()\n-{\n-\tcall_out(\"verify_objregd\", 1);\n-}\n-\n-private void verify_objregd_owner(string owner)\n-{\n-\tmapping seen;\n-\tobject first;\n-\tobject obj;\n-\n-\tseen = ([ ]);\n-\tfirst = KERNELD->first_link(owner);\n-\n-\tif (!first) {\n-\t\treturn;\n-\t}\n-\n-\tobj = first;\n-\n-\tdo {\n-\t\tseen[obj] = 1;\n-\t\tobj = KERNELD->next_link(obj);\n-\n-\t\tif (!obj) {\n-\t\t\tshutdown();\n-\t\t\tLOGD->post_message(\"system\", LOG_EMERG, \"Fatal error: Corrupted ObjRegD database for \" + owner);\n-\t\t\tbreak;\n-\t\t}\n-\t} while (!seen[obj]);\n-}\n-\n-static void verify_objregd()\n-{\n-\trlimits (0; -1) {\n-\t\tstring *owners;\n-\t\tint i, sz;\n-\n-\t\towners = KERNELD->query_owners();\n-\n-\t\tsz = sizeof(owners);\n-\n-\t\tfor (i = 0; i < sz; i++) {\n-\t\t\tverify_objregd_owner(owners[i]);\n-\t\t}\n-\n-\t\tcall_out(\"verify_objregd\", 1);\n-\t}\n-}\n"} {"commit":"514587bb82b84da30b5e2b4b37426ac0a31c5e88","subject":"Adjusting proper event configuraion.","message":"Adjusting proper event configuraion.\n","repos":"TeskaLabs\/Frame_Transporter,TeskaLabs\/Frame-Transporter,TeskaLabs\/SeaCat-Common-Library,TeskaLabs\/Frame_Transporter,TeskaLabs\/Frame-Transporter","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/sock_est.c\n+++ src\/sock_est.c\n@@ -619,13 +619,23 @@\n \t\t\t\/\/ All dvecs in the frame are filled with data\n \t\t\tbool upstreamed = this->cbs->read(this, this->read_frame);\n \t\t\tif (upstreamed) this->read_frame = NULL;\n-\t\t\tif (!ev_is_active(&this->read_watcher)) return; \/\/ If watcher is stopped, break reading\n+\t\t\tif ((this->read_events & READ_WANT_READ) == 0)\n+\t\t\t{\n+\t\t\t\t\/\/ If watcher is stopped, break reading\t\n+\t\t\t\tL_TRACE(L_TRACEID_SOCK_STREAM, \"END \" TRACE_FMT \" read stopped\", TRACE_ARGS);\n+\t\t\t\treturn;\n+\t\t\t}\n \t\t}\n \t\telse if (this->flags.read_partial == true)\n \t\t{\n \t\t\tbool upstreamed = this->cbs->read(this, this->read_frame);\n \t\t\tif (upstreamed) this->read_frame = NULL;\n-\t\t\tif (!ev_is_active(&this->read_watcher)) return; \/\/ If watcher is stopped, break reading\t\t\n+\t\t\tif ((this->read_events & READ_WANT_READ) == 0)\n+\t\t\t{\n+\t\t\t\t\/\/ If watcher is stopped, break reading\t\n+\t\t\t\tL_TRACE(L_TRACEID_SOCK_STREAM, \"END \" TRACE_FMT \" partial read stopped\", TRACE_ARGS);\n+\t\t\t\treturn;\n+\t\t\t}\n \t\t}\n \t}\n \n"} {"commit":"276c409163fb94b0c325900d6e2581eaa3e3ada6","subject":"security_selinux: Replace SELinuxSCSICallbackData with proper struct","message":"security_selinux: Replace SELinuxSCSICallbackData with proper struct\n\nWe have plenty of callbacks in the driver. Some of these\ncallbacks require more than one argument to be passed. For that\nwe currently have a data type (struct) per each callback. Well,\nso far for only one - SELinuxSCSICallbackData. But lets turn it\ninto more general name so it can be reused in other callbacks too\ninstead of each one introducing a new, duplicate data type.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\n","repos":"rlaager\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,agx\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,rlaager\/libvirt,fabianfreyer\/libvirt,rlaager\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,taget\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,rlaager\/libvirt,agx\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,taget\/libvirt,olafhering\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,datto\/libvirt,jfehlig\/libvirt,agx\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,rlaager\/libvirt,fabianfreyer\/libvirt,taget\/libvirt,agx\/libvirt,zippy2\/libvirt,taget\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,libvirt\/libvirt,zippy2\/libvirt,datto\/libvirt,agx\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,zippy2\/libvirt,olafhering\/libvirt,datto\/libvirt,andreabolognani\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,datto\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/security\/security_selinux.c\n+++ src\/security\/security_selinux.c\n@@ -68,14 +68,17 @@\n #endif\n };\n \n-#define SECURITY_SELINUX_VOID_DOI \"0\"\n-#define SECURITY_SELINUX_NAME \"selinux\"\n-\n-\/* Data structure to pass to *FileIterate so we have everything we need *\/\n-struct SELinuxSCSICallbackData {\n+\/* Data structure to pass to various callbacks so we have everything we need *\/\n+typedef struct _virSecuritySELinuxCallbackData virSecuritySELinuxCallbackData;\n+typedef virSecuritySELinuxCallbackData *virSecuritySELinuxCallbackDataPtr;\n+\n+struct _virSecuritySELinuxCallbackData {\n virSecurityManagerPtr mgr;\n virDomainDefPtr def;\n };\n+\n+#define SECURITY_SELINUX_VOID_DOI \"0\"\n+#define SECURITY_SELINUX_NAME \"selinux\"\n \n static int\n virSecuritySELinuxRestoreSecurityTPMFileLabelInt(virSecurityManagerPtr mgr,\n@@ -1319,7 +1322,7 @@\n const char *file, void *opaque)\n {\n virSecurityLabelDefPtr secdef;\n- struct SELinuxSCSICallbackData *ptr = opaque;\n+ virSecuritySELinuxCallbackDataPtr ptr = opaque;\n virSecurityManagerPtr mgr = ptr->mgr;\n virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);\n \n@@ -1400,7 +1403,7 @@\n \n case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: {\n virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;\n- struct SELinuxSCSICallbackData data = {.mgr = mgr, .def = def};\n+ virSecuritySELinuxCallbackData data = {.mgr = mgr, .def = def};\n \n virSCSIDevicePtr scsi =\n virSCSIDeviceNew(NULL,\n"} {"commit":"d5f6a1975fb5d4935543ab6587dc6feb95b7f0ca","subject":"Restore SVC_XPRT_PARTITIONS == 7.","message":"Restore SVC_XPRT_PARTITIONS == 7.\n","repos":"sswen\/ntirpc,sswen\/ntirpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/svc_xprt.c\n+++ src\/svc_xprt.c\n@@ -30,7 +30,7 @@\n #include \"vc_lock.h\"\n #include \"svc_xprt.h\"\n \n-#define SVC_XPRT_PARTITIONS \/* 7 *\/ 1\n+#define SVC_XPRT_PARTITIONS 7\n \n static bool_t initialized = FALSE;\n \n"} {"commit":"89404adc99dd43bc420f898e39212a5f58c1ef93","subject":"Cleanup","message":"Cleanup\n","repos":"dimkr\/szl,dimkr\/szl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/szl_zstd.c\n+++ src\/szl_zstd.c\n@@ -33,8 +33,8 @@\n \n static\n enum szl_res szl_zstd_proc_compress(struct szl_interp *interp,\n-\t const unsigned int objc,\n-\t struct szl_obj **objv)\n+\t const unsigned int objc,\n+\t struct szl_obj **objv)\n {\n \tstruct szl_obj *obj;\n \tchar *in, *out;\n@@ -76,13 +76,13 @@\n \n static\n enum szl_res szl_zstd_proc_decompress(struct szl_interp *interp,\n-\t const unsigned int objc,\n-\t struct szl_obj **objv)\n+\t const unsigned int objc,\n+\t struct szl_obj **objv)\n {\n \tstruct szl_obj *obj;\n \tchar *in, *out;\n+\tszl_int klen;\n \tunsigned long long blen;\n-\tszl_int klen;\n \tsize_t inlen, outlen;\n \n \tif (!szl_as_str(interp, objv[1], &in, &inlen))\n@@ -92,7 +92,7 @@\n \t\tif (!szl_as_int(interp, objv[2], &klen))\n \t\t\treturn SZL_ERR;\n \n-\t\tif ((klen <= 0) || (klen > ULONG_LONG_MAX)) {\n+\t\tif ((klen <= 0) || (klen > ULONG_LONG_MAX) || (klen > SIZE_MAX)) {\n \t\t\tszl_set_last_str(interp, \"bad size: \"SZL_INT_FMT, klen);\n \t\t\treturn SZL_ERR;\n \t\t}\n"} {"commit":"da90b5b427b2a5e60922c6388fb221dfe6e54dd8","subject":"Fixed bugs","message":"Fixed bugs\n","repos":"skhoroshavin\/qcc,skhoroshavin\/qcc,skhoroshavin\/qcc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/test_gen.c\n+++ src\/test_gen.c\n@@ -4,24 +4,26 @@\n unsigned qcc_gen_unsigned(struct qcc_test_context *ctx, unsigned min,\n unsigned max)\n {\n- unsigned avg = (min + max) \/ 2;\n+ unsigned avg = min \/ 2 + max \/ 2;\n+ if (avg < min) avg = min;\n+ if (avg > min) avg = max;\n \n- switch (qcc_test_context_rand(ctx) % 16)\n+ switch (qcc_test_context_rand(ctx) % 10)\n {\n case 0:\n return min;\n case 1:\n return max;\n case 2:\n- return min + 1;\n+ return min < max ? min + 1 : min;\n case 3:\n- return max - 1;\n+ return min < max ? max - 1 : max;\n case 4:\n return avg;\n case 5:\n- return avg + 1;\n+ return avg > min ? avg - 1 : avg;\n case 6:\n- return avg - 1;\n+ return avg < max ? avg + 1 : avg;\n }\n \n unsigned result = qcc_test_context_rand(ctx);\n"} {"commit":"a5b711b4877ca0d05d5abd1b4aaf3751806d3054","subject":"Avoiding NaN exceptions","message":"Avoiding NaN exceptions\n","repos":"Teino1978-Corp\/Teino1978-Corp-WiggleTools,weng-lab\/WiggleTools,Teino1978-Corp\/Teino1978-Corp-WiggleTools,weng-lab\/WiggleTools,Ensembl\/WiggleTools,Teino1978-Corp\/Teino1978-Corp-WiggleTools,weng-lab\/WiggleTools,Teino1978-Corp\/Teino1978-Corp-WiggleTools,Ensembl\/WiggleTools,Teino1978-Corp\/Teino1978-Corp-WiggleTools,weng-lab\/WiggleTools,Teino1978-Corp\/Teino1978-Corp-WiggleTools,weng-lab\/WiggleTools,weng-lab\/WiggleTools,Ensembl\/WiggleTools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/unaryOps.c\n+++ src\/unaryOps.c\n@@ -269,6 +269,10 @@\n void LogWiggleIteratorPop(WiggleIterator * wi) {\n \tLogWiggleIteratorData * data = (LogWiggleIteratorData *) wi->data;\n \tWiggleIterator * iter = data->iter;\n+\n+\twhile (iter->value <= 0)\n+\t\tpop(iter);\n+\n \tif (!data->iter->done) {\n \t\twi->chrom = iter->chrom;\n \t\twi->start = iter->start;\n@@ -355,6 +359,12 @@\n static void PowerWiggleIteratorPop(WiggleIterator * wi) {\n \tScaleWiggleIteratorData * data = (ScaleWiggleIteratorData *) wi->data;\n \tWiggleIterator * iter = data->iter;\n+\n+\t\/\/ Avoiding divisions by 0\n+\tif (data->scalar < 0)\n+\t\twhile (iter->value == 0)\n+\t\t\tpop(iter);\n+\n \tif (!iter->done) {\n \t\twi->chrom = iter->chrom;\n \t\twi->start = iter->start;\n"} {"commit":"5966dcdc018dc2b643409a0ca3f52158bb35c9ed","subject":"added version and authors to wirefang","message":"added version and authors to wirefang\n","repos":"greydamian\/wirefang,greydamian\/wirefang","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wirefang.c\n+++ src\/wirefang.c\n@@ -33,6 +33,9 @@\n * greyio.h: readall(), writeall()\n *\/\n #include \"greyio.h\"\n+\n+static const char *version = \"v1.0.0\";\n+static const char *authors = \"Damian Jason Lapidge \";\n \n void print_usage() {\n fprintf(stderr, \"wirefang \\n\");\n"} {"commit":"3b4d2108f53ef40e70e19c1bebc94d2c41cdb1f5","subject":"more cleanups","message":"more cleanups\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wm\/wdraw.c\n+++ src\/wm\/wdraw.c\n@@ -15,6 +15,9 @@\n #define COLOR_POINTERFRAME 0x08\n #define COLOR_TEXTNORMAL 0x09\n #define COLOR_TEXTLIGHT 0x0A\n+#define MOUSE_WIDTH 24\n+#define MOUSE_HEIGHT 24\n+#define TEXT_LINEHEIGHT 24\n \n static struct ctrl_videosettings oldsettings;\n static struct ctrl_videosettings settings;\n@@ -102,12 +105,19 @@\n \n }\n \n+static unsigned int isoverlap(unsigned int line, unsigned int y, unsigned int h)\n+{\n+\n+ return line >= y && line < y + h;\n+\n+}\n+\n static unsigned int testfill(struct element *element, void *data, unsigned int line)\n {\n \n struct element_fill *fill = data;\n \n- return line >= fill->size.y && line < fill->size.y + fill->size.h;\n+ return isoverlap(line, fill->size.y, fill->size.h);\n \n }\n \n@@ -125,7 +135,7 @@\n \n struct element_mouse *mouse = data;\n \n- return line >= mouse->y && line < mouse->y + 24;\n+ return isoverlap(line, mouse->y, MOUSE_HEIGHT);\n \n }\n \n@@ -133,15 +143,14 @@\n {\n \n struct element_mouse *mouse = data;\n+ unsigned char *md = mousedata + (line - mouse->y) * MOUSE_WIDTH;\n unsigned int i;\n \n- line = (line - mouse->y);\n-\n- for (i = 0; i < 24; i++)\n- {\n-\n- if (mousedata[line * 24 + i] != 0xFF)\n- paint(mousedata[line * 24 + i], mouse->x + i, 1);\n+ for (i = 0; i < MOUSE_WIDTH; i++)\n+ {\n+\n+ if (md[i] != 0xFF)\n+ paint(md[i], mouse->x + i, 1);\n \n }\n \n@@ -152,7 +161,7 @@\n \n struct element_panel *panel = data;\n \n- return line >= panel->size.y && line < panel->size.y + panel->size.h;\n+ return isoverlap(line, panel->size.y, panel->size.h);\n \n }\n \n@@ -201,7 +210,7 @@\n \n struct element_text *text = data;\n \n- return line >= text->size.y && line < text->size.y + text->size.h;\n+ return isoverlap(line, text->size.y, text->size.h);\n \n }\n \n@@ -338,9 +347,9 @@\n return;\n \n line = (line - text->size.y);\n- row = line \/ 24;\n- rowline = line % 24;\n- rowtop = row * 24;\n+ row = line \/ TEXT_LINEHEIGHT;\n+ rowline = line % TEXT_LINEHEIGHT;\n+ rowtop = row * TEXT_LINEHEIGHT;\n rowtotal = ascii_count(string, stringcount, '\\n') + 1;\n \n if (row >= rowtotal)\n@@ -361,7 +370,7 @@\n \n struct element_window *window = data;\n \n- return line >= window->size.y && line < window->size.y + window->size.h;\n+ return isoverlap(line, window->size.y, window->size.h);\n \n }\n \n"} {"commit":"4f6643cc0ce61caa3bd8959ce681c9c4e1678c5e","subject":"Fix missing glyph handling in modified stb_truetype.h (ttf branch)","message":"Fix missing glyph handling in modified stb_truetype.h (ttf branch)\n","repos":"shaggytwodope\/imgui,tpoechtrager\/imgui,Pagghiu\/imgui,neshume\/imgui,GHF\/imgui,elect86\/imgui,mikesart\/imgui,ggtucker\/imgui,aimotive\/imgui-glfw,Pagghiu\/imgui,zho7611\/imgui,aimotive\/imgui-glfw,wangshijin\/imgui,bkaradzic\/imgui,benoitjacquier\/imgui,xunmengfeng\/imgui,Flix01\/imgui,xunmengfeng\/imgui,shaggytwodope\/imgui,GHF\/imgui,dougbinks\/imgui,usagi\/imguixx,rxantos\/imgui,ocornut\/imgui,Psybrus\/imgui,burningreggae\/imgui,nProtect\/imgui,seanmiddleditch\/imgui,neshume\/imgui,wasikuss\/imgui,ghassanpl\/imgui,Extrawurst\/imgui,xythobuz\/imgui,bkaradzic\/imgui,twigletguy\/imgui,mikesart\/imgui,DXsmiley\/FlexGUI,redblobgames\/imgui,rmoorman\/imgui,cmaughan\/imgui,emoon\/imgui,wflohry\/imgui-addons,bagobor\/imgui,bagobor\/imgui,seanmiddleditch\/imgui,gyakoo\/imgui,wasikuss\/imgui,dougbinks\/imgui,thennequin\/imgui,sakishum\/imgui,thennequin\/imgui,kylawl\/imgui,ggtucker\/imgui,usagi\/imguixx,twigletguy\/imgui,rxantos\/imgui,redblobgames\/imgui,Flix01\/imgui,luiseduardohdbackup\/imgui,emoon\/imgui,thevaber\/imgui,kylawl\/imgui,xythobuz\/imgui,tom-seddon\/imgui,bkaradzic\/imgui,ocornut\/imgui,cmaughan\/imgui,elect86\/imgui,nProtect\/imgui,zho7611\/imgui,nmlgc\/imgui,ggtucker\/imgui,cmaughan\/imgui,Extrawurst\/imgui,Psybrus\/imgui,tpoechtrager\/imgui,ocornut\/imgui,gyakoo\/imgui,burningreggae\/imgui,DXsmiley\/FlexGUI,gamedeff\/imgui,wflohry\/imgui-addons,rmoorman\/imgui,benoitjacquier\/imgui,Flix01\/imgui,andresv\/imgui,gamedeff\/imgui,wangshijin\/imgui,cmaughan\/imgui,tom-seddon\/imgui,thevaber\/imgui,nProtect\/imgui,ghassanpl\/imgui,luiseduardohdbackup\/imgui,sakishum\/imgui,nmlgc\/imgui,andresv\/imgui","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- stb_truetype.h\n+++ stb_truetype.h\n@@ -2330,7 +2330,7 @@\n rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);\n rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);\n \t\t } else {\n- rects[k].w = rects[k].h = 0;\n+ rects[k].w = rects[k].h = 1;\n }\n \t\t ++k;\n }\n"} {"commit":"65a043f7f0d81e7b499fa6366a487f7097371b8e","subject":"Resolver: limited CNAME recursion.","message":"Resolver: limited CNAME recursion.\n\nPreviously, the recursion was only limited for cached responses.\n","repos":"firebase\/nginx,firebase\/nginx,firebase\/nginx,firebase\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/core\/ngx_resolver.c\n+++ src\/core\/ngx_resolver.c\n@@ -2001,23 +2001,39 @@\n \n ngx_queue_insert_head(&r->name_expire_queue, &rn->queue);\n \n+ ngx_resolver_free(r, rn->query);\n+ rn->query = NULL;\n+#if (NGX_HAVE_INET6)\n+ rn->query6 = NULL;\n+#endif\n+\n ctx = rn->waiting;\n rn->waiting = NULL;\n \n if (ctx) {\n \n+ if (ctx->recursion++ >= NGX_RESOLVER_MAX_RECURSION) {\n+\n+ \/* unlock name mutex *\/\n+\n+ do {\n+ ctx->state = NGX_RESOLVE_NXDOMAIN;\n+ next = ctx->next;\n+\n+ ctx->handler(ctx);\n+\n+ ctx = next;\n+ } while (ctx);\n+\n+ return;\n+ }\n+\n for (next = ctx; next; next = next->next) {\n next->node = NULL;\n }\n \n (void) ngx_resolve_name_locked(r, ctx, &name);\n }\n-\n- ngx_resolver_free(r, rn->query);\n- rn->query = NULL;\n-#if (NGX_HAVE_INET6)\n- rn->query6 = NULL;\n-#endif\n \n \/* unlock name mutex *\/\n \n"} {"commit":"89949203218f225cab4f62d107d9e41646e33176","subject":"netutils\/websocket: misc changes in handling loop","message":"netutils\/websocket: misc changes in handling loop\n\nwebsocket state is supposed to be changed at the last.\nOtherwise, it can happen memory leaks.\n\nChange-Id: I32d82a77dae1c17406c485a21f9b7d098da8a89e\nSigned-off-by: bossjisu <800dec47d2987cee7cc3d7aee71bc11b56f5042e@samsung.com>\n","repos":"HONGCHAEHEE\/TizenRT,JeonginKim\/TizenRT,pillip8282\/TizenRT,jeongarmy\/TizenRT,shivgarg\/TizenRT,junmin-kim\/TizenRT,btheosam\/TizenRT,chanijjani\/TizenRT,HONGCHAEHEE\/TizenRT,HONGCHAEHEE\/TizenRT,davidfather\/TizenRT,heejin-kim\/TizenRT,junmin-kim\/TizenRT,lokeshbv\/TizenRT,an4967\/TizenRT,chanijjani\/TizenRT,junmin-kim\/TizenRT,Samsung\/TizenRT,sangwon03\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,chanijjani\/TizenRT,sunghan-chang\/TizenRT,btheosam\/TizenRT,JeongJunSik\/TizenRT,JeonginKim\/TizenRT,jeongchanKim\/TizenRT,sangwon03\/TizenRT,jeongarmy\/TizenRT,chanijjani\/TizenRT,Samsung\/TizenRT,yashwanth686007\/TizenRTOS,pillip8282\/TizenRT,jeongchanKim\/TizenRT,jeongarmy\/TizenRT,HONGCHAEHEE\/TizenRT,Samsung\/TizenRT,lokeshbv\/TizenRT,jeongarmy\/TizenRT,JeonginKim\/TizenRT,JeonginKim\/TizenRT,jsdosa\/TizenRT,heejin-kim\/TizenRT,an4967\/TizenRT,an4967\/TizenRT,lokeshbv\/TizenRT,sangwon03\/TizenRT,chanijjani\/TizenRT,Samsung\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,Parkjihooni6186\/TizenRT,lokeshbv\/TizenRT,shivgarg\/TizenRT,jsdosa\/TizenRT,lokeshbv\/TizenRT,jeongchanKim\/TizenRT,btheosam\/TizenRT,heejin-kim\/TizenRT,davidfather\/TizenRT,shivgarg\/TizenRT,junmin-kim\/TizenRT,shivgarg\/TizenRT,jeongarmy\/TizenRT,sunghan-chang\/TizenRT,davidfather\/TizenRT,Samsung\/TizenRT,Parkjihooni6186\/TizenRT,davidfather\/TizenRT,pillip8282\/TizenRT,yashwanth686007\/TizenRTOS,Parkjihooni6186\/TizenRT,pillip8282\/TizenRT,lokeshbv\/TizenRT,davidfather\/TizenRT,yashwanth686007\/TizenRTOS,yashwanth686007\/TizenRTOS,jeongchanKim\/TizenRT,jsdosa\/TizenRT,btheosam\/TizenRT,davidfather\/TizenRT,Parkjihooni6186\/TizenRT,JeongJunSik\/TizenRT,JeongJunSik\/TizenRT,btheosam\/TizenRT,chanijjani\/TizenRT,chanijjani\/TizenRT,davidfather\/TizenRT,sunghan-chang\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,jsdosa\/TizenRT,sunghan-chang\/TizenRT,pillip8282\/TizenRT,jeongchanKim\/TizenRT,shivgarg\/TizenRT,JeonginKim\/TizenRT,yashwanth686007\/TizenRTOS,Samsung\/TizenRT,heejin-kim\/TizenRT,shivgarg\/TizenRT,an4967\/TizenRT,sangwon03\/TizenRT,sangwon03\/TizenRT,junmin-kim\/TizenRT,jeongarmy\/TizenRT,Samsung\/TizenRT,yashwanth686007\/TizenRTOS,jeongarmy\/TizenRT,heejin-kim\/TizenRT,Parkjihooni6186\/TizenRT,pillip8282\/TizenRT,JeongJunSik\/TizenRT,Parkjihooni6186\/TizenRT,HONGCHAEHEE\/TizenRT,jeongchanKim\/TizenRT,JeongJunSik\/TizenRT,JeongJunSik\/TizenRT,sangwon03\/TizenRT,jeongchanKim\/TizenRT,pillip8282\/TizenRT,junmin-kim\/TizenRT,heejin-kim\/TizenRT,an4967\/TizenRT,JeonginKim\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,btheosam\/TizenRT,jsdosa\/TizenRT,HONGCHAEHEE\/TizenRT","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/netutils\/websocket\/websocket.c\n+++ apps\/netutils\/websocket\/websocket.c\n@@ -174,21 +174,19 @@\n \treturn WEBSOCKET_SUCCESS;\n }\n \n-void websocket_ping_counter(FAR void *arg)\n-{\n-\twebsocket_t *websocket = arg;\n-\n+int websocket_ping_counter(websocket_t *websocket)\n+{\n \tif (websocket->state != WEBSOCKET_STOP) {\n \t\twebsocket->ping_cnt++;\n \n \t\tif (websocket->ping_cnt >= WEBSOCKET_MAX_PING_IGNORE) {\n \t\t\tWEBSOCKET_DEBUG(\"ping messages couldn't receive pong messages for %d times, closing.\\n\", WEBSOCKET_MAX_PING_IGNORE);\n-\t\t\twebsocket_update_state(websocket, WEBSOCKET_STOP);\n-\t\t\treturn;\n-\t\t} else {\n-\t\t\twebsocket_queue_ping(websocket);\n-\t\t}\n-\t}\n+\t\t\treturn WEBSOCKET_SOCKET_ERROR;\n+\t\t}\n+\t\twebsocket_queue_ping(websocket);\n+\t}\n+\n+\treturn WEBSOCKET_SUCCESS;\n }\n \n int websocket_handler(websocket_t *websocket)\n@@ -205,7 +203,9 @@\n \t\tFD_ZERO(&read_fds);\n \t\tFD_ZERO(&write_fds);\n \n-\t\tFD_SET(fd, &read_fds);\n+\t\tif (wslay_event_want_read(ctx)) {\n+\t\t\tFD_SET(fd, &read_fds);\n+\t\t}\n \t\tif (wslay_event_want_write(ctx)) {\n \t\t\tFD_SET(fd, &write_fds);\n \t\t}\n@@ -213,25 +213,21 @@\n \t\ttv.tv_sec = (WEBSOCKET_HANDLER_TIMEOUT \/ 1000);\n \t\ttv.tv_usec = ((WEBSOCKET_HANDLER_TIMEOUT % 1000) * 1000);\n \t\tr = select(fd + 1, &read_fds, &write_fds, NULL, &tv);\n-\t\tif (r == -1) {\n-\t\t\tif (errno == EINVAL) {\n-\t\t\t\tWEBSOCKET_DEBUG(\"socket fd is not exist, fd == %d\\n\", fd);\n-\t\t\t\twebsocket_update_state(websocket, WEBSOCKET_STOP);\n-\t\t\t\treturn WEBSOCKET_SOCKET_ERROR;\n-\t\t\t}\n-\n+\t\tif (r < 0) {\n \t\t\tif (errno == EAGAIN || errno == EBUSY || errno == EINTR) {\n \t\t\t\tcontinue;\n \t\t\t}\n \n \t\t\tWEBSOCKET_DEBUG(\"select function returned errno == %d\\n\", errno);\n-\t\t\tcontinue;\n+\t\t\treturn WEBSOCKET_SOCKET_ERROR;\n \t\t} else if (r == 0) {\n \t\t\tif (WEBSOCKET_HANDLER_TIMEOUT != 0) {\n \t\t\t\ttimeout++;\n \t\t\t\tif ((WEBSOCKET_HANDLER_TIMEOUT * timeout) >= (WEBSOCKET_PING_INTERVAL * 10)) {\n \t\t\t\t\ttimeout = 0;\n-\t\t\t\t\twebsocket_ping_counter((void *)websocket);\n+\t\t\t\t\tif (websocket_ping_counter(websocket) != WEBSOCKET_SUCCESS) {\n+\t\t\t\t\t\treturn WEBSOCKET_SOCKET_ERROR;\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n \n@@ -1033,6 +1029,8 @@\n \n websocket_return_t websocket_queue_close(websocket_t *websocket, const char *close_message)\n {\n+\tint r = WEBSOCKET_SUCCESS;\n+\n \tif (websocket == NULL) {\n \t\tWEBSOCKET_DEBUG(\"NULL parameter\\n\");\n \t\treturn WEBSOCKET_ALLOCATION_ERROR;\n@@ -1045,14 +1043,14 @@\n \tif (websocket->ctx != NULL && websocket->state != WEBSOCKET_STOP) {\n \t\tif (wslay_event_queue_close(websocket->ctx, 1000, (const uint8_t *)close_message, strlen(close_message)) != WEBSOCKET_SUCCESS) {\n \t\t\tWEBSOCKET_DEBUG(\"fail to queue close message\\n\");\n-\t\t\twebsocket_socket_free(websocket);\n-\t\t\twslay_event_context_free(websocket->ctx);\n-\t\t\treturn WEBSOCKET_SEND_ERROR;\n+\t\t\tr = WEBSOCKET_SEND_ERROR;\n+\t\t\tgoto EXIT_QUEUE_CLOSE;\n \t\t}\n \t\twebsocket_wait_state(websocket, WEBSOCKET_STOP, 100000);\n-\t\tWEBSOCKET_DEBUG(\"websocket handler stopped, closing\\n\");\n-\t}\n-\n+\t\tWEBSOCKET_DEBUG(\"websocket handler successfully stopped, closing\\n\");\n+\t}\n+\n+EXIT_QUEUE_CLOSE:\n \twebsocket_socket_free(websocket);\n \n \tif (websocket->ctx) {\n@@ -1060,7 +1058,9 @@\n \t\twebsocket->ctx = NULL;\n \t}\n \n-\treturn WEBSOCKET_SUCCESS;\n+\twebsocket_update_state(websocket, WEBSOCKET_STOP);\n+\n+\treturn r;\n }\n \n websocket_return_t websocket_update_state(websocket_t *websocket, int state)\n"} {"commit":"532f07ca04c6f8ab0555b00cf5d42dc6f72b802f","subject":"Blackfin: fix early_dma_memcpy() handling of busy channels","message":"Blackfin: fix early_dma_memcpy() handling of busy channels\n\nThe early logic to locate a free DMA channel and then set it up was broken\nin a few ways that only manifested itself when we needed to set up more\nthan 2 on chip SRAM regions (most board defaults setup 1 or 2). First, we\nchecked the wrong status register (the destination gets updated, not the\nsource) and second, we did the ssync before rather than after resetting a\nDMA config register.\n\nSigned-off-by: Mike Frysinger <8f3f75c74bd5184edcfa6534cab3c13a00a2f794@gentoo.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/blackfin\/kernel\/bfin_dma_5xx.c\n+++ arch\/blackfin\/kernel\/bfin_dma_5xx.c\n@@ -253,31 +253,30 @@\n \tBUG_ON(src % 4);\n \tBUG_ON(size % 4);\n \n+\tsrc_ch = 0;\n+\t\/* Find an avalible memDMA channel *\/\n+\twhile (1) {\n+\t\tif (src_ch == (struct dma_register *)MDMA_S0_NEXT_DESC_PTR) {\n+\t\t\tdst_ch = (struct dma_register *)MDMA_D1_NEXT_DESC_PTR;\n+\t\t\tsrc_ch = (struct dma_register *)MDMA_S1_NEXT_DESC_PTR;\n+\t\t} else {\n+\t\t\tdst_ch = (struct dma_register *)MDMA_D0_NEXT_DESC_PTR;\n+\t\t\tsrc_ch = (struct dma_register *)MDMA_S0_NEXT_DESC_PTR;\n+\t\t}\n+\n+\t\tif (!bfin_read16(&src_ch->cfg))\n+\t\t\tbreak;\n+\t\telse if (bfin_read16(&dst_ch->irq_status) & DMA_DONE) {\n+\t\t\tbfin_write16(&src_ch->cfg, 0);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n \t\/* Force a sync in case a previous config reset on this channel\n \t * occurred. This is needed so subsequent writes to DMA registers\n \t * are not spuriously lost\/corrupted.\n \t *\/\n \t__builtin_bfin_ssync();\n-\n-\tsrc_ch = 0;\n-\t\/* Find an avalible memDMA channel *\/\n-\twhile (1) {\n-\t\tif (!src_ch || src_ch == (struct dma_register *)MDMA_S1_NEXT_DESC_PTR) {\n-\t\t\tdst_ch = (struct dma_register *)MDMA_D0_NEXT_DESC_PTR;\n-\t\t\tsrc_ch = (struct dma_register *)MDMA_S0_NEXT_DESC_PTR;\n-\t\t} else {\n-\t\t\tdst_ch = (struct dma_register *)MDMA_D1_NEXT_DESC_PTR;\n-\t\t\tsrc_ch = (struct dma_register *)MDMA_S1_NEXT_DESC_PTR;\n-\t\t}\n-\n-\t\tif (!bfin_read16(&src_ch->cfg)) {\n-\t\t\tbreak;\n-\t\t} else {\n-\t\t\tif (bfin_read16(&src_ch->irq_status) & DMA_DONE)\n-\t\t\t\tbfin_write16(&src_ch->cfg, 0);\n-\t\t}\n-\n-\t}\n \n \t\/* Destination *\/\n \tbfin_write32(&dst_ch->start_addr, dst);\n"} {"commit":"a87434b04f6dbca547bf1b9856769290841b1b4c","subject":"CRIS v32: Remove kernel\/arbiter.c, it now exists in machine dependent directory.","message":"CRIS v32: Remove kernel\/arbiter.c, it now exists in machine dependent directory.\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/cris\/arch-v32\/kernel\/arbiter.c\n+++ arch\/cris\/arch-v32\/kernel\/arbiter.c\n@@ -1,296 +0,0 @@\n-\/*\n- * Memory arbiter functions. Allocates bandwidth through the\n- * arbiter and sets up arbiter breakpoints.\n- *\n- * The algorithm first assigns slots to the clients that has specified\n- * bandwidth (e.g. ethernet) and then the remaining slots are divided\n- * on all the active clients.\n- *\n- * Copyright (c) 2004, 2005 Axis Communications AB.\n- *\/\n-\n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-\n-struct crisv32_watch_entry\n-{\n- unsigned long instance;\n- watch_callback* cb;\n- unsigned long start;\n- unsigned long end;\n- int used;\n-};\n-\n-#define NUMBER_OF_BP 4\n-#define NBR_OF_CLIENTS 14\n-#define NBR_OF_SLOTS 64\n-#define SDRAM_BANDWIDTH 100000000 \/* Some kind of expected value *\/\n-#define INTMEM_BANDWIDTH 400000000\n-#define NBR_OF_REGIONS 2\n-\n-static struct crisv32_watch_entry watches[NUMBER_OF_BP] =\n-{\n- {regi_marb_bp0},\n- {regi_marb_bp1},\n- {regi_marb_bp2},\n- {regi_marb_bp3}\n-};\n-\n-static int requested_slots[NBR_OF_REGIONS][NBR_OF_CLIENTS];\n-static int active_clients[NBR_OF_REGIONS][NBR_OF_CLIENTS];\n-static int max_bandwidth[NBR_OF_REGIONS] = {SDRAM_BANDWIDTH, INTMEM_BANDWIDTH};\n-\n-DEFINE_SPINLOCK(arbiter_lock);\n-\n-static irqreturn_t\n-crisv32_arbiter_irq(int irq, void* dev_id, struct pt_regs* regs);\n-\n-static void crisv32_arbiter_config(int region)\n-{\n-\tint slot;\n-\tint client;\n-\tint interval = 0;\n-\tint val[NBR_OF_SLOTS];\n-\n-\tfor (slot = 0; slot < NBR_OF_SLOTS; slot++)\n-\t val[slot] = NBR_OF_CLIENTS + 1;\n-\n-\tfor (client = 0; client < NBR_OF_CLIENTS; client++)\n-\t{\n-\t int pos;\n-\t if (!requested_slots[region][client])\n-\t continue;\n-\t interval = NBR_OF_SLOTS \/ requested_slots[region][client];\n-\t pos = 0;\n-\t while (pos < NBR_OF_SLOTS)\n-\t {\n-\t\tif (val[pos] != NBR_OF_CLIENTS + 1)\n-\t\t pos++;\n-\t\telse\n-\t\t{\n-\t\t\tval[pos] = client;\n-\t\t\tpos += interval;\n-\t\t}\n-\t }\n-\t}\n-\n-\tclient = 0;\n-\tfor (slot = 0; slot < NBR_OF_SLOTS; slot++)\n-\t{\n-\t\tif (val[slot] == NBR_OF_CLIENTS + 1)\n-\t\t{\n-\t\t\tint first = client;\n-\t\t\twhile(!active_clients[region][client]) {\n-\t\t\t\tclient = (client + 1) % NBR_OF_CLIENTS;\n-\t\t\t\tif (client == first)\n-\t\t\t\t break;\n-\t\t\t}\n-\t\t\tval[slot] = client;\n-\t\t\tclient = (client + 1) % NBR_OF_CLIENTS;\n-\t\t}\n-\t\tif (region == EXT_REGION)\n-\t\t REG_WR_INT_VECT(marb, regi_marb, rw_ext_slots, slot, val[slot]);\n-\t\telse if (region == INT_REGION)\n-\t\t REG_WR_INT_VECT(marb, regi_marb, rw_int_slots, slot, val[slot]);\n-\t}\n-}\n-\n-extern char _stext, _etext;\n-\n-static void crisv32_arbiter_init(void)\n-{\n-\tstatic int initialized = 0;\n-\n-\tif (initialized)\n-\t\treturn;\n-\n-\tinitialized = 1;\n-\n-\t\/* CPU caches are active. *\/\n-\tactive_clients[EXT_REGION][10] = active_clients[EXT_REGION][11] = 1;\n- crisv32_arbiter_config(EXT_REGION);\n- crisv32_arbiter_config(INT_REGION);\n-\n-\tif (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED,\n- \"arbiter\", NULL))\n-\t\tprintk(KERN_ERR \"Couldn't allocate arbiter IRQ\\n\");\n-\n-#ifndef CONFIG_ETRAX_KGDB\n- \/* Global watch for writes to kernel text segment. *\/\n- crisv32_arbiter_watch(virt_to_phys(&_stext), &_etext - &_stext,\n- arbiter_all_clients, arbiter_all_write, NULL);\n-#endif\n-}\n-\n-\n-\n-int crisv32_arbiter_allocate_bandwidth(int client, int region,\n-\t\t\t\t unsigned long bandwidth)\n-{\n-\tint i;\n-\tint total_assigned = 0;\n-\tint total_clients = 0;\n-\tint req;\n-\n-\tcrisv32_arbiter_init();\n-\n-\tfor (i = 0; i < NBR_OF_CLIENTS; i++)\n-\t{\n-\t\ttotal_assigned += requested_slots[region][i];\n-\t\ttotal_clients += active_clients[region][i];\n-\t}\n-\treq = NBR_OF_SLOTS \/ (max_bandwidth[region] \/ bandwidth);\n-\n-\tif (total_assigned + total_clients + req + 1 > NBR_OF_SLOTS)\n-\t return -ENOMEM;\n-\n-\tactive_clients[region][client] = 1;\n-\trequested_slots[region][client] = req;\n-\tcrisv32_arbiter_config(region);\n-\n-\treturn 0;\n-}\n-\n-int crisv32_arbiter_watch(unsigned long start, unsigned long size,\n- unsigned long clients, unsigned long accesses,\n- watch_callback* cb)\n-{\n-\tint i;\n-\n-\tcrisv32_arbiter_init();\n-\n-\tif (start > 0x80000000) {\n-\t\tprintk(\"Arbiter: %lX doesn't look like a physical address\", start);\n-\t\treturn -EFAULT;\n-\t}\n-\n-\tspin_lock(&arbiter_lock);\n-\n-\tfor (i = 0; i < NUMBER_OF_BP; i++) {\n-\t\tif (!watches[i].used) {\n-\t\t\treg_marb_rw_intr_mask intr_mask = REG_RD(marb, regi_marb, rw_intr_mask);\n-\n-\t\t\twatches[i].used = 1;\n-\t\t\twatches[i].start = start;\n-\t\t\twatches[i].end = start + size;\n-\t\t\twatches[i].cb = cb;\n-\n-\t\t\tREG_WR_INT(marb_bp, watches[i].instance, rw_first_addr, watches[i].start);\n-\t\t\tREG_WR_INT(marb_bp, watches[i].instance, rw_last_addr, watches[i].end);\n-\t\t\tREG_WR_INT(marb_bp, watches[i].instance, rw_op, accesses);\n-\t\t\tREG_WR_INT(marb_bp, watches[i].instance, rw_clients, clients);\n-\n-\t\t\tif (i == 0)\n-\t\t\t\tintr_mask.bp0 = regk_marb_yes;\n-\t\t\telse if (i == 1)\n-\t\t\t\tintr_mask.bp1 = regk_marb_yes;\n-\t\t\telse if (i == 2)\n-\t\t\t\tintr_mask.bp2 = regk_marb_yes;\n-\t\t\telse if (i == 3)\n-\t\t\t\tintr_mask.bp3 = regk_marb_yes;\n-\n-\t\t\tREG_WR(marb, regi_marb, rw_intr_mask, intr_mask);\n-\t\t\tspin_unlock(&arbiter_lock);\n-\n-\t\t\treturn i;\n-\t\t}\n-\t}\n-\tspin_unlock(&arbiter_lock);\n-\treturn -ENOMEM;\n-}\n-\n-int crisv32_arbiter_unwatch(int id)\n-{\n-\treg_marb_rw_intr_mask intr_mask = REG_RD(marb, regi_marb, rw_intr_mask);\n-\n-\tcrisv32_arbiter_init();\n-\n-\tspin_lock(&arbiter_lock);\n-\n-\tif ((id < 0) || (id >= NUMBER_OF_BP) || (!watches[id].used)) {\n-\t\tspin_unlock(&arbiter_lock);\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tmemset(&watches[id], 0, sizeof(struct crisv32_watch_entry));\n-\n-\tif (id == 0)\n-\t\tintr_mask.bp0 = regk_marb_no;\n-\telse if (id == 1)\n-\t\tintr_mask.bp2 = regk_marb_no;\n-\telse if (id == 2)\n-\t\tintr_mask.bp2 = regk_marb_no;\n-\telse if (id == 3)\n-\t\tintr_mask.bp3 = regk_marb_no;\n-\n-\tREG_WR(marb, regi_marb, rw_intr_mask, intr_mask);\n-\n-\tspin_unlock(&arbiter_lock);\n-\treturn 0;\n-}\n-\n-extern void show_registers(struct pt_regs *regs);\n-\n-static irqreturn_t\n-crisv32_arbiter_irq(int irq, void* dev_id, struct pt_regs* regs)\n-{\n-\treg_marb_r_masked_intr masked_intr = REG_RD(marb, regi_marb, r_masked_intr);\n-\treg_marb_bp_r_brk_clients r_clients;\n-\treg_marb_bp_r_brk_addr r_addr;\n-\treg_marb_bp_r_brk_op r_op;\n-\treg_marb_bp_r_brk_first_client r_first;\n-\treg_marb_bp_r_brk_size r_size;\n-\treg_marb_bp_rw_ack ack = {0};\n-\treg_marb_rw_ack_intr ack_intr = {.bp0=1,.bp1=1,.bp2=1,.bp3=1};\n-\tstruct crisv32_watch_entry* watch;\n-\n-\tif (masked_intr.bp0) {\n-\t\twatch = &watches[0];\n-\t\tack_intr.bp0 = regk_marb_yes;\n-\t} else if (masked_intr.bp1) {\n-\t\twatch = &watches[1];\n-\t\tack_intr.bp1 = regk_marb_yes;\n-\t} else if (masked_intr.bp2) {\n-\t\twatch = &watches[2];\n-\t\tack_intr.bp2 = regk_marb_yes;\n-\t} else if (masked_intr.bp3) {\n-\t\twatch = &watches[3];\n-\t\tack_intr.bp3 = regk_marb_yes;\n-\t} else {\n-\t\treturn IRQ_NONE;\n-\t}\n-\n-\t\/* Retrieve all useful information and print it. *\/\n-\tr_clients = REG_RD(marb_bp, watch->instance, r_brk_clients);\n-\tr_addr = REG_RD(marb_bp, watch->instance, r_brk_addr);\n-\tr_op = REG_RD(marb_bp, watch->instance, r_brk_op);\n-\tr_first = REG_RD(marb_bp, watch->instance, r_brk_first_client);\n-\tr_size = REG_RD(marb_bp, watch->instance, r_brk_size);\n-\n-\tprintk(\"Arbiter IRQ\\n\");\n-\tprintk(\"Clients %X addr %X op %X first %X size %X\\n\",\n-\t REG_TYPE_CONV(int, reg_marb_bp_r_brk_clients, r_clients),\n-\t REG_TYPE_CONV(int, reg_marb_bp_r_brk_addr, r_addr),\n-\t REG_TYPE_CONV(int, reg_marb_bp_r_brk_op, r_op),\n-\t REG_TYPE_CONV(int, reg_marb_bp_r_brk_first_client, r_first),\n-\t REG_TYPE_CONV(int, reg_marb_bp_r_brk_size, r_size));\n-\n-\tREG_WR(marb_bp, watch->instance, rw_ack, ack);\n-\tREG_WR(marb, regi_marb, rw_ack_intr, ack_intr);\n-\n-\tprintk(\"IRQ occured at %lX\\n\", regs->erp);\n-\n-\tif (watch->cb)\n-\t\twatch->cb();\n-\n-\n-\treturn IRQ_HANDLED;\n-}\n"} {"commit":"abf1e11a0dcf5514139cb76ed8eb050107653abd","subject":"parisc: add task_pt_regs macro","message":"parisc: add task_pt_regs macro\n\nneeded for perf_counters.\n\nSigned-off-by: Kyle McMartin <3c25b01657254677d3e1a8fd1f0742c5d489bd39@mcmartin.ca>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/parisc\/include\/asm\/processor.h\n+++ arch\/parisc\/include\/asm\/processor.h\n@@ -18,6 +18,7 @@\n #include \n #include \n #include \n+\n #endif \/* __ASSEMBLY__ *\/\n \n #define KERNEL_STACK_SIZE \t(4*PAGE_SIZE)\n@@ -126,6 +127,8 @@\n \tunsigned long map_base;\n \tunsigned long flags;\n }; \n+\n+#define task_pt_regs(tsk) ((struct pt_regs *)&((tsk)->thread.regs))\n \n \/* Thread struct flags. *\/\n #define PARISC_UAC_NOPRINT\t(1UL << 0)\t\/* see prctl and unaligned.c *\/\n"} {"commit":"5e5aacb0de70fa80e8b1a2b803ae9e2ad40b8e52","subject":"sh: add isp1161 usb host device to se7343","message":"sh: add isp1161 usb host device to se7343\n\nAdd isp1161 platform data to get usb host working on se7343.\n\nSigned-off-by: Magnus Damm <2336f5729424d0c84d319e991b3648cafa2c3c5b@igel.co.jp>\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/sh\/boards\/mach-se\/7343\/setup.c\n+++ arch\/sh\/boards\/mach-se\/7343\/setup.c\n@@ -3,6 +3,8 @@\n #include \n #include \n #include \n+#include \n+#include \n #include \n #include \n #include \n@@ -126,11 +128,54 @@\n \t},\n };\n \n+static void isp116x_delay(struct device *dev, int delay)\n+{\n+\tndelay(delay);\n+}\n+\n+static struct resource usb_resources[] = {\n+\t[0] = {\n+\t\t.start = 0x11800000,\n+\t\t.end = 0x11800001,\n+\t\t.flags = IORESOURCE_MEM,\n+\t},\n+\t[1] = {\n+\t\t.start = 0x11800002,\n+\t\t.end = 0x11800003,\n+\t\t.flags = IORESOURCE_MEM,\n+\t},\n+\t[2] = {\n+\t\t.start = USB_IRQ,\n+\t\t.flags = IORESOURCE_IRQ,\n+\t},\n+};\n+\n+static struct isp116x_platform_data usb_platform_data = {\n+\t.sel15Kres\t\t= 1,\n+\t.oc_enable\t\t= 1,\n+\t.int_act_high\t\t= 0,\n+\t.int_edge_triggered\t= 0,\n+\t.remote_wakeup_enable\t= 0,\n+\t.delay\t\t\t= isp116x_delay,\n+};\n+\n+static struct platform_device usb_device = {\n+\t.name\t\t\t= \"isp116x-hcd\",\n+\t.id\t\t\t= -1,\n+\t.num_resources \t= ARRAY_SIZE(usb_resources),\n+\t.resource \t= usb_resources,\n+\t.dev\t\t\t= {\n+\t\t.platform_data\t= &usb_platform_data,\n+\t},\n+\n+};\n+\n static struct platform_device *sh7343se_platform_devices[] __initdata = {\n \t&smc91x_device,\n \t&heartbeat_device,\n \t&nor_flash_device,\n \t&uart_device,\n+\t&usb_device,\n };\n \n static int __init sh7343se_devices_setup(void)\n"} {"commit":"e414fc40a8781a49aa41580cd5badeb5c982bade","subject":"bugfix","message":"bugfix\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,damoxc\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/index-mail.c\n+++ src\/lib-storage\/index\/index-mail.c\n@@ -413,6 +413,15 @@\n \treturn data->size;\n }\n \n+static void parse_bodystructure_header(struct message_part *part,\n+\t\t\t\t struct message_header_line *hdr,\n+\t\t\t\t void *context)\n+{\n+\tpool_t pool = context;\n+\n+\timap_bodystructure_parse_header(pool, part, hdr);\n+}\n+\n static int index_mail_parse_body(struct index_mail *mail)\n {\n \tstruct index_mail_data *data = &mail->data;\n@@ -423,7 +432,13 @@\n \n \ti_stream_seek(data->stream, data->hdr_size.physical_size);\n \n-\tmessage_parser_parse_body(data->parser_ctx, NULL, NULL, NULL);\n+\tif (data->bodystructure_header_parsed) {\n+\t\tmessage_parser_parse_body(data->parser_ctx,\n+\t\t\t\t\t parse_bodystructure_header,\n+\t\t\t\t\t NULL, mail->pool);\n+\t} else {\n+\t\tmessage_parser_parse_body(data->parser_ctx, NULL, NULL, NULL);\n+\t}\n \tdata->parts = message_parser_deinit(data->parser_ctx);\n data->parser_ctx = NULL;\n \n@@ -510,15 +525,6 @@\n \n \ti_stream_seek(data->stream, 0);\n \treturn data->stream;\n-}\n-\n-static void parse_bodystructure_header(struct message_part *part,\n-\t\t\t\t struct message_header_line *hdr,\n-\t\t\t\t void *context)\n-{\n-\tpool_t pool = context;\n-\n-\timap_bodystructure_parse_header(pool, part, hdr);\n }\n \n static const char *get_special(struct mail *_mail, enum mail_fetch_field field)\n"} {"commit":"2e92362fadef966d7bf13266da23b85d9fbbef2e","subject":"lib-storage: dest_mail wasn't reset if previous save was aborted. This could have happened only with dsync.","message":"lib-storage: dest_mail wasn't reset if previous save was aborted.\nThis could have happened only with dsync.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/index-mail.c\n+++ src\/lib-storage\/index\/index-mail.c\n@@ -1387,8 +1387,13 @@\n {\n \tstruct index_mail *mail = (struct index_mail *)_mail;\n \n-\tif (mail->data.seq == seq)\n-\t\treturn;\n+\tif (mail->data.seq == seq) {\n+\t\tif (!saving)\n+\t\t\treturn;\n+\t\t\/* we started saving a mail, aborted it, and now we're saving\n+\t\t another mail with the same sequence. make sure the mail\n+\t\t gets reset. *\/\n+\t}\n \n \tmail->mail.v.close(&mail->mail.mail);\n \n"} {"commit":"e92cc02389f0f07f7be025385d053bb9fe32825c","subject":"Simplified and optimized the sorting code.","message":"Simplified and optimized the sorting code.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/index-sort.c\n+++ src\/lib-storage\/index\/index-sort.c\n@@ -53,28 +53,21 @@\n \tconst char *primary_sort_header;\n \tstruct mail *temp_mail;\n \n-\tARRAY_TYPE(mail_sort_node) nodes;\n+\tARRAY_TYPE(mail_sort_node) nodes, all_nodes;\n \tconst struct mail_sort_node *nodes_ptr;\n \tunsigned int nodes_count, iter_idx;\n \n-\tARRAY_TYPE(mail_sort_node) all_nodes;\n-\n \tuint32_t ext_id;\n-\tuint32_t prev_seq, last_sorted_seq;\n+\tunsigned int first_missing_sort_id_idx;\n \n \tunsigned int reverse:1;\n-\tunsigned int skipped_mails:1;\n \tunsigned int sort_ids_added:1;\n+\tunsigned int missing_sort_ids:1;\n };\n \n struct sort_cmp_context {\n \tstruct mail_search_sort_program *program;\n \tstruct mail *mail;\n-\n-\tuint32_t cache_seq;\n-\tenum mail_sort_type cache_type;\n-\tuint32_t cache_value;\n-\tconst char *cache_str;\n };\n \n static struct sort_cmp_context static_node_cmp_context;\n@@ -168,19 +161,21 @@\n \treturn addr != NULL ? addr->mailbox : \"\";\n }\n \n-static const char *\n-sort_header_get(enum mail_sort_type sort_type, struct mail *mail, uint32_t seq)\n+static void\n+sort_header_get(string_t *dest, enum mail_sort_type sort_type,\n+\t\tstruct mail *mail, uint32_t seq)\n {\n \tconst char *str;\n-\tstring_t *buf;\n \n \tmail_set_seq(mail, seq);\n \tswitch (sort_type & MAIL_SORT_MASK) {\n \tcase MAIL_SORT_SUBJECT:\n \t\tif (mail_get_first_header(mail, \"Subject\", &str) <= 0)\n-\t\t\treturn \"\";\n-\t\treturn imap_get_base_subject_cased(pool_datastack_create(),\n-\t\t\t\t\t\t str, NULL);\n+\t\t\treturn;\n+\t\tstr = imap_get_base_subject_cased(pool_datastack_create(),\n+\t\t\t\t\t\t str, NULL);\n+\t\tstr_append(dest, str);\n+\t\treturn;\n \tcase MAIL_SORT_CC:\n \t\tstr = get_first_mailbox(mail, \"Cc\");\n \t\tbreak;\n@@ -194,9 +189,7 @@\n \t\ti_unreached();\n \t}\n \n-\tbuf = t_str_new(128);\n-\t(void)uni_utf8_to_decomposed_titlecase(str, (size_t)-1, buf);\n-\treturn str_c(buf);\n+\t(void)uni_utf8_to_decomposed_titlecase(str, (size_t)-1, dest);\n }\n \n static uint32_t sort_get_arrival(struct mail *mail)\n@@ -259,23 +252,19 @@\n \tcase MAIL_SORT_TO:\n \tcase MAIL_SORT_SUBJECT:\n \t\tT_FRAME_BEGIN {\n-\t\t\tconst char *str1, *str2;\n-\n-\t\t\tstr1 = n1->seq == ctx->cache_seq &&\n-\t\t\t\tctx->cache_type == sort_type ? ctx->cache_str :\n-\t\t\t\tsort_header_get(sort_type, ctx->mail, n1->seq);\n-\t\t\tstr2 = sort_header_get(sort_type, ctx->mail, n2->seq);\n-\n-\t\t\tret = strcmp(str1, str2);\n+\t\t\tstring_t *str1, *str2;\n+\n+\t\t\tstr1 = t_str_new(256);\n+\t\t\tstr2 = t_str_new(256);\n+\t\t\tsort_header_get(str1, sort_type, ctx->mail, n1->seq);\n+\t\t\tsort_header_get(str2, sort_type, ctx->mail, n2->seq);\n+\n+\t\t\tret = strcmp(str_c(str1), str_c(str2));\n \t\t} T_FRAME_END;\n \t\tbreak;\n \tcase MAIL_SORT_ARRIVAL:\n-\t\tif (n1->seq == ctx->cache_seq && ctx->cache_type == sort_type)\n-\t\t\ttime1 = ctx->cache_value;\n-\t\telse {\n-\t\t\tmail_set_seq(ctx->mail, n1->seq);\n-\t\t\ttime1 = sort_get_arrival(ctx->mail);\n-\t\t}\n+\t\tmail_set_seq(ctx->mail, n1->seq);\n+\t\ttime1 = sort_get_arrival(ctx->mail);\n \n \t\tmail_set_seq(ctx->mail, n2->seq);\n \t\ttime2 = sort_get_arrival(ctx->mail);\n@@ -284,12 +273,8 @@\n \t\t\t(time1 > time2 ? 1 : 0);\n \t\tbreak;\n \tcase MAIL_SORT_DATE:\n-\t\tif (n1->seq == ctx->cache_seq && ctx->cache_type == sort_type)\n-\t\t\ttime1 = ctx->cache_value;\n-\t\telse {\n-\t\t\tmail_set_seq(ctx->mail, n1->seq);\n-\t\t\ttime1 = sort_get_date(ctx->mail);\n-\t\t}\n+\t\tmail_set_seq(ctx->mail, n1->seq);\n+\t\ttime1 = sort_get_date(ctx->mail);\n \n \t\tmail_set_seq(ctx->mail, n2->seq);\n \t\ttime2 = sort_get_date(ctx->mail);\n@@ -298,12 +283,8 @@\n \t\t\t(time1 > time2 ? 1 : 0);\n \t\tbreak;\n \tcase MAIL_SORT_SIZE:\n-\t\tif (n1->seq == ctx->cache_seq && ctx->cache_type == sort_type)\n-\t\t\tsize1 = ctx->cache_value;\n-\t\telse {\n-\t\t\tmail_set_seq(ctx->mail, n1->seq);\n-\t\t\tsize1 = sort_get_size(ctx->mail);\n-\t\t}\n+\t\tmail_set_seq(ctx->mail, n1->seq);\n+\t\tsize1 = sort_get_size(ctx->mail);\n \n \t\tmail_set_seq(ctx->mail, n2->seq);\n \t\tsize2 = sort_get_size(ctx->mail);\n@@ -341,31 +322,24 @@\n \treturn sort_node_cmp_type(ctx, ctx->program->sort_program + 1, n1, n2);\n }\n \n-static int sort_node_cmp_no_sort_id(const void *p1, const void *p2)\n+static int sort_node_cmp_nozero_sort_id(const void *p1, const void *p2)\n {\n \tstruct sort_cmp_context *ctx = &static_node_cmp_context;\n-\n-\treturn sort_node_cmp_type(ctx, ctx->program->sort_program, p1, p2);\n-}\n-\n-static void\n-index_sort_save_ids(struct mail_search_sort_program *program,\n-\t\t uint32_t first_seq)\n-{\n-\tstruct index_transaction_context *t =\n-\t\t(struct index_transaction_context *)program->t;\n-\tconst struct mail_sort_node *nodes;\n-\tunsigned int i, count;\n-\n-\tnodes = array_get(&program->all_nodes, &count);\n-\tfor (i = 0; i < count; i++) {\n-\t\tif (nodes[i].seq < first_seq)\n-\t\t\tcontinue;\n-\n-\t\ti_assert(nodes[i].sort_id != 0);\n-\t\tmail_index_update_ext(t->trans, nodes[i].seq,\n-\t\t\t\t program->ext_id, &nodes[i].sort_id, NULL);\n-\t}\n+\tconst struct mail_sort_node *n1 = p1, *n2 = p2;\n+\tconst enum mail_sort_type *sort_program;\n+\n+\t\/* Use sort IDs only if both have them *\/\n+\tif (n1->sort_id != 0 && n2->sort_id != 0) {\n+\t\tif (n1->sort_id < n2->sort_id)\n+\t\t\treturn -1;\n+\t\tif (n1->sort_id > n2->sort_id)\n+\t\t\treturn 1;\n+\t\tsort_program = ctx->program->sort_program + 1;\n+\t} else {\n+\t\tsort_program = ctx->program->sort_program;\n+\t}\n+\n+\treturn sort_node_cmp_type(ctx, ctx->program->sort_program, n1, n2);\n }\n \n static bool\n@@ -375,19 +349,18 @@\n {\n \tstruct mail_sort_node *nodes;\n \tunsigned int i, count;\n-\tconst char *last_str = \"\";\n \tuint32_t prev_id = 0, last_id = (uint32_t)-1;\n-\tstring_t *prev_str;\n-\tconst char *str;\n+\tstring_t *last_str, *prev_str, *str;\n \tunsigned int skip;\n \n+\tlast_str = t_str_new(256);\n \tnodes = array_get_modifiable(&program->all_nodes, &count);\n \tif (nodes[idx2].sort_id != 0) {\n \t\ti_assert(idx1 != idx2);\n \t\tlast_id = nodes[idx2].sort_id;\n \n-\t\tlast_str = sort_header_get(program->sort_program[0], mail,\n-\t\t\t\t\t nodes[idx2].seq);\n+\t\tsort_header_get(last_str, program->sort_program[0], mail,\n+\t\t\t\tnodes[idx2].seq);\n \t\tidx2--;\n \t}\n \n@@ -395,19 +368,21 @@\n \tif (nodes[idx1].sort_id != 0) {\n \t\tprev_id = nodes[idx1].sort_id;\n \n-\t\tstr_append(prev_str,\n-\t\t\t sort_header_get(program->sort_program[0], mail,\n-\t\t\t\t\t nodes[idx1].seq));\n+\t\tsort_header_get(prev_str, program->sort_program[0], mail,\n+\t\t\t\tnodes[idx1].seq);\n \t\tidx1++;\n \t}\n \n+\tstr = str_new(default_pool, 256);\n \tfor (i = idx1; i <= idx2; i++) {\n-\t\tstr = sort_header_get(program->sort_program[0], mail,\n-\t\t\t\t nodes[i].seq);\n-\n-\t\tif (i == idx2 && strcmp(str, last_str) == 0)\n+\t\tT_FRAME(\n+\t\t\tsort_header_get(str, program->sort_program[0], mail,\n+\t\t\t\t\tnodes[i].seq);\n+\t\t);\n+\n+\t\tif (i == idx2 && str_equals(str, last_str))\n \t\t\tnodes[i].sort_id = last_id;\n-\t\telse if (strcmp(str, str_c(prev_str)) == 0 && prev_id != 0)\n+\t\telse if (prev_id != 0 && str_equals(str, prev_str) == 0)\n \t\t\tnodes[i].sort_id = prev_id;\n \t\telse {\n \t\t\t\/* divide the available space so that each message gets\n@@ -420,14 +395,16 @@\n \t\t\tif (nodes[i].sort_id == last_id) {\n \t\t\t\t\/* we ran out of ID space. have to renumber\n \t\t\t\t the IDs. *\/\n+\t\t\t\tstr_free(&str);\n \t\t\t\treturn FALSE;\n \t\t\t}\n \n \t\t\tprev_id = nodes[i].sort_id;\n \t\t\tstr_truncate(prev_str, 0);\n-\t\t\tstr_append(prev_str, str);\n+\t\t\tstr_append_str(prev_str, str);\n \t\t}\n \t}\n+\tstr_free(&str);\n \treturn TRUE;\n }\n \n@@ -516,7 +493,6 @@\n \t\t\t\t uint32_t last_seq)\n {\n \tstruct mail_sort_node node;\n-\tstruct mail *mail;\n \tuint32_t (*get_sort_id)(struct mail *);\n \n \tswitch (program->sort_program[0] & MAIL_SORT_MASK) {\n@@ -534,114 +510,77 @@\n \t}\n \n \t\/* add the missing nodes with their sort_ids *\/\n-\tmail = program->temp_mail;\n \tnode.seq = array_count(&program->all_nodes) + 1;\n \tfor (; node.seq <= last_seq; node.seq++) {\n-\t\tmail_set_seq(mail, node.seq);\n-\t\tnode.sort_id = get_sort_id(mail);\n+\t\tmail_set_seq(program->temp_mail, node.seq);\n+\t\tnode.sort_id = get_sort_id(program->temp_mail);\n+\n \t\ti_assert(node.sort_id != 0);\n \t\tarray_append(&program->all_nodes, &node, 1);\n \t}\n-\n-\t\/* @UNSAFE: and sort them *\/\n-\tmemset(&static_node_cmp_context, 0, sizeof(static_node_cmp_context));\n-\tstatic_node_cmp_context.program = program;\n-\tstatic_node_cmp_context.mail = mail;\n-\n-\tqsort(array_idx_modifiable(&program->all_nodes, 0), last_seq,\n-\t sizeof(struct mail_sort_node), sort_node_cmp);\n-}\n-\n-static void index_sort_cache_seq(struct sort_cmp_context *ctx,\n-\t\t\t\t enum mail_sort_type sort_type, uint32_t seq)\n-{\n-\tctx->cache_seq = seq;\n-\tctx->cache_type = sort_type & MAIL_SORT_MASK;\n-\n-\tmail_set_seq(ctx->mail, seq);\n-\tswitch (ctx->cache_type) {\n-\tcase MAIL_SORT_ARRIVAL:\n-\t\tctx->cache_value = sort_get_arrival(ctx->mail);\n-\t\tbreak;\n-\tcase MAIL_SORT_DATE:\n-\t\tctx->cache_value = sort_get_date(ctx->mail);\n-\t\tbreak;\n-\tcase MAIL_SORT_SIZE:\n-\t\tctx->cache_value = sort_get_size(ctx->mail);\n-\t\tbreak;\n-\tdefault:\n-\t\tctx->cache_str = sort_header_get(sort_type, ctx->mail, seq);\n-\t\tbreak;\n-\t}\n }\n \n static void index_sort_headers(struct mail_search_sort_program *program,\n \t\t\t uint32_t last_seq)\n {\n-\tstruct mail_sort_node *nodes, node;\n-\tconst struct mail_sort_node *cnodes;\n-\tunsigned int count, idx;\n-\n-\t\/* we wish to avoid reading the actual headers as much as possible.\n-\t first sort the nodes which already have sort_ids, then start\n-\t inserting the new nodes by finding their insertion position with\n-\t binary search *\/\n-\tmemset(&static_node_cmp_context, 0, sizeof(static_node_cmp_context));\n-\tstatic_node_cmp_context.program = program;\n-\tstatic_node_cmp_context.mail = program->temp_mail;\n-\n-\t\/* @UNSAFE *\/\n+\tARRAY_TYPE(mail_sort_node) seq_nodes_arr;\n+\tstruct mail_sort_node *nodes, node, *seq_nodes;\n+\tunsigned int i, count, count2;\n+\n+\t\/* insert missing nodes *\/\n+\tnode.seq = array_count(&program->all_nodes) + 1;\n+\tfor (; node.seq <= last_seq; node.seq++)\n+\t\tarray_append(&program->all_nodes, &node, 1);\n+\n+\t\/* sort everything. use sort_ids whenever possible *\/\n \tnodes = array_get_modifiable(&program->all_nodes, &count);\n-\tif (program->last_sorted_seq != count) {\n-\t\tqsort(nodes, count, sizeof(struct mail_sort_node),\n-\t\t sort_node_cmp);\n-\t}\n-\n-\tnode.sort_id = 0;\n-\tfor (node.seq = count + 1; node.seq <= last_seq; node.seq++) {\n-\t\tindex_sort_cache_seq(&static_node_cmp_context,\n-\t\t\t\t program->sort_program[0], node.seq);\n-\n-\t\tcnodes = array_get_modifiable(&program->all_nodes, &count);\n-\t\tbsearch_insert_pos(&node, cnodes, count, sizeof(*cnodes),\n-\t\t\t\t sort_node_cmp_no_sort_id,\n-\t\t\t\t &idx);\n-\t\tarray_insert(&program->all_nodes, idx, &node, 1);\n-\t}\n-\n+\ti_assert(count == last_seq);\n+\tqsort(nodes, count, sizeof(struct mail_sort_node),\n+\t sort_node_cmp_nozero_sort_id);\n+\n+\t\/* we can now build the sort_ids *\/\n \tindex_sort_add_ids(program, static_node_cmp_context.mail);\n-}\n-\n-static void index_sort_build(struct mail_search_sort_program *program,\n-\t\t\t uint32_t last_seq)\n-{\n-\tstruct index_mailbox *ibox = (struct index_mailbox *)program->t->box;\n-\tstruct mail_sort_node node;\n+\n+\t\/* @UNSAFE: and finally get the range sorted back by sequence *\/\n+\ti_array_init(&seq_nodes_arr, count);\n+\t(void)array_idx_modifiable(&seq_nodes_arr, count-1);\n+\tseq_nodes = array_get_modifiable(&seq_nodes_arr, &count2);\n+\ti_assert(count2 == count);\n+\tfor (i = 0; i < count; i++)\n+\t\tseq_nodes[nodes[i].seq-1] = nodes[i];\n+\n+\tarray_free(&program->all_nodes);\n+\tprogram->all_nodes = seq_nodes_arr;\n+}\n+\n+static void index_sort_build(struct mail_search_sort_program *program)\n+{\n+\tstruct index_transaction_context *t =\n+\t\t(struct index_transaction_context *)program->t;\n+\tstruct mail_sort_node node, *all_nodes, *nodes;\n \tconst void *data;\n-\tunsigned int i, first_missing_sort_id_seq;\n-\n-\ti = array_count(&program->all_nodes);\n-\tif (i == 0) {\n-\t\t\/* we're building the array from scratch. add here only the\n-\t\t messages that have sort_ids set. *\/\n-\t\tprogram->last_sorted_seq = 0;\n-\t\tfor (; i < last_seq; i++) {\n-\t\t\tnode.seq = i+1;\n-\n-\t\t\tmail_index_lookup_ext(ibox->view, i+1, program->ext_id,\n-\t\t\t\t\t &data, NULL);\n-\n-\t\t\tnode.sort_id = data == NULL ? 0 :\n-\t\t\t\t*(const uint32_t *)data;\n-\t\t\tif (node.sort_id == 0) {\n-\t\t\t\t\/* the rest don't have sort_ids either *\/\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tarray_append(&program->all_nodes, &node, 1);\n+\tuint32_t last_seq;\n+\tunsigned int seq, i, count, count2;\n+\n+\t\/* add messages that have sort_ids. they're always at the beginning\n+\t of the mailbox. *\/\n+\tlast_seq = mail_index_view_get_messages_count(t->ibox->view);\n+\ti_array_init(&program->all_nodes, last_seq);\n+\tfor (seq = 1; seq <= last_seq; seq++) {\n+\t\tnode.seq = seq;\n+\n+\t\tmail_index_lookup_ext(t->ibox->view, seq, program->ext_id,\n+\t\t\t\t &data, NULL);\n+\t\tnode.sort_id = data == NULL ? 0 : *(const uint32_t *)data;\n+\t\tif (node.sort_id == 0) {\n+\t\t\t\/* the rest don't have sort_ids either *\/\n+\t\t\tbreak;\n \t\t}\n-\t}\n-\tfirst_missing_sort_id_seq = i + 1;\n-\n+\t\tarray_append(&program->all_nodes, &node, 1);\n+\t}\n+\ti_assert(seq <= last_seq);\n+\n+\t\/* add the new sort_ids and sort them all *\/\n \tswitch (program->sort_program[0] & MAIL_SORT_MASK) {\n \tcase MAIL_SORT_ARRIVAL:\n \tcase MAIL_SORT_DATE:\n@@ -652,110 +591,66 @@\n \t\tindex_sort_headers(program, last_seq);\n \t\tbreak;\n \t}\n-\tindex_sort_save_ids(program, first_missing_sort_id_seq);\n-}\n-\n-static void index_sort_add_node(struct mail_search_sort_program *program,\n-\t\t\t\tconst struct mail_sort_node *node)\n-{\n-\tconst struct mail_sort_node *nodes;\n-\tunsigned int count, idx;\n+\n+\t\/* add the missing sort IDs to index. also update sort_id in\n+\t wanted nodes. *\/\n+\tall_nodes = array_get_modifiable(&program->all_nodes, &count);\n+\tnodes = array_get_modifiable(&program->nodes, &count2);\n+\ti = program->first_missing_sort_id_idx;\n+\ti_assert(nodes[i].seq <= seq);\n+\tfor (; seq <= count; seq++) {\n+\t\ti_assert(all_nodes[seq-1].seq == seq);\n+\t\ti_assert(all_nodes[seq-1].sort_id != 0);\n+\t\tif (nodes[i].seq == seq) {\n+\t\t\tnodes[i].sort_id = all_nodes[seq-1].sort_id;\n+\t\t\ti++;\n+\t\t}\n+\n+\t\tmail_index_update_ext(t->trans, seq, program->ext_id,\n+\t\t\t\t &all_nodes[seq-1].sort_id, NULL);\n+\t}\n+\tarray_free(&program->all_nodes);\n+}\n+\n+void index_sort_list_add(struct mail_search_sort_program *program,\n+\t\t\t struct mail *mail)\n+{\n+\tstruct index_transaction_context *t =\n+\t\t(struct index_transaction_context *)program->t;\n+\tconst void *data;\n+\tstruct mail_sort_node node;\n+\n+\ti_assert(mail->transaction == program->t);\n+\n+\tmail_index_lookup_ext(t->trans_view, mail->seq,\n+\t\t\t program->ext_id, &data, NULL);\n+\tnode.seq = mail->seq;\n+\tnode.sort_id = data == NULL ? 0 : *(const uint32_t *)data;\n+\n+\tif (node.sort_id == 0 && !program->missing_sort_ids) {\n+\t\tprogram->missing_sort_ids = TRUE;\n+\t\tprogram->first_missing_sort_id_idx =\n+\t\t\tarray_count(&program->nodes);\n+\t}\n+\tarray_append(&program->nodes, &node, 1);\n+}\n+\n+void index_sort_list_finish(struct mail_search_sort_program *program)\n+{\n+\tstruct mail_sort_node *nodes;\n \n \tmemset(&static_node_cmp_context, 0, sizeof(static_node_cmp_context));\n \tstatic_node_cmp_context.program = program;\n \tstatic_node_cmp_context.mail = program->temp_mail;\n \n-\tnodes = array_get(&program->nodes, &count);\n-\tbsearch_insert_pos(node, nodes, count,\n-\t\t\t sizeof(*node), sort_node_cmp,\n-\t\t\t &idx);\n-\tarray_insert(&program->nodes, idx, node, 1);\n-\n-\tprogram->last_sorted_seq = node->seq;\n-\tprogram->prev_seq = node->seq;\n-}\n-\n-void index_sort_list_add(struct mail_search_sort_program *program,\n-\t\t\t struct mail *mail)\n-{\n-\tstruct index_transaction_context *t =\n-\t\t(struct index_transaction_context *)program->t;\n-\tconst struct mail_index_header *hdr;\n-\tconst void *data;\n-\tstruct mail_sort_node node;\n-\tuint32_t last_seq;\n-\n-\ti_assert(mail->transaction == program->t);\n-\n-\tif (program->prev_seq + 1 != mail->seq)\n-\t\tprogram->skipped_mails = TRUE;\n-\n-\tnode.seq = mail->seq;\n-\tif (program->last_sorted_seq == program->prev_seq) {\n-\t\t\/* we're still on the fast path using sort_ids from the\n-\t\t index file *\/\n-\t\tmail_index_lookup_ext(t->trans_view, mail->seq,\n-\t\t\t\t program->ext_id, &data, NULL);\n-\t\tnode.sort_id = data == NULL ? 0 : *(const uint32_t *)data;\n-\t\tif (node.sort_id != 0) {\n-\t\t\tindex_sort_add_node(program, &node);\n-\t\t\treturn;\n-\t\t}\n-\t\ti_assert(!program->sort_ids_added);\n-\t} else {\n-\t\tnode.sort_id = 0;\n-\t}\n-\n-\t\/* sort_ids are missing, have to generate them *\/\n-\tif (!program->skipped_mails) {\n-\t\t\/* as long as we think we're returning all the mails sorted,\n-\t\t which is the common case, we want to avoid duplicating the\n-\t\t node array. so here we just keep counting the sequences\n-\t\t until either we skip a sequence or we reach list_finish() *\/\n-\t\tprogram->prev_seq = mail->seq;\n-\t\treturn;\n-\t}\n-\n-\t\/* we're not returning all the mails. have to create a temporary array\n-\t for all the nodes so we can set all the missing sort_ids. *\/\n-\thdr = mail_index_get_header(t->ibox->view);\n-\ti_array_init(&program->all_nodes, hdr->messages_count);\n-\tindex_sort_build(program, hdr->messages_count);\n-\tarray_free(&program->all_nodes);\n-\n-\t\/* add the nodes in the middle *\/\n-\tnode.seq = program->last_sorted_seq + 1;\n-\tlast_seq = program->prev_seq;\n-\tfor (; node.seq <= last_seq; node.seq++) {\n-\t\tmail_index_lookup_ext(t->trans_view, mail->seq, program->ext_id,\n-\t\t\t\t &data, NULL);\n-\n-\t\tnode.sort_id = *(const uint32_t *)data;\n-\t\ti_assert(node.sort_id != 0);\n-\n-\t\tindex_sort_add_node(program, &node);\n-\t}\n-\n-\t\/* and add this last node *\/\n-\tprogram->sort_ids_added = TRUE;\n-\tindex_sort_list_add(program, mail);\n-}\n-\n-void index_sort_list_finish(struct mail_search_sort_program *program)\n-{\n-\tif (program->last_sorted_seq != program->prev_seq) {\n-\t\t\/* nodes array contains a contiguous range of sequences from\n-\t\t the beginning, with the last ones missing sort_id. we can\n-\t\t just sort the array directly without copying it. *\/\n-\t\ti_assert(!program->sort_ids_added);\n-\n-\t\tprogram->all_nodes = program->nodes;\n-\t\tindex_sort_build(program, program->prev_seq);\n-\t}\n-\n-\tprogram->nodes_ptr =\n-\t\tarray_get(&program->nodes, &program->nodes_count);\n-\n+\tif (program->missing_sort_ids)\n+\t\tindex_sort_build(program);\n+\n+\tnodes = array_get_modifiable(&program->nodes, &program->nodes_count);\n+\tqsort(nodes, program->nodes_count, sizeof(struct mail_sort_node),\n+\t sort_node_cmp);\n+\n+\tprogram->nodes_ptr = nodes;\n \tif (program->reverse)\n \t\tprogram->iter_idx = program->nodes_count;\n }\n"} {"commit":"2d5035b650bd90dc66699d278e312e7740613b8c","subject":"more formatting fixes after filter commit.","message":"more formatting fixes after filter commit.\n\n\n\ngit-svn-id: 24a995eca3b83137dd7eab3408044d7832e202f7@58748 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"antognolli\/Evas,antognolli\/Evas,antognolli\/Evas,antognolli\/Evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/canvas\/evas_object_image.c\n+++ src\/lib\/canvas\/evas_object_image.c\n@@ -2402,12 +2402,6 @@\n obj->layer->evas->engine.func->context_render_op_set(output, context,\n \t\t\t\t\t\t\tobj->cur.render_op);\n \n- if (0)\n- printf(\"Proxy: %p Source: %p Surface %p Redraw %s Type %s\/%s %p %d %d\\n\",\n- obj, o->cur.source,o->cur.source->proxy.surface,\n- o->cur.source->proxy.redraw?\"yep \":\"nope\",o->cur.source->type,\n- o_type,obj->cur.map,obj->cur.map->count, obj->cur.usemap);\n-\n if (!o->cur.source)\n {\n pixels = o->engine_data;\n@@ -2455,22 +2449,23 @@\n key = evas_filter_key_get(obj->filter, &len);\n obj->filter->key = key;\n obj->filter->len = len;\n- fi = obj->layer->evas->engine.func->image_filtered_get(\n- o->engine_data, key, len);\n+ fi = obj->layer->evas->engine.func->image_filtered_get\n+ (o->engine_data, key, len);\n if (obj->filter->cached && fi != obj->filter->cached)\n {\n- obj->layer->evas->engine.func->image_filtered_free(\n- o->engine_data, obj->filter->cached);\n+ obj->layer->evas->engine.func->image_filtered_free\n+ (o->engine_data, obj->filter->cached);\n obj->filter->cached = NULL;\n }\n }\n else if (obj->filter->cached)\n {\n- obj->layer->evas->engine.func->image_filtered_free(\n- o->engine_data, obj->filter->cached);\n+ obj->layer->evas->engine.func->image_filtered_free\n+ (o->engine_data, obj->filter->cached);\n }\n if (!fi)\n- fi = image_filter_update(obj->layer->evas, obj, pixels, imagew, imageh, &imagew, &imageh);\n+ fi = image_filter_update(obj->layer->evas, obj, pixels, \n+ imagew, imageh, &imagew, &imageh);\n pixels = fi->image;\n obj->filter->dirty = 0;\n obj->filter->cached = fi;\n@@ -2492,7 +2487,9 @@\n \t if (o->func.get_pixels)\n \t {\n \t\t o->func.get_pixels(o->func.get_pixels_data, obj);\n-\t\t o->engine_data = obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output, o->engine_data, 0, 0, o->cur.image.w, o->cur.image.h);\n+\t\t o->engine_data = obj->layer->evas->engine.func->image_dirty_region\n+ (obj->layer->evas->engine.data.output, o->engine_data,\n+ 0, 0, o->cur.image.w, o->cur.image.h);\n \t }\n \t o->dirty_pixels = 0;\n \t }\n@@ -2544,8 +2541,8 @@\n * (which is returned)it may be a new object, however exactly 0\n * of all the evas engines do this. *\/\n obj->layer->evas->engine.func->image_border_set(output, pixels,\n- o->cur.border.l, o->cur.border.r,\n- o->cur.border.t, o->cur.border.b);\n+ o->cur.border.l, o->cur.border.r,\n+ o->cur.border.t, o->cur.border.b);\n idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x, o->cur.fill.w, &idw);\n idy = evas_object_image_figure_y_fill(obj, o->cur.fill.y, o->cur.fill.h, &idh);\n if (idw < 1) idw = 1;\n"} {"commit":"3181782b157d276939b7305abcbb8b7d723adbc6","subject":"Cast sanity check in debug mode","message":"Cast sanity check in debug mode\n","repos":"adraghici\/marble,quannt24\/marble,utkuaydin\/marble,Earthwings\/marble,utkuaydin\/marble,AndreiDuma\/marble,AndreiDuma\/marble,tzapzoor\/marble,adraghici\/marble,quannt24\/marble,Earthwings\/marble,Earthwings\/marble,probonopd\/marble,utkuaydin\/marble,probonopd\/marble,adraghici\/marble,rku\/marble,tucnak\/marble,David-Gil\/marble-dev,Earthwings\/marble,Earthwings\/marble,adraghici\/marble,rku\/marble,David-Gil\/marble-dev,probonopd\/marble,tzapzoor\/marble,tucnak\/marble,Earthwings\/marble,David-Gil\/marble-dev,probonopd\/marble,quannt24\/marble,probonopd\/marble,AndreiDuma\/marble,adraghici\/marble,probonopd\/marble,tzapzoor\/marble,tzapzoor\/marble,quannt24\/marble,tucnak\/marble,tucnak\/marble,AndreiDuma\/marble,rku\/marble,AndreiDuma\/marble,tucnak\/marble,quannt24\/marble,tucnak\/marble,David-Gil\/marble-dev,AndreiDuma\/marble,probonopd\/marble,utkuaydin\/marble,rku\/marble,rku\/marble,tzapzoor\/marble,tzapzoor\/marble,rku\/marble,quannt24\/marble,utkuaydin\/marble,David-Gil\/marble-dev,tucnak\/marble,tzapzoor\/marble,David-Gil\/marble-dev,tzapzoor\/marble,adraghici\/marble,quannt24\/marble,utkuaydin\/marble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/geodata\/parser\/GeoParser.h\n+++ src\/lib\/geodata\/parser\/GeoParser.h\n@@ -119,6 +119,7 @@\n template\n T* nodeAs()\n {\n+ Q_ASSERT( dynamic_cast( m_node ) != 0 );\n return static_cast(m_node);\n }\n \n"} {"commit":"b84296491d04294908e767250dca93db47691c29","subject":"Optimize the request of input handling","message":"Optimize the request of input handling\n","repos":"turran\/egueb,turran\/egueb,turran\/egueb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/svg\/egueb_svg_renderable.c\n+++ src\/lib\/svg\/egueb_svg_renderable.c\n@@ -30,179 +30,30 @@\n \/*============================================================================*\n * Local *\n *============================================================================*\/\n-\/*----------------------------------------------------------------------------*\n- * Event handlers *\n- *----------------------------------------------------------------------------*\/\n-\/* Whenever a node has been inserted into the document, request the painter *\/\n-static void _egueb_svg_renderable_inserted_cb(Egueb_Dom_Event *e,\n-\t\tvoid *data)\n-{\n-\tEgueb_Dom_Event_Phase phase;\n-\tEgueb_Dom_Node *n = data;\n-\tEgueb_Dom_Event *request;\n-\n-\tphase = egueb_dom_event_phase_get(e);\n-\tif (phase != EGUEB_DOM_EVENT_PHASE_AT_TARGET)\n-\t\treturn;\n-\n-\tINFO_ELEMENT(n, \"Renderable inserted into document, requesting a painter\");\n-\trequest = egueb_svg_event_request_painter_new();\n-\tegueb_dom_node_event_dispatch(n, egueb_dom_event_ref(request), NULL, NULL);\n-\n-\tegueb_svg_renderable_painter_set(n,\n-\t\t\tegueb_svg_event_request_painter_painter_get(request));\n-\tegueb_dom_event_unref(request);\n-}\n-\n-\/* Whenever a node has been removed from the document, remove the painter\n- *\/\n-static void _egueb_svg_renderable_removed_cb(Egueb_Dom_Event *e,\n-\t\tvoid *data)\n-{\n-\tEgueb_Svg_Renderable *thiz;\n-\tEgueb_Dom_Event_Phase phase;\n-\tEgueb_Dom_Node *n = data;\n-\n-\tphase = egueb_dom_event_phase_get(e);\n-\tif (phase != EGUEB_DOM_EVENT_PHASE_AT_TARGET)\n-\t\treturn;\n-\tINFO_ELEMENT(n, \"Renderable removed from document\");\n-\tthiz = EGUEB_SVG_RENDERABLE(n);\n-\tif (thiz->painter)\n-\t{\n-\t\tegueb_svg_painter_unref(thiz->painter);\n-\t\tthiz->painter = NULL;\n-\t}\n-}\n-\/*----------------------------------------------------------------------------*\n- * Element interface *\n- *----------------------------------------------------------------------------*\/\n-static Eina_Bool _egueb_svg_renderable_process(Egueb_Svg_Element *e)\n-{\n-\tEgueb_Svg_Renderable *thiz;\n-\tEgueb_Svg_Renderable_Class *klass;\n-\tEgueb_Svg_Clip_Path clip_path = EGUEB_SVG_CLIP_PATH_INIT;\n-\tEgueb_Svg_Matrix m;\n-\tEgueb_Svg_Painter *painter;\n-\tEgueb_Dom_Node *relative;\n-\tEgueb_Dom_Input *input;\n+static void _egueb_svg_renderable_check_new_bounds(Egueb_Svg_Renderable *thiz)\n+{\n+\tEgueb_Svg_Pointer_Events pevents;\n+\tEgueb_Svg_Element *e;\n \tEgueb_Dom_Node *doc;\n \tEgueb_Dom_Node *topmost;\n-\tEnesim_Renderer *ren = NULL;\n-\n-\tthiz = EGUEB_SVG_RENDERABLE(e);\n-\tklass = EGUEB_SVG_RENDERABLE_CLASS_GET(e);\n-\n-\t\/* set the new transformation *\/\n-\trelative = egueb_svg_element_geometry_relative_get(EGUEB_DOM_NODE(e));\n-\tif (relative)\n-\t{\n-\t\tEgueb_Svg_Element *e_parent;\n-\n-\t\te_parent = EGUEB_SVG_ELEMENT(relative);\n-\t\tegueb_dom_attr_final_get(thiz->transform, &m);\n-\t\tenesim_matrix_compose(&e_parent->transform, &m, &e->transform);\n-\t\tegueb_dom_node_unref(relative);\n-\t}\n-\t\/* TODO in case there is no relative, set our own transform *\/\n-\n-\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"New transformation %\" ENESIM_MATRIX_FORMAT, ENESIM_MATRIX_ARGS(&e->transform));\n-\n-\t\/* first process the renderable itself *\/\n-\tif (klass->process)\n-\t{\n-\t\tif (!klass->process(thiz))\n-\t\t{\n-\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Process failed\");\n-\t\t\treturn EINA_FALSE;\n-\t\t}\n-\t}\n-\n-\t\/* propagate the presentation attributes *\/\n-\t\/* resolve the painter based on the presentation attributes *\/\n-\tpainter = egueb_svg_painter_ref(thiz->painter);\n-\tif (!painter)\n-\t{\n-\t\tdoc = egueb_dom_node_owner_document_get(EGUEB_DOM_NODE(e));\n-\t\tif (!doc)\n-\t\t{\n-\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No document available\");\n-\t\t\treturn EINA_FALSE;\n-\t\t}\n-\t\ttopmost = egueb_dom_document_document_element_get(doc);\n-\t\tegueb_dom_node_unref(doc);\n-\n-\t\t\/* The only special case is the topmost svg element *\/\n-\t\tif (topmost == EGUEB_DOM_NODE(e))\n-\t\t{\n-\t\t\tpainter = egueb_svg_renderable_class_painter_get(EGUEB_DOM_NODE(e));\n-\t\t\tif (!painter)\n-\t\t\t{\n-\t\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Topmost element does not have a painter\");\n-\t\t\t\tegueb_dom_node_unref(topmost);\n-\t\t\t}\n-\t\t\tegueb_dom_node_unref(topmost);\n-\t\t}\n-\t\telse\n-\t\t{\n-\t\t\tegueb_dom_node_unref(topmost);\n-\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No painter available\");\n-\t\t}\n-\t}\n-\n-\tif (painter)\n-\t{\n-\t\tif (!egueb_svg_painter_resolve(painter, e))\n-\t\t{\n-\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Painter resolving failed\");\n-\t\t\tegueb_svg_painter_unref(painter);\n-\t\t\treturn EINA_FALSE;\n-\t\t}\n-\t\t\/* finally call the renderer propagate implementation *\/\n-\t\tif (klass->painter_apply)\n-\t\t\tklass->painter_apply(thiz, painter);\n-\t\tegueb_svg_painter_unref(painter);\n-\t}\n-\n-\t\/* now resolve the clip path *\/\n-\tegueb_svg_element_clip_path_final_get(EGUEB_DOM_NODE(e), &clip_path);\n-\tegueb_svg_element_clip_path_resolve(EGUEB_DOM_NODE(e), &clip_path,\n-\t\t\t&thiz->clip_path_last, &thiz->clip_path);\n-\tegueb_svg_clip_path_reset(&clip_path);\n-\n-\tif (thiz->clip_path)\n-\t\tegueb_svg_reference_clip_path_renderer_get(thiz->clip_path, &ren);\n-\n-\t\/* set the correct renderer on the proxy *\/\n-\tif (ren)\n-\t{\n-\t\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"Clip path: %s\", enesim_renderer_name_get(ren));\n-\t}\n-\telse\n-\t{\n-\t\tif (klass->renderer_get)\n-\t\t\tren = klass->renderer_get(thiz);\n-\t\tif (!ren)\n-\t\t{\n-\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No renderer found\");\n-\t\t\treturn EINA_FALSE;\n-\t\t}\n-\t\telse\n-\t\t{\n-\t\t\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"Renderer: %s\", enesim_renderer_name_get(ren));\n-\t\t}\n-\t}\n-\tenesim_renderer_proxy_proxied_set(thiz->proxy, ren);\n+\n+\te = EGUEB_SVG_ELEMENT(thiz);\n+\t\/* do not inform about a geometry change if we can not handle the input *\/\n+\tegueb_dom_attr_final_get(e->pointer_events, &pevents);\n+\tif (pevents == EGUEB_SVG_POINTER_EVENTS_NONE)\n+\t\treturn;\n+\n \t\/* get the previous\/current bounds, if it is now inside the mouse, make sure\n \t * to inform about it\n \t *\/\n-\tdoc = egueb_dom_node_owner_document_get(EGUEB_DOM_NODE(e));\n+\tdoc = egueb_dom_node_owner_document_get(EGUEB_DOM_NODE(thiz));\n \tif (doc)\n \t{\n \t\ttopmost = egueb_dom_document_document_element_get(doc);\n \t\tif (topmost)\n \t\t{\n \t\t\tEina_Rectangle bounds;\n+\t\t\tEgueb_Dom_Input *input;\n \n \t\t\t\/* only notify the input in case the bounds are different *\/\n \t\t\tenesim_renderer_destination_bounds_get(thiz->proxy, &bounds, 0, 0, NULL);\n@@ -232,6 +83,170 @@\n \t\t}\n \t\tegueb_dom_node_unref(doc);\n \t}\n+}\n+\/*----------------------------------------------------------------------------*\n+ * Event handlers *\n+ *----------------------------------------------------------------------------*\/\n+\/* Whenever a node has been inserted into the document, request the painter *\/\n+static void _egueb_svg_renderable_inserted_cb(Egueb_Dom_Event *e,\n+\t\tvoid *data)\n+{\n+\tEgueb_Dom_Event_Phase phase;\n+\tEgueb_Dom_Node *n = data;\n+\tEgueb_Dom_Event *request;\n+\n+\tphase = egueb_dom_event_phase_get(e);\n+\tif (phase != EGUEB_DOM_EVENT_PHASE_AT_TARGET)\n+\t\treturn;\n+\n+\tINFO_ELEMENT(n, \"Renderable inserted into document, requesting a painter\");\n+\trequest = egueb_svg_event_request_painter_new();\n+\tegueb_dom_node_event_dispatch(n, egueb_dom_event_ref(request), NULL, NULL);\n+\n+\tegueb_svg_renderable_painter_set(n,\n+\t\t\tegueb_svg_event_request_painter_painter_get(request));\n+\tegueb_dom_event_unref(request);\n+}\n+\n+\/* Whenever a node has been removed from the document, remove the painter\n+ *\/\n+static void _egueb_svg_renderable_removed_cb(Egueb_Dom_Event *e,\n+\t\tvoid *data)\n+{\n+\tEgueb_Svg_Renderable *thiz;\n+\tEgueb_Dom_Event_Phase phase;\n+\tEgueb_Dom_Node *n = data;\n+\n+\tphase = egueb_dom_event_phase_get(e);\n+\tif (phase != EGUEB_DOM_EVENT_PHASE_AT_TARGET)\n+\t\treturn;\n+\tINFO_ELEMENT(n, \"Renderable removed from document\");\n+\tthiz = EGUEB_SVG_RENDERABLE(n);\n+\tif (thiz->painter)\n+\t{\n+\t\tegueb_svg_painter_unref(thiz->painter);\n+\t\tthiz->painter = NULL;\n+\t}\n+}\n+\/*----------------------------------------------------------------------------*\n+ * Element interface *\n+ *----------------------------------------------------------------------------*\/\n+static Eina_Bool _egueb_svg_renderable_process(Egueb_Svg_Element *e)\n+{\n+\tEgueb_Svg_Renderable *thiz;\n+\tEgueb_Svg_Renderable_Class *klass;\n+\tEgueb_Svg_Clip_Path clip_path = EGUEB_SVG_CLIP_PATH_INIT;\n+\tEgueb_Svg_Matrix m;\n+\tEgueb_Svg_Painter *painter;\n+\tEgueb_Dom_Node *relative;\n+\tEgueb_Dom_Node *doc;\n+\tEgueb_Dom_Node *topmost;\n+\tEnesim_Renderer *ren = NULL;\n+\n+\tthiz = EGUEB_SVG_RENDERABLE(e);\n+\tklass = EGUEB_SVG_RENDERABLE_CLASS_GET(e);\n+\n+\t\/* set the new transformation *\/\n+\trelative = egueb_svg_element_geometry_relative_get(EGUEB_DOM_NODE(e));\n+\tif (relative)\n+\t{\n+\t\tEgueb_Svg_Element *e_parent;\n+\n+\t\te_parent = EGUEB_SVG_ELEMENT(relative);\n+\t\tegueb_dom_attr_final_get(thiz->transform, &m);\n+\t\tenesim_matrix_compose(&e_parent->transform, &m, &e->transform);\n+\t\tegueb_dom_node_unref(relative);\n+\t}\n+\t\/* TODO in case there is no relative, set our own transform *\/\n+\n+\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"New transformation %\" ENESIM_MATRIX_FORMAT, ENESIM_MATRIX_ARGS(&e->transform));\n+\n+\t\/* first process the renderable itself *\/\n+\tif (klass->process)\n+\t{\n+\t\tif (!klass->process(thiz))\n+\t\t{\n+\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Process failed\");\n+\t\t\treturn EINA_FALSE;\n+\t\t}\n+\t}\n+\n+\t\/* propagate the presentation attributes *\/\n+\t\/* resolve the painter based on the presentation attributes *\/\n+\tpainter = egueb_svg_painter_ref(thiz->painter);\n+\tif (!painter)\n+\t{\n+\t\tdoc = egueb_dom_node_owner_document_get(EGUEB_DOM_NODE(e));\n+\t\tif (!doc)\n+\t\t{\n+\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No document available\");\n+\t\t\treturn EINA_FALSE;\n+\t\t}\n+\t\ttopmost = egueb_dom_document_document_element_get(doc);\n+\t\tegueb_dom_node_unref(doc);\n+\n+\t\t\/* The only special case is the topmost svg element *\/\n+\t\tif (topmost == EGUEB_DOM_NODE(e))\n+\t\t{\n+\t\t\tpainter = egueb_svg_renderable_class_painter_get(EGUEB_DOM_NODE(e));\n+\t\t\tif (!painter)\n+\t\t\t{\n+\t\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Topmost element does not have a painter\");\n+\t\t\t\tegueb_dom_node_unref(topmost);\n+\t\t\t}\n+\t\t\tegueb_dom_node_unref(topmost);\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\tegueb_dom_node_unref(topmost);\n+\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No painter available\");\n+\t\t}\n+\t}\n+\n+\tif (painter)\n+\t{\n+\t\tif (!egueb_svg_painter_resolve(painter, e))\n+\t\t{\n+\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"Painter resolving failed\");\n+\t\t\tegueb_svg_painter_unref(painter);\n+\t\t\treturn EINA_FALSE;\n+\t\t}\n+\t\t\/* finally call the renderer propagate implementation *\/\n+\t\tif (klass->painter_apply)\n+\t\t\tklass->painter_apply(thiz, painter);\n+\t\tegueb_svg_painter_unref(painter);\n+\t}\n+\n+\t\/* now resolve the clip path *\/\n+\tegueb_svg_element_clip_path_final_get(EGUEB_DOM_NODE(e), &clip_path);\n+\tegueb_svg_element_clip_path_resolve(EGUEB_DOM_NODE(e), &clip_path,\n+\t\t\t&thiz->clip_path_last, &thiz->clip_path);\n+\tegueb_svg_clip_path_reset(&clip_path);\n+\n+\tif (thiz->clip_path)\n+\t\tegueb_svg_reference_clip_path_renderer_get(thiz->clip_path, &ren);\n+\n+\t\/* set the correct renderer on the proxy *\/\n+\tif (ren)\n+\t{\n+\t\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"Clip path: %s\", enesim_renderer_name_get(ren));\n+\t}\n+\telse\n+\t{\n+\t\tif (klass->renderer_get)\n+\t\t\tren = klass->renderer_get(thiz);\n+\t\tif (!ren)\n+\t\t{\n+\t\t\tWARN_ELEMENT(EGUEB_DOM_NODE(e), \"No renderer found\");\n+\t\t\treturn EINA_FALSE;\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\tDBG_ELEMENT(EGUEB_DOM_NODE(e), \"Renderer: %s\", enesim_renderer_name_get(ren));\n+\t\t}\n+\t}\n+\tenesim_renderer_proxy_proxied_set(thiz->proxy, ren);\n+\t_egueb_svg_renderable_check_new_bounds(thiz);\n \treturn EINA_TRUE;\n }\n \/*----------------------------------------------------------------------------*\n"} {"commit":"9bb59511ae70b325d6d693f64bda976aed19e2e1","subject":"lib\/commit: Refactor file commits to separate subdir from content","message":"lib\/commit: Refactor file commits to separate subdir from content\n\nOne major thing we can do to speed up local commits is multithreading. In\npreparation for that, split up the recursion function so that the subdirectory\ncase is separate from the content (regfile\/symlink) case. Then for non-subdirs,\nwe can easily peel off worker threads and gather the final checksums and update\nthe mtree from the main thread.\n\nThe diff here looks large but it's pretty straightforward; amazingly this change\ncompiled the very first time I tried it!\n\nCloses: #1365\nApproved by: jlebon\n","repos":"GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libostree\/ostree-repo-commit.c\n+++ src\/libostree\/ostree-repo-commit.c\n@@ -2833,12 +2833,112 @@\n WRITE_DIR_CONTENT_FLAGS_CAN_ADOPT = 1,\n } WriteDirContentFlags;\n \n-\/* Given either a dir_enum or a dfd_iter, writes the directory entry to the mtree. For\n- * subdirs, we go back through either write_dfd_iter_to_mtree_internal (dfd_iter case) or\n- * write_directory_to_mtree_internal (dir_enum case) which will do the actual dirmeta +\n- * dirent iteration. *\/\n+\/* Given either a dir_enum or a dfd_iter, writes the directory entry (which is\n+ * itself a directory) to the mtree. For subdirs, we go back through either\n+ * write_dfd_iter_to_mtree_internal (dfd_iter case) or\n+ * write_directory_to_mtree_internal (dir_enum case) which will do the actual\n+ * dirmeta + dirent iteration. *\/\n static gboolean\n-write_directory_content_to_mtree_internal (OstreeRepo *self,\n+write_dir_entry_to_mtree_internal (OstreeRepo *self,\n+ OstreeRepoFile *repo_dir,\n+ GFileEnumerator *dir_enum,\n+ GLnxDirFdIterator *dfd_iter,\n+ WriteDirContentFlags writeflags,\n+ GFileInfo *child_info,\n+ OstreeMutableTree *mtree,\n+ OstreeRepoCommitModifier *modifier,\n+ GPtrArray *path,\n+ GCancellable *cancellable,\n+ GError **error)\n+{\n+ g_assert (dir_enum != NULL || dfd_iter != NULL);\n+ g_assert (g_file_info_get_file_type (child_info) == G_FILE_TYPE_DIRECTORY);\n+\n+ const char *name = g_file_info_get_name (child_info);\n+\n+ \/* We currently only honor the CONSUME flag in the dfd_iter case to avoid even\n+ * more complexity in this function, and it'd mostly only be useful when\n+ * operating on local filesystems anyways.\n+ *\/\n+ const gboolean delete_after_commit = dfd_iter && modifier &&\n+ (modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME);\n+\n+ \/* Build the full path which we need for callbacks *\/\n+ g_ptr_array_add (path, (char*)name);\n+ g_autofree char *child_relpath = ptrarray_path_join (path);\n+\n+ \/* Call the filter *\/\n+ g_autoptr(GFileInfo) modified_info = NULL;\n+ OstreeRepoCommitFilterResult filter_result =\n+ _ostree_repo_commit_modifier_apply (self, modifier, child_relpath, child_info, &modified_info);\n+\n+ if (filter_result != OSTREE_REPO_COMMIT_FILTER_ALLOW)\n+ {\n+ g_ptr_array_remove_index (path, path->len - 1);\n+ if (delete_after_commit)\n+ {\n+ g_assert (dfd_iter);\n+ if (!glnx_shutil_rm_rf_at (dfd_iter->fd, name, cancellable, error))\n+ return FALSE;\n+ }\n+ \/* Note: early return *\/\n+ return TRUE;\n+ }\n+\n+ g_autoptr(GFile) child = NULL;\n+ if (dir_enum != NULL)\n+ child = g_file_enumerator_get_child (dir_enum, child_info);\n+\n+ g_autoptr(OstreeMutableTree) child_mtree = NULL;\n+ if (!ostree_mutable_tree_ensure_dir (mtree, name, &child_mtree, error))\n+ return FALSE;\n+\n+ \/* Finally, recurse on the dir *\/\n+ if (dir_enum != NULL)\n+ {\n+ if (!write_directory_to_mtree_internal (self, child, child_mtree,\n+ modifier, path,\n+ cancellable, error))\n+ return FALSE;\n+ }\n+ else if (repo_dir)\n+ {\n+ g_assert (dir_enum != NULL);\n+ g_debug (\"Adding: %s\", gs_file_get_path_cached (child));\n+ if (!ostree_mutable_tree_replace_file (mtree, name,\n+ ostree_repo_file_get_checksum ((OstreeRepoFile*) child),\n+ error))\n+ return FALSE;\n+ }\n+ else\n+ {\n+ g_auto(GLnxDirFdIterator) child_dfd_iter = { 0, };\n+\n+ if (!glnx_dirfd_iterator_init_at (dfd_iter->fd, name, FALSE, &child_dfd_iter, error))\n+ return FALSE;\n+\n+ if (!write_dfd_iter_to_mtree_internal (self, &child_dfd_iter, child_mtree,\n+ modifier, path,\n+ cancellable, error))\n+ return FALSE;\n+\n+ if (delete_after_commit)\n+ {\n+ if (!glnx_unlinkat (dfd_iter->fd, name, AT_REMOVEDIR, error))\n+ return FALSE;\n+ }\n+ }\n+\n+ g_ptr_array_remove_index (path, path->len - 1);\n+\n+ return TRUE;\n+}\n+\n+\/* Given either a dir_enum or a dfd_iter, writes a non-dir (regfile\/symlink) to\n+ * the mtree.\n+ *\/\n+static gboolean\n+write_content_to_mtree_internal (OstreeRepo *self,\n OstreeRepoFile *repo_dir,\n GFileEnumerator *dir_enum,\n GLnxDirFdIterator *dfd_iter,\n@@ -2871,7 +2971,7 @@\n \n \/* See if we have a devino hit; this is used below in a few places. *\/\n const char *loose_checksum = NULL;\n- if (dfd_iter != NULL && (file_type != G_FILE_TYPE_DIRECTORY))\n+ if (dfd_iter != NULL)\n {\n guint32 dev = g_file_info_get_attribute_uint32 (child_info, \"unix::device\");\n guint64 inode = g_file_info_get_attribute_uint64 (child_info, \"unix::inode\");\n@@ -2933,7 +3033,6 @@\n \n switch (file_type)\n {\n- case G_FILE_TYPE_DIRECTORY:\n case G_FILE_TYPE_SYMBOLIC_LINK:\n case G_FILE_TYPE_REGULAR:\n break;\n@@ -2945,182 +3044,139 @@\n if (dir_enum != NULL)\n child = g_file_enumerator_get_child (dir_enum, child_info);\n \n- if (file_type == G_FILE_TYPE_DIRECTORY)\n- {\n- g_autoptr(OstreeMutableTree) child_mtree = NULL;\n- if (!ostree_mutable_tree_ensure_dir (mtree, name, &child_mtree, error))\n- return FALSE;\n-\n- if (dir_enum != NULL)\n- {\n- if (!write_directory_to_mtree_internal (self, child, child_mtree,\n- modifier, path,\n- cancellable, error))\n- return FALSE;\n- }\n+ \/* Our filters have passed, etc.; now we prepare to write the content object *\/\n+ glnx_autofd int file_input_fd = -1;\n+\n+ \/* Open the file now, since it's better for reading xattrs\n+ * rather than using the \/proc\/self\/fd links.\n+ *\n+ * TODO: Do this lazily, since for e.g. bare-user-only repos\n+ * we don't have xattrs and don't need to open every file\n+ * for things that have devino cache hits.\n+ *\/\n+ if (file_type == G_FILE_TYPE_REGULAR && dfd_iter != NULL)\n+ {\n+ if (!glnx_openat_rdonly (dfd_iter->fd, name, FALSE, &file_input_fd, error))\n+ return FALSE;\n+ }\n+\n+ g_autoptr(GVariant) xattrs = NULL;\n+ gboolean xattrs_were_modified;\n+ if (dir_enum != NULL)\n+ {\n+ if (!get_final_xattrs (self, modifier, child_relpath, child_info, child,\n+ -1, name, source_xattrs, &xattrs, &xattrs_were_modified,\n+ cancellable, error))\n+ return FALSE;\n+ }\n+ else\n+ {\n+ \/* These contortions are basically so we use glnx_fd_get_all_xattrs()\n+ * for regfiles, and glnx_dfd_name_get_all_xattrs() for symlinks.\n+ *\/\n+ int xattr_fd_arg = (file_input_fd != -1) ? file_input_fd : dfd_iter->fd;\n+ const char *xattr_path_arg = (file_input_fd != -1) ? NULL : name;\n+ if (!get_final_xattrs (self, modifier, child_relpath, child_info, child,\n+ xattr_fd_arg, xattr_path_arg, source_xattrs,\n+ &xattrs, &xattrs_were_modified,\n+ cancellable, error))\n+ return FALSE;\n+ }\n+\n+ \/* Used below to see whether we can do a fast path commit *\/\n+ const gboolean modified_file_meta = child_info_was_modified || xattrs_were_modified;\n+\n+ \/* A big prerequisite list of conditions for whether or not we can\n+ * \"adopt\", i.e. just checksum and rename() into place\n+ *\/\n+ const gboolean can_adopt_basic =\n+ file_type == G_FILE_TYPE_REGULAR\n+ && dfd_iter != NULL\n+ && delete_after_commit\n+ && ((writeflags & WRITE_DIR_CONTENT_FLAGS_CAN_ADOPT) > 0);\n+ gboolean can_adopt = can_adopt_basic;\n+ \/* If basic prerquisites are met, check repo mode specific ones *\/\n+ if (can_adopt)\n+ {\n+ \/* For bare repos, we could actually chown\/reset the xattrs, but let's\n+ * do the basic optimizations here first.\n+ *\/\n+ if (self->mode == OSTREE_REPO_MODE_BARE)\n+ can_adopt = !modified_file_meta;\n+ else if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)\n+ can_adopt = canonical_permissions;\n else\n- {\n- g_auto(GLnxDirFdIterator) child_dfd_iter = { 0, };\n-\n- if (!glnx_dirfd_iterator_init_at (dfd_iter->fd, name, FALSE, &child_dfd_iter, error))\n- return FALSE;\n-\n- if (!write_dfd_iter_to_mtree_internal (self, &child_dfd_iter, child_mtree,\n- modifier, path,\n- cancellable, error))\n- return FALSE;\n-\n- if (delete_after_commit)\n+ \/* This covers bare-user and archive. See comments in adopt_and_commit_regfile()\n+ * for notes on adding bare-user later here.\n+ *\/\n+ can_adopt = FALSE;\n+ }\n+ gboolean did_adopt = FALSE;\n+\n+ \/* The very fast path - we have a devino cache hit, nothing to write *\/\n+ if (loose_checksum && !modified_file_meta)\n+ {\n+ if (!ostree_mutable_tree_replace_file (mtree, name, loose_checksum,\n+ error))\n+ return FALSE;\n+ }\n+ \/* Next fast path - we can \"adopt\" the file *\/\n+ else if (can_adopt)\n+ {\n+ char checksum[OSTREE_SHA256_STRING_LEN+1];\n+ if (!adopt_and_commit_regfile (self, dfd_iter->fd, name, modified_info, xattrs,\n+ checksum, cancellable, error))\n+ return FALSE;\n+ if (!ostree_mutable_tree_replace_file (mtree, name, checksum, error))\n+ return FALSE;\n+ did_adopt = TRUE;\n+ }\n+ else\n+ {\n+ g_autoptr(GInputStream) file_input = NULL;\n+\n+ if (file_type == G_FILE_TYPE_REGULAR)\n+ {\n+ if (dir_enum != NULL)\n {\n- if (!glnx_unlinkat (dfd_iter->fd, name, AT_REMOVEDIR, error))\n+ g_assert (child != NULL);\n+ file_input = (GInputStream*)g_file_read (child, cancellable, error);\n+ if (!file_input)\n return FALSE;\n }\n- }\n- }\n- else if (repo_dir)\n- {\n- g_assert (dir_enum != NULL);\n- g_debug (\"Adding: %s\", gs_file_get_path_cached (child));\n- if (!ostree_mutable_tree_replace_file (mtree, name,\n- ostree_repo_file_get_checksum ((OstreeRepoFile*) child),\n+ else\n+ {\n+ \/* We already opened the fd above *\/\n+ file_input = g_unix_input_stream_new (file_input_fd, FALSE);\n+ }\n+ }\n+\n+ g_autoptr(GInputStream) file_object_input = NULL;\n+ guint64 file_obj_length;\n+ if (!ostree_raw_file_to_content_stream (file_input,\n+ modified_info, xattrs,\n+ &file_object_input, &file_obj_length,\n+ cancellable, error))\n+ return FALSE;\n+ g_autofree guchar *child_file_csum = NULL;\n+ if (!ostree_repo_write_content (self, NULL, file_object_input, file_obj_length,\n+ &child_file_csum, cancellable, error))\n+ return FALSE;\n+\n+ char tmp_checksum[OSTREE_SHA256_STRING_LEN+1];\n+ ostree_checksum_inplace_from_bytes (child_file_csum, tmp_checksum);\n+ if (!ostree_mutable_tree_replace_file (mtree, name, tmp_checksum,\n error))\n return FALSE;\n }\n- else\n- {\n- glnx_autofd int file_input_fd = -1;\n-\n- \/* Open the file now, since it's better for reading xattrs\n- * rather than using the \/proc\/self\/fd links.\n- *\n- * TODO: Do this lazily, since for e.g. bare-user-only repos\n- * we don't have xattrs and don't need to open every file\n- * for things that have devino cache hits.\n- *\/\n- if (file_type == G_FILE_TYPE_REGULAR && dfd_iter != NULL)\n- {\n- if (!glnx_openat_rdonly (dfd_iter->fd, name, FALSE, &file_input_fd, error))\n- return FALSE;\n- }\n-\n- g_autoptr(GVariant) xattrs = NULL;\n- gboolean xattrs_were_modified;\n- if (dir_enum != NULL)\n- {\n- if (!get_final_xattrs (self, modifier, child_relpath, child_info, child,\n- -1, name, source_xattrs, &xattrs, &xattrs_were_modified,\n- cancellable, error))\n- return FALSE;\n- }\n- else\n- {\n- \/* These contortions are basically so we use glnx_fd_get_all_xattrs()\n- * for regfiles, and glnx_dfd_name_get_all_xattrs() for symlinks.\n- *\/\n- int xattr_fd_arg = (file_input_fd != -1) ? file_input_fd : dfd_iter->fd;\n- const char *xattr_path_arg = (file_input_fd != -1) ? NULL : name;\n- if (!get_final_xattrs (self, modifier, child_relpath, child_info, child,\n- xattr_fd_arg, xattr_path_arg, source_xattrs,\n- &xattrs, &xattrs_were_modified,\n- cancellable, error))\n- return FALSE;\n- }\n-\n- \/* Used below to see whether we can do a fast path commit *\/\n- const gboolean modified_file_meta = child_info_was_modified || xattrs_were_modified;\n-\n- \/* A big prerequisite list of conditions for whether or not we can\n- * \"adopt\", i.e. just checksum and rename() into place\n- *\/\n- const gboolean can_adopt_basic =\n- file_type == G_FILE_TYPE_REGULAR\n- && dfd_iter != NULL\n- && delete_after_commit\n- && ((writeflags & WRITE_DIR_CONTENT_FLAGS_CAN_ADOPT) > 0);\n- gboolean can_adopt = can_adopt_basic;\n- \/* If basic prerquisites are met, check repo mode specific ones *\/\n- if (can_adopt)\n- {\n- \/* For bare repos, we could actually chown\/reset the xattrs, but let's\n- * do the basic optimizations here first.\n- *\/\n- if (self->mode == OSTREE_REPO_MODE_BARE)\n- can_adopt = !modified_file_meta;\n- else if (self->mode == OSTREE_REPO_MODE_BARE_USER_ONLY)\n- can_adopt = canonical_permissions;\n- else\n- \/* This covers bare-user and archive. See comments in adopt_and_commit_regfile()\n- * for notes on adding bare-user later here.\n- *\/\n- can_adopt = FALSE;\n- }\n- gboolean did_adopt = FALSE;\n-\n- \/* The very fast path - we have a devino cache hit, nothing to write *\/\n- if (loose_checksum && !modified_file_meta)\n- {\n- if (!ostree_mutable_tree_replace_file (mtree, name, loose_checksum,\n- error))\n- return FALSE;\n- }\n- \/* Next fast path - we can \"adopt\" the file *\/\n- else if (can_adopt)\n- {\n- char checksum[OSTREE_SHA256_STRING_LEN+1];\n- if (!adopt_and_commit_regfile (self, dfd_iter->fd, name, modified_info, xattrs,\n- checksum, cancellable, error))\n- return FALSE;\n- if (!ostree_mutable_tree_replace_file (mtree, name, checksum, error))\n- return FALSE;\n- did_adopt = TRUE;\n- }\n- else\n- {\n- g_autoptr(GInputStream) file_input = NULL;\n-\n- if (file_type == G_FILE_TYPE_REGULAR)\n- {\n- if (dir_enum != NULL)\n- {\n- g_assert (child != NULL);\n- file_input = (GInputStream*)g_file_read (child, cancellable, error);\n- if (!file_input)\n- return FALSE;\n- }\n- else\n- {\n- \/* We already opened the fd above *\/\n- file_input = g_unix_input_stream_new (file_input_fd, FALSE);\n- }\n- }\n-\n- g_autoptr(GInputStream) file_object_input = NULL;\n- guint64 file_obj_length;\n- if (!ostree_raw_file_to_content_stream (file_input,\n- modified_info, xattrs,\n- &file_object_input, &file_obj_length,\n- cancellable, error))\n- return FALSE;\n- g_autofree guchar *child_file_csum = NULL;\n- if (!ostree_repo_write_content (self, NULL, file_object_input, file_obj_length,\n- &child_file_csum, cancellable, error))\n- return FALSE;\n-\n- char tmp_checksum[OSTREE_SHA256_STRING_LEN+1];\n- ostree_checksum_inplace_from_bytes (child_file_csum, tmp_checksum);\n- if (!ostree_mutable_tree_replace_file (mtree, name, tmp_checksum,\n- error))\n- return FALSE;\n- }\n-\n- \/* Process delete_after_commit. In the adoption case though, we already\n- * took ownership of the file above, usually via a renameat().\n- *\/\n- if (delete_after_commit && !did_adopt)\n- {\n- if (!glnx_unlinkat (dfd_iter->fd, name, 0, error))\n- return FALSE;\n- }\n+\n+ \/* Process delete_after_commit. In the adoption case though, we already\n+ * took ownership of the file above, usually via a renameat().\n+ *\/\n+ if (delete_after_commit && !did_adopt)\n+ {\n+ if (!glnx_unlinkat (dfd_iter->fd, name, 0, error))\n+ return FALSE;\n }\n \n g_ptr_array_remove_index (path, path->len - 1);\n@@ -3129,7 +3185,7 @@\n }\n \n \/* Handles the dirmeta for the given GFile dir and then calls\n- * write_directory_content_to_mtree_internal() for each directory entry. *\/\n+ * write_{dir_entry,content}_to_mtree_internal() for each directory entry. *\/\n static gboolean\n write_directory_to_mtree_internal (OstreeRepo *self,\n GFile *dir,\n@@ -3214,12 +3270,24 @@\n if (child_info == NULL)\n break;\n \n- if (!write_directory_content_to_mtree_internal (self, repo_dir, dir_enum, NULL,\n- WRITE_DIR_CONTENT_FLAGS_NONE,\n- child_info,\n- mtree, modifier, path,\n- cancellable, error))\n- return FALSE;\n+ if (g_file_info_get_file_type (child_info) == G_FILE_TYPE_DIRECTORY)\n+ {\n+ if (!write_dir_entry_to_mtree_internal (self, repo_dir, dir_enum, NULL,\n+ WRITE_DIR_CONTENT_FLAGS_NONE,\n+ child_info,\n+ mtree, modifier, path,\n+ cancellable, error))\n+ return FALSE;\n+ }\n+ else\n+ {\n+ if (!write_content_to_mtree_internal (self, repo_dir, dir_enum, NULL,\n+ WRITE_DIR_CONTENT_FLAGS_NONE,\n+ child_info,\n+ mtree, modifier, path,\n+ cancellable, error))\n+ return FALSE;\n+ }\n }\n }\n \n@@ -3227,7 +3295,7 @@\n }\n \n \/* Handles the dirmeta for the dir described by src_dfd_iter and then calls\n- * write_directory_content_to_mtree_internal() for each directory entry. *\/\n+ * write_{dir_entry,content}_to_mtree_internal() for each directory entry. *\/\n static gboolean\n write_dfd_iter_to_mtree_internal (OstreeRepo *self,\n GLnxDirFdIterator *src_dfd_iter,\n@@ -3304,6 +3372,18 @@\n g_autoptr(GFileInfo) child_info = _ostree_stbuf_to_gfileinfo (&stbuf);\n g_file_info_set_name (child_info, dent->d_name);\n \n+ if (S_ISDIR (stbuf.st_mode))\n+ {\n+ if (!write_dir_entry_to_mtree_internal (self, NULL, NULL, src_dfd_iter,\n+ flags, child_info,\n+ mtree, modifier, path,\n+ cancellable, error))\n+ return FALSE;\n+\n+ \/* We handled the dir, move onto the next *\/\n+ continue;\n+ }\n+\n if (S_ISREG (stbuf.st_mode))\n ;\n else if (S_ISLNK (stbuf.st_mode))\n@@ -3312,18 +3392,17 @@\n child_info, cancellable, error))\n return FALSE;\n }\n- else if (S_ISDIR (stbuf.st_mode))\n- ;\n else\n {\n return glnx_throw (error, \"Not a regular file or symlink: %s\",\n dent->d_name);\n }\n \n- if (!write_directory_content_to_mtree_internal (self, NULL, NULL, src_dfd_iter,\n- flags, child_info,\n- mtree, modifier, path,\n- cancellable, error))\n+ \/* Write a content object, we handled directories above *\/\n+ if (!write_content_to_mtree_internal (self, NULL, NULL, src_dfd_iter,\n+ flags, child_info,\n+ mtree, modifier, path,\n+ cancellable, error))\n return FALSE;\n }\n \n"} {"commit":"6d1f8737f51a4971f77dd82aa36b75b605f68d9e","subject":"* src\/maemo\/modest-msg-edit-window.c: * If we try to remove an attached message in editor, we show the subject in the remove confirmation dialog (fixes NB#66044).","message":"* src\/maemo\/modest-msg-edit-window.c:\n * If we try to remove an attached message in editor, we\n show the subject in the remove confirmation dialog\n (fixes NB#66044).\n\npmo-trunk-r3484\n","repos":"community-ssu\/modest,community-ssu\/modest,community-ssu\/modest,community-ssu\/modest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/maemo\/modest-msg-edit-window.c\n+++ src\/maemo\/modest-msg-edit-window.c\n@@ -2046,15 +2046,27 @@\n \t\tgboolean dialog_response;\n \t\tGList *node;\n \t\tgchar *message = NULL;\n-\t\tconst gchar *filename = NULL;\n+\t\tgchar *filename = NULL;\n \n \t\tif (att_list->next == NULL) {\n-\t\t\tfilename = tny_mime_part_get_filename (TNY_MIME_PART (att_list->data));\n+\t\t\tif (TNY_IS_MSG (att_list->data)) {\n+\t\t\t\tTnyHeader *header = tny_msg_get_header (TNY_MSG (att_list->data));\n+\t\t\t\tif (header) {\n+\t\t\t\t\tfilename = g_strdup (tny_header_get_subject (header));\n+\t\t\t\t\tg_object_unref (header);\n+\t\t\t\t}\n+\t\t\t\tif (filename == NULL) {\n+\t\t\t\t\tfilename = g_strdup (_(\"mail_va_no_subject\"));\n+\t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tfilename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (att_list->data)));\n+\t\t\t}\n \t\t} else {\n-\t\t\tfilename = \"\";\n+\t\t\tfilename = g_strdup (\"\");\n \t\t}\n \t\tmessage = g_strdup_printf (ngettext(\"emev_nc_delete_attachment\", \"emev_nc_delete_attachments\",\n \t\t\t\t\t\t att_list->next == NULL), filename);\n+\t\tg_free (filename);\n \t\tconfirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message);\n \t\tg_free (message);\n \t\tdialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);\n"} {"commit":"4f59b321784e7c16bc91696303886c1ce7270960","subject":"r300: move declaration before code","message":"r300: move declaration before code\n","repos":"tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/r300\/compiler\/radeon_compiler_util.c\n+++ src\/mesa\/drivers\/dri\/r300\/compiler\/radeon_compiler_util.c\n@@ -534,10 +534,10 @@\n \trc_register_file file)\n {\n \tstruct max_data data;\n+\tstruct rc_instruction * inst;\n \tdata.Max = 0;\n \tdata.HasFileType = 0;\n \tdata.File = file;\n-\tstruct rc_instruction * inst;\n \tfor (inst = c->Program.Instructions.Next;\n \t\t\t\t\tinst != &c->Program.Instructions;\n \t\t\t\t\tinst = inst->Next) {\n"} {"commit":"81caed047533cd4069dad5f302f45946fea5ce97","subject":"minor fix","message":"minor fix\n","repos":"besser82\/shogun,besser82\/shogun,karlnapf\/shogun,Saurabh7\/shogun,geektoni\/shogun,geektoni\/shogun,lambday\/shogun,Saurabh7\/shogun,lambday\/shogun,Saurabh7\/shogun,shogun-toolbox\/shogun,lisitsyn\/shogun,lambday\/shogun,lambday\/shogun,lambday\/shogun,besser82\/shogun,Saurabh7\/shogun,sorig\/shogun,shogun-toolbox\/shogun,karlnapf\/shogun,sorig\/shogun,shogun-toolbox\/shogun,Saurabh7\/shogun,Saurabh7\/shogun,geektoni\/shogun,besser82\/shogun,besser82\/shogun,shogun-toolbox\/shogun,lisitsyn\/shogun,lisitsyn\/shogun,Saurabh7\/shogun,karlnapf\/shogun,lisitsyn\/shogun,Saurabh7\/shogun,sorig\/shogun,karlnapf\/shogun,lambday\/shogun,lisitsyn\/shogun,Saurabh7\/shogun,geektoni\/shogun,sorig\/shogun,shogun-toolbox\/shogun,sorig\/shogun,karlnapf\/shogun,geektoni\/shogun,besser82\/shogun,shogun-toolbox\/shogun,sorig\/shogun,karlnapf\/shogun,geektoni\/shogun,lisitsyn\/shogun","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/shogun\/distributions\/classical\/GaussianDistribution.h\n+++ src\/shogun\/distributions\/classical\/GaussianDistribution.h\n@@ -116,8 +116,8 @@\n \t\/** Computes the univariate pdf for one given sample.\n \t *\n \t * @param sample is a given sample \n-\t * @param mu is the mean of univariate Normal distribution (defaul value is 0.0)\n-\t * @param sigma2 is the variance of univariate Normal distribution (defaul value is 1.0)\n+\t * @param mu is the mean of univariate Normal distribution (default value is 0.0)\n+\t * @param sigma2 is the variance of univariate Normal distribution (default value is 1.0)\n \t * @return the pdf of the distribution given the sample\n \t *\/\n \tstatic float64_t univariate_log_pdf(float64_t sample, float64_t mu = 0.0, float64_t sigma2 = 1.0)\n"} {"commit":"a3b32934c83f721102b9dd004227a528a174d7bb","subject":"slang: Delete a file that is now autogenerated.","message":"slang: Delete a file that is now autogenerated.\n\nThis file has been modified in master and removed in feature branch.\nThis gave a merge conflict I couldn't resolve by removing and git adding\nit to index.\n","repos":"jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/shader\/slang\/library\/slang_common_builtin_gc.h\n+++ src\/mesa\/shader\/slang\/library\/slang_common_builtin_gc.h\n@@ -1,880 +0,0 @@\n-\n-\/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED FROM THE FOLLOWING FILE: *\/\n-\/* slang_common_builtin.gc *\/\n-\n-5,2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,76,105,103,104,116,115,0,2,16,10,56,0,0,0,2,2,90,95,1,0,\n-5,0,1,103,108,95,77,97,120,67,108,105,112,80,108,97,110,101,115,0,2,16,10,54,0,0,0,2,2,90,95,1,0,5,\n-0,1,103,108,95,77,97,120,84,101,120,116,117,114,101,85,110,105,116,115,0,2,16,10,56,0,0,0,2,2,90,\n-95,1,0,5,0,1,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,2,16,10,56,0,\n-0,0,2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,86,101,114,116,101,120,65,116,116,114,105,98,115,0,2,\n-16,10,49,54,0,0,0,2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,86,101,114,116,101,120,85,110,105,102,\n-111,114,109,67,111,109,112,111,110,101,110,116,115,0,2,16,10,53,49,50,0,0,0,2,2,90,95,1,0,5,0,1,\n-103,108,95,77,97,120,86,97,114,121,105,110,103,70,108,111,97,116,115,0,2,16,10,51,50,0,0,0,2,2,90,\n-95,1,0,5,0,1,103,108,95,77,97,120,86,101,114,116,101,120,84,101,120,116,117,114,101,73,109,97,103,\n-101,85,110,105,116,115,0,2,16,8,48,0,0,0,2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,67,111,109,98,\n-105,110,101,100,84,101,120,116,117,114,101,73,109,97,103,101,85,110,105,116,115,0,2,16,10,50,0,0,0,\n-2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,84,101,120,116,117,114,101,73,109,97,103,101,85,110,105,\n-116,115,0,2,16,10,50,0,0,0,2,2,90,95,1,0,5,0,1,103,108,95,77,97,120,70,114,97,103,109,101,110,116,\n-85,110,105,102,111,114,109,67,111,109,112,111,110,101,110,116,115,0,2,16,10,54,52,0,0,0,2,2,90,95,\n-1,0,5,0,1,103,108,95,77,97,120,68,114,97,119,66,117,102,102,101,114,115,0,2,16,10,49,0,0,0,2,2,90,\n-95,4,0,15,0,1,103,108,95,77,111,100,101,108,86,105,101,119,77,97,116,114,105,120,0,0,0,2,2,90,95,4,\n-0,15,0,1,103,108,95,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,0,0,0,2,2,90,95,4,\n-0,15,0,1,103,108,95,77,111,100,101,108,86,105,101,119,80,114,111,106,101,99,116,105,111,110,77,97,\n-116,114,105,120,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,84,101,120,116,117,114,101,77,97,116,114,105,\n-120,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,\n-4,0,14,0,1,103,108,95,78,111,114,109,97,108,77,97,116,114,105,120,0,0,0,2,2,90,95,4,0,15,0,1,103,\n-108,95,77,111,100,101,108,86,105,101,119,77,97,116,114,105,120,73,110,118,101,114,115,101,0,0,0,2,\n-2,90,95,4,0,15,0,1,103,108,95,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,73,110,\n-118,101,114,115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,77,111,100,101,108,86,105,101,119,80,114,\n-111,106,101,99,116,105,111,110,77,97,116,114,105,120,73,110,118,101,114,115,101,0,0,0,2,2,90,95,4,\n-0,15,0,1,103,108,95,84,101,120,116,117,114,101,77,97,116,114,105,120,73,110,118,101,114,115,101,0,\n-3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,15,\n-0,1,103,108,95,77,111,100,101,108,86,105,101,119,77,97,116,114,105,120,84,114,97,110,115,112,111,\n-115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,80,114,111,106,101,99,116,105,111,110,77,97,116,114,\n-105,120,84,114,97,110,115,112,111,115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,77,111,100,101,108,\n-86,105,101,119,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,84,114,97,110,115,112,\n-111,115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,84,101,120,116,117,114,101,77,97,116,114,105,120,\n-84,114,97,110,115,112,111,115,101,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,\n-111,114,100,115,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,77,111,100,101,108,86,105,101,119,77,97,116,\n-114,105,120,73,110,118,101,114,115,101,84,114,97,110,115,112,111,115,101,0,0,0,2,2,90,95,4,0,15,0,\n-1,103,108,95,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,73,110,118,101,114,115,\n-101,84,114,97,110,115,112,111,115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,77,111,100,101,108,86,\n-105,101,119,80,114,111,106,101,99,116,105,111,110,77,97,116,114,105,120,73,110,118,101,114,115,101,\n-84,114,97,110,115,112,111,115,101,0,0,0,2,2,90,95,4,0,15,0,1,103,108,95,84,101,120,116,117,114,101,\n-77,97,116,114,105,120,73,110,118,101,114,115,101,84,114,97,110,115,112,111,115,101,0,3,18,103,108,\n-95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,9,0,1,103,108,\n-95,78,111,114,109,97,108,83,99,97,108,101,0,0,0,2,2,90,95,0,0,24,103,108,95,68,101,112,116,104,82,\n-97,110,103,101,80,97,114,97,109,101,116,101,114,115,0,9,0,110,101,97,114,0,0,0,1,9,0,102,97,114,0,\n-0,0,1,9,0,100,105,102,102,0,0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,68,101,112,116,104,82,97,110,\n-103,101,80,97,114,97,109,101,116,101,114,115,0,0,1,103,108,95,68,101,112,116,104,82,97,110,103,101,\n-0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,67,108,105,112,80,108,97,110,101,0,3,18,103,108,95,77,97,120,\n-67,108,105,112,80,108,97,110,101,115,0,0,0,2,2,90,95,0,0,24,103,108,95,80,111,105,110,116,80,97,\n-114,97,109,101,116,101,114,115,0,9,0,115,105,122,101,0,0,0,1,9,0,115,105,122,101,77,105,110,0,0,0,\n-1,9,0,115,105,122,101,77,97,120,0,0,0,1,9,0,102,97,100,101,84,104,114,101,115,104,111,108,100,83,\n-105,122,101,0,0,0,1,9,0,100,105,115,116,97,110,99,101,67,111,110,115,116,97,110,116,65,116,116,101,\n-110,117,97,116,105,111,110,0,0,0,1,9,0,100,105,115,116,97,110,99,101,76,105,110,101,97,114,65,116,\n-116,101,110,117,97,116,105,111,110,0,0,0,1,9,0,100,105,115,116,97,110,99,101,81,117,97,100,114,97,\n-116,105,99,65,116,116,101,110,117,97,116,105,111,110,0,0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,80,\n-111,105,110,116,80,97,114,97,109,101,116,101,114,115,0,0,1,103,108,95,80,111,105,110,116,0,0,0,2,2,\n-90,95,0,0,24,103,108,95,77,97,116,101,114,105,97,108,80,97,114,97,109,101,116,101,114,115,0,12,0,\n-101,109,105,115,115,105,111,110,0,0,0,1,12,0,97,109,98,105,101,110,116,0,0,0,1,12,0,100,105,102,\n-102,117,115,101,0,0,0,1,12,0,115,112,101,99,117,108,97,114,0,0,0,1,9,0,115,104,105,110,105,110,101,\n-115,115,0,0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,77,97,116,101,114,105,97,108,80,97,114,97,109,\n-101,116,101,114,115,0,0,1,103,108,95,70,114,111,110,116,77,97,116,101,114,105,97,108,0,0,0,2,2,90,\n-95,4,0,25,103,108,95,77,97,116,101,114,105,97,108,80,97,114,97,109,101,116,101,114,115,0,0,1,103,\n-108,95,66,97,99,107,77,97,116,101,114,105,97,108,0,0,0,2,2,90,95,0,0,24,103,108,95,76,105,103,104,\n-116,83,111,117,114,99,101,80,97,114,97,109,101,116,101,114,115,0,12,0,97,109,98,105,101,110,116,0,\n-0,0,1,12,0,100,105,102,102,117,115,101,0,0,0,1,12,0,115,112,101,99,117,108,97,114,0,0,0,1,12,0,112,\n-111,115,105,116,105,111,110,0,0,0,1,12,0,104,97,108,102,86,101,99,116,111,114,0,0,0,1,11,0,115,112,\n-111,116,68,105,114,101,99,116,105,111,110,0,0,0,1,9,0,115,112,111,116,67,111,115,67,117,116,111,\n-102,102,0,0,0,1,9,0,99,111,110,115,116,97,110,116,65,116,116,101,110,117,97,116,105,111,110,0,0,0,\n-1,9,0,108,105,110,101,97,114,65,116,116,101,110,117,97,116,105,111,110,0,0,0,1,9,0,113,117,97,100,\n-114,97,116,105,99,65,116,116,101,110,117,97,116,105,111,110,0,0,0,1,9,0,115,112,111,116,69,120,112,\n-111,110,101,110,116,0,0,0,1,9,0,115,112,111,116,67,117,116,111,102,102,0,0,0,0,0,0,0,2,2,90,95,4,0,\n-25,103,108,95,76,105,103,104,116,83,111,117,114,99,101,80,97,114,97,109,101,116,101,114,115,0,0,1,\n-103,108,95,76,105,103,104,116,83,111,117,114,99,101,0,3,18,103,108,95,77,97,120,76,105,103,104,116,\n-115,0,0,0,2,2,90,95,0,0,24,103,108,95,76,105,103,104,116,77,111,100,101,108,80,97,114,97,109,101,\n-116,101,114,115,0,12,0,97,109,98,105,101,110,116,0,0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,76,105,\n-103,104,116,77,111,100,101,108,80,97,114,97,109,101,116,101,114,115,0,0,1,103,108,95,76,105,103,\n-104,116,77,111,100,101,108,0,0,0,2,2,90,95,0,0,24,103,108,95,76,105,103,104,116,77,111,100,101,108,\n-80,114,111,100,117,99,116,115,0,12,0,115,99,101,110,101,67,111,108,111,114,0,0,0,0,0,0,0,2,2,90,95,\n-4,0,25,103,108,95,76,105,103,104,116,77,111,100,101,108,80,114,111,100,117,99,116,115,0,0,1,103,\n-108,95,70,114,111,110,116,76,105,103,104,116,77,111,100,101,108,80,114,111,100,117,99,116,0,0,0,2,\n-2,90,95,4,0,25,103,108,95,76,105,103,104,116,77,111,100,101,108,80,114,111,100,117,99,116,115,0,0,\n-1,103,108,95,66,97,99,107,76,105,103,104,116,77,111,100,101,108,80,114,111,100,117,99,116,0,0,0,2,\n-2,90,95,0,0,24,103,108,95,76,105,103,104,116,80,114,111,100,117,99,116,115,0,12,0,97,109,98,105,\n-101,110,116,0,0,0,1,12,0,100,105,102,102,117,115,101,0,0,0,1,12,0,115,112,101,99,117,108,97,114,0,\n-0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,76,105,103,104,116,80,114,111,100,117,99,116,115,0,0,1,103,\n-108,95,70,114,111,110,116,76,105,103,104,116,80,114,111,100,117,99,116,0,3,18,103,108,95,77,97,120,\n-76,105,103,104,116,115,0,0,0,2,2,90,95,4,0,25,103,108,95,76,105,103,104,116,80,114,111,100,117,99,\n-116,115,0,0,1,103,108,95,66,97,99,107,76,105,103,104,116,80,114,111,100,117,99,116,0,3,18,103,108,\n-95,77,97,120,76,105,103,104,116,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,84,101,120,116,117,114,\n-101,69,110,118,67,111,108,111,114,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,73,109,97,\n-103,101,85,110,105,116,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,69,121,101,80,108,97,110,101,83,0,\n-3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,12,\n-0,1,103,108,95,69,121,101,80,108,97,110,101,84,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,\n-101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,69,121,101,80,108,97,110,101,82,0,\n-3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,12,\n-0,1,103,108,95,69,121,101,80,108,97,110,101,81,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,\n-101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,79,98,106,101,99,116,80,108,97,\n-110,101,83,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,\n-90,95,4,0,12,0,1,103,108,95,79,98,106,101,99,116,80,108,97,110,101,84,0,3,18,103,108,95,77,97,120,\n-84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,79,98,106,\n-101,99,116,80,108,97,110,101,82,0,3,18,103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,\n-114,100,115,0,0,0,2,2,90,95,4,0,12,0,1,103,108,95,79,98,106,101,99,116,80,108,97,110,101,81,0,3,18,\n-103,108,95,77,97,120,84,101,120,116,117,114,101,67,111,111,114,100,115,0,0,0,2,2,90,95,0,0,24,103,\n-108,95,70,111,103,80,97,114,97,109,101,116,101,114,115,0,12,0,99,111,108,111,114,0,0,0,1,9,0,100,\n-101,110,115,105,116,121,0,0,0,1,9,0,115,116,97,114,116,0,0,0,1,9,0,101,110,100,0,0,0,1,9,0,115,99,\n-97,108,101,0,0,0,0,0,0,0,2,2,90,95,4,0,25,103,108,95,70,111,103,80,97,114,97,109,101,116,101,114,\n-115,0,0,1,103,108,95,70,111,103,0,0,0,1,90,95,0,0,9,0,0,114,97,100,105,97,110,115,0,1,1,0,0,9,0,\n-100,101,103,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,51,0,49,52,49,53,57,50,54,0,0,17,49,56,48,0,48,0,\n-0,49,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,0,\n-18,100,101,103,0,0,18,99,0,0,0,0,1,90,95,0,0,10,0,0,114,97,100,105,97,110,115,0,1,1,0,0,10,0,100,\n-101,103,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,51,0,49,52,49,53,57,50,54,0,0,17,49,56,48,0,48,0,0,\n-49,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59,\n-120,121,0,0,18,100,101,103,0,59,120,121,0,0,18,99,0,59,120,120,0,0,0,0,1,90,95,0,0,11,0,0,114,97,\n-100,105,97,110,115,0,1,1,0,0,11,0,100,101,103,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,51,0,49,52,49,\n-53,57,50,54,0,0,17,49,56,48,0,48,0,0,49,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,\n-18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,100,101,103,0,59,120,121,122,0,0,18,99,0,59,\n-120,120,120,0,0,0,0,1,90,95,0,0,12,0,0,114,97,100,105,97,110,115,0,1,1,0,0,12,0,100,101,103,0,0,0,\n-1,3,2,90,95,1,0,9,0,1,99,0,2,17,51,0,49,52,49,53,57,50,54,0,0,17,49,56,48,0,48,0,0,49,0,0,4,118,\n-101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,0,18,100,101,103,0,\n-0,18,99,0,59,120,120,120,120,0,0,0,0,1,90,95,0,0,9,0,0,100,101,103,114,101,101,115,0,1,1,0,0,9,0,\n-114,97,100,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,49,56,48,0,48,0,0,17,51,0,49,52,49,53,57,50,54,0,\n-0,49,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,0,\n-18,114,97,100,0,0,18,99,0,0,0,0,1,90,95,0,0,10,0,0,100,101,103,114,101,101,115,0,1,1,0,0,10,0,114,\n-97,100,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,49,56,48,0,48,0,0,17,51,0,49,52,49,53,57,50,54,0,0,49,\n-0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59,120,\n-121,0,0,18,114,97,100,0,59,120,121,0,0,18,99,0,59,120,120,0,0,0,0,1,90,95,0,0,11,0,0,100,101,103,\n-114,101,101,115,0,1,1,0,0,11,0,114,97,100,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,49,56,48,0,48,0,0,\n-17,51,0,49,52,49,53,57,50,54,0,0,49,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,\n-95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,114,97,100,0,59,120,121,122,0,0,18,99,0,59,120,\n-120,120,0,0,0,0,1,90,95,0,0,12,0,0,100,101,103,114,101,101,115,0,1,1,0,0,12,0,114,97,100,0,0,0,1,3,\n-2,90,95,1,0,9,0,1,99,0,2,17,49,56,48,0,48,0,0,17,51,0,49,52,49,53,57,50,54,0,0,49,0,0,4,118,101,99,\n-52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,0,18,114,97,100,0,0,18,99,\n-0,59,120,120,120,120,0,0,0,0,1,90,95,0,0,9,0,0,115,105,110,0,1,1,0,0,9,0,114,97,100,105,97,110,115,\n-0,0,0,1,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,114,97,100,\n-105,97,110,115,0,0,0,0,1,90,95,0,0,10,0,0,115,105,110,0,1,1,0,0,10,0,114,97,100,105,97,110,115,0,0,\n-0,1,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,114,\n-97,100,105,97,110,115,0,59,120,0,0,0,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,\n-116,86,97,108,0,59,121,0,0,18,114,97,100,105,97,110,115,0,59,121,0,0,0,0,1,90,95,0,0,11,0,0,115,\n-105,110,0,1,1,0,0,11,0,114,97,100,105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,115,105,110,101,0,\n-18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,114,97,100,105,97,110,115,0,59,120,0,0,0,4,102,108,\n-111,97,116,95,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,114,97,100,105,97,\n-110,115,0,59,121,0,0,0,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,\n-59,122,0,0,18,114,97,100,105,97,110,115,0,59,122,0,0,0,0,1,90,95,0,0,12,0,0,115,105,110,0,1,1,0,0,\n-12,0,114,97,100,105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,\n-116,86,97,108,0,59,120,0,0,18,114,97,100,105,97,110,115,0,59,120,0,0,0,4,102,108,111,97,116,95,115,\n-105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,114,97,100,105,97,110,115,0,59,121,0,\n-0,0,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,114,\n-97,100,105,97,110,115,0,59,122,0,0,0,4,102,108,111,97,116,95,115,105,110,101,0,18,95,95,114,101,\n-116,86,97,108,0,59,119,0,0,18,114,97,100,105,97,110,115,0,59,119,0,0,0,0,1,90,95,0,0,9,0,0,99,111,\n-115,0,1,1,0,0,9,0,114,97,100,105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,99,111,115,105,110,101,\n-0,18,95,95,114,101,116,86,97,108,0,0,18,114,97,100,105,97,110,115,0,0,0,0,1,90,95,0,0,10,0,0,99,\n-111,115,0,1,1,0,0,10,0,114,97,100,105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,99,111,115,105,\n-110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,114,97,100,105,97,110,115,0,59,120,0,0,0,\n-4,102,108,111,97,116,95,99,111,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,\n-114,97,100,105,97,110,115,0,59,121,0,0,0,0,1,90,95,0,0,11,0,0,99,111,115,0,1,1,0,0,11,0,114,97,100,\n-105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,99,111,115,105,110,101,0,18,95,95,114,101,116,86,97,\n-108,0,59,120,0,0,18,114,97,100,105,97,110,115,0,59,120,0,0,0,4,102,108,111,97,116,95,99,111,115,\n-105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,114,97,100,105,97,110,115,0,59,121,0,\n-0,0,4,102,108,111,97,116,95,99,111,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,\n-18,114,97,100,105,97,110,115,0,59,122,0,0,0,0,1,90,95,0,0,12,0,0,99,111,115,0,1,1,0,0,12,0,114,97,\n-100,105,97,110,115,0,0,0,1,4,102,108,111,97,116,95,99,111,115,105,110,101,0,18,95,95,114,101,116,\n-86,97,108,0,59,120,0,0,18,114,97,100,105,97,110,115,0,59,120,0,0,0,4,102,108,111,97,116,95,99,111,\n-115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,114,97,100,105,97,110,115,0,59,\n-121,0,0,0,4,102,108,111,97,116,95,99,111,115,105,110,101,0,18,95,95,114,101,116,86,97,108,0,59,122,\n-0,0,18,114,97,100,105,97,110,115,0,59,122,0,0,0,4,102,108,111,97,116,95,99,111,115,105,110,101,0,\n-18,95,95,114,101,116,86,97,108,0,59,119,0,0,18,114,97,100,105,97,110,115,0,59,119,0,0,0,0,1,90,95,\n-0,0,9,0,0,116,97,110,0,1,1,0,0,9,0,97,110,103,108,101,0,0,0,1,3,2,90,95,1,0,9,0,1,115,0,2,58,115,\n-105,110,0,0,18,97,110,103,108,101,0,0,0,0,0,3,2,90,95,1,0,9,0,1,99,0,2,58,99,111,115,0,0,18,97,110,\n-103,108,101,0,0,0,0,0,8,18,115,0,18,99,0,49,0,0,1,90,95,0,0,10,0,0,116,97,110,0,1,1,0,0,10,0,97,\n-110,103,108,101,0,0,0,1,3,2,90,95,1,0,10,0,1,115,0,2,58,115,105,110,0,0,18,97,110,103,108,101,0,0,\n-0,0,0,3,2,90,95,1,0,10,0,1,99,0,2,58,99,111,115,0,0,18,97,110,103,108,101,0,0,0,0,0,8,18,115,0,18,\n-99,0,49,0,0,1,90,95,0,0,11,0,0,116,97,110,0,1,1,0,0,11,0,97,110,103,108,101,0,0,0,1,3,2,90,95,1,0,\n-11,0,1,115,0,2,58,115,105,110,0,0,18,97,110,103,108,101,0,0,0,0,0,3,2,90,95,1,0,11,0,1,99,0,2,58,\n-99,111,115,0,0,18,97,110,103,108,101,0,0,0,0,0,8,18,115,0,18,99,0,49,0,0,1,90,95,0,0,12,0,0,116,97,\n-110,0,1,1,0,0,12,0,97,110,103,108,101,0,0,0,1,3,2,90,95,1,0,12,0,1,115,0,2,58,115,105,110,0,0,18,\n-97,110,103,108,101,0,0,0,0,0,3,2,90,95,1,0,12,0,1,99,0,2,58,99,111,115,0,0,18,97,110,103,108,101,0,\n-0,0,0,0,8,18,115,0,18,99,0,49,0,0,1,90,95,0,0,9,0,0,97,115,105,110,0,1,1,0,0,9,0,120,0,0,0,1,3,2,\n-90,95,1,0,9,0,1,97,48,0,2,17,49,0,53,55,48,55,50,56,56,0,0,0,0,3,2,90,95,1,0,9,0,1,97,49,0,2,17,48,\n-0,50,49,50,49,49,52,52,0,0,54,0,0,3,2,90,95,1,0,9,0,1,97,50,0,2,17,48,0,48,55,52,50,54,49,48,0,0,0,\n-0,3,2,90,95,1,0,9,0,1,104,97,108,102,80,105,0,2,17,51,0,49,52,49,53,57,50,54,0,0,17,48,0,53,0,0,48,\n-0,0,3,2,90,95,1,0,9,0,1,121,0,2,58,97,98,115,0,0,18,120,0,0,0,0,0,9,18,95,95,114,101,116,86,97,108,\n-0,18,104,97,108,102,80,105,0,58,115,113,114,116,0,0,17,49,0,48,0,0,18,121,0,47,0,0,18,97,48,0,18,\n-121,0,18,97,49,0,18,97,50,0,18,121,0,48,46,48,46,48,47,58,115,105,103,110,0,0,18,120,0,0,0,48,20,0,\n-0,1,90,95,0,0,10,0,0,97,115,105,110,0,1,1,0,0,10,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,\n-59,120,0,58,97,115,105,110,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,\n-121,0,58,97,115,105,110,0,0,18,118,0,59,121,0,0,0,20,0,0,1,90,95,0,0,11,0,0,97,115,105,110,0,1,1,0,\n-0,11,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,97,115,105,110,0,0,18,118,0,59,\n-120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,115,105,110,0,0,18,118,0,59,121,0,\n-0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,97,115,105,110,0,0,18,118,0,59,122,0,0,0,\n-20,0,0,1,90,95,0,0,12,0,0,97,115,105,110,0,1,1,0,0,12,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,\n-108,0,59,120,0,58,97,115,105,110,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,\n-59,121,0,58,97,115,105,110,0,0,18,118,0,59,121,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,\n-122,0,58,97,115,105,110,0,0,18,118,0,59,122,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,119,0,\n-58,97,115,105,110,0,0,18,118,0,59,119,0,0,0,20,0,0,1,90,95,0,0,9,0,0,97,99,111,115,0,1,1,0,0,9,0,\n-120,0,0,0,1,3,2,90,95,1,0,9,0,1,104,97,108,102,80,105,0,2,17,51,0,49,52,49,53,57,50,54,0,0,17,48,0,\n-53,0,0,48,0,0,9,18,95,95,114,101,116,86,97,108,0,18,104,97,108,102,80,105,0,58,97,115,105,110,0,0,\n-18,120,0,0,0,47,20,0,0,1,90,95,0,0,10,0,0,97,99,111,115,0,1,1,0,0,10,0,118,0,0,0,1,9,18,95,95,114,\n-101,116,86,97,108,0,59,120,0,58,97,99,111,115,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,\n-116,86,97,108,0,59,121,0,58,97,99,111,115,0,0,18,118,0,59,121,0,0,0,20,0,0,1,90,95,0,0,11,0,0,97,\n-99,111,115,0,1,1,0,0,11,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,97,99,111,115,\n-0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,99,111,115,0,0,18,\n-118,0,59,121,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,97,99,111,115,0,0,18,118,0,\n-59,122,0,0,0,20,0,0,1,90,95,0,0,12,0,0,97,99,111,115,0,1,1,0,0,12,0,118,0,0,0,1,9,18,95,95,114,101,\n-116,86,97,108,0,59,120,0,58,97,99,111,115,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,\n-97,108,0,59,121,0,58,97,99,111,115,0,0,18,118,0,59,121,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,\n-0,59,122,0,58,97,99,111,115,0,0,18,118,0,59,122,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,\n-119,0,58,97,99,111,115,0,0,18,118,0,59,119,0,0,0,20,0,0,1,90,95,0,0,9,0,0,97,116,97,110,0,1,1,0,0,\n-9,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,58,97,115,105,110,0,0,18,120,0,58,105,110,118,\n-101,114,115,101,115,113,114,116,0,0,18,120,0,18,120,0,48,17,49,0,48,0,0,46,0,0,48,0,0,20,0,0,1,90,\n-95,0,0,10,0,0,97,116,97,110,0,1,1,0,0,10,0,121,95,111,118,101,114,95,120,0,0,0,1,9,18,95,95,114,\n-101,116,86,97,108,0,59,120,0,58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,120,0,59,120,0,0,0,\n-20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,\n-120,0,59,121,0,0,0,20,0,0,1,90,95,0,0,11,0,0,97,116,97,110,0,1,1,0,0,11,0,121,95,111,118,101,114,\n-95,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,97,116,97,110,0,0,18,121,95,111,118,\n-101,114,95,120,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,116,97,110,0,\n-0,18,121,95,111,118,101,114,95,120,0,59,121,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,\n-58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,120,0,59,122,0,0,0,20,0,0,1,90,95,0,0,12,0,0,97,\n-116,97,110,0,1,1,0,0,12,0,121,95,111,118,101,114,95,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,\n-59,120,0,58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,120,0,59,120,0,0,0,20,0,9,18,95,95,114,\n-101,116,86,97,108,0,59,121,0,58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,120,0,59,121,0,0,0,\n-20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,97,116,97,110,0,0,18,121,95,111,118,101,114,95,\n-120,0,59,122,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,119,0,58,97,116,97,110,0,0,18,121,95,\n-111,118,101,114,95,120,0,59,119,0,0,0,20,0,0,1,90,95,0,0,9,0,0,97,116,97,110,0,1,1,0,0,9,0,121,0,0,\n-1,1,0,0,9,0,120,0,0,0,1,3,2,90,95,0,0,9,0,1,114,0,0,0,10,58,97,98,115,0,0,18,120,0,0,0,17,49,0,48,\n-0,45,52,0,41,0,2,9,18,114,0,58,97,116,97,110,0,0,18,121,0,18,120,0,49,0,0,20,0,10,18,120,0,17,48,0,\n-48,0,0,40,0,2,9,18,114,0,18,114,0,58,115,105,103,110,0,0,18,121,0,0,0,17,51,0,49,52,49,53,57,51,0,\n-0,48,46,20,0,0,9,14,0,0,2,9,18,114,0,58,115,105,103,110,0,0,18,121,0,0,0,17,49,0,53,55,48,55,57,54,\n-53,0,0,48,20,0,0,8,18,114,0,0,0,1,90,95,0,0,10,0,0,97,116,97,110,0,1,1,0,0,10,0,117,0,0,1,1,0,0,10,\n-0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,97,116,97,110,0,0,18,117,0,59,120,0,0,\n-18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,116,97,110,0,0,18,117,\n-0,59,121,0,0,18,118,0,59,121,0,0,0,20,0,0,1,90,95,0,0,11,0,0,97,116,97,110,0,1,1,0,0,11,0,117,0,0,\n-1,1,0,0,11,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,97,116,97,110,0,0,18,117,0,\n-59,120,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,97,116,97,110,\n-0,0,18,117,0,59,121,0,0,18,118,0,59,121,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,\n-97,116,97,110,0,0,18,117,0,59,122,0,0,18,118,0,59,122,0,0,0,20,0,0,1,90,95,0,0,12,0,0,97,116,97,\n-110,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,\n-97,116,97,110,0,0,18,117,0,59,120,0,0,18,118,0,59,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,\n-0,59,121,0,58,97,116,97,110,0,0,18,117,0,59,121,0,0,18,118,0,59,121,0,0,0,20,0,9,18,95,95,114,101,\n-116,86,97,108,0,59,122,0,58,97,116,97,110,0,0,18,117,0,59,122,0,0,18,118,0,59,122,0,0,0,20,0,9,18,\n-95,95,114,101,116,86,97,108,0,59,119,0,58,97,116,97,110,0,0,18,117,0,59,119,0,0,18,118,0,59,119,0,\n-0,0,20,0,0,1,90,95,0,0,9,0,0,112,111,119,0,1,1,0,0,9,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,102,108,111,\n-97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,\n-0,0,10,0,0,112,111,119,0,1,1,0,0,10,0,97,0,0,1,1,0,0,10,0,98,0,0,0,1,4,102,108,111,97,116,95,112,\n-111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,97,0,59,120,0,0,18,98,0,59,120,0,\n-0,0,4,102,108,111,97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,\n-97,0,59,121,0,0,18,98,0,59,121,0,0,0,0,1,90,95,0,0,11,0,0,112,111,119,0,1,1,0,0,11,0,97,0,0,1,1,0,\n-0,11,0,98,0,0,0,1,4,102,108,111,97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,\n-59,120,0,0,18,97,0,59,120,0,0,18,98,0,59,120,0,0,0,4,102,108,111,97,116,95,112,111,119,101,114,0,\n-18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,97,0,59,121,0,0,18,98,0,59,121,0,0,0,4,102,108,111,\n-97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,97,0,59,122,0,0,18,\n-98,0,59,122,0,0,0,0,1,90,95,0,0,12,0,0,112,111,119,0,1,1,0,0,12,0,97,0,0,1,1,0,0,12,0,98,0,0,0,1,4,\n-102,108,111,97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,97,0,59,\n-120,0,0,18,98,0,59,120,0,0,0,4,102,108,111,97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,\n-97,108,0,59,121,0,0,18,97,0,59,121,0,0,18,98,0,59,121,0,0,0,4,102,108,111,97,116,95,112,111,119,\n-101,114,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,97,0,59,122,0,0,18,98,0,59,122,0,0,0,4,\n-102,108,111,97,116,95,112,111,119,101,114,0,18,95,95,114,101,116,86,97,108,0,59,119,0,0,18,97,0,59,\n-119,0,0,18,98,0,59,119,0,0,0,0,1,90,95,0,0,9,0,0,101,120,112,0,1,1,0,0,9,0,97,0,0,0,1,3,2,90,95,0,\n-0,9,0,1,116,0,2,18,97,0,17,49,0,52,52,50,54,57,53,48,50,0,0,48,0,0,4,102,108,111,97,116,95,101,120,\n-112,50,0,18,95,95,114,101,116,86,97,108,0,0,18,116,0,0,0,0,1,90,95,0,0,10,0,0,101,120,112,0,1,1,0,\n-0,10,0,97,0,0,0,1,3,2,90,95,0,0,10,0,1,116,0,2,18,97,0,17,49,0,52,52,50,54,57,53,48,50,0,0,48,0,0,\n-4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,116,0,59,\n-120,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,\n-116,0,59,121,0,0,0,0,1,90,95,0,0,11,0,0,101,120,112,0,1,1,0,0,11,0,97,0,0,0,1,3,2,90,95,0,0,11,0,1,\n-116,0,2,18,97,0,17,49,0,52,52,50,54,57,53,48,50,0,0,48,0,0,4,102,108,111,97,116,95,101,120,112,50,\n-0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,116,0,59,120,0,0,0,4,102,108,111,97,116,95,101,\n-120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,116,0,59,121,0,0,0,4,102,108,111,97,\n-116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,116,0,59,122,0,0,0,0,1,90,\n-95,0,0,12,0,0,101,120,112,0,1,1,0,0,12,0,97,0,0,0,1,3,2,90,95,0,0,12,0,1,116,0,2,18,97,0,17,49,0,\n-52,52,50,54,57,53,48,50,0,0,48,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,\n-86,97,108,0,59,120,0,0,18,116,0,59,120,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,\n-101,116,86,97,108,0,59,121,0,0,18,116,0,59,121,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,\n-95,95,114,101,116,86,97,108,0,59,122,0,0,18,116,0,59,122,0,0,0,4,102,108,111,97,116,95,101,120,112,\n-50,0,18,95,95,114,101,116,86,97,108,0,59,119,0,0,18,116,0,59,119,0,0,0,0,1,90,95,0,0,9,0,0,108,111,\n-103,50,0,1,1,0,0,9,0,120,0,0,0,1,4,102,108,111,97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,\n-97,108,0,0,18,120,0,0,0,0,1,90,95,0,0,10,0,0,108,111,103,50,0,1,1,0,0,10,0,118,0,0,0,1,4,102,108,\n-111,97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,\n-102,108,111,97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,\n-0,0,0,0,1,90,95,0,0,11,0,0,108,111,103,50,0,1,1,0,0,11,0,118,0,0,0,1,4,102,108,111,97,116,95,108,\n-111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,102,108,111,97,\n-116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,0,0,0,4,102,\n-108,111,97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,118,0,59,122,0,0,\n-0,0,1,90,95,0,0,12,0,0,108,111,103,50,0,1,1,0,0,12,0,118,0,0,0,1,4,102,108,111,97,116,95,108,111,\n-103,50,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,102,108,111,97,116,95,\n-108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,0,0,0,4,102,108,111,\n-97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,118,0,59,122,0,0,0,4,102,\n-108,111,97,116,95,108,111,103,50,0,18,95,95,114,101,116,86,97,108,0,59,119,0,0,18,118,0,59,119,0,0,\n-0,0,1,90,95,0,0,9,0,0,108,111,103,0,1,1,0,0,9,0,120,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,48,0,54,\n-57,51,49,52,55,49,56,49,0,0,0,0,8,58,108,111,103,50,0,0,18,120,0,0,0,18,99,0,48,0,0,1,90,95,0,0,10,\n-0,0,108,111,103,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,48,0,54,57,51,49,52,55,49,\n-56,49,0,0,0,0,8,58,108,111,103,50,0,0,18,118,0,0,0,18,99,0,48,0,0,1,90,95,0,0,11,0,0,108,111,103,0,\n-1,1,0,0,11,0,118,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,48,0,54,57,51,49,52,55,49,56,49,0,0,0,0,8,\n-58,108,111,103,50,0,0,18,118,0,0,0,18,99,0,48,0,0,1,90,95,0,0,12,0,0,108,111,103,0,1,1,0,0,12,0,\n-118,0,0,0,1,3,2,90,95,1,0,9,0,1,99,0,2,17,48,0,54,57,51,49,52,55,49,56,49,0,0,0,0,8,58,108,111,103,\n-50,0,0,18,118,0,0,0,18,99,0,48,0,0,1,90,95,0,0,9,0,0,101,120,112,50,0,1,1,0,0,9,0,97,0,0,0,1,4,102,\n-108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,0,0,1,90,95,0,0,10,\n-0,0,101,120,112,50,0,1,1,0,0,10,0,97,0,0,0,1,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,\n-101,116,86,97,108,0,59,120,0,0,18,97,0,59,120,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,\n-95,114,101,116,86,97,108,0,59,121,0,0,18,97,0,59,121,0,0,0,0,1,90,95,0,0,11,0,0,101,120,112,50,0,1,\n-1,0,0,11,0,97,0,0,0,1,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,\n-120,0,0,18,97,0,59,120,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,\n-108,0,59,121,0,0,18,97,0,59,121,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,\n-116,86,97,108,0,59,122,0,0,18,97,0,59,122,0,0,0,0,1,90,95,0,0,12,0,0,101,120,112,50,0,1,1,0,0,12,0,\n-97,0,0,0,1,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,\n-97,0,59,120,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,59,121,\n-0,0,18,97,0,59,121,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,97,108,0,\n-59,122,0,0,18,97,0,59,122,0,0,0,4,102,108,111,97,116,95,101,120,112,50,0,18,95,95,114,101,116,86,\n-97,108,0,59,119,0,0,18,97,0,59,119,0,0,0,0,1,90,95,0,0,9,0,0,115,113,114,116,0,1,1,0,0,9,0,120,0,0,\n-0,1,3,2,90,95,1,0,9,0,1,110,120,0,2,18,120,0,54,0,0,3,2,90,95,0,0,9,0,1,114,0,0,0,4,102,108,111,97,\n-116,95,114,115,113,0,18,114,0,0,18,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,0,18,\n-114,0,0,0,4,118,101,99,52,95,99,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,110,120,0,0,18,114,\n-0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,10,0,0,115,113,114,116,0,1,1,0,0,10,0,120,0,0,0,1,3,2,90,95,1,\n-0,10,0,1,110,120,0,2,18,120,0,54,0,1,1,122,101,114,111,0,2,58,118,101,99,50,0,0,17,48,0,48,0,0,0,0,\n-0,0,3,2,90,95,0,0,10,0,1,114,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,114,0,59,120,0,0,18,\n-120,0,59,120,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,114,0,59,121,0,0,18,120,0,59,121,0,0,0,\n-4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,120,0,0,18,114,0,59,120,0,0,0,4,102,108,111,97,\n-116,95,114,99,112,0,18,114,0,59,121,0,0,18,114,0,59,121,0,0,0,4,118,101,99,52,95,99,109,112,0,18,\n-95,95,114,101,116,86,97,108,0,0,18,110,120,0,0,18,114,0,0,18,122,101,114,111,0,0,0,0,1,90,95,0,0,\n-11,0,0,115,113,114,116,0,1,1,0,0,11,0,120,0,0,0,1,3,2,90,95,1,0,11,0,1,110,120,0,2,18,120,0,54,0,1,\n-1,122,101,114,111,0,2,58,118,101,99,51,0,0,17,48,0,48,0,0,0,0,0,0,3,2,90,95,0,0,11,0,1,114,0,0,0,4,\n-102,108,111,97,116,95,114,115,113,0,18,114,0,59,120,0,0,18,120,0,59,120,0,0,0,4,102,108,111,97,116,\n-95,114,115,113,0,18,114,0,59,121,0,0,18,120,0,59,121,0,0,0,4,102,108,111,97,116,95,114,115,113,0,\n-18,114,0,59,122,0,0,18,120,0,59,122,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,120,0,0,\n-18,114,0,59,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,121,0,0,18,114,0,59,121,0,0,\n-0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,122,0,0,18,114,0,59,122,0,0,0,4,118,101,99,52,\n-95,99,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,110,120,0,0,18,114,0,0,18,122,101,114,111,0,\n-0,0,0,1,90,95,0,0,12,0,0,115,113,114,116,0,1,1,0,0,12,0,120,0,0,0,1,3,2,90,95,1,0,12,0,1,110,120,0,\n-2,18,120,0,54,0,1,1,122,101,114,111,0,2,58,118,101,99,52,0,0,17,48,0,48,0,0,0,0,0,0,3,2,90,95,0,0,\n-12,0,1,114,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,114,0,59,120,0,0,18,120,0,59,120,0,0,0,4,\n-102,108,111,97,116,95,114,115,113,0,18,114,0,59,121,0,0,18,120,0,59,121,0,0,0,4,102,108,111,97,116,\n-95,114,115,113,0,18,114,0,59,122,0,0,18,120,0,59,122,0,0,0,4,102,108,111,97,116,95,114,115,113,0,\n-18,114,0,59,119,0,0,18,120,0,59,119,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,120,0,0,\n-18,114,0,59,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,121,0,0,18,114,0,59,121,0,0,\n-0,4,102,108,111,97,116,95,114,99,112,0,18,114,0,59,122,0,0,18,114,0,59,122,0,0,0,4,102,108,111,97,\n-116,95,114,99,112,0,18,114,0,59,119,0,0,18,114,0,59,119,0,0,0,4,118,101,99,52,95,99,109,112,0,18,\n-95,95,114,101,116,86,97,108,0,0,18,110,120,0,0,18,114,0,0,18,122,101,114,111,0,0,0,0,1,90,95,0,0,9,\n-0,0,105,110,118,101,114,115,101,115,113,114,116,0,1,1,0,0,9,0,120,0,0,0,1,4,102,108,111,97,116,95,\n-114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,120,0,0,0,0,1,90,95,0,0,10,0,0,105,\n-110,118,101,114,115,101,115,113,114,116,0,1,1,0,0,10,0,118,0,0,0,1,4,102,108,111,97,116,95,114,115,\n-113,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,102,108,111,97,116,95,\n-114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,0,0,0,0,1,90,95,0,0,11,0,\n-0,105,110,118,101,114,115,101,115,113,114,116,0,1,1,0,0,11,0,118,0,0,0,1,4,102,108,111,97,116,95,\n-114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,102,108,111,97,\n-116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,0,0,0,4,102,108,\n-111,97,116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,118,0,59,122,0,0,0,0,1,\n-90,95,0,0,12,0,0,105,110,118,101,114,115,101,115,113,114,116,0,1,1,0,0,12,0,118,0,0,0,1,4,102,108,\n-111,97,116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,118,0,59,120,0,0,0,4,\n-102,108,111,97,116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,121,0,0,18,118,0,59,121,0,\n-0,0,4,102,108,111,97,116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,122,0,0,18,118,0,59,\n-122,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,95,95,114,101,116,86,97,108,0,59,119,0,0,18,118,\n-0,59,119,0,0,0,0,1,90,95,0,0,9,0,0,110,111,114,109,97,108,105,122,101,0,1,1,0,0,9,0,120,0,0,0,1,9,\n-18,95,95,114,101,116,86,97,108,0,17,49,0,48,0,0,20,0,0,1,90,95,0,0,10,0,0,110,111,114,109,97,108,\n-105,122,101,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,1,0,9,0,1,115,0,2,58,105,110,118,101,114,115,101,\n-115,113,114,116,0,0,58,100,111,116,0,0,18,118,0,0,18,118,0,0,0,0,0,0,0,4,118,101,99,52,95,109,117,\n-108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,118,0,0,18,115,0,0,0,\n-0,1,90,95,0,0,11,0,0,110,111,114,109,97,108,105,122,101,0,1,1,0,0,11,0,118,0,0,0,1,3,2,90,95,0,0,9,\n-0,1,116,109,112,0,0,0,4,118,101,99,51,95,100,111,116,0,18,116,109,112,0,0,18,118,0,0,18,118,0,0,0,\n-4,102,108,111,97,116,95,114,115,113,0,18,116,109,112,0,0,18,116,109,112,0,0,0,4,118,101,99,52,95,\n-109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,118,0,0,\n-18,116,109,112,0,0,0,0,1,90,95,0,0,12,0,0,110,111,114,109,97,108,105,122,101,0,1,1,0,0,12,0,118,0,\n-0,0,1,3,2,90,95,0,0,9,0,1,116,109,112,0,0,0,4,118,101,99,52,95,100,111,116,0,18,116,109,112,0,0,18,\n-118,0,0,18,118,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,116,109,112,0,0,18,116,109,112,0,0,0,\n-4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,95,95,114,101,116,86,97,108,0,59,120,121,\n-122,0,0,18,118,0,0,18,116,109,112,0,0,0,0,1,90,95,0,0,9,0,0,97,98,115,0,1,1,0,0,9,0,97,0,0,0,1,4,\n-118,101,99,52,95,97,98,115,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,0,0,1,90,95,0,0,10,0,0,\n-97,98,115,0,1,1,0,0,10,0,97,0,0,0,1,4,118,101,99,52,95,97,98,115,0,18,95,95,114,101,116,86,97,108,\n-0,59,120,121,0,0,18,97,0,0,0,0,1,90,95,0,0,11,0,0,97,98,115,0,1,1,0,0,11,0,97,0,0,0,1,4,118,101,99,\n-52,95,97,98,115,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,97,0,0,0,0,1,90,95,0,0,12,\n-0,0,97,98,115,0,1,1,0,0,12,0,97,0,0,0,1,4,118,101,99,52,95,97,98,115,0,18,95,95,114,101,116,86,97,\n-108,0,0,18,97,0,0,0,0,1,90,95,0,0,9,0,0,115,105,103,110,0,1,1,0,0,9,0,120,0,0,0,1,3,2,90,95,0,0,9,\n-0,1,112,0,0,1,1,110,0,0,0,4,118,101,99,52,95,115,103,116,0,18,112,0,0,18,120,0,0,17,48,0,48,0,0,0,\n-0,4,118,101,99,52,95,115,103,116,0,18,110,0,0,17,48,0,48,0,0,0,18,120,0,0,0,4,118,101,99,52,95,115,\n-117,98,116,114,97,99,116,0,18,95,95,114,101,116,86,97,108,0,0,18,112,0,0,18,110,0,0,0,0,1,90,95,0,\n-0,10,0,0,115,105,103,110,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,0,0,10,0,1,112,0,0,1,1,110,0,0,0,4,\n-118,101,99,52,95,115,103,116,0,18,112,0,59,120,121,0,0,18,118,0,0,17,48,0,48,0,0,0,0,4,118,101,99,\n-52,95,115,103,116,0,18,110,0,59,120,121,0,0,17,48,0,48,0,0,0,18,118,0,0,0,4,118,101,99,52,95,115,\n-117,98,116,114,97,99,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,112,0,0,18,110,0,0,0,\n-0,1,90,95,0,0,11,0,0,115,105,103,110,0,1,1,0,0,11,0,118,0,0,0,1,3,2,90,95,0,0,11,0,1,112,0,0,1,1,\n-110,0,0,0,4,118,101,99,52,95,115,103,116,0,18,112,0,59,120,121,122,0,0,18,118,0,0,17,48,0,48,0,0,0,\n-0,4,118,101,99,52,95,115,103,116,0,18,110,0,59,120,121,122,0,0,17,48,0,48,0,0,0,18,118,0,0,0,4,118,\n-101,99,52,95,115,117,98,116,114,97,99,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,\n-112,0,0,18,110,0,0,0,0,1,90,95,0,0,12,0,0,115,105,103,110,0,1,1,0,0,12,0,118,0,0,0,1,3,2,90,95,0,0,\n-12,0,1,112,0,0,1,1,110,0,0,0,4,118,101,99,52,95,115,103,116,0,18,112,0,0,18,118,0,0,17,48,0,48,0,0,\n-0,0,4,118,101,99,52,95,115,103,116,0,18,110,0,0,17,48,0,48,0,0,0,18,118,0,0,0,4,118,101,99,52,95,\n-115,117,98,116,114,97,99,116,0,18,95,95,114,101,116,86,97,108,0,0,18,112,0,0,18,110,0,0,0,0,1,90,\n-95,0,0,9,0,0,102,108,111,111,114,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,102,108,111,111,114,0,\n-18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,0,0,1,90,95,0,0,10,0,0,102,108,111,111,114,0,1,1,0,0,\n-10,0,97,0,0,0,1,4,118,101,99,52,95,102,108,111,111,114,0,18,95,95,114,101,116,86,97,108,0,59,120,\n-121,0,0,18,97,0,0,0,0,1,90,95,0,0,11,0,0,102,108,111,111,114,0,1,1,0,0,11,0,97,0,0,0,1,4,118,101,\n-99,52,95,102,108,111,111,114,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,97,0,0,0,0,1,\n-90,95,0,0,12,0,0,102,108,111,111,114,0,1,1,0,0,12,0,97,0,0,0,1,4,118,101,99,52,95,102,108,111,111,\n-114,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,0,0,1,90,95,0,0,9,0,0,99,101,105,108,0,1,1,0,0,\n-9,0,97,0,0,0,1,3,2,90,95,0,0,9,0,1,98,0,2,18,97,0,54,0,0,4,118,101,99,52,95,102,108,111,111,114,0,\n-18,98,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,98,0,54,20,0,0,1,90,95,0,0,10,0,0,99,\n-101,105,108,0,1,1,0,0,10,0,97,0,0,0,1,3,2,90,95,0,0,10,0,1,98,0,2,18,97,0,54,0,0,4,118,101,99,52,\n-95,102,108,111,111,114,0,18,98,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,0,59,120,121,0,18,\n-98,0,54,20,0,0,1,90,95,0,0,11,0,0,99,101,105,108,0,1,1,0,0,11,0,97,0,0,0,1,3,2,90,95,0,0,11,0,1,98,\n-0,2,18,97,0,54,0,0,4,118,101,99,52,95,102,108,111,111,114,0,18,98,0,0,18,98,0,0,0,9,18,95,95,114,\n-101,116,86,97,108,0,59,120,121,122,0,18,98,0,54,20,0,0,1,90,95,0,0,12,0,0,99,101,105,108,0,1,1,0,0,\n-12,0,97,0,0,0,1,3,2,90,95,0,0,12,0,1,98,0,2,18,97,0,54,0,0,4,118,101,99,52,95,102,108,111,111,114,\n-0,18,98,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,98,0,54,20,0,0,1,90,95,0,0,9,0,0,102,\n-114,97,99,116,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,102,114,97,99,0,18,95,95,114,101,116,86,\n-97,108,0,0,18,97,0,0,0,0,1,90,95,0,0,10,0,0,102,114,97,99,116,0,1,1,0,0,10,0,97,0,0,0,1,4,118,101,\n-99,52,95,102,114,97,99,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,97,0,0,0,0,1,90,95,0,0,\n-11,0,0,102,114,97,99,116,0,1,1,0,0,11,0,97,0,0,0,1,4,118,101,99,52,95,102,114,97,99,0,18,95,95,114,\n-101,116,86,97,108,0,59,120,121,122,0,0,18,97,0,0,0,0,1,90,95,0,0,12,0,0,102,114,97,99,116,0,1,1,0,\n-0,12,0,97,0,0,0,1,4,118,101,99,52,95,102,114,97,99,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,\n-0,0,1,90,95,0,0,9,0,0,109,111,100,0,1,1,0,0,9,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,3,2,90,95,0,0,9,0,1,\n-111,110,101,79,118,101,114,66,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,\n-114,66,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,97,0,18,98,0,58,102,108,111,111,114,0,\n-0,18,97,0,18,111,110,101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,95,0,0,10,0,0,109,111,100,0,\n-1,1,0,0,10,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,3,2,90,95,0,0,9,0,1,111,110,101,79,118,101,114,66,0,0,0,\n-4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,66,0,0,18,98,0,0,0,9,18,95,95,\n-114,101,116,86,97,108,0,59,120,121,0,18,97,0,18,98,0,58,102,108,111,111,114,0,0,18,97,0,18,111,110,\n-101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,95,0,0,11,0,0,109,111,100,0,1,1,0,0,11,0,97,0,0,1,\n-1,0,0,9,0,98,0,0,0,1,3,2,90,95,0,0,9,0,1,111,110,101,79,118,101,114,66,0,0,0,4,102,108,111,97,116,\n-95,114,99,112,0,18,111,110,101,79,118,101,114,66,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,\n-0,59,120,121,122,0,18,97,0,18,98,0,58,102,108,111,111,114,0,0,18,97,0,18,111,110,101,79,118,101,\n-114,66,0,48,0,0,48,47,20,0,0,1,90,95,0,0,12,0,0,109,111,100,0,1,1,0,0,12,0,97,0,0,1,1,0,0,9,0,98,0,\n-0,0,1,3,2,90,95,0,0,9,0,1,111,110,101,79,118,101,114,66,0,0,0,4,102,108,111,97,116,95,114,99,112,0,\n-18,111,110,101,79,118,101,114,66,0,0,18,98,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,97,0,18,98,\n-0,58,102,108,111,111,114,0,0,18,97,0,18,111,110,101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,\n-95,0,0,10,0,0,109,111,100,0,1,1,0,0,10,0,97,0,0,1,1,0,0,10,0,98,0,0,0,1,3,2,90,95,0,0,10,0,1,111,\n-110,101,79,118,101,114,66,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,\n-66,0,59,120,0,0,18,98,0,59,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,\n-101,114,66,0,59,121,0,0,18,98,0,59,121,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,97,0,18,98,0,58,\n-102,108,111,111,114,0,0,18,97,0,18,111,110,101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,95,0,0,\n-11,0,0,109,111,100,0,1,1,0,0,11,0,97,0,0,1,1,0,0,11,0,98,0,0,0,1,3,2,90,95,0,0,11,0,1,111,110,101,\n-79,118,101,114,66,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,66,0,59,\n-120,0,0,18,98,0,59,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,66,\n-0,59,121,0,0,18,98,0,59,121,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,\n-114,66,0,59,122,0,0,18,98,0,59,122,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,97,0,18,98,0,58,102,\n-108,111,111,114,0,0,18,97,0,18,111,110,101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,95,0,0,12,\n-0,0,109,111,100,0,1,1,0,0,12,0,97,0,0,1,1,0,0,12,0,98,0,0,0,1,3,2,90,95,0,0,12,0,1,111,110,101,79,\n-118,101,114,66,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,66,0,59,\n-120,0,0,18,98,0,59,120,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,114,66,\n-0,59,121,0,0,18,98,0,59,121,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,118,101,\n-114,66,0,59,122,0,0,18,98,0,59,122,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,111,110,101,79,\n-118,101,114,66,0,59,119,0,0,18,98,0,59,119,0,0,0,9,18,95,95,114,101,116,86,97,108,0,18,97,0,18,98,\n-0,58,102,108,111,111,114,0,0,18,97,0,18,111,110,101,79,118,101,114,66,0,48,0,0,48,47,20,0,0,1,90,\n-95,0,0,9,0,0,109,105,110,0,1,1,0,0,9,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,105,\n-110,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,0,0,10,0,0,109,105,110,0,\n-1,1,0,0,10,0,97,0,0,1,1,0,0,10,0,98,0,0,0,1,4,118,101,99,52,95,109,105,110,0,18,95,95,114,101,116,\n-86,97,108,0,59,120,121,0,0,18,97,0,59,120,121,0,0,18,98,0,59,120,121,0,0,0,0,1,90,95,0,0,11,0,0,\n-109,105,110,0,1,1,0,0,11,0,97,0,0,1,1,0,0,11,0,98,0,0,0,1,4,118,101,99,52,95,109,105,110,0,18,95,\n-95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,97,0,59,120,121,122,0,0,18,98,0,59,120,121,122,0,\n-0,0,0,1,90,95,0,0,12,0,0,109,105,110,0,1,1,0,0,12,0,97,0,0,1,1,0,0,12,0,98,0,0,0,1,4,118,101,99,52,\n-95,109,105,110,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,0,0,10,0,0,109,\n-105,110,0,1,1,0,0,10,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,105,110,0,18,95,95,114,\n-101,116,86,97,108,0,0,18,97,0,59,120,121,0,0,18,98,0,0,0,0,1,90,95,0,0,11,0,0,109,105,110,0,1,1,0,\n-0,11,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,105,110,0,18,95,95,114,101,116,86,97,\n-108,0,0,18,97,0,59,120,121,122,0,0,18,98,0,0,0,0,1,90,95,0,0,12,0,0,109,105,110,0,1,1,0,0,12,0,97,\n-0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,105,110,0,18,95,95,114,101,116,86,97,108,0,0,18,\n-97,0,0,18,98,0,0,0,0,1,90,95,0,0,9,0,0,109,97,120,0,1,1,0,0,9,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,\n-118,101,99,52,95,109,97,120,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,0,\n-0,10,0,0,109,97,120,0,1,1,0,0,10,0,97,0,0,1,1,0,0,10,0,98,0,0,0,1,4,118,101,99,52,95,109,97,120,0,\n-18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,97,0,59,120,121,0,0,18,98,0,59,120,121,0,0,0,0,\n-1,90,95,0,0,11,0,0,109,97,120,0,1,1,0,0,11,0,97,0,0,1,1,0,0,11,0,98,0,0,0,1,4,118,101,99,52,95,109,\n-97,120,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,97,0,59,120,121,122,0,0,18,98,0,59,\n-120,121,122,0,0,0,0,1,90,95,0,0,12,0,0,109,97,120,0,1,1,0,0,12,0,97,0,0,1,1,0,0,12,0,98,0,0,0,1,4,\n-118,101,99,52,95,109,97,120,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,0,\n-0,10,0,0,109,97,120,0,1,1,0,0,10,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,97,120,0,\n-18,95,95,114,101,116,86,97,108,0,0,18,97,0,59,120,121,0,0,18,98,0,0,0,0,1,90,95,0,0,11,0,0,109,97,\n-120,0,1,1,0,0,11,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,97,120,0,18,95,95,114,101,\n-116,86,97,108,0,0,18,97,0,59,120,121,122,0,0,18,98,0,0,0,0,1,90,95,0,0,12,0,0,109,97,120,0,1,1,0,0,\n-12,0,97,0,0,1,1,0,0,9,0,98,0,0,0,1,4,118,101,99,52,95,109,97,120,0,18,95,95,114,101,116,86,97,108,\n-0,0,18,97,0,0,18,98,0,0,0,0,1,90,95,0,0,9,0,0,99,108,97,109,112,0,1,1,0,0,9,0,118,97,108,0,0,1,1,0,\n-0,9,0,109,105,110,86,97,108,0,0,1,1,0,0,9,0,109,97,120,86,97,108,0,0,0,1,4,118,101,99,52,95,99,108,\n-97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,105,110,86,97,108,0,0,18,\n-109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,10,0,0,99,108,97,109,112,0,1,1,0,0,10,0,118,97,108,0,0,1,\n-1,0,0,9,0,109,105,110,86,97,108,0,0,1,1,0,0,9,0,109,97,120,86,97,108,0,0,0,1,4,118,101,99,52,95,99,\n-108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,105,110,86,97,108,0,0,\n-18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,11,0,0,99,108,97,109,112,0,1,1,0,0,11,0,118,97,108,0,0,\n-1,1,0,0,9,0,109,105,110,86,97,108,0,0,1,1,0,0,9,0,109,97,120,86,97,108,0,0,0,1,4,118,101,99,52,95,\n-99,108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,105,110,86,97,108,\n-0,0,18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,12,0,0,99,108,97,109,112,0,1,1,0,0,12,0,118,97,108,\n-0,0,1,1,0,0,9,0,109,105,110,86,97,108,0,0,1,1,0,0,9,0,109,97,120,86,97,108,0,0,0,1,4,118,101,99,52,\n-95,99,108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,105,110,86,97,\n-108,0,0,18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,10,0,0,99,108,97,109,112,0,1,1,0,0,10,0,118,97,\n-108,0,0,1,1,0,0,10,0,109,105,110,86,97,108,0,0,1,1,0,0,10,0,109,97,120,86,97,108,0,0,0,1,4,118,101,\n-99,52,95,99,108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,105,110,\n-86,97,108,0,0,18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,11,0,0,99,108,97,109,112,0,1,1,0,0,11,0,\n-118,97,108,0,0,1,1,0,0,11,0,109,105,110,86,97,108,0,0,1,1,0,0,11,0,109,97,120,86,97,108,0,0,0,1,4,\n-118,101,99,52,95,99,108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,109,\n-105,110,86,97,108,0,0,18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,12,0,0,99,108,97,109,112,0,1,1,0,\n-0,12,0,118,97,108,0,0,1,1,0,0,12,0,109,105,110,86,97,108,0,0,1,1,0,0,12,0,109,97,120,86,97,108,0,0,\n-0,1,4,118,101,99,52,95,99,108,97,109,112,0,18,95,95,114,101,116,86,97,108,0,0,18,118,97,108,0,0,18,\n-109,105,110,86,97,108,0,0,18,109,97,120,86,97,108,0,0,0,0,1,90,95,0,0,9,0,0,109,105,120,0,1,1,0,0,\n-9,0,120,0,0,1,1,0,0,9,0,121,0,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,108,114,112,0,18,95,95,\n-114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,95,0,0,10,0,0,109,105,120,0,1,1,\n-0,0,10,0,120,0,0,1,1,0,0,10,0,121,0,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,108,114,112,0,18,\n-95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,95,0,0,11,0,0,109,105,120,\n-0,1,1,0,0,11,0,120,0,0,1,1,0,0,11,0,121,0,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,108,114,112,\n-0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,95,0,0,12,0,0,109,\n-105,120,0,1,1,0,0,12,0,120,0,0,1,1,0,0,12,0,121,0,0,1,1,0,0,9,0,97,0,0,0,1,4,118,101,99,52,95,108,\n-114,112,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,95,0,0,10,0,\n-0,109,105,120,0,1,1,0,0,10,0,120,0,0,1,1,0,0,10,0,121,0,0,1,1,0,0,10,0,97,0,0,0,1,4,118,101,99,52,\n-95,108,114,112,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,95,0,\n-0,11,0,0,109,105,120,0,1,1,0,0,11,0,120,0,0,1,1,0,0,11,0,121,0,0,1,1,0,0,11,0,97,0,0,0,1,4,118,101,\n-99,52,95,108,114,112,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,0,0,1,90,\n-95,0,0,12,0,0,109,105,120,0,1,1,0,0,12,0,120,0,0,1,1,0,0,12,0,121,0,0,1,1,0,0,12,0,97,0,0,0,1,4,\n-118,101,99,52,95,108,114,112,0,18,95,95,114,101,116,86,97,108,0,0,18,97,0,0,18,121,0,0,18,120,0,0,\n-0,0,1,90,95,0,0,9,0,0,115,116,101,112,0,1,1,0,0,9,0,101,100,103,101,0,0,1,1,0,0,9,0,120,0,0,0,1,4,\n-118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,0,18,120,0,0,18,101,100,103,101,0,\n-0,0,0,1,90,95,0,0,10,0,0,115,116,101,112,0,1,1,0,0,10,0,101,100,103,101,0,0,1,1,0,0,10,0,120,0,0,0,\n-1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,120,0,0,18,\n-101,100,103,101,0,0,0,0,1,90,95,0,0,11,0,0,115,116,101,112,0,1,1,0,0,11,0,101,100,103,101,0,0,1,1,\n-0,0,11,0,120,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,\n-122,0,0,18,120,0,0,18,101,100,103,101,0,0,0,0,1,90,95,0,0,12,0,0,115,116,101,112,0,1,1,0,0,12,0,\n-101,100,103,101,0,0,1,1,0,0,12,0,120,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,\n-86,97,108,0,0,18,120,0,0,18,101,100,103,101,0,0,0,0,1,90,95,0,0,10,0,0,115,116,101,112,0,1,1,0,0,9,\n-0,101,100,103,101,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,\n-116,86,97,108,0,59,120,121,0,0,18,118,0,0,18,101,100,103,101,0,0,0,0,1,90,95,0,0,11,0,0,115,116,\n-101,112,0,1,1,0,0,9,0,101,100,103,101,0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,\n-0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,118,0,0,18,101,100,103,101,0,0,0,0,1,90,\n-95,0,0,12,0,0,115,116,101,112,0,1,1,0,0,9,0,101,100,103,101,0,0,1,1,0,0,12,0,118,0,0,0,1,4,118,101,\n-99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,0,18,118,0,0,18,101,100,103,101,0,0,0,0,1,\n-90,95,0,0,9,0,0,115,109,111,111,116,104,115,116,101,112,0,1,1,0,0,9,0,101,100,103,101,48,0,0,1,1,0,\n-0,9,0,101,100,103,101,49,0,0,1,1,0,0,9,0,120,0,0,0,1,3,2,90,95,0,0,9,0,1,116,0,2,58,99,108,97,109,\n-112,0,0,18,120,0,18,101,100,103,101,48,0,47,18,101,100,103,101,49,0,18,101,100,103,101,48,0,47,49,\n-0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,8,18,116,0,18,116,0,48,17,51,0,48,0,0,17,50,0,48,0,0,18,\n-116,0,48,47,48,0,0,1,90,95,0,0,10,0,0,115,109,111,111,116,104,115,116,101,112,0,1,1,0,0,10,0,101,\n-100,103,101,48,0,0,1,1,0,0,10,0,101,100,103,101,49,0,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,0,0,10,0,\n-1,116,0,2,58,99,108,97,109,112,0,0,18,118,0,18,101,100,103,101,48,0,47,18,101,100,103,101,49,0,18,\n-101,100,103,101,48,0,47,49,0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,8,18,116,0,18,116,0,48,17,51,\n-0,48,0,0,17,50,0,48,0,0,18,116,0,48,47,48,0,0,1,90,95,0,0,11,0,0,115,109,111,111,116,104,115,116,\n-101,112,0,1,1,0,0,11,0,101,100,103,101,48,0,0,1,1,0,0,11,0,101,100,103,101,49,0,0,1,1,0,0,11,0,118,\n-0,0,0,1,3,2,90,95,0,0,11,0,1,116,0,2,58,99,108,97,109,112,0,0,18,118,0,18,101,100,103,101,48,0,47,\n-18,101,100,103,101,49,0,18,101,100,103,101,48,0,47,49,0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,8,\n-18,116,0,18,116,0,48,17,51,0,48,0,0,17,50,0,48,0,0,18,116,0,48,47,48,0,0,1,90,95,0,0,12,0,0,115,\n-109,111,111,116,104,115,116,101,112,0,1,1,0,0,12,0,101,100,103,101,48,0,0,1,1,0,0,12,0,101,100,103,\n-101,49,0,0,1,1,0,0,12,0,118,0,0,0,1,3,2,90,95,0,0,12,0,1,116,0,2,58,99,108,97,109,112,0,0,18,118,0,\n-18,101,100,103,101,48,0,47,18,101,100,103,101,49,0,18,101,100,103,101,48,0,47,49,0,17,48,0,48,0,0,\n-0,17,49,0,48,0,0,0,0,0,0,8,18,116,0,18,116,0,48,17,51,0,48,0,0,17,50,0,48,0,0,18,116,0,48,47,48,0,\n-0,1,90,95,0,0,10,0,0,115,109,111,111,116,104,115,116,101,112,0,1,1,0,0,9,0,101,100,103,101,48,0,0,\n-1,1,0,0,9,0,101,100,103,101,49,0,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,0,0,10,0,1,116,0,2,58,99,108,\n-97,109,112,0,0,18,118,0,18,101,100,103,101,48,0,47,18,101,100,103,101,49,0,18,101,100,103,101,48,0,\n-47,49,0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,8,18,116,0,18,116,0,48,17,51,0,48,0,0,17,50,0,48,0,\n-0,18,116,0,48,47,48,0,0,1,90,95,0,0,11,0,0,115,109,111,111,116,104,115,116,101,112,0,1,1,0,0,9,0,\n-101,100,103,101,48,0,0,1,1,0,0,9,0,101,100,103,101,49,0,0,1,1,0,0,11,0,118,0,0,0,1,3,2,90,95,0,0,\n-11,0,1,116,0,2,58,99,108,97,109,112,0,0,18,118,0,18,101,100,103,101,48,0,47,18,101,100,103,101,49,\n-0,18,101,100,103,101,48,0,47,49,0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,8,18,116,0,18,116,0,48,\n-17,51,0,48,0,0,17,50,0,48,0,0,18,116,0,48,47,48,0,0,1,90,95,0,0,12,0,0,115,109,111,111,116,104,115,\n-116,101,112,0,1,1,0,0,9,0,101,100,103,101,48,0,0,1,1,0,0,9,0,101,100,103,101,49,0,0,1,1,0,0,12,0,\n-118,0,0,0,1,3,2,90,95,0,0,12,0,1,116,0,2,58,99,108,97,109,112,0,0,18,118,0,18,101,100,103,101,48,0,\n-47,18,101,100,103,101,49,0,18,101,100,103,101,48,0,47,49,0,17,48,0,48,0,0,0,17,49,0,48,0,0,0,0,0,0,\n-8,18,116,0,18,116,0,48,17,51,0,48,0,0,17,50,0,48,0,0,18,116,0,48,47,48,0,0,1,90,95,0,0,9,0,0,108,\n-101,110,103,116,104,0,1,1,0,0,9,0,120,0,0,0,1,8,58,97,98,115,0,0,18,120,0,0,0,0,0,1,90,95,0,0,9,0,\n-0,108,101,110,103,116,104,0,1,1,0,0,10,0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,114,0,0,0,3,2,90,95,1,0,9,\n-0,1,112,0,2,58,100,111,116,0,0,18,118,0,0,18,118,0,0,0,0,0,4,102,108,111,97,116,95,114,115,113,0,\n-18,114,0,0,18,112,0,0,0,4,102,108,111,97,116,95,114,99,112,0,18,95,95,114,101,116,86,97,108,0,59,\n-120,0,0,18,114,0,0,0,0,1,90,95,0,0,9,0,0,108,101,110,103,116,104,0,1,1,0,0,11,0,118,0,0,0,1,3,2,90,\n-95,0,0,9,0,1,114,0,0,0,3,2,90,95,1,0,9,0,1,112,0,2,58,100,111,116,0,0,18,118,0,0,18,118,0,0,0,0,0,\n-4,102,108,111,97,116,95,114,115,113,0,18,114,0,0,18,112,0,0,0,4,102,108,111,97,116,95,114,99,112,0,\n-18,95,95,114,101,116,86,97,108,0,0,18,114,0,0,0,0,1,90,95,0,0,9,0,0,108,101,110,103,116,104,0,1,1,\n-0,0,12,0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,114,0,0,0,3,2,90,95,1,0,9,0,1,112,0,2,58,100,111,116,0,0,\n-18,118,0,0,18,118,0,0,0,0,0,4,102,108,111,97,116,95,114,115,113,0,18,114,0,0,18,112,0,0,0,4,102,\n-108,111,97,116,95,114,99,112,0,18,95,95,114,101,116,86,97,108,0,0,18,114,0,0,0,0,1,90,95,0,0,9,0,0,\n-100,105,115,116,97,110,99,101,0,1,1,0,0,9,0,120,0,0,1,1,0,0,9,0,121,0,0,0,1,3,2,90,95,1,0,9,0,1,\n-100,0,2,18,120,0,18,121,0,47,0,0,9,18,95,95,114,101,116,86,97,108,0,58,108,101,110,103,116,104,0,0,\n-18,100,0,0,0,20,0,0,1,90,95,0,0,9,0,0,100,105,115,116,97,110,99,101,0,1,1,0,0,10,0,118,0,0,1,1,0,0,\n-10,0,117,0,0,0,1,3,2,90,95,1,0,10,0,1,100,50,0,2,18,118,0,18,117,0,47,0,0,9,18,95,95,114,101,116,\n-86,97,108,0,58,108,101,110,103,116,104,0,0,18,100,50,0,0,0,20,0,0,1,90,95,0,0,9,0,0,100,105,115,\n-116,97,110,99,101,0,1,1,0,0,11,0,118,0,0,1,1,0,0,11,0,117,0,0,0,1,3,2,90,95,1,0,11,0,1,100,51,0,2,\n-18,118,0,18,117,0,47,0,0,9,18,95,95,114,101,116,86,97,108,0,58,108,101,110,103,116,104,0,0,18,100,\n-51,0,0,0,20,0,0,1,90,95,0,0,9,0,0,100,105,115,116,97,110,99,101,0,1,1,0,0,12,0,118,0,0,1,1,0,0,12,\n-0,117,0,0,0,1,3,2,90,95,1,0,12,0,1,100,52,0,2,18,118,0,18,117,0,47,0,0,9,18,95,95,114,101,116,86,\n-97,108,0,58,108,101,110,103,116,104,0,0,18,100,52,0,0,0,20,0,0,1,90,95,0,0,11,0,0,99,114,111,115,\n-115,0,1,1,0,0,11,0,118,0,0,1,1,0,0,11,0,117,0,0,0,1,4,118,101,99,51,95,99,114,111,115,115,0,18,95,\n-95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,118,0,0,18,117,0,0,0,0,1,90,95,0,0,9,0,0,102,97,\n-99,101,102,111,114,119,97,114,100,0,1,1,0,0,9,0,78,0,0,1,1,0,0,9,0,73,0,0,1,1,0,0,9,0,78,114,101,\n-102,0,0,0,1,3,2,90,95,1,0,9,0,1,100,0,2,58,100,111,116,0,0,18,78,114,101,102,0,0,18,73,0,0,0,0,0,3,\n-2,90,95,0,0,9,0,1,115,0,0,0,4,118,101,99,52,95,115,103,116,0,18,115,0,0,17,48,0,48,0,0,0,18,100,0,\n-0,0,8,58,109,105,120,0,0,18,78,0,54,0,18,78,0,0,18,115,0,0,0,0,0,1,90,95,0,0,10,0,0,102,97,99,101,\n-102,111,114,119,97,114,100,0,1,1,0,0,10,0,78,0,0,1,1,0,0,10,0,73,0,0,1,1,0,0,10,0,78,114,101,102,0,\n-0,0,1,3,2,90,95,1,0,9,0,1,100,0,2,58,100,111,116,0,0,18,78,114,101,102,0,0,18,73,0,0,0,0,0,3,2,90,\n-95,0,0,9,0,1,115,0,0,0,4,118,101,99,52,95,115,103,116,0,18,115,0,0,17,48,0,48,0,0,0,18,100,0,0,0,8,\n-58,109,105,120,0,0,18,78,0,54,0,18,78,0,0,18,115,0,0,0,0,0,1,90,95,0,0,11,0,0,102,97,99,101,102,\n-111,114,119,97,114,100,0,1,1,0,0,11,0,78,0,0,1,1,0,0,11,0,73,0,0,1,1,0,0,11,0,78,114,101,102,0,0,0,\n-1,3,2,90,95,1,0,9,0,1,100,0,2,58,100,111,116,0,0,18,78,114,101,102,0,0,18,73,0,0,0,0,0,3,2,90,95,0,\n-0,9,0,1,115,0,0,0,4,118,101,99,52,95,115,103,116,0,18,115,0,0,17,48,0,48,0,0,0,18,100,0,0,0,8,58,\n-109,105,120,0,0,18,78,0,54,0,18,78,0,0,18,115,0,0,0,0,0,1,90,95,0,0,12,0,0,102,97,99,101,102,111,\n-114,119,97,114,100,0,1,1,0,0,12,0,78,0,0,1,1,0,0,12,0,73,0,0,1,1,0,0,12,0,78,114,101,102,0,0,0,1,3,\n-2,90,95,1,0,9,0,1,100,0,2,58,100,111,116,0,0,18,78,114,101,102,0,0,18,73,0,0,0,0,0,3,2,90,95,0,0,9,\n-0,1,115,0,0,0,4,118,101,99,52,95,115,103,116,0,18,115,0,0,17,48,0,48,0,0,0,18,100,0,0,0,8,58,109,\n-105,120,0,0,18,78,0,54,0,18,78,0,0,18,115,0,0,0,0,0,1,90,95,0,0,9,0,0,114,101,102,108,101,99,116,0,\n-1,1,0,0,9,0,73,0,0,1,1,0,0,9,0,78,0,0,0,1,8,18,73,0,17,50,0,48,0,0,58,100,111,116,0,0,18,78,0,0,18,\n-73,0,0,0,48,18,78,0,48,47,0,0,1,90,95,0,0,10,0,0,114,101,102,108,101,99,116,0,1,1,0,0,10,0,73,0,0,\n-1,1,0,0,10,0,78,0,0,0,1,8,18,73,0,17,50,0,48,0,0,58,100,111,116,0,0,18,78,0,0,18,73,0,0,0,48,18,78,\n-0,48,47,0,0,1,90,95,0,0,11,0,0,114,101,102,108,101,99,116,0,1,1,0,0,11,0,73,0,0,1,1,0,0,11,0,78,0,\n-0,0,1,8,18,73,0,17,50,0,48,0,0,58,100,111,116,0,0,18,78,0,0,18,73,0,0,0,48,18,78,0,48,47,0,0,1,90,\n-95,0,0,12,0,0,114,101,102,108,101,99,116,0,1,1,0,0,12,0,73,0,0,1,1,0,0,12,0,78,0,0,0,1,8,18,73,0,\n-17,50,0,48,0,0,58,100,111,116,0,0,18,78,0,0,18,73,0,0,0,48,18,78,0,48,47,0,0,1,90,95,0,0,9,0,0,114,\n-101,102,114,97,99,116,0,1,1,0,0,9,0,73,0,0,1,1,0,0,9,0,78,0,0,1,1,0,0,9,0,101,116,97,0,0,0,1,3,2,\n-90,95,0,0,9,0,1,110,95,100,111,116,95,105,0,2,58,100,111,116,0,0,18,78,0,0,18,73,0,0,0,0,0,3,2,90,\n-95,0,0,9,0,1,107,0,2,17,49,0,48,0,0,18,101,116,97,0,18,101,116,97,0,48,17,49,0,48,0,0,18,110,95,\n-100,111,116,95,105,0,18,110,95,100,111,116,95,105,0,48,47,48,47,0,0,3,2,90,95,0,0,9,0,1,114,101,\n-116,118,97,108,0,0,0,10,18,107,0,17,48,0,48,0,0,40,0,9,18,114,101,116,118,97,108,0,17,48,0,48,0,0,\n-20,0,9,18,114,101,116,118,97,108,0,18,101,116,97,0,18,73,0,48,18,101,116,97,0,18,110,95,100,111,\n-116,95,105,0,48,58,115,113,114,116,0,0,18,107,0,0,0,46,18,78,0,48,47,20,0,8,18,114,101,116,118,97,\n-108,0,0,0,1,90,95,0,0,10,0,0,114,101,102,114,97,99,116,0,1,1,0,0,10,0,73,0,0,1,1,0,0,10,0,78,0,0,1,\n-1,0,0,9,0,101,116,97,0,0,0,1,3,2,90,95,0,0,9,0,1,110,95,100,111,116,95,105,0,2,58,100,111,116,0,0,\n-18,78,0,0,18,73,0,0,0,0,0,3,2,90,95,0,0,9,0,1,107,0,2,17,49,0,48,0,0,18,101,116,97,0,18,101,116,97,\n-0,48,17,49,0,48,0,0,18,110,95,100,111,116,95,105,0,18,110,95,100,111,116,95,105,0,48,47,48,47,0,0,\n-3,2,90,95,0,0,10,0,1,114,101,116,118,97,108,0,0,0,10,18,107,0,17,48,0,48,0,0,40,0,9,18,114,101,116,\n-118,97,108,0,58,118,101,99,50,0,0,17,48,0,48,0,0,0,0,20,0,9,18,114,101,116,118,97,108,0,18,101,116,\n-97,0,18,73,0,48,18,101,116,97,0,18,110,95,100,111,116,95,105,0,48,58,115,113,114,116,0,0,18,107,0,\n-0,0,46,18,78,0,48,47,20,0,8,18,114,101,116,118,97,108,0,0,0,1,90,95,0,0,11,0,0,114,101,102,114,97,\n-99,116,0,1,1,0,0,11,0,73,0,0,1,1,0,0,11,0,78,0,0,1,1,0,0,9,0,101,116,97,0,0,0,1,3,2,90,95,0,0,9,0,\n-1,110,95,100,111,116,95,105,0,2,58,100,111,116,0,0,18,78,0,0,18,73,0,0,0,0,0,3,2,90,95,0,0,9,0,1,\n-107,0,2,17,49,0,48,0,0,18,101,116,97,0,18,101,116,97,0,48,17,49,0,48,0,0,18,110,95,100,111,116,95,\n-105,0,18,110,95,100,111,116,95,105,0,48,47,48,47,0,0,3,2,90,95,0,0,11,0,1,114,101,116,118,97,108,0,\n-0,0,10,18,107,0,17,48,0,48,0,0,40,0,9,18,114,101,116,118,97,108,0,58,118,101,99,51,0,0,17,48,0,48,\n-0,0,0,0,20,0,9,18,114,101,116,118,97,108,0,18,101,116,97,0,18,73,0,48,18,101,116,97,0,18,110,95,\n-100,111,116,95,105,0,48,58,115,113,114,116,0,0,18,107,0,0,0,46,18,78,0,48,47,20,0,8,18,114,101,116,\n-118,97,108,0,0,0,1,90,95,0,0,12,0,0,114,101,102,114,97,99,116,0,1,1,0,0,12,0,73,0,0,1,1,0,0,12,0,\n-78,0,0,1,1,0,0,9,0,101,116,97,0,0,0,1,3,2,90,95,0,0,9,0,1,110,95,100,111,116,95,105,0,2,58,100,111,\n-116,0,0,18,78,0,0,18,73,0,0,0,0,0,3,2,90,95,0,0,9,0,1,107,0,2,17,49,0,48,0,0,18,101,116,97,0,18,\n-101,116,97,0,48,17,49,0,48,0,0,18,110,95,100,111,116,95,105,0,18,110,95,100,111,116,95,105,0,48,47,\n-48,47,0,0,3,2,90,95,0,0,12,0,1,114,101,116,118,97,108,0,0,0,10,18,107,0,17,48,0,48,0,0,40,0,9,18,\n-114,101,116,118,97,108,0,58,118,101,99,52,0,0,17,48,0,48,0,0,0,0,20,0,9,18,114,101,116,118,97,108,\n-0,18,101,116,97,0,18,73,0,48,18,101,116,97,0,18,110,95,100,111,116,95,105,0,48,58,115,113,114,116,\n-0,0,18,107,0,0,0,46,18,78,0,48,47,20,0,8,18,114,101,116,118,97,108,0,0,0,1,90,95,0,0,13,0,0,109,97,\n-116,114,105,120,67,111,109,112,77,117,108,116,0,1,0,0,0,13,0,109,0,0,1,0,0,0,13,0,110,0,0,0,1,8,58,\n-109,97,116,50,0,0,18,109,0,16,8,48,0,57,18,110,0,16,8,48,0,57,48,0,18,109,0,16,10,49,0,57,18,110,0,\n-16,10,49,0,57,48,0,0,0,0,1,90,95,0,0,14,0,0,109,97,116,114,105,120,67,111,109,112,77,117,108,116,0,\n-1,0,0,0,14,0,109,0,0,1,0,0,0,14,0,110,0,0,0,1,8,58,109,97,116,51,0,0,18,109,0,16,8,48,0,57,18,110,\n-0,16,8,48,0,57,48,0,18,109,0,16,10,49,0,57,18,110,0,16,10,49,0,57,48,0,18,109,0,16,10,50,0,57,18,\n-110,0,16,10,50,0,57,48,0,0,0,0,1,90,95,0,0,15,0,0,109,97,116,114,105,120,67,111,109,112,77,117,108,\n-116,0,1,0,0,0,15,0,109,0,0,1,0,0,0,15,0,110,0,0,0,1,8,58,109,97,116,52,0,0,18,109,0,16,8,48,0,57,\n-18,110,0,16,8,48,0,57,48,0,18,109,0,16,10,49,0,57,18,110,0,16,10,49,0,57,48,0,18,109,0,16,10,50,0,\n-57,18,110,0,16,10,50,0,57,48,0,18,109,0,16,10,51,0,57,18,110,0,16,10,51,0,57,48,0,0,0,0,1,90,95,0,\n-0,2,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,10,0,117,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,\n-52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,\n-95,0,0,3,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,11,0,117,0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,\n-101,99,52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,\n-0,0,0,1,90,95,0,0,4,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,\n-0,1,4,118,101,99,52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,\n-1,90,95,0,0,2,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,118,0,0,0,1,4,\n-118,101,99,52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,\n-0,0,0,1,90,95,0,0,3,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,7,0,117,0,0,1,1,0,0,7,0,118,0,0,0,\n-1,4,118,101,99,52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,\n-18,118,0,0,0,0,1,90,95,0,0,4,0,0,108,101,115,115,84,104,97,110,0,1,1,0,0,8,0,117,0,0,1,1,0,0,8,0,\n-118,0,0,0,1,4,118,101,99,52,95,115,108,116,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,\n-0,0,0,0,1,90,95,0,0,2,0,0,108,101,115,115,84,104,97,110,69,113,117,97,108,0,1,1,0,0,10,0,117,0,0,1,\n-1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,115,108,101,0,18,95,95,114,101,116,86,97,108,0,59,120,\n-121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,3,0,0,108,101,115,115,84,104,97,110,69,113,117,97,\n-108,0,1,1,0,0,11,0,117,0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,101,99,52,95,115,108,101,0,18,95,95,114,\n-101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,108,101,115,115,\n-84,104,97,110,69,113,117,97,108,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,0,1,4,118,101,99,52,95,\n-115,108,101,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,108,\n-101,115,115,84,104,97,110,69,113,117,97,108,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,118,0,0,0,1,4,118,\n-101,99,52,95,115,108,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,\n-0,1,90,95,0,0,3,0,0,108,101,115,115,84,104,97,110,69,113,117,97,108,0,1,1,0,0,7,0,117,0,0,1,1,0,0,\n-7,0,118,0,0,0,1,4,118,101,99,52,95,115,108,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,\n-0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,108,101,115,115,84,104,97,110,69,113,117,97,108,0,1,\n-1,0,0,8,0,117,0,0,1,1,0,0,8,0,118,0,0,0,1,4,118,101,99,52,95,115,108,101,0,18,95,95,114,101,116,86,\n-97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,103,114,101,97,116,101,114,84,104,97,110,0,\n-1,1,0,0,10,0,117,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,115,103,116,0,18,95,95,114,101,\n-116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,3,0,0,103,114,101,97,116,101,\n-114,84,104,97,110,0,1,1,0,0,11,0,117,0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,101,99,52,95,115,103,116,0,\n-18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,\n-103,114,101,97,116,101,114,84,104,97,110,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,0,1,4,118,101,\n-99,52,95,115,103,116,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,\n-0,0,103,114,101,97,116,101,114,84,104,97,110,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,118,0,0,0,1,4,118,\n-101,99,52,95,115,103,116,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,59,120,121,0,0,\n-18,118,0,59,120,121,0,0,0,0,1,90,95,0,0,3,0,0,103,114,101,97,116,101,114,84,104,97,110,0,1,1,0,0,7,\n-0,117,0,0,1,1,0,0,7,0,118,0,0,0,1,4,118,101,99,52,95,115,103,116,0,18,95,95,114,101,116,86,97,108,\n-0,59,120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,103,114,101,97,116,101,114,84,104,\n-97,110,0,1,1,0,0,8,0,117,0,0,1,1,0,0,8,0,118,0,0,0,1,4,118,101,99,52,95,115,103,116,0,18,95,95,114,\n-101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,103,114,101,97,116,101,114,84,\n-104,97,110,69,113,117,97,108,0,1,1,0,0,10,0,117,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,\n-115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,\n-0,3,0,0,103,114,101,97,116,101,114,84,104,97,110,69,113,117,97,108,0,1,1,0,0,11,0,117,0,0,1,1,0,0,\n-11,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,\n-0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,103,114,101,97,116,101,114,84,104,97,110,69,113,\n-117,97,108,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,\n-95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,103,114,101,97,116,101,\n-114,84,104,97,110,69,113,117,97,108,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,118,0,0,0,1,4,118,101,99,52,\n-95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,\n-0,0,3,0,0,103,114,101,97,116,101,114,84,104,97,110,69,113,117,97,108,0,1,1,0,0,7,0,117,0,0,1,1,0,0,\n-7,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,\n-0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,103,114,101,97,116,101,114,84,104,97,110,69,113,117,\n-97,108,0,1,1,0,0,8,0,117,0,0,1,1,0,0,8,0,118,0,0,0,1,4,118,101,99,52,95,115,103,101,0,18,95,95,114,\n-101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,101,113,117,97,108,0,1,1,0,0,10,\n-0,117,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,\n-0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,3,0,0,101,113,117,97,108,0,1,1,0,0,11,0,117,\n-0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,\n-120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,101,113,117,97,108,0,1,1,0,0,12,0,117,\n-0,0,1,1,0,0,12,0,118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,0,\n-18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,101,113,117,97,108,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,\n-118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,\n-117,0,0,18,118,0,0,0,0,1,90,95,0,0,3,0,0,101,113,117,97,108,0,1,1,0,0,7,0,117,0,0,1,1,0,0,7,0,118,\n-0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,\n-117,0,0,18,118,0,0,0,0,1,90,95,0,0,4,0,0,101,113,117,97,108,0,1,1,0,0,8,0,117,0,0,1,1,0,0,8,0,118,\n-0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,\n-0,0,1,90,95,0,0,2,0,0,101,113,117,97,108,0,1,1,0,0,2,0,117,0,0,1,1,0,0,2,0,118,0,0,0,1,4,118,101,\n-99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,\n-90,95,0,0,3,0,0,101,113,117,97,108,0,1,1,0,0,3,0,117,0,0,1,1,0,0,3,0,118,0,0,0,1,4,118,101,99,52,\n-95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,1,\n-90,95,0,0,4,0,0,101,113,117,97,108,0,1,1,0,0,4,0,117,0,0,1,1,0,0,4,0,118,0,0,0,1,4,118,101,99,52,\n-95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,0,2,0,0,\n-110,111,116,69,113,117,97,108,0,1,1,0,0,10,0,117,0,0,1,1,0,0,10,0,118,0,0,0,1,4,118,101,99,52,95,\n-115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,90,95,0,\n-0,3,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,11,0,117,0,0,1,1,0,0,11,0,118,0,0,0,1,4,118,101,99,\n-52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,0,0,0,\n-1,90,95,0,0,4,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,12,0,117,0,0,1,1,0,0,12,0,118,0,0,0,1,4,\n-118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,90,\n-95,0,0,2,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,6,0,117,0,0,1,1,0,0,6,0,118,0,0,0,1,4,118,101,\n-99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,0,1,\n-90,95,0,0,3,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,7,0,117,0,0,1,1,0,0,7,0,118,0,0,0,1,4,118,\n-101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,118,0,\n-0,0,0,1,90,95,0,0,4,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,8,0,117,0,0,1,1,0,0,8,0,118,0,0,0,\n-1,4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,0,0,1,\n-90,95,0,0,2,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,2,0,117,0,0,1,1,0,0,2,0,118,0,0,0,1,4,118,\n-101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,0,0,18,117,0,0,18,118,0,0,0,\n-0,1,90,95,0,0,3,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,3,0,117,0,0,1,1,0,0,3,0,118,0,0,0,1,4,\n-118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,121,122,0,0,18,117,0,0,18,\n-118,0,0,0,0,1,90,95,0,0,4,0,0,110,111,116,69,113,117,97,108,0,1,1,0,0,4,0,117,0,0,1,1,0,0,4,0,118,\n-0,0,0,1,4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,117,0,0,18,118,0,0,\n-0,0,1,90,95,0,0,1,0,0,97,110,121,0,1,1,0,0,2,0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,115,117,109,0,0,0,4,\n-118,101,99,52,95,97,100,100,0,18,115,117,109,0,59,120,0,0,18,118,0,59,120,0,0,18,118,0,59,121,0,0,\n-0,4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,115,117,109,0,59,\n-120,0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,1,0,0,97,110,121,0,1,1,0,0,3,0,118,0,0,0,1,3,2,90,95,0,0,\n-9,0,1,115,117,109,0,0,0,4,118,101,99,52,95,97,100,100,0,18,115,117,109,0,59,120,0,0,18,118,0,59,\n-120,0,0,18,118,0,59,121,0,0,0,4,118,101,99,52,95,97,100,100,0,18,115,117,109,0,59,120,0,0,18,115,\n-117,109,0,59,120,0,0,18,118,0,59,122,0,0,0,4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,\n-86,97,108,0,59,120,0,0,18,115,117,109,0,59,120,0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,1,0,0,97,110,\n-121,0,1,1,0,0,4,0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,115,117,109,0,0,0,4,118,101,99,52,95,97,100,100,\n-0,18,115,117,109,0,59,120,0,0,18,118,0,59,120,0,0,18,118,0,59,121,0,0,0,4,118,101,99,52,95,97,100,\n-100,0,18,115,117,109,0,59,120,0,0,18,115,117,109,0,59,120,0,0,18,118,0,59,122,0,0,0,4,118,101,99,\n-52,95,97,100,100,0,18,115,117,109,0,59,120,0,0,18,115,117,109,0,59,120,0,0,18,118,0,59,119,0,0,0,4,\n-118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,59,120,0,0,18,115,117,109,0,59,120,\n-0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,1,0,0,97,108,108,0,1,1,0,0,2,0,118,0,0,0,1,3,2,90,95,0,0,9,0,\n-1,112,114,111,100,0,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,112,114,111,100,0,\n-0,18,118,0,59,120,0,0,18,118,0,59,121,0,0,0,4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,\n-86,97,108,0,0,18,112,114,111,100,0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,1,0,0,97,108,108,0,1,1,0,0,3,\n-0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,112,114,111,100,0,0,0,4,118,101,99,52,95,109,117,108,116,105,112,\n-108,121,0,18,112,114,111,100,0,0,18,118,0,59,120,0,0,18,118,0,59,121,0,0,0,4,118,101,99,52,95,109,\n-117,108,116,105,112,108,121,0,18,112,114,111,100,0,0,18,112,114,111,100,0,0,18,118,0,59,122,0,0,0,\n-4,118,101,99,52,95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,112,114,111,100,0,0,17,48,0,\n-48,0,0,0,0,0,1,90,95,0,0,1,0,0,97,108,108,0,1,1,0,0,4,0,118,0,0,0,1,3,2,90,95,0,0,9,0,1,112,114,\n-111,100,0,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,112,114,111,100,0,0,18,118,0,\n-59,120,0,0,18,118,0,59,121,0,0,0,4,118,101,99,52,95,109,117,108,116,105,112,108,121,0,18,112,114,\n-111,100,0,0,18,112,114,111,100,0,0,18,118,0,59,122,0,0,0,4,118,101,99,52,95,109,117,108,116,105,\n-112,108,121,0,18,112,114,111,100,0,0,18,112,114,111,100,0,0,18,118,0,59,119,0,0,0,4,118,101,99,52,\n-95,115,110,101,0,18,95,95,114,101,116,86,97,108,0,0,18,112,114,111,100,0,0,17,48,0,48,0,0,0,0,0,1,\n-90,95,0,0,2,0,0,110,111,116,0,1,1,0,0,2,0,118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,\n-114,101,116,86,97,108,0,59,120,121,0,0,18,118,0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,3,0,0,110,111,\n-116,0,1,1,0,0,3,0,118,0,0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,59,\n-120,121,122,0,0,18,118,0,0,17,48,0,48,0,0,0,0,0,1,90,95,0,0,4,0,0,110,111,116,0,1,1,0,0,4,0,118,0,\n-0,0,1,4,118,101,99,52,95,115,101,113,0,18,95,95,114,101,116,86,97,108,0,0,18,118,0,0,17,48,0,48,0,\n-0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,49,68,0,1,1,0,0,16,0,115,97,109,112,108,101,\n-114,0,0,1,1,0,0,9,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,49,100,0,18,95,95,\n-114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,\n-0,0,12,0,0,116,101,120,116,117,114,101,49,68,80,114,111,106,0,1,1,0,0,16,0,115,97,109,112,108,101,\n-114,0,0,1,1,0,0,10,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,49,100,95,112,\n-114,111,106,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,\n-114,100,0,59,120,121,121,121,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,49,68,80,114,\n-111,106,0,1,1,0,0,16,0,115,97,109,112,108,101,114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,\n-118,101,99,52,95,116,101,120,95,49,100,95,112,114,111,106,0,18,95,95,114,101,116,86,97,108,0,0,18,\n-115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,\n-117,114,101,50,68,0,1,1,0,0,17,0,115,97,109,112,108,101,114,0,0,1,1,0,0,10,0,99,111,111,114,100,0,\n-0,0,1,4,118,101,99,52,95,116,101,120,95,50,100,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,\n-112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,\n-50,68,80,114,111,106,0,1,1,0,0,17,0,115,97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,100,\n-0,0,0,1,4,118,101,99,52,95,116,101,120,95,50,100,95,112,114,111,106,0,18,95,95,114,101,116,86,97,\n-108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,59,120,121,122,122,0,0,0,0,1,90,\n-95,0,0,12,0,0,116,101,120,116,117,114,101,50,68,80,114,111,106,0,1,1,0,0,17,0,115,97,109,112,108,\n-101,114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,50,100,95,\n-112,114,111,106,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,\n-111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,51,68,0,1,1,0,0,18,0,115,97,109,\n-112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,51,\n-100,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,\n-0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,51,68,80,114,111,106,0,1,1,0,0,18,0,115,97,\n-109,112,108,101,114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,\n-51,100,95,112,114,111,106,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,\n-18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,67,117,98,101,0,1,1,0,\n-0,19,0,115,97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,\n-116,101,120,95,99,117,98,101,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,\n-0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,115,104,97,100,111,119,49,68,0,1,1,0,0,20,0,115,\n-97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,\n-95,49,100,95,115,104,97,100,111,119,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,\n-114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,115,104,97,100,111,119,49,68,80,114,111,\n-106,0,1,1,0,0,20,0,115,97,109,112,108,101,114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,\n-101,99,52,95,116,101,120,95,49,100,95,112,114,111,106,95,115,104,97,100,111,119,0,18,95,95,114,101,\n-116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,\n-0,115,104,97,100,111,119,50,68,0,1,1,0,0,21,0,115,97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,\n-111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,50,100,95,115,104,97,100,111,119,0,18,95,95,\n-114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,\n-0,0,12,0,0,115,104,97,100,111,119,50,68,80,114,111,106,0,1,1,0,0,21,0,115,97,109,112,108,101,114,0,\n-0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,50,100,95,112,114,111,\n-106,95,115,104,97,100,111,119,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,\n-0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,50,68,82,101,99,116,\n-0,1,1,0,0,22,0,115,97,109,112,108,101,114,0,0,1,1,0,0,10,0,99,111,111,114,100,0,0,0,1,4,118,101,99,\n-52,95,116,101,120,95,114,101,99,116,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,112,108,101,\n-114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,50,68,82,101,\n-99,116,80,114,111,106,0,1,1,0,0,22,0,115,97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,\n-100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,114,101,99,116,95,112,114,111,106,0,18,95,95,114,101,\n-116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,59,120,121,122,122,0,0,\n-0,0,1,90,95,0,0,12,0,0,116,101,120,116,117,114,101,50,68,82,101,99,116,80,114,111,106,0,1,1,0,0,22,\n-0,115,97,109,112,108,101,114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,\n-101,120,95,114,101,99,116,95,112,114,111,106,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,\n-112,108,101,114,0,0,18,99,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,0,115,104,97,100,111,119,50,\n-68,82,101,99,116,0,1,1,0,0,23,0,115,97,109,112,108,101,114,0,0,1,1,0,0,11,0,99,111,111,114,100,0,0,\n-0,1,4,118,101,99,52,95,116,101,120,95,114,101,99,116,95,115,104,97,100,111,119,0,18,95,95,114,101,\n-116,86,97,108,0,0,18,115,97,109,112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,12,0,\n-0,115,104,97,100,111,119,50,68,82,101,99,116,80,114,111,106,0,1,1,0,0,23,0,115,97,109,112,108,101,\n-114,0,0,1,1,0,0,12,0,99,111,111,114,100,0,0,0,1,4,118,101,99,52,95,116,101,120,95,114,101,99,116,\n-95,112,114,111,106,95,115,104,97,100,111,119,0,18,95,95,114,101,116,86,97,108,0,0,18,115,97,109,\n-112,108,101,114,0,0,18,99,111,111,114,100,0,0,0,0,1,90,95,0,0,9,0,0,110,111,105,115,101,49,0,1,1,0,\n-0,9,0,120,0,0,0,1,4,102,108,111,97,116,95,110,111,105,115,101,49,0,18,95,95,114,101,116,86,97,108,\n-0,0,18,120,0,0,0,0,1,90,95,0,0,9,0,0,110,111,105,115,101,49,0,1,1,0,0,10,0,120,0,0,0,1,4,102,108,\n-111,97,116,95,110,111,105,115,101,50,0,18,95,95,114,101,116,86,97,108,0,0,18,120,0,0,0,0,1,90,95,0,\n-0,9,0,0,110,111,105,115,101,49,0,1,1,0,0,11,0,120,0,0,0,1,4,102,108,111,97,116,95,110,111,105,115,\n-101,51,0,18,95,95,114,101,116,86,97,108,0,0,18,120,0,0,0,0,1,90,95,0,0,9,0,0,110,111,105,115,101,\n-49,0,1,1,0,0,12,0,120,0,0,0,1,4,102,108,111,97,116,95,110,111,105,115,101,52,0,18,95,95,114,101,\n-116,86,97,108,0,0,18,120,0,0,0,0,1,90,95,0,0,10,0,0,110,111,105,115,101,50,0,1,1,0,0,9,0,120,0,0,0,\n-1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,\n-95,95,114,101,116,86,97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,17,49,57,0,51,52,0,0,\n-46,0,0,20,0,0,1,90,95,0,0,10,0,0,110,111,105,115,101,50,0,1,1,0,0,10,0,120,0,0,0,1,9,18,95,95,114,\n-101,116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,\n-116,86,97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,50,0,0,17,49,57,0,51,\n-52,0,0,0,17,55,0,54,54,0,0,0,0,46,0,0,20,0,0,1,90,95,0,0,10,0,0,110,111,105,115,101,50,0,1,1,0,0,\n-11,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,\n-0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,\n-118,101,99,51,0,0,17,49,57,0,51,52,0,0,0,17,55,0,54,54,0,0,0,17,51,0,50,51,0,0,0,0,46,0,0,20,0,0,1,\n-90,95,0,0,10,0,0,110,111,105,115,101,50,0,1,1,0,0,12,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,\n-108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,\n-59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,49,57,0,51,52,0,0,0,17,55,\n-0,54,54,0,0,0,17,51,0,50,51,0,0,0,17,50,0,55,55,0,0,0,0,46,0,0,20,0,0,1,90,95,0,0,11,0,0,110,111,\n-105,115,101,51,0,1,1,0,0,9,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,110,111,\n-105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,110,111,105,\n-115,101,49,0,0,18,120,0,17,49,57,0,51,52,0,0,46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,\n-0,58,110,111,105,115,101,49,0,0,18,120,0,17,53,0,52,55,0,0,46,0,0,20,0,0,1,90,95,0,0,11,0,0,110,\n-111,105,115,101,51,0,1,1,0,0,10,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,110,\n-111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,110,111,\n-105,115,101,49,0,0,18,120,0,58,118,101,99,50,0,0,17,49,57,0,51,52,0,0,0,17,55,0,54,54,0,0,0,0,46,0,\n-0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,\n-101,99,50,0,0,17,53,0,52,55,0,0,0,17,49,55,0,56,53,0,0,0,0,46,0,0,20,0,0,1,90,95,0,0,11,0,0,110,\n-111,105,115,101,51,0,1,1,0,0,11,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,110,\n-111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,110,111,\n-105,115,101,49,0,0,18,120,0,58,118,101,99,51,0,0,17,49,57,0,51,52,0,0,0,17,55,0,54,54,0,0,0,17,51,\n-0,50,51,0,0,0,0,46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,110,111,105,115,101,49,\n-0,0,18,120,0,58,118,101,99,51,0,0,17,53,0,52,55,0,0,0,17,49,55,0,56,53,0,0,0,17,49,49,0,48,52,0,0,\n-0,0,46,0,0,20,0,0,1,90,95,0,0,11,0,0,110,111,105,115,101,51,0,1,1,0,0,12,0,120,0,0,0,1,9,18,95,95,\n-114,101,116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,\n-101,116,86,97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,49,57,\n-0,51,52,0,0,0,17,55,0,54,54,0,0,0,17,51,0,50,51,0,0,0,17,50,0,55,55,0,0,0,0,46,0,0,20,0,9,18,95,95,\n-114,101,116,86,97,108,0,59,122,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,53,\n-0,52,55,0,0,0,17,49,55,0,56,53,0,0,0,17,49,49,0,48,52,0,0,0,17,49,51,0,49,57,0,0,0,0,46,0,0,20,0,0,\n-1,90,95,0,0,12,0,0,110,111,105,115,101,52,0,1,1,0,0,9,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,\n-108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,\n-59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,17,49,57,0,51,52,0,0,46,0,0,20,0,9,18,95,95,114,\n-101,116,86,97,108,0,59,122,0,58,110,111,105,115,101,49,0,0,18,120,0,17,53,0,52,55,0,0,46,0,0,20,0,\n-9,18,95,95,114,101,116,86,97,108,0,59,119,0,58,110,111,105,115,101,49,0,0,18,120,0,17,50,51,0,53,\n-52,0,0,46,0,0,20,0,0,1,90,95,0,0,12,0,0,110,111,105,115,101,52,0,1,1,0,0,10,0,120,0,0,0,1,9,18,95,\n-95,114,101,116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,\n-101,116,86,97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,50,0,0,17,49,57,\n-0,51,52,0,0,0,17,55,0,54,54,0,0,0,0,46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,110,\n-111,105,115,101,49,0,0,18,120,0,58,118,101,99,50,0,0,17,53,0,52,55,0,0,0,17,49,55,0,56,53,0,0,0,0,\n-46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,119,0,58,110,111,105,115,101,49,0,0,18,120,0,58,\n-118,101,99,50,0,0,17,50,51,0,53,52,0,0,0,17,50,57,0,49,49,0,0,0,0,46,0,0,20,0,0,1,90,95,0,0,12,0,0,\n-110,111,105,115,101,52,0,1,1,0,0,11,0,120,0,0,0,1,9,18,95,95,114,101,116,86,97,108,0,59,120,0,58,\n-110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,121,0,58,110,\n-111,105,115,101,49,0,0,18,120,0,58,118,101,99,51,0,0,17,49,57,0,51,52,0,0,0,17,55,0,54,54,0,0,0,17,\n-51,0,50,51,0,0,0,0,46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,122,0,58,110,111,105,115,101,\n-49,0,0,18,120,0,58,118,101,99,51,0,0,17,53,0,52,55,0,0,0,17,49,55,0,56,53,0,0,0,17,49,49,0,48,52,0,\n-0,0,0,46,0,0,20,0,9,18,95,95,114,101,116,86,97,108,0,59,119,0,58,110,111,105,115,101,49,0,0,18,120,\n-0,58,118,101,99,51,0,0,17,50,51,0,53,52,0,0,0,17,50,57,0,49,49,0,0,0,17,51,49,0,57,49,0,0,0,0,46,0,\n-0,20,0,0,1,90,95,0,0,12,0,0,110,111,105,115,101,52,0,1,1,0,0,12,0,120,0,0,0,1,9,18,95,95,114,101,\n-116,86,97,108,0,59,120,0,58,110,111,105,115,101,49,0,0,18,120,0,0,0,20,0,9,18,95,95,114,101,116,86,\n-97,108,0,59,121,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,49,57,0,51,52,0,0,\n-0,17,55,0,54,54,0,0,0,17,51,0,50,51,0,0,0,17,50,0,55,55,0,0,0,0,46,0,0,20,0,9,18,95,95,114,101,116,\n-86,97,108,0,59,122,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,53,0,52,55,0,0,\n-0,17,49,55,0,56,53,0,0,0,17,49,49,0,48,52,0,0,0,17,49,51,0,49,57,0,0,0,0,46,0,0,20,0,9,18,95,95,\n-114,101,116,86,97,108,0,59,119,0,58,110,111,105,115,101,49,0,0,18,120,0,58,118,101,99,52,0,0,17,50,\n-51,0,53,52,0,0,0,17,50,57,0,49,49,0,0,0,17,51,49,0,57,49,0,0,0,17,51,55,0,52,56,0,0,0,0,46,0,0,20,\n-0,0,0\n"} {"commit":"1c14858c9f0a318fd723bdcfe1374516d99b7646","subject":"Updates documentation of the PresetAssignments class to match current code.","message":"Updates documentation of the PresetAssignments class to match current code.\n\nPiperOrigin-RevId: 301250111\nChange-Id: Ief0b6f3a0a3d2b19f2d5155f73258676c6f5e0da\n","repos":"gautam1858\/tensorflow,petewarden\/tensorflow,davidzchen\/tensorflow,gautam1858\/tensorflow,frreiss\/tensorflow-fred,petewarden\/tensorflow,paolodedios\/tensorflow,gautam1858\/tensorflow,annarev\/tensorflow,aam-at\/tensorflow,petewarden\/tensorflow,cxxgtxy\/tensorflow,yongtang\/tensorflow,aldian\/tensorflow,paolodedios\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,gautam1858\/tensorflow,freedomtan\/tensorflow,sarvex\/tensorflow,annarev\/tensorflow,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,frreiss\/tensorflow-fred,sarvex\/tensorflow,yongtang\/tensorflow,aldian\/tensorflow,gautam1858\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,sarvex\/tensorflow,tensorflow\/tensorflow,karllessard\/tensorflow,paolodedios\/tensorflow,freedomtan\/tensorflow,freedomtan\/tensorflow,freedomtan\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,aldian\/tensorflow,karllessard\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,frreiss\/tensorflow-fred,sarvex\/tensorflow,tensorflow\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-experimental_link_static_libraries_once,yongtang\/tensorflow,gunan\/tensorflow,gautam1858\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,paolodedios\/tensorflow,aam-at\/tensorflow,gautam1858\/tensorflow,sarvex\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,Intel-Corporation\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,Intel-Corporation\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-pywrap_tf_optimizer,annarev\/tensorflow,davidzchen\/tensorflow,karllessard\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow,gunan\/tensorflow,karllessard\/tensorflow,gunan\/tensorflow,Intel-tensorflow\/tensorflow,gautam1858\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,petewarden\/tensorflow,tensorflow\/tensorflow,karllessard\/tensorflow,petewarden\/tensorflow,Intel-Corporation\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,karllessard\/tensorflow,petewarden\/tensorflow,aldian\/tensorflow,yongtang\/tensorflow,gunan\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,Intel-Corporation\/tensorflow,annarev\/tensorflow,paolodedios\/tensorflow,davidzchen\/tensorflow,davidzchen\/tensorflow,aam-at\/tensorflow,Intel-tensorflow\/tensorflow,aam-at\/tensorflow,petewarden\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,freedomtan\/tensorflow,Intel-tensorflow\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,annarev\/tensorflow,frreiss\/tensorflow-fred,karllessard\/tensorflow,annarev\/tensorflow,frreiss\/tensorflow-fred,paolodedios\/tensorflow,cxxgtxy\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,frreiss\/tensorflow-fred,cxxgtxy\/tensorflow,davidzchen\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-pywrap_tf_optimizer,cxxgtxy\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow,aam-at\/tensorflow,Intel-Corporation\/tensorflow,karllessard\/tensorflow,petewarden\/tensorflow,gunan\/tensorflow,karllessard\/tensorflow,Intel-tensorflow\/tensorflow,gunan\/tensorflow,tensorflow\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow-pywrap_saved_model,gunan\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow,Intel-tensorflow\/tensorflow,petewarden\/tensorflow,gunan\/tensorflow,aam-at\/tensorflow,cxxgtxy\/tensorflow,cxxgtxy\/tensorflow,petewarden\/tensorflow,frreiss\/tensorflow-fred,gautam1858\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,yongtang\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aam-at\/tensorflow,davidzchen\/tensorflow,Intel-tensorflow\/tensorflow,cxxgtxy\/tensorflow,gautam1858\/tensorflow,gautam1858\/tensorflow,davidzchen\/tensorflow,Intel-tensorflow\/tensorflow,karllessard\/tensorflow,annarev\/tensorflow,annarev\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow-experimental_link_static_libraries_once,aam-at\/tensorflow,gunan\/tensorflow,sarvex\/tensorflow,yongtang\/tensorflow,petewarden\/tensorflow,Intel-Corporation\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,Intel-tensorflow\/tensorflow,petewarden\/tensorflow,gunan\/tensorflow,Intel-tensorflow\/tensorflow,gunan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,annarev\/tensorflow,freedomtan\/tensorflow,annarev\/tensorflow,yongtang\/tensorflow,gunan\/tensorflow,frreiss\/tensorflow-fred,paolodedios\/tensorflow,Intel-Corporation\/tensorflow,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-pywrap_saved_model,aldian\/tensorflow,yongtang\/tensorflow,aldian\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,Intel-Corporation\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow,yongtang\/tensorflow,cxxgtxy\/tensorflow,yongtang\/tensorflow,davidzchen\/tensorflow,aldian\/tensorflow,aam-at\/tensorflow,aam-at\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow,aam-at\/tensorflow,frreiss\/tensorflow-fred,davidzchen\/tensorflow,paolodedios\/tensorflow,paolodedios\/tensorflow,freedomtan\/tensorflow,aldian\/tensorflow,gautam1858\/tensorflow","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tensorflow\/compiler\/xla\/service\/memory_space_assignment.h\n+++ tensorflow\/compiler\/xla\/service\/memory_space_assignment.h\n@@ -23,9 +23,10 @@\n \n \/\/ This class contains pre-set assignments determined by memory space\n \/\/ assignment. It contains two data structures: (1) a chunks vector that maps a\n-\/\/ defining HloPosition to a Chunk (offset and size), and (2) a sizes vector\n-\/\/ that maps the memory space to its size. If there is only one alternate memory\n-\/\/ space like there is currently, there will be one entry in sizes.\n+\/\/ defining HloPosition to a Chunk (offset and size), and (2) an assignment_info\n+\/\/ vector that maps the memory space to information like its allocated size and\n+\/\/ heap memory trace. If there is only one alternate memory space like there is\n+\/\/ currently, there will be one entry in assignment_info.\n class PresetAssignments {\n public:\n \/\/ Contains per-memory-space information like the allocated size and heap\n"} {"commit":"ce91cd603e0e537396a9995fb9bcf5f3a340090d","subject":"Constant Server Direction.","message":"Constant Server Direction.\n","repos":"mingot\/detectme","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ConstantsServer.h\n+++ ConstantsServer.h\n@@ -15,8 +15,8 @@\n #define SERVER_IP @\"128.52.128.116\" \/\/ production\n #define SERVER_PORT_NODE 7000\n #define MOBILE_LISTENING_PORT 9000\n-#define SERVER_ADDRESS @ \"http:\/\/128.30.99.94:8000\/\"\n-\/\/#define SERVER_ADDRESS @ \"http:\/\/detectme.csail.mit.edu\/\"\n+\/\/#define SERVER_ADDRESS @ \"http:\/\/128.30.99.94:8000\/\"\n+#define SERVER_ADDRESS @ \"http:\/\/detectme.csail.mit.edu\/\"\n #define SERVER_TOKEN @\"token\"\n \n \n"} {"commit":"0563c8912eaa758bb51d03c8dbfc48f3a4c91b69","subject":"Add minimal pfscan regression test due to combine problem","message":"Add minimal pfscan regression test due to combine problem\n","repos":"goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer","returncode":1,"stderr":"error: pathspec 'tests\/regression\/03-practical\/21-pfscan_combine_minimal.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- tests\/regression\/03-practical\/21-pfscan_combine_minimal.c\n+++ tests\/regression\/03-practical\/21-pfscan_combine_minimal.c\n@@ -0,0 +1,58 @@\n+#include \n+\n+struct __anonstruct_PQUEUE_63 {\n+ int closed ;\n+ pthread_mutex_t mtx ;\n+};\n+typedef struct __anonstruct_PQUEUE_63 PQUEUE;\n+\n+PQUEUE pqb;\n+\n+int pqueue_init(PQUEUE *qp)\n+{\n+ qp->closed = 0;\n+ pthread_mutex_init(& qp->mtx, NULL);\n+ return (0);\n+}\n+\n+void pqueue_close(PQUEUE *qp )\n+{\n+ pthread_mutex_lock(& qp->mtx);\n+ qp->closed = 1;\n+ pthread_mutex_unlock(& qp->mtx);\n+ return;\n+}\n+\n+int pqueue_put(PQUEUE *qp)\n+{\n+ pthread_mutex_lock(& qp->mtx);\n+ if (qp->closed) {\n+ \/\/ pfscan actually has a bug and is missing the following unlock at early return\n+ \/\/ pthread_mutex_unlock(& qp->mtx);\n+\n+ return (0);\n+ }\n+ pthread_mutex_unlock(& qp->mtx);\n+ return (1);\n+}\n+\n+void *worker(void *arg )\n+{\n+ return NULL;\n+}\n+\n+int main(int argc , char **argv )\n+{\n+ pthread_t tid;\n+\n+ PQUEUE *qp = &pqb;\n+ pqueue_init(& pqb);\n+ pthread_create(& tid, NULL, & worker, NULL);\n+\n+ for (int i = 1; i < argc; i++) {\n+ pqueue_put(& pqb);\n+ }\n+\n+ pqueue_close(& pqb);\n+ return 0;\n+}\n"} {"commit":"5f36096b77fe47015cbac130d1a20d089f202a1e","subject":"Add a comment noting that FDWs don't have to implement EXCEPT or LIMIT TO.","message":"Add a comment noting that FDWs don't have to implement EXCEPT or LIMIT TO.\n\npostgresImportForeignSchema pays attention to IMPORT's EXCEPT and LIMIT TO\noptions, but only as an efficiency hack, not for correctness' sake. The\nFDW documentation does explain that, but someone using postgres_fdw.c\nas a coding guide might not remember it, so let's add a comment here.\nPer question from Regina Obe.\n","repos":"adam8157\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- contrib\/postgres_fdw\/postgres_fdw.c\n+++ contrib\/postgres_fdw\/postgres_fdw.c\n@@ -2892,7 +2892,11 @@\n \n \t\t\/*\n \t\t * Fetch all table data from this schema, possibly restricted by\n-\t\t * EXCEPT or LIMIT TO.\n+\t\t * EXCEPT or LIMIT TO. (We don't actually need to pay any attention\n+\t\t * to EXCEPT\/LIMIT TO here, because the core code will filter the\n+\t\t * statements we return according to those lists anyway. But it\n+\t\t * should save a few cycles to not process excluded tables in the\n+\t\t * first place.)\n \t\t *\n \t\t * Note: because we run the connection with search_path restricted to\n \t\t * pg_catalog, the format_type() and pg_get_expr() outputs will always\n"} {"commit":"cfbb3044de6ae78a4beed2bf8488d7982e9fd6e8","subject":"Add CIELAB include in top level EDColor.h file","message":"Add CIELAB include in top level EDColor.h file\n","repos":"thisandagain\/color,modulexcite\/color,orta\/color,modulexcite\/color,thisandagain\/color,Pingco\/color,orta\/color,Pingco\/color","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- EDColor\/EDColor.h\n+++ EDColor\/EDColor.h\n@@ -9,4 +9,5 @@\n #import \"UIColor+Hex.h\"\n #import \"UIColor+HSB.h\"\n #import \"UIColor+HSL.h\"\n-#import \"UIColor+Crayola.h\"+#import \"UIColor+Crayola.h\"\n+#import \"UIColor+CIELAB.h\""} {"commit":"14d1fd6b5b30071b15a7e383d074c66befad35a4","subject":"get rid of old fortran interface code in c_baseio.c","message":"get rid of old fortran interface code in c_baseio.c\n","repos":"mfvalin\/rmnlib,mfvalin\/rmnlib,mfvalin\/rmnlib,mfvalin\/rmnlib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- EXTRAS\/c_baseio.c\n+++ EXTRAS\/c_baseio.c\n@@ -659,37 +659,6 @@\n if (ier < 0) junk=c_fclos(liun);\n return(ier<0?-1:0);\n } \n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(fnom)(ftnword *iun,char *nom,char *type,ftnword *flrec,F2Cl l1,F2Cl l2)\n-{\n- int lrec,lng,tmp,liun=*iun;\n- char filename[1025],filetype[257];\n-\n- lrec = *flrec;\n-\n- lng = (l1 <= 1024) ? l1 : 1024;\n- strncpy(filename,nom,lng); \/* copy filename into a C string *\/\n- filename[lng] = '\\0';\n-\n- while ((filename[lng-1] == ' ') && (lng > 1)) { \/* strip trailing blanks *\/\n- lng--;\n- filename[lng] = '\\0';\n- }\n-\n- lng = (l2 <= 256) ? l2 : 256;\n- strncpy(filetype,type,lng); \/* copy file type into a C string *\/\n- filetype[lng] = '\\0';\n-\n- while ((filetype[lng-1] == ' ') && (lng > 1)) { \/* strip trailing blanks *\/\n- lng--;\n- filetype[lng] = '\\0';\n- }\n-\n- tmp=(c_fnom(&liun,filename,filetype,lrec));\n- if(*iun==0) *iun = liun;\n- return (tmp);\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -739,16 +708,6 @@\n reset_file_entry(i);\n return(ier);\n }\n-\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(fclos)(ftnword *fiun)\n-{\n- int iun,ier;\n- iun = *fiun;\n- ier=c_fclos(iun);\n- return(ier);\n-}\n-#endif\n \n \/****************************************************************************\n * C _ Q Q Q F S C R *\n@@ -957,21 +916,6 @@\n }\n return ier;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(waopen2)(ftnword *fiun)\n-{\n- int iun;\n- iun = *fiun;\n- return(c_waopen2(iun));\n-}\n-\n-void f77name(waopen)(ftnword *fiun)\n-{\n- int iun;\n- iun = *fiun;\n- c_waopen(iun);\n-}\n-#endif\n \/****************************************************************************\n * C _ W A C L O S , C _ W A C L O S 2 , W A C L O S , W A C L O S 2 *\n *****************************************************************************\n@@ -1007,20 +951,6 @@\n FGFDT[i].attr.wap = 0;\n return(ier);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(waclos2)(ftnword *fiun)\n-{\n- int iun;\n- iun = *fiun;\n- return(c_waclos2(iun));\n-}\n-void f77name(waclos)(ftnword *fiun)\n-{\n- int iun;\n- iun = *fiun;\n- iun=c_waclos2(iun);\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -1125,24 +1055,6 @@\n return( nmots>0 ? nmots : 0);\n #endif\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(wawrit)(ftnword *fiun,void *buf,unsigned ftnword *fadr,ftnword *fnmots){\n- f77name(wawrit2)(fiun,buf,fadr,fnmots);\n- }\n-ftnword f77name(wawrit2)(ftnword *fiun,void *buf,unsigned ftnword *fadr,ftnword *fnmots)\n-{\n- int iun,adr,nmots;\n- iun = *fiun; adr = *fadr; nmots = *fnmots;\n-#if defined (ALL64)\n- if ( adr > 0 )\n- return(c_wawrit2(iun,buf,(2*adr)-1,nmots*2));\n- else\n- return(c_wawrit2(iun,buf,adr,nmots));\n-#else\n- return(c_wawrit2(iun,buf,adr,nmots));\n-#endif\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -1237,27 +1149,6 @@\n return(nmots);\n #endif\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(waread)(ftnword *fiun,void *buf,unsigned ftnword *fadr,\n- ftnword *fnmots)\n-{\n- f77name(waread2)(fiun,buf,fadr,fnmots);\n-}\n-ftnword f77name(waread2)(ftnword *fiun,void *buf,unsigned ftnword *fadr,\n- ftnword *fnmots)\n-{\n- int iun,adr,nmots;\n- iun = *fiun; adr = *fadr; nmots = *fnmots;\n-#if defined (ALL64)\n- if ( adr > 0 )\n- return(c_waread2(iun,buf,(2*adr)-1,nmots*2));\n- else\n- return(c_waread2(iun,buf,adr,nmots));\n-#else\n- return(c_waread2(iun,buf,adr,nmots));\n-#endif\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -1292,14 +1183,6 @@\n \n return(n);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(wasize)(ftnword *fiun) \/* return file size in FORTRAN WORDS *\/\n-{\n- int iun;\n- iun = *fiun;\n- return(c_wasize(iun));\n-}\n-#endif\n \/****************************************************************************\n * C _ N U M B L K S , N U M B L K S *\n *****************************************************************************\n@@ -1325,14 +1208,6 @@\n i = 1024 \/ sizeof(INT_32);\n return ( (n+i-1) \/ i );\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(numblks)(ftnword *fiun) \/* return file size in KiloBytes *\/\n-{\n- int iun;\n- iun = *fiun;\n- return(c_numblks(iun));\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -1376,14 +1251,6 @@\n {\n c_waopen(iun);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(openda)(ftnword *iun)\n-{\n- int liun;\n- liun = (int) *iun;\n- c_waopen(liun);\n-}\n-#endif\n \/****************************************************************************\n * C _ C L O S D A , C L O S D A *\n *****************************************************************************\n@@ -1399,14 +1266,6 @@\n {\n c_waclos(iun);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(closda)(ftnword *iun)\n-{\n- int liun;\n- liun = (int) *iun;\n- c_closda(liun);\n-}\n-#endif\n \/****************************************************************************\n * C _ C H E C D A , C H E C D A *\n *****************************************************************************\n@@ -1428,14 +1287,6 @@\n }\n }\n \n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(checda)(ftnword *iun)\n-{\n- int liun;\n- liun = (int) *iun;\n- c_checda(liun);\n-}\n-#endif\n \/****************************************************************************\n * C _ R E A D D A , R E A D D A *\n *****************************************************************************\n@@ -1471,18 +1322,6 @@\n }\n *pt = iun;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(readda)(ftnword *iun,ftnword *bufptr,ftnword *ns,ftnword *is)\n-{\n- int liun,lns,lis,save=BLKSIZE;\n- liun = (int) *iun;\n- lns = (int) *ns;\n- lis = (int) *is;\n- BLKSIZE = BLKSIZE * (sizeof(ftnword)\/sizeof(word));\n- c_readda(liun,bufptr,lns,lis);\n- BLKSIZE=save;\n-}\n-#endif\n \/****************************************************************************\n * C _ W R I T D A , W R I T D A *\n *****************************************************************************\n@@ -1517,18 +1356,6 @@\n }\n *pt = iun;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(writda)(ftnword *iun,ftnword *bufptr,ftnword *ns,ftnword *is)\n-{\n- int liun,lns,lis,save=BLKSIZE;\n- liun = (int) *iun;\n- lns = (int) *ns;\n- lis = (int) *is;\n- BLKSIZE = BLKSIZE * (sizeof(ftnword)\/sizeof(word));\n- c_writda(liun,bufptr,lns,lis);\n- BLKSIZE=save;\n-}\n-#endif\n \f \n \/***************************************************************************\n@@ -1561,9 +1388,6 @@\n \n return(FGFDT[i].fd) ;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(getfdsc)( ftnword *iun) { return(c_getfdsc((int) *iun)) ;}\n-#endif\n \/***************************************************************************\n * C _ S Q O P E N , S Q O P E N *\n ****************************************************************************\n@@ -1599,9 +1423,6 @@\n else\n c_waopen(iun) ;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(sqopen)(ftnword *iun) { c_sqopen((int) *iun) ; }\n-#endif\n \/***************************************************************************\n * C _ S Q C L O S , S Q C L O S *\n ****************************************************************************\n@@ -1620,9 +1441,6 @@\n if ((i=find_file_entry(\"c_sqclos\",iun)) < 0) return;\n if (FGFDT[i].attr.wa == 1) c_waclos(iun) ;\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(sqclos)(ftnword *iun) { c_sqclos((int) *iun) ; }\n-#endif\n \/***************************************************************************\n * C _ S Q R E W , S Q R E W *\n ****************************************************************************\n@@ -1646,9 +1464,6 @@\n if (fd <= 0) return;\n lseek(fd,(off_t) 0,SEEK_SET);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(sqrew)(ftnword *iun) { c_sqrew((int) *iun) ; }\n-#endif\n \/***************************************************************************\n * C _ S Q E O I , S Q E O I *\n ****************************************************************************\n@@ -1672,9 +1487,6 @@\n if (fd <= 0) return;\n lseek(fd,(off_t) 0,SEEK_END);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-void f77name(sqeoi)(ftnword *iun) { c_sqeoi((int) *iun) ; }\n-#endif\n \/**************************************************************************\n * C _ S Q G E T W , S Q G E T W * \n ***************************************************************************\n@@ -1709,12 +1521,6 @@\n }\n return( (alire == 0) ? alu\/sizeof(INT_32) : -1);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(sqgetw)(ftnword *iun, ftnword *bufptr, ftnword *nmots) {\n- int mult = sizeof(ftnword) \/ sizeof(word);\n- return(c_sqgetw((int) *iun, (word *) bufptr, (int) (*nmots * mult)));\n-}\n-#endif\n \/***************************************************************************\n * C _ S Q P U T W , S Q P U T W *\n ****************************************************************************\n@@ -1749,12 +1555,6 @@\n }\n return( (aecrire == 0) ? necrit\/sizeof(INT_32) : -1);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(sqputw)(ftnword *iun, ftnword *bufptr, ftnword *nmots) {\n- int mult = sizeof(ftnword) \/ sizeof(word);\n- return(c_sqputw((int) *iun, (word *) bufptr, (int) (*nmots * mult)));\n-}\n-#endif\n \/***************************************************************************\n * C _ S Q G E T S , S Q G E T S *\n ****************************************************************************\n@@ -1779,15 +1579,6 @@\n nlu = read(fd,bufptr,nchar);\n return( (nlu > 0) ? nlu : -1);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(sqgets)(ftnword *iun, char *bufptr, ftnword *nchar, F2Cl llbuf) {\n- int lbuf=llbuf;\n- if (lbuf >= *nchar)\n- return( c_sqgets(*iun, bufptr , *nchar));\n- else\n- return( c_sqgets(*iun, bufptr , lbuf));\n-}\n-#endif\n \/***************************************************************************\n * C _ S Q P U T S , S Q P U T S *\n ****************************************************************************\n@@ -1812,15 +1603,6 @@\n nlu = write(fd,bufptr,nchar);\n return( (nlu > 0) ? nlu : -1);\n }\n-#if defined(FORMER_FORTRAN_CODE)\n-ftnword f77name(sqputs)(ftnword *iun, char *bufptr, ftnword *nchar, F2Cl llbuf) {\n- int lbuf=llbuf;\n- if (lbuf >= *nchar)\n- return( c_sqputs(*iun, bufptr , *nchar));\n- else\n- return( c_sqputs(*iun, bufptr , lbuf));\n-}\n-#endif\n \f \n \/****************************************************************************\n@@ -3337,78 +3119,6 @@\n int i;\n for (i=0 ; i\n","repos":"galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/bluetooth\/controller\/ll_sw\/nordic\/lll\/lll_sync.c\n+++ subsys\/bluetooth\/controller\/ll_sw\/nordic\/lll\/lll_sync.c\n@@ -516,13 +516,13 @@\n \t}\n #if defined(CONFIG_BT_CTLR_DF_SAMPLE_CTE_FOR_PDU_WITH_BAD_CRC)\n \telse {\n-\t\tint err;\n-\n \t\terr = create_iq_report(lll, rssi_ready,\n \t\t\t\t BT_HCI_LE_CTE_CRC_ERR_CTE_BASED_TIME);\n \t\tif (!err) {\n \t\t\tull_rx_sched();\n \t\t}\n+\n+\t\terr = 0;\n \t}\n #endif \/* CONFIG_BT_CTLR_DF_SAMPLE_CTE_FOR_PDU_WITH_BAD_CRC *\/\n \n"} {"commit":"4489634914a35cccea8a97777cff655311e4cf00","subject":" * Added test code of the tag 8 for au XHTML converter.","message":" * Added test code of the tag 8 for au XHTML converter.\n\n\ngit-svn-id: 82aa9bee5de43c95ceefdc9a560c3564998c96fb@2171 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_xhtml_mobile_1_0\/test_chxj_xhtml_mobile_1_0.c\n+++ test\/chxj_xhtml_mobile_1_0\/test_chxj_xhtml_mobile_1_0.c\n@@ -490,8 +490,8 @@\n CU_add_test(xhtml_suite, \"test with text attribute 1.\", test_xhtml_body_tag_005);\n CU_add_test(xhtml_suite, \"test with text attribute 2.\", test_xhtml_body_tag_006);\n CU_add_test(xhtml_suite, \"test with text attribute 3.\", test_xhtml_body_tag_007);\n+ CU_add_test(xhtml_suite, \"test with link attribute 1.\", test_xhtml_body_tag_008);\n #if 0\n- CU_add_test(xhtml_suite, \"test with link attribute 1.\", test_xhtml_body_tag_008);\n CU_add_test(xhtml_suite, \"test with link attribute 2.\", test_xhtml_body_tag_009);\n CU_add_test(xhtml_suite, \"test with link attribute 3.\", test_xhtml_body_tag_010);\n CU_add_test(xhtml_suite, \"test with vlink attribute 1.\", test_xhtml_body_tag_011);\n@@ -1868,6 +1868,36 @@\n tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"ret=[%s]\",ret);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_xhtml_body_tag_008() \n+{\n+#define TEST_STRING \"<\/body>\"\n+#define RESULT_STRING \"\\r\\n<\/body>\\r\\n\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"ret=[%s]\",ret);\n CU_ASSERT(ret != NULL);\n CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n@@ -1877,34 +1907,6 @@\n #undef RESULT_STRING\n }\n \/* KONNO *\/\n-void test_xhtml_body_tag_008() \n-{\n-#define TEST_STRING \"<\/head><\/body><\/html>\"\n-#define RESULT_STRING \"<\/head><\/body><\/html>\"\n- char *ret;\n- char *tmp;\n- device_table spec;\n- chxjconvrule_entry entry;\n- cookie_t cookie;\n- apr_size_t destlen;\n- APR_INIT;\n-\n- COOKIE_INIT(cookie);\n-\n- SPEC_INIT(spec);\n- destlen = sizeof(TEST_STRING)-1;\n-\n- tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n- ret = chxj_exchange_xhtml_mobile_1_0(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n- ret = chxj_rencoding(&r, ret, &destlen);\n- CU_ASSERT(ret != NULL);\n- CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n- CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n-\n- APR_TERM;\n-#undef TEST_STRING\n-#undef RESULT_STRING\n-}\n void test_xhtml_body_tag_009() \n {\n #define TEST_STRING \"<\/head><\/body><\/html>\"\n"} {"commit":"b04327565559b5585bd94bc49316f0341f30f72d","subject":"Add failing test case for multiplication with DefExc","message":"Add failing test case for multiplication with DefExc\n","repos":"goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer","returncode":1,"stderr":"error: pathspec 'tests\/regression\/01-cpa\/42-non-injective-mult-def-exc.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- tests\/regression\/01-cpa\/42-non-injective-mult-def-exc.c\n+++ tests\/regression\/01-cpa\/42-non-injective-mult-def-exc.c\n@@ -0,0 +1,15 @@\n+\/\/PARAM: --enable ana.int.def_exc\n+#include\n+\n+int main() {\n+ unsigned int top;\n+ unsigned int x;\n+ top = 7;\n+ if (top == 3){\n+ return 0;\n+ }\n+\n+ x = top * 1073741824u;\n+ assert(x != 3221225472u); \/\/ UNKNOWN!\n+ return 0;\n+}\n"} {"commit":"fd606cdd655442d6483912201cce562f56de09c3","subject":"Added missing inline statements in order to prevent linker errors.","message":"Added missing inline statements in order to prevent linker errors.\n","repos":"pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- unsupported\/Eigen\/src\/MatrixFunctions\/MatrixLogarithm.h\n+++ unsupported\/Eigen\/src\/MatrixFunctions\/MatrixLogarithm.h\n@@ -66,7 +66,7 @@\n }\n \n \/* \\brief Get suitable degree for Pade approximation. (specialized for RealScalar = float) *\/\n-int matrix_log_get_pade_degree(float normTminusI)\n+inline int matrix_log_get_pade_degree(float normTminusI)\n {\n const float maxNormForPade[] = { 2.5111573934555054e-1 \/* degree = 3 *\/ , 4.0535837411880493e-1,\n 5.3149729967117310e-1 };\n@@ -80,7 +80,7 @@\n }\n \n \/* \\brief Get suitable degree for Pade approximation. (specialized for RealScalar = double) *\/\n-int matrix_log_get_pade_degree(double normTminusI)\n+inline int matrix_log_get_pade_degree(double normTminusI)\n {\n const double maxNormForPade[] = { 1.6206284795015624e-2 \/* degree = 3 *\/ , 5.3873532631381171e-2,\n 1.1352802267628681e-1, 1.8662860613541288e-1, 2.642960831111435e-1 };\n@@ -94,7 +94,7 @@\n }\n \n \/* \\brief Get suitable degree for Pade approximation. (specialized for RealScalar = long double) *\/\n-int matrix_log_get_pade_degree(long double normTminusI)\n+inline int matrix_log_get_pade_degree(long double normTminusI)\n {\n #if LDBL_MANT_DIG == 53 \/\/ double precision\n const long double maxNormForPade[] = { 1.6206284795015624e-2L \/* degree = 3 *\/ , 5.3873532631381171e-2L,\n"} {"commit":"7c68d248b81098b84202e26eb9ba32958f9a29ea","subject":"Just tidy up: no need to specify template parameters inside class body.","message":"Just tidy up: no need to specify template parameters inside class body.\n","repos":"ritsu1228\/eigen,Zefz\/eigen,pasuka\/eigen,pasuka\/eigen,ritsu1228\/eigen,TSC21\/Eigen,ritsu1228\/eigen,pasuka\/eigen,ritsu1228\/eigen,TSC21\/Eigen,Zefz\/eigen,toastedcrumpets\/eigen,Zefz\/eigen,ROCmSoftwarePlatform\/hipeigen,ROCmSoftwarePlatform\/hipeigen,toastedcrumpets\/eigen,ritsu1228\/eigen,ROCmSoftwarePlatform\/hipeigen,toastedcrumpets\/eigen,pasuka\/eigen,TSC21\/Eigen,ROCmSoftwarePlatform\/hipeigen,TSC21\/Eigen,pasuka\/eigen,Zefz\/eigen,toastedcrumpets\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- unsupported\/Eigen\/src\/MatrixFunctions\/MatrixPowerBase.h\n+++ unsupported\/Eigen\/src\/MatrixFunctions\/MatrixPowerBase.h\n@@ -106,7 +106,7 @@\n class MatrixPowerProduct : public MatrixBase >\n {\n public:\n- typedef MatrixBase > Base;\n+ typedef MatrixBase Base;\n EIGEN_DENSE_PUBLIC_INTERFACE(MatrixPowerProduct)\n \n MatrixPowerProduct(Derived& pow, const Rhs& b, RealScalar p) :\n"} {"commit":"ab3da6f541225002fdfbee35efef8c8a2105e8a8","subject":"Fix missing outer() member in DynamicSparseMatrix","message":"Fix missing outer() member in DynamicSparseMatrix\n","repos":"mjbshaw\/Eigen,rotorliu\/eigen,rotorliu\/eigen,rotorliu\/eigen,rotorliu\/eigen,madlib\/eigen_backup,mjbshaw\/Eigen,madlib\/eigen_backup,madlib\/eigen_backup,mjbshaw\/Eigen,madlib\/eigen_backup,mjbshaw\/Eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- unsupported\/Eigen\/src\/SparseExtra\/DynamicSparseMatrix.h\n+++ unsupported\/Eigen\/src\/SparseExtra\/DynamicSparseMatrix.h\n@@ -331,6 +331,7 @@\n \n inline Index row() const { return IsRowMajor ? m_outer : Base::index(); }\n inline Index col() const { return IsRowMajor ? Base::index() : m_outer; }\n+ inline Index outer() const { return m_outer; }\n \n protected:\n const Index m_outer;\n@@ -347,6 +348,7 @@\n \n inline Index row() const { return IsRowMajor ? m_outer : Base::index(); }\n inline Index col() const { return IsRowMajor ? Base::index() : m_outer; }\n+ inline Index outer() const { return m_outer; }\n \n protected:\n const Index m_outer;\n"} {"commit":"8f9ee069250fe65bc19c5859963ee85db96e24e1","subject":"glsl: add gl_Vertex, gl_Normal, etc to list of active attributes","message":"glsl: add gl_Vertex, gl_Normal, etc to list of active attributes\n\nIf a vertex shader uses gl_Vertex, gl_Normal, etc, we need to include them\nwhen the user queries the list of active attributes. Before this we were\njust including the user-defined attributes.\n","repos":"djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/shader\/slang\/slang_link.c\n+++ src\/mesa\/shader\/slang\/slang_link.c\n@@ -328,6 +328,7 @@\n GLint attribMap[MAX_VERTEX_GENERIC_ATTRIBS];\n GLuint i, j;\n GLbitfield usedAttributes; \/* generics only, not legacy attributes *\/\n+ GLbitfield inputsRead = 0x0;\n \n assert(origProg != linkedProg);\n assert(origProg->Target == GL_VERTEX_PROGRAM_ARB);\n@@ -371,6 +372,10 @@\n for (i = 0; i < linkedProg->NumInstructions; i++) {\n struct prog_instruction *inst = linkedProg->Instructions + i;\n for (j = 0; j < 3; j++) {\n+ if (inst->SrcReg[j].File == PROGRAM_INPUT) {\n+ inputsRead |= (1 << inst->SrcReg[j].Index);\n+ }\n+\n if (inst->SrcReg[j].File == PROGRAM_INPUT &&\n inst->SrcReg[j].Index >= VERT_ATTRIB_GENERIC0) {\n \/*\n@@ -429,6 +434,20 @@\n \/* update the instruction's src reg *\/\n inst->SrcReg[j].Index = VERT_ATTRIB_GENERIC0 + attr;\n }\n+ }\n+ }\n+\n+ \/* Handle pre-defined attributes here (gl_Vertex, gl_Normal, etc).\n+ * When the user queries the active attributes we need to include both\n+ * the user-defined attributes and the built-in ones.\n+ *\/\n+ for (i = VERT_ATTRIB_POS; i < VERT_ATTRIB_GENERIC0; i++) {\n+ if (inputsRead & (1 << i)) {\n+ _mesa_add_attribute(linkedProg->Attributes,\n+ _slang_vert_attrib_name(i),\n+ 1, \/* size *\/\n+ _slang_vert_attrib_type(i),\n+ -1 \/* attrib\/input *\/);\n }\n }\n \n"} {"commit":"6ce5b5e115451543a4a059ef6b618c1e53f2bbc5","subject":"mesa\/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH.","message":"mesa\/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH.\n\nSome st functions assume that they are identical.\n\n(cherry picked from commit 9d17ad2891b58de9e33e943ff918a678c6a3c2bd)\n","repos":"zz85\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_public.h\n+++ src\/mesa\/state_tracker\/st_public.h\n@@ -39,7 +39,7 @@\n #define ST_SURFACE_BACK_LEFT 1\n #define ST_SURFACE_FRONT_RIGHT 2\n #define ST_SURFACE_BACK_RIGHT 3\n-#define ST_SURFACE_DEPTH 8\n+#define ST_SURFACE_DEPTH 4\n \n #define ST_TEXTURE_2D 0x2\n #define ST_TEXTURE_RECT 0x4\n"} {"commit":"009501642533c7378fc4f061f1abe2ed4473a3f6","subject":"fix array index error in _swsetup_Translate (Felix)","message":"fix array index error in _swsetup_Translate (Felix)\n","repos":"mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/swrast_setup\/ss_context.c\n+++ src\/mesa\/swrast_setup\/ss_context.c\n@@ -1,6 +1,6 @@\n \/*\n * Mesa 3-D graphics library\n- * Version: 6.0.1\n+ * Version: 6.1\n *\n * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.\n *\n@@ -225,7 +225,7 @@\n \n dest->win[0] = m[0] * tmp[0] + m[12];\n dest->win[1] = m[5] * tmp[1] + m[13];\n- dest->win[2] = m[10] * tmp[2] + m[15];\n+ dest->win[2] = m[10] * tmp[2] + m[14];\n dest->win[3] = tmp[3];\n \n \n"} {"commit":"e1cff9579b862bb3784d4d3873ee3692d55c78d6","subject":"use elm_layout in video module","message":"use elm_layout in video module\n","repos":"GeeXboX\/enna,GeeXboX\/enna","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/modules\/activity\/video\/video.c\n+++ src\/modules\/activity\/video\/video.c\n@@ -73,7 +73,7 @@\n \n struct _Enna_Module_Video\n {\n- Evas_Object *o_edje;\n+ Evas_Object *o_layout;\n Evas_Object *o_browser;\n Evas_Object *o_backdrop;\n Evas_Object *o_snapshot;\n@@ -106,6 +106,7 @@\n Eina_List *l;\n int children = 0;\n char label[128] = { 0 };\n+ Evas_Object *o_edje;\n \n if (!list)\n goto end;\n@@ -118,7 +119,8 @@\n if (children)\n snprintf(label, sizeof(label), _(\"%d Movies\"), children);\n end:\n- edje_object_part_text_set(mod->o_edje, \"movies.counter.label\", label);\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n+ edje_object_part_text_set(o_edje, \"movies.counter.label\", label);\n }\n \n static int\n@@ -273,14 +275,17 @@\n static void\n popup_resume_display(int show)\n {\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n if (show)\n {\n- edje_object_signal_emit(mod->o_edje, \"resume,show\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"resume,show\", \"enna\");\n mod->resume_displayed = 1;\n }\n else\n {\n- edje_object_signal_emit(mod->o_edje, \"resume,hide\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"resume,hide\", \"enna\");\n mod->resume_displayed = 0;\n }\n }\n@@ -335,8 +340,8 @@\n \n enna_video_picture_set(mod->o_backdrop, file, from_vfs);\n evas_object_show(mod->o_backdrop);\n- edje_object_part_swallow(mod->o_edje,\n- \"backdrop.swallow\", mod->o_backdrop);\n+ elm_layout_content_set(mod->o_layout,\n+ \"backdrop.swallow\", mod->o_backdrop);\n ENNA_FREE(backdrop);\n ENNA_FREE(file);\n }\n@@ -375,8 +380,8 @@\n \n enna_video_picture_set(mod->o_snapshot, file, from_vfs);\n evas_object_show(mod->o_snapshot);\n- edje_object_part_swallow(mod->o_edje,\n- \"snapshot.swallow\", mod->o_snapshot);\n+ elm_layout_content_set(mod->o_layout,\n+ \"snapshot.swallow\", mod->o_snapshot);\n \n ENNA_FREE(snapshot);\n ENNA_FREE(file);\n@@ -385,14 +390,17 @@\n static void\n panel_infos_display(int show)\n {\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n if (show)\n {\n- edje_object_signal_emit(mod->o_edje, \"infos,show\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"infos,show\", \"enna\");\n mod->infos_displayed = 1;\n }\n else\n {\n- edje_object_signal_emit(mod->o_edje, \"infos,hide\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"infos,hide\", \"enna\");\n mod->infos_displayed = 0;\n }\n }\n@@ -491,6 +499,7 @@\n movie_start_playback(int resume)\n {\n const Evas_Object *ed;\n+ Evas_Object *o_edje;\n Evas_Coord x, y, w, h;\n \n panel_infos_display(0);\n@@ -501,8 +510,8 @@\n ENNA_OBJECT_DEL(mod->o_mediaplayer);\n mod->o_mediaplayer = evas_object_rectangle_add(enna->evas);\n evas_object_color_set(mod->o_mediaplayer, 0, 0, 0, 255);\n- edje_object_part_swallow(mod->o_edje,\n- \"fullscreen.swallow\", mod->o_mediaplayer);\n+ elm_layout_content_set(mod->o_layout,\n+ \"fullscreen.swallow\", mod->o_mediaplayer);\n evas_object_event_callback_add(mod->o_mediaplayer, EVAS_CALLBACK_RESIZE,\n _mediaplayer_resize_cb, NULL);\n \n@@ -511,7 +520,8 @@\n mod->o_mediacontrols =\n enna_mediaplayer_obj_add(enna->evas, mod->enna_playlist);\n \n- ed = edje_object_part_object_get(mod->o_edje, \"controls.swallow\");\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n+ ed = edje_object_part_object_get(o_edje, \"controls.swallow\");\n evas_object_geometry_get(ed, &x, &y, &w, &h);\n evas_object_move(mod->o_mediacontrols, x, y);\n evas_object_resize(mod->o_mediacontrols, w, h);\n@@ -628,10 +638,12 @@\n {\n char *title;\n const char *label;\n-\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n title = enna_metadata_meta_get(m, \"title\", 1);\n label = title ? title : file->label;\n- edje_object_part_text_set(mod->o_edje, \"title.label\", label);\n+ edje_object_part_text_set(o_edje, \"title.label\", label);\n \n free(title);\n }\n@@ -640,9 +652,11 @@\n video_infos_display_genre(const Enna_Vfs_File *file, const Enna_Metadata *m)\n {\n char *categories;\n-\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n categories = enna_metadata_meta_get(m, \"category\", 5);\n- edje_object_part_text_set(mod->o_edje, \"genre.label\",\n+ edje_object_part_text_set(o_edje, \"genre.label\",\n categories ? categories : \"\");\n \n free(categories);\n@@ -652,9 +666,11 @@\n video_infos_display_length(const Enna_Vfs_File *file, const Enna_Metadata *m)\n {\n char *length;\n-\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n length = enna_metadata_meta_duration_get(m);\n- edje_object_part_text_set(mod->o_edje, \"length.label\",\n+ edje_object_part_text_set(o_edje, \"length.label\",\n length ? length : \"\");\n \n free(length);\n@@ -664,11 +680,13 @@\n video_infos_display_synopsis(const Enna_Vfs_File *file, const Enna_Metadata *m)\n {\n char *synopsis;\n-\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n synopsis = enna_metadata_meta_get(m, \"synopsis\", 1);\n- edje_object_part_text_set(mod->o_edje, \"synopsis.textblock\",\n+ edje_object_part_text_set(o_edje, \"synopsis.textblock\",\n synopsis ? synopsis : \"\");\n- edje_object_signal_emit(mod->o_edje, synopsis ?\n+ edje_object_signal_emit(o_edje, synopsis ?\n \"separator,show\" : \"separator,hide\", \"enna\");\n \n free(synopsis);\n@@ -705,16 +723,19 @@\n static void\n video_infos_del (void)\n {\n- edje_object_part_text_set(mod->o_edje, \"title.label\", \"\");\n- edje_object_part_text_set(mod->o_edje, \"genre.label\", \"\");\n- edje_object_part_text_set(mod->o_edje, \"length.label\", \"\");\n- edje_object_part_text_set(mod->o_edje, \"synopsis.textblock\", \"\");\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n+ edje_object_part_text_set(o_edje, \"title.label\", \"\");\n+ edje_object_part_text_set(o_edje, \"genre.label\", \"\");\n+ edje_object_part_text_set(o_edje, \"length.label\", \"\");\n+ edje_object_part_text_set(o_edje, \"synopsis.textblock\", \"\");\n panel_infos_display(0);\n popup_resume_display(0);\n enna_video_picture_set(mod->o_backdrop, NULL, 0);\n enna_video_picture_set(mod->o_snapshot, NULL, 0);\n enna_video_flags_update(mod->o_video_flags, NULL);\n- edje_object_signal_emit(mod->o_edje, \"separator,hide\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"separator,hide\", \"enna\");\n }\n \n static void\n@@ -787,7 +808,7 @@\n _create_menu()\n {\n \n- mod->o_browser = enna_browser_obj_add(mod->o_edje);\n+ mod->o_browser = enna_browser_obj_add(mod->o_layout);\n \n enna_browser_obj_view_type_set(mod->o_browser, ENNA_BROWSER_VIEW_LIST);\n evas_object_smart_callback_add(mod->o_browser,\n@@ -797,24 +818,24 @@\n evas_object_smart_callback_add (mod->o_browser, \"delay,hilight\",\n browser_cb_delay_hilight, NULL);\n \n- edje_object_part_swallow(mod->o_edje,\n- \"browser.swallow\", mod->o_browser);\n+ elm_layout_content_set(mod->o_layout,\n+ \"browser.swallow\", mod->o_browser);\n enna_browser_obj_root_set(mod->o_browser, \"\/video\");\n \n ENNA_OBJECT_DEL(mod->o_panel_infos);\n mod->o_panel_infos = enna_panel_infos_add(enna->evas);\n- edje_object_part_swallow(mod->o_edje,\n- \"infos.panel.swallow\", mod->o_panel_infos);\n+ elm_layout_content_set(mod->o_layout,\n+ \"infos.panel.swallow\", mod->o_panel_infos);\n \n ENNA_OBJECT_DEL(mod->o_resume);\n mod->o_resume = video_resume_add(enna->evas);\n- edje_object_part_swallow(mod->o_edje,\n- \"resume.swallow\", mod->o_resume);\n+ elm_layout_content_set(mod->o_layout,\n+ \"resume.swallow\", mod->o_resume);\n \n ENNA_OBJECT_DEL(mod->o_video_flags);\n mod->o_video_flags = enna_video_flags_add(enna->evas);\n- edje_object_part_swallow(mod->o_edje,\n- \"infos.flags.swallow\", mod->o_video_flags);\n+ elm_layout_content_set(mod->o_layout,\n+ \"infos.flags.swallow\", mod->o_video_flags);\n \n mod->state = BROWSER_VIEW;\n }\n@@ -827,12 +848,9 @@\n static void\n _create_gui(void)\n {\n- Evas_Object *o;\n-\n mod->state = BROWSER_VIEW;\n- o = edje_object_add(enna->evas);\n- edje_object_file_set(o, enna_config_theme_get(), \"activity\/video\");\n- mod->o_edje = o;\n+ mod->o_layout = elm_layout_add(enna->layout);\n+ elm_layout_file_set(mod->o_layout, enna_config_theme_get(), \"activity\/video\");\n _create_menu();\n }\n \n@@ -844,19 +862,23 @@\n _class_init(void)\n {\n _create_gui();\n- enna_content_append(ENNA_MODULE_NAME, mod->o_edje);\n+ enna_content_append(ENNA_MODULE_NAME, mod->o_layout);\n }\n \n static void\n _class_show(void)\n {\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n+\n enna_content_select(ENNA_MODULE_NAME);\n- edje_object_signal_emit(mod->o_edje, \"module,show\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"module,show\", \"enna\");\n \n switch (mod->state)\n {\n case BROWSER_VIEW:\n- edje_object_signal_emit(mod->o_edje, \"content,show\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"content,show\", \"enna\");\n break;\n \n case VIDEOPLAYER_VIEW:\n@@ -870,8 +892,12 @@\n static void\n _class_hide(void)\n {\n+ Evas_Object *o_edje;\n+\n+ o_edje = elm_layout_edje_get(mod->o_layout);\n+\n _return_to_video_info_gui();\n- edje_object_signal_emit(mod->o_edje, \"module,hide\", \"enna\");\n+ edje_object_signal_emit(o_edje, \"module,hide\", \"enna\");\n }\n \n static void\n@@ -933,7 +959,7 @@\n {\n enna_activity_unregister(&class);\n ENNA_EVENT_HANDLER_DEL(mod->eos_event_handler);\n- ENNA_OBJECT_DEL(mod->o_edje);\n+ ENNA_OBJECT_DEL(mod->o_layout);\n evas_object_smart_callback_del(mod->o_browser, \"root\", browser_cb_root);\n evas_object_smart_callback_del(mod->o_browser,\n \"selected\", browser_cb_select);\n"} {"commit":"fc6b61dad160e60ee3b59f3c3505be542c8970d8","subject":"Try 'min' for units","message":"Try 'min' for units\n","repos":"acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/navigator\/rtl_params.c\n+++ src\/modules\/navigator\/rtl_params.c\n@@ -143,6 +143,7 @@\n * This is used to determine when the vehicle should be switched to RTL due to low battery.\n * Note, particularly for multirotors this should reflect flight time at cruise speed, not while stationary\n *\n+ * @unit min\n * @group Commander\n *\/\n PARAM_DEFINE_FLOAT(RTL_FLT_TIME, 15);\n"} {"commit":"8edd7e0c6ea6be2edccfd3375ed196838e3fd9c7","subject":"add support for HV to modperl_handler_make_args","message":"add support for HV to modperl_handler_make_args\n\n\ngit-svn-id: b4be4a41b2a3352907de631eb6da1671a2f7b614@69444 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"Distrotech\/mod_perl,Distrotech\/mod_perl,Distrotech\/mod_perl,Distrotech\/mod_perl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/modules\/perl\/modperl_handler.c\n+++ src\/modules\/perl\/modperl_handler.c\n@@ -153,6 +153,11 @@\n sv = ptr ? newSVpv((char *)ptr, 0) : &PL_sv_undef;\n break;\n }\n+ case 'H':\n+ if (strEQ(classname, \"HV\")) {\n+ sv = newRV_noinc((SV*)ptr);\n+ break;\n+ }\n default:\n sv = modperl_ptr2obj(aTHX_ classname, ptr);\n break;\n"} {"commit":"95a68da587ce699d9398f29f6f694bd1ec53eab3","subject":"Avoid hard coded path","message":"Avoid hard coded path\n","repos":"enna-project\/Enna-Media-Server,enna-project\/Enna-Media-Server,raoulh\/Enna-Media-Server,enna-project\/Enna-Media-Server,enna-project\/Enna-Media-Server,raoulh\/Enna-Media-Server,raoulh\/Enna-Media-Server,raoulh\/Enna-Media-Server,enna-project\/Enna-Media-Server,raoulh\/Enna-Media-Server","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/ems_config.c\n+++ src\/bin\/ems_config.c\n@@ -6,12 +6,53 @@\n #include \n #include \n \n+#include \"config.h\"\n+\n #include \"ems_private.h\"\n #include \"ems_config.h\"\n \n static Eet_Data_Descriptor *conf_edd = NULL;\n static Eet_Data_Descriptor *video_directory_edd = NULL;\n static Eet_Data_Descriptor *video_extension_edd = NULL;\n+\n+static const char *\n+ems_config_filename_get(void)\n+{\n+ static const char *filename = NULL;\n+ char tmp[4096]; \/* TODO : PATH_MAX *\/\n+\n+ if (filename)\n+ return filename;\n+\n+ snprintf(tmp, sizeof(tmp), \"%s\/.config\/enna-media-server\/%s\", getenv(\"HOME\"), EMS_CONFIG_FILE);\n+ return eina_stringshare_add(tmp);\n+}\n+\n+static const char *\n+ems_config_dirname_get(void)\n+{\n+ return ecore_file_dir_get(ems_config_filename_get());\n+}\n+\n+static const char *\n+ems_config_cache_filename_get(void)\n+{\n+ static const char *filename = NULL;\n+ char tmp[4096]; \/* TODO : PATH_MAX *\/\n+\n+ if (filename)\n+ return filename;\n+\n+ snprintf(tmp, sizeof(tmp), \"%s\/.cache\/enna-media-server\/%s\", getenv(\"HOME\"), EMS_CONFIG_FILE);\n+ return eina_stringshare_add(tmp);\n+}\n+\n+static const char *\n+ems_config_cache_dirname_get(void)\n+{\n+ return ecore_file_dir_get(ems_config_cache_filename_get());\n+}\n+\n \n static Eet_Data_Descriptor *\n ems_config_descriptor_new(const char *name, int size)\n@@ -33,20 +74,21 @@\n int textlen;\n char *text;\n \n- if (!ecore_file_is_dir(\"\/home\/nico\/.config\/enna-media-server\"))\n- ecore_file_mkdir(\"\/home\/nico\/.config\/enna-media-server\");\n-\n- if (!ecore_file_is_dir(\"\/home\/nico\/.cache\/enna-media-server\"))\n- ecore_file_mkdir(\"\/home\/nico\/.cache\/enna-media-server\");\n- ef = eet_open(\"\/home\/nico\/.cache\/enna-media-server\/\"EMS_CONFIG_FILE,\n+ if (!ecore_file_is_dir(ems_config_dirname_get()))\n+ ecore_file_mkdir(ems_config_dirname_get());\n+\n+ if (!ecore_file_is_dir(ems_config_cache_dirname_get()))\n+ ecore_file_mkdir(ems_config_cache_dirname_get());\n+\n+ ef = eet_open(ems_config_cache_filename_get(),\n EET_FILE_MODE_READ_WRITE);\n if (!ef)\n- ef = eet_open(\"\/home\/nico\/.cache\/enna-media-server\/\"EMS_CONFIG_FILE,\n+ ef = eet_open(ems_config_cache_filename_get(),\n EET_FILE_MODE_WRITE);\n- f = fopen(\"\/home\/nico\/.config\/enna-media-server\/enna-media-server.conf\", \"rb\");\n+ f = fopen(ems_config_filename_get(), \"rb\");\n if (!f)\n {\n- ERR(\"Could not open \/home\/nico\/.config\/enna-media-server\/enna-media-server.conf\");\n+ ERR(\"Could not open %s\", ems_config_filename_get());\n return;\n }\n \n@@ -82,9 +124,9 @@\n Ems_Config *config = NULL;\n Eet_File *file;\n \n- if (!ecore_file_is_dir(\"\/home\/nico\/.cache\/enna-media-server\"))\n- ecore_file_mkdir(\"\/home\/nico\/.cache\/enna-media-server\");\n- file = eet_open(\"\/home\/nico\/.cache\/enna-media-server\/\"EMS_CONFIG_FILE,\n+ if (!ecore_file_is_dir(ems_config_cache_dirname_get()))\n+ ecore_file_mkdir(ems_config_cache_dirname_get());\n+ file = eet_open(ems_config_cache_filename_get(),\n EET_FILE_MODE_READ_WRITE);\n \n config = eet_data_read(file, edd, \"Ems_Config\");\n@@ -92,7 +134,7 @@\n {\n Ems_Directory *dir;\n Ems_Extension *ext;\n- WRN(\"Warning no configuration found! This must not append, we will go back to a void configuration\");\n+ WRN(\"Warning no configuration found! This must not happen, we will go back to a void configuration\");\n config = calloc(1, sizeof(Ems_Config));\n \/* dir = calloc(1, sizeof(Ems_Directory)); *\/\n \/* dir->path = eina_stringshare_add(\"\/home\/nico\/videos\"); *\/\n@@ -150,13 +192,13 @@\n ENNA_CONFIG_LIST(D, T, video_directories, video_directory_edd);\n ENNA_CONFIG_LIST(D, T, video_extensions, video_extension_edd);\n \n- if (stat(\"\/home\/nico\/.cache\/enna-media-server\/\"EMS_CONFIG_FILE, &cache) == -1)\n+ if (stat(ems_config_cache_filename_get(), &cache) == -1)\n {\n _make_config();\n }\n else\n {\n- stat(\"\/home\/nico\/.config\/enna-media-server\/enna-server.conf\", &conf);\n+ stat(ems_config_filename_get(), &conf);\n if (cache.st_mtime < conf.st_mtime)\n _make_config();\n }\n@@ -164,7 +206,6 @@\n ems_config = _config_get(conf_edd);\n \n \n-\n }\n \n void\n"} {"commit":"c8ec07dfc4e04a481b6c41d845e396c25bc0d85f","subject":"memory alloc: clarify help messsage; declutter array printing","message":"memory alloc: clarify help messsage; declutter array printing\n","repos":"KelvinLi\/C-tutorial,KelvinLi\/C-tutorial","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- memory-alloc\/simple-malloc.c\n+++ memory-alloc\/simple-malloc.c\n@@ -8,18 +8,20 @@\n print_help (const char *name)\n {\n printf (\"Usage: %s ...\\n\\n\", name);\n- printf (\"Given a list of integers (a, b, c, d, ...),\\n\"\n- \"repeatedly computes (b - a, c - b, d - c, ...).\\n\");\n+ printf (\"Given a list of integers (a_1, a_2, ..., a_n),\\n\"\n+ \"computes (a_2 - a_1, a_3 - a_2, ..., a_1 - a_n),\\n\"\n+ \"then repeats again on the output list.\\n\\n\");\n+ printf (\"Example: %s 0 0 1 0 0\\n\"\n+ \"0 1 -1 0 0\\n\", name);\n }\n \n void\n print_array (long int *nums, size_t size)\n {\n size_t i;\n- printf (\"[\");\n for (i = 0; i < size - 1; i++)\n- printf (\"%ld, \", nums[i]);\n- printf (\"%ld]\\n\", nums[i]);\n+ printf (\"%ld \", nums[i]);\n+ printf (\"%ld\\n\", nums[i]);\n }\n \n void\n"} {"commit":"4dc8e08671c6579c4238197546d107b99f133eca","subject":"hexdump8x32() should dump data to stderr, not stdout","message":"hexdump8x32() should dump data to stderr, not stdout\n","repos":"noahwilliamsson\/openspotify,noahwilliamsson\/openspotify","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libopenspotify\/util.c\n+++ libopenspotify\/util.c\n@@ -52,7 +52,7 @@\n \n void hexdump8x32 (char *prefix, void *data, int len)\n {\n-\tfhexdump8x32 (stdout, prefix, data, len);\n+\tfhexdump8x32 (stderr, prefix, data, len);\n }\n \n void fhexdump8x32 (FILE * file, char *prefix, void *data, int len)\n"} {"commit":"ea21a503e6a9a417618a9d6a08e7f2a6efeed149","subject":"Fixed some bugs","message":"Fixed some bugs\n\nAlso removed unnecessary sizeof(char)'s\nThey just muddy up the code.\n","repos":"rswinkle\/c_utils,rswinkle\/c_utils","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c_utils.c\n+++ c_utils.c\n@@ -20,7 +20,7 @@\n \t\n \tfseek(file, 0, SEEK_END);\n \tsize = ftell(file);\n-\tdata = malloc(size);\n+\tdata = malloc(size+1);\n \tif (!data) {\n \t\tfclose(file);\n \t\treturn 0;\n@@ -48,7 +48,6 @@\n \n int file_read(FILE* file, c_array* out)\n {\n-\tint tmp;\n \tbyte* data;\n \tsize_t size;\n \tout->data = NULL;\n@@ -57,7 +56,7 @@\n \t\n \tfseek(file, 0, SEEK_END);\n \tsize = ftell(file);\n-\tdata = malloc(size);\n+\tdata = malloc(size+1);\n \tif (!data) {\n \t\tfclose(file);\n \t\treturn 0;\n@@ -65,7 +64,7 @@\n \t\t\n \trewind(file);\n \t\n-\tif ((tmp = fread(data, sizeof(char), size, file)) != size) {\n+\tif (!fread(data, size, 1, file)) {\n \t\tprintf(\"read failure\\n\");\n \t\tfclose(file);\n \t\tfree(data);\n@@ -84,7 +83,7 @@\n \n char* freadstring(FILE* input, char delim, size_t max_len);\n {\n-\tchar* string = malloc(300*sizeof(char));\n+\tchar* string = malloc(max_len+1);\n \tchar temp;\n \tint i=0;\n \tfor(i; i.","message":"fptu: refine\/update string_view<>.\n","repos":"leo-yuriev\/libfptu,leo-yuriev\/libfptu","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fast_positive\/tuples\/string_view.h\n+++ fast_positive\/tuples\/string_view.h\n@@ -26,11 +26,11 @@\n #include \n #include \n \n-#if __cplusplus >= 201703L && __has_include()\n+#if defined(__cpp_lib_string_view) && __cpp_lib_string_view >= 201606L\n #include \n-#define HAVE_cxx17_std_string_view 1\n+#define HAVE_std_string_view 1\n #else\n-#define HAVE_cxx17_std_string_view 0\n+#define HAVE_std_string_view 0\n #endif\n \n namespace fptu {\n@@ -52,9 +52,9 @@\n \n public:\n cxx11_constexpr string_view() : str(nullptr), len(-1) {}\n- cxx11_constexpr string_view(const string_view &v) = default;\n+ cxx11_constexpr string_view(const string_view &) = default;\n cxx14_constexpr string_view &\n- operator=(const string_view &v) cxx11_noexcept = default;\n+ operator=(const string_view &) cxx11_noexcept = default;\n \n cxx11_constexpr string_view(const char *str, std::size_t count)\n : str(str), len(str ? static_cast(count) : -1) {\n@@ -73,7 +73,7 @@\n }\n \/* \u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440 \u0438\u0437 std::string \u041e\u0411\u042f\u0417\u0410\u041d \u0431\u044b\u0442\u044c explicit \u0434\u043b\u044f \u043f\u0440\u0435\u0434\u043e\u0442\u0432\u0440\u0430\u0449\u0435\u043d\u0438\u044f\n * \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b reference to temporary object \u0438\u0437-\u0437\u0430 \u043d\u0435\u044f\u0432\u043d\u043e\u0433\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f string_view\n- * \u0438\u0437 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 std::string. *\/\n+ * \u0438\u0437 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 std::string. *\/\n explicit \/* \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c cxx11_constexpr \u0438\u0437-\u0437\u0430 std::string::size() *\/\n string_view(const std::string &s)\n : str(s.data()), len(static_cast(s.size())) {\n@@ -81,12 +81,12 @@\n }\n operator std::string() const { return std::string(data(), length()); }\n \n-#if HAVE_cxx17_std_string_view\n+#if HAVE_std_string_view\n \/* \u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440 \u0438\u0437 std::string_view:\n * - \u041c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u041d\u0415-explicit, \u0442\u0430\u043a \u043a\u0430\u043a \u0443 std::string_view \u043d\u0435\u0442 \u043d\u0435\u044f\u0432\u043d\u043e\u0433\u043e\n * \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0442\u043e\u0440\u0430 \u0438\u0437 std::string. \u041f\u043e\u044d\u0442\u043e\u043c\u0443 \u043d\u0435 \u0432\u043e\u0437\u043d\u0438\u043a\u0430\u0435\u0442 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b\n * reference to temporary object \u0438\u0437-\u0437\u0430 \u043d\u0435\u044f\u0432\u043d\u043e\u0433\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f string_view\n- * \u0438\u0437 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043d\u043e\u0439 \u043f\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 std::string.\n+ * \u0438\u0437 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 std::string.\n * - \u041d\u0415 \u0414\u041e\u041b\u0416\u0415\u041d \u0431\u044b\u0442\u044c explicit \u0434\u043b\u044f \u0431\u0435\u0441\u0448\u043e\u0432\u043d\u043e\u0439 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0441 std::string_view. *\/\n cxx11_constexpr string_view(const std::string_view &v) cxx11_noexcept\n : str(v.data()),\n@@ -107,7 +107,7 @@\n *this = v;\n v = temp;\n }\n-#endif \/* HAVE_cxx17_std_string_view *\/\n+#endif \/* HAVE_std_string_view *\/\n \n cxx14_constexpr void swap(string_view &v) cxx11_noexcept {\n const auto temp = *this;\n@@ -163,9 +163,9 @@\n cxx11_constexpr std::size_t size() const { return length(); }\n cxx11_constexpr size_type max_size() const { return 32767; }\n \n- cxx14_constexpr std::size_t hash_value() const {\n- \/* TODO: replace by t1ha *\/\n- std::size_t h = (size_t)len * 3977471;\n+ cxx14_constexpr size_t hash_value() const {\n+ \/* TODO: replace by t1ha_v3 *\/\n+ size_t h = static_cast(len) * 3977471;\n for (intptr_t i = 0; i < len; ++i)\n h = (h ^ str[i]) * 1664525 + 1013904223;\n return h ^ 3863194411 * (h >> 11);\n"} {"commit":"f606539cfe1863d848c7137a9f025248f49bc81a","subject":"Add PointTraits for further optimization. [1] Put dimension in template to make dimension statical [2] Specify a simpler structure for dimension = 1 TimeSeries. [3] Specify dimension=0 stands for dynamic dimension.","message":"Add PointTraits for further optimization.\n [1] Put dimension in template to make dimension statical\n [2] Specify a simpler structure for dimension = 1 TimeSeries.\n [3] Specify dimension=0 stands for dynamic dimension.\n","repos":"melode11\/FastDTW-x,melode11\/FastDTW-x,melode11\/FastDTW-x","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- FastDTW-x\/Classes\/TimeSeries\/TimeSeriesPoint.h\n+++ FastDTW-x\/Classes\/TimeSeries\/TimeSeriesPoint.h\n@@ -13,6 +13,20 @@\n #include \n FD_NS_START\n using namespace std;\n+\n+\/\/Add Traits for further optimize;\n+template \n+struct PointTraits\n+{\n+ typedef vector point_type;\n+};\n+\n+template \n+struct PointTraits\n+{\n+ typedef ValueType point_type;\n+};\n+\n template \n class TimeSeriesPoint {\n vector _measurements;\n"} {"commit":"a98b27afaae6a4e77b2e60d8aba047d6bfbcd1bb","subject":"Avoid faulty warning of MSVC 2015\/2017 regarding an infinite recursion between emplace and insert methods (#34).","message":"Avoid faulty warning of MSVC 2015\/2017 regarding an infinite recursion between emplace and insert methods (#34).\n\n","repos":"Tessil\/hopscotch-map","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/hopscotch_hash.h\n+++ src\/hopscotch_hash.h\n@@ -1025,7 +1025,7 @@\n \n template::value>::type* = nullptr>\n std::pair insert(P&& value) { \n- return emplace(std::forward

(value)); \n+ return insert_impl(value_type(std::forward

(value)));\n }\n \n std::pair insert(value_type&& value) { \n"} {"commit":"37cd2fa7ebb8cbbb2b6213d057fb8b838dcc4e7a","subject":"imap: Various fixes for handling expunges in mailbox sync.","message":"imap: Various fixes for handling expunges in mailbox sync.\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-sync.c\n+++ src\/imap\/imap-sync.c\n@@ -296,7 +296,7 @@\n \tclient->highest_fetch_modseq = 0;\n }\n \n-static int imap_sync_finish(struct imap_sync_context *ctx)\n+static int imap_sync_finish(struct imap_sync_context *ctx, bool aborting)\n {\n \tstruct client *client = ctx->client;\n \tint ret = ctx->failed ? -1 : 0;\n@@ -327,7 +327,7 @@\n \t\tclient_disconnect_with_error(client,\n \t\t\t\t\t \"Mailbox UIDVALIDITY changed\");\n \t}\n-\tif (!ctx->no_newmail) {\n+\tif (!ctx->no_newmail && !aborting) {\n \t\tif (ctx->status.messages < ctx->messages_count)\n \t\t\ti_panic(\"Message count decreased\");\n \t\tif (ctx->status.messages != ctx->messages_count &&\n@@ -371,7 +371,7 @@\n {\n \tint ret;\n \n-\tret = imap_sync_finish(ctx);\n+\tret = imap_sync_finish(ctx, TRUE);\n \timap_client_notify_finished(ctx->client);\n \n \tif ((ctx->client->enabled_features & MAILBOX_FEATURE_QRESYNC) != 0)\n@@ -506,14 +506,14 @@\n \tfor (; ctx->seq >= ctx->sync_rec.seq1; ctx->seq--) {\n \t\tif (ret == 0) {\n \t\t\t\/* buffer full, continue later *\/\n-\t\t\tbreak;\n+\t\t\treturn 0;\n \t\t}\n \n \t\tstr_truncate(str, 0);\n \t\tstr_printfa(str, \"* %u EXPUNGE\", ctx->seq);\n \t\tret = client_send_line_next(ctx->client, str_c(str));\n \t}\n-\treturn ret;\n+\treturn 1;\n }\n \n int imap_sync_more(struct imap_sync_context *ctx)\n@@ -613,10 +613,10 @@\n \n \t\tctx->seq = 0;\n \t}\n-\tif (array_is_created(&ctx->expunges))\n-\t\timap_sync_vanished(ctx);\n \tif (ret > 0) {\n-\t\tif (imap_sync_finish(ctx) < 0)\n+\t\tif (array_is_created(&ctx->expunges))\n+\t\t\timap_sync_vanished(ctx);\n+\t\tif (imap_sync_finish(ctx, FALSE) < 0)\n \t\t\treturn -1;\n \t\treturn imap_sync_more(ctx);\n \t}\n"} {"commit":"3121abc8e5d3fd8a3f12ee6e1ff5c929c235c008","subject":"Create 02_geri.c (#726)","message":"Create 02_geri.c (#726)\n\n","repos":"Enchak\/c-programming-homework,elsys\/c-programming-homework,puka89\/c-programming-homework","returncode":1,"stderr":"error: pathspec 'G\/03\/07\/02_geri.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- G\/03\/07\/02_geri.c\n+++ G\/03\/07\/02_geri.c\n@@ -0,0 +1,18 @@\n+#include \n+int main() {\n+int number;\n+int sum = 0;\n+int digit = 0;\n+scanf(\"%d\", &number);\n+while(number > 0){\n+sum += number % 10;\n+number \/= 10;\n+digit ++;\n+}\n+if(sum \/ digit > 7){\n+printf(\"heavy\\n\");\n+}else{\n+printf(\"light\\n\");\n+}\n+return 0;\n+}\n"} {"commit":"1d58f01398de6595ae6477b06be8e9318ccbfdf7","subject":"Delete Cell.h","message":"Delete Cell.h","repos":"dpanayotov\/CS1314,dpanayotov\/CS1314,dpanayotov\/CS1314","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- GameOfLife\/Cell.h\n+++ GameOfLife\/Cell.h\n@@ -1,15 +0,0 @@\n-\/*\n- * Cell.h\n- *\n- * Created on: May 18, 2014\n- * Author: dpanayotov\n- *\/\n-\n-#ifndef CELL_H_\n-#define CELL_H_\n-\n-\n-\n-\n-\n-#endif \/* CELL_H_ *\/\n"} {"commit":"fb0e0da68f97ac5e4a25ae46973629431dff4c98","subject":"dataplane: Make compile again with --enable-hybrid and --enable-developer","message":"dataplane: Make compile again with --enable-hybrid and --enable-developer\n","repos":"lagopus\/lagopus,lagopus\/lagopus,lagopus\/lagopus,lagopus\/lagopus,lagopus\/lagopus","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/dataplane\/mgr\/rib.c\n+++ src\/dataplane\/mgr\/rib.c\n@@ -36,6 +36,10 @@\n #include \"packet.h\"\n \n #include \"rib_notifier.h\"\n+\n+#ifdef HAVE_DPDK\n+#include \"dpdk.h\"\n+#endif \/* HAVE_DPDK *\/\n \n #if defined HYBRID && defined PIPELINER\n #include \"pipeline.h\"\n"} {"commit":"cb3ad733d6a228f169a3d236b8185c262bb302f8","subject":"[xui]fix draw icon","message":"[xui]fix draw icon\n","repos":"xboot\/xboot,xboot\/xboot","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"97831b04641adafb62a07665f21e1314b42d7aa0","subject":"Decrease the default detector threshold","message":"Decrease the default detector threshold\n","repos":"pablofdezalc\/kaze,pablofdezalc\/kaze","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib\/KAZEConfig.h\n+++ src\/lib\/KAZEConfig.h\n@@ -51,7 +51,7 @@\n soffset = 1.60;\n omax = 4;\n nsublevels = 4;\n- dthreshold = 0.0007;\n+ dthreshold = 0.0003;\n min_dthreshold = 0.000001f;\n use_fed = true;\n descriptor = MSURF;\n"} {"commit":"b23d2f43fe7c08ced4f70d392f66e432deb808ac","subject":"Add const DataStore::Store#back","message":"Add const DataStore::Store#back\n","repos":"dmorrill10\/cpp_utilities","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/data_store.h\n+++ src\/lib\/data_store.h\n@@ -43,6 +43,7 @@\n const T* data(uint blockIndex) const { return &data_[baseIndex(blockIndex)]; }\n \n T* back() { return data(size() - 1); }\n+ const T* back() const { return data(size() - 1); }\n \n uint blockSize() const { return blockSize_; }\n \n"} {"commit":"0ebf0bfa1f9f77b1b28918083a6ac92a5596d31b","subject":"Switch efreet_ini_parse to use mmap instead of fopen. Small speed improvements and little code cleanup.","message":"Switch efreet_ini_parse to use mmap instead of fopen. Small speed improvements and little code cleanup.\n\nFIXME: If people wonder we are loosing 50% of efreet time inside ecore_hash_* and ecore_string_*.\n","repos":"jordemort\/efreet,jordemort\/efreet","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/efreet_ini.c\n+++ src\/lib\/efreet_ini.c\n@@ -68,86 +68,68 @@\n static Ecore_Hash *\n efreet_ini_parse(const char *file)\n {\n+ const char *buffer;\n+ const char *line_start;\n FILE *f;\n- \/* a static buffer for quick reading of lines that fit *\/\n- char static_buf[4096];\n- \/* a big buffer to allocate for lines that are larger than the static one *\/\n- char *big_buf = NULL;\n- int big_buf_len = 0;\n- int big_buf_step = sizeof(static_buf);\n- \/* the current location to read into (with fgets) and the amount to read *\/\n- char *read_buf;\n- int read_len;\n- \/* the current buffer to parse *\/\n- char *buf;\n Ecore_Hash *data, *section = NULL;\n-\n- \/* start with the static buffer *\/\n- buf = read_buf = static_buf;\n- read_len = sizeof(static_buf);\n+ struct stat file_stat;\n+ int buffer_length;\n+ int line_length;\n+ int left;\n \n f = fopen(file, \"rb\");\n if (!f) return NULL;\n+\n+ if (fstat(fileno(f), &file_stat)\n+ || file_stat.st_size < 1)\n+ {\n+ fclose(f);\n+ return NULL;\n+ }\n+\n+ left = file_stat.st_size;\n+ buffer = mmap(NULL, left, PROT_READ, MAP_SHARED, fileno(f), 0);\n+ if (!buffer)\n+ {\n+ fclose(f);\n+ return NULL;\n+ }\n \n data = ecore_hash_new(ecore_str_hash, ecore_str_compare);\n ecore_hash_free_key_cb_set(data, ECORE_FREE_CB(ecore_string_release));\n ecore_hash_free_value_cb_set(data, ECORE_FREE_CB(ecore_hash_destroy));\n \n- \/* if a line is longer than the buffer size, this \\n will get overwritten. *\/\n- read_buf[read_len - 2] = '\\n';\n- while (fgets(read_buf, read_len, f) != NULL)\n- {\n- char *key, *value, *p;\n- char *sep;\n-\n- \/* handle lines longer than the buffer size *\/\n- if (read_buf[read_len-2] != '\\n')\n+ line_start = buffer;\n+ while (left > 0)\n+ {\n+ int sep;\n+\n+ \/* strnchr like looking for end of line *\/\n+ for (line_length = 0; line_length < left && line_start[line_length] != '\\n'; ++line_length)\n+ ;\n+\n+ \/* skip empty lines and comments *\/\n+ if (line_length == 0 || line_start[0] == '\\n' || line_start[0] == '#') goto next_line;\n+\n+ \/* new section *\/\n+ if (line_start[0] == '[')\n {\n- int len;\n- len = strlen(buf);\n-\n- if (!big_buf)\n- {\n- \/* create new big buffer and copy in contents of static buf *\/\n- big_buf_len = 2 * big_buf_step;\n- big_buf = malloc(big_buf_len * sizeof(char));\n- strncpy(big_buf, buf, len + 1);\n- }\n- else if (buf == big_buf)\n- {\n- \/* already using the big buffer. increase its size for the next read *\/\n- big_buf_len += big_buf_step;\n- big_buf = realloc(big_buf, big_buf_len);\n- }\n- else\n- {\n- \/* the big buffer exists, but we aren't using it yet. copy contents of static buf in *\/\n- strncpy(big_buf, buf, len);\n- }\n-\n- \/* use big_buffer for next fgets and subsequent parsing *\/\n- buf = big_buf;\n- read_buf = big_buf + len;\n- read_len = big_buf_len - len;\n- read_buf[read_len-2] = '\\n';\n-\n- continue;\n- }\n-\n- \/* skip empty lines and comments *\/\n- if (buf[0] == '\\0' || buf[0] == '\\n' || buf[0] == '#') goto next_line;\n-\n- \/* new section *\/\n- if (buf[0] == '[')\n- {\n- char *header, *p;\n- header = buf + 1;\n-\n- p = strchr(header, ']');\n- if (p)\n+ int header_length;\n+\n+ \/* strnchr like looking for ']' *\/\n+ for (header_length = 1; header_length < line_length && line_start[header_length] != ']'; ++header_length)\n+ ;\n+\n+ if (line_start[header_length] == ']')\n {\n Ecore_Hash *old;\n- *p = '\\0';\n+ const char *header;\n+\n+ header = alloca(header_length * sizeof(unsigned char));\n+ if (!header) goto next_line;\n+ memcpy((char*)header, line_start + 1, header_length - 1);\n+ ((char*)header)[header_length - 1] = '\\0';\n+\n section = ecore_hash_new(ecore_str_hash, ecore_str_compare);\n ecore_hash_free_key_cb_set(section, ECORE_FREE_CB(ecore_string_release));\n ecore_hash_free_value_cb_set(section, ECORE_FREE_CB(free));\n@@ -167,68 +149,85 @@\n goto next_line;\n }\n \n- \/* parse key=value pair *\/\n- sep = strchr(buf, '=');\n- key = buf;\n-\n- if (sep)\n+ \/* strnchr like looking for '=' *\/\n+ for (sep = 0; sep < line_length && line_start[sep] != '='; ++sep)\n+ ;\n+\n+ if (section == NULL)\n {\n+ printf(\"Invalid file (%s) (missing section)\\n\", file);\n+ goto next_line;\n+ }\n+\n+ if (sep < line_length)\n+ {\n+ const char *key;\n+ const char *value;\n+ char *old;\n+ int key_end;\n+ int value_start;\n+ int value_end;\n+\n \/* trim whitespace from end of key *\/\n- p = sep;\n- while (p > key && isspace(*(p - 1))) p--;\n- *p = '\\0';\n-\n- value = sep + 1;\n+ for (key_end = sep - 1; key_end > 0 && isspace(line_start[key_end]); --key_end)\n+ ;\n+ if (!isspace(line_start[key_end]))\n+ key_end++;\n \n \/* trim whitespace from start of value *\/\n- while (*value && isspace(*value)) value++;\n+ for (value_start = sep + 1; value_start < line_length && isspace(line_start[value_start]); ++value_start)\n+ ;\n \n \/* trim \\n off of end of value *\/\n- p = value + strlen(value) - 1;\n- while (p > value && (*p == '\\n' || *p == '\\r')) p--;\n- *(p + 1) = '\\0';\n-\n- if (key && value && *key && *value)\n- {\n- char *old;\n-\n- old = ecore_hash_remove(section, key);\n- \/\/if (old) printf(\"[efreet] Warning: duplicate key '%s' in file '%s'\\n\", key, file);\n- IF_FREE(old);\n-\n- ecore_hash_set(section, (void *)ecore_string_instance(key),\n- efreet_ini_unescape(value));\n- }\n+ for (value_end = line_length; value_end > value_start &&\n+ (line_start[value_end] == '\\n' || line_start[value_end] == '\\r'); --value_end)\n+ ;\n+ if (line_start[value_end] != '\\n'\n+ && line_start[value_end] != '\\r'\n+ && value_end < line_length)\n+ value_end++;\n+\n+ if (!(key_end > 0 && value_start < line_length && value_end > value_start))\n+ {\n+ \/* invalid file... *\/\n+ printf(\"Invalid file (%s) (invalid key=value pair)\\n\", file);\n+\n+ goto next_line;\n+ }\n+\n+ key = alloca((key_end + 1) * sizeof(unsigned char));\n+ value = alloca((value_end - value_start + 1) * sizeof(unsigned char));\n+ if (!key || !value) goto next_line;\n+ memcpy((char*)key, line_start, key_end);\n+ ((char*)key)[key_end] = '\\0';\n+ memcpy((char*)value, line_start + value_start, value_end - value_start);\n+ ((char*)value)[value_end - value_start] = '\\0';\n+\n+ old = ecore_hash_remove(section, key);\n+ IF_FREE(old);\n+\n+ ecore_hash_set(section, (void *)ecore_string_instance(key),\n+ efreet_ini_unescape(value));\n }\n else\n {\n \/* check if line is all whitespace, if so, skip it *\/\n- int nonwhite = 0;\n- p = buf;\n- while (*p)\n- {\n- if (!isspace(*p))\n- {\n- nonwhite = 1;\n- break;\n- }\n- p++;\n- }\n- if (!nonwhite) goto next_line;\n+ for (sep = 0; sep < line_length && isspace(line_start[sep]); ++sep)\n+ ;\n+\n+ if (sep < line_length) goto next_line;\n \n \/* invalid file... *\/\n printf(\"Invalid file (%s) (missing = from key=value pair)\\n\", file);\n }\n \n next_line:\n- \/* finished parsing a line. use static buffer for next line *\/\n- buf = read_buf = static_buf;\n- read_len = sizeof(static_buf);\n- read_buf[read_len - 2] = '\\n';\n- }\n-\n+ left -= line_length + 1;\n+ line_start += line_length + 1;\n+ }\n+\n+ munmap((char*) buffer, file_stat.st_size);\n fclose(f);\n- if (big_buf) free(big_buf);\n \n return data;\n }\n"} {"commit":"92616bb659106a263ca01a016ff5104085a4843d","subject":"elm_layout: fix typo in error message","message":"elm_layout: fix typo in error message\n\nSummary: fix \"box part\" to \"table part\" in _elm_layout_table_pack()\n\nReviewers: woohyun, jaehwan, Jaehyun, Hermet\n\nDifferential Revision: https:\/\/phab.enlightenment.org\/D3453\n","repos":"rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_layout.c\n+++ src\/lib\/elm_layout.c\n@@ -1424,7 +1424,7 @@\n (wd->resize_obj, part, child, col,\n row, colspan, rowspan))\n {\n- ERR(\"child %p could not be packed into box part '%s' col=%uh, row=%hu,\"\n+ ERR(\"child %p could not be packed into table part '%s' col=%uh, row=%hu,\"\n \" colspan=%hu, rowspan=%hu\", child, part, col, row, colspan,\n rowspan);\n return EINA_FALSE;\n"} {"commit":"10cf43da046219c3c0ea2b78a91b6977ac138580","subject":"still wrong..","message":"still wrong..\n","repos":"Distrotech\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/file-cache.c\n+++ src\/lib\/file-cache.c\n@@ -172,7 +172,7 @@\n \t\treturn;\n \n \tmax_size = cache->mmap_length - offset;\n-\tif (max_size > size)\n+\tif (max_size < size)\n \t\tsize = max_size;\n \tmemcpy(PTR_OFFSET(cache->mmap_base, offset), data, size);\n \n"} {"commit":"f55d489af70318a8e4e34c230d47470d2204d0a8","subject":"AIX compiling fix.","message":"AIX compiling fix.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/mountpoint.c\n+++ src\/lib\/mountpoint.c\n@@ -123,7 +123,7 @@\n \tfor (i = 0; i < count && device_path == NULL; i++) {\n \t\tstruct stat vst;\n \t\tconst char *vmt_base = (const char *)vmt;\n-\t\tconst char *vmt_base, *vmt_object, *vmt_stub, *vmt_hostname;\n+\t\tconst char *vmt_object, *vmt_stub, *vmt_hostname;\n \n \t\tvmt_hostname = vmt_base + vmt->vmt_data[VMT_HOSTNAME].vmt_off;\n \t\tvmt_object = vmt_base + vmt->vmt_data[VMT_OBJECT].vmt_off;\n"} {"commit":"78400d74853fa7ada46541b93bb9c1f6689b5e1e","subject":"Attempt to fix bug in especs","message":"Attempt to fix bug in especs\n","repos":"dcrossleyau\/yaz,nla\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz,nla\/yaz,nla\/yaz,nla\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- retrieval\/d1_doespec.c\n+++ retrieval\/d1_doespec.c\n@@ -4,7 +4,10 @@\n * Sebastian Hammer, Adam Dickmeiss\n *\n * $Log: d1_doespec.c,v $\n- * Revision 1.9 1997-09-17 12:10:35 adam\n+ * Revision 1.10 1997-10-02 12:10:24 quinn\n+ * Attempt to fix bug in especs\n+ *\n+ * Revision 1.9 1997\/09\/17 12:10:35 adam\n * YAZ version 1.4.\n *\n * Revision 1.8 1997\/05\/14 06:54:02 adam\n@@ -80,7 +83,17 @@\n {\n data1_node *c;\n \n+#if 1\n+ if (n->which == DATA1N_tag)\n+#else\n if (n->which == DATA1N_tag && (!n->child || n->child->which != DATA1N_tag))\n+ \/*\n+ * This seems to cause multi-level elements to fall out when only a\n+ * top-level elementRequest has been given... Problem is, I can't figure\n+ * out what it was supposed to ACHIEVE.... delete when code has been\n+ * verified.\n+ *\/\n+#endif\n {\n \tn->u.tag.node_selected = 1;\n \tn->u.tag.make_variantlist = make_variantlist;\n"} {"commit":"2b628d1640bd3b3094ad542eb72703073a012ecd","subject":"heapsort: use variably-sized arr on stack instead of swapping (non-recursive)","message":"heapsort: use variably-sized arr on stack instead of swapping (non-recursive)\n","repos":"noporpoise\/carrays","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- carrays.c\n+++ carrays.c\n@@ -194,15 +194,18 @@\n {\n char *b = (char*)base;\n size_t chi, pi, n;\n+ char tmp[es];\n \/\/ add elements one-at-a-time to the end\n for(n = 1; n < nel; n++)\n {\n+ memcpy(tmp, b+es*n, es);\n \/\/ push up the tree\n for(chi = n; chi > 0; chi = pi) {\n pi = array_heap_parent(chi);\n- if(compar(b+es*pi, b+es*chi, arg) >= 0) break;\n- carrays_swapm(b+es*pi, b+es*chi, es);\n- }\n+ if(compar(b+es*pi, tmp, arg) >= 0) break;\n+ memcpy(b+es*chi, b+es*pi, es);\n+ }\n+ memcpy(b+es*chi, tmp, es);\n }\n }\n \n@@ -213,15 +216,18 @@\n {\n if(nel <= 1) return;\n char *b = (char*)heap, *last, *p, *ch;\n+ char tmp[es];\n \/\/ take elements off the top one at a time, by swapping first and last\n for(last = b+es*(nel-1); last > b; last -= es)\n {\n- carrays_swapm(b, last, es); \/\/ swap into index zero\n+ memcpy(tmp, last, es);\n+ memcpy(last, b, es);\n \/\/ push down the tree\n for(p = b, ch = b+es; ch < last; p = ch, ch = b + 2*(ch-b) + es) {\n ch = (ch+es < last && compar(ch,ch+es,arg) < 0 ? ch+es : ch); \/\/ biggest child\n- if(compar(p,ch,arg) >= 0) break;\n- carrays_swapm(p, ch, es);\n- }\n- }\n-}\n+ if(compar(tmp, ch, arg) >= 0) break;\n+ memcpy(p, ch, es);\n+ }\n+ memcpy(p, tmp, es);\n+ }\n+}\n"} {"commit":"a989939bd66f879f14a7c39491b3913f3205cb6a","subject":"some fixes from testing","message":"some fixes from testing\n","repos":"stevenraspudic\/resource-agents,asp24\/resource-agents,asp24\/resource-agents,stevenraspudic\/resource-agents,stevenraspudic\/resource-agents,asp24\/resource-agents","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- dlm-kernel\/src2\/lock.c\n+++ dlm-kernel\/src2\/lock.c\n@@ -20,7 +20,6 @@\n #include \"lockspace.h\"\n #include \"astd.h\"\n #include \"lock.h\"\n-#include \"lock_remote.h\"\n \n \/* Central locking logic has four stages:\n \n@@ -147,9 +146,7 @@\n };\n \n \n-\/*\n- * Threads cannot use the lockspace while it's being recovered\n- *\/\n+\/* Threads cannot use the lockspace while it's being recovered *\/\n \n void lock_recovery(struct dlm_ls *ls)\n {\n@@ -184,7 +181,12 @@\n int is_remote(struct dlm_rsb *r)\n {\n \tDLM_ASSERT(r->res_nodeid >= 0, );\n-\treturn r->res_nodeid;\n+\treturn r->res_nodeid ? TRUE : FALSE;\n+}\n+\n+int is_master(struct dlm_rsb *r)\n+{\n+\treturn !is_remote(r);\n }\n \n int is_local_copy(struct dlm_lkb *lkb)\n@@ -274,7 +276,7 @@\n \treturn -ENOENT;\n \n found:\n-\tif (!test_bit(RESFL_MASTER, &r->res_flags) && (flags & R_MASTER))\n+\tif (r->res_nodeid && (flags & R_MASTER))\n \t\terror = -ENOTBLK;\n \t*r_ret = r;\n \treturn error;\n@@ -305,7 +307,6 @@\n \t\t\tr->res_trial_lkid = 0;\n \t\t} else {\n \t\t\tDLM_ASSERT(r->res_nodeid == 0, );\n-\t\t\tDLM_ASSERT(test_bit(RESFL_MASTER, &r->res_flags),);\n \t\t\tDLM_ASSERT(!test_bit(RESFL_MASTER_WAIT,\n \t\t\t\t\t &r->res_flags),);\n \t\t\tDLM_ASSERT(!test_bit(RESFL_MASTER_UNCERTAIN,\n@@ -541,6 +542,8 @@\n \tlkid = bucket | (ls->ls_lkbtbl[bucket].counter++ << 16);\n \t\/* FIXME: do a find to verify lkid not in use *\/\n \n+\tDLM_ASSERT(lkid, );\n+\n \tlkb->lkb_id = lkid;\n \tlist_add(&lkb->lkb_idtbl_list, &ls->ls_lkbtbl[bucket].list);\n \twrite_unlock(&ls->ls_lkbtbl[bucket].lock);\n@@ -583,7 +586,7 @@\n {\n \tstruct dlm_ls *ls = lkb->lkb_resource->res_ls;\n \tuint16_t bucket = lkb->lkb_id & 0xFFFF;\n-\tint rv = 0;\n+\tint rv = 1;\n \n \twrite_lock(&ls->ls_lkbtbl[bucket].lock);\n \t\/* rv = kref_put(&lkb->lkb_ref, kill_lkb); *\/\n@@ -795,6 +798,8 @@\n \tlkb->lkb_lvbptr = lksb->sb_lvbptr;\n \tlkb->lkb_ownpid = (int) current->pid;\n \n+\tlkb->lkb_flags &= ~DLM_IFL_RETURNLVB;\n+\n \tif (range) {\n \t\tif (!lkb->lkb_range) {\n \t\t\trv = -ENOMEM;\n@@ -815,10 +820,6 @@\n \t\tlkb->lkb_flags |= DLM_IFL_RANGE;\n \t}\n \n-\t\/* return lkid in lksb for new locks *\/\n-\n-\tif (!lksb->sb_lkid)\n-\t\tlksb->sb_lkid = lkb->lkb_id;\n \trv = 0;\n out:\n \treturn rv;\n@@ -896,7 +897,7 @@\n \t\terror = request_lock(ls, lkb, name, namelen);\n \n \t\/* the lock request is queued *\/\n-\tif (error == -EBUSY)\n+\tif (error == -EINPROGRESS)\n \t\terror = 0;\n out_put:\n \tif (error)\n@@ -971,7 +972,7 @@\n After the initial lookup reply, the initial lkb gets the resulting\n nodeid copied from the rsb. This lkb then \"tries out\" the nodeid\n since it's still uncertain. This lkb is designed the \"trial lkb\"\n- and is pointed to by res_trial_lkb until it gets a reply from the\n+ and is identified by res_trial_lkid until it gets a reply from the\n master indicating the lkb request was queued. This confirms that\n the master nodeid is correct and allows any other lkb's on the\n res_lookup list to have their nodeid copied from the rsb.\n@@ -981,19 +982,18 @@\n c. res_nodeid == -1 no idea who master is\n d. lkb_nodeid == 0 we are master, res_nodeid is certain\n e. lkb_nodeid != 0\n- f. res_flags MASTER we are master (a. should be true)\n- g. res_flags MASTER_UNCERTAIN (b. should be true in this case)\n- h. res_flags MASTER_WAIT\n+ f. res_flags MASTER_UNCERTAIN (b. should be true in this case)\n+ g. res_flags MASTER_WAIT\n \n Cases:\n 1. we've no idea who master is [c]\n- 2. we know who master \/was\/ in the past (r was tossed and remote) [b,g]\n+ 2. we know who master \/was\/ in the past (r was tossed and remote) [b,f]\n 3. we're certain of who master is (we hold granted locks) [b or a]\n- 4. we're in the process of looking up master from dir [c,h]\n+ 4. we're in the process of looking up master from dir [c,g]\n 5. we've been told who the master is (from dir) but it could\n change by the time we send it a lock request (only if we\n- were told the master is remote) [b,g]\n- 6. 5 and we have a request outstanding to this uncertain master [b,g,h]\n+ were told the master is remote) [b,f]\n+ 6. 5 and we have a request outstanding to this uncertain master [b,f,g]\n \n When set_master is called again on a trial lkb it means the trial failed and\n the uncertain rsb master was wrong. The rsb nodeid goes from being\n@@ -1010,7 +1010,8 @@\n \n int set_master(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n-\tint error;\n+\tstruct dlm_ls *ls = r->res_ls;\n+\tint error, dir_nodeid, ret_nodeid, our_nodeid = dlm_our_nodeid();\n \n \tif (r->res_trial_lkid == lkb->lkb_id) {\n \t\tr->res_nodeid = -1;\n@@ -1021,6 +1022,23 @@\n \t}\n \n \tif (r->res_nodeid == -1) {\n+\t\tdir_nodeid = dlm_dir_nodeid(r);\n+\n+\t\tif (dir_nodeid == our_nodeid) {\n+\t\t\terror = dlm_dir_lookup(ls, our_nodeid, r->res_name,\n+\t\t\t\t r->res_length, &ret_nodeid);\n+\t\t\t\/* FIXME: is -EEXIST ever a valid error here? *\/\n+\t\t\tif (error)\n+\t\t\t\tlog_print(\"dir lookup error %d\", error);\n+\n+\t\t\tif (ret_nodeid == our_nodeid)\n+\t\t\t\tret_nodeid = 0;\n+\n+\t\t\tr->res_nodeid = ret_nodeid;\n+\t\t\tlkb->lkb_nodeid = ret_nodeid;\n+\t\t\treturn 0;\n+\t\t}\n+\n \t\tif (!test_bit(RESFL_MASTER_WAIT, &r->res_flags)) {\n \t\t\terror = send_lookup(r, lkb);\n \t\t\tif (error)\n@@ -1067,12 +1085,12 @@\n interesting if we're waiting to confirm an uncertain rsb nodeid.\n \n The \"rv\" return value is the result the master sent back for the\n- request. It could be -EAGAIN (the lkb would block), -EBUSY (the\n- lkb was put on the wait queue), or 0 (the lkb was granted.)\n+ request. It could be -EAGAIN (the lkb would block), -EINPROGRESS\n+ (the lkb was put on the wait queue), or 0 (the lkb was granted.)\n \n If the rsb nodeid is uncertain and the rv is -EAGAIN, we still\n can't be certain so we need to do another trial lkb. If the\n- rsb is uncertain and the rv is -EBUSY or 0, we are now certain\n+ rsb is uncertain and the rv is -EINPROGRESS or 0, we are now certain\n and can send any lkb requests waiting on res_lookup.\n *\/\n \n@@ -1083,7 +1101,7 @@\n \tif (!test_bit(RESFL_MASTER_UNCERTAIN, &r->res_flags))\n \t\treturn;\n \n-\tif (rv == 0 || rv == -EBUSY) {\n+\tif (rv == 0 || rv == -EINPROGRESS) {\n \t\tclear_bit(RESFL_MASTER_UNCERTAIN, &r->res_flags);\n \t\tclear_bit(RESFL_MASTER_WAIT, &r->res_flags);\n \t\tr->res_trial_lkid = 0;\n@@ -1270,21 +1288,11 @@\n \treturn error;\n }\n \n-\n-\/*\n- * Special-purpose routines called by the core locking functions.\n- * Deal with \"details\" whereas primary routines deal with locking \"logic\".\n- * (Many routines from locking.c can be used here with minor change.)\n- *\/\n-\n \/* lkb is master or local copy *\/\n \n void set_lvb_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n \tint b;\n-\n-\tif (!r->res_lvbptr)\n-\t\tr->res_lvbptr = allocate_lvb(r->res_ls);\n \n \t\/* b=1 lvb returned to caller\n \t b=0 lvb written to rsb or invalidated\n@@ -1299,8 +1307,12 @@\n \t\tif (!(lkb->lkb_exflags & DLM_LKF_VALBLK))\n \t\t\treturn;\n \n+\t\tif (!r->res_lvbptr)\n+\t\t\treturn;\n+\n \t\tmemcpy(lkb->lkb_lvbptr, r->res_lvbptr, DLM_LVB_LEN);\n \t\tlkb->lkb_lvbseq = r->res_lvbseq;\n+\t\tlkb->lkb_flags &= DLM_IFL_RETURNLVB;\n \n \t} else if (b == 0) {\n \t\tif (lkb->lkb_exflags & DLM_LKF_IVVALBLK) {\n@@ -1314,8 +1326,15 @@\n \t\tif (!(lkb->lkb_exflags & DLM_LKF_VALBLK))\n \t\t\treturn;\n \n+\t\tif (!r->res_lvbptr)\n+\t\t\tr->res_lvbptr = allocate_lvb(r->res_ls);\n+\n+\t\tif (!r->res_lvbptr)\n+\t\t\treturn;\n+\n \t\tmemcpy(r->res_lvbptr, lkb->lkb_lvbptr, DLM_LVB_LEN);\n \t\tr->res_lvbseq++;\n+\t\tlkb->lkb_lvbseq = r->res_lvbseq;\n \t\tclear_bit(RESFL_VALNOTVALID, &r->res_flags);\n \t}\n \n@@ -1347,7 +1366,7 @@\n \tclear_bit(RESFL_VALNOTVALID, &r->res_flags);\n }\n \n-\/* pc: lkb is process copy *\/\n+\/* lkb is process copy (pc) *\/\n \n void set_lvb_lock_pc(struct dlm_rsb *r, struct dlm_lkb *lkb,\n \t\t struct dlm_message *ms)\n@@ -1365,7 +1384,15 @@\n \tlkb->lkb_lvbseq = ms->m_lvbseq;\n }\n \n-\/* \"remove_lock\" varieties used for unlock *\/\n+\/* Manipulate lkb's on rsb's convert\/granted\/waiting queues\n+ remove_lock -- used for unlock, removes lkb from granted\n+ revert_lock -- used for cancel, moves lkb from convert to granted\n+ grant_lock -- used for request and convert, moves lkb from\n+ convert or waiting to granted\n+ \n+ Each of these is used for master or local copy lkb's. There is\n+ also a _pc() variation used to make the corresponding change on\n+ a process copy (pc) lkb. *\/\n \n void _remove_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n@@ -1383,8 +1410,6 @@\n {\n \t_remove_lock(r, lkb);\n }\n-\n-\/* \"revert_lock\" varieties used for cancel *\/\n \n void revert_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n@@ -1397,8 +1422,6 @@\n {\n \trevert_lock(r, lkb);\n }\n-\n-\/* \"grant_lock\" varieties used for request and convert *\/\n \n void _grant_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n@@ -1416,8 +1439,6 @@\n \t}\n }\n \n-\/* lkb is master or local copy *\/\n-\n void grant_lock(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n \tset_lvb_lock(r, lkb);\n@@ -1425,8 +1446,6 @@\n \tlkb->lkb_highbast = 0;\n }\n \n-\/* pc: lkb is process copy *\/\n-\n void grant_lock_pc(struct dlm_rsb *r, struct dlm_lkb *lkb,\n \t\t struct dlm_message *ms)\n {\n@@ -1435,8 +1454,8 @@\n }\n \n \/* called by grant_pending_locks() which means an async grant message must\n- be sent to the requesting node in addition to granting the lock.\n- i.e. it's not granted in the context of the initial request\/convert *\/\n+ be sent to the requesting node in addition to granting the lock if the\n+ lkb belongs to a remote node. *\/\n \n void grant_lock_pending(struct dlm_rsb *r, struct dlm_lkb *lkb)\n {\n@@ -1447,12 +1466,12 @@\n \n static inline int first_in_list(struct dlm_lkb *lkb, struct list_head *head)\n {\n-\tstruct dlm_lkb *first = list_entry(head->next, struct dlm_lkb, lkb_statequeue);\n-\n+\tstruct dlm_lkb *first = list_entry(head->next, struct dlm_lkb,\n+\t\t\t\t\t lkb_statequeue);\n \tif (lkb->lkb_id == first->lkb_id)\n-\t\treturn 1;\n-\n-\treturn 0;\n+\t\treturn TRUE;\n+\n+\treturn FALSE;\n }\n \n \/*\n@@ -1463,13 +1482,13 @@\n static inline int ranges_overlap(struct dlm_lkb *lkb1, struct dlm_lkb *lkb2)\n {\n \tif (!lkb1->lkb_range || !lkb2->lkb_range)\n-\t\treturn 1;\n+\t\treturn TRUE;\n \n \tif (lkb1->lkb_range[RQ_RANGE_END] < lkb2->lkb_range[GR_RANGE_START] ||\n \t lkb1->lkb_range[RQ_RANGE_START] > lkb2->lkb_range[GR_RANGE_END])\n-\t\treturn 0;\n-\n-\treturn 1;\n+\t\treturn FALSE;\n+\n+\treturn TRUE;\n }\n \n \/*\n@@ -1687,6 +1706,11 @@\n \treturn FALSE;\n }\n \n+\/*\n+ * The ALTPR and ALTCW flags aren't traditional lock manager flags, but are a\n+ * simple way to provide a big optimization to applications that can use them.\n+ *\/\n+\n static int can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)\n {\n \tuint32_t flags = lkb->lkb_exflags;\n@@ -1778,10 +1802,7 @@\n \t\/*\n \t * If there are locks left on the wait\/convert queue then send blocking\n \t * ASTs to granted locks that are blocking\n-\t *\n-\t * FIXME: This might generate some spurious blocking ASTs for range\n-\t * locks.\n-\t *\n+\t * FIXME: This might generate spurious blocking ASTs for range locks.\n \t * FIXME: the highbast < high comparison is not always valid.\n \t *\/\n \n@@ -1840,7 +1861,7 @@\n \t}\n \n \tif (can_be_queued(lkb)) {\n-\t\terror = -EBUSY;\n+\t\terror = -EINPROGRESS;\n \t\tadd_lkb(r, lkb, DLM_LKSTS_WAITING);\n \t\tsend_blocking_asts(r, lkb);\n \t\tgoto out;\n@@ -1871,7 +1892,7 @@\n \tif (can_be_queued(lkb)) {\n \t\tif (is_demoted(lkb))\n \t\t\tgrant_pending_locks(r);\n-\t\terror = -EBUSY;\n+\t\terror = -EINPROGRESS;\n \t\tadd_lkb(r, lkb, DLM_LKSTS_CONVERT);\n \t\tsend_blocking_asts(r, lkb);\n \t\tgoto out;\n@@ -1909,36 +1930,23 @@\n \/*\n * send\/receive routines for remote operations and replies\n *\n- * send_args (all sends use this for setting args)\n+ * send_args\n * send_common\n- * send_request\n- * send_convert\n- * send_unlock\n- * send_cancel\n- * send_grant\n- * send_bast\n- * send_lookup\n+ * send_request\t\t\treceive_request\n+ * send_convert\t\t\treceive_convert\n+ * send_unlock\t\t\treceive_unlock\n+ * send_cancel\t\t\treceive_cancel\n+ * send_grant\t\t\treceive_grant\n+ * send_bast\t\t\treceive_bast\n+ * send_lookup\t\t\treceive_lookup\n+ * send_remove\t\t\treceive_remove\n *\n- * send_common_reply\n- * send_request_reply\n- * send_convert_reply\n- * send_unlock_reply\n- * send_cancel_reply\n- * send_lookup_reply\n- *\n- * receive_request\n- * receive_convert\n- * receive_unlock\n- * receive_cancel\n- * receive_grant\n- * receive_bast\n- * receive_lookup\n- *\n- * receive_request_reply\n- * receive_convert_reply\n- * receive_unlock_reply\n- * receive_cancel_reply\n- * receive_lookup_reply\n+ * \t\t\t\tsend_common_reply\n+ * receive_request_reply\tsend_request_reply\n+ * receive_convert_reply\tsend_convert_reply\n+ * receive_unlock_reply\t\tsend_unlock_reply\n+ * receive_cancel_reply\t\tsend_cancel_reply\n+ * receive_lookup_reply\t\tsend_lookup_reply\n *\/\n \n int create_message(struct dlm_rsb *r, int to_nodeid, int mstype,\n@@ -1981,7 +1989,7 @@\n \n int send_message(struct dlm_mhandle *mh)\n {\n-\t\/* FIXME: add byte order munging *\/\n+\t\/* FIXME: add byte swapping *\/\n \tlowcomms_commit_buffer(mh);\n \treturn 0;\n }\n@@ -2237,8 +2245,8 @@\n \n \n \/* which args we save from a received message depends heavily on the type\n- of message, unlike the send side where we can safely send everything\n- about the lkb for any type of message *\/\n+ of message, unlike the send side where we can safely send everything about\n+ the lkb for any type of message *\/\n \n void receive_flags(struct dlm_lkb *lkb, struct dlm_message *ms)\n {\n@@ -2259,7 +2267,8 @@\n \treturn (ms->m_header.h_length - sizeof(struct dlm_message));\n }\n \n-int receive_range(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_message *ms)\n+int receive_range(struct dlm_ls *ls, struct dlm_lkb *lkb,\n+\t\t struct dlm_message *ms)\n {\n \tif (lkb->lkb_flags & DLM_IFL_RANGE) {\n \t\tlkb->lkb_range = allocate_range(ls);\n@@ -2284,7 +2293,8 @@\n \treturn 0;\n }\n \n-int receive_request_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_message *ms)\n+int receive_request_args(struct dlm_ls *ls, struct dlm_lkb *lkb,\n+\t\t\t struct dlm_message *ms)\n {\n \tlkb->lkb_nodeid = ms->m_header.h_nodeid;\n \tlkb->lkb_ownpid = ms->m_pid;\n@@ -2303,7 +2313,8 @@\n \treturn 0;\n }\n \n-int receive_convert_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_message *ms)\n+int receive_convert_args(struct dlm_ls *ls, struct dlm_lkb *lkb,\n+\t\t\t struct dlm_message *ms)\n {\n \tlkb->lkb_rqmode = ms->m_rqmode;\n \tlkb->lkb_lvbseq = ms->m_lvbseq;\n@@ -2320,7 +2331,8 @@\n \treturn 0;\n }\n \n-int receive_unlock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_message *ms)\n+int receive_unlock_args(struct dlm_ls *ls, struct dlm_lkb *lkb,\n+\t\t\tstruct dlm_message *ms)\n {\n \tif (receive_lvb(ls, lkb, ms))\n \t\treturn -ENOMEM;\n@@ -2339,14 +2351,13 @@\n \n \treceive_flags(lkb, ms);\n \tlkb->lkb_flags |= DLM_IFL_MSTCPY;\n-\n-\tnamelen = receive_namelen(ms);\n-\n \terror = receive_request_args(ls, lkb, ms);\n \tif (error) {\n \t\tput_lkb(lkb);\n \t\tgoto fail;\n \t}\n+\n+\tnamelen = receive_namelen(ms);\n \n \terror = find_rsb(ls, ms->m_name, namelen, R_MASTER, &r);\n \tif (error) {\n@@ -2524,6 +2535,8 @@\n \n \tdir_nodeid = name_to_directory_nodeid(ls, ms->m_name, len);\n \tif (dir_nodeid != dlm_our_nodeid()) {\n+\t\tlog_error(ls, \"lookup dir_nodeid %d from %d\",\n+\t\t\t dir_nodeid, from_nodeid);\n \t\terror = -EINVAL;\n \t\tret_nodeid = -1;\n \t\tgoto out;\n@@ -2567,14 +2580,12 @@\n \n \terror = remove_from_waiters(lkb);\n \tif (error) {\n-\t\tlog_error(ls, \"receive_request_reply not on lockqueue\");\n+\t\tlog_error(ls, \"receive_request_reply not on waiters\");\n \t\tgoto out;\n \t}\n \n \t\/* this is the value returned from do_request() on the master *\/\n \terror = ms->m_result;\n-\n-\t\/* now follow pattern of xxx_lock() functions *\/\n \n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n@@ -2592,21 +2603,18 @@\n \t\tconfirm_master(r, -EAGAIN);\n \t\tbreak;\n \n-\tcase -EBUSY:\n-\t\t\/* request was queued on remote master *\/\n+\tcase -EINPROGRESS:\n+\tcase 0:\n+\t\t\/* request was queued or granted on remote master *\/\n \t\treceive_flags_reply(lkb, ms);\n \t\tlkb->lkb_remid = ms->m_lkid;\n-\t\tadd_lkb(r, lkb, DLM_LKSTS_WAITING);\n-\t\tconfirm_master(r, -EBUSY);\n-\t\tbreak;\n-\n-\tcase 0:\n-\t\t\/* request was granted on remote master *\/\n-\t\treceive_flags_reply(lkb, ms);\n-\t\tlkb->lkb_remid = ms->m_lkid;\n-\t\tgrant_lock_pc(r, lkb, ms);\n-\t\tqueue_cast(r, lkb, 0);\n-\t\tconfirm_master(r, 0);\n+\t\tif (error)\n+\t\t\tadd_lkb(r, lkb, DLM_LKSTS_WAITING);\n+\t\telse {\n+\t\t\tgrant_lock_pc(r, lkb, ms);\n+\t\t\tqueue_cast(r, lkb, 0);\n+\t\t}\n+\t\tconfirm_master(r, error);\n \t\tbreak;\n \n \tdefault:\n@@ -2634,14 +2642,12 @@\n \n \terror = remove_from_waiters(lkb);\n \tif (error) {\n-\t\tlog_error(ls, \"receive_convert_reply not on lockqueue\");\n+\t\tlog_error(ls, \"receive_convert_reply not on waiters\");\n \t\tgoto out;\n \t}\n \n \t\/* this is the value returned from do_convert() on the master *\/\n \terror = ms->m_result;\n-\n-\t\/* now follow pattern of xxx_lock() functions *\/\n \n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n@@ -2653,7 +2659,7 @@\n \t\tqueue_cast(r, lkb, -EAGAIN);\n \t\tbreak;\n \n-\tcase -EBUSY:\n+\tcase -EINPROGRESS:\n \t\t\/* convert was queued on remote master *\/\n \t\tdel_lkb(r, lkb);\n \t\tadd_lkb(r, lkb, DLM_LKSTS_CONVERT);\n@@ -2691,14 +2697,12 @@\n \n \terror = remove_from_waiters(lkb);\n \tif (error) {\n-\t\tlog_error(ls, \"receive_unlock_reply not on lockqueue\");\n+\t\tlog_error(ls, \"receive_unlock_reply not on waiters\");\n \t\tgoto out;\n \t}\n \n \t\/* this is the value returned from do_unlock() on the master *\/\n \terror = ms->m_result;\n-\n-\t\/* now follow pattern of xxx_lock() functions *\/\n \n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n@@ -2739,14 +2743,12 @@\n \n \terror = remove_from_waiters(lkb);\n \tif (error) {\n-\t\tlog_error(ls, \"receive_cancel_reply not on lockqueue\");\n+\t\tlog_error(ls, \"receive_cancel_reply not on waiters\");\n \t\tgoto out;\n \t}\n \n \t\/* this is the value returned from do_cancel() on the master *\/\n \terror = ms->m_result;\n-\n-\t\/* now follow pattern of xxx_lock() functions *\/\n \n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n@@ -2783,15 +2785,12 @@\n \n \terror = remove_from_waiters(lkb);\n \tif (error) {\n-\t\tlog_error(ls, \"receive_lookup_reply not on lockqueue\");\n+\t\tlog_error(ls, \"receive_lookup_reply not on waiters\");\n \t\tgoto out;\n \t}\n \n \t\/* this is the value returned by dlm_dir_lookup on dir node *\/\n \terror = ms->m_result;\n-\n-\t\/* now follow pattern of xxx_lock() functions.\n-\t this is basically request_lock() again *\/\n \n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n@@ -2803,10 +2802,6 @@\n \tr->res_nodeid = ms->m_nodeid;\n \tif (r->res_nodeid != 0)\n \t\tset_bit(RESFL_MASTER_UNCERTAIN, &r->res_flags);\n-\n-\t\/* We ignore the return value of _request_lock because there's\n-\t no user context to return it to. The user is left to getting the\n-\t result from the ast. *\/\n \n \t_request_lock(r, lkb);\n \n@@ -2942,7 +2937,7 @@\n \t\treceive_remove(ls, ms);\n \t\tbreak;\n \n-\t\/* messages sent from a dir node *\/\n+\t\/* messages sent from a dir node (remove has no reply) *\/\n \n \tcase DLM_MSG_LOOKUP_REPLY:\n \t\treceive_lookup_reply(ls, ms);\n@@ -2964,7 +2959,7 @@\n * Recovery related\n *\/\n \n-\/* Create a single list of all root rsb's that's used during recovery *\/\n+\/* Create a single list of all root rsb's to be used during recovery *\/\n \n int dlm_create_root_list(struct dlm_ls *ls)\n {\n@@ -3042,16 +3037,15 @@\n \t\t\tbreak;\n \n \t\tcase DLM_MSG_UNLOCK:\n-\t\t\t\/* follow receive_unlock_reply() and pretend we\n-\t\t\t received an unlock reply from the former master *\/\n+\t\t\t_remove_from_waiters(lkb);\n \n \t\t\tlog_debug(ls, \"fake unlock reply lkid %x %s\",\n \t\t\t\t lkb->lkb_id, r->res_name);\n \n-\t\t\t_remove_from_waiters(lkb);\n-\n \t\t\t\/* FIXME: fake an ms struct and call\n-\t\t\t receive_unlock_reply() ? *\/\n+\t\t\t receive_unlock_reply() here ?\n+\t\t\t pretend we received an unlock reply from the\n+\t\t\t former master *\/\n \n \t\t\thold_rsb(r);\n \t\t\tlock_rsb(r);\n@@ -3069,16 +3063,15 @@\n \t\t\tbreak;\n \n \t\tcase DLM_MSG_CANCEL:\n-\t\t\t\/* follow receive_cancel_reply() and pretend we\n-\t\t\t received a cancel reply from the former master *\/\n+\t\t\t_remove_from_waiters(lkb);\n \n \t\t\tlog_debug(ls, \"fake cancel reply lkid %x %s\",\n \t\t\t\t lkb->lkb_id, r->res_name);\n \n-\t\t\t_remove_from_waiters(lkb);\n-\n \t\t\t\/* FIXME: fake an ms struct and call\n-\t\t\t receive_cancel_reply() ? *\/\n+\t\t\t receive_cancel_reply() here ?\n+\t\t\t pretend we received a cancel reply from the\n+\t\t\t former master *\/\n \n \t\t\thold_rsb(r);\n \t\t\tlock_rsb(r);\n@@ -3101,32 +3094,6 @@\n \t\t}\n \t}\n \tup(&dlm_waiters_sem);\n-}\n-\n-void recover_request_lock(struct dlm_lkb *lkb)\n-{\n-\tstruct dlm_rsb *r = lkb->lkb_resource;\n-\n-\t\/* FIXME: probably don't need hold_rsb\/put_rsb here *\/\n-\n-\thold_rsb(r);\n-\tlock_rsb(r);\n-\t_request_lock(r, lkb);\n-\tunlock_rsb(r);\n-\tput_rsb(r);\n-}\n-\n-void recover_convert_lock(struct dlm_lkb *lkb)\n-{\n-\tstruct dlm_rsb *r = lkb->lkb_resource;\n-\n-\t\/* FIXME: probably don't need hold_rsb\/put_rsb here *\/\n-\n-\thold_rsb(r);\n-\tlock_rsb(r);\n-\t_convert_lock(r, lkb);\n-\tunlock_rsb(r);\n-\tput_rsb(r);\n }\n \n struct dlm_lkb *remove_resend_waiter(struct dlm_ls *ls)\n@@ -3155,6 +3122,7 @@\n int dlm_recover_waiters_post(struct dlm_ls *ls)\n {\n \tstruct dlm_lkb *lkb;\n+\tstruct dlm_rsb *r;\n \tint error = 0;\n \n \t\/* Deal with lookups and lkb's marked RESEND from _pre.\n@@ -3179,15 +3147,27 @@\n \t\tlkb->lkb_flags &= ~DLM_IFL_RESEND;\n \t\tlkb->lkb_flags &= ~DLM_IFL_CONVERTING;\n \n+\t\tr = lkb->lkb_resource;\n+\n \t\tswitch (lkb->lkb_wait_type) {\n \n \t\tcase DLM_MSG_LOOKUP:\n \t\tcase DLM_MSG_REQUEST:\n-\t\t\trecover_request_lock(lkb);\n+\t\t\thold_rsb(r);\n+\t\t\tlock_rsb(r);\n+\t\t\t_request_lock(r, lkb);\n+\t\t\tunlock_rsb(r);\n+\t\t\tput_rsb(r);\n \t\t\tbreak;\n+\n \t\tcase DLM_MSG_CONVERT:\n-\t\t\trecover_convert_lock(lkb);\n+\t\t\thold_rsb(r);\n+\t\t\tlock_rsb(r);\n+\t\t\t_convert_lock(r, lkb);\n+\t\t\tunlock_rsb(r);\n+\t\t\tput_rsb(r);\n \t\t\tbreak;\n+\n \t\tdefault:\n \t\t\tlog_error(ls, \"recover_waiters_post wait_type %d\",\n \t\t\t\t lkb->lkb_wait_type);\n"} {"commit":"addfac3136bc773670a71cb8404d9e523a67ea5f","subject":"Tiny code change to implement significant optimization: if a node receives a lookup and is the master itself, process the lookup as a request and return a request reply.","message":"Tiny code change to implement significant optimization: if a node\nreceives a lookup and is the master itself, process the lookup\nas a request and return a request reply.\n","repos":"stevenraspudic\/resource-agents,asp24\/resource-agents,asp24\/resource-agents,stevenraspudic\/resource-agents,asp24\/resource-agents,stevenraspudic\/resource-agents","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- dlm-kernel\/src2\/lock.c\n+++ dlm-kernel\/src2\/lock.c\n@@ -2701,14 +2701,15 @@\n \n static void receive_lookup(struct dlm_ls *ls, struct dlm_message *ms)\n {\n-\tint len, error, ret_nodeid, dir_nodeid, from_nodeid;\n+\tint len, error, ret_nodeid, dir_nodeid, from_nodeid, our_nodeid;\n \n \tfrom_nodeid = ms->m_header.h_nodeid;\n+\tour_nodeid = dlm_our_nodeid();\n \n \tlen = receive_extralen(ms);\n \n \tdir_nodeid = dlm_dir_name2nodeid(ls, ms->m_extra, len);\n-\tif (dir_nodeid != dlm_our_nodeid()) {\n+\tif (dir_nodeid != our_nodeid) {\n \t\tlog_error(ls, \"lookup dir_nodeid %d from %d\",\n \t\t\t dir_nodeid, from_nodeid);\n \t\terror = -EINVAL;\n@@ -2717,6 +2718,12 @@\n \t}\n \n \terror = dlm_dir_lookup(ls, from_nodeid, ms->m_extra, len, &ret_nodeid);\n+\n+\t\/* Optimization: we're master so treat lookup as a request *\/\n+\tif (!error && ret_nodeid == our_nodeid) {\n+\t\treceive_request(ls, ms);\n+\t\treturn;\n+\t}\n out:\n \tsend_lookup_reply(ls, ms, ret_nodeid, error);\n }\n@@ -2743,7 +2750,7 @@\n {\n \tstruct dlm_lkb *lkb;\n \tstruct dlm_rsb *r;\n-\tint error;\n+\tint error, mstype;\n \n \terror = find_lkb(ls, ms->m_remid, &lkb);\n \tif (error) {\n@@ -2752,6 +2759,7 @@\n \t}\n \tDLM_ASSERT(is_process_copy(lkb), dlm_print_lkb(lkb););\n \n+\tmstype = lkb->lkb_wait_type;\n \terror = remove_from_waiters(lkb);\n \tif (error) {\n \t\tlog_error(ls, \"receive_request_reply not on waiters\");\n@@ -2764,6 +2772,14 @@\n \tr = lkb->lkb_resource;\n \thold_rsb(r);\n \tlock_rsb(r);\n+\n+\t\/* Optimization: the dir node was also the master, so it took our\n+\t lookup as a request and sent request reply instead of lookup reply *\/\n+\tif (mstype == DLM_MSG_LOOKUP) {\n+\t\tr->res_nodeid = ms->m_header.h_nodeid;\n+\t\tlkb->lkb_nodeid = r->res_nodeid;\n+\t\tr->res_trial_lkid = lkb->lkb_id;\n+\t}\n \n \tswitch (error) {\n \tcase -EAGAIN:\n@@ -2804,7 +2820,7 @@\n \t\tbreak;\n \n \tdefault:\n-\t\tlog_error(ls, \"receive_request_reply unknown error %d\", error);\n+\t\tlog_error(ls, \"receive_request_reply error %d\", error);\n \t}\n \n \tunlock_rsb(r);\n"} {"commit":"d13bbed8becc2f3564734399012c09660ceed303","subject":"Fix breakage (struct before undefined structs)","message":"Fix breakage (struct before undefined structs)","repos":"infinit\/grpc,ipylypiv\/grpc,pmarks-net\/grpc,zhimingxie\/grpc,ctiller\/grpc,firebase\/grpc,msmania\/grpc,sreecha\/grpc,PeterFaiman\/ruby-grpc-minimal,carl-mastrangelo\/grpc,apolcyn\/grpc,miselin\/grpc,zhimingxie\/grpc,stanley-cheung\/grpc,miselin\/grpc,a11r\/grpc,dgquintas\/grpc,podsvirov\/grpc,w4-sjcho\/grpc,ctiller\/grpc,bogdandrutu\/grpc,jcanizales\/grpc,podsvirov\/grpc,perumaalgoog\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,LuminateWireless\/grpc,sreecha\/grpc,7anner\/grpc,tamihiro\/grpc,ppietrasa\/grpc,7anner\/grpc,wangyikai\/grpc,vsco\/grpc,grpc\/grpc,y-zeng\/grpc,malexzx\/grpc,wcevans\/grpc,geffzhang\/grpc,pmarks-net\/grpc,nicolasnoble\/grpc,pszemus\/grpc,pmarks-net\/grpc,philcleveland\/grpc,cgvarela\/grpc,ejona86\/grpc,yinsu\/grpc,vsco\/grpc,vsco\/grpc,tempbottle\/grpc,PeterFaiman\/ruby-grpc-minimal,andrewpollock\/grpc,matt-kwong\/grpc,makdharma\/grpc,deepaklukose\/grpc,kpayson64\/grpc,tengyifei\/grpc,yugui\/grpc,maxwell-demon\/grpc,rjshade\/grpc,Crevil\/grpc,kriswuollett\/grpc,simonkuang\/grpc,murgatroid99\/grpc,pszemus\/grpc,perumaalgoog\/grpc,fuchsia-mirror\/third_party-grpc,gpndata\/grpc,philcleveland\/grpc,jboeuf\/grpc,ipylypiv\/grpc,jcanizales\/grpc,soltanmm-google\/grpc,muxi\/grpc,geffzhang\/grpc,w4-sjcho\/grpc,grpc\/grpc,perumaalgoog\/grpc,kumaralokgithub\/grpc,stanley-cheung\/grpc,soltanmm-google\/grpc,bjori\/grpc,yang-g\/grpc,ofrobots\/grpc,crast\/grpc,msiedlarek\/grpc,sreecha\/grpc,gpndata\/grpc,mehrdada\/grpc,kriswuollett\/grpc,crast\/grpc,ppietrasa\/grpc,msmania\/grpc,Vizerai\/grpc,JoeWoo\/grpc,jtattermusch\/grpc,thunderboltsid\/grpc,geffzhang\/grpc,bjori\/grpc,7anner\/grpc,tamihiro\/grpc,kskalski\/grpc,mehrdada\/grpc,larsonmpdx\/grpc,madongfly\/grpc,larsonmpdx\/grpc,sreecha\/grpc,pmarks-net\/grpc,tengyifei\/grpc,tamihiro\/grpc,stanley-cheung\/grpc,donnadionne\/grpc,PeterFaiman\/ruby-grpc-minimal,soltanmm\/grpc,ananthonline\/grpc,matt-kwong\/grpc,malexzx\/grpc,podsvirov\/grpc,grani\/grpc,yang-g\/grpc,grpc\/grpc,miselin\/grpc,doubi-workshop\/grpc,ppietrasa\/grpc,ncteisen\/grpc,LuminateWireless\/grpc,pmarks-net\/grpc,quizlet\/grpc,kumaralokgithub\/grpc,leifurhauks\/grpc,thinkerou\/grpc,thunderboltsid\/grpc,surround-io\/grpc,simonkuang\/grpc,fuchsia-mirror\/third_party-grpc,murgatroid99\/grpc,maxwell-demon\/grpc,arkmaxim\/grpc,perumaalgoog\/grpc,grani\/grpc,hstefan\/grpc,ctiller\/grpc,jcanizales\/grpc,carl-mastrangelo\/grpc,ofrobots\/grpc,thinkerou\/grpc,maxwell-demon\/grpc,jcanizales\/grpc,grpc\/grpc,rjshade\/grpc,jboeuf\/grpc,malexzx\/grpc,infinit\/grpc,miselin\/grpc,malexzx\/grpc,adelez\/grpc,Vizerai\/grpc,crast\/grpc,surround-io\/grpc,pszemus\/grpc,a-veitch\/grpc,mehrdada\/grpc,firebase\/grpc,kumaralokgithub\/grpc,deepaklukose\/grpc,surround-io\/grpc,nicolasnoble\/grpc,dklempner\/grpc,mehrdada\/grpc,tempbottle\/grpc,nicolasnoble\/grpc,mehrdada\/grpc,miselin\/grpc,leifurhauks\/grpc,baylabs\/grpc,bogdandrutu\/grpc,zhimingxie\/grpc,grpc\/grpc,dklempner\/grpc,kpayson64\/grpc,sreecha\/grpc,fichter\/grpc,a-veitch\/grpc,tamihiro\/grpc,ppietrasa\/grpc,doubi-workshop\/grpc,a11r\/grpc,quizlet\/grpc,rjshade\/grpc,stanley-cheung\/grpc,tengyifei\/grpc,andrewpollock\/grpc,thunderboltsid\/grpc,ejona86\/grpc,goldenbull\/grpc,Crevil\/grpc,kskalski\/grpc,jtattermusch\/grpc,MakMukhi\/grpc,kriswuollett\/grpc,yinsu\/grpc,Vizerai\/grpc,malexzx\/grpc,chrisdunelm\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,quizlet\/grpc,mehrdada\/grpc,yongni\/grpc,maxwell-demon\/grpc,wangyikai\/grpc,yinsu\/grpc,carl-mastrangelo\/grpc,ejona86\/grpc,VcamX\/grpc,murgatroid99\/grpc,ncteisen\/grpc,PeterFaiman\/ruby-grpc-minimal,rjshade\/grpc,a11r\/grpc,vsco\/grpc,w4-sjcho\/grpc,jtattermusch\/grpc,kriswuollett\/grpc,deepaklukose\/grpc,madongfly\/grpc,malexzx\/grpc,PeterFaiman\/ruby-grpc-minimal,baylabs\/grpc,wcevans\/grpc,wcevans\/grpc,vjpai\/grpc,PeterFaiman\/ruby-grpc-minimal,daniel-j-born\/grpc,goldenbull\/grpc,surround-io\/grpc,jtattermusch\/grpc,madongfly\/grpc,doubi-workshop\/grpc,goldenbull\/grpc,kumaralokgithub\/grpc,firebase\/grpc,tempbottle\/grpc,surround-io\/grpc,sreecha\/grpc,doubi-workshop\/grpc,andrewpollock\/grpc,leifurhauks\/grpc,zhimingxie\/grpc,pszemus\/grpc,greasypizza\/grpc,daniel-j-born\/grpc,andrewpollock\/grpc,wangyikai\/grpc,a11r\/grpc,bjori\/grpc,dgquintas\/grpc,firebase\/grpc,jtattermusch\/grpc,donnadionne\/grpc,jcanizales\/grpc,yongni\/grpc,ipylypiv\/grpc,pszemus\/grpc,carl-mastrangelo\/grpc,soltanmm\/grpc,stanley-cheung\/grpc,arkmaxim\/grpc,simonkuang\/grpc,geffzhang\/grpc,matt-kwong\/grpc,ofrobots\/grpc,fuchsia-mirror\/third_party-grpc,wangyikai\/grpc,kskalski\/grpc,bjori\/grpc,andrewpollock\/grpc,ncteisen\/grpc,thinkerou\/grpc,7anner\/grpc,cgvarela\/grpc,tempbottle\/grpc,a-veitch\/grpc,thinkerou\/grpc,yongni\/grpc,daniel-j-born\/grpc,arkmaxim\/grpc,tamihiro\/grpc,wcevans\/grpc,zhimingxie\/grpc,hstefan\/grpc,gpndata\/grpc,Crevil\/grpc,malexzx\/grpc,crast\/grpc,jboeuf\/grpc,royalharsh\/grpc,hstefan\/grpc,kpayson64\/grpc,philcleveland\/grpc,bjori\/grpc,ipylypiv\/grpc,w4-sjcho\/grpc,y-zeng\/grpc,fuchsia-mirror\/third_party-grpc,vsco\/grpc,simonkuang\/grpc,arkmaxim\/grpc,wcevans\/grpc,kskalski\/grpc,pszemus\/grpc,sreecha\/grpc,kpayson64\/grpc,muxi\/grpc,LuminateWireless\/grpc,ncteisen\/grpc,ananthonline\/grpc,apolcyn\/grpc,JoeWoo\/grpc,goldenbull\/grpc,ppietrasa\/grpc,royalharsh\/grpc,JoeWoo\/grpc,yugui\/grpc,kriswuollett\/grpc,podsvirov\/grpc,yang-g\/grpc,kriswuollett\/grpc,ctiller\/grpc,kpayson64\/grpc,yang-g\/grpc,soltanmm\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,perumaalgoog\/grpc,makdharma\/grpc,geffzhang\/grpc,rjshade\/grpc,carl-mastrangelo\/grpc,royalharsh\/grpc,jcanizales\/grpc,LuminateWireless\/grpc,w4-sjcho\/grpc,a-veitch\/grpc,royalharsh\/grpc,Vizerai\/grpc,ipylypiv\/grpc,ppietrasa\/grpc,carl-mastrangelo\/grpc,baylabs\/grpc,yongni\/grpc,soltanmm\/grpc,vjpai\/grpc,geffzhang\/grpc,Crevil\/grpc,7anner\/grpc,soltanmm-google\/grpc,MakMukhi\/grpc,makdharma\/grpc,podsvirov\/grpc,matt-kwong\/grpc,jboeuf\/grpc,dklempner\/grpc,jboeuf\/grpc,wcevans\/grpc,madongfly\/grpc,philcleveland\/grpc,fichter\/grpc,greasypizza\/grpc,zhimingxie\/grpc,msiedlarek\/grpc,nicolasnoble\/grpc,firebase\/grpc,msmania\/grpc,murgatroid99\/grpc,thinkerou\/grpc,msiedlarek\/grpc,cgvarela\/grpc,perumaalgoog\/grpc,malexzx\/grpc,yang-g\/grpc,VcamX\/grpc,makdharma\/grpc,adelez\/grpc,nicolasnoble\/grpc,miselin\/grpc,dklempner\/grpc,surround-io\/grpc,firebase\/grpc,Crevil\/grpc,ofrobots\/grpc,pszemus\/grpc,Vizerai\/grpc,msiedlarek\/grpc,leifurhauks\/grpc,bjori\/grpc,simonkuang\/grpc,ejona86\/grpc,Vizerai\/grpc,baylabs\/grpc,bjori\/grpc,jtattermusch\/grpc,thunderboltsid\/grpc,quizlet\/grpc,adelez\/grpc,pmarks-net\/grpc,hstefan\/grpc,msmania\/grpc,Vizerai\/grpc,larsonmpdx\/grpc,kriswuollett\/grpc,a-veitch\/grpc,daniel-j-born\/grpc,ipylypiv\/grpc,philcleveland\/grpc,stanley-cheung\/grpc,LuminateWireless\/grpc,fuchsia-mirror\/third_party-grpc,yinsu\/grpc,wangyikai\/grpc,firebase\/grpc,ctiller\/grpc,ejona86\/grpc,sreecha\/grpc,kskalski\/grpc,carl-mastrangelo\/grpc,murgatroid99\/grpc,tamihiro\/grpc,gpndata\/grpc,sreecha\/grpc,ejona86\/grpc,w4-sjcho\/grpc,daniel-j-born\/grpc,carl-mastrangelo\/grpc,tamihiro\/grpc,JoeWoo\/grpc,daniel-j-born\/grpc,royalharsh\/grpc,yugui\/grpc,ncteisen\/grpc,matt-kwong\/grpc,kpayson64\/grpc,nicolasnoble\/grpc,thinkerou\/grpc,yinsu\/grpc,kriswuollett\/grpc,murgatroid99\/grpc,maxwell-demon\/grpc,perumaalgoog\/grpc,MakMukhi\/grpc,msmania\/grpc,kumaralokgithub\/grpc,chrisdunelm\/grpc,murgatroid99\/grpc,kumaralokgithub\/grpc,tengyifei\/grpc,hstefan\/grpc,ctiller\/grpc,Crevil\/grpc,grpc\/grpc,crast\/grpc,chrisdunelm\/grpc,ananthonline\/grpc,vjpai\/grpc,doubi-workshop\/grpc,royalharsh\/grpc,donnadionne\/grpc,grpc\/grpc,msiedlarek\/grpc,kpayson64\/grpc,gpndata\/grpc,kskalski\/grpc,jtattermusch\/grpc,vsco\/grpc,ananthonline\/grpc,perumaalgoog\/grpc,soltanmm\/grpc,grani\/grpc,muxi\/grpc,stanley-cheung\/grpc,muxi\/grpc,Crevil\/grpc,firebase\/grpc,ofrobots\/grpc,jboeuf\/grpc,thunderboltsid\/grpc,soltanmm-google\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,doubi-workshop\/grpc,jboeuf\/grpc,deepaklukose\/grpc,grpc\/grpc,miselin\/grpc,kpayson64\/grpc,apolcyn\/grpc,sreecha\/grpc,deepaklukose\/grpc,greasypizza\/grpc,msiedlarek\/grpc,msmania\/grpc,apolcyn\/grpc,vsco\/grpc,malexzx\/grpc,geffzhang\/grpc,doubi-workshop\/grpc,baylabs\/grpc,matt-kwong\/grpc,dgquintas\/grpc,PeterFaiman\/ruby-grpc-minimal,mehrdada\/grpc,leifurhauks\/grpc,leifurhauks\/grpc,JoeWoo\/grpc,baylabs\/grpc,ipylypiv\/grpc,donnadionne\/grpc,murgatroid99\/grpc,yinsu\/grpc,tengyifei\/grpc,pszemus\/grpc,soltanmm-google\/grpc,LuminateWireless\/grpc,yongni\/grpc,royalharsh\/grpc,pmarks-net\/grpc,podsvirov\/grpc,jcanizales\/grpc,7anner\/grpc,tamihiro\/grpc,donnadionne\/grpc,hstefan\/grpc,quizlet\/grpc,adelez\/grpc,7anner\/grpc,dgquintas\/grpc,stanley-cheung\/grpc,muxi\/grpc,kskalski\/grpc,chrisdunelm\/grpc,wangyikai\/grpc,wcevans\/grpc,VcamX\/grpc,bogdandrutu\/grpc,soltanmm-google\/grpc,makdharma\/grpc,vsco\/grpc,hstefan\/grpc,fuchsia-mirror\/third_party-grpc,msmania\/grpc,larsonmpdx\/grpc,makdharma\/grpc,kpayson64\/grpc,ejona86\/grpc,chrisdunelm\/grpc,adelez\/grpc,tempbottle\/grpc,wangyikai\/grpc,zhimingxie\/grpc,rjshade\/grpc,quizlet\/grpc,stanley-cheung\/grpc,JoeWoo\/grpc,ppietrasa\/grpc,7anner\/grpc,royalharsh\/grpc,andrewpollock\/grpc,dgquintas\/grpc,yugui\/grpc,podsvirov\/grpc,larsonmpdx\/grpc,maxwell-demon\/grpc,tempbottle\/grpc,y-zeng\/grpc,ncteisen\/grpc,kriswuollett\/grpc,chrisdunelm\/grpc,soltanmm\/grpc,daniel-j-born\/grpc,a11r\/grpc,jboeuf\/grpc,ejona86\/grpc,grpc\/grpc,greasypizza\/grpc,apolcyn\/grpc,MakMukhi\/grpc,jboeuf\/grpc,VcamX\/grpc,VcamX\/grpc,daniel-j-born\/grpc,greasypizza\/grpc,soltanmm-google\/grpc,a11r\/grpc,madongfly\/grpc,vsco\/grpc,matt-kwong\/grpc,LuminateWireless\/grpc,larsonmpdx\/grpc,donnadionne\/grpc,thinkerou\/grpc,vjpai\/grpc,infinit\/grpc,goldenbull\/grpc,ctiller\/grpc,nicolasnoble\/grpc,tamihiro\/grpc,crast\/grpc,goldenbull\/grpc,rjshade\/grpc,kpayson64\/grpc,gpndata\/grpc,Crevil\/grpc,wangyikai\/grpc,dgquintas\/grpc,jtattermusch\/grpc,sreecha\/grpc,goldenbull\/grpc,bjori\/grpc,podsvirov\/grpc,apolcyn\/grpc,ofrobots\/grpc,vjpai\/grpc,infinit\/grpc,yinsu\/grpc,mehrdada\/grpc,ncteisen\/grpc,VcamX\/grpc,msmania\/grpc,simonkuang\/grpc,zhimingxie\/grpc,donnadionne\/grpc,surround-io\/grpc,stanley-cheung\/grpc,royalharsh\/grpc,pszemus\/grpc,tempbottle\/grpc,zhimingxie\/grpc,larsonmpdx\/grpc,soltanmm-google\/grpc,w4-sjcho\/grpc,simonkuang\/grpc,philcleveland\/grpc,a-veitch\/grpc,w4-sjcho\/grpc,pmarks-net\/grpc,dklempner\/grpc,leifurhauks\/grpc,bogdandrutu\/grpc,muxi\/grpc,tempbottle\/grpc,mehrdada\/grpc,ipylypiv\/grpc,ctiller\/grpc,dgquintas\/grpc,rjshade\/grpc,kskalski\/grpc,firebase\/grpc,muxi\/grpc,arkmaxim\/grpc,7anner\/grpc,dgquintas\/grpc,pmarks-net\/grpc,Vizerai\/grpc,larsonmpdx\/grpc,y-zeng\/grpc,fichter\/grpc,yongni\/grpc,maxwell-demon\/grpc,arkmaxim\/grpc,ananthonline\/grpc,yugui\/grpc,mehrdada\/grpc,w4-sjcho\/grpc,ananthonline\/grpc,yugui\/grpc,yang-g\/grpc,tengyifei\/grpc,apolcyn\/grpc,a11r\/grpc,greasypizza\/grpc,MakMukhi\/grpc,donnadionne\/grpc,infinit\/grpc,Crevil\/grpc,doubi-workshop\/grpc,soltanmm-google\/grpc,jcanizales\/grpc,grpc\/grpc,yugui\/grpc,kumaralokgithub\/grpc,matt-kwong\/grpc,daniel-j-born\/grpc,yinsu\/grpc,ncteisen\/grpc,wangyikai\/grpc,msiedlarek\/grpc,thunderboltsid\/grpc,infinit\/grpc,makdharma\/grpc,dgquintas\/grpc,thinkerou\/grpc,pszemus\/grpc,adelez\/grpc,y-zeng\/grpc,yang-g\/grpc,msmania\/grpc,chrisdunelm\/grpc,muxi\/grpc,carl-mastrangelo\/grpc,nicolasnoble\/grpc,simonkuang\/grpc,makdharma\/grpc,stanley-cheung\/grpc,ncteisen\/grpc,cgvarela\/grpc,vjpai\/grpc,vjpai\/grpc,nicolasnoble\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,y-zeng\/grpc,pszemus\/grpc,andrewpollock\/grpc,a-veitch\/grpc,miselin\/grpc,podsvirov\/grpc,ctiller\/grpc,dklempner\/grpc,madongfly\/grpc,mehrdada\/grpc,MakMukhi\/grpc,chrisdunelm\/grpc,mehrdada\/grpc,goldenbull\/grpc,baylabs\/grpc,wcevans\/grpc,cgvarela\/grpc,a11r\/grpc,jboeuf\/grpc,perumaalgoog\/grpc,grani\/grpc,ananthonline\/grpc,fuchsia-mirror\/third_party-grpc,larsonmpdx\/grpc,geffzhang\/grpc,tengyifei\/grpc,ofrobots\/grpc,bogdandrutu\/grpc,jcanizales\/grpc,thinkerou\/grpc,yugui\/grpc,fichter\/grpc,maxwell-demon\/grpc,adelez\/grpc,dklempner\/grpc,firebase\/grpc,donnadionne\/grpc,grani\/grpc,gpndata\/grpc,arkmaxim\/grpc,fuchsia-mirror\/third_party-grpc,thinkerou\/grpc,deepaklukose\/grpc,maxwell-demon\/grpc,cgvarela\/grpc,ncteisen\/grpc,crast\/grpc,PeterFaiman\/ruby-grpc-minimal,firebase\/grpc,dklempner\/grpc,nicolasnoble\/grpc,grpc\/grpc,grpc\/grpc,ppietrasa\/grpc,apolcyn\/grpc,VcamX\/grpc,ctiller\/grpc,cgvarela\/grpc,jtattermusch\/grpc,madongfly\/grpc,greasypizza\/grpc,yang-g\/grpc,baylabs\/grpc,muxi\/grpc,nicolasnoble\/grpc,andrewpollock\/grpc,gpndata\/grpc,apolcyn\/grpc,infinit\/grpc,grani\/grpc,donnadionne\/grpc,leifurhauks\/grpc,bogdandrutu\/grpc,miselin\/grpc,yongni\/grpc,Vizerai\/grpc,ejona86\/grpc,soltanmm\/grpc,jtattermusch\/grpc,muxi\/grpc,deepaklukose\/grpc,leifurhauks\/grpc,fichter\/grpc,carl-mastrangelo\/grpc,ppietrasa\/grpc,carl-mastrangelo\/grpc,grani\/grpc,a-veitch\/grpc,y-zeng\/grpc,Vizerai\/grpc,JoeWoo\/grpc,bjori\/grpc,infinit\/grpc,madongfly\/grpc,andrewpollock\/grpc,kumaralokgithub\/grpc,murgatroid99\/grpc,sreecha\/grpc,arkmaxim\/grpc,PeterFaiman\/ruby-grpc-minimal,yinsu\/grpc,dklempner\/grpc,yugui\/grpc,msiedlarek\/grpc,geffzhang\/grpc,infinit\/grpc,dgquintas\/grpc,VcamX\/grpc,LuminateWireless\/grpc,vjpai\/grpc,grani\/grpc,jtattermusch\/grpc,fichter\/grpc,ananthonline\/grpc,chrisdunelm\/grpc,thunderboltsid\/grpc,pszemus\/grpc,MakMukhi\/grpc,PeterFaiman\/ruby-grpc-minimal,wcevans\/grpc,simonkuang\/grpc,adelez\/grpc,arkmaxim\/grpc,baylabs\/grpc,LuminateWireless\/grpc,greasypizza\/grpc,Vizerai\/grpc,jtattermusch\/grpc,ncteisen\/grpc,ofrobots\/grpc,deepaklukose\/grpc,jboeuf\/grpc,philcleveland\/grpc,kpayson64\/grpc,y-zeng\/grpc,ncteisen\/grpc,makdharma\/grpc,donnadionne\/grpc,fichter\/grpc,MakMukhi\/grpc,quizlet\/grpc,yongni\/grpc,doubi-workshop\/grpc,hstefan\/grpc,msiedlarek\/grpc,nicolasnoble\/grpc,hstefan\/grpc,muxi\/grpc,soltanmm\/grpc,ejona86\/grpc,cgvarela\/grpc,kskalski\/grpc,tengyifei\/grpc,soltanmm\/grpc,VcamX\/grpc,greasypizza\/grpc,crast\/grpc,ejona86\/grpc,fichter\/grpc,yongni\/grpc,vjpai\/grpc,adelez\/grpc,madongfly\/grpc,MakMukhi\/grpc,ipylypiv\/grpc,kumaralokgithub\/grpc,murgatroid99\/grpc,ananthonline\/grpc,ctiller\/grpc,vjpai\/grpc,bogdandrutu\/grpc,a-veitch\/grpc,ctiller\/grpc,quizlet\/grpc,JoeWoo\/grpc,ejona86\/grpc,philcleveland\/grpc,JoeWoo\/grpc,thunderboltsid\/grpc,firebase\/grpc,tengyifei\/grpc,jboeuf\/grpc,matt-kwong\/grpc,goldenbull\/grpc,philcleveland\/grpc,rjshade\/grpc,y-zeng\/grpc,ofrobots\/grpc,thunderboltsid\/grpc,deepaklukose\/grpc,quizlet\/grpc,bogdandrutu\/grpc,thinkerou\/grpc,surround-io\/grpc,muxi\/grpc,yang-g\/grpc,bogdandrutu\/grpc,grani\/grpc,a11r\/grpc,chrisdunelm\/grpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/objective-c\/GRPCClient\/private\/GRPCSecureChannel.h\n+++ src\/objective-c\/GRPCClient\/private\/GRPCSecureChannel.h\n@@ -46,6 +46,6 @@\n hostNameOverride:(NSString *)hostNameOverride;\n \n - (instancetype)initWithHost:(NSString *)host\n- credentials:(grpc_credentials *)credentials\n- args:(grpc_channel_args *)args NS_DESIGNATED_INITIALIZER;\n+ credentials:(struct grpc_credentials *)credentials\n+ args:(struct grpc_channel_args *)args NS_DESIGNATED_INITIALIZER;\n @end\n"} {"commit":"0c2cf3627fd36107e7c55f4e198ca2e1357fbaad","subject":"Fix the names of _PyObject_GC_TRACK and _PyObject_GC_UNTRACK when the GC is disabled. Obviously everyone enables the GC. :-)","message":"Fix the names of _PyObject_GC_TRACK and _PyObject_GC_UNTRACK when the GC is\ndisabled. Obviously everyone enables the GC. :-)\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Include\/objimpl.h\n+++ Include\/objimpl.h\n@@ -283,8 +283,8 @@\n #define PyObject_GC_New PyObject_New\n #define PyObject_GC_NewVar PyObject_NewVar\n #define PyObject_GC_Del\t PyObject_Del\n-#define PyObject_GC_TRACK(op)\n-#define PyObject_GC_UNTRACK(op)\n+#define _PyObject_GC_TRACK(op)\n+#define _PyObject_GC_UNTRACK(op)\n #define PyObject_GC_Track(op)\n #define PyObject_GC_UnTrack(op)\n \n"} {"commit":"e080936a898fc8372a7e5d2a43c296071eeb3e95","subject":"Minor bug - wrong line-number counting.","message":"Minor bug - wrong line-number counting.\n","repos":"agordon\/fastx_toolkit,agordon\/fastx_toolkit,agordon\/fastx_toolkit,agordon\/fastx_toolkit","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/libfastx\/fastx.c\n+++ src\/libfastx\/fastx.c\n@@ -314,6 +314,7 @@\n \tif (pFASTX==NULL)\n \t\terrx(1,\"Internal error: pFASTX==NULL (%s:%d)\", __FILE__,__LINE__);\n \n+\tpFASTX->input_line_number++;\n \tif (fgets(pFASTX->input_sequence_id_prefix, MAX_SEQ_LINE_LENGTH, pFASTX->input) == NULL)\n \t\treturn 0; \/\/assume end-of-file, if we couldn't read the first line of the foursome\n \n"} {"commit":"29ac8ca8c6629f2597da947e066beb3859a40a6e","subject":"Loader: Use local instead of global variable","message":"Loader: Use local instead of global variable\n","repos":"petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,petermax2\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,e1528532\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,e1528532\/libelektra,e1528532\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,petermax2\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libs\/loader\/dl.c\n+++ src\/libs\/loader\/dl.c\n@@ -50,14 +50,14 @@\n \treturn 0;\n }\n \n+elektraPluginFactory elektraModulesLoad (KeySet * modules, const char * name, Key * errorKey)\n+{\n #ifdef _WIN32\n-const char elektraPluginPostfix[] = \".dll\";\n+\tconst char elektraPluginPostfix[] = \".dll\";\n #else\n-const char elektraPluginPostfix[] = \".so\";\n+\tconst char elektraPluginPostfix[] = \".so\";\n #endif\n \n-elektraPluginFactory elektraModulesLoad (KeySet * modules, const char * name, Key * errorKey)\n-{\n \tKey * moduleKey = keyNew (\"system\/elektra\/modules\", KEY_END);\n \tkeyAddBaseName (moduleKey, name);\n \tKey * lookup = ksLookup (modules, moduleKey, 0);\n"} {"commit":"40c974f30450b5b71ddf5a45219f2f344aed9f42","subject":"fixed leak in unlikely error case","message":"fixed leak in unlikely error case","repos":"krevis\/MIDIApps,DouglasHeriot\/MIDIApps,DouglasHeriot\/MIDIApps,krevis\/MIDIApps,DouglasHeriot\/MIDIApps,krevis\/MIDIApps,krevis\/MIDIApps,krevis\/MIDIApps","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Frameworks\/SnoizeMIDISpy\/Driver\/MessageQueue.c\n+++ Frameworks\/SnoizeMIDISpy\/Driver\/MessageQueue.c\n@@ -150,6 +150,7 @@\n #if DEBUG\n printf(\"AddToMessageQueue: pthread_mutex_unlock failed (%d)\\n\", pthreadError);\n #endif\n+ CFRelease(copiedQueueArray);\n return;\n }\n \n"} {"commit":"909f4c1fb15d6e0e434f38949c5a9320126ac329","subject":"SHA1: use stack memory handlers","message":"SHA1: use stack memory handlers\n\nSigned-off-by: Eduardo Silva \n","repos":"monkey\/duda,monkey\/duda","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- packages\/sha1\/duda_package.c\n+++ packages\/sha1\/duda_package.c\n@@ -58,7 +58,7 @@\n struct duda_api_sha1 *sha1;\n \n \/* Alloc object *\/\n- sha1 = malloc(sizeof(struct duda_api_sha1));\n+ sha1 = monkey->mem_alloc(sizeof(struct duda_api_sha1));\n \n \/* Map API calls *\/\n sha1->encode = sha1_encode;\n"} {"commit":"9b1c2cfd7a8b3840cf5c99d0560e641ff4a3425b","subject":"[NETFILTER]: nf_conntrack_sctp: replace magic value by symbolic constant","message":"[NETFILTER]: nf_conntrack_sctp: replace magic value by symbolic constant\n\nUse SCTP_CHUNK_FLAG_T instead of 0x1.\n\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\nSigned-off-by: David S. Miller \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/netfilter\/nf_conntrack_proto_sctp.c\n+++ net\/netfilter\/nf_conntrack_proto_sctp.c\n@@ -341,7 +341,7 @@\n \t\t\t\/* Sec 8.5.1 (C) *\/\n \t\t\tif (sh->vtag != ct->proto.sctp.vtag[dir] &&\n \t\t\t sh->vtag != ct->proto.sctp.vtag[!dir] &&\n-\t\t\t (sch->flags & 1))\n+\t\t\t sch->flags & SCTP_CHUNK_FLAG_T)\n \t\t\t\tgoto out_unlock;\n \t\t} else if (sch->type == SCTP_CID_COOKIE_ECHO) {\n \t\t\t\/* Sec 8.5.1 (D) *\/\n"} {"commit":"22271049c61f4796f23f272cadd5d555ece37136","subject":"nimble\/controller: Rename and move ble_ll_conn_csa2_remapped_channel","message":"nimble\/controller: Rename and move ble_ll_conn_csa2_remapped_channel\n\nThis function is use both by CSA #1 and #2 so name it accordingly. Also\nmove it up in the source file - this is in preparation for optional\nCSA #2 support.\n","repos":"IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/nimble\/controller\/src\/ble_ll_conn.c\n+++ net\/nimble\/controller\/src\/ble_ll_conn.c\n@@ -563,46 +563,8 @@\n return aa;\n }\n \n-static uint16_t\n-ble_ll_conn_csa2_perm(uint16_t in)\n-{\n- uint16_t out = 0;\n- int i;\n-\n- for (i = 0; i < 8; i++) {\n- out |= ((in >> i) & 0x00000001) << (7 - i);\n- }\n-\n- for (i = 8; i < 16; i++) {\n- out |= ((in >> i) & 0x00000001) << (15 + 8 - i);\n- }\n-\n- return out;\n-}\n-\n-static uint16_t\n-ble_ll_conn_csa2_prng(uint16_t counter, uint16_t ch_id)\n-{\n- uint16_t prn_e;\n-\n- prn_e = counter ^ ch_id;\n-\n- prn_e = ble_ll_conn_csa2_perm(prn_e);\n- prn_e = (prn_e * 17) + ch_id;\n-\n- prn_e = ble_ll_conn_csa2_perm(prn_e);\n- prn_e = (prn_e * 17) + ch_id;\n-\n- prn_e = ble_ll_conn_csa2_perm(prn_e);\n- prn_e = (prn_e * 17) + ch_id;\n-\n- prn_e = prn_e ^ ch_id;\n-\n- return prn_e;\n-}\n-\n static uint8_t\n-ble_ll_conn_csa2_remapped_channel(uint8_t remap_index, const uint8_t *chanmap)\n+ble_ll_conn_remapped_channel(uint8_t remap_index, const uint8_t *chanmap)\n {\n uint8_t cntr;\n uint8_t mask;\n@@ -637,6 +599,44 @@\n return 0;\n }\n \n+static uint16_t\n+ble_ll_conn_csa2_perm(uint16_t in)\n+{\n+ uint16_t out = 0;\n+ int i;\n+\n+ for (i = 0; i < 8; i++) {\n+ out |= ((in >> i) & 0x00000001) << (7 - i);\n+ }\n+\n+ for (i = 8; i < 16; i++) {\n+ out |= ((in >> i) & 0x00000001) << (15 + 8 - i);\n+ }\n+\n+ return out;\n+}\n+\n+static uint16_t\n+ble_ll_conn_csa2_prng(uint16_t counter, uint16_t ch_id)\n+{\n+ uint16_t prn_e;\n+\n+ prn_e = counter ^ ch_id;\n+\n+ prn_e = ble_ll_conn_csa2_perm(prn_e);\n+ prn_e = (prn_e * 17) + ch_id;\n+\n+ prn_e = ble_ll_conn_csa2_perm(prn_e);\n+ prn_e = (prn_e * 17) + ch_id;\n+\n+ prn_e = ble_ll_conn_csa2_perm(prn_e);\n+ prn_e = (prn_e * 17) + ch_id;\n+\n+ prn_e = prn_e ^ ch_id;\n+\n+ return prn_e;\n+}\n+\n uint8_t\n ble_ll_conn_calc_dci_csa2(struct ble_ll_conn_sm *conn)\n {\n@@ -661,7 +661,7 @@\n \n remap_index = (conn->num_used_chans * prn_e) \/ 0x10000;\n \n- return ble_ll_conn_csa2_remapped_channel(remap_index, conn->chanmap);\n+ return ble_ll_conn_remapped_channel(remap_index, conn->chanmap);\n }\n \n \/**\n@@ -697,7 +697,7 @@\n \/* Calculate remap index *\/\n remap_index = curchan % conn->num_used_chans;\n \n- return ble_ll_conn_csa2_remapped_channel(remap_index, conn->chanmap);\n+ return ble_ll_conn_remapped_channel(remap_index, conn->chanmap);\n }\n \n \/**\n"} {"commit":"eda45f27016c19c9b71094d6635c6893b4f31065","subject":"net: Always dipatch requests trough event loop","message":"net: Always dipatch requests trough event loop\n\nThis is to ensure consistent execution context for instant and for\nnon-delayed web requests.\n","repos":"MathieuDuponchelle\/grilo,MathieuDuponchelle\/grilo,GNOME\/grilo,jasuarez\/grilo,kyoushuu\/grilo,jasuarez\/grilo,kyoushuu\/grilo,jasuarez\/grilo,grilofw\/grilo,kyoushuu\/grilo,grilofw\/grilo,MathieuDuponchelle\/grilo,kyoushuu\/grilo,GNOME\/grilo,grilofw\/grilo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/net\/grl-net-wc.c\n+++ libs\/net\/grl-net-wc.c\n@@ -287,8 +287,20 @@\n guint source_id;\n };\n \n+static void\n+request_clos_destroy (gpointer data)\n+{\n+ struct request_clos *c = (struct request_clos *) data;\n+\n+ g_free (c->url);\n+ if (c->headers) {\n+ g_hash_table_unref (c->headers);\n+ }\n+ g_free (c);\n+}\n+\n static gboolean\n-get_url_delayed (gpointer user_data)\n+get_url_cb (gpointer user_data)\n {\n struct request_clos *c = (struct request_clos *) user_data;\n \n@@ -304,12 +316,6 @@\n else\n get_url_now (c->self, c->url, c->headers, c->result, c->cancellable);\n \n- g_free (c->url);\n- if (c->headers) {\n- g_hash_table_unref (c->headers);\n- }\n- g_free (c);\n-\n return FALSE;\n }\n \n@@ -324,20 +330,6 @@\n GTimeVal now;\n struct request_clos *c;\n GrlNetWcPrivate *priv = self->priv;\n-\n- g_get_current_time (&now);\n-\n- if ((now.tv_sec - priv->last_request.tv_sec) > priv->throttling) {\n- if (is_mocked ())\n- get_url_mocked (self, url, headers, result, cancellable);\n- else\n- get_url_now (self, url, headers, result, cancellable);\n- g_get_current_time (&priv->last_request);\n-\n- return;\n- }\n-\n- GRL_DEBUG (\"delaying web request\");\n \n \/* closure *\/\n c = g_new (struct request_clos, 1);\n@@ -347,11 +339,21 @@\n c->result = result;\n c->cancellable = cancellable;\n \n- priv->last_request.tv_sec += priv->throttling;\n- id = g_timeout_add_seconds (priv->last_request.tv_sec - now.tv_sec,\n- get_url_delayed, c);\n+ g_get_current_time (&now);\n+\n+ if ((now.tv_sec - priv->last_request.tv_sec) > priv->throttling) {\n+ id = g_idle_add_full (G_PRIORITY_HIGH_IDLE,\n+ get_url_cb, c, request_clos_destroy);\n+ } else {\n+ GRL_DEBUG (\"delaying web request\");\n+\n+ priv->last_request.tv_sec += priv->throttling;\n+ id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,\n+ priv->last_request.tv_sec - now.tv_sec,\n+ get_url_cb, c, request_clos_destroy);\n+ }\n+\n c->source_id = id;\n-\n g_queue_push_head (self->priv->pending, c);\n }\n \n"} {"commit":"ed8564d9b0a91bd1ae0fa3157f3df274eaf2bf78","subject":"nimble\/ll: Fix for compiler warning","message":"nimble\/ll: Fix for compiler warning\n\nThis patch solves issue which is visible when building with -Og option.\nble_ll_conn.c:2365:18: error: 'init_addr' may be used uninitialized in this function [-Werror=maybe-uninitialized]\n","repos":"wes3\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,wes3\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,wes3\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,wes3\/incubator-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,wes3\/incubator-mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/nimble\/controller\/src\/ble_ll_conn.c\n+++ net\/nimble\/controller\/src\/ble_ll_conn.c\n@@ -2251,7 +2251,7 @@\n uint8_t peer_addr_type;\n uint8_t *adv_addr;\n uint8_t *peer;\n- uint8_t *init_addr;\n+ uint8_t *init_addr = NULL;\n uint8_t pyld_len;\n uint8_t inita_is_rpa;\n uint32_t endtime;\n@@ -2360,7 +2360,7 @@\n * If the inita is a RPA, we must see if it resolves based on the\n * identity address of the resolved ADVA.\n *\/\n- if (inita_is_rpa) {\n+ if (init_addr && inita_is_rpa) {\n if ((index < 0) ||\n !ble_ll_resolv_rpa(init_addr,\n g_ble_ll_resolv_list[index].rl_local_irk)) {\n"} {"commit":"2db1a99aca0177761f47daa71b27450923eb127e","subject":"Clean up debug messages","message":"Clean up debug messages","repos":"xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- driver\/others\/memory.c\n+++ driver\/others\/memory.c\n@@ -2985,7 +2985,7 @@\n \n error:\n if (memory_overflowed) goto terminate;\n- printf(\"num_buffers exceeded, adding auxiliary array\\n\");\n+ fprintf(stderr,\"OpenBLAS warning: precompiled NUM_THREADS exceeded, adding auxiliary array for thread metadata.\\n\")\n memory_overflowed=1;\n new_release_info = (struct release_t*) malloc(512*sizeof(struct release_t));\n newmemory = (struct newmemstruct*) malloc(512*sizeof(struct newmemstruct));\n@@ -3057,9 +3057,9 @@\n UNLOCK_COMMAND(&alloc_lock);\n #endif\n \n-\/\/#ifdef DEBUG\n+#ifdef DEBUG\n printf(\" Mapping Succeeded. %p(%d)\\n\", (void *)newmemory[position-NUM_BUFFERS].addr, position);\n-\/\/#endif\n+#endif\n \n #if defined(WHEREAMI) && !defined(USE_OPENMP)\n \n@@ -3110,9 +3110,9 @@\n UNLOCK_COMMAND(&alloc_lock);\n #endif\n \n-\/\/#ifdef DEBUG\n+#ifdef DEBUG\n printf(\"Unmap from overflow area succeeded.\\n\\n\");\n-\/\/#endif\n+#endif\n return;\n } else {\n \/\/ arm: ensure all writes are finished before other thread takes this memory\n"} {"commit":"c477796cd5e1ac8d414953bffc7caa10564608f6","subject":"Corrected emptyCStringL to CStringL","message":"Corrected emptyCStringL to CStringL\n","repos":"JAJames\/Jupiter,JAJames\/Jupiter","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- Jupiter\/CString.h\n+++ Jupiter\/CString.h\n@@ -465,7 +465,7 @@\n \n \t\/** Empty String constants *\/\n \tstatic const Jupiter::CStringS emptyCStringS;\n-\tstatic const Jupiter::CStringS emptyCStringL;\n+\tstatic const Jupiter::CStringL emptyCStringL;\n \tstatic const Jupiter::CStringType &emptyCString = emptyCStringS;\n \tstatic const Jupiter::StringType &emptyString = emptyCString;\n }\n"} {"commit":"3138b32d5e0998ba3cbd1c74bdc1887d74c5279b","subject":"ACPI battery: update status upon sysfs query","message":"ACPI battery: update status upon sysfs query\n\nSometimes the Battery driver doesn't get notifications when it's\nplugged\/unplugged. And this results in the incorrect Battery\nstatus reported by the power supply sysfs I\/F.\n\nUpdate Battery status first when querying from sysfs.\nhttp:\/\/marc.info\/?l=linux-acpi&m=128855015826728&w=2\n\nTested_by: Seblu \nSigned-off-by: Zhang Rui \nSigned-off-by: Len Brown \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/acpi\/battery.c\n+++ drivers\/acpi\/battery.c\n@@ -130,6 +130,8 @@\n \tunsigned long flags;\n };\n \n+static int acpi_battery_update(struct acpi_battery *battery);\n+\n #define to_acpi_battery(x) container_of(x, struct acpi_battery, bat);\n \n inline int acpi_battery_present(struct acpi_battery *battery)\n@@ -183,6 +185,9 @@\n {\n \tint ret = 0;\n \tstruct acpi_battery *battery = to_acpi_battery(psy);\n+\n+\tif (acpi_battery_update(battery))\n+\t\treturn -ENODEV;\n \n \tif (acpi_battery_present(battery)) {\n \t\t\/* run battery update only if it is present *\/\n"} {"commit":"c458033c9b72a81b890d97ec6339694bab252383","subject":"ACPI: PCI: use 1-based encoding for _PRT quirks","message":"ACPI: PCI: use 1-based encoding for _PRT quirks\n\nUse the PCI INTx pin encoding (1=INTA, 2=INTB, etc) for _PRT quirks.\nThen we can simply compare \"entry->pin == quirk->pin\".\n\nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nSigned-off-by: Len Brown \n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/acpi\/pci_irq.c\n+++ drivers\/acpi\/pci_irq.c\n@@ -145,19 +145,21 @@\n \tchar\t\t\t*actual_source;\n };\n \n+#define PCI_INTX_PIN(c)\t\t(c - 'A' + 1)\n+\n \/*\n * These systems have incorrect _PRT entries. The BIOS claims the PCI\n * interrupt at the listed segment\/bus\/device\/pin is connected to the first\n * link device, but it is actually connected to the second.\n *\/\n static struct prt_quirk prt_quirks[] = {\n-\t{ medion_md9580, 0, 0, 9, 'A',\n+\t{ medion_md9580, 0, 0, 9, PCI_INTX_PIN('A'),\n \t\t\"\\\\_SB_.PCI0.ISA_.LNKA\",\n \t\t\"\\\\_SB_.PCI0.ISA_.LNKB\"},\n-\t{ dell_optiplex, 0, 0, 0xd, 'A',\n+\t{ dell_optiplex, 0, 0, 0xd, PCI_INTX_PIN('A'),\n \t\t\"\\\\_SB_.LNKB\",\n \t\t\"\\\\_SB_.LNKA\"},\n-\t{ hp_t5710, 0, 0, 1, 'A',\n+\t{ hp_t5710, 0, 0, 1, PCI_INTX_PIN('A'),\n \t\t\"\\\\_SB_.PCI0.LNK1\",\n \t\t\"\\\\_SB_.PCI0.LNK3\"},\n };\n@@ -179,7 +181,7 @@\n \t\t entry->id.segment == quirk->segment &&\n \t\t entry->id.bus == quirk->bus &&\n \t\t entry->id.device == quirk->device &&\n-\t\t pin_name(entry->pin) == quirk->pin &&\n+\t\t entry->pin == quirk->pin &&\n \t\t !strcmp(prt->source, quirk->source) &&\n \t\t strlen(prt->source) >= strlen(quirk->actual_source)) {\n \t\t\tprintk(KERN_WARNING PREFIX \"firmware reports \"\n"} {"commit":"6938594374ee506e91a4c03117a034ea0ed66783","subject":"ata_piix: fix MWDMA handling on PIIX3","message":"ata_piix: fix MWDMA handling on PIIX3\n\nFix erroneous check for ap->udma_mask in do_pata_set_dmamode()\nresulting in controller not being programmed properly for MWDMA.\n\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/ata_piix.c\n+++ drivers\/ata\/ata_piix.c\n@@ -869,10 +869,10 @@\n \t\t\t\t(timings[pio][1] << 8);\n \t\t}\n \n-\t\tif (ap->udma_mask) {\n+\t\tif (ap->udma_mask)\n \t\t\tudma_enable &= ~(1 << devid);\n-\t\t\tpci_write_config_word(dev, master_port, master_data);\n-\t\t}\n+\n+\t\tpci_write_config_word(dev, master_port, master_data);\n \t}\n \t\/* Don't scribble on 0x48 if the controller does not support UDMA *\/\n \tif (ap->udma_mask)\n"} {"commit":"da3ceb2288d0b50373b69d57a81c34fdd7cd11aa","subject":"ata: duplicate variable sparse warning","message":"ata: duplicate variable sparse warning\n\ndrivers\/ata\/ata_piix.c:1502:7: warning: symbol 'rc' shadows an earlier one\n\nSigned-off-by: Stephen Hemminger \nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/ata_piix.c\n+++ drivers\/ata\/ata_piix.c\n@@ -1499,7 +1499,7 @@\n \t * off.\n \t *\/\n \tif (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) {\n-\t\tint rc = piix_disable_ahci(pdev);\n+\t\trc = piix_disable_ahci(pdev);\n \t\tif (rc)\n \t\t\treturn rc;\n \t}\n"} {"commit":"e029853612ba5999caed4dbc833dab729aac75ba","subject":"drivers\/block\/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros","message":"drivers\/block\/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros\n\nUse clear_bit, set_bit, and test_bit functions directly\n\nSigned-off-by: Joe Perches <16a9a54ddf4259952e3c118c763138e83693d7fd@perches.com>\nCc: Stephen Hemminger \nCc: Jens Axboe <165ab144a3ccfd9429d5c6466b275f24fafdb114@oracle.com>\nCc: Marcin Slusarz \nCc: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/block\/floppy.c\n+++ drivers\/block\/floppy.c\n@@ -305,17 +305,11 @@\n #define DRS\t(&drive_state[current_drive])\n #define DRWE\t(&write_errors[current_drive])\n #define FDCS\t(&fdc_state[fdc])\n-#define CLEARF(x)\tclear_bit(x##_BIT, &DRS->flags)\n-#define SETF(x)\t\tset_bit(x##_BIT, &DRS->flags)\n-#define TESTF(x)\ttest_bit(x##_BIT, &DRS->flags)\n \n #define UDP\t(&drive_params[drive])\n #define UDRS\t(&drive_state[drive])\n #define UDRWE\t(&write_errors[drive])\n #define UFDCS\t(&fdc_state[FDC(drive)])\n-#define UCLEARF(x)\tclear_bit(x##_BIT, &UDRS->flags)\n-#define USETF(x)\tset_bit(x##_BIT, &UDRS->flags)\n-#define UTESTF(x)\ttest_bit(x##_BIT, &UDRS->flags)\n \n #define DPRINT(format, args...) \\\n \tpr_info(DEVICE_NAME \"%d: \" format, current_drive, ##args)\n@@ -764,13 +758,13 @@\n \tdebug_dcl(UDP->flags, \"flags=%lx\\n\", UDRS->flags);\n \n \tif (UDP->flags & FD_BROKEN_DCL)\n-\t\treturn UTESTF(FD_DISK_CHANGED);\n+\t\treturn test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n \tif ((fd_inb(FD_DIR) ^ UDP->flags) & 0x80) {\n-\t\tUSETF(FD_VERIFY);\t\/* verify write protection *\/\n-\t\tif (UDRS->maxblock) {\n-\t\t\t\/* mark it changed *\/\n-\t\t\tUSETF(FD_DISK_CHANGED);\n-\t\t}\n+\t\tset_bit(FD_VERIFY_BIT, &UDRS->flags);\n+\t\t\t\t\t\/* verify write protection *\/\n+\n+\t\tif (UDRS->maxblock)\t\/* mark it changed *\/\n+\t\t\tset_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n \n \t\t\/* invalidate its geometry *\/\n \t\tif (UDRS->keep_data >= 0) {\n@@ -785,7 +779,7 @@\n \t\treturn 1;\n \t} else {\n \t\tUDRS->last_checked = jiffies;\n-\t\tUCLEARF(FD_DISK_NEWCHANGE);\n+\t\tclear_bit(FD_DISK_NEWCHANGE_BIT, &UDRS->flags);\n \t}\n \treturn 0;\n }\n@@ -1477,11 +1471,11 @@\n \t\tbad = 1;\n \t\tif (ST1 & ST1_WP) {\n \t\t\tDPRINT(\"Drive is write protected\\n\");\n-\t\t\tCLEARF(FD_DISK_WRITABLE);\n+\t\t\tclear_bit(FD_DISK_WRITABLE_BIT, &DRS->flags);\n \t\t\tcont->done(0);\n \t\t\tbad = 2;\n \t\t} else if (ST1 & ST1_ND) {\n-\t\t\tSETF(FD_NEED_TWADDLE);\n+\t\t\tset_bit(FD_NEED_TWADDLE_BIT, &DRS->flags);\n \t\t} else if (ST1 & ST1_OR) {\n \t\t\tif (DP->flags & FTD_MSG)\n \t\t\t\tDPRINT(\"Over\/Underrun - retrying\\n\");\n@@ -1587,7 +1581,8 @@\n \t\tdebug_dcl(DP->flags,\n \t\t\t \"clearing NEWCHANGE flag because of effective seek\\n\");\n \t\tdebug_dcl(DP->flags, \"jiffies=%lu\\n\", jiffies);\n-\t\tCLEARF(FD_DISK_NEWCHANGE);\t\/* effective seek *\/\n+\t\tclear_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags);\n+\t\t\t\t\t\/* effective seek *\/\n \t\tDRS->select_date = jiffies;\n \t}\n \tDRS->track = ST1;\n@@ -1596,23 +1591,23 @@\n \n static void check_wp(void)\n {\n-\tif (TESTF(FD_VERIFY)) {\n-\t\t\/* check write protection *\/\n+\tif (test_bit(FD_VERIFY_BIT, &DRS->flags)) {\n+\t\t\t\t\t\/* check write protection *\/\n \t\toutput_byte(FD_GETSTATUS);\n \t\toutput_byte(UNIT(current_drive));\n \t\tif (result() != 1) {\n \t\t\tFDCS->reset = 1;\n \t\t\treturn;\n \t\t}\n-\t\tCLEARF(FD_VERIFY);\n-\t\tCLEARF(FD_NEED_TWADDLE);\n+\t\tclear_bit(FD_VERIFY_BIT, &DRS->flags);\n+\t\tclear_bit(FD_NEED_TWADDLE_BIT, &DRS->flags);\n \t\tdebug_dcl(DP->flags,\n \t\t\t \"checking whether disk is write protected\\n\");\n \t\tdebug_dcl(DP->flags, \"wp=%x\\n\", ST3 & 0x40);\n \t\tif (!(ST3 & 0x40))\n-\t\t\tSETF(FD_DISK_WRITABLE);\n+\t\t\tset_bit(FD_DISK_WRITABLE_BIT, &DRS->flags);\n \t\telse\n-\t\t\tCLEARF(FD_DISK_WRITABLE);\n+\t\t\tclear_bit(FD_DISK_WRITABLE_BIT, &DRS->flags);\n \t}\n }\n \n@@ -1624,13 +1619,13 @@\n \n \tdebug_dcl(DP->flags, \"calling disk change from seek\\n\");\n \n-\tif (!TESTF(FD_DISK_NEWCHANGE) &&\n+\tif (!test_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags) &&\n \t disk_change(current_drive) && (raw_cmd->flags & FD_RAW_NEED_DISK)) {\n \t\t\/* the media changed flag should be cleared after the seek.\n \t\t * If it isn't, this means that there is really no disk in\n \t\t * the drive.\n \t\t *\/\n-\t\tSETF(FD_DISK_CHANGED);\n+\t\tset_bit(FD_DISK_CHANGED_BIT, &DRS->flags);\n \t\tcont->done(0);\n \t\tcont->redo();\n \t\treturn;\n@@ -1638,7 +1633,7 @@\n \tif (DRS->track <= NEED_1_RECAL) {\n \t\trecalibrate_floppy();\n \t\treturn;\n-\t} else if (TESTF(FD_DISK_NEWCHANGE) &&\n+\t} else if (test_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags) &&\n \t\t (raw_cmd->flags & FD_RAW_NEED_DISK) &&\n \t\t (DRS->track <= NO_TRACK || DRS->track == raw_cmd->track)) {\n \t\t\/* we seek to clear the media-changed condition. Does anybody\n@@ -1701,7 +1696,7 @@\n \t\t\tdebug_dcl(DP->flags,\n \t\t\t\t \"clearing NEWCHANGE flag because of second recalibrate\\n\");\n \n-\t\t\tCLEARF(FD_DISK_NEWCHANGE);\n+\t\t\tclear_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags);\n \t\t\tDRS->select_date = jiffies;\n \t\t\t\/* fall through *\/\n \t\tdefault:\n@@ -1991,7 +1986,7 @@\n \n \tscandrives();\n \tdebug_dcl(DP->flags, \"setting NEWCHANGE in floppy_start\\n\");\n-\tSETF(FD_DISK_NEWCHANGE);\n+\tset_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags);\n \tfloppy_ready();\n }\n \n@@ -2647,7 +2642,8 @@\n \tHEAD = fsector_t \/ _floppy->sect;\n \n \tif (((_floppy->stretch & (FD_SWAPSIDES | FD_SECTBASEMASK)) ||\n-\t TESTF(FD_NEED_TWADDLE)) && fsector_t < _floppy->sect)\n+\t test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags)) &&\n+\t fsector_t < _floppy->sect)\n \t\tmax_sector = _floppy->sect;\n \n \t\/* 2M disks have phantom sectors on the first track *\/\n@@ -2919,7 +2915,7 @@\n \t\t\treturn;\n \t\tdisk_change(current_drive);\n \t\tif (test_bit(current_drive, &fake_change) ||\n-\t\t TESTF(FD_DISK_CHANGED)) {\n+\t\t test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {\n \t\t\tDPRINT(\"disk absent or changed during operation\\n\");\n \t\t\tREPEAT;\n \t\t}\n@@ -2944,7 +2940,7 @@\n \t\t\tcontinue;\n \t\t}\n \n-\t\tif (TESTF(FD_NEED_TWADDLE))\n+\t\tif (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags))\n \t\t\ttwaddle();\n \t\tschedule_bh(floppy_start);\n \t\tdebugt(\"queue fd request\");\n@@ -3010,7 +3006,7 @@\n \traw_cmd->cmd_count = 0;\n \tcont = &poll_cont;\n \tdebug_dcl(DP->flags, \"setting NEWCHANGE in poll_drive\\n\");\n-\tSETF(FD_DISK_NEWCHANGE);\n+\tset_bit(FD_DISK_NEWCHANGE_BIT, &DRS->flags);\n \tWAIT(floppy_ready);\n \treturn ret;\n }\n@@ -3502,8 +3498,8 @@\n \t\t * non-Sparc architectures *\/\n \t\tret = fd_eject(UNIT(drive));\n \n-\t\tUSETF(FD_DISK_CHANGED);\n-\t\tUSETF(FD_VERIFY);\n+\t\tset_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n+\t\tset_bit(FD_VERIFY_BIT, &UDRS->flags);\n \t\tprocess_fd_request();\n \t\treturn ret;\n \tcase FDCLRPRM:\n@@ -3700,8 +3696,8 @@\n \t\tgoto out2;\n \n \tif (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)) {\n-\t\tUSETF(FD_DISK_CHANGED);\n-\t\tUSETF(FD_VERIFY);\n+\t\tset_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n+\t\tset_bit(FD_VERIFY_BIT, &UDRS->flags);\n \t}\n \n \tif (UDRS->fd_ref == -1 || (UDRS->fd_ref && (mode & FMODE_EXCL)))\n@@ -3761,11 +3757,12 @@\n \t\tif (mode & (FMODE_READ|FMODE_WRITE)) {\n \t\t\tUDRS->last_checked = 0;\n \t\t\tcheck_disk_change(bdev);\n-\t\t\tif (UTESTF(FD_DISK_CHANGED))\n+\t\t\tif (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))\n \t\t\t\tgoto out;\n \t\t}\n \t\tres = -EROFS;\n-\t\tif ((mode & FMODE_WRITE) && !(UTESTF(FD_DISK_WRITABLE)))\n+\t\tif ((mode & FMODE_WRITE) &&\n+\t\t !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags))\n \t\t\tgoto out;\n \t}\n \tmutex_unlock(&open_lock);\n@@ -3789,7 +3786,8 @@\n {\n \tint drive = (long)disk->private_data;\n \n-\tif (UTESTF(FD_DISK_CHANGED) || UTESTF(FD_VERIFY))\n+\tif (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||\n+\t test_bit(FD_VERIFY_BIT, &UDRS->flags))\n \t\treturn 1;\n \n \tif (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {\n@@ -3798,8 +3796,8 @@\n \t\tprocess_fd_request();\n \t}\n \n-\tif (UTESTF(FD_DISK_CHANGED) ||\n-\t UTESTF(FD_VERIFY) ||\n+\tif (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||\n+\t test_bit(FD_VERIFY_BIT, &UDRS->flags) ||\n \t test_bit(drive, &fake_change) ||\n \t (!ITYPE(UDRS->fd_device) && !current_type[drive]))\n \t\treturn 1;\n@@ -3870,14 +3868,16 @@\n \tint cf;\n \tint res = 0;\n \n-\tif (UTESTF(FD_DISK_CHANGED) ||\n-\t UTESTF(FD_VERIFY) || test_bit(drive, &fake_change) || NO_GEOM) {\n+\tif (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||\n+\t test_bit(FD_VERIFY_BIT, &UDRS->flags) ||\n+\t test_bit(drive, &fake_change) || NO_GEOM) {\n \t\tif (usage_count == 0) {\n \t\t\tpr_info(\"VFS: revalidate called on non-open device.\\n\");\n \t\t\treturn -EFAULT;\n \t\t}\n \t\tlock_fdc(drive, 0);\n-\t\tcf = UTESTF(FD_DISK_CHANGED) || UTESTF(FD_VERIFY);\n+\t\tcf = (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||\n+\t\t test_bit(FD_VERIFY_BIT, &UDRS->flags));\n \t\tif (!(cf || test_bit(drive, &fake_change) || NO_GEOM)) {\n \t\t\tprocess_fd_request();\t\/*already done by another thread *\/\n \t\t\treturn 0;\n@@ -3887,7 +3887,7 @@\n \t\tif (buffer_drive == drive)\n \t\t\tbuffer_track = -1;\n \t\tclear_bit(drive, &fake_change);\n-\t\tUCLEARF(FD_DISK_CHANGED);\n+\t\tclear_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n \t\tif (cf)\n \t\t\tUDRS->generation++;\n \t\tif (NO_GEOM) {\n@@ -4277,9 +4277,9 @@\n \tfor (drive = 0; drive < N_DRIVE; drive++) {\n \t\tmemset(UDRS, 0, sizeof(*UDRS));\n \t\tmemset(UDRWE, 0, sizeof(*UDRWE));\n-\t\tUSETF(FD_DISK_NEWCHANGE);\n-\t\tUSETF(FD_DISK_CHANGED);\n-\t\tUSETF(FD_VERIFY);\n+\t\tset_bit(FD_DISK_NEWCHANGE_BIT, &UDRS->flags);\n+\t\tset_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);\n+\t\tset_bit(FD_VERIFY_BIT, &UDRS->flags);\n \t\tUDRS->fd_device = -1;\n \t\tfloppy_track_buffer = NULL;\n \t\tmax_buffer_sectors = 0;\n"} {"commit":"6c14f97745e4bdb1ecbfef5a80d0a254ab4bb4cf","subject":"Fixing memory leak","message":"Fixing memory leak\n\n\ngit-svn-id: fbb392d5347ebc45c06187f72dfd8bab02595dbf@892182 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/transport\/http\/sender\/http_sender.c\n+++ src\/core\/transport\/http\/sender\/http_sender.c\n@@ -54,12 +54,6 @@\n axis2_bool_t keep_alive;\n };\n \n-typedef struct axis2_http_connection_struct\n-{\n- axutil_array_list_t *closed_list;\n- axis2_http_client_t *http_client;\n-} axis2_http_connection_struct_t;\n-\n #ifndef AXIS2_LIBCURL_ENABLED\n static void\n axis2_http_sender_add_header_list(\n@@ -149,7 +143,7 @@\n axis2_msg_ctx_t *msg_ctx);\n \n static void\n-axis2_http_sender_connection_map_add_to_closed_list(\n+axis2_http_sender_connection_map_remove(\n axutil_hash_t *connection_map,\n const axutil_env_t *env,\n axis2_msg_ctx_t *msg_ctx,\n@@ -406,12 +400,6 @@\n AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);\n return AXIS2_FAILURE;\n }\n- \n- connection_map_property = axutil_property_create_with_args(env, AXIS2_SCOPE_SESSION, \n- AXIS2_TRUE, axis2_http_sender_connection_map_free, connection_map);\n- axis2_conf_ctx_set_property(conf_ctx, env, AXIS2_HTTP_CONNECTION_MAP, \n- connection_map_property);\n-\n }\n else\n {\n@@ -1463,12 +1451,6 @@\n connection_header_present = AXIS2_TRUE;\n connection_header_value = axis2_http_header_get_value(header, env);\n conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);\n- \/** \n- * Put the http client into message context. Is this neccessary?\n- *\/\n- property = axutil_property_create_with_args(env, AXIS2_SCOPE_REQUEST, \n- AXIS2_FALSE, axis2_http_client_free_void_arg, sender->client);\n- axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT, property);\n connection_map_property = axis2_conf_ctx_get_property(conf_ctx, env, \n AXIS2_HTTP_CONNECTION_MAP);\n \n@@ -1483,7 +1465,7 @@\n {\n if(connection_map)\n {\n- axis2_http_sender_connection_map_add_to_closed_list(connection_map, env, \n+ axis2_http_sender_connection_map_remove(connection_map, env, \n msg_ctx, sender->client);\n } \n } \n@@ -1513,12 +1495,6 @@\n axis2_conf_ctx_t *conf_ctx = NULL;\n conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);\n \n- \/** \n- * Put the http client into message context. Is this neccessary?\n- *\/\n- property = axutil_property_create_with_args(env, AXIS2_SCOPE_REQUEST, AXIS2_FALSE, \n- axis2_http_client_free_void_arg, sender->client);\n- axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT, property);\n connection_map_property = axis2_conf_ctx_get_property(conf_ctx, env, \n AXIS2_HTTP_CONNECTION_MAP);\n if(connection_map_property)\n@@ -1529,7 +1505,7 @@\n {\n if(connection_map)\n {\n- axis2_http_sender_connection_map_add_to_closed_list(connection_map, env, msg_ctx, \n+ axis2_http_sender_connection_map_remove(connection_map, env, msg_ctx, \n sender->client);\n }\n } \/* End if http version 1.0 *\/\n@@ -3202,74 +3178,35 @@\n {\n AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);\n }\n- if(connection_map)\n- {\n- axis2_http_connection_struct_t *connections = NULL;\n- axis2_endpoint_ref_t *endpoint = NULL;\n- connections = AXIS2_MALLOC(env->allocator, sizeof(axis2_http_connection_struct_t));\n- if(connections)\n- {\n- connections->closed_list = axutil_array_list_create(env, 0);\n- if(!connections->closed_list)\n- {\n- if(connections->closed_list)\n- {\n- axutil_array_list_free(connections->closed_list, env);\n- }\n- axutil_hash_free(connection_map, env);\n- connection_map = NULL;\n- AXIS2_FREE(env->allocator, connections);\n- connections = NULL;\n- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);\n- return NULL;\n- }\n- }\n- else\n- {\n- axutil_hash_free(connection_map, env);\n- connection_map = NULL;\n- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);\n- return NULL;\n- }\n- endpoint = axis2_msg_ctx_get_to(msg_ctx, env);\n- if(endpoint)\n- {\n- const axis2_char_t *address = NULL;\n- address = axis2_endpoint_ref_get_address(endpoint, env);\n- if(address)\n- {\n- axutil_url_t *url = NULL;\n- url = axutil_url_parse_string(env, address);\n- if(url)\n- {\n- axis2_char_t *server = axutil_url_get_server(url, env);\n- if(server)\n- {\n- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, \"damserver:%s\", server);\n- axutil_hash_set(connection_map, axutil_strdup(env, server), \n- AXIS2_HASH_KEY_STRING, connections);\n- }\n- axutil_url_free(url, env);\n- }\n- }\n- }\n- else\n- {\n- axutil_hash_free(connection_map, env);\n- connection_map = NULL;\n- }\n- } \/* end if connection_map *\/\n+ else\n+ {\n+ axis2_conf_ctx_t *conf_ctx = NULL;\n+ axutil_property_t *connection_map_property = NULL;\n+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);\n+ connection_map_property = axutil_property_create_with_args(env, AXIS2_SCOPE_SESSION, \n+ AXIS2_TRUE, axis2_http_sender_connection_map_free, connection_map);\n+ axis2_conf_ctx_set_property(conf_ctx, env, AXIS2_HTTP_CONNECTION_MAP, \n+ connection_map_property);\n+ }\n return connection_map;\n }\n \n static void\n-axis2_http_sender_connection_map_add_to_closed_list(\n+axis2_http_sender_connection_map_remove(\n axutil_hash_t *connection_map,\n const axutil_env_t *env,\n axis2_msg_ctx_t *msg_ctx,\n axis2_http_client_t *http_client)\n {\n+ axutil_property_t *property = NULL;\n axis2_endpoint_ref_t *endpoint = NULL;\n+ \/** \n+ * Put the http client into message context with own value true so that it will be freed\n+ * after response processed\n+ *\/\n+ property = axutil_property_create_with_args(env, AXIS2_SCOPE_REQUEST, AXIS2_TRUE, \n+ axis2_http_client_free_void_arg, http_client);\n+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT, property);\n endpoint = axis2_msg_ctx_get_to(msg_ctx, env);\n if(endpoint)\n {\n@@ -3284,14 +3221,7 @@\n axis2_char_t *server = axutil_url_get_server(url, env);\n if(server)\n {\n- axis2_http_connection_struct_t *connections = NULL;\n- connections = axutil_hash_get(connection_map, server, \n- AXIS2_HASH_KEY_STRING);\n- if(connections)\n- {\n- connections->http_client = NULL;\n- axutil_array_list_add(connections->closed_list, env, http_client);\n- }\n+ axutil_hash_set(connection_map, server, AXIS2_HASH_KEY_STRING, NULL);\n }\n axutil_url_free(url, env);\n }\n@@ -3306,7 +3236,14 @@\n axis2_msg_ctx_t *msg_ctx,\n axis2_http_client_t *http_client)\n {\n+ axutil_property_t *property = NULL;\n axis2_endpoint_ref_t *endpoint = NULL;\n+ \/** \n+ * Put the http client into message context. Is this neccessary?\n+ *\/\n+ property = axutil_property_create_with_args(env, AXIS2_SCOPE_REQUEST, AXIS2_FALSE, \n+ axis2_http_client_free_void_arg, http_client);\n+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_CLIENT, property);\n endpoint = axis2_msg_ctx_get_to(msg_ctx, env);\n if(endpoint)\n {\n@@ -3321,13 +3258,8 @@\n axis2_char_t *server = axutil_url_get_server(url, env);\n if(server)\n {\n- axis2_http_connection_struct_t *connections = NULL;\n- connections = axutil_hash_get(connection_map, server, \n- AXIS2_HASH_KEY_STRING);\n- if(connections)\n- {\n- connections->http_client = http_client;\n- }\n+ axutil_hash_set(connection_map, axutil_strdup(env, server), \n+ AXIS2_HASH_KEY_STRING, http_client);\n }\n axutil_url_free(url, env);\n }\n@@ -3357,13 +3289,7 @@\n axis2_char_t *server = axutil_url_get_server(url, env);\n if(server)\n {\n- axis2_http_connection_struct_t *connections = NULL;\n- connections = axutil_hash_get(connection_map, server, \n- AXIS2_HASH_KEY_STRING);\n- if(connections)\n- {\n- http_client = connections->http_client;\n- }\n+ http_client = axutil_hash_get(connection_map, server, AXIS2_HASH_KEY_STRING);\n }\n axutil_url_free(url, env);\n }\n@@ -3385,7 +3311,7 @@\n for(hi = axutil_hash_first(ht, env); hi; hi = axutil_hash_next(env, hi))\n {\n axis2_char_t *name = NULL;\n- axis2_http_connection_struct_t *value = NULL;\n+ axis2_http_client_t *value = NULL;\n \n axutil_hash_this(hi, &key, NULL, &val);\n name = (axis2_char_t *) key;\n@@ -3393,27 +3319,10 @@\n {\n AXIS2_FREE(env->allocator, name);\n }\n- value = (axis2_http_connection_struct_t *) val;\n+ value = (axis2_http_client_t *) val;\n if(value)\n {\n- int i = 0, size = 0;\n- size = axutil_array_list_size(value->closed_list, env);\n- for(i = 0; i < size; i++)\n- {\n- axis2_http_client_t *http_client = NULL;\n- http_client = (axis2_http_client_t *) axutil_array_list_get(value->closed_list, env, \n- i);\n- if(http_client)\n- {\n- axis2_http_client_free(http_client, env);\n- }\n- }\n- axutil_array_list_free(value->closed_list, env);\n- if(value->http_client)\n- {\n- axis2_http_client_free(value->http_client, env);\n- }\n- AXIS2_FREE(env->allocator, value);\n+ axis2_http_client_free(value, env);\n }\n }\n axutil_hash_free(ht, env);\n"} {"commit":"ec288bd37e1925f513db40871bc46115cf7fb733","subject":"tpm: increase size of internal TPM response buffers","message":"tpm: increase size of internal TPM response buffers\n\nThis patch increases size of driver internal response buffers. Some TPM\nresponses defined in TCG TPM Specification Version 1.2 Revision 103 have\nincreased size and do not fit previously defined buffers. Some TPM\nresponses do not have fixed size, so bigger response buffers have to be\nallocated. 200B buffers should be enough.\n\n[5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org: coding-style fixes]\nSigned-off-by: Marcin Obara <533576a6db55786666ddd93aab80fe3859e95cc9@users.sourceforge.net>\nCc: Marcel Selhorst \nCc: Kylene Jo Hall \nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/tpm\/tpm.c\n+++ drivers\/char\/tpm\/tpm.c\n@@ -580,91 +580,133 @@\n }\n EXPORT_SYMBOL_GPL(tpm_continue_selftest);\n \n+#define TPM_INTERNAL_RESULT_SIZE 200\n+\n ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr,\n \t\t\tchar *buf)\n {\n-\tu8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)];\n+\tu8 *data;\n \tssize_t rc;\n \n \tstruct tpm_chip *chip = dev_get_drvdata(dev);\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_FLAG;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n-\t\t\t\"attemtping to determine the permanent state\");\n-\tif (rc)\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n+\t\t\t\"attemtping to determine the permanent enabled state\");\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n-\treturn sprintf(buf, \"%d\\n\", !data[TPM_GET_CAP_PERM_DISABLE_IDX]);\n+\t}\n+\n+\trc = sprintf(buf, \"%d\\n\", !data[TPM_GET_CAP_PERM_DISABLE_IDX]);\n+\n+\tkfree(data);\n+\treturn rc;\n }\n EXPORT_SYMBOL_GPL(tpm_show_enabled);\n \n ssize_t tpm_show_active(struct device * dev, struct device_attribute * attr,\n \t\t\tchar *buf)\n {\n-\tu8 data[max_t(int, ARRAY_SIZE(tpm_cap), 35)];\n+\tu8 *data;\n \tssize_t rc;\n \n \tstruct tpm_chip *chip = dev_get_drvdata(dev);\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_FLAG;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n-\t\t\t\"attemtping to determine the permanent state\");\n-\tif (rc)\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n+\t\t\t\"attemtping to determine the permanent active state\");\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n-\treturn sprintf(buf, \"%d\\n\", !data[TPM_GET_CAP_PERM_INACTIVE_IDX]);\n+\t}\n+\n+\trc = sprintf(buf, \"%d\\n\", !data[TPM_GET_CAP_PERM_INACTIVE_IDX]);\n+\n+\tkfree(data);\n+\treturn rc;\n }\n EXPORT_SYMBOL_GPL(tpm_show_active);\n \n ssize_t tpm_show_owned(struct device * dev, struct device_attribute * attr,\n \t\t\tchar *buf)\n {\n-\tu8 data[sizeof(tpm_cap)];\n+\tu8 *data;\n \tssize_t rc;\n \n \tstruct tpm_chip *chip = dev_get_drvdata(dev);\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_PROP;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_OWNER;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\"attempting to determine the owner state\");\n-\tif (rc)\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n-\treturn sprintf(buf, \"%d\\n\", data[TPM_GET_CAP_RET_BOOL_1_IDX]);\n+\t}\n+\n+\trc = sprintf(buf, \"%d\\n\", data[TPM_GET_CAP_RET_BOOL_1_IDX]);\n+\n+\tkfree(data);\n+\treturn rc;\n }\n EXPORT_SYMBOL_GPL(tpm_show_owned);\n \n ssize_t tpm_show_temp_deactivated(struct device * dev,\n \t\t\t\tstruct device_attribute * attr, char *buf)\n {\n-\tu8 data[sizeof(tpm_cap)];\n+\tu8 *data;\n \tssize_t rc;\n \n \tstruct tpm_chip *chip = dev_get_drvdata(dev);\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_FLAG;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_VOL;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\"attempting to determine the temporary state\");\n-\tif (rc)\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n-\treturn sprintf(buf, \"%d\\n\", data[TPM_GET_CAP_TEMP_INACTIVE_IDX]);\n+\t}\n+\n+\trc = sprintf(buf, \"%d\\n\", data[TPM_GET_CAP_TEMP_INACTIVE_IDX]);\n+\n+\tkfree(data);\n+\treturn rc;\n }\n EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated);\n \n@@ -678,7 +720,7 @@\n ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,\n \t\t char *buf)\n {\n-\tu8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(pcrread)), 30)];\n+\tu8 *data;\n \tssize_t rc;\n \tint i, j, num_pcrs;\n \t__be32 index;\n@@ -688,21 +730,27 @@\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_PROP;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_PCR;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\"attempting to determine the number of PCRS\");\n-\tif (rc)\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n+\t}\n \n \tnum_pcrs = be32_to_cpu(*((__be32 *) (data + 14)));\n \tfor (i = 0; i < num_pcrs; i++) {\n \t\tmemcpy(data, pcrread, sizeof(pcrread));\n \t\tindex = cpu_to_be32(i);\n \t\tmemcpy(data + 10, &index, 4);\n-\t\trc = transmit_cmd(chip, data, sizeof(data),\n+\t\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\t\"attempting to read a PCR\");\n \t\tif (rc)\n \t\t\tgoto out;\n@@ -712,6 +760,7 @@\n \t\tstr += sprintf(str, \"\\n\");\n \t}\n out:\n+\tkfree(data);\n \treturn str - buf;\n }\n EXPORT_SYMBOL_GPL(tpm_show_pcrs);\n@@ -795,7 +844,7 @@\n ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr,\n \t\t char *buf)\n {\n-\tu8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];\n+\tu8 *data;\n \tssize_t rc;\n \tchar *str = buf;\n \n@@ -803,21 +852,27 @@\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_PROP;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER;\n \n-\trc = transmit_cmd(chip, data, sizeof(data),\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\"attempting to determine the manufacturer\");\n-\tif (rc)\n+\tif (rc) {\n+\t\tkfree(data);\n \t\treturn 0;\n+\t}\n \n \tstr += sprintf(str, \"Manufacturer: 0x%x\\n\",\n \t\t be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX))));\n \n \tmemcpy(data, cap_version, sizeof(cap_version));\n \tdata[CAP_VERSION_IDX] = CAP_VERSION_1_1;\n-\trc = transmit_cmd(chip, data, sizeof(data),\n+\trc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,\n \t\t\t\"attempting to determine the 1.1 version\");\n \tif (rc)\n \t\tgoto out;\n@@ -828,6 +883,7 @@\n \t\t (int) data[17]);\n \n out:\n+\tkfree(data);\n \treturn str - buf;\n }\n EXPORT_SYMBOL_GPL(tpm_show_caps);\n@@ -835,7 +891,7 @@\n ssize_t tpm_show_caps_1_2(struct device * dev,\n \t\t\t struct device_attribute * attr, char *buf)\n {\n-\tu8 data[max_t(int, max(ARRAY_SIZE(tpm_cap), ARRAY_SIZE(cap_version)), 30)];\n+\tu8 *data;\n \tssize_t len;\n \tchar *str = buf;\n \n@@ -843,15 +899,20 @@\n \tif (chip == NULL)\n \t\treturn -ENODEV;\n \n+\tdata = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n \tmemcpy(data, tpm_cap, sizeof(tpm_cap));\n \tdata[TPM_CAP_IDX] = TPM_CAP_PROP;\n \tdata[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER;\n \n-\tif ((len = tpm_transmit(chip, data, sizeof(data))) <=\n-\t TPM_ERROR_SIZE) {\n+\tlen = tpm_transmit(chip, data, TPM_INTERNAL_RESULT_SIZE);\n+\tif (len <= TPM_ERROR_SIZE) {\n \t\tdev_dbg(chip->dev, \"A TPM error (%d) occurred \"\n \t\t\t\"attempting to determine the manufacturer\\n\",\n \t\t\tbe32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX))));\n+\t\tkfree(data);\n \t\treturn 0;\n \t}\n \n@@ -861,8 +922,8 @@\n \tmemcpy(data, cap_version, sizeof(cap_version));\n \tdata[CAP_VERSION_IDX] = CAP_VERSION_1_2;\n \n-\tif ((len = tpm_transmit(chip, data, sizeof(data))) <=\n-\t TPM_ERROR_SIZE) {\n+\tlen = tpm_transmit(chip, data, TPM_INTERNAL_RESULT_SIZE);\n+\tif (len <= TPM_ERROR_SIZE) {\n \t\tdev_err(chip->dev, \"A TPM error (%d) occurred \"\n \t\t\t\"attempting to determine the 1.2 version\\n\",\n \t\t\tbe32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX))));\n@@ -874,6 +935,7 @@\n \t\t (int) data[19]);\n \n out:\n+\tkfree(data);\n \treturn str - buf;\n }\n EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);\n"} {"commit":"fef4cbf2ab830fcd695d892927386ad9ccc46339","subject":"dmaengine: at_xdmac: Add DMA_PRIVATE","message":"dmaengine: at_xdmac: Add DMA_PRIVATE\n\nsame issue as commit 7f5ae3553685:\n\"Without DMA_PRIVATE the driver is not able to allocate more than one channel.\nSince it uses dma_get_any_slave_channel that calls private_candidate, the\nsecond allocation fails at\n\/* some channels are already publicly allocated *\/\n\"\n\nSigned-off-by: Ludovic Desroches <627575320a9526cb6c91021c9940202b0e84c416@atmel.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"62b5cb757f1d6c875293958535952dd38ff9e675","subject":"dmaengine: at_xdmac: fix memory leak in interleaved mode","message":"dmaengine: at_xdmac: fix memory leak in interleaved mode\n\nIn interleaved mode, when numf > 1, we have only one descriptor for the\ntransfer but this descriptor has to be added to the descs_list. If not,\nwhen doing remove_xfer, the descriptor won't be put back in the\nfree_descs_list.\n\nSigned-off-by: Ludovic Desroches <627575320a9526cb6c91021c9940202b0e84c416@atmel.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2358b820d42a33f1d1052b438489c90a4cc8f3fc","subject":"drivers: dma: Include appropriate header file in dca.c","message":"drivers: dma: Include appropriate header file in dca.c\n\nIncludes an appropriate header file dma_v2.h in ioat\/dca.c because\nfunctions ioat2_dca_init() and ioat3_dca_init() have their function\ndeclarations in dma_v2.h.\n\nThis eliminates the following warning in ioat\/dca.c:\ndrivers\/dma\/ioat\/dca.c:410:22: warning: no previous prototype for \u2018ioat2_dca_init\u2019 [-Wmissing-prototypes]\ndrivers\/dma\/ioat\/dca.c:624:22: warning: no previous prototype for \u2018ioat3_dca_init\u2019 [-Wmissing-prototypes]\n\nSigned-off-by: Rashika Kheria <62a2cbd3422b0d621dafb7ceeff40187aeaed4ed@gmail.com>\nReviewed-by: Josh Triplett \nAcked-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\nSigned-off-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6506cbca6b5b36d682bd39afcbf3f575c81dddb6","subject":"Add MODULE_DEVICE_TABLE() so ioatdma module is autoloaded","message":"Add MODULE_DEVICE_TABLE() so ioatdma module is autoloaded\n\nThe ioatdma module is missing aliases for the PCI devices it supports,\nso it is not autoloaded on boot. Add a MODULE_DEVICE_TABLE() to get\nthese aliases.\n\nSigned-off-by: Roland Dreier <91e9b5f7ca0bb6300133ed378670d64af90dde66@cisco.com>\nSigned-off-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/dma\/ioat\/pci.c\n+++ drivers\/dma\/ioat\/pci.c\n@@ -73,6 +73,7 @@\n \n \t{ 0, }\n };\n+MODULE_DEVICE_TABLE(pci, ioat_pci_tbl);\n \n static int __devinit ioat_pci_probe(struct pci_dev *pdev,\n \t\t\t\t const struct pci_device_id *id);\n"} {"commit":"ebabe2762607147d28aa395ea6df2a0ee7f795a1","subject":"iop-adma: fix platform driver hotplug\/coldplug","message":"iop-adma: fix platform driver hotplug\/coldplug\n\nSince 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform\nmodalias is prefixed with \"platform:\". Add MODULE_ALIAS() to most\nof the hotpluggable platform drivers, to re-enable auto loading.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Kay Sievers \nSigned-off-by: David Brownell \nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/dma\/iop-adma.c\n+++ drivers\/dma\/iop-adma.c\n@@ -1387,6 +1387,8 @@\n \tspin_unlock_bh(&iop_chan->lock);\n }\n \n+MODULE_ALIAS(\"platform:iop-adma\");\n+\n static struct platform_driver iop_adma_driver = {\n \t.probe\t\t= iop_adma_probe,\n \t.remove\t\t= iop_adma_remove,\n"} {"commit":"54933dddc3e8ccd9db48966d8ada11951cb8a558","subject":"[PATCH] EDAC: reorder EXPORT_SYMBOL macros","message":"[PATCH] EDAC: reorder EXPORT_SYMBOL macros\n\nFix EDAC code so EXPORT_SYMBOL comes after the function that is being\nexported. This is to maintain consistency with the rest of the kernel.\n\nSigned-off-by: David S. Peterson \nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/edac\/edac_mc.c\n+++ drivers\/edac\/edac_mc.c\n@@ -1199,7 +1199,6 @@\n \n #ifdef CONFIG_EDAC_DEBUG\n \n-EXPORT_SYMBOL(edac_mc_dump_channel);\n \n void edac_mc_dump_channel(struct channel_info *chan)\n {\n@@ -1209,9 +1208,8 @@\n \tdebugf4(\"\\tchannel->label = '%s'\\n\", chan->label);\n \tdebugf4(\"\\tchannel->csrow = %p\\n\\n\", chan->csrow);\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_dump_csrow);\n+EXPORT_SYMBOL(edac_mc_dump_channel);\n+\n \n void edac_mc_dump_csrow(struct csrow_info *csrow)\n {\n@@ -1227,9 +1225,8 @@\n \tdebugf4(\"\\tcsrow->channels = %p\\n\", csrow->channels);\n \tdebugf4(\"\\tcsrow->mci = %p\\n\\n\", csrow->mci);\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_dump_mci);\n+EXPORT_SYMBOL(edac_mc_dump_csrow);\n+\n \n void edac_mc_dump_mci(struct mem_ctl_info *mci)\n {\n@@ -1245,6 +1242,7 @@\n \t\tmci->mod_name, mci->ctl_name);\n \tdebugf3(\"\\tpvt_info = %p\\n\\n\", mci->pvt_info);\n }\n+EXPORT_SYMBOL(edac_mc_dump_mci);\n \n \n #endif\t\t\t\t\/* CONFIG_EDAC_DEBUG *\/\n@@ -1283,8 +1281,6 @@\n \treturn (char *) (((unsigned long) ptr) + align - r);\n }\n \n-\n-EXPORT_SYMBOL(edac_mc_alloc);\n \n \/**\n * edac_mc_alloc: Allocate a struct mem_ctl_info structure\n@@ -1357,9 +1353,8 @@\n \n \treturn mci;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_free);\n+EXPORT_SYMBOL(edac_mc_alloc);\n+\n \n \/**\n * edac_mc_free: Free a previously allocated 'mci' structure\n@@ -1369,6 +1364,7 @@\n {\n \tkfree(mci);\n }\n+EXPORT_SYMBOL(edac_mc_free);\n \n static struct mem_ctl_info *find_mci_by_pdev(struct pci_dev *pdev)\n {\n@@ -1450,8 +1446,6 @@\n }\n \n \n-EXPORT_SYMBOL(edac_mc_add_mc);\n-\n \/**\n * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and\n * create sysfs entries associated with mci structure\n@@ -1509,9 +1503,8 @@\n \tup(&mem_ctls_mutex);\n \treturn 1;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_del_mc);\n+EXPORT_SYMBOL(edac_mc_add_mc);\n+\n \n \/**\n * edac_mc_del_mc: Remove sysfs entries for specified mci structure and\n@@ -1540,9 +1533,8 @@\n \t\tmci->mod_name, mci->ctl_name, pci_name(mci->pdev));\n \treturn mci;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_scrub_block);\n+EXPORT_SYMBOL(edac_mc_del_mc);\n+\n \n void edac_mc_scrub_block(unsigned long page, unsigned long offset,\n \t\t\t u32 size)\n@@ -1574,11 +1566,10 @@\n \tif (PageHighMem(pg))\n \t\tlocal_irq_restore(flags);\n }\n+EXPORT_SYMBOL(edac_mc_scrub_block);\n \n \n \/* FIXME - should return -1 *\/\n-EXPORT_SYMBOL(edac_mc_find_csrow_by_page);\n-\n int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,\n \t\t\t\t unsigned long page)\n {\n@@ -1615,9 +1606,8 @@\n \n \treturn row;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_handle_ce);\n+EXPORT_SYMBOL(edac_mc_find_csrow_by_page);\n+\n \n \/* FIXME - setable log (warning\/emerg) levels *\/\n \/* FIXME - integrate with evlog: http:\/\/evlog.sourceforge.net\/ *\/\n@@ -1681,9 +1671,8 @@\n \t\t\t\t\t mci->csrows[row].grain);\n \t}\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_handle_ce_no_info);\n+EXPORT_SYMBOL(edac_mc_handle_ce);\n+\n \n void edac_mc_handle_ce_no_info(struct mem_ctl_info *mci,\n \t\t\t\t const char *msg)\n@@ -1694,9 +1683,8 @@\n \tmci->ce_noinfo_count++;\n \tmci->ce_count++;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_handle_ue);\n+EXPORT_SYMBOL(edac_mc_handle_ce_no_info);\n+\n \n void edac_mc_handle_ue(struct mem_ctl_info *mci,\n \t\t\t unsigned long page_frame_number,\n@@ -1750,9 +1738,8 @@\n \tmci->ue_count++;\n \tmci->csrows[row].ue_count++;\n }\n-\n-\n-EXPORT_SYMBOL(edac_mc_handle_ue_no_info);\n+EXPORT_SYMBOL(edac_mc_handle_ue);\n+\n \n void edac_mc_handle_ue_no_info(struct mem_ctl_info *mci,\n \t\t\t\t const char *msg)\n@@ -1766,6 +1753,7 @@\n \tmci->ue_noinfo_count++;\n \tmci->ue_count++;\n }\n+EXPORT_SYMBOL(edac_mc_handle_ue_no_info);\n \n \n #ifdef CONFIG_PCI\n"} {"commit":"021b97e469714b31b9e808c91b49543a8766c342","subject":"firewire net: Send L2 multicast via GASP.","message":"firewire net: Send L2 multicast via GASP.\n\nSend L2 multicast packet via GASP (Global asynchronous stream packet) by\nseeing the multicast bit in the L2 hardware address, not by seeing upper-\nlayer protocol address.\n\nSigned-off-by: YOSHIFUJI Hideaki <948b80da4254122ea1e8973dd9930d46b7654cf3@linux-ipv6.org>\nSigned-off-by: David S. Miller \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"aad932e75c573aec37a0652ff1c27a975d8d5373","subject":"HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured","message":"HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured\n\nc1dcad2d32d0252e8a3023d20311b52a187ecda3 added a new driver configured by\nHID_LENOVO_TPKBD but made the hid_have_special_driver entry non-optional which\nlead to a recognized but non-working device if the new driver wasn't\nconfigured (which is the correct default).\n\nSigned-off-by: Andres Freund <883768b6dd2c42aea0031b24be8a2da40fef4b64@anarazel.de>\nSigned-off-by: Jiri Kosina \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/hid\/hid-core.c\n+++ drivers\/hid\/hid-core.c\n@@ -1559,7 +1559,9 @@\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },\n- \t{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },\n+#if IS_ENABLED(CONFIG_HID_LENOVO_TPKBD)\n+\t{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },\n+#endif\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },\n \t{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },\n"} {"commit":"369932f6f840aedfbc717dd156bba7668a11d916","subject":"hwmon: (ad7418) Convert to a new-style i2c driver","message":"hwmon: (ad7418) Convert to a new-style i2c driver\n\nThe ad7418 driver is only used on embedded platforms where i2c\ndevices can easily be declared in platform code. Thus a new-style\ni2c driver makes perfect sense. This lets us get rid of quirky\ndetection code (these chips have no identification registers) and\nshrinks the binary driver size by 38%.\n\nSigned-off-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\nCc: Alessandro Zummo \n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/hwmon\/ad7418.c\n+++ drivers\/hwmon\/ad7418.c\n@@ -23,12 +23,9 @@\n \n #include \"lm75.h\"\n \n-#define DRV_VERSION \"0.3\"\n-\n-\/* Addresses to scan *\/\n-static const unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END };\n-\/* Insmod parameters *\/\n-I2C_CLIENT_INSMOD_3(ad7416, ad7417, ad7418);\n+#define DRV_VERSION \"0.4\"\n+\n+enum chips { ad7416, ad7417, ad7418 };\n \n \/* AD7418 registers *\/\n #define AD7418_REG_TEMP_IN\t0x00\n@@ -46,7 +43,6 @@\n \t\t\t\t\tAD7418_REG_TEMP_OS };\n \n struct ad7418_data {\n-\tstruct i2c_client\tclient;\n \tstruct device\t\t*hwmon_dev;\n \tstruct attribute_group\tattrs;\n \tenum chips\t\ttype;\n@@ -58,16 +54,25 @@\n \tu16\t\t\tin[4];\n };\n \n-static int ad7418_attach_adapter(struct i2c_adapter *adapter);\n-static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind);\n-static int ad7418_detach_client(struct i2c_client *client);\n+static int ad7418_probe(struct i2c_client *client,\n+\t\t\tconst struct i2c_device_id *id);\n+static int ad7418_remove(struct i2c_client *client);\n+\n+static const struct i2c_device_id ad7418_id[] = {\n+\t{ \"ad7416\", ad7416 },\n+\t{ \"ad7417\", ad7417 },\n+\t{ \"ad7418\", ad7418 },\n+\t{ }\n+};\n+MODULE_DEVICE_TABLE(i2c, ad7418_id);\n \n static struct i2c_driver ad7418_driver = {\n \t.driver = {\n \t\t.name\t= \"ad7418\",\n \t},\n-\t.attach_adapter\t= ad7418_attach_adapter,\n-\t.detach_client\t= ad7418_detach_client,\n+\t.probe\t\t= ad7418_probe,\n+\t.remove\t\t= ad7418_remove,\n+\t.id_table\t= ad7418_id,\n };\n \n \/* All registers are word-sized, except for the configuration registers.\n@@ -191,13 +196,6 @@\n static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 1);\n static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 2);\n static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 3);\n-\n-static int ad7418_attach_adapter(struct i2c_adapter *adapter)\n-{\n-\tif (!(adapter->class & I2C_CLASS_HWMON))\n-\t\treturn 0;\n-\treturn i2c_probe(adapter, &addr_data, ad7418_detect);\n-}\n \n static struct attribute *ad7416_attributes[] = {\n \t&sensor_dev_attr_temp1_max.dev_attr.attr,\n@@ -225,97 +223,45 @@\n \tNULL\n };\n \n-static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind)\n-{\n-\tstruct i2c_client *client;\n+static int ad7418_probe(struct i2c_client *client,\n+\t\t\t const struct i2c_device_id *id)\n+{\n+\tstruct i2c_adapter *adapter = client->adapter;\n \tstruct ad7418_data *data;\n-\tint err = 0;\n+\tint err;\n \n \tif (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |\n-\t\t\t\t\tI2C_FUNC_SMBUS_WORD_DATA))\n+\t\t\t\t\tI2C_FUNC_SMBUS_WORD_DATA)) {\n+\t\terr = -EOPNOTSUPP;\n \t\tgoto exit;\n+\t}\n \n \tif (!(data = kzalloc(sizeof(struct ad7418_data), GFP_KERNEL))) {\n \t\terr = -ENOMEM;\n \t\tgoto exit;\n \t}\n \n-\tclient = &data->client;\n-\tclient->addr = address;\n-\tclient->adapter = adapter;\n-\tclient->driver = &ad7418_driver;\n-\n \ti2c_set_clientdata(client, data);\n \n \tmutex_init(&data->lock);\n-\n-\t\/* AD7418 has a curious behaviour on registers 6 and 7. They\n-\t * both always read 0xC071 and are not documented on the datasheet.\n-\t * We use them to detect the chip.\n-\t *\/\n-\tif (kind <= 0) {\n-\t\tint reg, reg6, reg7;\n-\n-\t\t\/* the AD7416 lies within this address range, but I have\n-\t\t * no means to check.\n-\t\t *\/\n-\t\tif (address >= 0x48 && address <= 0x4f) {\n-\t\t\t\/* XXX add tests for AD7416 here *\/\n-\t\t\t\/* data->type = ad7416; *\/\n-\t\t}\n-\t\t\/* here we might have AD7417 or AD7418 *\/\n-\t\telse if (address >= 0x28 && address <= 0x2f) {\n-\t\t\treg6 = i2c_smbus_read_word_data(client, 0x06);\n-\t\t\treg7 = i2c_smbus_read_word_data(client, 0x07);\n-\n-\t\t\tif (address == 0x28 && reg6 == 0xC071 && reg7 == 0xC071)\n-\t\t\t\tdata->type = ad7418;\n-\n-\t\t\t\/* XXX add tests for AD7417 here *\/\n-\n-\n-\t\t\t\/* both AD7417 and AD7418 have bits 0-5 of\n-\t\t\t * the CONF2 register at 0\n-\t\t\t *\/\n-\t\t\treg = i2c_smbus_read_byte_data(client,\n-\t\t\t\t\t\t\tAD7418_REG_CONF2);\n-\t\t\tif (reg & 0x3F)\n-\t\t\t\tdata->type = any_chip; \/* detection failed *\/\n-\t\t}\n-\t} else {\n-\t\tdev_dbg(&adapter->dev, \"detection forced\\n\");\n-\t}\n-\n-\tif (kind > 0)\n-\t\tdata->type = kind;\n-\telse if (kind < 0 && data->type == any_chip) {\n-\t\terr = -ENODEV;\n-\t\tgoto exit_free;\n-\t}\n+\tdata->type = id->driver_data;\n \n \tswitch (data->type) {\n-\tcase any_chip:\n \tcase ad7416:\n \t\tdata->adc_max = 0;\n \t\tdata->attrs.attrs = ad7416_attributes;\n-\t\tstrlcpy(client->name, \"ad7416\", I2C_NAME_SIZE);\n \t\tbreak;\n \n \tcase ad7417:\n \t\tdata->adc_max = 4;\n \t\tdata->attrs.attrs = ad7417_attributes;\n-\t\tstrlcpy(client->name, \"ad7417\", I2C_NAME_SIZE);\n \t\tbreak;\n \n \tcase ad7418:\n \t\tdata->adc_max = 1;\n \t\tdata->attrs.attrs = ad7418_attributes;\n-\t\tstrlcpy(client->name, \"ad7418\", I2C_NAME_SIZE);\n \t\tbreak;\n \t}\n-\n-\tif ((err = i2c_attach_client(client)))\n-\t\tgoto exit_free;\n \n \tdev_info(&client->dev, \"%s chip found\\n\", client->name);\n \n@@ -324,7 +270,7 @@\n \n \t\/* Register sysfs hooks *\/\n \tif ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))\n-\t\tgoto exit_detach;\n+\t\tgoto exit_free;\n \n \tdata->hwmon_dev = hwmon_device_register(&client->dev);\n \tif (IS_ERR(data->hwmon_dev)) {\n@@ -336,20 +282,17 @@\n \n exit_remove:\n \tsysfs_remove_group(&client->dev.kobj, &data->attrs);\n-exit_detach:\n-\ti2c_detach_client(client);\n exit_free:\n \tkfree(data);\n exit:\n \treturn err;\n }\n \n-static int ad7418_detach_client(struct i2c_client *client)\n+static int ad7418_remove(struct i2c_client *client)\n {\n \tstruct ad7418_data *data = i2c_get_clientdata(client);\n \thwmon_device_unregister(data->hwmon_dev);\n \tsysfs_remove_group(&client->dev.kobj, &data->attrs);\n-\ti2c_detach_client(client);\n \tkfree(data);\n \treturn 0;\n }\n"} {"commit":"e20b4b38cdf1622d1577ae5e402ded2bd63bf616","subject":"hwmon: (ds1621) Convert to use devm_ functions","message":"hwmon: (ds1621) Convert to use devm_ functions\n\nConvert to use devm_ functions to reduce code size and simplify the code.\n\nSigned-off-by: Guenter Roeck \nAcked-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"5aebefb08682ebd67ea0b902950d00169e1451cb","subject":"hwmon: (w83793) remove duplicated defines","message":"hwmon: (w83793) remove duplicated defines\n\nRemove duplicated defines.\n\nSigned-off-by: Nicolas Kaiser <9c6450bbb5dc3209f15f8bb98630c23e1d8365d1@nikai.net>\nAcked-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\nSigned-off-by: Mark M. Hoffman <5aed555d2bd1319e6397948a784e5d0b93442eeb@lightlink.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/hwmon\/w83793.c\n+++ drivers\/hwmon\/w83793.c\n@@ -131,6 +131,7 @@\n #define PWM_DUTY\t\t\t0\n #define PWM_START\t\t\t1\n #define PWM_NONSTOP\t\t\t2\n+#define PWM_STOP_TIME\t\t\t3\n #define W83793_REG_PWM(index, nr)\t(((nr) == 0 ? 0xb3 : \\\n \t\t\t\t\t (nr) == 1 ? 0x220 : 0x218) + (index))\n \n@@ -407,10 +408,6 @@\n \treturn count;\n }\n \n-#define PWM_DUTY\t\t\t0\n-#define PWM_START\t\t\t1\n-#define PWM_NONSTOP\t\t\t2\n-#define PWM_STOP_TIME\t\t\t3\n static ssize_t\n show_pwm(struct device *dev, struct device_attribute *attr, char *buf)\n {\n"} {"commit":"2a2d27da00250c9f117e35653ed5a6a3212e5d77","subject":"hwmon: (w83795) Print the actual temperature channels as sources","message":"hwmon: (w83795) Print the actual temperature channels as sources\n\nDon't expose raw register values to user-space. Decode and encode\ntemperature channels selected as temperature sources as needed.\n\nSigned-off-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\nAcked-by: Guenter Roeck <32ce62c5480002985aec58d7044038218061ef55@ericsson.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/hwmon\/w83795.c\n+++ drivers\/hwmon\/w83795.c\n@@ -966,17 +966,18 @@\n \t to_sensor_dev_attr_2(attr);\n \tstruct w83795_data *data = w83795_update_pwm_config(dev);\n \tint index = sensor_attr->index;\n-\tu8 val = index \/ 2;\n-\tu8 tmp = data->temp_src[val];\n+\tu8 tmp = data->temp_src[index \/ 2];\n \n \tif (index & 1)\n-\t\tval = 4;\n+\t\ttmp >>= 4;\t\/* Pick high nibble *\/\n \telse\n-\t\tval = 0;\n-\ttmp >>= val;\n-\ttmp &= 0x0f;\n-\n-\treturn sprintf(buf, \"%u\\n\", tmp);\n+\t\ttmp &= 0x0f;\t\/* Pick low nibble *\/\n+\n+\t\/* Look-up the actual temperature channel number *\/\n+\tif (tmp >= 4 || tss_map[tmp][index] == TSS_MAP_RESERVED)\n+\t\treturn -EINVAL;\t\t\/* Shouldn't happen *\/\n+\n+\treturn sprintf(buf, \"%u\\n\", (unsigned int)tss_map[tmp][index] + 1);\n }\n \n static ssize_t\n@@ -988,12 +989,21 @@\n \tstruct sensor_device_attribute_2 *sensor_attr =\n \t to_sensor_dev_attr_2(attr);\n \tint index = sensor_attr->index;\n-\tunsigned long tmp;\n+\tint tmp;\n+\tunsigned long channel;\n \tu8 val = index \/ 2;\n \n-\tif (strict_strtoul(buf, 10, &tmp) < 0)\n+\tif (strict_strtoul(buf, 10, &channel) < 0 ||\n+\t channel < 1 || channel > 14)\n \t\treturn -EINVAL;\n-\ttmp = SENSORS_LIMIT(tmp, 0, 15);\n+\n+\t\/* Check if request can be fulfilled *\/\n+\tfor (tmp = 0; tmp < 4; tmp++) {\n+\t\tif (tss_map[tmp][index] == channel - 1)\n+\t\t\tbreak;\n+\t}\n+\tif (tmp == 4)\t\/* No match *\/\n+\t\treturn -EINVAL;\n \n \tmutex_lock(&data->update_lock);\n \tif (index & 1) {\n"} {"commit":"4663349fff436e92a0a54b35a2ac235ad6f6c46c","subject":"Remove the boost include in HelperMathFunciton.h","message":"Remove the boost include in HelperMathFunciton.h\n","repos":"JPETTomography\/j-pet-framework,alexkernphysiker\/j-pet-framework,alexkernphysiker\/j-pet-framework,alexkernphysiker\/j-pet-framework,alexkernphysiker\/j-pet-framework,JPETTomography\/j-pet-framework,JPETTomography\/j-pet-framework,alexkernphysiker\/j-pet-framework","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- JPetSimplePhysSignalReco\/HelperMathFunctions.h\n+++ JPetSimplePhysSignalReco\/HelperMathFunctions.h\n@@ -20,7 +20,7 @@\n \/\/This line below should be included in Boost 1.64\n \/\/To fix this bug in ublast: https:\/\/svn.boost.org\/trac10\/ticket\/12978\n \/\/However It does not exit in 1.54 which is used currently in travis\n-#include \n+\/\/#include \n #include \n #include \n \n"} {"commit":"ff94c742dfeea3110f1e1d27399d728f8494d29e","subject":"net: phy: fix semicolon.cocci warnings","message":"net: phy: fix semicolon.cocci warnings\n\ndrivers\/net\/phy\/smsc.c:127:3-4: Unneeded semicolon\n\n Remove unneeded semicolon.\n\nGenerated by: scripts\/coccinelle\/misc\/semicolon.cocci\n\nCC: Igor Plyatov <33199fad36ef2282ea2e142c0e7a80c26a43bfce@gmail.com>\nSigned-off-by: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nSigned-off-by: David S. Miller \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"3a8205ead4dc4b05fbc164eeb852b8f8921d11d3","subject":"ucc_geth: fixes for ucc_geth_memclean","message":"ucc_geth: fixes for ucc_geth_memclean\n\nThe ucc_geth_memclean function can be called before the Tx BD rings, Rx\nBD rings and associated socket buffers are allocated (for example if\nucc_fast_init fails). The current code doesn't check if p_tx_bd_ring[i]\nis null, generating a kernel panic when trying to free the associated\nsocket buffers.\n\nThe function can also fail when accessing the uninitialized list_head\nstructures ugeth->group_hash_q and ugeth->ind_hash_q. In the current\nimplementation the list heads are initialized only when\nmaxGroupAddrInHash and maxIndAddrInHash are positive values, although I\nthink it's better to always initialize them.\n\nSigned-off-by: Ionut Nicu \nSigned-off-by: Kim Phillips <4dbb162515b917285c0a29b08c706fd5ea64dadc@freescale.com>\nSigned-off-by: Jeff Garzik \n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ucc_geth.c\n+++ drivers\/net\/ucc_geth.c\n@@ -2133,6 +2133,8 @@\n \t}\n \tfor (i = 0; i < ugeth->ug_info->numQueuesTx; i++) {\n \t\tbd = ugeth->p_tx_bd_ring[i];\n+\t\tif (!bd)\n+\t\t\tcontinue;\n \t\tfor (j = 0; j < ugeth->ug_info->bdRingLenTx[i]; j++) {\n \t\t\tif (ugeth->tx_skbuff[i][j]) {\n \t\t\t\tdma_unmap_single(NULL,\n@@ -2299,6 +2301,10 @@\n \n \tug_info = ugeth->ug_info;\n \tuf_info = &ug_info->uf_info;\n+\n+\t\/* Create CQs for hash tables *\/\n+\tINIT_LIST_HEAD(&ugeth->group_hash_q);\n+\tINIT_LIST_HEAD(&ugeth->ind_hash_q);\n \n \tif (!((uf_info->bd_mem_part == MEM_PART_SYSTEM) ||\n \t (uf_info->bd_mem_part == MEM_PART_MURAM))) {\n@@ -3132,13 +3138,6 @@\n \t\tfor (j = 0; j < NUM_OF_PADDRS; j++)\n \t\t\tugeth_82xx_filtering_clear_addr_in_paddr(ugeth, (u8) j);\n \n-\t\t\/* Create CQs for hash tables *\/\n-\t\tif (ug_info->maxGroupAddrInHash > 0) {\n-\t\t\tINIT_LIST_HEAD(&ugeth->group_hash_q);\n-\t\t}\n-\t\tif (ug_info->maxIndAddrInHash > 0) {\n-\t\t\tINIT_LIST_HEAD(&ugeth->ind_hash_q);\n-\t\t}\n \t\tp_82xx_addr_filt =\n \t\t (struct ucc_geth_82xx_address_filtering_pram *) ugeth->\n \t\t p_rx_glbl_pram->addressfiltering;\n"} {"commit":"8766ad0ce8621aa6f0e4a91ef355509cc3364d5b","subject":"rtc: dont reference pnp_resource_table directly","message":"rtc: dont reference pnp_resource_table directly\n\npnp_resource_table is going away soon, so use the more\ngeneric public interfaces instead.\n\nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nAcked-By: Rene Herman \nSigned-off-by: Len Brown \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/rtc\/rtc-cmos.c\n+++ drivers\/rtc\/rtc-cmos.c\n@@ -854,11 +854,12 @@\n \t\t * don't define the IRQ. It should always be safe to\n \t\t * hardcode it in these cases\n \t\t *\/\n-\t\treturn cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8);\n+\t\treturn cmos_do_probe(&pnp->dev,\n+\t\t\t\tpnp_get_resource(pnp, IORESOURCE_IO, 0), 8);\n \telse\n \t\treturn cmos_do_probe(&pnp->dev,\n-\t\t\t\t &pnp->res.port_resource[0],\n-\t\t\t\t pnp->res.irq_resource[0].start);\n+\t\t\t\tpnp_get_resource(pnp, IORESOURCE_IO, 0),\n+\t\t\t\tpnp_irq(pnp, 0));\n }\n \n static void __exit cmos_pnp_remove(struct pnp_dev *pnp)\n"} {"commit":"19412ce9fcc9ca2d0f5b62af15c63381f0ac9657","subject":"drivers\/rtc\/rtc-omap.c: fix a memory leak","message":"drivers\/rtc\/rtc-omap.c: fix a memory leak\n\nrequest_mem_region() will call kzalloc to allocate memory for struct\nresource. release_resource() unregisters the resource but does not free\nthe allocated memory, thus use release_mem_region() instead to fix the\nmemory leak.\n\nAlso add a missing iounmap() in omap_rtc_remove().\n\nSigned-off-by: Axel Lin \nCc: Alessandro Zummo \nCc: Sekhar Nori <946cfb81282bb55c59f600e7ee3d3b2c6973f7a3@ti.com>\nCc: Kevin Hilman \nCc: Tony Lindgren <1001e8702733cced254345e193c88aaa47a4f5de@atomide.com>\nAcked-by: Mark A. Greer <2540a8c57225c2058d000de41debc8b502ea4a38@mvista.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/rtc\/rtc-omap.c\n+++ drivers\/rtc\/rtc-omap.c\n@@ -429,13 +429,14 @@\n fail0:\n \tiounmap(rtc_base);\n fail:\n-\trelease_resource(mem);\n+\trelease_mem_region(mem->start, resource_size(mem));\n \treturn -EIO;\n }\n \n static int __exit omap_rtc_remove(struct platform_device *pdev)\n {\n \tstruct rtc_device\t*rtc = platform_get_drvdata(pdev);\n+\tstruct resource\t\t*mem = dev_get_drvdata(&rtc->dev);\n \n \tdevice_init_wakeup(&pdev->dev, 0);\n \n@@ -447,8 +448,9 @@\n \tif (omap_rtc_timer != omap_rtc_alarm)\n \t\tfree_irq(omap_rtc_alarm, rtc);\n \n-\trelease_resource(dev_get_drvdata(&rtc->dev));\n \trtc_device_unregister(rtc);\n+\tiounmap(rtc_base);\n+\trelease_mem_region(mem->start, resource_size(mem));\n \treturn 0;\n }\n \n"} {"commit":"52fbc7796a6936dac4189f7ebda7ae7c2c813ad2","subject":"rtc: rtc-tile: add missing platform_device_unregister() when module exit","message":"rtc: rtc-tile: add missing platform_device_unregister() when module exit\n\nWe have registered platform device when module init, and\nneed unregister it when module exit.\n\nSigned-off-by: Wei Yongjun \nSigned-off-by: Chris Metcalf <074881f6f5da4d3b5278870ff234d1077ee622c0@tilera.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/rtc\/rtc-tile.c\n+++ drivers\/rtc\/rtc-tile.c\n@@ -151,6 +151,7 @@\n *\/\n static void __exit tile_rtc_driver_exit(void)\n {\n+\tplatform_device_unregister(tile_rtc_platform_device);\n \tplatform_driver_unregister(&tile_rtc_platform_driver);\n }\n \n"} {"commit":"cd1981ea04c355e471be6af92a3045bee58ef10d","subject":"rtc\/qmsi: use new DEVICE_AND_API_INIT()","message":"rtc\/qmsi: use new DEVICE_AND_API_INIT()\n\nChange-Id: Ic780b87e7f9372af970d24443d1a231a2f2c513f\nSigned-off-by: Daniel Leung \n","repos":"punitvara\/zephyr,mbolivar\/zephyr,nashif\/zephyr,bigdinotech\/zephyr,32bitmicro\/zephyr,aceofall\/zephyr-iotos,mbolivar\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,mirzak\/zephyr-os,nashif\/zephyr,kraj\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,mirzak\/zephyr-os,mirzak\/zephyr-os,zephyriot\/zephyr,mirzak\/zephyr-os,zephyriot\/zephyr,galak\/zephyr,bboozzoo\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,kraj\/zephyr,tidyjiang8\/zephyr-doc,ldts\/zephyr,explora26\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,bboozzoo\/zephyr,Vudentz\/zephyr,nashif\/zephyr,GiulianoFranchetto\/zephyr,sharronliu\/zephyr,zephyriot\/zephyr,ldts\/zephyr,Vudentz\/zephyr,tidyjiang8\/zephyr-doc,bboozzoo\/zephyr,zephyrproject-rtos\/zephyr,runchip\/zephyr-cc3200,32bitmicro\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,fbsder\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3200,erwango\/zephyr,erwango\/zephyr,rsalveti\/zephyr,fbsder\/zephyr,pklazy\/zephyr,32bitmicro\/zephyr,rsalveti\/zephyr,bigdinotech\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,pklazy\/zephyr,32bitmicro\/zephyr,holtmann\/zephyr,32bitmicro\/zephyr,bigdinotech\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,kraj\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,holtmann\/zephyr,fbsder\/zephyr,rsalveti\/zephyr,holtmann\/zephyr,galak\/zephyr,ldts\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,pklazy\/zephyr,tidyjiang8\/zephyr-doc,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3200,runchip\/zephyr-cc3220,punitvara\/zephyr,zephyrproject-rtos\/zephyr,runchip\/zephyr-cc3220,punitvara\/zephyr,finikorg\/zephyr,tidyjiang8\/zephyr-doc,sharronliu\/zephyr,aceofall\/zephyr-iotos,fractalclone\/zephyr-riscv,holtmann\/zephyr,Vudentz\/zephyr,sharronliu\/zephyr,kraj\/zephyr,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos,zephyriot\/zephyr,erwango\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,runchip\/zephyr-cc3220,erwango\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,aceofall\/zephyr-iotos,holtmann\/zephyr,zephyriot\/zephyr,erwango\/zephyr,tidyjiang8\/zephyr-doc,finikorg\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,explora26\/zephyr,galak\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3200,finikorg\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3220,fractalclone\/zephyr-riscv,fractalclone\/zephyr-riscv,nashif\/zephyr,galak\/zephyr,fbsder\/zephyr,pklazy\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,sharronliu\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/rtc\/rtc_qmsi.c\n+++ drivers\/rtc\/rtc_qmsi.c\n@@ -90,11 +90,11 @@\n \t\/* Route RTC interrupt to Lakemont *\/\n \tQM_SCSS_INT->int_rtc_mask &= ~BIT(0);\n \n-\tdev->driver_api = &api;\n \treturn 0;\n }\n \n-DEVICE_INIT(rtc, CONFIG_RTC_DRV_NAME, &rtc_qmsi_init, NULL, NULL,\n-\t\t\tSECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);\n+DEVICE_AND_API_INIT(rtc, CONFIG_RTC_DRV_NAME, &rtc_qmsi_init, NULL, NULL,\n+\t\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\n+\t\t (void *)&api);\n \n static struct device *rtc_qmsi_dev = DEVICE_GET(rtc);\n"} {"commit":"683c5418e6ac9f40f925dab6f547a5b0a4ad43c6","subject":"[S390] cio: suppress chpid event in case of configure error","message":"[S390] cio: suppress chpid event in case of configure error\n\nDo not send CHP_ONLINE\/CHP_OFFLINE events to subchannel drivers when a\nchannel-path configure request failed.\n\nSigned-off-by: Peter Oberparleiter \nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\nSigned-off-by: Heiko Carstens <8dcf0f69152f32f23184f83357a3731522e56b9c@de.ibm.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/s390\/cio\/chp.c\n+++ drivers\/s390\/cio\/chp.c\n@@ -624,6 +624,7 @@\n {\n \tstruct chp_id chpid;\n \tenum cfg_task_t t;\n+\tint rc;\n \n \tmutex_lock(&cfg_lock);\n \tt = cfg_none;\n@@ -638,14 +639,24 @@\n \n \tswitch (t) {\n \tcase cfg_configure:\n-\t\tsclp_chp_configure(chpid);\n-\t\tinfo_expire();\n-\t\tchsc_chp_online(chpid);\n+\t\trc = sclp_chp_configure(chpid);\n+\t\tif (rc)\n+\t\t\tCIO_MSG_EVENT(2, \"chp: sclp_chp_configure(%x.%02x)=\"\n+\t\t\t\t \"%d\\n\", chpid.cssid, chpid.id, rc);\n+\t\telse {\n+\t\t\tinfo_expire();\n+\t\t\tchsc_chp_online(chpid);\n+\t\t}\n \t\tbreak;\n \tcase cfg_deconfigure:\n-\t\tsclp_chp_deconfigure(chpid);\n-\t\tinfo_expire();\n-\t\tchsc_chp_offline(chpid);\n+\t\trc = sclp_chp_deconfigure(chpid);\n+\t\tif (rc)\n+\t\t\tCIO_MSG_EVENT(2, \"chp: sclp_chp_deconfigure(%x.%02x)=\"\n+\t\t\t\t \"%d\\n\", chpid.cssid, chpid.id, rc);\n+\t\telse {\n+\t\t\tinfo_expire();\n+\t\t\tchsc_chp_offline(chpid);\n+\t\t}\n \t\tbreak;\n \tcase cfg_none:\n \t\t\/* Get updated information after last change. *\/\n"} {"commit":"c99fc5dadcd87e8b97613f50c48407678b731cfb","subject":"[S390] convert lcs printks to dev_xxx and pr_xxx macros.","message":"[S390] convert lcs printks to dev_xxx and pr_xxx macros.\n\nSigned-off-by: Klaus-D. Wacker <918513dd2744cee2b80d5e68037ab762f2374248@de.ibm.com>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/s390\/net\/lcs.c\n+++ drivers\/s390\/net\/lcs.c\n@@ -26,6 +26,9 @@\n * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n *\/\n \n+#define KMSG_COMPONENT\t\t\"lcs\"\n+#define pr_fmt(fmt) KMSG_COMPONENT \": \" fmt\n+\n #include \n #include \n #include \n@@ -54,8 +57,6 @@\n #error Cannot compile lcs.c without some net devices switched on.\n #endif\n \n-#define PRINTK_HEADER\t\t\" lcs: \"\n-\n \/**\n * initialization string for output\n *\/\n@@ -96,7 +97,7 @@\n \tlcs_dbf_setup = debug_register(\"lcs_setup\", 2, 1, 8);\n \tlcs_dbf_trace = debug_register(\"lcs_trace\", 4, 1, 8);\n \tif (lcs_dbf_setup == NULL || lcs_dbf_trace == NULL) {\n-\t\tPRINT_ERR(\"Not enough memory for debug facility.\\n\");\n+\t\tpr_err(\"Not enough memory for debug facility.\\n\");\n \t\tlcs_unregister_debug_facility();\n \t\treturn -ENOMEM;\n \t}\n@@ -503,7 +504,9 @@\n \tif (rc) {\n \t\tLCS_DBF_TEXT_(4,trace,\"essh%s\",\n \t\t\t dev_name(&channel->ccwdev->dev));\n-\t\tPRINT_ERR(\"Error in starting channel, rc=%d!\\n\", rc);\n+\t\tdev_err(&channel->ccwdev->dev,\n+\t\t\t\"Starting an LCS device resulted in an error,\"\n+\t\t\t\" rc=%d!\\n\", rc);\n \t}\n \treturn rc;\n }\n@@ -640,7 +643,9 @@\n \tif (rc) {\n \t\tLCS_DBF_TEXT_(4, trace, \"ersc%s\",\n \t\t\t dev_name(&channel->ccwdev->dev));\n-\t\tPRINT_ERR(\"Error in lcs_resume_channel: rc=%d\\n\",rc);\n+\t\tdev_err(&channel->ccwdev->dev,\n+\t\t\t\"Sending data from the LCS device to the LAN failed\"\n+\t\t\t\" with rc=%d\\n\",rc);\n \t} else\n \t\tchannel->state = LCS_CH_STATE_RUNNING;\n \treturn rc;\n@@ -1086,7 +1091,7 @@\n \tcmd->cmd.lcs_qipassist.num_ip_pairs = 1;\n \trc = lcs_send_lancmd(card, buffer, __lcs_check_multicast_cb);\n \tif (rc != 0) {\n-\t\tPRINT_ERR(\"Query IPAssist failed. Assuming unsupported!\\n\");\n+\t\tpr_err(\"Query IPAssist failed. Assuming unsupported!\\n\");\n \t\treturn -EOPNOTSUPP;\n \t}\n \tif (card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT)\n@@ -1119,8 +1124,8 @@\n \t\t\trc = lcs_send_setipm(card, ipm);\n \t\t\tspin_lock_irqsave(&card->ipm_lock, flags);\n \t\t\tif (rc) {\n-\t\t\t\tPRINT_INFO(\"Adding multicast address failed. \"\n-\t\t\t\t\t \"Table possibly full!\\n\");\n+\t\t\t\tpr_info(\"Adding multicast address failed.\"\n+\t\t\t\t\t\" Table possibly full!\\n\");\n \t\t\t\t\/* store ipm in failed list -> will be added\n \t\t\t\t * to ipm_list again, so a retry will be done\n \t\t\t\t * during the next call of this function *\/\n@@ -1231,8 +1236,8 @@\n \t\tipm = (struct lcs_ipm_list *)\n \t\t\tkzalloc(sizeof(struct lcs_ipm_list), GFP_ATOMIC);\n \t\tif (ipm == NULL) {\n-\t\t\tPRINT_INFO(\"Not enough memory to add \"\n-\t\t\t\t \"new multicast entry!\\n\");\n+\t\t\tpr_info(\"Not enough memory to add\"\n+\t\t\t\t\" new multicast entry!\\n\");\n \t\t\tbreak;\n \t\t}\n \t\tmemcpy(&ipm->ipm.mac_addr, buf, LCS_MAC_LENGTH);\n@@ -1306,18 +1311,21 @@\n \n \tswitch (PTR_ERR(irb)) {\n \tcase -EIO:\n-\t\tPRINT_WARN(\"i\/o-error on device %s\\n\", dev_name(&cdev->dev));\n+\t\tdev_warn(&cdev->dev,\n+\t\t\t\"An I\/O-error occurred on the LCS device\\n\");\n \t\tLCS_DBF_TEXT(2, trace, \"ckirberr\");\n \t\tLCS_DBF_TEXT_(2, trace, \" rc%d\", -EIO);\n \t\tbreak;\n \tcase -ETIMEDOUT:\n-\t\tPRINT_WARN(\"timeout on device %s\\n\", dev_name(&cdev->dev));\n+\t\tdev_warn(&cdev->dev,\n+\t\t\t\"A command timed out on the LCS device\\n\");\n \t\tLCS_DBF_TEXT(2, trace, \"ckirberr\");\n \t\tLCS_DBF_TEXT_(2, trace, \" rc%d\", -ETIMEDOUT);\n \t\tbreak;\n \tdefault:\n-\t\tPRINT_WARN(\"unknown error %ld on device %s\\n\", PTR_ERR(irb),\n-\t\t\t dev_name(&cdev->dev));\n+\t\tdev_warn(&cdev->dev,\n+\t\t\t\"An error occurred on the LCS device, rc=%ld\\n\",\n+\t\t\tPTR_ERR(irb));\n \t\tLCS_DBF_TEXT(2, trace, \"ckirberr\");\n \t\tLCS_DBF_TEXT(2, trace, \" rc???\");\n \t}\n@@ -1403,8 +1411,10 @@\n \t\/* Check for channel and device errors presented *\/\n \trc = lcs_get_problem(cdev, irb);\n \tif (rc || (dstat & DEV_STAT_UNIT_EXCEP)) {\n-\t\tPRINT_WARN(\"check on device %s, dstat=0x%X, cstat=0x%X \\n\",\n-\t\t\t dev_name(&cdev->dev), dstat, cstat);\n+\t\tdev_warn(&cdev->dev,\n+\t\t\t\"The LCS device stopped because of an error,\"\n+\t\t\t\" dstat=0x%X, cstat=0x%X \\n\",\n+\t\t\t dstat, cstat);\n \t\tif (rc) {\n \t\t\tchannel->state = LCS_CH_STATE_ERROR;\n \t\t}\n@@ -1761,8 +1771,8 @@\n \t\t\tlcs_schedule_recovery(card);\n \t\t\tbreak;\n \t\tcase LCS_CMD_STOPLAN:\n-\t\t\tPRINT_WARN(\"Stoplan for %s initiated by LGW.\\n\",\n-\t\t\t\t\tcard->dev->name);\n+\t\t\tpr_warning(\"Stoplan for %s initiated by LGW.\\n\",\n+\t\t\t\t card->dev->name);\n \t\t\tif (card->dev)\n \t\t\t\tnetif_carrier_off(card->dev);\n \t\t\tbreak;\n@@ -1790,7 +1800,8 @@\n \n \tskb = dev_alloc_skb(skb_len);\n \tif (skb == NULL) {\n-\t\tPRINT_ERR(\"LCS: alloc_skb failed for device=%s\\n\",\n+\t\tdev_err(&card->dev->dev,\n+\t\t\t\" Allocating a socket buffer to interface %s failed\\n\",\n \t\t\t card->dev->name);\n \t\tcard->stats.rx_dropped++;\n \t\treturn;\n@@ -1886,7 +1897,8 @@\n \t\t(card->write.state != LCS_CH_STATE_RUNNING));\n \trc = lcs_stopcard(card);\n \tif (rc)\n-\t\tPRINT_ERR(\"Try it again!\\n \");\n+\t\tdev_err(&card->dev->dev,\n+\t\t\t\" Shutting down the LCS device failed\\n \");\n \treturn rc;\n }\n \n@@ -1905,7 +1917,7 @@\n \t\/* initialize statistics *\/\n \trc = lcs_detect(card);\n \tif (rc) {\n-\t\tPRINT_ERR(\"LCS:Error in opening device!\\n\");\n+\t\tpr_err(\"Error in opening device!\\n\");\n \n \t} else {\n \t\tdev->flags |= IFF_UP;\n@@ -2113,8 +2125,9 @@\n \trc = lcs_detect(card);\n \tif (rc) {\n \t\tLCS_DBF_TEXT(2, setup, \"dtctfail\");\n-\t\tPRINT_WARN(\"Detection of LCS card failed with return code \"\n-\t\t\t \"%d (0x%x)\\n\", rc, rc);\n+\t\tdev_err(&card->dev->dev,\n+\t\t\t\"Detecting a network adapter for LCS devices\"\n+\t\t\t\" failed with rc=%d (0x%x)\\n\", rc, rc);\n \t\tlcs_stopcard(card);\n \t\tgoto out;\n \t}\n@@ -2144,7 +2157,7 @@\n #endif\n \tdefault:\n \t\tLCS_DBF_TEXT(3, setup, \"errinit\");\n-\t\tPRINT_ERR(\"LCS: Initialization failed\\n\");\n+\t\tpr_err(\" Initialization failed\\n\");\n \t\tgoto out;\n \t}\n \tif (!dev)\n@@ -2176,13 +2189,13 @@\n \t\tgoto out;\n \n \t\/* Print out supported assists: IPv6 *\/\n-\tPRINT_INFO(\"LCS device %s %s IPv6 support\\n\", card->dev->name,\n-\t\t (card->ip_assists_supported & LCS_IPASS_IPV6_SUPPORT) ?\n-\t\t \"with\" : \"without\");\n+\tpr_info(\"LCS device %s %s IPv6 support\\n\", card->dev->name,\n+\t\t(card->ip_assists_supported & LCS_IPASS_IPV6_SUPPORT) ?\n+\t\t\"with\" : \"without\");\n \t\/* Print out supported assist: Multicast *\/\n-\tPRINT_INFO(\"LCS device %s %s Multicast support\\n\", card->dev->name,\n-\t\t (card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT) ?\n-\t\t \"with\" : \"without\");\n+\tpr_info(\"LCS device %s %s Multicast support\\n\", card->dev->name,\n+\t\t(card->ip_assists_supported & LCS_IPASS_MULTICAST_SUPPORT) ?\n+\t\t\"with\" : \"without\");\n \treturn 0;\n out:\n \n@@ -2248,15 +2261,16 @@\n \t\treturn 0;\n \tLCS_DBF_TEXT(4, trace, \"recover2\");\n \tgdev = card->gdev;\n-\tPRINT_WARN(\"Recovery of device %s started...\\n\", dev_name(&gdev->dev));\n+\tdev_warn(&gdev->dev,\n+\t\t\"A recovery process has been started for the LCS device\\n\");\n \trc = __lcs_shutdown_device(gdev, 1);\n \trc = lcs_new_device(gdev);\n \tif (!rc)\n-\t\tPRINT_INFO(\"Device %s successfully recovered!\\n\",\n-\t\t\t\tcard->dev->name);\n+\t\tpr_info(\"Device %s successfully recovered!\\n\",\n+\t\t\tcard->dev->name);\n \telse\n-\t\tPRINT_INFO(\"Device %s could not be recovered!\\n\",\n-\t\t\t\tcard->dev->name);\n+\t\tpr_info(\"Device %s could not be recovered!\\n\",\n+\t\t\tcard->dev->name);\n \tlcs_clear_thread_running_bit(card, LCS_RECOVERY_THREAD);\n \treturn 0;\n }\n@@ -2308,17 +2322,17 @@\n {\n \tint rc;\n \n-\tPRINT_INFO(\"Loading %s\\n\",version);\n+\tpr_info(\"Loading %s\\n\", version);\n \trc = lcs_register_debug_facility();\n \tLCS_DBF_TEXT(0, setup, \"lcsinit\");\n \tif (rc) {\n-\t\tPRINT_ERR(\"Initialization failed\\n\");\n+\t\tpr_err(\"Initialization failed\\n\");\n \t\treturn rc;\n \t}\n \n \trc = register_cu3088_discipline(&lcs_group_driver);\n \tif (rc) {\n-\t\tPRINT_ERR(\"Initialization failed\\n\");\n+\t\tpr_err(\"Initialization failed\\n\");\n \t\treturn rc;\n \t}\n \treturn 0;\n@@ -2331,7 +2345,7 @@\n static void\n __exit lcs_cleanup_module(void)\n {\n-\tPRINT_INFO(\"Terminating lcs module.\\n\");\n+\tpr_info(\"Terminating lcs module.\\n\");\n \tLCS_DBF_TEXT(0, trace, \"cleanup\");\n \tunregister_cu3088_discipline(&lcs_group_driver);\n \tlcs_unregister_debug_facility();\n"} {"commit":"09e13e91670b69736b5da0a869a076a55a326394","subject":"[SCSI] m68k: mac_esp asm fix","message":"[SCSI] m68k: mac_esp asm fix\n\nFix asm constraints and arguments so as not to transfer an odd byte when\nthere may be more words to transfer. The bug would probably also cause\nexceptions sometimes by transferring one too many bytes.\n\nSigned-off-by: Finn Thain <94052abb058aed443995dc4f8d236e022112765d@telegraphics.com.au>\nSigned-off-by: Geert Uytterhoeven <0da414d9d963da4039c2a0525b1844228075aa58@linux-m68k.org>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@HansenPartnership.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/mac_esp.c\n+++ drivers\/scsi\/mac_esp.c\n@@ -170,7 +170,7 @@\n \n #define MAC_ESP_PDMA_LOOP(operands) \\\n \tasm volatile ( \\\n-\t \" tstw %2 \\n\" \\\n+\t \" tstw %1 \\n\" \\\n \t \" jbeq 20f \\n\" \\\n \t \"1: movew \" operands \" \\n\" \\\n \t \"2: movew \" operands \" \\n\" \\\n@@ -188,14 +188,14 @@\n \t \"14: movew \" operands \" \\n\" \\\n \t \"15: movew \" operands \" \\n\" \\\n \t \"16: movew \" operands \" \\n\" \\\n-\t \" subqw #1,%2 \\n\" \\\n+\t \" subqw #1,%1 \\n\" \\\n \t \" jbne 1b \\n\" \\\n-\t \"20: tstw %3 \\n\" \\\n+\t \"20: tstw %2 \\n\" \\\n \t \" jbeq 30f \\n\" \\\n \t \"21: movew \" operands \" \\n\" \\\n-\t \" subqw #1,%3 \\n\" \\\n+\t \" subqw #1,%2 \\n\" \\\n \t \" jbne 21b \\n\" \\\n-\t \"30: tstw %4 \\n\" \\\n+\t \"30: tstw %3 \\n\" \\\n \t \" jbeq 40f \\n\" \\\n \t \"31: moveb \" operands \" \\n\" \\\n \t \"32: nop \\n\" \\\n@@ -223,8 +223,8 @@\n \t \" .long 31b,40b \\n\" \\\n \t \" .long 32b,40b \\n\" \\\n \t \" .previous \\n\" \\\n-\t : \"+a\" (addr) \\\n-\t : \"a\" (mep->pdma_io), \"r\" (count32), \"r\" (count2), \"g\" (esp_count))\n+\t : \"+a\" (addr), \"+r\" (count32), \"+r\" (count2) \\\n+\t : \"g\" (count1), \"a\" (mep->pdma_io))\n \n static void mac_esp_send_pdma_cmd(struct esp *esp, u32 addr, u32 esp_count,\n \t\t\t\t u32 dma_count, int write, u8 cmd)\n@@ -247,19 +247,20 @@\n \tdo {\n \t\tunsigned int count32 = esp_count >> 5;\n \t\tunsigned int count2 = (esp_count & 0x1F) >> 1;\n+\t\tunsigned int count1 = esp_count & 1;\n \t\tunsigned int start_addr = addr;\n \n \t\tif (mac_esp_wait_for_dreq(esp))\n \t\t\tbreak;\n \n \t\tif (write) {\n-\t\t\tMAC_ESP_PDMA_LOOP(\"%1@,%0@+\");\n+\t\t\tMAC_ESP_PDMA_LOOP(\"%4@,%0@+\");\n \n \t\t\tesp_count -= addr - start_addr;\n \t\t} else {\n \t\t\tunsigned int n;\n \n-\t\t\tMAC_ESP_PDMA_LOOP(\"%0@+,%1@\");\n+\t\t\tMAC_ESP_PDMA_LOOP(\"%0@+,%4@\");\n \n \t\t\tif (mac_esp_wait_for_empty_fifo(esp))\n \t\t\t\tbreak;\n"} {"commit":"490c97747d5dc77dfb5826e2823b41d8b2ef7ecc","subject":"spi: rspi: Add runtime PM support, using spi core auto_runtime_pm","message":"spi: rspi: Add runtime PM support, using spi core auto_runtime_pm\n\nSigned-off-by: Geert Uytterhoeven \nSigned-off-by: Mark Brown \n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6034a080f98b0bbc0a058e2ac65a538f75cffeee","subject":"[PATCH] Use driver_for_each_device() instead of manually walking list.","message":"[PATCH] Use driver_for_each_device() instead of manually walking list.\n\nSigned-off-by: Patrick Mochel \nSigned-off-by: Greg Kroah-Hartman \n\nIndex: gregkh-2.6\/drivers\/usb\/core\/usb.c\n===================================================================\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/core\/usb.c\n+++ drivers\/usb\/core\/usb.c\n@@ -462,6 +462,25 @@\n \treturn NULL;\n }\n \n+\n+static int __find_interface(struct device * dev, void * data)\n+{\n+\tstruct usb_interface ** ret = (struct usb_interface **)data;\n+\tstruct usb_interface * intf = *ret;\n+\tint *minor = (int *)data;\n+\n+\t\/* can't look at usb devices, only interfaces *\/\n+\tif (dev->driver == &usb_generic_driver)\n+\t\treturn 0;\n+\n+\tintf = to_usb_interface(dev);\n+\tif (intf->minor != -1 && intf->minor == *minor) {\n+\t\t*ret = intf;\n+\t\treturn 1;\n+\t}\n+\treturn 0;\n+}\n+\n \/**\n * usb_find_interface - find usb_interface pointer for driver and device\n * @drv: the driver whose current configuration is considered\n@@ -473,26 +492,12 @@\n *\/\n struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)\n {\n-\tstruct list_head *entry;\n-\tstruct device *dev;\n-\tstruct usb_interface *intf;\n-\n-\tlist_for_each(entry, &drv->driver.devices) {\n-\t\tdev = container_of(entry, struct device, driver_list);\n-\n-\t\t\/* can't look at usb devices, only interfaces *\/\n-\t\tif (dev->driver == &usb_generic_driver)\n-\t\t\tcontinue;\n-\n-\t\tintf = to_usb_interface(dev);\n-\t\tif (intf->minor == -1)\n-\t\t\tcontinue;\n-\t\tif (intf->minor == minor)\n-\t\t\treturn intf;\n-\t}\n-\n-\t\/* no device found that matches *\/\n-\treturn NULL;\t\n+\tstruct usb_interface *intf = (struct usb_interface *)minor;\n+\tint ret;\n+\n+\tret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface);\n+\n+\treturn ret ? intf : NULL;\n }\n \n static int usb_device_match (struct device *dev, struct device_driver *drv)\n"} {"commit":"4959212c18669f254daa0ae796ad676b67939ba2","subject":"s3c-fb: add support for runtime pm","message":"s3c-fb: add support for runtime pm\n\nThis patch adds support for runtime pm using the functions.\n - pm_runtime_get_sync()\n - pm_runtime_put_sync()\n\npm_runtime_get_sync() and pm_runtime_put_sync() are called when\nopen or release function of framebufer driver is called to inform\nthe system if hardware is idle or not.\n\nSigned-off-by: Jingoo Han \nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/s3c-fb.c\n+++ drivers\/video\/s3c-fb.c\n@@ -23,6 +23,7 @@\n #include \n #include \n #include \n+#include \n \n #include \n #include \n@@ -1013,8 +1014,30 @@\n \treturn ret;\n }\n \n+static int s3c_fb_open(struct fb_info *info, int user)\n+{\n+\tstruct s3c_fb_win *win = info->par;\n+\tstruct s3c_fb *sfb = win->parent;\n+\n+\tpm_runtime_get_sync(sfb->dev);\n+\n+\treturn 0;\n+}\n+\n+static int s3c_fb_release(struct fb_info *info, int user)\n+{\n+\tstruct s3c_fb_win *win = info->par;\n+\tstruct s3c_fb *sfb = win->parent;\n+\n+\tpm_runtime_put_sync(sfb->dev);\n+\n+\treturn 0;\n+}\n+\n static struct fb_ops s3c_fb_ops = {\n \t.owner\t\t= THIS_MODULE,\n+\t.fb_open\t= s3c_fb_open,\n+\t.fb_release\t= s3c_fb_release,\n \t.fb_check_var\t= s3c_fb_check_var,\n \t.fb_set_par\t= s3c_fb_set_par,\n \t.fb_blank\t= s3c_fb_blank,\n@@ -1322,6 +1345,8 @@\n \n \tclk_enable(sfb->bus_clk);\n \n+\tpm_runtime_enable(sfb->dev);\n+\n \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n \tif (!res) {\n \t\tdev_err(dev, \"failed to find registers\\n\");\n@@ -1359,6 +1384,9 @@\n \t}\n \n \tdev_dbg(dev, \"got resources (regs %p), probing windows\\n\", sfb->regs);\n+\n+\tplatform_set_drvdata(pdev, sfb);\n+\tpm_runtime_get_sync(sfb->dev);\n \n \t\/* setup gpio and output polarity controls *\/\n \n@@ -1400,6 +1428,7 @@\n \t}\n \n \tplatform_set_drvdata(pdev, sfb);\n+\tpm_runtime_put_sync(sfb->dev);\n \n \treturn 0;\n \n@@ -1434,6 +1463,8 @@\n \tstruct s3c_fb *sfb = platform_get_drvdata(pdev);\n \tint win;\n \n+\tpm_runtime_get_sync(sfb->dev);\n+\n \tfor (win = 0; win < S3C_FB_MAX_WIN; win++)\n \t\tif (sfb->windows[win])\n \t\t\ts3c_fb_release_win(sfb, sfb->windows[win]);\n@@ -1450,12 +1481,16 @@\n \n \tkfree(sfb);\n \n+\tpm_runtime_put_sync(sfb->dev);\n+\tpm_runtime_disable(sfb->dev);\n+\n \treturn 0;\n }\n \n #ifdef CONFIG_PM\n-static int s3c_fb_suspend(struct platform_device *pdev, pm_message_t state)\n-{\n+static int s3c_fb_suspend(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n \tstruct s3c_fb *sfb = platform_get_drvdata(pdev);\n \tstruct s3c_fb_win *win;\n \tint win_no;\n@@ -1473,8 +1508,9 @@\n \treturn 0;\n }\n \n-static int s3c_fb_resume(struct platform_device *pdev)\n-{\n+static int s3c_fb_resume(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n \tstruct s3c_fb *sfb = platform_get_drvdata(pdev);\n \tstruct s3c_fb_platdata *pd = sfb->pdata;\n \tstruct s3c_fb_win *win;\n@@ -1509,9 +1545,70 @@\n \n \treturn 0;\n }\n+\n+int s3c_fb_runtime_suspend(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n+\tstruct s3c_fb *sfb = platform_get_drvdata(pdev);\n+\tstruct s3c_fb_win *win;\n+\tint win_no;\n+\n+\tfor (win_no = S3C_FB_MAX_WIN - 1; win_no >= 0; win_no--) {\n+\t\twin = sfb->windows[win_no];\n+\t\tif (!win)\n+\t\t\tcontinue;\n+\n+\t\t\/* use the blank function to push into power-down *\/\n+\t\ts3c_fb_blank(FB_BLANK_POWERDOWN, win->fbinfo);\n+\t}\n+\n+\tclk_disable(sfb->bus_clk);\n+\treturn 0;\n+}\n+\n+int s3c_fb_runtime_resume(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n+\tstruct s3c_fb *sfb = platform_get_drvdata(pdev);\n+\tstruct s3c_fb_platdata *pd = sfb->pdata;\n+\tstruct s3c_fb_win *win;\n+\tint win_no;\n+\n+\tclk_enable(sfb->bus_clk);\n+\n+\t\/* setup registers *\/\n+\twritel(pd->vidcon1, sfb->regs + VIDCON1);\n+\n+\t\/* zero all windows before we do anything *\/\n+\tfor (win_no = 0; win_no < sfb->variant.nr_windows; win_no++)\n+\t\ts3c_fb_clear_win(sfb, win_no);\n+\n+\tfor (win_no = 0; win_no < sfb->variant.nr_windows - 1; win_no++) {\n+\t\tvoid __iomem *regs = sfb->regs + sfb->variant.keycon;\n+\n+\t\tregs += (win_no * 8);\n+\t\twritel(0xffffff, regs + WKEYCON0);\n+\t\twritel(0xffffff, regs + WKEYCON1);\n+\t}\n+\n+\t\/* restore framebuffers *\/\n+\tfor (win_no = 0; win_no < S3C_FB_MAX_WIN; win_no++) {\n+\t\twin = sfb->windows[win_no];\n+\t\tif (!win)\n+\t\t\tcontinue;\n+\n+\t\tdev_dbg(&pdev->dev, \"resuming window %d\\n\", win_no);\n+\t\ts3c_fb_set_par(win->fbinfo);\n+\t}\n+\n+\treturn 0;\n+}\n+\n #else\n #define s3c_fb_suspend NULL\n #define s3c_fb_resume NULL\n+#define s3c_fb_runtime_suspend NULL\n+#define s3c_fb_runtime_resume NULL\n #endif\n \n \n@@ -1710,15 +1807,21 @@\n };\n MODULE_DEVICE_TABLE(platform, s3c_fb_driver_ids);\n \n+static const struct dev_pm_ops s3cfb_pm_ops = {\n+\t.suspend\t= s3c_fb_suspend,\n+\t.resume\t\t= s3c_fb_resume,\n+\t.runtime_suspend\t= s3c_fb_runtime_suspend,\n+\t.runtime_resume\t\t= s3c_fb_runtime_resume,\n+};\n+\n static struct platform_driver s3c_fb_driver = {\n \t.probe\t\t= s3c_fb_probe,\n \t.remove\t\t= __devexit_p(s3c_fb_remove),\n-\t.suspend\t= s3c_fb_suspend,\n-\t.resume\t\t= s3c_fb_resume,\n \t.id_table\t= s3c_fb_driver_ids,\n \t.driver\t\t= {\n \t\t.name\t= \"s3c-fb\",\n \t\t.owner\t= THIS_MODULE,\n+\t\t.pm\t= &s3cfb_pm_ops,\n \t},\n };\n \n"} {"commit":"34525d365c0de756cb14f728da8a007684167ab2","subject":"Doc update: point out that line (quad) user_flags are used by the execute_coarsening_and_refinement function.","message":"Doc update: point out that line (quad) user_flags are used by the execute_coarsening_and_refinement function.\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@11860 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"lue\/dealii,Arezou-gh\/dealii,johntfoster\/dealii,pesser\/dealii,ESeNonFossiIo\/dealii,danshapero\/dealii,Arezou-gh\/dealii,adamkosik\/dealii,flow123d\/dealii,shakirbsm\/dealii,shakirbsm\/dealii,EGP-CIG-REU\/dealii,naliboff\/dealii,kalj\/dealii,JaeryunYim\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,pesser\/dealii,nicolacavallini\/dealii,flow123d\/dealii,gpitton\/dealii,maieneuro\/dealii,mac-a\/dealii,danshapero\/dealii,danshapero\/dealii,shakirbsm\/dealii,JaeryunYim\/dealii,EGP-CIG-REU\/dealii,gpitton\/dealii,flow123d\/dealii,lpolster\/dealii,ibkim11\/dealii,natashasharma\/dealii,natashasharma\/dealii,pesser\/dealii,rrgrove6\/dealii,spco\/dealii,andreamola\/dealii,johntfoster\/dealii,adamkosik\/dealii,rrgrove6\/dealii,gpitton\/dealii,naliboff\/dealii,Arezou-gh\/dealii,EGP-CIG-REU\/dealii,YongYang86\/dealii,shakirbsm\/dealii,lpolster\/dealii,flow123d\/dealii,naliboff\/dealii,natashasharma\/dealii,rrgrove6\/dealii,sairajat\/dealii,angelrca\/dealii,EGP-CIG-REU\/dealii,maieneuro\/dealii,ibkim11\/dealii,kalj\/dealii,mac-a\/dealii,jperryhouts\/dealii,jperryhouts\/dealii,angelrca\/dealii,danshapero\/dealii,maieneuro\/dealii,mtezzele\/dealii,gpitton\/dealii,gpitton\/dealii,lue\/dealii,sriharisundar\/dealii,pesser\/dealii,JaeryunYim\/dealii,ESeNonFossiIo\/dealii,EGP-CIG-REU\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,johntfoster\/dealii,rrgrove6\/dealii,johntfoster\/dealii,sriharisundar\/dealii,sriharisundar\/dealii,nicolacavallini\/dealii,sairajat\/dealii,gpitton\/dealii,maieneuro\/dealii,lue\/dealii,kalj\/dealii,lpolster\/dealii,sairajat\/dealii,YongYang86\/dealii,YongYang86\/dealii,YongYang86\/dealii,adamkosik\/dealii,flow123d\/dealii,sairajat\/dealii,sairajat\/dealii,rrgrove6\/dealii,sriharisundar\/dealii,jperryhouts\/dealii,ESeNonFossiIo\/dealii,lue\/dealii,lpolster\/dealii,andreamola\/dealii,sriharisundar\/dealii,spco\/dealii,kalj\/dealii,nicolacavallini\/dealii,nicolacavallini\/dealii,adamkosik\/dealii,natashasharma\/dealii,spco\/dealii,EGP-CIG-REU\/dealii,mac-a\/dealii,sairajat\/dealii,naliboff\/dealii,johntfoster\/dealii,ESeNonFossiIo\/dealii,pesser\/dealii,rrgrove6\/dealii,angelrca\/dealii,mtezzele\/dealii,maieneuro\/dealii,gpitton\/dealii,msteigemann\/dealii,andreamola\/dealii,ibkim11\/dealii,kalj\/dealii,jperryhouts\/dealii,danshapero\/dealii,sriharisundar\/dealii,pesser\/dealii,EGP-CIG-REU\/dealii,jperryhouts\/dealii,andreamola\/dealii,natashasharma\/dealii,msteigemann\/dealii,ibkim11\/dealii,spco\/dealii,lpolster\/dealii,msteigemann\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,mtezzele\/dealii,kalj\/dealii,mtezzele\/dealii,YongYang86\/dealii,msteigemann\/dealii,jperryhouts\/dealii,natashasharma\/dealii,mac-a\/dealii,pesser\/dealii,ibkim11\/dealii,sairajat\/dealii,danshapero\/dealii,nicolacavallini\/dealii,flow123d\/dealii,mtezzele\/dealii,msteigemann\/dealii,ESeNonFossiIo\/dealii,mtezzele\/dealii,shakirbsm\/dealii,angelrca\/dealii,rrgrove6\/dealii,flow123d\/dealii,lue\/dealii,natashasharma\/dealii,mac-a\/dealii,kalj\/dealii,nicolacavallini\/dealii,andreamola\/dealii,YongYang86\/dealii,adamkosik\/dealii,mac-a\/dealii,lue\/dealii,lpolster\/dealii,spco\/dealii,sriharisundar\/dealii,angelrca\/dealii,johntfoster\/dealii,adamkosik\/dealii,JaeryunYim\/dealii,msteigemann\/dealii,msteigemann\/dealii,JaeryunYim\/dealii,adamkosik\/dealii,naliboff\/dealii,maieneuro\/dealii,lue\/dealii,naliboff\/dealii,lpolster\/dealii,Arezou-gh\/dealii,JaeryunYim\/dealii,naliboff\/dealii,spco\/dealii,danshapero\/dealii,YongYang86\/dealii,angelrca\/dealii,mac-a\/dealii,andreamola\/dealii,nicolacavallini\/dealii,ibkim11\/dealii,angelrca\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,mtezzele\/dealii,andreamola\/dealii,johntfoster\/dealii,ESeNonFossiIo\/dealii,Arezou-gh\/dealii,spco\/dealii,maieneuro\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/deal.II\/include\/grid\/tria.h\n+++ deal.II\/deal.II\/include\/grid\/tria.h\n@@ -943,8 +943,10 @@\n * often necessary to use the flags in more than one function consecutively and\n * is then error prone to dedicate one of these to clear the flags.\n *\n- * It is recommended that a functions using the flags states so in its\n- * documentation.\n+ * It is recommended that a functions using the flags states so in\n+ * its documentation. For example, the\n+ * execute_coarsening_and_refinement() function uses the face user\n+ * flags.\n *\n * There is another set of user data, namely a void *<\/tt>, for\n * each line, quad, etc. You can access these user pointers through\n@@ -953,7 +955,8 @@\n * the accessor classes. These pointers are not used nor changed in\n * many places of the library, and those classes and functions that\n * do use them should document this clearly; the most prominent user\n- * of these pointers is the Solutiontransfer class.\n+ * of these pointers is the SolutionTransfer class which uses the\n+ * cell->user_pointers.\n *\n * The value of these user pointers is @p NULL by default. Note that\n * the pointers are not inherited to children upon\n@@ -1905,16 +1908,22 @@\n \t\t\t\t * The function resets all\n \t\t\t\t * refinement and coarsening\n \t\t\t\t * flags to false. It uses the\n-\t\t\t\t * user flags.\n+\t\t\t\t * line->user_flags<\/tt> for\n+\t\t\t\t * dim=2,3<\/tt> and the\n+\t\t\t\t * quad->user_flags<\/tt> for\n+\t\t\t\t * dim=3<\/tt>.\n \t\t\t\t *\n * See the general docs for more\n * information.\n \t\t\t\t *\n \t\t\t\t * Note that this function is\n-\t\t\t\t * @p virtual to allow derived\n-\t\t\t\t * classes to insert hooks, such\n-\t\t\t\t * as saving refinement flags and\n-\t\t\t\t * the like.\n+\t\t\t\t * virtual<\/tt> to allow\n+\t\t\t\t * derived classes to insert\n+\t\t\t\t * hooks, such as saving\n+\t\t\t\t * refinement flags and the like\n+\t\t\t\t * (see e.g. the\n+\t\t\t\t * PersistentTriangulation\n+\t\t\t\t * class).\n \t\t\t\t *\/\n virtual void execute_coarsening_and_refinement ();\n \n@@ -3248,6 +3257,12 @@\n \t\t\t\t \/**\n \t\t\t\t * Refine all cells on all levels which\n \t\t\t\t * were previously flagged for refinement.\n+\t\t\t\t *\n+\t\t\t\t * Note, that this function uses\n+\t\t\t\t * the line->user_flags<\/tt>\n+\t\t\t\t * for dim=2,3<\/tt> and the\n+\t\t\t\t * quad->user_flags<\/tt> for\n+\t\t\t\t * dim=3<\/tt>.\n \t\t\t\t *\/ \n void execute_refinement ();\n \n"} {"commit":"ad64c482aa5bf1b3fbe5286bfa954bb4ba941506","subject":"Updated documentation.","message":"Updated documentation.\n","repos":"copperhead\/copperhead-compiler,copperhead\/copperhead-compiler,copperhead\/copperhead-compiler","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- doc\/doxygen\/mainpage.h\n+++ doc\/doxygen\/mainpage.h\n@@ -9,7 +9,7 @@\n \"nodes\" that describe the text of a program, as well as a set\n of \\ref rewriters \"rewriters\", each of which transform the program\n in a particular way. These rewriters can be combined to form a\n- particular compiler, such as \\ref backend::compiler \"this one\",\n+ compiler, such as \\ref backend::compiler \"this one\",\n which is used as the compiler for the Python Copperhead runtime.\n \n \\section build_sec Building\n"} {"commit":"39185efd3a891b0d66b1ded10d165dd9aee94464","subject":"llvmpipe: fix non-sse build after recent changes","message":"llvmpipe: fix non-sse build after recent changes\n","repos":"KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/llvmpipe\/lp_setup_coef.c\n+++ src\/gallium\/drivers\/llvmpipe\/lp_setup_coef.c\n@@ -145,12 +145,12 @@\n \n \/*Z*\/\n if (usage_mask & TGSI_WRITEMASK_Z) {\n- linear_coef(inputs, info, slot, 0, 2);\n+ linear_coef(info, slot, 0, 2);\n }\n \n \/*W*\/\n if (usage_mask & TGSI_WRITEMASK_W) {\n- linear_coef(inputs, info, slot, 0, 3);\n+ linear_coef(info, slot, 0, 3);\n }\n }\n \n"} {"commit":"915a6e21c22ae84e36bcc12cbb1566db4b110ff6","subject":"Added solution to the approximate equality problem using c","message":"Added solution to the approximate equality problem using c\n","repos":"ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta,ncoe\/rosetta","returncode":1,"stderr":"error: pathspec 'Approximate_Equality\/C\/ApproximateEquality\/approximate.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- Approximate_Equality\/C\/ApproximateEquality\/approximate.c\n+++ Approximate_Equality\/C\/ApproximateEquality\/approximate.c\n@@ -0,0 +1,24 @@\n+#include \n+#include \n+#include \n+\n+bool approxEquals(double value, double other, double epsilon) {\n+ return fabs(value - other) < epsilon;\n+}\n+\n+void test(double a, double b) {\n+ double epsilon = 1e-18;\n+ printf(\"%f, %f => %d\\n\", a, b, approxEquals(a, b, epsilon));\n+}\n+\n+int main() {\n+ test(100000000000000.01, 100000000000000.011);\n+ test(100.01, 100.011);\n+ test(10000000000000.001 \/ 10000.0, 1000000000.0000001000);\n+ test(0.001, 0.0010000001);\n+ test(0.000000000000000000000101, 0.0);\n+ test(sqrt(2.0) * sqrt(2.0), 2.0);\n+ test(-sqrt(2.0) * sqrt(2.0), -2.0);\n+ test(3.14159265358979323846, 3.14159265358979324);\n+ return 0;\n+}\n"} {"commit":"5b85ca330eb168ed84654505083c7a7515707f03","subject":"fix JNI bug on wipping wallet","message":"fix JNI bug on wipping wallet\n","repos":"breadwallet\/breadwallet-android,breadwallet\/breadwallet-android,litecoin-foundation\/loafwallet-android,litecoin-foundation\/loafwallet-android,breadwallet\/breadwallet-android,breadwallet\/breadwallet-android,dr0pthedoge\/unitwallet-android,dr0pthedoge\/unitwallet-android","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- app\/src\/main\/jni\/transition\/wallet.c\n+++ app\/src\/main\/jni\/transition\/wallet.c\n@@ -578,7 +578,6 @@\n _wallet = NULL;\r }\r if (_transactions) {\r- free(_transactions);\r _transactions = NULL;\r }\r \r"} {"commit":"59277011e5a6bc4f0b3a7cbd23febc23db06e6f1","subject":"yuri window system\u3092\u8d77\u52d5\u3059\u308b\u3068\u771f\u3063\u6697\u306b\u3059\u308b\u3088\u3046\u306b\u3057\u305f","message":"yuri window system\u3092\u8d77\u52d5\u3059\u308b\u3068\u771f\u3063\u6697\u306b\u3059\u308b\u3088\u3046\u306b\u3057\u305f\n","repos":"AkihiroTakai\/yuri,AkihiroTakai\/yuri,AkihiroTakai\/yuri","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- yrws\/yrws_main.c\n+++ yrws\/yrws_main.c\n@@ -1,6 +1,8 @@\n #include \"..\/include\/kernel.h\"\n #include \"..\/include\/yrws.h\"\n #include \"..\/include\/sh.h\"\n+\n+static void init_yrws(void);\n \n struct MOUSE_CURSOR cursor;\n struct MOUSE_INFO mouse_info;\n@@ -14,13 +16,16 @@\n \n puts(\"Starting...\");\n \n+ \/*\n+ *\u30de\u30a6\u30b9\u306e\u30ad\u30e5\u30fc\u3092\u8a2d\u5b9a\n+ *\/\n mouse_queue = (struct QUEUE *)memory_alloc(memman, sizeof(struct QUEUE));\n-\n queue_init(mouse_queue, 512, mouse_buf, me);\n \n init_mouse(mouse_queue);\n+ io_out8(PIC1_IMR, 0xef); \/\/ \u30de\u30a6\u30b9\u3092\u8a31\u53ef(11101111)\n \n- io_out8(PIC1_IMR, 0xef); \/\/ \u30de\u30a6\u30b9\u3092\u8a31\u53ef(11101111)\n+ init_yrws();\n \n while(1){\n \/*\n@@ -85,3 +90,7 @@\n }\n }\n }\n+\n+static void init_yrws(void){\n+ boxfill8(binfo->vram, binfo->scrnx, BLACK, 0, 0, binfo->scrnx, binfo->scrny);\n+}\n"} {"commit":"82e51e818849f8f8600456fa476654630792bcf9","subject":"radeonsi: separate IA_MULTI_VGT_PARAM and VGT_PRIMITIVE_TYPE emission","message":"radeonsi: separate IA_MULTI_VGT_PARAM and VGT_PRIMITIVE_TYPE emission\n\nWe want to emit IA_MULTI_VGT_PARAM less often because it's a context reg.\n\nReviewed-by: Nicolai H\u00e4hnle <0d0be6cf5ad662651be2dc5dfd44aa2b09d4c1cc@amd.com>\nReviewed-by: Edward O'Callaghan \n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/radeonsi\/si_state_draw.c\n+++ src\/gallium\/drivers\/radeonsi\/si_state_draw.c\n@@ -473,18 +473,21 @@\n \tia_multi_vgt_param = si_get_ia_multi_vgt_param(sctx, info, num_patches);\n \n \t\/* Draw state. *\/\n-\tif (prim != sctx->last_prim ||\n-\t ia_multi_vgt_param != sctx->last_multi_vgt_param) {\n-\t\tif (sctx->b.chip_class >= CIK) {\n+\tif (ia_multi_vgt_param != sctx->last_multi_vgt_param) {\n+\t\tif (sctx->b.chip_class >= CIK)\n \t\t\tradeon_set_context_reg_idx(cs, R_028AA8_IA_MULTI_VGT_PARAM, 1, ia_multi_vgt_param);\n+\t\telse\n+\t\t\tradeon_set_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);\n+\n+\t\tsctx->last_multi_vgt_param = ia_multi_vgt_param;\n+\t}\n+\tif (prim != sctx->last_prim) {\n+\t\tif (sctx->b.chip_class >= CIK)\n \t\t\tradeon_set_uconfig_reg_idx(cs, R_030908_VGT_PRIMITIVE_TYPE, 1, prim);\n-\t\t} else {\n+\t\telse\n \t\t\tradeon_set_config_reg(cs, R_008958_VGT_PRIMITIVE_TYPE, prim);\n-\t\t\tradeon_set_context_reg(cs, R_028AA8_IA_MULTI_VGT_PARAM, ia_multi_vgt_param);\n-\t\t}\n \n \t\tsctx->last_prim = prim;\n-\t\tsctx->last_multi_vgt_param = ia_multi_vgt_param;\n \t}\n \n \tif (gs_out_prim != sctx->last_gs_out_prim) {\n"} {"commit":"90611297fa9a84996a7915c588e92725272c0ce0","subject":"radeonsi: don't flush shader caches when building PM4 shader states","message":"radeonsi: don't flush shader caches when building PM4 shader states\n\nThis is a wrong place to flush caches to say the least.\n\nI don't think we need to flush the instruction caches if we don't patch\nshaders with DMA.\n\nReviewed-by: Michel D\u00e4nzer <242b79f0804cf52679d58f27ed754158c1323c75@amd.com>\n","repos":"jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/radeonsi\/si_state_draw.c\n+++ src\/gallium\/drivers\/radeonsi\/si_state_draw.c\n@@ -75,8 +75,6 @@\n \t\t S_00B328_VGPR_COMP_CNT(vgpr_comp_cnt));\n \tsi_pm4_set_reg(pm4, R_00B32C_SPI_SHADER_PGM_RSRC2_ES,\n \t\t S_00B32C_USER_SGPR(num_user_sgprs));\n-\n-\tsctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;\n }\n \n static void si_shader_gs(struct pipe_context *ctx, struct si_shader *shader)\n@@ -147,8 +145,6 @@\n \t\t S_00B228_SGPRS((num_sgprs - 1) \/ 8));\n \tsi_pm4_set_reg(pm4, R_00B22C_SPI_SHADER_PGM_RSRC2_GS,\n \t\t S_00B22C_USER_SGPR(num_user_sgprs));\n-\n-\tsctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;\n }\n \n static void si_shader_vs(struct pipe_context *ctx, struct si_shader *shader)\n@@ -223,8 +219,6 @@\n \t\t S_00B12C_SO_BASE2_EN(!!shader->selector->so.stride[2]) |\n \t\t S_00B12C_SO_BASE3_EN(!!shader->selector->so.stride[3]) |\n \t\t S_00B12C_SO_EN(!!shader->selector->so.num_outputs));\n-\n-\tsctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;\n }\n \n static void si_shader_ps(struct pipe_context *ctx, struct si_shader *shader)\n@@ -305,8 +299,6 @@\n \tsi_pm4_set_reg(pm4, R_00B02C_SPI_SHADER_PGM_RSRC2_PS,\n \t\t S_00B02C_EXTRA_LDS_SIZE(shader->lds_size) |\n \t\t S_00B02C_USER_SGPR(num_user_sgprs));\n-\n-\tsctx->b.flags |= R600_CONTEXT_INV_SHADER_CACHE;\n }\n \n \/*\n"} {"commit":"8fcddd325ce3dc5dfdafc95767542590ae860c45","subject":"mesa: Work around internal compiler error","message":"mesa: Work around internal compiler error\n\nThis small rearrangement avoids MSVC 2013 ICE. Also, this should be\na better memory access order.\n\nCc: \"10.0\" <59f39c0db42d4479a46b02d4d2bc11120e37bb44@lists.freedesktop.org>\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\nReviewed-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\n","repos":"tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/softpipe\/sp_quad_blend.c\n+++ src\/gallium\/drivers\/softpipe\/sp_quad_blend.c\n@@ -860,8 +860,8 @@\n {\n unsigned i, j;\n \n- for (j = 0; j < TGSI_QUAD_SIZE; j++) {\n- for (i = 0; i < 4; i++) {\n+ for (i = 0; i < 4; i++) {\n+ for (j = 0; j < TGSI_QUAD_SIZE; j++) {\n quadColor[i][j] = CLAMP(quadColor[i][j], 0.0F, 1.0F);\n }\n }\n"} {"commit":"36e985e96e6da817042ba1b2dfadf96f85e32afb","subject":"winsys\/gdi: Init state tracker's per-thread data.","message":"winsys\/gdi: Init state tracker's per-thread data.\n","repos":"zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/winsys\/gdi\/gdi_softpipe_winsys.c\n+++ src\/gallium\/winsys\/gdi\/gdi_softpipe_winsys.c\n@@ -312,9 +312,20 @@\n {\n switch (fdwReason) {\n case DLL_PROCESS_ATTACH:\n- return st_init(&stw_winsys);\n+ if (!st_init(&stw_winsys)) {\n+ return FALSE;\n+ }\n+ return st_init_thread();\n+\n+ case DLL_THREAD_ATTACH:\n+ return st_init_thread();\n+\n+ case DLL_THREAD_DETACH:\n+ st_cleanup_thread();\n+ break;\n \n case DLL_PROCESS_DETACH:\n+ st_cleanup_thread();\n st_cleanup();\n break;\n }\n"} {"commit":"be9c61f144c923ad69f0f376efe52b932e50963e","subject":"wncklet: rename PagerData to WorkspaceSwitcherApplet","message":"wncklet: rename PagerData to WorkspaceSwitcherApplet\n","repos":"GNOME\/gnome-panel,GNOME\/gnome-panel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applets\/wncklet\/workspace-switcher.c\n+++ applets\/wncklet\/workspace-switcher.c\n@@ -67,10 +67,10 @@\n \tgboolean display_all;\n \n \tGSettings *settings;\n-} PagerData;\n-\n-static void\n-pager_update (PagerData *pager)\n+} WorkspaceSwitcherApplet;\n+\n+static void\n+pager_update (WorkspaceSwitcherApplet *pager)\n {\n \twnck_pager_set_orientation (WNCK_PAGER (pager->pager),\n \t\t\t\t pager->orientation);\n@@ -88,7 +88,7 @@\n }\n \n static void\n-update_properties_for_wm (PagerData *pager)\n+update_properties_for_wm (WorkspaceSwitcherApplet *pager)\n {\n \tswitch (pager->wm) {\n \tcase PAGER_WM_METACITY:\n@@ -127,8 +127,8 @@\n }\n \n static void\n-window_manager_changed (WnckScreen *screen,\n-\t\t\tPagerData *pager)\n+window_manager_changed (WnckScreen *screen,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tconst char *wm_name;\n \n@@ -148,8 +148,8 @@\n }\n \n static void\n-applet_realized (PanelApplet *applet,\n-\t\t PagerData *pager)\n+applet_realized (PanelApplet *applet,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tpager->screen = wnck_screen_get_default ();\n \n@@ -161,17 +161,17 @@\n }\n \n static void\n-applet_unrealized (PanelApplet *applet,\n-\t\t PagerData *pager)\n+applet_unrealized (PanelApplet *applet,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tpager->screen = NULL;\n \tpager->wm = PAGER_WM_UNKNOWN;\n }\n \n static void\n-applet_change_orient (PanelApplet *applet,\n-\t\t PanelAppletOrient orient,\n-\t\t PagerData *pager)\n+applet_change_orient (PanelApplet *applet,\n+ PanelAppletOrient orient,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tGtkOrientation new_orient;\n \n@@ -197,7 +197,8 @@\n }\n \n static void\n-destroy_pager(GtkWidget * widget, PagerData *pager)\n+destroy_pager (GtkWidget *widget,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tg_object_unref (G_OBJECT (pager->settings));\n \n@@ -208,9 +209,9 @@\n }\n \n static void\n-num_rows_changed (GSettings *settings,\n-\t\t const gchar *key,\n-\t\t PagerData *pager)\n+num_rows_changed (GSettings *settings,\n+ const gchar *key,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tint n_rows;\n \n@@ -225,9 +226,9 @@\n }\n \n static void\n-display_workspace_names_changed (GSettings *settings,\n-\t\t\t\t const gchar *key,\n-\t\t\t\t PagerData *pager)\n+display_workspace_names_changed (GSettings *settings,\n+ const gchar *key,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tgboolean value;\n \n@@ -247,11 +248,10 @@\n \t}\n }\n \n-\n-static void\n-all_workspaces_changed (GSettings *settings,\n-\t\t\tconst gchar *key,\n-\t\t\tPagerData *pager)\n+static void\n+all_workspaces_changed (GSettings *settings,\n+ const gchar *key,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tgboolean value;\n \n@@ -274,7 +274,7 @@\n }\n \n static void\n-setup_gsettings (PagerData *pager)\n+setup_gsettings (WorkspaceSwitcherApplet *pager)\n {\n \tpager->settings =\n \t panel_applet_settings_new (PANEL_APPLET (pager->applet),\n@@ -289,8 +289,8 @@\n }\n \n static void\n-display_workspace_names_toggled (GtkToggleButton *button,\n-\t\t\t\t PagerData *pager)\n+display_workspace_names_toggled (GtkToggleButton *button,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tg_settings_set_boolean (pager->settings,\n \t\t\t\t\"display-workspace-names\",\n@@ -298,8 +298,8 @@\n }\n \n static void\n-all_workspaces_toggled (GtkToggleButton *button,\n-\t\t\tPagerData *pager)\n+all_workspaces_toggled (GtkToggleButton *button,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tg_settings_set_boolean (pager->settings,\n \t\t\t\t\"display-all-workspaces\",\n@@ -307,8 +307,8 @@\n }\n \n static void\n-num_rows_value_changed (GtkSpinButton *button,\n-\t\t\tPagerData *pager)\n+num_rows_value_changed (GtkSpinButton *button,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tg_settings_set_int (pager->settings,\n \t\t\t \"num-rows\",\n@@ -316,7 +316,7 @@\n }\n \n static void\n-update_workspaces_model (PagerData *pager)\n+update_workspaces_model (WorkspaceSwitcherApplet *pager)\n {\n \tint nr_ws, i;\n \tWnckWorkspace *workspace;\n@@ -341,8 +341,8 @@\n }\n \n static void\n-workspace_renamed (WnckWorkspace *space,\n-\t\t PagerData *pager)\n+workspace_renamed (WnckWorkspace *space,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tint i;\n \tGtkTreeIter iter;\n@@ -357,9 +357,9 @@\n }\n \n static void\n-workspace_created (WnckScreen *screen,\n-\t\t WnckWorkspace *space,\n-\t\t PagerData *pager)\n+workspace_created (WnckScreen *screen,\n+ WnckWorkspace *space,\n+ WorkspaceSwitcherApplet *pager)\n {\n g_return_if_fail (WNCK_IS_SCREEN (screen));\n \n@@ -373,17 +373,17 @@\n }\n \n static void\n-workspace_destroyed (WnckScreen *screen,\n-\t\t WnckWorkspace *space,\n-\t\t PagerData *pager)\n+workspace_destroyed (WnckScreen *screen,\n+ WnckWorkspace *space,\n+ WorkspaceSwitcherApplet *pager)\n {\n g_return_if_fail (WNCK_IS_SCREEN (screen));\n \tupdate_workspaces_model (pager);\n }\n \n static void\n-num_workspaces_value_changed (GtkSpinButton *button,\n-\t\t\t PagerData *pager)\n+num_workspaces_value_changed (GtkSpinButton *button,\n+ WorkspaceSwitcherApplet *pager)\n {\n #if 0\n \t\/* Slow down a bit after the first change, since it's moving really to\n@@ -397,9 +397,9 @@\n }\n \n static gboolean\n-workspaces_tree_focused_out (GtkTreeView *treeview,\n-\t\t\t GdkEventFocus *event,\n-\t\t\t PagerData *pager)\n+workspaces_tree_focused_out (GtkTreeView *treeview,\n+ GdkEventFocus *event,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tGtkTreeSelection *selection;\n \n@@ -409,10 +409,10 @@\n }\n \n static void \n-workspace_name_edited (GtkCellRendererText *cell_renderer_text,\n-\t\t const gchar *path,\n-\t\t const gchar *new_text,\n-\t\t PagerData *pager)\n+workspace_name_edited (GtkCellRendererText *cell_renderer_text,\n+ const gchar *path,\n+ const gchar *new_text,\n+ WorkspaceSwitcherApplet *pager)\n {\n const gint *indices;\n WnckWorkspace *workspace;\n@@ -437,8 +437,8 @@\n }\n \n static void\n-properties_dialog_destroyed (GtkWidget *widget,\n-\t\t\t PagerData *pager)\n+properties_dialog_destroyed (GtkWidget *widget,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tpager->properties_dialog = NULL;\n \tpager->workspaces_frame = NULL;\n@@ -462,9 +462,9 @@\n }\n \n static void \n-response_cb (GtkWidget *widget,\n-\t int id,\n-\t PagerData *pager)\n+response_cb (GtkWidget *widget,\n+ gint id,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tgtk_widget_destroy (widget);\n }\n@@ -473,7 +473,7 @@\n close_dialog (GtkWidget *button,\n gpointer data)\n {\n-\tPagerData *pager = data;\n+\tWorkspaceSwitcherApplet *pager = data;\n \tGtkTreeViewColumn *col;\n \tGtkCellArea *area;\n \tGtkCellEditable *edit_widget;\n@@ -498,12 +498,12 @@\n #define WID(s) GTK_WIDGET (gtk_builder_get_object (builder, s))\n \n static void\n-setup_sensitivity (PagerData *pager,\n-\t\t GtkBuilder *builder,\n-\t\t const char *wid1,\n-\t\t const char *wid2,\n-\t\t const char *wid3,\n-\t\t const char *key)\n+setup_sensitivity (WorkspaceSwitcherApplet *pager,\n+ GtkBuilder *builder,\n+ const gchar *wid1,\n+ const gchar *wid2,\n+ const gchar *wid3,\n+ const gchar *key)\n {\n \tGtkWidget *w;\n \n@@ -535,8 +535,8 @@\n }\n \n static void\n-setup_dialog (GtkBuilder *builder,\n-\t PagerData *pager)\n+setup_dialog (GtkBuilder *builder,\n+ WorkspaceSwitcherApplet *pager)\n {\n \tgboolean value;\n \tGtkTreeViewColumn *column;\n@@ -670,7 +670,7 @@\n GVariant *parameter,\n gpointer user_data)\n {\n- PagerData *pager = (PagerData *) user_data;\n+\tWorkspaceSwitcherApplet *pager = (WorkspaceSwitcherApplet *) user_data;\n \n \tif (pager->properties_dialog == NULL) {\n \t\tGtkBuilder *builder;\n@@ -703,12 +703,12 @@\n gboolean\n workspace_switcher_applet_fill (PanelApplet *applet)\n {\n-\tPagerData *pager;\n+\tWorkspaceSwitcherApplet *pager;\n \tGSimpleActionGroup *action_group;\n \tGAction *action;\n \tgboolean display_names;\n \n-\tpager = g_new0 (PagerData, 1);\n+\tpager = g_new0 (WorkspaceSwitcherApplet, 1);\n \n \tpager->applet = GTK_WIDGET (applet);\n \n"} {"commit":"455e4b1f4dbf8e9a7324b5ef6d5d72761a26f056","subject":"kmsbasertpendpoint: Add property to modify remb parameters","message":"kmsbasertpendpoint: Add property to modify remb parameters\n\nChange-Id: I8dd17988a29e0abfb19b8ee916deca3749e4d9d8\n","repos":"shelsonjava\/kms-core,ESTOS\/kms-core,ESTOS\/kms-core,Kurento\/kms-core,Kurento\/kms-core,TribeMedia\/kms-core,Kurento\/kms-core,TribeMedia\/kms-core,shelsonjava\/kms-core,TribeMedia\/kms-core,Kurento\/kms-core,ESTOS\/kms-core,shelsonjava\/kms-core,ESTOS\/kms-core,shelsonjava\/kms-core,TribeMedia\/kms-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gst-plugins\/commons\/kmsbasertpendpoint.c\n+++ src\/gst-plugins\/commons\/kmsbasertpendpoint.c\n@@ -113,6 +113,7 @@\n guint max_video_send_bw;\n \n \/* REMB *\/\n+ GstStructure *remb_params;\n KmsRembLocal *rl;\n KmsRembRemote *rm;\n \n@@ -151,6 +152,7 @@\n PROP_MIN_VIDEO_SEND_BW,\n PROP_MAX_VIDEO_SEND_BW,\n PROP_STATE,\n+ PROP_REMB_PARAMS,\n PROP_LAST\n };\n \n@@ -670,6 +672,10 @@\n kms_remb_local_create (rtpsession, VIDEO_RTP_SESSION,\n self->priv->remote_video_ssrc, self->priv->min_video_recv_bw,\n max_recv_bw);\n+\n+ if (self->priv->remb_params != NULL) {\n+ kms_remb_local_set_remb_params (self->priv->rl, self->priv->remb_params);\n+ }\n \n pad = gst_element_get_static_pad (rtpbin, VIDEO_RTPBIN_SEND_RTP_SINK);\n self->priv->rm =\n@@ -1932,6 +1938,19 @@\n self->priv->max_video_send_bw = v;\n break;\n }\n+ case PROP_REMB_PARAMS:\n+ if (self->priv->rl != NULL) {\n+ GST_DEBUG_OBJECT (self, \"Set to already created RembLocal\");\n+ kms_remb_local_set_remb_params (self->priv->rl,\n+ g_value_get_boxed (value));\n+ } else {\n+ GST_DEBUG_OBJECT (self, \"Set to aux structure\");\n+ if (self->priv->remb_params != NULL) {\n+ gst_structure_free (self->priv->remb_params);\n+ }\n+ self->priv->remb_params = g_value_dup_boxed (value);\n+ }\n+ break;\n default:\n G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n break;\n@@ -1971,6 +1990,16 @@\n break;\n case PROP_STATE:\n g_value_set_enum (value, self->priv->state);\n+ break;\n+ case PROP_REMB_PARAMS:\n+ if (self->priv->rl != NULL) {\n+ GST_DEBUG_OBJECT (self, \"Get from already created RembLocal\");\n+ g_value_take_boxed (value,\n+ kms_remb_local_get_remb_params (self->priv->rl));\n+ } else if (self->priv->remb_params != NULL) {\n+ GST_DEBUG_OBJECT (self, \"Get from aux structure\");\n+ g_value_set_boxed (value, self->priv->remb_params);\n+ }\n break;\n default:\n G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n@@ -2013,6 +2042,10 @@\n KmsBaseRtpEndpoint *self = KMS_BASE_RTP_ENDPOINT (gobject);\n \n GST_DEBUG_OBJECT (self, \"finalize\");\n+\n+ if (self->priv->remb_params != NULL) {\n+ gst_structure_free (self->priv->remb_params);\n+ }\n \n kms_remb_local_destroy (self->priv->rl);\n kms_remb_remote_destroy (self->priv->rm);\n@@ -2207,6 +2240,11 @@\n \"Maximum video bandwidth for sending. Unit: kbps(kilobits per second). 0: unlimited\",\n 0, G_MAXUINT32, MAX_VIDEO_SEND_BW_DEFAULT,\n G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));\n+\n+ g_object_class_install_property (object_class, PROP_REMB_PARAMS,\n+ g_param_spec_boxed (\"remb-params\", \"remb params\",\n+ \"Set parameters for REMB algorithm\",\n+ GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));\n \n \/* set signals *\/\n obj_signals[MEDIA_STATE_CHANGED] =\n"} {"commit":"464f2ba5ab3869d6628be36a717eea7a103b0626","subject":"kmsrtpendpoint: adapt to use KmsSdpSession","message":"kmsrtpendpoint: adapt to use KmsSdpSession\n\nChange-Id: I95cd11409c2750e3aeaf60345ac623e6d4ea3055\n","repos":"Kurento\/kms-elements,Kurento\/kms-elements,Kurento\/kms-elements","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gst-plugins\/rtpendpoint\/kmsrtpendpoint.c\n+++ src\/gst-plugins\/rtpendpoint\/kmsrtpendpoint.c\n@@ -65,7 +65,7 @@\n \/* Connection management begin *\/\n static KmsIRtpConnection *\n kms_rtp_endpoint_create_connection (KmsBaseRtpEndpoint * base_rtp_endpoint,\n- SdpMediaConfig * mconf, const gchar * name)\n+ KmsSdpSession * sess, SdpMediaConfig * mconf, const gchar * name)\n {\n KmsRtpConnection *conn = kms_rtp_connection_new ();\n \n@@ -74,7 +74,7 @@\n \n static KmsIBundleConnection *\n kms_rtp_endpoint_create_bundle_connection (KmsBaseRtpEndpoint *\n- base_rtp_endpoint, const gchar * name)\n+ base_rtp_endpoint, KmsSdpSession * sess, const gchar * name)\n {\n KmsRtpEndpoint *self = KMS_RTP_ENDPOINT (base_rtp_endpoint);\n \n@@ -85,12 +85,12 @@\n \n static KmsRtpBaseConnection *\n kms_rtp_endpoint_media_get_connection (KmsRtpEndpoint * self,\n- SdpMediaConfig * mconf)\n+ KmsSdpSession * sess, SdpMediaConfig * mconf)\n {\n KmsBaseRtpEndpoint *base_rtp = KMS_BASE_RTP_ENDPOINT (self);\n KmsIRtpConnection *conn;\n \n- conn = kms_base_rtp_endpoint_get_connection (base_rtp, mconf);\n+ conn = kms_base_rtp_endpoint_get_connection (base_rtp, sess, mconf);\n if (conn == NULL) {\n return NULL;\n }\n@@ -133,10 +133,7 @@\n \n addr_str = g_inet_address_to_string (addr);\n if (addr_str != NULL) {\n- KmsBaseSdpEndpoint *base_sdp = KMS_BASE_SDP_ENDPOINT (self);\n- KmsSdpAgent *agent = kms_base_sdp_endpoint_get_sdp_agent (base_sdp);\n-\n- g_object_set (agent, \"addr\", addr_str, NULL);\n+ g_object_set (self, \"addr\", addr_str, NULL);\n g_free (addr_str);\n done = TRUE;\n }\n@@ -160,7 +157,7 @@\n \/* Configure media SDP begin *\/\n static gboolean\n kms_rtp_endpoint_configure_media (KmsBaseSdpEndpoint * base_sdp_endpoint,\n- SdpMediaConfig * mconf)\n+ KmsSdpSession * sess, SdpMediaConfig * mconf)\n {\n KmsRtpEndpoint *self = KMS_RTP_ENDPOINT (base_sdp_endpoint);\n KmsBaseRtpEndpoint *base_rtp = KMS_BASE_RTP_ENDPOINT (self);\n@@ -172,7 +169,7 @@\n \n \/* Chain up *\/\n ret = KMS_BASE_SDP_ENDPOINT_CLASS\n- (kms_rtp_endpoint_parent_class)->configure_media (base_sdp_endpoint,\n+ (kms_rtp_endpoint_parent_class)->configure_media (base_sdp_endpoint, sess,\n mconf);\n if (ret == FALSE) {\n return FALSE;\n@@ -185,7 +182,7 @@\n \n conn =\n KMS_RTP_BASE_CONNECTION (kms_base_rtp_endpoint_get_connection (base_rtp,\n- mconf));\n+ sess, mconf));\n if (conn == NULL) {\n return TRUE;\n }\n@@ -209,19 +206,17 @@\n \n static void\n kms_rtp_endpoint_start_transport_send (KmsBaseSdpEndpoint *\n- base_sdp_endpoint, gboolean offerer)\n+ base_sdp_endpoint, KmsSdpSession * sess, gboolean offerer)\n {\n KmsRtpEndpoint *self = KMS_RTP_ENDPOINT (base_sdp_endpoint);\n- SdpMessageContext *remote_ctx =\n- kms_base_sdp_endpoint_get_remote_sdp_ctx (base_sdp_endpoint);\n const GstSDPMessage *sdp =\n- kms_sdp_message_context_get_sdp_message (remote_ctx);\n- const GSList *item = kms_sdp_message_context_get_medias (remote_ctx);\n+ kms_sdp_message_context_get_sdp_message (sess->remote_ctx);\n+ const GSList *item = kms_sdp_message_context_get_medias (sess->remote_ctx);\n const GstSDPConnection *msg_conn = gst_sdp_message_get_connection (sdp);\n \n \/* Chain up *\/\n KMS_BASE_SDP_ENDPOINT_CLASS (parent_class)->start_transport_send\n- (base_sdp_endpoint, offerer);\n+ (base_sdp_endpoint, sess, offerer);\n \n for (; item != NULL; item = g_slist_next (item)) {\n SdpMediaConfig *mconf = item->data;\n@@ -249,7 +244,7 @@\n continue;\n }\n \n- conn = kms_rtp_endpoint_media_get_connection (self, mconf);\n+ conn = kms_rtp_endpoint_media_get_connection (self, sess, mconf);\n if (conn == NULL) {\n continue;\n }\n"} {"commit":"d53abf89445104786e40bef8255f5855c1e28466","subject":"Fixes NB#120415, cursor focus must be in the first entry in account wizard dialog","message":"Fixes NB#120415, cursor focus must be in the first entry in account wizard dialog\n","repos":"community-ssu\/modest,community-ssu\/modest,community-ssu\/modest,community-ssu\/modest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/hildon2\/modest-easysetup-wizard-dialog.c\n+++ src\/hildon2\/modest-easysetup-wizard-dialog.c\n@@ -1346,11 +1346,15 @@\n \t\t\t\t\t const gchar *label)\n {\n \tgint index;\n+\n \t\/* Append page and set attributes *\/\n \tindex = gtk_notebook_append_page (notebook, page, gtk_label_new (label));\n \tgtk_container_child_set (GTK_CONTAINER (notebook), page,\n \t\t\t\t \"tab-expand\", TRUE, \"tab-fill\", TRUE,\n \t\t\t\t NULL);\n+\n+\t\/* Give focus to page and show it *\/\n+\tgtk_container_set_focus_child (GTK_CONTAINER (notebook), page);\n \tgtk_widget_show (page);\n }\n \n"} {"commit":"f2ef9db230374f5f8ff31ea3f09e02b55da892b5","subject":"Fixed limit_req burst\/nodelay inheritance (ticket #76).","message":"Fixed limit_req burst\/nodelay inheritance (ticket #76).\n\nThe problem was introduced in r4381 (1.1.12).\n","repos":"hy0kl\/nginx,firebase\/nginx,hy0kl\/nginx,hy0kl\/nginx,firebase\/nginx,firebase\/nginx,firebase\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/modules\/ngx_http_limit_req_module.c\n+++ src\/http\/modules\/ngx_http_limit_req_module.c\n@@ -570,6 +570,8 @@\n \n if (conf->shm_zone == NULL) {\n conf->shm_zone = prev->shm_zone;\n+ conf->burst = prev->burst;\n+ conf->nodelay = prev->nodelay;\n }\n \n ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,\n"} {"commit":"b05eea8991cef1e42864b9c1c63732f4986cc871","subject":"whops, don't commit debugging","message":"whops, don't commit debugging\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,dscho\/dovecot,jkerihuel\/dovecot,jkerihuel\/dovecot,dscho\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-index\/maildir\/maildir-update-flags.c\n+++ src\/lib-index\/maildir\/maildir-update-flags.c\n@@ -136,8 +136,6 @@\n \t\t\t\t\t \"\/cur\/\", new_fname, NULL);\n \t\t}\n \n-\t\tret = 0; break;\n-\n \t\tif (strcmp(old_fname, new_fname) == 0)\n \t\t\tret = 1;\n \t\telse {\n"} {"commit":"737fa85573c2752bf120c5c47e30252995c199d2","subject":"Maildir: Another logging improvement to EACCES error.","message":"Maildir: Another logging improvement to EACCES error.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/maildir\/maildir-sync.c\n+++ src\/lib-storage\/index\/maildir\/maildir-sync.c\n@@ -176,6 +176,7 @@\n #include \"buffer.h\"\n #include \"hash.h\"\n #include \"str.h\"\n+#include \"eacces-error.h\"\n #include \"nfs-workarounds.h\"\n #include \"maildir-storage.h\"\n #include \"maildir-uidlist.h\"\n@@ -375,8 +376,13 @@\n \t\t\tbreak;\n \n \t\tif (errno != ENOENT || i == MAILDIR_DELETE_RETRY_COUNT) {\n-\t\t\tmail_storage_set_critical(storage,\n-\t\t\t\t\"opendir(%s) failed: %m\", path);\n+\t\t\tif (errno == EACCES) {\n+\t\t\t\tmail_storage_set_critical(storage, \"%s\",\n+\t\t\t\t\teacces_error_get(\"opendir\", path));\n+\t\t\t} else {\n+\t\t\t\tmail_storage_set_critical(storage,\n+\t\t\t\t\t\"opendir(%s) failed: %m\", path);\n+\t\t\t}\n \t\t\treturn -1;\n \t\t}\n \n"} {"commit":"dafdb1da1369cfeb96de5c9767e50a41d453d380","subject":"File's group could have been wrong with shared mailboxes","message":"File's group could have been wrong with shared mailboxes\n","repos":"Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/maildir\/maildir-util.c\n+++ src\/lib-storage\/index\/maildir\/maildir-util.c\n@@ -132,8 +132,7 @@\n \t\t\tmail_storage_set_critical(STORAGE(mbox->storage),\n \t\t\t\t\t\t \"open(%s) failed: %m\", path);\n \t\t}\n-\t} else if (st.st_gid != mbox->mail_create_gid &&\n-\t\t mbox->mail_create_gid != (gid_t)-1) {\n+\t} else if (mbox->mail_create_gid != (gid_t)-1) {\n \t\tif (fchown(fd, (uid_t)-1, mbox->mail_create_gid) < 0) {\n \t\t\tmail_storage_set_critical(STORAGE(mbox->storage),\n \t\t\t\t\"fchown(%s) failed: %m\", path);\n"} {"commit":"26abb549f489f6f3f37d8ba4362e3955c15e8e08","subject":"Continue cleaning up the rectangle renderer","message":"Continue cleaning up the rectangle renderer\n\n","repos":"turran\/enesim,turran\/enesim,turran\/enesim,turran\/enesim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/renderer\/enesim_renderer_rectangle.c\n+++ src\/lib\/renderer\/enesim_renderer_rectangle.c\n@@ -37,6 +37,7 @@\n \tEnesim_F16p16_Matrix matrix;\n \tdouble scaled_width;\n \tdouble scaled_height;\n+\t\/* the inner rectangle in case of rounded corners *\/\n \tint lxx0, rxx0;\n \tint tyy0, byy0;\n \tint rr0, irr0;\n@@ -44,144 +45,173 @@\n \tunsigned char do_inner :1;\n } Enesim_Renderer_Rectangle;\n \n-#if 0\n-static void inline _rectangle_outer_corners(Eina_F16p16 rr0, Eina_Bool tl, Eina_Bool tr, Eina_Bool br, Eina_Bool bl,\n-\t\tEina_F16p16 lxx, Eina_F16p16 tyy, Eina_F16p16 rxx, Eina_F16p16 byy, uint16_t ax, uint16_t ay,\n-\t\tEina_F16p16 sx, Eina_F16p16 sy, Eina_F16p16 sw, Eina_F16p16 sh)\n-{\n-\tEina_F16p16 rr1;\n-\tuint32_t c0, c1, c2, c3;\n-\tuint16_t ca;\n-\n-\trr1 = rr0 + EINA_F16P16_ONE;\n+\/* we assume tyy and lxx are inside the top left corner *\/\n+static inline void _outer_top_left(int sx, int sy, uint16_t ax, uint16_t ay,\n+\t\tEina_F16p16 lxx, Eina_F16p16 tyy, Eina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n+\tif ((-lxx - tyy) >= rr0)\n+\t{\n+\t\tint rr = hypot(lxx, tyy);\n+\n+\t\t*ca = 0;\n+\t\tif (rr < rr1)\n+\t\t{\n+\t\t\t*ca = 256;\n+\t\t\tif (rr > rr0)\n+\t\t\t\t*ca = 256 - ((rr - rr0) >> 8);\n+\t\t}\n+\t}\n+\n+\tif (sx < 0)\n+\t{\n+\t\tif (cout[1] != cout[3])\n+\t\t\tcout[1] = argb8888_interp_256(ay, cout[3], cout[1]);\n+\t\tcout[0] = cout[2] = cout[3] = cout[1];\n+\t}\n+\tif (sy < 0)\n+\t{\n+\t\tif (cout[2] != cout[3])\n+\t\t\tcout[2] = argb8888_interp_256(ax, cout[3], cout[2]);\n+\t\tcout[0] = cout[1] = cout[3] = cout[2];\n+\t}\n+}\n+\n+static inline void _outer_bottom_left(int sx, int sy, int sh, uint16_t ax, uint16_t ay,\n+\t\tEina_F16p16 lxx, Eina_F16p16 byy, Eina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n+\tif ((-lxx + byy) >= rr0)\n+\t{\n+\t\tint rr = hypot(lxx, byy);\n+\n+\t\t*ca = 0;\n+\t\tif (rr < rr1)\n+\t\t{\n+\t\t\t*ca = 256;\n+\t\t\tif (rr > rr0)\n+\t\t\t\t*ca = 256 - ((rr - rr0) >> 8);\n+\t\t}\n+\t}\n+\n+\tif (sx < 0)\n+\t{\n+\t\tif (cout[1] != cout[3])\n+\t\t\tcout[1] = argb8888_interp_256(ay, cout[3], cout[1]);\n+\t\tcout[0] = cout[2] = cout[3] = cout[1];\n+\t}\n+\tif ((sy + 1) == sh)\n+\t{\n+\t\tif (cout[0] != cout[1])\n+\t\t\tcout[0] = argb8888_interp_256(ax, cout[1], cout[0]);\n+\t\tcout[1] = cout[2] = cout[3] = cout[0];\n+\t}\n+}\n+\n+static inline void _outer_left_corners(int sx, int sy, int sh, uint16_t ax, uint16_t ay,\n+\t\tEina_Bool tl, Eina_Bool bl,\n+\t\tEina_F16p16 lxx, Eina_F16p16 tyy, Eina_F16p16 byy,\n+\t\tEina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n \tif (lxx < 0)\n \t{\n \t\tif (tl && (tyy < 0))\n+\t\t\t_outer_top_left(sx, sy, ax, ay, lxx, tyy, rr0, rr1, cout, ca);\n+\t\tif (bl && (byy > 0))\n+\t\t\t_outer_bottom_left(sx, sy, sh, ax, ay, lxx, byy, rr0, rr1, cout, ca);\n+\t}\n+}\n+\n+static inline void _outer_top_right(int sx, int sy, int sw, uint16_t ax, uint16_t ay,\n+\t\tEina_F16p16 rxx, Eina_F16p16 tyy,\n+\t\tEina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n+\tif ((rxx - tyy) >= rr0)\n+\t{\n+\t\tint rr = hypot(rxx, tyy);\n+\n+\t\t*ca = 0;\n+\t\tif (rr < rr1)\n \t\t{\n-\t\t\tif ((-lxx - tyy) >= rr0)\n-\t\t\t{\n-\t\t\t\tint rr = hypot(lxx, tyy);\n-\n-\t\t\t\tca = 0;\n-\t\t\t\tif (rr < rr1)\n-\t\t\t\t{\n-\t\t\t\t\tca = 256;\n-\t\t\t\t\tif (rr > rr0)\n-\t\t\t\t\t\tca = 256 - ((rr - rr0) >> 8);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif (sx < 0)\n-\t\t\t{\n-\t\t\t\tif (c1 != c3)\n-\t\t\t\t\tc1 = argb8888_interp_256(ay, c3, c1);\n-\t\t\t\tc0 = c2 = c3 = c1;\n-\t\t\t}\n-\t\t\tif (sy < 0)\n-\t\t\t{\n-\t\t\t\tif (c2 != c3)\n-\t\t\t\t\tc2 = argb8888_interp_256(ax, c3, c2);\n-\t\t\t\tc0 = c1 = c3 = c2;\n-\t\t\t}\n+\t\t\t*ca = 256;\n+\t\t\tif (rr > rr0)\n+\t\t\t\t*ca = 256 - ((rr - rr0) >> 8);\n \t\t}\n-\n-\t\tif (bl && (byy > 0))\n+\t}\n+\n+\tif ((sx + 1) == sw)\n+\t{\n+\t\tif (cout[0] != cout[2])\n+\t\t\tcout[0] = argb8888_interp_256(ay, cout[2], cout[0]);\n+\t\tcout[1] = cout[2] = cout[3] = cout[0];\n+\t}\n+\tif (sy < 0)\n+\t{\n+\t\tif (cout[2] != cout[3])\n+\t\t\tcout[2] = argb8888_interp_256(ax, cout[3], cout[2]);\n+\t\tcout[0] = cout[1] = cout[3] = cout[2];\n+\t}\n+}\n+\n+static inline void _outer_bottom_right(int sx, int sy, int sw, int sh,\n+\t\tuint16_t ax, uint16_t ay,\n+\t\tEina_F16p16 rxx, Eina_F16p16 byy,\n+\t\tEina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n+\tif ((rxx + byy) >= rr0)\n+\t{\n+\t\tint rr = hypot(rxx, byy);\n+\n+\t\t*ca = 0;\n+\t\tif (rr < rr1)\n \t\t{\n-\t\t\tif ((-lxx + byy) >= rr0)\n-\t\t\t{\n-\t\t\t\tint rr = hypot(lxx, byy);\n-\n-\t\t\t\tca = 0;\n-\t\t\t\tif (rr < rr1)\n-\t\t\t\t{\n-\t\t\t\t\tca = 256;\n-\t\t\t\t\tif (rr > rr0)\n-\t\t\t\t\t\tca = 256 - ((rr - rr0) >> 8);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif (sx < 0)\n-\t\t\t{\n-\t\t\t\tif (c1 != c3)\n-\t\t\t\t\tc1 = argb8888_interp_256(ay, c3, c1);\n-\t\t\t\tc0 = c2 = c3 = c1;\n-\t\t\t}\n-\t\t\tif ((sy + 1) == sh)\n-\t\t\t{\n-\t\t\t\tif (c0 != c1)\n-\t\t\t\t\tc0 = argb8888_interp_256(ax, c1, c0);\n-\t\t\t\tc1 = c2 = c3 = c0;\n-\t\t\t}\n+\t\t\t*ca = 256;\n+\t\t\tif (rr > rr0)\n+\t\t\t\t*ca = 256 - ((rr - rr0) >> 8);\n \t\t}\n \t}\n \n+\tif ((sx + 1) == sw)\n+\t{\n+\t\tif (cout[0] != cout[2])\n+\t\t\tcout[0] = argb8888_interp_256(ay, cout[2], cout[0]);\n+\t\tcout[1] = cout[2] = cout[3] = cout[0];\n+\t}\n+\tif ((sy + 1) == sh)\n+\t{\n+\t\tif (cout[0] != cout[1])\n+\t\t\tcout[0] = argb8888_interp_256(ax, cout[1], cout[0]);\n+\t\tcout[1] = cout[2] = cout[3] = cout[0];\n+\t}\n+}\n+\n+static inline void _outer_right_corners(int sx, int sy, int sw, int sh, uint16_t ax, uint16_t ay,\n+\t\tEina_Bool tr, Eina_Bool br,\n+\t\tEina_F16p16 rxx, Eina_F16p16 tyy, Eina_F16p16 byy,\n+\t\tEina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n \tif (rxx > 0)\n \t{\n \t\tif (tr && (tyy < 0))\n-\t\t{\n-\t\t\tif ((rxx - tyy) >= rr0)\n-\t\t\t{\n-\t\t\t\tint rr = hypot(rxx, tyy);\n-\n-\t\t\t\tca = 0;\n-\t\t\t\tif (rr < rr1)\n-\t\t\t\t{\n-\t\t\t\t\tca = 256;\n-\t\t\t\t\tif (rr > rr0)\n-\t\t\t\t\t\tca = 256 - ((rr - rr0) >> 8);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif ((sx + 1) == sw)\n-\t\t\t{\n-\t\t\t\tif (c0 != c2)\n-\t\t\t\t\tc0 = argb8888_interp_256(ay, c2, c0);\n-\t\t\t\tc1 = c2 = c3 = c0;\n-\t\t\t}\n-\t\t\tif (sy < 0)\n-\t\t\t{\n-\t\t\t\tif (c2 != c3)\n-\t\t\t\t\tc2 = argb8888_interp_256(ax, c3, c2);\n-\t\t\t\tc0 = c1 = c3 = c2;\n-\t\t\t}\n-\t\t}\n-\n+\t\t\t_outer_top_right(sx, sy, sw, ax, ay, rxx, tyy, rr0, rr1, cout, ca);\n \t\tif (br && (byy > 0))\n-\t\t{\n-\t\t\tif ((rxx + byy) >= rr0)\n-\t\t\t{\n-\t\t\t\tint rr = hypot(rxx, byy);\n-\n-\t\t\t\tca = 0;\n-\t\t\t\tif (rr < rr1)\n-\t\t\t\t{\n-\t\t\t\t\tca = 256;\n-\t\t\t\t\tif (rr > rr0)\n-\t\t\t\t\t\tca = 256 - ((rr - rr0) >> 8);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif ((sx + 1) == sw)\n-\t\t\t{\n-\t\t\t\tif (c0 != c2)\n-\t\t\t\t\tc0 = argb8888_interp_256(ay, c2, c0);\n-\t\t\t\tc1 = c2 = c3 = c0;\n-\t\t\t}\n-\t\t\tif ((sy + 1) == sh)\n-\t\t\t{\n-\t\t\t\tif (c0 != c1)\n-\t\t\t\t\tc0 = argb8888_interp_256(ax, c1, c0);\n-\t\t\t\tc1 = c2 = c3 = c0;\n-\t\t\t}\n-\t\t}\n-\t}\n-}\n-\n-static void inline _rectangle_inner_corners(void)\n-{\n-\n-}\n-#endif\n+\t\t\t_outer_bottom_right(sx, sy, sw, sh, ax, ay, rxx, byy, rr0, rr1, cout, ca);\n+\t}\n+}\n+\n+static inline void _outer_corners(int sx, int sy, int sw, int sh, uint16_t ax, uint16_t ay,\n+\t\tEina_Bool tl, Eina_Bool tr, Eina_Bool br, Eina_Bool bl,\n+\t\tEina_F16p16 lxx, Eina_F16p16 rxx, Eina_F16p16 tyy, Eina_F16p16 byy,\n+\t\tEina_F16p16 rr0, Eina_F16p16 rr1,\n+\t\tuint32_t cout[4], uint16_t *ca)\n+{\n+\t_outer_left_corners(sx, sy, sh, ax, ay, tl, bl, lxx, tyy, byy, rr0, rr1, cout, ca);\n+\t_outer_right_corners(sx, sy, sw, sh, ax, ay, tr, br, rxx, tyy, byy, rr0, rr1, cout, ca);\n+}\n \n #define EVAL_ROUND_OUTER_CORNERS(c0,c1,c2,c3) \\\n \t\tif (lxx < 0) \\\n@@ -528,8 +558,21 @@\n \t\t\t\tif ((sx + 1) < sw)\n \t\t\t\t\top3 = ocolor;\n \t\t\t}\n-\n+#if 0\n+\t\t\t{\n+\t\t\t\tuint32_t cout[4] = { op0, op1, op2, op3 };\n+\t\t\t\t_outer_corners(sx, sy, sw, sh, ax, ay, tl, tr, br, bl,\n+\t\t\t\t\t\tlxx, rxx, tyy, byy, rr0, rr1, cout, &ca);\n+\n+\n+\t\t\t\top0 = cout[0];\n+\t\t\t\top1 = cout[1];\n+\t\t\t\top2 = cout[2];\n+\t\t\t\top3 = cout[3];\n+\t\t\t}\n+#else\n \t\t\tEVAL_ROUND_OUTER_CORNERS(op0,op1,op2,op3)\n+#endif\n \n \t\t\tif (op0 != op1)\n \t\t\t\top0 = argb8888_interp_256(ax, op1, op0);\n"} {"commit":"cfe839c371969bce0bf91476ae10d63521ecb436","subject":"Added \"xit\" macro, identical to \"pending.\"","message":"Added \"xit\" macro, identical to \"pending.\"\n","repos":"depop\/Kiwi,unisontech\/Kiwi,weslindsay\/Kiwi,TaemoonCho\/Kiwi,unisontech\/Kiwi,allending\/Kiwi,tonyarnold\/Kiwi,carezone\/Kiwi,tcirwin\/Kiwi,howandhao\/Kiwi,ecaselles\/Kiwi,emodeqidao\/Kiwi,tangwei6423471\/Kiwi,unisontech\/Kiwi,PaulTaykalo\/Kiwi,tcirwin\/Kiwi,alloy\/Kiwi,ashfurrow\/Kiwi,indiegogo\/Kiwi,cookov\/Kiwi,unisontech\/Kiwi,hyperoslo\/Tusen,iosRookie\/Kiwi,PaulTaykalo\/Kiwi,ecaselles\/Kiwi,howandhao\/Kiwi,ecaselles\/Kiwi,tonyarnold\/Kiwi,tangwei6423471\/Kiwi,cookov\/Kiwi,tonyarnold\/Kiwi,iosRookie\/Kiwi,iosRookie\/Kiwi,ashfurrow\/Kiwi,weslindsay\/Kiwi,TaemoonCho\/Kiwi,hyperoslo\/Tusen,indiegogo\/Kiwi,TaemoonCho\/Kiwi,hyperoslo\/Tusen,JoistApp\/Kiwi,howandhao\/Kiwi,cookov\/Kiwi,ashfurrow\/Kiwi,allending\/Kiwi,PaulTaykalo\/Kiwi,tonyarnold\/Kiwi,ecaselles\/Kiwi,JoistApp\/Kiwi,carezone\/Kiwi,LiuShulong\/Kiwi,indiegogo\/Kiwi,tangwei6423471\/Kiwi,PaulTaykalo\/Kiwi,allending\/Kiwi,LiuShulong\/Kiwi,emodeqidao\/Kiwi,alloy\/Kiwi,samkrishna\/Kiwi,indiegogo\/Kiwi,weslindsay\/Kiwi,LiuShulong\/Kiwi,JoistApp\/Kiwi,hyperoslo\/Tusen,tcirwin\/Kiwi,depop\/Kiwi,JoistApp\/Kiwi,depop\/Kiwi,emodeqidao\/Kiwi,TaemoonCho\/Kiwi,alloy\/Kiwi,carezone\/Kiwi,samkrishna\/Kiwi,tangwei6423471\/Kiwi,cookov\/Kiwi,allending\/Kiwi,LiuShulong\/Kiwi,weslindsay\/Kiwi,depop\/Kiwi,tcirwin\/Kiwi,samkrishna\/Kiwi,emodeqidao\/Kiwi,iosRookie\/Kiwi,howandhao\/Kiwi,samkrishna\/Kiwi,carezone\/Kiwi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Kiwi\/KiwiMacros.h\n+++ Kiwi\/KiwiMacros.h\n@@ -45,6 +45,7 @@\n #define afterEach(...) afterEachWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)\n #define it(...) itWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)\n #define pending(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)\n+ #define xit(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)\n #endif \/\/ #if KW_BLOCKS_ENABLED\n \n \/\/ If a gcc compatible compiler is available, use the statement and\n"} {"commit":"854914d830d62468c57f395fe3d65c8eaf3a25be","subject":"update","message":"update\n","repos":"lianchengjiang\/LCUIKit,lianchengjiang\/LCUIKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- LCUIKit\/LCUIKit.h\n+++ LCUIKit\/LCUIKit.h\n@@ -12,6 +12,7 @@\n #import \"UIColor+LCHexValue.h\"\n #import \"UIButton+LCAlignment.h\"\n #import \"UILabel+LCConvenience.h\"\n+#import \"UITableView+LCTableHeader.h\"\n \n \n #endif \/* LCUIKit_h *\/\n"} {"commit":"c05ed0c3e4b3db60ce889821e8bfa4309f94bf5c","subject":"PositionManager implements getComponentType","message":"PositionManager implements getComponentType\n\nThis ComponentManager sub-class now implements the new abstract\ngetComponentType method, returning the Position enumeration of the\ncomponent_t type.\n","repos":"Kromey\/roglick","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/main\/entity\/components\/PositionManager.h\n+++ src\/main\/entity\/components\/PositionManager.h\n@@ -52,6 +52,13 @@\n \t\tvirtual void removeComponent(Entity e);\n \n \t\t\/**\n+\t\t * PositionManager is the ComponentManager sub-class for Position.\n+\t\t *\n+\t\t * @return The Position enumeration of component_t.\n+\t\t *\/\n+\t\tvirtual component_t getComponentType() { return Position; };\n+\n+\t\t\/**\n \t\t * Retrieve the position of the given Entity. Returns NULL_POS if\n \t\t * the Entity does not have a PositionComponent.\n \t\t *\n"} {"commit":"7829d975ed9474d08cfd1ce9c7d0e603dc410d76","subject":"Documentation for PositionComponent","message":"Documentation for PositionComponent\n","repos":"Kromey\/roglick","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/main\/entity\/components\/PositionManager.h\n+++ src\/main\/entity\/components\/PositionManager.h\n@@ -6,6 +6,9 @@\n #include \"entity\/Entity.h\"\n #include \"entity\/components\/ComponentManager.h\"\n \n+\/**\n+ * Data structure for a position component.\n+ *\/\n typedef struct\n {\n \tint x;\n"} {"commit":"cbf4e3a18f4bbf2370970c70f7c41bc3700d9252","subject":"Updated code comment.","message":"Updated code comment.\n","repos":"optimizely\/objective-c-sdk,optimizely\/objective-c-sdk,relayrides\/objective-c-sdk,optimizely\/objective-c-sdk,relayrides\/objective-c-sdk,relayrides\/objective-c-sdk,relayrides\/objective-c-sdk,optimizely\/objective-c-sdk","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OptimizelySDKShared\/OptimizelySDKShared\/OPTLYDataStore.h\n+++ OptimizelySDKShared\/OptimizelySDKShared\/OPTLYDataStore.h\n@@ -35,7 +35,7 @@\n \/\/\/ base directory where Optimizely-related data will persist\n @property (nonatomic, strong, readonly, nonnull) NSString *baseDirectory;\n \n-\/\/ ---- NSFileMAnager ----\n+\/\/ ---- NSFileManager ----\n \/**\n * Saves a file.\n * If a file of the same name type exists already, then that file will be overwritten.\n@@ -119,7 +119,7 @@\n error:(NSError * _Nullable * _Nullable)error;\n \n \n-\/\/ ---- database table ----\n+\/\/ ---- SQLite Table ----\n #if TARGET_OS_IOS\n \/**\n * Inserts data into a database table.\n"} {"commit":"1e204a651a1abecdd2779324a0c836c2ec1aa3c1","subject":"Remove obsolete sys\/nacl_imc_api.h header","message":"Remove obsolete sys\/nacl_imc_api.h header\n\nThis file was left as a placeholder after the move to src\/public\/.\nNow that chromium\/src\/DEPS has been updated, it's no longer required.\n\nBUG= https:\/\/code.google.com\/p\/nativeclient\/issues\/detail?id=2832\nTEST= trybots\nR=mseaborn@chromium.org\n\nReview URL: https:\/\/codereview.chromium.org\/16525004\n\ngit-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@11492 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2\n","repos":"Lind-Project\/native_client,Lind-Project\/native_client,Lind-Project\/native_client,Lind-Project\/native_client,Lind-Project\/native_client,Lind-Project\/native_client","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/trusted\/service_runtime\/include\/sys\/nacl_imc_api.h\n+++ src\/trusted\/service_runtime\/include\/sys\/nacl_imc_api.h\n@@ -1,16 +0,0 @@\n-\/*\n- * Copyright (c) 2013 The Native Client Authors. All rights reserved.\n- * Use of this source code is governed by a BSD-style license that can be\n- * found in the LICENSE file.\n- *\/\n-\n-\/*\n- * This is a temporary placeholder file to support existing versions of\n- * chromium\/src\/ppapi\/native_client\/src\/trusted\/plugin\/service_runtime.cc\n- * until chromium\/src\/DEPS gets updated so that file can be changed to use\n- * public\/imc_types.h directly.\n- *\n- * TODO(mcgrathr): Remove this file completely after chromium gets updated\n- * not to refer to it.\n- *\/\n-#include \"native_client\/src\/public\/imc_types.h\"\n"} {"commit":"5f7e3bdfdbc880f726811009c19d00f4eb6880d7","subject":"We need to free active neighbours in more than one place.","message":"We need to free active neighbours in more than one place.\n","repos":"SimPrints\/libAFIS,mjfh\/libAFIS,SimPrints\/libAFIS,mjfh\/libAFIS,mjfh\/libAFIS,SimPrints\/libAFIS","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Sources\/Extraction\/MinutiaeDetection\/MinutiaeDetection.c\n+++ Sources\/Extraction\/MinutiaeDetection\/MinutiaeDetection.c\n@@ -83,6 +83,17 @@\n return neighbors;\n }\n \n+static void FreeActiveNeighbours(List *activeNeighbors) \n+{\n+ \/\/ Free up the active neighburs list to stop leaking memory...\n+ for(ListElement *element = activeNeighbors->head; element != NULL; element = element->next)\n+ {\n+ Point *point;\n+ List_Remove(activeNeighbors, element, (void **) &point);\n+ free(point);\n+ }\n+}\n+\n static Point * CopyPoint(Point p) {\n Point * pointCopy = calloc(1, sizeof(*pointCopy));\n *pointCopy = p;\n@@ -104,6 +115,7 @@\n point = ArePointsEqual(*(Point *)neighbors.head->data, prev) ?\n *(Point *)neighbors.head->next->data : *(Point *)neighbors.head->data;\n prev = point;\n+ FreeActiveNeighbours(&neighbors);\n }\n List_AddData(&outputPoints, CopyPoint(point));\n return outputPoints;\n@@ -141,13 +153,7 @@\n List_AddData(&minutia->ridges, CopyRidge(ridge));\n }\n \n- \/\/ Free up the active neighburs list to stop leaking memory...\n- for(ListElement *element = activeNeighbors.head; element != NULL; element = element->next)\n- {\n- Point *point;\n- List_Remove(&activeNeighbors, element, (void **) &point);\n- free(point);\n- }\n+ FreeActiveNeighbours(&activeNeighbors);\n }\n }\n \n"} {"commit":"7b6004ca958840666d0516f77aa5cb38deff9604","subject":"Fixing static definition for button state","message":"Fixing static definition for button state\n","repos":"fire1\/ArduinoMid,fire1\/ArduinoMid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- MID\/lib\/MenuBtn.h\n+++ MID\/lib\/MenuBtn.h\n@@ -71,7 +71,7 @@\n \n };\n \n-static uint8_t MenuBtn::STATE;\n+uint8_t MenuBtn::STATE = LOW;\n \n \n MenuBtn::MenuBtn(IntAmp *_amp, CarSens *_car, EepRom *_eep, WhlSens *_whl, CarState *_stt) {\n@@ -80,6 +80,7 @@\n eep = _eep;\n whl = _whl;\n stt = _stt;\n+\n }\n \n uint8_t MenuBtn::getPinUp(void) {\n"} {"commit":"4780dc326c85d41b54e2cced6c7de48ff9f1f2e7","subject":"After tests ... commit","message":"After tests ... commit\n","repos":"fire1\/ArduinoMid,fire1\/ArduinoMid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- MID\/lib\/MidMenu.h\n+++ MID\/lib\/MidMenu.h\n@@ -240,16 +240,17 @@\n navigate();\n \/\/\n \/\/\n- if (MidMenu::where != activeMenu) {\n+ if (MidMenu::where != activeMenu && MidMenu::cursorMenu != MENU_ENTER) {\n \/\/\n \/\/ Keep cursor in save place\n savedCursor = MidMenu::cursorMenu;\n \/\/\n \/\/ Change menu to show info\n- cursor = MENU_ENTER;\n- } else {\n- cursor = MidMenu::cursorMenu;\n- }\n+ MidMenu::cursorMenu = MENU_ENTER;\n+ }\n+\n+ cursor = MidMenu::cursorMenu;\n+\n }\n \n \/**\n@@ -257,30 +258,45 @@\n *\/\n void MidMenu::display() {\n \n- if (ampInt.isSec()) {\n+ MidMenu::cursorMenu = MENU_ENTER;\n+\n+ lcd.clear();\n+ lcd.setCursor(0, 0);\n+ lcd.setCursor(0, 0);\n+ lcd.print(\"~ \");\n+ delay(100);\n+ lcd.print(MidMenu::where);\n+ delay(300); \/\/delay to allow message reading\n+ lcd.setCursor(0, 0);\n+\n+\n+ carSens.clearBaseData();\n+ activeMenu = MidMenu::where;\n+ enterDisplay = 0;\n+ MidMenu::cursorMenu = savedCursor;\n+ lcd.clear();\n+ \/\/\n+ \/\/ fixes value peek\n+ \/\/ reset base global vars\n+\n+\/* if (ampInt.isSec()) {\n lcd.clear();\n lcd.setCursor(0, 0);\n lcd.print(\" ->\");\n- }\n-\n- if (ampInt.isMid()) {\n- lcd.setCursor(0, 0);\n- lcd.print(\"-> \");\n- }\n-\n- if (!enterDisplay && ampInt.isBig()) {\n- lcd.clear();\n- lcd.setCursor(0, 0);\n- lcd.print(\" ->\");\n- \/\/\n- \/\/\n- lcd.print(MidMenu::where);\n- lcd.setCursor(0, 0);\n- lcd.clear();\n- enterDisplay = 1;\n- }\n-\n- if (enterDisplay && ampInt.isBig()) {\n+\n+ Serial.print(\"MENU \");\n+ Serial.print(MidMenu::cursorMenu);\n+ Serial.print(\" \");\n+ Serial.print(MidMenu::where);\n+ Serial.print(\" \");\n+ Serial.print(MidMenu::where);\n+ Serial.print(\" \");\n+ Serial.println(savedCursor);\n+\n+ }\n+\n+\n+ if (enterDisplay && ampInt.isMid()) {\n \/\/\n \/\/ fixes value peek\n \/\/ reset base global vars\n@@ -290,6 +306,20 @@\n MidMenu::cursorMenu = savedCursor;\n lcd.clear();\n }\n+\n+ if (!enterDisplay && ampInt.isBig()) {\n+ lcd.clear();\n+ lcd.setCursor(0, 0);\n+ lcd.print(\" ->\");\n+ \/\/\n+ \/\/\n+ lcd.print(MidMenu::where);\n+ lcd.setCursor(0, 0);\n+ lcd.clear();\n+ enterDisplay = 1;\n+ }\n+*\/\n+\n \n }\n \n"} {"commit":"ea037dcfb278d5a0f008b6bd68d1044732a87bd1","subject":"ENH: remove shapeAnalysisMANCOVACLP.h","message":"ENH: remove shapeAnalysisMANCOVACLP.h\n","repos":"bpaniagua\/SPHARM-PDM,bpaniagua\/SPHARM-PDM,NIRALUser\/SPHARM-PDM,zarquon42b\/SPHARM-PDM,zarquon42b\/SPHARM-PDM,NIRALUser\/SPHARM-PDM,bpaniagua\/SPHARM-PDM,NIRALUser\/SPHARM-PDM","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Applications\/StatNonParamTestPDM\/shapeAnalysisMANCOVACLP.h\n+++ Applications\/StatNonParamTestPDM\/shapeAnalysisMANCOVACLP.h\n@@ -1,736 +0,0 @@\n-\/\/ This file was automatically generated by:\n-\/\/ \/tools\/Slicer3\/Slicer3-3.4.1-2009-10-09-linux-x86_64\/bin\/GenerateCLP --InputXML \/home\/hamelc\/Neurolib\/NeuroLib\/Applications\/StatNonParamTestPDM\/shapeAnalysisMANCOVA.xml --OutputCxx \/home\/hamelc\/Neurolib\/NeuroLib_linux64\/Applications\/StatNonParamTestPDM\/shapeAnalysisMANCOVACLP.h\n-\/\/\n-#include \n-#include \n-#include \n-#include \n-#include \n-#include \n-\n-#include \n-\n-#include \"tclap\/CmdLine.h\"\n-#include \"ModuleProcessInformation.h\"\n-\n-#ifdef WIN32\n-#define Module_EXPORT __declspec(dllexport)\n-#else\n-#define Module_EXPORT \n-#endif\n-\n-#if defined(main) && !defined(REGISTER_TEST)\n-\/\/ If main defined as a preprocessor symbol, redefine it to the expected entry point.\n-#undef main\n-#define main ModuleEntryPoint\n-\n-extern \"C\" {\n- Module_EXPORT char *GetXMLModuleDescription();\n- Module_EXPORT int ModuleEntryPoint(int, char*[]);\n-}\n-#endif\n-\n-extern \"C\" {\n-Module_EXPORT char XMLModuleDescription[] = \n-\"\\n\"\n-\"\\n\"\n-\" Statistics<\/category>\\n\"\n-\" MANCOVA Shape Analysis Tool<\/title>\\n\"\n-\" <description>shapeAnalysisMANCOVA offers statistical shape analysis based on a parametric boundary description (SPHARM) as the point-based model computing method. The point-based models will be analyzed with the methods here proposed using multivariate analysis of covariance (MANCOVA). Here, the number of variates being tested is the dimensionality of our observations. Each point of these observations is a three dimensional displacement vector from the mean. The number of contrasts is the number of equations involved in the null-hypothesis. In order to encompass varying numbers of variates and contrasts, and to account for independent variables, a matrix computation is performed. This matrix represents the multidimensional aspects of the correlation significance and it can be transformed into a scalar measure by manipulation of its eigenvalues.\\n\"\n-\" <\/description>\\n\"\n-\" <version>0.0.1.$Revision: 1.2 $(alpha)<\/version>\\n\"\n-\" <documentation-url>http:\/\/hdl.handle.net\/10380\/3124<\/documentation-url>\\n\"\n-\" <license><\/license>\\n\"\n-\" <contributor>Beatriz Paniagua, Marc Niethammer, Marc Macenko, Corentin Hamel<\/contributor>\\n\"\n-\"\\n\"\n-\" <parameters>\\n\"\n-\" <label>I\/O Files<\/label>\\n\"\n-\" <file>\\n\"\n-\" <name>infile<\/name>\\n\"\n-\" <label>Input File<\/label>\\n\"\n-\" <channel>input<\/channel>\\n\"\n-\" <index>1<\/index>\\n\"\n-\" <description>File which contains all of the data to be analyzed. File is a list pointing to other data sources.<\/description>\\n\"\n-\" <\/file>\\n\"\n-\" \\n\"\n-\" <integer>\\n\"\n-\" <name>infileColumn<\/name>\\n\"\n-\" <label>Input File Column<\/label>\\n\"\n-\" <longflag>--infileColumn<\/longflag>\\n\"\n-\" <default>0<\/default>\\n\"\n-\" <description>Choose the column of the input file containing the testing surface. Index starting at 0.<\/description>\\n\"\n-\" <\/integer>\\n\"\n-\"\t\\n\"\n-\" <string>\\n\"\n-\" <name>outbase<\/name>\\n\"\n-\" <label>Name base for output files<\/label>\\n\"\n-\" <longflag>--out<\/longflag>\\n\"\n-\" <flag>o<\/flag>\\n\"\n-\" <default>statResult<\/default>\\n\"\n-\" <description>All output files will have this as their base.<\/description>\\n\"\n-\" <\/string>\\n\"\n-\" <\/parameters>\\n\"\n-\" \\n\"\n-\" <parameters>\\n\"\n-\" <label>Input Reading Parameters<\/label>\\n\"\n-\" <description>Input paramters in order to read the input file<\/description>\\n\"\n-\" \\n\"\n-\" <integer>\\n\"\n-\" <name>numPerms<\/name>\\n\"\n-\" <label>Number of permutations to perform.<\/label>\\n\"\n-\" <longflag>--numPerms<\/longflag>\\n\"\n-\" <flag>n<\/flag>\\n\"\n-\" <description>Number of permutations to perform.<\/description>\\n\"\n-\" <default>10000<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>1<\/minimum>\\n\"\n-\" <step>1<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/integer>\\n\"\n-\"\t\\n\"\n-\" <integer>\\n\"\n-\" <name>numGroupTypes<\/name>\\n\"\n-\" <label>Number of different classification types.<\/label>\\n\"\n-\" <longflag>--numGroupTypes<\/longflag>\\n\"\n-\" <flag>g<\/flag>\\n\"\n-\" <description>Number of different classification types.<\/description>\\n\"\n-\" <default>1<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>1<\/minimum>\\n\"\n-\" <step>1<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/integer>\\n\"\n-\" \\n\"\n-\" <integer-vector>\\n\"\n-\" <name>groupTypeColumns<\/name>\\n\"\n-\" <label>Columns containing a Group Type<\/label>\\n\"\n-\" <longflag>--columnGroupTypes<\/longflag>\\n\"\n-\" <description>Columns containing a Group Type. Index is starting at 0.<\/description>\\n\"\n-\" <default>0<\/default>\\n\"\n-\" <\/integer-vector>\\n\"\n-\" \\n\"\n-\" <integer>\\n\"\n-\" <name>numIndependent<\/name>\\n\"\n-\" <label>Number of different independent variables.<\/label>\\n\"\n-\" <longflag>--numIndependent<\/longflag>\\n\"\n-\" <flag>i<\/flag>\\n\"\n-\" <description>Number of different independent variables associated with each subject.<\/description>\\n\"\n-\" <default>0<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>0<\/minimum>\\n\"\n-\" <step>1<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/integer>\\n\"\n-\" \\n\"\n-\" <integer-vector>\\n\"\n-\" <name>independentColumns<\/name>\\n\"\n-\" <label>Columns containing independent variables<\/label>\\n\"\n-\" <longflag>--columnIndependent<\/longflag>\\n\"\n-\" <description>Columns containing independent variables. Index is starting at 0.<\/description>\\n\"\n-\" <default>0<\/default>\\n\"\n-\" <\/integer-vector>\\n\"\n-\" \\n\"\n-\" <boolean>\\n\"\n-\"\t<name>surfListScale<\/name>\\n\"\n-\"\t<label>Scale all point data by the cube-root of the scale factor.<\/label>\\n\"\n-\"\t<default>false<\/default>\\n\"\n-\"\t<longflag>--scale<\/longflag>\\n\"\n-\"\t<flag>s<\/flag>\\n\"\n-\"\t<description>Scale all point data by the cube-root of the scale factor found in the input file. This is typically used for correcting differences such as varying intercranial volumes (ICV).<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\" \\n\"\n-\" <integer>\\n\"\n-\"\t<name>scaleColumn<\/name>\\n\"\n-\"\t<label>Column containing the scale factor<\/label>\\n\"\n-\"\t<longflag>--scaleColumn<\/longflag>\\n\"\n-\"\t<default>0<\/default>\\n\"\n-\"\t<description>Column containing the scale factor. Index is starting a 0.<\/description>\\n\"\n-\" <\/integer>\\n\"\n-\"\t\\n\"\n-\" <integer>\\n\"\n-\" <name>testColumn<\/name>\\n\"\n-\" <label>Column tested<\/label>\\n\"\n-\" <longflag>--testColumn<\/longflag>\\n\"\n-\" <flag>t<\/flag>\\n\"\n-\" <description>Which column of the data is being tested (0 based). If this is a standard \\\"Group Test\\\", it will be one of the group columns. If it is an \\\"Interaction Test\\\", it will be one of the independent variable columns.<\/description>\\n\"\n-\" <default>0<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>0<\/minimum>\\n\"\n-\" <step>1<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/integer>\\n\"\n-\" \\n\"\n-\" \\n\"\n-\" <boolean>\\n\"\n-\"\t<name>KWMreadableInputFile<\/name>\\n\"\n-\"\t<label> Input KWMeshVisu readable feature (vector) file.<\/label>\\n\"\n-\"\t<default>false<\/default>\\n\"\n-\"\t<longflag>--KWMinput<\/longflag>\\n\"\n-\"\t<description> Input data will be obtained from a KWMeshVisu readable feature (vector) file instead of the 3-d coordinates in a MeshFile.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"<\/parameters>\\n\"\n-\"\\n\"\n-\" <parameters>\\n\"\n-\" <label>Analysis Parameters<\/label>\\n\"\n-\" <description>Parameters for the shape analysis<\/description>\\n\"\n-\" \\n\"\n-\" <double>\\n\"\n-\" <name>significanceLevel<\/name>\\n\"\n-\" <label>Cutoff of p-values considering significant.<\/label>\\n\"\n-\" <longflag>--significanceLevel<\/longflag>\\n\"\n-\" <flag>p<\/flag>\\n\"\n-\" <description>What cutoff of p-values is considered significant.<\/description>\\n\"\n-\" <default>0.05<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>0<\/minimum>\\n\"\n-\" <maximum>1<\/maximum>\\n\"\n-\" <step>.001<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/double>\\n\"\n-\" <double>\\n\"\n-\" <name>FDRdiscoveryLevel<\/name>\\n\"\n-\" <label>FDR threshold value<\/label>\\n\"\n-\" <longflag>--FDRdiscoveryLevel<\/longflag>\\n\"\n-\" <flag>r<\/flag>\\n\"\n-\" <description> FDR discovery threshold for posttest correction<\/description>\\n\"\n-\" <default>0.05<\/default>\\n\"\n-\" <constraints>\\n\"\n-\" <minimum>0<\/minimum>\\n\"\n-\" <maximum>1<\/maximum>\\n\"\n-\" <step>.001<\/step>\\n\"\n-\" <\/constraints>\\n\"\n-\" <\/double>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>writeZScores<\/name>\\n\"\n-\" <label> out the z-scores.<\/label>\\n\"\n-\" <longflag>--writeZScores<\/longflag>\\n\"\n-\" <description>Writes out the z-scores. Only uses group assignments from the first group column currently. z-score of group A is computed with mean and standard deviation from group B and vice versa. z-scores are output based on the projections on the mean surface normal as well as the corresponding Mahalanobis distances (where no projection is performed).<\/description>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>computeScaleFactorFromVolumes<\/name>\\n\"\n-\" <label>Compute scale factor from volumes.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--computeScaleFactorFromVolumes<\/longflag>\\n\"\n-\" <description>Reinterprets the scaling column values as volumes and compute the scaling factor from them. WARNING: This is different from the traditional file format where these scaling were already pre-computed.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\t\\n\"\n-\" <boolean>\\n\"\n-\" <name>interactionTest<\/name>\\n\"\n-\" <label>Test for statistically significant interaction.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--interactionTest<\/longflag>\\n\"\n-\" <flag>a<\/flag>\\n\"\n-\" <description>Instead of a group test, simply test for statistically significant interaction of the data with a single independent variable.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>simpleCorrs<\/name>\\n\"\n-\" <label>Simple correlations (Spearman, Pearson).<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--simpleCorrs<\/longflag>\\n\"\n-\" <description>Simple Spearman and Pearson correlations are computed, based on the normal to the average shape. This option is only valid in interaction test mode.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>computeParametricP<\/name>\\n\"\n-\" <label>Simple corr: Parametric p-value.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--simpleCorrsParaP<\/longflag>\\n\"\n-\" <description>Computes the p-value parametrically for the simple correlation test.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\" \\n\"\n-\" <boolean>\\n\"\n-\" <name>debug<\/name>\\n\"\n-\" <label>Outputs additional debugging information.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--debug<\/longflag>\\n\"\n-\" <flag>d<\/flag>\\n\"\n-\" <description>Outputs additional debugging information.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>useRoy<\/name>\\n\"\n-\" <label>Roy statistics.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--roy<\/longflag>\\n\"\n-\" <description>Uses Roy statistic for MANCOVA testing.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>useWilks<\/name>\\n\"\n-\" <label>Wilks statistics.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--wilks<\/longflag>\\n\"\n-\" <description>Uses Wilks statistic for MANCOVA testing.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>useHotelling<\/name>\\n\"\n-\" <label>Hotelling statistics.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--hotelling<\/longflag>\\n\"\n-\" <description>Uses Hotelling statistic for MANCOVA testing.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>usePillai<\/name>\\n\"\n-\" <label>Pillai statistics.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--pillai<\/longflag>\\n\"\n-\" <description>Uses Pillai statistic for MANCOVA testing.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>negativeCorrelation<\/name>\\n\"\n-\" <label>Negative correlation.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--negativeCorrelation<\/longflag>\\n\"\n-\" <description>For the simple (non-MANCOVA) correlation, test for negative correlation. (Only works in conjunction with parametric testing!)<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>positiveCorrelation<\/name>\\n\"\n-\" <label>Positive correlation.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--positiveCorrelation<\/longflag>\\n\"\n-\" <description>For the simple (non-MANCOVA) correlation, test for positive correlation.(Only works in conjunction with parametric testing!)<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\"\\n\"\n-\" <boolean>\\n\"\n-\" <name>trendCorrelation<\/name>\\n\"\n-\" <label>Trend correlation.<\/label>\\n\"\n-\" <default>false<\/default>\\n\"\n-\" <longflag>--trendCorrelation<\/longflag>\\n\"\n-\" <description>For the simple (non-MANCOVA) correlation, test for correlation.<\/description>\\n\"\n-\" <\/boolean>\\n\"\n-\" \\n\"\n-\"<\/parameters>\\n\"\n-\"\\n\"\n-\" <\/executable>\\n\"\n-\"\\n\"\n-;\n-\n-}\n-\n-void\n-splitString (const std::string &text,\n- const std::string &separators,\n- std::vector<std::string> &words)\n-{\n- const std::string::size_type n = text.length();\n- std::string::size_type start = text.find_first_not_of(separators);\n- while (start < n)\n- {\n- std::string::size_type stop = text.find_first_of(separators, start);\n- if (stop > n) stop = n;\n- words.push_back(text.substr(start, stop - start));\n- start = text.find_first_not_of(separators, stop+1);\n- }\n-}\n-\n-void\n-splitFilenames (const std::string &text,\n- std::vector<std::string> &words)\n-{\n- const std::string::size_type n = text.length();\n- bool quoted;\n- std::string comma(\",\");\n- std::string quote(\"\\\"\");\n- std::string::size_type start = text.find_first_not_of(comma);\n- while (start < n)\n- {\n- quoted = false;\n- std::string::size_type startq = text.find_first_of(quote, start);\n- std::string::size_type stopq = text.find_first_of(quote, startq+1);\n- std::string::size_type stop = text.find_first_of(comma, start);\n- if (stop > n) stop = n;\n- if (startq != std::string::npos && stopq != std::string::npos)\n- {\n- while (startq < stop && stop < stopq && stop != n)\n- {\n- quoted = true;\n- stop = text.find_first_of(comma, stop+1);\n- if (stop > n) stop = n;\n- }\n- }\n- if (!quoted)\n- {\n- words.push_back(text.substr(start, stop - start));\n- }\n- else\n- {\n- words.push_back(text.substr(start+1, stop - start-2));\n- }\n- start = text.find_first_not_of(comma, stop+1);\n- }\n-}\n-\n-char *GetXMLModuleDescription()\n-{\n- return XMLModuleDescription;\n-}\n-\n-#define GENERATE_LOGO\n-#define GENERATE_XML \\\n- if (argc >= 2 && (strcmp(argv[1],\"--xml\") == 0)) \\\n- { \\\n- std::cout << GetXMLModuleDescription(); \\\n- return EXIT_SUCCESS; \\\n- }\n-#define GENERATE_TCLAP \\\n- std::string infile; \\\n- int infileColumn = 0; \\\n- std::string outbase = \"statResult\"; \\\n- int numPerms = 10000; \\\n- int numGroupTypes = 1; \\\n- std::string groupTypeColumnsTemp = \"0\"; \\\n- std::vector<int> groupTypeColumns; \\\n- int numIndependent = 0; \\\n- std::string independentColumnsTemp = \"0\"; \\\n- std::vector<int> independentColumns; \\\n- bool surfListScale = false; \\\n- int scaleColumn = 0; \\\n- int testColumn = 0; \\\n- bool KWMreadableInputFile = false; \\\n- double significanceLevel = 0.05; \\\n- double FDRdiscoveryLevel= 0.05; \\\n- bool writeZScores = false; \\\n- bool computeScaleFactorFromVolumes = false; \\\n- bool interactionTest = false; \\\n- bool simpleCorrs = false; \\\n- bool computeParametricP = false; \\\n- bool debug = false; \\\n- bool useRoy = false; \\\n- bool useWilks = false; \\\n- bool useHotelling = false; \\\n- bool usePillai = false; \\\n- bool negativeCorrelation = false; \\\n- bool positiveCorrelation = false; \\\n- bool trendCorrelation = false; \\\n- bool echoSwitch = false; \\\n- bool xmlSwitch = false; \\\n- std::string processInformationAddressString = \"0\"; \\\n- std::string fullDescription(\"Description: \"); \\\n- fullDescription += \"shapeAnalysisMANCOVA offers statistical shape analysis based on a parametric boundary description (SPHARM) as the point-based model computing method. The point-based models will be analyzed with the methods here proposed using multivariate analysis of covariance (MANCOVA). Here, the number of variates being tested is the dimensionality of our observations. Each point of these observations is a three dimensional displacement vector from the mean. The number of contrasts is the number of equations involved in the null-hypothesis. In order to encompass varying numbers of variates and contrasts, and to account for independent variables, a matrix computation is performed. This matrix represents the multidimensional aspects of the correlation significance and it can be transformed into a scalar measure by manipulation of its eigenvalues.\"; \\\n- if (!std::string(\"Beatriz Paniagua, Marc Niethammer, Marc Macenko, Corentin Hamel\").empty()) \\\n- { \\\n- fullDescription += \"\\nAuthor(s): Beatriz Paniagua, Marc Niethammer, Marc Macenko, Corentin Hamel\"; \\\n- } \\\n- if (!std::string(\"\").empty()) \\\n- { \\\n- fullDescription += \"\\nAcknowledgements: \"; \\\n- } \\\n- TCLAP::CmdLine commandLine (fullDescription, \\\n- ' ', \\\n- \"0.0.1.$Revision: 1.2 $(alpha)\" ); \\\n- \\\n- itksys_ios::ostringstream msg; \\\n- msg.str(\"\");msg << \"File which contains all of the data to be analyzed. File is a list pointing to other data sources.\"; TCLAP::UnlabeledValueArg<std::string> infileArg(\"infile\", msg.str(), 1, infile, \"std::string\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Choose the column of the input file containing the testing surface. Index starting at 0. (default: \" << infileColumn << \")\"; \\\n- TCLAP::ValueArg<int > infileColumnArg(\"\", \"infileColumn\", msg.str(), 0, infileColumn, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"All output files will have this as their base. (default: \" << outbase << \")\"; \\\n- TCLAP::ValueArg<std::string > outbaseArg(\"o\", \"out\", msg.str(), 0, outbase, \"std::string\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Number of permutations to perform. (default: \" << numPerms << \")\"; \\\n- TCLAP::ValueArg<int > numPermsArg(\"n\", \"numPerms\", msg.str(), 0, numPerms, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Number of different classification types. (default: \" << numGroupTypes << \")\"; \\\n- TCLAP::ValueArg<int > numGroupTypesArg(\"g\", \"numGroupTypes\", msg.str(), 0, numGroupTypes, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Columns containing a Group Type. Index is starting at 0. (default: \" << groupTypeColumnsTemp << \")\"; \\\n- TCLAP::ValueArg<std::string > groupTypeColumnsArg(\"\", \"columnGroupTypes\", msg.str(), 0, groupTypeColumnsTemp, \"std::vector<int>\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Number of different independent variables associated with each subject. (default: \" << numIndependent << \")\"; \\\n- TCLAP::ValueArg<int > numIndependentArg(\"i\", \"numIndependent\", msg.str(), 0, numIndependent, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Columns containing independent variables. Index is starting at 0. (default: \" << independentColumnsTemp << \")\"; \\\n- TCLAP::ValueArg<std::string > independentColumnsArg(\"\", \"columnIndependent\", msg.str(), 0, independentColumnsTemp, \"std::vector<int>\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Scale all point data by the cube-root of the scale factor found in the input file. This is typically used for correcting differences such as varying intercranial volumes (ICV). (default: \" << surfListScale << \")\"; \\\n- TCLAP::SwitchArg surfListScaleArg(\"s\", \"scale\", msg.str(), commandLine, surfListScale); \\\n- \\\n- msg.str(\"\");msg << \"Column containing the scale factor. Index is starting a 0. (default: \" << scaleColumn << \")\"; \\\n- TCLAP::ValueArg<int > scaleColumnArg(\"\", \"scaleColumn\", msg.str(), 0, scaleColumn, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Which column of the data is being tested (0 based). If this is a standard 'Group Test', it will be one of the group columns. If it is an 'Interaction Test', it will be one of the independent variable columns. (default: \" << testColumn << \")\"; \\\n- TCLAP::ValueArg<int > testColumnArg(\"t\", \"testColumn\", msg.str(), 0, testColumn, \"int\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Input data will be obtained from a KWMeshVisu readable feature (vector) file instead of the 3-d coordinates in a MeshFile. (default: \" << KWMreadableInputFile << \")\"; \\\n- TCLAP::SwitchArg KWMreadableInputFileArg(\"\", \"KWMinput\", msg.str(), commandLine, KWMreadableInputFile); \\\n- \\\n- msg.str(\"\");msg << \"What cutoff of p-values is considered significant. Only affects the FDR corrected results. (default: \" << significanceLevel<< \")\"; \\\n- TCLAP::ValueArg<double > significanceLevelArg(\"p\", \"significanceLevel\", msg.str(), 0, significanceLevel, \"double\", commandLine); \\\n-\\\n-msg.str(\"\");msg << \"What cutoff of p-values is considered significant. Only affects the FDR corrected results. (default: \" << FDRdiscoveryLevel << \")\"; \\\n- TCLAP::ValueArg<double > FDRdiscoveryLevelArg(\"r\", \"FDRdiscoveryLevel\", msg.str(), 0, FDRdiscoveryLevel, \"double\", commandLine); \\\n- \\\n- msg.str(\"\");msg << \"Writes out the z-scores. Only uses group assignments from the first group column currently. z-score of group A is computed with mean and standard deviation from group B and vice versa. z-scores are output based on the projections on the mean surface normal as well as the corresponding Mahalanobis distances (where no projection is performed). (default: \" << writeZScores << \")\"; \\\n- TCLAP::SwitchArg writeZScoresArg(\"\", \"writeZScores\", msg.str(), commandLine, writeZScores); \\\n- \\\n- msg.str(\"\");msg << \"Reinterprets the scaling column values as volumes and compute the scaling factor from them. WARNING: This is different from the traditional file format where these scaling were already pre-computed. (default: \" << computeScaleFactorFromVolumes << \")\"; \\\n- TCLAP::SwitchArg computeScaleFactorFromVolumesArg(\"\", \"computeScaleFactorFromVolumes\", msg.str(), commandLine, computeScaleFactorFromVolumes); \\\n- \\\n- msg.str(\"\");msg << \"Instead of a group test, simply test for statistically significant interaction of the data with a single independent variable. (default: \" << interactionTest << \")\"; \\\n- TCLAP::SwitchArg interactionTestArg(\"a\", \"interactionTest\", msg.str(), commandLine, interactionTest); \\\n- \\\n- msg.str(\"\");msg << \"Simple Spearman and Pearson correlations are computed, based on the normal to the average shape. This option is only valid in interaction test mode. (default: \" << simpleCorrs << \")\"; \\\n- TCLAP::SwitchArg simpleCorrsArg(\"\", \"simpleCorrs\", msg.str(), commandLine, simpleCorrs); \\\n- \\\n- msg.str(\"\");msg << \"Computes the p-value parametrically for the simple correlation test. (default: \" << computeParametricP << \")\"; \\\n- TCLAP::SwitchArg computeParametricPArg(\"\", \"simpleCorrsParaP\", msg.str(), commandLine, computeParametricP); \\\n- \\\n- msg.str(\"\");msg << \"Outputs additional debugging information. (default: \" << debug << \")\"; \\\n- TCLAP::SwitchArg debugArg(\"d\", \"debug\", msg.str(), commandLine, debug); \\\n- \\\n- msg.str(\"\");msg << \"Uses Roy statistic for MANCOVA testing. (default: \" << useRoy << \")\"; \\\n- TCLAP::SwitchArg useRoyArg(\"\", \"roy\", msg.str(), commandLine, useRoy); \\\n- \\\n- msg.str(\"\");msg << \"Uses Wilks statistic for MANCOVA testing. (default: \" << useWilks << \")\"; \\\n- TCLAP::SwitchArg useWilksArg(\"\", \"wilks\", msg.str(), commandLine, useWilks); \\\n- \\\n- msg.str(\"\");msg << \"Uses Hotelling statistic for MANCOVA testing. (default: \" << useHotelling << \")\"; \\\n- TCLAP::SwitchArg useHotellingArg(\"\", \"hotelling\", msg.str(), commandLine, useHotelling); \\\n- \\\n- msg.str(\"\");msg << \"Uses Pillai statistic for MANCOVA testing. (default: \" << usePillai << \")\"; \\\n- TCLAP::SwitchArg usePillaiArg(\"\", \"pillai\", msg.str(), commandLine, usePillai); \\\n- \\\n- msg.str(\"\");msg << \"For the simple (non-MANCOVA) correlation, test for negative correlation. (Only works in conjunction with parametric testing!) (default: \" << negativeCorrelation << \")\"; \\\n- TCLAP::SwitchArg negativeCorrelationArg(\"\", \"negativeCorrelation\", msg.str(), commandLine, negativeCorrelation); \\\n- \\\n- msg.str(\"\");msg << \"For the simple (non-MANCOVA) correlation, test for positive correlation.(Only works in conjunction with parametric testing!) (default: \" << positiveCorrelation << \")\"; \\\n- TCLAP::SwitchArg positiveCorrelationArg(\"\", \"positiveCorrelation\", msg.str(), commandLine, positiveCorrelation); \\\n- \\\n- msg.str(\"\");msg << \"For the simple (non-MANCOVA) correlation, test for correlation. (default: \" << trendCorrelation << \")\"; \\\n- TCLAP::SwitchArg trendCorrelationArg(\"\", \"trendCorrelation\", msg.str(), commandLine, trendCorrelation); \\\n- \\\n- msg.str(\"\");msg << \"Echo the command line arguments (default: \" << echoSwitch << \")\"; \\\n- TCLAP::SwitchArg echoSwitchArg(\"\", \"echo\", msg.str(), commandLine, echoSwitch); \\\n- \\\n- msg.str(\"\");msg << \"Produce xml description of command line arguments (default: \" << xmlSwitch << \")\"; \\\n- TCLAP::SwitchArg xmlSwitchArg(\"\", \"xml\", msg.str(), commandLine, xmlSwitch); \\\n- \\\n- msg.str(\"\");msg << \"Address of a structure to store process information (progress, abort, etc.). (default: \" << processInformationAddressString << \")\"; \\\n- TCLAP::ValueArg<std::string > processInformationAddressStringArg(\"\", \"processinformationaddress\", msg.str(), 0, processInformationAddressString, \"std::string\", commandLine); \\\n- \\\n-try \\\n- { \\\n- \/* Build a map of flag aliases to the true flag *\/ \\\n- std::map<std::string,std::string> flagAliasMap; \\\n- std::map<std::string,std::string> deprecatedFlagAliasMap; \\\n- std::map<std::string,std::string> longFlagAliasMap; \\\n- std::map<std::string,std::string> deprecatedLongFlagAliasMap; \\\n- \/* Remap flag aliases to the true flag *\/ \\\n- std::vector<std::string> targs; \\\n- std::map<std::string,std::string>::iterator ait; \\\n- std::map<std::string,std::string>::iterator dait; \\\n- size_t ac; \\\n- for (ac=0; ac < static_cast<size_t>(argc); ++ac) \\\n- { \\\n- if (strlen(argv[ac]) == 2 && argv[ac][0]=='-') \\\n- { \\\n- \/* short flag case *\/ \\\n- std::string tflag(argv[ac], 1, strlen(argv[ac])-1); \\\n- ait = flagAliasMap.find(tflag); \\\n- dait = deprecatedFlagAliasMap.find(tflag); \\\n- if (ait != flagAliasMap.end() || dait != deprecatedFlagAliasMap.end()) \\\n- { \\\n- if (ait != flagAliasMap.end()) \\\n- { \\\n- \/* remap the flag *\/ \\\n- targs.push_back(\"-\" + (*ait).second); \\\n- } \\\n- else if (dait != deprecatedFlagAliasMap.end()) \\\n- { \\\n- std::cout << \"Flag \\\"\" << argv[ac] << \"\\\" is deprecated. Please use flag \\\"-\" << (*dait).second << \"\\\" instead. \" << std::endl; \\\n- \/* remap the flag *\/ \\\n- targs.push_back(\"-\" + (*dait).second); \\\n- } \\\n- } \\\n- else \\\n- { \\\n- targs.push_back(argv[ac]); \\\n- } \\\n- } \\\n- else if (strlen(argv[ac]) > 2 && argv[ac][0]=='-' && argv[ac][1]=='-') \\\n- { \\\n- \/* long flag case *\/ \\\n- std::string tflag(argv[ac], 2, strlen(argv[ac])-2); \\\n- ait = longFlagAliasMap.find(tflag); \\\n- dait = deprecatedLongFlagAliasMap.find(tflag); \\\n- if (ait != longFlagAliasMap.end() || dait != deprecatedLongFlagAliasMap.end()) \\\n- { \\\n- if (ait != longFlagAliasMap.end()) \\\n- { \\\n- \/* remap the flag *\/ \\\n- targs.push_back(\"--\" + (*ait).second); \\\n- } \\\n- else if (dait != deprecatedLongFlagAliasMap.end()) \\\n- { \\\n- std::cout << \"Long flag \\\"\" << argv[ac] << \"\\\" is deprecated. Please use long flag \\\"--\" << (*dait).second << \"\\\" instead. \" << std::endl; \\\n- \/* remap the flag *\/ \\\n- targs.push_back(\"--\" + (*dait).second); \\\n- } \\\n- } \\\n- else \\\n- { \\\n- targs.push_back(argv[ac]); \\\n- } \\\n- } \\\n- else if (strlen(argv[ac]) > 2 && argv[ac][0]=='-' && argv[ac][1]!='-') \\\n- { \\\n- \/* short flag case where multiple flags are given at once ala *\/ \\\n- \/* \"ls -ltr\" *\/ \\\n- std::string tflag(argv[ac], 1, strlen(argv[ac])-1); \\\n- std::string rflag(\"-\"); \\\n- for (std::string::size_type fi=0; fi < tflag.size(); ++fi) \\\n- { \\\n- std::string tf(tflag, fi, 1); \\\n- ait = flagAliasMap.find(tf); \\\n- dait = deprecatedFlagAliasMap.find(tf); \\\n- if (ait != flagAliasMap.end() || dait != deprecatedFlagAliasMap.end()) \\\n- { \\\n- if (ait != flagAliasMap.end()) \\\n- { \\\n- \/* remap the flag *\/ \\\n- rflag += (*ait).second; \\\n- } \\\n- else if (dait != deprecatedFlagAliasMap.end()) \\\n- { \\\n- std::cout << \"Flag \\\"-\" << tf << \"\\\" is deprecated. Please use flag \\\"-\" << (*dait).second << \"\\\" instead. \" << std::endl; \\\n- \/* remap the flag *\/ \\\n- rflag += (*dait).second; \\\n- } \\\n- } \\\n- else \\\n- { \\\n- rflag += tf; \\\n- } \\\n- } \\\n- targs.push_back(rflag); \\\n- } \\\n- else \\\n- { \\\n- \/* skip the argument without remapping (this is the case for any *\/ \\\n- \/* arguments for flags *\/ \\\n- targs.push_back(argv[ac]); \\\n- } \\\n- } \\\n- \\\n- \/* Remap args to a structure that CmdLine::parse() can understand*\/ \\\n- std::vector<char*> vargs; \\\n- for (ac = 0; ac < targs.size(); ++ac) \\\n- { \\\n- vargs.push_back(const_cast<char *>(targs[ac].c_str())); \\\n- } \\\n- commandLine.parse ( vargs.size(), (char**) &(vargs[0]) ); \\\n- infile = infileArg.getValue(); \\\n- infileColumn = infileColumnArg.getValue(); \\\n- outbase = outbaseArg.getValue(); \\\n- numPerms = numPermsArg.getValue(); \\\n- numGroupTypes = numGroupTypesArg.getValue(); \\\n- groupTypeColumnsTemp = groupTypeColumnsArg.getValue(); \\\n- numIndependent = numIndependentArg.getValue(); \\\n- independentColumnsTemp = independentColumnsArg.getValue(); \\\n- surfListScale = surfListScaleArg.getValue(); \\\n- scaleColumn = scaleColumnArg.getValue(); \\\n- testColumn = testColumnArg.getValue(); \\\n- KWMreadableInputFile = KWMreadableInputFileArg.getValue(); \\\n- significanceLevel = significanceLevelArg.getValue(); \\\n- FDRdiscoveryLevel = FDRdiscoveryLevelArg.getValue(); \\\n- writeZScores = writeZScoresArg.getValue(); \\\n- computeScaleFactorFromVolumes = computeScaleFactorFromVolumesArg.getValue(); \\\n- interactionTest = interactionTestArg.getValue(); \\\n- simpleCorrs = simpleCorrsArg.getValue(); \\\n- computeParametricP = computeParametricPArg.getValue(); \\\n- debug = debugArg.getValue(); \\\n- useRoy = useRoyArg.getValue(); \\\n- useWilks = useWilksArg.getValue(); \\\n- useHotelling = useHotellingArg.getValue(); \\\n- usePillai = usePillaiArg.getValue(); \\\n- negativeCorrelation = negativeCorrelationArg.getValue(); \\\n- positiveCorrelation = positiveCorrelationArg.getValue(); \\\n- trendCorrelation = trendCorrelationArg.getValue(); \\\n- echoSwitch = echoSwitchArg.getValue(); \\\n- xmlSwitch = xmlSwitchArg.getValue(); \\\n- processInformationAddressString = processInformationAddressStringArg.getValue(); \\\n- { \/* Assignment for groupTypeColumns *\/ \\\n- std::vector<std::string> words; \\\n- std::string sep(\",\"); \\\n- splitString(groupTypeColumnsTemp, sep, words); \\\n- for (unsigned int _j = 0; _j < words.size(); _j++) \\\n- { \\\n- groupTypeColumns.push_back(atoi(words[_j].c_str())); \\\n- } \\\n- } \\\n- { \/* Assignment for independentColumns *\/ \\\n- std::vector<std::string> words; \\\n- std::string sep(\",\"); \\\n- splitString(independentColumnsTemp, sep, words); \\\n- for (unsigned int _j = 0; _j < words.size(); _j++) \\\n- { \\\n- independentColumns.push_back(atoi(words[_j].c_str())); \\\n- } \\\n- } \\\n- } \\\n-catch ( TCLAP::ArgException e ) \\\n- { \\\n- std::cerr << \"error: \" << e.error() << \" for arg \" << e.argId() << std::endl; \\\n- return ( EXIT_FAILURE ); \\\n- }\n-#define GENERATE_ECHOARGS \\\n-if (echoSwitch) \\\n-{ \\\n-std::cout << \"Command Line Arguments\" << std::endl; \\\n-std::cout << \" infile: \" << infile << std::endl; \\\n-std::cout << \" infileColumn: \" << infileColumn << std::endl; \\\n-std::cout << \" outbase: \" << outbase << std::endl; \\\n-std::cout << \" numPerms: \" << numPerms << std::endl; \\\n-std::cout << \" numGroupTypes: \" << numGroupTypes << std::endl; \\\n-std::cout << \" groupTypeColumns: \"; \\\n-for (unsigned int _i =0; _i < groupTypeColumns.size(); _i++) \\\n-{ \\\n-std::cout << groupTypeColumns[_i] << \", \"; \\\n-} \\\n-std::cout <<std::endl; \\\n-std::cout << \" numIndependent: \" << numIndependent << std::endl; \\\n-std::cout << \" independentColumns: \"; \\\n-for (unsigned int _i =0; _i < independentColumns.size(); _i++) \\\n-{ \\\n-std::cout << independentColumns[_i] << \", \"; \\\n-} \\\n-std::cout <<std::endl; \\\n-std::cout << \" surfListScale: \" << surfListScale << std::endl; \\\n-std::cout << \" scaleColumn: \" << scaleColumn << std::endl; \\\n-std::cout << \" testColumn: \" << testColumn << std::endl; \\\n-std::cout << \" KWMreadableInputFile: \" << KWMreadableInputFile << std::endl; \\\n-std::cout << \" significanceLevel: \" << significanceLevel << std::endl; \\\n-std::cout << \" FDRdiscoveryLevel: \" << FDRdiscoveryLevel << std::endl; \\\n-std::cout << \" writeZScores: \" << writeZScores << std::endl; \\\n-std::cout << \" computeScaleFactorFromVolumes: \" << computeScaleFactorFromVolumes << std::endl; \\\n-std::cout << \" interactionTest: \" << interactionTest << std::endl; \\\n-std::cout << \" simpleCorrs: \" << simpleCorrs << std::endl; \\\n-std::cout << \" computeParametricP: \" << computeParametricP << std::endl; \\\n-std::cout << \" debug: \" << debug << std::endl; \\\n-std::cout << \" useRoy: \" << useRoy << std::endl; \\\n-std::cout << \" useWilks: \" << useWilks << std::endl; \\\n-std::cout << \" useHotelling: \" << useHotelling << std::endl; \\\n-std::cout << \" usePillai: \" << usePillai << std::endl; \\\n-std::cout << \" negativeCorrelation: \" << negativeCorrelation << std::endl; \\\n-std::cout << \" positiveCorrelation: \" << positiveCorrelation << std::endl; \\\n-std::cout << \" trendCorrelation: \" << trendCorrelation << std::endl; \\\n-std::cout << \" echoSwitch: \" << echoSwitch << std::endl; \\\n-std::cout << \" xmlSwitch: \" << xmlSwitch << std::endl; \\\n-std::cout << \" processInformationAddressString: \" << processInformationAddressString << std::endl; \\\n-}\n-#define GENERATE_ProcessInformationAddressDecoding \\\n-ModuleProcessInformation *CLPProcessInformation = 0; \\\n-if (processInformationAddressString != \"\") \\\n-{ \\\n-sscanf(processInformationAddressString.c_str(), \"%p\", &CLPProcessInformation); \\\n-}\n-#define PARSE_ARGS GENERATE_LOGO;GENERATE_XML;GENERATE_TCLAP;GENERATE_ECHOARGS;GENERATE_ProcessInformationAddressDecoding;\n"} {"commit":"82711611cf1dce82a667e531c2befad5a494f1cf","subject":"i965: Refactor Gen8 depth packet emission.","message":"i965: Refactor Gen8 depth packet emission.\n\nThe existing code followed the vtable function signature, which is not a\ngreat fit: many of the parameters are unused, and the function still\ninspects global state, making it less reusable.\n\nThis patch refactors the depth buffer packet emission code into a new\nfunction which takes exactly the parameters it needs, and which uses no\nglobal state. It then makes the existing vtable function call the new\none.\n\nIdeally, we would remove the vtable function, and clean up that\ninterface. But that can happen once HiZ is working.\n\nSigned-off-by: Kenneth Graunke <bd2562f754ec92342f93f61c25d731e290a2ffa8@whitecape.org>\nReviewed-by: Eric Anholt <96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@anholt.net>\n","repos":"tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/i965\/gen8_depth_state.c\n+++ src\/mesa\/drivers\/dri\/i965\/gen8_depth_state.c\n@@ -25,10 +25,113 @@\n #include \"intel_mipmap_tree.h\"\n #include \"intel_regions.h\"\n #include \"intel_fbo.h\"\n+#include \"intel_resolve_map.h\"\n #include \"brw_context.h\"\n #include \"brw_state.h\"\n #include \"brw_defines.h\"\n \n+\/**\n+ * Helper function to emit depth related command packets.\n+ *\/\n+static void\n+emit_depth_packets(struct brw_context *brw,\n+ struct intel_mipmap_tree *depth_mt,\n+ uint32_t depthbuffer_format,\n+ uint32_t depth_surface_type,\n+ bool depth_writable,\n+ struct intel_mipmap_tree *stencil_mt,\n+ bool stencil_writable,\n+ uint32_t stencil_offset,\n+ bool hiz,\n+ uint32_t width,\n+ uint32_t height,\n+ uint32_t depth,\n+ uint32_t lod,\n+ uint32_t min_array_element)\n+{\n+ intel_emit_depth_stall_flushes(brw);\n+\n+ \/* _NEW_BUFFERS, _NEW_DEPTH, _NEW_STENCIL *\/\n+ BEGIN_BATCH(8);\n+ OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER << 16 | (8 - 2));\n+ OUT_BATCH(depth_surface_type << 29 |\n+ (depth_writable ? (1 << 28) : 0) |\n+ (stencil_mt != NULL && stencil_writable) << 27 |\n+ (hiz ? 1 : 0) << 22 |\n+ depthbuffer_format << 18 |\n+ (depth_mt ? depth_mt->region->pitch - 1 : 0));\n+ if (depth_mt) {\n+ OUT_RELOC64(depth_mt->region->bo,\n+ I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);\n+ } else {\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ }\n+ OUT_BATCH(((width - 1) << 4) | ((height - 1) << 18) | lod);\n+ OUT_BATCH(((depth - 1) << 21) | (min_array_element << 10));\n+ OUT_BATCH(0);\n+ OUT_BATCH(depth_mt ? depth_mt->qpitch >> 2 : 0);\n+ ADVANCE_BATCH();\n+\n+ if (!hiz) {\n+ BEGIN_BATCH(5);\n+ OUT_BATCH(GEN7_3DSTATE_HIER_DEPTH_BUFFER << 16 | (5 - 2));\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ ADVANCE_BATCH();\n+ } else {\n+ BEGIN_BATCH(5);\n+ OUT_BATCH(GEN7_3DSTATE_HIER_DEPTH_BUFFER << 16 | (5 - 2));\n+ OUT_BATCH(depth_mt->hiz_mt->region->pitch - 1);\n+ OUT_RELOC64(depth_mt->hiz_mt->region->bo,\n+ I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);\n+ OUT_BATCH(depth_mt->hiz_mt->qpitch >> 2);\n+ ADVANCE_BATCH();\n+ }\n+\n+ if (stencil_mt == NULL) {\n+ BEGIN_BATCH(5);\n+ OUT_BATCH(GEN7_3DSTATE_STENCIL_BUFFER << 16 | (5 - 2));\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ OUT_BATCH(0);\n+ ADVANCE_BATCH();\n+ } else {\n+ BEGIN_BATCH(5);\n+ OUT_BATCH(GEN7_3DSTATE_STENCIL_BUFFER << 16 | (5 - 2));\n+ \/* The stencil buffer has quirky pitch requirements. From the Graphics\n+ * BSpec: vol2a.11 3D Pipeline Windower > Early Depth\/Stencil Processing\n+ * > Depth\/Stencil Buffer State > 3DSTATE_STENCIL_BUFFER [DevIVB+],\n+ * field \"Surface Pitch\":\n+ *\n+ * The pitch must be set to 2x the value computed based on width, as\n+ * the stencil buffer is stored with two rows interleaved.\n+ *\n+ * (Note that it is not 100% clear whether this intended to apply to\n+ * Gen7; the BSpec flags this comment as \"DevILK,DevSNB\" (which would\n+ * imply that it doesn't), however the comment appears on a \"DevIVB+\"\n+ * page (which would imply that it does). Experiments with the hardware\n+ * indicate that it does.\n+ *\/\n+ OUT_BATCH(HSW_STENCIL_ENABLED | (2 * stencil_mt->region->pitch - 1));\n+ OUT_RELOC64(stencil_mt->region->bo,\n+ I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,\n+ stencil_offset);\n+ OUT_BATCH(stencil_mt ? stencil_mt->qpitch >> 2 : 0);\n+ ADVANCE_BATCH();\n+ }\n+\n+ BEGIN_BATCH(3);\n+ OUT_BATCH(GEN7_3DSTATE_CLEAR_PARAMS << 16 | (3 - 2));\n+ OUT_BATCH(depth_mt ? depth_mt->depth_clear_value : 0);\n+ OUT_BATCH(1);\n+ ADVANCE_BATCH();\n+}\n+\n+\/* Awful vtable-compatible function; should be cleaned up in the future. *\/\n void\n gen8_emit_depth_stencil_hiz(struct brw_context *brw,\n struct intel_mipmap_tree *depth_mt,\n@@ -51,8 +154,6 @@\n const struct intel_renderbuffer *irb = NULL;\n const struct gl_renderbuffer *rb = NULL;\n \n- intel_emit_depth_stall_flushes(brw);\n-\n irb = intel_get_renderbuffer(fb, BUFFER_DEPTH);\n if (!irb)\n irb = intel_get_renderbuffer(fb, BUFFER_STENCIL);\n@@ -96,83 +197,9 @@\n height = mt->logical_height0;\n }\n \n- \/* _NEW_BUFFERS, _NEW_DEPTH, _NEW_STENCIL *\/\n- BEGIN_BATCH(8);\n- OUT_BATCH(GEN7_3DSTATE_DEPTH_BUFFER << 16 | (8 - 2));\n- OUT_BATCH((surftype << 29) |\n- ((ctx->Depth.Mask != 0) << 28) |\n- ((stencil_mt != NULL && ctx->Stencil._WriteEnabled) << 27) |\n- ((hiz ? 1 : 0) << 22) |\n- (depthbuffer_format << 18) |\n- (depth_mt ? depth_mt->region->pitch - 1 : 0));\n- if (depth_mt) {\n- OUT_RELOC64(depth_mt->region->bo,\n- I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,\n- 0);\n- } else {\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- }\n- OUT_BATCH(((width - 1) << 4) | ((height - 1) << 18) | lod);\n- OUT_BATCH(((depth - 1) << 21) | (min_array_element << 10));\n- OUT_BATCH(0);\n- OUT_BATCH(depth_mt ? depth_mt->qpitch >> 2 : 0);\n- ADVANCE_BATCH();\n-\n- if (!hiz) {\n- BEGIN_BATCH(5);\n- OUT_BATCH(GEN7_3DSTATE_HIER_DEPTH_BUFFER << 16 | (5 - 2));\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- ADVANCE_BATCH();\n- } else {\n- BEGIN_BATCH(5);\n- OUT_BATCH(GEN7_3DSTATE_HIER_DEPTH_BUFFER << 16 | (5 - 2));\n- OUT_BATCH(depth_mt->hiz_mt->region->pitch - 1);\n- OUT_RELOC64(depth_mt->hiz_mt->region->bo,\n- I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);\n- OUT_BATCH(depth_mt->hiz_mt->qpitch >> 2);\n- ADVANCE_BATCH();\n- }\n-\n- if (stencil_mt == NULL) {\n- BEGIN_BATCH(5);\n- OUT_BATCH(GEN7_3DSTATE_STENCIL_BUFFER << 16 | (5 - 2));\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- OUT_BATCH(0);\n- ADVANCE_BATCH();\n- } else {\n- BEGIN_BATCH(5);\n- OUT_BATCH(GEN7_3DSTATE_STENCIL_BUFFER << 16 | (5 - 2));\n- \/* The stencil buffer has quirky pitch requirements. From the Graphics\n- * BSpec: vol2a.11 3D Pipeline Windower > Early Depth\/Stencil Processing\n- * > Depth\/Stencil Buffer State > 3DSTATE_STENCIL_BUFFER [DevIVB+],\n- * field \"Surface Pitch\":\n- *\n- * The pitch must be set to 2x the value computed based on width, as\n- * the stencil buffer is stored with two rows interleaved.\n- *\n- * (Note that it is not 100% clear whether this intended to apply to\n- * Gen7; the BSpec flags this comment as \"DevILK,DevSNB\" (which would\n- * imply that it doesn't), however the comment appears on a \"DevIVB+\"\n- * page (which would imply that it does). Experiments with the hardware\n- * indicate that it does.\n- *\/\n- OUT_BATCH(HSW_STENCIL_ENABLED | (2 * stencil_mt->region->pitch - 1));\n- OUT_RELOC64(stencil_mt->region->bo,\n- I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,\n- brw->depthstencil.stencil_offset);\n- OUT_BATCH(stencil_mt ? stencil_mt->qpitch >> 2 : 0);\n- ADVANCE_BATCH();\n- }\n-\n- BEGIN_BATCH(3);\n- OUT_BATCH(GEN7_3DSTATE_CLEAR_PARAMS << 16 | (3 - 2));\n- OUT_BATCH(depth_mt ? depth_mt->depth_clear_value : 0);\n- OUT_BATCH(1);\n- ADVANCE_BATCH();\n+ emit_depth_packets(brw, depth_mt, brw_depthbuffer_format(brw), surftype,\n+ ctx->Depth.Mask != 0,\n+ stencil_mt, ctx->Stencil._WriteEnabled,\n+ brw->depthstencil.stencil_offset,\n+ hiz, width, height, depth, lod, min_array_element);\n }\n"} {"commit":"2e29b7d0f8238f804304b061fb0157cf586db6f9","subject":"mesa\/st: implement MapBufferRange callback","message":"mesa\/st: implement MapBufferRange callback\n\nUsing PIPE_BUFFER_USAGE_DONTBLOCK.\n","repos":"zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_cb_bufferobjects.c\n+++ src\/mesa\/state_tracker\/st_cb_bufferobjects.c\n@@ -212,8 +212,40 @@\n }\n \n \n-\/**\n- * Called via glMapBufferARB().\n+\n+\/**\n+ * Called via glMapBufferRange().\n+ *\/\n+static void *\n+st_bufferobj_map_range(GLcontext *ctx, GLenum target, \n+ GLintptr offset, GLsizeiptr length, GLbitfield access,\n+ struct gl_buffer_object *obj)\n+{\n+ struct pipe_context *pipe = st_context(ctx)->pipe;\n+ struct st_buffer_object *st_obj = st_buffer_object(obj);\n+ GLuint flags = 0;\n+\n+ if (access & GL_MAP_WRITE_BIT)\n+ flags |= PIPE_BUFFER_USAGE_CPU_WRITE;\n+\n+ if (access & GL_MAP_READ_BIT)\n+ flags |= PIPE_BUFFER_USAGE_CPU_READ;\n+\n+ \/* ... other flags ...\n+ *\/\n+\n+ if (access & MESA_MAP_NOWAIT_BIT)\n+ flags |= PIPE_BUFFER_USAGE_DONTBLOCK;\n+\n+ obj->Pointer = pipe_buffer_map(pipe->screen, st_obj->buffer, flags);\n+ return obj->Pointer;\n+}\n+\n+\n+\n+\n+\/**\n+ * Called via glUnmapBufferARB().\n *\/\n static GLboolean\n st_bufferobj_unmap(GLcontext *ctx, GLenum target, struct gl_buffer_object *obj)\n@@ -236,5 +268,6 @@\n functions->BufferSubData = st_bufferobj_subdata;\n functions->GetBufferSubData = st_bufferobj_get_subdata;\n functions->MapBuffer = st_bufferobj_map;\n+ functions->MapBufferRange = st_bufferobj_map_range;\n functions->UnmapBuffer = st_bufferobj_unmap;\n }\n"} {"commit":"33ecfe5b99a9f8ded299a5b67a3e0138b1d7b4a8","subject":"scale: Allow user to choose scale not multiplier","message":"scale: Allow user to choose scale not multiplier\n\nMisleading text now makes sense.\n","repos":"tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/conf_randr\/e_int_config_randr2.c\n+++ src\/modules\/conf_randr\/e_int_config_randr2.c\n@@ -79,6 +79,18 @@\n }\n \n \/* local functions *\/\n+static double\n+_multiplier_for_scale(double scale)\n+{\n+ return scale \/ elm_config_scale_get();\n+}\n+\n+static double\n+_scale_for_multiplier(double multiplier)\n+{\n+ return multiplier * elm_config_scale_get();\n+}\n+\n static void *\n _create_data(E_Config_Dialog *cfd EINA_UNUSED)\n {\n@@ -458,13 +470,14 @@\n {\n elm_check_state_set(cfdata->scale_custom_obj, EINA_TRUE);\n elm_object_disabled_set(cfdata->scale_value_obj, EINA_FALSE);\n- elm_slider_value_set(cfdata->scale_value_obj, cs->scale_multiplier);\n+ elm_slider_value_set(cfdata->scale_value_obj, \n+ _scale_for_multiplier(cs->scale_multiplier));\n }\n else\n {\n elm_check_state_set(cfdata->scale_custom_obj, EINA_FALSE);\n elm_object_disabled_set(cfdata->scale_value_obj, EINA_TRUE);\n- elm_slider_value_set(cfdata->scale_value_obj, 1.0);\n+ elm_slider_value_set(cfdata->scale_value_obj, elm_config_scale_get());\n }\n }\n else\n@@ -606,16 +619,16 @@\n E_Config_Dialog_Data *cfdata = data;\n E_Config_Randr2_Screen *cs = _config_screen_find(cfdata);\n if (!cs) return;\n+\n+ elm_slider_value_set(cfdata->scale_value_obj, elm_config_scale_get());\n if (elm_check_state_get(obj))\n {\n elm_object_disabled_set(cfdata->scale_value_obj, EINA_FALSE);\n- elm_slider_value_set(cfdata->scale_value_obj, 1.0);\n cs->scale_multiplier = 1.0;\n }\n else\n {\n elm_object_disabled_set(cfdata->scale_value_obj, EINA_TRUE);\n- elm_slider_value_set(cfdata->scale_value_obj, 0.0);\n cs->scale_multiplier = 0.0;\n }\n e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);\n@@ -627,7 +640,8 @@\n E_Config_Dialog_Data *cfdata = data;\n E_Config_Randr2_Screen *cs = _config_screen_find(cfdata);\n if (!cs) return;\n- cs->scale_multiplier = elm_slider_value_get(cfdata->scale_value_obj);\n+ cs->scale_multiplier =\n+ _multiplier_for_scale(elm_slider_value_get(cfdata->scale_value_obj));\n e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);\n }\n \n@@ -985,6 +999,7 @@\n elm_slider_unit_format_set(o, \"%1.1f\");\n elm_slider_span_size_set(o, 100);\n elm_slider_min_max_set(o, 0.5, 5.5);\n+ elm_slider_value_set(o, elm_config_scale_get());\n elm_table_pack(tb, o, 2, 13, 1, 1);\n evas_object_show(o);\n cfdata->scale_value_obj = o;\n"} {"commit":"c45001791d8bc6f8b1f1e94bae09b2903d55dfbd","subject":"makise_e_fsviewer fix draw.","message":"makise_e_fsviewer fix draw.\n","repos":"SL-RU\/MakiseGUI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- MakiseGUI\/gui\/elements\/src\/makise_e_fsviewer.c\n+++ MakiseGUI\/gui\/elements\/src\/makise_e_fsviewer.c\n@@ -106,8 +106,7 @@\n \t \n \n }\n-static uint8_t draw (MElement* b)\n-{\n+static uint8_t draw ( MElement* b ) {\n MFSViewer *l = (MFSViewer*)b->data;\n MakiseStyleTheme *th = l->state ? &l->style->focused : &l->style->normal;\n MakiseStyleTheme_FSViewer_Item *i_foc =\n@@ -126,25 +125,31 @@\n w = b->position.width - 5,\n h = b->position.height - 4,\n eh = l->item_style->font->height + l->item_style->font_line_spacing + 1,\n-\tec = h \/ (eh + 1), \/\/count of elements on the screen\n- sh = 0, \/\/scroll line height\n-\tcuid = 0, \/\/current id\n-\tlen = 0; \/\/count of items\n+ ec = h \/ (eh + 1), \/\/ count of elements on the screen\n+ sh = 0, \/\/ scroll line height\n+ cuid = 0, \/\/ current id\n+ len = 0; \/\/ count of items\n \n \n \/\/header\n- if(l->header != 0)\n- {\n-\tmakise_d_string(b->gui->buffer,\n-\t\t\tl->header, MDTextAll,\n-\t\t\tx, y, MDTextPlacement_LeftUp,\n-\t\t\tl->style->font, th->font_col);\n- y += l->style->font->height;\n- h -= l->style->font->height;\n-\tmakise_d_line(b->gui->buffer, b->position.real_x, y,\n- b->position.real_x + b->position.width, y,\n-\t\t th->border_c);\n-\tec = h \/ (eh + 1);\n+ if ( l->header != 0 ) {\n+ makise_d_string( b->gui->buffer,\n+ l->header,\n+ MDTextAll,\n+ x, y,\n+ MDTextPlacement_LeftUp,\n+ l->style->font,\n+ th->font_col );\n+\n+ y += l->style->font->height;\n+ h -= l->style->font->height;\n+\n+ makise_d_line( b->gui->buffer,\n+ b->position.real_x, y,\n+ b->position.real_x + b->position.width, y,\n+ th->border_c);\n+\n+ ec = h \/ (eh + 1);\n }\n y += 1;\n \n@@ -160,46 +165,37 @@\n cuid = i = l->current_position;\n \n \/\/compute start index of element to display & the last\n- if(ec >= len)\n- {\n-\tstart = 0;\n-\tend = len;\n- }\n- else if ((i >= (ec \/ 2)) && ((len - i) > (ec - 1) \/ 2))\n- {\n-\tstart = i - (ec \/ 2);\n-\tend = start + ec;\n- }\n- else if ((i > (ec \/ 2) && (len - i) <= (ec - 1) \/ 2))\n- {\n-\tend = len;\n-\tstart = len - ec;\n- }\n- else if (i < (ec \/ 2) && (len - i) > (ec - 1) \/ 2)\n- {\n-\tstart = 0;\n-\tend = ec;\n+ if ( ec >= len ) {\n+ start = 0;\n+ end = len;\n+ } else if ( ( i >= ( ec \/ 2 ) ) && ( ( len - i ) > ( ec - 1 ) \/ 2 ) ) {\n+ start = i - (ec \/ 2);\n+ end = start + ec;\n+ } else if ( ( i > ( ec \/ 2 ) && ( len - i ) <= ( ec - 1 ) \/ 2 ) ) {\n+ end = len;\n+ start = len - ec;\n+ } else if ( i < ( ec \/ 2 ) && ( len - i ) > ( ec - 1 ) \/ 2) {\n+ start = 0;\n+ end = ec;\n }\n \n \/\/check if required chunk is loaded\n- if(start < l->current_chunk_position ||\n- end >= (l->current_chunk_position + FM_BUFFERED))\n- {\n-\t\/\/load chunk\n-\tm_fsviewer_loadchunk(l, i);\n+ if ( start < l->current_chunk_position ||\n+ end >= ( l->current_chunk_position + FM_BUFFERED ) ) {\n+ \/\/load chunk\n+ m_fsviewer_loadchunk(l, i);\n }\n \n \/\/printf(\"start %d end %d\\n\", start, end);\n \/\/array\n- for (i = start; i < end; i++)\n- {\n-\tci = &l->buffer[i - l->current_chunk_position];\n-\t\/\/printf(\"draw %d %s\\n\", i, ci->name);\n-\tci->id = i;\n-\tc_th = (i == l->current_position) ? i_foc : i_nom;\n-\t\n-\tdraw_item(ci, l, c_th, x, y, w, eh);\n-\ty += eh + 1;\n+ for ( i = start; i < end; i++ ) {\n+ ci = &l->buffer[i - l->current_chunk_position];\n+ \/\/printf(\"draw %d %s\\n\", i, ci->name);\n+ ci->id = i;\n+ c_th = (i == l->current_position) ? i_foc : i_nom;\n+\n+ draw_item(ci, l, c_th, x, y, w, eh);\n+ y += eh + 1;\n }\n \n \n@@ -208,48 +204,42 @@\n \n h = b->position.height - 2;\n sh = h \/ len;\n- if(sh < 5)\n- {\n-\ty = cuid * (h + sh - 5) \/ len;\n-\tsh = 5;\n- }\n- else\n-\ty = cuid * (h) \/ len;\n+ if ( sh < 5 ) {\n+ y = cuid * (h + sh - 5) \/ len;\n+ sh = 5;\n+ } else {\n+ y = cuid * (h) \/ len;\n+ }\n y += b->position.real_y + 1;\n \n \n \/\/ Drawing scroll.\n if ( l->style->scroll_width != 0 ) {\n \tmakise_d_rect_filled( b->gui->buffer,\n- b->position.real_x + b->position.width - l->style->scroll_width - 1, b->position.real_y,\n- l->style->scroll_width + 1,\n- l->el.position.height,\n-\t\t\t th->border_c,\n-\t\t\t l->style->scroll_bg_color );\n+ b->position.real_x + b->position.width - l->style->scroll_width - 1, b->position.real_y,\n+ l->style->scroll_width + 1,\n+ l->el.position.height,\n+ th->border_c,\n+ l->style->scroll_bg_color );\n \n \tmakise_d_rect_filled( b->gui->buffer,\n- b->position.real_x + b->position.width - l->style->scroll_width - 1,\n-\t\t\t y, \n- l->style->scroll_width + 1,\n-\t\t\t sh + 1,\n-\t\t\t th->border_c,\n-\t\t\t l->style->scroll_color );\n- }\n-\n+ b->position.real_x + b->position.width - l->style->scroll_width - 1,\n+ y,\n+ l->style->scroll_width + 1,\n+ sh + 1,\n+ th->border_c,\n+ l->style->scroll_color );\n+ }\n \n return M_OK;\n }\n \n-static MFocusEnum focus (MElement* b, MFocusEnum act)\n-{\n+static MFocusEnum focus (MElement* b, MFocusEnum act) {\n \/\/MFSViewer *e = ((MFSViewer*)b->data);\n- if(act & M_G_FOCUS_GET)\n- {\n-\t((MFSViewer*)b->data)->state = 1;\n- }\n- if(act == M_G_FOCUS_LEAVE)\n- {\n-\t((MFSViewer*)b->data)->state = 0;\n+ if(act & M_G_FOCUS_GET) {\n+ ((MFSViewer*)b->data)->state = 1;\n+ } if ( act == M_G_FOCUS_LEAVE ) {\n+ ((MFSViewer*)b->data)->state = 0;\n }\n \n return (act == M_G_FOCUS_PREV || act == M_G_FOCUS_NEXT)\n@@ -339,7 +329,7 @@\n }\n \n \n-uint32_t fsviewer_count_files(char* path)\n+uint32_t fsviewer_count_files ( char* path )\n {\n uint32_t count = 0;\n \n@@ -372,7 +362,7 @@\n res = f_opendir(&dir, path); \/* Open the directory *\/\n \/\/printf(\"opdir %d\\n\", res);\n if (res == FR_OK) {\n-\tres = f_readdir(&dir, 0 );\n+ res = f_readdir( &dir, NULL );\n \tfor (;;) {\n \t res = f_readdir(&dir, &fno); \/* Read a directory item *\/\n \t \/\/printf(\"%d %d %s\\n\", count, res, fno.fname);\n@@ -395,31 +385,24 @@\n uint8_t isroot = f_getcwd(bu, 5);\n isroot = (bu[0] == '\/') && (bu[1] == 0);\n \/\/printf(\"root %s| %d\\n\", bu, isroot);\n- \/\/uint32_t count = l->files_count = fsviewer_count_files(\"\") + !isroot;\n+ l->files_count = fsviewer_count_files( l->path );\n \n \/\/printf(\"files coint: %d\\n\", count);\n \n \/\/calculate chunk's start position\n- if(required_id >= FM_BUFFERED\/2)\n- {\n-\tl->current_chunk_position = required_id - FM_BUFFERED\/2;\n-\tif(l->current_chunk_position != 0 &&\n-\t l->current_chunk_position + FM_BUFFERED\/2 - 1 >= l->files_count)\n-\t{\n-\t uint32_t d = l->current_chunk_position + FM_BUFFERED\/2 - 1 - l->files_count;\n-\t if(d > l->current_chunk_position)\n-\t {\n-\t\tl->current_chunk_position = 0;\n-\t }\n-\t else\n-\t {\n-\t\tl->current_chunk_position -= d;\n-\t }\n-\t}\n- }\n- else\n- {\n-\tl->current_chunk_position = 0;\n+ if ( required_id >= FM_BUFFERED \/ 2 ) {\n+ l->current_chunk_position = required_id - FM_BUFFERED \/ 2;\n+ if ( l->current_chunk_position != 0 &&\n+ l->current_chunk_position + FM_BUFFERED\/2 - 1 >= l->files_count ) {\n+ uint32_t d = l->current_chunk_position + FM_BUFFERED\/2 - 1 - l->files_count;\n+ if ( d > l->current_chunk_position ) {\n+ l->current_chunk_position = 0;\n+ } else {\n+ l->current_chunk_position -= d;\n+ }\n+ }\n+ } else {\n+ l->current_chunk_position = 0;\n }\n \/\/printf(\"ch st: %d req %d\\n\", l->current_chunk_position, required_id);\n FRESULT res;\n"} {"commit":"071b7221a550eba89800493e01861a1e7d72b2b4","subject":"Use DiskIo->WriteDisk() API to avoid alignment issue.","message":"Use DiskIo->WriteDisk() API to avoid alignment issue.\n\ngit-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@8445 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- MdeModulePkg\/Universal\/Disk\/PartitionDxe\/Gpt.c\n+++ MdeModulePkg\/Universal\/Disk\/PartitionDxe\/Gpt.c\n@@ -574,14 +574,20 @@\n PartHdr->PartitionEntryLBA = PEntryLBA;\r\n PartitionSetCrc ((EFI_TABLE_HEADER *) PartHdr);\r\n \r\n- Status = BlockIo->WriteBlocks (BlockIo, BlockIo->Media->MediaId, PartHdr->MyLBA, BlockSize, PartHdr);\r\n+ Status = DiskIo->WriteDisk (\r\n+ DiskIo,\r\n+ BlockIo->Media->MediaId,\r\n+ MultU64x32 (PartHdr->MyLBA, BlockIo->Media->BlockSize),\r\n+ BlockSize,\r\n+ PartHdr\r\n+ );\r\n if (EFI_ERROR (Status)) {\r\n goto Done;\r\n }\r\n \r\n Ptr = AllocatePool (PartHeader->NumberOfPartitionEntries * PartHeader->SizeOfPartitionEntry);\r\n if (Ptr == NULL) {\r\n- DEBUG ((EFI_D_ERROR, \" Allocate pool effor\\n\"));\r\n+ DEBUG ((EFI_D_ERROR, \" Allocate pool error\\n\"));\r\n Status = EFI_OUT_OF_RESOURCES;\r\n goto Done;\r\n }\r\n"} {"commit":"6149847370afc776d52f8ec8b6dac2a67a2aa9a0","subject":"BUG: fix out of bounds access of array","message":"BUG: fix out of bounds access of array\n\naddress 3 coverity issues related to accessing m_Visitors out of\nbounds.\n\nCID 1081041 (#4-1 of 4): Out-of-bounds read (OVERRUN)\n3. overrun-local: Overrunning array of 9 8-byte elements at element\nindex 9 (byte offset 72) by dereferencing pointer \"&this->m_Visitors[id]\"\n\nChange-Id: Idf7e306c489a30e429ceff74d61849d5bbdb664f\n","repos":"richardbeare\/ITK,atsnyder\/ITK,msmolens\/ITK,fbudin69500\/ITK,LucasGandel\/ITK,ajjl\/ITK,hjmjohnson\/ITK,BlueBrain\/ITK,heimdali\/ITK,LucHermitte\/ITK,blowekamp\/ITK,LucHermitte\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,malaterre\/ITK,stnava\/ITK,vfonov\/ITK,zachary-williamson\/ITK,eile\/ITK,biotrump\/ITK,ajjl\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,atsnyder\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,thewtex\/ITK,biotrump\/ITK,fedral\/ITK,jcfr\/ITK,spinicist\/ITK,blowekamp\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,atsnyder\/ITK,stnava\/ITK,fbudin69500\/ITK,Kitware\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,vfonov\/ITK,thewtex\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,stnava\/ITK,ajjl\/ITK,heimdali\/ITK,BRAINSia\/ITK,PlutoniumHeart\/ITK,eile\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,jcfr\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,eile\/ITK,LucasGandel\/ITK,spinicist\/ITK,zachary-williamson\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,malaterre\/ITK,jmerkow\/ITK,msmolens\/ITK,jmerkow\/ITK,jcfr\/ITK,PlutoniumHeart\/ITK,vfonov\/ITK,vfonov\/ITK,fedral\/ITK,hendradarwin\/ITK,stnava\/ITK,eile\/ITK,msmolens\/ITK,jmerkow\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,hjmjohnson\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,thewtex\/ITK,richardbeare\/ITK,spinicist\/ITK,spinicist\/ITK,malaterre\/ITK,Kitware\/ITK,jcfr\/ITK,stnava\/ITK,eile\/ITK,vfonov\/ITK,spinicist\/ITK,Kitware\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,thewtex\/ITK,jcfr\/ITK,malaterre\/ITK,malaterre\/ITK,Kitware\/ITK,ajjl\/ITK,msmolens\/ITK,fedral\/ITK,LucasGandel\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,fedral\/ITK,blowekamp\/ITK,spinicist\/ITK,Kitware\/ITK,hjmjohnson\/ITK,jmerkow\/ITK,LucHermitte\/ITK,hendradarwin\/ITK,BRAINSia\/ITK,richardbeare\/ITK,Kitware\/ITK,thewtex\/ITK,hjmjohnson\/ITK,spinicist\/ITK,hendradarwin\/ITK,heimdali\/ITK,jmerkow\/ITK,fbudin69500\/ITK,msmolens\/ITK,fedral\/ITK,malaterre\/ITK,BlueBrain\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,spinicist\/ITK,ajjl\/ITK,LucHermitte\/ITK,InsightSoftwareConsortium\/ITK,LucasGandel\/ITK,richardbeare\/ITK,BlueBrain\/ITK,fedral\/ITK,heimdali\/ITK,atsnyder\/ITK,jcfr\/ITK,fbudin69500\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,vfonov\/ITK,stnava\/ITK,msmolens\/ITK,thewtex\/ITK,richardbeare\/ITK,thewtex\/ITK,blowekamp\/ITK,LucHermitte\/ITK,blowekamp\/ITK,LucHermitte\/ITK,fedral\/ITK,biotrump\/ITK,richardbeare\/ITK,atsnyder\/ITK,heimdali\/ITK,Kitware\/ITK,stnava\/ITK,jmerkow\/ITK,LucasGandel\/ITK,vfonov\/ITK,eile\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,hjmjohnson\/ITK,heimdali\/ITK,blowekamp\/ITK,ajjl\/ITK,ajjl\/ITK,jcfr\/ITK,hendradarwin\/ITK,atsnyder\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,malaterre\/ITK,malaterre\/ITK,hendradarwin\/ITK,malaterre\/ITK,LucasGandel\/ITK,biotrump\/ITK,BlueBrain\/ITK,biotrump\/ITK,stnava\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,eile\/ITK,eile\/ITK,BRAINSia\/ITK,eile\/ITK,spinicist\/ITK,blowekamp\/ITK,blowekamp\/ITK,msmolens\/ITK,ajjl\/ITK,fbudin69500\/ITK,hendradarwin\/ITK,jmerkow\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,richardbeare\/ITK,heimdali\/ITK,biotrump\/ITK,hjmjohnson\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/Core\/Common\/include\/itkCellInterface.h\n+++ Modules\/Core\/Common\/include\/itkCellInterface.h\n@@ -191,7 +191,7 @@\n public:\n VisitorType * GetVisitor(int id)\n {\n- if ( id <= LAST_ITK_CELL )\n+ if ( id < LAST_ITK_CELL )\n {\n return m_Visitors[id];\n }\n@@ -211,7 +211,7 @@\n {\n int id = v->GetCellTopologyId();\n \n- if ( id <= LAST_ITK_CELL )\n+ if ( id < LAST_ITK_CELL )\n {\n m_Visitors[id] = v;\n }\n"} {"commit":"fd3bf03616f55422baddfc793b2412a35683f1ea","subject":"BUG: dllimport should not be used in function definition","message":"BUG: dllimport should not be used in function definition\n","repos":"orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/Core\/Metadata\/include\/otbMetaDataKey.h\n+++ Modules\/Core\/Metadata\/include\/otbMetaDataKey.h\n@@ -274,7 +274,7 @@\n };\n \n template <unsigned int VDim>\n-OTBMetadata_EXPORT bool operator==(const LUT<VDim> & lhs, const LUT<VDim> & rhs)\n+bool operator==(const LUT<VDim> & lhs, const LUT<VDim> & rhs)\n {\n bool axisComparison = true;\n for (unsigned int i = 0; i < VDim; i++)\n"} {"commit":"28ef4002ec7b4be27f1110b83e255df8159c786a","subject":"IMA: handle whitespace better","message":"IMA: handle whitespace better\n\nIMA parser will fail if whitespace is used in any way other than a single\nspace. Using a tab or even using 2 spaces in a row will result in a policy\nbeing rejected. This patch makes the kernel ignore whitespace a bit better.\n\nSigned-off-by: Eric Paris <b0b36e3cd9ea4e5739ff430a3056fabf2fdb0376@redhat.com>\nAcked-by: Mimi Zohar <f02992f7c171053741caa6b515d9896745b37477@us.ibm.com>\nSigned-off-by: James Morris <10d11de3abc355eabe955bb734f0f8e71da56e16@namei.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- security\/integrity\/ima\/ima_policy.c\n+++ security\/integrity\/ima\/ima_policy.c\n@@ -265,15 +265,15 @@\n \n \tentry->uid = -1;\n \tentry->action = UNKNOWN;\n-\twhile ((p = strsep(&rule, \" \")) != NULL) {\n+\twhile ((p = strsep(&rule, \" \\t\")) != NULL) {\n \t\tsubstring_t args[MAX_OPT_ARGS];\n \t\tint token;\n \t\tunsigned long lnum;\n \n \t\tif (result < 0)\n \t\t\tbreak;\n-\t\tif (!*p)\n-\t\t\tbreak;\n+\t\tif ((*p == '\\0') || (*p == ' ') || (*p == '\\t'))\n+\t\t\tcontinue;\n \t\ttoken = match_token(p, policy_tokens, args);\n \t\tswitch (token) {\n \t\tcase Opt_measure:\n"} {"commit":"d23ebb74934fcddd9ab7190d9000f57fee5c08ca","subject":"Bug 802903: The function blapi_pqg_param_gen is missing the return type. r=rrelyea.","message":"Bug 802903: The function blapi_pqg_param_gen is missing the return type.\nr=rrelyea.\n","repos":"nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/bltest\/blapitest.c\n+++ security\/nss\/cmd\/bltest\/blapitest.c\n@@ -1459,6 +1459,7 @@\n return SECSuccess;\n }\n \n+SECStatus\n blapi_pqg_param_gen(unsigned int keysize, PQGParams **pqg, PQGVerify **vfy)\n {\n if (keysize < 1024) {\n"} {"commit":"f6b422ac595336ace2ace50fd39821c3b5d3ac4a","subject":"Bug 403685, Application crashes after having called CERT_PKIXVerifyCert original idea for patch by Alexei r=rrelyea","message":"Bug 403685, Application crashes after having called CERT_PKIXVerifyCert\noriginal idea for patch by Alexei\nr=rrelyea\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/certhigh\/certvfy.c\n+++ security\/nss\/lib\/certhigh\/certvfy.c\n@@ -2071,8 +2071,8 @@\n PKIX_PL_Cert *eeCert = NULL;\n PKIX_Error *error = NULL;\n \n- pkix_pl_Cert_CreateWithNSSCert\n-\t(target, &eeCert, plContext);\n+ error = PKIX_PL_Cert_CreateFromCERTCertificate(target, &eeCert, plContext);\n+ if (error != NULL) goto cleanup;\n \n error = PKIX_CertSelector_Create(NULL, NULL, &certSelector, plContext);\n if (error != NULL) goto cleanup;\n"} {"commit":"7acea460d5bc0f5662b687612bfdb6cae75071aa","subject":"Back out last change","message":"Back out last change\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/certhigh\/certvfy.c\n+++ security\/nss\/lib\/certhigh\/certvfy.c\n@@ -1128,7 +1128,6 @@\n case certUsageAnyCA:\n case certUsageProtectedObjectSigner:\n case certUsageUserCertImport:\n- case certUsageVerifyCA:\n \/* these usages cannot be verified *\/\n NEXT_ITERATION();\n \n"} {"commit":"e2332281ad9e9b2f56df8bac388a2ce31e538ab5","subject":"Work queue: Add required POSIX header","message":"Work queue: Add required POSIX header\n","repos":"PX4\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,darknight-007\/Firmware,acfloria\/Firmware,Aerotenna\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,dagar\/Firmware,krbeverx\/Firmware,darknight-007\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,dagar\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,krbeverx\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,mje-nz\/PX4-Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,mcgill-robotics\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,dagar\/Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,mcgill-robotics\/Firmware,darknight-007\/Firmware,Aerotenna\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,PX4\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,darknight-007\/Firmware,acfloria\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,PX4\/Firmware,darknight-007\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/platforms\/posix\/work_queue\/work_thread.c\n+++ src\/platforms\/posix\/work_queue\/work_thread.c\n@@ -39,6 +39,7 @@\n \n #include <px4_config.h>\n #include <px4_defines.h>\n+#include <px4_posix.h>\n #include <px4_time.h>\n #include <stdint.h>\n #include <stdio.h>\n"} {"commit":"c7f293fa8647383ed0326b984d4654ade6aa4f8d","subject":"-Fix for GCC compile errors in OgreMaterialProperties.h.","message":"-Fix for GCC compile errors in OgreMaterialProperties.h.\n\ngit-svn-id: 65dd0ccd495961f396d5302e5521154b071f0302@1982 5b2332b8-efa3-11de-8684-7d64432d61a3\n","repos":"realXtend\/tundra,jesterKing\/naali,realXtend\/tundra,AlphaStaxLLC\/tundra,antont\/tundra,jesterKing\/naali,BogusCurry\/tundra,pharos3d\/tundra,BogusCurry\/tundra,antont\/tundra,BogusCurry\/tundra,pharos3d\/tundra,realXtend\/tundra,realXtend\/tundra,jesterKing\/naali,realXtend\/tundra,AlphaStaxLLC\/tundra,jesterKing\/naali,AlphaStaxLLC\/tundra,BogusCurry\/tundra,pharos3d\/tundra,realXtend\/tundra,BogusCurry\/tundra,antont\/tundra,AlphaStaxLLC\/tundra,pharos3d\/tundra,AlphaStaxLLC\/tundra,antont\/tundra,jesterKing\/naali,pharos3d\/tundra,antont\/tundra,antont\/tundra,pharos3d\/tundra,jesterKing\/naali,BogusCurry\/tundra,AlphaStaxLLC\/tundra,antont\/tundra,jesterKing\/naali","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OgreAssetEditorModule\/OgreMaterialProperties.h\n+++ OgreAssetEditorModule\/OgreMaterialProperties.h\n@@ -9,6 +9,9 @@\n #define incl_OgreAssetEditorModule_OgreMaterialProperties_h\r\n \r\n #include <boost\/shared_ptr.hpp>\r\n+\r\n+#include <OgreTexture.h>\r\n+#include <OgreGpuProgram.h>\r\n \r\n #include <QObject>\r\n #include <QMap>\r\n@@ -28,8 +31,6 @@\n \r\n namespace Ogre\r\n {\r\n- enum GpuConstantType;\r\n- enum TextureType;\r\n class MaterialPtr;\r\n }\r\n \r\n"} {"commit":"44ca69e2cb7e37fc5fe37697d0a6d0fdea9084f4","subject":"Fix 118679: PK11SDR_Encrypt fails if not logged into token.","message":"Fix 118679: PK11SDR_Encrypt fails if not logged into token.\n","repos":"nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/pk11wrap\/pk11sdr.c\n+++ security\/nss\/lib\/pk11wrap\/pk11sdr.c\n@@ -166,6 +166,13 @@\n \/* Use triple-DES *\/\n type = CKM_DES3_CBC;\n \n+ \/*\n+ * Login to the internal token before we look for the key, otherwise we\n+ * won't find it.\n+ *\/\n+ rv = PK11_Authenticate(slot, PR_TRUE, cx);\n+ if (rv != SECSuccess) goto loser;\n+\n \/* Find the key to use *\/\n pKeyID = keyid;\n if (pKeyID->len == 0) {\n"} {"commit":"4f051d2cf4ea263b6088347b0e29b800b52d194f","subject":"another instance of potentially null signerInfos being referenced","message":"another instance of potentially null signerInfos being referenced\n","repos":"ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/smime\/cmssigdata.c\n+++ security\/nss\/lib\/smime\/cmssigdata.c\n@@ -404,8 +404,10 @@\n signerinfos = sigd->signerInfos;\n \n \/* set cmsg for all the signerinfos *\/\n- for (i = 0; signerinfos[i] != NULL; i++)\n-\tsignerinfos[i]->cmsg = sigd->cmsg;\n+ if (signerinfos) {\n+\tfor (i = 0; signerinfos[i] != NULL; i++)\n+\t signerinfos[i]->cmsg = sigd->cmsg;\n+ }\n \n return SECSuccess;\n }\n"} {"commit":"1605d0110cb2441826e99411bf902da2fae0402a","subject":"increase class def","message":"increase class def\n","repos":"fcolamar\/AliPhysics,fcolamar\/AliPhysics,hzanoli\/AliPhysics,dmuhlhei\/AliPhysics,victor-gonzalez\/AliPhysics,rbailhac\/AliPhysics,rbailhac\/AliPhysics,pchrista\/AliPhysics,fbellini\/AliPhysics,SHornung1\/AliPhysics,mpuccio\/AliPhysics,dmuhlhei\/AliPhysics,victor-gonzalez\/AliPhysics,alisw\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,victor-gonzalez\/AliPhysics,adriansev\/AliPhysics,AMechler\/AliPhysics,alisw\/AliPhysics,mpuccio\/AliPhysics,mpuccio\/AliPhysics,amaringarcia\/AliPhysics,rbailhac\/AliPhysics,lcunquei\/AliPhysics,alisw\/AliPhysics,fcolamar\/AliPhysics,dmuhlhei\/AliPhysics,adriansev\/AliPhysics,SHornung1\/AliPhysics,hzanoli\/AliPhysics,pchrista\/AliPhysics,AMechler\/AliPhysics,fcolamar\/AliPhysics,rbailhac\/AliPhysics,fbellini\/AliPhysics,amaringarcia\/AliPhysics,adriansev\/AliPhysics,pchrista\/AliPhysics,rihanphys\/AliPhysics,fcolamar\/AliPhysics,AMechler\/AliPhysics,alisw\/AliPhysics,fbellini\/AliPhysics,lcunquei\/AliPhysics,mpuccio\/AliPhysics,rihanphys\/AliPhysics,SHornung1\/AliPhysics,nschmidtALICE\/AliPhysics,lcunquei\/AliPhysics,victor-gonzalez\/AliPhysics,adriansev\/AliPhysics,amaringarcia\/AliPhysics,victor-gonzalez\/AliPhysics,adriansev\/AliPhysics,adriansev\/AliPhysics,hzanoli\/AliPhysics,mpuccio\/AliPhysics,SHornung1\/AliPhysics,nschmidtALICE\/AliPhysics,pchrista\/AliPhysics,amaringarcia\/AliPhysics,rihanphys\/AliPhysics,AMechler\/AliPhysics,dmuhlhei\/AliPhysics,rbailhac\/AliPhysics,hzanoli\/AliPhysics,dmuhlhei\/AliPhysics,fcolamar\/AliPhysics,dmuhlhei\/AliPhysics,lcunquei\/AliPhysics,rihanphys\/AliPhysics,nschmidtALICE\/AliPhysics,AMechler\/AliPhysics,fbellini\/AliPhysics,rihanphys\/AliPhysics,rihanphys\/AliPhysics,alisw\/AliPhysics,SHornung1\/AliPhysics,victor-gonzalez\/AliPhysics,alisw\/AliPhysics,mpuccio\/AliPhysics,victor-gonzalez\/AliPhysics,fbellini\/AliPhysics,amaringarcia\/AliPhysics,mpuccio\/AliPhysics,alisw\/AliPhysics,pchrista\/AliPhysics,fcolamar\/AliPhysics,AMechler\/AliPhysics,nschmidtALICE\/AliPhysics,pchrista\/AliPhysics,hzanoli\/AliPhysics,SHornung1\/AliPhysics,AMechler\/AliPhysics,lcunquei\/AliPhysics,lcunquei\/AliPhysics,nschmidtALICE\/AliPhysics,adriansev\/AliPhysics,fbellini\/AliPhysics,rbailhac\/AliPhysics,amaringarcia\/AliPhysics,SHornung1\/AliPhysics,nschmidtALICE\/AliPhysics,lcunquei\/AliPhysics,rihanphys\/AliPhysics,rbailhac\/AliPhysics,dmuhlhei\/AliPhysics,pchrista\/AliPhysics,amaringarcia\/AliPhysics,fbellini\/AliPhysics,hzanoli\/AliPhysics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- PWGGA\/GammaConv\/AliAnalysisTaskGammaConvCalo.h\n+++ PWGGA\/GammaConv\/AliAnalysisTaskGammaConvCalo.h\n@@ -595,7 +595,7 @@\n AliAnalysisTaskGammaConvCalo(const AliAnalysisTaskGammaConvCalo&); \/\/ Prevent copy-construction\n AliAnalysisTaskGammaConvCalo &operator=(const AliAnalysisTaskGammaConvCalo&); \/\/ Prevent assignment\n \n- ClassDef(AliAnalysisTaskGammaConvCalo, 64);\n+ ClassDef(AliAnalysisTaskGammaConvCalo, 65);\n };\n \n #endif\n"} {"commit":"e3cead61702e16218825034ea9b28bacb12602d7","subject":"adding some comments","message":"adding some comments\n","repos":"Kiandr\/MS,Kiandr\/MS,Kiandr\/MS,Kiandr\/MS,Kiandr\/MS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sampleCodes\/LinkedList\/MergeTwoLinkedLists\/mergeTwoLinkedLists\/mergeTwoLinkedLists\/merge.c\n+++ sampleCodes\/LinkedList\/MergeTwoLinkedLists\/mergeTwoLinkedLists\/mergeTwoLinkedLists\/merge.c\n@@ -211,25 +211,14 @@\n \n \n \n- \/\/prtM->val = prtA->val;\n-\n- \/\/ now add to next node the prtB->val\n- \/\/prtM->next = (node*) malloc(sizeof(node));\n- \/\/\n- \/\/ prtM = prtM->next;\n-\n-\n- \/\/ prtM->val = prtB->val;\n- \/\/\n-\n-\n+ \/\/ nuild the next node in prtM linked list avoid prt error\n prtM->next = (node*) malloc(sizeof(node));\n prtM = (node*)prtM->next;\n prtM->next = NULL;\n prtM->val = 0;\n \n \n-\n+ \/\/ transvers within A and B linked list\n prtA = (node*)prtA->next;\n prtB = (node*)prtB->next;\n \n"} {"commit":"7fe4b55919bb6bd2d591796a912123e47af8fcdb","subject":"effects.c: More statics reduction 8","message":"effects.c: More statics reduction 8\n","repos":"dpt\/PrivateEye,dpt\/PrivateEye","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- apps\/PrivateEye\/!PrivatEye\/effects.c\n+++ apps\/PrivateEye\/!PrivatEye\/effects.c\n@@ -1373,7 +1373,7 @@\n \n \/* ----------------------------------------------------------------------- *\/\n \n-static void clear_set_handlers(int reg)\n+static void clear_set_handlers(effectwin_t *ew, int reg)\n {\n static const event_message_handler_spec message_handlers[] =\n {\n@@ -1385,7 +1385,7 @@\n NELEMS(message_handlers),\n event_ANY_WINDOW,\n event_ANY_ICON,\n- NULL);\n+ ew);\n }\n \n static int clear_edit(effect_element *e, int x, int y)\n@@ -1408,7 +1408,7 @@\n &dialogue,\n &picker_w);\n \n- clear_set_handlers(1);\n+ clear_set_handlers(&LOCALS.single, 1);\n \n return 0;\n }\n@@ -1416,19 +1416,18 @@\n static int clear_message_colour_picker_colour_choice(wimp_message *message,\n void *opaque)\n {\n+ effectwin_t *ew = opaque;\n colourpicker_message_colour_choice *choice;\n \n- NOT_USED(opaque);\n-\n choice = (colourpicker_message_colour_choice *) &message->data;\n \n- LOCALS.single.editing_element->args.clear.colour = choice->colour;\n-\n- effect_edited(&LOCALS.single, LOCALS.single.editing_element);\n+ ew->editing_element->args.clear.colour = choice->colour;\n+\n+ effect_edited(ew, ew->editing_element);\n \n \/* I don't think this is going to unregister in the case when 'Cancel' is\n * clicked. *\/\n- clear_set_handlers(0);\n+ clear_set_handlers(ew, 0);\n \n return event_HANDLED;\n }\n"} {"commit":"45dcc1a2ffe2c74fc6c80215985049409d9b9c30","subject":"better options and prepared for filtering","message":"better options and prepared for filtering\n\ngit-svn-id: 9714148d14941aebeae8d7f7841217f5ffc02bc5@2289 4143565c-f3ec-42ea-b729-f8ce0cf5cbc3\n","repos":"telefonicaid\/fiware-cosmos-platform,telefonicaid\/fiware-cosmos-platform,telefonicaid\/fiware-cosmos-platform,telefonicaid\/fiware-cosmos-platform,telefonicaid\/fiware-cosmos-platform","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/arcanumConsumer\/arcanumTunnel.c\n+++ apps\/arcanumConsumer\/arcanumTunnel.c\n@@ -23,6 +23,7 @@\n #include <netinet\/tcp.h> \/\/ TCP_NODELAY\n #include <unistd.h> \/\/ close\n #include <fcntl.h> \/\/ fcntl, F_SETFD\n+#include <inttypes.h> \/\/ int32_t, ...\n \n \n \n@@ -107,6 +108,8 @@\n * global variables - \n *\/ \n static int verbose = 0;\n+static int filter = 0;\n+\n Node node1;\n Node node2;\n char buffer[8 * 1024 * 1024];\n@@ -304,6 +307,18 @@\n \n \/* ****************************************************************************\n *\n+* filteredTunnel - \n+*\/\n+void filteredTunnel(Node* from, Node* to)\n+{\n+\tE((\"Sorry, filter not implemented ...\"));\n+\texit(51);\n+}\n+\n+\n+\n+\/* ****************************************************************************\n+*\n * tunnel - \n *\/\n void tunnel(Node* from, Node* to)\n@@ -311,6 +326,12 @@\n \tint nb;\n \tint size;\n \tint total;\n+\n+\tif (filter == 1)\n+\t{\n+\t\tfilteredTunnel(from, to);\n+\t\treturn;\n+\t}\n \n \tnb = read(from->fd, buffer, sizeof(buffer));\n \tif (nb == -1)\n@@ -382,6 +403,20 @@\n \n \/* ****************************************************************************\n *\n+* usage - \n+*\/\n+void usage(char* progName)\n+{\n+\tprintf(\"Usage:\\n\");\n+\tprintf(\" %s -u\\n\", progName);\n+\tprintf(\" %s ip:port:role ip:port:role [-v | -vv | -vvv | -vvvv | -vvvvv (verbose level 1-5)] [-filter (use filter to remove unwanted data)]\\n\", progName);\n+\texit(1);\n+}\n+\n+\n+\n+\/* ****************************************************************************\n+*\n * main - \n *\/\n int main(int argC, char* argV[])\n@@ -389,10 +424,43 @@\n \tchar* node1info = argV[1];\n \tchar* node2info = argV[2];\n \t\n-\tif ((argC != 3) && (argC != 5))\n-\t\tX(1, (\"Usage: %s: IP:port IP2:port [-v <verbose level (0-5)>]\\n\", argV[0]));\n-\n-\tverbose = atoi(argV[4]);\n+\tif (strcmp(argV[1], \"-u\") == 0)\n+\t\tusage(argV[0]);\n+\n+\tif (argC < 3)\n+\t\tusage(argV[0]);\n+\n+\tint ix = 3;\n+\twhile (ix < argC)\n+\t{\n+\t\tif (strcmp(argV[ix], \"-v\") == 0)\n+\t\t\tverbose = 1;\n+\t\telse if (strcmp(argV[ix], \"-vv\") == 0)\n+\t\t\tverbose = 2;\n+\t\telse if (strcmp(argV[ix], \"-vvv\") == 0)\n+\t\t\tverbose = 3;\n+\t\telse if (strcmp(argV[ix], \"-vvvv\") == 0)\n+\t\t\tverbose = 4;\n+\t\telse if (strcmp(argV[ix], \"-vvvvv\") == 0)\n+\t\t\tverbose = 5;\n+\t\telse if (strcmp(argV[ix], \"-filter\") == 0)\n+\t\t{\n+\t\t\tX(51, (\"Sorry, filter not implemented ...\"));\n+\t\t\tfilter = 1;\n+\t\t}\n+\t\telse if (strcmp(argV[ix], \"-u\") == 0)\n+\t\t\tusage(argV[0]);\n+\t\telse\n+\t\t{\n+\t\t\tX(1, (\"%s: unrecognized option '%s'\\n\\nUsage: %s: IP:port:role IP2:port:role [-v <verbose level (0-5)>] [-u (usage)] [-filter (use filter to remove unwanted data)]\\n\",\n+\t\t\t\t argV[0], argV[ix], argV[0]));\n+\n+\t\t\tusage(argV[0]);\n+\t\t}\n+\n+\t\t++ix;\n+\t}\n+\n \n \tnodeParse(node1info, &node1);\n \tnodeParse(node2info, &node2);\n"} {"commit":"44a4244e4a0cab17c8ddcec78f6fc9dd92cef247","subject":"ARM: mach-shmobile: add fixed voltage regulators to kzm9g","message":"ARM: mach-shmobile: add fixed voltage regulators to kzm9g\n\nOn kzm9g provide 1.8V and 2.8V supplies for its SD\/MMC-card interfaces\nand a dummy regulator for the smsc911x driver.\n\nSigned-off-by: Guennadi Liakhovetski <50875182aae23d69ca7738697596f18a14e926fc@gmx.de>\nAcked-by: Magnus Damm <2336f5729424d0c84d319e991b3648cafa2c3c5b@opensource.se>\nSigned-off-by: Rafael J. Wysocki <a11f87183a953ab11f50fbafff689c5a7fa3506c@sisk.pl>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/mach-shmobile\/board-kzm9g.c\n+++ arch\/arm\/mach-shmobile\/board-kzm9g.c\n@@ -30,6 +30,8 @@\n #include <linux\/mmc\/sh_mobile_sdhi.h>\n #include <linux\/mfd\/tmio.h>\n #include <linux\/platform_device.h>\n+#include <linux\/regulator\/fixed.h>\n+#include <linux\/regulator\/machine.h>\n #include <linux\/smsc911x.h>\n #include <linux\/usb\/r8a66597.h>\n #include <linux\/usb\/renesas_usbhs.h>\n@@ -56,6 +58,12 @@\n #define GPIO_PCF8575_PORT14\t(GPIO_NR + 12)\n #define GPIO_PCF8575_PORT15\t(GPIO_NR + 13)\n #define GPIO_PCF8575_PORT16\t(GPIO_NR + 14)\n+\n+\/* Dummy supplies, where voltage doesn't matter *\/\n+static struct regulator_consumer_supply dummy_supplies[] = {\n+\tREGULATOR_SUPPLY(\"vddvario\", \"smsc911x\"),\n+\tREGULATOR_SUPPLY(\"vdd33a\", \"smsc911x\"),\n+};\n \n \/*\n * FSI-AK4648\n@@ -322,6 +330,13 @@\n \t},\n };\n \n+\/* Fixed 1.8V regulator to be used by MMCIF *\/\n+static struct regulator_consumer_supply fixed1v8_power_consumers[] =\n+{\n+\tREGULATOR_SUPPLY(\"vmmc\", \"sh_mmcif.0\"),\n+\tREGULATOR_SUPPLY(\"vqmmc\", \"sh_mmcif.0\"),\n+};\n+\n \/* MMCIF *\/\n static struct resource sh_mmcif_resources[] = {\n \t[0] = {\n@@ -356,6 +371,13 @@\n \t},\n \t.num_resources\t= ARRAY_SIZE(sh_mmcif_resources),\n \t.resource\t= sh_mmcif_resources,\n+};\n+\n+\/* Fixed 2.8V regulators to be used by SDHI0 *\/\n+static struct regulator_consumer_supply fixed2v8_power_consumers[] =\n+{\n+\tREGULATOR_SUPPLY(\"vmmc\", \"sh_mobile_sdhi.0\"),\n+\tREGULATOR_SUPPLY(\"vqmmc\", \"sh_mobile_sdhi.0\"),\n };\n \n \/* SDHI *\/\n@@ -619,6 +641,12 @@\n \n static void __init kzm_init(void)\n {\n+\tregulator_register_always_on(0, \"fixed-1.8V\", fixed1v8_power_consumers,\n+\t\t\t\t ARRAY_SIZE(fixed1v8_power_consumers), 1800000);\n+\tregulator_register_always_on(1, \"fixed-2.8V\", fixed2v8_power_consumers,\n+\t\t\t\t ARRAY_SIZE(fixed2v8_power_consumers), 2800000);\n+\tregulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies));\n+\n \tsh73a0_pinmux_init();\n \n \t\/* enable SCIFA4 *\/\n"} {"commit":"5f85052c606e38c98de28170a2df72f78931aa30","subject":"ARM: shmobile: lager: Remove init_irq declaration in machine description","message":"ARM: shmobile: lager: Remove init_irq declaration in machine description\n\nRemove redundant irqchip_init() callback. The default case\nof NULL will result in invoking irqchip_init() anyway.\n\nSigned-off-by: Magnus Damm <2336f5729424d0c84d319e991b3648cafa2c3c5b@opensource.se>\n[ 9662bddcc379be37df16f02a449c344b4718c1a1@verge.net.au: Trimmed patch to remove portion\n that updates the r8a7790 SoC and altered the subject to\n use the same format as the patch that updates the r8a7790. ]\nSigned-off-by: Simon Horman <9662bddcc379be37df16f02a449c344b4718c1a1@verge.net.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/mach-shmobile\/board-lager.c\n+++ arch\/arm\/mach-shmobile\/board-lager.c\n@@ -22,7 +22,6 @@\n #include <linux\/gpio_keys.h>\n #include <linux\/input.h>\n #include <linux\/interrupt.h>\n-#include <linux\/irqchip.h>\n #include <linux\/kernel.h>\n #include <linux\/leds.h>\n #include <linux\/pinctrl\/machine.h>\n@@ -103,7 +102,6 @@\n };\n \n DT_MACHINE_START(LAGER_DT, \"lager\")\n-\t.init_irq\t= irqchip_init,\n \t.init_time\t= r8a7790_timer_init,\n \t.init_machine\t= lager_add_standard_devices,\n \t.dt_compat\t= lager_boards_compat_dt,\n"} {"commit":"0293ca814b74e20e77cf719074ee15372204fc55","subject":"[VOYAGER] add smp_call_function_single","message":"[VOYAGER] add smp_call_function_single\n\nThis apparently has msr users now, so add it to the voyager HAL\n\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@HansenPartnership.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/i386\/mach-voyager\/voyager_smp.c\n+++ arch\/i386\/mach-voyager\/voyager_smp.c\n@@ -1082,7 +1082,47 @@\n \t}\n }\n \n-\/* Call this function on all CPUs using the function_interrupt above \n+static int\n+__smp_call_function_mask (void (*func) (void *info), void *info, int retry,\n+\t\t\t int wait, __u32 mask)\n+{\n+\tstruct call_data_struct data;\n+\n+\tmask &= ~(1<<smp_processor_id());\n+\n+\tif (!mask)\n+\t\treturn 0;\n+\n+\t\/* Can deadlock when called with interrupts disabled *\/\n+\tWARN_ON(irqs_disabled());\n+\n+\tdata.func = func;\n+\tdata.info = info;\n+\tdata.started = mask;\n+\tdata.wait = wait;\n+\tif (wait)\n+\t\tdata.finished = mask;\n+\n+\tspin_lock(&call_lock);\n+\tcall_data = &data;\n+\twmb();\n+\t\/* Send a message to all other CPUs and wait for them to respond *\/\n+\tsend_CPI(mask, VIC_CALL_FUNCTION_CPI);\n+\n+\t\/* Wait for response *\/\n+\twhile (data.started)\n+\t\tbarrier();\n+\n+\tif (wait)\n+\t\twhile (data.finished)\n+\t\t\tbarrier();\n+\n+\tspin_unlock(&call_lock);\n+\n+\treturn 0;\n+}\n+\n+\/* Call this function on all CPUs using the function_interrupt above\n <func> The function to run. This must be fast and non-blocking.\n <info> An arbitrary pointer to pass to the function.\n <retry> If true, keep retrying until ready.\n@@ -1091,46 +1131,37 @@\n remote CPUs are nearly ready to execute <<func>> or are or have executed.\n *\/\n int\n-smp_call_function (void (*func) (void *info), void *info, int retry,\n+smp_call_function(void (*func) (void *info), void *info, int retry,\n \t\t int wait)\n {\n-\tstruct call_data_struct data;\n \t__u32 mask = cpus_addr(cpu_online_map)[0];\n \n-\tmask &= ~(1<<smp_processor_id());\n-\n-\tif (!mask)\n-\t\treturn 0;\n-\n-\t\/* Can deadlock when called with interrupts disabled *\/\n-\tWARN_ON(irqs_disabled());\n-\n-\tdata.func = func;\n-\tdata.info = info;\n-\tdata.started = mask;\n-\tdata.wait = wait;\n-\tif (wait)\n-\t\tdata.finished = mask;\n-\n-\tspin_lock(&call_lock);\n-\tcall_data = &data;\n-\twmb();\n-\t\/* Send a message to all other CPUs and wait for them to respond *\/\n-\tsend_CPI_allbutself(VIC_CALL_FUNCTION_CPI);\n-\n-\t\/* Wait for response *\/\n-\twhile (data.started)\n-\t\tbarrier();\n-\n-\tif (wait)\n-\t\twhile (data.finished)\n-\t\t\tbarrier();\n-\n-\tspin_unlock(&call_lock);\n-\n-\treturn 0;\n+\treturn __smp_call_function_mask(func, info, retry, wait, mask);\n }\n EXPORT_SYMBOL(smp_call_function);\n+\n+\/*\n+ * smp_call_function_single - Run a function on another CPU\n+ * @func: The function to run. This must be fast and non-blocking.\n+ * @info: An arbitrary pointer to pass to the function.\n+ * @nonatomic: Currently unused.\n+ * @wait: If true, wait until function has completed on other CPUs.\n+ *\n+ * Retrurns 0 on success, else a negative status code.\n+ *\n+ * Does not return until the remote CPU is nearly ready to execute <func>\n+ * or is or has executed.\n+ *\/\n+\n+int\n+smp_call_function_single(int cpu, void (*func) (void *info), void *info,\n+\t\t\t int nonatomic, int wait)\n+{\n+\t__u32 mask = 1 << cpu;\n+\n+\treturn __smp_call_function_mask(func, info, nonatomic, wait, mask);\n+}\n+EXPORT_SYMBOL(smp_call_function_single);\n \n \/* Sorry about the name. In an APIC based system, the APICs\n * themselves are programmed to send a timer interrupt. This is used\n"} {"commit":"4837a661a52dd9e02cd1cdb08a7ebdc5ed028ee4","subject":"MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.","message":"MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.\n\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/mips\/cavium-octeon\/octeon-irq.c\n+++ arch\/mips\/cavium-octeon\/octeon-irq.c\n@@ -544,7 +544,7 @@\n \n #ifdef CONFIG_PCI_MSI\n \n-static DEFINE_SPINLOCK(octeon_irq_msi_lock);\n+static DEFINE_RAW_SPINLOCK(octeon_irq_msi_lock);\n \n static void octeon_irq_msi_ack(unsigned int irq)\n {\n@@ -586,12 +586,12 @@\n \t\t *\/\n \t\tuint64_t en;\n \t\tunsigned long flags;\n-\t\tspin_lock_irqsave(&octeon_irq_msi_lock, flags);\n+\t\traw_spin_lock_irqsave(&octeon_irq_msi_lock, flags);\n \t\ten = cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);\n \t\ten |= 1ull << (irq - OCTEON_IRQ_MSI_BIT0);\n \t\tcvmx_write_csr(CVMX_PEXP_NPEI_MSI_ENB0, en);\n \t\tcvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);\n-\t\tspin_unlock_irqrestore(&octeon_irq_msi_lock, flags);\n+\t\traw_spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);\n \t}\n }\n \n@@ -608,12 +608,12 @@\n \t\t *\/\n \t\tuint64_t en;\n \t\tunsigned long flags;\n-\t\tspin_lock_irqsave(&octeon_irq_msi_lock, flags);\n+\t\traw_spin_lock_irqsave(&octeon_irq_msi_lock, flags);\n \t\ten = cvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);\n \t\ten &= ~(1ull << (irq - OCTEON_IRQ_MSI_BIT0));\n \t\tcvmx_write_csr(CVMX_PEXP_NPEI_MSI_ENB0, en);\n \t\tcvmx_read_csr(CVMX_PEXP_NPEI_MSI_ENB0);\n-\t\tspin_unlock_irqrestore(&octeon_irq_msi_lock, flags);\n+\t\traw_spin_unlock_irqrestore(&octeon_irq_msi_lock, flags);\n \t}\n }\n \n"} {"commit":"e1df057df814a4a70a8711c0226a1d178c33edaa","subject":"MIPS: AR7: Fix typo in ar7.h","message":"MIPS: AR7: Fix typo in ar7.h\n\nThis fixes a typo on the AR7_RESET_PERIPHERAL define.\n\nSigned-off-by: Florian Fainelli <73262ad0334ab37227b2f7a0205f51db1e606681@openwrt.org>\nTo: 562397917b9a8bf316569a848858b12fb417723f@linux-mips.org\nPatchwork: http:\/\/patchwork.linux-mips.org\/patch\/1247\/\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/mips\/include\/asm\/mach-ar7\/ar7.h\n+++ arch\/mips\/include\/asm\/mach-ar7\/ar7.h\n@@ -50,7 +50,7 @@\n #define UR8_REGS_WDT\t(AR7_REGS_BASE + 0x0b00)\n #define UR8_REGS_UART1\t(AR7_REGS_BASE + 0x0f00)\n \n-#define AR7_RESET_PEREPHERIAL\t0x0\n+#define AR7_RESET_PERIPHERAL\t0x0\n #define AR7_RESET_SOFTWARE\t0x4\n #define AR7_RESET_STATUS\t0x8\n \n@@ -128,7 +128,7 @@\n static inline void ar7_device_enable(u32 bit)\n {\n \tvoid *reset_reg =\n-\t\t(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PEREPHERIAL);\n+\t\t(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PERIPHERAL);\n \twritel(readl(reset_reg) | (1 << bit), reset_reg);\n \tmsleep(20);\n }\n@@ -136,7 +136,7 @@\n static inline void ar7_device_disable(u32 bit)\n {\n \tvoid *reset_reg =\n-\t\t(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PEREPHERIAL);\n+\t\t(void *)KSEG1ADDR(AR7_REGS_RESET + AR7_RESET_PERIPHERAL);\n \twritel(readl(reset_reg) & ~(1 << bit), reset_reg);\n \tmsleep(20);\n }\n"} {"commit":"c8f4ff9f3f655c92ca7b31850bfea2ce3796e386","subject":"[MIPS] Oprofile: Fix rm9000 performance counter handler","message":"[MIPS] Oprofile: Fix rm9000 performance counter handler\n\nThe new type of irq handler remove a parameter (struct pt_regs *),but\nsomeone forgot to supply it.\n\nSigned-off-by: Dajie Tan <c5080f70fc412753f9831d5e68e5f577e8fb6132@gmail.com>\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/mips\/oprofile\/op_model_rm9000.c\n+++ arch\/mips\/oprofile\/op_model_rm9000.c\n@@ -83,6 +83,7 @@\n static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id)\n {\n \tunsigned int control = read_c0_perfcontrol();\n+\tstruct pt_regs *regs = get_irq_regs();\n \tuint32_t counter1, counter2;\n \tuint64_t counters;\n \n"} {"commit":"97bf2640184f4fb2b2bf2c58ae3112768a6174fa","subject":"powerpc\/perf\/hv-gpci: add the remaining gpci requests","message":"powerpc\/perf\/hv-gpci: add the remaining gpci requests\n\nAdd the remaining gpci requests that contain counters suitable for use\nby perf. Omit those that don't contain any counters (but note their\nommision).\n\nSigned-off-by: Cody P Schafer <c4fe2b1d90ef8f2548c8aeabfa633434316f0305@linux.vnet.ibm.com>\nSigned-off-by: Sukadev Bhattiprolu <2ac48ee9b8f6042694a5d86ef56b8e10fe5327d1@linux.vnet.ibm.com>\nSigned-off-by: Michael Ellerman <864f124608374e06e4da1fa5d2e47ed839b95411@ellerman.id.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/powerpc\/perf\/hv-gpci-requests.h\n+++ arch\/powerpc\/perf\/hv-gpci-requests.h\n@@ -20,7 +20,9 @@\n *\n * - starting_index_kind is one of the following, depending on the event:\n *\n- * chip_id: hardware chip id or -1 for current hw chip\n+ * hw_chip_id: hardware chip id or -1 for current hw chip\n+ * partition_id\n+ * sibling_part_id,\n * phys_processor_idx:\n * 0xffffffffffffffff: or -1, which means it is irrelavant for the event\n *\n@@ -63,6 +65,33 @@\n )\n #include I(REQUEST_END)\n \n+#define REQUEST_NAME entitled_capped_uncapped_donated_idle_timebase_by_partition\n+#define REQUEST_NUM 0x20\n+#define REQUEST_IDX_KIND \"sibling_part_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t8,\tpartition_id)\n+\t__count(0x8,\t8,\tentitled_cycles)\n+\t__count(0x10,\t8,\tconsumed_capped_cycles)\n+\t__count(0x18,\t8,\tconsumed_uncapped_cycles)\n+\t__count(0x20,\t8,\tcycles_donated)\n+\t__count(0x28,\t8,\tpurr_idle_cycles)\n+)\n+#include I(REQUEST_END)\n+\n+\/*\n+ * Not available for counter_info_version >= 0x8, use\n+ * run_instruction_cycles_by_partition(0x100) instead.\n+ *\/\n+#define REQUEST_NAME run_instructions_run_cycles_by_partition\n+#define REQUEST_NUM 0x30\n+#define REQUEST_IDX_KIND \"sibling_part_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t8,\tpartition_id)\n+\t__count(0x8,\t8,\tinstructions_completed)\n+\t__count(0x10,\t8,\tcycles)\n+)\n+#include I(REQUEST_END)\n+\n #define REQUEST_NAME system_performance_capabilities\n #define REQUEST_NUM 0x40\n #define REQUEST_IDX_KIND \"starting_index=0xffffffffffffffff\"\n@@ -73,4 +102,160 @@\n )\n #include I(REQUEST_END)\n \n+#define REQUEST_NAME processor_bus_utilization_abc_links\n+#define REQUEST_NUM 0x50\n+#define REQUEST_IDX_KIND \"hw_chip_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t4,\thw_chip_id)\n+\t__array(0x4,\t0xC,\treserved1)\n+\t__count(0x10,\t8,\ttotal_link_cycles)\n+\t__count(0x18,\t8,\tidle_cycles_for_a_link)\n+\t__count(0x20,\t8,\tidle_cycles_for_b_link)\n+\t__count(0x28,\t8,\tidle_cycles_for_c_link)\n+\t__array(0x30,\t0x20,\treserved2)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME processor_bus_utilization_wxyz_links\n+#define REQUEST_NUM 0x60\n+#define REQUEST_IDX_KIND \"hw_chip_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t4,\thw_chip_id)\n+\t__array(0x4,\t0xC,\treserved1)\n+\t__count(0x10,\t8,\ttotal_link_cycles)\n+\t__count(0x18,\t8,\tidle_cycles_for_w_link)\n+\t__count(0x20,\t8,\tidle_cycles_for_x_link)\n+\t__count(0x28,\t8,\tidle_cycles_for_y_link)\n+\t__count(0x30,\t8,\tidle_cycles_for_z_link)\n+\t__array(0x38,\t0x28,\treserved2)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME processor_bus_utilization_gx_links\n+#define REQUEST_NUM 0x70\n+#define REQUEST_IDX_KIND \"hw_chip_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t4,\thw_chip_id)\n+\t__array(0x4,\t0xC,\treserved1)\n+\t__count(0x10,\t8,\tgx0_in_address_cycles)\n+\t__count(0x18,\t8,\tgx0_in_data_cycles)\n+\t__count(0x20,\t8,\tgx0_in_retries)\n+\t__count(0x28,\t8,\tgx0_in_bus_cycles)\n+\t__count(0x30,\t8,\tgx0_in_cycles_total)\n+\t__count(0x38,\t8,\tgx0_out_address_cycles)\n+\t__count(0x40,\t8,\tgx0_out_data_cycles)\n+\t__count(0x48,\t8,\tgx0_out_retries)\n+\t__count(0x50,\t8,\tgx0_out_bus_cycles)\n+\t__count(0x58,\t8,\tgx0_out_cycles_total)\n+\t__count(0x60,\t8,\tgx1_in_address_cycles)\n+\t__count(0x68,\t8,\tgx1_in_data_cycles)\n+\t__count(0x70,\t8,\tgx1_in_retries)\n+\t__count(0x78,\t8,\tgx1_in_bus_cycles)\n+\t__count(0x80,\t8,\tgx1_in_cycles_total)\n+\t__count(0x88,\t8,\tgx1_out_address_cycles)\n+\t__count(0x90,\t8,\tgx1_out_data_cycles)\n+\t__count(0x98,\t8,\tgx1_out_retries)\n+\t__count(0xA0,\t8,\tgx1_out_bus_cycles)\n+\t__count(0xA8,\t8,\tgx1_out_cycles_total)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME processor_bus_utilization_mc_links\n+#define REQUEST_NUM 0x80\n+#define REQUEST_IDX_KIND \"hw_chip_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t4,\thw_chip_id)\n+\t__array(0x4,\t0xC,\treserved1)\n+\t__count(0x10,\t8,\tmc0_frames)\n+\t__count(0x18,\t8,\tmc0_reads)\n+\t__count(0x20,\t8,\tmc0_write)\n+\t__count(0x28,\t8,\tmc0_total_cycles)\n+\t__count(0x30,\t8,\tmc1_frames)\n+\t__count(0x38,\t8,\tmc1_reads)\n+\t__count(0x40,\t8,\tmc1_writes)\n+\t__count(0x48,\t8,\tmc1_total_cycles)\n+)\n+#include I(REQUEST_END)\n+\n+\/* Processor_config (0x90) skipped, no counters *\/\n+\/* Current_processor_frequency (0x91) skipped, no counters *\/\n+\n+#define REQUEST_NAME processor_core_utilization\n+#define REQUEST_NUM 0x94\n+#define REQUEST_IDX_KIND \"phys_processor_idx=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t4,\tphys_processor_idx)\n+\t__field(0x4,\t4,\thw_processor_id)\n+\t__count(0x8,\t8,\tcycles_across_any_thread)\n+\t__count(0x10,\t8,\ttimebase_at_collection)\n+\t__count(0x18,\t8,\tpurr_cycles)\n+\t__count(0x20,\t8,\tsum_of_cycles_across_all_threads)\n+\t__count(0x28,\t8,\tinstructions_completed)\n+)\n+#include I(REQUEST_END)\n+\n+\/* Processor_core_power_mode (0x95) skipped, no counters *\/\n+\/* Affinity_domain_information_by_virtual_processor (0xA0) skipped,\n+ *\tno counters *\/\n+\/* Affinity_domain_information_by_domain (0xB0) skipped, no counters *\/\n+\/* Affinity_domain_information_by_partition (0xB1) skipped, no counters *\/\n+\/* Physical_memory_info (0xC0) skipped, no counters *\/\n+\/* Processor_bus_topology (0xD0) skipped, no counters *\/\n+\n+#define REQUEST_NAME partition_hypervisor_queuing_times\n+#define REQUEST_NUM 0xE0\n+#define REQUEST_IDX_KIND \"partition_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t2, partition_id)\n+\t__array(0x2,\t6, reserved1)\n+\t__count(0x8,\t8, time_waiting_for_entitlement)\n+\t__count(0x10,\t8, times_waited_for_entitlement)\n+\t__count(0x18,\t8, time_waiting_for_phys_processor)\n+\t__count(0x20,\t8, times_waited_for_phys_processor)\n+\t__count(0x28,\t8, dispatches_on_home_core)\n+\t__count(0x30,\t8, dispatches_on_home_primary_affinity_domain)\n+\t__count(0x38,\t8, dispatches_on_home_secondary_affinity_domain)\n+\t__count(0x40,\t8, dispatches_off_home_secondary_affinity_domain)\n+\t__count(0x48,\t8, dispatches_on_dedicated_processor_donating_cycles)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME system_hypervisor_times\n+#define REQUEST_NUM 0xF0\n+#define REQUEST_IDX_KIND \"starting_index=0xffffffffffffffff\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__count(0,\t8,\ttime_spent_to_dispatch_virtual_processors)\n+\t__count(0x8,\t8,\ttime_spent_processing_virtual_processor_timers)\n+\t__count(0x10,\t8,\ttime_spent_managing_partitions_over_entitlement)\n+\t__count(0x18,\t8,\ttime_spent_on_system_management)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME system_tlbie_count_and_time\n+#define REQUEST_NUM 0xF4\n+#define REQUEST_IDX_KIND \"starting_index=0xffffffffffffffff\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__count(0,\t8,\ttlbie_instructions_issued)\n+\t\/*\n+\t * FIXME: The spec says the offset here is 0x10, which I suspect\n+\t *\t is wrong.\n+\t *\/\n+\t__count(0x8,\t8,\ttime_spent_issuing_tlbies)\n+)\n+#include I(REQUEST_END)\n+\n+#define REQUEST_NAME partition_instruction_count_and_time\n+#define REQUEST_NUM 0x100\n+#define REQUEST_IDX_KIND \"partition_id=?\"\n+#include I(REQUEST_BEGIN)\n+REQUEST(__field(0,\t2,\tpartition_id)\n+\t__array(0x2,\t0x6,\treserved1)\n+\t__count(0x8,\t8,\tinstructions_performed)\n+\t__count(0x10,\t8,\ttime_collected)\n+)\n+#include I(REQUEST_END)\n+\n+\/* set_mmcrh (0x80001000) skipped, no counters *\/\n+\/* retrieve_hpmcx (0x80002000) skipped, no counters *\/\n+\n #include \"req-gen\/_end.h\"\n"} {"commit":"035688d9c64c61957dd272a1e773f27b0143704d","subject":"sh: ecovec: add sample amixer settings","message":"sh: ecovec: add sample amixer settings\n\nFSI - DA7210 needs amixer settings to use it.\nThis patch adds quick setting guide\n\nSigned-off-by: Kuninori Morimoto <a3b51ccb87d18302c1692defcfbf83319d1737eb@renesas.com>\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/sh\/boards\/mach-ecovec24\/setup.c\n+++ arch\/sh\/boards\/mach-ecovec24\/setup.c\n@@ -70,6 +70,16 @@\n * OFF-ON : MMC\n *\/\n \n+\/*\n+ * FSI - DA7210\n+ *\n+ * it needs amixer settings for playing\n+ *\n+ * amixer set 'HeadPhone' 80\n+ * amixer set 'Out Mixer Left DAC Left' on\n+ * amixer set 'Out Mixer Right DAC Right' on\n+ *\/\n+\n \/* Heartbeat *\/\n static unsigned char led_pos[] = { 0, 1, 2, 3 };\n \n"} {"commit":"54c0af9f1a1bfe9639666aea789dae6a37a741cf","subject":"xtensa: xtfpga: fix section mismatch","message":"xtensa: xtfpga: fix section mismatch\n\nplatform_calibrate_ccount() calls update_clock_frequency() which is in .init\nsection. However, platform_calibrate_ccount() itself is only called from .init\n(i.e., time_init()).\n\nSigned-off-by: Baruch Siach <53ccad33e0625915318fb3bc832e5c1c413d1294@tkos.co.il>\nSigned-off-by: Max Filippov <8c5ea195856807f4f02a6e0749c87ea6b7375f38@gmail.com>\nSigned-off-by: Chris Zankel <711c73f64afdce07b7e38039a96d2224209e9a6c@zankel.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/xtensa\/platforms\/xtfpga\/setup.c\n+++ arch\/xtensa\/platforms\/xtfpga\/setup.c\n@@ -163,7 +163,7 @@\n \n #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT\n \n-void platform_calibrate_ccount(void)\n+void __init platform_calibrate_ccount(void)\n {\n \tlong clk_freq = 0;\n #ifdef CONFIG_OF\n"} {"commit":"2229061d77c588db765570ee241f5c47419aa59f","subject":"fix potential overflow in square root code mod p^k","message":"fix potential overflow in square root code mod p^k\n","repos":"wbhart\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,wbhart\/flint2,dsroche\/flint2,dsroche\/flint2,jpflori\/flint2,dsroche\/flint2,fredrik-johansson\/flint2,jpflori\/flint2,dsroche\/flint2,wbhart\/flint2,jpflori\/flint2,fredrik-johansson\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- arith\/dedekind_cosine_sum_factored.c\n+++ arith\/dedekind_cosine_sum_factored.c\n@@ -82,7 +82,7 @@\n {\n t = n_mulmod2_preinv(r, r, pk, pkinv);\n t = n_submod(t, a, pk);\n- t = n_mulmod2_preinv(t, n_invmod((2*r) % pk, pk), pk, pkinv);\n+ t = n_mulmod2_preinv(t, n_invmod(n_addmod(r, r, pk), pk), pk, pkinv);\n r = n_submod(r, t, pk);\n i *= 2;\n }\n"} {"commit":"ce84704d4ad3fdb51cd4b52886a6017b6c51ac2f","subject":"UNGLAUBLICH, vlmm wird gebaut, gepruned und Knotn wrden gel\u00f6scht. Scheinbar ohne Fehler!","message":"UNGLAUBLICH, vlmm wird gebaut, gepruned und Knotn wrden gel\u00f6scht. Scheinbar ohne Fehler!\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@775 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- seqan\/projects\/library\/seqan\/vlmm.h\n+++ seqan\/projects\/library\/seqan\/vlmm.h\n@@ -230,27 +230,32 @@\n \t\t\t\t}\r\n \t\t\t\telse\r\n \t\t\t\t\tif(isRightTerminal(it)){ \/\/ check if node can be extended\r\n-\t\t\t\t\t\t\/\/ create dummy values for the case thatv we go down with the Constrained Traversal Iterator\r\n-\t\t\t\t\t\t\/\/ and need to go up afterwards, because we actually found a valid child\r\n-\t\t\t\t\t\t\/\/ Only then we need to set the values back\r\n-\t\t\t\t\t\tunsigned fatherRepLength = repLength(it);\r\n-\t\t\t\t\t\tbool DOWN = it.Down;\r\n-\t\t\t\t\t\tunsigned UP = it.Up;\r\n-\t\t\t\t\t\tgoDown(it);\r\n-\t\t\t\t\t\tgoRight(it);\r\n-\t\t\t\t\t\t\/\/ move to rightest sibling, if this has counts (is a leaf or node) its fine\r\n-\t\t\t\t\t\twhile(fatherRepLength == repLength(it) && goRight(it));\r\n-\t\t\t\t\t\tgoUp(it);\r\n-\t\t\t\t\t\tif( fatherRepLength == repLength(it)){\r\n-\t\t\t\t\t\t\tit.Up += -1;\r\n+\t\t\t\t\t\t\/\/ test with the topdown iterator (without considering $-Edges) if non-$-Leaf\r\n+\t\t\t\t\t\tIter<Index<TText, TSpec>, VSTree< TopDown< > > > copy(container(it),value(it));\r\n+\t\t\t\t\t\tif( !goDown(copy)){\r\n \t\t\t\t\t\t\tnot_finished=1;\r\n \t\t\t\t\t\t\twalk_down=0;\r\n \t\t\t\t\t\t}\r\n-\t\t\t\t\t\telse{ \/\/set the remembered values in\r\n-\t\t\t\t\t\t\t it.Down = DOWN;\r\n-\t\t\t\t\t\t\t it.Up = UP;\r\n-\t\t\t\t\t\t\t not_finished = 0;\r\n-\t\t\t\t\t\t}\r\n+\t\t\t\r\n+\t\t\t\t\t\t\/\/\/\/topDown<Index,indec(it),value(it) Index VertexDesriptor\r\n+\t\t\t\t\t\t\/\/unsigned fatherRepLength = repLength(it);\r\n+\t\t\t\t\t\t\/\/bool DOWN = it.Down;\r\n+\t\t\t\t\t\t\/\/unsigned UP = it.Up;\r\n+\t\t\t\t\t\t\/\/goDown(it);\r\n+\t\t\t\t\t\t\/\/goRight(it);\r\n+\t\t\t\t\t\t\/\/\/\/ move to rightest sibling, if this has counts (is a leaf or node) its fine\r\n+\t\t\t\t\t\t\/\/while(fatherRepLength == repLength(it) && goRight(it));\r\n+\t\t\t\t\t\t\/\/goUp(it);\r\n+\t\t\t\t\t\t\/\/if( fatherRepLength == repLength(it)){\r\n+\t\t\t\t\t\t\/\/\tit.Up += -1;\r\n+\t\t\t\t\t\t\/\/\tnot_finished=1;\r\n+\t\t\t\t\t\t\/\/\twalk_down=0;\r\n+\t\t\t\t\t\t\/\/}\r\n+\t\t\t\t\t\t\/\/else{ \/\/set the remembered values in\r\n+\t\t\t\t\t\t\/\/\t it.Down = DOWN;\r\n+\t\t\t\t\t\t\/\/\t it.Up = UP;\r\n+\t\t\t\t\t\t\/\/\t not_finished = 0;\r\n+\t\t\t\t\t\t\/\/}\r\n \t\t\t\t\t}\r\n \t\t\t\t\t\r\n \t\t\t\t}\r\n@@ -557,7 +562,6 @@\n \t\t TVertexDescriptor& child) \r\n {\r\n \tSEQAN_CHECKPOINT\r\n-\ttypedef Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TSpec> > > > TGraph;\r\n \r\n \twg.data_father[child] = father;\r\n \treturn;\r\n@@ -644,8 +648,8 @@\n template<typename TAlphabet, typename TCargo, typename TSpec , typename TVertexDescriptor, typename TChar>\r\n inline typename VertexDescriptor<Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TSpec> > > > >::Type \r\n setReverseSuffixLink(Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TSpec> > > >& g,\r\n-\t\t\t TVertexDescriptor source,\r\n-\t\t\t TVertexDescriptor target,\r\n+\t\t\t TVertexDescriptor &source,\r\n+\t\t\t TVertexDescriptor &target,\r\n \t\t\t TChar const c) \r\n {\r\n \tSEQAN_CHECKPOINT\r\n@@ -673,6 +677,28 @@\n \tSEQAN_ASSERT(getReverseSuffixLink(vlmm,SLfather,i) == SLchild);\r\n \treturn ((TAlphabet)0);\r\n }\r\n+\r\n+\r\n+template<typename TAlphabet, typename TCargo, typename TSpec , typename TVertexDescriptor>\r\n+inline void \r\n+removeAllReverseSuffixLinks(Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TSpec> > > >& g,\r\n+\t\t\t TVertexDescriptor &source) \r\n+{\r\n+\tSEQAN_CHECKPOINT\r\n+\r\n+\ttypedef typename Size<TAlphabet>::Type TSize;\r\n+\tTSize table_length = ValueSize<TAlphabet>::VALUE;\r\n+\tTVertexDescriptor nilVal = getNil<TVertexDescriptor>();\r\n+\tTVertexDescriptor dummy;\r\n+\tfor(TSize i = 0;i<table_length;++i){\r\n+\t\tif(getReverseSuffixLink(g,source,i) != nilVal){\r\n+\t\t\t\tdummy = getReverseSuffixLink(g,source,i);\r\n+\t\t\t\tsetReverseSuffixLink(g,source,nilVal,i);\r\n+\t\t\t\tsetSuffixLink(g,dummy,nilVal);\r\n+\t\t}\r\n+\t}\r\n+}\r\n+\r\n \r\n \/\/Graph<Automaton<TText, TCargo, WordGraph< VLMM < TSpec > > >, TGraphSpec> \r\n \/\/ currently this function can only be called for index of\r\n@@ -742,8 +768,10 @@\n \t\t\t\t\tString<TAlphabet> EdgeLabel = parentEdgeLabel(it);\r\n \t\t\t\t\tTAlphabet letter = value(EdgeLabel,length(EdgeLabel)-diff );\r\n \t\t\t\t\tString<TAlphabet> pref = prefix( EdgeLabel, length(EdgeLabel)-diff );\r\n+\t\t\t\t\tcout << \"prefix of edgelabel \"<<pref<<endl;\r\n \t\t\t\t\taddEdge(target,father,child, pref);\r\n \t\t\t\t\tinitProbabilityVectorForLeaf(it,target,child,letter);\r\n+\t\t\t\t\tSEQAN_ASSERT(parseString2(target,father,pref)==child)\r\n }\r\n \r\n \/\/Graph<Automaton<TText, TCargo, WordGraph< VLMM < TSpec > > >, TGraphSpec> \r\n@@ -1020,6 +1048,7 @@\n \tTVertexDescriptor child = vlmm.data_vertex[father].data_edge[(TSize) letter].data_target;\r\n \tcout << \"split edge at pos:\"<< splitPosition<<\" character:\" <<(int)childCharacter<<\" father\" <<father<<endl;\r\n \tString<TAlphabet> edgeString;\r\n+\tfloat number = getProbability(vlmm,father,childCharacter);\r\n \tgetSuffixChildLabel(vlmm,father,letter,edgeString);\r\n \t\/\/String<TAlphabet> edgeString = getProperty(vlmm.data_edge_label, TEdgeDescriptor(father, letter));\r\n \t\/\/std::cout<<\"before new node created, NumVertc:\"<<numVertices(vlmm)<<std::endl;\r\n@@ -1035,9 +1064,8 @@\n \t}\r\n \tappend(newEdgeString,prefix(edgeString,splitPosition),Exact());\r\n \taddEdge(vlmm,father,newNode,newEdgeString );\r\n-\r\n \tsetFather(vlmm,father,newNode);\r\n-\tsetProbability(vlmm,newNode,value(edgeString,splitPosition),1);\r\n+\tsetProbability(vlmm,newNode,value(edgeString,splitPosition),number);\r\n \tString<TAlphabet> EdgeLabel = suffix(edgeString,splitPosition);\r\n \taddEdge(vlmm,newNode,child,EdgeLabel);\r\n \tsetFather(vlmm,newNode,child);\r\n@@ -1660,7 +1688,12 @@\n \t\t\/\/smoothNode(vlmm,node,parameters);\r\n \t}\r\n \telse\r\n-\t{\r\n+\t{\t\/\/ we are sure thatr we have to remove the whole subtree below\r\n+\t\t\/\/ node, because if node has no valid suffixLink means that either\r\n+\t\t\/\/ node only exits because the edge has been pruned or the potential\r\n+\t\t\/\/ suffixLink target did not reach the threshold (not in the monotonous decreasing case)\r\n+\t\tif(getSuffixLink(vlmm,node) == nilVal)\r\n+\t\t\t\tremoveSubtree(vlmm,node);\r\n \t\/\/ delete node\r\n \t\t\/\/std::cout <<\" delete it\"<<std::endl;\r\n \t\t\/\/setMarked(vlmm,node,false); default is false\r\n@@ -1691,6 +1724,9 @@\n {\r\n \tSEQAN_CHECKPOINT\r\n \ttypedef typename Size<TAlphabet>::Type TSize;\r\n+\t\r\n+\ttypedef Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > TGraph;\r\n+\ttypedef typename EdgeDescriptor<TGraph>::Type TEdgeDescriptor;\r\n \tSEQAN_ASSERT(idInUse(vlmm.data_id_managerV, trashNode) == true)\r\n \tTVertexDescriptor nilVal = getNil<TVertexDescriptor>();\r\n \tif(trashNode < length(vlmm.data_vertex)-1)\r\n@@ -1698,14 +1734,18 @@\n \t\tremoveOutEdges(vlmm,trashNode); \/\/ Remove all outgoing edges\r\n \t\tTVertexDescriptor dummy = getFather(vlmm,trashNode);\r\n \t\tTAlphabet letter = getChildCharacter(vlmm,dummy,trashNode);\r\n-\t\tvlmm.data_vertex[dummy].data_edge[(TSize) letter].data_target = nilVal;\r\n-\t\tsetFather(vlmm,trashNode,nilVal);\r\n+\t\tTEdgeDescriptor ed = &vlmm.data_vertex[dummy].data_edge[(TSize)letter];\r\n+\t\tassignTarget(ed, nilVal);\r\n+\t\treleaseId(vlmm.data_id_managerE, _getId(ed));\r\n+\t\t\/\/vlmm.data_vertex[dummy].data_edge[(TSize) letter].data_target = nilVal;\r\n+\t\tsetFather(vlmm,nilVal,trashNode);\r\n \t\tdummy = getSuffixLink(vlmm,trashNode);\r\n \t\tif(dummy != nilVal){\r\n-\t\tletter = getReverseSuffixLinkCharacter(vlmm,dummy,trashNode);\r\n-\t\tsetReverseSuffixLink(vlmm,dummy,nilVal,letter);\r\n-\t\tsetSuffixLink(vlmm,trashNode,nilVal);\r\n-\t\t}\r\n+\t\t\tletter = getReverseSuffixLinkCharacter(vlmm,dummy,trashNode);\r\n+\t\t\tsetReverseSuffixLink(vlmm,dummy,nilVal,letter);\r\n+\t\t\tsetSuffixLink(vlmm,trashNode,nilVal);\r\n+\t\t}\r\n+\t\tremoveAllReverseSuffixLinks(vlmm,trashNode);\r\n \t\tsetMarked(vlmm,trashNode,false);\r\n \t\tdeleteProbabilityVector(vlmm,trashNode);\r\n \t\t}\r\n@@ -1716,15 +1756,15 @@\n \t\tvlmm.data_vertex[dummy].data_edge[(TSize) letter].data_target = nilVal;\r\n \t\tdummy = getSuffixLink(vlmm,trashNode);\r\n \t\tif(dummy != nilVal){\r\n-\t\tletter = getReverseSuffixLinkCharacter(vlmm,dummy,trashNode);\r\n-\t\tsetReverseSuffixLink(vlmm,dummy,nilVal,letter);\r\n-\t\t}\r\n-\t\/*\tresize(vlmm.data_vertex,Length,Generous());\r\n+\t\t\tletter = getReverseSuffixLinkCharacter(vlmm,dummy,trashNode);\r\n+\t\t\tsetReverseSuffixLink(vlmm,dummy,nilVal,letter);\r\n+\t\t}\r\n+\t\tresize(vlmm.data_vertex,Length,Generous());\r\n \t\tresize(vlmm.data_father,Length,Generous());\r\n \t\tresize(vlmm.data_marked,Length,Generous());\r\n \t\tresize(vlmm.data_suffix_link,Length,Generous());\r\n \t\tresize(vlmm.data_reverse_suffix_link,Length,Generous());\r\n-\t\tresize(vlmm.data_probability_vector,Length,Generous());*\/\r\n+\t\tresize(vlmm.data_probability_vector,Length,Generous());\r\n \t}\r\n \r\n \treleaseId(vlmm.data_id_managerV, trashNode); \/\/ Release id\r\n@@ -1737,8 +1777,9 @@\n \t\t\t TVertexDescriptor &head)\r\n {\r\n \t\/\/ recursive removal of all nodes in the subtree starting at the head node\r\n-typedef Graph<Automaton<TAlphabet,TCargo,WordGraph< VLMM < TVLMMSpec > > > > TVlmm;\r\n+\ttypedef Graph<Automaton<TAlphabet,TCargo,WordGraph< VLMM < TVLMMSpec > > > > TVlmm;\r\n \ttypedef typename Iterator<TVlmm, OutEdgeIterator>::Type TOutEdgeIterator;\r\n+\tSEQAN_ASSERT(idInUse(vlmm.data_id_managerV, head) == true)\r\n \tTOutEdgeIterator itout(vlmm,head);\r\n \tTVertexDescriptor dummy;\r\n \twhile(!atEnd(itout)){\r\n@@ -1754,25 +1795,39 @@\n \tremoveVertex(vlmm,head);\r\n \r\n }\r\n-template<typename TAlphabet,typename TCargo,typename TVLMMSpec >\r\n-inline void\r\n-removeRedundantNodes( Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm)\r\n+\r\n+\/\/ returns 1 if the node will be kept\r\n+\r\n+template<typename TAlphabet,typename TCargo,typename TVLMMSpec, typename TVertexDescriptor >\r\n+inline int\r\n+removeRedundantNodes( Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm,\r\n+\t\t\t\t\t TVertexDescriptor &start)\r\n {\r\n \/\/top down traversal to figure out which nodes can be deleted\r\n-typedef Graph<Automaton<TAlphabet,TCargo,WordGraph< VLMM < TSpec > > > > TVlmm;\r\n+typedef Graph<Automaton<TAlphabet,TCargo,WordGraph< VLMM < TVLMMSpec > > > > TVlmm;\r\n \ttypedef typename Iterator<TVlmm, OutEdgeIterator>::Type TOutEdgeIterator;\r\n-\r\n-\r\n-\tTOutEdgeIterator itout(vlmm,father);\r\n+\tint sum = 0;\r\n+\r\n+\tTOutEdgeIterator itout(vlmm,start);\r\n+\tTVertexDescriptor dummy;\r\n+\tTVertexDescriptor nilVal = getNil<TVertexDescriptor>();\r\n \twhile(!atEnd(itout)){\r\n-\t\tif(targetVertex(vlmm, getValue(itout)) == child)\r\n-\t\t\tbreak;\r\n-\t\/\/ *(TOutEdgeIterator) \r\n-\r\n-\tgoNext(itout);\r\n-\t}\r\n-\treturn(itout.data_pos);\r\n-\r\n+\t\tdummy = targetVertex(vlmm, getValue(itout));\r\n+\t\tif(dummy != nilVal){\r\n+\t\t\tcout << \" remove from node: \"<<dummy<<endl;\r\n+\t\t\tsum += removeRedundantNodes(vlmm,dummy);\r\n+\r\n+\t\t}\r\n+\t\tgoNext(itout);\r\n+\t}\r\n+\tif(!isMarked(vlmm,start) && sum == 0)\r\n+\t{\r\n+\t\tcout <<\"want to delete node: \" <<start;\r\n+\t\tremoveVertex(vlmm,start);\r\n+\t\treturn 0;\r\n+\t}\r\n+\r\n+\treturn 1;\r\n }\r\n \r\n \r\n@@ -1787,9 +1842,12 @@\n \t\t\t\tunsigned d) \r\n {\r\n \ttypedef Index<TIndexType, Index_ESA<> > TIndex;\r\n+\ttypedef Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < ContextTree > > > > TGraph;\r\n+\ttypedef typename VertexDescriptor<TGraph>::Type TVertexDescriptor;\r\n \tContextTree parameters;\r\n \tsetParameters(parameters,threshold,K,d);\r\n \tIter< TIndex, VSTree< TopDown< ParentLinks<ConstrainedTraversal<Absolute> > > > > it(index,threshold,d);\r\n+\tcout << \"create the core Suffix Tree from the suffix array\"<<endl;\r\n \tbuildSuffixTreeFromIndex(it,vlmm);\r\n \r\n \tstd::cout << \"in initMaps:\";\r\n@@ -1801,7 +1859,9 @@\n \tpruneTree(vlmm,parameters);\r\n \tstd::cout << \" Size of vlmm after prune Tree:\"<<numVertices(vlmm)<<std::endl;\r\n \tstd::cout << \"pruned the ContextTree\" <<std::endl;\r\n-\tstd::cout << vlmm;\r\n+\tTVertexDescriptor root = getRoot(vlmm);\r\n+\tremoveRedundantNodes(vlmm,root);\r\n+\tstd::cout <<\" remove redundant nodes: \"<<endl<< vlmm;\r\n \tstd::cout << \"READY!\" <<std::endl;\r\n }\r\n \r\n@@ -1859,7 +1919,7 @@\n \r\n \/**\r\n * Likelihood Estimation : works such that the reverse suffix links are walked starting from the root\r\n-* whenever a node is not marked(or a leaf the walking down is finished and the deepest possible \r\n+* whenever a node is not marked(or a leaf) is reached the walking down is finished and the deepest possible \r\n * context for the estimation is identified\r\n *\/\r\n \r\n@@ -1871,23 +1931,25 @@\n \t\t\t\t\tString<TAlphabet> &text )\r\n {\r\n \tfloat result = 0;\r\n-\tIter<String<TAlphabet>, PositionIterator> it(text);\r\n-\twhile(!atEnd(it))\r\n+\tIterator<String<TAlphabet> >::Type it = begin(text);\r\n+\r\n+\tfor(goBegin(it);!atEnd(it);goNext(it))\r\n \t{\r\n+\t\t\r\n \t\tresult += log(getProbabilityForLongestContext(vlmm,it));\r\n-\t\tgoNext(it);\r\n+\t\t\/\/cout <<\" prob for letter: \"<<value(it)<< \" is: \"<<getProbabilityForLongestContext(vlmm,it)<<endl;\r\n \t}\r\n \treturn result;\r\n }\r\n \r\n-template<typename TAlphabet,typename TCargo,typename TVLMMSpec,typename TSpec>\r\n+template<typename TAlphabet,typename TCargo,typename TVLMMSpec,typename TIter>\r\n inline float\r\n getProbabilityForLongestContext( Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm,\r\n-\t\t\t\t\tIter<String<TAlphabet>,TSpec> &it )\r\n+\t\t\t\t\tTIter &it )\r\n {\r\n \ttypedef Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TVLMMSpec> > > > TGraph;\r\n \ttypedef typename VertexDescriptor<TGraph>::Type TVertexDescriptor;\r\n-\tIter<String<TAlphabet>, TSpec> copy(it);\r\n+\tTIter copy = it;\r\n \tTVertexDescriptor nilVal = getNil<TVertexDescriptor>();\r\n \tTVertexDescriptor node = getRoot(vlmm);\r\n \r\n@@ -1908,6 +1970,37 @@\n \t}\r\n \treturn getProbability(vlmm,node,value(it));\r\n }\r\n+\/* Export plain file format for\r\n+VLMM\\t\tType[ContextTree,PST]\\t\tAlphabet[Dna,Dna5,AminoAcids]\\t\tParams[gamma:threshold:pMin ... etc]\r\n+Node\\t\tFather\\t\tChildren[1 .. N]\\t\tChildLabel[1 .. N]\\t\tSuffixLink\\t\tProbabilityVector[1 .. N]\\t\tReverseSuffixLink[1 .. N]\t\r\n+\r\n+\r\n+\r\n+\r\n+\r\n+\r\n+\r\n+*\/\r\n+\/\/save\/export the vlmm in a file for reading it again using the import funcion\r\n+template<typename TFile, typename TAlphabet, typename TCargo, typename TVLMMSpec , typename TIDString>\r\n+inline void\r\n+exportVLMM(Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm,\r\n+\t TFile & target)\r\n+{\r\n+\tSEQAN_CHECKPOINT\r\n+\ttypedef Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TVLMMSpec> > > > TGraph;\r\n+\ttypedef typename VertexDescriptor<TGraph>::Type TVertexDescriptor;\r\n+\ttypedef typename EdgeDescriptor<TGraph>::Type TEdgeDescriptor;\r\n+\ttypedef typename EdgeType<TGraph>::Type TEdge;\r\n+\ttypedef typename Size<TAlphabet>::Type TSize;\r\n+\tTSize table_length = ValueSize<TAlphabet>::VALUE;\r\n+\tTVertexDescriptor nilVal = getNil<TVertexDescriptor>();\r\n+\ttypedef typename Iterator<String<AutomatonEdgeArray<TEdge, TAlphabet> > const>::Type TIterConst;\r\n+\r\n+\r\n+\r\n+}\r\n+\r\n \/\/write the vlmm to a file in Easy-readable format,also used by the << Operator\r\n template<typename TFile, typename TAlphabet, typename TCargo, typename TSpec , typename TIDString>\r\n inline void\r\n@@ -1949,7 +2042,7 @@\n \t\t_streamPut(target, ')');\r\n \t\tif(g.data_marked[getRoot(g)])\r\n \t\t\tif(! g.data_marked[sourceVertex])\r\n-\t\t\t\t_streamWrite(target, \" deleted\");\r\n+\t\t\t\t_streamWrite(target, \" unmarked\");\r\n \t\t_streamWrite(target, \"\\n\");\r\n \t}\r\n \t\t_streamWrite(target,\"VLMM - Directed:\\n\");\r\n"} {"commit":"0dfce398e5fc71a0d83e53bb1195b10f0cc4336b","subject":"core_self_tests:.c: add ADD_OVERFLOW() test","message":"core_self_tests:.c: add ADD_OVERFLOW() test\n\nAdd a test that fails with GCC 4.9.4 (Linaro GCC 4.9-2017.01) [1] with the\noriginal overflow macros prior to commit 2b30433772af (\"util: fix fallback\nADD_OVERFLOW() macro\").\n\nLink: [1] http:\/\/releases.linaro.org\/components\/toolchain\/binaries\/4.9-2017.01\/arm-linux-gnueabihf\/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabihf.tar.xz\nSigned-off-by: Jerome Forissier <ced78d268b4c9a0a20a59a9feeebd2ad90da03d3@linaro.org>\nReviewed-by: Jens Wiklander <7706914404370d7502c27a0eff493dcf491feb51@linaro.org>\n","repos":"pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- core\/arch\/arm\/pta\/core_self_tests.c\n+++ core\/arch\/arm\/pta\/core_self_tests.c\n@@ -46,6 +46,10 @@\n \tuint32_t r_u32;\n \tint32_t r_s32;\n \n+\tif (ADD_OVERFLOW(8U, 0U, &r_s32))\n+\t\treturn -1;\n+\tif (r_s32 != 8)\n+\t\treturn -1;\n \tif (ADD_OVERFLOW(32U, 30U, &r_u32))\n \t\treturn -1;\n \tif (r_u32 != 62)\n"} {"commit":"f2a46455a1220fa6f82b696e7dd26d11ed376121","subject":"Update OSAL_Queue.c","message":"Update OSAL_Queue.c","repos":"ianhom\/MOE,ianhom\/MOE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OSAL\/OSAL_Queue.c\n+++ OSAL\/OSAL_Queue.c\n@@ -15,9 +15,6 @@\n #include \"OSAL.h\"\n #include \"OSAL_Queue.h\"\n #include \"debug.h\"\n-\n-static uint8 sg_u8No = 0;\n-\n \n \/******************************************************************************\n * Name : uint8 Osal_Queue_Create(uint8 u8Len, uint8 u8Num)\n@@ -47,14 +44,8 @@\n ENTER_CRITICAL_ZONE(u32IntSt); \/* Enter the critical zone to prevent event updating unexpectedly *\/\n \/**************************************************************************************************\/\n ptQueueInfo->pu8Addr = (uint8*)OSAL_MALLOC(u16Size);\n- ptQueueInfo->u8No = sg_u8No++;\n-\n- \/* If the Queue number is bigger than 255 *\/\n- if(0xFF == sg_u8No)\n- {\n- DBG_PRINT(\"Too many queue are created!!\\n\")\n- return NULL;\n- }\n+ ptQueueInfo->u8Begin = 0;\n+ ptQueueInfo->u8End = 0;\n \/**************************************************************************************************\/\n EXIT_CRITICAL_ZONE(u32IntSt); \/* Exit the critical zone *\/ \n \n@@ -62,14 +53,92 @@\n \n }\n \n-void Osal_Queue_Inc(T_QUEUE_INFO *ptQueue)\n+uint8 Osal_Queue_Inc(T_QUEUE_INFO *ptQueue)\n {\n+ uint32 u32IntSt;\n \/* If the pointer of queue info is invalid *\/\n if(NULL == ptQueue)\n {\n- \n+ DBG_PRINT(\"Invalid pointer of queue informtion!!\\n\");\n+ return SW_ERR;\n }\n+\n+ if(SW_ERR == Osal_Queue_Is_Free(ptQueue))\n+ {\n+ return SW_ERR;\n+ }\n+\n+ ENTER_CRITICAL_ZONE(u32IntSt); \/* Enter the critical zone to prevent event updating unexpectedly *\/\n+ \/**************************************************************************************************\/\n+ ptQueue->u8End = (ptQueue->u8End + 1) % ptQueue->u8MaxCnt;\n+ ptQueue->u8Cnt++;\n+ \/**************************************************************************************************\/\n+ EXIT_CRITICAL_ZONE(u32IntSt); \/* Exit the critical zone *\/ \n+\n+ \n }\n+\n+uint8 Osal_Queue_Dec(T_QUEUE_INFO *ptQueue)\n+{\n+ uint32 u32IntSt;\n+ \/* If the pointer of queue info is invalid *\/\n+ if(NULL == ptQueue)\n+ {\n+ DBG_PRINT(\"Invalid pointer of queue informtion!!\\n\");\n+ return SW_ERR;\n+ }\n+\n+ if(SW_OK == Osal_Queue_Is_Empty(ptQueue))\n+ {\n+ return SW_ERR;\n+ }\n+\n+ ENTER_CRITICAL_ZONE(u32IntSt); \/* Enter the critical zone to prevent event updating unexpectedly *\/\n+ \/**************************************************************************************************\/\n+ ptQueue->u8Begin = (ptQueue->u8Begin + 1) % ptQueue->u8MaxCnt;\n+ ptQueue->u8Cnt--;\n+ \/**************************************************************************************************\/\n+ EXIT_CRITICAL_ZONE(u32IntSt); \/* Exit the critical zone *\/ \n+}\n+\n+uint8 Osal_Queue_Is_Free(T_QUEUE_INFO *ptQueue)\n+{\n+ uint32 u32IntSt;\n+ \/* If the pointer of queue info is invalid *\/\n+ if(NULL == ptQueue)\n+ {\n+ DBG_PRINT(\"Invalid pointer of queue informtion!!\\n\");\n+ return SW_ERR;\n+ }\n+\n+ if(ptQueue->u8Cnt >= ptQueue->u8MaxCnt)\n+ {\n+ DBG_PRINT(\"The queue is full!!\\n\");\n+ return SW_ERR;\n+ }\n+ DBG_PRINT(\"The queue is NOT full!!\\n\");\n+ return SW_OK;\n+}\n+\n+uint8 Osal_Queue_Is_Empty(T_QUEUE_INFO *ptQueue)\n+{\n+ uint32 u32IntSt;\n+ \/* If the pointer of queue info is invalid *\/\n+ if(NULL == ptQueue)\n+ {\n+ DBG_PRINT(\"Invalid pointer of queue informtion!!\\n\");\n+ return SW_ERR;\n+ }\n+\n+ if(0 != ptQueue->u8Cnt)\n+ {\n+ DBG_PRINT(\"The queue is NOT empty!!\\n\");\n+ return SW_ERR;\n+ }\n+ DBG_PRINT(\"The queue is empty!!\\n\");\n+ return SW_OK;\n+}\n+\n \n \/******************************************************************************\n * Name : uint8 Osal_Queue_Delete(T_QUEUE_INFO* ptQueueInfo)\n"} {"commit":"ea422dd84be42e6f737903a8c13d474f92ece23e","subject":"Update OSAL_Timer.c","message":"Update OSAL_Timer.c","repos":"ianhom\/MOE,ianhom\/MOE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OSAL\/OSAL_Timer.c\n+++ OSAL\/OSAL_Timer.c\n@@ -10,6 +10,7 @@\n ******************************************************************************\/\r\n \r\n #include \"type_def.h\"\r\n+#define __DEBUG_MODE __DEBUG_NONE\r\n #include \"common_head.h\"\r\n #include \"OSAL.h\"\r\n #include \"OSAL_Timer.h\"\r\n@@ -517,9 +518,20 @@\n if(NULL == ptNode) \/* Check if successful or NOT *\/\r\n {\r\n DBG_PRINT(\"Failed to stop a timer!!\\n\");\r\n+ } \r\n+\r\n+ DBG_PRINT(\"Start a 10-times 1 second timer!!\\n\");\r\n+ ptNode = Osal_Timer_Start(0, 0, 10, 1000); \/* Start a timer *\/\r\n+ if(NULL == ptNode) \/* Check if successful or NOT *\/\r\n+ {\r\n+ DBG_PRINT(\"Failed to start a timer!!\\n\"); \r\n return SW_ERR;\r\n }\r\n-\r\n+ while(NULL != sg_ptTmHead)\r\n+ {\r\n+ Osal_Timer_Process(); \/* Wait for time up *\/\r\n+ }\r\n+ DBG_PRINT(\"General test for timer is finished!\\n\");\r\n \r\n \/**************************************************************************************************\/\r\n EXIT_CRITICAL_ZONE(u32IntSt); \/* Exit the critical zone *\/\r\n"} {"commit":"7e8d0f42b198446a9823e9f59f01c04a5316025c","subject":"better pvsband","message":"better pvsband\n","repos":"Angeldude\/csound,audiokit\/csound,iver56\/csound,Angeldude\/csound,mcanthony\/csound,max-ilse\/csound,iver56\/csound,max-ilse\/csound,iver56\/csound,max-ilse\/csound,max-ilse\/csound,mcanthony\/csound,Angeldude\/csound,Angeldude\/csound,Angeldude\/csound,Angeldude\/csound,max-ilse\/csound,audiokit\/csound,nikhilsinghmus\/csound,max-ilse\/csound,Angeldude\/csound,mcanthony\/csound,audiokit\/csound,audiokit\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,Angeldude\/csound,mcanthony\/csound,mcanthony\/csound,mcanthony\/csound,Angeldude\/csound,iver56\/csound,nikhilsinghmus\/csound,mcanthony\/csound,iver56\/csound,Angeldude\/csound,max-ilse\/csound,audiokit\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,iver56\/csound,mcanthony\/csound,mcanthony\/csound,nikhilsinghmus\/csound,iver56\/csound,iver56\/csound,nikhilsinghmus\/csound,audiokit\/csound,audiokit\/csound,audiokit\/csound,nikhilsinghmus\/csound,audiokit\/csound,max-ilse\/csound,audiokit\/csound,max-ilse\/csound,nikhilsinghmus\/csound,mcanthony\/csound,max-ilse\/csound,iver56\/csound,iver56\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Opcodes\/pvsband.c\n+++ Opcodes\/pvsband.c\n@@ -75,7 +75,7 @@\n \n static int pvsband(CSOUND *csound, PVSBAND *p)\n {\n- int i, N = p->fout->N;\n+ int i, N = p->fin->N;\n MYFLT lowcut = *p->klowcut;\n MYFLT lowbnd = *p->klowbnd;\n MYFLT higbnd = *p->khigbnd;\n@@ -110,20 +110,21 @@\n if (higcut<higbnd) higcut = higbnd;\n }\n for (i = 0; i < NB-1; i++) {\n- if (fout[i].im < lowcut || fout[i].im>higcut) {\n+ MYFLT frq = fin[i].im;\n+ if (frq < lowcut || frq>higcut) {\n fout[i].re = FL(0.0);\n fout[i].im = -FL(1.0);\n }\n- else if (fout[i].im > lowbnd && fout[i].im>higbnd) {\n+ else if (frq > lowbnd && frq<higbnd) {\n fout[i] = fin[i];\n }\n- else if (fout[i].im > lowcut && fout[i].im < lowbnd) {\n- fout[i].re = fin[i].re * (fin[i].im - lowcut)\/(lowbnd - lowcut);\n- fout[i].im = fin[i].im;\n+ else if (frq > lowcut && frq < lowbnd) {\n+ fout[i].re = fin[i].re * (frq - lowcut)\/(lowbnd - lowcut);\n+ fout[i].im = frq;\n }\n else {\n- fout[i].re = fin[i].re * (fin[i].im - higbnd)\/(higcut - higbnd);\n- fout[i].im = fin[i].im;\n+ fout[i].re = fin[i].re * (frq - higbnd)\/(higcut - higbnd);\n+ fout[i].im = frq;\n }\n }\n }\n@@ -131,22 +132,22 @@\n }\n #endif\n if (p->lastframe < p->fin->framecount) {\n-\n for (i = 0; i < N; i += 2) {\n- if (fout[i+1] < lowcut || fout[i+1]>higcut) {\n+ MYFLT frq = fin[i+1];\n+ if (frq < lowcut || frq>higcut) {\n fout[i] = FL(0.0);\n fout[i+1] = -FL(1.0);\n }\n- else if (fout[i+1] > lowbnd && fout[i+1]>higbnd) {\n+ else if (frq > lowbnd && frq<higbnd) {\n fout[i] = fin[i];\n }\n- else if (fout[i+1] > lowcut && fout[i+1] < lowbnd) {\n- fout[i] = fin[i] * (fin[i+1] - lowcut)\/(lowbnd - lowcut);\n- fout[i+1] = fin[i+1];\n+ else if (frq > lowcut && frq < lowbnd) {\n+ fout[i] = fin[i] * (frq - lowcut)\/(lowbnd - lowcut);\n+ fout[i+1] = frq;\n }\n else {\n- fout[i] = fin[i] * (fin[i+1] - higbnd)\/(higcut - higbnd);\n- fout[i+1] = fin[i+1];\n+ fout[i] = fin[i] * (frq - higbnd)\/(higcut - higbnd);\n+ fout[i+1] = frq;\n }\n }\n p->fout->framecount = p->lastframe = p->fin->framecount;\n@@ -157,7 +158,7 @@\n #define S(x) sizeof(x)\n \n static OENTRY localops[] = {\n- {\"pvsband\", S(PVSBAND), 3, \"f\", \"fxx\", (SUBR) pvsbandinit, (SUBR) pvsband }\n+ {\"pvsband\", S(PVSBAND), 3, \"f\", \"fxxxx\", (SUBR) pvsbandinit, (SUBR) pvsband }\n };\n \n int pvsband_init_(CSOUND *csound)\n"} {"commit":"1adff844c76faf39e28241a0204a961501606a95","subject":"Spectral centroid opcode","message":"Spectral centroid opcode\n","repos":"csound\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,csound\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Opcodes\/pvscent.c\n+++ Opcodes\/pvscent.c\n@@ -46,15 +46,14 @@\n long i,N = p->fin->N;\n MYFLT c = FL(0.0);\n MYFLT d = FL(0.0);\n- float j;\n+ MYFLT j, binsize = FL(0.5)*esr\/(MYFLT)N;\n float *fin = (float *) p->fin->frame.auxp;\n if (p->lastframe < p->fin->framecount) {\n- for (i=0,j=FL(1.0); i<N+2; i+=2, j++) {\n+ for (i=0,j=FL(0.5)*binsize; i<N+2; i+=2, j += binsize) {\n c += fin[i]*j; \/* This ignores phase *\/\n d += fin[i];\n }\n *p->ans = (d==FL(0.0) ? FL(0.0) : c\/d);\n- *p->ans = c;\n p->lastframe = p->fin->framecount;\n }\n return OK;\n"} {"commit":"b4927493d81ca40674938b760968af1c754f6874","subject":"and this permutation","message":"and this permutation\n","repos":"harnesscloud\/remyroy-pyopenssl-shutdown-fix,harnesscloud\/remyroy-pyopenssl-shutdown-fix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OpenSSL\/ssl\/ssl.c\n+++ OpenSSL\/ssl\/ssl.c\n@@ -81,7 +81,7 @@\n PyOpenSSL_MODRETURN(NULL);\n }\n \n- new_x509 = (crypto_X509Obj* (*)(X509*, int))GetProcAddress(crypto, \"_crypto_X509_New\");\n+ new_x509 = (crypto_X509Obj* (*)(X509*, int))GetProcAddress(crypto, \"crypto_X509_New\");\n new_x509name = (crypto_X509NameObj* (*)(X509_NAME*, int))GetProcAddress(crypto, \"_crypto_X509Name_New\");\n new_x509store = (crypto_X509StoreObj* (*)(X509_STORE*, int))GetProcAddress(crypto, \"_crypto_X509Store_New\");\n # else\n"} {"commit":"534bf31af28b77b7197b3d0a1f0b75efb7522284","subject":"don't call strncpy(str, NULL, 0)","message":"don't call strncpy(str, NULL, 0)\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Parser\/parsetok.c\n+++ Parser\/parsetok.c\n@@ -1,5 +1,5 @@\n \/***********************************************************\n-Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,\n+Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,\n Amsterdam, The Netherlands.\n \n All Rights Reserved\n@@ -34,56 +34,59 @@\n \n \n \/* Forward *\/\n-static int parsetok PROTO((struct tok_state *, grammar *, int, node **));\n-\n+static node *parsetok PROTO((struct tok_state *, grammar *, int,\n+\t\t\t perrdetail *));\n \n \/* Parse input coming from a string. Return error code, print some errors. *\/\n \n-int\n-parsestring(s, g, start, n_ret)\n+node *\n+parsestring(s, g, start, err_ret)\n \tchar *s;\n \tgrammar *g;\n \tint start;\n-\tnode **n_ret;\n+\tperrdetail *err_ret;\n {\n-\tstruct tok_state *tok = tok_setups(s);\n-\tint ret;\n-\t\n-\tif (tok == NULL) {\n-\t\tfprintf(stderr, \"no mem for tok_setups\\n\");\n-\t\treturn E_NOMEM;\n+\tstruct tok_state *tok;\n+\n+\terr_ret->error = E_OK;\n+\terr_ret->filename = NULL;\n+\terr_ret->lineno = 0;\n+\terr_ret->offset = 0;\n+\terr_ret->text = NULL;\n+\n+\tif ((tok = tok_setups(s)) == NULL) {\n+\t\terr_ret->error = E_NOMEM;\n+\t\treturn NULL;\n \t}\n-\tret = parsetok(tok, g, start, n_ret);\n-\/*\n-XXX Need a more sophisticated way to report the line number.\n-\tif (ret == E_TOKEN || ret == E_SYNTAX) {\n-\t\tfprintf(stderr, \"String parsing error at line %d\\n\",\n-\t\t\ttok->lineno);\n-\t}\n-*\/\n-\ttok_free(tok);\n-\treturn ret;\n+\n+\treturn parsetok(tok, g, start, err_ret);\n }\n \n \n \/* Parse input coming from a file. Return error code, print some errors. *\/\n \n-int\n-parsefile(fp, filename, g, start, ps1, ps2, n_ret)\n+node *\n+parsefile(fp, filename, g, start, ps1, ps2, err_ret)\n \tFILE *fp;\n \tchar *filename;\n \tgrammar *g;\n \tint start;\n \tchar *ps1, *ps2;\n-\tnode **n_ret;\n+\tperrdetail *err_ret;\n {\n-\tstruct tok_state *tok = tok_setupf(fp, ps1, ps2);\n-\tint ret;\n-\t\n-\tif (tok == NULL) {\n-\t\tfprintf(stderr, \"no mem for tok_setupf\\n\");\n-\t\treturn E_NOMEM;\n+\tstruct tok_state *tok;\n+\n+\terr_ret->error = E_OK;\n+\terr_ret->filename = filename;\n+\terr_ret->lineno = 0;\n+\terr_ret->offset = 0;\n+\terr_ret->text = NULL;\n+\n+\tif ((tok = tok_setupf(fp, ps1, ps2)) == NULL) {\n+\t\terr_ret->error = E_NOMEM;\n+\t\treturn NULL;\n \t}\n+\n #ifdef macintosh\n \t{\n \t\tint tabsize = guesstabsize(filename);\n@@ -91,60 +94,39 @@\n \t\t\ttok->tabsize = tabsize;\n \t}\n #endif\n-\tret = parsetok(tok, g, start, n_ret);\n-\tif (ret == E_TOKEN || ret == E_SYNTAX) {\n-\t\tchar *p;\n-\t\tfprintf(stderr, \"Parsing error: file %s, line %d:\\n\",\n-\t\t\t\t\t\tfilename, tok->lineno);\n-\t\tif (tok->buf == NULL)\n-\t\t\tfprintf(stderr, \"(EOF)\\n\");\n-\t\telse {\n-\t\t\t*tok->inp = '\\0';\n-\t\t\tif (tok->inp > tok->buf && tok->inp[-1] == '\\n')\n-\t\t\t\ttok->inp[-1] = '\\0';\n-\t\t\tfprintf(stderr, \"%s\\n\", tok->buf);\n-\t\t\tfor (p = tok->buf; p < tok->cur; p++) {\n-\t\t\t\tif (*p == '\\t')\n-\t\t\t\t\tputc('\\t', stderr);\n-\t\t\t\telse\n-\t\t\t\t\tputc(' ', stderr);\n-\t\t\t}\n-\t\t\tfprintf(stderr, \"^\\n\");\n-\t\t}\n-\t}\n-\ttok_free(tok);\n-\treturn ret;\n+\n+\treturn parsetok(tok, g, start, err_ret);\n }\n-\n \n \/* Parse input coming from the given tokenizer structure.\n Return error code. *\/\n \n-static int\n-parsetok(tok, g, start, n_ret)\n+static node *\n+parsetok(tok, g, start, err_ret)\n \tstruct tok_state *tok;\n \tgrammar *g;\n \tint start;\n-\tnode **n_ret;\n+\tperrdetail *err_ret;\n {\n \tparser_state *ps;\n-\tint ret;\n+\tnode *n;\n \tint started = 0;\n-\t\n+\n \tif ((ps = newparser(g, start)) == NULL) {\n \t\tfprintf(stderr, \"no mem for new parser\\n\");\n-\t\treturn E_NOMEM;\n+\t\terr_ret->error = E_NOMEM;\n+\t\treturn NULL;\n \t}\n-\t\n+\n \tfor (;;) {\n \t\tchar *a, *b;\n \t\tint type;\n \t\tint len;\n \t\tchar *str;\n-\t\t\n+\n \t\ttype = tok_get(tok, &a, &b);\n \t\tif (type == ERRORTOKEN) {\n-\t\t\tret = tok->done;\n+\t\t\terr_ret->error = tok->done;\n \t\t\tbreak;\n \t\t}\n \t\tif (type == ENDMARKER && started) {\n@@ -153,30 +135,46 @@\n \t\t}\n \t\telse\n \t\t\tstarted = 1;\n-\t\tlen = b - a;\n+\t\tlen = b - a; \/* XXX this may compute NULL - NULL *\/\n \t\tstr = NEW(char, len + 1);\n \t\tif (str == NULL) {\n \t\t\tfprintf(stderr, \"no mem for next token\\n\");\n-\t\t\tret = E_NOMEM;\n+\t\t\terr_ret->error = E_NOMEM;\n \t\t\tbreak;\n \t\t}\n-\t\tstrncpy(str, a, len);\n+\t\tif (len > 0)\n+\t\t\tstrncpy(str, a, len);\n \t\tstr[len] = '\\0';\n-\t\tret = addtoken(ps, (int)type, str, tok->lineno);\n-\t\tif (ret != E_OK) {\n-\t\t\tif (ret == E_DONE) {\n-\t\t\t\t*n_ret = ps->p_tree;\n-\t\t\t\tps->p_tree = NULL;\n+\t\tif ((err_ret->error =\n+\t\t addtoken(ps, (int)type, str, tok->lineno)) != E_OK)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (err_ret->error == E_DONE) {\n+\t\tn = ps->p_tree;\n+\t\tps->p_tree = NULL;\n+\t}\n+\telse\n+\t\tn = NULL;\n+\n+\tdelparser(ps);\n+\n+\tif (n == NULL) {\n+\t\tif (tok->lineno <= 1 && tok->done == E_EOF)\n+\t\t\terr_ret->error = E_EOF;\n+\t\terr_ret->lineno = tok->lineno;\n+\t\terr_ret->offset = tok->cur - tok->buf;\n+\t\tif (tok->buf != NULL) {\n+\t\t\tint len = tok->inp - tok->buf;\n+\t\t\terr_ret->text = malloc(len + 1);\n+\t\t\tif (err_ret->text != NULL) {\n+\t\t\t\tstrncpy(err_ret->text, tok->buf, len+1);\n+\t\t\t\terr_ret->text[len] = '\\0';\n \t\t\t}\n-\t\t\telse {\n-\t\t\t\t*n_ret = NULL;\n-\t\t\t\tif (tok->lineno <= 1 && tok->done == E_EOF)\n-\t\t\t\t\tret = E_EOF;\n-\t\t\t}\n-\t\t\tbreak;\n \t\t}\n \t}\n-\t\n-\tdelparser(ps);\n-\treturn ret;\n+\n+\ttok_free(tok);\n+\n+\treturn n;\n }\n"} {"commit":"3e3e91c70b5a4dc11767015bd6c8bcf199667d13","subject":"\u5220\u9664\u65e7\u54c8\u5e0c\u5b9a\u4e49","message":"\u5220\u9664\u65e7\u54c8\u5e0c\u5b9a\u4e49\n","repos":"Muz1379\/Data-structure","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- QQ\u7fa4\u91cd\u590d\u6210\u5458\u67e5\u627e\/QQGroupsRMS\/ListNode.h\n+++ QQ\u7fa4\u91cd\u590d\u6210\u5458\u67e5\u627e\/QQGroupsRMS\/ListNode.h\n@@ -1,8 +0,0 @@\n-#pragma once\n-#pragma execution_character_set(\"utf-8\")\n-\/\/\u037b\u06b5\n-typedef struct LISTNODE\n-{\n-\tstruct MEMBERNODE * member;\n-\tstruct LIST * next;\n-}LNODE;"} {"commit":"c41a030102eba6eb3786138cc2f421b732280dbf","subject":"input_render_f","message":"input_render_f\n","repos":"objective-audio\/audio_engine,objective-audio\/YASAudio,objective-audio\/audio_engine,objective-audio\/audio_engine,objective-audio\/YASAudio","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- audio\/audio_engine\/rendering\/yas_audio_rendering_types.h\n+++ audio\/audio_engine\/rendering\/yas_audio_rendering_types.h\n@@ -23,4 +23,12 @@\n };\n \n using node_render_f = std::function<void(node_render_args const &)>;\n+\n+struct node_input_render_args {\n+ audio::pcm_buffer const *const buffer;\n+ uint32_t const bus_idx;\n+ audio::time const &time;\n+};\n+\n+using node_input_render_f = std::function<void(node_input_render_args const &)>;\n } \/\/ namespace yas::audio\n"} {"commit":"d1fc2c755fd7b5b8fc251e2239530572a98371fd","subject":"Add the 'DenseIterator' class template","message":"Add the 'DenseIterator' class template\n","repos":"amaniak\/blaze-lib,byzhang\/blaze-lib,davidebaltieri31\/blaze-lib,wsavoie\/blaze-lib,Manu343726\/blaze-lib,ironm73\/blaze-lib,davidebaltieri31\/blaze-lib,nyotis\/blaze-lib,wsavoie\/blaze-lib,lsalamon\/blaze-lib,honnibal\/blaze-lib,ColinGilbert\/blaze-lib,wdv4758h\/blaze-lib,dylanede\/blaze-lib,dorofiykolya\/blaze-lib,byzhang\/blaze,dorofiykolya\/blaze-lib,amaniak\/blaze-lib,gnzlbg\/blaze-lib,benjamingr\/blaze-lib,wsavoie\/blaze-lib,benjamingr\/blaze-lib,ironm73\/blaze-lib,davidebaltieri31\/blaze-lib,byzhang\/blaze-lib,honnibal\/blaze-lib,ColinGilbert\/blaze-lib,gnzlbg\/blaze-lib,lsalamon\/blaze-lib,byzhang\/blaze,wdv4758h\/blaze-lib,lsalamon\/blaze-lib,dorofiykolya\/blaze-lib,wdv4758h\/blaze-lib,ceramos\/blaze-lib,honnibal\/blaze-lib,gnzlbg\/blaze-lib,ceramos\/blaze-lib,dylanede\/blaze-lib,ceramos\/blaze-lib,ironm73\/blaze-lib,yzxyzh\/blaze-lib,nyotis\/blaze-lib,ColinGilbert\/blaze-lib,byzhang\/blaze-lib,dylanede\/blaze-lib,amaniak\/blaze-lib,yzxyzh\/blaze-lib,nyotis\/blaze-lib,yzxyzh\/blaze-lib,Manu343726\/blaze-lib,Manu343726\/blaze-lib,byzhang\/blaze,benjamingr\/blaze-lib","returncode":1,"stderr":"error: pathspec 'blaze\/math\/dense\/DenseIterator.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/dense\/DenseIterator.h\n+++ blaze\/math\/dense\/DenseIterator.h\n@@ -0,0 +1,610 @@\n+\/\/=================================================================================================\n+\/*!\n+\/\/ \\file blaze\/math\/dense\/DenseIterator.h\n+\/\/ \\brief Header file for the DenseIterator class template\n+\/\/\n+\/\/ Copyright (C) 2013 Klaus Iglberger - All Rights Reserved\n+\/\/\n+\/\/ This file is part of the Blaze library. You can redistribute it and\/or modify it under\n+\/\/\n+\/\/ * The names of its contributors may not be used to endorse or promote products derived\n+\/\/ from this software without specific prior written permission.\n+\/\/\n+\/\/ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND ANY\n+\/\/ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n+\/\/ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT\n+\/\/ SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n+\/\/ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED\n+\/\/ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n+\/\/ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n+\/\/ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n+\/\/ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH\n+\/\/ DAMAGE.\n+*\/\n+\/\/=================================================================================================\n+\n+#ifndef _BLAZE_MATH_DENSE_DENSEITERATOR_H_\n+#define _BLAZE_MATH_DENSE_DENSEITERATOR_H_\n+\n+\n+\/\/*************************************************************************************************\n+\/\/ Includes\n+\/\/*************************************************************************************************\n+\n+#include <iterator>\n+#include <blaze\/math\/Intrinsics.h>\n+#include <blaze\/util\/AlignmentCheck.h>\n+#include <blaze\/util\/Assert.h>\n+#include <blaze\/util\/Null.h>\n+#include <blaze\/util\/Types.h>\n+\n+\n+namespace blaze {\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ CLASS DEFINITION\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Implementation of a generic iterator for dense vectors and matrices.\n+\/\/ \\ingroup math\n+\/\/\n+\/\/ The DenseIterator represents a generic random-access iterator that can be used for dense\n+\/\/ vectors and specific rows\/columns of dense matrices.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+class DenseIterator\n+{\n+ public:\n+ \/\/**Type definitions****************************************************************************\n+ typedef std::random_access_iterator_tag IteratorCategory; \/\/!< The iterator category.\n+ typedef Type ValueType; \/\/!< Type of the underlying elements.\n+ typedef Type* PointerType; \/\/!< Pointer return type.\n+ typedef Type& ReferenceType; \/\/!< Reference return type.\n+ typedef ptrdiff_t DifferenceType; \/\/!< Difference between two iterators.\n+\n+ \/\/ STL iterator requirements\n+ typedef IteratorCategory iterator_category; \/\/!< The iterator category.\n+ typedef ValueType value_type; \/\/!< Type of the underlying elements.\n+ typedef PointerType pointer; \/\/!< Pointer return type.\n+ typedef ReferenceType reference; \/\/!< Reference return type.\n+ typedef DifferenceType difference_type; \/\/!< Difference between two iterators.\n+\n+ \/\/! Intrinsic type of the elements.\n+ typedef typename IntrinsicTrait<Type>::Type IntrinsicType;\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Constructors********************************************************************************\n+ \/*!\\name Constructors *\/\n+ \/\/@{\n+ explicit inline DenseIterator();\n+ explicit inline DenseIterator( Type* ptr );\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Destructor**********************************************************************************\n+ \/\/ No explicitly declared destructor.\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Assignment operators************************************************************************\n+ \/*!\\name Assignment operators *\/\n+ \/\/@{\n+ \/\/ No explicitly declared copy assignment operator.\n+ inline DenseIterator& operator+=( ptrdiff_t inc );\n+ inline DenseIterator& operator-=( ptrdiff_t inc );\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Increment\/decrement operators***************************************************************\n+ \/*!\\name Increment\/decrement operators *\/\n+ \/\/@{\n+ inline DenseIterator& operator++();\n+ inline const DenseIterator operator++( int );\n+ inline DenseIterator& operator--();\n+ inline const DenseIterator operator--( int );\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Access operators****************************************************************************\n+ \/*!\\name Access operators *\/\n+ \/\/@{\n+ inline ReferenceType operator[]( size_t index ) const;\n+ inline ReferenceType operator* () const;\n+ inline PointerType operator->() const;\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Utility functions***************************************************************************\n+ \/*!\\name Utility functions *\/\n+ \/\/@{\n+ inline PointerType base() const;\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ \/\/**Expression template evaluation functions****************************************************\n+ \/*!\\name Expression template evaluation functions *\/\n+ \/\/@{\n+ inline const IntrinsicType load () const;\n+ inline const IntrinsicType loadu() const;\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+\n+ private:\n+ \/\/**Member variables****************************************************************************\n+ \/*!\\name Member variables *\/\n+ \/\/@{\n+ PointerType ptr_; \/\/!< Pointer to the current element.\n+ \/\/@}\n+ \/\/**********************************************************************************************\n+};\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ CONSTRUCTORS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Default constructor for the DenseIterator class.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>::DenseIterator()\n+ : ptr_( NULL ) \/\/ Pointer to the current element.\n+{}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Constructor for the DenseIterator class.\n+\/\/\n+\/\/ \\param ptr Pointer to the initial element.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>::DenseIterator( Type* ptr )\n+ : ptr_( ptr ) \/\/ Pointer to the current element.\n+{}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ ASSIGNMENT OPERATORS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Addition assignment operator.\n+\/\/\n+\/\/ \\param inc The increment of the iterator.\n+\/\/ \\return Reference to the incremented iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>& DenseIterator<Type>::operator+=( ptrdiff_t inc )\n+{\n+ ptr_ += inc;\n+ return *this;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Subtraction assignment operator.\n+\/\/\n+\/\/ \\param dec The decrement of the iterator.\n+\/\/ \\return Reference to the decremented iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>& DenseIterator<Type>::operator-=( ptrdiff_t dec )\n+{\n+ ptr_ -= dec;\n+ return *this;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ INCREMENT\/DECREMENT OPERATORS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Pre-increment operator.\n+\/\/\n+\/\/ \\return Reference to the incremented iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>& DenseIterator<Type>::operator++()\n+{\n+ ++ptr_;\n+ return *this;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Post-increment operator.\n+\/\/\n+\/\/ \\return The previous position of the iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline const DenseIterator<Type> DenseIterator<Type>::operator++( int )\n+{\n+ return DenseIterator( ptr_++ );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Pre-decrement operator.\n+\/\/\n+\/\/ \\return Reference to the decremented iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline DenseIterator<Type>& DenseIterator<Type>::operator--()\n+{\n+ --ptr_;\n+ return *this;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Post-decrement operator.\n+\/\/\n+\/\/ \\return The previous position of the iterator.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline const DenseIterator<Type> DenseIterator<Type>::operator--( int )\n+{\n+ return DenseIterator( ptr_-- );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ OPERATORS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Direct access to the underlying elements.\n+\/\/\n+\/\/ \\param index Access index.\n+\/\/ \\return Reference to the accessed value.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline typename DenseIterator<Type>::ReferenceType\n+ DenseIterator<Type>::operator[]( size_t index ) const\n+{\n+ return ptr_[index];\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Direct access to the element at the current iterator position.\n+\/\/\n+\/\/ \\return Reference to the current element.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline typename DenseIterator<Type>::ReferenceType\n+ DenseIterator<Type>::operator*() const\n+{\n+ return *ptr_;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Direct access to the element at the current iterator position.\n+\/\/\n+\/\/ \\return Pointer to the element at the current iterator position.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline typename DenseIterator<Type>::PointerType\n+ DenseIterator<Type>::operator->() const\n+{\n+ return ptr_;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ UTILITY FUNCTIONS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Low-level access to the underlying member of the iterator.\n+\/\/\n+\/\/ \\return Pointer to the current memory location.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline typename DenseIterator<Type>::PointerType DenseIterator<Type>::base() const\n+{\n+ return ptr_;\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ EXPRESSION TEMPLATE EVALUATION FUNCTIONS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Aligned load of the intrinsic element at the current iterator position.\n+\/\/\n+\/\/ \\return The loaded intrinsic element.\n+\/\/\n+\/\/ This function performs an aligned load of the intrinsic element of the current element.\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline const typename DenseIterator<Type>::IntrinsicType DenseIterator<Type>::load() const\n+{\n+ BLAZE_INTERNAL_ASSERT( checkAlignment( ptr_ ), \"Invalid alignment detected\" );\n+ return blaze::load( ptr_ );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Unaligned load of the intrinsic element at the current iterator position.\n+\/\/\n+\/\/ \\return The loaded intrinsic element.\n+\/\/\n+\/\/ This function performs an unaligned load of the intrinsic element of the current element.\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors.\n+*\/\n+template< typename Type > \/\/ Type of the elements\n+inline const typename DenseIterator<Type>::IntrinsicType DenseIterator<Type>::loadu() const\n+{\n+ return blaze::loadu( ptr_ );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n+\/\/ GLOBAL OPERATORS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*!\\name DenseIterator operators *\/\n+\/\/@{\n+template< typename T1, typename T2 >\n+inline bool operator==( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename T1, typename T2 >\n+inline bool operator!=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename T1, typename T2 >\n+inline bool operator<( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename T1, typename T2 >\n+inline bool operator>( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename T1, typename T2 >\n+inline bool operator<=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename T1, typename T2 >\n+inline bool operator>=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs );\n+\n+template< typename Type >\n+inline const DenseIterator<Type> operator+( const DenseIterator<Type>& it, ptrdiff_t inc );\n+\n+template< typename Type >\n+inline const DenseIterator<Type> operator+( ptrdiff_t inc, const DenseIterator<Type>& it );\n+\n+template< typename Type >\n+inline const DenseIterator<Type> operator-( const DenseIterator<Type>& it, ptrdiff_t inc );\n+\n+template< typename Type >\n+inline const DenseIterator<Type> operator-( ptrdiff_t inc, const DenseIterator<Type>& it );\n+\n+template< typename Type >\n+inline ptrdiff_t operator-( const DenseIterator<Type>& lhs, const DenseIterator<Type>& rhs );\n+\/\/@}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Equality comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the iterators refer to the same element, \\a false if not.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator==( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() == rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Inequality comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the iterators don't refer to the same element, \\a false if they do.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator!=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() != rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Less-than comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the left-hand side iterator is smaller, \\a false if not.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator<( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() < rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Greater-than comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the left-hand side iterator is greater, \\a false if not.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator>( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() > rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Less-or-equal-than comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the left-hand side iterator is less or equal, \\a false if not.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator<=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() <= rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Greater-or-equal-than comparison between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return \\a true if the left-hand side iterator is greater or equal, \\a false if not.\n+*\/\n+template< typename T1 \/\/ Element type of the left-hand side iterator\n+ , typename T2 > \/\/ Element type of the right-hand side iterator\n+inline bool operator>=( const DenseIterator<T1>& lhs, const DenseIterator<T2>& rhs )\n+{\n+ return lhs.base() >= rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Addition between a DenseIterator and an integral value.\n+\/\/\n+\/\/ \\param it The iterator to be incremented.\n+\/\/ \\param inc The number of elements the iterator is incremented.\n+\/\/ \\return The incremented iterator.\n+*\/\n+template< typename Type > \/\/ Element type of the iterator\n+inline const DenseIterator<Type> operator+( const DenseIterator<Type>& it, ptrdiff_t inc ) {\n+ return DenseIterator<Type>( it.base() + inc );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Addition between an integral value and a DenseIterator.\n+\/\/\n+\/\/ \\param inc The number of elements the iterator is incremented.\n+\/\/ \\param it The iterator to be incremented.\n+\/\/ \\return The incremented iterator.\n+*\/\n+template< typename Type > \/\/ Element type of the iterator\n+inline const DenseIterator<Type> operator+( ptrdiff_t inc, const DenseIterator<Type>& it )\n+{\n+ return DenseIterator<Type>( it.base() + inc );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Subtraction between a DenseIterator and an integral value.\n+\/\/\n+\/\/ \\param it The iterator to be decremented.\n+\/\/ \\param inc The number of elements the iterator is decremented.\n+\/\/ \\return The decremented iterator.\n+*\/\n+template< typename Type > \/\/ Element type of the iterator\n+inline const DenseIterator<Type> operator-( const DenseIterator<Type>& it, ptrdiff_t dec )\n+{\n+ return DenseIterator<Type>( it.base() - dec );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Subtraction between an integral value and a DenseIterator.\n+\/\/\n+\/\/ \\param inc The number of elements the iterator is decremented.\n+\/\/ \\param it The iterator to be decremented.\n+\/\/ \\return The decremented iterator.\n+*\/\n+template< typename Type > \/\/ Element type of the iterator\n+inline const DenseIterator<Type> operator-( ptrdiff_t dec, const DenseIterator<Type>& it )\n+{\n+ return DenseIterator<Type>( it.base() - dec );\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Calculating the number of elements between two DenseIterator objects.\n+\/\/\n+\/\/ \\param lhs The left-hand side iterator.\n+\/\/ \\param rhs The right-hand side iterator.\n+\/\/ \\return The number of elements between the two iterators.\n+*\/\n+template< typename Type > \/\/ Element type of the iterator\n+inline ptrdiff_t operator-( const DenseIterator<Type>& lhs, DenseIterator<Type>& rhs )\n+{\n+ return lhs.base() - rhs.base();\n+}\n+\/\/*************************************************************************************************\n+\n+} \/\/ namespace blaze\n+\n+#endif\n"} {"commit":"54ecf904b924e757feb091492000553aa1fa9150","subject":"servo_v4p1: add \"cc dtsoff\" and \"cc dtson\" commands","message":"servo_v4p1: add \"cc dtsoff\" and \"cc dtson\" commands\n\nBRANCH=none\nBUG=none\nTEST=Built servo_v4p1 firmware with this change and\nflashed it to a Servo v4.1 with Type-C CCD DUT cable.\n\nRepeated the following steps with and without a DUT charge plugged into\nServo v4.1:\n\n1) Power on the Servo v4.1 while connected to a known-good CCD capable DUT.\nVerify presence of CR50 CCD USB device on servo host machine.\n\n2) Run \"cc\" to log its output.\n\n3) Run \"cc dtsoff\" and compare the output.\nOnly change is \"dts mode: on\" changing to \"dts mode: off\" .\nVerify absence of CR50 CCD USB device on servo host machine.\n\n4) Run \"cc dtson\" and compare the output.\nOnly change is going back to \"dts mode: on\" .\nVerify presence of CR50 CCD USB device on servo host machine.\n\nSigned-off-by: Matthew Blecker <d18f4466f2802f9c78c5c14a42b8c21fdbfabfcd@chromium.org>\nChange-Id: I39b9e62d0e6c74e1264b698d9c04008042d36eac\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3889000\nReviewed-by: Wai-Hong Tam <04b587fdf5845741a0c5a8b9cd59ca72d73ef8fc@google.com>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- board\/servo_v4p1\/usb_pd_policy.c\n+++ board\/servo_v4p1\/usb_pd_policy.c\n@@ -63,6 +63,8 @@\n #define CONF_DRPDTS(c) \\\n \tCONF_SET_CLEAR(c, CC_ALLOW_SRC | CC_ENABLE_DRP, \\\n \t\t CC_DISABLE_DTS | CC_SNK_WITH_PD)\n+#define CONF_DTSOFF(c) CONF_SET_CLEAR(c, CC_DISABLE_DTS, 0)\n+#define CONF_DTSON(c) CONF_SET_CLEAR(c, 0, CC_DISABLE_DTS)\n \n \/* Macros to apply Rd\/Rp to CC lines *\/\n #define DUT_ACTIVE_CC_SET(r, flags) \\\n@@ -1216,6 +1218,10 @@\n \t\t\tcc_config_new = CONF_PDSNKDTS(cc_config_new);\n \t\telse if (!strcasecmp(argv[1], \"drpdts\"))\n \t\t\tcc_config_new = CONF_DRPDTS(cc_config_new);\n+\t\telse if (!strcasecmp(argv[1], \"dtsoff\"))\n+\t\t\tcc_config_new = CONF_DTSOFF(cc_config_new);\n+\t\telse if (!strcasecmp(argv[1], \"dtson\"))\n+\t\t\tcc_config_new = CONF_DTSON(cc_config_new);\n \t\telse if (!strcasecmp(argv[1], \"emca\"))\n \t\t\tcc_config_new |= CC_EMCA_SERVO;\n \t\telse if (!strcasecmp(argv[1], \"nonemca\"))\n@@ -1238,7 +1244,7 @@\n }\n DECLARE_CONSOLE_COMMAND(cc, command_cc,\n \t\t\t\"[off|on|src|snk|pdsnk|drp|srcdts|snkdts|pdsnkdts|\"\n-\t\t\t\"drpdts|emca|nonemca] [cc1|cc2]\",\n+\t\t\t\"drpdts|dtsoff|dtson|emca|nonemca] [cc1|cc2]\",\n \t\t\t\"Servo_v4 DTS and CHG mode\");\n \n static void fake_disconnect_end(void)\n"} {"commit":"7d2286e3ec0f370e6735259c3a3f73d0c74adac6","subject":"boards: iot-lab_M3: remove obsolete hwtimer defines","message":"boards: iot-lab_M3: remove obsolete hwtimer defines\n","repos":"miri64\/RIOT,kb2ma\/RIOT,d00616\/RIOT,immesys\/RiSyn,RBartz\/RIOT,FrancescoErmini\/RIOT,kaleb-himes\/RIOT,ks156\/RIOT,smlng\/RIOT,herrfz\/RIOT,shady33\/RIOT,shady33\/RIOT,abkam07\/RIOT,basilfx\/RIOT,BytesGalore\/RIOT,MohmadAyman\/RIOT,jfischer-phytec-iot\/RIOT,OlegHahm\/RIOT,cladmi\/RIOT,FrancescoErmini\/RIOT,kerneltask\/RIOT,TobiasFredersdorf\/RIOT,dkm\/RIOT,LudwigKnuepfer\/RIOT,daniel-k\/RIOT,MonsterCode8000\/RIOT,altairpearl\/RIOT,jbeyerstedt\/RIOT-OTA-update,katezilla\/RIOT,jfischer-phytec-iot\/RIOT,gautric\/RIOT,wentaoshang\/RIOT,avmelnikoff\/RIOT,stevenj\/RIOT,cladmi\/RIOT,binarylemon\/RIOT,MohmadAyman\/RIOT,mfrey\/RIOT,daniel-k\/RIOT,stevenj\/RIOT,Hyungsin\/RIOT-OS,zhuoshuguo\/RIOT,Hyungsin\/RIOT-OS,yogo1212\/RIOT,jasonatran\/RIOT,binarylemon\/RIOT,mtausig\/RIOT,LudwigOrtmann\/RIOT,alignan\/RIOT,immesys\/RiSyn,mtausig\/RIOT,RBartz\/RIOT,backenklee\/RIOT,smlng\/RIOT,gbarnett\/RIOT,LudwigOrtmann\/RIOT,Hyungsin\/RIOT-OS,d00616\/RIOT,jremmert-phytec-iot\/RIOT,miri64\/RIOT,MonsterCode8000\/RIOT,aeneby\/RIOT,rfuentess\/RIOT,RubikonAlpha\/RIOT,TobiasFredersdorf\/RIOT,abp719\/RIOT,latsku\/RIOT,adjih\/RIOT,rousselk\/RIOT,lazytech-org\/RIOT,avmelnikoff\/RIOT,latsku\/RIOT,immesys\/RiSyn,hamilton-mote\/RIOT-OS,gebart\/RIOT,Josar\/RIOT,Ell-i\/RIOT,msolters\/RIOT,asanka-code\/RIOT,dkm\/RIOT,plushvoxel\/RIOT,basilfx\/RIOT,MohmadAyman\/RIOT,RubikonAlpha\/RIOT,d00616\/RIOT,neiljay\/RIOT,jbeyerstedt\/RIOT-OTA-update,kerneltask\/RIOT,LudwigOrtmann\/RIOT,stevenj\/RIOT,mfrey\/RIOT,ant9000\/RIOT,shady33\/RIOT,miri64\/RIOT,neumodisch\/RIOT,gautric\/RIOT,attdona\/RIOT,JensErdmann\/RIOT,wentaoshang\/RIOT,dailab\/RIOT,RBartz\/RIOT,alignan\/RIOT,lazytech-org\/RIOT,basilfx\/RIOT,malosek\/RIOT,Yonezawa-T2\/RIOT,RubikonAlpha\/RIOT,stevenj\/RIOT,authmillenon\/RIOT,abp719\/RIOT,adjih\/RIOT,Josar\/RIOT,lebrush\/RIOT,jfischer-phytec-iot\/RIOT,watr-li\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,kaleb-himes\/RIOT,RIOT-OS\/RIOT,watr-li\/RIOT,FrancescoErmini\/RIOT,attdona\/RIOT,authmillenon\/RIOT,asanka-code\/RIOT,Yonezawa-T2\/RIOT,katezilla\/RIOT,wentaoshang\/RIOT,msolters\/RIOT,arvindpdmn\/RIOT,RubikonAlpha\/RIOT,adrianghc\/RIOT,watr-li\/RIOT,syin2\/RIOT,roberthartung\/RIOT,ks156\/RIOT,neumodisch\/RIOT,rakendrathapa\/RIOT,brettswann\/RIOT,adjih\/RIOT,BytesGalore\/RIOT,ks156\/RIOT,syin2\/RIOT,neiljay\/RIOT,ks156\/RIOT,arvindpdmn\/RIOT,thiagohd\/RIOT,haoyangyu\/RIOT,khhhh\/RIOT,l3nko\/RIOT,khhhh\/RIOT,aeneby\/RIOT,herrfz\/RIOT,dailab\/RIOT,mziegert\/RIOT,msolters\/RIOT,josephnoir\/RIOT,abkam07\/RIOT,dailab\/RIOT,yogo1212\/RIOT,aeneby\/RIOT,thiagohd\/RIOT,latsku\/RIOT,jasonatran\/RIOT,mtausig\/RIOT,daniel-k\/RIOT,abkam07\/RIOT,abp719\/RIOT,dhruvvyas90\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,brettswann\/RIOT,JensErdmann\/RIOT,haoyangyu\/RIOT,josephnoir\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,kbumsik\/RIOT,rajma996\/RIOT,LudwigOrtmann\/RIOT,khhhh\/RIOT,kb2ma\/RIOT,LudwigOrtmann\/RIOT,MonsterCode8000\/RIOT,MohmadAyman\/RIOT,gebart\/RIOT,rfuentess\/RIOT,backenklee\/RIOT,OlegHahm\/RIOT,hamilton-mote\/RIOT-OS,mziegert\/RIOT,thiagohd\/RIOT,malosek\/RIOT,mziegert\/RIOT,RBartz\/RIOT,watr-li\/RIOT,LudwigKnuepfer\/RIOT,mfrey\/RIOT,plushvoxel\/RIOT,LudwigOrtmann\/RIOT,wentaoshang\/RIOT,cladmi\/RIOT,mtausig\/RIOT,dhruvvyas90\/RIOT,watr-li\/RIOT,josephnoir\/RIOT,authmillenon\/RIOT,rfuentess\/RIOT,l3nko\/RIOT,adrianghc\/RIOT,thiagohd\/RIOT,Ell-i\/RIOT,zhuoshuguo\/RIOT,altairpearl\/RIOT,roberthartung\/RIOT,kerneltask\/RIOT,kYc0o\/RIOT,FrancescoErmini\/RIOT,daniel-k\/RIOT,OTAkeys\/RIOT,tfar\/RIOT,lazytech-org\/RIOT,jremmert-phytec-iot\/RIOT,khhhh\/RIOT,asanka-code\/RIOT,herrfz\/RIOT,MonsterCode8000\/RIOT,altairpearl\/RIOT,lebrush\/RIOT,kaspar030\/RIOT,yogo1212\/RIOT,smlng\/RIOT,rousselk\/RIOT,jremmert-phytec-iot\/RIOT,binarylemon\/RIOT,lebrush\/RIOT,lebrush\/RIOT,A-Paul\/RIOT,backenklee\/RIOT,zhuoshuguo\/RIOT,gbarnett\/RIOT,daniel-k\/RIOT,smlng\/RIOT,dhruvvyas90\/RIOT,kYc0o\/RIOT,kbumsik\/RIOT,d00616\/RIOT,kaspar030\/RIOT,jfischer-phytec-iot\/RIOT,rakendrathapa\/RIOT,avmelnikoff\/RIOT,OTAkeys\/RIOT,rfuentess\/RIOT,ant9000\/RIOT,Josar\/RIOT,jfischer-phytec-iot\/RIOT,adrianghc\/RIOT,plushvoxel\/RIOT,shady33\/RIOT,rajma996\/RIOT,gautric\/RIOT,thomaseichinger\/RIOT,MohmadAyman\/RIOT,brettswann\/RIOT,thomaseichinger\/RIOT,wentaoshang\/RIOT,rfuentess\/RIOT,mfrey\/RIOT,haoyangyu\/RIOT,avmelnikoff\/RIOT,arvindpdmn\/RIOT,mziegert\/RIOT,avmelnikoff\/RIOT,gautric\/RIOT,abkam07\/RIOT,miri64\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,miri64\/RIOT,katezilla\/RIOT,JensErdmann\/RIOT,gbarnett\/RIOT,neumodisch\/RIOT,TobiasFredersdorf\/RIOT,abp719\/RIOT,adrianghc\/RIOT,neiljay\/RIOT,neumodisch\/RIOT,lazytech-org\/RIOT,wentaoshang\/RIOT,kerneltask\/RIOT,OlegHahm\/RIOT,asanka-code\/RIOT,beurdouche\/RIOT,arvindpdmn\/RIOT,dailab\/RIOT,zhuoshuguo\/RIOT,l3nko\/RIOT,jasonatran\/RIOT,alignan\/RIOT,Yonezawa-T2\/RIOT,hamilton-mote\/RIOT-OS,josephnoir\/RIOT,herrfz\/RIOT,beurdouche\/RIOT,RubikonAlpha\/RIOT,josephnoir\/RIOT,watr-li\/RIOT,mziegert\/RIOT,mziegert\/RIOT,adjih\/RIOT,syin2\/RIOT,kbumsik\/RIOT,rakendrathapa\/RIOT,TobiasFredersdorf\/RIOT,kbumsik\/RIOT,RBartz\/RIOT,MonsterCode8000\/RIOT,toonst\/RIOT,herrfz\/RIOT,attdona\/RIOT,beurdouche\/RIOT,mtausig\/RIOT,MohmadAyman\/RIOT,OlegHahm\/RIOT,roberthartung\/RIOT,kbumsik\/RIOT,jasonatran\/RIOT,ks156\/RIOT,RBartz\/RIOT,binarylemon\/RIOT,authmillenon\/RIOT,rajma996\/RIOT,l3nko\/RIOT,haoyangyu\/RIOT,brettswann\/RIOT,dhruvvyas90\/RIOT,attdona\/RIOT,roberthartung\/RIOT,plushvoxel\/RIOT,tfar\/RIOT,tfar\/RIOT,aeneby\/RIOT,kb2ma\/RIOT,stevenj\/RIOT,MonsterCode8000\/RIOT,TobiasFredersdorf\/RIOT,JensErdmann\/RIOT,BytesGalore\/RIOT,dkm\/RIOT,A-Paul\/RIOT,rajma996\/RIOT,thomaseichinger\/RIOT,brettswann\/RIOT,kYc0o\/RIOT,Josar\/RIOT,syin2\/RIOT,beurdouche\/RIOT,A-Paul\/RIOT,x3ro\/RIOT,malosek\/RIOT,FrancescoErmini\/RIOT,khhhh\/RIOT,adrianghc\/RIOT,lebrush\/RIOT,abp719\/RIOT,kb2ma\/RIOT,zhuoshuguo\/RIOT,gebart\/RIOT,jremmert-phytec-iot\/RIOT,backenklee\/RIOT,FrancescoErmini\/RIOT,asanka-code\/RIOT,haoyangyu\/RIOT,cladmi\/RIOT,jbeyerstedt\/RIOT-OTA-update,basilfx\/RIOT,alignan\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,d00616\/RIOT,thiagohd\/RIOT,authmillenon\/RIOT,jremmert-phytec-iot\/RIOT,shady33\/RIOT,hamilton-mote\/RIOT-OS,attdona\/RIOT,yogo1212\/RIOT,x3ro\/RIOT,altairpearl\/RIOT,rajma996\/RIOT,latsku\/RIOT,rakendrathapa\/RIOT,dailab\/RIOT,BytesGalore\/RIOT,Ell-i\/RIOT,msolters\/RIOT,d00616\/RIOT,herrfz\/RIOT,biboc\/RIOT,RIOT-OS\/RIOT,adjih\/RIOT,Josar\/RIOT,neiljay\/RIOT,neumodisch\/RIOT,l3nko\/RIOT,shady33\/RIOT,yogo1212\/RIOT,msolters\/RIOT,Yonezawa-T2\/RIOT,kYc0o\/RIOT,rakendrathapa\/RIOT,thomaseichinger\/RIOT,JensErdmann\/RIOT,RIOT-OS\/RIOT,A-Paul\/RIOT,thiagohd\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,arvindpdmn\/RIOT,kYc0o\/RIOT,gebart\/RIOT,RubikonAlpha\/RIOT,cladmi\/RIOT,toonst\/RIOT,biboc\/RIOT,ant9000\/RIOT,gbarnett\/RIOT,immesys\/RiSyn,dhruvvyas90\/RIOT,smlng\/RIOT,mfrey\/RIOT,rousselk\/RIOT,JensErdmann\/RIOT,malosek\/RIOT,jremmert-phytec-iot\/RIOT,jbeyerstedt\/RIOT-OTA-update,abkam07\/RIOT,gebart\/RIOT,gbarnett\/RIOT,altairpearl\/RIOT,yogo1212\/RIOT,RIOT-OS\/RIOT,LudwigKnuepfer\/RIOT,Ell-i\/RIOT,OTAkeys\/RIOT,abkam07\/RIOT,arvindpdmn\/RIOT,LudwigKnuepfer\/RIOT,biboc\/RIOT,immesys\/RiSyn,plushvoxel\/RIOT,BytesGalore\/RIOT,attdona\/RIOT,latsku\/RIOT,LudwigKnuepfer\/RIOT,x3ro\/RIOT,hamilton-mote\/RIOT-OS,immesys\/RiSyn,neiljay\/RIOT,RIOT-OS\/RIOT,altairpearl\/RIOT,rakendrathapa\/RIOT,beurdouche\/RIOT,alignan\/RIOT,Ell-i\/RIOT,katezilla\/RIOT,x3ro\/RIOT,kaspar030\/RIOT,biboc\/RIOT,lebrush\/RIOT,haoyangyu\/RIOT,OlegHahm\/RIOT,binarylemon\/RIOT,toonst\/RIOT,lazytech-org\/RIOT,kaspar030\/RIOT,katezilla\/RIOT,roberthartung\/RIOT,kb2ma\/RIOT,kaleb-himes\/RIOT,aeneby\/RIOT,jbeyerstedt\/RIOT-OTA-update,ant9000\/RIOT,rousselk\/RIOT,msolters\/RIOT,binarylemon\/RIOT,daniel-k\/RIOT,zhuoshuguo\/RIOT,tfar\/RIOT,l3nko\/RIOT,brettswann\/RIOT,biboc\/RIOT,tfar\/RIOT,neumodisch\/RIOT,Hyungsin\/RIOT-OS,dkm\/RIOT,dhruvvyas90\/RIOT,khhhh\/RIOT,dkm\/RIOT,rajma996\/RIOT,gautric\/RIOT,syin2\/RIOT,jasonatran\/RIOT,authmillenon\/RIOT,abp719\/RIOT,rousselk\/RIOT,rousselk\/RIOT,OTAkeys\/RIOT,latsku\/RIOT,x3ro\/RIOT,Yonezawa-T2\/RIOT,gbarnett\/RIOT,backenklee\/RIOT,kerneltask\/RIOT,asanka-code\/RIOT,kaleb-himes\/RIOT,basilfx\/RIOT,malosek\/RIOT,thomaseichinger\/RIOT,kaleb-himes\/RIOT,Yonezawa-T2\/RIOT,stevenj\/RIOT,toonst\/RIOT,ant9000\/RIOT,A-Paul\/RIOT,Hyungsin\/RIOT-OS,toonst\/RIOT,malosek\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- boards\/iotlab-m3\/include\/board.h\n+++ boards\/iotlab-m3\/include\/board.h\n@@ -50,13 +50,6 @@\n #endif\n \n #define STDIO_RX_BUFSIZE (64U)\n-\/** @} *\/\n-\n-\/**\n- * @name Assign the hardware timer\n- * @{\n- *\/\n-#define HW_TIMER TIMER_0\n \/** @} *\/\n \n \/**\n"} {"commit":"6138b4f71aaf02fe03b178b4f517f6d891b23703","subject":"bootutil: Fix boot_read_image_header error path","message":"bootutil: Fix boot_read_image_header error path\n\nThe error path of boot_read_image_header could invoke\nflash_area_close on uninitialized flash_area object.\n\nSigned-off-by: Dominik Ermel <1a1d45a9cc0c98a37f8d0a0d2dbe3cacc0b2344f@nordicsemi.no>\n","repos":"ATmobica\/mcuboot,ATmobica\/mcuboot,runtimeco\/mcuboot,ATmobica\/mcuboot,runtimeco\/mcuboot,ATmobica\/mcuboot,ATmobica\/mcuboot,runtimeco\/mcuboot,runtimeco\/mcuboot,runtimeco\/mcuboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- boot\/bootutil\/src\/swap_scratch.c\n+++ boot\/bootutil\/src\/swap_scratch.c\n@@ -53,7 +53,7 @@\n {\n const struct flash_area *fap;\n int area_id;\n- int rc;\n+ int rc = 0;\n \n (void)bs;\n \n@@ -62,22 +62,17 @@\n #endif\n \n area_id = flash_area_id_from_multi_image_slot(BOOT_CURR_IMG(state), slot);\n+\n rc = flash_area_open(area_id, &fap);\n+ if (rc == 0) {\n+ rc = flash_area_read(fap, 0, out_hdr, sizeof *out_hdr);\n+ flash_area_close(fap);\n+ }\n+\n if (rc != 0) {\n rc = BOOT_EFLASH;\n- goto done;\n- }\n-\n- rc = flash_area_read(fap, 0, out_hdr, sizeof *out_hdr);\n- if (rc != 0) {\n- rc = BOOT_EFLASH;\n- goto done;\n- }\n-\n- rc = 0;\n-\n-done:\n- flash_area_close(fap);\n+ }\n+\n return rc;\n }\n \n"} {"commit":"833190e8fa23e8b4e0db095328e0e87e252bdd90","subject":":lipstick: for cpplint.","message":":lipstick: for cpplint.\n","repos":"dahal\/electron,adcentury\/electron,jhen0409\/electron,jsutcodes\/electron,kostia\/electron,kostia\/electron,jlhbaseball15\/electron,christian-bromann\/electron,d-salas\/electron,jhen0409\/electron,stevekinney\/electron,michaelchiche\/electron,nagyistoce\/electron-atom-shell,Gerhut\/electron,brave\/electron,Neron-X5\/electron,chriskdon\/electron,Evercoder\/electron,faizalpribadi\/electron,SufianHassan\/electron,voidbridge\/electron,systembugtj\/electron,shockone\/electron,brave\/electron,wan-qy\/electron,mrwizard82d1\/electron,eriser\/electron,davazp\/electron,leftstick\/electron,beni55\/electron,Floato\/electron,preco21\/electron,bwiggs\/electron,mrwizard82d1\/electron,leftstick\/electron,SufianHassan\/electron,dahal\/electron,pandoraui\/electron,stevekinney\/electron,ianscrivener\/electron,twolfson\/electron,DivyaKMenon\/electron,fireball-x\/atom-shell,mattdesl\/electron,tonyganch\/electron,soulteary\/electron,renaesop\/electron,minggo\/electron,brave\/electron,digideskio\/electron,leolujuyi\/electron,micalan\/electron,thingsinjars\/electron,trankmichael\/electron,sircharleswatson\/electron,renaesop\/electron,arusakov\/electron,fabien-d\/electron,tonyganch\/electron,neutrous\/electron,deed02392\/electron,shaundunne\/electron,rreimann\/electron,takashi\/electron,leethomas\/electron,neutrous\/electron,Gerhut\/electron,nicholasess\/electron,pirafrank\/electron,tomashanacek\/electron,maxogden\/atom-shell,MaxGraey\/electron,gabriel\/electron,Jacobichou\/electron,takashi\/electron,timruffles\/electron,bobwol\/electron,greyhwndz\/electron,posix4e\/electron,aecca\/electron,kikong\/electron,IonicaBizauKitchen\/electron,MaxWhere\/electron,soulteary\/electron,gabrielPeart\/electron,aliib\/electron,michaelchiche\/electron,brenca\/electron,gerhardberger\/electron,xiruibing\/electron,arturts\/electron,carsonmcdonald\/electron,aichingm\/electron,LadyNaggaga\/electron,kenmozi\/electron,brenca\/electron,systembugtj\/electron,felixrieseberg\/electron,tylergibson\/electron,fffej\/electron,jtburke\/electron,seanchas116\/electron,nagyistoce\/electron-atom-shell,LadyNaggaga\/electron,gbn972\/electron,simonfork\/electron,nicobot\/electron,pandoraui\/electron,dongjoon-hyun\/electron,yalexx\/electron,carsonmcdonald\/electron,minggo\/electron,GoooIce\/electron,hokein\/atom-shell,Jacobichou\/electron,fffej\/electron,bitemyapp\/electron,aecca\/electron,leftstick\/electron,ianscrivener\/electron,systembugtj\/electron,kikong\/electron,stevemao\/electron,fomojola\/electron,posix4e\/electron,jjz\/electron,evgenyzinoviev\/electron,destan\/electron,Jonekee\/electron,matiasinsaurralde\/electron,bobwol\/electron,tylergibson\/electron,coderhaoxin\/electron,soulteary\/electron,deed02392\/electron,brave\/electron,astoilkov\/electron,joneit\/electron,tonyganch\/electron,LadyNaggaga\/electron,jonatasfreitasv\/electron,leethomas\/electron,IonicaBizauKitchen\/electron,bright-sparks\/electron,mubassirhayat\/electron,kostia\/electron,brave\/muon,DivyaKMenon\/electron,jjz\/electron,joaomoreno\/atom-shell,hokein\/atom-shell,kikong\/electron,rhencke\/electron,bright-sparks\/electron,biblerule\/UMCTelnetHub,jacksondc\/electron,pombredanne\/electron,arusakov\/electron,dongjoon-hyun\/electron,Evercoder\/electron,RobertJGabriel\/electron,yalexx\/electron,neutrous\/electron,iftekeriba\/electron,natgolov\/electron,LadyNaggaga\/electron,JesselJohn\/electron,the-ress\/electron,rsvip\/electron,trankmichael\/electron,gabriel\/electron,yalexx\/electron,greyhwndz\/electron,tonyganch\/electron,ankitaggarwal011\/electron,maxogden\/atom-shell,aecca\/electron,chrisswk\/electron,icattlecoder\/electron,dongjoon-hyun\/electron,soulteary\/electron,faizalpribadi\/electron,ervinb\/electron,Jacobichou\/electron,jiaz\/electron,miniak\/electron,jtburke\/electron,felixrieseberg\/electron,michaelchiche\/electron,preco21\/electron,RobertJGabriel\/electron,bobwol\/electron,fomojola\/electron,mattotodd\/electron,carsonmcdonald\/electron,minggo\/electron,arusakov\/electron,kazupon\/electron,destan\/electron,stevemao\/electron,arusakov\/electron,the-ress\/electron,destan\/electron,jacksondc\/electron,electron\/electron,carsonmcdonald\/electron,rajatsingla28\/electron,dkfiresky\/electron,evgenyzinoviev\/electron,JesselJohn\/electron,abhishekgahlot\/electron,nicobot\/electron,kokdemo\/electron,Jonekee\/electron,jannishuebl\/electron,nekuz0r\/electron,Rokt33r\/electron,bitemyapp\/electron,neutrous\/electron,GoooIce\/electron,trankmichael\/electron,wan-qy\/electron,robinvandernoord\/electron,fomojola\/electron,leethomas\/electron,smczk\/electron,cqqccqc\/electron,gabriel\/electron,fritx\/electron,astoilkov\/electron,setzer777\/electron,rhencke\/electron,systembugtj\/electron,jlhbaseball15\/electron,JussMee15\/electron,mattotodd\/electron,LadyNaggaga\/electron,pirafrank\/electron,sky7sea\/electron,simonfork\/electron,bobwol\/electron,timruffles\/electron,tincan24\/electron,cos2004\/electron,eric-seekas\/electron,RIAEvangelist\/electron,Zagorakiss\/electron,felixrieseberg\/electron,mhkeller\/electron,jiaz\/electron,rreimann\/electron,takashi\/electron,RobertJGabriel\/electron,Gerhut\/electron,simonfork\/electron,sshiting\/electron,ervinb\/electron,zhakui\/electron,cqqccqc\/electron,setzer777\/electron,darwin\/electron,eric-seekas\/electron,yan-foto\/electron,bwiggs\/electron,setzer777\/electron,kazupon\/electron,fritx\/electron,fomojola\/electron,minggo\/electron,wolfflow\/electron,ianscrivener\/electron,gabriel\/electron,vipulroxx\/electron,shockone\/electron,Ivshti\/electron,jcblw\/electron,fffej\/electron,beni55\/electron,oiledCode\/electron,eric-seekas\/electron,electron\/electron,fomojola\/electron,gbn972\/electron,rhencke\/electron,yan-foto\/electron,jhen0409\/electron,robinvandernoord\/electron,jacksondc\/electron,MaxWhere\/electron,Ivshti\/electron,John-Lin\/electron,evgenyzinoviev\/electron,robinvandernoord\/electron,biblerule\/UMCTelnetHub,nagyistoce\/electron-atom-shell,Andrey-Pavlov\/electron,jaanus\/electron,jiaz\/electron,meowlab\/electron,webmechanicx\/electron,trigrass2\/electron,adamjgray\/electron,nekuz0r\/electron,oiledCode\/electron,digideskio\/electron,farmisen\/electron,miniak\/electron,ankitaggarwal011\/electron,JesselJohn\/electron,etiktin\/electron,meowlab\/electron,dahal\/electron,voidbridge\/electron,MaxWhere\/electron,maxogden\/atom-shell,Andrey-Pavlov\/electron,jtburke\/electron,rsvip\/electron,smczk\/electron,trigrass2\/electron,jjz\/electron,Ivshti\/electron,abhishekgahlot\/electron,tinydew4\/electron,xfstudio\/electron,SufianHassan\/electron,sircharleswatson\/electron,rhencke\/electron,tylergibson\/electron,wan-qy\/electron,nekuz0r\/electron,sky7sea\/electron,chriskdon\/electron,aichingm\/electron,benweissmann\/electron,kostia\/electron,felixrieseberg\/electron,cos2004\/electron,hokein\/atom-shell,sky7sea\/electron,the-ress\/electron,mhkeller\/electron,rprichard\/electron,nekuz0r\/electron,subblue\/electron,bwiggs\/electron,gamedevsam\/electron,brave\/electron,evgenyzinoviev\/electron,lzpfmh\/electron,aichingm\/electron,roadev\/electron,deed02392\/electron,tincan24\/electron,subblue\/electron,deed02392\/electron,thingsinjars\/electron,natgolov\/electron,minggo\/electron,vHanda\/electron,tylergibson\/electron,jiaz\/electron,synaptek\/electron,dkfiresky\/electron,thingsinjars\/electron,saronwei\/electron,jannishuebl\/electron,mhkeller\/electron,kcrt\/electron,nekuz0r\/electron,gamedevsam\/electron,jsutcodes\/electron,pombredanne\/electron,rsvip\/electron,seanchas116\/electron,leethomas\/electron,edulan\/electron,RIAEvangelist\/electron,jannishuebl\/electron,Faiz7412\/electron,destan\/electron,DivyaKMenon\/electron,cos2004\/electron,meowlab\/electron,Neron-X5\/electron,MaxGraey\/electron,trigrass2\/electron,Evercoder\/electron,shiftkey\/electron,zhakui\/electron,jlhbaseball15\/electron,seanchas116\/electron,SufianHassan\/electron,adamjgray\/electron,oiledCode\/electron,GoooIce\/electron,biblerule\/UMCTelnetHub,shockone\/electron,wolfflow\/electron,noikiy\/electron,greyhwndz\/electron,wan-qy\/electron,brave\/muon,jtburke\/electron,bwiggs\/electron,tincan24\/electron,astoilkov\/electron,jiaz\/electron,micalan\/electron,egoist\/electron,rajatsingla28\/electron,mattotodd\/electron,coderhaoxin\/electron,anko\/electron,mrwizard82d1\/electron,kazupon\/electron,mjaniszew\/electron,coderhaoxin\/electron,jlhbaseball15\/electron,MaxWhere\/electron,electron\/electron,rajatsingla28\/electron,xiruibing\/electron,aaron-goshine\/electron,Faiz7412\/electron,jaanus\/electron,John-Lin\/electron,coderhaoxin\/electron,leolujuyi\/electron,pandoraui\/electron,Rokt33r\/electron,bpasero\/electron,synaptek\/electron,micalan\/electron,webmechanicx\/electron,sircharleswatson\/electron,nicobot\/electron,fireball-x\/atom-shell,adcentury\/electron,smczk\/electron,renaesop\/electron,d-salas\/electron,adcentury\/electron,fffej\/electron,IonicaBizauKitchen\/electron,kcrt\/electron,jonatasfreitasv\/electron,coderhaoxin\/electron,astoilkov\/electron,jcblw\/electron,twolfson\/electron,digideskio\/electron,natgolov\/electron,brenca\/electron,howmuchcomputer\/electron,egoist\/electron,carsonmcdonald\/electron,gamedevsam\/electron,mirrh\/electron,thomsonreuters\/electron,SufianHassan\/electron,medixdev\/electron,eriser\/electron,brave\/muon,howmuchcomputer\/electron,webmechanicx\/electron,tinydew4\/electron,bruce\/electron,trankmichael\/electron,mirrh\/electron,aecca\/electron,saronwei\/electron,soulteary\/electron,simonfork\/electron,nekuz0r\/electron,leftstick\/electron,joaomoreno\/atom-shell,iftekeriba\/electron,howmuchcomputer\/electron,simongregory\/electron,kenmozi\/electron,subblue\/electron,Floato\/electron,eric-seekas\/electron,jlhbaseball15\/electron,JesselJohn\/electron,baiwyc119\/electron,Evercoder\/electron,thompsonemerson\/electron,gstack\/infinium-shell,shaundunne\/electron,brave\/muon,bobwol\/electron,mjaniszew\/electron,lrlna\/electron,destan\/electron,Andrey-Pavlov\/electron,kenmozi\/electron,twolfson\/electron,zhakui\/electron,gerhardberger\/electron,fomojola\/electron,mubassirhayat\/electron,Faiz7412\/electron,jacksondc\/electron,smczk\/electron,Zagorakiss\/electron,RIAEvangelist\/electron,jlord\/electron,etiktin\/electron,yan-foto\/electron,meowlab\/electron,bruce\/electron,eriser\/electron,synaptek\/electron,leolujuyi\/electron,Jonekee\/electron,vipulroxx\/electron,voidbridge\/electron,ianscrivener\/electron,ianscrivener\/electron,farmisen\/electron,Rokt33r\/electron,posix4e\/electron,ervinb\/electron,wolfflow\/electron,farmisen\/electron,lzpfmh\/electron,icattlecoder\/electron,dkfiresky\/electron,christian-bromann\/electron,digideskio\/electron,bpasero\/electron,IonicaBizauKitchen\/electron,felixrieseberg\/electron,Rokt33r\/electron,xiruibing\/electron,nicholasess\/electron,jiaz\/electron,adamjgray\/electron,xfstudio\/electron,kcrt\/electron,aecca\/electron,roadev\/electron,davazp\/electron,thomsonreuters\/electron,darwin\/electron,bright-sparks\/electron,jlord\/electron,twolfson\/electron,thompsonemerson\/electron,posix4e\/electron,John-Lin\/electron,sircharleswatson\/electron,shiftkey\/electron,matiasinsaurralde\/electron,oiledCode\/electron,miniak\/electron,chrisswk\/electron,farmisen\/electron,eric-seekas\/electron,michaelchiche\/electron,aaron-goshine\/electron,gabrielPeart\/electron,thomsonreuters\/electron,beni55\/electron,baiwyc119\/electron,jtburke\/electron,maxogden\/atom-shell,shennushi\/electron,joaomoreno\/atom-shell,egoist\/electron,adcentury\/electron,jlhbaseball15\/electron,edulan\/electron,arturts\/electron,maxogden\/atom-shell,jannishuebl\/electron,arturts\/electron,jannishuebl\/electron,jlord\/electron,Faiz7412\/electron,joaomoreno\/atom-shell,bpasero\/electron,soulteary\/electron,sircharleswatson\/electron,pombredanne\/electron,dongjoon-hyun\/electron,saronwei\/electron,nagyistoce\/electron-atom-shell,eric-seekas\/electron,seanchas116\/electron,astoilkov\/electron,sky7sea\/electron,bruce\/electron,d-salas\/electron,pandoraui\/electron,coderhaoxin\/electron,gstack\/infinium-shell,kenmozi\/electron,greyhwndz\/electron,jcblw\/electron,kcrt\/electron,RobertJGabriel\/electron,ianscrivener\/electron,fabien-d\/electron,mjaniszew\/electron,arturts\/electron,beni55\/electron,kenmozi\/electron,abhishekgahlot\/electron,aichingm\/electron,lzpfmh\/electron,takashi\/electron,DivyaKMenon\/electron,webmechanicx\/electron,fritx\/electron,stevemao\/electron,trankmichael\/electron,rreimann\/electron,howmuchcomputer\/electron,tomashanacek\/electron,vHanda\/electron,kokdemo\/electron,saronwei\/electron,noikiy\/electron,tomashanacek\/electron,hokein\/atom-shell,xfstudio\/electron,renaesop\/electron,deed02392\/electron,Andrey-Pavlov\/electron,brave\/muon,dongjoon-hyun\/electron,sshiting\/electron,felixrieseberg\/electron,gabrielPeart\/electron,jacksondc\/electron,arusakov\/electron,rprichard\/electron,simongregory\/electron,fritx\/electron,etiktin\/electron,biblerule\/UMCTelnetHub,smczk\/electron,nicobot\/electron,wan-qy\/electron,zhakui\/electron,yan-foto\/electron,faizalpribadi\/electron,jaanus\/electron,edulan\/electron,thomsonreuters\/electron,pombredanne\/electron,aichingm\/electron,aliib\/electron,cqqccqc\/electron,tomashanacek\/electron,rajatsingla28\/electron,stevemao\/electron,mattdesl\/electron,bwiggs\/electron,noikiy\/electron,Jacobichou\/electron,egoist\/electron,rprichard\/electron,rprichard\/electron,stevekinney\/electron,JesselJohn\/electron,icattlecoder\/electron,Rokt33r\/electron,Faiz7412\/electron,farmisen\/electron,rhencke\/electron,JesselJohn\/electron,leolujuyi\/electron,baiwyc119\/electron,JussMee15\/electron,xfstudio\/electron,MaxGraey\/electron,aliib\/electron,jhen0409\/electron,xiruibing\/electron,deepak1556\/atom-shell,christian-bromann\/electron,destan\/electron,shockone\/electron,benweissmann\/electron,jjz\/electron,thompsonemerson\/electron,subblue\/electron,miniak\/electron,renaesop\/electron,tincan24\/electron,eriser\/electron,edulan\/electron,stevekinney\/electron,trigrass2\/electron,dkfiresky\/electron,gabriel\/electron,shennushi\/electron,trigrass2\/electron,shiftkey\/electron,Zagorakiss\/electron,IonicaBizauKitchen\/electron,nicholasess\/electron,vHanda\/electron,dahal\/electron,gerhardberger\/electron,preco21\/electron,smczk\/electron,meowlab\/electron,gabriel\/electron,simongregory\/electron,Evercoder\/electron,mrwizard82d1\/electron,tylergibson\/electron,darwin\/electron,Floato\/electron,greyhwndz\/electron,faizalpribadi\/electron,adcentury\/electron,medixdev\/electron,mirrh\/electron,farmisen\/electron,nicobot\/electron,abhishekgahlot\/electron,bbondy\/electron,sky7sea\/electron,thingsinjars\/electron,hokein\/atom-shell,howmuchcomputer\/electron,natgolov\/electron,bitemyapp\/electron,ankitaggarwal011\/electron,shiftkey\/electron,matiasinsaurralde\/electron,mjaniszew\/electron,matiasinsaurralde\/electron,adcentury\/electron,eriser\/electron,nagyistoce\/electron-atom-shell,Jacobichou\/electron,bitemyapp\/electron,gabrielPeart\/electron,bpasero\/electron,Ivshti\/electron,bobwol\/electron,aecca\/electron,pirafrank\/electron,micalan\/electron,vipulroxx\/electron,baiwyc119\/electron,miniak\/electron,darwin\/electron,voidbridge\/electron,gerhardberger\/electron,MaxWhere\/electron,Andrey-Pavlov\/electron,d-salas\/electron,mattdesl\/electron,John-Lin\/electron,systembugtj\/electron,BionicClick\/electron,preco21\/electron,vHanda\/electron,electron\/electron,saronwei\/electron,jlord\/electron,shockone\/electron,astoilkov\/electron,Gerhut\/electron,webmechanicx\/electron,natgolov\/electron,the-ress\/electron,lrlna\/electron,rsvip\/electron,MaxWhere\/electron,seanchas116\/electron,gabrielPeart\/electron,thompsonemerson\/electron,biblerule\/UMCTelnetHub,mjaniszew\/electron,digideskio\/electron,deepak1556\/atom-shell,electron\/electron,jtburke\/electron,Evercoder\/electron,etiktin\/electron,deepak1556\/atom-shell,jonatasfreitasv\/electron,howmuchcomputer\/electron,mubassirhayat\/electron,cos2004\/electron,benweissmann\/electron,nicholasess\/electron,Neron-X5\/electron,dahal\/electron,BionicClick\/electron,shiftkey\/electron,shockone\/electron,bbondy\/electron,tinydew4\/electron,robinvandernoord\/electron,jsutcodes\/electron,deepak1556\/atom-shell,rsvip\/electron,Andrey-Pavlov\/electron,tomashanacek\/electron,chriskdon\/electron,rajatsingla28\/electron,thompsonemerson\/electron,seanchas116\/electron,leethomas\/electron,baiwyc119\/electron,kazupon\/electron,John-Lin\/electron,preco21\/electron,trankmichael\/electron,jhen0409\/electron,chrisswk\/electron,aichingm\/electron,trigrass2\/electron,MaxGraey\/electron,leethomas\/electron,aaron-goshine\/electron,Jonekee\/electron,lzpfmh\/electron,brenca\/electron,yalexx\/electron,greyhwndz\/electron,egoist\/electron,kikong\/electron,kokdemo\/electron,minggo\/electron,Gerhut\/electron,anko\/electron,bpasero\/electron,vaginessa\/electron,nicobot\/electron,renaesop\/electron,DivyaKMenon\/electron,bitemyapp\/electron,tylergibson\/electron,vHanda\/electron,shaundunne\/electron,adamjgray\/electron,webmechanicx\/electron,roadev\/electron,jjz\/electron,christian-bromann\/electron,sshiting\/electron,kostia\/electron,mubassirhayat\/electron,aaron-goshine\/electron,ankitaggarwal011\/electron,bwiggs\/electron,icattlecoder\/electron,simonfork\/electron,kcrt\/electron,tincan24\/electron,tonyganch\/electron,meowlab\/electron,fireball-x\/atom-shell,shaundunne\/electron,mubassirhayat\/electron,joneit\/electron,medixdev\/electron,gstack\/infinium-shell,simongregory\/electron,wolfflow\/electron,tincan24\/electron,jsutcodes\/electron,John-Lin\/electron,pirafrank\/electron,jaanus\/electron,mrwizard82d1\/electron,edulan\/electron,bright-sparks\/electron,synaptek\/electron,d-salas\/electron,benweissmann\/electron,zhakui\/electron,pombredanne\/electron,takashi\/electron,micalan\/electron,arturts\/electron,mattdesl\/electron,brave\/electron,setzer777\/electron,pandoraui\/electron,RobertJGabriel\/electron,rreimann\/electron,davazp\/electron,medixdev\/electron,sshiting\/electron,fffej\/electron,electron\/electron,jlord\/electron,miniak\/electron,christian-bromann\/electron,beni55\/electron,oiledCode\/electron,jaanus\/electron,kazupon\/electron,yan-foto\/electron,yan-foto\/electron,abhishekgahlot\/electron,xfstudio\/electron,bright-sparks\/electron,jsutcodes\/electron,dongjoon-hyun\/electron,aliib\/electron,adamjgray\/electron,wolfflow\/electron,mrwizard82d1\/electron,RIAEvangelist\/electron,icattlecoder\/electron,egoist\/electron,lzpfmh\/electron,shennushi\/electron,chrisswk\/electron,roadev\/electron,simongregory\/electron,the-ress\/electron,aaron-goshine\/electron,davazp\/electron,mattdesl\/electron,kazupon\/electron,mirrh\/electron,ankitaggarwal011\/electron,xiruibing\/electron,fabien-d\/electron,Gerhut\/electron,takashi\/electron,leftstick\/electron,sshiting\/electron,gstack\/infinium-shell,xfstudio\/electron,noikiy\/electron,roadev\/electron,twolfson\/electron,gerhardberger\/electron,leolujuyi\/electron,Floato\/electron,oiledCode\/electron,vHanda\/electron,rhencke\/electron,gbn972\/electron,gerhardberger\/electron,Neron-X5\/electron,sshiting\/electron,timruffles\/electron,shennushi\/electron,neutrous\/electron,thomsonreuters\/electron,anko\/electron,dahal\/electron,sky7sea\/electron,lrlna\/electron,cos2004\/electron,michaelchiche\/electron,Neron-X5\/electron,lrlna\/electron,subblue\/electron,ervinb\/electron,cqqccqc\/electron,adamjgray\/electron,fabien-d\/electron,kcrt\/electron,robinvandernoord\/electron,ervinb\/electron,natgolov\/electron,brenca\/electron,bbondy\/electron,JussMee15\/electron,mattotodd\/electron,abhishekgahlot\/electron,chrisswk\/electron,matiasinsaurralde\/electron,GoooIce\/electron,evgenyzinoviev\/electron,jcblw\/electron,faizalpribadi\/electron,mattdesl\/electron,pirafrank\/electron,cos2004\/electron,jonatasfreitasv\/electron,yalexx\/electron,carsonmcdonald\/electron,LadyNaggaga\/electron,benweissmann\/electron,Rokt33r\/electron,joneit\/electron,Jonekee\/electron,setzer777\/electron,michaelchiche\/electron,noikiy\/electron,vaginessa\/electron,nicholasess\/electron,anko\/electron,brave\/muon,joaomoreno\/atom-shell,Floato\/electron,Zagorakiss\/electron,shennushi\/electron,wan-qy\/electron,mhkeller\/electron,gamedevsam\/electron,medixdev\/electron,saronwei\/electron,chriskdon\/electron,kenmozi\/electron,anko\/electron,gabrielPeart\/electron,christian-bromann\/electron,gamedevsam\/electron,JussMee15\/electron,twolfson\/electron,the-ress\/electron,rajatsingla28\/electron,timruffles\/electron,shaundunne\/electron,beni55\/electron,Neron-X5\/electron,BionicClick\/electron,systembugtj\/electron,simongregory\/electron,tomashanacek\/electron,bruce\/electron,posix4e\/electron,posix4e\/electron,bruce\/electron,icattlecoder\/electron,bpasero\/electron,roadev\/electron,JussMee15\/electron,fritx\/electron,lzpfmh\/electron,vaginessa\/electron,leftstick\/electron,rreimann\/electron,stevemao\/electron,bbondy\/electron,kostia\/electron,vaginessa\/electron,cqqccqc\/electron,mattotodd\/electron,bruce\/electron,noikiy\/electron,mhkeller\/electron,jhen0409\/electron,brenca\/electron,Jonekee\/electron,fireball-x\/atom-shell,timruffles\/electron,ervinb\/electron,vipulroxx\/electron,mirrh\/electron,tinydew4\/electron,bpasero\/electron,deepak1556\/atom-shell,IonicaBizauKitchen\/electron,robinvandernoord\/electron,Zagorakiss\/electron,lrlna\/electron,bright-sparks\/electron,gbn972\/electron,electron\/electron,vaginessa\/electron,arturts\/electron,fritx\/electron,nicholasess\/electron,SufianHassan\/electron,jannishuebl\/electron,mhkeller\/electron,eriser\/electron,kokdemo\/electron,thompsonemerson\/electron,setzer777\/electron,joneit\/electron,Zagorakiss\/electron,JussMee15\/electron,BionicClick\/electron,jaanus\/electron,neutrous\/electron,anko\/electron,vaginessa\/electron,lrlna\/electron,dkfiresky\/electron,mattotodd\/electron,shennushi\/electron,evgenyzinoviev\/electron,tinydew4\/electron,pandoraui\/electron,bitemyapp\/electron,xiruibing\/electron,stevekinney\/electron,gbn972\/electron,GoooIce\/electron,jonatasfreitasv\/electron,edulan\/electron,gstack\/infinium-shell,jcblw\/electron,thingsinjars\/electron,biblerule\/UMCTelnetHub,mirrh\/electron,rreimann\/electron,d-salas\/electron,jonatasfreitasv\/electron,aliib\/electron,DivyaKMenon\/electron,digideskio\/electron,gamedevsam\/electron,fabien-d\/electron,the-ress\/electron,jcblw\/electron,etiktin\/electron,leolujuyi\/electron,ankitaggarwal011\/electron,fireball-x\/atom-shell,darwin\/electron,joneit\/electron,mjaniszew\/electron,tonyganch\/electron,iftekeriba\/electron,GoooIce\/electron,aliib\/electron,synaptek\/electron,Floato\/electron,faizalpribadi\/electron,davazp\/electron,kokdemo\/electron,cqqccqc\/electron,baiwyc119\/electron,simonfork\/electron,sircharleswatson\/electron,subblue\/electron,RIAEvangelist\/electron,dkfiresky\/electron,benweissmann\/electron,BionicClick\/electron,iftekeriba\/electron,preco21\/electron,jsutcodes\/electron,vipulroxx\/electron,matiasinsaurralde\/electron,shaundunne\/electron,joaomoreno\/atom-shell,aaron-goshine\/electron,synaptek\/electron,pirafrank\/electron,bbondy\/electron,jjz\/electron,RobertJGabriel\/electron,vipulroxx\/electron,thomsonreuters\/electron,jacksondc\/electron,gerhardberger\/electron,yalexx\/electron,arusakov\/electron,voidbridge\/electron,medixdev\/electron,stevekinney\/electron,stevemao\/electron,joneit\/electron,chriskdon\/electron,zhakui\/electron,etiktin\/electron,davazp\/electron,gbn972\/electron,micalan\/electron,deed02392\/electron,BionicClick\/electron,Jacobichou\/electron,iftekeriba\/electron,Ivshti\/electron,kokdemo\/electron,bbondy\/electron,voidbridge\/electron,pombredanne\/electron,RIAEvangelist\/electron,thingsinjars\/electron,tinydew4\/electron,iftekeriba\/electron,chriskdon\/electron,shiftkey\/electron,MaxGraey\/electron,kikong\/electron,fffej\/electron,wolfflow\/electron","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- browser\/ui\/win\/native_menu_win.h\n+++ browser\/ui\/win\/native_menu_win.h\n@@ -47,14 +47,14 @@\n virtual ~NativeMenuWin();\n \n void RunMenuAt(const gfx::Point& point, int alignment);\n- void CancelMenu() ;\n- void Rebuild(views::MenuInsertionDelegateWin* delegate) ;\n- void UpdateStates() ;\n- HMENU GetNativeMenu() const ;\n- MenuAction GetMenuAction() const ;\n- void AddMenuListener(views::MenuListener* listener) ;\n- void RemoveMenuListener(views::MenuListener* listener) ;\n- void SetMinimumWidth(int width) ;\n+ void CancelMenu();\n+ void Rebuild(views::MenuInsertionDelegateWin* delegate);\n+ void UpdateStates();\n+ HMENU GetNativeMenu() const;\n+ MenuAction GetMenuAction() const;\n+ void AddMenuListener(views::MenuListener* listener);\n+ void RemoveMenuListener(views::MenuListener* listener);\n+ void SetMinimumWidth(int width);\n \n \/\/ Flag to create a window menu instead of popup menu.\n void set_create_as_window_menu(bool flag) { create_as_window_menu_ = flag; }\n"} {"commit":"b4ddf0eb49f7ee41c075b69ed69557f8fa3d5b85","subject":"SecurityPkg OpalPasswordDxe: Check the pointer before use it.","message":"SecurityPkg OpalPasswordDxe: Check the pointer before use it.\n\nCheck the pointer before use it to make the code more safely.\n\nContributed-under: TianoCore Contribution Agreement 1.0\nSigned-off-by: Eric Dong <fa9eeec52367040ac98013bc4b2913db170588f8@intel.com>\nReviewed-by: Feng Tian <e66bb7e9f36c82a029035c5885acf75500d07e68@intel.com>\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- SecurityPkg\/Tcg\/Opal\/OpalPasswordDxe\/OpalHii.c\n+++ SecurityPkg\/Tcg\/Opal\/OpalPasswordDxe\/OpalHii.c\n@@ -435,12 +435,12 @@\n EFI_STATUS\r\n EFIAPI\r\n DriverCallback(\r\n- CONST EFI_HII_CONFIG_ACCESS_PROTOCOL* This,\r\n+ CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r\n EFI_BROWSER_ACTION Action,\r\n EFI_QUESTION_ID QuestionId,\r\n UINT8 Type,\r\n- EFI_IFR_TYPE_VALUE* Value,\r\n- EFI_BROWSER_ACTION_REQUEST* ActionRequest\r\n+ EFI_IFR_TYPE_VALUE *Value,\r\n+ EFI_BROWSER_ACTION_REQUEST *ActionRequest\r\n )\r\n {\r\n HII_KEY HiiKey;\r\n@@ -448,6 +448,8 @@\n \r\n if (ActionRequest != NULL) {\r\n *ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r\n+ } else {\r\n+ return EFI_INVALID_PARAMETER;\r\n }\r\n \r\n \/\/\r\n@@ -644,14 +646,13 @@\n \r\n UnicodeStrToAsciiStr(gHiiConfiguration.Psid, (CHAR8*)Psid.Psid);\r\n \r\n- OpalDisk = HiiGetOpalDiskCB(gHiiConfiguration.SelectedDiskIndex);\r\n-\r\n- ZeroMem(&Session, sizeof(Session));\r\n- Session.Sscp = OpalDisk->Sscp;\r\n- Session.MediaId = OpalDisk->MediaId;\r\n- Session.OpalBaseComId = OpalDisk->OpalBaseComId;\r\n-\r\n+ OpalDisk = HiiGetOpalDiskCB (gHiiConfiguration.SelectedDiskIndex);\r\n if (OpalDisk != NULL) {\r\n+ ZeroMem(&Session, sizeof(Session));\r\n+ Session.Sscp = OpalDisk->Sscp;\r\n+ Session.MediaId = OpalDisk->MediaId;\r\n+ Session.OpalBaseComId = OpalDisk->OpalBaseComId;\r\n+\r\n Ret = OpalSupportPsidRevert(&Session, Psid.Psid, (UINT32)sizeof(Psid.Psid), OpalDisk->OpalDevicePath);\r\n }\r\n \r\n"} {"commit":"28eca30ae207835ff99f8a75fb513a85518d8fd6","subject":"fixed_array: adding non-const access to raw data (how is it possible it was not implemented?!)","message":"fixed_array: adding non-const access to raw data\n(how is it possible it was not implemented?!)\n","repos":"Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- SofaKernel\/framework\/sofa\/helper\/fixed_array.h\n+++ SofaKernel\/framework\/sofa\/helper\/fixed_array.h\n@@ -309,6 +309,12 @@\n return elems;\n }\n \n+ \/\/ direct access to data\n+ T* data()\n+ {\n+ return elems;\n+ }\n+\n \/\/\/ direct access to array\n const Array& array() const\n {\n"} {"commit":"5e5b43aecbac90f4ea1892555c1b97dc006f58bf","subject":"Add nullability indicators","message":"Add nullability indicators\n","repos":"xamoom\/xamoom-ios-sdk,xamoom\/xamoom-ios-sdk,xamoom\/xamoom-ios-sdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- XamoomSDK\/Classes\/XMMOfflineStorageTagModule.h\n+++ XamoomSDK\/Classes\/XMMOfflineStorageTagModule.h\n@@ -12,16 +12,17 @@\n \n @interface XMMOfflineStorageTagModule : NSObject\n \n-@property (strong, nonatomic) XMMEnduserApi *api;\n-@property (strong, nonatomic) XMMOfflineStorageManager *storeManager;\n-@property (strong, nonatomic, readonly) NSMutableArray *offlineTags;\n+@property (strong, nonatomic, nonnull) XMMEnduserApi *api;\n+@property (strong, nonatomic, nonnull) XMMOfflineStorageManager *storeManager;\n+@property (strong, nonatomic, nonnull, readonly) NSMutableArray *offlineTags;\n \n-- (instancetype)initWithApi:(XMMEnduserApi * __nonnull)api;\n+- (nonnull instancetype)initWithApi:(nonnull XMMEnduserApi *)api;\n \n-- (void)downloadAndSaveWithTags:(NSArray *)tags completion:(void (^)(NSArray *spots, NSError *error))completion;\n+- (void)downloadAndSaveWithTags:(nonnull NSArray *)tags\n+ completion:(nullable void (^)( NSArray * _Null_unspecified spots , NSError * _Null_unspecified error))completion;\n \n-- (NSError *)deleteSavedDataWithTags:(NSArray *)tags;\n+- (nullable NSError *)deleteSavedDataWithTags:(nonnull NSArray *)tags;\n \n-- (void)addOfflineTag:(NSString *)tag;\n+- (void)addOfflineTag:(nullable NSString *)tag;\n \n @end\n"} {"commit":"a373f6d7d38a62eddff5878efbc808a98665c982","subject":"Add a 'conj()' test for sparse matrix\/sparse matrix additions ('smatsmatadd')","message":"Add a 'conj()' test for sparse matrix\/sparse matrix additions ('smatsmatadd')\n","repos":"byzhang\/blaze,byzhang\/blaze,byzhang\/blaze","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blazetest\/blazetest\/mathtest\/smatsmatadd\/OperationTest.h\n+++ blazetest\/blazetest\/mathtest\/smatsmatadd\/OperationTest.h\n@@ -169,6 +169,7 @@\n template< typename T > void testScaledOperation ( T scalar );\n void testTransposeOperation();\n void testAbsOperation ();\n+ void testConjOperation ();\n void testEvalOperation ();\n void testSerialOperation ();\n void testSubmatrixOperation();\n@@ -346,6 +347,7 @@\n testScaledOperation( 2.0 );\n testTransposeOperation();\n testAbsOperation();\n+ testConjOperation();\n testEvalOperation();\n testSerialOperation();\n testSubmatrixOperation();\n@@ -3619,6 +3621,414 @@\n sres_ -= abs( eval( olhs_ ) + eval( orhs_ ) );\n osres_ -= abs( eval( olhs_ ) + eval( orhs_ ) );\n refres_ -= abs( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+ }\n+#endif\n+}\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*!\\brief Testing the conj sparse matrix\/sparse matrix addition.\n+\/\/\n+\/\/ \\return void\n+\/\/ \\exception std::runtime_error Addition error detected.\n+\/\/\n+\/\/ This function tests the conj matrix addition with plain assignment, addition assignment,\n+\/\/ and subtraction assignment. In case any error resulting from the addition or the subsequent\n+\/\/ assignment is detected, a \\a std::runtime_error exception is thrown.\n+*\/\n+template< typename MT1 \/\/ Type of the left-hand side sparse matrix\n+ , typename MT2 > \/\/ Type of the right-hand side sparse matrix\n+void OperationTest<MT1,MT2>::testConjOperation()\n+{\n+#if BLAZETEST_MATHTEST_TEST_CONJ_OPERATION\n+ if( BLAZETEST_MATHTEST_TEST_CONJ_OPERATION > 1 )\n+ {\n+ \/\/=====================================================================================\n+ \/\/ Conj addition\n+ \/\/=====================================================================================\n+\n+ \/\/ Conj addition with the given matrices\n+ {\n+ test_ = \"Conj addition with the given matrices\";\n+ error_ = \"Failed addition operation\";\n+\n+ try {\n+ initResults();\n+ dres_ = conj( lhs_ + rhs_ );\n+ odres_ = conj( lhs_ + rhs_ );\n+ sres_ = conj( lhs_ + rhs_ );\n+ osres_ = conj( lhs_ + rhs_ );\n+ refres_ = conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( lhs_ + orhs_ );\n+ odres_ = conj( lhs_ + orhs_ );\n+ sres_ = conj( lhs_ + orhs_ );\n+ osres_ = conj( lhs_ + orhs_ );\n+ refres_ = conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( olhs_ + rhs_ );\n+ odres_ = conj( olhs_ + rhs_ );\n+ sres_ = conj( olhs_ + rhs_ );\n+ osres_ = conj( olhs_ + rhs_ );\n+ refres_ = conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( olhs_ + orhs_ );\n+ odres_ = conj( olhs_ + orhs_ );\n+ sres_ = conj( olhs_ + orhs_ );\n+ osres_ = conj( olhs_ + orhs_ );\n+ refres_ = conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+\n+ \/\/ Conj addition with evaluated matrices\n+ {\n+ test_ = \"Conj addition with evaluated matrices\";\n+ error_ = \"Failed addition operation\";\n+\n+ try {\n+ initResults();\n+ dres_ = conj( eval( lhs_ ) + eval( rhs_ ) );\n+ odres_ = conj( eval( lhs_ ) + eval( rhs_ ) );\n+ sres_ = conj( eval( lhs_ ) + eval( rhs_ ) );\n+ osres_ = conj( eval( lhs_ ) + eval( rhs_ ) );\n+ refres_ = conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( eval( lhs_ ) + eval( orhs_ ) );\n+ odres_ = conj( eval( lhs_ ) + eval( orhs_ ) );\n+ sres_ = conj( eval( lhs_ ) + eval( orhs_ ) );\n+ osres_ = conj( eval( lhs_ ) + eval( orhs_ ) );\n+ refres_ = conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( eval( olhs_ ) + eval( rhs_ ) );\n+ odres_ = conj( eval( olhs_ ) + eval( rhs_ ) );\n+ sres_ = conj( eval( olhs_ ) + eval( rhs_ ) );\n+ osres_ = conj( eval( olhs_ ) + eval( rhs_ ) );\n+ refres_ = conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ = conj( eval( olhs_ ) + eval( orhs_ ) );\n+ odres_ = conj( eval( olhs_ ) + eval( orhs_ ) );\n+ sres_ = conj( eval( olhs_ ) + eval( orhs_ ) );\n+ osres_ = conj( eval( olhs_ ) + eval( orhs_ ) );\n+ refres_ = conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+\n+\n+ \/\/=====================================================================================\n+ \/\/ Conj addition with addition assignment\n+ \/\/=====================================================================================\n+\n+ \/\/ Conj addition with addition assignment with the given matrices\n+ {\n+ test_ = \"Conj addition with addition assignment with the given matrices\";\n+ error_ = \"Failed addition assignment operation\";\n+\n+ try {\n+ initResults();\n+ dres_ += conj( lhs_ + rhs_ );\n+ odres_ += conj( lhs_ + rhs_ );\n+ sres_ += conj( lhs_ + rhs_ );\n+ osres_ += conj( lhs_ + rhs_ );\n+ refres_ += conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( lhs_ + orhs_ );\n+ odres_ += conj( lhs_ + orhs_ );\n+ sres_ += conj( lhs_ + orhs_ );\n+ osres_ += conj( lhs_ + orhs_ );\n+ refres_ += conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( olhs_ + rhs_ );\n+ odres_ += conj( olhs_ + rhs_ );\n+ sres_ += conj( olhs_ + rhs_ );\n+ osres_ += conj( olhs_ + rhs_ );\n+ refres_ += conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( olhs_ + orhs_ );\n+ odres_ += conj( olhs_ + orhs_ );\n+ sres_ += conj( olhs_ + orhs_ );\n+ osres_ += conj( olhs_ + orhs_ );\n+ refres_ += conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+\n+ \/\/ Conj addition with addition assignment with evaluated matrices\n+ {\n+ test_ = \"Conj addition with addition assignment with evaluated matrices\";\n+ error_ = \"Failed addition assignment operation\";\n+\n+ try {\n+ initResults();\n+ dres_ += conj( eval( lhs_ ) + eval( rhs_ ) );\n+ odres_ += conj( eval( lhs_ ) + eval( rhs_ ) );\n+ sres_ += conj( eval( lhs_ ) + eval( rhs_ ) );\n+ osres_ += conj( eval( lhs_ ) + eval( rhs_ ) );\n+ refres_ += conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( eval( lhs_ ) + eval( orhs_ ) );\n+ odres_ += conj( eval( lhs_ ) + eval( orhs_ ) );\n+ sres_ += conj( eval( lhs_ ) + eval( orhs_ ) );\n+ osres_ += conj( eval( lhs_ ) + eval( orhs_ ) );\n+ refres_ += conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( eval( olhs_ ) + eval( rhs_ ) );\n+ odres_ += conj( eval( olhs_ ) + eval( rhs_ ) );\n+ sres_ += conj( eval( olhs_ ) + eval( rhs_ ) );\n+ osres_ += conj( eval( olhs_ ) + eval( rhs_ ) );\n+ refres_ += conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ += conj( eval( olhs_ ) + eval( orhs_ ) );\n+ odres_ += conj( eval( olhs_ ) + eval( orhs_ ) );\n+ sres_ += conj( eval( olhs_ ) + eval( orhs_ ) );\n+ osres_ += conj( eval( olhs_ ) + eval( orhs_ ) );\n+ refres_ += conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+\n+\n+ \/\/=====================================================================================\n+ \/\/ Conj addition with subtraction assignment\n+ \/\/=====================================================================================\n+\n+ \/\/ Conj addition with subtraction assignment with the given matrices\n+ {\n+ test_ = \"Conj addition with subtraction assignment with the given matrices\";\n+ error_ = \"Failed subtraction assignment operation\";\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( lhs_ + rhs_ );\n+ odres_ -= conj( lhs_ + rhs_ );\n+ sres_ -= conj( lhs_ + rhs_ );\n+ osres_ -= conj( lhs_ + rhs_ );\n+ refres_ -= conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( lhs_ + orhs_ );\n+ odres_ -= conj( lhs_ + orhs_ );\n+ sres_ -= conj( lhs_ + orhs_ );\n+ osres_ -= conj( lhs_ + orhs_ );\n+ refres_ -= conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( olhs_ + rhs_ );\n+ odres_ -= conj( olhs_ + rhs_ );\n+ sres_ -= conj( olhs_ + rhs_ );\n+ osres_ -= conj( olhs_ + rhs_ );\n+ refres_ -= conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( olhs_ + orhs_ );\n+ odres_ -= conj( olhs_ + orhs_ );\n+ sres_ -= conj( olhs_ + orhs_ );\n+ osres_ -= conj( olhs_ + orhs_ );\n+ refres_ -= conj( reflhs_ + refrhs_ );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,OMT2>( ex );\n+ }\n+\n+ checkResults<OMT1,OMT2>();\n+ }\n+\n+ \/\/ Conj addition with subtraction assignment with evaluated matrices\n+ {\n+ test_ = \"Conj addition with subtraction assignment with evaluated matrices\";\n+ error_ = \"Failed subtraction assignment operation\";\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( eval( lhs_ ) + eval( rhs_ ) );\n+ odres_ -= conj( eval( lhs_ ) + eval( rhs_ ) );\n+ sres_ -= conj( eval( lhs_ ) + eval( rhs_ ) );\n+ osres_ -= conj( eval( lhs_ ) + eval( rhs_ ) );\n+ refres_ -= conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,MT2>( ex );\n+ }\n+\n+ checkResults<MT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( eval( lhs_ ) + eval( orhs_ ) );\n+ odres_ -= conj( eval( lhs_ ) + eval( orhs_ ) );\n+ sres_ -= conj( eval( lhs_ ) + eval( orhs_ ) );\n+ osres_ -= conj( eval( lhs_ ) + eval( orhs_ ) );\n+ refres_ -= conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<MT1,OMT2>( ex );\n+ }\n+\n+ checkResults<MT1,OMT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( eval( olhs_ ) + eval( rhs_ ) );\n+ odres_ -= conj( eval( olhs_ ) + eval( rhs_ ) );\n+ sres_ -= conj( eval( olhs_ ) + eval( rhs_ ) );\n+ osres_ -= conj( eval( olhs_ ) + eval( rhs_ ) );\n+ refres_ -= conj( eval( reflhs_ ) + eval( refrhs_ ) );\n+ }\n+ catch( std::exception& ex ) {\n+ convertException<OMT1,MT2>( ex );\n+ }\n+\n+ checkResults<OMT1,MT2>();\n+\n+ try {\n+ initResults();\n+ dres_ -= conj( eval( olhs_ ) + eval( orhs_ ) );\n+ odres_ -= conj( eval( olhs_ ) + eval( orhs_ ) );\n+ sres_ -= conj( eval( olhs_ ) + eval( orhs_ ) );\n+ osres_ -= conj( eval( olhs_ ) + eval( orhs_ ) );\n+ refres_ -= conj( eval( reflhs_ ) + eval( refrhs_ ) );\n }\n catch( std::exception& ex ) {\n convertException<OMT1,OMT2>( ex );\n"} {"commit":"90ebedcf1f2fc3d4d25bb04741507461bf254b89","subject":"The --verify option should identify the screen driver. (dm)","message":"The --verify option should identify the screen driver. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@3096 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/config.c\n+++ Programs\/config.c\n@@ -2169,6 +2169,7 @@\n \n if (opt_version) {\n LogPrint(LOG_INFO, \"%s\", BRLTTY_COPYRIGHT);\n+ identifyScreenDrivers(1);\n \n #ifdef ENABLE_API\n api_identify(1);\n@@ -2180,7 +2181,6 @@\n identifySpeechDrivers(1);\n #endif \/* ENABLE_SPEECH_SUPPORT *\/\n \n- identifyScreenDrivers(1);\n exit(0);\n }\n \n@@ -2373,10 +2373,12 @@\n *\/\n \n \/* initialize screen driver *\/\n+ atexit(exitScreen);\n+ openSpecialScreens();\n screenDrivers = splitString(opt_screenDriver? opt_screenDriver: \"\", ',', NULL);\n- if (!opt_verify) {\n- atexit(exitScreen);\n- openSpecialScreens();\n+ if (opt_verify) {\n+ if (activateScreenDriver(1)) deactivateScreenDriver();\n+ } else {\n tryScreenDriver();\n }\n \n"} {"commit":"b8728ce523cbc7c44c6bbd04d8cb8af8d46a5a9b","subject":"Don't crash if the key table isn't set. (dm)","message":"Don't crash if the key table isn't set. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@7192 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/config.c\n+++ Programs\/config.c\n@@ -692,12 +692,15 @@\n \n static KeyTableState\n handleKeyboardKeyEvent (unsigned char set, unsigned char key, int press) {\n- if (scr.unreadable) {\n+ if (keyboardKeyTable) {\n+ if (!scr.unreadable) {\n+ return processKeyEvent(keyboardKeyTable, getCurrentCommandContext(), set, key, press);\n+ }\n+\n resetKeyTable(keyboardKeyTable);\n- return KTS_UNBOUND;\n- }\n-\n- return processKeyEvent(keyboardKeyTable, getCurrentCommandContext(), set, key, press);\n+ }\n+\n+ return KTS_UNBOUND;\n }\n \n static void scheduleKeyboardMonitor (int interval);\n"} {"commit":"8f6ea5bb0b9183adace2377ffe7fe28346482224","subject":"Add a bit more error checking to the construction of the preferences menu. (dm)","message":"Add a bit more error checking to the construction of the preferences menu. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@5592 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/config.c\n+++ Programs\/config.c\n@@ -2016,7 +2016,7 @@\n }\n \n {\n-#define STATUS_FIELD_ITEM(number) newStatusFieldItem(menu, number, strtext(\"Status Field \") #number, testStatusField##number, changedStatusField##number)\n+#define STATUS_FIELD_ITEM(number) if (!newStatusFieldItem(menu, number, strtext(\"Status Field \") #number, testStatusField##number, changedStatusField##number)) goto noItem\n STATUS_FIELD_ITEM(1);\n STATUS_FIELD_ITEM(2);\n STATUS_FIELD_ITEM(3);\n"} {"commit":"fdd7a1dfcea389df558673dc81b2bffd9902c9eb","subject":"Give better names to serialTestLines()'s arguments. (dm)","message":"Give better names to serialTestLines()'s arguments. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@1281 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/serial.c\n+++ Programs\/serial.c\n@@ -934,10 +934,10 @@\n }\n \n static int\n-serialTestLines (SerialDevice *serial, SerialLines set, SerialLines clear) {\n+serialTestLines (SerialDevice *serial, SerialLines high, SerialLines low) {\n SerialLines lines;\n if (serialGetLines(serial, &lines))\n- if (((lines & set) == set) && ((~lines & clear) == clear))\n+ if (((lines & high) == high) && ((~lines & low) == low))\n return 1;\n return 0;\n }\n"} {"commit":"0309b092417c47a46a63c2bbfe1b283ca0e395de","subject":"[C] Add support for loading human readable params for the driver config from environment. Issue #603.","message":"[C] Add support for loading human readable params for the driver config from environment. Issue #603.\n","repos":"mikeb01\/Aeron,EvilMcJerkface\/Aeron,mikeb01\/Aeron,real-logic\/Aeron,real-logic\/Aeron,galderz\/Aeron,real-logic\/Aeron,galderz\/Aeron,EvilMcJerkface\/Aeron,real-logic\/Aeron,EvilMcJerkface\/Aeron,EvilMcJerkface\/Aeron,galderz\/Aeron,galderz\/Aeron,mikeb01\/Aeron,mikeb01\/Aeron","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- aeron-driver\/src\/main\/c\/aeron_driver_context.c\n+++ aeron-driver\/src\/main\/c\/aeron_driver_context.c\n@@ -39,6 +39,7 @@\n \n #include \"util\/aeron_error.h\"\n #include \"protocol\/aeron_udp_protocol.h\"\n+#include \"util\/aeron_prop_util.h\"\n #include \"util\/aeron_fileutil.h\"\n #include \"aeron_driver_context.h\"\n #include \"aeron_alloc.h\"\n@@ -135,6 +136,52 @@\n result = value;\n result = result > max ? max : result;\n result = result < min ? min : result;\n+ }\n+\n+ return result;\n+}\n+\n+uint64_t aeron_config_parse_size64(const char *name, const char *str, uint64_t def, uint64_t min, uint64_t max)\n+{\n+ uint64_t result = def;\n+\n+ if (NULL != str)\n+ {\n+ uint64_t value = 0;\n+\n+ if (-1 == aeron_parse_size64(str, &value))\n+ {\n+ printf(\"WARNING: %s=%s is invalid, using default\\n\", name, str);\n+ }\n+ else\n+ {\n+ result = value;\n+ result = result > max ? max : result;\n+ result = result < min ? min : result;\n+ }\n+ }\n+\n+ return result;\n+}\n+\n+uint64_t aeron_config_parse_duration_ns(const char *name, const char *str, uint64_t def, uint64_t min, uint64_t max)\n+{\n+ uint64_t result = def;\n+\n+ if (NULL != str)\n+ {\n+ uint64_t value = 0;\n+\n+ if (-1 == aeron_parse_duration_ns(str, &value))\n+ {\n+ printf(\"WARNING: %s=%s is invalid, using default\\n\", name, str);\n+ }\n+ else\n+ {\n+ result = value;\n+ result = result > max ? max : result;\n+ result = result < min ? min : result;\n+ }\n }\n \n return result;\n@@ -331,19 +378,22 @@\n getenv(AERON_SPIES_SIMULATE_CONNECTION_ENV_VAR),\n _context->spies_simulate_connection);\n \n- _context->to_driver_buffer_length = aeron_config_parse_uint64(\n+ _context->to_driver_buffer_length = aeron_config_parse_size64(\n+ AERON_TO_CONDUCTOR_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_TO_CONDUCTOR_BUFFER_LENGTH_ENV_VAR),\n _context->to_driver_buffer_length,\n 1024 + AERON_RB_TRAILER_LENGTH,\n INT32_MAX);\n \n- _context->to_clients_buffer_length = aeron_config_parse_uint64(\n+ _context->to_clients_buffer_length = aeron_config_parse_size64(\n+ AERON_TO_CLIENTS_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_TO_CLIENTS_BUFFER_LENGTH_ENV_VAR),\n _context->to_clients_buffer_length,\n 1024 + AERON_BROADCAST_BUFFER_TRAILER_LENGTH,\n INT32_MAX);\n \n- _context->counters_values_buffer_length = aeron_config_parse_uint64(\n+ _context->counters_values_buffer_length = aeron_config_parse_size64(\n+ AERON_COUNTERS_VALUES_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_COUNTERS_VALUES_BUFFER_LENGTH_ENV_VAR),\n _context->counters_values_buffer_length,\n 1024,\n@@ -353,67 +403,78 @@\n _context->counters_values_buffer_length *\n (AERON_COUNTERS_MANAGER_METADATA_LENGTH \/ AERON_COUNTERS_MANAGER_VALUE_LENGTH);\n \n- _context->error_buffer_length = aeron_config_parse_uint64(\n+ _context->error_buffer_length = aeron_config_parse_size64(\n+ AERON_ERROR_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_ERROR_BUFFER_LENGTH_ENV_VAR),\n _context->error_buffer_length,\n 1024,\n INT32_MAX);\n \n- _context->client_liveness_timeout_ns = aeron_config_parse_uint64(\n+ _context->client_liveness_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_CLIENT_LIVENESS_TIMEOUT_ENV_VAR,\n getenv(AERON_CLIENT_LIVENESS_TIMEOUT_ENV_VAR),\n _context->client_liveness_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->publication_linger_timeout_ns = aeron_config_parse_uint64(\n+ _context->publication_linger_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_PUBLICATION_LINGER_TIMEOUT_ENV_VAR,\n getenv(AERON_PUBLICATION_LINGER_TIMEOUT_ENV_VAR),\n _context->publication_linger_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->term_buffer_length = aeron_config_parse_uint64(\n+ _context->term_buffer_length = aeron_config_parse_size64(\n+ AERON_TERM_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_TERM_BUFFER_LENGTH_ENV_VAR),\n _context->term_buffer_length,\n 1024,\n INT32_MAX);\n \n- _context->ipc_term_buffer_length = aeron_config_parse_uint64(\n+ _context->ipc_term_buffer_length = aeron_config_parse_size64(\n+ AERON_IPC_TERM_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_IPC_TERM_BUFFER_LENGTH_ENV_VAR),\n _context->ipc_term_buffer_length,\n 1024,\n INT32_MAX);\n \n- _context->mtu_length = aeron_config_parse_uint64(\n+ _context->mtu_length = aeron_config_parse_size64(\n+ AERON_MTU_LENGTH_ENV_VAR,\n getenv(AERON_MTU_LENGTH_ENV_VAR),\n _context->mtu_length,\n AERON_DATA_HEADER_LENGTH,\n AERON_MAX_UDP_PAYLOAD_LENGTH);\n \n- _context->ipc_mtu_length = aeron_config_parse_uint64(\n+ _context->ipc_mtu_length = aeron_config_parse_size64(\n+ AERON_IPC_MTU_LENGTH_ENV_VAR,\n getenv(AERON_IPC_MTU_LENGTH_ENV_VAR),\n _context->ipc_mtu_length,\n AERON_DATA_HEADER_LENGTH,\n AERON_MAX_UDP_PAYLOAD_LENGTH);\n \n- _context->ipc_publication_window_length = aeron_config_parse_uint64(\n+ _context->ipc_publication_window_length = aeron_config_parse_size64(\n+ AERON_IPC_PUBLICATION_TERM_WINDOW_LENGTH_ENV_VAR,\n getenv(AERON_IPC_PUBLICATION_TERM_WINDOW_LENGTH_ENV_VAR),\n _context->ipc_publication_window_length,\n 0,\n INT32_MAX);\n \n- _context->publication_window_length = aeron_config_parse_uint64(\n+ _context->publication_window_length = aeron_config_parse_size64(\n+ AERON_PUBLICATION_TERM_WINDOW_LENGTH_ENV_VAR,\n getenv(AERON_PUBLICATION_TERM_WINDOW_LENGTH_ENV_VAR),\n _context->publication_window_length,\n 0,\n INT32_MAX);\n \n- _context->socket_rcvbuf = aeron_config_parse_uint64(\n+ _context->socket_rcvbuf = aeron_config_parse_size64(\n+ AERON_SOCKET_SO_RCVBUF_ENV_VAR,\n getenv(AERON_SOCKET_SO_RCVBUF_ENV_VAR),\n _context->socket_rcvbuf,\n 0,\n INT32_MAX);\n \n- _context->socket_sndbuf = aeron_config_parse_uint64(\n+ _context->socket_sndbuf = aeron_config_parse_size64(\n+ AERON_SOCKET_SO_SNDBUF_ENV_VAR,\n getenv(AERON_SOCKET_SO_SNDBUF_ENV_VAR),\n _context->socket_sndbuf,\n 0,\n@@ -431,55 +492,64 @@\n 1,\n INT32_MAX);\n \n- _context->status_message_timeout_ns = aeron_config_parse_uint64(\n+ _context->status_message_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_RCV_STATUS_MESSAGE_TIMEOUT_ENV_VAR,\n getenv(AERON_RCV_STATUS_MESSAGE_TIMEOUT_ENV_VAR),\n _context->status_message_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->image_liveness_timeout_ns = aeron_config_parse_uint64(\n+ _context->image_liveness_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_IMAGE_LIVENESS_TIMEOUT_ENV_VAR,\n getenv(AERON_IMAGE_LIVENESS_TIMEOUT_ENV_VAR),\n _context->image_liveness_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->initial_window_length = aeron_config_parse_uint64(\n+ _context->initial_window_length = aeron_config_parse_size64(\n+ AERON_RCV_INITIAL_WINDOW_LENGTH_ENV_VAR,\n getenv(AERON_RCV_INITIAL_WINDOW_LENGTH_ENV_VAR),\n _context->initial_window_length,\n 256,\n INT32_MAX);\n \n- _context->loss_report_length = aeron_config_parse_uint64(\n+ _context->loss_report_length = aeron_config_parse_size64(\n+ AERON_LOSS_REPORT_BUFFER_LENGTH_ENV_VAR,\n getenv(AERON_LOSS_REPORT_BUFFER_LENGTH_ENV_VAR),\n _context->loss_report_length,\n 1024,\n INT32_MAX);\n \n- _context->file_page_size = aeron_config_parse_uint64(\n+ _context->file_page_size = aeron_config_parse_size64(\n+ AERON_FILE_PAGE_SIZE_ENV_VAR,\n getenv(AERON_FILE_PAGE_SIZE_ENV_VAR),\n _context->file_page_size,\n 4 * 1024,\n INT32_MAX);\n \n- _context->publication_unblock_timeout_ns = aeron_config_parse_uint64(\n+ _context->publication_unblock_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_PUBLICATION_UNBLOCK_TIMEOUT_ENV_VAR,\n getenv(AERON_PUBLICATION_UNBLOCK_TIMEOUT_ENV_VAR),\n _context->publication_unblock_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->publication_connection_timeout_ns = aeron_config_parse_uint64(\n+ _context->publication_connection_timeout_ns = aeron_config_parse_duration_ns(\n+ AERON_PUBLICATION_CONNECTION_TIMEOUT_ENV_VAR,\n getenv(AERON_PUBLICATION_CONNECTION_TIMEOUT_ENV_VAR),\n _context->publication_connection_timeout_ns,\n 1000,\n INT64_MAX);\n \n- _context->timer_interval_ns = aeron_config_parse_uint64(\n+ _context->timer_interval_ns = aeron_config_parse_duration_ns(\n+ AERON_TIMER_INTERVAL_ENV_VAR,\n getenv(AERON_TIMER_INTERVAL_ENV_VAR),\n _context->timer_interval_ns,\n 1000,\n INT64_MAX);\n \n- _context->counter_free_to_reuse_ns = aeron_config_parse_uint64(\n+ _context->counter_free_to_reuse_ns = aeron_config_parse_duration_ns(\n+ AERON_COUNTERS_FREE_TO_REUSE_TIMEOUT_ENV_VAR,\n getenv(AERON_COUNTERS_FREE_TO_REUSE_TIMEOUT_ENV_VAR),\n _context->counter_free_to_reuse_ns,\n 0,\n@@ -641,7 +711,6 @@\n else\n {\n int64_t timestamp = aeron_mpsc_rb_consumer_heartbeat_time_value(&rb);\n-\n int64_t diff = now - timestamp;\n \n snprintf(buffer, sizeof(buffer) - 1, \"INFO: Aeron toDriver consumer heartbeat is %\" PRId64 \" ms old\", diff);\n@@ -665,7 +734,7 @@\n \n if (stat(dirname, &sb) == 0 && S_ISDIR(sb.st_mode))\n {\n- aeron_mapped_file_t cnc_map = {NULL, 0};\n+ aeron_mapped_file_t cnc_map = { NULL, 0 };\n \n snprintf(buffer, sizeof(buffer) - 1, \"INFO: Aeron directory %s exists\", dirname);\n log_func(buffer);\n"} {"commit":"7616020c930636f8a73d52642d10c80f7bb96d47","subject":"Put stronger static asserts in path element types.","message":"Put stronger static asserts in path element types.\n\nThe key was putting the inline implementation of the (templated) base's\nconstructor after all the derived declarations.\n","repos":"Armada651\/OSVR-Core,Armada651\/OSVR-Core,godbyk\/OSVR-Core,feilen\/OSVR-Core,Armada651\/OSVR-Core,d235j\/OSVR-Core,feilen\/OSVR-Core,godbyk\/OSVR-Core,Armada651\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,leemichaelRazer\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,feilen\/OSVR-Core,OSVR\/OSVR-Core,d235j\/OSVR-Core,OSVR\/OSVR-Core,leemichaelRazer\/OSVR-Core,feilen\/OSVR-Core,d235j\/OSVR-Core,feilen\/OSVR-Core,godbyk\/OSVR-Core,Armada651\/OSVR-Core,leemichaelRazer\/OSVR-Core,d235j\/OSVR-Core,leemichaelRazer\/OSVR-Core,leemichaelRazer\/OSVR-Core,d235j\/OSVR-Core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- inc\/osvr\/Common\/PathElementTypes.h\n+++ inc\/osvr\/Common\/PathElementTypes.h\n@@ -40,6 +40,7 @@\n \n \/\/ Library\/third-party includes\n #include <boost\/variant\/variant.hpp>\n+#include <boost\/mpl\/contains.hpp>\n \n \/\/ Standard includes\n #include <string>\n@@ -67,13 +68,10 @@\n \n protected:\n \/\/\/ @brief Protected constructor to force subclassing.\n- ElementBase() {\n- \/\/\/ Partially enforce the Curiously-Recurring Template Pattern\n- \/\/\/ Doesn't prevent inheriting from the wrong base - we have a\n- \/\/\/ static assert in the cpp file for that.\n- static_assert(std::is_base_of<base_type, type>::value,\n- \"ElementBase<T> must be the base of an element \"\n- \"type T (the CRTP)!\");\n+ \/\/\/\n+ \/\/\/ Inline implementation at the bottom of the file contains static\n+ \/\/\/ assertions.\n+ ElementBase();\n };\n \n \/\/\/ @brief The element type created when requesting a path that isn't\n@@ -123,7 +121,6 @@\n \/\/\/ @brief The element type corresponding to a particular sensor of an\n \/\/\/ interface\n class SensorElement : public ElementBase<SensorElement> {\n-\n public:\n SensorElement() = default;\n };\n@@ -161,6 +158,30 @@\n std::string m_source;\n };\n \n+ \/\/\/ This inline implementation MUST remain at the bottom of this file,\n+ \/\/\/ after all full declarations of types to be included in PathElement.\n+ \/\/\/ It consists entirely of compile time checks, so it is effectively\n+ \/\/\/ removed from the code once the conditions are verified.\n+ template <typename Type> inline ElementBase<Type>::ElementBase() {\n+ \/\/\/ Partially enforce the Curiously-Recurring Template Pattern.\n+ \/\/\/ The assertion here is that for some `ElementBase<X>`, there\n+ \/\/\/ exists a `class X : public ElementBase<X> {};`\n+ \/\/\/ Doesn't prevent inheriting from the wrong base (`class X :\n+ \/\/\/ public ElementBase<Y> {};` where there is already a `class Y :\n+ \/\/\/ public ElementBase<Y> {};` - we have a static assert in the .cpp\n+ \/\/\/ file to handle that for the types in the PathElement type list.\n+ static_assert(std::is_base_of<base_type, type>::value,\n+ \"ElementBase<T> must be the base of an element \"\n+ \"type T (the CRTP)!\");\n+\n+ \/\/\/ Enforce that every element type (that gets instantiated) has to\n+ \/\/\/ be holdable by the PathElement variant\n+ static_assert(\n+ boost::mpl::contains<PathElement::types, type>::type::value,\n+ \"Every element type must be a part of the PathElement variant \"\n+ \"type's bounded type list!\");\n+ }\n+\n } \/\/ namespace elements\n \n } \/\/ namespace common\n"} {"commit":"6833c07c32ebf65a7bbb0900eea52a9888573274","subject":"Amend documentation of TraceBufferChunk constructor","message":"Amend documentation of TraceBufferChunk constructor\n","repos":"Chippiewill\/phosphor,Chippiewill\/phosphor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/EventTracer\/trace_buffer.h\n+++ include\/EventTracer\/trace_buffer.h\n@@ -56,7 +56,7 @@\n public:\n \n \/**\n- * Default constructor for a TraceBufferChunk\n+ * Constructor for a TraceBufferChunk\n *\n * @param generation_ Generation number of the TraceBuffer\n * the chunk comes from\n"} {"commit":"0a3c0ea09a7c9b60f6f122369b5d420ed9aa8ba6","subject":"pruned Logic file","message":"pruned Logic file\n","repos":"LWarrens\/Wretched,LWarrens\/Wretched","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/Wretched\/Algorithm\/Logic.h\n+++ include\/Wretched\/Algorithm\/Logic.h\n@@ -1,12 +0,0 @@\n-#pragma once\r\n-#include <string>\r\n-#include \"..\/Entity.h\"\r\n-\r\n-namespace Wretched {\r\n- struct Logic {\r\n- std::string filename;\r\n- Entity *parent;\r\n- struct Manager {\r\n- };\r\n- };\r\n-}"} {"commit":"209e9c43ade3938feab8abcc7978c0e17c79cdc3","subject":"CRIS v32: Adjust arch-v32\/atomic.h for new spinlock\/rwlock infrastructure","message":"CRIS v32: Adjust arch-v32\/atomic.h for new spinlock\/rwlock infrastructure\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-cris\/arch-v32\/atomic.h\n+++ include\/asm-cris\/arch-v32\/atomic.h\n@@ -1,7 +1,7 @@\n #ifndef __ASM_CRIS_ARCH_ATOMIC__\n #define __ASM_CRIS_ARCH_ATOMIC__\n \n-#include <asm\/system.h>\n+#include <linux\/spinlock_types.h>\n \n extern void cris_spin_unlock(void *l, int val);\n extern void cris_spin_lock(void *l);\n@@ -18,15 +18,15 @@\n \n #define cris_atomic_save(addr, flags) \\\n local_irq_save(flags); \\\n- cris_spin_lock((void*)&cris_atomic_locks[HASH_ADDR(addr)].lock);\n+ cris_spin_lock((void *)&cris_atomic_locks[HASH_ADDR(addr)].raw_lock.slock);\n \n #define cris_atomic_restore(addr, flags) \\\n { \\\n spinlock_t *lock = (void*)&cris_atomic_locks[HASH_ADDR(addr)]; \\\n __asm__ volatile (\"move.d %1,%0\" \\\n-\t : \"=m\" (lock->lock) \\\n-\t\t\t : \"r\" (1) \\\n-\t\t\t : \"memory\"); \\\n+\t\t\t: \"=m\" (lock->raw_lock.slock) \\\n+\t\t\t: \"r\" (1) \\\n+\t\t\t: \"memory\"); \\\n local_irq_restore(flags); \\\n }\n \n"} {"commit":"9089cf1a1a37f4b4772fad6cef489e0e139b64ac","subject":"\u53bb\u9664\u591a\u4f59\u7684boost thread\u5934\u6587\u4ef6\u4f9d\u8d56","message":"\u53bb\u9664\u591a\u4f59\u7684boost thread\u5934\u6587\u4ef6\u4f9d\u8d56\n","repos":"frankee\/cetty2,frankee\/cetty2,frankee\/cetty2,frankee\/cetty2,frankee\/cetty2","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/cetty\/logging\/LogMessage.h\n+++ include\/cetty\/logging\/LogMessage.h\n@@ -28,7 +28,6 @@\n # include <strstream>\n #endif\n \n-#include <boost\/thread.hpp>\n #include <boost\/date_time.hpp>\n #include <cetty\/logging\/LogLevel.h>\n #include <cetty\/util\/Process.h>\n"} {"commit":"9371d9a4fd0230669f2b8cbba94e5f7b3cdb8957","subject":"Fix erroneous wrap of compound word.","message":"Fix erroneous wrap of compound word.\n","repos":"sairajat\/dealii,YongYang86\/dealii,danshapero\/dealii,angelrca\/dealii,spco\/dealii,ibkim11\/dealii,maieneuro\/dealii,adamkosik\/dealii,spco\/dealii,danshapero\/dealii,andreamola\/dealii,danshapero\/dealii,kalj\/dealii,shakirbsm\/dealii,maieneuro\/dealii,nicolacavallini\/dealii,angelrca\/dealii,johntfoster\/dealii,pesser\/dealii,angelrca\/dealii,shakirbsm\/dealii,kalj\/dealii,gpitton\/dealii,spco\/dealii,gpitton\/dealii,nicolacavallini\/dealii,spco\/dealii,danshapero\/dealii,danshapero\/dealii,spco\/dealii,Arezou-gh\/dealii,andreamola\/dealii,kalj\/dealii,sairajat\/dealii,JaeryunYim\/dealii,sriharisundar\/dealii,danshapero\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,ibkim11\/dealii,angelrca\/dealii,sriharisundar\/dealii,angelrca\/dealii,naliboff\/dealii,naliboff\/dealii,EGP-CIG-REU\/dealii,nicolacavallini\/dealii,ESeNonFossiIo\/dealii,sriharisundar\/dealii,spco\/dealii,sriharisundar\/dealii,nicolacavallini\/dealii,JaeryunYim\/dealii,ESeNonFossiIo\/dealii,adamkosik\/dealii,johntfoster\/dealii,kalj\/dealii,gpitton\/dealii,jperryhouts\/dealii,EGP-CIG-REU\/dealii,ibkim11\/dealii,YongYang86\/dealii,shakirbsm\/dealii,pesser\/dealii,sriharisundar\/dealii,EGP-CIG-REU\/dealii,andreamola\/dealii,nicolacavallini\/dealii,jperryhouts\/dealii,jperryhouts\/dealii,maieneuro\/dealii,adamkosik\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,EGP-CIG-REU\/dealii,ESeNonFossiIo\/dealii,johntfoster\/dealii,nicolacavallini\/dealii,andreamola\/dealii,JaeryunYim\/dealii,gpitton\/dealii,andreamola\/dealii,ibkim11\/dealii,Arezou-gh\/dealii,adamkosik\/dealii,naliboff\/dealii,sairajat\/dealii,pesser\/dealii,naliboff\/dealii,sriharisundar\/dealii,andreamola\/dealii,naliboff\/dealii,ESeNonFossiIo\/dealii,adamkosik\/dealii,shakirbsm\/dealii,ibkim11\/dealii,jperryhouts\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,Arezou-gh\/dealii,angelrca\/dealii,EGP-CIG-REU\/dealii,jperryhouts\/dealii,maieneuro\/dealii,ibkim11\/dealii,maieneuro\/dealii,johntfoster\/dealii,gpitton\/dealii,YongYang86\/dealii,johntfoster\/dealii,adamkosik\/dealii,Arezou-gh\/dealii,ESeNonFossiIo\/dealii,andreamola\/dealii,kalj\/dealii,jperryhouts\/dealii,YongYang86\/dealii,jperryhouts\/dealii,pesser\/dealii,nicolacavallini\/dealii,JaeryunYim\/dealii,Arezou-gh\/dealii,naliboff\/dealii,ESeNonFossiIo\/dealii,gpitton\/dealii,sriharisundar\/dealii,pesser\/dealii,johntfoster\/dealii,JaeryunYim\/dealii,ESeNonFossiIo\/dealii,maieneuro\/dealii,JaeryunYim\/dealii,JaeryunYim\/dealii,adamkosik\/dealii,spco\/dealii,pesser\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,angelrca\/dealii,YongYang86\/dealii,johntfoster\/dealii,gpitton\/dealii,kalj\/dealii,sairajat\/dealii,sairajat\/dealii,maieneuro\/dealii,naliboff\/dealii,sairajat\/dealii,danshapero\/dealii,pesser\/dealii,YongYang86\/dealii,YongYang86\/dealii,shakirbsm\/dealii,sairajat\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/deal.II\/base\/subscriptor.h\n+++ include\/deal.II\/base\/subscriptor.h\n@@ -177,8 +177,8 @@\n * constant objects also.\n *\n * In multithreaded mode, this counter may be modified by different threads.\n- * We thus have to mark it <tt>volatile<\/tt>. However, this is counter-\n- * productive in non-MT mode since it may pessimize code. So use the macro\n+ * We thus have to mark it <tt>volatile<\/tt>. However, this is\n+ * counter-productive in non-MT mode since it may pessimize code. So use the macro\n * defined in <tt>deal.II\/base\/config.h<\/tt> to selectively add volatility.\n *\/\n mutable DEAL_VOLATILE unsigned int counter;\n"} {"commit":"39123f4c0b4a02b7d94bac4f0348d6ec468b4382","subject":"temporarily add back in the factores that took a unitmapper","message":"temporarily add back in the factores that took a unitmapper\n\nBUG=skia:\nR=fmalita@google.com, fmalita@chromium.org, reed@chromium.org\n\nAuthor: reed@google.com\n\nReview URL: https:\/\/codereview.chromium.org\/292513006\n\ngit-svn-id: e8541e15acce502a64c929015570ad1648e548cd@14859 2bbb7eff-a529-9590-31e7-b0007b416f81\n","repos":"qrealka\/skia-hc,ctiao\/platform-external-skia,ench0\/external_chromium_org_third_party_skia,TeamExodus\/external_skia,Tesla-Redux\/android_external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,shahrzadmn\/skia,chenlian2015\/skia_from_google,TeslaOS\/android_external_skia,MinimalOS\/external_skia,amyvmiwei\/skia,OptiPop\/external_chromium_org_third_party_skia,TeamExodus\/external_skia,timduru\/platform-external-skia,zhaochengw\/platform_external_skia,TeamExodus\/external_skia,ench0\/external_chromium_org_third_party_skia,geekboxzone\/lollipop_external_skia,VRToxin-AOSP\/android_external_skia,DesolationStaging\/android_external_skia,RadonX-ROM\/external_skia,ominux\/skia,YUPlayGodDev\/platform_external_skia,Fusion-Rom\/android_external_skia,aospo\/platform_external_skia,samuelig\/skia,pacerom\/external_skia,vanish87\/skia,Fusion-Rom\/android_external_skia,Pure-Aosp\/android_external_skia,MinimalOS\/android_external_skia,houst0nn\/external_skia,CyanogenMod\/android_external_chromium_org_third_party_skia,mmatyas\/skia,sombree\/android_external_skia,TeamExodus\/external_skia,akiss77\/skia,rubenvb\/skia,vanish87\/skia,CyanogenMod\/android_external_chromium_org_third_party_skia,Khaon\/android_external_skia,VRToxin-AOSP\/android_external_skia,samuelig\/skia,MIPS\/external-chromium_org-third_party-skia,MinimalOS\/android_external_skia,TeslaProject\/external_skia,HalCanary\/skia-hc,fire855\/android_external_skia,w3nd1go\/android_external_skia,nfxosp\/platform_external_skia,codeaurora-unoffical\/platform-external-skia,tmpvar\/skia.cc,VRToxin-AOSP\/android_external_skia,MonkeyZZZZ\/platform_external_skia,samuelig\/skia,TeslaProject\/external_skia,TeamTwisted\/external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,zhaochengw\/platform_external_skia,nfxosp\/platform_external_skia,sudosurootdev\/external_skia,TeamEOS\/external_skia,HalCanary\/skia-hc,tmpvar\/skia.cc,aospo\/platform_external_skia,FusionSP\/external_chromium_org_third_party_skia,AOSP-YU\/platform_external_skia,noselhq\/skia,nfxosp\/platform_external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,HealthyHoney\/temasek_SKIA,mozilla-b2g\/external_skia,TeamTwisted\/external_skia,boulzordev\/android_external_skia,fire855\/android_external_skia,Omegaphora\/external_chromium_org_third_party_skia,temasek\/android_external_skia,OneRom\/external_skia,OptiPop\/external_skia,VentureROM-L\/android_external_skia,vvuk\/skia,OptiPop\/external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,TeamEOS\/external_chromium_org_third_party_skia,google\/skia,mydongistiny\/external_chromium_org_third_party_skia,VRToxin-AOSP\/android_external_skia,HalCanary\/skia-hc,ctiao\/platform-external-skia,Infusion-OS\/android_external_skia,Khaon\/android_external_skia,TeamTwisted\/external_skia,MonkeyZZZZ\/platform_external_skia,DiamondLovesYou\/skia-sys,byterom\/android_external_skia,jtg-gg\/skia,spezi77\/android_external_skia,HalCanary\/skia-hc,geekboxzone\/mmallow_external_skia,akiss77\/skia,geekboxzone\/mmallow_external_skia,AOSPA-L\/android_external_skia,mydongistiny\/android_external_skia,BrokenROM\/external_skia,NamelessRom\/android_external_skia,rubenvb\/skia,Omegaphora\/external_skia,TeamEOS\/external_chromium_org_third_party_skia,InfinitiveOS\/external_skia,AndroidOpenDevelopment\/android_external_skia,AOSPB\/external_skia,HealthyHoney\/temasek_SKIA,vvuk\/skia,scroggo\/skia,larsbergstrom\/skia,TeamExodus\/external_skia,w3nd1go\/android_external_skia,Tesla-Redux\/android_external_skia,AOSPU\/external_chromium_org_third_party_skia,NamelessRom\/android_external_skia,Jichao\/skia,Android-AOSP\/external_skia,VentureROM-L\/android_external_skia,invisiblek\/android_external_skia,F-AOSP\/platform_external_skia,houst0nn\/external_skia,F-AOSP\/platform_external_skia,Samsung\/skia,Igalia\/skia,byterom\/android_external_skia,PAC-ROM\/android_external_skia,AOSPA-L\/android_external_skia,MinimalOS\/external_skia,todotodoo\/skia,Khaon\/android_external_skia,nox\/skia,geekboxzone\/lollipop_external_skia,rubenvb\/skia,pcwalton\/skia,zhaochengw\/platform_external_skia,Euphoria-OS-Legacy\/android_external_skia,nvoron23\/skia,fire855\/android_external_skia,MinimalOS\/android_external_skia,GladeRom\/android_external_skia,sudosurootdev\/external_skia,chenlian2015\/skia_from_google,mmatyas\/skia,nvoron23\/skia,Tesla-Redux\/android_external_skia,GladeRom\/android_external_skia,shahrzadmn\/skia,google\/skia,MIPS\/external-chromium_org-third_party-skia,fire855\/android_external_skia,YUPlayGodDev\/platform_external_skia,MinimalOS-AOSP\/platform_external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,Omegaphora\/external_chromium_org_third_party_skia,Plain-Andy\/android_platform_external_skia,android-ia\/platform_external_skia,Plain-Andy\/android_platform_external_skia,noselhq\/skia,spezi77\/android_external_skia,Asteroid-Project\/android_external_skia,boulzordev\/android_external_skia,sudosurootdev\/external_skia,PAC-ROM\/android_external_skia,Samsung\/skia,Tesla-Redux\/android_external_skia,Asteroid-Project\/android_external_skia,RadonX-ROM\/external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,MinimalOS\/external_skia,mydongistiny\/android_external_skia,w3nd1go\/android_external_skia,xzzz9097\/android_external_skia,vanish87\/skia,ominux\/skia,nvoron23\/skia,pacerom\/external_skia,Hikari-no-Tenshi\/android_external_skia,Pure-Aosp\/android_external_skia,pcwalton\/skia,fire855\/android_external_skia,HalCanary\/skia-hc,MarshedOut\/android_external_skia,Purity-Lollipop\/platform_external_skia,Omegaphora\/external_chromium_org_third_party_skia,AndroidOpenDevelopment\/android_external_skia,InfinitiveOS\/external_skia,mmatyas\/skia,Omegaphora\/external_chromium_org_third_party_skia,android-ia\/platform_external_chromium_org_third_party_skia,rubenvb\/skia,DiamondLovesYou\/skia-sys,nox\/skia,nfxosp\/platform_external_skia,TeamEOS\/external_chromium_org_third_party_skia,Hybrid-Rom\/external_skia,samuelig\/skia,xzzz9097\/android_external_skia,wildermason\/external_skia,suyouxin\/android_external_skia,sombree\/android_external_skia,AOSPB\/external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,xzzz9097\/android_external_skia,MinimalOS\/external_chromium_org_third_party_skia,MIPS\/external-chromium_org-third_party-skia,invisiblek\/android_external_skia,TeamEOS\/external_skia,NamelessRom\/android_external_skia,Tesla-Redux\/android_external_skia,jtg-gg\/skia,w3nd1go\/android_external_skia,pcwalton\/skia,aosp-mirror\/platform_external_skia,w3nd1go\/android_external_skia,mozilla-b2g\/external_skia,tmpvar\/skia.cc,pacerom\/external_skia,mmatyas\/skia,vvuk\/skia,AsteroidOS\/android_external_skia,jtg-gg\/skia,android-ia\/platform_external_chromium_org_third_party_skia,todotodoo\/skia,tmpvar\/skia.cc,nox\/skia,wildermason\/external_skia,AsteroidOS\/android_external_skia,MinimalOS\/external_skia,AsteroidOS\/android_external_skia,wildermason\/external_skia,ench0\/external_skia,aosp-mirror\/platform_external_skia,pacerom\/external_skia,pcwalton\/skia,byterom\/android_external_skia,ctiao\/platform-external-skia,tmpvar\/skia.cc,nvoron23\/skia,MinimalOS\/android_external_skia,Euphoria-OS-Legacy\/android_external_skia,Omegaphora\/external_chromium_org_third_party_skia,Hybrid-Rom\/external_skia,android-ia\/platform_external_skia,nox\/skia,aosp-mirror\/platform_external_skia,google\/skia,houst0nn\/external_skia,samuelig\/skia,Asteroid-Project\/android_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,Tesla-Redux\/android_external_skia,aosp-mirror\/platform_external_skia,HealthyHoney\/temasek_SKIA,NamelessRom\/android_external_skia,Asteroid-Project\/android_external_skia,nox\/skia,ench0\/external_skia,todotodoo\/skia,nfxosp\/platform_external_skia,MinimalOS-AOSP\/platform_external_skia,RadonX-ROM\/external_skia,FusionSP\/android_external_skia,TeslaOS\/android_external_skia,invisiblek\/android_external_skia,invisiblek\/android_external_skia,mozilla-b2g\/external_skia,AOSPA-L\/android_external_skia,pcwalton\/skia,vvuk\/skia,ench0\/external_chromium_org_third_party_skia,MarshedOut\/android_external_skia,AOSPA-L\/android_external_skia,geekboxzone\/lollipop_external_skia,byterom\/android_external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,suyouxin\/android_external_skia,vanish87\/skia,todotodoo\/skia,OptiPop\/external_skia,w3nd1go\/android_external_skia,PAC-ROM\/android_external_skia,Pure-Aosp\/android_external_skia,suyouxin\/android_external_skia,geekboxzone\/mmallow_external_skia,PAC-ROM\/android_external_skia,qrealka\/skia-hc,Igalia\/skia,noselhq\/skia,qrealka\/skia-hc,TeslaOS\/android_external_skia,MonkeyZZZZ\/platform_external_skia,zhaochengw\/platform_external_skia,noselhq\/skia,geekboxzone\/mmallow_external_skia,MIPS\/external-chromium_org-third_party-skia,Igalia\/skia,scroggo\/skia,MyAOSP\/external_chromium_org_third_party_skia,AndroidOpenDevelopment\/android_external_skia,FusionSP\/external_chromium_org_third_party_skia,NamelessRom\/android_external_skia,jtg-gg\/skia,AOSPU\/external_chromium_org_third_party_skia,mydongistiny\/external_chromium_org_third_party_skia,temasek\/android_external_skia,Fusion-Rom\/android_external_skia,w3nd1go\/android_external_skia,NamelessRom\/android_external_skia,DesolationStaging\/android_external_skia,Android-AOSP\/external_skia,VRToxin-AOSP\/android_external_skia,F-AOSP\/platform_external_skia,MonkeyZZZZ\/platform_external_skia,google\/skia,AsteroidOS\/android_external_skia,mozilla-b2g\/external_skia,MIPS\/external-chromium_org-third_party-skia,PAC-ROM\/android_external_skia,qrealka\/skia-hc,MinimalOS\/external_chromium_org_third_party_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,vvuk\/skia,TeamTwisted\/external_skia,TeamEOS\/external_chromium_org_third_party_skia,amyvmiwei\/skia,MinimalOS\/android_external_chromium_org_third_party_skia,aosp-mirror\/platform_external_skia,Plain-Andy\/android_platform_external_skia,TeamBliss-LP\/android_external_skia,mmatyas\/skia,TeslaOS\/android_external_skia,scroggo\/skia,vanish87\/skia,android-ia\/platform_external_chromium_org_third_party_skia,pcwalton\/skia,nvoron23\/skia,AOSPB\/external_skia,MyAOSP\/external_chromium_org_third_party_skia,Pure-Aosp\/android_external_skia,Euphoria-OS-Legacy\/android_external_skia,Jichao\/skia,xzzz9097\/android_external_skia,CyanogenMod\/android_external_chromium_org_third_party_skia,invisiblek\/android_external_skia,VRToxin-AOSP\/android_external_skia,sudosurootdev\/external_skia,larsbergstrom\/skia,geekboxzone\/mmallow_external_skia,BrokenROM\/external_skia,google\/skia,MinimalOS\/external_skia,DesolationStaging\/android_external_skia,Purity-Lollipop\/platform_external_skia,temasek\/android_external_skia,MyAOSP\/external_chromium_org_third_party_skia,MyAOSP\/external_chromium_org_third_party_skia,Asteroid-Project\/android_external_skia,VentureROM-L\/android_external_skia,sigysmund\/platform_external_skia,TeamEOS\/external_chromium_org_third_party_skia,akiss77\/skia,MinimalOS-AOSP\/platform_external_skia,MarshedOut\/android_external_skia,Khaon\/android_external_skia,nfxosp\/platform_external_skia,Omegaphora\/external_chromium_org_third_party_skia,qrealka\/skia-hc,Jichao\/skia,Fusion-Rom\/android_external_skia,AOSPB\/external_skia,OptiPop\/external_skia,houst0nn\/external_skia,mydongistiny\/external_chromium_org_third_party_skia,Pure-Aosp\/android_external_skia,chenlian2015\/skia_from_google,amyvmiwei\/skia,Omegaphora\/external_chromium_org_third_party_skia,sigysmund\/platform_external_skia,RadonX-ROM\/external_skia,Infinitive-OS\/platform_external_skia,nvoron23\/skia,ench0\/external_chromium_org_third_party_skia,CyanogenMod\/android_external_chromium_org_third_party_skia,AOSP-YU\/platform_external_skia,Android-AOSP\/external_skia,codeaurora-unoffical\/platform-external-skia,BrokenROM\/external_skia,HalCanary\/skia-hc,MarshedOut\/android_external_skia,Jichao\/skia,Tesla-Redux\/android_external_skia,Infusion-OS\/android_external_skia,sudosurootdev\/external_skia,HealthyHoney\/temasek_SKIA,vanish87\/skia,timduru\/platform-external-skia,Jichao\/skia,nvoron23\/skia,codeaurora-unoffical\/platform-external-skia,TeslaProject\/external_skia,OneRom\/external_skia,Pure-Aosp\/android_external_skia,Fusion-Rom\/android_external_skia,rubenvb\/skia,sigysmund\/platform_external_skia,shahrzadmn\/skia,UBERMALLOW\/external_skia,invisiblek\/android_external_skia,geekboxzone\/lollipop_external_skia,chenlian2015\/skia_from_google,google\/skia,Fusion-Rom\/external_chromium_org_third_party_skia,larsbergstrom\/skia,MinimalOS-AOSP\/platform_external_skia,ench0\/external_chromium_org_third_party_skia,vanish87\/skia,aospo\/platform_external_skia,DesolationStaging\/android_external_skia,RadonX-ROM\/external_skia,ctiao\/platform-external-skia,Plain-Andy\/android_platform_external_skia,AndroidOpenDevelopment\/android_external_skia,xzzz9097\/android_external_skia,wildermason\/external_skia,samuelig\/skia,Samsung\/skia,MinimalOS\/android_external_skia,vanish87\/skia,OptiPop\/external_chromium_org_third_party_skia,RadonX-ROM\/external_skia,fire855\/android_external_skia,PAC-ROM\/android_external_skia,Android-AOSP\/external_skia,BrokenROM\/external_skia,AOSP-YU\/platform_external_skia,AOSP-YU\/platform_external_skia,OptiPop\/external_chromium_org_third_party_skia,VentureROM-L\/android_external_skia,tmpvar\/skia.cc,VentureROM-L\/android_external_skia,nvoron23\/skia,MinimalOS\/external_chromium_org_third_party_skia,mozilla-b2g\/external_skia,ench0\/external_skia,Fusion-Rom\/android_external_skia,rubenvb\/skia,TeamExodus\/external_skia,Omegaphora\/external_skia,AOSPB\/external_skia,google\/skia,geekboxzone\/mmallow_external_skia,geekboxzone\/lollipop_external_skia,DesolationStaging\/android_external_skia,Infinitive-OS\/platform_external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,ench0\/external_chromium_org_third_party_skia,pcwalton\/skia,houst0nn\/external_skia,byterom\/android_external_skia,samuelig\/skia,AOSPU\/external_chromium_org_third_party_skia,TeamBliss-LP\/android_external_skia,Purity-Lollipop\/platform_external_skia,YUPlayGodDev\/platform_external_skia,TeslaProject\/external_skia,akiss77\/skia,Plain-Andy\/android_platform_external_skia,noselhq\/skia,Infusion-OS\/android_external_skia,timduru\/platform-external-skia,TeamExodus\/external_skia,F-AOSP\/platform_external_skia,MyAOSP\/external_chromium_org_third_party_skia,boulzordev\/android_external_skia,temasek\/android_external_skia,VRToxin-AOSP\/android_external_skia,amyvmiwei\/skia,sombree\/android_external_skia,MinimalOS\/external_chromium_org_third_party_skia,Hikari-no-Tenshi\/android_external_skia,TeamExodus\/external_skia,GladeRom\/android_external_skia,AOSPA-L\/android_external_skia,Igalia\/skia,Euphoria-OS-Legacy\/android_external_skia,MyAOSP\/external_chromium_org_third_party_skia,OneRom\/external_skia,OneRom\/external_skia,TeamBliss-LP\/android_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,sombree\/android_external_skia,Asteroid-Project\/android_external_skia,Omegaphora\/external_chromium_org_third_party_skia,F-AOSP\/platform_external_skia,android-ia\/platform_external_chromium_org_third_party_skia,boulzordev\/android_external_skia,PAC-ROM\/android_external_skia,geekboxzone\/mmallow_external_skia,AndroidOpenDevelopment\/android_external_skia,Omegaphora\/external_skia,scroggo\/skia,InfinitiveOS\/external_skia,DiamondLovesYou\/skia-sys,android-ia\/platform_external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,aosp-mirror\/platform_external_skia,nfxosp\/platform_external_skia,rubenvb\/skia,mozilla-b2g\/external_skia,boulzordev\/android_external_skia,Android-AOSP\/external_skia,MinimalOS\/external_chromium_org_third_party_skia,MinimalOS-AOSP\/platform_external_skia,aosp-mirror\/platform_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,mozilla-b2g\/external_skia,Hybrid-Rom\/external_skia,aospo\/platform_external_skia,MinimalOS-AOSP\/platform_external_skia,UBERMALLOW\/external_skia,Fusion-Rom\/android_external_skia,UBERMALLOW\/external_skia,larsbergstrom\/skia,mmatyas\/skia,suyouxin\/android_external_skia,MonkeyZZZZ\/platform_external_skia,mydongistiny\/external_chromium_org_third_party_skia,shahrzadmn\/skia,TeamEOS\/external_skia,MinimalOS-AOSP\/platform_external_skia,OneRom\/external_skia,mmatyas\/skia,CyanogenMod\/android_external_chromium_org_third_party_skia,VRToxin-AOSP\/android_external_skia,invisiblek\/android_external_skia,invisiblek\/android_external_skia,boulzordev\/android_external_skia,larsbergstrom\/skia,pacerom\/external_skia,android-ia\/platform_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,Samsung\/skia,AOSPU\/external_chromium_org_third_party_skia,spezi77\/android_external_skia,RadonX-ROM\/external_skia,android-ia\/platform_external_skia,larsbergstrom\/skia,MIPS\/external-chromium_org-third_party-skia,Khaon\/android_external_skia,sombree\/android_external_skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,aosp-mirror\/platform_external_skia,TeamBliss-LP\/android_external_skia,OptiPop\/external_skia,ominux\/skia,vanish87\/skia,TeamBliss-LP\/android_external_skia,YUPlayGodDev\/platform_external_skia,BrokenROM\/external_skia,UBERMALLOW\/external_skia,Android-AOSP\/external_skia,Infinitive-OS\/platform_external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,aosp-mirror\/platform_external_skia,DARKPOP\/external_chromium_org_third_party_skia,InfinitiveOS\/external_skia,MonkeyZZZZ\/platform_external_skia,MinimalOS\/external_chromium_org_third_party_skia,MarshedOut\/android_external_skia,F-AOSP\/platform_external_skia,TeslaProject\/external_skia,VentureROM-L\/android_external_skia,chenlian2015\/skia_from_google,DiamondLovesYou\/skia-sys,YUPlayGodDev\/platform_external_skia,AOSPB\/external_skia,scroggo\/skia,DARKPOP\/external_chromium_org_third_party_skia,HalCanary\/skia-hc,MarshedOut\/android_external_skia,codeaurora-unoffical\/platform-external-skia,MinimalOS\/external_chromium_org_third_party_skia,VRToxin-AOSP\/android_external_skia,FusionSP\/external_chromium_org_third_party_skia,DARKPOP\/external_chromium_org_third_party_skia,noselhq\/skia,Igalia\/skia,MyAOSP\/external_chromium_org_third_party_skia,amyvmiwei\/skia,Omegaphora\/external_skia,byterom\/android_external_skia,MyAOSP\/external_chromium_org_third_party_skia,mmatyas\/skia,chenlian2015\/skia_from_google,MonkeyZZZZ\/platform_external_skia,android-ia\/platform_external_chromium_org_third_party_skia,TeamBliss-LP\/android_external_skia,nox\/skia,vvuk\/skia,Pure-Aosp\/android_external_skia,MarshedOut\/android_external_skia,TeslaOS\/android_external_skia,temasek\/android_external_skia,Khaon\/android_external_skia,FusionSP\/external_chromium_org_third_party_skia,TeamEOS\/external_skia,FusionSP\/external_chromium_org_third_party_skia,ench0\/external_skia,OneRom\/external_skia,InfinitiveOS\/external_skia,HalCanary\/skia-hc,sigysmund\/platform_external_skia,PAC-ROM\/android_external_skia,qrealka\/skia-hc,OptiPop\/external_chromium_org_third_party_skia,shahrzadmn\/skia,fire855\/android_external_skia,BrokenROM\/external_skia,Jichao\/skia,MinimalOS\/android_external_skia,suyouxin\/android_external_skia,jtg-gg\/skia,ominux\/skia,TeamEOS\/external_skia,ench0\/external_skia,shahrzadmn\/skia,tmpvar\/skia.cc,qrealka\/skia-hc,DesolationStaging\/android_external_skia,AOSP-YU\/platform_external_skia,FusionSP\/android_external_skia,android-ia\/platform_external_chromium_org_third_party_skia,Infusion-OS\/android_external_skia,Hybrid-Rom\/external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,TeslaProject\/external_skia,sombree\/android_external_skia,akiss77\/skia,TeamTwisted\/external_skia,FusionSP\/android_external_skia,TeamTwisted\/external_skia,Infusion-OS\/android_external_skia,geekboxzone\/lollipop_external_skia,timduru\/platform-external-skia,MinimalOS-AOSP\/platform_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,xzzz9097\/android_external_skia,larsbergstrom\/skia,GladeRom\/android_external_skia,byterom\/android_external_skia,Euphoria-OS-Legacy\/android_external_skia,AOSPB\/external_skia,Fusion-Rom\/android_external_skia,Tesla-Redux\/android_external_skia,YUPlayGodDev\/platform_external_skia,AOSP-YU\/platform_external_skia,aospo\/platform_external_skia,Khaon\/android_external_skia,vvuk\/skia,codeaurora-unoffical\/platform-external-skia,MarshedOut\/android_external_skia,pacerom\/external_skia,geekboxzone\/lollipop_external_skia,google\/skia,shahrzadmn\/skia,xzzz9097\/android_external_skia,ctiao\/platform-external-skia,BrokenROM\/external_skia,UBERMALLOW\/external_skia,AndroidOpenDevelopment\/android_external_skia,Khaon\/android_external_skia,larsbergstrom\/skia,mozilla-b2g\/external_skia,AsteroidOS\/android_external_skia,rubenvb\/skia,ominux\/skia,wildermason\/external_skia,aospo\/platform_external_skia,Purity-Lollipop\/platform_external_skia,TeamTwisted\/external_skia,TeamEOS\/external_skia,AOSPA-L\/android_external_skia,MinimalOS\/external_skia,HealthyHoney\/temasek_SKIA,sigysmund\/platform_external_skia,xzzz9097\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,chenlian2015\/skia_from_google,DARKPOP\/external_chromium_org_third_party_skia,OneRom\/external_skia,Euphoria-OS-Legacy\/android_external_skia,mydongistiny\/android_external_skia,MinimalOS\/external_chromium_org_third_party_skia,AsteroidOS\/android_external_skia,MinimalOS\/external_skia,nfxosp\/platform_external_skia,noselhq\/skia,TeslaOS\/android_external_skia,codeaurora-unoffical\/platform-external-skia,scroggo\/skia,Infusion-OS\/android_external_skia,mydongistiny\/external_chromium_org_third_party_skia,zhaochengw\/platform_external_skia,MIPS\/external-chromium_org-third_party-skia,FusionSP\/android_external_skia,MIPS\/external-chromium_org-third_party-skia,amyvmiwei\/skia,sombree\/android_external_skia,ench0\/external_skia,zhaochengw\/platform_external_skia,pacerom\/external_skia,CyanogenMod\/android_external_chromium_org_third_party_skia,SlimSaber\/android_external_skia,jtg-gg\/skia,houst0nn\/external_skia,Samsung\/skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,spezi77\/android_external_skia,w3nd1go\/android_external_skia,NamelessRom\/android_external_skia,DARKPOP\/external_chromium_org_third_party_skia,geekboxzone\/mmallow_external_skia,HalCanary\/skia-hc,larsbergstrom\/skia,MinimalOS\/android_external_skia,akiss77\/skia,todotodoo\/skia,Purity-Lollipop\/platform_external_skia,sigysmund\/platform_external_skia,HealthyHoney\/temasek_SKIA,SlimSaber\/android_external_skia,shahrzadmn\/skia,geekboxzone\/mmallow_external_skia,mydongistiny\/android_external_skia,nox\/skia,Euphoria-OS-Legacy\/android_external_skia,qrealka\/skia-hc,ominux\/skia,YUPlayGodDev\/platform_external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,xin3liang\/platform_external_chromium_org_third_party_skia,MinimalOS\/external_skia,rubenvb\/skia,OneRom\/external_skia,DARKPOP\/external_chromium_org_third_party_skia,android-ia\/platform_external_chromium_org_third_party_skia,todotodoo\/skia,geekboxzone\/lollipop_external_chromium_org_third_party_skia,MonkeyZZZZ\/platform_external_skia,google\/skia,AOSPU\/external_chromium_org_third_party_skia,BrokenROM\/external_skia,SlimSaber\/android_external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,sombree\/android_external_skia,boulzordev\/android_external_skia,timduru\/platform-external-skia,Infinitive-OS\/platform_external_skia,sudosurootdev\/external_skia,OptiPop\/external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,boulzordev\/android_external_skia,Asteroid-Project\/android_external_skia,Omegaphora\/external_skia,HealthyHoney\/temasek_SKIA,tmpvar\/skia.cc,CyanogenMod\/android_external_chromium_org_third_party_skia,TeamEOS\/external_chromium_org_third_party_skia,TeslaOS\/android_external_skia,DesolationStaging\/android_external_skia,ctiao\/platform-external-skia,amyvmiwei\/skia,AOSPA-L\/android_external_skia,timduru\/platform-external-skia,android-ia\/platform_external_skia,ominux\/skia,InfinitiveOS\/external_skia,InfinitiveOS\/external_skia,akiss77\/skia,aosp-mirror\/platform_external_skia,Hybrid-Rom\/external_skia,mmatyas\/skia,TeamEOS\/external_chromium_org_third_party_skia,AOSP-YU\/platform_external_skia,xin3liang\/platform_external_chromium_org_third_party_skia,spezi77\/android_external_skia,aospo\/platform_external_skia,GladeRom\/android_external_skia,Purity-Lollipop\/platform_external_skia,android-ia\/platform_external_skia,OneRom\/external_skia,OptiPop\/external_chromium_org_third_party_skia,sudosurootdev\/external_skia,ominux\/skia,vvuk\/skia,Purity-Lollipop\/platform_external_skia,TeamTwisted\/external_skia,SlimSaber\/android_external_skia,TeamEOS\/external_chromium_org_third_party_skia,todotodoo\/skia,TeamExodus\/external_skia,jtg-gg\/skia,FusionSP\/android_external_skia,android-ia\/platform_external_chromium_org_third_party_skia,FusionSP\/android_external_skia,byterom\/android_external_skia,TeamTwisted\/external_skia,DARKPOP\/external_chromium_org_third_party_skia,vvuk\/skia,Infinitive-OS\/platform_external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,timduru\/platform-external-skia,mydongistiny\/android_external_skia,NamelessRom\/android_external_skia,akiss77\/skia,amyvmiwei\/skia,OptiPop\/external_skia,nox\/skia,Hybrid-Rom\/external_skia,TeamEOS\/external_skia,InfinitiveOS\/external_skia,codeaurora-unoffical\/platform-external-skia,ctiao\/platform-external-skia,Infusion-OS\/android_external_skia,sigysmund\/platform_external_skia,scroggo\/skia,OptiPop\/external_chromium_org_third_party_skia,FusionSP\/external_chromium_org_third_party_skia,TeslaProject\/external_skia,pcwalton\/skia,SlimSaber\/android_external_skia,wildermason\/external_skia,AOSP-YU\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Igalia\/skia,Samsung\/skia,DesolationStaging\/android_external_skia,sudosurootdev\/external_skia,tmpvar\/skia.cc,codeaurora-unoffical\/platform-external-skia,Omegaphora\/external_skia,Hikari-no-Tenshi\/android_external_skia,ench0\/external_skia,SlimSaber\/android_external_skia,AsteroidOS\/android_external_skia,Infinitive-OS\/platform_external_skia,AOSPB\/external_skia,AOSPB\/external_skia,OptiPop\/external_skia,MinimalOS\/android_external_chromium_org_third_party_skia,HalCanary\/skia-hc,FusionSP\/android_external_skia,AndroidOpenDevelopment\/android_external_skia,SlimSaber\/android_external_skia,geekboxzone\/lollipop_external_skia,houst0nn\/external_skia,TeamBliss-LP\/android_external_skia,noselhq\/skia,Hybrid-Rom\/external_skia,zhaochengw\/platform_external_skia,nfxosp\/platform_external_skia,ench0\/external_skia,wildermason\/external_skia,YUPlayGodDev\/platform_external_skia,suyouxin\/android_external_skia,ench0\/external_chromium_org_third_party_skia,Android-AOSP\/external_skia,Fusion-Rom\/external_chromium_org_third_party_skia,Asteroid-Project\/android_external_skia,Igalia\/skia,Samsung\/skia,mydongistiny\/external_chromium_org_third_party_skia,aospo\/platform_external_skia,MinimalOS\/android_external_skia,boulzordev\/android_external_skia,MinimalOS-AOSP\/platform_external_skia,UBERMALLOW\/external_skia,TeslaProject\/external_skia,DiamondLovesYou\/skia-sys,RadonX-ROM\/external_skia,TeslaOS\/android_external_skia,HealthyHoney\/temasek_SKIA,DiamondLovesYou\/skia-sys,AOSPU\/external_chromium_org_third_party_skia,Hikari-no-Tenshi\/android_external_skia,AsteroidOS\/android_external_skia,rubenvb\/skia,Euphoria-OS-Legacy\/android_external_skia,fire855\/android_external_skia,SlimSaber\/android_external_skia,UBERMALLOW\/external_skia,nox\/skia,nvoron23\/skia,AOSP-YU\/platform_external_skia,sigysmund\/platform_external_skia,w3nd1go\/android_external_skia,YUPlayGodDev\/platform_external_skia,shahrzadmn\/skia,Infinitive-OS\/platform_external_skia,ominux\/skia,Omegaphora\/external_skia,wildermason\/external_skia,OptiPop\/external_chromium_org_third_party_skia,MarshedOut\/android_external_skia,samuelig\/skia,OptiPop\/external_chromium_org_third_party_skia,akiss77\/skia,suyouxin\/android_external_skia,Infinitive-OS\/platform_external_skia,GladeRom\/android_external_skia,spezi77\/android_external_skia,VentureROM-L\/android_external_skia,Pure-Aosp\/android_external_skia,Igalia\/skia,mydongistiny\/external_chromium_org_third_party_skia,VentureROM-L\/android_external_skia,GladeRom\/android_external_skia,FusionSP\/external_chromium_org_third_party_skia,ench0\/external_chromium_org_third_party_skia,google\/skia,temasek\/android_external_skia,Infusion-OS\/android_external_skia,temasek\/android_external_skia,Purity-Lollipop\/platform_external_skia,mydongistiny\/external_chromium_org_third_party_skia,DiamondLovesYou\/skia-sys,pcwalton\/skia,GladeRom\/android_external_skia,DARKPOP\/external_chromium_org_third_party_skia,Hybrid-Rom\/external_skia,Jichao\/skia,FusionSP\/external_chromium_org_third_party_skia,Omegaphora\/external_skia,Plain-Andy\/android_platform_external_skia,MonkeyZZZZ\/platform_external_skia,Jichao\/skia,mydongistiny\/android_external_skia,AOSPA-L\/android_external_skia,todotodoo\/skia,mydongistiny\/android_external_skia,todotodoo\/skia,UBERMALLOW\/external_skia,PAC-ROM\/android_external_skia,Samsung\/skia,noselhq\/skia,Jichao\/skia,Fusion-Rom\/external_chromium_org_third_party_skia,android-ia\/platform_external_skia,temasek\/android_external_skia,scroggo\/skia,F-AOSP\/platform_external_skia,zhaochengw\/platform_external_skia,AOSPU\/external_chromium_org_third_party_skia,mydongistiny\/android_external_skia,Plain-Andy\/android_platform_external_skia,UBERMALLOW\/external_skia,F-AOSP\/platform_external_skia,Infinitive-OS\/platform_external_skia","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/effects\/SkGradientShader.h\n+++ include\/effects\/SkGradientShader.h\n@@ -9,6 +9,8 @@\n #define SkGradientShader_DEFINED\n \n #include \"SkShader.h\"\n+\n+#define SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n \n \/** \\class SkGradientShader\n \n@@ -53,6 +55,15 @@\n return CreateLinear(pts, colors, pos, count, mode, 0, NULL);\n }\n \n+#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n+ static SkShader* CreateLinear(const SkPoint pts[2],\n+ const SkColor colors[], const SkScalar pos[], int count,\n+ SkShader::TileMode mode, void* ignored,\n+ uint32_t flags, const SkMatrix* localMatrix) {\n+ return CreateLinear(pts, colors, pos, count, mode, flags, localMatrix);\n+ }\n+#endif\n+\n \/** Returns a shader that generates a radial gradient given the center and radius.\n <p \/>\n CreateRadial returns a shader with a reference count of 1.\n@@ -79,6 +90,15 @@\n SkShader::TileMode mode) {\n return CreateRadial(center, radius, colors, pos, count, mode, 0, NULL);\n }\n+\n+#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n+ static SkShader* CreateRadial(const SkPoint& center, SkScalar radius,\n+ const SkColor colors[], const SkScalar pos[], int count,\n+ SkShader::TileMode mode, void* ignored,\n+ uint32_t flags, const SkMatrix* localMatrix) {\n+ return CreateRadial(center, radius, colors, pos, count, mode, flags, localMatrix);\n+ }\n+#endif\n \n \/** Returns a shader that generates a radial gradient given the start position, start radius, end position and end radius.\n <p \/>\n@@ -113,6 +133,17 @@\n 0, NULL);\n }\n \n+#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n+ static SkShader* CreateTwoPointRadial(const SkPoint& start, SkScalar startRadius,\n+ const SkPoint& end, SkScalar endRadius,\n+ const SkColor colors[], const SkScalar pos[], int count,\n+ SkShader::TileMode mode, void* ignored,\n+ uint32_t flags, const SkMatrix* localMatrix) {\n+ return CreateTwoPointRadial(start, startRadius, end, endRadius, colors, pos, count, mode,\n+ flags, localMatrix);\n+ }\n+#endif\n+ \n \/**\n * Returns a shader that generates a conical gradient given two circles, or\n * returns NULL if the inputs are invalid. The gradient interprets the\n@@ -133,6 +164,17 @@\n 0, NULL);\n }\n \n+#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n+ static SkShader* CreateTwoPointConical(const SkPoint& start, SkScalar startRadius,\n+ const SkPoint& end, SkScalar endRadius,\n+ const SkColor colors[], const SkScalar pos[], int count,\n+ SkShader::TileMode mode, void* ignored,\n+ uint32_t flags, const SkMatrix* localMatrix) {\n+ return CreateTwoPointConical(start, startRadius, end, endRadius, colors, pos, count, mode,\n+ flags, localMatrix);\n+ }\n+#endif\n+ \n \/** Returns a shader that generates a sweep gradient given a center.\n <p \/>\n CreateSweep returns a shader with a reference count of 1.\n@@ -157,6 +199,15 @@\n return CreateSweep(cx, cy, colors, pos, count, 0, NULL);\n }\n \n+#ifdef SK_SUPPORT_LEGACY_GRADIENT_FACTORIES\n+ static SkShader* CreateSweep(SkScalar cx, SkScalar cy,\n+ const SkColor colors[], const SkScalar pos[], int count,\n+ void* ignored,\n+ uint32_t flags, const SkMatrix* localMatrix) {\n+ return CreateSweep(cx, cy, colors, pos, count, flags, localMatrix);\n+ }\n+#endif\n+ \n SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()\n };\n \n"} {"commit":"3229b8800525993ae1f39cd303c81919e3e693c0","subject":"","message":"\n* include\/freetype\/config\/ftoption.h: Defining\nTT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING by default is a bad idea\nsince some fonts (e.g. Arial) produce worse results than without\nhinting. Reverted.\n","repos":"xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,yorung\/XLE,yorung\/XLE,yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/freetype\/config\/ftoption.h\n+++ include\/freetype\/config\/ftoption.h\n@@ -424,7 +424,7 @@\n \/* For this to work you must also define *\/\n \/* TT_CONFIG_OPTION_COMPILE_UNPATENTED_HINTING. *\/\n \/* *\/\n-#define TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING\n+#undef TT_CONFIG_OPTION_FORCE_UNPATENTED_HINTING\n \n \n \/*************************************************************************\/\n"} {"commit":"b0129d5975c29cfd72a4cd2dcf42057eb46daa1b","subject":"[indexstore] Enhancement for IndexStoreCXX.h's getUnitNameFromOutputPath","message":"[indexstore] Enhancement for IndexStoreCXX.h's getUnitNameFromOutputPath\n\nPass a buffer with non-zero size in the first call to indexstore_store_get_unit_name_from_output_path,\nto ensure it will get the name the first time.\n\nPreviously it was depending on the passed in nameBuf to be non-zero, which should not be a requirement.\n","repos":"apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/indexstore\/IndexStoreCXX.h\n+++ include\/indexstore\/IndexStoreCXX.h\n@@ -248,11 +248,14 @@\n \n void getUnitNameFromOutputPath(StringRef outputPath, llvm::SmallVectorImpl<char> &nameBuf) {\n llvm::SmallString<256> buf = outputPath;\n- size_t nameLen = indexstore_store_get_unit_name_from_output_path(obj, buf.c_str(), nameBuf.data(), nameBuf.size());\n- if (nameLen+1 > nameBuf.size()) {\n- nameBuf.resize(nameLen+1);\n- indexstore_store_get_unit_name_from_output_path(obj, buf.c_str(), nameBuf.data(), nameBuf.size());\n- }\n+ llvm::SmallString<64> unitName;\n+ unitName.resize(64);\n+ size_t nameLen = indexstore_store_get_unit_name_from_output_path(obj, buf.c_str(), unitName.data(), unitName.size());\n+ if (nameLen+1 > unitName.size()) {\n+ unitName.resize(nameLen+1);\n+ indexstore_store_get_unit_name_from_output_path(obj, buf.c_str(), unitName.data(), unitName.size());\n+ }\n+ nameBuf.append(unitName.begin(), unitName.begin()+nameLen);\n }\n \n llvm::Optional<timespec>\n"} {"commit":"3422cf05a8a4817c6c525ef4d66026761ec590c1","subject":"Trivial change to dump() function for SparseBitVector","message":"Trivial change to dump() function for SparseBitVector\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@104433 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/ADT\/SparseBitVector.h\n+++ include\/llvm\/ADT\/SparseBitVector.h\n@@ -889,13 +889,17 @@\n \/\/ Dump a SparseBitVector to a stream\n template <unsigned ElementSize>\n void dump(const SparseBitVector<ElementSize> &LHS, raw_ostream &out) {\n- out << \"[ \";\n-\n- typename SparseBitVector<ElementSize>::iterator bi;\n- for (bi = LHS.begin(); bi != LHS.end(); ++bi) {\n- out << *bi << \" \";\n- }\n- out << \" ]\\n\";\n+ out << \"[\";\n+\n+ typename SparseBitVector<ElementSize>::iterator bi = LHS.begin(),\n+ be = LHS.end();\n+ if (bi != be) {\n+ out << *bi;\n+ for (++bi; bi != be; ++bi) {\n+ out << \" \" << *bi;\n+ }\n+ }\n+ out << \"]\\n\";\n }\n } \/\/ end namespace llvm\n \n"} {"commit":"be76df6ce69ea1a4b6306af6fc06ccada708256d","subject":"Better comment on VTTI::getShuffleCost","message":"Better comment on VTTI::getShuffleCost\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@171459 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/TargetTransformInfo.h\n+++ include\/llvm\/TargetTransformInfo.h\n@@ -170,8 +170,8 @@\n }\n \n \/\/\/ Returns the cost of a shuffle instruction of kind Kind and of type Tp.\n- \/\/\/ The index and subtype parameters are used by some of the shuffle kinds\n- \/\/\/ to add additional information.\n+ \/\/\/ The index and subtype parameters are used by the subvector insertion and\n+ \/\/\/ extraction shuffle kinds.\n virtual unsigned getShuffleCost(ShuffleKind Kind, Type *Tp,\n int Index = 0, Type *SubTp = 0) const {\n return 1;\n"} {"commit":"760d5025fbd41af481dc7b5ed124b110c17a55c4","subject":"changed copy constructor to public","message":"changed copy constructor to public\n\n\ngit-svn-id: a7c1976543b50a5b791fd6a475a0ba067ae951b4@308187 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"mir-ror\/log4cxx,mir-ror\/log4cxx,mir-ror\/log4cxx,mir-ror\/log4cxx","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/log4cxx\/spi\/loggingevent.h\n+++ include\/log4cxx\/spi\/loggingevent.h\n@@ -52,10 +52,9 @@\n \t\t*\/\n \t\tclass LoggingEvent\n \t\t{\n-\t\tprotected:\n+\t\tpublic:\n \t\t\tLoggingEvent(const LoggingEvent& event);\n \t\t\t\n-\t\tpublic:\n \t\t\t\/** For serialization only\n \t\t\t*\/\n \t\t\tLoggingEvent();\n"} {"commit":"032a8a7454fb59d76e4a1e7efa572f30e64b2eca","subject":"added empty ctor","message":"added empty ctor\n","repos":"Malekblubb\/mlk,Malekblubb\/mlk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/mlk\/filesystem\/fs_handle.h\n+++ include\/mlk\/filesystem\/fs_handle.h\n@@ -95,6 +95,10 @@\n \t\t\tbool m_need_open{true};\n \n \t\tpublic:\n+\t\t\tfs_handle() :\n+\t\t\t\tfs_base{\"\"}\n+\t\t\t{ }\n+\n \t\t\tfs_handle(const std::string& path) :\n \t\t\t\tfs_base{path}\n \t\t\t{ }\n"} {"commit":"c441bfafb64640a183d2c2c0e710fe3258d41daa","subject":"Ensure we extend the timer as soon as we have a response instance","message":"Ensure we extend the timer as soon as we have a response instance\n","repos":"tm604\/asio-protocols,tm604\/asio-protocols","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/net\/asio\/http\/connection.h\n+++ include\/net\/asio\/http\/connection.h\n@@ -112,6 +112,7 @@\n \t\t\ts.cbegin(), s.cend()\n \t\t);\n \t\tres_ = std::move(res);\n+\t\tself->extend_timer();\n \t\tauto expected = out->size();\n \t\twrite(out)->on_done([self, expected](const size_t) {\n \t\t\tself->extend_timer();\n"} {"commit":"71ba30f7788167c04d0968d286a387fce16afcce","subject":"radeonsi: add new bonaire pci id","message":"radeonsi: add new bonaire pci id\n\nReviewed-by: Marek Ol\u0161\u00e1k <8c7344a1abdb103e79ecfd488098373070c3c70e@amd.com>\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\nCc: 59f39c0db42d4479a46b02d4d2bc11120e37bb44@lists.freedesktop.org\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/pci_ids\/radeonsi_pci_ids.h\n+++ include\/pci_ids\/radeonsi_pci_ids.h\n@@ -85,6 +85,7 @@\n CHIPSET(0x6658, BONAIRE_6658, BONAIRE)\n CHIPSET(0x665C, BONAIRE_665C, BONAIRE)\n CHIPSET(0x665D, BONAIRE_665D, BONAIRE)\n+CHIPSET(0x665F, BONAIRE_665F, BONAIRE)\n \n CHIPSET(0x9830, KABINI_9830, KABINI)\n CHIPSET(0x9831, KABINI_9831, KABINI)\n"} {"commit":"8586d0270498e8b93468bc3716de08531825f656","subject":"Documented RequestBuilder","message":"Documented RequestBuilder\n","repos":"jgaa\/restc-cpp,jgaa\/restc-cpp,jgaa\/restc-cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/restc-cpp\/RequestBuilder.h\n+++ include\/restc-cpp\/RequestBuilder.h\n@@ -16,6 +16,7 @@\n \n namespace restc_cpp {\n \n+\/*! Convenience class for building requests *\/\n class RequestBuilder\n {\n public:\n@@ -23,6 +24,7 @@\n RequestBuilder(Context& ctx)\n : ctx_{ctx} {}\n \n+ \/*! Make a HTTP GET request *\/\n RequestBuilder& Get(std::string url) {\n assert(url_.empty());\n url_ = std::move(url);\n@@ -30,6 +32,7 @@\n return *this;\n }\n \n+ \/*! Make a HTTP POST request *\/\n RequestBuilder& Post(std::string url) {\n assert(url_.empty());\n url_ = std::move(url);\n@@ -37,6 +40,7 @@\n return *this;\n }\n \n+ \/*! Make a HTTP PUT request *\/\n RequestBuilder& Put(std::string url) {\n assert(url_.empty());\n url_ = std::move(url);\n@@ -44,6 +48,7 @@\n return *this;\n }\n \n+ \/*! Make a HTTP DELETE request *\/\n RequestBuilder& Delete(std::string url) {\n assert(url_.empty());\n url_ = std::move(url);\n@@ -52,6 +57,14 @@\n }\n \n \n+ \/*! Add a header\n+ *\n+ * \\param name Name of the header\n+ * \\param value Value of the header\n+ *\n+ * This method will overwrite any estisting header\n+ * wuth the same name\n+ *\/\n RequestBuilder& Header(std::string name,\n std::string value) {\n if (!headers_) {\n@@ -62,10 +75,16 @@\n return *this;\n }\n \n- RequestBuilder& Argument(std::string name, int64_t value) {\n- return Argument(move(name), std::to_string(value));\n- }\n-\n+ \/*! Add a request argument\n+ *\n+ * This is a URL argument that will be appended to the\n+ * url (like http:\/\/example.com?name=value\n+ * where both the name and the value will be correctly\n+ * url encoded.\n+ *\n+ * \\param name Name of the argument\n+ * \\param value Value of the argument\n+ *\/\n RequestBuilder& Argument(std::string name,\n std::string value) {\n if (!args_) {\n@@ -76,30 +95,64 @@\n return *this;\n }\n \n+ \/*! Add a request argument\n+ *\n+ * This is a URL argument that will be appended to the\n+ * url (like http:\/\/example.com?name=value\n+ * where both the name and the value will be correctly\n+ * url encoded.\n+ *\n+ * \\param name Name of the argument\n+ * \\param value Value of the argument\n+ *\/\n+ RequestBuilder& Argument(std::string name, int64_t value) {\n+ return Argument(move(name), std::to_string(value));\n+ }\n+\n+\n RequestBuilder& Data(const std::string& body) {\n assert(!body_);\n body_ = std::make_unique<Request::Body>(body);\n return *this;\n }\n \n+ \/*! Body (data) for the request\n+ *\n+ * \\body A text string to send as the body.\n+ *\/\n RequestBuilder& Data(std::string&& body) {\n assert(!body_);\n body_ = std::make_unique<Request::Body>(move(body));\n return *this;\n }\n \n+ \/*! Body (file) to send as the body\n+ *\n+ * \\param path Path to a file to upload\n+ *\/\n RequestBuilder& File(const boost::filesystem::path& path) {\n assert(!body_);\n body_ = std::make_unique<Request::Body>(path);\n return *this;\n }\n \n+ \/*! Disable compression *\/\n RequestBuilder& DisableCompression() {\n assert(!body_);\n disable_compression_ = true;\n return *this;\n }\n \n+ \/*! Supply credentials for HTTP Basic Authentication\n+ *\n+ * \\param name Name to use\n+ * \\passwd Password to use\n+ *\n+ * \\Note The credentials are sent unencrypted (That's\n+ * how HTTP Basic Authentication works).\n+ * You should therefore only use this on internal\n+ * networks or when using https:\/\/ connections.\n+ *\/\n RequestBuilder& BasicAuthentication(const std::string name,\n const std::string passwd) {\n assert(!body_);\n@@ -108,7 +161,15 @@\n return *this;\n }\n \n- \/\/ Json serialization\n+ \/*! Serialize a C++ object to Json and send it as the body.\n+ *\n+ * \\param data A C++ object that is declared with\n+ * BOOST_FUSION_ADAPT_STRUCT. The object will be\n+ * serialized to a Json object and sent as the\n+ * body of the request.\n+ *\n+ * Normally used with POST or PUT requests.\n+ *\/\n template<typename T>\n RequestBuilder& Data(const T& data) {\n rapidjson::StringBuffer s;\n@@ -129,15 +190,21 @@\n assert(!built_);\n built_ = true;\n #endif\n+#if RESTC_CPP_LOG_WITH_ZLIB\n if (!disable_compression_) {\n if (!headers_ || (headers_->find(accept_encoding) == headers_->end())) {\n Header(accept_encoding, gzip);\n }\n }\n+#endif\n return Request::Create(\n url_, type_, ctx_.GetClient(), move(body_), args_, headers_, auth_);\n }\n \n+ \/*! Exceute the request.\n+ *\n+ * \\returns A unique pointer to a Reply instance.\n+ *\/\n std::unique_ptr<Reply> Execute() {\n auto request = Build();\n return request->Execute(ctx_);\n"} {"commit":"9a7d3533de7306e4355f7ef5778e7163674bea0b","subject":"properly return *this from operator ++","message":"properly return *this from operator ++\n\ngit-svn-id: 4e7379b20b57f8e3dde5a0b7363f233184647162@2686 4e380d45-d1fd-0310-85a7-d18ec86df0ad\n","repos":"sriram-mahavadi\/extlp,sriram-mahavadi\/extlp,sriram-mahavadi\/extlp,sriram-mahavadi\/extlp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/stxxl\/bits\/stream\/unique.h\n+++ include\/stxxl\/bits\/stream\/unique.h\n@@ -55,6 +55,7 @@\n ++input;\n while (!input.empty() && (binary_pred(current = *input, old_value)))\n ++input;\n+ return *this;\n }\n \n \/\/! \\brief Standard stream method\n@@ -102,6 +103,7 @@\n ++input;\n while (!input.empty() && ((current = *input) == old_value))\n ++input;\n+ return *this;\n }\n \n \/\/! \\brief Standard stream method\n"} {"commit":"d74a4566b8c5f8455f0b7b2628c12021688cb8a5","subject":"Fix logic bug in ParameterVector::clear().","message":"Fix logic bug in ParameterVector::clear().\n\nAssert that we are not already a shallow copy if someone calls push_back().\n","repos":"jwpeterson\/libmesh,hrittich\/libmesh,libMesh\/libmesh,friedmud\/libmesh,jwpeterson\/libmesh,pbauman\/libmesh,jwpeterson\/libmesh,hrittich\/libmesh,pbauman\/libmesh,balborian\/libmesh,vikramvgarg\/libmesh,friedmud\/libmesh,BalticPinguin\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,svallaghe\/libmesh,BalticPinguin\/libmesh,giorgiobornia\/libmesh,roystgnr\/libmesh,capitalaslash\/libmesh,hrittich\/libmesh,dschwen\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,roystgnr\/libmesh,capitalaslash\/libmesh,benkirk\/libmesh,90jrong\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,90jrong\/libmesh,jwpeterson\/libmesh,friedmud\/libmesh,vikramvgarg\/libmesh,giorgiobornia\/libmesh,90jrong\/libmesh,pbauman\/libmesh,90jrong\/libmesh,90jrong\/libmesh,jwpeterson\/libmesh,dschwen\/libmesh,hrittich\/libmesh,libMesh\/libmesh,vikramvgarg\/libmesh,friedmud\/libmesh,pbauman\/libmesh,libMesh\/libmesh,BalticPinguin\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,friedmud\/libmesh,benkirk\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,BalticPinguin\/libmesh,svallaghe\/libmesh,dschwen\/libmesh,vikramvgarg\/libmesh,giorgiobornia\/libmesh,svallaghe\/libmesh,90jrong\/libmesh,jwpeterson\/libmesh,giorgiobornia\/libmesh,hrittich\/libmesh,friedmud\/libmesh,giorgiobornia\/libmesh,svallaghe\/libmesh,balborian\/libmesh,capitalaslash\/libmesh,roystgnr\/libmesh,giorgiobornia\/libmesh,BalticPinguin\/libmesh,svallaghe\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,libMesh\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,dschwen\/libmesh,balborian\/libmesh,pbauman\/libmesh,libMesh\/libmesh,libMesh\/libmesh,BalticPinguin\/libmesh,BalticPinguin\/libmesh,svallaghe\/libmesh,vikramvgarg\/libmesh,pbauman\/libmesh,balborian\/libmesh,capitalaslash\/libmesh,svallaghe\/libmesh,dschwen\/libmesh,roystgnr\/libmesh,roystgnr\/libmesh,hrittich\/libmesh,benkirk\/libmesh,90jrong\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,dschwen\/libmesh,balborian\/libmesh,vikramvgarg\/libmesh,benkirk\/libmesh,capitalaslash\/libmesh,libMesh\/libmesh,friedmud\/libmesh,svallaghe\/libmesh,dschwen\/libmesh,balborian\/libmesh,hrittich\/libmesh,jwpeterson\/libmesh,vikramvgarg\/libmesh,pbauman\/libmesh,balborian\/libmesh,balborian\/libmesh,friedmud\/libmesh,roystgnr\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,jwpeterson\/libmesh,hrittich\/libmesh,90jrong\/libmesh,friedmud\/libmesh,capitalaslash\/libmesh,benkirk\/libmesh,capitalaslash\/libmesh,benkirk\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/systems\/parameter_vector.h\n+++ include\/systems\/parameter_vector.h\n@@ -165,7 +165,7 @@\n void\n ParameterVector::clear()\n {\n- if (_is_shallow_copy)\n+ if (!_is_shallow_copy)\n for (unsigned int i=0; i != _params.size(); ++i)\n delete _params[i];\n \n@@ -178,6 +178,8 @@\n inline\n void ParameterVector::push_back(UniquePtr<ParameterAccessor<Number> > new_accessor)\n {\n+ \/\/ Can't append stuff we are responsible for if we're already a shallow copy.\n+ libmesh_assert(!_is_shallow_copy);\n libmesh_assert(new_accessor.get());\n _params.push_back(new_accessor.release());\n }\n"} {"commit":"f86109210b242b5a5076c3956bda94fd5127f219","subject":"msm: camera: Add effects for front camera.","message":"msm: camera: Add effects for front camera.\n\nAdded Support for Effects like saturtaion,contrast for YUV sensor\nCRs-Fixed: 352316\nChange-Id: If278755849a866e84069ce517b2f1f6c67294980\nSigned-off-by: Katta Santhisindhu <2ec8501f36e74d77f7935451ec41f5820b1d98e7@codeaurora.org>\n[davidb: only include\/linux\/videodev2.h]\nSigned-off-by: David Brown <67bb63793f66c3c3797af10faa739beca3aeb927@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/uapi\/linux\/v4l2-controls.h\n+++ include\/uapi\/linux\/v4l2-controls.h\n@@ -140,6 +140,8 @@\n \n \/* last CID + 1 *\/\n #define V4L2_CID_LASTP1 (V4L2_CID_BASE+43)\n+#define V4L2_CID_SPECIAL_EFFECT\t\t\t(V4L2_CID_BASE+44)\n+\/* Minimum number of buffer neede by the device *\/\n \n \/* USER-class private control IDs *\/\n \n"} {"commit":"6cdbf3fd74494ab96bb57bd8be53241662383889","subject":"Fix typo in SupportsEncoderFrameDropping's documentation","message":"Fix typo in SupportsEncoderFrameDropping's documentation\n\nTBR=nisse@webrtc.org\n\nBug: None\nChange-Id: I6cc0651a4d01e1d46941a6bb7ee97fdc98b11514\nReviewed-on: https:\/\/webrtc-review.googlesource.com\/c\/src\/+\/135564\nReviewed-by: Elad Alon <9d66cb9c3c57b29e6fc055a4405dac15e20e28ee@webrtc.org>\nCommit-Queue: Elad Alon <9d66cb9c3c57b29e6fc055a4405dac15e20e28ee@webrtc.org>\nCr-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#27876}\n","repos":"ShiftMediaProject\/libilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc,ShiftMediaProject\/libilbc,ShiftMediaProject\/libilbc,TimothyGu\/libilbc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- api\/video_codecs\/vp8_frame_buffer_controller.h\n+++ api\/video_codecs\/vp8_frame_buffer_controller.h\n@@ -110,7 +110,7 @@\n \/\/ If this return false, the encoder must not drop any frames unless:\n \/\/ 1. Requested to do so via Vp8FrameConfig.drop_frame\n \/\/ 2. The frame to be encoded is requested to be a keyframe\n- \/\/ 3. The encoded detected a large overshoot and decided to drop and then\n+ \/\/ 3. The encoder detected a large overshoot and decided to drop and then\n \/\/ re-encode the image at a low bitrate. In this case the encoder should\n \/\/ call OnFrameDropped() once to indicate drop, and then call\n \/\/ OnEncodeDone() again when the frame has actually been encoded.\n"} {"commit":"8021a6841af0a2469a6c4ac6d9eb19550a4d3313","subject":"fixed one crash on exit","message":"fixed one crash on exit\n","repos":"gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indra\/llcommon\/llinstancetracker.h\n+++ indra\/llcommon\/llinstancetracker.h\n@@ -193,7 +193,12 @@\n \t}\n \n protected:\n-\tLLInstanceTracker(KEY key) { add_(key); }\n+\tLLInstanceTracker(KEY key) \n+\t{ \n+\t\t\/\/ make sure static data outlives all instances\n+\t\tgetStatic();\n+\t\tadd_(key); \n+\t}\n \tvirtual ~LLInstanceTracker() \n \t{ \n \t\t\/\/ it's unsafe to delete instances of this type while all instances are being iterated over.\n@@ -281,7 +286,8 @@\n protected:\n \tLLInstanceTracker()\n \t{\n-\t\t\/\/ it's safe but unpredictable to create instances of this type while all instances are being iterated over. I hate unpredictable.\t This assert will probably be turned on early in the next development cycle.\n+\t\t\/\/ make sure static data outlives all instances\n+\t\tgetStatic();\n \t\tgetSet_().insert(static_cast<T*>(this));\n \t}\n \tvirtual ~LLInstanceTracker()\n"} {"commit":"9490996373e6d305f4efe45edab4f13246db92bc","subject":"Move #include <sys\/param.h> to before osdefs.h (Donn Cave).","message":"Move #include <sys\/param.h> to before osdefs.h (Donn Cave).\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Python\/importdl.c\n+++ Python\/importdl.c\n@@ -33,6 +33,11 @@\n \/* If no dynamic linking is supported, this file still generates some code! *\/\n \n #include \"Python.h\"\n+\n+#ifdef HAVE_SYS_PARAM_H\n+\/* osdefs.h will define MAXPATHLEN if it's not already defined. *\/\n+#include <sys\/param.h>\n+#endif\n #include \"osdefs.h\"\n #include \"importdl.h\"\n \n@@ -87,10 +92,6 @@\n #define _DL_FUNCPTR_DEFINED 1\n #define SHORT_EXT \".pyd\"\n #define LONG_EXT \".dll\"\n-#endif\n-\n-#ifdef HAVE_SYS_PARAM_H\n-#include <sys\/param.h>\n #endif\n \n #if defined(__NetBSD__) && (NetBSD < 199712)\n"} {"commit":"8752ea866e72d6fb9d4e3bf525414ea32eb3c443","subject":"Fix whitespace","message":"Fix whitespace\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Python\/peephole.c\n+++ Python\/peephole.c\n@@ -347,7 +347,7 @@\n codestr = (unsigned char *)memcpy(codestr,\n PyString_AS_STRING(code), codelen);\n \n- \/* Verify that RETURN_VALUE terminates the codestring. This allows\n+ \/* Verify that RETURN_VALUE terminates the codestring. This allows\n the various transformation patterns to look ahead several\n instructions without additional checks to make sure they are not\n looking beyond the end of the code string.\n@@ -445,8 +445,8 @@\n case BUILD_LIST:\n j = GETARG(codestr, i);\n h = i - 3 * j;\n- if (h >= 0 &&\n- j <= lastlc &&\n+ if (h >= 0 &&\n+ j <= lastlc &&\n ((opcode == BUILD_TUPLE &&\n ISBASICBLOCK(blocks, h, 3*(j+1))) ||\n (opcode == BUILD_LIST &&\n@@ -490,8 +490,8 @@\n case BINARY_AND:\n case BINARY_XOR:\n case BINARY_OR:\n- if (lastlc >= 2 &&\n- ISBASICBLOCK(blocks, i-6, 7) &&\n+ if (lastlc >= 2 &&\n+ ISBASICBLOCK(blocks, i-6, 7) &&\n fold_binops_on_constants(&codestr[i-6], consts)) {\n i -= 2;\n assert(codestr[i] == LOAD_CONST);\n@@ -500,13 +500,13 @@\n break;\n \n \/* Fold unary ops on constants.\n- LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) *\/\n+ LOAD_CONST c1 UNARY_OP --> LOAD_CONST unary_op(c) *\/\n case UNARY_NEGATIVE:\n case UNARY_CONVERT:\n case UNARY_INVERT:\n- if (lastlc >= 1 &&\n- ISBASICBLOCK(blocks, i-3, 4) &&\n- fold_unaryops_on_constants(&codestr[i-3], consts)) {\n+ if (lastlc >= 1 &&\n+ ISBASICBLOCK(blocks, i-3, 4) &&\n+ fold_unaryops_on_constants(&codestr[i-3], consts)) {\n i -= 2;\n assert(codestr[i] == LOAD_CONST);\n cumlc = 1;\n@@ -532,8 +532,7 @@\n tgt = GETJUMPTGT(codestr, i);\n j = codestr[tgt];\n if (CONDITIONAL_JUMP(j)) {\n- \/* NOTE: all possible jumps here are\n- absolute! *\/\n+ \/* NOTE: all possible jumps here are absolute! *\/\n if (JUMPS_ON_TRUE(j) == JUMPS_ON_TRUE(opcode)) {\n \/* The second jump will be\n taken iff the first is. *\/\n@@ -544,13 +543,10 @@\n SETARG(codestr, i, tgttgt);\n goto reoptimize_current;\n } else {\n- \/* The second jump is not taken\n- if the first is (so jump past\n- it), and all conditional\n- jumps pop their argument when\n- they're not taken (so change\n- the first jump to pop its\n- argument when it's taken). *\/\n+ \/* The second jump is not taken if the first is (so\n+ jump past it), and all conditional jumps pop their\n+ argument when they're not taken (so change the\n+ first jump to pop its argument when it's taken). *\/\n if (JUMPS_ON_TRUE(opcode))\n codestr[i] = POP_JUMP_IF_TRUE;\n else\n@@ -586,8 +582,8 @@\n if (opcode == JUMP_FORWARD) \/* JMP_ABS can go backwards *\/\n opcode = JUMP_ABSOLUTE;\n if (!ABSOLUTE_JUMP(opcode))\n- tgttgt -= i + 3; \/* Calc relative jump addr *\/\n- if (tgttgt < 0) \/* No backward relative jumps *\/\n+ tgttgt -= i + 3; \/* Calc relative jump addr *\/\n+ if (tgttgt < 0) \/* No backward relative jumps *\/\n continue;\n codestr[i] = opcode;\n SETARG(codestr, i, tgttgt);\n"} {"commit":"85ad709cb424857c8e6aab5b18f6d7d26ddfde6a","subject":"[C++] Turn off redundant declaration warning for Mosquitto","message":"[C++] Turn off redundant declaration warning for Mosquitto\n\nMosquitto has some redundant declarations which lead to compilation\nerrors due to our compilation flags. Ignore this for the Mosquitto\ninclude.\n","repos":"bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr,bmwcarit\/joynr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cpp\/libjoynrclustercontroller\/mqtt\/MosquittoConnection.h\n+++ cpp\/libjoynrclustercontroller\/mqtt\/MosquittoConnection.h\n@@ -27,7 +27,10 @@\n #include <unordered_set>\n #include <mutex>\n \n+#pragma GCC diagnostic push\n+#pragma GCC diagnostic ignored \"-Wredundant-decls\"\n #include <mosquitto.h>\n+#pragma GCC diagnostic pop\n #include <mqtt_protocol.h>\n \n #if (LIBMOSQUITTO_VERSION_NUMBER < 1006007)\n"} {"commit":"18a8927efbf1ed1f57f668b6c69c70dae7bb92e1","subject":"update peg-highlighter","message":"update peg-highlighter\n","repos":"tamlok\/vnote,tamlok\/vnote,tamlok\/vnote,tamlok\/vnote,tamlok\/vnote","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- peg-highlight\/pmh_parser.c\n+++ peg-highlight\/pmh_parser.c\n@@ -4,7 +4,7 @@\n #include <stdlib.h>\n #include <string.h>\n struct _GREG;\n-#define YYRULECOUNT 266\n+#define YYRULECOUNT 268\n \n \/* PEG Markdown Highlight\n * Copyright 2011-2016 Ali Rantakari -- http:\/\/hasseg.org\n@@ -1324,227 +1324,229 @@\n \n #define YYACCEPT yyAccept(G, yythunkpos0)\n \n-YY_RULE(int) yy_RawNoteBlock(GREG *G); \/* 266 *\/\n-YY_RULE(int) yy_RawNoteReference(GREG *G); \/* 265 *\/\n-YY_RULE(int) yy_ExtendedSpecialChar(GREG *G); \/* 264 *\/\n-YY_RULE(int) yy_AlphanumericAscii(GREG *G); \/* 263 *\/\n-YY_RULE(int) yy_Quoted(GREG *G); \/* 262 *\/\n-YY_RULE(int) yy_HtmlTag(GREG *G); \/* 261 *\/\n-YY_RULE(int) yy_MarkTagClose(GREG *G); \/* 260 *\/\n-YY_RULE(int) yy_MarkTagText(GREG *G); \/* 259 *\/\n-YY_RULE(int) yy_MarkTagOpen(GREG *G); \/* 258 *\/\n-YY_RULE(int) yy_Ticks5(GREG *G); \/* 257 *\/\n-YY_RULE(int) yy_Ticks4(GREG *G); \/* 256 *\/\n-YY_RULE(int) yy_Ticks3(GREG *G); \/* 255 *\/\n-YY_RULE(int) yy_Ticks2(GREG *G); \/* 254 *\/\n-YY_RULE(int) yy_Ticks1(GREG *G); \/* 253 *\/\n-YY_RULE(int) yy_SkipBlock(GREG *G); \/* 252 *\/\n-YY_RULE(int) yy_References(GREG *G); \/* 251 *\/\n-YY_RULE(int) yy_EmptyTitle(GREG *G); \/* 250 *\/\n-YY_RULE(int) yy_RefTitleParens(GREG *G); \/* 249 *\/\n-YY_RULE(int) yy_RefTitleDouble(GREG *G); \/* 248 *\/\n-YY_RULE(int) yy_RefTitleSingle(GREG *G); \/* 247 *\/\n-YY_RULE(int) yy_LabelInline(GREG *G); \/* 246 *\/\n-YY_RULE(int) yy_RefTitle(GREG *G); \/* 245 *\/\n-YY_RULE(int) yy_RefSrc(GREG *G); \/* 244 *\/\n-YY_RULE(int) yy_AutoLinkEmail(GREG *G); \/* 243 *\/\n-YY_RULE(int) yy_AutoLinkUrl(GREG *G); \/* 242 *\/\n-YY_RULE(int) yy_ImageSizeHeight(GREG *G); \/* 241 *\/\n-YY_RULE(int) yy_ImageSizeWidth(GREG *G); \/* 240 *\/\n-YY_RULE(int) yy_ImageSizeComplete(GREG *G); \/* 239 *\/\n-YY_RULE(int) yy_TitleDoubleExt(GREG *G); \/* 238 *\/\n-YY_RULE(int) yy_TitleSingleExt(GREG *G); \/* 237 *\/\n-YY_RULE(int) yy_TitleDouble(GREG *G); \/* 236 *\/\n-YY_RULE(int) yy_TitleSingle(GREG *G); \/* 235 *\/\n-YY_RULE(int) yy_SourceContents(GREG *G); \/* 234 *\/\n-YY_RULE(int) yy_ImageSize(GREG *G); \/* 233 *\/\n-YY_RULE(int) yy_TitleExt(GREG *G); \/* 232 *\/\n-YY_RULE(int) yy_Title(GREG *G); \/* 231 *\/\n-YY_RULE(int) yy_Source(GREG *G); \/* 230 *\/\n-YY_RULE(int) yy_Label(GREG *G); \/* 229 *\/\n-YY_RULE(int) yy_ReferenceLinkSingle(GREG *G); \/* 228 *\/\n-YY_RULE(int) yy_ReferenceLinkDouble(GREG *G); \/* 227 *\/\n-YY_RULE(int) yy_AutoLink(GREG *G); \/* 226 *\/\n-YY_RULE(int) yy_ReferenceLink(GREG *G); \/* 225 *\/\n-YY_RULE(int) yy_ExplicitLinkSize(GREG *G); \/* 224 *\/\n-YY_RULE(int) yy_ExplicitLink(GREG *G); \/* 223 *\/\n-YY_RULE(int) yy_StrongUl(GREG *G); \/* 222 *\/\n-YY_RULE(int) yy_StrongStar(GREG *G); \/* 221 *\/\n-YY_RULE(int) yy_Whitespace(GREG *G); \/* 220 *\/\n-YY_RULE(int) yy_EmphUl(GREG *G); \/* 219 *\/\n-YY_RULE(int) yy_EmphStar(GREG *G); \/* 218 *\/\n-YY_RULE(int) yy_StarLine(GREG *G); \/* 217 *\/\n-YY_RULE(int) yy_UlLine(GREG *G); \/* 216 *\/\n-YY_RULE(int) yy_SpecialChar(GREG *G); \/* 215 *\/\n-YY_RULE(int) yy_Eof(GREG *G); \/* 214 *\/\n-YY_RULE(int) yy_NormalEndline(GREG *G); \/* 213 *\/\n-YY_RULE(int) yy_TerminalEndline(GREG *G); \/* 212 *\/\n-YY_RULE(int) yy_LineBreak(GREG *G); \/* 211 *\/\n-YY_RULE(int) yy_CharEntity(GREG *G); \/* 210 *\/\n-YY_RULE(int) yy_DecEntity(GREG *G); \/* 209 *\/\n-YY_RULE(int) yy_HexEntity(GREG *G); \/* 208 *\/\n-YY_RULE(int) yy_Alphanumeric(GREG *G); \/* 207 *\/\n-YY_RULE(int) yy_NormalChar(GREG *G); \/* 206 *\/\n-YY_RULE(int) yy_Symbol(GREG *G); \/* 205 *\/\n-YY_RULE(int) yy_EscapedChar(GREG *G); \/* 204 *\/\n-YY_RULE(int) yy_Entity(GREG *G); \/* 203 *\/\n-YY_RULE(int) yy_RawHtml(GREG *G); \/* 202 *\/\n-YY_RULE(int) yy_Mark(GREG *G); \/* 201 *\/\n-YY_RULE(int) yy_Code(GREG *G); \/* 200 *\/\n-YY_RULE(int) yy_InlineNote(GREG *G); \/* 199 *\/\n-YY_RULE(int) yy_NoteReference(GREG *G); \/* 198 *\/\n-YY_RULE(int) yy_Link(GREG *G); \/* 197 *\/\n-YY_RULE(int) yy_Image(GREG *G); \/* 196 *\/\n-YY_RULE(int) yy_Strike(GREG *G); \/* 195 *\/\n-YY_RULE(int) yy_Emph(GREG *G); \/* 194 *\/\n-YY_RULE(int) yy_Strong(GREG *G); \/* 193 *\/\n-YY_RULE(int) yy_UlOrStarLine(GREG *G); \/* 192 *\/\n-YY_RULE(int) yy_Str(GREG *G); \/* 191 *\/\n-YY_RULE(int) yy_InStyleTags(GREG *G); \/* 190 *\/\n-YY_RULE(int) yy_StyleClose(GREG *G); \/* 189 *\/\n-YY_RULE(int) yy_StyleOpen(GREG *G); \/* 188 *\/\n-YY_RULE(int) yy_HtmlBlockType(GREG *G); \/* 187 *\/\n-YY_RULE(int) yy_HtmlBlockSelfClosing(GREG *G); \/* 186 *\/\n-YY_RULE(int) yy_HtmlComment(GREG *G); \/* 185 *\/\n-YY_RULE(int) yy_HtmlBlockInTags(GREG *G); \/* 184 *\/\n-YY_RULE(int) yy_HtmlBlockHead(GREG *G); \/* 183 *\/\n-YY_RULE(int) yy_HtmlBlockCloseHead(GREG *G); \/* 182 *\/\n-YY_RULE(int) yy_HtmlBlockOpenHead(GREG *G); \/* 181 *\/\n-YY_RULE(int) yy_HtmlBlockScript(GREG *G); \/* 180 *\/\n-YY_RULE(int) yy_HtmlBlockCloseScript(GREG *G); \/* 179 *\/\n-YY_RULE(int) yy_HtmlBlockOpenScript(GREG *G); \/* 178 *\/\n-YY_RULE(int) yy_HtmlBlockTr(GREG *G); \/* 177 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTr(GREG *G); \/* 176 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTr(GREG *G); \/* 175 *\/\n-YY_RULE(int) yy_HtmlBlockThead(GREG *G); \/* 174 *\/\n-YY_RULE(int) yy_HtmlBlockCloseThead(GREG *G); \/* 173 *\/\n-YY_RULE(int) yy_HtmlBlockOpenThead(GREG *G); \/* 172 *\/\n-YY_RULE(int) yy_HtmlBlockTh(GREG *G); \/* 171 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTh(GREG *G); \/* 170 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTh(GREG *G); \/* 169 *\/\n-YY_RULE(int) yy_HtmlBlockTfoot(GREG *G); \/* 168 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTfoot(GREG *G); \/* 167 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTfoot(GREG *G); \/* 166 *\/\n-YY_RULE(int) yy_HtmlBlockTd(GREG *G); \/* 165 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTd(GREG *G); \/* 164 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTd(GREG *G); \/* 163 *\/\n-YY_RULE(int) yy_HtmlBlockTbody(GREG *G); \/* 162 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTbody(GREG *G); \/* 161 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTbody(GREG *G); \/* 160 *\/\n-YY_RULE(int) yy_HtmlBlockLi(GREG *G); \/* 159 *\/\n-YY_RULE(int) yy_HtmlBlockCloseLi(GREG *G); \/* 158 *\/\n-YY_RULE(int) yy_HtmlBlockOpenLi(GREG *G); \/* 157 *\/\n-YY_RULE(int) yy_HtmlBlockFrameset(GREG *G); \/* 156 *\/\n-YY_RULE(int) yy_HtmlBlockCloseFrameset(GREG *G); \/* 155 *\/\n-YY_RULE(int) yy_HtmlBlockOpenFrameset(GREG *G); \/* 154 *\/\n-YY_RULE(int) yy_HtmlBlockDt(GREG *G); \/* 153 *\/\n-YY_RULE(int) yy_HtmlBlockCloseDt(GREG *G); \/* 152 *\/\n-YY_RULE(int) yy_HtmlBlockOpenDt(GREG *G); \/* 151 *\/\n-YY_RULE(int) yy_HtmlBlockDd(GREG *G); \/* 150 *\/\n-YY_RULE(int) yy_HtmlBlockCloseDd(GREG *G); \/* 149 *\/\n-YY_RULE(int) yy_HtmlBlockOpenDd(GREG *G); \/* 148 *\/\n-YY_RULE(int) yy_HtmlBlockUl(GREG *G); \/* 147 *\/\n-YY_RULE(int) yy_HtmlBlockCloseUl(GREG *G); \/* 146 *\/\n-YY_RULE(int) yy_HtmlBlockOpenUl(GREG *G); \/* 145 *\/\n-YY_RULE(int) yy_HtmlBlockTable(GREG *G); \/* 144 *\/\n-YY_RULE(int) yy_HtmlBlockCloseTable(GREG *G); \/* 143 *\/\n-YY_RULE(int) yy_HtmlBlockOpenTable(GREG *G); \/* 142 *\/\n-YY_RULE(int) yy_HtmlBlockPre(GREG *G); \/* 141 *\/\n-YY_RULE(int) yy_HtmlBlockClosePre(GREG *G); \/* 140 *\/\n-YY_RULE(int) yy_HtmlBlockOpenPre(GREG *G); \/* 139 *\/\n-YY_RULE(int) yy_HtmlBlockP(GREG *G); \/* 138 *\/\n-YY_RULE(int) yy_HtmlBlockCloseP(GREG *G); \/* 137 *\/\n-YY_RULE(int) yy_HtmlBlockOpenP(GREG *G); \/* 136 *\/\n-YY_RULE(int) yy_HtmlBlockOl(GREG *G); \/* 135 *\/\n-YY_RULE(int) yy_HtmlBlockCloseOl(GREG *G); \/* 134 *\/\n-YY_RULE(int) yy_HtmlBlockOpenOl(GREG *G); \/* 133 *\/\n-YY_RULE(int) yy_HtmlBlockNoscript(GREG *G); \/* 132 *\/\n-YY_RULE(int) yy_HtmlBlockCloseNoscript(GREG *G); \/* 131 *\/\n-YY_RULE(int) yy_HtmlBlockOpenNoscript(GREG *G); \/* 130 *\/\n-YY_RULE(int) yy_HtmlBlockNoframes(GREG *G); \/* 129 *\/\n-YY_RULE(int) yy_HtmlBlockCloseNoframes(GREG *G); \/* 128 *\/\n-YY_RULE(int) yy_HtmlBlockOpenNoframes(GREG *G); \/* 127 *\/\n-YY_RULE(int) yy_HtmlBlockMenu(GREG *G); \/* 126 *\/\n-YY_RULE(int) yy_HtmlBlockCloseMenu(GREG *G); \/* 125 *\/\n-YY_RULE(int) yy_HtmlBlockOpenMenu(GREG *G); \/* 124 *\/\n-YY_RULE(int) yy_HtmlBlockH6(GREG *G); \/* 123 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH6(GREG *G); \/* 122 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH6(GREG *G); \/* 121 *\/\n-YY_RULE(int) yy_HtmlBlockH5(GREG *G); \/* 120 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH5(GREG *G); \/* 119 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH5(GREG *G); \/* 118 *\/\n-YY_RULE(int) yy_HtmlBlockH4(GREG *G); \/* 117 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH4(GREG *G); \/* 116 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH4(GREG *G); \/* 115 *\/\n-YY_RULE(int) yy_HtmlBlockH3(GREG *G); \/* 114 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH3(GREG *G); \/* 113 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH3(GREG *G); \/* 112 *\/\n-YY_RULE(int) yy_HtmlBlockH2(GREG *G); \/* 111 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH2(GREG *G); \/* 110 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH2(GREG *G); \/* 109 *\/\n-YY_RULE(int) yy_HtmlBlockH1(GREG *G); \/* 108 *\/\n-YY_RULE(int) yy_HtmlBlockCloseH1(GREG *G); \/* 107 *\/\n-YY_RULE(int) yy_HtmlBlockOpenH1(GREG *G); \/* 106 *\/\n-YY_RULE(int) yy_HtmlBlockForm(GREG *G); \/* 105 *\/\n-YY_RULE(int) yy_HtmlBlockCloseForm(GREG *G); \/* 104 *\/\n-YY_RULE(int) yy_HtmlBlockOpenForm(GREG *G); \/* 103 *\/\n-YY_RULE(int) yy_HtmlBlockFieldset(GREG *G); \/* 102 *\/\n-YY_RULE(int) yy_HtmlBlockCloseFieldset(GREG *G); \/* 101 *\/\n-YY_RULE(int) yy_HtmlBlockOpenFieldset(GREG *G); \/* 100 *\/\n-YY_RULE(int) yy_HtmlBlockDl(GREG *G); \/* 99 *\/\n-YY_RULE(int) yy_HtmlBlockCloseDl(GREG *G); \/* 98 *\/\n-YY_RULE(int) yy_HtmlBlockOpenDl(GREG *G); \/* 97 *\/\n-YY_RULE(int) yy_HtmlBlockDiv(GREG *G); \/* 96 *\/\n-YY_RULE(int) yy_HtmlBlockCloseDiv(GREG *G); \/* 95 *\/\n-YY_RULE(int) yy_HtmlBlockOpenDiv(GREG *G); \/* 94 *\/\n-YY_RULE(int) yy_HtmlBlockDir(GREG *G); \/* 93 *\/\n-YY_RULE(int) yy_HtmlBlockCloseDir(GREG *G); \/* 92 *\/\n-YY_RULE(int) yy_HtmlBlockOpenDir(GREG *G); \/* 91 *\/\n-YY_RULE(int) yy_HtmlBlockCenter(GREG *G); \/* 90 *\/\n-YY_RULE(int) yy_HtmlBlockCloseCenter(GREG *G); \/* 89 *\/\n-YY_RULE(int) yy_HtmlBlockOpenCenter(GREG *G); \/* 88 *\/\n-YY_RULE(int) yy_HtmlBlockBlockquote(GREG *G); \/* 87 *\/\n-YY_RULE(int) yy_HtmlBlockCloseBlockquote(GREG *G); \/* 86 *\/\n-YY_RULE(int) yy_HtmlBlockOpenBlockquote(GREG *G); \/* 85 *\/\n-YY_RULE(int) yy_HtmlBlockAddress(GREG *G); \/* 84 *\/\n-YY_RULE(int) yy_HtmlBlockCloseAddress(GREG *G); \/* 83 *\/\n-YY_RULE(int) yy_HtmlAttribute(GREG *G); \/* 82 *\/\n-YY_RULE(int) yy_HtmlBlockOpenAddress(GREG *G); \/* 81 *\/\n-YY_RULE(int) yy_OptionallyIndentedLine(GREG *G); \/* 80 *\/\n-YY_RULE(int) yy_Indent(GREG *G); \/* 79 *\/\n-YY_RULE(int) yy_ListBlockLine(GREG *G); \/* 78 *\/\n-YY_RULE(int) yy_ListContinuationBlock(GREG *G); \/* 77 *\/\n-YY_RULE(int) yy_ListBlock(GREG *G); \/* 76 *\/\n-YY_RULE(int) yy_ListItem(GREG *G); \/* 75 *\/\n-YY_RULE(int) yy_Enumerator(GREG *G); \/* 74 *\/\n-YY_RULE(int) yy_ListItemTight(GREG *G); \/* 73 *\/\n-YY_RULE(int) yy_ListLoose(GREG *G); \/* 72 *\/\n-YY_RULE(int) yy_ListTight(GREG *G); \/* 71 *\/\n-YY_RULE(int) yy_Bullet(GREG *G); \/* 70 *\/\n-YY_RULE(int) yy_TableCell(GREG *G); \/* 69 *\/\n-YY_RULE(int) yy_TableBorder(GREG *G); \/* 68 *\/\n-YY_RULE(int) yy_TableLine(GREG *G); \/* 67 *\/\n-YY_RULE(int) yy_TableDelimiter(GREG *G); \/* 66 *\/\n-YY_RULE(int) yy_TableHeader(GREG *G); \/* 65 *\/\n-YY_RULE(int) yy_InlineEquationMultiple(GREG *G); \/* 64 *\/\n-YY_RULE(int) yy_InlineEquationSingle(GREG *G); \/* 63 *\/\n-YY_RULE(int) yy_InlineEquation(GREG *G); \/* 62 *\/\n-YY_RULE(int) yy_Nonspacechar(GREG *G); \/* 61 *\/\n-YY_RULE(int) yy_DisplayFormulaRawMark(GREG *G); \/* 60 *\/\n-YY_RULE(int) yy_DisplayFormulaRawEnd(GREG *G); \/* 59 *\/\n-YY_RULE(int) yy_Spnl(GREG *G); \/* 58 *\/\n-YY_RULE(int) yy_DisplayFormulaRawStart(GREG *G); \/* 57 *\/\n-YY_RULE(int) yy_FormulaNumber(GREG *G); \/* 56 *\/\n-YY_RULE(int) yy_DisplayFormulaRaw(GREG *G); \/* 55 *\/\n-YY_RULE(int) yy_DisplayFormulaDollar(GREG *G); \/* 54 *\/\n-YY_RULE(int) yy_FencedCodeBlockTidle(GREG *G); \/* 53 *\/\n-YY_RULE(int) yy_FencedCodeBlockTick(GREG *G); \/* 52 *\/\n-YY_RULE(int) yy_FencedCodeBlockEndTidle(GREG *G); \/* 51 *\/\n-YY_RULE(int) yy_FencedCodeBlockChunkTidle(GREG *G); \/* 50 *\/\n-YY_RULE(int) yy_FencedCodeBlockStartTidle(GREG *G); \/* 49 *\/\n-YY_RULE(int) yy_Spacechar(GREG *G); \/* 48 *\/\n-YY_RULE(int) yy_FencedCodeBlockEndTick(GREG *G); \/* 47 *\/\n-YY_RULE(int) yy_FencedCodeBlockChunkTick(GREG *G); \/* 46 *\/\n+YY_RULE(int) yy_RawNoteBlock(GREG *G); \/* 268 *\/\n+YY_RULE(int) yy_RawNoteReference(GREG *G); \/* 267 *\/\n+YY_RULE(int) yy_AlphanumericAscii(GREG *G); \/* 266 *\/\n+YY_RULE(int) yy_Quoted(GREG *G); \/* 265 *\/\n+YY_RULE(int) yy_HtmlTag(GREG *G); \/* 264 *\/\n+YY_RULE(int) yy_MarkTagClose(GREG *G); \/* 263 *\/\n+YY_RULE(int) yy_MarkTagText(GREG *G); \/* 262 *\/\n+YY_RULE(int) yy_MarkTagOpen(GREG *G); \/* 261 *\/\n+YY_RULE(int) yy_Ticks5(GREG *G); \/* 260 *\/\n+YY_RULE(int) yy_Ticks4(GREG *G); \/* 259 *\/\n+YY_RULE(int) yy_Ticks3(GREG *G); \/* 258 *\/\n+YY_RULE(int) yy_Ticks2(GREG *G); \/* 257 *\/\n+YY_RULE(int) yy_Ticks1(GREG *G); \/* 256 *\/\n+YY_RULE(int) yy_SkipBlock(GREG *G); \/* 255 *\/\n+YY_RULE(int) yy_References(GREG *G); \/* 254 *\/\n+YY_RULE(int) yy_EmptyTitle(GREG *G); \/* 253 *\/\n+YY_RULE(int) yy_RefTitleParens(GREG *G); \/* 252 *\/\n+YY_RULE(int) yy_RefTitleDouble(GREG *G); \/* 251 *\/\n+YY_RULE(int) yy_RefTitleSingle(GREG *G); \/* 250 *\/\n+YY_RULE(int) yy_LabelInline(GREG *G); \/* 249 *\/\n+YY_RULE(int) yy_RefTitle(GREG *G); \/* 248 *\/\n+YY_RULE(int) yy_RefSrc(GREG *G); \/* 247 *\/\n+YY_RULE(int) yy_AutoLinkEmail(GREG *G); \/* 246 *\/\n+YY_RULE(int) yy_AutoLinkUrl(GREG *G); \/* 245 *\/\n+YY_RULE(int) yy_ImageSizeHeight(GREG *G); \/* 244 *\/\n+YY_RULE(int) yy_ImageSizeWidth(GREG *G); \/* 243 *\/\n+YY_RULE(int) yy_ImageSizeComplete(GREG *G); \/* 242 *\/\n+YY_RULE(int) yy_TitleDoubleExt(GREG *G); \/* 241 *\/\n+YY_RULE(int) yy_TitleSingleExt(GREG *G); \/* 240 *\/\n+YY_RULE(int) yy_TitleDouble(GREG *G); \/* 239 *\/\n+YY_RULE(int) yy_TitleSingle(GREG *G); \/* 238 *\/\n+YY_RULE(int) yy_SourceContents(GREG *G); \/* 237 *\/\n+YY_RULE(int) yy_ImageSize(GREG *G); \/* 236 *\/\n+YY_RULE(int) yy_TitleExt(GREG *G); \/* 235 *\/\n+YY_RULE(int) yy_Title(GREG *G); \/* 234 *\/\n+YY_RULE(int) yy_Source(GREG *G); \/* 233 *\/\n+YY_RULE(int) yy_Label(GREG *G); \/* 232 *\/\n+YY_RULE(int) yy_ReferenceLinkSingle(GREG *G); \/* 231 *\/\n+YY_RULE(int) yy_ReferenceLinkDouble(GREG *G); \/* 230 *\/\n+YY_RULE(int) yy_AutoLink(GREG *G); \/* 229 *\/\n+YY_RULE(int) yy_ReferenceLink(GREG *G); \/* 228 *\/\n+YY_RULE(int) yy_ExplicitLinkSize(GREG *G); \/* 227 *\/\n+YY_RULE(int) yy_ExplicitLink(GREG *G); \/* 226 *\/\n+YY_RULE(int) yy_StrongUl(GREG *G); \/* 225 *\/\n+YY_RULE(int) yy_StrongStar(GREG *G); \/* 224 *\/\n+YY_RULE(int) yy_Whitespace(GREG *G); \/* 223 *\/\n+YY_RULE(int) yy_EmphUl(GREG *G); \/* 222 *\/\n+YY_RULE(int) yy_EmphStar(GREG *G); \/* 221 *\/\n+YY_RULE(int) yy_StarLine(GREG *G); \/* 220 *\/\n+YY_RULE(int) yy_UlLine(GREG *G); \/* 219 *\/\n+YY_RULE(int) yy_SpecialChar(GREG *G); \/* 218 *\/\n+YY_RULE(int) yy_Eof(GREG *G); \/* 217 *\/\n+YY_RULE(int) yy_NormalEndline(GREG *G); \/* 216 *\/\n+YY_RULE(int) yy_TerminalEndline(GREG *G); \/* 215 *\/\n+YY_RULE(int) yy_LineBreak(GREG *G); \/* 214 *\/\n+YY_RULE(int) yy_CharEntity(GREG *G); \/* 213 *\/\n+YY_RULE(int) yy_DecEntity(GREG *G); \/* 212 *\/\n+YY_RULE(int) yy_HexEntity(GREG *G); \/* 211 *\/\n+YY_RULE(int) yy_ExtendedSpecialChar(GREG *G); \/* 210 *\/\n+YY_RULE(int) yy_Alphanumeric(GREG *G); \/* 209 *\/\n+YY_RULE(int) yy_NormalChar(GREG *G); \/* 208 *\/\n+YY_RULE(int) yy_Symbol(GREG *G); \/* 207 *\/\n+YY_RULE(int) yy_EscapedChar(GREG *G); \/* 206 *\/\n+YY_RULE(int) yy_Entity(GREG *G); \/* 205 *\/\n+YY_RULE(int) yy_RawHtml(GREG *G); \/* 204 *\/\n+YY_RULE(int) yy_Mark(GREG *G); \/* 203 *\/\n+YY_RULE(int) yy_Code(GREG *G); \/* 202 *\/\n+YY_RULE(int) yy_InlineNote(GREG *G); \/* 201 *\/\n+YY_RULE(int) yy_NoteReference(GREG *G); \/* 200 *\/\n+YY_RULE(int) yy_Link(GREG *G); \/* 199 *\/\n+YY_RULE(int) yy_Image(GREG *G); \/* 198 *\/\n+YY_RULE(int) yy_Strike(GREG *G); \/* 197 *\/\n+YY_RULE(int) yy_Emph(GREG *G); \/* 196 *\/\n+YY_RULE(int) yy_Strong(GREG *G); \/* 195 *\/\n+YY_RULE(int) yy_UlOrStarLine(GREG *G); \/* 194 *\/\n+YY_RULE(int) yy_Str(GREG *G); \/* 193 *\/\n+YY_RULE(int) yy_InStyleTags(GREG *G); \/* 192 *\/\n+YY_RULE(int) yy_StyleClose(GREG *G); \/* 191 *\/\n+YY_RULE(int) yy_StyleOpen(GREG *G); \/* 190 *\/\n+YY_RULE(int) yy_HtmlBlockType(GREG *G); \/* 189 *\/\n+YY_RULE(int) yy_HtmlBlockSelfClosing(GREG *G); \/* 188 *\/\n+YY_RULE(int) yy_HtmlComment(GREG *G); \/* 187 *\/\n+YY_RULE(int) yy_HtmlBlockInTags(GREG *G); \/* 186 *\/\n+YY_RULE(int) yy_HtmlBlockHead(GREG *G); \/* 185 *\/\n+YY_RULE(int) yy_HtmlBlockCloseHead(GREG *G); \/* 184 *\/\n+YY_RULE(int) yy_HtmlBlockOpenHead(GREG *G); \/* 183 *\/\n+YY_RULE(int) yy_HtmlBlockScript(GREG *G); \/* 182 *\/\n+YY_RULE(int) yy_HtmlBlockCloseScript(GREG *G); \/* 181 *\/\n+YY_RULE(int) yy_HtmlBlockOpenScript(GREG *G); \/* 180 *\/\n+YY_RULE(int) yy_HtmlBlockTr(GREG *G); \/* 179 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTr(GREG *G); \/* 178 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTr(GREG *G); \/* 177 *\/\n+YY_RULE(int) yy_HtmlBlockThead(GREG *G); \/* 176 *\/\n+YY_RULE(int) yy_HtmlBlockCloseThead(GREG *G); \/* 175 *\/\n+YY_RULE(int) yy_HtmlBlockOpenThead(GREG *G); \/* 174 *\/\n+YY_RULE(int) yy_HtmlBlockTh(GREG *G); \/* 173 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTh(GREG *G); \/* 172 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTh(GREG *G); \/* 171 *\/\n+YY_RULE(int) yy_HtmlBlockTfoot(GREG *G); \/* 170 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTfoot(GREG *G); \/* 169 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTfoot(GREG *G); \/* 168 *\/\n+YY_RULE(int) yy_HtmlBlockTd(GREG *G); \/* 167 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTd(GREG *G); \/* 166 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTd(GREG *G); \/* 165 *\/\n+YY_RULE(int) yy_HtmlBlockTbody(GREG *G); \/* 164 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTbody(GREG *G); \/* 163 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTbody(GREG *G); \/* 162 *\/\n+YY_RULE(int) yy_HtmlBlockLi(GREG *G); \/* 161 *\/\n+YY_RULE(int) yy_HtmlBlockCloseLi(GREG *G); \/* 160 *\/\n+YY_RULE(int) yy_HtmlBlockOpenLi(GREG *G); \/* 159 *\/\n+YY_RULE(int) yy_HtmlBlockFrameset(GREG *G); \/* 158 *\/\n+YY_RULE(int) yy_HtmlBlockCloseFrameset(GREG *G); \/* 157 *\/\n+YY_RULE(int) yy_HtmlBlockOpenFrameset(GREG *G); \/* 156 *\/\n+YY_RULE(int) yy_HtmlBlockDt(GREG *G); \/* 155 *\/\n+YY_RULE(int) yy_HtmlBlockCloseDt(GREG *G); \/* 154 *\/\n+YY_RULE(int) yy_HtmlBlockOpenDt(GREG *G); \/* 153 *\/\n+YY_RULE(int) yy_HtmlBlockDd(GREG *G); \/* 152 *\/\n+YY_RULE(int) yy_HtmlBlockCloseDd(GREG *G); \/* 151 *\/\n+YY_RULE(int) yy_HtmlBlockOpenDd(GREG *G); \/* 150 *\/\n+YY_RULE(int) yy_HtmlBlockUl(GREG *G); \/* 149 *\/\n+YY_RULE(int) yy_HtmlBlockCloseUl(GREG *G); \/* 148 *\/\n+YY_RULE(int) yy_HtmlBlockOpenUl(GREG *G); \/* 147 *\/\n+YY_RULE(int) yy_HtmlBlockTable(GREG *G); \/* 146 *\/\n+YY_RULE(int) yy_HtmlBlockCloseTable(GREG *G); \/* 145 *\/\n+YY_RULE(int) yy_HtmlBlockOpenTable(GREG *G); \/* 144 *\/\n+YY_RULE(int) yy_HtmlBlockPre(GREG *G); \/* 143 *\/\n+YY_RULE(int) yy_HtmlBlockClosePre(GREG *G); \/* 142 *\/\n+YY_RULE(int) yy_HtmlBlockOpenPre(GREG *G); \/* 141 *\/\n+YY_RULE(int) yy_HtmlBlockP(GREG *G); \/* 140 *\/\n+YY_RULE(int) yy_HtmlBlockCloseP(GREG *G); \/* 139 *\/\n+YY_RULE(int) yy_HtmlBlockOpenP(GREG *G); \/* 138 *\/\n+YY_RULE(int) yy_HtmlBlockOl(GREG *G); \/* 137 *\/\n+YY_RULE(int) yy_HtmlBlockCloseOl(GREG *G); \/* 136 *\/\n+YY_RULE(int) yy_HtmlBlockOpenOl(GREG *G); \/* 135 *\/\n+YY_RULE(int) yy_HtmlBlockNoscript(GREG *G); \/* 134 *\/\n+YY_RULE(int) yy_HtmlBlockCloseNoscript(GREG *G); \/* 133 *\/\n+YY_RULE(int) yy_HtmlBlockOpenNoscript(GREG *G); \/* 132 *\/\n+YY_RULE(int) yy_HtmlBlockNoframes(GREG *G); \/* 131 *\/\n+YY_RULE(int) yy_HtmlBlockCloseNoframes(GREG *G); \/* 130 *\/\n+YY_RULE(int) yy_HtmlBlockOpenNoframes(GREG *G); \/* 129 *\/\n+YY_RULE(int) yy_HtmlBlockMenu(GREG *G); \/* 128 *\/\n+YY_RULE(int) yy_HtmlBlockCloseMenu(GREG *G); \/* 127 *\/\n+YY_RULE(int) yy_HtmlBlockOpenMenu(GREG *G); \/* 126 *\/\n+YY_RULE(int) yy_HtmlBlockH6(GREG *G); \/* 125 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH6(GREG *G); \/* 124 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH6(GREG *G); \/* 123 *\/\n+YY_RULE(int) yy_HtmlBlockH5(GREG *G); \/* 122 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH5(GREG *G); \/* 121 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH5(GREG *G); \/* 120 *\/\n+YY_RULE(int) yy_HtmlBlockH4(GREG *G); \/* 119 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH4(GREG *G); \/* 118 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH4(GREG *G); \/* 117 *\/\n+YY_RULE(int) yy_HtmlBlockH3(GREG *G); \/* 116 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH3(GREG *G); \/* 115 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH3(GREG *G); \/* 114 *\/\n+YY_RULE(int) yy_HtmlBlockH2(GREG *G); \/* 113 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH2(GREG *G); \/* 112 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH2(GREG *G); \/* 111 *\/\n+YY_RULE(int) yy_HtmlBlockH1(GREG *G); \/* 110 *\/\n+YY_RULE(int) yy_HtmlBlockCloseH1(GREG *G); \/* 109 *\/\n+YY_RULE(int) yy_HtmlBlockOpenH1(GREG *G); \/* 108 *\/\n+YY_RULE(int) yy_HtmlBlockForm(GREG *G); \/* 107 *\/\n+YY_RULE(int) yy_HtmlBlockCloseForm(GREG *G); \/* 106 *\/\n+YY_RULE(int) yy_HtmlBlockOpenForm(GREG *G); \/* 105 *\/\n+YY_RULE(int) yy_HtmlBlockFieldset(GREG *G); \/* 104 *\/\n+YY_RULE(int) yy_HtmlBlockCloseFieldset(GREG *G); \/* 103 *\/\n+YY_RULE(int) yy_HtmlBlockOpenFieldset(GREG *G); \/* 102 *\/\n+YY_RULE(int) yy_HtmlBlockDl(GREG *G); \/* 101 *\/\n+YY_RULE(int) yy_HtmlBlockCloseDl(GREG *G); \/* 100 *\/\n+YY_RULE(int) yy_HtmlBlockOpenDl(GREG *G); \/* 99 *\/\n+YY_RULE(int) yy_HtmlBlockDiv(GREG *G); \/* 98 *\/\n+YY_RULE(int) yy_HtmlBlockCloseDiv(GREG *G); \/* 97 *\/\n+YY_RULE(int) yy_HtmlBlockOpenDiv(GREG *G); \/* 96 *\/\n+YY_RULE(int) yy_HtmlBlockDir(GREG *G); \/* 95 *\/\n+YY_RULE(int) yy_HtmlBlockCloseDir(GREG *G); \/* 94 *\/\n+YY_RULE(int) yy_HtmlBlockOpenDir(GREG *G); \/* 93 *\/\n+YY_RULE(int) yy_HtmlBlockCenter(GREG *G); \/* 92 *\/\n+YY_RULE(int) yy_HtmlBlockCloseCenter(GREG *G); \/* 91 *\/\n+YY_RULE(int) yy_HtmlBlockOpenCenter(GREG *G); \/* 90 *\/\n+YY_RULE(int) yy_HtmlBlockBlockquote(GREG *G); \/* 89 *\/\n+YY_RULE(int) yy_HtmlBlockCloseBlockquote(GREG *G); \/* 88 *\/\n+YY_RULE(int) yy_HtmlBlockOpenBlockquote(GREG *G); \/* 87 *\/\n+YY_RULE(int) yy_HtmlBlockAddress(GREG *G); \/* 86 *\/\n+YY_RULE(int) yy_HtmlBlockCloseAddress(GREG *G); \/* 85 *\/\n+YY_RULE(int) yy_HtmlAttribute(GREG *G); \/* 84 *\/\n+YY_RULE(int) yy_HtmlBlockOpenAddress(GREG *G); \/* 83 *\/\n+YY_RULE(int) yy_OptionallyIndentedLine(GREG *G); \/* 82 *\/\n+YY_RULE(int) yy_Indent(GREG *G); \/* 81 *\/\n+YY_RULE(int) yy_ListBlockLine(GREG *G); \/* 80 *\/\n+YY_RULE(int) yy_ListContinuationBlock(GREG *G); \/* 79 *\/\n+YY_RULE(int) yy_ListBlock(GREG *G); \/* 78 *\/\n+YY_RULE(int) yy_ListItem(GREG *G); \/* 77 *\/\n+YY_RULE(int) yy_Enumerator(GREG *G); \/* 76 *\/\n+YY_RULE(int) yy_ListItemTight(GREG *G); \/* 75 *\/\n+YY_RULE(int) yy_ListLoose(GREG *G); \/* 74 *\/\n+YY_RULE(int) yy_ListTight(GREG *G); \/* 73 *\/\n+YY_RULE(int) yy_Bullet(GREG *G); \/* 72 *\/\n+YY_RULE(int) yy_TableCell(GREG *G); \/* 71 *\/\n+YY_RULE(int) yy_TableBorder(GREG *G); \/* 70 *\/\n+YY_RULE(int) yy_TableLine(GREG *G); \/* 69 *\/\n+YY_RULE(int) yy_TableDelimiter(GREG *G); \/* 68 *\/\n+YY_RULE(int) yy_TableHeader(GREG *G); \/* 67 *\/\n+YY_RULE(int) yy_InlineEquationMultiple(GREG *G); \/* 66 *\/\n+YY_RULE(int) yy_InlineEquationSingle(GREG *G); \/* 65 *\/\n+YY_RULE(int) yy_InlineEquation(GREG *G); \/* 64 *\/\n+YY_RULE(int) yy_Nonspacechar(GREG *G); \/* 63 *\/\n+YY_RULE(int) yy_DisplayFormulaRawMark(GREG *G); \/* 62 *\/\n+YY_RULE(int) yy_DisplayFormulaRawEnd(GREG *G); \/* 61 *\/\n+YY_RULE(int) yy_Spnl(GREG *G); \/* 60 *\/\n+YY_RULE(int) yy_DisplayFormulaRawStart(GREG *G); \/* 59 *\/\n+YY_RULE(int) yy_FormulaNumber(GREG *G); \/* 58 *\/\n+YY_RULE(int) yy_DisplayFormulaRaw(GREG *G); \/* 57 *\/\n+YY_RULE(int) yy_DisplayFormulaDollar(GREG *G); \/* 56 *\/\n+YY_RULE(int) yy_FencedCodeBlockTidle(GREG *G); \/* 55 *\/\n+YY_RULE(int) yy_FencedCodeBlockTick(GREG *G); \/* 54 *\/\n+YY_RULE(int) yy_FencedCodeBlockEndTidle(GREG *G); \/* 53 *\/\n+YY_RULE(int) yy_FencedCodeBlockChunkTidle(GREG *G); \/* 52 *\/\n+YY_RULE(int) yy_FencedCodeBlockStartTidleLine(GREG *G); \/* 51 *\/\n+YY_RULE(int) yy_FencedCodeBlockStartTidle(GREG *G); \/* 50 *\/\n+YY_RULE(int) yy_Spacechar(GREG *G); \/* 49 *\/\n+YY_RULE(int) yy_FencedCodeBlockEndTick(GREG *G); \/* 48 *\/\n+YY_RULE(int) yy_FencedCodeBlockChunkTick(GREG *G); \/* 47 *\/\n+YY_RULE(int) yy_FencedCodeBlockStartTickLine(GREG *G); \/* 46 *\/\n YY_RULE(int) yy_FencedCodeBlockStartTick(GREG *G); \/* 45 *\/\n YY_RULE(int) yy_VerbatimChunk(GREG *G); \/* 44 *\/\n YY_RULE(int) yy_IndentedLine(GREG *G); \/* 43 *\/\n@@ -2171,12 +2173,15 @@\n yyprintf((stderr, \"do yy_1_DisplayFormulaDollar\\n\"));\n ADD(elem(pmh_DISPLAYFORMULA)); ;\n }\n-YY_ACTION(void) yy_1_FencedCodeBlock(GREG *G, char *yytext, int yyleng, yythunk *thunk, YY_XTYPE YY_XVAR)\n-{\n-#define s G->val[-1]\n- yyprintf((stderr, \"do yy_1_FencedCodeBlock\\n\"));\n+YY_ACTION(void) yy_1_FencedCodeBlockTidle(GREG *G, char *yytext, int yyleng, yythunk *thunk, YY_XTYPE YY_XVAR)\n+{\n+ yyprintf((stderr, \"do yy_1_FencedCodeBlockTidle\\n\"));\n ADD(elem(pmh_FENCEDCODEBLOCK)); ;\n-#undef s\n+}\n+YY_ACTION(void) yy_1_FencedCodeBlockTick(GREG *G, char *yytext, int yyleng, yythunk *thunk, YY_XTYPE YY_XVAR)\n+{\n+ yyprintf((stderr, \"do yy_1_FencedCodeBlockTick\\n\"));\n+ ADD(elem(pmh_FENCEDCODEBLOCK)); ;\n }\n YY_ACTION(void) yy_1_Verbatim(GREG *G, char *yytext, int yyleng, yythunk *thunk, YY_XTYPE YY_XVAR)\n {\n@@ -2319,565 +2324,551 @@\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RawNoteReference\", G->buf+G->pos));\n return 0;\n }\n-YY_RULE(int) yy_ExtendedSpecialChar(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"ExtendedSpecialChar\"));\n- { int yypos16= G->pos, yythunkpos16= G->thunkpos; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l17; if (!yymatchChar(G, '^')) goto l17; goto l16;\n- l17:;\t G->pos= yypos16; G->thunkpos= yythunkpos16; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l18; if (!yymatchChar(G, '$')) goto l18; goto l16;\n- l18:;\t G->pos= yypos16; G->thunkpos= yythunkpos16; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_TABLE) )) goto l15; if (!yymatchChar(G, '|')) goto l15;\n- }\n- l16:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"ExtendedSpecialChar\", G->buf+G->pos));\n+YY_RULE(int) yy_AlphanumericAscii(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"AlphanumericAscii\")); if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l15;\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"AlphanumericAscii\", G->buf+G->pos));\n return 1;\n l15:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"ExtendedSpecialChar\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_AlphanumericAscii(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"AlphanumericAscii\")); if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l19;\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"AlphanumericAscii\", G->buf+G->pos));\n- return 1;\n- l19:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AlphanumericAscii\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Quoted(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Quoted\"));\n- { int yypos21= G->pos, yythunkpos21= G->thunkpos; if (!yymatchChar(G, '\"')) goto l22;\n- l23:;\t\n- { int yypos24= G->pos, yythunkpos24= G->thunkpos;\n- { int yypos25= G->pos, yythunkpos25= G->thunkpos; if (!yymatchChar(G, '\"')) goto l25; goto l24;\n- l25:;\t G->pos= yypos25; G->thunkpos= yythunkpos25;\n- } if (!yymatchDot(G)) goto l24; goto l23;\n+ { int yypos17= G->pos, yythunkpos17= G->thunkpos; if (!yymatchChar(G, '\"')) goto l18;\n+ l19:;\t\n+ { int yypos20= G->pos, yythunkpos20= G->thunkpos;\n+ { int yypos21= G->pos, yythunkpos21= G->thunkpos; if (!yymatchChar(G, '\"')) goto l21; goto l20;\n+ l21:;\t G->pos= yypos21; G->thunkpos= yythunkpos21;\n+ } if (!yymatchDot(G)) goto l20; goto l19;\n+ l20:;\t G->pos= yypos20; G->thunkpos= yythunkpos20;\n+ } if (!yymatchChar(G, '\"')) goto l18; goto l17;\n+ l18:;\t G->pos= yypos17; G->thunkpos= yythunkpos17; if (!yymatchChar(G, '\\'')) goto l16;\n+ l22:;\t\n+ { int yypos23= G->pos, yythunkpos23= G->thunkpos;\n+ { int yypos24= G->pos, yythunkpos24= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l24; goto l23;\n l24:;\t G->pos= yypos24; G->thunkpos= yythunkpos24;\n- } if (!yymatchChar(G, '\"')) goto l22; goto l21;\n- l22:;\t G->pos= yypos21; G->thunkpos= yythunkpos21; if (!yymatchChar(G, '\\'')) goto l20;\n- l26:;\t\n- { int yypos27= G->pos, yythunkpos27= G->thunkpos;\n- { int yypos28= G->pos, yythunkpos28= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l28; goto l27;\n- l28:;\t G->pos= yypos28; G->thunkpos= yythunkpos28;\n- } if (!yymatchDot(G)) goto l27; goto l26;\n- l27:;\t G->pos= yypos27; G->thunkpos= yythunkpos27;\n- } if (!yymatchChar(G, '\\'')) goto l20;\n- }\n- l21:;\t\n+ } if (!yymatchDot(G)) goto l23; goto l22;\n+ l23:;\t G->pos= yypos23; G->thunkpos= yythunkpos23;\n+ } if (!yymatchChar(G, '\\'')) goto l16;\n+ }\n+ l17:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Quoted\", G->buf+G->pos));\n return 1;\n- l20:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l16:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Quoted\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlTag(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlTag\")); if (!yymatchChar(G, '<')) goto l29; if (!yy_Spnl(G)) { goto l29; }\n- { int yypos30= G->pos, yythunkpos30= G->thunkpos; if (!yymatchChar(G, '\/')) goto l30; goto l31;\n- l30:;\t G->pos= yypos30; G->thunkpos= yythunkpos30;\n- }\n- l31:;\t if (!yy_AlphanumericAscii(G)) { goto l29; }\n- l32:;\t\n- { int yypos33= G->pos, yythunkpos33= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l33; } goto l32;\n- l33:;\t G->pos= yypos33; G->thunkpos= yythunkpos33;\n- } if (!yy_Spnl(G)) { goto l29; }\n- l34:;\t\n- { int yypos35= G->pos, yythunkpos35= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l35; } goto l34;\n- l35:;\t G->pos= yypos35; G->thunkpos= yythunkpos35;\n- }\n- { int yypos36= G->pos, yythunkpos36= G->thunkpos; if (!yymatchChar(G, '\/')) goto l36; goto l37;\n- l36:;\t G->pos= yypos36; G->thunkpos= yythunkpos36;\n- }\n- l37:;\t if (!yy_Spnl(G)) { goto l29; } if (!yymatchChar(G, '>')) goto l29;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlTag\")); if (!yymatchChar(G, '<')) goto l25; if (!yy_Spnl(G)) { goto l25; }\n+ { int yypos26= G->pos, yythunkpos26= G->thunkpos; if (!yymatchChar(G, '\/')) goto l26; goto l27;\n+ l26:;\t G->pos= yypos26; G->thunkpos= yythunkpos26;\n+ }\n+ l27:;\t if (!yy_AlphanumericAscii(G)) { goto l25; }\n+ l28:;\t\n+ { int yypos29= G->pos, yythunkpos29= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l29; } goto l28;\n+ l29:;\t G->pos= yypos29; G->thunkpos= yythunkpos29;\n+ } if (!yy_Spnl(G)) { goto l25; }\n+ l30:;\t\n+ { int yypos31= G->pos, yythunkpos31= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l31; } goto l30;\n+ l31:;\t G->pos= yypos31; G->thunkpos= yythunkpos31;\n+ }\n+ { int yypos32= G->pos, yythunkpos32= G->thunkpos; if (!yymatchChar(G, '\/')) goto l32; goto l33;\n+ l32:;\t G->pos= yypos32; G->thunkpos= yythunkpos32;\n+ }\n+ l33:;\t if (!yy_Spnl(G)) { goto l25; } if (!yymatchChar(G, '>')) goto l25;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlTag\", G->buf+G->pos));\n return 1;\n- l29:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l25:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlTag\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_MarkTagClose(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"MarkTagClose\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l38; if (!yy_LocMarker(G)) { goto l38; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '<')) goto l38; if (!yy_Spnl(G)) { goto l38; } if (!yymatchChar(G, '\/')) goto l38;\n- { int yypos39= G->pos, yythunkpos39= G->thunkpos; if (!yymatchString(G, \"mark\")) goto l40; goto l39;\n- l40:;\t G->pos= yypos39; G->thunkpos= yythunkpos39; if (!yymatchString(G, \"MARK\")) goto l38;\n- }\n- l39:;\t if (!yy_Spnl(G)) { goto l38; } if (!yymatchChar(G, '>')) goto l38; yyText(G, G->begin, G->end); if (!(YY_END)) goto l38; yyDo(G, yy_1_MarkTagClose, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"MarkTagClose\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l34; if (!yy_LocMarker(G)) { goto l34; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '<')) goto l34; if (!yy_Spnl(G)) { goto l34; } if (!yymatchChar(G, '\/')) goto l34;\n+ { int yypos35= G->pos, yythunkpos35= G->thunkpos; if (!yymatchString(G, \"mark\")) goto l36; goto l35;\n+ l36:;\t G->pos= yypos35; G->thunkpos= yythunkpos35; if (!yymatchString(G, \"MARK\")) goto l34;\n+ }\n+ l35:;\t if (!yy_Spnl(G)) { goto l34; } if (!yymatchChar(G, '>')) goto l34; yyText(G, G->begin, G->end); if (!(YY_END)) goto l34; yyDo(G, yy_1_MarkTagClose, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"MarkTagClose\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l38:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l34:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"MarkTagClose\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_MarkTagText(GREG *G)\n {\n yyprintf((stderr, \"%s\\n\", \"MarkTagText\"));\n- l42:;\t\n- { int yypos43= G->pos, yythunkpos43= G->thunkpos;\n- { int yypos44= G->pos, yythunkpos44= G->thunkpos; if (!yy_MarkTagClose(G)) { goto l44; } goto l43;\n- l44:;\t G->pos= yypos44; G->thunkpos= yythunkpos44;\n- }\n- { int yypos45= G->pos, yythunkpos45= G->thunkpos; if (!yy_RawHtml(G)) { goto l46; } goto l45;\n- l46:;\t G->pos= yypos45; G->thunkpos= yythunkpos45; if (!yymatchDot(G)) goto l43;\n- }\n- l45:;\t goto l42;\n- l43:;\t G->pos= yypos43; G->thunkpos= yythunkpos43;\n+ l38:;\t\n+ { int yypos39= G->pos, yythunkpos39= G->thunkpos;\n+ { int yypos40= G->pos, yythunkpos40= G->thunkpos; if (!yy_MarkTagClose(G)) { goto l40; } goto l39;\n+ l40:;\t G->pos= yypos40; G->thunkpos= yythunkpos40;\n+ }\n+ { int yypos41= G->pos, yythunkpos41= G->thunkpos; if (!yy_RawHtml(G)) { goto l42; } goto l41;\n+ l42:;\t G->pos= yypos41; G->thunkpos= yythunkpos41; if (!yymatchDot(G)) goto l39;\n+ }\n+ l41:;\t goto l38;\n+ l39:;\t G->pos= yypos39; G->thunkpos= yythunkpos39;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"MarkTagText\", G->buf+G->pos));\n return 1;\n }\n YY_RULE(int) yy_MarkTagOpen(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"MarkTagOpen\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l47; if (!yy_LocMarker(G)) { goto l47; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '<')) goto l47; if (!yy_Spnl(G)) { goto l47; }\n- { int yypos48= G->pos, yythunkpos48= G->thunkpos; if (!yymatchString(G, \"mark\")) goto l49; goto l48;\n- l49:;\t G->pos= yypos48; G->thunkpos= yythunkpos48; if (!yymatchString(G, \"MARK\")) goto l47;\n- }\n- l48:;\t if (!yy_Spnl(G)) { goto l47; }\n- l50:;\t\n- { int yypos51= G->pos, yythunkpos51= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l51; } goto l50;\n+ yyprintf((stderr, \"%s\\n\", \"MarkTagOpen\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l43; if (!yy_LocMarker(G)) { goto l43; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '<')) goto l43; if (!yy_Spnl(G)) { goto l43; }\n+ { int yypos44= G->pos, yythunkpos44= G->thunkpos; if (!yymatchString(G, \"mark\")) goto l45; goto l44;\n+ l45:;\t G->pos= yypos44; G->thunkpos= yythunkpos44; if (!yymatchString(G, \"MARK\")) goto l43;\n+ }\n+ l44:;\t if (!yy_Spnl(G)) { goto l43; }\n+ l46:;\t\n+ { int yypos47= G->pos, yythunkpos47= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l47; } goto l46;\n+ l47:;\t G->pos= yypos47; G->thunkpos= yythunkpos47;\n+ } if (!yymatchChar(G, '>')) goto l43; yyText(G, G->begin, G->end); if (!(YY_END)) goto l43; yyDo(G, yy_1_MarkTagOpen, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"MarkTagOpen\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n+ return 1;\n+ l43:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"MarkTagOpen\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Ticks5(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Ticks5\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l48; if (!yymatchString(G, \"`````\")) goto l48; yyText(G, G->begin, G->end); if (!(YY_END)) goto l48;\n+ { int yypos49= G->pos, yythunkpos49= G->thunkpos; if (!yymatchChar(G, '`')) goto l49; goto l48;\n+ l49:;\t G->pos= yypos49; G->thunkpos= yythunkpos49;\n+ } yyDo(G, yy_1_Ticks5, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks5\", G->buf+G->pos));\n+ return 1;\n+ l48:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks5\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Ticks4(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Ticks4\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l50; if (!yymatchString(G, \"````\")) goto l50; yyText(G, G->begin, G->end); if (!(YY_END)) goto l50;\n+ { int yypos51= G->pos, yythunkpos51= G->thunkpos; if (!yymatchChar(G, '`')) goto l51; goto l50;\n l51:;\t G->pos= yypos51; G->thunkpos= yythunkpos51;\n- } if (!yymatchChar(G, '>')) goto l47; yyText(G, G->begin, G->end); if (!(YY_END)) goto l47; yyDo(G, yy_1_MarkTagOpen, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"MarkTagOpen\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n- return 1;\n- l47:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"MarkTagOpen\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Ticks5(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Ticks5\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l52; if (!yymatchString(G, \"`````\")) goto l52; yyText(G, G->begin, G->end); if (!(YY_END)) goto l52;\n+ } yyDo(G, yy_1_Ticks4, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks4\", G->buf+G->pos));\n+ return 1;\n+ l50:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks4\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Ticks3(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Ticks3\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l52; if (!yymatchString(G, \"```\")) goto l52; yyText(G, G->begin, G->end); if (!(YY_END)) goto l52;\n { int yypos53= G->pos, yythunkpos53= G->thunkpos; if (!yymatchChar(G, '`')) goto l53; goto l52;\n l53:;\t G->pos= yypos53; G->thunkpos= yythunkpos53;\n- } yyDo(G, yy_1_Ticks5, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks5\", G->buf+G->pos));\n+ } yyDo(G, yy_1_Ticks3, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks3\", G->buf+G->pos));\n return 1;\n l52:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks5\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Ticks4(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Ticks4\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l54; if (!yymatchString(G, \"````\")) goto l54; yyText(G, G->begin, G->end); if (!(YY_END)) goto l54;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks3\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Ticks2(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Ticks2\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l54; if (!yymatchString(G, \"``\")) goto l54; yyText(G, G->begin, G->end); if (!(YY_END)) goto l54;\n { int yypos55= G->pos, yythunkpos55= G->thunkpos; if (!yymatchChar(G, '`')) goto l55; goto l54;\n l55:;\t G->pos= yypos55; G->thunkpos= yythunkpos55;\n- } yyDo(G, yy_1_Ticks4, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks4\", G->buf+G->pos));\n+ } yyDo(G, yy_1_Ticks2, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks2\", G->buf+G->pos));\n return 1;\n l54:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks4\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Ticks3(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Ticks3\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l56; if (!yymatchString(G, \"```\")) goto l56; yyText(G, G->begin, G->end); if (!(YY_END)) goto l56;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks2\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Ticks1(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Ticks1\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l56; if (!yymatchChar(G, '`')) goto l56; yyText(G, G->begin, G->end); if (!(YY_END)) goto l56;\n { int yypos57= G->pos, yythunkpos57= G->thunkpos; if (!yymatchChar(G, '`')) goto l57; goto l56;\n l57:;\t G->pos= yypos57; G->thunkpos= yythunkpos57;\n- } yyDo(G, yy_1_Ticks3, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks3\", G->buf+G->pos));\n- return 1;\n- l56:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks3\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Ticks2(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Ticks2\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l58; if (!yymatchString(G, \"``\")) goto l58; yyText(G, G->begin, G->end); if (!(YY_END)) goto l58;\n- { int yypos59= G->pos, yythunkpos59= G->thunkpos; if (!yymatchChar(G, '`')) goto l59; goto l58;\n- l59:;\t G->pos= yypos59; G->thunkpos= yythunkpos59;\n- } yyDo(G, yy_1_Ticks2, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks2\", G->buf+G->pos));\n- return 1;\n- l58:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks2\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Ticks1(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Ticks1\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l60; if (!yymatchChar(G, '`')) goto l60; yyText(G, G->begin, G->end); if (!(YY_END)) goto l60;\n- { int yypos61= G->pos, yythunkpos61= G->thunkpos; if (!yymatchChar(G, '`')) goto l61; goto l60;\n- l61:;\t G->pos= yypos61; G->thunkpos= yythunkpos61;\n } yyDo(G, yy_1_Ticks1, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Ticks1\", G->buf+G->pos));\n return 1;\n- l60:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l56:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Ticks1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SkipBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"SkipBlock\"));\n- { int yypos63= G->pos, yythunkpos63= G->thunkpos;\n- { int yypos67= G->pos, yythunkpos67= G->thunkpos; if (!yy_BlankLine(G)) { goto l67; } goto l64;\n- l67:;\t G->pos= yypos67; G->thunkpos= yythunkpos67;\n- } if (!yy_RawLine(G)) { goto l64; }\n+ { int yypos59= G->pos, yythunkpos59= G->thunkpos;\n+ { int yypos63= G->pos, yythunkpos63= G->thunkpos; if (!yy_BlankLine(G)) { goto l63; } goto l60;\n+ l63:;\t G->pos= yypos63; G->thunkpos= yythunkpos63;\n+ } if (!yy_RawLine(G)) { goto l60; }\n+ l61:;\t\n+ { int yypos62= G->pos, yythunkpos62= G->thunkpos;\n+ { int yypos64= G->pos, yythunkpos64= G->thunkpos; if (!yy_BlankLine(G)) { goto l64; } goto l62;\n+ l64:;\t G->pos= yypos64; G->thunkpos= yythunkpos64;\n+ } if (!yy_RawLine(G)) { goto l62; } goto l61;\n+ l62:;\t G->pos= yypos62; G->thunkpos= yythunkpos62;\n+ }\n l65:;\t\n- { int yypos66= G->pos, yythunkpos66= G->thunkpos;\n- { int yypos68= G->pos, yythunkpos68= G->thunkpos; if (!yy_BlankLine(G)) { goto l68; } goto l66;\n+ { int yypos66= G->pos, yythunkpos66= G->thunkpos; if (!yy_BlankLine(G)) { goto l66; } goto l65;\n+ l66:;\t G->pos= yypos66; G->thunkpos= yythunkpos66;\n+ } goto l59;\n+ l60:;\t G->pos= yypos59; G->thunkpos= yythunkpos59; if (!yy_BlankLine(G)) { goto l58; }\n+ l67:;\t\n+ { int yypos68= G->pos, yythunkpos68= G->thunkpos; if (!yy_BlankLine(G)) { goto l68; } goto l67;\n l68:;\t G->pos= yypos68; G->thunkpos= yythunkpos68;\n- } if (!yy_RawLine(G)) { goto l66; } goto l65;\n- l66:;\t G->pos= yypos66; G->thunkpos= yythunkpos66;\n- }\n- l69:;\t\n- { int yypos70= G->pos, yythunkpos70= G->thunkpos; if (!yy_BlankLine(G)) { goto l70; } goto l69;\n- l70:;\t G->pos= yypos70; G->thunkpos= yythunkpos70;\n- } goto l63;\n- l64:;\t G->pos= yypos63; G->thunkpos= yythunkpos63; if (!yy_BlankLine(G)) { goto l62; }\n- l71:;\t\n- { int yypos72= G->pos, yythunkpos72= G->thunkpos; if (!yy_BlankLine(G)) { goto l72; } goto l71;\n- l72:;\t G->pos= yypos72; G->thunkpos= yythunkpos72;\n- }\n- }\n- l63:;\t\n+ }\n+ }\n+ l59:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SkipBlock\", G->buf+G->pos));\n return 1;\n- l62:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l58:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SkipBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_References(GREG *G)\n {\n yyprintf((stderr, \"%s\\n\", \"References\"));\n- l74:;\t\n- { int yypos75= G->pos, yythunkpos75= G->thunkpos;\n- { int yypos76= G->pos, yythunkpos76= G->thunkpos; if (!yy_Reference(G)) { goto l77; } goto l76;\n- l77:;\t G->pos= yypos76; G->thunkpos= yythunkpos76; if (!yy_SkipBlock(G)) { goto l75; }\n- }\n- l76:;\t goto l74;\n- l75:;\t G->pos= yypos75; G->thunkpos= yythunkpos75;\n+ l70:;\t\n+ { int yypos71= G->pos, yythunkpos71= G->thunkpos;\n+ { int yypos72= G->pos, yythunkpos72= G->thunkpos; if (!yy_Reference(G)) { goto l73; } goto l72;\n+ l73:;\t G->pos= yypos72; G->thunkpos= yythunkpos72; if (!yy_SkipBlock(G)) { goto l71; }\n+ }\n+ l72:;\t goto l70;\n+ l71:;\t G->pos= yypos71; G->thunkpos= yythunkpos71;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"References\", G->buf+G->pos));\n return 1;\n }\n YY_RULE(int) yy_EmptyTitle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"EmptyTitle\")); if (!yymatchString(G, \"\")) goto l78;\n+ yyprintf((stderr, \"%s\\n\", \"EmptyTitle\")); if (!yymatchString(G, \"\")) goto l74;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"EmptyTitle\", G->buf+G->pos));\n return 1;\n- l78:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l74:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"EmptyTitle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RefTitleParens(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"RefTitleParens\")); if (!yy_Spnl(G)) { goto l79; } if (!yymatchChar(G, '(')) goto l79;\n- l80:;\t\n- { int yypos81= G->pos, yythunkpos81= G->thunkpos;\n- { int yypos82= G->pos, yythunkpos82= G->thunkpos;\n- { int yypos83= G->pos, yythunkpos83= G->thunkpos; if (!yymatchChar(G, ')')) goto l84; if (!yy_Sp(G)) { goto l84; } if (!yy_Newline(G)) { goto l84; } goto l83;\n- l84:;\t G->pos= yypos83; G->thunkpos= yythunkpos83; if (!yy_Newline(G)) { goto l82; }\n- }\n- l83:;\t goto l81;\n- l82:;\t G->pos= yypos82; G->thunkpos= yythunkpos82;\n- } if (!yymatchDot(G)) goto l81; goto l80;\n- l81:;\t G->pos= yypos81; G->thunkpos= yythunkpos81;\n- } if (!yymatchChar(G, ')')) goto l79;\n+ yyprintf((stderr, \"%s\\n\", \"RefTitleParens\")); if (!yy_Spnl(G)) { goto l75; } if (!yymatchChar(G, '(')) goto l75;\n+ l76:;\t\n+ { int yypos77= G->pos, yythunkpos77= G->thunkpos;\n+ { int yypos78= G->pos, yythunkpos78= G->thunkpos;\n+ { int yypos79= G->pos, yythunkpos79= G->thunkpos; if (!yymatchChar(G, ')')) goto l80; if (!yy_Sp(G)) { goto l80; } if (!yy_Newline(G)) { goto l80; } goto l79;\n+ l80:;\t G->pos= yypos79; G->thunkpos= yythunkpos79; if (!yy_Newline(G)) { goto l78; }\n+ }\n+ l79:;\t goto l77;\n+ l78:;\t G->pos= yypos78; G->thunkpos= yythunkpos78;\n+ } if (!yymatchDot(G)) goto l77; goto l76;\n+ l77:;\t G->pos= yypos77; G->thunkpos= yythunkpos77;\n+ } if (!yymatchChar(G, ')')) goto l75;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RefTitleParens\", G->buf+G->pos));\n return 1;\n- l79:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l75:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RefTitleParens\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RefTitleDouble(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"RefTitleDouble\")); if (!yy_Spnl(G)) { goto l85; } if (!yymatchChar(G, '\"')) goto l85;\n- l86:;\t\n- { int yypos87= G->pos, yythunkpos87= G->thunkpos;\n- { int yypos88= G->pos, yythunkpos88= G->thunkpos;\n- { int yypos89= G->pos, yythunkpos89= G->thunkpos; if (!yymatchChar(G, '\"')) goto l90; if (!yy_Sp(G)) { goto l90; } if (!yy_Newline(G)) { goto l90; } goto l89;\n- l90:;\t G->pos= yypos89; G->thunkpos= yythunkpos89; if (!yy_Newline(G)) { goto l88; }\n- }\n- l89:;\t goto l87;\n- l88:;\t G->pos= yypos88; G->thunkpos= yythunkpos88;\n- } if (!yymatchDot(G)) goto l87; goto l86;\n- l87:;\t G->pos= yypos87; G->thunkpos= yythunkpos87;\n- } if (!yymatchChar(G, '\"')) goto l85;\n+ yyprintf((stderr, \"%s\\n\", \"RefTitleDouble\")); if (!yy_Spnl(G)) { goto l81; } if (!yymatchChar(G, '\"')) goto l81;\n+ l82:;\t\n+ { int yypos83= G->pos, yythunkpos83= G->thunkpos;\n+ { int yypos84= G->pos, yythunkpos84= G->thunkpos;\n+ { int yypos85= G->pos, yythunkpos85= G->thunkpos; if (!yymatchChar(G, '\"')) goto l86; if (!yy_Sp(G)) { goto l86; } if (!yy_Newline(G)) { goto l86; } goto l85;\n+ l86:;\t G->pos= yypos85; G->thunkpos= yythunkpos85; if (!yy_Newline(G)) { goto l84; }\n+ }\n+ l85:;\t goto l83;\n+ l84:;\t G->pos= yypos84; G->thunkpos= yythunkpos84;\n+ } if (!yymatchDot(G)) goto l83; goto l82;\n+ l83:;\t G->pos= yypos83; G->thunkpos= yythunkpos83;\n+ } if (!yymatchChar(G, '\"')) goto l81;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RefTitleDouble\", G->buf+G->pos));\n return 1;\n- l85:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l81:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RefTitleDouble\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RefTitleSingle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"RefTitleSingle\")); if (!yy_Spnl(G)) { goto l91; } if (!yymatchChar(G, '\\'')) goto l91;\n- l92:;\t\n- { int yypos93= G->pos, yythunkpos93= G->thunkpos;\n- { int yypos94= G->pos, yythunkpos94= G->thunkpos;\n- { int yypos95= G->pos, yythunkpos95= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l96; if (!yy_Sp(G)) { goto l96; } if (!yy_Newline(G)) { goto l96; } goto l95;\n- l96:;\t G->pos= yypos95; G->thunkpos= yythunkpos95; if (!yy_Newline(G)) { goto l94; }\n- }\n- l95:;\t goto l93;\n- l94:;\t G->pos= yypos94; G->thunkpos= yythunkpos94;\n- } if (!yymatchDot(G)) goto l93; goto l92;\n- l93:;\t G->pos= yypos93; G->thunkpos= yythunkpos93;\n- } if (!yymatchChar(G, '\\'')) goto l91;\n+ yyprintf((stderr, \"%s\\n\", \"RefTitleSingle\")); if (!yy_Spnl(G)) { goto l87; } if (!yymatchChar(G, '\\'')) goto l87;\n+ l88:;\t\n+ { int yypos89= G->pos, yythunkpos89= G->thunkpos;\n+ { int yypos90= G->pos, yythunkpos90= G->thunkpos;\n+ { int yypos91= G->pos, yythunkpos91= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l92; if (!yy_Sp(G)) { goto l92; } if (!yy_Newline(G)) { goto l92; } goto l91;\n+ l92:;\t G->pos= yypos91; G->thunkpos= yythunkpos91; if (!yy_Newline(G)) { goto l90; }\n+ }\n+ l91:;\t goto l89;\n+ l90:;\t G->pos= yypos90; G->thunkpos= yythunkpos90;\n+ } if (!yymatchDot(G)) goto l89; goto l88;\n+ l89:;\t G->pos= yypos89; G->thunkpos= yythunkpos89;\n+ } if (!yymatchChar(G, '\\'')) goto l87;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RefTitleSingle\", G->buf+G->pos));\n return 1;\n- l91:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l87:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RefTitleSingle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_LabelInline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"LabelInline\"));\n- { int yypos98= G->pos, yythunkpos98= G->thunkpos; if (!yy_Str(G)) { goto l99; } goto l98;\n- l99:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_Endline(G)) { goto l100; } goto l98;\n- l100:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_Space(G)) { goto l101; } goto l98;\n- l101:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_RawHtml(G)) { goto l102; } goto l98;\n- l102:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_Entity(G)) { goto l103; } goto l98;\n- l103:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_EscapedChar(G)) { goto l104; } goto l98;\n- l104:;\t G->pos= yypos98; G->thunkpos= yythunkpos98; if (!yy_Symbol(G)) { goto l97; }\n- }\n- l98:;\t\n+ { int yypos94= G->pos, yythunkpos94= G->thunkpos; if (!yy_Str(G)) { goto l95; } goto l94;\n+ l95:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_Endline(G)) { goto l96; } goto l94;\n+ l96:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_Space(G)) { goto l97; } goto l94;\n+ l97:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_RawHtml(G)) { goto l98; } goto l94;\n+ l98:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_Entity(G)) { goto l99; } goto l94;\n+ l99:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_EscapedChar(G)) { goto l100; } goto l94;\n+ l100:;\t G->pos= yypos94; G->thunkpos= yythunkpos94; if (!yy_Symbol(G)) { goto l93; }\n+ }\n+ l94:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"LabelInline\", G->buf+G->pos));\n return 1;\n- l97:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l93:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"LabelInline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RefTitle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"RefTitle\"));\n- { int yypos106= G->pos, yythunkpos106= G->thunkpos; if (!yy_RefTitleSingle(G)) { goto l107; } goto l106;\n- l107:;\t G->pos= yypos106; G->thunkpos= yythunkpos106; if (!yy_RefTitleDouble(G)) { goto l108; } goto l106;\n- l108:;\t G->pos= yypos106; G->thunkpos= yythunkpos106; if (!yy_RefTitleParens(G)) { goto l109; } goto l106;\n- l109:;\t G->pos= yypos106; G->thunkpos= yythunkpos106; if (!yy_EmptyTitle(G)) { goto l105; }\n- }\n- l106:;\t\n+ { int yypos102= G->pos, yythunkpos102= G->thunkpos; if (!yy_RefTitleSingle(G)) { goto l103; } goto l102;\n+ l103:;\t G->pos= yypos102; G->thunkpos= yythunkpos102; if (!yy_RefTitleDouble(G)) { goto l104; } goto l102;\n+ l104:;\t G->pos= yypos102; G->thunkpos= yythunkpos102; if (!yy_RefTitleParens(G)) { goto l105; } goto l102;\n+ l105:;\t G->pos= yypos102; G->thunkpos= yythunkpos102; if (!yy_EmptyTitle(G)) { goto l101; }\n+ }\n+ l102:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RefTitle\", G->buf+G->pos));\n return 1;\n- l105:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l101:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RefTitle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RefSrc(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"RefSrc\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l110; if (!yy_Nonspacechar(G)) { goto l110; }\n- l111:;\t\n- { int yypos112= G->pos, yythunkpos112= G->thunkpos; if (!yy_Nonspacechar(G)) { goto l112; } goto l111;\n- l112:;\t G->pos= yypos112; G->thunkpos= yythunkpos112;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l110; yyDo(G, yy_1_RefSrc, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"RefSrc\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l106; if (!yy_Nonspacechar(G)) { goto l106; }\n+ l107:;\t\n+ { int yypos108= G->pos, yythunkpos108= G->thunkpos; if (!yy_Nonspacechar(G)) { goto l108; } goto l107;\n+ l108:;\t G->pos= yypos108; G->thunkpos= yythunkpos108;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l106; yyDo(G, yy_1_RefSrc, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RefSrc\", G->buf+G->pos));\n return 1;\n- l110:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l106:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RefSrc\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_AutoLinkEmail(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"AutoLinkEmail\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l113; if (!yy_LocMarker(G)) { goto l113; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_AutoLinkEmail, G->begin, G->end); if (!yymatchChar(G, '<')) goto l113;\n- { int yypos114= G->pos, yythunkpos114= G->thunkpos; if (!yymatchString(G, \"mailto:\")) goto l114; goto l115;\n- l114:;\t G->pos= yypos114; G->thunkpos= yythunkpos114;\n- }\n- l115:;\t yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l113; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\062\\350\\377\\003\\376\\377\\377\\207\\376\\377\\377\\107\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l113;\n- l116:;\t\n- { int yypos117= G->pos, yythunkpos117= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\062\\350\\377\\003\\376\\377\\377\\207\\376\\377\\377\\107\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l117; goto l116;\n+ yyprintf((stderr, \"%s\\n\", \"AutoLinkEmail\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l109; if (!yy_LocMarker(G)) { goto l109; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_AutoLinkEmail, G->begin, G->end); if (!yymatchChar(G, '<')) goto l109;\n+ { int yypos110= G->pos, yythunkpos110= G->thunkpos; if (!yymatchString(G, \"mailto:\")) goto l110; goto l111;\n+ l110:;\t G->pos= yypos110; G->thunkpos= yythunkpos110;\n+ }\n+ l111:;\t yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l109; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\062\\350\\377\\003\\376\\377\\377\\207\\376\\377\\377\\107\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l109;\n+ l112:;\t\n+ { int yypos113= G->pos, yythunkpos113= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\062\\350\\377\\003\\376\\377\\377\\207\\376\\377\\377\\107\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l113; goto l112;\n+ l113:;\t G->pos= yypos113; G->thunkpos= yythunkpos113;\n+ } if (!yymatchChar(G, '@')) goto l109;\n+ { int yypos116= G->pos, yythunkpos116= G->thunkpos; if (!yy_Newline(G)) { goto l116; } goto l109;\n+ l116:;\t G->pos= yypos116; G->thunkpos= yythunkpos116;\n+ }\n+ { int yypos117= G->pos, yythunkpos117= G->thunkpos; if (!yymatchChar(G, '>')) goto l117; goto l109;\n l117:;\t G->pos= yypos117; G->thunkpos= yythunkpos117;\n- } if (!yymatchChar(G, '@')) goto l113;\n- { int yypos120= G->pos, yythunkpos120= G->thunkpos; if (!yy_Newline(G)) { goto l120; } goto l113;\n- l120:;\t G->pos= yypos120; G->thunkpos= yythunkpos120;\n- }\n- { int yypos121= G->pos, yythunkpos121= G->thunkpos; if (!yymatchChar(G, '>')) goto l121; goto l113;\n- l121:;\t G->pos= yypos121; G->thunkpos= yythunkpos121;\n- } if (!yymatchDot(G)) goto l113;\n- l118:;\t\n- { int yypos119= G->pos, yythunkpos119= G->thunkpos;\n- { int yypos122= G->pos, yythunkpos122= G->thunkpos; if (!yy_Newline(G)) { goto l122; } goto l119;\n- l122:;\t G->pos= yypos122; G->thunkpos= yythunkpos122;\n- }\n- { int yypos123= G->pos, yythunkpos123= G->thunkpos; if (!yymatchChar(G, '>')) goto l123; goto l119;\n- l123:;\t G->pos= yypos123; G->thunkpos= yythunkpos123;\n- } if (!yymatchDot(G)) goto l119; goto l118;\n+ } if (!yymatchDot(G)) goto l109;\n+ l114:;\t\n+ { int yypos115= G->pos, yythunkpos115= G->thunkpos;\n+ { int yypos118= G->pos, yythunkpos118= G->thunkpos; if (!yy_Newline(G)) { goto l118; } goto l115;\n+ l118:;\t G->pos= yypos118; G->thunkpos= yythunkpos118;\n+ }\n+ { int yypos119= G->pos, yythunkpos119= G->thunkpos; if (!yymatchChar(G, '>')) goto l119; goto l115;\n l119:;\t G->pos= yypos119; G->thunkpos= yythunkpos119;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l113; yyDo(G, yy_2_AutoLinkEmail, G->begin, G->end); if (!yymatchChar(G, '>')) goto l113; yyText(G, G->begin, G->end); if (!(YY_END)) goto l113; yyDo(G, yy_3_AutoLinkEmail, G->begin, G->end);\n+ } if (!yymatchDot(G)) goto l115; goto l114;\n+ l115:;\t G->pos= yypos115; G->thunkpos= yythunkpos115;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l109; yyDo(G, yy_2_AutoLinkEmail, G->begin, G->end); if (!yymatchChar(G, '>')) goto l109; yyText(G, G->begin, G->end); if (!(YY_END)) goto l109; yyDo(G, yy_3_AutoLinkEmail, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"AutoLinkEmail\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l113:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l109:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AutoLinkEmail\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_AutoLinkUrl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"AutoLinkUrl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l124; if (!yy_LocMarker(G)) { goto l124; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_AutoLinkUrl, G->begin, G->end); if (!yymatchChar(G, '<')) goto l124; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l124; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l124;\n- l125:;\t\n- { int yypos126= G->pos, yythunkpos126= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l126; goto l125;\n+ yyprintf((stderr, \"%s\\n\", \"AutoLinkUrl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l120; if (!yy_LocMarker(G)) { goto l120; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_AutoLinkUrl, G->begin, G->end); if (!yymatchChar(G, '<')) goto l120; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l120; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l120;\n+ l121:;\t\n+ { int yypos122= G->pos, yythunkpos122= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l122; goto l121;\n+ l122:;\t G->pos= yypos122; G->thunkpos= yythunkpos122;\n+ } if (!yymatchString(G, \":\/\/\")) goto l120;\n+ { int yypos125= G->pos, yythunkpos125= G->thunkpos; if (!yy_Newline(G)) { goto l125; } goto l120;\n+ l125:;\t G->pos= yypos125; G->thunkpos= yythunkpos125;\n+ }\n+ { int yypos126= G->pos, yythunkpos126= G->thunkpos; if (!yymatchChar(G, '>')) goto l126; goto l120;\n l126:;\t G->pos= yypos126; G->thunkpos= yythunkpos126;\n- } if (!yymatchString(G, \":\/\/\")) goto l124;\n- { int yypos129= G->pos, yythunkpos129= G->thunkpos; if (!yy_Newline(G)) { goto l129; } goto l124;\n- l129:;\t G->pos= yypos129; G->thunkpos= yythunkpos129;\n- }\n- { int yypos130= G->pos, yythunkpos130= G->thunkpos; if (!yymatchChar(G, '>')) goto l130; goto l124;\n- l130:;\t G->pos= yypos130; G->thunkpos= yythunkpos130;\n- } if (!yymatchDot(G)) goto l124;\n- l127:;\t\n- { int yypos128= G->pos, yythunkpos128= G->thunkpos;\n- { int yypos131= G->pos, yythunkpos131= G->thunkpos; if (!yy_Newline(G)) { goto l131; } goto l128;\n+ } if (!yymatchDot(G)) goto l120;\n+ l123:;\t\n+ { int yypos124= G->pos, yythunkpos124= G->thunkpos;\n+ { int yypos127= G->pos, yythunkpos127= G->thunkpos; if (!yy_Newline(G)) { goto l127; } goto l124;\n+ l127:;\t G->pos= yypos127; G->thunkpos= yythunkpos127;\n+ }\n+ { int yypos128= G->pos, yythunkpos128= G->thunkpos; if (!yymatchChar(G, '>')) goto l128; goto l124;\n+ l128:;\t G->pos= yypos128; G->thunkpos= yythunkpos128;\n+ } if (!yymatchDot(G)) goto l124; goto l123;\n+ l124:;\t G->pos= yypos124; G->thunkpos= yythunkpos124;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l120; yyDo(G, yy_2_AutoLinkUrl, G->begin, G->end); if (!yymatchChar(G, '>')) goto l120; yyText(G, G->begin, G->end); if (!(YY_END)) goto l120; yyDo(G, yy_3_AutoLinkUrl, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"AutoLinkUrl\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n+ return 1;\n+ l120:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"AutoLinkUrl\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_ImageSizeHeight(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"ImageSizeHeight\")); if (!yymatchString(G, \"=x\")) goto l129; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l129;\n+ l130:;\t\n+ { int yypos131= G->pos, yythunkpos131= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l131; goto l130;\n l131:;\t G->pos= yypos131; G->thunkpos= yythunkpos131;\n }\n- { int yypos132= G->pos, yythunkpos132= G->thunkpos; if (!yymatchChar(G, '>')) goto l132; goto l128;\n- l132:;\t G->pos= yypos132; G->thunkpos= yythunkpos132;\n- } if (!yymatchDot(G)) goto l128; goto l127;\n- l128:;\t G->pos= yypos128; G->thunkpos= yythunkpos128;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l124; yyDo(G, yy_2_AutoLinkUrl, G->begin, G->end); if (!yymatchChar(G, '>')) goto l124; yyText(G, G->begin, G->end); if (!(YY_END)) goto l124; yyDo(G, yy_3_AutoLinkUrl, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"AutoLinkUrl\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n- return 1;\n- l124:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"AutoLinkUrl\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_ImageSizeHeight(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"ImageSizeHeight\")); if (!yymatchString(G, \"=x\")) goto l133; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l133;\n- l134:;\t\n- { int yypos135= G->pos, yythunkpos135= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l135; goto l134;\n- l135:;\t G->pos= yypos135; G->thunkpos= yythunkpos135;\n- }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ImageSizeHeight\", G->buf+G->pos));\n return 1;\n- l133:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l129:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ImageSizeHeight\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ImageSizeWidth(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"ImageSizeWidth\")); if (!yymatchChar(G, '=')) goto l136; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l136;\n- l137:;\t\n- { int yypos138= G->pos, yythunkpos138= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l138; goto l137;\n- l138:;\t G->pos= yypos138; G->thunkpos= yythunkpos138;\n- } if (!yymatchChar(G, 'x')) goto l136;\n+ yyprintf((stderr, \"%s\\n\", \"ImageSizeWidth\")); if (!yymatchChar(G, '=')) goto l132; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l132;\n+ l133:;\t\n+ { int yypos134= G->pos, yythunkpos134= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l134; goto l133;\n+ l134:;\t G->pos= yypos134; G->thunkpos= yythunkpos134;\n+ } if (!yymatchChar(G, 'x')) goto l132;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ImageSizeWidth\", G->buf+G->pos));\n return 1;\n- l136:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l132:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ImageSizeWidth\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ImageSizeComplete(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"ImageSizeComplete\")); if (!yymatchChar(G, '=')) goto l139; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l139;\n- l140:;\t\n- { int yypos141= G->pos, yythunkpos141= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l141; goto l140;\n- l141:;\t G->pos= yypos141; G->thunkpos= yythunkpos141;\n- } if (!yymatchChar(G, 'x')) goto l139; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l139;\n- l142:;\t\n- { int yypos143= G->pos, yythunkpos143= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l143; goto l142;\n+ yyprintf((stderr, \"%s\\n\", \"ImageSizeComplete\")); if (!yymatchChar(G, '=')) goto l135; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l135;\n+ l136:;\t\n+ { int yypos137= G->pos, yythunkpos137= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l137; goto l136;\n+ l137:;\t G->pos= yypos137; G->thunkpos= yythunkpos137;\n+ } if (!yymatchChar(G, 'x')) goto l135; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l135;\n+ l138:;\t\n+ { int yypos139= G->pos, yythunkpos139= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l139; goto l138;\n+ l139:;\t G->pos= yypos139; G->thunkpos= yythunkpos139;\n+ }\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"ImageSizeComplete\", G->buf+G->pos));\n+ return 1;\n+ l135:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"ImageSizeComplete\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_TitleDoubleExt(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"TitleDoubleExt\")); if (!yymatchChar(G, '\"')) goto l140;\n+ l141:;\t\n+ { int yypos142= G->pos, yythunkpos142= G->thunkpos;\n+ { int yypos143= G->pos, yythunkpos143= G->thunkpos;\n+ { int yypos144= G->pos, yythunkpos144= G->thunkpos; if (!yymatchChar(G, '\"')) goto l145; goto l144;\n+ l145:;\t G->pos= yypos144; G->thunkpos= yythunkpos144; if (!yy_Newline(G)) { goto l143; }\n+ }\n+ l144:;\t goto l142;\n l143:;\t G->pos= yypos143; G->thunkpos= yythunkpos143;\n- }\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"ImageSizeComplete\", G->buf+G->pos));\n- return 1;\n- l139:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"ImageSizeComplete\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_TitleDoubleExt(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TitleDoubleExt\")); if (!yymatchChar(G, '\"')) goto l144;\n- l145:;\t\n- { int yypos146= G->pos, yythunkpos146= G->thunkpos;\n- { int yypos147= G->pos, yythunkpos147= G->thunkpos;\n- { int yypos148= G->pos, yythunkpos148= G->thunkpos; if (!yymatchChar(G, '\"')) goto l149; goto l148;\n- l149:;\t G->pos= yypos148; G->thunkpos= yythunkpos148; if (!yy_Newline(G)) { goto l147; }\n- }\n- l148:;\t goto l146;\n- l147:;\t G->pos= yypos147; G->thunkpos= yythunkpos147;\n- } if (!yymatchDot(G)) goto l146; goto l145;\n- l146:;\t G->pos= yypos146; G->thunkpos= yythunkpos146;\n- } if (!yymatchChar(G, '\"')) goto l144;\n+ } if (!yymatchDot(G)) goto l142; goto l141;\n+ l142:;\t G->pos= yypos142; G->thunkpos= yythunkpos142;\n+ } if (!yymatchChar(G, '\"')) goto l140;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleDoubleExt\", G->buf+G->pos));\n return 1;\n- l144:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l140:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleDoubleExt\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TitleSingleExt(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TitleSingleExt\")); if (!yymatchChar(G, '\\'')) goto l150;\n- l151:;\t\n- { int yypos152= G->pos, yythunkpos152= G->thunkpos;\n- { int yypos153= G->pos, yythunkpos153= G->thunkpos;\n- { int yypos154= G->pos, yythunkpos154= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l155; goto l154;\n- l155:;\t G->pos= yypos154; G->thunkpos= yythunkpos154; if (!yy_Newline(G)) { goto l153; }\n- }\n- l154:;\t goto l152;\n- l153:;\t G->pos= yypos153; G->thunkpos= yythunkpos153;\n- } if (!yymatchDot(G)) goto l152; goto l151;\n- l152:;\t G->pos= yypos152; G->thunkpos= yythunkpos152;\n- } if (!yymatchChar(G, '\\'')) goto l150;\n+ yyprintf((stderr, \"%s\\n\", \"TitleSingleExt\")); if (!yymatchChar(G, '\\'')) goto l146;\n+ l147:;\t\n+ { int yypos148= G->pos, yythunkpos148= G->thunkpos;\n+ { int yypos149= G->pos, yythunkpos149= G->thunkpos;\n+ { int yypos150= G->pos, yythunkpos150= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l151; goto l150;\n+ l151:;\t G->pos= yypos150; G->thunkpos= yythunkpos150; if (!yy_Newline(G)) { goto l149; }\n+ }\n+ l150:;\t goto l148;\n+ l149:;\t G->pos= yypos149; G->thunkpos= yythunkpos149;\n+ } if (!yymatchDot(G)) goto l148; goto l147;\n+ l148:;\t G->pos= yypos148; G->thunkpos= yythunkpos148;\n+ } if (!yymatchChar(G, '\\'')) goto l146;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleSingleExt\", G->buf+G->pos));\n return 1;\n- l150:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l146:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleSingleExt\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TitleDouble(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TitleDouble\")); if (!yymatchChar(G, '\"')) goto l156;\n- l157:;\t\n- { int yypos158= G->pos, yythunkpos158= G->thunkpos;\n- { int yypos159= G->pos, yythunkpos159= G->thunkpos; if (!yymatchChar(G, '\"')) goto l159; if (!yy_Sp(G)) { goto l159; }\n- { int yypos160= G->pos, yythunkpos160= G->thunkpos; if (!yymatchChar(G, ')')) goto l161; goto l160;\n- l161:;\t G->pos= yypos160; G->thunkpos= yythunkpos160; if (!yy_Newline(G)) { goto l159; }\n- }\n- l160:;\t goto l158;\n- l159:;\t G->pos= yypos159; G->thunkpos= yythunkpos159;\n- } if (!yymatchDot(G)) goto l158; goto l157;\n- l158:;\t G->pos= yypos158; G->thunkpos= yythunkpos158;\n- } if (!yymatchChar(G, '\"')) goto l156;\n+ yyprintf((stderr, \"%s\\n\", \"TitleDouble\")); if (!yymatchChar(G, '\"')) goto l152;\n+ l153:;\t\n+ { int yypos154= G->pos, yythunkpos154= G->thunkpos;\n+ { int yypos155= G->pos, yythunkpos155= G->thunkpos; if (!yymatchChar(G, '\"')) goto l155; if (!yy_Sp(G)) { goto l155; }\n+ { int yypos156= G->pos, yythunkpos156= G->thunkpos; if (!yymatchChar(G, ')')) goto l157; goto l156;\n+ l157:;\t G->pos= yypos156; G->thunkpos= yythunkpos156; if (!yy_Newline(G)) { goto l155; }\n+ }\n+ l156:;\t goto l154;\n+ l155:;\t G->pos= yypos155; G->thunkpos= yythunkpos155;\n+ } if (!yymatchDot(G)) goto l154; goto l153;\n+ l154:;\t G->pos= yypos154; G->thunkpos= yythunkpos154;\n+ } if (!yymatchChar(G, '\"')) goto l152;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleDouble\", G->buf+G->pos));\n return 1;\n- l156:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l152:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleDouble\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TitleSingle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TitleSingle\")); if (!yymatchChar(G, '\\'')) goto l162;\n- l163:;\t\n- { int yypos164= G->pos, yythunkpos164= G->thunkpos;\n- { int yypos165= G->pos, yythunkpos165= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l165; if (!yy_Sp(G)) { goto l165; }\n- { int yypos166= G->pos, yythunkpos166= G->thunkpos; if (!yymatchChar(G, ')')) goto l167; goto l166;\n- l167:;\t G->pos= yypos166; G->thunkpos= yythunkpos166; if (!yy_Newline(G)) { goto l165; }\n- }\n- l166:;\t goto l164;\n- l165:;\t G->pos= yypos165; G->thunkpos= yythunkpos165;\n- } if (!yymatchDot(G)) goto l164; goto l163;\n- l164:;\t G->pos= yypos164; G->thunkpos= yythunkpos164;\n- } if (!yymatchChar(G, '\\'')) goto l162;\n+ yyprintf((stderr, \"%s\\n\", \"TitleSingle\")); if (!yymatchChar(G, '\\'')) goto l158;\n+ l159:;\t\n+ { int yypos160= G->pos, yythunkpos160= G->thunkpos;\n+ { int yypos161= G->pos, yythunkpos161= G->thunkpos; if (!yymatchChar(G, '\\'')) goto l161; if (!yy_Sp(G)) { goto l161; }\n+ { int yypos162= G->pos, yythunkpos162= G->thunkpos; if (!yymatchChar(G, ')')) goto l163; goto l162;\n+ l163:;\t G->pos= yypos162; G->thunkpos= yythunkpos162; if (!yy_Newline(G)) { goto l161; }\n+ }\n+ l162:;\t goto l160;\n+ l161:;\t G->pos= yypos161; G->thunkpos= yythunkpos161;\n+ } if (!yymatchDot(G)) goto l160; goto l159;\n+ l160:;\t G->pos= yypos160; G->thunkpos= yythunkpos160;\n+ } if (!yymatchChar(G, '\\'')) goto l158;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleSingle\", G->buf+G->pos));\n return 1;\n- l162:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l158:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleSingle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SourceContents(GREG *G)\n {\n yyprintf((stderr, \"%s\\n\", \"SourceContents\"));\n+ l165:;\t\n+ { int yypos166= G->pos, yythunkpos166= G->thunkpos;\n+ { int yypos167= G->pos, yythunkpos167= G->thunkpos;\n+ { int yypos171= G->pos, yythunkpos171= G->thunkpos; if (!yymatchChar(G, '(')) goto l171; goto l168;\n+ l171:;\t G->pos= yypos171; G->thunkpos= yythunkpos171;\n+ }\n+ { int yypos172= G->pos, yythunkpos172= G->thunkpos; if (!yymatchChar(G, ')')) goto l172; goto l168;\n+ l172:;\t G->pos= yypos172; G->thunkpos= yythunkpos172;\n+ }\n+ { int yypos173= G->pos, yythunkpos173= G->thunkpos; if (!yymatchChar(G, '>')) goto l173; goto l168;\n+ l173:;\t G->pos= yypos173; G->thunkpos= yythunkpos173;\n+ } if (!yy_Nonspacechar(G)) { goto l168; }\n l169:;\t\n { int yypos170= G->pos, yythunkpos170= G->thunkpos;\n- { int yypos171= G->pos, yythunkpos171= G->thunkpos;\n- { int yypos175= G->pos, yythunkpos175= G->thunkpos; if (!yymatchChar(G, '(')) goto l175; goto l172;\n+ { int yypos174= G->pos, yythunkpos174= G->thunkpos; if (!yymatchChar(G, '(')) goto l174; goto l170;\n+ l174:;\t G->pos= yypos174; G->thunkpos= yythunkpos174;\n+ }\n+ { int yypos175= G->pos, yythunkpos175= G->thunkpos; if (!yymatchChar(G, ')')) goto l175; goto l170;\n l175:;\t G->pos= yypos175; G->thunkpos= yythunkpos175;\n }\n- { int yypos176= G->pos, yythunkpos176= G->thunkpos; if (!yymatchChar(G, ')')) goto l176; goto l172;\n+ { int yypos176= G->pos, yythunkpos176= G->thunkpos; if (!yymatchChar(G, '>')) goto l176; goto l170;\n l176:;\t G->pos= yypos176; G->thunkpos= yythunkpos176;\n- }\n- { int yypos177= G->pos, yythunkpos177= G->thunkpos; if (!yymatchChar(G, '>')) goto l177; goto l172;\n- l177:;\t G->pos= yypos177; G->thunkpos= yythunkpos177;\n- } if (!yy_Nonspacechar(G)) { goto l172; }\n- l173:;\t\n- { int yypos174= G->pos, yythunkpos174= G->thunkpos;\n- { int yypos178= G->pos, yythunkpos178= G->thunkpos; if (!yymatchChar(G, '(')) goto l178; goto l174;\n- l178:;\t G->pos= yypos178; G->thunkpos= yythunkpos178;\n- }\n- { int yypos179= G->pos, yythunkpos179= G->thunkpos; if (!yymatchChar(G, ')')) goto l179; goto l174;\n- l179:;\t G->pos= yypos179; G->thunkpos= yythunkpos179;\n- }\n- { int yypos180= G->pos, yythunkpos180= G->thunkpos; if (!yymatchChar(G, '>')) goto l180; goto l174;\n- l180:;\t G->pos= yypos180; G->thunkpos= yythunkpos180;\n- } if (!yy_Nonspacechar(G)) { goto l174; } goto l173;\n- l174:;\t G->pos= yypos174; G->thunkpos= yythunkpos174;\n- } goto l171;\n- l172:;\t G->pos= yypos171; G->thunkpos= yythunkpos171; if (!yymatchChar(G, '(')) goto l170; if (!yy_SourceContents(G)) { goto l170; } if (!yymatchChar(G, ')')) goto l170;\n- }\n- l171:;\t goto l169;\n+ } if (!yy_Nonspacechar(G)) { goto l170; } goto l169;\n l170:;\t G->pos= yypos170; G->thunkpos= yythunkpos170;\n+ } goto l167;\n+ l168:;\t G->pos= yypos167; G->thunkpos= yythunkpos167; if (!yymatchChar(G, '(')) goto l166; if (!yy_SourceContents(G)) { goto l166; } if (!yymatchChar(G, ')')) goto l166;\n+ }\n+ l167:;\t goto l165;\n+ l166:;\t G->pos= yypos166; G->thunkpos= yythunkpos166;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SourceContents\", G->buf+G->pos));\n return 1;\n@@ -2885,4054 +2876,4099 @@\n YY_RULE(int) yy_ImageSize(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"ImageSize\"));\n- { int yypos182= G->pos, yythunkpos182= G->thunkpos; if (!yy_ImageSizeComplete(G)) { goto l183; } goto l182;\n- l183:;\t G->pos= yypos182; G->thunkpos= yythunkpos182; if (!yy_ImageSizeWidth(G)) { goto l184; } goto l182;\n- l184:;\t G->pos= yypos182; G->thunkpos= yythunkpos182; if (!yy_ImageSizeHeight(G)) { goto l185; } goto l182;\n- l185:;\t G->pos= yypos182; G->thunkpos= yythunkpos182; if (!yymatchString(G, \"\")) goto l181;\n- }\n- l182:;\t\n+ { int yypos178= G->pos, yythunkpos178= G->thunkpos; if (!yy_ImageSizeComplete(G)) { goto l179; } goto l178;\n+ l179:;\t G->pos= yypos178; G->thunkpos= yythunkpos178; if (!yy_ImageSizeWidth(G)) { goto l180; } goto l178;\n+ l180:;\t G->pos= yypos178; G->thunkpos= yythunkpos178; if (!yy_ImageSizeHeight(G)) { goto l181; } goto l178;\n+ l181:;\t G->pos= yypos178; G->thunkpos= yythunkpos178; if (!yymatchString(G, \"\")) goto l177;\n+ }\n+ l178:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ImageSize\", G->buf+G->pos));\n return 1;\n- l181:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l177:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ImageSize\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TitleExt(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"TitleExt\"));\n- { int yypos187= G->pos, yythunkpos187= G->thunkpos; if (!yy_TitleSingleExt(G)) { goto l188; } goto l187;\n- l188:;\t G->pos= yypos187; G->thunkpos= yythunkpos187; if (!yy_TitleDoubleExt(G)) { goto l189; } goto l187;\n+ { int yypos183= G->pos, yythunkpos183= G->thunkpos; if (!yy_TitleSingleExt(G)) { goto l184; } goto l183;\n+ l184:;\t G->pos= yypos183; G->thunkpos= yythunkpos183; if (!yy_TitleDoubleExt(G)) { goto l185; } goto l183;\n+ l185:;\t G->pos= yypos183; G->thunkpos= yythunkpos183; if (!yymatchString(G, \"\")) goto l182;\n+ }\n+ l183:;\t\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleExt\", G->buf+G->pos));\n+ return 1;\n+ l182:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleExt\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Title(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Title\"));\n+ { int yypos187= G->pos, yythunkpos187= G->thunkpos; if (!yy_TitleSingle(G)) { goto l188; } goto l187;\n+ l188:;\t G->pos= yypos187; G->thunkpos= yythunkpos187; if (!yy_TitleDouble(G)) { goto l189; } goto l187;\n l189:;\t G->pos= yypos187; G->thunkpos= yythunkpos187; if (!yymatchString(G, \"\")) goto l186;\n }\n l187:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"TitleExt\", G->buf+G->pos));\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Title\", G->buf+G->pos));\n return 1;\n l186:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"TitleExt\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Title(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Title\"));\n- { int yypos191= G->pos, yythunkpos191= G->thunkpos; if (!yy_TitleSingle(G)) { goto l192; } goto l191;\n- l192:;\t G->pos= yypos191; G->thunkpos= yythunkpos191; if (!yy_TitleDouble(G)) { goto l193; } goto l191;\n- l193:;\t G->pos= yypos191; G->thunkpos= yythunkpos191; if (!yymatchString(G, \"\")) goto l190;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Title\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_Source(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"Source\")); yyDo(G, yy_1_Source, G->begin, G->end);\n+ { int yypos191= G->pos, yythunkpos191= G->thunkpos; if (!yymatchChar(G, '<')) goto l192; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l192; if (!yy_SourceContents(G)) { goto l192; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l192; yyDo(G, yy_2_Source, G->begin, G->end); if (!yymatchChar(G, '>')) goto l192; goto l191;\n+ l192:;\t G->pos= yypos191; G->thunkpos= yythunkpos191; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l190; if (!yy_SourceContents(G)) { goto l190; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l190; yyDo(G, yy_3_Source, G->begin, G->end);\n }\n l191:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Title\", G->buf+G->pos));\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Source\", G->buf+G->pos));\n return 1;\n l190:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Title\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_Source(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Source\")); yyDo(G, yy_1_Source, G->begin, G->end);\n- { int yypos195= G->pos, yythunkpos195= G->thunkpos; if (!yymatchChar(G, '<')) goto l196; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l196; if (!yy_SourceContents(G)) { goto l196; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l196; yyDo(G, yy_2_Source, G->begin, G->end); if (!yymatchChar(G, '>')) goto l196; goto l195;\n- l196:;\t G->pos= yypos195; G->thunkpos= yythunkpos195; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l194; if (!yy_SourceContents(G)) { goto l194; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l194; yyDo(G, yy_3_Source, G->begin, G->end);\n- }\n- l195:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Source\", G->buf+G->pos));\n- return 1;\n- l194:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Source\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Label(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Label\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l197; if (!yy_LocMarker(G)) { goto l197; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '[')) goto l197;\n- { int yypos198= G->pos, yythunkpos198= G->thunkpos;\n- { int yypos200= G->pos, yythunkpos200= G->thunkpos; if (!yymatchChar(G, '^')) goto l200; goto l199;\n+ yyprintf((stderr, \"%s\\n\", \"Label\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l193; if (!yy_LocMarker(G)) { goto l193; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '[')) goto l193;\n+ { int yypos194= G->pos, yythunkpos194= G->thunkpos;\n+ { int yypos196= G->pos, yythunkpos196= G->thunkpos; if (!yymatchChar(G, '^')) goto l196; goto l195;\n+ l196:;\t G->pos= yypos196; G->thunkpos= yythunkpos196;\n+ } yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l195; goto l194;\n+ l195:;\t G->pos= yypos194; G->thunkpos= yythunkpos194;\n+ { int yypos197= G->pos, yythunkpos197= G->thunkpos; if (!yymatchDot(G)) goto l193; G->pos= yypos197; G->thunkpos= yythunkpos197;\n+ } yyText(G, G->begin, G->end); if (!( !EXT(pmh_EXT_NOTES) )) goto l193;\n+ }\n+ l194:;\t yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l193;\n+ l198:;\t\n+ { int yypos199= G->pos, yythunkpos199= G->thunkpos;\n+ { int yypos200= G->pos, yythunkpos200= G->thunkpos; if (!yymatchChar(G, ']')) goto l200; goto l199;\n l200:;\t G->pos= yypos200; G->thunkpos= yythunkpos200;\n- } yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l199; goto l198;\n- l199:;\t G->pos= yypos198; G->thunkpos= yythunkpos198;\n- { int yypos201= G->pos, yythunkpos201= G->thunkpos; if (!yymatchDot(G)) goto l197; G->pos= yypos201; G->thunkpos= yythunkpos201;\n- } yyText(G, G->begin, G->end); if (!( !EXT(pmh_EXT_NOTES) )) goto l197;\n- }\n- l198:;\t yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l197;\n- l202:;\t\n- { int yypos203= G->pos, yythunkpos203= G->thunkpos;\n- { int yypos204= G->pos, yythunkpos204= G->thunkpos; if (!yymatchChar(G, ']')) goto l204; goto l203;\n- l204:;\t G->pos= yypos204; G->thunkpos= yythunkpos204;\n- }\n- { int yypos205= G->pos, yythunkpos205= G->thunkpos; if (!yymatchChar(G, '[')) goto l205; goto l203;\n- l205:;\t G->pos= yypos205; G->thunkpos= yythunkpos205;\n- } if (!yy_LabelInline(G)) { goto l203; } goto l202;\n- l203:;\t G->pos= yypos203; G->thunkpos= yythunkpos203;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l197; yyDo(G, yy_1_Label, G->begin, G->end); if (!yymatchChar(G, ']')) goto l197; yyText(G, G->begin, G->end); if (!(YY_END)) goto l197; yyDo(G, yy_2_Label, G->begin, G->end);\n+ }\n+ { int yypos201= G->pos, yythunkpos201= G->thunkpos; if (!yymatchChar(G, '[')) goto l201; goto l199;\n+ l201:;\t G->pos= yypos201; G->thunkpos= yythunkpos201;\n+ } if (!yy_LabelInline(G)) { goto l199; } goto l198;\n+ l199:;\t G->pos= yypos199; G->thunkpos= yythunkpos199;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l193; yyDo(G, yy_1_Label, G->begin, G->end); if (!yymatchChar(G, ']')) goto l193; yyText(G, G->begin, G->end); if (!(YY_END)) goto l193; yyDo(G, yy_2_Label, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Label\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l197:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l193:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Label\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ReferenceLinkSingle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"ReferenceLinkSingle\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l206; if (!yy_Label(G)) { goto l206; } yyDo(G, yySet, -1, 0);\n- { int yypos207= G->pos, yythunkpos207= G->thunkpos; if (!yy_Spnl(G)) { goto l207; } if (!yymatchString(G, \"[]\")) goto l207; goto l208;\n- l207:;\t G->pos= yypos207; G->thunkpos= yythunkpos207;\n- }\n- l208:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l206; yyDo(G, yy_1_ReferenceLinkSingle, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"ReferenceLinkSingle\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l202; if (!yy_Label(G)) { goto l202; } yyDo(G, yySet, -1, 0);\n+ { int yypos203= G->pos, yythunkpos203= G->thunkpos; if (!yy_Spnl(G)) { goto l203; } if (!yymatchString(G, \"[]\")) goto l203; goto l204;\n+ l203:;\t G->pos= yypos203; G->thunkpos= yythunkpos203;\n+ }\n+ l204:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l202; yyDo(G, yy_1_ReferenceLinkSingle, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ReferenceLinkSingle\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l206:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l202:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ReferenceLinkSingle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ReferenceLinkDouble(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 2, 0);\n- yyprintf((stderr, \"%s\\n\", \"ReferenceLinkDouble\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l209; if (!yy_Label(G)) { goto l209; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l209; }\n- { int yypos210= G->pos, yythunkpos210= G->thunkpos; if (!yymatchString(G, \"[]\")) goto l210; goto l209;\n- l210:;\t G->pos= yypos210; G->thunkpos= yythunkpos210;\n- } if (!yy_Label(G)) { goto l209; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_END)) goto l209; yyDo(G, yy_1_ReferenceLinkDouble, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"ReferenceLinkDouble\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l205; if (!yy_Label(G)) { goto l205; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l205; }\n+ { int yypos206= G->pos, yythunkpos206= G->thunkpos; if (!yymatchString(G, \"[]\")) goto l206; goto l205;\n+ l206:;\t G->pos= yypos206; G->thunkpos= yythunkpos206;\n+ } if (!yy_Label(G)) { goto l205; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_END)) goto l205; yyDo(G, yy_1_ReferenceLinkDouble, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ReferenceLinkDouble\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n return 1;\n- l209:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l205:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ReferenceLinkDouble\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_AutoLink(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"AutoLink\"));\n- { int yypos212= G->pos, yythunkpos212= G->thunkpos; if (!yy_AutoLinkUrl(G)) { goto l213; } goto l212;\n- l213:;\t G->pos= yypos212; G->thunkpos= yythunkpos212; if (!yy_AutoLinkEmail(G)) { goto l211; }\n- }\n- l212:;\t\n+ { int yypos208= G->pos, yythunkpos208= G->thunkpos; if (!yy_AutoLinkUrl(G)) { goto l209; } goto l208;\n+ l209:;\t G->pos= yypos208; G->thunkpos= yythunkpos208; if (!yy_AutoLinkEmail(G)) { goto l207; }\n+ }\n+ l208:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"AutoLink\", G->buf+G->pos));\n return 1;\n- l211:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l207:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AutoLink\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ReferenceLink(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"ReferenceLink\"));\n- { int yypos215= G->pos, yythunkpos215= G->thunkpos; if (!yy_ReferenceLinkDouble(G)) { goto l216; } goto l215;\n- l216:;\t G->pos= yypos215; G->thunkpos= yythunkpos215; if (!yy_ReferenceLinkSingle(G)) { goto l214; }\n- }\n- l215:;\t\n+ { int yypos211= G->pos, yythunkpos211= G->thunkpos; if (!yy_ReferenceLinkDouble(G)) { goto l212; } goto l211;\n+ l212:;\t G->pos= yypos211; G->thunkpos= yythunkpos211; if (!yy_ReferenceLinkSingle(G)) { goto l210; }\n+ }\n+ l211:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ReferenceLink\", G->buf+G->pos));\n return 1;\n- l214:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l210:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ReferenceLink\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ExplicitLinkSize(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 2, 0);\n- yyprintf((stderr, \"%s\\n\", \"ExplicitLinkSize\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l217; if (!yy_Label(G)) { goto l217; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l217; } if (!yymatchChar(G, '(')) goto l217; if (!yy_Sp(G)) { goto l217; } if (!yy_Source(G)) { goto l217; } yyDo(G, yySet, -1, 0); if (!yy_Spnl(G)) { goto l217; } if (!yy_TitleExt(G)) { goto l217; } if (!yy_Sp(G)) { goto l217; } if (!yy_ImageSize(G)) { goto l217; } if (!yy_Sp(G)) { goto l217; } if (!yymatchChar(G, ')')) goto l217; yyText(G, G->begin, G->end); if (!(YY_END)) goto l217; yyDo(G, yy_1_ExplicitLinkSize, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"ExplicitLinkSize\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l213; if (!yy_Label(G)) { goto l213; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l213; } if (!yymatchChar(G, '(')) goto l213; if (!yy_Sp(G)) { goto l213; } if (!yy_Source(G)) { goto l213; } yyDo(G, yySet, -1, 0); if (!yy_Spnl(G)) { goto l213; } if (!yy_TitleExt(G)) { goto l213; } if (!yy_Sp(G)) { goto l213; } if (!yy_ImageSize(G)) { goto l213; } if (!yy_Sp(G)) { goto l213; } if (!yymatchChar(G, ')')) goto l213; yyText(G, G->begin, G->end); if (!(YY_END)) goto l213; yyDo(G, yy_1_ExplicitLinkSize, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ExplicitLinkSize\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n return 1;\n- l217:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l213:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ExplicitLinkSize\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ExplicitLink(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 2, 0);\n- yyprintf((stderr, \"%s\\n\", \"ExplicitLink\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l218; if (!yy_Label(G)) { goto l218; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l218; } if (!yymatchChar(G, '(')) goto l218; if (!yy_Sp(G)) { goto l218; } if (!yy_Source(G)) { goto l218; } yyDo(G, yySet, -1, 0); if (!yy_Spnl(G)) { goto l218; } if (!yy_Title(G)) { goto l218; } if (!yy_Sp(G)) { goto l218; } if (!yymatchChar(G, ')')) goto l218; yyText(G, G->begin, G->end); if (!(YY_END)) goto l218; yyDo(G, yy_1_ExplicitLink, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"ExplicitLink\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l214; if (!yy_Label(G)) { goto l214; } yyDo(G, yySet, -2, 0); if (!yy_Spnl(G)) { goto l214; } if (!yymatchChar(G, '(')) goto l214; if (!yy_Sp(G)) { goto l214; } if (!yy_Source(G)) { goto l214; } yyDo(G, yySet, -1, 0); if (!yy_Spnl(G)) { goto l214; } if (!yy_Title(G)) { goto l214; } if (!yy_Sp(G)) { goto l214; } if (!yymatchChar(G, ')')) goto l214; yyText(G, G->begin, G->end); if (!(YY_END)) goto l214; yyDo(G, yy_1_ExplicitLink, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ExplicitLink\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n return 1;\n- l218:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l214:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ExplicitLink\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StrongUl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"StrongUl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l219; if (!yy_LocMarker(G)) { goto l219; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"__\")) goto l219;\n- { int yypos220= G->pos, yythunkpos220= G->thunkpos; if (!yy_Whitespace(G)) { goto l220; } goto l219;\n+ yyprintf((stderr, \"%s\\n\", \"StrongUl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l215; if (!yy_LocMarker(G)) { goto l215; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"__\")) goto l215;\n+ { int yypos216= G->pos, yythunkpos216= G->thunkpos; if (!yy_Whitespace(G)) { goto l216; } goto l215;\n+ l216:;\t G->pos= yypos216; G->thunkpos= yythunkpos216;\n+ }\n+ { int yypos219= G->pos, yythunkpos219= G->thunkpos; if (!yymatchString(G, \"__\")) goto l219; goto l215;\n+ l219:;\t G->pos= yypos219; G->thunkpos= yythunkpos219;\n+ } if (!yy_Inline(G)) { goto l215; }\n+ l217:;\t\n+ { int yypos218= G->pos, yythunkpos218= G->thunkpos;\n+ { int yypos220= G->pos, yythunkpos220= G->thunkpos; if (!yymatchString(G, \"__\")) goto l220; goto l218;\n l220:;\t G->pos= yypos220; G->thunkpos= yythunkpos220;\n- }\n- { int yypos223= G->pos, yythunkpos223= G->thunkpos; if (!yymatchString(G, \"__\")) goto l223; goto l219;\n- l223:;\t G->pos= yypos223; G->thunkpos= yythunkpos223;\n- } if (!yy_Inline(G)) { goto l219; }\n- l221:;\t\n- { int yypos222= G->pos, yythunkpos222= G->thunkpos;\n- { int yypos224= G->pos, yythunkpos224= G->thunkpos; if (!yymatchString(G, \"__\")) goto l224; goto l222;\n- l224:;\t G->pos= yypos224; G->thunkpos= yythunkpos224;\n- } if (!yy_Inline(G)) { goto l222; } goto l221;\n- l222:;\t G->pos= yypos222; G->thunkpos= yythunkpos222;\n- } if (!yymatchString(G, \"__\")) goto l219; yyText(G, G->begin, G->end); if (!(YY_END)) goto l219; yyDo(G, yy_1_StrongUl, G->begin, G->end);\n+ } if (!yy_Inline(G)) { goto l218; } goto l217;\n+ l218:;\t G->pos= yypos218; G->thunkpos= yythunkpos218;\n+ } if (!yymatchString(G, \"__\")) goto l215; yyText(G, G->begin, G->end); if (!(YY_END)) goto l215; yyDo(G, yy_1_StrongUl, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StrongUl\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l219:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l215:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StrongUl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StrongStar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"StrongStar\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l225; if (!yy_LocMarker(G)) { goto l225; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"**\")) goto l225;\n- { int yypos226= G->pos, yythunkpos226= G->thunkpos; if (!yy_Whitespace(G)) { goto l226; } goto l225;\n+ yyprintf((stderr, \"%s\\n\", \"StrongStar\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l221; if (!yy_LocMarker(G)) { goto l221; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"**\")) goto l221;\n+ { int yypos222= G->pos, yythunkpos222= G->thunkpos; if (!yy_Whitespace(G)) { goto l222; } goto l221;\n+ l222:;\t G->pos= yypos222; G->thunkpos= yythunkpos222;\n+ }\n+ { int yypos225= G->pos, yythunkpos225= G->thunkpos; if (!yymatchString(G, \"**\")) goto l225; goto l221;\n+ l225:;\t G->pos= yypos225; G->thunkpos= yythunkpos225;\n+ } if (!yy_Inline(G)) { goto l221; }\n+ l223:;\t\n+ { int yypos224= G->pos, yythunkpos224= G->thunkpos;\n+ { int yypos226= G->pos, yythunkpos226= G->thunkpos; if (!yymatchString(G, \"**\")) goto l226; goto l224;\n l226:;\t G->pos= yypos226; G->thunkpos= yythunkpos226;\n- }\n- { int yypos229= G->pos, yythunkpos229= G->thunkpos; if (!yymatchString(G, \"**\")) goto l229; goto l225;\n- l229:;\t G->pos= yypos229; G->thunkpos= yythunkpos229;\n- } if (!yy_Inline(G)) { goto l225; }\n- l227:;\t\n- { int yypos228= G->pos, yythunkpos228= G->thunkpos;\n- { int yypos230= G->pos, yythunkpos230= G->thunkpos; if (!yymatchString(G, \"**\")) goto l230; goto l228;\n- l230:;\t G->pos= yypos230; G->thunkpos= yythunkpos230;\n- } if (!yy_Inline(G)) { goto l228; } goto l227;\n- l228:;\t G->pos= yypos228; G->thunkpos= yythunkpos228;\n- } if (!yymatchString(G, \"**\")) goto l225; yyText(G, G->begin, G->end); if (!(YY_END)) goto l225; yyDo(G, yy_1_StrongStar, G->begin, G->end);\n+ } if (!yy_Inline(G)) { goto l224; } goto l223;\n+ l224:;\t G->pos= yypos224; G->thunkpos= yythunkpos224;\n+ } if (!yymatchString(G, \"**\")) goto l221; yyText(G, G->begin, G->end); if (!(YY_END)) goto l221; yyDo(G, yy_1_StrongStar, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StrongStar\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l225:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l221:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StrongStar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Whitespace(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Whitespace\"));\n- { int yypos232= G->pos, yythunkpos232= G->thunkpos; if (!yy_Spacechar(G)) { goto l233; } goto l232;\n- l233:;\t G->pos= yypos232; G->thunkpos= yythunkpos232; if (!yy_Newline(G)) { goto l231; }\n- }\n- l232:;\t\n+ { int yypos228= G->pos, yythunkpos228= G->thunkpos; if (!yy_Spacechar(G)) { goto l229; } goto l228;\n+ l229:;\t G->pos= yypos228; G->thunkpos= yythunkpos228; if (!yy_Newline(G)) { goto l227; }\n+ }\n+ l228:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Whitespace\", G->buf+G->pos));\n return 1;\n- l231:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l227:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Whitespace\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_EmphUl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"EmphUl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l234; if (!yy_LocMarker(G)) { goto l234; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '_')) goto l234;\n- { int yypos235= G->pos, yythunkpos235= G->thunkpos; if (!yy_Whitespace(G)) { goto l235; } goto l234;\n- l235:;\t G->pos= yypos235; G->thunkpos= yythunkpos235;\n- }\n- { int yypos238= G->pos, yythunkpos238= G->thunkpos;\n- { int yypos240= G->pos, yythunkpos240= G->thunkpos; if (!yymatchChar(G, '_')) goto l240; goto l239;\n- l240:;\t G->pos= yypos240; G->thunkpos= yythunkpos240;\n- } if (!yy_Inline(G)) { goto l239; } goto l238;\n- l239:;\t G->pos= yypos238; G->thunkpos= yythunkpos238; if (!yy_StrongUl(G)) { goto l234; }\n- }\n- l238:;\t\n- l236:;\t\n+ yyprintf((stderr, \"%s\\n\", \"EmphUl\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l230; if (!yy_LocMarker(G)) { goto l230; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '_')) goto l230;\n+ { int yypos231= G->pos, yythunkpos231= G->thunkpos; if (!yy_Whitespace(G)) { goto l231; } goto l230;\n+ l231:;\t G->pos= yypos231; G->thunkpos= yythunkpos231;\n+ }\n+ { int yypos234= G->pos, yythunkpos234= G->thunkpos;\n+ { int yypos236= G->pos, yythunkpos236= G->thunkpos; if (!yymatchChar(G, '_')) goto l236; goto l235;\n+ l236:;\t G->pos= yypos236; G->thunkpos= yythunkpos236;\n+ } if (!yy_Inline(G)) { goto l235; } goto l234;\n+ l235:;\t G->pos= yypos234; G->thunkpos= yythunkpos234; if (!yy_StrongUl(G)) { goto l230; }\n+ }\n+ l234:;\t\n+ l232:;\t\n+ { int yypos233= G->pos, yythunkpos233= G->thunkpos;\n { int yypos237= G->pos, yythunkpos237= G->thunkpos;\n- { int yypos241= G->pos, yythunkpos241= G->thunkpos;\n- { int yypos243= G->pos, yythunkpos243= G->thunkpos; if (!yymatchChar(G, '_')) goto l243; goto l242;\n- l243:;\t G->pos= yypos243; G->thunkpos= yythunkpos243;\n- } if (!yy_Inline(G)) { goto l242; } goto l241;\n- l242:;\t G->pos= yypos241; G->thunkpos= yythunkpos241; if (!yy_StrongUl(G)) { goto l237; }\n- }\n- l241:;\t goto l236;\n- l237:;\t G->pos= yypos237; G->thunkpos= yythunkpos237;\n- } if (!yymatchChar(G, '_')) goto l234; yyText(G, G->begin, G->end); if (!(YY_END)) goto l234; yyDo(G, yy_1_EmphUl, G->begin, G->end);\n+ { int yypos239= G->pos, yythunkpos239= G->thunkpos; if (!yymatchChar(G, '_')) goto l239; goto l238;\n+ l239:;\t G->pos= yypos239; G->thunkpos= yythunkpos239;\n+ } if (!yy_Inline(G)) { goto l238; } goto l237;\n+ l238:;\t G->pos= yypos237; G->thunkpos= yythunkpos237; if (!yy_StrongUl(G)) { goto l233; }\n+ }\n+ l237:;\t goto l232;\n+ l233:;\t G->pos= yypos233; G->thunkpos= yythunkpos233;\n+ } if (!yymatchChar(G, '_')) goto l230; yyText(G, G->begin, G->end); if (!(YY_END)) goto l230; yyDo(G, yy_1_EmphUl, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"EmphUl\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l234:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l230:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"EmphUl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_EmphStar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"EmphStar\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l244; if (!yy_LocMarker(G)) { goto l244; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '*')) goto l244;\n- { int yypos245= G->pos, yythunkpos245= G->thunkpos; if (!yy_Whitespace(G)) { goto l245; } goto l244;\n- l245:;\t G->pos= yypos245; G->thunkpos= yythunkpos245;\n- }\n- { int yypos248= G->pos, yythunkpos248= G->thunkpos;\n- { int yypos250= G->pos, yythunkpos250= G->thunkpos; if (!yymatchChar(G, '*')) goto l250; goto l249;\n- l250:;\t G->pos= yypos250; G->thunkpos= yythunkpos250;\n- } if (!yy_Inline(G)) { goto l249; } goto l248;\n- l249:;\t G->pos= yypos248; G->thunkpos= yythunkpos248; if (!yy_StrongStar(G)) { goto l244; }\n- }\n- l248:;\t\n- l246:;\t\n+ yyprintf((stderr, \"%s\\n\", \"EmphStar\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l240; if (!yy_LocMarker(G)) { goto l240; } yyDo(G, yySet, -1, 0); if (!yymatchChar(G, '*')) goto l240;\n+ { int yypos241= G->pos, yythunkpos241= G->thunkpos; if (!yy_Whitespace(G)) { goto l241; } goto l240;\n+ l241:;\t G->pos= yypos241; G->thunkpos= yythunkpos241;\n+ }\n+ { int yypos244= G->pos, yythunkpos244= G->thunkpos;\n+ { int yypos246= G->pos, yythunkpos246= G->thunkpos; if (!yymatchChar(G, '*')) goto l246; goto l245;\n+ l246:;\t G->pos= yypos246; G->thunkpos= yythunkpos246;\n+ } if (!yy_Inline(G)) { goto l245; } goto l244;\n+ l245:;\t G->pos= yypos244; G->thunkpos= yythunkpos244; if (!yy_StrongStar(G)) { goto l240; }\n+ }\n+ l244:;\t\n+ l242:;\t\n+ { int yypos243= G->pos, yythunkpos243= G->thunkpos;\n { int yypos247= G->pos, yythunkpos247= G->thunkpos;\n- { int yypos251= G->pos, yythunkpos251= G->thunkpos;\n- { int yypos253= G->pos, yythunkpos253= G->thunkpos; if (!yymatchChar(G, '*')) goto l253; goto l252;\n- l253:;\t G->pos= yypos253; G->thunkpos= yythunkpos253;\n- } if (!yy_Inline(G)) { goto l252; } goto l251;\n- l252:;\t G->pos= yypos251; G->thunkpos= yythunkpos251; if (!yy_StrongStar(G)) { goto l247; }\n- }\n- l251:;\t goto l246;\n- l247:;\t G->pos= yypos247; G->thunkpos= yythunkpos247;\n- } if (!yymatchChar(G, '*')) goto l244; yyText(G, G->begin, G->end); if (!(YY_END)) goto l244; yyDo(G, yy_1_EmphStar, G->begin, G->end);\n+ { int yypos249= G->pos, yythunkpos249= G->thunkpos; if (!yymatchChar(G, '*')) goto l249; goto l248;\n+ l249:;\t G->pos= yypos249; G->thunkpos= yythunkpos249;\n+ } if (!yy_Inline(G)) { goto l248; } goto l247;\n+ l248:;\t G->pos= yypos247; G->thunkpos= yythunkpos247; if (!yy_StrongStar(G)) { goto l243; }\n+ }\n+ l247:;\t goto l242;\n+ l243:;\t G->pos= yypos243; G->thunkpos= yythunkpos243;\n+ } if (!yymatchChar(G, '*')) goto l240; yyText(G, G->begin, G->end); if (!(YY_END)) goto l240; yyDo(G, yy_1_EmphStar, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"EmphStar\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l244:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l240:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"EmphStar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StarLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"StarLine\"));\n- { int yypos255= G->pos, yythunkpos255= G->thunkpos; if (!yymatchString(G, \"****\")) goto l256;\n- l257:;\t\n- { int yypos258= G->pos, yythunkpos258= G->thunkpos; if (!yymatchChar(G, '*')) goto l258; goto l257;\n- l258:;\t G->pos= yypos258; G->thunkpos= yythunkpos258;\n- } goto l255;\n- l256:;\t G->pos= yypos255; G->thunkpos= yythunkpos255; if (!yy_Spacechar(G)) { goto l254; } if (!yymatchChar(G, '*')) goto l254;\n+ { int yypos251= G->pos, yythunkpos251= G->thunkpos; if (!yymatchString(G, \"****\")) goto l252;\n+ l253:;\t\n+ { int yypos254= G->pos, yythunkpos254= G->thunkpos; if (!yymatchChar(G, '*')) goto l254; goto l253;\n+ l254:;\t G->pos= yypos254; G->thunkpos= yythunkpos254;\n+ } goto l251;\n+ l252:;\t G->pos= yypos251; G->thunkpos= yythunkpos251; if (!yy_Spacechar(G)) { goto l250; } if (!yymatchChar(G, '*')) goto l250;\n+ l255:;\t\n+ { int yypos256= G->pos, yythunkpos256= G->thunkpos; if (!yymatchChar(G, '*')) goto l256; goto l255;\n+ l256:;\t G->pos= yypos256; G->thunkpos= yythunkpos256;\n+ }\n+ { int yypos257= G->pos, yythunkpos257= G->thunkpos; if (!yy_Spacechar(G)) { goto l250; } G->pos= yypos257; G->thunkpos= yythunkpos257;\n+ }\n+ }\n+ l251:;\t\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"StarLine\", G->buf+G->pos));\n+ return 1;\n+ l250:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"StarLine\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_UlLine(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"UlLine\"));\n+ { int yypos259= G->pos, yythunkpos259= G->thunkpos; if (!yymatchString(G, \"____\")) goto l260;\n+ l261:;\t\n+ { int yypos262= G->pos, yythunkpos262= G->thunkpos; if (!yymatchChar(G, '_')) goto l262; goto l261;\n+ l262:;\t G->pos= yypos262; G->thunkpos= yythunkpos262;\n+ } goto l259;\n+ l260:;\t G->pos= yypos259; G->thunkpos= yythunkpos259; if (!yy_Spacechar(G)) { goto l258; } if (!yymatchChar(G, '_')) goto l258;\n+ l263:;\t\n+ { int yypos264= G->pos, yythunkpos264= G->thunkpos; if (!yymatchChar(G, '_')) goto l264; goto l263;\n+ l264:;\t G->pos= yypos264; G->thunkpos= yythunkpos264;\n+ }\n+ { int yypos265= G->pos, yythunkpos265= G->thunkpos; if (!yy_Spacechar(G)) { goto l258; } G->pos= yypos265; G->thunkpos= yythunkpos265;\n+ }\n+ }\n l259:;\t\n- { int yypos260= G->pos, yythunkpos260= G->thunkpos; if (!yymatchChar(G, '*')) goto l260; goto l259;\n- l260:;\t G->pos= yypos260; G->thunkpos= yythunkpos260;\n- }\n- { int yypos261= G->pos, yythunkpos261= G->thunkpos; if (!yy_Spacechar(G)) { goto l254; } G->pos= yypos261; G->thunkpos= yythunkpos261;\n- }\n- }\n- l255:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"StarLine\", G->buf+G->pos));\n- return 1;\n- l254:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"StarLine\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_UlLine(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"UlLine\"));\n- { int yypos263= G->pos, yythunkpos263= G->thunkpos; if (!yymatchString(G, \"____\")) goto l264;\n- l265:;\t\n- { int yypos266= G->pos, yythunkpos266= G->thunkpos; if (!yymatchChar(G, '_')) goto l266; goto l265;\n- l266:;\t G->pos= yypos266; G->thunkpos= yythunkpos266;\n- } goto l263;\n- l264:;\t G->pos= yypos263; G->thunkpos= yythunkpos263; if (!yy_Spacechar(G)) { goto l262; } if (!yymatchChar(G, '_')) goto l262;\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"UlLine\", G->buf+G->pos));\n+ return 1;\n+ l258:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"UlLine\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_SpecialChar(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"SpecialChar\"));\n+ { int yypos267= G->pos, yythunkpos267= G->thunkpos; if (!yymatchChar(G, '~')) goto l268; goto l267;\n+ l268:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '*')) goto l269; goto l267;\n+ l269:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '_')) goto l270; goto l267;\n+ l270:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '`')) goto l271; goto l267;\n+ l271:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '&')) goto l272; goto l267;\n+ l272:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '[')) goto l273; goto l267;\n+ l273:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, ']')) goto l274; goto l267;\n+ l274:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '(')) goto l275; goto l267;\n+ l275:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, ')')) goto l276; goto l267;\n+ l276:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '<')) goto l277; goto l267;\n+ l277:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '!')) goto l278; goto l267;\n+ l278:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '#')) goto l279; goto l267;\n+ l279:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '\\\\')) goto l280; goto l267;\n+ l280:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '\\'')) goto l281; goto l267;\n+ l281:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yymatchChar(G, '\"')) goto l282; goto l267;\n+ l282:;\t G->pos= yypos267; G->thunkpos= yythunkpos267; if (!yy_ExtendedSpecialChar(G)) { goto l266; }\n+ }\n l267:;\t\n- { int yypos268= G->pos, yythunkpos268= G->thunkpos; if (!yymatchChar(G, '_')) goto l268; goto l267;\n- l268:;\t G->pos= yypos268; G->thunkpos= yythunkpos268;\n- }\n- { int yypos269= G->pos, yythunkpos269= G->thunkpos; if (!yy_Spacechar(G)) { goto l262; } G->pos= yypos269; G->thunkpos= yythunkpos269;\n- }\n- }\n- l263:;\t\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"UlLine\", G->buf+G->pos));\n- return 1;\n- l262:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"UlLine\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_SpecialChar(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"SpecialChar\"));\n- { int yypos271= G->pos, yythunkpos271= G->thunkpos; if (!yymatchChar(G, '~')) goto l272; goto l271;\n- l272:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '*')) goto l273; goto l271;\n- l273:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '_')) goto l274; goto l271;\n- l274:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '`')) goto l275; goto l271;\n- l275:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '&')) goto l276; goto l271;\n- l276:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '[')) goto l277; goto l271;\n- l277:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, ']')) goto l278; goto l271;\n- l278:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '(')) goto l279; goto l271;\n- l279:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, ')')) goto l280; goto l271;\n- l280:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '<')) goto l281; goto l271;\n- l281:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '!')) goto l282; goto l271;\n- l282:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '#')) goto l283; goto l271;\n- l283:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '\\\\')) goto l284; goto l271;\n- l284:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '\\'')) goto l285; goto l271;\n- l285:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yymatchChar(G, '\"')) goto l286; goto l271;\n- l286:;\t G->pos= yypos271; G->thunkpos= yythunkpos271; if (!yy_ExtendedSpecialChar(G)) { goto l270; }\n- }\n- l271:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SpecialChar\", G->buf+G->pos));\n return 1;\n- l270:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l266:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SpecialChar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Eof(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Eof\"));\n- { int yypos288= G->pos, yythunkpos288= G->thunkpos; if (!yymatchDot(G)) goto l288; goto l287;\n+ { int yypos284= G->pos, yythunkpos284= G->thunkpos; if (!yymatchDot(G)) goto l284; goto l283;\n+ l284:;\t G->pos= yypos284; G->thunkpos= yythunkpos284;\n+ }\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"Eof\", G->buf+G->pos));\n+ return 1;\n+ l283:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"Eof\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_NormalEndline(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"NormalEndline\")); if (!yy_Sp(G)) { goto l285; } if (!yy_Newline(G)) { goto l285; }\n+ { int yypos286= G->pos, yythunkpos286= G->thunkpos; if (!yy_BlankLine(G)) { goto l286; } goto l285;\n+ l286:;\t G->pos= yypos286; G->thunkpos= yythunkpos286;\n+ }\n+ { int yypos287= G->pos, yythunkpos287= G->thunkpos; if (!yymatchChar(G, '>')) goto l287; goto l285;\n+ l287:;\t G->pos= yypos287; G->thunkpos= yythunkpos287;\n+ }\n+ { int yypos288= G->pos, yythunkpos288= G->thunkpos; if (!yy_AtxStart(G)) { goto l288; } goto l285;\n l288:;\t G->pos= yypos288; G->thunkpos= yythunkpos288;\n }\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"Eof\", G->buf+G->pos));\n- return 1;\n- l287:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"Eof\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_NormalEndline(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"NormalEndline\")); if (!yy_Sp(G)) { goto l289; } if (!yy_Newline(G)) { goto l289; }\n- { int yypos290= G->pos, yythunkpos290= G->thunkpos; if (!yy_BlankLine(G)) { goto l290; } goto l289;\n- l290:;\t G->pos= yypos290; G->thunkpos= yythunkpos290;\n- }\n- { int yypos291= G->pos, yythunkpos291= G->thunkpos; if (!yymatchChar(G, '>')) goto l291; goto l289;\n- l291:;\t G->pos= yypos291; G->thunkpos= yythunkpos291;\n- }\n- { int yypos292= G->pos, yythunkpos292= G->thunkpos; if (!yy_AtxStart(G)) { goto l292; } goto l289;\n- l292:;\t G->pos= yypos292; G->thunkpos= yythunkpos292;\n- }\n- { int yypos293= G->pos, yythunkpos293= G->thunkpos; if (!yy_Line(G)) { goto l293; }\n- { int yypos294= G->pos, yythunkpos294= G->thunkpos; if (!yymatchChar(G, '=')) goto l295;\n- l296:;\t\n- { int yypos297= G->pos, yythunkpos297= G->thunkpos; if (!yymatchChar(G, '=')) goto l297; goto l296;\n+ { int yypos289= G->pos, yythunkpos289= G->thunkpos; if (!yy_Line(G)) { goto l289; }\n+ { int yypos290= G->pos, yythunkpos290= G->thunkpos; if (!yymatchChar(G, '=')) goto l291;\n+ l292:;\t\n+ { int yypos293= G->pos, yythunkpos293= G->thunkpos; if (!yymatchChar(G, '=')) goto l293; goto l292;\n+ l293:;\t G->pos= yypos293; G->thunkpos= yythunkpos293;\n+ } goto l290;\n+ l291:;\t G->pos= yypos290; G->thunkpos= yythunkpos290; if (!yymatchChar(G, '-')) goto l289;\n+ l294:;\t\n+ { int yypos295= G->pos, yythunkpos295= G->thunkpos; if (!yymatchChar(G, '-')) goto l295; goto l294;\n+ l295:;\t G->pos= yypos295; G->thunkpos= yythunkpos295;\n+ }\n+ }\n+ l290:;\t if (!yy_Newline(G)) { goto l289; } goto l285;\n+ l289:;\t G->pos= yypos289; G->thunkpos= yythunkpos289;\n+ }\n+ { int yypos296= G->pos, yythunkpos296= G->thunkpos; if (!yy_FencedCodeBlockStartTick(G)) { goto l296; } goto l285;\n+ l296:;\t G->pos= yypos296; G->thunkpos= yythunkpos296;\n+ }\n+ { int yypos297= G->pos, yythunkpos297= G->thunkpos; if (!yy_FencedCodeBlockStartTidle(G)) { goto l297; } goto l285;\n l297:;\t G->pos= yypos297; G->thunkpos= yythunkpos297;\n- } goto l294;\n- l295:;\t G->pos= yypos294; G->thunkpos= yythunkpos294; if (!yymatchChar(G, '-')) goto l293;\n- l298:;\t\n- { int yypos299= G->pos, yythunkpos299= G->thunkpos; if (!yymatchChar(G, '-')) goto l299; goto l298;\n- l299:;\t G->pos= yypos299; G->thunkpos= yythunkpos299;\n- }\n- }\n- l294:;\t if (!yy_Newline(G)) { goto l293; } goto l289;\n- l293:;\t G->pos= yypos293; G->thunkpos= yythunkpos293;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"NormalEndline\", G->buf+G->pos));\n return 1;\n- l289:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l285:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"NormalEndline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TerminalEndline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TerminalEndline\")); if (!yy_Sp(G)) { goto l300; } if (!yy_Newline(G)) { goto l300; } if (!yy_Eof(G)) { goto l300; }\n+ yyprintf((stderr, \"%s\\n\", \"TerminalEndline\")); if (!yy_Sp(G)) { goto l298; } if (!yy_Newline(G)) { goto l298; } if (!yy_Eof(G)) { goto l298; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TerminalEndline\", G->buf+G->pos));\n return 1;\n+ l298:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"TerminalEndline\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_LineBreak(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"LineBreak\")); if (!yymatchString(G, \" \")) goto l299; if (!yy_NormalEndline(G)) { goto l299; }\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"LineBreak\", G->buf+G->pos));\n+ return 1;\n+ l299:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"LineBreak\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_CharEntity(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"CharEntity\")); if (!yymatchChar(G, '&')) goto l300; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l300;\n+ l301:;\t\n+ { int yypos302= G->pos, yythunkpos302= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l302; goto l301;\n+ l302:;\t G->pos= yypos302; G->thunkpos= yythunkpos302;\n+ } if (!yymatchChar(G, ';')) goto l300;\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"CharEntity\", G->buf+G->pos));\n+ return 1;\n l300:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"TerminalEndline\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_LineBreak(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"LineBreak\")); if (!yymatchString(G, \" \")) goto l301; if (!yy_NormalEndline(G)) { goto l301; }\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"LineBreak\", G->buf+G->pos));\n- return 1;\n- l301:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"LineBreak\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_CharEntity(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"CharEntity\")); if (!yymatchChar(G, '&')) goto l302; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l302;\n- l303:;\t\n- { int yypos304= G->pos, yythunkpos304= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l304; goto l303;\n- l304:;\t G->pos= yypos304; G->thunkpos= yythunkpos304;\n- } if (!yymatchChar(G, ';')) goto l302;\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"CharEntity\", G->buf+G->pos));\n- return 1;\n- l302:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"CharEntity\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DecEntity(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DecEntity\")); if (!yymatchChar(G, '&')) goto l305; if (!yymatchChar(G, '#')) goto l305; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l305;\n- l306:;\t\n- { int yypos307= G->pos, yythunkpos307= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l307; goto l306;\n- l307:;\t G->pos= yypos307; G->thunkpos= yythunkpos307;\n- } if (!yymatchChar(G, ';')) goto l305;\n+ yyprintf((stderr, \"%s\\n\", \"DecEntity\")); if (!yymatchChar(G, '&')) goto l303; if (!yymatchChar(G, '#')) goto l303; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l303;\n+ l304:;\t\n+ { int yypos305= G->pos, yythunkpos305= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l305; goto l304;\n+ l305:;\t G->pos= yypos305; G->thunkpos= yythunkpos305;\n+ } if (!yymatchChar(G, ';')) goto l303;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DecEntity\", G->buf+G->pos));\n return 1;\n- l305:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l303:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DecEntity\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HexEntity(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HexEntity\")); if (!yymatchChar(G, '&')) goto l308; if (!yymatchChar(G, '#')) goto l308; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\001\\000\\000\\000\\001\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l308; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\176\\000\\000\\000\\176\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l308;\n- l309:;\t\n- { int yypos310= G->pos, yythunkpos310= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\176\\000\\000\\000\\176\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l310; goto l309;\n- l310:;\t G->pos= yypos310; G->thunkpos= yythunkpos310;\n- } if (!yymatchChar(G, ';')) goto l308;\n+ yyprintf((stderr, \"%s\\n\", \"HexEntity\")); if (!yymatchChar(G, '&')) goto l306; if (!yymatchChar(G, '#')) goto l306; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\001\\000\\000\\000\\001\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l306; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\176\\000\\000\\000\\176\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l306;\n+ l307:;\t\n+ { int yypos308= G->pos, yythunkpos308= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\176\\000\\000\\000\\176\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l308; goto l307;\n+ l308:;\t G->pos= yypos308; G->thunkpos= yythunkpos308;\n+ } if (!yymatchChar(G, ';')) goto l306;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HexEntity\", G->buf+G->pos));\n return 1;\n- l308:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l306:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HexEntity\", G->buf+G->pos));\n return 0;\n }\n+YY_RULE(int) yy_ExtendedSpecialChar(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"ExtendedSpecialChar\"));\n+ { int yypos310= G->pos, yythunkpos310= G->thunkpos; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l311; if (!yymatchChar(G, '^')) goto l311; goto l310;\n+ l311:;\t G->pos= yypos310; G->thunkpos= yythunkpos310; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l312; if (!yymatchChar(G, '$')) goto l312; goto l310;\n+ l312:;\t G->pos= yypos310; G->thunkpos= yythunkpos310; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_TABLE) )) goto l309; if (!yymatchChar(G, '|')) goto l309;\n+ }\n+ l310:;\t\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"ExtendedSpecialChar\", G->buf+G->pos));\n+ return 1;\n+ l309:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"ExtendedSpecialChar\", G->buf+G->pos));\n+ return 0;\n+}\n YY_RULE(int) yy_Alphanumeric(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Alphanumeric\"));\n- { int yypos312= G->pos, yythunkpos312= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l313; goto l312;\n- l313:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\200\")) goto l314; goto l312;\n- l314:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\201\")) goto l315; goto l312;\n- l315:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\202\")) goto l316; goto l312;\n- l316:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\203\")) goto l317; goto l312;\n- l317:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\204\")) goto l318; goto l312;\n- l318:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\205\")) goto l319; goto l312;\n- l319:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\206\")) goto l320; goto l312;\n- l320:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\207\")) goto l321; goto l312;\n- l321:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\210\")) goto l322; goto l312;\n- l322:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\211\")) goto l323; goto l312;\n- l323:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\212\")) goto l324; goto l312;\n- l324:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\213\")) goto l325; goto l312;\n- l325:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\214\")) goto l326; goto l312;\n- l326:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\215\")) goto l327; goto l312;\n- l327:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\216\")) goto l328; goto l312;\n- l328:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\217\")) goto l329; goto l312;\n- l329:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\220\")) goto l330; goto l312;\n- l330:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\221\")) goto l331; goto l312;\n- l331:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\222\")) goto l332; goto l312;\n- l332:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\223\")) goto l333; goto l312;\n- l333:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\224\")) goto l334; goto l312;\n- l334:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\225\")) goto l335; goto l312;\n- l335:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\226\")) goto l336; goto l312;\n- l336:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\227\")) goto l337; goto l312;\n- l337:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\230\")) goto l338; goto l312;\n- l338:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\231\")) goto l339; goto l312;\n- l339:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\232\")) goto l340; goto l312;\n- l340:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\233\")) goto l341; goto l312;\n- l341:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\234\")) goto l342; goto l312;\n- l342:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\235\")) goto l343; goto l312;\n- l343:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\236\")) goto l344; goto l312;\n- l344:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\237\")) goto l345; goto l312;\n- l345:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\240\")) goto l346; goto l312;\n- l346:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\241\")) goto l347; goto l312;\n- l347:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\242\")) goto l348; goto l312;\n- l348:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\243\")) goto l349; goto l312;\n- l349:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\244\")) goto l350; goto l312;\n- l350:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\245\")) goto l351; goto l312;\n- l351:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\246\")) goto l352; goto l312;\n- l352:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\247\")) goto l353; goto l312;\n- l353:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\250\")) goto l354; goto l312;\n- l354:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\251\")) goto l355; goto l312;\n- l355:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\252\")) goto l356; goto l312;\n- l356:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\253\")) goto l357; goto l312;\n- l357:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\254\")) goto l358; goto l312;\n- l358:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\255\")) goto l359; goto l312;\n- l359:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\256\")) goto l360; goto l312;\n- l360:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\257\")) goto l361; goto l312;\n- l361:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\260\")) goto l362; goto l312;\n- l362:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\261\")) goto l363; goto l312;\n- l363:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\262\")) goto l364; goto l312;\n- l364:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\263\")) goto l365; goto l312;\n- l365:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\264\")) goto l366; goto l312;\n- l366:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\265\")) goto l367; goto l312;\n- l367:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\266\")) goto l368; goto l312;\n- l368:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\267\")) goto l369; goto l312;\n- l369:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\270\")) goto l370; goto l312;\n- l370:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\271\")) goto l371; goto l312;\n- l371:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\272\")) goto l372; goto l312;\n- l372:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\273\")) goto l373; goto l312;\n- l373:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\274\")) goto l374; goto l312;\n- l374:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\275\")) goto l375; goto l312;\n- l375:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\276\")) goto l376; goto l312;\n- l376:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\277\")) goto l377; goto l312;\n- l377:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\300\")) goto l378; goto l312;\n- l378:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\301\")) goto l379; goto l312;\n- l379:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\302\")) goto l380; goto l312;\n- l380:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\303\")) goto l381; goto l312;\n- l381:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\304\")) goto l382; goto l312;\n- l382:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\305\")) goto l383; goto l312;\n- l383:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\306\")) goto l384; goto l312;\n- l384:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\307\")) goto l385; goto l312;\n- l385:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\310\")) goto l386; goto l312;\n- l386:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\311\")) goto l387; goto l312;\n- l387:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\312\")) goto l388; goto l312;\n- l388:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\313\")) goto l389; goto l312;\n- l389:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\314\")) goto l390; goto l312;\n- l390:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\315\")) goto l391; goto l312;\n- l391:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\316\")) goto l392; goto l312;\n- l392:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\317\")) goto l393; goto l312;\n- l393:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\320\")) goto l394; goto l312;\n- l394:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\321\")) goto l395; goto l312;\n- l395:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\322\")) goto l396; goto l312;\n- l396:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\323\")) goto l397; goto l312;\n- l397:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\324\")) goto l398; goto l312;\n- l398:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\325\")) goto l399; goto l312;\n- l399:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\326\")) goto l400; goto l312;\n- l400:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\327\")) goto l401; goto l312;\n- l401:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\330\")) goto l402; goto l312;\n- l402:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\331\")) goto l403; goto l312;\n- l403:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\332\")) goto l404; goto l312;\n- l404:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\333\")) goto l405; goto l312;\n- l405:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\334\")) goto l406; goto l312;\n- l406:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\335\")) goto l407; goto l312;\n- l407:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\336\")) goto l408; goto l312;\n- l408:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\337\")) goto l409; goto l312;\n- l409:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\340\")) goto l410; goto l312;\n- l410:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\341\")) goto l411; goto l312;\n- l411:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\342\")) goto l412; goto l312;\n- l412:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\343\")) goto l413; goto l312;\n- l413:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\344\")) goto l414; goto l312;\n- l414:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\345\")) goto l415; goto l312;\n- l415:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\346\")) goto l416; goto l312;\n- l416:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\347\")) goto l417; goto l312;\n- l417:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\350\")) goto l418; goto l312;\n- l418:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\351\")) goto l419; goto l312;\n- l419:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\352\")) goto l420; goto l312;\n- l420:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\353\")) goto l421; goto l312;\n- l421:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\354\")) goto l422; goto l312;\n- l422:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\355\")) goto l423; goto l312;\n- l423:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\356\")) goto l424; goto l312;\n- l424:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\357\")) goto l425; goto l312;\n- l425:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\360\")) goto l426; goto l312;\n- l426:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\361\")) goto l427; goto l312;\n- l427:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\362\")) goto l428; goto l312;\n- l428:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\363\")) goto l429; goto l312;\n- l429:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\364\")) goto l430; goto l312;\n- l430:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\365\")) goto l431; goto l312;\n- l431:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\366\")) goto l432; goto l312;\n- l432:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\367\")) goto l433; goto l312;\n- l433:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\370\")) goto l434; goto l312;\n- l434:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\371\")) goto l435; goto l312;\n- l435:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\372\")) goto l436; goto l312;\n- l436:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\373\")) goto l437; goto l312;\n- l437:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\374\")) goto l438; goto l312;\n- l438:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\375\")) goto l439; goto l312;\n- l439:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\376\")) goto l440; goto l312;\n- l440:;\t G->pos= yypos312; G->thunkpos= yythunkpos312; if (!yymatchString(G, \"\\377\")) goto l311;\n- }\n- l312:;\t\n+ { int yypos314= G->pos, yythunkpos314= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\376\\377\\377\\007\\376\\377\\377\\007\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l315; goto l314;\n+ l315:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\200\")) goto l316; goto l314;\n+ l316:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\201\")) goto l317; goto l314;\n+ l317:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\202\")) goto l318; goto l314;\n+ l318:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\203\")) goto l319; goto l314;\n+ l319:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\204\")) goto l320; goto l314;\n+ l320:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\205\")) goto l321; goto l314;\n+ l321:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\206\")) goto l322; goto l314;\n+ l322:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\207\")) goto l323; goto l314;\n+ l323:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\210\")) goto l324; goto l314;\n+ l324:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\211\")) goto l325; goto l314;\n+ l325:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\212\")) goto l326; goto l314;\n+ l326:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\213\")) goto l327; goto l314;\n+ l327:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\214\")) goto l328; goto l314;\n+ l328:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\215\")) goto l329; goto l314;\n+ l329:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\216\")) goto l330; goto l314;\n+ l330:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\217\")) goto l331; goto l314;\n+ l331:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\220\")) goto l332; goto l314;\n+ l332:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\221\")) goto l333; goto l314;\n+ l333:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\222\")) goto l334; goto l314;\n+ l334:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\223\")) goto l335; goto l314;\n+ l335:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\224\")) goto l336; goto l314;\n+ l336:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\225\")) goto l337; goto l314;\n+ l337:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\226\")) goto l338; goto l314;\n+ l338:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\227\")) goto l339; goto l314;\n+ l339:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\230\")) goto l340; goto l314;\n+ l340:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\231\")) goto l341; goto l314;\n+ l341:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\232\")) goto l342; goto l314;\n+ l342:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\233\")) goto l343; goto l314;\n+ l343:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\234\")) goto l344; goto l314;\n+ l344:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\235\")) goto l345; goto l314;\n+ l345:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\236\")) goto l346; goto l314;\n+ l346:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\237\")) goto l347; goto l314;\n+ l347:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\240\")) goto l348; goto l314;\n+ l348:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\241\")) goto l349; goto l314;\n+ l349:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\242\")) goto l350; goto l314;\n+ l350:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\243\")) goto l351; goto l314;\n+ l351:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\244\")) goto l352; goto l314;\n+ l352:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\245\")) goto l353; goto l314;\n+ l353:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\246\")) goto l354; goto l314;\n+ l354:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\247\")) goto l355; goto l314;\n+ l355:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\250\")) goto l356; goto l314;\n+ l356:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\251\")) goto l357; goto l314;\n+ l357:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\252\")) goto l358; goto l314;\n+ l358:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\253\")) goto l359; goto l314;\n+ l359:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\254\")) goto l360; goto l314;\n+ l360:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\255\")) goto l361; goto l314;\n+ l361:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\256\")) goto l362; goto l314;\n+ l362:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\257\")) goto l363; goto l314;\n+ l363:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\260\")) goto l364; goto l314;\n+ l364:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\261\")) goto l365; goto l314;\n+ l365:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\262\")) goto l366; goto l314;\n+ l366:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\263\")) goto l367; goto l314;\n+ l367:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\264\")) goto l368; goto l314;\n+ l368:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\265\")) goto l369; goto l314;\n+ l369:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\266\")) goto l370; goto l314;\n+ l370:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\267\")) goto l371; goto l314;\n+ l371:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\270\")) goto l372; goto l314;\n+ l372:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\271\")) goto l373; goto l314;\n+ l373:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\272\")) goto l374; goto l314;\n+ l374:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\273\")) goto l375; goto l314;\n+ l375:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\274\")) goto l376; goto l314;\n+ l376:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\275\")) goto l377; goto l314;\n+ l377:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\276\")) goto l378; goto l314;\n+ l378:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\277\")) goto l379; goto l314;\n+ l379:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\300\")) goto l380; goto l314;\n+ l380:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\301\")) goto l381; goto l314;\n+ l381:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\302\")) goto l382; goto l314;\n+ l382:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\303\")) goto l383; goto l314;\n+ l383:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\304\")) goto l384; goto l314;\n+ l384:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\305\")) goto l385; goto l314;\n+ l385:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\306\")) goto l386; goto l314;\n+ l386:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\307\")) goto l387; goto l314;\n+ l387:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\310\")) goto l388; goto l314;\n+ l388:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\311\")) goto l389; goto l314;\n+ l389:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\312\")) goto l390; goto l314;\n+ l390:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\313\")) goto l391; goto l314;\n+ l391:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\314\")) goto l392; goto l314;\n+ l392:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\315\")) goto l393; goto l314;\n+ l393:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\316\")) goto l394; goto l314;\n+ l394:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\317\")) goto l395; goto l314;\n+ l395:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\320\")) goto l396; goto l314;\n+ l396:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\321\")) goto l397; goto l314;\n+ l397:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\322\")) goto l398; goto l314;\n+ l398:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\323\")) goto l399; goto l314;\n+ l399:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\324\")) goto l400; goto l314;\n+ l400:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\325\")) goto l401; goto l314;\n+ l401:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\326\")) goto l402; goto l314;\n+ l402:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\327\")) goto l403; goto l314;\n+ l403:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\330\")) goto l404; goto l314;\n+ l404:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\331\")) goto l405; goto l314;\n+ l405:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\332\")) goto l406; goto l314;\n+ l406:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\333\")) goto l407; goto l314;\n+ l407:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\334\")) goto l408; goto l314;\n+ l408:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\335\")) goto l409; goto l314;\n+ l409:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\336\")) goto l410; goto l314;\n+ l410:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\337\")) goto l411; goto l314;\n+ l411:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\340\")) goto l412; goto l314;\n+ l412:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\341\")) goto l413; goto l314;\n+ l413:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\342\")) goto l414; goto l314;\n+ l414:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\343\")) goto l415; goto l314;\n+ l415:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\344\")) goto l416; goto l314;\n+ l416:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\345\")) goto l417; goto l314;\n+ l417:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\346\")) goto l418; goto l314;\n+ l418:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\347\")) goto l419; goto l314;\n+ l419:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\350\")) goto l420; goto l314;\n+ l420:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\351\")) goto l421; goto l314;\n+ l421:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\352\")) goto l422; goto l314;\n+ l422:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\353\")) goto l423; goto l314;\n+ l423:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\354\")) goto l424; goto l314;\n+ l424:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\355\")) goto l425; goto l314;\n+ l425:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\356\")) goto l426; goto l314;\n+ l426:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\357\")) goto l427; goto l314;\n+ l427:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\360\")) goto l428; goto l314;\n+ l428:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\361\")) goto l429; goto l314;\n+ l429:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\362\")) goto l430; goto l314;\n+ l430:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\363\")) goto l431; goto l314;\n+ l431:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\364\")) goto l432; goto l314;\n+ l432:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\365\")) goto l433; goto l314;\n+ l433:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\366\")) goto l434; goto l314;\n+ l434:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\367\")) goto l435; goto l314;\n+ l435:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\370\")) goto l436; goto l314;\n+ l436:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\371\")) goto l437; goto l314;\n+ l437:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\372\")) goto l438; goto l314;\n+ l438:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\373\")) goto l439; goto l314;\n+ l439:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\374\")) goto l440; goto l314;\n+ l440:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\375\")) goto l441; goto l314;\n+ l441:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\376\")) goto l442; goto l314;\n+ l442:;\t G->pos= yypos314; G->thunkpos= yythunkpos314; if (!yymatchString(G, \"\\377\")) goto l313;\n+ }\n+ l314:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Alphanumeric\", G->buf+G->pos));\n return 1;\n- l311:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l313:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Alphanumeric\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_NormalChar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"NormalChar\"));\n- { int yypos442= G->pos, yythunkpos442= G->thunkpos;\n- { int yypos443= G->pos, yythunkpos443= G->thunkpos; if (!yy_SpecialChar(G)) { goto l444; } goto l443;\n- l444:;\t G->pos= yypos443; G->thunkpos= yythunkpos443; if (!yy_Spacechar(G)) { goto l445; } goto l443;\n- l445:;\t G->pos= yypos443; G->thunkpos= yythunkpos443; if (!yy_Newline(G)) { goto l442; }\n- }\n- l443:;\t goto l441;\n- l442:;\t G->pos= yypos442; G->thunkpos= yythunkpos442;\n- } if (!yymatchDot(G)) goto l441;\n+ { int yypos444= G->pos, yythunkpos444= G->thunkpos;\n+ { int yypos445= G->pos, yythunkpos445= G->thunkpos; if (!yy_SpecialChar(G)) { goto l446; } goto l445;\n+ l446:;\t G->pos= yypos445; G->thunkpos= yythunkpos445; if (!yy_Spacechar(G)) { goto l447; } goto l445;\n+ l447:;\t G->pos= yypos445; G->thunkpos= yythunkpos445; if (!yy_Newline(G)) { goto l444; }\n+ }\n+ l445:;\t goto l443;\n+ l444:;\t G->pos= yypos444; G->thunkpos= yythunkpos444;\n+ } if (!yymatchDot(G)) goto l443;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"NormalChar\", G->buf+G->pos));\n return 1;\n- l441:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l443:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"NormalChar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Symbol(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Symbol\")); if (!yy_SpecialChar(G)) { goto l446; }\n+ yyprintf((stderr, \"%s\\n\", \"Symbol\")); if (!yy_SpecialChar(G)) { goto l448; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Symbol\", G->buf+G->pos));\n return 1;\n- l446:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l448:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Symbol\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_EscapedChar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"EscapedChar\")); if (!yymatchChar(G, '\\\\')) goto l447;\n- { int yypos448= G->pos, yythunkpos448= G->thunkpos; if (!yy_Newline(G)) { goto l448; } goto l447;\n- l448:;\t G->pos= yypos448; G->thunkpos= yythunkpos448;\n- } if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\012\\157\\000\\120\\000\\000\\000\\270\\001\\000\\000\\070\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l447;\n+ yyprintf((stderr, \"%s\\n\", \"EscapedChar\")); if (!yymatchChar(G, '\\\\')) goto l449;\n+ { int yypos450= G->pos, yythunkpos450= G->thunkpos; if (!yy_Newline(G)) { goto l450; } goto l449;\n+ l450:;\t G->pos= yypos450; G->thunkpos= yythunkpos450;\n+ }\n+ { int yypos451= G->pos, yythunkpos451= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\012\\157\\000\\120\\000\\000\\000\\270\\001\\000\\000\\170\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l452; goto l451;\n+ l452:;\t G->pos= yypos451; G->thunkpos= yythunkpos451; if (!yy_ExtendedSpecialChar(G)) { goto l449; }\n+ }\n+ l451:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"EscapedChar\", G->buf+G->pos));\n return 1;\n- l447:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l449:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"EscapedChar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Entity(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Entity\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l449; if (!yy_LocMarker(G)) { goto l449; } yyDo(G, yySet, -1, 0);\n- { int yypos450= G->pos, yythunkpos450= G->thunkpos; if (!yy_HexEntity(G)) { goto l451; } goto l450;\n- l451:;\t G->pos= yypos450; G->thunkpos= yythunkpos450; if (!yy_DecEntity(G)) { goto l452; } goto l450;\n- l452:;\t G->pos= yypos450; G->thunkpos= yythunkpos450; if (!yy_CharEntity(G)) { goto l449; }\n- }\n- l450:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l449; yyDo(G, yy_1_Entity, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Entity\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l453; if (!yy_LocMarker(G)) { goto l453; } yyDo(G, yySet, -1, 0);\n+ { int yypos454= G->pos, yythunkpos454= G->thunkpos; if (!yy_HexEntity(G)) { goto l455; } goto l454;\n+ l455:;\t G->pos= yypos454; G->thunkpos= yythunkpos454; if (!yy_DecEntity(G)) { goto l456; } goto l454;\n+ l456:;\t G->pos= yypos454; G->thunkpos= yythunkpos454; if (!yy_CharEntity(G)) { goto l453; }\n+ }\n+ l454:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l453; yyDo(G, yy_1_Entity, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Entity\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l449:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l453:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Entity\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RawHtml(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"RawHtml\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l453; if (!yy_LocMarker(G)) { goto l453; } yyDo(G, yySet, -1, 0);\n- { int yypos454= G->pos, yythunkpos454= G->thunkpos; if (!yy_HtmlComment(G)) { goto l455; } goto l454;\n- l455:;\t G->pos= yypos454; G->thunkpos= yythunkpos454; if (!yy_HtmlBlockScript(G)) { goto l456; } goto l454;\n- l456:;\t G->pos= yypos454; G->thunkpos= yythunkpos454; if (!yy_HtmlTag(G)) { goto l453; }\n- }\n- l454:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l453; yyDo(G, yy_1_RawHtml, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"RawHtml\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l457; if (!yy_LocMarker(G)) { goto l457; } yyDo(G, yySet, -1, 0);\n+ { int yypos458= G->pos, yythunkpos458= G->thunkpos; if (!yy_HtmlComment(G)) { goto l459; } goto l458;\n+ l459:;\t G->pos= yypos458; G->thunkpos= yythunkpos458; if (!yy_HtmlBlockScript(G)) { goto l460; } goto l458;\n+ l460:;\t G->pos= yypos458; G->thunkpos= yythunkpos458; if (!yy_HtmlTag(G)) { goto l457; }\n+ }\n+ l458:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l457; yyDo(G, yy_1_RawHtml, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RawHtml\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l453:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l457:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RawHtml\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Mark(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 2, 0);\n- yyprintf((stderr, \"%s\\n\", \"Mark\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MARK) )) goto l457; if (!yy_MarkTagOpen(G)) { goto l457; } yyDo(G, yySet, -2, 0); if (!yy_MarkTagText(G)) { goto l457; } if (!yy_MarkTagClose(G)) { goto l457; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_Mark, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Mark\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MARK) )) goto l461; if (!yy_MarkTagOpen(G)) { goto l461; } yyDo(G, yySet, -2, 0); if (!yy_MarkTagText(G)) { goto l461; } if (!yy_MarkTagClose(G)) { goto l461; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_Mark, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Mark\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n return 1;\n- l457:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l461:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Mark\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Code(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Code\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l458;\n- { int yypos459= G->pos, yythunkpos459= G->thunkpos; if (!yy_Ticks1(G)) { goto l460; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l460; }\n- { int yypos463= G->pos, yythunkpos463= G->thunkpos;\n- { int yypos467= G->pos, yythunkpos467= G->thunkpos; if (!yymatchChar(G, '`')) goto l467; goto l464;\n- l467:;\t G->pos= yypos467; G->thunkpos= yythunkpos467;\n- } if (!yy_Nonspacechar(G)) { goto l464; }\n+ yyprintf((stderr, \"%s\\n\", \"Code\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l462;\n+ { int yypos463= G->pos, yythunkpos463= G->thunkpos; if (!yy_Ticks1(G)) { goto l464; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l464; }\n+ { int yypos467= G->pos, yythunkpos467= G->thunkpos;\n+ { int yypos471= G->pos, yythunkpos471= G->thunkpos; if (!yymatchChar(G, '`')) goto l471; goto l468;\n+ l471:;\t G->pos= yypos471; G->thunkpos= yythunkpos471;\n+ } if (!yy_Nonspacechar(G)) { goto l468; }\n+ l469:;\t\n+ { int yypos470= G->pos, yythunkpos470= G->thunkpos;\n+ { int yypos472= G->pos, yythunkpos472= G->thunkpos; if (!yymatchChar(G, '`')) goto l472; goto l470;\n+ l472:;\t G->pos= yypos472; G->thunkpos= yythunkpos472;\n+ } if (!yy_Nonspacechar(G)) { goto l470; } goto l469;\n+ l470:;\t G->pos= yypos470; G->thunkpos= yythunkpos470;\n+ } goto l467;\n+ l468:;\t G->pos= yypos467; G->thunkpos= yythunkpos467;\n+ { int yypos474= G->pos, yythunkpos474= G->thunkpos; if (!yy_Ticks1(G)) { goto l474; } goto l473;\n+ l474:;\t G->pos= yypos474; G->thunkpos= yythunkpos474;\n+ } if (!yymatchChar(G, '`')) goto l473;\n+ l475:;\t\n+ { int yypos476= G->pos, yythunkpos476= G->thunkpos; if (!yymatchChar(G, '`')) goto l476; goto l475;\n+ l476:;\t G->pos= yypos476; G->thunkpos= yythunkpos476;\n+ } goto l467;\n+ l473:;\t G->pos= yypos467; G->thunkpos= yythunkpos467;\n+ { int yypos477= G->pos, yythunkpos477= G->thunkpos; if (!yy_Sp(G)) { goto l477; } if (!yy_Ticks1(G)) { goto l477; } goto l464;\n+ l477:;\t G->pos= yypos477; G->thunkpos= yythunkpos477;\n+ }\n+ { int yypos478= G->pos, yythunkpos478= G->thunkpos; if (!yy_Spacechar(G)) { goto l479; } goto l478;\n+ l479:;\t G->pos= yypos478; G->thunkpos= yythunkpos478; if (!yy_Newline(G)) { goto l464; }\n+ { int yypos480= G->pos, yythunkpos480= G->thunkpos; if (!yy_BlankLine(G)) { goto l480; } goto l464;\n+ l480:;\t G->pos= yypos480; G->thunkpos= yythunkpos480;\n+ }\n+ }\n+ l478:;\t\n+ }\n+ l467:;\t\n l465:;\t\n { int yypos466= G->pos, yythunkpos466= G->thunkpos;\n- { int yypos468= G->pos, yythunkpos468= G->thunkpos; if (!yymatchChar(G, '`')) goto l468; goto l466;\n- l468:;\t G->pos= yypos468; G->thunkpos= yythunkpos468;\n- } if (!yy_Nonspacechar(G)) { goto l466; } goto l465;\n+ { int yypos481= G->pos, yythunkpos481= G->thunkpos;\n+ { int yypos485= G->pos, yythunkpos485= G->thunkpos; if (!yymatchChar(G, '`')) goto l485; goto l482;\n+ l485:;\t G->pos= yypos485; G->thunkpos= yythunkpos485;\n+ } if (!yy_Nonspacechar(G)) { goto l482; }\n+ l483:;\t\n+ { int yypos484= G->pos, yythunkpos484= G->thunkpos;\n+ { int yypos486= G->pos, yythunkpos486= G->thunkpos; if (!yymatchChar(G, '`')) goto l486; goto l484;\n+ l486:;\t G->pos= yypos486; G->thunkpos= yythunkpos486;\n+ } if (!yy_Nonspacechar(G)) { goto l484; } goto l483;\n+ l484:;\t G->pos= yypos484; G->thunkpos= yythunkpos484;\n+ } goto l481;\n+ l482:;\t G->pos= yypos481; G->thunkpos= yythunkpos481;\n+ { int yypos488= G->pos, yythunkpos488= G->thunkpos; if (!yy_Ticks1(G)) { goto l488; } goto l487;\n+ l488:;\t G->pos= yypos488; G->thunkpos= yythunkpos488;\n+ } if (!yymatchChar(G, '`')) goto l487;\n+ l489:;\t\n+ { int yypos490= G->pos, yythunkpos490= G->thunkpos; if (!yymatchChar(G, '`')) goto l490; goto l489;\n+ l490:;\t G->pos= yypos490; G->thunkpos= yythunkpos490;\n+ } goto l481;\n+ l487:;\t G->pos= yypos481; G->thunkpos= yythunkpos481;\n+ { int yypos491= G->pos, yythunkpos491= G->thunkpos; if (!yy_Sp(G)) { goto l491; } if (!yy_Ticks1(G)) { goto l491; } goto l466;\n+ l491:;\t G->pos= yypos491; G->thunkpos= yythunkpos491;\n+ }\n+ { int yypos492= G->pos, yythunkpos492= G->thunkpos; if (!yy_Spacechar(G)) { goto l493; } goto l492;\n+ l493:;\t G->pos= yypos492; G->thunkpos= yythunkpos492; if (!yy_Newline(G)) { goto l466; }\n+ { int yypos494= G->pos, yythunkpos494= G->thunkpos; if (!yy_BlankLine(G)) { goto l494; } goto l466;\n+ l494:;\t G->pos= yypos494; G->thunkpos= yythunkpos494;\n+ }\n+ }\n+ l492:;\t\n+ }\n+ l481:;\t goto l465;\n l466:;\t G->pos= yypos466; G->thunkpos= yythunkpos466;\n- } goto l463;\n- l464:;\t G->pos= yypos463; G->thunkpos= yythunkpos463;\n- { int yypos470= G->pos, yythunkpos470= G->thunkpos; if (!yy_Ticks1(G)) { goto l470; } goto l469;\n- l470:;\t G->pos= yypos470; G->thunkpos= yythunkpos470;\n- } if (!yymatchChar(G, '`')) goto l469;\n- l471:;\t\n- { int yypos472= G->pos, yythunkpos472= G->thunkpos; if (!yymatchChar(G, '`')) goto l472; goto l471;\n- l472:;\t G->pos= yypos472; G->thunkpos= yythunkpos472;\n- } goto l463;\n- l469:;\t G->pos= yypos463; G->thunkpos= yythunkpos463;\n- { int yypos473= G->pos, yythunkpos473= G->thunkpos; if (!yy_Sp(G)) { goto l473; } if (!yy_Ticks1(G)) { goto l473; } goto l460;\n- l473:;\t G->pos= yypos473; G->thunkpos= yythunkpos473;\n- }\n- { int yypos474= G->pos, yythunkpos474= G->thunkpos; if (!yy_Spacechar(G)) { goto l475; } goto l474;\n- l475:;\t G->pos= yypos474; G->thunkpos= yythunkpos474; if (!yy_Newline(G)) { goto l460; }\n- { int yypos476= G->pos, yythunkpos476= G->thunkpos; if (!yy_BlankLine(G)) { goto l476; } goto l460;\n- l476:;\t G->pos= yypos476; G->thunkpos= yythunkpos476;\n- }\n- }\n- l474:;\t\n- }\n- l463:;\t\n- l461:;\t\n- { int yypos462= G->pos, yythunkpos462= G->thunkpos;\n- { int yypos477= G->pos, yythunkpos477= G->thunkpos;\n- { int yypos481= G->pos, yythunkpos481= G->thunkpos; if (!yymatchChar(G, '`')) goto l481; goto l478;\n- l481:;\t G->pos= yypos481; G->thunkpos= yythunkpos481;\n- } if (!yy_Nonspacechar(G)) { goto l478; }\n- l479:;\t\n- { int yypos480= G->pos, yythunkpos480= G->thunkpos;\n- { int yypos482= G->pos, yythunkpos482= G->thunkpos; if (!yymatchChar(G, '`')) goto l482; goto l480;\n- l482:;\t G->pos= yypos482; G->thunkpos= yythunkpos482;\n- } if (!yy_Nonspacechar(G)) { goto l480; } goto l479;\n- l480:;\t G->pos= yypos480; G->thunkpos= yythunkpos480;\n- } goto l477;\n- l478:;\t G->pos= yypos477; G->thunkpos= yythunkpos477;\n- { int yypos484= G->pos, yythunkpos484= G->thunkpos; if (!yy_Ticks1(G)) { goto l484; } goto l483;\n- l484:;\t G->pos= yypos484; G->thunkpos= yythunkpos484;\n- } if (!yymatchChar(G, '`')) goto l483;\n- l485:;\t\n- { int yypos486= G->pos, yythunkpos486= G->thunkpos; if (!yymatchChar(G, '`')) goto l486; goto l485;\n- l486:;\t G->pos= yypos486; G->thunkpos= yythunkpos486;\n- } goto l477;\n- l483:;\t G->pos= yypos477; G->thunkpos= yythunkpos477;\n- { int yypos487= G->pos, yythunkpos487= G->thunkpos; if (!yy_Sp(G)) { goto l487; } if (!yy_Ticks1(G)) { goto l487; } goto l462;\n- l487:;\t G->pos= yypos487; G->thunkpos= yythunkpos487;\n- }\n- { int yypos488= G->pos, yythunkpos488= G->thunkpos; if (!yy_Spacechar(G)) { goto l489; } goto l488;\n- l489:;\t G->pos= yypos488; G->thunkpos= yythunkpos488; if (!yy_Newline(G)) { goto l462; }\n- { int yypos490= G->pos, yythunkpos490= G->thunkpos; if (!yy_BlankLine(G)) { goto l490; } goto l462;\n- l490:;\t G->pos= yypos490; G->thunkpos= yythunkpos490;\n- }\n- }\n- l488:;\t\n- }\n- l477:;\t goto l461;\n- l462:;\t G->pos= yypos462; G->thunkpos= yythunkpos462;\n- } if (!yy_Sp(G)) { goto l460; } if (!yy_Ticks1(G)) { goto l460; } goto l459;\n- l460:;\t G->pos= yypos459; G->thunkpos= yythunkpos459; if (!yy_Ticks2(G)) { goto l491; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l491; }\n- { int yypos494= G->pos, yythunkpos494= G->thunkpos;\n- { int yypos498= G->pos, yythunkpos498= G->thunkpos; if (!yymatchChar(G, '`')) goto l498; goto l495;\n- l498:;\t G->pos= yypos498; G->thunkpos= yythunkpos498;\n- } if (!yy_Nonspacechar(G)) { goto l495; }\n+ } if (!yy_Sp(G)) { goto l464; } if (!yy_Ticks1(G)) { goto l464; } goto l463;\n+ l464:;\t G->pos= yypos463; G->thunkpos= yythunkpos463; if (!yy_Ticks2(G)) { goto l495; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l495; }\n+ { int yypos498= G->pos, yythunkpos498= G->thunkpos;\n+ { int yypos502= G->pos, yythunkpos502= G->thunkpos; if (!yymatchChar(G, '`')) goto l502; goto l499;\n+ l502:;\t G->pos= yypos502; G->thunkpos= yythunkpos502;\n+ } if (!yy_Nonspacechar(G)) { goto l499; }\n+ l500:;\t\n+ { int yypos501= G->pos, yythunkpos501= G->thunkpos;\n+ { int yypos503= G->pos, yythunkpos503= G->thunkpos; if (!yymatchChar(G, '`')) goto l503; goto l501;\n+ l503:;\t G->pos= yypos503; G->thunkpos= yythunkpos503;\n+ } if (!yy_Nonspacechar(G)) { goto l501; } goto l500;\n+ l501:;\t G->pos= yypos501; G->thunkpos= yythunkpos501;\n+ } goto l498;\n+ l499:;\t G->pos= yypos498; G->thunkpos= yythunkpos498;\n+ { int yypos505= G->pos, yythunkpos505= G->thunkpos; if (!yy_Ticks2(G)) { goto l505; } goto l504;\n+ l505:;\t G->pos= yypos505; G->thunkpos= yythunkpos505;\n+ } if (!yymatchChar(G, '`')) goto l504;\n+ l506:;\t\n+ { int yypos507= G->pos, yythunkpos507= G->thunkpos; if (!yymatchChar(G, '`')) goto l507; goto l506;\n+ l507:;\t G->pos= yypos507; G->thunkpos= yythunkpos507;\n+ } goto l498;\n+ l504:;\t G->pos= yypos498; G->thunkpos= yythunkpos498;\n+ { int yypos508= G->pos, yythunkpos508= G->thunkpos; if (!yy_Sp(G)) { goto l508; } if (!yy_Ticks2(G)) { goto l508; } goto l495;\n+ l508:;\t G->pos= yypos508; G->thunkpos= yythunkpos508;\n+ }\n+ { int yypos509= G->pos, yythunkpos509= G->thunkpos; if (!yy_Spacechar(G)) { goto l510; } goto l509;\n+ l510:;\t G->pos= yypos509; G->thunkpos= yythunkpos509; if (!yy_Newline(G)) { goto l495; }\n+ { int yypos511= G->pos, yythunkpos511= G->thunkpos; if (!yy_BlankLine(G)) { goto l511; } goto l495;\n+ l511:;\t G->pos= yypos511; G->thunkpos= yythunkpos511;\n+ }\n+ }\n+ l509:;\t\n+ }\n+ l498:;\t\n l496:;\t\n { int yypos497= G->pos, yythunkpos497= G->thunkpos;\n- { int yypos499= G->pos, yythunkpos499= G->thunkpos; if (!yymatchChar(G, '`')) goto l499; goto l497;\n- l499:;\t G->pos= yypos499; G->thunkpos= yythunkpos499;\n- } if (!yy_Nonspacechar(G)) { goto l497; } goto l496;\n+ { int yypos512= G->pos, yythunkpos512= G->thunkpos;\n+ { int yypos516= G->pos, yythunkpos516= G->thunkpos; if (!yymatchChar(G, '`')) goto l516; goto l513;\n+ l516:;\t G->pos= yypos516; G->thunkpos= yythunkpos516;\n+ } if (!yy_Nonspacechar(G)) { goto l513; }\n+ l514:;\t\n+ { int yypos515= G->pos, yythunkpos515= G->thunkpos;\n+ { int yypos517= G->pos, yythunkpos517= G->thunkpos; if (!yymatchChar(G, '`')) goto l517; goto l515;\n+ l517:;\t G->pos= yypos517; G->thunkpos= yythunkpos517;\n+ } if (!yy_Nonspacechar(G)) { goto l515; } goto l514;\n+ l515:;\t G->pos= yypos515; G->thunkpos= yythunkpos515;\n+ } goto l512;\n+ l513:;\t G->pos= yypos512; G->thunkpos= yythunkpos512;\n+ { int yypos519= G->pos, yythunkpos519= G->thunkpos; if (!yy_Ticks2(G)) { goto l519; } goto l518;\n+ l519:;\t G->pos= yypos519; G->thunkpos= yythunkpos519;\n+ } if (!yymatchChar(G, '`')) goto l518;\n+ l520:;\t\n+ { int yypos521= G->pos, yythunkpos521= G->thunkpos; if (!yymatchChar(G, '`')) goto l521; goto l520;\n+ l521:;\t G->pos= yypos521; G->thunkpos= yythunkpos521;\n+ } goto l512;\n+ l518:;\t G->pos= yypos512; G->thunkpos= yythunkpos512;\n+ { int yypos522= G->pos, yythunkpos522= G->thunkpos; if (!yy_Sp(G)) { goto l522; } if (!yy_Ticks2(G)) { goto l522; } goto l497;\n+ l522:;\t G->pos= yypos522; G->thunkpos= yythunkpos522;\n+ }\n+ { int yypos523= G->pos, yythunkpos523= G->thunkpos; if (!yy_Spacechar(G)) { goto l524; } goto l523;\n+ l524:;\t G->pos= yypos523; G->thunkpos= yythunkpos523; if (!yy_Newline(G)) { goto l497; }\n+ { int yypos525= G->pos, yythunkpos525= G->thunkpos; if (!yy_BlankLine(G)) { goto l525; } goto l497;\n+ l525:;\t G->pos= yypos525; G->thunkpos= yythunkpos525;\n+ }\n+ }\n+ l523:;\t\n+ }\n+ l512:;\t goto l496;\n l497:;\t G->pos= yypos497; G->thunkpos= yythunkpos497;\n- } goto l494;\n- l495:;\t G->pos= yypos494; G->thunkpos= yythunkpos494;\n- { int yypos501= G->pos, yythunkpos501= G->thunkpos; if (!yy_Ticks2(G)) { goto l501; } goto l500;\n- l501:;\t G->pos= yypos501; G->thunkpos= yythunkpos501;\n- } if (!yymatchChar(G, '`')) goto l500;\n- l502:;\t\n- { int yypos503= G->pos, yythunkpos503= G->thunkpos; if (!yymatchChar(G, '`')) goto l503; goto l502;\n- l503:;\t G->pos= yypos503; G->thunkpos= yythunkpos503;\n- } goto l494;\n- l500:;\t G->pos= yypos494; G->thunkpos= yythunkpos494;\n- { int yypos504= G->pos, yythunkpos504= G->thunkpos; if (!yy_Sp(G)) { goto l504; } if (!yy_Ticks2(G)) { goto l504; } goto l491;\n- l504:;\t G->pos= yypos504; G->thunkpos= yythunkpos504;\n- }\n- { int yypos505= G->pos, yythunkpos505= G->thunkpos; if (!yy_Spacechar(G)) { goto l506; } goto l505;\n- l506:;\t G->pos= yypos505; G->thunkpos= yythunkpos505; if (!yy_Newline(G)) { goto l491; }\n- { int yypos507= G->pos, yythunkpos507= G->thunkpos; if (!yy_BlankLine(G)) { goto l507; } goto l491;\n- l507:;\t G->pos= yypos507; G->thunkpos= yythunkpos507;\n- }\n- }\n- l505:;\t\n- }\n- l494:;\t\n- l492:;\t\n- { int yypos493= G->pos, yythunkpos493= G->thunkpos;\n- { int yypos508= G->pos, yythunkpos508= G->thunkpos;\n- { int yypos512= G->pos, yythunkpos512= G->thunkpos; if (!yymatchChar(G, '`')) goto l512; goto l509;\n- l512:;\t G->pos= yypos512; G->thunkpos= yythunkpos512;\n- } if (!yy_Nonspacechar(G)) { goto l509; }\n- l510:;\t\n- { int yypos511= G->pos, yythunkpos511= G->thunkpos;\n- { int yypos513= G->pos, yythunkpos513= G->thunkpos; if (!yymatchChar(G, '`')) goto l513; goto l511;\n- l513:;\t G->pos= yypos513; G->thunkpos= yythunkpos513;\n- } if (!yy_Nonspacechar(G)) { goto l511; } goto l510;\n- l511:;\t G->pos= yypos511; G->thunkpos= yythunkpos511;\n- } goto l508;\n- l509:;\t G->pos= yypos508; G->thunkpos= yythunkpos508;\n- { int yypos515= G->pos, yythunkpos515= G->thunkpos; if (!yy_Ticks2(G)) { goto l515; } goto l514;\n- l515:;\t G->pos= yypos515; G->thunkpos= yythunkpos515;\n- } if (!yymatchChar(G, '`')) goto l514;\n- l516:;\t\n- { int yypos517= G->pos, yythunkpos517= G->thunkpos; if (!yymatchChar(G, '`')) goto l517; goto l516;\n- l517:;\t G->pos= yypos517; G->thunkpos= yythunkpos517;\n- } goto l508;\n- l514:;\t G->pos= yypos508; G->thunkpos= yythunkpos508;\n- { int yypos518= G->pos, yythunkpos518= G->thunkpos; if (!yy_Sp(G)) { goto l518; } if (!yy_Ticks2(G)) { goto l518; } goto l493;\n- l518:;\t G->pos= yypos518; G->thunkpos= yythunkpos518;\n- }\n- { int yypos519= G->pos, yythunkpos519= G->thunkpos; if (!yy_Spacechar(G)) { goto l520; } goto l519;\n- l520:;\t G->pos= yypos519; G->thunkpos= yythunkpos519; if (!yy_Newline(G)) { goto l493; }\n- { int yypos521= G->pos, yythunkpos521= G->thunkpos; if (!yy_BlankLine(G)) { goto l521; } goto l493;\n- l521:;\t G->pos= yypos521; G->thunkpos= yythunkpos521;\n- }\n- }\n- l519:;\t\n- }\n- l508:;\t goto l492;\n- l493:;\t G->pos= yypos493; G->thunkpos= yythunkpos493;\n- } if (!yy_Sp(G)) { goto l491; } if (!yy_Ticks2(G)) { goto l491; } goto l459;\n- l491:;\t G->pos= yypos459; G->thunkpos= yythunkpos459; if (!yy_Ticks3(G)) { goto l522; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l522; }\n- { int yypos525= G->pos, yythunkpos525= G->thunkpos;\n- { int yypos529= G->pos, yythunkpos529= G->thunkpos; if (!yymatchChar(G, '`')) goto l529; goto l526;\n+ } if (!yy_Sp(G)) { goto l495; } if (!yy_Ticks2(G)) { goto l495; } goto l463;\n+ l495:;\t G->pos= yypos463; G->thunkpos= yythunkpos463;\n+ { int yypos527= G->pos, yythunkpos527= G->thunkpos; if (!yy_FencedCodeBlockStartTickLine(G)) { goto l527; } goto l526;\n+ l527:;\t G->pos= yypos527; G->thunkpos= yythunkpos527;\n+ } if (!yy_Ticks3(G)) { goto l526; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l526; }\n+ { int yypos530= G->pos, yythunkpos530= G->thunkpos;\n+ { int yypos534= G->pos, yythunkpos534= G->thunkpos; if (!yymatchChar(G, '`')) goto l534; goto l531;\n+ l534:;\t G->pos= yypos534; G->thunkpos= yythunkpos534;\n+ } if (!yy_Nonspacechar(G)) { goto l531; }\n+ l532:;\t\n+ { int yypos533= G->pos, yythunkpos533= G->thunkpos;\n+ { int yypos535= G->pos, yythunkpos535= G->thunkpos; if (!yymatchChar(G, '`')) goto l535; goto l533;\n+ l535:;\t G->pos= yypos535; G->thunkpos= yythunkpos535;\n+ } if (!yy_Nonspacechar(G)) { goto l533; } goto l532;\n+ l533:;\t G->pos= yypos533; G->thunkpos= yythunkpos533;\n+ } goto l530;\n+ l531:;\t G->pos= yypos530; G->thunkpos= yythunkpos530;\n+ { int yypos537= G->pos, yythunkpos537= G->thunkpos; if (!yy_Ticks3(G)) { goto l537; } goto l536;\n+ l537:;\t G->pos= yypos537; G->thunkpos= yythunkpos537;\n+ } if (!yymatchChar(G, '`')) goto l536;\n+ l538:;\t\n+ { int yypos539= G->pos, yythunkpos539= G->thunkpos; if (!yymatchChar(G, '`')) goto l539; goto l538;\n+ l539:;\t G->pos= yypos539; G->thunkpos= yythunkpos539;\n+ } goto l530;\n+ l536:;\t G->pos= yypos530; G->thunkpos= yythunkpos530;\n+ { int yypos540= G->pos, yythunkpos540= G->thunkpos; if (!yy_Sp(G)) { goto l540; } if (!yy_Ticks3(G)) { goto l540; } goto l526;\n+ l540:;\t G->pos= yypos540; G->thunkpos= yythunkpos540;\n+ }\n+ { int yypos541= G->pos, yythunkpos541= G->thunkpos; if (!yy_Spacechar(G)) { goto l542; } goto l541;\n+ l542:;\t G->pos= yypos541; G->thunkpos= yythunkpos541; if (!yy_Newline(G)) { goto l526; }\n+ { int yypos543= G->pos, yythunkpos543= G->thunkpos; if (!yy_BlankLine(G)) { goto l543; } goto l526;\n+ l543:;\t G->pos= yypos543; G->thunkpos= yythunkpos543;\n+ }\n+ }\n+ l541:;\t\n+ }\n+ l530:;\t\n+ l528:;\t\n+ { int yypos529= G->pos, yythunkpos529= G->thunkpos;\n+ { int yypos544= G->pos, yythunkpos544= G->thunkpos;\n+ { int yypos548= G->pos, yythunkpos548= G->thunkpos; if (!yymatchChar(G, '`')) goto l548; goto l545;\n+ l548:;\t G->pos= yypos548; G->thunkpos= yythunkpos548;\n+ } if (!yy_Nonspacechar(G)) { goto l545; }\n+ l546:;\t\n+ { int yypos547= G->pos, yythunkpos547= G->thunkpos;\n+ { int yypos549= G->pos, yythunkpos549= G->thunkpos; if (!yymatchChar(G, '`')) goto l549; goto l547;\n+ l549:;\t G->pos= yypos549; G->thunkpos= yythunkpos549;\n+ } if (!yy_Nonspacechar(G)) { goto l547; } goto l546;\n+ l547:;\t G->pos= yypos547; G->thunkpos= yythunkpos547;\n+ } goto l544;\n+ l545:;\t G->pos= yypos544; G->thunkpos= yythunkpos544;\n+ { int yypos551= G->pos, yythunkpos551= G->thunkpos; if (!yy_Ticks3(G)) { goto l551; } goto l550;\n+ l551:;\t G->pos= yypos551; G->thunkpos= yythunkpos551;\n+ } if (!yymatchChar(G, '`')) goto l550;\n+ l552:;\t\n+ { int yypos553= G->pos, yythunkpos553= G->thunkpos; if (!yymatchChar(G, '`')) goto l553; goto l552;\n+ l553:;\t G->pos= yypos553; G->thunkpos= yythunkpos553;\n+ } goto l544;\n+ l550:;\t G->pos= yypos544; G->thunkpos= yythunkpos544;\n+ { int yypos554= G->pos, yythunkpos554= G->thunkpos; if (!yy_Sp(G)) { goto l554; } if (!yy_Ticks3(G)) { goto l554; } goto l529;\n+ l554:;\t G->pos= yypos554; G->thunkpos= yythunkpos554;\n+ }\n+ { int yypos555= G->pos, yythunkpos555= G->thunkpos; if (!yy_Spacechar(G)) { goto l556; } goto l555;\n+ l556:;\t G->pos= yypos555; G->thunkpos= yythunkpos555; if (!yy_Newline(G)) { goto l529; }\n+ { int yypos557= G->pos, yythunkpos557= G->thunkpos; if (!yy_BlankLine(G)) { goto l557; } goto l529;\n+ l557:;\t G->pos= yypos557; G->thunkpos= yythunkpos557;\n+ }\n+ }\n+ l555:;\t\n+ }\n+ l544:;\t goto l528;\n l529:;\t G->pos= yypos529; G->thunkpos= yythunkpos529;\n- } if (!yy_Nonspacechar(G)) { goto l526; }\n- l527:;\t\n- { int yypos528= G->pos, yythunkpos528= G->thunkpos;\n- { int yypos530= G->pos, yythunkpos530= G->thunkpos; if (!yymatchChar(G, '`')) goto l530; goto l528;\n- l530:;\t G->pos= yypos530; G->thunkpos= yythunkpos530;\n- } if (!yy_Nonspacechar(G)) { goto l528; } goto l527;\n- l528:;\t G->pos= yypos528; G->thunkpos= yythunkpos528;\n- } goto l525;\n- l526:;\t G->pos= yypos525; G->thunkpos= yythunkpos525;\n- { int yypos532= G->pos, yythunkpos532= G->thunkpos; if (!yy_Ticks3(G)) { goto l532; } goto l531;\n- l532:;\t G->pos= yypos532; G->thunkpos= yythunkpos532;\n- } if (!yymatchChar(G, '`')) goto l531;\n- l533:;\t\n- { int yypos534= G->pos, yythunkpos534= G->thunkpos; if (!yymatchChar(G, '`')) goto l534; goto l533;\n- l534:;\t G->pos= yypos534; G->thunkpos= yythunkpos534;\n- } goto l525;\n- l531:;\t G->pos= yypos525; G->thunkpos= yythunkpos525;\n- { int yypos535= G->pos, yythunkpos535= G->thunkpos; if (!yy_Sp(G)) { goto l535; } if (!yy_Ticks3(G)) { goto l535; } goto l522;\n- l535:;\t G->pos= yypos535; G->thunkpos= yythunkpos535;\n- }\n- { int yypos536= G->pos, yythunkpos536= G->thunkpos; if (!yy_Spacechar(G)) { goto l537; } goto l536;\n- l537:;\t G->pos= yypos536; G->thunkpos= yythunkpos536; if (!yy_Newline(G)) { goto l522; }\n- { int yypos538= G->pos, yythunkpos538= G->thunkpos; if (!yy_BlankLine(G)) { goto l538; } goto l522;\n- l538:;\t G->pos= yypos538; G->thunkpos= yythunkpos538;\n- }\n- }\n- l536:;\t\n- }\n- l525:;\t\n- l523:;\t\n- { int yypos524= G->pos, yythunkpos524= G->thunkpos;\n- { int yypos539= G->pos, yythunkpos539= G->thunkpos;\n- { int yypos543= G->pos, yythunkpos543= G->thunkpos; if (!yymatchChar(G, '`')) goto l543; goto l540;\n- l543:;\t G->pos= yypos543; G->thunkpos= yythunkpos543;\n- } if (!yy_Nonspacechar(G)) { goto l540; }\n- l541:;\t\n- { int yypos542= G->pos, yythunkpos542= G->thunkpos;\n- { int yypos544= G->pos, yythunkpos544= G->thunkpos; if (!yymatchChar(G, '`')) goto l544; goto l542;\n- l544:;\t G->pos= yypos544; G->thunkpos= yythunkpos544;\n- } if (!yy_Nonspacechar(G)) { goto l542; } goto l541;\n- l542:;\t G->pos= yypos542; G->thunkpos= yythunkpos542;\n- } goto l539;\n- l540:;\t G->pos= yypos539; G->thunkpos= yythunkpos539;\n- { int yypos546= G->pos, yythunkpos546= G->thunkpos; if (!yy_Ticks3(G)) { goto l546; } goto l545;\n- l546:;\t G->pos= yypos546; G->thunkpos= yythunkpos546;\n- } if (!yymatchChar(G, '`')) goto l545;\n- l547:;\t\n- { int yypos548= G->pos, yythunkpos548= G->thunkpos; if (!yymatchChar(G, '`')) goto l548; goto l547;\n- l548:;\t G->pos= yypos548; G->thunkpos= yythunkpos548;\n- } goto l539;\n- l545:;\t G->pos= yypos539; G->thunkpos= yythunkpos539;\n- { int yypos549= G->pos, yythunkpos549= G->thunkpos; if (!yy_Sp(G)) { goto l549; } if (!yy_Ticks3(G)) { goto l549; } goto l524;\n- l549:;\t G->pos= yypos549; G->thunkpos= yythunkpos549;\n- }\n- { int yypos550= G->pos, yythunkpos550= G->thunkpos; if (!yy_Spacechar(G)) { goto l551; } goto l550;\n- l551:;\t G->pos= yypos550; G->thunkpos= yythunkpos550; if (!yy_Newline(G)) { goto l524; }\n- { int yypos552= G->pos, yythunkpos552= G->thunkpos; if (!yy_BlankLine(G)) { goto l552; } goto l524;\n- l552:;\t G->pos= yypos552; G->thunkpos= yythunkpos552;\n- }\n- }\n- l550:;\t\n- }\n- l539:;\t goto l523;\n- l524:;\t G->pos= yypos524; G->thunkpos= yythunkpos524;\n- } if (!yy_Sp(G)) { goto l522; } if (!yy_Ticks3(G)) { goto l522; } goto l459;\n- l522:;\t G->pos= yypos459; G->thunkpos= yythunkpos459; if (!yy_Ticks4(G)) { goto l553; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l553; }\n- { int yypos556= G->pos, yythunkpos556= G->thunkpos;\n- { int yypos560= G->pos, yythunkpos560= G->thunkpos; if (!yymatchChar(G, '`')) goto l560; goto l557;\n+ } if (!yy_Sp(G)) { goto l526; } if (!yy_Ticks3(G)) { goto l526; } goto l463;\n+ l526:;\t G->pos= yypos463; G->thunkpos= yythunkpos463; if (!yy_Ticks4(G)) { goto l558; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l558; }\n+ { int yypos561= G->pos, yythunkpos561= G->thunkpos;\n+ { int yypos565= G->pos, yythunkpos565= G->thunkpos; if (!yymatchChar(G, '`')) goto l565; goto l562;\n+ l565:;\t G->pos= yypos565; G->thunkpos= yythunkpos565;\n+ } if (!yy_Nonspacechar(G)) { goto l562; }\n+ l563:;\t\n+ { int yypos564= G->pos, yythunkpos564= G->thunkpos;\n+ { int yypos566= G->pos, yythunkpos566= G->thunkpos; if (!yymatchChar(G, '`')) goto l566; goto l564;\n+ l566:;\t G->pos= yypos566; G->thunkpos= yythunkpos566;\n+ } if (!yy_Nonspacechar(G)) { goto l564; } goto l563;\n+ l564:;\t G->pos= yypos564; G->thunkpos= yythunkpos564;\n+ } goto l561;\n+ l562:;\t G->pos= yypos561; G->thunkpos= yythunkpos561;\n+ { int yypos568= G->pos, yythunkpos568= G->thunkpos; if (!yy_Ticks4(G)) { goto l568; } goto l567;\n+ l568:;\t G->pos= yypos568; G->thunkpos= yythunkpos568;\n+ } if (!yymatchChar(G, '`')) goto l567;\n+ l569:;\t\n+ { int yypos570= G->pos, yythunkpos570= G->thunkpos; if (!yymatchChar(G, '`')) goto l570; goto l569;\n+ l570:;\t G->pos= yypos570; G->thunkpos= yythunkpos570;\n+ } goto l561;\n+ l567:;\t G->pos= yypos561; G->thunkpos= yythunkpos561;\n+ { int yypos571= G->pos, yythunkpos571= G->thunkpos; if (!yy_Sp(G)) { goto l571; } if (!yy_Ticks4(G)) { goto l571; } goto l558;\n+ l571:;\t G->pos= yypos571; G->thunkpos= yythunkpos571;\n+ }\n+ { int yypos572= G->pos, yythunkpos572= G->thunkpos; if (!yy_Spacechar(G)) { goto l573; } goto l572;\n+ l573:;\t G->pos= yypos572; G->thunkpos= yythunkpos572; if (!yy_Newline(G)) { goto l558; }\n+ { int yypos574= G->pos, yythunkpos574= G->thunkpos; if (!yy_BlankLine(G)) { goto l574; } goto l558;\n+ l574:;\t G->pos= yypos574; G->thunkpos= yythunkpos574;\n+ }\n+ }\n+ l572:;\t\n+ }\n+ l561:;\t\n+ l559:;\t\n+ { int yypos560= G->pos, yythunkpos560= G->thunkpos;\n+ { int yypos575= G->pos, yythunkpos575= G->thunkpos;\n+ { int yypos579= G->pos, yythunkpos579= G->thunkpos; if (!yymatchChar(G, '`')) goto l579; goto l576;\n+ l579:;\t G->pos= yypos579; G->thunkpos= yythunkpos579;\n+ } if (!yy_Nonspacechar(G)) { goto l576; }\n+ l577:;\t\n+ { int yypos578= G->pos, yythunkpos578= G->thunkpos;\n+ { int yypos580= G->pos, yythunkpos580= G->thunkpos; if (!yymatchChar(G, '`')) goto l580; goto l578;\n+ l580:;\t G->pos= yypos580; G->thunkpos= yythunkpos580;\n+ } if (!yy_Nonspacechar(G)) { goto l578; } goto l577;\n+ l578:;\t G->pos= yypos578; G->thunkpos= yythunkpos578;\n+ } goto l575;\n+ l576:;\t G->pos= yypos575; G->thunkpos= yythunkpos575;\n+ { int yypos582= G->pos, yythunkpos582= G->thunkpos; if (!yy_Ticks4(G)) { goto l582; } goto l581;\n+ l582:;\t G->pos= yypos582; G->thunkpos= yythunkpos582;\n+ } if (!yymatchChar(G, '`')) goto l581;\n+ l583:;\t\n+ { int yypos584= G->pos, yythunkpos584= G->thunkpos; if (!yymatchChar(G, '`')) goto l584; goto l583;\n+ l584:;\t G->pos= yypos584; G->thunkpos= yythunkpos584;\n+ } goto l575;\n+ l581:;\t G->pos= yypos575; G->thunkpos= yythunkpos575;\n+ { int yypos585= G->pos, yythunkpos585= G->thunkpos; if (!yy_Sp(G)) { goto l585; } if (!yy_Ticks4(G)) { goto l585; } goto l560;\n+ l585:;\t G->pos= yypos585; G->thunkpos= yythunkpos585;\n+ }\n+ { int yypos586= G->pos, yythunkpos586= G->thunkpos; if (!yy_Spacechar(G)) { goto l587; } goto l586;\n+ l587:;\t G->pos= yypos586; G->thunkpos= yythunkpos586; if (!yy_Newline(G)) { goto l560; }\n+ { int yypos588= G->pos, yythunkpos588= G->thunkpos; if (!yy_BlankLine(G)) { goto l588; } goto l560;\n+ l588:;\t G->pos= yypos588; G->thunkpos= yythunkpos588;\n+ }\n+ }\n+ l586:;\t\n+ }\n+ l575:;\t goto l559;\n l560:;\t G->pos= yypos560; G->thunkpos= yythunkpos560;\n- } if (!yy_Nonspacechar(G)) { goto l557; }\n- l558:;\t\n- { int yypos559= G->pos, yythunkpos559= G->thunkpos;\n- { int yypos561= G->pos, yythunkpos561= G->thunkpos; if (!yymatchChar(G, '`')) goto l561; goto l559;\n- l561:;\t G->pos= yypos561; G->thunkpos= yythunkpos561;\n- } if (!yy_Nonspacechar(G)) { goto l559; } goto l558;\n- l559:;\t G->pos= yypos559; G->thunkpos= yythunkpos559;\n- } goto l556;\n- l557:;\t G->pos= yypos556; G->thunkpos= yythunkpos556;\n- { int yypos563= G->pos, yythunkpos563= G->thunkpos; if (!yy_Ticks4(G)) { goto l563; } goto l562;\n- l563:;\t G->pos= yypos563; G->thunkpos= yythunkpos563;\n- } if (!yymatchChar(G, '`')) goto l562;\n- l564:;\t\n- { int yypos565= G->pos, yythunkpos565= G->thunkpos; if (!yymatchChar(G, '`')) goto l565; goto l564;\n- l565:;\t G->pos= yypos565; G->thunkpos= yythunkpos565;\n- } goto l556;\n- l562:;\t G->pos= yypos556; G->thunkpos= yythunkpos556;\n- { int yypos566= G->pos, yythunkpos566= G->thunkpos; if (!yy_Sp(G)) { goto l566; } if (!yy_Ticks4(G)) { goto l566; } goto l553;\n- l566:;\t G->pos= yypos566; G->thunkpos= yythunkpos566;\n- }\n- { int yypos567= G->pos, yythunkpos567= G->thunkpos; if (!yy_Spacechar(G)) { goto l568; } goto l567;\n- l568:;\t G->pos= yypos567; G->thunkpos= yythunkpos567; if (!yy_Newline(G)) { goto l553; }\n- { int yypos569= G->pos, yythunkpos569= G->thunkpos; if (!yy_BlankLine(G)) { goto l569; } goto l553;\n- l569:;\t G->pos= yypos569; G->thunkpos= yythunkpos569;\n- }\n- }\n- l567:;\t\n- }\n- l556:;\t\n- l554:;\t\n- { int yypos555= G->pos, yythunkpos555= G->thunkpos;\n- { int yypos570= G->pos, yythunkpos570= G->thunkpos;\n- { int yypos574= G->pos, yythunkpos574= G->thunkpos; if (!yymatchChar(G, '`')) goto l574; goto l571;\n- l574:;\t G->pos= yypos574; G->thunkpos= yythunkpos574;\n- } if (!yy_Nonspacechar(G)) { goto l571; }\n- l572:;\t\n- { int yypos573= G->pos, yythunkpos573= G->thunkpos;\n- { int yypos575= G->pos, yythunkpos575= G->thunkpos; if (!yymatchChar(G, '`')) goto l575; goto l573;\n- l575:;\t G->pos= yypos575; G->thunkpos= yythunkpos575;\n- } if (!yy_Nonspacechar(G)) { goto l573; } goto l572;\n- l573:;\t G->pos= yypos573; G->thunkpos= yythunkpos573;\n- } goto l570;\n- l571:;\t G->pos= yypos570; G->thunkpos= yythunkpos570;\n- { int yypos577= G->pos, yythunkpos577= G->thunkpos; if (!yy_Ticks4(G)) { goto l577; } goto l576;\n- l577:;\t G->pos= yypos577; G->thunkpos= yythunkpos577;\n- } if (!yymatchChar(G, '`')) goto l576;\n- l578:;\t\n- { int yypos579= G->pos, yythunkpos579= G->thunkpos; if (!yymatchChar(G, '`')) goto l579; goto l578;\n- l579:;\t G->pos= yypos579; G->thunkpos= yythunkpos579;\n- } goto l570;\n- l576:;\t G->pos= yypos570; G->thunkpos= yythunkpos570;\n- { int yypos580= G->pos, yythunkpos580= G->thunkpos; if (!yy_Sp(G)) { goto l580; } if (!yy_Ticks4(G)) { goto l580; } goto l555;\n- l580:;\t G->pos= yypos580; G->thunkpos= yythunkpos580;\n- }\n- { int yypos581= G->pos, yythunkpos581= G->thunkpos; if (!yy_Spacechar(G)) { goto l582; } goto l581;\n- l582:;\t G->pos= yypos581; G->thunkpos= yythunkpos581; if (!yy_Newline(G)) { goto l555; }\n- { int yypos583= G->pos, yythunkpos583= G->thunkpos; if (!yy_BlankLine(G)) { goto l583; } goto l555;\n- l583:;\t G->pos= yypos583; G->thunkpos= yythunkpos583;\n- }\n- }\n- l581:;\t\n- }\n- l570:;\t goto l554;\n- l555:;\t G->pos= yypos555; G->thunkpos= yythunkpos555;\n- } if (!yy_Sp(G)) { goto l553; } if (!yy_Ticks4(G)) { goto l553; } goto l459;\n- l553:;\t G->pos= yypos459; G->thunkpos= yythunkpos459; if (!yy_Ticks5(G)) { goto l458; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l458; }\n- { int yypos586= G->pos, yythunkpos586= G->thunkpos;\n- { int yypos590= G->pos, yythunkpos590= G->thunkpos; if (!yymatchChar(G, '`')) goto l590; goto l587;\n+ } if (!yy_Sp(G)) { goto l558; } if (!yy_Ticks4(G)) { goto l558; } goto l463;\n+ l558:;\t G->pos= yypos463; G->thunkpos= yythunkpos463; if (!yy_Ticks5(G)) { goto l462; } yyDo(G, yySet, -1, 0); if (!yy_Sp(G)) { goto l462; }\n+ { int yypos591= G->pos, yythunkpos591= G->thunkpos;\n+ { int yypos595= G->pos, yythunkpos595= G->thunkpos; if (!yymatchChar(G, '`')) goto l595; goto l592;\n+ l595:;\t G->pos= yypos595; G->thunkpos= yythunkpos595;\n+ } if (!yy_Nonspacechar(G)) { goto l592; }\n+ l593:;\t\n+ { int yypos594= G->pos, yythunkpos594= G->thunkpos;\n+ { int yypos596= G->pos, yythunkpos596= G->thunkpos; if (!yymatchChar(G, '`')) goto l596; goto l594;\n+ l596:;\t G->pos= yypos596; G->thunkpos= yythunkpos596;\n+ } if (!yy_Nonspacechar(G)) { goto l594; } goto l593;\n+ l594:;\t G->pos= yypos594; G->thunkpos= yythunkpos594;\n+ } goto l591;\n+ l592:;\t G->pos= yypos591; G->thunkpos= yythunkpos591;\n+ { int yypos598= G->pos, yythunkpos598= G->thunkpos; if (!yy_Ticks5(G)) { goto l598; } goto l597;\n+ l598:;\t G->pos= yypos598; G->thunkpos= yythunkpos598;\n+ } if (!yymatchChar(G, '`')) goto l597;\n+ l599:;\t\n+ { int yypos600= G->pos, yythunkpos600= G->thunkpos; if (!yymatchChar(G, '`')) goto l600; goto l599;\n+ l600:;\t G->pos= yypos600; G->thunkpos= yythunkpos600;\n+ } goto l591;\n+ l597:;\t G->pos= yypos591; G->thunkpos= yythunkpos591;\n+ { int yypos601= G->pos, yythunkpos601= G->thunkpos; if (!yy_Sp(G)) { goto l601; } if (!yy_Ticks5(G)) { goto l601; } goto l462;\n+ l601:;\t G->pos= yypos601; G->thunkpos= yythunkpos601;\n+ }\n+ { int yypos602= G->pos, yythunkpos602= G->thunkpos; if (!yy_Spacechar(G)) { goto l603; } goto l602;\n+ l603:;\t G->pos= yypos602; G->thunkpos= yythunkpos602; if (!yy_Newline(G)) { goto l462; }\n+ { int yypos604= G->pos, yythunkpos604= G->thunkpos; if (!yy_BlankLine(G)) { goto l604; } goto l462;\n+ l604:;\t G->pos= yypos604; G->thunkpos= yythunkpos604;\n+ }\n+ }\n+ l602:;\t\n+ }\n+ l591:;\t\n+ l589:;\t\n+ { int yypos590= G->pos, yythunkpos590= G->thunkpos;\n+ { int yypos605= G->pos, yythunkpos605= G->thunkpos;\n+ { int yypos609= G->pos, yythunkpos609= G->thunkpos; if (!yymatchChar(G, '`')) goto l609; goto l606;\n+ l609:;\t G->pos= yypos609; G->thunkpos= yythunkpos609;\n+ } if (!yy_Nonspacechar(G)) { goto l606; }\n+ l607:;\t\n+ { int yypos608= G->pos, yythunkpos608= G->thunkpos;\n+ { int yypos610= G->pos, yythunkpos610= G->thunkpos; if (!yymatchChar(G, '`')) goto l610; goto l608;\n+ l610:;\t G->pos= yypos610; G->thunkpos= yythunkpos610;\n+ } if (!yy_Nonspacechar(G)) { goto l608; } goto l607;\n+ l608:;\t G->pos= yypos608; G->thunkpos= yythunkpos608;\n+ } goto l605;\n+ l606:;\t G->pos= yypos605; G->thunkpos= yythunkpos605;\n+ { int yypos612= G->pos, yythunkpos612= G->thunkpos; if (!yy_Ticks5(G)) { goto l612; } goto l611;\n+ l612:;\t G->pos= yypos612; G->thunkpos= yythunkpos612;\n+ } if (!yymatchChar(G, '`')) goto l611;\n+ l613:;\t\n+ { int yypos614= G->pos, yythunkpos614= G->thunkpos; if (!yymatchChar(G, '`')) goto l614; goto l613;\n+ l614:;\t G->pos= yypos614; G->thunkpos= yythunkpos614;\n+ } goto l605;\n+ l611:;\t G->pos= yypos605; G->thunkpos= yythunkpos605;\n+ { int yypos615= G->pos, yythunkpos615= G->thunkpos; if (!yy_Sp(G)) { goto l615; } if (!yy_Ticks5(G)) { goto l615; } goto l590;\n+ l615:;\t G->pos= yypos615; G->thunkpos= yythunkpos615;\n+ }\n+ { int yypos616= G->pos, yythunkpos616= G->thunkpos; if (!yy_Spacechar(G)) { goto l617; } goto l616;\n+ l617:;\t G->pos= yypos616; G->thunkpos= yythunkpos616; if (!yy_Newline(G)) { goto l590; }\n+ { int yypos618= G->pos, yythunkpos618= G->thunkpos; if (!yy_BlankLine(G)) { goto l618; } goto l590;\n+ l618:;\t G->pos= yypos618; G->thunkpos= yythunkpos618;\n+ }\n+ }\n+ l616:;\t\n+ }\n+ l605:;\t goto l589;\n l590:;\t G->pos= yypos590; G->thunkpos= yythunkpos590;\n- } if (!yy_Nonspacechar(G)) { goto l587; }\n- l588:;\t\n- { int yypos589= G->pos, yythunkpos589= G->thunkpos;\n- { int yypos591= G->pos, yythunkpos591= G->thunkpos; if (!yymatchChar(G, '`')) goto l591; goto l589;\n- l591:;\t G->pos= yypos591; G->thunkpos= yythunkpos591;\n- } if (!yy_Nonspacechar(G)) { goto l589; } goto l588;\n- l589:;\t G->pos= yypos589; G->thunkpos= yythunkpos589;\n- } goto l586;\n- l587:;\t G->pos= yypos586; G->thunkpos= yythunkpos586;\n- { int yypos593= G->pos, yythunkpos593= G->thunkpos; if (!yy_Ticks5(G)) { goto l593; } goto l592;\n- l593:;\t G->pos= yypos593; G->thunkpos= yythunkpos593;\n- } if (!yymatchChar(G, '`')) goto l592;\n- l594:;\t\n- { int yypos595= G->pos, yythunkpos595= G->thunkpos; if (!yymatchChar(G, '`')) goto l595; goto l594;\n- l595:;\t G->pos= yypos595; G->thunkpos= yythunkpos595;\n- } goto l586;\n- l592:;\t G->pos= yypos586; G->thunkpos= yythunkpos586;\n- { int yypos596= G->pos, yythunkpos596= G->thunkpos; if (!yy_Sp(G)) { goto l596; } if (!yy_Ticks5(G)) { goto l596; } goto l458;\n- l596:;\t G->pos= yypos596; G->thunkpos= yythunkpos596;\n- }\n- { int yypos597= G->pos, yythunkpos597= G->thunkpos; if (!yy_Spacechar(G)) { goto l598; } goto l597;\n- l598:;\t G->pos= yypos597; G->thunkpos= yythunkpos597; if (!yy_Newline(G)) { goto l458; }\n- { int yypos599= G->pos, yythunkpos599= G->thunkpos; if (!yy_BlankLine(G)) { goto l599; } goto l458;\n- l599:;\t G->pos= yypos599; G->thunkpos= yythunkpos599;\n- }\n- }\n- l597:;\t\n- }\n- l586:;\t\n- l584:;\t\n- { int yypos585= G->pos, yythunkpos585= G->thunkpos;\n- { int yypos600= G->pos, yythunkpos600= G->thunkpos;\n- { int yypos604= G->pos, yythunkpos604= G->thunkpos; if (!yymatchChar(G, '`')) goto l604; goto l601;\n- l604:;\t G->pos= yypos604; G->thunkpos= yythunkpos604;\n- } if (!yy_Nonspacechar(G)) { goto l601; }\n- l602:;\t\n- { int yypos603= G->pos, yythunkpos603= G->thunkpos;\n- { int yypos605= G->pos, yythunkpos605= G->thunkpos; if (!yymatchChar(G, '`')) goto l605; goto l603;\n- l605:;\t G->pos= yypos605; G->thunkpos= yythunkpos605;\n- } if (!yy_Nonspacechar(G)) { goto l603; } goto l602;\n- l603:;\t G->pos= yypos603; G->thunkpos= yythunkpos603;\n- } goto l600;\n- l601:;\t G->pos= yypos600; G->thunkpos= yythunkpos600;\n- { int yypos607= G->pos, yythunkpos607= G->thunkpos; if (!yy_Ticks5(G)) { goto l607; } goto l606;\n- l607:;\t G->pos= yypos607; G->thunkpos= yythunkpos607;\n- } if (!yymatchChar(G, '`')) goto l606;\n- l608:;\t\n- { int yypos609= G->pos, yythunkpos609= G->thunkpos; if (!yymatchChar(G, '`')) goto l609; goto l608;\n- l609:;\t G->pos= yypos609; G->thunkpos= yythunkpos609;\n- } goto l600;\n- l606:;\t G->pos= yypos600; G->thunkpos= yythunkpos600;\n- { int yypos610= G->pos, yythunkpos610= G->thunkpos; if (!yy_Sp(G)) { goto l610; } if (!yy_Ticks5(G)) { goto l610; } goto l585;\n- l610:;\t G->pos= yypos610; G->thunkpos= yythunkpos610;\n- }\n- { int yypos611= G->pos, yythunkpos611= G->thunkpos; if (!yy_Spacechar(G)) { goto l612; } goto l611;\n- l612:;\t G->pos= yypos611; G->thunkpos= yythunkpos611; if (!yy_Newline(G)) { goto l585; }\n- { int yypos613= G->pos, yythunkpos613= G->thunkpos; if (!yy_BlankLine(G)) { goto l613; } goto l585;\n- l613:;\t G->pos= yypos613; G->thunkpos= yythunkpos613;\n- }\n- }\n- l611:;\t\n- }\n- l600:;\t goto l584;\n- l585:;\t G->pos= yypos585; G->thunkpos= yythunkpos585;\n- } if (!yy_Sp(G)) { goto l458; } if (!yy_Ticks5(G)) { goto l458; }\n- }\n- l459:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l458; yyDo(G, yy_1_Code, G->begin, G->end);\n+ } if (!yy_Sp(G)) { goto l462; } if (!yy_Ticks5(G)) { goto l462; }\n+ }\n+ l463:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l462; yyDo(G, yy_1_Code, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Code\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l458:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l462:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Code\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_InlineNote(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"InlineNote\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l614; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l614; if (!yy_LocMarker(G)) { goto l614; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"^[\")) goto l614;\n- { int yypos617= G->pos, yythunkpos617= G->thunkpos; if (!yymatchChar(G, ']')) goto l617; goto l614;\n- l617:;\t G->pos= yypos617; G->thunkpos= yythunkpos617;\n- } if (!yy_Inline(G)) { goto l614; }\n- l615:;\t\n- { int yypos616= G->pos, yythunkpos616= G->thunkpos;\n- { int yypos618= G->pos, yythunkpos618= G->thunkpos; if (!yymatchChar(G, ']')) goto l618; goto l616;\n- l618:;\t G->pos= yypos618; G->thunkpos= yythunkpos618;\n- } if (!yy_Inline(G)) { goto l616; } goto l615;\n- l616:;\t G->pos= yypos616; G->thunkpos= yythunkpos616;\n- } if (!yymatchChar(G, ']')) goto l614; yyText(G, G->begin, G->end); if (!(YY_END)) goto l614; yyDo(G, yy_1_InlineNote, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"InlineNote\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l619; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l619; if (!yy_LocMarker(G)) { goto l619; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"^[\")) goto l619;\n+ { int yypos622= G->pos, yythunkpos622= G->thunkpos; if (!yymatchChar(G, ']')) goto l622; goto l619;\n+ l622:;\t G->pos= yypos622; G->thunkpos= yythunkpos622;\n+ } if (!yy_Inline(G)) { goto l619; }\n+ l620:;\t\n+ { int yypos621= G->pos, yythunkpos621= G->thunkpos;\n+ { int yypos623= G->pos, yythunkpos623= G->thunkpos; if (!yymatchChar(G, ']')) goto l623; goto l621;\n+ l623:;\t G->pos= yypos623; G->thunkpos= yythunkpos623;\n+ } if (!yy_Inline(G)) { goto l621; } goto l620;\n+ l621:;\t G->pos= yypos621; G->thunkpos= yythunkpos621;\n+ } if (!yymatchChar(G, ']')) goto l619; yyText(G, G->begin, G->end); if (!(YY_END)) goto l619; yyDo(G, yy_1_InlineNote, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"InlineNote\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l614:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l619:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"InlineNote\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_NoteReference(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"NoteReference\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l619; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l619; if (!yy_RawNoteReference(G)) { goto l619; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l619; yyDo(G, yy_1_NoteReference, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"NoteReference\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l624; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l624; if (!yy_RawNoteReference(G)) { goto l624; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l624; yyDo(G, yy_1_NoteReference, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"NoteReference\", G->buf+G->pos));\n return 1;\n- l619:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l624:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"NoteReference\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Link(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Link\"));\n- { int yypos621= G->pos, yythunkpos621= G->thunkpos; if (!yy_ExplicitLink(G)) { goto l622; } goto l621;\n- l622:;\t G->pos= yypos621; G->thunkpos= yythunkpos621; if (!yy_ReferenceLink(G)) { goto l623; } goto l621;\n- l623:;\t G->pos= yypos621; G->thunkpos= yythunkpos621; if (!yy_AutoLink(G)) { goto l620; }\n- }\n- l621:;\t yyDo(G, yy_1_Link, G->begin, G->end);\n+ { int yypos626= G->pos, yythunkpos626= G->thunkpos; if (!yy_ExplicitLink(G)) { goto l627; } goto l626;\n+ l627:;\t G->pos= yypos626; G->thunkpos= yythunkpos626; if (!yy_ReferenceLink(G)) { goto l628; } goto l626;\n+ l628:;\t G->pos= yypos626; G->thunkpos= yythunkpos626; if (!yy_AutoLink(G)) { goto l625; }\n+ }\n+ l626:;\t yyDo(G, yy_1_Link, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Link\", G->buf+G->pos));\n return 1;\n- l620:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l625:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Link\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Image(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Image\")); if (!yymatchChar(G, '!')) goto l624;\n- { int yypos625= G->pos, yythunkpos625= G->thunkpos; if (!yy_ExplicitLink(G)) { goto l626; } goto l625;\n- l626:;\t G->pos= yypos625; G->thunkpos= yythunkpos625; if (!yy_ExplicitLinkSize(G)) { goto l627; } goto l625;\n- l627:;\t G->pos= yypos625; G->thunkpos= yythunkpos625; if (!yy_ReferenceLink(G)) { goto l624; }\n- }\n- l625:;\t yyDo(G, yy_1_Image, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Image\")); if (!yymatchChar(G, '!')) goto l629;\n+ { int yypos630= G->pos, yythunkpos630= G->thunkpos; if (!yy_ExplicitLink(G)) { goto l631; } goto l630;\n+ l631:;\t G->pos= yypos630; G->thunkpos= yythunkpos630; if (!yy_ExplicitLinkSize(G)) { goto l632; } goto l630;\n+ l632:;\t G->pos= yypos630; G->thunkpos= yythunkpos630; if (!yy_ReferenceLink(G)) { goto l629; }\n+ }\n+ l630:;\t yyDo(G, yy_1_Image, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Image\", G->buf+G->pos));\n return 1;\n- l624:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l629:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Image\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Strike(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Strike\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_STRIKE) )) goto l628; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l628; if (!yy_LocMarker(G)) { goto l628; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"~~\")) goto l628;\n- { int yypos629= G->pos, yythunkpos629= G->thunkpos; if (!yy_Whitespace(G)) { goto l629; } goto l628;\n- l629:;\t G->pos= yypos629; G->thunkpos= yythunkpos629;\n- }\n- { int yypos632= G->pos, yythunkpos632= G->thunkpos; if (!yymatchString(G, \"~~\")) goto l632; goto l628;\n- l632:;\t G->pos= yypos632; G->thunkpos= yythunkpos632;\n- } if (!yy_Inline(G)) { goto l628; }\n- l630:;\t\n- { int yypos631= G->pos, yythunkpos631= G->thunkpos;\n- { int yypos633= G->pos, yythunkpos633= G->thunkpos; if (!yymatchString(G, \"~~\")) goto l633; goto l631;\n- l633:;\t G->pos= yypos633; G->thunkpos= yythunkpos633;\n- } if (!yy_Inline(G)) { goto l631; } goto l630;\n- l631:;\t G->pos= yypos631; G->thunkpos= yythunkpos631;\n- } yyText(G, G->begin, G->end); if (!( STRIKE_POST )) goto l628; if (!yymatchString(G, \"~~\")) goto l628; yyText(G, G->begin, G->end); if (!(YY_END)) goto l628; yyDo(G, yy_1_Strike, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Strike\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_STRIKE) )) goto l633; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l633; if (!yy_LocMarker(G)) { goto l633; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"~~\")) goto l633;\n+ { int yypos634= G->pos, yythunkpos634= G->thunkpos; if (!yy_Whitespace(G)) { goto l634; } goto l633;\n+ l634:;\t G->pos= yypos634; G->thunkpos= yythunkpos634;\n+ }\n+ { int yypos637= G->pos, yythunkpos637= G->thunkpos; if (!yymatchString(G, \"~~\")) goto l637; goto l633;\n+ l637:;\t G->pos= yypos637; G->thunkpos= yythunkpos637;\n+ } if (!yy_Inline(G)) { goto l633; }\n+ l635:;\t\n+ { int yypos636= G->pos, yythunkpos636= G->thunkpos;\n+ { int yypos638= G->pos, yythunkpos638= G->thunkpos; if (!yymatchString(G, \"~~\")) goto l638; goto l636;\n+ l638:;\t G->pos= yypos638; G->thunkpos= yythunkpos638;\n+ } if (!yy_Inline(G)) { goto l636; } goto l635;\n+ l636:;\t G->pos= yypos636; G->thunkpos= yythunkpos636;\n+ } yyText(G, G->begin, G->end); if (!( STRIKE_POST )) goto l633; if (!yymatchString(G, \"~~\")) goto l633; yyText(G, G->begin, G->end); if (!(YY_END)) goto l633; yyDo(G, yy_1_Strike, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Strike\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l628:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l633:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Strike\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Emph(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Emph\"));\n- { int yypos635= G->pos, yythunkpos635= G->thunkpos; if (!yy_EmphStar(G)) { goto l636; } goto l635;\n- l636:;\t G->pos= yypos635; G->thunkpos= yythunkpos635; if (!yy_EmphUl(G)) { goto l634; }\n- }\n- l635:;\t\n+ { int yypos640= G->pos, yythunkpos640= G->thunkpos; if (!yy_EmphStar(G)) { goto l641; } goto l640;\n+ l641:;\t G->pos= yypos640; G->thunkpos= yythunkpos640; if (!yy_EmphUl(G)) { goto l639; }\n+ }\n+ l640:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Emph\", G->buf+G->pos));\n return 1;\n- l634:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l639:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Emph\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Strong(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Strong\"));\n- { int yypos638= G->pos, yythunkpos638= G->thunkpos; if (!yy_StrongStar(G)) { goto l639; } goto l638;\n- l639:;\t G->pos= yypos638; G->thunkpos= yythunkpos638; if (!yy_StrongUl(G)) { goto l637; }\n- }\n- l638:;\t\n+ { int yypos643= G->pos, yythunkpos643= G->thunkpos; if (!yy_StrongStar(G)) { goto l644; } goto l643;\n+ l644:;\t G->pos= yypos643; G->thunkpos= yythunkpos643; if (!yy_StrongUl(G)) { goto l642; }\n+ }\n+ l643:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Strong\", G->buf+G->pos));\n return 1;\n- l637:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l642:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Strong\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_UlOrStarLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"UlOrStarLine\"));\n- { int yypos641= G->pos, yythunkpos641= G->thunkpos; if (!yy_UlLine(G)) { goto l642; } goto l641;\n- l642:;\t G->pos= yypos641; G->thunkpos= yythunkpos641; if (!yy_StarLine(G)) { goto l640; }\n- }\n- l641:;\t\n+ { int yypos646= G->pos, yythunkpos646= G->thunkpos; if (!yy_UlLine(G)) { goto l647; } goto l646;\n+ l647:;\t G->pos= yypos646; G->thunkpos= yythunkpos646; if (!yy_StarLine(G)) { goto l645; }\n+ }\n+ l646:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"UlOrStarLine\", G->buf+G->pos));\n return 1;\n- l640:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l645:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"UlOrStarLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Str(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Str\")); if (!yy_NormalChar(G)) { goto l643; }\n- l644:;\t\n- { int yypos645= G->pos, yythunkpos645= G->thunkpos;\n- { int yypos646= G->pos, yythunkpos646= G->thunkpos; if (!yy_NormalChar(G)) { goto l647; } goto l646;\n- l647:;\t G->pos= yypos646; G->thunkpos= yythunkpos646; if (!yymatchChar(G, '_')) goto l645;\n- l648:;\t\n- { int yypos649= G->pos, yythunkpos649= G->thunkpos; if (!yymatchChar(G, '_')) goto l649; goto l648;\n- l649:;\t G->pos= yypos649; G->thunkpos= yythunkpos649;\n- }\n- { int yypos650= G->pos, yythunkpos650= G->thunkpos; if (!yy_Alphanumeric(G)) { goto l645; } G->pos= yypos650; G->thunkpos= yythunkpos650;\n- }\n- }\n- l646:;\t goto l644;\n- l645:;\t G->pos= yypos645; G->thunkpos= yythunkpos645;\n+ yyprintf((stderr, \"%s\\n\", \"Str\")); if (!yy_NormalChar(G)) { goto l648; }\n+ l649:;\t\n+ { int yypos650= G->pos, yythunkpos650= G->thunkpos;\n+ { int yypos651= G->pos, yythunkpos651= G->thunkpos; if (!yy_NormalChar(G)) { goto l652; } goto l651;\n+ l652:;\t G->pos= yypos651; G->thunkpos= yythunkpos651; if (!yymatchChar(G, '_')) goto l650;\n+ l653:;\t\n+ { int yypos654= G->pos, yythunkpos654= G->thunkpos; if (!yymatchChar(G, '_')) goto l654; goto l653;\n+ l654:;\t G->pos= yypos654; G->thunkpos= yythunkpos654;\n+ }\n+ { int yypos655= G->pos, yythunkpos655= G->thunkpos; if (!yy_Alphanumeric(G)) { goto l650; } G->pos= yypos655; G->thunkpos= yythunkpos655;\n+ }\n+ }\n+ l651:;\t goto l649;\n+ l650:;\t G->pos= yypos650; G->thunkpos= yythunkpos650;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Str\", G->buf+G->pos));\n return 1;\n- l643:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l648:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Str\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_InStyleTags(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"InStyleTags\")); if (!yy_StyleOpen(G)) { goto l651; }\n- l652:;\t\n- { int yypos653= G->pos, yythunkpos653= G->thunkpos;\n- { int yypos654= G->pos, yythunkpos654= G->thunkpos; if (!yy_StyleClose(G)) { goto l654; } goto l653;\n- l654:;\t G->pos= yypos654; G->thunkpos= yythunkpos654;\n- } if (!yymatchDot(G)) goto l653; goto l652;\n- l653:;\t G->pos= yypos653; G->thunkpos= yythunkpos653;\n- } if (!yy_StyleClose(G)) { goto l651; }\n+ yyprintf((stderr, \"%s\\n\", \"InStyleTags\")); if (!yy_StyleOpen(G)) { goto l656; }\n+ l657:;\t\n+ { int yypos658= G->pos, yythunkpos658= G->thunkpos;\n+ { int yypos659= G->pos, yythunkpos659= G->thunkpos; if (!yy_StyleClose(G)) { goto l659; } goto l658;\n+ l659:;\t G->pos= yypos659; G->thunkpos= yythunkpos659;\n+ } if (!yymatchDot(G)) goto l658; goto l657;\n+ l658:;\t G->pos= yypos658; G->thunkpos= yythunkpos658;\n+ } if (!yy_StyleClose(G)) { goto l656; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"InStyleTags\", G->buf+G->pos));\n return 1;\n- l651:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l656:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"InStyleTags\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StyleClose(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"StyleClose\")); if (!yymatchChar(G, '<')) goto l655; if (!yy_Spnl(G)) { goto l655; } if (!yymatchChar(G, '\/')) goto l655;\n- { int yypos656= G->pos, yythunkpos656= G->thunkpos; if (!yymatchString(G, \"style\")) goto l657; goto l656;\n- l657:;\t G->pos= yypos656; G->thunkpos= yythunkpos656; if (!yymatchString(G, \"STYLE\")) goto l655;\n- }\n- l656:;\t if (!yy_Spnl(G)) { goto l655; } if (!yymatchChar(G, '>')) goto l655;\n+ yyprintf((stderr, \"%s\\n\", \"StyleClose\")); if (!yymatchChar(G, '<')) goto l660; if (!yy_Spnl(G)) { goto l660; } if (!yymatchChar(G, '\/')) goto l660;\n+ { int yypos661= G->pos, yythunkpos661= G->thunkpos; if (!yymatchString(G, \"style\")) goto l662; goto l661;\n+ l662:;\t G->pos= yypos661; G->thunkpos= yythunkpos661; if (!yymatchString(G, \"STYLE\")) goto l660;\n+ }\n+ l661:;\t if (!yy_Spnl(G)) { goto l660; } if (!yymatchChar(G, '>')) goto l660;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StyleClose\", G->buf+G->pos));\n return 1;\n- l655:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l660:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StyleClose\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StyleOpen(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"StyleOpen\")); if (!yymatchChar(G, '<')) goto l658; if (!yy_Spnl(G)) { goto l658; }\n- { int yypos659= G->pos, yythunkpos659= G->thunkpos; if (!yymatchString(G, \"style\")) goto l660; goto l659;\n- l660:;\t G->pos= yypos659; G->thunkpos= yythunkpos659; if (!yymatchString(G, \"STYLE\")) goto l658;\n- }\n- l659:;\t if (!yy_Spnl(G)) { goto l658; }\n- l661:;\t\n- { int yypos662= G->pos, yythunkpos662= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l662; } goto l661;\n- l662:;\t G->pos= yypos662; G->thunkpos= yythunkpos662;\n- } if (!yymatchChar(G, '>')) goto l658;\n+ yyprintf((stderr, \"%s\\n\", \"StyleOpen\")); if (!yymatchChar(G, '<')) goto l663; if (!yy_Spnl(G)) { goto l663; }\n+ { int yypos664= G->pos, yythunkpos664= G->thunkpos; if (!yymatchString(G, \"style\")) goto l665; goto l664;\n+ l665:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"STYLE\")) goto l663;\n+ }\n+ l664:;\t if (!yy_Spnl(G)) { goto l663; }\n+ l666:;\t\n+ { int yypos667= G->pos, yythunkpos667= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l667; } goto l666;\n+ l667:;\t G->pos= yypos667; G->thunkpos= yythunkpos667;\n+ } if (!yymatchChar(G, '>')) goto l663;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StyleOpen\", G->buf+G->pos));\n return 1;\n- l658:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l663:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StyleOpen\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockType(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"HtmlBlockType\"));\n- { int yypos664= G->pos, yythunkpos664= G->thunkpos; if (!yymatchString(G, \"address\")) goto l665; goto l664;\n- l665:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"blockquote\")) goto l666; goto l664;\n- l666:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"center\")) goto l667; goto l664;\n- l667:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"dir\")) goto l668; goto l664;\n- l668:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"div\")) goto l669; goto l664;\n- l669:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"dl\")) goto l670; goto l664;\n- l670:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"fieldset\")) goto l671; goto l664;\n- l671:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"form\")) goto l672; goto l664;\n- l672:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h1\")) goto l673; goto l664;\n- l673:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h2\")) goto l674; goto l664;\n- l674:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h3\")) goto l675; goto l664;\n- l675:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h4\")) goto l676; goto l664;\n- l676:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h5\")) goto l677; goto l664;\n- l677:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"h6\")) goto l678; goto l664;\n- l678:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"hr\")) goto l679; goto l664;\n- l679:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"isindex\")) goto l680; goto l664;\n- l680:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"menu\")) goto l681; goto l664;\n- l681:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"noframes\")) goto l682; goto l664;\n- l682:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"noscript\")) goto l683; goto l664;\n- l683:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"ol\")) goto l684; goto l664;\n- l684:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchChar(G, 'p')) goto l685; goto l664;\n- l685:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"pre\")) goto l686; goto l664;\n- l686:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"table\")) goto l687; goto l664;\n- l687:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"ul\")) goto l688; goto l664;\n- l688:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"dd\")) goto l689; goto l664;\n- l689:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"dt\")) goto l690; goto l664;\n- l690:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"frameset\")) goto l691; goto l664;\n- l691:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"li\")) goto l692; goto l664;\n- l692:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"tbody\")) goto l693; goto l664;\n- l693:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"td\")) goto l694; goto l664;\n- l694:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"tfoot\")) goto l695; goto l664;\n- l695:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"th\")) goto l696; goto l664;\n- l696:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"thead\")) goto l697; goto l664;\n- l697:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"tr\")) goto l698; goto l664;\n- l698:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"script\")) goto l699; goto l664;\n- l699:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"ADDRESS\")) goto l700; goto l664;\n- l700:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l701; goto l664;\n- l701:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"CENTER\")) goto l702; goto l664;\n- l702:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"DIR\")) goto l703; goto l664;\n- l703:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"DIV\")) goto l704; goto l664;\n- l704:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"DL\")) goto l705; goto l664;\n- l705:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"FIELDSET\")) goto l706; goto l664;\n- l706:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"FORM\")) goto l707; goto l664;\n- l707:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H1\")) goto l708; goto l664;\n- l708:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H2\")) goto l709; goto l664;\n- l709:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H3\")) goto l710; goto l664;\n- l710:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H4\")) goto l711; goto l664;\n- l711:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H5\")) goto l712; goto l664;\n- l712:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"H6\")) goto l713; goto l664;\n- l713:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"HR\")) goto l714; goto l664;\n- l714:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"ISINDEX\")) goto l715; goto l664;\n- l715:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"MENU\")) goto l716; goto l664;\n- l716:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"NOFRAMES\")) goto l717; goto l664;\n- l717:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"NOSCRIPT\")) goto l718; goto l664;\n- l718:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"OL\")) goto l719; goto l664;\n- l719:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchChar(G, 'P')) goto l720; goto l664;\n- l720:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"PRE\")) goto l721; goto l664;\n- l721:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TABLE\")) goto l722; goto l664;\n- l722:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"UL\")) goto l723; goto l664;\n- l723:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"DD\")) goto l724; goto l664;\n- l724:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"DT\")) goto l725; goto l664;\n- l725:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"FRAMESET\")) goto l726; goto l664;\n- l726:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"LI\")) goto l727; goto l664;\n- l727:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TBODY\")) goto l728; goto l664;\n- l728:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TD\")) goto l729; goto l664;\n- l729:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TFOOT\")) goto l730; goto l664;\n- l730:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TH\")) goto l731; goto l664;\n- l731:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"THEAD\")) goto l732; goto l664;\n- l732:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"TR\")) goto l733; goto l664;\n- l733:;\t G->pos= yypos664; G->thunkpos= yythunkpos664; if (!yymatchString(G, \"SCRIPT\")) goto l663;\n- }\n- l664:;\t\n+ { int yypos669= G->pos, yythunkpos669= G->thunkpos; if (!yymatchString(G, \"address\")) goto l670; goto l669;\n+ l670:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"blockquote\")) goto l671; goto l669;\n+ l671:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"center\")) goto l672; goto l669;\n+ l672:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"dir\")) goto l673; goto l669;\n+ l673:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"div\")) goto l674; goto l669;\n+ l674:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"dl\")) goto l675; goto l669;\n+ l675:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"fieldset\")) goto l676; goto l669;\n+ l676:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"form\")) goto l677; goto l669;\n+ l677:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h1\")) goto l678; goto l669;\n+ l678:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h2\")) goto l679; goto l669;\n+ l679:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h3\")) goto l680; goto l669;\n+ l680:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h4\")) goto l681; goto l669;\n+ l681:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h5\")) goto l682; goto l669;\n+ l682:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"h6\")) goto l683; goto l669;\n+ l683:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"hr\")) goto l684; goto l669;\n+ l684:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"isindex\")) goto l685; goto l669;\n+ l685:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"menu\")) goto l686; goto l669;\n+ l686:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"noframes\")) goto l687; goto l669;\n+ l687:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"noscript\")) goto l688; goto l669;\n+ l688:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"ol\")) goto l689; goto l669;\n+ l689:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchChar(G, 'p')) goto l690; goto l669;\n+ l690:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"pre\")) goto l691; goto l669;\n+ l691:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"table\")) goto l692; goto l669;\n+ l692:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"ul\")) goto l693; goto l669;\n+ l693:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"dd\")) goto l694; goto l669;\n+ l694:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"dt\")) goto l695; goto l669;\n+ l695:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"frameset\")) goto l696; goto l669;\n+ l696:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"li\")) goto l697; goto l669;\n+ l697:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"tbody\")) goto l698; goto l669;\n+ l698:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"td\")) goto l699; goto l669;\n+ l699:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"tfoot\")) goto l700; goto l669;\n+ l700:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"th\")) goto l701; goto l669;\n+ l701:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"thead\")) goto l702; goto l669;\n+ l702:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"tr\")) goto l703; goto l669;\n+ l703:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"script\")) goto l704; goto l669;\n+ l704:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"ADDRESS\")) goto l705; goto l669;\n+ l705:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l706; goto l669;\n+ l706:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"CENTER\")) goto l707; goto l669;\n+ l707:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"DIR\")) goto l708; goto l669;\n+ l708:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"DIV\")) goto l709; goto l669;\n+ l709:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"DL\")) goto l710; goto l669;\n+ l710:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"FIELDSET\")) goto l711; goto l669;\n+ l711:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"FORM\")) goto l712; goto l669;\n+ l712:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H1\")) goto l713; goto l669;\n+ l713:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H2\")) goto l714; goto l669;\n+ l714:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H3\")) goto l715; goto l669;\n+ l715:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H4\")) goto l716; goto l669;\n+ l716:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H5\")) goto l717; goto l669;\n+ l717:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"H6\")) goto l718; goto l669;\n+ l718:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"HR\")) goto l719; goto l669;\n+ l719:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"ISINDEX\")) goto l720; goto l669;\n+ l720:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"MENU\")) goto l721; goto l669;\n+ l721:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"NOFRAMES\")) goto l722; goto l669;\n+ l722:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"NOSCRIPT\")) goto l723; goto l669;\n+ l723:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"OL\")) goto l724; goto l669;\n+ l724:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchChar(G, 'P')) goto l725; goto l669;\n+ l725:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"PRE\")) goto l726; goto l669;\n+ l726:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TABLE\")) goto l727; goto l669;\n+ l727:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"UL\")) goto l728; goto l669;\n+ l728:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"DD\")) goto l729; goto l669;\n+ l729:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"DT\")) goto l730; goto l669;\n+ l730:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"FRAMESET\")) goto l731; goto l669;\n+ l731:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"LI\")) goto l732; goto l669;\n+ l732:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TBODY\")) goto l733; goto l669;\n+ l733:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TD\")) goto l734; goto l669;\n+ l734:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TFOOT\")) goto l735; goto l669;\n+ l735:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TH\")) goto l736; goto l669;\n+ l736:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"THEAD\")) goto l737; goto l669;\n+ l737:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"TR\")) goto l738; goto l669;\n+ l738:;\t G->pos= yypos669; G->thunkpos= yythunkpos669; if (!yymatchString(G, \"SCRIPT\")) goto l668;\n+ }\n+ l669:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockType\", G->buf+G->pos));\n return 1;\n- l663:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l668:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockType\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockSelfClosing(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockSelfClosing\")); if (!yymatchChar(G, '<')) goto l734; if (!yy_Spnl(G)) { goto l734; } if (!yy_HtmlBlockType(G)) { goto l734; } if (!yy_Spnl(G)) { goto l734; }\n- l735:;\t\n- { int yypos736= G->pos, yythunkpos736= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l736; } goto l735;\n- l736:;\t G->pos= yypos736; G->thunkpos= yythunkpos736;\n- } if (!yymatchChar(G, '\/')) goto l734; if (!yy_Spnl(G)) { goto l734; } if (!yymatchChar(G, '>')) goto l734;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockSelfClosing\")); if (!yymatchChar(G, '<')) goto l739; if (!yy_Spnl(G)) { goto l739; } if (!yy_HtmlBlockType(G)) { goto l739; } if (!yy_Spnl(G)) { goto l739; }\n+ l740:;\t\n+ { int yypos741= G->pos, yythunkpos741= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l741; } goto l740;\n+ l741:;\t G->pos= yypos741; G->thunkpos= yythunkpos741;\n+ } if (!yymatchChar(G, '\/')) goto l739; if (!yy_Spnl(G)) { goto l739; } if (!yymatchChar(G, '>')) goto l739;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockSelfClosing\", G->buf+G->pos));\n return 1;\n- l734:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l739:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockSelfClosing\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlComment(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlComment\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l737; if (!yy_LocMarker(G)) { goto l737; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"<!--\")) goto l737;\n- l738:;\t\n- { int yypos739= G->pos, yythunkpos739= G->thunkpos;\n- { int yypos740= G->pos, yythunkpos740= G->thunkpos; if (!yymatchString(G, \"-->\")) goto l740; goto l739;\n- l740:;\t G->pos= yypos740; G->thunkpos= yythunkpos740;\n- } if (!yymatchDot(G)) goto l739; goto l738;\n- l739:;\t G->pos= yypos739; G->thunkpos= yythunkpos739;\n- } if (!yymatchString(G, \"-->\")) goto l737; yyText(G, G->begin, G->end); if (!(YY_END)) goto l737; yyDo(G, yy_1_HtmlComment, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlComment\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l742; if (!yy_LocMarker(G)) { goto l742; } yyDo(G, yySet, -1, 0); if (!yymatchString(G, \"<!--\")) goto l742;\n+ l743:;\t\n+ { int yypos744= G->pos, yythunkpos744= G->thunkpos;\n+ { int yypos745= G->pos, yythunkpos745= G->thunkpos; if (!yymatchString(G, \"-->\")) goto l745; goto l744;\n+ l745:;\t G->pos= yypos745; G->thunkpos= yythunkpos745;\n+ } if (!yymatchDot(G)) goto l744; goto l743;\n+ l744:;\t G->pos= yypos744; G->thunkpos= yythunkpos744;\n+ } if (!yymatchString(G, \"-->\")) goto l742; yyText(G, G->begin, G->end); if (!(YY_END)) goto l742; yyDo(G, yy_1_HtmlComment, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlComment\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l737:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l742:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlComment\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockInTags(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"HtmlBlockInTags\"));\n- { int yypos742= G->pos, yythunkpos742= G->thunkpos; if (!yy_HtmlBlockAddress(G)) { goto l743; } goto l742;\n- l743:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockBlockquote(G)) { goto l744; } goto l742;\n- l744:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockCenter(G)) { goto l745; } goto l742;\n- l745:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockDir(G)) { goto l746; } goto l742;\n- l746:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockDiv(G)) { goto l747; } goto l742;\n- l747:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockDl(G)) { goto l748; } goto l742;\n- l748:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockFieldset(G)) { goto l749; } goto l742;\n- l749:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockForm(G)) { goto l750; } goto l742;\n- l750:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH1(G)) { goto l751; } goto l742;\n- l751:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH2(G)) { goto l752; } goto l742;\n- l752:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH3(G)) { goto l753; } goto l742;\n- l753:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH4(G)) { goto l754; } goto l742;\n- l754:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH5(G)) { goto l755; } goto l742;\n- l755:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockH6(G)) { goto l756; } goto l742;\n- l756:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockMenu(G)) { goto l757; } goto l742;\n- l757:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockNoframes(G)) { goto l758; } goto l742;\n- l758:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockNoscript(G)) { goto l759; } goto l742;\n- l759:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockOl(G)) { goto l760; } goto l742;\n- l760:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockP(G)) { goto l761; } goto l742;\n- l761:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockPre(G)) { goto l762; } goto l742;\n- l762:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTable(G)) { goto l763; } goto l742;\n- l763:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockUl(G)) { goto l764; } goto l742;\n- l764:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockDd(G)) { goto l765; } goto l742;\n- l765:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockDt(G)) { goto l766; } goto l742;\n- l766:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockFrameset(G)) { goto l767; } goto l742;\n- l767:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockLi(G)) { goto l768; } goto l742;\n- l768:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTbody(G)) { goto l769; } goto l742;\n- l769:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTd(G)) { goto l770; } goto l742;\n- l770:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTfoot(G)) { goto l771; } goto l742;\n- l771:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTh(G)) { goto l772; } goto l742;\n- l772:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockThead(G)) { goto l773; } goto l742;\n- l773:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockTr(G)) { goto l774; } goto l742;\n- l774:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockScript(G)) { goto l775; } goto l742;\n- l775:;\t G->pos= yypos742; G->thunkpos= yythunkpos742; if (!yy_HtmlBlockHead(G)) { goto l741; }\n- }\n- l742:;\t\n+ { int yypos747= G->pos, yythunkpos747= G->thunkpos; if (!yy_HtmlBlockAddress(G)) { goto l748; } goto l747;\n+ l748:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockBlockquote(G)) { goto l749; } goto l747;\n+ l749:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockCenter(G)) { goto l750; } goto l747;\n+ l750:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockDir(G)) { goto l751; } goto l747;\n+ l751:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockDiv(G)) { goto l752; } goto l747;\n+ l752:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockDl(G)) { goto l753; } goto l747;\n+ l753:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockFieldset(G)) { goto l754; } goto l747;\n+ l754:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockForm(G)) { goto l755; } goto l747;\n+ l755:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH1(G)) { goto l756; } goto l747;\n+ l756:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH2(G)) { goto l757; } goto l747;\n+ l757:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH3(G)) { goto l758; } goto l747;\n+ l758:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH4(G)) { goto l759; } goto l747;\n+ l759:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH5(G)) { goto l760; } goto l747;\n+ l760:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockH6(G)) { goto l761; } goto l747;\n+ l761:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockMenu(G)) { goto l762; } goto l747;\n+ l762:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockNoframes(G)) { goto l763; } goto l747;\n+ l763:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockNoscript(G)) { goto l764; } goto l747;\n+ l764:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockOl(G)) { goto l765; } goto l747;\n+ l765:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockP(G)) { goto l766; } goto l747;\n+ l766:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockPre(G)) { goto l767; } goto l747;\n+ l767:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTable(G)) { goto l768; } goto l747;\n+ l768:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockUl(G)) { goto l769; } goto l747;\n+ l769:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockDd(G)) { goto l770; } goto l747;\n+ l770:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockDt(G)) { goto l771; } goto l747;\n+ l771:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockFrameset(G)) { goto l772; } goto l747;\n+ l772:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockLi(G)) { goto l773; } goto l747;\n+ l773:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTbody(G)) { goto l774; } goto l747;\n+ l774:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTd(G)) { goto l775; } goto l747;\n+ l775:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTfoot(G)) { goto l776; } goto l747;\n+ l776:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTh(G)) { goto l777; } goto l747;\n+ l777:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockThead(G)) { goto l778; } goto l747;\n+ l778:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockTr(G)) { goto l779; } goto l747;\n+ l779:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockScript(G)) { goto l780; } goto l747;\n+ l780:;\t G->pos= yypos747; G->thunkpos= yythunkpos747; if (!yy_HtmlBlockHead(G)) { goto l746; }\n+ }\n+ l747:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockInTags\", G->buf+G->pos));\n return 1;\n- l741:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l746:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockInTags\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockHead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockHead\")); if (!yy_HtmlBlockOpenHead(G)) { goto l776; }\n- l777:;\t\n- { int yypos778= G->pos, yythunkpos778= G->thunkpos;\n- { int yypos779= G->pos, yythunkpos779= G->thunkpos; if (!yy_HtmlBlockCloseHead(G)) { goto l779; } goto l778;\n- l779:;\t G->pos= yypos779; G->thunkpos= yythunkpos779;\n- } if (!yymatchDot(G)) goto l778; goto l777;\n- l778:;\t G->pos= yypos778; G->thunkpos= yythunkpos778;\n- } if (!yy_HtmlBlockCloseHead(G)) { goto l776; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockHead\")); if (!yy_HtmlBlockOpenHead(G)) { goto l781; }\n+ l782:;\t\n+ { int yypos783= G->pos, yythunkpos783= G->thunkpos;\n+ { int yypos784= G->pos, yythunkpos784= G->thunkpos; if (!yy_HtmlBlockCloseHead(G)) { goto l784; } goto l783;\n+ l784:;\t G->pos= yypos784; G->thunkpos= yythunkpos784;\n+ } if (!yymatchDot(G)) goto l783; goto l782;\n+ l783:;\t G->pos= yypos783; G->thunkpos= yythunkpos783;\n+ } if (!yy_HtmlBlockCloseHead(G)) { goto l781; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockHead\", G->buf+G->pos));\n return 1;\n- l776:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l781:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockHead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseHead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseHead\")); if (!yymatchChar(G, '<')) goto l780; if (!yy_Spnl(G)) { goto l780; } if (!yymatchChar(G, '\/')) goto l780;\n- { int yypos781= G->pos, yythunkpos781= G->thunkpos; if (!yymatchString(G, \"head\")) goto l782; goto l781;\n- l782:;\t G->pos= yypos781; G->thunkpos= yythunkpos781; if (!yymatchString(G, \"HEAD\")) goto l780;\n- }\n- l781:;\t if (!yy_Spnl(G)) { goto l780; } if (!yymatchChar(G, '>')) goto l780;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseHead\")); if (!yymatchChar(G, '<')) goto l785; if (!yy_Spnl(G)) { goto l785; } if (!yymatchChar(G, '\/')) goto l785;\n+ { int yypos786= G->pos, yythunkpos786= G->thunkpos; if (!yymatchString(G, \"head\")) goto l787; goto l786;\n+ l787:;\t G->pos= yypos786; G->thunkpos= yythunkpos786; if (!yymatchString(G, \"HEAD\")) goto l785;\n+ }\n+ l786:;\t if (!yy_Spnl(G)) { goto l785; } if (!yymatchChar(G, '>')) goto l785;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseHead\", G->buf+G->pos));\n return 1;\n- l780:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l785:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseHead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenHead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenHead\")); if (!yymatchChar(G, '<')) goto l783; if (!yy_Spnl(G)) { goto l783; }\n- { int yypos784= G->pos, yythunkpos784= G->thunkpos; if (!yymatchString(G, \"head\")) goto l785; goto l784;\n- l785:;\t G->pos= yypos784; G->thunkpos= yythunkpos784; if (!yymatchString(G, \"HEAD\")) goto l783;\n- }\n- l784:;\t if (!yy_Spnl(G)) { goto l783; }\n- l786:;\t\n- { int yypos787= G->pos, yythunkpos787= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l787; } goto l786;\n- l787:;\t G->pos= yypos787; G->thunkpos= yythunkpos787;\n- } if (!yymatchChar(G, '>')) goto l783;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenHead\")); if (!yymatchChar(G, '<')) goto l788; if (!yy_Spnl(G)) { goto l788; }\n+ { int yypos789= G->pos, yythunkpos789= G->thunkpos; if (!yymatchString(G, \"head\")) goto l790; goto l789;\n+ l790:;\t G->pos= yypos789; G->thunkpos= yythunkpos789; if (!yymatchString(G, \"HEAD\")) goto l788;\n+ }\n+ l789:;\t if (!yy_Spnl(G)) { goto l788; }\n+ l791:;\t\n+ { int yypos792= G->pos, yythunkpos792= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l792; } goto l791;\n+ l792:;\t G->pos= yypos792; G->thunkpos= yythunkpos792;\n+ } if (!yymatchChar(G, '>')) goto l788;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenHead\", G->buf+G->pos));\n return 1;\n- l783:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l788:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenHead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockScript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockScript\")); if (!yy_HtmlBlockOpenScript(G)) { goto l788; }\n- l789:;\t\n- { int yypos790= G->pos, yythunkpos790= G->thunkpos;\n- { int yypos791= G->pos, yythunkpos791= G->thunkpos; if (!yy_HtmlBlockCloseScript(G)) { goto l791; } goto l790;\n- l791:;\t G->pos= yypos791; G->thunkpos= yythunkpos791;\n- } if (!yymatchDot(G)) goto l790; goto l789;\n- l790:;\t G->pos= yypos790; G->thunkpos= yythunkpos790;\n- } if (!yy_HtmlBlockCloseScript(G)) { goto l788; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockScript\")); if (!yy_HtmlBlockOpenScript(G)) { goto l793; }\n+ l794:;\t\n+ { int yypos795= G->pos, yythunkpos795= G->thunkpos;\n+ { int yypos796= G->pos, yythunkpos796= G->thunkpos; if (!yy_HtmlBlockCloseScript(G)) { goto l796; } goto l795;\n+ l796:;\t G->pos= yypos796; G->thunkpos= yythunkpos796;\n+ } if (!yymatchDot(G)) goto l795; goto l794;\n+ l795:;\t G->pos= yypos795; G->thunkpos= yythunkpos795;\n+ } if (!yy_HtmlBlockCloseScript(G)) { goto l793; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockScript\", G->buf+G->pos));\n return 1;\n- l788:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l793:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockScript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseScript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseScript\")); if (!yymatchChar(G, '<')) goto l792; if (!yy_Spnl(G)) { goto l792; } if (!yymatchChar(G, '\/')) goto l792;\n- { int yypos793= G->pos, yythunkpos793= G->thunkpos; if (!yymatchString(G, \"script\")) goto l794; goto l793;\n- l794:;\t G->pos= yypos793; G->thunkpos= yythunkpos793; if (!yymatchString(G, \"SCRIPT\")) goto l792;\n- }\n- l793:;\t if (!yy_Spnl(G)) { goto l792; } if (!yymatchChar(G, '>')) goto l792;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseScript\")); if (!yymatchChar(G, '<')) goto l797; if (!yy_Spnl(G)) { goto l797; } if (!yymatchChar(G, '\/')) goto l797;\n+ { int yypos798= G->pos, yythunkpos798= G->thunkpos; if (!yymatchString(G, \"script\")) goto l799; goto l798;\n+ l799:;\t G->pos= yypos798; G->thunkpos= yythunkpos798; if (!yymatchString(G, \"SCRIPT\")) goto l797;\n+ }\n+ l798:;\t if (!yy_Spnl(G)) { goto l797; } if (!yymatchChar(G, '>')) goto l797;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseScript\", G->buf+G->pos));\n return 1;\n- l792:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l797:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseScript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenScript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenScript\")); if (!yymatchChar(G, '<')) goto l795; if (!yy_Spnl(G)) { goto l795; }\n- { int yypos796= G->pos, yythunkpos796= G->thunkpos; if (!yymatchString(G, \"script\")) goto l797; goto l796;\n- l797:;\t G->pos= yypos796; G->thunkpos= yythunkpos796; if (!yymatchString(G, \"SCRIPT\")) goto l795;\n- }\n- l796:;\t if (!yy_Spnl(G)) { goto l795; }\n- l798:;\t\n- { int yypos799= G->pos, yythunkpos799= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l799; } goto l798;\n- l799:;\t G->pos= yypos799; G->thunkpos= yythunkpos799;\n- } if (!yymatchChar(G, '>')) goto l795;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenScript\")); if (!yymatchChar(G, '<')) goto l800; if (!yy_Spnl(G)) { goto l800; }\n+ { int yypos801= G->pos, yythunkpos801= G->thunkpos; if (!yymatchString(G, \"script\")) goto l802; goto l801;\n+ l802:;\t G->pos= yypos801; G->thunkpos= yythunkpos801; if (!yymatchString(G, \"SCRIPT\")) goto l800;\n+ }\n+ l801:;\t if (!yy_Spnl(G)) { goto l800; }\n+ l803:;\t\n+ { int yypos804= G->pos, yythunkpos804= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l804; } goto l803;\n+ l804:;\t G->pos= yypos804; G->thunkpos= yythunkpos804;\n+ } if (!yymatchChar(G, '>')) goto l800;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenScript\", G->buf+G->pos));\n return 1;\n- l795:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l800:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenScript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTr(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTr\")); if (!yy_HtmlBlockOpenTr(G)) { goto l800; }\n- l801:;\t\n- { int yypos802= G->pos, yythunkpos802= G->thunkpos;\n- { int yypos803= G->pos, yythunkpos803= G->thunkpos; if (!yy_HtmlBlockTr(G)) { goto l804; } goto l803;\n- l804:;\t G->pos= yypos803; G->thunkpos= yythunkpos803;\n- { int yypos805= G->pos, yythunkpos805= G->thunkpos; if (!yy_HtmlBlockCloseTr(G)) { goto l805; } goto l802;\n- l805:;\t G->pos= yypos805; G->thunkpos= yythunkpos805;\n- } if (!yymatchDot(G)) goto l802;\n- }\n- l803:;\t goto l801;\n- l802:;\t G->pos= yypos802; G->thunkpos= yythunkpos802;\n- } if (!yy_HtmlBlockCloseTr(G)) { goto l800; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTr\")); if (!yy_HtmlBlockOpenTr(G)) { goto l805; }\n+ l806:;\t\n+ { int yypos807= G->pos, yythunkpos807= G->thunkpos;\n+ { int yypos808= G->pos, yythunkpos808= G->thunkpos; if (!yy_HtmlBlockTr(G)) { goto l809; } goto l808;\n+ l809:;\t G->pos= yypos808; G->thunkpos= yythunkpos808;\n+ { int yypos810= G->pos, yythunkpos810= G->thunkpos; if (!yy_HtmlBlockCloseTr(G)) { goto l810; } goto l807;\n+ l810:;\t G->pos= yypos810; G->thunkpos= yythunkpos810;\n+ } if (!yymatchDot(G)) goto l807;\n+ }\n+ l808:;\t goto l806;\n+ l807:;\t G->pos= yypos807; G->thunkpos= yythunkpos807;\n+ } if (!yy_HtmlBlockCloseTr(G)) { goto l805; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTr\", G->buf+G->pos));\n return 1;\n- l800:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l805:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTr\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTr(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTr\")); if (!yymatchChar(G, '<')) goto l806; if (!yy_Spnl(G)) { goto l806; } if (!yymatchChar(G, '\/')) goto l806;\n- { int yypos807= G->pos, yythunkpos807= G->thunkpos; if (!yymatchString(G, \"tr\")) goto l808; goto l807;\n- l808:;\t G->pos= yypos807; G->thunkpos= yythunkpos807; if (!yymatchString(G, \"TR\")) goto l806;\n- }\n- l807:;\t if (!yy_Spnl(G)) { goto l806; } if (!yymatchChar(G, '>')) goto l806;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTr\")); if (!yymatchChar(G, '<')) goto l811; if (!yy_Spnl(G)) { goto l811; } if (!yymatchChar(G, '\/')) goto l811;\n+ { int yypos812= G->pos, yythunkpos812= G->thunkpos; if (!yymatchString(G, \"tr\")) goto l813; goto l812;\n+ l813:;\t G->pos= yypos812; G->thunkpos= yythunkpos812; if (!yymatchString(G, \"TR\")) goto l811;\n+ }\n+ l812:;\t if (!yy_Spnl(G)) { goto l811; } if (!yymatchChar(G, '>')) goto l811;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTr\", G->buf+G->pos));\n return 1;\n- l806:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l811:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTr\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTr(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTr\")); if (!yymatchChar(G, '<')) goto l809; if (!yy_Spnl(G)) { goto l809; }\n- { int yypos810= G->pos, yythunkpos810= G->thunkpos; if (!yymatchString(G, \"tr\")) goto l811; goto l810;\n- l811:;\t G->pos= yypos810; G->thunkpos= yythunkpos810; if (!yymatchString(G, \"TR\")) goto l809;\n- }\n- l810:;\t if (!yy_Spnl(G)) { goto l809; }\n- l812:;\t\n- { int yypos813= G->pos, yythunkpos813= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l813; } goto l812;\n- l813:;\t G->pos= yypos813; G->thunkpos= yythunkpos813;\n- } if (!yymatchChar(G, '>')) goto l809;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTr\")); if (!yymatchChar(G, '<')) goto l814; if (!yy_Spnl(G)) { goto l814; }\n+ { int yypos815= G->pos, yythunkpos815= G->thunkpos; if (!yymatchString(G, \"tr\")) goto l816; goto l815;\n+ l816:;\t G->pos= yypos815; G->thunkpos= yythunkpos815; if (!yymatchString(G, \"TR\")) goto l814;\n+ }\n+ l815:;\t if (!yy_Spnl(G)) { goto l814; }\n+ l817:;\t\n+ { int yypos818= G->pos, yythunkpos818= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l818; } goto l817;\n+ l818:;\t G->pos= yypos818; G->thunkpos= yythunkpos818;\n+ } if (!yymatchChar(G, '>')) goto l814;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTr\", G->buf+G->pos));\n return 1;\n- l809:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l814:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTr\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockThead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockThead\")); if (!yy_HtmlBlockOpenThead(G)) { goto l814; }\n- l815:;\t\n- { int yypos816= G->pos, yythunkpos816= G->thunkpos;\n- { int yypos817= G->pos, yythunkpos817= G->thunkpos; if (!yy_HtmlBlockThead(G)) { goto l818; } goto l817;\n- l818:;\t G->pos= yypos817; G->thunkpos= yythunkpos817;\n- { int yypos819= G->pos, yythunkpos819= G->thunkpos; if (!yy_HtmlBlockCloseThead(G)) { goto l819; } goto l816;\n- l819:;\t G->pos= yypos819; G->thunkpos= yythunkpos819;\n- } if (!yymatchDot(G)) goto l816;\n- }\n- l817:;\t goto l815;\n- l816:;\t G->pos= yypos816; G->thunkpos= yythunkpos816;\n- } if (!yy_HtmlBlockCloseThead(G)) { goto l814; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockThead\")); if (!yy_HtmlBlockOpenThead(G)) { goto l819; }\n+ l820:;\t\n+ { int yypos821= G->pos, yythunkpos821= G->thunkpos;\n+ { int yypos822= G->pos, yythunkpos822= G->thunkpos; if (!yy_HtmlBlockThead(G)) { goto l823; } goto l822;\n+ l823:;\t G->pos= yypos822; G->thunkpos= yythunkpos822;\n+ { int yypos824= G->pos, yythunkpos824= G->thunkpos; if (!yy_HtmlBlockCloseThead(G)) { goto l824; } goto l821;\n+ l824:;\t G->pos= yypos824; G->thunkpos= yythunkpos824;\n+ } if (!yymatchDot(G)) goto l821;\n+ }\n+ l822:;\t goto l820;\n+ l821:;\t G->pos= yypos821; G->thunkpos= yythunkpos821;\n+ } if (!yy_HtmlBlockCloseThead(G)) { goto l819; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockThead\", G->buf+G->pos));\n return 1;\n- l814:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l819:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockThead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseThead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseThead\")); if (!yymatchChar(G, '<')) goto l820; if (!yy_Spnl(G)) { goto l820; } if (!yymatchChar(G, '\/')) goto l820;\n- { int yypos821= G->pos, yythunkpos821= G->thunkpos; if (!yymatchString(G, \"thead\")) goto l822; goto l821;\n- l822:;\t G->pos= yypos821; G->thunkpos= yythunkpos821; if (!yymatchString(G, \"THEAD\")) goto l820;\n- }\n- l821:;\t if (!yy_Spnl(G)) { goto l820; } if (!yymatchChar(G, '>')) goto l820;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseThead\")); if (!yymatchChar(G, '<')) goto l825; if (!yy_Spnl(G)) { goto l825; } if (!yymatchChar(G, '\/')) goto l825;\n+ { int yypos826= G->pos, yythunkpos826= G->thunkpos; if (!yymatchString(G, \"thead\")) goto l827; goto l826;\n+ l827:;\t G->pos= yypos826; G->thunkpos= yythunkpos826; if (!yymatchString(G, \"THEAD\")) goto l825;\n+ }\n+ l826:;\t if (!yy_Spnl(G)) { goto l825; } if (!yymatchChar(G, '>')) goto l825;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseThead\", G->buf+G->pos));\n return 1;\n- l820:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l825:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseThead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenThead(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenThead\")); if (!yymatchChar(G, '<')) goto l823; if (!yy_Spnl(G)) { goto l823; }\n- { int yypos824= G->pos, yythunkpos824= G->thunkpos; if (!yymatchString(G, \"thead\")) goto l825; goto l824;\n- l825:;\t G->pos= yypos824; G->thunkpos= yythunkpos824; if (!yymatchString(G, \"THEAD\")) goto l823;\n- }\n- l824:;\t if (!yy_Spnl(G)) { goto l823; }\n- l826:;\t\n- { int yypos827= G->pos, yythunkpos827= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l827; } goto l826;\n- l827:;\t G->pos= yypos827; G->thunkpos= yythunkpos827;\n- } if (!yymatchChar(G, '>')) goto l823;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenThead\")); if (!yymatchChar(G, '<')) goto l828; if (!yy_Spnl(G)) { goto l828; }\n+ { int yypos829= G->pos, yythunkpos829= G->thunkpos; if (!yymatchString(G, \"thead\")) goto l830; goto l829;\n+ l830:;\t G->pos= yypos829; G->thunkpos= yythunkpos829; if (!yymatchString(G, \"THEAD\")) goto l828;\n+ }\n+ l829:;\t if (!yy_Spnl(G)) { goto l828; }\n+ l831:;\t\n+ { int yypos832= G->pos, yythunkpos832= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l832; } goto l831;\n+ l832:;\t G->pos= yypos832; G->thunkpos= yythunkpos832;\n+ } if (!yymatchChar(G, '>')) goto l828;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenThead\", G->buf+G->pos));\n return 1;\n- l823:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l828:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenThead\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTh(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTh\")); if (!yy_HtmlBlockOpenTh(G)) { goto l828; }\n- l829:;\t\n- { int yypos830= G->pos, yythunkpos830= G->thunkpos;\n- { int yypos831= G->pos, yythunkpos831= G->thunkpos; if (!yy_HtmlBlockTh(G)) { goto l832; } goto l831;\n- l832:;\t G->pos= yypos831; G->thunkpos= yythunkpos831;\n- { int yypos833= G->pos, yythunkpos833= G->thunkpos; if (!yy_HtmlBlockCloseTh(G)) { goto l833; } goto l830;\n- l833:;\t G->pos= yypos833; G->thunkpos= yythunkpos833;\n- } if (!yymatchDot(G)) goto l830;\n- }\n- l831:;\t goto l829;\n- l830:;\t G->pos= yypos830; G->thunkpos= yythunkpos830;\n- } if (!yy_HtmlBlockCloseTh(G)) { goto l828; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTh\")); if (!yy_HtmlBlockOpenTh(G)) { goto l833; }\n+ l834:;\t\n+ { int yypos835= G->pos, yythunkpos835= G->thunkpos;\n+ { int yypos836= G->pos, yythunkpos836= G->thunkpos; if (!yy_HtmlBlockTh(G)) { goto l837; } goto l836;\n+ l837:;\t G->pos= yypos836; G->thunkpos= yythunkpos836;\n+ { int yypos838= G->pos, yythunkpos838= G->thunkpos; if (!yy_HtmlBlockCloseTh(G)) { goto l838; } goto l835;\n+ l838:;\t G->pos= yypos838; G->thunkpos= yythunkpos838;\n+ } if (!yymatchDot(G)) goto l835;\n+ }\n+ l836:;\t goto l834;\n+ l835:;\t G->pos= yypos835; G->thunkpos= yythunkpos835;\n+ } if (!yy_HtmlBlockCloseTh(G)) { goto l833; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTh\", G->buf+G->pos));\n return 1;\n- l828:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l833:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTh\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTh(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTh\")); if (!yymatchChar(G, '<')) goto l834; if (!yy_Spnl(G)) { goto l834; } if (!yymatchChar(G, '\/')) goto l834;\n- { int yypos835= G->pos, yythunkpos835= G->thunkpos; if (!yymatchString(G, \"th\")) goto l836; goto l835;\n- l836:;\t G->pos= yypos835; G->thunkpos= yythunkpos835; if (!yymatchString(G, \"TH\")) goto l834;\n- }\n- l835:;\t if (!yy_Spnl(G)) { goto l834; } if (!yymatchChar(G, '>')) goto l834;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTh\")); if (!yymatchChar(G, '<')) goto l839; if (!yy_Spnl(G)) { goto l839; } if (!yymatchChar(G, '\/')) goto l839;\n+ { int yypos840= G->pos, yythunkpos840= G->thunkpos; if (!yymatchString(G, \"th\")) goto l841; goto l840;\n+ l841:;\t G->pos= yypos840; G->thunkpos= yythunkpos840; if (!yymatchString(G, \"TH\")) goto l839;\n+ }\n+ l840:;\t if (!yy_Spnl(G)) { goto l839; } if (!yymatchChar(G, '>')) goto l839;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTh\", G->buf+G->pos));\n return 1;\n- l834:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l839:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTh\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTh(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTh\")); if (!yymatchChar(G, '<')) goto l837; if (!yy_Spnl(G)) { goto l837; }\n- { int yypos838= G->pos, yythunkpos838= G->thunkpos; if (!yymatchString(G, \"th\")) goto l839; goto l838;\n- l839:;\t G->pos= yypos838; G->thunkpos= yythunkpos838; if (!yymatchString(G, \"TH\")) goto l837;\n- }\n- l838:;\t if (!yy_Spnl(G)) { goto l837; }\n- l840:;\t\n- { int yypos841= G->pos, yythunkpos841= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l841; } goto l840;\n- l841:;\t G->pos= yypos841; G->thunkpos= yythunkpos841;\n- } if (!yymatchChar(G, '>')) goto l837;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTh\")); if (!yymatchChar(G, '<')) goto l842; if (!yy_Spnl(G)) { goto l842; }\n+ { int yypos843= G->pos, yythunkpos843= G->thunkpos; if (!yymatchString(G, \"th\")) goto l844; goto l843;\n+ l844:;\t G->pos= yypos843; G->thunkpos= yythunkpos843; if (!yymatchString(G, \"TH\")) goto l842;\n+ }\n+ l843:;\t if (!yy_Spnl(G)) { goto l842; }\n+ l845:;\t\n+ { int yypos846= G->pos, yythunkpos846= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l846; } goto l845;\n+ l846:;\t G->pos= yypos846; G->thunkpos= yythunkpos846;\n+ } if (!yymatchChar(G, '>')) goto l842;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTh\", G->buf+G->pos));\n return 1;\n- l837:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l842:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTh\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTfoot(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTfoot\")); if (!yy_HtmlBlockOpenTfoot(G)) { goto l842; }\n- l843:;\t\n- { int yypos844= G->pos, yythunkpos844= G->thunkpos;\n- { int yypos845= G->pos, yythunkpos845= G->thunkpos; if (!yy_HtmlBlockTfoot(G)) { goto l846; } goto l845;\n- l846:;\t G->pos= yypos845; G->thunkpos= yythunkpos845;\n- { int yypos847= G->pos, yythunkpos847= G->thunkpos; if (!yy_HtmlBlockCloseTfoot(G)) { goto l847; } goto l844;\n- l847:;\t G->pos= yypos847; G->thunkpos= yythunkpos847;\n- } if (!yymatchDot(G)) goto l844;\n- }\n- l845:;\t goto l843;\n- l844:;\t G->pos= yypos844; G->thunkpos= yythunkpos844;\n- } if (!yy_HtmlBlockCloseTfoot(G)) { goto l842; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTfoot\")); if (!yy_HtmlBlockOpenTfoot(G)) { goto l847; }\n+ l848:;\t\n+ { int yypos849= G->pos, yythunkpos849= G->thunkpos;\n+ { int yypos850= G->pos, yythunkpos850= G->thunkpos; if (!yy_HtmlBlockTfoot(G)) { goto l851; } goto l850;\n+ l851:;\t G->pos= yypos850; G->thunkpos= yythunkpos850;\n+ { int yypos852= G->pos, yythunkpos852= G->thunkpos; if (!yy_HtmlBlockCloseTfoot(G)) { goto l852; } goto l849;\n+ l852:;\t G->pos= yypos852; G->thunkpos= yythunkpos852;\n+ } if (!yymatchDot(G)) goto l849;\n+ }\n+ l850:;\t goto l848;\n+ l849:;\t G->pos= yypos849; G->thunkpos= yythunkpos849;\n+ } if (!yy_HtmlBlockCloseTfoot(G)) { goto l847; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTfoot\", G->buf+G->pos));\n return 1;\n- l842:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l847:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTfoot\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTfoot(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTfoot\")); if (!yymatchChar(G, '<')) goto l848; if (!yy_Spnl(G)) { goto l848; } if (!yymatchChar(G, '\/')) goto l848;\n- { int yypos849= G->pos, yythunkpos849= G->thunkpos; if (!yymatchString(G, \"tfoot\")) goto l850; goto l849;\n- l850:;\t G->pos= yypos849; G->thunkpos= yythunkpos849; if (!yymatchString(G, \"TFOOT\")) goto l848;\n- }\n- l849:;\t if (!yy_Spnl(G)) { goto l848; } if (!yymatchChar(G, '>')) goto l848;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTfoot\")); if (!yymatchChar(G, '<')) goto l853; if (!yy_Spnl(G)) { goto l853; } if (!yymatchChar(G, '\/')) goto l853;\n+ { int yypos854= G->pos, yythunkpos854= G->thunkpos; if (!yymatchString(G, \"tfoot\")) goto l855; goto l854;\n+ l855:;\t G->pos= yypos854; G->thunkpos= yythunkpos854; if (!yymatchString(G, \"TFOOT\")) goto l853;\n+ }\n+ l854:;\t if (!yy_Spnl(G)) { goto l853; } if (!yymatchChar(G, '>')) goto l853;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTfoot\", G->buf+G->pos));\n return 1;\n- l848:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l853:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTfoot\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTfoot(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTfoot\")); if (!yymatchChar(G, '<')) goto l851; if (!yy_Spnl(G)) { goto l851; }\n- { int yypos852= G->pos, yythunkpos852= G->thunkpos; if (!yymatchString(G, \"tfoot\")) goto l853; goto l852;\n- l853:;\t G->pos= yypos852; G->thunkpos= yythunkpos852; if (!yymatchString(G, \"TFOOT\")) goto l851;\n- }\n- l852:;\t if (!yy_Spnl(G)) { goto l851; }\n- l854:;\t\n- { int yypos855= G->pos, yythunkpos855= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l855; } goto l854;\n- l855:;\t G->pos= yypos855; G->thunkpos= yythunkpos855;\n- } if (!yymatchChar(G, '>')) goto l851;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTfoot\")); if (!yymatchChar(G, '<')) goto l856; if (!yy_Spnl(G)) { goto l856; }\n+ { int yypos857= G->pos, yythunkpos857= G->thunkpos; if (!yymatchString(G, \"tfoot\")) goto l858; goto l857;\n+ l858:;\t G->pos= yypos857; G->thunkpos= yythunkpos857; if (!yymatchString(G, \"TFOOT\")) goto l856;\n+ }\n+ l857:;\t if (!yy_Spnl(G)) { goto l856; }\n+ l859:;\t\n+ { int yypos860= G->pos, yythunkpos860= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l860; } goto l859;\n+ l860:;\t G->pos= yypos860; G->thunkpos= yythunkpos860;\n+ } if (!yymatchChar(G, '>')) goto l856;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTfoot\", G->buf+G->pos));\n return 1;\n- l851:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l856:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTfoot\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTd\")); if (!yy_HtmlBlockOpenTd(G)) { goto l856; }\n- l857:;\t\n- { int yypos858= G->pos, yythunkpos858= G->thunkpos;\n- { int yypos859= G->pos, yythunkpos859= G->thunkpos; if (!yy_HtmlBlockTd(G)) { goto l860; } goto l859;\n- l860:;\t G->pos= yypos859; G->thunkpos= yythunkpos859;\n- { int yypos861= G->pos, yythunkpos861= G->thunkpos; if (!yy_HtmlBlockCloseTd(G)) { goto l861; } goto l858;\n- l861:;\t G->pos= yypos861; G->thunkpos= yythunkpos861;\n- } if (!yymatchDot(G)) goto l858;\n- }\n- l859:;\t goto l857;\n- l858:;\t G->pos= yypos858; G->thunkpos= yythunkpos858;\n- } if (!yy_HtmlBlockCloseTd(G)) { goto l856; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTd\")); if (!yy_HtmlBlockOpenTd(G)) { goto l861; }\n+ l862:;\t\n+ { int yypos863= G->pos, yythunkpos863= G->thunkpos;\n+ { int yypos864= G->pos, yythunkpos864= G->thunkpos; if (!yy_HtmlBlockTd(G)) { goto l865; } goto l864;\n+ l865:;\t G->pos= yypos864; G->thunkpos= yythunkpos864;\n+ { int yypos866= G->pos, yythunkpos866= G->thunkpos; if (!yy_HtmlBlockCloseTd(G)) { goto l866; } goto l863;\n+ l866:;\t G->pos= yypos866; G->thunkpos= yythunkpos866;\n+ } if (!yymatchDot(G)) goto l863;\n+ }\n+ l864:;\t goto l862;\n+ l863:;\t G->pos= yypos863; G->thunkpos= yythunkpos863;\n+ } if (!yy_HtmlBlockCloseTd(G)) { goto l861; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTd\", G->buf+G->pos));\n return 1;\n- l856:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l861:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTd\")); if (!yymatchChar(G, '<')) goto l862; if (!yy_Spnl(G)) { goto l862; } if (!yymatchChar(G, '\/')) goto l862;\n- { int yypos863= G->pos, yythunkpos863= G->thunkpos; if (!yymatchString(G, \"td\")) goto l864; goto l863;\n- l864:;\t G->pos= yypos863; G->thunkpos= yythunkpos863; if (!yymatchString(G, \"TD\")) goto l862;\n- }\n- l863:;\t if (!yy_Spnl(G)) { goto l862; } if (!yymatchChar(G, '>')) goto l862;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTd\")); if (!yymatchChar(G, '<')) goto l867; if (!yy_Spnl(G)) { goto l867; } if (!yymatchChar(G, '\/')) goto l867;\n+ { int yypos868= G->pos, yythunkpos868= G->thunkpos; if (!yymatchString(G, \"td\")) goto l869; goto l868;\n+ l869:;\t G->pos= yypos868; G->thunkpos= yythunkpos868; if (!yymatchString(G, \"TD\")) goto l867;\n+ }\n+ l868:;\t if (!yy_Spnl(G)) { goto l867; } if (!yymatchChar(G, '>')) goto l867;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTd\", G->buf+G->pos));\n return 1;\n- l862:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l867:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTd\")); if (!yymatchChar(G, '<')) goto l865; if (!yy_Spnl(G)) { goto l865; }\n- { int yypos866= G->pos, yythunkpos866= G->thunkpos; if (!yymatchString(G, \"td\")) goto l867; goto l866;\n- l867:;\t G->pos= yypos866; G->thunkpos= yythunkpos866; if (!yymatchString(G, \"TD\")) goto l865;\n- }\n- l866:;\t if (!yy_Spnl(G)) { goto l865; }\n- l868:;\t\n- { int yypos869= G->pos, yythunkpos869= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l869; } goto l868;\n- l869:;\t G->pos= yypos869; G->thunkpos= yythunkpos869;\n- } if (!yymatchChar(G, '>')) goto l865;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTd\")); if (!yymatchChar(G, '<')) goto l870; if (!yy_Spnl(G)) { goto l870; }\n+ { int yypos871= G->pos, yythunkpos871= G->thunkpos; if (!yymatchString(G, \"td\")) goto l872; goto l871;\n+ l872:;\t G->pos= yypos871; G->thunkpos= yythunkpos871; if (!yymatchString(G, \"TD\")) goto l870;\n+ }\n+ l871:;\t if (!yy_Spnl(G)) { goto l870; }\n+ l873:;\t\n+ { int yypos874= G->pos, yythunkpos874= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l874; } goto l873;\n+ l874:;\t G->pos= yypos874; G->thunkpos= yythunkpos874;\n+ } if (!yymatchChar(G, '>')) goto l870;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTd\", G->buf+G->pos));\n return 1;\n- l865:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l870:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTbody(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTbody\")); if (!yy_HtmlBlockOpenTbody(G)) { goto l870; }\n- l871:;\t\n- { int yypos872= G->pos, yythunkpos872= G->thunkpos;\n- { int yypos873= G->pos, yythunkpos873= G->thunkpos; if (!yy_HtmlBlockTbody(G)) { goto l874; } goto l873;\n- l874:;\t G->pos= yypos873; G->thunkpos= yythunkpos873;\n- { int yypos875= G->pos, yythunkpos875= G->thunkpos; if (!yy_HtmlBlockCloseTbody(G)) { goto l875; } goto l872;\n- l875:;\t G->pos= yypos875; G->thunkpos= yythunkpos875;\n- } if (!yymatchDot(G)) goto l872;\n- }\n- l873:;\t goto l871;\n- l872:;\t G->pos= yypos872; G->thunkpos= yythunkpos872;\n- } if (!yy_HtmlBlockCloseTbody(G)) { goto l870; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTbody\")); if (!yy_HtmlBlockOpenTbody(G)) { goto l875; }\n+ l876:;\t\n+ { int yypos877= G->pos, yythunkpos877= G->thunkpos;\n+ { int yypos878= G->pos, yythunkpos878= G->thunkpos; if (!yy_HtmlBlockTbody(G)) { goto l879; } goto l878;\n+ l879:;\t G->pos= yypos878; G->thunkpos= yythunkpos878;\n+ { int yypos880= G->pos, yythunkpos880= G->thunkpos; if (!yy_HtmlBlockCloseTbody(G)) { goto l880; } goto l877;\n+ l880:;\t G->pos= yypos880; G->thunkpos= yythunkpos880;\n+ } if (!yymatchDot(G)) goto l877;\n+ }\n+ l878:;\t goto l876;\n+ l877:;\t G->pos= yypos877; G->thunkpos= yythunkpos877;\n+ } if (!yy_HtmlBlockCloseTbody(G)) { goto l875; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTbody\", G->buf+G->pos));\n return 1;\n- l870:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l875:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTbody\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTbody(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTbody\")); if (!yymatchChar(G, '<')) goto l876; if (!yy_Spnl(G)) { goto l876; } if (!yymatchChar(G, '\/')) goto l876;\n- { int yypos877= G->pos, yythunkpos877= G->thunkpos; if (!yymatchString(G, \"tbody\")) goto l878; goto l877;\n- l878:;\t G->pos= yypos877; G->thunkpos= yythunkpos877; if (!yymatchString(G, \"TBODY\")) goto l876;\n- }\n- l877:;\t if (!yy_Spnl(G)) { goto l876; } if (!yymatchChar(G, '>')) goto l876;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTbody\")); if (!yymatchChar(G, '<')) goto l881; if (!yy_Spnl(G)) { goto l881; } if (!yymatchChar(G, '\/')) goto l881;\n+ { int yypos882= G->pos, yythunkpos882= G->thunkpos; if (!yymatchString(G, \"tbody\")) goto l883; goto l882;\n+ l883:;\t G->pos= yypos882; G->thunkpos= yythunkpos882; if (!yymatchString(G, \"TBODY\")) goto l881;\n+ }\n+ l882:;\t if (!yy_Spnl(G)) { goto l881; } if (!yymatchChar(G, '>')) goto l881;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTbody\", G->buf+G->pos));\n return 1;\n- l876:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l881:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTbody\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTbody(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTbody\")); if (!yymatchChar(G, '<')) goto l879; if (!yy_Spnl(G)) { goto l879; }\n- { int yypos880= G->pos, yythunkpos880= G->thunkpos; if (!yymatchString(G, \"tbody\")) goto l881; goto l880;\n- l881:;\t G->pos= yypos880; G->thunkpos= yythunkpos880; if (!yymatchString(G, \"TBODY\")) goto l879;\n- }\n- l880:;\t if (!yy_Spnl(G)) { goto l879; }\n- l882:;\t\n- { int yypos883= G->pos, yythunkpos883= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l883; } goto l882;\n- l883:;\t G->pos= yypos883; G->thunkpos= yythunkpos883;\n- } if (!yymatchChar(G, '>')) goto l879;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTbody\")); if (!yymatchChar(G, '<')) goto l884; if (!yy_Spnl(G)) { goto l884; }\n+ { int yypos885= G->pos, yythunkpos885= G->thunkpos; if (!yymatchString(G, \"tbody\")) goto l886; goto l885;\n+ l886:;\t G->pos= yypos885; G->thunkpos= yythunkpos885; if (!yymatchString(G, \"TBODY\")) goto l884;\n+ }\n+ l885:;\t if (!yy_Spnl(G)) { goto l884; }\n+ l887:;\t\n+ { int yypos888= G->pos, yythunkpos888= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l888; } goto l887;\n+ l888:;\t G->pos= yypos888; G->thunkpos= yythunkpos888;\n+ } if (!yymatchChar(G, '>')) goto l884;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTbody\", G->buf+G->pos));\n return 1;\n- l879:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l884:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTbody\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockLi(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockLi\")); if (!yy_HtmlBlockOpenLi(G)) { goto l884; }\n- l885:;\t\n- { int yypos886= G->pos, yythunkpos886= G->thunkpos;\n- { int yypos887= G->pos, yythunkpos887= G->thunkpos; if (!yy_HtmlBlockLi(G)) { goto l888; } goto l887;\n- l888:;\t G->pos= yypos887; G->thunkpos= yythunkpos887;\n- { int yypos889= G->pos, yythunkpos889= G->thunkpos; if (!yy_HtmlBlockCloseLi(G)) { goto l889; } goto l886;\n- l889:;\t G->pos= yypos889; G->thunkpos= yythunkpos889;\n- } if (!yymatchDot(G)) goto l886;\n- }\n- l887:;\t goto l885;\n- l886:;\t G->pos= yypos886; G->thunkpos= yythunkpos886;\n- } if (!yy_HtmlBlockCloseLi(G)) { goto l884; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockLi\")); if (!yy_HtmlBlockOpenLi(G)) { goto l889; }\n+ l890:;\t\n+ { int yypos891= G->pos, yythunkpos891= G->thunkpos;\n+ { int yypos892= G->pos, yythunkpos892= G->thunkpos; if (!yy_HtmlBlockLi(G)) { goto l893; } goto l892;\n+ l893:;\t G->pos= yypos892; G->thunkpos= yythunkpos892;\n+ { int yypos894= G->pos, yythunkpos894= G->thunkpos; if (!yy_HtmlBlockCloseLi(G)) { goto l894; } goto l891;\n+ l894:;\t G->pos= yypos894; G->thunkpos= yythunkpos894;\n+ } if (!yymatchDot(G)) goto l891;\n+ }\n+ l892:;\t goto l890;\n+ l891:;\t G->pos= yypos891; G->thunkpos= yythunkpos891;\n+ } if (!yy_HtmlBlockCloseLi(G)) { goto l889; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockLi\", G->buf+G->pos));\n return 1;\n- l884:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l889:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockLi\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseLi(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseLi\")); if (!yymatchChar(G, '<')) goto l890; if (!yy_Spnl(G)) { goto l890; } if (!yymatchChar(G, '\/')) goto l890;\n- { int yypos891= G->pos, yythunkpos891= G->thunkpos; if (!yymatchString(G, \"li\")) goto l892; goto l891;\n- l892:;\t G->pos= yypos891; G->thunkpos= yythunkpos891; if (!yymatchString(G, \"LI\")) goto l890;\n- }\n- l891:;\t if (!yy_Spnl(G)) { goto l890; } if (!yymatchChar(G, '>')) goto l890;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseLi\")); if (!yymatchChar(G, '<')) goto l895; if (!yy_Spnl(G)) { goto l895; } if (!yymatchChar(G, '\/')) goto l895;\n+ { int yypos896= G->pos, yythunkpos896= G->thunkpos; if (!yymatchString(G, \"li\")) goto l897; goto l896;\n+ l897:;\t G->pos= yypos896; G->thunkpos= yythunkpos896; if (!yymatchString(G, \"LI\")) goto l895;\n+ }\n+ l896:;\t if (!yy_Spnl(G)) { goto l895; } if (!yymatchChar(G, '>')) goto l895;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseLi\", G->buf+G->pos));\n return 1;\n- l890:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l895:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseLi\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenLi(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenLi\")); if (!yymatchChar(G, '<')) goto l893; if (!yy_Spnl(G)) { goto l893; }\n- { int yypos894= G->pos, yythunkpos894= G->thunkpos; if (!yymatchString(G, \"li\")) goto l895; goto l894;\n- l895:;\t G->pos= yypos894; G->thunkpos= yythunkpos894; if (!yymatchString(G, \"LI\")) goto l893;\n- }\n- l894:;\t if (!yy_Spnl(G)) { goto l893; }\n- l896:;\t\n- { int yypos897= G->pos, yythunkpos897= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l897; } goto l896;\n- l897:;\t G->pos= yypos897; G->thunkpos= yythunkpos897;\n- } if (!yymatchChar(G, '>')) goto l893;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenLi\")); if (!yymatchChar(G, '<')) goto l898; if (!yy_Spnl(G)) { goto l898; }\n+ { int yypos899= G->pos, yythunkpos899= G->thunkpos; if (!yymatchString(G, \"li\")) goto l900; goto l899;\n+ l900:;\t G->pos= yypos899; G->thunkpos= yythunkpos899; if (!yymatchString(G, \"LI\")) goto l898;\n+ }\n+ l899:;\t if (!yy_Spnl(G)) { goto l898; }\n+ l901:;\t\n+ { int yypos902= G->pos, yythunkpos902= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l902; } goto l901;\n+ l902:;\t G->pos= yypos902; G->thunkpos= yythunkpos902;\n+ } if (!yymatchChar(G, '>')) goto l898;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenLi\", G->buf+G->pos));\n return 1;\n- l893:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l898:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenLi\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockFrameset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockFrameset\")); if (!yy_HtmlBlockOpenFrameset(G)) { goto l898; }\n- l899:;\t\n- { int yypos900= G->pos, yythunkpos900= G->thunkpos;\n- { int yypos901= G->pos, yythunkpos901= G->thunkpos; if (!yy_HtmlBlockFrameset(G)) { goto l902; } goto l901;\n- l902:;\t G->pos= yypos901; G->thunkpos= yythunkpos901;\n- { int yypos903= G->pos, yythunkpos903= G->thunkpos; if (!yy_HtmlBlockCloseFrameset(G)) { goto l903; } goto l900;\n- l903:;\t G->pos= yypos903; G->thunkpos= yythunkpos903;\n- } if (!yymatchDot(G)) goto l900;\n- }\n- l901:;\t goto l899;\n- l900:;\t G->pos= yypos900; G->thunkpos= yythunkpos900;\n- } if (!yy_HtmlBlockCloseFrameset(G)) { goto l898; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockFrameset\")); if (!yy_HtmlBlockOpenFrameset(G)) { goto l903; }\n+ l904:;\t\n+ { int yypos905= G->pos, yythunkpos905= G->thunkpos;\n+ { int yypos906= G->pos, yythunkpos906= G->thunkpos; if (!yy_HtmlBlockFrameset(G)) { goto l907; } goto l906;\n+ l907:;\t G->pos= yypos906; G->thunkpos= yythunkpos906;\n+ { int yypos908= G->pos, yythunkpos908= G->thunkpos; if (!yy_HtmlBlockCloseFrameset(G)) { goto l908; } goto l905;\n+ l908:;\t G->pos= yypos908; G->thunkpos= yythunkpos908;\n+ } if (!yymatchDot(G)) goto l905;\n+ }\n+ l906:;\t goto l904;\n+ l905:;\t G->pos= yypos905; G->thunkpos= yythunkpos905;\n+ } if (!yy_HtmlBlockCloseFrameset(G)) { goto l903; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockFrameset\", G->buf+G->pos));\n return 1;\n- l898:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l903:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockFrameset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseFrameset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseFrameset\")); if (!yymatchChar(G, '<')) goto l904; if (!yy_Spnl(G)) { goto l904; } if (!yymatchChar(G, '\/')) goto l904;\n- { int yypos905= G->pos, yythunkpos905= G->thunkpos; if (!yymatchString(G, \"frameset\")) goto l906; goto l905;\n- l906:;\t G->pos= yypos905; G->thunkpos= yythunkpos905; if (!yymatchString(G, \"FRAMESET\")) goto l904;\n- }\n- l905:;\t if (!yy_Spnl(G)) { goto l904; } if (!yymatchChar(G, '>')) goto l904;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseFrameset\")); if (!yymatchChar(G, '<')) goto l909; if (!yy_Spnl(G)) { goto l909; } if (!yymatchChar(G, '\/')) goto l909;\n+ { int yypos910= G->pos, yythunkpos910= G->thunkpos; if (!yymatchString(G, \"frameset\")) goto l911; goto l910;\n+ l911:;\t G->pos= yypos910; G->thunkpos= yythunkpos910; if (!yymatchString(G, \"FRAMESET\")) goto l909;\n+ }\n+ l910:;\t if (!yy_Spnl(G)) { goto l909; } if (!yymatchChar(G, '>')) goto l909;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseFrameset\", G->buf+G->pos));\n return 1;\n- l904:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l909:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseFrameset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenFrameset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenFrameset\")); if (!yymatchChar(G, '<')) goto l907; if (!yy_Spnl(G)) { goto l907; }\n- { int yypos908= G->pos, yythunkpos908= G->thunkpos; if (!yymatchString(G, \"frameset\")) goto l909; goto l908;\n- l909:;\t G->pos= yypos908; G->thunkpos= yythunkpos908; if (!yymatchString(G, \"FRAMESET\")) goto l907;\n- }\n- l908:;\t if (!yy_Spnl(G)) { goto l907; }\n- l910:;\t\n- { int yypos911= G->pos, yythunkpos911= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l911; } goto l910;\n- l911:;\t G->pos= yypos911; G->thunkpos= yythunkpos911;\n- } if (!yymatchChar(G, '>')) goto l907;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenFrameset\")); if (!yymatchChar(G, '<')) goto l912; if (!yy_Spnl(G)) { goto l912; }\n+ { int yypos913= G->pos, yythunkpos913= G->thunkpos; if (!yymatchString(G, \"frameset\")) goto l914; goto l913;\n+ l914:;\t G->pos= yypos913; G->thunkpos= yythunkpos913; if (!yymatchString(G, \"FRAMESET\")) goto l912;\n+ }\n+ l913:;\t if (!yy_Spnl(G)) { goto l912; }\n+ l915:;\t\n+ { int yypos916= G->pos, yythunkpos916= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l916; } goto l915;\n+ l916:;\t G->pos= yypos916; G->thunkpos= yythunkpos916;\n+ } if (!yymatchChar(G, '>')) goto l912;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenFrameset\", G->buf+G->pos));\n return 1;\n- l907:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l912:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenFrameset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockDt(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockDt\")); if (!yy_HtmlBlockOpenDt(G)) { goto l912; }\n- l913:;\t\n- { int yypos914= G->pos, yythunkpos914= G->thunkpos;\n- { int yypos915= G->pos, yythunkpos915= G->thunkpos; if (!yy_HtmlBlockDt(G)) { goto l916; } goto l915;\n- l916:;\t G->pos= yypos915; G->thunkpos= yythunkpos915;\n- { int yypos917= G->pos, yythunkpos917= G->thunkpos; if (!yy_HtmlBlockCloseDt(G)) { goto l917; } goto l914;\n- l917:;\t G->pos= yypos917; G->thunkpos= yythunkpos917;\n- } if (!yymatchDot(G)) goto l914;\n- }\n- l915:;\t goto l913;\n- l914:;\t G->pos= yypos914; G->thunkpos= yythunkpos914;\n- } if (!yy_HtmlBlockCloseDt(G)) { goto l912; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockDt\")); if (!yy_HtmlBlockOpenDt(G)) { goto l917; }\n+ l918:;\t\n+ { int yypos919= G->pos, yythunkpos919= G->thunkpos;\n+ { int yypos920= G->pos, yythunkpos920= G->thunkpos; if (!yy_HtmlBlockDt(G)) { goto l921; } goto l920;\n+ l921:;\t G->pos= yypos920; G->thunkpos= yythunkpos920;\n+ { int yypos922= G->pos, yythunkpos922= G->thunkpos; if (!yy_HtmlBlockCloseDt(G)) { goto l922; } goto l919;\n+ l922:;\t G->pos= yypos922; G->thunkpos= yythunkpos922;\n+ } if (!yymatchDot(G)) goto l919;\n+ }\n+ l920:;\t goto l918;\n+ l919:;\t G->pos= yypos919; G->thunkpos= yythunkpos919;\n+ } if (!yy_HtmlBlockCloseDt(G)) { goto l917; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockDt\", G->buf+G->pos));\n return 1;\n- l912:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l917:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockDt\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseDt(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDt\")); if (!yymatchChar(G, '<')) goto l918; if (!yy_Spnl(G)) { goto l918; } if (!yymatchChar(G, '\/')) goto l918;\n- { int yypos919= G->pos, yythunkpos919= G->thunkpos; if (!yymatchString(G, \"dt\")) goto l920; goto l919;\n- l920:;\t G->pos= yypos919; G->thunkpos= yythunkpos919; if (!yymatchString(G, \"DT\")) goto l918;\n- }\n- l919:;\t if (!yy_Spnl(G)) { goto l918; } if (!yymatchChar(G, '>')) goto l918;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDt\")); if (!yymatchChar(G, '<')) goto l923; if (!yy_Spnl(G)) { goto l923; } if (!yymatchChar(G, '\/')) goto l923;\n+ { int yypos924= G->pos, yythunkpos924= G->thunkpos; if (!yymatchString(G, \"dt\")) goto l925; goto l924;\n+ l925:;\t G->pos= yypos924; G->thunkpos= yythunkpos924; if (!yymatchString(G, \"DT\")) goto l923;\n+ }\n+ l924:;\t if (!yy_Spnl(G)) { goto l923; } if (!yymatchChar(G, '>')) goto l923;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseDt\", G->buf+G->pos));\n return 1;\n- l918:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l923:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseDt\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenDt(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDt\")); if (!yymatchChar(G, '<')) goto l921; if (!yy_Spnl(G)) { goto l921; }\n- { int yypos922= G->pos, yythunkpos922= G->thunkpos; if (!yymatchString(G, \"dt\")) goto l923; goto l922;\n- l923:;\t G->pos= yypos922; G->thunkpos= yythunkpos922; if (!yymatchString(G, \"DT\")) goto l921;\n- }\n- l922:;\t if (!yy_Spnl(G)) { goto l921; }\n- l924:;\t\n- { int yypos925= G->pos, yythunkpos925= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l925; } goto l924;\n- l925:;\t G->pos= yypos925; G->thunkpos= yythunkpos925;\n- } if (!yymatchChar(G, '>')) goto l921;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDt\")); if (!yymatchChar(G, '<')) goto l926; if (!yy_Spnl(G)) { goto l926; }\n+ { int yypos927= G->pos, yythunkpos927= G->thunkpos; if (!yymatchString(G, \"dt\")) goto l928; goto l927;\n+ l928:;\t G->pos= yypos927; G->thunkpos= yythunkpos927; if (!yymatchString(G, \"DT\")) goto l926;\n+ }\n+ l927:;\t if (!yy_Spnl(G)) { goto l926; }\n+ l929:;\t\n+ { int yypos930= G->pos, yythunkpos930= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l930; } goto l929;\n+ l930:;\t G->pos= yypos930; G->thunkpos= yythunkpos930;\n+ } if (!yymatchChar(G, '>')) goto l926;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenDt\", G->buf+G->pos));\n return 1;\n- l921:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l926:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenDt\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockDd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockDd\")); if (!yy_HtmlBlockOpenDd(G)) { goto l926; }\n- l927:;\t\n- { int yypos928= G->pos, yythunkpos928= G->thunkpos;\n- { int yypos929= G->pos, yythunkpos929= G->thunkpos; if (!yy_HtmlBlockDd(G)) { goto l930; } goto l929;\n- l930:;\t G->pos= yypos929; G->thunkpos= yythunkpos929;\n- { int yypos931= G->pos, yythunkpos931= G->thunkpos; if (!yy_HtmlBlockCloseDd(G)) { goto l931; } goto l928;\n- l931:;\t G->pos= yypos931; G->thunkpos= yythunkpos931;\n- } if (!yymatchDot(G)) goto l928;\n- }\n- l929:;\t goto l927;\n- l928:;\t G->pos= yypos928; G->thunkpos= yythunkpos928;\n- } if (!yy_HtmlBlockCloseDd(G)) { goto l926; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockDd\")); if (!yy_HtmlBlockOpenDd(G)) { goto l931; }\n+ l932:;\t\n+ { int yypos933= G->pos, yythunkpos933= G->thunkpos;\n+ { int yypos934= G->pos, yythunkpos934= G->thunkpos; if (!yy_HtmlBlockDd(G)) { goto l935; } goto l934;\n+ l935:;\t G->pos= yypos934; G->thunkpos= yythunkpos934;\n+ { int yypos936= G->pos, yythunkpos936= G->thunkpos; if (!yy_HtmlBlockCloseDd(G)) { goto l936; } goto l933;\n+ l936:;\t G->pos= yypos936; G->thunkpos= yythunkpos936;\n+ } if (!yymatchDot(G)) goto l933;\n+ }\n+ l934:;\t goto l932;\n+ l933:;\t G->pos= yypos933; G->thunkpos= yythunkpos933;\n+ } if (!yy_HtmlBlockCloseDd(G)) { goto l931; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockDd\", G->buf+G->pos));\n return 1;\n- l926:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l931:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockDd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseDd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDd\")); if (!yymatchChar(G, '<')) goto l932; if (!yy_Spnl(G)) { goto l932; } if (!yymatchChar(G, '\/')) goto l932;\n- { int yypos933= G->pos, yythunkpos933= G->thunkpos; if (!yymatchString(G, \"dd\")) goto l934; goto l933;\n- l934:;\t G->pos= yypos933; G->thunkpos= yythunkpos933; if (!yymatchString(G, \"DD\")) goto l932;\n- }\n- l933:;\t if (!yy_Spnl(G)) { goto l932; } if (!yymatchChar(G, '>')) goto l932;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDd\")); if (!yymatchChar(G, '<')) goto l937; if (!yy_Spnl(G)) { goto l937; } if (!yymatchChar(G, '\/')) goto l937;\n+ { int yypos938= G->pos, yythunkpos938= G->thunkpos; if (!yymatchString(G, \"dd\")) goto l939; goto l938;\n+ l939:;\t G->pos= yypos938; G->thunkpos= yythunkpos938; if (!yymatchString(G, \"DD\")) goto l937;\n+ }\n+ l938:;\t if (!yy_Spnl(G)) { goto l937; } if (!yymatchChar(G, '>')) goto l937;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseDd\", G->buf+G->pos));\n return 1;\n- l932:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l937:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseDd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenDd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDd\")); if (!yymatchChar(G, '<')) goto l935; if (!yy_Spnl(G)) { goto l935; }\n- { int yypos936= G->pos, yythunkpos936= G->thunkpos; if (!yymatchString(G, \"dd\")) goto l937; goto l936;\n- l937:;\t G->pos= yypos936; G->thunkpos= yythunkpos936; if (!yymatchString(G, \"DD\")) goto l935;\n- }\n- l936:;\t if (!yy_Spnl(G)) { goto l935; }\n- l938:;\t\n- { int yypos939= G->pos, yythunkpos939= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l939; } goto l938;\n- l939:;\t G->pos= yypos939; G->thunkpos= yythunkpos939;\n- } if (!yymatchChar(G, '>')) goto l935;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDd\")); if (!yymatchChar(G, '<')) goto l940; if (!yy_Spnl(G)) { goto l940; }\n+ { int yypos941= G->pos, yythunkpos941= G->thunkpos; if (!yymatchString(G, \"dd\")) goto l942; goto l941;\n+ l942:;\t G->pos= yypos941; G->thunkpos= yythunkpos941; if (!yymatchString(G, \"DD\")) goto l940;\n+ }\n+ l941:;\t if (!yy_Spnl(G)) { goto l940; }\n+ l943:;\t\n+ { int yypos944= G->pos, yythunkpos944= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l944; } goto l943;\n+ l944:;\t G->pos= yypos944; G->thunkpos= yythunkpos944;\n+ } if (!yymatchChar(G, '>')) goto l940;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenDd\", G->buf+G->pos));\n return 1;\n- l935:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l940:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenDd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockUl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockUl\")); if (!yy_HtmlBlockOpenUl(G)) { goto l940; }\n- l941:;\t\n- { int yypos942= G->pos, yythunkpos942= G->thunkpos;\n- { int yypos943= G->pos, yythunkpos943= G->thunkpos; if (!yy_HtmlBlockUl(G)) { goto l944; } goto l943;\n- l944:;\t G->pos= yypos943; G->thunkpos= yythunkpos943;\n- { int yypos945= G->pos, yythunkpos945= G->thunkpos; if (!yy_HtmlBlockCloseUl(G)) { goto l945; } goto l942;\n- l945:;\t G->pos= yypos945; G->thunkpos= yythunkpos945;\n- } if (!yymatchDot(G)) goto l942;\n- }\n- l943:;\t goto l941;\n- l942:;\t G->pos= yypos942; G->thunkpos= yythunkpos942;\n- } if (!yy_HtmlBlockCloseUl(G)) { goto l940; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockUl\")); if (!yy_HtmlBlockOpenUl(G)) { goto l945; }\n+ l946:;\t\n+ { int yypos947= G->pos, yythunkpos947= G->thunkpos;\n+ { int yypos948= G->pos, yythunkpos948= G->thunkpos; if (!yy_HtmlBlockUl(G)) { goto l949; } goto l948;\n+ l949:;\t G->pos= yypos948; G->thunkpos= yythunkpos948;\n+ { int yypos950= G->pos, yythunkpos950= G->thunkpos; if (!yy_HtmlBlockCloseUl(G)) { goto l950; } goto l947;\n+ l950:;\t G->pos= yypos950; G->thunkpos= yythunkpos950;\n+ } if (!yymatchDot(G)) goto l947;\n+ }\n+ l948:;\t goto l946;\n+ l947:;\t G->pos= yypos947; G->thunkpos= yythunkpos947;\n+ } if (!yy_HtmlBlockCloseUl(G)) { goto l945; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockUl\", G->buf+G->pos));\n return 1;\n- l940:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l945:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockUl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseUl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseUl\")); if (!yymatchChar(G, '<')) goto l946; if (!yy_Spnl(G)) { goto l946; } if (!yymatchChar(G, '\/')) goto l946;\n- { int yypos947= G->pos, yythunkpos947= G->thunkpos; if (!yymatchString(G, \"ul\")) goto l948; goto l947;\n- l948:;\t G->pos= yypos947; G->thunkpos= yythunkpos947; if (!yymatchString(G, \"UL\")) goto l946;\n- }\n- l947:;\t if (!yy_Spnl(G)) { goto l946; } if (!yymatchChar(G, '>')) goto l946;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseUl\")); if (!yymatchChar(G, '<')) goto l951; if (!yy_Spnl(G)) { goto l951; } if (!yymatchChar(G, '\/')) goto l951;\n+ { int yypos952= G->pos, yythunkpos952= G->thunkpos; if (!yymatchString(G, \"ul\")) goto l953; goto l952;\n+ l953:;\t G->pos= yypos952; G->thunkpos= yythunkpos952; if (!yymatchString(G, \"UL\")) goto l951;\n+ }\n+ l952:;\t if (!yy_Spnl(G)) { goto l951; } if (!yymatchChar(G, '>')) goto l951;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseUl\", G->buf+G->pos));\n return 1;\n- l946:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l951:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseUl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenUl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenUl\")); if (!yymatchChar(G, '<')) goto l949; if (!yy_Spnl(G)) { goto l949; }\n- { int yypos950= G->pos, yythunkpos950= G->thunkpos; if (!yymatchString(G, \"ul\")) goto l951; goto l950;\n- l951:;\t G->pos= yypos950; G->thunkpos= yythunkpos950; if (!yymatchString(G, \"UL\")) goto l949;\n- }\n- l950:;\t if (!yy_Spnl(G)) { goto l949; }\n- l952:;\t\n- { int yypos953= G->pos, yythunkpos953= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l953; } goto l952;\n- l953:;\t G->pos= yypos953; G->thunkpos= yythunkpos953;\n- } if (!yymatchChar(G, '>')) goto l949;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenUl\")); if (!yymatchChar(G, '<')) goto l954; if (!yy_Spnl(G)) { goto l954; }\n+ { int yypos955= G->pos, yythunkpos955= G->thunkpos; if (!yymatchString(G, \"ul\")) goto l956; goto l955;\n+ l956:;\t G->pos= yypos955; G->thunkpos= yythunkpos955; if (!yymatchString(G, \"UL\")) goto l954;\n+ }\n+ l955:;\t if (!yy_Spnl(G)) { goto l954; }\n+ l957:;\t\n+ { int yypos958= G->pos, yythunkpos958= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l958; } goto l957;\n+ l958:;\t G->pos= yypos958; G->thunkpos= yythunkpos958;\n+ } if (!yymatchChar(G, '>')) goto l954;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenUl\", G->buf+G->pos));\n return 1;\n- l949:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l954:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenUl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockTable(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockTable\")); if (!yy_HtmlBlockOpenTable(G)) { goto l954; }\n- l955:;\t\n- { int yypos956= G->pos, yythunkpos956= G->thunkpos;\n- { int yypos957= G->pos, yythunkpos957= G->thunkpos; if (!yy_HtmlBlockTable(G)) { goto l958; } goto l957;\n- l958:;\t G->pos= yypos957; G->thunkpos= yythunkpos957;\n- { int yypos959= G->pos, yythunkpos959= G->thunkpos; if (!yy_HtmlBlockCloseTable(G)) { goto l959; } goto l956;\n- l959:;\t G->pos= yypos959; G->thunkpos= yythunkpos959;\n- } if (!yymatchDot(G)) goto l956;\n- }\n- l957:;\t goto l955;\n- l956:;\t G->pos= yypos956; G->thunkpos= yythunkpos956;\n- } if (!yy_HtmlBlockCloseTable(G)) { goto l954; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockTable\")); if (!yy_HtmlBlockOpenTable(G)) { goto l959; }\n+ l960:;\t\n+ { int yypos961= G->pos, yythunkpos961= G->thunkpos;\n+ { int yypos962= G->pos, yythunkpos962= G->thunkpos; if (!yy_HtmlBlockTable(G)) { goto l963; } goto l962;\n+ l963:;\t G->pos= yypos962; G->thunkpos= yythunkpos962;\n+ { int yypos964= G->pos, yythunkpos964= G->thunkpos; if (!yy_HtmlBlockCloseTable(G)) { goto l964; } goto l961;\n+ l964:;\t G->pos= yypos964; G->thunkpos= yythunkpos964;\n+ } if (!yymatchDot(G)) goto l961;\n+ }\n+ l962:;\t goto l960;\n+ l961:;\t G->pos= yypos961; G->thunkpos= yythunkpos961;\n+ } if (!yy_HtmlBlockCloseTable(G)) { goto l959; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockTable\", G->buf+G->pos));\n return 1;\n- l954:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l959:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockTable\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseTable(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTable\")); if (!yymatchChar(G, '<')) goto l960; if (!yy_Spnl(G)) { goto l960; } if (!yymatchChar(G, '\/')) goto l960;\n- { int yypos961= G->pos, yythunkpos961= G->thunkpos; if (!yymatchString(G, \"table\")) goto l962; goto l961;\n- l962:;\t G->pos= yypos961; G->thunkpos= yythunkpos961; if (!yymatchString(G, \"TABLE\")) goto l960;\n- }\n- l961:;\t if (!yy_Spnl(G)) { goto l960; } if (!yymatchChar(G, '>')) goto l960;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseTable\")); if (!yymatchChar(G, '<')) goto l965; if (!yy_Spnl(G)) { goto l965; } if (!yymatchChar(G, '\/')) goto l965;\n+ { int yypos966= G->pos, yythunkpos966= G->thunkpos; if (!yymatchString(G, \"table\")) goto l967; goto l966;\n+ l967:;\t G->pos= yypos966; G->thunkpos= yythunkpos966; if (!yymatchString(G, \"TABLE\")) goto l965;\n+ }\n+ l966:;\t if (!yy_Spnl(G)) { goto l965; } if (!yymatchChar(G, '>')) goto l965;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseTable\", G->buf+G->pos));\n return 1;\n- l960:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l965:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseTable\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenTable(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTable\")); if (!yymatchChar(G, '<')) goto l963; if (!yy_Spnl(G)) { goto l963; }\n- { int yypos964= G->pos, yythunkpos964= G->thunkpos; if (!yymatchString(G, \"table\")) goto l965; goto l964;\n- l965:;\t G->pos= yypos964; G->thunkpos= yythunkpos964; if (!yymatchString(G, \"TABLE\")) goto l963;\n- }\n- l964:;\t if (!yy_Spnl(G)) { goto l963; }\n- l966:;\t\n- { int yypos967= G->pos, yythunkpos967= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l967; } goto l966;\n- l967:;\t G->pos= yypos967; G->thunkpos= yythunkpos967;\n- } if (!yymatchChar(G, '>')) goto l963;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenTable\")); if (!yymatchChar(G, '<')) goto l968; if (!yy_Spnl(G)) { goto l968; }\n+ { int yypos969= G->pos, yythunkpos969= G->thunkpos; if (!yymatchString(G, \"table\")) goto l970; goto l969;\n+ l970:;\t G->pos= yypos969; G->thunkpos= yythunkpos969; if (!yymatchString(G, \"TABLE\")) goto l968;\n+ }\n+ l969:;\t if (!yy_Spnl(G)) { goto l968; }\n+ l971:;\t\n+ { int yypos972= G->pos, yythunkpos972= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l972; } goto l971;\n+ l972:;\t G->pos= yypos972; G->thunkpos= yythunkpos972;\n+ } if (!yymatchChar(G, '>')) goto l968;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenTable\", G->buf+G->pos));\n return 1;\n- l963:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l968:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenTable\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockPre(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockPre\")); if (!yy_HtmlBlockOpenPre(G)) { goto l968; }\n- l969:;\t\n- { int yypos970= G->pos, yythunkpos970= G->thunkpos;\n- { int yypos971= G->pos, yythunkpos971= G->thunkpos; if (!yy_HtmlBlockPre(G)) { goto l972; } goto l971;\n- l972:;\t G->pos= yypos971; G->thunkpos= yythunkpos971;\n- { int yypos973= G->pos, yythunkpos973= G->thunkpos; if (!yy_HtmlBlockClosePre(G)) { goto l973; } goto l970;\n- l973:;\t G->pos= yypos973; G->thunkpos= yythunkpos973;\n- } if (!yymatchDot(G)) goto l970;\n- }\n- l971:;\t goto l969;\n- l970:;\t G->pos= yypos970; G->thunkpos= yythunkpos970;\n- } if (!yy_HtmlBlockClosePre(G)) { goto l968; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockPre\")); if (!yy_HtmlBlockOpenPre(G)) { goto l973; }\n+ l974:;\t\n+ { int yypos975= G->pos, yythunkpos975= G->thunkpos;\n+ { int yypos976= G->pos, yythunkpos976= G->thunkpos; if (!yy_HtmlBlockPre(G)) { goto l977; } goto l976;\n+ l977:;\t G->pos= yypos976; G->thunkpos= yythunkpos976;\n+ { int yypos978= G->pos, yythunkpos978= G->thunkpos; if (!yy_HtmlBlockClosePre(G)) { goto l978; } goto l975;\n+ l978:;\t G->pos= yypos978; G->thunkpos= yythunkpos978;\n+ } if (!yymatchDot(G)) goto l975;\n+ }\n+ l976:;\t goto l974;\n+ l975:;\t G->pos= yypos975; G->thunkpos= yythunkpos975;\n+ } if (!yy_HtmlBlockClosePre(G)) { goto l973; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockPre\", G->buf+G->pos));\n return 1;\n- l968:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l973:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockPre\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockClosePre(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockClosePre\")); if (!yymatchChar(G, '<')) goto l974; if (!yy_Spnl(G)) { goto l974; } if (!yymatchChar(G, '\/')) goto l974;\n- { int yypos975= G->pos, yythunkpos975= G->thunkpos; if (!yymatchString(G, \"pre\")) goto l976; goto l975;\n- l976:;\t G->pos= yypos975; G->thunkpos= yythunkpos975; if (!yymatchString(G, \"PRE\")) goto l974;\n- }\n- l975:;\t if (!yy_Spnl(G)) { goto l974; } if (!yymatchChar(G, '>')) goto l974;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockClosePre\")); if (!yymatchChar(G, '<')) goto l979; if (!yy_Spnl(G)) { goto l979; } if (!yymatchChar(G, '\/')) goto l979;\n+ { int yypos980= G->pos, yythunkpos980= G->thunkpos; if (!yymatchString(G, \"pre\")) goto l981; goto l980;\n+ l981:;\t G->pos= yypos980; G->thunkpos= yythunkpos980; if (!yymatchString(G, \"PRE\")) goto l979;\n+ }\n+ l980:;\t if (!yy_Spnl(G)) { goto l979; } if (!yymatchChar(G, '>')) goto l979;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockClosePre\", G->buf+G->pos));\n return 1;\n- l974:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l979:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockClosePre\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenPre(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenPre\")); if (!yymatchChar(G, '<')) goto l977; if (!yy_Spnl(G)) { goto l977; }\n- { int yypos978= G->pos, yythunkpos978= G->thunkpos; if (!yymatchString(G, \"pre\")) goto l979; goto l978;\n- l979:;\t G->pos= yypos978; G->thunkpos= yythunkpos978; if (!yymatchString(G, \"PRE\")) goto l977;\n- }\n- l978:;\t if (!yy_Spnl(G)) { goto l977; }\n- l980:;\t\n- { int yypos981= G->pos, yythunkpos981= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l981; } goto l980;\n- l981:;\t G->pos= yypos981; G->thunkpos= yythunkpos981;\n- } if (!yymatchChar(G, '>')) goto l977;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenPre\")); if (!yymatchChar(G, '<')) goto l982; if (!yy_Spnl(G)) { goto l982; }\n+ { int yypos983= G->pos, yythunkpos983= G->thunkpos; if (!yymatchString(G, \"pre\")) goto l984; goto l983;\n+ l984:;\t G->pos= yypos983; G->thunkpos= yythunkpos983; if (!yymatchString(G, \"PRE\")) goto l982;\n+ }\n+ l983:;\t if (!yy_Spnl(G)) { goto l982; }\n+ l985:;\t\n+ { int yypos986= G->pos, yythunkpos986= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l986; } goto l985;\n+ l986:;\t G->pos= yypos986; G->thunkpos= yythunkpos986;\n+ } if (!yymatchChar(G, '>')) goto l982;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenPre\", G->buf+G->pos));\n return 1;\n- l977:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l982:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenPre\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockP(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockP\")); if (!yy_HtmlBlockOpenP(G)) { goto l982; }\n- l983:;\t\n- { int yypos984= G->pos, yythunkpos984= G->thunkpos;\n- { int yypos985= G->pos, yythunkpos985= G->thunkpos; if (!yy_HtmlBlockP(G)) { goto l986; } goto l985;\n- l986:;\t G->pos= yypos985; G->thunkpos= yythunkpos985;\n- { int yypos987= G->pos, yythunkpos987= G->thunkpos; if (!yy_HtmlBlockCloseP(G)) { goto l987; } goto l984;\n- l987:;\t G->pos= yypos987; G->thunkpos= yythunkpos987;\n- } if (!yymatchDot(G)) goto l984;\n- }\n- l985:;\t goto l983;\n- l984:;\t G->pos= yypos984; G->thunkpos= yythunkpos984;\n- } if (!yy_HtmlBlockCloseP(G)) { goto l982; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockP\")); if (!yy_HtmlBlockOpenP(G)) { goto l987; }\n+ l988:;\t\n+ { int yypos989= G->pos, yythunkpos989= G->thunkpos;\n+ { int yypos990= G->pos, yythunkpos990= G->thunkpos; if (!yy_HtmlBlockP(G)) { goto l991; } goto l990;\n+ l991:;\t G->pos= yypos990; G->thunkpos= yythunkpos990;\n+ { int yypos992= G->pos, yythunkpos992= G->thunkpos; if (!yy_HtmlBlockCloseP(G)) { goto l992; } goto l989;\n+ l992:;\t G->pos= yypos992; G->thunkpos= yythunkpos992;\n+ } if (!yymatchDot(G)) goto l989;\n+ }\n+ l990:;\t goto l988;\n+ l989:;\t G->pos= yypos989; G->thunkpos= yythunkpos989;\n+ } if (!yy_HtmlBlockCloseP(G)) { goto l987; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockP\", G->buf+G->pos));\n return 1;\n- l982:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l987:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockP\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseP(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseP\")); if (!yymatchChar(G, '<')) goto l988; if (!yy_Spnl(G)) { goto l988; } if (!yymatchChar(G, '\/')) goto l988;\n- { int yypos989= G->pos, yythunkpos989= G->thunkpos; if (!yymatchChar(G, 'p')) goto l990; goto l989;\n- l990:;\t G->pos= yypos989; G->thunkpos= yythunkpos989; if (!yymatchChar(G, 'P')) goto l988;\n- }\n- l989:;\t if (!yy_Spnl(G)) { goto l988; } if (!yymatchChar(G, '>')) goto l988;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseP\")); if (!yymatchChar(G, '<')) goto l993; if (!yy_Spnl(G)) { goto l993; } if (!yymatchChar(G, '\/')) goto l993;\n+ { int yypos994= G->pos, yythunkpos994= G->thunkpos; if (!yymatchChar(G, 'p')) goto l995; goto l994;\n+ l995:;\t G->pos= yypos994; G->thunkpos= yythunkpos994; if (!yymatchChar(G, 'P')) goto l993;\n+ }\n+ l994:;\t if (!yy_Spnl(G)) { goto l993; } if (!yymatchChar(G, '>')) goto l993;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseP\", G->buf+G->pos));\n return 1;\n- l988:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l993:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseP\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenP(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenP\")); if (!yymatchChar(G, '<')) goto l991; if (!yy_Spnl(G)) { goto l991; }\n- { int yypos992= G->pos, yythunkpos992= G->thunkpos; if (!yymatchChar(G, 'p')) goto l993; goto l992;\n- l993:;\t G->pos= yypos992; G->thunkpos= yythunkpos992; if (!yymatchChar(G, 'P')) goto l991;\n- }\n- l992:;\t if (!yy_Spnl(G)) { goto l991; }\n- l994:;\t\n- { int yypos995= G->pos, yythunkpos995= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l995; } goto l994;\n- l995:;\t G->pos= yypos995; G->thunkpos= yythunkpos995;\n- } if (!yymatchChar(G, '>')) goto l991;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenP\")); if (!yymatchChar(G, '<')) goto l996; if (!yy_Spnl(G)) { goto l996; }\n+ { int yypos997= G->pos, yythunkpos997= G->thunkpos; if (!yymatchChar(G, 'p')) goto l998; goto l997;\n+ l998:;\t G->pos= yypos997; G->thunkpos= yythunkpos997; if (!yymatchChar(G, 'P')) goto l996;\n+ }\n+ l997:;\t if (!yy_Spnl(G)) { goto l996; }\n+ l999:;\t\n+ { int yypos1000= G->pos, yythunkpos1000= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1000; } goto l999;\n+ l1000:;\t G->pos= yypos1000; G->thunkpos= yythunkpos1000;\n+ } if (!yymatchChar(G, '>')) goto l996;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenP\", G->buf+G->pos));\n return 1;\n- l991:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l996:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenP\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOl\")); if (!yy_HtmlBlockOpenOl(G)) { goto l996; }\n- l997:;\t\n- { int yypos998= G->pos, yythunkpos998= G->thunkpos;\n- { int yypos999= G->pos, yythunkpos999= G->thunkpos; if (!yy_HtmlBlockOl(G)) { goto l1000; } goto l999;\n- l1000:;\t G->pos= yypos999; G->thunkpos= yythunkpos999;\n- { int yypos1001= G->pos, yythunkpos1001= G->thunkpos; if (!yy_HtmlBlockCloseOl(G)) { goto l1001; } goto l998;\n- l1001:;\t G->pos= yypos1001; G->thunkpos= yythunkpos1001;\n- } if (!yymatchDot(G)) goto l998;\n- }\n- l999:;\t goto l997;\n- l998:;\t G->pos= yypos998; G->thunkpos= yythunkpos998;\n- } if (!yy_HtmlBlockCloseOl(G)) { goto l996; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOl\")); if (!yy_HtmlBlockOpenOl(G)) { goto l1001; }\n+ l1002:;\t\n+ { int yypos1003= G->pos, yythunkpos1003= G->thunkpos;\n+ { int yypos1004= G->pos, yythunkpos1004= G->thunkpos; if (!yy_HtmlBlockOl(G)) { goto l1005; } goto l1004;\n+ l1005:;\t G->pos= yypos1004; G->thunkpos= yythunkpos1004;\n+ { int yypos1006= G->pos, yythunkpos1006= G->thunkpos; if (!yy_HtmlBlockCloseOl(G)) { goto l1006; } goto l1003;\n+ l1006:;\t G->pos= yypos1006; G->thunkpos= yythunkpos1006;\n+ } if (!yymatchDot(G)) goto l1003;\n+ }\n+ l1004:;\t goto l1002;\n+ l1003:;\t G->pos= yypos1003; G->thunkpos= yythunkpos1003;\n+ } if (!yy_HtmlBlockCloseOl(G)) { goto l1001; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOl\", G->buf+G->pos));\n return 1;\n- l996:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1001:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseOl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseOl\")); if (!yymatchChar(G, '<')) goto l1002; if (!yy_Spnl(G)) { goto l1002; } if (!yymatchChar(G, '\/')) goto l1002;\n- { int yypos1003= G->pos, yythunkpos1003= G->thunkpos; if (!yymatchString(G, \"ol\")) goto l1004; goto l1003;\n- l1004:;\t G->pos= yypos1003; G->thunkpos= yythunkpos1003; if (!yymatchString(G, \"OL\")) goto l1002;\n- }\n- l1003:;\t if (!yy_Spnl(G)) { goto l1002; } if (!yymatchChar(G, '>')) goto l1002;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseOl\")); if (!yymatchChar(G, '<')) goto l1007; if (!yy_Spnl(G)) { goto l1007; } if (!yymatchChar(G, '\/')) goto l1007;\n+ { int yypos1008= G->pos, yythunkpos1008= G->thunkpos; if (!yymatchString(G, \"ol\")) goto l1009; goto l1008;\n+ l1009:;\t G->pos= yypos1008; G->thunkpos= yythunkpos1008; if (!yymatchString(G, \"OL\")) goto l1007;\n+ }\n+ l1008:;\t if (!yy_Spnl(G)) { goto l1007; } if (!yymatchChar(G, '>')) goto l1007;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseOl\", G->buf+G->pos));\n return 1;\n- l1002:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1007:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseOl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenOl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenOl\")); if (!yymatchChar(G, '<')) goto l1005; if (!yy_Spnl(G)) { goto l1005; }\n- { int yypos1006= G->pos, yythunkpos1006= G->thunkpos; if (!yymatchString(G, \"ol\")) goto l1007; goto l1006;\n- l1007:;\t G->pos= yypos1006; G->thunkpos= yythunkpos1006; if (!yymatchString(G, \"OL\")) goto l1005;\n- }\n- l1006:;\t if (!yy_Spnl(G)) { goto l1005; }\n- l1008:;\t\n- { int yypos1009= G->pos, yythunkpos1009= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1009; } goto l1008;\n- l1009:;\t G->pos= yypos1009; G->thunkpos= yythunkpos1009;\n- } if (!yymatchChar(G, '>')) goto l1005;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenOl\")); if (!yymatchChar(G, '<')) goto l1010; if (!yy_Spnl(G)) { goto l1010; }\n+ { int yypos1011= G->pos, yythunkpos1011= G->thunkpos; if (!yymatchString(G, \"ol\")) goto l1012; goto l1011;\n+ l1012:;\t G->pos= yypos1011; G->thunkpos= yythunkpos1011; if (!yymatchString(G, \"OL\")) goto l1010;\n+ }\n+ l1011:;\t if (!yy_Spnl(G)) { goto l1010; }\n+ l1013:;\t\n+ { int yypos1014= G->pos, yythunkpos1014= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1014; } goto l1013;\n+ l1014:;\t G->pos= yypos1014; G->thunkpos= yythunkpos1014;\n+ } if (!yymatchChar(G, '>')) goto l1010;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenOl\", G->buf+G->pos));\n return 1;\n- l1005:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1010:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenOl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockNoscript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockNoscript\")); if (!yy_HtmlBlockOpenNoscript(G)) { goto l1010; }\n- l1011:;\t\n- { int yypos1012= G->pos, yythunkpos1012= G->thunkpos;\n- { int yypos1013= G->pos, yythunkpos1013= G->thunkpos; if (!yy_HtmlBlockNoscript(G)) { goto l1014; } goto l1013;\n- l1014:;\t G->pos= yypos1013; G->thunkpos= yythunkpos1013;\n- { int yypos1015= G->pos, yythunkpos1015= G->thunkpos; if (!yy_HtmlBlockCloseNoscript(G)) { goto l1015; } goto l1012;\n- l1015:;\t G->pos= yypos1015; G->thunkpos= yythunkpos1015;\n- } if (!yymatchDot(G)) goto l1012;\n- }\n- l1013:;\t goto l1011;\n- l1012:;\t G->pos= yypos1012; G->thunkpos= yythunkpos1012;\n- } if (!yy_HtmlBlockCloseNoscript(G)) { goto l1010; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockNoscript\")); if (!yy_HtmlBlockOpenNoscript(G)) { goto l1015; }\n+ l1016:;\t\n+ { int yypos1017= G->pos, yythunkpos1017= G->thunkpos;\n+ { int yypos1018= G->pos, yythunkpos1018= G->thunkpos; if (!yy_HtmlBlockNoscript(G)) { goto l1019; } goto l1018;\n+ l1019:;\t G->pos= yypos1018; G->thunkpos= yythunkpos1018;\n+ { int yypos1020= G->pos, yythunkpos1020= G->thunkpos; if (!yy_HtmlBlockCloseNoscript(G)) { goto l1020; } goto l1017;\n+ l1020:;\t G->pos= yypos1020; G->thunkpos= yythunkpos1020;\n+ } if (!yymatchDot(G)) goto l1017;\n+ }\n+ l1018:;\t goto l1016;\n+ l1017:;\t G->pos= yypos1017; G->thunkpos= yythunkpos1017;\n+ } if (!yy_HtmlBlockCloseNoscript(G)) { goto l1015; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockNoscript\", G->buf+G->pos));\n return 1;\n- l1010:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1015:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockNoscript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseNoscript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseNoscript\")); if (!yymatchChar(G, '<')) goto l1016; if (!yy_Spnl(G)) { goto l1016; } if (!yymatchChar(G, '\/')) goto l1016;\n- { int yypos1017= G->pos, yythunkpos1017= G->thunkpos; if (!yymatchString(G, \"noscript\")) goto l1018; goto l1017;\n- l1018:;\t G->pos= yypos1017; G->thunkpos= yythunkpos1017; if (!yymatchString(G, \"NOSCRIPT\")) goto l1016;\n- }\n- l1017:;\t if (!yy_Spnl(G)) { goto l1016; } if (!yymatchChar(G, '>')) goto l1016;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseNoscript\")); if (!yymatchChar(G, '<')) goto l1021; if (!yy_Spnl(G)) { goto l1021; } if (!yymatchChar(G, '\/')) goto l1021;\n+ { int yypos1022= G->pos, yythunkpos1022= G->thunkpos; if (!yymatchString(G, \"noscript\")) goto l1023; goto l1022;\n+ l1023:;\t G->pos= yypos1022; G->thunkpos= yythunkpos1022; if (!yymatchString(G, \"NOSCRIPT\")) goto l1021;\n+ }\n+ l1022:;\t if (!yy_Spnl(G)) { goto l1021; } if (!yymatchChar(G, '>')) goto l1021;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseNoscript\", G->buf+G->pos));\n return 1;\n- l1016:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1021:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseNoscript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenNoscript(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenNoscript\")); if (!yymatchChar(G, '<')) goto l1019; if (!yy_Spnl(G)) { goto l1019; }\n- { int yypos1020= G->pos, yythunkpos1020= G->thunkpos; if (!yymatchString(G, \"noscript\")) goto l1021; goto l1020;\n- l1021:;\t G->pos= yypos1020; G->thunkpos= yythunkpos1020; if (!yymatchString(G, \"NOSCRIPT\")) goto l1019;\n- }\n- l1020:;\t if (!yy_Spnl(G)) { goto l1019; }\n- l1022:;\t\n- { int yypos1023= G->pos, yythunkpos1023= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1023; } goto l1022;\n- l1023:;\t G->pos= yypos1023; G->thunkpos= yythunkpos1023;\n- } if (!yymatchChar(G, '>')) goto l1019;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenNoscript\")); if (!yymatchChar(G, '<')) goto l1024; if (!yy_Spnl(G)) { goto l1024; }\n+ { int yypos1025= G->pos, yythunkpos1025= G->thunkpos; if (!yymatchString(G, \"noscript\")) goto l1026; goto l1025;\n+ l1026:;\t G->pos= yypos1025; G->thunkpos= yythunkpos1025; if (!yymatchString(G, \"NOSCRIPT\")) goto l1024;\n+ }\n+ l1025:;\t if (!yy_Spnl(G)) { goto l1024; }\n+ l1027:;\t\n+ { int yypos1028= G->pos, yythunkpos1028= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1028; } goto l1027;\n+ l1028:;\t G->pos= yypos1028; G->thunkpos= yythunkpos1028;\n+ } if (!yymatchChar(G, '>')) goto l1024;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenNoscript\", G->buf+G->pos));\n return 1;\n- l1019:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1024:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenNoscript\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockNoframes(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockNoframes\")); if (!yy_HtmlBlockOpenNoframes(G)) { goto l1024; }\n- l1025:;\t\n- { int yypos1026= G->pos, yythunkpos1026= G->thunkpos;\n- { int yypos1027= G->pos, yythunkpos1027= G->thunkpos; if (!yy_HtmlBlockNoframes(G)) { goto l1028; } goto l1027;\n- l1028:;\t G->pos= yypos1027; G->thunkpos= yythunkpos1027;\n- { int yypos1029= G->pos, yythunkpos1029= G->thunkpos; if (!yy_HtmlBlockCloseNoframes(G)) { goto l1029; } goto l1026;\n- l1029:;\t G->pos= yypos1029; G->thunkpos= yythunkpos1029;\n- } if (!yymatchDot(G)) goto l1026;\n- }\n- l1027:;\t goto l1025;\n- l1026:;\t G->pos= yypos1026; G->thunkpos= yythunkpos1026;\n- } if (!yy_HtmlBlockCloseNoframes(G)) { goto l1024; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockNoframes\")); if (!yy_HtmlBlockOpenNoframes(G)) { goto l1029; }\n+ l1030:;\t\n+ { int yypos1031= G->pos, yythunkpos1031= G->thunkpos;\n+ { int yypos1032= G->pos, yythunkpos1032= G->thunkpos; if (!yy_HtmlBlockNoframes(G)) { goto l1033; } goto l1032;\n+ l1033:;\t G->pos= yypos1032; G->thunkpos= yythunkpos1032;\n+ { int yypos1034= G->pos, yythunkpos1034= G->thunkpos; if (!yy_HtmlBlockCloseNoframes(G)) { goto l1034; } goto l1031;\n+ l1034:;\t G->pos= yypos1034; G->thunkpos= yythunkpos1034;\n+ } if (!yymatchDot(G)) goto l1031;\n+ }\n+ l1032:;\t goto l1030;\n+ l1031:;\t G->pos= yypos1031; G->thunkpos= yythunkpos1031;\n+ } if (!yy_HtmlBlockCloseNoframes(G)) { goto l1029; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockNoframes\", G->buf+G->pos));\n return 1;\n- l1024:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1029:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockNoframes\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseNoframes(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseNoframes\")); if (!yymatchChar(G, '<')) goto l1030; if (!yy_Spnl(G)) { goto l1030; } if (!yymatchChar(G, '\/')) goto l1030;\n- { int yypos1031= G->pos, yythunkpos1031= G->thunkpos; if (!yymatchString(G, \"noframes\")) goto l1032; goto l1031;\n- l1032:;\t G->pos= yypos1031; G->thunkpos= yythunkpos1031; if (!yymatchString(G, \"NOFRAMES\")) goto l1030;\n- }\n- l1031:;\t if (!yy_Spnl(G)) { goto l1030; } if (!yymatchChar(G, '>')) goto l1030;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseNoframes\")); if (!yymatchChar(G, '<')) goto l1035; if (!yy_Spnl(G)) { goto l1035; } if (!yymatchChar(G, '\/')) goto l1035;\n+ { int yypos1036= G->pos, yythunkpos1036= G->thunkpos; if (!yymatchString(G, \"noframes\")) goto l1037; goto l1036;\n+ l1037:;\t G->pos= yypos1036; G->thunkpos= yythunkpos1036; if (!yymatchString(G, \"NOFRAMES\")) goto l1035;\n+ }\n+ l1036:;\t if (!yy_Spnl(G)) { goto l1035; } if (!yymatchChar(G, '>')) goto l1035;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseNoframes\", G->buf+G->pos));\n return 1;\n- l1030:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1035:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseNoframes\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenNoframes(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenNoframes\")); if (!yymatchChar(G, '<')) goto l1033; if (!yy_Spnl(G)) { goto l1033; }\n- { int yypos1034= G->pos, yythunkpos1034= G->thunkpos; if (!yymatchString(G, \"noframes\")) goto l1035; goto l1034;\n- l1035:;\t G->pos= yypos1034; G->thunkpos= yythunkpos1034; if (!yymatchString(G, \"NOFRAMES\")) goto l1033;\n- }\n- l1034:;\t if (!yy_Spnl(G)) { goto l1033; }\n- l1036:;\t\n- { int yypos1037= G->pos, yythunkpos1037= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1037; } goto l1036;\n- l1037:;\t G->pos= yypos1037; G->thunkpos= yythunkpos1037;\n- } if (!yymatchChar(G, '>')) goto l1033;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenNoframes\")); if (!yymatchChar(G, '<')) goto l1038; if (!yy_Spnl(G)) { goto l1038; }\n+ { int yypos1039= G->pos, yythunkpos1039= G->thunkpos; if (!yymatchString(G, \"noframes\")) goto l1040; goto l1039;\n+ l1040:;\t G->pos= yypos1039; G->thunkpos= yythunkpos1039; if (!yymatchString(G, \"NOFRAMES\")) goto l1038;\n+ }\n+ l1039:;\t if (!yy_Spnl(G)) { goto l1038; }\n+ l1041:;\t\n+ { int yypos1042= G->pos, yythunkpos1042= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1042; } goto l1041;\n+ l1042:;\t G->pos= yypos1042; G->thunkpos= yythunkpos1042;\n+ } if (!yymatchChar(G, '>')) goto l1038;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenNoframes\", G->buf+G->pos));\n return 1;\n- l1033:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1038:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenNoframes\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockMenu(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockMenu\")); if (!yy_HtmlBlockOpenMenu(G)) { goto l1038; }\n- l1039:;\t\n- { int yypos1040= G->pos, yythunkpos1040= G->thunkpos;\n- { int yypos1041= G->pos, yythunkpos1041= G->thunkpos; if (!yy_HtmlBlockMenu(G)) { goto l1042; } goto l1041;\n- l1042:;\t G->pos= yypos1041; G->thunkpos= yythunkpos1041;\n- { int yypos1043= G->pos, yythunkpos1043= G->thunkpos; if (!yy_HtmlBlockCloseMenu(G)) { goto l1043; } goto l1040;\n- l1043:;\t G->pos= yypos1043; G->thunkpos= yythunkpos1043;\n- } if (!yymatchDot(G)) goto l1040;\n- }\n- l1041:;\t goto l1039;\n- l1040:;\t G->pos= yypos1040; G->thunkpos= yythunkpos1040;\n- } if (!yy_HtmlBlockCloseMenu(G)) { goto l1038; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockMenu\")); if (!yy_HtmlBlockOpenMenu(G)) { goto l1043; }\n+ l1044:;\t\n+ { int yypos1045= G->pos, yythunkpos1045= G->thunkpos;\n+ { int yypos1046= G->pos, yythunkpos1046= G->thunkpos; if (!yy_HtmlBlockMenu(G)) { goto l1047; } goto l1046;\n+ l1047:;\t G->pos= yypos1046; G->thunkpos= yythunkpos1046;\n+ { int yypos1048= G->pos, yythunkpos1048= G->thunkpos; if (!yy_HtmlBlockCloseMenu(G)) { goto l1048; } goto l1045;\n+ l1048:;\t G->pos= yypos1048; G->thunkpos= yythunkpos1048;\n+ } if (!yymatchDot(G)) goto l1045;\n+ }\n+ l1046:;\t goto l1044;\n+ l1045:;\t G->pos= yypos1045; G->thunkpos= yythunkpos1045;\n+ } if (!yy_HtmlBlockCloseMenu(G)) { goto l1043; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockMenu\", G->buf+G->pos));\n return 1;\n- l1038:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1043:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockMenu\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseMenu(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseMenu\")); if (!yymatchChar(G, '<')) goto l1044; if (!yy_Spnl(G)) { goto l1044; } if (!yymatchChar(G, '\/')) goto l1044;\n- { int yypos1045= G->pos, yythunkpos1045= G->thunkpos; if (!yymatchString(G, \"menu\")) goto l1046; goto l1045;\n- l1046:;\t G->pos= yypos1045; G->thunkpos= yythunkpos1045; if (!yymatchString(G, \"MENU\")) goto l1044;\n- }\n- l1045:;\t if (!yy_Spnl(G)) { goto l1044; } if (!yymatchChar(G, '>')) goto l1044;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseMenu\")); if (!yymatchChar(G, '<')) goto l1049; if (!yy_Spnl(G)) { goto l1049; } if (!yymatchChar(G, '\/')) goto l1049;\n+ { int yypos1050= G->pos, yythunkpos1050= G->thunkpos; if (!yymatchString(G, \"menu\")) goto l1051; goto l1050;\n+ l1051:;\t G->pos= yypos1050; G->thunkpos= yythunkpos1050; if (!yymatchString(G, \"MENU\")) goto l1049;\n+ }\n+ l1050:;\t if (!yy_Spnl(G)) { goto l1049; } if (!yymatchChar(G, '>')) goto l1049;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseMenu\", G->buf+G->pos));\n return 1;\n- l1044:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1049:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseMenu\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenMenu(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenMenu\")); if (!yymatchChar(G, '<')) goto l1047; if (!yy_Spnl(G)) { goto l1047; }\n- { int yypos1048= G->pos, yythunkpos1048= G->thunkpos; if (!yymatchString(G, \"menu\")) goto l1049; goto l1048;\n- l1049:;\t G->pos= yypos1048; G->thunkpos= yythunkpos1048; if (!yymatchString(G, \"MENU\")) goto l1047;\n- }\n- l1048:;\t if (!yy_Spnl(G)) { goto l1047; }\n- l1050:;\t\n- { int yypos1051= G->pos, yythunkpos1051= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1051; } goto l1050;\n- l1051:;\t G->pos= yypos1051; G->thunkpos= yythunkpos1051;\n- } if (!yymatchChar(G, '>')) goto l1047;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenMenu\")); if (!yymatchChar(G, '<')) goto l1052; if (!yy_Spnl(G)) { goto l1052; }\n+ { int yypos1053= G->pos, yythunkpos1053= G->thunkpos; if (!yymatchString(G, \"menu\")) goto l1054; goto l1053;\n+ l1054:;\t G->pos= yypos1053; G->thunkpos= yythunkpos1053; if (!yymatchString(G, \"MENU\")) goto l1052;\n+ }\n+ l1053:;\t if (!yy_Spnl(G)) { goto l1052; }\n+ l1055:;\t\n+ { int yypos1056= G->pos, yythunkpos1056= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1056; } goto l1055;\n+ l1056:;\t G->pos= yypos1056; G->thunkpos= yythunkpos1056;\n+ } if (!yymatchChar(G, '>')) goto l1052;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenMenu\", G->buf+G->pos));\n return 1;\n- l1047:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1052:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenMenu\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH6(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH6\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1052; if (!yy_LocMarker(G)) { goto l1052; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH6(G)) { goto l1052; }\n- l1053:;\t\n- { int yypos1054= G->pos, yythunkpos1054= G->thunkpos;\n- { int yypos1055= G->pos, yythunkpos1055= G->thunkpos; if (!yy_HtmlBlockH6(G)) { goto l1056; } goto l1055;\n- l1056:;\t G->pos= yypos1055; G->thunkpos= yythunkpos1055;\n- { int yypos1057= G->pos, yythunkpos1057= G->thunkpos; if (!yy_HtmlBlockCloseH6(G)) { goto l1057; } goto l1054;\n- l1057:;\t G->pos= yypos1057; G->thunkpos= yythunkpos1057;\n- } if (!yymatchDot(G)) goto l1054;\n- }\n- l1055:;\t goto l1053;\n- l1054:;\t G->pos= yypos1054; G->thunkpos= yythunkpos1054;\n- } if (!yy_HtmlBlockCloseH6(G)) { goto l1052; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1052; yyDo(G, yy_1_HtmlBlockH6, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH6\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1057; if (!yy_LocMarker(G)) { goto l1057; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH6(G)) { goto l1057; }\n+ l1058:;\t\n+ { int yypos1059= G->pos, yythunkpos1059= G->thunkpos;\n+ { int yypos1060= G->pos, yythunkpos1060= G->thunkpos; if (!yy_HtmlBlockH6(G)) { goto l1061; } goto l1060;\n+ l1061:;\t G->pos= yypos1060; G->thunkpos= yythunkpos1060;\n+ { int yypos1062= G->pos, yythunkpos1062= G->thunkpos; if (!yy_HtmlBlockCloseH6(G)) { goto l1062; } goto l1059;\n+ l1062:;\t G->pos= yypos1062; G->thunkpos= yythunkpos1062;\n+ } if (!yymatchDot(G)) goto l1059;\n+ }\n+ l1060:;\t goto l1058;\n+ l1059:;\t G->pos= yypos1059; G->thunkpos= yythunkpos1059;\n+ } if (!yy_HtmlBlockCloseH6(G)) { goto l1057; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1057; yyDo(G, yy_1_HtmlBlockH6, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH6\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1052:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1057:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH6\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH6(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH6\")); if (!yymatchChar(G, '<')) goto l1058; if (!yy_Spnl(G)) { goto l1058; } if (!yymatchChar(G, '\/')) goto l1058;\n- { int yypos1059= G->pos, yythunkpos1059= G->thunkpos; if (!yymatchString(G, \"h6\")) goto l1060; goto l1059;\n- l1060:;\t G->pos= yypos1059; G->thunkpos= yythunkpos1059; if (!yymatchString(G, \"H6\")) goto l1058;\n- }\n- l1059:;\t if (!yy_Spnl(G)) { goto l1058; } if (!yymatchChar(G, '>')) goto l1058;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH6\")); if (!yymatchChar(G, '<')) goto l1063; if (!yy_Spnl(G)) { goto l1063; } if (!yymatchChar(G, '\/')) goto l1063;\n+ { int yypos1064= G->pos, yythunkpos1064= G->thunkpos; if (!yymatchString(G, \"h6\")) goto l1065; goto l1064;\n+ l1065:;\t G->pos= yypos1064; G->thunkpos= yythunkpos1064; if (!yymatchString(G, \"H6\")) goto l1063;\n+ }\n+ l1064:;\t if (!yy_Spnl(G)) { goto l1063; } if (!yymatchChar(G, '>')) goto l1063;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH6\", G->buf+G->pos));\n return 1;\n- l1058:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1063:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH6\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH6(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH6\")); if (!yymatchChar(G, '<')) goto l1061; if (!yy_Spnl(G)) { goto l1061; }\n- { int yypos1062= G->pos, yythunkpos1062= G->thunkpos; if (!yymatchString(G, \"h6\")) goto l1063; goto l1062;\n- l1063:;\t G->pos= yypos1062; G->thunkpos= yythunkpos1062; if (!yymatchString(G, \"H6\")) goto l1061;\n- }\n- l1062:;\t if (!yy_Spnl(G)) { goto l1061; }\n- l1064:;\t\n- { int yypos1065= G->pos, yythunkpos1065= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1065; } goto l1064;\n- l1065:;\t G->pos= yypos1065; G->thunkpos= yythunkpos1065;\n- } if (!yymatchChar(G, '>')) goto l1061;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH6\")); if (!yymatchChar(G, '<')) goto l1066; if (!yy_Spnl(G)) { goto l1066; }\n+ { int yypos1067= G->pos, yythunkpos1067= G->thunkpos; if (!yymatchString(G, \"h6\")) goto l1068; goto l1067;\n+ l1068:;\t G->pos= yypos1067; G->thunkpos= yythunkpos1067; if (!yymatchString(G, \"H6\")) goto l1066;\n+ }\n+ l1067:;\t if (!yy_Spnl(G)) { goto l1066; }\n+ l1069:;\t\n+ { int yypos1070= G->pos, yythunkpos1070= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1070; } goto l1069;\n+ l1070:;\t G->pos= yypos1070; G->thunkpos= yythunkpos1070;\n+ } if (!yymatchChar(G, '>')) goto l1066;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH6\", G->buf+G->pos));\n return 1;\n- l1061:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1066:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH6\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH5(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH5\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1066; if (!yy_LocMarker(G)) { goto l1066; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH5(G)) { goto l1066; }\n- l1067:;\t\n- { int yypos1068= G->pos, yythunkpos1068= G->thunkpos;\n- { int yypos1069= G->pos, yythunkpos1069= G->thunkpos; if (!yy_HtmlBlockH5(G)) { goto l1070; } goto l1069;\n- l1070:;\t G->pos= yypos1069; G->thunkpos= yythunkpos1069;\n- { int yypos1071= G->pos, yythunkpos1071= G->thunkpos; if (!yy_HtmlBlockCloseH5(G)) { goto l1071; } goto l1068;\n- l1071:;\t G->pos= yypos1071; G->thunkpos= yythunkpos1071;\n- } if (!yymatchDot(G)) goto l1068;\n- }\n- l1069:;\t goto l1067;\n- l1068:;\t G->pos= yypos1068; G->thunkpos= yythunkpos1068;\n- } if (!yy_HtmlBlockCloseH5(G)) { goto l1066; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1066; yyDo(G, yy_1_HtmlBlockH5, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH5\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1071; if (!yy_LocMarker(G)) { goto l1071; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH5(G)) { goto l1071; }\n+ l1072:;\t\n+ { int yypos1073= G->pos, yythunkpos1073= G->thunkpos;\n+ { int yypos1074= G->pos, yythunkpos1074= G->thunkpos; if (!yy_HtmlBlockH5(G)) { goto l1075; } goto l1074;\n+ l1075:;\t G->pos= yypos1074; G->thunkpos= yythunkpos1074;\n+ { int yypos1076= G->pos, yythunkpos1076= G->thunkpos; if (!yy_HtmlBlockCloseH5(G)) { goto l1076; } goto l1073;\n+ l1076:;\t G->pos= yypos1076; G->thunkpos= yythunkpos1076;\n+ } if (!yymatchDot(G)) goto l1073;\n+ }\n+ l1074:;\t goto l1072;\n+ l1073:;\t G->pos= yypos1073; G->thunkpos= yythunkpos1073;\n+ } if (!yy_HtmlBlockCloseH5(G)) { goto l1071; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1071; yyDo(G, yy_1_HtmlBlockH5, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH5\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1066:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1071:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH5\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH5(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH5\")); if (!yymatchChar(G, '<')) goto l1072; if (!yy_Spnl(G)) { goto l1072; } if (!yymatchChar(G, '\/')) goto l1072;\n- { int yypos1073= G->pos, yythunkpos1073= G->thunkpos; if (!yymatchString(G, \"h5\")) goto l1074; goto l1073;\n- l1074:;\t G->pos= yypos1073; G->thunkpos= yythunkpos1073; if (!yymatchString(G, \"H5\")) goto l1072;\n- }\n- l1073:;\t if (!yy_Spnl(G)) { goto l1072; } if (!yymatchChar(G, '>')) goto l1072;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH5\")); if (!yymatchChar(G, '<')) goto l1077; if (!yy_Spnl(G)) { goto l1077; } if (!yymatchChar(G, '\/')) goto l1077;\n+ { int yypos1078= G->pos, yythunkpos1078= G->thunkpos; if (!yymatchString(G, \"h5\")) goto l1079; goto l1078;\n+ l1079:;\t G->pos= yypos1078; G->thunkpos= yythunkpos1078; if (!yymatchString(G, \"H5\")) goto l1077;\n+ }\n+ l1078:;\t if (!yy_Spnl(G)) { goto l1077; } if (!yymatchChar(G, '>')) goto l1077;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH5\", G->buf+G->pos));\n return 1;\n- l1072:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1077:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH5\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH5(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH5\")); if (!yymatchChar(G, '<')) goto l1075; if (!yy_Spnl(G)) { goto l1075; }\n- { int yypos1076= G->pos, yythunkpos1076= G->thunkpos; if (!yymatchString(G, \"h5\")) goto l1077; goto l1076;\n- l1077:;\t G->pos= yypos1076; G->thunkpos= yythunkpos1076; if (!yymatchString(G, \"H5\")) goto l1075;\n- }\n- l1076:;\t if (!yy_Spnl(G)) { goto l1075; }\n- l1078:;\t\n- { int yypos1079= G->pos, yythunkpos1079= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1079; } goto l1078;\n- l1079:;\t G->pos= yypos1079; G->thunkpos= yythunkpos1079;\n- } if (!yymatchChar(G, '>')) goto l1075;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH5\")); if (!yymatchChar(G, '<')) goto l1080; if (!yy_Spnl(G)) { goto l1080; }\n+ { int yypos1081= G->pos, yythunkpos1081= G->thunkpos; if (!yymatchString(G, \"h5\")) goto l1082; goto l1081;\n+ l1082:;\t G->pos= yypos1081; G->thunkpos= yythunkpos1081; if (!yymatchString(G, \"H5\")) goto l1080;\n+ }\n+ l1081:;\t if (!yy_Spnl(G)) { goto l1080; }\n+ l1083:;\t\n+ { int yypos1084= G->pos, yythunkpos1084= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1084; } goto l1083;\n+ l1084:;\t G->pos= yypos1084; G->thunkpos= yythunkpos1084;\n+ } if (!yymatchChar(G, '>')) goto l1080;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH5\", G->buf+G->pos));\n return 1;\n- l1075:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1080:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH5\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH4(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH4\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1080; if (!yy_LocMarker(G)) { goto l1080; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH4(G)) { goto l1080; }\n- l1081:;\t\n- { int yypos1082= G->pos, yythunkpos1082= G->thunkpos;\n- { int yypos1083= G->pos, yythunkpos1083= G->thunkpos; if (!yy_HtmlBlockH4(G)) { goto l1084; } goto l1083;\n- l1084:;\t G->pos= yypos1083; G->thunkpos= yythunkpos1083;\n- { int yypos1085= G->pos, yythunkpos1085= G->thunkpos; if (!yy_HtmlBlockCloseH4(G)) { goto l1085; } goto l1082;\n- l1085:;\t G->pos= yypos1085; G->thunkpos= yythunkpos1085;\n- } if (!yymatchDot(G)) goto l1082;\n- }\n- l1083:;\t goto l1081;\n- l1082:;\t G->pos= yypos1082; G->thunkpos= yythunkpos1082;\n- } if (!yy_HtmlBlockCloseH4(G)) { goto l1080; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1080; yyDo(G, yy_1_HtmlBlockH4, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH4\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1085; if (!yy_LocMarker(G)) { goto l1085; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH4(G)) { goto l1085; }\n+ l1086:;\t\n+ { int yypos1087= G->pos, yythunkpos1087= G->thunkpos;\n+ { int yypos1088= G->pos, yythunkpos1088= G->thunkpos; if (!yy_HtmlBlockH4(G)) { goto l1089; } goto l1088;\n+ l1089:;\t G->pos= yypos1088; G->thunkpos= yythunkpos1088;\n+ { int yypos1090= G->pos, yythunkpos1090= G->thunkpos; if (!yy_HtmlBlockCloseH4(G)) { goto l1090; } goto l1087;\n+ l1090:;\t G->pos= yypos1090; G->thunkpos= yythunkpos1090;\n+ } if (!yymatchDot(G)) goto l1087;\n+ }\n+ l1088:;\t goto l1086;\n+ l1087:;\t G->pos= yypos1087; G->thunkpos= yythunkpos1087;\n+ } if (!yy_HtmlBlockCloseH4(G)) { goto l1085; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1085; yyDo(G, yy_1_HtmlBlockH4, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH4\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1080:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1085:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH4\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH4(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH4\")); if (!yymatchChar(G, '<')) goto l1086; if (!yy_Spnl(G)) { goto l1086; } if (!yymatchChar(G, '\/')) goto l1086;\n- { int yypos1087= G->pos, yythunkpos1087= G->thunkpos; if (!yymatchString(G, \"h4\")) goto l1088; goto l1087;\n- l1088:;\t G->pos= yypos1087; G->thunkpos= yythunkpos1087; if (!yymatchString(G, \"H4\")) goto l1086;\n- }\n- l1087:;\t if (!yy_Spnl(G)) { goto l1086; } if (!yymatchChar(G, '>')) goto l1086;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH4\")); if (!yymatchChar(G, '<')) goto l1091; if (!yy_Spnl(G)) { goto l1091; } if (!yymatchChar(G, '\/')) goto l1091;\n+ { int yypos1092= G->pos, yythunkpos1092= G->thunkpos; if (!yymatchString(G, \"h4\")) goto l1093; goto l1092;\n+ l1093:;\t G->pos= yypos1092; G->thunkpos= yythunkpos1092; if (!yymatchString(G, \"H4\")) goto l1091;\n+ }\n+ l1092:;\t if (!yy_Spnl(G)) { goto l1091; } if (!yymatchChar(G, '>')) goto l1091;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH4\", G->buf+G->pos));\n return 1;\n- l1086:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1091:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH4\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH4(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH4\")); if (!yymatchChar(G, '<')) goto l1089; if (!yy_Spnl(G)) { goto l1089; }\n- { int yypos1090= G->pos, yythunkpos1090= G->thunkpos; if (!yymatchString(G, \"h4\")) goto l1091; goto l1090;\n- l1091:;\t G->pos= yypos1090; G->thunkpos= yythunkpos1090; if (!yymatchString(G, \"H4\")) goto l1089;\n- }\n- l1090:;\t if (!yy_Spnl(G)) { goto l1089; }\n- l1092:;\t\n- { int yypos1093= G->pos, yythunkpos1093= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1093; } goto l1092;\n- l1093:;\t G->pos= yypos1093; G->thunkpos= yythunkpos1093;\n- } if (!yymatchChar(G, '>')) goto l1089;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH4\")); if (!yymatchChar(G, '<')) goto l1094; if (!yy_Spnl(G)) { goto l1094; }\n+ { int yypos1095= G->pos, yythunkpos1095= G->thunkpos; if (!yymatchString(G, \"h4\")) goto l1096; goto l1095;\n+ l1096:;\t G->pos= yypos1095; G->thunkpos= yythunkpos1095; if (!yymatchString(G, \"H4\")) goto l1094;\n+ }\n+ l1095:;\t if (!yy_Spnl(G)) { goto l1094; }\n+ l1097:;\t\n+ { int yypos1098= G->pos, yythunkpos1098= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1098; } goto l1097;\n+ l1098:;\t G->pos= yypos1098; G->thunkpos= yythunkpos1098;\n+ } if (!yymatchChar(G, '>')) goto l1094;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH4\", G->buf+G->pos));\n return 1;\n- l1089:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1094:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH4\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH3(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH3\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1094; if (!yy_LocMarker(G)) { goto l1094; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH3(G)) { goto l1094; }\n- l1095:;\t\n- { int yypos1096= G->pos, yythunkpos1096= G->thunkpos;\n- { int yypos1097= G->pos, yythunkpos1097= G->thunkpos; if (!yy_HtmlBlockH3(G)) { goto l1098; } goto l1097;\n- l1098:;\t G->pos= yypos1097; G->thunkpos= yythunkpos1097;\n- { int yypos1099= G->pos, yythunkpos1099= G->thunkpos; if (!yy_HtmlBlockCloseH3(G)) { goto l1099; } goto l1096;\n- l1099:;\t G->pos= yypos1099; G->thunkpos= yythunkpos1099;\n- } if (!yymatchDot(G)) goto l1096;\n- }\n- l1097:;\t goto l1095;\n- l1096:;\t G->pos= yypos1096; G->thunkpos= yythunkpos1096;\n- } if (!yy_HtmlBlockCloseH3(G)) { goto l1094; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1094; yyDo(G, yy_1_HtmlBlockH3, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH3\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1099; if (!yy_LocMarker(G)) { goto l1099; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH3(G)) { goto l1099; }\n+ l1100:;\t\n+ { int yypos1101= G->pos, yythunkpos1101= G->thunkpos;\n+ { int yypos1102= G->pos, yythunkpos1102= G->thunkpos; if (!yy_HtmlBlockH3(G)) { goto l1103; } goto l1102;\n+ l1103:;\t G->pos= yypos1102; G->thunkpos= yythunkpos1102;\n+ { int yypos1104= G->pos, yythunkpos1104= G->thunkpos; if (!yy_HtmlBlockCloseH3(G)) { goto l1104; } goto l1101;\n+ l1104:;\t G->pos= yypos1104; G->thunkpos= yythunkpos1104;\n+ } if (!yymatchDot(G)) goto l1101;\n+ }\n+ l1102:;\t goto l1100;\n+ l1101:;\t G->pos= yypos1101; G->thunkpos= yythunkpos1101;\n+ } if (!yy_HtmlBlockCloseH3(G)) { goto l1099; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1099; yyDo(G, yy_1_HtmlBlockH3, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH3\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1094:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1099:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH3\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH3(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH3\")); if (!yymatchChar(G, '<')) goto l1100; if (!yy_Spnl(G)) { goto l1100; } if (!yymatchChar(G, '\/')) goto l1100;\n- { int yypos1101= G->pos, yythunkpos1101= G->thunkpos; if (!yymatchString(G, \"h3\")) goto l1102; goto l1101;\n- l1102:;\t G->pos= yypos1101; G->thunkpos= yythunkpos1101; if (!yymatchString(G, \"H3\")) goto l1100;\n- }\n- l1101:;\t if (!yy_Spnl(G)) { goto l1100; } if (!yymatchChar(G, '>')) goto l1100;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH3\")); if (!yymatchChar(G, '<')) goto l1105; if (!yy_Spnl(G)) { goto l1105; } if (!yymatchChar(G, '\/')) goto l1105;\n+ { int yypos1106= G->pos, yythunkpos1106= G->thunkpos; if (!yymatchString(G, \"h3\")) goto l1107; goto l1106;\n+ l1107:;\t G->pos= yypos1106; G->thunkpos= yythunkpos1106; if (!yymatchString(G, \"H3\")) goto l1105;\n+ }\n+ l1106:;\t if (!yy_Spnl(G)) { goto l1105; } if (!yymatchChar(G, '>')) goto l1105;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH3\", G->buf+G->pos));\n return 1;\n- l1100:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1105:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH3\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH3(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH3\")); if (!yymatchChar(G, '<')) goto l1103; if (!yy_Spnl(G)) { goto l1103; }\n- { int yypos1104= G->pos, yythunkpos1104= G->thunkpos; if (!yymatchString(G, \"h3\")) goto l1105; goto l1104;\n- l1105:;\t G->pos= yypos1104; G->thunkpos= yythunkpos1104; if (!yymatchString(G, \"H3\")) goto l1103;\n- }\n- l1104:;\t if (!yy_Spnl(G)) { goto l1103; }\n- l1106:;\t\n- { int yypos1107= G->pos, yythunkpos1107= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1107; } goto l1106;\n- l1107:;\t G->pos= yypos1107; G->thunkpos= yythunkpos1107;\n- } if (!yymatchChar(G, '>')) goto l1103;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH3\")); if (!yymatchChar(G, '<')) goto l1108; if (!yy_Spnl(G)) { goto l1108; }\n+ { int yypos1109= G->pos, yythunkpos1109= G->thunkpos; if (!yymatchString(G, \"h3\")) goto l1110; goto l1109;\n+ l1110:;\t G->pos= yypos1109; G->thunkpos= yythunkpos1109; if (!yymatchString(G, \"H3\")) goto l1108;\n+ }\n+ l1109:;\t if (!yy_Spnl(G)) { goto l1108; }\n+ l1111:;\t\n+ { int yypos1112= G->pos, yythunkpos1112= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1112; } goto l1111;\n+ l1112:;\t G->pos= yypos1112; G->thunkpos= yythunkpos1112;\n+ } if (!yymatchChar(G, '>')) goto l1108;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH3\", G->buf+G->pos));\n return 1;\n- l1103:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1108:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH3\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH2(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH2\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1108; if (!yy_LocMarker(G)) { goto l1108; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH2(G)) { goto l1108; }\n- l1109:;\t\n- { int yypos1110= G->pos, yythunkpos1110= G->thunkpos;\n- { int yypos1111= G->pos, yythunkpos1111= G->thunkpos; if (!yy_HtmlBlockH2(G)) { goto l1112; } goto l1111;\n- l1112:;\t G->pos= yypos1111; G->thunkpos= yythunkpos1111;\n- { int yypos1113= G->pos, yythunkpos1113= G->thunkpos; if (!yy_HtmlBlockCloseH2(G)) { goto l1113; } goto l1110;\n- l1113:;\t G->pos= yypos1113; G->thunkpos= yythunkpos1113;\n- } if (!yymatchDot(G)) goto l1110;\n- }\n- l1111:;\t goto l1109;\n- l1110:;\t G->pos= yypos1110; G->thunkpos= yythunkpos1110;\n- } if (!yy_HtmlBlockCloseH2(G)) { goto l1108; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1108; yyDo(G, yy_1_HtmlBlockH2, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH2\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1113; if (!yy_LocMarker(G)) { goto l1113; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH2(G)) { goto l1113; }\n+ l1114:;\t\n+ { int yypos1115= G->pos, yythunkpos1115= G->thunkpos;\n+ { int yypos1116= G->pos, yythunkpos1116= G->thunkpos; if (!yy_HtmlBlockH2(G)) { goto l1117; } goto l1116;\n+ l1117:;\t G->pos= yypos1116; G->thunkpos= yythunkpos1116;\n+ { int yypos1118= G->pos, yythunkpos1118= G->thunkpos; if (!yy_HtmlBlockCloseH2(G)) { goto l1118; } goto l1115;\n+ l1118:;\t G->pos= yypos1118; G->thunkpos= yythunkpos1118;\n+ } if (!yymatchDot(G)) goto l1115;\n+ }\n+ l1116:;\t goto l1114;\n+ l1115:;\t G->pos= yypos1115; G->thunkpos= yythunkpos1115;\n+ } if (!yy_HtmlBlockCloseH2(G)) { goto l1113; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1113; yyDo(G, yy_1_HtmlBlockH2, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH2\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1108:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1113:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH2\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH2(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH2\")); if (!yymatchChar(G, '<')) goto l1114; if (!yy_Spnl(G)) { goto l1114; } if (!yymatchChar(G, '\/')) goto l1114;\n- { int yypos1115= G->pos, yythunkpos1115= G->thunkpos; if (!yymatchString(G, \"h2\")) goto l1116; goto l1115;\n- l1116:;\t G->pos= yypos1115; G->thunkpos= yythunkpos1115; if (!yymatchString(G, \"H2\")) goto l1114;\n- }\n- l1115:;\t if (!yy_Spnl(G)) { goto l1114; } if (!yymatchChar(G, '>')) goto l1114;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH2\")); if (!yymatchChar(G, '<')) goto l1119; if (!yy_Spnl(G)) { goto l1119; } if (!yymatchChar(G, '\/')) goto l1119;\n+ { int yypos1120= G->pos, yythunkpos1120= G->thunkpos; if (!yymatchString(G, \"h2\")) goto l1121; goto l1120;\n+ l1121:;\t G->pos= yypos1120; G->thunkpos= yythunkpos1120; if (!yymatchString(G, \"H2\")) goto l1119;\n+ }\n+ l1120:;\t if (!yy_Spnl(G)) { goto l1119; } if (!yymatchChar(G, '>')) goto l1119;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH2\", G->buf+G->pos));\n return 1;\n- l1114:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1119:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH2\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH2(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH2\")); if (!yymatchChar(G, '<')) goto l1117; if (!yy_Spnl(G)) { goto l1117; }\n- { int yypos1118= G->pos, yythunkpos1118= G->thunkpos; if (!yymatchString(G, \"h2\")) goto l1119; goto l1118;\n- l1119:;\t G->pos= yypos1118; G->thunkpos= yythunkpos1118; if (!yymatchString(G, \"H2\")) goto l1117;\n- }\n- l1118:;\t if (!yy_Spnl(G)) { goto l1117; }\n- l1120:;\t\n- { int yypos1121= G->pos, yythunkpos1121= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1121; } goto l1120;\n- l1121:;\t G->pos= yypos1121; G->thunkpos= yythunkpos1121;\n- } if (!yymatchChar(G, '>')) goto l1117;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH2\")); if (!yymatchChar(G, '<')) goto l1122; if (!yy_Spnl(G)) { goto l1122; }\n+ { int yypos1123= G->pos, yythunkpos1123= G->thunkpos; if (!yymatchString(G, \"h2\")) goto l1124; goto l1123;\n+ l1124:;\t G->pos= yypos1123; G->thunkpos= yythunkpos1123; if (!yymatchString(G, \"H2\")) goto l1122;\n+ }\n+ l1123:;\t if (!yy_Spnl(G)) { goto l1122; }\n+ l1125:;\t\n+ { int yypos1126= G->pos, yythunkpos1126= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1126; } goto l1125;\n+ l1126:;\t G->pos= yypos1126; G->thunkpos= yythunkpos1126;\n+ } if (!yymatchChar(G, '>')) goto l1122;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH2\", G->buf+G->pos));\n return 1;\n- l1117:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1122:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH2\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockH1(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockH1\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1122; if (!yy_LocMarker(G)) { goto l1122; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH1(G)) { goto l1122; }\n- l1123:;\t\n- { int yypos1124= G->pos, yythunkpos1124= G->thunkpos;\n- { int yypos1125= G->pos, yythunkpos1125= G->thunkpos; if (!yy_HtmlBlockH1(G)) { goto l1126; } goto l1125;\n- l1126:;\t G->pos= yypos1125; G->thunkpos= yythunkpos1125;\n- { int yypos1127= G->pos, yythunkpos1127= G->thunkpos; if (!yy_HtmlBlockCloseH1(G)) { goto l1127; } goto l1124;\n- l1127:;\t G->pos= yypos1127; G->thunkpos= yythunkpos1127;\n- } if (!yymatchDot(G)) goto l1124;\n- }\n- l1125:;\t goto l1123;\n- l1124:;\t G->pos= yypos1124; G->thunkpos= yythunkpos1124;\n- } if (!yy_HtmlBlockCloseH1(G)) { goto l1122; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1122; yyDo(G, yy_1_HtmlBlockH1, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockH1\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1127; if (!yy_LocMarker(G)) { goto l1127; } yyDo(G, yySet, -1, 0); if (!yy_HtmlBlockOpenH1(G)) { goto l1127; }\n+ l1128:;\t\n+ { int yypos1129= G->pos, yythunkpos1129= G->thunkpos;\n+ { int yypos1130= G->pos, yythunkpos1130= G->thunkpos; if (!yy_HtmlBlockH1(G)) { goto l1131; } goto l1130;\n+ l1131:;\t G->pos= yypos1130; G->thunkpos= yythunkpos1130;\n+ { int yypos1132= G->pos, yythunkpos1132= G->thunkpos; if (!yy_HtmlBlockCloseH1(G)) { goto l1132; } goto l1129;\n+ l1132:;\t G->pos= yypos1132; G->thunkpos= yythunkpos1132;\n+ } if (!yymatchDot(G)) goto l1129;\n+ }\n+ l1130:;\t goto l1128;\n+ l1129:;\t G->pos= yypos1129; G->thunkpos= yythunkpos1129;\n+ } if (!yy_HtmlBlockCloseH1(G)) { goto l1127; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1127; yyDo(G, yy_1_HtmlBlockH1, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockH1\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1122:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1127:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockH1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseH1(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH1\")); if (!yymatchChar(G, '<')) goto l1128; if (!yy_Spnl(G)) { goto l1128; } if (!yymatchChar(G, '\/')) goto l1128;\n- { int yypos1129= G->pos, yythunkpos1129= G->thunkpos; if (!yymatchString(G, \"h1\")) goto l1130; goto l1129;\n- l1130:;\t G->pos= yypos1129; G->thunkpos= yythunkpos1129; if (!yymatchString(G, \"H1\")) goto l1128;\n- }\n- l1129:;\t if (!yy_Spnl(G)) { goto l1128; } if (!yymatchChar(G, '>')) goto l1128;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseH1\")); if (!yymatchChar(G, '<')) goto l1133; if (!yy_Spnl(G)) { goto l1133; } if (!yymatchChar(G, '\/')) goto l1133;\n+ { int yypos1134= G->pos, yythunkpos1134= G->thunkpos; if (!yymatchString(G, \"h1\")) goto l1135; goto l1134;\n+ l1135:;\t G->pos= yypos1134; G->thunkpos= yythunkpos1134; if (!yymatchString(G, \"H1\")) goto l1133;\n+ }\n+ l1134:;\t if (!yy_Spnl(G)) { goto l1133; } if (!yymatchChar(G, '>')) goto l1133;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseH1\", G->buf+G->pos));\n return 1;\n- l1128:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1133:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseH1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenH1(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH1\")); if (!yymatchChar(G, '<')) goto l1131; if (!yy_Spnl(G)) { goto l1131; }\n- { int yypos1132= G->pos, yythunkpos1132= G->thunkpos; if (!yymatchString(G, \"h1\")) goto l1133; goto l1132;\n- l1133:;\t G->pos= yypos1132; G->thunkpos= yythunkpos1132; if (!yymatchString(G, \"H1\")) goto l1131;\n- }\n- l1132:;\t if (!yy_Spnl(G)) { goto l1131; }\n- l1134:;\t\n- { int yypos1135= G->pos, yythunkpos1135= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1135; } goto l1134;\n- l1135:;\t G->pos= yypos1135; G->thunkpos= yythunkpos1135;\n- } if (!yymatchChar(G, '>')) goto l1131;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenH1\")); if (!yymatchChar(G, '<')) goto l1136; if (!yy_Spnl(G)) { goto l1136; }\n+ { int yypos1137= G->pos, yythunkpos1137= G->thunkpos; if (!yymatchString(G, \"h1\")) goto l1138; goto l1137;\n+ l1138:;\t G->pos= yypos1137; G->thunkpos= yythunkpos1137; if (!yymatchString(G, \"H1\")) goto l1136;\n+ }\n+ l1137:;\t if (!yy_Spnl(G)) { goto l1136; }\n+ l1139:;\t\n+ { int yypos1140= G->pos, yythunkpos1140= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1140; } goto l1139;\n+ l1140:;\t G->pos= yypos1140; G->thunkpos= yythunkpos1140;\n+ } if (!yymatchChar(G, '>')) goto l1136;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenH1\", G->buf+G->pos));\n return 1;\n- l1131:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1136:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenH1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockForm(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockForm\")); if (!yy_HtmlBlockOpenForm(G)) { goto l1136; }\n- l1137:;\t\n- { int yypos1138= G->pos, yythunkpos1138= G->thunkpos;\n- { int yypos1139= G->pos, yythunkpos1139= G->thunkpos; if (!yy_HtmlBlockForm(G)) { goto l1140; } goto l1139;\n- l1140:;\t G->pos= yypos1139; G->thunkpos= yythunkpos1139;\n- { int yypos1141= G->pos, yythunkpos1141= G->thunkpos; if (!yy_HtmlBlockCloseForm(G)) { goto l1141; } goto l1138;\n- l1141:;\t G->pos= yypos1141; G->thunkpos= yythunkpos1141;\n- } if (!yymatchDot(G)) goto l1138;\n- }\n- l1139:;\t goto l1137;\n- l1138:;\t G->pos= yypos1138; G->thunkpos= yythunkpos1138;\n- } if (!yy_HtmlBlockCloseForm(G)) { goto l1136; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockForm\")); if (!yy_HtmlBlockOpenForm(G)) { goto l1141; }\n+ l1142:;\t\n+ { int yypos1143= G->pos, yythunkpos1143= G->thunkpos;\n+ { int yypos1144= G->pos, yythunkpos1144= G->thunkpos; if (!yy_HtmlBlockForm(G)) { goto l1145; } goto l1144;\n+ l1145:;\t G->pos= yypos1144; G->thunkpos= yythunkpos1144;\n+ { int yypos1146= G->pos, yythunkpos1146= G->thunkpos; if (!yy_HtmlBlockCloseForm(G)) { goto l1146; } goto l1143;\n+ l1146:;\t G->pos= yypos1146; G->thunkpos= yythunkpos1146;\n+ } if (!yymatchDot(G)) goto l1143;\n+ }\n+ l1144:;\t goto l1142;\n+ l1143:;\t G->pos= yypos1143; G->thunkpos= yythunkpos1143;\n+ } if (!yy_HtmlBlockCloseForm(G)) { goto l1141; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockForm\", G->buf+G->pos));\n return 1;\n- l1136:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1141:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockForm\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseForm(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseForm\")); if (!yymatchChar(G, '<')) goto l1142; if (!yy_Spnl(G)) { goto l1142; } if (!yymatchChar(G, '\/')) goto l1142;\n- { int yypos1143= G->pos, yythunkpos1143= G->thunkpos; if (!yymatchString(G, \"form\")) goto l1144; goto l1143;\n- l1144:;\t G->pos= yypos1143; G->thunkpos= yythunkpos1143; if (!yymatchString(G, \"FORM\")) goto l1142;\n- }\n- l1143:;\t if (!yy_Spnl(G)) { goto l1142; } if (!yymatchChar(G, '>')) goto l1142;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseForm\")); if (!yymatchChar(G, '<')) goto l1147; if (!yy_Spnl(G)) { goto l1147; } if (!yymatchChar(G, '\/')) goto l1147;\n+ { int yypos1148= G->pos, yythunkpos1148= G->thunkpos; if (!yymatchString(G, \"form\")) goto l1149; goto l1148;\n+ l1149:;\t G->pos= yypos1148; G->thunkpos= yythunkpos1148; if (!yymatchString(G, \"FORM\")) goto l1147;\n+ }\n+ l1148:;\t if (!yy_Spnl(G)) { goto l1147; } if (!yymatchChar(G, '>')) goto l1147;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseForm\", G->buf+G->pos));\n return 1;\n- l1142:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1147:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseForm\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenForm(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenForm\")); if (!yymatchChar(G, '<')) goto l1145; if (!yy_Spnl(G)) { goto l1145; }\n- { int yypos1146= G->pos, yythunkpos1146= G->thunkpos; if (!yymatchString(G, \"form\")) goto l1147; goto l1146;\n- l1147:;\t G->pos= yypos1146; G->thunkpos= yythunkpos1146; if (!yymatchString(G, \"FORM\")) goto l1145;\n- }\n- l1146:;\t if (!yy_Spnl(G)) { goto l1145; }\n- l1148:;\t\n- { int yypos1149= G->pos, yythunkpos1149= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1149; } goto l1148;\n- l1149:;\t G->pos= yypos1149; G->thunkpos= yythunkpos1149;\n- } if (!yymatchChar(G, '>')) goto l1145;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenForm\")); if (!yymatchChar(G, '<')) goto l1150; if (!yy_Spnl(G)) { goto l1150; }\n+ { int yypos1151= G->pos, yythunkpos1151= G->thunkpos; if (!yymatchString(G, \"form\")) goto l1152; goto l1151;\n+ l1152:;\t G->pos= yypos1151; G->thunkpos= yythunkpos1151; if (!yymatchString(G, \"FORM\")) goto l1150;\n+ }\n+ l1151:;\t if (!yy_Spnl(G)) { goto l1150; }\n+ l1153:;\t\n+ { int yypos1154= G->pos, yythunkpos1154= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1154; } goto l1153;\n+ l1154:;\t G->pos= yypos1154; G->thunkpos= yythunkpos1154;\n+ } if (!yymatchChar(G, '>')) goto l1150;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenForm\", G->buf+G->pos));\n return 1;\n- l1145:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1150:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenForm\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockFieldset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockFieldset\")); if (!yy_HtmlBlockOpenFieldset(G)) { goto l1150; }\n- l1151:;\t\n- { int yypos1152= G->pos, yythunkpos1152= G->thunkpos;\n- { int yypos1153= G->pos, yythunkpos1153= G->thunkpos; if (!yy_HtmlBlockFieldset(G)) { goto l1154; } goto l1153;\n- l1154:;\t G->pos= yypos1153; G->thunkpos= yythunkpos1153;\n- { int yypos1155= G->pos, yythunkpos1155= G->thunkpos; if (!yy_HtmlBlockCloseFieldset(G)) { goto l1155; } goto l1152;\n- l1155:;\t G->pos= yypos1155; G->thunkpos= yythunkpos1155;\n- } if (!yymatchDot(G)) goto l1152;\n- }\n- l1153:;\t goto l1151;\n- l1152:;\t G->pos= yypos1152; G->thunkpos= yythunkpos1152;\n- } if (!yy_HtmlBlockCloseFieldset(G)) { goto l1150; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockFieldset\")); if (!yy_HtmlBlockOpenFieldset(G)) { goto l1155; }\n+ l1156:;\t\n+ { int yypos1157= G->pos, yythunkpos1157= G->thunkpos;\n+ { int yypos1158= G->pos, yythunkpos1158= G->thunkpos; if (!yy_HtmlBlockFieldset(G)) { goto l1159; } goto l1158;\n+ l1159:;\t G->pos= yypos1158; G->thunkpos= yythunkpos1158;\n+ { int yypos1160= G->pos, yythunkpos1160= G->thunkpos; if (!yy_HtmlBlockCloseFieldset(G)) { goto l1160; } goto l1157;\n+ l1160:;\t G->pos= yypos1160; G->thunkpos= yythunkpos1160;\n+ } if (!yymatchDot(G)) goto l1157;\n+ }\n+ l1158:;\t goto l1156;\n+ l1157:;\t G->pos= yypos1157; G->thunkpos= yythunkpos1157;\n+ } if (!yy_HtmlBlockCloseFieldset(G)) { goto l1155; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockFieldset\", G->buf+G->pos));\n return 1;\n- l1150:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1155:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockFieldset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseFieldset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseFieldset\")); if (!yymatchChar(G, '<')) goto l1156; if (!yy_Spnl(G)) { goto l1156; } if (!yymatchChar(G, '\/')) goto l1156;\n- { int yypos1157= G->pos, yythunkpos1157= G->thunkpos; if (!yymatchString(G, \"fieldset\")) goto l1158; goto l1157;\n- l1158:;\t G->pos= yypos1157; G->thunkpos= yythunkpos1157; if (!yymatchString(G, \"FIELDSET\")) goto l1156;\n- }\n- l1157:;\t if (!yy_Spnl(G)) { goto l1156; } if (!yymatchChar(G, '>')) goto l1156;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseFieldset\")); if (!yymatchChar(G, '<')) goto l1161; if (!yy_Spnl(G)) { goto l1161; } if (!yymatchChar(G, '\/')) goto l1161;\n+ { int yypos1162= G->pos, yythunkpos1162= G->thunkpos; if (!yymatchString(G, \"fieldset\")) goto l1163; goto l1162;\n+ l1163:;\t G->pos= yypos1162; G->thunkpos= yythunkpos1162; if (!yymatchString(G, \"FIELDSET\")) goto l1161;\n+ }\n+ l1162:;\t if (!yy_Spnl(G)) { goto l1161; } if (!yymatchChar(G, '>')) goto l1161;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseFieldset\", G->buf+G->pos));\n return 1;\n- l1156:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1161:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseFieldset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenFieldset(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenFieldset\")); if (!yymatchChar(G, '<')) goto l1159; if (!yy_Spnl(G)) { goto l1159; }\n- { int yypos1160= G->pos, yythunkpos1160= G->thunkpos; if (!yymatchString(G, \"fieldset\")) goto l1161; goto l1160;\n- l1161:;\t G->pos= yypos1160; G->thunkpos= yythunkpos1160; if (!yymatchString(G, \"FIELDSET\")) goto l1159;\n- }\n- l1160:;\t if (!yy_Spnl(G)) { goto l1159; }\n- l1162:;\t\n- { int yypos1163= G->pos, yythunkpos1163= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1163; } goto l1162;\n- l1163:;\t G->pos= yypos1163; G->thunkpos= yythunkpos1163;\n- } if (!yymatchChar(G, '>')) goto l1159;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenFieldset\")); if (!yymatchChar(G, '<')) goto l1164; if (!yy_Spnl(G)) { goto l1164; }\n+ { int yypos1165= G->pos, yythunkpos1165= G->thunkpos; if (!yymatchString(G, \"fieldset\")) goto l1166; goto l1165;\n+ l1166:;\t G->pos= yypos1165; G->thunkpos= yythunkpos1165; if (!yymatchString(G, \"FIELDSET\")) goto l1164;\n+ }\n+ l1165:;\t if (!yy_Spnl(G)) { goto l1164; }\n+ l1167:;\t\n+ { int yypos1168= G->pos, yythunkpos1168= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1168; } goto l1167;\n+ l1168:;\t G->pos= yypos1168; G->thunkpos= yythunkpos1168;\n+ } if (!yymatchChar(G, '>')) goto l1164;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenFieldset\", G->buf+G->pos));\n return 1;\n- l1159:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1164:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenFieldset\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockDl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockDl\")); if (!yy_HtmlBlockOpenDl(G)) { goto l1164; }\n- l1165:;\t\n- { int yypos1166= G->pos, yythunkpos1166= G->thunkpos;\n- { int yypos1167= G->pos, yythunkpos1167= G->thunkpos; if (!yy_HtmlBlockDl(G)) { goto l1168; } goto l1167;\n- l1168:;\t G->pos= yypos1167; G->thunkpos= yythunkpos1167;\n- { int yypos1169= G->pos, yythunkpos1169= G->thunkpos; if (!yy_HtmlBlockCloseDl(G)) { goto l1169; } goto l1166;\n- l1169:;\t G->pos= yypos1169; G->thunkpos= yythunkpos1169;\n- } if (!yymatchDot(G)) goto l1166;\n- }\n- l1167:;\t goto l1165;\n- l1166:;\t G->pos= yypos1166; G->thunkpos= yythunkpos1166;\n- } if (!yy_HtmlBlockCloseDl(G)) { goto l1164; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockDl\")); if (!yy_HtmlBlockOpenDl(G)) { goto l1169; }\n+ l1170:;\t\n+ { int yypos1171= G->pos, yythunkpos1171= G->thunkpos;\n+ { int yypos1172= G->pos, yythunkpos1172= G->thunkpos; if (!yy_HtmlBlockDl(G)) { goto l1173; } goto l1172;\n+ l1173:;\t G->pos= yypos1172; G->thunkpos= yythunkpos1172;\n+ { int yypos1174= G->pos, yythunkpos1174= G->thunkpos; if (!yy_HtmlBlockCloseDl(G)) { goto l1174; } goto l1171;\n+ l1174:;\t G->pos= yypos1174; G->thunkpos= yythunkpos1174;\n+ } if (!yymatchDot(G)) goto l1171;\n+ }\n+ l1172:;\t goto l1170;\n+ l1171:;\t G->pos= yypos1171; G->thunkpos= yythunkpos1171;\n+ } if (!yy_HtmlBlockCloseDl(G)) { goto l1169; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockDl\", G->buf+G->pos));\n return 1;\n- l1164:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1169:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockDl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseDl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDl\")); if (!yymatchChar(G, '<')) goto l1170; if (!yy_Spnl(G)) { goto l1170; } if (!yymatchChar(G, '\/')) goto l1170;\n- { int yypos1171= G->pos, yythunkpos1171= G->thunkpos; if (!yymatchString(G, \"dl\")) goto l1172; goto l1171;\n- l1172:;\t G->pos= yypos1171; G->thunkpos= yythunkpos1171; if (!yymatchString(G, \"DL\")) goto l1170;\n- }\n- l1171:;\t if (!yy_Spnl(G)) { goto l1170; } if (!yymatchChar(G, '>')) goto l1170;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDl\")); if (!yymatchChar(G, '<')) goto l1175; if (!yy_Spnl(G)) { goto l1175; } if (!yymatchChar(G, '\/')) goto l1175;\n+ { int yypos1176= G->pos, yythunkpos1176= G->thunkpos; if (!yymatchString(G, \"dl\")) goto l1177; goto l1176;\n+ l1177:;\t G->pos= yypos1176; G->thunkpos= yythunkpos1176; if (!yymatchString(G, \"DL\")) goto l1175;\n+ }\n+ l1176:;\t if (!yy_Spnl(G)) { goto l1175; } if (!yymatchChar(G, '>')) goto l1175;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseDl\", G->buf+G->pos));\n return 1;\n- l1170:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1175:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseDl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenDl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDl\")); if (!yymatchChar(G, '<')) goto l1173; if (!yy_Spnl(G)) { goto l1173; }\n- { int yypos1174= G->pos, yythunkpos1174= G->thunkpos; if (!yymatchString(G, \"dl\")) goto l1175; goto l1174;\n- l1175:;\t G->pos= yypos1174; G->thunkpos= yythunkpos1174; if (!yymatchString(G, \"DL\")) goto l1173;\n- }\n- l1174:;\t if (!yy_Spnl(G)) { goto l1173; }\n- l1176:;\t\n- { int yypos1177= G->pos, yythunkpos1177= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1177; } goto l1176;\n- l1177:;\t G->pos= yypos1177; G->thunkpos= yythunkpos1177;\n- } if (!yymatchChar(G, '>')) goto l1173;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDl\")); if (!yymatchChar(G, '<')) goto l1178; if (!yy_Spnl(G)) { goto l1178; }\n+ { int yypos1179= G->pos, yythunkpos1179= G->thunkpos; if (!yymatchString(G, \"dl\")) goto l1180; goto l1179;\n+ l1180:;\t G->pos= yypos1179; G->thunkpos= yythunkpos1179; if (!yymatchString(G, \"DL\")) goto l1178;\n+ }\n+ l1179:;\t if (!yy_Spnl(G)) { goto l1178; }\n+ l1181:;\t\n+ { int yypos1182= G->pos, yythunkpos1182= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1182; } goto l1181;\n+ l1182:;\t G->pos= yypos1182; G->thunkpos= yythunkpos1182;\n+ } if (!yymatchChar(G, '>')) goto l1178;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenDl\", G->buf+G->pos));\n return 1;\n- l1173:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1178:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenDl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockDiv(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockDiv\")); if (!yy_HtmlBlockOpenDiv(G)) { goto l1178; }\n- l1179:;\t\n- { int yypos1180= G->pos, yythunkpos1180= G->thunkpos;\n- { int yypos1181= G->pos, yythunkpos1181= G->thunkpos; if (!yy_HtmlBlockDiv(G)) { goto l1182; } goto l1181;\n- l1182:;\t G->pos= yypos1181; G->thunkpos= yythunkpos1181;\n- { int yypos1183= G->pos, yythunkpos1183= G->thunkpos; if (!yy_HtmlBlockCloseDiv(G)) { goto l1183; } goto l1180;\n- l1183:;\t G->pos= yypos1183; G->thunkpos= yythunkpos1183;\n- } if (!yymatchDot(G)) goto l1180;\n- }\n- l1181:;\t goto l1179;\n- l1180:;\t G->pos= yypos1180; G->thunkpos= yythunkpos1180;\n- } if (!yy_HtmlBlockCloseDiv(G)) { goto l1178; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockDiv\")); if (!yy_HtmlBlockOpenDiv(G)) { goto l1183; }\n+ l1184:;\t\n+ { int yypos1185= G->pos, yythunkpos1185= G->thunkpos;\n+ { int yypos1186= G->pos, yythunkpos1186= G->thunkpos; if (!yy_HtmlBlockDiv(G)) { goto l1187; } goto l1186;\n+ l1187:;\t G->pos= yypos1186; G->thunkpos= yythunkpos1186;\n+ { int yypos1188= G->pos, yythunkpos1188= G->thunkpos; if (!yy_HtmlBlockCloseDiv(G)) { goto l1188; } goto l1185;\n+ l1188:;\t G->pos= yypos1188; G->thunkpos= yythunkpos1188;\n+ } if (!yymatchDot(G)) goto l1185;\n+ }\n+ l1186:;\t goto l1184;\n+ l1185:;\t G->pos= yypos1185; G->thunkpos= yythunkpos1185;\n+ } if (!yy_HtmlBlockCloseDiv(G)) { goto l1183; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockDiv\", G->buf+G->pos));\n return 1;\n- l1178:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1183:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockDiv\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseDiv(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDiv\")); if (!yymatchChar(G, '<')) goto l1184; if (!yy_Spnl(G)) { goto l1184; } if (!yymatchChar(G, '\/')) goto l1184;\n- { int yypos1185= G->pos, yythunkpos1185= G->thunkpos; if (!yymatchString(G, \"div\")) goto l1186; goto l1185;\n- l1186:;\t G->pos= yypos1185; G->thunkpos= yythunkpos1185; if (!yymatchString(G, \"DIV\")) goto l1184;\n- }\n- l1185:;\t if (!yy_Spnl(G)) { goto l1184; } if (!yymatchChar(G, '>')) goto l1184;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDiv\")); if (!yymatchChar(G, '<')) goto l1189; if (!yy_Spnl(G)) { goto l1189; } if (!yymatchChar(G, '\/')) goto l1189;\n+ { int yypos1190= G->pos, yythunkpos1190= G->thunkpos; if (!yymatchString(G, \"div\")) goto l1191; goto l1190;\n+ l1191:;\t G->pos= yypos1190; G->thunkpos= yythunkpos1190; if (!yymatchString(G, \"DIV\")) goto l1189;\n+ }\n+ l1190:;\t if (!yy_Spnl(G)) { goto l1189; } if (!yymatchChar(G, '>')) goto l1189;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseDiv\", G->buf+G->pos));\n return 1;\n- l1184:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1189:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseDiv\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenDiv(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDiv\")); if (!yymatchChar(G, '<')) goto l1187; if (!yy_Spnl(G)) { goto l1187; }\n- { int yypos1188= G->pos, yythunkpos1188= G->thunkpos; if (!yymatchString(G, \"div\")) goto l1189; goto l1188;\n- l1189:;\t G->pos= yypos1188; G->thunkpos= yythunkpos1188; if (!yymatchString(G, \"DIV\")) goto l1187;\n- }\n- l1188:;\t if (!yy_Spnl(G)) { goto l1187; }\n- l1190:;\t\n- { int yypos1191= G->pos, yythunkpos1191= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1191; } goto l1190;\n- l1191:;\t G->pos= yypos1191; G->thunkpos= yythunkpos1191;\n- } if (!yymatchChar(G, '>')) goto l1187;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDiv\")); if (!yymatchChar(G, '<')) goto l1192; if (!yy_Spnl(G)) { goto l1192; }\n+ { int yypos1193= G->pos, yythunkpos1193= G->thunkpos; if (!yymatchString(G, \"div\")) goto l1194; goto l1193;\n+ l1194:;\t G->pos= yypos1193; G->thunkpos= yythunkpos1193; if (!yymatchString(G, \"DIV\")) goto l1192;\n+ }\n+ l1193:;\t if (!yy_Spnl(G)) { goto l1192; }\n+ l1195:;\t\n+ { int yypos1196= G->pos, yythunkpos1196= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1196; } goto l1195;\n+ l1196:;\t G->pos= yypos1196; G->thunkpos= yythunkpos1196;\n+ } if (!yymatchChar(G, '>')) goto l1192;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenDiv\", G->buf+G->pos));\n return 1;\n- l1187:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1192:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenDiv\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockDir(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockDir\")); if (!yy_HtmlBlockOpenDir(G)) { goto l1192; }\n- l1193:;\t\n- { int yypos1194= G->pos, yythunkpos1194= G->thunkpos;\n- { int yypos1195= G->pos, yythunkpos1195= G->thunkpos; if (!yy_HtmlBlockDir(G)) { goto l1196; } goto l1195;\n- l1196:;\t G->pos= yypos1195; G->thunkpos= yythunkpos1195;\n- { int yypos1197= G->pos, yythunkpos1197= G->thunkpos; if (!yy_HtmlBlockCloseDir(G)) { goto l1197; } goto l1194;\n- l1197:;\t G->pos= yypos1197; G->thunkpos= yythunkpos1197;\n- } if (!yymatchDot(G)) goto l1194;\n- }\n- l1195:;\t goto l1193;\n- l1194:;\t G->pos= yypos1194; G->thunkpos= yythunkpos1194;\n- } if (!yy_HtmlBlockCloseDir(G)) { goto l1192; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockDir\")); if (!yy_HtmlBlockOpenDir(G)) { goto l1197; }\n+ l1198:;\t\n+ { int yypos1199= G->pos, yythunkpos1199= G->thunkpos;\n+ { int yypos1200= G->pos, yythunkpos1200= G->thunkpos; if (!yy_HtmlBlockDir(G)) { goto l1201; } goto l1200;\n+ l1201:;\t G->pos= yypos1200; G->thunkpos= yythunkpos1200;\n+ { int yypos1202= G->pos, yythunkpos1202= G->thunkpos; if (!yy_HtmlBlockCloseDir(G)) { goto l1202; } goto l1199;\n+ l1202:;\t G->pos= yypos1202; G->thunkpos= yythunkpos1202;\n+ } if (!yymatchDot(G)) goto l1199;\n+ }\n+ l1200:;\t goto l1198;\n+ l1199:;\t G->pos= yypos1199; G->thunkpos= yythunkpos1199;\n+ } if (!yy_HtmlBlockCloseDir(G)) { goto l1197; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockDir\", G->buf+G->pos));\n return 1;\n- l1192:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1197:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockDir\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseDir(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDir\")); if (!yymatchChar(G, '<')) goto l1198; if (!yy_Spnl(G)) { goto l1198; } if (!yymatchChar(G, '\/')) goto l1198;\n- { int yypos1199= G->pos, yythunkpos1199= G->thunkpos; if (!yymatchString(G, \"dir\")) goto l1200; goto l1199;\n- l1200:;\t G->pos= yypos1199; G->thunkpos= yythunkpos1199; if (!yymatchString(G, \"DIR\")) goto l1198;\n- }\n- l1199:;\t if (!yy_Spnl(G)) { goto l1198; } if (!yymatchChar(G, '>')) goto l1198;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseDir\")); if (!yymatchChar(G, '<')) goto l1203; if (!yy_Spnl(G)) { goto l1203; } if (!yymatchChar(G, '\/')) goto l1203;\n+ { int yypos1204= G->pos, yythunkpos1204= G->thunkpos; if (!yymatchString(G, \"dir\")) goto l1205; goto l1204;\n+ l1205:;\t G->pos= yypos1204; G->thunkpos= yythunkpos1204; if (!yymatchString(G, \"DIR\")) goto l1203;\n+ }\n+ l1204:;\t if (!yy_Spnl(G)) { goto l1203; } if (!yymatchChar(G, '>')) goto l1203;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseDir\", G->buf+G->pos));\n return 1;\n- l1198:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1203:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseDir\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenDir(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDir\")); if (!yymatchChar(G, '<')) goto l1201; if (!yy_Spnl(G)) { goto l1201; }\n- { int yypos1202= G->pos, yythunkpos1202= G->thunkpos; if (!yymatchString(G, \"dir\")) goto l1203; goto l1202;\n- l1203:;\t G->pos= yypos1202; G->thunkpos= yythunkpos1202; if (!yymatchString(G, \"DIR\")) goto l1201;\n- }\n- l1202:;\t if (!yy_Spnl(G)) { goto l1201; }\n- l1204:;\t\n- { int yypos1205= G->pos, yythunkpos1205= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1205; } goto l1204;\n- l1205:;\t G->pos= yypos1205; G->thunkpos= yythunkpos1205;\n- } if (!yymatchChar(G, '>')) goto l1201;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenDir\")); if (!yymatchChar(G, '<')) goto l1206; if (!yy_Spnl(G)) { goto l1206; }\n+ { int yypos1207= G->pos, yythunkpos1207= G->thunkpos; if (!yymatchString(G, \"dir\")) goto l1208; goto l1207;\n+ l1208:;\t G->pos= yypos1207; G->thunkpos= yythunkpos1207; if (!yymatchString(G, \"DIR\")) goto l1206;\n+ }\n+ l1207:;\t if (!yy_Spnl(G)) { goto l1206; }\n+ l1209:;\t\n+ { int yypos1210= G->pos, yythunkpos1210= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1210; } goto l1209;\n+ l1210:;\t G->pos= yypos1210; G->thunkpos= yythunkpos1210;\n+ } if (!yymatchChar(G, '>')) goto l1206;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenDir\", G->buf+G->pos));\n return 1;\n- l1201:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1206:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenDir\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCenter(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCenter\")); if (!yy_HtmlBlockOpenCenter(G)) { goto l1206; }\n- l1207:;\t\n- { int yypos1208= G->pos, yythunkpos1208= G->thunkpos;\n- { int yypos1209= G->pos, yythunkpos1209= G->thunkpos; if (!yy_HtmlBlockCenter(G)) { goto l1210; } goto l1209;\n- l1210:;\t G->pos= yypos1209; G->thunkpos= yythunkpos1209;\n- { int yypos1211= G->pos, yythunkpos1211= G->thunkpos; if (!yy_HtmlBlockCloseCenter(G)) { goto l1211; } goto l1208;\n- l1211:;\t G->pos= yypos1211; G->thunkpos= yythunkpos1211;\n- } if (!yymatchDot(G)) goto l1208;\n- }\n- l1209:;\t goto l1207;\n- l1208:;\t G->pos= yypos1208; G->thunkpos= yythunkpos1208;\n- } if (!yy_HtmlBlockCloseCenter(G)) { goto l1206; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCenter\")); if (!yy_HtmlBlockOpenCenter(G)) { goto l1211; }\n+ l1212:;\t\n+ { int yypos1213= G->pos, yythunkpos1213= G->thunkpos;\n+ { int yypos1214= G->pos, yythunkpos1214= G->thunkpos; if (!yy_HtmlBlockCenter(G)) { goto l1215; } goto l1214;\n+ l1215:;\t G->pos= yypos1214; G->thunkpos= yythunkpos1214;\n+ { int yypos1216= G->pos, yythunkpos1216= G->thunkpos; if (!yy_HtmlBlockCloseCenter(G)) { goto l1216; } goto l1213;\n+ l1216:;\t G->pos= yypos1216; G->thunkpos= yythunkpos1216;\n+ } if (!yymatchDot(G)) goto l1213;\n+ }\n+ l1214:;\t goto l1212;\n+ l1213:;\t G->pos= yypos1213; G->thunkpos= yythunkpos1213;\n+ } if (!yy_HtmlBlockCloseCenter(G)) { goto l1211; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCenter\", G->buf+G->pos));\n return 1;\n- l1206:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1211:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCenter\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseCenter(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseCenter\")); if (!yymatchChar(G, '<')) goto l1212; if (!yy_Spnl(G)) { goto l1212; } if (!yymatchChar(G, '\/')) goto l1212;\n- { int yypos1213= G->pos, yythunkpos1213= G->thunkpos; if (!yymatchString(G, \"center\")) goto l1214; goto l1213;\n- l1214:;\t G->pos= yypos1213; G->thunkpos= yythunkpos1213; if (!yymatchString(G, \"CENTER\")) goto l1212;\n- }\n- l1213:;\t if (!yy_Spnl(G)) { goto l1212; } if (!yymatchChar(G, '>')) goto l1212;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseCenter\")); if (!yymatchChar(G, '<')) goto l1217; if (!yy_Spnl(G)) { goto l1217; } if (!yymatchChar(G, '\/')) goto l1217;\n+ { int yypos1218= G->pos, yythunkpos1218= G->thunkpos; if (!yymatchString(G, \"center\")) goto l1219; goto l1218;\n+ l1219:;\t G->pos= yypos1218; G->thunkpos= yythunkpos1218; if (!yymatchString(G, \"CENTER\")) goto l1217;\n+ }\n+ l1218:;\t if (!yy_Spnl(G)) { goto l1217; } if (!yymatchChar(G, '>')) goto l1217;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseCenter\", G->buf+G->pos));\n return 1;\n- l1212:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1217:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseCenter\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenCenter(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenCenter\")); if (!yymatchChar(G, '<')) goto l1215; if (!yy_Spnl(G)) { goto l1215; }\n- { int yypos1216= G->pos, yythunkpos1216= G->thunkpos; if (!yymatchString(G, \"center\")) goto l1217; goto l1216;\n- l1217:;\t G->pos= yypos1216; G->thunkpos= yythunkpos1216; if (!yymatchString(G, \"CENTER\")) goto l1215;\n- }\n- l1216:;\t if (!yy_Spnl(G)) { goto l1215; }\n- l1218:;\t\n- { int yypos1219= G->pos, yythunkpos1219= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1219; } goto l1218;\n- l1219:;\t G->pos= yypos1219; G->thunkpos= yythunkpos1219;\n- } if (!yymatchChar(G, '>')) goto l1215;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenCenter\")); if (!yymatchChar(G, '<')) goto l1220; if (!yy_Spnl(G)) { goto l1220; }\n+ { int yypos1221= G->pos, yythunkpos1221= G->thunkpos; if (!yymatchString(G, \"center\")) goto l1222; goto l1221;\n+ l1222:;\t G->pos= yypos1221; G->thunkpos= yythunkpos1221; if (!yymatchString(G, \"CENTER\")) goto l1220;\n+ }\n+ l1221:;\t if (!yy_Spnl(G)) { goto l1220; }\n+ l1223:;\t\n+ { int yypos1224= G->pos, yythunkpos1224= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1224; } goto l1223;\n+ l1224:;\t G->pos= yypos1224; G->thunkpos= yythunkpos1224;\n+ } if (!yymatchChar(G, '>')) goto l1220;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenCenter\", G->buf+G->pos));\n return 1;\n- l1215:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1220:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenCenter\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockBlockquote(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockBlockquote\")); if (!yy_HtmlBlockOpenBlockquote(G)) { goto l1220; }\n- l1221:;\t\n- { int yypos1222= G->pos, yythunkpos1222= G->thunkpos;\n- { int yypos1223= G->pos, yythunkpos1223= G->thunkpos; if (!yy_HtmlBlockBlockquote(G)) { goto l1224; } goto l1223;\n- l1224:;\t G->pos= yypos1223; G->thunkpos= yythunkpos1223;\n- { int yypos1225= G->pos, yythunkpos1225= G->thunkpos; if (!yy_HtmlBlockCloseBlockquote(G)) { goto l1225; } goto l1222;\n- l1225:;\t G->pos= yypos1225; G->thunkpos= yythunkpos1225;\n- } if (!yymatchDot(G)) goto l1222;\n- }\n- l1223:;\t goto l1221;\n- l1222:;\t G->pos= yypos1222; G->thunkpos= yythunkpos1222;\n- } if (!yy_HtmlBlockCloseBlockquote(G)) { goto l1220; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockBlockquote\")); if (!yy_HtmlBlockOpenBlockquote(G)) { goto l1225; }\n+ l1226:;\t\n+ { int yypos1227= G->pos, yythunkpos1227= G->thunkpos;\n+ { int yypos1228= G->pos, yythunkpos1228= G->thunkpos; if (!yy_HtmlBlockBlockquote(G)) { goto l1229; } goto l1228;\n+ l1229:;\t G->pos= yypos1228; G->thunkpos= yythunkpos1228;\n+ { int yypos1230= G->pos, yythunkpos1230= G->thunkpos; if (!yy_HtmlBlockCloseBlockquote(G)) { goto l1230; } goto l1227;\n+ l1230:;\t G->pos= yypos1230; G->thunkpos= yythunkpos1230;\n+ } if (!yymatchDot(G)) goto l1227;\n+ }\n+ l1228:;\t goto l1226;\n+ l1227:;\t G->pos= yypos1227; G->thunkpos= yythunkpos1227;\n+ } if (!yy_HtmlBlockCloseBlockquote(G)) { goto l1225; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockBlockquote\", G->buf+G->pos));\n return 1;\n- l1220:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1225:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockBlockquote\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseBlockquote(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseBlockquote\")); if (!yymatchChar(G, '<')) goto l1226; if (!yy_Spnl(G)) { goto l1226; } if (!yymatchChar(G, '\/')) goto l1226;\n- { int yypos1227= G->pos, yythunkpos1227= G->thunkpos; if (!yymatchString(G, \"blockquote\")) goto l1228; goto l1227;\n- l1228:;\t G->pos= yypos1227; G->thunkpos= yythunkpos1227; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l1226;\n- }\n- l1227:;\t if (!yy_Spnl(G)) { goto l1226; } if (!yymatchChar(G, '>')) goto l1226;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseBlockquote\")); if (!yymatchChar(G, '<')) goto l1231; if (!yy_Spnl(G)) { goto l1231; } if (!yymatchChar(G, '\/')) goto l1231;\n+ { int yypos1232= G->pos, yythunkpos1232= G->thunkpos; if (!yymatchString(G, \"blockquote\")) goto l1233; goto l1232;\n+ l1233:;\t G->pos= yypos1232; G->thunkpos= yythunkpos1232; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l1231;\n+ }\n+ l1232:;\t if (!yy_Spnl(G)) { goto l1231; } if (!yymatchChar(G, '>')) goto l1231;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseBlockquote\", G->buf+G->pos));\n return 1;\n- l1226:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1231:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseBlockquote\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenBlockquote(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenBlockquote\")); if (!yymatchChar(G, '<')) goto l1229; if (!yy_Spnl(G)) { goto l1229; }\n- { int yypos1230= G->pos, yythunkpos1230= G->thunkpos; if (!yymatchString(G, \"blockquote\")) goto l1231; goto l1230;\n- l1231:;\t G->pos= yypos1230; G->thunkpos= yythunkpos1230; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l1229;\n- }\n- l1230:;\t if (!yy_Spnl(G)) { goto l1229; }\n- l1232:;\t\n- { int yypos1233= G->pos, yythunkpos1233= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1233; } goto l1232;\n- l1233:;\t G->pos= yypos1233; G->thunkpos= yythunkpos1233;\n- } if (!yymatchChar(G, '>')) goto l1229;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenBlockquote\")); if (!yymatchChar(G, '<')) goto l1234; if (!yy_Spnl(G)) { goto l1234; }\n+ { int yypos1235= G->pos, yythunkpos1235= G->thunkpos; if (!yymatchString(G, \"blockquote\")) goto l1236; goto l1235;\n+ l1236:;\t G->pos= yypos1235; G->thunkpos= yythunkpos1235; if (!yymatchString(G, \"BLOCKQUOTE\")) goto l1234;\n+ }\n+ l1235:;\t if (!yy_Spnl(G)) { goto l1234; }\n+ l1237:;\t\n+ { int yypos1238= G->pos, yythunkpos1238= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1238; } goto l1237;\n+ l1238:;\t G->pos= yypos1238; G->thunkpos= yythunkpos1238;\n+ } if (!yymatchChar(G, '>')) goto l1234;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenBlockquote\", G->buf+G->pos));\n return 1;\n- l1229:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1234:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenBlockquote\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockAddress(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockAddress\")); if (!yy_HtmlBlockOpenAddress(G)) { goto l1234; }\n- l1235:;\t\n- { int yypos1236= G->pos, yythunkpos1236= G->thunkpos;\n- { int yypos1237= G->pos, yythunkpos1237= G->thunkpos; if (!yy_HtmlBlockAddress(G)) { goto l1238; } goto l1237;\n- l1238:;\t G->pos= yypos1237; G->thunkpos= yythunkpos1237;\n- { int yypos1239= G->pos, yythunkpos1239= G->thunkpos; if (!yy_HtmlBlockCloseAddress(G)) { goto l1239; } goto l1236;\n- l1239:;\t G->pos= yypos1239; G->thunkpos= yythunkpos1239;\n- } if (!yymatchDot(G)) goto l1236;\n- }\n- l1237:;\t goto l1235;\n- l1236:;\t G->pos= yypos1236; G->thunkpos= yythunkpos1236;\n- } if (!yy_HtmlBlockCloseAddress(G)) { goto l1234; }\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockAddress\")); if (!yy_HtmlBlockOpenAddress(G)) { goto l1239; }\n+ l1240:;\t\n+ { int yypos1241= G->pos, yythunkpos1241= G->thunkpos;\n+ { int yypos1242= G->pos, yythunkpos1242= G->thunkpos; if (!yy_HtmlBlockAddress(G)) { goto l1243; } goto l1242;\n+ l1243:;\t G->pos= yypos1242; G->thunkpos= yythunkpos1242;\n+ { int yypos1244= G->pos, yythunkpos1244= G->thunkpos; if (!yy_HtmlBlockCloseAddress(G)) { goto l1244; } goto l1241;\n+ l1244:;\t G->pos= yypos1244; G->thunkpos= yythunkpos1244;\n+ } if (!yymatchDot(G)) goto l1241;\n+ }\n+ l1242:;\t goto l1240;\n+ l1241:;\t G->pos= yypos1241; G->thunkpos= yythunkpos1241;\n+ } if (!yy_HtmlBlockCloseAddress(G)) { goto l1239; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockAddress\", G->buf+G->pos));\n return 1;\n- l1234:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1239:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockAddress\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockCloseAddress(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseAddress\")); if (!yymatchChar(G, '<')) goto l1240; if (!yy_Spnl(G)) { goto l1240; } if (!yymatchChar(G, '\/')) goto l1240;\n- { int yypos1241= G->pos, yythunkpos1241= G->thunkpos; if (!yymatchString(G, \"address\")) goto l1242; goto l1241;\n- l1242:;\t G->pos= yypos1241; G->thunkpos= yythunkpos1241; if (!yymatchString(G, \"ADDRESS\")) goto l1240;\n- }\n- l1241:;\t if (!yy_Spnl(G)) { goto l1240; } if (!yymatchChar(G, '>')) goto l1240;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockCloseAddress\")); if (!yymatchChar(G, '<')) goto l1245; if (!yy_Spnl(G)) { goto l1245; } if (!yymatchChar(G, '\/')) goto l1245;\n+ { int yypos1246= G->pos, yythunkpos1246= G->thunkpos; if (!yymatchString(G, \"address\")) goto l1247; goto l1246;\n+ l1247:;\t G->pos= yypos1246; G->thunkpos= yythunkpos1246; if (!yymatchString(G, \"ADDRESS\")) goto l1245;\n+ }\n+ l1246:;\t if (!yy_Spnl(G)) { goto l1245; } if (!yymatchChar(G, '>')) goto l1245;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockCloseAddress\", G->buf+G->pos));\n return 1;\n- l1240:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1245:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockCloseAddress\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlAttribute(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"HtmlAttribute\"));\n- { int yypos1246= G->pos, yythunkpos1246= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l1247; } goto l1246;\n- l1247:;\t G->pos= yypos1246; G->thunkpos= yythunkpos1246; if (!yymatchChar(G, '-')) goto l1243;\n- }\n- l1246:;\t\n- l1244:;\t\n- { int yypos1245= G->pos, yythunkpos1245= G->thunkpos;\n- { int yypos1248= G->pos, yythunkpos1248= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l1249; } goto l1248;\n- l1249:;\t G->pos= yypos1248; G->thunkpos= yythunkpos1248; if (!yymatchChar(G, '-')) goto l1245;\n- }\n- l1248:;\t goto l1244;\n- l1245:;\t G->pos= yypos1245; G->thunkpos= yythunkpos1245;\n- } if (!yy_Spnl(G)) { goto l1243; }\n- { int yypos1250= G->pos, yythunkpos1250= G->thunkpos; if (!yymatchChar(G, '=')) goto l1250; if (!yy_Spnl(G)) { goto l1250; }\n- { int yypos1252= G->pos, yythunkpos1252= G->thunkpos; if (!yy_Quoted(G)) { goto l1253; } goto l1252;\n- l1253:;\t G->pos= yypos1252; G->thunkpos= yythunkpos1252;\n- { int yypos1256= G->pos, yythunkpos1256= G->thunkpos; if (!yymatchChar(G, '>')) goto l1256; goto l1250;\n- l1256:;\t G->pos= yypos1256; G->thunkpos= yythunkpos1256;\n- } if (!yy_Nonspacechar(G)) { goto l1250; }\n- l1254:;\t\n- { int yypos1255= G->pos, yythunkpos1255= G->thunkpos;\n- { int yypos1257= G->pos, yythunkpos1257= G->thunkpos; if (!yymatchChar(G, '>')) goto l1257; goto l1255;\n- l1257:;\t G->pos= yypos1257; G->thunkpos= yythunkpos1257;\n- } if (!yy_Nonspacechar(G)) { goto l1255; } goto l1254;\n+ { int yypos1251= G->pos, yythunkpos1251= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l1252; } goto l1251;\n+ l1252:;\t G->pos= yypos1251; G->thunkpos= yythunkpos1251; if (!yymatchChar(G, '-')) goto l1248;\n+ }\n+ l1251:;\t\n+ l1249:;\t\n+ { int yypos1250= G->pos, yythunkpos1250= G->thunkpos;\n+ { int yypos1253= G->pos, yythunkpos1253= G->thunkpos; if (!yy_AlphanumericAscii(G)) { goto l1254; } goto l1253;\n+ l1254:;\t G->pos= yypos1253; G->thunkpos= yythunkpos1253; if (!yymatchChar(G, '-')) goto l1250;\n+ }\n+ l1253:;\t goto l1249;\n+ l1250:;\t G->pos= yypos1250; G->thunkpos= yythunkpos1250;\n+ } if (!yy_Spnl(G)) { goto l1248; }\n+ { int yypos1255= G->pos, yythunkpos1255= G->thunkpos; if (!yymatchChar(G, '=')) goto l1255; if (!yy_Spnl(G)) { goto l1255; }\n+ { int yypos1257= G->pos, yythunkpos1257= G->thunkpos; if (!yy_Quoted(G)) { goto l1258; } goto l1257;\n+ l1258:;\t G->pos= yypos1257; G->thunkpos= yythunkpos1257;\n+ { int yypos1261= G->pos, yythunkpos1261= G->thunkpos; if (!yymatchChar(G, '>')) goto l1261; goto l1255;\n+ l1261:;\t G->pos= yypos1261; G->thunkpos= yythunkpos1261;\n+ } if (!yy_Nonspacechar(G)) { goto l1255; }\n+ l1259:;\t\n+ { int yypos1260= G->pos, yythunkpos1260= G->thunkpos;\n+ { int yypos1262= G->pos, yythunkpos1262= G->thunkpos; if (!yymatchChar(G, '>')) goto l1262; goto l1260;\n+ l1262:;\t G->pos= yypos1262; G->thunkpos= yythunkpos1262;\n+ } if (!yy_Nonspacechar(G)) { goto l1260; } goto l1259;\n+ l1260:;\t G->pos= yypos1260; G->thunkpos= yythunkpos1260;\n+ }\n+ }\n+ l1257:;\t goto l1256;\n l1255:;\t G->pos= yypos1255; G->thunkpos= yythunkpos1255;\n }\n- }\n- l1252:;\t goto l1251;\n- l1250:;\t G->pos= yypos1250; G->thunkpos= yythunkpos1250;\n- }\n- l1251:;\t if (!yy_Spnl(G)) { goto l1243; }\n+ l1256:;\t if (!yy_Spnl(G)) { goto l1248; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlAttribute\", G->buf+G->pos));\n return 1;\n- l1243:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1248:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlAttribute\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlockOpenAddress(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenAddress\")); if (!yymatchChar(G, '<')) goto l1258; if (!yy_Spnl(G)) { goto l1258; }\n- { int yypos1259= G->pos, yythunkpos1259= G->thunkpos; if (!yymatchString(G, \"address\")) goto l1260; goto l1259;\n- l1260:;\t G->pos= yypos1259; G->thunkpos= yythunkpos1259; if (!yymatchString(G, \"ADDRESS\")) goto l1258;\n- }\n- l1259:;\t if (!yy_Spnl(G)) { goto l1258; }\n- l1261:;\t\n- { int yypos1262= G->pos, yythunkpos1262= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1262; } goto l1261;\n- l1262:;\t G->pos= yypos1262; G->thunkpos= yythunkpos1262;\n- } if (!yymatchChar(G, '>')) goto l1258;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlockOpenAddress\")); if (!yymatchChar(G, '<')) goto l1263; if (!yy_Spnl(G)) { goto l1263; }\n+ { int yypos1264= G->pos, yythunkpos1264= G->thunkpos; if (!yymatchString(G, \"address\")) goto l1265; goto l1264;\n+ l1265:;\t G->pos= yypos1264; G->thunkpos= yythunkpos1264; if (!yymatchString(G, \"ADDRESS\")) goto l1263;\n+ }\n+ l1264:;\t if (!yy_Spnl(G)) { goto l1263; }\n+ l1266:;\t\n+ { int yypos1267= G->pos, yythunkpos1267= G->thunkpos; if (!yy_HtmlAttribute(G)) { goto l1267; } goto l1266;\n+ l1267:;\t G->pos= yypos1267; G->thunkpos= yythunkpos1267;\n+ } if (!yymatchChar(G, '>')) goto l1263;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlockOpenAddress\", G->buf+G->pos));\n return 1;\n- l1258:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1263:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlockOpenAddress\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_OptionallyIndentedLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"OptionallyIndentedLine\"));\n- { int yypos1264= G->pos, yythunkpos1264= G->thunkpos; if (!yy_Indent(G)) { goto l1264; } goto l1265;\n- l1264:;\t G->pos= yypos1264; G->thunkpos= yythunkpos1264;\n- }\n- l1265:;\t if (!yy_Line(G)) { goto l1263; }\n+ { int yypos1269= G->pos, yythunkpos1269= G->thunkpos; if (!yy_Indent(G)) { goto l1269; } goto l1270;\n+ l1269:;\t G->pos= yypos1269; G->thunkpos= yythunkpos1269;\n+ }\n+ l1270:;\t if (!yy_Line(G)) { goto l1268; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"OptionallyIndentedLine\", G->buf+G->pos));\n return 1;\n- l1263:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1268:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"OptionallyIndentedLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Indent(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Indent\"));\n- { int yypos1267= G->pos, yythunkpos1267= G->thunkpos; if (!yymatchChar(G, '\\t')) goto l1268; goto l1267;\n- l1268:;\t G->pos= yypos1267; G->thunkpos= yythunkpos1267; if (!yymatchString(G, \" \")) goto l1266;\n- }\n- l1267:;\t\n+ { int yypos1272= G->pos, yythunkpos1272= G->thunkpos; if (!yymatchChar(G, '\\t')) goto l1273; goto l1272;\n+ l1273:;\t G->pos= yypos1272; G->thunkpos= yythunkpos1272; if (!yymatchString(G, \" \")) goto l1271;\n+ }\n+ l1272:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Indent\", G->buf+G->pos));\n return 1;\n- l1266:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1271:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Indent\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListBlockLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"ListBlockLine\"));\n- { int yypos1270= G->pos, yythunkpos1270= G->thunkpos; if (!yy_BlankLine(G)) { goto l1270; } goto l1269;\n- l1270:;\t G->pos= yypos1270; G->thunkpos= yythunkpos1270;\n- }\n- { int yypos1271= G->pos, yythunkpos1271= G->thunkpos;\n- { int yypos1272= G->pos, yythunkpos1272= G->thunkpos; if (!yy_Indent(G)) { goto l1272; } goto l1273;\n- l1272:;\t G->pos= yypos1272; G->thunkpos= yythunkpos1272;\n- }\n- l1273:;\t\n- { int yypos1274= G->pos, yythunkpos1274= G->thunkpos; if (!yy_Bullet(G)) { goto l1275; } goto l1274;\n- l1275:;\t G->pos= yypos1274; G->thunkpos= yythunkpos1274; if (!yy_Enumerator(G)) { goto l1271; }\n- }\n- l1274:;\t goto l1269;\n- l1271:;\t G->pos= yypos1271; G->thunkpos= yythunkpos1271;\n- }\n- { int yypos1276= G->pos, yythunkpos1276= G->thunkpos; if (!yy_HorizontalRule(G)) { goto l1276; } goto l1269;\n+ { int yypos1275= G->pos, yythunkpos1275= G->thunkpos; if (!yy_BlankLine(G)) { goto l1275; } goto l1274;\n+ l1275:;\t G->pos= yypos1275; G->thunkpos= yythunkpos1275;\n+ }\n+ { int yypos1276= G->pos, yythunkpos1276= G->thunkpos;\n+ { int yypos1277= G->pos, yythunkpos1277= G->thunkpos; if (!yy_Indent(G)) { goto l1277; } goto l1278;\n+ l1277:;\t G->pos= yypos1277; G->thunkpos= yythunkpos1277;\n+ }\n+ l1278:;\t\n+ { int yypos1279= G->pos, yythunkpos1279= G->thunkpos; if (!yy_Bullet(G)) { goto l1280; } goto l1279;\n+ l1280:;\t G->pos= yypos1279; G->thunkpos= yythunkpos1279; if (!yy_Enumerator(G)) { goto l1276; }\n+ }\n+ l1279:;\t goto l1274;\n l1276:;\t G->pos= yypos1276; G->thunkpos= yythunkpos1276;\n- } if (!yy_OptionallyIndentedLine(G)) { goto l1269; }\n+ }\n+ { int yypos1281= G->pos, yythunkpos1281= G->thunkpos; if (!yy_HorizontalRule(G)) { goto l1281; } goto l1274;\n+ l1281:;\t G->pos= yypos1281; G->thunkpos= yythunkpos1281;\n+ } if (!yy_OptionallyIndentedLine(G)) { goto l1274; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListBlockLine\", G->buf+G->pos));\n return 1;\n- l1269:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1274:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListBlockLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListContinuationBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"ListContinuationBlock\")); if (!yy_StartList(G)) { goto l1277; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1277;\n- l1278:;\t\n- { int yypos1279= G->pos, yythunkpos1279= G->thunkpos; if (!yy_BlankLine(G)) { goto l1279; } goto l1278;\n- l1279:;\t G->pos= yypos1279; G->thunkpos= yythunkpos1279;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1277; yyDo(G, yy_1_ListContinuationBlock, G->begin, G->end); if (!yy_Indent(G)) { goto l1277; } if (!yy_ListBlock(G)) { goto l1277; } yyDo(G, yy_2_ListContinuationBlock, G->begin, G->end);\n- l1280:;\t\n- { int yypos1281= G->pos, yythunkpos1281= G->thunkpos; if (!yy_Indent(G)) { goto l1281; } if (!yy_ListBlock(G)) { goto l1281; } yyDo(G, yy_2_ListContinuationBlock, G->begin, G->end); goto l1280;\n- l1281:;\t G->pos= yypos1281; G->thunkpos= yythunkpos1281;\n+ yyprintf((stderr, \"%s\\n\", \"ListContinuationBlock\")); if (!yy_StartList(G)) { goto l1282; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1282;\n+ l1283:;\t\n+ { int yypos1284= G->pos, yythunkpos1284= G->thunkpos; if (!yy_BlankLine(G)) { goto l1284; } goto l1283;\n+ l1284:;\t G->pos= yypos1284; G->thunkpos= yythunkpos1284;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1282; yyDo(G, yy_1_ListContinuationBlock, G->begin, G->end); if (!yy_Indent(G)) { goto l1282; } if (!yy_ListBlock(G)) { goto l1282; } yyDo(G, yy_2_ListContinuationBlock, G->begin, G->end);\n+ l1285:;\t\n+ { int yypos1286= G->pos, yythunkpos1286= G->thunkpos; if (!yy_Indent(G)) { goto l1286; } if (!yy_ListBlock(G)) { goto l1286; } yyDo(G, yy_2_ListContinuationBlock, G->begin, G->end); goto l1285;\n+ l1286:;\t G->pos= yypos1286; G->thunkpos= yythunkpos1286;\n } yyDo(G, yy_3_ListContinuationBlock, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListContinuationBlock\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1277:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1282:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListContinuationBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"ListBlock\")); if (!yy_StartList(G)) { goto l1282; } yyDo(G, yySet, -1, 0);\n- { int yypos1283= G->pos, yythunkpos1283= G->thunkpos; if (!yy_BlankLine(G)) { goto l1283; } goto l1282;\n- l1283:;\t G->pos= yypos1283; G->thunkpos= yythunkpos1283;\n- } if (!yy_Line(G)) { goto l1282; } yyDo(G, yy_1_ListBlock, G->begin, G->end);\n- l1284:;\t\n- { int yypos1285= G->pos, yythunkpos1285= G->thunkpos; if (!yy_ListBlockLine(G)) { goto l1285; } yyDo(G, yy_2_ListBlock, G->begin, G->end); goto l1284;\n- l1285:;\t G->pos= yypos1285; G->thunkpos= yythunkpos1285;\n+ yyprintf((stderr, \"%s\\n\", \"ListBlock\")); if (!yy_StartList(G)) { goto l1287; } yyDo(G, yySet, -1, 0);\n+ { int yypos1288= G->pos, yythunkpos1288= G->thunkpos; if (!yy_BlankLine(G)) { goto l1288; } goto l1287;\n+ l1288:;\t G->pos= yypos1288; G->thunkpos= yythunkpos1288;\n+ } if (!yy_Line(G)) { goto l1287; } yyDo(G, yy_1_ListBlock, G->begin, G->end);\n+ l1289:;\t\n+ { int yypos1290= G->pos, yythunkpos1290= G->thunkpos; if (!yy_ListBlockLine(G)) { goto l1290; } yyDo(G, yy_2_ListBlock, G->begin, G->end); goto l1289;\n+ l1290:;\t G->pos= yypos1290; G->thunkpos= yythunkpos1290;\n } yyDo(G, yy_3_ListBlock, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListBlock\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1282:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1287:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListItem(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n yyprintf((stderr, \"%s\\n\", \"ListItem\"));\n- { int yypos1287= G->pos, yythunkpos1287= G->thunkpos; if (!yy_Bullet(G)) { goto l1288; } goto l1287;\n- l1288:;\t G->pos= yypos1287; G->thunkpos= yythunkpos1287; if (!yy_Enumerator(G)) { goto l1286; }\n- }\n- l1287:;\t if (!yy_StartList(G)) { goto l1286; } yyDo(G, yySet, -1, 0); if (!yy_ListBlock(G)) { goto l1286; } yyDo(G, yy_1_ListItem, G->begin, G->end);\n- l1289:;\t\n- { int yypos1290= G->pos, yythunkpos1290= G->thunkpos; if (!yy_ListContinuationBlock(G)) { goto l1290; } yyDo(G, yy_2_ListItem, G->begin, G->end); goto l1289;\n- l1290:;\t G->pos= yypos1290; G->thunkpos= yythunkpos1290;\n+ { int yypos1292= G->pos, yythunkpos1292= G->thunkpos; if (!yy_Bullet(G)) { goto l1293; } goto l1292;\n+ l1293:;\t G->pos= yypos1292; G->thunkpos= yythunkpos1292; if (!yy_Enumerator(G)) { goto l1291; }\n+ }\n+ l1292:;\t if (!yy_StartList(G)) { goto l1291; } yyDo(G, yySet, -1, 0); if (!yy_ListBlock(G)) { goto l1291; } yyDo(G, yy_1_ListItem, G->begin, G->end);\n+ l1294:;\t\n+ { int yypos1295= G->pos, yythunkpos1295= G->thunkpos; if (!yy_ListContinuationBlock(G)) { goto l1295; } yyDo(G, yy_2_ListItem, G->begin, G->end); goto l1294;\n+ l1295:;\t G->pos= yypos1295; G->thunkpos= yythunkpos1295;\n } yyDo(G, yy_3_ListItem, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListItem\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1286:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1291:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListItem\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Enumerator(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Enumerator\")); if (!yy_NonindentSpace(G)) { goto l1291; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1291; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1291;\n- l1292:;\t\n- { int yypos1293= G->pos, yythunkpos1293= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1293; goto l1292;\n- l1293:;\t G->pos= yypos1293; G->thunkpos= yythunkpos1293;\n- } if (!yymatchChar(G, '.')) goto l1291; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1291; if (!yy_Spacechar(G)) { goto l1291; }\n- l1294:;\t\n- { int yypos1295= G->pos, yythunkpos1295= G->thunkpos; if (!yy_Spacechar(G)) { goto l1295; } goto l1294;\n- l1295:;\t G->pos= yypos1295; G->thunkpos= yythunkpos1295;\n+ yyprintf((stderr, \"%s\\n\", \"Enumerator\")); if (!yy_NonindentSpace(G)) { goto l1296; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1296; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1296;\n+ l1297:;\t\n+ { int yypos1298= G->pos, yythunkpos1298= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1298; goto l1297;\n+ l1298:;\t G->pos= yypos1298; G->thunkpos= yythunkpos1298;\n+ } if (!yymatchChar(G, '.')) goto l1296; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1296; if (!yy_Spacechar(G)) { goto l1296; }\n+ l1299:;\t\n+ { int yypos1300= G->pos, yythunkpos1300= G->thunkpos; if (!yy_Spacechar(G)) { goto l1300; } goto l1299;\n+ l1300:;\t G->pos= yypos1300; G->thunkpos= yythunkpos1300;\n } yyDo(G, yy_1_Enumerator, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Enumerator\", G->buf+G->pos));\n return 1;\n- l1291:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1296:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Enumerator\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListItemTight(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n yyprintf((stderr, \"%s\\n\", \"ListItemTight\"));\n- { int yypos1297= G->pos, yythunkpos1297= G->thunkpos; if (!yy_Bullet(G)) { goto l1298; } goto l1297;\n- l1298:;\t G->pos= yypos1297; G->thunkpos= yythunkpos1297; if (!yy_Enumerator(G)) { goto l1296; }\n- }\n- l1297:;\t if (!yy_StartList(G)) { goto l1296; } yyDo(G, yySet, -1, 0); if (!yy_ListBlock(G)) { goto l1296; } yyDo(G, yy_1_ListItemTight, G->begin, G->end);\n- l1299:;\t\n- { int yypos1300= G->pos, yythunkpos1300= G->thunkpos;\n- { int yypos1301= G->pos, yythunkpos1301= G->thunkpos; if (!yy_BlankLine(G)) { goto l1301; } goto l1300;\n- l1301:;\t G->pos= yypos1301; G->thunkpos= yythunkpos1301;\n- } if (!yy_ListContinuationBlock(G)) { goto l1300; } yyDo(G, yy_2_ListItemTight, G->begin, G->end); goto l1299;\n- l1300:;\t G->pos= yypos1300; G->thunkpos= yythunkpos1300;\n- }\n- { int yypos1302= G->pos, yythunkpos1302= G->thunkpos; if (!yy_ListContinuationBlock(G)) { goto l1302; } goto l1296;\n- l1302:;\t G->pos= yypos1302; G->thunkpos= yythunkpos1302;\n+ { int yypos1302= G->pos, yythunkpos1302= G->thunkpos; if (!yy_Bullet(G)) { goto l1303; } goto l1302;\n+ l1303:;\t G->pos= yypos1302; G->thunkpos= yythunkpos1302; if (!yy_Enumerator(G)) { goto l1301; }\n+ }\n+ l1302:;\t if (!yy_StartList(G)) { goto l1301; } yyDo(G, yySet, -1, 0); if (!yy_ListBlock(G)) { goto l1301; } yyDo(G, yy_1_ListItemTight, G->begin, G->end);\n+ l1304:;\t\n+ { int yypos1305= G->pos, yythunkpos1305= G->thunkpos;\n+ { int yypos1306= G->pos, yythunkpos1306= G->thunkpos; if (!yy_BlankLine(G)) { goto l1306; } goto l1305;\n+ l1306:;\t G->pos= yypos1306; G->thunkpos= yythunkpos1306;\n+ } if (!yy_ListContinuationBlock(G)) { goto l1305; } yyDo(G, yy_2_ListItemTight, G->begin, G->end); goto l1304;\n+ l1305:;\t G->pos= yypos1305; G->thunkpos= yythunkpos1305;\n+ }\n+ { int yypos1307= G->pos, yythunkpos1307= G->thunkpos; if (!yy_ListContinuationBlock(G)) { goto l1307; } goto l1301;\n+ l1307:;\t G->pos= yypos1307; G->thunkpos= yythunkpos1307;\n } yyDo(G, yy_3_ListItemTight, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListItemTight\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1296:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1301:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListItemTight\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_ListLoose(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 2, 0);\n- yyprintf((stderr, \"%s\\n\", \"ListLoose\")); if (!yy_StartList(G)) { goto l1303; } yyDo(G, yySet, -2, 0); if (!yy_ListItem(G)) { goto l1303; } yyDo(G, yySet, -1, 0);\n- l1306:;\t\n- { int yypos1307= G->pos, yythunkpos1307= G->thunkpos; if (!yy_BlankLine(G)) { goto l1307; } goto l1306;\n- l1307:;\t G->pos= yypos1307; G->thunkpos= yythunkpos1307;\n+ yyprintf((stderr, \"%s\\n\", \"ListLoose\")); if (!yy_StartList(G)) { goto l1308; } yyDo(G, yySet, -2, 0); if (!yy_ListItem(G)) { goto l1308; } yyDo(G, yySet, -1, 0);\n+ l1311:;\t\n+ { int yypos1312= G->pos, yythunkpos1312= G->thunkpos; if (!yy_BlankLine(G)) { goto l1312; } goto l1311;\n+ l1312:;\t G->pos= yypos1312; G->thunkpos= yythunkpos1312;\n } yyDo(G, yy_1_ListLoose, G->begin, G->end);\n- l1304:;\t\n- { int yypos1305= G->pos, yythunkpos1305= G->thunkpos; if (!yy_ListItem(G)) { goto l1305; } yyDo(G, yySet, -1, 0);\n- l1308:;\t\n- { int yypos1309= G->pos, yythunkpos1309= G->thunkpos; if (!yy_BlankLine(G)) { goto l1309; } goto l1308;\n- l1309:;\t G->pos= yypos1309; G->thunkpos= yythunkpos1309;\n- } yyDo(G, yy_1_ListLoose, G->begin, G->end); goto l1304;\n- l1305:;\t G->pos= yypos1305; G->thunkpos= yythunkpos1305;\n- } yyDo(G, yy_2_ListLoose, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"ListLoose\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n- return 1;\n- l1303:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n- yyprintf((stderr, \" fail %s @ %s\\n\", \"ListLoose\", G->buf+G->pos));\n- return 0;\n-}\n-YY_RULE(int) yy_ListTight(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"ListTight\")); if (!yy_StartList(G)) { goto l1310; } yyDo(G, yySet, -1, 0); if (!yy_ListItemTight(G)) { goto l1310; } yyDo(G, yy_1_ListTight, G->begin, G->end);\n- l1311:;\t\n- { int yypos1312= G->pos, yythunkpos1312= G->thunkpos; if (!yy_ListItemTight(G)) { goto l1312; } yyDo(G, yy_1_ListTight, G->begin, G->end); goto l1311;\n- l1312:;\t G->pos= yypos1312; G->thunkpos= yythunkpos1312;\n- }\n+ l1309:;\t\n+ { int yypos1310= G->pos, yythunkpos1310= G->thunkpos; if (!yy_ListItem(G)) { goto l1310; } yyDo(G, yySet, -1, 0);\n l1313:;\t\n { int yypos1314= G->pos, yythunkpos1314= G->thunkpos; if (!yy_BlankLine(G)) { goto l1314; } goto l1313;\n l1314:;\t G->pos= yypos1314; G->thunkpos= yythunkpos1314;\n- }\n- { int yypos1315= G->pos, yythunkpos1315= G->thunkpos;\n- { int yypos1316= G->pos, yythunkpos1316= G->thunkpos; if (!yy_Bullet(G)) { goto l1317; } goto l1316;\n- l1317:;\t G->pos= yypos1316; G->thunkpos= yythunkpos1316; if (!yy_Enumerator(G)) { goto l1315; }\n- }\n- l1316:;\t goto l1310;\n- l1315:;\t G->pos= yypos1315; G->thunkpos= yythunkpos1315;\n+ } yyDo(G, yy_1_ListLoose, G->begin, G->end); goto l1309;\n+ l1310:;\t G->pos= yypos1310; G->thunkpos= yythunkpos1310;\n+ } yyDo(G, yy_2_ListLoose, G->begin, G->end);\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"ListLoose\", G->buf+G->pos)); yyDo(G, yyPop, 2, 0);\n+ return 1;\n+ l1308:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"ListLoose\", G->buf+G->pos));\n+ return 0;\n+}\n+YY_RULE(int) yy_ListTight(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n+ yyprintf((stderr, \"%s\\n\", \"ListTight\")); if (!yy_StartList(G)) { goto l1315; } yyDo(G, yySet, -1, 0); if (!yy_ListItemTight(G)) { goto l1315; } yyDo(G, yy_1_ListTight, G->begin, G->end);\n+ l1316:;\t\n+ { int yypos1317= G->pos, yythunkpos1317= G->thunkpos; if (!yy_ListItemTight(G)) { goto l1317; } yyDo(G, yy_1_ListTight, G->begin, G->end); goto l1316;\n+ l1317:;\t G->pos= yypos1317; G->thunkpos= yythunkpos1317;\n+ }\n+ l1318:;\t\n+ { int yypos1319= G->pos, yythunkpos1319= G->thunkpos; if (!yy_BlankLine(G)) { goto l1319; } goto l1318;\n+ l1319:;\t G->pos= yypos1319; G->thunkpos= yythunkpos1319;\n+ }\n+ { int yypos1320= G->pos, yythunkpos1320= G->thunkpos;\n+ { int yypos1321= G->pos, yythunkpos1321= G->thunkpos; if (!yy_Bullet(G)) { goto l1322; } goto l1321;\n+ l1322:;\t G->pos= yypos1321; G->thunkpos= yythunkpos1321; if (!yy_Enumerator(G)) { goto l1320; }\n+ }\n+ l1321:;\t goto l1315;\n+ l1320:;\t G->pos= yypos1320; G->thunkpos= yythunkpos1320;\n } yyDo(G, yy_2_ListTight, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"ListTight\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1310:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1315:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"ListTight\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Bullet(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Bullet\"));\n- { int yypos1319= G->pos, yythunkpos1319= G->thunkpos; if (!yy_HorizontalRule(G)) { goto l1319; } goto l1318;\n- l1319:;\t G->pos= yypos1319; G->thunkpos= yythunkpos1319;\n- } if (!yy_NonindentSpace(G)) { goto l1318; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1318;\n- { int yypos1320= G->pos, yythunkpos1320= G->thunkpos; if (!yymatchChar(G, '+')) goto l1321; goto l1320;\n- l1321:;\t G->pos= yypos1320; G->thunkpos= yythunkpos1320; if (!yymatchChar(G, '*')) goto l1322; goto l1320;\n- l1322:;\t G->pos= yypos1320; G->thunkpos= yythunkpos1320; if (!yymatchChar(G, '-')) goto l1318;\n- }\n- l1320:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1318; if (!yy_Spacechar(G)) { goto l1318; }\n- l1323:;\t\n- { int yypos1324= G->pos, yythunkpos1324= G->thunkpos; if (!yy_Spacechar(G)) { goto l1324; } goto l1323;\n+ { int yypos1324= G->pos, yythunkpos1324= G->thunkpos; if (!yy_HorizontalRule(G)) { goto l1324; } goto l1323;\n l1324:;\t G->pos= yypos1324; G->thunkpos= yythunkpos1324;\n+ } if (!yy_NonindentSpace(G)) { goto l1323; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1323;\n+ { int yypos1325= G->pos, yythunkpos1325= G->thunkpos; if (!yymatchChar(G, '+')) goto l1326; goto l1325;\n+ l1326:;\t G->pos= yypos1325; G->thunkpos= yythunkpos1325; if (!yymatchChar(G, '*')) goto l1327; goto l1325;\n+ l1327:;\t G->pos= yypos1325; G->thunkpos= yythunkpos1325; if (!yymatchChar(G, '-')) goto l1323;\n+ }\n+ l1325:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1323; if (!yy_Spacechar(G)) { goto l1323; }\n+ l1328:;\t\n+ { int yypos1329= G->pos, yythunkpos1329= G->thunkpos; if (!yy_Spacechar(G)) { goto l1329; } goto l1328;\n+ l1329:;\t G->pos= yypos1329; G->thunkpos= yythunkpos1329;\n } yyDo(G, yy_1_Bullet, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Bullet\", G->buf+G->pos));\n return 1;\n- l1318:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1323:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Bullet\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TableCell(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TableCell\")); if (!yy_Sp(G)) { goto l1325; }\n- l1326:;\t\n- { int yypos1327= G->pos, yythunkpos1327= G->thunkpos;\n- { int yypos1328= G->pos, yythunkpos1328= G->thunkpos; if (!yymatchChar(G, '|')) goto l1328; goto l1327;\n- l1328:;\t G->pos= yypos1328; G->thunkpos= yythunkpos1328;\n- }\n- { int yypos1329= G->pos, yythunkpos1329= G->thunkpos; if (!yy_Newline(G)) { goto l1329; } goto l1327;\n- l1329:;\t G->pos= yypos1329; G->thunkpos= yythunkpos1329;\n- } if (!yy_Inline(G)) { goto l1327; } goto l1326;\n- l1327:;\t G->pos= yypos1327; G->thunkpos= yythunkpos1327;\n- } if (!yy_TableBorder(G)) { goto l1325; }\n+ yyprintf((stderr, \"%s\\n\", \"TableCell\")); if (!yy_Sp(G)) { goto l1330; }\n+ l1331:;\t\n+ { int yypos1332= G->pos, yythunkpos1332= G->thunkpos;\n+ { int yypos1333= G->pos, yythunkpos1333= G->thunkpos; if (!yymatchChar(G, '|')) goto l1333; goto l1332;\n+ l1333:;\t G->pos= yypos1333; G->thunkpos= yythunkpos1333;\n+ }\n+ { int yypos1334= G->pos, yythunkpos1334= G->thunkpos; if (!yy_Newline(G)) { goto l1334; } goto l1332;\n+ l1334:;\t G->pos= yypos1334; G->thunkpos= yythunkpos1334;\n+ } if (!yy_Inline(G)) { goto l1332; } goto l1331;\n+ l1332:;\t G->pos= yypos1332; G->thunkpos= yythunkpos1332;\n+ } if (!yy_TableBorder(G)) { goto l1330; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TableCell\", G->buf+G->pos));\n return 1;\n- l1325:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1330:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TableCell\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TableBorder(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TableBorder\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1330; if (!yymatchChar(G, '|')) goto l1330; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1330; yyDo(G, yy_1_TableBorder, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"TableBorder\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1335; if (!yymatchChar(G, '|')) goto l1335; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1335; yyDo(G, yy_1_TableBorder, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TableBorder\", G->buf+G->pos));\n return 1;\n- l1330:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1335:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TableBorder\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TableLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TableLine\")); if (!yy_TableBorder(G)) { goto l1331; } if (!yy_TableCell(G)) { goto l1331; }\n- l1332:;\t\n- { int yypos1333= G->pos, yythunkpos1333= G->thunkpos; if (!yy_TableCell(G)) { goto l1333; } goto l1332;\n- l1333:;\t G->pos= yypos1333; G->thunkpos= yythunkpos1333;\n- } if (!yy_Sp(G)) { goto l1331; } if (!yy_Newline(G)) { goto l1331; }\n+ yyprintf((stderr, \"%s\\n\", \"TableLine\")); if (!yy_TableBorder(G)) { goto l1336; } if (!yy_TableCell(G)) { goto l1336; }\n+ l1337:;\t\n+ { int yypos1338= G->pos, yythunkpos1338= G->thunkpos; if (!yy_TableCell(G)) { goto l1338; } goto l1337;\n+ l1338:;\t G->pos= yypos1338; G->thunkpos= yythunkpos1338;\n+ } if (!yy_Sp(G)) { goto l1336; } if (!yy_Newline(G)) { goto l1336; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TableLine\", G->buf+G->pos));\n return 1;\n- l1331:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1336:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TableLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TableDelimiter(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"TableDelimiter\")); if (!yy_TableBorder(G)) { goto l1334; } if (!yy_Sp(G)) { goto l1334; }\n- { int yypos1337= G->pos, yythunkpos1337= G->thunkpos; if (!yymatchChar(G, ':')) goto l1337; goto l1338;\n- l1337:;\t G->pos= yypos1337; G->thunkpos= yythunkpos1337;\n- }\n- l1338:;\t if (!yymatchChar(G, '-')) goto l1334;\n- l1339:;\t\n- { int yypos1340= G->pos, yythunkpos1340= G->thunkpos; if (!yymatchChar(G, '-')) goto l1340; goto l1339;\n- l1340:;\t G->pos= yypos1340; G->thunkpos= yythunkpos1340;\n- }\n- { int yypos1341= G->pos, yythunkpos1341= G->thunkpos; if (!yymatchChar(G, ':')) goto l1341; goto l1342;\n+ yyprintf((stderr, \"%s\\n\", \"TableDelimiter\")); if (!yy_TableBorder(G)) { goto l1339; } if (!yy_Sp(G)) { goto l1339; }\n+ { int yypos1342= G->pos, yythunkpos1342= G->thunkpos; if (!yymatchChar(G, ':')) goto l1342; goto l1343;\n+ l1342:;\t G->pos= yypos1342; G->thunkpos= yythunkpos1342;\n+ }\n+ l1343:;\t if (!yymatchChar(G, '-')) goto l1339;\n+ l1344:;\t\n+ { int yypos1345= G->pos, yythunkpos1345= G->thunkpos; if (!yymatchChar(G, '-')) goto l1345; goto l1344;\n+ l1345:;\t G->pos= yypos1345; G->thunkpos= yythunkpos1345;\n+ }\n+ { int yypos1346= G->pos, yythunkpos1346= G->thunkpos; if (!yymatchChar(G, ':')) goto l1346; goto l1347;\n+ l1346:;\t G->pos= yypos1346; G->thunkpos= yythunkpos1346;\n+ }\n+ l1347:;\t if (!yy_Sp(G)) { goto l1339; } if (!yy_TableBorder(G)) { goto l1339; }\n+ l1340:;\t\n+ { int yypos1341= G->pos, yythunkpos1341= G->thunkpos; if (!yy_Sp(G)) { goto l1341; }\n+ { int yypos1348= G->pos, yythunkpos1348= G->thunkpos; if (!yymatchChar(G, ':')) goto l1348; goto l1349;\n+ l1348:;\t G->pos= yypos1348; G->thunkpos= yythunkpos1348;\n+ }\n+ l1349:;\t if (!yymatchChar(G, '-')) goto l1341;\n+ l1350:;\t\n+ { int yypos1351= G->pos, yythunkpos1351= G->thunkpos; if (!yymatchChar(G, '-')) goto l1351; goto l1350;\n+ l1351:;\t G->pos= yypos1351; G->thunkpos= yythunkpos1351;\n+ }\n+ { int yypos1352= G->pos, yythunkpos1352= G->thunkpos; if (!yymatchChar(G, ':')) goto l1352; goto l1353;\n+ l1352:;\t G->pos= yypos1352; G->thunkpos= yythunkpos1352;\n+ }\n+ l1353:;\t if (!yy_Sp(G)) { goto l1341; } if (!yy_TableBorder(G)) { goto l1341; } goto l1340;\n l1341:;\t G->pos= yypos1341; G->thunkpos= yythunkpos1341;\n- }\n- l1342:;\t if (!yy_Sp(G)) { goto l1334; } if (!yy_TableBorder(G)) { goto l1334; }\n- l1335:;\t\n- { int yypos1336= G->pos, yythunkpos1336= G->thunkpos; if (!yy_Sp(G)) { goto l1336; }\n- { int yypos1343= G->pos, yythunkpos1343= G->thunkpos; if (!yymatchChar(G, ':')) goto l1343; goto l1344;\n- l1343:;\t G->pos= yypos1343; G->thunkpos= yythunkpos1343;\n- }\n- l1344:;\t if (!yymatchChar(G, '-')) goto l1336;\n- l1345:;\t\n- { int yypos1346= G->pos, yythunkpos1346= G->thunkpos; if (!yymatchChar(G, '-')) goto l1346; goto l1345;\n- l1346:;\t G->pos= yypos1346; G->thunkpos= yythunkpos1346;\n- }\n- { int yypos1347= G->pos, yythunkpos1347= G->thunkpos; if (!yymatchChar(G, ':')) goto l1347; goto l1348;\n- l1347:;\t G->pos= yypos1347; G->thunkpos= yythunkpos1347;\n- }\n- l1348:;\t if (!yy_Sp(G)) { goto l1336; } if (!yy_TableBorder(G)) { goto l1336; } goto l1335;\n- l1336:;\t G->pos= yypos1336; G->thunkpos= yythunkpos1336;\n- } if (!yy_Sp(G)) { goto l1334; } if (!yy_Newline(G)) { goto l1334; }\n+ } if (!yy_Sp(G)) { goto l1339; } if (!yy_Newline(G)) { goto l1339; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TableDelimiter\", G->buf+G->pos));\n return 1;\n- l1334:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1339:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TableDelimiter\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_TableHeader(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"TableHeader\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1349; if (!yy_LocMarker(G)) { goto l1349; } yyDo(G, yySet, -1, 0); if (!yy_TableLine(G)) { goto l1349; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1349; yyDo(G, yy_1_TableHeader, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"TableHeader\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1354; if (!yy_LocMarker(G)) { goto l1354; } yyDo(G, yySet, -1, 0); if (!yy_TableLine(G)) { goto l1354; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1354; yyDo(G, yy_1_TableHeader, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"TableHeader\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1349:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1354:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"TableHeader\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_InlineEquationMultiple(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"InlineEquationMultiple\"));\n- { int yypos1351= G->pos, yythunkpos1351= G->thunkpos; if (!yymatchChar(G, '$')) goto l1351; goto l1350;\n- l1351:;\t G->pos= yypos1351; G->thunkpos= yythunkpos1351;\n- } if (!yy_Nonspacechar(G)) { goto l1350; }\n- { int yypos1354= G->pos, yythunkpos1354= G->thunkpos; if (!yymatchChar(G, '$')) goto l1354; goto l1350;\n- l1354:;\t G->pos= yypos1354; G->thunkpos= yythunkpos1354;\n- }\n- { int yypos1355= G->pos, yythunkpos1355= G->thunkpos; if (!yy_Newline(G)) { goto l1355; } goto l1350;\n- l1355:;\t G->pos= yypos1355; G->thunkpos= yythunkpos1355;\n- } if (!yymatchDot(G)) goto l1350;\n- l1352:;\t\n- { int yypos1353= G->pos, yythunkpos1353= G->thunkpos;\n- { int yypos1356= G->pos, yythunkpos1356= G->thunkpos; if (!yymatchChar(G, '$')) goto l1356; goto l1353;\n+ { int yypos1356= G->pos, yythunkpos1356= G->thunkpos; if (!yymatchChar(G, '$')) goto l1356; goto l1355;\n l1356:;\t G->pos= yypos1356; G->thunkpos= yythunkpos1356;\n- }\n- { int yypos1357= G->pos, yythunkpos1357= G->thunkpos; if (!yy_Newline(G)) { goto l1357; } goto l1353;\n- l1357:;\t G->pos= yypos1357; G->thunkpos= yythunkpos1357;\n- } if (!yymatchDot(G)) goto l1353; goto l1352;\n- l1353:;\t G->pos= yypos1353; G->thunkpos= yythunkpos1353;\n- } if (!yymatchChar(G, '$')) goto l1350; yyText(G, G->begin, G->end); if (!( IEP_POST )) goto l1350;\n+ } if (!yy_Nonspacechar(G)) { goto l1355; }\n+ { int yypos1359= G->pos, yythunkpos1359= G->thunkpos; if (!yymatchChar(G, '$')) goto l1359; goto l1355;\n+ l1359:;\t G->pos= yypos1359; G->thunkpos= yythunkpos1359;\n+ }\n+ { int yypos1360= G->pos, yythunkpos1360= G->thunkpos; if (!yy_Newline(G)) { goto l1360; } goto l1355;\n+ l1360:;\t G->pos= yypos1360; G->thunkpos= yythunkpos1360;\n+ } if (!yymatchDot(G)) goto l1355;\n+ l1357:;\t\n+ { int yypos1358= G->pos, yythunkpos1358= G->thunkpos;\n+ { int yypos1361= G->pos, yythunkpos1361= G->thunkpos; if (!yymatchChar(G, '$')) goto l1361; goto l1358;\n+ l1361:;\t G->pos= yypos1361; G->thunkpos= yythunkpos1361;\n+ }\n+ { int yypos1362= G->pos, yythunkpos1362= G->thunkpos; if (!yy_Newline(G)) { goto l1362; } goto l1358;\n+ l1362:;\t G->pos= yypos1362; G->thunkpos= yythunkpos1362;\n+ } if (!yymatchDot(G)) goto l1358; goto l1357;\n+ l1358:;\t G->pos= yypos1358; G->thunkpos= yythunkpos1358;\n+ } if (!yymatchChar(G, '$')) goto l1355; yyText(G, G->begin, G->end); if (!( IEP_POST )) goto l1355;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"InlineEquationMultiple\", G->buf+G->pos));\n return 1;\n- l1350:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1355:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"InlineEquationMultiple\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_InlineEquationSingle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"InlineEquationSingle\"));\n- { int yypos1359= G->pos, yythunkpos1359= G->thunkpos; if (!yymatchChar(G, '$')) goto l1359; goto l1358;\n- l1359:;\t G->pos= yypos1359; G->thunkpos= yythunkpos1359;\n- }\n- { int yypos1360= G->pos, yythunkpos1360= G->thunkpos; if (!yymatchChar(G, '\\\\')) goto l1360; goto l1358;\n- l1360:;\t G->pos= yypos1360; G->thunkpos= yythunkpos1360;\n- } if (!yy_Nonspacechar(G)) { goto l1358; } if (!yymatchChar(G, '$')) goto l1358;\n+ { int yypos1364= G->pos, yythunkpos1364= G->thunkpos; if (!yymatchChar(G, '$')) goto l1364; goto l1363;\n+ l1364:;\t G->pos= yypos1364; G->thunkpos= yythunkpos1364;\n+ }\n+ { int yypos1365= G->pos, yythunkpos1365= G->thunkpos; if (!yymatchChar(G, '\\\\')) goto l1365; goto l1363;\n+ l1365:;\t G->pos= yypos1365; G->thunkpos= yythunkpos1365;\n+ } if (!yy_Nonspacechar(G)) { goto l1363; } if (!yymatchChar(G, '$')) goto l1363;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"InlineEquationSingle\", G->buf+G->pos));\n return 1;\n- l1358:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1363:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"InlineEquationSingle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_InlineEquation(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"InlineEquation\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l1361; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1361; if (!yymatchChar(G, '$')) goto l1361; yyText(G, G->begin, G->end); if (!( IEP_PRE )) goto l1361;\n- { int yypos1362= G->pos, yythunkpos1362= G->thunkpos; if (!yy_InlineEquationSingle(G)) { goto l1363; } goto l1362;\n- l1363:;\t G->pos= yypos1362; G->thunkpos= yythunkpos1362; if (!yy_InlineEquationMultiple(G)) { goto l1361; }\n- }\n- l1362:;\t\n- { int yypos1364= G->pos, yythunkpos1364= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1364; goto l1361;\n- l1364:;\t G->pos= yypos1364; G->thunkpos= yythunkpos1364;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1361; yyDo(G, yy_1_InlineEquation, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"InlineEquation\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l1366; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1366; if (!yymatchChar(G, '$')) goto l1366; yyText(G, G->begin, G->end); if (!( IEP_PRE )) goto l1366;\n+ { int yypos1367= G->pos, yythunkpos1367= G->thunkpos; if (!yy_InlineEquationSingle(G)) { goto l1368; } goto l1367;\n+ l1368:;\t G->pos= yypos1367; G->thunkpos= yythunkpos1367; if (!yy_InlineEquationMultiple(G)) { goto l1366; }\n+ }\n+ l1367:;\t\n+ { int yypos1369= G->pos, yythunkpos1369= G->thunkpos; if (!yymatchClass(G, (unsigned char *)\"\\000\\000\\000\\000\\000\\000\\377\\003\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\\000\")) goto l1369; goto l1366;\n+ l1369:;\t G->pos= yypos1369; G->thunkpos= yythunkpos1369;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1366; yyDo(G, yy_1_InlineEquation, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"InlineEquation\", G->buf+G->pos));\n return 1;\n- l1361:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1366:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"InlineEquation\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Nonspacechar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Nonspacechar\"));\n- { int yypos1366= G->pos, yythunkpos1366= G->thunkpos; if (!yy_Spacechar(G)) { goto l1366; } goto l1365;\n- l1366:;\t G->pos= yypos1366; G->thunkpos= yythunkpos1366;\n- }\n- { int yypos1367= G->pos, yythunkpos1367= G->thunkpos; if (!yy_Newline(G)) { goto l1367; } goto l1365;\n- l1367:;\t G->pos= yypos1367; G->thunkpos= yythunkpos1367;\n- } if (!yymatchDot(G)) goto l1365;\n+ { int yypos1371= G->pos, yythunkpos1371= G->thunkpos; if (!yy_Spacechar(G)) { goto l1371; } goto l1370;\n+ l1371:;\t G->pos= yypos1371; G->thunkpos= yythunkpos1371;\n+ }\n+ { int yypos1372= G->pos, yythunkpos1372= G->thunkpos; if (!yy_Newline(G)) { goto l1372; } goto l1370;\n+ l1372:;\t G->pos= yypos1372; G->thunkpos= yythunkpos1372;\n+ } if (!yymatchDot(G)) goto l1370;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Nonspacechar\", G->buf+G->pos));\n return 1;\n- l1365:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1370:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Nonspacechar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormulaRawMark(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRawMark\"));\n- { int yypos1371= G->pos, yythunkpos1371= G->thunkpos; if (!yymatchChar(G, '{')) goto l1371; goto l1368;\n- l1371:;\t G->pos= yypos1371; G->thunkpos= yythunkpos1371;\n- }\n- { int yypos1372= G->pos, yythunkpos1372= G->thunkpos; if (!yymatchChar(G, '}')) goto l1372; goto l1368;\n- l1372:;\t G->pos= yypos1372; G->thunkpos= yythunkpos1372;\n- } if (!yy_Nonspacechar(G)) { goto l1368; }\n- l1369:;\t\n- { int yypos1370= G->pos, yythunkpos1370= G->thunkpos;\n- { int yypos1373= G->pos, yythunkpos1373= G->thunkpos; if (!yymatchChar(G, '{')) goto l1373; goto l1370;\n- l1373:;\t G->pos= yypos1373; G->thunkpos= yythunkpos1373;\n- }\n- { int yypos1374= G->pos, yythunkpos1374= G->thunkpos; if (!yymatchChar(G, '}')) goto l1374; goto l1370;\n- l1374:;\t G->pos= yypos1374; G->thunkpos= yythunkpos1374;\n- } if (!yy_Nonspacechar(G)) { goto l1370; } goto l1369;\n- l1370:;\t G->pos= yypos1370; G->thunkpos= yythunkpos1370;\n+ { int yypos1376= G->pos, yythunkpos1376= G->thunkpos; if (!yymatchChar(G, '{')) goto l1376; goto l1373;\n+ l1376:;\t G->pos= yypos1376; G->thunkpos= yythunkpos1376;\n+ }\n+ { int yypos1377= G->pos, yythunkpos1377= G->thunkpos; if (!yymatchChar(G, '}')) goto l1377; goto l1373;\n+ l1377:;\t G->pos= yypos1377; G->thunkpos= yythunkpos1377;\n+ } if (!yy_Nonspacechar(G)) { goto l1373; }\n+ l1374:;\t\n+ { int yypos1375= G->pos, yythunkpos1375= G->thunkpos;\n+ { int yypos1378= G->pos, yythunkpos1378= G->thunkpos; if (!yymatchChar(G, '{')) goto l1378; goto l1375;\n+ l1378:;\t G->pos= yypos1378; G->thunkpos= yythunkpos1378;\n+ }\n+ { int yypos1379= G->pos, yythunkpos1379= G->thunkpos; if (!yymatchChar(G, '}')) goto l1379; goto l1375;\n+ l1379:;\t G->pos= yypos1379; G->thunkpos= yythunkpos1379;\n+ } if (!yy_Nonspacechar(G)) { goto l1375; } goto l1374;\n+ l1375:;\t G->pos= yypos1375; G->thunkpos= yythunkpos1375;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormulaRawMark\", G->buf+G->pos));\n return 1;\n- l1368:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1373:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormulaRawMark\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormulaRawEnd(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRawEnd\")); if (!yymatchString(G, \"\\\\end\")) goto l1375; if (!yymatchChar(G, '{')) goto l1375; if (!yy_DisplayFormulaRawMark(G)) { goto l1375; } if (!yymatchChar(G, '}')) goto l1375;\n+ yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRawEnd\")); if (!yymatchString(G, \"\\\\end\")) goto l1380; if (!yymatchChar(G, '{')) goto l1380; if (!yy_DisplayFormulaRawMark(G)) { goto l1380; } if (!yymatchChar(G, '}')) goto l1380;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormulaRawEnd\", G->buf+G->pos));\n return 1;\n- l1375:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1380:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormulaRawEnd\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Spnl(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Spnl\")); if (!yy_Sp(G)) { goto l1376; }\n- { int yypos1377= G->pos, yythunkpos1377= G->thunkpos; if (!yy_Newline(G)) { goto l1377; } if (!yy_Sp(G)) { goto l1377; } goto l1378;\n- l1377:;\t G->pos= yypos1377; G->thunkpos= yythunkpos1377;\n- }\n- l1378:;\t\n+ yyprintf((stderr, \"%s\\n\", \"Spnl\")); if (!yy_Sp(G)) { goto l1381; }\n+ { int yypos1382= G->pos, yythunkpos1382= G->thunkpos; if (!yy_Newline(G)) { goto l1382; } if (!yy_Sp(G)) { goto l1382; } goto l1383;\n+ l1382:;\t G->pos= yypos1382; G->thunkpos= yythunkpos1382;\n+ }\n+ l1383:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Spnl\", G->buf+G->pos));\n return 1;\n- l1376:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1381:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Spnl\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormulaRawStart(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRawStart\")); if (!yymatchString(G, \"\\\\begin\")) goto l1379; if (!yymatchChar(G, '{')) goto l1379; if (!yy_DisplayFormulaRawMark(G)) { goto l1379; } if (!yymatchChar(G, '}')) goto l1379;\n+ yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRawStart\")); if (!yymatchString(G, \"\\\\begin\")) goto l1384; if (!yymatchChar(G, '{')) goto l1384; if (!yy_DisplayFormulaRawMark(G)) { goto l1384; } if (!yymatchChar(G, '}')) goto l1384;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormulaRawStart\", G->buf+G->pos));\n return 1;\n- l1379:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1384:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormulaRawStart\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FormulaNumber(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FormulaNumber\")); if (!yymatchChar(G, '(')) goto l1380;\n- { int yypos1383= G->pos, yythunkpos1383= G->thunkpos; if (!yymatchChar(G, ')')) goto l1383; goto l1380;\n- l1383:;\t G->pos= yypos1383; G->thunkpos= yythunkpos1383;\n- }\n- { int yypos1384= G->pos, yythunkpos1384= G->thunkpos; if (!yymatchChar(G, '$')) goto l1384; goto l1380;\n- l1384:;\t G->pos= yypos1384; G->thunkpos= yythunkpos1384;\n- }\n- { int yypos1385= G->pos, yythunkpos1385= G->thunkpos; if (!yy_Newline(G)) { goto l1385; } goto l1380;\n- l1385:;\t G->pos= yypos1385; G->thunkpos= yythunkpos1385;\n- } if (!yymatchDot(G)) goto l1380;\n- l1381:;\t\n- { int yypos1382= G->pos, yythunkpos1382= G->thunkpos;\n- { int yypos1386= G->pos, yythunkpos1386= G->thunkpos; if (!yymatchChar(G, ')')) goto l1386; goto l1382;\n- l1386:;\t G->pos= yypos1386; G->thunkpos= yythunkpos1386;\n- }\n- { int yypos1387= G->pos, yythunkpos1387= G->thunkpos; if (!yymatchChar(G, '$')) goto l1387; goto l1382;\n+ yyprintf((stderr, \"%s\\n\", \"FormulaNumber\")); if (!yymatchChar(G, '(')) goto l1385;\n+ { int yypos1388= G->pos, yythunkpos1388= G->thunkpos; if (!yymatchChar(G, ')')) goto l1388; goto l1385;\n+ l1388:;\t G->pos= yypos1388; G->thunkpos= yythunkpos1388;\n+ }\n+ { int yypos1389= G->pos, yythunkpos1389= G->thunkpos; if (!yymatchChar(G, '$')) goto l1389; goto l1385;\n+ l1389:;\t G->pos= yypos1389; G->thunkpos= yythunkpos1389;\n+ }\n+ { int yypos1390= G->pos, yythunkpos1390= G->thunkpos; if (!yy_Newline(G)) { goto l1390; } goto l1385;\n+ l1390:;\t G->pos= yypos1390; G->thunkpos= yythunkpos1390;\n+ } if (!yymatchDot(G)) goto l1385;\n+ l1386:;\t\n+ { int yypos1387= G->pos, yythunkpos1387= G->thunkpos;\n+ { int yypos1391= G->pos, yythunkpos1391= G->thunkpos; if (!yymatchChar(G, ')')) goto l1391; goto l1387;\n+ l1391:;\t G->pos= yypos1391; G->thunkpos= yythunkpos1391;\n+ }\n+ { int yypos1392= G->pos, yythunkpos1392= G->thunkpos; if (!yymatchChar(G, '$')) goto l1392; goto l1387;\n+ l1392:;\t G->pos= yypos1392; G->thunkpos= yythunkpos1392;\n+ }\n+ { int yypos1393= G->pos, yythunkpos1393= G->thunkpos; if (!yy_Newline(G)) { goto l1393; } goto l1387;\n+ l1393:;\t G->pos= yypos1393; G->thunkpos= yythunkpos1393;\n+ } if (!yymatchDot(G)) goto l1387; goto l1386;\n l1387:;\t G->pos= yypos1387; G->thunkpos= yythunkpos1387;\n- }\n- { int yypos1388= G->pos, yythunkpos1388= G->thunkpos; if (!yy_Newline(G)) { goto l1388; } goto l1382;\n- l1388:;\t G->pos= yypos1388; G->thunkpos= yythunkpos1388;\n- } if (!yymatchDot(G)) goto l1382; goto l1381;\n- l1382:;\t G->pos= yypos1382; G->thunkpos= yythunkpos1382;\n- } if (!yymatchChar(G, ')')) goto l1380;\n+ } if (!yymatchChar(G, ')')) goto l1385;\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FormulaNumber\", G->buf+G->pos));\n return 1;\n- l1380:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1385:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FormulaNumber\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormulaRaw(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRaw\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH_RAW) )) goto l1389; if (!yy_NonindentSpace(G)) { goto l1389; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1389; if (!yy_DisplayFormulaRawStart(G)) { goto l1389; } yyText(G, G->begin, G->end); if (!( start_dfr() )) goto l1389; if (!yy_Spnl(G)) { goto l1389; }\n- l1390:;\t\n- { int yypos1391= G->pos, yythunkpos1391= G->thunkpos;\n- { int yypos1392= G->pos, yythunkpos1392= G->thunkpos; if (!yy_DisplayFormulaRawStart(G)) { goto l1393; } yyText(G, G->begin, G->end); if (!( inc_dfr() )) goto l1393; goto l1392;\n- l1393:;\t G->pos= yypos1392; G->thunkpos= yythunkpos1392; yyText(G, G->begin, G->end); if (!( nested_dfr() )) goto l1394; if (!yy_DisplayFormulaRawEnd(G)) { goto l1394; } yyText(G, G->begin, G->end); if (!( dec_dfr() )) goto l1394; goto l1392;\n- l1394:;\t G->pos= yypos1392; G->thunkpos= yythunkpos1392;\n- { int yypos1395= G->pos, yythunkpos1395= G->thunkpos; if (!yy_DisplayFormulaRawEnd(G)) { goto l1395; } goto l1391;\n- l1395:;\t G->pos= yypos1395; G->thunkpos= yythunkpos1395;\n- }\n- { int yypos1396= G->pos, yythunkpos1396= G->thunkpos; if (!yy_DisplayFormulaRawStart(G)) { goto l1396; } goto l1391;\n+ yyprintf((stderr, \"%s\\n\", \"DisplayFormulaRaw\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH_RAW) )) goto l1394; if (!yy_NonindentSpace(G)) { goto l1394; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1394; if (!yy_DisplayFormulaRawStart(G)) { goto l1394; } yyText(G, G->begin, G->end); if (!( start_dfr() )) goto l1394; if (!yy_Spnl(G)) { goto l1394; }\n+ l1395:;\t\n+ { int yypos1396= G->pos, yythunkpos1396= G->thunkpos;\n+ { int yypos1397= G->pos, yythunkpos1397= G->thunkpos; if (!yy_DisplayFormulaRawStart(G)) { goto l1398; } yyText(G, G->begin, G->end); if (!( inc_dfr() )) goto l1398; goto l1397;\n+ l1398:;\t G->pos= yypos1397; G->thunkpos= yythunkpos1397; yyText(G, G->begin, G->end); if (!( nested_dfr() )) goto l1399; if (!yy_DisplayFormulaRawEnd(G)) { goto l1399; } yyText(G, G->begin, G->end); if (!( dec_dfr() )) goto l1399; goto l1397;\n+ l1399:;\t G->pos= yypos1397; G->thunkpos= yythunkpos1397;\n+ { int yypos1400= G->pos, yythunkpos1400= G->thunkpos; if (!yy_DisplayFormulaRawEnd(G)) { goto l1400; } goto l1396;\n+ l1400:;\t G->pos= yypos1400; G->thunkpos= yythunkpos1400;\n+ }\n+ { int yypos1401= G->pos, yythunkpos1401= G->thunkpos; if (!yy_DisplayFormulaRawStart(G)) { goto l1401; } goto l1396;\n+ l1401:;\t G->pos= yypos1401; G->thunkpos= yythunkpos1401;\n+ }\n+ { int yypos1402= G->pos, yythunkpos1402= G->thunkpos; if (!yy_Newline(G)) { goto l1402; } if (!yy_Newline(G)) { goto l1402; }\n+ l1403:;\t\n+ { int yypos1404= G->pos, yythunkpos1404= G->thunkpos; if (!yy_Newline(G)) { goto l1404; } goto l1403;\n+ l1404:;\t G->pos= yypos1404; G->thunkpos= yythunkpos1404;\n+ } goto l1396;\n+ l1402:;\t G->pos= yypos1402; G->thunkpos= yythunkpos1402;\n+ } if (!yymatchDot(G)) goto l1396;\n+ }\n+ l1397:;\t goto l1395;\n l1396:;\t G->pos= yypos1396; G->thunkpos= yythunkpos1396;\n- }\n- { int yypos1397= G->pos, yythunkpos1397= G->thunkpos; if (!yy_Newline(G)) { goto l1397; } if (!yy_Newline(G)) { goto l1397; }\n- l1398:;\t\n- { int yypos1399= G->pos, yythunkpos1399= G->thunkpos; if (!yy_Newline(G)) { goto l1399; } goto l1398;\n- l1399:;\t G->pos= yypos1399; G->thunkpos= yythunkpos1399;\n- } goto l1391;\n- l1397:;\t G->pos= yypos1397; G->thunkpos= yythunkpos1397;\n- } if (!yymatchDot(G)) goto l1391;\n- }\n- l1392:;\t goto l1390;\n- l1391:;\t G->pos= yypos1391; G->thunkpos= yythunkpos1391;\n- } yyText(G, G->begin, G->end); if (!( !nested_dfr() )) goto l1389; if (!yy_DisplayFormulaRawEnd(G)) { goto l1389; } yyText(G, G->begin, G->end); if (!( dec_dfr() )) goto l1389; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1389; if (!yy_Sp(G)) { goto l1389; } if (!yy_Newline(G)) { goto l1389; } yyDo(G, yy_1_DisplayFormulaRaw, G->begin, G->end);\n+ } yyText(G, G->begin, G->end); if (!( !nested_dfr() )) goto l1394; if (!yy_DisplayFormulaRawEnd(G)) { goto l1394; } yyText(G, G->begin, G->end); if (!( dec_dfr() )) goto l1394; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1394; if (!yy_Sp(G)) { goto l1394; } if (!yy_Newline(G)) { goto l1394; } yyDo(G, yy_1_DisplayFormulaRaw, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormulaRaw\", G->buf+G->pos));\n return 1;\n- l1389:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1394:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormulaRaw\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormulaDollar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DisplayFormulaDollar\")); if (!yy_NonindentSpace(G)) { goto l1400; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1400; if (!yymatchString(G, \"$$\")) goto l1400;\n- l1401:;\t\n- { int yypos1402= G->pos, yythunkpos1402= G->thunkpos;\n- { int yypos1403= G->pos, yythunkpos1403= G->thunkpos; if (!yymatchString(G, \"$$\")) goto l1403; goto l1402;\n- l1403:;\t G->pos= yypos1403; G->thunkpos= yythunkpos1403;\n- } if (!yymatchDot(G)) goto l1402; goto l1401;\n- l1402:;\t G->pos= yypos1402; G->thunkpos= yythunkpos1402;\n- } if (!yymatchString(G, \"$$\")) goto l1400; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1400; if (!yy_Sp(G)) { goto l1400; }\n- { int yypos1404= G->pos, yythunkpos1404= G->thunkpos; if (!yy_FormulaNumber(G)) { goto l1404; } goto l1405;\n- l1404:;\t G->pos= yypos1404; G->thunkpos= yythunkpos1404;\n- }\n- l1405:;\t if (!yy_Sp(G)) { goto l1400; } if (!yy_Newline(G)) { goto l1400; } yyDo(G, yy_1_DisplayFormulaDollar, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"DisplayFormulaDollar\")); if (!yy_NonindentSpace(G)) { goto l1405; } yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1405; if (!yymatchString(G, \"$$\")) goto l1405;\n+ l1406:;\t\n+ { int yypos1407= G->pos, yythunkpos1407= G->thunkpos;\n+ { int yypos1408= G->pos, yythunkpos1408= G->thunkpos; if (!yymatchString(G, \"$$\")) goto l1408; goto l1407;\n+ l1408:;\t G->pos= yypos1408; G->thunkpos= yythunkpos1408;\n+ } if (!yymatchDot(G)) goto l1407; goto l1406;\n+ l1407:;\t G->pos= yypos1407; G->thunkpos= yythunkpos1407;\n+ } if (!yymatchString(G, \"$$\")) goto l1405; yyText(G, G->begin, G->end); if (!(YY_END)) goto l1405; if (!yy_Sp(G)) { goto l1405; }\n+ { int yypos1409= G->pos, yythunkpos1409= G->thunkpos; if (!yy_FormulaNumber(G)) { goto l1409; } goto l1410;\n+ l1409:;\t G->pos= yypos1409; G->thunkpos= yythunkpos1409;\n+ }\n+ l1410:;\t if (!yy_Sp(G)) { goto l1405; } if (!yy_Newline(G)) { goto l1405; } yyDo(G, yy_1_DisplayFormulaDollar, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormulaDollar\", G->buf+G->pos));\n return 1;\n- l1400:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1405:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormulaDollar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockTidle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockTidle\")); if (!yy_FencedCodeBlockStartTidle(G)) { goto l1406; }\n- l1407:;\t\n- { int yypos1408= G->pos, yythunkpos1408= G->thunkpos; if (!yy_FencedCodeBlockChunkTidle(G)) { goto l1408; } goto l1407;\n- l1408:;\t G->pos= yypos1408; G->thunkpos= yythunkpos1408;\n- } if (!yy_FencedCodeBlockEndTidle(G)) { goto l1406; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockTidle\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1411; if (!yy_FencedCodeBlockStartTidleLine(G)) { goto l1411; }\n+ l1412:;\t\n+ { int yypos1413= G->pos, yythunkpos1413= G->thunkpos; if (!yy_FencedCodeBlockChunkTidle(G)) { goto l1413; } goto l1412;\n+ l1413:;\t G->pos= yypos1413; G->thunkpos= yythunkpos1413;\n+ } if (!yy_FencedCodeBlockEndTidle(G)) { goto l1411; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1411; yyDo(G, yy_1_FencedCodeBlockTidle, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockTidle\", G->buf+G->pos));\n return 1;\n- l1406:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1411:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockTidle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockTick(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockTick\")); if (!yy_FencedCodeBlockStartTick(G)) { goto l1409; }\n- l1410:;\t\n- { int yypos1411= G->pos, yythunkpos1411= G->thunkpos; if (!yy_FencedCodeBlockChunkTick(G)) { goto l1411; } goto l1410;\n- l1411:;\t G->pos= yypos1411; G->thunkpos= yythunkpos1411;\n- } if (!yy_FencedCodeBlockEndTick(G)) { goto l1409; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockTick\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1414; if (!yy_FencedCodeBlockStartTickLine(G)) { goto l1414; }\n+ l1415:;\t\n+ { int yypos1416= G->pos, yythunkpos1416= G->thunkpos; if (!yy_FencedCodeBlockChunkTick(G)) { goto l1416; } goto l1415;\n+ l1416:;\t G->pos= yypos1416; G->thunkpos= yythunkpos1416;\n+ } if (!yy_FencedCodeBlockEndTick(G)) { goto l1414; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1414; yyDo(G, yy_1_FencedCodeBlockTick, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockTick\", G->buf+G->pos));\n return 1;\n- l1409:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1414:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockTick\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockEndTidle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockEndTidle\")); if (!yymatchString(G, \"~~~\")) goto l1412;\n- l1413:;\t\n- { int yypos1414= G->pos, yythunkpos1414= G->thunkpos; if (!yy_Spacechar(G)) { goto l1414; } goto l1413;\n- l1414:;\t G->pos= yypos1414; G->thunkpos= yythunkpos1414;\n- } if (!yy_Newline(G)) { goto l1412; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockEndTidle\")); if (!yymatchString(G, \"~~~\")) goto l1417;\n+ l1418:;\t\n+ { int yypos1419= G->pos, yythunkpos1419= G->thunkpos; if (!yy_Spacechar(G)) { goto l1419; } goto l1418;\n+ l1419:;\t G->pos= yypos1419; G->thunkpos= yythunkpos1419;\n+ } if (!yy_Newline(G)) { goto l1417; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockEndTidle\", G->buf+G->pos));\n return 1;\n- l1412:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1417:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockEndTidle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockChunkTidle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockChunkTidle\"));\n- { int yypos1416= G->pos, yythunkpos1416= G->thunkpos; if (!yy_FencedCodeBlockEndTidle(G)) { goto l1416; } goto l1415;\n- l1416:;\t G->pos= yypos1416; G->thunkpos= yythunkpos1416;\n- }\n- l1417:;\t\n- { int yypos1418= G->pos, yythunkpos1418= G->thunkpos;\n- { int yypos1419= G->pos, yythunkpos1419= G->thunkpos; if (!yy_Newline(G)) { goto l1419; } goto l1418;\n- l1419:;\t G->pos= yypos1419; G->thunkpos= yythunkpos1419;\n- } if (!yymatchDot(G)) goto l1418; goto l1417;\n- l1418:;\t G->pos= yypos1418; G->thunkpos= yythunkpos1418;\n- } if (!yy_Newline(G)) { goto l1415; }\n+ { int yypos1421= G->pos, yythunkpos1421= G->thunkpos; if (!yy_FencedCodeBlockEndTidle(G)) { goto l1421; } goto l1420;\n+ l1421:;\t G->pos= yypos1421; G->thunkpos= yythunkpos1421;\n+ }\n+ l1422:;\t\n+ { int yypos1423= G->pos, yythunkpos1423= G->thunkpos;\n+ { int yypos1424= G->pos, yythunkpos1424= G->thunkpos; if (!yy_Newline(G)) { goto l1424; } goto l1423;\n+ l1424:;\t G->pos= yypos1424; G->thunkpos= yythunkpos1424;\n+ } if (!yymatchDot(G)) goto l1423; goto l1422;\n+ l1423:;\t G->pos= yypos1423; G->thunkpos= yythunkpos1423;\n+ } if (!yy_Newline(G)) { goto l1420; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockChunkTidle\", G->buf+G->pos));\n return 1;\n- l1415:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1420:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockChunkTidle\", G->buf+G->pos));\n return 0;\n }\n+YY_RULE(int) yy_FencedCodeBlockStartTidleLine(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTidleLine\")); if (!yy_FencedCodeBlockStartTidle(G)) { goto l1425; } if (!yy_Newline(G)) { goto l1425; }\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockStartTidleLine\", G->buf+G->pos));\n+ return 1;\n+ l1425:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockStartTidleLine\", G->buf+G->pos));\n+ return 0;\n+}\n YY_RULE(int) yy_FencedCodeBlockStartTidle(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTidle\")); if (!yymatchString(G, \"~~~\")) goto l1420;\n- l1421:;\t\n- { int yypos1422= G->pos, yythunkpos1422= G->thunkpos;\n- { int yypos1423= G->pos, yythunkpos1423= G->thunkpos; if (!yy_Newline(G)) { goto l1423; } goto l1422;\n- l1423:;\t G->pos= yypos1423; G->thunkpos= yythunkpos1423;\n- }\n- { int yypos1424= G->pos, yythunkpos1424= G->thunkpos; if (!yymatchChar(G, '~')) goto l1424; goto l1422;\n- l1424:;\t G->pos= yypos1424; G->thunkpos= yythunkpos1424;\n- } if (!yymatchDot(G)) goto l1422; goto l1421;\n- l1422:;\t G->pos= yypos1422; G->thunkpos= yythunkpos1422;\n- } if (!yy_Newline(G)) { goto l1420; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTidle\")); if (!yymatchString(G, \"~~~\")) goto l1426;\n+ l1427:;\t\n+ { int yypos1428= G->pos, yythunkpos1428= G->thunkpos;\n+ { int yypos1429= G->pos, yythunkpos1429= G->thunkpos; if (!yy_Newline(G)) { goto l1429; } goto l1428;\n+ l1429:;\t G->pos= yypos1429; G->thunkpos= yythunkpos1429;\n+ }\n+ { int yypos1430= G->pos, yythunkpos1430= G->thunkpos; if (!yymatchChar(G, '~')) goto l1430; goto l1428;\n+ l1430:;\t G->pos= yypos1430; G->thunkpos= yythunkpos1430;\n+ } if (!yymatchDot(G)) goto l1428; goto l1427;\n+ l1428:;\t G->pos= yypos1428; G->thunkpos= yythunkpos1428;\n+ }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockStartTidle\", G->buf+G->pos));\n return 1;\n- l1420:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1426:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockStartTidle\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Spacechar(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Spacechar\"));\n- { int yypos1426= G->pos, yythunkpos1426= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1427; goto l1426;\n- l1427:;\t G->pos= yypos1426; G->thunkpos= yythunkpos1426; if (!yymatchChar(G, '\\t')) goto l1425;\n- }\n- l1426:;\t\n+ { int yypos1432= G->pos, yythunkpos1432= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1433; goto l1432;\n+ l1433:;\t G->pos= yypos1432; G->thunkpos= yythunkpos1432; if (!yymatchChar(G, '\\t')) goto l1431;\n+ }\n+ l1432:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Spacechar\", G->buf+G->pos));\n return 1;\n- l1425:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1431:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Spacechar\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockEndTick(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockEndTick\")); if (!yymatchString(G, \"```\")) goto l1428;\n- l1429:;\t\n- { int yypos1430= G->pos, yythunkpos1430= G->thunkpos; if (!yy_Spacechar(G)) { goto l1430; } goto l1429;\n- l1430:;\t G->pos= yypos1430; G->thunkpos= yythunkpos1430;\n- } if (!yy_Newline(G)) { goto l1428; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockEndTick\")); if (!yymatchString(G, \"```\")) goto l1434;\n+ l1435:;\t\n+ { int yypos1436= G->pos, yythunkpos1436= G->thunkpos; if (!yy_Spacechar(G)) { goto l1436; } goto l1435;\n+ l1436:;\t G->pos= yypos1436; G->thunkpos= yythunkpos1436;\n+ } if (!yy_Newline(G)) { goto l1434; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockEndTick\", G->buf+G->pos));\n return 1;\n- l1428:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1434:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockEndTick\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlockChunkTick(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockChunkTick\"));\n- { int yypos1432= G->pos, yythunkpos1432= G->thunkpos; if (!yy_FencedCodeBlockEndTick(G)) { goto l1432; } goto l1431;\n- l1432:;\t G->pos= yypos1432; G->thunkpos= yythunkpos1432;\n- }\n- l1433:;\t\n- { int yypos1434= G->pos, yythunkpos1434= G->thunkpos;\n- { int yypos1435= G->pos, yythunkpos1435= G->thunkpos; if (!yy_Newline(G)) { goto l1435; } goto l1434;\n- l1435:;\t G->pos= yypos1435; G->thunkpos= yythunkpos1435;\n- } if (!yymatchDot(G)) goto l1434; goto l1433;\n- l1434:;\t G->pos= yypos1434; G->thunkpos= yythunkpos1434;\n- } if (!yy_Newline(G)) { goto l1431; }\n+ { int yypos1438= G->pos, yythunkpos1438= G->thunkpos; if (!yy_FencedCodeBlockEndTick(G)) { goto l1438; } goto l1437;\n+ l1438:;\t G->pos= yypos1438; G->thunkpos= yythunkpos1438;\n+ }\n+ l1439:;\t\n+ { int yypos1440= G->pos, yythunkpos1440= G->thunkpos;\n+ { int yypos1441= G->pos, yythunkpos1441= G->thunkpos; if (!yy_Newline(G)) { goto l1441; } goto l1440;\n+ l1441:;\t G->pos= yypos1441; G->thunkpos= yythunkpos1441;\n+ } if (!yymatchDot(G)) goto l1440; goto l1439;\n+ l1440:;\t G->pos= yypos1440; G->thunkpos= yythunkpos1440;\n+ } if (!yy_Newline(G)) { goto l1437; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockChunkTick\", G->buf+G->pos));\n return 1;\n- l1431:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1437:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockChunkTick\", G->buf+G->pos));\n return 0;\n }\n+YY_RULE(int) yy_FencedCodeBlockStartTickLine(GREG *G)\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTickLine\")); if (!yy_FencedCodeBlockStartTick(G)) { goto l1442; } if (!yy_Newline(G)) { goto l1442; }\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockStartTickLine\", G->buf+G->pos));\n+ return 1;\n+ l1442:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockStartTickLine\", G->buf+G->pos));\n+ return 0;\n+}\n YY_RULE(int) yy_FencedCodeBlockStartTick(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTick\")); if (!yymatchString(G, \"```\")) goto l1436;\n- l1437:;\t\n- { int yypos1438= G->pos, yythunkpos1438= G->thunkpos;\n- { int yypos1439= G->pos, yythunkpos1439= G->thunkpos; if (!yy_Newline(G)) { goto l1439; } goto l1438;\n- l1439:;\t G->pos= yypos1439; G->thunkpos= yythunkpos1439;\n- }\n- { int yypos1440= G->pos, yythunkpos1440= G->thunkpos; if (!yymatchChar(G, '`')) goto l1440; goto l1438;\n- l1440:;\t G->pos= yypos1440; G->thunkpos= yythunkpos1440;\n- } if (!yymatchDot(G)) goto l1438; goto l1437;\n- l1438:;\t G->pos= yypos1438; G->thunkpos= yythunkpos1438;\n- } if (!yy_Newline(G)) { goto l1436; }\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlockStartTick\")); if (!yymatchString(G, \"```\")) goto l1443;\n+ l1444:;\t\n+ { int yypos1445= G->pos, yythunkpos1445= G->thunkpos;\n+ { int yypos1446= G->pos, yythunkpos1446= G->thunkpos; if (!yy_Newline(G)) { goto l1446; } goto l1445;\n+ l1446:;\t G->pos= yypos1446; G->thunkpos= yythunkpos1446;\n+ }\n+ { int yypos1447= G->pos, yythunkpos1447= G->thunkpos; if (!yymatchChar(G, '`')) goto l1447; goto l1445;\n+ l1447:;\t G->pos= yypos1447; G->thunkpos= yythunkpos1447;\n+ } if (!yymatchDot(G)) goto l1445; goto l1444;\n+ l1445:;\t G->pos= yypos1445; G->thunkpos= yythunkpos1445;\n+ }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlockStartTick\", G->buf+G->pos));\n return 1;\n- l1436:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1443:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlockStartTick\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_VerbatimChunk(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"VerbatimChunk\"));\n- l1442:;\t\n- { int yypos1443= G->pos, yythunkpos1443= G->thunkpos; if (!yy_BlankLine(G)) { goto l1443; } goto l1442;\n- l1443:;\t G->pos= yypos1443; G->thunkpos= yythunkpos1443;\n- } if (!yy_NonblankIndentedLine(G)) { goto l1441; }\n- l1444:;\t\n- { int yypos1445= G->pos, yythunkpos1445= G->thunkpos; if (!yy_NonblankIndentedLine(G)) { goto l1445; } goto l1444;\n- l1445:;\t G->pos= yypos1445; G->thunkpos= yythunkpos1445;\n+ l1449:;\t\n+ { int yypos1450= G->pos, yythunkpos1450= G->thunkpos; if (!yy_BlankLine(G)) { goto l1450; } goto l1449;\n+ l1450:;\t G->pos= yypos1450; G->thunkpos= yythunkpos1450;\n+ } if (!yy_NonblankIndentedLine(G)) { goto l1448; }\n+ l1451:;\t\n+ { int yypos1452= G->pos, yythunkpos1452= G->thunkpos; if (!yy_NonblankIndentedLine(G)) { goto l1452; } goto l1451;\n+ l1452:;\t G->pos= yypos1452; G->thunkpos= yythunkpos1452;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"VerbatimChunk\", G->buf+G->pos));\n return 1;\n- l1441:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1448:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"VerbatimChunk\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_IndentedLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"IndentedLine\")); if (!yy_Indent(G)) { goto l1446; } if (!yy_Line(G)) { goto l1446; }\n+ yyprintf((stderr, \"%s\\n\", \"IndentedLine\")); if (!yy_Indent(G)) { goto l1453; } if (!yy_Line(G)) { goto l1453; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"IndentedLine\", G->buf+G->pos));\n return 1;\n- l1446:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1453:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"IndentedLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_NonblankIndentedLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"NonblankIndentedLine\"));\n- { int yypos1448= G->pos, yythunkpos1448= G->thunkpos; if (!yy_BlankLine(G)) { goto l1448; } goto l1447;\n- l1448:;\t G->pos= yypos1448; G->thunkpos= yythunkpos1448;\n- } if (!yy_IndentedLine(G)) { goto l1447; }\n+ { int yypos1455= G->pos, yythunkpos1455= G->thunkpos; if (!yy_BlankLine(G)) { goto l1455; } goto l1454;\n+ l1455:;\t G->pos= yypos1455; G->thunkpos= yythunkpos1455;\n+ } if (!yy_IndentedLine(G)) { goto l1454; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"NonblankIndentedLine\", G->buf+G->pos));\n return 1;\n- l1447:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1454:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"NonblankIndentedLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Line(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Line\")); if (!yy_RawLine(G)) { goto l1449; } yyDo(G, yy_1_Line, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Line\")); if (!yy_RawLine(G)) { goto l1456; } yyDo(G, yy_1_Line, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Line\", G->buf+G->pos));\n return 1;\n- l1449:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1456:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Line\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StartList(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"StartList\"));\n- { int yypos1451= G->pos, yythunkpos1451= G->thunkpos; if (!yymatchDot(G)) goto l1450; G->pos= yypos1451; G->thunkpos= yythunkpos1451;\n+ { int yypos1458= G->pos, yythunkpos1458= G->thunkpos; if (!yymatchDot(G)) goto l1457; G->pos= yypos1458; G->thunkpos= yythunkpos1458;\n } yyDo(G, yy_1_StartList, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StartList\", G->buf+G->pos));\n return 1;\n- l1450:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1457:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StartList\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_BlockQuoteRaw(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"BlockQuoteRaw\")); if (!yy_StartList(G)) { goto l1452; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1452; if (!yymatchChar(G, '>')) goto l1452;\n- { int yypos1455= G->pos, yythunkpos1455= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1455; goto l1456;\n- l1455:;\t G->pos= yypos1455; G->thunkpos= yythunkpos1455;\n- }\n- l1456:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1452; yyDo(G, yy_1_BlockQuoteRaw, G->begin, G->end); if (!yy_Line(G)) { goto l1452; } yyDo(G, yy_2_BlockQuoteRaw, G->begin, G->end);\n- l1457:;\t\n- { int yypos1458= G->pos, yythunkpos1458= G->thunkpos;\n- { int yypos1459= G->pos, yythunkpos1459= G->thunkpos; if (!yymatchChar(G, '>')) goto l1459; goto l1458;\n- l1459:;\t G->pos= yypos1459; G->thunkpos= yythunkpos1459;\n- }\n- { int yypos1460= G->pos, yythunkpos1460= G->thunkpos; if (!yy_BlankLine(G)) { goto l1460; } goto l1458;\n- l1460:;\t G->pos= yypos1460; G->thunkpos= yythunkpos1460;\n- } if (!yy_Line(G)) { goto l1458; } yyDo(G, yy_3_BlockQuoteRaw, G->begin, G->end); goto l1457;\n- l1458:;\t G->pos= yypos1458; G->thunkpos= yythunkpos1458;\n- }\n- l1461:;\t\n- { int yypos1462= G->pos, yythunkpos1462= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1462; if (!yy_BlankLine(G)) { goto l1462; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1462; yyDo(G, yy_4_BlockQuoteRaw, G->begin, G->end); goto l1461;\n+ yyprintf((stderr, \"%s\\n\", \"BlockQuoteRaw\")); if (!yy_StartList(G)) { goto l1459; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1459; if (!yymatchChar(G, '>')) goto l1459;\n+ { int yypos1462= G->pos, yythunkpos1462= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1462; goto l1463;\n l1462:;\t G->pos= yypos1462; G->thunkpos= yythunkpos1462;\n }\n- l1453:;\t\n- { int yypos1454= G->pos, yythunkpos1454= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1454; if (!yymatchChar(G, '>')) goto l1454;\n- { int yypos1463= G->pos, yythunkpos1463= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1463; goto l1464;\n- l1463:;\t G->pos= yypos1463; G->thunkpos= yythunkpos1463;\n- }\n- l1464:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1454; yyDo(G, yy_1_BlockQuoteRaw, G->begin, G->end); if (!yy_Line(G)) { goto l1454; } yyDo(G, yy_2_BlockQuoteRaw, G->begin, G->end);\n- l1465:;\t\n- { int yypos1466= G->pos, yythunkpos1466= G->thunkpos;\n- { int yypos1467= G->pos, yythunkpos1467= G->thunkpos; if (!yymatchChar(G, '>')) goto l1467; goto l1466;\n+ l1463:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1459; yyDo(G, yy_1_BlockQuoteRaw, G->begin, G->end); if (!yy_Line(G)) { goto l1459; } yyDo(G, yy_2_BlockQuoteRaw, G->begin, G->end);\n+ l1464:;\t\n+ { int yypos1465= G->pos, yythunkpos1465= G->thunkpos;\n+ { int yypos1466= G->pos, yythunkpos1466= G->thunkpos; if (!yymatchChar(G, '>')) goto l1466; goto l1465;\n+ l1466:;\t G->pos= yypos1466; G->thunkpos= yythunkpos1466;\n+ }\n+ { int yypos1467= G->pos, yythunkpos1467= G->thunkpos; if (!yy_BlankLine(G)) { goto l1467; } goto l1465;\n l1467:;\t G->pos= yypos1467; G->thunkpos= yythunkpos1467;\n- }\n- { int yypos1468= G->pos, yythunkpos1468= G->thunkpos; if (!yy_BlankLine(G)) { goto l1468; } goto l1466;\n- l1468:;\t G->pos= yypos1468; G->thunkpos= yythunkpos1468;\n- } if (!yy_Line(G)) { goto l1466; } yyDo(G, yy_3_BlockQuoteRaw, G->begin, G->end); goto l1465;\n- l1466:;\t G->pos= yypos1466; G->thunkpos= yythunkpos1466;\n- }\n- l1469:;\t\n- { int yypos1470= G->pos, yythunkpos1470= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1470; if (!yy_BlankLine(G)) { goto l1470; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1470; yyDo(G, yy_4_BlockQuoteRaw, G->begin, G->end); goto l1469;\n+ } if (!yy_Line(G)) { goto l1465; } yyDo(G, yy_3_BlockQuoteRaw, G->begin, G->end); goto l1464;\n+ l1465:;\t G->pos= yypos1465; G->thunkpos= yythunkpos1465;\n+ }\n+ l1468:;\t\n+ { int yypos1469= G->pos, yythunkpos1469= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1469; if (!yy_BlankLine(G)) { goto l1469; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1469; yyDo(G, yy_4_BlockQuoteRaw, G->begin, G->end); goto l1468;\n+ l1469:;\t G->pos= yypos1469; G->thunkpos= yythunkpos1469;\n+ }\n+ l1460:;\t\n+ { int yypos1461= G->pos, yythunkpos1461= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1461; if (!yymatchChar(G, '>')) goto l1461;\n+ { int yypos1470= G->pos, yythunkpos1470= G->thunkpos; if (!yymatchChar(G, ' ')) goto l1470; goto l1471;\n l1470:;\t G->pos= yypos1470; G->thunkpos= yythunkpos1470;\n- } goto l1453;\n- l1454:;\t G->pos= yypos1454; G->thunkpos= yythunkpos1454;\n+ }\n+ l1471:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1461; yyDo(G, yy_1_BlockQuoteRaw, G->begin, G->end); if (!yy_Line(G)) { goto l1461; } yyDo(G, yy_2_BlockQuoteRaw, G->begin, G->end);\n+ l1472:;\t\n+ { int yypos1473= G->pos, yythunkpos1473= G->thunkpos;\n+ { int yypos1474= G->pos, yythunkpos1474= G->thunkpos; if (!yymatchChar(G, '>')) goto l1474; goto l1473;\n+ l1474:;\t G->pos= yypos1474; G->thunkpos= yythunkpos1474;\n+ }\n+ { int yypos1475= G->pos, yythunkpos1475= G->thunkpos; if (!yy_BlankLine(G)) { goto l1475; } goto l1473;\n+ l1475:;\t G->pos= yypos1475; G->thunkpos= yythunkpos1475;\n+ } if (!yy_Line(G)) { goto l1473; } yyDo(G, yy_3_BlockQuoteRaw, G->begin, G->end); goto l1472;\n+ l1473:;\t G->pos= yypos1473; G->thunkpos= yythunkpos1473;\n+ }\n+ l1476:;\t\n+ { int yypos1477= G->pos, yythunkpos1477= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1477; if (!yy_BlankLine(G)) { goto l1477; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1477; yyDo(G, yy_4_BlockQuoteRaw, G->begin, G->end); goto l1476;\n+ l1477:;\t G->pos= yypos1477; G->thunkpos= yythunkpos1477;\n+ } goto l1460;\n+ l1461:;\t G->pos= yypos1461; G->thunkpos= yythunkpos1461;\n } yyDo(G, yy_5_BlockQuoteRaw, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"BlockQuoteRaw\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1452:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1459:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"BlockQuoteRaw\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Endline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Endline\"));\n- { int yypos1472= G->pos, yythunkpos1472= G->thunkpos; if (!yy_LineBreak(G)) { goto l1473; } goto l1472;\n- l1473:;\t G->pos= yypos1472; G->thunkpos= yythunkpos1472; if (!yy_TerminalEndline(G)) { goto l1474; } goto l1472;\n- l1474:;\t G->pos= yypos1472; G->thunkpos= yythunkpos1472; if (!yy_NormalEndline(G)) { goto l1471; }\n- }\n- l1472:;\t\n+ { int yypos1479= G->pos, yythunkpos1479= G->thunkpos; if (!yy_LineBreak(G)) { goto l1480; } goto l1479;\n+ l1480:;\t G->pos= yypos1479; G->thunkpos= yythunkpos1479; if (!yy_TerminalEndline(G)) { goto l1481; } goto l1479;\n+ l1481:;\t G->pos= yypos1479; G->thunkpos= yythunkpos1479; if (!yy_NormalEndline(G)) { goto l1478; }\n+ }\n+ l1479:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Endline\", G->buf+G->pos));\n return 1;\n- l1471:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1478:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Endline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_RawLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"RawLine\"));\n- { int yypos1476= G->pos, yythunkpos1476= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1477;\n- l1478:;\t\n- { int yypos1479= G->pos, yythunkpos1479= G->thunkpos;\n- { int yypos1480= G->pos, yythunkpos1480= G->thunkpos; if (!yymatchChar(G, '\\r')) goto l1480; goto l1479;\n- l1480:;\t G->pos= yypos1480; G->thunkpos= yythunkpos1480;\n- }\n- { int yypos1481= G->pos, yythunkpos1481= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1481; goto l1479;\n- l1481:;\t G->pos= yypos1481; G->thunkpos= yythunkpos1481;\n- } if (!yymatchDot(G)) goto l1479; goto l1478;\n- l1479:;\t G->pos= yypos1479; G->thunkpos= yythunkpos1479;\n- } if (!yy_Newline(G)) { goto l1477; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1477; goto l1476;\n- l1477:;\t G->pos= yypos1476; G->thunkpos= yythunkpos1476; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1475; if (!yymatchDot(G)) goto l1475;\n- l1482:;\t\n- { int yypos1483= G->pos, yythunkpos1483= G->thunkpos; if (!yymatchDot(G)) goto l1483; goto l1482;\n- l1483:;\t G->pos= yypos1483; G->thunkpos= yythunkpos1483;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1475; if (!yy_Eof(G)) { goto l1475; }\n- }\n- l1476:;\t yyDo(G, yy_1_RawLine, G->begin, G->end);\n+ { int yypos1483= G->pos, yythunkpos1483= G->thunkpos; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1484;\n+ l1485:;\t\n+ { int yypos1486= G->pos, yythunkpos1486= G->thunkpos;\n+ { int yypos1487= G->pos, yythunkpos1487= G->thunkpos; if (!yymatchChar(G, '\\r')) goto l1487; goto l1486;\n+ l1487:;\t G->pos= yypos1487; G->thunkpos= yythunkpos1487;\n+ }\n+ { int yypos1488= G->pos, yythunkpos1488= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1488; goto l1486;\n+ l1488:;\t G->pos= yypos1488; G->thunkpos= yythunkpos1488;\n+ } if (!yymatchDot(G)) goto l1486; goto l1485;\n+ l1486:;\t G->pos= yypos1486; G->thunkpos= yythunkpos1486;\n+ } if (!yy_Newline(G)) { goto l1484; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1484; goto l1483;\n+ l1484:;\t G->pos= yypos1483; G->thunkpos= yythunkpos1483; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1482; if (!yymatchDot(G)) goto l1482;\n+ l1489:;\t\n+ { int yypos1490= G->pos, yythunkpos1490= G->thunkpos; if (!yymatchDot(G)) goto l1490; goto l1489;\n+ l1490:;\t G->pos= yypos1490; G->thunkpos= yythunkpos1490;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1482; if (!yy_Eof(G)) { goto l1482; }\n+ }\n+ l1483:;\t yyDo(G, yy_1_RawLine, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"RawLine\", G->buf+G->pos));\n return 1;\n- l1475:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1482:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"RawLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SetextBottom2(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"SetextBottom2\")); if (!yymatchChar(G, '-')) goto l1484;\n- l1485:;\t\n- { int yypos1486= G->pos, yythunkpos1486= G->thunkpos; if (!yymatchChar(G, '-')) goto l1486; goto l1485;\n- l1486:;\t G->pos= yypos1486; G->thunkpos= yythunkpos1486;\n- } if (!yy_Newline(G)) { goto l1484; }\n+ yyprintf((stderr, \"%s\\n\", \"SetextBottom2\")); if (!yymatchChar(G, '-')) goto l1491;\n+ l1492:;\t\n+ { int yypos1493= G->pos, yythunkpos1493= G->thunkpos; if (!yymatchChar(G, '-')) goto l1493; goto l1492;\n+ l1493:;\t G->pos= yypos1493; G->thunkpos= yythunkpos1493;\n+ } if (!yy_Newline(G)) { goto l1491; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SetextBottom2\", G->buf+G->pos));\n return 1;\n- l1484:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1491:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SetextBottom2\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SetextBottom1(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"SetextBottom1\")); if (!yymatchChar(G, '=')) goto l1487;\n- l1488:;\t\n- { int yypos1489= G->pos, yythunkpos1489= G->thunkpos; if (!yymatchChar(G, '=')) goto l1489; goto l1488;\n- l1489:;\t G->pos= yypos1489; G->thunkpos= yythunkpos1489;\n- } if (!yy_Newline(G)) { goto l1487; }\n+ yyprintf((stderr, \"%s\\n\", \"SetextBottom1\")); if (!yymatchChar(G, '=')) goto l1494;\n+ l1495:;\t\n+ { int yypos1496= G->pos, yythunkpos1496= G->thunkpos; if (!yymatchChar(G, '=')) goto l1496; goto l1495;\n+ l1496:;\t G->pos= yypos1496; G->thunkpos= yythunkpos1496;\n+ } if (!yy_Newline(G)) { goto l1494; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SetextBottom1\", G->buf+G->pos));\n return 1;\n- l1487:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1494:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SetextBottom1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SetextHeading2(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n yyprintf((stderr, \"%s\\n\", \"SetextHeading2\"));\n- { int yypos1491= G->pos, yythunkpos1491= G->thunkpos; if (!yy_RawLine(G)) { goto l1490; } if (!yy_SetextBottom2(G)) { goto l1490; } G->pos= yypos1491; G->thunkpos= yythunkpos1491;\n- } if (!yy_LocMarker(G)) { goto l1490; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1490;\n- { int yypos1494= G->pos, yythunkpos1494= G->thunkpos; if (!yy_Endline(G)) { goto l1494; } goto l1490;\n- l1494:;\t G->pos= yypos1494; G->thunkpos= yythunkpos1494;\n- } if (!yy_Inline(G)) { goto l1490; }\n- l1492:;\t\n- { int yypos1493= G->pos, yythunkpos1493= G->thunkpos;\n- { int yypos1495= G->pos, yythunkpos1495= G->thunkpos; if (!yy_Endline(G)) { goto l1495; } goto l1493;\n- l1495:;\t G->pos= yypos1495; G->thunkpos= yythunkpos1495;\n- } if (!yy_Inline(G)) { goto l1493; } goto l1492;\n- l1493:;\t G->pos= yypos1493; G->thunkpos= yythunkpos1493;\n- } if (!yy_Sp(G)) { goto l1490; } if (!yy_Newline(G)) { goto l1490; } if (!yy_SetextBottom2(G)) { goto l1490; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1490; yyDo(G, yy_1_SetextHeading2, G->begin, G->end);\n+ { int yypos1498= G->pos, yythunkpos1498= G->thunkpos; if (!yy_RawLine(G)) { goto l1497; } if (!yy_SetextBottom2(G)) { goto l1497; } G->pos= yypos1498; G->thunkpos= yythunkpos1498;\n+ } if (!yy_LocMarker(G)) { goto l1497; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1497;\n+ { int yypos1501= G->pos, yythunkpos1501= G->thunkpos; if (!yy_Endline(G)) { goto l1501; } goto l1497;\n+ l1501:;\t G->pos= yypos1501; G->thunkpos= yythunkpos1501;\n+ } if (!yy_Inline(G)) { goto l1497; }\n+ l1499:;\t\n+ { int yypos1500= G->pos, yythunkpos1500= G->thunkpos;\n+ { int yypos1502= G->pos, yythunkpos1502= G->thunkpos; if (!yy_Endline(G)) { goto l1502; } goto l1500;\n+ l1502:;\t G->pos= yypos1502; G->thunkpos= yythunkpos1502;\n+ } if (!yy_Inline(G)) { goto l1500; } goto l1499;\n+ l1500:;\t G->pos= yypos1500; G->thunkpos= yythunkpos1500;\n+ } if (!yy_Sp(G)) { goto l1497; } if (!yy_Newline(G)) { goto l1497; } if (!yy_SetextBottom2(G)) { goto l1497; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1497; yyDo(G, yy_1_SetextHeading2, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SetextHeading2\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1490:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1497:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SetextHeading2\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SetextHeading1(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n yyprintf((stderr, \"%s\\n\", \"SetextHeading1\"));\n- { int yypos1497= G->pos, yythunkpos1497= G->thunkpos; if (!yy_RawLine(G)) { goto l1496; } if (!yy_SetextBottom1(G)) { goto l1496; } G->pos= yypos1497; G->thunkpos= yythunkpos1497;\n- } if (!yy_LocMarker(G)) { goto l1496; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1496;\n- { int yypos1500= G->pos, yythunkpos1500= G->thunkpos; if (!yy_Endline(G)) { goto l1500; } goto l1496;\n- l1500:;\t G->pos= yypos1500; G->thunkpos= yythunkpos1500;\n- } if (!yy_Inline(G)) { goto l1496; }\n- l1498:;\t\n- { int yypos1499= G->pos, yythunkpos1499= G->thunkpos;\n- { int yypos1501= G->pos, yythunkpos1501= G->thunkpos; if (!yy_Endline(G)) { goto l1501; } goto l1499;\n- l1501:;\t G->pos= yypos1501; G->thunkpos= yythunkpos1501;\n- } if (!yy_Inline(G)) { goto l1499; } goto l1498;\n- l1499:;\t G->pos= yypos1499; G->thunkpos= yythunkpos1499;\n- } if (!yy_Sp(G)) { goto l1496; } if (!yy_Newline(G)) { goto l1496; } if (!yy_SetextBottom1(G)) { goto l1496; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1496; yyDo(G, yy_1_SetextHeading1, G->begin, G->end);\n+ { int yypos1504= G->pos, yythunkpos1504= G->thunkpos; if (!yy_RawLine(G)) { goto l1503; } if (!yy_SetextBottom1(G)) { goto l1503; } G->pos= yypos1504; G->thunkpos= yythunkpos1504;\n+ } if (!yy_LocMarker(G)) { goto l1503; } yyDo(G, yySet, -1, 0); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1503;\n+ { int yypos1507= G->pos, yythunkpos1507= G->thunkpos; if (!yy_Endline(G)) { goto l1507; } goto l1503;\n+ l1507:;\t G->pos= yypos1507; G->thunkpos= yythunkpos1507;\n+ } if (!yy_Inline(G)) { goto l1503; }\n+ l1505:;\t\n+ { int yypos1506= G->pos, yythunkpos1506= G->thunkpos;\n+ { int yypos1508= G->pos, yythunkpos1508= G->thunkpos; if (!yy_Endline(G)) { goto l1508; } goto l1506;\n+ l1508:;\t G->pos= yypos1508; G->thunkpos= yythunkpos1508;\n+ } if (!yy_Inline(G)) { goto l1506; } goto l1505;\n+ l1506:;\t G->pos= yypos1506; G->thunkpos= yythunkpos1506;\n+ } if (!yy_Sp(G)) { goto l1503; } if (!yy_Newline(G)) { goto l1503; } if (!yy_SetextBottom1(G)) { goto l1503; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1503; yyDo(G, yy_1_SetextHeading1, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SetextHeading1\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1496:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1503:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SetextHeading1\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_SetextHeading(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"SetextHeading\"));\n- { int yypos1503= G->pos, yythunkpos1503= G->thunkpos; if (!yy_SetextHeading1(G)) { goto l1504; } goto l1503;\n- l1504:;\t G->pos= yypos1503; G->thunkpos= yythunkpos1503; if (!yy_SetextHeading2(G)) { goto l1502; }\n- }\n- l1503:;\t\n+ { int yypos1510= G->pos, yythunkpos1510= G->thunkpos; if (!yy_SetextHeading1(G)) { goto l1511; } goto l1510;\n+ l1511:;\t G->pos= yypos1510; G->thunkpos= yythunkpos1510; if (!yy_SetextHeading2(G)) { goto l1509; }\n+ }\n+ l1510:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"SetextHeading\", G->buf+G->pos));\n return 1;\n- l1502:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1509:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"SetextHeading\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Space(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Space\")); if (!yy_Spacechar(G)) { goto l1505; }\n- l1506:;\t\n- { int yypos1507= G->pos, yythunkpos1507= G->thunkpos; if (!yy_Spacechar(G)) { goto l1507; } goto l1506;\n- l1507:;\t G->pos= yypos1507; G->thunkpos= yythunkpos1507;\n+ yyprintf((stderr, \"%s\\n\", \"Space\")); if (!yy_Spacechar(G)) { goto l1512; }\n+ l1513:;\t\n+ { int yypos1514= G->pos, yythunkpos1514= G->thunkpos; if (!yy_Spacechar(G)) { goto l1514; } goto l1513;\n+ l1514:;\t G->pos= yypos1514; G->thunkpos= yythunkpos1514;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Space\", G->buf+G->pos));\n return 1;\n- l1505:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1512:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Space\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_AtxHeading(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"AtxHeading\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1508; if (!yy_AtxStart(G)) { goto l1508; } yyDo(G, yySet, -1, 0); if (!yy_Space(G)) { goto l1508; } if (!yy_AtxInline(G)) { goto l1508; }\n- l1509:;\t\n- { int yypos1510= G->pos, yythunkpos1510= G->thunkpos; if (!yy_AtxInline(G)) { goto l1510; } goto l1509;\n- l1510:;\t G->pos= yypos1510; G->thunkpos= yythunkpos1510;\n- }\n- { int yypos1511= G->pos, yythunkpos1511= G->thunkpos; if (!yy_Sp(G)) { goto l1511; }\n- l1513:;\t\n- { int yypos1514= G->pos, yythunkpos1514= G->thunkpos; if (!yymatchChar(G, '#')) goto l1514; goto l1513;\n- l1514:;\t G->pos= yypos1514; G->thunkpos= yythunkpos1514;\n- } if (!yy_Sp(G)) { goto l1511; } goto l1512;\n- l1511:;\t G->pos= yypos1511; G->thunkpos= yythunkpos1511;\n- }\n- l1512:;\t if (!yy_Newline(G)) { goto l1508; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1508; yyDo(G, yy_1_AtxHeading, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"AtxHeading\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1515; if (!yy_AtxStart(G)) { goto l1515; } yyDo(G, yySet, -1, 0); if (!yy_Space(G)) { goto l1515; } if (!yy_AtxInline(G)) { goto l1515; }\n+ l1516:;\t\n+ { int yypos1517= G->pos, yythunkpos1517= G->thunkpos; if (!yy_AtxInline(G)) { goto l1517; } goto l1516;\n+ l1517:;\t G->pos= yypos1517; G->thunkpos= yythunkpos1517;\n+ }\n+ { int yypos1518= G->pos, yythunkpos1518= G->thunkpos; if (!yy_Sp(G)) { goto l1518; }\n+ l1520:;\t\n+ { int yypos1521= G->pos, yythunkpos1521= G->thunkpos; if (!yymatchChar(G, '#')) goto l1521; goto l1520;\n+ l1521:;\t G->pos= yypos1521; G->thunkpos= yythunkpos1521;\n+ } if (!yy_Sp(G)) { goto l1518; } goto l1519;\n+ l1518:;\t G->pos= yypos1518; G->thunkpos= yythunkpos1518;\n+ }\n+ l1519:;\t if (!yy_Newline(G)) { goto l1515; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1515; yyDo(G, yy_1_AtxHeading, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"AtxHeading\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1508:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1515:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AtxHeading\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_AtxStart(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"AtxStart\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1515;\n- { int yypos1516= G->pos, yythunkpos1516= G->thunkpos; if (!yymatchString(G, \"######\")) goto l1517; goto l1516;\n- l1517:;\t G->pos= yypos1516; G->thunkpos= yythunkpos1516; if (!yymatchString(G, \"#####\")) goto l1518; goto l1516;\n- l1518:;\t G->pos= yypos1516; G->thunkpos= yythunkpos1516; if (!yymatchString(G, \"####\")) goto l1519; goto l1516;\n- l1519:;\t G->pos= yypos1516; G->thunkpos= yythunkpos1516; if (!yymatchString(G, \"###\")) goto l1520; goto l1516;\n- l1520:;\t G->pos= yypos1516; G->thunkpos= yythunkpos1516; if (!yymatchString(G, \"##\")) goto l1521; goto l1516;\n- l1521:;\t G->pos= yypos1516; G->thunkpos= yythunkpos1516; if (!yymatchChar(G, '#')) goto l1515;\n- }\n- l1516:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1515; yyDo(G, yy_1_AtxStart, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"AtxStart\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1522;\n+ { int yypos1523= G->pos, yythunkpos1523= G->thunkpos; if (!yymatchString(G, \"######\")) goto l1524; goto l1523;\n+ l1524:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yymatchString(G, \"#####\")) goto l1525; goto l1523;\n+ l1525:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yymatchString(G, \"####\")) goto l1526; goto l1523;\n+ l1526:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yymatchString(G, \"###\")) goto l1527; goto l1523;\n+ l1527:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yymatchString(G, \"##\")) goto l1528; goto l1523;\n+ l1528:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yymatchChar(G, '#')) goto l1522;\n+ }\n+ l1523:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1522; yyDo(G, yy_1_AtxStart, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"AtxStart\", G->buf+G->pos));\n return 1;\n- l1515:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1522:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AtxStart\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Inline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Inline\"));\n- { int yypos1523= G->pos, yythunkpos1523= G->thunkpos; if (!yy_Str(G)) { goto l1524; } goto l1523;\n- l1524:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Endline(G)) { goto l1525; } goto l1523;\n- l1525:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_UlOrStarLine(G)) { goto l1526; } goto l1523;\n- l1526:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Space(G)) { goto l1527; } goto l1523;\n- l1527:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Strong(G)) { goto l1528; } goto l1523;\n- l1528:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Emph(G)) { goto l1529; } goto l1523;\n- l1529:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Strike(G)) { goto l1530; } goto l1523;\n- l1530:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Image(G)) { goto l1531; } goto l1523;\n- l1531:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Link(G)) { goto l1532; } goto l1523;\n- l1532:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_NoteReference(G)) { goto l1533; } goto l1523;\n- l1533:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_InlineNote(G)) { goto l1534; } goto l1523;\n- l1534:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Code(G)) { goto l1535; } goto l1523;\n- l1535:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_InlineEquation(G)) { goto l1536; } goto l1523;\n- l1536:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Mark(G)) { goto l1537; } goto l1523;\n- l1537:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_RawHtml(G)) { goto l1538; } goto l1523;\n- l1538:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Entity(G)) { goto l1539; } goto l1523;\n- l1539:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_EscapedChar(G)) { goto l1540; } goto l1523;\n- l1540:;\t G->pos= yypos1523; G->thunkpos= yythunkpos1523; if (!yy_Symbol(G)) { goto l1522; }\n- }\n- l1523:;\t\n+ { int yypos1530= G->pos, yythunkpos1530= G->thunkpos; if (!yy_Str(G)) { goto l1531; } goto l1530;\n+ l1531:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Endline(G)) { goto l1532; } goto l1530;\n+ l1532:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_UlOrStarLine(G)) { goto l1533; } goto l1530;\n+ l1533:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Space(G)) { goto l1534; } goto l1530;\n+ l1534:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Strong(G)) { goto l1535; } goto l1530;\n+ l1535:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Emph(G)) { goto l1536; } goto l1530;\n+ l1536:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Strike(G)) { goto l1537; } goto l1530;\n+ l1537:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Image(G)) { goto l1538; } goto l1530;\n+ l1538:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Link(G)) { goto l1539; } goto l1530;\n+ l1539:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_NoteReference(G)) { goto l1540; } goto l1530;\n+ l1540:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_InlineNote(G)) { goto l1541; } goto l1530;\n+ l1541:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Code(G)) { goto l1542; } goto l1530;\n+ l1542:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_InlineEquation(G)) { goto l1543; } goto l1530;\n+ l1543:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Mark(G)) { goto l1544; } goto l1530;\n+ l1544:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_RawHtml(G)) { goto l1545; } goto l1530;\n+ l1545:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Entity(G)) { goto l1546; } goto l1530;\n+ l1546:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_EscapedChar(G)) { goto l1547; } goto l1530;\n+ l1547:;\t G->pos= yypos1530; G->thunkpos= yythunkpos1530; if (!yy_Symbol(G)) { goto l1529; }\n+ }\n+ l1530:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Inline\", G->buf+G->pos));\n return 1;\n- l1522:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1529:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Inline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Sp(GREG *G)\n {\n yyprintf((stderr, \"%s\\n\", \"Sp\"));\n- l1542:;\t\n- { int yypos1543= G->pos, yythunkpos1543= G->thunkpos; if (!yy_Spacechar(G)) { goto l1543; } goto l1542;\n- l1543:;\t G->pos= yypos1543; G->thunkpos= yythunkpos1543;\n+ l1549:;\t\n+ { int yypos1550= G->pos, yythunkpos1550= G->thunkpos; if (!yy_Spacechar(G)) { goto l1550; } goto l1549;\n+ l1550:;\t G->pos= yypos1550; G->thunkpos= yythunkpos1550;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Sp\", G->buf+G->pos));\n return 1;\n@@ -6940,412 +6976,412 @@\n YY_RULE(int) yy_AtxInline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"AtxInline\"));\n- { int yypos1545= G->pos, yythunkpos1545= G->thunkpos; if (!yy_Newline(G)) { goto l1545; } goto l1544;\n- l1545:;\t G->pos= yypos1545; G->thunkpos= yythunkpos1545;\n- }\n- { int yypos1546= G->pos, yythunkpos1546= G->thunkpos; if (!yy_Sp(G)) { goto l1546; }\n- l1547:;\t\n- { int yypos1548= G->pos, yythunkpos1548= G->thunkpos; if (!yymatchChar(G, '#')) goto l1548; goto l1547;\n- l1548:;\t G->pos= yypos1548; G->thunkpos= yythunkpos1548;\n- } if (!yy_Sp(G)) { goto l1546; } if (!yy_Newline(G)) { goto l1546; } goto l1544;\n- l1546:;\t G->pos= yypos1546; G->thunkpos= yythunkpos1546;\n- } if (!yy_Inline(G)) { goto l1544; }\n+ { int yypos1552= G->pos, yythunkpos1552= G->thunkpos; if (!yy_Newline(G)) { goto l1552; } goto l1551;\n+ l1552:;\t G->pos= yypos1552; G->thunkpos= yythunkpos1552;\n+ }\n+ { int yypos1553= G->pos, yythunkpos1553= G->thunkpos; if (!yy_Sp(G)) { goto l1553; }\n+ l1554:;\t\n+ { int yypos1555= G->pos, yythunkpos1555= G->thunkpos; if (!yymatchChar(G, '#')) goto l1555; goto l1554;\n+ l1555:;\t G->pos= yypos1555; G->thunkpos= yythunkpos1555;\n+ } if (!yy_Sp(G)) { goto l1553; } if (!yy_Newline(G)) { goto l1553; } goto l1551;\n+ l1553:;\t G->pos= yypos1553; G->thunkpos= yythunkpos1553;\n+ } if (!yy_Inline(G)) { goto l1551; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"AtxInline\", G->buf+G->pos));\n return 1;\n- l1544:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1551:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"AtxInline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Inlines(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Inlines\"));\n- { int yypos1552= G->pos, yythunkpos1552= G->thunkpos;\n- { int yypos1554= G->pos, yythunkpos1554= G->thunkpos; if (!yy_Endline(G)) { goto l1554; } goto l1553;\n- l1554:;\t G->pos= yypos1554; G->thunkpos= yythunkpos1554;\n- } if (!yy_Inline(G)) { goto l1553; } goto l1552;\n- l1553:;\t G->pos= yypos1552; G->thunkpos= yythunkpos1552; if (!yy_Endline(G)) { goto l1549; }\n- { int yypos1555= G->pos, yythunkpos1555= G->thunkpos; if (!yy_Inline(G)) { goto l1549; } G->pos= yypos1555; G->thunkpos= yythunkpos1555;\n- }\n- }\n- l1552:;\t\n- l1550:;\t\n- { int yypos1551= G->pos, yythunkpos1551= G->thunkpos;\n- { int yypos1556= G->pos, yythunkpos1556= G->thunkpos;\n- { int yypos1558= G->pos, yythunkpos1558= G->thunkpos; if (!yy_Endline(G)) { goto l1558; } goto l1557;\n+ { int yypos1559= G->pos, yythunkpos1559= G->thunkpos;\n+ { int yypos1561= G->pos, yythunkpos1561= G->thunkpos; if (!yy_Endline(G)) { goto l1561; } goto l1560;\n+ l1561:;\t G->pos= yypos1561; G->thunkpos= yythunkpos1561;\n+ } if (!yy_Inline(G)) { goto l1560; } goto l1559;\n+ l1560:;\t G->pos= yypos1559; G->thunkpos= yythunkpos1559; if (!yy_Endline(G)) { goto l1556; }\n+ { int yypos1562= G->pos, yythunkpos1562= G->thunkpos; if (!yy_Inline(G)) { goto l1556; } G->pos= yypos1562; G->thunkpos= yythunkpos1562;\n+ }\n+ }\n+ l1559:;\t\n+ l1557:;\t\n+ { int yypos1558= G->pos, yythunkpos1558= G->thunkpos;\n+ { int yypos1563= G->pos, yythunkpos1563= G->thunkpos;\n+ { int yypos1565= G->pos, yythunkpos1565= G->thunkpos; if (!yy_Endline(G)) { goto l1565; } goto l1564;\n+ l1565:;\t G->pos= yypos1565; G->thunkpos= yythunkpos1565;\n+ } if (!yy_Inline(G)) { goto l1564; } goto l1563;\n+ l1564:;\t G->pos= yypos1563; G->thunkpos= yythunkpos1563; if (!yy_Endline(G)) { goto l1558; }\n+ { int yypos1566= G->pos, yythunkpos1566= G->thunkpos; if (!yy_Inline(G)) { goto l1558; } G->pos= yypos1566; G->thunkpos= yythunkpos1566;\n+ }\n+ }\n+ l1563:;\t goto l1557;\n l1558:;\t G->pos= yypos1558; G->thunkpos= yythunkpos1558;\n- } if (!yy_Inline(G)) { goto l1557; } goto l1556;\n- l1557:;\t G->pos= yypos1556; G->thunkpos= yythunkpos1556; if (!yy_Endline(G)) { goto l1551; }\n- { int yypos1559= G->pos, yythunkpos1559= G->thunkpos; if (!yy_Inline(G)) { goto l1551; } G->pos= yypos1559; G->thunkpos= yythunkpos1559;\n- }\n- }\n- l1556:;\t goto l1550;\n- l1551:;\t G->pos= yypos1551; G->thunkpos= yythunkpos1551;\n- }\n- { int yypos1560= G->pos, yythunkpos1560= G->thunkpos; if (!yy_Endline(G)) { goto l1560; } goto l1561;\n- l1560:;\t G->pos= yypos1560; G->thunkpos= yythunkpos1560;\n- }\n- l1561:;\t\n+ }\n+ { int yypos1567= G->pos, yythunkpos1567= G->thunkpos; if (!yy_Endline(G)) { goto l1567; } goto l1568;\n+ l1567:;\t G->pos= yypos1567; G->thunkpos= yythunkpos1567;\n+ }\n+ l1568:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Inlines\", G->buf+G->pos));\n return 1;\n- l1549:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1556:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Inlines\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_NonindentSpace(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"NonindentSpace\"));\n- { int yypos1563= G->pos, yythunkpos1563= G->thunkpos; if (!yymatchString(G, \" \")) goto l1564; goto l1563;\n- l1564:;\t G->pos= yypos1563; G->thunkpos= yythunkpos1563; if (!yymatchString(G, \" \")) goto l1565; goto l1563;\n- l1565:;\t G->pos= yypos1563; G->thunkpos= yythunkpos1563; if (!yymatchChar(G, ' ')) goto l1566; goto l1563;\n- l1566:;\t G->pos= yypos1563; G->thunkpos= yythunkpos1563; if (!yymatchString(G, \"\")) goto l1562;\n- }\n- l1563:;\t\n+ { int yypos1570= G->pos, yythunkpos1570= G->thunkpos; if (!yymatchString(G, \" \")) goto l1571; goto l1570;\n+ l1571:;\t G->pos= yypos1570; G->thunkpos= yythunkpos1570; if (!yymatchString(G, \" \")) goto l1572; goto l1570;\n+ l1572:;\t G->pos= yypos1570; G->thunkpos= yythunkpos1570; if (!yymatchChar(G, ' ')) goto l1573; goto l1570;\n+ l1573:;\t G->pos= yypos1570; G->thunkpos= yythunkpos1570; if (!yymatchString(G, \"\")) goto l1569;\n+ }\n+ l1570:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"NonindentSpace\", G->buf+G->pos));\n return 1;\n- l1562:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1569:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"NonindentSpace\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Plain(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Plain\")); if (!yy_Inlines(G)) { goto l1567; }\n+ yyprintf((stderr, \"%s\\n\", \"Plain\")); if (!yy_Inlines(G)) { goto l1574; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Plain\", G->buf+G->pos));\n return 1;\n- l1567:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1574:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Plain\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Para(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Para\")); if (!yy_NonindentSpace(G)) { goto l1568; } if (!yy_Inlines(G)) { goto l1568; } if (!yy_BlankLine(G)) { goto l1568; }\n- l1569:;\t\n- { int yypos1570= G->pos, yythunkpos1570= G->thunkpos; if (!yy_BlankLine(G)) { goto l1570; } goto l1569;\n- l1570:;\t G->pos= yypos1570; G->thunkpos= yythunkpos1570;\n+ yyprintf((stderr, \"%s\\n\", \"Para\")); if (!yy_NonindentSpace(G)) { goto l1575; } if (!yy_Inlines(G)) { goto l1575; } if (!yy_BlankLine(G)) { goto l1575; }\n+ l1576:;\t\n+ { int yypos1577= G->pos, yythunkpos1577= G->thunkpos; if (!yy_BlankLine(G)) { goto l1577; } goto l1576;\n+ l1577:;\t G->pos= yypos1577; G->thunkpos= yythunkpos1577;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Para\", G->buf+G->pos));\n return 1;\n- l1568:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1575:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Para\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_StyleBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"StyleBlock\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1571; if (!yy_LocMarker(G)) { goto l1571; } yyDo(G, yySet, -1, 0); if (!yy_InStyleTags(G)) { goto l1571; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1571;\n- l1572:;\t\n- { int yypos1573= G->pos, yythunkpos1573= G->thunkpos; if (!yy_BlankLine(G)) { goto l1573; } goto l1572;\n- l1573:;\t G->pos= yypos1573; G->thunkpos= yythunkpos1573;\n+ yyprintf((stderr, \"%s\\n\", \"StyleBlock\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1578; if (!yy_LocMarker(G)) { goto l1578; } yyDo(G, yySet, -1, 0); if (!yy_InStyleTags(G)) { goto l1578; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1578;\n+ l1579:;\t\n+ { int yypos1580= G->pos, yythunkpos1580= G->thunkpos; if (!yy_BlankLine(G)) { goto l1580; } goto l1579;\n+ l1580:;\t G->pos= yypos1580; G->thunkpos= yythunkpos1580;\n } yyDo(G, yy_1_StyleBlock, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"StyleBlock\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1571:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1578:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"StyleBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HtmlBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"HtmlBlock\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1574; if (!yy_LocMarker(G)) { goto l1574; } yyDo(G, yySet, -1, 0);\n- { int yypos1575= G->pos, yythunkpos1575= G->thunkpos; if (!yy_HtmlBlockInTags(G)) { goto l1576; } goto l1575;\n- l1576:;\t G->pos= yypos1575; G->thunkpos= yythunkpos1575; if (!yy_HtmlComment(G)) { goto l1577; } goto l1575;\n- l1577:;\t G->pos= yypos1575; G->thunkpos= yythunkpos1575; if (!yy_HtmlBlockSelfClosing(G)) { goto l1574; }\n- }\n- l1575:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1574; if (!yy_BlankLine(G)) { goto l1574; }\n- l1578:;\t\n- { int yypos1579= G->pos, yythunkpos1579= G->thunkpos; if (!yy_BlankLine(G)) { goto l1579; } goto l1578;\n- l1579:;\t G->pos= yypos1579; G->thunkpos= yythunkpos1579;\n+ yyprintf((stderr, \"%s\\n\", \"HtmlBlock\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1581; if (!yy_LocMarker(G)) { goto l1581; } yyDo(G, yySet, -1, 0);\n+ { int yypos1582= G->pos, yythunkpos1582= G->thunkpos; if (!yy_HtmlBlockInTags(G)) { goto l1583; } goto l1582;\n+ l1583:;\t G->pos= yypos1582; G->thunkpos= yythunkpos1582; if (!yy_HtmlComment(G)) { goto l1584; } goto l1582;\n+ l1584:;\t G->pos= yypos1582; G->thunkpos= yythunkpos1582; if (!yy_HtmlBlockSelfClosing(G)) { goto l1581; }\n+ }\n+ l1582:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1581; if (!yy_BlankLine(G)) { goto l1581; }\n+ l1585:;\t\n+ { int yypos1586= G->pos, yythunkpos1586= G->thunkpos; if (!yy_BlankLine(G)) { goto l1586; } goto l1585;\n+ l1586:;\t G->pos= yypos1586; G->thunkpos= yythunkpos1586;\n } yyDo(G, yy_1_HtmlBlock, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HtmlBlock\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1574:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1581:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HtmlBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Table(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Table\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_TABLE) )) goto l1580; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1580; if (!yy_LocMarker(G)) { goto l1580; } yyDo(G, yySet, -1, 0); if (!yy_TableHeader(G)) { goto l1580; } if (!yy_TableDelimiter(G)) { goto l1580; }\n- l1581:;\t\n- { int yypos1582= G->pos, yythunkpos1582= G->thunkpos; if (!yy_TableLine(G)) { goto l1582; } goto l1581;\n- l1582:;\t G->pos= yypos1582; G->thunkpos= yythunkpos1582;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1580; yyDo(G, yy_1_Table, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Table\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_TABLE) )) goto l1587; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1587; if (!yy_LocMarker(G)) { goto l1587; } yyDo(G, yySet, -1, 0); if (!yy_TableHeader(G)) { goto l1587; } if (!yy_TableDelimiter(G)) { goto l1587; }\n+ l1588:;\t\n+ { int yypos1589= G->pos, yythunkpos1589= G->thunkpos; if (!yy_TableLine(G)) { goto l1589; } goto l1588;\n+ l1589:;\t G->pos= yypos1589; G->thunkpos= yythunkpos1589;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1587; yyDo(G, yy_1_Table, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Table\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1580:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1587:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Table\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_BulletList(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"BulletList\"));\n- { int yypos1584= G->pos, yythunkpos1584= G->thunkpos; if (!yy_Bullet(G)) { goto l1583; } G->pos= yypos1584; G->thunkpos= yythunkpos1584;\n- }\n- { int yypos1585= G->pos, yythunkpos1585= G->thunkpos; if (!yy_ListTight(G)) { goto l1586; } goto l1585;\n- l1586:;\t G->pos= yypos1585; G->thunkpos= yythunkpos1585; if (!yy_ListLoose(G)) { goto l1583; }\n- }\n- l1585:;\t\n+ { int yypos1591= G->pos, yythunkpos1591= G->thunkpos; if (!yy_Bullet(G)) { goto l1590; } G->pos= yypos1591; G->thunkpos= yythunkpos1591;\n+ }\n+ { int yypos1592= G->pos, yythunkpos1592= G->thunkpos; if (!yy_ListTight(G)) { goto l1593; } goto l1592;\n+ l1593:;\t G->pos= yypos1592; G->thunkpos= yythunkpos1592; if (!yy_ListLoose(G)) { goto l1590; }\n+ }\n+ l1592:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"BulletList\", G->buf+G->pos));\n return 1;\n- l1583:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1590:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"BulletList\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_OrderedList(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"OrderedList\"));\n- { int yypos1588= G->pos, yythunkpos1588= G->thunkpos; if (!yy_Enumerator(G)) { goto l1587; } G->pos= yypos1588; G->thunkpos= yythunkpos1588;\n- }\n- { int yypos1589= G->pos, yythunkpos1589= G->thunkpos; if (!yy_ListTight(G)) { goto l1590; } goto l1589;\n- l1590:;\t G->pos= yypos1589; G->thunkpos= yythunkpos1589; if (!yy_ListLoose(G)) { goto l1587; }\n- }\n- l1589:;\t\n+ { int yypos1595= G->pos, yythunkpos1595= G->thunkpos; if (!yy_Enumerator(G)) { goto l1594; } G->pos= yypos1595; G->thunkpos= yythunkpos1595;\n+ }\n+ { int yypos1596= G->pos, yythunkpos1596= G->thunkpos; if (!yy_ListTight(G)) { goto l1597; } goto l1596;\n+ l1597:;\t G->pos= yypos1596; G->thunkpos= yythunkpos1596; if (!yy_ListLoose(G)) { goto l1594; }\n+ }\n+ l1596:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"OrderedList\", G->buf+G->pos));\n return 1;\n- l1587:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1594:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"OrderedList\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Heading(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Heading\"));\n- { int yypos1592= G->pos, yythunkpos1592= G->thunkpos; if (!yy_SetextHeading(G)) { goto l1593; } goto l1592;\n- l1593:;\t G->pos= yypos1592; G->thunkpos= yythunkpos1592; if (!yy_AtxHeading(G)) { goto l1591; }\n- }\n- l1592:;\t\n+ { int yypos1599= G->pos, yythunkpos1599= G->thunkpos; if (!yy_SetextHeading(G)) { goto l1600; } goto l1599;\n+ l1600:;\t G->pos= yypos1599; G->thunkpos= yythunkpos1599; if (!yy_AtxHeading(G)) { goto l1598; }\n+ }\n+ l1599:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Heading\", G->buf+G->pos));\n return 1;\n- l1591:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1598:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Heading\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_HorizontalRule(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"HorizontalRule\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1594; if (!yy_NonindentSpace(G)) { goto l1594; }\n- { int yypos1595= G->pos, yythunkpos1595= G->thunkpos; if (!yymatchChar(G, '*')) goto l1596; if (!yy_Sp(G)) { goto l1596; } if (!yymatchChar(G, '*')) goto l1596; if (!yy_Sp(G)) { goto l1596; } if (!yymatchChar(G, '*')) goto l1596;\n- l1597:;\t\n- { int yypos1598= G->pos, yythunkpos1598= G->thunkpos; if (!yy_Sp(G)) { goto l1598; } if (!yymatchChar(G, '*')) goto l1598; goto l1597;\n- l1598:;\t G->pos= yypos1598; G->thunkpos= yythunkpos1598;\n- } goto l1595;\n- l1596:;\t G->pos= yypos1595; G->thunkpos= yythunkpos1595; if (!yymatchChar(G, '-')) goto l1599; if (!yy_Sp(G)) { goto l1599; } if (!yymatchChar(G, '-')) goto l1599; if (!yy_Sp(G)) { goto l1599; } if (!yymatchChar(G, '-')) goto l1599;\n- l1600:;\t\n- { int yypos1601= G->pos, yythunkpos1601= G->thunkpos; if (!yy_Sp(G)) { goto l1601; } if (!yymatchChar(G, '-')) goto l1601; goto l1600;\n- l1601:;\t G->pos= yypos1601; G->thunkpos= yythunkpos1601;\n- } goto l1595;\n- l1599:;\t G->pos= yypos1595; G->thunkpos= yythunkpos1595; if (!yymatchChar(G, '_')) goto l1594; if (!yy_Sp(G)) { goto l1594; } if (!yymatchChar(G, '_')) goto l1594; if (!yy_Sp(G)) { goto l1594; } if (!yymatchChar(G, '_')) goto l1594;\n- l1602:;\t\n- { int yypos1603= G->pos, yythunkpos1603= G->thunkpos; if (!yy_Sp(G)) { goto l1603; } if (!yymatchChar(G, '_')) goto l1603; goto l1602;\n- l1603:;\t G->pos= yypos1603; G->thunkpos= yythunkpos1603;\n- }\n- }\n- l1595:;\t if (!yy_Sp(G)) { goto l1594; } if (!yy_Newline(G)) { goto l1594; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1594; yyDo(G, yy_1_HorizontalRule, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"HorizontalRule\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1601; if (!yy_NonindentSpace(G)) { goto l1601; }\n+ { int yypos1602= G->pos, yythunkpos1602= G->thunkpos; if (!yymatchChar(G, '*')) goto l1603; if (!yy_Sp(G)) { goto l1603; } if (!yymatchChar(G, '*')) goto l1603; if (!yy_Sp(G)) { goto l1603; } if (!yymatchChar(G, '*')) goto l1603;\n+ l1604:;\t\n+ { int yypos1605= G->pos, yythunkpos1605= G->thunkpos; if (!yy_Sp(G)) { goto l1605; } if (!yymatchChar(G, '*')) goto l1605; goto l1604;\n+ l1605:;\t G->pos= yypos1605; G->thunkpos= yythunkpos1605;\n+ } goto l1602;\n+ l1603:;\t G->pos= yypos1602; G->thunkpos= yythunkpos1602; if (!yymatchChar(G, '-')) goto l1606; if (!yy_Sp(G)) { goto l1606; } if (!yymatchChar(G, '-')) goto l1606; if (!yy_Sp(G)) { goto l1606; } if (!yymatchChar(G, '-')) goto l1606;\n+ l1607:;\t\n+ { int yypos1608= G->pos, yythunkpos1608= G->thunkpos; if (!yy_Sp(G)) { goto l1608; } if (!yymatchChar(G, '-')) goto l1608; goto l1607;\n+ l1608:;\t G->pos= yypos1608; G->thunkpos= yythunkpos1608;\n+ } goto l1602;\n+ l1606:;\t G->pos= yypos1602; G->thunkpos= yythunkpos1602; if (!yymatchChar(G, '_')) goto l1601; if (!yy_Sp(G)) { goto l1601; } if (!yymatchChar(G, '_')) goto l1601; if (!yy_Sp(G)) { goto l1601; } if (!yymatchChar(G, '_')) goto l1601;\n+ l1609:;\t\n+ { int yypos1610= G->pos, yythunkpos1610= G->thunkpos; if (!yy_Sp(G)) { goto l1610; } if (!yymatchChar(G, '_')) goto l1610; goto l1609;\n+ l1610:;\t G->pos= yypos1610; G->thunkpos= yythunkpos1610;\n+ }\n+ }\n+ l1602:;\t if (!yy_Sp(G)) { goto l1601; } if (!yy_Newline(G)) { goto l1601; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1601; yyDo(G, yy_1_HorizontalRule, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"HorizontalRule\", G->buf+G->pos));\n return 1;\n- l1594:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1601:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"HorizontalRule\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Reference(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 3, 0);\n- yyprintf((stderr, \"%s\\n\", \"Reference\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1604; if (!yy_LocMarker(G)) { goto l1604; } yyDo(G, yySet, -3, 0); if (!yy_NonindentSpace(G)) { goto l1604; }\n- { int yypos1605= G->pos, yythunkpos1605= G->thunkpos; if (!yymatchString(G, \"[]\")) goto l1605; goto l1604;\n- l1605:;\t G->pos= yypos1605; G->thunkpos= yythunkpos1605;\n- } if (!yy_Label(G)) { goto l1604; } yyDo(G, yySet, -2, 0); if (!yymatchChar(G, ':')) goto l1604; if (!yy_Spnl(G)) { goto l1604; } if (!yy_RefSrc(G)) { goto l1604; } yyDo(G, yySet, -1, 0); if (!yy_RefTitle(G)) { goto l1604; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1604; if (!yy_BlankLine(G)) { goto l1604; }\n- l1606:;\t\n- { int yypos1607= G->pos, yythunkpos1607= G->thunkpos; if (!yy_BlankLine(G)) { goto l1607; } goto l1606;\n- l1607:;\t G->pos= yypos1607; G->thunkpos= yythunkpos1607;\n+ yyprintf((stderr, \"%s\\n\", \"Reference\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1611; if (!yy_LocMarker(G)) { goto l1611; } yyDo(G, yySet, -3, 0); if (!yy_NonindentSpace(G)) { goto l1611; }\n+ { int yypos1612= G->pos, yythunkpos1612= G->thunkpos; if (!yymatchString(G, \"[]\")) goto l1612; goto l1611;\n+ l1612:;\t G->pos= yypos1612; G->thunkpos= yythunkpos1612;\n+ } if (!yy_Label(G)) { goto l1611; } yyDo(G, yySet, -2, 0); if (!yymatchChar(G, ':')) goto l1611; if (!yy_Spnl(G)) { goto l1611; } if (!yy_RefSrc(G)) { goto l1611; } yyDo(G, yySet, -1, 0); if (!yy_RefTitle(G)) { goto l1611; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1611; if (!yy_BlankLine(G)) { goto l1611; }\n+ l1613:;\t\n+ { int yypos1614= G->pos, yythunkpos1614= G->thunkpos; if (!yy_BlankLine(G)) { goto l1614; } goto l1613;\n+ l1614:;\t G->pos= yypos1614; G->thunkpos= yythunkpos1614;\n } yyDo(G, yy_1_Reference, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Reference\", G->buf+G->pos)); yyDo(G, yyPop, 3, 0);\n return 1;\n- l1604:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1611:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Reference\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Note(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Note\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l1608; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1608; if (!yy_LocMarker(G)) { goto l1608; } yyDo(G, yySet, -1, 0); if (!yy_NonindentSpace(G)) { goto l1608; } if (!yy_RawNoteReference(G)) { goto l1608; } if (!yymatchChar(G, ':')) goto l1608; if (!yy_Sp(G)) { goto l1608; } if (!yy_RawNoteBlock(G)) { goto l1608; }\n- l1609:;\t\n- { int yypos1610= G->pos, yythunkpos1610= G->thunkpos;\n- { int yypos1611= G->pos, yythunkpos1611= G->thunkpos; if (!yy_Indent(G)) { goto l1610; } G->pos= yypos1611; G->thunkpos= yythunkpos1611;\n- } if (!yy_RawNoteBlock(G)) { goto l1610; } goto l1609;\n- l1610:;\t G->pos= yypos1610; G->thunkpos= yythunkpos1610;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1608; yyDo(G, yy_1_Note, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Note\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_NOTES) )) goto l1615; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1615; if (!yy_LocMarker(G)) { goto l1615; } yyDo(G, yySet, -1, 0); if (!yy_NonindentSpace(G)) { goto l1615; } if (!yy_RawNoteReference(G)) { goto l1615; } if (!yymatchChar(G, ':')) goto l1615; if (!yy_Sp(G)) { goto l1615; } if (!yy_RawNoteBlock(G)) { goto l1615; }\n+ l1616:;\t\n+ { int yypos1617= G->pos, yythunkpos1617= G->thunkpos;\n+ { int yypos1618= G->pos, yythunkpos1618= G->thunkpos; if (!yy_Indent(G)) { goto l1617; } G->pos= yypos1618; G->thunkpos= yythunkpos1618;\n+ } if (!yy_RawNoteBlock(G)) { goto l1617; } goto l1616;\n+ l1617:;\t G->pos= yypos1617; G->thunkpos= yythunkpos1617;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1615; yyDo(G, yy_1_Note, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Note\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1608:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1615:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Note\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_DisplayFormula(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"DisplayFormula\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l1612;\n- { int yypos1613= G->pos, yythunkpos1613= G->thunkpos; if (!yy_DisplayFormulaDollar(G)) { goto l1614; } goto l1613;\n- l1614:;\t G->pos= yypos1613; G->thunkpos= yythunkpos1613; if (!yy_DisplayFormulaRaw(G)) { goto l1612; }\n- }\n- l1613:;\t\n+ yyprintf((stderr, \"%s\\n\", \"DisplayFormula\")); yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_MATH) )) goto l1619;\n+ { int yypos1620= G->pos, yythunkpos1620= G->thunkpos; if (!yy_DisplayFormulaDollar(G)) { goto l1621; } goto l1620;\n+ l1621:;\t G->pos= yypos1620; G->thunkpos= yythunkpos1620; if (!yy_DisplayFormulaRaw(G)) { goto l1619; }\n+ }\n+ l1620:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"DisplayFormula\", G->buf+G->pos));\n return 1;\n- l1612:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1619:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"DisplayFormula\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FencedCodeBlock(GREG *G)\n-{ int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"FencedCodeBlock\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1615; if (!yy_LocMarker(G)) { goto l1615; } yyDo(G, yySet, -1, 0);\n- { int yypos1616= G->pos, yythunkpos1616= G->thunkpos; if (!yy_FencedCodeBlockTick(G)) { goto l1617; } goto l1616;\n- l1617:;\t G->pos= yypos1616; G->thunkpos= yythunkpos1616; if (!yy_FencedCodeBlockTidle(G)) { goto l1615; }\n- }\n- l1616:;\t yyText(G, G->begin, G->end); if (!(YY_END)) goto l1615; yyDo(G, yy_1_FencedCodeBlock, G->begin, G->end);\n- yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlock\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n- return 1;\n- l1615:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+{ int yypos0= G->pos, yythunkpos0= G->thunkpos;\n+ yyprintf((stderr, \"%s\\n\", \"FencedCodeBlock\"));\n+ { int yypos1623= G->pos, yythunkpos1623= G->thunkpos; if (!yy_FencedCodeBlockTick(G)) { goto l1624; } goto l1623;\n+ l1624:;\t G->pos= yypos1623; G->thunkpos= yythunkpos1623; if (!yy_FencedCodeBlockTidle(G)) { goto l1622; }\n+ }\n+ l1623:;\t\n+ yyprintf((stderr, \" ok %s @ %s\\n\", \"FencedCodeBlock\", G->buf+G->pos));\n+ return 1;\n+ l1622:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FencedCodeBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Verbatim(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"Verbatim\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1618; if (!yy_LocMarker(G)) { goto l1618; } yyDo(G, yySet, -1, 0); if (!yy_VerbatimChunk(G)) { goto l1618; }\n- l1619:;\t\n- { int yypos1620= G->pos, yythunkpos1620= G->thunkpos; if (!yy_VerbatimChunk(G)) { goto l1620; } goto l1619;\n- l1620:;\t G->pos= yypos1620; G->thunkpos= yythunkpos1620;\n- } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1618; yyDo(G, yy_1_Verbatim, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"Verbatim\")); yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1625; if (!yy_LocMarker(G)) { goto l1625; } yyDo(G, yySet, -1, 0); if (!yy_VerbatimChunk(G)) { goto l1625; }\n+ l1626:;\t\n+ { int yypos1627= G->pos, yythunkpos1627= G->thunkpos; if (!yy_VerbatimChunk(G)) { goto l1627; } goto l1626;\n+ l1627:;\t G->pos= yypos1627; G->thunkpos= yythunkpos1627;\n+ } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1625; yyDo(G, yy_1_Verbatim, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Verbatim\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1618:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1625:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Verbatim\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_BlockQuote(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"BlockQuote\")); if (!yy_BlockQuoteRaw(G)) { goto l1621; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_BlockQuote, G->begin, G->end);\n+ yyprintf((stderr, \"%s\\n\", \"BlockQuote\")); if (!yy_BlockQuoteRaw(G)) { goto l1628; } yyDo(G, yySet, -1, 0); yyDo(G, yy_1_BlockQuote, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"BlockQuote\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1621:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1628:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"BlockQuote\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_BlankLine(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"BlankLine\")); if (!yy_Sp(G)) { goto l1622; } if (!yy_Newline(G)) { goto l1622; }\n+ yyprintf((stderr, \"%s\\n\", \"BlankLine\")); if (!yy_Sp(G)) { goto l1629; } if (!yy_Newline(G)) { goto l1629; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"BlankLine\", G->buf+G->pos));\n return 1;\n- l1622:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1629:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"BlankLine\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FrontMatterEndMark(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"FrontMatterEndMark\"));\n- { int yypos1624= G->pos, yythunkpos1624= G->thunkpos; if (!yymatchString(G, \"---\")) goto l1625; goto l1624;\n- l1625:;\t G->pos= yypos1624; G->thunkpos= yythunkpos1624; if (!yymatchString(G, \"...\")) goto l1623;\n- }\n- l1624:;\t\n+ { int yypos1631= G->pos, yythunkpos1631= G->thunkpos; if (!yymatchString(G, \"---\")) goto l1632; goto l1631;\n+ l1632:;\t G->pos= yypos1631; G->thunkpos= yythunkpos1631; if (!yymatchString(G, \"...\")) goto l1630;\n+ }\n+ l1631:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FrontMatterEndMark\", G->buf+G->pos));\n return 1;\n- l1623:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1630:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FrontMatterEndMark\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FrontMatterBlock(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"FrontMatterBlock\"));\n- { int yypos1627= G->pos, yythunkpos1627= G->thunkpos; if (!yy_FrontMatterEndMark(G)) { goto l1627; } goto l1626;\n- l1627:;\t G->pos= yypos1627; G->thunkpos= yythunkpos1627;\n- }\n- l1628:;\t\n- { int yypos1629= G->pos, yythunkpos1629= G->thunkpos;\n- { int yypos1630= G->pos, yythunkpos1630= G->thunkpos; if (!yy_Newline(G)) { goto l1630; } goto l1629;\n- l1630:;\t G->pos= yypos1630; G->thunkpos= yythunkpos1630;\n- } if (!yymatchDot(G)) goto l1629; goto l1628;\n- l1629:;\t G->pos= yypos1629; G->thunkpos= yythunkpos1629;\n- } if (!yy_Newline(G)) { goto l1626; }\n+ { int yypos1634= G->pos, yythunkpos1634= G->thunkpos; if (!yy_FrontMatterEndMark(G)) { goto l1634; } goto l1633;\n+ l1634:;\t G->pos= yypos1634; G->thunkpos= yythunkpos1634;\n+ }\n+ l1635:;\t\n+ { int yypos1636= G->pos, yythunkpos1636= G->thunkpos;\n+ { int yypos1637= G->pos, yythunkpos1637= G->thunkpos; if (!yy_Newline(G)) { goto l1637; } goto l1636;\n+ l1637:;\t G->pos= yypos1637; G->thunkpos= yythunkpos1637;\n+ } if (!yymatchDot(G)) goto l1636; goto l1635;\n+ l1636:;\t G->pos= yypos1636; G->thunkpos= yythunkpos1636;\n+ } if (!yy_Newline(G)) { goto l1633; }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FrontMatterBlock\", G->buf+G->pos));\n return 1;\n- l1626:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1633:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FrontMatterBlock\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Newline(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Newline\"));\n- { int yypos1632= G->pos, yythunkpos1632= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1633; goto l1632;\n- l1633:;\t G->pos= yypos1632; G->thunkpos= yythunkpos1632; if (!yymatchChar(G, '\\r')) goto l1631;\n- { int yypos1634= G->pos, yythunkpos1634= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1634; goto l1635;\n- l1634:;\t G->pos= yypos1634; G->thunkpos= yythunkpos1634;\n- }\n- l1635:;\t\n- }\n- l1632:;\t\n+ { int yypos1639= G->pos, yythunkpos1639= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1640; goto l1639;\n+ l1640:;\t G->pos= yypos1639; G->thunkpos= yythunkpos1639; if (!yymatchChar(G, '\\r')) goto l1638;\n+ { int yypos1641= G->pos, yythunkpos1641= G->thunkpos; if (!yymatchChar(G, '\\n')) goto l1641; goto l1642;\n+ l1641:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641;\n+ }\n+ l1642:;\t\n+ }\n+ l1639:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Newline\", G->buf+G->pos));\n return 1;\n- l1631:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1638:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Newline\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_LocMarker(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"LocMarker\"));\n- { int yypos1637= G->pos, yythunkpos1637= G->thunkpos; if (!yymatchDot(G)) goto l1636; G->pos= yypos1637; G->thunkpos= yythunkpos1637;\n+ { int yypos1644= G->pos, yythunkpos1644= G->thunkpos; if (!yymatchDot(G)) goto l1643; G->pos= yypos1644; G->thunkpos= yythunkpos1644;\n } yyDo(G, yy_1_LocMarker, G->begin, G->end);\n yyprintf((stderr, \" ok %s @ %s\\n\", \"LocMarker\", G->buf+G->pos));\n return 1;\n- l1636:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1643:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"LocMarker\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Block(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n yyprintf((stderr, \"%s\\n\", \"Block\"));\n- l1639:;\t\n- { int yypos1640= G->pos, yythunkpos1640= G->thunkpos; if (!yy_BlankLine(G)) { goto l1640; } goto l1639;\n- l1640:;\t G->pos= yypos1640; G->thunkpos= yythunkpos1640;\n- }\n- { int yypos1641= G->pos, yythunkpos1641= G->thunkpos; if (!yy_BlockQuote(G)) { goto l1642; } goto l1641;\n- l1642:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Verbatim(G)) { goto l1643; } goto l1641;\n- l1643:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_FencedCodeBlock(G)) { goto l1644; } goto l1641;\n- l1644:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_DisplayFormula(G)) { goto l1645; } goto l1641;\n- l1645:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Note(G)) { goto l1646; } goto l1641;\n- l1646:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Reference(G)) { goto l1647; } goto l1641;\n- l1647:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_HorizontalRule(G)) { goto l1648; } goto l1641;\n- l1648:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Heading(G)) { goto l1649; } goto l1641;\n- l1649:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_OrderedList(G)) { goto l1650; } goto l1641;\n- l1650:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_BulletList(G)) { goto l1651; } goto l1641;\n- l1651:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Table(G)) { goto l1652; } goto l1641;\n- l1652:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_HtmlBlock(G)) { goto l1653; } goto l1641;\n- l1653:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_StyleBlock(G)) { goto l1654; } goto l1641;\n- l1654:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Para(G)) { goto l1655; } goto l1641;\n- l1655:;\t G->pos= yypos1641; G->thunkpos= yythunkpos1641; if (!yy_Plain(G)) { goto l1638; }\n- }\n- l1641:;\t\n+ l1646:;\t\n+ { int yypos1647= G->pos, yythunkpos1647= G->thunkpos; if (!yy_BlankLine(G)) { goto l1647; } goto l1646;\n+ l1647:;\t G->pos= yypos1647; G->thunkpos= yythunkpos1647;\n+ }\n+ { int yypos1648= G->pos, yythunkpos1648= G->thunkpos; if (!yy_BlockQuote(G)) { goto l1649; } goto l1648;\n+ l1649:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Verbatim(G)) { goto l1650; } goto l1648;\n+ l1650:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_FencedCodeBlock(G)) { goto l1651; } goto l1648;\n+ l1651:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_DisplayFormula(G)) { goto l1652; } goto l1648;\n+ l1652:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Note(G)) { goto l1653; } goto l1648;\n+ l1653:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Reference(G)) { goto l1654; } goto l1648;\n+ l1654:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_HorizontalRule(G)) { goto l1655; } goto l1648;\n+ l1655:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Heading(G)) { goto l1656; } goto l1648;\n+ l1656:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_OrderedList(G)) { goto l1657; } goto l1648;\n+ l1657:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_BulletList(G)) { goto l1658; } goto l1648;\n+ l1658:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Table(G)) { goto l1659; } goto l1648;\n+ l1659:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_HtmlBlock(G)) { goto l1660; } goto l1648;\n+ l1660:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_StyleBlock(G)) { goto l1661; } goto l1648;\n+ l1661:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Para(G)) { goto l1662; } goto l1648;\n+ l1662:;\t G->pos= yypos1648; G->thunkpos= yythunkpos1648; if (!yy_Plain(G)) { goto l1645; }\n+ }\n+ l1648:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Block\", G->buf+G->pos));\n return 1;\n- l1638:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1645:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Block\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_FrontMatter(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos; yyDo(G, yyPush, 1, 0);\n- yyprintf((stderr, \"%s\\n\", \"FrontMatter\")); if (!yy_LocMarker(G)) { goto l1656; } yyDo(G, yySet, -1, 0);\n- { int yypos1657= G->pos, yythunkpos1657= G->thunkpos; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_FRONTMATTER) )) goto l1657; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1657; if (!yymatchString(G, \"---\")) goto l1657; if (!yy_Newline(G)) { goto l1657; }\n- l1659:;\t\n- { int yypos1660= G->pos, yythunkpos1660= G->thunkpos; if (!yy_FrontMatterBlock(G)) { goto l1660; } goto l1659;\n- l1660:;\t G->pos= yypos1660; G->thunkpos= yythunkpos1660;\n- } if (!yy_FrontMatterEndMark(G)) { goto l1657; } if (!yy_Newline(G)) { goto l1657; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1657; yyDo(G, yy_1_FrontMatter, G->begin, G->end); goto l1658;\n- l1657:;\t G->pos= yypos1657; G->thunkpos= yythunkpos1657;\n- }\n- l1658:;\t\n+ yyprintf((stderr, \"%s\\n\", \"FrontMatter\")); if (!yy_LocMarker(G)) { goto l1663; } yyDo(G, yySet, -1, 0);\n+ { int yypos1664= G->pos, yythunkpos1664= G->thunkpos; yyText(G, G->begin, G->end); if (!( EXT(pmh_EXT_FRONTMATTER) )) goto l1664; yyText(G, G->begin, G->end); if (!(YY_BEGIN)) goto l1664; if (!yymatchString(G, \"---\")) goto l1664; if (!yy_Newline(G)) { goto l1664; }\n+ l1666:;\t\n+ { int yypos1667= G->pos, yythunkpos1667= G->thunkpos; if (!yy_FrontMatterBlock(G)) { goto l1667; } goto l1666;\n+ l1667:;\t G->pos= yypos1667; G->thunkpos= yythunkpos1667;\n+ } if (!yy_FrontMatterEndMark(G)) { goto l1664; } if (!yy_Newline(G)) { goto l1664; } yyText(G, G->begin, G->end); if (!(YY_END)) goto l1664; yyDo(G, yy_1_FrontMatter, G->begin, G->end); goto l1665;\n+ l1664:;\t G->pos= yypos1664; G->thunkpos= yythunkpos1664;\n+ }\n+ l1665:;\t\n yyprintf((stderr, \" ok %s @ %s\\n\", \"FrontMatter\", G->buf+G->pos)); yyDo(G, yyPop, 1, 0);\n return 1;\n- l1656:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1663:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"FrontMatter\", G->buf+G->pos));\n return 0;\n }\n YY_RULE(int) yy_Doc(GREG *G)\n { int yypos0= G->pos, yythunkpos0= G->thunkpos;\n- yyprintf((stderr, \"%s\\n\", \"Doc\")); if (!yy_FrontMatter(G)) { goto l1661; }\n- l1662:;\t\n- { int yypos1663= G->pos, yythunkpos1663= G->thunkpos; if (!yy_Block(G)) { goto l1663; } goto l1662;\n- l1663:;\t G->pos= yypos1663; G->thunkpos= yythunkpos1663;\n+ yyprintf((stderr, \"%s\\n\", \"Doc\")); if (!yy_FrontMatter(G)) { goto l1668; }\n+ l1669:;\t\n+ { int yypos1670= G->pos, yythunkpos1670= G->thunkpos; if (!yy_Block(G)) { goto l1670; } goto l1669;\n+ l1670:;\t G->pos= yypos1670; G->thunkpos= yythunkpos1670;\n }\n yyprintf((stderr, \" ok %s @ %s\\n\", \"Doc\", G->buf+G->pos));\n return 1;\n- l1661:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n+ l1668:;\t G->pos= yypos0; G->thunkpos= yythunkpos0;\n yyprintf((stderr, \" fail %s @ %s\\n\", \"Doc\", G->buf+G->pos));\n return 0;\n }\n"} {"commit":"4a0496b818dc4c2bc8a0e590166b6c51f564f944","subject":"Add buffered IO reading mode (for stream instead of file sources)","message":"Add buffered IO reading mode (for stream instead of file sources)\n","repos":"protyposis\/Aurio,protyposis\/Aurio","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- Aurio\/Aurio.FFmpeg.Proxy32\/proxy.c\n+++ Aurio\/Aurio.FFmpeg.Proxy32\/proxy.c\n@@ -21,8 +21,8 @@\n \t#define inline __inline \/\/ support for \"inline\" http:\/\/stackoverflow.com\/a\/24435157\n \t#if _MSC_VER < 1900 \/\/ snfprint support added in VS2015 http:\/\/stackoverflow.com\/a\/27754829\n \t\t#define snprintf _snprintf \/\/ support for \"snprintf\" http:\/\/stackoverflow.com\/questions\/2915672\n-\t\t#define _CRT_SECURE_NO_WARNINGS \/\/ disable _snprintf compile warning\n \t#endif\n+\t#define _CRT_SECURE_NO_WARNINGS \/\/ disable _snprintf compile warning, disable fopen compile error\n #endif\n \n \/\/ System includes\n@@ -96,7 +96,9 @@\n } ProxyInstance;\n \n \/\/ function definitions\n-EXPORT ProxyInstance *stream_open(char *filename);\n+EXPORT ProxyInstance *stream_open_file(char *filename);\n+EXPORT ProxyInstance *stream_open_bufferedio(void *opaque, int(*read_packet)(void *opaque, uint8_t *buf, int buf_size), int64_t(*seek)(void *opaque, int64_t offset, int whence));\n+ProxyInstance *stream_open(ProxyInstance *pi);\n EXPORT void *stream_get_output_config(ProxyInstance *pi);\n EXPORT int stream_read_frame_any(ProxyInstance *pi, int *got_audio_frame);\n EXPORT int stream_read_frame(ProxyInstance *pi, int64_t *timestamp, uint8_t *output_buffer, int output_buffer_size);\n@@ -114,6 +116,35 @@\n static inline int64_t pts_to_samples(ProxyInstance *pi, AVRational time_base, int64_t time);\n static inline int64_t samples_to_pts(ProxyInstance *pi, AVRational time_base, int64_t time);\n \n+\/\/ THESE FUNCTIONS ARE ONLY FOR STANDALONE DEBUG PURPOSES\n+FILE *file_open(const char *filename) {\n+\treturn fopen(filename, \"rb\");\n+}\n+\n+void file_rewind(FILE *f) {\n+\trewind(f);\n+}\n+\n+int file_close(FILE *f) {\n+\treturn fclose(f);\n+}\n+\n+int file_read_packet(FILE* f, uint8_t *buf, int buf_size) {\n+\treturn fread(buf, 1, buf_size, f);\n+}\n+\n+int64_t file_seek(FILE* f, int64_t offset, int whence) {\n+\tif (whence == AVSEEK_SIZE) {\n+\t\tlong current_pos = ftell(f);\t\t\/\/ temporarily save current position\n+\t\tfseek(f, 0, SEEK_END);\t\t\t\t\/\/ seek to end\n+\t\tlong file_size = ftell(f);\t\t\t\/\/ end position == file size\n+\t\tfseek(f, current_pos, SEEK_SET);\t\/\/ return to original position\n+\t\treturn current_pos;\n+\t}\n+\treturn fseek(f, (long)offset, whence);\n+}\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n int main(int argc, char *argv[])\n {\n \tProxyInstance *pi;\n@@ -121,41 +152,64 @@\n \tint ret;\n \tuint8_t *output_buffer;\n \tint output_buffer_size;\n+\tconst int stream_mode = 1; \/\/ 0 = file, 1 = buffered stream IO\n+\tFILE *f = NULL; \/\/ used for buffered stream IO\n \n \tif (argc < 2) {\n \t\tfprintf(stderr, \"No source file specified\\n\");\n \t\texit(1);\n \t}\n \n-\tpi = stream_open(argv[1]);\n+\tif (stream_mode) { \/\/ buffered stream IO\n+\t\tf = file_open(argv[1]);\n+\t\tpi = stream_open_bufferedio(f, file_read_packet, file_seek);\n+\t}\n+\telse { \/\/ file IO\n+\t\tpi = stream_open_file(argv[1]);\n+\t}\n \n \toutput_buffer_size = pi->output.frame_size * pi->output.format.channels * pi->output.format.sample_size;\n \toutput_buffer = malloc(output_buffer_size);\n \n \t\/\/ read full stream\n+\tint64_t count1 = 0, last_ts1;\n \twhile ((ret = stream_read_frame(pi, ×tamp, output_buffer, output_buffer_size)) >= 0) {\n \t\tprintf(\"read %d @ %lld\\n\", ret, timestamp);\n+\t\tcount1++;\n+\t\tlast_ts1 = timestamp;\n \t}\n \n \t\/\/ seek back to start\n \tstream_seek(pi, 0);\n \n \t\/\/ read again (output should be the same as above)\n+\tint64_t count2 = 0, last_ts2;\n \twhile ((ret = stream_read_frame(pi, ×tamp, output_buffer, output_buffer_size)) >= 0) {\n \t\tprintf(\"read %d @ %lld\\n\", ret, timestamp);\n-\t}\n+\t\tcount2++;\n+\t\tlast_ts2 = timestamp;\n+\t}\n+\n+\tprintf(\"read1 count: %lld, timestamp: %lld\\n\", count1, last_ts1);\n+\tprintf(\"read2 count: %lld, timestamp: %lld\\n\", count2, last_ts2);\n \n \tfree(output_buffer);\n \n \tstream_close(pi);\n \n+\tif (stream_mode) {\n+\t\tfile_close(f);\n+\t}\n+\n \treturn 0;\n }\n \n-ProxyInstance *stream_open(char *filename)\n+\/*\n+ * Opens a stream from a file specified by filename.\n+ *\/\n+ProxyInstance *stream_open_file(char *filename)\n {\n \tProxyInstance *pi;\n-\tint ret;\n \n \tpi_init(&pi);\n \n@@ -163,6 +217,71 @@\n \n \tif (avformat_open_input(&pi->fmt_ctx, filename, NULL, NULL) < 0) {\n \t\tfprintf(stderr, \"Could not open source file %s\\n\", filename);\n+\t\texit(1);\n+\t}\n+\n+\treturn stream_open(pi);\n+}\n+\n+\/*\n+ * Opens a buffered I\/O stream through data reading callbacks, allowing for arbitrary data sources (e.g. online streams, custom file input streams).\n+ *\/\n+ProxyInstance *stream_open_bufferedio(\n+\t\/\/ User-specific data that is returned with each callback (e.g. an instance pointer, a stream id, or the source stream object). Optional, can be NULL.\n+\tvoid *opaque, \n+\t\/\/ Callback to read a data packet of given length.\n+\tint(*read_packet)(void *opaque, uint8_t *buf, int buf_size), \n+\t\/\/ Callback for a seek operation. Optional, can be NULL.\n+\t\/\/ whence: SEEK_SET\/0, SEEK_CUR\/1, SEEK_END\/2, AVSEEK_SIZE\/0x10000 (optional, return -1 of not supported), AVSEEK_FORCE\/0x20000 (ored into whence, can be ignored)\n+\tint64_t(*seek)(void *opaque, int64_t offset, int whence))\n+{\n+\tProxyInstance *pi;\n+\tconst int buffer_size = 32 * 1024;\n+\tchar *buffer;\n+\tAVIOContext *io_ctx;\n+\tint ret;\n+\n+\tpi_init(&pi);\n+\n+\tav_register_all();\n+\n+\t\/\/ Allocate IO buffer for the AVIOContext. \n+\t\/\/ Must later be freed by av_free() from AVIOContext.buffer (which could be the same or a replacement buffer).\n+\tbuffer = av_malloc(buffer_size + FF_INPUT_BUFFER_PADDING_SIZE);\n+\n+\t\/\/ Allocate the AVIOContext. Must later be freed by av_free().\n+\tio_ctx = avio_alloc_context(buffer, buffer_size, 0 \/* not writeable *\/, opaque, read_packet, NULL \/* no write_packet needed *\/, seek);\n+\n+\t\/\/ Allocate and configure AVFormatContext. Must later bee freed by avformat_close_input().\n+\tpi->fmt_ctx = avformat_alloc_context();\n+\tpi->fmt_ctx->pb = io_ctx;\n+\n+\t\/\/ NOTE format does not need to be probed manually, FFmpeg does the probing itself and does not crash anymore\n+\n+\t\/\/ TODO fix \"moov atom not found\" for MP4 files\n+\t\/\/ This error happens at the avformat_open_input call for files where the moov atom is at the end of the file\n+\t\/\/ A hacky solution is to increase the buffer to the file size, then FFmpeg can find the atom. But this needs to be avoided at all cost!\n+\n+\tif ((ret = avformat_open_input(&pi->fmt_ctx, NULL, NULL, NULL)) < 0) {\n+\t\tfprintf(stderr, \"Could not open source stream: %s\\n\", av_err2str(ret));\n+\t\texit(1);\n+\t}\n+\n+\t\/\/ NOTE AVFMT_FLAG_CUSTOM_IO is automatically set by avformat_open_input, can be checked when closing the stream to free allocated resources\n+\n+\treturn stream_open(pi);\n+}\n+\n+\/*\n+ * Opens a stream from an initialized AVFormatContext. The AVFormatContext needs to be \n+ * initialized separately, to allow for filename and buffered IO contexts.\n+ *\/\n+ProxyInstance *stream_open(ProxyInstance *pi)\n+{\n+\tint ret;\n+\n+\tif (pi->fmt_ctx == NULL) {\n+\t\tfprintf(stderr, \"AVFormatContext missing \/ not initialized\");\n \t\texit(1);\n \t}\n \n@@ -389,6 +508,11 @@\n \tProxyInstance *_pi = *pi;\n \n \t\/* close & free FFmpeg stuff *\/\n+\tif ((_pi->fmt_ctx->flags & AVFMT_FLAG_CUSTOM_IO) != 0) {\n+\t\t\/\/ buffered stream IO mode\n+\t\tav_free(_pi->fmt_ctx->pb->buffer);\n+\t\tav_free(_pi->fmt_ctx->pb);\n+\t}\n \tav_free_packet(&_pi->pkt);\n \tav_frame_free(&_pi->frame);\n \tswr_free(&_pi->swr);\n"} {"commit":"ad8544c78a497827d11e9c3c4aa415048c5944d2","subject":"extmod\/cc3100: restore ifndef around __CONCAT","message":"extmod\/cc3100: restore ifndef around __CONCAT\n","repos":"emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cc3100\/include\/simplelink.h\n+++ drivers\/cc3100\/include\/simplelink.h\n@@ -443,8 +443,9 @@\n #endif\n \n \n-\n+#ifndef __CONCAT\n #define __CONCAT(x,y)\tx ## y\n+#endif\n #define __CONCAT2(x,y)\t__CONCAT(x,y)\n \n \n"} {"commit":"3c012754c9ff6114d1ba852015329978d18e0dcc","subject":"constraints used in Residual","message":"constraints used in Residual\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@20881 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"EGP-CIG-REU\/dealii,mac-a\/dealii,rrgrove6\/dealii,gpitton\/dealii,msteigemann\/dealii,shakirbsm\/dealii,johntfoster\/dealii,danshapero\/dealii,spco\/dealii,flow123d\/dealii,JaeryunYim\/dealii,andreamola\/dealii,naliboff\/dealii,maieneuro\/dealii,ESeNonFossiIo\/dealii,adamkosik\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,pesser\/dealii,shakirbsm\/dealii,johntfoster\/dealii,shakirbsm\/dealii,angelrca\/dealii,natashasharma\/dealii,EGP-CIG-REU\/dealii,mac-a\/dealii,Arezou-gh\/dealii,spco\/dealii,JaeryunYim\/dealii,kalj\/dealii,Arezou-gh\/dealii,natashasharma\/dealii,lpolster\/dealii,angelrca\/dealii,gpitton\/dealii,Arezou-gh\/dealii,spco\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,mtezzele\/dealii,ESeNonFossiIo\/dealii,sairajat\/dealii,Arezou-gh\/dealii,adamkosik\/dealii,rrgrove6\/dealii,danshapero\/dealii,maieneuro\/dealii,pesser\/dealii,danshapero\/dealii,adamkosik\/dealii,ESeNonFossiIo\/dealii,YongYang86\/dealii,adamkosik\/dealii,YongYang86\/dealii,lue\/dealii,kalj\/dealii,ibkim11\/dealii,YongYang86\/dealii,JaeryunYim\/dealii,gpitton\/dealii,mtezzele\/dealii,mac-a\/dealii,sriharisundar\/dealii,lpolster\/dealii,jperryhouts\/dealii,lue\/dealii,ESeNonFossiIo\/dealii,kalj\/dealii,sairajat\/dealii,lpolster\/dealii,Arezou-gh\/dealii,nicolacavallini\/dealii,johntfoster\/dealii,kalj\/dealii,lpolster\/dealii,mtezzele\/dealii,YongYang86\/dealii,natashasharma\/dealii,naliboff\/dealii,andreamola\/dealii,maieneuro\/dealii,flow123d\/dealii,mtezzele\/dealii,JaeryunYim\/dealii,maieneuro\/dealii,angelrca\/dealii,nicolacavallini\/dealii,naliboff\/dealii,EGP-CIG-REU\/dealii,msteigemann\/dealii,naliboff\/dealii,spco\/dealii,msteigemann\/dealii,Arezou-gh\/dealii,danshapero\/dealii,danshapero\/dealii,ibkim11\/dealii,mac-a\/dealii,rrgrove6\/dealii,mac-a\/dealii,sairajat\/dealii,rrgrove6\/dealii,sriharisundar\/dealii,johntfoster\/dealii,msteigemann\/dealii,ibkim11\/dealii,sairajat\/dealii,sairajat\/dealii,lue\/dealii,nicolacavallini\/dealii,andreamola\/dealii,YongYang86\/dealii,nicolacavallini\/dealii,pesser\/dealii,mtezzele\/dealii,rrgrove6\/dealii,johntfoster\/dealii,jperryhouts\/dealii,nicolacavallini\/dealii,gpitton\/dealii,nicolacavallini\/dealii,sriharisundar\/dealii,ibkim11\/dealii,maieneuro\/dealii,pesser\/dealii,jperryhouts\/dealii,flow123d\/dealii,shakirbsm\/dealii,spco\/dealii,EGP-CIG-REU\/dealii,lpolster\/dealii,pesser\/dealii,lpolster\/dealii,naliboff\/dealii,johntfoster\/dealii,naliboff\/dealii,mtezzele\/dealii,mac-a\/dealii,flow123d\/dealii,andreamola\/dealii,lue\/dealii,flow123d\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,YongYang86\/dealii,lpolster\/dealii,danshapero\/dealii,danshapero\/dealii,lue\/dealii,gpitton\/dealii,flow123d\/dealii,pesser\/dealii,andreamola\/dealii,gpitton\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,ibkim11\/dealii,mtezzele\/dealii,shakirbsm\/dealii,adamkosik\/dealii,lue\/dealii,msteigemann\/dealii,natashasharma\/dealii,sriharisundar\/dealii,sairajat\/dealii,nicolacavallini\/dealii,kalj\/dealii,rrgrove6\/dealii,natashasharma\/dealii,ibkim11\/dealii,flow123d\/dealii,sriharisundar\/dealii,andreamola\/dealii,spco\/dealii,msteigemann\/dealii,ESeNonFossiIo\/dealii,jperryhouts\/dealii,maieneuro\/dealii,jperryhouts\/dealii,maieneuro\/dealii,johntfoster\/dealii,angelrca\/dealii,pesser\/dealii,shakirbsm\/dealii,adamkosik\/dealii,gpitton\/dealii,sairajat\/dealii,jperryhouts\/dealii,mac-a\/dealii,sriharisundar\/dealii,angelrca\/dealii,shakirbsm\/dealii,kalj\/dealii,YongYang86\/dealii,lue\/dealii,jperryhouts\/dealii,JaeryunYim\/dealii,sriharisundar\/dealii,spco\/dealii,rrgrove6\/dealii,ESeNonFossiIo\/dealii,angelrca\/dealii,andreamola\/dealii,ESeNonFossiIo\/dealii,msteigemann\/dealii,naliboff\/dealii,EGP-CIG-REU\/dealii,natashasharma\/dealii,angelrca\/dealii,adamkosik\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/deal.II\/include\/numerics\/mesh_worker_assembler.h\n+++ deal.II\/deal.II\/include\/numerics\/mesh_worker_assembler.h\n@@ -341,6 +341,10 @@\n \tvoid initialize(const BlockInfo* block_info,\n \t\t\tNamedData<VECTOR*>& residuals);\n \t\t\t\t\t \/**\n+\t\t\t\t\t * Initialize the constraints. \n+\t\t\t\t\t *\/\n+ void initialize(const ConstraintMatrix& constraints);\n+\t\t\t\t\t \/**\n \t\t\t\t\t * Initialize the local data\n \t\t\t\t\t * in the\n \t\t\t\t\t * DoFInfo\n@@ -396,6 +400,10 @@\n * A pointer to the object containing the block structure.\n *\/\n SmartPointer<const BlockInfo> block_info;\n+ \/**\n+ * A pointer to the object containing constraints.\n+ *\/\n+ SmartPointer<const ConstraintMatrix, VECTOR> constraints;\n };\n \n \n@@ -1154,6 +1162,14 @@\n residuals = m; \n }\n \n+ template <class VECTOR>\n+ inline void\n+ ResidualLocalBlocksToGlobalBlocks<VECTOR>::initialize(\n+ const ConstraintMatrix& c)\n+ {\n+ constraints = &c;\n+ }\n+\n \n template <class VECTOR>\n template <int dim>\n@@ -1171,6 +1187,8 @@\n const BlockVector<double>& local,\n const std::vector<unsigned int>& dof)\n {\n+ if(constraints == 0)\n+ {\n for (unsigned int b=0;b<local.n_blocks();++b)\n \tfor (unsigned int j=0;j<local.block(b).size();++j)\n \t {\n@@ -1185,6 +1203,9 @@\n \t const unsigned int jcell = this->block_info->local().local_to_global(b, j);\n \t global(dof[jcell]) += local.block(b)(j);\n \t }\n+ }\n+ else\n+ constraints->distribute_local_to_global(local, dof, global);\n }\n \n \n"} {"commit":"0a7c31bad5b127a6ceeec58124e906fff92b51f9","subject":"Fix seeking and timestamp calculations","message":"Fix seeking and timestamp calculations\n\nThis commit adds a type parameter to the seek function, to select which type of stream's timebase should be used for the seek. E.g. Audio And video are usually not entirely in sync and the type selection can make a noticeable difference.\n","repos":"protyposis\/Aurio,protyposis\/Aurio","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- Aurio\/Aurio.FFmpeg.Proxy32\/proxy.c\n+++ Aurio\/Aurio.FFmpeg.Proxy32\/proxy.c\n@@ -130,7 +130,7 @@\n EXPORT void *stream_get_output_config(ProxyInstance *pi, int type);\n int stream_read_frame_any(ProxyInstance *pi, int *got_frame, int *frame_type);\n EXPORT int stream_read_frame(ProxyInstance *pi, int64_t *timestamp, uint8_t *output_buffer, int output_buffer_size, int *frame_type);\n-EXPORT void stream_seek(ProxyInstance *pi, int64_t timestamp);\n+EXPORT void stream_seek(ProxyInstance *pi, int64_t timestamp, int type);\n EXPORT void stream_close(ProxyInstance *pi);\n \n static void pi_init(ProxyInstance **pi);\n@@ -143,8 +143,8 @@\n static int convert_audio_samples(ProxyInstance *pi);\n static int convert_video_frame(ProxyInstance *pi);\n static int determine_target_format(AVCodecContext *audio_codec_ctx);\n-static inline int64_t pts_to_samples(ProxyInstance *pi, AVRational time_base, int64_t time);\n-static inline int64_t samples_to_pts(ProxyInstance *pi, AVRational time_base, int64_t time);\n+static inline int64_t pts_to_samples(double sample_rate, AVRational time_base, int64_t time);\n+static inline int64_t samples_to_pts(double sample_rate, AVRational time_base, int64_t time);\n \n \/\/ THESE FUNCTIONS ARE ONLY FOR STANDALONE DEBUG PURPOSES\n FILE *file_open(const char *filename) {\n@@ -239,7 +239,7 @@\n \t}\n \n \t\/\/ seek back to start\n-\tstream_seek(pi, 0);\n+\tstream_seek(pi, 0, mode == TYPE_VIDEO ? TYPE_VIDEO : TYPE_AUDIO);\n \n \t\/\/ read again (output should be the same as above)\n \tint64_t count2 = 0, last_ts2;\n@@ -396,7 +396,7 @@\n \t\t}\n \n \t\tpi->audio_output.length = pi->audio_stream->duration != AV_NOPTS_VALUE ?\n-\t\t\tpts_to_samples(pi, pi->audio_stream->time_base, pi->audio_stream->duration) : AV_NOPTS_VALUE;\n+\t\t\tpts_to_samples(pi->audio_output.format.sample_rate, pi->audio_stream->time_base, pi->audio_stream->duration) : AV_NOPTS_VALUE;\n \n \t\t\/*\n \t\t* TODO To get the frame size, read the first frame, take the size, and seek back to the start.\n@@ -463,7 +463,7 @@\n \t\t}\n \n \t\tpi->video_output.length = pi->video_stream->duration != AV_NOPTS_VALUE ?\n-\t\t\tpts_to_samples(pi, pi->video_stream->time_base, pi->video_stream->duration) : AV_NOPTS_VALUE;\n+\t\t\tpts_to_samples(pi->video_output.format.frame_rate, pi->video_stream->time_base, pi->video_stream->duration) : AV_NOPTS_VALUE;\n \n \t\tpi->video_output.frame_size = pi->video_output.format.width * pi->video_output.format.height * 4; \/\/ TODO determine real size\n \n@@ -588,11 +588,11 @@\n \t\tif (ret < 0 || got_frame) {\n \t\t\tif (*frame_type == TYPE_AUDIO) {\n \t\t\t\t*timestamp = pi->pkt.pts != AV_NOPTS_VALUE ?\n-\t\t\t\t\tpts_to_samples(pi, pi->audio_stream->time_base, pi->pkt.pts) : pi->pkt.pos;\n+\t\t\t\t\tpts_to_samples(pi->audio_output.format.sample_rate, pi->audio_stream->time_base, pi->pkt.pts) : pi->pkt.pos;\n \t\t\t}\n \t\t\telse if (*frame_type == TYPE_VIDEO) {\n \t\t\t\t*timestamp = pi->pkt.pts != AV_NOPTS_VALUE ?\n-\t\t\t\t\tpts_to_samples(pi, pi->video_stream->time_base, pi->pkt.pts) : pi->pkt.pos;\n+\t\t\t\t\tpts_to_samples(pi->video_output.format.frame_rate, pi->video_stream->time_base, pi->pkt.pts) : pi->pkt.pos;\n \t\t\t\tpi->video_output.current_frame.keyframe = pi->frame->key_frame;\n \t\t\t\tpi->video_output.current_frame.pict_type = pi->frame->pict_type;\n \t\t\t\tpi->video_output.current_frame.interlaced = pi->frame->interlaced_frame;\n@@ -603,10 +603,26 @@\n \t}\n }\n \n-void stream_seek(ProxyInstance *pi, int64_t timestamp)\n-{\n+void stream_seek(ProxyInstance *pi, int64_t timestamp, int type)\n+{\n+\tAVStream *seek_stream;\n+\tdouble sample_rate;\n+\n+\tif (pi->mode & TYPE_AUDIO && type == TYPE_AUDIO) {\n+\t\tseek_stream = pi->audio_stream;\n+\t\tsample_rate = pi->audio_output.format.sample_rate;\n+\t}\n+\telse if (pi->mode & TYPE_VIDEO && type == TYPE_VIDEO) {\n+\t\tseek_stream = pi->video_stream;\n+\t\tsample_rate = pi->video_output.format.frame_rate;\n+\t}\n+\telse {\n+\t\tfprintf(stderr, \"unsupported seek stream type %d\\n\", type);\n+\t\texit(1);\n+\t}\n+\n \t\/\/ convert sample time to time_base time\n-\ttimestamp = samples_to_pts(pi, pi->audio_stream->time_base, timestamp);\n+\ttimestamp = samples_to_pts(sample_rate, seek_stream->time_base, timestamp);\n \n \t\/*\n \t * When seeking to a timestamp which is not exactly a frame PTS but \n@@ -624,10 +640,11 @@\n \t *\/\n \n \t\/\/ do seek\n-\tav_seek_frame(pi->fmt_ctx, pi->audio_stream->index, timestamp, AVSEEK_FLAG_BACKWARD);\n+\tav_seek_frame(pi->fmt_ctx, seek_stream->index, timestamp, AVSEEK_FLAG_BACKWARD);\n \t\n \t\/\/ flush codec\n-\tavcodec_flush_buffers(pi->audio_codec_ctx);\n+\tif (pi->mode & TYPE_AUDIO) avcodec_flush_buffers(pi->audio_codec_ctx);\n+\tif (pi->mode & TYPE_VIDEO) avcodec_flush_buffers(pi->video_codec_ctx);\n \n \t\/\/ avcodec_flush_buffers invalidates the packet reference\n \tpi->pkt.data = NULL;\n@@ -670,8 +687,10 @@\n \t\tav_free(_pi->fmt_ctx->pb->buffer);\n \t\tav_free(_pi->fmt_ctx->pb);\n \t}\n-\tsws_freeContext(_pi->sws);\n-\tavpicture_free(&_pi->video_picture);\n+\tif (_pi->mode & TYPE_VIDEO) {\n+\t\tsws_freeContext(_pi->sws);\n+\t\tavpicture_free(&_pi->video_picture);\n+\t}\n \tav_free_packet(&_pi->pkt);\n \tav_frame_free(&_pi->frame);\n \tswr_free(&_pi->swr);\n@@ -947,12 +966,12 @@\n \treturn AV_SAMPLE_FMT_FLT;\n }\n \n-static inline int64_t pts_to_samples(ProxyInstance *pi, AVRational time_base, int64_t time)\n-{\n-\treturn (int64_t)round((av_q2d(time_base) * time) * pi->audio_output.format.sample_rate);\n-}\n-\n-static inline int64_t samples_to_pts(ProxyInstance *pi, AVRational time_base, int64_t time)\n-{\n-\treturn (int64_t)round(time \/ av_q2d(time_base) \/ pi->audio_output.format.sample_rate);\n-}\n+static inline int64_t pts_to_samples(double sample_rate, AVRational time_base, int64_t time)\n+{\n+\treturn (int64_t)round((av_q2d(time_base) * time) * sample_rate);\n+}\n+\n+static inline int64_t samples_to_pts(double sample_rate, AVRational time_base, int64_t time)\n+{\n+\treturn (int64_t)round(time \/ av_q2d(time_base) \/ sample_rate);\n+}\n"} {"commit":"25176ed670121e1e0aae5c8161713c332b786538","subject":"ipmi: fix statistics counting issues","message":"ipmi: fix statistics counting issues\n\nBela Lubkin noticed that the statistics for send IPMB and LAN commands\nin the IPMI driver could be incremented even if an error occurred. Move\nthe increments to the proper place to avoid this.\n\nAlso add some statistics for retransmissions that failed, and some little\nhelper functions to neaten up the code a little.\n\nSigned-off-by: Corey Minyard <97c9634d4bed2779ee3e53c0495565ccc28c2363@mvista.com>\nCc: Bela Lubkin <210a20779db4c5b7bdffde2c331b86a1e28a64ec@vmware.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_msghandler.c\n+++ drivers\/char\/ipmi\/ipmi_msghandler.c\n@@ -285,6 +285,11 @@\n \t\/* Events that were received with the proper format. *\/\n \tIPMI_STAT_events,\n \n+\t\/* Retransmissions on IPMB that failed. *\/\n+\tIPMI_STAT_dropped_rexmit_ipmb_commands,\n+\n+\t\/* Retransmissions on LAN that failed. *\/\n+\tIPMI_STAT_dropped_rexmit_lan_commands,\n \n \t\/* This *must* remain last, add new values above this. *\/\n \tIPMI_NUM_STATS\n@@ -445,6 +450,20 @@\n #define ipmi_get_stat(intf, stat) \\\n \t((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))\n \n+static int is_lan_addr(struct ipmi_addr *addr)\n+{\n+\treturn addr->addr_type == IPMI_LAN_ADDR_TYPE;\n+}\n+\n+static int is_ipmb_addr(struct ipmi_addr *addr)\n+{\n+\treturn addr->addr_type == IPMI_IPMB_ADDR_TYPE;\n+}\n+\n+static int is_ipmb_bcast_addr(struct ipmi_addr *addr)\n+{\n+\treturn addr->addr_type == IPMI_IPMB_BROADCAST_ADDR_TYPE;\n+}\n \n static void free_recv_msg_list(struct list_head *q)\n {\n@@ -601,8 +620,7 @@\n \t\treturn (smi_addr1->lun == smi_addr2->lun);\n \t}\n \n-\tif ((addr1->addr_type == IPMI_IPMB_ADDR_TYPE)\n-\t || (addr1->addr_type == IPMI_IPMB_BROADCAST_ADDR_TYPE)) {\n+\tif (is_ipmb_addr(addr1) || is_ipmb_bcast_addr(addr1)) {\n \t\tstruct ipmi_ipmb_addr *ipmb_addr1\n \t\t = (struct ipmi_ipmb_addr *) addr1;\n \t\tstruct ipmi_ipmb_addr *ipmb_addr2\n@@ -612,7 +630,7 @@\n \t\t\t&& (ipmb_addr1->lun == ipmb_addr2->lun));\n \t}\n \n-\tif (addr1->addr_type == IPMI_LAN_ADDR_TYPE) {\n+\tif (is_lan_addr(addr1)) {\n \t\tstruct ipmi_lan_addr *lan_addr1\n \t\t\t= (struct ipmi_lan_addr *) addr1;\n \t\tstruct ipmi_lan_addr *lan_addr2\n@@ -644,14 +662,13 @@\n \t || (addr->channel < 0))\n \t\treturn -EINVAL;\n \n-\tif ((addr->addr_type == IPMI_IPMB_ADDR_TYPE)\n-\t || (addr->addr_type == IPMI_IPMB_BROADCAST_ADDR_TYPE)) {\n+\tif (is_ipmb_addr(addr) || is_ipmb_bcast_addr(addr)) {\n \t\tif (len < sizeof(struct ipmi_ipmb_addr))\n \t\t\treturn -EINVAL;\n \t\treturn 0;\n \t}\n \n-\tif (addr->addr_type == IPMI_LAN_ADDR_TYPE) {\n+\tif (is_lan_addr(addr)) {\n \t\tif (len < sizeof(struct ipmi_lan_addr))\n \t\t\treturn -EINVAL;\n \t\treturn 0;\n@@ -1503,8 +1520,7 @@\n \t\t\tmemcpy(&(smi_msg->data[2]), msg->data, msg->data_len);\n \t\tsmi_msg->data_size = msg->data_len + 2;\n \t\tipmi_inc_stat(intf, sent_local_commands);\n-\t} else if ((addr->addr_type == IPMI_IPMB_ADDR_TYPE)\n-\t\t || (addr->addr_type == IPMI_IPMB_BROADCAST_ADDR_TYPE)) {\n+\t} else if (is_ipmb_addr(addr) || is_ipmb_bcast_addr(addr)) {\n \t\tstruct ipmi_ipmb_addr *ipmb_addr;\n \t\tunsigned char ipmb_seq;\n \t\tlong seqid;\n@@ -1582,8 +1598,6 @@\n \t\t\t\/* It's a command, so get a sequence for it. *\/\n \n \t\t\tspin_lock_irqsave(&(intf->seq_lock), flags);\n-\n-\t\t\tipmi_inc_stat(intf, sent_ipmb_commands);\n \n \t\t\t\/*\n \t\t\t * Create a sequence number with a 1 second\n@@ -1606,6 +1620,8 @@\n \t\t\t\tgoto out_err;\n \t\t\t}\n \n+\t\t\tipmi_inc_stat(intf, sent_ipmb_commands);\n+\n \t\t\t\/*\n \t\t\t * Store the sequence number in the message,\n \t\t\t * so that when the send message response\n@@ -1635,7 +1651,7 @@\n \t\t\t *\/\n \t\t\tspin_unlock_irqrestore(&(intf->seq_lock), flags);\n \t\t}\n-\t} else if (addr->addr_type == IPMI_LAN_ADDR_TYPE) {\n+\t} else if (is_lan_addr(addr)) {\n \t\tstruct ipmi_lan_addr *lan_addr;\n \t\tunsigned char ipmb_seq;\n \t\tlong seqid;\n@@ -1695,8 +1711,6 @@\n \t\t\t\/* It's a command, so get a sequence for it. *\/\n \n \t\t\tspin_lock_irqsave(&(intf->seq_lock), flags);\n-\n-\t\t\tipmi_inc_stat(intf, sent_lan_commands);\n \n \t\t\t\/*\n \t\t\t * Create a sequence number with a 1 second\n@@ -1718,6 +1732,8 @@\n \t\t\t\t\t\t flags);\n \t\t\t\tgoto out_err;\n \t\t\t}\n+\n+\t\t\tipmi_inc_stat(intf, sent_lan_commands);\n \n \t\t\t\/*\n \t\t\t * Store the sequence number in the message,\n@@ -1937,6 +1953,10 @@\n \t\t ipmi_get_stat(intf, invalid_events));\n \tout += sprintf(out, \"events: %u\\n\",\n \t\t ipmi_get_stat(intf, events));\n+\tout += sprintf(out, \"failed rexmit LAN msgs: %u\\n\",\n+\t\t ipmi_get_stat(intf, dropped_rexmit_lan_commands));\n+\tout += sprintf(out, \"failed rexmit IPMB msgs: %u\\n\",\n+\t\t ipmi_get_stat(intf, dropped_rexmit_ipmb_commands));\n \n \treturn (out - ((char *) page));\n }\n@@ -3730,7 +3750,7 @@\n \t\tlist_add_tail(&msg->link, timeouts);\n \t\tif (ent->broadcast)\n \t\t\tipmi_inc_stat(intf, timed_out_ipmb_broadcasts);\n-\t\telse if (ent->recv_msg->addr.addr_type == IPMI_LAN_ADDR_TYPE)\n+\t\telse if (is_lan_addr(&ent->recv_msg->addr))\n \t\t\tipmi_inc_stat(intf, timed_out_lan_commands);\n \t\telse\n \t\t\tipmi_inc_stat(intf, timed_out_ipmb_commands);\n@@ -3744,15 +3764,17 @@\n \t\t *\/\n \t\tent->timeout = MAX_MSG_TIMEOUT;\n \t\tent->retries_left--;\n-\t\tif (ent->recv_msg->addr.addr_type == IPMI_LAN_ADDR_TYPE)\n-\t\t\tipmi_inc_stat(intf, retransmitted_lan_commands);\n-\t\telse\n-\t\t\tipmi_inc_stat(intf, retransmitted_ipmb_commands);\n-\n \t\tsmi_msg = smi_from_recv_msg(intf, ent->recv_msg, slot,\n \t\t\t\t\t ent->seqid);\n-\t\tif (!smi_msg)\n+\t\tif (!smi_msg) {\n+\t\t\tif (is_lan_addr(&ent->recv_msg->addr))\n+\t\t\t\tipmi_inc_stat(intf,\n+\t\t\t\t\t dropped_rexmit_lan_commands);\n+\t\t\telse\n+\t\t\t\tipmi_inc_stat(intf,\n+\t\t\t\t\t dropped_rexmit_ipmb_commands);\n \t\t\treturn;\n+\t\t}\n \n \t\tspin_unlock_irqrestore(&intf->seq_lock, *flags);\n \n@@ -3764,10 +3786,17 @@\n \t\t * resent.\n \t\t *\/\n \t\thandlers = intf->handlers;\n-\t\tif (handlers)\n+\t\tif (handlers) {\n+\t\t\tif (is_lan_addr(&ent->recv_msg->addr))\n+\t\t\t\tipmi_inc_stat(intf,\n+\t\t\t\t\t retransmitted_lan_commands);\n+\t\t\telse\n+\t\t\t\tipmi_inc_stat(intf,\n+\t\t\t\t\t retransmitted_ipmb_commands);\n+\n \t\t\tintf->handlers->sender(intf->send_info,\n \t\t\t\t\t smi_msg, 0);\n-\t\telse\n+\t\t} else\n \t\t\tipmi_free_smi_msg(smi_msg);\n \n \t\tspin_lock_irqsave(&intf->seq_lock, *flags);\n"} {"commit":"0f112a86a36b91afe30e1cc8d4bc000402dde127","subject":"[WATCHDOG] Eurotechwdt.c - clean-up comments","message":"[WATCHDOG] Eurotechwdt.c - clean-up comments\n\nClean-up history and add a comment about the fact that\nthe watchdog is actually part of the SMSC FDC 37B782\nsuper I\/O chipset.\n\nSigned-off-by: Wim Van Sebroeck <5f65f6985de1ebf15dde04e0dc4668211868bafa@iguana.be>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/watchdog\/eurotechwdt.c\n+++ drivers\/char\/watchdog\/eurotechwdt.c\n@@ -1,5 +1,5 @@\n \/*\n- *\tEurotech CPU-1220\/1410 on board WDT driver\n+ *\tEurotech CPU-1220\/1410\/1420 on board WDT driver\n *\n *\t(c) Copyright 2001 Ascensit <support@ascensit.com>\n *\t(c) Copyright 2001 Rodolfo Giometti <giometti@ascensit.com>\n@@ -24,6 +24,9 @@\n *\/\n \n \/* Changelog:\n+ *\n+ * 2001 - Rodolfo Giometti\n+ *\tInitial release\n *\n * 2002\/04\/25 - Rob Radez\n *\tclean up #includes\n@@ -33,11 +36,13 @@\n *\tadd WDIOC_GETSTATUS and WDIOC_SETOPTIONS ioctls\n *\tadd expect_close support\n *\n- * 2001 - Rodolfo Giometti\n- *\tInitial release\n- *\n * 2002.05.30 - Joel Becker <joel.becker@oracle.com>\n * \tAdded Matt Domsch's nowayout module option.\n+ *\/\n+\n+\/*\n+ *\tThe eurotech CPU-1220\/1410\/1420's watchdog is a part\n+ *\tof the on-board SUPER I\/O device SMSC FDC 37B782.\n *\/\n \n #include <linux\/interrupt.h>\n"} {"commit":"11bb961c018f3f345fca59390d2a3e53210c0abe","subject":"common\/octeontx2: fix link event message size","message":"common\/octeontx2: fix link event message size\n\nDue to wrong size of mbox message allocated for sending link status\nto the VF, incorrect link status is observed.\n\nFixes: cb8d769fb6fe (\"common\/octeontx2: send link event to VF\")\nCc: stable@dpdk.org\n\nSigned-off-by: Harman Kalra <568a3484dfecf16d6b30cd214c570848bb408570@marvell.com>\nAcked-by: Jerin Jacob <352c4d4f9291b869992ddb67daa45ddc149fed30@marvell.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/common\/octeontx2\/otx2_dev.c\n+++ drivers\/common\/octeontx2\/otx2_dev.c\n@@ -172,14 +172,17 @@\n \t\t\t\/* Send link status to VF *\/\n \t\t\tstruct cgx_link_user_info linfo;\n \t\t\tstruct mbox_msghdr *vf_msg;\n+\t\t\tsize_t sz;\n \n \t\t\t\/* Get the link status *\/\n \t\t\tif (dev->ops && dev->ops->link_status_get)\n \t\t\t\tdev->ops->link_status_get(dev, &linfo);\n \n+\t\t\tsz = RTE_ALIGN(otx2_mbox_id2size(\n+\t\t\t\tMBOX_MSG_CGX_LINK_EVENT), MBOX_MSG_ALIGN);\n \t\t\t\/* Prepare the message to be sent *\/\n \t\t\tvf_msg = otx2_mbox_alloc_msg(&dev->mbox_vfpf_up, vf,\n-\t\t\t\t\t\t size);\n+\t\t\t\t\t\t sz);\n \t\t\totx2_mbox_req_init(MBOX_MSG_CGX_LINK_EVENT, vf_msg);\n \t\t\tmemcpy((uint8_t *)vf_msg + sizeof(struct mbox_msghdr),\n \t\t\t &linfo, sizeof(struct cgx_link_user_info));\n"} {"commit":"3fdcf80f75814fe2f28db43771b50f9aa70d43b6","subject":"drm\/i915\/skl: Initialize PPGTT like gen8","message":"drm\/i915\/skl: Initialize PPGTT like gen8\n\ngen9 uses very similar memory management to what gen8 has. Just follow\nthe flow.\n\nv2: Fix trivial conflict (Damien)\n\nReviewed-by: Rodrigo Vivi <f714145d6ee82178e54021e0c168f56d17b53c9c@intel.com>\nReviewed-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\nSigned-off-by: Damien Lespiau <64bd3cb94f359c1a3ce68dae5e26b40578526277@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"7907f45bf9f67a1c5e5d4ae05bab428d7c2f43b2","subject":"Revert \"drm\/i915\/bdw: Limit GTT to 2GB\"","message":"Revert \"drm\/i915\/bdw: Limit GTT to 2GB\"\n\nThis reverts commit 3a2ffb65eec6dbda2fd8151894f51c18b42c8d41.\n\nNow that the code is fixed to use smaller allocations, it should be safe\nto let the full GGTT be used on BDW.\n\nThe testcase for this is anything which uses more than half of the GTT,\nthus eclipsing the old limit.\n\nReviewed-by: Imre Deak <fbd5edba1988036c8923f0cca0cce6ac4811db29@intel.com>\nSigned-off-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"cd4e38542a5c2cab94e5410fb17c1cc004a60792","subject":"IB\/srp: Report receive errors correctly","message":"IB\/srp: Report receive errors correctly\n\nThe IB spec does not guarantee that the opcode is available in error\ncompletions. Hence do not rely on it. See also commit 948d1e889e5b\n(\"IB\/srp: Introduce srp_handle_qp_err()\").\n\nSigned-off-by: Bart Van Assche <89ed62d80e76c0eb24ee0d6433b48a91c2273b5e@acm.org>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org> # v3.8\nSigned-off-by: Roland Dreier <0d270388f2f92757a5de0f4bd891d3b392c44c4f@purestorage.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/infiniband\/ulp\/srp\/ib_srp.c\n+++ drivers\/infiniband\/ulp\/srp\/ib_srp.c\n@@ -1449,14 +1449,13 @@\n \t\tsrp_start_tl_fail_timers(target->rport);\n }\n \n-static void srp_handle_qp_err(enum ib_wc_status wc_status,\n-\t\t\t enum ib_wc_opcode wc_opcode,\n+static void srp_handle_qp_err(enum ib_wc_status wc_status, bool send_err,\n \t\t\t struct srp_target_port *target)\n {\n \tif (target->connected && !target->qp_in_error) {\n \t\tshost_printk(KERN_ERR, target->scsi_host,\n \t\t\t PFX \"failed %s status %d\\n\",\n-\t\t\t wc_opcode & IB_WC_RECV ? \"receive\" : \"send\",\n+\t\t\t send_err ? \"send\" : \"receive\",\n \t\t\t wc_status);\n \t\tqueue_work(system_long_wq, &target->tl_err_work);\n \t}\n@@ -1473,7 +1472,7 @@\n \t\tif (likely(wc.status == IB_WC_SUCCESS)) {\n \t\t\tsrp_handle_recv(target, &wc);\n \t\t} else {\n-\t\t\tsrp_handle_qp_err(wc.status, wc.opcode, target);\n+\t\t\tsrp_handle_qp_err(wc.status, false, target);\n \t\t}\n \t}\n }\n@@ -1489,7 +1488,7 @@\n \t\t\tiu = (struct srp_iu *) (uintptr_t) wc.wr_id;\n \t\t\tlist_add(&iu->list, &target->free_tx);\n \t\t} else {\n-\t\t\tsrp_handle_qp_err(wc.status, wc.opcode, target);\n+\t\t\tsrp_handle_qp_err(wc.status, true, target);\n \t\t}\n \t}\n }\n"} {"commit":"5f553388b06532b495681f5d6c8e8fbff64ea86a","subject":"V4L\/DVB (6015): DVB: convert struct class_device to struct device","message":"V4L\/DVB (6015): DVB: convert struct class_device to struct device\n\nThe currently used \"struct class_device\" will be removed from the\nkernel. Here is a trivial patch that converts DVB to use struct device.\n\nSigned-off-by: Kay Sievers <a591390dde1303c55d531fd687bfa5ffd43e435e@vrfy.org>\nSigned-off-by: Michael Krufky <00524723a60798c74a43fcc620c25dd7b9ece078@linuxtv.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-core\/dvbdev.c\n+++ drivers\/media\/dvb\/dvb-core\/dvbdev.c\n@@ -200,7 +200,7 @@\n {\n \tstruct dvb_device *dvbdev;\n \tstruct file_operations *dvbdevfops;\n-\tstruct class_device *clsdev;\n+\tstruct device *clsdev;\n \tint id;\n \n \tmutex_lock(&dvbdev_register_lock);\n@@ -242,10 +242,9 @@\n \n \tmutex_unlock(&dvbdev_register_lock);\n \n-\tclsdev = class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR,\n-\t\t\t\t nums2minor(adap->num, type, id)),\n-\t\t\t\t adap->device, \"dvb%d.%s%d\", adap->num,\n-\t\t\t\t dnames[type], id);\n+\tclsdev = device_create(dvb_class, adap->device,\n+\t\t\t MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),\n+\t\t\t \"dvb%d.%s%d\", adap->num, dnames[type], id);\n \tif (IS_ERR(clsdev)) {\n \t\tprintk(KERN_ERR \"%s: failed to create device dvb%d.%s%d (%ld)\\n\",\n \t\t __FUNCTION__, adap->num, dnames[type], id, PTR_ERR(clsdev));\n@@ -266,8 +265,8 @@\n \tif (!dvbdev)\n \t\treturn;\n \n-\tclass_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,\n-\t\t\t\t\tdvbdev->type, dvbdev->id)));\n+\tdevice_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num,\n+\t\t dvbdev->type, dvbdev->id)));\n \n \tlist_del (&dvbdev->list_head);\n \tkfree (dvbdev->fops);\n"} {"commit":"f8931f56f51a795e030318b95e4a0f8ac453e35e","subject":"[media] DM04\/QQBOX Update V1.76 - use 32 bit remote decoding","message":"[media] DM04\/QQBOX Update V1.76 - use 32 bit remote decoding\n\nUse 32 bit decoding to add support for more than one variant of remote\ncontrol.\n\nSigned-off-by: Malcolm Priestley <123fd39c698f702285d09eaebae85efdff081c95@gmail.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/lmedm04.c\n+++ drivers\/media\/dvb\/dvb-usb\/lmedm04.c\n@@ -204,7 +204,7 @@\n \t\t\trbuff, sizeof(rbuff));\n \treturn ret;\n }\n-static int lme2510_remote_keypress(struct dvb_usb_adapter *adap, u16 keypress)\n+static int lme2510_remote_keypress(struct dvb_usb_adapter *adap, u32 keypress)\n {\n \tstruct dvb_usb_device *d = adap->dev;\n \n@@ -250,7 +250,8 @@\n \t\tcase 0xaa:\n \t\t\tdebug_data_snipet(1, \"INT Remote data snipet in\", ibuf);\n \t\t\tlme2510_remote_keypress(adap,\n-\t\t\t\t(u16)(ibuf[4]<<8)+ibuf[5]);\n+\t\t\t\t(u32)(ibuf[2] << 24) + (ibuf[3] << 16) +\n+\t\t\t\t(ibuf[4] << 8) + ibuf[5]);\n \t\t\tbreak;\n \t\tcase 0xbb:\n \t\t\tswitch (st->tuner_config) {\n"} {"commit":"ef226d00dd041f753163fd3b69c7790496ab8384","subject":"V4L\/DVB (11760): dvb-ttpci: Check transport error indicator flag","message":"V4L\/DVB (11760): dvb-ttpci: Check transport error indicator flag\n\nDiscard PES packet if transport error indicator flag is set.\n\nSigned-off-by: Oliver Endriss <9b3f86b56e4ec8d638cb909e38a925ff6631c42a@gmx.de>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/dvb\/ttpci\/av7110_av.c\n+++ drivers\/media\/dvb\/ttpci\/av7110_av.c\n@@ -824,6 +824,11 @@\n {\n \tstruct ipack *ipack = &av7110->ipack[type];\n \n+\tif (buf[1] & TRANS_ERROR) {\n+\t\tav7110_ipack_reset(ipack);\n+\t\treturn -1;\n+\t}\n+\n \tif (!(buf[3] & PAYLOAD))\n \t\treturn -1;\n \n"} {"commit":"4d6454dbae935825e729f34dc7410bb1b22c7944","subject":"[media] gspca_pac7302: Add usb-id for 145f:013c","message":"[media] gspca_pac7302: Add usb-id for 145f:013c\n\nReported by: Grzegorz Wo\u017aniak\n\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/pac7302.c\n+++ drivers\/media\/video\/gspca\/pac7302.c\n@@ -1197,6 +1197,7 @@\n \t{USB_DEVICE(0x093a, 0x2629), .driver_info = FL_VFLIP},\n \t{USB_DEVICE(0x093a, 0x262a)},\n \t{USB_DEVICE(0x093a, 0x262c)},\n+\t{USB_DEVICE(0x145f, 0x013c)},\n \t{}\n };\n MODULE_DEVICE_TABLE(usb, device_table);\n"} {"commit":"bba57f8f948239340e939cb25c7d858cd60ad9de","subject":"drivers\/misc\/sgi-gru: fix dereference of ERR_PTR","message":"drivers\/misc\/sgi-gru: fix dereference of ERR_PTR\n\ngru_alloc_gts() can fail and it can return ERR_PTR(errvalue). We should\nnot dereference it if it has returned error. And incase it has returned\nerror then wait for some time and try again.\n\nSigned-off-by: Sudip Mukherjee <8ebcb270388efeefbc3b674e2d51f150dd6e6b25@vectorindia.org>\nAcked-by: Dimitri Sivanich <eb9314cd9fb6c9c1ab10792809da7e2f4af25acd@sgi.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"daf3ec688e057f6060fb9bb0819feac7a8bbf45c","subject":"tg3: Fix crc errors on jumbo frame receive","message":"tg3: Fix crc errors on jumbo frame receive\n\nTG3_PHY_AUXCTL_SMDSP_ENABLE\/DISABLE macros do a blind write to the phy\nauxiliary control register and overwrite the EXT_PKT_LEN (bit 14) resulting\nin intermittent crc errors on jumbo frames with some link partners. Change\nthe code to do a read\/modify\/write.\n\nSigned-off-by: Nithin Nayak Sujir <a41d72140302bfd55cac4982138967475b47eb43@broadcom.com>\nSigned-off-by: Michael Chan <6b52f9d672b6134057900fe608467612b789a84e@broadcom.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/broadcom\/tg3.c\n+++ drivers\/net\/ethernet\/broadcom\/tg3.c\n@@ -1283,14 +1283,26 @@\n \treturn tg3_writephy(tp, MII_TG3_AUX_CTRL, set | reg);\n }\n \n-#define TG3_PHY_AUXCTL_SMDSP_ENABLE(tp) \\\n-\ttg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \\\n-\t\t\t MII_TG3_AUXCTL_ACTL_SMDSP_ENA | \\\n-\t\t\t MII_TG3_AUXCTL_ACTL_TX_6DB)\n-\n-#define TG3_PHY_AUXCTL_SMDSP_DISABLE(tp) \\\n-\ttg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \\\n-\t\t\t MII_TG3_AUXCTL_ACTL_TX_6DB);\n+static int tg3_phy_toggle_auxctl_smdsp(struct tg3 *tp, bool enable)\n+{\n+\tu32 val;\n+\tint err;\n+\n+\terr = tg3_phy_auxctl_read(tp, MII_TG3_AUXCTL_SHDWSEL_AUXCTL, &val);\n+\n+\tif (err)\n+\t\treturn err;\n+\tif (enable)\n+\n+\t\tval |= MII_TG3_AUXCTL_ACTL_SMDSP_ENA;\n+\telse\n+\t\tval &= ~MII_TG3_AUXCTL_ACTL_SMDSP_ENA;\n+\n+\terr = tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL,\n+\t\t\t\t val | MII_TG3_AUXCTL_ACTL_TX_6DB);\n+\n+\treturn err;\n+}\n \n static int tg3_bmcr_reset(struct tg3 *tp)\n {\n@@ -2223,7 +2235,7 @@\n \n \totp = tp->phy_otp;\n \n-\tif (TG3_PHY_AUXCTL_SMDSP_ENABLE(tp))\n+\tif (tg3_phy_toggle_auxctl_smdsp(tp, true))\n \t\treturn;\n \n \tphy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT);\n@@ -2248,7 +2260,7 @@\n \t ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT);\n \ttg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy);\n \n-\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n }\n \n static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)\n@@ -2284,9 +2296,9 @@\n \n \tif (!tp->setlpicnt) {\n \t\tif (current_link_up == 1 &&\n-\t\t !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {\n+\t\t !tg3_phy_toggle_auxctl_smdsp(tp, true)) {\n \t\t\ttg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);\n-\t\t\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\t\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \t\t}\n \n \t\tval = tr32(TG3_CPMU_EEE_MODE);\n@@ -2302,11 +2314,11 @@\n \t (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||\n \t GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||\n \t tg3_flag(tp, 57765_CLASS)) &&\n-\t !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {\n+\t !tg3_phy_toggle_auxctl_smdsp(tp, true)) {\n \t\tval = MII_TG3_DSP_TAP26_ALNOKO |\n \t\t MII_TG3_DSP_TAP26_RMRXSTO;\n \t\ttg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);\n-\t\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \t}\n \n \tval = tr32(TG3_CPMU_EEE_MODE);\n@@ -2450,7 +2462,7 @@\n \t\ttg3_writephy(tp, MII_CTRL1000,\n \t\t\t CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER);\n \n-\t\terr = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);\n+\t\terr = tg3_phy_toggle_auxctl_smdsp(tp, true);\n \t\tif (err)\n \t\t\treturn err;\n \n@@ -2471,7 +2483,7 @@\n \ttg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);\n \ttg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000);\n \n-\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \n \ttg3_writephy(tp, MII_CTRL1000, phy9_orig);\n \n@@ -2572,10 +2584,10 @@\n \n out:\n \tif ((tp->phy_flags & TG3_PHYFLG_ADC_BUG) &&\n-\t !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {\n+\t !tg3_phy_toggle_auxctl_smdsp(tp, true)) {\n \t\ttg3_phydsp_write(tp, 0x201f, 0x2aaa);\n \t\ttg3_phydsp_write(tp, 0x000a, 0x0323);\n-\t\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \t}\n \n \tif (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) {\n@@ -2584,14 +2596,14 @@\n \t}\n \n \tif (tp->phy_flags & TG3_PHYFLG_BER_BUG) {\n-\t\tif (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {\n+\t\tif (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {\n \t\t\ttg3_phydsp_write(tp, 0x000a, 0x310b);\n \t\t\ttg3_phydsp_write(tp, 0x201f, 0x9506);\n \t\t\ttg3_phydsp_write(tp, 0x401f, 0x14e2);\n-\t\t\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\t\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \t\t}\n \t} else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) {\n-\t\tif (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) {\n+\t\tif (!tg3_phy_toggle_auxctl_smdsp(tp, true)) {\n \t\t\ttg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a);\n \t\t\tif (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) {\n \t\t\t\ttg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b);\n@@ -2600,7 +2612,7 @@\n \t\t\t} else\n \t\t\t\ttg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b);\n \n-\t\t\tTG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\t\ttg3_phy_toggle_auxctl_smdsp(tp, false);\n \t\t}\n \t}\n \n@@ -4009,7 +4021,7 @@\n \ttw32(TG3_CPMU_EEE_MODE,\n \t tr32(TG3_CPMU_EEE_MODE) & ~TG3_CPMU_EEEMD_LPI_ENABLE);\n \n-\terr = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp);\n+\terr = tg3_phy_toggle_auxctl_smdsp(tp, true);\n \tif (!err) {\n \t\tu32 err2;\n \n@@ -4042,7 +4054,7 @@\n \t\t\t\t\t\t MII_TG3_DSP_CH34TP2_HIBW01);\n \t\t}\n \n-\t\terr2 = TG3_PHY_AUXCTL_SMDSP_DISABLE(tp);\n+\t\terr2 = tg3_phy_toggle_auxctl_smdsp(tp, false);\n \t\tif (!err)\n \t\t\terr = err2;\n \t}\n"} {"commit":"ee14eb7b5f20313d80eedeb8d35e84429a7cf020","subject":"skge: Added FS A8NE-FM to the list of 32bit DMA boards","message":"skge: Added FS A8NE-FM to the list of 32bit DMA boards\n\nAdded FUJITSU SIEMENS A8NE-FM to the list of 32bit DMA boards\n\n>From Tomi O.:\nAfter I added an entry to this MB into the skge.c\ndriver in order to enable the mentioned 64bit dma disable quirk,\nthe network data corruptions ended and everything is fine again.\n\nSigned-off-by: Mirko Lindner <e96a18d8025d855dd997b6efe61565b158bbab25@marvell.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/marvell\/skge.c\n+++ drivers\/net\/ethernet\/marvell\/skge.c\n@@ -4199,6 +4199,13 @@\n \t\t\tDMI_MATCH(DMI_BOARD_NAME, \"P5NSLI\")\n \t\t},\n \t},\n+\t{\n+\t\t.ident = \"FUJITSU SIEMENS A8NE-FM\",\n+\t\t.matches = {\n+\t\t\tDMI_MATCH(DMI_BOARD_VENDOR, \"ASUSTek Computer INC.\"),\n+\t\t\tDMI_MATCH(DMI_BOARD_NAME, \"A8NE-FM\")\n+\t\t},\n+\t},\n \t{}\n };\n \n"} {"commit":"8a8807369ffafef90c410279b4b2645d2d7a7483","subject":"i40e\/base: fix driver load failure","message":"i40e\/base: fix driver load failure\n\nFix the driver load failure with linking with some\nPHY types, as the amount of time it takes for the\nGLGEN_RSTAT_DEVSTATE to be set increases greatly on those PHY\ntypes, which can lead to a timeout.\n\nFixes: 9aeefed05538 (\"i40e\/base: support ESS\")\n\nSigned-off-by: Helin Zhang <aba9dfdb1a6ec8bf1ff66b95272c029f8dfde1b1@intel.com>\nAcked-by: Jingjing Wu <64d28b617c3b4840f5ded1bfa611cba7fadfe5c7@intel.com>\nAcked-by: Remy Horton <34c343e92f0e27f7a8e26a1d8d2146ae7c7dd1a3@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/i40e\/base\/i40e_common.c\n+++ drivers\/net\/i40e\/base\/i40e_common.c\n@@ -1316,11 +1316,11 @@\n \tgrst_del = (rd32(hw, I40E_GLGEN_RSTCTL) &\n \t\t\tI40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>\n \t\t\tI40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;\n-#ifdef I40E_ESS_SUPPORT\n+\n \t\/* It can take upto 15 secs for GRST steady state *\/\n \tgrst_del = grst_del * 20; \/* bump it to 16 secs max to be safe *\/\n-#endif\n-\tfor (cnt = 0; cnt < grst_del + 10; cnt++) {\n+\n+\tfor (cnt = 0; cnt < grst_del; cnt++) {\n \t\treg = rd32(hw, I40E_GLGEN_RSTAT);\n \t\tif (!(reg & I40E_GLGEN_RSTAT_DEVSTATE_MASK))\n \t\t\tbreak;\n"} {"commit":"4ab7dbb0a0f6a404f225baca55a37644bc41933a","subject":"net\/ice: switch to Rx flexible descriptor in AVX path","message":"net\/ice: switch to Rx flexible descriptor in AVX path\n\nSwitch to Rx flexible descriptor format instead of legacy\ndescriptor format.\n\nSigned-off-by: Leyi Rong <a64575982df652f4749a148e140caaa64f8b1459@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ice\/ice_rxtx_vec_avx2.c\n+++ drivers\/net\/ice\/ice_rxtx_vec_avx2.c\n@@ -15,10 +15,10 @@\n {\n \tint i;\n \tuint16_t rx_id;\n-\tvolatile union ice_rx_desc *rxdp;\n+\tvolatile union ice_rx_flex_desc *rxdp;\n \tstruct ice_rx_entry *rxep = &rxq->sw_ring[rxq->rxrearm_start];\n \n-\trxdp = rxq->rx_ring + rxq->rxrearm_start;\n+\trxdp = (union ice_rx_flex_desc *)rxq->rx_ring + rxq->rxrearm_start;\n \n \t\/* Pull 'n' more MBUFs into the software ring *\/\n \tif (rte_mempool_get_bulk(rxq->mp,\n@@ -132,8 +132,6 @@\n \tICE_PCI_REG_WRITE(rxq->qrx_tail, rx_id);\n }\n \n-#define PKTLEN_SHIFT 10\n-\n static inline uint16_t\n _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts,\n \t\t\t uint16_t nb_pkts, uint8_t *split_packet)\n@@ -144,7 +142,8 @@\n \tconst __m256i mbuf_init = _mm256_set_epi64x(0, 0,\n \t\t\t0, rxq->mbuf_initializer);\n \tstruct ice_rx_entry *sw_ring = &rxq->sw_ring[rxq->rx_tail];\n-\tvolatile union ice_rx_desc *rxdp = rxq->rx_ring + rxq->rx_tail;\n+\tvolatile union ice_rx_flex_desc *rxdp =\n+\t\t(union ice_rx_flex_desc *)rxq->rx_ring + rxq->rx_tail;\n \tconst int avx_aligned = ((rxq->rx_tail & 1) == 0);\n \n \trte_prefetch0(rxdp);\n@@ -161,8 +160,8 @@\n \t\/* Before we start moving massive data around, check to see if\n \t * there is actually a packet available\n \t *\/\n-\tif (!(rxdp->wb.qword1.status_error_len &\n-\t\t\trte_cpu_to_le_32(1 << ICE_RX_DESC_STATUS_DD_S)))\n+\tif (!(rxdp->wb.status_error0 &\n+\t\t\trte_cpu_to_le_32(1 << ICE_RX_FLEX_DESC_STATUS0_DD_S)))\n \t\treturn 0;\n \n \t\/* constants used in processing loop *\/\n@@ -193,21 +192,23 @@\n \tconst __m256i shuf_msk =\n \t\t_mm256_set_epi8\n \t\t\t(\/* first descriptor *\/\n-\t\t\t 7, 6, 5, 4, \/* octet 4~7, 32bits rss *\/\n-\t\t\t 3, 2, \/* octet 2~3, low 16 bits vlan_macip *\/\n-\t\t\t 15, 14, \/* octet 15~14, 16 bits data_len *\/\n-\t\t\t 0xFF, 0xFF, \/* skip high 16 bits pkt_len, zero out *\/\n-\t\t\t 15, 14, \/* octet 15~14, low 16 bits pkt_len *\/\n-\t\t\t 0xFF, 0xFF, \/* pkt_type set as unknown *\/\n-\t\t\t 0xFF, 0xFF, \/*pkt_type set as unknown *\/\n+\t\t\t 0xFF, 0xFF,\n+\t\t\t 0xFF, 0xFF,\t\/* rss not supported *\/\n+\t\t\t 11, 10,\t\/* octet 10~11, 16 bits vlan_macip *\/\n+\t\t\t 5, 4,\t\t\/* octet 4~5, 16 bits data_len *\/\n+\t\t\t 0xFF, 0xFF,\t\/* skip hi 16 bits pkt_len, zero out *\/\n+\t\t\t 5, 4,\t\t\/* octet 4~5, 16 bits pkt_len *\/\n+\t\t\t 0xFF, 0xFF,\t\/* pkt_type set as unknown *\/\n+\t\t\t 0xFF, 0xFF,\t\/*pkt_type set as unknown *\/\n \t\t\t \/* second descriptor *\/\n-\t\t\t 7, 6, 5, 4, \/* octet 4~7, 32bits rss *\/\n-\t\t\t 3, 2, \/* octet 2~3, low 16 bits vlan_macip *\/\n-\t\t\t 15, 14, \/* octet 15~14, 16 bits data_len *\/\n-\t\t\t 0xFF, 0xFF, \/* skip high 16 bits pkt_len, zero out *\/\n-\t\t\t 15, 14, \/* octet 15~14, low 16 bits pkt_len *\/\n-\t\t\t 0xFF, 0xFF, \/* pkt_type set as unknown *\/\n-\t\t\t 0xFF, 0xFF \/*pkt_type set as unknown *\/\n+\t\t\t 0xFF, 0xFF,\n+\t\t\t 0xFF, 0xFF,\t\/* rss not supported *\/\n+\t\t\t 11, 10,\t\/* octet 10~11, 16 bits vlan_macip *\/\n+\t\t\t 5, 4,\t\t\/* octet 4~5, 16 bits data_len *\/\n+\t\t\t 0xFF, 0xFF,\t\/* skip hi 16 bits pkt_len, zero out *\/\n+\t\t\t 5, 4,\t\t\/* octet 4~5, 16 bits pkt_len *\/\n+\t\t\t 0xFF, 0xFF,\t\/* pkt_type set as unknown *\/\n+\t\t\t 0xFF, 0xFF\t\/*pkt_type set as unknown *\/\n \t\t\t);\n \t\/**\n \t * compile-time check the above crc and shuffle layout is correct.\n@@ -225,68 +226,68 @@\n \n \t\/* Status\/Error flag masks *\/\n \t\/**\n-\t * mask everything except RSS, flow director and VLAN flags\n-\t * bit2 is for VLAN tag, bit11 for flow director indication\n-\t * bit13:12 for RSS indication. Bits 3-5 of error\n-\t * field (bits 22-24) are for IP\/L4 checksum errors\n+\t * mask everything except Checksum Reports, RSS indication\n+\t * and VLAN indication.\n+\t * bit6:4 for IP\/L4 checksum errors.\n+\t * bit12 is for RSS indication.\n+\t * bit13 is for VLAN indication.\n \t *\/\n \tconst __m256i flags_mask =\n-\t\t _mm256_set1_epi32((1 << 2) | (1 << 11) |\n-\t\t\t\t (3 << 12) | (7 << 22));\n+\t\t _mm256_set1_epi32((7 << 4) | (1 << 12) | (1 << 13));\n \t\/**\n-\t * data to be shuffled by result of flag mask. If VLAN bit is set,\n-\t * (bit 2), then position 4 in this array will be used in the\n-\t * destination\n-\t *\/\n-\tconst __m256i vlan_flags_shuf =\n-\t\t_mm256_set_epi32(0, 0, PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, 0,\n-\t\t\t\t 0, 0, PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED, 0);\n-\t\/**\n-\t * data to be shuffled by result of flag mask, shifted down 11.\n-\t * If RSS\/FDIR bits are set, shuffle moves appropriate flags in\n-\t * place.\n-\t *\/\n-\tconst __m256i rss_flags_shuf =\n-\t\t_mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,\n-\t\t\t\tPKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH,\n-\t\t\t\t0, 0, 0, 0, PKT_RX_FDIR, 0,\/* end up 128-bits *\/\n-\t\t\t\t0, 0, 0, 0, 0, 0, 0, 0,\n-\t\t\t\tPKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH,\n-\t\t\t\t0, 0, 0, 0, PKT_RX_FDIR, 0);\n-\n-\t\/**\n-\t * data to be shuffled by the result of the flags mask shifted by 22\n+\t * data to be shuffled by the result of the flags mask shifted by 4\n \t * bits. This gives use the l3_l4 flags.\n \t *\/\n \tconst __m256i l3_l4_flags_shuf = _mm256_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,\n \t\t\t\/* shift right 1 bit to make sure it not exceed 255 *\/\n \t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |\n \t\t\t PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD |\n-\t\t\t PKT_RX_L4_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |\n+\t\t\t PKT_RX_IP_CKSUM_GOOD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |\n+\t\t\t PKT_RX_IP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |\n+\t\t\t PKT_RX_IP_CKSUM_GOOD) >> 1,\n \t\t\t(PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD) >> 1,\n-\t\t\tPKT_RX_IP_CKSUM_BAD >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD) >> 1,\n+\t\t\t(PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1,\n+\t\t\t(PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >> 1,\n \t\t\t\/* second 128-bits *\/\n \t\t\t0, 0, 0, 0, 0, 0, 0, 0,\n \t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |\n \t\t\t PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD |\n-\t\t\t PKT_RX_L4_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_EIP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD |\n+\t\t\t PKT_RX_IP_CKSUM_GOOD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |\n+\t\t\t PKT_RX_IP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_EIP_CKSUM_BAD | PKT_RX_L4_CKSUM_GOOD |\n+\t\t\t PKT_RX_IP_CKSUM_GOOD) >> 1,\n \t\t\t(PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_BAD) >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD) >> 1,\n-\t\t\tPKT_RX_IP_CKSUM_BAD >> 1,\n-\t\t\t(PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD) >> 1);\n-\n+\t\t\t(PKT_RX_L4_CKSUM_BAD | PKT_RX_IP_CKSUM_GOOD) >> 1,\n+\t\t\t(PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD) >> 1,\n+\t\t\t(PKT_RX_L4_CKSUM_GOOD | PKT_RX_IP_CKSUM_GOOD) >> 1);\n \tconst __m256i cksum_mask =\n \t\t _mm256_set1_epi32(PKT_RX_IP_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD |\n \t\t\t\t PKT_RX_L4_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD |\n \t\t\t\t PKT_RX_EIP_CKSUM_BAD);\n+\t\/**\n+\t * data to be shuffled by result of flag mask, shifted down 12.\n+\t * If RSS(bit12)\/VLAN(bit13) are set,\n+\t * shuffle moves appropriate flags in place.\n+\t *\/\n+\tconst __m256i rss_vlan_flags_shuf = _mm256_set_epi8(0, 0, 0, 0,\n+\t\t\t0, 0, 0, 0,\n+\t\t\t0, 0, 0, 0,\n+\t\t\tPKT_RX_RSS_HASH | PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,\n+\t\t\tPKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,\n+\t\t\tPKT_RX_RSS_HASH, 0,\n+\t\t\t\/* end up 128-bits *\/\n+\t\t\t0, 0, 0, 0,\n+\t\t\t0, 0, 0, 0,\n+\t\t\t0, 0, 0, 0,\n+\t\t\tPKT_RX_RSS_HASH | PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,\n+\t\t\tPKT_RX_VLAN | PKT_RX_VLAN_STRIPPED,\n+\t\t\tPKT_RX_RSS_HASH, 0);\n \n \tRTE_SET_USED(avx_aligned); \/* for 32B descriptors we don't use this *\/\n \n@@ -369,73 +370,66 @@\n \t\t}\n \n \t\t\/**\n-\t\t * convert descriptors 4-7 into mbufs, adjusting length and\n-\t\t * re-arranging fields. Then write into the mbuf\n+\t\t * convert descriptors 4-7 into mbufs, re-arrange fields.\n+\t\t * Then write into the mbuf.\n \t\t *\/\n-\t\tconst __m256i len6_7 = _mm256_slli_epi32(raw_desc6_7,\n-\t\t\t\t\t\t\t PKTLEN_SHIFT);\n-\t\tconst __m256i len4_5 = _mm256_slli_epi32(raw_desc4_5,\n-\t\t\t\t\t\t\t PKTLEN_SHIFT);\n-\t\tconst __m256i desc6_7 = _mm256_blend_epi16(raw_desc6_7,\n-\t\t\t\t\t\t\t len6_7, 0x80);\n-\t\tconst __m256i desc4_5 = _mm256_blend_epi16(raw_desc4_5,\n-\t\t\t\t\t\t\t len4_5, 0x80);\n-\t\t__m256i mb6_7 = _mm256_shuffle_epi8(desc6_7, shuf_msk);\n-\t\t__m256i mb4_5 = _mm256_shuffle_epi8(desc4_5, shuf_msk);\n+\t\t__m256i mb6_7 = _mm256_shuffle_epi8(raw_desc6_7, shuf_msk);\n+\t\t__m256i mb4_5 = _mm256_shuffle_epi8(raw_desc4_5, shuf_msk);\n \n \t\tmb6_7 = _mm256_add_epi16(mb6_7, crc_adjust);\n \t\tmb4_5 = _mm256_add_epi16(mb4_5, crc_adjust);\n \t\t\/**\n-\t\t * to get packet types, shift 64-bit values down 30 bits\n-\t\t * and so ptype is in lower 8-bits in each\n+\t\t * to get packet types, ptype is located in bit16-25\n+\t\t * of each 128bits\n \t\t *\/\n-\t\tconst __m256i ptypes6_7 = _mm256_srli_epi64(desc6_7, 30);\n-\t\tconst __m256i ptypes4_5 = _mm256_srli_epi64(desc4_5, 30);\n-\t\tconst uint8_t ptype7 = _mm256_extract_epi8(ptypes6_7, 24);\n-\t\tconst uint8_t ptype6 = _mm256_extract_epi8(ptypes6_7, 8);\n-\t\tconst uint8_t ptype5 = _mm256_extract_epi8(ptypes4_5, 24);\n-\t\tconst uint8_t ptype4 = _mm256_extract_epi8(ptypes4_5, 8);\n+\t\tconst __m256i ptype_mask =\n+\t\t\t_mm256_set1_epi16(ICE_RX_FLEX_DESC_PTYPE_M);\n+\t\tconst __m256i ptypes6_7 =\n+\t\t\t_mm256_and_si256(raw_desc6_7, ptype_mask);\n+\t\tconst __m256i ptypes4_5 =\n+\t\t\t_mm256_and_si256(raw_desc4_5, ptype_mask);\n+\t\tconst uint16_t ptype7 = _mm256_extract_epi16(ptypes6_7, 9);\n+\t\tconst uint16_t ptype6 = _mm256_extract_epi16(ptypes6_7, 1);\n+\t\tconst uint16_t ptype5 = _mm256_extract_epi16(ptypes4_5, 9);\n+\t\tconst uint16_t ptype4 = _mm256_extract_epi16(ptypes4_5, 1);\n \n \t\tmb6_7 = _mm256_insert_epi32(mb6_7, ptype_tbl[ptype7], 4);\n \t\tmb6_7 = _mm256_insert_epi32(mb6_7, ptype_tbl[ptype6], 0);\n \t\tmb4_5 = _mm256_insert_epi32(mb4_5, ptype_tbl[ptype5], 4);\n \t\tmb4_5 = _mm256_insert_epi32(mb4_5, ptype_tbl[ptype4], 0);\n \t\t\/* merge the status bits into one register *\/\n-\t\tconst __m256i status4_7 = _mm256_unpackhi_epi32(desc6_7,\n-\t\t\t\tdesc4_5);\n+\t\tconst __m256i status4_7 = _mm256_unpackhi_epi32(raw_desc6_7,\n+\t\t\t\traw_desc4_5);\n \n \t\t\/**\n-\t\t * convert descriptors 0-3 into mbufs, adjusting length and\n-\t\t * re-arranging fields. Then write into the mbuf\n+\t\t * convert descriptors 0-3 into mbufs, re-arrange fields.\n+\t\t * Then write into the mbuf.\n \t\t *\/\n-\t\tconst __m256i len2_3 = _mm256_slli_epi32(raw_desc2_3,\n-\t\t\t\t\t\t\t PKTLEN_SHIFT);\n-\t\tconst __m256i len0_1 = _mm256_slli_epi32(raw_desc0_1,\n-\t\t\t\t\t\t\t PKTLEN_SHIFT);\n-\t\tconst __m256i desc2_3 = _mm256_blend_epi16(raw_desc2_3,\n-\t\t\t\t\t\t\t len2_3, 0x80);\n-\t\tconst __m256i desc0_1 = _mm256_blend_epi16(raw_desc0_1,\n-\t\t\t\t\t\t\t len0_1, 0x80);\n-\t\t__m256i mb2_3 = _mm256_shuffle_epi8(desc2_3, shuf_msk);\n-\t\t__m256i mb0_1 = _mm256_shuffle_epi8(desc0_1, shuf_msk);\n+\t\t__m256i mb2_3 = _mm256_shuffle_epi8(raw_desc2_3, shuf_msk);\n+\t\t__m256i mb0_1 = _mm256_shuffle_epi8(raw_desc0_1, shuf_msk);\n \n \t\tmb2_3 = _mm256_add_epi16(mb2_3, crc_adjust);\n \t\tmb0_1 = _mm256_add_epi16(mb0_1, crc_adjust);\n-\t\t\/* get the packet types *\/\n-\t\tconst __m256i ptypes2_3 = _mm256_srli_epi64(desc2_3, 30);\n-\t\tconst __m256i ptypes0_1 = _mm256_srli_epi64(desc0_1, 30);\n-\t\tconst uint8_t ptype3 = _mm256_extract_epi8(ptypes2_3, 24);\n-\t\tconst uint8_t ptype2 = _mm256_extract_epi8(ptypes2_3, 8);\n-\t\tconst uint8_t ptype1 = _mm256_extract_epi8(ptypes0_1, 24);\n-\t\tconst uint8_t ptype0 = _mm256_extract_epi8(ptypes0_1, 8);\n+\t\t\/**\n+\t\t * to get packet types, ptype is located in bit16-25\n+\t\t * of each 128bits\n+\t\t *\/\n+\t\tconst __m256i ptypes2_3 =\n+\t\t\t_mm256_and_si256(raw_desc2_3, ptype_mask);\n+\t\tconst __m256i ptypes0_1 =\n+\t\t\t_mm256_and_si256(raw_desc0_1, ptype_mask);\n+\t\tconst uint16_t ptype3 = _mm256_extract_epi16(ptypes2_3, 9);\n+\t\tconst uint16_t ptype2 = _mm256_extract_epi16(ptypes2_3, 1);\n+\t\tconst uint16_t ptype1 = _mm256_extract_epi16(ptypes0_1, 9);\n+\t\tconst uint16_t ptype0 = _mm256_extract_epi16(ptypes0_1, 1);\n \n \t\tmb2_3 = _mm256_insert_epi32(mb2_3, ptype_tbl[ptype3], 4);\n \t\tmb2_3 = _mm256_insert_epi32(mb2_3, ptype_tbl[ptype2], 0);\n \t\tmb0_1 = _mm256_insert_epi32(mb0_1, ptype_tbl[ptype1], 4);\n \t\tmb0_1 = _mm256_insert_epi32(mb0_1, ptype_tbl[ptype0], 0);\n \t\t\/* merge the status bits into one register *\/\n-\t\tconst __m256i status0_3 = _mm256_unpackhi_epi32(desc2_3,\n-\t\t\t\t\t\t\t\tdesc0_1);\n+\t\tconst __m256i status0_3 = _mm256_unpackhi_epi32(raw_desc2_3,\n+\t\t\t\t\t\t\t\traw_desc0_1);\n \n \t\t\/**\n \t\t * take the two sets of status bits and merge to one\n@@ -450,24 +444,24 @@\n \t\t\/* get only flag\/error bits we want *\/\n \t\tconst __m256i flag_bits =\n \t\t\t_mm256_and_si256(status0_7, flags_mask);\n-\t\t\/* set vlan and rss flags *\/\n-\t\tconst __m256i vlan_flags =\n-\t\t\t_mm256_shuffle_epi8(vlan_flags_shuf, flag_bits);\n-\t\tconst __m256i rss_flags =\n-\t\t\t_mm256_shuffle_epi8(rss_flags_shuf,\n-\t\t\t\t\t _mm256_srli_epi32(flag_bits, 11));\n \t\t\/**\n \t\t * l3_l4_error flags, shuffle, then shift to correct adjustment\n \t\t * of flags in flags_shuf, and finally mask out extra bits\n \t\t *\/\n \t\t__m256i l3_l4_flags = _mm256_shuffle_epi8(l3_l4_flags_shuf,\n-\t\t\t\t_mm256_srli_epi32(flag_bits, 22));\n+\t\t\t\t_mm256_srli_epi32(flag_bits, 4));\n \t\tl3_l4_flags = _mm256_slli_epi32(l3_l4_flags, 1);\n \t\tl3_l4_flags = _mm256_and_si256(l3_l4_flags, cksum_mask);\n+\t\t\/* set rss and vlan flags *\/\n+\t\tconst __m256i rss_vlan_flag_bits =\n+\t\t\t_mm256_srli_epi32(flag_bits, 12);\n+\t\tconst __m256i rss_vlan_flags =\n+\t\t\t_mm256_shuffle_epi8(rss_vlan_flags_shuf,\n+\t\t\t\t\t rss_vlan_flag_bits);\n \n \t\t\/* merge flags *\/\n \t\tconst __m256i mbuf_flags = _mm256_or_si256(l3_l4_flags,\n-\t\t\t\t_mm256_or_si256(rss_flags, vlan_flags));\n+\t\t\t\trss_vlan_flags);\n \t\t\/**\n \t\t * At this point, we have the 8 sets of flags in the low 16-bits\n \t\t * of each 32-bit value in vlan0.\n"} {"commit":"72908beba944b57e3e1cbe0edf7728a192230d2b","subject":"net\/ice: fix priority of DCF switch rule","message":"net\/ice: fix priority of DCF switch rule\n\nThis patch fixes the reversed priority of DCF switch rule. Priority 0\nand 1 are supported, and priority 0 should be the highest priority.\n\nFixes: 2321e34c23b3 (\"net\/ice: support flow priority for DCF switch filter\")\nCc: stable@dpdk.org\n\nSigned-off-by: Wenjun Wu <f2c8f8c385402f4722593bcff277b2cd6b66f35b@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ice\/ice_switch_filter.c\n+++ drivers\/net\/ice\/ice_switch_filter.c\n@@ -1572,7 +1572,7 @@\n \trule_info->sw_act.src = rule_info->sw_act.vsi_handle;\n \trule_info->sw_act.flag = ICE_FLTR_RX;\n \trule_info->rx = 1;\n-\trule_info->priority = priority + 5;\n+\trule_info->priority = 6 - priority;\n \n \treturn 0;\n }\n"} {"commit":"3453ad8839ca91e1c11211d4d87dc3657c5a2b44","subject":"ath9k: use ath9k_hw_write_associd() on reset","message":"ath9k: use ath9k_hw_write_associd() on reset\n\nUse the already provided helper instead of rewriting the code\nrequired in place.\n\nSigned-off-by: Luis R. Rodriguez <79e6b8107a8aa3944e09fad43634662ac3b91a0b@atheros.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.c\n@@ -2476,9 +2476,7 @@\n \n \tREG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);\n \n-\tREG_WRITE(ah, AR_BSS_ID0, get_unaligned_le32(sc->curbssid));\n-\tREG_WRITE(ah, AR_BSS_ID1, get_unaligned_le16(sc->curbssid + 4) |\n-\t\t ((sc->curaid & 0x3fff) << AR_BSS_ID1_AID_S));\n+\tath9k_hw_write_associd(ah);\n \n \tREG_WRITE(ah, AR_ISR, ~0);\n \n"} {"commit":"397e5d5b93ba99ad3dc56f1e294f487e77d2daa8","subject":"ath9k: add missing AR9340 in ath_mac_bb_names","message":"ath9k: add missing AR9340 in ath_mac_bb_names\n\nAR9340 is not listed in ath_mac_bb_names, which leads to such a message:\nieee80211 phy0: Atheros AR???? Rev:0 mem=0xb8100000, irq=2\n\nSigned-off-by: Florian Fainelli <73262ad0334ab37227b2f7a0205f51db1e606681@openwrt.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.c\n@@ -2754,6 +2754,7 @@\n \t{ AR_SREV_VERSION_9271, \"9271\" },\n \t{ AR_SREV_VERSION_9300, \"9300\" },\n \t{ AR_SREV_VERSION_9330, \"9330\" },\n+\t{ AR_SREV_VERSION_9340,\t\t\"9340\" },\n \t{ AR_SREV_VERSION_9485, \"9485\" },\n };\n \n"} {"commit":"11158472c4ea7a4817d85912c491afa36a244192","subject":"ath9k_hw: add AR9271 single chip name mapping","message":"ath9k_hw: add AR9271 single chip name mapping\n\nSigned-off-by: Luis R. Rodriguez <79e6b8107a8aa3944e09fad43634662ac3b91a0b@atheros.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.c\n@@ -4363,7 +4363,8 @@\n \t\/* Single-chip solutions *\/\n \t{ AR_SREV_VERSION_9280,\t\t\"9280\" },\n \t{ AR_SREV_VERSION_9285,\t\t\"9285\" },\n-\t{ AR_SREV_VERSION_9287, \"9287\" }\n+\t{ AR_SREV_VERSION_9287, \"9287\" },\n+\t{ AR_SREV_VERSION_9271, \"9271\" },\n };\n \n \/* For devices with external radios *\/\n"} {"commit":"a8909cfb1832ac623142898df2a9374722cfe68f","subject":"ath9k: built-in rate control A-MPDU fix","message":"ath9k: built-in rate control A-MPDU fix\n\nThis patch attempts to ensure that ath9k's built-in rate control algorithm\ndoes not rely on the value of the ampdu_len and ampdu_ack_len tx status\nfields unless the IEEE80211_TX_STAT_AMPDU flag is set.\n\nThis patch has not been tested.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Bj\u00f6rn Smedman <242bd63b1daaea253b8e7e9c0ec79e01a183b234@venatech.se>\nAcked-by: Felix Fietkau <118ed6118e893d16e8c6e0776e0ebc290952c897@openwrt.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/rc.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/rc.c\n@@ -1375,6 +1375,12 @@\n \tif (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED)\n \t\treturn;\n \n+\tif (!(tx_info->flags & IEEE80211_TX_STAT_AMPDU)) {\n+\t\ttx_info->status.ampdu_ack_len =\n+\t\t\t(tx_info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);\n+\t\ttx_info->status.ampdu_len = 1;\n+\t}\n+\n \t\/*\n \t * If an underrun error is seen assume it as an excessive retry only\n \t * if max frame trigger level has been reached (2 KB for singel stream,\n"} {"commit":"2728cecdc7d6bf3d216fc406718d88c35f4d09eb","subject":"mwifiex: corrections in PCIe event skb handling","message":"mwifiex: corrections in PCIe event skb handling\n\nPreallocated event SKBs are getting reused for PCIe chipset.\nTheir physical addresses are shared with firmware so that\nfirmware can write data into them.\n\nThis patch makes sure that SKB is cleared and length is set to\ndefault while submitting it to firmware.\n\nSigned-off-by: Amitkumar Karwar <7343c7ffb424bf4c3ebd1cd0c94117b3c12118ff@marvell.com>\nSigned-off-by: Zhaoyang Liu <21dc6e85f8272f244f55d66e9f6c791db4f1169c@marvell.com>\nSigned-off-by: Kalle Valo <7081a7d99b8c74c0698a728df19e3915a995d7e1@codeaurora.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/mwifiex\/pcie.c\n+++ drivers\/net\/wireless\/mwifiex\/pcie.c\n@@ -1807,6 +1807,8 @@\n \n \tif (!card->evt_buf_list[rdptr]) {\n \t\tskb_push(skb, INTF_HEADER_LEN);\n+\t\tskb_put(skb, MAX_EVENT_SIZE - skb->len);\n+\t\tmemset(skb->data, 0, MAX_EVENT_SIZE);\n \t\tif (mwifiex_map_pci_memory(adapter, skb,\n \t\t\t\t\t MAX_EVENT_SIZE,\n \t\t\t\t\t PCI_DMA_FROMDEVICE))\n"} {"commit":"d44b5c2f2ec54569006dc85c7dbe25ccd41cfb73","subject":"mwifiex: separate out next scan command queueing logic","message":"mwifiex: separate out next scan command queueing logic\n\nThis new function will be useful later for extended scan\nfeature.\n\nSigned-off-by: Amitkumar Karwar <7343c7ffb424bf4c3ebd1cd0c94117b3c12118ff@marvell.com>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"4bee325cd9bc06c5e7b3cc4398f101ed3fa5cc0e","subject":"pinctrl: sirf: fix \"quoted string split across lines\"","message":"pinctrl: sirf: fix \"quoted string split across lines\"\n\nthis patch fixes:\nWARNING: quoted string split across lines\n902: FILE: drivers\/pinctrl\/sirf\/pinctrl-sirf.c:902:\n+MODULE_AUTHOR(\"Rongjun Ying <rongjun.ying@csr.com>, \"\n+\t\"Yuping Luo <yuping.luo@csr.com>, \"\n\nWARNING: quoted string split across lines\n903: FILE: drivers\/pinctrl\/sirf\/pinctrl-sirf.c:903:\n+\t\"Yuping Luo <yuping.luo@csr.com>, \"\n+\t\"Barry Song <baohua.song@csr.com>\");\n\nSigned-off-by: Bin Shi <29fc7a650385f95ffdcff41b8da67b8c74b0fe01@csr.com>\nSigned-off-by: Barry Song <a856445693a373abed3e477bd705f7011cbd8a1d@csr.com>\nSigned-off-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"805469053ba9dc3c14ebbc8287f2c051ba848aa4","subject":"toshiba_acpi: Add keyboard backlight mode change event","message":"toshiba_acpi: Add keyboard backlight mode change event\n\nA previous patch added support to handle more events.\n\nThis patch adds support to update the sysfs group whenever we receive\na 0x92 event, which indicates a change in the keyboard backlight mode,\nremoving the update group code from toshiba_kbd_bl_mode_store, as it is\nno longer needed there.\n\nSigned-off-by: Azael Avalos <38200bb1bfd6b0890d2ad683bb8ab02214b08408@gmail.com>\nSigned-off-by: Darren Hart <38f9eaa30910c40b06f5a60020b1222f2a953801@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/platform\/x86\/toshiba_acpi.c\n+++ drivers\/platform\/x86\/toshiba_acpi.c\n@@ -1394,12 +1394,6 @@\n \t\tif (ret)\n \t\t\treturn ret;\n \n-\t\t\/* Update sysfs entries on successful mode change*\/\n-\t\tret = sysfs_update_group(&toshiba->acpi_dev->dev.kobj,\n-\t\t\t\t\t &toshiba_attr_group);\n-\t\tif (ret)\n-\t\t\treturn ret;\n-\n \t\ttoshiba->kbd_mode = mode;\n \t}\n \n@@ -2009,10 +2003,18 @@\n static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)\n {\n \tstruct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);\n+\tint ret;\n \n \tswitch (event) {\n \tcase 0x80: \/* Hotkeys and some system events *\/\n \t\ttoshiba_acpi_process_hotkeys(dev);\n+\t\tbreak;\n+\tcase 0x92: \/* Keyboard backlight mode changed *\/\n+\t\t\/* Update sysfs entries *\/\n+\t\tret = sysfs_update_group(&acpi_dev->dev.kobj,\n+\t\t\t\t\t &toshiba_attr_group);\n+\t\tif (ret)\n+\t\t\tpr_err(\"Unable to update sysfs entries\\n\");\n \t\tbreak;\n \tcase 0x81: \/* Unknown *\/\n \tcase 0x82: \/* Unknown *\/\n"} {"commit":"25477f2398f39a35f110e02f6c7d8dd1023c47c1","subject":"Staging: batman-adv: return -EFAULT on copy_to_user errors","message":"Staging: batman-adv: return -EFAULT on copy_to_user errors\n\ncopy_to_user() returns the number of bites remaining but we want to\nreturn a negative error code here.\n\nSigned-off-by: Dan Carpenter <72501f147b2753e6660fdce744d9ac3084854f5e@gmail.com>\nSigned-off-by: Sven Eckelmann <2ac7036d3528aff465f5d4b31a65c571c86fd591@gmx.de>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/batman-adv\/device.c\n+++ drivers\/staging\/batman-adv\/device.c\n@@ -196,7 +196,7 @@\n \tkfree(device_packet);\n \n \tif (error)\n-\t\treturn error;\n+\t\treturn -EFAULT;\n \n \treturn sizeof(struct icmp_packet);\n }\n"} {"commit":"b581c3d9a90772613e05e659b4e8defc81704212","subject":"Staging: iio: meter: ade7753: Fixed checkpatch.pl warnings","message":"Staging: iio: meter: ade7753: Fixed checkpatch.pl warnings\n\nClean-up patch to fix the following checkpatch.pl warnings:\n\nade7753.c:325: WARNING: Missing a blank line after declarations\nade7753.c:383: WARNING: Missing a blank line after declarations\n\nSigned-off-by: Tina Johnson<4f72c41fcde9a332155bfadbd025d4abdbce53f8@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/iio\/meter\/ade7753.c\n+++ drivers\/staging\/iio\/meter\/ade7753.c\n@@ -322,6 +322,7 @@\n {\n \tint ret;\n \tu8 irqen;\n+\n \tret = ade7753_spi_read_reg_8(dev, ADE7753_IRQEN, &irqen);\n \tif (ret)\n \t\tgoto error_ret;\n@@ -380,6 +381,7 @@\n \tint ret;\n \tu16 t;\n \tint sps;\n+\n \tret = ade7753_spi_read_reg_16(dev, ADE7753_MODE, &t);\n \tif (ret)\n \t\treturn ret;\n"} {"commit":"56e34ee2adb59a35bfa5714bdf4dcb3f4d14a41d","subject":"target: Make se_dev_check_online() locking IRQ-safe","message":"target: Make se_dev_check_online() locking IRQ-safe\n\nse_dev_check_online() is called from transport_lookup_cmd_lun(), which\nas discussed before may be called from interrupt context. So it needs\nto use spin_lock_irqsave() instead of spin_lock_irq() to avoid\nenabling interrupts at the wrong time.\n\nSigned-off-by: Roland Dreier <0d270388f2f92757a5de0f4bd891d3b392c44c4f@purestorage.com>\nSigned-off-by: Nicholas Bellinger <978acd1567d5598152161fdf8bf3ca568f950c9b@linux-iscsi.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/target\/target_core_device.c\n+++ drivers\/target\/target_core_device.c\n@@ -813,12 +813,13 @@\n \n int se_dev_check_online(struct se_device *dev)\n {\n+\tunsigned long flags;\n \tint ret;\n \n-\tspin_lock_irq(&dev->dev_status_lock);\n+\tspin_lock_irqsave(&dev->dev_status_lock, flags);\n \tret = ((dev->dev_status & TRANSPORT_DEVICE_ACTIVATED) ||\n \t (dev->dev_status & TRANSPORT_DEVICE_DEACTIVATED)) ? 0 : 1;\n-\tspin_unlock_irq(&dev->dev_status_lock);\n+\tspin_unlock_irqrestore(&dev->dev_status_lock, flags);\n \n \treturn ret;\n }\n"} {"commit":"927d9f77fe3d5f9261eeb465e2b60768e400ffc9","subject":"usb: gadget: udc-xilinx: add ep capabilities support","message":"usb: gadget: udc-xilinx: add ep capabilities support\n\nConvert endpoint configuration to new capabilities model.\n\nSigned-off-by: Robert Baldyga <72b1db3d98bf139199de36aba5da00140727c571@samsung.com>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"76a97232680b4789dba8f0f1554f2feb616e2e9f","subject":"remove dead code","message":"remove dead code\n","repos":"frodrigo\/osrm-backend,Tristramg\/osrm-backend,chaupow\/osrm-backend,Carsten64\/OSRM-aux-git,ammeurer\/osrm-backend,hydrays\/osrm-backend,Conggge\/osrm-backend,bitsteller\/osrm-backend,neilbu\/osrm-backend,agruss\/osrm-backend,frodrigo\/osrm-backend,Conggge\/osrm-backend,ammeurer\/osrm-backend,antoinegiret\/osrm-geovelo,bjtaylor1\/osrm-backend,raymond0\/osrm-backend,neilbu\/osrm-backend,tkhaxton\/osrm-backend,Project-OSRM\/osrm-backend,atsuyim\/osrm-backend,Carsten64\/OSRM-aux-git,atsuyim\/osrm-backend,KnockSoftware\/osrm-backend,hydrays\/osrm-backend,agruss\/osrm-backend,bjtaylor1\/Project-OSRM-Old,antoinegiret\/osrm-geovelo,antoinegiret\/osrm-geovelo,hydrays\/osrm-backend,hydrays\/osrm-backend,antoinegiret\/osrm-backend,prembasumatary\/osrm-backend,atsuyim\/osrm-backend,KnockSoftware\/osrm-backend,ammeurer\/osrm-backend,antoinegiret\/osrm-backend,beemogmbh\/osrm-backend,beemogmbh\/osrm-backend,nagyistoce\/osrm-backend,skyborla\/osrm-backend,nagyistoce\/osrm-backend,yuryleb\/osrm-backend,raymond0\/osrm-backend,bjtaylor1\/osrm-backend,beemogmbh\/osrm-backend,frodrigo\/osrm-backend,skyborla\/osrm-backend,stevevance\/Project-OSRM,duizendnegen\/osrm-backend,stevevance\/Project-OSRM,bitsteller\/osrm-backend,bjtaylor1\/Project-OSRM-Old,yuryleb\/osrm-backend,jpizarrom\/osrm-backend,ammeurer\/osrm-backend,alex85k\/Project-OSRM,ammeurer\/osrm-backend,bjtaylor1\/osrm-backend,prembasumatary\/osrm-backend,ramyaragupathy\/osrm-backend,duizendnegen\/osrm-backend,arnekaiser\/osrm-backend,chaupow\/osrm-backend,alex85k\/Project-OSRM,deniskoronchik\/osrm-backend,Carsten64\/OSRM-aux-git,bitsteller\/osrm-backend,prembasumatary\/osrm-backend,Tristramg\/osrm-backend,arnekaiser\/osrm-backend,raymond0\/osrm-backend,beemogmbh\/osrm-backend,jpizarrom\/osrm-backend,Conggge\/osrm-backend,alex85k\/Project-OSRM,raymond0\/osrm-backend,Project-OSRM\/osrm-backend,skyborla\/osrm-backend,yuryleb\/osrm-backend,arnekaiser\/osrm-backend,agruss\/osrm-backend,deniskoronchik\/osrm-backend,Project-OSRM\/osrm-backend,neilbu\/osrm-backend,deniskoronchik\/osrm-backend,yuryleb\/osrm-backend,felixguendling\/osrm-backend,KnockSoftware\/osrm-backend,felixguendling\/osrm-backend,Carsten64\/OSRM-aux-git,oxidase\/osrm-backend,oxidase\/osrm-backend,ramyaragupathy\/osrm-backend,tkhaxton\/osrm-backend,bjtaylor1\/osrm-backend,oxidase\/osrm-backend,Project-OSRM\/osrm-backend,Conggge\/osrm-backend,stevevance\/Project-OSRM,ammeurer\/osrm-backend,deniskoronchik\/osrm-backend,duizendnegen\/osrm-backend,duizendnegen\/osrm-backend,Tristramg\/osrm-backend,tkhaxton\/osrm-backend,KnockSoftware\/osrm-backend,felixguendling\/osrm-backend,ammeurer\/osrm-backend,bjtaylor1\/Project-OSRM-Old,neilbu\/osrm-backend,antoinegiret\/osrm-backend,frodrigo\/osrm-backend,stevevance\/Project-OSRM,oxidase\/osrm-backend,bjtaylor1\/Project-OSRM-Old,chaupow\/osrm-backend,ramyaragupathy\/osrm-backend,nagyistoce\/osrm-backend,arnekaiser\/osrm-backend,jpizarrom\/osrm-backend","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Contractor\/EdgeBasedGraphFactory.h\n+++ Contractor\/EdgeBasedGraphFactory.h\n@@ -115,15 +115,6 @@\n bool contraFlow:1;\n };\n \n- struct _EdgeBasedEdgeData {\n- int distance;\n- unsigned via;\n- unsigned nameID;\n- bool forward;\n- bool backward;\n- TurnInstruction turnInstruction;\n- };\n-\n unsigned m_turn_restrictions_count;\n \n typedef DynamicGraph<NodeBasedEdgeData> NodeBasedDynamicGraph;\n"} {"commit":"15f1e575481e0ccc0f2c3d7d871583a38f5c9be2","subject":"Add header file so it compiles with CrossWorks V2.","message":"Add header file so it compiles with CrossWorks V2.\n\ngit-svn-id: 43aea61533866f88f23079d48f4f5dc2d5288937@808 1d2547de-c912-0410-9cb9-b8ca96c0e9e2\n","repos":"Psykar\/kubos,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos","returncode":1,"stderr":"error: pathspec 'Demo\/ARM7_LPC2138_Rowley\/LPC21xx.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- Demo\/ARM7_LPC2138_Rowley\/LPC21xx.h\n+++ Demo\/ARM7_LPC2138_Rowley\/LPC21xx.h\n@@ -0,0 +1,5599 @@\n+\/\/ Copyright (c) 2009 Rowley Associates Limited.\n+\/\/\n+\/\/ This file may be distributed under the terms of the License Agreement\n+\/\/ provided with this software.\n+\/\/\n+\/\/ THIS FILE IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, INCLUDING THE\n+\/\/ WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.\n+\n+#ifndef LPC21xx_h\n+#define LPC21xx_h\n+\n+#define FIO_BASE 0x3FFFC000\n+\n+#define FIO0DIR (*(volatile unsigned long *)0x3FFFC000)\n+#define FIO0DIR_OFFSET 0x0\n+\n+#define FIO0DIR0 (*(volatile unsigned char *)0x3FFFC000)\n+#define FIO0DIR0_OFFSET 0x0\n+\n+#define FIO0DIR1 (*(volatile unsigned char *)0x3FFFC001)\n+#define FIO0DIR1_OFFSET 0x1\n+\n+#define FIO0DIR2 (*(volatile unsigned char *)0x3FFFC002)\n+#define FIO0DIR2_OFFSET 0x2\n+\n+#define FIO0DIR3 (*(volatile unsigned char *)0x3FFFC003)\n+#define FIO0DIR3_OFFSET 0x3\n+\n+#define FIO0DIRL (*(volatile unsigned short *)0x3FFFC000)\n+#define FIO0DIRL_OFFSET 0x0\n+\n+#define FIO0DIRH (*(volatile unsigned short *)0x3FFFC002)\n+#define FIO0DIRH_OFFSET 0x2\n+\n+#define FIO0MASK (*(volatile unsigned long *)0x3FFFC010)\n+#define FIO0MASK_OFFSET 0x10\n+\n+#define FIO0MASK0 (*(volatile unsigned char *)0x3FFFC010)\n+#define FIO0MASK0_OFFSET 0x10\n+\n+#define FIO0MASK1 (*(volatile unsigned char *)0x3FFFC011)\n+#define FIO0MASK1_OFFSET 0x11\n+\n+#define FIO0MASK2 (*(volatile unsigned char *)0x3FFFC012)\n+#define FIO0MASK2_OFFSET 0x12\n+\n+#define FIO0MASK3 (*(volatile unsigned char *)0x3FFFC013)\n+#define FIO0MASK3_OFFSET 0x13\n+\n+#define FIO0MASKL (*(volatile unsigned short *)0x3FFFC010)\n+#define FIO0MASKL_OFFSET 0x10\n+\n+#define FIO0MASKH (*(volatile unsigned short *)0x3FFFC012)\n+#define FIO0MASKH_OFFSET 0x12\n+\n+#define FIO0PIN (*(volatile unsigned long *)0x3FFFC014)\n+#define FIO0PIN_OFFSET 0x14\n+\n+#define FIO0PIN0 (*(volatile unsigned char *)0x3FFFC014)\n+#define FIO0PIN0_OFFSET 0x14\n+\n+#define FIO0PIN1 (*(volatile unsigned char *)0x3FFFC015)\n+#define FIO0PIN1_OFFSET 0x15\n+\n+#define FIO0PIN2 (*(volatile unsigned char *)0x3FFFC016)\n+#define FIO0PIN2_OFFSET 0x16\n+\n+#define FIO0PIN3 (*(volatile unsigned char *)0x3FFFC017)\n+#define FIO0PIN3_OFFSET 0x17\n+\n+#define FIO0PINL (*(volatile unsigned short *)0x3FFFC014)\n+#define FIO0PINL_OFFSET 0x14\n+\n+#define FIO0PINH (*(volatile unsigned short *)0x3FFFC016)\n+#define FIO0PINH_OFFSET 0x16\n+\n+#define FIO0SET (*(volatile unsigned long *)0x3FFFC018)\n+#define FIO0SET_OFFSET 0x18\n+\n+#define FIO0SET0 (*(volatile unsigned char *)0x3FFFC018)\n+#define FIO0SET0_OFFSET 0x18\n+\n+#define FIO0SET1 (*(volatile unsigned char *)0x3FFFC019)\n+#define FIO0SET1_OFFSET 0x19\n+\n+#define FIO0SET2 (*(volatile unsigned char *)0x3FFFC01A)\n+#define FIO0SET2_OFFSET 0x1A\n+\n+#define FIO0SET3 (*(volatile unsigned char *)0x3FFFC01B)\n+#define FIO0SET3_OFFSET 0x1B\n+\n+#define FIO0SETL (*(volatile unsigned short *)0x3FFFC018)\n+#define FIO0SETL_OFFSET 0x18\n+\n+#define FIO0SETH (*(volatile unsigned short *)0x3FFFC01A)\n+#define FIO0SETH_OFFSET 0x1A\n+\n+#define FIO0CLR (*(volatile unsigned long *)0x3FFFC01C)\n+#define FIO0CLR_OFFSET 0x1C\n+\n+#define FIO0CLR0 (*(volatile unsigned char *)0x3FFFC01C)\n+#define FIO0CLR0_OFFSET 0x1C\n+\n+#define FIO0CLR1 (*(volatile unsigned char *)0x3FFFC01D)\n+#define FIO0CLR1_OFFSET 0x1D\n+\n+#define FIO0CLR2 (*(volatile unsigned char *)0x3FFFC01E)\n+#define FIO0CLR2_OFFSET 0x1E\n+\n+#define FIO0CLR3 (*(volatile unsigned char *)0x3FFFC01F)\n+#define FIO0CLR3_OFFSET 0x1F\n+\n+#define FIO0CLRL (*(volatile unsigned short *)0x3FFFC01C)\n+#define FIO0CLRL_OFFSET 0x1C\n+\n+#define FIO0CLRH (*(volatile unsigned short *)0x3FFFC01E)\n+#define FIO0CLRH_OFFSET 0x1E\n+\n+#define FIO1DIR (*(volatile unsigned long *)0x3FFFC020)\n+#define FIO1DIR_OFFSET 0x20\n+\n+#define FIO1DIR0 (*(volatile unsigned char *)0x3FFFC020)\n+#define FIO1DIR0_OFFSET 0x20\n+\n+#define FIO1DIR1 (*(volatile unsigned char *)0x3FFFC021)\n+#define FIO1DIR1_OFFSET 0x21\n+\n+#define FIO1DIR2 (*(volatile unsigned char *)0x3FFFC022)\n+#define FIO1DIR2_OFFSET 0x22\n+\n+#define FIO1DIR3 (*(volatile unsigned char *)0x3FFFC023)\n+#define FIO1DIR3_OFFSET 0x23\n+\n+#define FIO1DIRL (*(volatile unsigned short *)0x3FFFC020)\n+#define FIO1DIRL_OFFSET 0x20\n+\n+#define FIO1DIRH (*(volatile unsigned short *)0x3FFFC022)\n+#define FIO1DIRH_OFFSET 0x22\n+\n+#define FIO1MASK (*(volatile unsigned long *)0x3FFFC030)\n+#define FIO1MASK_OFFSET 0x30\n+\n+#define FIO1MASK0 (*(volatile unsigned char *)0x3FFFC030)\n+#define FIO1MASK0_OFFSET 0x30\n+\n+#define FIO1MASK1 (*(volatile unsigned char *)0x3FFFC031)\n+#define FIO1MASK1_OFFSET 0x31\n+\n+#define FIO1MASK2 (*(volatile unsigned char *)0x3FFFC032)\n+#define FIO1MASK2_OFFSET 0x32\n+\n+#define FIO1MASK3 (*(volatile unsigned char *)0x3FFFC033)\n+#define FIO1MASK3_OFFSET 0x33\n+\n+#define FIO1MASKL (*(volatile unsigned short *)0x3FFFC030)\n+#define FIO1MASKL_OFFSET 0x30\n+\n+#define FIO1MASKH (*(volatile unsigned short *)0x3FFFC032)\n+#define FIO1MASKH_OFFSET 0x32\n+\n+#define FIO1PIN (*(volatile unsigned long *)0x3FFFC034)\n+#define FIO1PIN_OFFSET 0x34\n+\n+#define FIO1PIN0 (*(volatile unsigned char *)0x3FFFC034)\n+#define FIO1PIN0_OFFSET 0x34\n+\n+#define FIO1PIN1 (*(volatile unsigned char *)0x3FFFC035)\n+#define FIO1PIN1_OFFSET 0x35\n+\n+#define FIO1PIN2 (*(volatile unsigned char *)0x3FFFC036)\n+#define FIO1PIN2_OFFSET 0x36\n+\n+#define FIO1PIN3 (*(volatile unsigned char *)0x3FFFC037)\n+#define FIO1PIN3_OFFSET 0x37\n+\n+#define FIO1PINL (*(volatile unsigned short *)0x3FFFC034)\n+#define FIO1PINL_OFFSET 0x34\n+\n+#define FIO1PINH (*(volatile unsigned short *)0x3FFFC036)\n+#define FIO1PINH_OFFSET 0x36\n+\n+#define FIO1SET (*(volatile unsigned long *)0x3FFFC038)\n+#define FIO1SET_OFFSET 0x38\n+\n+#define FIO1SET0 (*(volatile unsigned char *)0x3FFFC038)\n+#define FIO1SET0_OFFSET 0x38\n+\n+#define FIO1SET1 (*(volatile unsigned char *)0x3FFFC039)\n+#define FIO1SET1_OFFSET 0x39\n+\n+#define FIO1SET2 (*(volatile unsigned char *)0x3FFFC03A)\n+#define FIO1SET2_OFFSET 0x3A\n+\n+#define FIO1SET3 (*(volatile unsigned char *)0x3FFFC03B)\n+#define FIO1SET3_OFFSET 0x3B\n+\n+#define FIO1SETL (*(volatile unsigned short *)0x3FFFC038)\n+#define FIO1SETL_OFFSET 0x38\n+\n+#define FIO1SETH (*(volatile unsigned short *)0x3FFFC03A)\n+#define FIO1SETH_OFFSET 0x3A\n+\n+#define FIO1CLR (*(volatile unsigned long *)0x3FFFC03C)\n+#define FIO1CLR_OFFSET 0x3C\n+\n+#define FIO1CLR0 (*(volatile unsigned char *)0x3FFFC03C)\n+#define FIO1CLR0_OFFSET 0x3C\n+\n+#define FIO1CLR1 (*(volatile unsigned char *)0x3FFFC03D)\n+#define FIO1CLR1_OFFSET 0x3D\n+\n+#define FIO1CLR2 (*(volatile unsigned char *)0x3FFFC03E)\n+#define FIO1CLR2_OFFSET 0x3E\n+\n+#define FIO1CLR3 (*(volatile unsigned char *)0x3FFFC03F)\n+#define FIO1CLR3_OFFSET 0x3F\n+\n+#define FIO1CLRL (*(volatile unsigned short *)0x3FFFC03C)\n+#define FIO1CLRL_OFFSET 0x3C\n+\n+#define FIO1CLRH (*(volatile unsigned short *)0x3FFFC03E)\n+#define FIO1CLRH_OFFSET 0x3E\n+\n+#define WDT_BASE 0xE0000000\n+\n+#define WDMOD (*(volatile unsigned long *)0xE0000000)\n+#define WDMOD_OFFSET 0x0\n+#define WDMOD_WDEN_MASK 0x1\n+#define WDMOD_WDEN 0x1\n+#define WDMOD_WDEN_BIT 0\n+#define WDMOD_WDRESET_MASK 0x2\n+#define WDMOD_WDRESET 0x2\n+#define WDMOD_WDRESET_BIT 1\n+#define WDMOD_WDTOF_MASK 0x4\n+#define WDMOD_WDTOF 0x4\n+#define WDMOD_WDTOF_BIT 2\n+#define WDMOD_WDINT_MASK 0x8\n+#define WDMOD_WDINT 0x8\n+#define WDMOD_WDINT_BIT 3\n+\n+#define WDTC (*(volatile unsigned long *)0xE0000004)\n+#define WDTC_OFFSET 0x4\n+\n+#define WDFEED (*(volatile unsigned long *)0xE0000008)\n+#define WDFEED_OFFSET 0x8\n+\n+#define WDTV (*(volatile unsigned long *)0xE000000C)\n+#define WDTV_OFFSET 0xC\n+\n+#define TIMER0_BASE 0xE0004000\n+\n+#define T0IR (*(volatile unsigned char *)0xE0004000)\n+#define T0IR_OFFSET 0x0\n+#define T0IR_MR0_MASK 0x1\n+#define T0IR_MR0 0x1\n+#define T0IR_MR0_BIT 0\n+#define T0IR_MR1_MASK 0x2\n+#define T0IR_MR1 0x2\n+#define T0IR_MR1_BIT 1\n+#define T0IR_MR2_MASK 0x4\n+#define T0IR_MR2 0x4\n+#define T0IR_MR2_BIT 2\n+#define T0IR_MR3_MASK 0x8\n+#define T0IR_MR3 0x8\n+#define T0IR_MR3_BIT 3\n+#define T0IR_CR0_MASK 0x10\n+#define T0IR_CR0 0x10\n+#define T0IR_CR0_BIT 4\n+#define T0IR_CR1_MASK 0x20\n+#define T0IR_CR1 0x20\n+#define T0IR_CR1_BIT 5\n+#define T0IR_CR2_MASK 0x40\n+#define T0IR_CR2 0x40\n+#define T0IR_CR2_BIT 6\n+#define T0IR_CR3_MASK 0x80\n+#define T0IR_CR3 0x80\n+#define T0IR_CR3_BIT 7\n+\n+#define T0TCR (*(volatile unsigned char *)0xE0004004)\n+#define T0TCR_OFFSET 0x4\n+#define T0TCR_Counter_Enable_MASK 0x1\n+#define T0TCR_Counter_Enable 0x1\n+#define T0TCR_Counter_Enable_BIT 0\n+#define T0TCR_Counter_Reset_MASK 0x2\n+#define T0TCR_Counter_Reset 0x2\n+#define T0TCR_Counter_Reset_BIT 1\n+\n+#define T0TC (*(volatile unsigned long *)0xE0004008)\n+#define T0TC_OFFSET 0x8\n+\n+#define T0PR (*(volatile unsigned long *)0xE000400C)\n+#define T0PR_OFFSET 0xC\n+\n+#define T0PC (*(volatile unsigned long *)0xE0004010)\n+#define T0PC_OFFSET 0x10\n+\n+#define T0MCR (*(volatile unsigned short *)0xE0004014)\n+#define T0MCR_OFFSET 0x14\n+#define T0MCR_MR0I_MASK 0x1\n+#define T0MCR_MR0I 0x1\n+#define T0MCR_MR0I_BIT 0\n+#define T0MCR_MR0R_MASK 0x2\n+#define T0MCR_MR0R 0x2\n+#define T0MCR_MR0R_BIT 1\n+#define T0MCR_MR0S_MASK 0x4\n+#define T0MCR_MR0S 0x4\n+#define T0MCR_MR0S_BIT 2\n+#define T0MCR_MR1I_MASK 0x8\n+#define T0MCR_MR1I 0x8\n+#define T0MCR_MR1I_BIT 3\n+#define T0MCR_MR1R_MASK 0x10\n+#define T0MCR_MR1R 0x10\n+#define T0MCR_MR1R_BIT 4\n+#define T0MCR_MR1S_MASK 0x20\n+#define T0MCR_MR1S 0x20\n+#define T0MCR_MR1S_BIT 5\n+#define T0MCR_MR2I_MASK 0x40\n+#define T0MCR_MR2I 0x40\n+#define T0MCR_MR2I_BIT 6\n+#define T0MCR_MR2R_MASK 0x80\n+#define T0MCR_MR2R 0x80\n+#define T0MCR_MR2R_BIT 7\n+#define T0MCR_MR2S_MASK 0x100\n+#define T0MCR_MR2S 0x100\n+#define T0MCR_MR2S_BIT 8\n+#define T0MCR_MR3I_MASK 0x200\n+#define T0MCR_MR3I 0x200\n+#define T0MCR_MR3I_BIT 9\n+#define T0MCR_MR3R_MASK 0x400\n+#define T0MCR_MR3R 0x400\n+#define T0MCR_MR3R_BIT 10\n+#define T0MCR_MR3S_MASK 0x800\n+#define T0MCR_MR3S 0x800\n+#define T0MCR_MR3S_BIT 11\n+\n+#define T0MR0 (*(volatile unsigned long *)0xE0004018)\n+#define T0MR0_OFFSET 0x18\n+\n+#define T0MR1 (*(volatile unsigned long *)0xE000401C)\n+#define T0MR1_OFFSET 0x1C\n+\n+#define T0MR2 (*(volatile unsigned long *)0xE0004020)\n+#define T0MR2_OFFSET 0x20\n+\n+#define T0MR3 (*(volatile unsigned long *)0xE0004024)\n+#define T0MR3_OFFSET 0x24\n+\n+#define T0CCR (*(volatile unsigned short *)0xE0004028)\n+#define T0CCR_OFFSET 0x28\n+#define T0CCR_CAP0RE_MASK 0x1\n+#define T0CCR_CAP0RE 0x1\n+#define T0CCR_CAP0RE_BIT 0\n+#define T0CCR_CAP0FE_MASK 0x2\n+#define T0CCR_CAP0FE 0x2\n+#define T0CCR_CAP0FE_BIT 1\n+#define T0CCR_CAP0I_MASK 0x4\n+#define T0CCR_CAP0I 0x4\n+#define T0CCR_CAP0I_BIT 2\n+#define T0CCR_CAP1RE_MASK 0x8\n+#define T0CCR_CAP1RE 0x8\n+#define T0CCR_CAP1RE_BIT 3\n+#define T0CCR_CAP1FE_MASK 0x10\n+#define T0CCR_CAP1FE 0x10\n+#define T0CCR_CAP1FE_BIT 4\n+#define T0CCR_CAP1I_MASK 0x20\n+#define T0CCR_CAP1I 0x20\n+#define T0CCR_CAP1I_BIT 5\n+#define T0CCR_CAP2RE_MASK 0x40\n+#define T0CCR_CAP2RE 0x40\n+#define T0CCR_CAP2RE_BIT 6\n+#define T0CCR_CAP2FE_MASK 0x80\n+#define T0CCR_CAP2FE 0x80\n+#define T0CCR_CAP2FE_BIT 7\n+#define T0CCR_CAP2I_MASK 0x100\n+#define T0CCR_CAP2I 0x100\n+#define T0CCR_CAP2I_BIT 8\n+#define T0CCR_CAP3RE_MASK 0x200\n+#define T0CCR_CAP3RE 0x200\n+#define T0CCR_CAP3RE_BIT 9\n+#define T0CCR_CAP3FE_MASK 0x400\n+#define T0CCR_CAP3FE 0x400\n+#define T0CCR_CAP3FE_BIT 10\n+#define T0CCR_CAP3I_MASK 0x800\n+#define T0CCR_CAP3I 0x800\n+#define T0CCR_CAP3I_BIT 11\n+\n+#define T0CR0 (*(volatile unsigned long *)0xE000402C)\n+#define T0CR0_OFFSET 0x2C\n+\n+#define T0CR1 (*(volatile unsigned long *)0xE0004030)\n+#define T0CR1_OFFSET 0x30\n+\n+#define T0CR2 (*(volatile unsigned long *)0xE0004034)\n+#define T0CR2_OFFSET 0x34\n+\n+#define T0CR3 (*(volatile unsigned long *)0xE0004038)\n+#define T0CR3_OFFSET 0x38\n+\n+#define T0EMR (*(volatile unsigned short *)0xE000403C)\n+#define T0EMR_OFFSET 0x3C\n+#define T0EMR_EM0_MASK 0x1\n+#define T0EMR_EM0 0x1\n+#define T0EMR_EM0_BIT 0\n+#define T0EMR_EM1_MASK 0x2\n+#define T0EMR_EM1 0x2\n+#define T0EMR_EM1_BIT 1\n+#define T0EMR_EM2_MASK 0x4\n+#define T0EMR_EM2 0x4\n+#define T0EMR_EM2_BIT 2\n+#define T0EMR_EM3_MASK 0x8\n+#define T0EMR_EM3 0x8\n+#define T0EMR_EM3_BIT 3\n+#define T0EMR_EMC0_MASK 0x30\n+#define T0EMR_EMC0_BIT 4\n+#define T0EMR_EMC1_MASK 0xC0\n+#define T0EMR_EMC1_BIT 6\n+#define T0EMR_EMC2_MASK 0x300\n+#define T0EMR_EMC2_BIT 8\n+#define T0EMR_EMC3_MASK 0xC00\n+#define T0EMR_EMC3_BIT 10\n+\n+#define T0CTCR (*(volatile unsigned long *)0xE0004070)\n+#define T0CTCR_OFFSET 0x70\n+#define T0CTCR_Counter_Timer_Mode_MASK 0x3\n+#define T0CTCR_Counter_Timer_Mode_BIT 0\n+#define T0CTCR_Count_Input_Select_MASK 0xC\n+#define T0CTCR_Count_Input_Select_BIT 2\n+\n+#define TIMER1_BASE 0xE0008000\n+\n+#define T1IR (*(volatile unsigned char *)0xE0008000)\n+#define T1IR_OFFSET 0x0\n+#define T1IR_MR0_MASK 0x1\n+#define T1IR_MR0 0x1\n+#define T1IR_MR0_BIT 0\n+#define T1IR_MR1_MASK 0x2\n+#define T1IR_MR1 0x2\n+#define T1IR_MR1_BIT 1\n+#define T1IR_MR2_MASK 0x4\n+#define T1IR_MR2 0x4\n+#define T1IR_MR2_BIT 2\n+#define T1IR_MR3_MASK 0x8\n+#define T1IR_MR3 0x8\n+#define T1IR_MR3_BIT 3\n+#define T1IR_CR0_MASK 0x10\n+#define T1IR_CR0 0x10\n+#define T1IR_CR0_BIT 4\n+#define T1IR_CR1_MASK 0x20\n+#define T1IR_CR1 0x20\n+#define T1IR_CR1_BIT 5\n+#define T1IR_CR2_MASK 0x40\n+#define T1IR_CR2 0x40\n+#define T1IR_CR2_BIT 6\n+#define T1IR_CR3_MASK 0x80\n+#define T1IR_CR3 0x80\n+#define T1IR_CR3_BIT 7\n+\n+#define T1TCR (*(volatile unsigned char *)0xE0008004)\n+#define T1TCR_OFFSET 0x4\n+#define T1TCR_Counter_Enable_MASK 0x1\n+#define T1TCR_Counter_Enable 0x1\n+#define T1TCR_Counter_Enable_BIT 0\n+#define T1TCR_Counter_Reset_MASK 0x2\n+#define T1TCR_Counter_Reset 0x2\n+#define T1TCR_Counter_Reset_BIT 1\n+\n+#define T1TC (*(volatile unsigned long *)0xE0008008)\n+#define T1TC_OFFSET 0x8\n+\n+#define T1PR (*(volatile unsigned long *)0xE000800C)\n+#define T1PR_OFFSET 0xC\n+\n+#define T1PC (*(volatile unsigned long *)0xE0008010)\n+#define T1PC_OFFSET 0x10\n+\n+#define T1MCR (*(volatile unsigned short *)0xE0008014)\n+#define T1MCR_OFFSET 0x14\n+#define T1MCR_MR0I_MASK 0x1\n+#define T1MCR_MR0I 0x1\n+#define T1MCR_MR0I_BIT 0\n+#define T1MCR_MR0R_MASK 0x2\n+#define T1MCR_MR0R 0x2\n+#define T1MCR_MR0R_BIT 1\n+#define T1MCR_MR0S_MASK 0x4\n+#define T1MCR_MR0S 0x4\n+#define T1MCR_MR0S_BIT 2\n+#define T1MCR_MR1I_MASK 0x8\n+#define T1MCR_MR1I 0x8\n+#define T1MCR_MR1I_BIT 3\n+#define T1MCR_MR1R_MASK 0x10\n+#define T1MCR_MR1R 0x10\n+#define T1MCR_MR1R_BIT 4\n+#define T1MCR_MR1S_MASK 0x20\n+#define T1MCR_MR1S 0x20\n+#define T1MCR_MR1S_BIT 5\n+#define T1MCR_MR2I_MASK 0x40\n+#define T1MCR_MR2I 0x40\n+#define T1MCR_MR2I_BIT 6\n+#define T1MCR_MR2R_MASK 0x80\n+#define T1MCR_MR2R 0x80\n+#define T1MCR_MR2R_BIT 7\n+#define T1MCR_MR2S_MASK 0x100\n+#define T1MCR_MR2S 0x100\n+#define T1MCR_MR2S_BIT 8\n+#define T1MCR_MR3I_MASK 0x200\n+#define T1MCR_MR3I 0x200\n+#define T1MCR_MR3I_BIT 9\n+#define T1MCR_MR3R_MASK 0x400\n+#define T1MCR_MR3R 0x400\n+#define T1MCR_MR3R_BIT 10\n+#define T1MCR_MR3S_MASK 0x800\n+#define T1MCR_MR3S 0x800\n+#define T1MCR_MR3S_BIT 11\n+\n+#define T1MR0 (*(volatile unsigned long *)0xE0008018)\n+#define T1MR0_OFFSET 0x18\n+\n+#define T1MR1 (*(volatile unsigned long *)0xE000801C)\n+#define T1MR1_OFFSET 0x1C\n+\n+#define T1MR2 (*(volatile unsigned long *)0xE0008020)\n+#define T1MR2_OFFSET 0x20\n+\n+#define T1MR3 (*(volatile unsigned long *)0xE0008024)\n+#define T1MR3_OFFSET 0x24\n+\n+#define T1CCR (*(volatile unsigned short *)0xE0008028)\n+#define T1CCR_OFFSET 0x28\n+#define T1CCR_CAP0RE_MASK 0x1\n+#define T1CCR_CAP0RE 0x1\n+#define T1CCR_CAP0RE_BIT 0\n+#define T1CCR_CAP0FE_MASK 0x2\n+#define T1CCR_CAP0FE 0x2\n+#define T1CCR_CAP0FE_BIT 1\n+#define T1CCR_CAP0I_MASK 0x4\n+#define T1CCR_CAP0I 0x4\n+#define T1CCR_CAP0I_BIT 2\n+#define T1CCR_CAP1RE_MASK 0x8\n+#define T1CCR_CAP1RE 0x8\n+#define T1CCR_CAP1RE_BIT 3\n+#define T1CCR_CAP1FE_MASK 0x10\n+#define T1CCR_CAP1FE 0x10\n+#define T1CCR_CAP1FE_BIT 4\n+#define T1CCR_CAP1I_MASK 0x20\n+#define T1CCR_CAP1I 0x20\n+#define T1CCR_CAP1I_BIT 5\n+#define T1CCR_CAP2RE_MASK 0x40\n+#define T1CCR_CAP2RE 0x40\n+#define T1CCR_CAP2RE_BIT 6\n+#define T1CCR_CAP2FE_MASK 0x80\n+#define T1CCR_CAP2FE 0x80\n+#define T1CCR_CAP2FE_BIT 7\n+#define T1CCR_CAP2I_MASK 0x100\n+#define T1CCR_CAP2I 0x100\n+#define T1CCR_CAP2I_BIT 8\n+#define T1CCR_CAP3RE_MASK 0x200\n+#define T1CCR_CAP3RE 0x200\n+#define T1CCR_CAP3RE_BIT 9\n+#define T1CCR_CAP3FE_MASK 0x400\n+#define T1CCR_CAP3FE 0x400\n+#define T1CCR_CAP3FE_BIT 10\n+#define T1CCR_CAP3I_MASK 0x800\n+#define T1CCR_CAP3I 0x800\n+#define T1CCR_CAP3I_BIT 11\n+\n+#define T1CR0 (*(volatile unsigned long *)0xE000802C)\n+#define T1CR0_OFFSET 0x2C\n+\n+#define T1CR1 (*(volatile unsigned long *)0xE0008030)\n+#define T1CR1_OFFSET 0x30\n+\n+#define T1CR2 (*(volatile unsigned long *)0xE0008034)\n+#define T1CR2_OFFSET 0x34\n+\n+#define T1CR3 (*(volatile unsigned long *)0xE0008038)\n+#define T1CR3_OFFSET 0x38\n+\n+#define T1EMR (*(volatile unsigned short *)0xE000803C)\n+#define T1EMR_OFFSET 0x3C\n+#define T1EMR_EM0_MASK 0x1\n+#define T1EMR_EM0 0x1\n+#define T1EMR_EM0_BIT 0\n+#define T1EMR_EM1_MASK 0x2\n+#define T1EMR_EM1 0x2\n+#define T1EMR_EM1_BIT 1\n+#define T1EMR_EM2_MASK 0x4\n+#define T1EMR_EM2 0x4\n+#define T1EMR_EM2_BIT 2\n+#define T1EMR_EM3_MASK 0x8\n+#define T1EMR_EM3 0x8\n+#define T1EMR_EM3_BIT 3\n+#define T1EMR_EMC0_MASK 0x30\n+#define T1EMR_EMC0_BIT 4\n+#define T1EMR_EMC1_MASK 0xC0\n+#define T1EMR_EMC1_BIT 6\n+#define T1EMR_EMC2_MASK 0x300\n+#define T1EMR_EMC2_BIT 8\n+#define T1EMR_EMC3_MASK 0xC00\n+#define T1EMR_EMC3_BIT 10\n+\n+#define T1CTCR (*(volatile unsigned long *)0xE0008070)\n+#define T1CTCR_OFFSET 0x70\n+#define T1CTCR_Counter_Timer_Mode_MASK 0x3\n+#define T1CTCR_Counter_Timer_Mode_BIT 0\n+#define T1CTCR_Count_Input_Select_MASK 0xC\n+#define T1CTCR_Count_Input_Select_BIT 2\n+\n+#define UART0_BASE 0xE000C000\n+\n+#define U0RBR (*(volatile unsigned char *)0xE000C000)\n+#define U0RBR_OFFSET 0x0\n+\n+#define U0THR (*(volatile unsigned char *)0xE000C000)\n+#define U0THR_OFFSET 0x0\n+\n+#define U0DLL (*(volatile unsigned char *)0xE000C000)\n+#define U0DLL_OFFSET 0x0\n+\n+#define U0DLM (*(volatile unsigned char *)0xE000C004)\n+#define U0DLM_OFFSET 0x4\n+\n+#define U0IER (*(volatile unsigned long *)0xE000C004)\n+#define U0IER_OFFSET 0x4\n+#define U0IER_RBR_Interrupt_Enable_MASK 0x1\n+#define U0IER_RBR_Interrupt_Enable 0x1\n+#define U0IER_RBR_Interrupt_Enable_BIT 0\n+#define U0IER_THRE_Interrupt_Enable_MASK 0x2\n+#define U0IER_THRE_Interrupt_Enable 0x2\n+#define U0IER_THRE_Interrupt_Enable_BIT 1\n+#define U0IER_Rx_Line_Status_Interrupt_Enable_MASK 0x4\n+#define U0IER_Rx_Line_Status_Interrupt_Enable 0x4\n+#define U0IER_Rx_Line_Status_Interrupt_Enable_BIT 2\n+#define U0IER_ABTOIntEn_MASK 0x100\n+#define U0IER_ABTOIntEn 0x100\n+#define U0IER_ABTOIntEn_BIT 8\n+#define U0IER_ABEOIntEn_MASK 0x200\n+#define U0IER_ABEOIntEn 0x200\n+#define U0IER_ABEOIntEn_BIT 9\n+\n+#define U0IIR (*(volatile unsigned long *)0xE000C008)\n+#define U0IIR_OFFSET 0x8\n+#define U0IIR_Interrupt_Pending_MASK 0x1\n+#define U0IIR_Interrupt_Pending 0x1\n+#define U0IIR_Interrupt_Pending_BIT 0\n+#define U0IIR_Interrupt_Identification_MASK 0xE\n+#define U0IIR_Interrupt_Identification_BIT 1\n+#define U0IIR_FIFO_Enable_MASK 0xC0\n+#define U0IIR_FIFO_Enable_BIT 6\n+#define U0IIR_ABTOInt_MASK 0x100\n+#define U0IIR_ABTOInt 0x100\n+#define U0IIR_ABTOInt_BIT 8\n+#define U0IIR_ABEOInt_MASK 0x200\n+#define U0IIR_ABEOInt 0x200\n+#define U0IIR_ABEOInt_BIT 9\n+\n+#define U0FCR (*(volatile unsigned char *)0xE000C008)\n+#define U0FCR_OFFSET 0x8\n+#define U0FCR_FIFO_Enable_MASK 0x1\n+#define U0FCR_FIFO_Enable 0x1\n+#define U0FCR_FIFO_Enable_BIT 0\n+#define U0FCR_Rx_FIFO_Reset_MASK 0x2\n+#define U0FCR_Rx_FIFO_Reset 0x2\n+#define U0FCR_Rx_FIFO_Reset_BIT 1\n+#define U0FCR_Tx_FIFO_Reset_MASK 0x4\n+#define U0FCR_Tx_FIFO_Reset 0x4\n+#define U0FCR_Tx_FIFO_Reset_BIT 2\n+#define U0FCR_Rx_Trigger_Level_Select_MASK 0xC0\n+#define U0FCR_Rx_Trigger_Level_Select_BIT 6\n+\n+#define U0LCR (*(volatile unsigned char *)0xE000C00C)\n+#define U0LCR_OFFSET 0xC\n+#define U0LCR_Word_Length_Select_MASK 0x3\n+#define U0LCR_Word_Length_Select_BIT 0\n+#define U0LCR_Stop_Bit_Select_MASK 0x4\n+#define U0LCR_Stop_Bit_Select 0x4\n+#define U0LCR_Stop_Bit_Select_BIT 2\n+#define U0LCR_Parity_Enable_MASK 0x8\n+#define U0LCR_Parity_Enable 0x8\n+#define U0LCR_Parity_Enable_BIT 3\n+#define U0LCR_Parity_Select_MASK 0x30\n+#define U0LCR_Parity_Select_BIT 4\n+#define U0LCR_Break_Control_MASK 0x40\n+#define U0LCR_Break_Control 0x40\n+#define U0LCR_Break_Control_BIT 6\n+#define U0LCR_Divisor_Latch_Access_Bit_MASK 0x80\n+#define U0LCR_Divisor_Latch_Access_Bit 0x80\n+#define U0LCR_Divisor_Latch_Access_Bit_BIT 7\n+\n+#define U0LSR (*(volatile unsigned char *)0xE000C014)\n+#define U0LSR_OFFSET 0x14\n+#define U0LSR_RDR_MASK 0x1\n+#define U0LSR_RDR 0x1\n+#define U0LSR_RDR_BIT 0\n+#define U0LSR_OE_MASK 0x2\n+#define U0LSR_OE 0x2\n+#define U0LSR_OE_BIT 1\n+#define U0LSR_PE_MASK 0x4\n+#define U0LSR_PE 0x4\n+#define U0LSR_PE_BIT 2\n+#define U0LSR_FE_MASK 0x8\n+#define U0LSR_FE 0x8\n+#define U0LSR_FE_BIT 3\n+#define U0LSR_BI_MASK 0x10\n+#define U0LSR_BI 0x10\n+#define U0LSR_BI_BIT 4\n+#define U0LSR_THRE_MASK 0x20\n+#define U0LSR_THRE 0x20\n+#define U0LSR_THRE_BIT 5\n+#define U0LSR_TEMT_MASK 0x40\n+#define U0LSR_TEMT 0x40\n+#define U0LSR_TEMT_BIT 6\n+#define U0LSR_RXFE_MASK 0x80\n+#define U0LSR_RXFE 0x80\n+#define U0LSR_RXFE_BIT 7\n+\n+#define U0SCR (*(volatile unsigned char *)0xE000C01C)\n+#define U0SCR_OFFSET 0x1C\n+\n+#define U0ACR (*(volatile unsigned long *)0xE000C020)\n+#define U0ACR_OFFSET 0x20\n+#define U0ACR_Start_MASK 0x1\n+#define U0ACR_Start 0x1\n+#define U0ACR_Start_BIT 0\n+#define U0ACR_Mode_MASK 0x2\n+#define U0ACR_Mode 0x2\n+#define U0ACR_Mode_BIT 1\n+#define U0ACR_AutoRestart_MASK 0x4\n+#define U0ACR_AutoRestart 0x4\n+#define U0ACR_AutoRestart_BIT 2\n+#define U0ACR_ABEOIntClr_MASK 0x100\n+#define U0ACR_ABEOIntClr 0x100\n+#define U0ACR_ABEOIntClr_BIT 8\n+#define U0ACR_ABTOIntClr_MASK 0x200\n+#define U0ACR_ABTOIntClr 0x200\n+#define U0ACR_ABTOIntClr_BIT 9\n+\n+#define U0FDR (*(volatile unsigned long *)0xE000C028)\n+#define U0FDR_OFFSET 0x28\n+#define U0FDR_DIVADDVAL_MASK 0xF\n+#define U0FDR_DIVADDVAL_BIT 0\n+#define U0FDR_MULVAL_MASK 0xF0\n+#define U0FDR_MULVAL_BIT 4\n+\n+#define U0TER (*(volatile unsigned char *)0xE000C030)\n+#define U0TER_OFFSET 0x30\n+#define U0TER_TXEN_MASK 0x80\n+#define U0TER_TXEN 0x80\n+#define U0TER_TXEN_BIT 7\n+\n+#define UART1_BASE 0xE0010000\n+\n+#define U1RBR (*(volatile unsigned char *)0xE0010000)\n+#define U1RBR_OFFSET 0x0\n+\n+#define U1THR (*(volatile unsigned char *)0xE0010000)\n+#define U1THR_OFFSET 0x0\n+\n+#define U1DLL (*(volatile unsigned char *)0xE0010000)\n+#define U1DLL_OFFSET 0x0\n+\n+#define U1DLM (*(volatile unsigned char *)0xE0010004)\n+#define U1DLM_OFFSET 0x4\n+\n+#define U1IER (*(volatile unsigned long *)0xE0010004)\n+#define U1IER_OFFSET 0x4\n+#define U1IER_RBR_Interrupt_Enable_MASK 0x1\n+#define U1IER_RBR_Interrupt_Enable 0x1\n+#define U1IER_RBR_Interrupt_Enable_BIT 0\n+#define U1IER_THRE_Interrupt_Enable_MASK 0x2\n+#define U1IER_THRE_Interrupt_Enable 0x2\n+#define U1IER_THRE_Interrupt_Enable_BIT 1\n+#define U1IER_Rx_Line_Status_Interrupt_Enable_MASK 0x4\n+#define U1IER_Rx_Line_Status_Interrupt_Enable 0x4\n+#define U1IER_Rx_Line_Status_Interrupt_Enable_BIT 2\n+#define U1IER_Modem_Status_Interrupt_Enable_MASK 0x8\n+#define U1IER_Modem_Status_Interrupt_Enable 0x8\n+#define U1IER_Modem_Status_Interrupt_Enable_BIT 3\n+#define U1IER_CTS_Interrupt_Enable_MASK 0x80\n+#define U1IER_CTS_Interrupt_Enable 0x80\n+#define U1IER_CTS_Interrupt_Enable_BIT 7\n+#define U1IER_ABTOIntEn_MASK 0x100\n+#define U1IER_ABTOIntEn 0x100\n+#define U1IER_ABTOIntEn_BIT 8\n+#define U1IER_ABEOIntEn_MASK 0x200\n+#define U1IER_ABEOIntEn 0x200\n+#define U1IER_ABEOIntEn_BIT 9\n+\n+#define U1IIR (*(volatile unsigned long *)0xE0010008)\n+#define U1IIR_OFFSET 0x8\n+#define U1IIR_Interrupt_Pending_MASK 0x1\n+#define U1IIR_Interrupt_Pending 0x1\n+#define U1IIR_Interrupt_Pending_BIT 0\n+#define U1IIR_Interrupt_Identification_MASK 0xE\n+#define U1IIR_Interrupt_Identification_BIT 1\n+#define U1IIR_FIFO_Enable_MASK 0xC0\n+#define U1IIR_FIFO_Enable_BIT 6\n+#define U1IIR_ABEOInt_MASK 0x100\n+#define U1IIR_ABEOInt 0x100\n+#define U1IIR_ABEOInt_BIT 8\n+#define U1IIR_ABTOInt_MASK 0x200\n+#define U1IIR_ABTOInt 0x200\n+#define U1IIR_ABTOInt_BIT 9\n+\n+#define U1FCR (*(volatile unsigned char *)0xE0010008)\n+#define U1FCR_OFFSET 0x8\n+#define U1FCR_FIFO_Enable_MASK 0x1\n+#define U1FCR_FIFO_Enable 0x1\n+#define U1FCR_FIFO_Enable_BIT 0\n+#define U1FCR_Rx_FIFO_Reset_MASK 0x2\n+#define U1FCR_Rx_FIFO_Reset 0x2\n+#define U1FCR_Rx_FIFO_Reset_BIT 1\n+#define U1FCR_Tx_FIFO_Reset_MASK 0x4\n+#define U1FCR_Tx_FIFO_Reset 0x4\n+#define U1FCR_Tx_FIFO_Reset_BIT 2\n+#define U1FCR_Rx_Trigger_Level_Select_MASK 0xC0\n+#define U1FCR_Rx_Trigger_Level_Select_BIT 6\n+\n+#define U1LCR (*(volatile unsigned char *)0xE001000C)\n+#define U1LCR_OFFSET 0xC\n+#define U1LCR_Word_Length_Select_MASK 0x3\n+#define U1LCR_Word_Length_Select_BIT 0\n+#define U1LCR_Stop_Bit_Select_MASK 0x4\n+#define U1LCR_Stop_Bit_Select 0x4\n+#define U1LCR_Stop_Bit_Select_BIT 2\n+#define U1LCR_Parity_Enable_MASK 0x8\n+#define U1LCR_Parity_Enable 0x8\n+#define U1LCR_Parity_Enable_BIT 3\n+#define U1LCR_Parity_Select_MASK 0x30\n+#define U1LCR_Parity_Select_BIT 4\n+#define U1LCR_Break_Control_MASK 0x40\n+#define U1LCR_Break_Control 0x40\n+#define U1LCR_Break_Control_BIT 6\n+#define U1LCR_Divisor_Latch_Access_Bit_MASK 0x80\n+#define U1LCR_Divisor_Latch_Access_Bit 0x80\n+#define U1LCR_Divisor_Latch_Access_Bit_BIT 7\n+\n+#define U1MCR (*(volatile unsigned char *)0xE0010010)\n+#define U1MCR_OFFSET 0x10\n+#define U1MCR_DTR_Control_MASK 0x1\n+#define U1MCR_DTR_Control 0x1\n+#define U1MCR_DTR_Control_BIT 0\n+#define U1MCR_RTS_Control_MASK 0x2\n+#define U1MCR_RTS_Control 0x2\n+#define U1MCR_RTS_Control_BIT 1\n+#define U1MCR_Loopback_Mode_Select_MASK 0x10\n+#define U1MCR_Loopback_Mode_Select 0x10\n+#define U1MCR_Loopback_Mode_Select_BIT 4\n+#define U1MCR_RTSen_MASK 0x40\n+#define U1MCR_RTSen 0x40\n+#define U1MCR_RTSen_BIT 6\n+#define U1MCR_CTSen_MASK 0x80\n+#define U1MCR_CTSen 0x80\n+#define U1MCR_CTSen_BIT 7\n+\n+#define U1LSR (*(volatile unsigned char *)0xE0010014)\n+#define U1LSR_OFFSET 0x14\n+#define U1LSR_RDR_MASK 0x1\n+#define U1LSR_RDR 0x1\n+#define U1LSR_RDR_BIT 0\n+#define U1LSR_OE_MASK 0x2\n+#define U1LSR_OE 0x2\n+#define U1LSR_OE_BIT 1\n+#define U1LSR_PE_MASK 0x4\n+#define U1LSR_PE 0x4\n+#define U1LSR_PE_BIT 2\n+#define U1LSR_FE_MASK 0x8\n+#define U1LSR_FE 0x8\n+#define U1LSR_FE_BIT 3\n+#define U1LSR_BI_MASK 0x10\n+#define U1LSR_BI 0x10\n+#define U1LSR_BI_BIT 4\n+#define U1LSR_THRE_MASK 0x20\n+#define U1LSR_THRE 0x20\n+#define U1LSR_THRE_BIT 5\n+#define U1LSR_TEMT_MASK 0x40\n+#define U1LSR_TEMT 0x40\n+#define U1LSR_TEMT_BIT 6\n+#define U1LSR_RXFE_MASK 0x80\n+#define U1LSR_RXFE 0x80\n+#define U1LSR_RXFE_BIT 7\n+\n+#define U1MSR (*(volatile unsigned char *)0xE0010018)\n+#define U1MSR_OFFSET 0x18\n+#define U1MSR_Delta_CTS_MASK 0x1\n+#define U1MSR_Delta_CTS 0x1\n+#define U1MSR_Delta_CTS_BIT 0\n+#define U1MSR_Delta_DSR_MASK 0x2\n+#define U1MSR_Delta_DSR 0x2\n+#define U1MSR_Delta_DSR_BIT 1\n+#define U1MSR_Trailing_Edge_RI_MASK 0x4\n+#define U1MSR_Trailing_Edge_RI 0x4\n+#define U1MSR_Trailing_Edge_RI_BIT 2\n+#define U1MSR_Delta_DCD_MASK 0x8\n+#define U1MSR_Delta_DCD 0x8\n+#define U1MSR_Delta_DCD_BIT 3\n+#define U1MSR_CTS_MASK 0x10\n+#define U1MSR_CTS 0x10\n+#define U1MSR_CTS_BIT 4\n+#define U1MSR_DSR_MASK 0x20\n+#define U1MSR_DSR 0x20\n+#define U1MSR_DSR_BIT 5\n+#define U1MSR_RI_MASK 0x40\n+#define U1MSR_RI 0x40\n+#define U1MSR_RI_BIT 6\n+#define U1MSR_DCD_MASK 0x80\n+#define U1MSR_DCD 0x80\n+#define U1MSR_DCD_BIT 7\n+\n+#define U1SCR (*(volatile unsigned char *)0xE001001C)\n+#define U1SCR_OFFSET 0x1C\n+\n+#define U1ACR (*(volatile unsigned long *)0xE0010020)\n+#define U1ACR_OFFSET 0x20\n+#define U1ACR_Start_MASK 0x1\n+#define U1ACR_Start 0x1\n+#define U1ACR_Start_BIT 0\n+#define U1ACR_Mode_MASK 0x2\n+#define U1ACR_Mode 0x2\n+#define U1ACR_Mode_BIT 1\n+#define U1ACR_AutoRestart_MASK 0x4\n+#define U1ACR_AutoRestart 0x4\n+#define U1ACR_AutoRestart_BIT 2\n+#define U1ACR_ABEOIntClr_MASK 0x100\n+#define U1ACR_ABEOIntClr 0x100\n+#define U1ACR_ABEOIntClr_BIT 8\n+#define U1ACR_ABTOIntClr_MASK 0x200\n+#define U1ACR_ABTOIntClr 0x200\n+#define U1ACR_ABTOIntClr_BIT 9\n+\n+#define U1FDR (*(volatile unsigned long *)0xE0010028)\n+#define U1FDR_OFFSET 0x28\n+#define U1FDR_DIVADDVAL_MASK 0xF\n+#define U1FDR_DIVADDVAL_BIT 0\n+#define U1FDR_MULVAL_MASK 0xF0\n+#define U1FDR_MULVAL_BIT 4\n+\n+#define U1TER (*(volatile unsigned char *)0xE0010030)\n+#define U1TER_OFFSET 0x30\n+#define U1TER_TXEN_MASK 0x80\n+#define U1TER_TXEN 0x80\n+#define U1TER_TXEN_BIT 7\n+\n+#define PWM_BASE 0xE0014000\n+\n+#define PWMIR (*(volatile unsigned long *)0xE0014000)\n+#define PWMIR_OFFSET 0x0\n+#define PWMIR_PWMMR0_Interrupt_MASK 0x1\n+#define PWMIR_PWMMR0_Interrupt 0x1\n+#define PWMIR_PWMMR0_Interrupt_BIT 0\n+#define PWMIR_PWMMR1_Interrupt_MASK 0x2\n+#define PWMIR_PWMMR1_Interrupt 0x2\n+#define PWMIR_PWMMR1_Interrupt_BIT 1\n+#define PWMIR_PWMMR2_Interrupt_MASK 0x4\n+#define PWMIR_PWMMR2_Interrupt 0x4\n+#define PWMIR_PWMMR2_Interrupt_BIT 2\n+#define PWMIR_PWMMR3_Interrupt_MASK 0x8\n+#define PWMIR_PWMMR3_Interrupt 0x8\n+#define PWMIR_PWMMR3_Interrupt_BIT 3\n+#define PWMIR_PWMMR4_Interrupt_MASK 0x100\n+#define PWMIR_PWMMR4_Interrupt 0x100\n+#define PWMIR_PWMMR4_Interrupt_BIT 8\n+#define PWMIR_PWMMR5_Interrupt_MASK 0x200\n+#define PWMIR_PWMMR5_Interrupt 0x200\n+#define PWMIR_PWMMR5_Interrupt_BIT 9\n+#define PWMIR_PWMMR6_Interrupt_MASK 0x400\n+#define PWMIR_PWMMR6_Interrupt 0x400\n+#define PWMIR_PWMMR6_Interrupt_BIT 10\n+\n+#define PWMTCR (*(volatile unsigned long *)0xE0014004)\n+#define PWMTCR_OFFSET 0x4\n+#define PWMTCR_Counter_Enable_MASK 0x1\n+#define PWMTCR_Counter_Enable 0x1\n+#define PWMTCR_Counter_Enable_BIT 0\n+#define PWMTCR_Counter_Reset_MASK 0x2\n+#define PWMTCR_Counter_Reset 0x2\n+#define PWMTCR_Counter_Reset_BIT 1\n+#define PWMTCR_PWM_Enable_MASK 0x8\n+#define PWMTCR_PWM_Enable 0x8\n+#define PWMTCR_PWM_Enable_BIT 3\n+\n+#define PWMTC (*(volatile unsigned long *)0xE0014008)\n+#define PWMTC_OFFSET 0x8\n+\n+#define PWMPR (*(volatile unsigned long *)0xE001400C)\n+#define PWMPR_OFFSET 0xC\n+\n+#define PWMPC (*(volatile unsigned long *)0xE0014010)\n+#define PWMPC_OFFSET 0x10\n+\n+#define PWMMCR (*(volatile unsigned long *)0xE0014014)\n+#define PWMMCR_OFFSET 0x14\n+#define PWMMCR_PWMMR0I_MASK 0x1\n+#define PWMMCR_PWMMR0I 0x1\n+#define PWMMCR_PWMMR0I_BIT 0\n+#define PWMMCR_PWMMR0R_MASK 0x2\n+#define PWMMCR_PWMMR0R 0x2\n+#define PWMMCR_PWMMR0R_BIT 1\n+#define PWMMCR_PWMMR0S_MASK 0x4\n+#define PWMMCR_PWMMR0S 0x4\n+#define PWMMCR_PWMMR0S_BIT 2\n+#define PWMMCR_PWMMR1I_MASK 0x8\n+#define PWMMCR_PWMMR1I 0x8\n+#define PWMMCR_PWMMR1I_BIT 3\n+#define PWMMCR_PWMMR1R_MASK 0x10\n+#define PWMMCR_PWMMR1R 0x10\n+#define PWMMCR_PWMMR1R_BIT 4\n+#define PWMMCR_PWMMR1S_MASK 0x20\n+#define PWMMCR_PWMMR1S 0x20\n+#define PWMMCR_PWMMR1S_BIT 5\n+#define PWMMCR_PWMMR2I_MASK 0x40\n+#define PWMMCR_PWMMR2I 0x40\n+#define PWMMCR_PWMMR2I_BIT 6\n+#define PWMMCR_PWMMR2R_MASK 0x80\n+#define PWMMCR_PWMMR2R 0x80\n+#define PWMMCR_PWMMR2R_BIT 7\n+#define PWMMCR_PWMMR2S_MASK 0x100\n+#define PWMMCR_PWMMR2S 0x100\n+#define PWMMCR_PWMMR2S_BIT 8\n+#define PWMMCR_PWMMR3I_MASK 0x200\n+#define PWMMCR_PWMMR3I 0x200\n+#define PWMMCR_PWMMR3I_BIT 9\n+#define PWMMCR_PWMMR3R_MASK 0x400\n+#define PWMMCR_PWMMR3R 0x400\n+#define PWMMCR_PWMMR3R_BIT 10\n+#define PWMMCR_PWMMR3S_MASK 0x800\n+#define PWMMCR_PWMMR3S 0x800\n+#define PWMMCR_PWMMR3S_BIT 11\n+#define PWMMCR_PWMMR4I_MASK 0x1000\n+#define PWMMCR_PWMMR4I 0x1000\n+#define PWMMCR_PWMMR4I_BIT 12\n+#define PWMMCR_PWMMR4R_MASK 0x2000\n+#define PWMMCR_PWMMR4R 0x2000\n+#define PWMMCR_PWMMR4R_BIT 13\n+#define PWMMCR_PWMMR4S_MASK 0x4000\n+#define PWMMCR_PWMMR4S 0x4000\n+#define PWMMCR_PWMMR4S_BIT 14\n+#define PWMMCR_PWMMR5I_MASK 0x8000\n+#define PWMMCR_PWMMR5I 0x8000\n+#define PWMMCR_PWMMR5I_BIT 15\n+#define PWMMCR_PWMMR5R_MASK 0x10000\n+#define PWMMCR_PWMMR5R 0x10000\n+#define PWMMCR_PWMMR5R_BIT 16\n+#define PWMMCR_PWMMR5S_MASK 0x20000\n+#define PWMMCR_PWMMR5S 0x20000\n+#define PWMMCR_PWMMR5S_BIT 17\n+#define PWMMCR_PWMMR6I_MASK 0x40000\n+#define PWMMCR_PWMMR6I 0x40000\n+#define PWMMCR_PWMMR6I_BIT 18\n+#define PWMMCR_PWMMR6R_MASK 0x80000\n+#define PWMMCR_PWMMR6R 0x80000\n+#define PWMMCR_PWMMR6R_BIT 19\n+#define PWMMCR_PWMMR6S_MASK 0x100000\n+#define PWMMCR_PWMMR6S 0x100000\n+#define PWMMCR_PWMMR6S_BIT 20\n+\n+#define PWMMR0 (*(volatile unsigned long *)0xE0014018)\n+#define PWMMR0_OFFSET 0x18\n+\n+#define PWMMR1 (*(volatile unsigned long *)0xE001401C)\n+#define PWMMR1_OFFSET 0x1C\n+\n+#define PWMMR2 (*(volatile unsigned long *)0xE0014020)\n+#define PWMMR2_OFFSET 0x20\n+\n+#define PWMMR3 (*(volatile unsigned long *)0xE0014024)\n+#define PWMMR3_OFFSET 0x24\n+\n+#define PWMMR4 (*(volatile unsigned long *)0xE0014040)\n+#define PWMMR4_OFFSET 0x40\n+\n+#define PWMMR5 (*(volatile unsigned long *)0xE0014044)\n+#define PWMMR5_OFFSET 0x44\n+\n+#define PWMMR6 (*(volatile unsigned long *)0xE0014048)\n+#define PWMMR6_OFFSET 0x48\n+\n+#define PWMPCR (*(volatile unsigned long *)0xE001404C)\n+#define PWMPCR_OFFSET 0x4C\n+#define PWMPCR_PWMSEL2_MASK 0x4\n+#define PWMPCR_PWMSEL2 0x4\n+#define PWMPCR_PWMSEL2_BIT 2\n+#define PWMPCR_PWMSEL3_MASK 0x8\n+#define PWMPCR_PWMSEL3 0x8\n+#define PWMPCR_PWMSEL3_BIT 3\n+#define PWMPCR_PWMSEL4_MASK 0x10\n+#define PWMPCR_PWMSEL4 0x10\n+#define PWMPCR_PWMSEL4_BIT 4\n+#define PWMPCR_PWMSEL5_MASK 0x20\n+#define PWMPCR_PWMSEL5 0x20\n+#define PWMPCR_PWMSEL5_BIT 5\n+#define PWMPCR_PWMSEL6_MASK 0x40\n+#define PWMPCR_PWMSEL6 0x40\n+#define PWMPCR_PWMSEL6_BIT 6\n+#define PWMPCR_PWMENA1_MASK 0x200\n+#define PWMPCR_PWMENA1 0x200\n+#define PWMPCR_PWMENA1_BIT 9\n+#define PWMPCR_PWMENA2_MASK 0x400\n+#define PWMPCR_PWMENA2 0x400\n+#define PWMPCR_PWMENA2_BIT 10\n+#define PWMPCR_PWMENA3_MASK 0x800\n+#define PWMPCR_PWMENA3 0x800\n+#define PWMPCR_PWMENA3_BIT 11\n+#define PWMPCR_PWMENA4_MASK 0x1000\n+#define PWMPCR_PWMENA4 0x1000\n+#define PWMPCR_PWMENA4_BIT 12\n+#define PWMPCR_PWMENA5_MASK 0x2000\n+#define PWMPCR_PWMENA5 0x2000\n+#define PWMPCR_PWMENA5_BIT 13\n+#define PWMPCR_PWMENA6_MASK 0x4000\n+#define PWMPCR_PWMENA6 0x4000\n+#define PWMPCR_PWMENA6_BIT 14\n+\n+#define PWMLER (*(volatile unsigned long *)0xE0014050)\n+#define PWMLER_OFFSET 0x50\n+#define PWMLER_Enable_PWM_Match_0_Latch_MASK 0x1\n+#define PWMLER_Enable_PWM_Match_0_Latch 0x1\n+#define PWMLER_Enable_PWM_Match_0_Latch_BIT 0\n+#define PWMLER_Enable_PWM_Match_1_Latch_MASK 0x2\n+#define PWMLER_Enable_PWM_Match_1_Latch 0x2\n+#define PWMLER_Enable_PWM_Match_1_Latch_BIT 1\n+#define PWMLER_Enable_PWM_Match_2_Latch_MASK 0x4\n+#define PWMLER_Enable_PWM_Match_2_Latch 0x4\n+#define PWMLER_Enable_PWM_Match_2_Latch_BIT 2\n+#define PWMLER_Enable_PWM_Match_3_Latch_MASK 0x8\n+#define PWMLER_Enable_PWM_Match_3_Latch 0x8\n+#define PWMLER_Enable_PWM_Match_3_Latch_BIT 3\n+#define PWMLER_Enable_PWM_Match_4_Latch_MASK 0x10\n+#define PWMLER_Enable_PWM_Match_4_Latch 0x10\n+#define PWMLER_Enable_PWM_Match_4_Latch_BIT 4\n+#define PWMLER_Enable_PWM_Match_5_Latch_MASK 0x20\n+#define PWMLER_Enable_PWM_Match_5_Latch 0x20\n+#define PWMLER_Enable_PWM_Match_5_Latch_BIT 5\n+#define PWMLER_Enable_PWM_Match_6_Latch_MASK 0x40\n+#define PWMLER_Enable_PWM_Match_6_Latch 0x40\n+#define PWMLER_Enable_PWM_Match_6_Latch_BIT 6\n+\n+#define I2C_BASE 0xE001C000\n+\n+#define I2CONSET (*(volatile unsigned char *)0xE001C000)\n+#define I2CONSET_OFFSET 0x0\n+#define I2CONSET_AA_MASK 0x4\n+#define I2CONSET_AA 0x4\n+#define I2CONSET_AA_BIT 2\n+#define I2CONSET_SI_MASK 0x8\n+#define I2CONSET_SI 0x8\n+#define I2CONSET_SI_BIT 3\n+#define I2CONSET_STO_MASK 0x10\n+#define I2CONSET_STO 0x10\n+#define I2CONSET_STO_BIT 4\n+#define I2CONSET_STA_MASK 0x20\n+#define I2CONSET_STA 0x20\n+#define I2CONSET_STA_BIT 5\n+#define I2CONSET_I2EN_MASK 0x40\n+#define I2CONSET_I2EN 0x40\n+#define I2CONSET_I2EN_BIT 6\n+\n+#define I2STAT (*(volatile unsigned char *)0xE001C004)\n+#define I2STAT_OFFSET 0x4\n+#define I2STAT_Status_MASK 0xF8\n+#define I2STAT_Status_BIT 3\n+\n+#define I2DAT (*(volatile unsigned char *)0xE001C008)\n+#define I2DAT_OFFSET 0x8\n+\n+#define I2ADR (*(volatile unsigned char *)0xE001C00C)\n+#define I2ADR_OFFSET 0xC\n+#define I2ADR_GC_MASK 0x1\n+#define I2ADR_GC 0x1\n+#define I2ADR_GC_BIT 0\n+#define I2ADR_Address_MASK 0x7E\n+#define I2ADR_Address_BIT 1\n+\n+#define I2SCLH (*(volatile unsigned short *)0xE001C010)\n+#define I2SCLH_OFFSET 0x10\n+\n+#define I2SCLL (*(volatile unsigned short *)0xE001C014)\n+#define I2SCLL_OFFSET 0x14\n+\n+#define I2CONCLR (*(volatile unsigned char *)0xE001C018)\n+#define I2CONCLR_OFFSET 0x18\n+#define I2CONCLR_AAC_MASK 0x4\n+#define I2CONCLR_AAC 0x4\n+#define I2CONCLR_AAC_BIT 2\n+#define I2CONCLR_SIC_MASK 0x8\n+#define I2CONCLR_SIC 0x8\n+#define I2CONCLR_SIC_BIT 3\n+#define I2CONCLR_STAC_MASK 0x20\n+#define I2CONCLR_STAC 0x20\n+#define I2CONCLR_STAC_BIT 5\n+#define I2CONCLR_I2ENC_MASK 0x40\n+#define I2CONCLR_I2ENC 0x40\n+#define I2CONCLR_I2ENC_BIT 6\n+\n+#define SPI0_BASE 0xE0020000\n+\n+#define S0SPCR (*(volatile unsigned short *)0xE0020000)\n+#define S0SPCR_OFFSET 0x0\n+#define S0SPCR_BitEnable_MASK 0x4\n+#define S0SPCR_BitEnable 0x4\n+#define S0SPCR_BitEnable_BIT 2\n+#define S0SPCR_CPHA_MASK 0x8\n+#define S0SPCR_CPHA 0x8\n+#define S0SPCR_CPHA_BIT 3\n+#define S0SPCR_CPOL_MASK 0x10\n+#define S0SPCR_CPOL 0x10\n+#define S0SPCR_CPOL_BIT 4\n+#define S0SPCR_MSTR_MASK 0x20\n+#define S0SPCR_MSTR 0x20\n+#define S0SPCR_MSTR_BIT 5\n+#define S0SPCR_LSBF_MASK 0x40\n+#define S0SPCR_LSBF 0x40\n+#define S0SPCR_LSBF_BIT 6\n+#define S0SPCR_SPIE_MASK 0x80\n+#define S0SPCR_SPIE 0x80\n+#define S0SPCR_SPIE_BIT 7\n+#define S0SPCR_BITS_MASK 0xF00\n+#define S0SPCR_BITS_BIT 8\n+\n+#define S0SPSR (*(volatile unsigned char *)0xE0020004)\n+#define S0SPSR_OFFSET 0x4\n+#define S0SPSR_ABRT_MASK 0x8\n+#define S0SPSR_ABRT 0x8\n+#define S0SPSR_ABRT_BIT 3\n+#define S0SPSR_MODF_MASK 0x10\n+#define S0SPSR_MODF 0x10\n+#define S0SPSR_MODF_BIT 4\n+#define S0SPSR_ROVR_MASK 0x20\n+#define S0SPSR_ROVR 0x20\n+#define S0SPSR_ROVR_BIT 5\n+#define S0SPSR_WCOL_MASK 0x40\n+#define S0SPSR_WCOL 0x40\n+#define S0SPSR_WCOL_BIT 6\n+#define S0SPSR_SPIF_MASK 0x80\n+#define S0SPSR_SPIF 0x80\n+#define S0SPSR_SPIF_BIT 7\n+\n+#define S0SPDR (*(volatile unsigned short *)0xE0020008)\n+#define S0SPDR_OFFSET 0x8\n+\n+#define S0SPCCR (*(volatile unsigned char *)0xE002000C)\n+#define S0SPCCR_OFFSET 0xC\n+\n+#define S0SPINT (*(volatile unsigned char *)0xE002001C)\n+#define S0SPINT_OFFSET 0x1C\n+\n+#define RTC_BASE 0xE0024000\n+\n+#define ILR (*(volatile unsigned long *)0xE0024000)\n+#define ILR_OFFSET 0x0\n+#define ILR_RTCCIF_MASK 0x1\n+#define ILR_RTCCIF 0x1\n+#define ILR_RTCCIF_BIT 0\n+#define ILR_RTCALF_MASK 0x2\n+#define ILR_RTCALF 0x2\n+#define ILR_RTCALF_BIT 1\n+\n+#define CTC (*(volatile unsigned long *)0xE0024004)\n+#define CTC_OFFSET 0x4\n+#define CTC_Clock_Tick_Counter_MASK 0xFFFE\n+#define CTC_Clock_Tick_Counter_BIT 1\n+\n+#define CCR (*(volatile unsigned long *)0xE0024008)\n+#define CCR_OFFSET 0x8\n+#define CCR_CLKEN_MASK 0x1\n+#define CCR_CLKEN 0x1\n+#define CCR_CLKEN_BIT 0\n+#define CCR_CTCRST_MASK 0x2\n+#define CCR_CTCRST 0x2\n+#define CCR_CTCRST_BIT 1\n+#define CCR_CTTEST_MASK 0xC\n+#define CCR_CTTEST_BIT 2\n+\n+#define CIIR (*(volatile unsigned long *)0xE002400C)\n+#define CIIR_OFFSET 0xC\n+#define CIIR_IMSEC_MASK 0x1\n+#define CIIR_IMSEC 0x1\n+#define CIIR_IMSEC_BIT 0\n+#define CIIR_IMMIN_MASK 0x2\n+#define CIIR_IMMIN 0x2\n+#define CIIR_IMMIN_BIT 1\n+#define CIIR_IMHOUR_MASK 0x4\n+#define CIIR_IMHOUR 0x4\n+#define CIIR_IMHOUR_BIT 2\n+#define CIIR_IMDOM_MASK 0x8\n+#define CIIR_IMDOM 0x8\n+#define CIIR_IMDOM_BIT 3\n+#define CIIR_IMDOW_MASK 0x10\n+#define CIIR_IMDOW 0x10\n+#define CIIR_IMDOW_BIT 4\n+#define CIIR_IMDOY_MASK 0x20\n+#define CIIR_IMDOY 0x20\n+#define CIIR_IMDOY_BIT 5\n+#define CIIR_IMMON_MASK 0x40\n+#define CIIR_IMMON 0x40\n+#define CIIR_IMMON_BIT 6\n+#define CIIR_IMYEAR_MASK 0x80\n+#define CIIR_IMYEAR 0x80\n+#define CIIR_IMYEAR_BIT 7\n+\n+#define AMR (*(volatile unsigned long *)0xE0024010)\n+#define AMR_OFFSET 0x10\n+#define AMR_AMRSEC_MASK 0x1\n+#define AMR_AMRSEC 0x1\n+#define AMR_AMRSEC_BIT 0\n+#define AMR_AMRMIN_MASK 0x2\n+#define AMR_AMRMIN 0x2\n+#define AMR_AMRMIN_BIT 1\n+#define AMR_AMRHOUR_MASK 0x4\n+#define AMR_AMRHOUR 0x4\n+#define AMR_AMRHOUR_BIT 2\n+#define AMR_AMRDOM_MASK 0x8\n+#define AMR_AMRDOM 0x8\n+#define AMR_AMRDOM_BIT 3\n+#define AMR_AMRDOW_MASK 0x10\n+#define AMR_AMRDOW 0x10\n+#define AMR_AMRDOW_BIT 4\n+#define AMR_AMRDOY_MASK 0x20\n+#define AMR_AMRDOY 0x20\n+#define AMR_AMRDOY_BIT 5\n+#define AMR_AMRMON_MASK 0x40\n+#define AMR_AMRMON 0x40\n+#define AMR_AMRMON_BIT 6\n+#define AMR_AMRYEAR_MASK 0x80\n+#define AMR_AMRYEAR 0x80\n+#define AMR_AMRYEAR_BIT 7\n+\n+#define CTIME0 (*(volatile unsigned long *)0xE0024014)\n+#define CTIME0_OFFSET 0x14\n+#define CTIME0_Seconds_MASK 0x3F\n+#define CTIME0_Seconds_BIT 0\n+#define CTIME0_Minutes_MASK 0x3F00\n+#define CTIME0_Minutes_BIT 8\n+#define CTIME0_Hours_MASK 0x1F0000\n+#define CTIME0_Hours_BIT 16\n+#define CTIME0_Day_of_Week_MASK 0x7000000\n+#define CTIME0_Day_of_Week_BIT 24\n+\n+#define CTIME1 (*(volatile unsigned long *)0xE0024018)\n+#define CTIME1_OFFSET 0x18\n+#define CTIME1_Day_of_Month_MASK 0x1F\n+#define CTIME1_Day_of_Month_BIT 0\n+#define CTIME1_Month_MASK 0xF00\n+#define CTIME1_Month_BIT 8\n+#define CTIME1_Year_MASK 0xFFF0000\n+#define CTIME1_Year_BIT 16\n+\n+#define CTIME2 (*(volatile unsigned long *)0xE002401C)\n+#define CTIME2_OFFSET 0x1C\n+#define CTIME2_Day_of_Year_MASK 0xFFF\n+#define CTIME2_Day_of_Year_BIT 0\n+\n+#define SEC (*(volatile unsigned long *)0xE0024020)\n+#define SEC_OFFSET 0x20\n+\n+#define MIN (*(volatile unsigned long *)0xE0024024)\n+#define MIN_OFFSET 0x24\n+\n+#define HOUR (*(volatile unsigned long *)0xE0024028)\n+#define HOUR_OFFSET 0x28\n+\n+#define DOM (*(volatile unsigned long *)0xE002402C)\n+#define DOM_OFFSET 0x2C\n+\n+#define DOW (*(volatile unsigned long *)0xE0024030)\n+#define DOW_OFFSET 0x30\n+\n+#define DOY (*(volatile unsigned long *)0xE0024034)\n+#define DOY_OFFSET 0x34\n+\n+#define MONTH (*(volatile unsigned long *)0xE0024038)\n+#define MONTH_OFFSET 0x38\n+\n+#define YEAR (*(volatile unsigned long *)0xE002403C)\n+#define YEAR_OFFSET 0x3C\n+\n+#define ALSEC (*(volatile unsigned long *)0xE0024060)\n+#define ALSEC_OFFSET 0x60\n+\n+#define ALMIN (*(volatile unsigned long *)0xE0024064)\n+#define ALMIN_OFFSET 0x64\n+\n+#define ALHOUR (*(volatile unsigned long *)0xE0024068)\n+#define ALHOUR_OFFSET 0x68\n+\n+#define ALDOM (*(volatile unsigned long *)0xE002406C)\n+#define ALDOM_OFFSET 0x6C\n+\n+#define ALDOW (*(volatile unsigned long *)0xE0024070)\n+#define ALDOW_OFFSET 0x70\n+\n+#define ALDOY (*(volatile unsigned long *)0xE0024074)\n+#define ALDOY_OFFSET 0x74\n+\n+#define ALMON (*(volatile unsigned long *)0xE0024078)\n+#define ALMON_OFFSET 0x78\n+\n+#define ALYEAR (*(volatile unsigned long *)0xE002407C)\n+#define ALYEAR_OFFSET 0x7C\n+\n+#define PREINT (*(volatile unsigned long *)0xE0024080)\n+#define PREINT_OFFSET 0x80\n+\n+#define PREFRAC (*(volatile unsigned long *)0xE0024084)\n+#define PREFRAC_OFFSET 0x84\n+\n+#define GPIO_BASE 0xE0028000\n+\n+#define IO0PIN (*(volatile unsigned long *)0xE0028000)\n+#define IO0PIN_OFFSET 0x0\n+\n+#define IO0SET (*(volatile unsigned long *)0xE0028004)\n+#define IO0SET_OFFSET 0x4\n+\n+#define IO0DIR (*(volatile unsigned long *)0xE0028008)\n+#define IO0DIR_OFFSET 0x8\n+\n+#define IO0CLR (*(volatile unsigned long *)0xE002800C)\n+#define IO0CLR_OFFSET 0xC\n+\n+#define IO1PIN (*(volatile unsigned long *)0xE0028010)\n+#define IO1PIN_OFFSET 0x10\n+\n+#define IO1SET (*(volatile unsigned long *)0xE0028014)\n+#define IO1SET_OFFSET 0x14\n+\n+#define IO1DIR (*(volatile unsigned long *)0xE0028018)\n+#define IO1DIR_OFFSET 0x18\n+\n+#define IO1CLR (*(volatile unsigned long *)0xE002801C)\n+#define IO1CLR_OFFSET 0x1C\n+\n+#define PCB_BASE 0xE002C000\n+\n+#define PINSEL0 (*(volatile unsigned long *)0xE002C000)\n+#define PINSEL0_OFFSET 0x0\n+#define PINSEL0_P0_0_MASK 0x3\n+#define PINSEL0_P0_0_BIT 0\n+#define PINSEL0_P0_1_MASK 0xC\n+#define PINSEL0_P0_1_BIT 2\n+#define PINSEL0_P0_2_MASK 0x30\n+#define PINSEL0_P0_2_BIT 4\n+#define PINSEL0_P0_3_MASK 0xC0\n+#define PINSEL0_P0_3_BIT 6\n+#define PINSEL0_P0_4_MASK 0x300\n+#define PINSEL0_P0_4_BIT 8\n+#define PINSEL0_P0_5_MASK 0xC00\n+#define PINSEL0_P0_5_BIT 10\n+#define PINSEL0_P0_6_MASK 0x3000\n+#define PINSEL0_P0_6_BIT 12\n+#define PINSEL0_P0_7_MASK 0xC000\n+#define PINSEL0_P0_7_BIT 14\n+#define PINSEL0_P0_8_MASK 0x30000\n+#define PINSEL0_P0_8_BIT 16\n+#define PINSEL0_P0_9_MASK 0xC0000\n+#define PINSEL0_P0_9_BIT 18\n+#define PINSEL0_P0_10_MASK 0x300000\n+#define PINSEL0_P0_10_BIT 20\n+#define PINSEL0_P0_11_MASK 0xC00000\n+#define PINSEL0_P0_11_BIT 22\n+#define PINSEL0_P0_12_MASK 0x3000000\n+#define PINSEL0_P0_12_BIT 24\n+#define PINSEL0_P0_13_MASK 0xC000000\n+#define PINSEL0_P0_13_BIT 26\n+#define PINSEL0_P0_14_MASK 0x30000000\n+#define PINSEL0_P0_14_BIT 28\n+#define PINSEL0_P0_15_MASK 0xC0000000\n+#define PINSEL0_P0_15_BIT 30\n+\n+#define PINSEL1 (*(volatile unsigned long *)0xE002C004)\n+#define PINSEL1_OFFSET 0x4\n+#define PINSEL1_P0_16_MASK 0x3\n+#define PINSEL1_P0_16_BIT 0\n+#define PINSEL1_P0_17_MASK 0xC\n+#define PINSEL1_P0_17_BIT 2\n+#define PINSEL1_P0_18_MASK 0x30\n+#define PINSEL1_P0_18_BIT 4\n+#define PINSEL1_P0_19_MASK 0xC0\n+#define PINSEL1_P0_19_BIT 6\n+#define PINSEL1_P0_20_MASK 0x300\n+#define PINSEL1_P0_20_BIT 8\n+#define PINSEL1_P0_21_MASK 0xC00\n+#define PINSEL1_P0_21_BIT 10\n+#define PINSEL1_P0_22_MASK 0x3000\n+#define PINSEL1_P0_22_BIT 12\n+#define PINSEL1_P0_23_MASK 0xC000\n+#define PINSEL1_P0_23_BIT 14\n+#define PINSEL1_P0_24_MASK 0x30000\n+#define PINSEL1_P0_24_BIT 16\n+#define PINSEL1_P0_25_MASK 0xC0000\n+#define PINSEL1_P0_25_BIT 18\n+#define PINSEL1_P0_26_MASK 0x300000\n+#define PINSEL1_P0_26_BIT 20\n+#define PINSEL1_P0_27_MASK 0xC00000\n+#define PINSEL1_P0_27_BIT 22\n+#define PINSEL1_P0_28_MASK 0x3000000\n+#define PINSEL1_P0_28_BIT 24\n+#define PINSEL1_P0_29_MASK 0xC000000\n+#define PINSEL1_P0_29_BIT 26\n+#define PINSEL1_P0_30_MASK 0x30000000\n+#define PINSEL1_P0_30_BIT 28\n+#define PINSEL1_P0_31_MASK 0xC0000000\n+#define PINSEL1_P0_31_BIT 30\n+\n+#define PINSEL2 (*(volatile unsigned long *)0xE002C014)\n+#define PINSEL2_OFFSET 0x14\n+#define PINSEL2_GPIO_DEBUG_MASK 0x4\n+#define PINSEL2_GPIO_DEBUG 0x4\n+#define PINSEL2_GPIO_DEBUG_BIT 2\n+#define PINSEL2_GPIO_TRACE_MASK 0x8\n+#define PINSEL2_GPIO_TRACE 0x8\n+#define PINSEL2_GPIO_TRACE_BIT 3\n+\n+#define SPI1_BASE 0xE0030000\n+\n+#define S1SPCR (*(volatile unsigned short *)0xE0030000)\n+#define S1SPCR_OFFSET 0x0\n+#define S1SPCR_BitEnable_MASK 0x4\n+#define S1SPCR_BitEnable 0x4\n+#define S1SPCR_BitEnable_BIT 2\n+#define S1SPCR_CPHA_MASK 0x8\n+#define S1SPCR_CPHA 0x8\n+#define S1SPCR_CPHA_BIT 3\n+#define S1SPCR_CPOL_MASK 0x10\n+#define S1SPCR_CPOL 0x10\n+#define S1SPCR_CPOL_BIT 4\n+#define S1SPCR_MSTR_MASK 0x20\n+#define S1SPCR_MSTR 0x20\n+#define S1SPCR_MSTR_BIT 5\n+#define S1SPCR_LSBF_MASK 0x40\n+#define S1SPCR_LSBF 0x40\n+#define S1SPCR_LSBF_BIT 6\n+#define S1SPCR_SPIE_MASK 0x80\n+#define S1SPCR_SPIE 0x80\n+#define S1SPCR_SPIE_BIT 7\n+#define S1SPCR_BITS_MASK 0xF00\n+#define S1SPCR_BITS_BIT 8\n+\n+#define S1SPSR (*(volatile unsigned char *)0xE0030004)\n+#define S1SPSR_OFFSET 0x4\n+#define S1SPSR_ABRT_MASK 0x8\n+#define S1SPSR_ABRT 0x8\n+#define S1SPSR_ABRT_BIT 3\n+#define S1SPSR_MODF_MASK 0x10\n+#define S1SPSR_MODF 0x10\n+#define S1SPSR_MODF_BIT 4\n+#define S1SPSR_ROVR_MASK 0x20\n+#define S1SPSR_ROVR 0x20\n+#define S1SPSR_ROVR_BIT 5\n+#define S1SPSR_WCOL_MASK 0x40\n+#define S1SPSR_WCOL 0x40\n+#define S1SPSR_WCOL_BIT 6\n+#define S1SPSR_SPIF_MASK 0x80\n+#define S1SPSR_SPIF 0x80\n+#define S1SPSR_SPIF_BIT 7\n+\n+#define S1SPDR (*(volatile unsigned short *)0xE0030008)\n+#define S1SPDR_OFFSET 0x8\n+\n+#define S1SPCCR (*(volatile unsigned char *)0xE003000C)\n+#define S1SPCCR_OFFSET 0xC\n+\n+#define S1SPINT (*(volatile unsigned char *)0xE003001C)\n+#define S1SPINT_OFFSET 0x1C\n+\n+#define AD_BASE 0xE0034000\n+\n+#define ADCR (*(volatile unsigned *)0xE0034000)\n+#define ADCR_OFFSET 0x0\n+#define ADCR_SEL_MASK 0xFF\n+#define ADCR_SEL_BIT 0\n+#define ADCR_CLKDIV_MASK 0xFF00\n+#define ADCR_CLKDIV_BIT 8\n+#define ADCR_BURST_MASK 0x10000\n+#define ADCR_BURST 0x10000\n+#define ADCR_BURST_BIT 16\n+#define ADCR_CLKS_MASK 0xE0000\n+#define ADCR_CLKS_BIT 17\n+#define ADCR_PDN_MASK 0x200000\n+#define ADCR_PDN 0x200000\n+#define ADCR_PDN_BIT 21\n+#define ADCR_START_MASK 0x7000000\n+#define ADCR_START_BIT 24\n+#define ADCR_EDGE_MASK 0x8000000\n+#define ADCR_EDGE 0x8000000\n+#define ADCR_EDGE_BIT 27\n+\n+#define ADGDR (*(volatile unsigned *)0xE0034004)\n+#define ADGDR_OFFSET 0x4\n+#define ADGDR_RESULT_MASK 0xFFC0\n+#define ADGDR_RESULT_BIT 6\n+#define ADGDR_CHN_MASK 0x7000000\n+#define ADGDR_CHN_BIT 24\n+#define ADGDR_OVERUN_MASK 0x40000000\n+#define ADGDR_OVERUN 0x40000000\n+#define ADGDR_OVERUN_BIT 30\n+#define ADGDR_DONE_MASK 0x80000000\n+#define ADGDR_DONE 0x80000000\n+#define ADGDR_DONE_BIT 31\n+\n+#define ADINTEN (*(volatile unsigned *)0xE003400C)\n+#define ADINTEN_OFFSET 0xC\n+#define ADINTEN_ADINTEN0_MASK 0x1\n+#define ADINTEN_ADINTEN0 0x1\n+#define ADINTEN_ADINTEN0_BIT 0\n+#define ADINTEN_ADINTEN1_MASK 0x2\n+#define ADINTEN_ADINTEN1 0x2\n+#define ADINTEN_ADINTEN1_BIT 1\n+#define ADINTEN_ADINTEN2_MASK 0x4\n+#define ADINTEN_ADINTEN2 0x4\n+#define ADINTEN_ADINTEN2_BIT 2\n+#define ADINTEN_ADINTEN3_MASK 0x8\n+#define ADINTEN_ADINTEN3 0x8\n+#define ADINTEN_ADINTEN3_BIT 3\n+#define ADINTEN_ADINTEN4_MASK 0x10\n+#define ADINTEN_ADINTEN4 0x10\n+#define ADINTEN_ADINTEN4_BIT 4\n+#define ADINTEN_ADINTEN5_MASK 0x20\n+#define ADINTEN_ADINTEN5 0x20\n+#define ADINTEN_ADINTEN5_BIT 5\n+#define ADINTEN_ADINTEN6_MASK 0x40\n+#define ADINTEN_ADINTEN6 0x40\n+#define ADINTEN_ADINTEN6_BIT 6\n+#define ADINTEN_ADINTEN7_MASK 0x80\n+#define ADINTEN_ADINTEN7 0x80\n+#define ADINTEN_ADINTEN7_BIT 7\n+#define ADINTEN_ADGINTEN_MASK 0x100\n+#define ADINTEN_ADGINTEN 0x100\n+#define ADINTEN_ADGINTEN_BIT 8\n+\n+#define ADDR0 (*(volatile unsigned *)0xE0034010)\n+#define ADDR0_OFFSET 0x10\n+#define ADDR0_RESULT_MASK 0xFFC0\n+#define ADDR0_RESULT_BIT 6\n+#define ADDR0_OVERRUN_MASK 0x40000000\n+#define ADDR0_OVERRUN 0x40000000\n+#define ADDR0_OVERRUN_BIT 30\n+#define ADDR0_DONE_MASK 0x80000000\n+#define ADDR0_DONE 0x80000000\n+#define ADDR0_DONE_BIT 31\n+\n+#define ADDR1 (*(volatile unsigned *)0xE0034014)\n+#define ADDR1_OFFSET 0x14\n+#define ADDR1_RESULT_MASK 0xFFC0\n+#define ADDR1_RESULT_BIT 6\n+#define ADDR1_OVERRUN_MASK 0x40000000\n+#define ADDR1_OVERRUN 0x40000000\n+#define ADDR1_OVERRUN_BIT 30\n+#define ADDR1_DONE_MASK 0x80000000\n+#define ADDR1_DONE 0x80000000\n+#define ADDR1_DONE_BIT 31\n+\n+#define ADDR2 (*(volatile unsigned *)0xE0034018)\n+#define ADDR2_OFFSET 0x18\n+#define ADDR2_RESULT_MASK 0xFFC0\n+#define ADDR2_RESULT_BIT 6\n+#define ADDR2_OVERRUN_MASK 0x40000000\n+#define ADDR2_OVERRUN 0x40000000\n+#define ADDR2_OVERRUN_BIT 30\n+#define ADDR2_DONE_MASK 0x80000000\n+#define ADDR2_DONE 0x80000000\n+#define ADDR2_DONE_BIT 31\n+\n+#define ADDR3 (*(volatile unsigned *)0xE003401C)\n+#define ADDR3_OFFSET 0x1C\n+#define ADDR3_RESULT_MASK 0xFFC0\n+#define ADDR3_RESULT_BIT 6\n+#define ADDR3_OVERRUN_MASK 0x40000000\n+#define ADDR3_OVERRUN 0x40000000\n+#define ADDR3_OVERRUN_BIT 30\n+#define ADDR3_DONE_MASK 0x80000000\n+#define ADDR3_DONE 0x80000000\n+#define ADDR3_DONE_BIT 31\n+\n+#define ADDR4 (*(volatile unsigned *)0xE0034020)\n+#define ADDR4_OFFSET 0x20\n+#define ADDR4_RESULT_MASK 0xFFC0\n+#define ADDR4_RESULT_BIT 6\n+#define ADDR4_OVERRUN_MASK 0x40000000\n+#define ADDR4_OVERRUN 0x40000000\n+#define ADDR4_OVERRUN_BIT 30\n+#define ADDR4_DONE_MASK 0x80000000\n+#define ADDR4_DONE 0x80000000\n+#define ADDR4_DONE_BIT 31\n+\n+#define ADDR5 (*(volatile unsigned *)0xE0034024)\n+#define ADDR5_OFFSET 0x24\n+#define ADDR5_RESULT_MASK 0xFFC0\n+#define ADDR5_RESULT_BIT 6\n+#define ADDR5_OVERRUN_MASK 0x40000000\n+#define ADDR5_OVERRUN 0x40000000\n+#define ADDR5_OVERRUN_BIT 30\n+#define ADDR5_DONE_MASK 0x80000000\n+#define ADDR5_DONE 0x80000000\n+#define ADDR5_DONE_BIT 31\n+\n+#define ADDR6 (*(volatile unsigned *)0xE0034028)\n+#define ADDR6_OFFSET 0x28\n+#define ADDR6_RESULT_MASK 0xFFC0\n+#define ADDR6_RESULT_BIT 6\n+#define ADDR6_OVERRUN_MASK 0x40000000\n+#define ADDR6_OVERRUN 0x40000000\n+#define ADDR6_OVERRUN_BIT 30\n+#define ADDR6_DONE_MASK 0x80000000\n+#define ADDR6_DONE 0x80000000\n+#define ADDR6_DONE_BIT 31\n+\n+#define ADDR7 (*(volatile unsigned *)0xE003402C)\n+#define ADDR7_OFFSET 0x2C\n+#define ADDR7_RESULT_MASK 0xFFC0\n+#define ADDR7_RESULT_BIT 6\n+#define ADDR7_OVERRUN_MASK 0x40000000\n+#define ADDR7_OVERRUN 0x40000000\n+#define ADDR7_OVERRUN_BIT 30\n+#define ADDR7_DONE_MASK 0x80000000\n+#define ADDR7_DONE 0x80000000\n+#define ADDR7_DONE_BIT 31\n+\n+#define ADSTAT (*(volatile unsigned *)0xE0034030)\n+#define ADSTAT_OFFSET 0x30\n+#define ADSTAT_DONE0_MASK 0x1\n+#define ADSTAT_DONE0 0x1\n+#define ADSTAT_DONE0_BIT 0\n+#define ADSTAT_DONE1_MASK 0x2\n+#define ADSTAT_DONE1 0x2\n+#define ADSTAT_DONE1_BIT 1\n+#define ADSTAT_DONE2_MASK 0x4\n+#define ADSTAT_DONE2 0x4\n+#define ADSTAT_DONE2_BIT 2\n+#define ADSTAT_DONE3_MASK 0x8\n+#define ADSTAT_DONE3 0x8\n+#define ADSTAT_DONE3_BIT 3\n+#define ADSTAT_DONE4_MASK 0x10\n+#define ADSTAT_DONE4 0x10\n+#define ADSTAT_DONE4_BIT 4\n+#define ADSTAT_DONE5_MASK 0x20\n+#define ADSTAT_DONE5 0x20\n+#define ADSTAT_DONE5_BIT 5\n+#define ADSTAT_DONE6_MASK 0x40\n+#define ADSTAT_DONE6 0x40\n+#define ADSTAT_DONE6_BIT 6\n+#define ADSTAT_DONE7_MASK 0x80\n+#define ADSTAT_DONE7 0x80\n+#define ADSTAT_DONE7_BIT 7\n+#define ADSTAT_OVERRUN0_MASK 0x100\n+#define ADSTAT_OVERRUN0 0x100\n+#define ADSTAT_OVERRUN0_BIT 8\n+#define ADSTAT_OVERRUN1_MASK 0x200\n+#define ADSTAT_OVERRUN1 0x200\n+#define ADSTAT_OVERRUN1_BIT 9\n+#define ADSTAT_OVERRUN2_MASK 0x400\n+#define ADSTAT_OVERRUN2 0x400\n+#define ADSTAT_OVERRUN2_BIT 10\n+#define ADSTAT_OVERRUN3_MASK 0x800\n+#define ADSTAT_OVERRUN3 0x800\n+#define ADSTAT_OVERRUN3_BIT 11\n+#define ADSTAT_OVERRUN4_MASK 0x1000\n+#define ADSTAT_OVERRUN4 0x1000\n+#define ADSTAT_OVERRUN4_BIT 12\n+#define ADSTAT_OVERRUN5_MASK 0x2000\n+#define ADSTAT_OVERRUN5 0x2000\n+#define ADSTAT_OVERRUN5_BIT 13\n+#define ADSTAT_OVERRUN6_MASK 0x4000\n+#define ADSTAT_OVERRUN6 0x4000\n+#define ADSTAT_OVERRUN6_BIT 14\n+#define ADSTAT_OVERRUN7_MASK 0x8000\n+#define ADSTAT_OVERRUN7 0x8000\n+#define ADSTAT_OVERRUN7_BIT 15\n+#define ADSTAT_ADINT_MASK 0x10000\n+#define ADSTAT_ADINT 0x10000\n+#define ADSTAT_ADINT_BIT 16\n+\n+#define CAN_BASE 0xE0038000\n+\n+#define AFMR (*(volatile unsigned long *)0xE003C000)\n+#define AFMR_OFFSET 0x4000\n+#define AFMR_AccOff_MASK 0x1\n+#define AFMR_AccOff 0x1\n+#define AFMR_AccOff_BIT 0\n+#define AFMR_AccBP_MASK 0x2\n+#define AFMR_AccBP 0x2\n+#define AFMR_AccBP_BIT 1\n+#define AFMR_eFCAN_MASK 0x4\n+#define AFMR_eFCAN 0x4\n+#define AFMR_eFCAN_BIT 2\n+\n+#define SFF_sa (*(volatile unsigned long *)0xE003C004)\n+#define SFF_sa_OFFSET 0x4004\n+\n+#define SFF_GRP_sa (*(volatile unsigned long *)0xE003C008)\n+#define SFF_GRP_sa_OFFSET 0x4008\n+\n+#define EFF_sa (*(volatile unsigned long *)0xE003C00C)\n+#define EFF_sa_OFFSET 0x400C\n+\n+#define EFF_GRP_sa (*(volatile unsigned long *)0xE003C010)\n+#define EFF_GRP_sa_OFFSET 0x4010\n+\n+#define ENDofTable (*(volatile unsigned long *)0xE003C014)\n+#define ENDofTable_OFFSET 0x4014\n+\n+#define LUTerrAd (*(volatile unsigned long *)0xE003C018)\n+#define LUTerrAd_OFFSET 0x4018\n+\n+#define LUTerr (*(volatile unsigned long *)0xE003C01C)\n+#define LUTerr_OFFSET 0x401C\n+\n+#define CANTxSR (*(volatile unsigned long *)0xE0040000)\n+#define CANTxSR_OFFSET 0x8000\n+#define CANTxSR_TS1_MASK 0x1\n+#define CANTxSR_TS1 0x1\n+#define CANTxSR_TS1_BIT 0\n+#define CANTxSR_TS2_MASK 0x2\n+#define CANTxSR_TS2 0x2\n+#define CANTxSR_TS2_BIT 1\n+#define CANTxSR_TS3_MASK 0x4\n+#define CANTxSR_TS3 0x4\n+#define CANTxSR_TS3_BIT 2\n+#define CANTxSR_TS4_MASK 0x8\n+#define CANTxSR_TS4 0x8\n+#define CANTxSR_TS4_BIT 3\n+#define CANTxSR_TBS1_MASK 0x100\n+#define CANTxSR_TBS1 0x100\n+#define CANTxSR_TBS1_BIT 8\n+#define CANTxSR_TBS2_MASK 0x200\n+#define CANTxSR_TBS2 0x200\n+#define CANTxSR_TBS2_BIT 9\n+#define CANTxSR_TBS3_MASK 0x400\n+#define CANTxSR_TBS3 0x400\n+#define CANTxSR_TBS3_BIT 10\n+#define CANTxSR_TBS4_MASK 0x800\n+#define CANTxSR_TBS4 0x800\n+#define CANTxSR_TBS4_BIT 11\n+#define CANTxSR_TCS1_MASK 0x10000\n+#define CANTxSR_TCS1 0x10000\n+#define CANTxSR_TCS1_BIT 16\n+#define CANTxSR_TCS2_MASK 0x20000\n+#define CANTxSR_TCS2 0x20000\n+#define CANTxSR_TCS2_BIT 17\n+#define CANTxSR_TCS3_MASK 0x40000\n+#define CANTxSR_TCS3 0x40000\n+#define CANTxSR_TCS3_BIT 18\n+#define CANTxSR_TCS4_MASK 0x80000\n+#define CANTxSR_TCS4 0x80000\n+#define CANTxSR_TCS4_BIT 19\n+\n+#define CANRxSR (*(volatile unsigned long *)0xE0040004)\n+#define CANRxSR_OFFSET 0x8004\n+#define CANRxSR_RS1_MASK 0x1\n+#define CANRxSR_RS1 0x1\n+#define CANRxSR_RS1_BIT 0\n+#define CANRxSR_RS2_MASK 0x2\n+#define CANRxSR_RS2 0x2\n+#define CANRxSR_RS2_BIT 1\n+#define CANRxSR_RS3_MASK 0x4\n+#define CANRxSR_RS3 0x4\n+#define CANRxSR_RS3_BIT 2\n+#define CANRxSR_RS4_MASK 0x8\n+#define CANRxSR_RS4 0x8\n+#define CANRxSR_RS4_BIT 3\n+#define CANRxSR_RB1_MASK 0x100\n+#define CANRxSR_RB1 0x100\n+#define CANRxSR_RB1_BIT 8\n+#define CANRxSR_RB2_MASK 0x200\n+#define CANRxSR_RB2 0x200\n+#define CANRxSR_RB2_BIT 9\n+#define CANRxSR_RB3_MASK 0x400\n+#define CANRxSR_RB3 0x400\n+#define CANRxSR_RB3_BIT 10\n+#define CANRxSR_RB4_MASK 0x800\n+#define CANRxSR_RB4 0x800\n+#define CANRxSR_RB4_BIT 11\n+#define CANRxSR_DOS1_MASK 0x10000\n+#define CANRxSR_DOS1 0x10000\n+#define CANRxSR_DOS1_BIT 16\n+#define CANRxSR_DOS2_MASK 0x20000\n+#define CANRxSR_DOS2 0x20000\n+#define CANRxSR_DOS2_BIT 17\n+#define CANRxSR_DOS3_MASK 0x40000\n+#define CANRxSR_DOS3 0x40000\n+#define CANRxSR_DOS3_BIT 18\n+#define CANRxSR_DOS4_MASK 0x80000\n+#define CANRxSR_DOS4 0x80000\n+#define CANRxSR_DOS4_BIT 19\n+\n+#define CANMSR (*(volatile unsigned long *)0xE0040008)\n+#define CANMSR_OFFSET 0x8008\n+#define CANMSR_ES1_MASK 0x1\n+#define CANMSR_ES1 0x1\n+#define CANMSR_ES1_BIT 0\n+#define CANMSR_ES2_MASK 0x2\n+#define CANMSR_ES2 0x2\n+#define CANMSR_ES2_BIT 1\n+#define CANMSR_ES3_MASK 0x4\n+#define CANMSR_ES3 0x4\n+#define CANMSR_ES3_BIT 2\n+#define CANMSR_ES4_MASK 0x8\n+#define CANMSR_ES4 0x8\n+#define CANMSR_ES4_BIT 3\n+#define CANMSR_BS1_MASK 0x100\n+#define CANMSR_BS1 0x100\n+#define CANMSR_BS1_BIT 8\n+#define CANMSR_BS2_MASK 0x200\n+#define CANMSR_BS2 0x200\n+#define CANMSR_BS2_BIT 9\n+#define CANMSR_BS3_MASK 0x400\n+#define CANMSR_BS3 0x400\n+#define CANMSR_BS3_BIT 10\n+#define CANMSR_BS4_MASK 0x800\n+#define CANMSR_BS4 0x800\n+#define CANMSR_BS4_BIT 11\n+\n+#define CAN1_BASE 0xE0044000\n+\n+#define C1MOD (*(volatile unsigned long *)0xE0044000)\n+#define CAN1MOD C1MOD\n+#define C1MOD_OFFSET 0x0\n+#define CAN1MOD_OFFSET C1MOD_OFFSET\n+#define C1MOD_RM_MASK 0x1\n+#define CAN1MOD_RM_MASK C1MOD_RM_MASK\n+#define C1MOD_RM 0x1\n+#define CAN1MOD_RM C1MOD_RM\n+#define C1MOD_RM_BIT 0\n+#define CAN1MOD_RM_BIT C1MOD_RM_BIT\n+#define C1MOD_LOM_MASK 0x2\n+#define CAN1MOD_LOM_MASK C1MOD_LOM_MASK\n+#define C1MOD_LOM 0x2\n+#define CAN1MOD_LOM C1MOD_LOM\n+#define C1MOD_LOM_BIT 1\n+#define CAN1MOD_LOM_BIT C1MOD_LOM_BIT\n+#define C1MOD_STM_MASK 0x4\n+#define CAN1MOD_STM_MASK C1MOD_STM_MASK\n+#define C1MOD_STM 0x4\n+#define CAN1MOD_STM C1MOD_STM\n+#define C1MOD_STM_BIT 2\n+#define CAN1MOD_STM_BIT C1MOD_STM_BIT\n+#define C1MOD_TPM_MASK 0x8\n+#define CAN1MOD_TPM_MASK C1MOD_TPM_MASK\n+#define C1MOD_TPM 0x8\n+#define CAN1MOD_TPM C1MOD_TPM\n+#define C1MOD_TPM_BIT 3\n+#define CAN1MOD_TPM_BIT C1MOD_TPM_BIT\n+#define C1MOD_SM_MASK 0x10\n+#define CAN1MOD_SM_MASK C1MOD_SM_MASK\n+#define C1MOD_SM 0x10\n+#define CAN1MOD_SM C1MOD_SM\n+#define C1MOD_SM_BIT 4\n+#define CAN1MOD_SM_BIT C1MOD_SM_BIT\n+#define C1MOD_RPM_MASK 0x20\n+#define CAN1MOD_RPM_MASK C1MOD_RPM_MASK\n+#define C1MOD_RPM 0x20\n+#define CAN1MOD_RPM C1MOD_RPM\n+#define C1MOD_RPM_BIT 5\n+#define CAN1MOD_RPM_BIT C1MOD_RPM_BIT\n+#define C1MOD_TM_MASK 0x80\n+#define CAN1MOD_TM_MASK C1MOD_TM_MASK\n+#define C1MOD_TM 0x80\n+#define CAN1MOD_TM C1MOD_TM\n+#define C1MOD_TM_BIT 7\n+#define CAN1MOD_TM_BIT C1MOD_TM_BIT\n+\n+#define C1CMR (*(volatile unsigned long *)0xE0044004)\n+#define CAN1CMR C1CMR\n+#define C1CMR_OFFSET 0x4\n+#define CAN1CMR_OFFSET C1CMR_OFFSET\n+#define C1CMR_TR_MASK 0x1\n+#define CAN1CMR_TR_MASK C1CMR_TR_MASK\n+#define C1CMR_TR 0x1\n+#define CAN1CMR_TR C1CMR_TR\n+#define C1CMR_TR_BIT 0\n+#define CAN1CMR_TR_BIT C1CMR_TR_BIT\n+#define C1CMR_AT_MASK 0x2\n+#define CAN1CMR_AT_MASK C1CMR_AT_MASK\n+#define C1CMR_AT 0x2\n+#define CAN1CMR_AT C1CMR_AT\n+#define C1CMR_AT_BIT 1\n+#define CAN1CMR_AT_BIT C1CMR_AT_BIT\n+#define C1CMR_RRB_MASK 0x4\n+#define CAN1CMR_RRB_MASK C1CMR_RRB_MASK\n+#define C1CMR_RRB 0x4\n+#define CAN1CMR_RRB C1CMR_RRB\n+#define C1CMR_RRB_BIT 2\n+#define CAN1CMR_RRB_BIT C1CMR_RRB_BIT\n+#define C1CMR_CDO_MASK 0x8\n+#define CAN1CMR_CDO_MASK C1CMR_CDO_MASK\n+#define C1CMR_CDO 0x8\n+#define CAN1CMR_CDO C1CMR_CDO\n+#define C1CMR_CDO_BIT 3\n+#define CAN1CMR_CDO_BIT C1CMR_CDO_BIT\n+#define C1CMR_SRR_MASK 0x10\n+#define CAN1CMR_SRR_MASK C1CMR_SRR_MASK\n+#define C1CMR_SRR 0x10\n+#define CAN1CMR_SRR C1CMR_SRR\n+#define C1CMR_SRR_BIT 4\n+#define CAN1CMR_SRR_BIT C1CMR_SRR_BIT\n+#define C1CMR_STB1_MASK 0x20\n+#define CAN1CMR_STB1_MASK C1CMR_STB1_MASK\n+#define C1CMR_STB1 0x20\n+#define CAN1CMR_STB1 C1CMR_STB1\n+#define C1CMR_STB1_BIT 5\n+#define CAN1CMR_STB1_BIT C1CMR_STB1_BIT\n+#define C1CMR_STB2_MASK 0x40\n+#define CAN1CMR_STB2_MASK C1CMR_STB2_MASK\n+#define C1CMR_STB2 0x40\n+#define CAN1CMR_STB2 C1CMR_STB2\n+#define C1CMR_STB2_BIT 6\n+#define CAN1CMR_STB2_BIT C1CMR_STB2_BIT\n+#define C1CMR_STB3_MASK 0x80\n+#define CAN1CMR_STB3_MASK C1CMR_STB3_MASK\n+#define C1CMR_STB3 0x80\n+#define CAN1CMR_STB3 C1CMR_STB3\n+#define C1CMR_STB3_BIT 7\n+#define CAN1CMR_STB3_BIT C1CMR_STB3_BIT\n+\n+#define C1GSR (*(volatile unsigned long *)0xE0044008)\n+#define CAN1GSR C1GSR\n+#define C1GSR_OFFSET 0x8\n+#define CAN1GSR_OFFSET C1GSR_OFFSET\n+#define C1GSR_RBS_MASK 0x1\n+#define CAN1GSR_RBS_MASK C1GSR_RBS_MASK\n+#define C1GSR_RBS 0x1\n+#define CAN1GSR_RBS C1GSR_RBS\n+#define C1GSR_RBS_BIT 0\n+#define CAN1GSR_RBS_BIT C1GSR_RBS_BIT\n+#define C1GSR_DOS_MASK 0x2\n+#define CAN1GSR_DOS_MASK C1GSR_DOS_MASK\n+#define C1GSR_DOS 0x2\n+#define CAN1GSR_DOS C1GSR_DOS\n+#define C1GSR_DOS_BIT 1\n+#define CAN1GSR_DOS_BIT C1GSR_DOS_BIT\n+#define C1GSR_TBS_MASK 0x4\n+#define CAN1GSR_TBS_MASK C1GSR_TBS_MASK\n+#define C1GSR_TBS 0x4\n+#define CAN1GSR_TBS C1GSR_TBS\n+#define C1GSR_TBS_BIT 2\n+#define CAN1GSR_TBS_BIT C1GSR_TBS_BIT\n+#define C1GSR_TCS_MASK 0x8\n+#define CAN1GSR_TCS_MASK C1GSR_TCS_MASK\n+#define C1GSR_TCS 0x8\n+#define CAN1GSR_TCS C1GSR_TCS\n+#define C1GSR_TCS_BIT 3\n+#define CAN1GSR_TCS_BIT C1GSR_TCS_BIT\n+#define C1GSR_RS_MASK 0x10\n+#define CAN1GSR_RS_MASK C1GSR_RS_MASK\n+#define C1GSR_RS 0x10\n+#define CAN1GSR_RS C1GSR_RS\n+#define C1GSR_RS_BIT 4\n+#define CAN1GSR_RS_BIT C1GSR_RS_BIT\n+#define C1GSR_TS_MASK 0x20\n+#define CAN1GSR_TS_MASK C1GSR_TS_MASK\n+#define C1GSR_TS 0x20\n+#define CAN1GSR_TS C1GSR_TS\n+#define C1GSR_TS_BIT 5\n+#define CAN1GSR_TS_BIT C1GSR_TS_BIT\n+#define C1GSR_ES_MASK 0x40\n+#define CAN1GSR_ES_MASK C1GSR_ES_MASK\n+#define C1GSR_ES 0x40\n+#define CAN1GSR_ES C1GSR_ES\n+#define C1GSR_ES_BIT 6\n+#define CAN1GSR_ES_BIT C1GSR_ES_BIT\n+#define C1GSR_BS_MASK 0x80\n+#define CAN1GSR_BS_MASK C1GSR_BS_MASK\n+#define C1GSR_BS 0x80\n+#define CAN1GSR_BS C1GSR_BS\n+#define C1GSR_BS_BIT 7\n+#define CAN1GSR_BS_BIT C1GSR_BS_BIT\n+#define C1GSR_RXERR_MASK 0xFF0000\n+#define CAN1GSR_RXERR_MASK C1GSR_RXERR_MASK\n+#define C1GSR_RXERR_BIT 16\n+#define CAN1GSR_RXERR_BIT C1GSR_RXERR_BIT\n+#define C1GSR_TXERR_MASK 0xFF000000\n+#define CAN1GSR_TXERR_MASK C1GSR_TXERR_MASK\n+#define C1GSR_TXERR_BIT 24\n+#define CAN1GSR_TXERR_BIT C1GSR_TXERR_BIT\n+\n+#define C1ICR (*(volatile unsigned long *)0xE004400C)\n+#define CAN1ICR C1ICR\n+#define C1ICR_OFFSET 0xC\n+#define CAN1ICR_OFFSET C1ICR_OFFSET\n+#define C1ICR_RI_MASK 0x1\n+#define CAN1ICR_RI_MASK C1ICR_RI_MASK\n+#define C1ICR_RI 0x1\n+#define CAN1ICR_RI C1ICR_RI\n+#define C1ICR_RI_BIT 0\n+#define CAN1ICR_RI_BIT C1ICR_RI_BIT\n+#define C1ICR_TI1_MASK 0x2\n+#define CAN1ICR_TI1_MASK C1ICR_TI1_MASK\n+#define C1ICR_TI1 0x2\n+#define CAN1ICR_TI1 C1ICR_TI1\n+#define C1ICR_TI1_BIT 1\n+#define CAN1ICR_TI1_BIT C1ICR_TI1_BIT\n+#define C1ICR_EI_MASK 0x4\n+#define CAN1ICR_EI_MASK C1ICR_EI_MASK\n+#define C1ICR_EI 0x4\n+#define CAN1ICR_EI C1ICR_EI\n+#define C1ICR_EI_BIT 2\n+#define CAN1ICR_EI_BIT C1ICR_EI_BIT\n+#define C1ICR_DOI_MASK 0x8\n+#define CAN1ICR_DOI_MASK C1ICR_DOI_MASK\n+#define C1ICR_DOI 0x8\n+#define CAN1ICR_DOI C1ICR_DOI\n+#define C1ICR_DOI_BIT 3\n+#define CAN1ICR_DOI_BIT C1ICR_DOI_BIT\n+#define C1ICR_WUI_MASK 0x10\n+#define CAN1ICR_WUI_MASK C1ICR_WUI_MASK\n+#define C1ICR_WUI 0x10\n+#define CAN1ICR_WUI C1ICR_WUI\n+#define C1ICR_WUI_BIT 4\n+#define CAN1ICR_WUI_BIT C1ICR_WUI_BIT\n+#define C1ICR_EPI_MASK 0x20\n+#define CAN1ICR_EPI_MASK C1ICR_EPI_MASK\n+#define C1ICR_EPI 0x20\n+#define CAN1ICR_EPI C1ICR_EPI\n+#define C1ICR_EPI_BIT 5\n+#define CAN1ICR_EPI_BIT C1ICR_EPI_BIT\n+#define C1ICR_ALI_MASK 0x40\n+#define CAN1ICR_ALI_MASK C1ICR_ALI_MASK\n+#define C1ICR_ALI 0x40\n+#define CAN1ICR_ALI C1ICR_ALI\n+#define C1ICR_ALI_BIT 6\n+#define CAN1ICR_ALI_BIT C1ICR_ALI_BIT\n+#define C1ICR_BEI_MASK 0x80\n+#define CAN1ICR_BEI_MASK C1ICR_BEI_MASK\n+#define C1ICR_BEI 0x80\n+#define CAN1ICR_BEI C1ICR_BEI\n+#define C1ICR_BEI_BIT 7\n+#define CAN1ICR_BEI_BIT C1ICR_BEI_BIT\n+#define C1ICR_IDI_MASK 0x100\n+#define CAN1ICR_IDI_MASK C1ICR_IDI_MASK\n+#define C1ICR_IDI 0x100\n+#define CAN1ICR_IDI C1ICR_IDI\n+#define C1ICR_IDI_BIT 8\n+#define CAN1ICR_IDI_BIT C1ICR_IDI_BIT\n+#define C1ICR_TI2_MASK 0x200\n+#define CAN1ICR_TI2_MASK C1ICR_TI2_MASK\n+#define C1ICR_TI2 0x200\n+#define CAN1ICR_TI2 C1ICR_TI2\n+#define C1ICR_TI2_BIT 9\n+#define CAN1ICR_TI2_BIT C1ICR_TI2_BIT\n+#define C1ICR_TI3_MASK 0x400\n+#define CAN1ICR_TI3_MASK C1ICR_TI3_MASK\n+#define C1ICR_TI3 0x400\n+#define CAN1ICR_TI3 C1ICR_TI3\n+#define C1ICR_TI3_BIT 10\n+#define CAN1ICR_TI3_BIT C1ICR_TI3_BIT\n+#define C1ICR_ERRBIT_MASK 0x1F0000\n+#define CAN1ICR_ERRBIT_MASK C1ICR_ERRBIT_MASK\n+#define C1ICR_ERRBIT_BIT 16\n+#define CAN1ICR_ERRBIT_BIT C1ICR_ERRBIT_BIT\n+#define C1ICR_ERRDIR_MASK 0x200000\n+#define CAN1ICR_ERRDIR_MASK C1ICR_ERRDIR_MASK\n+#define C1ICR_ERRDIR 0x200000\n+#define CAN1ICR_ERRDIR C1ICR_ERRDIR\n+#define C1ICR_ERRDIR_BIT 21\n+#define CAN1ICR_ERRDIR_BIT C1ICR_ERRDIR_BIT\n+#define C1ICR_ERRC_MASK 0xC00000\n+#define CAN1ICR_ERRC_MASK C1ICR_ERRC_MASK\n+#define C1ICR_ERRC_BIT 22\n+#define CAN1ICR_ERRC_BIT C1ICR_ERRC_BIT\n+#define C1ICR_ALCBIT_MASK 0x1F000000\n+#define CAN1ICR_ALCBIT_MASK C1ICR_ALCBIT_MASK\n+#define C1ICR_ALCBIT_BIT 24\n+#define CAN1ICR_ALCBIT_BIT C1ICR_ALCBIT_BIT\n+\n+#define C1IER (*(volatile unsigned long *)0xE0044010)\n+#define CAN1IER C1IER\n+#define C1IER_OFFSET 0x10\n+#define CAN1IER_OFFSET C1IER_OFFSET\n+#define C1IER_RIE_MASK 0x1\n+#define CAN1IER_RIE_MASK C1IER_RIE_MASK\n+#define C1IER_RIE 0x1\n+#define CAN1IER_RIE C1IER_RIE\n+#define C1IER_RIE_BIT 0\n+#define CAN1IER_RIE_BIT C1IER_RIE_BIT\n+#define C1IER_TIE1_MASK 0x2\n+#define CAN1IER_TIE1_MASK C1IER_TIE1_MASK\n+#define C1IER_TIE1 0x2\n+#define CAN1IER_TIE1 C1IER_TIE1\n+#define C1IER_TIE1_BIT 1\n+#define CAN1IER_TIE1_BIT C1IER_TIE1_BIT\n+#define C1IER_EIE_MASK 0x4\n+#define CAN1IER_EIE_MASK C1IER_EIE_MASK\n+#define C1IER_EIE 0x4\n+#define CAN1IER_EIE C1IER_EIE\n+#define C1IER_EIE_BIT 2\n+#define CAN1IER_EIE_BIT C1IER_EIE_BIT\n+#define C1IER_DOIE_MASK 0x8\n+#define CAN1IER_DOIE_MASK C1IER_DOIE_MASK\n+#define C1IER_DOIE 0x8\n+#define CAN1IER_DOIE C1IER_DOIE\n+#define C1IER_DOIE_BIT 3\n+#define CAN1IER_DOIE_BIT C1IER_DOIE_BIT\n+#define C1IER_WUIE_MASK 0x10\n+#define CAN1IER_WUIE_MASK C1IER_WUIE_MASK\n+#define C1IER_WUIE 0x10\n+#define CAN1IER_WUIE C1IER_WUIE\n+#define C1IER_WUIE_BIT 4\n+#define CAN1IER_WUIE_BIT C1IER_WUIE_BIT\n+#define C1IER_EPIE_MASK 0x20\n+#define CAN1IER_EPIE_MASK C1IER_EPIE_MASK\n+#define C1IER_EPIE 0x20\n+#define CAN1IER_EPIE C1IER_EPIE\n+#define C1IER_EPIE_BIT 5\n+#define CAN1IER_EPIE_BIT C1IER_EPIE_BIT\n+#define C1IER_ALIE_MASK 0x40\n+#define CAN1IER_ALIE_MASK C1IER_ALIE_MASK\n+#define C1IER_ALIE 0x40\n+#define CAN1IER_ALIE C1IER_ALIE\n+#define C1IER_ALIE_BIT 6\n+#define CAN1IER_ALIE_BIT C1IER_ALIE_BIT\n+#define C1IER_BEIE_MASK 0x80\n+#define CAN1IER_BEIE_MASK C1IER_BEIE_MASK\n+#define C1IER_BEIE 0x80\n+#define CAN1IER_BEIE C1IER_BEIE\n+#define C1IER_BEIE_BIT 7\n+#define CAN1IER_BEIE_BIT C1IER_BEIE_BIT\n+#define C1IER_IDIE_MASK 0x100\n+#define CAN1IER_IDIE_MASK C1IER_IDIE_MASK\n+#define C1IER_IDIE 0x100\n+#define CAN1IER_IDIE C1IER_IDIE\n+#define C1IER_IDIE_BIT 8\n+#define CAN1IER_IDIE_BIT C1IER_IDIE_BIT\n+#define C1IER_TIE2_MASK 0x200\n+#define CAN1IER_TIE2_MASK C1IER_TIE2_MASK\n+#define C1IER_TIE2 0x200\n+#define CAN1IER_TIE2 C1IER_TIE2\n+#define C1IER_TIE2_BIT 9\n+#define CAN1IER_TIE2_BIT C1IER_TIE2_BIT\n+#define C1IER_TIE3_MASK 0x400\n+#define CAN1IER_TIE3_MASK C1IER_TIE3_MASK\n+#define C1IER_TIE3 0x400\n+#define CAN1IER_TIE3 C1IER_TIE3\n+#define C1IER_TIE3_BIT 10\n+#define CAN1IER_TIE3_BIT C1IER_TIE3_BIT\n+\n+#define C1BTR (*(volatile unsigned long *)0xE0044014)\n+#define CAN1BTR C1BTR\n+#define C1BTR_OFFSET 0x14\n+#define CAN1BTR_OFFSET C1BTR_OFFSET\n+#define C1BTR_BRP_MASK 0x3FF\n+#define CAN1BTR_BRP_MASK C1BTR_BRP_MASK\n+#define C1BTR_BRP_BIT 0\n+#define CAN1BTR_BRP_BIT C1BTR_BRP_BIT\n+#define C1BTR_SJW_MASK 0xC000\n+#define CAN1BTR_SJW_MASK C1BTR_SJW_MASK\n+#define C1BTR_SJW_BIT 14\n+#define CAN1BTR_SJW_BIT C1BTR_SJW_BIT\n+#define C1BTR_TSEG1_MASK 0xF0000\n+#define CAN1BTR_TSEG1_MASK C1BTR_TSEG1_MASK\n+#define C1BTR_TSEG1_BIT 16\n+#define CAN1BTR_TSEG1_BIT C1BTR_TSEG1_BIT\n+#define C1BTR_TSEG2_MASK 0x700000\n+#define CAN1BTR_TSEG2_MASK C1BTR_TSEG2_MASK\n+#define C1BTR_TSEG2_BIT 20\n+#define CAN1BTR_TSEG2_BIT C1BTR_TSEG2_BIT\n+#define C1BTR_SAM_MASK 0x800000\n+#define CAN1BTR_SAM_MASK C1BTR_SAM_MASK\n+#define C1BTR_SAM 0x800000\n+#define CAN1BTR_SAM C1BTR_SAM\n+#define C1BTR_SAM_BIT 23\n+#define CAN1BTR_SAM_BIT C1BTR_SAM_BIT\n+\n+#define C1EWL (*(volatile unsigned long *)0xE0044018)\n+#define CAN1EWL C1EWL\n+#define C1EWL_OFFSET 0x18\n+#define CAN1EWL_OFFSET C1EWL_OFFSET\n+#define C1EWL_EWL_MASK 0xFF\n+#define CAN1EWL_EWL_MASK C1EWL_EWL_MASK\n+#define C1EWL_EWL_BIT 0\n+#define CAN1EWL_EWL_BIT C1EWL_EWL_BIT\n+\n+#define C1SR (*(volatile unsigned long *)0xE004401C)\n+#define CAN1SR C1SR\n+#define C1SR_OFFSET 0x1C\n+#define CAN1SR_OFFSET C1SR_OFFSET\n+#define C1SR_RBS_MASK 0x1\n+#define CAN1SR_RBS_MASK C1SR_RBS_MASK\n+#define C1SR_RBS 0x1\n+#define CAN1SR_RBS C1SR_RBS\n+#define C1SR_RBS_BIT 0\n+#define CAN1SR_RBS_BIT C1SR_RBS_BIT\n+#define C1SR_DOS_MASK 0x2\n+#define CAN1SR_DOS_MASK C1SR_DOS_MASK\n+#define C1SR_DOS 0x2\n+#define CAN1SR_DOS C1SR_DOS\n+#define C1SR_DOS_BIT 1\n+#define CAN1SR_DOS_BIT C1SR_DOS_BIT\n+#define C1SR_TBS1_MASK 0x4\n+#define CAN1SR_TBS1_MASK C1SR_TBS1_MASK\n+#define C1SR_TBS1 0x4\n+#define CAN1SR_TBS1 C1SR_TBS1\n+#define C1SR_TBS1_BIT 2\n+#define CAN1SR_TBS1_BIT C1SR_TBS1_BIT\n+#define C1SR_TCS1_MASK 0x8\n+#define CAN1SR_TCS1_MASK C1SR_TCS1_MASK\n+#define C1SR_TCS1 0x8\n+#define CAN1SR_TCS1 C1SR_TCS1\n+#define C1SR_TCS1_BIT 3\n+#define CAN1SR_TCS1_BIT C1SR_TCS1_BIT\n+#define C1SR_RS_MASK 0x10\n+#define CAN1SR_RS_MASK C1SR_RS_MASK\n+#define C1SR_RS 0x10\n+#define CAN1SR_RS C1SR_RS\n+#define C1SR_RS_BIT 4\n+#define CAN1SR_RS_BIT C1SR_RS_BIT\n+#define C1SR_TS1_MASK 0x20\n+#define CAN1SR_TS1_MASK C1SR_TS1_MASK\n+#define C1SR_TS1 0x20\n+#define CAN1SR_TS1 C1SR_TS1\n+#define C1SR_TS1_BIT 5\n+#define CAN1SR_TS1_BIT C1SR_TS1_BIT\n+#define C1SR_ES_MASK 0x40\n+#define CAN1SR_ES_MASK C1SR_ES_MASK\n+#define C1SR_ES 0x40\n+#define CAN1SR_ES C1SR_ES\n+#define C1SR_ES_BIT 6\n+#define CAN1SR_ES_BIT C1SR_ES_BIT\n+#define C1SR_BS_MASK 0x80\n+#define CAN1SR_BS_MASK C1SR_BS_MASK\n+#define C1SR_BS 0x80\n+#define CAN1SR_BS C1SR_BS\n+#define C1SR_BS_BIT 7\n+#define CAN1SR_BS_BIT C1SR_BS_BIT\n+#define C1SR_RBS2_MASK 0x100\n+#define CAN1SR_RBS2_MASK C1SR_RBS2_MASK\n+#define C1SR_RBS2 0x100\n+#define CAN1SR_RBS2 C1SR_RBS2\n+#define C1SR_RBS2_BIT 8\n+#define CAN1SR_RBS2_BIT C1SR_RBS2_BIT\n+#define C1SR_DOS2_MASK 0x200\n+#define CAN1SR_DOS2_MASK C1SR_DOS2_MASK\n+#define C1SR_DOS2 0x200\n+#define CAN1SR_DOS2 C1SR_DOS2\n+#define C1SR_DOS2_BIT 9\n+#define CAN1SR_DOS2_BIT C1SR_DOS2_BIT\n+#define C1SR_TBS2_MASK 0x400\n+#define CAN1SR_TBS2_MASK C1SR_TBS2_MASK\n+#define C1SR_TBS2 0x400\n+#define CAN1SR_TBS2 C1SR_TBS2\n+#define C1SR_TBS2_BIT 10\n+#define CAN1SR_TBS2_BIT C1SR_TBS2_BIT\n+#define C1SR_TCS2_MASK 0x800\n+#define CAN1SR_TCS2_MASK C1SR_TCS2_MASK\n+#define C1SR_TCS2 0x800\n+#define CAN1SR_TCS2 C1SR_TCS2\n+#define C1SR_TCS2_BIT 11\n+#define CAN1SR_TCS2_BIT C1SR_TCS2_BIT\n+#define C1SR_RS2_MASK 0x1000\n+#define CAN1SR_RS2_MASK C1SR_RS2_MASK\n+#define C1SR_RS2 0x1000\n+#define CAN1SR_RS2 C1SR_RS2\n+#define C1SR_RS2_BIT 12\n+#define CAN1SR_RS2_BIT C1SR_RS2_BIT\n+#define C1SR_TS2_MASK 0x2000\n+#define CAN1SR_TS2_MASK C1SR_TS2_MASK\n+#define C1SR_TS2 0x2000\n+#define CAN1SR_TS2 C1SR_TS2\n+#define C1SR_TS2_BIT 13\n+#define CAN1SR_TS2_BIT C1SR_TS2_BIT\n+#define C1SR_ES2_MASK 0x4000\n+#define CAN1SR_ES2_MASK C1SR_ES2_MASK\n+#define C1SR_ES2 0x4000\n+#define CAN1SR_ES2 C1SR_ES2\n+#define C1SR_ES2_BIT 14\n+#define CAN1SR_ES2_BIT C1SR_ES2_BIT\n+#define C1SR_BS2_MASK 0x8000\n+#define CAN1SR_BS2_MASK C1SR_BS2_MASK\n+#define C1SR_BS2 0x8000\n+#define CAN1SR_BS2 C1SR_BS2\n+#define C1SR_BS2_BIT 15\n+#define CAN1SR_BS2_BIT C1SR_BS2_BIT\n+#define C1SR_RBS3_MASK 0x10000\n+#define CAN1SR_RBS3_MASK C1SR_RBS3_MASK\n+#define C1SR_RBS3 0x10000\n+#define CAN1SR_RBS3 C1SR_RBS3\n+#define C1SR_RBS3_BIT 16\n+#define CAN1SR_RBS3_BIT C1SR_RBS3_BIT\n+#define C1SR_DOS3_MASK 0x20000\n+#define CAN1SR_DOS3_MASK C1SR_DOS3_MASK\n+#define C1SR_DOS3 0x20000\n+#define CAN1SR_DOS3 C1SR_DOS3\n+#define C1SR_DOS3_BIT 17\n+#define CAN1SR_DOS3_BIT C1SR_DOS3_BIT\n+#define C1SR_TBS3_MASK 0x40000\n+#define CAN1SR_TBS3_MASK C1SR_TBS3_MASK\n+#define C1SR_TBS3 0x40000\n+#define CAN1SR_TBS3 C1SR_TBS3\n+#define C1SR_TBS3_BIT 18\n+#define CAN1SR_TBS3_BIT C1SR_TBS3_BIT\n+#define C1SR_TCS3_MASK 0x80000\n+#define CAN1SR_TCS3_MASK C1SR_TCS3_MASK\n+#define C1SR_TCS3 0x80000\n+#define CAN1SR_TCS3 C1SR_TCS3\n+#define C1SR_TCS3_BIT 19\n+#define CAN1SR_TCS3_BIT C1SR_TCS3_BIT\n+#define C1SR_RS3_MASK 0x100000\n+#define CAN1SR_RS3_MASK C1SR_RS3_MASK\n+#define C1SR_RS3 0x100000\n+#define CAN1SR_RS3 C1SR_RS3\n+#define C1SR_RS3_BIT 20\n+#define CAN1SR_RS3_BIT C1SR_RS3_BIT\n+#define C1SR_TS3_MASK 0x200000\n+#define CAN1SR_TS3_MASK C1SR_TS3_MASK\n+#define C1SR_TS3 0x200000\n+#define CAN1SR_TS3 C1SR_TS3\n+#define C1SR_TS3_BIT 21\n+#define CAN1SR_TS3_BIT C1SR_TS3_BIT\n+#define C1SR_ES3_MASK 0x400000\n+#define CAN1SR_ES3_MASK C1SR_ES3_MASK\n+#define C1SR_ES3 0x400000\n+#define CAN1SR_ES3 C1SR_ES3\n+#define C1SR_ES3_BIT 22\n+#define CAN1SR_ES3_BIT C1SR_ES3_BIT\n+#define C1SR_BS3_MASK 0x800000\n+#define CAN1SR_BS3_MASK C1SR_BS3_MASK\n+#define C1SR_BS3 0x800000\n+#define CAN1SR_BS3 C1SR_BS3\n+#define C1SR_BS3_BIT 23\n+#define CAN1SR_BS3_BIT C1SR_BS3_BIT\n+\n+#define C1RFS (*(volatile unsigned long *)0xE0044020)\n+#define CAN1RFS C1RFS\n+#define C1RFS_OFFSET 0x20\n+#define CAN1RFS_OFFSET C1RFS_OFFSET\n+#define C1RFS_ID_Index_MASK 0x3FF\n+#define CAN1RFS_ID_Index_MASK C1RFS_ID_Index_MASK\n+#define C1RFS_ID_Index_BIT 0\n+#define CAN1RFS_ID_Index_BIT C1RFS_ID_Index_BIT\n+#define C1RFS_BP_MASK 0x400\n+#define CAN1RFS_BP_MASK C1RFS_BP_MASK\n+#define C1RFS_BP 0x400\n+#define CAN1RFS_BP C1RFS_BP\n+#define C1RFS_BP_BIT 10\n+#define CAN1RFS_BP_BIT C1RFS_BP_BIT\n+#define C1RFS_DLC_MASK 0xF0000\n+#define CAN1RFS_DLC_MASK C1RFS_DLC_MASK\n+#define C1RFS_DLC_BIT 16\n+#define CAN1RFS_DLC_BIT C1RFS_DLC_BIT\n+#define C1RFS_RTR_MASK 0x40000000\n+#define CAN1RFS_RTR_MASK C1RFS_RTR_MASK\n+#define C1RFS_RTR 0x40000000\n+#define CAN1RFS_RTR C1RFS_RTR\n+#define C1RFS_RTR_BIT 30\n+#define CAN1RFS_RTR_BIT C1RFS_RTR_BIT\n+#define C1RFS_FF_MASK 0x80000000\n+#define CAN1RFS_FF_MASK C1RFS_FF_MASK\n+#define C1RFS_FF 0x80000000\n+#define CAN1RFS_FF C1RFS_FF\n+#define C1RFS_FF_BIT 31\n+#define CAN1RFS_FF_BIT C1RFS_FF_BIT\n+\n+#define C1RID (*(volatile unsigned long *)0xE0044024)\n+#define CAN1RID C1RID\n+#define C1RID_OFFSET 0x24\n+#define CAN1RID_OFFSET C1RID_OFFSET\n+#define C1RID_ID_MASK 0x7FF\n+#define CAN1RID_ID_MASK C1RID_ID_MASK\n+#define C1RID_ID_BIT 0\n+#define CAN1RID_ID_BIT C1RID_ID_BIT\n+\n+#define C1RDA (*(volatile unsigned long *)0xE0044028)\n+#define CAN1RDA C1RDA\n+#define C1RDA_OFFSET 0x28\n+#define CAN1RDA_OFFSET C1RDA_OFFSET\n+#define C1RDA_Data_1_MASK 0xFF\n+#define CAN1RDA_Data_1_MASK C1RDA_Data_1_MASK\n+#define C1RDA_Data_1_BIT 0\n+#define CAN1RDA_Data_1_BIT C1RDA_Data_1_BIT\n+#define C1RDA_Data_2_MASK 0xFF00\n+#define CAN1RDA_Data_2_MASK C1RDA_Data_2_MASK\n+#define C1RDA_Data_2_BIT 8\n+#define CAN1RDA_Data_2_BIT C1RDA_Data_2_BIT\n+#define C1RDA_Data_3_MASK 0xFF0000\n+#define CAN1RDA_Data_3_MASK C1RDA_Data_3_MASK\n+#define C1RDA_Data_3_BIT 16\n+#define CAN1RDA_Data_3_BIT C1RDA_Data_3_BIT\n+#define C1RDA_Data_4_MASK 0xFF000000\n+#define CAN1RDA_Data_4_MASK C1RDA_Data_4_MASK\n+#define C1RDA_Data_4_BIT 24\n+#define CAN1RDA_Data_4_BIT C1RDA_Data_4_BIT\n+\n+#define C1RDB (*(volatile unsigned long *)0xE004402C)\n+#define CAN1RDB C1RDB\n+#define C1RDB_OFFSET 0x2C\n+#define CAN1RDB_OFFSET C1RDB_OFFSET\n+#define C1RDB_Data_5_MASK 0xFF\n+#define CAN1RDB_Data_5_MASK C1RDB_Data_5_MASK\n+#define C1RDB_Data_5_BIT 0\n+#define CAN1RDB_Data_5_BIT C1RDB_Data_5_BIT\n+#define C1RDB_Data_6_MASK 0xFF00\n+#define CAN1RDB_Data_6_MASK C1RDB_Data_6_MASK\n+#define C1RDB_Data_6_BIT 8\n+#define CAN1RDB_Data_6_BIT C1RDB_Data_6_BIT\n+#define C1RDB_Data_7_MASK 0xFF0000\n+#define CAN1RDB_Data_7_MASK C1RDB_Data_7_MASK\n+#define C1RDB_Data_7_BIT 16\n+#define CAN1RDB_Data_7_BIT C1RDB_Data_7_BIT\n+#define C1RDB_Data_8_MASK 0xFF000000\n+#define CAN1RDB_Data_8_MASK C1RDB_Data_8_MASK\n+#define C1RDB_Data_8_BIT 24\n+#define CAN1RDB_Data_8_BIT C1RDB_Data_8_BIT\n+\n+#define C1TFI1 (*(volatile unsigned long *)0xE0044030)\n+#define CAN1TFI1 C1TFI1\n+#define C1TFI1_OFFSET 0x30\n+#define CAN1TFI1_OFFSET C1TFI1_OFFSET\n+#define C1TFI1_PRIO_MASK 0xFF\n+#define CAN1TFI1_PRIO_MASK C1TFI1_PRIO_MASK\n+#define C1TFI1_PRIO_BIT 0\n+#define CAN1TFI1_PRIO_BIT C1TFI1_PRIO_BIT\n+#define C1TFI1_DLC_MASK 0xF0000\n+#define CAN1TFI1_DLC_MASK C1TFI1_DLC_MASK\n+#define C1TFI1_DLC_BIT 16\n+#define CAN1TFI1_DLC_BIT C1TFI1_DLC_BIT\n+#define C1TFI1_RTR_MASK 0x40000000\n+#define CAN1TFI1_RTR_MASK C1TFI1_RTR_MASK\n+#define C1TFI1_RTR 0x40000000\n+#define CAN1TFI1_RTR C1TFI1_RTR\n+#define C1TFI1_RTR_BIT 30\n+#define CAN1TFI1_RTR_BIT C1TFI1_RTR_BIT\n+#define C1TFI1_FF_MASK 0x80000000\n+#define CAN1TFI1_FF_MASK C1TFI1_FF_MASK\n+#define C1TFI1_FF 0x80000000\n+#define CAN1TFI1_FF C1TFI1_FF\n+#define C1TFI1_FF_BIT 31\n+#define CAN1TFI1_FF_BIT C1TFI1_FF_BIT\n+\n+#define C1TID1 (*(volatile unsigned long *)0xE0044034)\n+#define CAN1TID1 C1TID1\n+#define C1TID1_OFFSET 0x34\n+#define CAN1TID1_OFFSET C1TID1_OFFSET\n+#define C1TID1_ID_MASK 0x7FF\n+#define CAN1TID1_ID_MASK C1TID1_ID_MASK\n+#define C1TID1_ID_BIT 0\n+#define CAN1TID1_ID_BIT C1TID1_ID_BIT\n+\n+#define C1TDA1 (*(volatile unsigned long *)0xE0044038)\n+#define CAN1TDA1 C1TDA1\n+#define C1TDA1_OFFSET 0x38\n+#define CAN1TDA1_OFFSET C1TDA1_OFFSET\n+#define C1TDA1_Data_1_MASK 0xFF\n+#define CAN1TDA1_Data_1_MASK C1TDA1_Data_1_MASK\n+#define C1TDA1_Data_1_BIT 0\n+#define CAN1TDA1_Data_1_BIT C1TDA1_Data_1_BIT\n+#define C1TDA1_Data_2_MASK 0xFF00\n+#define CAN1TDA1_Data_2_MASK C1TDA1_Data_2_MASK\n+#define C1TDA1_Data_2_BIT 8\n+#define CAN1TDA1_Data_2_BIT C1TDA1_Data_2_BIT\n+#define C1TDA1_Data_3_MASK 0xFF0000\n+#define CAN1TDA1_Data_3_MASK C1TDA1_Data_3_MASK\n+#define C1TDA1_Data_3_BIT 16\n+#define CAN1TDA1_Data_3_BIT C1TDA1_Data_3_BIT\n+#define C1TDA1_Data_4_MASK 0xFF000000\n+#define CAN1TDA1_Data_4_MASK C1TDA1_Data_4_MASK\n+#define C1TDA1_Data_4_BIT 24\n+#define CAN1TDA1_Data_4_BIT C1TDA1_Data_4_BIT\n+\n+#define C1TDB1 (*(volatile unsigned long *)0xE004403C)\n+#define CAN1TDB1 C1TDB1\n+#define C1TDB1_OFFSET 0x3C\n+#define CAN1TDB1_OFFSET C1TDB1_OFFSET\n+#define C1TDB1_Data_5_MASK 0xFF\n+#define CAN1TDB1_Data_5_MASK C1TDB1_Data_5_MASK\n+#define C1TDB1_Data_5_BIT 0\n+#define CAN1TDB1_Data_5_BIT C1TDB1_Data_5_BIT\n+#define C1TDB1_Data_6_MASK 0xFF00\n+#define CAN1TDB1_Data_6_MASK C1TDB1_Data_6_MASK\n+#define C1TDB1_Data_6_BIT 8\n+#define CAN1TDB1_Data_6_BIT C1TDB1_Data_6_BIT\n+#define C1TDB1_Data_7_MASK 0xFF0000\n+#define CAN1TDB1_Data_7_MASK C1TDB1_Data_7_MASK\n+#define C1TDB1_Data_7_BIT 16\n+#define CAN1TDB1_Data_7_BIT C1TDB1_Data_7_BIT\n+#define C1TDB1_Data_8_MASK 0xFF000000\n+#define CAN1TDB1_Data_8_MASK C1TDB1_Data_8_MASK\n+#define C1TDB1_Data_8_BIT 24\n+#define CAN1TDB1_Data_8_BIT C1TDB1_Data_8_BIT\n+\n+#define C1TFI2 (*(volatile unsigned long *)0xE0044040)\n+#define CAN1TFI2 C1TFI2\n+#define C1TFI2_OFFSET 0x40\n+#define CAN1TFI2_OFFSET C1TFI2_OFFSET\n+#define C1TFI2_PRIO_MASK 0xFF\n+#define CAN1TFI2_PRIO_MASK C1TFI2_PRIO_MASK\n+#define C1TFI2_PRIO_BIT 0\n+#define CAN1TFI2_PRIO_BIT C1TFI2_PRIO_BIT\n+#define C1TFI2_DLC_MASK 0xF0000\n+#define CAN1TFI2_DLC_MASK C1TFI2_DLC_MASK\n+#define C1TFI2_DLC_BIT 16\n+#define CAN1TFI2_DLC_BIT C1TFI2_DLC_BIT\n+#define C1TFI2_RTR_MASK 0x40000000\n+#define CAN1TFI2_RTR_MASK C1TFI2_RTR_MASK\n+#define C1TFI2_RTR 0x40000000\n+#define CAN1TFI2_RTR C1TFI2_RTR\n+#define C1TFI2_RTR_BIT 30\n+#define CAN1TFI2_RTR_BIT C1TFI2_RTR_BIT\n+#define C1TFI2_FF_MASK 0x80000000\n+#define CAN1TFI2_FF_MASK C1TFI2_FF_MASK\n+#define C1TFI2_FF 0x80000000\n+#define CAN1TFI2_FF C1TFI2_FF\n+#define C1TFI2_FF_BIT 31\n+#define CAN1TFI2_FF_BIT C1TFI2_FF_BIT\n+\n+#define C1TID2 (*(volatile unsigned long *)0xE0044044)\n+#define CAN1TID2 C1TID2\n+#define C1TID2_OFFSET 0x44\n+#define CAN1TID2_OFFSET C1TID2_OFFSET\n+#define C1TID2_ID_MASK 0x7FF\n+#define CAN1TID2_ID_MASK C1TID2_ID_MASK\n+#define C1TID2_ID_BIT 0\n+#define CAN1TID2_ID_BIT C1TID2_ID_BIT\n+\n+#define C1TDA2 (*(volatile unsigned long *)0xE0044048)\n+#define CAN1TDA2 C1TDA2\n+#define C1TDA2_OFFSET 0x48\n+#define CAN1TDA2_OFFSET C1TDA2_OFFSET\n+#define C1TDA2_Data_1_MASK 0xFF\n+#define CAN1TDA2_Data_1_MASK C1TDA2_Data_1_MASK\n+#define C1TDA2_Data_1_BIT 0\n+#define CAN1TDA2_Data_1_BIT C1TDA2_Data_1_BIT\n+#define C1TDA2_Data_2_MASK 0xFF00\n+#define CAN1TDA2_Data_2_MASK C1TDA2_Data_2_MASK\n+#define C1TDA2_Data_2_BIT 8\n+#define CAN1TDA2_Data_2_BIT C1TDA2_Data_2_BIT\n+#define C1TDA2_Data_3_MASK 0xFF0000\n+#define CAN1TDA2_Data_3_MASK C1TDA2_Data_3_MASK\n+#define C1TDA2_Data_3_BIT 16\n+#define CAN1TDA2_Data_3_BIT C1TDA2_Data_3_BIT\n+#define C1TDA2_Data_4_MASK 0xFF000000\n+#define CAN1TDA2_Data_4_MASK C1TDA2_Data_4_MASK\n+#define C1TDA2_Data_4_BIT 24\n+#define CAN1TDA2_Data_4_BIT C1TDA2_Data_4_BIT\n+\n+#define C1TDB2 (*(volatile unsigned long *)0xE004404C)\n+#define CAN1TDB2 C1TDB2\n+#define C1TDB2_OFFSET 0x4C\n+#define CAN1TDB2_OFFSET C1TDB2_OFFSET\n+#define C1TDB2_Data_5_MASK 0xFF\n+#define CAN1TDB2_Data_5_MASK C1TDB2_Data_5_MASK\n+#define C1TDB2_Data_5_BIT 0\n+#define CAN1TDB2_Data_5_BIT C1TDB2_Data_5_BIT\n+#define C1TDB2_Data_6_MASK 0xFF00\n+#define CAN1TDB2_Data_6_MASK C1TDB2_Data_6_MASK\n+#define C1TDB2_Data_6_BIT 8\n+#define CAN1TDB2_Data_6_BIT C1TDB2_Data_6_BIT\n+#define C1TDB2_Data_7_MASK 0xFF0000\n+#define CAN1TDB2_Data_7_MASK C1TDB2_Data_7_MASK\n+#define C1TDB2_Data_7_BIT 16\n+#define CAN1TDB2_Data_7_BIT C1TDB2_Data_7_BIT\n+#define C1TDB2_Data_8_MASK 0xFF000000\n+#define CAN1TDB2_Data_8_MASK C1TDB2_Data_8_MASK\n+#define C1TDB2_Data_8_BIT 24\n+#define CAN1TDB2_Data_8_BIT C1TDB2_Data_8_BIT\n+\n+#define C1TFI3 (*(volatile unsigned long *)0xE0044050)\n+#define CAN1TFI3 C1TFI3\n+#define C1TFI3_OFFSET 0x50\n+#define CAN1TFI3_OFFSET C1TFI3_OFFSET\n+#define C1TFI3_PRIO_MASK 0xFF\n+#define CAN1TFI3_PRIO_MASK C1TFI3_PRIO_MASK\n+#define C1TFI3_PRIO_BIT 0\n+#define CAN1TFI3_PRIO_BIT C1TFI3_PRIO_BIT\n+#define C1TFI3_DLC_MASK 0xF0000\n+#define CAN1TFI3_DLC_MASK C1TFI3_DLC_MASK\n+#define C1TFI3_DLC_BIT 16\n+#define CAN1TFI3_DLC_BIT C1TFI3_DLC_BIT\n+#define C1TFI3_RTR_MASK 0x40000000\n+#define CAN1TFI3_RTR_MASK C1TFI3_RTR_MASK\n+#define C1TFI3_RTR 0x40000000\n+#define CAN1TFI3_RTR C1TFI3_RTR\n+#define C1TFI3_RTR_BIT 30\n+#define CAN1TFI3_RTR_BIT C1TFI3_RTR_BIT\n+#define C1TFI3_FF_MASK 0x80000000\n+#define CAN1TFI3_FF_MASK C1TFI3_FF_MASK\n+#define C1TFI3_FF 0x80000000\n+#define CAN1TFI3_FF C1TFI3_FF\n+#define C1TFI3_FF_BIT 31\n+#define CAN1TFI3_FF_BIT C1TFI3_FF_BIT\n+\n+#define C1TID3 (*(volatile unsigned long *)0xE0044054)\n+#define CAN1TID3 C1TID3\n+#define C1TID3_OFFSET 0x54\n+#define CAN1TID3_OFFSET C1TID3_OFFSET\n+#define C1TID3_ID_MASK 0x7FF\n+#define CAN1TID3_ID_MASK C1TID3_ID_MASK\n+#define C1TID3_ID_BIT 0\n+#define CAN1TID3_ID_BIT C1TID3_ID_BIT\n+\n+#define C1TDA3 (*(volatile unsigned long *)0xE0044058)\n+#define CAN1TDA3 C1TDA3\n+#define C1TDA3_OFFSET 0x58\n+#define CAN1TDA3_OFFSET C1TDA3_OFFSET\n+#define C1TDA3_Data_1_MASK 0xFF\n+#define CAN1TDA3_Data_1_MASK C1TDA3_Data_1_MASK\n+#define C1TDA3_Data_1_BIT 0\n+#define CAN1TDA3_Data_1_BIT C1TDA3_Data_1_BIT\n+#define C1TDA3_Data_2_MASK 0xFF00\n+#define CAN1TDA3_Data_2_MASK C1TDA3_Data_2_MASK\n+#define C1TDA3_Data_2_BIT 8\n+#define CAN1TDA3_Data_2_BIT C1TDA3_Data_2_BIT\n+#define C1TDA3_Data_3_MASK 0xFF0000\n+#define CAN1TDA3_Data_3_MASK C1TDA3_Data_3_MASK\n+#define C1TDA3_Data_3_BIT 16\n+#define CAN1TDA3_Data_3_BIT C1TDA3_Data_3_BIT\n+#define C1TDA3_Data_4_MASK 0xFF000000\n+#define CAN1TDA3_Data_4_MASK C1TDA3_Data_4_MASK\n+#define C1TDA3_Data_4_BIT 24\n+#define CAN1TDA3_Data_4_BIT C1TDA3_Data_4_BIT\n+\n+#define C1TDB3 (*(volatile unsigned long *)0xE004405C)\n+#define CAN1TDB3 C1TDB3\n+#define C1TDB3_OFFSET 0x5C\n+#define CAN1TDB3_OFFSET C1TDB3_OFFSET\n+#define C1TDB3_Data_5_MASK 0xFF\n+#define CAN1TDB3_Data_5_MASK C1TDB3_Data_5_MASK\n+#define C1TDB3_Data_5_BIT 0\n+#define CAN1TDB3_Data_5_BIT C1TDB3_Data_5_BIT\n+#define C1TDB3_Data_6_MASK 0xFF00\n+#define CAN1TDB3_Data_6_MASK C1TDB3_Data_6_MASK\n+#define C1TDB3_Data_6_BIT 8\n+#define CAN1TDB3_Data_6_BIT C1TDB3_Data_6_BIT\n+#define C1TDB3_Data_7_MASK 0xFF0000\n+#define CAN1TDB3_Data_7_MASK C1TDB3_Data_7_MASK\n+#define C1TDB3_Data_7_BIT 16\n+#define CAN1TDB3_Data_7_BIT C1TDB3_Data_7_BIT\n+#define C1TDB3_Data_8_MASK 0xFF000000\n+#define CAN1TDB3_Data_8_MASK C1TDB3_Data_8_MASK\n+#define C1TDB3_Data_8_BIT 24\n+#define CAN1TDB3_Data_8_BIT C1TDB3_Data_8_BIT\n+\n+#define CAN2_BASE 0xE0048000\n+\n+#define C2MOD (*(volatile unsigned long *)0xE0048000)\n+#define CAN2MOD C2MOD\n+#define C2MOD_OFFSET 0x0\n+#define CAN2MOD_OFFSET C2MOD_OFFSET\n+#define C2MOD_RM_MASK 0x1\n+#define CAN2MOD_RM_MASK C2MOD_RM_MASK\n+#define C2MOD_RM 0x1\n+#define CAN2MOD_RM C2MOD_RM\n+#define C2MOD_RM_BIT 0\n+#define CAN2MOD_RM_BIT C2MOD_RM_BIT\n+#define C2MOD_LOM_MASK 0x2\n+#define CAN2MOD_LOM_MASK C2MOD_LOM_MASK\n+#define C2MOD_LOM 0x2\n+#define CAN2MOD_LOM C2MOD_LOM\n+#define C2MOD_LOM_BIT 1\n+#define CAN2MOD_LOM_BIT C2MOD_LOM_BIT\n+#define C2MOD_STM_MASK 0x4\n+#define CAN2MOD_STM_MASK C2MOD_STM_MASK\n+#define C2MOD_STM 0x4\n+#define CAN2MOD_STM C2MOD_STM\n+#define C2MOD_STM_BIT 2\n+#define CAN2MOD_STM_BIT C2MOD_STM_BIT\n+#define C2MOD_TPM_MASK 0x8\n+#define CAN2MOD_TPM_MASK C2MOD_TPM_MASK\n+#define C2MOD_TPM 0x8\n+#define CAN2MOD_TPM C2MOD_TPM\n+#define C2MOD_TPM_BIT 3\n+#define CAN2MOD_TPM_BIT C2MOD_TPM_BIT\n+#define C2MOD_SM_MASK 0x10\n+#define CAN2MOD_SM_MASK C2MOD_SM_MASK\n+#define C2MOD_SM 0x10\n+#define CAN2MOD_SM C2MOD_SM\n+#define C2MOD_SM_BIT 4\n+#define CAN2MOD_SM_BIT C2MOD_SM_BIT\n+#define C2MOD_RPM_MASK 0x20\n+#define CAN2MOD_RPM_MASK C2MOD_RPM_MASK\n+#define C2MOD_RPM 0x20\n+#define CAN2MOD_RPM C2MOD_RPM\n+#define C2MOD_RPM_BIT 5\n+#define CAN2MOD_RPM_BIT C2MOD_RPM_BIT\n+#define C2MOD_TM_MASK 0x80\n+#define CAN2MOD_TM_MASK C2MOD_TM_MASK\n+#define C2MOD_TM 0x80\n+#define CAN2MOD_TM C2MOD_TM\n+#define C2MOD_TM_BIT 7\n+#define CAN2MOD_TM_BIT C2MOD_TM_BIT\n+\n+#define C2CMR (*(volatile unsigned long *)0xE0048004)\n+#define CAN2CMR C2CMR\n+#define C2CMR_OFFSET 0x4\n+#define CAN2CMR_OFFSET C2CMR_OFFSET\n+#define C2CMR_TR_MASK 0x1\n+#define CAN2CMR_TR_MASK C2CMR_TR_MASK\n+#define C2CMR_TR 0x1\n+#define CAN2CMR_TR C2CMR_TR\n+#define C2CMR_TR_BIT 0\n+#define CAN2CMR_TR_BIT C2CMR_TR_BIT\n+#define C2CMR_AT_MASK 0x2\n+#define CAN2CMR_AT_MASK C2CMR_AT_MASK\n+#define C2CMR_AT 0x2\n+#define CAN2CMR_AT C2CMR_AT\n+#define C2CMR_AT_BIT 1\n+#define CAN2CMR_AT_BIT C2CMR_AT_BIT\n+#define C2CMR_RRB_MASK 0x4\n+#define CAN2CMR_RRB_MASK C2CMR_RRB_MASK\n+#define C2CMR_RRB 0x4\n+#define CAN2CMR_RRB C2CMR_RRB\n+#define C2CMR_RRB_BIT 2\n+#define CAN2CMR_RRB_BIT C2CMR_RRB_BIT\n+#define C2CMR_CDO_MASK 0x8\n+#define CAN2CMR_CDO_MASK C2CMR_CDO_MASK\n+#define C2CMR_CDO 0x8\n+#define CAN2CMR_CDO C2CMR_CDO\n+#define C2CMR_CDO_BIT 3\n+#define CAN2CMR_CDO_BIT C2CMR_CDO_BIT\n+#define C2CMR_SRR_MASK 0x10\n+#define CAN2CMR_SRR_MASK C2CMR_SRR_MASK\n+#define C2CMR_SRR 0x10\n+#define CAN2CMR_SRR C2CMR_SRR\n+#define C2CMR_SRR_BIT 4\n+#define CAN2CMR_SRR_BIT C2CMR_SRR_BIT\n+#define C2CMR_STB1_MASK 0x20\n+#define CAN2CMR_STB1_MASK C2CMR_STB1_MASK\n+#define C2CMR_STB1 0x20\n+#define CAN2CMR_STB1 C2CMR_STB1\n+#define C2CMR_STB1_BIT 5\n+#define CAN2CMR_STB1_BIT C2CMR_STB1_BIT\n+#define C2CMR_STB2_MASK 0x40\n+#define CAN2CMR_STB2_MASK C2CMR_STB2_MASK\n+#define C2CMR_STB2 0x40\n+#define CAN2CMR_STB2 C2CMR_STB2\n+#define C2CMR_STB2_BIT 6\n+#define CAN2CMR_STB2_BIT C2CMR_STB2_BIT\n+#define C2CMR_STB3_MASK 0x80\n+#define CAN2CMR_STB3_MASK C2CMR_STB3_MASK\n+#define C2CMR_STB3 0x80\n+#define CAN2CMR_STB3 C2CMR_STB3\n+#define C2CMR_STB3_BIT 7\n+#define CAN2CMR_STB3_BIT C2CMR_STB3_BIT\n+\n+#define C2GSR (*(volatile unsigned long *)0xE0048008)\n+#define CAN2GSR C2GSR\n+#define C2GSR_OFFSET 0x8\n+#define CAN2GSR_OFFSET C2GSR_OFFSET\n+#define C2GSR_RBS_MASK 0x1\n+#define CAN2GSR_RBS_MASK C2GSR_RBS_MASK\n+#define C2GSR_RBS 0x1\n+#define CAN2GSR_RBS C2GSR_RBS\n+#define C2GSR_RBS_BIT 0\n+#define CAN2GSR_RBS_BIT C2GSR_RBS_BIT\n+#define C2GSR_DOS_MASK 0x2\n+#define CAN2GSR_DOS_MASK C2GSR_DOS_MASK\n+#define C2GSR_DOS 0x2\n+#define CAN2GSR_DOS C2GSR_DOS\n+#define C2GSR_DOS_BIT 1\n+#define CAN2GSR_DOS_BIT C2GSR_DOS_BIT\n+#define C2GSR_TBS_MASK 0x4\n+#define CAN2GSR_TBS_MASK C2GSR_TBS_MASK\n+#define C2GSR_TBS 0x4\n+#define CAN2GSR_TBS C2GSR_TBS\n+#define C2GSR_TBS_BIT 2\n+#define CAN2GSR_TBS_BIT C2GSR_TBS_BIT\n+#define C2GSR_TCS_MASK 0x8\n+#define CAN2GSR_TCS_MASK C2GSR_TCS_MASK\n+#define C2GSR_TCS 0x8\n+#define CAN2GSR_TCS C2GSR_TCS\n+#define C2GSR_TCS_BIT 3\n+#define CAN2GSR_TCS_BIT C2GSR_TCS_BIT\n+#define C2GSR_RS_MASK 0x10\n+#define CAN2GSR_RS_MASK C2GSR_RS_MASK\n+#define C2GSR_RS 0x10\n+#define CAN2GSR_RS C2GSR_RS\n+#define C2GSR_RS_BIT 4\n+#define CAN2GSR_RS_BIT C2GSR_RS_BIT\n+#define C2GSR_TS_MASK 0x20\n+#define CAN2GSR_TS_MASK C2GSR_TS_MASK\n+#define C2GSR_TS 0x20\n+#define CAN2GSR_TS C2GSR_TS\n+#define C2GSR_TS_BIT 5\n+#define CAN2GSR_TS_BIT C2GSR_TS_BIT\n+#define C2GSR_ES_MASK 0x40\n+#define CAN2GSR_ES_MASK C2GSR_ES_MASK\n+#define C2GSR_ES 0x40\n+#define CAN2GSR_ES C2GSR_ES\n+#define C2GSR_ES_BIT 6\n+#define CAN2GSR_ES_BIT C2GSR_ES_BIT\n+#define C2GSR_BS_MASK 0x80\n+#define CAN2GSR_BS_MASK C2GSR_BS_MASK\n+#define C2GSR_BS 0x80\n+#define CAN2GSR_BS C2GSR_BS\n+#define C2GSR_BS_BIT 7\n+#define CAN2GSR_BS_BIT C2GSR_BS_BIT\n+#define C2GSR_RXERR_MASK 0xFF0000\n+#define CAN2GSR_RXERR_MASK C2GSR_RXERR_MASK\n+#define C2GSR_RXERR_BIT 16\n+#define CAN2GSR_RXERR_BIT C2GSR_RXERR_BIT\n+#define C2GSR_TXERR_MASK 0xFF000000\n+#define CAN2GSR_TXERR_MASK C2GSR_TXERR_MASK\n+#define C2GSR_TXERR_BIT 24\n+#define CAN2GSR_TXERR_BIT C2GSR_TXERR_BIT\n+\n+#define C2ICR (*(volatile unsigned long *)0xE004800C)\n+#define CAN2ICR C2ICR\n+#define C2ICR_OFFSET 0xC\n+#define CAN2ICR_OFFSET C2ICR_OFFSET\n+#define C2ICR_RI_MASK 0x1\n+#define CAN2ICR_RI_MASK C2ICR_RI_MASK\n+#define C2ICR_RI 0x1\n+#define CAN2ICR_RI C2ICR_RI\n+#define C2ICR_RI_BIT 0\n+#define CAN2ICR_RI_BIT C2ICR_RI_BIT\n+#define C2ICR_TI1_MASK 0x2\n+#define CAN2ICR_TI1_MASK C2ICR_TI1_MASK\n+#define C2ICR_TI1 0x2\n+#define CAN2ICR_TI1 C2ICR_TI1\n+#define C2ICR_TI1_BIT 1\n+#define CAN2ICR_TI1_BIT C2ICR_TI1_BIT\n+#define C2ICR_EI_MASK 0x4\n+#define CAN2ICR_EI_MASK C2ICR_EI_MASK\n+#define C2ICR_EI 0x4\n+#define CAN2ICR_EI C2ICR_EI\n+#define C2ICR_EI_BIT 2\n+#define CAN2ICR_EI_BIT C2ICR_EI_BIT\n+#define C2ICR_DOI_MASK 0x8\n+#define CAN2ICR_DOI_MASK C2ICR_DOI_MASK\n+#define C2ICR_DOI 0x8\n+#define CAN2ICR_DOI C2ICR_DOI\n+#define C2ICR_DOI_BIT 3\n+#define CAN2ICR_DOI_BIT C2ICR_DOI_BIT\n+#define C2ICR_WUI_MASK 0x10\n+#define CAN2ICR_WUI_MASK C2ICR_WUI_MASK\n+#define C2ICR_WUI 0x10\n+#define CAN2ICR_WUI C2ICR_WUI\n+#define C2ICR_WUI_BIT 4\n+#define CAN2ICR_WUI_BIT C2ICR_WUI_BIT\n+#define C2ICR_EPI_MASK 0x20\n+#define CAN2ICR_EPI_MASK C2ICR_EPI_MASK\n+#define C2ICR_EPI 0x20\n+#define CAN2ICR_EPI C2ICR_EPI\n+#define C2ICR_EPI_BIT 5\n+#define CAN2ICR_EPI_BIT C2ICR_EPI_BIT\n+#define C2ICR_ALI_MASK 0x40\n+#define CAN2ICR_ALI_MASK C2ICR_ALI_MASK\n+#define C2ICR_ALI 0x40\n+#define CAN2ICR_ALI C2ICR_ALI\n+#define C2ICR_ALI_BIT 6\n+#define CAN2ICR_ALI_BIT C2ICR_ALI_BIT\n+#define C2ICR_BEI_MASK 0x80\n+#define CAN2ICR_BEI_MASK C2ICR_BEI_MASK\n+#define C2ICR_BEI 0x80\n+#define CAN2ICR_BEI C2ICR_BEI\n+#define C2ICR_BEI_BIT 7\n+#define CAN2ICR_BEI_BIT C2ICR_BEI_BIT\n+#define C2ICR_IDI_MASK 0x100\n+#define CAN2ICR_IDI_MASK C2ICR_IDI_MASK\n+#define C2ICR_IDI 0x100\n+#define CAN2ICR_IDI C2ICR_IDI\n+#define C2ICR_IDI_BIT 8\n+#define CAN2ICR_IDI_BIT C2ICR_IDI_BIT\n+#define C2ICR_TI2_MASK 0x200\n+#define CAN2ICR_TI2_MASK C2ICR_TI2_MASK\n+#define C2ICR_TI2 0x200\n+#define CAN2ICR_TI2 C2ICR_TI2\n+#define C2ICR_TI2_BIT 9\n+#define CAN2ICR_TI2_BIT C2ICR_TI2_BIT\n+#define C2ICR_TI3_MASK 0x400\n+#define CAN2ICR_TI3_MASK C2ICR_TI3_MASK\n+#define C2ICR_TI3 0x400\n+#define CAN2ICR_TI3 C2ICR_TI3\n+#define C2ICR_TI3_BIT 10\n+#define CAN2ICR_TI3_BIT C2ICR_TI3_BIT\n+#define C2ICR_ERRBIT_MASK 0x1F0000\n+#define CAN2ICR_ERRBIT_MASK C2ICR_ERRBIT_MASK\n+#define C2ICR_ERRBIT_BIT 16\n+#define CAN2ICR_ERRBIT_BIT C2ICR_ERRBIT_BIT\n+#define C2ICR_ERRDIR_MASK 0x200000\n+#define CAN2ICR_ERRDIR_MASK C2ICR_ERRDIR_MASK\n+#define C2ICR_ERRDIR 0x200000\n+#define CAN2ICR_ERRDIR C2ICR_ERRDIR\n+#define C2ICR_ERRDIR_BIT 21\n+#define CAN2ICR_ERRDIR_BIT C2ICR_ERRDIR_BIT\n+#define C2ICR_ERRC_MASK 0xC00000\n+#define CAN2ICR_ERRC_MASK C2ICR_ERRC_MASK\n+#define C2ICR_ERRC_BIT 22\n+#define CAN2ICR_ERRC_BIT C2ICR_ERRC_BIT\n+#define C2ICR_ALCBIT_MASK 0x1F000000\n+#define CAN2ICR_ALCBIT_MASK C2ICR_ALCBIT_MASK\n+#define C2ICR_ALCBIT_BIT 24\n+#define CAN2ICR_ALCBIT_BIT C2ICR_ALCBIT_BIT\n+\n+#define C2IER (*(volatile unsigned long *)0xE0048010)\n+#define CAN2IER C2IER\n+#define C2IER_OFFSET 0x10\n+#define CAN2IER_OFFSET C2IER_OFFSET\n+#define C2IER_RIE_MASK 0x1\n+#define CAN2IER_RIE_MASK C2IER_RIE_MASK\n+#define C2IER_RIE 0x1\n+#define CAN2IER_RIE C2IER_RIE\n+#define C2IER_RIE_BIT 0\n+#define CAN2IER_RIE_BIT C2IER_RIE_BIT\n+#define C2IER_TIE1_MASK 0x2\n+#define CAN2IER_TIE1_MASK C2IER_TIE1_MASK\n+#define C2IER_TIE1 0x2\n+#define CAN2IER_TIE1 C2IER_TIE1\n+#define C2IER_TIE1_BIT 1\n+#define CAN2IER_TIE1_BIT C2IER_TIE1_BIT\n+#define C2IER_EIE_MASK 0x4\n+#define CAN2IER_EIE_MASK C2IER_EIE_MASK\n+#define C2IER_EIE 0x4\n+#define CAN2IER_EIE C2IER_EIE\n+#define C2IER_EIE_BIT 2\n+#define CAN2IER_EIE_BIT C2IER_EIE_BIT\n+#define C2IER_DOIE_MASK 0x8\n+#define CAN2IER_DOIE_MASK C2IER_DOIE_MASK\n+#define C2IER_DOIE 0x8\n+#define CAN2IER_DOIE C2IER_DOIE\n+#define C2IER_DOIE_BIT 3\n+#define CAN2IER_DOIE_BIT C2IER_DOIE_BIT\n+#define C2IER_WUIE_MASK 0x10\n+#define CAN2IER_WUIE_MASK C2IER_WUIE_MASK\n+#define C2IER_WUIE 0x10\n+#define CAN2IER_WUIE C2IER_WUIE\n+#define C2IER_WUIE_BIT 4\n+#define CAN2IER_WUIE_BIT C2IER_WUIE_BIT\n+#define C2IER_EPIE_MASK 0x20\n+#define CAN2IER_EPIE_MASK C2IER_EPIE_MASK\n+#define C2IER_EPIE 0x20\n+#define CAN2IER_EPIE C2IER_EPIE\n+#define C2IER_EPIE_BIT 5\n+#define CAN2IER_EPIE_BIT C2IER_EPIE_BIT\n+#define C2IER_ALIE_MASK 0x40\n+#define CAN2IER_ALIE_MASK C2IER_ALIE_MASK\n+#define C2IER_ALIE 0x40\n+#define CAN2IER_ALIE C2IER_ALIE\n+#define C2IER_ALIE_BIT 6\n+#define CAN2IER_ALIE_BIT C2IER_ALIE_BIT\n+#define C2IER_BEIE_MASK 0x80\n+#define CAN2IER_BEIE_MASK C2IER_BEIE_MASK\n+#define C2IER_BEIE 0x80\n+#define CAN2IER_BEIE C2IER_BEIE\n+#define C2IER_BEIE_BIT 7\n+#define CAN2IER_BEIE_BIT C2IER_BEIE_BIT\n+#define C2IER_IDIE_MASK 0x100\n+#define CAN2IER_IDIE_MASK C2IER_IDIE_MASK\n+#define C2IER_IDIE 0x100\n+#define CAN2IER_IDIE C2IER_IDIE\n+#define C2IER_IDIE_BIT 8\n+#define CAN2IER_IDIE_BIT C2IER_IDIE_BIT\n+#define C2IER_TIE2_MASK 0x200\n+#define CAN2IER_TIE2_MASK C2IER_TIE2_MASK\n+#define C2IER_TIE2 0x200\n+#define CAN2IER_TIE2 C2IER_TIE2\n+#define C2IER_TIE2_BIT 9\n+#define CAN2IER_TIE2_BIT C2IER_TIE2_BIT\n+#define C2IER_TIE3_MASK 0x400\n+#define CAN2IER_TIE3_MASK C2IER_TIE3_MASK\n+#define C2IER_TIE3 0x400\n+#define CAN2IER_TIE3 C2IER_TIE3\n+#define C2IER_TIE3_BIT 10\n+#define CAN2IER_TIE3_BIT C2IER_TIE3_BIT\n+\n+#define C2BTR (*(volatile unsigned long *)0xE0048014)\n+#define CAN2BTR C2BTR\n+#define C2BTR_OFFSET 0x14\n+#define CAN2BTR_OFFSET C2BTR_OFFSET\n+#define C2BTR_BRP_MASK 0x3FF\n+#define CAN2BTR_BRP_MASK C2BTR_BRP_MASK\n+#define C2BTR_BRP_BIT 0\n+#define CAN2BTR_BRP_BIT C2BTR_BRP_BIT\n+#define C2BTR_SJW_MASK 0xC000\n+#define CAN2BTR_SJW_MASK C2BTR_SJW_MASK\n+#define C2BTR_SJW_BIT 14\n+#define CAN2BTR_SJW_BIT C2BTR_SJW_BIT\n+#define C2BTR_TSEG1_MASK 0xF0000\n+#define CAN2BTR_TSEG1_MASK C2BTR_TSEG1_MASK\n+#define C2BTR_TSEG1_BIT 16\n+#define CAN2BTR_TSEG1_BIT C2BTR_TSEG1_BIT\n+#define C2BTR_TSEG2_MASK 0x700000\n+#define CAN2BTR_TSEG2_MASK C2BTR_TSEG2_MASK\n+#define C2BTR_TSEG2_BIT 20\n+#define CAN2BTR_TSEG2_BIT C2BTR_TSEG2_BIT\n+#define C2BTR_SAM_MASK 0x800000\n+#define CAN2BTR_SAM_MASK C2BTR_SAM_MASK\n+#define C2BTR_SAM 0x800000\n+#define CAN2BTR_SAM C2BTR_SAM\n+#define C2BTR_SAM_BIT 23\n+#define CAN2BTR_SAM_BIT C2BTR_SAM_BIT\n+\n+#define C2EWL (*(volatile unsigned long *)0xE0048018)\n+#define CAN2EWL C2EWL\n+#define C2EWL_OFFSET 0x18\n+#define CAN2EWL_OFFSET C2EWL_OFFSET\n+#define C2EWL_EWL_MASK 0xFF\n+#define CAN2EWL_EWL_MASK C2EWL_EWL_MASK\n+#define C2EWL_EWL_BIT 0\n+#define CAN2EWL_EWL_BIT C2EWL_EWL_BIT\n+\n+#define C2SR (*(volatile unsigned long *)0xE004801C)\n+#define CAN2SR C2SR\n+#define C2SR_OFFSET 0x1C\n+#define CAN2SR_OFFSET C2SR_OFFSET\n+#define C2SR_RBS_MASK 0x1\n+#define CAN2SR_RBS_MASK C2SR_RBS_MASK\n+#define C2SR_RBS 0x1\n+#define CAN2SR_RBS C2SR_RBS\n+#define C2SR_RBS_BIT 0\n+#define CAN2SR_RBS_BIT C2SR_RBS_BIT\n+#define C2SR_DOS_MASK 0x2\n+#define CAN2SR_DOS_MASK C2SR_DOS_MASK\n+#define C2SR_DOS 0x2\n+#define CAN2SR_DOS C2SR_DOS\n+#define C2SR_DOS_BIT 1\n+#define CAN2SR_DOS_BIT C2SR_DOS_BIT\n+#define C2SR_TBS1_MASK 0x4\n+#define CAN2SR_TBS1_MASK C2SR_TBS1_MASK\n+#define C2SR_TBS1 0x4\n+#define CAN2SR_TBS1 C2SR_TBS1\n+#define C2SR_TBS1_BIT 2\n+#define CAN2SR_TBS1_BIT C2SR_TBS1_BIT\n+#define C2SR_TCS1_MASK 0x8\n+#define CAN2SR_TCS1_MASK C2SR_TCS1_MASK\n+#define C2SR_TCS1 0x8\n+#define CAN2SR_TCS1 C2SR_TCS1\n+#define C2SR_TCS1_BIT 3\n+#define CAN2SR_TCS1_BIT C2SR_TCS1_BIT\n+#define C2SR_RS_MASK 0x10\n+#define CAN2SR_RS_MASK C2SR_RS_MASK\n+#define C2SR_RS 0x10\n+#define CAN2SR_RS C2SR_RS\n+#define C2SR_RS_BIT 4\n+#define CAN2SR_RS_BIT C2SR_RS_BIT\n+#define C2SR_TS1_MASK 0x20\n+#define CAN2SR_TS1_MASK C2SR_TS1_MASK\n+#define C2SR_TS1 0x20\n+#define CAN2SR_TS1 C2SR_TS1\n+#define C2SR_TS1_BIT 5\n+#define CAN2SR_TS1_BIT C2SR_TS1_BIT\n+#define C2SR_ES_MASK 0x40\n+#define CAN2SR_ES_MASK C2SR_ES_MASK\n+#define C2SR_ES 0x40\n+#define CAN2SR_ES C2SR_ES\n+#define C2SR_ES_BIT 6\n+#define CAN2SR_ES_BIT C2SR_ES_BIT\n+#define C2SR_BS_MASK 0x80\n+#define CAN2SR_BS_MASK C2SR_BS_MASK\n+#define C2SR_BS 0x80\n+#define CAN2SR_BS C2SR_BS\n+#define C2SR_BS_BIT 7\n+#define CAN2SR_BS_BIT C2SR_BS_BIT\n+#define C2SR_RBS2_MASK 0x100\n+#define CAN2SR_RBS2_MASK C2SR_RBS2_MASK\n+#define C2SR_RBS2 0x100\n+#define CAN2SR_RBS2 C2SR_RBS2\n+#define C2SR_RBS2_BIT 8\n+#define CAN2SR_RBS2_BIT C2SR_RBS2_BIT\n+#define C2SR_DOS2_MASK 0x200\n+#define CAN2SR_DOS2_MASK C2SR_DOS2_MASK\n+#define C2SR_DOS2 0x200\n+#define CAN2SR_DOS2 C2SR_DOS2\n+#define C2SR_DOS2_BIT 9\n+#define CAN2SR_DOS2_BIT C2SR_DOS2_BIT\n+#define C2SR_TBS2_MASK 0x400\n+#define CAN2SR_TBS2_MASK C2SR_TBS2_MASK\n+#define C2SR_TBS2 0x400\n+#define CAN2SR_TBS2 C2SR_TBS2\n+#define C2SR_TBS2_BIT 10\n+#define CAN2SR_TBS2_BIT C2SR_TBS2_BIT\n+#define C2SR_TCS2_MASK 0x800\n+#define CAN2SR_TCS2_MASK C2SR_TCS2_MASK\n+#define C2SR_TCS2 0x800\n+#define CAN2SR_TCS2 C2SR_TCS2\n+#define C2SR_TCS2_BIT 11\n+#define CAN2SR_TCS2_BIT C2SR_TCS2_BIT\n+#define C2SR_RS2_MASK 0x1000\n+#define CAN2SR_RS2_MASK C2SR_RS2_MASK\n+#define C2SR_RS2 0x1000\n+#define CAN2SR_RS2 C2SR_RS2\n+#define C2SR_RS2_BIT 12\n+#define CAN2SR_RS2_BIT C2SR_RS2_BIT\n+#define C2SR_TS2_MASK 0x2000\n+#define CAN2SR_TS2_MASK C2SR_TS2_MASK\n+#define C2SR_TS2 0x2000\n+#define CAN2SR_TS2 C2SR_TS2\n+#define C2SR_TS2_BIT 13\n+#define CAN2SR_TS2_BIT C2SR_TS2_BIT\n+#define C2SR_ES2_MASK 0x4000\n+#define CAN2SR_ES2_MASK C2SR_ES2_MASK\n+#define C2SR_ES2 0x4000\n+#define CAN2SR_ES2 C2SR_ES2\n+#define C2SR_ES2_BIT 14\n+#define CAN2SR_ES2_BIT C2SR_ES2_BIT\n+#define C2SR_BS2_MASK 0x8000\n+#define CAN2SR_BS2_MASK C2SR_BS2_MASK\n+#define C2SR_BS2 0x8000\n+#define CAN2SR_BS2 C2SR_BS2\n+#define C2SR_BS2_BIT 15\n+#define CAN2SR_BS2_BIT C2SR_BS2_BIT\n+#define C2SR_RBS3_MASK 0x10000\n+#define CAN2SR_RBS3_MASK C2SR_RBS3_MASK\n+#define C2SR_RBS3 0x10000\n+#define CAN2SR_RBS3 C2SR_RBS3\n+#define C2SR_RBS3_BIT 16\n+#define CAN2SR_RBS3_BIT C2SR_RBS3_BIT\n+#define C2SR_DOS3_MASK 0x20000\n+#define CAN2SR_DOS3_MASK C2SR_DOS3_MASK\n+#define C2SR_DOS3 0x20000\n+#define CAN2SR_DOS3 C2SR_DOS3\n+#define C2SR_DOS3_BIT 17\n+#define CAN2SR_DOS3_BIT C2SR_DOS3_BIT\n+#define C2SR_TBS3_MASK 0x40000\n+#define CAN2SR_TBS3_MASK C2SR_TBS3_MASK\n+#define C2SR_TBS3 0x40000\n+#define CAN2SR_TBS3 C2SR_TBS3\n+#define C2SR_TBS3_BIT 18\n+#define CAN2SR_TBS3_BIT C2SR_TBS3_BIT\n+#define C2SR_TCS3_MASK 0x80000\n+#define CAN2SR_TCS3_MASK C2SR_TCS3_MASK\n+#define C2SR_TCS3 0x80000\n+#define CAN2SR_TCS3 C2SR_TCS3\n+#define C2SR_TCS3_BIT 19\n+#define CAN2SR_TCS3_BIT C2SR_TCS3_BIT\n+#define C2SR_RS3_MASK 0x100000\n+#define CAN2SR_RS3_MASK C2SR_RS3_MASK\n+#define C2SR_RS3 0x100000\n+#define CAN2SR_RS3 C2SR_RS3\n+#define C2SR_RS3_BIT 20\n+#define CAN2SR_RS3_BIT C2SR_RS3_BIT\n+#define C2SR_TS3_MASK 0x200000\n+#define CAN2SR_TS3_MASK C2SR_TS3_MASK\n+#define C2SR_TS3 0x200000\n+#define CAN2SR_TS3 C2SR_TS3\n+#define C2SR_TS3_BIT 21\n+#define CAN2SR_TS3_BIT C2SR_TS3_BIT\n+#define C2SR_ES3_MASK 0x400000\n+#define CAN2SR_ES3_MASK C2SR_ES3_MASK\n+#define C2SR_ES3 0x400000\n+#define CAN2SR_ES3 C2SR_ES3\n+#define C2SR_ES3_BIT 22\n+#define CAN2SR_ES3_BIT C2SR_ES3_BIT\n+#define C2SR_BS3_MASK 0x800000\n+#define CAN2SR_BS3_MASK C2SR_BS3_MASK\n+#define C2SR_BS3 0x800000\n+#define CAN2SR_BS3 C2SR_BS3\n+#define C2SR_BS3_BIT 23\n+#define CAN2SR_BS3_BIT C2SR_BS3_BIT\n+\n+#define C2RFS (*(volatile unsigned long *)0xE0048020)\n+#define CAN2RFS C2RFS\n+#define C2RFS_OFFSET 0x20\n+#define CAN2RFS_OFFSET C2RFS_OFFSET\n+#define C2RFS_ID_Index_MASK 0x3FF\n+#define CAN2RFS_ID_Index_MASK C2RFS_ID_Index_MASK\n+#define C2RFS_ID_Index_BIT 0\n+#define CAN2RFS_ID_Index_BIT C2RFS_ID_Index_BIT\n+#define C2RFS_BP_MASK 0x400\n+#define CAN2RFS_BP_MASK C2RFS_BP_MASK\n+#define C2RFS_BP 0x400\n+#define CAN2RFS_BP C2RFS_BP\n+#define C2RFS_BP_BIT 10\n+#define CAN2RFS_BP_BIT C2RFS_BP_BIT\n+#define C2RFS_DLC_MASK 0xF0000\n+#define CAN2RFS_DLC_MASK C2RFS_DLC_MASK\n+#define C2RFS_DLC_BIT 16\n+#define CAN2RFS_DLC_BIT C2RFS_DLC_BIT\n+#define C2RFS_RTR_MASK 0x40000000\n+#define CAN2RFS_RTR_MASK C2RFS_RTR_MASK\n+#define C2RFS_RTR 0x40000000\n+#define CAN2RFS_RTR C2RFS_RTR\n+#define C2RFS_RTR_BIT 30\n+#define CAN2RFS_RTR_BIT C2RFS_RTR_BIT\n+#define C2RFS_FF_MASK 0x80000000\n+#define CAN2RFS_FF_MASK C2RFS_FF_MASK\n+#define C2RFS_FF 0x80000000\n+#define CAN2RFS_FF C2RFS_FF\n+#define C2RFS_FF_BIT 31\n+#define CAN2RFS_FF_BIT C2RFS_FF_BIT\n+\n+#define C2RID (*(volatile unsigned long *)0xE0048024)\n+#define CAN2RID C2RID\n+#define C2RID_OFFSET 0x24\n+#define CAN2RID_OFFSET C2RID_OFFSET\n+#define C2RID_ID_MASK 0x7FF\n+#define CAN2RID_ID_MASK C2RID_ID_MASK\n+#define C2RID_ID_BIT 0\n+#define CAN2RID_ID_BIT C2RID_ID_BIT\n+\n+#define C2RDA (*(volatile unsigned long *)0xE0048028)\n+#define CAN2RDA C2RDA\n+#define C2RDA_OFFSET 0x28\n+#define CAN2RDA_OFFSET C2RDA_OFFSET\n+#define C2RDA_Data_1_MASK 0xFF\n+#define CAN2RDA_Data_1_MASK C2RDA_Data_1_MASK\n+#define C2RDA_Data_1_BIT 0\n+#define CAN2RDA_Data_1_BIT C2RDA_Data_1_BIT\n+#define C2RDA_Data_2_MASK 0xFF00\n+#define CAN2RDA_Data_2_MASK C2RDA_Data_2_MASK\n+#define C2RDA_Data_2_BIT 8\n+#define CAN2RDA_Data_2_BIT C2RDA_Data_2_BIT\n+#define C2RDA_Data_3_MASK 0xFF0000\n+#define CAN2RDA_Data_3_MASK C2RDA_Data_3_MASK\n+#define C2RDA_Data_3_BIT 16\n+#define CAN2RDA_Data_3_BIT C2RDA_Data_3_BIT\n+#define C2RDA_Data_4_MASK 0xFF000000\n+#define CAN2RDA_Data_4_MASK C2RDA_Data_4_MASK\n+#define C2RDA_Data_4_BIT 24\n+#define CAN2RDA_Data_4_BIT C2RDA_Data_4_BIT\n+\n+#define C2RDB (*(volatile unsigned long *)0xE004802C)\n+#define CAN2RDB C2RDB\n+#define C2RDB_OFFSET 0x2C\n+#define CAN2RDB_OFFSET C2RDB_OFFSET\n+#define C2RDB_Data_5_MASK 0xFF\n+#define CAN2RDB_Data_5_MASK C2RDB_Data_5_MASK\n+#define C2RDB_Data_5_BIT 0\n+#define CAN2RDB_Data_5_BIT C2RDB_Data_5_BIT\n+#define C2RDB_Data_6_MASK 0xFF00\n+#define CAN2RDB_Data_6_MASK C2RDB_Data_6_MASK\n+#define C2RDB_Data_6_BIT 8\n+#define CAN2RDB_Data_6_BIT C2RDB_Data_6_BIT\n+#define C2RDB_Data_7_MASK 0xFF0000\n+#define CAN2RDB_Data_7_MASK C2RDB_Data_7_MASK\n+#define C2RDB_Data_7_BIT 16\n+#define CAN2RDB_Data_7_BIT C2RDB_Data_7_BIT\n+#define C2RDB_Data_8_MASK 0xFF000000\n+#define CAN2RDB_Data_8_MASK C2RDB_Data_8_MASK\n+#define C2RDB_Data_8_BIT 24\n+#define CAN2RDB_Data_8_BIT C2RDB_Data_8_BIT\n+\n+#define C2TFI1 (*(volatile unsigned long *)0xE0048030)\n+#define CAN2TFI1 C2TFI1\n+#define C2TFI1_OFFSET 0x30\n+#define CAN2TFI1_OFFSET C2TFI1_OFFSET\n+#define C2TFI1_PRIO_MASK 0xFF\n+#define CAN2TFI1_PRIO_MASK C2TFI1_PRIO_MASK\n+#define C2TFI1_PRIO_BIT 0\n+#define CAN2TFI1_PRIO_BIT C2TFI1_PRIO_BIT\n+#define C2TFI1_DLC_MASK 0xF0000\n+#define CAN2TFI1_DLC_MASK C2TFI1_DLC_MASK\n+#define C2TFI1_DLC_BIT 16\n+#define CAN2TFI1_DLC_BIT C2TFI1_DLC_BIT\n+#define C2TFI1_RTR_MASK 0x40000000\n+#define CAN2TFI1_RTR_MASK C2TFI1_RTR_MASK\n+#define C2TFI1_RTR 0x40000000\n+#define CAN2TFI1_RTR C2TFI1_RTR\n+#define C2TFI1_RTR_BIT 30\n+#define CAN2TFI1_RTR_BIT C2TFI1_RTR_BIT\n+#define C2TFI1_FF_MASK 0x80000000\n+#define CAN2TFI1_FF_MASK C2TFI1_FF_MASK\n+#define C2TFI1_FF 0x80000000\n+#define CAN2TFI1_FF C2TFI1_FF\n+#define C2TFI1_FF_BIT 31\n+#define CAN2TFI1_FF_BIT C2TFI1_FF_BIT\n+\n+#define C2TID1 (*(volatile unsigned long *)0xE0048034)\n+#define CAN2TID1 C2TID1\n+#define C2TID1_OFFSET 0x34\n+#define CAN2TID1_OFFSET C2TID1_OFFSET\n+#define C2TID1_ID_MASK 0x7FF\n+#define CAN2TID1_ID_MASK C2TID1_ID_MASK\n+#define C2TID1_ID_BIT 0\n+#define CAN2TID1_ID_BIT C2TID1_ID_BIT\n+\n+#define C2TDA1 (*(volatile unsigned long *)0xE0048038)\n+#define CAN2TDA1 C2TDA1\n+#define C2TDA1_OFFSET 0x38\n+#define CAN2TDA1_OFFSET C2TDA1_OFFSET\n+#define C2TDA1_Data_1_MASK 0xFF\n+#define CAN2TDA1_Data_1_MASK C2TDA1_Data_1_MASK\n+#define C2TDA1_Data_1_BIT 0\n+#define CAN2TDA1_Data_1_BIT C2TDA1_Data_1_BIT\n+#define C2TDA1_Data_2_MASK 0xFF00\n+#define CAN2TDA1_Data_2_MASK C2TDA1_Data_2_MASK\n+#define C2TDA1_Data_2_BIT 8\n+#define CAN2TDA1_Data_2_BIT C2TDA1_Data_2_BIT\n+#define C2TDA1_Data_3_MASK 0xFF0000\n+#define CAN2TDA1_Data_3_MASK C2TDA1_Data_3_MASK\n+#define C2TDA1_Data_3_BIT 16\n+#define CAN2TDA1_Data_3_BIT C2TDA1_Data_3_BIT\n+#define C2TDA1_Data_4_MASK 0xFF000000\n+#define CAN2TDA1_Data_4_MASK C2TDA1_Data_4_MASK\n+#define C2TDA1_Data_4_BIT 24\n+#define CAN2TDA1_Data_4_BIT C2TDA1_Data_4_BIT\n+\n+#define C2TDB1 (*(volatile unsigned long *)0xE004803C)\n+#define CAN2TDB1 C2TDB1\n+#define C2TDB1_OFFSET 0x3C\n+#define CAN2TDB1_OFFSET C2TDB1_OFFSET\n+#define C2TDB1_Data_5_MASK 0xFF\n+#define CAN2TDB1_Data_5_MASK C2TDB1_Data_5_MASK\n+#define C2TDB1_Data_5_BIT 0\n+#define CAN2TDB1_Data_5_BIT C2TDB1_Data_5_BIT\n+#define C2TDB1_Data_6_MASK 0xFF00\n+#define CAN2TDB1_Data_6_MASK C2TDB1_Data_6_MASK\n+#define C2TDB1_Data_6_BIT 8\n+#define CAN2TDB1_Data_6_BIT C2TDB1_Data_6_BIT\n+#define C2TDB1_Data_7_MASK 0xFF0000\n+#define CAN2TDB1_Data_7_MASK C2TDB1_Data_7_MASK\n+#define C2TDB1_Data_7_BIT 16\n+#define CAN2TDB1_Data_7_BIT C2TDB1_Data_7_BIT\n+#define C2TDB1_Data_8_MASK 0xFF000000\n+#define CAN2TDB1_Data_8_MASK C2TDB1_Data_8_MASK\n+#define C2TDB1_Data_8_BIT 24\n+#define CAN2TDB1_Data_8_BIT C2TDB1_Data_8_BIT\n+\n+#define C2TFI2 (*(volatile unsigned long *)0xE0048040)\n+#define CAN2TFI2 C2TFI2\n+#define C2TFI2_OFFSET 0x40\n+#define CAN2TFI2_OFFSET C2TFI2_OFFSET\n+#define C2TFI2_PRIO_MASK 0xFF\n+#define CAN2TFI2_PRIO_MASK C2TFI2_PRIO_MASK\n+#define C2TFI2_PRIO_BIT 0\n+#define CAN2TFI2_PRIO_BIT C2TFI2_PRIO_BIT\n+#define C2TFI2_DLC_MASK 0xF0000\n+#define CAN2TFI2_DLC_MASK C2TFI2_DLC_MASK\n+#define C2TFI2_DLC_BIT 16\n+#define CAN2TFI2_DLC_BIT C2TFI2_DLC_BIT\n+#define C2TFI2_RTR_MASK 0x40000000\n+#define CAN2TFI2_RTR_MASK C2TFI2_RTR_MASK\n+#define C2TFI2_RTR 0x40000000\n+#define CAN2TFI2_RTR C2TFI2_RTR\n+#define C2TFI2_RTR_BIT 30\n+#define CAN2TFI2_RTR_BIT C2TFI2_RTR_BIT\n+#define C2TFI2_FF_MASK 0x80000000\n+#define CAN2TFI2_FF_MASK C2TFI2_FF_MASK\n+#define C2TFI2_FF 0x80000000\n+#define CAN2TFI2_FF C2TFI2_FF\n+#define C2TFI2_FF_BIT 31\n+#define CAN2TFI2_FF_BIT C2TFI2_FF_BIT\n+\n+#define C2TID2 (*(volatile unsigned long *)0xE0048044)\n+#define CAN2TID2 C2TID2\n+#define C2TID2_OFFSET 0x44\n+#define CAN2TID2_OFFSET C2TID2_OFFSET\n+#define C2TID2_ID_MASK 0x7FF\n+#define CAN2TID2_ID_MASK C2TID2_ID_MASK\n+#define C2TID2_ID_BIT 0\n+#define CAN2TID2_ID_BIT C2TID2_ID_BIT\n+\n+#define C2TDA2 (*(volatile unsigned long *)0xE0048048)\n+#define CAN2TDA2 C2TDA2\n+#define C2TDA2_OFFSET 0x48\n+#define CAN2TDA2_OFFSET C2TDA2_OFFSET\n+#define C2TDA2_Data_1_MASK 0xFF\n+#define CAN2TDA2_Data_1_MASK C2TDA2_Data_1_MASK\n+#define C2TDA2_Data_1_BIT 0\n+#define CAN2TDA2_Data_1_BIT C2TDA2_Data_1_BIT\n+#define C2TDA2_Data_2_MASK 0xFF00\n+#define CAN2TDA2_Data_2_MASK C2TDA2_Data_2_MASK\n+#define C2TDA2_Data_2_BIT 8\n+#define CAN2TDA2_Data_2_BIT C2TDA2_Data_2_BIT\n+#define C2TDA2_Data_3_MASK 0xFF0000\n+#define CAN2TDA2_Data_3_MASK C2TDA2_Data_3_MASK\n+#define C2TDA2_Data_3_BIT 16\n+#define CAN2TDA2_Data_3_BIT C2TDA2_Data_3_BIT\n+#define C2TDA2_Data_4_MASK 0xFF000000\n+#define CAN2TDA2_Data_4_MASK C2TDA2_Data_4_MASK\n+#define C2TDA2_Data_4_BIT 24\n+#define CAN2TDA2_Data_4_BIT C2TDA2_Data_4_BIT\n+\n+#define C2TDB2 (*(volatile unsigned long *)0xE004804C)\n+#define CAN2TDB2 C2TDB2\n+#define C2TDB2_OFFSET 0x4C\n+#define CAN2TDB2_OFFSET C2TDB2_OFFSET\n+#define C2TDB2_Data_5_MASK 0xFF\n+#define CAN2TDB2_Data_5_MASK C2TDB2_Data_5_MASK\n+#define C2TDB2_Data_5_BIT 0\n+#define CAN2TDB2_Data_5_BIT C2TDB2_Data_5_BIT\n+#define C2TDB2_Data_6_MASK 0xFF00\n+#define CAN2TDB2_Data_6_MASK C2TDB2_Data_6_MASK\n+#define C2TDB2_Data_6_BIT 8\n+#define CAN2TDB2_Data_6_BIT C2TDB2_Data_6_BIT\n+#define C2TDB2_Data_7_MASK 0xFF0000\n+#define CAN2TDB2_Data_7_MASK C2TDB2_Data_7_MASK\n+#define C2TDB2_Data_7_BIT 16\n+#define CAN2TDB2_Data_7_BIT C2TDB2_Data_7_BIT\n+#define C2TDB2_Data_8_MASK 0xFF000000\n+#define CAN2TDB2_Data_8_MASK C2TDB2_Data_8_MASK\n+#define C2TDB2_Data_8_BIT 24\n+#define CAN2TDB2_Data_8_BIT C2TDB2_Data_8_BIT\n+\n+#define C2TFI3 (*(volatile unsigned long *)0xE0048050)\n+#define CAN2TFI3 C2TFI3\n+#define C2TFI3_OFFSET 0x50\n+#define CAN2TFI3_OFFSET C2TFI3_OFFSET\n+#define C2TFI3_PRIO_MASK 0xFF\n+#define CAN2TFI3_PRIO_MASK C2TFI3_PRIO_MASK\n+#define C2TFI3_PRIO_BIT 0\n+#define CAN2TFI3_PRIO_BIT C2TFI3_PRIO_BIT\n+#define C2TFI3_DLC_MASK 0xF0000\n+#define CAN2TFI3_DLC_MASK C2TFI3_DLC_MASK\n+#define C2TFI3_DLC_BIT 16\n+#define CAN2TFI3_DLC_BIT C2TFI3_DLC_BIT\n+#define C2TFI3_RTR_MASK 0x40000000\n+#define CAN2TFI3_RTR_MASK C2TFI3_RTR_MASK\n+#define C2TFI3_RTR 0x40000000\n+#define CAN2TFI3_RTR C2TFI3_RTR\n+#define C2TFI3_RTR_BIT 30\n+#define CAN2TFI3_RTR_BIT C2TFI3_RTR_BIT\n+#define C2TFI3_FF_MASK 0x80000000\n+#define CAN2TFI3_FF_MASK C2TFI3_FF_MASK\n+#define C2TFI3_FF 0x80000000\n+#define CAN2TFI3_FF C2TFI3_FF\n+#define C2TFI3_FF_BIT 31\n+#define CAN2TFI3_FF_BIT C2TFI3_FF_BIT\n+\n+#define C2TID3 (*(volatile unsigned long *)0xE0048054)\n+#define CAN2TID3 C2TID3\n+#define C2TID3_OFFSET 0x54\n+#define CAN2TID3_OFFSET C2TID3_OFFSET\n+#define C2TID3_ID_MASK 0x7FF\n+#define CAN2TID3_ID_MASK C2TID3_ID_MASK\n+#define C2TID3_ID_BIT 0\n+#define CAN2TID3_ID_BIT C2TID3_ID_BIT\n+\n+#define C2TDA3 (*(volatile unsigned long *)0xE0048058)\n+#define CAN2TDA3 C2TDA3\n+#define C2TDA3_OFFSET 0x58\n+#define CAN2TDA3_OFFSET C2TDA3_OFFSET\n+#define C2TDA3_Data_1_MASK 0xFF\n+#define CAN2TDA3_Data_1_MASK C2TDA3_Data_1_MASK\n+#define C2TDA3_Data_1_BIT 0\n+#define CAN2TDA3_Data_1_BIT C2TDA3_Data_1_BIT\n+#define C2TDA3_Data_2_MASK 0xFF00\n+#define CAN2TDA3_Data_2_MASK C2TDA3_Data_2_MASK\n+#define C2TDA3_Data_2_BIT 8\n+#define CAN2TDA3_Data_2_BIT C2TDA3_Data_2_BIT\n+#define C2TDA3_Data_3_MASK 0xFF0000\n+#define CAN2TDA3_Data_3_MASK C2TDA3_Data_3_MASK\n+#define C2TDA3_Data_3_BIT 16\n+#define CAN2TDA3_Data_3_BIT C2TDA3_Data_3_BIT\n+#define C2TDA3_Data_4_MASK 0xFF000000\n+#define CAN2TDA3_Data_4_MASK C2TDA3_Data_4_MASK\n+#define C2TDA3_Data_4_BIT 24\n+#define CAN2TDA3_Data_4_BIT C2TDA3_Data_4_BIT\n+\n+#define C2TDB3 (*(volatile unsigned long *)0xE004805C)\n+#define CAN2TDB3 C2TDB3\n+#define C2TDB3_OFFSET 0x5C\n+#define CAN2TDB3_OFFSET C2TDB3_OFFSET\n+#define C2TDB3_Data_5_MASK 0xFF\n+#define CAN2TDB3_Data_5_MASK C2TDB3_Data_5_MASK\n+#define C2TDB3_Data_5_BIT 0\n+#define CAN2TDB3_Data_5_BIT C2TDB3_Data_5_BIT\n+#define C2TDB3_Data_6_MASK 0xFF00\n+#define CAN2TDB3_Data_6_MASK C2TDB3_Data_6_MASK\n+#define C2TDB3_Data_6_BIT 8\n+#define CAN2TDB3_Data_6_BIT C2TDB3_Data_6_BIT\n+#define C2TDB3_Data_7_MASK 0xFF0000\n+#define CAN2TDB3_Data_7_MASK C2TDB3_Data_7_MASK\n+#define C2TDB3_Data_7_BIT 16\n+#define CAN2TDB3_Data_7_BIT C2TDB3_Data_7_BIT\n+#define C2TDB3_Data_8_MASK 0xFF000000\n+#define CAN2TDB3_Data_8_MASK C2TDB3_Data_8_MASK\n+#define C2TDB3_Data_8_BIT 24\n+#define CAN2TDB3_Data_8_BIT C2TDB3_Data_8_BIT\n+\n+#define CAN3_BASE 0xE004C000\n+\n+#define C3MOD (*(volatile unsigned long *)0xE004C000)\n+#define CAN3MOD C3MOD\n+#define C3MOD_OFFSET 0x0\n+#define CAN3MOD_OFFSET C3MOD_OFFSET\n+#define C3MOD_RM_MASK 0x1\n+#define CAN3MOD_RM_MASK C3MOD_RM_MASK\n+#define C3MOD_RM 0x1\n+#define CAN3MOD_RM C3MOD_RM\n+#define C3MOD_RM_BIT 0\n+#define CAN3MOD_RM_BIT C3MOD_RM_BIT\n+#define C3MOD_LOM_MASK 0x2\n+#define CAN3MOD_LOM_MASK C3MOD_LOM_MASK\n+#define C3MOD_LOM 0x2\n+#define CAN3MOD_LOM C3MOD_LOM\n+#define C3MOD_LOM_BIT 1\n+#define CAN3MOD_LOM_BIT C3MOD_LOM_BIT\n+#define C3MOD_STM_MASK 0x4\n+#define CAN3MOD_STM_MASK C3MOD_STM_MASK\n+#define C3MOD_STM 0x4\n+#define CAN3MOD_STM C3MOD_STM\n+#define C3MOD_STM_BIT 2\n+#define CAN3MOD_STM_BIT C3MOD_STM_BIT\n+#define C3MOD_TPM_MASK 0x8\n+#define CAN3MOD_TPM_MASK C3MOD_TPM_MASK\n+#define C3MOD_TPM 0x8\n+#define CAN3MOD_TPM C3MOD_TPM\n+#define C3MOD_TPM_BIT 3\n+#define CAN3MOD_TPM_BIT C3MOD_TPM_BIT\n+#define C3MOD_SM_MASK 0x10\n+#define CAN3MOD_SM_MASK C3MOD_SM_MASK\n+#define C3MOD_SM 0x10\n+#define CAN3MOD_SM C3MOD_SM\n+#define C3MOD_SM_BIT 4\n+#define CAN3MOD_SM_BIT C3MOD_SM_BIT\n+#define C3MOD_RPM_MASK 0x20\n+#define CAN3MOD_RPM_MASK C3MOD_RPM_MASK\n+#define C3MOD_RPM 0x20\n+#define CAN3MOD_RPM C3MOD_RPM\n+#define C3MOD_RPM_BIT 5\n+#define CAN3MOD_RPM_BIT C3MOD_RPM_BIT\n+#define C3MOD_TM_MASK 0x80\n+#define CAN3MOD_TM_MASK C3MOD_TM_MASK\n+#define C3MOD_TM 0x80\n+#define CAN3MOD_TM C3MOD_TM\n+#define C3MOD_TM_BIT 7\n+#define CAN3MOD_TM_BIT C3MOD_TM_BIT\n+\n+#define C3CMR (*(volatile unsigned long *)0xE004C004)\n+#define CAN3CMR C3CMR\n+#define C3CMR_OFFSET 0x4\n+#define CAN3CMR_OFFSET C3CMR_OFFSET\n+#define C3CMR_TR_MASK 0x1\n+#define CAN3CMR_TR_MASK C3CMR_TR_MASK\n+#define C3CMR_TR 0x1\n+#define CAN3CMR_TR C3CMR_TR\n+#define C3CMR_TR_BIT 0\n+#define CAN3CMR_TR_BIT C3CMR_TR_BIT\n+#define C3CMR_AT_MASK 0x2\n+#define CAN3CMR_AT_MASK C3CMR_AT_MASK\n+#define C3CMR_AT 0x2\n+#define CAN3CMR_AT C3CMR_AT\n+#define C3CMR_AT_BIT 1\n+#define CAN3CMR_AT_BIT C3CMR_AT_BIT\n+#define C3CMR_RRB_MASK 0x4\n+#define CAN3CMR_RRB_MASK C3CMR_RRB_MASK\n+#define C3CMR_RRB 0x4\n+#define CAN3CMR_RRB C3CMR_RRB\n+#define C3CMR_RRB_BIT 2\n+#define CAN3CMR_RRB_BIT C3CMR_RRB_BIT\n+#define C3CMR_CDO_MASK 0x8\n+#define CAN3CMR_CDO_MASK C3CMR_CDO_MASK\n+#define C3CMR_CDO 0x8\n+#define CAN3CMR_CDO C3CMR_CDO\n+#define C3CMR_CDO_BIT 3\n+#define CAN3CMR_CDO_BIT C3CMR_CDO_BIT\n+#define C3CMR_SRR_MASK 0x10\n+#define CAN3CMR_SRR_MASK C3CMR_SRR_MASK\n+#define C3CMR_SRR 0x10\n+#define CAN3CMR_SRR C3CMR_SRR\n+#define C3CMR_SRR_BIT 4\n+#define CAN3CMR_SRR_BIT C3CMR_SRR_BIT\n+#define C3CMR_STB1_MASK 0x20\n+#define CAN3CMR_STB1_MASK C3CMR_STB1_MASK\n+#define C3CMR_STB1 0x20\n+#define CAN3CMR_STB1 C3CMR_STB1\n+#define C3CMR_STB1_BIT 5\n+#define CAN3CMR_STB1_BIT C3CMR_STB1_BIT\n+#define C3CMR_STB2_MASK 0x40\n+#define CAN3CMR_STB2_MASK C3CMR_STB2_MASK\n+#define C3CMR_STB2 0x40\n+#define CAN3CMR_STB2 C3CMR_STB2\n+#define C3CMR_STB2_BIT 6\n+#define CAN3CMR_STB2_BIT C3CMR_STB2_BIT\n+#define C3CMR_STB3_MASK 0x80\n+#define CAN3CMR_STB3_MASK C3CMR_STB3_MASK\n+#define C3CMR_STB3 0x80\n+#define CAN3CMR_STB3 C3CMR_STB3\n+#define C3CMR_STB3_BIT 7\n+#define CAN3CMR_STB3_BIT C3CMR_STB3_BIT\n+\n+#define C3GSR (*(volatile unsigned long *)0xE004C008)\n+#define CAN3GSR C3GSR\n+#define C3GSR_OFFSET 0x8\n+#define CAN3GSR_OFFSET C3GSR_OFFSET\n+#define C3GSR_RBS_MASK 0x1\n+#define CAN3GSR_RBS_MASK C3GSR_RBS_MASK\n+#define C3GSR_RBS 0x1\n+#define CAN3GSR_RBS C3GSR_RBS\n+#define C3GSR_RBS_BIT 0\n+#define CAN3GSR_RBS_BIT C3GSR_RBS_BIT\n+#define C3GSR_DOS_MASK 0x2\n+#define CAN3GSR_DOS_MASK C3GSR_DOS_MASK\n+#define C3GSR_DOS 0x2\n+#define CAN3GSR_DOS C3GSR_DOS\n+#define C3GSR_DOS_BIT 1\n+#define CAN3GSR_DOS_BIT C3GSR_DOS_BIT\n+#define C3GSR_TBS_MASK 0x4\n+#define CAN3GSR_TBS_MASK C3GSR_TBS_MASK\n+#define C3GSR_TBS 0x4\n+#define CAN3GSR_TBS C3GSR_TBS\n+#define C3GSR_TBS_BIT 2\n+#define CAN3GSR_TBS_BIT C3GSR_TBS_BIT\n+#define C3GSR_TCS_MASK 0x8\n+#define CAN3GSR_TCS_MASK C3GSR_TCS_MASK\n+#define C3GSR_TCS 0x8\n+#define CAN3GSR_TCS C3GSR_TCS\n+#define C3GSR_TCS_BIT 3\n+#define CAN3GSR_TCS_BIT C3GSR_TCS_BIT\n+#define C3GSR_RS_MASK 0x10\n+#define CAN3GSR_RS_MASK C3GSR_RS_MASK\n+#define C3GSR_RS 0x10\n+#define CAN3GSR_RS C3GSR_RS\n+#define C3GSR_RS_BIT 4\n+#define CAN3GSR_RS_BIT C3GSR_RS_BIT\n+#define C3GSR_TS_MASK 0x20\n+#define CAN3GSR_TS_MASK C3GSR_TS_MASK\n+#define C3GSR_TS 0x20\n+#define CAN3GSR_TS C3GSR_TS\n+#define C3GSR_TS_BIT 5\n+#define CAN3GSR_TS_BIT C3GSR_TS_BIT\n+#define C3GSR_ES_MASK 0x40\n+#define CAN3GSR_ES_MASK C3GSR_ES_MASK\n+#define C3GSR_ES 0x40\n+#define CAN3GSR_ES C3GSR_ES\n+#define C3GSR_ES_BIT 6\n+#define CAN3GSR_ES_BIT C3GSR_ES_BIT\n+#define C3GSR_BS_MASK 0x80\n+#define CAN3GSR_BS_MASK C3GSR_BS_MASK\n+#define C3GSR_BS 0x80\n+#define CAN3GSR_BS C3GSR_BS\n+#define C3GSR_BS_BIT 7\n+#define CAN3GSR_BS_BIT C3GSR_BS_BIT\n+#define C3GSR_RXERR_MASK 0xFF0000\n+#define CAN3GSR_RXERR_MASK C3GSR_RXERR_MASK\n+#define C3GSR_RXERR_BIT 16\n+#define CAN3GSR_RXERR_BIT C3GSR_RXERR_BIT\n+#define C3GSR_TXERR_MASK 0xFF000000\n+#define CAN3GSR_TXERR_MASK C3GSR_TXERR_MASK\n+#define C3GSR_TXERR_BIT 24\n+#define CAN3GSR_TXERR_BIT C3GSR_TXERR_BIT\n+\n+#define C3ICR (*(volatile unsigned long *)0xE004C00C)\n+#define CAN3ICR C3ICR\n+#define C3ICR_OFFSET 0xC\n+#define CAN3ICR_OFFSET C3ICR_OFFSET\n+#define C3ICR_RI_MASK 0x1\n+#define CAN3ICR_RI_MASK C3ICR_RI_MASK\n+#define C3ICR_RI 0x1\n+#define CAN3ICR_RI C3ICR_RI\n+#define C3ICR_RI_BIT 0\n+#define CAN3ICR_RI_BIT C3ICR_RI_BIT\n+#define C3ICR_TI1_MASK 0x2\n+#define CAN3ICR_TI1_MASK C3ICR_TI1_MASK\n+#define C3ICR_TI1 0x2\n+#define CAN3ICR_TI1 C3ICR_TI1\n+#define C3ICR_TI1_BIT 1\n+#define CAN3ICR_TI1_BIT C3ICR_TI1_BIT\n+#define C3ICR_EI_MASK 0x4\n+#define CAN3ICR_EI_MASK C3ICR_EI_MASK\n+#define C3ICR_EI 0x4\n+#define CAN3ICR_EI C3ICR_EI\n+#define C3ICR_EI_BIT 2\n+#define CAN3ICR_EI_BIT C3ICR_EI_BIT\n+#define C3ICR_DOI_MASK 0x8\n+#define CAN3ICR_DOI_MASK C3ICR_DOI_MASK\n+#define C3ICR_DOI 0x8\n+#define CAN3ICR_DOI C3ICR_DOI\n+#define C3ICR_DOI_BIT 3\n+#define CAN3ICR_DOI_BIT C3ICR_DOI_BIT\n+#define C3ICR_WUI_MASK 0x10\n+#define CAN3ICR_WUI_MASK C3ICR_WUI_MASK\n+#define C3ICR_WUI 0x10\n+#define CAN3ICR_WUI C3ICR_WUI\n+#define C3ICR_WUI_BIT 4\n+#define CAN3ICR_WUI_BIT C3ICR_WUI_BIT\n+#define C3ICR_EPI_MASK 0x20\n+#define CAN3ICR_EPI_MASK C3ICR_EPI_MASK\n+#define C3ICR_EPI 0x20\n+#define CAN3ICR_EPI C3ICR_EPI\n+#define C3ICR_EPI_BIT 5\n+#define CAN3ICR_EPI_BIT C3ICR_EPI_BIT\n+#define C3ICR_ALI_MASK 0x40\n+#define CAN3ICR_ALI_MASK C3ICR_ALI_MASK\n+#define C3ICR_ALI 0x40\n+#define CAN3ICR_ALI C3ICR_ALI\n+#define C3ICR_ALI_BIT 6\n+#define CAN3ICR_ALI_BIT C3ICR_ALI_BIT\n+#define C3ICR_BEI_MASK 0x80\n+#define CAN3ICR_BEI_MASK C3ICR_BEI_MASK\n+#define C3ICR_BEI 0x80\n+#define CAN3ICR_BEI C3ICR_BEI\n+#define C3ICR_BEI_BIT 7\n+#define CAN3ICR_BEI_BIT C3ICR_BEI_BIT\n+#define C3ICR_IDI_MASK 0x100\n+#define CAN3ICR_IDI_MASK C3ICR_IDI_MASK\n+#define C3ICR_IDI 0x100\n+#define CAN3ICR_IDI C3ICR_IDI\n+#define C3ICR_IDI_BIT 8\n+#define CAN3ICR_IDI_BIT C3ICR_IDI_BIT\n+#define C3ICR_TI2_MASK 0x200\n+#define CAN3ICR_TI2_MASK C3ICR_TI2_MASK\n+#define C3ICR_TI2 0x200\n+#define CAN3ICR_TI2 C3ICR_TI2\n+#define C3ICR_TI2_BIT 9\n+#define CAN3ICR_TI2_BIT C3ICR_TI2_BIT\n+#define C3ICR_TI3_MASK 0x400\n+#define CAN3ICR_TI3_MASK C3ICR_TI3_MASK\n+#define C3ICR_TI3 0x400\n+#define CAN3ICR_TI3 C3ICR_TI3\n+#define C3ICR_TI3_BIT 10\n+#define CAN3ICR_TI3_BIT C3ICR_TI3_BIT\n+#define C3ICR_ERRBIT_MASK 0x1F0000\n+#define CAN3ICR_ERRBIT_MASK C3ICR_ERRBIT_MASK\n+#define C3ICR_ERRBIT_BIT 16\n+#define CAN3ICR_ERRBIT_BIT C3ICR_ERRBIT_BIT\n+#define C3ICR_ERRDIR_MASK 0x200000\n+#define CAN3ICR_ERRDIR_MASK C3ICR_ERRDIR_MASK\n+#define C3ICR_ERRDIR 0x200000\n+#define CAN3ICR_ERRDIR C3ICR_ERRDIR\n+#define C3ICR_ERRDIR_BIT 21\n+#define CAN3ICR_ERRDIR_BIT C3ICR_ERRDIR_BIT\n+#define C3ICR_ERRC_MASK 0xC00000\n+#define CAN3ICR_ERRC_MASK C3ICR_ERRC_MASK\n+#define C3ICR_ERRC_BIT 22\n+#define CAN3ICR_ERRC_BIT C3ICR_ERRC_BIT\n+#define C3ICR_ALCBIT_MASK 0x1F000000\n+#define CAN3ICR_ALCBIT_MASK C3ICR_ALCBIT_MASK\n+#define C3ICR_ALCBIT_BIT 24\n+#define CAN3ICR_ALCBIT_BIT C3ICR_ALCBIT_BIT\n+\n+#define C3IER (*(volatile unsigned long *)0xE004C010)\n+#define CAN3IER C3IER\n+#define C3IER_OFFSET 0x10\n+#define CAN3IER_OFFSET C3IER_OFFSET\n+#define C3IER_RIE_MASK 0x1\n+#define CAN3IER_RIE_MASK C3IER_RIE_MASK\n+#define C3IER_RIE 0x1\n+#define CAN3IER_RIE C3IER_RIE\n+#define C3IER_RIE_BIT 0\n+#define CAN3IER_RIE_BIT C3IER_RIE_BIT\n+#define C3IER_TIE1_MASK 0x2\n+#define CAN3IER_TIE1_MASK C3IER_TIE1_MASK\n+#define C3IER_TIE1 0x2\n+#define CAN3IER_TIE1 C3IER_TIE1\n+#define C3IER_TIE1_BIT 1\n+#define CAN3IER_TIE1_BIT C3IER_TIE1_BIT\n+#define C3IER_EIE_MASK 0x4\n+#define CAN3IER_EIE_MASK C3IER_EIE_MASK\n+#define C3IER_EIE 0x4\n+#define CAN3IER_EIE C3IER_EIE\n+#define C3IER_EIE_BIT 2\n+#define CAN3IER_EIE_BIT C3IER_EIE_BIT\n+#define C3IER_DOIE_MASK 0x8\n+#define CAN3IER_DOIE_MASK C3IER_DOIE_MASK\n+#define C3IER_DOIE 0x8\n+#define CAN3IER_DOIE C3IER_DOIE\n+#define C3IER_DOIE_BIT 3\n+#define CAN3IER_DOIE_BIT C3IER_DOIE_BIT\n+#define C3IER_WUIE_MASK 0x10\n+#define CAN3IER_WUIE_MASK C3IER_WUIE_MASK\n+#define C3IER_WUIE 0x10\n+#define CAN3IER_WUIE C3IER_WUIE\n+#define C3IER_WUIE_BIT 4\n+#define CAN3IER_WUIE_BIT C3IER_WUIE_BIT\n+#define C3IER_EPIE_MASK 0x20\n+#define CAN3IER_EPIE_MASK C3IER_EPIE_MASK\n+#define C3IER_EPIE 0x20\n+#define CAN3IER_EPIE C3IER_EPIE\n+#define C3IER_EPIE_BIT 5\n+#define CAN3IER_EPIE_BIT C3IER_EPIE_BIT\n+#define C3IER_ALIE_MASK 0x40\n+#define CAN3IER_ALIE_MASK C3IER_ALIE_MASK\n+#define C3IER_ALIE 0x40\n+#define CAN3IER_ALIE C3IER_ALIE\n+#define C3IER_ALIE_BIT 6\n+#define CAN3IER_ALIE_BIT C3IER_ALIE_BIT\n+#define C3IER_BEIE_MASK 0x80\n+#define CAN3IER_BEIE_MASK C3IER_BEIE_MASK\n+#define C3IER_BEIE 0x80\n+#define CAN3IER_BEIE C3IER_BEIE\n+#define C3IER_BEIE_BIT 7\n+#define CAN3IER_BEIE_BIT C3IER_BEIE_BIT\n+#define C3IER_IDIE_MASK 0x100\n+#define CAN3IER_IDIE_MASK C3IER_IDIE_MASK\n+#define C3IER_IDIE 0x100\n+#define CAN3IER_IDIE C3IER_IDIE\n+#define C3IER_IDIE_BIT 8\n+#define CAN3IER_IDIE_BIT C3IER_IDIE_BIT\n+#define C3IER_TIE2_MASK 0x200\n+#define CAN3IER_TIE2_MASK C3IER_TIE2_MASK\n+#define C3IER_TIE2 0x200\n+#define CAN3IER_TIE2 C3IER_TIE2\n+#define C3IER_TIE2_BIT 9\n+#define CAN3IER_TIE2_BIT C3IER_TIE2_BIT\n+#define C3IER_TIE3_MASK 0x400\n+#define CAN3IER_TIE3_MASK C3IER_TIE3_MASK\n+#define C3IER_TIE3 0x400\n+#define CAN3IER_TIE3 C3IER_TIE3\n+#define C3IER_TIE3_BIT 10\n+#define CAN3IER_TIE3_BIT C3IER_TIE3_BIT\n+\n+#define C3BTR (*(volatile unsigned long *)0xE004C014)\n+#define CAN3BTR C3BTR\n+#define C3BTR_OFFSET 0x14\n+#define CAN3BTR_OFFSET C3BTR_OFFSET\n+#define C3BTR_BRP_MASK 0x3FF\n+#define CAN3BTR_BRP_MASK C3BTR_BRP_MASK\n+#define C3BTR_BRP_BIT 0\n+#define CAN3BTR_BRP_BIT C3BTR_BRP_BIT\n+#define C3BTR_SJW_MASK 0xC000\n+#define CAN3BTR_SJW_MASK C3BTR_SJW_MASK\n+#define C3BTR_SJW_BIT 14\n+#define CAN3BTR_SJW_BIT C3BTR_SJW_BIT\n+#define C3BTR_TSEG1_MASK 0xF0000\n+#define CAN3BTR_TSEG1_MASK C3BTR_TSEG1_MASK\n+#define C3BTR_TSEG1_BIT 16\n+#define CAN3BTR_TSEG1_BIT C3BTR_TSEG1_BIT\n+#define C3BTR_TSEG2_MASK 0x700000\n+#define CAN3BTR_TSEG2_MASK C3BTR_TSEG2_MASK\n+#define C3BTR_TSEG2_BIT 20\n+#define CAN3BTR_TSEG2_BIT C3BTR_TSEG2_BIT\n+#define C3BTR_SAM_MASK 0x800000\n+#define CAN3BTR_SAM_MASK C3BTR_SAM_MASK\n+#define C3BTR_SAM 0x800000\n+#define CAN3BTR_SAM C3BTR_SAM\n+#define C3BTR_SAM_BIT 23\n+#define CAN3BTR_SAM_BIT C3BTR_SAM_BIT\n+\n+#define C3EWL (*(volatile unsigned long *)0xE004C018)\n+#define CAN3EWL C3EWL\n+#define C3EWL_OFFSET 0x18\n+#define CAN3EWL_OFFSET C3EWL_OFFSET\n+#define C3EWL_EWL_MASK 0xFF\n+#define CAN3EWL_EWL_MASK C3EWL_EWL_MASK\n+#define C3EWL_EWL_BIT 0\n+#define CAN3EWL_EWL_BIT C3EWL_EWL_BIT\n+\n+#define C3SR (*(volatile unsigned long *)0xE004C01C)\n+#define CAN3SR C3SR\n+#define C3SR_OFFSET 0x1C\n+#define CAN3SR_OFFSET C3SR_OFFSET\n+#define C3SR_RBS_MASK 0x1\n+#define CAN3SR_RBS_MASK C3SR_RBS_MASK\n+#define C3SR_RBS 0x1\n+#define CAN3SR_RBS C3SR_RBS\n+#define C3SR_RBS_BIT 0\n+#define CAN3SR_RBS_BIT C3SR_RBS_BIT\n+#define C3SR_DOS_MASK 0x2\n+#define CAN3SR_DOS_MASK C3SR_DOS_MASK\n+#define C3SR_DOS 0x2\n+#define CAN3SR_DOS C3SR_DOS\n+#define C3SR_DOS_BIT 1\n+#define CAN3SR_DOS_BIT C3SR_DOS_BIT\n+#define C3SR_TBS1_MASK 0x4\n+#define CAN3SR_TBS1_MASK C3SR_TBS1_MASK\n+#define C3SR_TBS1 0x4\n+#define CAN3SR_TBS1 C3SR_TBS1\n+#define C3SR_TBS1_BIT 2\n+#define CAN3SR_TBS1_BIT C3SR_TBS1_BIT\n+#define C3SR_TCS1_MASK 0x8\n+#define CAN3SR_TCS1_MASK C3SR_TCS1_MASK\n+#define C3SR_TCS1 0x8\n+#define CAN3SR_TCS1 C3SR_TCS1\n+#define C3SR_TCS1_BIT 3\n+#define CAN3SR_TCS1_BIT C3SR_TCS1_BIT\n+#define C3SR_RS_MASK 0x10\n+#define CAN3SR_RS_MASK C3SR_RS_MASK\n+#define C3SR_RS 0x10\n+#define CAN3SR_RS C3SR_RS\n+#define C3SR_RS_BIT 4\n+#define CAN3SR_RS_BIT C3SR_RS_BIT\n+#define C3SR_TS1_MASK 0x20\n+#define CAN3SR_TS1_MASK C3SR_TS1_MASK\n+#define C3SR_TS1 0x20\n+#define CAN3SR_TS1 C3SR_TS1\n+#define C3SR_TS1_BIT 5\n+#define CAN3SR_TS1_BIT C3SR_TS1_BIT\n+#define C3SR_ES_MASK 0x40\n+#define CAN3SR_ES_MASK C3SR_ES_MASK\n+#define C3SR_ES 0x40\n+#define CAN3SR_ES C3SR_ES\n+#define C3SR_ES_BIT 6\n+#define CAN3SR_ES_BIT C3SR_ES_BIT\n+#define C3SR_BS_MASK 0x80\n+#define CAN3SR_BS_MASK C3SR_BS_MASK\n+#define C3SR_BS 0x80\n+#define CAN3SR_BS C3SR_BS\n+#define C3SR_BS_BIT 7\n+#define CAN3SR_BS_BIT C3SR_BS_BIT\n+#define C3SR_RBS2_MASK 0x100\n+#define CAN3SR_RBS2_MASK C3SR_RBS2_MASK\n+#define C3SR_RBS2 0x100\n+#define CAN3SR_RBS2 C3SR_RBS2\n+#define C3SR_RBS2_BIT 8\n+#define CAN3SR_RBS2_BIT C3SR_RBS2_BIT\n+#define C3SR_DOS2_MASK 0x200\n+#define CAN3SR_DOS2_MASK C3SR_DOS2_MASK\n+#define C3SR_DOS2 0x200\n+#define CAN3SR_DOS2 C3SR_DOS2\n+#define C3SR_DOS2_BIT 9\n+#define CAN3SR_DOS2_BIT C3SR_DOS2_BIT\n+#define C3SR_TBS2_MASK 0x400\n+#define CAN3SR_TBS2_MASK C3SR_TBS2_MASK\n+#define C3SR_TBS2 0x400\n+#define CAN3SR_TBS2 C3SR_TBS2\n+#define C3SR_TBS2_BIT 10\n+#define CAN3SR_TBS2_BIT C3SR_TBS2_BIT\n+#define C3SR_TCS2_MASK 0x800\n+#define CAN3SR_TCS2_MASK C3SR_TCS2_MASK\n+#define C3SR_TCS2 0x800\n+#define CAN3SR_TCS2 C3SR_TCS2\n+#define C3SR_TCS2_BIT 11\n+#define CAN3SR_TCS2_BIT C3SR_TCS2_BIT\n+#define C3SR_RS2_MASK 0x1000\n+#define CAN3SR_RS2_MASK C3SR_RS2_MASK\n+#define C3SR_RS2 0x1000\n+#define CAN3SR_RS2 C3SR_RS2\n+#define C3SR_RS2_BIT 12\n+#define CAN3SR_RS2_BIT C3SR_RS2_BIT\n+#define C3SR_TS2_MASK 0x2000\n+#define CAN3SR_TS2_MASK C3SR_TS2_MASK\n+#define C3SR_TS2 0x2000\n+#define CAN3SR_TS2 C3SR_TS2\n+#define C3SR_TS2_BIT 13\n+#define CAN3SR_TS2_BIT C3SR_TS2_BIT\n+#define C3SR_ES2_MASK 0x4000\n+#define CAN3SR_ES2_MASK C3SR_ES2_MASK\n+#define C3SR_ES2 0x4000\n+#define CAN3SR_ES2 C3SR_ES2\n+#define C3SR_ES2_BIT 14\n+#define CAN3SR_ES2_BIT C3SR_ES2_BIT\n+#define C3SR_BS2_MASK 0x8000\n+#define CAN3SR_BS2_MASK C3SR_BS2_MASK\n+#define C3SR_BS2 0x8000\n+#define CAN3SR_BS2 C3SR_BS2\n+#define C3SR_BS2_BIT 15\n+#define CAN3SR_BS2_BIT C3SR_BS2_BIT\n+#define C3SR_RBS3_MASK 0x10000\n+#define CAN3SR_RBS3_MASK C3SR_RBS3_MASK\n+#define C3SR_RBS3 0x10000\n+#define CAN3SR_RBS3 C3SR_RBS3\n+#define C3SR_RBS3_BIT 16\n+#define CAN3SR_RBS3_BIT C3SR_RBS3_BIT\n+#define C3SR_DOS3_MASK 0x20000\n+#define CAN3SR_DOS3_MASK C3SR_DOS3_MASK\n+#define C3SR_DOS3 0x20000\n+#define CAN3SR_DOS3 C3SR_DOS3\n+#define C3SR_DOS3_BIT 17\n+#define CAN3SR_DOS3_BIT C3SR_DOS3_BIT\n+#define C3SR_TBS3_MASK 0x40000\n+#define CAN3SR_TBS3_MASK C3SR_TBS3_MASK\n+#define C3SR_TBS3 0x40000\n+#define CAN3SR_TBS3 C3SR_TBS3\n+#define C3SR_TBS3_BIT 18\n+#define CAN3SR_TBS3_BIT C3SR_TBS3_BIT\n+#define C3SR_TCS3_MASK 0x80000\n+#define CAN3SR_TCS3_MASK C3SR_TCS3_MASK\n+#define C3SR_TCS3 0x80000\n+#define CAN3SR_TCS3 C3SR_TCS3\n+#define C3SR_TCS3_BIT 19\n+#define CAN3SR_TCS3_BIT C3SR_TCS3_BIT\n+#define C3SR_RS3_MASK 0x100000\n+#define CAN3SR_RS3_MASK C3SR_RS3_MASK\n+#define C3SR_RS3 0x100000\n+#define CAN3SR_RS3 C3SR_RS3\n+#define C3SR_RS3_BIT 20\n+#define CAN3SR_RS3_BIT C3SR_RS3_BIT\n+#define C3SR_TS3_MASK 0x200000\n+#define CAN3SR_TS3_MASK C3SR_TS3_MASK\n+#define C3SR_TS3 0x200000\n+#define CAN3SR_TS3 C3SR_TS3\n+#define C3SR_TS3_BIT 21\n+#define CAN3SR_TS3_BIT C3SR_TS3_BIT\n+#define C3SR_ES3_MASK 0x400000\n+#define CAN3SR_ES3_MASK C3SR_ES3_MASK\n+#define C3SR_ES3 0x400000\n+#define CAN3SR_ES3 C3SR_ES3\n+#define C3SR_ES3_BIT 22\n+#define CAN3SR_ES3_BIT C3SR_ES3_BIT\n+#define C3SR_BS3_MASK 0x800000\n+#define CAN3SR_BS3_MASK C3SR_BS3_MASK\n+#define C3SR_BS3 0x800000\n+#define CAN3SR_BS3 C3SR_BS3\n+#define C3SR_BS3_BIT 23\n+#define CAN3SR_BS3_BIT C3SR_BS3_BIT\n+\n+#define C3RFS (*(volatile unsigned long *)0xE004C020)\n+#define CAN3RFS C3RFS\n+#define C3RFS_OFFSET 0x20\n+#define CAN3RFS_OFFSET C3RFS_OFFSET\n+#define C3RFS_ID_Index_MASK 0x3FF\n+#define CAN3RFS_ID_Index_MASK C3RFS_ID_Index_MASK\n+#define C3RFS_ID_Index_BIT 0\n+#define CAN3RFS_ID_Index_BIT C3RFS_ID_Index_BIT\n+#define C3RFS_BP_MASK 0x400\n+#define CAN3RFS_BP_MASK C3RFS_BP_MASK\n+#define C3RFS_BP 0x400\n+#define CAN3RFS_BP C3RFS_BP\n+#define C3RFS_BP_BIT 10\n+#define CAN3RFS_BP_BIT C3RFS_BP_BIT\n+#define C3RFS_DLC_MASK 0xF0000\n+#define CAN3RFS_DLC_MASK C3RFS_DLC_MASK\n+#define C3RFS_DLC_BIT 16\n+#define CAN3RFS_DLC_BIT C3RFS_DLC_BIT\n+#define C3RFS_RTR_MASK 0x40000000\n+#define CAN3RFS_RTR_MASK C3RFS_RTR_MASK\n+#define C3RFS_RTR 0x40000000\n+#define CAN3RFS_RTR C3RFS_RTR\n+#define C3RFS_RTR_BIT 30\n+#define CAN3RFS_RTR_BIT C3RFS_RTR_BIT\n+#define C3RFS_FF_MASK 0x80000000\n+#define CAN3RFS_FF_MASK C3RFS_FF_MASK\n+#define C3RFS_FF 0x80000000\n+#define CAN3RFS_FF C3RFS_FF\n+#define C3RFS_FF_BIT 31\n+#define CAN3RFS_FF_BIT C3RFS_FF_BIT\n+\n+#define C3RID (*(volatile unsigned long *)0xE004C024)\n+#define CAN3RID C3RID\n+#define C3RID_OFFSET 0x24\n+#define CAN3RID_OFFSET C3RID_OFFSET\n+#define C3RID_ID_MASK 0x7FF\n+#define CAN3RID_ID_MASK C3RID_ID_MASK\n+#define C3RID_ID_BIT 0\n+#define CAN3RID_ID_BIT C3RID_ID_BIT\n+\n+#define C3RDA (*(volatile unsigned long *)0xE004C028)\n+#define CAN3RDA C3RDA\n+#define C3RDA_OFFSET 0x28\n+#define CAN3RDA_OFFSET C3RDA_OFFSET\n+#define C3RDA_Data_1_MASK 0xFF\n+#define CAN3RDA_Data_1_MASK C3RDA_Data_1_MASK\n+#define C3RDA_Data_1_BIT 0\n+#define CAN3RDA_Data_1_BIT C3RDA_Data_1_BIT\n+#define C3RDA_Data_2_MASK 0xFF00\n+#define CAN3RDA_Data_2_MASK C3RDA_Data_2_MASK\n+#define C3RDA_Data_2_BIT 8\n+#define CAN3RDA_Data_2_BIT C3RDA_Data_2_BIT\n+#define C3RDA_Data_3_MASK 0xFF0000\n+#define CAN3RDA_Data_3_MASK C3RDA_Data_3_MASK\n+#define C3RDA_Data_3_BIT 16\n+#define CAN3RDA_Data_3_BIT C3RDA_Data_3_BIT\n+#define C3RDA_Data_4_MASK 0xFF000000\n+#define CAN3RDA_Data_4_MASK C3RDA_Data_4_MASK\n+#define C3RDA_Data_4_BIT 24\n+#define CAN3RDA_Data_4_BIT C3RDA_Data_4_BIT\n+\n+#define C3RDB (*(volatile unsigned long *)0xE004C02C)\n+#define CAN3RDB C3RDB\n+#define C3RDB_OFFSET 0x2C\n+#define CAN3RDB_OFFSET C3RDB_OFFSET\n+#define C3RDB_Data_5_MASK 0xFF\n+#define CAN3RDB_Data_5_MASK C3RDB_Data_5_MASK\n+#define C3RDB_Data_5_BIT 0\n+#define CAN3RDB_Data_5_BIT C3RDB_Data_5_BIT\n+#define C3RDB_Data_6_MASK 0xFF00\n+#define CAN3RDB_Data_6_MASK C3RDB_Data_6_MASK\n+#define C3RDB_Data_6_BIT 8\n+#define CAN3RDB_Data_6_BIT C3RDB_Data_6_BIT\n+#define C3RDB_Data_7_MASK 0xFF0000\n+#define CAN3RDB_Data_7_MASK C3RDB_Data_7_MASK\n+#define C3RDB_Data_7_BIT 16\n+#define CAN3RDB_Data_7_BIT C3RDB_Data_7_BIT\n+#define C3RDB_Data_8_MASK 0xFF000000\n+#define CAN3RDB_Data_8_MASK C3RDB_Data_8_MASK\n+#define C3RDB_Data_8_BIT 24\n+#define CAN3RDB_Data_8_BIT C3RDB_Data_8_BIT\n+\n+#define C3TFI1 (*(volatile unsigned long *)0xE004C030)\n+#define CAN3TFI1 C3TFI1\n+#define C3TFI1_OFFSET 0x30\n+#define CAN3TFI1_OFFSET C3TFI1_OFFSET\n+#define C3TFI1_PRIO_MASK 0xFF\n+#define CAN3TFI1_PRIO_MASK C3TFI1_PRIO_MASK\n+#define C3TFI1_PRIO_BIT 0\n+#define CAN3TFI1_PRIO_BIT C3TFI1_PRIO_BIT\n+#define C3TFI1_DLC_MASK 0xF0000\n+#define CAN3TFI1_DLC_MASK C3TFI1_DLC_MASK\n+#define C3TFI1_DLC_BIT 16\n+#define CAN3TFI1_DLC_BIT C3TFI1_DLC_BIT\n+#define C3TFI1_RTR_MASK 0x40000000\n+#define CAN3TFI1_RTR_MASK C3TFI1_RTR_MASK\n+#define C3TFI1_RTR 0x40000000\n+#define CAN3TFI1_RTR C3TFI1_RTR\n+#define C3TFI1_RTR_BIT 30\n+#define CAN3TFI1_RTR_BIT C3TFI1_RTR_BIT\n+#define C3TFI1_FF_MASK 0x80000000\n+#define CAN3TFI1_FF_MASK C3TFI1_FF_MASK\n+#define C3TFI1_FF 0x80000000\n+#define CAN3TFI1_FF C3TFI1_FF\n+#define C3TFI1_FF_BIT 31\n+#define CAN3TFI1_FF_BIT C3TFI1_FF_BIT\n+\n+#define C3TID1 (*(volatile unsigned long *)0xE004C034)\n+#define CAN3TID1 C3TID1\n+#define C3TID1_OFFSET 0x34\n+#define CAN3TID1_OFFSET C3TID1_OFFSET\n+#define C3TID1_ID_MASK 0x7FF\n+#define CAN3TID1_ID_MASK C3TID1_ID_MASK\n+#define C3TID1_ID_BIT 0\n+#define CAN3TID1_ID_BIT C3TID1_ID_BIT\n+\n+#define C3TDA1 (*(volatile unsigned long *)0xE004C038)\n+#define CAN3TDA1 C3TDA1\n+#define C3TDA1_OFFSET 0x38\n+#define CAN3TDA1_OFFSET C3TDA1_OFFSET\n+#define C3TDA1_Data_1_MASK 0xFF\n+#define CAN3TDA1_Data_1_MASK C3TDA1_Data_1_MASK\n+#define C3TDA1_Data_1_BIT 0\n+#define CAN3TDA1_Data_1_BIT C3TDA1_Data_1_BIT\n+#define C3TDA1_Data_2_MASK 0xFF00\n+#define CAN3TDA1_Data_2_MASK C3TDA1_Data_2_MASK\n+#define C3TDA1_Data_2_BIT 8\n+#define CAN3TDA1_Data_2_BIT C3TDA1_Data_2_BIT\n+#define C3TDA1_Data_3_MASK 0xFF0000\n+#define CAN3TDA1_Data_3_MASK C3TDA1_Data_3_MASK\n+#define C3TDA1_Data_3_BIT 16\n+#define CAN3TDA1_Data_3_BIT C3TDA1_Data_3_BIT\n+#define C3TDA1_Data_4_MASK 0xFF000000\n+#define CAN3TDA1_Data_4_MASK C3TDA1_Data_4_MASK\n+#define C3TDA1_Data_4_BIT 24\n+#define CAN3TDA1_Data_4_BIT C3TDA1_Data_4_BIT\n+\n+#define C3TDB1 (*(volatile unsigned long *)0xE004C03C)\n+#define CAN3TDB1 C3TDB1\n+#define C3TDB1_OFFSET 0x3C\n+#define CAN3TDB1_OFFSET C3TDB1_OFFSET\n+#define C3TDB1_Data_5_MASK 0xFF\n+#define CAN3TDB1_Data_5_MASK C3TDB1_Data_5_MASK\n+#define C3TDB1_Data_5_BIT 0\n+#define CAN3TDB1_Data_5_BIT C3TDB1_Data_5_BIT\n+#define C3TDB1_Data_6_MASK 0xFF00\n+#define CAN3TDB1_Data_6_MASK C3TDB1_Data_6_MASK\n+#define C3TDB1_Data_6_BIT 8\n+#define CAN3TDB1_Data_6_BIT C3TDB1_Data_6_BIT\n+#define C3TDB1_Data_7_MASK 0xFF0000\n+#define CAN3TDB1_Data_7_MASK C3TDB1_Data_7_MASK\n+#define C3TDB1_Data_7_BIT 16\n+#define CAN3TDB1_Data_7_BIT C3TDB1_Data_7_BIT\n+#define C3TDB1_Data_8_MASK 0xFF000000\n+#define CAN3TDB1_Data_8_MASK C3TDB1_Data_8_MASK\n+#define C3TDB1_Data_8_BIT 24\n+#define CAN3TDB1_Data_8_BIT C3TDB1_Data_8_BIT\n+\n+#define C3TFI2 (*(volatile unsigned long *)0xE004C040)\n+#define CAN3TFI2 C3TFI2\n+#define C3TFI2_OFFSET 0x40\n+#define CAN3TFI2_OFFSET C3TFI2_OFFSET\n+#define C3TFI2_PRIO_MASK 0xFF\n+#define CAN3TFI2_PRIO_MASK C3TFI2_PRIO_MASK\n+#define C3TFI2_PRIO_BIT 0\n+#define CAN3TFI2_PRIO_BIT C3TFI2_PRIO_BIT\n+#define C3TFI2_DLC_MASK 0xF0000\n+#define CAN3TFI2_DLC_MASK C3TFI2_DLC_MASK\n+#define C3TFI2_DLC_BIT 16\n+#define CAN3TFI2_DLC_BIT C3TFI2_DLC_BIT\n+#define C3TFI2_RTR_MASK 0x40000000\n+#define CAN3TFI2_RTR_MASK C3TFI2_RTR_MASK\n+#define C3TFI2_RTR 0x40000000\n+#define CAN3TFI2_RTR C3TFI2_RTR\n+#define C3TFI2_RTR_BIT 30\n+#define CAN3TFI2_RTR_BIT C3TFI2_RTR_BIT\n+#define C3TFI2_FF_MASK 0x80000000\n+#define CAN3TFI2_FF_MASK C3TFI2_FF_MASK\n+#define C3TFI2_FF 0x80000000\n+#define CAN3TFI2_FF C3TFI2_FF\n+#define C3TFI2_FF_BIT 31\n+#define CAN3TFI2_FF_BIT C3TFI2_FF_BIT\n+\n+#define C3TID2 (*(volatile unsigned long *)0xE004C044)\n+#define CAN3TID2 C3TID2\n+#define C3TID2_OFFSET 0x44\n+#define CAN3TID2_OFFSET C3TID2_OFFSET\n+#define C3TID2_ID_MASK 0x7FF\n+#define CAN3TID2_ID_MASK C3TID2_ID_MASK\n+#define C3TID2_ID_BIT 0\n+#define CAN3TID2_ID_BIT C3TID2_ID_BIT\n+\n+#define C3TDA2 (*(volatile unsigned long *)0xE004C048)\n+#define CAN3TDA2 C3TDA2\n+#define C3TDA2_OFFSET 0x48\n+#define CAN3TDA2_OFFSET C3TDA2_OFFSET\n+#define C3TDA2_Data_1_MASK 0xFF\n+#define CAN3TDA2_Data_1_MASK C3TDA2_Data_1_MASK\n+#define C3TDA2_Data_1_BIT 0\n+#define CAN3TDA2_Data_1_BIT C3TDA2_Data_1_BIT\n+#define C3TDA2_Data_2_MASK 0xFF00\n+#define CAN3TDA2_Data_2_MASK C3TDA2_Data_2_MASK\n+#define C3TDA2_Data_2_BIT 8\n+#define CAN3TDA2_Data_2_BIT C3TDA2_Data_2_BIT\n+#define C3TDA2_Data_3_MASK 0xFF0000\n+#define CAN3TDA2_Data_3_MASK C3TDA2_Data_3_MASK\n+#define C3TDA2_Data_3_BIT 16\n+#define CAN3TDA2_Data_3_BIT C3TDA2_Data_3_BIT\n+#define C3TDA2_Data_4_MASK 0xFF000000\n+#define CAN3TDA2_Data_4_MASK C3TDA2_Data_4_MASK\n+#define C3TDA2_Data_4_BIT 24\n+#define CAN3TDA2_Data_4_BIT C3TDA2_Data_4_BIT\n+\n+#define C3TDB2 (*(volatile unsigned long *)0xE004C04C)\n+#define CAN3TDB2 C3TDB2\n+#define C3TDB2_OFFSET 0x4C\n+#define CAN3TDB2_OFFSET C3TDB2_OFFSET\n+#define C3TDB2_Data_5_MASK 0xFF\n+#define CAN3TDB2_Data_5_MASK C3TDB2_Data_5_MASK\n+#define C3TDB2_Data_5_BIT 0\n+#define CAN3TDB2_Data_5_BIT C3TDB2_Data_5_BIT\n+#define C3TDB2_Data_6_MASK 0xFF00\n+#define CAN3TDB2_Data_6_MASK C3TDB2_Data_6_MASK\n+#define C3TDB2_Data_6_BIT 8\n+#define CAN3TDB2_Data_6_BIT C3TDB2_Data_6_BIT\n+#define C3TDB2_Data_7_MASK 0xFF0000\n+#define CAN3TDB2_Data_7_MASK C3TDB2_Data_7_MASK\n+#define C3TDB2_Data_7_BIT 16\n+#define CAN3TDB2_Data_7_BIT C3TDB2_Data_7_BIT\n+#define C3TDB2_Data_8_MASK 0xFF000000\n+#define CAN3TDB2_Data_8_MASK C3TDB2_Data_8_MASK\n+#define C3TDB2_Data_8_BIT 24\n+#define CAN3TDB2_Data_8_BIT C3TDB2_Data_8_BIT\n+\n+#define C3TFI3 (*(volatile unsigned long *)0xE004C050)\n+#define CAN3TFI3 C3TFI3\n+#define C3TFI3_OFFSET 0x50\n+#define CAN3TFI3_OFFSET C3TFI3_OFFSET\n+#define C3TFI3_PRIO_MASK 0xFF\n+#define CAN3TFI3_PRIO_MASK C3TFI3_PRIO_MASK\n+#define C3TFI3_PRIO_BIT 0\n+#define CAN3TFI3_PRIO_BIT C3TFI3_PRIO_BIT\n+#define C3TFI3_DLC_MASK 0xF0000\n+#define CAN3TFI3_DLC_MASK C3TFI3_DLC_MASK\n+#define C3TFI3_DLC_BIT 16\n+#define CAN3TFI3_DLC_BIT C3TFI3_DLC_BIT\n+#define C3TFI3_RTR_MASK 0x40000000\n+#define CAN3TFI3_RTR_MASK C3TFI3_RTR_MASK\n+#define C3TFI3_RTR 0x40000000\n+#define CAN3TFI3_RTR C3TFI3_RTR\n+#define C3TFI3_RTR_BIT 30\n+#define CAN3TFI3_RTR_BIT C3TFI3_RTR_BIT\n+#define C3TFI3_FF_MASK 0x80000000\n+#define CAN3TFI3_FF_MASK C3TFI3_FF_MASK\n+#define C3TFI3_FF 0x80000000\n+#define CAN3TFI3_FF C3TFI3_FF\n+#define C3TFI3_FF_BIT 31\n+#define CAN3TFI3_FF_BIT C3TFI3_FF_BIT\n+\n+#define C3TID3 (*(volatile unsigned long *)0xE004C054)\n+#define CAN3TID3 C3TID3\n+#define C3TID3_OFFSET 0x54\n+#define CAN3TID3_OFFSET C3TID3_OFFSET\n+#define C3TID3_ID_MASK 0x7FF\n+#define CAN3TID3_ID_MASK C3TID3_ID_MASK\n+#define C3TID3_ID_BIT 0\n+#define CAN3TID3_ID_BIT C3TID3_ID_BIT\n+\n+#define C3TDA3 (*(volatile unsigned long *)0xE004C058)\n+#define CAN3TDA3 C3TDA3\n+#define C3TDA3_OFFSET 0x58\n+#define CAN3TDA3_OFFSET C3TDA3_OFFSET\n+#define C3TDA3_Data_1_MASK 0xFF\n+#define CAN3TDA3_Data_1_MASK C3TDA3_Data_1_MASK\n+#define C3TDA3_Data_1_BIT 0\n+#define CAN3TDA3_Data_1_BIT C3TDA3_Data_1_BIT\n+#define C3TDA3_Data_2_MASK 0xFF00\n+#define CAN3TDA3_Data_2_MASK C3TDA3_Data_2_MASK\n+#define C3TDA3_Data_2_BIT 8\n+#define CAN3TDA3_Data_2_BIT C3TDA3_Data_2_BIT\n+#define C3TDA3_Data_3_MASK 0xFF0000\n+#define CAN3TDA3_Data_3_MASK C3TDA3_Data_3_MASK\n+#define C3TDA3_Data_3_BIT 16\n+#define CAN3TDA3_Data_3_BIT C3TDA3_Data_3_BIT\n+#define C3TDA3_Data_4_MASK 0xFF000000\n+#define CAN3TDA3_Data_4_MASK C3TDA3_Data_4_MASK\n+#define C3TDA3_Data_4_BIT 24\n+#define CAN3TDA3_Data_4_BIT C3TDA3_Data_4_BIT\n+\n+#define C3TDB3 (*(volatile unsigned long *)0xE004C05C)\n+#define CAN3TDB3 C3TDB3\n+#define C3TDB3_OFFSET 0x5C\n+#define CAN3TDB3_OFFSET C3TDB3_OFFSET\n+#define C3TDB3_Data_5_MASK 0xFF\n+#define CAN3TDB3_Data_5_MASK C3TDB3_Data_5_MASK\n+#define C3TDB3_Data_5_BIT 0\n+#define CAN3TDB3_Data_5_BIT C3TDB3_Data_5_BIT\n+#define C3TDB3_Data_6_MASK 0xFF00\n+#define CAN3TDB3_Data_6_MASK C3TDB3_Data_6_MASK\n+#define C3TDB3_Data_6_BIT 8\n+#define CAN3TDB3_Data_6_BIT C3TDB3_Data_6_BIT\n+#define C3TDB3_Data_7_MASK 0xFF0000\n+#define CAN3TDB3_Data_7_MASK C3TDB3_Data_7_MASK\n+#define C3TDB3_Data_7_BIT 16\n+#define CAN3TDB3_Data_7_BIT C3TDB3_Data_7_BIT\n+#define C3TDB3_Data_8_MASK 0xFF000000\n+#define CAN3TDB3_Data_8_MASK C3TDB3_Data_8_MASK\n+#define C3TDB3_Data_8_BIT 24\n+#define CAN3TDB3_Data_8_BIT C3TDB3_Data_8_BIT\n+\n+#define CAN4_BASE 0xE0050000\n+\n+#define C4MOD (*(volatile unsigned long *)0xE0050000)\n+#define CAN4MOD C4MOD\n+#define C4MOD_OFFSET 0x0\n+#define CAN4MOD_OFFSET C4MOD_OFFSET\n+#define C4MOD_RM_MASK 0x1\n+#define CAN4MOD_RM_MASK C4MOD_RM_MASK\n+#define C4MOD_RM 0x1\n+#define CAN4MOD_RM C4MOD_RM\n+#define C4MOD_RM_BIT 0\n+#define CAN4MOD_RM_BIT C4MOD_RM_BIT\n+#define C4MOD_LOM_MASK 0x2\n+#define CAN4MOD_LOM_MASK C4MOD_LOM_MASK\n+#define C4MOD_LOM 0x2\n+#define CAN4MOD_LOM C4MOD_LOM\n+#define C4MOD_LOM_BIT 1\n+#define CAN4MOD_LOM_BIT C4MOD_LOM_BIT\n+#define C4MOD_STM_MASK 0x4\n+#define CAN4MOD_STM_MASK C4MOD_STM_MASK\n+#define C4MOD_STM 0x4\n+#define CAN4MOD_STM C4MOD_STM\n+#define C4MOD_STM_BIT 2\n+#define CAN4MOD_STM_BIT C4MOD_STM_BIT\n+#define C4MOD_TPM_MASK 0x8\n+#define CAN4MOD_TPM_MASK C4MOD_TPM_MASK\n+#define C4MOD_TPM 0x8\n+#define CAN4MOD_TPM C4MOD_TPM\n+#define C4MOD_TPM_BIT 3\n+#define CAN4MOD_TPM_BIT C4MOD_TPM_BIT\n+#define C4MOD_SM_MASK 0x10\n+#define CAN4MOD_SM_MASK C4MOD_SM_MASK\n+#define C4MOD_SM 0x10\n+#define CAN4MOD_SM C4MOD_SM\n+#define C4MOD_SM_BIT 4\n+#define CAN4MOD_SM_BIT C4MOD_SM_BIT\n+#define C4MOD_RPM_MASK 0x20\n+#define CAN4MOD_RPM_MASK C4MOD_RPM_MASK\n+#define C4MOD_RPM 0x20\n+#define CAN4MOD_RPM C4MOD_RPM\n+#define C4MOD_RPM_BIT 5\n+#define CAN4MOD_RPM_BIT C4MOD_RPM_BIT\n+#define C4MOD_TM_MASK 0x80\n+#define CAN4MOD_TM_MASK C4MOD_TM_MASK\n+#define C4MOD_TM 0x80\n+#define CAN4MOD_TM C4MOD_TM\n+#define C4MOD_TM_BIT 7\n+#define CAN4MOD_TM_BIT C4MOD_TM_BIT\n+\n+#define C4CMR (*(volatile unsigned long *)0xE0050004)\n+#define CAN4CMR C4CMR\n+#define C4CMR_OFFSET 0x4\n+#define CAN4CMR_OFFSET C4CMR_OFFSET\n+#define C4CMR_TR_MASK 0x1\n+#define CAN4CMR_TR_MASK C4CMR_TR_MASK\n+#define C4CMR_TR 0x1\n+#define CAN4CMR_TR C4CMR_TR\n+#define C4CMR_TR_BIT 0\n+#define CAN4CMR_TR_BIT C4CMR_TR_BIT\n+#define C4CMR_AT_MASK 0x2\n+#define CAN4CMR_AT_MASK C4CMR_AT_MASK\n+#define C4CMR_AT 0x2\n+#define CAN4CMR_AT C4CMR_AT\n+#define C4CMR_AT_BIT 1\n+#define CAN4CMR_AT_BIT C4CMR_AT_BIT\n+#define C4CMR_RRB_MASK 0x4\n+#define CAN4CMR_RRB_MASK C4CMR_RRB_MASK\n+#define C4CMR_RRB 0x4\n+#define CAN4CMR_RRB C4CMR_RRB\n+#define C4CMR_RRB_BIT 2\n+#define CAN4CMR_RRB_BIT C4CMR_RRB_BIT\n+#define C4CMR_CDO_MASK 0x8\n+#define CAN4CMR_CDO_MASK C4CMR_CDO_MASK\n+#define C4CMR_CDO 0x8\n+#define CAN4CMR_CDO C4CMR_CDO\n+#define C4CMR_CDO_BIT 3\n+#define CAN4CMR_CDO_BIT C4CMR_CDO_BIT\n+#define C4CMR_SRR_MASK 0x10\n+#define CAN4CMR_SRR_MASK C4CMR_SRR_MASK\n+#define C4CMR_SRR 0x10\n+#define CAN4CMR_SRR C4CMR_SRR\n+#define C4CMR_SRR_BIT 4\n+#define CAN4CMR_SRR_BIT C4CMR_SRR_BIT\n+#define C4CMR_STB1_MASK 0x20\n+#define CAN4CMR_STB1_MASK C4CMR_STB1_MASK\n+#define C4CMR_STB1 0x20\n+#define CAN4CMR_STB1 C4CMR_STB1\n+#define C4CMR_STB1_BIT 5\n+#define CAN4CMR_STB1_BIT C4CMR_STB1_BIT\n+#define C4CMR_STB2_MASK 0x40\n+#define CAN4CMR_STB2_MASK C4CMR_STB2_MASK\n+#define C4CMR_STB2 0x40\n+#define CAN4CMR_STB2 C4CMR_STB2\n+#define C4CMR_STB2_BIT 6\n+#define CAN4CMR_STB2_BIT C4CMR_STB2_BIT\n+#define C4CMR_STB3_MASK 0x80\n+#define CAN4CMR_STB3_MASK C4CMR_STB3_MASK\n+#define C4CMR_STB3 0x80\n+#define CAN4CMR_STB3 C4CMR_STB3\n+#define C4CMR_STB3_BIT 7\n+#define CAN4CMR_STB3_BIT C4CMR_STB3_BIT\n+\n+#define C4GSR (*(volatile unsigned long *)0xE0050008)\n+#define CAN4GSR C4GSR\n+#define C4GSR_OFFSET 0x8\n+#define CAN4GSR_OFFSET C4GSR_OFFSET\n+#define C4GSR_RBS_MASK 0x1\n+#define CAN4GSR_RBS_MASK C4GSR_RBS_MASK\n+#define C4GSR_RBS 0x1\n+#define CAN4GSR_RBS C4GSR_RBS\n+#define C4GSR_RBS_BIT 0\n+#define CAN4GSR_RBS_BIT C4GSR_RBS_BIT\n+#define C4GSR_DOS_MASK 0x2\n+#define CAN4GSR_DOS_MASK C4GSR_DOS_MASK\n+#define C4GSR_DOS 0x2\n+#define CAN4GSR_DOS C4GSR_DOS\n+#define C4GSR_DOS_BIT 1\n+#define CAN4GSR_DOS_BIT C4GSR_DOS_BIT\n+#define C4GSR_TBS_MASK 0x4\n+#define CAN4GSR_TBS_MASK C4GSR_TBS_MASK\n+#define C4GSR_TBS 0x4\n+#define CAN4GSR_TBS C4GSR_TBS\n+#define C4GSR_TBS_BIT 2\n+#define CAN4GSR_TBS_BIT C4GSR_TBS_BIT\n+#define C4GSR_TCS_MASK 0x8\n+#define CAN4GSR_TCS_MASK C4GSR_TCS_MASK\n+#define C4GSR_TCS 0x8\n+#define CAN4GSR_TCS C4GSR_TCS\n+#define C4GSR_TCS_BIT 3\n+#define CAN4GSR_TCS_BIT C4GSR_TCS_BIT\n+#define C4GSR_RS_MASK 0x10\n+#define CAN4GSR_RS_MASK C4GSR_RS_MASK\n+#define C4GSR_RS 0x10\n+#define CAN4GSR_RS C4GSR_RS\n+#define C4GSR_RS_BIT 4\n+#define CAN4GSR_RS_BIT C4GSR_RS_BIT\n+#define C4GSR_TS_MASK 0x20\n+#define CAN4GSR_TS_MASK C4GSR_TS_MASK\n+#define C4GSR_TS 0x20\n+#define CAN4GSR_TS C4GSR_TS\n+#define C4GSR_TS_BIT 5\n+#define CAN4GSR_TS_BIT C4GSR_TS_BIT\n+#define C4GSR_ES_MASK 0x40\n+#define CAN4GSR_ES_MASK C4GSR_ES_MASK\n+#define C4GSR_ES 0x40\n+#define CAN4GSR_ES C4GSR_ES\n+#define C4GSR_ES_BIT 6\n+#define CAN4GSR_ES_BIT C4GSR_ES_BIT\n+#define C4GSR_BS_MASK 0x80\n+#define CAN4GSR_BS_MASK C4GSR_BS_MASK\n+#define C4GSR_BS 0x80\n+#define CAN4GSR_BS C4GSR_BS\n+#define C4GSR_BS_BIT 7\n+#define CAN4GSR_BS_BIT C4GSR_BS_BIT\n+#define C4GSR_RXERR_MASK 0xFF0000\n+#define CAN4GSR_RXERR_MASK C4GSR_RXERR_MASK\n+#define C4GSR_RXERR_BIT 16\n+#define CAN4GSR_RXERR_BIT C4GSR_RXERR_BIT\n+#define C4GSR_TXERR_MASK 0xFF000000\n+#define CAN4GSR_TXERR_MASK C4GSR_TXERR_MASK\n+#define C4GSR_TXERR_BIT 24\n+#define CAN4GSR_TXERR_BIT C4GSR_TXERR_BIT\n+\n+#define C4ICR (*(volatile unsigned long *)0xE005000C)\n+#define CAN4ICR C4ICR\n+#define C4ICR_OFFSET 0xC\n+#define CAN4ICR_OFFSET C4ICR_OFFSET\n+#define C4ICR_RI_MASK 0x1\n+#define CAN4ICR_RI_MASK C4ICR_RI_MASK\n+#define C4ICR_RI 0x1\n+#define CAN4ICR_RI C4ICR_RI\n+#define C4ICR_RI_BIT 0\n+#define CAN4ICR_RI_BIT C4ICR_RI_BIT\n+#define C4ICR_TI1_MASK 0x2\n+#define CAN4ICR_TI1_MASK C4ICR_TI1_MASK\n+#define C4ICR_TI1 0x2\n+#define CAN4ICR_TI1 C4ICR_TI1\n+#define C4ICR_TI1_BIT 1\n+#define CAN4ICR_TI1_BIT C4ICR_TI1_BIT\n+#define C4ICR_EI_MASK 0x4\n+#define CAN4ICR_EI_MASK C4ICR_EI_MASK\n+#define C4ICR_EI 0x4\n+#define CAN4ICR_EI C4ICR_EI\n+#define C4ICR_EI_BIT 2\n+#define CAN4ICR_EI_BIT C4ICR_EI_BIT\n+#define C4ICR_DOI_MASK 0x8\n+#define CAN4ICR_DOI_MASK C4ICR_DOI_MASK\n+#define C4ICR_DOI 0x8\n+#define CAN4ICR_DOI C4ICR_DOI\n+#define C4ICR_DOI_BIT 3\n+#define CAN4ICR_DOI_BIT C4ICR_DOI_BIT\n+#define C4ICR_WUI_MASK 0x10\n+#define CAN4ICR_WUI_MASK C4ICR_WUI_MASK\n+#define C4ICR_WUI 0x10\n+#define CAN4ICR_WUI C4ICR_WUI\n+#define C4ICR_WUI_BIT 4\n+#define CAN4ICR_WUI_BIT C4ICR_WUI_BIT\n+#define C4ICR_EPI_MASK 0x20\n+#define CAN4ICR_EPI_MASK C4ICR_EPI_MASK\n+#define C4ICR_EPI 0x20\n+#define CAN4ICR_EPI C4ICR_EPI\n+#define C4ICR_EPI_BIT 5\n+#define CAN4ICR_EPI_BIT C4ICR_EPI_BIT\n+#define C4ICR_ALI_MASK 0x40\n+#define CAN4ICR_ALI_MASK C4ICR_ALI_MASK\n+#define C4ICR_ALI 0x40\n+#define CAN4ICR_ALI C4ICR_ALI\n+#define C4ICR_ALI_BIT 6\n+#define CAN4ICR_ALI_BIT C4ICR_ALI_BIT\n+#define C4ICR_BEI_MASK 0x80\n+#define CAN4ICR_BEI_MASK C4ICR_BEI_MASK\n+#define C4ICR_BEI 0x80\n+#define CAN4ICR_BEI C4ICR_BEI\n+#define C4ICR_BEI_BIT 7\n+#define CAN4ICR_BEI_BIT C4ICR_BEI_BIT\n+#define C4ICR_IDI_MASK 0x100\n+#define CAN4ICR_IDI_MASK C4ICR_IDI_MASK\n+#define C4ICR_IDI 0x100\n+#define CAN4ICR_IDI C4ICR_IDI\n+#define C4ICR_IDI_BIT 8\n+#define CAN4ICR_IDI_BIT C4ICR_IDI_BIT\n+#define C4ICR_TI2_MASK 0x200\n+#define CAN4ICR_TI2_MASK C4ICR_TI2_MASK\n+#define C4ICR_TI2 0x200\n+#define CAN4ICR_TI2 C4ICR_TI2\n+#define C4ICR_TI2_BIT 9\n+#define CAN4ICR_TI2_BIT C4ICR_TI2_BIT\n+#define C4ICR_TI3_MASK 0x400\n+#define CAN4ICR_TI3_MASK C4ICR_TI3_MASK\n+#define C4ICR_TI3 0x400\n+#define CAN4ICR_TI3 C4ICR_TI3\n+#define C4ICR_TI3_BIT 10\n+#define CAN4ICR_TI3_BIT C4ICR_TI3_BIT\n+#define C4ICR_ERRBIT_MASK 0x1F0000\n+#define CAN4ICR_ERRBIT_MASK C4ICR_ERRBIT_MASK\n+#define C4ICR_ERRBIT_BIT 16\n+#define CAN4ICR_ERRBIT_BIT C4ICR_ERRBIT_BIT\n+#define C4ICR_ERRDIR_MASK 0x200000\n+#define CAN4ICR_ERRDIR_MASK C4ICR_ERRDIR_MASK\n+#define C4ICR_ERRDIR 0x200000\n+#define CAN4ICR_ERRDIR C4ICR_ERRDIR\n+#define C4ICR_ERRDIR_BIT 21\n+#define CAN4ICR_ERRDIR_BIT C4ICR_ERRDIR_BIT\n+#define C4ICR_ERRC_MASK 0xC00000\n+#define CAN4ICR_ERRC_MASK C4ICR_ERRC_MASK\n+#define C4ICR_ERRC_BIT 22\n+#define CAN4ICR_ERRC_BIT C4ICR_ERRC_BIT\n+#define C4ICR_ALCBIT_MASK 0x1F000000\n+#define CAN4ICR_ALCBIT_MASK C4ICR_ALCBIT_MASK\n+#define C4ICR_ALCBIT_BIT 24\n+#define CAN4ICR_ALCBIT_BIT C4ICR_ALCBIT_BIT\n+\n+#define C4IER (*(volatile unsigned long *)0xE0050010)\n+#define CAN4IER C4IER\n+#define C4IER_OFFSET 0x10\n+#define CAN4IER_OFFSET C4IER_OFFSET\n+#define C4IER_RIE_MASK 0x1\n+#define CAN4IER_RIE_MASK C4IER_RIE_MASK\n+#define C4IER_RIE 0x1\n+#define CAN4IER_RIE C4IER_RIE\n+#define C4IER_RIE_BIT 0\n+#define CAN4IER_RIE_BIT C4IER_RIE_BIT\n+#define C4IER_TIE1_MASK 0x2\n+#define CAN4IER_TIE1_MASK C4IER_TIE1_MASK\n+#define C4IER_TIE1 0x2\n+#define CAN4IER_TIE1 C4IER_TIE1\n+#define C4IER_TIE1_BIT 1\n+#define CAN4IER_TIE1_BIT C4IER_TIE1_BIT\n+#define C4IER_EIE_MASK 0x4\n+#define CAN4IER_EIE_MASK C4IER_EIE_MASK\n+#define C4IER_EIE 0x4\n+#define CAN4IER_EIE C4IER_EIE\n+#define C4IER_EIE_BIT 2\n+#define CAN4IER_EIE_BIT C4IER_EIE_BIT\n+#define C4IER_DOIE_MASK 0x8\n+#define CAN4IER_DOIE_MASK C4IER_DOIE_MASK\n+#define C4IER_DOIE 0x8\n+#define CAN4IER_DOIE C4IER_DOIE\n+#define C4IER_DOIE_BIT 3\n+#define CAN4IER_DOIE_BIT C4IER_DOIE_BIT\n+#define C4IER_WUIE_MASK 0x10\n+#define CAN4IER_WUIE_MASK C4IER_WUIE_MASK\n+#define C4IER_WUIE 0x10\n+#define CAN4IER_WUIE C4IER_WUIE\n+#define C4IER_WUIE_BIT 4\n+#define CAN4IER_WUIE_BIT C4IER_WUIE_BIT\n+#define C4IER_EPIE_MASK 0x20\n+#define CAN4IER_EPIE_MASK C4IER_EPIE_MASK\n+#define C4IER_EPIE 0x20\n+#define CAN4IER_EPIE C4IER_EPIE\n+#define C4IER_EPIE_BIT 5\n+#define CAN4IER_EPIE_BIT C4IER_EPIE_BIT\n+#define C4IER_ALIE_MASK 0x40\n+#define CAN4IER_ALIE_MASK C4IER_ALIE_MASK\n+#define C4IER_ALIE 0x40\n+#define CAN4IER_ALIE C4IER_ALIE\n+#define C4IER_ALIE_BIT 6\n+#define CAN4IER_ALIE_BIT C4IER_ALIE_BIT\n+#define C4IER_BEIE_MASK 0x80\n+#define CAN4IER_BEIE_MASK C4IER_BEIE_MASK\n+#define C4IER_BEIE 0x80\n+#define CAN4IER_BEIE C4IER_BEIE\n+#define C4IER_BEIE_BIT 7\n+#define CAN4IER_BEIE_BIT C4IER_BEIE_BIT\n+#define C4IER_IDIE_MASK 0x100\n+#define CAN4IER_IDIE_MASK C4IER_IDIE_MASK\n+#define C4IER_IDIE 0x100\n+#define CAN4IER_IDIE C4IER_IDIE\n+#define C4IER_IDIE_BIT 8\n+#define CAN4IER_IDIE_BIT C4IER_IDIE_BIT\n+#define C4IER_TIE2_MASK 0x200\n+#define CAN4IER_TIE2_MASK C4IER_TIE2_MASK\n+#define C4IER_TIE2 0x200\n+#define CAN4IER_TIE2 C4IER_TIE2\n+#define C4IER_TIE2_BIT 9\n+#define CAN4IER_TIE2_BIT C4IER_TIE2_BIT\n+#define C4IER_TIE3_MASK 0x400\n+#define CAN4IER_TIE3_MASK C4IER_TIE3_MASK\n+#define C4IER_TIE3 0x400\n+#define CAN4IER_TIE3 C4IER_TIE3\n+#define C4IER_TIE3_BIT 10\n+#define CAN4IER_TIE3_BIT C4IER_TIE3_BIT\n+\n+#define C4BTR (*(volatile unsigned long *)0xE0050014)\n+#define CAN4BTR C4BTR\n+#define C4BTR_OFFSET 0x14\n+#define CAN4BTR_OFFSET C4BTR_OFFSET\n+#define C4BTR_BRP_MASK 0x3FF\n+#define CAN4BTR_BRP_MASK C4BTR_BRP_MASK\n+#define C4BTR_BRP_BIT 0\n+#define CAN4BTR_BRP_BIT C4BTR_BRP_BIT\n+#define C4BTR_SJW_MASK 0xC000\n+#define CAN4BTR_SJW_MASK C4BTR_SJW_MASK\n+#define C4BTR_SJW_BIT 14\n+#define CAN4BTR_SJW_BIT C4BTR_SJW_BIT\n+#define C4BTR_TSEG1_MASK 0xF0000\n+#define CAN4BTR_TSEG1_MASK C4BTR_TSEG1_MASK\n+#define C4BTR_TSEG1_BIT 16\n+#define CAN4BTR_TSEG1_BIT C4BTR_TSEG1_BIT\n+#define C4BTR_TSEG2_MASK 0x700000\n+#define CAN4BTR_TSEG2_MASK C4BTR_TSEG2_MASK\n+#define C4BTR_TSEG2_BIT 20\n+#define CAN4BTR_TSEG2_BIT C4BTR_TSEG2_BIT\n+#define C4BTR_SAM_MASK 0x800000\n+#define CAN4BTR_SAM_MASK C4BTR_SAM_MASK\n+#define C4BTR_SAM 0x800000\n+#define CAN4BTR_SAM C4BTR_SAM\n+#define C4BTR_SAM_BIT 23\n+#define CAN4BTR_SAM_BIT C4BTR_SAM_BIT\n+\n+#define C4EWL (*(volatile unsigned long *)0xE0050018)\n+#define CAN4EWL C4EWL\n+#define C4EWL_OFFSET 0x18\n+#define CAN4EWL_OFFSET C4EWL_OFFSET\n+#define C4EWL_EWL_MASK 0xFF\n+#define CAN4EWL_EWL_MASK C4EWL_EWL_MASK\n+#define C4EWL_EWL_BIT 0\n+#define CAN4EWL_EWL_BIT C4EWL_EWL_BIT\n+\n+#define C4SR (*(volatile unsigned long *)0xE005001C)\n+#define CAN4SR C4SR\n+#define C4SR_OFFSET 0x1C\n+#define CAN4SR_OFFSET C4SR_OFFSET\n+#define C4SR_RBS_MASK 0x1\n+#define CAN4SR_RBS_MASK C4SR_RBS_MASK\n+#define C4SR_RBS 0x1\n+#define CAN4SR_RBS C4SR_RBS\n+#define C4SR_RBS_BIT 0\n+#define CAN4SR_RBS_BIT C4SR_RBS_BIT\n+#define C4SR_DOS_MASK 0x2\n+#define CAN4SR_DOS_MASK C4SR_DOS_MASK\n+#define C4SR_DOS 0x2\n+#define CAN4SR_DOS C4SR_DOS\n+#define C4SR_DOS_BIT 1\n+#define CAN4SR_DOS_BIT C4SR_DOS_BIT\n+#define C4SR_TBS1_MASK 0x4\n+#define CAN4SR_TBS1_MASK C4SR_TBS1_MASK\n+#define C4SR_TBS1 0x4\n+#define CAN4SR_TBS1 C4SR_TBS1\n+#define C4SR_TBS1_BIT 2\n+#define CAN4SR_TBS1_BIT C4SR_TBS1_BIT\n+#define C4SR_TCS1_MASK 0x8\n+#define CAN4SR_TCS1_MASK C4SR_TCS1_MASK\n+#define C4SR_TCS1 0x8\n+#define CAN4SR_TCS1 C4SR_TCS1\n+#define C4SR_TCS1_BIT 3\n+#define CAN4SR_TCS1_BIT C4SR_TCS1_BIT\n+#define C4SR_RS_MASK 0x10\n+#define CAN4SR_RS_MASK C4SR_RS_MASK\n+#define C4SR_RS 0x10\n+#define CAN4SR_RS C4SR_RS\n+#define C4SR_RS_BIT 4\n+#define CAN4SR_RS_BIT C4SR_RS_BIT\n+#define C4SR_TS1_MASK 0x20\n+#define CAN4SR_TS1_MASK C4SR_TS1_MASK\n+#define C4SR_TS1 0x20\n+#define CAN4SR_TS1 C4SR_TS1\n+#define C4SR_TS1_BIT 5\n+#define CAN4SR_TS1_BIT C4SR_TS1_BIT\n+#define C4SR_ES_MASK 0x40\n+#define CAN4SR_ES_MASK C4SR_ES_MASK\n+#define C4SR_ES 0x40\n+#define CAN4SR_ES C4SR_ES\n+#define C4SR_ES_BIT 6\n+#define CAN4SR_ES_BIT C4SR_ES_BIT\n+#define C4SR_BS_MASK 0x80\n+#define CAN4SR_BS_MASK C4SR_BS_MASK\n+#define C4SR_BS 0x80\n+#define CAN4SR_BS C4SR_BS\n+#define C4SR_BS_BIT 7\n+#define CAN4SR_BS_BIT C4SR_BS_BIT\n+#define C4SR_RBS2_MASK 0x100\n+#define CAN4SR_RBS2_MASK C4SR_RBS2_MASK\n+#define C4SR_RBS2 0x100\n+#define CAN4SR_RBS2 C4SR_RBS2\n+#define C4SR_RBS2_BIT 8\n+#define CAN4SR_RBS2_BIT C4SR_RBS2_BIT\n+#define C4SR_DOS2_MASK 0x200\n+#define CAN4SR_DOS2_MASK C4SR_DOS2_MASK\n+#define C4SR_DOS2 0x200\n+#define CAN4SR_DOS2 C4SR_DOS2\n+#define C4SR_DOS2_BIT 9\n+#define CAN4SR_DOS2_BIT C4SR_DOS2_BIT\n+#define C4SR_TBS2_MASK 0x400\n+#define CAN4SR_TBS2_MASK C4SR_TBS2_MASK\n+#define C4SR_TBS2 0x400\n+#define CAN4SR_TBS2 C4SR_TBS2\n+#define C4SR_TBS2_BIT 10\n+#define CAN4SR_TBS2_BIT C4SR_TBS2_BIT\n+#define C4SR_TCS2_MASK 0x800\n+#define CAN4SR_TCS2_MASK C4SR_TCS2_MASK\n+#define C4SR_TCS2 0x800\n+#define CAN4SR_TCS2 C4SR_TCS2\n+#define C4SR_TCS2_BIT 11\n+#define CAN4SR_TCS2_BIT C4SR_TCS2_BIT\n+#define C4SR_RS2_MASK 0x1000\n+#define CAN4SR_RS2_MASK C4SR_RS2_MASK\n+#define C4SR_RS2 0x1000\n+#define CAN4SR_RS2 C4SR_RS2\n+#define C4SR_RS2_BIT 12\n+#define CAN4SR_RS2_BIT C4SR_RS2_BIT\n+#define C4SR_TS2_MASK 0x2000\n+#define CAN4SR_TS2_MASK C4SR_TS2_MASK\n+#define C4SR_TS2 0x2000\n+#define CAN4SR_TS2 C4SR_TS2\n+#define C4SR_TS2_BIT 13\n+#define CAN4SR_TS2_BIT C4SR_TS2_BIT\n+#define C4SR_ES2_MASK 0x4000\n+#define CAN4SR_ES2_MASK C4SR_ES2_MASK\n+#define C4SR_ES2 0x4000\n+#define CAN4SR_ES2 C4SR_ES2\n+#define C4SR_ES2_BIT 14\n+#define CAN4SR_ES2_BIT C4SR_ES2_BIT\n+#define C4SR_BS2_MASK 0x8000\n+#define CAN4SR_BS2_MASK C4SR_BS2_MASK\n+#define C4SR_BS2 0x8000\n+#define CAN4SR_BS2 C4SR_BS2\n+#define C4SR_BS2_BIT 15\n+#define CAN4SR_BS2_BIT C4SR_BS2_BIT\n+#define C4SR_RBS3_MASK 0x10000\n+#define CAN4SR_RBS3_MASK C4SR_RBS3_MASK\n+#define C4SR_RBS3 0x10000\n+#define CAN4SR_RBS3 C4SR_RBS3\n+#define C4SR_RBS3_BIT 16\n+#define CAN4SR_RBS3_BIT C4SR_RBS3_BIT\n+#define C4SR_DOS3_MASK 0x20000\n+#define CAN4SR_DOS3_MASK C4SR_DOS3_MASK\n+#define C4SR_DOS3 0x20000\n+#define CAN4SR_DOS3 C4SR_DOS3\n+#define C4SR_DOS3_BIT 17\n+#define CAN4SR_DOS3_BIT C4SR_DOS3_BIT\n+#define C4SR_TBS3_MASK 0x40000\n+#define CAN4SR_TBS3_MASK C4SR_TBS3_MASK\n+#define C4SR_TBS3 0x40000\n+#define CAN4SR_TBS3 C4SR_TBS3\n+#define C4SR_TBS3_BIT 18\n+#define CAN4SR_TBS3_BIT C4SR_TBS3_BIT\n+#define C4SR_TCS3_MASK 0x80000\n+#define CAN4SR_TCS3_MASK C4SR_TCS3_MASK\n+#define C4SR_TCS3 0x80000\n+#define CAN4SR_TCS3 C4SR_TCS3\n+#define C4SR_TCS3_BIT 19\n+#define CAN4SR_TCS3_BIT C4SR_TCS3_BIT\n+#define C4SR_RS3_MASK 0x100000\n+#define CAN4SR_RS3_MASK C4SR_RS3_MASK\n+#define C4SR_RS3 0x100000\n+#define CAN4SR_RS3 C4SR_RS3\n+#define C4SR_RS3_BIT 20\n+#define CAN4SR_RS3_BIT C4SR_RS3_BIT\n+#define C4SR_TS3_MASK 0x200000\n+#define CAN4SR_TS3_MASK C4SR_TS3_MASK\n+#define C4SR_TS3 0x200000\n+#define CAN4SR_TS3 C4SR_TS3\n+#define C4SR_TS3_BIT 21\n+#define CAN4SR_TS3_BIT C4SR_TS3_BIT\n+#define C4SR_ES3_MASK 0x400000\n+#define CAN4SR_ES3_MASK C4SR_ES3_MASK\n+#define C4SR_ES3 0x400000\n+#define CAN4SR_ES3 C4SR_ES3\n+#define C4SR_ES3_BIT 22\n+#define CAN4SR_ES3_BIT C4SR_ES3_BIT\n+#define C4SR_BS3_MASK 0x800000\n+#define CAN4SR_BS3_MASK C4SR_BS3_MASK\n+#define C4SR_BS3 0x800000\n+#define CAN4SR_BS3 C4SR_BS3\n+#define C4SR_BS3_BIT 23\n+#define CAN4SR_BS3_BIT C4SR_BS3_BIT\n+\n+#define C4RFS (*(volatile unsigned long *)0xE0050020)\n+#define CAN4RFS C4RFS\n+#define C4RFS_OFFSET 0x20\n+#define CAN4RFS_OFFSET C4RFS_OFFSET\n+#define C4RFS_ID_Index_MASK 0x3FF\n+#define CAN4RFS_ID_Index_MASK C4RFS_ID_Index_MASK\n+#define C4RFS_ID_Index_BIT 0\n+#define CAN4RFS_ID_Index_BIT C4RFS_ID_Index_BIT\n+#define C4RFS_BP_MASK 0x400\n+#define CAN4RFS_BP_MASK C4RFS_BP_MASK\n+#define C4RFS_BP 0x400\n+#define CAN4RFS_BP C4RFS_BP\n+#define C4RFS_BP_BIT 10\n+#define CAN4RFS_BP_BIT C4RFS_BP_BIT\n+#define C4RFS_DLC_MASK 0xF0000\n+#define CAN4RFS_DLC_MASK C4RFS_DLC_MASK\n+#define C4RFS_DLC_BIT 16\n+#define CAN4RFS_DLC_BIT C4RFS_DLC_BIT\n+#define C4RFS_RTR_MASK 0x40000000\n+#define CAN4RFS_RTR_MASK C4RFS_RTR_MASK\n+#define C4RFS_RTR 0x40000000\n+#define CAN4RFS_RTR C4RFS_RTR\n+#define C4RFS_RTR_BIT 30\n+#define CAN4RFS_RTR_BIT C4RFS_RTR_BIT\n+#define C4RFS_FF_MASK 0x80000000\n+#define CAN4RFS_FF_MASK C4RFS_FF_MASK\n+#define C4RFS_FF 0x80000000\n+#define CAN4RFS_FF C4RFS_FF\n+#define C4RFS_FF_BIT 31\n+#define CAN4RFS_FF_BIT C4RFS_FF_BIT\n+\n+#define C4RID (*(volatile unsigned long *)0xE0050024)\n+#define CAN4RID C4RID\n+#define C4RID_OFFSET 0x24\n+#define CAN4RID_OFFSET C4RID_OFFSET\n+#define C4RID_ID_MASK 0x7FF\n+#define CAN4RID_ID_MASK C4RID_ID_MASK\n+#define C4RID_ID_BIT 0\n+#define CAN4RID_ID_BIT C4RID_ID_BIT\n+\n+#define C4RDA (*(volatile unsigned long *)0xE0050028)\n+#define CAN4RDA C4RDA\n+#define C4RDA_OFFSET 0x28\n+#define CAN4RDA_OFFSET C4RDA_OFFSET\n+#define C4RDA_Data_1_MASK 0xFF\n+#define CAN4RDA_Data_1_MASK C4RDA_Data_1_MASK\n+#define C4RDA_Data_1_BIT 0\n+#define CAN4RDA_Data_1_BIT C4RDA_Data_1_BIT\n+#define C4RDA_Data_2_MASK 0xFF00\n+#define CAN4RDA_Data_2_MASK C4RDA_Data_2_MASK\n+#define C4RDA_Data_2_BIT 8\n+#define CAN4RDA_Data_2_BIT C4RDA_Data_2_BIT\n+#define C4RDA_Data_3_MASK 0xFF0000\n+#define CAN4RDA_Data_3_MASK C4RDA_Data_3_MASK\n+#define C4RDA_Data_3_BIT 16\n+#define CAN4RDA_Data_3_BIT C4RDA_Data_3_BIT\n+#define C4RDA_Data_4_MASK 0xFF000000\n+#define CAN4RDA_Data_4_MASK C4RDA_Data_4_MASK\n+#define C4RDA_Data_4_BIT 24\n+#define CAN4RDA_Data_4_BIT C4RDA_Data_4_BIT\n+\n+#define C4RDB (*(volatile unsigned long *)0xE005002C)\n+#define CAN4RDB C4RDB\n+#define C4RDB_OFFSET 0x2C\n+#define CAN4RDB_OFFSET C4RDB_OFFSET\n+#define C4RDB_Data_5_MASK 0xFF\n+#define CAN4RDB_Data_5_MASK C4RDB_Data_5_MASK\n+#define C4RDB_Data_5_BIT 0\n+#define CAN4RDB_Data_5_BIT C4RDB_Data_5_BIT\n+#define C4RDB_Data_6_MASK 0xFF00\n+#define CAN4RDB_Data_6_MASK C4RDB_Data_6_MASK\n+#define C4RDB_Data_6_BIT 8\n+#define CAN4RDB_Data_6_BIT C4RDB_Data_6_BIT\n+#define C4RDB_Data_7_MASK 0xFF0000\n+#define CAN4RDB_Data_7_MASK C4RDB_Data_7_MASK\n+#define C4RDB_Data_7_BIT 16\n+#define CAN4RDB_Data_7_BIT C4RDB_Data_7_BIT\n+#define C4RDB_Data_8_MASK 0xFF000000\n+#define CAN4RDB_Data_8_MASK C4RDB_Data_8_MASK\n+#define C4RDB_Data_8_BIT 24\n+#define CAN4RDB_Data_8_BIT C4RDB_Data_8_BIT\n+\n+#define C4TFI1 (*(volatile unsigned long *)0xE0050030)\n+#define CAN4TFI1 C4TFI1\n+#define C4TFI1_OFFSET 0x30\n+#define CAN4TFI1_OFFSET C4TFI1_OFFSET\n+#define C4TFI1_PRIO_MASK 0xFF\n+#define CAN4TFI1_PRIO_MASK C4TFI1_PRIO_MASK\n+#define C4TFI1_PRIO_BIT 0\n+#define CAN4TFI1_PRIO_BIT C4TFI1_PRIO_BIT\n+#define C4TFI1_DLC_MASK 0xF0000\n+#define CAN4TFI1_DLC_MASK C4TFI1_DLC_MASK\n+#define C4TFI1_DLC_BIT 16\n+#define CAN4TFI1_DLC_BIT C4TFI1_DLC_BIT\n+#define C4TFI1_RTR_MASK 0x40000000\n+#define CAN4TFI1_RTR_MASK C4TFI1_RTR_MASK\n+#define C4TFI1_RTR 0x40000000\n+#define CAN4TFI1_RTR C4TFI1_RTR\n+#define C4TFI1_RTR_BIT 30\n+#define CAN4TFI1_RTR_BIT C4TFI1_RTR_BIT\n+#define C4TFI1_FF_MASK 0x80000000\n+#define CAN4TFI1_FF_MASK C4TFI1_FF_MASK\n+#define C4TFI1_FF 0x80000000\n+#define CAN4TFI1_FF C4TFI1_FF\n+#define C4TFI1_FF_BIT 31\n+#define CAN4TFI1_FF_BIT C4TFI1_FF_BIT\n+\n+#define C4TID1 (*(volatile unsigned long *)0xE0050034)\n+#define CAN4TID1 C4TID1\n+#define C4TID1_OFFSET 0x34\n+#define CAN4TID1_OFFSET C4TID1_OFFSET\n+#define C4TID1_ID_MASK 0x7FF\n+#define CAN4TID1_ID_MASK C4TID1_ID_MASK\n+#define C4TID1_ID_BIT 0\n+#define CAN4TID1_ID_BIT C4TID1_ID_BIT\n+\n+#define C4TDA1 (*(volatile unsigned long *)0xE0050038)\n+#define CAN4TDA1 C4TDA1\n+#define C4TDA1_OFFSET 0x38\n+#define CAN4TDA1_OFFSET C4TDA1_OFFSET\n+#define C4TDA1_Data_1_MASK 0xFF\n+#define CAN4TDA1_Data_1_MASK C4TDA1_Data_1_MASK\n+#define C4TDA1_Data_1_BIT 0\n+#define CAN4TDA1_Data_1_BIT C4TDA1_Data_1_BIT\n+#define C4TDA1_Data_2_MASK 0xFF00\n+#define CAN4TDA1_Data_2_MASK C4TDA1_Data_2_MASK\n+#define C4TDA1_Data_2_BIT 8\n+#define CAN4TDA1_Data_2_BIT C4TDA1_Data_2_BIT\n+#define C4TDA1_Data_3_MASK 0xFF0000\n+#define CAN4TDA1_Data_3_MASK C4TDA1_Data_3_MASK\n+#define C4TDA1_Data_3_BIT 16\n+#define CAN4TDA1_Data_3_BIT C4TDA1_Data_3_BIT\n+#define C4TDA1_Data_4_MASK 0xFF000000\n+#define CAN4TDA1_Data_4_MASK C4TDA1_Data_4_MASK\n+#define C4TDA1_Data_4_BIT 24\n+#define CAN4TDA1_Data_4_BIT C4TDA1_Data_4_BIT\n+\n+#define C4TDB1 (*(volatile unsigned long *)0xE005003C)\n+#define CAN4TDB1 C4TDB1\n+#define C4TDB1_OFFSET 0x3C\n+#define CAN4TDB1_OFFSET C4TDB1_OFFSET\n+#define C4TDB1_Data_5_MASK 0xFF\n+#define CAN4TDB1_Data_5_MASK C4TDB1_Data_5_MASK\n+#define C4TDB1_Data_5_BIT 0\n+#define CAN4TDB1_Data_5_BIT C4TDB1_Data_5_BIT\n+#define C4TDB1_Data_6_MASK 0xFF00\n+#define CAN4TDB1_Data_6_MASK C4TDB1_Data_6_MASK\n+#define C4TDB1_Data_6_BIT 8\n+#define CAN4TDB1_Data_6_BIT C4TDB1_Data_6_BIT\n+#define C4TDB1_Data_7_MASK 0xFF0000\n+#define CAN4TDB1_Data_7_MASK C4TDB1_Data_7_MASK\n+#define C4TDB1_Data_7_BIT 16\n+#define CAN4TDB1_Data_7_BIT C4TDB1_Data_7_BIT\n+#define C4TDB1_Data_8_MASK 0xFF000000\n+#define CAN4TDB1_Data_8_MASK C4TDB1_Data_8_MASK\n+#define C4TDB1_Data_8_BIT 24\n+#define CAN4TDB1_Data_8_BIT C4TDB1_Data_8_BIT\n+\n+#define C4TFI2 (*(volatile unsigned long *)0xE0050040)\n+#define CAN4TFI2 C4TFI2\n+#define C4TFI2_OFFSET 0x40\n+#define CAN4TFI2_OFFSET C4TFI2_OFFSET\n+#define C4TFI2_PRIO_MASK 0xFF\n+#define CAN4TFI2_PRIO_MASK C4TFI2_PRIO_MASK\n+#define C4TFI2_PRIO_BIT 0\n+#define CAN4TFI2_PRIO_BIT C4TFI2_PRIO_BIT\n+#define C4TFI2_DLC_MASK 0xF0000\n+#define CAN4TFI2_DLC_MASK C4TFI2_DLC_MASK\n+#define C4TFI2_DLC_BIT 16\n+#define CAN4TFI2_DLC_BIT C4TFI2_DLC_BIT\n+#define C4TFI2_RTR_MASK 0x40000000\n+#define CAN4TFI2_RTR_MASK C4TFI2_RTR_MASK\n+#define C4TFI2_RTR 0x40000000\n+#define CAN4TFI2_RTR C4TFI2_RTR\n+#define C4TFI2_RTR_BIT 30\n+#define CAN4TFI2_RTR_BIT C4TFI2_RTR_BIT\n+#define C4TFI2_FF_MASK 0x80000000\n+#define CAN4TFI2_FF_MASK C4TFI2_FF_MASK\n+#define C4TFI2_FF 0x80000000\n+#define CAN4TFI2_FF C4TFI2_FF\n+#define C4TFI2_FF_BIT 31\n+#define CAN4TFI2_FF_BIT C4TFI2_FF_BIT\n+\n+#define C4TID2 (*(volatile unsigned long *)0xE0050044)\n+#define CAN4TID2 C4TID2\n+#define C4TID2_OFFSET 0x44\n+#define CAN4TID2_OFFSET C4TID2_OFFSET\n+#define C4TID2_ID_MASK 0x7FF\n+#define CAN4TID2_ID_MASK C4TID2_ID_MASK\n+#define C4TID2_ID_BIT 0\n+#define CAN4TID2_ID_BIT C4TID2_ID_BIT\n+\n+#define C4TDA2 (*(volatile unsigned long *)0xE0050048)\n+#define CAN4TDA2 C4TDA2\n+#define C4TDA2_OFFSET 0x48\n+#define CAN4TDA2_OFFSET C4TDA2_OFFSET\n+#define C4TDA2_Data_1_MASK 0xFF\n+#define CAN4TDA2_Data_1_MASK C4TDA2_Data_1_MASK\n+#define C4TDA2_Data_1_BIT 0\n+#define CAN4TDA2_Data_1_BIT C4TDA2_Data_1_BIT\n+#define C4TDA2_Data_2_MASK 0xFF00\n+#define CAN4TDA2_Data_2_MASK C4TDA2_Data_2_MASK\n+#define C4TDA2_Data_2_BIT 8\n+#define CAN4TDA2_Data_2_BIT C4TDA2_Data_2_BIT\n+#define C4TDA2_Data_3_MASK 0xFF0000\n+#define CAN4TDA2_Data_3_MASK C4TDA2_Data_3_MASK\n+#define C4TDA2_Data_3_BIT 16\n+#define CAN4TDA2_Data_3_BIT C4TDA2_Data_3_BIT\n+#define C4TDA2_Data_4_MASK 0xFF000000\n+#define CAN4TDA2_Data_4_MASK C4TDA2_Data_4_MASK\n+#define C4TDA2_Data_4_BIT 24\n+#define CAN4TDA2_Data_4_BIT C4TDA2_Data_4_BIT\n+\n+#define C4TDB2 (*(volatile unsigned long *)0xE005004C)\n+#define CAN4TDB2 C4TDB2\n+#define C4TDB2_OFFSET 0x4C\n+#define CAN4TDB2_OFFSET C4TDB2_OFFSET\n+#define C4TDB2_Data_5_MASK 0xFF\n+#define CAN4TDB2_Data_5_MASK C4TDB2_Data_5_MASK\n+#define C4TDB2_Data_5_BIT 0\n+#define CAN4TDB2_Data_5_BIT C4TDB2_Data_5_BIT\n+#define C4TDB2_Data_6_MASK 0xFF00\n+#define CAN4TDB2_Data_6_MASK C4TDB2_Data_6_MASK\n+#define C4TDB2_Data_6_BIT 8\n+#define CAN4TDB2_Data_6_BIT C4TDB2_Data_6_BIT\n+#define C4TDB2_Data_7_MASK 0xFF0000\n+#define CAN4TDB2_Data_7_MASK C4TDB2_Data_7_MASK\n+#define C4TDB2_Data_7_BIT 16\n+#define CAN4TDB2_Data_7_BIT C4TDB2_Data_7_BIT\n+#define C4TDB2_Data_8_MASK 0xFF000000\n+#define CAN4TDB2_Data_8_MASK C4TDB2_Data_8_MASK\n+#define C4TDB2_Data_8_BIT 24\n+#define CAN4TDB2_Data_8_BIT C4TDB2_Data_8_BIT\n+\n+#define C4TFI3 (*(volatile unsigned long *)0xE0050050)\n+#define CAN4TFI3 C4TFI3\n+#define C4TFI3_OFFSET 0x50\n+#define CAN4TFI3_OFFSET C4TFI3_OFFSET\n+#define C4TFI3_PRIO_MASK 0xFF\n+#define CAN4TFI3_PRIO_MASK C4TFI3_PRIO_MASK\n+#define C4TFI3_PRIO_BIT 0\n+#define CAN4TFI3_PRIO_BIT C4TFI3_PRIO_BIT\n+#define C4TFI3_DLC_MASK 0xF0000\n+#define CAN4TFI3_DLC_MASK C4TFI3_DLC_MASK\n+#define C4TFI3_DLC_BIT 16\n+#define CAN4TFI3_DLC_BIT C4TFI3_DLC_BIT\n+#define C4TFI3_RTR_MASK 0x40000000\n+#define CAN4TFI3_RTR_MASK C4TFI3_RTR_MASK\n+#define C4TFI3_RTR 0x40000000\n+#define CAN4TFI3_RTR C4TFI3_RTR\n+#define C4TFI3_RTR_BIT 30\n+#define CAN4TFI3_RTR_BIT C4TFI3_RTR_BIT\n+#define C4TFI3_FF_MASK 0x80000000\n+#define CAN4TFI3_FF_MASK C4TFI3_FF_MASK\n+#define C4TFI3_FF 0x80000000\n+#define CAN4TFI3_FF C4TFI3_FF\n+#define C4TFI3_FF_BIT 31\n+#define CAN4TFI3_FF_BIT C4TFI3_FF_BIT\n+\n+#define C4TID3 (*(volatile unsigned long *)0xE0050054)\n+#define CAN4TID3 C4TID3\n+#define C4TID3_OFFSET 0x54\n+#define CAN4TID3_OFFSET C4TID3_OFFSET\n+#define C4TID3_ID_MASK 0x7FF\n+#define CAN4TID3_ID_MASK C4TID3_ID_MASK\n+#define C4TID3_ID_BIT 0\n+#define CAN4TID3_ID_BIT C4TID3_ID_BIT\n+\n+#define C4TDA3 (*(volatile unsigned long *)0xE0050058)\n+#define CAN4TDA3 C4TDA3\n+#define C4TDA3_OFFSET 0x58\n+#define CAN4TDA3_OFFSET C4TDA3_OFFSET\n+#define C4TDA3_Data_1_MASK 0xFF\n+#define CAN4TDA3_Data_1_MASK C4TDA3_Data_1_MASK\n+#define C4TDA3_Data_1_BIT 0\n+#define CAN4TDA3_Data_1_BIT C4TDA3_Data_1_BIT\n+#define C4TDA3_Data_2_MASK 0xFF00\n+#define CAN4TDA3_Data_2_MASK C4TDA3_Data_2_MASK\n+#define C4TDA3_Data_2_BIT 8\n+#define CAN4TDA3_Data_2_BIT C4TDA3_Data_2_BIT\n+#define C4TDA3_Data_3_MASK 0xFF0000\n+#define CAN4TDA3_Data_3_MASK C4TDA3_Data_3_MASK\n+#define C4TDA3_Data_3_BIT 16\n+#define CAN4TDA3_Data_3_BIT C4TDA3_Data_3_BIT\n+#define C4TDA3_Data_4_MASK 0xFF000000\n+#define CAN4TDA3_Data_4_MASK C4TDA3_Data_4_MASK\n+#define C4TDA3_Data_4_BIT 24\n+#define CAN4TDA3_Data_4_BIT C4TDA3_Data_4_BIT\n+\n+#define C4TDB3 (*(volatile unsigned long *)0xE005005C)\n+#define CAN4TDB3 C4TDB3\n+#define C4TDB3_OFFSET 0x5C\n+#define CAN4TDB3_OFFSET C4TDB3_OFFSET\n+#define C4TDB3_Data_5_MASK 0xFF\n+#define CAN4TDB3_Data_5_MASK C4TDB3_Data_5_MASK\n+#define C4TDB3_Data_5_BIT 0\n+#define CAN4TDB3_Data_5_BIT C4TDB3_Data_5_BIT\n+#define C4TDB3_Data_6_MASK 0xFF00\n+#define CAN4TDB3_Data_6_MASK C4TDB3_Data_6_MASK\n+#define C4TDB3_Data_6_BIT 8\n+#define CAN4TDB3_Data_6_BIT C4TDB3_Data_6_BIT\n+#define C4TDB3_Data_7_MASK 0xFF0000\n+#define CAN4TDB3_Data_7_MASK C4TDB3_Data_7_MASK\n+#define C4TDB3_Data_7_BIT 16\n+#define CAN4TDB3_Data_7_BIT C4TDB3_Data_7_BIT\n+#define C4TDB3_Data_8_MASK 0xFF000000\n+#define CAN4TDB3_Data_8_MASK C4TDB3_Data_8_MASK\n+#define C4TDB3_Data_8_BIT 24\n+#define CAN4TDB3_Data_8_BIT C4TDB3_Data_8_BIT\n+\n+#define SSP_BASE 0xE005C000\n+\n+#define SSPCR0 (*(volatile unsigned long *)0xE005C000)\n+#define SSPCR0_OFFSET 0x0\n+#define SSPCR0_SCR_MASK 0xFF00\n+#define SSPCR0_SCR_BIT 8\n+#define SSPCR0_CPHA_MASK 0x80\n+#define SSPCR0_CPHA 0x80\n+#define SSPCR0_CPHA_BIT 7\n+#define SSPCR0_CPOL_MASK 0x40\n+#define SSPCR0_CPOL 0x40\n+#define SSPCR0_CPOL_BIT 6\n+#define SSPCR0_FRF_MASK 0x30\n+#define SSPCR0_FRF_BIT 4\n+#define SSPCR0_DSS_MASK 0xF\n+#define SSPCR0_DSS_BIT 0\n+\n+#define SSPCR1 (*(volatile unsigned long *)0xE005C004)\n+#define SSPCR1_OFFSET 0x4\n+#define SSPCR1_SOD_MASK 0x8\n+#define SSPCR1_SOD 0x8\n+#define SSPCR1_SOD_BIT 3\n+#define SSPCR1_MS_MASK 0x4\n+#define SSPCR1_MS 0x4\n+#define SSPCR1_MS_BIT 2\n+#define SSPCR1_SSE_MASK 0x2\n+#define SSPCR1_SSE 0x2\n+#define SSPCR1_SSE_BIT 1\n+#define SSPCR1_LBE_MASK 0x1\n+#define SSPCR1_LBE 0x1\n+#define SSPCR1_LBE_BIT 0\n+\n+#define SSPDR (*(volatile unsigned long *)0xE005C008)\n+#define SSPDR_OFFSET 0x8\n+\n+#define SSPSR (*(volatile unsigned long *)0xE005C00C)\n+#define SSPSR_OFFSET 0xC\n+#define SSPSR_BSY_MASK 0x10\n+#define SSPSR_BSY 0x10\n+#define SSPSR_BSY_BIT 4\n+#define SSPSR_RFF_MASK 0x8\n+#define SSPSR_RFF 0x8\n+#define SSPSR_RFF_BIT 3\n+#define SSPSR_RNE_MASK 0x4\n+#define SSPSR_RNE 0x4\n+#define SSPSR_RNE_BIT 2\n+#define SSPSR_TNF_MASK 0x2\n+#define SSPSR_TNF 0x2\n+#define SSPSR_TNF_BIT 1\n+#define SSPSR_TFE_MASK 0x1\n+#define SSPSR_TFE 0x1\n+#define SSPSR_TFE_BIT 0\n+\n+#define SSPCPSR (*(volatile unsigned long *)0xE005C010)\n+#define SSPCPSR_OFFSET 0x10\n+#define SSPCPSR_CPSDVSR_MASK 0xFF\n+#define SSPCPSR_CPSDVSR_BIT 0\n+\n+#define SSPIMSC (*(volatile unsigned long *)0xE005C014)\n+#define SSPIMSC_OFFSET 0x14\n+#define SSPIMSC_TXIM_MASK 0x8\n+#define SSPIMSC_TXIM 0x8\n+#define SSPIMSC_TXIM_BIT 3\n+#define SSPIMSC_RXIM_MASK 0x4\n+#define SSPIMSC_RXIM 0x4\n+#define SSPIMSC_RXIM_BIT 2\n+#define SSPIMSC_RTIM_MASK 0x2\n+#define SSPIMSC_RTIM 0x2\n+#define SSPIMSC_RTIM_BIT 1\n+#define SSPIMSC_RORIM_MASK 0x1\n+#define SSPIMSC_RORIM 0x1\n+#define SSPIMSC_RORIM_BIT 0\n+\n+#define SSPRIS (*(volatile unsigned long *)0xE005C018)\n+#define SSPRIS_OFFSET 0x18\n+#define SSPRIS_TXRIS_MASK 0x8\n+#define SSPRIS_TXRIS 0x8\n+#define SSPRIS_TXRIS_BIT 3\n+#define SSPRIS_RXRIS_MASK 0x4\n+#define SSPRIS_RXRIS 0x4\n+#define SSPRIS_RXRIS_BIT 2\n+#define SSPRIS_RTRIS_MASK 0x2\n+#define SSPRIS_RTRIS 0x2\n+#define SSPRIS_RTRIS_BIT 1\n+#define SSPRIS_RORRIS_MASK 0x1\n+#define SSPRIS_RORRIS 0x1\n+#define SSPRIS_RORRIS_BIT 0\n+\n+#define SSPMIS (*(volatile unsigned long *)0xE005C01C)\n+#define SSPMIS_OFFSET 0x1C\n+#define SSPMIS_TXMIS_MASK 0x8\n+#define SSPMIS_TXMIS 0x8\n+#define SSPMIS_TXMIS_BIT 3\n+#define SSPMIS_RXMIS_MASK 0x4\n+#define SSPMIS_RXMIS 0x4\n+#define SSPMIS_RXMIS_BIT 2\n+#define SSPMIS_RTMIS_MASK 0x2\n+#define SSPMIS_RTMIS 0x2\n+#define SSPMIS_RTMIS_BIT 1\n+#define SSPMIS_RORMIS_MASK 0x1\n+#define SSPMIS_RORMIS 0x1\n+#define SSPMIS_RORMIS_BIT 0\n+\n+#define SSPICR (*(volatile unsigned long *)0xE005C020)\n+#define SSPICR_OFFSET 0x20\n+#define SSPICR_RTIC_MASK 0x2\n+#define SSPICR_RTIC 0x2\n+#define SSPICR_RTIC_BIT 1\n+#define SSPICR_RORIC_MASK 0x1\n+#define SSPICR_RORIC 0x1\n+#define SSPICR_RORIC_BIT 0\n+\n+#define SCB_BASE 0xE01FC000\n+\n+#define MAMCR (*(volatile unsigned char *)0xE01FC000)\n+#define MAMCR_OFFSET 0x0\n+#define MAMCR_MAM_mode_control_MASK 0x3\n+#define MAMCR_MAM_mode_control_BIT 0\n+\n+#define MAMTIM (*(volatile unsigned char *)0xE01FC004)\n+#define MAMTIM_OFFSET 0x4\n+#define MAMTIM_MAM_fetch_cycle_timing_MASK 0x7\n+#define MAMTIM_MAM_fetch_cycle_timing_BIT 0\n+\n+#define MEMMAP (*(volatile unsigned char *)0xE01FC040)\n+#define MEMMAP_OFFSET 0x40\n+#define MEMMAP_MAP_MASK 0x3\n+#define MEMMAP_MAP_BIT 0\n+\n+#define PLLCON (*(volatile unsigned char *)0xE01FC080)\n+#define PLLCON_OFFSET 0x80\n+#define PLLCON_PLLE_MASK 0x1\n+#define PLLCON_PLLE 0x1\n+#define PLLCON_PLLE_BIT 0\n+#define PLLCON_PLLC_MASK 0x2\n+#define PLLCON_PLLC 0x2\n+#define PLLCON_PLLC_BIT 1\n+\n+#define PLLCFG (*(volatile unsigned char *)0xE01FC084)\n+#define PLLCFG_OFFSET 0x84\n+#define PLLCFG_MSEL_MASK 0x1F\n+#define PLLCFG_MSEL_BIT 0\n+#define PLLCFG_PSEL_MASK 0x60\n+#define PLLCFG_PSEL_BIT 5\n+\n+#define PLLSTAT (*(volatile unsigned short *)0xE01FC088)\n+#define PLLSTAT_OFFSET 0x88\n+#define PLLSTAT_MSEL_MASK 0x1F\n+#define PLLSTAT_MSEL_BIT 0\n+#define PLLSTAT_PSEL_MASK 0x60\n+#define PLLSTAT_PSEL_BIT 5\n+#define PLLSTAT_PLLE_MASK 0x100\n+#define PLLSTAT_PLLE 0x100\n+#define PLLSTAT_PLLE_BIT 8\n+#define PLLSTAT_PLLC_MASK 0x200\n+#define PLLSTAT_PLLC 0x200\n+#define PLLSTAT_PLLC_BIT 9\n+#define PLLSTAT_PLOCK_MASK 0x400\n+#define PLLSTAT_PLOCK 0x400\n+#define PLLSTAT_PLOCK_BIT 10\n+\n+#define PLLFEED (*(volatile unsigned char *)0xE01FC08C)\n+#define PLLFEED_OFFSET 0x8C\n+\n+#define PCON (*(volatile unsigned char *)0xE01FC0C0)\n+#define PCON_OFFSET 0xC0\n+#define PCON_IDL_MASK 0x1\n+#define PCON_IDL 0x1\n+#define PCON_IDL_BIT 0\n+#define PCON_PD_MASK 0x2\n+#define PCON_PD 0x2\n+#define PCON_PD_BIT 1\n+\n+#define PCONP (*(volatile unsigned long *)0xE01FC0C4)\n+#define PCONP_OFFSET 0xC4\n+#define PCONP_PCTIM0_MASK 0x2\n+#define PCONP_PCTIM0 0x2\n+#define PCONP_PCTIM0_BIT 1\n+#define PCONP_PCTIM1_MASK 0x4\n+#define PCONP_PCTIM1 0x4\n+#define PCONP_PCTIM1_BIT 2\n+#define PCONP_PCUART0_MASK 0x8\n+#define PCONP_PCUART0 0x8\n+#define PCONP_PCUART0_BIT 3\n+#define PCONP_PCUART1_MASK 0x10\n+#define PCONP_PCUART1 0x10\n+#define PCONP_PCUART1_BIT 4\n+#define PCONP_PCPWM0_MASK 0x20\n+#define PCONP_PCPWM0 0x20\n+#define PCONP_PCPWM0_BIT 5\n+#define PCONP_PCI2C_MASK 0x80\n+#define PCONP_PCI2C 0x80\n+#define PCONP_PCI2C_BIT 7\n+#define PCONP_PCSPI0_MASK 0x100\n+#define PCONP_PCSPI0 0x100\n+#define PCONP_PCSPI0_BIT 8\n+#define PCONP_PCRTC_MASK 0x200\n+#define PCONP_PCRTC 0x200\n+#define PCONP_PCRTC_BIT 9\n+#define PCONP_PCSPI1_MASK 0x400\n+#define PCONP_PCSPI1 0x400\n+#define PCONP_PCSPI1_BIT 10\n+#define PCONP_PCAD_MASK 0x1000\n+#define PCONP_PCAD 0x1000\n+#define PCONP_PCAD_BIT 12\n+#define PCONP_PCAN1_MASK 0x2000\n+#define PCONP_PCAN1 0x2000\n+#define PCONP_PCAN1_BIT 13\n+#define PCONP_PCAN2_MASK 0x4000\n+#define PCONP_PCAN2 0x4000\n+#define PCONP_PCAN2_BIT 14\n+#define PCONP_PCAN3_MASK 0x8000\n+#define PCONP_PCAN3 0x8000\n+#define PCONP_PCAN3_BIT 15\n+#define PCONP_PCAN4_MASK 0x10000\n+#define PCONP_PCAN4 0x10000\n+#define PCONP_PCAN4_BIT 16\n+\n+#define VPBDIV (*(volatile unsigned char *)0xE01FC100)\n+#define VPBDIV_OFFSET 0x100\n+#define VPBDIV_VPBDIV_MASK 0x3\n+#define VPBDIV_VPBDIV_BIT 0\n+\n+#define EXTINT (*(volatile unsigned char *)0xE01FC140)\n+#define EXTINT_OFFSET 0x140\n+#define EXTINT_EINT0_MASK 0x1\n+#define EXTINT_EINT0 0x1\n+#define EXTINT_EINT0_BIT 0\n+#define EXTINT_EINT1_MASK 0x2\n+#define EXTINT_EINT1 0x2\n+#define EXTINT_EINT1_BIT 1\n+#define EXTINT_EINT2_MASK 0x4\n+#define EXTINT_EINT2 0x4\n+#define EXTINT_EINT2_BIT 2\n+#define EXTINT_EINT3_MASK 0x8\n+#define EXTINT_EINT3 0x8\n+#define EXTINT_EINT3_BIT 3\n+\n+#define EXTWAKE (*(volatile unsigned char *)0xE01FC144)\n+#define EXTWAKE_OFFSET 0x144\n+#define EXTWAKE_EXTWAKE0_MASK 0x1\n+#define EXTWAKE_EXTWAKE0 0x1\n+#define EXTWAKE_EXTWAKE0_BIT 0\n+#define EXTWAKE_EXTWAKE1_MASK 0x2\n+#define EXTWAKE_EXTWAKE1 0x2\n+#define EXTWAKE_EXTWAKE1_BIT 1\n+#define EXTWAKE_EXTWAKE2_MASK 0x4\n+#define EXTWAKE_EXTWAKE2 0x4\n+#define EXTWAKE_EXTWAKE2_BIT 2\n+#define EXTWAKE_EXTWAKE3_MASK 0x8\n+#define EXTWAKE_EXTWAKE3 0x8\n+#define EXTWAKE_EXTWAKE3_BIT 3\n+\n+#define EXTMODE (*(volatile unsigned char *)0xE01FC148)\n+#define EXTMODE_OFFSET 0x148\n+#define EXTMODE_EXTMODE0_MASK 0x1\n+#define EXTMODE_EXTMODE0 0x1\n+#define EXTMODE_EXTMODE0_BIT 0\n+#define EXTMODE_EXTMODE1_MASK 0x2\n+#define EXTMODE_EXTMODE1 0x2\n+#define EXTMODE_EXTMODE1_BIT 1\n+#define EXTMODE_EXTMODE2_MASK 0x4\n+#define EXTMODE_EXTMODE2 0x4\n+#define EXTMODE_EXTMODE2_BIT 2\n+#define EXTMODE_EXTMODE3_MASK 0x8\n+#define EXTMODE_EXTMODE3 0x8\n+#define EXTMODE_EXTMODE3_BIT 3\n+\n+#define EXTPOLAR (*(volatile unsigned char *)0xE01FC14C)\n+#define EXTPOLAR_OFFSET 0x14C\n+#define EXTPOLAR_EXTPOLAR0_MASK 0x1\n+#define EXTPOLAR_EXTPOLAR0 0x1\n+#define EXTPOLAR_EXTPOLAR0_BIT 0\n+#define EXTPOLAR_EXTPOLAR1_MASK 0x2\n+#define EXTPOLAR_EXTPOLAR1 0x2\n+#define EXTPOLAR_EXTPOLAR1_BIT 1\n+#define EXTPOLAR_EXTPOLAR2_MASK 0x4\n+#define EXTPOLAR_EXTPOLAR2 0x4\n+#define EXTPOLAR_EXTPOLAR2_BIT 2\n+#define EXTPOLAR_EXTPOLAR3_MASK 0x8\n+#define EXTPOLAR_EXTPOLAR3 0x8\n+#define EXTPOLAR_EXTPOLAR3_BIT 3\n+\n+#define VIC_BASE 0xFFFFF000\n+\n+#define VICIRQStatus (*(volatile unsigned long *)0xFFFFF000)\n+#define VICIRQStatus_OFFSET 0x0\n+\n+#define VICFIQStatus (*(volatile unsigned long *)0xFFFFF004)\n+#define VICFIQStatus_OFFSET 0x4\n+\n+#define VICRawIntr (*(volatile unsigned long *)0xFFFFF008)\n+#define VICRawIntr_OFFSET 0x8\n+\n+#define VICIntSelect (*(volatile unsigned long *)0xFFFFF00C)\n+#define VICIntSelect_OFFSET 0xC\n+\n+#define VICIntEnable (*(volatile unsigned long *)0xFFFFF010)\n+#define VICIntEnable_OFFSET 0x10\n+\n+#define VICIntEnClr (*(volatile unsigned long *)0xFFFFF014)\n+#define VICIntEnClr_OFFSET 0x14\n+\n+#define VICSoftInt (*(volatile unsigned long *)0xFFFFF018)\n+#define VICSoftInt_OFFSET 0x18\n+\n+#define VICSoftIntClear (*(volatile unsigned long *)0xFFFFF01C)\n+#define VICSoftIntClear_OFFSET 0x1C\n+\n+#define VICProtection (*(volatile unsigned long *)0xFFFFF020)\n+#define VICProtection_OFFSET 0x20\n+\n+#define VICVectAddr (*(volatile unsigned long *)0xFFFFF030)\n+#define VICVectAddr_OFFSET 0x30\n+\n+#define VICDefVectAddr (*(volatile unsigned long *)0xFFFFF034)\n+#define VICDefVectAddr_OFFSET 0x34\n+\n+#define VICVectAddr0 (*(volatile unsigned long *)0xFFFFF100)\n+#define VICVectAddr0_OFFSET 0x100\n+\n+#define VICVectAddr1 (*(volatile unsigned long *)0xFFFFF104)\n+#define VICVectAddr1_OFFSET 0x104\n+\n+#define VICVectAddr2 (*(volatile unsigned long *)0xFFFFF108)\n+#define VICVectAddr2_OFFSET 0x108\n+\n+#define VICVectAddr3 (*(volatile unsigned long *)0xFFFFF10C)\n+#define VICVectAddr3_OFFSET 0x10C\n+\n+#define VICVectAddr4 (*(volatile unsigned long *)0xFFFFF110)\n+#define VICVectAddr4_OFFSET 0x110\n+\n+#define VICVectAddr5 (*(volatile unsigned long *)0xFFFFF114)\n+#define VICVectAddr5_OFFSET 0x114\n+\n+#define VICVectAddr6 (*(volatile unsigned long *)0xFFFFF118)\n+#define VICVectAddr6_OFFSET 0x118\n+\n+#define VICVectAddr7 (*(volatile unsigned long *)0xFFFFF11C)\n+#define VICVectAddr7_OFFSET 0x11C\n+\n+#define VICVectAddr8 (*(volatile unsigned long *)0xFFFFF120)\n+#define VICVectAddr8_OFFSET 0x120\n+\n+#define VICVectAddr9 (*(volatile unsigned long *)0xFFFFF124)\n+#define VICVectAddr9_OFFSET 0x124\n+\n+#define VICVectAddr10 (*(volatile unsigned long *)0xFFFFF128)\n+#define VICVectAddr10_OFFSET 0x128\n+\n+#define VICVectAddr11 (*(volatile unsigned long *)0xFFFFF12C)\n+#define VICVectAddr11_OFFSET 0x12C\n+\n+#define VICVectAddr12 (*(volatile unsigned long *)0xFFFFF130)\n+#define VICVectAddr12_OFFSET 0x130\n+\n+#define VICVectAddr13 (*(volatile unsigned long *)0xFFFFF134)\n+#define VICVectAddr13_OFFSET 0x134\n+\n+#define VICVectAddr14 (*(volatile unsigned long *)0xFFFFF138)\n+#define VICVectAddr14_OFFSET 0x138\n+\n+#define VICVectAddr15 (*(volatile unsigned long *)0xFFFFF13C)\n+#define VICVectAddr15_OFFSET 0x13C\n+\n+#define VICVectCntl0 (*(volatile unsigned long *)0xFFFFF200)\n+#define VICVectCntl0_OFFSET 0x200\n+\n+#define VICVectCntl1 (*(volatile unsigned long *)0xFFFFF204)\n+#define VICVectCntl1_OFFSET 0x204\n+\n+#define VICVectCntl2 (*(volatile unsigned long *)0xFFFFF208)\n+#define VICVectCntl2_OFFSET 0x208\n+\n+#define VICVectCntl3 (*(volatile unsigned long *)0xFFFFF20C)\n+#define VICVectCntl3_OFFSET 0x20C\n+\n+#define VICVectCntl4 (*(volatile unsigned long *)0xFFFFF210)\n+#define VICVectCntl4_OFFSET 0x210\n+\n+#define VICVectCntl5 (*(volatile unsigned long *)0xFFFFF214)\n+#define VICVectCntl5_OFFSET 0x214\n+\n+#define VICVectCntl6 (*(volatile unsigned long *)0xFFFFF218)\n+#define VICVectCntl6_OFFSET 0x218\n+\n+#define VICVectCntl7 (*(volatile unsigned long *)0xFFFFF21C)\n+#define VICVectCntl7_OFFSET 0x21C\n+\n+#define VICVectCntl8 (*(volatile unsigned long *)0xFFFFF220)\n+#define VICVectCntl8_OFFSET 0x220\n+\n+#define VICVectCntl9 (*(volatile unsigned long *)0xFFFFF224)\n+#define VICVectCntl9_OFFSET 0x224\n+\n+#define VICVectCntl10 (*(volatile unsigned long *)0xFFFFF228)\n+#define VICVectCntl10_OFFSET 0x228\n+\n+#define VICVectCntl11 (*(volatile unsigned long *)0xFFFFF22C)\n+#define VICVectCntl11_OFFSET 0x22C\n+\n+#define VICVectCntl12 (*(volatile unsigned long *)0xFFFFF230)\n+#define VICVectCntl12_OFFSET 0x230\n+\n+#define VICVectCntl13 (*(volatile unsigned long *)0xFFFFF234)\n+#define VICVectCntl13_OFFSET 0x234\n+\n+#define VICVectCntl14 (*(volatile unsigned long *)0xFFFFF238)\n+#define VICVectCntl14_OFFSET 0x238\n+\n+#define VICVectCntl15 (*(volatile unsigned long *)0xFFFFF23C)\n+#define VICVectCntl15_OFFSET 0x23C\n+\n+\n+#endif\n"} {"commit":"7471adc81aa9312d80ce62bee4485221682d12ef","subject":"BUG: porting bugfix from refactor @ 708d6be","message":"BUG: porting bugfix from refactor @ 708d6be\n","repos":"SunghanKim\/numpy,empeeu\/numpy,bmorris3\/numpy,cjermain\/numpy,rmcgibbo\/numpy,anntzer\/numpy,hainm\/numpy,kirillzhuravlev\/numpy,leifdenby\/numpy,jakirkham\/numpy,charris\/numpy,ChristopherHogan\/numpy,SiccarPoint\/numpy,hainm\/numpy,dato-code\/numpy,cjermain\/numpy,mhvk\/numpy,BMJHayward\/numpy,BMJHayward\/numpy,rherault-insa\/numpy,pelson\/numpy,skymanaditya1\/numpy,pelson\/numpy,trankmichael\/numpy,sinhrks\/numpy,dato-code\/numpy,pyparallel\/numpy,CMartelLML\/numpy,GaZ3ll3\/numpy,skymanaditya1\/numpy,ekalosak\/numpy,ekalosak\/numpy,yiakwy\/numpy,simongibbons\/numpy,BabeNovelty\/numpy,Srisai85\/numpy,mattip\/numpy,endolith\/numpy,b-carter\/numpy,WarrenWeckesser\/numpy,has2k1\/numpy,stefanv\/numpy,empeeu\/numpy,pizzathief\/numpy,rgommers\/numpy,MSeifert04\/numpy,Yusa95\/numpy,grlee77\/numpy,WarrenWeckesser\/numpy,anntzer\/numpy,dwillmer\/numpy,mwiebe\/numpy,MichaelAquilina\/numpy,skymanaditya1\/numpy,ahaldane\/numpy,ogrisel\/numpy,mingwpy\/numpy,rmcgibbo\/numpy,drasmuss\/numpy,bmorris3\/numpy,rajathkumarmp\/numpy,ogrisel\/numpy,pizzathief\/numpy,felipebetancur\/numpy,groutr\/numpy,rhythmsosad\/numpy,naritta\/numpy,MSeifert04\/numpy,jorisvandenbossche\/numpy,pdebuyl\/numpy,sigma-random\/numpy,MichaelAquilina\/numpy,embray\/numpy,maniteja123\/numpy,jorisvandenbossche\/numpy,CMartelLML\/numpy,yiakwy\/numpy,sigma-random\/numpy,solarjoe\/numpy,larsmans\/numpy,dwillmer\/numpy,Dapid\/numpy,pizzathief\/numpy,SiccarPoint\/numpy,gmcastil\/numpy,WillieMaddox\/numpy,SunghanKim\/numpy,pyparallel\/numpy,SiccarPoint\/numpy,simongibbons\/numpy,joferkington\/numpy,Eric89GXL\/numpy,mortada\/numpy,BabeNovelty\/numpy,rgommers\/numpy,KaelChen\/numpy,ekalosak\/numpy,madphysicist\/numpy,bertrand-l\/numpy,pyparallel\/numpy,stefanv\/numpy,mortada\/numpy,KaelChen\/numpy,ogrisel\/numpy,musically-ut\/numpy,simongibbons\/numpy,behzadnouri\/numpy,tynn\/numpy,chatcannon\/numpy,GaZ3ll3\/numpy,has2k1\/numpy,pelson\/numpy,brandon-rhodes\/numpy,tdsmith\/numpy,nbeaver\/numpy,pelson\/numpy,andsor\/numpy,shoyer\/numpy,astrofrog\/numpy,larsmans\/numpy,charris\/numpy,rmcgibbo\/numpy,ViralLeadership\/numpy,kirillzhuravlev\/numpy,rherault-insa\/numpy,jschueller\/numpy,ajdawson\/numpy,ewmoore\/numpy,githubmlai\/numpy,ESSS\/numpy,has2k1\/numpy,solarjoe\/numpy,embray\/numpy,cowlicks\/numpy,pizzathief\/numpy,Linkid\/numpy,bringingheavendown\/numpy,Srisai85\/numpy,ahaldane\/numpy,jonathanunderwood\/numpy,Yusa95\/numpy,mattip\/numpy,gmcastil\/numpy,Eric89GXL\/numpy,jschueller\/numpy,mwiebe\/numpy,groutr\/numpy,Linkid\/numpy,b-carter\/numpy,bertrand-l\/numpy,tacaswell\/numpy,dato-code\/numpy,rudimeier\/numpy,hainm\/numpy,ESSS\/numpy,GaZ3ll3\/numpy,andsor\/numpy,mindw\/numpy,joferkington\/numpy,jschueller\/numpy,nguyentu1602\/numpy,musically-ut\/numpy,ContinuumIO\/numpy,jankoslavic\/numpy,solarjoe\/numpy,pdebuyl\/numpy,Srisai85\/numpy,sonnyhu\/numpy,musically-ut\/numpy,immerrr\/numpy,astrofrog\/numpy,seberg\/numpy,stuarteberg\/numpy,andsor\/numpy,WarrenWeckesser\/numpy,stefanv\/numpy,dimasad\/numpy,jakirkham\/numpy,GrimDerp\/numpy,mindw\/numpy,MaPePeR\/numpy,bmorris3\/numpy,pbrod\/numpy,madphysicist\/numpy,nguyentu1602\/numpy,ChristopherHogan\/numpy,gfyoung\/numpy,MichaelAquilina\/numpy,anntzer\/numpy,CMartelLML\/numpy,mathdd\/numpy,ContinuumIO\/numpy,NextThought\/pypy-numpy,utke1\/numpy,embray\/numpy,cowlicks\/numpy,jorisvandenbossche\/numpy,joferkington\/numpy,MSeifert04\/numpy,mindw\/numpy,skwbc\/numpy,pdebuyl\/numpy,cjermain\/numpy,gfyoung\/numpy,kiwifb\/numpy,kiwifb\/numpy,SunghanKim\/numpy,numpy\/numpy,dato-code\/numpy,groutr\/numpy,ahaldane\/numpy,dch312\/numpy,jonathanunderwood\/numpy,dwillmer\/numpy,dwf\/numpy,drasmuss\/numpy,NextThought\/pypy-numpy,SunghanKim\/numpy,trankmichael\/numpy,shoyer\/numpy,Anwesh43\/numpy,tacaswell\/numpy,rajathkumarmp\/numpy,shoyer\/numpy,mortada\/numpy,tynn\/numpy,chatcannon\/numpy,brandon-rhodes\/numpy,ewmoore\/numpy,KaelChen\/numpy,gmcastil\/numpy,charris\/numpy,rudimeier\/numpy,ESSS\/numpy,mhvk\/numpy,brandon-rhodes\/numpy,shoyer\/numpy,GaZ3ll3\/numpy,mortada\/numpy,MaPePeR\/numpy,ahaldane\/numpy,empeeu\/numpy,MSeifert04\/numpy,mindw\/numpy,endolith\/numpy,ahaldane\/numpy,rgommers\/numpy,jankoslavic\/numpy,Eric89GXL\/numpy,ChristopherHogan\/numpy,ChanderG\/numpy,mhvk\/numpy,seberg\/numpy,BMJHayward\/numpy,numpy\/numpy,jakirkham\/numpy,abalkin\/numpy,BabeNovelty\/numpy,dch312\/numpy,embray\/numpy,maniteja123\/numpy,grlee77\/numpy,utke1\/numpy,madphysicist\/numpy,dwf\/numpy,b-carter\/numpy,skwbc\/numpy,grlee77\/numpy,hainm\/numpy,ChanderG\/numpy,GrimDerp\/numpy,ssanderson\/numpy,chiffa\/numpy,mingwpy\/numpy,rmcgibbo\/numpy,dwf\/numpy,yiakwy\/numpy,BMJHayward\/numpy,grlee77\/numpy,larsmans\/numpy,gfyoung\/numpy,bringingheavendown\/numpy,chatcannon\/numpy,argriffing\/numpy,bmorris3\/numpy,felipebetancur\/numpy,stefanv\/numpy,dwillmer\/numpy,shoyer\/numpy,naritta\/numpy,utke1\/numpy,dch312\/numpy,GrimDerp\/numpy,sinhrks\/numpy,cowlicks\/numpy,ssanderson\/numpy,mattip\/numpy,sigma-random\/numpy,sigma-random\/numpy,bringingheavendown\/numpy,rherault-insa\/numpy,jonathanunderwood\/numpy,ddasilva\/numpy,endolith\/numpy,dwf\/numpy,trankmichael\/numpy,mhvk\/numpy,githubmlai\/numpy,immerrr\/numpy,pelson\/numpy,MSeifert04\/numpy,embray\/numpy,has2k1\/numpy,ewmoore\/numpy,trankmichael\/numpy,ddasilva\/numpy,dimasad\/numpy,Anwesh43\/numpy,naritta\/numpy,jorisvandenbossche\/numpy,nguyentu1602\/numpy,kirillzhuravlev\/numpy,Linkid\/numpy,endolith\/numpy,behzadnouri\/numpy,stuarteberg\/numpy,numpy\/numpy,behzadnouri\/numpy,rajathkumarmp\/numpy,CMartelLML\/numpy,NextThought\/pypy-numpy,simongibbons\/numpy,WillieMaddox\/numpy,pbrod\/numpy,tdsmith\/numpy,rhythmsosad\/numpy,leifdenby\/numpy,larsmans\/numpy,yiakwy\/numpy,simongibbons\/numpy,abalkin\/numpy,MichaelAquilina\/numpy,bertrand-l\/numpy,empeeu\/numpy,nguyentu1602\/numpy,jakirkham\/numpy,jorisvandenbossche\/numpy,ajdawson\/numpy,mhvk\/numpy,SiccarPoint\/numpy,astrofrog\/numpy,mingwpy\/numpy,njase\/numpy,AustereCuriosity\/numpy,NextThought\/pypy-numpy,jakirkham\/numpy,MaPePeR\/numpy,Anwesh43\/numpy,sinhrks\/numpy,BabeNovelty\/numpy,sinhrks\/numpy,WarrenWeckesser\/numpy,andsor\/numpy,madphysicist\/numpy,abalkin\/numpy,rgommers\/numpy,tdsmith\/numpy,moreati\/numpy,sonnyhu\/numpy,Yusa95\/numpy,dch312\/numpy,stuarteberg\/numpy,skymanaditya1\/numpy,AustereCuriosity\/numpy,dimasad\/numpy,mattip\/numpy,rudimeier\/numpy,argriffing\/numpy,Srisai85\/numpy,Linkid\/numpy,githubmlai\/numpy,astrofrog\/numpy,ewmoore\/numpy,rhythmsosad\/numpy,mingwpy\/numpy,maniteja123\/numpy,charris\/numpy,stuarteberg\/numpy,ajdawson\/numpy,MaPePeR\/numpy,pdebuyl\/numpy,ssanderson\/numpy,ContinuumIO\/numpy,moreati\/numpy,ogrisel\/numpy,skwbc\/numpy,njase\/numpy,ViralLeadership\/numpy,nbeaver\/numpy,githubmlai\/numpy,astrofrog\/numpy,tynn\/numpy,dimasad\/numpy,kiwifb\/numpy,pbrod\/numpy,tdsmith\/numpy,brandon-rhodes\/numpy,ChristopherHogan\/numpy,chiffa\/numpy,ewmoore\/numpy,ajdawson\/numpy,sonnyhu\/numpy,musically-ut\/numpy,WarrenWeckesser\/numpy,felipebetancur\/numpy,ekalosak\/numpy,sonnyhu\/numpy,madphysicist\/numpy,felipebetancur\/numpy,rajathkumarmp\/numpy,KaelChen\/numpy,immerrr\/numpy,cjermain\/numpy,jankoslavic\/numpy,naritta\/numpy,mwiebe\/numpy,stefanv\/numpy,jschueller\/numpy,dwf\/numpy,mathdd\/numpy,ddasilva\/numpy,Anwesh43\/numpy,pbrod\/numpy,Yusa95\/numpy,grlee77\/numpy,seberg\/numpy,ogrisel\/numpy,ChanderG\/numpy,argriffing\/numpy,immerrr\/numpy,Dapid\/numpy,leifdenby\/numpy,WillieMaddox\/numpy,Eric89GXL\/numpy,jankoslavic\/numpy,kirillzhuravlev\/numpy,cowlicks\/numpy,moreati\/numpy,njase\/numpy,drasmuss\/numpy,numpy\/numpy,pizzathief\/numpy,chiffa\/numpy,rudimeier\/numpy,ChanderG\/numpy,anntzer\/numpy,GrimDerp\/numpy,Dapid\/numpy,mathdd\/numpy,rhythmsosad\/numpy,nbeaver\/numpy,AustereCuriosity\/numpy,pbrod\/numpy,mathdd\/numpy,ViralLeadership\/numpy,joferkington\/numpy,seberg\/numpy,tacaswell\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/multiarray\/iterators.c\n+++ numpy\/core\/src\/multiarray\/iterators.c\n@@ -1706,6 +1706,7 @@\n multi->index++;\n return ret;\n }\n+ Py_DECREF(ret);\n return NULL;\n }\n \n"} {"commit":"25bc73a6f8eb933bb6104208a73bf3ab106ec65d","subject":"expire-tool: Make sure expire plugin won't get used.","message":"expire-tool: Make sure expire plugin won't get used.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/expire\/expire-plugin.c\n+++ src\/plugins\/expire\/expire-plugin.c\n@@ -4,6 +4,7 @@\n #include \"ioloop.h\"\n #include \"array.h\"\n #include \"str.h\"\n+#include \"master-service.h\"\n #include \"dict.h\"\n #include \"mail-namespace.h\"\n #include \"index-mail.h\"\n@@ -309,12 +310,15 @@\n static void expire_mail_user_created(struct mail_user *user)\n {\n \tstruct expire_mail_user *euser;\n-\tconst char *expunge_env, *altmove_env, *dict_uri;\n-\n+\tconst char *expunge_env, *altmove_env, *dict_uri, *service_name;\n+\n+\tservice_name = master_service_get_name(master_service);\n \texpunge_env = mail_user_plugin_getenv(user, \"expire\");\n \taltmove_env = mail_user_plugin_getenv(user, \"expire_altmove\");\n \tdict_uri = mail_user_plugin_getenv(user, \"expire_dict\");\n-\tif (expunge_env == NULL && altmove_env == NULL) {\n+\tif (strcmp(service_name, \"expire-tool\") == 0) {\n+\t\t\/* expire-tool handles all of this internally *\/\n+\t} else if (expunge_env == NULL && altmove_env == NULL) {\n \t\tif (user->mail_debug) {\n \t\t\ti_info(\"expire: No expire or expire_altmove settings - \"\n \t\t\t \"plugin disabled\");\n"} {"commit":"ff44f113101814b6321906a312fe9f0db1b2f1e6","subject":"BUG: Set deprecated fields to null in PyArray_InitArrFuncs","message":"BUG: Set deprecated fields to null in PyArray_InitArrFuncs\n\nInitializing the deprecated fields to null ensures that if a\nuser sets them to their own function pointers, this can be\ndetected and the warning about using deprecated fields can be\nprinted.\n","repos":"jakirkham\/numpy,pdebuyl\/numpy,grlee77\/numpy,mattip\/numpy,simongibbons\/numpy,numpy\/numpy,madphysicist\/numpy,simongibbons\/numpy,numpy\/numpy,grlee77\/numpy,charris\/numpy,charris\/numpy,numpy\/numpy,mhvk\/numpy,pbrod\/numpy,pbrod\/numpy,madphysicist\/numpy,rgommers\/numpy,pdebuyl\/numpy,seberg\/numpy,mhvk\/numpy,numpy\/numpy,madphysicist\/numpy,jakirkham\/numpy,mattip\/numpy,madphysicist\/numpy,mattip\/numpy,seberg\/numpy,mattip\/numpy,charris\/numpy,jakirkham\/numpy,endolith\/numpy,rgommers\/numpy,seberg\/numpy,madphysicist\/numpy,simongibbons\/numpy,rgommers\/numpy,simongibbons\/numpy,grlee77\/numpy,endolith\/numpy,grlee77\/numpy,pdebuyl\/numpy,mhvk\/numpy,jakirkham\/numpy,mhvk\/numpy,pbrod\/numpy,grlee77\/numpy,jakirkham\/numpy,pbrod\/numpy,anntzer\/numpy,mhvk\/numpy,anntzer\/numpy,endolith\/numpy,charris\/numpy,pdebuyl\/numpy,pbrod\/numpy,seberg\/numpy,anntzer\/numpy,simongibbons\/numpy,rgommers\/numpy,anntzer\/numpy,endolith\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/multiarray\/usertypes.c\n+++ numpy\/core\/src\/multiarray\/usertypes.c\n@@ -127,6 +127,9 @@\n f->scalarkind = NULL;\n f->cancastscalarkindto = NULL;\n f->cancastto = NULL;\n+ f->fastclip = NULL;\n+ f->fastputmask = NULL;\n+ f->fasttake = NULL;\n }\n \n \n"} {"commit":"7a8266963fb62dfeac03094258c06d145929107f","subject":"fts-squat: Fixed searching multi-byte characters.","message":"fts-squat: Fixed searching multi-byte characters.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/fts-squat\/squat-trie.c\n+++ src\/plugins\/fts-squat\/squat-trie.c\n@@ -1904,7 +1904,8 @@\n \tunsigned int char_idx, max_chars, i, j, bytelen;\n \tint ret;\n \n-\tmax_chars = uni_utf8_strlen_n(data, size);\n+\tfor (i = 0, max_chars = 0; i < size; max_chars++)\n+\t\ti += char_lengths[i];\n \ti_assert(max_chars > 0);\n \n \ti = 0; char_idx = 0;\n@@ -1999,7 +2000,7 @@\n \t\t search it in parts. *\/\n \t\tif (i != start) {\n \t\t\tret = squat_trie_lookup_partial(&ctx, data + start,\n-\t\t\t\t\t\t\tchar_lengths,\n+\t\t\t\t\t\t\tchar_lengths + start,\n \t\t\t\t\t\t\ti - start);\n \t\t\tsearched = TRUE;\n \t\t}\n@@ -2025,7 +2026,7 @@\n \t\t\tarray_clear(maybe_uids);\n \t\t} else {\n \t\t\tret = squat_trie_lookup_partial(&ctx, data + start,\n-\t\t\t\t\t\t\tchar_lengths,\n+\t\t\t\t\t\t\tchar_lengths + start,\n \t\t\t\t\t\t\ti - start);\n \t\t}\n \t} else if (str_bytelen > 0) {\n@@ -2033,7 +2034,7 @@\n \t\tarray_clear(definite_uids);\n \t\tif (i != start && ret >= 0) {\n \t\t\tret = squat_trie_lookup_partial(&ctx, data + start,\n-\t\t\t\t\t\t\tchar_lengths,\n+\t\t\t\t\t\t\tchar_lengths + start,\n \t\t\t\t\t\t\ti - start);\n \t\t} else if (!searched) {\n \t\t\t\/* string has only nonindexed chars,\n"} {"commit":"f3279aaa300eacb65b5f01b7c438800098d0bd5b","subject":"Use std::ostringstream instead of std::stringstream.","message":"Use std::ostringstream instead of std::stringstream.\n\nPiperOrigin-RevId: 272280882\n","repos":"google\/riegeli,google\/riegeli,google\/riegeli,google\/riegeli","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- riegeli\/base\/base.h\n+++ riegeli\/base\/base.h\n@@ -76,7 +76,7 @@\n ABSL_ATTRIBUTE_NORETURN ~CheckFailed();\n \n private:\n- std::stringstream stream_;\n+ std::ostringstream stream_;\n };\n \n \/\/ Stores an optional pointer to a message of a check failure.\n@@ -105,7 +105,7 @@\n template <typename A, typename B>\n ABSL_ATTRIBUTE_COLD const char* FormatCheckOpMessage(const char* message,\n const A& a, const B& b) {\n- std::stringstream stream;\n+ std::ostringstream stream;\n stream << message << \" (\" << a << \" vs. \" << b << \")\";\n \/\/ Do not bother with freeing this string: the program will soon terminate.\n return (new std::string(stream.str()))->c_str();\n"} {"commit":"0a4b314a58bbf67513df026ee8b37d7fecfff3c2","subject":"Fixed handling expunges.","message":"Fixed handling expunges.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/fts-squat\/squat-trie.c\n+++ src\/plugins\/fts-squat\/squat-trie.c\n@@ -1201,9 +1201,15 @@\n \t\t\t\tarray_delete(uids_arr, uid_idx, 1);\n \t\t\t\tuids = array_get_modifiable(uids_arr,\n \t\t\t\t\t\t\t &uid_count);\n-\t\t\t} else {\n+\t\t\t} else if (do_shifts) {\n \t\t\t\t\/* the next loop iteration fixes the UIDs *\/\n \t\t\t\tuids[uid_idx].seq1 += child_shift_count;\n+\t\t\t} else {\n+\t\t\t\tseq_range_array_remove_range(uids_arr,\n+\t\t\t\t\t\t\t shift.seq1,\n+\t\t\t\t\t\t\t shift.seq2);\n+\t\t\t\tuids = array_get_modifiable(uids_arr,\n+\t\t\t\t\t\t\t &uid_count);\n \t\t\t}\n \t\t\tshift_sum += child_shift_count;\n \t\t}\n"} {"commit":"3c53fb35a7de4ff2c7dff6c2a0a9289c848b31db","subject":"fts-squat: Assert-crashfix on indexing","message":"fts-squat: Assert-crashfix on indexing\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/fts-squat\/squat-trie.c\n+++ src\/plugins\/fts-squat\/squat-trie.c\n@@ -961,9 +961,9 @@\n \t\t\t uint32_t uid, enum squat_index_type type,\n \t\t\t const unsigned char *input, unsigned int size)\n {\n-\tint ret;\n-\n-\tT_BEGIN {\n+\tint ret = 0;\n+\n+\tif (size != 0) T_BEGIN {\n \t\tret = squat_trie_build_more_real(ctx, uid, type, input, size);\n \t} T_END;\n \treturn ret;\n"} {"commit":"aadd12f891d9cc6e42782d86c1806f45efa89118","subject":"log the remote address of new connections","message":"log the remote address of new connections\n","repos":"rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- rtr\/connection_control.c\n+++ rtr\/connection_control.c\n@@ -5,6 +5,9 @@\n #include <string.h>\n #include <sys\/select.h>\n #include <sys\/time.h>\n+#include <sys\/types.h>\n+#include <sys\/socket.h>\n+#include <netdb.h>\n #include <unistd.h>\n #include <fcntl.h>\n \n@@ -17,6 +20,12 @@\n \n struct connection_info {\n \tint fd;\n+\n+\tstruct sockaddr_storage addr;\n+\tsocklen_t addr_len;\n+\tchar host[256];\n+\tchar serv[16];\n+\n \tcxn_semaphore_t * semaphore;\n \tpthread_t thread;\n \tbool started;\n@@ -264,6 +273,7 @@\n \t\t\t}\n \n \t\t\tcxn_info->started = false;\n+\t\t\tcxn_info->addr_len = 0;\n \n \t\t\tcxn_info->semaphore = malloc(sizeof(cxn_semaphore_t));\n \t\t\tif (cxn_info->semaphore == NULL)\n@@ -281,7 +291,8 @@\n \t\t\t\tcontinue;\n \t\t\t}\n \n-\t\t\tcxn_info->fd = accept(argsp->listen_fd, NULL, NULL);\n+\t\t\tcxn_info->addr_len = sizeof(cxn_info->addr);\n+\t\t\tcxn_info->fd = accept(argsp->listen_fd, (struct sockaddr *)&cxn_info->addr, &cxn_info->addr_len);\n \t\t\tif (cxn_info->fd < 0)\n \t\t\t{\n \t\t\t\tERR_LOG(errno, errorbuf, \"accept()\");\n@@ -294,6 +305,19 @@\n \t\t\t\tcontinue;\n \t\t\t}\n \n+\t\t\tretval = getnameinfo((struct sockaddr *)&cxn_info->addr, cxn_info->addr_len,\n+\t\t\t\tcxn_info->host, sizeof(cxn_info->host),\n+\t\t\t\tcxn_info->serv, sizeof(cxn_info->serv),\n+\t\t\t\tNI_NUMERICHOST | NI_NUMERICSERV);\n+\t\t\tif (retval != 0)\n+\t\t\t{\n+\t\t\t\tLOG(LOG_ERR, \"getnameinfo(): %s\", gai_strerror(retval));\n+\t\t\t\tcleanup_connection(cxn_info);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\tLOG(LOG_INFO, \"new connection from [%s]:%s\", cxn_info->host, cxn_info->serv);\n+\n \t\t\tstruct connection_main_args * connection_args = malloc(sizeof(struct connection_main_args));\n \t\t\tif (connection_args == NULL)\n \t\t\t{\n@@ -324,8 +348,6 @@\n \t\t\t\tcleanup_connection(cxn_info);\n \t\t\t\tcontinue;\n \t\t\t}\n-\n-\t\t\tLOG(LOG_INFO, \"new connection\"); \/\/ TODO remote socket information (e.g. host:port)\n \t\t}\n \t}\n \n"} {"commit":"e850b83fa30ba0f8dd986d89b27a90285efc6802","subject":"removed erroneous setting of the log level","message":"removed erroneous setting of the log level\n","repos":"PerilousApricot\/lstore,PerilousApricot\/lstore,accre\/lstore,tacketar\/lstore,accre\/lstore,PerilousApricot\/lstore,PerilousApricot\/lstore,tacketar\/lstore,accre\/lstore,tacketar\/lstore,accre\/lstore,tacketar\/lstore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lio\/lio_config.c\n+++ src\/lio\/lio_config.c\n@@ -1225,8 +1225,6 @@\n if (cfg_name != NULL) {\n mlog_load(cfg_name, out_override, ll_override);\n \n- set_log_level(ll);\n-\n lio_gc = lio_create(cfg_name, section_name, userid);\n lio_gc->ref_cnt = 1;\n if (auto_mode != -1) lio_gc->auto_translate = auto_mode;\n"} {"commit":"1e2489c9e7afff637419c8567878c2f141d42904","subject":"sinowealth: add LOD and angle snapping value getter","message":"sinowealth: add LOD and angle snapping value getter\n\nLOD - lift-off distance.\n","repos":"libratbag\/libratbag,libratbag\/libratbag,libratbag\/libratbag","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/driver-sinowealth.c\n+++ src\/driver-sinowealth.c\n@@ -37,6 +37,7 @@\n \tSINOWEALTH_CMD_PROFILE = 0x2,\n \tSINOWEALTH_CMD_GET_CONFIG = 0x11,\n \tSINOWEALTH_CMD_DEBOUNCE = 0x1a,\n+\tSINOWEALTH_CMD_LONG_ANGLESNAPPING_AND_LOD = 0x1b,\n } __attribute__((packed));\n \n _Static_assert(sizeof(enum sinowealth_command_id) == sizeof(uint8_t), \"Invalid size\");\n@@ -441,6 +442,36 @@\n \treturn buf[2] * 2;\n }\n \n+\/* Print angle snapping (Cal line) and lift-off distance (LOD) modes.\n+ * This is only confirmed to work on G-Wolves Hati where the way with\n+ * config report doesn't work. This does not work on Glorious Model O.\n+ *\/\n+static int\n+sinowealth_print_long_lod_and_anglesnapping(struct ratbag_device *device)\n+{\n+\tint rc = 0;\n+\n+\t\/* TODO: implement angle snapping and lift-off distance changing once we have an API for that.\n+\t * To implement LOD changing here: set the third index to <whether you want LOD high or low> + 1.\n+\t * To implement angle snapping toggling here: set the fourth index to 1 or 0 to enable or disable accordingly.\n+\t *\/\n+\tuint8_t buf[6] = { SINOWEALTH_REPORT_ID_CMD, SINOWEALTH_CMD_LONG_ANGLESNAPPING_AND_LOD };\n+\trc = ratbag_hidraw_set_feature_report(device, SINOWEALTH_REPORT_ID_CMD, buf, sizeof(buf));\n+\tif (rc != sizeof(buf)) {\n+\t\tlog_error(device->ratbag, \"Couldn't send LOD and angle snapping read command: %d\\n\", rc);\n+\t\treturn -1;\n+\t}\n+\trc = ratbag_hidraw_get_feature_report(device, SINOWEALTH_REPORT_ID_CMD, buf, sizeof(buf));\n+\tif (rc != sizeof(buf)) {\n+\t\tlog_error(device->ratbag, \"Couldn't read LOD and angle snapping: %d\\n\", rc);\n+\t\treturn -1;\n+\t}\n+\tlog_info(device->ratbag, \"LOD is high: %u\\n\", buf[2] - 1);\n+\tlog_info(device->ratbag, \"Angle snapping enabled: %u\\n\", buf[3]);\n+\n+\treturn 0;\n+}\n+\n static int\n sinowealth_read_raw_config(struct ratbag_device *device)\n {\n"} {"commit":"e7137ad3b526218a7ab0847fcac5e44416592b27","subject":"Another VCA shutdown race.","message":"Another VCA shutdown race.\n","repos":"gquintard\/Varnish-Cache,varnish\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,gquintard\/Varnish-Cache,feld\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,varnish\/Varnish-Cache,feld\/Varnish-Cache,gquintard\/Varnish-Cache,feld\/Varnish-Cache,gquintard\/Varnish-Cache,varnish\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/varnishd\/cache\/cache_acceptor.c\n+++ bin\/varnishd\/cache\/cache_acceptor.c\n@@ -405,6 +405,12 @@\n \t\t\t\t &wa.acceptaddrlen);\n \t\t} while (i < 0 && errno == EAGAIN);\n \n+\t\tif (i < 0 && ls->sock == -2) {\n+\t\t\t\/* Shut down in progress *\/\n+\t\t\tsleep(2);\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tif (i < 0) {\n \t\t\tswitch (errno) {\n \t\t\tcase ECONNABORTED:\n@@ -416,7 +422,8 @@\n \t\t\tcase EBADF:\n \t\t\t\tVSL(SLT_Debug, ls->sock, \"Accept failed: %s\",\n \t\t\t\t strerror(errno));\n-\t\t\t\treturn;\n+\t\t\t\tvca_pace_bad();\n+\t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tVSL(SLT_Debug, ls->sock, \"Accept failed: %s\",\n \t\t\t\t strerror(errno));\n"} {"commit":"7fc811e55e251892ab6c8ba351a73b9a8a666865","subject":"header reorganization","message":"header reorganization\n","repos":"koszcz\/KSTableViewManager","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- KSTableViewManager\/KSTableViewManager\/KSTableViewManager.h\n+++ KSTableViewManager\/KSTableViewManager\/KSTableViewManager.h\n@@ -17,28 +17,27 @@\n - (instancetype)initWithTableView:(UITableView *)tableView;\n - (void)attachDelegates;\n \n+- (void)insertRow:(id <KSTableViewManagerRow>)row;\n+- (void)insertRow:(id <KSTableViewManagerRow>)row atIndex:(NSUInteger)index;\n+- (void)insertRow:(id <KSTableViewManagerRow>)row animation:(UITableViewRowAnimation)animation;\n+- (void)insertRow:(id <KSTableViewManagerRow>)row atIndex:(NSUInteger)index animation:(UITableViewRowAnimation)animation;\n+\n+- (void)reloadRow:(id <KSTableViewManagerRow>)row;\n+\n+- (void)removeRow:(id <KSTableViewManagerRow>)row;\n+- (void)removeRowAtIndex:(NSUInteger)index;\n+- (void)removeRow:(id <KSTableViewManagerRow>)row animation:(UITableViewRowAnimation)animation;\n+- (void)removeRowAtIndex:(NSUInteger)index animation:(UITableViewRowAnimation)animation;\n+- (void)removeAllRows;\n \n - (void)replaceRowAtIndex:(NSUInteger)index withRow:(id <KSTableViewManagerRow>)row animation:(UITableViewRowAnimation)animation;\n \n-- (void)removeRow:(id <KSTableViewManagerRow>)row;\n-- (void)removeRowAtIndex:(NSUInteger)index;\n-- (void)removeAllRows;\n+- (UITableViewCell *)cellForRow:(id <KSTableViewManagerRow>)row;\n \n-- (void)insertRow:(id <KSTableViewManagerRow>)row;\n-- (void)insertRow:(id <KSTableViewManagerRow>)row atIndex:(NSUInteger)index;\n-\n-- (void)removeRow:(id <KSTableViewManagerRow>)row animation:(UITableViewRowAnimation)animation;\n-- (void)removeRowAtIndex:(NSUInteger)index animation:(UITableViewRowAnimation)animation;\n-\n-- (void)insertRow:(id <KSTableViewManagerRow>)row animation:(UITableViewRowAnimation)animation;\n-- (void)insertRow:(id <KSTableViewManagerRow>)row atIndex:(NSUInteger)index animation:(UITableViewRowAnimation)animation;\n-\n-- (UITableViewCell *)cellForRow:(id <KSTableViewManagerRow>)row;\n+\/\/ Scrolling\n \n - (void)scrollToIndex:(NSUInteger)index animated:(BOOL)animated;\n - (void)scrollToRow:(id <KSTableViewManagerRow>)row animated:(BOOL)animated;\n-\n-- (void)reloadRow:(id <KSTableViewManagerRow>)row;\n \n \/\/ Helper guides\n \n"} {"commit":"f72084f6fbde47f48649f780c7c3f7c165decdeb","subject":"Update motor.h to match arduino program.","message":"Update motor.h to match arduino program.","repos":"Aramist\/Self-Driving-Car,Aramist\/Self-Driving-Car,Aramist\/Self-Driving-Car","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ros\/src\/motors\/motor.h\n+++ ros\/src\/motors\/motor.h\n@@ -8,12 +8,12 @@\n private:\n static serial::Serial arduinoSerial;\n int motorPwmId;\n- int currentSpeed;\n+ int currentSetpoint;\n public:\n Motor(int pwmID);\n ~Motor();\n void set(int speed);\n- int get();\n+ int getSetpoint();\n };\n \n #endif \/\/MOTORS_MOTOR_H"} {"commit":"9f8028caadfee68f343fa48117226eeecafd5c03","subject":"* subversion\/libsvn_auth_gpg_agent\/gpg_agent.c (password_get_gpg_agent): Reinitialise local variable P to NULL before using it a second time.","message":"* subversion\/libsvn_auth_gpg_agent\/gpg_agent.c\n (password_get_gpg_agent): Reinitialise local variable P to NULL before\n using it a second time.\n\nFound by: danielsh\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1150884 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_auth_gpg_agent\/gpg_agent.c\n+++ subversion\/libsvn_auth_gpg_agent\/gpg_agent.c\n@@ -333,6 +333,7 @@\n if (strncmp(buffer, \"ERR\", 3) == 0)\n return FALSE;\n \n+ p = NULL;\n if (strncmp(buffer, \"D\", 1) == 0)\n p = &buffer[2];\n \n"} {"commit":"d34bccbc164450d09b569abd9650d6e1198b7c0f","subject":"* subversion\/tests\/libsvn_client\/client-test.c (check_patch_result): Following up on r927785, cast strlen() result to int to fix some 64 bit warnings.","message":"* subversion\/tests\/libsvn_client\/client-test.c\n (check_patch_result):\n Following up on r927785, cast strlen() result to int to fix some\n 64 bit warnings.\n\nFound by: philip's compiler\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/tests\/libsvn_client\/client-test.c\n+++ subversion\/tests\/libsvn_client\/client-test.c\n@@ -233,8 +233,8 @@\n return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,\n \"%s line %d didn't match the expected line \"\n \"(strlen=%d vs strlen=%d)\", path, i,\n- strlen(expected_lines[i-1]),\n- strlen(line->data));\n+ (int)strlen(expected_lines[i-1]),\n+ (int)strlen(line->data));\n \n if (eof)\n break;\n"} {"commit":"e7a12b6406a478b5c9085091b5015cb3e1683958","subject":"OMAP: 3430SDP: Remove unused vdda_dac supply","message":"OMAP: 3430SDP: Remove unused vdda_dac supply\n\nRemove extra vdda_dac supply definition. It was a leftover from conflict\nresolution.\n\nSigned-off-by: Tomi Valkeinen <e1ca4dbb8be1acaf20734fecd2da10ed1d46a9bb@ti.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-omap2\/board-3430sdp.c\n+++ arch\/arm\/mach-omap2\/board-3430sdp.c\n@@ -307,9 +307,6 @@\n \t.default_device\t= &sdp3430_lcd_device,\n };\n \n-static struct regulator_consumer_supply sdp3430_vdda_dac_supply =\n-\tREGULATOR_SUPPLY(\"vdda_dac\", \"omapdss\");\n-\n static struct omap_board_config_kernel sdp3430_config[] __initdata = {\n };\n \n"} {"commit":"13340b2a1ef64891572c10927e5626e2b6a81b64","subject":"omap2+: fix build regression","message":"omap2+: fix build regression\n\nboard-generic.c now contains a reference to omap3_timer, but depends\nonly on ARCH_OMAP2, not on ARCH_OMAP3, which controls that symbol.\nomap2_timer seems to be more appropriate anyway, so use that instead.\n\nSigned-off-by: Arnd Bergmann <f2c659f01951776204a6c5b902787d9019fbeebd@arndb.de>\nAcked-by: Tony Lindgren <1001e8702733cced254345e193c88aaa47a4f5de@atomide.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/mach-omap2\/board-generic.c\n+++ arch\/arm\/mach-omap2\/board-generic.c\n@@ -72,5 +72,5 @@\n \t.init_early\t= omap_generic_init_early,\n \t.init_irq\t= omap2_init_irq,\n \t.init_machine\t= omap_generic_init,\n-\t.timer\t\t= &omap3_timer,\n+\t.timer\t\t= &omap2_timer,\n MACHINE_END\n"} {"commit":"4c4e9759a6fa63c61f0d269150741feccdd33f06","subject":"ARM: S3C24XX: split s3c2412 spi dma channels","message":"ARM: S3C24XX: split s3c2412 spi dma channels\n\nWhile s3c24xx before s3c2412 (2410, 2440, 2442) use one dma channel\nfor both sending and receiving spi data, all later s3c24xx socs use\nseparate channels.\n\nTo keep with the structure of \"one spi channel\" s3c2412 introduced\na channel_rx attribute to the map and selects the correct request\nchannel depending on the dma direction, hiding the underlying\nseparation from view.\n\nThe s3c24xx-spi driver, which would need this, currently does not\nuse dma at all, but as s3c2443 has both highspeed (spi0) and regular\n(spi1) controllers and also uses the split scheme a future dma support\nfor s3c24xx-spi would in any case need to differentiate between\nold-style and new-style spi channel structure.\n\nThus we can swtch to the split channel structure like in later socs.\n\nSigned-off-by: Heiko Stuebner <9ab5f52a1ca0bcf4f70d6d9008e02f6134b5b8f2@sntech.de>\nSigned-off-by: Kukjin Kim <3fc711f4e08bc570a586748633ff7c76d0e1e253@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"06fc9a30052b82d87da4a34a9c0bb3bf7338412c","subject":"ARM: tegra: harmony: Set WM8903 gpio_base","message":"ARM: tegra: harmony: Set WM8903 gpio_base\n\nThis is the final patch to enable audio support on Harmony. It additionally\nrelies on the latest ASoC branch being merged in, which provides the header\ndefining the gpio_base field in the WM8903 platform data.\n\nSigned-off-by: Stephen Warren <5ef2a23ba3aff51d1cfc8c113c1ec34b608b3b13@nvidia.com>\nSigned-off-by: Olof Johansson <8c69ee23f3f44f8162a64d579c1fa25c2f55298a@lixom.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-tegra\/board-harmony.c\n+++ arch\/arm\/mach-tegra\/board-harmony.c\n@@ -102,6 +102,7 @@\n \t.irq_active_low = 0,\n \t.micdet_cfg = 0,\n \t.micdet_delay = 100,\n+\t.gpio_base = HARMONY_GPIO_WM8903(0),\n \t.gpio_cfg = {\n \t\tWM8903_GPIO_NO_CONFIG,\n \t\tWM8903_GPIO_NO_CONFIG,\n"} {"commit":"582a6783c56517b84a06da72e18e1e44a59558e6","subject":"openrisc\/uaccess: fix sparse errors","message":"openrisc\/uaccess: fix sparse errors\n\nvirtio wants to read bitwise types from userspace using get_user. At the\nmoment this triggers sparse errors, since the value is passed through an\ninteger.\n\nFix that up using __force.\n\nSigned-off-by: Michael S. Tsirkin <255103e50249e3d658441816e0597170ebfc16ef@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c428dcc9b9f967945992a2f8529e8c50a31d7913","subject":"KVM: Make KVM_HPAGES_PER_HPAGE unsigned long to avoid build error on powerpc","message":"KVM: Make KVM_HPAGES_PER_HPAGE unsigned long to avoid build error on powerpc\n\nEliminates this compiler warning:\n\narch\/powerpc\/kvm\/..\/..\/..\/virt\/kvm\/kvm_main.c:1178: error: integer overflow in expression\n\nSigned-off-by: Stephen Rothwell <4bf0fb350827ce8d86875e76c923a478597c3cef@canb.auug.org.au>\nSigned-off-by: Avi Kivity <8f920f22884d6fea9df883843c4a8095a2e5ac6f@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/powerpc\/include\/asm\/kvm_host.h\n+++ arch\/powerpc\/include\/asm\/kvm_host.h\n@@ -34,7 +34,7 @@\n #define KVM_COALESCED_MMIO_PAGE_OFFSET 1\n \n \/* We don't currently support large pages. *\/\n-#define KVM_PAGES_PER_HPAGE (1<<31)\n+#define KVM_PAGES_PER_HPAGE (1UL << 31)\n \n struct kvm;\n struct kvm_run;\n"} {"commit":"c6b406919288a617815f710175da20f3fca72065","subject":"x86, fpu: Extend the use of static_cpu_has_safe","message":"x86, fpu: Extend the use of static_cpu_has_safe\n\nIt may be necessary to save and restore the FPU context during EFI runtime\nsystem services calls. However, this may happen during boot and before\nalternatives have run. Thus, we need to use static_cpu_has_safe instead.\n\nThe rationale behind the use of static_cpu_has_safe is the same as in\ncommit 5f8c4218148822fde6ee (\"x86, fpu: Use static_cpu_has_safe\nbefore alternatives\") by Borislav Petkov.\n\nSigned-off-by: Matt Fleming <b02f0790d66a0f0a6b369873bf6df37420fbe5dd@intel.com>\nSigned-off-by: Ricardo Neri <b0ea9152ea2026377af95cd4fdb162e220f5b6e2@linux.intel.com>\nCc: Borislav Petkov <0691a664b24b6f15b20cd5aee64b72271db08be1@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"52a5b72dd6ea71e94807b3f4d03a65b586900c44","subject":"fix nurbs motion drafting","message":"fix nurbs motion drafting\n\nSigned-off-by: Eric, Hsu-yao Tsai <ad8e9cf61b582456bbe32d188af06658a1707686@araisrobo.com>\n","repos":"araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/emc\/kinematics\/tc.c\n+++ src\/emc\/kinematics\/tc.c\n@@ -269,7 +269,7 @@\n R += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].R;\n }\n \n- if (tc->nurbs_block.axis_mask & AXIS_MASK_X) {\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_X) {\n X = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n X += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].X;\n@@ -277,89 +277,89 @@\n }\n X = X\/R;\n xyz.tran.x = X;\n- } else {\n+\/\/ } else {\n \/\/ xyz.tran.x = pos.tran.x;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_Y) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_Y) {\n Y = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n Y += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].Y;\n }\n Y = Y\/R;\n xyz.tran.y = Y;\n- } else {\n+\/\/ } else {\n \/\/ xyz.tran.y = pos.tran.y;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_Z) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_Z) {\n Z = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n Z += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].Z;\n }\n Z = Z\/R;\n xyz.tran.z = Z;\n- } else {\n+\/\/ } else {\n \/\/ xyz.tran.z = pos.tran.z;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_A) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_A) {\n A = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n A += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].A;\n }\n A = A\/R;\n abc.tran.x = A;\n- } else {\n+\/\/ } else {\n \/\/ abc.tran.x = pos.a;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_B) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_B) {\n B = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n B += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].B;\n }\n B = B\/R;\n abc.tran.y = B;\n- } else {\n+\/\/ } else {\n \/\/ abc.tran.y = pos.b;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_C) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_C) {\n C = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n C += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].C;\n }\n C = C\/R;\n abc.tran.z = C;\n- } else {\n+\/\/ } else {\n \/\/ abc.tran.z = pos.c;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_U) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_U) {\n U = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n U += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].U;\n }\n U = U\/R;\n uvw.tran.x = U;\n- } else {\n+\/\/ } else {\n \/\/ uvw.tran.x = pos.u;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_V) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_V) {\n V = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n V += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].V;\n }\n V = V\/R;\n uvw.tran.y = V;\n- } else {\n+\/\/ } else {\n \/\/ uvw.tran.y = pos.v;\n- }\n- if (tc->nurbs_block.axis_mask & AXIS_MASK_W) {\n+\/\/ }\n+\/\/ if (tc->nurbs_block.axis_mask & AXIS_MASK_W) {\n W = 0.0;\n for (i=0; i<=tc->nurbs_block.order -1; i++) {\n W += N[i]*tc->nurbs_block.ctrl_pts_ptr[tmp1+i].W;\n }\n W = W\/R;\n uvw.tran.z = W;\n- } else {\n+\/\/ } else {\n \/\/ uvw.tran.z = pos.w;\n- }\n+\/\/ }\n \n F = 0.0;\n F = tc->nurbs_block.ctrl_pts_ptr[tmp1].F;\n"} {"commit":"24e94454c8cb6a13634f5a2f5a01da53a546a58d","subject":"xtensa: ISS: fix locking in TAP network adapter","message":"xtensa: ISS: fix locking in TAP network adapter\n\n- don't lock lp->lock in the iss_net_timer for the call of iss_net_poll,\n it will lock it itself;\n- invert order of lp->lock and opened_lock acquisition in the\n iss_net_open to make it consistent with iss_net_poll;\n- replace spin_lock with spin_lock_bh when acquiring locks used in\n iss_net_timer from non-atomic context;\n- replace spin_lock_irqsave with spin_lock_bh in the iss_net_start_xmit\n as the driver doesn't use lp->lock in the hard IRQ context;\n- replace __SPIN_LOCK_UNLOCKED(lp.lock) with spin_lock_init, otherwise\n lockdep is unhappy about using non-static key.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Max Filippov <8c5ea195856807f4f02a6e0749c87ea6b7375f38@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b089d0d5932081d5762614a35827bd16a5a36155","subject":"cosmetic","message":"cosmetic\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Foundation\/Configuration\/Version.h\n+++ Library\/Sources\/Stroika\/Foundation\/Configuration\/Version.h\n@@ -23,7 +23,7 @@\n * @todo RETHINK MAPPING TO FULL_VERSION_NUMBER type? VersionStage only needs 3 bits (??)\n * But maybe useful compat with windows format?\n *\n- * @todo\n+ * @todo\tConsider if explicit Version(FullVersionType) CTOR should be FromFullVersionType\n *\/\n \n \n@@ -63,11 +63,11 @@\n *\/\n static Version FromPrettyVersionString (const Characters::String& prettyVersionString);\n \n- uint8_t fMajorVer;\n- uint8_t fMinorVer;\n- VersionStage fVerStage;\n- uint8_t fVerSubStage;\n- bool fFinalBuild;\n+ uint8_t\t\t\tfMajorVer;\n+ uint8_t\t\t\tfMinorVer;\n+ VersionStage\tfVerStage;\n+ uint8_t\t\t\tfVerSubStage;\n+ bool\t\t\tfFinalBuild;\n \n nonvirtual FullVersionType AsFullVersionNum () const;\n nonvirtual Characters::String AsWin32Version4DotString () const;\n"} {"commit":"14871c274445424629083b5de6edb89352b87b75","subject":"Formatting cleanup, no functional change","message":"Formatting cleanup, no functional change\n\nReplace tabs with spaces, remove trailing whitespace\n","repos":"joshuaspence\/ruby-augeas,hercules-team\/ruby-augeas,applewiskey\/ruby-augeas,uib\/ruby-augeas,lutter\/ruby-augeas,applewiskey\/ruby-augeas,lutter\/ruby-augeas,hercules-team\/ruby-augeas,uib\/ruby-augeas,joshuaspence\/ruby-augeas","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/augeas\/_augeas.c\n+++ ext\/augeas\/_augeas.c\n@@ -25,92 +25,92 @@\n \/*\n * call-seq:\n * get(PATH) -> String\n- * \n+ *\n * Lookup the value associated with PATH\n *\/\n VALUE augeas_get(VALUE m, VALUE path) {\n-\tconst char *cpath = StringValuePtr(path) ;\n-\tconst char *value = aug_get(cpath) ;\n-\tVALUE returnValue = Qnil ;\n-\tif (value != NULL) {\t\n-\t\treturnValue = rb_str_new(value, strlen(value)) ;\n-\t}\n-\treturn returnValue ;\n-}\n-\n-\/* \n+ const char *cpath = StringValuePtr(path) ;\n+ const char *value = aug_get(cpath) ;\n+ VALUE returnValue = Qnil ;\n+ if (value != NULL) {\n+ returnValue = rb_str_new(value, strlen(value)) ;\n+ }\n+ return returnValue ;\n+}\n+\n+\/*\n * call-seq:\n * exists(PATH) -> boolean\n- * \n+ *\n * Return true if there is an entry for this path, false otherwise \n *\/\n VALUE augeas_exists(VALUE m, VALUE path) {\n-\tconst char *cpath = StringValuePtr(path) ;\n-\tint callValue = aug_exists(cpath) ;\n-\tVALUE returnValue ;\n-\t\n-\tif (callValue == 1) \n-\t\treturnValue = Qtrue ;\n-\telse\n-\t\treturnValue = Qfalse ;\n-\t\n-\treturn returnValue ;\n-}\n-\n-\/* \n+ const char *cpath = StringValuePtr(path) ;\n+ int callValue = aug_exists(cpath) ;\n+ VALUE returnValue ;\n+\n+ if (callValue == 1)\n+ returnValue = Qtrue ;\n+ else\n+ returnValue = Qfalse ;\n+\n+ return returnValue ;\n+}\n+\n+\/*\n * call-seq:\n * set(PATH, VALUE) -> boolean\n- * \n+ *\n * Set the value associated with PATH to VALUE. VALUE is copied into the\n * internal data structure. Intermediate entries are created if they don't\n * exist.\n *\/\n VALUE augeas_set(VALUE m, VALUE path, VALUE value) {\n-\tconst char *cpath = StringValuePtr(path) ;\t\n-\tconst char *cvalue = StringValuePtr(value) ;\n-\t\t\n-\tint callValue = aug_set(cpath, cvalue) ;\n-\tVALUE returnValue ;\n-\t\n-\tif (callValue == 0) \n-\t\treturnValue = Qtrue ;\n-\telse\n-\t\treturnValue = Qfalse ;\n-\t\n-\treturn returnValue ;\n-}\n-\n-\/* \n+ const char *cpath = StringValuePtr(path) ;\n+ const char *cvalue = StringValuePtr(value) ;\n+\n+ int callValue = aug_set(cpath, cvalue) ;\n+ VALUE returnValue ;\n+\n+ if (callValue == 0)\n+ returnValue = Qtrue ;\n+ else\n+ returnValue = Qfalse ;\n+\n+ return returnValue ;\n+}\n+\n+\/*\n * call-seq:\n * insert(PATH, SIBLING) -> int\n- * \n- * Make PATH a SIBLING of PATH by inserting it directly before SIBLING. \n+ *\n+ * Make PATH a SIBLING of PATH by inserting it directly before SIBLING.\n *\/\n VALUE augeas_insert(VALUE m, VALUE path, VALUE sibling) {\n-\tconst char *cpath = StringValuePtr(path) ;\t\n-\tconst char *csibling = StringValuePtr(sibling) ;\n-\t\n-\tint callValue = aug_insert(cpath, csibling) ;\n-\treturn INT2FIX(callValue) ;\n-}\n-\n-\/* \n- * call-seq:\n- * rm(PATH) -> int \n- * \n+ const char *cpath = StringValuePtr(path) ;\n+ const char *csibling = StringValuePtr(sibling) ;\n+\n+ int callValue = aug_insert(cpath, csibling) ;\n+ return INT2FIX(callValue) ;\n+}\n+\n+\/*\n+ * call-seq:\n+ * rm(PATH) -> int\n+ *\n * Remove path and all its children. Returns the number of entries removed\n *\/\n VALUE augeas_rm(VALUE m, VALUE path, VALUE sibling) {\n-\tconst char *cpath = StringValuePtr(path) ;\t\n-\t\n-\tint callValue = aug_rm(cpath) ;\n-\treturn INT2FIX(callValue) ;\n+ const char *cpath = StringValuePtr(path) ;\n+\n+ int callValue = aug_rm(cpath) ;\n+ return INT2FIX(callValue) ;\n }\n \n \/*\n * call-seq:\n * ls(PATH) -> an_array\n- * \n+ *\n * Return a list of the direct children of PATH in CHILDREN, which is\n * allocated and must be freed by the caller, including the strings it\n * contains. If CHILDREN is NULL, nothing is allocated and only the number\n@@ -118,29 +118,29 @@\n * children of PATH.\n *\/\n VALUE augeas_ls(VALUE m, VALUE path) {\n-\t\n-\tint cnt = 0 ;\n-\tconst char **paths ;\n-\tchar *cpath = StringValuePtr(path) ;\n-\tcnt = aug_ls(cpath, &paths) ;\n-\tVALUE returnArray = rb_ary_new() ;\n-\tif (cnt > 0) {\n-\t\tint x ;\n-\t\tfor (x=0; x < cnt; x++) {\n-\t\t\trb_ary_push(returnArray, rb_str_new(paths[x], strlen(paths[x]))) ;\n-\t\t\tfree((void*)paths[x]) ;\n-\t\t}\n-\t\tfree (paths) ;\n-\t}\n-\t\n-\treturn returnArray ;\n-} \n-\n-\n-\/* \n- * call-seq:\n- * \t match(PATH, SIZE) -> an_array\n- * \n+\n+ int cnt = 0 ;\n+ const char **paths ;\n+ char *cpath = StringValuePtr(path) ;\n+ cnt = aug_ls(cpath, &paths) ;\n+ VALUE returnArray = rb_ary_new() ;\n+ if (cnt > 0) {\n+ int x ;\n+ for (x=0; x < cnt; x++) {\n+ rb_ary_push(returnArray, rb_str_new(paths[x], strlen(paths[x]))) ;\n+ free((void*)paths[x]) ;\n+ }\n+ free (paths) ;\n+ }\n+\n+ return returnArray ;\n+}\n+\n+\n+\/*\n+ * call-seq:\n+ * match(PATH, SIZE) -> an_array\n+ *\n * Return the first SIZE paths that match PATTERN, which must be\n * preallocated to hold at least SIZE entries. If no size is provided,\n * then all matches are returned\n@@ -149,75 +149,84 @@\n * so that '*' does not match a '\/'\n *\/\n VALUE augeas_match(int argc, VALUE *argv, VALUE obj) {\n-\t\n-\tif (argc == 0)\n-\t\trb_raise(rb_eArgError, \"wrong number of arguments (0 for 1)\") ;\n-\t\t \n-\tconst char *cpattern = StringValuePtr(argv[0]) ;\n-\n-\t\/\/ figure out the size\n-\tint csize = 0 ;\n-\tif (argc > 1) {\n-\t\tcsize = NUM2INT(argv[1]) ;\n-\t}\n-\telse {\n-\t\t\/\/ pre-fetch to get the count if no size was provided\n-\t\tcsize = aug_match(cpattern, NULL, 0) ;\t\n-\t}\n-\n-\t\/\/ grab memory and make the call\n-\tconst char **matches = calloc(csize, sizeof(char *));\t\t\n-\tint cnt = aug_match(cpattern, matches, csize) ;\n-\t\n-\t\/\/ Process the return value\n-\tVALUE returnArray = rb_ary_new() ;\n-\tif (cnt > 0) {\n-\t\tint x ;\n-\t\tfor (x=0; x < csize; x++) {\n-\t\t\trb_ary_push(returnArray, rb_str_new(matches[x], strlen(matches[x]))) ;\n-\t\t\tfree((void*)matches[x]) ;\n-\t\t}\n-\t\tfree (matches) ;\n-\t}\t\n-\t\n-\treturn returnArray ;\t\n-}\n-\n-\/* \n- * call-seq:\n- * \t save() -> boolean\n- * \n- * Write all pending changes to disk \n+\n+ if (argc == 0)\n+ rb_raise(rb_eArgError, \"wrong number of arguments (0 for 1)\") ;\n+\n+ const char *cpattern = StringValuePtr(argv[0]) ;\n+\n+ \/\/ figure out the size\n+ int csize = 0 ;\n+ if (argc > 1) {\n+ csize = NUM2INT(argv[1]) ;\n+ }\n+ else {\n+ \/\/ pre-fetch to get the count if no size was provided\n+ csize = aug_match(cpattern, NULL, 0) ;\n+ }\n+\n+ \/\/ grab memory and make the call\n+ const char **matches = calloc(csize, sizeof(char *));\n+ int cnt = aug_match(cpattern, matches, csize) ;\n+\n+ \/\/ Process the return value\n+ VALUE returnArray = rb_ary_new() ;\n+ if (cnt > 0) {\n+ int x ;\n+ for (x=0; x < csize; x++) {\n+ rb_ary_push(returnArray, rb_str_new(matches[x], strlen(matches[x]))) ;\n+ free((void*)matches[x]) ;\n+ }\n+ free (matches) ;\n+ }\n+\n+ return returnArray ;\n+}\n+\n+\/*\n+ * call-seq:\n+ * save() -> boolean\n+ *\n+ * Write all pending changes to disk\n *\/\n VALUE augeas_save(VALUE m) {\n-\tint callValue = aug_save() ;\n-\tVALUE returnValue ;\n-\t\n-\tif (callValue == 0) \n-\t\treturnValue = Qtrue ;\n-\telse\n-\t\treturnValue = Qfalse ;\n-\t\n-\treturn returnValue ;\n+ int callValue = aug_save() ;\n+ VALUE returnValue ;\n+\n+ if (callValue == 0)\n+ returnValue = Qtrue ;\n+ else\n+ returnValue = Qfalse ;\n+\n+ return returnValue ;\n }\n \n VALUE augeas_init(VALUE m) {\n-\taug_init() ;\n+ aug_init() ;\n }\n \n void Init__augeas() {\n \n-\t\/* Define the ruby class *\/\n-\tVALUE augeasclass = rb_define_class(\"Augeas\",rb_cObject) ;\n-\t\n-\t\/* Define the methods *\/\n-\trb_define_protected_method(augeasclass, \"aug_init\", augeas_init, 0) ;\n-\trb_define_method(augeasclass, \"get\", augeas_get, 1) ;\t\n-\trb_define_method(augeasclass, \"exists\", augeas_exists, 1) ;\t\n-\trb_define_method(augeasclass, \"insert\", augeas_insert, 2) ;\t\t\n-\trb_define_method(augeasclass, \"rm\", augeas_rm, 1) ;\t\t\t\n-\trb_define_method(augeasclass, \"ls\", augeas_ls, 1) ;\t\n-\trb_define_method(augeasclass, \"match\", augeas_match, -1) ;\t\n-\trb_define_method(augeasclass, \"save\", augeas_save, 0) ;\t\t\n-\trb_define_method(augeasclass, \"set\", augeas_set, 2) ;\t\t\t\n-}\n+ \/* Define the ruby class *\/\n+ VALUE augeasclass = rb_define_class(\"Augeas\",rb_cObject) ;\n+\n+ \/* Define the methods *\/\n+ rb_define_protected_method(augeasclass, \"aug_init\", augeas_init, 0) ;\n+ rb_define_method(augeasclass, \"get\", augeas_get, 1) ;\n+ rb_define_method(augeasclass, \"exists\", augeas_exists, 1) ;\n+ rb_define_method(augeasclass, \"insert\", augeas_insert, 2) ;\n+ rb_define_method(augeasclass, \"rm\", augeas_rm, 1) ;\n+ rb_define_method(augeasclass, \"ls\", augeas_ls, 1) ;\n+ rb_define_method(augeasclass, \"match\", augeas_match, -1) ;\n+ rb_define_method(augeasclass, \"save\", augeas_save, 0) ;\n+ rb_define_method(augeasclass, \"set\", augeas_set, 2) ;\n+}\n+\n+\/*\n+ * Local variables:\n+ * indent-tabs-mode: nil\n+ * c-indent-level: 4\n+ * c-basic-offset: 4\n+ * tab-width: 4\n+ * End:\n+ *\/\n"} {"commit":"4a5d3d44229761b12976e96558a41196125bc147","subject":"Remove slopeoffset.c sample code","message":"Remove slopeoffset.c sample code\n","repos":"gotmc\/mccdaq","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- usb1608fsplus\/c_code\/slopeoffset.c\n+++ usb1608fsplus\/c_code\/slopeoffset.c\n@@ -1,46 +0,0 @@\n-#include <stdlib.h>\n-#include <stdio.h>\n-#include <string.h>\n-#include <unistd.h>\n-#include <fcntl.h>\n-#include <ctype.h>\n-#include <math.h>\n-\n-double volts_USB1608FS_Plus(uint16_t value, uint8_t range)\n-{\n- double volt = 0.0;\n- switch(range) {\n- case 0: volt = (value - 0x8000)*10.0\/32768.; break;\n- case 1: volt = (value - 0x8000)*5.0\/32768.; break;\n- case 2: volt = (value - 0x8000)*2.5\/32768.; break;\n- case 3: volt = (value - 0x8000)*2.0\/32768.; break;\n- case 4: volt = (value - 0x8000)*1.25\/32768.; break;\n- case 5: volt = (value - 0x8000)*1.0\/32768.; break;\n- case 6: volt = (value - 0x8000)*0.625\/32768.; break;\n- case 7: volt = (value - 0x8000)*0.3125\/32768.; break;\n- default: printf(\"Unknown range.\\n\"); break;\n- }\n- return volt;\n-}\n-\n-int main ()\n-{\n- float slope;\n- float offset;\n- uint16_t value;\n- uint16_t adjvalue;\n- uint8_t range;\n-\n- value = 0x8000;\n- slope = 1.155244;\n- offset = -5451.133301;\n- range = 3;\n- adjvalue = rint(value*slope + offset);\n- printf(\"Value = %#x \/ Adjusted Value = %#x\\n\", value, adjvalue);\n- printf(\"Votlage = %lf \/ Adjusted Voltage = %lf\\n\",\n- volts_USB1608FS_Plus(value, range), volts_USB1608FS_Plus(adjvalue, range));\n- printf(\"value * slope = %f\\n\", value*slope);\n- printf(\"value * slope - offset = %f\\n\", value*slope+offset);\n- printf(\"rint(value * slope - offset) = %f\\n\", rint(value*slope+offset));\n- return 0;\n-}\n"} {"commit":"68f5d750a720b550c7f8ea9c8ca8db0e22b7a91a","subject":"Fix commit f923ba1","message":"Fix commit f923ba1\n","repos":"guilherme\/byebug,scalp42\/byebug,yui-knk\/byebug,icebreaker\/byebug,deivid-rodriguez\/byebug,ozydingo\/byebug,guilherme\/byebug,saisai\/byebug,webdev1001\/byebug,k0kubun\/byebug,k0kubun\/byebug,k0kubun\/byebug,icebreaker\/byebug,deivid-rodriguez\/byebug,yui-knk\/byebug,saisai\/byebug,os97673\/byebug,miamiruby\/byebug,yui-knk\/byebug,deivid-rodriguez\/byebug,os97673\/byebug,guilherme\/byebug,miamiruby\/byebug,webdev1001\/byebug,ozydingo\/byebug,scalp42\/byebug","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ext\/byebug\/threads.c\n+++ ext\/byebug\/threads.c\n@@ -9,8 +9,6 @@\n UNUSED(tbl);\n \n rb_gc_mark((VALUE) key);\n-\n- rb_gc_mark(thread);\n \n if (!value)\n return ST_CONTINUE;\n"} {"commit":"0e93da39f207cac29de7c6a774f720c379d2355c","subject":"tp.c: clean up code","message":"tp.c: clean up code\n","repos":"araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc,araisrobo\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/emc\/kinematics\/tp.c\n+++ src\/emc\/kinematics\/tp.c\n@@ -1709,7 +1709,8 @@\n \/\/ to motion. It's not THAT bad and in the interest of not touching\n \/\/ stuff outside this directory, I'm going to leave it for now.\n \n-int tpRunCycle(TP_STRUCT * tp, long period) {\n+int tpRunCycle(TP_STRUCT * tp, long period) \n+{\n \/\/ vel = (new position - old position) \/ cycle time\n \/\/ (two position points required)\n \/\/\n@@ -2235,7 +2236,7 @@\n }\n \n int tpSetSyncInput(TP_STRUCT *tp, int index, double timeout, int wait_type) {\n- int i;\n+ \/\/ int i;\n if (0 == tp) {\n return -1;\n }\n"} {"commit":"d0e2e3462753cce2d56b6ce6eb8f1bf10051b8c3","subject":"Credit to @haukot - Fix RubyCaller to always catch Ruby exceptions, even on C functions","message":"Credit to @haukot - Fix RubyCaller to always catch Ruby exceptions, even on C functions\n\n@haukot opened issue #26 that exposed an exception handling issue,\nwhere exceptions weren\u2019t handled when the GVL was entered using\n`RubyCaller.call_c` rather than a Ruby `RubyCaller.call`.\n\nThis redesigned implementation should solve the issue.\n","repos":"boazsegev\/iodine,boazsegev\/iodine,boazsegev\/iodine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/iodine\/rb-call.c\n+++ ext\/iodine\/rb-call.c\n@@ -13,22 +13,39 @@\n #define _Thread_local __thread\n #endif\n \n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\/\/ this is a simple helper that calls Ruby methods on Ruby objects while within\n-\/\/ a non-GVL ruby thread zone.\n-struct RubyArgCall {\n+typedef enum {\n+ RUBY_TASK,\n+ C_TASK,\n+} iodine_task_type_en;\n+\n+typedef struct {\n+ iodine_task_type_en type;\n VALUE obj;\n int argc;\n VALUE *argv;\n VALUE returned;\n ID method;\n int exception;\n-};\n+} iodine_rb_task_s;\n+\n+typedef struct {\n+ iodine_task_type_en type;\n+ void *(*func)(void *);\n+ void *arg;\n+} iodine_c_task_s;\n \n \/\/ running the actual method call\n-static VALUE run_ruby_method_unsafe(VALUE tsk_) {\n- struct RubyArgCall *task = (void *)tsk_;\n- return rb_funcall2(task->obj, task->method, task->argc, task->argv);\n+static VALUE iodine_ruby_caller_perform(VALUE tsk_) {\n+ switch (*(iodine_task_type_en *)tsk_) {\n+ case RUBY_TASK: {\n+ iodine_rb_task_s *task = (void *)tsk_;\n+ return rb_funcall2(task->obj, task->method, task->argc, task->argv);\n+ }\n+ case C_TASK: {\n+ iodine_c_task_s *task = (void *)tsk_;\n+ return (VALUE)task->func(task->arg);\n+ }\n+ }\n }\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n@@ -58,16 +75,14 @@\n return (void *)Qnil;\n }\n \n-\/\/ GVL gateway\n-static void *run_ruby_method_within_gvl(void *tsk_) {\n- struct RubyArgCall *task = tsk_;\n+\/* wrap the function call in the exception handling code *\/\n+static void *iodine_protected_call(void *tsk_) {\n int state = 0;\n- task->returned = rb_protect(run_ruby_method_unsafe, (VALUE)(task), &state);\n+ VALUE ret = rb_protect(iodine_ruby_caller_perform, (VALUE)(tsk_), &state);\n if (state) {\n- task->exception = 1;\n handle_exception(NULL);\n }\n- return task;\n+ return (void *)ret;\n }\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n@@ -81,13 +96,14 @@\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ Calling C functions.\n-static void *iodine_rb_call_c(void *(*func)(void *), void *arg) {\n+static inline void *iodine_rb_call_c(void *(*func)(void *), void *arg) {\n if (in_gvl) {\n return func(arg);\n }\n+ iodine_c_task_s task = {.type = C_TASK, .func = func, .arg = arg};\n void *ret;\n in_gvl = 1;\n- ret = rb_thread_call_with_gvl(func, arg);\n+ ret = rb_thread_call_with_gvl(iodine_protected_call, &task);\n in_gvl = 0;\n return ret;\n }\n@@ -103,24 +119,27 @@\n }\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\/\/ A simple (and a bit lighter) design for when there's no need for arguments.\n-\n-\/\/ wrapping any API calls for exception management AND GVL entry\n-static VALUE iodin_rb_call(VALUE obj, ID method) {\n- struct RubyArgCall task = {.obj = obj, .method = method};\n- iodine_rb_call_c(run_ruby_method_within_gvl, &task);\n- return task.returned;\n-}\n-\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ A heavier (memory) design for when we're passing arguments around.\n \n \/\/ wrapping any API calls for exception management AND GVL entry\n static VALUE iodin_rb_call_arg(VALUE obj, ID method, int argc, VALUE *argv) {\n- struct RubyArgCall task = {\n- .obj = obj, .method = method, .argc = argc, .argv = argv};\n- iodine_rb_call_c(run_ruby_method_within_gvl, &task);\n- return task.returned;\n+ iodine_rb_task_s task = {.type = RUBY_TASK,\n+ .obj = obj,\n+ .method = method,\n+ .argc = argc,\n+ .argv = argv};\n+ void *ret;\n+ if (in_gvl)\n+ return (VALUE)rb_funcall2(obj, method, argc, argv);\n+ in_gvl = 1;\n+ ret = rb_thread_call_with_gvl(iodine_protected_call, &task);\n+ in_gvl = 0;\n+ return (VALUE)ret;\n+}\n+\n+\/\/ wrapping any API calls for exception management AND GVL entry\n+static VALUE iodin_rb_call(VALUE obj, ID method) {\n+ return iodin_rb_call_arg(obj, method, 0, NULL);\n }\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n"} {"commit":"5c310c3237029d9a2f22a4c616fcc8015ed01c3b","subject":"Add comments to the preprocessor","message":"Add comments to the preprocessor\n\nWe have two kind of comments, and it makes a bit more\ncomplex the readline function.\n","repos":"k0gaMSX\/kcc,8l\/scc,k0gaMSX\/scc,k0gaMSX\/scc,8l\/scc,8l\/scc,k0gaMSX\/scc,k0gaMSX\/kcc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cc1\/lex.c\n+++ cc1\/lex.c\n@@ -211,8 +211,8 @@\n readline(void)\n {\n \tchar *bp, *ptr;\n-\tuint8_t n;\n-\tint c;\n+\tuint8_t n, eol, block;\n+\tint back, c;\n \tFILE *fp;\n \n repeat:\n@@ -232,19 +232,55 @@\n \t\tgoto repeat;\n \t}\n \tungetc(c, fp);\n-\n-\tfor (bp = ptr; (c = getc(fp)) != EOF && c != '\\n'; ) {\n-\t\tif (c == '\\\\') {\n+\tback = eol = block = 0;\n+\n+\tfor (bp = ptr; (c = getc(fp)) != EOF; ) {\n+\t\tswitch (c) {\n+\t\tcase '\\\\':\n \t\t\tif ((c = getc(fp)) == '\\n')\n \t\t\t\tcontinue;\n-\t\t\tungetc(c, fp);\n+\t\t\tback = c;\n \t\t\tc = '\\\\';\n+\t\t\tbreak;\n+\t\tcase '\/':\n+\t\t\tif ((c = getc(fp)) == '\/')\n+\t\t\t\teol = 1;\n+\t\t\telse if (c == '*')\n+\t\t\t\tblock = 1;\n+\t\t\telse\n+\t\t\t\tback = c;\n+\t\t\tc = '\/';\n+\t\t\tbreak;\n+\t\tcase '\\n':\n+\t\t\tif (eol)\n+\t\t\t\tc = ' ';\n+\t\t\telse if (!block)\n+\t\t\t\tgoto end_line;\n+\t\t\tbreak;\n+\t\tcase '*':\n+\t\t\tif (block) {\n+\t\t\t\tif ((c = getc(fp)) == '\/') {\n+\t\t\t\t\tblock = 0;\n+\t\t\t\t\tc = ' ';\n+\t\t\t\t} else {\n+\t\t\t\t\tback = c;\n+\t\t\t\t\tc = '*';\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (eol || block)\n+\t\t\tcontinue;\n+\t\tif (back) {\n+\t\t\tungetc(back, fp);\n+\t\t\tback = 0;\n \t\t}\n \t\tif (bp == &ptr[INPUTSIZ])\n \t\t\tdie(\"line %d too big in file '%s'\",\n \t\t\t input->nline, input->fname);\n \t\t*bp++ = c;\n \t}\n+end_line:\n \t*bp = ' ';\n \tinput->cnt = bp - ptr;\n \tinput->ptr = ptr;\n"} {"commit":"fdb9bbf764bb409059eb6172f01ab44632a37df0","subject":"Add documentation for stream.event_{add,remove,update}_callback.","message":"Add documentation for stream.event_{add,remove,update}_callback.\n\nSigned-off-by: Chris Lalancette <60b62644009db6b194cc0445b64e9b27bb26433a@redhat.com>\n","repos":"libvirt\/ruby-libvirt,libvirt\/ruby-libvirt,libvirt\/ruby-libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/libvirt\/stream.c\n+++ ext\/libvirt\/stream.c\n@@ -243,6 +243,21 @@\n \"wrong stream event callback (expected Symbol or Proc)\");\n }\n \n+\/*\n+ * call-seq:\n+ * stream.event_add_callback(events, callback, opaque=nil) -> nil\n+ *\n+ * Call +virStreamEventAddCallback+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virStreamEventAddCallback]\n+ * to register a callback to be notified when a stream becomes readable or\n+ * writeable. The events parameter is an integer representing the events the\n+ * user is interested in; it should be one or more of EVENT_READABLE,\n+ * EVENT_WRITABLE, EVENT_ERROR, and EVENT_HANGUP, ORed together. The callback\n+ * can either be a Symbol (that is the name of a method to callback) or a Proc.\n+ * The callback should accept 3 parameters: a pointer to the Stream object\n+ * itself, the integer that represents the events that actually occurred, and\n+ * an opaque pointer that was (optionally) passed into\n+ * stream.event_add_callback to begin with.\n+ *\/\n static VALUE libvirt_stream_event_add_callback(int argc, VALUE *argv, VALUE s) {\n VALUE events;\n VALUE callback;\n@@ -269,6 +284,16 @@\n return Qnil;\n }\n \n+\/*\n+ * call-seq:\n+ * stream.event_update_callback(events) -> nil\n+ *\n+ * Call +virStreamEventUpdateCallback+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virStreamEventUpdateCallback]\n+ * to change the events that the event callback is looking for. The events\n+ * parameter is an integer representing the events the user is interested in;\n+ * it should be one or more of EVENT_READABLE, EVENT_WRITABLE, EVENT_ERROR,\n+ * and EVENT_HANGUP, ORed together.\n+ *\/\n static VALUE libvirt_stream_event_update_callback(VALUE s, VALUE events) {\n int ret;\n \n@@ -279,6 +304,13 @@\n return Qnil;\n }\n \n+\/*\n+ * call-seq:\n+ * stream.event_remove_callback -> nil\n+ *\n+ * Call +virStreamEventRemoveCallback+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virStreamEventRemoveCallback]\n+ * to remove the event callback currently registered to this stream.\n+ *\/\n static VALUE libvirt_stream_event_remove_callback(VALUE s) {\n int ret;\n \n"} {"commit":"44b1465d17bd91a54577544dc9c281ebe64120a4","subject":"BGG -- changed the version info to be consistent","message":"BGG -- changed the version info to be consistent\n","repos":"RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/maxmsp\/rtcmix~.c\n+++ src\/maxmsp\/rtcmix~.c\n@@ -78,8 +78,8 @@\n \n \n \n-#define VERSION \"2.00\"\n-#define RTcmixVERSION \"RTcmix-maxmsp-4.1.1\"\n+#define VERSION \"2.004\"\n+#define RTcmixVERSION \"RTcmix-maxmsp-4.3\"\n \n #include \"ext.h\"\n #include \"z_dsp.h\"\n"} {"commit":"97b578972499f58449a8ecfec22cd68b9ab41886","subject":"src\/emc\/motion\/motion.c changes","message":"src\/emc\/motion\/motion.c changes\n","repos":"araisrobo\/machinekit,kinsamanka\/machinekit,cdsteinkuehler\/MachineKit,bobvanderlinden\/machinekit,unseenlaser\/machinekit,cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,Cid427\/machinekit,Cid427\/machinekit,strahlex\/machinekit,ArcEye\/MK-Qt5,strahlex\/machinekit,strahlex\/machinekit,kinsamanka\/machinekit,EqAfrica\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/MachineKit,RunningLight\/machinekit,araisrobo\/machinekit,kinsamanka\/machinekit,cdsteinkuehler\/MachineKit,RunningLight\/machinekit,RunningLight\/machinekit,ArcEye\/machinekit-testing,araisrobo\/machinekit,cdsteinkuehler\/linuxcnc,EqAfrica\/machinekit,Cid427\/machinekit,bobvanderlinden\/machinekit,RunningLight\/machinekit,araisrobo\/machinekit,strahlex\/machinekit,kinsamanka\/machinekit,EqAfrica\/machinekit,RunningLight\/machinekit,ArcEye\/MK-Qt5,unseenlaser\/machinekit,ArcEye\/MK-Qt5,strahlex\/machinekit,ArcEye\/MK-Qt5,mhaberler\/machinekit,ArcEye\/MK-Qt5,cdsteinkuehler\/MachineKit,kinsamanka\/machinekit,EqAfrica\/machinekit,unseenlaser\/machinekit,cdsteinkuehler\/linuxcnc,unseenlaser\/machinekit,ArcEye\/machinekit-testing,EqAfrica\/machinekit,EqAfrica\/machinekit,mhaberler\/machinekit,ArcEye\/MK-Qt5,araisrobo\/machinekit,RunningLight\/machinekit,bobvanderlinden\/machinekit,unseenlaser\/machinekit,EqAfrica\/machinekit,araisrobo\/machinekit,ArcEye\/machinekit-testing,bobvanderlinden\/machinekit,mhaberler\/machinekit,mhaberler\/machinekit,araisrobo\/machinekit,RunningLight\/machinekit,ArcEye\/machinekit-testing,EqAfrica\/machinekit,mhaberler\/machinekit,bobvanderlinden\/machinekit,Cid427\/machinekit,RunningLight\/machinekit,bobvanderlinden\/machinekit,Cid427\/machinekit,cdsteinkuehler\/MachineKit,mhaberler\/machinekit,bobvanderlinden\/machinekit,kinsamanka\/machinekit,ArcEye\/machinekit-testing,Cid427\/machinekit,Cid427\/machinekit,cdsteinkuehler\/MachineKit,strahlex\/machinekit,mhaberler\/machinekit,unseenlaser\/machinekit,araisrobo\/machinekit,cdsteinkuehler\/linuxcnc,cdsteinkuehler\/linuxcnc,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,unseenlaser\/machinekit,mhaberler\/machinekit,kinsamanka\/machinekit,strahlex\/machinekit,cdsteinkuehler\/linuxcnc,ArcEye\/MK-Qt5,unseenlaser\/machinekit,araisrobo\/machinekit,kinsamanka\/machinekit,ArcEye\/machinekit-testing,Cid427\/machinekit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/emc\/motion\/motion.c\n+++ src\/emc\/motion\/motion.c\n@@ -28,7 +28,7 @@\n * KERNEL MODULE PARAMETERS *\n ************************************************************************\/\n \n-static int key = DEFAULT_SHMEM_KEY;\t\t\/* the shared memory key, default value *\/\n+static int key = DEFAULT_MOTION_SHMEM_KEY;\t\t\/* the shared memory key, default value *\/\n \n \/* module information *\/\n \/* register symbols to be modified by insmod\n"} {"commit":"acbcce1225010c6224e22e02bc5de21336a03c9e","subject":"White space","message":"White space\n","repos":"karies\/root,zzxuanyuan\/root,karies\/root,zzxuanyuan\/root,olifre\/root,root-mirror\/root,karies\/root,root-mirror\/root,karies\/root,root-mirror\/root,zzxuanyuan\/root,olifre\/root,karies\/root,zzxuanyuan\/root,karies\/root,zzxuanyuan\/root,olifre\/root,zzxuanyuan\/root,karies\/root,olifre\/root,zzxuanyuan\/root,olifre\/root,root-mirror\/root,olifre\/root,root-mirror\/root,olifre\/root,zzxuanyuan\/root,root-mirror\/root,karies\/root,olifre\/root,root-mirror\/root,zzxuanyuan\/root,root-mirror\/root,olifre\/root,olifre\/root,zzxuanyuan\/root,olifre\/root,root-mirror\/root,zzxuanyuan\/root,zzxuanyuan\/root,karies\/root,root-mirror\/root,karies\/root,root-mirror\/root,karies\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/meta\/src\/TViewPubDataMembers.h\n+++ core\/meta\/src\/TViewPubDataMembers.h\n@@ -14,7 +14,7 @@\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ \/\/\n-\/\/ TViewPubDataMembers \/\/\n+\/\/ TViewPubDataMembers \/\/\n \/\/ \/\/\n \/\/ \/\/\n \/\/ \/\/\n@@ -88,16 +88,14 @@\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ \/\/\n-\/\/ TViewPubDataMembersIter \/\/\n+\/\/ TViewPubDataMembersIter \/\/\n \/\/ \/\/\n-\/\/ Iterator of view of linked list. `1234 \/\/\n+\/\/ Iterator of view of linked list. ` \/\/\n \/\/ \/\/\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n class TViewPubDataMembersIter : public TIterator,\n-public std::iterator<std::bidirectional_iterator_tag,\n-TObject*, std::ptrdiff_t,\n-const TObject**, const TObject*&>\n-{\n+ public std::iterator<std::bidirectional_iterator_tag, TObject *, std::ptrdiff_t,\n+ const TObject **, const TObject *&> {\n protected:\n const TList *fView; \/\/View we are iterating over.\n TIter fClassIter; \/\/iterator over the classes\n"} {"commit":"85e2487898bf8401213c8d7ffebf3b5f565b1050","subject":"add cipher_bm::cfb\/ctr to default build.","message":"add cipher_bm::cfb\/ctr to default build.\n","repos":"azadkuh\/mbedcrypto,azadkuh\/mbedcrypto","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mbedtls_config.h\n+++ src\/mbedtls_config.h\n@@ -27,6 +27,8 @@\n \n \/\/ cipher\n #define MBEDTLS_CIPHER_MODE_CBC\n+#define MBEDTLS_CIPHER_MODE_CFB\n+#define MBEDTLS_CIPHER_MODE_CTR\n #define MBEDTLS_CIPHER_MODE_WITH_PADDING\n #define MBEDTLS_CIPHER_PADDING_PKCS7\n #define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS\n"} {"commit":"bc584789c3aa0808b0dca71e3e8f885e9f7e0f18","subject":"fix pre bug","message":"fix pre bug","repos":"hljyunxi\/clearsilver,hobby\/clearsilver,hongruiqi\/clearsilver,alisonjoe\/clearsilver,WillYee\/clearsilver,hongruiqi\/clearsilver,manuelluis\/clearsilver,alisonjoe\/clearsilver,alisonjoe\/clearsilver,hczhang\/clearsilver,manuelluis\/clearsilver,apfeltee\/clearsilver,hobby\/clearsilver,hongruiqi\/clearsilver,hongruiqi\/clearsilver,hczhang\/clearsilver,manuelluis\/clearsilver,apfeltee\/clearsilver,hongruiqi\/clearsilver,hobby\/clearsilver,alisonjoe\/clearsilver,hljyunxi\/clearsilver,manuelluis\/clearsilver,WillYee\/clearsilver,hljyunxi\/clearsilver,hczhang\/clearsilver,hljyunxi\/clearsilver,manuelluis\/clearsilver,hczhang\/clearsilver,WillYee\/clearsilver,apfeltee\/clearsilver,hobby\/clearsilver,WillYee\/clearsilver,WillYee\/clearsilver,hobby\/clearsilver,hljyunxi\/clearsilver,hobby\/clearsilver,alisonjoe\/clearsilver,manuelluis\/clearsilver,apfeltee\/clearsilver,WillYee\/clearsilver,apfeltee\/clearsilver,alisonjoe\/clearsilver,hczhang\/clearsilver,apfeltee\/clearsilver,hczhang\/clearsilver,hczhang\/clearsilver,hongruiqi\/clearsilver,hljyunxi\/clearsilver,apfeltee\/clearsilver,hljyunxi\/clearsilver,hljyunxi\/clearsilver,apfeltee\/clearsilver,hobby\/clearsilver,apfeltee\/clearsilver,alisonjoe\/clearsilver,hczhang\/clearsilver,WillYee\/clearsilver,alisonjoe\/clearsilver,hczhang\/clearsilver,hljyunxi\/clearsilver,WillYee\/clearsilver,hongruiqi\/clearsilver,manuelluis\/clearsilver,hobby\/clearsilver,hobby\/clearsilver,manuelluis\/clearsilver,hongruiqi\/clearsilver,alisonjoe\/clearsilver,hongruiqi\/clearsilver,manuelluis\/clearsilver,WillYee\/clearsilver","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- cgi\/cgi.c\n+++ cgi\/cgi.c\n@@ -977,7 +977,7 @@\n \to += l;\n \ti += l;\n }\n- else if (!strncasecmp(str->buf + i, \"pre\", 8))\n+ else if (!strncasecmp(str->buf + i, \"pre\", 3))\n {\n \tch = str->buf + i;\n \tdo\n"} {"commit":"03dd5dfa13cc79b60c91c72cc16acd8b1e0ba12e","subject":"McdDispatcher: listen to McdClient's need-recovery signal","message":"McdDispatcher: listen to McdClient's need-recovery signal\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/mcd-dispatcher.c\n+++ src\/mcd-dispatcher.c\n@@ -805,6 +805,9 @@\n static void mcd_dispatcher_client_gone_cb (McdClientProxy *client,\n McdDispatcher *self);\n \n+static void mcd_dispatcher_client_needs_recovery_cb (McdClientProxy *client,\n+ McdDispatcher *self);\n+\n static void\n mcd_dispatcher_discard_client (McdDispatcher *self,\n McdClientProxy *client)\n@@ -818,6 +821,9 @@\n g_signal_handlers_disconnect_by_func (client,\n mcd_dispatcher_client_gone_cb,\n self);\n+\n+ g_signal_handlers_disconnect_by_func (client,\n+ mcd_dispatcher_client_needs_recovery_cb, self);\n }\n \n static void\n@@ -825,6 +831,40 @@\n McdDispatcher *self)\n {\n mcd_dispatcher_discard_client (self, client);\n+}\n+\n+static void\n+mcd_dispatcher_client_needs_recovery_cb (McdClientProxy *client,\n+ McdDispatcher *self)\n+{\n+ GList *channels =\n+ _mcd_handler_map_get_handled_channels (self->priv->handler_map);\n+ GHashTable *accounts =\n+ _mcd_handler_map_get_channel_accounts (self->priv->handler_map);\n+ const GList *observer_filters;\n+ GList *list;\n+\n+ DEBUG (\"called\");\n+\n+ observer_filters = _mcd_client_proxy_get_observer_filters (client);\n+\n+ for (list = channels; list; list = list->next)\n+ {\n+ TpChannel *channel = list->data;\n+ GHashTable *properties;\n+\n+ properties = tp_channel_borrow_immutable_properties (channel);\n+\n+ if (_mcd_client_match_filters (properties, observer_filters,\n+ FALSE))\n+ {\n+ const gchar *account_path =\n+ g_hash_table_lookup (accounts, tp_proxy_get_object_path (channel));\n+\n+ _mcd_client_recover_observer (client, channel, account_path);\n+ }\n+\n+ }\n }\n \n static void\n@@ -843,6 +883,11 @@\n g_signal_connect (client, \"handler-capabilities-changed\",\n G_CALLBACK (mcd_dispatcher_client_capabilities_changed_cb),\n self);\n+\n+ g_signal_connect (client, \"need-recovery\",\n+ G_CALLBACK (mcd_dispatcher_client_needs_recovery_cb),\n+ self);\n+\n }\n \n static void\n"} {"commit":"37af6017fd7f69611e4c0e560c0103afccc8e090","subject":"chapter: 'tref' and 'udta' boxes can exist in each container box up to one.","message":"chapter: 'tref' and 'udta' boxes can exist in each container box up to one.\n\nFix a regression in 45e48b5 .\n","repos":"l-smash\/l-smash,silverfilain\/L-SMASH,maki-rxrz\/L-SMASH,dwbuiten\/l-smash,canbal\/l-smash,l-smash\/l-smash,mstorsjo\/l-smash,dwbuiten\/l-smash,canbal\/l-smash,mstorsjo\/l-smash,silverfilain\/L-SMASH,l-smash\/l-smash,silverfilain\/L-SMASH,maki-rxrz\/L-SMASH","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- chapter.c\n+++ chapter.c\n@@ -180,7 +180,8 @@\n lsmash_log( NULL, LSMASH_LOG_ERROR, \"failed to open the chapter file \\\"%s\\\".\\n\", file_name );\n goto error_message;\n }\n- if( isom_add_udta( root->moov ) || isom_add_chpl( root->moov->udta ) )\n+ if( (!root->moov->udta && isom_add_udta( root->moov ))\n+ || (!root->moov->udta->chpl && isom_add_chpl( root->moov->udta )) )\n goto fail;\n root->moov->udta->chpl->version = 1; \/* version = 1 is popular. *\/\n isom_chapter_entry_t data = {0};\n@@ -238,7 +239,7 @@\n lsmash_log( NULL, LSMASH_LOG_ERROR, \"the specified track ID to apply the chapter doesn't exist.\\n\" );\n goto error_message;\n }\n- if( isom_add_tref( trak ) )\n+ if( !trak->tref && isom_add_tref( trak ) )\n goto error_message;\n \/* Create a track_ID for a new chapter track. *\/\n uint32_t *id = (uint32_t *)lsmash_malloc( sizeof(uint32_t) );\n"} {"commit":"73f8f1c49a9eb6a28554e7b576568511cc179550","subject":"Add CONTENT_EXPORT to AudioDevice::RenderCallback class.","message":"Add CONTENT_EXPORT to AudioDevice::RenderCallback class.\n\nThis fixes shared builds.\n\nBUG=NONE\nTEST=trybots pass\nTBR=crogers\n\nReview URL: http:\/\/codereview.chromium.org\/8899005\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@113828 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"markYoungH\/chromium.src,ChromiumWebApps\/chromium,dednal\/chromium.src,jaruba\/chromium.src,timopulkkinen\/BubbleFish,TheTypoMaster\/chromium-crosswalk,rogerwang\/chromium,anirudhSK\/chromium,robclark\/chromium,timopulkkinen\/BubbleFish,axinging\/chromium-crosswalk,M4sse\/chromium.src,rogerwang\/chromium,jaruba\/chromium.src,patrickm\/chromium.src,TheTypoMaster\/chromium-crosswalk,anirudhSK\/chromium,Jonekee\/chromium.src,ltilve\/chromium,axinging\/chromium-crosswalk,M4sse\/chromium.src,mogoweb\/chromium-crosswalk,ChromiumWebApps\/chromium,anirudhSK\/chromium,keishi\/chromium,krieger-od\/nwjs_chromium.src,fujunwei\/chromium-crosswalk,ltilve\/chromium,nacl-webkit\/chrome_deps,littlstar\/chromium.src,robclark\/chromium,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk,dushu1203\/chromium.src,junmin-zhu\/chromium-rivertrail,M4sse\/chromium.src,Jonekee\/chromium.src,patrickm\/chromium.src,hgl888\/chromium-crosswalk-efl,keishi\/chromium,Fireblend\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,Just-D\/chromium-1,fujunwei\/chromium-crosswalk,littlstar\/chromium.src,bright-sparks\/chromium-spacewalk,dednal\/chromium.src,krieger-od\/nwjs_chromium.src,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,bright-sparks\/chromium-spacewalk,M4sse\/chromium.src,pozdnyakov\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,fujunwei\/chromium-crosswalk,ondra-novak\/chromium.src,jaruba\/chromium.src,timopulkkinen\/BubbleFish,hgl888\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,ondra-novak\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,nacl-webkit\/chrome_deps,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk,jaruba\/chromium.src,pozdnyakov\/chromium-crosswalk,fujunwei\/chromium-crosswalk,nacl-webkit\/chrome_deps,ondra-novak\/chromium.src,dushu1203\/chromium.src,hujiajie\/pa-chromium,fujunwei\/chromium-crosswalk,Just-D\/chromium-1,timopulkkinen\/BubbleFish,zcbenz\/cefode-chromium,dednal\/chromium.src,hujiajie\/pa-chromium,crosswalk-project\/chromium-crosswalk-efl,keishi\/chromium,dushu1203\/chromium.src,krieger-od\/nwjs_chromium.src,jaruba\/chromium.src,patrickm\/chromium.src,bright-sparks\/chromium-spacewalk,ltilve\/chromium,M4sse\/chromium.src,bright-sparks\/chromium-spacewalk,dednal\/chromium.src,junmin-zhu\/chromium-rivertrail,Pluto-tv\/chromium-crosswalk,keishi\/chromium,anirudhSK\/chromium,TheTypoMaster\/chromium-crosswalk,axinging\/chromium-crosswalk,dushu1203\/chromium.src,axinging\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,nacl-webkit\/chrome_deps,zcbenz\/cefode-chromium,chuan9\/chromium-crosswalk,anirudhSK\/chromium,crosswalk-project\/chromium-crosswalk-efl,Jonekee\/chromium.src,Fireblend\/chromium-crosswalk,anirudhSK\/chromium,crosswalk-project\/chromium-crosswalk-efl,ChromiumWebApps\/chromium,anirudhSK\/chromium,rogerwang\/chromium,Pluto-tv\/chromium-crosswalk,chuan9\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,littlstar\/chromium.src,junmin-zhu\/chromium-rivertrail,patrickm\/chromium.src,axinging\/chromium-crosswalk,dushu1203\/chromium.src,Fireblend\/chromium-crosswalk,zcbenz\/cefode-chromium,timopulkkinen\/BubbleFish,mogoweb\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,markYoungH\/chromium.src,nacl-webkit\/chrome_deps,Pluto-tv\/chromium-crosswalk,robclark\/chromium,TheTypoMaster\/chromium-crosswalk,rogerwang\/chromium,nacl-webkit\/chrome_deps,mohamed--abdel-maksoud\/chromium.src,timopulkkinen\/BubbleFish,timopulkkinen\/BubbleFish,crosswalk-project\/chromium-crosswalk-efl,Just-D\/chromium-1,littlstar\/chromium.src,Chilledheart\/chromium,ChromiumWebApps\/chromium,junmin-zhu\/chromium-rivertrail,Fireblend\/chromium-crosswalk,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,pozdnyakov\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,zcbenz\/cefode-chromium,dushu1203\/chromium.src,littlstar\/chromium.src,robclark\/chromium,rogerwang\/chromium,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk-efl,timopulkkinen\/BubbleFish,bright-sparks\/chromium-spacewalk,zcbenz\/cefode-chromium,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,ChromiumWebApps\/chromium,robclark\/chromium,Chilledheart\/chromium,hujiajie\/pa-chromium,Chilledheart\/chromium,nacl-webkit\/chrome_deps,jaruba\/chromium.src,hgl888\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,dednal\/chromium.src,M4sse\/chromium.src,axinging\/chromium-crosswalk,patrickm\/chromium.src,ChromiumWebApps\/chromium,hujiajie\/pa-chromium,robclark\/chromium,ChromiumWebApps\/chromium,robclark\/chromium,junmin-zhu\/chromium-rivertrail,ltilve\/chromium,littlstar\/chromium.src,pozdnyakov\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,Jonekee\/chromium.src,hujiajie\/pa-chromium,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,chuan9\/chromium-crosswalk,mogoweb\/chromium-crosswalk,hujiajie\/pa-chromium,mohamed--abdel-maksoud\/chromium.src,rogerwang\/chromium,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,krieger-od\/nwjs_chromium.src,Chilledheart\/chromium,keishi\/chromium,Jonekee\/chromium.src,Pluto-tv\/chromium-crosswalk,keishi\/chromium,fujunwei\/chromium-crosswalk,Chilledheart\/chromium,PeterWangIntel\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,mohamed--abdel-maksoud\/chromium.src,ltilve\/chromium,M4sse\/chromium.src,ltilve\/chromium,hgl888\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,dushu1203\/chromium.src,Jonekee\/chromium.src,markYoungH\/chromium.src,zcbenz\/cefode-chromium,hujiajie\/pa-chromium,mogoweb\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,robclark\/chromium,Fireblend\/chromium-crosswalk,M4sse\/chromium.src,hgl888\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,zcbenz\/cefode-chromium,Pluto-tv\/chromium-crosswalk,anirudhSK\/chromium,chuan9\/chromium-crosswalk,ondra-novak\/chromium.src,rogerwang\/chromium,markYoungH\/chromium.src,markYoungH\/chromium.src,ltilve\/chromium,timopulkkinen\/BubbleFish,dednal\/chromium.src,jaruba\/chromium.src,ondra-novak\/chromium.src,dednal\/chromium.src,dushu1203\/chromium.src,Jonekee\/chromium.src,markYoungH\/chromium.src,rogerwang\/chromium,hgl888\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,markYoungH\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,Just-D\/chromium-1,hujiajie\/pa-chromium,crosswalk-project\/chromium-crosswalk-efl,M4sse\/chromium.src,Just-D\/chromium-1,keishi\/chromium,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Chilledheart\/chromium,axinging\/chromium-crosswalk,ChromiumWebApps\/chromium,dushu1203\/chromium.src,zcbenz\/cefode-chromium,ondra-novak\/chromium.src,PeterWangIntel\/chromium-crosswalk,hujiajie\/pa-chromium,ChromiumWebApps\/chromium,rogerwang\/chromium,markYoungH\/chromium.src,mohamed--abdel-maksoud\/chromium.src,fujunwei\/chromium-crosswalk,chuan9\/chromium-crosswalk,fujunwei\/chromium-crosswalk,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,keishi\/chromium,bright-sparks\/chromium-spacewalk,Fireblend\/chromium-crosswalk,jaruba\/chromium.src,anirudhSK\/chromium,mogoweb\/chromium-crosswalk,Just-D\/chromium-1,krieger-od\/nwjs_chromium.src,Just-D\/chromium-1,ChromiumWebApps\/chromium,mogoweb\/chromium-crosswalk,Just-D\/chromium-1,anirudhSK\/chromium,Fireblend\/chromium-crosswalk,dushu1203\/chromium.src,PeterWangIntel\/chromium-crosswalk,Chilledheart\/chromium,ChromiumWebApps\/chromium,jaruba\/chromium.src,krieger-od\/nwjs_chromium.src,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,jaruba\/chromium.src,jaruba\/chromium.src,chuan9\/chromium-crosswalk,dednal\/chromium.src,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,fujunwei\/chromium-crosswalk,anirudhSK\/chromium,Pluto-tv\/chromium-crosswalk,littlstar\/chromium.src,timopulkkinen\/BubbleFish,PeterWangIntel\/chromium-crosswalk,nacl-webkit\/chrome_deps,Fireblend\/chromium-crosswalk,patrickm\/chromium.src,keishi\/chromium,pozdnyakov\/chromium-crosswalk,Jonekee\/chromium.src,ondra-novak\/chromium.src,ondra-novak\/chromium.src,dednal\/chromium.src,Chilledheart\/chromium,axinging\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,robclark\/chromium,junmin-zhu\/chromium-rivertrail,dednal\/chromium.src,axinging\/chromium-crosswalk,ltilve\/chromium,anirudhSK\/chromium,patrickm\/chromium.src,hujiajie\/pa-chromium,pozdnyakov\/chromium-crosswalk,patrickm\/chromium.src,Fireblend\/chromium-crosswalk,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,ChromiumWebApps\/chromium,mohamed--abdel-maksoud\/chromium.src,chuan9\/chromium-crosswalk,robclark\/chromium,rogerwang\/chromium,junmin-zhu\/chromium-rivertrail,chuan9\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,Chilledheart\/chromium,PeterWangIntel\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,nacl-webkit\/chrome_deps,Jonekee\/chromium.src,mogoweb\/chromium-crosswalk,markYoungH\/chromium.src,axinging\/chromium-crosswalk,hgl888\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,timopulkkinen\/BubbleFish,nacl-webkit\/chrome_deps,crosswalk-project\/chromium-crosswalk-efl,markYoungH\/chromium.src,chuan9\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,hujiajie\/pa-chromium,Just-D\/chromium-1,littlstar\/chromium.src,ltilve\/chromium,ondra-novak\/chromium.src,zcbenz\/cefode-chromium,keishi\/chromium,hgl888\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk-efl,keishi\/chromium,patrickm\/chromium.src,dednal\/chromium.src","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- content\/renderer\/media\/audio_device.h\n+++ content\/renderer\/media\/audio_device.h\n@@ -79,7 +79,7 @@\n public base::DelegateSimpleThread::Delegate,\n public base::RefCountedThreadSafe<AudioDevice> {\n public:\n- class RenderCallback {\n+ class CONTENT_EXPORT RenderCallback {\n public:\n virtual void Render(const std::vector<float*>& audio_data,\n size_t number_of_frames,\n"} {"commit":"cd5bfd18b9e2aa2130d531c56ae0f80ad8f72ded","subject":"propagate the coremode when doing ipc requests only","message":"propagate the coremode when doing ipc requests only\n","repos":"eINIT\/core,eINIT\/core,eINIT\/core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/ipc-9p.c\n+++ src\/modules\/ipc-9p.c\n@@ -675,6 +675,7 @@\n for (; einit_argv[y] && einit_argv[y+1]; y++) {\n if (strmatch (einit_argv[y], \"--ipc-socket\")) {\n address = einit_argv[y+1];\n+ coremode = einit_mode_ipconly;\n }\n }\n \n"} {"commit":"539a4e78d7cb9d6f2076280c06ddfbc90c70ed5f","subject":"fixed swoole_server_port::set crash.","message":"fixed swoole_server_port::set crash.\n","repos":"LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/network\/Server.c\n+++ src\/network\/Server.c\n@@ -1304,8 +1304,8 @@\n ls->ssl_config.session_tickets = 0;\n ls->ssl_config.stapling = 1;\n ls->ssl_config.stapling_verify = 1;\n- ls->ssl_config.ciphers = SW_SSL_CIPHER_LIST;\n- ls->ssl_config.ecdh_curve = SW_SSL_ECDH_CURVE;\n+ ls->ssl_config.ciphers = sw_strdup(SW_SSL_CIPHER_LIST);\n+ ls->ssl_config.ecdh_curve = sw_strdup(SW_SSL_ECDH_CURVE);\n #endif\n }\n }\n"} {"commit":"af4c67065207418e60c21a89a1c7acd48b3f1126","subject":"add comment for Cc3dALBuffer::m_data","message":"add comment for Cc3dALBuffer::m_data\n","repos":"wantnon2\/superSingleCell-c3dEngine,wantnon2\/superSingleCell-c3dEngine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- superSingleCell-c3dEngine\/c3dEngine\/core\/c3dALBuffer.h\n+++ superSingleCell-c3dEngine\/c3dEngine\/core\/c3dALBuffer.h\n@@ -56,7 +56,7 @@\n void initBuffer(const string&fileNameFull,void*&_data,ALuint&_buffer);\n protected:\n ALuint m_buffer;\n- void* m_data;\n+ void* m_data;\/\/this member is copy from MusicCube sample on apple developer web site\n string m_filePath;\n \n };\n"} {"commit":"bb42e1705de3e43e7d8944869c350e34dae90c39","subject":"http: add proxy authentication","message":"http: add proxy authentication\n","repos":"xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/access\/http\/tunnel.c\n+++ modules\/access\/http\/tunnel.c\n@@ -48,7 +48,9 @@\n \n static struct vlc_http_msg *vlc_http_tunnel_open(struct vlc_http_conn *conn,\n const char *hostname,\n- unsigned port)\n+ unsigned port,\n+ const char *username,\n+ const char *password)\n {\n char *authority = vlc_http_authority(hostname, port);\n if (authority == NULL)\n@@ -62,6 +64,9 @@\n \n vlc_http_msg_add_header(req, \"ALPN\", \"h2, http%%2F1.1\");\n vlc_http_msg_add_agent(req, PACKAGE_NAME \"\/\" PACKAGE_VERSION);\n+ if (username != NULL)\n+ vlc_http_msg_add_creds_basic(req, true, username,\n+ (password != NULL) ? password : \"\");\n \n struct vlc_http_stream *stream = vlc_http_stream_open(conn, req);\n \n@@ -151,16 +156,20 @@\n else\n sock = NULL;\n \n- vlc_UrlClean(&url);\n-\n if (sock == NULL)\n- return NULL;\n+ {\n+ vlc_UrlClean(&url);\n+ return NULL;\n+ }\n \n assert(!ptwo); \/* HTTP\/2 proxy not supported yet *\/\n \n struct vlc_tls *psock = malloc(sizeof (*psock));\n if (unlikely(psock == NULL))\n- goto error;\n+ {\n+ vlc_UrlClean(&url);\n+ goto error;\n+ }\n \n psock->obj = VLC_OBJECT(creds);\n psock->sys = sock;\n@@ -176,10 +185,14 @@\n if (unlikely(conn == NULL))\n {\n vlc_tls_Close(psock);\n- goto error;\n- }\n-\n- struct vlc_http_msg *resp = vlc_http_tunnel_open(conn, hostname, port);\n+ vlc_UrlClean(&url);\n+ goto error;\n+ }\n+\n+ struct vlc_http_msg *resp = vlc_http_tunnel_open(conn, hostname, port,\n+ url.psz_username,\n+ url.psz_password);\n+ vlc_UrlClean(&url);\n \n \/* TODO: reuse connection to HTTP\/2 proxy *\/\n vlc_http_conn_release(conn); \/* psock is destroyed there too *\/\n"} {"commit":"48f278f723cc1527b1e785c416192083e67dc292","subject":"Export QQuickDefaultClipNode for modules using quick-private.","message":"Export QQuickDefaultClipNode for modules using quick-private.\n\nChange-Id: Ia79d53dcb5a2ce4e91820c88e2dada666c6d7841\nReviewed-by: Simon Hausmann <a975102812d593b3191088e3d0aeaeb6f11dbcf5@digia.com>\n","repos":"matthewvogt\/qtdeclarative,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative,matthewvogt\/qtdeclarative,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,mgrunditz\/qtdeclarative-2d,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,mgrunditz\/qtdeclarative-2d","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/quick\/items\/qquickclipnode_p.h\n+++ src\/quick\/items\/qquickclipnode_p.h\n@@ -42,9 +42,10 @@\n #ifndef QQUICKCLIPNODE_P_H\n #define QQUICKCLIPNODE_P_H\n \n+#include <private\/qtquickglobal_p.h>\n #include <QtQuick\/qsgnode.h>\n \n-class QQuickDefaultClipNode : public QSGClipNode\n+class Q_QUICK_PRIVATE_EXPORT QQuickDefaultClipNode : public QSGClipNode\n {\n public:\n QQuickDefaultClipNode(const QRectF &);\n"} {"commit":"c7e747d7cd6a5e2952a9930436806bb51999d8a7","subject":"Add problematic example","message":"Add problematic example\n","repos":"goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer,goblint\/analyzer","returncode":1,"stderr":"error: pathspec 'tests\/regression\/46-apron2\/06-pointer-multilevel-two.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- tests\/regression\/46-apron2\/06-pointer-multilevel-two.c\n+++ tests\/regression\/46-apron2\/06-pointer-multilevel-two.c\n@@ -0,0 +1,22 @@\n+\/\/ SKIP PARAM: --set solver td3 --set ana.activated \"['base','threadid','threadflag','mallocWrapper','apron','escape']\" --set ana.base.privatization none --set ana.apron.privatization dummy\n+extern int __VERIFIER_nondet_int();\n+\n+void change(int *p,int i) {\n+ (*p)++;\n+ int* ptr = &p;\n+ assert(*p == 6);\n+}\n+\n+int g;\n+int main() {\n+ int c = __VERIFIER_nondet_int();\n+ g = 3;\n+ assert(g != 3); \/\/ FAIL\n+ assert(g == 3);\n+ int a = 5;\n+ int *p = &a;\n+ change(p, a);\n+ assert(a == 5); \/\/FAIL\n+ assert(a - 6 == 0); \/\/ Apron currently finds \\bot here (!)\n+ return 0;\n+}\n"} {"commit":"7d078cfbfb9282a6405796ebc081a24ad2e9fffd","subject":"Added member access method to base thing instance types","message":"Added member access method to base thing instance types\n","repos":"ytanay\/thinglang,ytanay\/thinglang,ytanay\/thinglang,ytanay\/thinglang","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- thinglang\/runtime\/types\/infrastructure\/ThingInstance.h\n+++ thinglang\/runtime\/types\/infrastructure\/ThingInstance.h\n@@ -14,6 +14,10 @@\n return \"?\";\n }\n \n+ virtual Thing operator[](const Index index) const {\n+ return nullptr;\n+ }\n+\n };\n \n \/**\n@@ -21,6 +25,11 @@\n *\/\n class ThingInstance : public BaseThingInstance {\n Things members;\n+\n+public:\n+ Thing operator[](const Index index) const override {\n+ return members[index];\n+ }\n };\n \n \n"} {"commit":"96ac8dd4f5c67b0e0f72fe2ccdb6160684e29050","subject":"Change MatrixFunction::separation() parameter from 0.01 to 0.1 . The latter is actually the value used in the literature.","message":"Change MatrixFunction::separation() parameter from 0.01 to 0.1 .\nThe latter is actually the value used in the literature.\n","repos":"mjbshaw\/Eigen,rotorliu\/eigen,madlib\/eigen_backup,madlib\/eigen_backup,mjbshaw\/Eigen,rotorliu\/eigen,mjbshaw\/Eigen,rotorliu\/eigen,mjbshaw\/Eigen,madlib\/eigen_backup,rotorliu\/eigen,madlib\/eigen_backup","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- unsupported\/Eigen\/src\/MatrixFunctions\/MatrixFunction.h\n+++ unsupported\/Eigen\/src\/MatrixFunctions\/MatrixFunction.h\n@@ -178,9 +178,9 @@\n *\n * This is morally a \\c static \\c const \\c Scalar, but only\n * integers can be static constant class members in C++. The\n- * separation constant is set to 0.01, a value taken from the\n+ * separation constant is set to 0.1, a value taken from the\n * paper by Davies and Higham. *\/\n- static const RealScalar separation() { return static_cast<RealScalar>(0.01); }\n+ static const RealScalar separation() { return static_cast<RealScalar>(0.1); }\n };\n \n \/** \\brief Constructor. \n"} {"commit":"c2e6a41d541e1834586be228fbd7752ca311a355","subject":"Gauss quadrature made more efficient: nodes and weights now only loaded\/computed once","message":"Gauss quadrature made more efficient: nodes and weights now only loaded\/computed once\n","repos":"Tudat\/tudat,Tudat\/tudat,Tudat\/tudat,Tudat\/tudat","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Tudat\/Mathematics\/NumericalQuadrature\/gaussianQuadrature.h\n+++ Tudat\/Mathematics\/NumericalQuadrature\/gaussianQuadrature.h\n@@ -15,7 +15,8 @@\n #include <map>\n \n #include <boost\/function.hpp>\n-\/\/ #include <boost\/shared_ptr.hpp>\n+#include <boost\/shared_ptr.hpp>\n+#include <boost\/make_shared.hpp>\n \n #include <Eigen\/Core>\n \n@@ -34,25 +35,178 @@\n \n \/\/! Read Gaussian nodes from text file\n template< typename IndependentVariableType >\n-static void readGaussianQuadratureNodes(\n+void readGaussianQuadratureNodes(\n std::map< unsigned int, Eigen::Array< IndependentVariableType, Eigen::Dynamic, 1> >& gaussQuadratureNodes )\n {\n- gaussQuadratureNodes =\n- utilities::convertSTLVectorMapToEigenVectorMap< unsigned int, double >(\n- input_output::readStlVectorMapFromFile< unsigned int, IndependentVariableType >(\n- input_output::getTudatRootPath( ) + \"\/Mathematics\/NumericalQuadrature\/gaussianNodes.txt\" ) );\n+ gaussQuadratureNodes =\n+ utilities::convertSTLVectorMapToEigenVectorMap< unsigned int, IndependentVariableType >(\n+ input_output::readStlVectorMapFromFile< unsigned int, IndependentVariableType >(\n+ input_output::getTudatRootPath( ) + \"\/Mathematics\/NumericalQuadrature\/gaussianNodes.txt\" ) );\n }\n \n \/\/! Read Gaussian weight factors from text file\n template< typename IndependentVariableType >\n-static void readGaussianQuadratureWeights(\n+void readGaussianQuadratureWeights(\n std::map< unsigned int, Eigen::Array< IndependentVariableType, Eigen::Dynamic, 1> >& gaussQuadratureWeights )\n {\n- gaussQuadratureWeights = utilities::convertSTLVectorMapToEigenVectorMap< unsigned int, double >(\n+ gaussQuadratureWeights = utilities::convertSTLVectorMapToEigenVectorMap< unsigned int, IndependentVariableType >(\n input_output::readStlVectorMapFromFile< unsigned int, IndependentVariableType >(\n- input_output::getTudatRootPath( ) + \"\/Mathematics\/NumericalQuadrature\/gaussianWeights.txt\" ) );\n-}\n-\n+ input_output::getTudatRootPath( ) + \"\/Mathematics\/NumericalQuadrature\/gaussianWeights.txt\" ) );\n+}\n+\n+template< typename IndependentVariableType >\n+struct GaussQuadratureNodesAndWeights\n+{\n+\n+ typedef Eigen::Array< IndependentVariableType, Eigen::Dynamic, 1 > IndependentVariableArray;\n+\n+ GaussQuadratureNodesAndWeights( )\n+ {\n+ readGaussianQuadratureNodes( uniqueNodes_ );\n+ readGaussianQuadratureWeights( uniqueWeights_ );\n+ }\n+\n+ \/\/! Get the unique nodes for a specified order `n`.\n+ \/*!\n+ * \\param n The number of nodes or weight factors.\n+ * \\return `uniqueNodes_[n]`, after reading the text file with the tabulated nodes if necessary.\n+ *\/\n+ IndependentVariableArray getUniqueNodes( const unsigned int n )\n+ {\n+ if ( uniqueNodes_.count( n ) == 0 )\n+ {\n+ std::string errorMessage = \"Error in Gaussian quadrature, nodes not available for n=\" +\n+ boost::lexical_cast< std::string >( n );\n+ throw std::runtime_error( errorMessage );\n+ }\n+ return uniqueNodes_.at( n );\n+ }\n+\n+ \/\/! Get the unique weight factors for a specified order `n`.\n+ \/*!\n+ * \\param n The number of nodes or weight factors.\n+ * \\return `uniqueWeights_[n]`, after reading the text file with the tabulated nodes if necessary.\n+ *\/\n+ IndependentVariableArray getUniqueWeights( const unsigned int n )\n+ {\n+ if ( uniqueWeights_.count( n ) == 0 )\n+ {\n+ std::string errorMessage = \"Error in Gaussian quadrature, weights not available for n=\" +\n+ boost::lexical_cast< std::string >( n );\n+ throw std::runtime_error( errorMessage );\n+ }\n+ return uniqueWeights_.at( n );\n+ }\n+\n+ \/\/! Get all the nodes (i.e. n nodes for nth order) from uniqueNodes_\n+ IndependentVariableArray getNodes( const unsigned int n )\n+ {\n+ if ( nodes_.count( n ) == 0 )\n+ {\n+ IndependentVariableArray newNodes( n );\n+\n+ \/\/ Include node 0.0 if n is odd\n+ unsigned int i = 0;\n+ if ( n % 2 == 1 )\n+ {\n+ newNodes.row( i++ ) = 0.0;\n+ }\n+\n+ \/\/ Include \u00b1 nodes\n+ IndependentVariableArray uniqueNodes_ = getUniqueNodes( n );\n+ for ( unsigned int j = 0; j < uniqueNodes_.size(); j++ )\n+ {\n+ newNodes.row( i++ ) = -uniqueNodes_[ j ];\n+ newNodes.row( i++ ) = uniqueNodes_[ j ];\n+ }\n+\n+ nodes_[ n ] = newNodes;\n+ }\n+\n+ return nodes_.at( n );\n+ }\n+\n+ \/\/! Get all the weight factors (i.e. n weight factors for nth order) from uniqueWeights_\n+ IndependentVariableArray getWeights( const unsigned int n )\n+ {\n+ if ( weights_.count( n ) == 0 )\n+ {\n+ IndependentVariableArray newWeights( n );\n+\n+ IndependentVariableArray orderNWeights = getUniqueWeights( n );\n+ \/\/ Include non-repeated weight factor if n is odd\n+ unsigned int i = 0;\n+ unsigned int j = 0;\n+ if ( n % 2 == 1 )\n+ {\n+ newWeights.row( i++ ) = orderNWeights[ j++ ];\n+ }\n+\n+ \/\/ Include repeated weight factors\n+ for ( ; j < orderNWeights.size( ); j++ )\n+ {\n+ newWeights.row( i++ ) = orderNWeights[ j ];\n+ newWeights.row( i++ ) = orderNWeights[ j ];\n+ }\n+\n+ weights_[ n ] = newWeights;\n+ }\n+\n+ return weights_.at( n );\n+ }\n+\n+ \/\/! Map containing the nodes read from the text file (currently up to `n = 64`).\n+ \/\/! The following relation holds: `size( uniqueNodes_[n] ) = floor( n \/ 2 )`\n+ \/\/! For the actual nodes, the following must hold: `size( nodes[n] ) = n`\n+ \/\/! The actual nodes are generated from `uniqueNodes_` by `getNodes()`\n+ std::map< unsigned int, IndependentVariableArray > uniqueNodes_;\n+ std::map< unsigned int, IndependentVariableArray > nodes_;\n+\n+ \/\/! Map containing the weight factors read from the text file (currently up to `n = 64`).\n+ \/\/! The following relation holds: `size( uniqueWeights_[n] ) = ceil( n \/ 2 )`\n+ \/\/! For the actual weight factors, the following must hold: `size( uniqueWeights_[n] ) = n`\n+ \/\/! The actual weight factors are generated from `uniqueWeights_` by `getWeights()`\n+ std::map< unsigned int, IndependentVariableArray > uniqueWeights_;\n+ std::map< unsigned int, IndependentVariableArray > weights_;\n+\n+};\n+\n+static const boost::shared_ptr< GaussQuadratureNodesAndWeights< long double > > longDoubleGaussQuadratureNodesAndWeights =\n+ boost::make_shared< GaussQuadratureNodesAndWeights< long double > >( );\n+\n+static const boost::shared_ptr< GaussQuadratureNodesAndWeights< double > > doubleGaussQuadratureNodesAndWeights =\n+ boost::make_shared< GaussQuadratureNodesAndWeights< double > >( );\n+\n+static const boost::shared_ptr< GaussQuadratureNodesAndWeights< float > > floatGaussQuadratureNodesAndWeights =\n+ boost::make_shared< GaussQuadratureNodesAndWeights< float > >( );\n+\n+template< typename IndependentVariableType >\n+boost::shared_ptr< GaussQuadratureNodesAndWeights< IndependentVariableType > >\n+getGaussQuadratureNodesAndWeights( )\n+{\n+ return boost::make_shared< GaussQuadratureNodesAndWeights< IndependentVariableType > >( );\n+}\n+\n+template< >\n+boost::shared_ptr< GaussQuadratureNodesAndWeights< long double > >\n+getGaussQuadratureNodesAndWeights( )\n+{\n+ return longDoubleGaussQuadratureNodesAndWeights;\n+}\n+\n+template< >\n+boost::shared_ptr< GaussQuadratureNodesAndWeights< double > >\n+getGaussQuadratureNodesAndWeights( )\n+{\n+ return doubleGaussQuadratureNodesAndWeights;\n+}\n+\n+template< >\n+boost::shared_ptr< GaussQuadratureNodesAndWeights< float > >\n+getGaussQuadratureNodesAndWeights( )\n+{\n+ return floatGaussQuadratureNodesAndWeights;\n+}\n \n \/\/! Gaussian numerical quadrature wrapper class.\n \/*!\n@@ -65,9 +219,9 @@\n {\n public:\n \n- \/\/! Empty constructor.\n- GaussianQuadrature( ) { }\n-\n+\n+ typedef Eigen::Array< DependentVariableType, Eigen::Dynamic, 1 > DependentVariableArray;\n+ typedef Eigen::Array< IndependentVariableType, Eigen::Dynamic, 1 > IndependentVariableArray;\n \n \/\/! Constructor.\n \/*!\n@@ -84,8 +238,7 @@\n integrand_ ( integrand ), lowerLimit_( lowerLimit ), upperLimit_ ( upperLimit ),\n numberOfNodes_( numberOfNodes ), quadratureHasBeenPerformed_( false )\n {\n- readGaussianQuadratureNodes( uniqueNodes_ );\n- readGaussianQuadratureWeights( uniqueWeights_ );\n+ gaussQuadratureNodesAndWeights_ = getGaussQuadratureNodesAndWeights< IndependentVariableType >( );\n }\n \n \n@@ -145,67 +298,6 @@\n }\n \n \n- typedef Eigen::Array< DependentVariableType, Eigen::Dynamic, 1 > DependentVariableArray;\n- typedef Eigen::Array< IndependentVariableType, Eigen::Dynamic, 1 > IndependentVariableArray;\n-\n- \/\/! Get all the nodes (i.e. n nodes for nth order) from uniqueNodes_\n- IndependentVariableArray getNodes( const unsigned int n )\n- {\n- if ( nodes_.count( n ) == 0 )\n- {\n- IndependentVariableArray newNodes( n );\n-\n- \/\/ Include node 0.0 if n is odd\n- unsigned int i = 0;\n- if ( n % 2 == 1 )\n- {\n- newNodes.row( i++ ) = 0.0;\n- }\n-\n- \/\/ Include \u00b1 nodes\n- IndependentVariableArray uniqueNodes_ = getUniqueNodes( n );\n- for ( unsigned int j = 0; j < uniqueNodes_.size(); j++ )\n- {\n- newNodes.row( i++ ) = -uniqueNodes_[ j ];\n- newNodes.row( i++ ) = uniqueNodes_[ j ];\n- }\n-\n- nodes_[ n ] = newNodes;\n- }\n-\n- return nodes_.at( n );\n- }\n-\n- \/\/! Get all the weight factors (i.e. n weight factors for nth order) from uniqueWeights_\n- IndependentVariableArray getWeights( const unsigned int n )\n- {\n- if ( weights_.count( n ) == 0 )\n- {\n- IndependentVariableArray newWeights( n );\n-\n- IndependentVariableArray orderNWeights = getUniqueWeights( n );\n- \/\/ Include non-repeated weight factor if n is odd\n- unsigned int i = 0;\n- unsigned int j = 0;\n- if ( n % 2 == 1 )\n- {\n- newWeights.row( i++ ) = orderNWeights[ j++ ];\n- }\n-\n- \/\/ Include repeated weight factors\n- for ( ; j < orderNWeights.size( ); j++ )\n- {\n- newWeights.row( i++ ) = orderNWeights[ j ];\n- newWeights.row( i++ ) = orderNWeights[ j ];\n- }\n-\n- weights_[ n ] = newWeights;\n- }\n-\n- return weights_.at( n );\n- }\n-\n-\n protected:\n \n \/\/! Function that is called to perform the numerical quadrature\n@@ -216,10 +308,10 @@\n void performQuadrature( )\n {\n \/\/ Determine the values of the auxiliary independent variable (nodes)\n- const IndependentVariableArray nodes = getNodes( numberOfNodes_ );\n+ const IndependentVariableArray nodes = gaussQuadratureNodesAndWeights_->getNodes( numberOfNodes_ );\n \n \/\/ Determine the values of the weight factors\n- const IndependentVariableArray weights = getWeights( numberOfNodes_ );\n+ const IndependentVariableArray weights = gaussQuadratureNodesAndWeights_->getWeights( numberOfNodes_ );\n \n \/\/ Change of variable -> from range [-1, 1] to range [lowerLimit, upperLimit]\n const IndependentVariableArray independentVariables =\n@@ -238,20 +330,6 @@\n \n private:\n \n- \/\/! Map containing the nodes read from the text file (currently up to `n = 64`).\n- \/\/! The following relation holds: `size( uniqueNodes_[n] ) = floor( n \/ 2 )`\n- \/\/! For the actual nodes, the following must hold: `size( nodes[n] ) = n`\n- \/\/! The actual nodes are generated from `uniqueNodes_` by `getNodes()`\n- std::map< unsigned int, IndependentVariableArray > uniqueNodes_;\n- std::map< unsigned int, IndependentVariableArray > nodes_;\n-\n- \/\/! Map containing the weight factors read from the text file (currently up to `n = 64`).\n- \/\/! The following relation holds: `size( uniqueWeights_[n] ) = ceil( n \/ 2 )`\n- \/\/! For the actual weight factors, the following must hold: `size( uniqueWeights_[n] ) = n`\n- \/\/! The actual weight factors are generated from `uniqueWeights_` by `getWeights()`\n- std::map< unsigned int, IndependentVariableArray > uniqueWeights_;\n- std::map< unsigned int, IndependentVariableArray > weights_;\n-\n \/\/! Function returning the integrand.\n boost::function< DependentVariableType( IndependentVariableType ) > integrand_;\n \n@@ -270,37 +348,7 @@\n \/\/! Computed value of the quadrature, as computed by last call to performQuadrature.\n DependentVariableType quadratureResult_;\n \n- \/\/! Get the unique nodes for a specified order `n`.\n- \/*!\n- * \\param n The number of nodes or weight factors.\n- * \\return `uniqueNodes_[n]`, after reading the text file with the tabulated nodes if necessary.\n- *\/\n- IndependentVariableArray getUniqueNodes( const unsigned int n )\n- {\n- if ( uniqueNodes_.count( n ) == 0 )\n- {\n- std::string errorMessage = \"Error in Gaussian quadrature, nodes not available for n=\" +\n- boost::lexical_cast< std::string >( n );\n- throw std::runtime_error( errorMessage );\n- }\n- return uniqueNodes_.at( n );\n- }\n-\n- \/\/! Get the unique weight factors for a specified order `n`.\n- \/*!\n- * \\param n The number of nodes or weight factors.\n- * \\return `uniqueWeights_[n]`, after reading the text file with the tabulated nodes if necessary.\n- *\/\n- IndependentVariableArray getUniqueWeights( const unsigned int n )\n- {\n- if ( uniqueWeights_.count( n ) == 0 )\n- {\n- std::string errorMessage = \"Error in Gaussian quadrature, weights not available for n=\" +\n- boost::lexical_cast< std::string >( n );\n- throw std::runtime_error( errorMessage );\n- }\n- return uniqueWeights_.at( n );\n- }\n+ boost::shared_ptr< GaussQuadratureNodesAndWeights< IndependentVariableType > > gaussQuadratureNodesAndWeights_;\n };\n \n } \/\/ namespace numerical_quadrature\n"} {"commit":"6dbb1acb9709883dde12dcd14f7bcccc111c66a0","subject":"FIX warnings for .Net","message":"FIX warnings for .Net\n","repos":"daviddoria\/PointGraphsPhase1,aashish24\/VTK-old,cjh1\/VTK,johnkit\/vtk-dev,arnaudgelas\/VTK,SimVascular\/VTK,mspark93\/VTK,collects\/VTK,demarle\/VTK,Wuteyan\/VTK,cjh1\/VTK,candy7393\/VTK,mspark93\/VTK,SimVascular\/VTK,keithroe\/vtkoptix,SimVascular\/VTK,jmerkow\/VTK,sankhesh\/VTK,hendradarwin\/VTK,sumedhasingla\/VTK,biddisco\/VTK,hendradarwin\/VTK,johnkit\/vtk-dev,cjh1\/VTK,naucoin\/VTKSlicerWidgets,keithroe\/vtkoptix,daviddoria\/PointGraphsPhase1,ashray\/VTK-EVM,mspark93\/VTK,sumedhasingla\/VTK,daviddoria\/PointGraphsPhase1,sumedhasingla\/VTK,cjh1\/VTK,msmolens\/VTK,keithroe\/vtkoptix,Wuteyan\/VTK,naucoin\/VTKSlicerWidgets,aashish24\/VTK-old,jmerkow\/VTK,jmerkow\/VTK,sankhesh\/VTK,sumedhasingla\/VTK,candy7393\/VTK,demarle\/VTK,demarle\/VTK,naucoin\/VTKSlicerWidgets,gram526\/VTK,candy7393\/VTK,SimVascular\/VTK,demarle\/VTK,hendradarwin\/VTK,sgh\/vtk,hendradarwin\/VTK,gram526\/VTK,gram526\/VTK,johnkit\/vtk-dev,arnaudgelas\/VTK,berendkleinhaneveld\/VTK,candy7393\/VTK,mspark93\/VTK,jeffbaumes\/jeffbaumes-vtk,aashish24\/VTK-old,spthaolt\/VTK,daviddoria\/PointGraphsPhase1,cjh1\/VTK,spthaolt\/VTK,mspark93\/VTK,SimVascular\/VTK,spthaolt\/VTK,jmerkow\/VTK,naucoin\/VTKSlicerWidgets,biddisco\/VTK,demarle\/VTK,Wuteyan\/VTK,candy7393\/VTK,jmerkow\/VTK,sankhesh\/VTK,gram526\/VTK,johnkit\/vtk-dev,Wuteyan\/VTK,msmolens\/VTK,jmerkow\/VTK,aashish24\/VTK-old,demarle\/VTK,jeffbaumes\/jeffbaumes-vtk,biddisco\/VTK,johnkit\/vtk-dev,spthaolt\/VTK,biddisco\/VTK,hendradarwin\/VTK,sgh\/vtk,mspark93\/VTK,sankhesh\/VTK,sgh\/vtk,collects\/VTK,jeffbaumes\/jeffbaumes-vtk,hendradarwin\/VTK,SimVascular\/VTK,msmolens\/VTK,sankhesh\/VTK,ashray\/VTK-EVM,biddisco\/VTK,aashish24\/VTK-old,candy7393\/VTK,msmolens\/VTK,daviddoria\/PointGraphsPhase1,naucoin\/VTKSlicerWidgets,Wuteyan\/VTK,jeffbaumes\/jeffbaumes-vtk,gram526\/VTK,keithroe\/vtkoptix,sankhesh\/VTK,biddisco\/VTK,ashray\/VTK-EVM,arnaudgelas\/VTK,sumedhasingla\/VTK,biddisco\/VTK,sumedhasingla\/VTK,sankhesh\/VTK,cjh1\/VTK,sgh\/vtk,jeffbaumes\/jeffbaumes-vtk,mspark93\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,candy7393\/VTK,mspark93\/VTK,aashish24\/VTK-old,sumedhasingla\/VTK,gram526\/VTK,hendradarwin\/VTK,sankhesh\/VTK,sgh\/vtk,demarle\/VTK,collects\/VTK,spthaolt\/VTK,Wuteyan\/VTK,berendkleinhaneveld\/VTK,naucoin\/VTKSlicerWidgets,keithroe\/vtkoptix,spthaolt\/VTK,ashray\/VTK-EVM,berendkleinhaneveld\/VTK,SimVascular\/VTK,berendkleinhaneveld\/VTK,Wuteyan\/VTK,arnaudgelas\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,sumedhasingla\/VTK,keithroe\/vtkoptix,ashray\/VTK-EVM,demarle\/VTK,collects\/VTK,berendkleinhaneveld\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,jeffbaumes\/jeffbaumes-vtk,gram526\/VTK,arnaudgelas\/VTK,candy7393\/VTK,ashray\/VTK-EVM,keithroe\/vtkoptix,berendkleinhaneveld\/VTK,msmolens\/VTK,collects\/VTK,SimVascular\/VTK,msmolens\/VTK,collects\/VTK,gram526\/VTK,jmerkow\/VTK,msmolens\/VTK,msmolens\/VTK,arnaudgelas\/VTK,sgh\/vtk,berendkleinhaneveld\/VTK,jmerkow\/VTK,ashray\/VTK-EVM","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Utilities\/freetype\/builds\/win32\/freetype\/config\/ftoption.h\n+++ Utilities\/freetype\/builds\/win32\/freetype\/config\/ftoption.h\n@@ -19,6 +19,15 @@\n #ifndef __FTOPTION_H__\n #define __FTOPTION_H__\n \n+#if defined( _MSC_VER ) \/* Visual C++ (and Intel C++) *\/\n+\n+#pragma warning( disable : 4244 ) \/\/ conversion [...] possible loss of data\n+#pragma warning( disable : 4267 ) \/\/ same\n+#pragma warning( disable : 4311 ) \/\/ same for pointer\n+#pragma warning( disable : 4312 ) \/\/ same for pointer\n+\n+#endif \/* _MSC_VER *\/ \n+\n #include <ft2build.h>\n \n FT_BEGIN_HEADER\n"} {"commit":"3c305342732b9b099af89d03454e43e0428a3ef4","subject":"Add matrixR() to get the triangular factor from the Householder QR","message":"Add matrixR() to get the triangular factor from the Householder QR\n","repos":"rotorliu\/eigen,madlib\/eigen_backup,madlib\/eigen_backup,mjbshaw\/Eigen,mjbshaw\/Eigen,madlib\/eigen_backup,mjbshaw\/Eigen,madlib\/eigen_backup,rotorliu\/eigen,rotorliu\/eigen,rotorliu\/eigen,mjbshaw\/Eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/QR\/ColPivHouseholderQR.h\n+++ Eigen\/src\/QR\/ColPivHouseholderQR.h\n@@ -145,7 +145,21 @@\n eigen_assert(m_isInitialized && \"ColPivHouseholderQR is not initialized.\");\n return m_qr;\n }\n-\n+ \n+ \/** \\returns a reference to the matrix where the Householder QR is stored \n+ * To get the triangular factor R, use \n+ * \\code matrixR().template triangularView<Upper>() \\endcode\n+ * For rank-deficient matrices, use \n+ * \\code \n+ * matrixR().topLeftCorner(rank(), rank()).template triangularView<Upper>() \n+ * \\endcode\n+ *\/\n+ const MatrixType& matrixR() const\n+ {\n+ eigen_assert(m_isInitialized && \"ColPivHouseholderQR is not initialized.\");\n+ return m_qr;\n+ }\n+ \n ColPivHouseholderQR& compute(const MatrixType& matrix);\n \n const PermutationType& colsPermutation() const\n@@ -336,6 +350,18 @@\n * diagonal coefficient of R.\n *\/\n RealScalar maxPivot() const { return m_maxpivot; }\n+ \n+ \/** \\brief Reports whether the QR factorization was succesful.\n+ *\n+ * \\note This routine is provided for uniformity with other factorization modules\n+ * \\returns \\c Success if computation was succesful,\n+ * \\c NumericalIssue if the QR can not be computed\n+ *\/\n+ ComputationInfo info() const\n+ {\n+ eigen_assert(m_isInitialized && \"Decomposition is not initialized.\");\n+ return Success;\n+ }\n \n protected:\n MatrixType m_qr;\n@@ -345,6 +371,7 @@\n RowVectorType m_temp;\n RealRowVectorType m_colSqNorms;\n bool m_isInitialized, m_usePrescribedThreshold;\n+ mutable ComputationInfo m_info;\n RealScalar m_prescribedThreshold, m_maxpivot;\n Index m_nonzero_pivots;\n Index m_det_pq;\n@@ -488,7 +515,7 @@\n \t\t .transpose()\n );\n \n- dec().matrixQR()\n+ dec().matrixR()\n .topLeftCorner(nonzero_pivots, nonzero_pivots)\n .template triangularView<Upper>()\n .solveInPlace(c.topRows(nonzero_pivots));\n"} {"commit":"9788f93f651ac027043dbfea1712ba425fc9f3a1","subject":"Silence stupid parenthesis warnings for old GCC versions (<= 4.6.x)","message":"Silence stupid parenthesis warnings for old GCC versions (<= 4.6.x)\n","repos":"robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/SparseCore\/SparseBlock.h\n+++ Eigen\/src\/SparseCore\/SparseBlock.h\n@@ -338,7 +338,10 @@\n namespace internal {\r\n \r\n template< typename XprType, int BlockRows, int BlockCols, bool InnerPanel,\r\n- bool OuterVector = (BlockCols==1 && XprType::IsRowMajor) || (BlockRows==1 && !XprType::IsRowMajor)>\r\n+ bool OuterVector = (BlockCols==1 && XprType::IsRowMajor)\r\n+ | \/\/ FIXME | instead of || to please GCC 4.4.0 stupid warning \"suggest parentheses around &&\".\r\n+ \/\/ revert to || as soon as not needed anymore. \r\n+ (BlockRows==1 && !XprType::IsRowMajor)>\r\n class GenericSparseBlockInnerIteratorImpl;\r\n \r\n }\r\n"} {"commit":"dccabbdc11872b371c05efb4723063bbf785c943","subject":"Fix inner iterator on an outer-vector","message":"Fix inner iterator on an outer-vector\n","repos":"mjbshaw\/Eigen,madlib\/eigen_backup,rotorliu\/eigen,rotorliu\/eigen,mjbshaw\/Eigen,mjbshaw\/Eigen,madlib\/eigen_backup,madlib\/eigen_backup,rotorliu\/eigen,rotorliu\/eigen,madlib\/eigen_backup,mjbshaw\/Eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/SparseCore\/SparseBlock.h\n+++ Eigen\/src\/SparseCore\/SparseBlock.h\n@@ -523,6 +523,7 @@\n while(m_outerPos<m_end)\r\n {\r\n m_outerPos++;\r\n+ if(m_outerPos==m_end) break;\r\n typename XprType::InnerIterator it(m_block.m_matrix, m_outerPos);\r\n \/\/ search for the key m_innerIndex in the current outer-vector\r\n while(it && it.index() < m_innerIndex) ++it;\r\n"} {"commit":"a6e98f85e8b21e8ed0d0a2d756aeb03b615b590c","subject":"Added numerical Laplace implementation.","message":"Added numerical Laplace implementation.\n","repos":"dbindel\/lecture,dbindel\/lecture,dbindel\/lecture","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 2015-09-17\/laplace2d.c\n+++ 2015-09-17\/laplace2d.c\n@@ -12,6 +12,12 @@\n double h, double x, double y)\n {\n \/* Fill in the solution here *\/\n+ double upx = u(x+h,y);\n+ double umx = u(x-h,y);\n+ double upy = u(x,y+h);\n+ double umy = u(x,y-h);\n+ double u0 = u(x,y);\n+ return (4*u0-upx-upy-umx-umy)\/(h*h);\n }\n \n \n"} {"commit":"0258f19da8a21462d95abad68041056e6951c508","subject":"BUG: Fix build error in third-party plugins","message":"BUG: Fix build error in third-party plugins\n","repos":"jonathanunderwood\/numpy,maniteja123\/numpy,ViralLeadership\/numpy,skymanaditya1\/numpy,seberg\/numpy,yiakwy\/numpy,skymanaditya1\/numpy,andsor\/numpy,simongibbons\/numpy,mingwpy\/numpy,shoyer\/numpy,mingwpy\/numpy,Srisai85\/numpy,ChanderG\/numpy,anntzer\/numpy,dwillmer\/numpy,bmorris3\/numpy,jakirkham\/numpy,immerrr\/numpy,tynn\/numpy,mattip\/numpy,Linkid\/numpy,ogrisel\/numpy,dwf\/numpy,mattip\/numpy,numpy\/numpy,brandon-rhodes\/numpy,ddasilva\/numpy,naritta\/numpy,njase\/numpy,stuarteberg\/numpy,ajdawson\/numpy,felipebetancur\/numpy,astrofrog\/numpy,bringingheavendown\/numpy,jakirkham\/numpy,larsmans\/numpy,kirillzhuravlev\/numpy,SunghanKim\/numpy,mingwpy\/numpy,yiakwy\/numpy,mhvk\/numpy,ViralLeadership\/numpy,sigma-random\/numpy,MaPePeR\/numpy,mwiebe\/numpy,rgommers\/numpy,pbrod\/numpy,rajathkumarmp\/numpy,WillieMaddox\/numpy,WarrenWeckesser\/numpy,nguyentu1602\/numpy,dimasad\/numpy,jschueller\/numpy,Dapid\/numpy,felipebetancur\/numpy,jakirkham\/numpy,ewmoore\/numpy,charris\/numpy,dimasad\/numpy,Eric89GXL\/numpy,MaPePeR\/numpy,NextThought\/pypy-numpy,drasmuss\/numpy,Dapid\/numpy,embray\/numpy,jankoslavic\/numpy,tynn\/numpy,empeeu\/numpy,pizzathief\/numpy,endolith\/numpy,ssanderson\/numpy,seberg\/numpy,numpy\/numpy,sigma-random\/numpy,rudimeier\/numpy,pyparallel\/numpy,jschueller\/numpy,ahaldane\/numpy,musically-ut\/numpy,naritta\/numpy,tdsmith\/numpy,dch312\/numpy,sonnyhu\/numpy,bmorris3\/numpy,kiwifb\/numpy,grlee77\/numpy,mindw\/numpy,pizzathief\/numpy,madphysicist\/numpy,njase\/numpy,kiwifb\/numpy,abalkin\/numpy,grlee77\/numpy,musically-ut\/numpy,dwf\/numpy,rgommers\/numpy,ddasilva\/numpy,pizzathief\/numpy,tacaswell\/numpy,dwf\/numpy,seberg\/numpy,chatcannon\/numpy,shoyer\/numpy,dwillmer\/numpy,chatcannon\/numpy,githubmlai\/numpy,ESSS\/numpy,rherault-insa\/numpy,Srisai85\/numpy,chiffa\/numpy,astrofrog\/numpy,grlee77\/numpy,larsmans\/numpy,pdebuyl\/numpy,WarrenWeckesser\/numpy,ahaldane\/numpy,seberg\/numpy,ContinuumIO\/numpy,mhvk\/numpy,NextThought\/pypy-numpy,chatcannon\/numpy,ESSS\/numpy,sinhrks\/numpy,ekalosak\/numpy,MSeifert04\/numpy,mattip\/numpy,pbrod\/numpy,embray\/numpy,argriffing\/numpy,KaelChen\/numpy,dwillmer\/numpy,ContinuumIO\/numpy,shoyer\/numpy,drasmuss\/numpy,Yusa95\/numpy,mindw\/numpy,astrofrog\/numpy,charris\/numpy,SunghanKim\/numpy,jonathanunderwood\/numpy,joferkington\/numpy,skwbc\/numpy,felipebetancur\/numpy,numpy\/numpy,Anwesh43\/numpy,larsmans\/numpy,nguyentu1602\/numpy,simongibbons\/numpy,maniteja123\/numpy,larsmans\/numpy,solarjoe\/numpy,stuarteberg\/numpy,felipebetancur\/numpy,AustereCuriosity\/numpy,pbrod\/numpy,CMartelLML\/numpy,mortada\/numpy,utke1\/numpy,drasmuss\/numpy,pelson\/numpy,GrimDerp\/numpy,cjermain\/numpy,dimasad\/numpy,trankmichael\/numpy,chiffa\/numpy,Anwesh43\/numpy,kirillzhuravlev\/numpy,groutr\/numpy,gfyoung\/numpy,dch312\/numpy,simongibbons\/numpy,bringingheavendown\/numpy,embray\/numpy,cowlicks\/numpy,SiccarPoint\/numpy,KaelChen\/numpy,madphysicist\/numpy,mathdd\/numpy,joferkington\/numpy,BabeNovelty\/numpy,ChanderG\/numpy,sonnyhu\/numpy,nguyentu1602\/numpy,has2k1\/numpy,bringingheavendown\/numpy,has2k1\/numpy,Dapid\/numpy,dch312\/numpy,gfyoung\/numpy,mathdd\/numpy,jankoslavic\/numpy,WillieMaddox\/numpy,rajathkumarmp\/numpy,tynn\/numpy,mattip\/numpy,groutr\/numpy,Yusa95\/numpy,githubmlai\/numpy,MaPePeR\/numpy,maniteja123\/numpy,rherault-insa\/numpy,tacaswell\/numpy,rhythmsosad\/numpy,shoyer\/numpy,cowlicks\/numpy,stuarteberg\/numpy,shoyer\/numpy,mortada\/numpy,tacaswell\/numpy,yiakwy\/numpy,Eric89GXL\/numpy,MaPePeR\/numpy,leifdenby\/numpy,jankoslavic\/numpy,argriffing\/numpy,endolith\/numpy,SiccarPoint\/numpy,sigma-random\/numpy,leifdenby\/numpy,cjermain\/numpy,dwf\/numpy,nbeaver\/numpy,sinhrks\/numpy,cjermain\/numpy,ChanderG\/numpy,sonnyhu\/numpy,skymanaditya1\/numpy,AustereCuriosity\/numpy,CMartelLML\/numpy,hainm\/numpy,cjermain\/numpy,Anwesh43\/numpy,hainm\/numpy,charris\/numpy,ewmoore\/numpy,jorisvandenbossche\/numpy,AustereCuriosity\/numpy,Srisai85\/numpy,simongibbons\/numpy,ewmoore\/numpy,ekalosak\/numpy,MSeifert04\/numpy,BabeNovelty\/numpy,immerrr\/numpy,bertrand-l\/numpy,numpy\/numpy,MichaelAquilina\/numpy,ahaldane\/numpy,tdsmith\/numpy,yiakwy\/numpy,hainm\/numpy,brandon-rhodes\/numpy,pbrod\/numpy,ahaldane\/numpy,ogrisel\/numpy,kiwifb\/numpy,rhythmsosad\/numpy,rherault-insa\/numpy,mhvk\/numpy,madphysicist\/numpy,ogrisel\/numpy,trankmichael\/numpy,Linkid\/numpy,dato-code\/numpy,immerrr\/numpy,Linkid\/numpy,argriffing\/numpy,rudimeier\/numpy,ChristopherHogan\/numpy,abalkin\/numpy,jschueller\/numpy,b-carter\/numpy,Anwesh43\/numpy,BabeNovelty\/numpy,BMJHayward\/numpy,dch312\/numpy,mhvk\/numpy,pyparallel\/numpy,joferkington\/numpy,skwbc\/numpy,ajdawson\/numpy,BabeNovelty\/numpy,anntzer\/numpy,has2k1\/numpy,ChristopherHogan\/numpy,ViralLeadership\/numpy,ChanderG\/numpy,ahaldane\/numpy,endolith\/numpy,pyparallel\/numpy,BMJHayward\/numpy,ogrisel\/numpy,skymanaditya1\/numpy,pdebuyl\/numpy,abalkin\/numpy,andsor\/numpy,SunghanKim\/numpy,pizzathief\/numpy,groutr\/numpy,andsor\/numpy,CMartelLML\/numpy,MSeifert04\/numpy,rmcgibbo\/numpy,pdebuyl\/numpy,ekalosak\/numpy,KaelChen\/numpy,mwiebe\/numpy,mindw\/numpy,rgommers\/numpy,bertrand-l\/numpy,MSeifert04\/numpy,madphysicist\/numpy,hainm\/numpy,ESSS\/numpy,simongibbons\/numpy,MichaelAquilina\/numpy,MSeifert04\/numpy,sigma-random\/numpy,MichaelAquilina\/numpy,mathdd\/numpy,GrimDerp\/numpy,dato-code\/numpy,ChristopherHogan\/numpy,b-carter\/numpy,grlee77\/numpy,Srisai85\/numpy,Yusa95\/numpy,pdebuyl\/numpy,ssanderson\/numpy,astrofrog\/numpy,bmorris3\/numpy,WarrenWeckesser\/numpy,ChristopherHogan\/numpy,WarrenWeckesser\/numpy,joferkington\/numpy,jorisvandenbossche\/numpy,ajdawson\/numpy,dwf\/numpy,naritta\/numpy,GaZ3ll3\/numpy,skwbc\/numpy,ewmoore\/numpy,sinhrks\/numpy,dwillmer\/numpy,githubmlai\/numpy,pelson\/numpy,ekalosak\/numpy,moreati\/numpy,anntzer\/numpy,Linkid\/numpy,rmcgibbo\/numpy,moreati\/numpy,brandon-rhodes\/numpy,BMJHayward\/numpy,CMartelLML\/numpy,solarjoe\/numpy,kirillzhuravlev\/numpy,KaelChen\/numpy,pizzathief\/numpy,rajathkumarmp\/numpy,GaZ3ll3\/numpy,jschueller\/numpy,GaZ3ll3\/numpy,behzadnouri\/numpy,ssanderson\/numpy,rhythmsosad\/numpy,empeeu\/numpy,cowlicks\/numpy,ajdawson\/numpy,brandon-rhodes\/numpy,behzadnouri\/numpy,ContinuumIO\/numpy,anntzer\/numpy,has2k1\/numpy,b-carter\/numpy,jorisvandenbossche\/numpy,chiffa\/numpy,grlee77\/numpy,rmcgibbo\/numpy,rgommers\/numpy,mathdd\/numpy,jonathanunderwood\/numpy,SiccarPoint\/numpy,bertrand-l\/numpy,NextThought\/pypy-numpy,trankmichael\/numpy,sinhrks\/numpy,naritta\/numpy,MichaelAquilina\/numpy,mwiebe\/numpy,WarrenWeckesser\/numpy,mindw\/numpy,gmcastil\/numpy,githubmlai\/numpy,tdsmith\/numpy,dato-code\/numpy,rhythmsosad\/numpy,pelson\/numpy,jakirkham\/numpy,madphysicist\/numpy,pelson\/numpy,embray\/numpy,andsor\/numpy,behzadnouri\/numpy,immerrr\/numpy,gmcastil\/numpy,rudimeier\/numpy,sonnyhu\/numpy,musically-ut\/numpy,rajathkumarmp\/numpy,musically-ut\/numpy,embray\/numpy,tdsmith\/numpy,charris\/numpy,pelson\/numpy,empeeu\/numpy,solarjoe\/numpy,mingwpy\/numpy,Yusa95\/numpy,dato-code\/numpy,jakirkham\/numpy,pbrod\/numpy,nbeaver\/numpy,njase\/numpy,mhvk\/numpy,ogrisel\/numpy,empeeu\/numpy,nguyentu1602\/numpy,NextThought\/pypy-numpy,mortada\/numpy,cowlicks\/numpy,ddasilva\/numpy,SunghanKim\/numpy,gmcastil\/numpy,utke1\/numpy,utke1\/numpy,jorisvandenbossche\/numpy,dimasad\/numpy,nbeaver\/numpy,jorisvandenbossche\/numpy,rudimeier\/numpy,stuarteberg\/numpy,endolith\/numpy,mortada\/numpy,moreati\/numpy,rmcgibbo\/numpy,GrimDerp\/numpy,ewmoore\/numpy,WillieMaddox\/numpy,astrofrog\/numpy,GaZ3ll3\/numpy,Eric89GXL\/numpy,SiccarPoint\/numpy,gfyoung\/numpy,trankmichael\/numpy,kirillzhuravlev\/numpy,BMJHayward\/numpy,Eric89GXL\/numpy,GrimDerp\/numpy,bmorris3\/numpy,leifdenby\/numpy,jankoslavic\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/include\/numpy\/ndarraytypes.h\n+++ numpy\/core\/include\/numpy\/ndarraytypes.h\n@@ -1516,7 +1516,7 @@\n PyArray_GETITEM(const PyArrayObject *arr, const char *itemptr)\n {\n return ((PyArrayObject_fields *)arr)->descr->f->getitem(\n- itemptr, arr);\n+\t\t\t\t\t(void *)itemptr, (PyArrayObject *)arr);\n }\n \n static NPY_INLINE int\n"} {"commit":"e55b31d6305c94d0ae28196818bc0e2d0049e7ae","subject":"add ObjectPoolContiguous class","message":"add ObjectPoolContiguous class\n","repos":"moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- contrib\/other-builds\/moses2\/MemPool.h\n+++ contrib\/other-builds\/moses2\/MemPool.h\n@@ -113,4 +113,54 @@\n protected:\n \tMemPool m_pool;\n };\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+template <typename T>\n+class ObjectPoolContiguous {\n+\n+ public:\n+\tObjectPoolContiguous(std::size_t initSize = 10000)\n+\t:m_maxSize(initSize)\n+\t{\n+\t\tm_ind = 0;\n+\t\tcurrent_ = (T*) util::MallocOrThrow(sizeof(T) * initSize);\n+\t}\n+\n+ ~ObjectPoolContiguous()\n+ {\n+ \tfree(current_);\n+ }\n+\n+ T &Allocate() {\n+ if (m_ind >= m_maxSize) {\n+ \t m_maxSize <<= 1;\n+ \t current_ = realloc(current_, m_maxSize);\n+ }\n+ ++m_ind;\n+\n+ return current_[m_ind];\n+\n+ }\n+\n+ void Reset()\n+ {\n+ \tm_ind = 0;\n+ }\n+\n+ size_t size() const\n+ { return m_ind; }\n+\n+ T &get(size_t ind) {\n+ \treturn current_[ind];\n+ }\n+ private:\n+ size_t m_maxSize;\n+ size_t m_ind;\n+ T *current_;\n+\n+ \/\/ no copying\n+ ObjectPoolContiguous(const ObjectPoolContiguous &);\n+ ObjectPoolContiguous &operator=(const ObjectPoolContiguous &);\n+};\n+\n #endif \/* MEMPOOL_H_ *\/\n"} {"commit":"bcb7f0687389b1efaaf3f848e023988faa448838","subject":"fix a small bug","message":"fix a small bug\n","repos":"pombredanne\/sf1r-lite,pombredanne\/sf1r-lite,pombredanne\/sf1r-lite,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-lite,pombredanne\/sf1r-lite,izenecloud\/sf1r-ad-delivery,pombredanne\/sf1r-lite,izenecloud\/sf1r-lite,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-lite,izenecloud\/sf1r-lite,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-lite,izenecloud\/sf1r-ad-delivery","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/core\/log-manager\/UserQuery.h\n+++ source\/core\/log-manager\/UserQuery.h\n@@ -8,6 +8,7 @@\n #include <map>\n #include <boost\/date_time\/posix_time\/posix_time.hpp>\n #include <boost\/algorithm\/string\/replace.hpp>\n+#include <boost\/lexical_cast.hpp>\n #include <string>\n \n namespace sf1r\n@@ -188,12 +189,22 @@\n {\n LogAnalysisConnection& conn = LogAnalysisConnection::instance();\n GetTopKRequest req;\n+ std::list<std::pair<std::string, uint32_t> >tmp;\n req.param_.service_ = service_;\n req.param_.collection_=c;\n req.param_.begin_time_ = b;\n req.param_.end_time_ = e;\n req.param_.limit_=boost::lexical_cast<uint32_t>(limit);\n- conn.syncRequest(req,res);\n+ conn.syncRequest(req,tmp);\n+\n+ std::list<std::pair<std::string, uint32_t> >::iterator it;\n+ for(it=tmp.begin();it!=tmp.end();it++)\n+ {\n+ std::map<std::string, std::string> m;\n+ m[\"query\"] = it->first;\n+ m[\"count\"] = boost::lexical_cast<std::string>(it->second);\n+ res.push_back(m);\n+ }\n return true;\n }\n \n"} {"commit":"3dc06b3932ff6c3ff4823ebe1e6b62b3a9e0b648","subject":"Revert masking of interrupts after flash algo function execute","message":"Revert masking of interrupts after flash algo function execute\n","repos":"google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/daplink\/interface\/swd_host.c\n+++ source\/daplink\/interface\/swd_host.c\n@@ -711,6 +711,11 @@\n if (!swd_read_core_register(0, &state.r[0])) {\n return 0;\n }\n+ \n+ \/\/remove the C_MASKINTS\n+ if (!swd_write_word(DBG_HCSR, DBGKEY | C_DEBUGEN | C_HALT)) {\n+ return 0;\n+ }\n \n \/\/ Flash functions return 0 if successful.\n if (state.r[0] != 0) {\n"} {"commit":"35b131d97955f56167ff68e22ddd2a22a5d766c4","subject":"added vh_iterator in CompositeTruthValue API","message":"added vh_iterator in CompositeTruthValue API","repos":"Tiggels\/opencog,Selameab\/atomspace,AmeBel\/atomspace,MarcosPividori\/atomspace,jlegendary\/opencog,rodsol\/opencog,inflector\/opencog,jswiergo\/atomspace,ArvinPan\/opencog,misgeatgit\/opencog,Selameab\/opencog,prateeksaxena2809\/opencog,zhaozengguang\/opencog,andre-senna\/opencog,inflector\/atomspace,eddiemonroe\/atomspace,ceefour\/atomspace,printedheart\/atomspace,ceefour\/opencog,kinoc\/opencog,misgeatgit\/atomspace,williampma\/opencog,inflector\/opencog,sumitsourabh\/opencog,inflector\/atomspace,ArvinPan\/atomspace,sanuj\/opencog,cosmoharrigan\/opencog,jlegendary\/opencog,rohit12\/opencog,gavrieltal\/opencog,sanuj\/opencog,inflector\/atomspace,Tiggels\/opencog,AmeBel\/atomspace,shujingke\/opencog,virneo\/opencog,ceefour\/opencog,kinoc\/opencog,eddiemonroe\/atomspace,Allend575\/opencog,eddiemonroe\/opencog,kinoc\/opencog,ceefour\/opencog,AmeBel\/opencog,gaapt\/opencog,kinoc\/opencog,rohit12\/atomspace,prateeksaxena2809\/opencog,kinoc\/opencog,kinoc\/opencog,ceefour\/opencog,virneo\/atomspace,sumitsourabh\/opencog,zhaozengguang\/opencog,cosmoharrigan\/opencog,gaapt\/opencog,virneo\/opencog,shujingke\/opencog,iAMr00t\/opencog,gavrieltal\/opencog,yantrabuddhi\/atomspace,jlegendary\/opencog,printedheart\/atomspace,roselleebarle04\/opencog,AmeBel\/opencog,rodsol\/opencog,cosmoharrigan\/atomspace,jlegendary\/opencog,sumitsourabh\/opencog,yantrabuddhi\/opencog,rodsol\/opencog,inflector\/opencog,eddiemonroe\/atomspace,AmeBel\/opencog,jswiergo\/atomspace,rTreutlein\/atomspace,ruiting\/opencog,anitzkin\/opencog,eddiemonroe\/opencog,shujingke\/opencog,jlegendary\/opencog,rTreutlein\/atomspace,rohit12\/opencog,eddiemonroe\/atomspace,ceefour\/atomspace,AmeBel\/opencog,TheNameIsNigel\/opencog,printedheart\/opencog,Allend575\/opencog,prateeksaxena2809\/opencog,Selameab\/opencog,ArvinPan\/opencog,inflector\/opencog,yantrabuddhi\/opencog,misgeatgit\/opencog,tim777z\/opencog,sanuj\/opencog,sanuj\/opencog,anitzkin\/opencog,rodsol\/atomspace,williampma\/opencog,williampma\/opencog,misgeatgit\/opencog,cosmoharrigan\/opencog,cosmoharrigan\/atomspace,UIKit0\/atomspace,gaapt\/opencog,misgeatgit\/atomspace,kim135797531\/opencog,roselleebarle04\/opencog,roselleebarle04\/opencog,anitzkin\/opencog,virneo\/atomspace,TheNameIsNigel\/opencog,anitzkin\/opencog,williampma\/atomspace,iAMr00t\/opencog,rohit12\/opencog,inflector\/opencog,yantrabuddhi\/opencog,rodsol\/opencog,williampma\/atomspace,jswiergo\/atomspace,TheNameIsNigel\/opencog,misgeatgit\/atomspace,rohit12\/opencog,zhaozengguang\/opencog,cosmoharrigan\/opencog,tim777z\/opencog,gavrieltal\/opencog,williampma\/atomspace,ArvinPan\/opencog,andre-senna\/opencog,jswiergo\/atomspace,eddiemonroe\/atomspace,zhaozengguang\/opencog,MarcosPividori\/atomspace,shujingke\/opencog,ArvinPan\/atomspace,Allend575\/opencog,williampma\/opencog,ruiting\/opencog,ceefour\/atomspace,virneo\/opencog,ruiting\/opencog,andre-senna\/opencog,yantrabuddhi\/opencog,eddiemonroe\/opencog,ceefour\/opencog,prateeksaxena2809\/opencog,rodsol\/atomspace,anitzkin\/opencog,gavrieltal\/opencog,ArvinPan\/opencog,yantrabuddhi\/opencog,TheNameIsNigel\/opencog,gaapt\/opencog,MarcosPividori\/atomspace,Allend575\/opencog,misgeatgit\/opencog,jlegendary\/opencog,gaapt\/opencog,yantrabuddhi\/atomspace,shujingke\/opencog,gaapt\/opencog,ruiting\/opencog,printedheart\/opencog,UIKit0\/atomspace,jlegendary\/opencog,AmeBel\/opencog,rohit12\/opencog,ceefour\/opencog,gavrieltal\/opencog,rTreutlein\/atomspace,yantrabuddhi\/opencog,iAMr00t\/opencog,tim777z\/opencog,TheNameIsNigel\/opencog,MarcosPividori\/atomspace,sanuj\/opencog,yantrabuddhi\/atomspace,prateeksaxena2809\/opencog,kim135797531\/opencog,ArvinPan\/atomspace,andre-senna\/opencog,rodsol\/atomspace,gavrieltal\/opencog,virneo\/opencog,printedheart\/opencog,cosmoharrigan\/atomspace,rohit12\/atomspace,Selameab\/atomspace,rodsol\/atomspace,inflector\/atomspace,zhaozengguang\/opencog,misgeatgit\/opencog,UIKit0\/atomspace,Selameab\/opencog,andre-senna\/opencog,Selameab\/opencog,andre-senna\/opencog,iAMr00t\/opencog,rodsol\/opencog,gaapt\/opencog,cosmoharrigan\/opencog,virneo\/atomspace,rodsol\/opencog,yantrabuddhi\/atomspace,inflector\/opencog,shujingke\/opencog,zhaozengguang\/opencog,printedheart\/opencog,Tiggels\/opencog,Selameab\/opencog,anitzkin\/opencog,kim135797531\/opencog,williampma\/opencog,rTreutlein\/atomspace,misgeatgit\/opencog,prateeksaxena2809\/opencog,ArvinPan\/opencog,misgeatgit\/opencog,virneo\/atomspace,misgeatgit\/opencog,iAMr00t\/opencog,ceefour\/atomspace,cosmoharrigan\/opencog,AmeBel\/opencog,sumitsourabh\/opencog,rohit12\/opencog,cosmoharrigan\/atomspace,printedheart\/atomspace,rTreutlein\/atomspace,inflector\/opencog,sumitsourabh\/opencog,AmeBel\/atomspace,eddiemonroe\/opencog,tim777z\/opencog,inflector\/atomspace,eddiemonroe\/opencog,roselleebarle04\/opencog,sumitsourabh\/opencog,roselleebarle04\/opencog,williampma\/atomspace,anitzkin\/opencog,eddiemonroe\/opencog,rohit12\/atomspace,kinoc\/opencog,rohit12\/atomspace,AmeBel\/opencog,ArvinPan\/opencog,TheNameIsNigel\/opencog,kim135797531\/opencog,sanuj\/opencog,ruiting\/opencog,AmeBel\/atomspace,AmeBel\/atomspace,tim777z\/opencog,kim135797531\/opencog,sumitsourabh\/opencog,printedheart\/atomspace,Tiggels\/opencog,Allend575\/opencog,iAMr00t\/opencog,tim777z\/opencog,Selameab\/opencog,misgeatgit\/atomspace,kim135797531\/opencog,roselleebarle04\/opencog,printedheart\/opencog,eddiemonroe\/opencog,andre-senna\/opencog,Selameab\/atomspace,printedheart\/opencog,ceefour\/opencog,misgeatgit\/opencog,shujingke\/opencog,prateeksaxena2809\/opencog,kim135797531\/opencog,virneo\/opencog,ArvinPan\/atomspace,UIKit0\/atomspace,gavrieltal\/opencog,roselleebarle04\/opencog,inflector\/opencog,yantrabuddhi\/atomspace,Selameab\/atomspace,Tiggels\/opencog,virneo\/opencog,ruiting\/opencog,Tiggels\/opencog,yantrabuddhi\/opencog,virneo\/opencog,ruiting\/opencog,williampma\/opencog,Allend575\/opencog,Allend575\/opencog,misgeatgit\/atomspace","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/atomspace\/CompositeTruthValue.h\n+++ opencog\/atomspace\/CompositeTruthValue.h\n@@ -25,6 +25,8 @@\n #ifndef _OPENCOG__COMPOSITE_TRUTH_VALUE_H_\n #define _OPENCOG__COMPOSITE_TRUTH_VALUE_H_\n \n+#include <functional>\n+\n #include <opencog\/util\/platform.h>\n \n #include <opencog\/atomspace\/AtomSpace.h>\n@@ -39,16 +41,16 @@\n {\n \n typedef boost::unordered_map<VersionHandle, \n- TruthValue*,\n- hashVersionHandle,\n- eqVersionHandle> VersionedTruthValueMap;\n+ TruthValue*,\n+ hashVersionHandle,\n+ eqVersionHandle> VersionedTruthValueMap;\n \n class Atom;\n class CompositeRenumber;\n \n class CompositeTruthValue: public TruthValue\n {\n- friend class CompositeRenumber; \/\/ XXX ugly hack\n+ friend class CompositeRenumber; \/\/ XXX ugly hack\n \n private:\n TruthValue* primaryTV;\n@@ -63,7 +65,6 @@\n void copy(const CompositeTruthValue&);\n \n public:\n-\n \/**\n * @param The initial primary or versioned TV of this composite TV.\n * If it is NULL_TV(), a default tv will be created internally.\n@@ -171,6 +172,24 @@\n *\/\n void removeInvalidTVs(AtomSpace& atomspace);\n \n+ \/\/ iterator over VersionHandles\n+private:\n+ typedef select1st<VersionedTruthValueMap::value_type> get_key;\n+ typedef VersionedTruthValueMap::const_iterator vhm_const_iterator;\n+public:\n+ typedef boost::transform_iterator<get_key,\n+ vhm_const_iterator> vh_const_iterator;\n+ vh_const_iterator vh_begin() const {\n+ return boost::make_transform_iterator(versionedTVs.begin(), get_key());\n+ }\n+ vh_const_iterator vh_end() const {\n+ return boost::make_transform_iterator(versionedTVs.end(), get_key());\n+ }\n+ \/\/ helper for foreach\n+ std::pair<vh_const_iterator, vh_const_iterator> vh_range() const {\n+ return std::make_pair(vh_begin(), vh_end());\n+ }\n+\n \/**\n * Gets the number of versioned TVs of this CTV.\n *\/\n"} {"commit":"8bc5e25722be06df4dcffdabb156440dfba17884","subject":"Fixed wrong NULL checks for calling renderer->Quit(). Thanks Sid Dermoumi!","message":"Fixed wrong NULL checks for calling renderer->Quit(). Thanks Sid Dermoumi!","repos":"weimingtom\/sdl-gpu,DataFighter\/sdl-gpu,neozero497\/sdl-gpu,neozero497\/sdl-gpu,DataFighter\/sdl-gpu,DataFighter\/sdl-gpu,weimingtom\/sdl-gpu,neozero497\/sdl-gpu,weimingtom\/sdl-gpu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SDL_gpu\/SDL_gpu.c\n+++ SDL_gpu\/SDL_gpu.c\n@@ -178,7 +178,7 @@\n \tif(current_renderer == NULL)\r\n \t\treturn;\r\n \t\r\n-\tif(current_renderer->Quit == NULL)\r\n+\tif(current_renderer->Quit != NULL)\r\n \t\tcurrent_renderer->Quit(current_renderer);\r\n \tGPU_RemoveRenderer(current_renderer->id);\r\n \tcurrent_renderer = NULL;\r\n@@ -193,7 +193,7 @@\n \tif(current_renderer == NULL)\r\n \t\treturn;\r\n \t\r\n-\tif(current_renderer->Quit == NULL)\r\n+\tif(current_renderer->Quit != NULL)\r\n \t\tcurrent_renderer->Quit(current_renderer);\r\n \tGPU_RemoveRenderer(current_renderer->id);\r\n \t\r\n"} {"commit":"1c9223abccc3b5a275d784dd09aa163d63a01da6","subject":"Register Generic Attribute Profile service record","message":"Register Generic Attribute Profile service record\n\nPublishes SDP service record for GATT support over BR\/EDR. Currently,\nthe record is registered for all available adapters.\n","repos":"mapfau\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,mapfau\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- attrib\/example.c\n+++ attrib\/example.c\n@@ -26,19 +26,111 @@\n #include <config.h>\n #endif\n \n+#include <bluetooth\/sdp.h>\n+#include <bluetooth\/sdp_lib.h>\n+\n+#include \"sdpd.h\"\n+#include \"log.h\"\n+\n #include \"example.h\"\n+\n+#define ATT_PSM 27\n+\n+static uint32_t handle = 0;\n+\n+static sdp_record_t *server_record_new(void)\n+{\n+\tsdp_list_t *svclass_id, *apseq, *proto[2], *profiles, *root, *aproto;\n+\tuuid_t root_uuid, proto_uuid, gatt_uuid, l2cap;\n+\tsdp_profile_desc_t profile;\n+\tsdp_record_t *record;\n+\tsdp_data_t *psm, *sh, *eh;\n+\tuint16_t lp = ATT_PSM, start = 0x0001, end = 0x000f;\n+\n+\trecord = sdp_record_alloc();\n+\tif (record == NULL)\n+\t\treturn NULL;\n+\n+\tsdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP);\n+\troot = sdp_list_append(NULL, &root_uuid);\n+\tsdp_set_browse_groups(record, root);\n+\tsdp_list_free(root, NULL);\n+\n+\tsdp_uuid16_create(&gatt_uuid, GENERIC_ATTRIB_SVCLASS_ID);\n+\tsvclass_id = sdp_list_append(NULL, &gatt_uuid);\n+\tsdp_set_service_classes(record, svclass_id);\n+\tsdp_list_free(svclass_id, NULL);\n+\n+\tsdp_uuid16_create(&profile.uuid, GENERIC_ATTRIB_PROFILE_ID);\n+\tprofile.version = 0x0100;\n+\tprofiles = sdp_list_append(NULL, &profile);\n+\tsdp_set_profile_descs(record, profiles);\n+\tsdp_list_free(profiles, NULL);\n+\n+\tsdp_uuid16_create(&l2cap, L2CAP_UUID);\n+\tproto[0] = sdp_list_append(NULL, &l2cap);\n+\tpsm = sdp_data_alloc(SDP_UINT16, &lp);\n+\tproto[0] = sdp_list_append(proto[0], psm);\n+\tapseq = sdp_list_append(NULL, proto[0]);\n+\n+\tsdp_uuid16_create(&proto_uuid, ATT_UUID);\n+\tproto[1] = sdp_list_append(NULL, &proto_uuid);\n+\tsh = sdp_data_alloc(SDP_UINT16, &start);\n+\tproto[1] = sdp_list_append(proto[1], sh);\n+\teh = sdp_data_alloc(SDP_UINT16, &end);\n+\tproto[1] = sdp_list_append(proto[1], eh);\n+\tapseq = sdp_list_append(apseq, proto[1]);\n+\n+\taproto = sdp_list_append(NULL, apseq);\n+\tsdp_set_access_protos(record, aproto);\n+\n+\tsdp_set_info_attr(record, \"Generic Attribute Profile\", \"BlueZ\", NULL);\n+\n+\tsdp_set_url_attr(record, \"http:\/\/www.bluez.org\/\",\n+\t\t\t\"http:\/\/www.bluez.org\/\", \"http:\/\/www.bluez.org\/\");\n+\n+\tsdp_set_service_id(record, gatt_uuid);\n+\n+\tsdp_data_free(psm);\n+\tsdp_data_free(sh);\n+\tsdp_data_free(eh);\n+\tsdp_list_free(proto[0], NULL);\n+\tsdp_list_free(proto[1], NULL);\n+\tsdp_list_free(apseq, NULL);\n+\tsdp_list_free(aproto, NULL);\n+\n+\treturn record;\n+}\n \n int server_example_init(void)\n {\n+\tsdp_record_t *record;\n+\n \t\/*\n \t * FIXME: Add BR\/EDR service record and attributes into the GATT\n \t * database. BlueZ gatt server will be automatically enabled if\n \t * any plugin registers at least one primary service.\n \t *\/\n \n+\trecord = server_record_new();\n+\tif (record == NULL) {\n+\t\terror(\"Unable to create GATT service record\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (add_record_to_server(BDADDR_ANY, record) < 0) {\n+\t\terror(\"Failed to register GATT service record\");\n+\t\tsdp_record_free(record);\n+\t\treturn -1;\n+\t}\n+\n+\thandle = record->handle;\n+\n \treturn 0;\n }\n \n void server_example_exit(void)\n {\n+\tif (handle)\n+\t\tremove_record_from_server(handle);\n }\n"} {"commit":"e6f7d85e8a6e9dd1d46e046a82e271cf758e6b16","subject":"atudb\/fw: disable the UART in ATUSB_GPIO","message":"atudb\/fw: disable the UART in ATUSB_GPIO\n\n- board.c (gpio): split GPIO setup and probing\n- board.c (gpio): disable the UART while probing GPIOs\n","repos":"cfriedt\/ben-wpan,cfriedt\/ben-wpan,cfriedt\/ben-wpan,cfriedt\/ben-wpan,cfriedt\/ben-wpan,cfriedt\/ben-wpan","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- atusb\/fw\/board.c\n+++ atusb\/fw\/board.c\n@@ -172,30 +172,43 @@\n \tcase 1:\n \t\tDDRB = (DDRB & ~mask) | dir;\n \t\tPORTB = (PORTB & ~mask) | data;\n-\t\t_delay_ms(1);\n+\t\tbreak;\n+\tcase 2:\n+\t\tDDRC = (DDRC & ~mask) | dir;\n+\t\tPORTC = (PORTC & ~mask) | data;\n+\t\tbreak;\n+\tcase 3:\n+\t\tDDRD = (DDRD & ~mask) | dir;\n+\t\tPORTD = (PORTD & ~mask) | data;\n+\t\tbreak;\n+\tdefault:\n+\t\treturn 0;\n+\t}\n+\n+\t\/* disable the UART so that we can meddle with these pins as well. *\/\n+\tUCSR1B = 0;\n+\t_delay_ms(1);\n+\n+\tswitch (port) {\n+\tcase 1:\n \t\tres[0] = PINB;\n \t\tres[1] = PORTB;\n \t\tres[2] = DDRB;\n \t\tbreak;\n \tcase 2:\n-\t\tDDRC = (DDRC & ~mask) | dir;\n-\t\tPORTC = (PORTC & ~mask) | data;\n-\t\t_delay_ms(1);\n \t\tres[0] = PINC;\n \t\tres[1] = PORTC;\n \t\tres[2] = DDRC;\n \t\tbreak;\n \tcase 3:\n-\t\tDDRD = (DDRD & ~mask) | dir;\n-\t\tPORTD = (PORTD & ~mask) | data;\n-\t\t_delay_ms(1);\n \t\tres[0] = PIND;\n \t\tres[1] = PORTD;\n \t\tres[2] = DDRD;\n \t\tbreak;\n-\tdefault:\n-\t\treturn 0;\n-\t}\n+\t}\n+\n+\tspi_init();\n+\n \treturn 1;\n }\n \n"} {"commit":"4a4817e17cd409619db382fb3dd7b3d390768173","subject":"Add p07 not finished.","message":"Add p07 not finished.\n","repos":"Dannyps\/SOPE","returncode":1,"stderr":"error: pathspec 'aula4\/p07\/main.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- aula4\/p07\/main.c\n+++ aula4\/p07\/main.c\n@@ -0,0 +1,34 @@\n+\/\/ PROGRAM p07.c\n+#include <stdio.h>\n+#include <unistd.h>\n+#include <stdlib.h>\n+#include <sys\/time.h>\n+#include <wait.h>\n+\n+\n+int main(int argc, char** argv) \n+{ \n+\n+\tint it=1;\n+\n+\twhile(argv[it]!=NULL){\n+\t\tif(fork()==0){\n+\t\t\texeclp(argv[it], argv[it], NULL);\n+\t\t\tprintf(\"Failed to run %s.\\n\", argv[it]);\n+\t\t\texit(-1);\n+\t\t}\n+\t\tit++;\n+\t}\n+\tint status;\n+\twhile(1){\n+\t\tint ret = waitpid(-1, &status, WNOHANG);\n+\t\tif(ret==-1){ \/\/ No children remaining\n+\t\t\tprintf(\"All children ran successfully.\\n\");\n+\t\t\tbreak;\n+\t\t}else if(ret==0){ \/\/ There are still children running\n+\t\t\tusleep(100);\n+\t\t}else{ \/\/ We got someone\n+\t\t\tprintf(\"Child %d existed with code %d.\\n\", ret, WEXITSTATUS(status));\n+\t\t}\n+\t}\n+} "} {"commit":"02c6b49f146dd5494be1eb87d25eed85f4b3fbd4","subject":"Adjusted pin assignment for the BLE Nano board.","message":"Adjusted pin assignment for the BLE Nano board.\n","repos":"rosterloh\/mbed,maximmbed\/mbed,cvtsi2sd\/mbed-os,YarivCol\/mbed-os,autopulated\/mbed,mnlipp\/mbed,infinnovation\/mbed-os,jamesadevine\/mbed,devanlai\/mbed,jpbrucker\/mbed,tung7970\/mbed-os,nRFMesh\/mbed-os,HeadsUpDisplayInc\/mbed,karsev\/mbed-os,sam-geek\/mbed,monkiineko\/mbed-os,mmorenobarm\/mbed-os,adamgreen\/mbed,CalSol\/mbed,bikeNomad\/mbed,monkiineko\/mbed-os,fpiot\/mbed-ats,ban4jp\/mbed,ban4jp\/mbed,mnlipp\/mbed,dbestm\/mbed,Willem23\/mbed,NitinBhaskar\/mbed,xcrespo\/mbed,mnlipp\/mbed,FranklyDev\/mbed,brstew\/MBED-BUILD,fpiot\/mbed-ats,mazimkhan\/mbed-os,hwfwgrp\/mbed,CalSol\/mbed,mikaleppanen\/mbed-os,jeremybrodt\/mbed,autopulated\/mbed,DanKupiniak\/mbed,bentwire\/mbed,RonEld\/mbed,kpurusho\/mbed,j-greffe\/mbed-os,andcor02\/mbed-os,mikaleppanen\/mbed-os,ryankurte\/mbed-os,ARM-software\/mbed-beetle,screamerbg\/mbed,NitinBhaskar\/mbed,ARM-software\/mbed-beetle,theotherjimmy\/mbed,arostm\/mbed-os,nvlsianpu\/mbed,brstew\/MBED-BUILD,jferreir\/mbed,svogl\/mbed-os,logost\/mbed,K4zuki\/mbed,kl-cruz\/mbed-os,mikaleppanen\/mbed-os,bentwire\/mbed,al177\/mbed,pedromes\/mbed,theotherjimmy\/mbed,nvlsianpu\/mbed,fpiot\/mbed-ats,radhika-raghavendran\/mbed-os5.1-onsemi,hwfwgrp\/mbed,fvincenzo\/mbed-os,mazimkhan\/mbed-os,rosterloh\/mbed,andreaslarssonublox\/mbed,cvtsi2sd\/mbed-os,nRFMesh\/mbed-os,c1728p9\/mbed-os,maximmbed\/mbed,nabilbendafi\/mbed,xcrespo\/mbed,hwfwgrp\/mbed,adamgreen\/mbed,catiedev\/mbed-os,theotherjimmy\/mbed,mmorenobarm\/mbed-os,mikaleppanen\/mbed-os,Archcady\/mbed-os,kl-cruz\/mbed-os,svastm\/mbed,mbedmicro\/mbed,maximmbed\/mbed,alertby\/mbed,mnlipp\/mbed,adustm\/mbed,betzw\/mbed-os,rgrover\/mbed,geky\/mbed,YarivCol\/mbed-os,fvincenzo\/mbed-os,netzimme\/mbed-os,jamesadevine\/mbed,naves-thiago\/mbed-midi,wodji\/mbed,ban4jp\/mbed,adamgreen\/mbed,brstew\/MBED-BUILD,kpurusho\/mbed,naves-thiago\/mbed-midi,screamerbg\/mbed,c1728p9\/mbed-os,radhika-raghavendran\/mbed-os5.1-onsemi,YarivCol\/mbed-os,jferreir\/mbed,karsev\/mbed-os,Willem23\/mbed,Tiryoh\/mbed,kl-cruz\/mbed-os,mikaleppanen\/mbed-os,andcor02\/mbed-os,NXPmicro\/mbed,HeadsUpDisplayInc\/mbed,geky\/mbed,jeremybrodt\/mbed,wodji\/mbed,FranklyDev\/mbed,wodji\/mbed,mbedmicro\/mbed,svastm\/mbed,bcostm\/mbed-os,sg-\/mbed-drivers,dbestm\/mbed,Sweet-Peas\/mbed,c1728p9\/mbed-os,masaohamanaka\/mbed,bcostm\/mbed-os,pi19404\/mbed,nvlsianpu\/mbed,Timmmm\/mbed,c1728p9\/mbed-os,K4zuki\/mbed,tung7970\/mbed-os-1,radhika-raghavendran\/mbed-os5.1-onsemi,kl-cruz\/mbed-os,cvtsi2sd\/mbed-os,svastm\/mbed,larks\/mbed,EmuxEvans\/mbed,Tiryoh\/mbed,svogl\/mbed-os,wodji\/mbed,mazimkhan\/mbed-os,NitinBhaskar\/mbed,sam-geek\/mbed,svastm\/mbed,CalSol\/mbed,nRFMesh\/mbed-os,mmorenobarm\/mbed-os,nRFMesh\/mbed-os,K4zuki\/mbed,Sweet-Peas\/mbed,rosterloh\/mbed,nvlsianpu\/mbed,tung7970\/mbed-os,fahhem\/mbed-os,tung7970\/mbed-os-1,adamgreen\/mbed,catiedev\/mbed-os,Tiryoh\/mbed,0xc0170\/mbed-drivers,j-greffe\/mbed-os,pedromes\/mbed,fahhem\/mbed-os,pedromes\/mbed,pedromes\/mbed,ban4jp\/mbed,EmuxEvans\/mbed,Shengliang\/mbed,fvincenzo\/mbed-os,fanghuaqi\/mbed,ryankurte\/mbed-os,bulislaw\/mbed-os,pbrook\/mbed,arostm\/mbed-os,netzimme\/mbed-os,c1728p9\/mbed-os,autopulated\/mbed,jrjang\/mbed,bulislaw\/mbed-os,monkiineko\/mbed-os,pbrook\/mbed,getopenmono\/mbed,karsev\/mbed-os,struempelix\/mbed,maximmbed\/mbed,wodji\/mbed,EmuxEvans\/mbed,radhika-raghavendran\/mbed-os5.1-onsemi,dbestm\/mbed,iriark01\/mbed-drivers,GustavWi\/mbed,pedromes\/mbed,fanghuaqi\/mbed,larks\/mbed,Archcady\/mbed-os,screamerbg\/mbed,andreaslarssonublox\/mbed,fahhem\/mbed-os,adustm\/mbed,tung7970\/mbed-os-1,masaohamanaka\/mbed,andreaslarssonublox\/mbed,al177\/mbed,iriark01\/mbed-drivers,theotherjimmy\/mbed,bikeNomad\/mbed,sam-geek\/mbed,getopenmono\/mbed,adamgreen\/mbed,kjbracey-arm\/mbed,DanKupiniak\/mbed,HeadsUpDisplayInc\/mbed,logost\/mbed,karsev\/mbed-os,kpurusho\/mbed,dbestm\/mbed,wodji\/mbed,pi19404\/mbed,JasonHow44\/mbed,j-greffe\/mbed-os,devanlai\/mbed,jpbrucker\/mbed,pbrook\/mbed,nRFMesh\/mbed-os,K4zuki\/mbed,mikaleppanen\/mbed-os,jferreir\/mbed,getopenmono\/mbed,jamesadevine\/mbed,Marcomissyou\/mbed,tung7970\/mbed-os,kjbracey-arm\/mbed,pbrook\/mbed,Sweet-Peas\/mbed,monkiineko\/mbed-os,c1728p9\/mbed-os,jamesadevine\/mbed,fpiot\/mbed-ats,RonEld\/mbed,pi19404\/mbed,RonEld\/mbed,NXPmicro\/mbed,EmuxEvans\/mbed,bremoran\/mbed-drivers,Timmmm\/mbed,nabilbendafi\/mbed,GustavWi\/mbed,bentwire\/mbed,getopenmono\/mbed,cvtsi2sd\/mbed-os,dbestm\/mbed,bentwire\/mbed,Shengliang\/mbed,masaohamanaka\/mbed,nRFMesh\/mbed-os,RonEld\/mbed,sam-geek\/mbed,infinnovation\/mbed-os,NXPmicro\/mbed,Archcady\/mbed-os,fanghuaqi\/mbed,Willem23\/mbed,arostm\/mbed-os,brstew\/MBED-BUILD,mbedmicro\/mbed,catiedev\/mbed-os,geky\/mbed,mmorenobarm\/mbed-os,Tiryoh\/mbed,geky\/mbed,jrjang\/mbed,larks\/mbed,JasonHow44\/mbed,xcrespo\/mbed,mmorenobarm\/mbed-os,bikeNomad\/mbed,screamerbg\/mbed,andreaslarssonublox\/mbed,naves-thiago\/mbed-midi,larks\/mbed,Willem23\/mbed,DanKupiniak\/mbed,devanlai\/mbed,alertby\/mbed,catiedev\/mbed-os,pbrook\/mbed,netzimme\/mbed-os,nvlsianpu\/mbed,jferreir\/mbed,struempelix\/mbed,svogl\/mbed-os,jrjang\/mbed,betzw\/mbed-os,al177\/mbed,Timmmm\/mbed,Marcomissyou\/mbed,JasonHow44\/mbed,devanlai\/mbed,Timmmm\/mbed,nabilbendafi\/mbed,jpbrucker\/mbed,mazimkhan\/mbed-os,Sweet-Peas\/mbed,Shengliang\/mbed,FranklyDev\/mbed,larks\/mbed,nabilbendafi\/mbed,struempelix\/mbed,bulislaw\/mbed-os,jferreir\/mbed,struempelix\/mbed,Marcomissyou\/mbed,fvincenzo\/mbed-os,pradeep-gr\/mbed-os5-onsemi,naves-thiago\/mbed-midi,Marcomissyou\/mbed,logost\/mbed,bikeNomad\/mbed,svogl\/mbed-os,al177\/mbed,masaohamanaka\/mbed,hwfwgrp\/mbed,pedromes\/mbed,logost\/mbed,tung7970\/mbed-os-1,CalSol\/mbed,xcrespo\/mbed,getopenmono\/mbed,monkiineko\/mbed-os,nabilbendafi\/mbed,rosterloh\/mbed,xcrespo\/mbed,brstew\/MBED-BUILD,andcor02\/mbed-os,alertby\/mbed,Shengliang\/mbed,infinnovation\/mbed-os,rosterloh\/mbed,nabilbendafi\/mbed,JasonHow44\/mbed,ryankurte\/mbed-os,sg-\/mbed-drivers,rgrover\/mbed,karsev\/mbed-os,K4zuki\/mbed,kjbracey-arm\/mbed,adustm\/mbed,fvincenzo\/mbed-os,YarivCol\/mbed-os,screamerbg\/mbed,masaohamanaka\/mbed,bcostm\/mbed-os,bentwire\/mbed,alertby\/mbed,bcostm\/mbed-os,alertby\/mbed,Willem23\/mbed,mazimkhan\/mbed-os,geky\/mbed,Shengliang\/mbed,jpbrucker\/mbed,cvtsi2sd\/mbed-os,jferreir\/mbed,jpbrucker\/mbed,autopulated\/mbed,andreaslarssonublox\/mbed,kpurusho\/mbed,ARM-software\/mbed-beetle,RonEld\/mbed,theotherjimmy\/mbed,JasonHow44\/mbed,CalSol\/mbed,jamesadevine\/mbed,j-greffe\/mbed-os,GustavWi\/mbed,betzw\/mbed-os,logost\/mbed,al177\/mbed,dbestm\/mbed,devanlai\/mbed,pi19404\/mbed,jrjang\/mbed,betzw\/mbed-os,rosterloh\/mbed,maximmbed\/mbed,kpurusho\/mbed,YarivCol\/mbed-os,mnlipp\/mbed,FranklyDev\/mbed,infinnovation\/mbed-os,mnlipp\/mbed,arostm\/mbed-os,fanghuaqi\/mbed,struempelix\/mbed,pradeep-gr\/mbed-os5-onsemi,betzw\/mbed-os,Timmmm\/mbed,NXPmicro\/mbed,fpiot\/mbed-ats,screamerbg\/mbed,hwfwgrp\/mbed,Archcady\/mbed-os,ban4jp\/mbed,svastm\/mbed,mmorenobarm\/mbed-os,Archcady\/mbed-os,arostm\/mbed-os,andcor02\/mbed-os,pradeep-gr\/mbed-os5-onsemi,ban4jp\/mbed,0xc0170\/mbed-drivers,HeadsUpDisplayInc\/mbed,NXPmicro\/mbed,andcor02\/mbed-os,Sweet-Peas\/mbed,tung7970\/mbed-os,RonEld\/mbed,andcor02\/mbed-os,JasonHow44\/mbed,pradeep-gr\/mbed-os5-onsemi,Shengliang\/mbed,bikeNomad\/mbed,theotherjimmy\/mbed,autopulated\/mbed,GustavWi\/mbed,sam-geek\/mbed,fahhem\/mbed-os,kpurusho\/mbed,DanKupiniak\/mbed,Archcady\/mbed-os,autopulated\/mbed,Marcomissyou\/mbed,jeremybrodt\/mbed,bremoran\/mbed-drivers,rgrover\/mbed,bulislaw\/mbed-os,catiedev\/mbed-os,jeremybrodt\/mbed,kl-cruz\/mbed-os,pi19404\/mbed,xcrespo\/mbed,larks\/mbed,EmuxEvans\/mbed,bcostm\/mbed-os,svogl\/mbed-os,ryankurte\/mbed-os,infinnovation\/mbed-os,radhika-raghavendran\/mbed-os5.1-onsemi,mazimkhan\/mbed-os,Sweet-Peas\/mbed,fahhem\/mbed-os,naves-thiago\/mbed-midi,arostm\/mbed-os,adustm\/mbed,kl-cruz\/mbed-os,bentwire\/mbed,cvtsi2sd\/mbed-os,pi19404\/mbed,betzw\/mbed-os,jrjang\/mbed,maximmbed\/mbed,K4zuki\/mbed,CalSol\/mbed,tung7970\/mbed-os-1,FranklyDev\/mbed,nvlsianpu\/mbed,kjbracey-arm\/mbed,karsev\/mbed-os,brstew\/MBED-BUILD,netzimme\/mbed-os,logost\/mbed,ARM-software\/mbed-beetle,pradeep-gr\/mbed-os5-onsemi,naves-thiago\/mbed-midi,fahhem\/mbed-os,monkiineko\/mbed-os,masaohamanaka\/mbed,ryankurte\/mbed-os,alertby\/mbed,NXPmicro\/mbed,fanghuaqi\/mbed,jeremybrodt\/mbed,bulislaw\/mbed-os,netzimme\/mbed-os,j-greffe\/mbed-os,al177\/mbed,Tiryoh\/mbed,tung7970\/mbed-os,rgrover\/mbed,infinnovation\/mbed-os,devanlai\/mbed,radhika-raghavendran\/mbed-os5.1-onsemi,adamgreen\/mbed,fpiot\/mbed-ats,GustavWi\/mbed,bulislaw\/mbed-os,struempelix\/mbed,EmuxEvans\/mbed,adustm\/mbed,NitinBhaskar\/mbed,Timmmm\/mbed,svogl\/mbed-os,mbedmicro\/mbed,Tiryoh\/mbed,adustm\/mbed,ryankurte\/mbed-os,jrjang\/mbed,mbedmicro\/mbed,hwfwgrp\/mbed,HeadsUpDisplayInc\/mbed,j-greffe\/mbed-os,jpbrucker\/mbed,jamesadevine\/mbed,rgrover\/mbed,bcostm\/mbed-os,pradeep-gr\/mbed-os5-onsemi,NitinBhaskar\/mbed,netzimme\/mbed-os,Marcomissyou\/mbed,catiedev\/mbed-os,pbrook\/mbed,getopenmono\/mbed,HeadsUpDisplayInc\/mbed,YarivCol\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libraries\/mbed\/targets\/hal\/TARGET_NORDIC\/TARGET_MCU_NRF51822\/TARGET_RBLAB_BLENANO\/PinNames.h\n+++ libraries\/mbed\/targets\/hal\/TARGET_NORDIC\/TARGET_MCU_NRF51822\/TARGET_RBLAB_BLENANO\/PinNames.h\n@@ -139,17 +139,16 @@\n I2C_SCL1 = p15, \n *\/\n \n- D0 = p9,\n- D1 = p11,\n- D2 = p8,\n- D3 = p10,\n-\/\/ D4 = p,\n- D5 = p7,\n+ D0 = p11,\n+ D1 = p9,\n+ D2 = p10,\n+ D3 = p8,\n+ D4 = p28,\n+ D5 = p29,\n D6 = p15,\n- D7 = p29,\n- \n+ D7 = p7,\n+\/* \n D8 = p28,\n-\/*\n D9 = p18,\n D10 = p14,\n D11 = p12,\n"} {"commit":"59603da25cdf66cf437c64d32dfe22028a87044c","subject":"More detailed comments on bandwidth margin constants","message":"More detailed comments on bandwidth margin constants\n","repos":"google\/synthmark,google\/synthmark,google\/synthmark,google\/synthmark,google\/synthmark","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/tools\/CustomHostCpuManager.h\n+++ source\/tools\/CustomHostCpuManager.h\n@@ -126,8 +126,14 @@\n else\n bandwidth = static_cast<double>(expectedRuntime_ns) \/ mPeriod_ns;\n \n- \/* Add some offset to the computed bandwidth *\/\n+ \/*\n+ * Add some margins to the computed bandwidth, since the\n+ * application execution times are noisy.\n+ * A first margin is a multiplication factor, meaning that the margin\n+ * proportionally increases with the duration.\n+ *\/ \n bandwidth *= 1.1;\n+ \/* A second margin is an absolute offset. *\/\n bandwidth += 0.05;\n \n \/* Bound the bandwidth to the limit set by the Kernel *\/\n"} {"commit":"9a37bb73c574d4d950d7eaf4c7bcb4bfa264cb2b","subject":"suprresion of test verbosity","message":"suprresion of test verbosity","repos":"ARISSIM\/ARISS,alrinach\/ARISS,ARISSIM\/ARISS,alrinach\/ARISS,alrinach\/ARISS,ARISSIM\/ARISS,ARISSIM\/ARISS,alrinach\/ARISS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sources\/libApexArinc653\/CSampling.c\n+++ sources\/libApexArinc653\/CSampling.c\n@@ -76,6 +76,5 @@\n }\n \n } while (last_message_in_queue != 1);\n- printf(\"arrrrrrrrrg\");\n return 0;\n }"} {"commit":"21ef733251473f1d7f43cab03d998210a000b844","subject":"lpc43xx: use the RIT timer as SysTick in M0 core","message":"lpc43xx: use the RIT timer as SysTick in M0 core\n","repos":"nongxiaoming\/rt-thread,weiyuliang\/rt-thread,igou\/rt-thread,yongli3\/rt-thread,FlyLu\/rt-thread,RT-Thread\/rt-thread,gbcwbz\/rt-thread,AubrCool\/rt-thread,AubrCool\/rt-thread,weety\/rt-thread,zhaojuntao\/rt-thread,yongli3\/rt-thread,ArdaFu\/rt-thread,armink\/rt-thread,armink\/rt-thread,armink\/rt-thread,ArdaFu\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,wolfgangz2013\/rt-thread,gbcwbz\/rt-thread,AubrCool\/rt-thread,weiyuliang\/rt-thread,yongli3\/rt-thread,zhaojuntao\/rt-thread,gbcwbz\/rt-thread,nongxiaoming\/rt-thread,zhaojuntao\/rt-thread,FlyLu\/rt-thread,weety\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,gbcwbz\/rt-thread,wolfgangz2013\/rt-thread,wolfgangz2013\/rt-thread,armink\/rt-thread,gbcwbz\/rt-thread,gbcwbz\/rt-thread,AubrCool\/rt-thread,yongli3\/rt-thread,geniusgogo\/rt-thread,weety\/rt-thread,FlyLu\/rt-thread,AubrCool\/rt-thread,igou\/rt-thread,armink\/rt-thread,igou\/rt-thread,hezlog\/rt-thread,weiyuliang\/rt-thread,armink\/rt-thread,armink\/rt-thread,FlyLu\/rt-thread,weiyuliang\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,weiyuliang\/rt-thread,zhaojuntao\/rt-thread,wolfgangz2013\/rt-thread,weety\/rt-thread,FlyLu\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,igou\/rt-thread,RT-Thread\/rt-thread,wolfgangz2013\/rt-thread,hezlog\/rt-thread,yongli3\/rt-thread,nongxiaoming\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,yongli3\/rt-thread,igou\/rt-thread,gbcwbz\/rt-thread,RT-Thread\/rt-thread,wolfgangz2013\/rt-thread,wolfgangz2013\/rt-thread,ArdaFu\/rt-thread,hezlog\/rt-thread,ArdaFu\/rt-thread,zhaojuntao\/rt-thread,igou\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,zhaojuntao\/rt-thread,FlyLu\/rt-thread,RT-Thread\/rt-thread,yongli3\/rt-thread,zhaojuntao\/rt-thread,weety\/rt-thread,AubrCool\/rt-thread,ArdaFu\/rt-thread,hezlog\/rt-thread,RT-Thread\/rt-thread,igou\/rt-thread,RT-Thread\/rt-thread,ArdaFu\/rt-thread,AubrCool\/rt-thread,weiyuliang\/rt-thread,ArdaFu\/rt-thread,geniusgogo\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,nongxiaoming\/rt-thread,weiyuliang\/rt-thread,FlyLu\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bsp\/lpc43xx\/M0\/applications\/board.c\n+++ bsp\/lpc43xx\/M0\/applications\/board.c\n@@ -26,17 +26,34 @@\n \/* enter interrupt *\/\n rt_interrupt_enter();\n \n- rt_tick_increase();\n+ if (LPC_RITIMER->CTRL & 0x01)\n+ {\n+ rt_tick_increase();\n+ LPC_RITIMER->CTRL |= 0x01;\n+ }\n \n \/* leave interrupt *\/\n rt_interrupt_leave();\n }\n+\n+extern void SystemCoreClockUpdate(void);\n \n \/**\n * This function will initial LPC43xx board.\n *\/\n void rt_hw_board_init()\n {\n+ SystemCoreClockUpdate();\n+\n+ \/* Setup RIT timer. *\/\n+ LPC_RITIMER->COMPVAL = SystemCoreClock \/ RT_TICK_PER_SECOND - 1;\n+ \/* Enable auto-clear. *\/\n+ LPC_RITIMER->CTRL |= 1 << 1;\n+ \/* Reset the counter as the counter is enabled after reset. *\/\n+ LPC_RITIMER->COUNTER = 0;\n+ NVIC_SetPriority(M0_RITIMER_OR_WWDT_IRQn, (1 << __NVIC_PRIO_BITS) - 1);\n+ NVIC_EnableIRQ(M0_RITIMER_OR_WWDT_IRQn);\n+\n \/* set pend exception priority *\/\n NVIC_SetPriority(PendSV_IRQn, (1 << __NVIC_PRIO_BITS) - 1);\n \n"} {"commit":"585b16a39f64abdd51341e24a041727770aa6d2f","subject":"Update definition of StaticTimer_t so its size is correct on MSP403X large memory model builds.","message":"Update definition of StaticTimer_t so its size is correct on MSP403X large memory model builds.\n","repos":"FreeRTOS\/FreeRTOS-Kernel,FreeRTOS\/FreeRTOS-Kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- FreeRTOS\/Source\/include\/FreeRTOS.h\n+++ FreeRTOS\/Source\/include\/FreeRTOS.h\n@@ -1129,13 +1129,14 @@\n \tStaticListItem_t\txDummy2;\r\n \tTickType_t\t\t\txDummy3;\r\n \tUBaseType_t\t\t\tuxDummy4;\r\n-\tvoid \t\t\t\t*pvDummy5[ 2 ];\r\n+\tvoid \t\t\t\t*pvDummy5;\r\n+\tTaskFunction_t\t\tpvDummy6;\r\n \t#if( configUSE_TRACE_FACILITY == 1 )\r\n-\t\tUBaseType_t\t\tuxDummy6;\r\n+\t\tUBaseType_t\t\tuxDummy7;\r\n \t#endif\r\n \r\n \t#if( ( configSUPPORT_STATIC_ALLOCATION == 1 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r\n-\t\tuint8_t \t\tucDummy7;\r\n+\t\tuint8_t \t\tucDummy8;\r\n \t#endif\r\n \r\n } StaticTimer_t;\r\n"} {"commit":"fd42532d499a291a3b4452d79a5f9126cd74f24c","subject":"glib2: remove needless check","message":"glib2: remove needless check\n\nrbg_scan_options() does it.\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib2\/ext\/glib2\/rbglib_fileutils.c\n+++ glib2\/ext\/glib2\/rbglib_fileutils.c\n@@ -66,7 +66,7 @@\n rb_scan_args(argc, argv, \"11\", &rb_size, &rb_options);\n if (NIL_P(rb_options)) {\n return CSTR2RVAL_FREE(g_format_size(NUM2UINT(rb_size)));\n- } else if (TYPE(rb_options) == RUBY_T_HASH) {\n+ } else {\n VALUE rb_flags;\n rbg_scan_options(rb_options,\n \"flags\", &rb_flags,\n@@ -74,8 +74,6 @@\n \n return CSTR2RVAL_FREE(g_format_size_full(NUM2UINT(rb_size),\n RVAL2GFORMATSIZEFLAGS(rb_flags)));\n- } else {\n- rb_raise(rb_eArgError, \"Invalid arguments.\");\n }\n }\n #endif\n"} {"commit":"d3cc072be4c9e835a603a203a7f0d996b8dc927e","subject":"STYLE: Added default values.","message":"STYLE: Added default values.\n","repos":"candy7393\/VTK,arnaudgelas\/VTK,mspark93\/VTK,candy7393\/VTK,jmerkow\/VTK,keithroe\/vtkoptix,cjh1\/VTK,ashray\/VTK-EVM,sankhesh\/VTK,gram526\/VTK,keithroe\/vtkoptix,mspark93\/VTK,gram526\/VTK,naucoin\/VTKSlicerWidgets,jmerkow\/VTK,johnkit\/vtk-dev,demarle\/VTK,aashish24\/VTK-old,johnkit\/vtk-dev,daviddoria\/PointGraphsPhase1,Wuteyan\/VTK,berendkleinhaneveld\/VTK,Wuteyan\/VTK,msmolens\/VTK,hendradarwin\/VTK,naucoin\/VTKSlicerWidgets,jmerkow\/VTK,sankhesh\/VTK,mspark93\/VTK,demarle\/VTK,berendkleinhaneveld\/VTK,sankhesh\/VTK,SimVascular\/VTK,msmolens\/VTK,arnaudgelas\/VTK,msmolens\/VTK,cjh1\/VTK,spthaolt\/VTK,berendkleinhaneveld\/VTK,demarle\/VTK,biddisco\/VTK,sumedhasingla\/VTK,hendradarwin\/VTK,hendradarwin\/VTK,jeffbaumes\/jeffbaumes-vtk,SimVascular\/VTK,sankhesh\/VTK,jeffbaumes\/jeffbaumes-vtk,Wuteyan\/VTK,msmolens\/VTK,sankhesh\/VTK,ashray\/VTK-EVM,spthaolt\/VTK,collects\/VTK,cjh1\/VTK,aashish24\/VTK-old,mspark93\/VTK,collects\/VTK,mspark93\/VTK,cjh1\/VTK,spthaolt\/VTK,msmolens\/VTK,msmolens\/VTK,candy7393\/VTK,aashish24\/VTK-old,collects\/VTK,SimVascular\/VTK,sumedhasingla\/VTK,SimVascular\/VTK,arnaudgelas\/VTK,ashray\/VTK-EVM,biddisco\/VTK,keithroe\/vtkoptix,spthaolt\/VTK,jeffbaumes\/jeffbaumes-vtk,aashish24\/VTK-old,SimVascular\/VTK,johnkit\/vtk-dev,johnkit\/vtk-dev,jeffbaumes\/jeffbaumes-vtk,mspark93\/VTK,jmerkow\/VTK,biddisco\/VTK,aashish24\/VTK-old,candy7393\/VTK,keithroe\/vtkoptix,biddisco\/VTK,sankhesh\/VTK,keithroe\/vtkoptix,daviddoria\/PointGraphsPhase1,sumedhasingla\/VTK,keithroe\/vtkoptix,SimVascular\/VTK,gram526\/VTK,johnkit\/vtk-dev,spthaolt\/VTK,candy7393\/VTK,ashray\/VTK-EVM,candy7393\/VTK,collects\/VTK,berendkleinhaneveld\/VTK,jeffbaumes\/jeffbaumes-vtk,johnkit\/vtk-dev,msmolens\/VTK,keithroe\/vtkoptix,candy7393\/VTK,sumedhasingla\/VTK,biddisco\/VTK,cjh1\/VTK,Wuteyan\/VTK,arnaudgelas\/VTK,Wuteyan\/VTK,arnaudgelas\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,mspark93\/VTK,ashray\/VTK-EVM,collects\/VTK,hendradarwin\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,johnkit\/vtk-dev,jmerkow\/VTK,jmerkow\/VTK,sumedhasingla\/VTK,daviddoria\/PointGraphsPhase1,jmerkow\/VTK,demarle\/VTK,gram526\/VTK,cjh1\/VTK,demarle\/VTK,hendradarwin\/VTK,demarle\/VTK,ashray\/VTK-EVM,daviddoria\/PointGraphsPhase1,mspark93\/VTK,sankhesh\/VTK,hendradarwin\/VTK,biddisco\/VTK,Wuteyan\/VTK,aashish24\/VTK-old,ashray\/VTK-EVM,gram526\/VTK,arnaudgelas\/VTK,naucoin\/VTKSlicerWidgets,berendkleinhaneveld\/VTK,spthaolt\/VTK,gram526\/VTK,demarle\/VTK,gram526\/VTK,berendkleinhaneveld\/VTK,jeffbaumes\/jeffbaumes-vtk,spthaolt\/VTK,sumedhasingla\/VTK,jmerkow\/VTK,naucoin\/VTKSlicerWidgets,naucoin\/VTKSlicerWidgets,sumedhasingla\/VTK,keithroe\/vtkoptix,collects\/VTK,naucoin\/VTKSlicerWidgets,sumedhasingla\/VTK,ashray\/VTK-EVM,sankhesh\/VTK,candy7393\/VTK,SimVascular\/VTK,Wuteyan\/VTK,msmolens\/VTK,hendradarwin\/VTK,daviddoria\/PointGraphsPhase1,SimVascular\/VTK,demarle\/VTK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Graphics\/vtkPolyDataPointSampler.h\n+++ Graphics\/vtkPolyDataPointSampler.h\n@@ -54,7 +54,7 @@\n \n \/\/ Description:\n \/\/ Set\/Get the approximate distance between points. This is an absolute\n- \/\/ distance measure.\n+ \/\/ distance measure. The default is 0.01.\n vtkSetClampMacro(Distance,double,0.0,VTK_LARGE_FLOAT);\n vtkGetMacro(Distance,double);\n \n@@ -67,14 +67,14 @@\n \n \/\/ Description:\n \/\/ Specify\/retrieve a boolean flag indicating whether cell edges should\n- \/\/ be sampled to produce output points.\n+ \/\/ be sampled to produce output points. The default is true.\n vtkGetMacro(GenerateEdgePoints,int); \n vtkSetMacro(GenerateEdgePoints,int); \n vtkBooleanMacro(GenerateEdgePoints,int); \n \n \/\/ Description:\n \/\/ Specify\/retrieve a boolean flag indicating whether cell interiors should\n- \/\/ be sampled to produce output points.\n+ \/\/ be sampled to produce output points. The default is true.\n vtkGetMacro(GenerateInteriorPoints,int); \n vtkSetMacro(GenerateInteriorPoints,int); \n vtkBooleanMacro(GenerateInteriorPoints,int); \n@@ -83,7 +83,8 @@\n \/\/ Specify\/retrieve a boolean flag indicating whether cell vertices should\n \/\/ be generated. Cell vertices are useful if you actually want to display\n \/\/ the points (that is, for each point generated, a vertex is generated).\n- \/\/ Recall that VTK only renders vertices and not points.\n+ \/\/ Recall that VTK only renders vertices and not points. \n+ \/\/ The default is true.\n vtkGetMacro(GenerateVertices,int); \n vtkSetMacro(GenerateVertices,int); \n vtkBooleanMacro(GenerateVertices,int); \n"} {"commit":"dcccb212305e9d12838de5082cb85fc39df1c875","subject":"removed targetver.h","message":"removed targetver.h\n","repos":"lanit-tercom-school\/grouplock,lanit-tercom-school\/grouplock,lanit-tercom-school\/grouplock,lanit-tercom-school\/grouplock,lanit-tercom-school\/grouplock","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- GroupLockCrypto\/Source\/targetver.h\n+++ GroupLockCrypto\/Source\/targetver.h\n@@ -1,8 +0,0 @@\n-#pragma once\n-\n-\/\/ SDKDDKVer.h Windows.\n-\n-\/\/ Windows, WinSDKVer.h \n-\/\/ _WIN32_WINNT SDKDDKVer.h.\n-\n-#include <SDKDDKVer.h>\n"} {"commit":"ad7b60240e2e25f4812cf2df53a1b1cb950c1b36","subject":"example: classifier: fix add queue param init call","message":"example: classifier: fix add queue param init call\n\nFixes crash caused by queue param not being initialized.\n\nSigned-off-by: Balasubramanian Manoharan <affd9aba178b6c6e9aaff69252817fd03d71ae35@linaro.org>\nReviewed-by: Stuart Haslam <1fce01f364ef5298e64e07a42e08efeef153fa98@linaro.org>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"dkrot\/odp,erachmi\/odp,kalray\/odp-mppa,nmorey\/odp,rsalveti\/odp,rsalveti\/odp,ravineet-singh\/odp,kalray\/odp-mppa,dkrot\/odp,nmorey\/odp,ravineet-singh\/odp,dkrot\/odp,rsalveti\/odp,erachmi\/odp,nmorey\/odp,mike-holmes-linaro\/odp,nmorey\/odp,rsalveti\/odp,kalray\/odp-mppa,kalray\/odp-mppa,mike-holmes-linaro\/odp,erachmi\/odp,kalray\/odp-mppa,mike-holmes-linaro\/odp,erachmi\/odp,ravineet-singh\/odp,dkrot\/odp,ravineet-singh\/odp,kalray\/odp-mppa,mike-holmes-linaro\/odp,kalray\/odp-mppa,rsalveti\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example\/classifier\/odp_classifier.c\n+++ example\/classifier\/odp_classifier.c\n@@ -401,6 +401,7 @@\n \t\t};\n \n \t\tstats->pmr = odp_pmr_create(&match);\n+\t\todp_queue_param_init(&qparam);\n \t\tqparam.sched.prio = i % odp_schedule_num_prio();\n \t\tqparam.sched.sync = ODP_SCHED_SYNC_NONE;\n \t\tqparam.sched.group = ODP_SCHED_GROUP_ALL;\n"} {"commit":"bf4f481625dbe4bb757cf7aa3562ab5d45780c77","subject":"Some minor cleaning up (#57).","message":"Some minor cleaning up (#57).\n","repos":"Fairly\/opencor,Fairly\/opencor,mirams\/opencor,Fairly\/opencor,mirams\/opencor,Fairly\/opencor,mirams\/opencor,Fairly\/opencor,mirams\/opencor,mirams\/opencor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/plugins\/editing\/CellMLAnnotationView\/src\/cellmlannotationviewmetadataeditdetailswidget.h\n+++ src\/plugins\/editing\/CellMLAnnotationView\/src\/cellmlannotationviewmetadataeditdetailswidget.h\n@@ -118,9 +118,9 @@\n int mItemsVerticalScrollBarPosition;\n \n void updateGui(const Items &pItems, const QString &pErrorMsg,\n- const bool &pLookupTerm = false,\n- const int &pItemsVerticalScrollBarPosition = 0,\n- const bool &pRetranslate = false);\n+ const bool &pLookupTerm,\n+ const int &pItemsVerticalScrollBarPosition,\n+ const bool &pRetranslate);\n void updateItemsGui(const Items &pItems, const QString &pErrorMsg,\n const bool &pLookupTerm);\n \n"} {"commit":"58fe836429737900fc53266c7c668d79da26a09d","subject":"Fix CSI to support a separate thread per platform","message":"Fix CSI to support a separate thread per platform\n\nThis is crucial to being able to deliver indications from multiple\nplatforms at the same time. By keeping a separate thread_id for each\nplatform, we ensure that we start one and only one thread per platform,\nso that they can properly establish their connections to libvirt.\n\nNote that pegasus won't hand me a fresh ObjectPath if I subscribe to a (e.g)\nXen indication after a KVM one, so this doesn't actually enable subscription\nof indications from multiple platforms. However, this seems to be a pegasus\nissue and can be worked independently.\n\nAlso fix leak of args in ActivateFilter if thread is already started.\n\nSigned-off-by: Dan Smith <787803eb1755f35291827d0f0268aa9bc7a57464@us.ibm.com>\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Virt_ComputerSystemIndication.c\n+++ src\/Virt_ComputerSystemIndication.c\n@@ -46,7 +46,13 @@\n \n static const CMPIBroker *_BROKER;\n \n-static CMPI_THREAD_TYPE lifecycle_thread_id = 0;\n+#define CSI_NUM_PLATFORMS 3\n+enum CSI_PLATFORMS {CSI_XEN,\n+ CSI_KVM,\n+ CSI_LXC,\n+};\n+\n+static CMPI_THREAD_TYPE thread_id[CSI_NUM_PLATFORMS];\n \n enum CS_EVENTS {CS_CREATED,\n CS_DELETED,\n@@ -362,6 +368,18 @@\n return rc;\n }\n \n+static int platform_from_class(const char *cn)\n+{\n+ if (STARTS_WITH(cn, \"Xen\"))\n+ return CSI_XEN;\n+ else if (STARTS_WITH(cn, \"KVM\"))\n+ return CSI_KVM;\n+ else if (STARTS_WITH(cn, \"LXC\"))\n+ return CSI_LXC;\n+ else\n+ return -1;\n+}\n+\n static CMPI_THREAD_RETURN lifecycle_thread(void *params)\n {\n struct ind_args *args = (struct ind_args *)params;\n@@ -374,6 +392,7 @@\n struct dom_xml *prev_xml = NULL;\n virConnectPtr conn;\n char *prefix = class_prefix_name(args->classname);\n+ int platform = platform_from_class(args->classname);\n \n conn = connect_by_classname(_BROKER, args->classname, &s);\n if (conn == NULL) {\n@@ -393,7 +412,7 @@\n free_domain_list(tmp_list, prev_count);\n free(tmp_list);\n \n- CU_DEBUG(\"entering event loop\");\n+ CU_DEBUG(\"Entering CSI event loop (%s)\", prefix);\n while (lifecycle_enabled) {\n int i;\n bool res;\n@@ -449,12 +468,12 @@\n }\n \n out:\n+ thread_id[platform] = 0;\n+\n pthread_mutex_unlock(&lifecycle_mutex);\n stdi_free_ind_args(&args);\n free(prefix);\n virConnectClose(conn);\n-\n- lifecycle_thread_id = 0;\n \n return NULL;\n }\n@@ -469,7 +488,8 @@\n CU_DEBUG(\"ActivateFilter\");\n CMPIStatus s = {CMPI_RC_OK, NULL};\n struct std_indication_ctx *_ctx;\n- struct ind_args *args = malloc(sizeof(struct ind_args));\n+ struct ind_args *args;\n+ int platform;\n \n _ctx = (struct std_indication_ctx *)mi->hdl;\n \n@@ -479,14 +499,41 @@\n \"No ObjectPath given\");\n goto out;\n }\n- args->ns = strdup(NAMESPACE(op));\n- args->classname = strdup(CLASSNAME(op));\n- args->_ctx = _ctx;\n-\n- if (lifecycle_thread_id == 0) {\n+\n+ \/* FIXME: op is stale the second time around, for some reason *\/\n+ platform = platform_from_class(CLASSNAME(op));\n+ if (platform < 0) {\n+ cu_statusf(_BROKER, &s,\n+ CMPI_RC_ERR_FAILED,\n+ \"Unknown platform\");\n+ goto out;\n+ }\n+\n+ if (thread_id[platform] == 0) {\n+ args = malloc(sizeof(struct ind_args));\n+ if (args == NULL) {\n+ CU_DEBUG(\"Failed to allocate ind_args\");\n+ cu_statusf(_BROKER, &s,\n+ CMPI_RC_ERR_FAILED,\n+ \"Unable to allocate ind_args\");\n+ goto out;\n+ }\n+\n args->context = CBPrepareAttachThread(_BROKER, ctx);\n-\n- lifecycle_thread_id = _BROKER->xft->newThread(lifecycle_thread,\n+ if (args->context == NULL) {\n+ CU_DEBUG(\"Failed to create thread context\");\n+ cu_statusf(_BROKER, &s,\n+ CMPI_RC_ERR_FAILED,\n+ \"Unable to create thread context\");\n+ free(args);\n+ goto out;\n+ }\n+\n+ args->ns = strdup(NAMESPACE(op));\n+ args->classname = strdup(CLASSNAME(op));\n+ args->_ctx = _ctx;\n+\n+ thread_id[platform] = _BROKER->xft->newThread(lifecycle_thread,\n args,\n 0);\n }\n@@ -508,6 +555,7 @@\n static _EI_RTYPE EnableIndications(CMPIIndicationMI* mi,\n const CMPIContext *ctx)\n {\n+ CU_DEBUG(\"EnableIndications\");\n pthread_mutex_lock(&lifecycle_mutex);\n lifecycle_enabled = true;\n pthread_mutex_unlock(&lifecycle_mutex);\n"} {"commit":"3ed5c46c8bae546d9b4862c6d1c747c9ffef1784","subject":"ECTP: adopt the changes made to profile.h Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com>","message":"ECTP: adopt the changes made to profile.h\nSigned-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com>\n\n Virt_ElementConformsToProfile.c | 3 +++\n 1 file changed, 3 insertions(+)\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Virt_ElementConformsToProfile.c\n+++ src\/Virt_ElementConformsToProfile.c\n@@ -180,6 +180,9 @@\n }\n \n for (i = 0; profiles[i] != NULL; i++) {\n+ if (profiles[i]->scoping_class == NULL)\n+ continue;\n+\n if (!STREQC(profiles[i]->scoping_class, classname))\n continue;\n \n"} {"commit":"ee29d93e2c2d40efde15502bbcfd5227da488943","subject":"cosmetic","message":"cosmetic\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Foundation\/DataExchange\/StructuredStreamEvents\/ObjectReaderRegistry.h\n+++ Library\/Sources\/Stroika\/Foundation\/DataExchange\/StructuredStreamEvents\/ObjectReaderRegistry.h\n@@ -331,10 +331,10 @@\n public:\n const ObjectReaderRegistry& GetObjectReaderRegistry () const;\n \n-\n-\n public:\n nonvirtual void Push (const shared_ptr<IElementConsumer>& elt);\n+\n+ public:\n nonvirtual void Pop ();\n \n public:\n"} {"commit":"08ec94aa5da98203f31d0aee5a911baf451b0850","subject":"fix total_tuples is not updated in `SetPositionListsAndVisibility`, which causes tile iterator fails in some cases.","message":"fix total_tuples is not updated in `SetPositionListsAndVisibility`, which causes tile iterator fails in\nsome cases.\n","repos":"eric-haibin-lin\/peloton,eric-haibin-lin\/peloton,eric-haibin-lin\/peloton,eric-haibin-lin\/peloton,eric-haibin-lin\/peloton,eric-haibin-lin\/peloton,eric-haibin-lin\/peloton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/executor\/logical_tile.h\n+++ src\/backend\/executor\/logical_tile.h\n@@ -280,6 +280,7 @@\n std::vector<std::vector<oid_t>> &&position_lists) {\n position_lists_ = position_lists;\n if (position_lists.size() > 0) {\n+ total_tuples_ = position_lists[0].size();\n visible_rows_.resize(position_lists_[0].size(), true);\n visible_tuples_ = position_lists_[0].size();\n }\n"} {"commit":"4a5593197b0ddec913fcd7758d61e782ab5c4d59","subject":"Remove duplicate include of slot.h.","message":"Remove duplicate include of slot.h.\n\nBack-patch to 9.4, where this problem was added.\n","repos":"50wu\/gpdb,xinzweb\/gpdb,50wu\/gpdb,yazun\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,Postgres-XL\/Postgres-XL,oberstet\/postgres-xl,greenplum-db\/gpdb,oberstet\/postgres-xl,50wu\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,yazun\/postgres-xl,techdragon\/Postgres-XL,greenplum-db\/gpdb,ashwinstar\/gpdb,pavanvd\/postgres-xl,techdragon\/Postgres-XL,lisakowen\/gpdb,adam8157\/gpdb,ovr\/postgres-xl,zeroae\/postgres-xl,greenplum-db\/gpdb,pavanvd\/postgres-xl,zeroae\/postgres-xl,adam8157\/gpdb,techdragon\/Postgres-XL,greenplum-db\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,ovr\/postgres-xl,Postgres-XL\/Postgres-XL,Postgres-XL\/Postgres-XL,xinzweb\/gpdb,xinzweb\/gpdb,oberstet\/postgres-xl,ashwinstar\/gpdb,jmcatamney\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,xinzweb\/gpdb,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,50wu\/gpdb,yazun\/postgres-xl,zeroae\/postgres-xl,xinzweb\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,adam8157\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,pavanvd\/postgres-xl,zeroae\/postgres-xl,ovr\/postgres-xl,xinzweb\/gpdb,yazun\/postgres-xl,zeroae\/postgres-xl,lisakowen\/gpdb,techdragon\/Postgres-XL,oberstet\/postgres-xl,50wu\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,techdragon\/Postgres-XL,greenplum-db\/gpdb,oberstet\/postgres-xl,greenplum-db\/gpdb,pavanvd\/postgres-xl,pavanvd\/postgres-xl,yazun\/postgres-xl,ashwinstar\/gpdb,50wu\/gpdb,lisakowen\/gpdb,50wu\/gpdb,ovr\/postgres-xl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/replication\/walsender.c\n+++ src\/backend\/replication\/walsender.c\n@@ -62,7 +62,6 @@\n #include \"replication\/slot.h\"\n #include \"replication\/snapbuild.h\"\n #include \"replication\/syncrep.h\"\n-#include \"replication\/slot.h\"\n #include \"replication\/walreceiver.h\"\n #include \"replication\/walsender.h\"\n #include \"replication\/walsender_private.h\"\n"} {"commit":"0c116d8c427cc549ebb58947afe3c60c2317d989","subject":"update factors with values from their respective standard, and add values for reverse transformation (rgb to yuv)","message":"update factors with values from their respective standard, and add values for reverse transformation (rgb to yuv)\n","repos":"descampsa\/yuv2rgb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- yuv_rgb.c\n+++ yuv_rgb.c\n@@ -32,13 +32,29 @@\n \/\/ |G| = 1\/PRECISION_FACTOR * |y_factor u_g_factor v_g_factor| * | U-128 |\n \/\/ |B| |y_factor u_b_factor 0 | | V-128 |\n \n+#define V(value) (value*PRECISION_FACTOR)\n+\n+\/\/ for ITU-T T.871, values can be found in section 7\n+\/\/ for ITU-R BT.601-7 values are derived from equations in sections 2.5.1-2.5.3, assuming RGB is encoded using full range ([0-1]<->[0-255])\n+\/\/ for ITU-R BT.709-6 values are derived from equations in sections 3.2-3.4, assuming RGB is encoded using full range ([0-1]<->[0-255])\n+\/\/ all values are rounded to the fourth decimal\n+\n static const YUV2RGBParam YUV2RGB[3] = {\n-\t\/\/ JPEG\n-\t{.y_shift=0, .y_factor=1.0*PRECISION_FACTOR, .v_r_factor=1.4*PRECISION_FACTOR, .u_g_factor=-0.343*PRECISION_FACTOR, .v_g_factor=-0.711*PRECISION_FACTOR, .u_b_factor=1.765*PRECISION_FACTOR},\n-\t\/\/601\n-\t{.y_shift=16, .y_factor=1.164*PRECISION_FACTOR, .v_r_factor=1.596*PRECISION_FACTOR, .u_g_factor=-0.392*PRECISION_FACTOR, .v_g_factor=-0.813*PRECISION_FACTOR, .u_b_factor=2.017*PRECISION_FACTOR},\n-\t\/\/709\n-\t{.y_shift=16, .y_factor=1.164*PRECISION_FACTOR, .v_r_factor=1.793*PRECISION_FACTOR, .u_g_factor=-0.213*PRECISION_FACTOR, .v_g_factor=-0.533*PRECISION_FACTOR, .u_b_factor=2.112*PRECISION_FACTOR}\n+\t\/\/ ITU-T T.871 (JPEG)\n+\t{.y_shift=0, .y_factor=V(1.0), .v_r_factor=V(1.402), .u_g_factor=V(-0.3441), .v_g_factor=V(-0.7141), .u_b_factor=V(1.772)},\n+\t\/\/ ITU-R BT.601-7\n+\t{.y_shift=16, .y_factor=V(1.1644), .v_r_factor=V(1.596), .u_g_factor=V(-0.3918), .v_g_factor=V(-0.813), .u_b_factor=V(2.0172)},\n+\t\/\/ ITU-R BT.709-6\n+\t{.y_shift=16, .y_factor=V(1.1644), .v_r_factor=V(1.7927), .u_g_factor=V(-0.2132), .v_g_factor=V(-0.5329), .u_b_factor=V(2.1124)}\n+};\n+\n+static const RGB2YUVParam RGB2YUV[3] = {\n+\t\/\/ ITU-T T.871 (JPEG)\n+\t{.y_shift=0, .matrix={{V(0.299), V(0.587), V(0.114)}, {V(-0.1687), V(-0.3313), V(0.5)}, {V(0.5), V(-0.4187), V(-0.0813)}}},\n+\t\/\/ ITU-R BT.601-7\n+\t{.y_shift=16, .matrix={{V(0.2568), V(0.5041), V(0.0979)}, {V(-0.1135), V(-0.291), V(0.4392)}, {V(0.4392), V(-0.3678), V(-0.0714)}}},\n+\t\/\/ ITU-R BT.709-6\n+\t{.y_shift=16, .matrix={{V(0.1826), V(0.6142), V(0.062)}, {V(-0.1006), V(-0.3386), V(0.4392)}, {V(0.4392), V(-0.3989), V(-0.0403)}}}\n };\n \n \/\/ divide by PRECISION_FACTOR and clamp to [0:255] interval\n"} {"commit":"ca778d01e7f0f216bf2a8b0f45952c4c3ef5321a","subject":"Improve error message for rejecting RETURNING clauses with dropped columns.","message":"Improve error message for rejecting RETURNING clauses with dropped columns.\n\nThis error message was written with only ON SELECT rules in mind, but since\nthen we also made RETURNING-clause targetlists go through the same logic.\nThis means that you got a rather off-topic error message if you tried to\nadd a rule with RETURNING to a table having dropped columns. Ideally we'd\njust support that, but some preliminary investigation says that it might be\na significant amount of work. Seeing that Nicklas Av\u00e9n's complaint is the\nfirst one we've gotten about this in the ten years or so that the code's\nbeen like that, I'm unwilling to put much time into it. Instead, improve\nthe error report by issuing a different message for RETURNING cases, and\nrevise the associated comment based on this investigation.\n\nDiscussion: d72f0a5a12ad4e75c8ddc028d6f8bb26283adaf2@jordogskog.no\n","repos":"zeroae\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/backend\/rewrite\/rewriteDefine.c\n+++ src\/backend\/rewrite\/rewriteDefine.c\n@@ -671,17 +671,29 @@\n \t\tattname = NameStr(attr->attname);\n \n \t\t\/*\n-\t\t * Disallow dropped columns in the relation. This won't happen in the\n-\t\t * cases we actually care about (namely creating a view via CREATE\n-\t\t * TABLE then CREATE RULE, or adding a RETURNING rule to a view).\n-\t\t * Trying to cope with it is much more trouble than it's worth,\n-\t\t * because we'd have to modify the rule to insert dummy NULLs at the\n-\t\t * right positions.\n+\t\t * Disallow dropped columns in the relation. This is not really\n+\t\t * expected to happen when creating an ON SELECT rule. It'd be\n+\t\t * possible if someone tried to convert a relation with dropped\n+\t\t * columns to a view, but the only case we care about supporting\n+\t\t * table-to-view conversion for is pg_dump, and pg_dump won't do that.\n+\t\t *\n+\t\t * Unfortunately, the situation is also possible when adding a rule\n+\t\t * with RETURNING to a regular table, and rejecting that case is\n+\t\t * altogether more annoying. In principle we could support it by\n+\t\t * modifying the targetlist to include dummy NULL columns\n+\t\t * corresponding to the dropped columns in the tupdesc. However,\n+\t\t * places like ruleutils.c would have to be fixed to not process such\n+\t\t * entries, and that would take an uncertain and possibly rather large\n+\t\t * amount of work. (Note we could not dodge that by marking the dummy\n+\t\t * columns resjunk, since it's precisely the non-resjunk tlist columns\n+\t\t * that are expected to correspond to table columns.)\n \t\t *\/\n \t\tif (attr->attisdropped)\n \t\t\tereport(ERROR,\n \t\t\t\t\t(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),\n-\t\t\t\t\t errmsg(\"cannot convert relation containing dropped columns to view\")));\n+\t\t\t\t\t isSelect ?\n+\t\t\t\t\t errmsg(\"cannot convert relation containing dropped columns to view\") :\n+\t\t\t\t\t errmsg(\"cannot create a RETURNING list for a relation containing dropped columns\")));\n \n \t\t\/* Check name match if required; no need for two error texts here *\/\n \t\tif (requireColumnNameMatch && strcmp(tle->resname, attname) != 0)\n"} {"commit":"cf65d61aee4d5a2c9b35b33472a803dde015dd35","subject":"Updated device information.","message":"Updated device information.\n","repos":"ProGTX\/sycl-gtx,ProGTX\/sycl-gtx,ProGTX\/sycl-gtx,ProGTX\/sycl-gtx","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sycl-gtx\/implementation\/specification\/info.h\n+++ sycl-gtx\/implementation\/specification\/info.h\n@@ -3,6 +3,7 @@\n \/\/ C. Interface of Memory Object Information Descriptors\n \n #include <CL\/cl.h>\n+#include <type_traits>\n \n namespace cl {\n namespace sycl {\n@@ -29,12 +30,12 @@\n \n \n \/\/ C.3 Device Information Descriptors\n-\/\/ TODO: Add remaining OpenCL values and deal with cases without corresponding OpenCL values\n-\n-using device_fp_config = cl_device_fp_config;\n-using device_exec_capabilities = cl_device_exec_capabilities;\n-using device_queue_properties = cl_command_queue_properties;\n-\n+\n+using device_fp_config\t\t\t= cl_device_fp_config;\n+using device_exec_capabilities\t= cl_device_exec_capabilities;\n+using device_queue_properties\t= cl_command_queue_properties;\n+\n+\/\/ TODO: Host\n enum class device_type : cl_device_type {\n \tcpu\t\t\t= CL_DEVICE_TYPE_CPU,\n \tgpu\t\t\t= CL_DEVICE_TYPE_GPU,\n@@ -121,29 +122,33 @@\n };\n \n enum class device_partition_property : cl_device_partition_property {\n-\tunsupported,\n-\tpartition_equally\t\t\t\t\t\t\t\t= CL_DEVICE_PARTITION_EQUALLY,\n-\tpartition_by_counts\t\t\t\t\t\t\t\t= CL_DEVICE_PARTITION_BY_COUNTS,\n-\tpartition_by_affinity_domain\t\t\t\t\t= CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN,\n-\tpartition_affinity_domain_next_partitionable\n+\tunsupported\t\t\t\t\t\t= 0,\n+\tpartition_equally\t\t\t\t= CL_DEVICE_PARTITION_EQUALLY,\n+\tpartition_by_counts\t\t\t\t= CL_DEVICE_PARTITION_BY_COUNTS,\n+\tpartition_by_affinity_domain\t= CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN\n };\n \n enum class device_affinity_domain : cl_device_affinity_domain {\n-\tunsupported,\n-\tnuma,\n-\tL4_cache,\n-\tL3_cache,\n-\tL2_cache,\n-\tnext_partitionable\n-};\n-\n-enum class device_partition_type : cl_device_partition_property {\n-\tno_partition,\n-\tnuma,\n-\tL4_cache,\n-\tL3_cache,\n-\tL2_cache,\n-\tL1_cache\n+\tunsupported\t\t\t= 0,\n+\tnuma\t\t\t\t= CL_DEVICE_AFFINITY_DOMAIN_NUMA,\n+\tL4_cache\t\t\t= CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE,\n+\tL3_cache\t\t\t= CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE,\n+\tL2_cache\t\t\t= CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE,\n+\tL1_cache\t\t\t= CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE,\n+\tnext_partitionable\t= CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE\n+};\n+\n+namespace detail {\n+using aff_domain_t = std::underlying_type<device_affinity_domain>::type;\n+}\n+\n+enum class device_partition_type : detail::aff_domain_t {\n+\tno_partition\t= 0,\n+\tnuma\t\t\t= (detail::aff_domain_t)device_affinity_domain::numa,\n+\tL4_cache\t\t= (detail::aff_domain_t)device_affinity_domain::L4_cache,\n+\tL3_cache\t\t= (detail::aff_domain_t)device_affinity_domain::L3_cache,\n+\tL2_cache\t\t= (detail::aff_domain_t)device_affinity_domain::L2_cache,\n+\tL1_cache\t\t= (detail::aff_domain_t)device_affinity_domain::L1_cache\n };\n \n enum class local_mem_type : cl_device_local_mem_type {\n@@ -164,14 +169,14 @@\n };\n \n enum class global_mem_cache_type : cl_device_mem_cache_type {\n-\tnone,\n-\tread_only,\n-\twrite_only\n+\tnone\t\t= CL_NONE,\n+\tread_only\t= CL_READ_ONLY_CACHE,\n+\twrite_only\t= CL_READ_WRITE_CACHE\n };\n \n enum class device_execution_capabilities : cl_device_exec_capabilities {\n-\texec_kernel,\n-\texec_native_kernel\n+\texec_kernel\t\t\t= CL_EXEC_KERNEL,\n+\texec_native_kernel\t= CL_EXEC_NATIVE_KERNEL\n };\n \n \n"} {"commit":"5967ce44ff05346321a30ae4cf44ebbc0a82eb20","subject":"Add annotations","message":"Add annotations\n","repos":"RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bsp\/bluetrum\/libraries\/hal_drivers\/drv_flash.c\n+++ bsp\/bluetrum\/libraries\/hal_drivers\/drv_flash.c\n@@ -137,4 +137,4 @@\n MSH_CMD_EXPORT(fal_ops_test, \"fal_ops_test\");\n \n #endif\n-#endif\n+#endif\/* BSP_USING_ON_CHIP_FLASH *\/\n"} {"commit":"282afaf8c8ddd4fe8d854f3d4e8b65223b16d6c3","subject":"move dehnenSmooth back to DehnenBar and make inline","message":"move dehnenSmooth back to DehnenBar and make inline\n","repos":"jobovy\/galpy,followthesheep\/galpy,jobovy\/galpy,followthesheep\/galpy,jobovy\/galpy,jobovy\/galpy,followthesheep\/galpy,followthesheep\/galpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- galpy\/potential_src\/potential_c_ext\/DehnenBarPotential.c\n+++ galpy\/potential_src\/potential_c_ext\/DehnenBarPotential.c\n@@ -2,7 +2,7 @@\n #include <galpy_potentials.h>\n \/\/DehnenBarPotential\n \/\/\n-double dehnenSmooth(double t,double tform, double tsteady){\n+inline double dehnenSmooth(double t,double tform, double tsteady){\n double smooth, xi,deltat;\n if ( t < tform )\n smooth= 0.;\n"} {"commit":"e0a6a3d620a585ca5e9bfd50f98f80b1eada52e4","subject":"Further improved the performance of the contrast adjustment code by enabling nvcc to optimize the broadcast of scalars","message":"Further improved the performance of the contrast adjustment code by\nenabling nvcc to optimize the broadcast of scalars\n","repos":"ppries\/tensorflow,ravindrapanda\/tensorflow,ychfan\/tensorflow,RapidApplicationDevelopment\/tensorflow,eerwitt\/tensorflow,sandeepdsouza93\/TensorFlow-15712,seaotterman\/tensorflow,guschmue\/tensorflow,tillahoffmann\/tensorflow,jwlawson\/tensorflow,neilhan\/tensorflow,laszlocsomor\/tensorflow,snnn\/tensorflow,dendisuhubdy\/tensorflow,4Quant\/tensorflow,davidzchen\/tensorflow,benoitsteiner\/tensorflow,jeffzheng1\/tensorflow,xzturn\/tensorflow,snnn\/tensorflow,petewarden\/tensorflow,benoitsteiner\/tensorflow-xsmm,arborh\/tensorflow,unsiloai\/syntaxnet-ops-hack,ibab\/tensorflow,manazhao\/tf_recsys,Mazecreator\/tensorflow,Xeralux\/tensorflow,AnishShah\/tensorflow,DavidNorman\/tensorflow,eaplatanios\/tensorflow,LUTAN\/tensorflow,aselle\/tensorflow,mrry\/tensorflow,awni\/tensorflow,RapidApplicationDevelopment\/tensorflow,alheinecke\/tensorflow-xsmm,llhe\/tensorflow,HKUST-SING\/tensorflow,tongwang01\/tensorflow,jendap\/tensorflow,xodus7\/tensorflow,hsaputra\/tensorflow,tiagofrepereira2012\/tensorflow,dongjoon-hyun\/tensorflow,snnn\/tensorflow,nolanliou\/tensorflow,gnieboer\/tensorflow,sandeepdsouza93\/TensorFlow-15712,kobejean\/tensorflow,unsiloai\/syntaxnet-ops-hack,benoitsteiner\/tensorflow,MostafaGazar\/tensorflow,RyanYoung25\/tensorflow,sandeepgupta2k4\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,kevin-coder\/tensorflow-fork,Mistobaan\/tensorflow,rabipanda\/tensorflow,alsrgv\/tensorflow,ArtsiomCh\/tensorflow,juharris\/tensorflow,chemelnucfin\/tensorflow,ArtsiomCh\/tensorflow,jhseu\/tensorflow,Mazecreator\/tensorflow,tornadozou\/tensorflow,peterbraden\/tensorflow,Mazecreator\/tensorflow,thjashin\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,martinbede\/second-sight,hsaputra\/tensorflow,hlt-mt\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,krikru\/tensorflow-opencl,XueqingLin\/tensorflow,thesuperzapper\/tensorflow,kevin-coder\/tensorflow-fork,kobejean\/tensorflow,HaebinShin\/tensorflow,ghchinoy\/tensorflow,aldian\/tensorflow,JVillella\/tensorflow,anilmuthineni\/tensorflow,Mistobaan\/tensorflow,HaebinShin\/tensorflow,MycChiu\/tensorflow,adit-chandra\/tensorflow,karllessard\/tensorflow,jart\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,martinwicke\/tensorflow,mortada\/tensorflow,SnakeJenny\/TensorFlow,gautam1858\/tensorflow,johndpope\/tensorflow,4Quant\/tensorflow,mengxn\/tensorflow,Kongsea\/tensorflow,jendap\/tensorflow,alistairlow\/tensorflow,yaroslavvb\/tensorflow,handroissuazo\/tensorflow,vrv\/tensorflow,chenjun0210\/tensorflow,jalexvig\/tensorflow,Intel-tensorflow\/tensorflow,Mazecreator\/tensorflow,jart\/tensorflow,pcm17\/tensorflow,adit-chandra\/tensorflow,girving\/tensorflow,suiyuan2009\/tensorflow,martinwicke\/tensorflow,code-sauce\/tensorflow,dongjoon-hyun\/tensorflow,taknevski\/tensorflow-xsmm,alheinecke\/tensorflow-xsmm,mrry\/tensorflow,suiyuan2009\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,jart\/tensorflow,yanchen036\/tensorflow,scenarios\/tensorflow,petewarden\/tensorflow,whn09\/tensorflow,jeffzheng1\/tensorflow,shreyasva\/tensorflow,lakshayg\/tensorflow,abhitopia\/tensorflow,yaroslavvb\/tensorflow,AnishShah\/tensorflow,shreyasva\/tensorflow,hfp\/tensorflow-xsmm,gautam1858\/tensorflow,yongtang\/tensorflow,alheinecke\/tensorflow-xsmm,jalexvig\/tensorflow,freedomtan\/tensorflow,eadgarchen\/tensorflow,haeusser\/tensorflow,jeffzheng1\/tensorflow,alivecor\/tensorflow,chemelnucfin\/tensorflow,anand-c-goog\/tensorflow,cg31\/tensorflow,snnn\/tensorflow,elingg\/tensorflow,tornadozou\/tensorflow,hlt-mt\/tensorflow,HKUST-SING\/tensorflow,av8ramit\/tensorflow,hsaputra\/tensorflow,naturali\/tensorflow,code-sauce\/tensorflow,paolodedios\/tensorflow,sandeepgupta2k4\/tensorflow,ivano666\/tensorflow,aselle\/tensorflow,ran5515\/DeepDecision,maciekcc\/tensorflow,Intel-tensorflow\/tensorflow,dancingdan\/tensorflow,xzturn\/tensorflow,sandeepdsouza93\/TensorFlow-15712,ZhangXinNan\/tensorflow,adamtiger\/tensorflow,elingg\/tensorflow,eadgarchen\/tensorflow,davidzchen\/tensorflow,jendap\/tensorflow,odejesush\/tensorflow,anilmuthineni\/tensorflow,elingg\/tensorflow,brchiu\/tensorflow,lukeiwanski\/tensorflow,adit-chandra\/tensorflow,ppwwyyxx\/tensorflow,dancingdan\/tensorflow,paolodedios\/tensorflow,annarev\/tensorflow,av8ramit\/tensorflow,ghchinoy\/tensorflow,Bismarrck\/tensorflow,llhe\/tensorflow,seanli9jan\/tensorflow,jendap\/tensorflow,girving\/tensorflow,LUTAN\/tensorflow,dendisuhubdy\/tensorflow,pavelchristof\/gomoku-ai,pcm17\/tensorflow,memo\/tensorflow,ZhangXinNan\/tensorflow,wchan\/tensorflow,RyanYoung25\/tensorflow,bowang\/tensorflow,jendap\/tensorflow,whn09\/tensorflow,Bismarrck\/tensorflow,thesuperzapper\/tensorflow,yufengg\/tensorflow,xzturn\/tensorflow,ArtsiomCh\/tensorflow,MostafaGazar\/tensorflow,tiagofrepereira2012\/tensorflow,MostafaGazar\/tensorflow,jeffzheng1\/tensorflow,calebfoss\/tensorflow,codrut3\/tensorflow,anilmuthineni\/tensorflow,wangyum\/tensorflow,mavenlin\/tensorflow,panmari\/tensorflow,drpngx\/tensorflow,anand-c-goog\/tensorflow,caisq\/tensorflow,jbedorf\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,moonboots\/tensorflow,alsrgv\/tensorflow,handroissuazo\/tensorflow,sarvex\/tensorflow,ageron\/tensorflow,dancingdan\/tensorflow,gunan\/tensorflow,meteorcloudy\/tensorflow,benoitsteiner\/tensorflow,petewarden\/tensorflow,allenlavoie\/tensorflow,mrry\/tensorflow,neilhan\/tensorflow,Moriadry\/tensorflow,with-git\/tensorflow,lukeiwanski\/tensorflow-opencl,jostep\/tensorflow,jalexvig\/tensorflow,MycChiu\/tensorflow,ZhangXinNan\/tensorflow,gojira\/tensorflow,meteorcloudy\/tensorflow,ppwwyyxx\/tensorflow,XueqingLin\/tensorflow,chris-chris\/tensorflow,a-doumoulakis\/tensorflow,Mazecreator\/tensorflow,markslwong\/tensorflow,JingJunYin\/tensorflow,chemelnucfin\/tensorflow,ychfan\/tensorflow,mavenlin\/tensorflow,nanditav\/15712-TensorFlow,manjunaths\/tensorflow,nolanliou\/tensorflow,TakayukiSakai\/tensorflow,ibmsoe\/tensorflow,meteorcloudy\/tensorflow,allenlavoie\/tensorflow,eaplatanios\/tensorflow,laszlocsomor\/tensorflow,aselle\/tensorflow,cancan101\/tensorflow,rdipietro\/tensorflow,nburn42\/tensorflow,pierreg\/tensorflow,ville-k\/tensorflow,kamcpp\/tensorflow,meteorcloudy\/tensorflow,tensorflow\/tensorflow,gunan\/tensorflow,haeusser\/tensorflow,Intel-Corporation\/tensorflow,admcrae\/tensorflow,HKUST-SING\/tensorflow,pavelchristof\/gomoku-ai,kevin-coder\/tensorflow-fork,benoitsteiner\/tensorflow-xsmm,adit-chandra\/tensorflow,theflofly\/tensorflow,elingg\/tensorflow,krikru\/tensorflow-opencl,SnakeJenny\/TensorFlow,hlt-mt\/tensorflow,manjunaths\/tensorflow,ninotoshi\/tensorflow,nightjean\/Deep-Learning,theflofly\/tensorflow,jart\/tensorflow,sandeepdsouza93\/TensorFlow-15712,tomasreimers\/tensorflow-emscripten,allenlavoie\/tensorflow,andrewcmyers\/tensorflow,apark263\/tensorflow,jwlawson\/tensorflow,dhalleine\/tensorflow,allenlavoie\/tensorflow,ppwwyyxx\/tensorflow,Mistobaan\/tensorflow,guschmue\/tensorflow,SnakeJenny\/TensorFlow,JinXinDeep\/tensorflow,tornadozou\/tensorflow,Carmezim\/tensorflow,odejesush\/tensorflow,XueqingLin\/tensorflow,snnn\/tensorflow,JingJunYin\/tensorflow,MostafaGazar\/tensorflow,seaotterman\/tensorflow,aam-at\/tensorflow,Intel-Corporation\/tensorflow,krikru\/tensorflow-opencl,manipopopo\/tensorflow,moonboots\/tensorflow,LUTAN\/tensorflow,renyi533\/tensorflow,dyoung418\/tensorflow,dendisuhubdy\/tensorflow,Kongsea\/tensorflow,DavidNorman\/tensorflow,code-sauce\/tensorflow,rabipanda\/tensorflow,eerwitt\/tensorflow,aselle\/tensorflow,benoitsteiner\/tensorflow-opencl,jbedorf\/tensorflow,hfp\/tensorflow-xsmm,av8ramit\/tensorflow,whn09\/tensorflow,arborh\/tensorflow,ageron\/tensorflow,llhe\/tensorflow,aselle\/tensorflow,sjperkins\/tensorflow,laszlocsomor\/tensorflow,XueqingLin\/tensorflow,theflofly\/tensorflow,dongjoon-hyun\/tensorflow,freedomtan\/tensorflow,cg31\/tensorflow,ville-k\/tensorflow,HaebinShin\/tensorflow,kchodorow\/tensorflow,arborh\/tensorflow,yongtang\/tensorflow,ychfan\/tensorflow,alheinecke\/tensorflow-xsmm,Kongsea\/tensorflow,cg31\/tensorflow,snnn\/tensorflow,JingJunYin\/tensorflow,MycChiu\/tensorflow,abhitopia\/tensorflow,with-git\/tensorflow,mixturemodel-flow\/tensorflow,anand-c-goog\/tensorflow,asadziach\/tensorflow,alivecor\/tensorflow,meteorcloudy\/tensorflow,theflofly\/tensorflow,Kongsea\/tensorflow,cxxgtxy\/tensorflow,mixturemodel-flow\/tensorflow,hfp\/tensorflow-xsmm,unsiloai\/syntaxnet-ops-hack,jeffzheng1\/tensorflow,chemelnucfin\/tensorflow,Bulochkin\/tensorflow_pack,martinwicke\/tensorflow,sandeepdsouza93\/TensorFlow-15712,pierreg\/tensorflow,lukeiwanski\/tensorflow,Bismarrck\/tensorflow,vrv\/tensorflow,haeusser\/tensorflow,kamcpp\/tensorflow,mrry\/tensorflow,tomasreimers\/tensorflow-emscripten,hlt-mt\/tensorflow,ninotoshi\/tensorflow,thjashin\/tensorflow,nanditav\/15712-TensorFlow,tiagofrepereira2012\/tensorflow,elingg\/tensorflow,EvenStrangest\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,meteorcloudy\/tensorflow,yaroslavvb\/tensorflow,Mistobaan\/tensorflow,llhe\/tensorflow,nolanliou\/tensorflow,davidzchen\/tensorflow,kchodorow\/tensorflow,sjperkins\/tensorflow,renyi533\/tensorflow,alivecor\/tensorflow,DCSaunders\/tensorflow,RyanYoung25\/tensorflow,ArtsiomCh\/tensorflow,xodus7\/tensorflow,jostep\/tensorflow,peterbraden\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,laosiaudi\/tensorflow,sjperkins\/tensorflow,Bulochkin\/tensorflow_pack,juharris\/tensorflow,wchan\/tensorflow,jart\/tensorflow,AndreasMadsen\/tensorflow,nanditav\/15712-TensorFlow,jwlawson\/tensorflow,nikste\/tensorflow,ishay2b\/tensorflow,juharris\/tensorflow,tomasreimers\/tensorflow-emscripten,alheinecke\/tensorflow-xsmm,horance-liu\/tensorflow,manipopopo\/tensorflow,karllessard\/tensorflow,haeusser\/tensorflow,odejesush\/tensorflow,cxxgtxy\/tensorflow,jhseu\/tensorflow,gibiansky\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,memo\/tensorflow,manjunaths\/tensorflow,naturali\/tensorflow,allenlavoie\/tensorflow,alisidd\/tensorflow,calebfoss\/tensorflow,wangyum\/tensorflow,aldian\/tensorflow,xodus7\/tensorflow,jbedorf\/tensorflow,Bismarrck\/tensorflow,Xeralux\/tensorflow,ibmsoe\/tensorflow,seanli9jan\/tensorflow,HKUST-SING\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,rabipanda\/tensorflow,moonboots\/tensorflow,tongwang01\/tensorflow,krikru\/tensorflow-opencl,rdipietro\/tensorflow,ghchinoy\/tensorflow,tillahoffmann\/tensorflow,alsrgv\/tensorflow,ran5515\/DeepDecision,asimshankar\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,naturali\/tensorflow,gautam1858\/tensorflow,bowang\/tensorflow,ppries\/tensorflow,yongtang\/tensorflow,JingJunYin\/tensorflow,meteorcloudy\/tensorflow,cg31\/tensorflow,a-doumoulakis\/tensorflow,AnishShah\/tensorflow,alivecor\/tensorflow,xodus7\/tensorflow,renyi533\/tensorflow,vrv\/tensorflow,yaroslavvb\/tensorflow,mdrumond\/tensorflow,mortada\/tensorflow,dancingdan\/tensorflow,admcrae\/tensorflow,tornadozou\/tensorflow,DCSaunders\/tensorflow,guschmue\/tensorflow,dhalleine\/tensorflow,guschmue\/tensorflow,seaotterman\/tensorflow,lukeiwanski\/tensorflow,cg31\/tensorflow,jwlawson\/tensorflow,tornadozou\/tensorflow,handroissuazo\/tensorflow,tensorflow\/tensorflow,manjunaths\/tensorflow,eaplatanios\/tensorflow,zycdragonball\/tensorflow,Mistobaan\/tensorflow,alshedivat\/tensorflow,JinXinDeep\/tensorflow,ageron\/tensorflow,vrv\/tensorflow,ville-k\/tensorflow,pavelchristof\/gomoku-ai,RapidApplicationDevelopment\/tensorflow,hsaputra\/tensorflow,eerwitt\/tensorflow,benoitsteiner\/tensorflow,dendisuhubdy\/tensorflow,ghchinoy\/tensorflow,yaroslavvb\/tensorflow,whn09\/tensorflow,mdrumond\/tensorflow,codrut3\/tensorflow,ibab\/tensorflow,handroissuazo\/tensorflow,aam-at\/tensorflow,aselle\/tensorflow,brchiu\/tensorflow,kevin-coder\/tensorflow-fork,a-doumoulakis\/tensorflow,laosiaudi\/tensorflow,LUTAN\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,adamtiger\/tensorflow,SnakeJenny\/TensorFlow,ageron\/tensorflow,tomasreimers\/tensorflow-emscripten,scenarios\/tensorflow,jostep\/tensorflow,tntnatbry\/tensorflow,asimshankar\/tensorflow,arborh\/tensorflow,Bulochkin\/tensorflow_pack,manjunaths\/tensorflow,MostafaGazar\/tensorflow,yufengg\/tensorflow,kamcpp\/tensorflow,yongtang\/tensorflow,gunan\/tensorflow,martinbede\/second-sight,neilhan\/tensorflow,xzturn\/tensorflow,EvenStrangest\/tensorflow,mrry\/tensorflow,Moriadry\/tensorflow,dhalleine\/tensorflow,lukeiwanski\/tensorflow-opencl,yufengg\/tensorflow,AndreasMadsen\/tensorflow,RapidApplicationDevelopment\/tensorflow,4Quant\/tensorflow,thjashin\/tensorflow,anilmuthineni\/tensorflow,ageron\/tensorflow,dongjoon-hyun\/tensorflow,neilhan\/tensorflow,allenlavoie\/tensorflow,drpngx\/tensorflow,hsaputra\/tensorflow,ppwwyyxx\/tensorflow,Xeralux\/tensorflow,Xeralux\/tensorflow,4Quant\/tensorflow,abhitopia\/tensorflow,DavidNorman\/tensorflow,dyoung418\/tensorflow,rdipietro\/tensorflow,yongtang\/tensorflow,sjperkins\/tensorflow,chris-chris\/tensorflow,raymondxyang\/tensorflow,Xeralux\/tensorflow,benoitsteiner\/tensorflow,av8ramit\/tensorflow,raymondxyang\/tensorflow,TakayukiSakai\/tensorflow,cxxgtxy\/tensorflow,DCSaunders\/tensorflow,LUTAN\/tensorflow,apark263\/tensorflow,strint\/tensorflow,frreiss\/tensorflow-fred,ishay2b\/tensorflow,ibmsoe\/tensorflow,eerwitt\/tensorflow,mdrumond\/tensorflow,suiyuan2009\/tensorflow,benoitsteiner\/tensorflow-opencl,eerwitt\/tensorflow,frreiss\/tensorflow-fred,alivecor\/tensorflow,ArtsiomCh\/tensorflow,nburn42\/tensorflow,paolodedios\/tensorflow,awni\/tensorflow,aselle\/tensorflow,gojira\/tensorflow,eerwitt\/tensorflow,juharris\/tensorflow,Intel-tensorflow\/tensorflow,seaotterman\/tensorflow,gautam1858\/tensorflow,jalexvig\/tensorflow,dyoung418\/tensorflow,strint\/tensorflow,zasdfgbnm\/tensorflow,panmari\/tensorflow,horance-liu\/tensorflow,xzturn\/tensorflow,benoitsteiner\/tensorflow-xsmm,tiagofrepereira2012\/tensorflow,jalexvig\/tensorflow,ychfan\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,ninotoshi\/tensorflow,frreiss\/tensorflow-fred,ibmsoe\/tensorflow,ville-k\/tensorflow,sandeepgupta2k4\/tensorflow,gautam1858\/tensorflow,anand-c-goog\/tensorflow,alistairlow\/tensorflow,jeffzheng1\/tensorflow,DCSaunders\/tensorflow,JVillella\/tensorflow,JinXinDeep\/tensorflow,apark263\/tensorflow,lukeiwanski\/tensorflow-opencl,JinXinDeep\/tensorflow,arborh\/tensorflow,kobejean\/tensorflow,alisidd\/tensorflow,cancan101\/tensorflow,ghchinoy\/tensorflow,eadgarchen\/tensorflow,karllessard\/tensorflow,aam-at\/tensorflow,ppries\/tensorflow,chenjun0210\/tensorflow,ran5515\/DeepDecision,chris-chris\/tensorflow,lakshayg\/tensorflow,whn09\/tensorflow,yanchen036\/tensorflow,JVillella\/tensorflow,with-git\/tensorflow,llhe\/tensorflow,andrewcmyers\/tensorflow,AndreasMadsen\/tensorflow,freedomtan\/tensorflow,tntnatbry\/tensorflow,ychfan\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,adit-chandra\/tensorflow,gautam1858\/tensorflow,kevin-coder\/tensorflow-fork,aselle\/tensorflow,jwlawson\/tensorflow,juharris\/tensorflow,annarev\/tensorflow,alshedivat\/tensorflow,pcm17\/tensorflow,dongjoon-hyun\/tensorflow,lukeiwanski\/tensorflow-opencl,ppries\/tensorflow,renyi533\/tensorflow,lukeiwanski\/tensorflow,annarev\/tensorflow,memo\/tensorflow,manipopopo\/tensorflow,laosiaudi\/tensorflow,pierreg\/tensorflow,dendisuhubdy\/tensorflow,caisq\/tensorflow,drpngx\/tensorflow,eerwitt\/tensorflow,SnakeJenny\/TensorFlow,anilmuthineni\/tensorflow,manipopopo\/tensorflow,alivecor\/tensorflow,jbedorf\/tensorflow,paolodedios\/tensorflow,johndpope\/tensorflow,alisidd\/tensorflow,lukeiwanski\/tensorflow-opencl,gnieboer\/tensorflow,jostep\/tensorflow,martinbede\/second-sight,haeusser\/tensorflow,sarvex\/tensorflow,code-sauce\/tensorflow,ravindrapanda\/tensorflow,RapidApplicationDevelopment\/tensorflow,renyi533\/tensorflow,chemelnucfin\/tensorflow,seaotterman\/tensorflow,HKUST-SING\/tensorflow,ghchinoy\/tensorflow,jalexvig\/tensorflow,hfp\/tensorflow-xsmm,hehongliang\/tensorflow,manipopopo\/tensorflow,awni\/tensorflow,ppries\/tensorflow,lukas-krecan\/tensorflow,benoitsteiner\/tensorflow-opencl,ArtsiomCh\/tensorflow,xzturn\/tensorflow,naturali\/tensorflow,unsiloai\/syntaxnet-ops-hack,bowang\/tensorflow,thjashin\/tensorflow,taknevski\/tensorflow-xsmm,HaebinShin\/tensorflow,tensorflow\/tensorflow,Intel-Corporation\/tensorflow,apark263\/tensorflow,cxxgtxy\/tensorflow,lakshayg\/tensorflow,laszlocsomor\/tensorflow,lukeiwanski\/tensorflow,yanchen036\/tensorflow,ychfan\/tensorflow,ppwwyyxx\/tensorflow,laosiaudi\/tensorflow,laosiaudi\/tensorflow,hehongliang\/tensorflow,ville-k\/tensorflow,anilmuthineni\/tensorflow,DCSaunders\/tensorflow,tntnatbry\/tensorflow,ZhangXinNan\/tensorflow,karllessard\/tensorflow,gojira\/tensorflow,alheinecke\/tensorflow-xsmm,hsaputra\/tensorflow,eadgarchen\/tensorflow,codrut3\/tensorflow,krikru\/tensorflow-opencl,ArtsiomCh\/tensorflow,apark263\/tensorflow,ravindrapanda\/tensorflow,guschmue\/tensorflow,martinbede\/second-sight,martinbede\/second-sight,petewarden\/tensorflow_makefile,HaebinShin\/tensorflow,tongwang01\/tensorflow,peterbraden\/tensorflow,yongtang\/tensorflow,code-sauce\/tensorflow,ibmsoe\/tensorflow,admcrae\/tensorflow,martinwicke\/tensorflow,EvenStrangest\/tensorflow,ArtsiomCh\/tensorflow,tongwang01\/tensorflow,cancan101\/tensorflow,girving\/tensorflow,rdipietro\/tensorflow,strint\/tensorflow,ppwwyyxx\/tensorflow,mengxn\/tensorflow,tomasreimers\/tensorflow-emscripten,kamcpp\/tensorflow,gojira\/tensorflow,rdipietro\/tensorflow,yanchen036\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,brchiu\/tensorflow,hsaputra\/tensorflow,hfp\/tensorflow-xsmm,ppwwyyxx\/tensorflow,lukas-krecan\/tensorflow,mdrumond\/tensorflow,girving\/tensorflow,lukeiwanski\/tensorflow-opencl,arborh\/tensorflow,Bismarrck\/tensorflow,maciekcc\/tensorflow,sandeepgupta2k4\/tensorflow,kchodorow\/tensorflow,scenarios\/tensorflow,abhitopia\/tensorflow,kevin-coder\/tensorflow-fork,ZhangXinNan\/tensorflow,rdipietro\/tensorflow,yaroslavvb\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,odejesush\/tensorflow,mengxn\/tensorflow,AnishShah\/tensorflow,JingJunYin\/tensorflow,DavidNorman\/tensorflow,gibiansky\/tensorflow,raymondxyang\/tensorflow,kevin-coder\/tensorflow-fork,dongjoon-hyun\/tensorflow,kobejean\/tensorflow,zasdfgbnm\/tensorflow,dongjoon-hyun\/tensorflow,benoitsteiner\/tensorflow-opencl,unsiloai\/syntaxnet-ops-hack,dancingdan\/tensorflow,nikste\/tensorflow,andrewcmyers\/tensorflow,xzturn\/tensorflow,gibiansky\/tensorflow,JVillella\/tensorflow,jhaux\/tensorflow,chenjun0210\/tensorflow,adit-chandra\/tensorflow,mavenlin\/tensorflow,whn09\/tensorflow,lakshayg\/tensorflow,Bismarrck\/tensorflow,admcrae\/tensorflow,MycChiu\/tensorflow,cancan101\/tensorflow,awni\/tensorflow,yufengg\/tensorflow,kchodorow\/tensorflow,alsrgv\/tensorflow,MycChiu\/tensorflow,moonboots\/tensorflow,martinwicke\/tensorflow,raymondxyang\/tensorflow,av8ramit\/tensorflow,theflofly\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,unsiloai\/syntaxnet-ops-hack,theflofly\/tensorflow,zasdfgbnm\/tensorflow,nburn42\/tensorflow,moonboots\/tensorflow,pierreg\/tensorflow,DavidNorman\/tensorflow,eerwitt\/tensorflow,ravindrapanda\/tensorflow,handroissuazo\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,nikste\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,freedomtan\/tensorflow,elingg\/tensorflow,jwlawson\/tensorflow,Xeralux\/tensorflow,Kongsea\/tensorflow,karllessard\/tensorflow,alshedivat\/tensorflow,lukeiwanski\/tensorflow-opencl,freedomtan\/tensorflow,tntnatbry\/tensorflow,chenjun0210\/tensorflow,brchiu\/tensorflow,alshedivat\/tensorflow,jart\/tensorflow,strint\/tensorflow,ran5515\/DeepDecision,adamtiger\/tensorflow,ghchinoy\/tensorflow,rabipanda\/tensorflow,nburn42\/tensorflow,strint\/tensorflow,cg31\/tensorflow,Carmezim\/tensorflow,kchodorow\/tensorflow,ibmsoe\/tensorflow,kobejean\/tensorflow,pcm17\/tensorflow,johndpope\/tensorflow,karllessard\/tensorflow,manjunaths\/tensorflow,lukas-krecan\/tensorflow,RyanYoung25\/tensorflow,AnishShah\/tensorflow,AnishShah\/tensorflow,renyi533\/tensorflow,pierreg\/tensorflow,caisq\/tensorflow,asimshankar\/tensorflow,girving\/tensorflow,handroissuazo\/tensorflow,sjperkins\/tensorflow,jbedorf\/tensorflow,kevin-coder\/tensorflow-fork,ageron\/tensorflow,apark263\/tensorflow,naturali\/tensorflow,petewarden\/tensorflow,hehongliang\/tensorflow,eaplatanios\/tensorflow,gunan\/tensorflow,eaplatanios\/tensorflow,ravindrapanda\/tensorflow,thesuperzapper\/tensorflow,jhaux\/tensorflow,petewarden\/tensorflow,wangyum\/tensorflow,mavenlin\/tensorflow,hlt-mt\/tensorflow,scenarios\/tensorflow,adit-chandra\/tensorflow,jendap\/tensorflow,rabipanda\/tensorflow,vrv\/tensorflow,seanli9jan\/tensorflow,JingJunYin\/tensorflow,asimshankar\/tensorflow,dendisuhubdy\/tensorflow,kamcpp\/tensorflow,mdrumond\/tensorflow,Bismarrck\/tensorflow,wangyum\/tensorflow,dendisuhubdy\/tensorflow,yaroslavvb\/tensorflow,lukas-krecan\/tensorflow,DavidNorman\/tensorflow,pavelchristof\/gomoku-ai,chemelnucfin\/tensorflow,alisidd\/tensorflow,zasdfgbnm\/tensorflow,snnn\/tensorflow,benoitsteiner\/tensorflow-opencl,sarvex\/tensorflow,guschmue\/tensorflow,gibiansky\/tensorflow,lukeiwanski\/tensorflow,davidzchen\/tensorflow,suiyuan2009\/tensorflow,TakayukiSakai\/tensorflow,davidzchen\/tensorflow,freedomtan\/tensorflow,llhe\/tensorflow,hsaputra\/tensorflow,ibmsoe\/tensorflow,hfp\/tensorflow-xsmm,petewarden\/tensorflow_makefile,dhalleine\/tensorflow,markslwong\/tensorflow,panmari\/tensorflow,alheinecke\/tensorflow-xsmm,tensorflow\/tensorflow-experimental_link_static_libraries_once,chenjun0210\/tensorflow,horance-liu\/tensorflow,ghchinoy\/tensorflow,abhitopia\/tensorflow,mengxn\/tensorflow,jostep\/tensorflow,mortada\/tensorflow,EvenStrangest\/tensorflow,Bulochkin\/tensorflow_pack,ychfan\/tensorflow,yanchen036\/tensorflow,krikru\/tensorflow-opencl,nikste\/tensorflow,manazhao\/tf_recsys,ivano666\/tensorflow,nanditav\/15712-TensorFlow,ibab\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,jwlawson\/tensorflow,davidzchen\/tensorflow,gunan\/tensorflow,manazhao\/tf_recsys,yaroslavvb\/tensorflow,Intel-Corporation\/tensorflow,AndreasMadsen\/tensorflow,alsrgv\/tensorflow,petewarden\/tensorflow_makefile,ghchinoy\/tensorflow,nanditav\/15712-TensorFlow,manipopopo\/tensorflow,sjperkins\/tensorflow,allenlavoie\/tensorflow,ibab\/tensorflow,xodus7\/tensorflow,aldian\/tensorflow,gojira\/tensorflow,ishay2b\/tensorflow,jostep\/tensorflow,SnakeJenny\/TensorFlow,horance-liu\/tensorflow,asimshankar\/tensorflow,dyoung418\/tensorflow,jostep\/tensorflow,nikste\/tensorflow,elingg\/tensorflow,gnieboer\/tensorflow,horance-liu\/tensorflow,ishay2b\/tensorflow,dyoung418\/tensorflow,kobejean\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,ageron\/tensorflow,dancingdan\/tensorflow,strint\/tensorflow,panmari\/tensorflow,thjashin\/tensorflow,petewarden\/tensorflow_makefile,admcrae\/tensorflow,alistairlow\/tensorflow,cxxgtxy\/tensorflow,gojira\/tensorflow,ageron\/tensorflow,aam-at\/tensorflow,Mistobaan\/tensorflow,xodus7\/tensorflow,a-doumoulakis\/tensorflow,llhe\/tensorflow,chenjun0210\/tensorflow,eadgarchen\/tensorflow,Intel-tensorflow\/tensorflow,moonboots\/tensorflow,apark263\/tensorflow,paolodedios\/tensorflow,ivano666\/tensorflow,Mazecreator\/tensorflow,gautam1858\/tensorflow,petewarden\/tensorflow,dongjoon-hyun\/tensorflow,Carmezim\/tensorflow,nightjean\/Deep-Learning,caisq\/tensorflow,abhitopia\/tensorflow,memo\/tensorflow,Bismarrck\/tensorflow,handroissuazo\/tensorflow,wchan\/tensorflow,DCSaunders\/tensorflow,kobejean\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,hsaputra\/tensorflow,brchiu\/tensorflow,meteorcloudy\/tensorflow,dyoung418\/tensorflow,mixturemodel-flow\/tensorflow,AndreasMadsen\/tensorflow,gibiansky\/tensorflow,tillahoffmann\/tensorflow,mengxn\/tensorflow,Bulochkin\/tensorflow_pack,ville-k\/tensorflow,benoitsteiner\/tensorflow-xsmm,laszlocsomor\/tensorflow,yufengg\/tensorflow,jhseu\/tensorflow,chris-chris\/tensorflow,asadziach\/tensorflow,gautam1858\/tensorflow,jbedorf\/tensorflow,chemelnucfin\/tensorflow,pierreg\/tensorflow,renyi533\/tensorflow,eaplatanios\/tensorflow,paolodedios\/tensorflow,RyanYoung25\/tensorflow,asimshankar\/tensorflow,asimshankar\/tensorflow,markslwong\/tensorflow,seanli9jan\/tensorflow,peterbraden\/tensorflow,lukas-krecan\/tensorflow,gunan\/tensorflow,alsrgv\/tensorflow,karllessard\/tensorflow,bowang\/tensorflow,taknevski\/tensorflow-xsmm,manazhao\/tf_recsys,martinbede\/second-sight,ivano666\/tensorflow,xzturn\/tensorflow,calebfoss\/tensorflow,annarev\/tensorflow,nburn42\/tensorflow,drpngx\/tensorflow,yaroslavvb\/tensorflow,yongtang\/tensorflow,adit-chandra\/tensorflow,kchodorow\/tensorflow,ibab\/tensorflow,taknevski\/tensorflow-xsmm,tornadozou\/tensorflow,theflofly\/tensorflow,petewarden\/tensorflow,ibmsoe\/tensorflow,jhaux\/tensorflow,alshedivat\/tensorflow,krikru\/tensorflow-opencl,dyoung418\/tensorflow,aam-at\/tensorflow,suiyuan2009\/tensorflow,andrewcmyers\/tensorflow,admcrae\/tensorflow,juharris\/tensorflow,sarvex\/tensorflow,sjperkins\/tensorflow,xodus7\/tensorflow,maciekcc\/tensorflow,aam-at\/tensorflow,whn09\/tensorflow,jalexvig\/tensorflow,dyoung418\/tensorflow,taknevski\/tensorflow-xsmm,DavidNorman\/tensorflow,Mistobaan\/tensorflow,jhseu\/tensorflow,martinwicke\/tensorflow,gunan\/tensorflow,aam-at\/tensorflow,snnn\/tensorflow,ninotoshi\/tensorflow,whn09\/tensorflow,awni\/tensorflow,DavidNorman\/tensorflow,EvenStrangest\/tensorflow,tongwang01\/tensorflow,jart\/tensorflow,sarvex\/tensorflow,alivecor\/tensorflow,ninotoshi\/tensorflow,asadziach\/tensorflow,Mazecreator\/tensorflow,av8ramit\/tensorflow,JinXinDeep\/tensorflow,frreiss\/tensorflow-fred,MoamerEncsConcordiaCa\/tensorflow,panmari\/tensorflow,alheinecke\/tensorflow-xsmm,eaplatanios\/tensorflow,pavelchristof\/gomoku-ai,johndpope\/tensorflow,tillahoffmann\/tensorflow,theflofly\/tensorflow,petewarden\/tensorflow_makefile,TakayukiSakai\/tensorflow,ZhangXinNan\/tensorflow,apark263\/tensorflow,Kongsea\/tensorflow,allenlavoie\/tensorflow,code-sauce\/tensorflow,with-git\/tensorflow,calebfoss\/tensorflow,xzturn\/tensorflow,davidzchen\/tensorflow,mdrumond\/tensorflow,Intel-tensorflow\/tensorflow,Carmezim\/tensorflow,awni\/tensorflow,gnieboer\/tensorflow,mortada\/tensorflow,Carmezim\/tensorflow,code-sauce\/tensorflow,markslwong\/tensorflow,manipopopo\/tensorflow,nightjean\/Deep-Learning,brchiu\/tensorflow,Moriadry\/tensorflow,wchan\/tensorflow,hfp\/tensorflow-xsmm,suiyuan2009\/tensorflow,anilmuthineni\/tensorflow,nburn42\/tensorflow,eadgarchen\/tensorflow,adamtiger\/tensorflow,gibiansky\/tensorflow,dhalleine\/tensorflow,llhe\/tensorflow,sandeepdsouza93\/TensorFlow-15712,DCSaunders\/tensorflow,martinwicke\/tensorflow,jendap\/tensorflow,hehongliang\/tensorflow,jalexvig\/tensorflow,peterbraden\/tensorflow,anand-c-goog\/tensorflow,pierreg\/tensorflow,sandeepdsouza93\/TensorFlow-15712,RapidApplicationDevelopment\/tensorflow,frreiss\/tensorflow-fred,LUTAN\/tensorflow,asadziach\/tensorflow,pcm17\/tensorflow,Intel-Corporation\/tensorflow,tensorflow\/tensorflow,zasdfgbnm\/tensorflow,adit-chandra\/tensorflow,av8ramit\/tensorflow,codrut3\/tensorflow,karllessard\/tensorflow,zycdragonball\/tensorflow,xodus7\/tensorflow,petewarden\/tensorflow,nolanliou\/tensorflow,ppries\/tensorflow,petewarden\/tensorflow_makefile,thesuperzapper\/tensorflow,rabipanda\/tensorflow,JingJunYin\/tensorflow,thesuperzapper\/tensorflow,Xeralux\/tensorflow,Xeralux\/tensorflow,mortada\/tensorflow,yongtang\/tensorflow,zycdragonball\/tensorflow,AndreasMadsen\/tensorflow,aldian\/tensorflow,paolodedios\/tensorflow,seanli9jan\/tensorflow,markslwong\/tensorflow,asimshankar\/tensorflow,manazhao\/tf_recsys,XueqingLin\/tensorflow,nolanliou\/tensorflow,mixturemodel-flow\/tensorflow,mengxn\/tensorflow,Bismarrck\/tensorflow,haeusser\/tensorflow,manjunaths\/tensorflow,MycChiu\/tensorflow,JinXinDeep\/tensorflow,ravindrapanda\/tensorflow,alshedivat\/tensorflow,markslwong\/tensorflow,suiyuan2009\/tensorflow,jhaux\/tensorflow,jwlawson\/tensorflow,kamcpp\/tensorflow,wangyum\/tensorflow,davidzchen\/tensorflow,tntnatbry\/tensorflow,apark263\/tensorflow,andrewcmyers\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tiagofrepereira2012\/tensorflow,tntnatbry\/tensorflow,thjashin\/tensorflow,Bulochkin\/tensorflow_pack,kchodorow\/tensorflow,sjperkins\/tensorflow,thjashin\/tensorflow,kamcpp\/tensorflow,mengxn\/tensorflow,admcrae\/tensorflow,benoitsteiner\/tensorflow-xsmm,apark263\/tensorflow,jeffzheng1\/tensorflow,ravindrapanda\/tensorflow,benoitsteiner\/tensorflow,SnakeJenny\/TensorFlow,mavenlin\/tensorflow,alistairlow\/tensorflow,theflofly\/tensorflow,kchodorow\/tensorflow,mrry\/tensorflow,seanli9jan\/tensorflow,mortada\/tensorflow,cancan101\/tensorflow,xodus7\/tensorflow,ivano666\/tensorflow,LUTAN\/tensorflow,arborh\/tensorflow,chris-chris\/tensorflow,seanli9jan\/tensorflow,lakshayg\/tensorflow,jhseu\/tensorflow,aam-at\/tensorflow,theflofly\/tensorflow,petewarden\/tensorflow,lukeiwanski\/tensorflow-opencl,arborh\/tensorflow,nolanliou\/tensorflow,peterbraden\/tensorflow,ninotoshi\/tensorflow,wangyum\/tensorflow,jhaux\/tensorflow,andrewcmyers\/tensorflow,rabipanda\/tensorflow,benoitsteiner\/tensorflow-xsmm,frreiss\/tensorflow-fred,tntnatbry\/tensorflow,llhe\/tensorflow,hsaputra\/tensorflow,paolodedios\/tensorflow,tntnatbry\/tensorflow,abhitopia\/tensorflow,annarev\/tensorflow,alistairlow\/tensorflow,meteorcloudy\/tensorflow,zasdfgbnm\/tensorflow,nburn42\/tensorflow,chemelnucfin\/tensorflow,maciekcc\/tensorflow,with-git\/tensorflow,HKUST-SING\/tensorflow,kobejean\/tensorflow,cxxgtxy\/tensorflow,aselle\/tensorflow,kevin-coder\/tensorflow-fork,lukeiwanski\/tensorflow,odejesush\/tensorflow,tongwang01\/tensorflow,nightjean\/Deep-Learning,sarvex\/tensorflow,seanli9jan\/tensorflow,Bulochkin\/tensorflow_pack,whn09\/tensorflow,asimshankar\/tensorflow,Bismarrck\/tensorflow,a-doumoulakis\/tensorflow,gunan\/tensorflow,hlt-mt\/tensorflow,tillahoffmann\/tensorflow,haeusser\/tensorflow,zasdfgbnm\/tensorflow,horance-liu\/tensorflow,adit-chandra\/tensorflow,DavidNorman\/tensorflow,ibab\/tensorflow,gunan\/tensorflow,cancan101\/tensorflow,apark263\/tensorflow,odejesush\/tensorflow,gnieboer\/tensorflow,Carmezim\/tensorflow,sandeepgupta2k4\/tensorflow,Moriadry\/tensorflow,gunan\/tensorflow,vrv\/tensorflow,jostep\/tensorflow,a-doumoulakis\/tensorflow,chemelnucfin\/tensorflow,sandeepdsouza93\/TensorFlow-15712,seanli9jan\/tensorflow,SnakeJenny\/TensorFlow,mortada\/tensorflow,caisq\/tensorflow,seaotterman\/tensorflow,nightjean\/Deep-Learning,gnieboer\/tensorflow,shreyasva\/tensorflow,hfp\/tensorflow-xsmm,dongjoon-hyun\/tensorflow,tomasreimers\/tensorflow-emscripten,elingg\/tensorflow,anand-c-goog\/tensorflow,AndreasMadsen\/tensorflow,tongwang01\/tensorflow,benoitsteiner\/tensorflow-opencl,panmari\/tensorflow,raymondxyang\/tensorflow,alisidd\/tensorflow,alistairlow\/tensorflow,jendap\/tensorflow,ZhangXinNan\/tensorflow,frreiss\/tensorflow-fred,Intel-tensorflow\/tensorflow,meteorcloudy\/tensorflow,laszlocsomor\/tensorflow,caisq\/tensorflow,wangyum\/tensorflow,jeffzheng1\/tensorflow,rabipanda\/tensorflow,nanditav\/15712-TensorFlow,HaebinShin\/tensorflow,guschmue\/tensorflow,jalexvig\/tensorflow,cxxgtxy\/tensorflow,codrut3\/tensorflow,ZhangXinNan\/tensorflow,llhe\/tensorflow,JingJunYin\/tensorflow,RyanYoung25\/tensorflow,martinwicke\/tensorflow,4Quant\/tensorflow,ageron\/tensorflow,lukas-krecan\/tensorflow,aldian\/tensorflow,nburn42\/tensorflow,rabipanda\/tensorflow,renyi533\/tensorflow,wchan\/tensorflow,neilhan\/tensorflow,tomasreimers\/tensorflow-emscripten,benoitsteiner\/tensorflow,tensorflow\/tensorflow,davidzchen\/tensorflow,ppwwyyxx\/tensorflow,petewarden\/tensorflow,drpngx\/tensorflow,sandeepdsouza93\/TensorFlow-15712,calebfoss\/tensorflow,strint\/tensorflow,lakshayg\/tensorflow,Bulochkin\/tensorflow_pack,jbedorf\/tensorflow,mixturemodel-flow\/tensorflow,alivecor\/tensorflow,tomasreimers\/tensorflow-emscripten,Intel-Corporation\/tensorflow,Intel-tensorflow\/tensorflow,adamtiger\/tensorflow,Carmezim\/tensorflow,benoitsteiner\/tensorflow-xsmm,av8ramit\/tensorflow,peterbraden\/tensorflow,annarev\/tensorflow,taknevski\/tensorflow-xsmm,alistairlow\/tensorflow,nikste\/tensorflow,taknevski\/tensorflow-xsmm,mengxn\/tensorflow,HKUST-SING\/tensorflow,codrut3\/tensorflow,hehongliang\/tensorflow,odejesush\/tensorflow,eaplatanios\/tensorflow,ychfan\/tensorflow,alsrgv\/tensorflow,jhseu\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,vrv\/tensorflow,renyi533\/tensorflow,bowang\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,sarvex\/tensorflow,petewarden\/tensorflow_makefile,jart\/tensorflow,guschmue\/tensorflow,4Quant\/tensorflow,girving\/tensorflow,Intel-tensorflow\/tensorflow,gautam1858\/tensorflow,raymondxyang\/tensorflow,cg31\/tensorflow,nolanliou\/tensorflow,Mistobaan\/tensorflow,av8ramit\/tensorflow,thjashin\/tensorflow,jwlawson\/tensorflow,Intel-tensorflow\/tensorflow,karllessard\/tensorflow,drpngx\/tensorflow,nanditav\/15712-TensorFlow,snnn\/tensorflow,dongjoon-hyun\/tensorflow,kamcpp\/tensorflow,memo\/tensorflow,DCSaunders\/tensorflow,tiagofrepereira2012\/tensorflow,aam-at\/tensorflow,mixturemodel-flow\/tensorflow,gibiansky\/tensorflow,ppwwyyxx\/tensorflow,paolodedios\/tensorflow,brchiu\/tensorflow,jbedorf\/tensorflow,asadziach\/tensorflow,jbedorf\/tensorflow,ZhangXinNan\/tensorflow,mixturemodel-flow\/tensorflow,anand-c-goog\/tensorflow,nolanliou\/tensorflow,thesuperzapper\/tensorflow,gibiansky\/tensorflow,horance-liu\/tensorflow,scenarios\/tensorflow,gojira\/tensorflow,yufengg\/tensorflow,dendisuhubdy\/tensorflow,seaotterman\/tensorflow,adamtiger\/tensorflow,rdipietro\/tensorflow,nburn42\/tensorflow,MostafaGazar\/tensorflow,jalexvig\/tensorflow,pavelchristof\/gomoku-ai,tensorflow\/tensorflow-pywrap_saved_model,maciekcc\/tensorflow,EvenStrangest\/tensorflow,DCSaunders\/tensorflow,hlt-mt\/tensorflow,elingg\/tensorflow,nikste\/tensorflow,yanchen036\/tensorflow,laosiaudi\/tensorflow,shreyasva\/tensorflow,mdrumond\/tensorflow,yanchen036\/tensorflow,Mistobaan\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,maciekcc\/tensorflow,eaplatanios\/tensorflow,mengxn\/tensorflow,taknevski\/tensorflow-xsmm,jhseu\/tensorflow,codrut3\/tensorflow,laosiaudi\/tensorflow,sandeepgupta2k4\/tensorflow,sarvex\/tensorflow,pcm17\/tensorflow,jwlawson\/tensorflow,brchiu\/tensorflow,benoitsteiner\/tensorflow,mdrumond\/tensorflow,JinXinDeep\/tensorflow,jbedorf\/tensorflow,ivano666\/tensorflow,alistairlow\/tensorflow,guschmue\/tensorflow,chris-chris\/tensorflow,tiagofrepereira2012\/tensorflow,jbedorf\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aselle\/tensorflow,gnieboer\/tensorflow,jendap\/tensorflow,horance-liu\/tensorflow,ivano666\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,ivano666\/tensorflow,ZhangXinNan\/tensorflow,Intel-Corporation\/tensorflow,wchan\/tensorflow,JVillella\/tensorflow,Bulochkin\/tensorflow_pack,lukas-krecan\/tensorflow,jart\/tensorflow,kamcpp\/tensorflow,eadgarchen\/tensorflow,arborh\/tensorflow,Xeralux\/tensorflow,alsrgv\/tensorflow,shreyasva\/tensorflow,jhaux\/tensorflow,brchiu\/tensorflow,Intel-Corporation\/tensorflow,alshedivat\/tensorflow,aldian\/tensorflow,hehongliang\/tensorflow,awni\/tensorflow,ghchinoy\/tensorflow,gunan\/tensorflow,sjperkins\/tensorflow,arborh\/tensorflow,jendap\/tensorflow,ppries\/tensorflow,chris-chris\/tensorflow,mrry\/tensorflow,with-git\/tensorflow,codrut3\/tensorflow,girving\/tensorflow,girving\/tensorflow,drpngx\/tensorflow,MostafaGazar\/tensorflow,gojira\/tensorflow,alshedivat\/tensorflow,lukeiwanski\/tensorflow-opencl,JVillella\/tensorflow,eadgarchen\/tensorflow,gnieboer\/tensorflow,scenarios\/tensorflow,ageron\/tensorflow,MycChiu\/tensorflow,lakshayg\/tensorflow,HaebinShin\/tensorflow,seanli9jan\/tensorflow,drpngx\/tensorflow,ibmsoe\/tensorflow,sjperkins\/tensorflow,freedomtan\/tensorflow,code-sauce\/tensorflow,theflofly\/tensorflow,neilhan\/tensorflow,drpngx\/tensorflow,chemelnucfin\/tensorflow,freedomtan\/tensorflow,Mistobaan\/tensorflow,petewarden\/tensorflow,hlt-mt\/tensorflow,MostafaGazar\/tensorflow,nolanliou\/tensorflow,ageron\/tensorflow,abhitopia\/tensorflow,jhaux\/tensorflow,calebfoss\/tensorflow,Intel-tensorflow\/tensorflow,karllessard\/tensorflow,ville-k\/tensorflow,zycdragonball\/tensorflow,Moriadry\/tensorflow,gautam1858\/tensorflow,yongtang\/tensorflow,manazhao\/tf_recsys,memo\/tensorflow,eerwitt\/tensorflow,Mazecreator\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,JingJunYin\/tensorflow,ibab\/tensorflow,lukas-krecan\/tensorflow,jalexvig\/tensorflow,tongwang01\/tensorflow,a-doumoulakis\/tensorflow,chemelnucfin\/tensorflow,jhseu\/tensorflow,nanditav\/15712-TensorFlow,tensorflow\/tensorflow-experimental_link_static_libraries_once,pavelchristof\/gomoku-ai,jhseu\/tensorflow,kobejean\/tensorflow,ghchinoy\/tensorflow,laosiaudi\/tensorflow,guschmue\/tensorflow,TakayukiSakai\/tensorflow,AndreasMadsen\/tensorflow,4Quant\/tensorflow,ychfan\/tensorflow,bowang\/tensorflow,tiagofrepereira2012\/tensorflow,ishay2b\/tensorflow,johndpope\/tensorflow,snnn\/tensorflow,bowang\/tensorflow,mortada\/tensorflow,strint\/tensorflow,vrv\/tensorflow,asimshankar\/tensorflow,gautam1858\/tensorflow,code-sauce\/tensorflow,vrv\/tensorflow,laszlocsomor\/tensorflow,jeffzheng1\/tensorflow,strint\/tensorflow,av8ramit\/tensorflow,horance-liu\/tensorflow,chemelnucfin\/tensorflow,tornadozou\/tensorflow,ZhangXinNan\/tensorflow,alsrgv\/tensorflow,paolodedios\/tensorflow,xzturn\/tensorflow,neilhan\/tensorflow,frreiss\/tensorflow-fred,jhseu\/tensorflow,jhseu\/tensorflow,yufengg\/tensorflow,laszlocsomor\/tensorflow,sandeepgupta2k4\/tensorflow,AnishShah\/tensorflow,ishay2b\/tensorflow,tensorflow\/tensorflow,arborh\/tensorflow,aldian\/tensorflow,MycChiu\/tensorflow,Xeralux\/tensorflow,dhalleine\/tensorflow,ville-k\/tensorflow,Carmezim\/tensorflow,alshedivat\/tensorflow,kobejean\/tensorflow,naturali\/tensorflow,manjunaths\/tensorflow,raymondxyang\/tensorflow,RapidApplicationDevelopment\/tensorflow,renyi533\/tensorflow,chris-chris\/tensorflow,RapidApplicationDevelopment\/tensorflow,caisq\/tensorflow,Intel-tensorflow\/tensorflow,manjunaths\/tensorflow,neilhan\/tensorflow,shreyasva\/tensorflow,krikru\/tensorflow-opencl,allenlavoie\/tensorflow,markslwong\/tensorflow,Moriadry\/tensorflow,cancan101\/tensorflow,zasdfgbnm\/tensorflow,tornadozou\/tensorflow,EvenStrangest\/tensorflow,shreyasva\/tensorflow,frreiss\/tensorflow-fred,nightjean\/Deep-Learning,benoitsteiner\/tensorflow-opencl,ageron\/tensorflow,annarev\/tensorflow,awni\/tensorflow,JVillella\/tensorflow,DavidNorman\/tensorflow,brchiu\/tensorflow,tillahoffmann\/tensorflow,benoitsteiner\/tensorflow-xsmm,ran5515\/DeepDecision,tillahoffmann\/tensorflow,dancingdan\/tensorflow,taknevski\/tensorflow-xsmm,gibiansky\/tensorflow,alisidd\/tensorflow,caisq\/tensorflow,ghchinoy\/tensorflow,wangyum\/tensorflow,frreiss\/tensorflow-fred,adamtiger\/tensorflow,tensorflow\/tensorflow,EvenStrangest\/tensorflow,dancingdan\/tensorflow,chenjun0210\/tensorflow,admcrae\/tensorflow,alheinecke\/tensorflow-xsmm,pcm17\/tensorflow,aselle\/tensorflow,benoitsteiner\/tensorflow-xsmm,alistairlow\/tensorflow,anilmuthineni\/tensorflow,annarev\/tensorflow,haeusser\/tensorflow,nightjean\/Deep-Learning,manipopopo\/tensorflow,nburn42\/tensorflow,nikste\/tensorflow,XueqingLin\/tensorflow,LUTAN\/tensorflow,kobejean\/tensorflow,TakayukiSakai\/tensorflow,adit-chandra\/tensorflow,markslwong\/tensorflow,eaplatanios\/tensorflow,AnishShah\/tensorflow,frreiss\/tensorflow-fred,ninotoshi\/tensorflow,horance-liu\/tensorflow,DavidNorman\/tensorflow,anand-c-goog\/tensorflow,jart\/tensorflow,freedomtan\/tensorflow,chris-chris\/tensorflow,mdrumond\/tensorflow,asadziach\/tensorflow,anand-c-goog\/tensorflow,hehongliang\/tensorflow,mrry\/tensorflow,rdipietro\/tensorflow,benoitsteiner\/tensorflow-xsmm,XueqingLin\/tensorflow,alisidd\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tillahoffmann\/tensorflow,ishay2b\/tensorflow,renyi533\/tensorflow,benoitsteiner\/tensorflow-xsmm,alisidd\/tensorflow,annarev\/tensorflow,kevin-coder\/tensorflow-fork,juharris\/tensorflow,ppwwyyxx\/tensorflow,AnishShah\/tensorflow,rabipanda\/tensorflow,abhitopia\/tensorflow,zasdfgbnm\/tensorflow,RyanYoung25\/tensorflow,Xeralux\/tensorflow,odejesush\/tensorflow,MostafaGazar\/tensorflow,ravindrapanda\/tensorflow,JinXinDeep\/tensorflow,Kongsea\/tensorflow,zycdragonball\/tensorflow,johndpope\/tensorflow,anilmuthineni\/tensorflow,AnishShah\/tensorflow,odejesush\/tensorflow,hfp\/tensorflow-xsmm,manazhao\/tf_recsys,gunan\/tensorflow,gojira\/tensorflow,handroissuazo\/tensorflow,ppwwyyxx\/tensorflow,andrewcmyers\/tensorflow,petewarden\/tensorflow_makefile,gnieboer\/tensorflow,karllessard\/tensorflow,johndpope\/tensorflow,Mistobaan\/tensorflow,Kongsea\/tensorflow,moonboots\/tensorflow,Mazecreator\/tensorflow,memo\/tensorflow,DavidNorman\/tensorflow,xodus7\/tensorflow,hfp\/tensorflow-xsmm,eadgarchen\/tensorflow,rabipanda\/tensorflow,unsiloai\/syntaxnet-ops-hack,memo\/tensorflow,theflofly\/tensorflow,calebfoss\/tensorflow,seaotterman\/tensorflow,johndpope\/tensorflow,RapidApplicationDevelopment\/tensorflow,paolodedios\/tensorflow,TakayukiSakai\/tensorflow,caisq\/tensorflow,zasdfgbnm\/tensorflow,tensorflow\/tensorflow,Moriadry\/tensorflow,dongjoon-hyun\/tensorflow,drpngx\/tensorflow,codrut3\/tensorflow,lakshayg\/tensorflow,bowang\/tensorflow,wchan\/tensorflow,zycdragonball\/tensorflow,scenarios\/tensorflow,jhaux\/tensorflow,Moriadry\/tensorflow,Bulochkin\/tensorflow_pack,dhalleine\/tensorflow,seaotterman\/tensorflow,calebfoss\/tensorflow,snnn\/tensorflow,thesuperzapper\/tensorflow,cg31\/tensorflow,dendisuhubdy\/tensorflow,martinwicke\/tensorflow,memo\/tensorflow,pavelchristof\/gomoku-ai,cg31\/tensorflow,girving\/tensorflow,gojira\/tensorflow,yongtang\/tensorflow,HKUST-SING\/tensorflow,mrry\/tensorflow,annarev\/tensorflow,haeusser\/tensorflow,ninotoshi\/tensorflow,sandeepgupta2k4\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,johndpope\/tensorflow,laszlocsomor\/tensorflow,frreiss\/tensorflow-fred,eadgarchen\/tensorflow,jhaux\/tensorflow,RyanYoung25\/tensorflow,adit-chandra\/tensorflow,jendap\/tensorflow,scenarios\/tensorflow,LUTAN\/tensorflow,thesuperzapper\/tensorflow,ran5515\/DeepDecision,wchan\/tensorflow,alsrgv\/tensorflow,eaplatanios\/tensorflow,HKUST-SING\/tensorflow,neilhan\/tensorflow,jwlawson\/tensorflow,av8ramit\/tensorflow,AnishShah\/tensorflow,tomasreimers\/tensorflow-emscripten,benoitsteiner\/tensorflow-opencl,HaebinShin\/tensorflow,laszlocsomor\/tensorflow,asimshankar\/tensorflow,maciekcc\/tensorflow,krikru\/tensorflow-opencl,naturali\/tensorflow,a-doumoulakis\/tensorflow,dancingdan\/tensorflow,aam-at\/tensorflow,4Quant\/tensorflow,nikste\/tensorflow,benoitsteiner\/tensorflow,jhseu\/tensorflow,gautam1858\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,asadziach\/tensorflow,naturali\/tensorflow,zycdragonball\/tensorflow,nolanliou\/tensorflow,allenlavoie\/tensorflow,manipopopo\/tensorflow,Carmezim\/tensorflow,laosiaudi\/tensorflow,asadziach\/tensorflow,zasdfgbnm\/tensorflow,benoitsteiner\/tensorflow-opencl,with-git\/tensorflow,xzturn\/tensorflow,alistairlow\/tensorflow,lukeiwanski\/tensorflow,handroissuazo\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,with-git\/tensorflow,martinbede\/second-sight,alsrgv\/tensorflow,thesuperzapper\/tensorflow,hfp\/tensorflow-xsmm,yongtang\/tensorflow,pcm17\/tensorflow,nburn42\/tensorflow,freedomtan\/tensorflow,nanditav\/15712-TensorFlow,alsrgv\/tensorflow,DCSaunders\/tensorflow,kevin-coder\/tensorflow-fork,arborh\/tensorflow,Bulochkin\/tensorflow_pack,Bulochkin\/tensorflow_pack,alshedivat\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,dendisuhubdy\/tensorflow,markslwong\/tensorflow,yanchen036\/tensorflow,ppwwyyxx\/tensorflow,peterbraden\/tensorflow,jhaux\/tensorflow,ran5515\/DeepDecision,Bismarrck\/tensorflow,annarev\/tensorflow,martinbede\/second-sight,cancan101\/tensorflow,calebfoss\/tensorflow,chenjun0210\/tensorflow,maciekcc\/tensorflow,XueqingLin\/tensorflow,renyi533\/tensorflow,tntnatbry\/tensorflow,johndpope\/tensorflow,JingJunYin\/tensorflow,gojira\/tensorflow,seanli9jan\/tensorflow,petewarden\/tensorflow,panmari\/tensorflow,codrut3\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,mixturemodel-flow\/tensorflow,davidzchen\/tensorflow,asadziach\/tensorflow,juharris\/tensorflow,manipopopo\/tensorflow,panmari\/tensorflow,sandeepgupta2k4\/tensorflow,mavenlin\/tensorflow,TakayukiSakai\/tensorflow,XueqingLin\/tensorflow,allenlavoie\/tensorflow,MycChiu\/tensorflow,lukeiwanski\/tensorflow,girving\/tensorflow,raymondxyang\/tensorflow,jbedorf\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,lukeiwanski\/tensorflow,aldian\/tensorflow,brchiu\/tensorflow,cxxgtxy\/tensorflow,dancingdan\/tensorflow,kchodorow\/tensorflow,ppries\/tensorflow,xzturn\/tensorflow,alshedivat\/tensorflow,cancan101\/tensorflow,benoitsteiner\/tensorflow,chenjun0210\/tensorflow,davidzchen\/tensorflow,aam-at\/tensorflow,pcm17\/tensorflow,pierreg\/tensorflow,shreyasva\/tensorflow,AndreasMadsen\/tensorflow,ville-k\/tensorflow,dhalleine\/tensorflow,mortada\/tensorflow,wangyum\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow,xodus7\/tensorflow,ppries\/tensorflow,nightjean\/Deep-Learning,admcrae\/tensorflow,ravindrapanda\/tensorflow,dancingdan\/tensorflow,mavenlin\/tensorflow,caisq\/tensorflow,andrewcmyers\/tensorflow,manipopopo\/tensorflow,ibab\/tensorflow,ville-k\/tensorflow,mavenlin\/tensorflow,moonboots\/tensorflow,MoamerEncsConcordiaCa\/tensorflow,rdipietro\/tensorflow,girving\/tensorflow,scenarios\/tensorflow,thjashin\/tensorflow,alisidd\/tensorflow,unsiloai\/syntaxnet-ops-hack","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tensorflow\/core\/kernels\/adjust_contrast_op.h\n+++ tensorflow\/core\/kernels\/adjust_contrast_op.h\n@@ -38,14 +38,11 @@\n Eigen::array<int, 4> scalar_broadcast{{batch, height, width, channels}};\n #if !defined(EIGEN_HAS_INDEX_LIST)\n Eigen::array<int, 2> reduction_axis{{1, 2}};\n- Eigen::array<int, 4> scalar{{1, 1, 1, 1}};\n Eigen::array<int, 4> broadcast_dims{{1, height, width, 1}};\n Eigen::Tensor<int, 4>::Dimensions reshape_dims{{batch, 1, 1, channels}};\n #else\n Eigen::IndexList<Eigen::type2index<1>, Eigen::type2index<2> >\n reduction_axis;\n- Eigen::IndexList<Eigen::type2index<1>, Eigen::type2index<1>,\n- Eigen::type2index<1>, Eigen::type2index<1> > scalar;\n Eigen::IndexList<Eigen::type2index<1>, int, int, Eigen::type2index<1> >\n broadcast_dims;\n broadcast_dims.set(1, height);\n@@ -55,6 +52,7 @@\n reshape_dims.set(0, batch);\n reshape_dims.set(3, channels);\n #endif\n+ Eigen::Sizes<1, 1, 1, 1> scalar;\n float num_reduced_coeffs = height * width;\n mean_values.device(d) =\n (input.template cast<float>().sum(reduction_axis).eval() \/\n@@ -88,16 +86,12 @@\n Eigen::array<int, 4> scalar_broadcast{{batch, height, width, channels}};\n #if !defined(EIGEN_HAS_INDEX_LIST)\n Eigen::array<int, 2> reduction_axis{{0, 1}};\n- Eigen::array<int, 4> scalar{{1, 1, 1, 1}};\n Eigen::array<int, 4> broadcast_dims{{1, height, width, 1}};\n Eigen::Tensor<int, 4>::Dimensions reshape_dims{{batch, 1, 1, channels}};\n Eigen::array<int, 4> reduced_dims_first{{1, 2, 0, 3}};\n #else\n Eigen::IndexList<Eigen::type2index<0>, Eigen::type2index<1> >\n reduction_axis;\n- Eigen::IndexList<Eigen::type2index<1>, Eigen::type2index<1>,\n- Eigen::type2index<1>, Eigen::type2index<1> >\n- scalar;\n Eigen::IndexList<Eigen::type2index<1>, int, int, Eigen::type2index<1> >\n broadcast_dims;\n broadcast_dims.set(1, height);\n@@ -110,6 +104,7 @@\n Eigen::type2index<0>, Eigen::type2index<3> >\n reduced_dims_first;\n #endif\n+ Eigen::Sizes<1, 1, 1, 1> scalar;\n float num_reduced_coeffs = height * width;\n output.device(d) =\n (input.shuffle(reduced_dims_first).sum(reduction_axis).eval() \/\n"} {"commit":"45fa8394078279072dc56807ea6cdbd208afc6ae","subject":"Add REQUIRES: native to a test that assumes it","message":"Add REQUIRES: native to a test that assumes it\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@338552 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/Driver\/darwin-infer-simulator-sdkroot.c\n+++ test\/Driver\/darwin-infer-simulator-sdkroot.c\n@@ -1,6 +1,6 @@\n \/\/ Check that SDKROOT does not infer simulator on when it points to a regular\n \/\/ SDK.\n-\/\/ REQUIRES: system-darwin\n+\/\/ REQUIRES: system-darwin && native\n \/\/\n \/\/ RUN: rm -rf %t\/SDKs\/iPhoneOS8.0.0.sdk\n \/\/ RUN: mkdir -p %t\/SDKs\/iPhoneOS8.0.0.sdk\n"} {"commit":"9f44c2c4d27660aa43504493d74e83d76051d3f0","subject":"Sync with TF upstream code as much as possible to remove warning","message":"Sync with TF upstream code as much as possible to remove warning\n","repos":"kjbracey-arm\/mbed,kjbracey-arm\/mbed,mbedmicro\/mbed,mbedmicro\/mbed,kjbracey-arm\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,kjbracey-arm\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/TARGET_PSA\/services\/attestation\/COMPONENT_PSA_SRV_IMPL\/tfm_impl\/attestation_core.c\n+++ components\/TARGET_PSA\/services\/attestation\/COMPONENT_PSA_SRV_IMPL\/tfm_impl\/attestation_core.c\n@@ -841,7 +841,6 @@\n enum attest_token_err_t token_err;\n struct attest_token_ctx attest_token_ctx;\n int32_t key_select;\n- int32_t alg_select;\n uint32_t option_flags = 0;\n \n if (challenge->len == 36) {\n@@ -855,21 +854,13 @@\n \/* Lower three bits are the key select *\/\n key_select = option_flags & 0x7;\n \n- \/* Map the key select to an algorithm. Maybe someday we'll support something\n- * other than ES256\n- *\/\n- switch (key_select) {\n- default:\n- alg_select = COSE_ALGORITHM_ES256;\n- }\n-\n \/* Get started creating the token. This sets up the CBOR and COSE contexts\n * which causes the COSE headers to be constructed.\n *\/\n token_err = attest_token_start(&attest_token_ctx,\n option_flags, \/* option_flags *\/\n key_select, \/* key_select *\/\n- alg_select, \/* alg_select *\/\n+ COSE_ALGORITHM_ES256, \/* alg_select *\/\n token);\n \n if (token_err != ATTEST_TOKEN_ERR_SUCCESS) {\n"} {"commit":"4e035ef2e4fc0b70bfe67bb8615c0114797447f0","subject":"Reorganize defaults","message":"Reorganize defaults\n","repos":"malensek\/3RVX,malensek\/3RVX,malensek\/3RVX","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- 3RVX\/DefaultSettings.h\n+++ 3RVX\/DefaultSettings.h\n@@ -24,6 +24,10 @@\n static const bool BrightnessOSDEnabled = true;\n static const bool KeyboardOSDEnabled = false;\n \n+ \/* System Event Subscriptions*\/\n+ static const bool SubscribeVolumeEvents = true;\n+ static const bool SubscribeEjectEvents = true;\n+\n \/* Notification Icons *\/\n static const bool EjectIcon = false;\n static const bool VolumeIcon = true;\n@@ -42,7 +46,4 @@\n static const Settings::OSDPos OSDPosition = Settings::OSDPos::Bottom;\n static const bool AutoUpdate = false;\n static const bool MuteLock = false;\n- static const bool SubscribeVolumeEvents = true;\n- static const bool SubscribeEjectEvents = true;\n-\n };\n"} {"commit":"28901c1fed11dfeab65f640878e85a9b61d311ed","subject":"ARM: shmobile: add new __iomem annotation for new code","message":"ARM: shmobile: add new __iomem annotation for new code\n\nWhile we fixed up all instances that were already present in v3.6,\nthis one came in through new code.\n\nWithout this patch, building kzm9g_defconfig results in:\n\narch\/arm\/mach-shmobile\/board-kzm9g.c: In function 'kzm9g_restart':\narch\/arm\/mach-shmobile\/board-kzm9g.c:781:2: warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast [enabled by default]\n\nSigned-off-by: Arnd Bergmann <f2c659f01951776204a6c5b902787d9019fbeebd@arndb.de>\nCc: Nobuhiro Iwamatsu <2b8440e189956f325e301c8d8c76bd30356b2f9f@renesas.com>\nCc: Kuninori Morimoto <a3b51ccb87d18302c1692defcfbf83319d1737eb@renesas.com>\nCc: Tetsuyuki Kobayashi <f11af612650f474cce319970f68085816c4c9a70@kmckk.co.jp>\nCc: Simon Horman <a105fd58f578dea0be108941d4c59d15396e1855@verge.net.au>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-shmobile\/board-kzm9g.c\n+++ arch\/arm\/mach-shmobile\/board-kzm9g.c\n@@ -765,7 +765,7 @@\n \n static void kzm9g_restart(char mode, const char *cmd)\n {\n-#define RESCNT2 0xe6188020\n+#define RESCNT2 IOMEM(0xe6188020)\n \t\/* Do soft power on reset *\/\n \twritel((1 << 31), RESCNT2);\n }\n"} {"commit":"cefcadeaa7d5681b88b3ee2272d961c23a70a091","subject":"OMAP4: Fix the emif and dmm virtual mapping","message":"OMAP4: Fix the emif and dmm virtual mapping\n\nFix the address overlap with Emulation domain (EMU).\n\nThe previous mapping was entering into EMU mapping\nand was not as per comments. Fix the mapping accordingly.\n\nSigned-off-by: Girish S G <b002a8a450dca3d4be743d6e7d0e223a630a2e99@ti.com>\nSigned-off-by: Santosh Shilimkar <5b4d8dc9ea337fff5fd1729321eda9873ade0b09@ti.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/plat-omap\/include\/plat\/io.h\n+++ arch\/arm\/plat-omap\/include\/plat\/io.h\n@@ -228,13 +228,13 @@\n \n #define OMAP44XX_EMIF2_PHYS\tOMAP44XX_EMIF2_BASE\n \t\t\t\t\t\t\/* 0x4d000000 --> 0xfd200000 *\/\n-#define OMAP44XX_EMIF2_VIRT\t(OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET)\n #define OMAP44XX_EMIF2_SIZE\tSZ_1M\n+#define OMAP44XX_EMIF2_VIRT\t(OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE)\n \n #define OMAP44XX_DMM_PHYS\tOMAP44XX_DMM_BASE\n \t\t\t\t\t\t\/* 0x4e000000 --> 0xfd300000 *\/\n-#define OMAP44XX_DMM_VIRT\t(OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)\n #define OMAP44XX_DMM_SIZE\tSZ_1M\n+#define OMAP44XX_DMM_VIRT\t(OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE)\n \/*\n * ----------------------------------------------------------------------------\n * Omap specific register access\n"} {"commit":"671cb652a14b28bd0e312802701da796ab59e797","subject":"arch\/mcimx7_m4: Add pad, clock and gate config for GPIO7 and UART6","message":"arch\/mcimx7_m4: Add pad, clock and gate config for GPIO7 and UART6\n\nAdds the necessery configuration for using the GPIO7 and UART6 on\ni.MX7 platforms.\n\nSigned-off-by: Diego Sueiro <ad8405088babfd9de78621db022334230b00cda7@gmail.com>\n","repos":"galak\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,galak\/zephyr,punitvara\/zephyr,explora26\/zephyr,nashif\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,nashif\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,nashif\/zephyr,kraj\/zephyr,kraj\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,ldts\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,nashif\/zephyr,kraj\/zephyr,kraj\/zephyr,nashif\/zephyr,explora26\/zephyr,galak\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,explora26\/zephyr,Vudentz\/zephyr,explora26\/zephyr,ldts\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/soc\/nxp_imx\/mcimx7_m4\/soc.c\n+++ arch\/arm\/soc\/nxp_imx\/mcimx7_m4\/soc.c\n@@ -67,6 +67,13 @@\n \tRDC_SetPdapAccess(RDC, rdcPdapGpio2, GPIO_2_RDC, false, false);\n \t\/* Enable gpio clock gate *\/\n \tCCM_ControlGate(CCM, ccmCcgrGateGpio2, ccmClockNeededRunWait);\n+#endif \/* CONFIG_GPIO_IMX_PORT_2 *\/\n+\n+\n+#ifdef CONFIG_GPIO_IMX_PORT_7\n+\tRDC_SetPdapAccess(RDC, rdcPdapGpio7, GPIO_7_RDC, false, false);\n+\t\/* Enable gpio clock gate *\/\n+\tCCM_ControlGate(CCM, ccmCcgrGateGpio7, ccmClockNeededRunWait);\n #endif \/* CONFIG_GPIO_IMX_PORT_2 *\/\n \n }\n@@ -91,6 +98,20 @@\n \tCCM_ControlGate(CCM, ccmCcgrGateUart2, ccmClockNeededAll);\n #endif \/* #ifdef CONFIG_UART_IMX_UART_2 *\/\n \n+#ifdef CONFIG_UART_IMX_UART_6\n+\t\/* We need to grasp board uart exclusively *\/\n+\tRDC_SetPdapAccess(RDC, rdcPdapUart6, UART_6_RDC, false, false);\n+\t\/* Select clock derived from OSC clock(24M) *\/\n+\tCCM_UpdateRoot(CCM, ccmRootUart6, ccmRootmuxUartOsc24m, 0, 0);\n+\t\/* Enable uart clock *\/\n+\tCCM_EnableRoot(CCM, ccmRootUart6);\n+\t\/*\n+\t * IC Limitation\n+\t * M4 stop will cause A7 UART lose functionality\n+\t * So we need UART clock all the time\n+\t *\/\n+\tCCM_ControlGate(CCM, ccmCcgrGateUart6, ccmClockNeededAll);\n+#endif \/* #ifdef CONFIG_UART_IMX_UART_6 *\/\n }\n #endif \/* CONFIG_UART_IMX *\/\n \n"} {"commit":"78e3c7951021b4e1a554b3d619506b55b0619073","subject":"arch\/x86\/kernel\/cpu\/perf_event_msr.c: use sign_extend64() for sign extension","message":"arch\/x86\/kernel\/cpu\/perf_event_msr.c: use sign_extend64() for sign extension\n\nSigned-off-by: Martin Kepplinger <5f224f582e4d41e2bdb8535d23e6b63d7ab1203d@theobroma-systems.com>\nCc: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@redhat.com>\nCc: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@kernel.org>\nCc: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nCc: \"H. Peter Anvin\" <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\nCc: George Spelvin <ba324ca7b1c77fc20bb970d5aff6eea9377918a5@horizon.com>\nCc: Rasmus Villemoes <ba324ca7b1c77fc20bb970d5aff6eea9377918a5@rasmusvillemoes.dk>\nCc: Maxime Coquelin <9a2667dee3b90866bbc9c2696cff2b7d5616c95a@st.com>\nCc: Denys Vlasenko <50fbbd36fe0f9c8261d4a3c762c8c29ffb35e48f@redhat.com>\nCc: Yury Norov <d4c98dcfb8a2d1a780b73ae0523ba1408042900b@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"9caf2227a2d710aad3ac7ffb6307bc4ca543c06e","subject":"proxy volume monitor: Drop init warning","message":"proxy volume monitor: Drop init warning\n\nThis caused make to fail e.g. in libgweather:\n\n(g-ir-compiler:11785): GVFS-RemoteVolumeMonitor-WARNING **: Error: The connection is closed\nkernel: traps: g-ir-compiler[4216] trap int3 ip:7f76f9fa2663 sp:7fff1e6a2d90 error:0\nWith gvfs-1.22.3 no error's\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=746398\n","repos":"gicmo\/gvfs,gicmo\/gvfs,gicmo\/gvfs,gicmo\/gvfs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- monitor\/proxy\/gproxyvolumemonitor.c\n+++ monitor\/proxy\/gproxyvolumemonitor.c\n@@ -1494,7 +1494,7 @@\n }\n else\n {\n- g_warning (\"Error: %s\\n\", error->message);\n+ g_debug (\"Error: %s\\n\", error->message);\n g_error_free (error);\n }\n }\n"} {"commit":"cbb58d8cd007a87a65448fe64d44f44df0854e42","subject":"Oops, forgot to include bigstruct","message":"Oops, forgot to include bigstruct\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/touchd.c\n+++ mudlib\/mud\/home\/System\/sys\/touchd.c\n@@ -18,7 +18,7 @@\n * along with this program. If not, see <http:\/\/www.gnu.org\/licenses\/>.\n *\/\n #include <kotaka\/paths.h>\n-#include <bigstruct\/paths.h>\n+#include <kotaka\/bigstruct.h>\n #include <status.h>\n \n inherit SECOND_AUTO;\n"} {"commit":"04eb211a8e71a85e94b8f8aa333275fe5868d61f","subject":"Optimize performance of depthwise_conv_bwd of filter (#46490)","message":"Optimize performance of depthwise_conv_bwd of filter (#46490)\n\n* Optimize performance of depthwise_conv_bwd of filter\r\n\r\n* op-benchmark\r\n\r\n* fix\r\n\r\n* op benchmark\r\n\r\n* merge bwd","repos":"luotao1\/Paddle,luotao1\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/phi\/kernels\/gpu\/depthwise_conv.h\n+++ paddle\/phi\/kernels\/gpu\/depthwise_conv.h\n@@ -87,43 +87,36 @@\n const DataLayout data_layout = DataLayout::kNCHW);\n };\n \n+#define FINAL_MASK 0xffffffff\n+#define HALF_WARP 16\n+#define WARP_SIZE 32\n+\n template <typename T>\n-static __forceinline__ __device__ T WarpReduceSum(T val, int warp_size) {\n- typedef cub::WarpReduce<T> WarpReduce;\n- typename WarpReduce::TempStorage temp_storage;\n- val = WarpReduce(temp_storage).Sum(val, warp_size);\n+__forceinline__ __device__ T WarpReduceSum(T val, unsigned lane_mask) {\n+ for (int mask = HALF_WARP; mask > 0; mask >>= 1)\n+ val += platform::CudaShuffleDownSync(lane_mask, val, mask);\n return val;\n }\n \n template <typename T>\n-__forceinline__ __device__ T BlockReduceSum(T val) {\n- static __shared__ T shared[32];\n- int thread_id = threadIdx.x + threadIdx.y * blockDim.x +\n- threadIdx.z * blockDim.x * blockDim.y;\n- int warp_size = min(blockDim.x * blockDim.y * blockDim.z, warpSize);\n- int lane = thread_id % warp_size;\n- int wid = thread_id \/ warp_size;\n-\n- val = WarpReduceSum(val, warp_size); \/\/ Each warp performs partial reduction\n-\n- if (lane == 0) shared[wid] = val; \/\/ Write reduced value to shared memory\n- __syncthreads(); \/\/ Wait for all partial reductions\n-\n- \/\/ read from shared memory only if that warp existed\n- int block_size = blockDim.x * blockDim.y * blockDim.z;\n- if (thread_id < (block_size - 1) \/ warp_size + 1) {\n- val = shared[lane];\n- } else {\n- val = static_cast<T>(0);\n- }\n-\n- if (wid == 0) {\n- val = WarpReduceSum(val, warp_size); \/\/ Final reduce within first warp\n- }\n+__forceinline__ __device__ T BlockReduceSum(T val, unsigned mask = FINAL_MASK) {\n+ static __shared__ T shared[WARP_SIZE];\n+ int tid = threadIdx.y * blockDim.x + threadIdx.x;\n+ int lane = tid & 0x1f;\n+ int wid = tid >> 5;\n+\n+ val = WarpReduceSum<T>(val, mask);\n+\n __syncthreads();\n- if (thread_id != 0) {\n- val = static_cast<T>(0);\n- }\n+ if (lane == 0) shared[wid] = val;\n+\n+ __syncthreads();\n+\n+ \/\/ align block_span to WARP_SIZE\n+ int block_span = (blockDim.x * blockDim.y + WARP_SIZE - 1) >> 5;\n+ val = (lane < block_span) ? shared[lane] : static_cast<T>(0.0f);\n+ val = WarpReduceSum<T>(val, mask);\n+\n return val;\n }\n \n@@ -858,45 +851,81 @@\n const int dilate_height,\n const int dilate_width,\n T* filter_grad_data) {\n- T s(0);\n- int gbid = ((blockIdx.z * gridDim.y) + blockIdx.y) * gridDim.x + blockIdx.x;\n-\n- for (int image_w = threadIdx.x; image_w < output_width;\n- image_w += blockDim.x) {\n- for (int bid = 0; bid < num; bid++) {\n- for (int image_h = threadIdx.y; image_h < output_height;\n- image_h += blockDim.y) {\n- int kernel_id = blockIdx.z;\n- int kernel_h = blockIdx.y * dilate_height - padding_height;\n- int kernel_w = blockIdx.x * dilate_width - padding_width;\n-\n- int image_hk = image_h * stride_height + kernel_h;\n- int image_wk = image_w * stride_width + kernel_w;\n- if (image_hk < 0 || image_hk >= input_height) continue;\n- if (image_wk < 0 || image_wk >= input_width) continue;\n-#define gaid(N, C, H, W) \\\n- ((((N)*gridDim.z + (C)) * output_height + (H)) * output_width + (W))\n- int input_id = ((bid * (gridDim.z \/ filter_multiplier) +\n- kernel_id \/ filter_multiplier) *\n- input_height +\n- image_hk) *\n- input_width +\n- image_wk;\n+ T f_grad(0);\n+ const bool loop_batch = output_height * output_width >= WARP_SIZE;\n+\n+ int kw_id = blockIdx.x;\n+ int kh_id = blockIdx.y;\n+ int oc_id = blockIdx.z;\n+ int ic_id = oc_id \/ filter_multiplier;\n+ int idx = ((blockIdx.z * gridDim.y) + blockIdx.y) * gridDim.x + blockIdx.x;\n+\n+ const int ohw = output_height * output_width;\n+ const int onhw = num * ohw;\n+ const int h_offset = kh_id * dilate_height - padding_height;\n+ const int w_offset = kw_id * dilate_width - padding_width;\n+\n+ if (loop_batch) {\n+ for (int og_w = threadIdx.x; og_w < output_width; og_w += blockDim.x) {\n+ for (int bid = 0; bid < num; ++bid) {\n+ for (int og_h = threadIdx.y; og_h < output_height; og_h += blockDim.y) {\n+ int i_h = og_h * stride_height + h_offset;\n+ int i_w = og_w * stride_width + w_offset;\n+\n+ if (i_w >= 0 && i_w < input_width && i_h >= 0 && i_h < input_height) {\n+ int input_offset =\n+ ((bid * input_channels + ic_id) * input_height + i_h) *\n+ input_width +\n+ i_w;\n+ int output_grad_offset =\n+ ((bid * output_channels + oc_id) * output_height + og_h) *\n+ output_width +\n+ og_w;\n+ if (fuse_relu_before_conv) {\n+ f_grad +=\n+ output_grad_data[output_grad_offset] *\n+ static_cast<T>(\n+ max(0.0f, static_cast<double>(input_data[input_offset])));\n+ } else {\n+ f_grad += output_grad_data[output_grad_offset] *\n+ input_data[input_offset];\n+ }\n+ }\n+ }\n+ }\n+ }\n+ } else {\n+ for (int id = threadIdx.x; id < onhw; id += blockDim.x) {\n+ int bid = id \/ ohw;\n+ int og_hw = id - bid * ohw;\n+ int og_h = og_hw \/ output_width;\n+ int og_w = og_hw - og_h * output_width;\n+\n+ int i_h = og_h * stride_height + h_offset;\n+ int i_w = og_w * stride_width + w_offset;\n+\n+ if (i_w >= 0 && i_w < input_width && i_h >= 0 && i_h < input_height) {\n+ int input_offset =\n+ ((bid * input_channels + ic_id) * input_height + i_h) *\n+ input_width +\n+ i_w;\n+ int output_grad_offset = (bid * output_channels + oc_id) * ohw + og_hw;\n if (fuse_relu_before_conv) {\n- s += output_grad_data[gaid(bid, kernel_id, image_h, image_w)] *\n- static_cast<T>(\n- max(0.0f, static_cast<double>(input_data[input_id])));\n+ f_grad += output_grad_data[output_grad_offset] *\n+ static_cast<T>(max(\n+ 0.0f, static_cast<double>(input_data[input_offset])));\n } else {\n- s += output_grad_data[gaid(bid, kernel_id, image_h, image_w)] *\n- input_data[input_id];\n+ f_grad +=\n+ output_grad_data[output_grad_offset] * input_data[input_offset];\n }\n-#undef gaid\n- }\n- }\n- }\n-\n- T val = BlockReduceSum(s);\n- if (threadIdx.y == 0 && threadIdx.x == 0) filter_grad_data[gbid] = val;\n+ }\n+ }\n+ }\n+\n+ T val = BlockReduceSum<T>(f_grad);\n+ if (threadIdx.x == 0 && threadIdx.y == 0) {\n+ filter_grad_data[idx] = val;\n+ }\n }\n \n template <typename T, bool fuse_relu_before_conv>\n@@ -1572,6 +1601,10 @@\n blocks = std::min(std::max(block_size \/ output_width, 1), output_height);\n grid = dim3(ksize_width, ksize_height, output_channels);\n threads = dim3(std::min(output_width, block_size), blocks, 1);\n+ if (output_height * output_width < WARP_SIZE) {\n+ threads = dim3(\n+ std::min(block_size, batch_size * output_height * output_width));\n+ }\n } else {\n blocks = std::min(\n std::max(block_size \/ output_channels, 1),\n"} {"commit":"a0148f28664af0b11dc3cfe7a240d276aa762730","subject":"Add BASE_API to SystemMonitor::PowerObserver to be able to export net::HttpNetworkLayer","message":"Add BASE_API to SystemMonitor::PowerObserver to be able to\nexport net::HttpNetworkLayer\n\nBUG=76997\nTEST=NONE\nReview URL: http:\/\/codereview.chromium.org\/6992032\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@86492 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"fujunwei\/chromium-crosswalk,Just-D\/chromium-1,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,dednal\/chromium.src,ltilve\/chromium,jaruba\/chromium.src,Fireblend\/chromium-crosswalk,hujiajie\/pa-chromium,zcbenz\/cefode-chromium,mohamed--abdel-maksoud\/chromium.src,littlstar\/chromium.src,markYoungH\/chromium.src,rogerwang\/chromium,junmin-zhu\/chromium-rivertrail,Just-D\/chromium-1,littlstar\/chromium.src,zcbenz\/cefode-chromium,M4sse\/chromium.src,jaruba\/chromium.src,patrickm\/chromium.src,fujunwei\/chromium-crosswalk,ltilve\/chromium,jaruba\/chromium.src,markYoungH\/chromium.src,hgl888\/chromium-crosswalk,zcbenz\/cefode-chromium,rogerwang\/chromium,fujunwei\/chromium-crosswalk,axinging\/chromium-crosswalk,littlstar\/chromium.src,jaruba\/chromium.src,hgl888\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,dushu1203\/chromium.src,Fireblend\/chromium-crosswalk,markYoungH\/chromium.src,M4sse\/chromium.src,PeterWangIntel\/chromium-crosswalk,timopulkkinen\/BubbleFish,dushu1203\/chromium.src,krieger-od\/nwjs_chromium.src,ltilve\/chromium,chuan9\/chromium-crosswalk,Chilledheart\/chromium,ltilve\/chromium,zcbenz\/cefode-chromium,crosswalk-project\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,dednal\/chromium.src,dednal\/chromium.src,chuan9\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,rogerwang\/chromium,patrickm\/chromium.src,dushu1203\/chromium.src,ChromiumWebApps\/chromium,Pluto-tv\/chromium-crosswalk,M4sse\/chromium.src,nacl-webkit\/chrome_deps,ltilve\/chromium,hgl888\/chromium-crosswalk-efl,robclark\/chromium,mohamed--abdel-maksoud\/chromium.src,Pluto-tv\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,mogoweb\/chromium-crosswalk,dushu1203\/chromium.src,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,PeterWangIntel\/chromium-crosswalk,markYoungH\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,hujiajie\/pa-chromium,dednal\/chromium.src,Jonekee\/chromium.src,chuan9\/chromium-crosswalk,dednal\/chromium.src,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk,chuan9\/chromium-crosswalk,rogerwang\/chromium,markYoungH\/chromium.src,jaruba\/chromium.src,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,keishi\/chromium,timopulkkinen\/BubbleFish,Pluto-tv\/chromium-crosswalk,hujiajie\/pa-chromium,PeterWangIntel\/chromium-crosswalk,rogerwang\/chromium,keishi\/chromium,ondra-novak\/chromium.src,mohamed--abdel-maksoud\/chromium.src,pozdnyakov\/chromium-crosswalk,mogoweb\/chromium-crosswalk,zcbenz\/cefode-chromium,ChromiumWebApps\/chromium,fujunwei\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,Just-D\/chromium-1,bright-sparks\/chromium-spacewalk,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk,robclark\/chromium,robclark\/chromium,hgl888\/chromium-crosswalk,timopulkkinen\/BubbleFish,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,Chilledheart\/chromium,hgl888\/chromium-crosswalk-efl,rogerwang\/chromium,Chilledheart\/chromium,junmin-zhu\/chromium-rivertrail,keishi\/chromium,Jonekee\/chromium.src,krieger-od\/nwjs_chromium.src,ondra-novak\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,littlstar\/chromium.src,chuan9\/chromium-crosswalk,fujunwei\/chromium-crosswalk,nacl-webkit\/chrome_deps,markYoungH\/chromium.src,Fireblend\/chromium-crosswalk,zcbenz\/cefode-chromium,junmin-zhu\/chromium-rivertrail,Fireblend\/chromium-crosswalk,axinging\/chromium-crosswalk,anirudhSK\/chromium,PeterWangIntel\/chromium-crosswalk,rogerwang\/chromium,dednal\/chromium.src,mohamed--abdel-maksoud\/chromium.src,anirudhSK\/chromium,fujunwei\/chromium-crosswalk,axinging\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,TheTypoMaster\/chromium-crosswalk,patrickm\/chromium.src,Chilledheart\/chromium,dednal\/chromium.src,jaruba\/chromium.src,Chilledheart\/chromium,timopulkkinen\/BubbleFish,robclark\/chromium,chuan9\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,Jonekee\/chromium.src,Jonekee\/chromium.src,pozdnyakov\/chromium-crosswalk,axinging\/chromium-crosswalk,ChromiumWebApps\/chromium,nacl-webkit\/chrome_deps,Jonekee\/chromium.src,ChromiumWebApps\/chromium,nacl-webkit\/chrome_deps,robclark\/chromium,jaruba\/chromium.src,rogerwang\/chromium,M4sse\/chromium.src,littlstar\/chromium.src,rogerwang\/chromium,ondra-novak\/chromium.src,PeterWangIntel\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,axinging\/chromium-crosswalk,fujunwei\/chromium-crosswalk,anirudhSK\/chromium,timopulkkinen\/BubbleFish,nacl-webkit\/chrome_deps,dednal\/chromium.src,timopulkkinen\/BubbleFish,crosswalk-project\/chromium-crosswalk-efl,TheTypoMaster\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,littlstar\/chromium.src,Fireblend\/chromium-crosswalk,mogoweb\/chromium-crosswalk,nacl-webkit\/chrome_deps,TheTypoMaster\/chromium-crosswalk,dushu1203\/chromium.src,axinging\/chromium-crosswalk,patrickm\/chromium.src,hujiajie\/pa-chromium,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk,keishi\/chromium,ondra-novak\/chromium.src,zcbenz\/cefode-chromium,timopulkkinen\/BubbleFish,zcbenz\/cefode-chromium,jaruba\/chromium.src,patrickm\/chromium.src,krieger-od\/nwjs_chromium.src,junmin-zhu\/chromium-rivertrail,ChromiumWebApps\/chromium,anirudhSK\/chromium,dushu1203\/chromium.src,mogoweb\/chromium-crosswalk,zcbenz\/cefode-chromium,Jonekee\/chromium.src,Fireblend\/chromium-crosswalk,mogoweb\/chromium-crosswalk,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk-efl,Just-D\/chromium-1,Just-D\/chromium-1,patrickm\/chromium.src,krieger-od\/nwjs_chromium.src,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,ChromiumWebApps\/chromium,chuan9\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,TheTypoMaster\/chromium-crosswalk,fujunwei\/chromium-crosswalk,ltilve\/chromium,anirudhSK\/chromium,markYoungH\/chromium.src,jaruba\/chromium.src,Just-D\/chromium-1,dednal\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,chuan9\/chromium-crosswalk,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,Chilledheart\/chromium,Jonekee\/chromium.src,jaruba\/chromium.src,anirudhSK\/chromium,axinging\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,ChromiumWebApps\/chromium,krieger-od\/nwjs_chromium.src,PeterWangIntel\/chromium-crosswalk,Fireblend\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,Jonekee\/chromium.src,PeterWangIntel\/chromium-crosswalk,dushu1203\/chromium.src,ondra-novak\/chromium.src,M4sse\/chromium.src,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,Just-D\/chromium-1,bright-sparks\/chromium-spacewalk,zcbenz\/cefode-chromium,PeterWangIntel\/chromium-crosswalk,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,junmin-zhu\/chromium-rivertrail,M4sse\/chromium.src,krieger-od\/nwjs_chromium.src,mohamed--abdel-maksoud\/chromium.src,hujiajie\/pa-chromium,PeterWangIntel\/chromium-crosswalk,nacl-webkit\/chrome_deps,robclark\/chromium,TheTypoMaster\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,Just-D\/chromium-1,junmin-zhu\/chromium-rivertrail,anirudhSK\/chromium,chuan9\/chromium-crosswalk,dushu1203\/chromium.src,Jonekee\/chromium.src,ondra-novak\/chromium.src,pozdnyakov\/chromium-crosswalk,nacl-webkit\/chrome_deps,hujiajie\/pa-chromium,pozdnyakov\/chromium-crosswalk,anirudhSK\/chromium,littlstar\/chromium.src,Chilledheart\/chromium,ChromiumWebApps\/chromium,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,keishi\/chromium,robclark\/chromium,hujiajie\/pa-chromium,pozdnyakov\/chromium-crosswalk,nacl-webkit\/chrome_deps,littlstar\/chromium.src,krieger-od\/nwjs_chromium.src,ltilve\/chromium,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk-efl,pozdnyakov\/chromium-crosswalk,keishi\/chromium,hgl888\/chromium-crosswalk,Chilledheart\/chromium,patrickm\/chromium.src,Chilledheart\/chromium,patrickm\/chromium.src,M4sse\/chromium.src,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,M4sse\/chromium.src,junmin-zhu\/chromium-rivertrail,anirudhSK\/chromium,crosswalk-project\/chromium-crosswalk-efl,bright-sparks\/chromium-spacewalk,hgl888\/chromium-crosswalk,ltilve\/chromium,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,pozdnyakov\/chromium-crosswalk,ChromiumWebApps\/chromium,pozdnyakov\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,hujiajie\/pa-chromium,dushu1203\/chromium.src,hgl888\/chromium-crosswalk-efl,anirudhSK\/chromium,mogoweb\/chromium-crosswalk,ltilve\/chromium,mohamed--abdel-maksoud\/chromium.src,robclark\/chromium,Pluto-tv\/chromium-crosswalk,timopulkkinen\/BubbleFish,bright-sparks\/chromium-spacewalk,mohamed--abdel-maksoud\/chromium.src,dushu1203\/chromium.src,hujiajie\/pa-chromium,Jonekee\/chromium.src,Just-D\/chromium-1,crosswalk-project\/chromium-crosswalk-efl,robclark\/chromium,mogoweb\/chromium-crosswalk,axinging\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,nacl-webkit\/chrome_deps,Pluto-tv\/chromium-crosswalk,keishi\/chromium,M4sse\/chromium.src,patrickm\/chromium.src,ondra-novak\/chromium.src,axinging\/chromium-crosswalk,dednal\/chromium.src,anirudhSK\/chromium,jaruba\/chromium.src,hujiajie\/pa-chromium,ondra-novak\/chromium.src,ondra-novak\/chromium.src,hujiajie\/pa-chromium,junmin-zhu\/chromium-rivertrail,anirudhSK\/chromium,robclark\/chromium,dednal\/chromium.src,keishi\/chromium,krieger-od\/nwjs_chromium.src,markYoungH\/chromium.src,keishi\/chromium,axinging\/chromium-crosswalk,markYoungH\/chromium.src,timopulkkinen\/BubbleFish,keishi\/chromium,Fireblend\/chromium-crosswalk,bright-sparks\/chromium-spacewalk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- base\/system_monitor\/system_monitor.h\n+++ base\/system_monitor\/system_monitor.h\n@@ -66,7 +66,7 @@\n \/\/ are finished. Observers should implement quick callback functions; if\n \/\/ lengthy operations are needed, the observer should take care to invoke\n \/\/ the operation on an appropriate thread.\n- class PowerObserver {\n+ class BASE_API PowerObserver {\n public:\n \/\/ Notification of a change in power status of the computer, such\n \/\/ as from switching between battery and A\/C power.\n"} {"commit":"233d247ee360dff43136042a0b2fd2b64c73dfe2","subject":"Manual tuning - Wrote hints for commit modes.","message":"Manual tuning\n- Wrote hints for commit modes.\n","repos":"gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Sources\/BaseTen.h\n+++ Sources\/BaseTen.h\n@@ -832,7 +832,9 @@\n *\n * BXDatabaseContext has two modes for handling transactions, which affect queries sent to the database and the way\n * the context's undo manager is used. In both cases, the transaction isolation level is set to READ COMMITTED meaning that\n- * changes committed by other connections will be received. The commit mode is set using -setAutocommits:.\n+ * changes committed by other connections will be received. The commit mode is set using -setAutocommits:. Generally,\n+ * autocommit is well-suited for non-document-based applications. Manual commit is well-suited for document-based \n+ * applications, provided that changes are committed frequently enough.\n *\n *\n * \\section autocommit Autocommit\n@@ -846,7 +848,8 @@\n *\n * In manual commit mode, a savepoint is added after each change. Undo causes a ROLLBACK TO SAVEPOINT query to be sent.\n * This causes not only the changes made by BaseTen to be reverted, but their possible side effects as well. For instance,\n- * if database triggers fire when a specific change is made, its effects will be reverted, too.\n+ * if database triggers fire when a specific change is made, its effects will be reverted, too. When -commit: or -rollback\n+ * is called, undo queue is emptied.\n *\n * In case one client updates a row, BaseTen doesn't send the change to other clients immediately. Instead, it sends a\n * notification indicating that the row is locked and changing it will cause the connection to block until the other\n"} {"commit":"9f0d0c73d5eb21df3c82cb05ac9c7320b4f558b1","subject":"changed version to 1.2 please release","message":"changed version to 1.2 please release\n\ngit-svn-id: 83c4c97093aeea62ac982fbfd516bf9db27f5c99@1243 c36c8488-0289-0348-9b64-b301f74bd9a7\n","repos":"BlueBrain\/Tuvok,BlueBrain\/Tuvok,BlueBrain\/Tuvok","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- StdTuvokDefines.h\n+++ StdTuvokDefines.h\n@@ -53,7 +53,7 @@\n #define TUVOK_MAJOR 1\n #define TUVOK_MINOR 1\n #define TUVOK_PATCH 1\n-#define TUVOK_VERSION \"1.1.1\"\n+#define TUVOK_VERSION \"1.2\"\n #define TUVOK_VERSION_TYPE \"Release\"\n \n #ifdef _MSC_VER\n"} {"commit":"e7eeb148254a5b4e701fb60c99b4a641dc1a8912","subject":"added string GetName()","message":"added string GetName()\n","repos":"worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Atlas\/Stream\/Factory.h\n+++ Atlas\/Stream\/Factory.h\n@@ -4,6 +4,8 @@\n \n #ifndef ATLAS_STREAM_FACTORY_H\n #define ATLAS_STREAM_FACTORY_H\n+\n+#include <string>\n \n namespace Atlas { namespace Stream {\n \n@@ -16,6 +18,8 @@\n \n virtual T* New() = 0;\n virtual void Delete(T*) = 0;\n+\n+ virtual std::string GetName() = 0;\n };\n \n } } \/\/ Atlas::Stream\n"} {"commit":"7def39854c897e67524171aea49e84f3df7536c9","subject":"Add retina check macro","message":"Add retina check macro\n","repos":"cliq\/CCKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- CCKit\/CCDefines.h\n+++ CCKit\/CCDefines.h\n@@ -34,6 +34,7 @@\n #define CCiPhone568NameForImage(image) (CCisPhone568 ? [NSString stringWithFormat:@\"%@-568h.%@\", [image stringByDeletingPathExtension], [image pathExtension]] : image)\n #define CCiPhone568ImageNamed(image) ([UIImage imageNamed:CCiPhone568NameForImage(image)])\n \n+#define CCisRetina ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)] && ([UIScreen mainScreen].scale == 2.0))\n \n #pragma mark - CC Singleton\n \n"} {"commit":"01eb7ba4b4b20e7061ed9261d44a9c941ebfca4b","subject":"will use pass by value instead of pass by ref in method getValue()","message":"will use pass by value instead of pass by ref in method getValue()\n","repos":"MarkusPfundstein\/Cocos2DX-Extensions","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- CCValue\/CCValue.h\n+++ CCValue\/CCValue.h\n@@ -61,7 +61,7 @@\n return fpCmp(m_type, rhs->m_type) == 0 ? 1 : 0;\n }\n \n- CC_SYNTHESIZE_READONLY_PASS_BY_REF(_typeT, m_type, Value);\n+ CC_SYNTHESIZE_READONLY(_typeT, m_type, Value);\n \n protected:\n ~CCValue()\n"} {"commit":"888d49d40775c478121fc4dbe8d84e2432e42b5d","subject":"Include LibKTX in tPicture.","message":"Include LibKTX in tPicture.\n","repos":"bluescan\/tacent","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- Modules\/Image\/Inc\/Image\/tPicture.h\n+++ Modules\/Image\/Inc\/Image\/tPicture.h\n@@ -28,6 +28,7 @@\n #include \"Image\/tImageAPNG.h\"\n #include \"Image\/tImageBMP.h\"\n #include \"Image\/tImageDDS.h\"\n+#include \"Image\/tImageKTX.h\"\n #include \"Image\/tImageEXR.h\"\n #include \"Image\/tImageGIF.h\"\n #include \"Image\/tImageHDR.h\"\n"} {"commit":"bb88ce2bfdf89bb16bdc1a9b31c57d4e6c2db789","subject":"MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures","message":"MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/cjkcodecs\/multibytecodec.c\n+++ Modules\/cjkcodecs\/multibytecodec.c\n@@ -643,6 +643,8 @@\n if (buf.outobj == NULL)\n goto errorexit;\n buf.outbuf = PyUnicode_AS_UNICODE(buf.outobj);\n+ if (buf.outbuf == NULL)\n+ goto errorexit;\n buf.outbuf_end = buf.outbuf + PyUnicode_GET_SIZE(buf.outobj);\n \n if (self->codec->decinit != NULL &&\n"} {"commit":"518f1bde86469adf22be6e0c90aab668c93f1dd4","subject":"1.3 Add clip arrays for blue screening and alpha channel logic. Also some minor tuning","message":"1.3 Add clip arrays for blue screening and alpha channel logic. Also some minor tuning\n\n\ngit-svn-id: f18ccec24f938f15aa42574278fe0cc52f637e81@473 fa1542d4-bde8-0310-ad64-8ed1123d492a\n","repos":"timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,timfel\/squeakvm,OpenSmalltalk\/vm,peteruhnak\/pharo-vm,timfel\/squeakvm,bencoman\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,timfel\/squeakvm,bencoman\/pharo-vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,bencoman\/pharo-vm,OpenSmalltalk\/vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,timfel\/squeakvm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,bencoman\/pharo-vm,OpenSmalltalk\/vm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Mpeg3Plugin\/libmpeg\/video\/output.c\n+++ Mpeg3Plugin\/libmpeg\/video\/output.c\n@@ -29,20 +29,17 @@\n *\/\n \/* Changed Sept 15th by John M McIntosh to support Macintosh & Squeak\n Feb\/march 2001, JMM tuning for the mac\n- I've coded up mpeg3video_ditherframeFastRGB555 and mpeg3video_ditherframeFastRGBA which\n+ I've coded up mpeg3video_ditherframeFastRGB555 and mpeg3video_ditherframeFastARGB which\n do specialized 16 and 32 bit Crb to rgb mapping (Intel should do this too?)\n I also coded up clip arrays versus using CLIP() This avoid test\/branchs which slows things down\n+\t\tSept 2002, JMM added clip arrays to enable blue screening and value for alpha channel\n *\/\n #include \"libmpeg3.h\"\n #include \"mpeg3video.h\"\n #include <string.h>\n \n-unsigned char gClipArray[1026];\n-unsigned short gClipArray16r[1026],gClipArray16g[1026],gClipArray16b[1026];\n-unsigned char *gClipArray_ptr=&gClipArray[512];\n-unsigned short *gClipArray_ptr16r=&gClipArray16r[512];\n-unsigned short *gClipArray_ptr16g=&gClipArray16g[512];\n-unsigned short *gClipArray_ptr16b=&gClipArray16b[512];\n+unsigned char gClipArray[1028];\n+unsigned short gClipArray16r[1028],gClipArray16g[1028],gClipArray16b[1028];\n int doClippingArrays=1;\n \n static unsigned char mpeg3_601_to_rgb[256];\n@@ -514,30 +511,30 @@\n \n \n #define STORE_PIXEL_BGR888 \\\n-\t*data++ = clipArray_ptr[b_l]; \\\n-\t*data++ = clipArray_ptr[g_l]; \\\n-\t*data++ = clipArray_ptr[r_l];\n+\t*data++ = clipArray_ptr_B[b_l]; \\\n+\t*data++ = clipArray_ptr_G[g_l]; \\\n+\t*data++ = clipArray_ptr_R[r_l];\n \n #define STORE_PIXEL_BGRA8888 \\\n-\t*data++ = clipArray_ptr[b_l]; \\\n-\t*data++ = clipArray_ptr[g_l]; \\\n-\t*data++ = clipArray_ptr[r_l]; \\\n-\t*data++ = 0;\n+\t*data++ = clipArray_ptr_B[b_l]; \\\n+\t*data++ = clipArray_ptr_G[g_l]; \\\n+\t*data++ = clipArray_ptr_R[r_l]; \\\n+\t*data++ = alphaChannelValue;\n \n #define STORE_PIXEL_RGB565 \\\n- foo = ((clipArray_ptr[r_l] & 0xf8) << 8) | \\\n-\t\t((clipArray_ptr[g_l] & 0xfc) << 3) | \\\n-\t\t((clipArray_ptr[b_l] & 0xf8) >> 3); *(unsigned short*)data = foo; data += 2;\n+ foo = ((clipArray_ptr_R[r_l] & 0xf8) << 8) | \\\n+\t\t((clipArray_ptr_G[g_l] & 0xfc) << 3) | \\\n+\t\t((clipArray_ptr_B[b_l] & 0xf8) >> 3); *(unsigned short*)data = foo; data += 2;\n \n #define STORE_PIXEL_RGB555 \\\n- foo = ((clipArray_ptr[r_l] & 0xf8) << 7) | \\\n-\t\t((clipArray_ptr[g_l] & 0xf8) << 2) | \\\n-\t\t((clipArray_ptr[b_l] & 0xf8) >> 3); *(unsigned short*)data = foo; data += 2;\n+ foo = ((clipArray_ptr_R[r_l] & 0xf8) << 7) | \\\n+\t\t((clipArray_ptr_G[g_l] & 0xf8) << 2) | \\\n+\t\t((clipArray_ptr_B[b_l] & 0xf8) >> 3); *(unsigned short*)data = foo; data += 2;\n \n #define STORE_PIXEL_RGBI555 \\\n- foo = ((clipArray_ptr[r_l] & 0xf8) << 7) | \\\n- ((clipArray_ptr[g_l] & 0xf8) << 2) | \\\n- ((clipArray_ptr[b_l] & 0xf8) >> 3); \\\n+ foo = ((clipArray_ptr_R[r_l] & 0xf8) << 7) | \\\n+ ((clipArray_ptr_G[g_l] & 0xf8) << 2) | \\\n+ ((clipArray_ptr_B[b_l] & 0xf8) >> 3); \\\n if((unsigned long)data & 0x00000002L) { \\\n \t data -= 2; \\\n *(unsigned short*)data = foo; \\\n@@ -549,37 +546,40 @@\n \n \n #define STORE_PIXEL_RGB888 \\\n-\t*data++ = clipArray_ptr[r_l]; \\\n-\t*data++ = clipArray_ptr[g_l]; \\\n-\t*data++ = clipArray_ptr[b_l];\n+\t*data++ = clipArray_ptr_R[r_l]; \\\n+\t*data++ = clipArray_ptr_G[g_l]; \\\n+\t*data++ = clipArray_ptr_B[b_l];\n \n #define STORE_PIXEL_RGBA8888 \\\n-\t*data++ = clipArray_ptr[r_l]; \\\n-\t*data++ = clipArray_ptr[g_l]; \\\n-\t*data++ = clipArray_ptr[b_l]; \\\n-\t*data++ = 0;\n+\t*data++ = clipArray_ptr_R[r_l]; \\\n+\t*data++ = clipArray_ptr_G[g_l]; \\\n+\t*data++ = clipArray_ptr_B[b_l]; \\\n+\t*data++ = alphaChannelValue;\n \n #define STORE_PIXEL_ARGB8888 \\\n-\t*data++ = 0; \\\n-\t*data++ = clipArray_ptr[r_l]; \\\n-\t*data++ = clipArray_ptr[g_l]; \\\n-\t*data++ = clipArray_ptr[b_l]; \n+\t*data++ = alphaChannelValue; \\\n+\t*data++ = clipArray_ptr_R[r_l]; \\\n+\t*data++ = clipArray_ptr_G[g_l]; \\\n+\t*data++ = clipArray_ptr_B[b_l]; \n \n #define STORE_PIXEL_RGBA16161616 \\\n-\t*data_s++ = clipArray_ptr[r_l]; \\\n-\t*data_s++ = clipArray_ptr[g_l]; \\\n-\t*data_s++ = clipArray_ptr[b_l]; \\\n-\t*data_s++ = 0;\n-\n+\t*data_s++ = clipArray_ptr_R[r_l]; \\\n+\t*data_s++ = clipArray_ptr_G[g_l]; \\\n+\t*data_s++ = clipArray_ptr_B[b_l]; \\\n+\t*data_s++ = alphaChannelValue;\n+\/* JMM broken for 16 bit color here *\/\n \n \n \/* Only good for YUV 4:2:0 *\/\n int mpeg3video_ditherframe(mpeg3video_t *video, unsigned char **src, unsigned char **output_rows)\n {\n \tint h = 0;\n-\tregister unsigned char *y_in, *cb_in, *cr_in;\n+\tregister unsigned char *y_in, *cb_in, *cr_in,alphaChannelValue=video->alphaChannelValue;\n \tlong y_l, r_l, b_l, g_l;\n-\tregister unsigned char *data,*clipArray_ptr=gClipArray_ptr;\n+\tregister unsigned char *data,\n+ *clipArray_ptr_R=&video->clipArray_Red[512],\n+ *clipArray_ptr_G=&video->clipArray_Green[512],\n+ *clipArray_ptr_B=&video->clipArray_Blue[512];\n \tregister int uv_subscript, step, w = -1;\n \tregister short foo;\n \n@@ -970,7 +970,7 @@\n return mpeg3video_ditherframeFastRGB555(video, src, video->output_rows);\n else\n if (video->color_model == MPEG3_ARGB8888) \n- return mpeg3video_ditherframeFastRGBA(video, src, video->output_rows);\n+ return mpeg3video_ditherframeFastARGB(video, src, video->output_rows);\n else\n \treturn mpeg3video_ditherframe(video, src, video->output_rows);\n }\n@@ -1030,15 +1030,20 @@\n \treturn 0;\n }\n \n-int mpeg3video_ditherframeFastRGBA(mpeg3video_t *video, unsigned char **src, unsigned char **output_rows) {\n+int mpeg3video_ditherframeFastARGB(mpeg3video_t *video, unsigned char **src, unsigned char **output_rows) {\n \tint h = 0;\n-\tregister unsigned char *y_in, *cb_in, *cr_in, *clipArray_ptr;\n+\tregister unsigned char *y_in, *cb_in, *cr_in, *clipArray_ptr_R, *clipArray_ptr_G, *clipArray_ptr_B;\n \tlong y_l, r_l, b_l, g_l;\n \tregister unsigned long *data;\n \tregister int uv_subscript, step, w = -1,t1,t2;\n- register long *cr_to_gPtr,*cr_to_rPtr,*cb_to_bPtr,*cb_to_gPtr;;\n-\n-\tclipArray_ptr = gClipArray_ptr;\n+ register long *cr_to_gPtr,*cr_to_rPtr,*cb_to_bPtr,*cb_to_gPtr;\n+ unsigned long alphaChannelValue_t;\n+ \n+\tclipArray_ptr_R = &video->clipArray_Red[512];\n+\tclipArray_ptr_G = &video->clipArray_Green[512];\n+\tclipArray_ptr_B = &video->clipArray_Blue[512];\n+ alphaChannelValue_t = video->alphaChannelValue << 24;\n+ \n \tcr_to_rPtr = &video->cr_to_r[0];\n \tcr_to_gPtr = &video->cr_to_g[0];\n \tcb_to_bPtr = &video->cb_to_b[0];\n@@ -1060,7 +1065,7 @@\n \t\tg_l = (g_l + cr_to_gPtr[*cr_in] + cb_to_gPtr[*cb_in]) >> 16;\n \t\tr_l = (r_l + cr_to_rPtr[*cr_in]) >> 16; \n \t\tb_l = (b_l + cb_to_bPtr[*cb_in]) >> 16;\n- \t*data++ = (clipArray_ptr[r_l] << 16) | (clipArray_ptr[g_l] << 8) | clipArray_ptr[b_l];\n+ \t*data++ = alphaChannelValue_t | (clipArray_ptr_R[r_l] << 16) | (clipArray_ptr_G[g_l] << 8) | clipArray_ptr_B[b_l];\n \tif(w & 1) { \n \tcr_in++; \n \tcb_in++; \n@@ -1076,7 +1081,7 @@\n \t\tg_l = (g_l + cr_to_gPtr[t1] + cb_to_gPtr[t2]) >> 16;\n \t\tr_l = (r_l + cr_to_rPtr[t1]) >> 16; \n \t\tb_l = (b_l + cb_to_bPtr[t2]) >> 16;\n- \t*data++ = (clipArray_ptr[r_l] << 16) | (clipArray_ptr[g_l] << 8) | clipArray_ptr[b_l];\n+ \t*data++ = alphaChannelValue_t | (clipArray_ptr_R[r_l] << 16) | (clipArray_ptr_G[g_l] << 8) | clipArray_ptr_B[b_l];\n }\n }\n } \n@@ -1085,24 +1090,22 @@\n \n int mpeg3video_ditherframeFastRGB555(mpeg3video_t *video, unsigned char **src, unsigned char **output_rows) {\n \tint h = 0;\n-\tregister unsigned char *y_in, *cb_in, *cr_in, *clipArray_ptr;\n-\tregister unsigned short *clipArray_ptr16r,*clipArray_ptr16g,*clipArray_ptr16b;\n \tlong y_l, r_l, b_l, g_l;\n-\tregister unsigned short *data;\n-\tregister int uv_subscript, step, w = -1,t1,t2;\n- register long *cr_to_gPtr,*cr_to_rPtr,*cb_to_bPtr,*cb_to_gPtr;;\n+\tunsigned char *y_in, *cb_in, *cr_in;\n+ unsigned short *clipArray_ptr16r,*clipArray_ptr16g,*clipArray_ptr16b,*data;\n+\tint w,t1,t2;\n+ long *cr_to_gPtr,*cr_to_rPtr,*cb_to_bPtr,*cb_to_gPtr;;\n \n-\tclipArray_ptr = gClipArray_ptr;\n-\tclipArray_ptr16r = gClipArray_ptr16r;\n-\tclipArray_ptr16g = gClipArray_ptr16g;\n-\tclipArray_ptr16b = gClipArray_ptr16b;\n-\tcr_to_rPtr = &video->cr_to_r[0];\n+\tclipArray_ptr16r = &video->clipArray16_Red[512];\n+\tclipArray_ptr16g = &video->clipArray16_Green[512];\n+\tclipArray_ptr16b = &video->clipArray16_Blue[512];\n+ cr_to_rPtr = &video->cr_to_r[0];\n \tcr_to_gPtr = &video->cr_to_g[0];\n \tcb_to_bPtr = &video->cb_to_b[0];\n \tcb_to_gPtr = &video->cb_to_g[0];\n \t\n-\tfor(h = 0; h < video->out_h; h++) \n- \t{ \n+ if(video->out_w == video->horizontal_size) {\n+ for(h = 0; h < video->out_h; h++) { \n \t\tt1 = video->y_table[h] + video->in_y;\n \t\tt2 = (t1 >> 1) * video->chrom_width;\n \t\ty_in = &src[0][t1 * video->coded_picture_width] + video->in_x; \n@@ -1110,24 +1113,34 @@\n \t\tcr_in = &src[2][t2] + (video->in_x >> 1); \n \t\tdata = (unsigned short*) output_rows[h];\n \n- if(video->out_w == video->horizontal_size) {\n- for(w = 0; w < video->horizontal_size; w++) { \n+ for (w = 0; w < video->horizontal_size; w++) { \n \t\ty_l = *y_in++; \n \t\tr_l = g_l = b_l = y_l << 16; \n \t\tg_l = (g_l + cr_to_gPtr[*cr_in] + cb_to_gPtr[*cb_in]) >> 16;\n \t\tr_l = (r_l + cr_to_rPtr[*cr_in]) >> 16; \n \t\tb_l = (b_l + cb_to_bPtr[*cb_in]) >> 16;\n- *data++ = clipArray_ptr16r[r_l] | \n+ *data++ = clipArray_ptr16r[r_l] | \n \t\t clipArray_ptr16g[g_l] | \n \t\t clipArray_ptr16b[b_l];\n+ \n \tif(w & 1) { \n- \tcr_in++; \n- \tcb_in++; \n- \t} \n+ cr_in++; \n+ cb_in++; \n+ } \n }\n- } else {\n- for(w = 0; w < video->out_w; w++) \n- \t { \n+ }\n+ } else {\n+ int uv_subscript;\n+ \n+ for(h = 0; h < video->out_h; h++) { \n+ \t\tt1 = video->y_table[h] + video->in_y;\n+ \t\tt2 = (t1 >> 1) * video->chrom_width;\n+ \t\ty_in = &src[0][t1 * video->coded_picture_width] + video->in_x; \n+ \t\tcb_in = &src[1][t2] + (video->in_x >> 2); \n+ \t\tcr_in = &src[2][t2] + (video->in_x >> 1); \n+ \t\tdata = (unsigned short*) output_rows[h];\n+\n+ for (w = 0; w < video->out_w; w++) { \n \t\tuv_subscript = video->x_table[w] \/ 2; \n \t\tr_l = g_l = b_l = (y_in[video->x_table[w]]) << 16; \n \t\tt1 = cr_in[uv_subscript];\n@@ -1138,9 +1151,10 @@\n *data++ = clipArray_ptr16r[r_l] | \n \t\t clipArray_ptr16g[g_l] | \n \t\t clipArray_ptr16b[b_l];\n- }\n+ \n }\n- } \n+ }\n+ } \n \n \n return 0;\n@@ -1151,19 +1165,6 @@\n \tint i, j, k, l, h;\n \tunsigned char **src = video->output_src;\n \n-\tif (doClippingArrays) {\n-\t\tfor(h=-512;h<=512;h++) {\n-\t\t\tgClipArray_ptr[h]=CLIP(h);\n-\t\t\tgClipArray_ptr16r[h]=(CLIP(h) & 0xf8) << 7;\n-\t\t\tgClipArray_ptr16g[h]=(CLIP(h) & 0xf8) << 2;\n-\t\t\tgClipArray_ptr16b[h]=(CLIP(h) & 0xf8) >> 3;\n-\t\t\tif (gClipArray_ptr[h] == 0x00) \n-\t\t\t\tgClipArray_ptr[h] = 0x01;\n-\t\t\tif (gClipArray_ptr16b[h] == 0x00) \n-\t\t\t\tgClipArray_ptr16b[h] = 0x01;\n-\t\t}\n-\t\tdoClippingArrays = 0;\n-\t}\n \n \/* Copy YUV buffers *\/\n \tif(video->want_yvu)\n@@ -1224,7 +1225,7 @@\n \t mpeg3video_ditherframeFastRGB555(video, src, video->output_rows);\n \t\telse\n \t\t if (video->color_model == MPEG3_ARGB8888) \n- \t mpeg3video_ditherframeFastRGBA(video, src, video->output_rows);\n+ \t mpeg3video_ditherframeFastARGB(video, src, video->output_rows);\n \t\t else\n \t\tmpeg3video_ditherframe(video, src, video->output_rows);\n \t}\n@@ -1271,3 +1272,41 @@\n \/* Not used *\/\n \treturn 0;\n }\n+\n+void doClipArrays(mpeg3_t *file) {\n+\tlong h,i;\n+\t\n+\tif (doClippingArrays) {\n+ \n+\t\tfor(h=-512;h<=512;h++) {\n+\t\t\tgClipArray[h+512]=CLIP(h);\n+\t\t\tgClipArray16r[h+512]=(CLIP(h) & 0xf8) << 7;\n+\t\t\tgClipArray16g[h+512]=(CLIP(h) & 0xf8) << 2;\n+\t\t\tgClipArray16b[h+512]=(CLIP(h) & 0xf8) >> 3;\n+\t\t\tif (gClipArray[h+512] == 0x00) \n+\t\t\t\tgClipArray[h+512] = 0x01;\n+\t\t\tif (gClipArray16b[h+512] == 0x00) \n+\t\t\t\tgClipArray16b[h+512] = 0x01;\n+\t\t}\n+\t\tdoClippingArrays = 0;\n+\t}\n+ \n+ for(h=0;h<file->total_vstreams;h++) { \n+ memcpy(&file->vtrack[h]->video->clipArray_Red,&gClipArray,1028);\n+ memcpy(&file->vtrack[h]->video->clipArray_Green,&gClipArray,1028);\n+ memcpy(&file->vtrack[h]->video->clipArray_Blue,&gClipArray,1028);\n+ memcpy(&file->vtrack[h]->video->clipArray16_Red,&gClipArray16r,1028*2);\n+ memcpy(&file->vtrack[h]->video->clipArray16_Green,&gClipArray16g,1028*2);\n+ memcpy(&file->vtrack[h]->video->clipArray16_Blue,&gClipArray16b,1028*2);\n+ file->vtrack[h]->video->alphaChannelValue =0x00;\n+ for(i=0;i<256;i++) {\n+ \tfile->vtrack[h]->video->blueScreenMappingR[i] = i;\n+ \tfile->vtrack[h]->video->blueScreenMappingG[i] = i;\n+ \tfile->vtrack[h]->video->blueScreenMappingB[i] = i;\n+ }\n+ file->vtrack[h]->video->blueScreenMappingR[0] = 1;\n+ file->vtrack[h]->video->blueScreenMappingG[0] = 1;\n+ file->vtrack[h]->video->blueScreenMappingB[0] = 1;\n+ }\n+}\n+\n"} {"commit":"9873b19194c72d7bb1a016191c82dd794845d291","subject":"[FIX] reserve before open bug in mmap string","message":"[FIX] reserve before open bug in mmap string\n\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13491 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"weese\/seqan,ktrappe\/seqan,holtgrewe\/seqan,bayolau\/seqan,xp3i4\/seqan,bestrauc\/seqan,limeng12\/seqan,xenigmax\/seqan,bestrauc\/seqan,PF2-pasteur-fr\/seqan,weese\/seqan,xp3i4\/seqan,bestrauc\/seqan,h-2\/seqan,ktrappe\/seqan,bayolau\/seqan,catkira\/seqan,PF2-pasteur-fr\/seqan,PF2-pasteur-fr\/seqan,budach\/seqan,xp3i4\/seqan,catkira\/seqan,hannespetur\/SeqAnHTS,bayolau\/seqan,PF2-pasteur-fr\/seqan,xenigmax\/seqan,hannespetur\/SeqAnHTS,ktrappe\/seqan,holtgrewe\/seqan,ktrappe\/seqan,bestrauc\/seqan,bayolau\/seqan,weese\/seqan,hannespetur\/SeqAnHTS,xp3i4\/seqan,ktrappe\/seqan,limeng12\/seqan,h-2\/seqan,PF2-pasteur-fr\/seqan,weese\/seqan,h-2\/seqan,bayolau\/seqan,h-2\/seqan,holtgrewe\/seqan,xp3i4\/seqan,weese\/seqan,ktrappe\/seqan,holtgrewe\/seqan,JohnReid\/seqan,hannespetur\/SeqAnHTS,catkira\/seqan,budach\/seqan,ktrappe\/seqan,xp3i4\/seqan,h-2\/seqan,PF2-pasteur-fr\/seqan,limeng12\/seqan,catkira\/seqan,budach\/seqan,JohnReid\/seqan,xp3i4\/seqan,xenigmax\/seqan,ktrappe\/seqan,JohnReid\/seqan,JohnReid\/seqan,bayolau\/seqan,holtgrewe\/seqan,limeng12\/seqan,xenigmax\/seqan,bestrauc\/seqan,limeng12\/seqan,JohnReid\/seqan,hannespetur\/SeqAnHTS,bestrauc\/seqan,h-2\/seqan,xenigmax\/seqan,xp3i4\/seqan,hannespetur\/SeqAnHTS,limeng12\/seqan,weese\/seqan,JohnReid\/seqan,xenigmax\/seqan,budach\/seqan,JohnReid\/seqan,h-2\/seqan,bayolau\/seqan,bestrauc\/seqan,PF2-pasteur-fr\/seqan,weese\/seqan,h-2\/seqan,weese\/seqan,hannespetur\/SeqAnHTS,xenigmax\/seqan,holtgrewe\/seqan,catkira\/seqan,h-2\/seqan,budach\/seqan,JohnReid\/seqan,xp3i4\/seqan,xenigmax\/seqan,limeng12\/seqan,budach\/seqan,hannespetur\/SeqAnHTS,holtgrewe\/seqan,budach\/seqan,catkira\/seqan,bestrauc\/seqan,JohnReid\/seqan,hannespetur\/SeqAnHTS,limeng12\/seqan,holtgrewe\/seqan,catkira\/seqan,bayolau\/seqan,ktrappe\/seqan,catkira\/seqan,limeng12\/seqan,bayolau\/seqan,catkira\/seqan,budach\/seqan,PF2-pasteur-fr\/seqan,PF2-pasteur-fr\/seqan,budach\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/include\/seqan\/file\/string_mmap.h\n+++ core\/include\/seqan\/file\/string_mmap.h\n@@ -110,8 +110,8 @@\n \n \t\texplicit\n String(TSize size = 0):\n-\t\t\tdata_begin(0),\n-\t\t\tdata_end(0),\n+\t\t\tdata_begin(NULL),\n+\t\t\tdata_end(NULL),\n \t\t\tadvise(MAP_NORMAL)\n {\n \t\t\tresize(*this, size);\n@@ -119,8 +119,8 @@\n \n \t\texplicit\n String(TFile &_file):\n-\t\t\tdata_begin(0),\n-\t\t\tdata_end(0),\n+\t\t\tdata_begin(NULL),\n+\t\t\tdata_end(NULL),\n \t\t\tadvise(MAP_NORMAL)\n {\n \t\t\topen(*this, _file);\n@@ -128,8 +128,8 @@\n \n \t\texplicit\n String(const char *fileName, int openMode = DefaultOpenMode<TFile>::VALUE):\n-\t\t\tdata_begin(0),\n-\t\t\tdata_end(0),\n+\t\t\tdata_begin(NULL),\n+\t\t\tdata_end(NULL),\n \t\t\tadvise(MAP_NORMAL)\n {\n \t\t\topen(*this, fileName, openMode);\n@@ -402,7 +402,6 @@\n return false;\n }\n adviseFileSegment(me.mapping, me.advise, me.data_begin, 0, length(me.mapping));\n- me.data_end = me.data_begin + new_capacity;\n \t\t}\n else\n \t\t\tresize(me.mapping, 0);\n@@ -441,7 +440,7 @@\n {\n \/\/ if file gets bigger, resize first\n if (old_capacity < new_capacity)\n- resize(me.mapping, new_capacity * sizeof(TValue));\n+ resize(me.mapping, (TFileSize)new_capacity * (TFileSize)sizeof(TValue));\n \n me.data_begin = static_cast<TValue*>(remapFileSegment(\n me.mapping,\n@@ -452,7 +451,7 @@\n \n \/\/ if file gets smaller, resize at last\n if (old_capacity > new_capacity)\n- resize(me.mapping, new_capacity * sizeof(TValue));\n+ resize(me.mapping, (TFileSize)new_capacity * (TFileSize)sizeof(TValue));\n \n if (me.data_begin == NULL)\n {\n@@ -468,6 +467,8 @@\n result &= _map(me, new_capacity);\n if (me.data_begin != NULL)\n _setLength(me, seq_length);\n+ else\n+ me.data_begin = me.data_end;\n return result;\n \t}\n \n@@ -487,8 +488,12 @@\n _allocateStorage(String<TValue, MMap<TConfig> > &me, TSize new_capacity) \n \t{\n \/\/IOREV\n-\t\tTSize size = _computeSizeForCapacity(me, new_capacity);\n-\t\t_map(me, size);\n+ typename Size< String<TValue, MMap<TConfig> > >::Type seq_length = length(me);\n+\t\t_map(me, _computeSizeForCapacity(me, new_capacity));\n+ if (me.data_begin != NULL)\n+ _setLength(me, seq_length);\n+ else\n+ me.data_begin = me.data_end;\n \t\treturn NULL;\n \t}\n \n@@ -606,13 +611,17 @@\n close(String<TValue, MMap<TConfig> > &me) \n \t{\n typedef typename Size<typename TConfig::TFile>::Type TFileSize;\n+\n \t\tif (me)\n \t\t{\n+ TFileSize finalLen = (TFileSize)length(me) * (TFileSize)sizeof(TValue);\n+\n \t\t\t\/\/ close associated file\n \t\t\tif (me.mapping.temporary)\n \t\t\t\tcancel(me);\n \n-\t\t\tcloseAndResize(me.mapping, (TFileSize)length(me) * (TFileSize)sizeof(TValue));\n+ _unmap(me);\n+\t\t\tcloseAndResize(me.mapping, finalLen);\n \t\t}\n \t\treturn true;\n }\n"} {"commit":"11686f3d7bd5b8a96f88a239d60688e6eafe2445","subject":"[FIX] Index: qualified indexRawText() as host-device","message":"[FIX] Index: qualified indexRawText() as host-device\n","repos":"catkira\/seqan,hannespetur\/SeqAnHTS,bestrauc\/seqan,xp3i4\/seqan,PF2-pasteur-fr\/seqan,budach\/seqan,xp3i4\/seqan,bestrauc\/seqan,PF2-pasteur-fr\/seqan,limeng12\/seqan,xp3i4\/seqan,h-2\/seqan,JohnReid\/seqan,bayolau\/seqan,bestrauc\/seqan,JohnReid\/seqan,ktrappe\/seqan,bayolau\/seqan,budach\/seqan,h-2\/seqan,JohnReid\/seqan,PF2-pasteur-fr\/seqan,xp3i4\/seqan,PF2-pasteur-fr\/seqan,JohnReid\/seqan,JohnReid\/seqan,catkira\/seqan,xenigmax\/seqan,ktrappe\/seqan,hannespetur\/SeqAnHTS,h-2\/seqan,ktrappe\/seqan,xenigmax\/seqan,bayolau\/seqan,h-2\/seqan,PF2-pasteur-fr\/seqan,bestrauc\/seqan,xenigmax\/seqan,hannespetur\/SeqAnHTS,hannespetur\/SeqAnHTS,bestrauc\/seqan,limeng12\/seqan,xenigmax\/seqan,xp3i4\/seqan,catkira\/seqan,bayolau\/seqan,ktrappe\/seqan,JohnReid\/seqan,limeng12\/seqan,bayolau\/seqan,bestrauc\/seqan,ktrappe\/seqan,bayolau\/seqan,PF2-pasteur-fr\/seqan,PF2-pasteur-fr\/seqan,xp3i4\/seqan,catkira\/seqan,hannespetur\/SeqAnHTS,xenigmax\/seqan,hannespetur\/SeqAnHTS,ktrappe\/seqan,budach\/seqan,ktrappe\/seqan,h-2\/seqan,h-2\/seqan,catkira\/seqan,catkira\/seqan,budach\/seqan,ktrappe\/seqan,h-2\/seqan,bestrauc\/seqan,limeng12\/seqan,bayolau\/seqan,catkira\/seqan,h-2\/seqan,limeng12\/seqan,bestrauc\/seqan,PF2-pasteur-fr\/seqan,PF2-pasteur-fr\/seqan,xp3i4\/seqan,bayolau\/seqan,h-2\/seqan,catkira\/seqan,hannespetur\/SeqAnHTS,xenigmax\/seqan,catkira\/seqan,hannespetur\/SeqAnHTS,budach\/seqan,budach\/seqan,limeng12\/seqan,hannespetur\/SeqAnHTS,bayolau\/seqan,limeng12\/seqan,budach\/seqan,xenigmax\/seqan,xp3i4\/seqan,xenigmax\/seqan,JohnReid\/seqan,JohnReid\/seqan,limeng12\/seqan,JohnReid\/seqan,budach\/seqan,ktrappe\/seqan,limeng12\/seqan,xp3i4\/seqan,budach\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/include\/seqan\/index\/index_base.h\n+++ core\/include\/seqan\/index\/index_base.h\n@@ -1680,9 +1680,20 @@\n *\/\n \n \ttemplate <typename TText, typename TSpec>\n-\tinline typename Fibre<Index<TText, TSpec>, FibreRawText>::Type & indexRawText(Index<TText, TSpec> &index) { return getFibre(index, FibreRawText()); }\n-\ttemplate <typename TText, typename TSpec>\n-\tinline typename Fibre<Index<TText, TSpec> const, FibreRawText>::Type & indexRawText(Index<TText, TSpec> const &index) { return getFibre(index, FibreRawText()); }\n+\tinline SEQAN_HOST_DEVICE\n+\ttypename Fibre<Index<TText, TSpec>, FibreRawText>::Type &\n+\tindexRawText(Index<TText, TSpec> &index)\n+\t{\n+\t return getFibre(index, FibreRawText());\n+\t}\n+\n+\ttemplate <typename TText, typename TSpec>\n+\tinline SEQAN_HOST_DEVICE\n+\ttypename Fibre<Index<TText, TSpec> const, FibreRawText>::Type &\n+\tindexRawText(Index<TText, TSpec> const &index)\n+\t{\n+\t return getFibre(index, FibreRawText());\n+\t}\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/**\n"} {"commit":"7b4dcdd9ab0f4ad03cdde0f267f2f36bd15bb5a6","subject":"add macro for THERON_DEBUG","message":"add macro for THERON_DEBUG\n","repos":"lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame,lightningkay\/NoahGameFrame","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- NFComm\/NFPluginModule\/NFPlatform.h\n+++ NFComm\/NFPluginModule\/NFPlatform.h\n@@ -301,7 +301,7 @@\n \n \n \/\/use actor mode--begin\n-#define NF_ACTOR_THREAD_COUNT 16\n+#define NF_ACTOR_THREAD_COUNT 1\n \n #ifndef NF_DYNAMIC_PLUGIN\n #define NF_DYNAMIC_PLUGIN\n@@ -312,6 +312,12 @@\n #endif\n \n #ifdef NF_USE_ACTOR\n+\n+#ifdef NF_DEBUG_MODE\n+#define THERON_DEBUG 1\n+#else\n+#define THERON_DEBUG 0\n+#endif\n \n #ifndef THERON_CPP11\n #define THERON_CPP11 1\n"} {"commit":"9d42fd67dcd0af12d8d7c2007566d3a6cb7db5c6","subject":"don't record sensor data by default","message":"don't record sensor data by default\n","repos":"BerlinUnited\/NaoTH,BerlinUnited\/NaoTH,BerlinUnited\/NaoTH,BerlinUnited\/NaoTH,BerlinUnited\/NaoTH,BerlinUnited\/NaoTH,BerlinUnited\/NaoTH","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- NaoTHSoccer\/Source\/Motion\/Motion.h\n+++ NaoTHSoccer\/Source\/Motion\/Motion.h\n@@ -160,7 +160,7 @@\n \/\/PARAMETER_REGISTER(useInertiaSensorCalibration) = true;\n PARAMETER_REGISTER(useIMUDataForRotationOdometry) = true;\n \n- PARAMETER_REGISTER(recordSensorData) = true;\n+ PARAMETER_REGISTER(recordSensorData) = false;\n syncWithConfig();\n }\n \n"} {"commit":"5b81e4b0416b6cc0079d970a24ad645737889e08","subject":"Bump version to 2.5.1","message":"Bump version to 2.5.1\n","repos":"christophercotton\/FreeStreamer,nKey\/FreeStreamer,ren6\/FreeStreamer,christophercotton\/FreeStreamer,nKey\/FreeStreamer,ren6\/FreeStreamer,alecgorge\/FreeStreamer,zdw19840929\/FreeStreamer,alecgorge\/FreeStreamer,mjasa\/FreeStreamer,mjasa\/FreeStreamer,alecgorge\/FreeStreamer,ren6\/FreeStreamer,zdw19840929\/FreeStreamer,nKey\/FreeStreamer,christophercotton\/FreeStreamer,mjasa\/FreeStreamer,zdw19840929\/FreeStreamer","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Common\/FSAudioStream.h\n+++ Common\/FSAudioStream.h\n@@ -22,7 +22,7 @@\n \/**\n * The reversion of the current release\n *\/\n-#define FREESTREAMER_VERSION_REVISION 0\n+#define FREESTREAMER_VERSION_REVISION 1\n \n \/**\n * Follow this notification for the audio stream state changes.\n"} {"commit":"f79b22eb308b75843abf033fd710f94a99f9eda0","subject":"Made output filenames more consistent.","message":"Made output filenames more consistent.\n","repos":"spinicist\/old_QUIT,spinicist\/old_QUIT,spinicist\/old_QUIT,spinicist\/old_QUIT","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- DESPOT_Functors.h\n+++ DESPOT_Functors.h\n@@ -255,9 +255,9 @@\n \t\t\t\tcase Components::Three: m_names = {\"T1_a\", \"T2_a\", \"T1_b\", \"T2_b\", \"T1_c\", \"T2_c\", \"tau_a\", \"f_a\", \"f_c\"}; break;\n \t\t\t}\n \t\t\tfor (int i = 0; i < nOffRes(); i++)\n-\t\t\t\tm_names.emplace_back(\"f\" + std::to_string(i));\n+\t\t\t\tm_names.emplace_back(\"f0_\" + std::to_string(i));\n \t\t\tfor (int i = 0; i < nPD(); i++)\n-\t\t\t\tm_names.emplace_back(\"PD\" + std::to_string(i));\n+\t\t\t\tm_names.emplace_back(\"PD_\" + std::to_string(i));\n \t\t}\n \t\t\n \t\tconst bool constraint(const VectorXd ¶ms) {\n@@ -443,7 +443,7 @@\n \t\t\tm_names.resize(inputs());\n \t\t\tm_names.at(0) = \"T2\";\n \t\t\tfor (int i = 0; i < nOffRes(); i++)\n-\t\t\t\tm_names.at(1 + i) = \"f0_off_\" + std::to_string(i);\n+\t\t\t\tm_names.at(1 + i) = \"f0_\" + std::to_string(i);\n \t\t\tfor (int i = 0; i < nPD(); i++)\n \t\t\t\tm_names.at(1 + nOffRes() + i) = \"PD_\" + std::to_string(i);\n \t\t}\n"} {"commit":"45d92434b7288cf72de19cda781de1372432b12b","subject":"include entity table header","message":"include entity table header\n","repos":"OneMoreThing\/DataKit,eaigner\/DataKit,OneMoreThing\/DataKit,eaigner\/DataKit,eaigner\/DataKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- DataKit\/DataKit.h\n+++ DataKit\/DataKit.h\n@@ -12,4 +12,5 @@\n #import \"DKQuery.h\"\n #import \"DKMapReduce.h\"\n #import \"DKFile.h\"\n-#import \"DKConstants.h\"+#import \"DKConstants.h\"\n+#import \"DKEntityTableViewController.h\""} {"commit":"13824a243f688cc85b0df243ecff5adb9c37bdc6","subject":"added tboot addresses as globals","message":"added tboot addresses as globals\n","repos":"tmroeder\/cloudproxy,tmroeder\/cloudproxy,William-J-Earl\/cloudproxy,cjpatton\/cloudproxy,William-J-Earl\/cloudproxy,cjpatton\/cloudproxy,jlmucb\/cloudproxy,jlmucb\/cloudproxy,jethrogb\/cloudproxy,cjpatton\/cloudproxy,William-J-Earl\/cloudproxy,jethrogb\/cloudproxy,William-J-Earl\/cloudproxy,jethrogb\/cloudproxy,jlmucb\/cloudproxy,tmroeder\/cloudproxy,kevinawalsh\/cloudproxy,jethrogb\/cloudproxy,kevinawalsh\/cloudproxy,tmroeder\/cloudproxy,cjpatton\/cloudproxy,jlmucb\/cloudproxy,tmroeder\/cloudproxy,jethrogb\/cloudproxy,jlmucb\/cloudproxy,William-J-Earl\/cloudproxy,cjpatton\/cloudproxy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cpvmm\/vmm\/bootstrap\/bootstrap_entry.c\n+++ cpvmm\/vmm\/bootstrap\/bootstrap_entry.c\n@@ -67,8 +67,10 @@\n \r\n \r\n \/\/ Memory layout on start32_evmm entry\r\n-uint32_t bootstrap_start= 0; \/\/ this is the bootstrap image start address\r\n-uint32_t bootstrap_end= 0; \/\/ this is the bootstrap image end address\r\n+uint32_t tboot_start= 0; \/\/ tboot image start address\r\n+uint32_t tboot_end= 0; \/\/ tboot image end address\r\n+uint32_t bootstrap_start= 0; \/\/ bootstrap image start address\r\n+uint32_t bootstrap_end= 0; \/\/ bootstrap image end address\r\n uint32_t evmm_start= 0; \/\/ location of evmm start\r\n uint32_t evmm_end= 0; \/\/ location of evmm image start\r\n uint32_t linux_start= 0; \/\/ location of linux imag start\r\n@@ -1411,6 +1413,11 @@\n (uint32_t)mbi, initial_entry, magic);\r\n #endif\r\n \r\n+ \/\/ tboot start\/end, this is the only data from the shared\r\n+ \/\/ page we use\r\n+ tboot_start= shared_page->tboot_base;\r\n+ tboot_end= shared_page->tboot_base+shared_page->tboot_size;\r\n+\r\n \/\/ bootstrap's start (load) address and its end address\r\n bootstrap_start= (uint32_t)&_start_bootstrap;\r\n bootstrap_end= (uint32_t)&_end_bootstrap;\r\n@@ -1441,11 +1448,8 @@\n }\r\n #ifdef JLMDEBUG\r\n \/\/ shared page\r\n- bprint(\"shared_page data:\\n\");\r\n- bprint(\"\\t tboot_base: 0x%08x\\n\", shared_page->tboot_base);\r\n- bprint(\"\\t tboot_size: 0x%x\\n\", shared_page->tboot_size);\r\n- \r\n- \/\/ image info\r\n+ bprint(\"\\ttboot_start: 0x%08x\\n\", tboot_start);\r\n+ bprint(\"\\ttboot_end: 0x%x\\n\", tboot_end);\r\n bprint(\"bootstrap_start, bootstrap_end: 0x%08x 0x%08x, size: %d\\n\", \r\n bootstrap_start, bootstrap_end, bootstrap_end-bootstrap_start);\r\n bprint(\"evmm_start, evmm_end: 0x%08x 0x%08x\\n\", evmm_start, evmm_end);\r\n@@ -1631,6 +1635,8 @@\n else {\r\n bprint(\"\\tinvalid command line\\n\");\r\n }\r\n+ bprint(\"code at evmm start\\n\");\r\n+ HexDump((uint8_t*)evmm_start_address, (uint8_t*)evmm_start_address+10);\r\n #endif\r\n LOOP_FOREVER\r\n \r\n"} {"commit":"ce06342585ae8fca663f6b724478b2b3d770402e","subject":"icommented out write to msr","message":"icommented out write to msr\n","repos":"jethrogb\/cloudproxy,jethrogb\/cloudproxy,tmroeder\/cloudproxy,William-J-Earl\/cloudproxy,kevinawalsh\/cloudproxy,tmroeder\/cloudproxy,jlmucb\/cloudproxy,cjpatton\/cloudproxy,tmroeder\/cloudproxy,William-J-Earl\/cloudproxy,cjpatton\/cloudproxy,tmroeder\/cloudproxy,kevinawalsh\/cloudproxy,jethrogb\/cloudproxy,cjpatton\/cloudproxy,jlmucb\/cloudproxy,jlmucb\/cloudproxy,jlmucb\/cloudproxy,cjpatton\/cloudproxy,tmroeder\/cloudproxy,William-J-Earl\/cloudproxy,jethrogb\/cloudproxy,William-J-Earl\/cloudproxy,William-J-Earl\/cloudproxy,jlmucb\/cloudproxy,jethrogb\/cloudproxy,cjpatton\/cloudproxy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cpvmm\/vmm\/bootstrap\/bootstrap_entry.c\n+++ cpvmm\/vmm\/bootstrap\/bootstrap_entry.c\n@@ -370,10 +370,9 @@\n }\r\n \r\n \r\n-\/\/ x32_pt64_setup_paging: establish paging tables for x64 -bit mode, \r\n \/\/ 2MB pages while running in 32-bit mode.\r\n \/\/ It should scope full 32-bit space, i.e. 4G\r\n-void x32_pt64_setup_paging(uint64_t memory_size)\r\n+void setup_64bit_paging(uint64_t memory_size)\r\n {\r\n uint32_t pdpt_entry_id;\r\n uint32_t pdt_entry_id;\r\n@@ -449,7 +448,7 @@\n ia32_write_gdtr(&gdtr_64);\r\n \r\n \/\/ setup paging, control registers and flags on BSP\r\n- x32_pt64_setup_paging(TOTAL_MEM);\r\n+ setup_64bit_paging(TOTAL_MEM);\r\n \r\n \/\/ set cr3 and cr4\r\n ia32_write_cr3(evmm64_cr3);\r\n@@ -462,7 +461,7 @@\n \/\/ init64.i64_efer was never set but it is being written into the msr\r\n \/\/ ia32_read_msr(0xc0000080, &init64.i64_efer);\r\n \/\/ init64.i64_efer|= EFER_LME; \/\/ EFER_SCE EFER_LMA EFER_NXE\r\n- ia32_write_msr(0xc0000080, &init64.i64_efer);\r\n+ \/\/ ia32_write_msr(0xc0000080, &init64.i64_efer);\r\n \r\n \/\/ we don't really use this structure\r\n init64.i64_gdtr= gdtr_64;\r\n"} {"commit":"c78cc5353bcc19b66a5b487aa700bd6709a0eb65","subject":"free regex","message":"free regex\n","repos":"nvoron23\/arangodb,nekulin\/arangodb,mujiansu\/arangodb,kkdd\/arangodb,nekulin\/arangodb,abaditsegay\/arangodb,kkdd\/arangodb,razvanphp\/arangodb,abaditsegay\/arangodb,morsdatum\/ArangoDB,morsdatum\/ArangoDB,nvoron23\/arangodb,morsdatum\/ArangoDB,nvoron23\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,nekulin\/arangodb,morsdatum\/ArangoDB,razvanphp\/arangodb,nvoron23\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,pekeler\/arangodb,nekulin\/arangodb,mujiansu\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,pekeler\/arangodb,pekeler\/arangodb,pekeler\/arangodb,pekeler\/arangodb,mujiansu\/arangodb,pekeler\/arangodb,morsdatum\/ArangoDB,kkdd\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,mujiansu\/arangodb,razvanphp\/arangodb,abaditsegay\/arangodb,kkdd\/arangodb,razvanphp\/arangodb,razvanphp\/arangodb,morsdatum\/ArangoDB,morsdatum\/ArangoDB,aurelijusb\/arangodb,aurelijusb\/arangodb,kkdd\/arangodb,pekeler\/arangodb,nekulin\/arangodb,razvanphp\/arangodb,nvoron23\/arangodb,nekulin\/arangodb,kkdd\/arangodb,morsdatum\/ArangoDB,abaditsegay\/arangodb,razvanphp\/arangodb,morsdatum\/ArangoDB,aurelijusb\/arangodb,mujiansu\/arangodb,aurelijusb\/arangodb,nekulin\/arangodb,aurelijusb\/arangodb,mujiansu\/arangodb,mujiansu\/arangodb,kkdd\/arangodb,mujiansu\/arangodb,mujiansu\/arangodb,aurelijusb\/arangodb,nvoron23\/arangodb,abaditsegay\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,nekulin\/arangodb,morsdatum\/ArangoDB,mujiansu\/arangodb,nvoron23\/arangodb,abaditsegay\/arangodb,razvanphp\/arangodb,razvanphp\/arangodb,abaditsegay\/arangodb,aurelijusb\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,razvanphp\/arangodb,nekulin\/arangodb,nvoron23\/arangodb,abaditsegay\/arangodb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- VocBase\/vocbase.c\n+++ VocBase\/vocbase.c\n@@ -495,6 +495,7 @@\n file = TRI_Concatenate2File(path, name);\n if (!file) {\n LOG_FATAL(\"out of memory\");\n+ regfree(&re);\n return TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY);\n }\n \n"} {"commit":"098ab73142d9fad4c7f4b6d3ce03ce9fed7b703a","subject":"Template param to disable ipow calculation with <<","message":"Template param to disable ipow calculation with <<\n","repos":"serin-delaunay\/Wangscape,Wangscape\/Wangscape,Wangscape\/Wangscape,Wangscape\/Wangscape,serin-delaunay\/Wangscape","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Wangscape\/utils.h\n+++ Wangscape\/utils.h\n@@ -58,7 +58,7 @@\n \/\/ is undefined.\n \/\/ In particular, cases like ipow(digits-1, digits-1)\n \/\/ are not checked, and may return nonsense results.\n-template <typename IBase, typename IExp>\n+template <typename IBase, typename IExp, bool UseBitshift = true>\n IBase ipow(IBase base, IExp exp)\n {\n static_assert(std::is_integral<IBase>::value,\n@@ -112,7 +112,14 @@\n if (base == -base_two)\n {\n stop = true;\n- result = (base_one << exp) * (exp % exp_two ? -base_one : base_one);\n+ cpp::static_if<UseBitshift>\n+ ([&](auto) {\n+ result = ((exp % exp_two) ? -base_one : base_one) << exp;\n+ })\n+ .else_\n+ ([&](auto) {\n+ result = ipow_imp(base, exp);\n+ });\n }\n });\n if (stop)\n@@ -121,7 +128,16 @@\n if (exp >= exp_digits)\n throw std::range_error(\"Integer pow() with exp >= digits and base not in {-2, -1, 0, 1}\");\n if (base == base_two)\n- return base_one << exp;\n+ {\n+ cpp::static_if<UseBitshift>\n+ ([&](auto) {\n+ result = base_one << exp;\n+ })\n+ .else_\n+ ([&](auto) {\n+ result = ipow_imp(base, exp);\n+ });\n+ }\n \n return ipow_imp(base, exp);\n }\n"} {"commit":"3132ab8ce690bc6c10e58006d1afce3a5acf0549","subject":"Add #ifdefs to some devcrypto code","message":"Add #ifdefs to some devcrypto code\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/engine\/hw_openbsd_dev_crypto.c\n+++ crypto\/engine\/hw_openbsd_dev_crypto.c\n@@ -57,6 +57,8 @@\n #include <openssl\/evp.h>\n #include \"engine_int.h\"\n \n+#ifdef OPENSSL_OPENBSD_DEV_CRYPTO\n+\n static void load_ciphers(ENGINE *e)\n {\n ENGINE_add_cipher(e,EVP_dev_crypto_des_ede3_cbc());\n@@ -78,3 +80,4 @@\n return engine;\n }\n \n+#endif\n"} {"commit":"fc74685b5d9ca12b08dd8839e9817ec8923eeaf3","subject":"bug fix for derivative subtraction","message":"bug fix for derivative subtraction\n","repos":"lfeldkam\/AliPhysics,btrzecia\/AliPhysics,AMechler\/AliPhysics,sebaleh\/AliPhysics,rderradi\/AliPhysics,carstooon\/AliPhysics,amatyja\/AliPhysics,fbellini\/AliPhysics,btrzecia\/AliPhysics,mazimm\/AliPhysics,lfeldkam\/AliPhysics,mvala\/AliPhysics,dstocco\/AliPhysics,victor-gonzalez\/AliPhysics,mbjadhav\/AliPhysics,adriansev\/AliPhysics,ppribeli\/AliPhysics,SHornung1\/AliPhysics,fbellini\/AliPhysics,preghenella\/AliPhysics,SHornung1\/AliPhysics,kreisl\/AliPhysics,carstooon\/AliPhysics,jmargutt\/AliPhysics,pchrista\/AliPhysics,kreisl\/AliPhysics,yowatana\/AliPhysics,SHornung1\/AliPhysics,fcolamar\/AliPhysics,hzanoli\/AliPhysics,btrzecia\/AliPhysics,jgronefe\/AliPhysics,yowatana\/AliPhysics,amatyja\/AliPhysics,pbuehler\/AliPhysics,alisw\/AliPhysics,mkrzewic\/AliPhysics,mazimm\/AliPhysics,amatyja\/AliPhysics,SHornung1\/AliPhysics,alisw\/AliPhysics,alisw\/AliPhysics,mpuccio\/AliPhysics,mazimm\/AliPhysics,mkrzewic\/AliPhysics,adriansev\/AliPhysics,pchrista\/AliPhysics,victor-gonzalez\/AliPhysics,amatyja\/AliPhysics,mbjadhav\/AliPhysics,amatyja\/AliPhysics,mazimm\/AliPhysics,amaringarcia\/AliPhysics,dlodato\/AliPhysics,lfeldkam\/AliPhysics,AudreyFrancisco\/AliPhysics,mvala\/AliPhysics,amaringarcia\/AliPhysics,preghenella\/AliPhysics,jmargutt\/AliPhysics,dstocco\/AliPhysics,btrzecia\/AliPhysics,hzanoli\/AliPhysics,alisw\/AliPhysics,carstooon\/AliPhysics,nschmidtALICE\/AliPhysics,hcab14\/AliPhysics,ALICEHLT\/AliPhysics,pbuehler\/AliPhysics,jgronefe\/AliPhysics,fbellini\/AliPhysics,hcab14\/AliPhysics,pchrista\/AliPhysics,amatyja\/AliPhysics,mpuccio\/AliPhysics,hcab14\/AliPhysics,jmargutt\/AliPhysics,preghenella\/AliPhysics,ppribeli\/AliPhysics,btrzecia\/AliPhysics,mbjadhav\/AliPhysics,dlodato\/AliPhysics,mazimm\/AliPhysics,amaringarcia\/AliPhysics,fbellini\/AliPhysics,akubera\/AliPhysics,yowatana\/AliPhysics,lcunquei\/AliPhysics,mpuccio\/AliPhysics,AMechler\/AliPhysics,dlodato\/AliPhysics,rderradi\/AliPhysics,dstocco\/AliPhysics,AudreyFrancisco\/AliPhysics,amaringarcia\/AliPhysics,rderradi\/AliPhysics,jgronefe\/AliPhysics,mpuccio\/AliPhysics,pbuehler\/AliPhysics,amaringarcia\/AliPhysics,nschmidtALICE\/AliPhysics,preghenella\/AliPhysics,mvala\/AliPhysics,AudreyFrancisco\/AliPhysics,rihanphys\/AliPhysics,carstooon\/AliPhysics,victor-gonzalez\/AliPhysics,lfeldkam\/AliPhysics,jmargutt\/AliPhysics,kreisl\/AliPhysics,dmuhlhei\/AliPhysics,nschmidtALICE\/AliPhysics,SHornung1\/AliPhysics,pbuehler\/AliPhysics,mkrzewic\/AliPhysics,mvala\/AliPhysics,victor-gonzalez\/AliPhysics,hcab14\/AliPhysics,rihanphys\/AliPhysics,AMechler\/AliPhysics,mvala\/AliPhysics,mpuccio\/AliPhysics,akubera\/AliPhysics,pchrista\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,nschmidtALICE\/AliPhysics,rderradi\/AliPhysics,hcab14\/AliPhysics,victor-gonzalez\/AliPhysics,preghenella\/AliPhysics,jgronefe\/AliPhysics,rihanphys\/AliPhysics,ALICEHLT\/AliPhysics,fcolamar\/AliPhysics,dmuhlhei\/AliPhysics,AudreyFrancisco\/AliPhysics,pbuehler\/AliPhysics,yowatana\/AliPhysics,rihanphys\/AliPhysics,rbailhac\/AliPhysics,jgronefe\/AliPhysics,lcunquei\/AliPhysics,fcolamar\/AliPhysics,ALICEHLT\/AliPhysics,fcolamar\/AliPhysics,fbellini\/AliPhysics,yowatana\/AliPhysics,adriansev\/AliPhysics,alisw\/AliPhysics,dmuhlhei\/AliPhysics,jgronefe\/AliPhysics,lcunquei\/AliPhysics,dlodato\/AliPhysics,rbailhac\/AliPhysics,ppribeli\/AliPhysics,rderradi\/AliPhysics,sebaleh\/AliPhysics,fcolamar\/AliPhysics,mbjadhav\/AliPhysics,btrzecia\/AliPhysics,SHornung1\/AliPhysics,rbailhac\/AliPhysics,lcunquei\/AliPhysics,adriansev\/AliPhysics,ALICEHLT\/AliPhysics,pbuehler\/AliPhysics,sebaleh\/AliPhysics,SHornung1\/AliPhysics,rbailhac\/AliPhysics,lfeldkam\/AliPhysics,dmuhlhei\/AliPhysics,jmargutt\/AliPhysics,nschmidtALICE\/AliPhysics,adriansev\/AliPhysics,fbellini\/AliPhysics,adriansev\/AliPhysics,lfeldkam\/AliPhysics,lcunquei\/AliPhysics,dmuhlhei\/AliPhysics,ppribeli\/AliPhysics,hcab14\/AliPhysics,jmargutt\/AliPhysics,pchrista\/AliPhysics,ppribeli\/AliPhysics,mazimm\/AliPhysics,mbjadhav\/AliPhysics,hzanoli\/AliPhysics,lcunquei\/AliPhysics,akubera\/AliPhysics,dmuhlhei\/AliPhysics,victor-gonzalez\/AliPhysics,AudreyFrancisco\/AliPhysics,pbuehler\/AliPhysics,mbjadhav\/AliPhysics,ppribeli\/AliPhysics,rderradi\/AliPhysics,rbailhac\/AliPhysics,carstooon\/AliPhysics,dlodato\/AliPhysics,AMechler\/AliPhysics,kreisl\/AliPhysics,AudreyFrancisco\/AliPhysics,yowatana\/AliPhysics,mpuccio\/AliPhysics,rihanphys\/AliPhysics,fbellini\/AliPhysics,preghenella\/AliPhysics,lcunquei\/AliPhysics,rderradi\/AliPhysics,fcolamar\/AliPhysics,pchrista\/AliPhysics,mkrzewic\/AliPhysics,rbailhac\/AliPhysics,amaringarcia\/AliPhysics,akubera\/AliPhysics,lfeldkam\/AliPhysics,mkrzewic\/AliPhysics,dlodato\/AliPhysics,akubera\/AliPhysics,mazimm\/AliPhysics,carstooon\/AliPhysics,mpuccio\/AliPhysics,nschmidtALICE\/AliPhysics,yowatana\/AliPhysics,dstocco\/AliPhysics,AMechler\/AliPhysics,sebaleh\/AliPhysics,btrzecia\/AliPhysics,amatyja\/AliPhysics,amaringarcia\/AliPhysics,sebaleh\/AliPhysics,dlodato\/AliPhysics,carstooon\/AliPhysics,dmuhlhei\/AliPhysics,akubera\/AliPhysics,pchrista\/AliPhysics,mkrzewic\/AliPhysics,hzanoli\/AliPhysics,kreisl\/AliPhysics,hzanoli\/AliPhysics,mkrzewic\/AliPhysics,sebaleh\/AliPhysics,AMechler\/AliPhysics,akubera\/AliPhysics,AudreyFrancisco\/AliPhysics,rihanphys\/AliPhysics,fcolamar\/AliPhysics,preghenella\/AliPhysics,adriansev\/AliPhysics,mvala\/AliPhysics,ALICEHLT\/AliPhysics,kreisl\/AliPhysics,jmargutt\/AliPhysics,jgronefe\/AliPhysics,hcab14\/AliPhysics,mvala\/AliPhysics,dstocco\/AliPhysics,alisw\/AliPhysics,hzanoli\/AliPhysics,ALICEHLT\/AliPhysics,ALICEHLT\/AliPhysics,kreisl\/AliPhysics,dstocco\/AliPhysics,victor-gonzalez\/AliPhysics,sebaleh\/AliPhysics,rihanphys\/AliPhysics,alisw\/AliPhysics,ppribeli\/AliPhysics,rbailhac\/AliPhysics,mbjadhav\/AliPhysics,dstocco\/AliPhysics,AMechler\/AliPhysics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- PWGJE\/EMCALJetTasks\/AliFJWrapper.h\n+++ PWGJE\/EMCALJetTasks\/AliFJWrapper.h\n@@ -104,15 +104,12 @@\n virtual Int_t DoGenericSubtractionJetOpeningAngle_kt();\n virtual Int_t DoGenericSubtractionJet1subjettiness_ca();\n virtual Int_t DoGenericSubtractionJet2subjettiness_ca();\n- virtual Int_t DoGenericSubtractionJet3subjettiness_ca();\n virtual Int_t DoGenericSubtractionJetOpeningAngle_ca();\n virtual Int_t DoGenericSubtractionJet1subjettiness_akt02();\n virtual Int_t DoGenericSubtractionJet2subjettiness_akt02();\n- virtual Int_t DoGenericSubtractionJet3subjettiness_akt02();\n virtual Int_t DoGenericSubtractionJetOpeningAngle_akt02();\n virtual Int_t DoGenericSubtractionJet1subjettiness_casd();\n virtual Int_t DoGenericSubtractionJet2subjettiness_casd();\n- virtual Int_t DoGenericSubtractionJet3subjettiness_casd();\n virtual Int_t DoGenericSubtractionJetOpeningAngle_casd();\n virtual Int_t DoConstituentSubtraction();\n virtual Int_t DoEventConstituentSubtraction();\n"} {"commit":"f5d0a4d465d2e89468ca39018c005870470dc8a4","subject":"fix include guard in atomicity.h","message":"fix include guard in atomicity.h\n\ngit-svn-id: 40192aece4a9e6664bc9a93aa558322db432a344@1196 15ae5fad-cc11-0410-8fac-bce609e504b0\n","repos":"OlafRadicke\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools,OlafRadicke\/cxxtools,OlafRadicke\/cxxtools,maekitalo\/cxxtools,maekitalo\/cxxtools,maekitalo\/cxxtools","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cxxtools\/include\/cxxtools\/atomicity.h\n+++ cxxtools\/include\/cxxtools\/atomicity.h\n@@ -27,6 +27,7 @@\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\n #ifndef CXXTOOLS_ATOMICITY_H\n+#define CXXTOOLS_ATOMICITY_H\n \n #include <cxxtools\/config.h>\n \n"} {"commit":"7ed9107668c6e13dd37beb97d0105bd2339f40d6","subject":"adhering to spacing conventions","message":"adhering to spacing conventions\n","repos":"dartsim\/dart,dartsim\/dart,dartsim\/dart,axeisghost\/DART6motionBlur,axeisghost\/DART6motionBlur,dartsim\/dart,axeisghost\/DART6motionBlur,dartsim\/dart","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- dart\/dynamics\/TemplatedJacobianNode.h\n+++ dart\/dynamics\/TemplatedJacobianNode.h\n@@ -56,14 +56,17 @@\n public:\n \n \/\/ Documentation inherited\n- math::Jacobian getJacobian(const Frame* _inCoordinatesOf) const override final;\n+ math::Jacobian getJacobian(\n+ const Frame* _inCoordinatesOf) const override final;\n \n \/\/ Documentation inherited\n- math::Jacobian getJacobian(const Eigen::Vector3d& _offset) const override final;\n+ math::Jacobian getJacobian(\n+ const Eigen::Vector3d& _offset) const override final;\n \n \/\/ Documentation inherited\n- math::Jacobian getJacobian(const Eigen::Vector3d& _offset,\n- const Frame* _inCoordinatesOf) const override final;\n+ math::Jacobian getJacobian(\n+ const Eigen::Vector3d& _offset,\n+ const Frame* _inCoordinatesOf) const override final;\n \n \/\/ Documentation inherited\n math::Jacobian getWorldJacobian(\n"} {"commit":"bb114c464ad74f39bccdbebd66adecea43c3e0e5","subject":"Create EEPROMFUNCTIONS.h","message":"Create EEPROMFUNCTIONS.h\n\nMemory functions, for loading and saving presetc etc","repos":"KontinuumLab\/OpenHornMIDIsystem","returncode":1,"stderr":"error: pathspec 'EEPROMFUNCTIONS.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- EEPROMFUNCTIONS.h\n+++ EEPROMFUNCTIONS.h\n@@ -0,0 +1,109 @@\n+\n+\n+void getEEPROMaddresses(){\n+\n+ EEPROM.setMemPool(0, 2048);\n+ int address = 0;\n+ \/\/ Set up EEPROM:\n+ \/\/ Always get the adresses first and in the same order\n+\n+ int addressDefaults = EEPROM.getAddress(1);\n+ \n+ int addressSensor1_A = EEPROM.getAddress(30);\n+ int addressSensor2_A = EEPROM.getAddress(30);\n+ int addressSensor3_A = EEPROM.getAddress(30);\n+ int addressSensor4_A = EEPROM.getAddress(30);\n+ int addressSensor5_A = EEPROM.getAddress(30); \n+ int addressSensor6_A = EEPROM.getAddress(30); \n+ int addressSensor7_A = EEPROM.getAddress(30);\n+ int addressSensor8_A = EEPROM.getAddress(30);\n+ int addressIMU_A = EEPROM.getAddress(30);\n+ int addressCalib_A = EEPROM.getAddress(6); \/\/ + 276 bytes\n+ \n+ int addressSensor1_B = EEPROM.getAddress(30);\n+ int addressSensor2_B = EEPROM.getAddress(30);\n+ int addressSensor3_B = EEPROM.getAddress(30);\n+ int addressSensor4_B = EEPROM.getAddress(30);\n+ int addressSensor5_B = EEPROM.getAddress(30); \n+ int addressSensor6_B = EEPROM.getAddress(30); \n+ int addressSensor7_B = EEPROM.getAddress(30);\n+ int addressSensor8_B = EEPROM.getAddress(30);\n+ int addressIMU_B = EEPROM.getAddress(30);\n+ int addressCalib_B = EEPROM.getAddress(6);\n+ \n+ int addressSensor1_C = EEPROM.getAddress(30);\n+ int addressSensor2_C = EEPROM.getAddress(30);\n+ int addressSensor3_C = EEPROM.getAddress(30);\n+ int addressSensor4_C = EEPROM.getAddress(30);\n+ int addressSensor5_C = EEPROM.getAddress(30); \n+ int addressSensor6_C = EEPROM.getAddress(30); \n+ int addressSensor7_C = EEPROM.getAddress(30);\n+ int addressSensor8_C = EEPROM.getAddress(30);\n+ int addressIMU_C = EEPROM.getAddress(30);\n+ int addressCalib_C = EEPROM.getAddress(6); \/\/ 276 * 3 = 833 bytes\n+\n+ int addressKeys_A = EEPROM.getAddress(20);\n+ int addressKeys_B = EEPROM.getAddress(20); \/\/ + 40 = 873 bytes\n+\n+ int addressFingerings_A = EEPROM.getAddress(325); \/\/ (13 noteKeys * 20 available fingerings)\n+ int addressFingerings_B = EEPROM.getAddress(325); \/\/ + 975 = 1523 bytes\n+ int addressFingerings_C = EEPROM.getAddress(325);\n+ \n+ int addressOctaves_A = EEPROM.getAddress(36); \/\/ 4 octave keys * 9 octaves\n+ int addressOctaves_B = EEPROM.getAddress(36); \/\/ + 72 = 1595\n+\n+ int addressOutput_A = EEPROM.getAddress(66); \/\/ 11 possible outputs * 6 bytes each. ??\n+ int addressOutput_B = EEPROM.getAddress(66); \/\/ + 198 = 1793 bytes\n+ \/\/ 1793 bytes up to here\n+}\n+\n+void loadAllDefaults(){\n+ \n+}\n+\n+void setDefaults(){\n+ \n+}\n+\n+void loadSensorsPreset(){\n+ \n+}\n+\n+void loadKeysPreset(){\n+ \n+}\n+\n+void loadFingeringsPreset(){\n+ \n+}\n+\n+void loadOctavesPreset(){\n+ \n+}\n+\n+void loadOutputPreset(){\n+ \n+}\n+\n+\n+\n+\/\/\/\/################### set up EEPROM: ########################\n+\n+\n+\n+\/\/ For reading:\n+\/\/ uint8_t read(int address);\n+\/\/ uint8_t readByte(int address);\n+\/\/ uint16_t readInt(int address);\n+\/\/ uint32_t readLong(int address);\n+\/\/ float readFloat(int address);\n+\/\/ double readDouble(int address);\n+\/\/ Where address is the starting position in EEPROM, and the return value the value read from EEPROM. \n+\n+\/\/ For writing:\n+\/\/ bool write(int address, uint8_t value);\n+\/\/ bool writeByte(int address, uint8_t value);\n+\/\/ bool writeInt(int address, uint16_t value);\n+\/\/ bool writeLong(int address, uint32_t value);\n+\/\/ bool writeFloat(int address, float value);\n+\/\/ bool writeDouble(int address, double value);\n"} {"commit":"78256ad7c88dab09b8627ecbc2f5908f2238e42c","subject":"Updated app for producation version.","message":"Updated app for producation version.\n","repos":"E-B-Smith\/ZLibrary,E-B-Smith\/ZLibrary","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ZLibrary\/ZDebug.h\n+++ ZLibrary\/ZDebug.h\n@@ -185,6 +185,8 @@\n \n #define ZDebugAssertIsMainThread()\t\t\t\t\tZDebugAssert([NSThread isMainThread])\n \n+#define ZDebugCompileForDebug(x)\t\t\t\t\tx\n+\n \n #else\t\/\/\tnot ZDEBUG ---------------------------------------------------------------------------\n \n@@ -200,7 +202,7 @@\n #define ZDebugSetOptions(debugOptions)\t\t\t\t\/*true*\/\n \n #define ZDebug(...)\t\t\t\t\t\t\t\t\tdo {} while (0)\n-#define ZDebugLogMethodName()\t\t\t\t\t\t\tdo {} while (0)\n+#define ZDebugLogMethodName()\t\t\t\t\t\tdo {} while (0)\n #define ZDebugLogError(error)\t\t\t\t\t\tdo {} while (0)\n #define ZDebugLogFunctionName()\t\t\t\t\t\tdo {} while (0)\n #define ZDebugAssert(Condition)\t\t\t\t\t\tdo {} while (0)\n@@ -209,6 +211,8 @@\n #define ZDebugBreakPoint()\t\t\t\t\t\t\tdo {} while (0)\n #define ZDebugFlushMessages()\t\t\t\t\t\tdo {} while (0)\n #define ZDebugAssertIsMainThread()\t\t\t\t\tdo {} while (0)\n+#define ZDebugCompileForDebug(x)\t\t\t\t\tdo {} while (0)\n+\n \n #endif\t\/\/\tZDEBUG --------------------------------------------------------------------------------\n \n"} {"commit":"52324c0b0e7b90b3df2ae2ae5fa1addf5c050cf7","subject":"Prevent temporaries for reductions.","message":"Prevent temporaries for reductions.\n","repos":"rotorliu\/eigen,mjbshaw\/Eigen,mjbshaw\/Eigen,rotorliu\/eigen,mjbshaw\/Eigen,mjbshaw\/Eigen,rotorliu\/eigen,madlib\/eigen_backup,rotorliu\/eigen,madlib\/eigen_backup,madlib\/eigen_backup,madlib\/eigen_backup","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/Core\/Redux.h\n+++ Eigen\/src\/Core\/Redux.h\n@@ -313,10 +313,9 @@\n inline typename ei_result_of<Func(typename ei_traits<Derived>::Scalar)>::type\n DenseBase<Derived>::redux(const Func& func) const\n {\n- typename Derived::Nested nested(derived());\n typedef typename ei_cleantype<typename Derived::Nested>::type ThisNested;\n return ei_redux_impl<Func, ThisNested>\n- ::run(nested, func);\n+ ::run(derived(), func);\n }\n \n \/** \\returns the minimum of all coefficients of *this\n"} {"commit":"1f4e49d5c7df3ce813ce7b5b14d4120f6d483854","subject":"fix the 4x4 inverse -- unit test passes again","message":"fix the 4x4 inverse -- unit test passes again\n","repos":"madlib\/eigen,madlib\/eigen,madlib\/eigen,madlib\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/LU\/Inverse.h\n+++ Eigen\/src\/LU\/Inverse.h\n@@ -132,21 +132,31 @@\n \/\/ since this is a rare case, we don't need to optimize it. We just want to handle it with little\n \/\/ additional code.\n MatrixType m(matrix);\n- m.row(1).swap(m.row(2));\n+ m.row(0).swap(m.row(2));\n+ m.row(1).swap(m.row(3));\n if(ei_compute_inverse_in_size4_case_helper(m, result))\n {\n- \/\/ good, the topleft 2x2 block of m is invertible. Since m is different from matrix in that two\n+ \/\/ good, the topleft 2x2 block of m is invertible. Since m is different from matrix in that some\n \/\/ rows were permuted, the actual inverse of matrix is derived from the inverse of m by permuting\n \/\/ the corresponding columns.\n- result->col(1).swap(result->col(2));\n+ result->col(0).swap(result->col(2));\n+ result->col(1).swap(result->col(3));\n }\n else\n {\n \/\/ last possible case. Since matrix is assumed to be invertible, this last case has to work.\n- m.row(1).swap(m.row(2));\n+ \/\/ first, undo the swaps previously made\n+ m.row(0).swap(m.row(2));\n m.row(1).swap(m.row(3));\n+ \/\/ swap row 0 with the the row among 0 and 1 that has the biggest 2 first coeffs\n+ int swap0with = ei_abs(m.coeff(0,0))+ei_abs(m.coeff(0,1))>ei_abs(m.coeff(1,0))+ei_abs(m.coeff(1,1)) ? 0 : 1;\n+ m.row(0).swap(m.row(swap0with));\n+ \/\/ swap row 1 with the the row among 2 and 3 that has the biggest 2 first coeffs\n+ int swap1with = ei_abs(m.coeff(2,0))+ei_abs(m.coeff(2,1))>ei_abs(m.coeff(3,0))+ei_abs(m.coeff(3,1)) ? 2 : 3;\n+ m.row(1).swap(m.row(swap1with));\n ei_compute_inverse_in_size4_case_helper(m, result);\n- result->col(1).swap(result->col(3));\n+ result->col(1).swap(result->col(swap1with));\n+ result->col(0).swap(result->col(swap0with));\n }\n }\n }\n"} {"commit":"febd8078f85b3abe205f72c0061cc986952fdcc2","subject":"Small bug ix for OpenMP","message":"Small bug ix for OpenMP","repos":"guptashail\/SYMPHONY,tkralphs\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- SYMPHONY\/src\/TreeManager\/tm_func.c\n+++ SYMPHONY\/src\/TreeManager\/tm_func.c\n@@ -543,6 +543,7 @@\n \t }\n \t then = now;\n \t }\n+#if 0\n for (i = 0; i < tm->par.max_active_nodes; i++){\n \t if (tm->active_nodes[i]){\n \t break;\n@@ -551,6 +552,7 @@\n \t if (i == tm->par.max_active_nodes){\n \t tm->active_node_num = 0;\n \t }\n+#endif\n \t if (now - then2 > timeout2){\n \t if(tm->par.verbosity >=0 ){\n \t print_tree_status(tm);\n"} {"commit":"ae4b7d969d9fc76338d156816eb86b2e434638c8","subject":"fixed catching of CRC errors","message":"fixed catching of CRC errors\n","repos":"nusepo\/SiK,tridge\/SiK,RFDesign\/SiK,weera00\/SiK,RFDesign\/SiK,gardners\/SiK,davidbuzz\/SiK,phelpsw\/SiK,joeman155\/SiK,nusepo\/SiK,tridge\/SiK,LorenzMeier\/SiK,RFDesign\/SiK,LorenzMeier\/SiK,tridge\/DavisSi1000,Dronecode\/SiK,mikeclement\/SiK,davidbuzz\/SiK,LorenzMeier\/SiK,tomszilagyi\/SiK,davidbuzz\/SiK,tomszilagyi\/SiK,nusepo\/SiK,joeman155\/SiK,joeman155\/SiK,jschall\/SiK,jschall\/SiK,jschall\/SiK,weera00\/SiK,gardners\/SiK,tridge\/SiK,Dronecode\/SiK,chrissnell\/DavisSi1000,nusepo\/SiK,geeksville\/SiK,tridge\/DavisSi1000,geeksville\/SiK,joeman155\/SiK,tridge\/SiK,gardners\/SiK,mikeclement\/SiK,GaloisInc\/smaccmpilot-SiK,RFDesign\/SiK,davidbuzz\/SiK,chrissnell\/DavisSi1000,Dronecode\/SiK,Serveurperso\/SiK,Dronecode\/SiK,gardners\/SiK,GaloisInc\/smaccmpilot-SiK,Serveurperso\/SiK,jschall\/SiK,tridge\/SiK,GaloisInc\/smaccmpilot-SiK,geeksville\/SiK,phelpsw\/SiK,chrissnell\/DavisSi1000,weera00\/SiK,RFDesign\/SiK,tomszilagyi\/SiK,mikeclement\/SiK,tridge\/DavisSi1000,mikeclement\/SiK,LorenzMeier\/SiK,tridge\/DavisSi1000,GaloisInc\/smaccmpilot-SiK,phelpsw\/SiK,nusepo\/SiK,phelpsw\/SiK,chrissnell\/DavisSi1000,Serveurperso\/SiK,geeksville\/SiK,chrissnell\/DavisSi1000,weera00\/SiK,tomszilagyi\/SiK,phelpsw\/SiK,geeksville\/SiK,Serveurperso\/SiK,tomszilagyi\/SiK,mikeclement\/SiK,davidbuzz\/SiK,joeman155\/SiK,weera00\/SiK","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Firmware\/radio\/radio.c\n+++ Firmware\/radio\/radio.c\n@@ -68,7 +68,7 @@\n #define EX0_SAVE_DISABLE __bit EX0_saved = EX0; EX0 = 0\n #define EX0_RESTORE EX0 = EX0_saved\n \n-#define RADIO_RX_INTERRUPTS (EZRADIOPRO_ENRXFFAFULL|EZRADIOPRO_ENPKVALID)\n+#define RADIO_RX_INTERRUPTS (EZRADIOPRO_ENRXFFAFULL|EZRADIOPRO_ENPKVALID|EZRADIOPRO_ENCRCERROR)\n \n \/\/ FIFO thresholds to allow for packets larger than 64 bytes\n #define TX_FIFO_THRESHOLD_LOW 32\n@@ -1045,6 +1045,10 @@\n \t\tlast_rssi = register_read(EZRADIOPRO_RECEIVED_SIGNAL_STRENGTH_INDICATOR);\n \t}\n \n+\tif (feature_golay == false && (status & EZRADIOPRO_ICRCERROR)) {\n+\t\tgoto rxfail;\n+\t}\n+\n \tif (status & EZRADIOPRO_IPKVALID) {\n \t\t__data uint8_t len = register_read(EZRADIOPRO_RECEIVED_PACKET_LENGTH);\n \t\tif (len > MAX_PACKET_LENGTH || partial_packet_length > len) {\n"} {"commit":"9b06f04d434c7da359fc4c01dc00e0adf1a40658","subject":"export.txt path was changed","message":"export.txt path was changed\n","repos":"ReDFoX43rus\/RuC,ReDFoX43rus\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- RuC\/import.c\n+++ RuC\/import.c\n@@ -374,11 +374,11 @@\n \n switch (mem[pc++])\n {\n-\/*\n+\n case STOP:\n flagstop = 0;\n break;\n- \n+\/* \n case CREATEC:\n numthr = mem[pc++];\n threads[numthr] = cur0 = MAXMEMTHREAD * numthr;\n@@ -1307,7 +1307,7 @@\n system(\"i2cset -y 2 0x48 0x13 0x1000 w\");\n #endif\n \n- input = fopen(\"..\/..\/..\/export.txt\", \"r\");\n+ input = fopen(\"export.txt\", \"r\");\n \n fscanf(input, \"%i %i %i %i %i %i %i\\n\", &pc, &funcnum, &id, &rp, &md, &maxdisplg, &wasmain);\n \n"} {"commit":"2faa27de100fea1d4a2a09a1fc4b5d98deb70df6","subject":"Create Generate_Parentheses.c","message":"Create Generate_Parentheses.c","repos":"fanyingming\/leetcode,fanyingming\/leetcode","returncode":1,"stderr":"error: pathspec 'Generate_Parentheses.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- Generate_Parentheses.c\n+++ Generate_Parentheses.c\n@@ -0,0 +1,23 @@\n+class Solution {\n+public:\n+\tvector<string> rl;\n+\tvoid helper(int l, int r, string str) {\n+\t\tif (l > r)\n+\t\t\treturn;\n+\t\tif (l == 0 && r == 0) {\n+\t\t\trl.push_back(str);\n+\t\t\treturn;\n+\t\t}\n+\t\tif (l > 0)\n+\t\t\thelper(l-1, r, str+'(');\n+\t\tif (r > 0)\n+\t\t\thelper(l, r - 1, str + ')');\n+\t}\n+\tvector<string> generateParenthesis(int n) {\n+\t\trl.clear();\n+\t\tif (n <= 0)\n+\t\t\treturn rl;\n+\t\thelper(n, n, \"\");\n+\t\treturn rl;\n+\t}\n+};\n"} {"commit":"7181c5c4419f5d749a45a22ae5d9afa558ff4901","subject":"sms: Check if a bios is provided before trying to open it","message":"sms: Check if a bios is provided before trying to open it\n","repos":"JoppyFurr\/Snepulator,JoppyFurr\/Snepulator,JoppyFurr\/Snepulator,JoppyFurr\/Snepulator,JoppyFurr\/Snepulator,JoppyFurr\/Snepulator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Source\/sms.c\n+++ Source\/sms.c\n@@ -300,11 +300,14 @@\n void sms_init (char *bios_filename, char *cart_filename)\n {\n \/* Load BIOS *\/\n- if (sms_load_rom (&bios, &bios_size, bios_filename) == -1)\n- {\n- snepulator.abort = true;\n- }\n- fprintf (stdout, \"%d KiB BIOS %s loaded.\\n\", bios_size >> 10, bios_filename);\n+ if (bios_filename)\n+ {\n+ if (sms_load_rom (&bios, &bios_size, bios_filename) == -1)\n+ {\n+ snepulator.abort = true;\n+ }\n+ fprintf (stdout, \"%d KiB BIOS %s loaded.\\n\", bios_size >> 10, bios_filename);\n+ }\n \n \/* Load cart *\/\n if (cart_filename)\n"} {"commit":"cd5fa34549ce09a5500ec935fcbd39113d9e6496","subject":"Better compilation","message":"Better compilation\n","repos":"nikhilsinghmus\/csound,mcanthony\/csound,nikhilsinghmus\/csound,audiokit\/csound,Angeldude\/csound,iver56\/csound,max-ilse\/csound,Angeldude\/csound,audiokit\/csound,mcanthony\/csound,nikhilsinghmus\/csound,max-ilse\/csound,mcanthony\/csound,iver56\/csound,Angeldude\/csound,Angeldude\/csound,Angeldude\/csound,iver56\/csound,iver56\/csound,mcanthony\/csound,Angeldude\/csound,Angeldude\/csound,max-ilse\/csound,iver56\/csound,iver56\/csound,audiokit\/csound,iver56\/csound,nikhilsinghmus\/csound,max-ilse\/csound,nikhilsinghmus\/csound,iver56\/csound,audiokit\/csound,iver56\/csound,nikhilsinghmus\/csound,mcanthony\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,Angeldude\/csound,audiokit\/csound,mcanthony\/csound,iver56\/csound,max-ilse\/csound,Angeldude\/csound,max-ilse\/csound,audiokit\/csound,max-ilse\/csound,nikhilsinghmus\/csound,max-ilse\/csound,mcanthony\/csound,mcanthony\/csound,max-ilse\/csound,audiokit\/csound,Angeldude\/csound,max-ilse\/csound,audiokit\/csound,audiokit\/csound,nikhilsinghmus\/csound,mcanthony\/csound,mcanthony\/csound,audiokit\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Top\/csound.c\n+++ Top\/csound.c\n@@ -1420,7 +1420,9 @@\n while (ip != NULL) { \/* for each instr active: *\/\n INSDS *nxt = ip->nxtact;\n csound->pds = (OPDS*) ip;\n- if (ip->offtim > 0 && time_end > ip->offtim && csound->oparms->sampleAccurate){\n+ if (ip->offtim > 0 && \n+ time_end > ip->offtim && \n+ csound->oparms->sampleAccurate) {\n \/* this is the last cycle of performance *\/\n \/\/ csound->Message(csound, \"last cycle %d: %f %f %d\\n\", \n \/\/ ip->insno, csound->icurTime\/csound->esr, \n@@ -1471,12 +1473,14 @@\n int returnValue;\n \n \/* VL: 1.1.13 if not compiled (csoundStart() not called) *\/\n- if (!(csound->engineStatus & CS_STATE_COMP)){\n- csound->Warning(csound, \"Csound not ready for performance: csoundStart() has not been called \\n\");\n+ if (UNLIKELY(!(csound->engineStatus & CS_STATE_COMP))) {\n+ csound->Warning(csound, \n+ Str(\"Csound not ready for performance: csoundStart() \"\n+ \"has not been called \\n\"));\n return CSOUND_ERROR;\n }\n \/* setup jmp for return after an exit() *\/\n- if ((returnValue = setjmp(csound->exitjmp))) {\n+ if (UNLIKELY((returnValue = setjmp(csound->exitjmp)))) {\n #ifndef MACOSX\n csoundMessage(csound, Str(\"Early return from csoundPerformKsmps().\\n\"));\n #endif\n@@ -1500,12 +1504,14 @@\n int returnValue;\n \n \/* VL: 1.1.13 if not compiled (csoundStart() not called) *\/\n- if (!(csound->engineStatus & CS_STATE_COMP)){\n- csound->Warning(csound, \"Csound not ready for performance: csoundStart() has not been called \\n\");\n+ if (UNLIKELY(!(csound->engineStatus & CS_STATE_COMP))) {\n+ csound->Warning(csound,\n+ Str(\"Csound not ready for performance: csoundStart() \"\n+ \"has not been called \\n\"));\n return CSOUND_ERROR;\n }\n \/* setup jmp for return after an exit() *\/\n- if ((returnValue = setjmp(csound->exitjmp))) {\n+ if (UNLIKELY((returnValue = setjmp(csound->exitjmp)))) {\n #ifndef MACOSX\n csoundMessage(csound, Str(\"Early return from csoundPerformKsmps().\\n\"));\n #endif\n@@ -1517,7 +1523,7 @@\n return done;\n }\n } while (kperf(csound));\n- return 0;\n+ return 0;\n }\n \n \n@@ -1528,12 +1534,14 @@\n int returnValue;\n \n \/* VL: 1.1.13 if not compiled (csoundStart() not called) *\/\n- if (!(csound->engineStatus & CS_STATE_COMP)){\n- csound->Warning(csound, \"Csound not ready for performance: csoundStart() has not been called \\n\");\n+ if (UNLIKELY(!(csound->engineStatus & CS_STATE_COMP))) {\n+ csound->Warning(csound,\n+ Str(\"Csound not ready for performance: csoundStart() \"\n+ \"has not been called \\n\"));\n return CSOUND_ERROR;\n }\n \/* setup jmp for return after an exit() *\/\n- if ((returnValue = setjmp(csound->exitjmp))) {\n+ if (UNLIKELY((returnValue = setjmp(csound->exitjmp)))) {\n #ifndef MACOSX\n csoundMessage(csound, Str(\"Early return from csoundPerformKsmps().\\n\"));\n #endif\n@@ -1554,13 +1562,15 @@\n int returnValue;\n int done;\n \/* VL: 1.1.13 if not compiled (csoundStart() not called) *\/\n- if (!(csound->engineStatus & CS_STATE_COMP)){\n- csound->Warning(csound, \"Csound not ready for performance: csoundStart() has not been called \\n\");\n+ if (UNLIKELY(!(csound->engineStatus & CS_STATE_COMP))) {\n+ csound->Warning(csound,\n+ Str(\"Csound not ready for performance: csoundStart() \"\n+ \"has not been called \\n\"));\n return CSOUND_ERROR;\n }\n-\n+ \n \/* Setup jmp for return after an exit(). *\/\n- if ((returnValue = setjmp(csound->exitjmp))) {\n+ if (UNLIKELY((returnValue = setjmp(csound->exitjmp)))) {\n #ifndef MACOSX\n csoundMessage(csound, Str(\"Early return from csoundPerformBuffer().\\n\"));\n #endif\n@@ -1589,14 +1599,16 @@\n int returnValue;\n \n \/* VL: 1.1.13 if not compiled (csoundStart() not called) *\/\n- if (!(csound->engineStatus & CS_STATE_COMP)){\n- csound->Warning(csound, \"Csound not ready for performance: csoundStart() has not been called \\n\");\n+ if (UNLIKELY(!(csound->engineStatus & CS_STATE_COMP))) {\n+ csound->Warning(csound, \n+ Str(\"Csound not ready for performance: csoundStart() \"\n+ \"has not been called \\n\"));\n return CSOUND_ERROR;\n }\n \n csound->performState = 0;\n \/* setup jmp for return after an exit() *\/\n- if ((returnValue = setjmp(csound->exitjmp))) {\n+ if (UNLIKELY((returnValue = setjmp(csound->exitjmp)))) {\n #ifndef MACOSX\n csoundMessage(csound, Str(\"Early return from csoundPerform().\\n\"));\n #endif\n"} {"commit":"71c49eafc54f2f3158ed8861a90cb6eb95e13f97","subject":"Add initializing code for local variable 'CalleeExitStatus' and 'ExitStatus' in 'Shell.c'.","message":"Add initializing code for local variable 'CalleeExitStatus' and 'ExitStatus' in 'Shell.c'.\n\nSigned-off-by: Shumin Qiu <shumin.qiu@intel.com>\nReviewed-by: Jaben Carsey <Jaben.carsey@intel.com>\n\n\ngit-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@15191 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ShellPkg\/Application\/Shell\/Shell.c\n+++ ShellPkg\/Application\/Shell\/Shell.c\n@@ -300,6 +300,12 @@\n \/\/ install our console logger. This will keep a log of the output for back-browsing\r\n \/\/\r\n Status = ConsoleLoggerInstall(ShellInfoObject.LogScreenCount, &ShellInfoObject.ConsoleInfo);\r\n+ if(EFI_ERROR (Status)) {\r\n+ ExitStatus = (SHELL_STATUS) (Status & (~MAX_BIT));\r\n+ } else {\r\n+ ExitStatus = SHELL_SUCCESS;\r\n+ }\r\n+\t\r\n if (!EFI_ERROR(Status)) {\r\n \/\/\r\n \/\/ Enable the cursor to be visible\r\n@@ -2074,6 +2080,7 @@\n Status = EFI_SUCCESS;\r\n CommandWithPath = NULL;\r\n DevPath = NULL;\r\n+ CalleeExitStatus = SHELL_INVALID_PARAMETER;\r\n \r\n switch (Type) {\r\n case Internal_Command:\r\n@@ -2149,11 +2156,17 @@\n \r\n SHELL_FREE_NON_NULL(DevPath);\r\n \r\n+ if(EFI_ERROR (Status)) {\r\n+ CalleeExitStatus = (SHELL_STATUS) (Status & (~MAX_BIT));\r\n+ } else {\r\n+ CalleeExitStatus = SHELL_SUCCESS;\r\n+ }\r\n+\r\n \/\/\r\n \/\/ Update last error status.\r\n \/\/\r\n \/\/ Status is an EFI_STATUS. Clear top bit to convert to SHELL_STATUS\r\n- SetLastError((SHELL_STATUS) (Status & (~MAX_BIT)));\r\n+ SetLastError(CalleeExitStatus);\r\n break;\r\n default:\r\n \/\/\r\n"} {"commit":"57aa4fa98354e6555f7431249b1b08d67329756a","subject":"fix udp server windows","message":"fix udp server windows\n","repos":"csound\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Top\/server.c\n+++ Top\/server.c\n@@ -221,10 +221,11 @@\n {\n u_long argp = 1;\n err = ioctlsocket(p->sock, FIONBIO, &argp);\n- if (UNLIKELY(err != NO_ERROR))\n+ if (UNLIKELY(err != NO_ERROR)) {\n \tcsound->Warning(csound, Str(\"UDP Server: Cannot set nonblock\"));\n- closesocket(p->sock);\n- return CSOUND_ERROR;\n+ closesocket(p->sock);\n+ return CSOUND_ERROR;\n+ }\n }\n #endif \n if (UNLIKELY(p->sock < 0)) {\n"} {"commit":"095481921e2e3e4a1a33d72481076f0c7995da2e","subject":"x Mac compilation issue","message":"x Mac compilation issue\n\ngit-svn-id: 294f12855175db510999321cff72188496f07bec@5764 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da\n","repos":"MediaArea\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,MediaArea\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,tribouille\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,tribouille\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Source\/MediaInfoDLL\/MediaInfoDLL.h\n+++ Source\/MediaInfoDLL\/MediaInfoDLL.h\n@@ -129,6 +129,7 @@\n #else\r\n #define MEDIAINFODLL_NAME \"libmediainfo.so.0\"\r\n #define __stdcall\r\n+ #include <new> \/\/for size_t\r\n #endif \/\/!defined(_WIN32) || defined (WIN32)\r\n \r\n \/*-------------------------------------------------------------------------*\/\r\n"} {"commit":"d79e0238a9c820be16874f2aec910fbb42270975","subject":"Import from CVS Fri Aug 15 13:53:59 2003 -0600","message":"Import from CVS Fri Aug 15 13:53:59 2003 -0600\n\nImport of LiS-2.16.13\n","repos":"0x7678\/openss7,openss7\/openss7,kerr-huang\/openss7,kerr-huang\/openss7,0x7678\/openss7,openss7\/openss7,0x7678\/openss7,kerr-huang\/openss7,0x7678\/openss7,openss7\/openss7,openss7\/openss7,kerr-huang\/openss7,0x7678\/openss7,openss7\/openss7,openss7\/openss7,0x7678\/openss7,0x7678\/openss7,kerr-huang\/openss7,kerr-huang\/openss7,kerr-huang\/openss7,openss7\/openss7,0x7678\/openss7,kerr-huang\/openss7,openss7\/openss7","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- LiS\/head\/msgutl.c\n+++ LiS\/head\/msgutl.c\n@@ -31,7 +31,7 @@\n * nemo@ordago.uc3m.es, gram@aztec.co.za\n *\/\n \n-#ident \"@(#) LiS msgutl.c 2.11 5\/30\/03 21:40:40 \"\n+#ident \"@(#) LiS msgutl.c 2.12 8\/15\/03 13:53:59 \"\n \n \/*\n * The memory allocation mechanism is based on that in SVR4.2.\n@@ -99,7 +99,7 @@\n {\n if (mp->b_datap->db_type == type)\n \t{\n-\t short n = (short) (mp->b_wptr - mp->b_rptr);\n+\t int n = (mp->b_wptr - mp->b_rptr);\n \t if (n > 0) rtn += n;\n \t}\n \telse \/* different type; reset counter and count these *\/\n@@ -161,7 +161,7 @@\n type = mp->b_datap->db_type;\n while (mp && mp->b_datap->db_type == type)\n {\n-\tshort n = (short) (mp->b_wptr - mp->b_rptr) ;\n+\tint n = (mp->b_wptr - mp->b_rptr) ;\n \tif (n > 0) rtn += n;\n \tmp = mp->b_cont;\n }\n@@ -238,11 +238,11 @@\n lis_copyb(mblk_t *mp)\n {\n mblk_t *bp;\n- short msgsize, msglen;\n+ int msgsize, msglen;\n \n if (mp == NULL ||\n-\t(msgsize = (short) (mp->b_datap->db_lim - mp->b_datap->db_base)) < 0 ||\n-\t(msglen = (short) (mp->b_wptr - mp->b_rptr)) < 0)\n+\t(msgsize = (mp->b_datap->db_lim - mp->b_datap->db_base)) < 0 ||\n+\t(msglen = (mp->b_wptr - mp->b_rptr)) < 0)\n \treturn NULL;\n if ((bp = allocb(msgsize, BPRI_LO)) == NULL)\n \treturn NULL;\n"} {"commit":"7813c06845985a4aa516103acb0ba0d0b4079d81","subject":"Fix build failure on Windows arm64 (#342)","message":"Fix build failure on Windows arm64 (#342)\n\n","repos":"ARM-software\/astc-encoder,ARM-software\/astc-encoder,ARM-software\/astc-encoder,ARM-software\/astc-encoder","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Source\/astcenc_vecmathlib_neon_4.h\n+++ Source\/astcenc_vecmathlib_neon_4.h\n@@ -204,7 +204,7 @@\n \t{\n \t\tuint32x2_t t8 {};\n \t\t\/\/ Cast is safe - NEON loads are allowed to be unaligned\n-\t\tt8 = vld1_lane_u32((const uint32_t*)p, t8, 0);\n+\t\tt8 = vld1_lane_u32(reinterpret_cast<const uint32_t*>(p), t8, 0);\n \t\tuint16x4_t t16 = vget_low_u16(vmovl_u8(vreinterpret_u8_u32(t8)));\n \t\tm = vreinterpretq_s32_u32(vmovl_u16(t16));\n \t}\n@@ -347,6 +347,14 @@\n \t}\n \n \t\/**\n+\t * @brief Get the scalar from a single lane.\n+\t *\/\n+\ttemplate <int32_t l> ASTCENC_SIMD_INLINE uint32_t lane() const\n+\t{\n+\t\treturn vgetq_lane_s32(m, l);\n+\t}\n+\n+\t\/**\n \t * @brief The vector ...\n \t *\/\n \tuint32x4_t m;\n@@ -582,7 +590,7 @@\n *\/\n ASTCENC_SIMD_INLINE void store_nbytes(vint4 a, uint8_t* p)\n {\n-\tvst1q_lane_s32((int32_t*)p, a.m, 0);\n+\tvst1q_lane_s32(reinterpret_cast<int32_t*>(p), a.m, 0);\n }\n \n \/**\n@@ -874,7 +882,7 @@\n static inline uint16_t float_to_float16(float a)\n {\n \tvfloat4 av(a);\n-\treturn float_to_float16(av).lane<0>();\n+\treturn static_cast<uint16_t>(float_to_float16(av).lane<0>());\n }\n \n \/**\n@@ -1017,22 +1025,22 @@\n *\/\n ASTCENC_SIMD_INLINE void store_lanes_masked(int* base, vint4 data, vmask4 mask)\n {\n-\tif (mask.m[3])\n+\tif (mask.lane<3>())\n \t{\n \t\tstore(data, base);\n \t}\n-\telse if(mask.m[2])\n+\telse if(mask.lane<2>())\n \t{\n \t\tbase[0] = data.lane<0>();\n \t\tbase[1] = data.lane<1>();\n \t\tbase[2] = data.lane<2>();\n \t}\n-\telse if(mask.m[1])\n+\telse if(mask.lane<1>())\n \t{\n \t\tbase[0] = data.lane<0>();\n \t\tbase[1] = data.lane<1>();\n \t}\n-\telse if(mask.m[0])\n+\telse if(mask.lane<0>())\n \t{\n \t\tbase[0] = data.lane<0>();\n \t}\n"} {"commit":"818cadd65520f347c329b5648bb1e2c065056c9a","subject":"The GrowlPlugin protocol now inherits from the NSObject protocol. Also, whitespace++.","message":"The GrowlPlugin protocol now inherits from the NSObject protocol. Also, whitespace++.\n\n--HG--\nextra : convert_revision : svn%3A99687598-2e92-11dd-8019-fe7b9d601d1b\/trunk%40402\n","repos":"incbee\/Growl,PersonifyInc\/growl,PersonifyInc\/growl,incbee\/Growl,incbee\/Growl,incbee\/Growl,incbee\/Growl,PersonifyInc\/growl,PersonifyInc\/growl,PersonifyInc\/growl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- GrowlDisplayProtocol.h\n+++ GrowlDisplayProtocol.h\n@@ -23,27 +23,34 @@\n \t@abstract The base plugin protocol\n \t@discussion A protocol defining all methods supported by all Growl plugins.\n *\/\n-@protocol GrowlPlugin\n+@protocol GrowlPlugin <NSObject>\n+\n \/*! A method sent to tell the plugin to initialize itself *\/\n - (void) loadPlugin;\n+\n \/*! Returns the name of the author of the plugin\n \t@result A string *\/\n - (NSString *) author;\n+\n \/*! Returns the name of the plugin\n \t@result A string *\/\n - (NSString *) name;\n+\n \/*! Returns the description of the plugin\n \t@result A string *\/\n - (NSString *) userDescription;\n+\n \/*! Returns the version of the plugin\n \t@result A string *\/\n - (NSString *) version;\n+\n \/*! Returns a dictionary containing author, name, desc, and version for the plugin.\n-\t\n \tThe corresponding keys are: Author, Name, Description, Version *\/\n - (NSDictionary *) pluginInfo;\n+\n \/*! A method sent to tell the plugin to clean itself up *\/\n - (void) unloadPlugin;\n+\n \/*! Returns an NSPreferencePane instance that manages the plugin's preferences.\n \t\n \tFor reference, the size of the view should be 354 x 289.\n@@ -51,6 +58,7 @@\n \tWe have to think of something if there are more options than fit in that place.\n *\/\n - (NSPreferencePane *) preferencePane;\n+\n @end\n \n \/*!\n@@ -59,9 +67,11 @@\n \t@discussion A protocol defining all methods supported by Growl display plugins.\n *\/\n @protocol GrowlDisplayPlugin <GrowlPlugin>\n+\n \/*! Tells the display plugin to display a notification with the given information\n \t@param noteDict The userInfo dictionary that describes the notification *\/\n - (void) displayNotificationWithInfo:(NSDictionary *) noteDict;\n+\n @end\n \n \/*!\n"} {"commit":"08286addec882d28f46227ef293b4d7813118cad","subject":"Allocate responses in the client pool, not the server's. TODO: destroy the client pool after cleaning up the client context.","message":"Allocate responses in the client pool, not the server's.\nTODO: destroy the client pool after cleaning up the client context.\n","repos":"lgov\/MockHTTPinC,lgov\/MockHTTPinC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MockHTTP_server.c\n+++ MockHTTP_server.c\n@@ -1095,11 +1095,11 @@\n if (resp) {\n _mhLog(MH_VERBOSE, cctx->skt,\n \"Request matched, queueing response.\\n\");\n- resp = cloneResponse(ctx->pool, resp);\n+ resp = cloneResponse(cctx->pool, resp);\n } else {\n _mhLog(MH_VERBOSE, cctx->skt,\n \"Request matched, queueing default response.\\n\");\n- resp = cloneResponse(ctx->pool, ctx->mh->defResponse);\n+ resp = cloneResponse(cctx->pool, ctx->mh->defResponse);\n }\n \n switch (action) {\n@@ -1126,7 +1126,7 @@\n ctx->mh->verifyStats->requestsNotMatched++;\n _mhLog(MH_VERBOSE, cctx->skt,\n \"Request found no match, queueing error response.\\n\");\n- resp = cloneResponse(ctx->pool, ctx->mh->defErrorResponse);\n+ resp = cloneResponse(cctx->pool, ctx->mh->defErrorResponse);\n }\n if (ctx->maxRequests && cctx->reqsReceived >= ctx->maxRequests) {\n setHeader(resp->hdrs, \"Connection\", \"close\");\n@@ -1154,7 +1154,7 @@\n \"Incomplete request matched, queueing response.\\n\");\n ctx->mh->verifyStats->requestsMatched++;\n if (!resp)\n- resp = cloneResponse(ctx->pool, ctx->mh->defResponse);\n+ resp = cloneResponse(cctx->pool, ctx->mh->defResponse);\n resp->req = cctx->req;\n *((mhResponse_t **)apr_array_push(cctx->respQueue)) = resp;\n cctx->req = NULL;\n@@ -1182,8 +1182,11 @@\n apr_socket_t *cskt, mhServerType_t type)\n {\n _mhClientCtx_t *cctx;\n- cctx = apr_pcalloc(pool, sizeof(_mhClientCtx_t));\n- cctx->pool = pool;\n+ apr_pool_t *ccpool;\n+ apr_pool_create(&ccpool, pool);\n+\n+ cctx = apr_pcalloc(ccpool, sizeof(_mhClientCtx_t));\n+ cctx->pool = ccpool;\n cctx->skt = cskt;\n cctx->buflen = 0;\n cctx->bufrem = BUFSIZE;\n"} {"commit":"d74fa1c1d59ec5ae1c8706603c64fe738c50a3cd","subject":"Added adpcm2lin and lin2adpcm.","message":"Added adpcm2lin and lin2adpcm.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/audioop.c\n+++ Modules\/audioop.c\n@@ -130,6 +130,9 @@\n }\n \/* End of code taken from sox *\/\n \n+\/* ADPCM step variation table *\/\n+static float newstep[5] = { 0.8, 0.9, 1.0, 1.75, 1.75 };\n+\n #define CHARP(cp, i) ((signed char *)(cp+i))\n #define SHORTP(cp, i) ((short *)(cp+i))\n #define LONGP(cp, i) ((long *)(cp+i))\n@@ -546,6 +549,136 @@\n return rv;\n }\n \n+static object *\n+audioop_lin2adpcm(self, args)\n+ object *self;\n+ object *args;\n+{\n+ signed char *cp;\n+ signed char *ncp;\n+ int len, size, val, step, valprev, delta;\n+ object *rv, *state, *str;\n+ int i;\n+\n+ if ( !getargs(args, \"(s#iO)\",\n+\t\t &cp, &len, &size, &state) )\n+ return 0;\n+ \n+\n+ if ( size != 1 && size != 2 && size != 4) {\n+\terr_setstr(AudioopError, \"Size should be 1, 2 or 4\");\n+\treturn 0;\n+ }\n+ \n+ str = newsizedstringobject(NULL, len\/size);\n+ if ( str == 0 )\n+ return 0;\n+ ncp = (signed char *)getstringvalue(str);\n+\n+ \/* Decode state, should have (value, step) *\/\n+ if ( state == None ) {\n+\t\/* First time, it seems. Set defaults *\/\n+\tvalprev = 0;\n+\tstep = 4;\t\/* The '4' is magic. Dunno it's significance *\/\n+ } else if ( !getargs(state, \"(ii)\", &valprev, &step) )\n+ return 0;\n+\n+ for ( i=0; i < len; i += size ) {\n+\tif ( size == 1 ) val = ((int)*CHARP(cp, i)) << 8;\n+\telse if ( size == 2 ) val = (int)*SHORTP(cp, i);\n+\telse if ( size == 4 ) val = ((int)*LONGP(cp, i)) >> 16;\n+\n+\t\/* Step 1 - compute difference with previous value *\/\n+\tdelta = (val - valprev)\/step;\n+\n+\t\/* Step 2 - Clamp *\/\n+\tif ( delta < -4 )\n+\t delta = -4;\n+\telse if ( delta > 3 )\n+\t delta = 3;\n+\n+\t\/* Step 3 - Update previous value *\/\n+\tvalprev += delta*step;\n+\n+\t\/* Step 4 - Clamp previous value to 16 bits *\/\n+\tif ( valprev > 32767 )\n+\t valprev = 32767;\n+\telse if ( valprev < -32768 )\n+\t valprev = -32768;\n+\n+\t\/* Step 5 - Update step value *\/\n+\tstep = step * newstep[abs(delta)];\n+\tstep++;\t\t\/* Don't understand this. *\/\n+\n+\t\/* Step 6 - Output value (as a whole byte, currently) *\/\n+\t*ncp++ = delta;\n+ }\n+ rv = mkvalue(\"(O(ii))\", str, valprev, step);\n+ DECREF(str);\n+ return rv;\n+}\n+\n+static object *\n+audioop_adpcm2lin(self, args)\n+ object *self;\n+ object *args;\n+{\n+ signed char *cp;\n+ signed char *ncp;\n+ int len, size, val, valprev, step, delta;\n+ object *rv, *str, *state;\n+ int i;\n+\n+ if ( !getargs(args, \"(s#iO)\",\n+\t\t &cp, &len, &size, &state) )\n+ return 0;\n+\n+ if ( size != 1 && size != 2 && size != 4) {\n+\terr_setstr(AudioopError, \"Size should be 1, 2 or 4\");\n+\treturn 0;\n+ }\n+ \n+ \/* Decode state, should have (value, step) *\/\n+ if ( state == None ) {\n+\t\/* First time, it seems. Set defaults *\/\n+\tvalprev = 0;\n+\tstep = 4;\t\/* The '4' is magic. Dunno it's significance *\/\n+ } else if ( !getargs(state, \"(ii)\", &valprev, &step) )\n+ return 0;\n+ \n+ str = newsizedstringobject(NULL, len*size);\n+ if ( str == 0 )\n+ return 0;\n+ ncp = (signed char *)getstringvalue(str);\n+ \n+ for ( i=0; i < len*size; i += size ) {\n+\t\/* Step 1 - get the delta value *\/\n+\tdelta = *cp++;\n+\n+\t\/* Step 2 - update output value *\/\n+\tvalprev = valprev + delta*step;\n+\n+\t\/* Step 3 - clamp output value *\/\n+\tif ( valprev > 32767 )\n+\t valprev = 32767;\n+\telse if ( valprev < -32768 )\n+\t valprev = -32768;\n+\n+\t\/* Step 4 - Update step value *\/\n+\tstep = step * newstep[abs(delta)];\n+\tstep++;\n+\n+\t\/* Step 5 - Output value *\/\n+\tif ( size == 1 ) *CHARP(ncp, i) = (signed char)(valprev >> 8);\n+\telse if ( size == 2 ) *SHORTP(ncp, i) = (short)(valprev);\n+\telse if ( size == 4 ) *LONGP(ncp, i) = (long)(valprev<<16);\n+ }\n+\n+ rv = mkvalue(\"(O(ii))\", str, valprev, step);\n+ DECREF(str);\n+ return rv;\n+}\n+\n static struct methodlist audioop_methods[] = {\n { \"max\", audioop_max },\n { \"avg\", audioop_avg },\n@@ -555,6 +688,8 @@\n { \"bias\", audioop_bias },\n { \"ulaw2lin\", audioop_ulaw2lin },\n { \"lin2ulaw\", audioop_lin2ulaw },\n+ { \"adpcm2lin\", audioop_adpcm2lin },\n+ { \"lin2adpcm\", audioop_lin2adpcm },\n { \"tomono\", audioop_tomono },\n { \"tostereo\", audioop_tostereo },\n { \"getsample\", audioop_getsample },\n"} {"commit":"261504955d043d969f238f07b2e40bc00fbfa27a","subject":"Issue #6011: getpath: decode VPATH env var from the locale encoding","message":"Issue #6011: getpath: decode VPATH env var from the locale encoding\n\nInstead of casting it to wchar_t* without conversion. It fixes a bug if Python\nis compiled a non-ascii directory, different than the source code directory,\nwith C locale.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/getpath.c\n+++ Modules\/getpath.c\n@@ -285,13 +285,16 @@\n joinpath(prefix, L\"Modules\/Setup\");\n if (isfile(prefix)) {\n \/* Check VPATH to see if argv0_path is in the build directory. *\/\n- vpath = L\"\" VPATH;\n- wcscpy(prefix, argv0_path);\n- joinpath(prefix, vpath);\n- joinpath(prefix, L\"Lib\");\n- joinpath(prefix, LANDMARK);\n- if (ismodule(prefix))\n- return -1;\n+ vpath = _Py_char2wchar(VPATH, NULL);\n+ if (vpath != NULL) {\n+ wcscpy(prefix, argv0_path);\n+ joinpath(prefix, vpath);\n+ PyMem_Free(vpath);\n+ joinpath(prefix, L\"Lib\");\n+ joinpath(prefix, LANDMARK);\n+ if (ismodule(prefix))\n+ return -1;\n+ }\n }\n \n \/* Search from argv0_path, until root is found *\/\n"} {"commit":"374f11ef444a7ab7dcc80b1d8a27a8b286e803bd","subject":"Fix for bug introduced in when PART_DATA processing was extracted to a separate function in commit 6c2014ac4b5e52daf69c. The feed state is also now passed by reference to processPartData, so that the feed state is correctly updated. Fixed minor typo inherited from original formidable.js source code.","message":"Fix for bug introduced in when PART_DATA processing was extracted to a separate function in commit 6c2014ac4b5e52daf69c.\nThe feed state is also now passed by reference to processPartData, so that the feed state is correctly updated.\nFixed minor typo inherited from original formidable.js source code.\n","repos":"FooBarWidget\/multipart-parser,FooBarWidget\/multipart-parser,FooBarWidget\/multipart-parser","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- MultipartParser.h\n+++ MultipartParser.h\n@@ -122,12 +122,12 @@\n \t}\n \t\n \tvoid processPartData(size_t &prevIndex, size_t &index, const char *buffer,\n-\t\tsize_t len, size_t boundaryEnd, size_t &i, char c, int &flags)\n+\t\tsize_t len, size_t boundaryEnd, size_t &i, char c, State &state, int &flags)\n \t{\n \t\tprevIndex = index;\n \t\t\n \t\tif (index == 0) {\n-\t\t\t\/\/ boyer-moore derrived algorithm to safely skip non-boundary data\n+\t\t\t\/\/ boyer-moore derived algorithm to safely skip non-boundary data\n \t\t\twhile (i + boundarySize <= len) {\n \t\t\t\tif (isBoundaryChar(buffer[i + boundaryEnd])) {\n \t\t\t\t\tbreak;\n@@ -389,8 +389,7 @@\n \t\t\t\tstate = PART_DATA;\n \t\t\t\tpartDataMark = i;\n \t\t\tcase PART_DATA:\n-\t\t\t\tprocessPartData(prevIndex, index, buffer, len, boundaryEnd,\n-\t\t\t\t\ti, c, flags);\n+\t\t\t\tprocessPartData(prevIndex, index, buffer, len, boundaryEnd, i, c, state, flags);\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\treturn i;\n"} {"commit":"491441c4caa97103f110b13bc90d2a4134aa0dcd","subject":"Create OSAL_Queue.h","message":"Create OSAL_Queue.h","repos":"ianhom\/MOE,ianhom\/MOE","returncode":1,"stderr":"error: pathspec 'OSAL\/OSAL_Queue.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- OSAL\/OSAL_Queue.h\n+++ OSAL\/OSAL_Queue.h\n@@ -0,0 +1,40 @@\n+\/*\/******************************************************************************\n+* File : OSAL_Queue.h\n+* Function : General queue function.\n+* description: To be done. \n+* Version : V1.00\n+* Author : Ian\n+* Date : 10th Jun 2016\n+* History : No. When Who What\n+* 1 10\/Jun\/2016 Ian Create\n+******************************************************************************\/\n+\n+#ifndef _OSAL_QUEUE_H_\n+#define _OSAL_QUEUE_H_\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+\/* Check if specified option is set for debugging *\/\n+#ifndef __DEBUG_MODE_OSAL_QUEUE \n+#define __DEBUG_MODE __DEBUG_NONE \/* Default: None debugging info *\/\n+#else\n+#ifdef __DEBUG_MODE\n+#undef __DEBUG_MODE\n+#endif\n+#define __DEBUG_MODE __DEBUG_MODE_OSAL_QUEUE \/* According the set from project_config.h *\/\n+#endif\n+\n+\n+\n+\n+ \n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif \/* _OSAL_QUEUE_H_ *\/\n+\n+\/* End of file *\/\n+\n"} {"commit":"e9c32a12bde22b2687a4fc1f60f81116340ade56","subject":"Update OSAL_Timer.h","message":"Update OSAL_Timer.h","repos":"ianhom\/MOE,ianhom\/MOE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OSAL\/OSAL_Timer.h\n+++ OSAL\/OSAL_Timer.h\n@@ -55,8 +55,8 @@\n \r\n typedef struct _T_TIMER_NODE\r\n {\r\n+ struct _T_TIMER_NODE *ptNext; \/* Pointer for next timer node *\/\r\n T_TIMER tTimer; \/* Timer data of such node *\/\r\n- struct _T_TIMER_NODE *ptNext; \/* Pointer for next timer node *\/\r\n }T_TIMER_NODE;\r\n \r\n \/* MACRO *\/\r\n"} {"commit":"3e52a176773563b21ed3139fad555751034c0558","subject":"Adding missing newline to OctoKit.h","message":"Adding missing newline to OctoKit.h\n","repos":"Acidburn0zzz\/octokit.objc,leichunfeng\/octokit.objc,Palleas\/octokit.objc,CleanShavenApps\/octokit.objc,daemonchen\/octokit.objc,yeahdongcn\/octokit.objc,xantage\/octokit.objc,jonesgithub\/octokit.objc,GroundControl-Solutions\/octokit.objc,Palleas\/octokit.objc,cnbin\/octokit.objc,daemonchen\/octokit.objc,wrcj12138aaa\/octokit.objc,Acidburn0zzz\/octokit.objc,xantage\/octokit.objc,cnbin\/octokit.objc,phatblat\/octokit.objc,daukantas\/octokit.objc,daukantas\/octokit.objc,CHNLiPeng\/octokit.objc,GroundControl-Solutions\/octokit.objc,phatblat\/octokit.objc,wrcj12138aaa\/octokit.objc,jonesgithub\/octokit.objc,leichunfeng\/octokit.objc,CHNLiPeng\/octokit.objc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OctoKit\/OctoKit.h\n+++ OctoKit\/OctoKit.h\n@@ -43,4 +43,4 @@\n #import <OctoKit\/OCTTeam.h>\n #import <OctoKit\/OCTUser.h>\n #import <OctoKit\/OCTComment.h>\n-#import <OctoKit\/OCTReviewComment.h>+#import <OctoKit\/OCTReviewComment.h>\n"} {"commit":"2a156ebc2a383fd12d8855192c91b68ac66b3623","subject":"trying to fix max_k","message":"trying to fix max_k\n","repos":"Angeldude\/csound,audiokit\/csound,nikhilsinghmus\/csound,audiokit\/csound,max-ilse\/csound,nikhilsinghmus\/csound,iver56\/csound,Angeldude\/csound,audiokit\/csound,audiokit\/csound,Angeldude\/csound,nikhilsinghmus\/csound,Angeldude\/csound,iver56\/csound,mcanthony\/csound,iver56\/csound,Angeldude\/csound,mcanthony\/csound,iver56\/csound,mcanthony\/csound,max-ilse\/csound,mcanthony\/csound,audiokit\/csound,Angeldude\/csound,max-ilse\/csound,audiokit\/csound,max-ilse\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,iver56\/csound,Angeldude\/csound,mcanthony\/csound,Angeldude\/csound,max-ilse\/csound,mcanthony\/csound,iver56\/csound,iver56\/csound,nikhilsinghmus\/csound,max-ilse\/csound,audiokit\/csound,audiokit\/csound,iver56\/csound,nikhilsinghmus\/csound,mcanthony\/csound,max-ilse\/csound,Angeldude\/csound,nikhilsinghmus\/csound,audiokit\/csound,nikhilsinghmus\/csound,iver56\/csound,max-ilse\/csound,Angeldude\/csound,mcanthony\/csound,nikhilsinghmus\/csound,audiokit\/csound,max-ilse\/csound,mcanthony\/csound,iver56\/csound,mcanthony\/csound,max-ilse\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Opcodes\/gab\/gab.c\n+++ Opcodes\/gab\/gab.c\n@@ -32,6 +32,8 @@\n #include \"gab.h\"\n #include <math.h>\n #include \"interlocks.h\"\n+\n+#define FLT_MAX ((MYFLT)0x7fffffff)\n \n static int krsnsetx(CSOUND *csound, KRESONX *p)\n \/* Gabriel Maldonado, modifies for arb order *\/\n@@ -711,7 +713,17 @@\n \n static int partial_maximum_set(CSOUND *csound,P_MAXIMUM *p)\n {\n- p->max = 0;\n+ int flag = (int) *p->imaxflag;\n+ switch (flag) {\n+ case 1:\n+ p->max = 0; break;\n+ case 2:\n+ p->max = -FLT_MAX; break;\n+ case 3:\n+ p->max = FLT_MAX; break;\n+ case 4:\n+ p->max = 0; break;\n+ }\n p->counter = 0;\n return OK;\n }\n@@ -759,13 +771,22 @@\n Str(\"max_k: invalid imaxflag value\"));\n }\n if (*p->ktrig) {\n- if (flag == 4) {\n+ switch (flag) {\n+ case 4:\n *p->kout = p->max \/ (MYFLT) p->counter;\n p->counter = 0;\n- }\n- else\n+ p->max = FL(0.0);\n+ break;\n+ case 1:\n *p->kout = p->max;\n- p->max = FL(0.0);\n+ p->max = 0; break;\n+ case 2:\n+ *p->kout = p->max;\n+ p->max = -FLT_MAX; break;\n+ case 3:\n+ *p->kout = p->max;\n+ p->max = FLT_MAX; break;\n+ }\n }\n return OK;\n }\n"} {"commit":"8be10c170308c5f491ef64f9a27dbd3784e40ad0","subject":"","message":"\n\nADD - More commenting on the dispenserManager header","repos":"psorlie\/PFE_FullFill,psorlie\/PFE_FullFill,psorlie\/PFE_FullFill,psorlie\/PFE_FullFill,psorlie\/PFE_FullFill","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- VracBerry\/C\/src\/DispenserManager.h\n+++ VracBerry\/C\/src\/DispenserManager.h\n@@ -15,10 +15,26 @@\n #include \"Network_Configuration.h\"\n #include \"Dispenser.h\"\n \n+\/**\n+ * @def type for the head of the list\n+ *\/\n typedef struct Dispenser_list_t Dispenser_list;\n \n+\n+\/**\n+ * @brief function to get the first dispenser of the list\n+ *\n+ * @retval Dispenser* the first dispenser.\n+ *\/\n extern Dispenser* DispenserManager_get_list();\n \n+\/**\n+ * @brief function to initialize the list (malloc of the head, ...)\n+ *\n+ * the list hasnt been initialized\n+ *\n+ * @retval void\n+ *\/\n extern void DispenserManager_init();\n \n extern Dispenser* DispenserManager_add_dispenser(Dispenser_Id, char*, Battery, Filling);\n@@ -77,20 +93,65 @@\n \n extern void DispenserManager_prepare_destroy_dispenser(Dispenser_Id);\n \n+\/**\n+ * @brief function called from the translator that had a dispenser with the data he sent\n+ *\n+ * @param[in] the id of the new dispenser\n+ *\n+ * @param[in] the battery value it sent\n+ *\n+ * @param[in] the filling value it sent\n+ *\n+ * @retval Dispenser* of the new dispenser\n+ *\/\n extern Dispenser* DispenserManager_add_new_detected_dispenser(Dispenser_Id, Battery, Filling);\n \n+\/**\n+ * @brief function called when the dispenser is in run state and an user ask the product name\n+ *\n+ * @pre the dispenser is in run state ?\n+ *\n+ * @param[in] Dispenser* of the asked dispenser\n+ *\/\n extern void DispenserManager_ask_product_name(Dispenser*);\n \n+\/**\n+ * @brief function to tell to a dispenser that he is broken\n+ *\n+ * @param[in] id of the dispenser\n+ *\/\n extern void DispenserManager_tell_dispenser_broken(Dispenser_Id);\n \n+\/**\n+ * @brief function to tell to a dispenser he has to repeat his last message.\n+ *\n+ * @param[in] id of the dispenser\n+ *\/\n extern void DispenserManager_tell_dispenser_repeat(Dispenser_Id);\n \n+\n+\/**\n+ * @brief function called to save the data of a dispenser in the backup file\n+ *\n+ * @param[in] Dispenser* of the to-be saved dispenser\n+ *\/\n extern void DispenserManager_save_in_backup(Dispenser*);\n \n+\/**\n+ * @brief function called every morning to know if there is dirty dispenser\n+ *\n+ * @param[in] the maximum days since last cleaning\n+ *\/\n extern void DispenserManager_check_dispenser_is_dirty(int);\n \n+\/**\n+ * @brief function called to generate for every dispenser that the day is over\n+ *\/\n extern void DispenserManager_end_of_the_day();\n \n+\/**\n+ * @brief function called to generate for every dispenser that the night is over\n+ *\/\n extern void DispenserManager_morning();\n \n \n"} {"commit":"c329f74e6dfa8dc837f2e7c4beb29be4e08954fb","subject":"Remove unused include","message":"Remove unused include\n","repos":"objective-audio\/YASAudio,objective-audio\/audio_engine,objective-audio\/audio_engine,objective-audio\/audio_engine,objective-audio\/YASAudio","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- YASAudio\/Utility\/YASAudioUtility.c\n+++ YASAudio\/Utility\/YASAudioUtility.c\n@@ -4,7 +4,6 @@\n \/\/\n \n #include \"YASAudioUtility.h\"\n-#include <string.h>\n #include <Accelerate\/Accelerate.h>\n \n void YASAudioRemoveAudioBufferList(AudioBufferList *ioAbl)\n"} {"commit":"54c353830fa3528a8a3b12667a744ebdaf5f0763","subject":"SDL GUI mouse support","message":"SDL GUI mouse support\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SDL\/gui.c\n+++ SDL\/gui.c\n@@ -25,7 +25,8 @@\n #endif\n \n shader_t shader;\n-SDL_Rect rect;\n+static SDL_Rect rect;\n+static unsigned factor;\n \n void render_texture(void *pixels, void *previous)\n {\n@@ -118,6 +119,10 @@\n {\n int win_width, win_height;\n SDL_GL_GetDrawableSize(window, &win_width, &win_height);\n+ int logical_width, logical_height;\n+ SDL_GetWindowSize(window, &logical_width, &logical_height);\n+ factor = win_width \/ logical_width;\n+ \n double x_factor = win_width \/ (double) GB_get_screen_width(&gb);\n double y_factor = win_height \/ (double) GB_get_screen_height(&gb);\n \n@@ -810,9 +815,60 @@\n current_menu = root_menu = is_running? paused_menu : nonpaused_menu;\n current_selection = 0;\n do {\n- \/* Convert Joypad events (We only generate down events) *\/\n+ \/* Convert Joypad and mouse events (We only generate down events) *\/\n if (gui_state != WAITING_FOR_KEY && gui_state != WAITING_FOR_JBUTTON) {\n switch (event.type) {\n+ case SDL_MOUSEBUTTONDOWN:\n+ if (gui_state == SHOWING_HELP) {\n+ event.type = SDL_KEYDOWN;\n+ event.key.keysym.scancode = SDL_SCANCODE_RETURN;\n+ }\n+ else if (gui_state == SHOWING_DROP_MESSAGE) {\n+ event.type = SDL_KEYDOWN;\n+ event.key.keysym.scancode = SDL_SCANCODE_ESCAPE;\n+ }\n+ else if (gui_state == SHOWING_MENU) {\n+ signed x = (event.button.x - rect.x \/ factor) * 160 \/ (rect.w \/ factor) - x_offset;\n+ signed y = (event.button.y - rect.y \/ factor) * 144 \/ (rect.h \/ factor) - y_offset;\n+ \n+ if (strcmp(\"CRT\", configuration.filter) == 0) {\n+ y = y * 8 \/ 7;\n+ y -= 144 \/ 16;\n+ }\n+ \n+ if (x < 0 || x >= 160 || y < 24) {\n+ continue;\n+ }\n+ \n+ unsigned item_y = 24;\n+ unsigned index = 0;\n+ for (const struct menu_item *item = current_menu; item->string; item++, index++) {\n+ if (!item->backwards_handler) {\n+ if (y >= item_y && y < item_y + 12) {\n+ break;\n+ }\n+ item_y += 12;\n+ }\n+ else {\n+ if (y >= item_y && y < item_y + 24) {\n+ break;\n+ }\n+ item_y += 24;\n+ }\n+ }\n+ \n+ if (!current_menu[index].string) continue;\n+ \n+ current_selection = index;\n+ event.type = SDL_KEYDOWN;\n+ if (current_menu[index].backwards_handler) {\n+ event.key.keysym.scancode = x < 80? SDL_SCANCODE_LEFT : SDL_SCANCODE_RIGHT;\n+ }\n+ else {\n+ event.key.keysym.scancode = SDL_SCANCODE_RETURN;\n+ }\n+\n+ }\n case SDL_JOYBUTTONDOWN:\n event.type = SDL_KEYDOWN;\n joypad_button_t button = get_joypad_button(event.jbutton.button);\n"} {"commit":"d6c29c30eaac8a0d6c8c8f44a2c61d3443c51707","subject":"drm\/amdgpu: reset vce trap interrupt flag","message":"drm\/amdgpu: reset vce trap interrupt flag\n\nSigned-off-by: Leo Liu <2cc5244297c0b82e7ea531cc4a868153602775b7@amd.com>\nReviewed-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/amd\/amdgpu\/vce_v3_0.c\n+++ drivers\/gpu\/drm\/amd\/amdgpu\/vce_v3_0.c\n@@ -576,6 +576,11 @@\n \t\t\t\t struct amdgpu_iv_entry *entry)\n {\n \tDRM_DEBUG(\"IH: VCE\\n\");\n+\n+\tWREG32_P(mmVCE_SYS_INT_STATUS,\n+\t\tVCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK,\n+\t\t~VCE_SYS_INT_STATUS__VCE_SYS_INT_TRAP_INTERRUPT_INT_MASK);\n+\n \tswitch (entry->src_data) {\n \tcase 0:\n \t\tamdgpu_fence_process(&adev->vce.ring[0]);\n"} {"commit":"c2a2a1a722b7e4edce7dad285b461e0b2592eecc","subject":"drm\/i915: distinguish between error messages in DIDL initialization","message":"drm\/i915: distinguish between error messages in DIDL initialization\n\nTwo exactly same error messages on different error paths makes debugging\ndifficult. Clarify the messages and distinguish them from each other.\n\nSigned-off-by: Jani Nikula <ba783f3beccaedfda693f41a15407d612a629408@intel.com>\nReviewed-by: Paulo Zanoni <cc0e04a2103c45cd195651d976f79813d0f66bdf@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_opregion.c\n+++ drivers\/gpu\/drm\/i915\/intel_opregion.c\n@@ -312,7 +312,7 @@\n \tlist_for_each_entry(acpi_cdev, &acpi_video_bus->children, node) {\n \t\tif (i >= 8) {\n \t\t\tdev_printk(KERN_ERR, &dev->pdev->dev,\n-\t\t\t\t \"More than 8 outputs detected\\n\");\n+\t\t\t\t \"More than 8 outputs detected via ACPI\\n\");\n \t\t\treturn;\n \t\t}\n \t\tstatus =\n@@ -339,7 +339,7 @@\n \t\tint output_type = ACPI_OTHER_OUTPUT;\n \t\tif (i >= 8) {\n \t\t\tdev_printk(KERN_ERR, &dev->pdev->dev,\n-\t\t\t\t \"More than 8 outputs detected\\n\");\n+\t\t\t\t \"More than 8 outputs in connector list\\n\");\n \t\t\treturn;\n \t\t}\n \t\tswitch (connector->connector_type) {\n"} {"commit":"c556d989038a6eba1411acf39163eb660e0a13bc","subject":"drm\/nvc0: implement memory detection","message":"drm\/nvc0: implement memory detection\n\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/nouveau_mem.c\n+++ drivers\/gpu\/drm\/nouveau\/nouveau_mem.c\n@@ -320,7 +320,8 @@\n \tif (dev_priv->card_type < NV_50) {\n \t\tdev_priv->vram_size = nv_rd32(dev, NV04_PFB_FIFO_DATA);\n \t\tdev_priv->vram_size &= NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK;\n-\t} else {\n+\t} else\n+\tif (dev_priv->card_type < NV_C0) {\n \t\tdev_priv->vram_size = nv_rd32(dev, NV04_PFB_FIFO_DATA);\n \t\tdev_priv->vram_size |= (dev_priv->vram_size & 0xff) << 32;\n \t\tdev_priv->vram_size &= 0xffffffff00ll;\n@@ -328,6 +329,9 @@\n \t\t\tdev_priv->vram_sys_base = nv_rd32(dev, 0x100e10);\n \t\t\tdev_priv->vram_sys_base <<= 12;\n \t\t}\n+\t} else {\n+\t\tdev_priv->vram_size = nv_rd32(dev, 0x10f20c) << 20;\n+\t\tdev_priv->vram_size *= nv_rd32(dev, 0x121c74);\n \t}\n \n \tNV_INFO(dev, \"Detected %dMiB VRAM\\n\", (int)(dev_priv->vram_size >> 20));\n"} {"commit":"5b97382398dda31ca38a8c62880a21af03cf6f7f","subject":"ib_srpt: Destroy cm_id before destroying QP.","message":"ib_srpt: Destroy cm_id before destroying QP.\n\ncommit 0b41d6ca616ddeb3b6c0a80e8770b6f53cd42806 upstream.\n\nThis patch fixes a bug where ib_destroy_cm_id() was incorrectly being called\nafter srpt_destroy_ch_ib() had destroyed the active QP.\n\nThis would result in the following failed SRP_LOGIN_REQ messages:\n\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff1762bd, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c903009f8f41)\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff1758f9, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 2 (guid=0xfe80000000000000:0x2c903009f8f42)\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff175941, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 2 (guid=0xfe80000000000000:0x2c90300a3cfb2)\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1)\nmlx4_core 0000:84:00.0: command 0x19 failed: fw status = 0x9\nrejected SRP_LOGIN_REQ because creating a new RDMA channel failed.\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1)\nmlx4_core 0000:84:00.0: command 0x19 failed: fw status = 0x9\nrejected SRP_LOGIN_REQ because creating a new RDMA channel failed.\nReceived SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1)\n\nReported-by: Navin Ahuja <b0f51a261c6e8372a057c05c44a087e5b5185a07@saratoga-speed.com>\nSigned-off-by: Nicholas Bellinger <978acd1567d5598152161fdf8bf3ca568f950c9b@linux-iscsi.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/infiniband\/ulp\/srpt\/ib_srpt.c\n+++ drivers\/infiniband\/ulp\/srpt\/ib_srpt.c\n@@ -2358,6 +2358,8 @@\n \ttransport_deregister_session(se_sess);\n \tch->sess = NULL;\n \n+\tib_destroy_cm_id(ch->cm_id);\n+\n \tsrpt_destroy_ch_ib(ch);\n \n \tsrpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring,\n@@ -2367,8 +2369,6 @@\n \tspin_lock_irq(&sdev->spinlock);\n \tlist_del(&ch->list);\n \tspin_unlock_irq(&sdev->spinlock);\n-\n-\tib_destroy_cm_id(ch->cm_id);\n \n \tif (ch->release_done)\n \t\tcomplete(ch->release_done);\n"} {"commit":"650b1815ffa7b39947cdc33568d3113134d999ec","subject":"[media] ov2640: use the v4l2 size definitions","message":"[media] ov2640: use the v4l2 size definitions\n\nReuse the v4l2 size definitions from v4l2-image-sizes.h.\nSo we can remove the rudundent definitions from ov2640.c.\n\nSigned-off-by: Josh Wu <5d315a13f7549d1ecf8e62305448b567ef831df9@atmel.com>\nSigned-off-by: Guennadi Liakhovetski <50875182aae23d69ca7738697596f18a14e926fc@gmx.de>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@osg.samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"27dcb00d0dc1d532b0da940e35a6d020ee33bd47","subject":"[media] radio-miropcm20: fix sparse NULL pointer warning","message":"[media] radio-miropcm20: fix sparse NULL pointer warning\n\nFixes the following sparse warnings:\n\ndrivers\/media\/radio\/radio-miropcm20.c:193:33: warning:\n Using plain integer as NULL pointer\n\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nSigned-off-by: Mauro Carvalho Chehab <0cae1d1e981e84d16b82ca3d17be8a7f826608d3@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/radio\/radio-miropcm20.c\n+++ drivers\/media\/radio\/radio-miropcm20.c\n@@ -190,7 +190,7 @@\n \tfreql = freq & 0xff;\n \tfreqh = freq >> 8;\n \n-\trds_cmd(aci, RDS_RESET, 0, 0);\n+\trds_cmd(aci, RDS_RESET, NULL, 0);\n \treturn snd_aci_cmd(aci, ACI_WRITE_TUNE, freql, freqh);\n }\n \n"} {"commit":"ffdeca885e887dcdde40c03d8910373bd1f62296","subject":"[media] em28xx_dvb: only call the software filter if data","message":"[media] em28xx_dvb: only call the software filter if data\n\nSeveral URBs will be simply not filled. Don't call the DVB\ncore software filter for those empty URBs.\n\nSigned-off-by: Mauro Carvalho Chehab <0cae1d1e981e84d16b82ca3d17be8a7f826608d3@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/usb\/em28xx\/em28xx-dvb.c\n+++ drivers\/media\/usb\/em28xx\/em28xx-dvb.c\n@@ -161,6 +161,8 @@\n \t\t\t\tif (urb->status != -EPROTO)\n \t\t\t\t\tcontinue;\n \t\t\t}\n+\t\t\tif (!urb->actual_length)\n+\t\t\t\tcontinue;\n \t\t\tdvb_dmx_swfilter(&dev->dvb->demux, urb->transfer_buffer,\n \t\t\t\t\turb->actual_length);\n \t\t} else {\n@@ -170,6 +172,8 @@\n \t\t\t\tif (urb->iso_frame_desc[i].status != -EPROTO)\n \t\t\t\t\tcontinue;\n \t\t\t}\n+\t\t\tif (!urb->iso_frame_desc[i].actual_length)\n+\t\t\t\tcontinue;\n \t\t\tdvb_dmx_swfilter(&dev->dvb->demux,\n \t\t\t\t\t urb->transfer_buffer +\n \t\t\t\t\t urb->iso_frame_desc[i].offset,\n"} {"commit":"52f7b00e645b2c85020bca2cc3dc720ab7f93ac0","subject":"[media] em28xx: Display the used DVB alternate","message":"[media] em28xx: Display the used DVB alternate\n\nThat helps to understand what's going there.\n\nSigned-off-by: Mauro Carvalho Chehab <0cae1d1e981e84d16b82ca3d17be8a7f826608d3@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/usb\/em28xx\/em28xx-dvb.c\n+++ drivers\/media\/usb\/em28xx\/em28xx-dvb.c\n@@ -212,10 +212,10 @@\n \tif (rc < 0)\n \t\treturn rc;\n \n-\tdprintk(1, \"Using %d buffers each with %d x %d bytes\\n\",\n+\tdprintk(1, \"Using %d buffers each with %d x %d bytes, alternate %d\\n\",\n \t\tEM28XX_DVB_NUM_BUFS,\n \t\tpacket_multiplier,\n-\t\tdvb_max_packet_size);\n+\t\tdvb_max_packet_size, dvb_alt);\n \n \treturn em28xx_init_usb_xfer(dev, EM28XX_DIGITAL_MODE,\n \t\t\t\t dev->dvb_xfer_bulk,\n"} {"commit":"637fb3d70b1e53a127cba5ffae5aa3b2b9f57df6","subject":"V4L\/DVB (12180): cx18: Update Yuan MPC-718 card entry with better information and guesses","message":"V4L\/DVB (12180): cx18: Update Yuan MPC-718 card entry with better information and guesses\n\nSigned-off-by: Andy Walls <87098e5036de39f00cafe8d8f6114135f55ad2e7@radix.net>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/cx18\/cx18-cards.c\n+++ drivers\/media\/video\/cx18\/cx18-cards.c\n@@ -198,11 +198,14 @@\n \n static const struct cx18_card cx18_card_mpc718 = {\n \t.type = CX18_CARD_YUAN_MPC718,\n-\t.name = \"Yuan MPC718\",\n-\t.comment = \"Analog video capture works; some audio line in may not.\\n\",\n-\t.v4l2_capabilities = CX18_CAP_ENCODER,\n-\t.hw_audio_ctrl = CX18_HW_418_AV,\n-\t.hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL,\n+\t.name = \"Yuan MPC718 MiniPCI DVB-T\/Analog\",\n+\t.comment = \"Experimenters needed for device to work well.\\n\"\n+\t\t \"\\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\\n\",\n+\t.v4l2_capabilities = CX18_CAP_ENCODER,\n+\t.hw_audio_ctrl = CX18_HW_418_AV,\n+\t.hw_muxer = CX18_HW_GPIO_MUX,\n+\t.hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_MUX |\n+\t\t CX18_HW_GPIO_RESET_CTRL,\n \t.video_inputs = {\n \t\t{ CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 },\n \t\t{ CX18_CARD_INPUT_SVIDEO1, 1,\n@@ -211,27 +214,34 @@\n \t\t{ CX18_CARD_INPUT_SVIDEO2, 2,\n \t\t\t\tCX18_AV_SVIDEO_LUMA7 | CX18_AV_SVIDEO_CHROMA8 },\n \t\t{ CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE6 },\n-\t\t{ CX18_CARD_INPUT_COMPOSITE3, 2, CX18_AV_COMPOSITE3 },\n \t},\n \t.audio_inputs = {\n \t\t{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 },\n-\t\t{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 0 },\n-\t\t{ CX18_CARD_INPUT_LINE_IN2, CX18_AV_AUDIO_SERIAL1, 0 },\n-\t},\n-\t.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO_SERIAL1, 0 },\n+\t\t{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },\n+\t\t{ CX18_CARD_INPUT_LINE_IN2, CX18_AV_AUDIO_SERIAL2, 1 },\n+\t},\n \t.tuners = {\n \t\t\/* XC3028 tuner *\/\n \t\t{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },\n \t},\n-\t.ddr = {\n-\t\t\/* Probably Samsung K4D263238G-VC33 memory *\/\n-\t\t.chip_config = 0x003,\n-\t\t.refresh = 0x30c,\n-\t\t.timing1 = 0x23230b73,\n-\t\t.timing2 = 0x08,\n+\t\/* FIXME - the FM radio is just a guess and driver doesn't use SIF *\/\n+\t.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },\n+\t.ddr = {\n+\t\t\/* Hynix HY5DU283222B DDR RAM *\/\n+\t\t.chip_config = 0x303,\n+\t\t.refresh = 0x3bd,\n+\t\t.timing1 = 0x36320966,\n+\t\t.timing2 = 0x1f,\n \t\t.tune_lane = 0,\n \t\t.initial_emrs = 2,\n \t},\n+\t.gpio_init.initial_value = 0x1,\n+\t.gpio_init.direction = 0x3,\n+\t\/* FIXME - these GPIO's are just guesses *\/\n+\t.gpio_audio_input = { .mask = 0x3,\n+\t\t\t .tuner = 0x1,\n+\t\t\t .linein = 0x3,\n+\t\t\t .radio = 0x1 },\n \t.xceive_pin = 0,\n \t.pci_list = cx18_pci_mpc718,\n \t.i2c = &cx18_i2c_std,\n"} {"commit":"94a6f2def20486d80df2e289ae327eb2a7932209","subject":"net\/failsafe: avoid crash on malformed ethdev","message":"net\/failsafe: avoid crash on malformed ethdev\n\nSome PMD do not respect the eth_dev API when allocating their\nrte_eth_dev. As a result, on device add event resulting from\nrte_eth_dev_probing_finish() call, the eth_dev processed is incomplete.\n\nThe segfault is a good way to focus the developer on the issue, but does\nnot inspire confidence. Instead, warn the user of the error repeatedly.\n\nThe failsafe PMD can warn of the issue and continue. It will repeatedly\nattempt to initialize the failed port and complain about it, which\nshould result in the same developer focus but with less crashing.\n\nSigned-off-by: Gaetan Rivet <5349a78fb7b717c3a3b30d04e535485ef35093c6@u256.net>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/failsafe\/failsafe_ether.c\n+++ drivers\/net\/failsafe\/failsafe_ether.c\n@@ -623,6 +623,11 @@\n \tFOREACH_SUBDEV_STATE(sdev, i, fs_dev, DEV_PARSED) {\n \t\tif (sdev->state >= DEV_PROBED)\n \t\t\tcontinue;\n+\t\tif (dev->device == NULL) {\n+\t\t\tWARN(\"Trying to probe malformed device %s.\\n\",\n+\t\t\t sdev->devargs.name);\n+\t\t\tcontinue;\n+\t\t}\n \t\tif (strcmp(sdev->devargs.name, dev->device->name) != 0)\n \t\t\tcontinue;\n \t\trte_eth_dev_owner_set(port_id, &PRIV(fs_dev)->my_owner);\n"} {"commit":"5cc7caf46cb8823f0a86b25b96ebbc531bd1a21c","subject":"ath10k: use wmi op version to check which iface combination to use","message":"ath10k: use wmi op version to check which iface combination to use\n\nATH10K_FW_FEATURE_WMI_10X should not be used for anymore as that's\nnow deprecated, instead use wmi op version.\n\nSigned-off-by: Kalle Valo <7081a7d99b8c74c0698a728df19e3915a995d7e1@qca.qualcomm.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath10k\/mac.c\n+++ drivers\/net\/wireless\/ath\/ath10k\/mac.c\n@@ -5129,16 +5129,25 @@\n \t *\/\n \tar->hw->queues = 4;\n \n-\tif (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {\n+\tswitch (ar->wmi.op_version) {\n+\tcase ATH10K_FW_WMI_OP_VERSION_MAIN:\n+\tcase ATH10K_FW_WMI_OP_VERSION_TLV:\n+\t\tar->hw->wiphy->iface_combinations = ath10k_if_comb;\n+\t\tar->hw->wiphy->n_iface_combinations =\n+\t\t\tARRAY_SIZE(ath10k_if_comb);\n+\t\tar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);\n+\t\tbreak;\n+\tcase ATH10K_FW_WMI_OP_VERSION_10_1:\n+\tcase ATH10K_FW_WMI_OP_VERSION_10_2:\n \t\tar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;\n \t\tar->hw->wiphy->n_iface_combinations =\n \t\t\tARRAY_SIZE(ath10k_10x_if_comb);\n-\t} else {\n-\t\tar->hw->wiphy->iface_combinations = ath10k_if_comb;\n-\t\tar->hw->wiphy->n_iface_combinations =\n-\t\t\tARRAY_SIZE(ath10k_if_comb);\n-\n-\t\tar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);\n+\t\tbreak;\n+\tcase ATH10K_FW_WMI_OP_VERSION_UNSET:\n+\tcase ATH10K_FW_WMI_OP_VERSION_MAX:\n+\t\tWARN_ON(1);\n+\t\tret = -EINVAL;\n+\t\tgoto err_free;\n \t}\n \n \tar->hw->netdev_features = NETIF_F_HW_CSUM;\n"} {"commit":"4afd89d9cf17df46c3cfa1eb744232e345b3b0e6","subject":"ath5k: remove all mention of monitor iftype","message":"ath5k: remove all mention of monitor iftype\n\nMonitor interfaces are never seen by the driver so these\ncases are never reached.\n\nSigned-off-by: Bob Copeland <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@bobcopeland.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath5k\/base.c\n+++ drivers\/net\/wireless\/ath\/ath5k\/base.c\n@@ -2325,8 +2325,7 @@\n \n \tATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, \"in beacon_send\\n\");\n \n-\tif (unlikely(bf->skb == NULL || sc->opmode == NL80211_IFTYPE_STATION ||\n-\t\t\tsc->opmode == NL80211_IFTYPE_MONITOR)) {\n+\tif (unlikely(bf->skb == NULL || sc->opmode == NL80211_IFTYPE_STATION)) {\n \t\tATH5K_WARN(sc, \"bf=%p bf_skb=%p\\n\", bf, bf ? bf->skb : NULL);\n \t\treturn;\n \t}\n@@ -2900,9 +2899,6 @@\n \n \tath5k_debug_dump_skb(sc, skb, \"TX \", 1);\n \n-\tif (sc->opmode == NL80211_IFTYPE_MONITOR)\n-\t\tATH5K_DBG(sc, ATH5K_DEBUG_XMIT, \"tx in monitor (scan?)\\n\");\n-\n \t\/*\n \t * The hardware expects the header padded to 4 byte boundaries.\n \t * If this is not the case, we add the padding after the header.\n@@ -3048,7 +3044,6 @@\n \tcase NL80211_IFTYPE_STATION:\n \tcase NL80211_IFTYPE_ADHOC:\n \tcase NL80211_IFTYPE_MESH_POINT:\n-\tcase NL80211_IFTYPE_MONITOR:\n \t\tsc->opmode = vif->type;\n \t\tbreak;\n \tdefault:\n@@ -3250,7 +3245,6 @@\n \n \tswitch (sc->opmode) {\n \tcase NL80211_IFTYPE_MESH_POINT:\n-\tcase NL80211_IFTYPE_MONITOR:\n \t\trfilt |= AR5K_RX_FILTER_CONTROL |\n \t\t\t AR5K_RX_FILTER_BEACON |\n \t\t\t AR5K_RX_FILTER_PROBEREQ |\n"} {"commit":"c82552c5b0cb1735dbcbad78b1ffc6d3c212dc56","subject":"ath9k: add a recv budget","message":"ath9k: add a recv budget\n\nImplement a recv budget so that in cases of high traffic we still allow other\ntaskets to get processed.\n\nWithout this, we can encounter a host of issues during high wireless traffic\nreception depending on system load including rcu stall's detected (ARM),\nsoft lockups, failure to service critical tasks such as watchdog resets,\nand triggering of the tx stuck tasklet.\n\nThe same thing was proposed previously by Ben:\n http:\/\/www.spinics.net\/lists\/linux-wireless\/msg112891.html\n\nThe only difference here is that I make sure only processed packets are counted\nin the budget by checking at the end of the rx loop.\n\nSigned-off-by: Tim Harvey <2eb8e9683e255f7f6ab4ba7e0e01ba35c34e3b93@gateworks.com>\nAcked-by: Felix Fietkau <118ed6118e893d16e8c6e0776e0ebc290952c897@openwrt.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d7017461fa4ce9a59104866a6c382eeca439560a","subject":"ath9k: Fix queue management","message":"ath9k: Fix queue management\n\nSince we use IEEE80211_HW_QUEUE_CONTROL now, the\nCAB\/Offchannel queues are registered as the last\ntwo queues. There is no need to check and reassign\nthe queues in the TX start()\/done() routines.\n\nCAB frames will not reach the tx() callback since\nwe set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING and\npull the buffered frames during beacon transmission.\nWe also don't have a special HW queue for handling\noff-channel frames.\n\nSigned-off-by: Sujith Manoharan <1240f8b9a8d4f8f6d54c4d059a9fef2470495ad4@qca.qualcomm.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/xmit.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/xmit.c\n@@ -158,7 +158,6 @@\n {\n \tstruct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);\n \tstruct ath_frame_info *fi = get_frame_info(skb);\n-\tint hw_queue;\n \tint q = fi->txq;\n \n \tif (q < 0)\n@@ -168,10 +167,9 @@\n \tif (WARN_ON(--txq->pending_frames < 0))\n \t\ttxq->pending_frames = 0;\n \n-\thw_queue = (info->hw_queue >= sc->hw->queues - 2) ? q : info->hw_queue;\n \tif (txq->stopped &&\n \t txq->pending_frames < sc->tx.txq_max_pending[q]) {\n-\t\tieee80211_wake_queue(sc->hw, hw_queue);\n+\t\tieee80211_wake_queue(sc->hw, info->hw_queue);\n \t\ttxq->stopped = false;\n \t}\n }\n@@ -2208,8 +2206,7 @@\n \tstruct ath_atx_tid *tid = NULL;\n \tstruct ath_buf *bf;\n \tbool queue;\n-\tint q, hw_queue;\n-\tint ret;\n+\tint q, ret;\n \n \tif (vif)\n \t\tavp = (void *)vif->drv_priv;\n@@ -2228,14 +2225,13 @@\n \t *\/\n \n \tq = skb_get_queue_mapping(skb);\n-\thw_queue = (info->hw_queue >= sc->hw->queues - 2) ? q : info->hw_queue;\n \n \tath_txq_lock(sc, txq);\n \tif (txq == sc->tx.txq_map[q]) {\n \t\tfi->txq = q;\n \t\tif (++txq->pending_frames > sc->tx.txq_max_pending[q] &&\n \t\t !txq->stopped) {\n-\t\t\tieee80211_stop_queue(sc->hw, hw_queue);\n+\t\t\tieee80211_stop_queue(sc->hw, info->hw_queue);\n \t\t\ttxq->stopped = true;\n \t\t}\n \t}\n"} {"commit":"83beaacc2a0441d13f2706105b5ffaf945f84594","subject":"b43legacy: remove usage of deprecated noise value","message":"b43legacy: remove usage of deprecated noise value\n\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/b43legacy\/xmit.c\n+++ drivers\/net\/wireless\/b43legacy\/xmit.c\n@@ -548,7 +548,6 @@\n \t\t\t\t (phystat0 & B43legacy_RX_PHYST0_OFDM),\n \t\t\t\t (phystat0 & B43legacy_RX_PHYST0_GAINCTL),\n \t\t\t\t (phystat3 & B43legacy_RX_PHYST3_TRSTATE));\n-\tstatus.noise = dev->stats.link_noise;\n \t\/* change to support A PHY *\/\n \tif (phystat0 & B43legacy_RX_PHYST0_OFDM)\n \t\tstatus.rate_idx = b43legacy_plcp_get_bitrate_idx_ofdm(plcp, false);\n"} {"commit":"2624e96ce16bacae0e422d5775eac6d4fc33239a","subject":"iwlwifi: fix possible data overwrite in hcmd callback","message":"iwlwifi: fix possible data overwrite in hcmd callback\n\nMy commit 3598e1774c94e55c71b585340e7dc4538f310e3f\n\"iwlwifi: fix enqueue hcmd race conditions\" move hcmd callback after\ncommand queue reclaim, to avoid call it with hcmd_lock. But since\nqueue read index was updated, cmd data can be overwritten. Fix problem\nby calling callback before taking hcmd_lock and queue reclaim.\n\nSigned-off-by: Stanislaw Gruszka <1542dc81552e668e197a396f69e655c1621c300d@redhat.com>\nAcked-by: Wey-Yi Guy <15ba08e2ad0b84ec2e6b8e47b27706f8a8e5edd0@intel.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/iwlwifi\/iwl-tx.c\n+++ drivers\/net\/wireless\/iwlwifi\/iwl-tx.c\n@@ -621,9 +621,6 @@\n \tstruct iwl_cmd_meta *meta;\n \tstruct iwl_tx_queue *txq = &priv->txq[priv->cmd_queue];\n \tunsigned long flags;\n-\tvoid (*callback) (struct iwl_priv *priv, struct iwl_device_cmd *cmd,\n-\t\t\t struct iwl_rx_packet *pkt);\n-\n \n \t\/* If a Tx command is being handled and it isn't in the actual\n \t * command queue then there a command routing bug has been introduced\n@@ -637,8 +634,6 @@\n \t\treturn;\n \t}\n \n-\tspin_lock_irqsave(&priv->hcmd_lock, flags);\n-\n \tcmd_index = get_cmd_index(&txq->q, index, huge);\n \tcmd = txq->cmd[cmd_index];\n \tmeta = &txq->meta[cmd_index];\n@@ -648,13 +643,14 @@\n \t\t\t dma_unmap_len(meta, len),\n \t\t\t PCI_DMA_BIDIRECTIONAL);\n \n-\tcallback = NULL;\n \t\/* Input error checking is done when commands are added to queue. *\/\n \tif (meta->flags & CMD_WANT_SKB) {\n \t\tmeta->source->reply_page = (unsigned long)rxb_addr(rxb);\n \t\trxb->page = NULL;\n-\t} else\n-\t\tcallback = meta->callback;\n+\t} else if (meta->callback)\n+\t\tmeta->callback(priv, cmd, pkt);\n+\n+\tspin_lock_irqsave(&priv->hcmd_lock, flags);\n \n \tiwl_hcmd_queue_reclaim(priv, txq_id, index, cmd_index);\n \n@@ -669,7 +665,4 @@\n \tmeta->flags = 0;\n \n \tspin_unlock_irqrestore(&priv->hcmd_lock, flags);\n-\n-\tif (callback)\n-\t\tcallback(priv, cmd, pkt);\n-}\n+}\n"} {"commit":"a500e469ead055f35c7b2d0a1104e1bd58e34e70","subject":"iwlwifi: mvm: clean net-detect info if device was reset during suspend","message":"iwlwifi: mvm: clean net-detect info if device was reset during suspend\n\nIf the device is reset during suspend with net-detect enabled, we\nleave the net-detect information dangling and this causes the next\nsuspend to fail with a warning:\n\n[21795.351010] WARNING: at \/root\/iwlwifi\/iwlwifi-stack-dev\/drivers\/net\/wireless\/iwlwifi\/mvm\/d3.c:989 __iwl_mvm_suspend.isra.6+0x2be\/0x460 [iwlmvm]()\n[21795.353253] Modules linked in: iwlmvm(O) iwlwifi(O) mac80211(O) cfg80211(O) compat(O) [...]\n[21795.366168] CPU: 1 PID: 3645 Comm: bash Tainted: G O 3.10.29-dev #1\n[21795.368785] Hardware name: Dell Inc. Latitude E6430\/0CPWYR, BIOS A09 12\/13\/2012\n[21795.371441] f8ec6748 f8ec6748 e51f3ce8 c168aa62 e51f3d10 c103a824 c1871238 f8ec6748\n[21795.374228] 000003dd f8eb982e f8eb982e 00000000 c3408ed4 c41edbbc e51f3d20 c103a862\n[21795.377006] 00000009 00000000 e51f3da8 f8eb982e c41ee3dc 00000004 e7970000 e51f3d74\n[21795.379792] Call Trace:\n[21795.382461] [<c168aa62>] dump_stack+0x16\/0x18\n[21795.385133] [<c103a824>] warn_slowpath_common+0x64\/0x80\n[21795.387803] [<f8eb982e>] ? __iwl_mvm_suspend.isra.6+0x2be\/0x460 [iwlmvm]\n[21795.390485] [<f8eb982e>] ? __iwl_mvm_suspend.isra.6+0x2be\/0x460 [iwlmvm]\n[21795.393124] [<c103a862>] warn_slowpath_null+0x22\/0x30\n[21795.395787] [<f8eb982e>] __iwl_mvm_suspend.isra.6+0x2be\/0x460 [iwlmvm]\n[21795.398464] [<f8eb9d7c>] iwl_mvm_suspend+0xec\/0x140 [iwlmvm]\n[21795.401127] [<c104be11>] ? del_timer_sync+0xa1\/0xc0\n[21795.403800] [<f8d4107e>] __ieee80211_suspend+0x1de\/0xff0 [mac80211]\n[21795.406459] [<c168e43d>] ? mutex_lock_nested+0x25d\/0x350\n[21795.409084] [<c1586b64>] ? rtnl_lock+0x14\/0x20\n[21795.411685] [<f8cf0076>] ieee80211_suspend+0x16\/0x20 [mac80211]\n[21795.414318] [<f8c4e014>] wiphy_suspend+0x74\/0x710 [cfg80211]\n[21795.416916] [<c141e612>] __device_suspend+0x1e2\/0x220\n[21795.419521] [<f8c4dfa0>] ? addresses_show+0xa0\/0xa0 [cfg80211]\n[21795.422097] [<c141f997>] dpm_suspend+0x67\/0x210\n[21795.424661] [<c141fd6f>] dpm_suspend_start+0x4f\/0x60\n[21795.427219] [<c108d8e0>] suspend_devices_and_enter+0x60\/0x480\n[21795.429768] [<c168646a>] ? printk+0x4d\/0x4f\n[21795.432295] [<c108de76>] pm_suspend+0x176\/0x210\n[21795.434830] [<c108ca5d>] state_store+0x5d\/0xb0\n[21795.437410] [<c108ca00>] ? wakeup_count_show+0x50\/0x50\n[21795.439961] [<c13208db>] kobj_attr_store+0x1b\/0x30\n[21795.442514] [<c11e3a4b>] sysfs_write_file+0xab\/0x100\n[21795.445088] [<c11e39a0>] ? sysfs_poll+0xa0\/0xa0\n[21795.447659] [<c1179655>] vfs_write+0xa5\/0x1c0\n[21795.450212] [<c1179af7>] SyS_write+0x57\/0xa0\n[21795.452699] [<c1699ec1>] sysenter_do_call+0x12\/0x32\n[21795.455146] ---[ end trace faf5321baba2bfdb ]---\n\nTo fix this, call the iwl_mvm_free_nd() function in case of any error\nduring resume. Additionally, rename the \"out_unlock\" label to err to\nmake it clearer that it's only called in error conditions.\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org [3.19+]\nSigned-off-by: Luciano Coelho <48024ebf6407f04843f8b4062a045f41623c6d61@intel.com>\nSigned-off-by: Emmanuel Grumbach <643a80aaf16a8332d6a70921c14d4bb265446494@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2f40b9404903dba89d70d706ee71263f9babd109","subject":"mac80211_hwsim: Add tsf to beacons, probe responses and radiotap header.","message":"mac80211_hwsim: Add tsf to beacons, probe responses and radiotap header.\n\nGenerate a tsf from internal kernel clock. Prepare the path for having\ndifferent tsf offsets on each phy. This will be useful for testing\nmesh synchronization algorithms.\n\nSigned-off-by: Javier Cardona <828c1a17681e8566a17a1a4801ea67306010b273@cozybit.com>\nReviewed-by: Johannes Berg <8398eb9892c5ab2ff439ca0b5e4b0706dd9ebef9@sipsolutions.net>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/mac80211_hwsim.c\n+++ drivers\/net\/wireless\/mac80211_hwsim.c\n@@ -27,6 +27,7 @@\n #include <linux\/etherdevice.h>\n #include <linux\/debugfs.h>\n #include <linux\/module.h>\n+#include <linux\/ktime.h>\n #include <net\/genetlink.h>\n #include \"mac80211_hwsim.h\"\n \n@@ -321,11 +322,15 @@\n \tstruct dentry *debugfs_group;\n \n \tint power_level;\n+\n+\t\/* difference between this hw's clock and the real clock, in usecs *\/\n+\tu64 tsf_offset;\n };\n \n \n struct hwsim_radiotap_hdr {\n \tstruct ieee80211_radiotap_header hdr;\n+\t__le64 rt_tsft;\n \tu8 rt_flags;\n \tu8 rt_rate;\n \t__le16 rt_channel;\n@@ -367,6 +372,12 @@\n \treturn NETDEV_TX_OK;\n }\n \n+static __le64 __mac80211_hwsim_get_tsf(struct mac80211_hwsim_data *data)\n+{\n+\tstruct timeval tv = ktime_to_timeval(ktime_get_real());\n+\tu64 now = tv.tv_sec * USEC_PER_SEC + tv.tv_usec;\n+\treturn cpu_to_le64(now + data->tsf_offset);\n+}\n \n static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,\n \t\t\t\t struct sk_buff *tx_skb)\n@@ -391,7 +402,9 @@\n \thdr->hdr.it_len = cpu_to_le16(sizeof(*hdr));\n \thdr->hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |\n \t\t\t\t\t (1 << IEEE80211_RADIOTAP_RATE) |\n+\t\t\t\t\t (1 << IEEE80211_RADIOTAP_TSFT) |\n \t\t\t\t\t (1 << IEEE80211_RADIOTAP_CHANNEL));\n+\thdr->rt_tsft = __mac80211_hwsim_get_tsf(data);\n \thdr->rt_flags = 0;\n \thdr->rt_rate = txrate->bitrate \/ 5;\n \thdr->rt_channel = cpu_to_le16(data->channel->center_freq);\n@@ -610,7 +623,8 @@\n \t}\n \n \tmemset(&rx_status, 0, sizeof(rx_status));\n-\t\/* TODO: set mactime *\/\n+\trx_status.mactime = le64_to_cpu(__mac80211_hwsim_get_tsf(data));\n+\trx_status.flag |= RX_FLAG_MACTIME_MPDU;\n \trx_status.freq = data->channel->center_freq;\n \trx_status.band = data->channel->band;\n \trx_status.rate_idx = info->control.rates[0].idx;\n@@ -667,6 +681,12 @@\n \tbool ack;\n \tstruct ieee80211_tx_info *txi;\n \tu32 _pid;\n+\tstruct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *) skb->data;\n+\tstruct mac80211_hwsim_data *data = hw->priv;\n+\n+\tif (ieee80211_is_beacon(mgmt->frame_control) ||\n+\t ieee80211_is_probe_resp(mgmt->frame_control))\n+\t\tmgmt->u.beacon.timestamp = __mac80211_hwsim_get_tsf(data);\n \n \tmac80211_hwsim_monitor_rx(hw, skb);\n \n@@ -763,9 +783,11 @@\n \t\t\t\t struct ieee80211_vif *vif)\n {\n \tstruct ieee80211_hw *hw = arg;\n+\tstruct mac80211_hwsim_data *data = hw->priv;\n \tstruct sk_buff *skb;\n \tstruct ieee80211_tx_info *info;\n \tu32 _pid;\n+\tstruct ieee80211_mgmt *mgmt;\n \n \thwsim_check_magic(vif);\n \n@@ -778,6 +800,9 @@\n \tif (skb == NULL)\n \t\treturn;\n \tinfo = IEEE80211_SKB_CB(skb);\n+\n+\tmgmt = (struct ieee80211_mgmt *) skb->data;\n+\tmgmt->u.beacon.timestamp = __mac80211_hwsim_get_tsf(data);\n \n \tmac80211_hwsim_monitor_rx(hw, skb);\n \n"} {"commit":"f39c2bfa9a1e2bae726cce65d2d328652e81f0c2","subject":"mac80211_hwsim: refactor radio registration","message":"mac80211_hwsim: refactor radio registration\n\nIn order to support dynamic radio registration in the future,\nrefactor the actual registration into a new function with only\nminor cleanups. Since it had to change anyway, also clean up\nthe init error paths.\n\nSigned-off-by: Johannes Berg <bff32994ff0f8d048f262a8388145a71b6071bfe@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/mac80211_hwsim.c\n+++ drivers\/net\/wireless\/mac80211_hwsim.c\n@@ -2122,14 +2122,219 @@\n \t}\n };\n \n-static int __init init_mac80211_hwsim(void)\n-{\n-\tint i, err = 0;\n+static int __init mac80211_hwsim_create_radio(int idx)\n+{\n+\tint err;\n \tu8 addr[ETH_ALEN];\n \tstruct mac80211_hwsim_data *data;\n \tstruct ieee80211_hw *hw;\n \tenum ieee80211_band band;\n-\tconst struct ieee80211_ops *ops;\n+\tconst struct ieee80211_ops *ops = &mac80211_hwsim_ops;\n+\n+\tif (channels > 1)\n+\t\tops = &mac80211_hwsim_mchan_ops;\n+\thw = ieee80211_alloc_hw(sizeof(*data), ops);\n+\tif (!hw) {\n+\t\tprintk(KERN_DEBUG \"mac80211_hwsim: ieee80211_alloc_hw failed\\n\");\n+\t\terr = -ENOMEM;\n+\t\tgoto failed;\n+\t}\n+\tdata = hw->priv;\n+\tdata->hw = hw;\n+\n+\tdata->dev = device_create(hwsim_class, NULL, 0, hw, \"hwsim%d\", idx);\n+\tif (IS_ERR(data->dev)) {\n+\t\tprintk(KERN_DEBUG\n+\t\t \"mac80211_hwsim: device_create failed (%ld)\\n\",\n+\t\t PTR_ERR(data->dev));\n+\t\terr = -ENOMEM;\n+\t\tgoto failed_drvdata;\n+\t}\n+\tdata->dev->driver = &mac80211_hwsim_driver.driver;\n+\terr = device_bind_driver(data->dev);\n+\tif (err != 0) {\n+\t\tprintk(KERN_DEBUG \"mac80211_hwsim: device_bind_driver failed (%d)\\n\",\n+\t\t err);\n+\t\tgoto failed_hw;\n+\t}\n+\n+\tskb_queue_head_init(&data->pending);\n+\n+\tSET_IEEE80211_DEV(hw, data->dev);\n+\tmemset(addr, 0, ETH_ALEN);\n+\taddr[0] = 0x02;\n+\taddr[3] = idx >> 8;\n+\taddr[4] = idx;\n+\tmemcpy(data->addresses[0].addr, addr, ETH_ALEN);\n+\tmemcpy(data->addresses[1].addr, addr, ETH_ALEN);\n+\tdata->addresses[1].addr[0] |= 0x40;\n+\thw->wiphy->n_addresses = 2;\n+\thw->wiphy->addresses = data->addresses;\n+\n+\tdata->channels = channels;\n+\n+\tif (data->channels > 1) {\n+\t\thw->wiphy->max_scan_ssids = 255;\n+\t\thw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;\n+\t\thw->wiphy->max_remain_on_channel_duration = 1000;\n+\t\t\/* For channels > 1 DFS is not allowed *\/\n+\t\thw->wiphy->n_iface_combinations = 1;\n+\t\thw->wiphy->iface_combinations = &data->if_combination;\n+\t\tdata->if_combination = hwsim_if_comb[0];\n+\t\tdata->if_combination.num_different_channels = data->channels;\n+\t} else {\n+\t\thw->wiphy->iface_combinations = hwsim_if_comb;\n+\t\thw->wiphy->n_iface_combinations = ARRAY_SIZE(hwsim_if_comb);\n+\t}\n+\n+\tINIT_DELAYED_WORK(&data->roc_done, hw_roc_done);\n+\tINIT_DELAYED_WORK(&data->hw_scan, hw_scan_work);\n+\n+\thw->queues = 5;\n+\thw->offchannel_tx_hw_queue = 4;\n+\thw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |\n+\t\t\t\t BIT(NL80211_IFTYPE_AP) |\n+\t\t\t\t BIT(NL80211_IFTYPE_P2P_CLIENT) |\n+\t\t\t\t BIT(NL80211_IFTYPE_P2P_GO) |\n+\t\t\t\t BIT(NL80211_IFTYPE_ADHOC) |\n+\t\t\t\t BIT(NL80211_IFTYPE_MESH_POINT) |\n+\t\t\t\t BIT(NL80211_IFTYPE_P2P_DEVICE);\n+\n+\thw->flags = IEEE80211_HW_MFP_CAPABLE |\n+\t\t IEEE80211_HW_SIGNAL_DBM |\n+\t\t IEEE80211_HW_SUPPORTS_STATIC_SMPS |\n+\t\t IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |\n+\t\t IEEE80211_HW_AMPDU_AGGREGATION |\n+\t\t IEEE80211_HW_WANT_MONITOR_VIF |\n+\t\t IEEE80211_HW_QUEUE_CONTROL |\n+\t\t IEEE80211_HW_SUPPORTS_HT_CCK_RATES;\n+\tif (rctbl)\n+\t\thw->flags |= IEEE80211_HW_SUPPORTS_RC_TABLE;\n+\n+\thw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |\n+\t\t\t WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |\n+\t\t\t WIPHY_FLAG_AP_UAPSD;\n+\thw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;\n+\n+\t\/* ask mac80211 to reserve space for magic *\/\n+\thw->vif_data_size = sizeof(struct hwsim_vif_priv);\n+\thw->sta_data_size = sizeof(struct hwsim_sta_priv);\n+\thw->chanctx_data_size = sizeof(struct hwsim_chanctx_priv);\n+\n+\tmemcpy(data->channels_2ghz, hwsim_channels_2ghz,\n+\t\tsizeof(hwsim_channels_2ghz));\n+\tmemcpy(data->channels_5ghz, hwsim_channels_5ghz,\n+\t\tsizeof(hwsim_channels_5ghz));\n+\tmemcpy(data->rates, hwsim_rates, sizeof(hwsim_rates));\n+\n+\tfor (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {\n+\t\tstruct ieee80211_supported_band *sband = &data->bands[band];\n+\t\tswitch (band) {\n+\t\tcase IEEE80211_BAND_2GHZ:\n+\t\t\tsband->channels = data->channels_2ghz;\n+\t\t\tsband->n_channels = ARRAY_SIZE(hwsim_channels_2ghz);\n+\t\t\tsband->bitrates = data->rates;\n+\t\t\tsband->n_bitrates = ARRAY_SIZE(hwsim_rates);\n+\t\t\tbreak;\n+\t\tcase IEEE80211_BAND_5GHZ:\n+\t\t\tsband->channels = data->channels_5ghz;\n+\t\t\tsband->n_channels = ARRAY_SIZE(hwsim_channels_5ghz);\n+\t\t\tsband->bitrates = data->rates + 4;\n+\t\t\tsband->n_bitrates = ARRAY_SIZE(hwsim_rates) - 4;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tsband->ht_cap.ht_supported = true;\n+\t\tsband->ht_cap.cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |\n+\t\t\t\t IEEE80211_HT_CAP_GRN_FLD |\n+\t\t\t\t IEEE80211_HT_CAP_SGI_40 |\n+\t\t\t\t IEEE80211_HT_CAP_DSSSCCK40;\n+\t\tsband->ht_cap.ampdu_factor = 0x3;\n+\t\tsband->ht_cap.ampdu_density = 0x6;\n+\t\tmemset(&sband->ht_cap.mcs, 0,\n+\t\t sizeof(sband->ht_cap.mcs));\n+\t\tsband->ht_cap.mcs.rx_mask[0] = 0xff;\n+\t\tsband->ht_cap.mcs.rx_mask[1] = 0xff;\n+\t\tsband->ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;\n+\n+\t\thw->wiphy->bands[band] = sband;\n+\n+\t\tsband->vht_cap.vht_supported = true;\n+\t\tsband->vht_cap.cap =\n+\t\t\tIEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |\n+\t\t\tIEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ |\n+\t\t\tIEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |\n+\t\t\tIEEE80211_VHT_CAP_RXLDPC |\n+\t\t\tIEEE80211_VHT_CAP_SHORT_GI_80 |\n+\t\t\tIEEE80211_VHT_CAP_SHORT_GI_160 |\n+\t\t\tIEEE80211_VHT_CAP_TXSTBC |\n+\t\t\tIEEE80211_VHT_CAP_RXSTBC_1 |\n+\t\t\tIEEE80211_VHT_CAP_RXSTBC_2 |\n+\t\t\tIEEE80211_VHT_CAP_RXSTBC_3 |\n+\t\t\tIEEE80211_VHT_CAP_RXSTBC_4 |\n+\t\t\tIEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;\n+\t\tsband->vht_cap.vht_mcs.rx_mcs_map =\n+\t\t\tcpu_to_le16(IEEE80211_VHT_MCS_SUPPORT_0_8 << 0 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 2 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 4 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 6 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 8 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 10 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 12 |\n+\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 14);\n+\t\tsband->vht_cap.vht_mcs.tx_mcs_map =\n+\t\t\tsband->vht_cap.vht_mcs.rx_mcs_map;\n+\t}\n+\n+\t\/* By default all radios belong to the first group *\/\n+\tdata->group = 1;\n+\tmutex_init(&data->mutex);\n+\n+\t\/* Enable frame retransmissions for lossy channels *\/\n+\thw->max_rates = 4;\n+\thw->max_rate_tries = 11;\n+\n+\terr = ieee80211_register_hw(hw);\n+\tif (err < 0) {\n+\t\tprintk(KERN_DEBUG \"mac80211_hwsim: ieee80211_register_hw failed (%d)\\n\",\n+\t\t err);\n+\t\tgoto failed_hw;\n+\t}\n+\n+\twiphy_debug(hw->wiphy, \"hwaddr %pM registered\\n\", hw->wiphy->perm_addr);\n+\n+\tdata->debugfs = debugfs_create_dir(\"hwsim\", hw->wiphy->debugfsdir);\n+\tdebugfs_create_file(\"ps\", 0666, data->debugfs, data, &hwsim_fops_ps);\n+\tdebugfs_create_file(\"group\", 0666, data->debugfs, data,\n+\t\t\t &hwsim_fops_group);\n+\tif (data->channels == 1)\n+\t\tdebugfs_create_file(\"dfs_simulate_radar\", 0222,\n+\t\t\t\t data->debugfs,\n+\t\t\t\t data, &hwsim_simulate_radar);\n+\n+\ttasklet_hrtimer_init(&data->beacon_timer,\n+\t\t\t mac80211_hwsim_beacon,\n+\t\t\t CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS);\n+\n+\tspin_lock_bh(&hwsim_radio_lock);\n+\tlist_add_tail(&data->list, &hwsim_radios);\n+\tspin_unlock_bh(&hwsim_radio_lock);\n+\n+\treturn 0;\n+\n+failed_hw:\n+\tdevice_unregister(data->dev);\n+failed_drvdata:\n+\tieee80211_free_hw(hw);\n+failed:\n+\treturn err;\n+}\n+\n+static int __init init_mac80211_hwsim(void)\n+{\n+\tint i, err;\n \n \tif (radios < 1 || radios > 100)\n \t\treturn -EINVAL;\n@@ -2162,256 +2367,46 @@\n \thwsim_class = class_create(THIS_MODULE, \"mac80211_hwsim\");\n \tif (IS_ERR(hwsim_class)) {\n \t\terr = PTR_ERR(hwsim_class);\n-\t\tgoto failed_unregister_driver;\n-\t}\n-\n-\tmemset(addr, 0, ETH_ALEN);\n-\taddr[0] = 0x02;\n+\t\tgoto out_unregister_driver;\n+\t}\n \n \tfor (i = 0; i < radios; i++) {\n-\t\tprintk(KERN_DEBUG \"mac80211_hwsim: Initializing radio %d\\n\",\n-\t\t i);\n-\t\tops = &mac80211_hwsim_ops;\n-\t\tif (channels > 1)\n-\t\t\tops = &mac80211_hwsim_mchan_ops;\n-\t\thw = ieee80211_alloc_hw(sizeof(*data), ops);\n-\t\tif (!hw) {\n-\t\t\tprintk(KERN_DEBUG \"mac80211_hwsim: ieee80211_alloc_hw \"\n-\t\t\t \"failed\\n\");\n-\t\t\terr = -ENOMEM;\n-\t\t\tgoto failed;\n-\t\t}\n-\t\tdata = hw->priv;\n-\t\tdata->hw = hw;\n-\n-\t\tdata->dev = device_create(hwsim_class, NULL, 0, hw,\n-\t\t\t\t\t \"hwsim%d\", i);\n-\t\tif (IS_ERR(data->dev)) {\n-\t\t\tprintk(KERN_DEBUG\n-\t\t\t \"mac80211_hwsim: device_create failed (%ld)\\n\",\n-\t\t\t PTR_ERR(data->dev));\n-\t\t\terr = -ENOMEM;\n-\t\t\tgoto failed_drvdata;\n-\t\t}\n-\t\tdata->dev->driver = &mac80211_hwsim_driver.driver;\n-\t\terr = device_bind_driver(data->dev);\n-\t\tif (err != 0) {\n-\t\t\tprintk(KERN_DEBUG\n-\t\t\t \"mac80211_hwsim: device_bind_driver failed (%d)\\n\",\n-\t\t\t err);\n-\t\t\tgoto failed_hw;\n-\t\t}\n-\n-\t\tskb_queue_head_init(&data->pending);\n-\n-\t\tSET_IEEE80211_DEV(hw, data->dev);\n-\t\taddr[3] = i >> 8;\n-\t\taddr[4] = i;\n-\t\tmemcpy(data->addresses[0].addr, addr, ETH_ALEN);\n-\t\tmemcpy(data->addresses[1].addr, addr, ETH_ALEN);\n-\t\tdata->addresses[1].addr[0] |= 0x40;\n-\t\thw->wiphy->n_addresses = 2;\n-\t\thw->wiphy->addresses = data->addresses;\n-\n-\t\tdata->channels = channels;\n-\n-\t\tif (data->channels > 1) {\n-\t\t\thw->wiphy->max_scan_ssids = 255;\n-\t\t\thw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;\n-\t\t\thw->wiphy->max_remain_on_channel_duration = 1000;\n-\t\t\t\/* For channels > 1 DFS is not allowed *\/\n-\t\t\thw->wiphy->n_iface_combinations = 1;\n-\t\t\thw->wiphy->iface_combinations = &data->if_combination;\n-\t\t\tdata->if_combination = hwsim_if_comb[0];\n-\t\t\tdata->if_combination.num_different_channels =\n-\t\t\t\tdata->channels;\n-\t\t} else {\n-\t\t\thw->wiphy->iface_combinations = hwsim_if_comb;\n-\t\t\thw->wiphy->n_iface_combinations =\n-\t\t\t\tARRAY_SIZE(hwsim_if_comb);\n-\t\t}\n-\n-\t\tINIT_DELAYED_WORK(&data->roc_done, hw_roc_done);\n-\t\tINIT_DELAYED_WORK(&data->hw_scan, hw_scan_work);\n-\n-\t\thw->queues = 5;\n-\t\thw->offchannel_tx_hw_queue = 4;\n-\t\thw->wiphy->interface_modes =\n-\t\t\tBIT(NL80211_IFTYPE_STATION) |\n-\t\t\tBIT(NL80211_IFTYPE_AP) |\n-\t\t\tBIT(NL80211_IFTYPE_P2P_CLIENT) |\n-\t\t\tBIT(NL80211_IFTYPE_P2P_GO) |\n-\t\t\tBIT(NL80211_IFTYPE_ADHOC) |\n-\t\t\tBIT(NL80211_IFTYPE_MESH_POINT) |\n-\t\t\tBIT(NL80211_IFTYPE_P2P_DEVICE);\n-\n-\t\thw->flags = IEEE80211_HW_MFP_CAPABLE |\n-\t\t\t IEEE80211_HW_SIGNAL_DBM |\n-\t\t\t IEEE80211_HW_SUPPORTS_STATIC_SMPS |\n-\t\t\t IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |\n-\t\t\t IEEE80211_HW_AMPDU_AGGREGATION |\n-\t\t\t IEEE80211_HW_WANT_MONITOR_VIF |\n-\t\t\t IEEE80211_HW_QUEUE_CONTROL |\n-\t\t\t IEEE80211_HW_SUPPORTS_HT_CCK_RATES;\n-\t\tif (rctbl)\n-\t\t\thw->flags |= IEEE80211_HW_SUPPORTS_RC_TABLE;\n-\n-\t\thw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS |\n-\t\t\t\t WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |\n-\t\t\t\t WIPHY_FLAG_AP_UAPSD;\n-\t\thw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;\n-\n-\t\t\/* ask mac80211 to reserve space for magic *\/\n-\t\thw->vif_data_size = sizeof(struct hwsim_vif_priv);\n-\t\thw->sta_data_size = sizeof(struct hwsim_sta_priv);\n-\t\thw->chanctx_data_size = sizeof(struct hwsim_chanctx_priv);\n-\n-\t\tmemcpy(data->channels_2ghz, hwsim_channels_2ghz,\n-\t\t\tsizeof(hwsim_channels_2ghz));\n-\t\tmemcpy(data->channels_5ghz, hwsim_channels_5ghz,\n-\t\t\tsizeof(hwsim_channels_5ghz));\n-\t\tmemcpy(data->rates, hwsim_rates, sizeof(hwsim_rates));\n-\n-\t\tfor (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {\n-\t\t\tstruct ieee80211_supported_band *sband = &data->bands[band];\n-\t\t\tswitch (band) {\n-\t\t\tcase IEEE80211_BAND_2GHZ:\n-\t\t\t\tsband->channels = data->channels_2ghz;\n-\t\t\t\tsband->n_channels =\n-\t\t\t\t\tARRAY_SIZE(hwsim_channels_2ghz);\n-\t\t\t\tsband->bitrates = data->rates;\n-\t\t\t\tsband->n_bitrates = ARRAY_SIZE(hwsim_rates);\n-\t\t\t\tbreak;\n-\t\t\tcase IEEE80211_BAND_5GHZ:\n-\t\t\t\tsband->channels = data->channels_5ghz;\n-\t\t\t\tsband->n_channels =\n-\t\t\t\t\tARRAY_SIZE(hwsim_channels_5ghz);\n-\t\t\t\tsband->bitrates = data->rates + 4;\n-\t\t\t\tsband->n_bitrates = ARRAY_SIZE(hwsim_rates) - 4;\n-\t\t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\n-\t\t\tsband->ht_cap.ht_supported = true;\n-\t\t\tsband->ht_cap.cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |\n-\t\t\t\tIEEE80211_HT_CAP_GRN_FLD |\n-\t\t\t\tIEEE80211_HT_CAP_SGI_40 |\n-\t\t\t\tIEEE80211_HT_CAP_DSSSCCK40;\n-\t\t\tsband->ht_cap.ampdu_factor = 0x3;\n-\t\t\tsband->ht_cap.ampdu_density = 0x6;\n-\t\t\tmemset(&sband->ht_cap.mcs, 0,\n-\t\t\t sizeof(sband->ht_cap.mcs));\n-\t\t\tsband->ht_cap.mcs.rx_mask[0] = 0xff;\n-\t\t\tsband->ht_cap.mcs.rx_mask[1] = 0xff;\n-\t\t\tsband->ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;\n-\n-\t\t\thw->wiphy->bands[band] = sband;\n-\n-\t\t\tsband->vht_cap.vht_supported = true;\n-\t\t\tsband->vht_cap.cap =\n-\t\t\t\tIEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |\n-\t\t\t\tIEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ |\n-\t\t\t\tIEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |\n-\t\t\t\tIEEE80211_VHT_CAP_RXLDPC |\n-\t\t\t\tIEEE80211_VHT_CAP_SHORT_GI_80 |\n-\t\t\t\tIEEE80211_VHT_CAP_SHORT_GI_160 |\n-\t\t\t\tIEEE80211_VHT_CAP_TXSTBC |\n-\t\t\t\tIEEE80211_VHT_CAP_RXSTBC_1 |\n-\t\t\t\tIEEE80211_VHT_CAP_RXSTBC_2 |\n-\t\t\t\tIEEE80211_VHT_CAP_RXSTBC_3 |\n-\t\t\t\tIEEE80211_VHT_CAP_RXSTBC_4 |\n-\t\t\t\tIEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;\n-\t\t\tsband->vht_cap.vht_mcs.rx_mcs_map =\n-\t\t\t\tcpu_to_le16(IEEE80211_VHT_MCS_SUPPORT_0_8 << 0 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 2 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 4 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 6 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 8 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 10 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_9 << 12 |\n-\t\t\t\t\t IEEE80211_VHT_MCS_SUPPORT_0_8 << 14);\n-\t\t\tsband->vht_cap.vht_mcs.tx_mcs_map =\n-\t\t\t\tsband->vht_cap.vht_mcs.rx_mcs_map;\n-\t\t}\n-\t\t\/* By default all radios are belonging to the first group *\/\n-\t\tdata->group = 1;\n-\t\tmutex_init(&data->mutex);\n-\n-\t\t\/* Enable frame retransmissions for lossy channels *\/\n-\t\thw->max_rates = 4;\n-\t\thw->max_rate_tries = 11;\n-\n-\t\terr = ieee80211_register_hw(hw);\n-\t\tif (err < 0) {\n-\t\t\tprintk(KERN_DEBUG \"mac80211_hwsim: \"\n-\t\t\t \"ieee80211_register_hw failed (%d)\\n\", err);\n-\t\t\tgoto failed_hw;\n-\t\t}\n-\n-\t\twiphy_debug(hw->wiphy, \"hwaddr %pm registered\\n\",\n-\t\t\t hw->wiphy->perm_addr);\n-\n-\t\tdata->debugfs = debugfs_create_dir(\"hwsim\",\n-\t\t\t\t\t\t hw->wiphy->debugfsdir);\n-\t\tdebugfs_create_file(\"ps\", 0666, data->debugfs, data,\n-\t\t\t\t &hwsim_fops_ps);\n-\t\tdebugfs_create_file(\"group\", 0666, data->debugfs, data,\n-\t\t\t\t &hwsim_fops_group);\n-\t\tif (channels == 1)\n-\t\t\tdebugfs_create_file(\"dfs_simulate_radar\", 0222,\n-\t\t\t\t\t data->debugfs,\n-\t\t\t\t\t data, &hwsim_simulate_radar);\n-\n-\t\ttasklet_hrtimer_init(&data->beacon_timer,\n-\t\t\t\t mac80211_hwsim_beacon,\n-\t\t\t\t CLOCK_MONOTONIC_RAW, HRTIMER_MODE_ABS);\n-\n-\t\tlist_add_tail(&data->list, &hwsim_radios);\n+\t\terr = mac80211_hwsim_create_radio(i);\n+\t\tif (err)\n+\t\t\tgoto out_free_radios;\n \t}\n \n \thwsim_mon = alloc_netdev(0, \"hwsim%d\", hwsim_mon_setup);\n \tif (hwsim_mon == NULL) {\n \t\terr = -ENOMEM;\n-\t\tgoto failed;\n+\t\tgoto out_free_radios;\n \t}\n \n \trtnl_lock();\n-\n \terr = dev_alloc_name(hwsim_mon, hwsim_mon->name);\n-\tif (err < 0)\n-\t\tgoto failed_mon;\n-\n+\tif (err < 0) {\n+\t\trtnl_unlock();\n+\t\tgoto out_free_radios;\n+\t}\n \n \terr = register_netdevice(hwsim_mon);\n-\tif (err < 0)\n-\t\tgoto failed_mon;\n-\n+\tif (err < 0) {\n+\t\trtnl_unlock();\n+\t\tgoto out_free_mon;\n+\t}\n \trtnl_unlock();\n \n \terr = hwsim_init_netlink();\n \tif (err < 0)\n-\t\tgoto failed_nl;\n-\n-\treturn 0;\n-\n-failed_nl:\n-\tprintk(KERN_DEBUG \"mac80211_hwsim: failed initializing netlink\\n\");\n-\treturn err;\n-\n-failed_mon:\n-\trtnl_unlock();\n+\t\tgoto out_free_mon;\n+\n+\treturn 0;\n+\n+out_free_mon:\n \tfree_netdev(hwsim_mon);\n+out_free_radios:\n \tmac80211_hwsim_free();\n-\treturn err;\n-\n-failed_hw:\n-\tdevice_unregister(data->dev);\n-failed_drvdata:\n-\tieee80211_free_hw(hw);\n-failed:\n-\tmac80211_hwsim_free();\n-failed_unregister_driver:\n+out_unregister_driver:\n \tplatform_driver_unregister(&mac80211_hwsim_driver);\n \treturn err;\n }\n"} {"commit":"dad6330d034a24a22008ee28b8ec447cbb0961c9","subject":"mac80211_hwsim: handle VHT rates in rx_status","message":"mac80211_hwsim: handle VHT rates in rx_status\n\nSigned-off-by: Karl Beldan <5c8455eb353959a2a7e266fcc4f76fb65342dc20@rivierawaves.com>\nSigned-off-by: Johannes Berg <bff32994ff0f8d048f262a8388145a71b6071bfe@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/mac80211_hwsim.c\n+++ drivers\/net\/wireless\/mac80211_hwsim.c\n@@ -718,9 +718,17 @@\n \trx_status.flag |= RX_FLAG_MACTIME_START;\n \trx_status.freq = chan->center_freq;\n \trx_status.band = chan->band;\n-\trx_status.rate_idx = info->control.rates[0].idx;\n-\tif (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)\n-\t\trx_status.flag |= RX_FLAG_HT;\n+\tif (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {\n+\t\trx_status.rate_idx =\n+\t\t\tieee80211_rate_get_vht_mcs(&info->control.rates[0]);\n+\t\trx_status.vht_nss =\n+\t\t\tieee80211_rate_get_vht_nss(&info->control.rates[0]);\n+\t\trx_status.flag |= RX_FLAG_VHT;\n+\t} else {\n+\t\trx_status.rate_idx = info->control.rates[0].idx;\n+\t\tif (info->control.rates[0].flags & IEEE80211_TX_RC_MCS)\n+\t\t\trx_status.flag |= RX_FLAG_HT;\n+\t}\n \tif (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)\n \t\trx_status.flag |= RX_FLAG_40MHZ;\n \tif (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI)\n"} {"commit":"48795424acff7215d5eac0b52793a2c1eb3a6283","subject":"mwifiex: clear is_suspended flag when interrupt is received early","message":"mwifiex: clear is_suspended flag when interrupt is received early\n\nWhen the XO-4 with 8787 wireless is woken up due to wake-on-WLAN\nmwifiex is often flooded with \"not allowed while suspended\" messages\nand the interface is unusable.\n\n[ 202.171609] int: sdio_ireg = 0x1\n[ 202.180700] info: mwifiex_process_hs_config: auto cancelling host\n sleep since there is interrupt from the firmware\n[ 202.201880] event: wakeup device...\n[ 202.211452] event: hs_deactivated\n[ 202.514638] info: --- Rx: Data packet ---\n[ 202.514753] data: 4294957544 BSS(0-0): Data <= kernel\n[ 202.514825] PREP_CMD: device in suspended state\n[ 202.514839] data: dequeuing the packet ec7248c0 ec4869c0\n[ 202.514886] mwifiex_write_data_sync: not allowed while suspended\n[ 202.514886] host_to_card, write iomem (1) failed: -1\n[ 202.514917] mwifiex_write_data_sync: not allowed while suspended\n[ 202.514936] host_to_card, write iomem (2) failed: -1\n[ 202.514949] mwifiex_write_data_sync: not allowed while suspended\n[ 202.514965] host_to_card, write iomem (3) failed: -1\n[ 202.514976] mwifiex_write_data_async failed: 0xFFFFFFFF\n\nThis can be readily reproduced when putting the XO-4 in a loop where\nit goes to sleep due to inactivity, but then wakes up due to an\nincoming ping. The error is hit within an hour or two.\n\nThis issue happens when an interrupt comes in early while host sleep\nis still activated. Driver handles this case by auto cancelling host\nsleep. However is_suspended flag is still set which prevents any cmd\nor data from being sent to firmware. Fix it by clearing is_suspended\nflag in this path.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nReported-by: Daniel Drake <83b0c3d63e8a11eb6e40077030b59e95bfe31ffa@laptop.org>\nTested-by: Daniel Drake <83b0c3d63e8a11eb6e40077030b59e95bfe31ffa@laptop.org>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/mwifiex\/cmdevt.c\n+++ drivers\/net\/wireless\/mwifiex\/cmdevt.c\n@@ -1191,6 +1191,7 @@\n \tadapter->if_ops.wakeup(adapter);\n \tadapter->hs_activated = false;\n \tadapter->is_hs_configured = false;\n+\tadapter->is_suspended = false;\n \tmwifiex_hs_activated_event(mwifiex_get_priv(adapter,\n \t\t\t\t\t\t MWIFIEX_BSS_ROLE_ANY),\n \t\t\t\t false);\n"} {"commit":"09aad14f6533d0db47b8077792fcb7c8fc881cf1","subject":"wl18xx: increase Rx descriptors for PG2","message":"wl18xx: increase Rx descriptors for PG2\n\nNew PG2 firmwares have additional Rx descriptors.\n\nAdd a module parameter to manually set the number of Rx descriptors for\nolder versions (PG1). We cannot discriminate based on chip-id, since\nthis value must be set on probe.\n\nSigned-off-by: Arik Nemtsov <1a5d131848a166677cc209f94fa988cee9378c32@wizery.com>\nSigned-off-by: Luciano Coelho <d1ef580865f8eb2e1d1c65bc406aba322cc98f3e@ti.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ti\/wl18xx\/main.c\n+++ drivers\/net\/wireless\/ti\/wl18xx\/main.c\n@@ -47,6 +47,7 @@\n static char *board_type_param = \"hdk\";\n static bool checksum_param = false;\n static bool enable_11a_param = true;\n+static int num_rx_desc_param = -1;\n \n \/* phy paramters *\/\n static int dc2dc_param = -1;\n@@ -1286,13 +1287,16 @@\n \twl->ptable = wl18xx_ptable;\n \twl->rtable = wl18xx_rtable;\n \twl->num_tx_desc = 32;\n-\twl->num_rx_desc = 16;\n+\twl->num_rx_desc = 32;\n \twl->band_rate_to_idx = wl18xx_band_rate_to_idx;\n \twl->hw_tx_rate_tbl_size = WL18XX_CONF_HW_RXTX_RATE_MAX;\n \twl->hw_min_ht_rate = WL18XX_CONF_HW_RXTX_RATE_MCS0;\n \twl->fw_status_priv_len = sizeof(struct wl18xx_fw_status_priv);\n \twl->stats.fw_stats_len = sizeof(struct wl18xx_acx_statistics);\n \twl->static_data_priv_len = sizeof(struct wl18xx_static_data_priv);\n+\n+\tif (num_rx_desc_param != -1)\n+\t\twl->num_rx_desc = num_rx_desc_param;\n \n \tif (!strcmp(ht_mode_param, \"wide\")) {\n \t\tmemcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],\n@@ -1458,6 +1462,11 @@\n MODULE_PARM_DESC(pwr_limit_reference_11_abg, \"Power limit reference: u8 \"\n \t\t \"(default is 0xc8)\");\n \n+module_param_named(num_rx_desc,\n+\t\t num_rx_desc_param, int, S_IRUSR);\n+MODULE_PARM_DESC(num_rx_desc_param,\n+\t\t \"Number of Rx descriptors: u8 (default is 32)\");\n+\n MODULE_LICENSE(\"GPL v2\");\n MODULE_AUTHOR(\"Luciano Coelho <coelho@ti.com>\");\n MODULE_FIRMWARE(WL18XX_FW_NAME);\n"} {"commit":"ba02dfd205a9c54ac6f9db119d9328d9609615bb","subject":"regulator: mc13783: add regulators sw1x and sw2x","message":"regulator: mc13783: add regulators sw1x and sw2x\n\nSigned-off-by: Ga\u00ebtan Carlier <92a40fd6478778c7740f8cd03e79d220ae0aed42@gmail.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/regulator\/mc13783-regulator.c\n+++ drivers\/regulator\/mc13783-regulator.c\n@@ -21,6 +21,30 @@\n #include <linux\/module.h>\n #include \"mc13xxx.h\"\n \n+#define MC13783_REG_SWITCHERS0\t\t\t24\n+\/* Enable does not exist for SW1A *\/\n+#define MC13783_REG_SWITCHERS0_SW1AEN\t\t\t0\n+#define MC13783_REG_SWITCHERS0_SW1AVSEL\t\t\t0\n+#define MC13783_REG_SWITCHERS0_SW1AVSEL_M\t\t(63 << 0)\n+\n+#define MC13783_REG_SWITCHERS1\t\t\t25\n+\/* Enable does not exist for SW1B *\/\n+#define MC13783_REG_SWITCHERS1_SW1BEN\t\t\t0\n+#define MC13783_REG_SWITCHERS1_SW1BVSEL\t\t\t0\n+#define MC13783_REG_SWITCHERS1_SW1BVSEL_M\t\t(63 << 0)\n+\n+#define MC13783_REG_SWITCHERS2\t\t\t26\n+\/* Enable does not exist for SW2A *\/\n+#define MC13783_REG_SWITCHERS2_SW2AEN\t\t\t0\n+#define MC13783_REG_SWITCHERS2_SW2AVSEL\t\t\t0\n+#define MC13783_REG_SWITCHERS2_SW2AVSEL_M\t\t(63 << 0)\n+\n+#define MC13783_REG_SWITCHERS3\t\t\t27\n+\/* Enable does not exist for SW2B *\/\n+#define MC13783_REG_SWITCHERS3_SW2BEN\t\t\t0\n+#define MC13783_REG_SWITCHERS3_SW2BVSEL\t\t\t0\n+#define MC13783_REG_SWITCHERS3_SW2BVSEL_M\t\t(63 << 0)\n+\n #define MC13783_REG_SWITCHERS5\t\t\t29\n #define MC13783_REG_SWITCHERS5_SW3EN\t\t\t(1 << 20)\n #define MC13783_REG_SWITCHERS5_SW3VSEL\t\t\t18\n@@ -93,6 +117,44 @@\n \n \n \/* Voltage Values *\/\n+static const int mc13783_sw1x_val[] = {\n+\t900000, 925000, 950000, 975000,\n+\t1000000, 1025000, 1050000, 1075000,\n+\t1100000, 1125000, 1150000, 1175000,\n+\t1200000, 1225000, 1250000, 1275000,\n+\t1300000, 1325000, 1350000, 1375000,\n+\t1400000, 1425000, 1450000, 1475000,\n+\t1500000, 1525000, 1550000, 1575000,\n+\t1600000, 1625000, 1650000, 1675000,\n+\t1700000, 1700000, 1700000, 1700000,\n+\t1800000, 1800000, 1800000, 1800000,\n+\t1850000, 1850000, 1850000, 1850000,\n+\t2000000, 2000000, 2000000, 2000000,\n+\t2100000, 2100000, 2100000, 2100000,\n+\t2200000, 2200000, 2200000, 2200000,\n+\t2200000, 2200000, 2200000, 2200000,\n+\t2200000, 2200000, 2200000, 2200000,\n+};\n+\n+static const int mc13783_sw2x_val[] = {\n+\t900000, 925000, 950000, 975000,\n+\t1000000, 1025000, 1050000, 1075000,\n+\t1100000, 1125000, 1150000, 1175000,\n+\t1200000, 1225000, 1250000, 1275000,\n+\t1300000, 1325000, 1350000, 1375000,\n+\t1400000, 1425000, 1450000, 1475000,\n+\t1500000, 1525000, 1550000, 1575000,\n+\t1600000, 1625000, 1650000, 1675000,\n+\t1700000, 1700000, 1700000, 1700000,\n+\t1800000, 1800000, 1800000, 1800000,\n+\t1900000, 1900000, 1900000, 1900000,\n+\t2000000, 2000000, 2000000, 2000000,\n+\t2100000, 2100000, 2100000, 2100000,\n+\t2200000, 2200000, 2200000, 2200000,\n+\t2200000, 2200000, 2200000, 2200000,\n+\t2200000, 2200000, 2200000, 2200000,\n+};\n+\n static const unsigned int mc13783_sw3_val[] = {\n \t5000000, 5000000, 5000000, 5500000,\n };\n@@ -188,6 +250,10 @@\n \tMC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)\n \n static struct mc13xxx_regulator mc13783_regulators[] = {\n+\tMC13783_DEFINE_SW(SW1A, SWITCHERS0, SWITCHERS0, mc13783_sw1x_val),\n+\tMC13783_DEFINE_SW(SW1B, SWITCHERS1, SWITCHERS1, mc13783_sw1x_val),\n+\tMC13783_DEFINE_SW(SW2A, SWITCHERS2, SWITCHERS2, mc13783_sw2x_val),\n+\tMC13783_DEFINE_SW(SW2B, SWITCHERS3, SWITCHERS3, mc13783_sw2x_val),\n \tMC13783_DEFINE_SW(SW3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val),\n \n \tMC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),\n"} {"commit":"8412a96127d2866a78dc8d73eeaedac688977f4f","subject":"staging: comedi: 8253.h: remove the unused i8253_cascade_ns_to_timer_*()","message":"staging: comedi: 8253.h: remove the unused i8253_cascade_ns_to_timer_*()\n\nNone of the comedi drivers use the i8253_cascade_ns_to_timer_2div_old()\nor i8253_cascade_ns_to_timer_power() helpers to calculate the cascaded\ndivisors. Remove them to avoid any confusion.\n\nSigned-off-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nReviewed-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/drivers\/8253.h\n+++ drivers\/staging\/comedi\/drivers\/8253.h\n@@ -29,99 +29,6 @@\n #define I8254_OSC_BASE_4MHZ\t\t250\n #define I8254_OSC_BASE_2MHZ\t\t500\n #define I8254_OSC_BASE_1MHZ\t\t1000\n-\n-static inline void i8253_cascade_ns_to_timer_2div_old(int i8253_osc_base,\n-\t\t\t\t\t\t unsigned int *d1,\n-\t\t\t\t\t\t unsigned int *d2,\n-\t\t\t\t\t\t unsigned int *nanosec,\n-\t\t\t\t\t\t int round_mode)\n-{\n-\tint divider;\n-\tint div1, div2;\n-\tint div1_glb, div2_glb, ns_glb;\n-\tint div1_lub, div2_lub, ns_lub;\n-\tint ns;\n-\n-\tdivider = (*nanosec + i8253_osc_base \/ 2) \/ i8253_osc_base;\n-\n-\t\/* find 2 integers 1<={x,y}<=65536 such that x*y is\n-\t close to divider *\/\n-\n-\tdiv1_lub = div2_lub = 0;\n-\tdiv1_glb = div2_glb = 0;\n-\n-\tns_glb = 0;\n-\tns_lub = 0xffffffff;\n-\n-\tdiv2 = 0x10000;\n-\tfor (div1 = divider \/ 65536 + 1; div1 < div2; div1++) {\n-\t\tdiv2 = divider \/ div1;\n-\n-\t\tns = i8253_osc_base * div1 * div2;\n-\t\tif (ns <= *nanosec && ns > ns_glb) {\n-\t\t\tns_glb = ns;\n-\t\t\tdiv1_glb = div1;\n-\t\t\tdiv2_glb = div2;\n-\t\t}\n-\n-\t\tdiv2++;\n-\t\tif (div2 <= 65536) {\n-\t\t\tns = i8253_osc_base * div1 * div2;\n-\t\t\tif (ns > *nanosec && ns < ns_lub) {\n-\t\t\t\tns_lub = ns;\n-\t\t\t\tdiv1_lub = div1;\n-\t\t\t\tdiv2_lub = div2;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t*nanosec = div1_lub * div2_lub * i8253_osc_base;\n-\t*d1 = div1_lub & 0xffff;\n-\t*d2 = div2_lub & 0xffff;\n-\treturn;\n-}\n-\n-static inline void i8253_cascade_ns_to_timer_power(int i8253_osc_base,\n-\t\t\t\t\t\t unsigned int *d1,\n-\t\t\t\t\t\t unsigned int *d2,\n-\t\t\t\t\t\t unsigned int *nanosec,\n-\t\t\t\t\t\t int round_mode)\n-{\n-\tint div1, div2;\n-\tint base;\n-\n-\tfor (div1 = 2; div1 <= (1 << 16); div1 <<= 1) {\n-\t\tbase = i8253_osc_base * div1;\n-\t\tround_mode &= TRIG_ROUND_MASK;\n-\t\tswitch (round_mode) {\n-\t\tcase TRIG_ROUND_NEAREST:\n-\t\tdefault:\n-\t\t\tdiv2 = (*nanosec + base \/ 2) \/ base;\n-\t\t\tbreak;\n-\t\tcase TRIG_ROUND_DOWN:\n-\t\t\tdiv2 = (*nanosec) \/ base;\n-\t\t\tbreak;\n-\t\tcase TRIG_ROUND_UP:\n-\t\t\tdiv2 = (*nanosec + base - 1) \/ base;\n-\t\t\tbreak;\n-\t\t}\n-\t\tif (div2 < 2)\n-\t\t\tdiv2 = 2;\n-\t\tif (div2 <= 65536) {\n-\t\t\t*nanosec = div2 * base;\n-\t\t\t*d1 = div1 & 0xffff;\n-\t\t\t*d2 = div2 & 0xffff;\n-\t\t\treturn;\n-\t\t}\n-\t}\n-\n-\t\/* shouldn't get here *\/\n-\tdiv1 = 0x10000;\n-\tdiv2 = 0x10000;\n-\t*nanosec = div1 * div2 * i8253_osc_base;\n-\t*d1 = div1 & 0xffff;\n-\t*d2 = div2 & 0xffff;\n-}\n \n static inline void i8253_cascade_ns_to_timer(int i8253_osc_base,\n \t\t\t\t\t unsigned int *d1,\n"} {"commit":"5044a2c0e0e951afeb4dce87e18e10036635410a","subject":"Staging: comedi: s526: fixes for pulse generator","message":"Staging: comedi: s526: fixes for pulse generator\n\nSome changes and corrections to handling of\nINSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR, and\nINSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR, so they interpret insn->data[]\nas per the comments in the code.\n\nSigned-off-by: Frank Mori Hess <298b610a35dd7dda4ea5d33c28e8a7d9dff2b9bf@users.sourceforge.net>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/staging\/comedi\/drivers\/s526.c\n+++ drivers\/staging\/comedi\/drivers\/s526.c\n@@ -453,11 +453,11 @@\n \tudelay(1000);\n \tprintk(\"Read back mode reg=0x%04x\\n\", inw(ADDR_CHAN_REG(REG_C0M, n)));\n \n-\t\/* Load the pre-laod register high word *\/\n+\t\/* Load the pre-load register high word *\/\n \/* value = (short) (0x55); *\/\n \/* outw(value, ADDR_CHAN_REG(REG_C0H, n)); *\/\n \n-\t\/* Load the pre-laod register low word *\/\n+\t\/* Load the pre-load register low word *\/\n \/* value = (short)(0xaa55); *\/\n \/* outw(value, ADDR_CHAN_REG(REG_C0L, n)); *\/\n \n@@ -587,19 +587,8 @@\n \n #if 1\n \t\t\/* Set Counter Mode Register *\/\n-\t\tcmReg.reg.coutSource = 0;\t\/* out RCAP *\/\n-\t\tcmReg.reg.coutPolarity = 0;\t\/* Polarity inverted *\/\n-\t\tcmReg.reg.autoLoadResetRcap = 0;\t\/* Auto load disabled *\/\n-\t\tcmReg.reg.hwCtEnableSource = 2;\t\/* NOT RCAP *\/\n-\t\tcmReg.reg.ctEnableCtrl = 1;\t\/* 1: Software, >1 : Hardware *\/\n-\t\tcmReg.reg.clockSource = 3;\t\/* x4 *\/\n-\t\tcmReg.reg.countDir = 0;\t\/* up *\/\n-\t\tcmReg.reg.countDirCtrl = 0;\t\/* quadrature *\/\n-\t\tcmReg.reg.outputRegLatchCtrl = 0;\t\/* latch on read *\/\n-\t\tcmReg.reg.preloadRegSel = 0;\t\/* PR0 *\/\n-\t\tcmReg.reg.reserved = 0;\n-\n-\t\t\/* Set Counter Mode Register *\/\n+\t\tcmReg.value = insn->data[1] & 0xFFFF;\n+\n \/* printk(\"s526: Counter Mode register=%x\\n\", cmReg.value); *\/\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n@@ -634,11 +623,11 @@\n \t\tcmReg.value = (short)(insn->data[1] & 0xFFFF);\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n-\t\t\/* Load the pre-laod register high word *\/\n+\t\t\/* Load the pre-load register high word *\/\n \t\tvalue = (short)((insn->data[2] >> 16) & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0H, subdev_channel));\n \n-\t\t\/* Load the pre-laod register low word *\/\n+\t\t\/* Load the pre-load register low word *\/\n \t\tvalue = (short)(insn->data[2] & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0L, subdev_channel));\n \n@@ -672,11 +661,11 @@\n \t\tcmReg.reg.preloadRegSel = 0;\t\/* PR0 *\/\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 0 high word *\/\n+\t\t\/* Load the pre-load register 0 high word *\/\n \t\tvalue = (short)((insn->data[2] >> 16) & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0H, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 0 low word *\/\n+\t\t\/* Load the pre-load register 0 low word *\/\n \t\tvalue = (short)(insn->data[2] & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0L, subdev_channel));\n \n@@ -685,17 +674,17 @@\n \t\tcmReg.reg.preloadRegSel = 1;\t\/* PR1 *\/\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 1 high word *\/\n+\t\t\/* Load the pre-load register 1 high word *\/\n \t\tvalue = (short)((insn->data[3] >> 16) & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0H, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 1 low word *\/\n+\t\t\/* Load the pre-load register 1 low word *\/\n \t\tvalue = (short)(insn->data[3] & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0L, subdev_channel));\n \n \t\t\/* Write the Counter Control Register *\/\n-\t\tif (insn->data[3] != 0) {\n-\t\t\tvalue = (short)(insn->data[3] & 0xFFFF);\n+\t\tif (insn->data[4] != 0) {\n+\t\t\tvalue = (short)(insn->data[4] & 0xFFFF);\n \t\t\toutw(value, ADDR_CHAN_REG(REG_C0C, subdev_channel));\n \t\t}\n \t\tbreak;\n@@ -717,11 +706,11 @@\n \t\tcmReg.reg.preloadRegSel = 0;\t\/* PR0 *\/\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 0 high word *\/\n+\t\t\/* Load the pre-load register 0 high word *\/\n \t\tvalue = (short)((insn->data[2] >> 16) & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0H, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 0 low word *\/\n+\t\t\/* Load the pre-load register 0 low word *\/\n \t\tvalue = (short)(insn->data[2] & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0L, subdev_channel));\n \n@@ -730,17 +719,17 @@\n \t\tcmReg.reg.preloadRegSel = 1;\t\/* PR1 *\/\n \t\toutw(cmReg.value, ADDR_CHAN_REG(REG_C0M, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 1 high word *\/\n+\t\t\/* Load the pre-load register 1 high word *\/\n \t\tvalue = (short)((insn->data[3] >> 16) & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0H, subdev_channel));\n \n-\t\t\/* Load the pre-laod register 1 low word *\/\n+\t\t\/* Load the pre-load register 1 low word *\/\n \t\tvalue = (short)(insn->data[3] & 0xFFFF);\n \t\toutw(value, ADDR_CHAN_REG(REG_C0L, subdev_channel));\n \n \t\t\/* Write the Counter Control Register *\/\n-\t\tif (insn->data[3] != 0) {\n-\t\t\tvalue = (short)(insn->data[3] & 0xFFFF);\n+\t\tif (insn->data[4] != 0) {\n+\t\t\tvalue = (short)(insn->data[4] & 0xFFFF);\n \t\t\toutw(value, ADDR_CHAN_REG(REG_C0C, subdev_channel));\n \t\t}\n \t\tbreak;\n@@ -795,9 +784,8 @@\n \t\t\t(devpriv->s526_gpct_config[subdev_channel]).data[1] =\n \t\t\t insn->data[1];\n \t\t} else {\n-\t\t\tprintk(\"%d \\t %d\\n\", insn->data[1], insn->data[2]);\n-\t\t\tprintk\n-\t\t\t (\"s526: INSN_WRITE: PTG: Problem with Pulse params\\n\");\n+\t\t\tprintk(\"s526: INSN_WRITE: PTG: Problem with Pulse params -> %d %d\\n\",\n+\t\t\t\tinsn->data[0], insn->data[1]);\n \t\t\treturn -EINVAL;\n \t\t}\n \n"} {"commit":"95e67a7a29b56b5012f3dd4e01b8f5ebfa7b2b75","subject":"staging: octeon-usb: cvmx-usb: delete __cvmx_usb_complete_to_string()","message":"staging: octeon-usb: cvmx-usb: delete __cvmx_usb_complete_to_string()\n\nDelete a redundant function.\n\nSigned-off-by: Aaro Koskinen <13423a3f3006b5859cfceae66d59451f5eb4e205@iki.fi>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/octeon-usb\/cvmx-usb.c\n+++ drivers\/staging\/octeon-usb\/cvmx-usb.c\n@@ -323,34 +323,6 @@\n {\n cvmx_write64_uint64(address, value);\n }\n-\n-\n-\/**\n- * @INTERNAL\n- * Utility function to convert complete codes into strings\n- *\n- * @param complete_code\n- * Code to convert\n- *\n- * @return Human readable string\n- *\/\n-static const char *__cvmx_usb_complete_to_string(cvmx_usb_complete_t complete_code)\n-{\n- switch (complete_code)\n- {\n- case CVMX_USB_COMPLETE_SUCCESS: return \"SUCCESS\";\n- case CVMX_USB_COMPLETE_SHORT: return \"SHORT\";\n- case CVMX_USB_COMPLETE_CANCEL: return \"CANCEL\";\n- case CVMX_USB_COMPLETE_ERROR: return \"ERROR\";\n- case CVMX_USB_COMPLETE_STALL: return \"STALL\";\n- case CVMX_USB_COMPLETE_XACTERR: return \"XACTERR\";\n- case CVMX_USB_COMPLETE_DATATGLERR: return \"DATATGLERR\";\n- case CVMX_USB_COMPLETE_BABBLEERR: return \"BABBLEERR\";\n- case CVMX_USB_COMPLETE_FRAMEERR: return \"FRAMEERR\";\n- }\n- return \"Update __cvmx_usb_complete_to_string\";\n-}\n-\n \n \/**\n * @INTERNAL\n"} {"commit":"5556734959ab7d600552eca8eabe9a8321c83586","subject":"staging: olpc_dcon: Trivial: Remove space before indentation.","message":"staging: olpc_dcon: Trivial: Remove space before indentation.\n\nThis coding style error was detected using the checkpatch.pl script\n\nSigned-off-by: Gary Servin <900f526b7efcff4d8a1fa3621f2f8a8ce2dba88c@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/olpc_dcon\/olpc_dcon.h\n+++ drivers\/staging\/olpc_dcon\/olpc_dcon.h\n@@ -37,7 +37,7 @@\n \/* Load Delay Locked Loop (DLL) settings for clock delay *\/\n #define MEM_DLL_CLOCK_DELAY\t(1<<0)\n \/* Memory controller power down function *\/\n-#define MEM_POWER_DOWN \t(1<<8)\n+#define MEM_POWER_DOWN\t\t(1<<8)\n \/* Memory controller software reset *\/\n #define MEM_SOFT_RESET\t\t(1<<0)\n \n"} {"commit":"17c128e8c8b06138bb088e48be5a89c27257d405","subject":"usb: gadget: Remove redundant dev_err call in r8a66597_sudmac_ioremap()","message":"usb: gadget: Remove redundant dev_err call in r8a66597_sudmac_ioremap()\n\nThere is a error message within devm_ioremap_resource\nalready, so remove the dev_err call to avoid redundant\nerror message.\n\nAcked-by: Laurent Pinchart <ae960578cc5eca7b9b1dbc37d9caa6cb634f35e0@ideasonboard.com>\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/gadget\/udc\/r8a66597-udc.c\n+++ drivers\/usb\/gadget\/udc\/r8a66597-udc.c\n@@ -1846,10 +1846,8 @@\n \n \tres = platform_get_resource_byname(pdev, IORESOURCE_MEM, \"sudmac\");\n \tr8a66597->sudmac_reg = devm_ioremap_resource(&pdev->dev, res);\n-\tif (IS_ERR(r8a66597->sudmac_reg)) {\n-\t\tdev_err(&pdev->dev, \"ioremap error(sudmac).\\n\");\n+\tif (IS_ERR(r8a66597->sudmac_reg))\n \t\treturn PTR_ERR(r8a66597->sudmac_reg);\n-\t}\n \n \treturn 0;\n }\n"} {"commit":"05987e9cc8628bb417e208a1c2b2d980178434f0","subject":"add ifndef's to Variant.h for incorporation in other projects","message":"add ifndef's to Variant.h for incorporation in other projects\n","repos":"zhmz90\/vcflib,tomdcsmith\/vcflib,alimanfoo\/vcflib,hyphaltip\/vcflib,zeeev\/vcflib,zeeev\/vcflib,ekg\/vcflib,ashishjain1988\/vcflib,harshinamdar\/vcflib,vcflib\/vcflib,ekg\/vcflib,glennhickey\/vcflib,zeeev\/vcflib,jewmanchue\/vcflib,andersje\/vcflib,harshinamdar\/vcflib,ashishjain1988\/vcflib,jewmanchue\/vcflib,ekg\/vcflib,ekg\/vcflib,travc\/vcflib,wzugang\/vcflib,vcflib\/vcflib,wzugang\/vcflib,ashishjain1988\/vcflib,jewmanchue\/vcflib,glennhickey\/vcflib,ekg\/vcflib,wzugang\/vcflib,wzugang\/vcflib,alimanfoo\/vcflib,harshinamdar\/vcflib,vcflib\/vcflib,zeeev\/vcflib,hyphaltip\/vcflib,andersje\/vcflib,andersje\/vcflib,vcflib\/vcflib,hyphaltip\/vcflib,ashishjain1988\/vcflib,alimanfoo\/vcflib,harshinamdar\/vcflib,zhmz90\/vcflib,hyphaltip\/vcflib,glennhickey\/vcflib,zhmz90\/vcflib,wzugang\/vcflib,wzugang\/vcflib,zeeev\/vcflib,zhmz90\/vcflib,vcflib\/vcflib,hyphaltip\/vcflib,tomdcsmith\/vcflib,vcflib\/vcflib,ashishjain1988\/vcflib,harshinamdar\/vcflib,vcflib\/vcflib,travc\/vcflib,jewmanchue\/vcflib,zhmz90\/vcflib,glennhickey\/vcflib,tomdcsmith\/vcflib,alimanfoo\/vcflib,vcflib\/vcflib,travc\/vcflib,jewmanchue\/vcflib,harshinamdar\/vcflib,jewmanchue\/vcflib,andersje\/vcflib,alimanfoo\/vcflib,glennhickey\/vcflib,zhmz90\/vcflib,zeeev\/vcflib,andersje\/vcflib,ashishjain1988\/vcflib,hyphaltip\/vcflib,alimanfoo\/vcflib,glennhickey\/vcflib,andersje\/vcflib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Variant.h\n+++ Variant.h\n@@ -1,3 +1,6 @@\n+#ifndef __VARIANT_H\n+#define __VARIANT_H\n+\n #include <vector>\n #include <map>\n #include <string>\n@@ -385,3 +388,5 @@\n bool isNull(map<int, int>& genotype);\n \n } \/\/ end namespace VCF\n+\n+#endif\n"} {"commit":"74be4b884dcde4d75a3cc8d606988e51c425bb42","subject":"WebMMux crash fixed.","message":"WebMMux crash fixed.\n\nChange-Id: Ibdacb550b08e2ef3f3000853bdef3a6cd12b7958\n","repos":"matanbs\/webm.webmquicktime,reimaginemedia\/webm.webmquicktime,Maria1099\/webm.webmquicktime,kleopatra999\/webm.webmquicktime,matanbs\/webm.webmquicktime,matanbs\/webm.webmquicktime,reimaginemedia\/webm.webmquicktime,Acidburn0zzz\/webm.webmquicktime,kleopatra999\/webm.webmquicktime,gshORTON\/webm.webmquicktime,Maria1099\/webm.webmquicktime,ericmckean\/webm.webmquicktime,zofuthan\/webmquicktime,altogother\/webm.webmquicktime,webmproject\/webmquicktime,Acidburn0zzz\/webm.webmquicktime,abwiz0086\/webm.webmquicktime,iniwf\/webm.webmquicktime,gshORTON\/webm.webmquicktime,webmproject\/webmquicktime,altogother\/webm.webmquicktime,Suvarna1488\/webm.webmquicktime,iniwf\/webm.webmquicktime,iniwf\/webm.webmquicktime,kalli123\/webm.webmquicktime,altogother\/webm.webmquicktime,ericmckean\/webm.webmquicktime,kalli123\/webm.webmquicktime,webmproject\/webmquicktime,Suvarna1488\/webm.webmquicktime,Maria1099\/webm.webmquicktime,kleopatra999\/webm.webmquicktime,kim42083\/webm.webmquicktime,Acidburn0zzz\/webm.webmquicktime,abwiz0086\/webm.webmquicktime,Suvarna1488\/webm.webmquicktime,reimaginemedia\/webm.webmquicktime,ericmckean\/webm.webmquicktime,kim42083\/webm.webmquicktime,zofuthan\/webmquicktime,zofuthan\/webmquicktime,kalli123\/webm.webmquicktime,webmproject\/webmquicktime,gshORTON\/webm.webmquicktime,abwiz0086\/webm.webmquicktime,kim42083\/webm.webmquicktime","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- WebMMux.c\n+++ WebMMux.c\n@@ -418,7 +418,7 @@\n {\n bTwoPass = ((UInt32*)*(globals->videoSettingsCustom))[1] ==2;\n dbg_printf(\"[WebM] globals->videoSettingsCustom)[0] = %4.4s twoPass =%d\\n\",\n- ((UInt32*) *(globals->videoSettingsCustom))[0], bTwoPass);\n+ &((UInt32*) *(globals->videoSettingsCustom))[0], bTwoPass);\n }\n else \n {\n"} {"commit":"56cb8e0ca28d0a27533aef620f684849e0fc6d30","subject":"Declare mush_carr_mushcell in aabb.98.c.","message":"Declare mush_carr_mushcell in aabb.98.c.\n","repos":"Deewiant\/mushspace,Deewiant\/mushspace,Deewiant\/mushspace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- aabb.98.c\n+++ aabb.98.c\n@@ -4,6 +4,10 @@\n \n #include <assert.h>\n #include <string.h>\n+\n+#include \"stdlib.any.h\"\n+\n+MUSH_DECL_CONST_DYN_ARRAY(mushcell)\n \n #define mush_aabb_can_direct_copy MUSHSPACE_CAT(mush_aabb,_can_direct_copy)\n #define mush_aabb_can_direct_copy_area \\\n"} {"commit":"33db6d169a5779de37d244af7a88080cb6329b3a","subject":"doc\/mainpage.h: Updated instructions for running component tests","message":"doc\/mainpage.h: Updated instructions for running component tests\n","repos":"thenor\/softwarecontainer,DunderRoffe\/softwarecontainer,tobsan\/softwarecontainer,Pelagicore\/softwarecontainer,kursatkobya\/softwarecontainer,DunderRoffe\/softwarecontainer,thenor\/softwarecontainer,DunderRoffe\/softwarecontainer,thenor\/softwarecontainer,frznlogic\/softwarecontainer,DunderRoffe\/softwarecontainer,tobsan\/softwarecontainer,frznlogic\/softwarecontainer,thenor\/softwarecontainer,kursatkobya\/softwarecontainer,tobsan\/softwarecontainer,Pelagicore\/softwarecontainer,frznlogic\/softwarecontainer,tobsan\/softwarecontainer,Pelagicore\/softwarecontainer,kursatkobya\/softwarecontainer,kursatkobya\/softwarecontainer,frznlogic\/softwarecontainer,Pelagicore\/softwarecontainer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pelagicontain\/doc\/mainpage.h\n+++ pelagicontain\/doc\/mainpage.h\n@@ -162,13 +162,6 @@\n <\/code>\n \n <h2>Running the Pelagicontain component tests<\/h2>\n- <code>.\/setup-dirs.sh \/tmp\/test\/<\/code><br>\n-\n- Copy \\c controller to <code>\/tmp\/test\/bin\/<\/code><br>\n- Copy \\c containedapp to <code>\/tmp\/test\/com.pelagicore.comptest\/bin\/<\/code> (containedapp is\n- built separately from the pelagicontain project and is found in\n- pelagicontain\/component-test\/)<br>\n-\n Add a container-br0 bridge: <br \/>\n <code>brctl addbr container-br0<\/code> <br \/>\n <code>brctl setfd container-br0 0<\/code> <br \/>\n@@ -176,8 +169,23 @@\n <code>iptables -t nat -A POSTROUTING -s 10.0.3.0\/24 ! -d 10.0.3.0\/24 -j MASQUERADE<\/code> <br \/>\n <code>echo 1 > \/proc\/sys\/net\/ipv4\/ip_forward<\/code> <br \/>\n \n+ The Pelagicontain component tests use the py.test testing framework. The tests are\n+ launched by the test_runner.sh script which also sets up the environement (including\n+ a Platform Access Manager stub).\n+\n+ \\deprecated\n+ <code>.\/setup-dirs.sh \/tmp\/test\/<\/code><br>\n+\n+ \\deprecated\n+ Copy \\c controller to <code>\/tmp\/test\/bin\/<\/code><br>\n+ Copy \\c containedapp to <code>\/tmp\/test\/com.pelagicore.comptest\/bin\/<\/code> (containedapp is\n+ built separately from the pelagicontain project and is found in\n+ pelagicontain\/component-test\/)<br>\n+\n+ \\deprecated\n With root privilegies start \\c pam_stub.py (found in pelagicontain\/component-test\/)\n \n+ \\deprecated\n Run \\c test_pelagicontain (also with root privilegies) and point out where the\n \\c pelagicontain binary is (assuming we are in the git repo root and build is\n done in \\c build):<br>\n"} {"commit":"2770e2f363e0d027a244e5017acfd2b6fd8dd8d0","subject":"[control] Add moveto function","message":"[control] Add moveto function\n","repos":"super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/state_machine\/controlTask.c\n+++ src\/state_machine\/controlTask.c\n@@ -24,10 +24,10 @@\n struct timespec init, current;\n int timeout = 0;\n \n- clock_gettime(CLOCK_MONOTONIC, &init)\n+ clock_gettime(CLOCK_MONOTONIC, &init);\n Main_Nav = return_navdata();\n \n- while(!timeout && (Main_Nav.magneto.heading_fusion_unwrapped > (angle_desire + 3.0) || Main_Nav.magneto.heading_fusion_unwrapped < (angle_desire - 3.0)))\n+ while(!timeout && (Main_Nav.magneto.heading_fusion_unwrapped > (angle + 3.0) || Main_Nav.magneto.heading_fusion_unwrapped < (angle - 3.0)))\n {\n \/\/ Timeout check\n clock_gettime(CLOCK_MONOTONIC, ¤t);\n@@ -47,6 +47,87 @@\n return -1;\n \n return 0;\n+}\n+\n+\/** \\brief Move to given coordinates, without checking the map\n+ * \\param Destination coordinates\n+ * \\return 0 if no error *\/\n+int move_to(struct coordinates_ dest)\n+{\n+ struct coordinates_ current = { 0.0, 0.0 };\n+\n+ sleep(5); \/\/ Wait for the drone to stabilize \n+ read_data_bluetooth(¤t.x, ¤t.y);\n+\n+ pitch_move = FRONT;\n+ pitch_power = 0.2;\n+\n+ while(sqrt(pow(dest.x-current.x,2) + pow(dest.y-current.y,2)) > ERROR_COORD)\n+ {\n+ int j = 0;\n+ while(j < 5000) {\n+ pitch_move = FRONT;\n+ pitch_power = 0.2;\n+ SWITCH_DRONE_COMMANDE(4);\n+ j++;\n+ }\n+ break_drone();\n+ sleep(5);\n+ read_data_bluetooth(¤t.x,¤t.y);\n+\n+ \/\/printf(\"(Start point not found) Enter x and y\\n\");\n+ \/\/scanf(\"%f\", &(C_blue.x));\n+ \/\/scanf(\"%f\", &(C_blue.y));\n+\n+ printf(\"\\rBT location: X = %f, Y = %f (want to go to (%f, %f)\", current.x, current.y, dest.x, dest.y);\n+ }\n+\n+ return 0;\n+}\n+\n+\/** \\brief Move to given destination, check the map to detect any faulty path\n+ * \\param nextPoint Next point coordinates\n+ * \\param path Shortest path\n+ * \\return 0 if we reached destination; > 0 if a drift is detected *\/\n+int move_to_next_point(struct coordinates_ nextPoint, const node_t **path)\n+{\n+ int check = 0;\n+ int findy_lost = 0;\n+ struct coordinates_ current = { 0.0, 0.0 };\n+\n+ sleep(5); \/\/ Wait for the drone to stabilize \n+ read_data_bluetooth(¤t.x, ¤t.y);\n+ \n+ \/\/printf(\"Valeur de tab_algo_x[%d] = %.2f |&&| Valeur de C_blue.x = %.2f\\n\", indice, path[indice]->x, C_blue.x);\n+ \/\/printf(\"Valeur de tab_algo_y[%d] = %.2f |&&| Valeur de C_blue.x = %.2f\\n\", indice, path[indice]->y, C_blue.y);\n+\n+ while((sqrt(pow(nextPoint.x-current.x,2) + pow(nextPoint.y-current.y,2)) > ERROR_COORD) && (findy_lost != 1))\n+ {\n+ int j = 0;\n+ while (j < 5000) {\n+ pitch_move = FRONT;\n+ pitch_power = 0.2;\n+ SWITCH_DRONE_COMMANDE(4);\n+ j++;\n+ }\n+ break_drone();\n+ sleep(3);\n+ read_data_bluetooth(¤t.x,¤t.y);\n+\n+ \/\/printf(\"main move, enter x and y\\n\");\n+ \/\/scanf(\"%f\", &(C_blue.x));\n+ \/\/scanf(\"%f\", &(C_blue.y));\n+\n+ printf(\"\\rGoing to (%f, %f), currently at (%f, %f)\", nextPoint.x, nextPoint.y, current.x, current.y);\n+\n+ if((check = find_point(graph, current.x, current.y)) != -1)\n+ {\n+ if((check = find_point_in_path(path, current.x, current.y)) == -1)\n+ findy_lost = 1;\n+ }\n+ }\n+\n+ return findy_lost;\n }\n \n void* controlTask(void* arg)\n@@ -267,6 +348,8 @@\n C_blue.x = 0.0;\n C_blue.y = 0.0;\n \n+ \/\/ Wait for the data to stabilize\n+ sleep(3);\n read_data_bluetooth(&C_blue.x,&C_blue.y);\n \n \/\/printf(\"Enter first x and first y\\n\");\n@@ -299,40 +382,28 @@\n computeOffsetMag(&angle_desire, nav_prec, nav_suiv);\n yaw_power = computeDirection(angle_actuel, angle_desire, 0.2, &yaw_move);\n \n- \/\/ FIXME: check returned value\n- rotate_to_desired_angle(angle_desire);\n-\n- pitch_move = FRONT;\n- pitch_power = 0.2;\n-\n- while(sqrt(pow(startPoint.x-C_blue.x,2) + pow(startPoint.y-C_blue.y,2)) > ERROR_COORD)\n+ if(rotate_to_desired_angle(angle_desire) == -1)\n {\n- int j = 0;\n- while(j < 5000) {\n- pitch_move = FRONT;\n- pitch_power = 0.2;\n- SWITCH_DRONE_COMMANDE(4);\/\/ less than 1s in theory\n- j++;\n- }\n+ fprintf(stderr, \"[%s:%d] Error: Rotation to desired angle failed\\n\", __FILE__, __LINE__);\n break_drone();\n- sleep(5);\n- read_data_bluetooth(&C_blue.x,&C_blue.y);\n-\n- \/\/printf(\"(Start point not found) Enter x and y\\n\");\n- \/\/scanf(\"%f\", &(C_blue.x));\n- \/\/scanf(\"%f\", &(C_blue.y));\n-\n- printf(\"\\rBT location: X = %f, Y = %f (want to go to (%f, %f)\", C_blue.x, C_blue.y, startPoint.x, startPoint.y);\n- }\n-\n+ stop_mission();\n+ free(graph);\n+ return;\n+ }\n+\n+ move_to(startPoint);\n+\n+ break_drone();\n+ \n+ read_data_bluetooth(&C_blue.x,&C_blue.y);\n+ \n path = dijkstra(C_blue.x, C_blue.y, destination.x, destination.y, graph);\n \n- \/\/ FIXME: do it better\n if (path == NULL)\n {\n-\n fprintf(stderr, \"[%s:%d] Error: destination point not found, mission aborted\\n\", __FILE__, __LINE__);\n stop_mission();\n+ free(graph);\n return;\n }\n }\n@@ -375,55 +446,26 @@\n yaw_power = computeDirection(angle_actuel, angle_desire, 0.2, &yaw_move);\n \/\/printf(\"Valeur de la puissance mise : %1.f, Valeur de l'angle souhait\u00e9 = %2.f, valeur de l'angle actuel = %2.f sens de rotation = %d\\n\", yaw_power, angle_desire, angle_actuel, yaw_move);\n \n- \/\/ FIXME: check returned value\n- rotate_to_desired_angle(angle_desire);\n-\n- \/\/D\u00e9but du d\u00e9placement FRONT\n- pitch_move = FRONT;\n- pitch_power = 0.2;\n-\n- \/\/printf(\"Valeur de tab_algo_x[%d] = %.2f |&&| Valeur de C_blue.x = %.2f\\n\", indice, path[indice]->x, C_blue.x);\n- \/\/printf(\"Valeur de tab_algo_y[%d] = %.2f |&&| Valeur de C_blue.x = %.2f\\n\", indice, path[indice]->y, C_blue.y);\n-\n- \/\/envoie commande pitch tant qu'on est pas a la coordonn\u00e9e bluetooth\n- float dist = sqrt(pow(path[indice]->x-C_blue.x,2) + pow(path[indice]->y-C_blue.y,2));\n- printf(\"distance = %.2f\\n\", dist);\n- printf(\"\\rGoal (%f, %f), currently at (%f, %f)\", path[indice]->x, path[indice]->y, C_blue.x, C_blue.y);\n- printf(\"findy lost? %d\\n\", findy_lost);\n-\n- while((sqrt(pow(path[indice]->x-C_blue.x,2) + pow(path[indice]->y-C_blue.y,2)) > ERROR_COORD) && (findy_lost != 1))\n+ if (rotate_to_desired_angle(angle_desire) == -1)\n {\n- \n- int j = 0;\n- while (j < 5000) {\n- pitch_move = FRONT;\n- pitch_power = 0.2;\n- SWITCH_DRONE_COMMANDE(4);\n- j++;\n- }\n break_drone();\n- sleep(5);\n- read_data_bluetooth(&C_blue.x,&C_blue.y);\n-\n- \/\/printf(\"main move, enter x and y\\n\");\n- \/\/scanf(\"%f\", &(C_blue.x));\n- \/\/scanf(\"%f\", &(C_blue.y));\n-\n- printf(\"\\rGoing to (%f, %f), currently at (%f, %f)\", path[indice]->x, path[indice]->y, C_blue.x, C_blue.y);\n-\n- if((check = find_point(graph, C_blue.x, C_blue.y)) != -1)\n- {\n- if((check = find_point_in_path(path, C_blue.x, C_blue.y)) == -1)\n- findy_lost = 1;\n- }\n- }\n- \n+ stop_mission();\n+ free(graph);\n+ return;\n+ }\n+\n+ \/\/ Let's move to next point\n+ findy_lost = move_to_next_point(nextPoint, (const node_t **) path);\n+\n \/\/ Stop the drone movement\n break_drone();\n-\n- \/\/if the drone is lost, we calculate a new path and we re-initialize the variable \"indice\"\n- \/\/else decrementation of \"indice\"\n- if(findy_lost == 1)\n+ \n+ sleep(3); \n+ read_data_bluetooth(&C_blue.x,&C_blue.y);\n+\n+ \/\/ If the drone is lost, we calculate a new path and we re-initialize the variable \"indice\"\n+ \/\/ Else decrementation of \"indice\"\n+ if(findy_lost > 0)\n {\n printf(\"Findy deviated, recalculating path...\\n\");\n path = dijkstra(C_blue.x, C_blue.y, destination.x, destination.y, graph);\n@@ -444,6 +486,7 @@\n }\n \n }\n+\n stop_mission();\n printf(\"fin mission\\n\");\n free(path);\n"} {"commit":"356aae12c50ad430491f25d153f2d102881ce82e","subject":"beginning of search for the closest departure point","message":"beginning of search for the closest departure point\n","repos":"super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard,super7ramp\/Leonard","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/state_machine\/controlTask.c\n+++ src\/state_machine\/controlTask.c\n@@ -4,6 +4,9 @@\n \n \/\/return the index of a point in the path\n int find_point_in_path (node_t ** path, float other_x, float other_y);\n+\n+\/\/return the index of the closest node to the current position of the drone in the graph\n+int find_closest_node(graph_t *graph, current_x, current_y);\n \n void* controlTask(void* arg)\n { \n@@ -210,6 +213,7 @@\n struct coordinates_ C_blue; \/\/coordinates of drone\n struct coordinates_ nextPoint;\n int indice = 0;\n+ int index = 0;\n int check = 0;\n int findy_lost = 0;\n float angle_actuel,calcul_x, calcul_y, angle_desire;\n@@ -234,10 +238,14 @@\n \n if (path == NULL)\n {\n+\/*\n \/\/ Destination point not found, cannot do the mission\n fprintf(stderr, \"[%s:%d] Error: destination point not found, mission aborted\\n\", __FILE__, __LINE__);\n stop_mission();\n return;\n+*\/\n+ index = find_closest_node(graph, C_blue.x, C_blue.y);\n+ \n }\n printf(\" \\n\");\n \n@@ -286,28 +294,6 @@\n \/\/Calcul du sens de rotation de l'axe Z pour un positionnement le plus rapide.\n \n yaw_power = computeDirection(angle_actuel, angle_desire, 0.2, &yaw_move);\n-\n- \/*if(angle_actuel < 0 && angle_desire > 0){\n- if((angle_desire - angle_actuel)>180)\n- yaw_move = LEFT;\n- else\n- yaw_move = RIGHT;\n- }\n- else if(angle_actuel > 0 && angle_desire < 0){\n- if((angle_actuel - angle_desire) > 180)\n- yaw_move = RIGHT;\n- else\n- yaw_move = LEFT;\n- }\n- else if(angle_actuel > 0 && angle_desire > 0)\n- yaw_move = RIGHT;\n- else if(angle_actuel < 0 && angle_desire < 0)\n- yaw_move = LEFT;\n- \/\/fin du calcul\n-\n- yaw_power = 0.2;\n- *\/\n-\n \n printf(\"Valeur de la puissance mise : %1.f, Valeur de l'angle souhait\u00e9 = %2.f, valeur de l'angle actuel = %2.f sens de rotation = %d\\n\", yaw_power, angle_desire, angle_actuel, yaw_move);\n \/\/D\u00e9but de la rotation\n@@ -473,4 +459,28 @@\n return i;\n }\n return -1;\n-}+}\n+\n+int find_closest_node(graph_t *graph, current_x, current_y)\n+{\n+ float tamp_X = 999;\n+ float tamp_Y = 999;\n+ float diff_X = 0;\n+ float diff_Y = 0;\n+ int i;\n+ int indice;\n+\n+ for(i = 0 ; graph->nodes[i] != NULL ; i++)\n+ {\n+ diff_X = fabs(graph->nodes[i].x - current_x);\n+ diff_Y = fabs(graph->nodes[i].y - current_y);\n+\n+ if((tamp_X > diff_X) || (tamp_Y > diff_Y))\n+ {\n+ indice = i;\n+ tamp_X = diff_X;\n+ tamp_Y = diff_Y;\n+ }\n+ }\n+ return indice;\n+}\n"} {"commit":"f6abc852639c35f0bcb6f1ab9d8f20ff59c775a1","subject":"Revert \"fix: incomplete for setting valueRank -1; use a readvalue to also handle\"","message":"Revert \"fix: incomplete for setting valueRank -1; use a readvalue to also handle\"\n\nThis reverts commit bf4e481cdedb55e3fc848029d138fdd853d2d4ef.\n\nThe commit uncovered some issues regarding data sources. Will be\nre-committed with the necessary fixes in a PR.\n","repos":"jpfr\/open62541,open62541\/open62541,jpfr\/open62541,AGIsmail\/open62541,jpfr\/open62541,JGrothoff\/open62541,JGrothoff\/open62541,open62541\/open62541,open62541\/open62541,JGrothoff\/open62541,bostjanv\/open62541,StalderT\/open62541,JGrothoff\/open62541,AGIsmail\/open62541,open62541\/open62541,StalderT\/open62541,bostjanv\/open62541,StalderT\/open62541,StalderT\/open62541,jpfr\/open62541","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/server\/ua_services_attribute.c\n+++ src\/server\/ua_services_attribute.c\n@@ -3,7 +3,6 @@\n #ifdef UA_ENABLE_NONSTANDARD_STATELESS\n #include \"ua_types_encoding_binary.h\"\n #endif\n-\n \/******************\/\n \/* Read Attribute *\/\n \/******************\/\n@@ -548,7 +547,7 @@\n \/* Check if the valuerank allows for the value dimension *\/\n arrayDims = value->arrayDimensionsSize;\n if(value->arrayDimensionsSize == 0 && value->arrayLength > 0)\n- arrayDims = 1; \/* array but no arraydimensions -> implicit array dimension 1 *\/\n+ arrayDims = 1;\n UA_StatusCode retval = UA_matchValueRankArrayDimensions(variableValueRank, arrayDims);\n if(retval != UA_STATUSCODE_GOOD) {\n UA_LOG_DEBUG(server->config.logger, UA_LOGCATEGORY_SERVER,\n@@ -597,20 +596,17 @@\n return UA_STATUSCODE_BADTYPEMISMATCH;\n \n \/* Check if the current value would match the new type *\/\n- UA_Variant value;\n- UA_Variant_init(&value);\n- UA_StatusCode retval = UA_Server_readValue(server, node->nodeId, &value);\n- if(retval != UA_STATUSCODE_GOOD)\n- return retval;\n- retval = UA_Variant_matchVariableDefinition(server, dataType, node->valueRank,\n- node->arrayDimensionsSize,\n- node->arrayDimensions,\n- &value, NULL, NULL);\n- UA_Variant_deleteMembers(&value);\n- if(retval != UA_STATUSCODE_GOOD) {\n- UA_LOG_DEBUG(server->config.logger, UA_LOGCATEGORY_SERVER,\n- \"The current value does not match the new data type\");\n- return retval;\n+ UA_StatusCode retval = UA_STATUSCODE_GOOD;\n+ if(node->value.data.value.hasValue) {\n+ retval = UA_Variant_matchVariableDefinition(server, dataType, node->valueRank,\n+ node->arrayDimensionsSize,\n+ node->arrayDimensions,\n+ &node->value.data.value.value, NULL, NULL);\n+ if(retval != UA_STATUSCODE_GOOD) {\n+ UA_LOG_DEBUG(server->config.logger, UA_LOGCATEGORY_SERVER,\n+ \"The current value does not match the new data type\");\n+ return retval;\n+ }\n }\n \n \/* replace the datatype nodeid *\/\n@@ -633,8 +629,8 @@\n if(node->nodeClass == UA_NODECLASS_VARIABLETYPE &&\n UA_Node_hasSubTypeOrInstances((const UA_Node*)node))\n return UA_STATUSCODE_BADINTERNALERROR;\n-\n- \/* Check if the valuerank of the variabletype allows the change. *\/\n+ \n+ \/* Check if the valuerank of the type allows the change *\/\n switch(vt->valueRank) {\n case -3: \/* the value can be a scalar or a one dimensional array *\/\n if(valueRank != -1 && valueRank != 1)\n@@ -643,34 +639,25 @@\n case -2: \/* the value can be a scalar or an array with any number of dimensions *\/\n break;\n case -1: \/* the value is a scalar *\/\n- if(valueRank != -1)\n- return UA_STATUSCODE_BADTYPEMISMATCH;\n- break;\n+ return UA_STATUSCODE_BADTYPEMISMATCH;\n case 0: \/* the value is an array with one or more dimensions *\/\n if(valueRank < 0)\n return UA_STATUSCODE_BADTYPEMISMATCH;\n break;\n default: \/* >= 1: the value is an array with the specified number of dimensions *\/\n- if(valueRank != vt->valueRank)\n- return UA_STATUSCODE_BADTYPEMISMATCH;\n- break;\n- }\n-\n- \/* Check if the new ValuRank is compatible with the array dimensions *\/\n- UA_Variant value;\n- UA_Variant_init(&value);\n- UA_StatusCode retval = UA_Server_readValue(server, node->nodeId, &value);\n+ return UA_STATUSCODE_BADTYPEMISMATCH;\n+ }\n+\n+ \/* Check if the new value is compatible with the array dimensions *\/\n+ size_t arrayDims = node->value.data.value.value.arrayDimensionsSize;\n+ if(node->value.data.value.value.arrayDimensionsSize == 0 &&\n+ node->value.data.value.value.arrayLength > 0)\n+ arrayDims = 1;\n+ UA_StatusCode retval = UA_matchValueRankArrayDimensions(valueRank, arrayDims);\n if(retval != UA_STATUSCODE_GOOD)\n return retval;\n- size_t arrayDims = value.arrayDimensionsSize;\n- if(value.arrayDimensionsSize == 0 && value.arrayLength > 0)\n- arrayDims = 1; \/* no array dimensions but an array -> assume dimensions 1 *\/\n- retval = UA_matchValueRankArrayDimensions(valueRank, arrayDims);\n- UA_Variant_deleteMembers(&value);\n- if(retval != UA_STATUSCODE_GOOD)\n- return retval;\n-\n- \/* All good, apply the change *\/\n+\n+ \/* Ok, apply *\/\n node->valueRank = valueRank;\n return UA_STATUSCODE_GOOD;\n }\n@@ -715,19 +702,15 @@\n }\n \n \/* Check if the current value is compatible with the array dimensions *\/\n- UA_Variant value;\n- UA_Variant_init(&value);\n- retval = UA_Server_readValue(server, node->nodeId, &value);\n- if(retval != UA_STATUSCODE_GOOD)\n- return retval;\n- retval = UA_Variant_matchVariableDefinition(server, &node->dataType, node->valueRank,\n- arrayDimensionsSize, arrayDimensions,\n- &value, NULL, NULL);\n- UA_Variant_deleteMembers(&value);\n- if(retval != UA_STATUSCODE_GOOD) {\n- UA_LOG_DEBUG(server->config.logger, UA_LOGCATEGORY_SERVER,\n- \"The current value does not match the new array dimensions\");\n- return retval;\n+ if(node->value.data.value.hasValue) {\n+ retval = UA_Variant_matchVariableDefinition(server, &node->dataType, node->valueRank,\n+ arrayDimensionsSize, arrayDimensions,\n+ &node->value.data.value.value, NULL, NULL);\n+ if(retval != UA_STATUSCODE_GOOD) {\n+ UA_LOG_DEBUG(server->config.logger, UA_LOGCATEGORY_SERVER,\n+ \"The current value does not match the new array dimensions\");\n+ return retval;\n+ }\n }\n \n \/* Ok, apply *\/\n@@ -741,7 +724,6 @@\n return UA_STATUSCODE_GOOD;\n }\n \n-\/* value is stored in the node. no datasource *\/\n static UA_StatusCode\n setValueAfterTypeCheck(UA_VariableNode *node, UA_DataValue *editableValue,\n UA_NumericRange *rangeptr) {\n"} {"commit":"3ffc314a06357329615ca92e045504a6cfdc582d","subject":"Make tw_route inherit from raw_route.","message":"Make tw_route inherit from raw_route.\n","repos":"jcoupey\/vroom,VROOM-Project\/vroom,jcoupey\/vroom,VROOM-Project\/vroom,VROOM-Project\/vroom","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/structures\/vroom\/tw_route.h\n+++ src\/structures\/vroom\/tw_route.h\n@@ -14,8 +14,9 @@\n \n #include \"structures\/typedefs.h\"\n #include \"structures\/vroom\/input\/input.h\"\n+#include \"structures\/vroom\/raw_route.h\"\n \n-class tw_route {\n+class tw_route : public raw_route {\n private:\n \/\/ Compute new earliest and latest date for job at job_rank when\n \/\/ inserted in route at rank. Only takes into account existing\n@@ -48,7 +49,6 @@\n duration_t v_start;\n duration_t v_end;\n \n- std::vector<index_t> route;\n std::vector<duration_t> earliest;\n std::vector<duration_t> latest;\n std::vector<index_t> tw_ranks;\n"} {"commit":"334d713696fe459c4d6d7350e24cf2cf9a88f50c","subject":"Added getter for sequence data","message":"Added getter for sequence data\n","repos":"Saurabh7\/shogun,shogun-toolbox\/shogun,shogun-toolbox\/shogun,lambday\/shogun,Saurabh7\/shogun,lisitsyn\/shogun,Saurabh7\/shogun,sorig\/shogun,lambday\/shogun,shogun-toolbox\/shogun,geektoni\/shogun,sorig\/shogun,lisitsyn\/shogun,geektoni\/shogun,besser82\/shogun,sorig\/shogun,lisitsyn\/shogun,sorig\/shogun,Saurabh7\/shogun,lisitsyn\/shogun,karlnapf\/shogun,sorig\/shogun,Saurabh7\/shogun,shogun-toolbox\/shogun,besser82\/shogun,lambday\/shogun,lisitsyn\/shogun,karlnapf\/shogun,besser82\/shogun,karlnapf\/shogun,Saurabh7\/shogun,shogun-toolbox\/shogun,Saurabh7\/shogun,shogun-toolbox\/shogun,besser82\/shogun,Saurabh7\/shogun,lisitsyn\/shogun,lambday\/shogun,karlnapf\/shogun,geektoni\/shogun,karlnapf\/shogun,besser82\/shogun,lambday\/shogun,sorig\/shogun,geektoni\/shogun,geektoni\/shogun,lambday\/shogun,karlnapf\/shogun,Saurabh7\/shogun,geektoni\/shogun,besser82\/shogun","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/shogun\/structure\/HMSVMLabels.h\n+++ src\/shogun\/structure\/HMSVMLabels.h\n@@ -56,6 +56,9 @@\n \n \t\/** data sequence *\/\n \tSGVector< int32_t > data;\n+\n+\t\/** returns data *\/\n+\tSGVector<int32_t> get_data() const { return data; }\n };\n \n \/** @brief Class CHMSVMLabels to be used in the application of Structured Output\n"} {"commit":"8169c504611903ef45256ff04c8e12191e2470ae","subject":"Add string length limit to zval representation","message":"Add string length limit to zval representation\n","repos":"tempbottle\/phptrace,tempbottle\/phptrace,narlian\/phptrace,three2one\/phptrace,silkCut\/phptrace,fengshao0907\/phptrace,kmiku7\/phptrace,xiaosl\/phptrace,outman\/phptrace,three2one\/phptrace,tempbottle\/phptrace,skyworker\/phptrace,narlian\/phptrace,kmiku7\/phptrace,nihaibao\/phptrace,skyworker\/phptrace,xiaosl\/phptrace,oikomi\/phptrace,silkCut\/phptrace,narlian\/phptrace,tempbottle\/phptrace,three2one\/phptrace,three2one\/phptrace,Qihoo360\/phptrace,kmiku7\/phptrace,narlian\/phptrace,xiaosl\/phptrace,chenwenbin928\/phptrace,fengshao0907\/phptrace,xiaosl\/phptrace,monque\/phptrace,Qihoo360\/phptrace,fengshao0907\/phptrace,outman\/phptrace,skyworker\/phptrace,chenwenbin928\/phptrace,oikomi\/phptrace,outman\/phptrace,fengshao0907\/phptrace,outman\/phptrace,oikomi\/phptrace,monque\/phptrace,skyworker\/phptrace,chenwenbin928\/phptrace,silkCut\/phptrace,nihaibao\/phptrace,nihaibao\/phptrace,chenwenbin928\/phptrace,kmiku7\/phptrace,oikomi\/phptrace,nihaibao\/phptrace,monque\/phptrace,Qihoo360\/phptrace","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- extension\/phptrace.c\n+++ extension\/phptrace.c\n@@ -371,7 +371,7 @@\n if (frame->arg_count > 0) {\n frame->args = calloc(frame->arg_count, sizeof(sds));\n for (i = 0; i < frame->arg_count; i++) {\n- frame->args[i] = pt_repr_zval(args[i], 0 TSRMLS_CC);\n+ frame->args[i] = pt_repr_zval(args[i], 32 TSRMLS_CC);\n }\n }\n \n@@ -445,18 +445,17 @@\n }\n \n if (retval) {\n- frame->retval = pt_repr_zval(retval, 0 TSRMLS_CC);\n+ frame->retval = pt_repr_zval(retval, 32 TSRMLS_CC);\n }\n }\n \n sds pt_repr_zval(zval *zv, int limit TSRMLS_DC)\n {\n- int tmp_len = 0;\n- char buf[128], *tmp_str = NULL;\n+ int tlen = 0;\n+ char buf[128], *tstr = NULL;\n sds result;\n \n \/* php_var_export_ex is a good example *\/\n- \/* TODO limit string length *\/\n switch (Z_TYPE_P(zv)) {\n case IS_BOOL:\n if (Z_LVAL_P(zv)) {\n@@ -473,25 +472,26 @@\n sprintf(buf, \"%f\", Z_DVAL_P(zv));\n return sdsnew(buf);\n case IS_STRING:\n- \/* TODO addslashes and deal special chars, make it binary safe *\/\n- result = sdsnewlen(\"'\", Z_STRLEN_P(zv) + 2);\n- memcpy(result + 1, Z_STRVAL_P(zv), Z_STRLEN_P(zv));\n- result[Z_STRLEN_P(zv) + 1] = '\\'';\n+ tlen = (limit <= 0 || Z_STRLEN_P(zv) < limit) ? Z_STRLEN_P(zv) : limit;\n+ result = sdscatrepr(sdsempty(), Z_STRVAL_P(zv), tlen);\n+ if (limit > 0 && Z_STRLEN_P(zv) > limit) {\n+ result = sdscat(result, \"...\");\n+ }\n return result;\n case IS_ARRAY:\n return sdscatprintf(sdsempty(), \"array(%d)\", zend_hash_num_elements(Z_ARRVAL_P(zv)));\n case IS_OBJECT:\n if (Z_OBJ_HANDLER(*zv, get_class_name)) {\n- Z_OBJ_HANDLER(*zv, get_class_name)(zv, (const char **) &tmp_str, (zend_uint *) &tmp_len, 0 TSRMLS_CC);\n- result = sdscatprintf(sdsempty(), \"object(%s)#%d\", tmp_str, Z_OBJ_HANDLE_P(zv));\n- efree(tmp_str);\n+ Z_OBJ_HANDLER(*zv, get_class_name)(zv, (const char **) &tstr, (zend_uint *) &tlen, 0 TSRMLS_CC);\n+ result = sdscatprintf(sdsempty(), \"object(%s)#%d\", tstr, Z_OBJ_HANDLE_P(zv));\n+ efree(tstr);\n } else {\n result = sdscatprintf(sdsempty(), \"object(unknown)#%d\", Z_OBJ_HANDLE_P(zv));\n }\n return result;\n case IS_RESOURCE:\n- tmp_str = (char *) zend_rsrc_list_get_rsrc_type(Z_LVAL_P(zv) TSRMLS_CC);\n- return sdscatprintf(sdsempty(), \"resource(%s)#%ld\", tmp_str ? tmp_str : \"Unknown\", Z_LVAL_P(zv));\n+ tstr = (char *) zend_rsrc_list_get_rsrc_type(Z_LVAL_P(zv) TSRMLS_CC);\n+ return sdscatprintf(sdsempty(), \"resource(%s)#%ld\", tstr ? tstr : \"Unknown\", Z_LVAL_P(zv));\n default:\n return sdsnew(\"{unknown}\");\n }\n"} {"commit":"6ece18779ebe31066122fd480cd5971131cb0f19","subject":"fix: implement gradient_radial_new","message":"fix: implement gradient_radial_new\n","repos":"GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- rsvg-paint-server.h\n+++ rsvg-paint-server.h\n@@ -99,6 +99,18 @@\n \n \/* Implemented in rust\/src\/gradient.rs *\/\n G_GNUC_INTERNAL\n+Gradient *gradient_radial_new (RsvgLength *cx,\n+ RsvgLength *cy,\n+ RsvgLength *r,\n+ RsvgLength *fx,\n+ RsvgLength *fy,\n+ gboolean *obj_bbox,\n+ cairo_matrix_t *affine,\n+ cairo_extend_t *extend,\n+ const char *fallback_name);\n+\n+\/* Implemented in rust\/src\/gradient.rs *\/\n+G_GNUC_INTERNAL\n void gradient_destroy (Gradient *gradient);\n \n G_GNUC_INTERNAL\n"} {"commit":"1e16aec357c5c6f02d358c81ce8c81ce68fe0818","subject":"remount: Refactor to helper function instead of loop","message":"remount: Refactor to helper function instead of loop\n\nPrep for further work. It was silly to use a loop on\na static array of two elements.\n\nCloses: #1760\nApproved by: jlebon\n","repos":"GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/switchroot\/ostree-remount.c\n+++ src\/switchroot\/ostree-remount.c\n@@ -39,13 +39,40 @@\n \n #include \"ostree-mount-util.h\"\n \n+static void\n+do_remount (const char *target)\n+{\n+ struct stat stbuf;\n+ if (lstat (target, &stbuf) < 0)\n+ return;\n+ \/* Silently ignore symbolic links; we expect these to point to\n+ * \/sysroot, and thus there isn't a bind mount there.\n+ *\/\n+ if (S_ISLNK (stbuf.st_mode))\n+ return;\n+ \/* If not a mountpoint, skip it *\/\n+ struct statvfs stvfsbuf;\n+ if (statvfs (target, &stvfsbuf) == -1)\n+ return;\n+ \/* If no read-only flag, skip it *\/\n+ if ((stvfsbuf.f_flag & ST_RDONLY) == 0)\n+ return;\n+ \/* It's a mounted, read-only fs; remount it *\/\n+ if (mount (target, target, NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)\n+ {\n+ \/* Also ignore EINVAL - if the target isn't a mountpoint\n+ * already, then assume things are OK.\n+ *\/\n+ if (errno != EINVAL)\n+ err (EXIT_FAILURE, \"failed to remount %s\", target);\n+ }\n+ else\n+ printf (\"Remounted: %s\\n\", target);\n+}\n+\n int\n main(int argc, char *argv[])\n {\n- const char *remounts[] = { \"\/sysroot\", \"\/var\", NULL };\n- struct stat stbuf;\n- int i;\n-\n \/* When systemd is in use this is normally created via the generator, but\n * we ensure it's created here as well for redundancy.\n *\/\n@@ -65,39 +92,11 @@\n \/* If \/ isn't writable, don't do any remounts; we don't want\n * to clear the readonly flag in that case.\n *\/\n-\n exit (EXIT_SUCCESS);\n }\n \n- for (i = 0; remounts[i] != NULL; i++)\n- {\n- const char *target = remounts[i];\n- if (lstat (target, &stbuf) < 0)\n- continue;\n- \/* Silently ignore symbolic links; we expect these to point to\n- * \/sysroot, and thus there isn't a bind mount there.\n- *\/\n- if (S_ISLNK (stbuf.st_mode))\n- continue;\n- \/* If not a mountpoint, skip it *\/\n- struct statvfs stvfsbuf;\n- if (statvfs (target, &stvfsbuf) == -1)\n- continue;\n- \/* If no read-only flag, skip it *\/\n- if ((stvfsbuf.f_flag & ST_RDONLY) == 0)\n- continue;\n- \/* It's a mounted, read-only fs; remount it *\/\n- if (mount (target, target, NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)\n- {\n- \/* Also ignore EINVAL - if the target isn't a mountpoint\n- * already, then assume things are OK.\n- *\/\n- if (errno != EINVAL)\n- err (EXIT_FAILURE, \"failed to remount %s\", target);\n- }\n- else\n- printf (\"Remounted: %s\\n\", target);\n- }\n+ do_remount (\"\/sysroot\");\n+ do_remount (\"\/var\");\n \n exit (EXIT_SUCCESS);\n }\n"} {"commit":"ec9c0e8841b985b262a85f81929842d69a93a5e4","subject":"[bugfix] rope_at","message":"[bugfix] rope_at\n","repos":"dcurrie\/picrin,koba-e964\/picrin,koba-e964\/picrin,omasanori\/picrin,picrin-scheme\/picrin,omasanori\/picrin,dcurrie\/picrin,koba-e964\/picrin,picrin-scheme\/picrin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extlib\/benz\/string.c\n+++ extlib\/benz\/string.c\n@@ -120,8 +120,8 @@\n if (i < x->left->weight) {\n x = x->left;\n } else {\n+ i -= x->left->weight;\n x = x->right;\n- i -= x->left->weight;\n }\n }\n return -1;\n"} {"commit":"c0a30e989cede99e96e0a189d319647a6fae75e3","subject":"Duplicated metamacro_foreach() for recursive invocations","message":"Duplicated metamacro_foreach() for recursive invocations\n","repos":"sunfei\/libextobjc,liuruxian\/libextobjc,kolyuchiy\/libextobjc,telly\/libextobjc,sandyway\/libextobjc,sanojnambiar\/libextobjc,goodheart\/libextobjc,jiakai-lian\/libextobjc,WPDreamMelody\/libextobjc,KBvsMJ\/libextobjc,bboyesc\/libextobjc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extobjc\/metamacros.h\n+++ extobjc\/metamacros.h\n@@ -62,6 +62,14 @@\n #define metamacro_foreach(MACRO, ...) \\\n metamacro_concat(metamacro_for, metamacro_argcount(__VA_ARGS__))(MACRO, __VA_ARGS__)\n \n+\/**\n+ * Identical to #metamacro_foreach, but can be used when already expanding an\n+ * outer invocation to #metamacro_foreach (where another use of it would fail to\n+ * expand).\n+ *\/\n+#define metamacro_foreach_recursive(MACRO, ...) \\\n+ metamacro_concat(metamacro_for_recursive, metamacro_argcount(__VA_ARGS__))(MACRO, __VA_ARGS__)\n+\n \/\/ IMPLEMENTATION DETAILS FOLLOW!\n \/\/ Do not write code that depends on anything below this line.\n #define metamacro_stringify_(VALUE) # VALUE\n@@ -79,4 +87,15 @@\n #define metamacro_for9(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8) metamacro_for8(MACRO, _0, _1, _2, _3, _4, _5, _6, _7) MACRO(8, _8)\n #define metamacro_for10(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9) metamacro_for9(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8) MACRO(9, _9)\n \n+#define metamacro_for_recursive1(MACRO, _0) MACRO(0, _0)\n+#define metamacro_for_recursive2(MACRO, _0, _1) metamacro_for_recursive1(MACRO, _0) MACRO(1, _1)\n+#define metamacro_for_recursive3(MACRO, _0, _1, _2) metamacro_for_recursive2(MACRO, _0, _1) MACRO(2, _2)\n+#define metamacro_for_recursive4(MACRO, _0, _1, _2, _3) metamacro_for_recursive3(MACRO, _0, _1, _2) MACRO(3, _3)\n+#define metamacro_for_recursive5(MACRO, _0, _1, _2, _3, _4) metamacro_for_recursive4(MACRO, _0, _1, _2, _3) MACRO(4, _4)\n+#define metamacro_for_recursive6(MACRO, _0, _1, _2, _3, _4, _5) metamacro_for_recursive5(MACRO, _0, _1, _2, _3, _4) MACRO(5, _5)\n+#define metamacro_for_recursive7(MACRO, _0, _1, _2, _3, _4, _5, _6) metamacro_for_recursive6(MACRO, _0, _1, _2, _3, _4, _5) MACRO(6, _6)\n+#define metamacro_for_recursive8(MACRO, _0, _1, _2, _3, _4, _5, _6, _7) metamacro_for_recursive7(MACRO, _0, _1, _2, _3, _4, _5, _6) MACRO(7, _7)\n+#define metamacro_for_recursive9(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8) metamacro_for_recursive8(MACRO, _0, _1, _2, _3, _4, _5, _6, _7) MACRO(8, _8)\n+#define metamacro_for_recursive10(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9) metamacro_for_recursive9(MACRO, _0, _1, _2, _3, _4, _5, _6, _7, _8) MACRO(9, _9)\n+\n #endif\n"} {"commit":"ede91bde83e66d3f083f113f3fd834e1ef74fd2f","subject":"storage: Resolve resource leaks with cmd processing","message":"storage: Resolve resource leaks with cmd processing\n","repos":"datto\/libvirt,elmarco\/libvirt,eskultety\/libvirt,elmarco\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,trainstack\/libvirt,cbosdo\/libvirt,zippy2\/libvirt,trainstack\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,datto\/libvirt,iam-TJ\/libvirt,VenkatDatta\/libvirt,crobinso\/libvirt,taget\/libvirt,iam-TJ\/libvirt,olafhering\/libvirt,eskultety\/libvirt,cbosdo\/libvirt,olafhering\/libvirt,siboulet\/libvirt-openvz,datto\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jardasgit\/libvirt,iam-TJ\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,iam-TJ\/libvirt,crobinso\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,cbosdo\/libvirt,cbosdo\/libvirt,olafhering\/libvirt,shugaoye\/libvirt,jfehlig\/libvirt,taget\/libvirt,elmarco\/libvirt,rlaager\/libvirt,jfehlig\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,shugaoye\/libvirt,libvirt\/libvirt,eskultety\/libvirt,elmarco\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,shugaoye\/libvirt,datto\/libvirt,trainstack\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,agx\/libvirt,iam-TJ\/libvirt,taget\/libvirt,nertpinx\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,trainstack\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,siboulet\/libvirt-openvz,libvirt\/libvirt,zippy2\/libvirt,agx\/libvirt,cbosdo\/libvirt,andreabolognani\/libvirt,iam-TJ\/libvirt,rlaager\/libvirt,taget\/libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,eskultety\/libvirt,trainstack\/libvirt,shugaoye\/libvirt,datto\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,rlaager\/libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,nertpinx\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,iam-TJ\/libvirt,rlaager\/libvirt,libvirt\/libvirt,agx\/libvirt,taget\/libvirt,jfehlig\/libvirt,siboulet\/libvirt-openvz,siboulet\/libvirt-openvz,shugaoye\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/storage\/storage_backend_disk.c\n+++ src\/storage\/storage_backend_disk.c\n@@ -1,7 +1,7 @@\n \/*\n * storage_backend_disk.c: storage backend for disk handling\n *\n- * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc.\n+ * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc.\n * Copyright (C) 2007-2008 Daniel P. Berrange\n *\n * This library is free software; you can redistribute it and\/or\n@@ -385,14 +385,7 @@\n {\n bool ok_to_mklabel = false;\n int ret = -1;\n- \/* eg parted \/dev\/sda mklabel msdos *\/\n- virCommandPtr cmd = virCommandNewArgList(PARTED,\n- pool->def->source.devices[0].path,\n- \"mklabel\",\n- \"--script\",\n- ((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? \"msdos\" :\n- virStoragePoolFormatDiskTypeToString(pool->def->source.format)),\n- NULL);\n+ virCommandPtr cmd = NULL;\n \n virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE |\n VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, ret);\n@@ -423,8 +416,17 @@\n }\n }\n \n- if (ok_to_mklabel)\n+ if (ok_to_mklabel) {\n+ \/* eg parted \/dev\/sda mklabel msdos *\/\n+ cmd = virCommandNewArgList(PARTED,\n+ pool->def->source.devices[0].path,\n+ \"mklabel\",\n+ \"--script\",\n+ ((pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) ? \"msdos\" :\n+ virStoragePoolFormatDiskTypeToString(pool->def->source.format)),\n+ NULL);\n ret = virCommandRun(cmd, NULL);\n+ }\n \n error:\n virCommandFree(cmd);\n@@ -634,7 +636,7 @@\n virStorageVolDefPtr vol)\n {\n int res = -1;\n- char *partFormat;\n+ char *partFormat = NULL;\n unsigned long long startOffset = 0, endOffset = 0;\n virCommandPtr cmd = virCommandNewArgList(PARTED,\n pool->def->source.devices[0].path,\n@@ -646,11 +648,11 @@\n virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n \"%s\", _(\"storage pool does not support encrypted \"\n \"volumes\"));\n- return -1;\n+ goto cleanup;\n }\n \n if (virStorageBackendDiskPartFormat(pool, vol, &partFormat) != 0) {\n- return -1;\n+ goto cleanup;\n }\n virCommandAddArg(cmd, partFormat);\n \n"} {"commit":"2935fa46b95e75e485e0fffd56764b66176efbc4","subject":"Another openmp implementation test imag_self_energy_at_triplet","message":"Another openmp implementation test imag_self_energy_at_triplet\n","repos":"atztogo\/phono3py,atztogo\/phono3py,atztogo\/phono3py,atztogo\/phono3py","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- c\/anharmonic\/phonon3\/imag_self_energy_with_g.c\n+++ c\/anharmonic\/phonon3\/imag_self_energy_with_g.c\n@@ -38,19 +38,19 @@\n #include <phonoc_utils.h>\n #include <phonon3_h\/imag_self_energy_with_g.h>\n \n-static double sum_imag_self_energy_at_band(const int ij,\n- const int num_band,\n-\t\t\t\t\t const double *fc3_normal_squared,\n+static double sum_imag_self_energy_at_band(const int i,\n+ const int j,\n+\t\t\t\t\t const double fc3_normal_squared,\n \t\t\t\t\t const double *n1,\n \t\t\t\t\t const double *n2,\n-\t\t\t\t\t const double *g1,\n-\t\t\t\t\t const double *g2_3);\n-static double sum_imag_self_energy_at_band_0K(const int ij,\n- const int num_band,\n-\t\t\t\t\t const double *fc3_normal_squared,\n+\t\t\t\t\t const double g1,\n+\t\t\t\t\t const double g2_3);\n+static double sum_imag_self_energy_at_band_0K(const int i,\n+ const int j,\n+\t\t\t\t\t const double fc3_normal_squared,\n \t\t\t\t\t const double *n1,\n \t\t\t\t\t const double *n2,\n-\t\t\t\t\t const double *g);\n+\t\t\t\t\t const double g);\n static void\n detailed_imag_self_energy_at_triplet(double *detailed_imag_self_energy,\n \t\t\t\t double *imag_self_energy,\n@@ -223,10 +223,9 @@\n const double cutoff_frequency,\n const int openmp_at_bands)\n {\n- int ij, j;\n- double *n1, *n2;\n- int adrs_shift;\n- double sum_g;\n+ int i, ijk, j, k, l, num_g_pos, count;\n+ double *n1, *n2, *ise;\n+ int (*g_pos)[4];\n \n n1 = (double*)malloc(sizeof(double) * num_band);\n n2 = (double*)malloc(sizeof(double) * num_band);\n@@ -238,76 +237,93 @@\n frequencies,\n cutoff_frequency);\n \n- for (j = 0; j < num_band0; j++) {\n- adrs_shift = j * num_band * num_band;\n- sum_g = 0;\n+ num_g_pos = 0;\n+ for (i = 0; i < num_band0 * num_band * num_band; i ++) {\n+ if (!g_zero[i]) {num_g_pos++;}\n+ }\n+\n+ count = 0;\n+ ijk = 0;\n+ g_pos = (int(*)[4])malloc(sizeof(int[4]) * num_g_pos);\n+ for (i = 0; i < num_band0; i++) {\n+ for (j = 0; j < num_band; j++) {\n+ for (k = 0; k < num_band; k++) {\n+ if (!g_zero[ijk]) {\n+ g_pos[count][0] = i;\n+ g_pos[count][1] = j;\n+ g_pos[count][2] = k;\n+ g_pos[count][3] = ijk;\n+ count++;\n+ }\n+ ijk++;\n+ }\n+ }\n+ }\n+\n+ ise = (double*)malloc(sizeof(double) * num_g_pos);\n+#pragma omp parallel for if (openmp_at_bands)\n+ for (i = 0; i < num_g_pos; i++) {\n if (temperature > 0) {\n-\/* #pragma omp parallel for reduction(+:sum_g) if (openmp_at_bands) *\/\n-\/* Significant performance down using openmp *\/\n- for (ij = 0; ij < num_band * num_band; ij++) {\n- if (g_zero[ij + adrs_shift]) {continue;}\n- sum_g += sum_imag_self_energy_at_band(\n- ij,\n- num_band,\n- fc3_normal_squared + adrs_shift,\n- n1,\n- n2,\n- g1 + adrs_shift,\n- g2_3 + adrs_shift) * triplet_weight;\n- }\n- imag_self_energy[j] = sum_g;\n+ ise[i] = sum_imag_self_energy_at_band(\n+ g_pos[i][1],\n+ g_pos[i][2],\n+ fc3_normal_squared[g_pos[i][3]],\n+ n1,\n+ n2,\n+ g1[g_pos[i][3]],\n+ g2_3[g_pos[i][3]]) * triplet_weight;\n } else {\n-\/* #pragma omp parallel for reduction(+:sum_g) if (openmp_at_bands) *\/\n- for (ij = 0; ij < num_band * num_band; ij++) {\n- if (g_zero[ij + adrs_shift]) {continue;}\n- sum_g += sum_imag_self_energy_at_band_0K(\n- ij,\n- num_band,\n- fc3_normal_squared + adrs_shift,\n- n1,\n- n2,\n- g1 + adrs_shift) * triplet_weight;\n- }\n- imag_self_energy[j] = sum_g;\n- }\n- }\n-\n+ ise[i] = sum_imag_self_energy_at_band_0K(\n+ g_pos[i][1],\n+ g_pos[i][2],\n+ fc3_normal_squared[g_pos[i][3]],\n+ n1,\n+ n2,\n+ g1[g_pos[i][3]]) * triplet_weight;\n+ }\n+ }\n+\n+ for (i = 0; i < num_band0; i++) {\n+ imag_self_energy[i] = 0;\n+ }\n+\n+ for (i = 0; i < num_g_pos; i++) {\n+ imag_self_energy[g_pos[i][0]] += ise[i];\n+ }\n+\n+\n+ free(ise);\n+ ise = NULL;\n+ free(g_pos);\n+ g_pos = NULL;\n free(n1);\n n1 = NULL;\n free(n2);\n n2 = NULL;\n }\n \n-static double sum_imag_self_energy_at_band(const int ij,\n- const int num_band,\n-\t\t\t\t\t const double *fc3_normal_squared,\n+static double sum_imag_self_energy_at_band(const int i,\n+ const int j,\n+\t\t\t\t\t const double fc3_normal_squared,\n \t\t\t\t\t const double *n1,\n \t\t\t\t\t const double *n2,\n-\t\t\t\t\t const double *g1,\n-\t\t\t\t\t const double *g2_3)\n-{\n- int i, j;\n-\n- i = ij \/ num_band;\n- j = ij % num_band;\n+\t\t\t\t\t const double g1,\n+\t\t\t\t\t const double g2_3)\n+{\n if (n1[i] < 0 || n2[j] < 0) {return 0;}\n- return ((n1[i] + n2[j] + 1) * g1[ij] +\n- (n1[i] - n2[j]) * g2_3[ij]) * fc3_normal_squared[ij];\n-}\n-\n-static double sum_imag_self_energy_at_band_0K(const int ij,\n- const int num_band,\n-\t\t\t\t\t const double *fc3_normal_squared,\n+ return ((n1[i] + n2[j] + 1) * g1 +\n+ (n1[i] - n2[j]) * g2_3) * fc3_normal_squared;\n+}\n+\n+static double sum_imag_self_energy_at_band_0K(const int i,\n+ const int j,\n+\t\t\t\t\t const double fc3_normal_squared,\n \t\t\t\t\t const double *n1,\n \t\t\t\t\t const double *n2,\n-\t\t\t\t\t const double *g1)\n-{\n- int i, j;\n-\n- i = ij \/ num_band;\n- j = ij % num_band;\n+\t\t\t\t\t const double g1)\n+{\n if (n1[i] < 0 || n2[j] < 0) {return 0;}\n- return g1[ij] * fc3_normal_squared[ij];\n+ return g1 * fc3_normal_squared;\n }\n \n static void\n"} {"commit":"8bc265d22c5451ba5d523e667a53ff4d671918f1","subject":"paint-volume: remove more is_axis_aligned assertions","message":"paint-volume: remove more is_axis_aligned assertions\n\nThis removes the is_axis_aligned assertions for the width\/height\/depth\ngetters and setters, since for example it is legitimate to query the\nwidth, height or depth of a container's child actors which aren't\nnecessarily axis aligned.\n\nSigned-off-by: Emmanuele Bassi <049ee2061f71220e5aaf33f5be422fc2a2b06a44@linux.intel.com>\n","repos":"jigpu\/clutter,Distrotech\/clutter,djdeath\/clutter-multithreaded,collects\/clutter,ebassi\/clutter,spatulasnout\/clutter,djdeath\/clutter,spatulasnout\/clutter,ebassi\/clutter,spatulasnout\/clutter,Distrotech\/clutter,djdeath\/clutter-multithreaded,djdeath\/clutter,jigpu\/clutter,heysion\/clutter-clone,heysion\/clutter-clone,jigpu\/clutter,Distrotech\/clutter,djdeath\/clutter,djdeath\/clutter-android,collects\/clutter,kerrickstaley\/clutter-vala,collects\/clutter,GNOME\/clutter,djdeath\/clutter,kerrickstaley\/clutter-vala,jigpu\/clutter,djdeath\/clutter,djdeath\/clutter-android,djdeath\/clutter-multithreaded,djdeath\/clutter-android,djdeath\/clutter-android,jigpu\/clutter,djdeath\/clutter-android,GNOME\/clutter,ebassi\/clutter,heysion\/clutter-clone,heysion\/clutter-clone,heysion\/clutter-clone,djdeath\/clutter,ebassi\/clutter,collects\/clutter,collects\/clutter,Distrotech\/clutter,spatulasnout\/clutter,kerrickstaley\/clutter-vala,GNOME\/clutter,GNOME\/clutter,ebassi\/clutter,Distrotech\/clutter,kerrickstaley\/clutter-vala,jigpu\/clutter,GNOME\/clutter,Distrotech\/clutter,spatulasnout\/clutter,djdeath\/clutter-multithreaded","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- clutter\/clutter-paint-volume.c\n+++ clutter\/clutter-paint-volume.c\n@@ -242,7 +242,8 @@\n * @pv: a #ClutterPaintVolume\n * @width: the width of the paint volume, in pixels\n *\n- * Sets the width of the paint volume.\n+ * Sets the width of the paint volume. The width is measured along\n+ * the x axis in the actor coordinates that @pv is associated with.\n *\n * Since: 1.6\n *\/\n@@ -253,13 +254,15 @@\n gfloat right_xpos;\n \n g_return_if_fail (pv != NULL);\n- g_return_if_fail (pv->is_axis_aligned);\n g_return_if_fail (width >= 0.0f);\n \n \/* If the volume is currently empty then only the origin is\n * currently valid *\/\n if (pv->is_empty)\n pv->vertices[1] = pv->vertices[3] = pv->vertices[4] = pv->vertices[0];\n+\n+ if (!pv->is_axis_aligned)\n+ _clutter_paint_volume_axis_align (pv);\n \n right_xpos = pv->vertices[0].x + width;\n \n@@ -279,9 +282,30 @@\n * clutter_paint_volume_get_width:\n * @pv: a #ClutterPaintVolume\n *\n- * Retrieves the width set using clutter_paint_volume_get_width()\n- *\n- * Return value: the width, in pixels\n+ * Retrieves the width of the volume's, axis aligned, bounding box.\n+ *\n+ * In other words; this takes into account what actor's coordinate\n+ * space @pv belongs too and conceptually fits an axis aligned box\n+ * around the volume. It returns the size of that bounding box as\n+ * measured along the x-axis.\n+ *\n+ * <note>If, for example, clutter_actor_get_transformed_paint_volume()\n+ * is used to transform a 2D child actor that is 100px wide, 100px\n+ * high and 0px deep into container coordinates then the width might\n+ * not simply be 100px if the child actor has a 3D rotation applied to\n+ * it.\n+ *\n+ * Remember; after clutter_actor_get_transformed_paint_volume() is\n+ * used then a transformed child volume will be defined relative to the\n+ * ancestor container actor and so a 2D child actor\n+ * can have a 3D bounding volume.<\/note>\n+ *\n+ * <note>There are no accuracy guarantees for the reported width,\n+ * except that it must always be >= to the true width. This is\n+ * because actors may report simple, loose fitting paint-volumes\n+ * for efficiency<\/note>\n+\n+ * Return value: the width, in units of @pv's local coordinate system.\n *\n * Since: 1.6\n *\/\n@@ -289,10 +313,19 @@\n clutter_paint_volume_get_width (const ClutterPaintVolume *pv)\n {\n g_return_val_if_fail (pv != NULL, 0.0);\n- g_return_val_if_fail (pv->is_axis_aligned, 0);\n \n if (pv->is_empty)\n return 0;\n+ else if (!pv->is_axis_aligned)\n+ {\n+ ClutterPaintVolume tmp;\n+ float width;\n+ _clutter_paint_volume_copy_static (pv, &tmp);\n+ _clutter_paint_volume_axis_align (&tmp);\n+ width = tmp.vertices[1].x - tmp.vertices[0].x;\n+ clutter_paint_volume_free (&tmp);\n+ return width;\n+ }\n else\n return pv->vertices[1].x - pv->vertices[0].x;\n }\n@@ -302,7 +335,8 @@\n * @pv: a #ClutterPaintVolume\n * @height: the height of the paint volume, in pixels\n *\n- * Sets the height of the paint volume.\n+ * Sets the height of the paint volume. The height is measured along\n+ * the y axis in the actor coordinates that @pv is associated with.\n *\n * Since: 1.6\n *\/\n@@ -313,13 +347,15 @@\n gfloat height_ypos;\n \n g_return_if_fail (pv != NULL);\n- g_return_if_fail (pv->is_axis_aligned);\n g_return_if_fail (height >= 0.0f);\n \n \/* If the volume is currently empty then only the origin is\n * currently valid *\/\n if (pv->is_empty)\n pv->vertices[1] = pv->vertices[3] = pv->vertices[4] = pv->vertices[0];\n+\n+ if (!pv->is_axis_aligned)\n+ _clutter_paint_volume_axis_align (pv);\n \n height_ypos = pv->vertices[0].y + height;\n \n@@ -338,10 +374,30 @@\n * clutter_paint_volume_get_height:\n * @pv: a #ClutterPaintVolume\n *\n- * Retrieves the height of the paint volume set using\n- * clutter_paint_volume_get_height()\n- *\n- * Return value: the height of the paint volume, in pixels\n+ * Retrieves the height of the volume's, axis aligned, bounding box.\n+ *\n+ * In other words; this takes into account what actor's coordinate\n+ * space @pv belongs too and conceptually fits an axis aligned box\n+ * around the volume. It returns the size of that bounding box as\n+ * measured along the y-axis.\n+ *\n+ * <note>If, for example, clutter_actor_get_transformed_paint_volume()\n+ * is used to transform a 2D child actor that is 100px wide, 100px\n+ * high and 0px deep into container coordinates then the height might\n+ * not simply be 100px if the child actor has a 3D rotation applied to\n+ * it.\n+ *\n+ * Remember; after clutter_actor_get_transformed_paint_volume() is\n+ * used then a transformed child volume will be defined relative to the\n+ * ancestor container actor and so a 2D child actor\n+ * can have a 3D bounding volume.<\/note>\n+ *\n+ * <note>There are no accuracy guarantees for the reported height,\n+ * except that it must always be >= to the true height. This is\n+ * because actors may report simple, loose fitting paint-volumes\n+ * for efficiency<\/note>\n+ *\n+ * Return value: the height, in units of @pv's local coordinate system.\n *\n * Since: 1.6\n *\/\n@@ -349,10 +405,19 @@\n clutter_paint_volume_get_height (const ClutterPaintVolume *pv)\n {\n g_return_val_if_fail (pv != NULL, 0.0);\n- g_return_val_if_fail (pv->is_axis_aligned, 0);\n \n if (pv->is_empty)\n return 0;\n+ else if (!pv->is_axis_aligned)\n+ {\n+ ClutterPaintVolume tmp;\n+ float height;\n+ _clutter_paint_volume_copy_static (pv, &tmp);\n+ _clutter_paint_volume_axis_align (&tmp);\n+ height = tmp.vertices[3].y - tmp.vertices[0].y;\n+ clutter_paint_volume_free (&tmp);\n+ return height;\n+ }\n else\n return pv->vertices[3].y - pv->vertices[0].y;\n }\n@@ -362,7 +427,8 @@\n * @pv: a #ClutterPaintVolume\n * @depth: the depth of the paint volume, in pixels\n *\n- * Sets the depth of the paint volume.\n+ * Sets the depth of the paint volume. The depth is measured along\n+ * the z axis in the actor coordinates that @pv is associated with.\n *\n * Since: 1.6\n *\/\n@@ -373,13 +439,15 @@\n gfloat depth_zpos;\n \n g_return_if_fail (pv != NULL);\n- g_return_if_fail (pv->is_axis_aligned);\n g_return_if_fail (depth >= 0.0f);\n \n \/* If the volume is currently empty then only the origin is\n * currently valid *\/\n if (pv->is_empty)\n pv->vertices[1] = pv->vertices[3] = pv->vertices[4] = pv->vertices[0];\n+\n+ if (!pv->is_axis_aligned)\n+ _clutter_paint_volume_axis_align (pv);\n \n depth_zpos = pv->vertices[0].z + depth;\n \n@@ -399,10 +467,30 @@\n * clutter_paint_volume_get_depth:\n * @pv: a #ClutterPaintVolume\n *\n- * Retrieves the depth of the paint volume set using\n- * clutter_paint_volume_get_depth()\n- *\n- * Return value: the depth\n+ * Retrieves the depth of the volume's, axis aligned, bounding box.\n+ *\n+ * In other words; this takes into account what actor's coordinate\n+ * space @pv belongs too and conceptually fits an axis aligned box\n+ * around the volume. It returns the size of that bounding box as\n+ * measured along the z-axis.\n+ *\n+ * <note>If, for example, clutter_actor_get_transformed_paint_volume()\n+ * is used to transform a 2D child actor that is 100px wide, 100px\n+ * high and 0px deep into container coordinates then the depth might\n+ * not simply be 0px if the child actor has a 3D rotation applied to\n+ * it.\n+ *\n+ * Remember; after clutter_actor_get_transformed_paint_volume() is\n+ * used then the transformed volume will be defined relative to the\n+ * container actor and in container coordinates a 2D child actor\n+ * can have a 3D bounding volume.<\/note>\n+ *\n+ * <note>There are no accuracy guarantees for the reported depth,\n+ * except that it must always be >= to the true depth. This is\n+ * because actors may report simple, loose fitting paint-volumes\n+ * for efficiency.<\/note>\n+ *\n+ * Return value: the depth, in units of @pv's local coordinate system.\n *\n * Since: 1.6\n *\/\n@@ -410,10 +498,19 @@\n clutter_paint_volume_get_depth (const ClutterPaintVolume *pv)\n {\n g_return_val_if_fail (pv != NULL, 0.0);\n- g_return_val_if_fail (pv->is_axis_aligned, 0);\n \n if (pv->is_empty)\n return 0;\n+ else if (!pv->is_axis_aligned)\n+ {\n+ ClutterPaintVolume tmp;\n+ float depth;\n+ _clutter_paint_volume_copy_static (pv, &tmp);\n+ _clutter_paint_volume_axis_align (&tmp);\n+ depth = tmp.vertices[4].z - tmp.vertices[0].z;\n+ clutter_paint_volume_free (&tmp);\n+ return depth;\n+ }\n else\n return pv->vertices[4].z - pv->vertices[0].z;\n }\n"} {"commit":"7fd8fd2f7f618c06482c33982b9c93f559a1a11d","subject":"Overlap dmacopied shared pull source region pinning","message":"Overlap dmacopied shared pull source region pinning\n\n\ngit-svn-id: 29c1264a5cf5e3532df57b06678e7347571c1a3c@1854 f1ba3bf5-cb5c-402b-92a9-7c6bdc83a356\n","repos":"ananos\/xen2mx,ananos\/xen2mx,ananos\/open-mx,ananos\/open-mx,ananos\/xen2mx,ananos\/xen2mx,ananos\/open-mx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- driver\/linux\/omx_reg.c\n+++ driver\/linux\/omx_reg.c\n@@ -1375,10 +1375,12 @@\n \tunsigned long remaining = length;\n \tunsigned long tmp;\n \tstruct omx_user_region_segment *sseg, *dseg; \/* current segment *\/\n+\tunsigned long soff; \/* current offset in region *\/\n \tunsigned long sseglen, dseglen; \/* length of current segment *\/\n \tunsigned long ssegoff, dsegoff; \/* current offset in current segment *\/\n \tstruct page **spage, **dpage; \/* current page *\/\n \tunsigned int spageoff, dpageoff; \/* current offset in current page *\/\n+\tunsigned long spinlen; \/* currently pinned length in region *\/\n \tstruct dma_chan *dma_chan = NULL;\n \tdma_cookie_t dma_last_cookie = -1;\n \tint ret = 0;\n@@ -1388,8 +1390,6 @@\n \t\tgoto out;\n \n \tif (omx_deferred_region_pin) {\n-\t\tunsigned long needed;\n-\n \t\t\/* make sure the receive region is pinned *\/\n \t\tret = omx_user_region_deferred_pin(dst_region,\n \t\t\t\t\t\t 1 \/* no overlap yet *\/,\n@@ -1398,12 +1398,6 @@\n \t\t\tdprintk(REG, \"failed to pin user region\\n\");\n \t\t\tgoto err_with_chan;\n \t\t}\n-\n-\t\t\/* make sure the send region is pinned *\/\n-\t\tneeded = src_offset + length;\n-\t\tret = omx_user_region_pending_pin_wait(src_region, &needed); \/* no overlap yet *\/\n-\t\tif (ret < 0)\n-\t\t\tgoto err_with_chan;\n \t}\n \n \tdprintk(REG, \"shared region copy of %ld bytes from region #%ld len %ld starting at %ld into region #%ld len %ld starting at %ld\\n\",\n@@ -1418,9 +1412,11 @@\n \t\t\tbreak;\n \t\ttmp += sseglen;\n \t}\n+\tsoff = src_offset;\n \tssegoff = src_offset - tmp;\n \tspage = &sseg->pages[(ssegoff + sseg->first_page_offset) >> PAGE_SHIFT];\n \tspageoff = (ssegoff + sseg->first_page_offset) & (~PAGE_MASK);\n+\tspinlen = 0;\n \n \t\/* initialize the dst state *\/\n \tfor(tmp=0,dseg=&dst_region->segments[0];; dseg++) {\n@@ -1452,11 +1448,19 @@\n \t\t\t(unsigned long) (sseg-&src_region->segments[0]), (unsigned long) (spage-&sseg->pages[0]), *spage, spageoff,\n \t\t\t(unsigned long) (dseg-&dst_region->segments[0]), (unsigned long) (dpage-&dseg->pages[0]), *dpage, dpageoff);\n \n+\t\tif (omx_deferred_region_pin && spinlen < soff + chunk) {\n+\t\t\tspinlen = soff + chunk;\n+\t\t\tret = omx_user_region_pending_pin_wait(src_region, &spinlen);\n+\t\t\tif (ret < 0)\n+\t\t\t\tgoto err_with_chan;\n+\t\t}\n+\n \t\tcookie = dma_async_memcpy_pg_to_pg(dma_chan, *dpage, dpageoff, *spage, spageoff, chunk);\n \t\tif (cookie < 0)\n \t\t\tgoto out;\n \t\tdma_last_cookie = cookie;\n \n+\t\tsoff += chunk;\n \t\tremaining -= chunk;\n \t\tif (!remaining)\n \t\t\tbreak;\n"} {"commit":"94aa33d48d97752c496c4f5e1eefc09b60b6eb5c","subject":"Eliminated build warning","message":"Eliminated build warning\n","repos":"simo5\/evolution-activesync,simo5\/evolution-activesync,simo5\/evolution-activesync","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- eas-daemon\/libeas\/eas-provision-msg.c\n+++ eas-daemon\/libeas\/eas-provision-msg.c\n@@ -155,7 +155,7 @@\n \/*\n translates from eas provision status code to GError\n *\/\n-static void set_provision_status_error (guint provision_status, GError **error)\n+\/*static void set_provision_status_error (guint provision_status, GError **error)\n {\n \tswitch (provision_status) {\n \tcase 2: {\n@@ -183,7 +183,7 @@\n \t\t\t (\"Unrecognised provisioning error\"));\n \t}\n \t}\n-}\n+}*\/\n \n \/*\n translates from eas policy status code to GError\n"} {"commit":"b685f3b1744061aa9ad822548ba9c674de5be7c6","subject":"ACPI \/ PCI: Fix memory leak in acpi_pci_irq_enable()","message":"ACPI \/ PCI: Fix memory leak in acpi_pci_irq_enable()\n\nacpi_pci_link_allocate_irq() can return negative gsi even if\nentry != NULL. For that case we have a memory leak, so free\nentry before returning from acpi_pci_irq_enable() for gsi < 0.\n\nSigned-off-by: Tomasz Nowicki <fdd9c4222ab3411edc7e02cd0fc06212c69f4f6f@linaro.org>\nCc: All applicable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\n[rjw: Subject and changelog]\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/acpi\/pci_irq.c\n+++ drivers\/acpi\/pci_irq.c\n@@ -430,6 +430,7 @@\n \t\t\t\t pin_name(pin));\n \t\t}\n \n+\t\tkfree(entry);\n \t\treturn 0;\n \t}\n \n"} {"commit":"c4aace9003e29fc9becce292683dd09bdce7785c","subject":"fix compare function of ziplist to only load integer from ziplist when it is encoded as integer","message":"fix compare function of ziplist to only load integer from ziplist when it is encoded as integer\n","repos":"alpha8\/redis,darksideofthemoo\/redis-histogram,huyuezheng\/redis,spearhead-ea\/redis,qiyang0221\/redis,viongpanzi\/annotated_redis_source,daogangtang\/redis_luajit2.6,Hailei\/redis,Aaron1992\/redis,supasate\/redis,josiahcarlson\/redis,zczhuohuo\/redis,fengshao0907\/redis-3.0-annotated,zczhuohuo\/redis,mcanthony\/redis,GitHubMota\/redis,jaambee\/redis,jqk6\/redis,ramonsnir\/redis,mdavid\/redis-windows-port,hawkchch\/redis,wenxueliu\/redis_comment,zhoudayang\/redis,alexmchale\/redis,rogerlz\/redis,unasm\/redis-3.0-annotated,ofirluzon\/redis,RepmujNetsik\/redis,rogerchina\/redis,soveran\/redis,fankeke\/redis-3.0-annotated,ipmobiletech\/redis,Jonavin\/redis,Cybermaxs\/redis,weizijun\/redis,universsky\/redis,yuhc\/redis-benchmark-enhanced,gilala\/hbjredis,190235047\/redis,MSOpenTech\/redis,tidatida\/annotated_redis_source,coverxiaoeye\/redis,huangz1990\/experiment-redis,zhaobo1023\/redis-3.0-annotated,tidatida\/annotated_redis_source,badboy\/redis,AplayER\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,Jonavin\/redis,gongice\/redis-3.0-annotated,mverrilli\/redis,huangz1990\/redis-3.0-annotated,jxwr\/redis,programmecat\/redis,jbochi\/parallel_redis,jermnelson\/redis,ofirluzon\/redis,cloudrain21\/redis,miminus\/redis,oas1986\/redis-s,huangz1990\/experiment-redis,twskipper\/redis,mumingv\/redis,wujf\/redis,cen-li\/redis,MasahikoSawada\/redis,colstrom\/redis,190235047\/redis,nnog\/redis,ofirluzon\/redis,aim-for-better\/redis,msn217\/redis-3.0-annotated,mengzhejin\/RedisStudy,SummonY\/redis,harrisonfeng\/redis,NBSW\/redis,YuraLukashik\/redis,saisai\/redis,RepmujNetsik\/redis,taoguan\/redis,holstvoogd\/redis,csuhawk\/redis,z-fork\/redis,ofirluzon\/redis,zhiliaoniu\/redis,xlzhan\/redis,adamweixuan\/redis,schacon\/redis,AndersonFirmino\/redis,flashbuckets\/redis,StevenTsai\/redis,dmajkic\/redis,hedisdb\/hedis,Jonekee\/redis,narma\/redis,hedisdb\/hedis,ReadCode\/redis-3.0-annotated,seppo0010\/rlite-server,gilala\/bjredis,upsoft\/redis,shining-yang\/redis,fengshao0907\/annotated_redis_source,dramenk\/annotated_redis_source,zooniverse\/redis,figoxu\/annotated_redis_source,miaoyc1989\/redis-3.0-annotated,cen-li\/redis,wuxiaowei907\/annotated_redis_source,AALEKH\/redis,YuraLukashik\/redis,huangz1990\/redis-3.0-annotated,yuzhangjob\/redis-3.0-annotated-unstable,pietern\/redis,CodeJuan\/redis,harrisonfeng\/redis,GitHubMota\/redis,jingjidejuren\/redis,laurencee\/redis,shining-yang\/redis,schacon\/redis,kts12345\/redis,figoxu\/annotated_redis_source,gilala\/bjredis,Aliceljm1\/redis,atreeyang\/redis,alexmchale\/redis,laurencee\/redis,GitHubMota\/redis,Instagram\/redis,elkingtonmcb\/redis,nilyang\/redis-tdd-annotation,maxpert\/redis,PradheepShrinivasan\/redis,hedisdb\/hedis,darksideofthemoo\/redis-histogram,schacon\/redis,cnbin\/redis,Sciumo\/redis,dramenk\/annotated_redis_source,ouyangkongtong\/redis,PKRoma\/redis,JackieXie168\/redis,pcarrier\/redis,hanmichael\/redis,takeshineshiro\/redis,duanx\/redis,SyntaxStacks\/redis,hornen\/redis,Wangyao14cyy\/redis,zy416548283\/redis-3.0-annotated,mrb\/redis,AplayER\/redis,dongqifan2\/redis-3.0-annotated,blackmady\/redis,mengzhejin\/RedisStudy,ChaosCoo\/annotated_redis_source,gilala\/redis,mpalmer\/redis,tjschuck\/redis,modulexcite\/redis,Jonavin\/redis,spinlock\/redis,devaos\/redis,grisha\/thredis,AndersonFirmino\/redis,hgl888\/redis,louisliangjun\/redis,StevenTsai\/redis,seandsky\/redis,valdsJohn\/redis,RepmujNetsik\/redis,honestme\/redis,healerkx\/redis,pmem\/redis,gaoxianglong\/redis,DeNA\/redis,arijitvt\/redis,weizijun\/redis,shining-yang\/redis,allengaller\/redis,allengaller\/redis,hawkchch\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,huangz1990\/experiment-redis,dayuoba\/redis,dramenk\/annotated_redis_source,cusspvz\/redis,huyuezheng\/redis,GrimDerp\/redis,StevenTsai\/redis,brg-liuwei\/redis,taoguan\/redis,wbailey5\/redis,damy\/redis,Cisphyx\/redis-websockets,brg-liuwei\/redis,ketor\/redis,sunheehnus\/redis,francischan714\/redis,jaambee\/redis,splitice\/redis,JackieXie168\/redis,idning\/redis,zy416548283\/redis-3.0-annotated,PKRoma\/redis,jacklee0810\/redis,gilala\/hbjredis,jingjidejuren\/redis,dayuoba\/redis,rrsean\/redis-3.0-annotated,soveran\/redis,cnbin\/redis,Aliceljm1\/redis-3.0-annotated,nandhanurrevanth\/redis,haima-zju\/redis-3.0-annotated,shanegxxiao\/redis,ChanningDuan\/annotated_redis_source,healerkx\/redis,AALEKH\/redis,izhoujie\/redis,riyan8250\/redis,quangnguyen90\/redis,LittlePeng\/redis,netroby\/redis,tjschuck\/redis,gilala\/redis,citusdata\/redis,huangz1990\/annotated_redis_source,xuguruogu\/redis,AndersonFirmino\/redis,jxwr\/redis,dreamquster\/redis,oaastest\/redis,raphaelfruneaux\/redis,wangyikai\/redis,haima-zju\/redis-3.0-annotated,ctripcorp\/redis,CodeJuan\/redis,laurencee\/redis,mcanthony\/redis,abhiklodh\/redis,MOON-CLJ\/redis,itamarhaber\/redis,upsoft\/redis,jbochi\/parallel_redis,onlymellb\/redis-3.0-annotated,moonbingbing\/redis-3.0-annotated,shreesundara\/redis,mattsta\/redis,DeNA\/redis,jango2015\/redis,janekmi\/redis,tellapart\/redis,kmiku7\/redis,kevinsawicki\/redis,honestme\/redis,ramonsnir\/redis,kensou97\/redis,antirez\/redis,HeartSaVioR\/redis,cloudrain21\/redis,gechong\/redis-3.0-annotated,badboy\/redis,shreesundara\/redis,YuanZhewei\/redis,enginekit\/redis,xlzhan\/redis,hornen\/redis,alenslan\/redis,july2993\/redis,h0x91b\/redis,alenslan\/redis,mumingv\/redis,aluzzardi\/redis,oaastest\/redis,NBSW\/redis,tanghaodong25\/redis,sidsen\/redis,xuguruogu\/redis,0x55\/redis-3.0-annotated,gspandy\/annotated_redis_source,jaambee\/redis,AplayER\/redis,sunqb\/redis-1,Soledad89\/redis,0x55\/redis-3.0-annotated,ton31337\/redis,ouyangkongtong\/redis,jacklee0810\/redis-3.0-annotated,dmajkic\/redis,tanghaodong25\/redis,seppo0010\/redislite-server,ttuna\/msot-redis,roth1002\/redis,mpalmer\/redis,ituncle\/redis,rouzier\/redis,machicao2013\/redis-source-annotated,quangnguyen90\/redis,arijitvt\/redis,nandhanurrevanth\/redis,weizijun\/redis,a-pavlov\/redis,ctripcorp\/redis,ErikDubbelboer\/redis,cusspvz\/redis,ScottKaiGu\/redis,hedisdb\/hedis,yuzhangjob\/redis-3.0-annotated-unstable,abhiklodh\/redis,moonbingbing\/redis-3.0-annotated,grisha\/thredis,pcarrier\/redis,alpha8\/redis,mingyaaaa\/redis,tellapart\/redis,jacklee0810\/annotated_redis_source,antirez\/redis,jacklee0810\/annotated_redis_source,crask\/redis-cutter,maodeyi\/redis_lua,hhli\/redis,izhoujie\/redis,mumingv\/redis-3.0-annotated,Tapology\/redis,mattsta\/redis,4396\/redis,oranagra\/redis,CodeJuan\/redis,grisha\/thredis,Markgorden\/redis,zhcy\/redis,aim-for-better\/redis,kensou97\/redis,allengaller\/redis,xujunhai1991\/redis,mattsta\/redis,adamweixuan\/redis-3.0-annotated,soveran\/redis,zooniverse\/redis,dreamquster\/redis,soloestoy\/redis,ytjiang\/redis,ofirluzon\/redis,mingyaaaa\/redis,aim-for-better\/redis,JoeWoo\/redis,ideaar\/redis,ipmobiletech\/redis,esomenos\/redis,alenslan\/redis,guker\/redis,ttuna\/msot-redis,jacklee0810\/annotated_redis_source,gilala\/bjredis,buobao\/redis-3.0-annotated,jxwr\/redis,PradheepShrinivasan\/redis,modulexcite\/redis,guker\/redis,blackmady\/redis,drinkthere\/redis-3.0-annotated,miminus\/redis,janekmi\/redis,aluzzardi\/redis,itamarhaber\/redis,kmiku7\/redis,mumingv\/redis-3.0-annotated,spinlock\/redis,SummonY\/redis,healerkx\/redis,gilala\/hbjredis,shanegxxiao\/redis,zhaobo1023\/redis-3.0-annotated,pedigree\/redis,jqk6\/redis,cnbin\/redis,flashbuckets\/redis,Linked95\/redis,GrimDerp\/redis,elkingtonmcb\/redis,mrb\/redis,kaushik94\/redis,csuhawk\/redis,zhcy\/redis,a-pavlov\/redis,josephholsten\/redis,Markgorden\/redis,gspandy\/annotated_redis_source,shshlzh\/redis-3.0-annotated,h0x91b\/redis,pmem\/redis,enginekit\/redis,RepmujNetsik\/redis,huangz1990\/annotated_redis_source,janeasystems\/redis,wujf\/redis,tjschuck\/redis,shanegxxiao\/redis,ncopa\/redis,HeartSaVioR\/redis,tanghaodong25\/redis,nuxeh\/redis,mgk\/redis,slfs007\/mk-redis,itugs\/redis,fengshao0907\/redis-3.0-annotated,ketor\/redis,HeartSaVioR\/redis,jacklee0810\/redis-3.0-annotated,kmiku7\/redis,rgl\/redis,kts12345\/redis,rogerlz\/redis,saisai\/redis,wbailey5\/redis,richmonkey\/netleveldb,jacklee0810\/redis,citusdata\/redis,shshlzh\/redis-3.0-annotated,HouKangkang\/redis-3.0-annotated,spearhead-ea\/redis,nuxeh\/redis,nandhanurrevanth\/redis,universsky\/redis,lonely8rain\/redis,honestme\/redis,jingjidejuren\/redis,maodeyi\/redis_lua,Cybermaxs\/redis,sunlianqiang\/redis-3.0-annotated,janeasystems\/redis,damy\/redis,oaastest\/redis,zhoudayang\/redis,charsyam\/redis,MasahikoSawada\/redis,alpha8\/redis,gechong\/redis-3.0-annotated,roth1002\/redis,h0x91b\/redis,whille\/redis-3.0-annotated,rouzier\/redis,jacklee0810\/redis,xujunhai1991\/redis,Sciumo\/redis,rrsean\/redis-3.0-annotated,SyntaxStacks\/redis,xlzhan\/redis,nandhanurrevanth\/redis,machicao2013\/redis-source-annotated,vincent-vivian-liu\/redis,spinlock\/redis,VCTLabs\/redis,zguangyu\/redis,ytjiang\/redis,hhli\/redis,qiyang0221\/redis,darksideofthemoo\/redis-histogram,mengyou0304\/redis,simplestbest\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,j0hnma\/szredis,hanmichael\/redis,ttuna\/msot-redis,oranagra\/redis,pcarrier\/redis,liqiang199105\/redis,splitice\/redis,xujunhai1991\/redis,j0hnma\/hszredis,adamweixuan\/redis,ton31337\/redis,ncopa\/redis,ouyangkongtong\/redis,ScottKaiGu\/redis,pedigree\/redis,netroby\/redis,kts12345\/redis,laurencee\/redis,mrb\/redis,j0hnma\/hszredis,erwin00776\/redis-2.8-optimize,ncopa\/redis,spinlock\/redis,VCTLabs\/redis,Soledad89\/redis,pietern\/redis,enginekit\/redis,wprice\/redis,gilala\/redis,davidradunz\/redis,narma\/redis,ChanningDuan\/annotated_redis_source,xuzhezhaozhao\/redis_reading,tzq668766\/redis-3.0-annotated,narma\/redis,wuyu201321060203\/redis-3.0-annotated,izhoujie\/redis,yuhc\/redis-benchmark-enhanced,0x55\/redis-3.0-annotated,flashbuckets\/redis,ttuna\/msot-redis,esomenos\/redis,yossigo\/redis,zhoudayang\/redis,sidsen\/redis,colstrom\/redis,mdavid\/redis-windows-port,LittlePeng\/redis,viongpanzi\/annotated_redis_source,modulexcite\/redis,shining-yang\/redis,fengshao0907\/redis-3.0-annotated,adamweixuan\/redis,oas1986\/redis-s,erwin00776\/redis-2.8-optimize,qiyang0221\/redis,yybirdcf\/learn-redis,jasonkying\/redis,ErikDubbelboer\/redis,JackieXie168\/redis,huangz1990\/experiment-redis,Aliceljm1\/redis,wujf\/redis,zy416548283\/redis-3.0-annotated,citusdata\/redis,wprice\/redis,mingyaaaa\/redis,louisliangjun\/redis,takeshineshiro\/redis,hhli\/redis,cloudrain21\/redis,4396\/redis,jqk6\/redis,gongice\/redis-3.0-annotated,neomantra\/redis,GrimDerp\/redis,laurencee\/redis,quangnguyen90\/redis,Aaron1992\/redis,wprice\/redis,grisha\/thredis,charsyam\/redis,mcanthony\/redis,wbailey5\/redis,richmonkey\/netleveldb,4396\/redis,zhcy\/redis,ituncle\/redis,fanxu\/redis,cen-li\/redis,gilala\/hredis,damy\/redis,sidsen\/redis,timothyohare\/3rdPartySrc-redis,Instagram\/redis,figoxu\/annotated_redis_source,guker\/redis,0x20h\/redis,LongXQ\/redis,maodeyi\/redis_lua,wangyikai\/redis,badboy\/redis,danny200309\/annotated_redis_source,linfangrong\/redis,qiyang0221\/redis,wuyu201321060203\/redis-3.0-annotated,PKRoma\/redis,damy\/redis,yossigo\/redis,shanegxxiao\/redis,yuzhangjob\/redis-3.0-annotated-unstable,shshlzh\/redis-3.0-annotated,thomasdarimont\/redis,powerumc\/MyRedis_old,itugs\/redis,sidsen\/redis,MOON-CLJ\/redis,j0hnma\/hszredis,perrystreetsoftware\/redis-stall,yybirdcf\/learn-redis,ytjiang\/redis,yybirdcf\/learn-redis,gilala\/redis,pcarrier\/redis,xujunhai1991\/redis,slfs007\/mk-redis,sunlianqiang\/redis-3.0-annotated,fanxu\/redis,yybirdcf\/learn-redis,csuhawk\/redis,adamweixuan\/redis,VCTLabs\/redis,xuzhezhaozhao\/redis_reading,oas1986\/redis-s,gongice\/redis-3.0-annotated,darksideofthemoo\/redis-histogram,ketor\/redis,roth1002\/redis,zhiliaoniu\/redis,kolonse\/redis,taoguan\/redis,kensou97\/redis,Hailei\/redis,july2993\/redis,OmarQunsul\/graph-redis,hanmichael\/redis,Aliceljm1\/redis,shreesundara\/redis,Hailei\/redis,huangz1990\/annotated_redis_source,adamweixuan\/redis-3.0-annotated,LongXQ\/redis,rogerchina\/redis,kolonse\/redis,jqk6\/redis,Linked95\/redis,josiahcarlson\/redis,0x20h\/redis,upsoft\/redis,PradheepShrinivasan\/redis,duanx\/redis,Linked95\/redis,iandyh\/redis,jbochi\/redis,alpha8\/redis,OmarQunsul\/graph-redis,drinkthere\/redis-3.0-annotated,healerkx\/redis,jingjidejuren\/redis,nuxeh\/redis,josephholsten\/redis,takeshineshiro\/redis,seandsky\/redis,richmonkey\/netleveldb,jasonkying\/redis,msn217\/redis-3.0-annotated,antirez\/redis,VCTLabs\/redis,shreesundara\/redis,adamweixuan\/redis,flashbuckets\/redis,netroby\/redis,pkdevbox\/redis,hanmichael\/redis,mengyou0304\/redis,mingyaaaa\/redis,jackyan\/redis,splitice\/redis,mengyou0304\/redis,powerumc\/MyRedis,jackyan\/redis,holstvoogd\/redis,YuanZhewei\/redis,soloestoy\/redis,iandyh\/redis,190235047\/redis,dayuoba\/redis,slfs007\/mk-redis,292388900\/redis,ChanningDuan\/annotated_redis_source,gilala\/hbjredis,tanghaodong25\/redis,yossigo\/redis,seppo0010\/rlite-server,francischan714\/redis,guker\/redis,xuguruogu\/redis,fengshao0907\/redis,buobao\/redis-3.0-annotated,seandsky\/redis,ChaosCoo\/annotated_redis_source,YongMan\/redis,crask\/redis-cutter,LittlePeng\/redis,j0hnma\/szredis,jqk6\/redis,kolonse\/redis,DeNA\/redis,upsoft\/redis,Cybermaxs\/redis,GitHubMota\/redis,jaambee\/redis,pietern\/redis,tzq668766\/redis-3.0-annotated,HunanTV\/redis,AALEKH\/redis,msn217\/redis-3.0-annotated,xuguruogu\/redis,xlzhan\/redis,powerumc\/MyRedis_old,Markgorden\/redis,jacklee0810\/redis,hoxworth\/redis,Sciumo\/redis,elkingtonmcb\/redis,jango2015\/redis,JackieXie168\/redis,seppo0010\/redis,wujf\/redis,valdsJohn\/redis,fanxu\/redis,citusdata\/redis,pkdevbox\/redis,mengzhejin\/RedisStudy,LongXQ\/redis,saisai\/redis,quangnguyen90\/redis,MSOpenTech\/redis,Wangyao14cyy\/redis,buobao\/redis-3.0-annotated,sunheehnus\/redis,ipmobiletech\/redis,AALEKH\/redis,liqiang199105\/redis,rgl\/redis,riyan8250\/redis,colstrom\/redis,HouKangkang\/redis-3.0-annotated,linfangrong\/redis,GrimDerp\/redis,erwin00776\/redis-2.8-optimize,pedigree\/redis,oaastest\/redis,itamarhaber\/redis,sunqb\/redis-1,soloestoy\/redis,ReadCode\/redis-3.0-annotated,fengshao0907\/annotated_redis_source,soloestoy\/redis,j0hnma\/szredis,kmiku7\/redis,nuxeh\/redis,wangyikai\/redis,fengshao0907\/redis,gechong\/redis-3.0-annotated,whille\/redis-3.0-annotated,ksarch-saas\/redis,programmecat\/redis,seppo0010\/redis,weizijun\/redis,cloudrain21\/redis,arijitvt\/redis,JoeWoo\/redis,jaambee\/redis,liqiang199105\/redis,fengshao0907\/redis,rgl\/redis,mgk\/redis,iandyh\/redis,shshlzh\/redis-3.0-annotated,HunanTV\/redis,clamoriniere1A\/redis,a-pavlov\/redis,universsky\/redis,badboy\/redis,charsyam\/redis,jbochi\/parallel_redis,vincent-vivian-liu\/redis,roth1002\/redis,hanmichael\/redis,machicao2013\/redis-source-annotated,SyntaxStacks\/redis,ksarch-saas\/redis,z-fork\/redis,gaoxianglong\/redis,atreeyang\/redis,janekmi\/redis,PradheepShrinivasan\/redis,YuanZhewei\/redis,rgl\/redis,huyuezheng\/redis,gilala\/bjredis,maxpert\/redis,drinkthere\/redis-3.0-annotated,josiahcarlson\/redis,YuraLukashik\/redis,YongMan\/redis,rouzier\/redis,Tapology\/redis,dongqifan2\/redis-3.0-annotated,LongXQ\/redis,timothyohare\/3rdPartySrc-redis,liqiang199105\/redis,itamarhaber\/redis,Soledad89\/redis,harrisonfeng\/redis,cusspvz\/redis,itugs\/redis,zhiliaoniu\/redis,kts12345\/redis,StevenTsai\/redis,simplestbest\/redis,mpalmer\/redis,xuzhezhaozhao\/redis_reading,dmajkic\/redis,duanx\/redis,ctripcorp\/redis,alpha8\/redis,raphaelfruneaux\/redis,tellapart\/redis,SummonY\/redis,modulexcite\/redis,nnog\/redis,kaushik94\/redis,janeasystems\/redis,supasate\/redis,programmecat\/redis,powerumc\/MyRedis_old,zguangyu\/redis,hgl888\/redis,MasahikoSawada\/redis,yuhc\/redis-benchmark-enhanced,JoeWoo\/redis,quangnguyen90\/redis,davidradunz\/redis,Wangyao14cyy\/redis,twskipper\/redis,tzq668766\/redis-3.0-annotated,j0hnma\/hszredis,linfangrong\/redis,zhiliaoniu\/redis,magastzheng\/redis-3.0-annotated,fengshao0907\/redis,unasm\/redis-3.0-annotated,dayuoba\/redis,nandhanurrevanth\/redis,hawkchch\/redis,PKRoma\/redis,wenxueliu\/redis_comment,4396\/redis,mdavid\/redis-windows-port,huangz1990\/redis-3.0-annotated,crask\/redis-cutter,sunheehnus\/redis,zhcy\/redis,splitice\/redis,lonely8rain\/redis,holstvoogd\/redis,YongMan\/redis,zhaobo1023\/redis-3.0-annotated,0x55\/redis-3.0-annotated,seppo0010\/redislite-server,pmem\/redis,danny200309\/annotated_redis_source,sunheehnus\/redis,Soledad89\/redis,0x20h\/redis,honestme\/redis,MasahikoSawada\/redis,CodeJuan\/redis,holstvoogd\/redis,jango2015\/redis,kts12345\/redis,wprice\/redis,dreamquster\/redis,neomantra\/redis,mgk\/redis,takeshineshiro\/redis,janekmi\/redis,alenslan\/redis,himoca\/redis,HunanTV\/redis,Cybermaxs\/redis,charsyam\/redis,jbochi\/redis,timothyohare\/3rdPartySrc-redis,devaos\/redis,Aaron1992\/redis,coverxiaoeye\/redis,NBSW\/redis,Jonekee\/redis,ScottKaiGu\/redis,jasonkying\/redis,rogerlz\/redis,viongpanzi\/annotated_redis_source,gaoxianglong\/redis,ytjiang\/redis,wenxueliu\/redis_comment,wangyikai\/redis,seppo0010\/rlite-server,oaastest\/redis,ideaar\/redis,clamoriniere1A\/redis,tidatida\/annotated_redis_source,seppo0010\/redis,neomantra\/redis,nilyang\/redis-tdd-annotation,Cisphyx\/redis-websockets,taoguan\/redis,kolonse\/redis,simplestbest\/redis,arijitvt\/redis,devaos\/redis,erwin00776\/redis-2.8-optimize,gilala\/hredis,csuhawk\/redis,elkingtonmcb\/redis,OmarQunsul\/graph-redis,zczhuohuo\/redis,hgl888\/redis,sunqb\/redis-1,kevinsawicki\/redis,daogangtang\/redis_luajit2.6,jasonkying\/redis,ideaar\/redis,programmecat\/redis,ideaar\/redis,zczhuohuo\/redis,linfangrong\/redis,Wangyao14cyy\/redis,wuyu201321060203\/redis-3.0-annotated,ReadCode\/redis-3.0-annotated,unasm\/redis-3.0-annotated,universsky\/redis,ton31337\/redis,miminus\/redis,PKRoma\/redis,jacklee0810\/redis-3.0-annotated,harrisonfeng\/redis,kolonse\/redis,HouKangkang\/redis-3.0-annotated,supasate\/redis,yossigo\/redis,pmem\/redis,seppo0010\/redislite-server,oranagra\/redis,kensou97\/redis,soloestoy\/redis,idning\/redis,Aaron1992\/redis,colstrom\/redis,seandsky\/redis,simplestbest\/redis,nnog\/redis,ScottKaiGu\/redis,wuyu201321060203\/redis-3.0-annotated,yossigo\/redis,cnbin\/redis,devaos\/redis,valdsJohn\/redis,cen-li\/redis,daogangtang\/redis_luajit2.6,vincent-vivian-liu\/redis,huyuezheng\/redis,thomasdarimont\/redis,nnog\/redis,Tapology\/redis,richmonkey\/netleveldb,ErikDubbelboer\/redis,magastzheng\/redis-3.0-annotated,AplayER\/redis,fanxu\/redis,vincent-vivian-liu\/redis,blackmady\/redis,saisai\/redis,ctripcorp\/redis,aim-for-better\/redis,Cybermaxs\/redis,MOON-CLJ\/redis,rogerlz\/redis,YuraLukashik\/redis,Aliceljm1\/redis-3.0-annotated,july2993\/redis,j0hnma\/szredis,hhli\/redis,hoxworth\/redis,twskipper\/redis,july2993\/redis,a-pavlov\/redis,zooniverse\/redis,rogerchina\/redis,wenxueliu\/redis_comment,thomasdarimont\/redis,raphaelfruneaux\/redis,jackyan\/redis,hornen\/redis,YongMan\/redis,abhiklodh\/redis,Sciumo\/redis,OmarQunsul\/graph-redis,ituncle\/redis,onlymellb\/redis-3.0-annotated,oranagra\/redis,pkdevbox\/redis,liqiang199105\/redis,timothyohare\/3rdPartySrc-redis,jermnelson\/redis,mgk\/redis,ChaosCoo\/annotated_redis_source,ttuna\/msot-redis,powerumc\/MyRedis,rogerchina\/redis,xuzhezhaozhao\/redis_reading,jackyan\/redis,Instagram\/redis,louisliangjun\/redis,nilyang\/redis-tdd-annotation,neomantra\/redis,izhoujie\/redis,seppo0010\/redis,tjschuck\/redis,sunlianqiang\/redis-3.0-annotated,Aliceljm1\/redis,antirez\/redis,gaoxianglong\/redis,charsyam\/redis,valdsJohn\/redis,ouyangkongtong\/redis,wuxiaowei907\/annotated_redis_source,mverrilli\/redis,perrystreetsoftware\/redis-stall,oas1986\/redis-s,jbochi\/redis,duanx\/redis,itugs\/redis,idning\/redis,SummonY\/redis,292388900\/redis,twskipper\/redis,francischan714\/redis,alexmchale\/redis,pkdevbox\/redis,YuanZhewei\/redis,zguangyu\/redis,StartTheShift\/redis-shift,rrsean\/redis-3.0-annotated,yuhc\/redis-benchmark-enhanced,292388900\/redis,JoeWoo\/redis,oranagra\/redis,dreamquster\/redis,gspandy\/annotated_redis_source,z-fork\/redis,magastzheng\/redis-3.0-annotated,SyntaxStacks\/redis,zguangyu\/redis,Hailei\/redis,machicao2013\/redis-source-annotated,powerumc\/MyRedis_old,coverxiaoeye\/redis,Jonekee\/redis,hornen\/redis,blackmady\/redis,netroby\/redis,Markgorden\/redis,ErikDubbelboer\/redis,hgl888\/redis,hoxworth\/redis,ipmobiletech\/redis,HunanTV\/redis,jermnelson\/redis,ncopa\/redis,ideaar\/redis,mpalmer\/redis,ituncle\/redis,miaoyc1989\/redis-3.0-annotated,Cisphyx\/redis-websockets,enginekit\/redis,janeasystems\/redis,fankeke\/redis-3.0-annotated,cusspvz\/redis,iandyh\/redis,h0x91b\/redis,NBSW\/redis,aluzzardi\/redis,mengyou0304\/redis,adamweixuan\/redis-3.0-annotated,clamoriniere1A\/redis,daogangtang\/redis_luajit2.6,riyan8250\/redis,gilala\/hredis,enginekit\/redis,onlymellb\/redis-3.0-annotated,allengaller\/redis,esomenos\/redis,hoxworth\/redis,atreeyang\/redis,soveran\/redis,zhoudayang\/redis,sidsen\/redis,MSOpenTech\/redis,abhiklodh\/redis,Aliceljm1\/redis-3.0-annotated,danny200309\/annotated_redis_source,ScottKaiGu\/redis,idning\/redis,kaushik94\/redis,miminus\/redis,wuxiaowei907\/annotated_redis_source,shanegxxiao\/redis,rouzier\/redis,mverrilli\/redis,MSOpenTech\/redis,francischan714\/redis,mumingv\/redis,moonbingbing\/redis-3.0-annotated,miminus\/redis,ton31337\/redis,nilyang\/redis-tdd-annotation,dongqifan2\/redis-3.0-annotated,MSOpenTech\/redis,upsoft\/redis,HeartSaVioR\/redis,maxpert\/redis,z-fork\/redis,josephholsten\/redis,mumingv\/redis-3.0-annotated,neomantra\/redis,mrb\/redis,thomasdarimont\/redis,pietern\/redis,brg-liuwei\/redis,StartTheShift\/redis-shift,fengshao0907\/annotated_redis_source,perrystreetsoftware\/redis-stall,haima-zju\/redis-3.0-annotated,gilala\/hredis,aluzzardi\/redis,wbailey5\/redis,ramonsnir\/redis,seppo0010\/rlite-server,clamoriniere1A\/redis,davidradunz\/redis,miaoyc1989\/redis-3.0-annotated,Jonavin\/redis,ksarch-saas\/redis,janeasystems\/redis,riyan8250\/redis,powerumc\/MyRedis,Jonavin\/redis,kevinsawicki\/redis,jacklee0810\/redis,brg-liuwei\/redis,hawkchch\/redis,davidradunz\/redis,0x20h\/redis,himoca\/redis,josiahcarlson\/redis,mverrilli\/redis,spearhead-ea\/redis,himoca\/redis,pedigree\/redis,mengzhejin\/RedisStudy,Cisphyx\/redis-websockets,lonely8rain\/redis,damy\/redis,mcanthony\/redis,ksarch-saas\/redis,whille\/redis-3.0-annotated,190235047\/redis,sidsen\/redis,fankeke\/redis-3.0-annotated,supasate\/redis,miaoyc1989\/redis-3.0-annotated,tellapart\/redis,atreeyang\/redis,louisliangjun\/redis,mumingv\/redis,kaushik94\/redis,StartTheShift\/redis-shift","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ziplist.c\n+++ ziplist.c\n@@ -374,18 +374,23 @@\n if (*p == ZIP_END) return 0;\n \n zlen = zipDecodeLength(p,&lensize);\n- if (zipTryEncoding(entry,&eval,&encoding)) {\n- \/* Do integer compare *\/\n- zval = zipLoadInteger(p+lensize,ZIP_ENCODING(p));\n- return zval == eval;\n- } else {\n+ if (ZIP_ENCODING(p) == ZIP_ENC_RAW) {\n \/* Raw compare *\/\n if (zlen == elen) {\n return memcmp(p+lensize,entry,elen) == 0;\n } else {\n return 0;\n }\n- }\n+ } else {\n+ if (zipTryEncoding(entry,&eval,&encoding)) {\n+ \/* Do integer compare *\/\n+ zval = zipLoadInteger(p+lensize,ZIP_ENCODING(p));\n+ return zval == eval;\n+ } else {\n+ \/* Ziplist entry is integer encoded, but given entry is not. *\/\n+ }\n+ }\n+ return 0;\n }\n \n \/* Return length of ziplist. *\/\n"} {"commit":"15b5b4672c3ed17bfe7c8a53e2ae273c5f37b5f1","subject":"implicit pointer-to-long cast warning","message":"implicit pointer-to-long cast warning\n","repos":"cxd4\/zs-flash,cxd4\/zs-flash","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- zs_data.c\n+++ zs_data.c\n@@ -40,7 +40,7 @@\n if (skip_warn)\n if (strcmp(optv[1], \"NOCONFIRM\") == 0)\n goto skip_confirmation;\n- printf(\"Erasing game data at %p. Continue? \", file - flash_RAM);\n+ printf(\"Erasing game data at %p. Continue? \", file);\n response = getchar();\n if (response % 2 == 0)\n return ERR_NONE;\n"} {"commit":"4c7fb0776f678acaead519f83d16559869b618a0","subject":"add support for region debugging","message":"add support for region debugging\n","repos":"HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tool\/hpcrun\/ompt\/ompt-region.c\n+++ src\/tool\/hpcrun\/ompt\/ompt-region.c\n@@ -94,11 +94,67 @@\n \/\/ FIXME: should use eliding interface rather than skipping frames manually\n #define LEVELS_TO_SKIP 2 \/\/ skip one level in enclosing OpenMP runtime\n \n+\/******************************************************************************\n+ * variables\n+ *****************************************************************************\/\n+\n+\/\/ private freelist from which only thread owner can reused regions\n+static __thread ompt_data_t* private_region_freelist_head = NULL;\n+\n+\n+\n+\/\/*****************************************************************************\n+\/\/ debugging support\n+\/\/*****************************************************************************\n+\n+#define REGION_DEBUGGING 1\n+\n+#if REGION_DEBUGGING\n+\n+typedef struct region_resolve_tracker_s {\n+ struct region_resolve_tracker_s *next;\n+ ompt_region_data_t *region;\n+ int thread_id;\n+} rr_pending_t;\n+\n+static spinlock_t debuginfo_lock = SPINLOCK_UNLOCKED;\n+ompt_region_data_t *global_region_list = 0;\n+rr_pending_t *rr_pending = 0;\n+rr_pending_t *rr_freelist = 0;\n+\n+#endif\n+\n+\/\/*****************************************************************************\n+\/\/ forward declarations\n+\/\/*****************************************************************************\n+\n+static ompt_region_data_t * \n+ompt_region_acquire\n+(\n+ void\n+);\n+\n+static void\n+ompt_region_release\n+(\n+ ompt_region_data_t *r\n+);\n \n \n \/\/*****************************************************************************\n \/\/ private operations\n \/\/*****************************************************************************\n+\n+\/\/ initialize support for regions\n+void\n+ompt_regions_init\n+(\n+ void\n+)\n+{\n+ wfq_init(&public_region_freelist);\n+}\n+\n \n ompt_region_data_t *\n ompt_region_data_new\n@@ -107,20 +163,18 @@\n cct_node_t *call_path\n )\n {\n- \/\/ old version of allocating\n- \/\/ ompt_region_data_t *e;\n- \/\/ e = (ompt_region_data_t *)hpcrun_malloc(sizeof(ompt_region_data_t));\n-\n- \/\/ new version\n- ompt_region_data_t* e = hpcrun_ompt_region_alloc();\n+ ompt_region_data_t* e = ompt_region_acquire();\n \n e->region_id = region_id;\n e->call_path = call_path;\n+\n wfq_init(&e->queue);\n+\n \/\/ parts for freelist\n OMPT_BASE_T_GET_NEXT(e) = NULL;\n e->thread_freelist = &public_region_freelist;\n e->depth = 0;\n+\n return e;\n }\n \n@@ -251,7 +305,7 @@\n \/\/ if none, you can reuse region\n \/\/ this thread is region creator, so it could add to private region's list\n \/\/ FIXME vi3: check if you are right\n- freelist_add_first(OMPT_BASE_T_STAR(region_data), OMPT_BASE_T_STAR_STAR(private_region_freelist_head));\n+ ompt_region_release(region_data);\n \/\/ or should use this\n \/\/ wfq_enqueue((ompt_base_t*)region_data, &public_region_freelist);\n }\n@@ -412,3 +466,257 @@\n (ompt_callback_t)ompt_implicit_task);\n assert(ompt_event_may_occur(retval));\n }\n+\n+\n+ompt_region_data_t* \n+ompt_region_alloc\n+(\n+ void\n+)\n+{\n+ ompt_region_data_t* r = (ompt_region_data_t*) hpcrun_malloc(sizeof(ompt_region_data_t));\n+ return r;\n+}\n+\n+\n+static ompt_region_data_t* \n+ompt_region_freelist_get\n+(\n+ void\n+)\n+{\n+ \/\/ FIXME vi3: should in this situation call OMPT_REGION_DATA_T_STAR \/ Notification \/ TRL_EL\n+ \/\/ FIXME vi3: I think that call to wfq_dequeue_private in this case should be thread safe\n+ \/\/ but check this one more time\n+ ompt_region_data_t* r = \n+ (ompt_region_data_t*) wfq_dequeue_private(&public_region_freelist,\n+\t\t\t\t\t OMPT_BASE_T_STAR_STAR(private_region_freelist_head));\n+ return r;\n+}\n+\n+\n+static void\n+ompt_region_freelist_put\n+(\n+ ompt_region_data_t *r \n+)\n+{\n+ freelist_add_first(OMPT_BASE_T_STAR(r), OMPT_BASE_T_STAR_STAR(private_region_freelist_head));\n+}\n+\n+\n+#if REGION_DEBUGGING\n+void\n+ompt_region_debug_chain\n+(\n+ ompt_region_data_t* r\n+)\n+{\n+ \/\/ region tracking for debugging\n+ spinlock_lock(&debuginfo_lock);\n+\n+ r->next_region = global_region_list;\n+ global_region_list = r;\n+\n+ spinlock_unlock(&debuginfo_lock);\n+}\n+#endif\n+\n+\n+ompt_region_data_t*\n+ompt_region_acquire\n+(\n+ void\n+)\n+{\n+ ompt_region_data_t* r = ompt_region_freelist_get();\n+ if (r == 0) {\n+ r = ompt_region_alloc();\n+#if REGION_DEBUGGING\n+ ompt_region_debug_chain(r);\n+#endif\n+ }\n+ return r;\n+}\n+\n+\n+static void\n+ompt_region_release\n+(\n+ ompt_region_data_t *r\n+)\n+{\n+ ompt_region_freelist_put(r);\n+}\n+\n+\n+void\n+rr_queue_push\n+(\n+ rr_pending_t **q,\n+ rr_pending_t *rr\n+)\n+{\n+ rr->next = *q;\n+ *q = rr;\n+}\n+\n+\n+rr_pending_t *\n+rr_queue_pop\n+(\n+ rr_pending_t **q\n+)\n+{\n+ rr_pending_t *rr = 0;\n+\n+ if (q) {\n+ rr = *q;\n+ *q = rr->next;\n+ rr->next = 0;\n+ } \n+\n+ return rr;\n+}\n+\n+\n+rr_pending_t *\n+rr_alloc()\n+{\n+ rr_pending_t *rr = (rr_pending_t *) hpcrun_malloc(sizeof(rr_pending_t));\n+ return rr;\n+}\n+\n+\n+rr_pending_t *\n+rr_get()\n+{\n+ rr_pending_t *rr = rr_freelist ? rr_queue_pop(&rr_freelist) : rr_alloc();\n+ return rr;\n+}\n+\n+\n+void\n+rr_free\n+(\n+ rr_pending_t *rr\n+)\n+{\n+ rr_queue_push(&rr_freelist, rr);\n+}\n+\n+\n+int\n+rr_matches\n+(\n+ rr_pending_t *rr,\n+ ompt_region_data_t *region,\n+ int thread_id\n+)\n+{\n+ return rr->region == region && rr->thread_id == thread_id;\n+}\n+\n+\n+void\n+rr_queue_drop\n+(\n+ ompt_region_data_t *region,\n+ int thread_id\n+)\n+{\n+ \/\/ invariant: cur is pointer to next element\n+ rr_pending_t **cur = &rr_pending;\n+\n+ \/\/ for each element in the queue \n+ for (; *cur;) { \n+ \/\/ if a match is found, remove and return it\n+ if (rr_matches(*cur, region, thread_id)) {\n+ rr_pending_t *rr = rr_queue_pop(cur);\n+\n+ printf(\"rr_done region %p (id=0x%lx) thread %d\\n\", rr->region, region->region_id, rr->thread_id);\n+\n+ rr_free(rr);\n+\n+ return;\n+ }\n+\n+ \/\/ preserve invariant for next element in the list\n+ cur = &((*cur)->next);\n+ }\n+\n+ printf(\"region resolution queue drop failed q = %p, region = %p, thread = %d\\n\", &rr_pending, region, thread_id);\n+}\n+\n+\n+void\n+rr_needed\n+(\n+ ompt_region_data_t *region\n+)\n+{\n+#if 1\n+ spinlock_lock(&debuginfo_lock);\n+\n+ rr_pending_t *rr = rr_get();\n+\n+ rr->region = region;\n+ rr->thread_id = monitor_get_thread_num();\n+\n+ rr_queue_push(&rr_pending, rr);\n+\n+ printf(\"rr_needed region %p (id=0x%lx) thread %d\\n\", region, region->region_id, rr->thread_id);\n+\n+ spinlock_unlock(&debuginfo_lock);\n+#endif\n+}\n+\n+\n+void\n+rr_done\n+(\n+ ompt_region_data_t *region\n+)\n+{\n+#if 1\n+ spinlock_lock(&debuginfo_lock);\n+\n+ int thread_id = monitor_get_thread_num();\n+\n+ rr_queue_drop(region, thread_id);\n+\n+ spinlock_unlock(&debuginfo_lock);\n+#endif\n+}\n+\n+\n+void \n+hpcrun_ompt_region_check\n+(\n+ void\n+)\n+{\n+ ompt_region_data_t *e = global_region_list;\n+ while (e) {\n+ printf(\"region ((ompt_region_data_t *) %p) call_path = %p queue head = %p\\n\", e, e->call_path, \n+ atomic_load(&e->queue.head));\n+ e = (ompt_region_data_t *) e->next_region;\n+ } \n+\n+ rr_pending_t *rr = rr_pending;\n+ while (rr) {\n+ printf(\"pending region %p thread %d\\n\", rr->region, rr->thread_id);\n+ rr = rr->next;\n+ }\n+}\n+\n+\n+void\n+hpcrun_ompt_region_free\n+(\n+ ompt_region_data_t *region_data\n+)\n+{\n+ wfq_enqueue(OMPT_BASE_T_STAR(region_data), region_data->thread_freelist);\n+}\n+\n"} {"commit":"7e97ffd48c4cafb78cc39504d66be59e1238d06e","subject":"Init: much better designed solution to 5-11 (detab)","message":"Init: much better designed solution to 5-11 (detab)\n","repos":"DeadDork\/learning_c,DeadDork\/learning_c","returncode":1,"stderr":"error: pathspec 'KnR\/ch_5\/5.12\/detab2.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- KnR\/ch_5\/5.12\/detab2.c\n+++ KnR\/ch_5\/5.12\/detab2.c\n@@ -0,0 +1,105 @@\n+\/\/ Replaces tabs with spaces.\n+\n+\/\/ Solves the problem of a detab start column not aligning well with tabstop by\n+\/\/ \"rounding\" up tabstops.\n+\n+\/\/ N.B. Demonstrates the design idea of begining with a broad-level main()\n+\/\/ makes for a much clearer program.\n+\n+\/\/ main() {{{\n+#include <stdio.h>\n+\n+void detab(int, int, int);\n+int set_detab_start_column(int, char *[]);\n+int set_tabstop(int, char *[]);\n+\n+int main(int argc, char *argv[]) {\n+\tint place_holder;\n+\tint column_start = ((place_holder = set_detab_start_column(argc, argv)) > 0) ? place_holder : 0;\n+\tint tabstop = ((place_holder = set_tabstop(argc, argv)) > 0) ? place_holder : 8;\n+\n+\tint character;\n+\twhile ((character = getchar()) != EOF)\n+\t\tdetab(column_start, tabstop, character);\n+\n+\treturn 0;\n+}\n+\/\/ }}}\n+\n+\/\/ detab() {{{\n+void print_spaces(int);\n+\n+void detab(int column_start, int tabstop, int character) {\n+\tstatic int column_count;\n+\tint tab_space;\n+\n+\tif (character == '\\t') {\n+\t\ttab_space = tabstop - column_count % tabstop;\n+\t\tcolumn_count += tab_space;\n+\t\tif (column_count < column_start)\n+\t\t\tputchar(character);\n+\t\telse if (column_count - tab_space < column_start)\n+\t\t\tprint_spaces(tab_space);\n+\t\telse\n+\t\t\tprint_spaces(tab_space);\n+\t} else {\n+\t\tputchar(character);\n+\t\t++column_count;\n+\t}\n+\n+\tif (character == '\\n')\n+\t\tcolumn_count = 0;\n+}\n+\/\/ detab() }}}\n+\n+\/\/ set_detab_start_column() {{{\n+#include <stdlib.h>\n+\n+#define ArgsAssign(argc_count, argv_element, arg_sign) {\\\n+\tif (argc == argc_count && argv[argv_element][0] == arg_sign) {\\\n+\t\targv[argv_element][0] = '0';\\\n+\t\tif (is_number(argv[argv_element]))\\\n+\t\t\treturn atoi(argv[argv_element]);\\\n+\t}\\\n+}\n+\n+enum match {\n+\tNO_MATCH,\n+\tMATCH\n+};\n+\n+enum match is_number(char *);\n+\n+int set_detab_start_column(int argc, char *argv[]) {\n+\tArgsAssign(2, 1, '-');\n+\tArgsAssign(3, 1, '-');\n+\tArgsAssign(3, 2, '-');\n+\n+\treturn 0;\n+}\n+\/\/ set_detab_start_column() }}}\n+\n+int set_tabstop(int argc, char *argv[]) {\n+\tArgsAssign(2, 1, '+');\n+\tArgsAssign(3, 1, '+');\n+\tArgsAssign(3, 2, '+');\n+\n+\treturn 0;\n+}\n+\n+\/\/ is_number() {{{\n+#include <ctype.h>\n+\n+enum match is_number(char *character) {\n+\tchar *start_character = character;\n+\n+\twhile (isdigit(*character))\n+\t\t++character;\n+\n+\treturn (character > start_character && isdigit(character[-1])) ? MATCH : NO_MATCH;\n+}\n+\n+void print_spaces(int space_number) {\n+\twhile (space_number-- > 0)\n+\t\tputchar(' ');\n+}\n"} {"commit":"aca36e1bd2efe07c43e4c9e3385651afc53a0fe8","subject":"Remove unnecesary clib_bitmap_set from af_packet input node","message":"Remove unnecesary clib_bitmap_set from af_packet input node\n\nChange-Id: I856fefd52efdfc0a3b8be8bafa3f3106267dfcf1\nSigned-off-by: Damjan Marion <9141bba8b2efed526e55cf796d48631af330ad98@cisco.com>\n","repos":"chrisy\/vpp,GabrielGanne\/vpp-flowtable,chrisy\/vpp,muharif\/vpp,muharif\/vpp,vpp-dev\/vpp,milanlenco\/vpp,vpp-dev\/vpp,GabrielGanne\/vpp-flowtable,FDio\/vpp,GabrielGanne\/vpp-flowtable,FDio\/vpp,vpp-dev\/vpp,chrisy\/vpp,vpp-dev\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,milanlenco\/vpp,GabrielGanne\/vpp-flowtable,milanlenco\/vpp,GabrielGanne\/vpp-flowtable,muharif\/vpp,milanlenco\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,FDio\/vpp,GabrielGanne\/vpp-flowtable,FDio\/vpp,muharif\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,FDio\/vpp,muharif\/vpp,muharif\/vpp,FDio\/vpp,milanlenco\/vpp,FDio\/vpp,milanlenco\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- vnet\/vnet\/devices\/af_packet\/node.c\n+++ vnet\/vnet\/devices\/af_packet\/node.c\n@@ -254,7 +254,6 @@\n \n clib_bitmap_foreach (i, apm->pending_input_bitmap,\n ({\n- clib_bitmap_set (apm->pending_input_bitmap, i, 1);\n n_rx_packets += af_packet_device_input_fn(vm, node, frame, i);\n }));\n \n"} {"commit":"03c66b1f0aa1184f95a5f2bc8fde5767b999a997","subject":"ReadBytes\/SkipBytes should do nothing if length is 0","message":"ReadBytes\/SkipBytes should do nothing if length is 0\n","repos":"cloudera\/Impala,michaelhkw\/incubator-impala,michaelhkw\/incubator-impala,cloudera\/Impala,michaelhkw\/incubator-impala,cloudera\/Impala,michaelhkw\/incubator-impala,michaelhkw\/incubator-impala,cloudera\/Impala,michaelhkw\/incubator-impala,cloudera\/Impala,cloudera\/Impala,cloudera\/Impala,michaelhkw\/incubator-impala","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- be\/src\/exec\/scanner-context.inline.h\n+++ be\/src\/exec\/scanner-context.inline.h\n@@ -63,6 +63,10 @@\n *status = Status(\"Negative length\");\n return false;\n }\n+ if (UNLIKELY(length == 0)) {\n+ *status = Status::OK;\n+ return true;\n+ }\n int bytes_read;\n bool dummy_eos;\n RETURN_IF_FALSE(GetBytes(length, buf, &bytes_read, &dummy_eos, status));\n@@ -80,6 +84,10 @@\n \/\/ TODO: consider implementing a Skip in the context\/stream object that's more \n \/\/ efficient than GetBytes.\n inline bool ScannerContext::Stream::SkipBytes(int length, Status* status) {\n+ if (UNLIKELY(length == 0)) {\n+ *status = Status::OK;\n+ return true;\n+ }\n uint8_t* dummy_buf;\n int bytes_read;\n bool dummy_eos;\n"} {"commit":"7cafe7670ed508b872e05c951da9721e6009ce81","subject":"http_server_rx_callback","message":"http_server_rx_callback\n\nhttp_server_rx_callback must return -1,\nif session_rx_request fails.\n\nChange-Id: I08e48ea7560dee301958e0babe023bb739b9342c\nSigned-off-by: JingLiuZTE <644f9f04077834d8c7510aa90d14c0cca5b7e592@zte.com.cn>\n","repos":"chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp,FDio\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vnet\/tcp\/builtin_http_server.c\n+++ src\/vnet\/tcp\/builtin_http_server.c\n@@ -355,8 +355,11 @@\n {\n http_server_main_t *hsm = &http_server_main;\n builtin_http_server_args *args;\n-\n- session_rx_request (s);\n+ int rv;\n+\n+ rv = session_rx_request (s);\n+ if (rv)\n+ return rv;\n \n \/* send the command to a new\/recycled vlib process *\/\n args = clib_mem_alloc (sizeof (*args));\n@@ -385,8 +388,11 @@\n http_server_main_t *hsm = &http_server_main;\n u8 *request = 0;\n int i;\n-\n- session_rx_request (s);\n+ int rv;\n+\n+ rv = session_rx_request (s);\n+ if (rv)\n+ return rv;\n \n request = hsm->rx_buf[s->thread_index];\n if (vec_len (request) < 7)\n"} {"commit":"9998f1b7a37bb6fbeb723de7cb3b39a72a510175","subject":"Don't use covariant returns, as MSVC++7.1 does not support them.","message":"Don't use covariant returns, as MSVC++7.1 does not support them.\n\n\ngit-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@37529 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"dawehner\/root,bbannier\/ROOT,bbannier\/ROOT,dawehner\/root,bbannier\/ROOT,bbannier\/ROOT,dawehner\/root,bbannier\/ROOT,bbannier\/ROOT,dawehner\/root,dawehner\/root,dawehner\/root,dawehner\/root,dawehner\/root,bbannier\/ROOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bindings\/pyroot\/inc\/TPyFitFunction.h\n+++ bindings\/pyroot\/inc\/TPyFitFunction.h\n@@ -29,7 +29,8 @@\n virtual ~TPyMultiGenFunction();\n \n \/\/ Math::IMultiGenFunction implementation\n- virtual TPyMultiGenFunction* Clone() const { return new TPyMultiGenFunction( fPySelf ); }\n+ virtual ROOT::Math::IBaseFunctionMultiDim* Clone() const\n+ { return new TPyMultiGenFunction( fPySelf ); }\n virtual unsigned int NDim() const;\n virtual double DoEval( const double* x ) const;\n \n@@ -52,7 +53,8 @@\n virtual ~TPyMultiGradFunction();\n \n \/\/ Math::IMultiGenFunction implementation\n- virtual TPyMultiGradFunction* Clone() const { return new TPyMultiGradFunction( fPySelf ); }\n+ virtual ROOT::Math::IBaseFunctionMultiDim* Clone() const\n+ { return new TPyMultiGradFunction( fPySelf ); }\n virtual unsigned int NDim() const;\n virtual double DoEval( const double* x ) const;\n \n"} {"commit":"e9908f3520e6abaa11819317cbee8993677e1812","subject":"iirdes: cleaning up generic iir filter desing template","message":"iirdes: cleaning up generic iir filter desing template\n","repos":"JayKickliter\/liquid-dsp,wangning223\/liquid-dsp,manuts\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,cjcliffe\/liquid-dsp,biotrump\/liquid-dsp,biotrump\/liquid-dsp,wangning223\/liquid-dsp,biotrump\/liquid-dsp,andrepuschmann\/liquid-dsp,manuts\/liquid-dsp,biotrump\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,cjcliffe\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,cjcliffe\/liquid-dsp,cjcliffe\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,jgaeddert\/liquid-dsp,jgaeddert\/liquid-dsp,manuts\/liquid-dsp,wangning223\/liquid-dsp,wangning223\/liquid-dsp,andrepuschmann\/liquid-dsp,wangning223\/liquid-dsp,manuts\/liquid-dsp,cjcliffe\/liquid-dsp,manuts\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/filter\/src\/iirdes.c\n+++ src\/filter\/src\/iirdes.c\n@@ -404,6 +404,8 @@\n exit(1);\n }\n \n+ unsigned int i;\n+\n \/\/ number of analaog poles\/zeros\n unsigned int npa = _n;\n unsigned int nza;\n@@ -413,55 +415,52 @@\n float complex za[_n];\n float complex ka;\n \n- unsigned int r = _n%2;\n- unsigned int L = (_n-r)\/2;\n-\n- unsigned int i;\n+ \/\/ derived values\n+ unsigned int r = _n%2; \/\/ odd\/even filter order\n+ unsigned int L = (_n-r)\/2; \/\/ filter semi-length\n+\n \/\/ specific filter variables\n float epsilon, Gp, Gs, ep, es;\n \n+ \/\/ compute zeros and poles of analog prototype\n switch (_ftype) {\n case LIQUID_IIRDES_BUTTER:\n- printf(\"Butterworth filter design:\\n\");\n+ \/\/ Butterworth filter design : no zeros, _n poles\n nza = 0;\n butter_azpkf(_n,_fc,za,pa,&ka);\n break;\n case LIQUID_IIRDES_CHEBY1:\n- printf(\"Cheby-I filter design:\\n\");\n+ \/\/ Cheby-I filter design : no zeros, _n poles, pass-band ripple\n nza = 0;\n epsilon = sqrtf( powf(10.0f, _Ap \/ 10.0f) - 1.0f );\n cheby1_azpkf(_n,_fc,epsilon,za,pa,&ka);\n break;\n case LIQUID_IIRDES_CHEBY2:\n- printf(\"Cheby-II filter design:\\n\");\n+ \/\/ Cheby-II filter design : _n-r zeros, _n poles, stop-band ripple\n nza = 2*L;\n epsilon = powf(10.0f, -_As\/20.0f);\n cheby2_azpkf(_n,_fc,epsilon,za,pa,&ka);\n break;\n case LIQUID_IIRDES_ELLIP:\n- printf(\"elliptic filter design:\\n\");\n+ \/\/ elliptic filter design : _n-r zeros, _n poles, pass\/stop-band ripple\n nza = 2*L;\n- Gp = powf(10.0f, -_Ap \/ 20.0f);\n- Gs = powf(10.0f, -_As \/ 20.0f);\n- printf(\" Gp = %12.8f\\n\", Gp);\n- printf(\" Gs = %12.8f\\n\", Gs);\n-\n- \/\/ epsilon values\n- ep = sqrtf(1.0f\/(Gp*Gp) - 1.0f);\n- es = sqrtf(1.0f\/(Gs*Gs) - 1.0f);\n-\n+ Gp = powf(10.0f, -_Ap \/ 20.0f); \/\/ pass-band gain\n+ Gs = powf(10.0f, -_As \/ 20.0f); \/\/ stop-band gain\n+ ep = sqrtf(1.0f\/(Gp*Gp) - 1.0f); \/\/ pass-band epsilon\n+ es = sqrtf(1.0f\/(Gs*Gs) - 1.0f); \/\/ stop-band epsilon\n ellip_azpkf(_n,_fc,ep,es,za,pa,&ka);\n break;\n case LIQUID_IIRDES_BESSEL:\n- printf(\"Bessel filter design:\\n\");\n+ \/\/ Bessel filter design : no zeros, _n poles\n+ nza = 0;\n bessel_azpkf(_n,za,pa,&ka);\n- nza = 0;\n break;\n default:\n fprintf(stderr,\"error: iirdes(), unknown filter type\\n\");\n exit(1);\n }\n \n+#if LIQUID_IIRDES_DEBUG_PRINT\n printf(\"poles (analog):\\n\");\n for (i=0; i<npa; i++)\n printf(\" pa[%3u] = %12.8f + j*%12.8f\\n\", i, crealf(pa[i]), cimagf(pa[i]));\n@@ -470,6 +469,7 @@\n printf(\" za[%3u] = %12.8f + j*%12.8f\\n\", i, crealf(za[i]), cimagf(za[i]));\n printf(\"gain (analog):\\n\");\n printf(\" ka : %12.8f + j*%12.8f\\n\", crealf(ka), cimagf(ka));\n+#endif\n \n \/\/ complex digital poles\/zeros\/gain\n \/\/ NOTE: allocated double the filter order to cover band-pass, band-stop cases\n@@ -477,12 +477,13 @@\n float complex pd[2*_n];\n float complex kd;\n float m = iirdes_freqprewarp(_btype,_fc,_f0);\n- printf(\"m : %12.8f\\n\", m);\n+ \/\/printf(\"m : %12.8f\\n\", m);\n bilinear_zpkf(za, nza,\n pa, npa,\n ka, m,\n zd, pd, &kd);\n \n+#if LIQUID_IIRDES_DEBUG_PRINT\n printf(\"zeros (digital, low-pass prototype):\\n\");\n for (i=0; i<_n; i++)\n printf(\" zd[%3u] = %12.4e + j*%12.4e;\\n\", i, crealf(zd[i]), cimagf(zd[i]));\n@@ -491,6 +492,7 @@\n printf(\" pd[%3u] = %12.4e + j*%12.4e;\\n\", i, crealf(pd[i]), cimagf(pd[i]));\n printf(\"gain (digital):\\n\");\n printf(\" kd : %12.8f + j*%12.8f\\n\", crealf(kd), cimagf(kd));\n+#endif\n \n \/\/ negate zeros, poles for high-pass and band-stop cases\n if (_btype == LIQUID_IIRDES_HIGHPASS ||\n@@ -511,7 +513,7 @@\n float complex zd1[2*_n];\n float complex pd1[2*_n];\n \n- \/\/ run zeros, poles trasform\n+ \/\/ run zeros, poles low-pass -> band-pass trasform\n iirdes_dzpk_lp2bp(zd, pd, \/\/ low-pass prototype zeros, poles\n _n, \/\/ filter order\n _f0, \/\/ center frequency\n@@ -528,24 +530,24 @@\n }\n \n if (_format == LIQUID_IIRDES_TF) {\n- \/\/float b[_n+1]; \/\/ numerator\n- \/\/float a[_n+1]; \/\/ denominator\n-\n- \/\/ convert complex digital poles\/zeros\/gain into transfer function\n+ \/\/ convert complex digital poles\/zeros\/gain into transfer\n+ \/\/ function : H(z) = B(z) \/ A(z)\n+ \/\/ where length(B,A) = low\/high-pass ? _n + 1 : 2*_n + 1\n iirdes_dzpk2tff(zd,pd,_n,kd,_B,_A);\n \n+#if LIQUID_IIRDES_DEBUG_PRINT\n \/\/ print coefficients\n for (i=0; i<=_n; i++) printf(\"b[%3u] = %12.8f;\\n\", i, _B[i]);\n for (i=0; i<=_n; i++) printf(\"a[%3u] = %12.8f;\\n\", i, _A[i]);\n+#endif\n } else {\n- \/\/ second-order sections\n- \/\/float A[3*(L+r)];\n- \/\/float B[3*(L+r)];\n-\n \/\/ convert complex digital poles\/zeros\/gain into second-\n- \/\/ order sections form\n+ \/\/ order sections form :\n+ \/\/ H(z) = prod { (b0 + b1*z^-1 + b2*z^-2) \/ (a0 + a1*z^-1 + a2*z^-2) }\n+ \/\/ where size(B,A) = low\/high-pass ? [3]x[L+r] : [3]x[2*L]\n iirdes_dzpk2sosf(zd,pd,_n,kd,_B,_A);\n \n+#if LIQUID_IIRDES_DEBUG_PRINT\n \/\/ print coefficients\n printf(\"B [%u x 3] :\\n\", L+r);\n for (i=0; i<L+r; i++)\n@@ -553,8 +555,9 @@\n printf(\"A [%u x 3] :\\n\", L+r);\n for (i=0; i<L+r; i++)\n printf(\" %12.8f %12.8f %12.8f\\n\", _A[3*i+0], _A[3*i+1], _A[3*i+2]);\n-\n- }\n-}\n-\n-\n+#endif\n+\n+ }\n+}\n+\n+\n"} {"commit":"432a8dc6322002a067e13062680b5757032b9e9f","subject":"Add missing include.","message":"Add missing include.","repos":"ukscone\/relic,tfar\/relic,ukscone\/relic,ace0\/relic,sruesch\/relic,sruesch\/relic,OlegHahm\/relic,OlegHahm\/relic,tfar\/relic,ace0\/relic,ace0\/relic,ace0\/relic,sruesch\/relic,tfar\/relic,ukscone\/relic,OlegHahm\/relic","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fp\/relic_fp_prime.c\n+++ src\/fp\/relic_fp_prime.c\n@@ -30,6 +30,7 @@\n *\/\n \n #include \"relic_core.h\"\n+#include \"relic_fpx.h\"\n #include \"relic_bn_low.h\"\n #include \"relic_fp_low.h\"\n \n@@ -415,7 +416,7 @@\n }\n \n void fp_prime_calc() {\n-#ifdef WITH_PP\n+#ifdef WITH_FPX\n \tif (fp_prime_get_qnr() != 0) {\n \t\tfp2_calc();\n \t}\n"} {"commit":"2689d1267f4bedd803f2a4c968622d4f30787fbc","subject":"Don't log when freopen() returns ENOENT. (dm)","message":"Don't log when freopen() returns ENOENT. (dm)\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/config.c\n+++ Programs\/config.c\n@@ -2448,6 +2448,20 @@\n }\n }\n \n+static void\n+detachStream (FILE *stream, const char *name, int output) {\n+ const char *nullDevice = \"\/dev\/null\";\n+\n+ if (!freopen(nullDevice, (output? \"a\": \"r\"), stream)) {\n+ if (errno != ENOENT) {\n+ char action[0X40];\n+\n+ snprintf(action, sizeof(action), \"freopen[%s]\", name);\n+ logSystemError(action);\n+ }\n+ }\n+}\n+\n ProgramExitStatus\n brlttyStart (void) {\n if (opt_cancelExecution) {\n@@ -2525,23 +2539,9 @@\n #if defined(GRUB_RUNTIME)\n \n #else \/* redirect stdio streams to \/dev\/null *\/\n- {\n- const char *nullDevice = \"\/dev\/null\";\n-\n- if (!freopen(nullDevice, \"r\", stdin)) {\n- logSystemError(\"freopen[stdin]\");\n- }\n-\n- if (!freopen(nullDevice, \"a\", stdout)) {\n- logSystemError(\"freopen[stdout]\");\n- }\n-\n- if (!opt_standardError) {\n- if (!freopen(nullDevice, \"a\", stderr)) {\n- logSystemError(\"freopen[stderr]\");\n- }\n- }\n- }\n+ detachStream(stdin, \"stdin\", 0);\n+ detachStream(stdout, \"stdout\", 1);\n+ if (!opt_standardError) detachStream(stderr, \"stderr\", 1);\n #endif \/* redirect stdio streams to \/dev\/null *\/\n \n #ifdef __MINGW32__\n"} {"commit":"ea0d1fd709d28eadef0bcfdbb985b7696a19559c","subject":"enable user message accentuation for history","message":"enable user message accentuation for history\n\nmptcore\n history message highlighting in terminal when color is enabled\n","repos":"becm\/mpt-base,becm\/mpt-base,becm\/mpt-base,becm\/mpt-base","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mptcore\/output\/history_log.c\n+++ mptcore\/output\/history_log.c\n@@ -27,6 +27,11 @@\n \tconst char *reset, *newline;\n \tFILE *fd;\n \t\n+\t\/* discard lower priority log message *\/\n+\tif (hist->ignore\n+\t && (type & 0x1f) >= hist->ignore) {\n+\t\treturn 0;\n+\t}\n \t\/* message being composed *\/\n \tif (hist->state & MPT_OUTFLAG(Active)) {\n \t\treturn MPT_ERROR(MessageInProgress);\n@@ -39,6 +44,10 @@\n \telse {\n \t\tfd = (type & ~MPT_LOG(File)) ? stderr : stdout;\n \t\tnewline = mpt_newline_string(0);\n+\t\t\/* force color for terminal output *\/\n+\t\tif ((hist->state & MPT_OUTFLAG(PrintColor))) {\n+\t\t\ttype |= MPT_ENUM(LogPretty);\n+\t\t}\n \t}\n \t\/* write intro *\/\n \treset = mpt_log_intro(fd, type);\n"} {"commit":"de66252f9b67feb0785247f8c381c80c28b9af64","subject":"Only reallocate the autospeak buffer as necessary (rather than all the time). (dm)","message":"Only reallocate the autospeak buffer as necessary (rather than all the time). (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@8102 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/update.c\n+++ Programs\/update.c\n@@ -311,6 +311,7 @@\n static int oldY = -1;\n static int oldWidth = 0;\n static ScreenCharacter *oldCharacters = NULL;\n+ static size_t oldSize = 0;\n static int cursorAssumedStable = 0;\n \n int newScreen = scr.number;\n@@ -328,7 +329,7 @@\n const char *reason = NULL;\n \n if (!oldCharacters) {\n- count = 0;\n+ reason = \"current line\";\n } else if ((newScreen != oldScreen) || (ses->winy != oldwiny) || (newWidth != oldWidth)) {\n if (!prefs.autospeakSelectedLine) count = 0;\n reason = \"line selected\";\n@@ -342,7 +343,7 @@\n * before assuming that it is actually stable.\n *\/\n \t if ((newX == oldX) && !cursorAssumedStable) {\n-\t scheduleUpdate(\"auto-speak cursor stability check\");\n+\t scheduleUpdate(\"autospeak cursor stability check\");\n \t cursorAssumedStable = 1;\n \t return;\n \t }\n@@ -495,23 +496,35 @@\n }\n \n autospeak:\n+ if (!reason) reason = \"unknown reason\";\n characters += column;\n \n if (count) {\n- if (!reason) reason = \"unknown reason\";\n logMessage(LOG_CATEGORY(SPEECH_EVENTS), \"autospeak: %s: %d\", reason, count);\n speakCharacters(characters, count, 0);\n }\n }\n \n {\n- size_t size = newWidth * sizeof(*oldCharacters);\n-\n- if ((oldCharacters = realloc(oldCharacters, size))) {\n- memcpy(oldCharacters, newCharacters, size);\n- } else {\n- logMallocError();\n- }\n+ size_t newSize = newWidth * sizeof(*oldCharacters);\n+\n+ if (newSize > oldSize) {\n+ ScreenCharacter *newBuffer = malloc(newSize);\n+\n+ if (!newBuffer) {\n+ logMallocError();\n+ return;\n+ }\n+\n+ if (!oldCharacters) {\n+ registerProgramMemory(\"autospeak-buffer\", &oldCharacters);\n+ }\n+\n+ oldCharacters = newBuffer;\n+ oldSize = newSize;\n+ }\n+\n+ memcpy(oldCharacters, newCharacters, newSize);\n }\n \n oldScreen = newScreen;\n"} {"commit":"60d4c5e9a12fb9e4ad2b0782244b4ea95211c4c1","subject":"Clean up style","message":"Clean up style\n\n","repos":"yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE,yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE,yorung\/XLE,yorung\/XLE,yorung\/XLE,yorung\/XLE,xlgames-inc\/XLE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- LuaBridge.h\n+++ LuaBridge.h\n@@ -432,7 +432,7 @@\n The mapped name is the same.\n *\/\n template <class T>\n-struct classinfo <const T> : public classinfo <T>\n+struct classinfo <T const> : public classinfo <T>\n {\n static inline bool isConst ()\n {\n@@ -955,25 +955,30 @@\n * function pointer containers, these are only defined up to 8 parameters.\n *\/\n \n+\/** Constructor generators.\n+\n+ These templates call operator new with the contents of a type\/value\n+ list passed to the constructor with up to 8 parameters. Two versions\n+ of call() are provided. One performs a regular new, the other performs\n+ a placement new.\n+*\/\n template <class T, typename Typelist>\n struct constructor {};\n \n template <class T>\n struct constructor <T, nil>\n {\n- static T* call (const typevallist<nil> &tvl)\n- {\n- (void)tvl;\n+ static T* call (typevallist <nil> const&)\n+ {\n return new T;\n }\n- static T* call (void* mem, const typevallist<nil> &tvl)\n- {\n- (void)tvl;\n+ static T* call (void* mem, typevallist <nil> const&)\n+ {\n return new (mem) T;\n }\n };\n \n-template <class T, typename P1>\n+template <class T, class P1>\n struct constructor <T, typelist<P1> >\n {\n static T* call (const typevallist<typelist<P1> > &tvl)\n@@ -986,7 +991,7 @@\n }\n };\n \n-template <class T, typename P1, typename P2>\n+template <class T, class P1, class P2>\n struct constructor <T, typelist<P1, typelist<P2> > >\n {\n static T* call (const typevallist<typelist<P1, typelist<P2> > > &tvl)\n@@ -999,7 +1004,7 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3>\n+template <class T, class P1, class P2, class P3>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3> > > >\n {\n static T* call (const typevallist<typelist<P1, typelist<P2,\n@@ -1014,7 +1019,7 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3, typename P4>\n+template <class T, class P1, class P2, class P3, class P4>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3,\n typelist<P4> > > > >\n {\n@@ -1030,8 +1035,8 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3, typename P4,\n- typename P5>\n+template <class T, class P1, class P2, class P3, class P4,\n+ class P5>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3,\n typelist<P4, typelist<P5> > > > > >\n {\n@@ -1049,8 +1054,8 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3, typename P4,\n- typename P5, typename P6>\n+template <class T, class P1, class P2, class P3, class P4,\n+ class P5, class P6>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3,\n typelist<P4, typelist<P5, typelist<P6> > > > > > >\n {\n@@ -1068,8 +1073,8 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3, typename P4,\n- typename P5, typename P6, typename P7>\n+template <class T, class P1, class P2, class P3, class P4,\n+ class P5, class P6, class P7>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3,\n typelist<P4, typelist<P5, typelist<P6, typelist<P7> > > > > > > >\n {\n@@ -1091,8 +1096,8 @@\n }\n };\n \n-template <class T, typename P1, typename P2, typename P3, typename P4,\n- typename P5, typename P6, typename P7, typename P8>\n+template <class T, class P1, class P2, class P3, class P4,\n+ class P5, class P6, class P7, class P8>\n struct constructor <T, typelist<P1, typelist<P2, typelist<P3,\n typelist<P4, typelist<P5, typelist<P6, typelist<P7, \n typelist<P8> > > > > > > > >\n@@ -2879,7 +2884,7 @@\n \n \/\/------------------------------------------------------------------------------\n \/**\n- lua_CFunction to garbage collect a class object.\n+ lua_CFunction to destroy a class object.\n \n This is used for the __gc metamethod.\n \n@@ -2887,7 +2892,7 @@\n ensure that we are destroying the right kind of object.\n *\/\n template <class T>\n-int gcProxy (lua_State* L)\n+int dtorProxy (lua_State* L)\n {\n void* const p = detail::checkClass (\n L, 1, lua_tostring (L, lua_upvalueindex (1)), true);\n@@ -3038,7 +3043,7 @@\n lua_pushcfunction (L, &detail::object_newindexer);\n rawsetfield (L, -2, \"__newindex\"); \/\/ Use our __newindex.\n lua_pushstring (L, name);\n- lua_pushcclosure (L, &gcProxy <T>, 1);\n+ lua_pushcclosure (L, &dtorProxy <T>, 1);\n rawsetfield (L, -2, \"__gc\"); \/\/ Use our __gc\n lua_pushstring (L, name);\n rawsetfield (L, -2, \"__type\"); \/\/ Set __type to class name.\n@@ -3063,7 +3068,7 @@\n lua_pushcfunction (L, &detail::object_newindexer);\n rawsetfield (L, -2, \"__newindex\"); \/\/ Use our __newindex.\n lua_pushstring (L, name);\n- lua_pushcclosure (L, &gcProxy <T>, 1);\n+ lua_pushcclosure (L, &dtorProxy <T>, 1);\n rawsetfield (L, -2, \"__gc\"); \/\/ Use our __gc.\n lua_pushstring (L, name);\n rawsetfield (L, -2, \"__type\"); \/\/ Store the class type.\n@@ -3326,15 +3331,10 @@\n template <typename MemFn, template <class> class SharedPtr>\n class__ <T>& constructor ()\n {\n- \/\/ Get a reference to the class's static table\n findStaticTable (L, name.c_str());\n-\n- \/\/ Push the constructor proxy, with the class's metatable as an upvalue\n luaL_getmetatable(L, name.c_str());\n lua_pushcclosure (L,\n &ctorProxy <T, SharedPtr, typename fnptr <MemFn>::params>, 1);\n-\n- \/\/ Set the constructor proxy as the __call metamethod of the static table\n rawsetfield(L, -2, \"__call\");\n lua_pop (L, 1);\n return *this;\n@@ -3347,39 +3347,42 @@\n * indexer function we've installed as __index metamethod.\n *\/\n template <typename MemFn>\n- class__ <T>& method (char const *name, MemFn fp)\n+ class__ <T>& method (char const* name, MemFn fp)\n {\n assert (fnptr <MemFn>::mfp);\n std::string metatable_name = this->name;\n \n-#ifdef _MSC_VER\n-#pragma warning (push)\n-#pragma warning (disable: 4127) \/\/ constant conditional expression\n-#endif\n+ #ifdef _MSC_VER\n+ #pragma warning (push)\n+ #pragma warning (disable: 4127) \/\/ constant conditional expression\n+ #endif\n if (fnptr <MemFn>::const_mfp)\n metatable_name.insert (0, \"const \");\n-#ifdef _MSC_VER\n-#pragma warning (pop)\n-#endif\n+ #ifdef _MSC_VER\n+ #pragma warning (pop)\n+ #endif\n+\n luaL_getmetatable (L, metatable_name.c_str ());\n lua_pushstring (L, metatable_name.c_str ());\n void* const v = lua_newuserdata (L, sizeof (MemFn));\n memcpy (v, &fp, sizeof (MemFn));\n-#ifdef _MSC_VER\n-#pragma warning (push)\n-#pragma warning (disable: 4127) \/\/ constant conditional expression\n-#endif\n+\n+ #ifdef _MSC_VER\n+ #pragma warning (push)\n+ #pragma warning (disable: 4127) \/\/ constant conditional expression\n+ #endif\n if (fnptr <MemFn>::const_mfp)\n-#if LUABRIDGE_STRICT_CONST\n+ #if LUABRIDGE_STRICT_CONST\n lua_pushcclosure (L, &methodProxy <MemFn>::const_func, 2);\n-#else\n+ #else\n lua_pushcclosure (L, &methodProxy <MemFn>::func, 2);\n-#endif\n+ #endif\n else\n lua_pushcclosure (L, &methodProxy <MemFn>::func, 2);\n-#ifdef _MSC_VER\n-#pragma warning (pop)\n-#endif\n+ #ifdef _MSC_VER\n+ #pragma warning (pop)\n+ #endif\n+\n rawsetfield (L, -2, name);\n lua_pop (L, 1);\n return *this;\n@@ -3397,74 +3400,87 @@\n template <typename U>\n class__ <T>& property_ro (char const* name, const U T::* mp)\n {\n- luaL_getmetatable(L, this->name.c_str());\n+ luaL_getmetatable (L, this->name.c_str());\n std::string cname = \"const \" + this->name;\n- luaL_getmetatable(L, cname.c_str());\n- rawgetfield(L, -2, \"__propget\");\n- rawgetfield(L, -2, \"__propget\");\n- lua_pushstring(L, cname.c_str());\n- void *v = lua_newuserdata(L, sizeof(U T::*));\n- memcpy(v, &mp, sizeof(U T::*));\n- lua_pushcclosure(L, &propgetProxy<T, U>, 2);\n- lua_pushvalue(L, -1);\n- rawsetfield(L, -3, name);\n- rawsetfield(L, -3, name);\n- lua_pop(L, 4);\n+ luaL_getmetatable (L, cname.c_str());\n+ rawgetfield (L, -2, \"__propget\");\n+ rawgetfield (L, -2, \"__propget\");\n+ lua_pushstring (L, cname.c_str ());\n+ void* const v = lua_newuserdata(L, sizeof (U T::*));\n+ memcpy (v, &mp, sizeof (U T::*));\n+ lua_pushcclosure (L, &propgetProxy <T, U>, 2);\n+ lua_pushvalue (L, -1);\n+ rawsetfield (L, -3, name);\n+ rawsetfield (L, -3, name);\n+ lua_pop (L, 4);\n return *this;\n }\n \n \/\/----------------------------------------------------------------------------\n+ \/**\n+ Register a read-only property using a get function.\n+ *\/\n template <typename U>\n- class__ <T>& property_ro (char const *name, U (T::*get) () const)\n- {\n- luaL_getmetatable(L, this->name.c_str());\n+ class__ <T>& property_ro (char const* name, U (T::* get) () const)\n+ {\n+ luaL_getmetatable (L, this->name.c_str ());\n+ \/** @todo Why not use classinfo <T>::const_name () ? *\/\n std::string cname = \"const \" + this->name;\n- luaL_getmetatable(L, cname.c_str());\n- rawgetfield(L, -2, \"__propget\");\n- rawgetfield(L, -2, \"__propget\");\n- lua_pushstring(L, cname.c_str());\n+ luaL_getmetatable (L, cname.c_str ());\n+ rawgetfield (L, -2, \"__propget\");\n+ rawgetfield (L, -2, \"__propget\");\n+ lua_pushstring (L, cname.c_str ());\n typedef U (T::*MemFn) () const;\n- void *v = lua_newuserdata(L, sizeof(MemFn));\n- memcpy(v, &get, sizeof(MemFn));\n+ void* const v = lua_newuserdata (L, sizeof (MemFn));\n+ memcpy (v, &get, sizeof (MemFn));\n lua_pushcclosure (L, &methodProxy <MemFn>::const_func, 2);\n- lua_pushvalue(L, -1);\n- rawsetfield(L, -3, name);\n- rawsetfield(L, -3, name);\n- lua_pop(L, 4);\n+ lua_pushvalue (L, -1);\n+ rawsetfield (L, -3, name);\n+ rawsetfield (L, -3, name);\n+ lua_pop (L, 4);\n return *this;\n }\n \n \/\/----------------------------------------------------------------------------\n- template <typename U>\n+ \/**\n+ Register a read\/write data member.\n+ *\/\n+ template <class U>\n class__ <T>& property_rw (char const *name, U T::* mp)\n {\n- property_ro<U>(name, mp);\n- luaL_getmetatable(L, this->name.c_str());\n- rawgetfield(L, -1, \"__propset\");\n- lua_pushstring(L, this->name.c_str());\n- void *v = lua_newuserdata(L, sizeof(U T::*));\n- memcpy(v, &mp, sizeof(U T::*));\n- lua_pushcclosure(L, &propsetProxy <T, U>, 2);\n- rawsetfield(L, -2, name);\n- lua_pop(L, 2);\n+ property_ro <U> (name, mp);\n+ luaL_getmetatable (L, this->name.c_str ());\n+ rawgetfield (L, -1, \"__propset\");\n+ lua_pushstring (L, this->name.c_str());\n+ void* v = lua_newuserdata (L, sizeof (U T::*));\n+ memcpy (v, &mp, sizeof (U T::*));\n+ lua_pushcclosure (L, &propsetProxy <T, U>, 2);\n+ rawsetfield (L, -2, name);\n+ lua_pop (L, 2);\n return *this;\n }\n \n- template <typename U>\n- class__ <T>& property_rw (char const *name, U (T::*get) () const, void (T::*set) (U))\n- {\n- property_ro<U>(name, get);\n- luaL_getmetatable(L, this->name.c_str());\n- rawgetfield(L, -1, \"__propset\");\n- lua_pushstring(L, this->name.c_str());\n- typedef void (T::*MemFn) (U);\n- void *v = lua_newuserdata(L, sizeof(MemFn));\n- memcpy(v, &set, sizeof(MemFn));\n- lua_pushcclosure(L, &methodProxy <MemFn>::func, 2);\n- rawsetfield(L, -2, name);\n- lua_pop(L, 2);\n+ \/\/----------------------------------------------------------------------------\n+ \/**\n+ Register a read\/write property using get\/set functions.\n+ *\/\n+ template <class U>\n+ class__ <T>& property_rw (char const* name, U (T::* get) () const, void (T::* set) (U))\n+ {\n+ property_ro <U> (name, get);\n+ luaL_getmetatable (L, this->name.c_str ());\n+ rawgetfield (L, -1, \"__propset\");\n+ lua_pushstring (L, this->name.c_str ());\n+ typedef void (T::* MemFn) (U);\n+ void* const v = lua_newuserdata (L, sizeof (MemFn));\n+ memcpy (v, &set, sizeof (MemFn));\n+ lua_pushcclosure (L, &methodProxy <MemFn>::func, 2);\n+ rawsetfield (L, -2, name);\n+ lua_pop (L, 2);\n return *this;\n }\n+\n+ \/\/----------------------------------------------------------------------------\n \n \/\/ Static method registration\n template <typename MemFn>\n"} {"commit":"0f4b9e8000105d978155f171718cb821514ef5d1","subject":"Add overloads of the 'tryAssign' function for diagonal matrices","message":"Add overloads of the 'tryAssign' function for diagonal matrices\n","repos":"byzhang\/blaze,byzhang\/blaze,byzhang\/blaze","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/adaptors\/DiagonalMatrix.h\n+++ blaze\/math\/adaptors\/DiagonalMatrix.h\n@@ -47,7 +47,9 @@\n #include <blaze\/math\/adaptors\/strictlylowermatrix\/BaseTemplate.h>\n #include <blaze\/math\/adaptors\/strictlyuppermatrix\/BaseTemplate.h>\n #include <blaze\/math\/adaptors\/uppermatrix\/BaseTemplate.h>\n+#include <blaze\/math\/constraints\/RequiresEvaluation.h>\n #include <blaze\/math\/Forward.h>\n+#include <blaze\/math\/shims\/IsDefault.h>\n #include <blaze\/math\/traits\/AddTrait.h>\n #include <blaze\/math\/traits\/ColumnTrait.h>\n #include <blaze\/math\/traits\/DerestrictTrait.h>\n@@ -68,7 +70,9 @@\n #include <blaze\/math\/typetraits\/IsUpper.h>\n #include <blaze\/math\/typetraits\/RemoveAdaptor.h>\n #include <blaze\/math\/typetraits\/Rows.h>\n+#include <blaze\/util\/Assert.h>\n #include <blaze\/util\/constraints\/Numeric.h>\n+#include <blaze\/util\/Unused.h>\n \n \n namespace blaze {\n@@ -206,6 +210,392 @@\n \n \/\/*************************************************************************************************\n \/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a dense vector to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side dense vector to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename VT > \/\/ Type of the right-hand side dense vector\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT,SO,DF>& lhs,\n+ const DenseVector<VT,false>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( VT );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.rows() - row, \"Invalid number of rows\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ const size_t index( ( column <= row )?( 0UL ):( column - row ) );\n+\n+ for( size_t i=0UL; i<index; ++i ) {\n+ if( !isDefault( (~rhs)[i] ) )\n+ return false;\n+ }\n+\n+ for( size_t i=index+1UL; i<(~rhs).size(); ++i ) {\n+ if( !isDefault( (~rhs)[i] ) )\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a dense vector to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side dense vector to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename VT > \/\/ Type of the right-hand side dense vector\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT,SO,DF>& lhs,\n+ const DenseVector<VT,true>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( VT );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ const size_t index( ( row <= column )?( 0UL ):( row - column ) );\n+\n+ for( size_t i=0UL; i<index; ++i ) {\n+ if( !isDefault( (~rhs)[i] ) )\n+ return false;\n+ }\n+\n+ for( size_t i=index+1UL; i<(~rhs).size(); ++i ) {\n+ if( !isDefault( (~rhs)[i] ) )\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a sparse vector to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side sparse vector to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename VT > \/\/ Type of the right-hand side sparse vector\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT,SO,DF>& lhs,\n+ const SparseVector<VT,false>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( VT );\n+\n+ BLAZE_INTERNAL_ASSERT( row < (~lhs).rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < (~lhs).columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.rows() - row, \"Invalid number of rows\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ typedef typename VT::ConstIterator RhsIterator;\n+\n+ const size_t index( column - row );\n+\n+ for( RhsIterator element=(~rhs).begin(); element!=(~rhs).end(); ++element ) {\n+ if( element->index() != index && !isDefault( element->value() ) )\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a sparse vector to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side sparse vector to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename VT > \/\/ Type of the right-hand side sparse vector\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT,SO,DF>& lhs,\n+ const SparseVector<VT,true>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( VT );\n+\n+ BLAZE_INTERNAL_ASSERT( row < (~lhs).rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < (~lhs).columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).size() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ typedef typename VT::ConstIterator RhsIterator;\n+\n+ const size_t index( row - column );\n+\n+ for( RhsIterator element=(~rhs).begin(); element!=(~rhs).end(); ++element ) {\n+ if( element->index() != index && !isDefault( element->value() ) )\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a dense matrix to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side dense matrix to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT1 \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename MT2 > \/\/ Type of the right-hand side dense matrix\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT1,SO,DF>& lhs,\n+ const DenseMatrix<MT2,false>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( MT2 );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).rows() <= lhs.rows() - row, \"Invalid number of rows\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).columns() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ const size_t M( (~rhs).rows() );\n+ const size_t N( (~rhs).columns() );\n+\n+ for( size_t i=0UL; i<M; ++i ) {\n+ for( size_t j=0UL; j<N; ++j ) {\n+ if( ( row + i != column + j ) && !isDefault( (~rhs)(i,j) ) )\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a dense matrix to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side dense matrix to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT1 \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename MT2 > \/\/ Type of the right-hand side dense matrix\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT1,SO,DF>& lhs,\n+ const DenseMatrix<MT2,true>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( MT2 );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).rows() <= lhs.rows() - row, \"Invalid number of rows\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).columns() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ const size_t M( (~rhs).rows() );\n+ const size_t N( (~rhs).columns() );\n+\n+ for( size_t j=0UL; j<N; ++j ) {\n+ for( size_t i=0UL; i<M; ++i ) {\n+ if( ( column + j != row + i ) && !isDefault( (~rhs)(i,j) ) )\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a sparse matrix to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side sparse matrix to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT1 \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename MT2 > \/\/ Type of the right-hand side sparse matrix\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT1,SO,DF>& lhs,\n+ const SparseMatrix<MT2,false>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( MT2 );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).rows() <= lhs.rows() - row, \"Invalid number of rows\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).columns() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ typedef typename MT2::ConstIterator RhsIterator;\n+\n+ const size_t M( (~rhs).rows() );\n+ const size_t N( (~rhs).columns() );\n+\n+ for( size_t i=0UL; i<M; ++i ) {\n+ for( RhsIterator element=(~rhs).begin(i); element!=(~rhs).end(i); ++element ) {\n+ if( ( row + i != column + element->index() ) && !isDefault( element->value() ) )\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+\/*!\\brief Predict invariant violations by the assignment of a sparse matrix to a diagonal matrix.\n+\/\/ \\ingroup diagonal_matrix\n+\/\/\n+\/\/ \\param lhs The target left-hand side diagonal matrix.\n+\/\/ \\param rhs The right-hand side sparse matrix to be assigned.\n+\/\/ \\param row The row index of the first element to be modified.\n+\/\/ \\param column The column index of the first element to be modified.\n+\/\/ \\return \\a true in case the assignment would be successful, \\a false if not.\n+\/\/\n+\/\/ This function must \\b NOT be called explicitly! It is used internally for the performance\n+\/\/ optimized evaluation of expression templates. Calling this function explicitly might result\n+\/\/ in erroneous results and\/or in compilation errors. Instead of using this function use the\n+\/\/ assignment operator.\n+*\/\n+template< typename MT1 \/\/ Type of the adapted matrix\n+ , bool SO \/\/ Storage order of the adapted matrix\n+ , bool DF \/\/ Density flag\n+ , typename MT2 > \/\/ Type of the right-hand side sparse matrix\n+BLAZE_ALWAYS_INLINE bool tryAssign( const DiagonalMatrix<MT1,SO,DF>& lhs,\n+ const SparseMatrix<MT2,true>& rhs, size_t row, size_t column )\n+{\n+ BLAZE_CONSTRAINT_MUST_NOT_REQUIRE_EVALUATION( MT2 );\n+\n+ BLAZE_INTERNAL_ASSERT( row < lhs.rows(), \"Invalid row access index\" );\n+ BLAZE_INTERNAL_ASSERT( column < lhs.columns(), \"Invalid column access index\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).rows() <= lhs.rows() - row, \"Invalid number of rows\" );\n+ BLAZE_INTERNAL_ASSERT( (~rhs).columns() <= lhs.columns() - column, \"Invalid number of columns\" );\n+\n+ UNUSED_PARAMETER( lhs );\n+\n+ typedef typename MT2::ConstIterator RhsIterator;\n+\n+ const size_t M( (~rhs).rows() );\n+ const size_t N( (~rhs).columns() );\n+\n+ for( size_t j=0UL; j<N; ++j ) {\n+ for( RhsIterator element=(~rhs).begin(j); element!=(~rhs).end(j); ++element ) {\n+ if( ( column + j != row + element->index() ) && !isDefault( element->value() ) )\n+ return false;\n+ }\n+ }\n+\n+ return true;\n+}\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n \/*!\\brief Returns a reference to the instance without the access restrictions to the lower and\n \/\/ upper part.\n \/\/ \\ingroup math_shims\n"} {"commit":"997a9aae1060baf9727b98ebc29ba7a1f0ead15c","subject":"Optimize the assignment of empty sparse matrices to a 'CompressedMatrix'","message":"Optimize the assignment of empty sparse matrices to a 'CompressedMatrix'\n","repos":"lsalamon\/blaze-lib,dorofiykolya\/blaze-lib,nyotis\/blaze-lib,wsavoie\/blaze-lib,davidebaltieri31\/blaze-lib,ColinGilbert\/blaze-lib,ceramos\/blaze-lib,dylanede\/blaze-lib,wdv4758h\/blaze-lib,amaniak\/blaze-lib,honnibal\/blaze-lib,wsavoie\/blaze-lib,dylanede\/blaze-lib,wdv4758h\/blaze-lib,Manu343726\/blaze-lib,dylanede\/blaze-lib,ColinGilbert\/blaze-lib,ceramos\/blaze-lib,dorofiykolya\/blaze-lib,lsalamon\/blaze-lib,benjamingr\/blaze-lib,honnibal\/blaze-lib,amaniak\/blaze-lib,byzhang\/blaze,davidebaltieri31\/blaze-lib,yzxyzh\/blaze-lib,benjamingr\/blaze-lib,ironm73\/blaze-lib,lsalamon\/blaze-lib,ironm73\/blaze-lib,yzxyzh\/blaze-lib,wdv4758h\/blaze-lib,honnibal\/blaze-lib,byzhang\/blaze,amaniak\/blaze-lib,gnzlbg\/blaze-lib,dorofiykolya\/blaze-lib,wsavoie\/blaze-lib,nyotis\/blaze-lib,Manu343726\/blaze-lib,byzhang\/blaze,nyotis\/blaze-lib,ironm73\/blaze-lib,ColinGilbert\/blaze-lib,davidebaltieri31\/blaze-lib,Manu343726\/blaze-lib,yzxyzh\/blaze-lib,gnzlbg\/blaze-lib,benjamingr\/blaze-lib,gnzlbg\/blaze-lib,ceramos\/blaze-lib","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/sparse\/CompressedMatrix.h\n+++ blaze\/math\/sparse\/CompressedMatrix.h\n@@ -2253,8 +2253,12 @@\n BLAZE_INTERNAL_ASSERT( m_ == (~rhs).rows() , \"Invalid number of rows\" );\n BLAZE_INTERNAL_ASSERT( n_ == (~rhs).columns(), \"Invalid number of columns\" );\n BLAZE_INTERNAL_ASSERT( nonZeros() == 0UL, \"Invalid non-zero elements detected\" );\n-\n- for( size_t i=0UL; i<(~rhs).rows(); ++i ) {\n+ BLAZE_INTERNAL_ASSERT( capacity() >= (~rhs).nonZeros(), \"Invalid capacity detected\" );\n+\n+ if( m_ == 0UL || begin_[0] == NULL )\n+ return;\n+\n+ for( size_t i=0UL; i<m_; ++i ) {\n begin_[i+1UL] = end_[i] = std::copy( (~rhs).begin(i), (~rhs).end(i), begin_[i] );\n }\n }\n@@ -2282,6 +2286,7 @@\n BLAZE_INTERNAL_ASSERT( m_ == (~rhs).rows() , \"Invalid number of rows\" );\n BLAZE_INTERNAL_ASSERT( n_ == (~rhs).columns(), \"Invalid number of columns\" );\n BLAZE_INTERNAL_ASSERT( nonZeros() == 0UL, \"Invalid non-zero elements detected\" );\n+ BLAZE_INTERNAL_ASSERT( capacity() >= (~rhs).nonZeros(), \"Invalid capacity detected\" );\n \n typedef typename MT::ConstIterator RhsIterator;\n \n@@ -4480,8 +4485,12 @@\n BLAZE_INTERNAL_ASSERT( m_ == (~rhs).rows() , \"Invalid number of rows\" );\n BLAZE_INTERNAL_ASSERT( n_ == (~rhs).columns(), \"Invalid number of columns\" );\n BLAZE_INTERNAL_ASSERT( nonZeros() == 0UL, \"Invalid non-zero elements detected\" );\n-\n- for( size_t j=0UL; j<(~rhs).columns(); ++j ) {\n+ BLAZE_INTERNAL_ASSERT( capacity() >= (~rhs).nonZeros(), \"Invalid capacity detected\" );\n+\n+ if( n_ == 0UL || begin_[0] == NULL )\n+ return;\n+\n+ for( size_t j=0UL; j<n_; ++j ) {\n begin_[j+1UL] = end_[j] = std::copy( (~rhs).begin(j), (~rhs).end(j), begin_[j] );\n }\n }\n@@ -4510,6 +4519,7 @@\n BLAZE_INTERNAL_ASSERT( m_ == (~rhs).rows() , \"Invalid number of rows\" );\n BLAZE_INTERNAL_ASSERT( n_ == (~rhs).columns(), \"Invalid number of columns\" );\n BLAZE_INTERNAL_ASSERT( nonZeros() == 0UL, \"Invalid non-zero elements detected\" );\n+ BLAZE_INTERNAL_ASSERT( capacity() >= (~rhs).nonZeros(), \"Invalid capacity detected\" );\n \n typedef typename MT::ConstIterator RhsIterator;\n \n"} {"commit":"c72c47b9f7e65ed309c43765a2a38403087eaf2c","subject":"Fix error with strtok delimiters.","message":"Fix error with strtok delimiters.\n","repos":"iotauth\/iotauth,iotauth\/iotauth,iotauth\/iotauth,iotauth\/iotauth,iotauth\/iotauth,iotauth\/iotauth","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- entity\/c\/load_config.c\n+++ entity\/c\/load_config.c\n@@ -44,6 +44,7 @@\n 0,\n };\n char *pline;\n+ static const char delimiters[] = \" \\n\";\n \n printf(\"--config--\\n\");\n while (!feof(fp)) {\n@@ -53,54 +54,53 @@\n while (ptr != NULL) {\n switch (get_key_value(ptr)) {\n case ENTITY_INFO_NAME:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"name: %s\", ptr);\n strcpy(c->name, ptr);\n break;\n case ENTITY_INFO_PURPOSE:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"purpose: %s\", ptr);\n strcpy(c->purpose, ptr);\n break;\n case ENTITY_INFO_NUMKEY:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"Numkey: %s\", ptr);\n c->numkey = atoi((const char *)ptr);\n break;\n case AUTH_INFO_PUBKEY_PATH:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"Pubkey path of Auth: %s\", ptr);\n c->auth_pubkey_path = malloc(strlen(ptr) - 1);\n memcpy(c->auth_pubkey_path, ptr, strlen(ptr) - 1);\n break;\n case ENTITY_INFO_PRIVKEY_PATH:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"Privkey path of Entity: %s\", ptr);\n c->entity_privkey_path = malloc(strlen(ptr) - 1);\n memcpy(c->entity_privkey_path, ptr, strlen(ptr) - 1);\n break;\n case AUTH_INFO_IP_ADDRESS:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"IP address of Auth: %s\", ptr);\n strcpy(c->auth_ip_addr, ptr);\n break;\n case AUTH_INFO_PORT:\n- ptr = strtok(NULL, \" \");\n- printf(\"Port number of Auth: %s\", ptr);\n+ ptr = strtok(NULL, delimiters);\n strcpy(c->auth_port_num, ptr);\n break;\n case ENTITY_SERVER_INFO_IP_ADDRESS:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"IP address of entity server: %s\", ptr);\n strcpy(c->entity_server_ip_addr, ptr);\n break;\n case ENTITY_SERVER_INFO_PORT_NUMBER:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"Port number of entity server: %s\", ptr);\n strcpy(c->entity_server_port_num, ptr);\n break;\n case NETWORK_PROTOCOL:\n- ptr = strtok(NULL, \" \");\n+ ptr = strtok(NULL, delimiters);\n printf(\"Network Protocol: %s\\n\", ptr);\n strcpy(c->network_protocol, ptr);\n break;\n"} {"commit":"5558a7e0ebaf358e07d47ab6c62caea34d5fd139","subject":"If NO_DYNAMIC_LINK is defined, load_dynamic_module() will always fail.","message":"If NO_DYNAMIC_LINK is defined, load_dynamic_module() will always fail.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Python\/importdl.c\n+++ Python\/importdl.c\n@@ -213,6 +213,10 @@\n \t{\".pyc\", \"rb\", PY_COMPILED},\n \t{0, 0}\n };\n+\n+#ifdef NO_DYNAMIC_LINK\n+#undef DYNAMIC_LINK\n+#endif\n \n object *\n load_dynamic_module(name, pathname, fp)\n"} {"commit":"c722b4f861b26cfa093c3dabab0d62a6e5f07340","subject":"boards\/chronos: remove UART config","message":"boards\/chronos: remove UART config\n","repos":"kYc0o\/RIOT,miri64\/RIOT,kYc0o\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,jasonatran\/RIOT,ant9000\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,jasonatran\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,ant9000\/RIOT,jasonatran\/RIOT,kaspar030\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,jasonatran\/RIOT,authmillenon\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,ant9000\/RIOT,RIOT-OS\/RIOT,RIOT-OS\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,OTAkeys\/RIOT,kYc0o\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- boards\/chronos\/include\/periph_conf.h\n+++ boards\/chronos\/include\/periph_conf.h\n@@ -50,21 +50,7 @@\n * @name UART configuration\n * @{\n *\/\n-#define UART_NUMOF (1U)\n-#define UART_0_EN (1U)\n-\n-#define UART_DEV (USART_1)\n-#define UART_IE (SFR->IE2)\n-#define UART_IF (SFR->IFG2)\n-#define UART_IE_RX_BIT (1 << 4)\n-#define UART_IE_TX_BIT (1 << 5)\n-#define UART_ME (SFR->ME2)\n-#define UART_ME_BITS (0x30)\n-#define UART_PORT (PORT_3)\n-#define UART_RX_PIN (1 << 6)\n-#define UART_TX_PIN (1 << 7)\n-#define UART_RX_ISR (USART1RX_VECTOR)\n-#define UART_TX_ISR (USART1TX_VECTOR)\n+#define UART_NUMOF (0U)\n \/** @} *\/\n \n \n"} {"commit":"d906d5aef8409d6b1872ffefd1b64ea47511fee4","subject":"boards\/mcb2388: configure second SPI bus","message":"boards\/mcb2388: configure second SPI bus\n\nSPI0 will always clash with the pins of the LCD display, so if we\nwant to use both SPI and the display we need to use SPI1.\n","repos":"OTAkeys\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,OlegHahm\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,miri64\/RIOT,authmillenon\/RIOT,basilfx\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,basilfx\/RIOT,kYc0o\/RIOT,miri64\/RIOT,RIOT-OS\/RIOT,RIOT-OS\/RIOT,basilfx\/RIOT,basilfx\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,kaspar030\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,OTAkeys\/RIOT,kYc0o\/RIOT,jasonatran\/RIOT,basilfx\/RIOT,jasonatran\/RIOT,miri64\/RIOT,kYc0o\/RIOT,OlegHahm\/RIOT,ant9000\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,ant9000\/RIOT,kYc0o\/RIOT,ant9000\/RIOT,jasonatran\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- boards\/mcb2388\/include\/periph_conf.h\n+++ boards\/mcb2388\/include\/periph_conf.h\n@@ -20,6 +20,7 @@\n #define PERIPH_CONF_H\n \n #include \"periph_cpu.h\"\n+#include \"kernel_defines.h\"\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -83,9 +84,18 @@\n .pinsel_msk_miso = (BIT14 | BIT15), \/* P1.23 *\/\n .pinsel_msk_clk = (BIT8 | BIT9), \/* P1.20 *\/\n },\n+ {\n+ .dev = SPI1,\n+ .pinsel_mosi = 0,\n+ .pinsel_miso = 0,\n+ .pinsel_clk = 0,\n+ .pinsel_msk_mosi = (BIT19), \/* P0.9 *\/\n+ .pinsel_msk_miso = (BIT17), \/* P0.8 *\/\n+ .pinsel_msk_clk = (BIT15), \/* P0.7 *\/\n+ },\n };\n \n-#define SPI_NUMOF (1)\n+#define SPI_NUMOF ARRAY_SIZE(spi_config)\n \/** @} *\/\n \n \/**\n"} {"commit":"c07fbc916f997f7a4ebbbcb875c24b9214dd7e9c","subject":"Format","message":"Format\n","repos":"mrlitong\/fpsgame,mrlitong\/fpsgame,mrlitong\/Game-Engine-Development-Usage,mrlitong\/fpsgame","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- MoveDummy.h\n+++ MoveDummy.h\n@@ -38,8 +38,9 @@\n \tvoid SetUp(const MathLib::vec3& u);\n \tconst MathLib::vec3& GetUp() const;\n \n-\tvoid SetEnabled(int e);\n-\tint GetEnabled() const;\n+\tvoid\tSetEnabled(int e);\n+\tint\t\tGetEnabled() const;\n+\n \n \n \n"} {"commit":"22e9f750236d823986ce02bcd68eccb01e1fc820","subject":"removed unused stuff from scanf and printf","message":"removed unused stuff from scanf and printf\n","repos":"rrbutani\/Rasware,rrbutani\/Rasware,mcasterlin\/Rasware,mcasterlin\/Rasware","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- RASLib\/src\/uart.c\n+++ RASLib\/src\/uart.c\n@@ -191,7 +191,6 @@\n unsigned int braket_len;\n unsigned int * i_ptr;\n float * f_ptr;\n- float f_tmp;\n va_list ap;\n va_start(ap, formatString);\n while (formatString[++i] != '\\0') {\n@@ -245,7 +244,6 @@\n \t goto octal; } }\n \telse\n \t goto decimal;\n-\tbreak;\n case 'o':\n octal:\n \ti_ptr = va_arg(ap, unsigned int *);\n@@ -545,7 +543,6 @@\n PutString(\"inf\", left, width, 3);\n } else {\n float exp = floorf(log10f(f));\n- float base = f \/ powf(10, exp);\n \n int height;\n if (left) {\n"} {"commit":"6bf5b3e771cf56ba11a27219ce6df3a21d5c5d13","subject":"(minor) raw socket test","message":"(minor) raw socket test","repos":"gzoom13\/embox,mike2390\/embox,Kefir0192\/embox,embox\/embox,gzoom13\/embox,mike2390\/embox,Kefir0192\/embox,Kakadu\/embox,abusalimov\/embox,Kakadu\/embox,gzoom13\/embox,vrxfile\/embox-trik,mike2390\/embox,gzoom13\/embox,embox\/embox,abusalimov\/embox,Kefir0192\/embox,vrxfile\/embox-trik,abusalimov\/embox,embox\/embox,mike2390\/embox,vrxfile\/embox-trik,vrxfile\/embox-trik,abusalimov\/embox,Kefir0192\/embox,vrxfile\/embox-trik,Kefir0192\/embox,Kakadu\/embox,embox\/embox,gzoom13\/embox,mike2390\/embox,mike2390\/embox,abusalimov\/embox,vrxfile\/embox-trik,mike2390\/embox,gzoom13\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,embox\/embox,Kefir0192\/embox,vrxfile\/embox-trik,Kefir0192\/embox,embox\/embox,gzoom13\/embox,abusalimov\/embox,Kakadu\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/tests\/net\/raw_socket_test.c\n+++ src\/tests\/net\/raw_socket_test.c\n@@ -19,7 +19,7 @@\n #include <net\/netdevice.h>\n #include <net\/l3\/route.h>\n \n-EMBOX_TEST_SUITE(\"inet raw socket test\");\n+EMBOX_TEST_SUITE(\"raw socket test\");\n \n TEST_SETUP_SUITE(suite_setup);\n TEST_TEARDOWN_SUITE(suite_teardown);\n@@ -39,7 +39,7 @@\n \treturn (struct sockaddr *) sa_in;\n }\n \n-TEST_CASE(\"raw socket with IPPROTO_RAW could \") {\n+TEST_CASE(\"raw socket with IPPROTO_RAW can send and receive\") {\n \tchar packet[sizeof(struct iphdr) + 1];\n \t\/* point the iphdr to the beginning of the packet *\/\n \tstruct iphdr *ip = (struct iphdr *) packet;\n@@ -81,7 +81,7 @@\n \t}\n \n \taddr.sin_family = AF_INET;\n-\taddr.sin_addr.s_addr = htonl(INADDR_ANY);\n+\taddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);\n \taddr.sin_port = htons(PORT);\n \taddrlen = sizeof addr;\n \n@@ -92,8 +92,6 @@\n \tif (-1 == fcntl(b, F_SETFD, O_NONBLOCK)) {\n \t\treturn -errno;\n \t}\n-\n-\taddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);\n \n \treturn 0;\n }\n"} {"commit":"61421658bf212c6d6893c4b4cff5ced1886d1772","subject":"\u5220\u9664\u591a\u4f59\u4ee3\u7801","message":"\u5220\u9664\u591a\u4f59\u4ee3\u7801\n","repos":"lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gui\/widget\/button.c\n+++ src\/gui\/widget\/button.c\n@@ -1,42 +1,42 @@\n \/* ***************************************************************************\r\n * button.c -- LCUI\u2018s Button widget\r\n- * \r\n+ *\r\n * Copyright (C) 2012-2013 by\r\n * Liu Chao\r\n- * \r\n+ *\r\n * This file is part of the LCUI project, and may only be used, modified, and\r\n * distributed under the terms of the GPLv2.\r\n- * \r\n+ *\r\n * (GPLv2 is abbreviation of GNU General Public License Version 2)\r\n- * \r\n+ *\r\n * By continuing to use, modify, or distribute this file you indicate that you\r\n * have read the license and understand and accept it fully.\r\n- * \r\n- * The LCUI project is distributed in the hope that it will be useful, but \r\n- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY \r\n+ *\r\n+ * The LCUI project is distributed in the hope that it will be useful, but\r\n+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r\n * or FITNESS FOR A PARTICULAR PURPOSE. See the GPL v2 for more details.\r\n- * \r\n- * You should have received a copy of the GPLv2 along with this file. It is \r\n+ *\r\n+ * You should have received a copy of the GPLv2 along with this file. It is\r\n * usually in the LICENSE.TXT file, If not, see <http:\/\/www.gnu.org\/licenses\/>.\r\n * ****************************************************************************\/\r\n- \r\n+\r\n \/* ****************************************************************************\r\n * button.c -- LCUI \u7684\u6309\u94ae\u90e8\u4ef6\r\n *\r\n * \u7248\u6743\u6240\u6709 (C) 2012-2013 \u5f52\u5c5e\u4e8e\r\n * \u5218\u8d85\r\n- * \r\n+ *\r\n * \u8fd9\u4e2a\u6587\u4ef6\u662fLCUI\u9879\u76ee\u7684\u4e00\u90e8\u5206\uff0c\u5e76\u4e14\u53ea\u53ef\u4ee5\u6839\u636eGPLv2\u8bb8\u53ef\u534f\u8bae\u6765\u4f7f\u7528\u3001\u66f4\u6539\u548c\u53d1\u5e03\u3002\r\n *\r\n * (GPLv2 \u662f GNU\u901a\u7528\u516c\u5171\u8bb8\u53ef\u8bc1\u7b2c\u4e8c\u7248 \u7684\u82f1\u6587\u7f29\u5199)\r\n- * \r\n+ *\r\n * \u7ee7\u7eed\u4f7f\u7528\u3001\u4fee\u6539\u6216\u53d1\u5e03\u672c\u6587\u4ef6\uff0c\u8868\u660e\u60a8\u5df2\u7ecf\u9605\u8bfb\u5e76\u5b8c\u5168\u7406\u89e3\u548c\u63a5\u53d7\u8fd9\u4e2a\u8bb8\u53ef\u534f\u8bae\u3002\r\n- * \r\n+ *\r\n * LCUI \u9879\u76ee\u662f\u57fa\u4e8e\u4f7f\u7528\u76ee\u7684\u800c\u52a0\u4ee5\u6563\u5e03\u7684\uff0c\u4f46\u4e0d\u8d1f\u4efb\u4f55\u62c5\u4fdd\u8d23\u4efb\uff0c\u751a\u81f3\u6ca1\u6709\u9002\u9500\u6027\u6216\u7279\r\n * \u5b9a\u7528\u9014\u7684\u9690\u542b\u62c5\u4fdd\uff0c\u8be6\u60c5\u8bf7\u53c2\u7167GPLv2\u8bb8\u53ef\u534f\u8bae\u3002\r\n *\r\n * \u60a8\u5e94\u5df2\u6536\u5230\u9644\u968f\u4e8e\u672c\u6587\u4ef6\u7684GPLv2\u8bb8\u53ef\u534f\u8bae\u7684\u526f\u672c\uff0c\u5b83\u901a\u5e38\u5728LICENSE.TXT\u6587\u4ef6\u4e2d\uff0c\u5982\u679c\r\n- * \u6ca1\u6709\uff0c\u8bf7\u67e5\u770b\uff1a<http:\/\/www.gnu.org\/licenses\/>. \r\n+ * \u6ca1\u6709\uff0c\u8bf7\u67e5\u770b\uff1a<http:\/\/www.gnu.org\/licenses\/>.\r\n * ****************************************************************************\/\r\n \/\/#define DEBUG\r\n #include <LCUI_Build.h>\r\n@@ -84,7 +84,7 @@\n {\r\n \tLCUI_Button *btn;\r\n \tLCUI_Graph *img;\r\n-\t\r\n+\r\n \tbtn = Widget_GetPrivData( widget );\r\n \tswitch(widget->state) {\r\n \tcase WIDGET_STATE_NORMAL: img = &btn->btn_normal; break;\r\n@@ -127,7 +127,7 @@\n \t\tcolor = RGB(153,61,61);\r\n \t\tbreak;\r\n \tcase WIDGET_STATE_DISABLE :\r\n-\t\tcolor = color = RGB(199,80,80);\r\n+\t\tcolor = RGB(199,80,80);\r\n \t\tbreak;\r\n \t\tdefault : break;\r\n \t}\r\n@@ -153,7 +153,7 @@\n \tWidget_Refresh( widget );\r\n }\r\n \r\n-static void \r\n+static void\r\n Button_ProcFocusOut( LCUI_Widget *widget, LCUI_WidgetEvent *unused )\r\n {\r\n \tWidget_Update( widget );\r\n@@ -166,19 +166,19 @@\n {\r\n \tint valid_state;\r\n \tLCUI_Button *button;\r\n-\t\r\n+\r\n \tbutton = WidgetPrivData_New(widget, sizeof(LCUI_Button));\r\n-\t\/* \u521d\u59cb\u5316\u56fe\u50cf\u6570\u636e *\/ \r\n+\t\/* \u521d\u59cb\u5316\u56fe\u50cf\u6570\u636e *\/\r\n \tGraph_Init(&button->btn_disable);\r\n \tGraph_Init(&button->btn_normal);\r\n \tGraph_Init(&button->btn_focus);\r\n \tGraph_Init(&button->btn_down);\r\n \tGraph_Init(&button->btn_over);\r\n-\t\r\n+\r\n \tvalid_state = (WIDGET_STATE_NORMAL | WIDGET_STATE_ACTIVE);\r\n \tvalid_state |= (WIDGET_STATE_DISABLE | WIDGET_STATE_OVERLAY);\r\n \tWidget_SetValidState( widget, valid_state );\r\n-\tbutton->label = Widget_New(\"label\");\/* \u521b\u5efalabel\u90e8\u4ef6 *\/ \r\n+\tbutton->label = Widget_New(\"label\");\/* \u521b\u5efalabel\u90e8\u4ef6 *\/\r\n \t\/* \u5c06\u6309\u94ae\u90e8\u4ef6\u4f5c\u4e3alabel\u90e8\u4ef6\u7684\u5bb9\u5668 *\/\r\n \tWidget_Container_Add(widget, button->label);\r\n \t\/* label\u90e8\u4ef6\u5c45\u4e2d\u663e\u793a *\/\r\n@@ -201,8 +201,8 @@\n \r\n \/* \u81ea\u5b9a\u4e49\u6309\u94ae\u5728\u5404\u79cd\u72b6\u6001\u4e0b\u663e\u793a\u7684\u4f4d\u56fe *\/\r\n LCUI_API void\r\n-Button_CustomStyle(\tLCUI_Widget *widget, LCUI_Graph *normal, \r\n-\t\t\tLCUI_Graph *over, LCUI_Graph *down, \r\n+Button_CustomStyle(\tLCUI_Widget *widget, LCUI_Graph *normal,\r\n+\t\t\tLCUI_Graph *over, LCUI_Graph *down,\r\n \t\t\tLCUI_Graph *focus, LCUI_Graph *disable)\r\n {\r\n \tLCUI_Button *btn_data;\r\n@@ -243,7 +243,7 @@\n {\r\n \tLCUI_Button *button;\r\n \tLCUI_Widget *label;\r\n-\t\r\n+\r\n \tbutton = (LCUI_Button*)Widget_GetPrivData(widget);\r\n \tlabel = button->label;\r\n \t\/* \u8bbe\u5b9a\u90e8\u4ef6\u663e\u793a\u7684\u6587\u672c *\/\r\n@@ -255,7 +255,7 @@\n {\r\n \tLCUI_Button *button;\r\n \tLCUI_Widget *label;\r\n-\t\r\n+\r\n \tbutton = (LCUI_Button*)Widget_GetPrivData(widget);\r\n \tlabel = button->label;\r\n \tLabel_TextW( label, text );\r\n@@ -277,7 +277,7 @@\n {\r\n \t\/* \u6dfb\u52a0\u90e8\u4ef6\u7c7b\u578b *\/\r\n \tWidgetType_Add(\"button\");\r\n-\t\r\n+\r\n \t\/* \u4e3a\u90e8\u4ef6\u7c7b\u578b\u5173\u8054\u76f8\u5173\u51fd\u6570 *\/\r\n \tWidgetFunc_Add(\"button\", Button_Init,\t\tFUNC_TYPE_INIT);\r\n \tWidgetFunc_Add(\"button\", Button_ExecUpdate,\tFUNC_TYPE_UPDATE);\r\n"} {"commit":"7ea4f65c1acfc178658294ab8c71cdc24b555f21","subject":"Library: MenuLib: add initialization check","message":"Library: MenuLib: add initialization check\n","repos":"efidroid\/uefi_apps_EFIDroidUi,efidroid\/uefi_apps_EFIDroidUi","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Library\/MenuLib\/Menu.c\n+++ Library\/MenuLib\/Menu.c\n@@ -7,6 +7,7 @@\n STATIC MENU_OPTION* mActiveMenu = NULL;\r\n STATIC LIBAROMA_CANVASP dc;\r\n STATIC MINLIST *list = NULL;\r\n+STATIC BOOLEAN Initialized = FALSE;\r\n \r\n word colorPrimary;\r\n word colorPrimaryLight;\r\n@@ -581,6 +582,9 @@\n CONST CHAR8* Message\r\n )\r\n {\r\n+ if(Initialized==FALSE)\r\n+ return;\r\n+\r\n libaroma_draw_rect(\r\n dc, 0, 0, dc->w, dc->h, RGB(000000), 0x7a\r\n );\r\n@@ -803,6 +807,8 @@\n colorSeparator = RGB(555555);\r\n colorBackground = RGB(212121);\r\n #endif\r\n+\r\n+ Initialized = TRUE;\r\n }\r\n \r\n VOID\r\n@@ -876,6 +882,7 @@\n VOID\r\n )\r\n {\r\n+ Initialized = FALSE;\r\n AromaRelease();\r\n mGop->SetMode(mGop, OldMode);\r\n gLKDisplay->SetFlushMode(gLKDisplay, OldFlushMode);\r\n"} {"commit":"e756333daca3c95e6b84d1fb778f834392cf12ba","subject":"hyperv: Silence clang alignment warnings in serialization code","message":"hyperv: Silence clang alignment warnings in serialization code\n\nSlight refactor of the WMI serialization code to minimize mixing\nopenwsman and libxml2 APIs that triggered clang alignment warnings.\n\nThe only usage of libxml2 APIs now is in creating CDATA blocks,\nbecause the openwsman API does not provide that functionality. The\nclang alignment warning in this case is silenced by casting to a\nvoid pointer first.\n","repos":"zippy2\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,datto\/libvirt,jardasgit\/libvirt,datto\/libvirt,eskultety\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,libvirt\/libvirt,olafhering\/libvirt,eskultety\/libvirt,crobinso\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,datto\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,datto\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,nertpinx\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/hyperv\/hyperv_wmi.c\n+++ src\/hyperv\/hyperv_wmi.c\n@@ -489,17 +489,14 @@\n \n static int\n hypervSerializeEprParam(hypervParamPtr p, hypervPrivate *priv,\n- const char *resourceUri, WsXmlDocH doc, WsXmlNodeH *methodNode)\n+ const char *resourceUri, WsXmlNodeH *methodNode)\n {\n int result = -1;\n WsXmlNodeH xmlNodeParam = NULL,\n xmlNodeTemp = NULL,\n xmlNodeAddr = NULL,\n xmlNodeRef = NULL;\n- xmlNodePtr xmlNodeAddrPtr = NULL,\n- xmlNodeRefPtr = NULL;\n WsXmlDocH xmlDocResponse = NULL;\n- xmlDocPtr docPtr = (xmlDocPtr) doc->parserDoc;\n WsXmlNsH ns = NULL;\n client_opt_t *options = NULL;\n filter_t *filter = NULL;\n@@ -573,21 +570,10 @@\n goto cleanup;\n }\n \n- if (!(xmlNodeAddrPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeAddr, docPtr, 1))) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\", _(\"Could not copy EPR address\"));\n- goto cleanup;\n- }\n-\n if (!(xmlNodeRef = ws_xml_get_child(xmlNodeTemp, 0, XML_NS_ADDRESSING,\n WSA_REFERENCE_PARAMETERS))) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Could not lookup EPR item reference parameters\"));\n- goto cleanup;\n- }\n-\n- if (!(xmlNodeRefPtr = xmlDocCopyNode((xmlNodePtr) xmlNodeRef, docPtr, 1))) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not copy EPR item reference parameters\"));\n goto cleanup;\n }\n \n@@ -595,7 +581,7 @@\n if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri,\n p->epr.name, NULL))) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not add child node to xmlNodeParam\"));\n+ _(\"Could not add child node to methodNode\"));\n goto cleanup;\n }\n \n@@ -613,23 +599,8 @@\n goto cleanup;\n }\n \n- if (xmlAddChild((xmlNodePtr) *methodNode, (xmlNodePtr) xmlNodeParam) == NULL) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not add child to xml parent node\"));\n- goto cleanup;\n- }\n-\n- if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeAddrPtr) == NULL) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not add child to xml parent node\"));\n- goto cleanup;\n- }\n-\n- if (xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeRefPtr) == NULL) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not add child to xml parent node\"));\n- goto cleanup;\n- }\n+ ws_xml_duplicate_tree(xmlNodeParam, xmlNodeAddr);\n+ ws_xml_duplicate_tree(xmlNodeParam, xmlNodeRef);\n \n \/* we did it! *\/\n result = 0;\n@@ -656,8 +627,7 @@\n xmlNodeArray = NULL;\n WsXmlDocH xmlDocTemp = NULL,\n xmlDocCdata = NULL;\n- xmlBufferPtr xmlBufferNode = NULL;\n- const xmlChar *xmlCharCdataContent = NULL;\n+ char *cdataContent = NULL;\n xmlNodePtr xmlNodeCdata = NULL;\n hypervWmiClassInfoPtr classInfo = p->embedded.info;\n virHashKeyValuePairPtr items = NULL;\n@@ -761,25 +731,22 @@\n }\n \n \/* create CDATA node *\/\n- xmlBufferNode = xmlBufferCreate();\n- if (xmlNodeDump(xmlBufferNode, (xmlDocPtr) xmlDocTemp->parserDoc,\n- (xmlNodePtr) xmlNodeInstance, 0, 0) < 0) {\n- virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n- _(\"Could not get root of temp XML doc\"));\n- goto cleanup;\n- }\n-\n- len = xmlBufferLength(xmlBufferNode);\n- xmlCharCdataContent = xmlBufferContent(xmlBufferNode);\n+ ws_xml_dump_memory_node_tree(xmlNodeInstance, &cdataContent, &len);\n+\n if (!(xmlNodeCdata = xmlNewCDataBlock((xmlDocPtr) xmlDocCdata,\n- xmlCharCdataContent, len))) {\n+ (xmlChar *)cdataContent, len))) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Could not create CDATA element\"));\n goto cleanup;\n }\n \n- \/* Add CDATA node to the doc root *\/\n- if (!(xmlAddChild((xmlNodePtr) xmlNodeParam, xmlNodeCdata))) {\n+ \/*\n+ * Add CDATA node to the doc root\n+ *\n+ * FIXME: there is no openwsman wrapper for xmlNewCDataBlock, so instead\n+ * silence clang alignment warnings by casting to a void pointer first\n+ *\/\n+ if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Could not add CDATA to doc root\"));\n goto cleanup;\n@@ -792,7 +759,7 @@\n VIR_FREE(items);\n ws_xml_destroy_doc(xmlDocCdata);\n ws_xml_destroy_doc(xmlDocTemp);\n- xmlBufferFree(xmlBufferNode);\n+ ws_xml_free_memory(cdataContent);\n return result;\n }\n \n@@ -854,7 +821,7 @@\n break;\n case HYPERV_EPR_PARAM:\n if (hypervSerializeEprParam(p, priv, params->resourceUri,\n- paramsDocRoot, &methodNode) < 0)\n+ &methodNode) < 0)\n goto cleanup;\n break;\n case HYPERV_EMBEDDED_PARAM:\n"} {"commit":"31ab2334b95b3f5b8e13f72602159768033b183a","subject":"byteorder: more typos","message":"byteorder: more typos\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/include\/byteorder.h\n+++ src\/include\/byteorder.h\n@@ -33,11 +33,14 @@\n }\n \n \/\/ mswab == maybe swab (if not LE)\n-#if __BYTEORDER == __BIG_ENDIAN\n+#if __BYTE_ORDER == __BIG_ENDIAN\n # define mswab64(a) swab64(a)\n # define mswab32(a) swab32(a)\n # define mswab16(a) swab16(a)\n #else\n+# if __BYTE_ORDER != __LITTLE_ENDIAN\n+# warning __BYTE_ORDER is not defined, assuming little endian\n+# endif\n # define mswab64(a) (a)\n # define mswab32(a) (a)\n # define mswab16(a) (a)\n"} {"commit":"a74b1615a68c0f335f01df0cefbc61550f8732ae","subject":"eina: @since","message":"eina: @since\n\n\ngit-svn-id: a6113611d365f0fc061992be0d1d0b451b434026@60356 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/eina,jordemort\/eina,jordemort\/eina","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/include\/eina_hash.h\n+++ src\/include\/eina_hash.h\n@@ -269,6 +269,7 @@\n * @param hash The given hash table\n * @param data_free_cb The function called on each value when the hash\n * table is freed. @c NULL can be passed as callback.\n+ * @since 1.1\n *\/\n EAPI void eina_hash_free_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb) EINA_ARG_NONNULL(1);\n \n"} {"commit":"e2da25e4b3bbc7fbf53cae67fedd91f1df603c60","subject":"Completed animation of ship. It now happens every hour.","message":"Completed animation of ship. It now happens every hour.\n","repos":"tesneddon\/invaders-watchface","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/invaders-watchapp.c\n+++ src\/invaders-watchapp.c\n@@ -61,6 +61,8 @@\n void pbl_main(void *params);\n void handle_init(AppContextRef ctx);\n void handle_tick(AppContextRef ctx, PebbleTickEvent *event);\n+ void handle_ship_animation_stopped(Animation *animation, bool finished,\n+ \t \t \t \t void *context);\n void handle_deinit(AppContextRef ctx);\n \n \/*\n@@ -106,7 +108,7 @@\n \n PebbleTickEvent event;\n PblTm now;\n- GRect to_frame = GRect(-65, 45, 65, 28);\n+ GRect to_frame = GRect(-65, 30, 65, 28);\n \n window_init(&window, \"Invaders Watchface\");\n window_stack_push(&window, true \/* Animated *\/);\n@@ -118,17 +120,17 @@\n ** Load the ship from resources and configure the animation.\n *\/\n heap_bitmap_init(&ship, RESOURCE_ID_SHIP);\n- bitmap_layer_init(&ship_layer, GRect(78, 45, 65, 28));\n- \/\/ hide the layer?\n+ bitmap_layer_init(&ship_layer, GRect(144, 30, 65, 28));\n+ bitmap_layer_set_bitmap(&ship_layer, &ship.bmp);\n layer_add_child(&window.layer, &ship_layer.layer);\n \n property_animation_init_layer_frame(&ship_animation, &ship_layer.layer,\n \t \t \t \t \tNULL, &to_frame);\n-\n- animation_set_duration(&ship_animation.animation, 50);\n-\n- \/\/ setup callback for start so layer is unhidden\n- \/\/ setup callback for stop so we can enable the other\n+ animation_set_duration(&ship_animation.animation, 1800);\n+ animation_set_handlers(&ship_animation.animation,\n+\t\t\t (AnimationHandlers) {\n+\t\t\t .stopped = handle_ship_animation_stopped\n+\t\t\t }, NULL);\n \n \/*\n ** Load the invaders from resources and configure the layer.\n@@ -200,8 +202,6 @@\n ** If we've ticked over a minute, then switch the invader animation.\n *\/\n if (event->units_changed & MINUTE_UNIT) {\n-layer_set_hidden(&bmp_layer.layer, true);\n-animation_schedule(&ship_animation.animation);\n \tindex = 0;\n \toffset += 2;\n \tif (offset >= sizeof(invaders)\/sizeof(invaders[0])) {\n@@ -215,25 +215,35 @@\n ** Update the invader animation.\n *\/\n if (event->units_changed & HOUR_UNIT) {\n- \t\/\/ hide bmp_layer -- rename to invader_layer\n- \t\/\/ schedule the animation\n- \t\/\/ -- the animation has a call back that then un-hides the\n- \t\/\/\t invader_layer.\n+ \tlayer_set_hidden(&bmp_layer.layer, true);\n+ \tlayer_set_hidden(&ship_layer.layer, false);\n+ \tanimation_schedule(&ship_animation.animation);\n } else {\n \tbitmap_layer_set_bitmap(&bmp_layer, &invaders[offset+index].bmp);\n }\n }\n \n+void handle_ship_animation_stopped(Animation *animation,\n+\t\t\t\t bool finished,\n+\t\t\t\t void *data) {\n+ \/*\n+ ** Re-enable the invader layer after the ship has passed.\n+ *\/\n+ layer_set_hidden(&bmp_layer.layer, false);\n+}\n+\n void handle_deinit(AppContextRef ctx) {\n unsigned i;\n \n \/*\n+ ** Tidy up the ship.\n+ *\/\n+ heap_bitmap_deinit(&ship);\n+\n+ \/*\n ** Tidy up the invaders bitmaps.\n *\/\n for (i = 0; i < sizeof(invaders)\/sizeof(invaders[0]); i++) {\n \theap_bitmap_deinit(&invaders[i]);\n }\n-\n- \/\/ don't forget stuff to do with animation.\n-\n-}\n+}\n"} {"commit":"88e89662b0da37037b43278b6beb655671b748a4","subject":"[Matrix]: add more operators to dense matrix.","message":"[Matrix]: add more operators to dense matrix.\n","repos":"icoming\/FlashX,icoming\/FlashX,zheng-da\/FlashX,flashxio\/FlashX,icoming\/FlashGraph,flashxio\/FlashX,zheng-da\/FlashX,zheng-da\/FlashX,icoming\/FlashGraph,icoming\/FlashX,icoming\/FlashGraph,icoming\/FlashGraph,flashxio\/FlashX,icoming\/FlashGraph,zheng-da\/FlashX,flashxio\/FlashX,icoming\/FlashX,flashxio\/FlashX,flashxio\/FlashX,icoming\/FlashX,zheng-da\/FlashX","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- matrix\/dense_matrix.h\n+++ matrix\/dense_matrix.h\n@@ -386,6 +386,15 @@\n \t\tconst bulk_operate &op = get_type().get_basic_ops().get_multiply();\n \t\treturn this->mapply2(mat, bulk_operate::conv2ptr(op));\n \t}\n+\tdense_matrix::ptr div(const dense_matrix &mat) const {\n+\t\tconst bulk_operate &op = get_type().get_basic_ops().get_divide();\n+\t\treturn this->mapply2(mat, bulk_operate::conv2ptr(op));\n+\t}\n+\tdense_matrix::ptr pmax(const dense_matrix &mat) const {\n+\t\tconst bulk_operate &op = *get_type().get_basic_ops().get_op(\n+\t\t\t\tbasic_ops::op_idx::MAX);\n+\t\treturn this->mapply2(mat, bulk_operate::conv2ptr(op));\n+\t}\n \n \tdense_matrix::ptr abs() const {\n \t\tbulk_uoperate::const_ptr op = bulk_uoperate::conv2ptr(\n@@ -424,6 +433,14 @@\n \t}\n \n \ttemplate<class T>\n+\tdense_matrix::ptr add_scalar(T val) const {\n+\t\tscalar_variable::ptr var(new scalar_variable_impl<T>(val));\n+\t\tbulk_operate::const_ptr op = bulk_operate::conv2ptr(\n+\t\t\t\tvar->get_type().get_basic_ops().get_add());\n+\t\treturn apply_scalar(var, op);\n+\t}\n+\n+\ttemplate<class T>\n \tdense_matrix::ptr minus_scalar(T val) const {\n \t\tscalar_variable::ptr var(new scalar_variable_impl<T>(val));\n \t\tbulk_operate::const_ptr op = bulk_operate::conv2ptr(\n"} {"commit":"5df8b765ca183ace05d15650860530b582ce45e6","subject":"play pos buffer ioctl","message":"play pos buffer ioctl\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- media\/dosamp\/dosamp.c\n+++ media\/dosamp\/dosamp.c\n@@ -134,6 +134,7 @@\n #define soundcard_ioctl_stop_play 0x5B43U\n #define soundcard_ioctl_get_buffer_size 0x5BB0U\n #define soundcard_ioctl_get_buffer_write_position 0x5BB1U\n+#define soundcard_ioctl_get_buffer_play_position 0x5BB2U\n #define soundcard_ioctl_set_play_format 0x5BF0U\n \n \/* private *\/\n@@ -418,6 +419,15 @@\n if (card == NULL) return 0;\n \n return card->buffer_size;\n+}\n+\n+static uint32_t soundblaster_play_buffer_play_pos(soundcard_t sc) {\n+ struct sndsb_ctx *card = soundblaster_get_sndsb_ctx(sc);\n+\n+ if (card == NULL) return 0;\n+ soundblaster_update_wav_dma_position(sc,card);\n+\n+ return wav_state.dma_position;\n }\n \n static uint32_t soundblaster_play_buffer_write_pos(soundcard_t sc) {\n@@ -670,6 +680,11 @@\n if (*len < sizeof(uint32_t)) return -1;\n if ((*((uint32_t dosamp_FAR*)data) = soundblaster_play_buffer_write_pos(sc)) == 0) return -1;\n } return 0;\n+ case soundcard_ioctl_get_buffer_play_position: {\n+ if (data == NULL || len == 0) return -1;\n+ if (*len < sizeof(uint32_t)) return -1;\n+ if ((*((uint32_t dosamp_FAR*)data) = soundblaster_play_buffer_play_pos(sc)) == 0) return -1;\n+ } return 0;\n case soundcard_ioctl_get_buffer_size: {\n if (data == NULL || len == 0) return -1;\n if (*len < sizeof(uint32_t)) return -1;\n@@ -1594,9 +1609,9 @@\n }\n \n void display_idle_buffer(void) {\n+ signed long pos = -1;\n signed long apos = -1;\n signed long buffersz = -1;\n- signed long pos = (signed long)sndsb_read_dma_buffer_position(sb_card);\n \n {\n unsigned int sz = sizeof(uint32_t);\n@@ -1606,6 +1621,8 @@\n buffersz = (signed long)bufsz;\n if (soundcard->ioctl(soundcard,soundcard_ioctl_get_buffer_write_position,&bufsz,&sz,0) >= 0)\n apos = (signed long)bufsz;\n+ if (soundcard->ioctl(soundcard,soundcard_ioctl_get_buffer_play_position,&bufsz,&sz,0) >= 0)\n+ pos = (signed long)bufsz;\n }\n \n printf(\"\\x0D\");\n"} {"commit":"a11e808311da5afd61980f9af03d384effa13915","subject":"MSVC miscompilation workaround: MSVC stores the temporary __m256 on the stack, but misaligned. Using set1_epi32 avoids this error.","message":"MSVC miscompilation workaround: MSVC stores the temporary __m256 on the stack, but misaligned. Using set1_epi32 avoids this error.\n","repos":"chr-engwer\/Vc,chr-engwer\/Vc,chr-engwer\/Vc,VcDevel\/Vc,VcDevel\/Vc,VcDevel\/Vc,VcDevel\/Vc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- avx\/intrinsics.h\n+++ avx\/intrinsics.h\n@@ -168,6 +168,10 @@\n \n #if defined(VC_GNU_ASM) && !defined(NVALGRIND)\n static Vc_INTRINSIC m256 Vc_CONST _mm256_setallone() { __m256 r; __asm__(\"vcmpps $8,%0,%0,%0\":\"=x\"(r)); return r; }\n+#elif defined(VC_MSVC)\n+ \/\/ MSVC puts temporaries of this value on the stack, but sometimes at misaligned addresses, try\n+ \/\/ some other generator instead...\n+ static Vc_INTRINSIC m256 Vc_CONST _mm256_setallone() { return _mm256_castsi256_ps(_mm256_set1_epi32(-1)); }\n #else\n static Vc_INTRINSIC m256 Vc_CONST _mm256_setallone() { m256 r = _mm256_setzero_ps(); return _mm256_cmp_ps(r, r, _CMP_EQ_UQ); }\n #endif\n"} {"commit":"97eb60527dc673c26c26f21ac23a72e9f9918862","subject":"Put a mis-placed block of documentation to where it belongs.","message":"Put a mis-placed block of documentation to where it belongs.\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@12135 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"johntfoster\/dealii,ibkim11\/dealii,lpolster\/dealii,flow123d\/dealii,JaeryunYim\/dealii,rrgrove6\/dealii,EGP-CIG-REU\/dealii,danshapero\/dealii,nicolacavallini\/dealii,maieneuro\/dealii,msteigemann\/dealii,mac-a\/dealii,natashasharma\/dealii,lpolster\/dealii,pesser\/dealii,lue\/dealii,rrgrove6\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,ibkim11\/dealii,EGP-CIG-REU\/dealii,ESeNonFossiIo\/dealii,sriharisundar\/dealii,danshapero\/dealii,Arezou-gh\/dealii,ESeNonFossiIo\/dealii,rrgrove6\/dealii,andreamola\/dealii,YongYang86\/dealii,lpolster\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,jperryhouts\/dealii,ibkim11\/dealii,JaeryunYim\/dealii,angelrca\/dealii,adamkosik\/dealii,sriharisundar\/dealii,spco\/dealii,msteigemann\/dealii,ibkim11\/dealii,natashasharma\/dealii,naliboff\/dealii,YongYang86\/dealii,andreamola\/dealii,mtezzele\/dealii,Arezou-gh\/dealii,angelrca\/dealii,gpitton\/dealii,maieneuro\/dealii,shakirbsm\/dealii,lpolster\/dealii,danshapero\/dealii,spco\/dealii,danshapero\/dealii,sairajat\/dealii,mac-a\/dealii,shakirbsm\/dealii,ESeNonFossiIo\/dealii,ESeNonFossiIo\/dealii,sriharisundar\/dealii,natashasharma\/dealii,maieneuro\/dealii,angelrca\/dealii,lue\/dealii,JaeryunYim\/dealii,lpolster\/dealii,adamkosik\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,flow123d\/dealii,jperryhouts\/dealii,angelrca\/dealii,Arezou-gh\/dealii,spco\/dealii,flow123d\/dealii,rrgrove6\/dealii,sriharisundar\/dealii,andreamola\/dealii,naliboff\/dealii,pesser\/dealii,pesser\/dealii,jperryhouts\/dealii,mtezzele\/dealii,andreamola\/dealii,maieneuro\/dealii,mtezzele\/dealii,ESeNonFossiIo\/dealii,pesser\/dealii,lpolster\/dealii,johntfoster\/dealii,flow123d\/dealii,gpitton\/dealii,gpitton\/dealii,YongYang86\/dealii,rrgrove6\/dealii,natashasharma\/dealii,jperryhouts\/dealii,johntfoster\/dealii,adamkosik\/dealii,mtezzele\/dealii,sairajat\/dealii,mac-a\/dealii,ibkim11\/dealii,JaeryunYim\/dealii,ibkim11\/dealii,adamkosik\/dealii,adamkosik\/dealii,YongYang86\/dealii,YongYang86\/dealii,rrgrove6\/dealii,lue\/dealii,EGP-CIG-REU\/dealii,pesser\/dealii,kalj\/dealii,natashasharma\/dealii,nicolacavallini\/dealii,kalj\/dealii,maieneuro\/dealii,kalj\/dealii,pesser\/dealii,kalj\/dealii,naliboff\/dealii,rrgrove6\/dealii,johntfoster\/dealii,EGP-CIG-REU\/dealii,andreamola\/dealii,shakirbsm\/dealii,sriharisundar\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,sairajat\/dealii,maieneuro\/dealii,Arezou-gh\/dealii,angelrca\/dealii,kalj\/dealii,ibkim11\/dealii,naliboff\/dealii,Arezou-gh\/dealii,flow123d\/dealii,angelrca\/dealii,mac-a\/dealii,mtezzele\/dealii,johntfoster\/dealii,nicolacavallini\/dealii,angelrca\/dealii,YongYang86\/dealii,jperryhouts\/dealii,sairajat\/dealii,spco\/dealii,sairajat\/dealii,spco\/dealii,natashasharma\/dealii,gpitton\/dealii,EGP-CIG-REU\/dealii,sairajat\/dealii,msteigemann\/dealii,nicolacavallini\/dealii,danshapero\/dealii,flow123d\/dealii,maieneuro\/dealii,shakirbsm\/dealii,sriharisundar\/dealii,mac-a\/dealii,spco\/dealii,johntfoster\/dealii,sairajat\/dealii,lue\/dealii,mtezzele\/dealii,adamkosik\/dealii,gpitton\/dealii,gpitton\/dealii,naliboff\/dealii,Arezou-gh\/dealii,nicolacavallini\/dealii,nicolacavallini\/dealii,danshapero\/dealii,msteigemann\/dealii,andreamola\/dealii,sriharisundar\/dealii,JaeryunYim\/dealii,gpitton\/dealii,msteigemann\/dealii,andreamola\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,nicolacavallini\/dealii,flow123d\/dealii,johntfoster\/dealii,lue\/dealii,msteigemann\/dealii,lue\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,naliboff\/dealii,danshapero\/dealii,msteigemann\/dealii,kalj\/dealii,mac-a\/dealii,pesser\/dealii,jperryhouts\/dealii,naliboff\/dealii,lue\/dealii,lpolster\/dealii,mtezzele\/dealii,spco\/dealii,Arezou-gh\/dealii,YongYang86\/dealii,mac-a\/dealii,adamkosik\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/deal.II\/include\/grid\/tria.h\n+++ deal.II\/deal.II\/include\/grid\/tria.h\n@@ -1128,9 +1128,6 @@\n * apply some smoothing for multigrid algorithms, but this has to be decided\n * upon later.\n *\n- * N4\/ face lines in 3d are ordered, such that the induced 2d local\n- * coordinate system (x,y) implies (right hand rule) a normal in\n- * face normal direction, see N2\/\n *\n * <h4>Implementation conventions for two spatial dimensions<\/h4>\n * \n@@ -1153,6 +1150,10 @@\n * point 0 towards point 1 and is always in one of the coordinate\n * directions\n * \n+ * N4\/ face lines in 3d are ordered, such that the induced 2d local\n+ * coordinate system (x,y) implies (right hand rule) a normal in\n+ * face normal direction, see N2\/.\n+ *\n * The resulting numbering of vertices and faces (lines) in 2d as\n * well as the directions of lines is shown in the following.\n * @verbatim\n"} {"commit":"04c82d44fd38e12aa42d4516873a5b50e3accddb","subject":"Added missing pop","message":"Added missing pop\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@1471 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"YongYang86\/dealii,angelrca\/dealii,EGP-CIG-REU\/dealii,rrgrove6\/dealii,flow123d\/dealii,sriharisundar\/dealii,YongYang86\/dealii,kalj\/dealii,sairajat\/dealii,mtezzele\/dealii,gpitton\/dealii,ibkim11\/dealii,maieneuro\/dealii,spco\/dealii,ESeNonFossiIo\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,andreamola\/dealii,Arezou-gh\/dealii,maieneuro\/dealii,ESeNonFossiIo\/dealii,ibkim11\/dealii,spco\/dealii,EGP-CIG-REU\/dealii,EGP-CIG-REU\/dealii,pesser\/dealii,YongYang86\/dealii,angelrca\/dealii,spco\/dealii,sairajat\/dealii,flow123d\/dealii,ESeNonFossiIo\/dealii,msteigemann\/dealii,natashasharma\/dealii,johntfoster\/dealii,sriharisundar\/dealii,danshapero\/dealii,ibkim11\/dealii,andreamola\/dealii,jperryhouts\/dealii,shakirbsm\/dealii,pesser\/dealii,sriharisundar\/dealii,maieneuro\/dealii,jperryhouts\/dealii,mtezzele\/dealii,nicolacavallini\/dealii,pesser\/dealii,sairajat\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,ESeNonFossiIo\/dealii,angelrca\/dealii,nicolacavallini\/dealii,jperryhouts\/dealii,shakirbsm\/dealii,adamkosik\/dealii,jperryhouts\/dealii,maieneuro\/dealii,shakirbsm\/dealii,mac-a\/dealii,ESeNonFossiIo\/dealii,mac-a\/dealii,johntfoster\/dealii,lue\/dealii,danshapero\/dealii,lpolster\/dealii,gpitton\/dealii,gpitton\/dealii,rrgrove6\/dealii,lue\/dealii,natashasharma\/dealii,mac-a\/dealii,jperryhouts\/dealii,lue\/dealii,lpolster\/dealii,kalj\/dealii,YongYang86\/dealii,spco\/dealii,naliboff\/dealii,lpolster\/dealii,angelrca\/dealii,adamkosik\/dealii,gpitton\/dealii,angelrca\/dealii,spco\/dealii,gpitton\/dealii,shakirbsm\/dealii,gpitton\/dealii,adamkosik\/dealii,naliboff\/dealii,naliboff\/dealii,msteigemann\/dealii,danshapero\/dealii,mtezzele\/dealii,Arezou-gh\/dealii,sriharisundar\/dealii,lpolster\/dealii,shakirbsm\/dealii,nicolacavallini\/dealii,sairajat\/dealii,andreamola\/dealii,rrgrove6\/dealii,shakirbsm\/dealii,kalj\/dealii,sairajat\/dealii,pesser\/dealii,naliboff\/dealii,lpolster\/dealii,nicolacavallini\/dealii,nicolacavallini\/dealii,Arezou-gh\/dealii,sairajat\/dealii,spco\/dealii,andreamola\/dealii,sriharisundar\/dealii,JaeryunYim\/dealii,spco\/dealii,JaeryunYim\/dealii,mac-a\/dealii,danshapero\/dealii,maieneuro\/dealii,angelrca\/dealii,lue\/dealii,pesser\/dealii,kalj\/dealii,natashasharma\/dealii,Arezou-gh\/dealii,EGP-CIG-REU\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,EGP-CIG-REU\/dealii,EGP-CIG-REU\/dealii,johntfoster\/dealii,rrgrove6\/dealii,flow123d\/dealii,pesser\/dealii,mtezzele\/dealii,flow123d\/dealii,johntfoster\/dealii,johntfoster\/dealii,mac-a\/dealii,mtezzele\/dealii,angelrca\/dealii,danshapero\/dealii,mtezzele\/dealii,nicolacavallini\/dealii,mac-a\/dealii,JaeryunYim\/dealii,sriharisundar\/dealii,natashasharma\/dealii,ibkim11\/dealii,jperryhouts\/dealii,lue\/dealii,msteigemann\/dealii,msteigemann\/dealii,natashasharma\/dealii,ESeNonFossiIo\/dealii,ESeNonFossiIo\/dealii,YongYang86\/dealii,naliboff\/dealii,kalj\/dealii,shakirbsm\/dealii,JaeryunYim\/dealii,mtezzele\/dealii,rrgrove6\/dealii,maieneuro\/dealii,lpolster\/dealii,flow123d\/dealii,rrgrove6\/dealii,sriharisundar\/dealii,danshapero\/dealii,andreamola\/dealii,johntfoster\/dealii,msteigemann\/dealii,kalj\/dealii,adamkosik\/dealii,adamkosik\/dealii,gpitton\/dealii,danshapero\/dealii,naliboff\/dealii,jperryhouts\/dealii,mac-a\/dealii,johntfoster\/dealii,flow123d\/dealii,YongYang86\/dealii,nicolacavallini\/dealii,msteigemann\/dealii,kalj\/dealii,JaeryunYim\/dealii,YongYang86\/dealii,flow123d\/dealii,andreamola\/dealii,lue\/dealii,Arezou-gh\/dealii,lpolster\/dealii,EGP-CIG-REU\/dealii,adamkosik\/dealii,maieneuro\/dealii,andreamola\/dealii,lue\/dealii,pesser\/dealii,sairajat\/dealii,naliboff\/dealii,adamkosik\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,rrgrove6\/dealii,ibkim11\/dealii,msteigemann\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/lac\/include\/lac\/solver_cg.h\n+++ deal.II\/lac\/include\/lac\/solver_cg.h\n@@ -78,7 +78,10 @@\n \t\t\t\t * of the actual solution process and\n \t\t\t\t * deallocated at the end.\n \t\t\t\t *\/\n- Vector *Vr, *Vp, *Vz, *VAp;\n+ Vector *Vr;\n+ Vector *Vp;\n+ Vector *Vz;\n+ Vector *VAp;\n \n \t\t\t\t \/**\n \t\t\t\t * Within the iteration loop, the\n@@ -157,7 +160,7 @@\n memory.free(Vp);\n memory.free(Vz);\n memory.free(VAp);\n- \n+ deallog.pop();\n return success;\n };\n \n"} {"commit":"8a5113c700aec16158b2c208694a1054c9c27ba5","subject":"fixed the interface class matcher to actually work.","message":"fixed the interface class matcher to actually work.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@9390 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- packaging\/generic\/print-camera-list.c\n+++ packaging\/generic\/print-camera-list.c\n@@ -351,13 +351,10 @@\n \t}\n \n \tif (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {\n-\t\tprintf(\"SYSFS{bInterfaceClass}==\\\"%02x\\\", \", class);\n-\t\tif (flags & GP_USB_HOTPLUG_MATCH_INT_SUBCLASS) {\n-\t\t\tprintf(\"SYSFS{bInterfaceSubClass}==\\\"%02x\\\", \", subclass);\n-\t\t}\n-\t\tif (flags & GP_USB_HOTPLUG_MATCH_INT_PROTOCOL) {\n-\t\t\tprintf(\"SYSFS{bInterfaceProtocol}==\\\"%02x\\\", \", proto);\n-\t\t\t}\n+\t\tif ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))\n+\t\t\tprintf(\"ENV{INTERFACE}==\\\"%d\/%d\/%d\\\", \", class, subclass, proto);\n+\t\telse\n+\t\t\tfprintf(stderr,\"unhandled interface match flags %x\\n\", flags);\n \t} else {\n \t\tprintf (\"SYSFS{idVendor}==\\\"%04x\\\", SYSFS{idProduct}==\\\"%04x\\\", \",\n \t\t\ta->usb_vendor, a->usb_product);\n@@ -461,11 +458,10 @@\n \t\tprintf (\"# %s\\n\", a->model);\n \n \tif (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {\n-\t\tprintf(\"ATTRS{bInterfaceClass}==\\\"%02x\\\", \", class);\n-\t\tif (flags & GP_USB_HOTPLUG_MATCH_INT_SUBCLASS)\n-\t\t\tprintf(\"ATTRS{bInterfaceSubClass}==\\\"%02x\\\", \", subclass);\n-\t\tif (flags & GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)\n-\t\t\tprintf(\"ATTRS{bInterfaceProtocol}==\\\"%02x\\\", \", proto);\n+\t\tif ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL))\n+\t\t\tprintf(\"ENV{INTERFACE}==\\\"%d\/%d\/%d\\\", \", class, subclass, proto);\n+\t\telse\n+\t\t\tfprintf(stderr,\"unhandled interface match flags %x\\n\", flags);\n \t} else {\n \t\tprintf (\"ATTRS{idVendor}==\\\"%04x\\\", ATTRS{idProduct}==\\\"%04x\\\", \",\n \t\t\ta->usb_vendor, a->usb_product);\n"} {"commit":"732e348c6d2fb58b2cf4c2bdab2f9f28e39e3a78","subject":"- Removed AliMUONSegmentationManager; added AliMUONSegFactory - DE segmentations classes now declared with '+'","message":"- Removed AliMUONSegmentationManager; added AliMUONSegFactory\n- DE segmentations classes now declared with '+'\n\n","repos":"mkrzewic\/AliRoot,coppedis\/AliRoot,coppedis\/AliRoot,ecalvovi\/AliRoot,sebaleh\/AliRoot,sebaleh\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,mkrzewic\/AliRoot,coppedis\/AliRoot,miranov25\/AliRoot,shahor02\/AliRoot,coppedis\/AliRoot,sebaleh\/AliRoot,coppedis\/AliRoot,alisw\/AliRoot,alisw\/AliRoot,ALICEHLT\/AliRoot,ALICEHLT\/AliRoot,sebaleh\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,shahor02\/AliRoot,alisw\/AliRoot,coppedis\/AliRoot,sebaleh\/AliRoot,ecalvovi\/AliRoot,miranov25\/AliRoot,mkrzewic\/AliRoot,shahor02\/AliRoot,ALICEHLT\/AliRoot,jgrosseo\/AliRoot,alisw\/AliRoot,ecalvovi\/AliRoot,jgrosseo\/AliRoot,sebaleh\/AliRoot,shahor02\/AliRoot,ALICEHLT\/AliRoot,mkrzewic\/AliRoot,mkrzewic\/AliRoot,jgrosseo\/AliRoot,alisw\/AliRoot,ecalvovi\/AliRoot,coppedis\/AliRoot,shahor02\/AliRoot,mkrzewic\/AliRoot,coppedis\/AliRoot,miranov25\/AliRoot,jgrosseo\/AliRoot,miranov25\/AliRoot,alisw\/AliRoot,jgrosseo\/AliRoot,ecalvovi\/AliRoot,jgrosseo\/AliRoot,ALICEHLT\/AliRoot,shahor02\/AliRoot,ecalvovi\/AliRoot,ecalvovi\/AliRoot,mkrzewic\/AliRoot,sebaleh\/AliRoot,jgrosseo\/AliRoot,shahor02\/AliRoot,miranov25\/AliRoot,alisw\/AliRoot,miranov25\/AliRoot,alisw\/AliRoot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- MUON\/MUONbaseLinkDef.h\n+++ MUON\/MUONbaseLinkDef.h\n@@ -7,11 +7,11 @@\n #pragma link C++ class AliMUONv1+; \n \n \/\/ mapping & segmentation (change in progress)\n-#pragma link C++ class AliMUONSt12QuadrantSegmentation-; \n+#pragma link C++ class AliMUONSt12QuadrantSegmentation+; \n #pragma link C++ class AliMUONSt345SlatSegmentation+;\n-#pragma link C++ class AliMUONSt345SlatSegmentationV2-;\n+#pragma link C++ class AliMUONSt345SlatSegmentationV2+;\n #pragma link C++ class AliMUONTriggerSegmentation+;\n-#pragma link C++ class AliMUONTriggerSegmentationV2-;\n+#pragma link C++ class AliMUONTriggerSegmentationV2+;\n \n \/\/ geometry \n #pragma link C++ class AliMUONMathieson+; \n@@ -48,7 +48,7 @@\n #pragma link C++ class AliMUONRecoCheck+; \n \n \/\/ segmentation\n-#pragma link C++ class AliMUONSegmentationManager+;\n+#pragma link C++ class AliMUONSegFactory+;\n #endif\n \n \n"} {"commit":"097f935c4499473a7d8eccbd5067e4683cf3f4d3","subject":"","message":"\n\ngit-svn-id: https:\/\/www.imagemagick.org\/subversion\/ImageMagick\/trunk@13525 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74\n","repos":"svn2github\/ImageMagick,svn2github\/ImageMagick,svn2github\/ImageMagick,svn2github\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MagickCore\/attribute.c\n+++ MagickCore\/attribute.c\n@@ -331,19 +331,19 @@\n \n atDepth=MagickTrue;\n range=GetQuantumRange(current_depth[id]);\n- if (atDepth == MagickTrue &&\n- (GetPixelRedTraits(image) & UpdatePixelTrait) != 0)\n+ if ((atDepth != MagickFalse) &&\n+ (GetPixelRedTraits(image) & UpdatePixelTrait) != 0)\n if (IsPixelAtDepth(image->colormap[i].red,range) == MagickFalse)\n- atDepth = MagickFalse;\n- if (atDepth == MagickTrue &&\n- (GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)\n+ atDepth=MagickFalse;\n+ if ((atDepth != MagickFalse) &&\n+ (GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)\n if (IsPixelAtDepth(image->colormap[i].green,range) == MagickFalse)\n- atDepth = MagickFalse;\n- if (atDepth == MagickTrue &&\n- (GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)\n+ atDepth=MagickFalse;\n+ if ((atDepth != MagickFalse) &&\n+ (GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)\n if (IsPixelAtDepth(image->colormap[i].blue,range) == MagickFalse)\n- atDepth = MagickFalse;\n- if (atDepth == MagickTrue)\n+ atDepth=MagickFalse;\n+ if ((atDepth != MagickFalse))\n break;\n current_depth[id]++;\n }\n"} {"commit":"a7759f410b773a1dd57b0e1fb28112e1cd8b97bc","subject":"https:\/\/github.com\/ImageMagick\/ImageMagick\/issues\/1608","message":"https:\/\/github.com\/ImageMagick\/ImageMagick\/issues\/1608\n","repos":"Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MagickCore\/threshold.c\n+++ MagickCore\/threshold.c\n@@ -218,6 +218,8 @@\n threshold_image=CloneImage(image,0,0,MagickTrue,exception);\n if (threshold_image == (Image *) NULL)\n return((Image *) NULL);\n+ if (width == 0)\n+ return(threshold_image);\n status=SetImageStorageClass(threshold_image,DirectClass,exception);\n if (status == MagickFalse)\n {\n"} {"commit":"4b08da6b0d2a3eb251be31d6042e5f115dd86ed0","subject":"Get rid of compiler warnings on Redhat","message":"Get rid of compiler warnings on Redhat\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/_iconv_codec.c\n+++ Modules\/_iconv_codec.c\n@@ -122,7 +122,7 @@\n out_top = PyString_AS_STRING(outputobj); \\\n }\n while (inplen > 0) {\n- if (iconv(self->enchdl, &inp, &inplen, &out, &outlen) == -1) {\n+ if (iconv(self->enchdl, (char**)&inp, &inplen, &out, &outlen) == -1) {\n char reason[128];\n int errpos;\n \n@@ -319,7 +319,7 @@\n out_top = (char *)PyUnicode_AS_UNICODE(outputobj); \\\n }\n while (inplen > 0) {\n- if (iconv(self->dechdl, &inp, &inplen, &out, &outlen) == -1) {\n+ if (iconv(self->dechdl, (char**)&inp, &inplen, &out, &outlen) == -1) {\n char reason[128], *reasonpos = (char *)reason;\n int errpos;\n \n"} {"commit":"4a338d66c6ab8d9d27ae54b624011b974f3e731d","subject":"Issue #11393: Fix faulthandler_thread(): release cancel lock before join lock","message":"Issue #11393: Fix faulthandler_thread(): release cancel lock before join lock\n\nIf the thread releases the join lock before the cancel lock, the thread may\nsometimes still be alive at cancel_dump_tracebacks_later() exit. So the cancel\nlock may be destroyed while the thread is still alive, whereas the thread will\ntry to release the cancel lock, which just crash.\n\nAnother minor fix: the thread doesn't release the cancel lock if it didn't\nacquire it.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/faulthandler.c\n+++ Modules\/faulthandler.c\n@@ -401,6 +401,7 @@\n thread.timeout_ms, 0);\n if (st == PY_LOCK_ACQUIRED) {\n \/* Cancelled by user *\/\n+ PyThread_release_lock(thread.cancel_event);\n break;\n }\n \/* Timeout => dump traceback *\/\n@@ -419,7 +420,6 @@\n \/* The only way out *\/\n thread.running = 0;\n PyThread_release_lock(thread.join_event);\n- PyThread_release_lock(thread.cancel_event);\n }\n \n static void\n"} {"commit":"416889c5e70ade1fd90301cc432a8cb6e49b399d","subject":"OS\/2 EMX port changes (Modules part of patch #450267): Modules\/ socketmodule.c","message":"OS\/2 EMX port changes (Modules part of patch #450267):\n Modules\/\n socketmodule.c\n\nEMX handles sockets like Posix, rather than use native APIs\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/socketmodule.c\n+++ Modules\/socketmodule.c\n@@ -227,7 +227,7 @@\n #\tdefine snprintf _snprintf\n #endif\n \n-#if defined(PYOS_OS2)\n+#if defined(PYOS_OS2) && !defined(PYCC_GCC)\n #define SOCKETCLOSE soclose\n #define NO_DUP \/* Sockets are Not Actual File Handles under OS\/2 *\/\n #endif\n@@ -352,7 +352,7 @@\n \telse\n #endif\n \n-#if defined(PYOS_OS2)\n+#if defined(PYOS_OS2) && !defined(PYCC_GCC)\n if (sock_errno() != NO_ERROR) {\n APIRET rc;\n ULONG msglen;\n@@ -931,7 +931,7 @@\n #else\n #ifndef RISCOS\n #ifndef MS_WINDOWS\n-#ifdef PYOS_OS2\n+#if defined(PYOS_OS2) && !defined(PYCC_GCC)\n \tblock = !block;\n \tioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));\n #else \/* !PYOS_OS2 *\/\n@@ -1441,7 +1441,7 @@\n \tmemset(addrbuf, 0, addrlen);\n \tn = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,\n #ifndef MS_WINDOWS\n-#if defined(PYOS_OS2)\n+#if defined(PYOS_OS2) && !defined(PYCC_GCC)\n \t\t (struct sockaddr *)addrbuf, &addrlen\n #else\n \t\t (void *)addrbuf, &addrlen\n@@ -2633,6 +2633,7 @@\n static int\n OS2init(void)\n {\n+#if !defined(PYCC_GCC)\n char reason[64];\n int rc = sock_init();\n \n@@ -2646,6 +2647,10 @@\n PyErr_SetString(PyExc_ImportError, reason);\n \n return 0; \/* Indicate Failure *\/\n+#else\n+ \/* no need to initialise sockets with GCC\/EMX *\/\n+ return 1;\n+#endif\n }\n \n #endif \/* PYOS_OS2 *\/\n@@ -2695,10 +2700,10 @@\n \tif (!NTinit())\n \t\treturn;\n #else\n-#if defined(__TOS_OS2__)\n+#if defined(PYOS_OS2)\n \tif (!OS2init())\n \t\treturn;\n-#endif \/* __TOS_OS2__ *\/\n+#endif \/* PYOS_OS2 *\/\n #endif \/* MS_WINDOWS *\/\n #endif \/* RISCOS *\/\n \tPySocketSock_Type.ob_type = &PyType_Type;\n"} {"commit":"8e6d225da80a4fd075785d8a014ea9cad9fb9860","subject":"Unsigned 1 and 2 byte sized formats shouldn't result in long integer values!","message":"Unsigned 1 and 2 byte sized formats shouldn't result in long integer values!\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/structmodule.c\n+++ Modules\/structmodule.c\n@@ -694,7 +694,10 @@\n \tdo {\n \t\tx = (x<<8) | (*p++ & 0xFF);\n \t} while (--i > 0);\n-\treturn PyLong_FromUnsignedLong(x);\n+\tif (f->size >= 4)\n+\t\treturn PyLong_FromUnsignedLong(x);\n+\telse\n+\t\treturn PyInt_FromLong((long)x);\n }\n \n static PyObject *\n@@ -825,7 +828,10 @@\n \tdo {\n \t\tx = (x<<8) | (p[--i] & 0xFF);\n \t} while (i > 0);\n-\treturn PyLong_FromUnsignedLong(x);\n+\tif (f->size >= 4)\n+\t\treturn PyLong_FromUnsignedLong(x);\n+\telse\n+\t\treturn PyInt_FromLong((long)x);\n }\n \n static PyObject *\n"} {"commit":"c02e7419fd3b99aa421f704db83e3a1d3bc9d431","subject":"ExampleCallStream: defer setting stream direction until constructed","message":"ExampleCallStream: defer setting stream direction until constructed\n\nOtherwise, we'll potentially emit signals etc. before everything is set\nup, and in particular before we know the self-handle.\n","repos":"Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/future\/call-cm\/call-stream.c\n+++ examples\/future\/call-cm\/call-stream.c\n@@ -138,6 +138,17 @@\n self->priv->call_terminated_id = g_signal_connect (self->priv->channel,\n \"call-terminated\", G_CALLBACK (call_terminated_cb), self);\n \n+ if (self->priv->locally_requested)\n+ {\n+ example_call_stream_change_direction (self,\n+ TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL, NULL);\n+ }\n+ else\n+ {\n+ example_call_stream_receive_direction_request (self,\n+ TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);\n+ }\n+\n if (self->priv->handle != 0)\n {\n TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (\n@@ -263,18 +274,6 @@\n \n case PROP_LOCALLY_REQUESTED:\n self->priv->locally_requested = g_value_get_boolean (value);\n-\n- if (self->priv->locally_requested)\n- {\n- example_call_stream_change_direction (self,\n- TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL, NULL);\n- }\n- else\n- {\n- example_call_stream_receive_direction_request (self,\n- TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);\n- }\n-\n break;\n \n default:\n"} {"commit":"02151f73595883375f1ebc8e6f1c66d18e8e648e","subject":" - Fixes for OpenVR functionality","message":" - Fixes for OpenVR functionality\n","repos":"hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/gleam\/rhi\/vr-test\/renderer.h\n+++ examples\/gleam\/rhi\/vr-test\/renderer.h\n@@ -331,31 +331,29 @@\n \t vr::HmdColor_t sceneCol;\n \t sceneCol.r = sceneCol.g = 0.5;\n \t sceneCol.b = sceneCol.a = 1.0;\n-\t vr_ctxt.VRChaperone()->SetSceneColor(sceneCol);\n-\n-\t \/* Resize window to dimensions of VR stuffs *\/\n-\t _cbasic_size_2d<uint32> tsize = {};\n-\t vr_ctxt.VRSystem()->GetRecommendedRenderTargetSize(&tsize.w, &tsize.h);\n-\t CSize s = { (int32)tsize.w,(int32)tsize.h};\n-\/\/\t this->setWindowSize(s);\n-\n-\t eye_bounds[0].uMax = eye_bounds[1].uMin = 512;\n-\t eye_bounds[0].uMax = eye_bounds[1].uMax = 1024;\n-\t eye_bounds[0].vMax = eye_bounds[1].vMax = 1024;\n-\n-\t eye_texture.eType = vr::API_OpenGL;\n-\t eye_texture.eColorSpace = vr::ColorSpace_Auto;\n-\t eye_texture.handle = (void*)eyetex.handle();\n+ vr_ctxt.VRChaperone()->SetSceneColor(sceneCol);\n \t}\n \n \t{\n \t CSize s = {1280,1536};\n \n+ if(vr_ctxt.VRSystem())\n+ {\n+ \/* Resize window to dimensions of VR stuffs *\/\n+ _cbasic_size_2d<uint32> tsize = {};\n+ vr_ctxt.VRSystem()->GetRecommendedRenderTargetSize(&tsize.w, &tsize.h);\n+ s = { (int32)tsize.w,(int32)tsize.h};\n+ }\n+\n \t vr_target.alloc();\n-\t vr_ctarget = new GLM::S_2D(PixelFormat::RGBA8,1);\n+ vr_ctarget = new GLM::S_2D(PixelFormat::SRGB8A8,1);\n \t vr_dtarget = new GLM::S_2D(PixelFormat::Depth24Stencil8,1);\n \n-\t s.w *= 2;\n+ eye_bounds[0].uMax = eye_bounds[1].uMin = s.w;\n+ eye_bounds[1].uMax = s.w*2;\n+ eye_bounds[0].vMax = eye_bounds[1].vMax = s.h;\n+\n+ s.w *= 2;\n \t vr_ctarget->allocate(s,PixCmp::RGBA);\n \t vr_dtarget->allocate(s,PixCmp::Depth);\n \n@@ -363,6 +361,10 @@\n \t vr_target.attachSurface(*vr_ctarget,0);\n \n \t vr_target.resize(0,{0,0,s.w,s.h});\n+\n+ eye_texture.eType = vr::API_OpenGL;\n+ eye_texture.eColorSpace = vr::ColorSpace_Gamma;\n+ eye_texture.handle = (void*)vr_ctarget->handle();\n \t}\n \n \tGLM::FB_T* default_fb = &GLM::DefaultFramebuffer;\n@@ -466,8 +468,12 @@\n \n \t if(vr_ctxt.VRSystem())\n \t {\n-\t\tvr_ctxt.VRCompositor()->Submit(vr::Eye_Left,&eye_texture,&eye_bounds[0],vr::Submit_Default);\n-\t\tvr_ctxt.VRCompositor()->Submit(vr::Eye_Right,&eye_texture,&eye_bounds[1],vr::Submit_Default);\n+ vr_ctxt.VRCompositor()->Submit(vr::Eye_Left,&eye_texture,\n+ &eye_bounds[0],vr::Submit_Default);\n+ vr_ctxt.VRCompositor()->Submit(vr::Eye_Right,&eye_texture,\n+ &eye_bounds[1],vr::Submit_Default);\n+\n+ vr_ctxt.VRCompositor()->WaitGetPoses(nullptr,0,nullptr,0);\n \t }\n \n \t vr_target.blit({0,0,1280,720},GLM::DefaultFramebuffer,{0,0,1280,720},DBuffers::Color,Filtering::Linear);\n@@ -479,7 +485,7 @@\n \t}\n \n \tif(vr_ctxt.VRSystem())\n-\t{\n+ {\n \t vr::VR_Shutdown();\n \t}\n \n"} {"commit":"6d6401dc9925fe95d4819e7cbdee7b3ed8778c5d","subject":" - Fix minor issue with Windows","message":" - Fix minor issue with Windows\n","repos":"hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie,hbirchtree\/coffeecutie","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/gleam\/rhi\/vr-test\/renderer.h\n+++ examples\/gleam\/rhi\/vr-test\/renderer.h\n@@ -292,7 +292,7 @@\n \n camera.aspect = 1.6f;\n camera.fieldOfView = 70.f;\n- camera.zVals.far = 100.;\n+ camera.zVals.far_ = 100.;\n \n camera.position = Vecf3(0, 0, -9);\n \n"} {"commit":"ff39487a758f7521e55417d6b25680bdd703c1d5","subject":"separate node into new file","message":"separate node into new file\n","repos":"tofula\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder","returncode":1,"stderr":"error: pathspec 'contrib\/other-builds\/moses2\/TranslationModel\/Memory\/Node.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- contrib\/other-builds\/moses2\/TranslationModel\/Memory\/Node.h\n+++ contrib\/other-builds\/moses2\/TranslationModel\/Memory\/Node.h\n@@ -0,0 +1,139 @@\n+\/*\n+ * Node.h\n+ *\n+ * Created on: 22 Apr 2016\n+ * Author: hieu\n+ *\/\n+#pragma once\n+#include <boost\/unordered_map.hpp>\n+#include <boost\/foreach.hpp>\n+#include \"..\/..\/PhraseBased\/TargetPhrases.h\"\n+#include \"..\/..\/System.h\"\n+\n+namespace Moses2\n+{\n+class System;\n+\n+class Node\n+{\n+public:\n+ typedef boost::unordered_map<Word, Node, UnorderedComparer<Word>,\n+ UnorderedComparer<Word> > Children;\n+\n+ Node();\n+ ~Node();\n+ void AddRule(Phrase &source, TargetPhrase *target);\n+ TargetPhrases *Find(const Phrase &source, size_t pos = 0) const;\n+ const Node *Find(const Word &word) const;\n+\n+ const TargetPhrases *GetTargetPhrases() const\n+ { return m_targetPhrases; }\n+\n+ void SortAndPrune(size_t tableLimit, MemPool &pool, System &system);\n+\n+ const Children &GetChildren() const\n+ { return m_children; }\n+\n+protected:\n+ Children m_children;\n+ TargetPhrases *m_targetPhrases;\n+ Phrase *m_source;\n+ std::vector<TargetPhrase*> *m_unsortedTPS;\n+\n+ Node &AddRule(Phrase &source, TargetPhrase *target, size_t pos);\n+\n+};\n+\n+Node::Node() :\n+ m_targetPhrases(NULL), m_unsortedTPS(NULL)\n+{\n+}\n+\n+Node::~Node()\n+{\n+}\n+\n+void Node::AddRule(Phrase &source, TargetPhrase *target)\n+{\n+ AddRule(source, target, 0);\n+}\n+\n+Node &Node::AddRule(Phrase &source,\n+ TargetPhrase *target, size_t pos)\n+{\n+ if (pos == source.GetSize()) {\n+ if (m_unsortedTPS == NULL) {\n+ m_unsortedTPS = new std::vector<TargetPhrase*>();\n+ m_source = &source;\n+ }\n+\n+ m_unsortedTPS->push_back(target);\n+ return *this;\n+ }\n+ else {\n+ const Word &word = source[pos];\n+ Node &child = m_children[word];\n+ return child.AddRule(source, target, pos + 1);\n+ }\n+}\n+\n+TargetPhrases *Node::Find(const Phrase &source,\n+ size_t pos) const\n+{\n+ assert(source.GetSize());\n+ if (pos == source.GetSize()) {\n+ return m_targetPhrases;\n+ }\n+ else {\n+ const Word &word = source[pos];\n+ \/\/cerr << \"word=\" << word << endl;\n+ Children::const_iterator iter = m_children.find(word);\n+ if (iter == m_children.end()) {\n+ return NULL;\n+ }\n+ else {\n+ const Node &child = iter->second;\n+ return child.Find(source, pos + 1);\n+ }\n+ }\n+}\n+\n+const Node *Node::Find(const Word &word) const\n+{\n+ Children::const_iterator iter = m_children.find(word);\n+ if (iter == m_children.end()) {\n+ return NULL;\n+ }\n+ else {\n+ const Node &child = iter->second;\n+ return &child;\n+ }\n+\n+}\n+\n+void Node::SortAndPrune(size_t tableLimit, MemPool &pool,\n+ System &system)\n+{\n+ BOOST_FOREACH(Children::value_type &val, m_children){\n+ Node &child = val.second;\n+ child.SortAndPrune(tableLimit, pool, system);\n+ }\n+\n+ \/\/ prune target phrases in this node\n+ if (m_unsortedTPS) {\n+ m_targetPhrases = new (pool.Allocate<TargetPhrases>()) TargetPhrases(pool, m_unsortedTPS->size());\n+\n+ for (size_t i = 0; i < m_unsortedTPS->size(); ++i) {\n+ TargetPhrase *tp = (*m_unsortedTPS)[i];\n+ m_targetPhrases->AddTargetPhrase(*tp);\n+ }\n+\n+ m_targetPhrases->SortAndPrune(tableLimit);\n+ system.featureFunctions.EvaluateAfterTablePruning(system.GetSystemPool(), *m_targetPhrases, *m_source);\n+\n+ delete m_unsortedTPS;\n+ }\n+}\n+\n+} \/\/ namespace\n+\n"} {"commit":"927e885cd58b0f08873974c01ba0e9d720e01a86","subject":"Update RingOpenGL - Add Function (Source Code) : void glLineStipple(GLint factor,GLushort pattern)","message":"Update RingOpenGL - Add Function (Source Code) : void glLineStipple(GLint factor,GLushort pattern)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extensions\/ringopengl\/ring_opengl21.c\n+++ extensions\/ringopengl\/ring_opengl21.c\n@@ -4936,6 +4936,22 @@\n \t\treturn ;\n \t}\n \tglLightModeliv( (GLenum ) (int) RING_API_GETNUMBER(1),(GLint *) RING_API_GETCPOINTER(2,\"GLint\"));\n+}\n+\n+\n+RING_FUNC(ring_glLineStipple)\n+{\n+\tif ( RING_API_PARACOUNT != 2 ) {\n+\t\tRING_API_ERROR(RING_API_MISS2PARA);\n+\t\treturn ;\n+\t}\n+\tif ( ! RING_API_ISNUMBER(1) ) {\n+\t\tRING_API_ERROR(RING_API_BADPARATYPE);\n+\t\treturn ;\n+\t}\n+\tglLineStipple( (GLint ) RING_API_GETNUMBER(1),* (GLushort *) RING_API_GETCPOINTER(2,\"GLushort\"));\n+\tif (RING_API_ISCPOINTERNOTASSIGNED(2))\n+\t\tfree(RING_API_GETCPOINTER(2,\"GLushort\"));\n }\n \n RING_API void ringlib_init(RingState *pRingState)\n@@ -5180,4 +5196,5 @@\n \tring_vm_funcregister(\"gllightmodeli\",ring_glLightModeli);\n \tring_vm_funcregister(\"gllightmodelfv\",ring_glLightModelfv);\n \tring_vm_funcregister(\"gllightmodeliv\",ring_glLightModeliv);\n-}\n+\tring_vm_funcregister(\"gllinestipple\",ring_glLineStipple);\n+}\n"} {"commit":"14575c3cf0a72f4fbeb6dea6bc60a7981a5075bb","subject":"Don't use static buffers internally for formatstring().","message":"Don't use static buffers internally for formatstring().\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Objects\/stringobject.c\n+++ Objects\/stringobject.c\n@@ -580,18 +580,18 @@\n \n extern double fabs PROTO((double));\n \n-static char *\n-formatfloat(flags, prec, type, v)\n+static int\n+formatfloat(buf, flags, prec, type, v)\n+\tchar *buf;\n \tint flags;\n \tint prec;\n \tint type;\n \tobject *v;\n {\n \tchar fmt[20];\n-\tstatic char buf[120];\n \tdouble x;\n \tif (!getargs(v, \"d;float argument required\", &x))\n-\t\treturn NULL;\n+\t\treturn -1;\n \tif (prec < 0)\n \t\tprec = 6;\n \tif (prec > 50)\n@@ -600,43 +600,43 @@\n \t\ttype = 'g';\n \tsprintf(fmt, \"%%%s.%d%c\", (flags&F_ALT) ? \"#\" : \"\", prec, type);\n \tsprintf(buf, fmt, x);\n-\treturn buf;\n-}\n-\n-static char *\n-formatint(flags, prec, type, v)\n+\treturn strlen(buf);\n+}\n+\n+static int\n+formatint(buf, flags, prec, type, v)\n+\tchar *buf;\n \tint flags;\n \tint prec;\n \tint type;\n \tobject *v;\n {\n \tchar fmt[20];\n-\tstatic char buf[50];\n \tlong x;\n \tif (!getargs(v, \"l;int argument required\", &x))\n-\t\treturn NULL;\n+\t\treturn -1;\n \tif (prec < 0)\n \t\tprec = 1;\n \tsprintf(fmt, \"%%%s.%dl%c\", (flags&F_ALT) ? \"#\" : \"\", prec, type);\n \tsprintf(buf, fmt, x);\n-\treturn buf;\n-}\n-\n-static char *\n-formatchar(v)\n+\treturn strlen(buf);\n+}\n+\n+static int\n+formatchar(buf, v)\n+\tchar *buf;\n \tobject *v;\n {\n-\tstatic char buf[2];\n \tif (is_stringobject(v)) {\n \t\tif (!getargs(v, \"c;%c requires int or char\", &buf[0]))\n-\t\t\treturn NULL;\n+\t\t\treturn -1;\n \t}\n \telse {\n \t\tif (!getargs(v, \"b;%c requires int or char\", &buf[0]))\n-\t\t\treturn NULL;\n+\t\t\treturn -1;\n \t}\n \tbuf[1] = '\\0';\n-\treturn buf;\n+\treturn 1;\n }\n \n \n@@ -698,6 +698,7 @@\n \t\t\tchar *buf;\n \t\t\tint sign;\n \t\t\tint len;\n+\t\t\tchar tmpbuf[120]; \/* For format{float,int,char}() *\/\n \t\t\tfmt++;\n \t\t\tif (*fmt == '(') {\n \t\t\t\tchar *keystart;\n@@ -849,10 +850,10 @@\n \t\t\tcase 'X':\n \t\t\t\tif (c == 'i')\n \t\t\t\t\tc = 'd';\n-\t\t\t\tbuf = formatint(flags, prec, c, v);\n-\t\t\t\tif (buf == NULL)\n+\t\t\t\tbuf = tmpbuf;\n+\t\t\t\tlen = formatint(buf, flags, prec, c, v);\n+\t\t\t\tif (len < 0)\n \t\t\t\t\tgoto error;\n-\t\t\t\tlen = strlen(buf);\n \t\t\t\tsign = (c == 'd');\n \t\t\t\tif (flags&F_ZERO)\n \t\t\t\t\tfill = '0';\n@@ -862,19 +863,19 @@\n \t\t\tcase 'f':\n \t\t\tcase 'g':\n \t\t\tcase 'G':\n-\t\t\t\tbuf = formatfloat(flags, prec, c, v);\n-\t\t\t\tif (buf == NULL)\n+\t\t\t\tbuf = tmpbuf;\n+\t\t\t\tlen = formatfloat(buf, flags, prec, c, v);\n+\t\t\t\tif (len < 0)\n \t\t\t\t\tgoto error;\n-\t\t\t\tlen = strlen(buf);\n \t\t\t\tsign = 1;\n \t\t\t\tif (flags&F_ZERO)\n \t\t\t\t\tfill = '0';\n \t\t\t\tbreak;\n \t\t\tcase 'c':\n-\t\t\t\tbuf = formatchar(v);\n-\t\t\t\tif (buf == NULL)\n+\t\t\t\tbuf = tmpbuf;\n+\t\t\t\tlen = formatchar(buf, v);\n+\t\t\t\tif (len < 0)\n \t\t\t\t\tgoto error;\n-\t\t\t\tlen = 1;\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\terr_setstr(ValueError,\n"} {"commit":"81208acd6e67057644fb6e18e8e98f101d4b5fb5","subject":"Add missing returns","message":"Add missing returns\n","repos":"jims\/openal-soft,dapetcu21\/openal-soft,franklixuefei\/openal-soft,jims\/openal-soft,arkana-fts\/openal-soft,irungentoo\/openal-soft-tox,BeamNG\/openal-soft,aaronmjacobs\/openal-soft,alexxvk\/openal-soft,arkana-fts\/openal-soft,aaronmjacobs\/openal-soft,franklixuefei\/openal-soft,irungentoo\/openal-soft-tox,BeamNG\/openal-soft,Wemersive\/openal-soft,rryan\/openal-soft,rryan\/openal-soft,EddieRingle\/openal-soft,mmozeiko\/OpenAL-Soft,mmozeiko\/OpenAL-Soft,EddieRingle\/openal-soft,Wemersive\/openal-soft,alexxvk\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- OpenAL32\/Include\/alu.h\n+++ OpenAL32\/Include\/alu.h\n@@ -51,52 +51,52 @@\n \n #ifndef HAVE_SQRTF\n static __inline float sqrtf(float x)\n-{ (float)sqrt(x); }\n+{ return (float)sqrt(x); }\n #endif\n \n #ifndef HAVE_COSF\n static __inline float cosf(float x)\n-{ (float)cos(x); }\n+{ return (float)cos(x); }\n #endif\n \n #ifndef HAVE_SINF\n static __inline float sinf(float x)\n-{ (float)sin(x); }\n+{ return (float)sin(x); }\n #endif\n \n #ifndef HAVE_ACOSF\n static __inline float acosf(float x)\n-{ (float)acos(x); }\n+{ return (float)acos(x); }\n #endif\n \n #ifndef HAVE_ASINF\n static __inline float asinf(float x)\n-{ (float)asin(x); }\n+{ return (float)asin(x); }\n #endif\n \n #ifndef HAVE_ATANF\n static __inline float atanf(float x)\n-{ (float)atan(x); }\n+{ return (float)atan(x); }\n #endif\n \n #ifndef HAVE_ATAN2F\n static __inline float atan2f(float x, float y)\n-{ (float)atan2(x, y); }\n+{ return (float)atan2(x, y); }\n #endif\n \n #ifndef HAVE_FABSF\n static __inline float fabsf(float x)\n-{ (float)fabs(x); }\n+{ return (float)fabs(x); }\n #endif\n \n #ifndef HAVE_LOG10F\n static __inline float log10f(float x)\n-{ (float)log10(x); }\n+{ return (float)log10(x); }\n #endif\n \n #ifndef HAVE_FLOORF\n static __inline float floorf(float x)\n-{ (float)floor(x); }\n+{ return (float)floor(x); }\n #endif\n \n #ifdef __cplusplus\n"} {"commit":"e7640e994c7c98822de45e3d718f94e2a5255a19","subject":"Resolve a potential double free within the executable contraction table code. (dm)","message":"Resolve a potential double free within the executable contraction table code. (dm)\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/ctb_compile.c\n+++ Programs\/ctb_compile.c\n@@ -560,7 +560,11 @@\n logMessage(LOG_DEBUG, \"external contraction table stopped: %s\", table->command);\n table->data.external.commandStarted = 0;\n \n- if (table->data.external.input.buffer) free(table->data.external.input.buffer);\n+ if (table->data.external.input.buffer) {\n+ free(table->data.external.input.buffer);\n+ table->data.external.input.buffer = NULL;\n+ table->data.external.input.size = 0;\n+ }\n }\n }\n \n"} {"commit":"b6a3fb26a9ba5007f42fccc59e73b623d1da8614","subject":"Add missing friends to class for RxStatus.","message":"Add missing friends to class for RxStatus.\n","repos":"chrisstaite\/TeensyDmx,chrisstaite\/TeensyDmx,chrisstaite\/TeensyDmx","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- TeensyDmx.h\n+++ TeensyDmx.h\n@@ -142,6 +142,11 @@\n struct RDMINIT *m_rdm;\n char m_deviceLabel[32];\n \n+#ifndef IRQ_UART0_ERROR\n+ friend void UART0RxStatus(void);\n+ friend void UART1RxStatus(void);\n+ friend void UART2RxStatus(void);\n+#endif\n friend void UART0TxStatus(void);\n friend void UART1TxStatus(void);\n friend void UART2TxStatus(void);\n"} {"commit":"2280312501aa7ad34ab9fccd353e0036b1fd8038","subject":"Timestamp added","message":"Timestamp added\n","repos":"brain5lug\/i2pd,hypnosis-i2p\/i2pd,brain5lug\/i2pd,kytvi2p\/i2pd,majestrate\/i2pd,majestrate\/kovri,01BTC10\/i2pd,EinMByte\/i2pd,kytvi2p\/i2pd,01BTC10\/i2pd,PurpleI2P\/i2pd,majestrate\/i2pd,01BTC10\/i2pd,mlt\/i2pd,PurpleI2P\/i2pd,manasb\/i2pd,edwtjo\/i2pd,majestrate\/i2pd,hypnosis-i2p\/i2pd,EinMByte\/i2pd,EinMByte\/i2pd,PurpleI2P\/i2pd,mlt\/i2pd,brain5lug\/i2pd,edwtjo\/i2pd,EinMByte\/i2pd,brain5lug\/i2pd,supertanglang\/i2pd,mlt\/i2pd,supertanglang\/i2pd,kytvi2p\/i2pd,hypnosis-i2p\/i2pd,PurpleI2P\/i2pd,majestrate\/kovri,majestrate\/kovri,majestrate\/kovri,manasb\/i2pd,majestrate\/i2pd,mlt\/i2pd,mlt\/i2pd,supertanglang\/i2pd,01BTC10\/i2pd,majestrate\/i2pd,EinMByte\/i2pd,hypnosis-i2p\/i2pd,EinMByte\/i2pd,hypnosis-i2p\/i2pd,edwtjo\/i2pd,mlt\/i2pd","returncode":1,"stderr":"error: pathspec 'Timestamp.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- Timestamp.h\n+++ Timestamp.h\n@@ -0,0 +1,26 @@\n+#ifndef TIMESTAMP_H__\n+#define TIMESTAMP_H__\n+\n+#include <inttypes.h>\n+#include <chrono>\n+\n+namespace i2p\n+{\n+namespace util\n+{\n+\tinline uint64_t GetMillisecondsSinceEpoch ()\n+\t{\n+\t\treturn std::chrono::duration_cast<std::chrono::milliseconds>(\n+\t\t\t \t std::chrono::system_clock::now().time_since_epoch()).count ();\n+\t}\n+\n+\tinline uint32_t GetHoursSinceEpoch ()\n+\t{\n+\t\treturn std::chrono::duration_cast<std::chrono::hours>(\n+\t\t\t \t std::chrono::system_clock::now().time_since_epoch()).count ();\n+\t}\n+}\n+}\n+\n+#endif\n+\n"} {"commit":"c702b50045fee32b6fbd2979cd5e413b6fc62a3c","subject":"* Fix wait UART ready when using Tx interrupts with syscalls","message":"* Fix wait UART ready when using Tx interrupts with syscalls\n","repos":"SMFSW\/HARMcksL","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- UART_term.c\n+++ UART_term.c\n@@ -73,6 +73,9 @@\n FctERR NONNULL__ UART_Term_Send(UART_HandleTypeDef * const huart, const char * str, const int len)\n {\n \t#if STDREAM__UART_TX_IT\n+\t\t#if STDREAM_RDIR_SND_SYSCALLS\n+\t\tUART_Term_Wait_Ready(huart);\n+\t\t#endif\n \t\treturn HALERRtoFCTERR(HAL_UART_Transmit_IT(huart, (uint8_t *) str, len));\n \t#else\n \t\treturn HALERRtoFCTERR(HAL_UART_Transmit(huart, (uint8_t *) str, len, 30));\n"} {"commit":"734412501b623643165424d7a839efa21471bbf7","subject":"Staging: rtl8187se: Remove unnecessary comments in ieee80211_crypt_ccmp.c","message":"Staging: rtl8187se: Remove unnecessary comments in ieee80211_crypt_ccmp.c\n\nThis patch removes unnecessary comments written in ieee80211\/ieee80211_crypt_ccmp.c.\nAnd hence also, removes the following checkpatch.pl issue-\nERROR: do not use C99 \/\/ comments\n\nSigned-off-by: Rashika Kheria <62a2cbd3422b0d621dafb7ceeff40187aeaed4ed@gmail.com>\nReviewed-by: Josh Triplett <c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@joshtriplett.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/rtl8187se\/ieee80211\/ieee80211_crypt_ccmp.c\n+++ drivers\/staging\/rtl8187se\/ieee80211\/ieee80211_crypt_ccmp.c\n@@ -11,7 +11,6 @@\n \n #define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \n-\/\/#include <linux\/config.h>\n #include <linux\/module.h>\n #include <linux\/init.h>\n #include <linux\/slab.h>\n@@ -130,7 +129,6 @@\n \tqc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&\n \t\t (WLAN_FC_GET_STYPE(fc) & 0x08));\n \t*\/\n-\t\/\/ fixed by David :2006.9.6\n \tqc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&\n \t\t (WLAN_FC_GET_STYPE(fc) & 0x80));\n \taad_len = 22;\n@@ -212,7 +210,6 @@\n \tpos = skb_push(skb, CCMP_HDR_LEN);\n \tmemmove(pos, pos + CCMP_HDR_LEN, hdr_len);\n \tpos += hdr_len;\n-\/\/\tmic = skb_put(skb, CCMP_MIC_LEN);\n \n \ti = CCMP_PN_LEN - 1;\n \twhile (i >= 0) {\n@@ -232,7 +229,6 @@\n \t*pos++ = key->tx_pn[0];\n \n \thdr = (struct ieee80211_hdr_4addr *)skb->data;\n-\t\/\/mic is moved to here by john\n \tmic = skb_put(skb, CCMP_MIC_LEN);\n \n \tccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);\n@@ -430,7 +426,6 @@\n \n void ieee80211_ccmp_null(void)\n {\n-\/\/ printk(\"============>%s()\\n\", __func__);\n \treturn;\n }\n static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {\n"} {"commit":"73b7ea2423c0d4a36af99ace926553b901d7c8fa","subject":"Add solution to palindrome.","message":"Add solution to palindrome.\n","repos":"clasnake\/hackermeter,clasnake\/hackermeter","returncode":1,"stderr":"error: pathspec 'palindrome.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- palindrome.c\n+++ palindrome.c\n@@ -0,0 +1,28 @@\n+#include <stdio.h>\n+#include <string.h>\n+\n+int is_palindrome(char* s, unsigned n) {\n+\tunsigned i;\n+\tfor (i = 0; i < n \/ 2; i++) {\n+\t\tif (s[i] != s[n - i - 1]) {\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\treturn 1;\n+}\n+int main() {\n+\tint cases;\n+\tscanf(\"%d\", &cases);\n+\twhile (cases--) {\n+\t\tchar* s;\n+\t\tscanf(\"%s\", s);\n+\t\tunsigned n = strlen(s);\n+\t\tif (is_palindrome(s, n)) {\n+\t\t\tprintf(\"Y\\n\");\n+\t\t}\n+\t\telse {\n+\t\t\tprintf(\"N\\n\");\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n"} {"commit":"6dc0b710650b77b233b2a678836277c6a8b1ec46","subject":"Change Float_t to Double32_t (Markus)","message":"Change Float_t to Double32_t (Markus)\n\n","repos":"alisw\/AliRoot,ecalvovi\/AliRoot,mkrzewic\/AliRoot,alisw\/AliRoot,coppedis\/AliRoot,jgrosseo\/AliRoot,coppedis\/AliRoot,alisw\/AliRoot,shahor02\/AliRoot,coppedis\/AliRoot,sebaleh\/AliRoot,mkrzewic\/AliRoot,miranov25\/AliRoot,coppedis\/AliRoot,ALICEHLT\/AliRoot,ALICEHLT\/AliRoot,sebaleh\/AliRoot,sebaleh\/AliRoot,mkrzewic\/AliRoot,miranov25\/AliRoot,ecalvovi\/AliRoot,miranov25\/AliRoot,ALICEHLT\/AliRoot,ecalvovi\/AliRoot,jgrosseo\/AliRoot,shahor02\/AliRoot,shahor02\/AliRoot,mkrzewic\/AliRoot,alisw\/AliRoot,jgrosseo\/AliRoot,shahor02\/AliRoot,jgrosseo\/AliRoot,sebaleh\/AliRoot,ecalvovi\/AliRoot,miranov25\/AliRoot,coppedis\/AliRoot,ALICEHLT\/AliRoot,jgrosseo\/AliRoot,shahor02\/AliRoot,mkrzewic\/AliRoot,ALICEHLT\/AliRoot,ecalvovi\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,coppedis\/AliRoot,jgrosseo\/AliRoot,coppedis\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,sebaleh\/AliRoot,alisw\/AliRoot,alisw\/AliRoot,miranov25\/AliRoot,ecalvovi\/AliRoot,sebaleh\/AliRoot,miranov25\/AliRoot,alisw\/AliRoot,mkrzewic\/AliRoot,mkrzewic\/AliRoot,shahor02\/AliRoot,sebaleh\/AliRoot,shahor02\/AliRoot,ecalvovi\/AliRoot,alisw\/AliRoot,jgrosseo\/AliRoot,coppedis\/AliRoot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- STEER\/AliESDZDC.h\n+++ STEER\/AliESDZDC.h\n@@ -21,14 +21,14 @@\n AliESDZDC(const AliESDZDC& zdc);\n AliESDZDC& operator=(const AliESDZDC& zdc);\n \n- Float_t GetZDCN1Energy() const {return fZDCN1Energy;}\n- Float_t GetZDCP1Energy() const {return fZDCP1Energy;}\n- Float_t GetZDCN2Energy() const {return fZDCN2Energy;}\n- Float_t GetZDCP2Energy() const {return fZDCP2Energy;}\n- Float_t GetZDCEMEnergy() const {return fZDCEMEnergy;}\n- Int_t GetZDCParticipants() const {return fZDCParticipants;}\n- void SetZDC(Float_t n1Energy, Float_t p1Energy, Float_t emEnergy,\n- Float_t n2Energy, Float_t p2Energy, Int_t participants) \n+ Double_t GetZDCN1Energy() const {return fZDCN1Energy;}\n+ Double_t GetZDCP1Energy() const {return fZDCP1Energy;}\n+ Double_t GetZDCN2Energy() const {return fZDCN2Energy;}\n+ Double_t GetZDCP2Energy() const {return fZDCP2Energy;}\n+ Double_t GetZDCEMEnergy() const {return fZDCEMEnergy;}\n+ Int_t GetZDCParticipants() const {return fZDCParticipants;}\n+ void SetZDC(Double_t n1Energy, Double_t p1Energy, Double_t emEnergy,\n+\t\t Double_t n2Energy, Double_t p2Energy, Int_t participants) \n {fZDCN1Energy=n1Energy; fZDCP1Energy=p1Energy; fZDCEMEnergy=emEnergy;\n fZDCN2Energy=n2Energy; fZDCP2Energy=p2Energy; fZDCParticipants=participants;}\n \n@@ -37,14 +37,14 @@\n \n private:\n \n- Float_t fZDCN1Energy; \/\/ reconstructed energy in the neutron ZDC\n- Float_t fZDCP1Energy; \/\/ reconstructed energy in the proton ZDC\n- Float_t fZDCN2Energy; \/\/ reconstructed energy in the neutron ZDC\n- Float_t fZDCP2Energy; \/\/ reconstructed energy in the proton ZDC\n- Float_t fZDCEMEnergy; \/\/ reconstructed energy in the electromagnetic ZDC\n- Int_t fZDCParticipants; \/\/ number of participants estimated by the ZDC\n+ Double32_t fZDCN1Energy; \/\/ reconstructed energy in the neutron ZDC\n+ Double32_t fZDCP1Energy; \/\/ reconstructed energy in the proton ZDC\n+ Double32_t fZDCN2Energy; \/\/ reconstructed energy in the neutron ZDC\n+ Double32_t fZDCP2Energy; \/\/ reconstructed energy in the proton ZDC\n+ Double32_t fZDCEMEnergy; \/\/ reconstructed energy in the electromagnetic ZDC\n+ Int_t fZDCParticipants; \/\/ number of participants estimated by the ZDC\n \n- ClassDef(AliESDZDC,1)\n+ ClassDef(AliESDZDC,2)\n };\n \n #endif\n"} {"commit":"d418d40cd51929ce0b3e422468bc04087fafb2f0","subject":"updrated the class version (forgot to do so after changing the QA data members)","message":"updrated the class version (forgot to do so after changing the QA data members)\n\n","repos":"alisw\/AliRoot,jgrosseo\/AliRoot,sebaleh\/AliRoot,ecalvovi\/AliRoot,coppedis\/AliRoot,jgrosseo\/AliRoot,coppedis\/AliRoot,ecalvovi\/AliRoot,ALICEHLT\/AliRoot,mkrzewic\/AliRoot,mkrzewic\/AliRoot,coppedis\/AliRoot,jgrosseo\/AliRoot,shahor02\/AliRoot,alisw\/AliRoot,mkrzewic\/AliRoot,mkrzewic\/AliRoot,sebaleh\/AliRoot,mkrzewic\/AliRoot,miranov25\/AliRoot,sebaleh\/AliRoot,ALICEHLT\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,shahor02\/AliRoot,ALICEHLT\/AliRoot,jgrosseo\/AliRoot,alisw\/AliRoot,alisw\/AliRoot,miranov25\/AliRoot,shahor02\/AliRoot,jgrosseo\/AliRoot,jgrosseo\/AliRoot,sebaleh\/AliRoot,ecalvovi\/AliRoot,jgrosseo\/AliRoot,miranov25\/AliRoot,shahor02\/AliRoot,alisw\/AliRoot,ecalvovi\/AliRoot,sebaleh\/AliRoot,miranov25\/AliRoot,mkrzewic\/AliRoot,ecalvovi\/AliRoot,miranov25\/AliRoot,ecalvovi\/AliRoot,coppedis\/AliRoot,sebaleh\/AliRoot,shahor02\/AliRoot,mkrzewic\/AliRoot,coppedis\/AliRoot,ALICEHLT\/AliRoot,alisw\/AliRoot,sebaleh\/AliRoot,ecalvovi\/AliRoot,coppedis\/AliRoot,alisw\/AliRoot,shahor02\/AliRoot,ALICEHLT\/AliRoot,shahor02\/AliRoot,ALICEHLT\/AliRoot,miranov25\/AliRoot,miranov25\/AliRoot,coppedis\/AliRoot,coppedis\/AliRoot,alisw\/AliRoot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- STEER\/AliRunTag.h\n+++ STEER\/AliRunTag.h\n@@ -99,7 +99,7 @@\n Int_t fESLength; \/\/ Length of the Event Specie Length\n Bool_t * fEventSpecies; \/\/[fESLength] EventSpecies in this run\t\n \n- ClassDef(AliRunTag,4) \/\/(ClassName, ClassVersion)\n+ ClassDef(AliRunTag,5) \/\/(ClassName, ClassVersion)\n };\n \/\/___________________________________________________________________________\n \n"} {"commit":"1fde35ecef9fc9d9c14442fe80d4705e706f3ee0","subject":"Comment out the string behind #endif","message":"Comment out the string behind #endif\n","repos":"tn-mai\/NDKOpenGLES2App,tn-mai\/NDKOpenGLES2App","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Shared\/FontInfo.h\n+++ Shared\/FontInfo.h\n@@ -45,4 +45,4 @@\n \n } \/\/ namespace Mai\n \n-#endif MAI_FONTINFO_H_INCLUDED\n+#endif \/\/ MAI_FONTINFO_H_INCLUDED\n"} {"commit":"39ddc090781f07045f39f0b45bdfa8d21ba59d2f","subject":"remove unused constant","message":"remove unused constant\n","repos":"jblomer\/ramcloud-sqlite3,jblomer\/ramcloud-sqlite3","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- vfs-ramcloud.c\n+++ vfs-ramcloud.c\n@@ -26,11 +26,6 @@\n \n #ifdef __cplusplus\n extern \"C\" {\n-#endif\n-\n-\/\/ Size of the write buffer used by journal files in bytes.\n-#ifndef SQLITE_RCVFS_BUFFERSZ\n-# define SQLITE_RCVFS_BUFFERSZ 8192\n #endif\n \n \/\/ Default page size\n"} {"commit":"5d70b50283c03b9bc544b145bcd928d0d32da57c","subject":"fix conflicts created by import","message":"fix conflicts created by import\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/ipfilter\/fil.c\n+++ contrib\/ipfilter\/fil.c\n@@ -274,32 +274,35 @@\n \t\tint minicmpsz = sizeof(struct icmp);\n \t\ticmphdr_t *icmp;\n \n-\t\tif (fin->fin_dlen > 1)\n+\t\tif (!off && (fin->fin_dlen > 1)) {\n \t\t\tfin->fin_data[0] = *(u_short *)tcp;\n \n+\t\t\ticmp = (icmphdr_t *)tcp;\n+\n+\t\t\tif (icmp->icmp_type == ICMP_ECHOREPLY ||\n+\t\t\t icmp->icmp_type == ICMP_ECHO)\n+\t\t\t\tminicmpsz = ICMP_MINLEN;\n+\n+\t\t\t\/*\n+\t\t\t * type(1) + code(1) + cksum(2) + id(2) seq(2) +\n+\t\t\t * 3*timestamp(3*4)\n+\t\t\t *\/\n+\t\t\telse if (icmp->icmp_type == ICMP_TSTAMP ||\n+\t\t\t\t icmp->icmp_type == ICMP_TSTAMPREPLY)\n+\t\t\t\tminicmpsz = 20;\n+\n+\t\t\t\/*\n+\t\t\t * type(1) + code(1) + cksum(2) + id(2) seq(2) +\n+\t\t\t * mask(4)\n+\t\t\t *\/\n+\t\t\telse if (icmp->icmp_type == ICMP_MASKREQ ||\n+\t\t\t\t icmp->icmp_type == ICMP_MASKREPLY)\n+\t\t\t\tminicmpsz = 12;\n+\t\t}\n+\n \t\tif ((!(plen >= hlen + minicmpsz) && !off) ||\n-\t\t (off && off < sizeof(struct icmp))) {\n+\t\t (off && off < sizeof(struct icmp)))\n \t\t\tfi->fi_fl |= FI_SHORT;\n-\t\t\tif (fin->fin_dlen < 2)\n-\t\t\t\tbreak;\n-\t\t}\n-\n-\t\ticmp = (icmphdr_t *)tcp;\n-\n-\t\tif (!off && (icmp->icmp_type == ICMP_ECHOREPLY ||\n-\t\t icmp->icmp_type == ICMP_ECHO))\n-\t\t\tminicmpsz = ICMP_MINLEN;\n-\n-\t\t\/* type(1) + code(1) + cksum(2) + id(2) seq(2) +\n-\t\t * 3*timestamp(3*4) *\/\n-\t\telse if (!off && (icmp->icmp_type == ICMP_TSTAMP ||\n-\t\t icmp->icmp_type == ICMP_TSTAMPREPLY))\n-\t\t\tminicmpsz = 20;\n-\n-\t\t\/* type(1) + code(1) + cksum(2) + id(2) seq(2) + mask(4) *\/\n-\t\telse if (!off && (icmp->icmp_type == ICMP_MASKREQ ||\n-\t\t icmp->icmp_type == ICMP_MASKREPLY))\n-\t\t\tminicmpsz = 12;\n \n \t\tbreak;\n \t}\n@@ -1398,7 +1401,7 @@\n * SUCH DAMAGE.\n *\n *\t@(#)uipc_mbuf.c\t8.2 (Berkeley) 1\/4\/94\n- * $Id: fil.c,v 2.35.2.26 2000\/10\/24 11:58:17 darrenr Exp $\n+ * $Id: fil.c,v 2.35.2.27 2000\/10\/26 21:20:54 darrenr Exp $\n *\/\n \/*\n * Copy data from an mbuf chain starting \"off\" bytes from the beginning,\n"} {"commit":"c75b76e20ae06e506ef72a3339208f14fd376493","subject":"","message":"\n\nwarnings","repos":"antidotcb\/googletest,xnagireddy\/googletest,google\/googletest,gianricardo\/googletest,gianricardo\/googletest,google\/googletest,antidotcb\/googletest,jlanecox\/googletest,google\/googletest,antidotcb\/googletest,jlanecox\/googletest,empiredan\/googletest,jlanecox\/googletest,gianricardo\/googletest,xnagireddy\/googletest,antidotcb\/googletest,google\/googletest,xnagireddy\/googletest,xnagireddy\/googletest,jlanecox\/googletest,empiredan\/googletest,empiredan\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- googlemock\/include\/gmock\/internal\/gmock-internal-utils.h\n+++ googlemock\/include\/gmock\/internal\/gmock-internal-utils.h\n@@ -52,7 +52,8 @@\n \/\/ C4805('==': unsafe mix of type 'const int' and type 'const bool')\n #ifdef _MSC_VER\n # pragma warning(push)\n-# pragma warning(disable:4100 4805;)\n+# pragma warning(disable:4100)\n+# pragma warning(disable:4805)\n #endif\n \n \/\/ Joins a vector of strings as if they are fields of a tuple; returns\n"} {"commit":"4d7e9227c7582fdb2c8605fd1e41948c5f7010e5","subject":"eliminate reference to rejected TODO ticket.","message":"eliminate reference to rejected TODO ticket.\n\n\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@36181 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- compilers\/imcc\/optimizer.c\n+++ compilers\/imcc\/optimizer.c\n@@ -43,7 +43,7 @@\n cfg_optimize may be called multiple times during the construction of the\n CFG depending on whether or not it finds anything to optimize.\n \n-RT #46277: subst_constants ... rewrite e.g. add_i_ic_ic -- where does this happen?\n+subst_constants ... rewrite e.g. add_i_ic_ic\n \n optimizer\n ---------\n"} {"commit":"f07ef395ad4cd050e695edfec217ceb2158220a3","subject":"drivers\/char\/riscom8: clean up irq handling","message":"drivers\/char\/riscom8: clean up irq handling\n\nMake irq handling more efficient, by passing board pointer via\nrequest_irq() to our irq handler's dev_id argument.\n\nThis eliminates a table lookup upon each interrupt, and eliminates an\nassociated global variable (the table).\n\nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/riscom8.c\n+++ drivers\/char\/riscom8.c\n@@ -79,7 +79,6 @@\n \n #define RS_EVENT_WRITE_WAKEUP\t0\n \n-static struct riscom_board * IRQ_to_board[16];\n static struct tty_driver *riscom_driver;\n \n static struct riscom_board rc_board[RC_NBOARD] = {\n@@ -537,15 +536,13 @@\n }\n \n \/* The main interrupt processing routine *\/\n-static irqreturn_t rc_interrupt(int irq, void * dev_id)\n+static irqreturn_t rc_interrupt(int dummy, void * dev_id)\n {\n \tunsigned char status;\n \tunsigned char ack;\n-\tstruct riscom_board *bp;\n+\tstruct riscom_board *bp = dev_id;\n \tunsigned long loop = 0;\n \tint handled = 0;\n-\n-\tbp = IRQ_to_board[irq];\n \n \tif (!(bp->flags & RC_BOARD_ACTIVE))\n \t\treturn IRQ_NONE;\n@@ -603,7 +600,7 @@\n *\/\n \n \/* Called with disabled interrupts *\/\n-static inline int rc_setup_board(struct riscom_board * bp)\n+static int rc_setup_board(struct riscom_board * bp)\n {\n \tint error;\n \n@@ -611,7 +608,7 @@\n \t\treturn 0;\n \t\n \terror = request_irq(bp->irq, rc_interrupt, IRQF_DISABLED,\n-\t\t\t \"RISCom\/8\", NULL);\n+\t\t\t \"RISCom\/8\", bp);\n \tif (error) \n \t\treturn error;\n \t\n@@ -619,14 +616,13 @@\n \tbp->DTR = ~0;\n \trc_out(bp, RC_DTR, bp->DTR);\t \/* Drop DTR on all ports *\/\n \t\n-\tIRQ_to_board[bp->irq] = bp;\n \tbp->flags |= RC_BOARD_ACTIVE;\n \t\n \treturn 0;\n }\n \n \/* Called with disabled interrupts *\/\n-static inline void rc_shutdown_board(struct riscom_board *bp)\n+static void rc_shutdown_board(struct riscom_board *bp)\n {\n \tif (!(bp->flags & RC_BOARD_ACTIVE))\n \t\treturn;\n@@ -634,7 +630,6 @@\n \tbp->flags &= ~RC_BOARD_ACTIVE;\n \t\n \tfree_irq(bp->irq, NULL);\n-\tIRQ_to_board[bp->irq] = NULL;\n \t\n \tbp->DTR = ~0;\n \trc_out(bp, RC_DTR, bp->DTR);\t \/* Drop DTR on all ports *\/\n@@ -1594,7 +1589,6 @@\n \tif (!riscom_driver)\t\n \t\treturn -ENOMEM;\n \t\n-\tmemset(IRQ_to_board, 0, sizeof(IRQ_to_board));\n \triscom_driver->owner = THIS_MODULE;\n \triscom_driver->name = \"ttyL\";\n \triscom_driver->major = RISCOM8_NORMAL_MAJOR;\n"} {"commit":"7736c715d08a53ad89d17b63b8f5124adce39f67","subject":"clk: at91: fix pmc_clk_ids data type attriubte","message":"clk: at91: fix pmc_clk_ids data type attriubte\n\nFix pmc_clk_ids data type attribute (__initdata -> __initconst).\n\nSigned-off-by: Boris BREZILLON <584ea62cadf5ee95d42aa81561c478d4b98fe58d@overkiz.com>\nReported-by: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nAcked-by: Mike Turquette <6dab61939fc5e23761050a66932f032dceda5ebf@linaro.org>\nSigned-off-by: Nicolas Ferre <45b517be0e5ec6dc3a39715767c1d18e090d39b4@atmel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"178c81e58e91559fd2c6b1cae43c8f573a2ead36","subject":"dma: fsl-edma: fix static checker warning of NULL dereference","message":"dma: fsl-edma: fix static checker warning of NULL dereference\n\nThe static checker reports following warning:\n\tdrivers\/dma\/fsl-edma.c:732 fsl_edma_xlate()\n\terror: we previously assumed 'chan' could be null (see line 737)\nThe changes of the loop cursor in the iteration may result in\nNULL dereference when dma_get_slave_channel failed but loop\nwill continue. So use list_for_each_entry_safe() instead of\nlist_for_each_entry() to against this.\n\nReported-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Jingchang Lu <4db3b194e3d265fee9d2d9f059d65eb497fc7a1b@freescale.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"5f0c3f080ab2a2eed1f0c68dd25b0dfaaa2941b9","subject":"msm: kgsl: Allow sync points to be created on the submitter's context","message":"msm: kgsl: Allow sync points to be created on the submitter's context\n\nThere are situations where a submitting thread may wish to create a\nsyncpoint on an already issued timestamp to pause a context until a\nprevious command has been retired. Relax the restriction against\nsubmitting a sync point against one's own context and only check to\nmake sure the user isn't submitting a syncpoint against a future\ntimestamp (which would be a certain deadlock).\n\nChange-Id: Ic0dedbad883fc228da0d94c8416a88504f5d1377\nSigned-off-by: Jordan Crouse <fec53db8c4887e6e95defbb5052bc6438029c1e6@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/msm\/kgsl.c\n+++ drivers\/gpu\/msm\/kgsl.c\n@@ -1634,12 +1634,23 @@\n \tif (context == NULL)\n \t\treturn -EINVAL;\n \n-\t\/* Sanity check - you can't create a sync point on your own context *\/\n+\t\/*\n+\t * We allow somebody to create a sync point on their own context.\n+\t * This has the effect of delaying a command from submitting until the\n+\t * dependent command has cleared. That said we obviously can't let them\n+\t * create a sync point on a future timestamp.\n+\t *\/\n+\n \tif (context == cmdbatch->context) {\n-\t\tKGSL_DRV_ERR(device,\n-\t\t\t\"Cannot create a sync point on your own context %d\\n\",\n-\t\t\tcontext->id);\n-\t\tgoto done;\n+\t\tunsigned int queued = kgsl_readtimestamp(device, context,\n+\t\t\tKGSL_TIMESTAMP_QUEUED);\n+\n+\t\tif (timestamp_cmp(sync->timestamp, queued) > 0) {\n+\t\t\tKGSL_DRV_ERR(device,\n+\t\t\t\"Cannot create syncpoint for future timestamp %d (current %d)\\n\",\n+\t\t\t\tsync->timestamp, queued);\n+\t\t\tgoto done;\n+\t\t}\n \t}\n \n \tevent = kzalloc(sizeof(*event), GFP_KERNEL);\n"} {"commit":"db59ac434230c2d6c051bb314f320ad977e6841d","subject":"hwmon: (asb100) Fix vrm write operation","message":"hwmon: (asb100) Fix vrm write operation\n\nvrm is an u8, so the written value needs to be limited to [0, 255].\n\nSigned-off-by: Axel Lin <b6ffd6973e972cb999e8e535ab74da7fee0c035f@ingics.com>\nSigned-off-by: Guenter Roeck <ba324ca7b1c77fc20bb970d5aff6eea9377918a5@roeck-us.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"1fa6d768d67dc3223ab93a5124d68e439cbe37a5","subject":"added a new function to convert ssl_util minor error codes into gssapi error codes.","message":"added a new function to convert ssl_util minor error codes into\ngssapi error codes.\n","repos":"globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gsi\/gssapi\/source\/library\/gsserr.c\n+++ gsi\/gssapi\/source\/library\/gsserr.c\n@@ -138,3 +138,202 @@\n {\n \treturn ERR_user_lib_gsserr_number;\n }\n+\n+\/**********************************************************************\n+Function: convert_minor_codes()\n+\n+Description:\n+ converts error codes created in various libraries into gss minor codes\n+ currently it is only implemented to convert SSL minor codes from\n+ sslutils.h\n+\n+Parameters:\n+ lib - The number of the error library that\n+ the error code was defined under it can be obtained using\n+ ERR_GET_LIB(ERR_peek_error()) or passed a constant if the library \n+ the error is under is known.\n+\n+ reason - The number of the error reason, it can be obtained using\n+ ERR_GET_REASON(ERR_peek_error())\n+\n+Returns:\n+ an unsigned long suitable for use as a GSS minor code\n+**********************************************************************\/\n+\n+\n+OM_uint32\n+convert_minor_codes(const int lib, const int reason)\n+{\n+ unsigned long retval = 0;\n+\n+#ifdef DEBUG\n+ fprintf(stderr,\"lib: %i, reason: %i, ssl_lib: %i\\n\",\n+ lib,reason,ERR_user_lib_prxyerr_num());\n+#endif\n+\n+ if (lib == ERR_user_lib_prxyerr_num()) \n+ {\n+ switch (reason)\n+ {\n+ case PRXYERR_R_USER_CERT_EXPIRED: \n+ retval = GSSERR_PRXY_R_USER_CERT_EXPIRED;\n+ break;\n+ case PRXYERR_R_SERVER_CERT_EXPIRED: \n+ retval = GSSERR_PRXY_R_SERVER_CERT_EXPIRED;\n+ break;\n+ case PRXYERR_R_NO_PROXY:\n+ retval = GSSERR_PRXY_R_NO_PROXY;\n+ break;\n+ case PRXYERR_R_PROXY_EXPIRED:\n+ retval = GSSERR_PRXY_R_PROXY_EXPIRED;\n+ break;\n+ case PRXYERR_R_BAD_PROXY_ISSUER:\n+ retval = GSSERR_PRXY_R_BAD_PROXY_ISSUER;\n+ break;\n+ case PRXYERR_R_LPROXY_MISSED_USED:\n+ retval = GSSERR_PRXY_R_LPROXY_MISSED_USED;\n+ break;\n+ case PRXYERR_R_CRL_SIGNATURE_FAILURE:\n+ retval = GSSERR_PRXY_R_CRL_SIGNATURE_FAILURE;\n+ break;\n+ case PRXYERR_R_CRL_NEXT_UPDATE_FIELD:\n+ retval = GSSERR_PRXY_R_CRL_NEXT_UPDATE_FIELD;\n+ break;\n+ case PRXYERR_R_CRL_HAS_EXPIRED:\n+ retval = GSSERR_PRXY_R_CRL_HAS_EXPIRED;\n+ break;\n+ case PRXYERR_R_CERT_REVOKED:\n+ retval = GSSERR_PRXY_R_CERT_REVOKED;\n+ break;\n+ case PRXYERR_R_CA_NOPATH:\n+ retval = GSSERR_PRXY_R_CA_NOPATH;\n+ break;\n+ case PRXYERR_R_CA_NOFILE:\n+ retval = GSSERR_PRXY_R_CA_NOFILE;\n+ break;\n+ case PRXYERR_R_CA_POLICY_RETRIEVE:\n+ retval = GSSERR_PRXY_R_CA_POLICY_RETRIEVE;\n+ break;\n+ case PRXYERR_R_CA_POLICY_PARSE:\n+ retval = GSSERR_PRXY_R_CA_POLICY_PARSE;\n+ break;\n+ case PRXYERR_R_CA_POLICY_ERR:\n+ retval = GSSERR_PRXY_R_CA_POLICY_ERR;\n+ break;\n+ case PRXYERR_R_CA_POLICY_VIOLATION:\n+ retval = GSSERR_PRXY_R_CA_POLICY_VIOLATION;\n+ break;\n+ case PRXYERR_R_CA_UNKNOWN:\n+ retval = GSSERR_PRXY_R_CA_UNKNOWN;\n+ break;\n+ case PRXYERR_R_CB_CALLED_WITH_ERROR:\n+ retval = GSSERR_PRXY_R_CB_CALLED_WITH_ERROR;\n+ break;\n+\n+ case PRXYERR_R_PROCESS_PROXY_KEY:\n+ retval = GSSERR_PRXY_R_PROCESS_PROXY_KEY;\n+ break;\n+ case PRXYERR_R_PROCESS_REQ:\n+ retval = GSSERR_PRXY_R_PROCESS_REQ;\n+ break;\n+ case PRXYERR_R_PROCESS_SIGN:\n+ retval = GSSERR_PRXY_R_PROCESS_SIGN;\n+ break; \n+ case PRXYERR_R_MALFORM_REQ:\n+ retval = GSSERR_PRXY_R_MALFORM_REQ;\n+ break;\n+ case PRXYERR_R_SIG_VERIFY:\n+ retval = GSSERR_PRXY_R_SIG_VERIFY;\n+ break;\n+ case PRXYERR_R_SIG_BAD:\n+ retval = GSSERR_PRXY_R_SIG_BAD;\n+ break;\n+ case PRXYERR_R_PROCESS_PROXY:\n+ retval = GSSERR_PRXY_R_PROCESS_PROXY;\n+ break;\n+ case PRXYERR_R_PROXY_NAME_BAD:\n+ retval = GSSERR_PRXY_R_PROXY_NAME_BAD;\n+ break;\n+ case PRXYERR_R_PROCESS_SIGNC:\n+ retval = GSSERR_PRXY_R_PROCESS_SIGNC;\n+ break;\n+ case PRXYERR_R_PROBLEM_PROXY_FILE:\n+ retval = GSSERR_PRXY_R_PROBLEM_PROXY_FILE;\n+ break;\n+ case PRXYERR_R_SIGN_NOT_CA:\n+ retval = GSSERR_PRXY_R_SIGN_NOT_CA;\n+ break;\n+ case PRXYERR_R_PROCESS_KEY:\n+ retval = GSSERR_PRXY_R_PROCESS_KEY;\n+ break;\n+ case PRXYERR_R_PROCESS_CERT:\n+ retval = GSSERR_PRXY_R_PROCESS_CERT;\n+ break;\n+ case PRXYERR_R_PROCESS_CERTS:\n+ retval = GSSERR_PRXY_R_PROCESS_CERTS;\n+ break;\n+ case PRXYERR_R_NO_TRUSTED_CERTS:\n+ retval = GSSERR_PRXY_R_NO_TRUSTED_CERTS;\n+ break;\n+ case PRXYERR_R_PROBLEM_KEY_FILE:\n+ retval = GSSERR_PRXY_R_PROBLEM_KEY_FILE;\n+ break;\n+ case PRXYERR_R_PROBLEM_NOCERT_FILE:\n+ retval = GSSERR_PRXY_R_PROBLEM_NOCERT_FILE;\n+ break;\n+ case PRXYERR_R_PROBLEM_NOKEY_FILE:\n+ retval = GSSERR_PRXY_R_PROBLEM_NOKEY_FILE;\n+ break;\n+ case PRXYERR_R_ZERO_LENGTH_KEY_FILE:\n+ retval = GSSERR_PRXY_R_ZERO_LENGTH_KEY_FILE;\n+ break;\n+ case PRXYERR_R_ZERO_LENGTH_CERT_FILE:\n+ retval = GSSERR_PRXY_R_ZERO_LENGTH_CERT_FILE;\n+ break;\n+ case PRXYERR_R_NO_HOME:\n+ retval = GSSERR_PRXY_R_NO_HOME;\n+ break;\n+ case PRXYERR_R_LPROXY_REJECTED:\n+ retval = GSSERR_PRXY_R_LPROXY_REJECTED;\n+ break;\n+ case PRXYERR_R_KEY_CERT_MISMATCH:\n+ retval = GSSERR_PRXY_R_KEY_CERT_MISMATCH;\n+ break;\n+ case PRXYERR_R_WRONG_PASSPHRASE:\n+ retval = GSSERR_PRXY_R_WRONG_PASSPHRASE;\n+ break;\n+ case PRXYERR_R_PROBLEM_CLIENT_CA:\n+ retval = GSSERR_PRXY_R_PROBLEM_CLIENT_CA;\n+ break;\n+ case PRXYERR_R_CB_NO_PW:\n+ retval = GSSERR_PRXY_R_CB_NO_PW;\n+ break;\n+ case PRXYERR_R_CLASS_ADD_OID:\n+ retval = GSSERR_PRXY_R_CLASS_ADD_OID;\n+ break;\n+ case PRXYERR_R_CLASS_ADD_EXT:\n+ retval = GSSERR_PRXY_R_CLASS_ADD_EXT;\n+ break;\n+ case PRXYERR_R_DELEGATE_VERIFY:\n+ retval = GSSERR_PRXY_R_DELEGATE_VERIFY;\n+ break;\n+ case PRXYERR_R_EXT_ADD:\n+ retval = GSSERR_PRXY_R_EXT_ADD;\n+ break;\n+ case PRXYERR_R_DELEGATE_COPY:\n+ retval = GSSERR_PRXY_R_DELEGATE_COPY;\n+ break;\n+ case PRXYERR_R_DELEGATE_CREATE:\n+ retval = GSSERR_PRXY_R_DELEGATE_CREATE;\n+ break;\n+ case PRXYERR_R_BUFFER_TOO_SMALL:\n+ retval = GSSERR_PRXY_R_BUFFER_TOO_SMALL;\n+ break;\n+ }\n+ }\n+ else if (lib == ERR_user_lib_gsserr_number)\n+ retval = (unsigned long) reason;\n+ else if (reason == ERR_R_MALLOC_FAILURE)\n+ retval = (unsigned long) GSSERR_PRXY_R_MALLOC_FAILURE;\n+ return retval;\n+}\n"} {"commit":"166c2ba398640278ae6037be4aa5562c03cf3d24","subject":"i2c \/ ACPI: Rework I2C device scanning","message":"i2c \/ ACPI: Rework I2C device scanning\n\nThe way we currently scan I2C devices behind an I2C host controller does not\nwork in cases where the I2C device in question is not declared directly below\nthe host controller ACPI node.\n\nThis is perfectly legal according the ACPI 6.0 specification and some existing\nsystems are doing this.\n\nTo be able to enumerate all devices which are connected to a certain I2C host\ncontroller we need to rework the current I2C scanning routine a bit. Instead of\nscanning directly below the host controller we scan the whole ACPI namespace\nfor present devices with valid I2cSerialBus() connection pointing to the host\ncontroller in question.\n\nSigned-off-by: Mika Westerberg <afb75201fb002d7fdd2b0b231e006999e00db8a9@linux.intel.com>\nAcked-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\nSigned-off-by: Andy Shevchenko <74f0c009df510614346aa771cd21959b78cdb413@linux.intel.com>\nTested-by: Dustin Byford <1c08efb9b3965701be9d700d9a6f481f1ffec3ea@cumulusnetworks.com>\nSigned-off-by: Wolfram Sang <fd4ce474653598159cad06f3c83387a05cd53a44@the-dreams.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/i2c\/i2c-core.c\n+++ drivers\/i2c\/i2c-core.c\n@@ -99,27 +99,40 @@\n \t};\n } __packed;\n \n-static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data)\n-{\n-\tstruct i2c_board_info *info = data;\n-\n-\tif (ares->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {\n-\t\tstruct acpi_resource_i2c_serialbus *sb;\n-\n-\t\tsb = &ares->data.i2c_serial_bus;\n-\t\tif (!info->addr && sb->type == ACPI_RESOURCE_SERIAL_TYPE_I2C) {\n-\t\t\tinfo->addr = sb->slave_address;\n-\t\t\tif (sb->access_mode == ACPI_I2C_10BIT_MODE)\n-\t\t\t\tinfo->flags |= I2C_CLIENT_TEN;\n-\t\t}\n-\t} else if (!info->irq) {\n-\t\tstruct resource r;\n-\n-\t\tif (acpi_dev_resource_interrupt(ares, 0, &r))\n-\t\t\tinfo->irq = r.start;\n-\t}\n-\n-\t\/* Tell the ACPI core to skip this resource *\/\n+struct acpi_i2c_lookup {\n+\tstruct i2c_board_info *info;\n+\tacpi_handle adapter_handle;\n+\tacpi_handle device_handle;\n+};\n+\n+static int acpi_i2c_find_address(struct acpi_resource *ares, void *data)\n+{\n+\tstruct acpi_i2c_lookup *lookup = data;\n+\tstruct i2c_board_info *info = lookup->info;\n+\tstruct acpi_resource_i2c_serialbus *sb;\n+\tacpi_handle adapter_handle;\n+\tacpi_status status;\n+\n+\tif (info->addr || ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)\n+\t\treturn 1;\n+\n+\tsb = &ares->data.i2c_serial_bus;\n+\tif (sb->type != ACPI_RESOURCE_SERIAL_TYPE_I2C)\n+\t\treturn 1;\n+\n+\t\/*\n+\t * Extract the ResourceSource and make sure that the handle matches\n+\t * with the I2C adapter handle.\n+\t *\/\n+\tstatus = acpi_get_handle(lookup->device_handle,\n+\t\t\t\t sb->resource_source.string_ptr,\n+\t\t\t\t &adapter_handle);\n+\tif (ACPI_SUCCESS(status) && adapter_handle == lookup->adapter_handle) {\n+\t\tinfo->addr = sb->slave_address;\n+\t\tif (sb->access_mode == ACPI_I2C_10BIT_MODE)\n+\t\t\tinfo->flags |= I2C_CLIENT_TEN;\n+\t}\n+\n \treturn 1;\n }\n \n@@ -128,6 +141,8 @@\n {\n \tstruct i2c_adapter *adapter = data;\n \tstruct list_head resource_list;\n+\tstruct acpi_i2c_lookup lookup;\n+\tstruct resource_entry *entry;\n \tstruct i2c_board_info info;\n \tstruct acpi_device *adev;\n \tint ret;\n@@ -140,13 +155,36 @@\n \tmemset(&info, 0, sizeof(info));\n \tinfo.fwnode = acpi_fwnode_handle(adev);\n \n+\tmemset(&lookup, 0, sizeof(lookup));\n+\tlookup.adapter_handle = ACPI_HANDLE(adapter->dev.parent);\n+\tlookup.device_handle = handle;\n+\tlookup.info = &info;\n+\n+\t\/*\n+\t * Look up for I2cSerialBus resource with ResourceSource that\n+\t * matches with this adapter.\n+\t *\/\n \tINIT_LIST_HEAD(&resource_list);\n \tret = acpi_dev_get_resources(adev, &resource_list,\n-\t\t\t\t acpi_i2c_add_resource, &info);\n+\t\t\t\t acpi_i2c_find_address, &lookup);\n \tacpi_dev_free_resource_list(&resource_list);\n \n \tif (ret < 0 || !info.addr)\n \t\treturn AE_OK;\n+\n+\t\/* Then fill IRQ number if any *\/\n+\tret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);\n+\tif (ret < 0)\n+\t\treturn AE_OK;\n+\n+\tresource_list_for_each_entry(entry, &resource_list) {\n+\t\tif (resource_type(entry->res) == IORESOURCE_IRQ) {\n+\t\t\tinfo.irq = entry->res->start;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tacpi_dev_free_resource_list(&resource_list);\n \n \tadev->power.flags.ignore_parent = true;\n \tstrlcpy(info.type, dev_name(&adev->dev), sizeof(info.type));\n@@ -160,6 +198,8 @@\n \treturn AE_OK;\n }\n \n+#define ACPI_I2C_MAX_SCAN_DEPTH 32\n+\n \/**\n * acpi_i2c_register_devices - enumerate I2C slave devices behind adapter\n * @adap: pointer to adapter\n@@ -170,17 +210,13 @@\n *\/\n static void acpi_i2c_register_devices(struct i2c_adapter *adap)\n {\n-\tacpi_handle handle;\n \tacpi_status status;\n \n-\tif (!adap->dev.parent)\n+\tif (!adap->dev.parent || !has_acpi_companion(adap->dev.parent))\n \t\treturn;\n \n-\thandle = ACPI_HANDLE(adap->dev.parent);\n-\tif (!handle)\n-\t\treturn;\n-\n-\tstatus = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,\n+\tstatus = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,\n+\t\t\t\t ACPI_I2C_MAX_SCAN_DEPTH,\n \t\t\t\t acpi_i2c_add_device, NULL,\n \t\t\t\t adap, NULL);\n \tif (ACPI_FAILURE(status))\n"} {"commit":"5545509bc2ed06290165dccce7b2440c1207e6ff","subject":"filepath normalize","message":"filepath normalize\n","repos":"mstry\/codebase,mstry\/codebase","returncode":1,"stderr":"error: pathspec 'filepath_normalize.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- filepath_normalize.c\n+++ filepath_normalize.c\n@@ -0,0 +1,67 @@\n+#include <stdio.h>\n+#include <string.h>\n+#include <stdlib.h>\n+\n+#define MAX_NAME_LEN 256\n+\n+\/**\n+ * strip both-ends blank spaces and tail '\/'\n+ * contiguous '\/' or intervaled with blank spaces\n+ * will be treated as one '\/'\n+ * '.' and '..' will not be treated specially as relative path\n+ *\/\n+static int __fs_path_strip(char *path)\n+{\n+\tint i, j, flag;\n+\tchar *p;\n+\tchar name[MAX_NAME_LEN] = {0};\n+\n+\tenum path_flag {\n+\t\tP_FLG_NOP = 0,\n+\t\tP_FLG_SEP, \/\/ seperator '\/'\n+\t\tP_FLG_SPC, \/\/ blank space\n+\t\tP_FLG_OTH, \/\/ other character\n+\t};\n+\n+\tp = path;\n+\tj = 0;\n+\tflag = P_FLG_NOP;\n+\tfor (i = 0; path[i] != '\\0'; i++) {\n+\t\tswitch (path[i]) {\n+\t\tcase '\/':\n+\t\t\tif (P_FLG_OTH == flag) {\n+\t\t\t\tstrncpy(p, name, j);\n+\t\t\t\tp += j;\n+\t\t\t}\n+\t\t\tj = 0;\n+\t\t\tflag = P_FLG_SEP;\n+\t\t\tbreak;\n+\t\tcase ' ':\n+\t\t\tif (P_FLG_SEP == flag) {\n+\t\t\t\tflag = P_FLG_SPC;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tflag = P_FLG_OTH;\n+\t\t\tbreak;\n+\t\t}\n+\t\tname[j++] = path[i];\n+\t}\n+\tif (P_FLG_OTH == flag) {\n+\t\tstrncpy(p, name, j);\n+\t\tp += j;\n+\t}\n+\t*p = '\\0';\n+\n+\treturn 0;\n+}\n+\n+\n+int main(int argc, char *argv[])\n+{\n+\tchar path[] = \" \/home\/peter\/ \/\/\/hello world\/path \/\/ \/\/world \";\n+\tprintf(\"org-path: %s\\n\", path);\n+\t__fs_path_strip(path);\n+\tprintf(\"reg-path: %s\\n\", path);\n+\treturn 0;\n+}\n"} {"commit":"fc385777e43344c663754bacacb72557db6b13b3","subject":"fix the compile cost long time test=develop (#21064)","message":"fix the compile cost long time test=develop (#21064)\n\n","repos":"PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,luotao1\/Paddle,luotao1\/Paddle,luotao1\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/fluid\/operators\/expand_as_op.h\n+++ paddle\/fluid\/operators\/expand_as_op.h\n@@ -31,9 +31,7 @@\n break; \\\n }\n #define REP_EXPAND_AS_TEMPLATE(n) BOOST_PP_REPEAT(n, EXPAND_AS_TEMPLATE, ~)\n-#define COND(n) \\\n- BOOST_PP_GREATER_EQUAL(BOOST_PP_DIV(n, MAX_RANK_SUPPORTED), \\\n- BOOST_PP_MOD(n, MAX_RANK_SUPPORTED))\n+#define COND(n) BOOST_PP_GREATER_EQUAL(n, BOOST_PP_MOD(n, MAX_RANK_SUPPORTED))\n #define EXPAND_AS_GRAD_CASE(n) \\\n case n: { \\\n ExpandAsBackward<n>(context, reshape_dims_vec, reduce_dims_vec); \\\n@@ -116,23 +114,20 @@\n std::vector<int> reshape_dims_vec;\n std::vector<int> reduce_dims_vec;\n for (size_t i = 0; i < bcast_dims.size(); ++i) {\n- if (bcast_dims[i] == 1) {\n- reshape_dims_vec.push_back(x_dims[i]);\n- } else {\n- if (x_dims[i] == 1) {\n- reduce_dims_vec.push_back(reshape_dims_vec.size());\n- reshape_dims_vec.push_back(bcast_dims[i]);\n- } else {\n- reduce_dims_vec.push_back(reshape_dims_vec.size());\n- reshape_dims_vec.push_back(bcast_dims[i]);\n- reshape_dims_vec.push_back(x_dims[i]);\n- }\n+ reduce_dims_vec.push_back(reshape_dims_vec.size());\n+ reshape_dims_vec.push_back(bcast_dims[i]);\n+ reshape_dims_vec.push_back(x_dims[i]);\n+ }\n+ int dims = reduce_dims_vec.size();\n+ bool just_copy = true;\n+ for (size_t i = 0; i < bcast_dims.size(); i++) {\n+ if (bcast_dims[i] != 1) {\n+ just_copy = false;\n+ break;\n }\n }\n- int dims = reshape_dims_vec.size() * MAX_RANK_SUPPORTED +\n- reduce_dims_vec.size() - MAX_RANK_SUPPORTED - 1;\n \/\/ no need reduce, just copy\n- if (reduce_dims_vec.size() == 0) {\n+ if (just_copy) {\n auto* in0 = context.Input<Tensor>(framework::GradVarName(\"Out\"));\n auto* out0 = context.Output<Tensor>(framework::GradVarName(\"X\"));\n out0->mutable_data<T>(context.GetPlace());\n@@ -140,7 +135,7 @@\n out0);\n } else {\n switch (dims) {\n- REP_EXPAND_AS_GRAD_TEMPLATE(72)\n+ REP_EXPAND_AS_GRAD_TEMPLATE(MAX_RANK_SUPPORTED)\n default:\n PADDLE_THROW(\"Only support tensor with rank being between 1 and 6.\");\n }\n@@ -152,8 +147,8 @@\n void ExpandAsBackward(const framework::ExecutionContext& context,\n const std::vector<int>& reshape_dims_vec,\n const std::vector<int>& reduce_dims_vec) const {\n- size_t reshape_size = Dims \/ MAX_RANK_SUPPORTED + 1;\n- size_t reduce_size = Dims % MAX_RANK_SUPPORTED + 1;\n+ size_t reshape_size = reshape_dims_vec.size();\n+ size_t reduce_size = reduce_dims_vec.size();\n PADDLE_ENFORCE_EQ(reshape_size, reshape_dims_vec.size(),\n \"Inconsistent size between template Dims and \"\n \"reshape dimensions.\");\n@@ -164,11 +159,11 @@\n auto* out0 = context.Output<Tensor>(framework::GradVarName(\"X\"));\n out0->mutable_data<T>(context.GetPlace());\n auto x_grad = EigenVector<T>::Flatten(*out0);\n- Eigen::DSizes<int, Dims \/ MAX_RANK_SUPPORTED + 1> reshape_dims;\n+ Eigen::DSizes<int, Dims * 2> reshape_dims;\n for (size_t i = 0; i < reshape_size; ++i) {\n reshape_dims[i] = reshape_dims_vec[i];\n }\n- Eigen::DSizes<int, Dims % MAX_RANK_SUPPORTED + 1> reduce_dims;\n+ Eigen::DSizes<int, Dims> reduce_dims;\n for (size_t i = 0; i < reduce_size; ++i) {\n reduce_dims[i] = reduce_dims_vec[i];\n }\n"} {"commit":"a4d7d4a2d6c5b6708d7cde53714b52c456689d10","subject":"oups.. return before going into the error cases","message":"oups.. return before going into the error cases\n","repos":"ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst-libs\/gst\/farsight\/fsu-stream.c\n+++ gst-libs\/gst\/farsight\/fsu-stream.c\n@@ -413,6 +413,8 @@\n \n g_signal_connect_object (pad, \"unlinked\", (GCallback) src_pad_unlinked,\n self, 0);\n+\n+ return;\n \n error_state:\n gst_pad_unlink (pad, filter_pad);\n"} {"commit":"39e644b77ce06b125431876a21203007bc9bd14b","subject":"Add a specialization of the 'IsAligned' type trait for the 'DMatAbsExpr' class template","message":"Add a specialization of the 'IsAligned' type trait for the 'DMatAbsExpr' class template\n","repos":"byzhang\/blaze,byzhang\/blaze,byzhang\/blaze","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- blaze\/math\/expressions\/DMatAbsExpr.h\n+++ blaze\/math\/expressions\/DMatAbsExpr.h\n@@ -57,6 +57,7 @@\n #include <blaze\/math\/traits\/SubmatrixExprTrait.h>\n #include <blaze\/math\/traits\/TDMatAbsExprTrait.h>\n #include <blaze\/math\/typetraits\/Columns.h>\n+#include <blaze\/math\/typetraits\/IsAligned.h>\n #include <blaze\/math\/typetraits\/IsColumnMajorMatrix.h>\n #include <blaze\/math\/typetraits\/IsComputation.h>\n #include <blaze\/math\/typetraits\/IsDenseVector.h>\n@@ -992,6 +993,23 @@\n \n \/\/=================================================================================================\n \/\/\n+\/\/ ISALIGNED SPECIALIZATIONS\n+\/\/\n+\/\/=================================================================================================\n+\n+\/\/*************************************************************************************************\n+\/*! \\cond BLAZE_INTERNAL *\/\n+template< typename MT, bool SO >\n+struct IsAligned< DMatAbsExpr<MT,SO> > : public IsTrue< IsAligned<MT>::value >\n+{};\n+\/*! \\endcond *\/\n+\/\/*************************************************************************************************\n+\n+\n+\n+\n+\/\/=================================================================================================\n+\/\/\n \/\/ ISPADDED SPECIALIZATIONS\n \/\/\n \/\/=================================================================================================\n"} {"commit":"70762abb9f89d97603a04cc3438988ca0cf886eb","subject":"i2c: Use stable dev_name for ACPI enumerated I2C slaves","message":"i2c: Use stable dev_name for ACPI enumerated I2C slaves\n\nCurrent I2C adapter id - client address \"x-00yy\" based device naming scheme\nis not always stable enough to be used in name based matching, for instance\nwithin ALSA SoC subsystem.\n\nThis is problematic in PC kind of platforms where I2C adapter numbers can\nchange due variable amount of bus controllers, probe order, add-on cards or\njust because of BIOS settings.\n\nThis patch addresses the problem by using the ACPI device name with\n\"i2c-\" prefix for ACPI enumerated I2C slaves. For them device name\n\"x-00yz\" becomes \"i2c-INTABCD:ij\" after this patch.\n\nSigned-off-by: Jarkko Nikula <ed47dfa4cd43d03d92ccc66ffdb9609c96fcf22b@linux.intel.com>\nAcked-by: Wolfram Sang <fd4ce474653598159cad06f3c83387a05cd53a44@the-dreams.de>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"5e7db4f402cbc90abed95892073740d55f8bb6fc","subject":"session: redirect login page to https","message":"session: redirect login page to https\n","repos":"kepstin\/gst-stream-server,kepstin\/gst-stream-server,kepstin\/gst-stream-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst-streaming-server\/gss-session.c\n+++ gst-streaming-server\/gss-session.c\n@@ -726,6 +726,27 @@\n char *redirect_url;\n char *location;\n \n+ if (t->soupserver == ewserver->server) {\n+ char *base_url;\n+ char *location;\n+ char *s2;\n+\n+ base_url = gss_soup_get_base_url_https (t->server, t->msg);\n+ location = g_strdup_printf (\"%s\/login\", base_url);\n+\n+ soup_message_headers_append (t->msg->response_headers, \"Location\",\n+ location);\n+ s2 = g_strdup_printf (\"<html><body>Oops, you were supposed to \"\n+ \"be redirected <a href='%s'>here<\/a>.<\/body><\/html>\\n\", location);\n+ soup_message_set_response (t->msg, \"text\/html\", SOUP_MEMORY_TAKE, s2,\n+ strlen (s2));\n+ soup_message_set_status (t->msg, SOUP_STATUS_SEE_OTHER);\n+\n+ g_free (location);\n+ g_free (base_url);\n+ return;\n+ }\n+\n t->s = s = g_string_new (\"\");\n \n gss_html_header (t);\n"} {"commit":"22cdd6cedc93653a95965191e65a30619234a640","subject":"ide: skip \"VLB sync\" if host uses MMIO","message":"ide: skip \"VLB sync\" if host uses MMIO\n\n* Skip \"VLB sync\" in ata_{in,out}put_data() if host uses MMIO.\n\n* Use I\/O ops directly in ata_vlb_sync() an drop no longer needed\n 'ide_drive_t *drive' argument.\n\nAcked-by: Sergei Shtylyov <38a867ea26f35d3eeb42270f1bc7b9d1d135e6a2@ru.mvista.com>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ide\/ide-iops.c\n+++ drivers\/ide\/ide-iops.c\n@@ -227,11 +227,11 @@\n * of the sector count register location, with interrupts disabled\n * to ensure that the reads all happen together.\n *\/\n-static void ata_vlb_sync(ide_drive_t *drive, unsigned long port)\n-{\n-\t(void) HWIF(drive)->INB(port);\n-\t(void) HWIF(drive)->INB(port);\n-\t(void) HWIF(drive)->INB(port);\n+static void ata_vlb_sync(unsigned long port)\n+{\n+\t(void)inb(port);\n+\t(void)inb(port);\n+\t(void)inb(port);\n }\n \n \/*\n@@ -255,9 +255,9 @@\n \tif (io_32bit) {\n \t\tunsigned long uninitialized_var(flags);\n \n-\t\tif (io_32bit & 2) {\n+\t\tif ((io_32bit & 2) && !mmio) {\n \t\t\tlocal_irq_save(flags);\n-\t\t\tata_vlb_sync(drive, io_ports->nsect_addr);\n+\t\t\tata_vlb_sync(io_ports->nsect_addr);\n \t\t}\n \n \t\tif (mmio)\n@@ -265,7 +265,7 @@\n \t\telse\n \t\t\tinsl(data_addr, buf, len \/ 4);\n \n-\t\tif (io_32bit & 2)\n+\t\tif ((io_32bit & 2) && !mmio)\n \t\t\tlocal_irq_restore(flags);\n \n \t\tif ((len & 3) >= 2) {\n@@ -298,9 +298,9 @@\n \tif (io_32bit) {\n \t\tunsigned long uninitialized_var(flags);\n \n-\t\tif (io_32bit & 2) {\n+\t\tif ((io_32bit & 2) && !mmio) {\n \t\t\tlocal_irq_save(flags);\n-\t\t\tata_vlb_sync(drive, io_ports->nsect_addr);\n+\t\t\tata_vlb_sync(io_ports->nsect_addr);\n \t\t}\n \n \t\tif (mmio)\n@@ -308,7 +308,7 @@\n \t\telse\n \t\t\toutsl(data_addr, buf, len \/ 4);\n \n-\t\tif (io_32bit & 2)\n+\t\tif ((io_32bit & 2) && !mmio)\n \t\t\tlocal_irq_restore(flags);\n \n \t\tif ((len & 3) >= 2) {\n"} {"commit":"0ce1d3aad2a09e0ca54c9effdd141882d0a566ca","subject":"unlock native buffers if we get them in show_frame","message":"unlock native buffers if we get them in show_frame\n","repos":"sailfishos\/gst-jolla,sailfishos\/gst-jolla","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/droideglsink\/gstdroideglsink.c\n+++ gst\/droideglsink\/gstdroideglsink.c\n@@ -234,6 +234,14 @@\n \n if (GST_IS_NATIVE_BUFFER (buf)) {\n new_buffer = GST_NATIVE_BUFFER (buf);\n+\n+ if (!gst_native_buffer_unlock (new_buffer)) {\n+ GST_ELEMENT_ERROR (sink, LIBRARY, FAILED,\n+ (\"Failed to unlock native buffer\"), (NULL));\n+\n+ return GST_FLOW_ERROR;\n+ }\n+\n gst_buffer_ref (buf);\n } else {\n GstBuffer *b;\n@@ -255,6 +263,9 @@\n memcpy (GST_BUFFER_DATA (buf), GST_BUFFER_DATA (b), GST_BUFFER_SIZE (buf));\n \n if (!gst_native_buffer_unlock (new_buffer)) {\n+ GST_ELEMENT_ERROR (sink, LIBRARY, FAILED,\n+ (\"Failed to unlock native buffer\"), (NULL));\n+\n gst_buffer_unref (GST_BUFFER (new_buffer));\n return GST_FLOW_ERROR;\n }\n"} {"commit":"5baa3ca909be0f4ab1221bccd0333859544d5607","subject":"Remove groupinghash","message":"Remove groupinghash\n","repos":"tanel\/bugsnag-qt,tanel\/bugsnag-qt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bugsnag.h\n+++ bugsnag.h\n@@ -7,7 +7,6 @@\n \n #include <QJsonObject>\n #include <QObject>\n-#include <QEvent>\n #include <QList>\n #include <QJsonArray>\n #include <QHash>\n@@ -214,8 +213,6 @@\n Bugsnag() {}\n \n bool notify(\n- QObject *receiver,\n- QEvent *evt,\n const QString message,\n QString context = QString(\"\"),\n QHash<QString, QHash<QString, QString> > *metadata = 0) {\n@@ -228,7 +225,6 @@\n \/\/ FIXME: exception.stacktrace\n Event event;\n event.context = context;\n- event.groupingHash = receiver->objectName();\n event.exceptions << exception;\n event.user = Bugsnag::user;\n event.app = Bugsnag::app;\n"} {"commit":"c2ce5ca047ff6bbc41d491451c39e597c4537cd3","subject":"scc_pata: make use of scc_dma_sff_read_status()","message":"scc_pata: make use of scc_dma_sff_read_status()\n\nMake consistent use of scc_dma_sff_read_status() throughout the driver.\n\nSigned-off-by: Sergei Shtylyov <38a867ea26f35d3eeb42270f1bc7b9d1d135e6a2@ru.mvista.com>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/scc_pata.c\n+++ drivers\/ide\/scc_pata.c\n@@ -292,7 +292,7 @@\n {\n \tide_hwif_t *hwif = drive->hwif;\n \tu8 unit = drive->dn & 1;\n-\tu8 dma_stat = scc_ide_inb(hwif->dma_base + 4);\n+\tu8 dma_stat = scc_dma_sff_read_status(hwif);\n \n \tif (on)\n \t\tdma_stat |= (1 << (5 + unit));\n@@ -338,7 +338,7 @@\n \tout_be32((void __iomem *)hwif->dma_base, reading);\n \n \t\/* read DMA status for INTR & ERROR flags *\/\n-\tdma_stat = in_be32((void __iomem *)(hwif->dma_base + 4));\n+\tdma_stat = scc_dma_sff_read_status(hwif);\n \n \t\/* clear INTR & ERROR flags *\/\n \tout_be32((void __iomem *)(hwif->dma_base + 4), dma_stat | 6);\n@@ -367,7 +367,7 @@\n \t\/* stop DMA *\/\n \tscc_ide_outb(dma_cmd & ~1, hwif->dma_base);\n \t\/* get DMA status *\/\n-\tdma_stat = scc_ide_inb(hwif->dma_base + 4);\n+\tdma_stat = scc_dma_sff_read_status(hwif);\n \t\/* clear the INTR & ERROR bits *\/\n \tscc_ide_outb(dma_stat | 6, hwif->dma_base + 4);\n \t\/* purge DMA mappings *\/\n"} {"commit":"5d4717d76f06d56586addcda59572113167e07da","subject":"misc: fsa8480: Use dev_pm_ops","message":"misc: fsa8480: Use dev_pm_ops\n\nUse dev_pm_ops instead of the deprecated legacy suspend\/resume callbacks.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nCc: Donggeun Kim <524d1fb7c7f482d1c49aaf511e5fff45ba8839ec@samsung.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/misc\/fsa9480.c\n+++ drivers\/misc\/fsa9480.c\n@@ -474,10 +474,11 @@\n \treturn 0;\n }\n \n-#ifdef CONFIG_PM\n-\n-static int fsa9480_suspend(struct i2c_client *client, pm_message_t state)\n-{\n+#ifdef CONFIG_PM_SLEEP\n+\n+static int fsa9480_suspend(struct device *dev)\n+{\n+\tstruct i2c_client *client = to_i2c_client(dev);\n \tstruct fsa9480_usbsw *usbsw = i2c_get_clientdata(client);\n \tstruct fsa9480_platform_data *pdata = usbsw->pdata;\n \n@@ -490,8 +491,9 @@\n \treturn 0;\n }\n \n-static int fsa9480_resume(struct i2c_client *client)\n-{\n+static int fsa9480_resume(struct device *dev)\n+{\n+\tstruct i2c_client *client = to_i2c_client(dev);\n \tstruct fsa9480_usbsw *usbsw = i2c_get_clientdata(client);\n \tint dev1, dev2;\n \n@@ -515,12 +517,14 @@\n \treturn 0;\n }\n \n+static SIMPLE_DEV_PM_OPS(fsa9480_pm_ops, fsa9480_suspend, fsa9480_resume);\n+#define FSA9480_PM_OPS (&fsa9480_pm_ops)\n+\n #else\n \n-#define fsa9480_suspend NULL\n-#define fsa9480_resume NULL\n-\n-#endif \/* CONFIG_PM *\/\n+#define FSA9480_PM_OPS NULL\n+\n+#endif \/* CONFIG_PM_SLEEP *\/\n \n static const struct i2c_device_id fsa9480_id[] = {\n \t{\"fsa9480\", 0},\n@@ -531,11 +535,10 @@\n static struct i2c_driver fsa9480_i2c_driver = {\n \t.driver = {\n \t\t.name = \"fsa9480\",\n+\t\t.pm = FSA9480_PM_OPS,\n \t},\n \t.probe = fsa9480_probe,\n \t.remove = fsa9480_remove,\n-\t.resume = fsa9480_resume,\n-\t.suspend = fsa9480_suspend,\n \t.id_table = fsa9480_id,\n };\n \n"} {"commit":"8e8248b1369c97c7bb6f8bcaee1f05deeabab8ef","subject":"mei: nfc: fix memory leak in error path","message":"mei: nfc: fix memory leak in error path\n\nNFC will leak buffer if send failed.\nUse single exit point that does the freeing\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org #3.10+\nSigned-off-by: Alexander Usyskin <2c2d03d7dae842f113743879f565d486184f22a3@intel.com>\nSigned-off-by: Tomas Winkler <002a8af089113a6510dbc00453be711ac350fd80@intel.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ec9b6add7d81f902f6094e71f595da4a362f3348","subject":"[PPPOL2TP]: Add missing sock_put() in pppol2tp_tunnel_closeall()","message":"[PPPOL2TP]: Add missing sock_put() in pppol2tp_tunnel_closeall()\n\nEvery skb removed from session->reorder_q needs sock_put().\n\nSigned-off-by: Jarek Poplawski <85e4e0cd35fdfcbe234be29b330d591ff9717625@gmail.com>\nAcked-by: James Chapman <d87d459960487ecb1b999dfc309f5d5f521df082@katalix.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/pppol2tp.c\n+++ drivers\/net\/pppol2tp.c\n@@ -1111,6 +1111,8 @@\n \tfor (hash = 0; hash < PPPOL2TP_HASH_SIZE; hash++) {\n again:\n \t\thlist_for_each_safe(walk, tmp, &tunnel->session_hlist[hash]) {\n+\t\t\tstruct sk_buff *skb;\n+\n \t\t\tsession = hlist_entry(walk, struct pppol2tp_session, hlist);\n \n \t\t\tsk = session->sock;\n@@ -1139,7 +1141,10 @@\n \t\t\t\/* Purge any queued data *\/\n \t\t\tskb_queue_purge(&sk->sk_receive_queue);\n \t\t\tskb_queue_purge(&sk->sk_write_queue);\n-\t\t\tskb_queue_purge(&session->reorder_q);\n+\t\t\twhile ((skb = skb_dequeue(&session->reorder_q))) {\n+\t\t\t\tkfree_skb(skb);\n+\t\t\t\tsock_put(sk);\n+\t\t\t}\n \n \t\t\trelease_sock(sk);\n \t\t\tsock_put(sk);\n"} {"commit":"3942453948015228d6b1ae9835a6f6ca3e842aaa","subject":"drivers\/net\/smsc911x.c: Fix resource size off by 1 error","message":"drivers\/net\/smsc911x.c: Fix resource size off by 1 error\n\nThe call resource_size(res) returns res->end - res->start + 1 and thus the\nsecond change is semantics-preserving. res_size is then used as the second\nargument of a call to request_mem_region, and the memory allocated by this\ncall appears to be the same as what is released in the two calls to\nrelease_mem_region. So the size argument for those calls should be\nresource_size(size) as well. Alternatively, in the second call to\nrelease_mem_region, the second argument could be res_size, as that variable\nhas already been initialized at the point of this call.\n\nThe problem was found using the following semantic patch:\n(http:\/\/www.emn.fr\/x-info\/coccinelle\/)\n\n\/\/ <smpl>\n@@\nstruct resource *res;\n@@\n\n- (res->end - res->start) + 1\n+ resource_size(res)\n\n@@\nstruct resource *res;\n@@\n\n- res->end - res->start\n+ BAD(resource_size(res))\n\/\/ <\/smpl>\n\nSigned-off-by: Julia Lawall <b43b0ad1e8108e7ab870d7a54feac93ae8b8600e@diku.dk>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/smsc911x.c\n+++ drivers\/net\/smsc911x.c\n@@ -1938,7 +1938,7 @@\n \tif (!res)\n \t\tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n \n-\trelease_mem_region(res->start, res->end - res->start);\n+\trelease_mem_region(res->start, resource_size(res));\n \n \tiounmap(pdata->ioaddr);\n \n@@ -1976,7 +1976,7 @@\n \t\tretval = -ENODEV;\n \t\tgoto out_0;\n \t}\n-\tres_size = res->end - res->start + 1;\n+\tres_size = resource_size(res);\n \n \tirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);\n \tif (!irq_res) {\n@@ -2104,7 +2104,7 @@\n out_free_netdev_2:\n \tfree_netdev(dev);\n out_release_io_1:\n-\trelease_mem_region(res->start, res->end - res->start);\n+\trelease_mem_region(res->start, resource_size(res));\n out_0:\n \treturn retval;\n }\n"} {"commit":"73dcd6617a7dbc1540c714b20cf4734d1bd3b1dd","subject":"Force noexcept demand for ScopedGuard callback","message":"Force noexcept demand for ScopedGuard callback\n\nWe use lambdas in capture-by-reference mode and it is highly unlike for them to throw any exceptions.\n\nMoreover, we often use scope-guard for resource cleanup, callbacks that might throw could be a pain.","repos":"kingsamchen\/KBase_Demo,kingsamchen\/KBase_Demo,kingsamchen\/KBase,kingsamchen\/KBase","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/kbase\/scope_guard.h\n+++ src\/kbase\/scope_guard.h\n@@ -27,12 +27,12 @@\n \n public:\n template<typename F>\n- explicit ScopeGuard(F&& fn) noexcept(std::is_nothrow_constructible<ExitCallback, F>::value)\n+ explicit ScopeGuard(F&& fn) noexcept\n : exit_callback_(std::forward<F>(fn)), dismissed_(false)\n {}\n \n \/\/ Overloaded operator+ on ScopeGuardDriver relies move-ctor.\n- ScopeGuard(ScopeGuard&& other) noexcept(std::is_nothrow_move_constructible<ExitCallback>::value)\n+ ScopeGuard(ScopeGuard&& other) noexcept\n : exit_callback_(std::move(other.exit_callback_)), dismissed_(other.dismissed_)\n {\n other.dismissed_ = true;\n"} {"commit":"af736fede772d92096b52da9aa1b0cf5de62eceb","subject":"sunlance: Convert to pure OF driver.","message":"sunlance: Convert to pure OF driver.\n\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/sunlance.c\n+++ drivers\/net\/sunlance.c\n@@ -92,6 +92,8 @@\n #include <linux\/ethtool.h>\n #include <linux\/bitops.h>\n #include <linux\/dma-mapping.h>\n+#include <linux\/of.h>\n+#include <linux\/of_device.h>\n \n #include <asm\/system.h>\n #include <asm\/io.h>\n@@ -99,7 +101,6 @@\n #include <asm\/pgtable.h>\n #include <asm\/byteorder.h>\t\/* Used by the checksum routines *\/\n #include <asm\/idprom.h>\n-#include <asm\/sbus.h>\n #include <asm\/prom.h>\n #include <asm\/auxio.h>\t\t\/* For tpe-link-test? setting *\/\n #include <asm\/irq.h>\n@@ -264,7 +265,8 @@\n \tchar\t \t *name;\n \tdma_addr_t\t\tinit_block_dvma;\n \tstruct net_device *dev;\t\t \/* Backpointer\t*\/\n-\tstruct sbus_dev\t *sdev;\n+\tstruct of_device *op;\n+\tstruct of_device *lebuffer;\n \tstruct timer_list multicast_timer;\n };\n \n@@ -1273,7 +1275,7 @@\n static void lance_free_hwresources(struct lance_private *lp)\n {\n \tif (lp->lregs)\n-\t\tsbus_iounmap(lp->lregs, LANCE_REG_SIZE);\n+\t\tof_iounmap(&lp->op->resource[0], lp->lregs, LANCE_REG_SIZE);\n \tif (lp->dregs) {\n \t\tstruct of_device *ledma = lp->ledma;\n \n@@ -1281,10 +1283,10 @@\n \t\t\t resource_size(&ledma->resource[0]));\n \t}\n \tif (lp->init_block_iomem) {\n-\t\tsbus_iounmap(lp->init_block_iomem,\n-\t\t\t sizeof(struct lance_init_block));\n+\t\tof_iounmap(&lp->lebuffer->resource[0], lp->init_block_iomem,\n+\t\t\t sizeof(struct lance_init_block));\n \t} else if (lp->init_block_mem) {\n-\t\tdma_free_coherent(&lp->sdev->ofdev.dev,\n+\t\tdma_free_coherent(&lp->op->dev,\n \t\t\t\t sizeof(struct lance_init_block),\n \t\t\t\t lp->init_block_mem,\n \t\t\t\t lp->init_block_dvma);\n@@ -1294,12 +1296,8 @@\n \/* Ethtool support... *\/\n static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)\n {\n-\tstruct lance_private *lp = netdev_priv(dev);\n-\n \tstrcpy(info->driver, \"sunlance\");\n \tstrcpy(info->version, \"2.02\");\n-\tsprintf(info->bus_info, \"SBUS:%d\",\n-\t\tlp->sdev->slot);\n }\n \n static u32 sparc_lance_get_link(struct net_device *dev)\n@@ -1315,16 +1313,16 @@\n \t.get_link\t\t= sparc_lance_get_link,\n };\n \n-static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,\n+static int __devinit sparc_lance_probe_one(struct of_device *op,\n \t\t\t\t\t struct of_device *ledma,\n-\t\t\t\t\t struct sbus_dev *lebuffer)\n-{\n+\t\t\t\t\t struct of_device *lebuffer)\n+{\n+\tstruct device_node *dp = op->node;\n \tstatic unsigned version_printed;\n-\tstruct device_node *dp = sdev->ofdev.node;\n+\tstruct lance_private *lp;\n \tstruct net_device *dev;\n-\tstruct lance_private *lp;\n+\tDECLARE_MAC_BUF(mac);\n \tint i;\n-\tDECLARE_MAC_BUF(mac);\n \n \tdev = alloc_etherdev(sizeof(struct lance_private) + 8);\n \tif (!dev)\n@@ -1345,8 +1343,8 @@\n \t\tdev->dev_addr[i] = idprom->id_ethaddr[i];\n \n \t\/* Get the IO region *\/\n-\tlp->lregs = sbus_ioremap(&sdev->resource[0], 0,\n-\t\t\t\t LANCE_REG_SIZE, lancestr);\n+\tlp->lregs = of_ioremap(&op->resource[0], 0,\n+\t\t\t LANCE_REG_SIZE, lancestr);\n \tif (!lp->lregs) {\n \t\tprintk(KERN_ERR \"SunLance: Cannot map registers.\\n\");\n \t\tgoto fail;\n@@ -1364,7 +1362,8 @@\n \t\t}\n \t}\n \n-\tlp->sdev = sdev;\n+\tlp->op = op;\n+\tlp->lebuffer = lebuffer;\n \tif (lebuffer) {\n \t\t\/* sanity check *\/\n \t\tif (lebuffer->resource[0].start & 7) {\n@@ -1372,8 +1371,8 @@\n \t\t\tgoto fail;\n \t\t}\n \t\tlp->init_block_iomem =\n-\t\t\tsbus_ioremap(&lebuffer->resource[0], 0,\n-\t\t\t\t sizeof(struct lance_init_block), \"lebuffer\");\n+\t\t\tof_ioremap(&lebuffer->resource[0], 0,\n+\t\t\t\t sizeof(struct lance_init_block), \"lebuffer\");\n \t\tif (!lp->init_block_iomem) {\n \t\t\tprintk(KERN_ERR \"SunLance: Cannot map PIO buffer.\\n\");\n \t\t\tgoto fail;\n@@ -1385,10 +1384,10 @@\n \t\tlp->tx = lance_tx_pio;\n \t} else {\n \t\tlp->init_block_mem =\n-\t\t\tdma_alloc_coherent(&sdev->ofdev.dev,\n+\t\t\tdma_alloc_coherent(&op->dev,\n \t\t\t\t\t sizeof(struct lance_init_block),\n \t\t\t\t\t &lp->init_block_dvma, GFP_ATOMIC);\n-\t\tif (!lp->init_block_mem || lp->init_block_dvma == 0) {\n+\t\tif (!lp->init_block_mem) {\n \t\t\tprintk(KERN_ERR \"SunLance: Cannot allocate consistent DMA memory.\\n\");\n \t\t\tgoto fail;\n \t\t}\n@@ -1407,8 +1406,9 @@\n \tlp->burst_sizes = 0;\n \tif (lp->ledma) {\n \t\tstruct device_node *ledma_dp = ledma->node;\n+\t\tstruct device_node *sbus_dp;\n+\t\tunsigned int sbmask;\n \t\tconst char *prop;\n-\t\tunsigned int sbmask;\n \t\tu32 csr;\n \n \t\t\/* Find burst-size property for ledma *\/\n@@ -1416,7 +1416,8 @@\n \t\t\t\t\t\t\t\"burst-sizes\", 0);\n \n \t\t\/* ledma may be capable of fast bursts, but sbus may not. *\/\n-\t\tsbmask = of_getintprop_default(ledma_dp, \"burst-sizes\",\n+\t\tsbus_dp = ledma_dp->parent;\n+\t\tsbmask = of_getintprop_default(sbus_dp, \"burst-sizes\",\n \t\t\t\t\t DMA_BURSTBITS);\n \t\tlp->burst_sizes &= sbmask;\n \n@@ -1463,7 +1464,7 @@\n \t\tlp->dregs = NULL;\n \n \tlp->dev = dev;\n-\tSET_NETDEV_DEV(dev, &sdev->ofdev.dev);\n+\tSET_NETDEV_DEV(dev, &op->dev);\n \tdev->open = &lance_open;\n \tdev->stop = &lance_close;\n \tdev->hard_start_xmit = &lance_start_xmit;\n@@ -1472,9 +1473,7 @@\n \tdev->set_multicast_list = &lance_set_multicast;\n \tdev->ethtool_ops = &sparc_lance_ethtool_ops;\n \n-\tdev->irq = sdev->irqs[0];\n-\n-\tdev->dma = 0;\n+\tdev->irq = op->irqs[0];\n \n \t\/* We cannot sleep if the chip is busy during a\n \t * multicast list update event, because such events\n@@ -1490,7 +1489,7 @@\n \t\tgoto fail;\n \t}\n \n-\tdev_set_drvdata(&sdev->ofdev.dev, lp);\n+\tdev_set_drvdata(&op->dev, lp);\n \n \tprintk(KERN_INFO \"%s: LANCE %s\\n\",\n \t dev->name, print_mac(mac, dev->dev_addr));\n@@ -1540,31 +1539,25 @@\n \n #else \/* !CONFIG_SUN4 *\/\n \n-static int __devinit sunlance_sbus_probe(struct of_device *dev, const struct of_device_id *match)\n-{\n-\tstruct sbus_dev *sdev = to_sbus_device(&dev->dev);\n+static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)\n+{\n+\tstruct of_device *parent = to_of_device(op->dev.parent);\n+\tstruct device_node *parent_dp = parent->node;\n \tint err;\n \n-\tif (sdev->parent) {\n-\t\tstruct device_node *parent_node = sdev->parent->ofdev.node;\n-\t\tstruct of_device *parent;\n-\n-\t\tparent = of_find_device_by_node(parent_node);\n-\t\tif (parent && !strcmp(parent->node->name, \"ledma\")) {\n-\t\t\terr = sparc_lance_probe_one(sdev, parent, NULL);\n-\t\t} else if (parent && !strcmp(parent->node->name, \"lebuffer\")) {\n-\t\t\terr = sparc_lance_probe_one(sdev, NULL, to_sbus_device(&parent->dev));\n-\t\t} else\n-\t\t\terr = sparc_lance_probe_one(sdev, NULL, NULL);\n+\tif (!strcmp(parent_dp->name, \"ledma\")) {\n+\t\terr = sparc_lance_probe_one(op, parent, NULL);\n+\t} else if (!strcmp(parent_dp->name, \"lebuffer\")) {\n+\t\terr = sparc_lance_probe_one(op, NULL, parent);\n \t} else\n-\t\terr = sparc_lance_probe_one(sdev, NULL, NULL);\n+\t\terr = sparc_lance_probe_one(op, NULL, NULL);\n \n \treturn err;\n }\n \n-static int __devexit sunlance_sbus_remove(struct of_device *dev)\n-{\n-\tstruct lance_private *lp = dev_get_drvdata(&dev->dev);\n+static int __devexit sunlance_sbus_remove(struct of_device *op)\n+{\n+\tstruct lance_private *lp = dev_get_drvdata(&op->dev);\n \tstruct net_device *net_dev = lp->dev;\n \n \tunregister_netdev(net_dev);\n@@ -1573,7 +1566,7 @@\n \n \tfree_netdev(net_dev);\n \n-\tdev_set_drvdata(&dev->dev, NULL);\n+\tdev_set_drvdata(&op->dev, NULL);\n \n \treturn 0;\n }\n@@ -1598,7 +1591,7 @@\n \/* Find all the lance cards on the system and initialize them *\/\n static int __init sparc_lance_init(void)\n {\n-\treturn of_register_driver(&sunlance_sbus_driver, &sbus_bus_type);\n+\treturn of_register_driver(&sunlance_sbus_driver, &of_bus_type);\n }\n #endif \/* !CONFIG_SUN4 *\/\n \n"} {"commit":"25df57db73adc3e610193ee1fcdd202c47ba471d","subject":"util: don't fail if no PortData is found while getting migrateData","message":"util: don't fail if no PortData is found while getting migrateData\n\nIntroduced by f6a2f97e\n\nProblem Description:\nAfter multiple times of migrating a domain, which has an ovs interface with no portData set,\nwith non-shared disk, nbd ports got overflowed.\n\nThe steps to reproduce the problem:\n1 define and start a domain with its network configured as:\n <interface type='bridge'>\n <source bridge='br0'\/>\n <virtualport type='openvswitch'>\n <\/virtualport>\n <model type='virtio'\/>\n <driver name='vhost' queues='4'\/>\n <\/interface>\n2 do not set the network's portData.\n3 migrate(ToURI2) it with flag 91(1011011), which means:\n VIR_MIGRATE_LIVE\n VIR_MIGRATE_PEER2PEER\n VIR_MIGRATE_PERSIST_DEST\n VIR_MIGRATE_UNDEFINE_SOURCE\n VIR_MIGRATE_NON_SHARED_DISK\n4 migrate success, but we got an error log in libvirtd.log:\n error : virCommandWait:2423 : internal error: Child process (ovs-vsctl --timeout=5 get Interface\n vnet1 external_ids:PortData) unexpected exit status 1: ovs-vsctl: no key \"PortData\" in Interface\n record \"vnet1\" column external_ids\n5 migrate it back, migrate it , migrate it back, .......\n6 nbd port got overflowed.\n\nThe reasons for the problem is :\n1 virNetDevOpenvswitchGetMigrateData() takes it as wrong if no portData is available for the ovs\n interface of a domain. (We think it's not appropriate, as portData is just OPTIONAL)\n2 in func qemuMigrationBakeCookie(), it fails in qemuMigrationCookieAddNetwork(), and returns with -1.\n qemuMigrationCookieAddNBD() is not called thereafter, and mig->nbd is still NULL.\n3 However, qemuMigrationRun() just *WARN* if qemuMigrationBakeCookie() fails, migration still successes.\n cookie is NULL, it's not baked on the src side.\n4 On the destination side, it would alloc a port first and then free the nbd port in COOKIE.\n But the cookie is NULL due to qemuMigrationCookieAddNetwork() failure at src side. thus the nbd port\n is not freed.\n\nIn this patch, we add \"--if-exists\" option to make ovs-vsctl not raise error if there's no portData available.\nFurther more, because portData may be NULL in the cookie at the dest side, check it before setting portData.\n\nSigned-off-by: Zhou Yimin <301f1aa1a5d5742a74cf62f513901bacca83bb66@huawei.com>\nSigned-off-by: Zhang Bo <cae72d1e73283b1efb9f7d3401b1ea60af16bc40@huawei.com>\n","repos":"nertpinx\/libvirt,taget\/libvirt,taget\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,datto\/libvirt,datto\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,rlaager\/libvirt,eskultety\/libvirt,olafhering\/libvirt,olafhering\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,rlaager\/libvirt,VenkatDatta\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,datto\/libvirt,eskultety\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,rlaager\/libvirt,eskultety\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,taget\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,taget\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,libvirt\/libvirt,datto\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,rlaager\/libvirt,libvirt\/libvirt,zippy2\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,taget\/libvirt,eskultety\/libvirt,libvirt\/libvirt,agx\/libvirt,agx\/libvirt,agx\/libvirt,agx\/libvirt,zippy2\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virnetdevopenvswitch.c\n+++ src\/util\/virnetdevopenvswitch.c\n@@ -30,8 +30,11 @@\n #include \"virerror.h\"\n #include \"virmacaddr.h\"\n #include \"virstring.h\"\n+#include \"virlog.h\"\n \n #define VIR_FROM_THIS VIR_FROM_NONE\n+\n+VIR_LOG_INIT(\"util.netdevopenvswitch\");\n \n \/**\n * virNetDevOpenvswitchAddPort:\n@@ -206,7 +209,7 @@\n virCommandPtr cmd = NULL;\n int ret = -1;\n \n- cmd = virCommandNewArgList(OVSVSCTL, \"--timeout=5\", \"get\", \"Interface\",\n+ cmd = virCommandNewArgList(OVSVSCTL, \"--timeout=5\", \"--if-exists\", \"get\", \"Interface\",\n ifname, \"external_ids:PortData\", NULL);\n \n virCommandSetOutputBuffer(cmd, migrate);\n@@ -241,6 +244,11 @@\n virCommandPtr cmd = NULL;\n int ret = -1;\n \n+ if (!migrate) {\n+ VIR_DEBUG(\"No OVS port data for interface %s\", ifname);\n+ return 0;\n+ }\n+\n cmd = virCommandNewArgList(OVSVSCTL, \"--timeout=5\", \"set\",\n \"Interface\", ifname, NULL);\n virCommandAddArgFormat(cmd, \"external_ids:PortData=%s\", migrate);\n"} {"commit":"a6d3c749add30c6d2d3898d0821ae29239b9c810","subject":"drop caps granted by mds on inodes we dont have; use send_cap_ack helper","message":"drop caps granted by mds on inodes we dont have; use send_cap_ack helper\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/kernel\/mds_client.c\n+++ src\/kernel\/mds_client.c\n@@ -986,7 +986,29 @@\n \treturn;\n }\n \n+\n \/* caps *\/\n+\n+void send_cap_ack(struct ceph_mds_client *mdsc, __u64 ino, int caps, int wanted, \n+\t\t __u32 seq, __u64 size, int mds)\n+{\n+\tstruct ceph_mds_file_caps *fc;\n+\tstruct ceph_msg *msg;\n+\t\n+\tmsg = ceph_msg_new(CEPH_MSG_CLIENT_FILECAPS, sizeof(*fc), 0, 0, 0);\n+\tif (IS_ERR(msg))\n+\t\treturn;\n+\t\n+\tfc = msg->front.iov_base;\n+\tfc->op = cpu_to_le32(CEPH_CAP_OP_ACK); \/* misnomer *\/\n+\tfc->seq = cpu_to_le64(seq);\n+\tfc->caps = cpu_to_le32(caps);\n+\tfc->wanted = cpu_to_le32(wanted);\n+\tfc->ino = cpu_to_le64(ino);\n+\tfc->size = cpu_to_le64(size);\n+\t\n+\tsend_msg_mds(mdsc, msg, mds);\n+}\n \n void ceph_mdsc_handle_filecaps(struct ceph_mds_client *mdsc, struct ceph_msg *msg)\n {\n@@ -997,7 +1019,8 @@\n \tstruct ceph_mds_file_caps *h;\n \tint mds = msg->hdr.src.name.num;\n \tint op;\n-\t__u64 ino;\n+\t__u32 seq;\n+\t__u64 ino, size;\n \t\n \tdout(10, \"handle_filecaps from mds%d\\n\", mds);\n \t\n@@ -1007,6 +1030,8 @@\n \th = msg->front.iov_base;\n \top = le32_to_cpu(h->op);\n \tino = le64_to_cpu(h->ino);\n+\tseq = le32_to_cpu(h->seq);\n+\tsize = le64_to_cpu(h->seq);\n \n \t\/* find session *\/\n \tsession = get_session(&client->mdsc, mds);\n@@ -1020,7 +1045,8 @@\n \tinode = ilookup(sb, ino);\n \tdout(20, \"op is %d, inode is %llx %p\\n\", op, ino, inode);\n \tif (!inode) {\n-\t\tdout(10, \"hrm, wtf, don't have inode?\\n\");\n+\t\tdout(10, \"hrm, wtf, i don't have inode %llx? closing out cap\\n\", ino);\n+\t\tsend_cap_ack(mdsc, ino, 0, 0, seq, size, mds);\n \t\treturn;\n \t}\n \n@@ -1053,8 +1079,6 @@\n \tstruct ceph_mds_client *mdsc = &client->mdsc;\n \tstruct ceph_inode_cap *cap;\n \tstruct ceph_mds_session *session;\n-\tstruct ceph_mds_file_caps *fc;\n-\tstruct ceph_msg *msg;\n \tint i;\n \n \tdout(10, \"update_cap_wanted %d -> %d\\n\", ci->i_cap_wanted, wanted);\n@@ -1064,22 +1088,10 @@\n \n \t\tsession = get_session(mdsc, cap->mds);\n \t\tBUG_ON(!session);\n-\t\t\n-\t\tmsg = ceph_msg_new(CEPH_MSG_CLIENT_FILECAPS, sizeof(*fc), 0, 0, 0);\n-\t\tif (IS_ERR(msg))\n-\t\t\treturn PTR_ERR(msg);\n \n \t\tcap->caps &= wanted; \/* drop caps we don't want *\/\n-\n-\t\tfc = msg->front.iov_base;\n-\t\tfc->op = cpu_to_le32(CEPH_CAP_OP_ACK); \/* misnomer *\/\n-\t\tfc->seq = cap->seq;\n-\t\tfc->caps = cap->caps;\n-\t\tfc->wanted = wanted;\n-\t\tfc->ino = cpu_to_le64(ci->vfs_inode.i_ino);\n-\t\tfc->size = cpu_to_le64(ci->vfs_inode.i_size);\n-\n-\t\tsend_msg_mds(mdsc, msg, cap->mds);\n+\t\tsend_cap_ack(mdsc, ci->vfs_inode.i_ino, cap->caps, wanted, \n+\t\t\t cap->seq, ci->vfs_inode.i_size, cap->mds);\n \t}\n \n \tci->i_cap_wanted = wanted;\n"} {"commit":"0911810755fc9f15659cc3cb43912633b90027a0","subject":"cosa: cdev lock_kernel() pushdown","message":"cosa: cdev lock_kernel() pushdown\n\nSigned-off-by: Jonathan Corbet <b2ce64d5587c02f12e367eac59751145a0660c51@lwn.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wan\/cosa.c\n+++ drivers\/net\/wan\/cosa.c\n@@ -93,6 +93,7 @@\n #include <linux\/spinlock.h>\n #include <linux\/mutex.h>\n #include <linux\/device.h>\n+#include <linux\/smp_lock.h>\n \n #undef COSA_SLOW_IO\t\/* for testing purposes only *\/\n \n@@ -974,15 +975,21 @@\n \tstruct channel_data *chan;\n \tunsigned long flags;\n \tint n;\n-\n+\tint ret = 0;\n+\n+\tlock_kernel();\n \tif ((n=iminor(file->f_path.dentry->d_inode)>>CARD_MINOR_BITS)\n-\t\t>= nr_cards)\n-\t\treturn -ENODEV;\n+\t\t>= nr_cards) {\n+\t\tret = -ENODEV;\n+\t\tgoto out;\n+\t}\n \tcosa = cosa_cards+n;\n \n \tif ((n=iminor(file->f_path.dentry->d_inode)\n-\t\t& ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels)\n-\t\treturn -ENODEV;\n+\t\t& ((1<<CARD_MINOR_BITS)-1)) >= cosa->nchannels) {\n+\t\tret = -ENODEV;\n+\t\tgoto out;\n+\t}\n \tchan = cosa->chan + n;\n \t\n \tfile->private_data = chan;\n@@ -991,7 +998,8 @@\n \n \tif (chan->usage < 0) { \/* in netdev mode *\/\n \t\tspin_unlock_irqrestore(&cosa->lock, flags);\n-\t\treturn -EBUSY;\n+\t\tret = -EBUSY;\n+\t\tgoto out;\n \t}\n \tcosa->usage++;\n \tchan->usage++;\n@@ -1000,7 +1008,9 @@\n \tchan->setup_rx = chrdev_setup_rx;\n \tchan->rx_done = chrdev_rx_done;\n \tspin_unlock_irqrestore(&cosa->lock, flags);\n-\treturn 0;\n+out:\n+\tunlock_kernel();\n+\treturn ret;\n }\n \n static int cosa_release(struct inode *inode, struct file *file)\n"} {"commit":"17a4b0e688d6d78d05c408224f4df08db69c20be","subject":"All new \/proc\/PID\/maps parsing support.","message":"All new \/proc\/PID\/maps parsing support.\n","repos":"emptymonkey\/ptrace_do","returncode":1,"stderr":"error: pathspec 'parse_maps.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- parse_maps.c\n+++ parse_maps.c\n@@ -0,0 +1,297 @@\n+\n+#include \"libptrace_do.h\"\n+\n+\n+#define PROC_STRING \"\/proc\/\"\n+#define MAPS_STRING \"\/maps\"\n+\n+\n+\/\/ Internal helper functions don't need to make it into the main .h file.*\/\n+struct parse_maps *parse_next_line(char *line);\n+\n+\n+\/***********************************************************************************************************************\n+ *\n+ *\tget_proc_pid_maps()\n+ *\n+ *\t\tInput:\n+ *\t\t\tThe process id of the target.\n+ *\n+ *\t\tOutput:\n+ *\t\t\tPointer to a struct parse_maps object. NULL on error.\n+ *\n+ *\t\tPurpose:\n+ *\t\t\tThe parse_maps object pointer will be a pointer to the head of a linked list. This list represents the \n+ *\t\t\tdifferent regions of memory allocated by the kernel. This will be a reflection of the entries in the \n+ *\t\t\t\/proc\/PID\/maps file.\n+ *\n+ **********************************************************************************************************************\/\n+struct parse_maps *get_proc_pid_maps(pid_t target){\n+\n+\tstruct parse_maps *map_head = NULL, *map_tail = NULL, *map_tmp;\n+\n+\tint fd, buffer_len;\n+\tint ret_int;\n+\n+\tchar *buffer;\n+\tchar *tmp_ptr;\n+\n+\n+\t\/\/ I'm afraid that this function just parses a file and turns it into a linked list. Not very exciting.\n+\n+\tbuffer_len = getpagesize();\n+\n+\tif((buffer = (char *) calloc(buffer_len, sizeof(char))) == NULL){\n+\t\tfprintf(stderr, \"calloc(%d, %d): %s\\n\", buffer_len, (int) sizeof(char), strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\n+\n+\ttmp_ptr = buffer;\n+\tmemcpy(tmp_ptr, PROC_STRING, strlen(PROC_STRING));\n+\n+\ttmp_ptr = strchr(buffer, '\\0');\n+\tsnprintf(tmp_ptr, (PATH_MAX - 1) - (strlen(PROC_STRING) + strlen(MAPS_STRING)), \"%d\", target);\n+\n+\ttmp_ptr = strchr(buffer, '\\0');\n+\tmemcpy(tmp_ptr, MAPS_STRING, strlen(MAPS_STRING));\n+\n+\tif((fd = open(buffer, O_RDONLY)) == -1){\n+\t\tfprintf(stderr, \"open(%s, O_RDONLY): %s\\n\", buffer, strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\n+\n+\tmemset(buffer, 0, buffer_len);\n+\ttmp_ptr = buffer;\n+\n+\twhile((ret_int = read(fd, tmp_ptr, 1)) > 0){\n+\t\tif(*tmp_ptr\t== '\\n'){\n+\t\t\t*tmp_ptr = '\\0';\n+\n+\t\t\tif((map_tmp = parse_next_line(buffer)) == NULL){\n+\t\t\t\tfprintf(stderr, \"parse_next_line(%s): %s\\n\", buffer, strerror(errno));\n+\t\t\t\tgoto CLEAN_UP;\n+\t\t\t}\n+\n+\t\t\tif(!map_head){\n+\t\t\t\tmap_head = map_tmp;\n+\t\t\t\tmap_tail = map_tmp;\n+\t\t\t}else{\n+\t\t\t\tmap_tail->next = map_tmp;\n+\t\t\t\tmap_tmp->previous = map_tail;\n+\t\t\t\tmap_tail = map_tmp;\n+\t\t\t}\n+\n+\t\t\tmemset(buffer, 0, buffer_len);\n+\t\t\ttmp_ptr = buffer;\n+\n+\t\t}else{\n+\t\t\ttmp_ptr++;\n+\t\t}\n+\t}\n+\n+\tif(ret_int == -1){\n+\t\tfprintf(stderr, \"read(%d, %lx, 1): %s\\n\", fd, (unsigned long) tmp_ptr, strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\n+\n+\tfree(buffer);\n+\tclose(fd);\n+\treturn(map_head);\n+\n+\n+CLEAN_UP:\n+\n+\tfree(buffer);\n+\tclose(fd);\n+\tfree_parse_maps_list(map_head);\n+\treturn(NULL);\n+}\n+\n+\n+\/***********************************************************************************************************************\n+ *\n+ *\tparse_next_line()\n+ *\n+ *\t\tInput:\n+ *\t\t\tA pointer to the string that represents the next line of the file.\n+ *\n+ *\t\tOutput:\n+ *\t\t\tA pointer to the next node, as created from this line.\n+ *\n+ *\t\tPurpose:\n+ *\t\t\tThis is a helper function, not exposed externally. It parses a line and returns a node. Enough said. :)\n+ *\n+ **********************************************************************************************************************\/\n+struct parse_maps *parse_next_line(char *line){\n+\n+\tstruct parse_maps *node = NULL;\n+\tchar *token_head, *token_tail;\n+\n+\t\/\/ The comments mentioning data types are just trying to demonstrate\n+\t\/\/ the type of data we will be parsing in that area.\n+\n+\tif((node = (struct parse_maps *) calloc(1, sizeof(struct parse_maps))) == NULL){\n+\t\tfprintf(stderr, \"calloc(1, %d): %s\\n\", (int) sizeof(struct parse_maps), strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\n+\t\/\/ unsigned long start_address;\n+\ttoken_head = line;\n+\tif((token_tail = strchr(token_head, '-')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, '-', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\n+\t*token_tail = '\\0';\n+\tnode->start_address = strtoul(token_head, NULL, 16);\n+\n+\t\/\/ unsigned long end_address;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ' ')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tnode->end_address = strtoul(token_head, NULL, 16);\n+\n+\t\/\/ unsigned int perms;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ' ')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tif(*(token_head++) == 'r'){\n+\t\tnode->perms |= MAPS_READ;\n+\t}\n+\tif(*(token_head++) == 'w'){\n+\t\tnode->perms |= MAPS_WRITE;\n+\t}\n+\tif(*(token_head++) == 'x'){\n+\t\tnode->perms |= MAPS_EXECUTE;\n+\t}\n+\tif(*token_head == 'p'){\n+\t\tnode->perms |= MAPS_PRIVATE;\n+\t}else if(*token_head == 's'){\n+\t\tnode->perms |= MAPS_SHARED;\n+\t}\n+\n+\t\/\/ unsigned long offset;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ' ')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tnode->offset = strtoul(token_head, NULL, 16);\n+\n+\t\/\/ unsigned int dev_major;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ':')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ':', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tnode->dev_major = strtol(token_head, NULL, 16);\n+\n+\t\/\/ unsigned int dev_minor;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ' ')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tnode->dev_minor = strtol(token_head, NULL, 16);\n+\n+\t\/\/ unsigned long inode;\n+\ttoken_head = token_tail + 1;\n+\tif((token_tail = strchr(token_head, ' ')) == NULL){\n+\t\tfprintf(stderr, \"strchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\tgoto CLEAN_UP;\n+\t}\n+\t*token_tail = '\\0';\n+\tnode->inode = strtol(token_head, NULL, 10);\n+\n+\t\/\/ char pathname[PATH_MAX];\n+\ttoken_head = token_tail + 1;\n+\tif(*token_head){\n+\t\tif((token_head = strrchr(token_head, ' ')) == NULL){\n+\t\t\tfprintf(stderr, \"strrchr(%s, '%c'): %s\\n\", token_head, ' ', strerror(errno));\n+\t\t\tgoto CLEAN_UP;\n+\t\t}\n+\t\ttoken_head++;\n+\t\tmemcpy(node->pathname, token_head, strlen(token_head));\n+\t}\n+\n+\treturn(node);\n+\n+CLEAN_UP:\n+\tfree(node);\n+\treturn(NULL);\n+}\n+\n+\n+\/***********************************************************************************************************************\n+ *\n+ *\tfree_parse_maps_list()\n+ *\n+ *\t\tInput:\n+ *\t\t\tA pointer to the head of the list.\n+ *\n+ *\t\tOutput:\n+ *\t\t\tNothing.\n+ *\n+ *\t\tPurpose:\n+ *\t\t\tFree the members of the linked list.\n+ *\n+ **********************************************************************************************************************\/\n+void free_parse_maps_list(struct parse_maps *head){\n+\tstruct parse_maps *tmp;\n+\n+\twhile(head){\n+\t\ttmp = head->next;\n+\t\tfree(head);\n+\t\thead = tmp;\n+\t}\n+}\n+\n+\n+\/***********************************************************************************************************************\n+ *\n+ *\tdump_parse_maps_list()\n+ *\n+ *\t\tInput:\n+ *\t\t\tA pointer to the head of the list.\n+ *\n+ *\t\tOutput:\n+ *\t\t\tNothing, but it will print representations of the internal data to stdout.\n+ *\n+ *\t\tPurpose:\n+ *\t\t\tShow us what the linked list looks like. Mostly intended for debugging.\n+ *\n+ **********************************************************************************************************************\/\n+void dump_parse_maps_list(struct parse_maps *head){\n+\n+\twhile(head){\n+\t\tprintf(\"--------------------------------------------------------------------------------\\n\");\t\n+\t\tprintf(\"node: %lx\\n\", (unsigned long) head);\n+\t\tprintf(\"--------------------------------------------------------------------------------\\n\");\t\n+\t\tprintf(\"start_address:\\t\\t%lx\\n\", head->start_address);\n+\t\tprintf(\"end_address:\\t\\t%lx\\n\", head->end_address);\n+\t\tprintf(\"perms:\\t\\t\\t%05x\\n\", head->perms);\n+\t\tprintf(\"offset:\\t\\t\\t%lx\\n\", head->offset);\n+\t\tprintf(\"dev_major:\\t\\t%x\\n\", head->dev_major);\n+\t\tprintf(\"dev_minor:\\t\\t%x\\n\", head->dev_minor);\n+\t\tprintf(\"inode:\\t\\t\\t%lx\\n\", head->inode);\n+\t\tprintf(\"pathname:\\t\\t%s\\n\", head->pathname);\n+\n+\t\tprintf(\"parse_maps *next:\\t%lx\\n\", (unsigned long) head->next);\n+\t\tprintf(\"parse_maps *previous:\\t%lx\\n\", (unsigned long) head->previous);\n+\t\tprintf(\"\\n\");\n+\n+\t\thead = head->next;\n+\t}\n+}\n"} {"commit":"f537f99114825b80b6b1ed246634edbca408e244","subject":"kclient: osdc fixed circular lock dependency","message":"kclient: osdc fixed circular lock dependency\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/kernel\/osd_client.c\n+++ src\/kernel\/osd_client.c\n@@ -89,6 +89,8 @@\n {\n \tstruct ceph_osd_request_head *head = req->r_request->front.iov_base;\n \tint rc;\n+\n+\tradix_tree_preload(GFP_NOFS);\n \n \tspin_lock(&osdc->request_lock);\n \treq->r_tid = head->tid = ++osdc->last_tid;\n@@ -437,9 +439,8 @@\n \tint bytes;\n \n \t\/* register+send request *\/\n+\tregister_request(osdc, req);\n \tdown_read(&osdc->map_sem);\n-\tradix_tree_preload(GFP_NOFS);\n-\tregister_request(osdc, req);\n \tsend_request(osdc, req, -1);\n \tup_read(&osdc->map_sem);\n \n"} {"commit":"f40037fd3677ae240978f469cc4155bf3ca7c076","subject":"phy-core: phy_get: Leave error logging to the caller","message":"phy-core: phy_get: Leave error logging to the caller\n\nIn various cases errors may be expected, ie probe-deferral or a call to\nphy_get from a driver where the use of a phy is optional.\n\nRather then adding all sort of complicated checks for this, and\/or adding\nspecial functions like devm_phy_get_optional, simply don't log an error,\nand let deciding if get_phy returning an error really should result in a\ndev_err up to the caller.\n\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\nSigned-off-by: Kishon Vijay Abraham I <c224db9378a929ae8338a052bbb1b30fb46cdd39@ti.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d8d2886b0f9dca330b9a6ca368e3d74d9d0c494d","subject":"kclient: fix and clean up osd request generation","message":"kclient: fix and clean up osd request generation\n\nAdd trunc op correctly. Clean things up by combining request\nmessage and request struct creation.\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/kernel\/osd_client.c\n+++ src\/kernel\/osd_client.c\n@@ -86,41 +86,66 @@\n }\n \n \/*\n- * build osd request message only.\n- *\/\n-static struct ceph_msg *new_request_msg(struct ceph_osd_client *osdc, short opc,\n-\t\t\t\t\tstruct ceph_snap_context *snapc,\n-\t\t\t\t\tint do_sync, int do_trunc)\n-{\n-\tstruct ceph_msg *req;\n+ * build new request AND message, calculate layout, and adjust file\n+ * extent as needed. include addition truncate or sync osd ops.\n+ *\/\n+struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,\n+\t\t\t\t\t struct ceph_file_layout *layout,\n+\t\t\t\t\t struct ceph_vino vino,\n+\t\t\t\t\t u64 off, u64 *plen, int opcode,\n+\t\t\t\t\t struct ceph_snap_context *snapc,\n+\t\t\t\t\t int do_sync,\n+\t\t\t\t\t u32 truncate_seq,\n+\t\t\t\t\t u64 truncate_size)\n+{\n+\tstruct ceph_osd_request *req;\n+\tstruct ceph_msg *msg;\n+\tint num_pages = calc_pages_for(off, *plen);\n \tstruct ceph_osd_request_head *head;\n \tstruct ceph_osd_op *op;\n \t__le64 *snaps;\n+\tint do_trunc = truncate_seq && (off + *plen > truncate_size);\n \tint num_op = 1 + do_sync + do_trunc;\n-\tsize_t size = sizeof(*head) + num_op*sizeof(*op);\n+\tsize_t msg_size = sizeof(*head) + num_op*sizeof(*op);\n \tint i;\n \n+\t\/* we may overallocate here, if our write extent is shortened below *\/\n+\treq = kzalloc(sizeof(*req) + num_pages*sizeof(void *), GFP_NOFS);\n+\tif (req == NULL)\n+\t\treturn ERR_PTR(-ENOMEM);\n+\n+\t\/* create message *\/\n \tif (snapc)\n-\t\tsize += sizeof(u64) * snapc->num_snaps;\n-\treq = ceph_msg_new(CEPH_MSG_OSD_OP, size, 0, 0, NULL);\n-\tif (IS_ERR(req))\n-\t\treturn req;\n-\tmemset(req->front.iov_base, 0, req->front.iov_len);\n-\thead = req->front.iov_base;\n+\t\tmsg_size += sizeof(u64) * snapc->num_snaps;\n+\tmsg = ceph_msg_new(CEPH_MSG_OSD_OP, msg_size, 0, 0, NULL);\n+\tif (IS_ERR(msg)) {\n+\t\tkfree(req);\n+\t\treturn ERR_PTR(PTR_ERR(msg));\n+\t}\n+\tmemset(msg->front.iov_base, 0, msg->front.iov_len);\n+\thead = msg->front.iov_base;\n \top = (void *)(head + 1);\n \tsnaps = (void *)(op + num_op);\n \n-\t\/* encode head *\/\n \thead->client_inc = cpu_to_le32(1); \/* always, for now. *\/\n \thead->flags = 0;\n \thead->num_ops = cpu_to_le16(num_op);\n-\top->op = cpu_to_le16(opc);\n-\n+\top->op = cpu_to_le16(opcode);\n+\n+\treq->r_request = msg;\n+\treq->r_snapc = ceph_get_snap_context(snapc);\n+\n+\t\/* calculate max write size, pgid *\/\n+\tcalc_layout(osdc, vino, layout, off, plen, req);\n+\treq->r_pgid.pg64 = le64_to_cpu(head->layout.ol_pgid);\n+\n+\t\/* additional ops *\/\n \tif (do_trunc) {\n \t\top++;\n-\t\top->op = cpu_to_le16(opc == CEPH_OSD_OP_READ ? \n+\t\top->op = cpu_to_le16(opcode == CEPH_OSD_OP_READ ? \n \t\t\t CEPH_OSD_OP_MASKTRUNC : CEPH_OSD_OP_SETTRUNC);\n-\t\t\/* call set_trunc later *\/\n+\t\top->truncate_seq = truncate_seq;\n+\t\top->truncate_size = truncate_size - (off - (op-1)->offset);\n \t}\n \tif (do_sync) {\n \t\top++;\n@@ -132,63 +157,6 @@\n \t\tfor (i = 0; i < snapc->num_snaps; i++)\n \t\t\tsnaps[i] = cpu_to_le64(snapc->snaps[i]);\n \t}\n-\treturn req;\n-}\n-\n-\/*\n- * Set truncate op's truncate_size relative to object offset,\n- * after we calculate the layout.\n- *\/\n-static void set_trunc(struct ceph_osd_request *req, u64 file_off,\n-\t\t u32 truncate_seq, u64 truncate_size)\n-{\n-\tstruct ceph_osd_request_head *head = req->r_request->front.iov_base;\n-\tstruct ceph_osd_op *op = (void *)(head + 1);\n-\tstruct ceph_osd_op *top = op + 1;\n-\n-\top->truncate_seq = truncate_seq;\n-\top->truncate_size = truncate_size - (file_off - top->offset);\n-}\n-\n-\/*\n- * build new request AND message, calculate layout, and adjust file\n- * extent as needed.\n- *\/\n-struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,\n-\t\t\t\t\t struct ceph_file_layout *layout,\n-\t\t\t\t\t struct ceph_vino vino,\n-\t\t\t\t\t u64 off, u64 *plen, int op,\n-\t\t\t\t\t struct ceph_snap_context *snapc,\n-\t\t\t\t\t int do_sync,\n-\t\t\t\t\t u32 truncate_seq,\n-\t\t\t\t\t u64 truncate_size)\n-{\n-\tstruct ceph_osd_request *req;\n-\tstruct ceph_msg *msg;\n-\tint num_pages = calc_pages_for(off, *plen);\n-\tstruct ceph_osd_request_head *head;\n-\tint do_trunc = off + *plen > truncate_size;\n-\n-\t\/* we may overallocate here, if our write extent is shortened below *\/\n-\treq = kzalloc(sizeof(*req) + num_pages*sizeof(void *), GFP_NOFS);\n-\tif (req == NULL)\n-\t\treturn ERR_PTR(-ENOMEM);\n-\n-\tmsg = new_request_msg(osdc, op, snapc, do_sync, do_trunc);\n-\tif (IS_ERR(msg)) {\n-\t\tkfree(req);\n-\t\treturn ERR_PTR(PTR_ERR(msg));\n-\t}\n-\treq->r_request = msg;\n-\treq->r_snapc = ceph_get_snap_context(snapc);\n-\n-\t\/* calculate max write size, pgid *\/\n-\tcalc_layout(osdc, vino, layout, off, plen, req);\n-\tif (do_trunc)\n-\t\tset_trunc(req, off, truncate_seq, truncate_size);\n-\n-\thead = msg->front.iov_base;\n-\treq->r_pgid.pg64 = le64_to_cpu(head->layout.ol_pgid);\n \n \tatomic_set(&req->r_ref, 1);\n \tinit_completion(&req->r_completion);\n"} {"commit":"962bcbc57aa244eeb1176fa2e9f65ac865cca68a","subject":"pinctrl: fix the pin descriptor kerneldoc","message":"pinctrl: fix the pin descriptor kerneldoc\n\nThe introduction of the owner field on the pin descriptor was not\nproperly documented so fix this up.\n\nSigned-off-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pinctrl\/core.h\n+++ drivers\/pinctrl\/core.h\n@@ -76,9 +76,7 @@\n *\tdatasheet or such\n * @dynamic_name: if the name of this pin was dynamically allocated\n * @lock: a lock to protect the descriptor structure\n- * @mux_requested: whether the pin is already requested by pinmux or not\n- * @mux_function: a named muxing function for the pin that will be passed to\n- *\tsubdrivers and shown in debugfs etc\n+ * @owner: the device holding this pin or NULL of no device has claimed it\n *\/\n struct pin_desc {\n \tstruct pinctrl_dev *pctldev;\n"} {"commit":"78212996895df0851956b62c491495ec21ad0a6a","subject":"[REF] Removed unused symbol_set::insert function","message":"[REF] Removed unused symbol_set::insert function\n","repos":"morinim\/vita,morinim\/vita,morinim\/vita","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/kernel\/symbol_set.h\n+++ src\/kernel\/symbol_set.h\n@@ -42,7 +42,6 @@\n void clear();\n \n symbol *insert(std::unique_ptr<symbol>, double = 1.0);\n- template<class S, class ...Args> symbol *insert(double, Args &&...);\n template<class S, class ...Args> symbol *insert(Args &&...);\n \n const symbol &roulette(category_t) const;\n@@ -167,8 +166,6 @@\n \/\/\/ Adds a symbol to the symbol set.\n \/\/\/\n \/\/\/ \\tparam S symbol to be added\n-\/\/\/ \\param[in] wr the weight of `S` (`1.0` means standard frequency, `2.0`\n-\/\/\/ double probability of selection)\n \/\/\/ \\param[in] args arguments used to build `S`\n \/\/\/ \\return a raw pointer to the symbol just added (or `nullptr` in\n \/\/\/ case of error)\n@@ -177,20 +174,11 @@\n \/\/\/ memory. It doesn't completely replace the `insert(std::unique_ptr)`\n \/\/\/ method (e.g. building from factory).\n \/\/\/\n-template<class S, class ...Args> symbol *symbol_set::insert(double wr,\n- Args &&... args)\n-{\n- return insert(std::make_unique<S>(args...), wr);\n-}\n-\n-\/\/\/\n-\/\/\/ Adds a symbol to the symbol set.\n-\/\/\/\n \/\/\/ \\note Assumes a standard frequency (`1.0`) for symbol `S`.\n \/\/\/\n template<class S, class ...Args> symbol *symbol_set::insert(Args &&... args)\n {\n- return insert(std::make_unique<S>(args...), 1.0);\n+ return insert(std::make_unique<S>(args...));\n }\n \n std::ostream &operator<<(std::ostream &, const symbol_set &);\n"} {"commit":"f1137e47827e948ce01ab828929b5f5807273e3f","subject":"drivers: pwm_nrfx: use IS_ENABLED to eliminate a bunch of #ifndefs","message":"drivers: pwm_nrfx: use IS_ENABLED to eliminate a bunch of #ifndefs\n\nFor the macros that take on 0\/1 values, we can use the existing\nIS_ENABLED macro to remove a bunch of code.\n\nSigned-off-by: Jim Paris <1cd02e31b43620d7c664e038ca42a060d61727b9@jtan.com>\n","repos":"Vudentz\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,galak\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pwm\/pwm_nrfx.c\n+++ drivers\/pwm\/pwm_nrfx.c\n@@ -352,15 +352,15 @@\n \n #define PWM_NRFX_OUTPUT_PIN(dev_idx, ch_idx)\t\t\t\t \\\n \t(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CH##ch_idx##_PIN |\t\t \\\n-\t (DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CH##ch_idx##_INVERTED ?\t \\\n+\t (IS_ENABLED(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CH##ch_idx##_INVERTED) ?\\\n \t NRFX_PWM_PIN_INVERTED : 0))\n \n #define PWM_NRFX_DEFAULT_VALUE(dev_idx, ch_idx) \\\n-\t(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CH##ch_idx##_INVERTED ? \\\n+\t(IS_ENABLED(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CH##ch_idx##_INVERTED) ? \\\n \t PWM_NRFX_CH_VALUE_INVERTED : PWM_NRFX_CH_VALUE_NORMAL)\n \n #define PWM_NRFX_COUNT_MODE(dev_idx) \\\n-\t(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CENTER_ALIGNED ? \\\n+\t(IS_ENABLED(DT_NORDIC_NRF_PWM_PWM_##dev_idx##_CENTER_ALIGNED) ?\t \\\n \t NRF_PWM_MODE_UP_AND_DOWN : NRF_PWM_MODE_UP)\n \n #define PWM_NRFX_DEVICE(idx)\t\t\t\t\t\t \\\n@@ -402,125 +402,65 @@\n \t\t &pwm_nrfx_drv_api_funcs)\n \n #ifdef CONFIG_PWM_0\n-#ifndef DT_NORDIC_NRF_PWM_PWM_0_CENTER_ALIGNED\n-#define DT_NORDIC_NRF_PWM_PWM_0_CENTER_ALIGNED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_0_CH0_PIN\n #define DT_NORDIC_NRF_PWM_PWM_0_CH0_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_0_CH0_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_0_CH0_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_0_CH1_PIN\n #define DT_NORDIC_NRF_PWM_PWM_0_CH1_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_0_CH1_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_0_CH1_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_0_CH2_PIN\n #define DT_NORDIC_NRF_PWM_PWM_0_CH2_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_0_CH2_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_0_CH2_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_0_CH3_PIN\n #define DT_NORDIC_NRF_PWM_PWM_0_CH3_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_0_CH3_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_0_CH3_INVERTED 0\n-#endif\n PWM_NRFX_DEVICE(0);\n #endif\n \n #ifdef CONFIG_PWM_1\n-#ifndef DT_NORDIC_NRF_PWM_PWM_1_CENTER_ALIGNED\n-#define DT_NORDIC_NRF_PWM_PWM_1_CENTER_ALIGNED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_1_CH0_PIN\n #define DT_NORDIC_NRF_PWM_PWM_1_CH0_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_1_CH0_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_1_CH0_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_1_CH1_PIN\n #define DT_NORDIC_NRF_PWM_PWM_1_CH1_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_1_CH1_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_1_CH1_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_1_CH2_PIN\n #define DT_NORDIC_NRF_PWM_PWM_1_CH2_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_1_CH2_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_1_CH2_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_1_CH3_PIN\n #define DT_NORDIC_NRF_PWM_PWM_1_CH3_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_1_CH3_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_1_CH3_INVERTED 0\n-#endif\n PWM_NRFX_DEVICE(1);\n #endif\n \n #ifdef CONFIG_PWM_2\n-#ifndef DT_NORDIC_NRF_PWM_PWM_2_CENTER_ALIGNED\n-#define DT_NORDIC_NRF_PWM_PWM_2_CENTER_ALIGNED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_2_CH0_PIN\n #define DT_NORDIC_NRF_PWM_PWM_2_CH0_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_2_CH0_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_2_CH0_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_2_CH1_PIN\n #define DT_NORDIC_NRF_PWM_PWM_2_CH1_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_2_CH1_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_2_CH1_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_2_CH2_PIN\n #define DT_NORDIC_NRF_PWM_PWM_2_CH2_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_2_CH2_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_2_CH2_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_2_CH3_PIN\n #define DT_NORDIC_NRF_PWM_PWM_2_CH3_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_2_CH3_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_2_CH3_INVERTED 0\n-#endif\n PWM_NRFX_DEVICE(2);\n #endif\n \n #ifdef CONFIG_PWM_3\n-#ifndef DT_NORDIC_NRF_PWM_PWM_3_CENTER_ALIGNED\n-#define DT_NORDIC_NRF_PWM_PWM_3_CENTER_ALIGNED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_3_CH0_PIN\n #define DT_NORDIC_NRF_PWM_PWM_3_CH0_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_3_CH0_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_3_CH0_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_3_CH1_PIN\n #define DT_NORDIC_NRF_PWM_PWM_3_CH1_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_3_CH1_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_3_CH1_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_3_CH2_PIN\n #define DT_NORDIC_NRF_PWM_PWM_3_CH2_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_3_CH2_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_3_CH2_INVERTED 0\n-#endif\n #ifndef DT_NORDIC_NRF_PWM_PWM_3_CH3_PIN\n #define DT_NORDIC_NRF_PWM_PWM_3_CH3_PIN NRFX_PWM_PIN_NOT_USED\n #endif\n-#ifndef DT_NORDIC_NRF_PWM_PWM_3_CH3_INVERTED\n-#define DT_NORDIC_NRF_PWM_PWM_3_CH3_INVERTED 0\n-#endif\n PWM_NRFX_DEVICE(3);\n #endif\n"} {"commit":"dbd692c04adbe5487141566163fde0994eea9dd4","subject":"fixed: timer tick's handling before jiffies initializing","message":"fixed: timer tick's handling before jiffies initializing","repos":"vrxfile\/embox-trik,Kefir0192\/embox,embox\/embox,mike2390\/embox,Kakadu\/embox,mike2390\/embox,mike2390\/embox,gzoom13\/embox,vrxfile\/embox-trik,Kakadu\/embox,embox\/embox,Kefir0192\/embox,embox\/embox,Kefir0192\/embox,gzoom13\/embox,Kakadu\/embox,mike2390\/embox,abusalimov\/embox,gzoom13\/embox,gzoom13\/embox,Kakadu\/embox,mike2390\/embox,Kakadu\/embox,abusalimov\/embox,embox\/embox,mike2390\/embox,Kakadu\/embox,mike2390\/embox,embox\/embox,Kefir0192\/embox,vrxfile\/embox-trik,embox\/embox,Kefir0192\/embox,abusalimov\/embox,abusalimov\/embox,vrxfile\/embox-trik,gzoom13\/embox,vrxfile\/embox-trik,vrxfile\/embox-trik,abusalimov\/embox,Kakadu\/embox,vrxfile\/embox-trik,abusalimov\/embox,Kefir0192\/embox,Kefir0192\/embox,gzoom13\/embox,gzoom13\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/kernel\/time\/timer.c\n+++ src\/kernel\/time\/timer.c\n@@ -20,7 +20,7 @@\n * Handling of the clock tick.\n *\/\n void clock_tick_handler(int irq_num, void *dev_id) {\n-\tif (irq_num == jiffies.event_device->irq_nr) {\n+\tif (jiffies.event_device && irq_num == jiffies.event_device->irq_nr) {\n \t\tsys_ticks++;\n \t\tsoftirq_raise(SOFTIRQ_NR_TIMER);\n \t}\n"} {"commit":"fe587068239cf446a31c4638796b03718291ffcf","subject":"Do not hold change_lock while loading the vout module.","message":"Do not hold change_lock while loading the vout module.\n\nIt allows the module to trigger some vout callback while loading.\n","repos":"krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/video_output\/video_output.c\n+++ src\/video_output\/video_output.c\n@@ -979,9 +979,6 @@\n bool b_picture_interlaced_last = false;\n mtime_t i_picture_interlaced_last_date;\n \n-\n- vlc_mutex_lock( &p_vout->change_lock );\n-\n \/*\n * Initialize thread\n *\/\n@@ -989,6 +986,9 @@\n p_vout->p->psz_module_type,\n p_vout->p->psz_module_name,\n !strcmp(p_vout->p->psz_module_type, \"video filter\") );\n+\n+ vlc_mutex_lock( &p_vout->change_lock );\n+\n if( p_vout->p_module )\n p_vout->b_error = InitThread( p_vout );\n else\n"} {"commit":"2195d9690464445d0c30ee8170030a8e696f2053","subject":"3w-9xxx.c: Cleaning up missing null-terminate in conjunction with strncpy","message":"3w-9xxx.c: Cleaning up missing null-terminate in conjunction with strncpy\n\nReplacing strncpy with strlcpy to avoid strings that lacks null terminate.\nAnd use the sizeof on the to string rather than strlen on the from string.\n\nSigned-off-by: Rickard Strandqvist <b2870f70e324b62b54eced4cf50284b23ec5baab@spectrumdigital.se>\nAcked-by: Adam Radford <3dbf2d2fbfb3484492c697dc4586b54d94b4a311@gmail.com>\nSigned-off-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@lst.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"8f7760e68e1c16ae939180a60d66ade515e1015f","subject":"Trimmed unnecessary whitespaces.","message":"Trimmed unnecessary whitespaces.","repos":"potmdehex\/homm3tools,potmdehex\/homm3tools,potmdehex\/homm3tools,potmdehex\/homm3tools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- h3m\/h3mlib\/gen\/object_names_hash.c\n+++ h3m\/h3mlib\/gen\/object_names_hash.c\n@@ -1263,7 +1263,6 @@\n \t\t\tf2 = 0;\n \t}\n \n-\n \tint result = g[f0] + g[f1] + g[f2];\n \tif (result == 1318) \/\/ Stronghold workaround\n \t\treturn 1319;\n"} {"commit":"1510a1a2d0946b34422fe8816187f274a5086904","subject":"usb: trival: Fix debugging units mistake.","message":"usb: trival: Fix debugging units mistake.\n\nSEL and PEL are in microseconds, not milliseconds. Also, fix a split\nstring that will trigger checkpatch warnings.\n\nSigned-off-by: Sarah Sharp <d4c4fc5069677be84f589aa6e14eedffef9ba12f@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/core\/hub.c\n+++ drivers\/usb\/core\/hub.c\n@@ -3241,8 +3241,7 @@\n \t\t\t(state == USB3_LPM_U2 &&\n \t\t\t (u2_sel > USB3_LPM_MAX_U2_SEL_PEL ||\n \t\t\t u2_pel > USB3_LPM_MAX_U2_SEL_PEL))) {\n-\t\tdev_dbg(&udev->dev, \"Device-initiated %s disabled due \"\n-\t\t\t\t\"to long SEL %llu ms or PEL %llu ms\\n\",\n+\t\tdev_dbg(&udev->dev, \"Device-initiated %s disabled due to long SEL %llu us or PEL %llu us\\n\",\n \t\t\t\tusb3_lpm_names[state], u1_sel, u1_pel);\n \t\treturn -EINVAL;\n \t}\n"} {"commit":"0ed0c0c48c508578c30aa58f755ca0d692636906","subject":"[PATCH] USB: usbcore: inverted test for resuming interfaces","message":"[PATCH] USB: usbcore: inverted test for resuming interfaces\n\nThis one-liner fixes a test for interfaces that are already resumed.\n\nIt would be nice if this could get into 2.6.12, but it's not critical\nsince it only affects people doing selective (runtime) suspend\/resume.\n\nSigned-off-by: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/core\/hub.c\n+++ drivers\/usb\/core\/hub.c\n@@ -1733,7 +1733,7 @@\n \t\t\tstruct usb_driver\t*driver;\n \n \t\t\tintf = udev->actconfig->interface[i];\n-\t\t\tif (intf->dev.power.power_state == PMSG_SUSPEND)\n+\t\t\tif (intf->dev.power.power_state == PMSG_ON)\n \t\t\t\tcontinue;\n \t\t\tif (!intf->dev.driver) {\n \t\t\t\t\/* FIXME maybe force to alt 0 *\/\n"} {"commit":"1e7618d8a1ad7aac6904c3a3915bf63f411344c2","subject":"usb: dwc3: ep0: use proper endianess in SetFeature for wIndex","message":"usb: dwc3: ep0: use proper endianess in SetFeature for wIndex\n\nThe first access was correct, the second was wrong.\n\nSigned-off-by: Sebastian Andrzej Siewior <265264fed90bdf8e813a354375ec16f47ebdb1c5@linutronix.de>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/dwc3\/ep0.c\n+++ drivers\/usb\/dwc3\/ep0.c\n@@ -392,8 +392,7 @@\n \tcase USB_RECIP_ENDPOINT:\n \t\tswitch (wValue) {\n \t\tcase USB_ENDPOINT_HALT:\n-\n-\t\t\tdep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex);\n+\t\t\tdep = dwc3_wIndex_to_dep(dwc, wIndex);\n \t\t\tif (!dep)\n \t\t\t\treturn -EINVAL;\n \t\t\tret = __dwc3_gadget_ep_set_halt(dep, set);\n"} {"commit":"5732ce8424527ec271e8fa43709948852aa3fc0a","subject":"[PATCH] USB: asix - Add device IDs for 0G0 Cable Ethernet","message":"[PATCH] USB: asix - Add device IDs for 0G0 Cable Ethernet\n\nAdd device IDs for the 0G0 Cable Ethernet device as reported by\nCharles Lepple <clepple@gmail.com>.\n\nSigned-off-by: David Hollis <50a3f951ffa05c7f2aad878874968be8dcf70115@davehollis.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/net\/asix.c\n+++ drivers\/usb\/net\/asix.c\n@@ -916,6 +916,10 @@\n \t\/\/ Linksys USB200M Rev 2\n \tUSB_DEVICE (0x13b1, 0x0018),\n \t.driver_info = (unsigned long) &ax88772_info,\n+}, {\n+\t\/\/ 0Q0 cable ethernet\n+\tUSB_DEVICE (0x1557, 0x7720),\n+\t.driver_info = (unsigned long) &ax88772_info,\n },\n \t{ },\t\t\/\/ END\n };\n"} {"commit":"3e90aefa25d43df0aad26fede45458335798d1b6","subject":"[UnitTests] Block size in aesdemo increased to 32 MB.","message":"[UnitTests] Block size in aesdemo increased to 32 MB.","repos":"pavelkryukov\/putty-aes-ni,pavelkryukov\/putty-aes-ni","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- aestest\/aesdemo.c\n+++ aestest\/aesdemo.c\n@@ -16,27 +16,20 @@\n \r\n #include \"coverage.h\"\r\n \r\n-#define BUF_LEN 4096\r\n+#define BUF_LEN (1 << 25)\r\n \r\n-void encode(unsigned char* block)\r\n+void cipher(unsigned char* block)\r\n {\r\n unsigned char key[32] = \"imtheoperatorwithmypocketcalcula\";\r\n unsigned char iv[16] = \"initializationve\";\r\n void *handle = aes_make_context();\r\n aes256_key(handle, key);\r\n aes_iv(handle, iv);\r\n- aes_ssh2_encrypt_blk(handle, block, BUF_LEN);\r\n- aes_free_context(handle);\r\n-}\r\n-\r\n-void decode(unsigned char* block)\r\n-{\r\n- unsigned char key[32] = \"imtheoperatorwithmypocketcalcula\";\r\n- unsigned char iv[16] = \"initializationve\";\r\n- void *handle = aes_make_context();\r\n- aes256_key(handle, key);\r\n- aes_iv(handle, iv);\r\n+#ifdef DECODE\r\n aes_ssh2_decrypt_blk(handle, block, BUF_LEN);\r\n+#else\r\n+ aes_ssh2_decrypt_blk(handle, block, BUF_LEN);\r\n+#endif\r\n aes_free_context(handle);\r\n }\r\n \r\n@@ -74,12 +67,10 @@\n fclose(f_dst);\r\n return 1;\r\n }\r\n-#ifdef DECODE\r\n- decode(buf);\r\n-#else\r\n- encode(buf);\r\n-#endif\r\n- result = fwrite(buf, sizeof(char), BUF_LEN, f_dst);\r\n+ result = (result & 0xf) + 1;\r\n+ cipher(buf);\r\n+ result = fwrite(buf, sizeof(char), result, f_dst);\r\n+ fflush(f_dst);\r\n if (result == -1)\r\n {\r\n fprintf(stderr,\"Failed to write to '%s'\\n\", dst);\r\n"} {"commit":"2abcdd7ee278cc4c1aab87df85460560410b1c46","subject":"switch on EXF_IREAD_USE_GLOBAL_POINTER when USE_EXF_INTERPOLATION is defined","message":"switch on EXF_IREAD_USE_GLOBAL_POINTER when USE_EXF_INTERPOLATION is defined\n","repos":"altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2e5155ecbb729d3a2e7d1cea7c18493516fec55a","subject":"fbdev: vesafb: bind to platform-framebuffer device","message":"fbdev: vesafb: bind to platform-framebuffer device\n\nx86 creates platform-framebuffer platform devices for every system\nframebuffer. Use these instead of creating a dummy device.\n\nThis requires us to remove the __init annotations as hotplugging may occur\nduring runtime.\n\nSigned-off-by: David Herrmann <fb53b2ddb8d141e0cb39d7c67c2f81b6bc2eb0f7@gmail.com>\nLink: http:\/\/lkml.kernel.org\/r\/1375445127-15480-7-git-send-email-fb53b2ddb8d141e0cb39d7c67c2f81b6bc2eb0f7@gmail.com\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a50fecc16e6959eb788b95d4c88e1d46fc8d89da","subject":"i#1438 MacOS: signal support","message":"i#1438 MacOS: signal support\n\nAct on the libc trampoline and not the app handler, to avoid false\npositive unaddressables inside the trampoline.\n\nSVN-Revision: 1789\n","repos":"code4bones\/drmemory,code4bones\/drmemory,sigma-random\/drmemory,sigma-random\/drmemory,LohithBlaze\/drmemory,code4bones\/drmemory,code4bones\/drmemory,sigma-random\/drmemory,LohithBlaze\/drmemory,code4bones\/drmemory,LohithBlaze\/drmemory,LohithBlaze\/drmemory,sigma-random\/drmemory,sigma-random\/drmemory,LohithBlaze\/drmemory","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drmemory\/alloc_drmem.c\n+++ drmemory\/alloc_drmem.c\n@@ -1427,16 +1427,24 @@\n * and wait until enter a handler. Can ignore SIG_IGN and SIG_DFL.\n *\/\n void *handler = NULL;\n- if (sysnum == IF_MACOS_ELSE(SYS_sigaction, SYS_rt_sigaction)) {\n+# ifdef MACOS\n+ if (sysnum == SYS_sigaction) {\n+ \/* 2nd arg is ptr to struct w\/ app handler as 1st field, but libc\n+ * trampoline as 2nd field.\n+ *\/\n+ safe_read((byte *)syscall_get_param(drcontext, 1) + sizeof(handler),\n+ sizeof(handler), &handler);\n+ }\n+# else\n+ if (sysnum == SYS_rt_sigaction) {\n \/* 2nd arg is ptr to struct w\/ handler as 1st field *\/\n safe_read((void *)syscall_get_param(drcontext, 1), sizeof(handler), &handler);\n }\n-# ifdef X86_32\n+# ifdef X86_32\n else if (sysnum == SYS_sigaction) {\n \/* 2nd arg is ptr to struct w\/ handler as 1st field *\/\n safe_read((void *)syscall_get_param(drcontext, 1), sizeof(handler), &handler);\n }\n-# ifdef LINUX\n else if (sysnum == SYS_signal) {\n \/* 2nd arg is handler *\/\n handler = (void *) syscall_get_param(drcontext, 1);\n"} {"commit":"2053814d7cd47d2143f7a0e5a47be0d26861ffea","subject":"tests: make code style changes according with review comments","message":"tests: make code style changes according with review comments\n\nMade light code style changes.\n\nSigned-off-by: Maksim Masalski <00762c94550ce68b2a0e3f1373f5a19cd4f4bbbb@intel.com>\n","repos":"zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,nashif\/zephyr,nashif\/zephyr,nashif\/zephyr,finikorg\/zephyr,finikorg\/zephyr,nashif\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/kernel\/workq\/work_queue_api\/src\/main.c\n+++ tests\/kernel\/workq\/work_queue_api\/src\/main.c\n@@ -153,13 +153,13 @@\n void test_sched_delayed_work_item(void)\n {\n \tint32_t ms_remain, ms_spent, start_time, stop_time, cycles_spent;\n-\n \tint32_t ms_delta = 15;\n \n \tk_sem_reset(&sync_sema);\n \n-\t\/* TESTPOINT: init delayed work to be processed *\/\n-\t\/* only after specific period of time *\/\n+\t\/* TESTPOINT: init delayed work to be processed\n+\t * only after specific period of time\n+\t *\/\n \tk_delayed_work_init(&work_item_delayed, common_work_handler);\n \tstart_time = k_cycle_get_32();\n \tk_delayed_work_submit_to_queue(&workq, &work_item_delayed, TIMEOUT);\n@@ -311,14 +311,12 @@\n \ttick_to_ms = k_ticks_to_ms_floor64(timeout_ticks + _TICK_ALIGN);\n \n \t\/**TESTPOINT: check remaining timeout after submit *\/\n-\tzassert_true(time_remaining <= tick_to_ms,\n-\t\t\tNULL);\n+\tzassert_true(time_remaining <= tick_to_ms, NULL);\n \n \ttimeout_ticks -= z_ms_to_ticks(15);\n \ttick_to_ms = k_ticks_to_ms_floor64(timeout_ticks);\n \n-\tzassert_true(time_remaining >= tick_to_ms,\n-\t\t NULL);\n+\tzassert_true(time_remaining >= tick_to_ms, NULL);\n \n \t\/**TESTPOINT: check pending after delayed work submit*\/\n \tzassert_true(k_work_pending((struct k_work *)w) == 0, NULL);\n"} {"commit":"79cdb119621341a7da1a6e888bb56ee69e369ae1","subject":"fix memleak for webp encode","message":"fix memleak for webp encode","repos":"onecoolx\/picasso,onecoolx\/picasso,onecoolx\/picasso,onecoolx\/picasso","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ext\/image_loader\/webp\/webp_module.c\n+++ ext\/image_loader\/webp\/webp_module.c\n@@ -171,10 +171,12 @@\n ctx->writer_param = param;\n \n if (!WebPConfigPreset(&ctx->econfig, WEBP_PRESET_DEFAULT, quality * 100)) {\n+ free(ctx);\n return -1;\n }\n \n if (!WebPPictureInit(&ctx->pic)) {\n+ free(ctx);\n return -1;\n }\n \n"} {"commit":"b0dc288cfb4c067f7efcd5f1ef968434681ddf83","subject":"fixed compilation error: OUTPUT_MESSAGES -> OUTPUT_MESSAGES_T","message":"fixed compilation error: OUTPUT_MESSAGES -> OUTPUT_MESSAGES_T\n","repos":"MITEVT\/opel_driver_interface","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- firmware\/inc\/types.h\n+++ firmware\/inc\/types.h\n@@ -149,7 +149,7 @@\n \n typedef struct {\n ACCESSORIES_OUTPUT_REQUEST_T *acc_output;\n- OUTPUT_MESSAGES *messages;\n+ OUTPUT_MESSAGES_T *messages;\n bool close_contactors;\n } OUTPUT_T;\n \n"} {"commit":"babaa20811b72ad7e9d72319d5d66880fab3bb71","subject":"-- Make error message more verbose.","message":"-- Make error message more verbose.\n\n-- Allow the eq operator to compare attributes and other nodes.\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- pathfinder\/compiler\/algebra\/logical.c\n+++ pathfinder\/compiler\/algebra\/logical.c\n@@ -790,8 +790,15 @@\n \/* see if both operands have same number of attributes *\/\n if (n1->schema.count != n2->schema.count)\n PFoops (OOPS_FATAL,\n- \"Schema of two arguments of set operation (union, \"\n- \"difference, intersect) do not match\");\n+ \"Schema of two arguments of set operation (%s) \"\n+ \"do not match. (%i #cols != %i #cols)\",\n+ kind == la_disjunion\n+ ? \"union\"\n+ : kind == la_intersect\n+ ? \"intersect\"\n+ : \"difference\",\n+ n1->schema.count,\n+ n2->schema.count);\n \n \/* allocate memory for the result schema *\/\n ret->schema.count = n1->schema.count;\n@@ -1130,7 +1137,9 @@\n \"not found\", PFatt_str (att2));\n \n \/* make sure both attributes are of the same type *\/\n- assert (n->schema.items[ix1].type == n->schema.items[ix2].type);\n+ assert (n->schema.items[ix1].type == n->schema.items[ix2].type ||\n+ (n->schema.items[ix1].type & aat_node &&\n+ n->schema.items[ix2].type & aat_node));\n \n \/* create new binary operator node *\/\n ret = la_op_wire1 (kind, n);\n"} {"commit":"bb20ba06733ae80756392b75198de2b813bdd0eb","subject":"Move a call to exitChplThreads() to after the final barrier","message":"Move a call to exitChplThreads() to after the final barrier\n\nWhen it was before the barrier, all nodes except 0 called it very early, but\nit should only be called at the very end of execution.\n\n\ngit-svn-id: 88467cb1fb04b8a755be7e1ee1026be4190196ef@15138 3a8e244f-b0f2-452b-bcba-4c88e055c3ca\n","repos":"sungeunchoi\/chapel,sungeunchoi\/chapel,CoryMcCartan\/chapel,sungeunchoi\/chapel,chizarlicious\/chapel,chizarlicious\/chapel,CoryMcCartan\/chapel,CoryMcCartan\/chapel,chizarlicious\/chapel,hildeth\/chapel,chizarlicious\/chapel,sungeunchoi\/chapel,sungeunchoi\/chapel,chizarlicious\/chapel,CoryMcCartan\/chapel,hildeth\/chapel,sungeunchoi\/chapel,sungeunchoi\/chapel,chizarlicious\/chapel,sungeunchoi\/chapel,hildeth\/chapel,hildeth\/chapel,CoryMcCartan\/chapel,hildeth\/chapel,CoryMcCartan\/chapel,hildeth\/chapel,CoryMcCartan\/chapel,chizarlicious\/chapel,hildeth\/chapel","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- runtime\/src\/chplexit.c\n+++ runtime\/src\/chplexit.c\n@@ -15,10 +15,8 @@\n gdbShouldBreakHere();\n }\n if (all) {\n+ _chpl_comm_barrier(\"_chpl_comm_exit_all\");\n exitChplThreads(); \/\/ tear down the threads\n- }\n- if (all) {\n- _chpl_comm_barrier(\"_chpl_comm_exit_all\");\n _chpl_comm_exit_all(status);\n } else {\n _chpl_comm_exit_any(status);\n"} {"commit":"d6fdb52b9c9db0454fa49dbbb969ea4164de29c0","subject":"allwinner: Always use a 3MHz RSB bus clock","message":"allwinner: Always use a 3MHz RSB bus clock\n\nNone of the other drivers (Linux, U-Boot, Crust) need to lower the bus\nclock frequency to switch the PMIC to RSB mode. That logic is not needed\nhere, either. The hardware takes care of running this transaction at the\ncorrect bus frequency.\n\nSigned-off-by: Samuel Holland <c16aab9fe3288df0fb8fc1d24990a300b6b8f299@sholland.org>\nChange-Id: Idcfe933df4da75d5fd5a4f3e362da40ac26bdad1\n","repos":"achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- plat\/allwinner\/sun50i_a64\/sunxi_power.c\n+++ plat\/allwinner\/sun50i_a64\/sunxi_power.c\n@@ -92,8 +92,8 @@\n \tif (ret)\n \t\treturn ret;\n \n-\t\/* Start with 400 KHz to issue the I2C->RSB switch command. *\/\n-\tret = rsb_set_bus_speed(SUNXI_OSC24M_CLK_IN_HZ, 400000);\n+\t\/* Switch to the recommended 3 MHz bus clock. *\/\n+\tret = rsb_set_bus_speed(SUNXI_OSC24M_CLK_IN_HZ, 3000000);\n \tif (ret)\n \t\treturn ret;\n \n@@ -102,11 +102,6 @@\n \t * switching the PMIC to RSB mode.\n \t *\/\n \tret = rsb_set_device_mode(0x7c3e00);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\t\/* Now in RSB mode, switch to the recommended 3 MHz. *\/\n-\tret = rsb_set_bus_speed(SUNXI_OSC24M_CLK_IN_HZ, 3000000);\n \tif (ret)\n \t\treturn ret;\n \n"} {"commit":"c2e31b8015f8dc8a36a1a8e7afe629a51636d17a","subject":"amciod: removed more warnings","message":"amciod: removed more warnings\n\ngit-svn-id: f5c02e989b43d8c4044d70be6e79cbb684b6aa25@4327 4f504ea5-f356-0410-adec-f1b3679f3bb7\n","repos":"golems\/socanmatic,golems\/socanmatic,luminize\/socanmatic,luminize\/socanmatic,luminize\/socanmatic,luminize\/socanmatic,golems\/socanmatic,golems\/socanmatic","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- amciod\/amcdrive.c\n+++ amciod\/amcdrive.c\n@@ -103,42 +103,42 @@\n dprintf(\"rpdo_position: %d\\n\", (pdos & ENABLE_RPDO_POSITION) == 0);\n status = try_ntcan_dl(\"rpdo_position\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_RPDO_3, \n- drive_info->rpdo_position, (pdos & ENABLE_RPDO_POSITION) == 0, 0));\n+ drive_info->rpdo_position, (uint32_t)((pdos & ENABLE_RPDO_POSITION) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n dprintf(\"rpdo_velocity: %d\\n\", (pdos & ENABLE_RPDO_VELOCITY) == 0);\n status = try_ntcan_dl(\"rpdo_velocity\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_RPDO_4, \n- drive_info->rpdo_velocity, (pdos & ENABLE_RPDO_VELOCITY) == 0, 0));\n+ drive_info->rpdo_velocity, (uint32_t)((pdos & ENABLE_RPDO_VELOCITY) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n dprintf(\"rpdo_current: %d\\n\", (pdos & ENABLE_RPDO_CURRENT) == 0);\n status = try_ntcan_dl(\"rpdo_current\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_RPDO_5, \n- drive_info->rpdo_current, (pdos & ENABLE_RPDO_CURRENT) == 0, 0));\n+ drive_info->rpdo_current, (uint32_t)((pdos & ENABLE_RPDO_CURRENT) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n dprintf(\"tpdo_position: %d\\n\", (pdos & REQUEST_TPDO_POSITION) == 0);\n status = try_ntcan_dl(\"tpdo_position\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_TPDO_3, \n- drive_info->tpdo_position, (pdos & REQUEST_TPDO_POSITION) == 0, 0));\n+ drive_info->tpdo_position, (uint32_t)((pdos & REQUEST_TPDO_POSITION) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n dprintf(\"tpdo_velocity: %d\\n\", (pdos & REQUEST_TPDO_VELOCITY) == 0);\n status = try_ntcan_dl(\"tpdo_velocity\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_TPDO_4, \n- drive_info->tpdo_velocity, (pdos & REQUEST_TPDO_VELOCITY) == 0, 0));\n+ drive_info->tpdo_velocity, (uint32_t)((pdos & REQUEST_TPDO_VELOCITY) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n dprintf(\"tpdo_current: %d\\n\", (pdos & REQUEST_TPDO_CURRENT) == 0);\n status = try_ntcan_dl(\"tpdo_current\", &rcmd,\n amccan_dl_pdo_id(handle, &rcmd, id, AMCCAN_TPDO_5, \n- drive_info->tpdo_current, (pdos & REQUEST_TPDO_CURRENT) == 0, 0));\n+ drive_info->tpdo_current, (uint32_t)((pdos & REQUEST_TPDO_CURRENT) == 0), 0));\n if (status != NTCAN_SUCCESS)\n return status;\n \n"} {"commit":"6a14b0bfd8cd011e605936c4652e3dd691775fdf","subject":"Attempting to fix up yet more compile errors on 4.6","message":"Attempting to fix up yet more compile errors on 4.6\n","repos":"kaltsi\/qt-mobility,KDE\/android-qt-mobility,kaltsi\/qt-mobility,qtproject\/qt-mobility,qtproject\/qt-mobility,KDE\/android-qt-mobility,qtproject\/qt-mobility,enthought\/qt-mobility,enthought\/qt-mobility,kaltsi\/qt-mobility,tmcguire\/qt-mobility,kaltsi\/qt-mobility,KDE\/android-qt-mobility,tmcguire\/qt-mobility,qtproject\/qt-mobility,kaltsi\/qt-mobility,enthought\/qt-mobility,tmcguire\/qt-mobility,tmcguire\/qt-mobility,tmcguire\/qt-mobility,enthought\/qt-mobility,KDE\/android-qt-mobility,enthought\/qt-mobility,qtproject\/qt-mobility,kaltsi\/qt-mobility,qtproject\/qt-mobility,enthought\/qt-mobility","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/location-testing-tools\/mapbox\/mapbox.h\n+++ tests\/location-testing-tools\/mapbox\/mapbox.h\n@@ -50,7 +50,6 @@\n class QGraphicsScene;\n class QGraphicsView;\n class StatsWidget;\n-class QNetworkSession;\n \n QTM_BEGIN_NAMESPACE\n class QGeoCoordinate;\n"} {"commit":"9a6376c8a1d0757ab8e862c60ebc2e09dc599c66","subject":"rk3399: dram: making phy into dll bypass mode at low frequency","message":"rk3399: dram: making phy into dll bypass mode at low frequency\n\nwhen dram frequency below 260MHz, phy master dll may unlock, so\nlet phy master dll working at dll bypass mode when frequency is\nbelow 260MHz.\n\nSigned-off-by: Lin Huang <c9fe3c0450a180d111405ace687410d20d0d0895@rock-chips.com>\n","repos":"lsigithub\/arm-trusted-firmware_public,achingupta\/arm-trusted-firmware,sbranden\/arm-trusted-firmware,achingupta\/arm-trusted-firmware,lsigithub\/arm-trusted-firmware_public,sbranden\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- plat\/rockchip\/rk3399\/drivers\/dram\/dfs.c\n+++ plat\/rockchip\/rk3399\/drivers\/dram\/dfs.c\n@@ -40,25 +40,17 @@\n \n #include <delay_timer.h>\n \n-#define CTL_TRAINING\t(1)\n-#define PI_TRAINING\t\t(!CTL_TRAINING)\n-\n-#define EN_READ_GATE_TRAINING\t(1)\n-#define EN_CA_TRAINING\t\t(0)\n-#define EN_WRITE_LEVELING\t(0)\n-#define EN_READ_LEVELING\t(0)\n-#define EN_WDQ_LEVELING\t(0)\n-\n #define ENPER_CS_TRAINING_FREQ\t(933)\n+#define PHY_DLL_BYPASS_FREQ\t(260)\n \n struct pll_div {\n-\tunsigned int mhz;\n-\tunsigned int refdiv;\n-\tunsigned int fbdiv;\n-\tunsigned int postdiv1;\n-\tunsigned int postdiv2;\n-\tunsigned int frac;\n-\tunsigned int freq;\n+\tuint32_t mhz;\n+\tuint32_t refdiv;\n+\tuint32_t fbdiv;\n+\tuint32_t postdiv1;\n+\tuint32_t postdiv2;\n+\tuint32_t frac;\n+\tuint32_t freq;\n };\n \n static const struct pll_div dpll_rates_table[] = {\n@@ -84,6 +76,7 @@\n };\n \n static struct rk3399_dram_status rk3399_dram_status;\n+static uint32_t wrdqs_delay_val[2][2][4];\n \n static struct rk3399_sdram_default_config ddr3_default_config = {\n \t.bl = 8,\n@@ -1028,6 +1021,21 @@\n \t}\n }\n \n+static void gen_rk3399_enable_training(uint32_t ch_cnt, uint32_t nmhz)\n+{\n+\t\tuint32_t i, tmp;\n+\n+\t\tif (nmhz <= PHY_DLL_BYPASS_FREQ)\n+\t\t\ttmp = 0;\n+\t\telse\n+\t\t\ttmp = 1;\n+\n+\t\tfor (i = 0; i < ch_cnt; i++) {\n+\t\t\tmmio_clrsetbits_32(CTL_REG(i, 305), 1 << 16, tmp << 16);\n+\t\t\tmmio_clrsetbits_32(CTL_REG(i, 71), 1, tmp);\n+\t\t}\n+}\n+\n static void gen_rk3399_ctl_params(struct timing_related_config *timing_config,\n \t\t\t\t struct dram_timing_t *pdram_timing,\n \t\t\t\t uint32_t fn)\n@@ -1036,35 +1044,6 @@\n \t\tgen_rk3399_ctl_params_f0(timing_config, pdram_timing);\n \telse\n \t\tgen_rk3399_ctl_params_f1(timing_config, pdram_timing);\n-\n-#if CTL_TRAINING\n-\tuint32_t i, tmp0, tmp1;\n-\n-\ttmp0 = tmp1 = 0;\n-#if EN_READ_GATE_TRAINING\n-\ttmp1 = 1;\n-#endif\n-\n-#if EN_CA_TRAINING\n-\ttmp0 |= (1 << 8);\n-#endif\n-\n-#if EN_WRITE_LEVELING\n-\ttmp0 |= (1 << 16);\n-#endif\n-\n-#if EN_READ_LEVELING\n-\ttmp0 |= (1 << 24);\n-#endif\n-\tfor (i = 0; i < timing_config->ch_cnt; i++) {\n-\t\tif (tmp0 | tmp1)\n-\t\t\tmmio_setbits_32(CTL_REG(i, 305), 1 << 16);\n-\t\tif (tmp0)\n-\t\t\tmmio_setbits_32(CTL_REG(i, 70), tmp0);\n-\t\tif (tmp1)\n-\t\t\tmmio_setbits_32(CTL_REG(i, 71), tmp1);\n-\t}\n-#endif\n }\n \n static void gen_rk3399_pi_params_f0(struct timing_related_config *timing_config,\n@@ -1432,32 +1411,6 @@\n \t\tgen_rk3399_pi_params_f0(timing_config, pdram_timing);\n \telse\n \t\tgen_rk3399_pi_params_f1(timing_config, pdram_timing);\n-\n-#if PI_TRAINING\n-\tuint32_t i;\n-\n-\tfor (i = 0; i < timing_config->ch_cnt; i++) {\n-#if EN_READ_GATE_TRAINING\n-\t\tmmio_clrsetbits_32(PI_REG(i, 80), 3 << 24, 2 << 24);\n-#endif\n-\n-#if EN_CA_TRAINING\n-\t\tmmio_clrsetbits_32(PI_REG(i, 100), 3 << 8, 2 << 8);\n-#endif\n-\n-#if EN_WRITE_LEVELING\n-\t\tmmio_clrsetbits_32(PI_REG(i, 60), 3 << 8, 2 << 8);\n-#endif\n-\n-#if EN_READ_LEVELING\n-\t\tmmio_clrsetbits_32(PI_REG(i, 80), 3 << 16, 2 << 16);\n-#endif\n-\n-#if EN_WDQ_LEVELING\n-\t\tmmio_clrsetbits_32(PI_REG(i, 124), 3 << 16, 2 << 16);\n-#endif\n-\t}\n-#endif\n }\n \n static void gen_rk3399_set_odt(uint32_t odt_en)\n@@ -1477,6 +1430,94 @@\n \t\tmmio_clrsetbits_32(PHY_REG(i, 262), 0x7 << 24, drv_odt_val);\n \t\tmmio_clrsetbits_32(PHY_REG(i, 390), 0x7 << 24, drv_odt_val);\n \t}\n+}\n+\n+static void gen_rk3399_phy_dll_bypass(uint32_t mhz, uint32_t ch,\n+\t\tuint32_t index, uint32_t dram_type)\n+{\n+\tuint32_t sw_master_mode = 0;\n+\tuint32_t rddqs_gate_delay, rddqs_latency, total_delay;\n+\tuint32_t i;\n+\n+\tif (dram_type == DDR3)\n+\t\ttotal_delay = PI_PAD_DELAY_PS_VALUE;\n+\telse if (dram_type == LPDDR3)\n+\t\ttotal_delay = PI_PAD_DELAY_PS_VALUE + 2500;\n+\telse\n+\t\ttotal_delay = PI_PAD_DELAY_PS_VALUE + 1500;\n+\t\/* total_delay + 0.55tck *\/\n+\ttotal_delay += (55 * 10000)\/mhz;\n+\trddqs_latency = total_delay * mhz \/ 1000000;\n+\ttotal_delay -= rddqs_latency * 1000000 \/ mhz;\n+\trddqs_gate_delay = total_delay * 0x200 * mhz \/ 1000000;\n+\tif (mhz <= PHY_DLL_BYPASS_FREQ) {\n+\t\tsw_master_mode = 0xc;\n+\t\tmmio_setbits_32(PHY_REG(ch, 514), 1);\n+\t\tmmio_setbits_32(PHY_REG(ch, 642), 1);\n+\t\tmmio_setbits_32(PHY_REG(ch, 770), 1);\n+\n+\t\t\/* setting bypass mode slave delay *\/\n+\t\tfor (i = 0; i < 4; i++) {\n+\t\t\t\/* wr dq delay = -180deg + (0x60 \/ 4) * 20ps *\/\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 1 + 128 * i), 0x7ff << 8,\n+\t\t\t\t\t 0x4a0 << 8);\n+\t\t\t\/* rd dqs\/dq delay = (0x60 \/ 4) * 20ps *\/\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 11 + 128 * i), 0x3ff,\n+\t\t\t\t\t 0xa0);\n+\t\t\t\/* rd rddqs_gate delay *\/\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 2 + 128 * i), 0x3ff,\n+\t\t\t\t\t rddqs_gate_delay);\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 78 + 128 * i), 0xf,\n+\t\t\t\t\t rddqs_latency);\n+\t\t}\n+\t\tfor (i = 0; i < 3; i++)\n+\t\t\t\/* adr delay *\/\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 513 + 128 * i),\n+\t\t\t\t\t 0x7ff << 16, 0x80 << 16);\n+\n+\t\tif ((mmio_read_32(PHY_REG(ch, 86)) & 0xc00) == 0) {\n+\t\t\t\/*\n+\t\t\t * old status is normal mode,\n+\t\t\t * and saving the wrdqs slave delay\n+\t\t\t *\/\n+\t\t\tfor (i = 0; i < 4; i++) {\n+\t\t\t\t\/* save and clear wr dqs slave delay *\/\n+\t\t\t\twrdqs_delay_val[ch][index][i] = 0x3ff &\n+\t\t\t\t\t(mmio_read_32(PHY_REG(ch, 63 + i * 128))\n+\t\t\t\t\t>> 16);\n+\t\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 63 + i * 128),\n+\t\t\t\t\t\t 0x03ff << 16, 0 << 16);\n+\t\t\t\t\/*\n+\t\t\t\t * in normal mode the cmd may delay 1cycle by\n+\t\t\t\t * wrlvl and in bypass mode making dqs also\n+\t\t\t\t * delay 1cycle.\n+\t\t\t\t *\/\n+\t\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 78 + i * 128),\n+\t\t\t\t\t\t 0x07 << 8, 0x1 << 8);\n+\t\t\t}\n+\t\t}\n+\t} else if (mmio_read_32(PHY_REG(ch, 86)) & 0xc00) {\n+\t\t\/* old status is bypass mode and restore wrlvl resume *\/\n+\t\tfor (i = 0; i < 4; i++) {\n+\t\t\tmmio_clrsetbits_32(PHY_REG(ch, 63 + i * 128),\n+\t\t\t\t\t 0x03ff << 16,\n+\t\t\t\t\t (wrdqs_delay_val[ch][index][i] &\n+\t\t\t\t\t 0x3ff) << 16);\n+\t\t\t\/* resume phy_write_path_lat_add *\/\n+\t\t\tmmio_clrbits_32(PHY_REG(ch, 78 + i * 128), 0x07 << 8);\n+\t\t}\n+\t}\n+\n+\t\/* phy_sw_master_mode_X PHY_86\/214\/342\/470 4bits offset_8 *\/\n+\tmmio_clrsetbits_32(PHY_REG(ch, 86), 0xf << 8, sw_master_mode << 8);\n+\tmmio_clrsetbits_32(PHY_REG(ch, 214), 0xf << 8, sw_master_mode << 8);\n+\tmmio_clrsetbits_32(PHY_REG(ch, 342), 0xf << 8, sw_master_mode << 8);\n+\tmmio_clrsetbits_32(PHY_REG(ch, 470), 0xf << 8, sw_master_mode << 8);\n+\n+\t\/* phy_adrctl_sw_master_mode PHY_547\/675\/803 4bits offset_16 *\/\n+\tmmio_clrsetbits_32(PHY_REG(ch, 547), 0xf << 16, sw_master_mode << 16);\n+\tmmio_clrsetbits_32(PHY_REG(ch, 675), 0xf << 16, sw_master_mode << 16);\n+\tmmio_clrsetbits_32(PHY_REG(ch, 803), 0xf << 16, sw_master_mode << 16);\n }\n \n static void gen_rk3399_phy_params(struct timing_related_config *timing_config,\n@@ -1586,12 +1627,6 @@\n \t\tgate_delay_ps = delay_frac_ps + 1000 - (trpre_min_ps \/ 2);\n \t\tgate_delay_frac_ps = gate_delay_ps % 1000;\n \t\ttmp = gate_delay_frac_ps * 0x200 \/ 1000;\n-\t\t\/* PHY_RDDQS_GATE_BYPASS_SLAVE_DELAY *\/\n-\t\t\/* DENALI_PHY_2\/130\/258\/386 10bits offset_0 *\/\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 2), 0x2ff, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 130), 0x2ff, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 258), 0x2ff, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 386), 0x2ff, tmp);\n \t\t\/* PHY_RDDQS_GATE_SLAVE_DELAY *\/\n \t\t\/* DENALI_PHY_77\/205\/333\/461 10bits offset_16 *\/\n \t\tmmio_clrsetbits_32(PHY_REG(i, 77), 0x2ff << 16, tmp << 16);\n@@ -1606,12 +1641,6 @@\n \t\tmmio_clrsetbits_32(PHY_REG(i, 138), 0xf, tmp);\n \t\tmmio_clrsetbits_32(PHY_REG(i, 266), 0xf, tmp);\n \t\tmmio_clrsetbits_32(PHY_REG(i, 394), 0xf, tmp);\n-\t\t\/* PHY_RDDQS_LATENCY_ADJUST *\/\n-\t\t\/* DENALI_PHY_78\/206\/334\/462 4bits offset_0 *\/\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 78), 0xf, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 206), 0xf, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 334), 0xf, tmp);\n-\t\tmmio_clrsetbits_32(PHY_REG(i, 462), 0xf, tmp);\n \t\t\/* PHY_GTLVL_LAT_ADJ_START *\/\n \t\t\/* DENALI_PHY_80\/208\/336\/464 4bits offset_16 *\/\n \t\ttmp = delay_frac_ps \/ 1000;\n@@ -1696,6 +1725,8 @@\n \t\t\tmmio_setbits_32(PHY_REG(i, 340), 0x1 << 16);\n \t\t\tmmio_setbits_32(PHY_REG(i, 468), 0x1 << 16);\n \t\t}\n+\t\tgen_rk3399_phy_dll_bypass(pdram_timing->mhz, i, fn,\n+\t\t\t\t\t timing_config->dram_type);\n \t}\n }\n \n@@ -2018,6 +2049,8 @@\n \trk3399_dram_status.index_freq[index] = mhz;\n \n out:\n+\tgen_rk3399_enable_training(rk3399_dram_status.timing_config.ch_cnt,\n+\t\t\t\t mhz);\n \treturn index;\n }\n \n"} {"commit":"e07cfff404ebcdb6707c1eb08c5e8d5a5b9316ea","subject":"msm7627a: Update the MSM-ID of 8125 1GHZ part","message":"msm7627a: Update the MSM-ID of 8125 1GHZ part\n\nChange-Id: I2437853da0ac90593e0b3c1ce77f7097170477cd\n","repos":"DooMLoRD\/android_bootable_bootloader_lk,t2m-foxfone\/kernel_lk,t2m-foxfone\/android_kernel_lk,Foxda-Tech\/argo8-bootable-bootloader-lk,jbott\/lk_gee,t2m-foxfone\/kernel_lk,efidroid\/lk,jbott\/lk_gee,M1cha\/android_bootable_bootloader_lk,Foxda-Tech\/polaris-bootable-bootloader-lk,Redmi-dev\/android_bootable_lk,Foxda-Tech\/argo8-bootable-bootloader-lk,CanarySolutions\/little-kernel,hanjae\/lumiab0,Foxda-Tech\/polaris-bootable-bootloader-lk,thornbirdblue\/codeaurora_lk,jbott\/lk_gee,idor\/dk50-bootable_bootloader_lk,DooMLoRD\/android_bootable_bootloader_lk,detule\/lk-g2-spr,mozilla-b2g\/fairphone2_kernel_lk,lg-devs\/g2-bootloader,detule\/lk-g2-spr,M1cha\/lktris,thornbirdblue\/codeaurora_lk,mozilla-b2g\/kernel_lk,jsr-d10\/android_bootable_bootloader_lk,mozilla-b2g\/kernel_lk,lg-devs\/g2-bootloader,M1cha\/android_bootable_bootloader_lk,M1cha\/android_bootable_bootloader_lk,Foxda-Tech\/polaris-bootable-bootloader-lk,jsr-d10\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,hanjae\/lumiab0,M1cha\/lktris,CanarySolutions\/little-kernel,jsr-d10\/android_bootable_bootloader_lk,t2m-foxfone\/kernel_lk,M1cha\/lktris,idor\/dk50-bootable_bootloader_lk,Redmi-dev\/android_bootable_lk,t2m-foxfone\/android_kernel_lk,detule\/lk-g2-spr,Foxda-Tech\/polaris-bootable-bootloader-lk,Foxda-Tech\/argo8-bootable-bootloader-lk,t2m-foxfone\/android_kernel_lk,chirayudesai\/android_bootable_bootloader_lk,Foxda-Tech\/argo8-bootable-bootloader-lk,M1cha\/android_bootable_bootloader_lk,mozilla-b2g\/kernel_lk,Redmi-dev\/android_bootable_lk,jsr-d10\/android_bootable_bootloader_lk,DooMLoRD\/android_bootable_bootloader_lk,jbott\/lk_gee,mozilla-b2g\/kernel_lk,lg-devs\/g2-bootloader,t2m-foxfone\/kernel_lk,CanarySolutions\/little-kernel,hanjae\/lumiab0,M1cha\/lktris,hanjae\/lumiab0,mozilla-b2g\/kernel_lk,DooMLoRD\/android_bootable_bootloader_lk,lg-devs\/g2-bootloader,efidroid\/lk,DooMLoRD\/android_bootable_bootloader_lk,idor\/dk50-bootable_bootloader_lk,t2m-foxfone\/kernel_lk,jbott\/lk_gee,idor\/dk50-bootable_bootloader_lk,chirayudesai\/android_bootable_bootloader_lk,M1cha\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,t2m-foxfone\/android_kernel_lk,thornbirdblue\/codeaurora_lk,efidroid\/lk,idor\/dk50-bootable_bootloader_lk,detule\/lk-g2-spr,t2m-foxfone\/android_kernel_lk,efidroid\/lk,jsr-d10\/android_bootable_bootloader_lk,chirayudesai\/android_bootable_bootloader_lk,Redmi-dev\/android_bootable_lk,M1cha\/android_bootable_bootloader_lk,CanarySolutions\/little-kernel,Redmi-dev\/android_bootable_lk,Foxda-Tech\/polaris-bootable-bootloader-lk,thornbirdblue\/codeaurora_lk,M1cha\/lktris,lg-devs\/g2-bootloader,hanjae\/lumiab0,thornbirdblue\/codeaurora_lk,CanarySolutions\/little-kernel,Foxda-Tech\/argo8-bootable-bootloader-lk,mozilla-b2g\/fairphone2_kernel_lk,chirayudesai\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,chirayudesai\/android_bootable_bootloader_lk,detule\/lk-g2-spr,efidroid\/lk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platform\/msm_shared\/smem.h\n+++ platform\/msm_shared\/smem.h\n@@ -245,8 +245,8 @@\n \tMSM8630AB = 155,\n \tMSM8230AB = 156,\n \tAPQ8030AB = 157,\n-\tMSM8125 = 160,\n \tAPQ8030AA = 160,\n+\tMSM8125 = 167,\n };\n \n enum platform {\n"} {"commit":"3c86e7f9862b681740997a769566a0a4ec768838","subject":"platform: msm_shared: remove unused broadcastmode flag","message":"platform: msm_shared: remove unused broadcastmode flag\n\nBroadcast mode flag is defined at two places in panel header\nfile. This change removes unused instance to prevent confusion\nwhile debugging the broadcast mode support.\n\nChange-Id: Ibbcc930e6375c86546a4f6b2494afcd206634766\n","repos":"idor\/dk50-bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,lg-devs\/g2-bootloader,idor\/dk50-bootable_bootloader_lk,t2m-foxfone\/android_kernel_lk,mozilla-b2g\/fairphone2_kernel_lk,t2m-foxfone\/android_kernel_lk,lg-devs\/g2-bootloader,lg-devs\/g2-bootloader,t2m-foxfone\/android_kernel_lk,idor\/dk50-bootable_bootloader_lk,lg-devs\/g2-bootloader,mozilla-b2g\/fairphone2_kernel_lk,lg-devs\/g2-bootloader,idor\/dk50-bootable_bootloader_lk,t2m-foxfone\/android_kernel_lk,t2m-foxfone\/android_kernel_lk,mozilla-b2g\/fairphone2_kernel_lk,mozilla-b2g\/fairphone2_kernel_lk,idor\/dk50-bootable_bootloader_lk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platform\/msm_shared\/include\/msm_panel.h\n+++ platform\/msm_shared\/include\/msm_panel.h\n@@ -189,7 +189,6 @@\n \tuint32_t wait_cycle;\n \tuint32_t clk_rate;\n \tuint32_t rotation;\n-\tuint32_t broadcastmode;\n \tchar lowpowerstop;\n \n \tstruct lcd_panel_info lcd;\n"} {"commit":"2ebeef99017ef089c2722ace51370194a1bfb0df","subject":"[pirc] add a comment to clarify PASM register allocation (or rather, non-allocation).","message":"[pirc] add a comment to clarify PASM register allocation (or rather, non-allocation).\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@33156 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- compilers\/pirc\/new\/pirsymbol.c\n+++ compilers\/pirc\/new\/pirsymbol.c\n@@ -466,10 +466,16 @@\n }\n \n if (TEST_FLAG(lexer->flags, LEXER_FLAG_PASMFILE)) { \/* PASM mode *\/\n+ \/* In PASM mode, the user-specified regno is also the final PASM\n+ * register, so don't use the vanilla register allocator here.\n+ *\/\n return use_register(lexer, type, regno, regno);\n }\n else {\n- \/* we're still here, so the register was not used yet; do that now. *\/\n+ \/* we're still here, so the register was not used yet; allocate\n+ * a new PASM register through the vanilla reg. allocator and\n+ * store the register as \"used\".\n+ *\/\n return use_register(lexer, type, regno, next_register(lexer, type));\n }\n }\n"} {"commit":"7e0bc2f00da124f27215b7e94fb2a9e288fbabb9","subject":"android: Add support for handling new link key mgmt event","message":"android: Add support for handling new link key mgmt event\n\nWhen link key is emitted by kernel bond state change notification is\nsend to HAL. Storing link key is not yet implemented.\n","repos":"pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,mapfau\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,mapfau\/bluez,mapfau\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- android\/adapter.c\n+++ android\/adapter.c\n@@ -195,6 +195,60 @@\n \t\/* TODO: Gatt attrib set*\/\n }\n \n+static void store_link_key(const bdaddr_t *dst, const uint8_t *key,\n+\t\t\t\t\tuint8_t type, uint8_t pin_length)\n+{\n+\t\/* TODO store link key *\/\n+\n+}\n+\n+static void send_bond_state_change(const bdaddr_t *addr, uint8_t status,\n+\t\t\t\t\t\t\t\tuint8_t state)\n+{\n+\tstruct hal_ev_bond_state_changed ev;\n+\n+\tev.status = status;\n+\tev.state = state;\n+\tbdaddr2android(addr, ev.bdaddr);\n+\n+\tipc_send(notification_io, HAL_SERVICE_ID_BLUETOOTH,\n+\t\t\tHAL_EV_BOND_STATE_CHANGED, sizeof(ev), &ev, -1);\n+}\n+\n+static void new_link_key_callback(uint16_t index, uint16_t length,\n+\t\t\t\t\tconst void *param, void *user_data)\n+{\n+\tconst struct mgmt_ev_new_link_key *ev = param;\n+\tconst struct mgmt_addr_info *addr = &ev->key.addr;\n+\tchar dst[18];\n+\n+\tif (length < sizeof(*ev)) {\n+\t\terror(\"Too small new link key event\");\n+\t\treturn;\n+\t}\n+\n+\tba2str(&addr->bdaddr, dst);\n+\n+\tDBG(\"new key for %s type %u pin_len %u\",\n+\t\t\t\t\tdst, ev->key.type, ev->key.pin_len);\n+\n+\tif (ev->key.pin_len > 16) {\n+\t\terror(\"Invalid PIN length (%u) in new_key event\",\n+\t\t\t\t\t\t\tev->key.pin_len);\n+\t\treturn;\n+\t}\n+\n+\tif (ev->store_hint) {\n+\t\tconst struct mgmt_link_key_info *key = &ev->key;\n+\n+\t\tstore_link_key(&addr->bdaddr, key->val, key->type,\n+\t\t\t\t\t\t\t\tkey->pin_len);\n+\t}\n+\n+\tsend_bond_state_change(&addr->bdaddr, HAL_STATUS_SUCCESS,\n+\t\t\t\t\t\t\tHAL_BOND_STATE_BONDED);\n+}\n+\n static void register_mgmt_handlers(void)\n {\n \tmgmt_register(adapter->mgmt, MGMT_EV_NEW_SETTINGS, adapter->index,\n@@ -207,6 +261,9 @@\n \tmgmt_register(adapter->mgmt, MGMT_EV_LOCAL_NAME_CHANGED,\n \t\t\t\tadapter->index, mgmt_local_name_changed_event,\n \t\t\t\tNULL, NULL);\n+\n+\tmgmt_register(adapter->mgmt, MGMT_EV_NEW_LINK_KEY, adapter->index,\n+\t\t\t\t\tnew_link_key_callback, NULL, NULL);\n }\n \n static void load_link_keys_complete(uint8_t status, uint16_t length,\n"} {"commit":"409183d95d5820e08d8bc68d2b0921ccf9f2392e","subject":"pkg: lwip: do not panic on failing netdev->recv()","message":"pkg: lwip: do not panic on failing netdev->recv()\n","repos":"BytesGalore\/RIOT,adjih\/RIOT,jfischer-phytec-iot\/RIOT,syin2\/RIOT,plushvoxel\/RIOT,OlegHahm\/RIOT,syin2\/RIOT,cladmi\/RIOT,adjih\/RIOT,OlegHahm\/RIOT,kaspar030\/RIOT,basilfx\/RIOT,LudwigKnuepfer\/RIOT,dailab\/RIOT,hamilton-mote\/RIOT-OS,foss-for-synopsys-dwc-arc-processors\/RIOT,adjih\/RIOT,TobiasFredersdorf\/RIOT,TobiasFredersdorf\/RIOT,gautric\/RIOT,hamilton-mote\/RIOT-OS,thomaseichinger\/RIOT,kaleb-himes\/RIOT,thomaseichinger\/RIOT,avmelnikoff\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,adrianghc\/RIOT,biboc\/RIOT,authmillenon\/RIOT,dailab\/RIOT,thomaseichinger\/RIOT,Hyungsin\/RIOT-OS,ks156\/RIOT,gebart\/RIOT,thomaseichinger\/RIOT,gebart\/RIOT,rfuentess\/RIOT,toonst\/RIOT,kbumsik\/RIOT,mfrey\/RIOT,LudwigKnuepfer\/RIOT,beurdouche\/RIOT,smlng\/RIOT,rfuentess\/RIOT,dkm\/RIOT,neumodisch\/RIOT,jfischer-phytec-iot\/RIOT,LudwigKnuepfer\/RIOT,roberthartung\/RIOT,gebart\/RIOT,kerneltask\/RIOT,beurdouche\/RIOT,OlegHahm\/RIOT,jasonatran\/RIOT,authmillenon\/RIOT,smlng\/RIOT,LudwigKnuepfer\/RIOT,smlng\/RIOT,kYc0o\/RIOT,neumodisch\/RIOT,jfischer-phytec-iot\/RIOT,miri64\/RIOT,yogo1212\/RIOT,RIOT-OS\/RIOT,kbumsik\/RIOT,rfuentess\/RIOT,toonst\/RIOT,OTAkeys\/RIOT,hamilton-mote\/RIOT-OS,adrianghc\/RIOT,authmillenon\/RIOT,syin2\/RIOT,Josar\/RIOT,x3ro\/RIOT,toonst\/RIOT,x3ro\/RIOT,Hyungsin\/RIOT-OS,dkm\/RIOT,kerneltask\/RIOT,Ell-i\/RIOT,hamilton-mote\/RIOT-OS,x3ro\/RIOT,mtausig\/RIOT,neumodisch\/RIOT,lazytech-org\/RIOT,ks156\/RIOT,A-Paul\/RIOT,neiljay\/RIOT,miri64\/RIOT,biboc\/RIOT,BytesGalore\/RIOT,mfrey\/RIOT,aeneby\/RIOT,jasonatran\/RIOT,rfuentess\/RIOT,dkm\/RIOT,plushvoxel\/RIOT,neumodisch\/RIOT,x3ro\/RIOT,A-Paul\/RIOT,aeneby\/RIOT,A-Paul\/RIOT,immesys\/RiSyn,kYc0o\/RIOT,kbumsik\/RIOT,OlegHahm\/RIOT,LudwigKnuepfer\/RIOT,kYc0o\/RIOT,authmillenon\/RIOT,neumodisch\/RIOT,RIOT-OS\/RIOT,yogo1212\/RIOT,adrianghc\/RIOT,toonst\/RIOT,immesys\/RiSyn,LudwigOrtmann\/RIOT,kaspar030\/RIOT,authmillenon\/RIOT,LudwigOrtmann\/RIOT,josephnoir\/RIOT,yogo1212\/RIOT,LudwigOrtmann\/RIOT,neiljay\/RIOT,kaspar030\/RIOT,miri64\/RIOT,yogo1212\/RIOT,A-Paul\/RIOT,mtausig\/RIOT,kYc0o\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,cladmi\/RIOT,gautric\/RIOT,immesys\/RiSyn,yogo1212\/RIOT,Josar\/RIOT,smlng\/RIOT,immesys\/RiSyn,ant9000\/RIOT,kaspar030\/RIOT,dailab\/RIOT,TobiasFredersdorf\/RIOT,Ell-i\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,cladmi\/RIOT,BytesGalore\/RIOT,lazytech-org\/RIOT,RIOT-OS\/RIOT,basilfx\/RIOT,jasonatran\/RIOT,gebart\/RIOT,toonst\/RIOT,plushvoxel\/RIOT,josephnoir\/RIOT,miri64\/RIOT,immesys\/RiSyn,plushvoxel\/RIOT,Ell-i\/RIOT,yogo1212\/RIOT,aeneby\/RIOT,syin2\/RIOT,rfuentess\/RIOT,LudwigOrtmann\/RIOT,mtausig\/RIOT,ks156\/RIOT,OTAkeys\/RIOT,lazytech-org\/RIOT,lazytech-org\/RIOT,OTAkeys\/RIOT,dailab\/RIOT,x3ro\/RIOT,jasonatran\/RIOT,beurdouche\/RIOT,TobiasFredersdorf\/RIOT,ant9000\/RIOT,smlng\/RIOT,gautric\/RIOT,cladmi\/RIOT,adrianghc\/RIOT,kaspar030\/RIOT,mfrey\/RIOT,roberthartung\/RIOT,aeneby\/RIOT,ant9000\/RIOT,Hyungsin\/RIOT-OS,adrianghc\/RIOT,dailab\/RIOT,kYc0o\/RIOT,syin2\/RIOT,BytesGalore\/RIOT,avmelnikoff\/RIOT,roberthartung\/RIOT,basilfx\/RIOT,gautric\/RIOT,mtausig\/RIOT,josephnoir\/RIOT,immesys\/RiSyn,OTAkeys\/RIOT,biboc\/RIOT,cladmi\/RIOT,gebart\/RIOT,Hyungsin\/RIOT-OS,biboc\/RIOT,ant9000\/RIOT,ks156\/RIOT,neiljay\/RIOT,roberthartung\/RIOT,avmelnikoff\/RIOT,josephnoir\/RIOT,Josar\/RIOT,neumodisch\/RIOT,authmillenon\/RIOT,neiljay\/RIOT,biboc\/RIOT,ks156\/RIOT,mtausig\/RIOT,plushvoxel\/RIOT,jasonatran\/RIOT,jfischer-phytec-iot\/RIOT,Josar\/RIOT,jfischer-phytec-iot\/RIOT,kaleb-himes\/RIOT,avmelnikoff\/RIOT,Ell-i\/RIOT,dkm\/RIOT,neiljay\/RIOT,basilfx\/RIOT,kerneltask\/RIOT,miri64\/RIOT,kerneltask\/RIOT,aeneby\/RIOT,basilfx\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,lazytech-org\/RIOT,adjih\/RIOT,mfrey\/RIOT,roberthartung\/RIOT,Josar\/RIOT,BytesGalore\/RIOT,RIOT-OS\/RIOT,A-Paul\/RIOT,ant9000\/RIOT,kaleb-himes\/RIOT,Hyungsin\/RIOT-OS,dkm\/RIOT,hamilton-mote\/RIOT-OS,adjih\/RIOT,TobiasFredersdorf\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,LudwigOrtmann\/RIOT,thomaseichinger\/RIOT,kbumsik\/RIOT,LudwigOrtmann\/RIOT,OTAkeys\/RIOT,avmelnikoff\/RIOT,gautric\/RIOT,beurdouche\/RIOT,kaleb-himes\/RIOT,Ell-i\/RIOT,kerneltask\/RIOT,kaleb-himes\/RIOT,kbumsik\/RIOT,beurdouche\/RIOT,mfrey\/RIOT,josephnoir\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pkg\/lwip\/contrib\/netdev\/lwip_netdev.c\n+++ pkg\/lwip\/contrib\/netdev\/lwip_netdev.c\n@@ -215,6 +215,10 @@\n {\n int len = dev->driver->recv(dev, _tmp_buf, sizeof(_tmp_buf), NULL);\n \n+ if (len < 0) {\n+ DEBUG(\"lwip_netdev: an error occurred while reading the packet\\n\");\n+ return NULL;\n+ }\n assert(((unsigned)len) <= UINT16_MAX);\n struct pbuf *p = pbuf_alloc(PBUF_RAW, (u16_t)len, PBUF_POOL);\n \n"} {"commit":"ca92c9f08512349dd26f938e12d0620abf06c466","subject":"#100514#new osl_createTempFile function","message":"#100514#new osl_createTempFile function\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sal\/osl\/unx\/tempfile.c\n+++ sal\/osl\/unx\/tempfile.c\n@@ -1,6 +1,104 @@\n+\/*************************************************************************\n+ *\n+ * $RCSfile: tempfile.c,v $\n+ *\n+ * $Revision: 1.2 $\n+ *\n+ * last change: $Author: tra $ $Date: 2002-11-12 14:23:56 $\n+ *\n+ * The Contents of this file are made available subject to the terms of\n+ * either of the following licenses\n+ *\n+ * - GNU Lesser General Public License Version 2.1\n+ * - Sun Industry Standards Source License Version 1.1\n+ *\n+ * Sun Microsystems Inc., October, 2000\n+ *\n+ * GNU Lesser General Public License Version 2.1\n+ * =============================================\n+ * Copyright 2000 by Sun Microsystems, Inc.\n+ * 901 San Antonio Road, Palo Alto, CA 94303, USA\n+ *\n+ * This library is free software; you can redistribute it and\/or\n+ * modify it under the terms of the GNU Lesser General Public\n+ * License version 2.1, as published by the Free Software Foundation.\n+ *\n+ * This library is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this library; if not, write to the Free Software\n+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n+ * MA 02111-1307 USA\n+ *\n+ *\n+ * Sun Industry Standards Source License Version 1.1\n+ * =================================================\n+ * The contents of this file are subject to the Sun Industry Standards\n+ * Source License Version 1.1 (the \"License\"); You may not use this file\n+ * except in compliance with the License. You may obtain a copy of the\n+ * License at http:\/\/www.openoffice.org\/license.html.\n+ *\n+ * Software provided under this License is provided on an \"AS IS\" basis,\n+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,\n+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,\n+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.\n+ * See the License for the specific provisions governing your rights and\n+ * obligations concerning the Software.\n+ *\n+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.\n+ *\n+ * Copyright: 2000 by Sun Microsystems, Inc.\n+ *\n+ * All Rights Reserved.\n+ *\n+ * Contributor(s): _______________________________________\n+ *\n+ *\n+ ************************************************************************\/\n+\n+\/*****************************************************************\/\n+\/* Includes *\/\n+\/*****************************************************************\/\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <sys\/types.h>\n+#include <sys\/stat.h>\n+#include <sys\/time.h>\n+\n+#ifndef __OSL_SYSTEM_H__\n #include \"system.h\"\n-\n+#endif\n+\n+#ifndef _OSL_FILE_H_\n #include <osl\/file.h>\n+#endif\n+\n+#ifndef _OSL_THREAD_H_\n+#include <osl\/thread.h>\n+#endif\n+\n+#ifndef _RTL_USTRBUF_H_\n+#include <rtl\/ustrbuf.h>\n+#endif\n+\n+#ifndef _OSL_DIAGNOSE_H_\n+#include <osl\/diagnose.h>\n+#endif\n+\n+\/*****************************************************************\/\n+\/* Forward declaration *\/\n+\/*****************************************************************\/\n+\n+extern oslFileError _osl_getSystemPathFromFileURL(\n+ rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath, sal_Bool bAllowRelative);\n+\n+\/*****************************************************************\/\n+\/* osl_getTempFirURL *\/\n+\/*****************************************************************\/\n \n oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )\n {\n@@ -29,3 +127,228 @@\n else\n return osl_File_E_NOENT;\n }\n+\n+\/******************************************************************\n+ * Generates a random unique file name. We're using the scheme\n+ * from the standard c-lib function mkstemp to generate a more\n+ * or less random unique file name\n+ *\n+ * @param rand_name\n+ * receives the random name\n+ ******************************************************************\/\n+\n+static const char LETTERS[] = \"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890\";\n+static const int COUNT_OF_LETTERS = sizeof(LETTERS)\/sizeof(LETTERS[0]) - 1;\n+\n+#define RAND_NAME_LENGTH 6\n+\n+static void osl_gen_random_name_impl_(rtl_uString** rand_name)\n+{\n+ static uint64_t value;\n+\n+ char buffer[RAND_NAME_LENGTH];\n+ struct timeval tv;\n+ uint64_t v;\n+ int i;\n+\n+ gettimeofday(&tv, NULL);\n+\n+ value += ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();\n+\n+ v = value;\n+\n+ for (i = 0; i < RAND_NAME_LENGTH; i++)\n+ {\n+ buffer[i] = LETTERS[v % COUNT_OF_LETTERS];\n+ v \/= COUNT_OF_LETTERS;\n+ }\n+\n+ rtl_string2UString(\n+ rand_name,\n+ buffer,\n+ RAND_NAME_LENGTH,\n+ RTL_TEXTENCODING_ASCII_US,\n+ OSTRING_TO_OUSTRING_CVTFLAGS);\n+}\n+\n+\/*****************************************************************\n+ * Helper function\n+ * Either use the directory provided or the result of\n+ * osl_getTempDirUrl and return it as system path and file url\n+ ****************************************************************\/\n+\n+static oslFileError osl_setup_base_directory_impl_(\n+ rtl_uString* pustrDirectoryURL,\n+ rtl_uString** ppustr_base_dir)\n+{\n+ rtl_uString* dir_url = 0;\n+ rtl_uString* dir = 0;\n+ oslFileError error = osl_File_E_None;\n+\n+ if (pustrDirectoryURL)\n+ rtl_uString_assign(&dir_url, pustrDirectoryURL);\n+ else\n+ error = osl_getTempDirURL(&dir_url);\n+\n+ if (osl_File_E_None == error)\n+ {\n+ error = _osl_getSystemPathFromFileURL(dir_url, &dir, sal_False);\n+ rtl_uString_release(dir_url);\n+ }\n+\n+ if (osl_File_E_None == error)\n+ {\n+ rtl_uString_assign(ppustr_base_dir, dir);\n+ rtl_uString_release(dir);\n+ }\n+\n+ return error;\n+}\n+\n+\/*****************************************************************\n+ * Create a unique file in the specified directory and return\n+ * it's name\n+ ****************************************************************\/\n+\n+static oslFileError osl_create_temp_file_impl_(\n+ const rtl_uString* pustr_base_directory,\n+ oslFileHandle* file_handle,\n+ rtl_uString** ppustr_temp_file_name)\n+{\n+ rtl_uString* rand_name = 0;\n+ sal_uInt32 len_base_dir = 0;\n+ rtl_uString* tmp_file_path = 0;\n+ rtl_uString* tmp_file_url = 0;\n+ sal_Int32 capacity = 0;\n+ oslFileError osl_error = osl_File_E_None;\n+ sal_Int32 offset_file_name;\n+ const sal_Unicode* puchr;\n+\n+ OSL_PRECOND(pustr_base_directory, \"Invalid Parameter\");\n+ OSL_PRECOND(file_handle, \"Invalid Parameter\");\n+ OSL_PRECOND(ppustr_temp_file_name, \"Invalid Parameter\");\n+\n+ len_base_dir = rtl_uString_getLength(pustr_base_directory);\n+\n+ rtl_uStringbuffer_newFromStr_WithLength(\n+ &tmp_file_path,\n+ rtl_uString_getStr(pustr_base_directory),\n+ len_base_dir);\n+\n+ rtl_uStringbuffer_ensureCapacity(\n+ &tmp_file_path,\n+ &capacity,\n+ (len_base_dir + 1 + RAND_NAME_LENGTH));\n+\n+ offset_file_name = len_base_dir;\n+\n+ puchr = rtl_uString_getStr(tmp_file_path);\n+\n+ \/* ensure that the last character is a '\/' *\/\n+\n+ if ((sal_Unicode)'\/' != puchr[len_base_dir - 1])\n+ {\n+ rtl_uStringbuffer_insert_ascii(\n+ &tmp_file_path,\n+ &capacity,\n+ len_base_dir,\n+ \"\/\",\n+ 1);\n+\n+ offset_file_name++;\n+ }\n+\n+ while(1) \/* try until success *\/\n+ {\n+ osl_gen_random_name_impl_(&rand_name);\n+\n+ rtl_uStringbuffer_insert(\n+ &tmp_file_path,\n+ &capacity,\n+ offset_file_name,\n+ rtl_uString_getStr(rand_name),\n+ rtl_uString_getLength(rand_name));\n+\n+ osl_error = osl_getFileURLFromSystemPath(\n+ tmp_file_path, &tmp_file_url);\n+\n+ if (osl_File_E_None == osl_error)\n+ {\n+ \/* RW permission for the user only! *\/\n+ mode_t old_mode = umask(077);\n+\n+ osl_error = osl_openFile(\n+ tmp_file_url,\n+ file_handle,\n+ osl_File_OpenFlag_Read |\n+ osl_File_OpenFlag_Write |\n+ osl_File_OpenFlag_Create);\n+\n+ umask(old_mode);\n+ }\n+\n+ \/* in case of error osl_File_E_EXIST we simply try again else we give up *\/\n+\n+ if ((osl_File_E_None == osl_error) || (osl_error != osl_File_E_EXIST))\n+ {\n+ if (rand_name)\n+ rtl_uString_release(rand_name);\n+\n+ if (tmp_file_url)\n+ rtl_uString_release(tmp_file_url);\n+\n+ break;\n+ }\n+ } \/* while(1) *\/\n+\n+ if (osl_File_E_None == osl_error)\n+ rtl_uString_assign(ppustr_temp_file_name, tmp_file_path);\n+\n+ if (tmp_file_path)\n+ rtl_uString_release(tmp_file_path);\n+\n+ return osl_error;\n+}\n+\n+\/*****************************************************************\n+ * osl_createTempFile\n+ *****************************************************************\/\n+\n+oslFileError SAL_CALL osl_createTempFile(\n+ rtl_uString* pustrDirectoryURL,\n+ oslFileHandle* pHandle,\n+ rtl_uString** ppustrTempFileURL)\n+{\n+ rtl_uString* base_directory = 0;\n+ rtl_uString* temp_file_name = 0;\n+ oslFileHandle temp_file_handle;\n+ oslFileError osl_error;\n+\n+ osl_error = osl_setup_base_directory_impl_(\n+ pustrDirectoryURL, &base_directory);\n+\n+ if (osl_File_E_None != osl_error)\n+ return osl_error;\n+\n+ osl_error = osl_create_temp_file_impl_(\n+ base_directory, &temp_file_handle, &temp_file_name);\n+\n+ if (osl_File_E_None == osl_error)\n+ {\n+ if (0 == pHandle)\n+ osl_closeFile(temp_file_handle);\n+ else\n+ *pHandle = temp_file_handle;\n+\n+ osl_getFileURLFromSystemPath(\n+ temp_file_name, ppustrTempFileURL);\n+\n+ if (temp_file_name)\n+ rtl_uString_release(temp_file_name);\n+ }\n+\n+ if (base_directory)\n+ rtl_uString_release(base_directory);\n+\n+ return osl_error;\n+}\n"} {"commit":"b154b2d614d393f09e9434a14aaee81ea3c10469","subject":"lib-lda: Crashfix when sending rejection mail with Auto-Submitted: header.","message":"lib-lda: Crashfix when sending rejection mail with Auto-Submitted: header.\n\n--HG--\nbranch : HEAD\n","repos":"jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-lda\/mail-send.c\n+++ src\/lib-lda\/mail-send.c\n@@ -64,6 +64,9 @@\n size_t size;\n int ret;\n \n+ if (mail_get_first_header(mail, \"Message-ID\", &orig_msgid) < 0)\n+\t orig_msgid = NULL;\n+\n if (mail_get_first_header(mail, \"Auto-Submitted\", &value) > 0 &&\n \tstrcasecmp(value, \"no\") != 0) {\n \t i_info(\"msgid=%s: Auto-submitted message discarded: %s\",\n@@ -72,8 +75,6 @@\n \t return 0;\n }\n \n- if (mail_get_first_header(mail, \"Message-ID\", &orig_msgid) < 0)\n-\t orig_msgid = NULL;\n return_addr = mail_deliver_get_return_address(ctx);\n if (return_addr == NULL) {\n \t i_info(\"msgid=%s: Return-Path missing, rejection reason: %s\",\n"} {"commit":"95f319bf858e4cb6cf5eab78671054c8a91d0b40","subject":"Don't include stdint.h directly.","message":"Don't include stdint.h directly.\n","repos":"Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-ntlm\/ntlm-des.c\n+++ src\/lib-ntlm\/ntlm-des.c\n@@ -6,8 +6,7 @@\n * This software is released under the MIT license.\n *\/\n \n-#include <stdint.h>\n-\n+#include \"lib.h\"\n #include \"ntlm-des.h\"\n \n \/*\n"} {"commit":"718c2710d00c98e306a541cd925a4d5c4464bef0","subject":"Small speedup of division.","message":"Small speedup of division.\n","repos":"jpflori\/flint2,fredrik-johansson\/flint2,fredrik-johansson\/flint2,jpflori\/flint2,jpflori\/flint2,wbhart\/flint2,wbhart\/flint2,wbhart\/flint2,dsroche\/flint2,jpflori\/flint2,dsroche\/flint2,dsroche\/flint2,dsroche\/flint2,fredrik-johansson\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmpz_mat\/hnf_mod_D.c\n+++ fmpz_mat\/hnf_mod_D.c\n@@ -43,7 +43,7 @@\n fmpz_init(q);\n for (j = 0, k = 0; j != A->c; j++, k++)\n {\n- fmpz_cdiv_q_ui(R2, R, 2);\n+ fmpz_fdiv_q_2exp(R2, R, 1);\n \n if (fmpz_is_zero(fmpz_mat_entry(H, k, j)))\n fmpz_set(fmpz_mat_entry(H, k, j), R);\n"} {"commit":"fbebb3a2ad256e34543659f63e064052cf455a88","subject":"mod_lily now registers a server import.","message":"mod_lily now registers a server import.\n","repos":"FascinatedBox\/lily,FascinatedBox\/lily,FascinatedBox\/lily,jesserayadkins\/lily,jesserayadkins\/lily,jesserayadkins\/lily,FascinatedBox\/lily","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- apache\/mod_lily.c\n+++ apache\/mod_lily.c\n@@ -14,6 +14,7 @@\n #include \"lily_lexer.h\"\n #include \"lily_value.h\"\n #include \"lily_impl.h\"\n+#include \"lily_seed.h\"\n \n #include \"lily_cls_hash.h\"\n \n@@ -21,10 +22,6 @@\n {\n ap_rputs(text, (request_rec *)data);\n }\n-\n-\n-\/** Shared common functions **\/\n-\n \n static lily_hash_elem *bind_hash_elem_with_values(char *sipkey,\n lily_value *key, lily_value *value)\n@@ -60,9 +57,6 @@\n \n return hash_val;\n }\n-\n-\/** Binding server::env and server::get **\/\n-\n \n struct table_bind_data {\n lily_parse_state *parser;\n@@ -87,13 +81,13 @@\n return TRUE;\n }\n \n-static void bind_table_as(lily_parse_state *parser, request_rec *r,\n+static lily_var *bind_table_as(lily_parse_state *parser, request_rec *r,\n apr_table_t *table, char *name)\n {\n lily_symtab *symtab = parser->symtab;\n \n- lily_var *hash_var = bind_hash_str_str_var(parser, name);\n- lily_hash_val *hash_val = get_new_tied_hash(symtab, hash_var);\n+ lily_var *result = bind_hash_str_str_var(parser, name);\n+ lily_hash_val *hash_val = get_new_tied_hash(symtab, result);\n \n struct table_bind_data data;\n data.parser = parser;\n@@ -103,45 +97,13 @@\n data.hash_val = hash_val;\n data.sipkey = parser->vm->sipkey;\n apr_table_do(bind_table_entry, &data, table, NULL);\n-}\n-\n-\n-\/** Bind server::httpmethod. This data is already available through\n- server::env[\"REQUEST_METHOD\"], so this is simply for convenience. **\/\n-\n-\n-static void bind_httpmethod(lily_parse_state *parser, request_rec *r)\n-{\n- lily_class *string_cls = parser->symtab->string_class;\n-\n- lily_type *string_type = string_cls->type;\n- lily_var *var = lily_new_var(parser->symtab, string_type, \"httpmethod\", 0);\n-\n- lily_string_val *sv = lily_malloc(sizeof(lily_string_val));\n- char *sv_buffer = lily_malloc(strlen(r->method) + 1);\n-\n- strcpy(sv_buffer, r->method);\n-\n- sv->string = sv_buffer;\n- sv->refcount = 1;\n- sv->size = strlen(r->method);\n-\n- lily_value v;\n- v.type = var->type;\n- v.flags = 0;\n- v.value.string = sv;\n-\n- lily_tie_value(parser->symtab, var, &v);\n-}\n-\n-\n-\/** Binding server::post **\/\n-\n-\n-static void bind_post(lily_parse_state *parser, request_rec *r)\n-{\n- lily_var *post_var = bind_hash_str_str_var(parser, \"post\");\n- lily_hash_val *hash_val = get_new_tied_hash(parser->symtab, post_var);\n+ return result;\n+}\n+\n+static lily_var *bind_post(lily_parse_state *parser, request_rec *r)\n+{\n+ lily_var *result = bind_hash_str_str_var(parser, \"post\");\n+ lily_hash_val *hash_val = get_new_tied_hash(parser->symtab, result);\n \n apr_array_header_t *pairs;\n apr_off_t len;\n@@ -174,31 +136,73 @@\n hash_val->elem_chain = new_elem;\n }\n }\n-}\n-\n-\n-\/** Binding the server package itself **\/\n-\n-\n-static void apache_bind_server(lily_parse_state *parser, request_rec *r)\n-{\n- lily_begin_package(parser, \"server\");\n-\n- lily_symtab *symtab = parser->symtab;\n-\n+\n+ return result;\n+}\n+\n+static lily_var *bind_get(lily_parse_state *parser, request_rec *r)\n+{\n+ apr_table_t *http_get_args;\n+ ap_args_to_table(r, &http_get_args);\n+\n+ return bind_table_as(parser, r, http_get_args, \"get\");\n+}\n+\n+static lily_var *bind_env(lily_parse_state *parser, request_rec *r)\n+{\n ap_add_cgi_vars(r);\n ap_add_common_vars(r);\n- bind_table_as(parser, r, r->subprocess_env, \"env\");\n-\n- apr_table_t *http_get_args;\n- ap_args_to_table(r, &http_get_args);\n-\n- bind_table_as(parser, r, http_get_args, \"get\");\n- bind_post(parser, r);\n- bind_httpmethod(parser, r);\n-\n- lily_end_package(parser);\n-}\n+\n+ return bind_table_as(parser, r, r->subprocess_env, \"env\");\n+}\n+\n+static lily_var *bind_httpmethod(lily_parse_state *parser, request_rec *r)\n+{\n+ lily_class *string_cls = parser->symtab->string_class;\n+\n+ lily_type *string_type = string_cls->type;\n+ lily_var *result = lily_new_var(parser->symtab, string_type, \"httpmethod\", 0);\n+\n+ lily_string_val *sv = lily_malloc(sizeof(lily_string_val));\n+ char *sv_buffer = lily_malloc(strlen(r->method) + 1);\n+\n+ strcpy(sv_buffer, r->method);\n+\n+ sv->string = sv_buffer;\n+ sv->refcount = 1;\n+ sv->size = strlen(r->method);\n+\n+ lily_value v;\n+ v.type = result->type;\n+ v.flags = 0;\n+ v.value.string = sv;\n+\n+ lily_tie_value(parser->symtab, result, &v);\n+\n+ return result;\n+}\n+\n+lily_var *apache_var_dynaloader(lily_parse_state *parser, const char *name)\n+{\n+ request_rec *r = (request_rec *)parser->data;\n+ lily_var *result = NULL;\n+\n+ if (strcmp(\"httpmethod\", name) == 0)\n+ result = bind_httpmethod(parser, r);\n+ else if (strcmp(\"post\", name) == 0)\n+ result = bind_post(parser, r);\n+ else if (strcmp(\"get\", name) == 0)\n+ result = bind_get(parser, r);\n+ else if (strcmp(\"env\", name) == 0)\n+ result = bind_env(parser, r);\n+\n+ return result;\n+}\n+\n+const lily_base_seed httpmethod_seed = {NULL, \"httpmethod\", dyna_var};\n+const lily_base_seed post_seed = {&httpmethod_seed, \"post\", dyna_var};\n+const lily_base_seed get_seed = {&post_seed, \"get\", dyna_var};\n+const lily_base_seed env_seed = {&get_seed, \"env\", dyna_var};\n \n static int lily_handler(request_rec *r)\n {\n@@ -211,8 +215,7 @@\n options->data = r;\n \n lily_parse_state *parser = lily_new_parse_state(options);\n-\n- apache_bind_server(parser, r);\n+ lily_register_import(parser, \"server\", &env_seed, apache_var_dynaloader);\n \n lily_parse_file(parser, lm_tags, r->filename);\n \n"} {"commit":"84d64ee14e709d6158343221c67436c32c1022ac","subject":"elementary\/naviframe - oops, here more proper check.","message":"elementary\/naviframe - oops, here more proper check.\n","repos":"tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elc_naviframe.c\n+++ src\/lib\/elc_naviframe.c\n@@ -520,7 +520,7 @@\n }\n \n end:\n- if (!sd->stack || (VIEW(it) != sd->dummy_edje))\n+ if (!sd->stack && !sd->on_deletion)\n _resize_object_reset(WIDGET(it), NULL, NULL, EINA_TRUE);\n \n _item_free(nit);\n"} {"commit":"2ae886f0888104a69d18b99e691d0a8e92759ede","subject":"elementary\/naviframe - fix the title part which name of fixed wrongly.","message":"elementary\/naviframe - fix the title part which name of fixed wrongly.\n\n\n\nSVN revision: 80514\n","repos":"FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elc_naviframe.c\n+++ src\/lib\/elc_naviframe.c\n@@ -182,9 +182,9 @@\n char buf[1024];\n \n if ((it->title_label) && (it->title_label[0]))\n- edje_object_signal_emit(VIEW(it), \"elm,state,title,show\", \"elm\");\n+ edje_object_signal_emit(VIEW(it), \"elm,state,title_label,show\", \"elm\");\n else\n- edje_object_signal_emit(VIEW(it), \"elm,state,title,hide\", \"elm\");\n+ edje_object_signal_emit(VIEW(it), \"elm,state,title_label,hide\", \"elm\");\n \n if ((it->subtitle_label) && (it->subtitle_label[0]))\n edje_object_signal_emit(VIEW(it), \"elm,state,subtitle,show\", \"elm\");\n@@ -372,9 +372,9 @@\n eina_stringshare_replace(&nit->title_label, label);\n snprintf(buf, sizeof(buf), \"elm.text.title\");\n if (label)\n- edje_object_signal_emit(VIEW(it), \"elm,state,title,show\", \"elm\");\n+ edje_object_signal_emit(VIEW(it), \"elm,state,title_label,show\", \"elm\");\n else\n- edje_object_signal_emit(VIEW(it), \"elm,state,title,hide\", \"elm\");\n+ edje_object_signal_emit(VIEW(it), \"elm,state,title_label,hide\", \"elm\");\n }\n else if (!strcmp(\"subtitle\", part))\n {\n"} {"commit":"ddfb773fb0816c906ec76da963640b75ab9174bf","subject":"imx7: imx7_clock: usb: Initialize the USB core clocks","message":"imx7: imx7_clock: usb: Initialize the USB core clocks\n\nThis patch initializes USB core clocks for the i.MX7.\n\nSigned-off-by: Bryan O'Donoghue <165dc05575478af93ac2f97f67be6e1756010094@linaro.org>\n","repos":"achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- plat\/imx\/common\/imx7_clock.c\n+++ plat\/imx\/common\/imx7_clock.c\n@@ -22,6 +22,12 @@\n \t\timx_clock_disable_wdog(i);\n }\n \n+static void imx7_clock_usb_init(void)\n+{\n+\t\/* Disable the clock root *\/\n+\timx_clock_target_clr(CCM_TRT_ID_USB_HSIC_CLK_ROOT, 0xFFFFFFFF);\n+}\n+\n void imx_clock_init(void)\n {\n \t\/*\n@@ -40,5 +46,10 @@\n \timx7_clock_uart_init();\n \n \t\/* Watchdog clocks *\/\n+\n \timx7_clock_wdog_init();\n+\n+\t\/* USB clocks *\/\n+\timx7_clock_usb_init();\n+\n }\n"} {"commit":"6fc5890a58baae9b37d9c8a110ea8bf67246c89b","subject":"flow: packet is not deleted when send call fails","message":"flow: packet is not deleted when send call fails\n\nAs sol_flow_send_packet is owner of packet and it is in charge of\nfreeing allocated memory, we need to call sol_flow_packet_del when send\nfails\n\nSigned-off-by: Otavio Pontes <a04f37e3ccb281cf4119e4b2fa8286ed94121d92@intel.com>\n","repos":"dorileo\/soletta,cabelitos\/soletta,cmarcelo\/soletta,cabelitos\/soletta,ibriano\/soletta,anselmolsm\/soletta,wzhen12\/soletta,cabelitos\/soletta,ibriano\/soletta,rchiossi\/soletta,brunobottazzini\/soletta,wzhen12\/soletta,ricardotk\/soletta,edersondisouza\/soletta,brunobottazzini\/soletta,brunobottazzini\/soletta,cabelitos\/soletta,nagineni\/soletta,cabelitos\/soletta,lpereira\/soletta,brunobottazzini\/soletta,edersondisouza\/soletta,cmarcelo\/soletta,ceolin\/soletta,anselmolsm\/soletta,otaviobp\/soletta,ceolin\/soletta,wanghongjuan\/soletta,tripzero\/soletta,cmarcelo\/soletta,otaviobp\/soletta,ricardotk\/soletta,thiagomacieira\/soletta,cmarcelo\/soletta,edersondisouza\/soletta,bdilly\/soletta,tripzero\/soletta,wzhen12\/soletta,ibriano\/soletta,anselmolsm\/soletta,rchiossi\/soletta,otaviobp\/soletta,bdilly\/soletta,zehortigoza\/soletta,dorileo\/soletta,cmarcelo\/soletta,bsmelo\/soletta,wzhen12\/soletta,cmarcelo\/soletta,zolkis\/soletta,thiagomacieira\/soletta,lpereira\/soletta,anselmolsm\/soletta,gabrielschulhof\/soletta,thiagomacieira\/soletta,wanghongjuan\/soletta,gabrielschulhof\/soletta,wanghongjuan\/soletta,dorileo\/soletta,lpereira\/soletta,barbieri\/soletta,nagineni\/soletta,tripzero\/soletta,lpereira\/soletta,barbieri\/soletta,gabrielschulhof\/soletta,anselmolsm\/soletta,ceolin\/soletta,wzhen12\/soletta,bdilly\/soletta,dorileo\/soletta,wanghongjuan\/soletta,rchiossi\/soletta,edersondisouza\/soletta,rchiossi\/soletta,cabelitos\/soletta,gabrielschulhof\/soletta,bsmelo\/soletta,ibriano\/soletta,bsmelo\/soletta,zolkis\/soletta,ricardotk\/soletta,zehortigoza\/soletta,ibriano\/soletta,gabrielschulhof\/soletta,gabrielschulhof\/soletta,bsmelo\/soletta,otaviobp\/soletta,wanghongjuan\/soletta,tripzero\/soletta,barbieri\/soletta,barbieri\/soletta,zolkis\/soletta,thiagomacieira\/soletta,bsmelo\/soletta,bdilly\/soletta,zolkis\/soletta,edersondisouza\/soletta,ceolin\/soletta,wanghongjuan\/soletta,zehortigoza\/soletta,ceolin\/soletta,zehortigoza\/soletta,zolkis\/soletta,otaviobp\/soletta,bsmelo\/soletta,nagineni\/soletta,thiagomacieira\/soletta,zehortigoza\/soletta,tripzero\/soletta,rchiossi\/soletta,dorileo\/soletta,ricardotk\/soletta,brunobottazzini\/soletta,barbieri\/soletta,ceolin\/soletta,bdilly\/soletta,dorileo\/soletta,otaviobp\/soletta,rchiossi\/soletta,barbieri\/soletta,ibriano\/soletta,nagineni\/soletta,nagineni\/soletta,lpereira\/soletta,tripzero\/soletta,zehortigoza\/soletta,wzhen12\/soletta,ricardotk\/soletta,thiagomacieira\/soletta,brunobottazzini\/soletta,edersondisouza\/soletta","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lib\/flow\/sol-flow.c\n+++ src\/lib\/flow\/sol-flow.c\n@@ -224,6 +224,7 @@\n {\n struct sol_flow_node *parent;\n struct sol_flow_node_container_type *parent_type;\n+ int ret;\n \n SOL_FLOW_NODE_CHECK_GOTO(src, err);\n parent = src->parent;\n@@ -239,7 +240,11 @@\n * reduce indirection. *\/\n SOL_FLOW_NODE_TYPE_IS_CONTAINER_CHECK_GOTO(parent, err);\n parent_type = (struct sol_flow_node_container_type *)parent->type;\n- return parent_type->send(parent, src, src_port, packet);\n+\n+ ret = parent_type->send(parent, src, src_port, packet);\n+ if (ret != 0)\n+ sol_flow_packet_del(packet);\n+ return ret;\n \n err:\n sol_flow_packet_del(packet);\n"} {"commit":"5d92615f37303041a473e8a25860860601a8dcfe","subject":"java: Handle outlines with duff links.","message":"java: Handle outlines with duff links.\n","repos":"sebras\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,poor-grad-student\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,knielsen\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,knielsen\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,muennich\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- platform\/java\/mupdf_native.c\n+++ platform\/java\/mupdf_native.c\n@@ -961,7 +961,7 @@\n \twhile (outline)\n \t{\n \t\tjstring jtitle = NULL;\n-\t\tjint jpage = 0;\n+\t\tjint jpage = -1;\n \t\tjstring juri = NULL;\n \t\tjobject jdown = NULL;\n \n@@ -971,13 +971,16 @@\n \t\t\tif (!jtitle) return NULL;\n \t\t}\n \n-\t\tif (fz_is_external_link(ctx, outline->uri))\n+\t\tif (outline->uri)\n \t\t{\n-\t\t\tjuri = (*env)->NewStringUTF(env, outline->uri);\n-\t\t\tif (!juri) return NULL;\n+\t\t\tif (fz_is_external_link(ctx, outline->uri))\n+\t\t\t{\n+\t\t\t\tjuri = (*env)->NewStringUTF(env, outline->uri);\n+\t\t\t\tif (!juri) return NULL;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t\tjpage = fz_resolve_link(ctx, doc, outline->uri, NULL, NULL);\n \t\t}\n-\t\telse\n-\t\t\tjpage = fz_resolve_link(ctx, doc, outline->uri, NULL, NULL);\n \n \t\tif (outline->down)\n \t\t{\n"} {"commit":"ed93dbc71e3f21a6b76b66a10fba822791bd570a","subject":"#i7045# #104574# rtl_ImplFloatToString: wrong fractional part","message":"#i7045# #104574# rtl_ImplFloatToString: wrong fractional part\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sal\/rtl\/source\/strimp.c\n+++ sal\/rtl\/source\/strimp.c\n@@ -2,9 +2,9 @@\n *\n * $RCSfile: strimp.c,v $\n *\n- * $Revision: 1.3 $\n- *\n- * last change: $Author: pl $ $Date: 2001-07-13 17:05:30 $\n+ * $Revision: 1.4 $\n+ *\n+ * last change: $Author: er $ $Date: 2002-10-30 11:39:49 $\n *\n * The Contents of this file are made available subject to the terms of\n * either of the following licenses\n@@ -245,7 +245,7 @@\n * (like in Java Ctor FloatingDecimal( float f ) ) *\/\n sal_uInt32 nFBits = *(sal_uInt32*)(&f);\n sal_uInt32 nBinExp = (sal_uInt32)((nFBits & FLOAT_EXPMASK) >> FLOAT_EXPSHIFT);\n- sal_uInt32 nFractBits = nFractBits & FLOAT_FRACTMASK;\n+ sal_uInt32 nFractBits = nFBits & FLOAT_FRACTMASK;\n if ( nBinExp == (sal_uInt32)(FLOAT_EXPMASK>>FLOAT_EXPSHIFT) )\n {\n if ( !nFractBits )\n"} {"commit":"452c5e7954eddeb566bde8d3422f4c917f1581b5","subject":"fix memory leak","message":"fix memory leak","repos":"binarycrusader\/libproxy,binarycrusader\/libproxy,cicku\/libproxy,cicku\/libproxy,markcox\/libproxy,codegooglecom\/libproxy,anonymous2ch\/libproxy,markcox\/libproxy,maxinbjohn\/libproxy,markcox\/libproxy,markcox\/libproxy,horar\/libproxy,cicku\/libproxy,codegooglecom\/libproxy,binarycrusader\/libproxy,libproxy\/libproxy,horar\/libproxy,codegooglecom\/libproxy,anonymous2ch\/libproxy,anonymous2ch\/libproxy,horar\/libproxy,libproxy\/libproxy,codegooglecom\/libproxy,binarycrusader\/libproxy,horar\/libproxy,horar\/libproxy,cicku\/libproxy,markcox\/libproxy,maxinbjohn\/libproxy,codegooglecom\/libproxy,libproxy\/libproxy,cicku\/libproxy,maxinbjohn\/libproxy,libproxy\/libproxy,binarycrusader\/libproxy,maxinbjohn\/libproxy,codegooglecom\/libproxy,maxinbjohn\/libproxy,markcox\/libproxy,maxinbjohn\/libproxy,codegooglecom\/libproxy,binarycrusader\/libproxy,cicku\/libproxy,libproxy\/libproxy,libproxy\/libproxy,anonymous2ch\/libproxy,horar\/libproxy,binarycrusader\/libproxy,binarycrusader\/libproxy,horar\/libproxy,anonymous2ch\/libproxy,maxinbjohn\/libproxy,cicku\/libproxy,anonymous2ch\/libproxy,markcox\/libproxy,anonymous2ch\/libproxy,markcox\/libproxy,libproxy\/libproxy","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/proxy_factory.c\n+++ src\/lib\/proxy_factory.c\n@@ -661,7 +661,8 @@\n \t}\n \t\n \t\/\/ Free everything else\n-\tif (self->pac) px_pac_free(self->pac);\n-\tif (self->wpad) px_wpad_free(self->wpad);\n+\tpx_pac_free(self->pac);\n+\tpx_wpad_free(self->wpad);\n+\tpx_config_file_free(self->cf);\n \tpx_free(self);\n }\n"} {"commit":"cebc1b829f51ff9b7dfdfcbe9a7adce6aca6db80","subject":"Defined abstract virtual function 'readVal' which provides access to the object's buf for retrieving data subsequent to deserializing.","message":"Defined abstract virtual function 'readVal' which provides access\nto the object's buf for retrieving data subsequent to deserializing.\n\n","repos":"OPENDAP\/libdap,OPENDAP\/libdap,OPENDAP\/libdap4,OPENDAP\/libdap4,OPENDAP\/libdap4,OPENDAP\/libdap,OPENDAP\/libdap,OPENDAP\/libdap4,OPENDAP\/libdap4,OPENDAP\/libdap4","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- BaseType.h\n+++ BaseType.h\n@@ -8,16 +8,20 @@\n \/\/ jhrg 9\/6\/94\n \n \/* $Log: BaseType.h,v $\n-\/* Revision 1.9 1995\/01\/11 16:06:48 jimg\n-\/* Added static XDR pointers to BaseType class and removed the XDR pointers\n-\/* that were class members - now there is only one xdrin and one xdrout\n-\/* for all children of BaseType.\n-\/* Added friend functions to help in setting the FILE * associated with\n-\/* the XDR *s.\n-\/* Removed FILE *in member (but FILE *out was kept as FILE * _out, mfunc\n-\/* expunge()).\n-\/* Changed ctor so that it no longer takes FILE * params.\n+\/* Revision 1.10 1995\/01\/18 18:35:28 dan\n+\/* Defined abstract virtual function 'readVal' which provides access\n+\/* to the object's buf for retrieving data subsequent to deserializing.\n \/*\n+ * Revision 1.9 1995\/01\/11 16:06:48 jimg\n+ * Added static XDR pointers to BaseType class and removed the XDR pointers\n+ * that were class members - now there is only one xdrin and one xdrout\n+ * for all children of BaseType.\n+ * Added friend functions to help in setting the FILE * associated with\n+ * the XDR *s.\n+ * Removed FILE *in member (but FILE *out was kept as FILE * _out, mfunc\n+ * expunge()).\n+ * Changed ctor so that it no longer takes FILE * params.\n+ *\n * Revision 1.8 1994\/12\/16 22:04:21 jimg\n * Added the mfuncs var() and add_var(). These are used by ctor types. They\n * need to be defined here so that access to them via BaseType * will work\n@@ -146,6 +150,7 @@\n \/\/ means read it from the file and into a buffer. The buffer is\n \/\/ serialized by the mfunc serialize().\n virtual bool read(String dataset, String var_name, String constraint) = 0;\n+ virtual bool readVal(void *stuff) = 0;\n \n \/\/ move data to and from the net.\n virtual bool serialize(bool flush = false, unsigned int num = 0) = 0; \n"} {"commit":"d5027f004120854bf03bd5ad07b7e131f2cf5d1d","subject":"Subscribe to DMA events on line 0 for the radio.","message":"Subscribe to DMA events on line 0 for the radio.\n","repos":"arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/msb430\/dev\/cc1020.c\n+++ platform\/msb430\/dev\/cc1020.c\n@@ -57,7 +57,7 @@\n #include \"cc1020.h\"\n #include \"lib\/random.h\"\n #include \"dev\/irq.h\"\n-#include \"dma.h\"\n+#include \"dev\/dma.h\"\n \n static int cc1020_calibrate(void);\n static int cc1020_setupTX(int);\n@@ -101,15 +101,11 @@\n cc1020_off\n };\n \n-process_event_t cc1020_event;\n-\n PROCESS(cc1020_sender_process, \"CC1020 sender\");\n \n void\n cc1020_init(const u8_t *config)\n {\n- cc1020_event = process_alloc_event();\n-\n cc1020_setupPD();\n cc1020_reset();\n cc1020_load_config(config);\n@@ -130,6 +126,7 @@\n \n \/\/ power down\n cc1020_setupPD();\n+\n process_start(&cc1020_sender_process, NULL);\n }\n \n@@ -391,6 +388,8 @@\n {\n PROCESS_BEGIN();\n \n+ dma_subscribe(0, &cc1020_sender_process);\n+\n while (1) {\n PROCESS_WAIT_UNTIL(cc1020_txlen > 0);\n \n@@ -411,7 +410,7 @@\n dma_transfer(cc1020_txbuf, cc1020_txlen);\n \n \/\/ wait for DMA0 to finish\n- PROCESS_WAIT_UNTIL(ev == cc1020_event && *((unsigned char *) data) == 0);\n+ PROCESS_WAIT_UNTIL(ev == dma_event);\n \n \/\/ clean up\n cc1020_txlen = 0;\n"} {"commit":"03e2106f2533bf87888428a1a8c319407511c80b","subject":"Fixed accidental reorder of surface delete and disconnect","message":"Fixed accidental reorder of surface delete and disconnect\n","repos":"akallabeth\/FreeRDP,chipitsine\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,cloudbase\/FreeRDP-dev,RangeeGmbH\/FreeRDP,cedrozor\/FreeRDP,cedrozor\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,cloudbase\/FreeRDP-dev,mfleisz\/FreeRDP,chipitsine\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,mfleisz\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,akallabeth\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,erbth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,mfleisz\/FreeRDP,mfleisz\/FreeRDP,FreeRDP\/FreeRDP,cloudbase\/FreeRDP-dev,DavBfr\/FreeRDP,akallabeth\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,chipitsine\/FreeRDP,cloudbase\/FreeRDP-dev,mfleisz\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,cedrozor\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,chipitsine\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- channels\/rdpgfx\/client\/rdpgfx_main.c\n+++ channels\/rdpgfx\/client\/rdpgfx_main.c\n@@ -46,6 +46,55 @@\n #include \"rdpgfx_main.h\"\n \n #define TAG CHANNELS_TAG(\"rdpgfx.client\")\n+\n+static void free_surfaces(RdpgfxClientContext* context, wHashTable* SurfaceTable)\n+{\n+\tUINT error = 0;\n+\tULONG_PTR* pKeys = NULL;\n+\tint count;\n+\tint index;\n+\n+\tcount = HashTable_GetKeys(SurfaceTable, &pKeys);\n+\n+\tfor (index = 0; index < count; index++)\n+\t{\n+\t\tRDPGFX_DELETE_SURFACE_PDU pdu;\n+\t\tpdu.surfaceId = ((UINT16)pKeys[index]) - 1;\n+\n+\t\tif (context)\n+\t\t{\n+\t\t\tIFCALLRET(context->DeleteSurface, error, context, &pdu);\n+\n+\t\t\tif (error)\n+\t\t\t{\n+\t\t\t\tWLog_ERR(TAG, \"context->DeleteSurface failed with error %\" PRIu32 \"\", error);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tfree(pKeys);\n+}\n+\n+static void evict_cache_slots(RdpgfxClientContext* context, UINT16 MaxCacheSlot, void** CacheSlots)\n+{\n+\tUINT16 index;\n+\n+\tfor (index = 0; index < MaxCacheSlot; index++)\n+\t{\n+\t\tif (CacheSlots[index])\n+\t\t{\n+\t\t\tRDPGFX_EVICT_CACHE_ENTRY_PDU pdu;\n+\t\t\tpdu.cacheSlot = (UINT16)index;\n+\n+\t\t\tif (context && context->EvictCacheEntry)\n+\t\t\t{\n+\t\t\t\tcontext->EvictCacheEntry(context, &pdu);\n+\t\t\t}\n+\n+\t\t\tCacheSlots[index] = NULL;\n+\t\t}\n+\t}\n+}\n \n \/**\n * Function description\n@@ -1767,7 +1816,17 @@\n \tRDPGFX_CHANNEL_CALLBACK* callback = (RDPGFX_CHANNEL_CALLBACK*)pChannelCallback;\n \tRDPGFX_PLUGIN* gfx = (RDPGFX_PLUGIN*)callback->plugin;\n \tRdpgfxClientContext* context = (RdpgfxClientContext*)gfx->iface.pInterface;\n+\n \tDEBUG_RDPGFX(gfx->log, \"OnClose\");\n+\tfree_surfaces(context, gfx->SurfaceTable);\n+\tevict_cache_slots(context, gfx->MaxCacheSlot, gfx->CacheSlots);\n+\n+\tif (gfx->listener_callback)\n+\t{\n+\t\tfree(gfx->listener_callback);\n+\t\tgfx->listener_callback = NULL;\n+\t}\n+\n \tfree(callback);\n \tgfx->UnacknowledgedFrames = 0;\n \tgfx->TotalDecodedFrames = 0;\n@@ -2049,58 +2108,14 @@\n {\n \n \tRDPGFX_PLUGIN* gfx;\n-\tint count;\n-\tint index;\n-\tULONG_PTR* pKeys = NULL;\n-\tUINT error = CHANNEL_RC_OK;\n \n \tif (!context)\n \t\treturn;\n \n \tgfx = (RDPGFX_PLUGIN*)context->handle;\n \n-\tcount = HashTable_GetKeys(gfx->SurfaceTable, &pKeys);\n-\n-\tfor (index = 0; index < count; index++)\n-\t{\n-\t\tRDPGFX_DELETE_SURFACE_PDU pdu;\n-\t\tpdu.surfaceId = ((UINT16)pKeys[index]) - 1;\n-\n-\t\tif (context)\n-\t\t{\n-\t\t\tIFCALLRET(context->DeleteSurface, error, context, &pdu);\n-\n-\t\t\tif (error)\n-\t\t\t{\n-\t\t\t\tWLog_Print(gfx->log, WLOG_ERROR,\n-\t\t\t\t \"context->DeleteSurface failed with error %\" PRIu32 \"\", error);\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\tfree(pKeys);\n-\n-\tfor (index = 0; index < gfx->MaxCacheSlot; index++)\n-\t{\n-\t\tif (gfx->CacheSlots[index])\n-\t\t{\n-\t\t\tRDPGFX_EVICT_CACHE_ENTRY_PDU pdu;\n-\t\t\tpdu.cacheSlot = (UINT16)index;\n-\n-\t\t\tif (context)\n-\t\t\t{\n-\t\t\t\tIFCALLRET(context->EvictCacheEntry, error, context, &pdu);\n-\n-\t\t\t\tif (error)\n-\t\t\t\t{\n-\t\t\t\t\tWLog_Print(gfx->log, WLOG_ERROR,\n-\t\t\t\t\t \"context->EvictCacheEntry failed with error %\" PRIu32 \"\", error);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tgfx->CacheSlots[index] = NULL;\n-\t\t}\n-\t}\n+\tfree_surfaces(context, gfx->SurfaceTable);\n+\tevict_cache_slots(context, gfx->MaxCacheSlot, gfx->CacheSlots);\n \n \tif (gfx->listener_callback)\n \t{\n"} {"commit":"dc036ae81475b96ca2520085e77b978caeca2639","subject":"msm_shared: Add qtimer support","message":"msm_shared: Add qtimer support\n\nChange-Id: I6cd15a21eace8b10fa8f4365cf0959b49ae5e02e\n","repos":"my4ndr0id\/android_bootable_bootloader_lk,M1cha\/lktris,jsr-d10\/android_bootable_bootloader_lk,oubeichen\/lk-v500,my4ndr0id\/android_bootable_bootloader_lk,M1cha\/lktris,idor\/dk50-bootable_bootloader_lk,M1cha\/mi2_lk,mozilla-b2g\/kernel_lk,Redmi-dev\/android_bootable_lk,t2m-foxfone\/android_kernel_lk,chirayudesai\/android_bootable_bootloader_lk,utilite2\/lk,Foxda-Tech\/argo8-bootable-bootloader-lk,lg-devs\/g2-bootloader,jbott\/lk_gee,beidl\/lk_umia,Redmi-dev\/android_bootable_lk,idor\/dk50-bootable_bootloader_lk,RonGokhale\/android_lk_bootloader,Blefish\/android_bootable_bootloader_lk,oubeichen\/lk-v500,Foxda-Tech\/polaris-bootable-bootloader-lk,jsr-d9\/android_kernel_lk,my4ndr0id\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,thornbirdblue\/codeaurora_lk,Foxda-Tech\/argo8-bootable-bootloader-lk,hanjae\/lumiab0,idor\/dk50-bootable_bootloader_lk,t2m-foxfone\/kernel_lk,my4ndr0id\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,utilite2\/lk,detule\/lk-g2-spr,Blefish\/android_bootable_bootloader_lk,t2m-foxfone\/android_kernel_lk,M1cha\/android_bootable_bootloader_lk,jsr-d9\/android_kernel_lk,jsr-d9\/android_kernel_lk,jsr-d9\/android_kernel_lk,M1cha\/mi2_lk,beidl\/lk_umia,oubeichen\/lk-v500,MiCode\/mi2_lk,pichina\/lk,M1cha\/android_bootable_bootloader_lk,chirayudesai\/android_bootable_bootloader_lk,MiCode\/mi2_lk,M1cha\/lktris,Foxda-Tech\/argo8-bootable-bootloader-lk,M1cha\/mi2_lk,t2m-foxfone\/kernel_lk,jsr-d10\/android_bootable_bootloader_lk,jbott\/lk_gee,jsr-d10\/android_bootable_bootloader_lk,beidl\/lk_umia,RonGokhale\/android_lk_bootloader,M1cha\/lktris,t2m-foxfone\/kernel_lk,thornbirdblue\/codeaurora_lk,chirayudesai\/android_bootable_bootloader_lk,zhuotong\/mi2_lk_NoEmmc,t2m-foxfone\/kernel_lk,pichina\/lk,mozilla-b2g\/fairphone2_kernel_lk,DooMLoRD\/android_bootable_bootloader_lk,Foxda-Tech\/polaris-bootable-bootloader-lk,Blefish\/android_bootable_bootloader_lk,utilite2\/lk,detule\/lk-g2-spr,M1cha\/mi2_lk,MiCode\/mi2_lk,hanjae\/lumiab0,hanjae\/lumiab0,jsr-d10\/android_bootable_bootloader_lk,jbott\/lk_gee,idor\/dk50-bootable_bootloader_lk,thornbirdblue\/codeaurora_lk,DooMLoRD\/android_bootable_bootloader_lk,Foxda-Tech\/polaris-bootable-bootloader-lk,jsr-d10\/android_bootable_bootloader_lk,mozilla-b2g\/kernel_lk,RonGokhale\/android_lk_bootloader,chirayudesai\/android_bootable_bootloader_lk,mozilla-b2g\/kernel_lk,DooMLoRD\/android_bootable_bootloader_lk,t2m-foxfone\/kernel_lk,efidroid\/lk,Redmi-dev\/android_bootable_lk,DooMLoRD\/android_bootable_bootloader_lk,zhuotong\/mi2_lk_NoEmmc,utilite2\/lk,Foxda-Tech\/argo8-bootable-bootloader-lk,Blefish\/android_bootable_bootloader_lk,my4ndr0id\/android_bootable_bootloader_lk,detule\/lk-g2-spr,mozilla-b2g\/kernel_lk,CanarySolutions\/little-kernel,efidroid\/lk,MiCode\/mi2_lk,M1cha\/android_bootable_bootloader_lk,mozilla-b2g\/fairphone2_kernel_lk,efidroid\/lk,zhuotong\/mi2_lk_NoEmmc,t2m-foxfone\/android_kernel_lk,M1cha\/android_bootable_bootloader_lk,t2m-foxfone\/android_kernel_lk,zhuotong\/mi2_lk_NoEmmc,pichina\/lk,oubeichen\/lk-v500,detule\/lk-g2-spr,pichina\/lk,CanarySolutions\/little-kernel,Redmi-dev\/android_bootable_lk,chirayudesai\/android_bootable_bootloader_lk,M1cha\/android_bootable_bootloader_lk,M1cha\/android_bootable_bootloader_lk,jbott\/lk_gee,beidl\/lk_umia,RonGokhale\/android_lk_bootloader,lg-devs\/g2-bootloader,thornbirdblue\/codeaurora_lk,mozilla-b2g\/kernel_lk,hanjae\/lumiab0,Foxda-Tech\/polaris-bootable-bootloader-lk,jbott\/lk_gee,hanjae\/lumiab0,pichina\/lk,t2m-foxfone\/android_kernel_lk,utilite2\/lk,Redmi-dev\/android_bootable_lk,DooMLoRD\/android_bootable_bootloader_lk,lg-devs\/g2-bootloader,thornbirdblue\/codeaurora_lk,idor\/dk50-bootable_bootloader_lk,lg-devs\/g2-bootloader,M1cha\/lktris,Foxda-Tech\/argo8-bootable-bootloader-lk,CanarySolutions\/little-kernel,CanarySolutions\/little-kernel,Foxda-Tech\/polaris-bootable-bootloader-lk,Blefish\/android_bootable_bootloader_lk,oubeichen\/lk-v500,RonGokhale\/android_lk_bootloader,CanarySolutions\/little-kernel,jsr-d9\/android_kernel_lk,beidl\/lk_umia,efidroid\/lk,efidroid\/lk,M1cha\/mi2_lk,mozilla-b2g\/fairphone2_kernel_lk,MiCode\/mi2_lk,lg-devs\/g2-bootloader,detule\/lk-g2-spr,zhuotong\/mi2_lk_NoEmmc","returncode":1,"stderr":"error: pathspec 'platform\/msm_shared\/qtimer.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- platform\/msm_shared\/qtimer.c\n+++ platform\/msm_shared\/qtimer.c\n@@ -0,0 +1,198 @@\n+\/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.\n+\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions are\n+ * met:\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above\n+ * copyright notice, this list of conditions and the following\n+ * disclaimer in the documentation and\/or other materials provided\n+ * with the distribution.\n+ * * Neither the name of Code Aurora Forum, Inc. nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED\n+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT\n+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS\n+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ *\/\n+\n+#include <debug.h>\n+#include <reg.h>\n+#include <sys\/types.h>\n+\n+#include <platform\/timer.h>\n+#include <platform\/irqs.h>\n+#include <platform\/iomap.h>\n+#include <platform\/interrupts.h>\n+#include <kernel\/thread.h>\n+\n+#define QTMR_TIMER_CTRL_ENABLE (1 << 0)\n+#define QTMR_TIMER_CTRL_INT_MASK (1 << 1)\n+\n+#define PLATFORM_TIMER_TYPE_PHYSICAL 1\n+#define PLATFORM_TIMER_TYPE_VIRTUAL 2\n+\n+static platform_timer_callback timer_callback;\n+static void *timer_arg;\n+static time_t timer_interval;\n+static unsigned int timer_type = PLATFORM_TIMER_TYPE_PHYSICAL;\n+static volatile uint32_t ticks;\n+\n+static enum handler_return timer_irq(void *arg)\n+{\n+\tticks += timer_interval;\n+\n+\tif (timer_type == PLATFORM_TIMER_TYPE_VIRTUAL)\n+\t\t__asm__(\"mcr p15, 0, %0, c14, c3, 0\"::\"r\"(timer_interval));\n+\telse if (timer_type == PLATFORM_TIMER_TYPE_PHYSICAL)\n+\t\t__asm__(\"mcr p15, 0, %0, c14, c2, 0\" : :\"r\" (timer_interval));\n+\n+\treturn timer_callback(timer_arg, ticks);\n+}\n+\n+\/* Programs the Virtual Down counter timer.\n+ * interval : Counter ticks till expiry interrupt is fired.\n+ *\/\n+unsigned int platform_set_virtual_timer(uint32_t interval)\n+{\n+\tuint32_t ctrl;\n+\n+\t\/* Program CTRL Register *\/\n+\tctrl =0;\n+\tctrl |= QTMR_TIMER_CTRL_ENABLE;\n+\tctrl &= ~QTMR_TIMER_CTRL_INT_MASK;\n+\n+\t__asm__(\"mcr p15, 0, %0, c14, c3, 1\"::\"r\"(ctrl));\n+\n+\t\/* Set Virtual Down Counter *\/\n+\t__asm__(\"mcr p15, 0, %0, c14, c3, 0\"::\"r\"(interval));\n+\n+\treturn INT_QTMR_VIRTUAL_TIMER_EXP;\n+\n+}\n+\n+\/* Programs the Physical Secure Down counter timer.\n+ * interval : Counter ticks till expiry interrupt is fired.\n+ *\/\n+unsigned int platform_set_physical_timer(uint32_t interval)\n+{\n+\tuint32_t ctrl;\n+\n+\t\/* Program CTRL Register *\/\n+\tctrl =0;\n+\tctrl |= QTMR_TIMER_CTRL_ENABLE;\n+\tctrl &= ~QTMR_TIMER_CTRL_INT_MASK;\n+\n+\t__asm__(\"mcr p15, 0, %0, c14, c2, 1\" : :\"r\" (ctrl));\n+\n+\t\/* Set Physical Down Counter *\/\n+\t__asm__(\"mcr p15, 0, %0, c14, c2, 0\" : :\"r\" (interval));\n+\n+\treturn INT_QTMR_SECURE_PHYSICAL_TIMER_EXP;\n+\n+}\n+\n+\n+status_t platform_set_periodic_timer(platform_timer_callback callback,\n+\tvoid *arg, time_t interval)\n+{\n+\tuint32_t ppi_num;\n+\tunsigned long ctrl;\n+\tuint32_t tick_count = interval * platform_tick_rate() \/ 1000;\n+\n+\tenter_critical_section();\n+\n+\ttimer_callback = callback;\n+\ttimer_arg = arg;\n+\ttimer_interval = interval;\n+\n+\tif (timer_type == PLATFORM_TIMER_TYPE_VIRTUAL)\n+\t\tppi_num = platform_set_virtual_timer(tick_count);\n+\telse if (timer_type == PLATFORM_TIMER_TYPE_PHYSICAL)\n+\t\tppi_num = platform_set_physical_timer(tick_count);\n+\n+\tregister_int_handler(ppi_num, timer_irq, 0);\n+\tunmask_interrupt(ppi_num);\n+\n+\texit_critical_section();\n+\treturn 0;\n+}\n+\n+time_t current_time(void)\n+{\n+\treturn ticks;\n+}\n+\n+void platform_uninit_timer(void)\n+{\n+\tuint32_t ctrl;\n+\n+\tunmask_interrupt(INT_DEBUG_TIMER_EXP);\n+\n+\t\/* program cntrl register *\/\n+\tctrl =0;\n+\tctrl |= ~QTMR_TIMER_CTRL_ENABLE;\n+\tctrl &= QTMR_TIMER_CTRL_INT_MASK;\n+\n+\tif (timer_type == PLATFORM_TIMER_TYPE_VIRTUAL)\n+\t\t__asm__(\"mcr p15, 0, %0, c14, c3, 1\"::\"r\"(ctrl));\n+\telse if (timer_type == PLATFORM_TIMER_TYPE_PHYSICAL)\n+\t\t__asm__(\"mcr p15, 0, %0, c14, c2, 1\" : :\"r\" (ctrl));\n+\n+}\n+\n+void mdelay(unsigned msecs)\n+{\n+\tuint32_t phy_cnt_lo, phy_cnt_hi, cnt, timeout = 0;\n+\tuint64_t phy_cnt;\n+\tmsecs = msecs * platform_tick_rate() \/ 1000;\n+\n+\tdo{\n+\t\/* read global counter *\/\n+\t__asm__(\"mrrc p15,0,%0,%1, c14\":\"=r\"(phy_cnt_lo),\"=r\"(phy_cnt_hi));\n+\tphy_cnt = ((uint64_t)phy_cnt_hi << 32) | phy_cnt_lo;\n+\t\/*Actual counter used in the simulation is only 32 bits\n+\t * in reality the counter is actually 56 bits.\n+\t *\/\n+\tcnt = phy_cnt & (uint32_t)~0;\n+\tif (timeout == 0)\n+\t\ttimeout = cnt + msecs;\n+\t} while (cnt < timeout);\n+\n+}\n+\n+void udelay(unsigned usecs)\n+{\n+\tuint32_t phy_cnt_lo, phy_cnt_hi, cnt, timeout = 0;\n+\tuint64_t phy_cnt;\n+\tusecs = (usecs * platform_tick_rate()) \/ 1000000;\n+\n+\tdo{\n+\t\/* read global counter *\/\n+\t__asm__(\"mrrc p15,0,%0,%1, c14\":\"=r\"(phy_cnt_lo),\"=r\"(phy_cnt_hi));\n+\tphy_cnt = ((uint64_t)phy_cnt_hi << 32) | phy_cnt_lo;\n+\n+\t\/*Actual counter used in the simulation is only 32 bits\n+\t * in reality the counter is actually 56 bits.\n+\t *\/\n+\tcnt = phy_cnt & (uint32_t)~0;\n+\tif (timeout == 0)\n+\t\ttimeout = cnt + usecs;\n+\t} while (cnt < timeout);\n+}\n+\n+\/* Return current time in micro seconds *\/\n+bigtime_t current_time_hires(void)\n+{\n+\treturn ticks * 1000000ULL;\n+}\n"} {"commit":"58796846e44a56c3c7a54e1f7f50f44739ffb746","subject":"Reduce log level (Java 9 warning -> info)","message":"Reduce log level (Java 9 warning -> info)\n","repos":"ShiftMediaProject\/libbluray,ShiftMediaProject\/libbluray,ShiftMediaProject\/libbluray,ShiftMediaProject\/libbluray","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libbluray\/bdj\/bdj.c\n+++ src\/libbluray\/bdj\/bdj.c\n@@ -862,7 +862,7 @@\n #else\n java_9 = !!dl_dlsym(jvm_lib, \"JVM_DefineModule\");\n if (java_9) {\n- BD_DEBUG(DBG_CRIT | DBG_BDJ, \"Detected Java 9 or later JVM - support is experimental !\\n\");\n+ BD_DEBUG(DBG_BDJ, \"Detected Java 9 or later JVM\\n\");\n }\n #endif\n \n"} {"commit":"2de99ed718d0dd68d6fa527f9e7c424ae40f5563","subject":"Fix compilation issue with atomic_uint64_t on Debian (#2072)","message":"Fix compilation issue with atomic_uint64_t on Debian (#2072)\n\nResolves https:\/\/github.com\/tangrams\/tangram-es\/issues\/2068","repos":"tangrams\/tangram-es,tangrams\/tangram-es,tangrams\/tangram-es,tangrams\/tangram-es,tangrams\/tangram-es,tangrams\/tangram-es,tangrams\/tangram-es","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/common\/urlClient.h\n+++ platforms\/common\/urlClient.h\n@@ -3,6 +3,7 @@\n #include \"platform.h\" \/\/ UrlResponse\n #include \"util\/asyncWorker.h\"\n \n+#include <atomic>\n #include <condition_variable>\n #include <functional>\n #include <list>\n@@ -69,7 +70,7 @@\n std::mutex m_requestMutex;\n \n \/\/ RequestIds\n- std::atomic_uint64_t m_requestCount{0};\n+ std::atomic<uint64_t> m_requestCount{0};\n \n \/\/ File descriptors to break waiting select.\n int m_requestNotify[2] = { -1, -1 };\n"} {"commit":"367511f4c06f87f17203635a67735135dbbb8f82","subject":"added proposed ksPopAtCursor","message":"added proposed ksPopAtCursor\n","repos":"petermax2\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,e1528532\/libelektra,petermax2\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra,mpranj\/libelektra,petermax2\/libelektra,e1528532\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libelektra\/keyset.c\n+++ src\/libelektra\/keyset.c\n@@ -1188,6 +1188,29 @@\n \n \tif (ks->cursor == 0) return (cursor_t) -1;\n \telse return (cursor_t) ks->current;\n+}\n+\n+Key *ksPopAtCursor(KeySet *ks, cursor_t pos)\n+{\n+\tif (!ks) return 0;\n+\tKey ** found = ks->array+pos;\n+\tKey * k = *found;\n+\t\/* Move the array over the place where key was found *\/\n+\tmemmove (found, found+1, ks->size*sizeof(Key *)-(found-ks->array)-sizeof(Key *));\n+\t*(ks->array+ks->size-1) = k;\n+\tif (found < ks->array+ks->current)\n+\t{\n+\t\tksPrev(ks);\n+\t}\n+\telse if (found == ks->array+ks->current)\n+\t{\n+\t\tksRewind(ks);\n+\t}\n+\n+\tks->flags |= KS_FLAG_SYNC;\n+\n+\tksRewind(ks);\n+\treturn ksPop(ks);\n }\n \n \n@@ -1457,23 +1480,8 @@\n \t\t{\n \t\t\tif (options & KDB_O_POP)\n \t\t\t{\n-\t\t\t\tKey * k = *found;\n-\t\t\t\t\/* Move the array over the place where key was found *\/\n-\t\t\t\tmemmove (found, found+1, ks->size*sizeof(Key *)-(found-ks->array)-sizeof(Key *));\n-\t\t\t\t*(ks->array+ks->size-1) = k;\n-\t\t\t\tif (found < ks->array+ks->current)\n-\t\t\t\t{\n-\t\t\t\t\tksPrev(ks);\n-\t\t\t\t}\n-\t\t\t\telse if (found == ks->array+ks->current)\n-\t\t\t\t{\n-\t\t\t\t\tksRewind(ks);\n-\t\t\t\t}\n-\n-\t\t\t\tks->flags |= KS_FLAG_SYNC;\n-\n-\t\t\t\tksRewind(ks);\n-\t\t\t\treturn ksPop(ks);\n+\t\t\t\tcursor = found-ks->array;\n+\t\t\t\treturn ksPopAtCursor(ks, cursor);\n \t\t\t} else {\n \t\t\t\tcursor = found-ks->array;\n \t\t\t\tksSetCursor(ks, cursor);\n"} {"commit":"801e83599b734330bc4a962a084aa8ab357e6e24","subject":"Don't try to decode partial mp3 frames at the end of a file","message":"Don't try to decode partial mp3 frames at the end of a file\n\ngit-svn-id: 793bb72743a407948e3701719c462b6a765bc435@2539 35dc7657-300d-0410-a2e5-dc2837fedb53\n","repos":"Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libmpg123\/readers.c\n+++ src\/libmpg123\/readers.c\n@@ -369,9 +369,7 @@\n \t{\n \t\tlong ll = l;\n \t\tif(ll <= 0) ll = 0;\n-\n-\t\t\/* This allows partial frames at the end... do we really want to pad and decode these?! *\/\n-\t\tmemset(buf+ll,0,size-ll);\n+\t\treturn READER_MORE;\n \t}\n \treturn l;\n }\n"} {"commit":"631d11215f6391667d2df66f717104ba48e5758a","subject":"Fix starting frame numbers for Theora","message":"Fix starting frame numbers for Theora\n\nThe correction for different starting frame numbers on early Theora streams\nwas backward, resulting in the timestamp calculation being off by a frame\non all stream version. This was causing oggz-sort and oggz-merge to mis-mux\nstreams (which oggz-validate was catching properly)\n","repos":"brion\/liboggz,brion\/liboggz,kfish\/liboggz,brion\/liboggz,kfish\/liboggz,brion\/liboggz,kfish\/liboggz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/liboggz\/oggz_auto.c\n+++ src\/liboggz\/oggz_auto.c\n@@ -174,8 +174,15 @@\n \t\t\tOGGZ_AUTO_MULT * (ogg_int64_t)fps_denominator);\n oggz_set_granuleshift (oggz, serialno, keyframe_shift);\n \n- if (version > THEORA_VERSION(3,2,0))\n- oggz_set_first_granule (oggz, serialno, 1);\n+ \/* the theora granpos->time calculation always adds one to the\n+ index, but 3.2.0 streams count from zero and later versions count\n+ from one. So... for a 3.2.0 stream, the intitial frame number is\n+ zero, but we add one (or in this case, subtract -1 in\n+ oggz_metric_default_granuleshift). For 3.2.1 and later, we\n+ subtract one from the first frame number (1) to get an initial index\n+ of zero, then add one to compute time for a net change of zero *\/\n+ if (version < THEORA_VERSION(3,2,0))\n+ oggz_set_first_granule (oggz, serialno, -1);\n \n oggz_stream_set_numheaders (oggz, serialno, 3);\n \n"} {"commit":"168c77b3912225ab2375202add2f48d876cb6a21","subject":"src\/libpcp\/src\/interp.c: remove some #if 0 dead code from last commit","message":"src\/libpcp\/src\/interp.c: remove some #if 0 dead code from last commit\n","repos":"adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libpcp\/src\/interp.c\n+++ src\/libpcp\/src\/interp.c\n@@ -1336,11 +1336,6 @@\n \tif (icp->t_first >= 0 && t_req < icp->t_first)\n \t \/* before earliest observation, don't bother *\/\n \t continue;\n-#if 0\n-\tif (icp->t_last >= 0 && t_req > icp->t_last)\n-\t \/* after latest observation, don't bother *\/\n-\t continue;\n-#endif\n \tif (icp->t_birth >= 0 && t_req < icp->t_birth)\n \t \/* from time_caliper(): before instance appears, don't bother *\/\n \t continue;\n@@ -1482,11 +1477,6 @@\n for (icp = (instcntl_t *)ctxp->c_archctl->ac_want; icp != NULL; icp = icp->want) {\n \tassert(icp->inresult);\n \tnuis[NUIS_PASS3]++;\n-#if 0\n-\tif (icp->t_first >= 0 && t_req < icp->t_first)\n-\t \/* before earliest observation, don't bother *\/\n-\t continue;\n-#endif\n \tif (icp->t_last >= 0 && t_req > icp->t_last)\n \t \/* after latest observation, don't bother *\/\n \t continue;\n"} {"commit":"766612d7e865319e5de64f40b40b36931f14229b","subject":"Rewrite to an empty node when the lhs of subtraction is empty.","message":"Rewrite to an empty node when the lhs of subtraction is empty.\n\nThis should never be reached in practice, I just can't resist handling it, though.\n","repos":"katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/libre\/ast_rewrite.c\n+++ src\/libre\/ast_rewrite.c\n@@ -139,8 +139,8 @@\n \n \t\tif (n->u.concat.count == 0) {\n \t\t\tfree(n->u.concat.n);\n-\t\t\tn->type = AST_EXPR_EMPTY;\n-\t\t\treturn 1;\n+\n+\t\t\tgoto empty;\n \t\t}\n \n \t\tif (n->u.concat.count == 1) {\n@@ -234,8 +234,8 @@\n \n \t\tif (n->u.alt.count == 0) {\n \t\t\tfree(n->u.alt.n);\n-\t\t\tn->type = AST_EXPR_EMPTY;\n-\t\t\treturn 1;\n+\n+\t\t\tgoto empty;\n \t\t}\n \n \t\tif (n->u.alt.count == 1) {\n@@ -262,9 +262,20 @@\n \t\t\treturn 0;\n \t\t}\n \n+\t\t\/* If the lhs operand is empty, the result is always empty *\/\n+\t\tif (n->u.subtract.a->type == AST_EXPR_EMPTY) {\n+\t\t\tast_expr_free(n->u.subtract.a);\n+\t\t\tast_expr_free(n->u.subtract.b);\n+\n+\t\t\tgoto empty;\n+\t\t}\n+\n \t\tif (!rewrite(n->u.subtract.b, flags)) {\n \t\t\treturn 0;\n \t\t}\n+\n+\t\t\/* TODO: If the rhs operand is 00-ff, the result is always empty\n+\t\t * (unless RE_UNICODE is set) *\/\n \n \t\t\/* TODO: optimisation for computing subtractions for simple cases here;\n \t\t * this should be possible by walking AST nodes directly (and sorting\n@@ -313,7 +324,7 @@\n \t\tif (empty) {\n \t\t\tast_expr_free(n->u.subtract.a);\n \t\t\tast_expr_free(n->u.subtract.b);\n-\t\t\tn->type = AST_EXPR_EMPTY;\n+\t\t\tgoto empty;\n \t\t}\n \n \t\treturn 1;\n@@ -322,6 +333,12 @@\n \tdefault:\n \t\treturn 1;\n \t}\n+\n+empty:\n+\n+\tn->type = AST_EXPR_EMPTY;\n+\n+\treturn 1;\n }\n \n int\n"} {"commit":"d6e2a81b93d90a158ac2e9c16de7498196b3b101","subject":"[external::rex] Add method to get the raw JSON value","message":"[external::rex] Add method to get the raw JSON value\n","repos":"DethRaid\/nova-renderer,NovaMods\/nova-renderer,DethRaid\/nova-renderer,DethRaid\/nova-renderer,NovaMods\/nova-renderer,DethRaid\/nova-renderer","returncode":0,"stderr":"","license":"unknown","lang":"C","diff":"--- external\/rex\/include\/rx\/core\/json.h\n+++ external\/rex\/include\/rx\/core\/json.h\n@@ -1,241 +1,188 @@\n #ifndef RX_CORE_JSON_H\n #define RX_CORE_JSON_H\n+#include \"lib\/json.h\"\n #include \"rx\/core\/concurrency\/atomic.h\"\n-\n+#include \"rx\/core\/optional.h\"\n+#include \"rx\/core\/string.h\"\n+#include \"rx\/core\/traits\/is_same.h\"\n #include \"rx\/core\/traits\/return_type.h\"\n-#include \"rx\/core\/traits\/is_same.h\"\n-\n-#include \"rx\/core\/string.h\"\n-#include \"rx\/core\/optional.h\"\n-\n-#include \"lib\/json.h\"\n \n namespace rx {\n \n-struct json {\n- constexpr json();\n- json(memory::allocator* _allocator, const char* _contents, rx_size _length);\n- json(memory::allocator* _allocator, const char* _contents);\n- json(memory::allocator* _allocator, const string& _contents);\n- json(const char* _contents, rx_size _length);\n- json(const char* _contents);\n- json(const string& _contents);\n- json(const json& _json);\n- json(json&& json_);\n- ~json();\n+ struct json {\n+ constexpr json();\n+ json(memory::allocator* _allocator, const char* _contents, rx_size _length);\n+ json(memory::allocator* _allocator, const char* _contents);\n+ json(memory::allocator* _allocator, const string& _contents);\n+ json(const char* _contents, rx_size _length);\n+ json(const char* _contents);\n+ json(const string& _contents);\n+ json(const json& _json);\n+ json(json&& json_);\n+ ~json();\n \n- json& operator=(const json& _json);\n- json& operator=(json&& json_);\n+ json& operator=(const json& _json);\n+ json& operator=(json&& json_);\n \n- enum class type {\n- k_array,\n- k_boolean,\n- k_null,\n- k_number,\n- k_object,\n- k_string,\n- k_integer\n- };\n+ enum class type { k_array, k_boolean, k_null, k_number, k_object, k_string, k_integer };\n \n- operator bool() const;\n- optional<string> error() const;\n+ operator bool() const;\n+ optional<string> error() const;\n \n- bool is_type(type _type) const;\n+ bool is_type(type _type) const;\n \n- bool is_array() const;\n- bool is_array_of(type _type) const;\n- bool is_array_of(type _type, rx_size _size) const;\n- bool is_boolean() const;\n- bool is_null() const;\n- bool is_number() const;\n- bool is_object() const;\n- bool is_string() const;\n- bool is_integer() const;\n+ bool is_array() const;\n+ bool is_array_of(type _type) const;\n+ bool is_array_of(type _type, rx_size _size) const;\n+ bool is_boolean() const;\n+ bool is_null() const;\n+ bool is_number() const;\n+ bool is_object() const;\n+ bool is_string() const;\n+ bool is_integer() const;\n \n- json operator[](rx_size _index) const;\n- bool as_boolean() const;\n- rx_f64 as_number() const;\n- rx_f32 as_float() const;\n- rx_s32 as_integer() const;\n- json operator[](const char* _name) const;\n- string as_string() const;\n- string as_string_with_allocator(memory::allocator* _allocator) const;\n+ json operator[](rx_size _index) const;\n+ bool as_boolean() const;\n+ rx_f64 as_number() const;\n+ rx_f32 as_float() const;\n+ rx_s32 as_integer() const;\n+ json operator[](const char* _name) const;\n+ string as_string() const;\n+ string as_string_with_allocator(memory::allocator* _allocator) const;\n \n- \/\/ # of elements for objects and arrays only\n- rx_size size() const;\n- bool is_empty() const;\n+ \/\/ # of elements for objects and arrays only\n+ rx_size size() const;\n+ bool is_empty() const;\n \n- template<typename F>\n- bool each(F&& _function) const;\n+ template <typename F>\n+ bool each(F&& _function) const;\n \n- memory::allocator* allocator() const;\n+ memory::allocator* allocator() const;\n \n-private:\n- struct shared {\n- shared(memory::allocator* _allocator, const char* _contents, rx_size _length);\n- ~shared();\n+ struct json_value_s* raw() const;\n \n- shared* acquire();\n- void release();\n+ private:\n+ struct shared {\n+ shared(memory::allocator* _allocator, const char* _contents, rx_size _length);\n+ ~shared();\n \n- memory::allocator* m_allocator;\n- struct json_parse_result_s m_error;\n- struct json_value_s* m_root;\n- concurrency::atomic<rx_size> m_count;\n- };\n+ shared* acquire();\n+ void release();\n \n- json(shared* _shared, struct json_value_s* _head);\n+ memory::allocator* m_allocator;\n+ struct json_parse_result_s m_error;\n+ struct json_value_s* m_root;\n+ concurrency::atomic<rx_size> m_count;\n+ };\n \n- shared* m_shared;\n- struct json_value_s* m_value;\n-};\n+ json(shared* _shared, struct json_value_s* _head);\n \n-inline constexpr json::json()\n- : m_shared{nullptr}\n- , m_value{nullptr}\n-{\n-}\n+ shared* m_shared;\n+ struct json_value_s* m_value;\n+ };\n \n-inline json::json(memory::allocator* _allocator, const string& _contents)\n- : json{_allocator, _contents.data(), _contents.size()}\n-{\n-}\n+ inline constexpr json::json() : m_shared{nullptr}, m_value{nullptr} {}\n \n-inline json::json(const char* _contents, rx_size _length)\n- : json{&memory::g_system_allocator, _contents, _length}\n-{\n-}\n+ inline json::json(memory::allocator* _allocator, const string& _contents) : json{_allocator, _contents.data(), _contents.size()} {}\n \n-inline json::json(const string& _contents)\n- : json{&memory::g_system_allocator, _contents.data(), _contents.size()}\n-{\n-}\n+ inline json::json(const char* _contents, rx_size _length) : json{&memory::g_system_allocator, _contents, _length} {}\n \n-inline json::json(const json& _json)\n- : m_shared{_json.m_shared->acquire()}\n- , m_value{_json.m_value}\n-{\n-}\n+ inline json::json(const string& _contents) : json{&memory::g_system_allocator, _contents.data(), _contents.size()} {}\n \n-inline json::json(json&& json_)\n- : m_shared{json_.m_shared}\n- , m_value{json_.m_value}\n-{\n- json_.m_shared = nullptr;\n- json_.m_value = nullptr;\n-}\n+ inline json::json(const json& _json) : m_shared{_json.m_shared->acquire()}, m_value{_json.m_value} {}\n \n-inline json::~json() {\n- if (m_shared) {\n- m_shared->release();\n- }\n-}\n+ inline json::json(json&& json_) : m_shared{json_.m_shared}, m_value{json_.m_value} {\n+ json_.m_shared = nullptr;\n+ json_.m_value = nullptr;\n+ }\n \n-inline json& json::operator=(const json& _json) {\n- RX_ASSERT(&_json != this, \"self assignment\");\n+ inline json::~json() {\n+ if(m_shared) {\n+ m_shared->release();\n+ }\n+ }\n \n- if (m_shared) {\n- m_shared->release();\n- }\n+ inline json& json::operator=(const json& _json) {\n+ RX_ASSERT(&_json != this, \"self assignment\");\n \n- m_shared = _json.m_shared->acquire();\n- m_value = _json.m_value;\n+ if(m_shared) {\n+ m_shared->release();\n+ }\n \n- return *this;\n-}\n+ m_shared = _json.m_shared->acquire();\n+ m_value = _json.m_value;\n \n-inline json& json::operator=(json&& json_) {\n- RX_ASSERT(&json_ != this, \"self assignment\");\n+ return *this;\n+ }\n \n- m_shared = json_.m_shared;\n- m_value = json_.m_value;\n- json_.m_shared = nullptr;\n- json_.m_value = nullptr;\n+ inline json& json::operator=(json&& json_) {\n+ RX_ASSERT(&json_ != this, \"self assignment\");\n \n- return *this;\n-}\n+ m_shared = json_.m_shared;\n+ m_value = json_.m_value;\n+ json_.m_shared = nullptr;\n+ json_.m_value = nullptr;\n \n-inline json::operator bool() const {\n- return m_shared && m_shared->m_root;\n-}\n+ return *this;\n+ }\n \n-inline bool json::is_array() const {\n- return is_type(type::k_array);\n-}\n+ inline json::operator bool() const { return m_shared && m_shared->m_root; }\n \n-inline bool json::is_array_of(type _type) const {\n- if (!is_array()) {\n- return false;\n- }\n+ inline bool json::is_array() const { return is_type(type::k_array); }\n \n- return each([_type](const json& _value) {\n- return _value.is_type(_type);\n- });\n-}\n+ inline bool json::is_array_of(type _type) const {\n+ if(!is_array()) {\n+ return false;\n+ }\n \n-inline bool json::is_array_of(type _type, rx_size _size) const {\n- if (!is_array()) {\n- return false;\n- }\n+ return each([_type](const json& _value) { return _value.is_type(_type); });\n+ }\n \n- if (size() != _size) {\n- return false;\n- }\n+ inline bool json::is_array_of(type _type, rx_size _size) const {\n+ if(!is_array()) {\n+ return false;\n+ }\n \n- return each([_type](const json& _value) {\n- return _value.is_type(_type);\n- });\n-}\n+ if(size() != _size) {\n+ return false;\n+ }\n \n-inline bool json::is_boolean() const {\n- return is_type(type::k_boolean);\n-}\n+ return each([_type](const json& _value) { return _value.is_type(_type); });\n+ }\n \n-inline bool json::is_null() const {\n- return is_type(type::k_null);\n-}\n+ inline bool json::is_boolean() const { return is_type(type::k_boolean); }\n \n-inline bool json::is_number() const {\n- return is_type(type::k_number);\n-}\n+ inline bool json::is_null() const { return is_type(type::k_null); }\n \n-inline bool json::is_object() const {\n- return is_type(type::k_object);\n-}\n+ inline bool json::is_number() const { return is_type(type::k_number); }\n \n-inline bool json::is_string() const {\n- return is_type(type::k_string);\n-}\n+ inline bool json::is_object() const { return is_type(type::k_object); }\n \n-inline bool json::is_integer() const {\n- return is_type(type::k_integer);\n-}\n+ inline bool json::is_string() const { return is_type(type::k_string); }\n \n-inline bool json::is_empty() const {\n- return size() != 0;\n-}\n+ inline bool json::is_integer() const { return is_type(type::k_integer); }\n \n-inline string json::as_string() const {\n- return as_string_with_allocator(&memory::g_system_allocator);\n-}\n+ inline bool json::is_empty() const { return size() != 0; }\n \n-template<typename F>\n-inline bool json::each(F&& _function) const {\n- for (rx_size i{0}; i < size(); i++) {\n- if constexpr(traits::is_same<traits::return_type<F>, bool>) {\n- if (!_function(operator[](i))) {\n- return false;\n- }\n- } else {\n- _function(operator[](i));\n+ inline string json::as_string() const { return as_string_with_allocator(&memory::g_system_allocator); }\n+\n+ template <typename F>\n+ inline bool json::each(F&& _function) const {\n+ for(rx_size i{0}; i < size(); i++) {\n+ if constexpr(traits::is_same<traits::return_type<F>, bool>) {\n+ if(!_function(operator[](i))) {\n+ return false;\n+ }\n+ } else {\n+ _function(operator[](i));\n+ }\n+ }\n+ return true;\n }\n- }\n- return true;\n-}\n \n-inline memory::allocator* json::allocator() const {\n- return m_shared ? m_shared->m_allocator : nullptr;\n-}\n+ inline memory::allocator* json::allocator() const { return m_shared ? m_shared->m_allocator : nullptr; }\n+\n+ inline struct json_value_s* json::raw() const { return m_value; }\n \n } \/\/ namespace rx\n \n"} {"commit":"0b67ec47f3d984a8c965d7e683c963bb5c07c263","subject":"don't use indirect gotos in strict mode","message":"don't use indirect gotos in strict mode\n","repos":"koba-e964\/picrin,leavesbnw\/picrin,ktakashi\/picrin,leavesbnw\/picrin,picrin-scheme\/picrin,dcurrie\/picrin,ktakashi\/picrin,leavesbnw\/picrin,koba-e964\/picrin,omasanori\/picrin,omasanori\/picrin,koba-e964\/picrin,dcurrie\/picrin,ktakashi\/picrin,picrin-scheme\/picrin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extlib\/benz\/include\/picrin\/config.h\n+++ extlib\/benz\/include\/picrin\/config.h\n@@ -40,7 +40,7 @@\n \/* #define GC_DEBUG_DETAIL 1 *\/\n \n #ifndef PIC_DIRECT_THREADED_VM\n-# if defined(__GNUC__) || defined(__clang__)\n+# if (defined(__GNUC__) || defined(__clang__)) && __STRICT_ANSI__ != 1\n # define PIC_DIRECT_THREADED_VM 1\n # endif\n #endif\n"} {"commit":"7c3ae7f8d8c329bdc8fa3d9cbce80807b5bb6cb3","subject":"Next round of Ralf Wildenhues' correctness patches.","message":"Next round of Ralf Wildenhues' correctness patches.","repos":"BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- artutil.c\n+++ artutil.c\n@@ -35,12 +35,12 @@\n * that) or NULL \n * \\bug should rather use Boyer-Moore or something to be quicker\n *\/\n-char *\n+\/*@null@*\/\/*@only@ *\/ char *\n mgetheader(\n \/** header to find, must contain a colon, must not be NULL *\/\n-\t const char *hdr,\n+\t \/*@notnull@ *\/ const char *hdr,\n \/** buffer to search, may be NULL *\/\n-\t char *buf)\n+\t \/*@null@ *\/ char *buf)\n {\n mastr *hunt;\n char *p, *q;\n@@ -80,10 +80,12 @@\n \tint i;\n \tvalue = (char *)critmalloc((size_t) (q - p + 1),\n \t\t\t\t \"Allocating space for header value\");\n+\t\/*@+loopexec@ *\/\n \tfor (i = 0; i < q - p; i++) {\n \t \/* sort of strncpy, replacing LF by space *\/\n \t value[i] = (p[i] == '\\n' || p[i] == '\\r') ? ' ' : p[i];\n \t}\n+\t\/*@+loopexec@ *\/\n \t\/* strip trailing whitespace *\/\n \twhile (i && isspace((unsigned char)*(value + i - 1)))\n \t i--;\n@@ -98,12 +100,12 @@\n * NOTE: calls abort() if header does not contain a colon.\n * \\return malloc()ed copy of header without tag (caller must free that)\n * or NULL if not found. *\/\n-char *\n+\/*@null@*\/\/*@only@ *\/ char *\n fgetheader(\n \/** file to search for header, may be NULL *\/\n-\t FILE * f,\n+\t \/*@null@ *\/ FILE * f,\n \/** header to find, must contain a colon, must not be NULL *\/\n-\t const char *header,\n+\t \/*@notnull@ *\/ const char *header,\n \/** flag, if set, the file is rewound before and after access *\/\n \t int rewind_file)\n {\n@@ -153,12 +155,12 @@\n * NOTE: calls abort() if header does not contain a colon.\n * \\return malloc()ed copy of header without tag (caller must free that)\n * or NULL if not found. *\/\n-char *\n+\/*@null@*\/\/*@only@ *\/ char *\n getheader(\n \/** filename of article to search *\/\n-\t const char *filename,\n+\t \/*@notnull@ *\/ const char *filename,\n \/** header to search *\/\n-\t const char *header)\n+\t \/*@notnull@ *\/ const char *header)\n {\n FILE *f;\n char *hdr;\n@@ -166,7 +168,7 @@\n \n if (stat(filename, &st) || !S_ISREG(st.st_mode))\n \treturn NULL;\n- if ((f = fopen(filename, \"r\")) == 0)\n+ if ((f = fopen(filename, \"r\")) == NULL)\n \treturn NULL;\n hdr = fgetheader(f, header, 0);\n (void)log_fclose(f);\n@@ -212,14 +214,14 @@\n \n filename = lookup(msgid);\n if (!filename) {\n-\tclose(fd);\n+\t(void)close(fd);\n \tfree(msgidalloc);\n \treturn;\n }\n \n p = hdr = getheader(filename, \"Xref:\");\n if (!hdr) {\n-\tclose(fd);\n+\t(void)close(fd);\n \tfree(msgidalloc);\n \treturn;\n }\n"} {"commit":"0aeb86d922874fd501546919967b5755428c96b0","subject":"Added the description of the output type and the fact that there is only one descriptor computed for the whole cloud. This text was taken directly from the tutorial, but should also be visible in the Doxygen.","message":"Added the description of the output type and the fact that there\nis only one descriptor computed for the whole cloud. This text\nwas taken directly from the tutorial, but should also be visible \nin the Doxygen.\n\n\n\ngit-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@3937 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- features\/include\/pcl\/features\/vfh.h\n+++ features\/include\/pcl\/features\/vfh.h\n@@ -46,7 +46,12 @@\n namespace pcl\n {\n \/** \\brief VFHEstimation estimates the <b>Viewpoint Feature Histogram (VFH)<\/b> descriptor for a given point cloud\n- * dataset containing points and normals.\n+ * dataset containing points and normals. The default VFH implementation uses 45 binning subdivisions for each of\n+ * the three extended FPFH values, and 128 binning subdivisions for the viewpoint component, which results in a\n+ * 308-byte array of float values. These are stored in a pcl::VFHSignature308 point type.\n+ * A major difference between the PFH\/FPFH descriptors and VFH, is that for a given point cloud dataset, only a\n+ * single VFH descriptor will be estimated (vfhs->points.size() should be 1), while the resultant PFH\/FPFH data\n+ * will have the same number of entries as the number of points in the cloud.\n *\n * \\note If you use this code in any academic work, please cite:\n *\n"} {"commit":"fc5fdf204c562a909d9d38f26a63f5a80b4502bc","subject":"Fix several ppage issues: 1)range collapse and marking as full 2)cache_advise() failing to prope ppages","message":"Fix several ppage issues: 1)range collapse and marking as full 2)cache_advise() failing to prope ppages\n","repos":"PerilousApricot\/lstore,PerilousApricot\/lstore,tacketar\/lstore,tacketar\/lstore,tacketar\/lstore,accre\/lstore,accre\/lstore,PerilousApricot\/lstore,accre\/lstore,accre\/lstore,tacketar\/lstore,PerilousApricot\/lstore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lio\/segment_cache.c\n+++ src\/lio\/segment_cache.c\n@@ -95,6 +95,7 @@\n atomic_int_t _flush_count = 0;\n \n op_status_t cache_rw_func(void *arg, int id);\n+int _cache_ppages_flush(segment_t *seg, data_attr_t *da);\n \n \/\/*************************************************************\n \/\/ cache_cond_new - Creates a new shelf of cond variables\n@@ -643,6 +644,7 @@\n *ca->n_pages = 0;\n \n cache_lock(s->c);\n+ _cache_ppages_flush(seg, s->c->da); \/\/** Flush any partial pages first \/\/QWERT\n \n \/\/** Generate the page list to load\n coff = lo_row;\n@@ -701,7 +703,13 @@\n \n cache_unlock(s->c);\n \n- if (*ca->n_pages > 0) cache_rw_pages(seg, ca->page, *(ca->n_pages), ca->rw_mode, 0);\n+ if (*ca->n_pages > 0) {\n+ \/\/** Got some pages to fetch. Make sure the child segment is big enough. If not flush\n+ if (segment_size(s->child_seg) < segment_size(seg)) {\n+ gop_sync_exec(cache_flush_range(seg, s->c->da, 0, -1, s->c->timeout));\n+ } \n+ cache_rw_pages(seg, ca->page, *(ca->n_pages), ca->rw_mode, 0);\n+ }\n \n log_printf(5, \"END seg=\" XIDT \" lo=\" XOT \" hi=\" XOT \" n_pages=%d\\n\", segment_id(seg), ca->lo, ca->hi, *ca->n_pages);\n \n@@ -1756,10 +1764,14 @@\n }\n }\n \n+ log_printf(5, \"n_ranges=%d\\n\", stack_size(pp->range_stack));\n+\n \/\/** Check if we have a full page\n if (stack_size(pp->range_stack) == 1) {\n move_to_top(pp->range_stack);\n rng = get_ele_data(pp->range_stack);\n+ log_printf(5, \"lo=\" XOT \" gi=\" XOT \"\\n\", rng[0], rng[1]);\n+\n if ((rng[0] == 0) && (rng[1] == (pp->page_end - pp->page_start))) {\n pp->flags = 1;\n }\n@@ -1830,11 +1842,17 @@\n }\n \n if (lo <= prng[1]+1) { \/\/** Expand prev range\n+ log_printf(5, \"seg=\" XIDT \" checking if can collapse prhi=\" XOT \" hi=\" XOT \"\\n\", segment_id(seg), prng[1], hi);\n if (prng[1] < hi) {\n- prng[1] = hi;\n- if (rng != NULL) { \/\/** Move back and collapse. Otherwise we're at the end and just need to extend the existing range\n+ prng[1] = hi; \/\/** Extend the range\n+ if (rng != NULL) { \/\/** Move back before collapsing. Otherwise we're at the end and we've already extended the range\n+ log_printf(5, \"seg=\" XIDT \" collapsing prlo=\" XOT \" prhi=\" XOT \"\\n\", segment_id(seg), prng[0], prng[1]);\n move_up(pp->range_stack);\n full = _cache_ppages_range_collapse(pp);\n+ } else if (stack_size(pp->range_stack) == 1) { \/\/** Check if we have a full page\n+ if ((prng[0] == 0) && (prng[1] == (pp->page_end - pp->page_start))) {\n+ pp->flags = 1;\n+ }\n }\n }\n } else if (rng != NULL) { \/\/** Check if overlap on curr range\n@@ -2714,6 +2732,7 @@\n while ((curr=(cache_range_t *)pop(&stack)) != NULL) {\n log_printf(5, \"cache_flush_range_func: processing range: lo=\" XOT \" hi=\" XOT \" mode=%d\\n\", curr->lo, curr->hi, mode);\n n_pages = max_pages;\n+\/\/mode = CACHE_DOBLOCK; \/\/**QWERTY\n status = cache_dirty_pages_get(cop->seg, mode, curr->lo, curr->hi, &hi_got, page, &n_pages);\n log_printf(1, \"seg=\" XIDT \" processing range: lo=\" XOT \" hi=\" XOT \" hi_got=\" XOT \" mode=%d skip_mode=%d n_pages=%d\\n\", segment_id(cop->seg), curr->lo, curr->hi, hi_got, mode, status, n_pages);\n flush_log();\n"} {"commit":"61f57014f11854939ede91399f3859c8a4d2d23d","subject":"inetd startup wasn't working. Patch by Magnus Holmgren.","message":"inetd startup wasn't working. Patch by Magnus Holmgren.\n","repos":"LTD-Beget\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/login-common\/main.c\n+++ src\/login-common\/main.c\n@@ -235,7 +235,7 @@\n \tstruct ip_addr ip, local_ip;\n \tstruct ssl_proxy *proxy = NULL;\n \tstruct client *client;\n-\tint i, fd = -1, master_fd = -1;\n+\tint i, fd = -1, master_fd = -1, ssl = FALSE;\n \n \tis_inetd = getenv(\"DOVECOT_MASTER\") == NULL;\n \n@@ -285,6 +285,7 @@\n \t\t\t\tfd = ssl_proxy_new(fd, &ip, &proxy);\n \t\t\t\tif (fd == -1)\n \t\t\t\t\treturn 1;\n+\t\t\t\tssl = TRUE;\n \t\t\t} else if (strncmp(argv[i], \"--group=\", 8) != 0)\n \t\t\t\ti_fatal(\"Unknown parameter: %s\", argv[i]);\n \t\t}\n@@ -293,7 +294,7 @@\n \t\tclosing_down = TRUE;\n \n \t\tif (fd != -1) {\n-\t\t\tclient = client_create(fd, TRUE, &local_ip, &ip);\n+\t\t\tclient = client_create(fd, ssl, &local_ip, &ip);\n \t\t\tclient->proxy = proxy;\n \t\t}\n \t}\n"} {"commit":"92575afe3143dfd8c0a925f7b6609a8f94a8d45d","subject":"fix build: remove dup CBudgetVote","message":"fix build: remove dup CBudgetVote","repos":"Crowndev\/crowncoin,Crowndev\/crowncoin,Crowndev\/crowncoin,Crowndev\/crowncoin,Crowndev\/crowncoin,Crowndev\/crowncoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/masternode-budget.h\n+++ src\/masternode-budget.h\n@@ -262,56 +262,6 @@\n READWRITE(*(CScriptBase*)(&payee));\n READWRITE(nAmount);\n READWRITE(nProposalHash);\n- }\n-};\n-\n-\/\/\n-\/\/ CBudgetVote - Allow a masternode node to vote and broadcast throughout the network\n-\/\/\n-\n-class CBudgetVote\n-{\n-public:\n- bool fValid; \/\/if the vote is currently valid \/ counted\n- bool fSynced; \/\/if we've sent this to our peers\n- CTxIn vin;\n- uint256 nProposalHash;\n- int nVote;\n- int64_t nTime;\n- std::vector<unsigned char> vchSig;\n-\n- CBudgetVote();\n- CBudgetVote(CTxIn vin, uint256 nProposalHash, int nVoteIn);\n-\n- bool Sign(CKey& keyMasternode, CPubKey& pubKeyMasternode);\n- bool SignatureValid(bool fSignatureCheck) const;\n- void Relay();\n-\n- std::string GetVoteString() const {\n- std::string ret = \"ABSTAIN\";\n- if(nVote == VOTE_YES) ret = \"YES\";\n- if(nVote == VOTE_NO) ret = \"NO\";\n- return ret;\n- }\n-\n- uint256 GetHash() const {\n- CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);\n- ss << vin;\n- ss << nProposalHash;\n- ss << nVote;\n- ss << nTime;\n- return ss.GetHash();\n- }\n-\n- ADD_SERIALIZE_METHODS;\n-\n- template <typename Stream, typename Operation>\n- inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) {\n- READWRITE(vin);\n- READWRITE(nProposalHash);\n- READWRITE(nVote);\n- READWRITE(nTime);\n- READWRITE(vchSig);\n }\n };\n \n"} {"commit":"38ea1069d70a7c35fa502ac29f41ad0f6e54d39e","subject":"trunk: changeset 1749","message":"trunk: changeset 1749\n\nWSplitPane should now update markers on transpose.\n\ndarcs-hash:20040916162751-e481e-9f94bbe157b01c8d054e56d169e96532610c8a4d.gz\n","repos":"neg-serg\/notion,dkogan\/notion.xfttest,dkogan\/notion,p5n\/notion,raboof\/notion,dkogan\/notion,neg-serg\/notion,knixeur\/notion,raboof\/notion,raboof\/notion,anoduck\/notion,knixeur\/notion,dkogan\/notion,knixeur\/notion,anoduck\/notion,neg-serg\/notion,raboof\/notion,dkogan\/notion,p5n\/notion,anoduck\/notion,p5n\/notion,dkogan\/notion.xfttest,p5n\/notion,dkogan\/notion.xfttest,dkogan\/notion,neg-serg\/notion,knixeur\/notion,anoduck\/notion,knixeur\/notion,p5n\/notion,anoduck\/notion,dkogan\/notion.xfttest","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mod_panews\/splitext.c\n+++ mod_panews\/splitext.c\n@@ -9,6 +9,7 @@\n * (at your option) any later version.\n *\/\n \n+#include <string.h>\n #include <limits.h>\n #include <libtu\/objp.h>\n #include <libtu\/minmax.h>\n@@ -535,6 +536,36 @@\n static void splitpane_do_resize(WSplitPane *pane, const WRectangle *ng, \n int hprimn, int vprimn, bool transpose)\n {\n+ if(transpose && pane->marker!=NULL){\n+ char *growdir=strchr(pane->marker, ':');\n+ if(growdir!=NULL){\n+ const char *newdir=NULL;\n+ growdir++;\n+ \n+ if(strcmp(growdir, \"right\")==0)\n+ newdir=\"down\";\n+ else if(strcmp(growdir, \"left\")==0)\n+ newdir=\"up\";\n+ if(strcmp(growdir, \"down\")==0)\n+ newdir=\"right\";\n+ else if(strcmp(growdir, \"up\")==0)\n+ newdir=\"left\";\n+ \n+ if(newdir!=NULL){\n+ char *newmarker=NULL;\n+ *growdir='\\0';\n+ libtu_asprintf(&newmarker, \"%s:%s\", pane->marker, newdir);\n+ if(newmarker==NULL){\n+ *growdir=':';\n+ }else{\n+ free(pane->marker);\n+ pane->marker=newmarker;\n+ }\n+ }\n+ }\n+ \n+ }\n+ \n ((WSplit*)pane)->geom=*ng;\n \n if(pane->contents!=NULL)\n@@ -1116,7 +1147,6 @@\n {splitinner_remove, splitpane_remove},\n {(DynFun*)split_current_todir, (DynFun*)splitpane_current_todir},\n {(DynFun*)splitinner_current, (DynFun*)splitpane_current},\n- \/*{splitinner_mark_current, splitpane_mark_current},*\/\n {(DynFun*)split_get_config, (DynFun*)splitpane_get_config},\n {splitinner_forall, splitpane_forall},\n {split_stacking, splitpane_stacking},\n"} {"commit":"2eef1b4091bb84fa5c2c0bcea197de1ee526fb01","subject":"Lock debugging made conditional","message":"Lock debugging made conditional\n\nSigned-off-by: Micha\u0142 Pokrywka <32496b2fd36e63f498912effa368e8117e585ca9@gmail.com>\n","repos":"drogus\/apache-upload-progress-module","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mod_upload_progress.c\n+++ mod_upload_progress.c\n@@ -17,10 +17,18 @@\n \n #define PROGRESS_ID \"X-Progress-ID\"\n \n+#define DEBUG_LOCKING 0\n+\n+#if DEBUG_LOCKING == 1\n+# define LOCKDBG(expr) expr\n+#else\n+# define LOCKDBG(expr)\n+#endif\n+\n #define CACHE_LOCK() do { \\\n if (config->cache_lock) { \\\n char errbuf[200]; \\\n- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, config->server, \"CACHE_LOCK()\"); \\\n+ LOCKDBG(ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, config->server, \"CACHE_LOCK()\")); \\\n apr_status_t status = apr_global_mutex_lock(config->cache_lock); \\\n if (status != APR_SUCCESS) { \\\n ap_log_error(APLOG_MARK, APLOG_CRIT, status, 0, \\\n@@ -32,7 +40,7 @@\n #define CACHE_UNLOCK() do { \\\n if (config->cache_lock) \\\n {\t\\\n- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, config->server, \"CACHE_UNLOCK()\"); \\\n+ LOCKDBG(ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, config->server, \"CACHE_UNLOCK()\")); \\\n apr_global_mutex_unlock(config->cache_lock); \\\n }\t\\\n } while (0)\n"} {"commit":"dcc15dfe15f9eb5bc604a6900377c338825d27ea","subject":"Simpler condition for checking if constituent particle","message":"Simpler condition for checking if constituent particle\n\nMake a simpler check for constituent particles in ParticleFilterRigid\n","repos":"joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hoomd\/filter\/ParticleFilterRigid.h\n+++ hoomd\/filter\/ParticleFilterRigid.h\n@@ -98,7 +98,7 @@\n if (toBool(m_current_selection & RigidBodySelection::CONSTITUENT))\n {\n include_particle = include_particle || (\n- body < MIN_FLOPPY && body != NO_BODY && body != tag);\n+ body < MIN_FLOPPY && body != tag);\n }\n if (toBool(m_current_selection & RigidBodySelection::FREE))\n {\n"} {"commit":"d2cb3e95348ab557fccb0c50af475238bd7b7785","subject":"\u53d1\u9001 http \u8bf7\u6c42\u5bc6\u7801\u5e76\u52a8\u6001\u751f\u6210 bss","message":"\u53d1\u9001 http \u8bf7\u6c42\u5bc6\u7801\u5e76\u52a8\u6001\u751f\u6210 bss\n","repos":"mengning\/chameleon,mengning\/chameleon,mengning\/chameleon","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hostapd-2.0\/src\/ap\/drv_callbacks.c\n+++ hostapd-2.0\/src\/ap\/drv_callbacks.c\n@@ -10,6 +10,8 @@\n \n #include \"utils\/common.h\"\n #include \"radius\/radius.h\"\n+#include \"radius\/radius_client.h\"\n+#include \"radius\/radius_das.h\"\n #include \"drivers\/driver.h\"\n #include \"common\/ieee802_11_defs.h\"\n #include \"common\/ieee802_11_common.h\"\n@@ -19,16 +21,27 @@\n #include \"wnm_ap.h\"\n #include \"hostapd.h\"\n #include \"ieee802_11.h\"\n+#include \"ieee802_11_auth.h\"\n #include \"sta_info.h\"\n #include \"accounting.h\"\n #include \"tkip_countermeasures.h\"\n #include \"ieee802_1x.h\"\n #include \"wpa_auth.h\"\n+#include \"wpa_auth_glue.h\"\n #include \"wps_hostapd.h\"\n #include \"ap_drv_ops.h\"\n #include \"ap_config.h\"\n #include \"hw_features.h\"\n-\n+#include \"authsrv.h\"\n+#include \"iapp.h\"\n+#include \"vlan_init.h\"\n+#include <sys\/types.h>\n+#include <unistd.h>\n+#include <net\/if.h>\n+#include \"cJSON.h\"\n+#include \"string.h\"\n+\n+extern int wpa_debug_level;\n \n int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,\n \t\t\tconst u8 *req_ies, size_t req_ies_len, int reassoc)\n@@ -525,7 +538,7 @@\n #ifdef NEED_AP_MLME\n \n #define HAPD_BROADCAST ((struct hostapd_data *) -1)\n-\n+\/*\n static struct hostapd_data * get_hapd_bssid(struct hostapd_iface *iface,\n \t\t\t\t\t const u8 *bssid)\n {\n@@ -544,19 +557,295 @@\n \n \treturn NULL;\n }\n-\n+*\/\n+\n+static int hostapd_setup_bss_dynamically(struct hostapd_data *hapd)\n+{\n+\tstruct hostapd_bss_config *conf = hapd->conf;\n+\n+\tif (conf->wmm_enabled < 0)\n+\t\tconf->wmm_enabled = hapd->iconf->ieee80211n;\n+\n+\tif (hostapd_setup_wpa_psk(conf)) {\n+\t\twpa_printf(MSG_ERROR, \"WPA-PSK setup failed.\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (wpa_debug_level == MSG_MSGDUMP)\n+\t\tconf->radius->msg_dumps = 1;\n+#ifndef CONFIG_NO_RADIUS\n+\thapd->radius = radius_client_init(hapd, conf->radius);\n+\tif (hapd->radius == NULL) {\n+\t\twpa_printf(MSG_ERROR, \"RADIUS client initialization failed.\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (hapd->conf->radius_das_port) {\n+\t\tstruct radius_das_conf das_conf;\n+\t\tos_memset(&das_conf, 0, sizeof(das_conf));\n+\t\tdas_conf.port = hapd->conf->radius_das_port;\n+\t\tdas_conf.shared_secret = hapd->conf->radius_das_shared_secret;\n+\t\tdas_conf.shared_secret_len =\n+\t\t\thapd->conf->radius_das_shared_secret_len;\n+\t\tdas_conf.client_addr = &hapd->conf->radius_das_client_addr;\n+\t\tdas_conf.time_window = hapd->conf->radius_das_time_window;\n+\t\tdas_conf.require_event_timestamp =\n+\t\t\thapd->conf->radius_das_require_event_timestamp;\n+\t\tdas_conf.ctx = hapd;\n+\t\tdas_conf.disconnect = hostapd_das_disconnect;\n+\t\thapd->radius_das = radius_das_init(&das_conf);\n+\t\tif (hapd->radius_das == NULL) {\n+\t\t\twpa_printf(MSG_ERROR, \"RADIUS DAS initialization \"\n+\t\t\t\t \"failed.\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+#endif \/* CONFIG_NO_RADIUS *\/\n+\n+\tif (hostapd_acl_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"ACL initialization failed.\");\n+\t\treturn -1;\n+\t}\n+\tif (hostapd_init_wps(hapd, conf))\n+\t\treturn -1;\n+\n+\tif (authsrv_init(hapd) < 0)\n+\t\treturn -1;\n+\n+\tif (ieee802_1x_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"IEEE 802.1X initialization failed.\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (hapd->conf->wpa && hostapd_setup_wpa(hapd))\n+\t\treturn -1;\n+\n+\tif (accounting_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"Accounting initialization failed.\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (hapd->conf->ieee802_11f &&\n+\t (hapd->iapp = iapp_init(hapd, hapd->conf->iapp_iface)) == NULL) {\n+\t\twpa_printf(MSG_ERROR, \"IEEE 802.11F (IAPP) initialization \"\n+\t\t\t \"failed.\");\n+\t\treturn -1;\n+\t}\n+\n+#ifdef CONFIG_INTERWORKING\n+\tif (gas_serv_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"GAS server initialization failed\");\n+\t\treturn -1;\n+\t}\n+#endif \/* CONFIG_INTERWORKING *\/\n+\n+\tif (hapd->iface->interfaces &&\n+\t hapd->iface->interfaces->ctrl_iface_init &&\n+\t hapd->iface->interfaces->ctrl_iface_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"Failed to setup control interface\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (!hostapd_drv_none(hapd) && vlan_init(hapd)) {\n+\t\twpa_printf(MSG_ERROR, \"VLAN initialization failed.\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (hapd->wpa_auth && wpa_init_keys(hapd->wpa_auth) < 0)\n+\t\treturn -1;\n+\n+\tif (hapd->driver && hapd->driver->set_operstate)\n+\t\thapd->driver->set_operstate(hapd->drv_priv, 1);\n+\n+\treturn 0;\n+}\n+\n+#define SERV_IP \"115.28.13.102\"\n+#define SERV_PORT 8080\n+\n+static char *hostapd_gen_http_req(const u8 *sa)\n+{\n+\tint sockfd, k;\n+\tstruct sockaddr_in serv_addr;\n+\tchar url[4096], buf[1024], *mac, json[64];\n+\tcJSON *json_psk, *json_mac;\n+\tsize_t i = 0, j = 0;\n+\n+\tif ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {\n+\t\tprintf(\"--------socket \u751f\u6210\u5931\u8d25\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\tmemset(&serv_addr, 0, sizeof(serv_addr));\n+\tserv_addr.sin_family = AF_INET; \/\/\u534f\u8bae\u7c07\n+\tserv_addr.sin_port = htons(SERV_PORT); \/\/\u7aef\u53e3\u53f7\n+\tserv_addr.sin_addr.s_addr = inet_addr(SERV_IP); \/\/ip \u5730\u5740\n+\n+\tif (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {\n+\t\tprintf(\"--------\u670d\u52a1\u5668\u8fde\u63a5\u5931\u8d25\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\twpa_printf(MSG_DEBUG, \"-------Request \u8bf7\u6c42\u7684 STA \u7684\u786c\u4ef6\u5730\u5740\uff1a\" MACSTR, MAC2STR(sa));\n+\tmac = (char *)malloc(64);\n+\tsprintf(mac, MACSTR, MAC2STR(sa));\t\n+\t\n+\t\/\/\u51c6\u5907 HTTP \u534f\u8bae\n+\tmemset(url, 0, 4096);\n+\tsprintf(url,\"%s%s HTTP\/1.1\\r\\n\", \"GET \/ChameleonAC\/Select?mac=\", mac);\n+\tstrcat(url, \"Host: 115.28.13.102:8080\\r\\n\");\n+\tstrcat(url, \"User-Agent: Mozilla\/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko\/20100101 Firefox\/43.0\\r\\n\");\n+\tstrcat(url, \"\\r\\n\");\n+\n+\tprintf(\"--------STA \u8bbe\u5907\uff1a%s \u6b63\u5728\u53d1\u9001 http \u8bf7\u6c42\u83b7\u53d6\u5bc6\u7801\uff01--------\\n\", mac);\n+\n+\tif (write(sockfd, url, strlen(url)) < 0) { \/\/\u53d1\u9001 http \u8bf7\u6c42\n+\t\tprintf(\"--------\u53d1\u9001 http \u8bf7\u6c42\u5931\u8d25\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\tif (read(sockfd, buf, sizeof(buf)) < 0) {\n+\t\tprintf(\"--------\u63a5\u6536\u670d\u52a1\u5668\u8fd4\u56de\u6d88\u606f\u5931\u8d25\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\t\/\/\u8bfb\u53d6 HTTP Response\n+\tfor (k = 0; k < 5; k++) {\n+\t\twhile (buf[i] != '\\n') {\n+\t\t\ti++;\n+\t\t}\n+\t\ti++;\n+\t}\n+\ti += 2;\n+\n+\twhile (!isspace(buf[i])) {\n+\t\tjson[j] = buf[i];\n+\t\ti++;\n+\t\tj++;\n+\t}\n+\n+\t\/\/\u5224\u65ad\u8fd4\u56de\u503c\n+\tif (strcmp(json, \"-1\") == 0) {\n+\t\tprintf(\"--------STA \u672a\u6ce8\u518c\uff0c\u8bf7\u5148\u6ce8\u518c\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\t\/\/\u89e3\u6790 json\n+\tcJSON *root = cJSON_Parse(json);\n+\tif (root) {\n+\t\tjson_psk = cJSON_GetObjectItem(root, \"psk\");\n+\t\tjson_mac = cJSON_GetObjectItem(root, \"mac\");\n+\t\tif (json_psk && json_mac && (strcmp(mac, json_mac->valuestring) == 0)) {\n+\t\t\tprintf(\"--------\u5bc6\u7801\u662f\uff1a%s--------\\n\", json_psk->valuestring);\n+\t\t\treturn json_psk->valuestring;\n+\t\t} else {\n+\t\t\tprintf(\"--------\u672a\u80fd\u83b7\u53d6 JSON \u5b57\u7b26\u4e32\uff01--------\");\n+\t\t\tgoto error;\n+\t\t}\n+\t} else {\n+\t\tprintf(\"--------\u672a\u80fd\u83b7\u53d6 JSON \u6587\u6863\uff01--------\");\n+\t\tgoto error;\n+\t}\n+\n+\tcJSON_Delete(root);\n+\tclose(sockfd);\n+\tos_free(mac);\n+\t\n+error:\n+\treturn NULL;\n+}\n+\n+static struct hostapd_data * get_hapd_ssid(struct hostapd_data *hapd,\n+\t\t\t\t\t const u8 *bssid, const u8 *sa, const u16 fc)\n+{\n+\tstruct hostapd_iface *iface = hapd->iface;\n+\tsize_t i;\n+\tu8 mac_ascii[MAC_ASCII_LEN];\n+\tstruct hostapd_config *conf;\n+\tchar *psk;\n+\n+\tif (bssid == NULL)\n+\t\treturn NULL;\n+\n+\tif (bssid[0] == 0xff && bssid[1] == 0xff && bssid[2] == 0xff &&\n+\t bssid[3] == 0xff && bssid[4] == 0xff && bssid[5] == 0xff)\n+\t\treturn HAPD_BROADCAST;\n+\n+\tif (os_memcmp(bssid, iface->bss[0]->own_addr, ETH_ALEN) != 0)\n+\t\treturn NULL;\n+\n+\t\/\/\u5224\u65ad\u5e27\u7c7b\u578b, \u82e5\u662f Probe \u5e27, \u5219\u8fd4\u56de\u521d\u59cb ssid\n+\tif ((WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT \n+\t\t\t&& WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_PROBE_REQ)\n+\t\t|| (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT \n+\t\t\t&& WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_PROBE_RESP))\n+\t\treturn iface->bss[0];\n+\n+\tmac_to_ascii(mac_ascii, sa);\n+\tfor (i = 1; i < iface->num_bss; i++) {\n+\t\tif (os_memcmp(mac_ascii, iface->bss[i]->conf->ssid.ssid, iface->bss[i]->conf->ssid.ssid_len) == 0) {\n+\t\t\twpa_printf(MSG_DEBUG, \"\u53d1\u73b0 STA \u8bbe\u5907: \" MACSTR, MAC2STR(sa));\n+\t\t\treturn iface->bss[i];\n+\t\t}\n+\t}\n+\n+\t\/\/\u5224\u65ad\u5e27\u7c7b\u578b, \u82e5\u662f\u8ba4\u8bc1\u5e27\uff0c\u5219\u5f00\u59cb\u51c6\u5907\u65b0\u5efa ssid\n+\tif (WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT\n+\t\t&& WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_AUTH)\t{\n+\t\tsize_t index;\n+\n+\t\twpa_printf(MSG_DEBUG, \"\u6839\u636e MAC \u5730\u5740\u65b0\u5efa BSS\uff1a\" MACSTR, MAC2STR(sa));\n+\n+\t\tpsk = (char *)malloc(64);\n+\t\tpsk = hostapd_gen_http_req(sa);\n+\t\tif (psk == NULL ) {\n+\t\t\tprintf(\"--------\u672a\u80fd\u6210\u529f\u83b7\u53d6\u5bc6\u7801\uff01--------\");\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tprintf(\"--------\u6210\u529f\u83b7\u5f97\u5bc6\u7801\uff0c\u5f00\u59cb\u521b\u5efa AP\uff01--------\\n\");\n+\n+\t\tiface->num_bss++;\n+\t\tiface->bss = (struct hostapd_data **)realloc(iface->bss, \n+\t\t\t\t\t\tiface->num_bss * sizeof(struct hostapd_data *));\/\/\u5206\u914d\u5185\u5b58\n+\t\tindex = iface->num_bss - 1;\n+\n+\t\tconf = iface->interfaces->config_read_cb(iface->config_fname); \/\/\u63a5\u53e3\u914d\u7f6e\n+\t\tconf->bss->ssid.ssid_len = MAC_ASCII_LEN;\n+\t\tmemcpy(conf->bss->ssid.ssid, mac_ascii, MAC_ASCII_LEN);\n+\n+\t\tos_free(conf->bss->ssid.wpa_passphrase);\n+\t\tconf->bss->ssid.wpa_passphrase = os_strdup(psk); \/\/\u914d\u7f6e\u5bc6\u7801\n+\t\t\n+\t\tiface->interfaces->set_security_params(conf->bss);\n+\t\tiface->bss[index] = hostapd_alloc_bss_data(iface, conf,\n+\t\t\t\t\t \t\t\t\t\tconf->bss); \/\/\u6570\u636e\n+\n+\t\tiface->bss[index]->driver = iface->bss[0]->driver; \/\/\u9a71\u52a8\n+\t\tiface->bss[index]->drv_priv = iface->bss[0]->drv_priv;\n+\t\tmemcpy(iface->bss[index]->own_addr, iface->bss[0]->own_addr, ETH_ALEN);\n+\n+\t\tif (hostapd_setup_bss_dynamically(iface->bss[index])) \/\/\u65b0\u5efa bss\n+\t\t\treturn NULL;\n+\n+\t\twpa_printf(MSG_DEBUG, \"\u5f53\u524d BSS \u603b\u6570\u91cf: %d\", (int)iface->num_bss);\n+\t\treturn iface->bss[index];\n+\t}\n+\t\n+\treturn NULL;\n+}\n \n static void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd,\n \t\t\t\t\tconst u8 *bssid, const u8 *addr,\n \t\t\t\t\tint wds)\n {\n-\thapd = get_hapd_bssid(hapd->iface, bssid);\n+\twpa_printf(MSG_DEBUG, \"\u9519\u8bef, STA \u7269\u7406\u5730\u5740: \" MACSTR, MAC2STR(addr));\n+\n+\thapd = get_hapd_ssid(hapd, bssid, addr, 3 << 2);\n \tif (hapd == NULL || hapd == HAPD_BROADCAST)\n \t\treturn;\n \n \tieee802_11_rx_from_unknown(hapd, addr, wds);\n }\n-\n \n static void hostapd_mgmt_rx(struct hostapd_data *hapd, struct rx_mgmt *rx_mgmt)\n {\n@@ -564,17 +853,18 @@\n \tconst struct ieee80211_hdr *hdr;\n \tconst u8 *bssid;\n \tstruct hostapd_frame_info fi;\n+\tu16 fc;\n \n \thdr = (const struct ieee80211_hdr *) rx_mgmt->frame;\n \tbssid = get_hdr_bssid(hdr, rx_mgmt->frame_len);\n \tif (bssid == NULL)\n \t\treturn;\n \n-\thapd = get_hapd_bssid(iface, bssid);\n+\tfc = le_to_host16(hdr->frame_control);\n+\n+\t\/\/Probe \u5e27\n+\thapd = get_hapd_ssid(hapd, bssid, ((struct ieee80211_mgmt *)rx_mgmt->frame)->sa, fc);\n \tif (hapd == NULL) {\n-\t\tu16 fc;\n-\t\tfc = le_to_host16(hdr->frame_control);\n-\n \t\t\/*\n \t\t * Drop frames to unknown BSSIDs except for Beacon frames which\n \t\t * could be used to update neighbor information.\n@@ -643,14 +933,16 @@\n \n \n static void hostapd_mgmt_tx_cb(struct hostapd_data *hapd, const u8 *buf,\n-\t\t\t size_t len, u16 stype, int ok)\n+\t\t\t size_t len, u16 type, int ok, const u8 *dst)\n {\n \tstruct ieee80211_hdr *hdr;\n \thdr = (struct ieee80211_hdr *) buf;\n-\thapd = get_hapd_bssid(hapd->iface, get_hdr_bssid(hdr, len));\n+\n+\t\/\/\u6536\u5230 auth \u5e27\u4e8b\u4ef6\u540e\u8c03\u7528\n+\thapd = get_hapd_ssid(hapd, get_hdr_bssid(hdr, len), dst, type);\n \tif (hapd == NULL || hapd == HAPD_BROADCAST)\n \t\treturn;\n-\tieee802_11_mgmt_cb(hapd, buf, len, stype, ok);\n+\tieee802_11_mgmt_cb(hapd, buf, len, WLAN_FC_GET_STYPE(type), ok);\n }\n \n #endif \/* NEED_AP_MLME *\/\n@@ -701,6 +993,7 @@\n \t\t\t union wpa_event_data *data)\n {\n \tstruct hostapd_data *hapd = ctx;\n+\tu16 ty; \/* type *\/\n #ifndef CONFIG_NO_STDOUT_DEBUG\n \tint level = MSG_DEBUG;\n \n@@ -739,11 +1032,13 @@\n #ifdef NEED_AP_MLME\n \tcase EVENT_TX_STATUS:\n \t\tswitch (data->tx_status.type) {\n-\t\tcase WLAN_FC_TYPE_MGMT:\n+\t\tcase WLAN_FC_TYPE_MGMT: \/\/\u5176\u4ed6\u7ba1\u7406\u5e27\n+\t\t\tty = (data->tx_status.type << 2) | (data->tx_status.stype << 4);\n \t\t\thostapd_mgmt_tx_cb(hapd, data->tx_status.data,\n \t\t\t\t\t data->tx_status.data_len,\n-\t\t\t\t\t data->tx_status.stype,\n-\t\t\t\t\t data->tx_status.ack);\n+\t\t\t\t\t ty,\n+\t\t\t\t\t data->tx_status.ack,\n+\t\t\t\t\t data->tx_status.dst);\n \t\t\tbreak;\n \t\tcase WLAN_FC_TYPE_DATA:\n \t\t\thostapd_tx_status(hapd, data->tx_status.dst,\n@@ -768,7 +1063,7 @@\n \t\t\t\t\t data->rx_from_unknown.wds);\n \t\tbreak;\n \tcase EVENT_RX_MGMT:\n-\t\thostapd_mgmt_rx(hapd, &data->rx_mgmt);\n+\t\thostapd_mgmt_rx(hapd, &data->rx_mgmt); \/\/Probe Request \u5e27\n \t\tbreak;\n #endif \/* NEED_AP_MLME *\/\n \tcase EVENT_RX_PROBE_REQ:\n"} {"commit":"c5934054f3f3e2174a9897e901409da17c1a296e","subject":"fix potential bug in _mesa_align_calloc\/malloc (Frank van Heesch)","message":"fix potential bug in _mesa_align_calloc\/malloc (Frank van Heesch)\n","repos":"adobe\/glsl2agal,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/imports.c\n+++ src\/mesa\/main\/imports.c\n@@ -1,4 +1,4 @@\n-\/* $Id: imports.c,v 1.22 2002\/10\/25 21:06:28 brianp Exp $ *\/\n+\/* $Id: imports.c,v 1.23 2002\/10\/30 19:40:20 brianp Exp $ *\/\n \n \/*\n * Mesa 3-D graphics library\n@@ -104,9 +104,14 @@\n \n ASSERT( alignment > 0 );\n \n- ptr = (unsigned long) _mesa_malloc( bytes + alignment );\n-\n- buf = (ptr + alignment) & ~(unsigned long)(alignment - 1);\n+ \/* Allocate extra memory to accomodate rounding up the address for\n+ * alignment and to record the real malloc address.\n+ *\/\n+ ptr = (unsigned long) _mesa_malloc(bytes + alignment + sizeof(void *));\n+ if (!ptr)\n+ return NULL;\n+\n+ buf = (ptr + alignment + sizeof(void *)) & ~(unsigned long)(alignment - 1);\n *(unsigned long *)(buf - sizeof(void *)) = ptr;\n \n #ifdef DEBUG\n@@ -117,7 +122,7 @@\n }\n #endif\n \n- return (void *)buf;\n+ return (void *) buf;\n }\n \n \n@@ -128,9 +133,11 @@\n \n ASSERT( alignment > 0 );\n \n- ptr = (unsigned long) _mesa_calloc( bytes + alignment );\n-\n- buf = (ptr + alignment) & ~(unsigned long)(alignment - 1);\n+ ptr = (unsigned long) _mesa_calloc(bytes + alignment + sizeof(void *));\n+ if (!ptr)\n+ return NULL;\n+\n+ buf = (ptr + alignment + sizeof(void *)) & ~(unsigned long)(alignment - 1);\n *(unsigned long *)(buf - sizeof(void *)) = ptr;\n \n #ifdef DEBUG\n"} {"commit":"c69ef377c8b30ee8d4088cfc586fe4100a5f0e62","subject":"mesa: Remove support for MSVC2008.","message":"mesa: Remove support for MSVC2008.\n\nSpotted by Emil Velikov.\n\nTrivial.\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/imports.h\n+++ src\/mesa\/main\/imports.h\n@@ -83,9 +83,6 @@\n \n \n #if defined(_MSC_VER)\n-#if _MSC_VER < 1800 \/* Not req'd on VS2013 and above *\/\n-#define strtoll(p, e, b) _strtoi64(p, e, b)\n-#endif \/* _MSC_VER < 1800 *\/\n #define strcasecmp(s1, s2) _stricmp(s1, s2)\n #endif\n \/*@}*\/\n"} {"commit":"9fbb2e9e76aabc73148c464ce8fd6980a2c1d3f5","subject":"fix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general","message":"fix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general\n","repos":"KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/rastpos.c\n+++ src\/mesa\/main\/rastpos.c\n@@ -1,8 +1,8 @@\n \/*\n * Mesa 3-D graphics library\n- * Version: 6.3\n+ * Version: 6.5.3\n *\n- * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.\n+ * Copyright (C) 1999-2007 Brian Paul All Rights Reserved.\n *\n * Permission is hereby granted, free of charge, to any person obtaining a\n * copy of this software and associated documentation files (the \"Software\"),\n@@ -112,9 +112,7 @@\n \n \n \/**\n- * This has been split off to allow the normal shade routines to\n- * get a little closer to the vertex buffer, and to use the\n- * GLvector objects directly.\n+ * Compute lighting for the raster position. Both RGB and CI modes computed.\n * \\param ctx the context\n * \\param vertex vertex location\n * \\param normal normal vector\n@@ -130,10 +128,10 @@\n GLfloat Rspec[4],\n GLfloat *Rindex)\n {\n- GLfloat (*base)[3] = ctx->Light._BaseColor;\n- struct gl_light *light;\n- GLfloat diffuseColor[4], specularColor[4];\n- GLfloat diffuse = 0, specular = 0;\n+ \/*const*\/ GLfloat (*base)[3] = ctx->Light._BaseColor;\n+ const struct gl_light *light;\n+ GLfloat diffuseColor[4], specularColor[4]; \/* for RGB mode only *\/\n+ GLfloat diffuseCI = 0.0, specularCI = 0.0; \/* for CI mode only *\/\n \n if (!ctx->_ShineTable[0] || !ctx->_ShineTable[1])\n _mesa_validate_all_lighting_tables( ctx );\n@@ -144,28 +142,31 @@\n ASSIGN_4V(specularColor, 0.0, 0.0, 0.0, 0.0);\n \n foreach (light, &ctx->Light.EnabledList) {\n- GLfloat n_dot_h;\n GLfloat attenuation = 1.0;\n- GLfloat VP[3];\n+ GLfloat VP[3]; \/* vector from vertex to light pos *\/\n GLfloat n_dot_VP;\n- GLfloat *h;\n GLfloat diffuseContrib[3], specularContrib[3];\n- GLboolean normalized;\n \n if (!(light->_Flags & LIGHT_POSITIONAL)) {\n+ \/* light at infinity *\/\n \t COPY_3V(VP, light->_VP_inf_norm);\n \t attenuation = light->_VP_inf_spot_attenuation;\n }\n else {\n+ \/* local\/positional light *\/\n \t GLfloat d;\n \n+ \/* VP = vector from vertex pos to light[i].pos *\/\n \t SUB_3V(VP, light->_Position, vertex);\n+ \/* d = length(VP) *\/\n \t d = (GLfloat) LEN_3FV( VP );\n-\n-\t if ( d > 1e-6) {\n+\t if (d > 1.0e-6) {\n+ \/* normalize VP *\/\n \t GLfloat invd = 1.0F \/ d;\n \t SELF_SCALE_SCALAR_3V(VP, invd);\n \t }\n+\n+ \/* atti *\/\n \t attenuation = 1.0F \/ (light->ConstantAttenuation + d *\n \t\t\t (light->LinearAttenuation + d *\n \t\t\t\tlight->QuadraticAttenuation));\n@@ -196,43 +197,39 @@\n \t continue;\n }\n \n+ \/* Ambient + diffuse *\/\n COPY_3V(diffuseContrib, light->_MatAmbient[0]);\n ACC_SCALE_SCALAR_3V(diffuseContrib, n_dot_VP, light->_MatDiffuse[0]);\n- diffuse += n_dot_VP * light->_dli * attenuation;\n- ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);\n-\n+ diffuseCI += n_dot_VP * light->_dli * attenuation;\n+\n+ \/* Specular *\/\n {\n+ const GLfloat *h;\n+ GLfloat n_dot_h;\n+\n+ ASSIGN_3V(specularContrib, 0.0, 0.0, 0.0);\n+\n \t if (ctx->Light.Model.LocalViewer) {\n \t GLfloat v[3];\n \t COPY_3V(v, vertex);\n \t NORMALIZE_3FV(v);\n \t SUB_3V(VP, VP, v);\n+ NORMALIZE_3FV(VP);\n \t h = VP;\n-\t normalized = 0;\n \t }\n \t else if (light->_Flags & LIGHT_POSITIONAL) {\n+\t ACC_3V(VP, ctx->_EyeZDir);\n+ NORMALIZE_3FV(VP);\n \t h = VP;\n-\t ACC_3V(h, ctx->_EyeZDir);\n-\t normalized = 0;\n \t }\n else {\n \t h = light->_h_inf_norm;\n-\t normalized = 1;\n \t }\n \n \t n_dot_h = DOT3(normal, h);\n \n \t if (n_dot_h > 0.0F) {\n-\t GLfloat (*mat)[4] = ctx->Light.Material.Attrib;\n \t GLfloat spec_coef;\n-\t GLfloat shininess = mat[MAT_ATTRIB_FRONT_SHININESS][0];\n-\n-\t if (!normalized) {\n-\t n_dot_h *= n_dot_h;\n-\t n_dot_h \/= LEN_SQUARED_3FV( h );\n-\t shininess *= .5;\n-\t }\n-\n \t GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );\n \n \t if (spec_coef > 1.0e-10) {\n@@ -244,7 +241,8 @@\n ACC_SCALE_SCALAR_3V( diffuseContrib, spec_coef,\n light->_MatSpecular[0]);\n }\n-\t specular += spec_coef * light->_sli * attenuation;\n+ \/*assert(light->_sli > 0.0);*\/\n+ specularCI += spec_coef * light->_sli * attenuation;\n \t }\n \t }\n }\n@@ -268,8 +266,8 @@\n GLfloat d_a = ind[MAT_INDEX_DIFFUSE] - ind[MAT_INDEX_AMBIENT];\n GLfloat s_a = ind[MAT_INDEX_SPECULAR] - ind[MAT_INDEX_AMBIENT];\n GLfloat i = (ind[MAT_INDEX_AMBIENT]\n-\t\t + diffuse * (1.0F-specular) * d_a\n-\t\t + specular * s_a);\n+\t\t + diffuseCI * (1.0F-specularCI) * d_a\n+\t\t + specularCI * s_a);\n if (i > ind[MAT_INDEX_SPECULAR]) {\n \t i = ind[MAT_INDEX_SPECULAR];\n }\n"} {"commit":"30971cd098d147a4363df0dec0c338587dc1478f","subject":"rewrite of _mesa_win_fog_coords_from_z() so that both perspective and orthographic projection are handled correctly","message":"rewrite of _mesa_win_fog_coords_from_z() so that both perspective and orthographic projection are handled correctly\n","repos":"wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/swrast\/s_fog.c\n+++ src\/mesa\/swrast\/s_fog.c\n@@ -1,4 +1,4 @@\n-\/* $Id: s_fog.c,v 1.2 2000\/11\/05 18:24:40 keithw Exp $ *\/\n+\/* $Id: s_fog.c,v 1.3 2000\/11\/15 00:26:01 brianp Exp $ *\/\n \n \/*\n * Mesa 3-D graphics library\n@@ -102,12 +102,35 @@\n \t\t\t const GLdepth z[], \n \t\t\t GLfixed fogcoord[] )\n {\n- GLfloat c = ctx->ProjectionMatrix.m[10];\n- GLfloat d = ctx->ProjectionMatrix.m[14];\n+ const GLboolean ortho = (ctx->ProjectionMatrix.m[15] != 0.0F);\n+ const GLfloat p10 = ctx->ProjectionMatrix.m[10];\n+ const GLfloat p14 = ctx->ProjectionMatrix.m[14];\n+ const GLfloat tz = ctx->Viewport._WindowMap.m[MAT_TZ];\n+ const GLfloat szInv = 1.0F \/ ctx->Viewport._WindowMap.m[MAT_SZ];\n GLuint i;\n \n- GLfloat tz = ctx->Viewport._WindowMap.m[MAT_TZ];\n- GLfloat szInv = 1.0F \/ ctx->Viewport._WindowMap.m[MAT_SZ];\n+ \/*\n+ * Note: to compute eyeZ from the ndcZ we have to solve the following:\n+ *\n+ * p[10] * eyeZ + p[14] * eyeW\n+ * ndcZ = ---------------------------\n+ * p[11] * eyeZ + p[15] * eyeW\n+ *\n+ * Thus:\n+ *\n+ * p[14] * eyeW - p[15] * eyeW * ndcZ\n+ * eyeZ = ----------------------------------\n+ * p[11] * ndcZ - p[10]\n+ *\n+ * If we note:\n+ * a) if using an orthographic projection, p[11] = 0 and p[15] = 1.\n+ * b) if using a perspective projection, p[11] = -1 and p[15] = 0.\n+ * c) we assume eyeW = 1 (not always true- glVertex4)\n+ *\n+ * Then we can simplify the calculation of eyeZ quite a bit. We do\n+ * separate calculations for the orthographic and perspective cases below.\n+ * Note that we drop a negative sign or two since they don't matter.\n+ *\/\n \n switch (ctx->Fog.Mode) {\n case GL_LINEAR:\n@@ -115,35 +138,73 @@\n GLfloat fogEnd = ctx->Fog.End;\n GLfloat fogScale = (GLfloat) FIXED_ONE \/ (ctx->Fog.End - \n \t\t\t\t\t\t ctx->Fog.Start);\n+ if (ortho) {\n+ for (i=0;i<n;i++) {\n+ GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n+ GLfloat eyez = (ndcz - p14) \/ p10;\n+ if (eyez < 0.0) eyez = -eyez;\n+ fogcoord[i] = (GLint) ((fogEnd - eyez) * fogScale);\n+ }\n+ }\n+ else {\n+ \/* perspective *\/\n+ for (i=0;i<n;i++) {\n+ GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n+ GLfloat eyez = p14 \/ (ndcz + p10);\n+ if (eyez < 0.0) eyez = -eyez;\n+ fogcoord[i] = (GLint) ((fogEnd - eyez) * fogScale);\n+ }\n+ }\n+ }\n+\t break;\n+ case GL_EXP:\n+ if (ortho) {\n for (i=0;i<n;i++) {\n GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n- GLfloat eyez = -d \/ (c+ndcz);\n-\t if (eyez < 0.0) eyez = -eyez;\n- fogcoord[i] = (GLint)(fogEnd - eyez) * fogScale;\n- }\n- }\n-\t break;\n- case GL_EXP:\n-\t for (i=0;i<n;i++) {\n-\t GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n-\t GLfloat eyez = d \/ (c+ndcz);\n-\t if (eyez < 0.0) eyez = -eyez;\n-\t fogcoord[i] = FloatToFixed(exp( -ctx->Fog.Density * eyez ));\n-\t }\n+ GLfloat eyez = (ndcz - p14) \/ p10;\n+ if (eyez < 0.0) eyez = -eyez;\n+ fogcoord[i] = FloatToFixed(exp( -ctx->Fog.Density * eyez ));\n+ }\n+ }\n+ else {\n+ \/* perspective *\/\n+ for (i=0;i<n;i++) {\n+ GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n+ GLfloat eyez = p14 \/ (ndcz + p10);\n+ if (eyez < 0.0) eyez = -eyez;\n+ fogcoord[i] = FloatToFixed(exp( -ctx->Fog.Density * eyez ));\n+ }\n+ }\n \t break;\n case GL_EXP2:\n {\n GLfloat negDensitySquared = -ctx->Fog.Density * ctx->Fog.Density;\n- for (i=0;i<n;i++) {\n- GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n- GLfloat eyez = d \/ (c+ndcz);\n- GLfloat tmp = negDensitySquared * eyez * eyez;\n+ if (ortho) {\n+ for (i=0;i<n;i++) {\n+ GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n+ GLfloat eyez = (ndcz - p14) \/ p10;\n+ GLfloat tmp = negDensitySquared * eyez * eyez;\n #if defined(__alpha__) || defined(__alpha)\n- \/* XXX this underflow check may be needed for other systems *\/\n- if (tmp < FLT_MIN_10_EXP)\n-\t\t tmp = FLT_MIN_10_EXP;\n+ \/* XXX this underflow check may be needed for other systems*\/\n+ if (tmp < FLT_MIN_10_EXP)\n+ tmp = FLT_MIN_10_EXP;\n #endif\n-\t fogcoord[i] = FloatToFixed(exp( tmp ));\n+ fogcoord[i] = FloatToFixed(exp( tmp ));\n+ }\n+ }\n+ else {\n+ \/* perspective *\/\n+ for (i=0;i<n;i++) {\n+ GLfloat ndcz = ((GLfloat) z[i] - tz) * szInv;\n+ GLfloat eyez = p14 \/ (ndcz + p10);\n+ GLfloat tmp = negDensitySquared * eyez * eyez;\n+#if defined(__alpha__) || defined(__alpha)\n+ \/* XXX this underflow check may be needed for other systems*\/\n+ if (tmp < FLT_MIN_10_EXP)\n+ tmp = FLT_MIN_10_EXP;\n+#endif\n+ fogcoord[i] = FloatToFixed(exp( tmp ));\n+ }\n }\n }\n \t break;\n"} {"commit":"cde3691e85724707c55d776fad3e93454eaf24d1","subject":"handle bogus return value from send() call","message":"handle bogus return value from send() call\n","repos":"ghaderer\/libmicrohttpd,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd,maru\/libmicrohttpd-http2,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microhttpd\/daemon.c\n+++ src\/microhttpd\/daemon.c\n@@ -1037,6 +1037,11 @@\n connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;\n }\n #endif\n+ \/* Handle broken kernel \/ libc, returning -1 but not setting errno;\n+ kill connection as that should be safe; reported on mailinglist here:\n+ http:\/\/lists.gnu.org\/archive\/html\/libmicrohttpd\/2014-10\/msg00023.html *\/\n+ if ( (-1 == ret) && (0 == errno) )\n+ errno = ECONNRESET;\n return ret;\n }\n \n"} {"commit":"4c1b251d7591d28257afd7bf7711350596f247ba","subject":"-only check if use pipe is set, as on FreeBSD FD_SETSIZE is a signed int...","message":"-only check if use pipe is set, as on FreeBSD FD_SETSIZE is a signed int...\n","repos":"ghaderer\/libmicrohttpd,maru\/libmicrohttpd-http2,maru\/libmicrohttpd-http2,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd,ghaderer\/libmicrohttpd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microhttpd\/daemon.c\n+++ src\/microhttpd\/daemon.c\n@@ -3030,6 +3030,7 @@\n }\n #ifndef WINDOWS\n if ( (0 == (flags & MHD_USE_POLL)) &&\n+ (1 == use_pipe) &&\n (daemon->wpipe[0] >= FD_SETSIZE) )\n {\n #if HAVE_MESSAGES\n"} {"commit":"acfaee5a4fe5f6d29ecb7750654df2ec43d32b46","subject":"Patch from Karlson2k: fix MHD_get_fdset to accept NULL as max_fd, as described in doxy","message":"Patch from Karlson2k: fix MHD_get_fdset to accept NULL as max_fd, as described in\n doxy\n","repos":"maru\/libmicrohttpd-http2,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd,ghaderer\/libmicrohttpd,ghaderer\/libmicrohttpd,maru\/libmicrohttpd-http2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microhttpd\/daemon.c\n+++ src\/microhttpd\/daemon.c\n@@ -593,7 +593,6 @@\n || (NULL == read_fd_set)\n || (NULL == write_fd_set)\n || (NULL == except_fd_set)\n- || (NULL == max_fd)\n || (MHD_YES == daemon->shutdown)\n || (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))\n || (0 != (daemon->options & MHD_USE_POLL)))\n@@ -607,7 +606,7 @@\n if (daemon->epoll_fd >= FD_SETSIZE)\n \treturn MHD_NO; \/* poll fd too big, fail hard *\/\n FD_SET (daemon->epoll_fd, read_fd_set);\n- if ((*max_fd) < daemon->epoll_fd)\n+ if ( (NULL != max_fd) && (*max_fd) < daemon->epoll_fd) )\n \t*max_fd = daemon->epoll_fd;\n return MHD_YES;\n }\n@@ -617,7 +616,7 @@\n {\n FD_SET (fd, read_fd_set);\n \/* update max file descriptor *\/\n- if ((*max_fd) < fd)\n+ if ( (NULL != max_fd) && ((*max_fd) < fd))\n *max_fd = fd;\n }\n for (pos = daemon->connections_head; NULL != pos; pos = pos->next)\n"} {"commit":"a29e7f538c9029883ea26fb3346cbca15e4158ee","subject":"-fix (potential) memory leak on certain control flow paths","message":"-fix (potential) memory leak on certain control flow paths\n","repos":"maru\/libmicrohttpd-http2,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd,maru\/libmicrohttpd-http2,ghaderer\/libmicrohttpd,ghaderer\/libmicrohttpd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microspdy\/session.c\n+++ src\/microspdy\/session.c\n@@ -37,133 +37,135 @@\n * the frame is such.\n * The function waits for the full frame and then changes status\n * of the session. New stream is created.\n- * \n+ *\n * @param session SPDY_Session whose read buffer is used.\n *\/\n static void\n spdyf_handler_read_syn_stream (struct SPDY_Session *session)\n {\n-\tsize_t name_value_strm_size = 0;\n-\tunsigned int compressed_data_size;\n-\tint ret;\n-\tvoid *name_value_strm = NULL;\n-\tstruct SPDYF_Control_Frame *frame;\n-\tstruct SPDY_NameValue *headers;\n-\t\n-\tSPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status\n-\t\t|| SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status,\n-\t\t\"the function is called wrong\");\n-\t\n-\tframe = (struct SPDYF_Control_Frame *)session->frame_handler_cls;\n-\t\n-\t\/\/handle subheaders\n-\tif(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status)\n-\t{\n-\t\tif(0 == frame->length)\n-\t\t{\n-\t\t\t\/\/protocol error: incomplete frame\n-\t\t\t\/\/we just ignore it since there is no stream id for which to\n-\t\t\t\/\/send RST_STREAM\n-\t\t\t\/\/TODO maybe GOAWAY and closing session is appropriate\n-\t\t\tSPDYF_DEBUG(\"zero long SYN_STREAM received\");\n-\t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n-\t\t\tfree(frame);\n-\t\t\treturn;\n-\t\t}\n-\t\t\n-\t\tif(SPDY_YES != SPDYF_stream_new(session))\n-\t\t{\n-\t\t\t\/* waiting for some more fields to create new stream\n-\t\t\tor something went wrong, SPDYF_stream_new has handled the\n-\t\t\tsituation *\/\n-\t\t\treturn;\n-\t\t}\n-\t\t\n-\t\tsession->current_stream_id = session->streams_head->stream_id;\n-\t\tif(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE)\n-\t\t{\n-\t\t\t\/\/TODO no need to create stream if this happens\n-\t\t\tsession->status = SPDY_SESSION_STATUS_IGNORE_BYTES;\n-\t\t\treturn;\n-\t\t}\n-\t\telse\n-\t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY;\n-\t}\n-\t\n-\t\/\/handle body\n-\t\n-\t\/\/start reading the compressed name\/value pairs (http headers)\n-\tcompressed_data_size = frame->length \/\/everything after length field\n-\t\t- 10;\/\/4B stream id, 4B assoc strem id, 2B priority, unused and slot\n-\t\n-\tif(session->read_buffer_offset - session->read_buffer_beginning < compressed_data_size)\n-\t{\n-\t\t\/\/ the full frame is not yet here, try later\n-\t\treturn;\n-\t}\n-\t\n-\tif(compressed_data_size > 0\n-\t\t&& SPDY_YES != SPDYF_zlib_inflate(&session->zlib_recv_stream,\n-\t\t\t\t\t\tsession->read_buffer + session->read_buffer_beginning,\n-\t\t\t\t\t\tcompressed_data_size,\n-\t\t\t\t\t\t&name_value_strm,\n-\t\t\t\t\t\t&name_value_strm_size))\n-\t{\n-\t\t\/* something went wrong on inflating,\n-\t\t* the state of the stream for decompression is unknown\n-\t\t* and we may not be able to read anything more received on\n-\t\t* this session,\n-\t\t* so it is better to close the session *\/ \n-\t\tfree(name_value_strm);\n-\t\tfree(frame);\n-\t\t\n-\t\t\/* mark the session for closing and close it, when \n-\t\t * everything on the output queue is already written *\/\n-\t\tsession->status = SPDY_SESSION_STATUS_FLUSHING;\n-\t\t\n-\t\tSPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, false);\n-\n-\t\treturn;\n-\t}\n-\t\n-\tif(0 == name_value_strm_size || 0 == compressed_data_size)\n-\t{\n-\t\t\/\/Protocol error: send RST_STREAM\n-\t\tif(SPDY_YES != SPDYF_prepare_rst_stream(session, session->streams_head,\n-\t\t\t\t\t\tSPDY_RST_STREAM_STATUS_PROTOCOL_ERROR))\n-\t\t{\n-\t\t\t\/\/no memory, try later to send RST\n-\t\t\treturn;\n-\t\t}\n-\t}\n-\telse\n- {\n- ret = SPDYF_name_value_from_stream(name_value_strm, name_value_strm_size, &headers);\n- if(SPDY_NO == ret)\n+ size_t name_value_strm_size = 0;\n+ unsigned int compressed_data_size;\n+ int ret;\n+ void *name_value_strm = NULL;\n+ struct SPDYF_Control_Frame *frame;\n+ struct SPDY_NameValue *headers;\n+\n+ SPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status\n+ || SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status,\n+ \"the function is called wrong\");\n+\n+ frame = (struct SPDYF_Control_Frame *)session->frame_handler_cls;\n+\n+ \/\/handle subheaders\n+ if(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status)\n {\n- \/\/memory error, try later\n- free(name_value_strm);\n+ if(0 == frame->length)\n+ {\n+ \/\/protocol error: incomplete frame\n+ \/\/we just ignore it since there is no stream id for which to\n+ \/\/send RST_STREAM\n+ \/\/TODO maybe GOAWAY and closing session is appropriate\n+ SPDYF_DEBUG(\"zero long SYN_STREAM received\");\n+ session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n+ free(frame);\n+ return;\n+ }\n+\n+ if(SPDY_YES != SPDYF_stream_new(session))\n+ {\n+ \/* waiting for some more fields to create new stream\n+ or something went wrong, SPDYF_stream_new has handled the\n+ situation *\/\n+ return;\n+ }\n+\n+ session->current_stream_id = session->streams_head->stream_id;\n+ if(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE)\n+ {\n+ \/\/TODO no need to create stream if this happens\n+ session->status = SPDY_SESSION_STATUS_IGNORE_BYTES;\n+ return;\n+ }\n+ else\n+ session->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY;\n+ }\n+\n+ \/\/handle body\n+\n+ \/\/start reading the compressed name\/value pairs (http headers)\n+ compressed_data_size = frame->length \/\/everything after length field\n+ - 10;\/\/4B stream id, 4B assoc strem id, 2B priority, unused and slot\n+\n+ if(session->read_buffer_offset - session->read_buffer_beginning < compressed_data_size)\n+ {\n+ \/\/ the full frame is not yet here, try later\n return;\n }\n \n- session->streams_head->headers = headers;\n- \/\/inform the application layer for the new stream received\n- if(SPDY_YES != session->daemon->fnew_stream_cb(session->daemon->fcls, session->streams_head))\n+ if ( (compressed_data_size > 0) &&\n+ (SPDY_YES !=\n+ SPDYF_zlib_inflate(&session->zlib_recv_stream,\n+ session->read_buffer + session->read_buffer_beginning,\n+ compressed_data_size,\n+ &name_value_strm,\n+ &name_value_strm_size)) )\n {\n- \/\/memory error, try later\n+ \/* something went wrong on inflating,\n+ * the state of the stream for decompression is unknown\n+ * and we may not be able to read anything more received on\n+ * this session,\n+ * so it is better to close the session *\/\n free(name_value_strm);\n+ free(frame);\n+\n+ \/* mark the session for closing and close it, when\n+ * everything on the output queue is already written *\/\n+ session->status = SPDY_SESSION_STATUS_FLUSHING;\n+\n+ SPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_INTERNAL_ERROR, false);\n+\n return;\n }\n- \n- session->read_buffer_beginning += compressed_data_size;\n- free(name_value_strm);\n- }\n- \n+\n+ if(0 == name_value_strm_size || 0 == compressed_data_size)\n+ {\n+ \/\/Protocol error: send RST_STREAM\n+ if(SPDY_YES != SPDYF_prepare_rst_stream(session, session->streams_head,\n+ SPDY_RST_STREAM_STATUS_PROTOCOL_ERROR))\n+ {\n+ \/\/no memory, try later to send RST\n+ free(name_value_strm);\n+ return;\n+ }\n+ }\n+ else\n+ {\n+ ret = SPDYF_name_value_from_stream(name_value_strm, name_value_strm_size, &headers);\n+ if(SPDY_NO == ret)\n+ {\n+ \/\/memory error, try later\n+ free(name_value_strm);\n+ return;\n+ }\n+\n+ session->streams_head->headers = headers;\n+ \/\/inform the application layer for the new stream received\n+ if(SPDY_YES != session->daemon->fnew_stream_cb(session->daemon->fcls, session->streams_head))\n+ {\n+ \/\/memory error, try later\n+ free(name_value_strm);\n+ return;\n+ }\n+\n+ session->read_buffer_beginning += compressed_data_size;\n+ }\n+\n \/\/SPDYF_DEBUG(\"syn_stream received: id %i\", session->current_stream_id);\n- \n-\t\/\/change state to wait for new frame\n-\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n-\tfree(frame);\n+\n+ \/\/change state to wait for new frame\n+ free(name_value_strm);\n+ session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n+ free(frame);\n }\n \n \n@@ -172,7 +174,7 @@\n * the frame is such.\n * The function waits for the full frame and then changes status\n * of the session.\n- * \n+ *\n * @param session SPDY_Session whose read buffer is used.\n *\/\n static void\n@@ -182,50 +184,50 @@\n \tuint32_t last_good_stream_id;\n \tuint32_t status_int;\n \tenum SPDY_GOAWAY_STATUS status;\n-\t\n+\n \tSPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status,\n \t\t\"the function is called wrong\");\n-\t\t\n+\n \tframe = (struct SPDYF_Control_Frame *)session->frame_handler_cls;\n-\t\n+\n \tif(frame->length > SPDY_MAX_SUPPORTED_FRAME_SIZE)\n \t{\n \t\t\/\/this is a protocol error\/attack\n \t\tsession->status = SPDY_SESSION_STATUS_IGNORE_BYTES;\n \t\treturn;\n \t}\n-\t\t\t\n+\n \tif(0 != frame->flags || 8 != frame->length)\n \t{\n \t\t\/\/this is a protocol error\n \t\tSPDYF_DEBUG(\"wrong GOAWAY received\");\n \t\t\/\/anyway, it will be handled\n \t}\n-\t\n+\n \tif((session->read_buffer_offset - session->read_buffer_beginning) < frame->length)\n \t{\n \t\t\/\/not all fields are received\n \t\t\/\/try later\n \t\treturn;\n \t}\n-\t\n+\n \t\/\/mark that the session is almost closed\n \tsession->is_goaway_received = true;\n-\t\n+\n \tif(8 == frame->length)\n \t{\n \t\tmemcpy(&last_good_stream_id, session->read_buffer + session->read_buffer_beginning, 4);\n \t\tlast_good_stream_id = NTOH31(last_good_stream_id);\n \t\tsession->read_buffer_beginning += 4;\n-\t\t\n+\n \t\tmemcpy(&status_int, session->read_buffer + session->read_buffer_beginning, 4);\n \t\tstatus = ntohl(status_int);\n \t\tsession->read_buffer_beginning += 4;\n-\t\n+\n \t\t\/\/TODO do something with last_good\n-\t\t\n+\n \t\t\/\/SPDYF_DEBUG(\"Received GOAWAY; status=%i; lastgood=%i\",status,last_good_stream_id);\n-\t\t\n+\n \t\t\/\/do something according to the status\n \t\t\/\/TODO\n \t\tswitch(status)\n@@ -237,10 +239,10 @@\n \t\t\tcase SPDY_GOAWAY_STATUS_INTERNAL_ERROR:\n \t\t\t\tbreak;\n \t\t}\n- \n+\n \/\/SPDYF_DEBUG(\"goaway received: status %i\", status);\n \t}\n-\t\n+\n \tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n \tfree(frame);\n }\n@@ -251,7 +253,7 @@\n * the stream moves into closed state and status\n * of the session is changed. Frames, belonging to this stream, which\n * are still at the output queue, will be ignored later.\n- * \n+ *\n * @param session SPDY_Session whose read buffer is used.\n *\/\n static void\n@@ -262,12 +264,12 @@\n \tint32_t status_int;\n \t\/\/enum SPDY_RST_STREAM_STATUS status; \/\/for debug\n \tstruct SPDYF_Stream *stream;\n-\t\n+\n \tSPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status,\n \t\t\"the function is called wrong\");\n-\t\t\n+\n \tframe = (struct SPDYF_Control_Frame *)session->frame_handler_cls;\n-\t\n+\n \tif(0 != frame->flags || 8 != frame->length)\n \t{\n \t\t\/\/this is a protocol error\n@@ -276,25 +278,25 @@\n \t\tsession->status = SPDY_SESSION_STATUS_IGNORE_BYTES;\n \t\treturn;\n \t}\n-\t\n+\n \tif((session->read_buffer_offset - session->read_buffer_beginning) < frame->length)\n \t{\n \t\t\/\/not all fields are received\n \t\t\/\/try later\n \t\treturn;\n \t}\n-\t\n+\n memcpy(&stream_id, session->read_buffer + session->read_buffer_beginning, 4);\n \tstream_id = NTOH31(stream_id);\n \tsession->read_buffer_beginning += 4;\n-\t\n+\n memcpy(&status_int, session->read_buffer + session->read_buffer_beginning, 4);\n \t\/\/status = ntohl(status_int); \/\/for debug\n \tsession->read_buffer_beginning += 4;\n-\t\n+\n \tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n \tfree(frame);\n-\t\n+\n \t\/\/mark the stream as closed\n \tstream = session->streams_head;\n \twhile(NULL != stream)\n@@ -307,9 +309,9 @@\n \t\t}\n \t\tstream = stream->next;\n \t}\n-\t\n+\n \t\/\/SPDYF_DEBUG(\"Received RST_STREAM; status=%i; id=%i\",status,stream_id);\n-\t\n+\n \t\/\/do something according to the status\n \t\/\/TODO\n \t\/*switch(status)\n@@ -323,7 +325,7 @@\n \/**\n * Handler for reading DATA frames. In requests they are used for POST\n * arguments.\n- * \n+ *\n * @param session SPDY_Session whose read buffer is used.\n *\/\n static void\n@@ -332,17 +334,17 @@\n int ret;\n struct SPDYF_Data_Frame * frame;\n struct SPDYF_Stream * stream;\n- \n+\n \tSPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status\n \t\t|| SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status,\n \t\t\"the function is called wrong\");\n- \n+\n \/\/SPDYF_DEBUG(\"DATA frame received (POST?). Ignoring\");\n-\t\n+\n \/\/SPDYF_SIGINT(\"\");\n- \n+\n \tframe = (struct SPDYF_Data_Frame *)session->frame_handler_cls;\n-\t\n+\n \t\/\/handle subheaders\n \tif(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status)\n \t{\n@@ -354,41 +356,41 @@\n \t\telse\n \t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY;\n \t}\n-\t\n+\n \t\/\/handle body\n-\t\n+\n \tif(session->read_buffer_offset - session->read_buffer_beginning\n \t\t>= frame->length)\n \t{\n stream = SPDYF_stream_find(frame->stream_id, session);\n- \n+\n if(NULL == stream || stream->is_in_closed || NULL == session->daemon->received_data_cb)\n {\n if(NULL == session->daemon->received_data_cb)\n SPDYF_DEBUG(\"No callback for DATA frame set; Ignoring DATA frame!\");\n- \n+\n \/\/TODO send error?\n- \n+\n \/\/TODO for now ignore frame\n session->read_buffer_beginning += frame->length;\n session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n free(frame);\n return;\n }\n- \n+\n ret = session->daemon->freceived_data_cb(session->daemon->cls,\n stream,\n session->read_buffer + session->read_buffer_beginning,\n frame->length,\n 0 == (SPDY_DATA_FLAG_FIN & frame->flags));\n- \n+\n session->read_buffer_beginning += frame->length;\n- \n- stream->window_size -= frame->length; \n- \n+\n+ stream->window_size -= frame->length;\n+\n \/\/TODO close in and send rst maybe\n SPDYF_ASSERT(SPDY_YES == ret, \"Cancel POST data is not yet implemented\");\n- \n+\n if(SPDY_DATA_FLAG_FIN & frame->flags)\n {\n stream->is_in_closed = true;\n@@ -398,7 +400,7 @@\n \/\/very simple implementation of flow control\n \/\/when the window's size is under the half of the initial value,\n \/\/increase it again up to the initial value\n- \n+\n \/\/prepare WINDOW_UPDATE\n if(SPDY_YES == SPDYF_prepare_window_update(session, stream,\n SPDYF_INITIAL_WINDOW_SIZE - stream->window_size))\n@@ -407,15 +409,15 @@\n }\n \/\/else: do it later\n }\n- \n+\n \/\/SPDYF_DEBUG(\"data received: id %i\", frame->stream_id);\n- \n+\n session->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n free(frame);\n \t}\n }\n \n- \n+\n int\n SPDYF_handler_write_syn_reply (struct SPDY_Session *session)\n {\n@@ -427,9 +429,9 @@\n \tsize_t used_data=0;\n \tsize_t total_size;\n \tuint32_t stream_id_nbo;\n-\t\n+\n \tSPDYF_ASSERT(NULL == session->write_buffer, \"the function is called not in the correct moment\");\n-\t\n+\n \tmemcpy(&control_frame, response_queue->control_frame, sizeof(control_frame));\n \n \tif(SPDY_YES != SPDYF_zlib_deflate(&session->zlib_send_stream,\n@@ -445,12 +447,12 @@\n \t\t* this session,\n \t\t* so it is better to close the session right now *\/\n \t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n-\t\t\n+\n \t\tfree(compressed_headers);\n \n \t\treturn SPDY_NO;\n \t}\n-\t\n+\n \t\/\/TODO do we need this used_Data\n \tSPDYF_ASSERT(used_data == response_queue->data_size, \"not everything was used by zlib\");\n \n@@ -461,22 +463,22 @@\n \tif(NULL == (session->write_buffer = malloc(total_size)))\n \t{\n \t\t\/* no memory\n-\t\t * since we do not save the compressed data anywhere and \n-\t\t * the sending zlib stream is already in new state, we must \n-\t\t * close the session *\/ \n+\t\t * since we do not save the compressed data anywhere and\n+\t\t * the sending zlib stream is already in new state, we must\n+\t\t * close the session *\/\n \t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n-\t\t\n+\n \t\tfree(compressed_headers);\n-\t\t\n+\n \t\treturn SPDY_NO;\n \t}\n \tsession->write_buffer_beginning = 0;\n \tsession->write_buffer_offset = 0;\n \tsession->write_buffer_size = total_size;\n-\t\n+\n \tcontrol_frame.length = compressed_headers_size + 4; \/\/ compressed data + stream_id\n \tSPDYF_CONTROL_FRAME_HTON(&control_frame);\n-\t\n+\n \t\/\/put frame headers to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame));\n \tsession->write_buffer_offset += sizeof(struct SPDYF_Control_Frame);\n@@ -489,7 +491,7 @@\n \t\/\/put compressed name\/value pairs to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset, compressed_headers, compressed_headers_size);\n \tsession->write_buffer_offset += compressed_headers_size;\n-\t\n+\n \tSPDYF_ASSERT(0 == session->write_buffer_beginning, \"bug1\");\n \tSPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, \"bug2\");\n \n@@ -502,15 +504,15 @@\n \t\t&compressed_headers_size);\n *\/\n \tfree(compressed_headers);\n-\t\n+\n \tsession->last_replied_to_stream_id = stream->stream_id;\n-\t\n+\n \/\/SPDYF_DEBUG(\"syn_reply sent: id %i\", stream->stream_id);\n \n \treturn SPDY_YES;\n }\n \n-\t \n+\n int\n SPDYF_handler_write_goaway (struct SPDY_Session *session)\n {\n@@ -518,13 +520,13 @@\n \tstruct SPDYF_Control_Frame control_frame;\n \tsize_t total_size;\n \tint last_good_stream_id;\n-\t\n+\n \tSPDYF_ASSERT(NULL == session->write_buffer, \"the function is called not in the correct moment\");\n-\t\n+\n \tmemcpy(&control_frame, response_queue->control_frame, sizeof(control_frame));\n-\t\n+\n \tsession->is_goaway_sent = true;\n-\t\n+\n \ttotal_size = sizeof(struct SPDYF_Control_Frame) \/\/SPDY header\n \t\t+ 4 \/\/ last good stream id as \"subheader\"\n \t\t+ 4; \/\/ status code as \"subheader\"\n@@ -536,10 +538,10 @@\n \tsession->write_buffer_beginning = 0;\n \tsession->write_buffer_offset = 0;\n \tsession->write_buffer_size = total_size;\n-\t\n+\n \tcontrol_frame.length = 8; \/\/ always for GOAWAY\n \tSPDYF_CONTROL_FRAME_HTON(&control_frame);\n-\t\n+\n \t\/\/put frame headers to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame));\n \tsession->write_buffer_offset += sizeof(struct SPDYF_Control_Frame);\n@@ -548,22 +550,22 @@\n \tlast_good_stream_id = HTON31(session->last_replied_to_stream_id);\n \tmemcpy(session->write_buffer + session->write_buffer_offset, &last_good_stream_id, 4);\n \tsession->write_buffer_offset += 4;\n-\t\n+\n \t\/\/put \"data\" to write buffer. This is the status\n \tmemcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 4);\n \tsession->write_buffer_offset += 4;\n \t\/\/data is not freed by the destroy function so:\n \t\/\/free(response_queue->data);\n-\t\n+\n \/\/SPDYF_DEBUG(\"goaway sent: status %i\", NTOH31(*(uint32_t*)(response_queue->data)));\n- \n+\n \tSPDYF_ASSERT(0 == session->write_buffer_beginning, \"bug1\");\n \tSPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, \"bug2\");\n \n \treturn SPDY_YES;\n }\n \n- \n+\n int\n SPDYF_handler_write_data (struct SPDY_Session *session)\n {\n@@ -573,16 +575,16 @@\n \tstruct SPDYF_Data_Frame data_frame;\n \tssize_t ret;\n \tbool more;\n-\t\n+\n \tSPDYF_ASSERT(NULL == session->write_buffer, \"the function is called not in the correct moment\");\n-\t\n+\n \tmemcpy(&data_frame, response_queue->data_frame, sizeof(data_frame));\n \n \tif(NULL == response_queue->response->rcb)\n \t{\n \t\t\/\/standard response with data into the struct\n \t\tSPDYF_ASSERT(NULL != response_queue->data, \"no data for the response\");\n-\t\n+\n \t\ttotal_size = sizeof(struct SPDYF_Data_Frame) \/\/SPDY header\n \t\t\t+ response_queue->data_size;\n \n@@ -593,7 +595,7 @@\n \t\tsession->write_buffer_beginning = 0;\n \t\tsession->write_buffer_offset = 0;\n \t\tsession->write_buffer_size = total_size;\n-\t\t\n+\n \t\tdata_frame.length = response_queue->data_size;\n \t\tSPDYF_DATA_FRAME_HTON(&data_frame);\n \n@@ -610,7 +612,7 @@\n \t\t\/* response with callbacks. The lib will produce more than 1\n \t\t * data frames\n \t\t *\/\n-\t\t\n+\n \t\ttotal_size = sizeof(struct SPDYF_Data_Frame) \/\/SPDY header\n \t\t\t+ SPDY_MAX_SUPPORTED_FRAME_SIZE; \/\/max possible size\n \n@@ -621,17 +623,17 @@\n \t\tsession->write_buffer_beginning = 0;\n \t\tsession->write_buffer_offset = 0;\n \t\tsession->write_buffer_size = total_size;\n-\t\t\n+\n \t\tret = response_queue->response->rcb(response_queue->response->rcb_cls,\n \t\t\tsession->write_buffer + sizeof(struct SPDYF_Data_Frame),\n \t\t\tresponse_queue->response->rcb_block_size,\n \t\t\t&more);\n-\t\t\t\n+\n \t\tif(ret < 0 || ret > response_queue->response->rcb_block_size)\n \t\t{\n \t\t\tfree(session->write_buffer);\n session->write_buffer = NULL;\n- \n+\n \/\/send RST_STREAM\n if(SPDY_YES == (ret = SPDYF_prepare_rst_stream(session,\n response_queue->stream,\n@@ -639,12 +641,12 @@\n {\n return SPDY_NO;\n }\n- \n+\n \/\/else no memory\n \t\t\t\/\/for now close session\n \t\t\t\/\/TODO what?\n \t\t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n-\t\t\n+\n \t\t\treturn SPDY_NO;\n \t\t}\n \t\tif(0 == ret && more)\n@@ -653,7 +655,7 @@\n \t\t\tfree(session->write_buffer);\n \t\t\tsession->write_buffer = NULL;\n \t\t\tsession->write_buffer_size = 0;\n-\t\t\t\n+\n \t\t\tif(NULL != response_queue->next)\n \t\t\t{\n \t\t\t\t\/\/put the frame at the end of the queue\n@@ -665,10 +667,10 @@\n \t\t\t\tresponse_queue->next = NULL;\n \t\t\t\tsession->response_queue_tail = response_queue;\n \t\t\t}\n-\t\t\t\n+\n \t\t\treturn SPDY_YES;\n \t\t}\n-\t\t\n+\n \t\tif(more)\n \t\t{\n \t\t\t\/\/create another response queue object to call the user cb again\n@@ -686,12 +688,12 @@\n \t\t\t\t\/\/TODO send RST_STREAM\n \t\t\t\t\/\/for now close session\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n-\t\t\n+\n \t\t\t\tfree(session->write_buffer);\n session->write_buffer = NULL;\n \t\t\t\treturn SPDY_NO;\n \t\t\t}\n-\t\t\t\n+\n \t\t\t\/\/put it at second position on the queue\n \t\t\tnew_response_queue->prev = response_queue;\n \t\t\tnew_response_queue->next = response_queue->next;\n@@ -704,7 +706,7 @@\n \t\t\t\tresponse_queue->next->prev = new_response_queue;\n \t\t\t}\n \t\t\tresponse_queue->next = new_response_queue;\n-\t\t\t\n+\n \t\t\tresponse_queue->frqcb = NULL;\n \t\t\tresponse_queue->frqcb_cls = NULL;\n \t\t\tresponse_queue->rrcb = NULL;\n@@ -714,7 +716,7 @@\n \t\t{\n \t\t\tdata_frame.flags |= SPDY_DATA_FLAG_FIN;\n \t\t}\n-\t\t\t\n+\n \t\tdata_frame.length = ret;\n \t\tSPDYF_DATA_FRAME_HTON(&data_frame);\n \n@@ -726,27 +728,27 @@\n \t\tsession->write_buffer_offset += ret;\n \t\tsession->write_buffer_size = session->write_buffer_offset;\n \t}\n- \n+\n \/\/SPDYF_DEBUG(\"data sent: id %i\", NTOH31(data_frame.stream_id));\n \n \tSPDYF_ASSERT(0 == session->write_buffer_beginning, \"bug1\");\n \tSPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, \"bug2\");\n-\t\n+\n \treturn SPDY_YES;\n }\n \n-\t\t \n+\n int\n SPDYF_handler_write_rst_stream (struct SPDY_Session *session)\n {\n \tstruct SPDYF_Response_Queue *response_queue = session->response_queue_head;\n \tstruct SPDYF_Control_Frame control_frame;\n \tsize_t total_size;\n-\t\n+\n \tSPDYF_ASSERT(NULL == session->write_buffer, \"the function is called not in the correct moment\");\n-\t\n+\n \tmemcpy(&control_frame, response_queue->control_frame, sizeof(control_frame));\n-\t\n+\n \ttotal_size = sizeof(struct SPDYF_Control_Frame) \/\/SPDY header\n \t\t+ 4 \/\/ stream id as \"subheader\"\n \t\t+ 4; \/\/ status code as \"subheader\"\n@@ -758,40 +760,40 @@\n \tsession->write_buffer_beginning = 0;\n \tsession->write_buffer_offset = 0;\n \tsession->write_buffer_size = total_size;\n-\t\n+\n \tcontrol_frame.length = 8; \/\/ always for RST_STREAM\n \tSPDYF_CONTROL_FRAME_HTON(&control_frame);\n-\t\n+\n \t\/\/put frame headers to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame));\n \tsession->write_buffer_offset += sizeof(struct SPDYF_Control_Frame);\n-\t\n+\n \t\/\/put stream id to write buffer. This is the status\n \tmemcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 8);\n \tsession->write_buffer_offset += 8;\n \t\/\/data is not freed by the destroy function so:\n \t\/\/free(response_queue->data);\n-\t\n+\n \/\/SPDYF_DEBUG(\"rst_stream sent: id %i\", NTOH31((((uint64_t)response_queue->data) & 0xFFFF0000) >> 32));\n- \n+\n \tSPDYF_ASSERT(0 == session->write_buffer_beginning, \"bug1\");\n \tSPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, \"bug2\");\n \n \treturn SPDY_YES;\n }\n \n-\t\t \n+\n int\n SPDYF_handler_write_window_update (struct SPDY_Session *session)\n {\n \tstruct SPDYF_Response_Queue *response_queue = session->response_queue_head;\n \tstruct SPDYF_Control_Frame control_frame;\n \tsize_t total_size;\n-\t\n+\n \tSPDYF_ASSERT(NULL == session->write_buffer, \"the function is called not in the correct moment\");\n-\t\n+\n \tmemcpy(&control_frame, response_queue->control_frame, sizeof(control_frame));\n-\t\n+\n \ttotal_size = sizeof(struct SPDYF_Control_Frame) \/\/SPDY header\n \t\t+ 4 \/\/ stream id as \"subheader\"\n \t\t+ 4; \/\/ delta-window-size as \"subheader\"\n@@ -803,20 +805,20 @@\n \tsession->write_buffer_beginning = 0;\n \tsession->write_buffer_offset = 0;\n \tsession->write_buffer_size = total_size;\n-\t\n+\n \tcontrol_frame.length = 8; \/\/ always for WINDOW_UPDATE\n \tSPDYF_CONTROL_FRAME_HTON(&control_frame);\n-\t\n+\n \t\/\/put frame headers to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset,&control_frame,sizeof(struct SPDYF_Control_Frame));\n \tsession->write_buffer_offset += sizeof(struct SPDYF_Control_Frame);\n-\t\n+\n \t\/\/put stream id and delta-window-size to write buffer\n \tmemcpy(session->write_buffer + session->write_buffer_offset, response_queue->data, 8);\n \tsession->write_buffer_offset += 8;\n-\t\n+\n \/\/SPDYF_DEBUG(\"window_update sent: id %i\", NTOH31((((uint64_t)response_queue->data) & 0xFFFF0000) >> 32));\n-\t\n+\n \tSPDYF_ASSERT(0 == session->write_buffer_beginning, \"bug1\");\n \tSPDYF_ASSERT(session->write_buffer_offset == session->write_buffer_size, \"bug2\");\n \n@@ -828,14 +830,14 @@\n SPDYF_handler_ignore_frame (struct SPDY_Session *session)\n {\n \tstruct SPDYF_Control_Frame *frame;\n-\t\n+\n \tSPDYF_ASSERT(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status\n \t\t|| SPDY_SESSION_STATUS_WAIT_FOR_BODY == session->status,\n \t\t\"the function is called wrong\");\n-\t\n-\t\n+\n+\n \tframe = (struct SPDYF_Control_Frame *)session->frame_handler_cls;\n-\t\n+\n \t\/\/handle subheaders\n \tif(SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER == session->status)\n \t{\n@@ -847,9 +849,9 @@\n \t\telse\n \t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY;\n \t}\n-\t\n+\n \t\/\/handle body\n-\t\n+\n \tif(session->read_buffer_offset - session->read_buffer_beginning\n \t\t>= frame->length)\n \t{\n@@ -866,7 +868,7 @@\n \tint bytes_read;\n \tbool reallocate;\n \tsize_t actual_buf_size;\n-\t\t\t\t\t\t\t\n+\n \tif(SPDY_SESSION_STATUS_CLOSING == session->status\n \t\t|| SPDY_SESSION_STATUS_FLUSHING == session->status)\n \t\treturn SPDY_NO;\n@@ -882,40 +884,40 @@\n \t\tswitch(session->status)\n \t\t{\n \t\t\tcase SPDY_SESSION_STATUS_WAIT_FOR_HEADER:\n-\t\t\t\t\n+\n \t\t\tcase SPDY_SESSION_STATUS_IGNORE_BYTES:\n \t\t\t\t\/\/we need space for a whole control frame header\n \t\t\t\tif(actual_buf_size < sizeof(struct SPDYF_Control_Frame))\n \t\t\t\t\treallocate = true;\n \t\t\t\tbreak;\n-\t\t\t\t\n+\n \t\t\tcase SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER:\n-\t\t\t\t\n+\n \t\t\tcase SPDY_SESSION_STATUS_WAIT_FOR_BODY:\n \t\t\t\t\/\/we need as many bytes as set in length field of the\n \t\t\t\t\/\/header\n \t\t\t\tSPDYF_ASSERT(NULL != session->frame_handler_cls,\n \t\t\t\t\t\"no frame for session\");\n \t\t\t\tif(session->frame_handler != &spdyf_handler_read_data)\n-\t\t\t\t{\t\n+\t\t\t\t{\n \t\t\t\t\tif(actual_buf_size\n \t\t\t\t\t\t< ((struct SPDYF_Control_Frame *)session->frame_handler_cls)->length)\n \t\t\t\t\t\treallocate = true;\n \t\t\t\t}\n \t\t\t\telse\n-\t\t\t\t{\t\n+\t\t\t\t{\n \t\t\t\t\tif(actual_buf_size\n \t\t\t\t\t\t< ((struct SPDYF_Data_Frame *)session->frame_handler_cls)->length)\n \t\t\t\t\t\treallocate = true;\n \t\t\t\t}\n \t\t\t\tbreak;\n-\t\t\t\t\n+\n \t\t\tcase SPDY_SESSION_STATUS_CLOSING:\n \t\t\tcase SPDY_SESSION_STATUS_FLUSHING:\n \t\t\t\t\/\/nothing needed\n \t\t\t\tbreak;\n \t\t}\n-\t\t\n+\n \t\tif(reallocate)\n \t\t{\n \t\t\t\/\/reuse the space in the buffer that was already read by the lib\n@@ -933,24 +935,24 @@\n \t\t\treturn SPDY_NO;\n \t\t}\n \t}\n-\t\n+\n \tsession->last_activity = SPDYF_monotonic_time();\n \n \t\/\/actual read from the TLS socket\n \tbytes_read = session->fio_recv(session,\n \t\t\t\t\tsession->read_buffer + session->read_buffer_offset,\n \t\t\t\t\tsession->read_buffer_size - session->read_buffer_offset);\n-\t\t\t\t\t\n+\n \tswitch(bytes_read)\n \t{\n \t\tcase SPDY_IO_ERROR_CLOSED:\n-\t\t\t\/\/The TLS connection was closed by the other party, clean \n+\t\t\t\/\/The TLS connection was closed by the other party, clean\n \t\t\t\/\/or not\n \t\t\tshutdown (session->socket_fd, SHUT_RD);\n \t\t\tsession->read_closed = true;\n \t\t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n \t\t\treturn SPDY_YES;\n-\t\t\t\n+\n \t\tcase SPDY_IO_ERROR_ERROR:\n \t\t\t\/\/any kind of error in the TLS subsystem\n \t\t\t\/\/try to prepare GOAWAY frame\n@@ -958,17 +960,17 @@\n \t\t\t\/\/try to flush the queue when write is called\n \t\t\tsession->status = SPDY_SESSION_STATUS_FLUSHING;\n \t\t\treturn SPDY_YES;\n-\t\t\t\n+\n \t\tcase SPDY_IO_ERROR_AGAIN:\n \t\t\t\/\/read or write should be called again; leave it for the\n \t\t\t\/\/next time\n \t\t\treturn SPDY_NO;\n-\t\t\t\n+\n \t\t\/\/default:\n \t\t\t\/\/something was really read from the TLS subsystem\n \t\t\t\/\/just continue\n \t}\n-\t\n+\n \tsession->read_buffer_offset += bytes_read;\n \n \treturn SPDY_YES;\n@@ -983,13 +985,13 @@\n \tint bytes_written;\n \tstruct SPDYF_Response_Queue *queue_head;\n \tstruct SPDYF_Response_Queue *response_queue;\n-\t\n+\n \tif(SPDY_SESSION_STATUS_CLOSING == session->status)\n \t\treturn SPDY_NO;\n- \n+\n if(SPDY_NO == session->fio_before_write(session))\n return SPDY_NO;\n-\t\n+\n \tfor(i=0;\n \t\tonly_one_frame\n \t\t? i < 1\n@@ -1002,7 +1004,7 @@\n \t\t{\n \t\t\t\/\/discard frames on closed streams\n \t\t\tresponse_queue = session->response_queue_head;\n-\t\t\t\n+\n \t\t\twhile(NULL != response_queue)\n \t\t\t{\n \t\t\t\t\/\/if stream is closed, remove not yet sent frames\n@@ -1012,21 +1014,21 @@\n \t\t\t\tif(NULL == response_queue->stream\n \t\t\t\t\t|| !response_queue->stream->is_out_closed)\n \t\t\t\t\tbreak;\n-\t\t\t\t\t\t\n+\n \t\t\t\tDLL_remove(session->response_queue_head,session->response_queue_tail,response_queue);\n-\t\t\t\t\n+\n \t\t\t\tif(NULL != response_queue->frqcb)\n \t\t\t\t{\n \t\t\t\t\tresponse_queue->frqcb(response_queue->frqcb_cls, response_queue, SPDY_RESPONSE_RESULT_STREAM_CLOSED);\n \t\t\t\t}\n-\t\t\t\t\n+\n \t\t\t\tSPDYF_response_queue_destroy(response_queue);\n \t\t\t\tresponse_queue = session->response_queue_head;\n \t\t\t}\n-\t\t\t\n+\n \t\t\tif(NULL == session->response_queue_head)\n \t\t\t\tbreak;\/\/nothing on the queue\n-\t\t\t\t\n+\n \t\t\t\/\/get next data from queue and put it to the write buffer\n \t\t\t\/\/ to send it\n \t\t\tif(SPDY_NO == session->response_queue_head->process_response_handler(session))\n@@ -1047,15 +1049,15 @@\n \t\t\t\t\t}\n \t\t\t\t\treturn SPDY_YES;\n \t\t\t\t}\n-\t\t\t\t\n+\n \t\t\t\t\/\/just return from the loop to return from this function\n ++i;\n \t\t\t\tbreak;\n \t\t\t}\n-\t\t\t\n+\n \t\t\t\/\/check if something was prepared for writing\n \t\t\t\/\/on respones with callbacks it is possible that their is no\n-\t\t\t\/\/data available \n+\t\t\t\/\/data available\n \t\t\tif(0 == session->write_buffer_size)\/\/nothing to write\n {\n \t\t\t\tif(response_queue != session->response_queue_head)\n@@ -1073,41 +1075,41 @@\n \t\t}\n \n \t\tsession->last_activity = SPDYF_monotonic_time();\n-\t\t\n+\n \t\t\/\/actual write to the IO\n \t\tbytes_written = session->fio_send(session,\n \t\t\tsession->write_buffer + session->write_buffer_beginning,\n \t\t\tsession->write_buffer_offset - session->write_buffer_beginning);\n-\t\t\t\n+\n \t\tswitch(bytes_written)\n \t\t{\n \t\t\tcase SPDY_IO_ERROR_CLOSED:\n-\t\t\t\t\/\/The TLS connection was closed by the other party, clean \n+\t\t\t\t\/\/The TLS connection was closed by the other party, clean\n \t\t\t\t\/\/or not\n \t\t\t\tshutdown (session->socket_fd, SHUT_RD);\n \t\t\t\tsession->read_closed = true;\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n \t\t\t\treturn SPDY_YES;\n-\t\t\t\t\n+\n \t\t\tcase SPDY_IO_ERROR_ERROR:\n \t\t\t\t\/\/any kind of error in the TLS subsystem\n \t\t\t\t\/\/forbid more writing\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n \t\t\t\treturn SPDY_YES;\n-\t\t\t\t\n+\n \t\t\tcase SPDY_IO_ERROR_AGAIN:\n \t\t\t\t\/\/read or write should be called again; leave it for the\n \t\t\t\t\/\/next time; return from the function as we do not now\n \t\t\t\t\/\/whether reading or writing is needed\n \t\t\t\treturn i>0 ? SPDY_YES : SPDY_NO;\n-\t\t\t\t\n+\n \t\t\t\/\/default:\n \t\t\t\t\/\/something was really read from the TLS subsystem\n \t\t\t\t\/\/just continue\n \t\t}\n-\t\t\n+\n \t\tsession->write_buffer_beginning += bytes_written;\n-\t\t\n+\n \t\t\/\/check if the full buffer was written\n \t\tif(session->write_buffer_beginning == session->write_buffer_size)\n \t\t{\n@@ -1126,16 +1128,16 @@\n \t\t\t\tsession->response_queue_head = queue_head->next;\n \t\t\t\tsession->response_queue_head->prev = NULL;\n \t\t\t}\n-\t\t\t\n+\n \t\t\t\/\/set stream to closed if the frame's fin flag is set\n \t\t\tSPDYF_stream_set_flags_on_write(queue_head);\n-\t\t\t\n+\n \t\t\tif(NULL != queue_head->frqcb)\n \t\t\t{\n \t\t\t\t\/\/application layer callback to notify sending of the response\n \t\t\t\tqueue_head->frqcb(queue_head->frqcb_cls, queue_head, SPDY_RESPONSE_RESULT_SUCCESS);\n \t\t\t}\n-\t\t\t\n+\n \t\t\tSPDYF_response_queue_destroy(queue_head);\n \t\t}\n \t}\n@@ -1143,7 +1145,7 @@\n \tif(SPDY_SESSION_STATUS_FLUSHING == session->status\n \t\t&& NULL == session->response_queue_head)\n \t\tsession->status = SPDY_SESSION_STATUS_CLOSING;\n-\t\n+\n \t\/\/return i>0 ? SPDY_YES : SPDY_NO;\n \treturn session->fio_after_write(session, i>0 ? SPDY_YES : SPDY_NO);\n }\n@@ -1156,7 +1158,7 @@\n \tsize_t frame_length;\n \tstruct SPDYF_Control_Frame* control_frame;\n \tstruct SPDYF_Data_Frame *data_frame;\n-\t\n+\n \t\/\/prepare session for closing if timeout is used and already passed\n \tif(SPDY_SESSION_STATUS_CLOSING != session->status\n \t\t&& session->daemon->session_timeout\n@@ -1167,7 +1169,7 @@\n \t\tSPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_OK, true);\n \t\tSPDYF_session_write(session,true);\n \t}\n-\t\n+\n \tswitch(session->status)\n \t{\n \t\t\/\/expect new frame to arrive\n@@ -1190,14 +1192,14 @@\n \t\t\t\t\tSPDYF_DEBUG(\"No memory\");\n \t\t\t\t\treturn SPDY_NO;\n \t\t\t\t}\n-\t\t\t\t\n+\n \t\t\t\t\/\/get frame headers\n \t\t\t\tmemcpy(control_frame,\n \t\t\t\t\tsession->read_buffer + session->read_buffer_beginning,\n \t\t\t\t\tsizeof(struct SPDYF_Control_Frame));\n \t\t\t\tsession->read_buffer_beginning += sizeof(struct SPDYF_Control_Frame);\n \t\t\t\tSPDYF_CONTROL_FRAME_NTOH(control_frame);\n-\t\t\n+\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER;\n \t\t\t\t\/\/assign different frame handler according to frame type\n \t\t\t\tswitch(control_frame->type){\n@@ -1225,14 +1227,14 @@\n \t\t\t\t\tSPDYF_DEBUG(\"No memory\");\n \t\t\t\t\treturn SPDY_NO;\n \t\t\t\t}\n-\t\t\t\t\n+\n \t\t\t\t\/\/get frame headers\n \t\t\t\tmemcpy(data_frame,\n \t\t\t\t\tsession->read_buffer + session->read_buffer_beginning,\n \t\t\t\t\tsizeof(struct SPDYF_Data_Frame));\n \t\t\t\tsession->read_buffer_beginning += sizeof(struct SPDYF_Data_Frame);\n \t\t\t\tSPDYF_DATA_FRAME_NTOH(data_frame);\n-\t\t\t\t\n+\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_BODY;\n \t\t\t\tsession->frame_handler = &spdyf_handler_read_data;\n \t\t\t\tsession->frame_handler_cls = data_frame;\n@@ -1241,15 +1243,15 @@\n \t\t\telse\n \t\t\t{\n \t\t\t\tSPDYF_DEBUG(\"another protocol or version received!\");\n-\t\t\t\t\n+\n \t\t\t\t\/* According to the draft the lib should send here\n \t\t\t\t * RST_STREAM with status UNSUPPORTED_VERSION. I don't\n \t\t\t\t * see any sense of keeping the session open since\n \t\t\t\t * we don't know how many bytes is the bogus \"frame\".\n \t\t\t\t * And the latter normally will be HTTP request.\n-\t\t\t\t * \n+\t\t\t\t *\n \t\t\t\t *\/\n-\t\t\t\t\n+\n \t\t\t\t\/\/shutdown(session->socket_fd, SHUT_RD);\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_FLUSHING;\n \t\t\t\tSPDYF_prepare_goaway(session, SPDY_GOAWAY_STATUS_PROTOCOL_ERROR,false);\n@@ -1259,7 +1261,7 @@\n \t\t\t\t\/\/SPDYF_session_close(session);\n \t\t\t\treturn SPDY_YES;\n \t\t\t}\n-\t\t\t\n+\n \t\t\/\/expect specific header fields after the standard header\n \t\tcase SPDY_SESSION_STATUS_WAIT_FOR_SUBHEADER:\n \t\t\tif(NULL!=session->frame_handler)\n@@ -1268,52 +1270,52 @@\n \t\t\t\t\/\/if everything is ok, the \"body\" will also be processed\n \t\t\t\t\/\/by the handler\n \t\t\t\tsession->frame_handler(session);\n-\t\t\t\t\n+\n \t\t\t\tif(SPDY_SESSION_STATUS_IGNORE_BYTES == session->status)\n \t\t\t\t{\n \t\t\t\t\t\/\/check for larger than max supported frame\n \t\t\t\t\tif(session->frame_handler != &spdyf_handler_read_data)\n-\t\t\t\t\t{\t\n+\t\t\t\t\t{\n \t\t\t\t\t\tframe_length = ((struct SPDYF_Control_Frame *)session->frame_handler_cls)->length;\n \t\t\t\t\t}\n \t\t\t\t\telse\n-\t\t\t\t\t{\t\n+\t\t\t\t\t{\n \t\t\t\t\t\tframe_length = ((struct SPDYF_Data_Frame *)session->frame_handler_cls)->length;\n \t\t\t\t\t}\n-\t\t\t\t\t\n+\n \t\t\t\t\t\/\/if(SPDY_MAX_SUPPORTED_FRAME_SIZE < frame_length)\n \t\t\t\t\t{\n \t\t\t\t\t\tSPDYF_DEBUG(\"received frame with unsupported size: %zu\", frame_length);\n \t\t\t\t\t\t\/\/the data being received must be ignored and\n \t\t\t\t\t\t\/\/RST_STREAM sent\n-\t\t\t\t\t\t\n+\n \t\t\t\t\t\t\/\/ignore bytes that will arive later\n \t\t\t\t\t\tsession->read_ignore_bytes = frame_length\n \t\t\t\t\t\t\t+ read_buffer_beginning\n \t\t\t\t\t\t\t- session->read_buffer_offset;\n \t\t\t\t\t\t\/\/ignore what is already in read buffer\n \t\t\t\t\t\tsession->read_buffer_beginning = session->read_buffer_offset;\n-\t\t\t\t\t\t\n+\n \t\t\t\t\t\tSPDYF_prepare_rst_stream(session,\n \t\t\t\t\t\t\tsession->current_stream_id > 0 ? session->streams_head : NULL, \/\/may be 0 here which is not good\n \t\t\t\t\t\t\tSPDY_RST_STREAM_STATUS_FRAME_TOO_LARGE);\n-\t\t\t\t\t\t\n-\t\t\t\t\t\t\/\/actually the read buffer can be bigger than the \n+\n+\t\t\t\t\t\t\/\/actually the read buffer can be bigger than the\n \t\t\t\t\t\t\/\/max supported size\n \t\t\t\t\t\tsession->status = session->read_ignore_bytes\n \t\t\t\t\t\t\t? SPDY_SESSION_STATUS_IGNORE_BYTES\n \t\t\t\t\t\t\t: SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n-\t\t\t\t\t\t\t\n+\n \t\t\t\t\t\tfree(session->frame_handler_cls);\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\t\t\t\n+\n \t\t\tif(SPDY_SESSION_STATUS_IGNORE_BYTES != session->status)\n \t\t\t{\n \t\t\t\tbreak;\n \t\t\t}\n-\t\t\t\n+\n \t\t\/\/ignoring data in read buffer\n \t\tcase SPDY_SESSION_STATUS_IGNORE_BYTES:\n \t\t\tSPDYF_ASSERT(session->read_ignore_bytes > 0,\n@@ -1321,7 +1323,7 @@\n \t\t\tif(session->read_ignore_bytes\n \t\t\t\t> session->read_buffer_offset - session->read_buffer_beginning)\n \t\t\t{\n-\t\t\t\tsession->read_ignore_bytes -= \n+\t\t\t\tsession->read_ignore_bytes -=\n \t\t\t\t\tsession->read_buffer_offset - session->read_buffer_beginning;\n \t\t\t\tsession->read_buffer_beginning = session->read_buffer_offset;\n \t\t\t}\n@@ -1332,24 +1334,24 @@\n \t\t\t\tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n \t\t\t}\n \t\t\tbreak;\n-\t\t\t\n+\n \t\t\/\/expect frame body (name\/value pairs)\n \t\tcase SPDY_SESSION_STATUS_WAIT_FOR_BODY:\n \t\t\tif(NULL!=session->frame_handler)\n \t\t\t\tsession->frame_handler(session);\n \t\t\tbreak;\n-\t\t\t\n+\n \t\tcase SPDY_SESSION_STATUS_FLUSHING:\n-\t\t\n+\n \t\t\treturn SPDY_NO;\n-\t\t\t\n+\n \t\t\/\/because of error the session needs to be closed\n \t\tcase SPDY_SESSION_STATUS_CLOSING:\n \t\t\t\/\/error should be already sent to the client\n \t\t\tSPDYF_session_close(session);\n \t\t\treturn SPDY_YES;\n \t}\n-\t\n+\n \treturn SPDY_YES;\n }\n \n@@ -1359,10 +1361,10 @@\n {\n \tstruct SPDY_Daemon *daemon = session->daemon;\n \tint by_client = session->read_closed ? SPDY_YES : SPDY_NO;\n-\t\n+\n \t\/\/shutdown the tls and deinit the tls context\n \tsession->fio_close_session(session);\n-\tshutdown (session->socket_fd, \n+\tshutdown (session->socket_fd,\n \t\tsession->read_closed ? SHUT_WR : SHUT_RDWR);\n \tsession->read_closed = true;\n \n@@ -1374,7 +1376,7 @@\n \tDLL_insert (daemon->cleanup_head,\n \t\tdaemon->cleanup_tail,\n \t\tsession);\n-\t\t\n+\n \t\/\/call callback for closed session\n \tif(NULL != daemon->session_closed_cb)\n \t{\n@@ -1391,43 +1393,43 @@\n \tstruct SPDY_Session *session = NULL;\n \tsocklen_t addr_len;\n \tstruct sockaddr *addr;\n- \n+\n #if HAVE_INET6\n \tstruct sockaddr_in6 addr6;\n-\t\n+\n \taddr = (struct sockaddr *)&addr6;\n \taddr_len = sizeof(addr6);\n #else\n \tstruct sockaddr_in addr4;\n-\t\n+\n \taddr = (struct sockaddr *)&addr4;\n \taddr_len = sizeof(addr6);\n #endif\n-\t\n+\n new_socket_fd = accept (daemon->socket_fd, addr, &addr_len);\n- \n+\n if(new_socket_fd < 1)\n \t\treturn SPDY_NO;\n- \n+\n \tif (NULL == (session = malloc (sizeof (struct SPDY_Session))))\n {\n \t\tgoto free_and_fail;\n \t}\n \tmemset (session, 0, sizeof (struct SPDY_Session));\n-\t\n+\n \tsession->daemon = daemon;\n \tsession->socket_fd = new_socket_fd;\n session->max_num_frames = daemon->max_num_frames;\n- \n+\n ret = SPDYF_io_set_session(session, daemon->io_subsystem);\n SPDYF_ASSERT(SPDY_YES == ret, \"Somehow daemon->io_subsystem iswrong here\");\n-\t\n+\n \t\/\/init TLS context, handshake will be done\n \tif(SPDY_YES != session->fio_new_session(session))\n \t{\n \t\tgoto free_and_fail;\n \t}\n-\t\n+\n \t\/\/read buffer\n \tsession->read_buffer_size = SPDYF_BUFFER_SIZE;\n \tif (NULL == (session->read_buffer = malloc (session->read_buffer_size)))\n@@ -1435,7 +1437,7 @@\n \t\tsession->fio_close_session(session);\n \t\tgoto free_and_fail;\n \t}\n-\t\n+\n \t\/\/address of the client\n \tif (NULL == (session->addr = malloc (addr_len)))\n {\n@@ -1443,10 +1445,10 @@\n \t\tgoto free_and_fail;\n \t}\n \tmemcpy (session->addr, addr, addr_len);\n-\t\n+\n \tsession->addr_len = addr_len;\n \tsession->status = SPDY_SESSION_STATUS_WAIT_FOR_HEADER;\n-\t\n+\n \t\/\/init zlib context for the whole session\n \tif(SPDY_YES != SPDYF_zlib_deflate_init(&session->zlib_send_stream))\n {\n@@ -1459,23 +1461,23 @@\n \t\tSPDYF_zlib_deflate_end(&session->zlib_send_stream);\n \t\tgoto free_and_fail;\n \t}\n-\t\n+\n \t\/\/add it to daemon's list\n \tDLL_insert(daemon->sessions_head,daemon->sessions_tail,session);\n-\t\n+\n \tsession->last_activity = SPDYF_monotonic_time();\n-\t\n+\n \tif(NULL != daemon->new_session_cb)\n \t\tdaemon->new_session_cb(daemon->cls, session);\n-\t\n+\n \treturn SPDY_YES;\n-\t\n+\n \t\/\/for GOTO\n \tfree_and_fail:\n \t\/* something failed, so shutdown, close and free memory *\/\n \tshutdown (new_socket_fd, SHUT_RDWR);\n \t(void)close (new_socket_fd);\n-\t\n+\n \tif(NULL != session)\n \t{\n \t\tif(NULL != session->addr)\n@@ -1487,7 +1489,7 @@\n \treturn SPDY_NO;\n }\n \n-\t\t \n+\n void\n SPDYF_queue_response (struct SPDYF_Response_Queue *response_to_queue,\n \t\t\t\t\t\tstruct SPDY_Session *session,\n@@ -1496,18 +1498,18 @@\n \tstruct SPDYF_Response_Queue *pos;\n \tstruct SPDYF_Response_Queue *last;\n \tuint8_t priority;\n-\t\n+\n \tSPDYF_ASSERT(SPDY_YES != consider_priority || NULL != response_to_queue->stream,\n \t\t\"called with consider_priority but no stream provided\");\n-\t\n+\n \tlast = response_to_queue;\n \twhile(NULL != last->next)\n \t{\n \t\tlast = last->next;\n \t}\n-\t\n+\n \tif(SPDY_NO == consider_priority)\n-\t{\t\t\n+\t{\n \t\t\/\/put it at the end of the queue\n \t\tresponse_to_queue->prev = session->response_queue_tail;\n \t\tif (NULL == session->response_queue_head)\n@@ -1528,14 +1530,14 @@\n \t\tsession->response_queue_head = response_to_queue;\n \t\treturn;\n \t}\n-\t\n+\n \tif(NULL == session->response_queue_tail)\n \t{\n \t\tsession->response_queue_head = response_to_queue;\n \t\tsession->response_queue_tail = last;\n \t\treturn;\n \t}\n-\t\n+\n \t\/\/search for the right position to put it\n \tpos = session->response_queue_tail;\n \tpriority = response_to_queue->stream->priority;\n@@ -1544,7 +1546,7 @@\n \t{\n \t\tpos = pos->prev;\n \t}\n-\t\n+\n \tif(NULL == pos)\n \t{\n \t\t\/\/put it on the head\n@@ -1574,18 +1576,18 @@\n {\n \tstruct SPDYF_Stream *stream;\n \tstruct SPDYF_Response_Queue *response_queue;\n-\t\n+\n \t(void)close (session->socket_fd);\n \tSPDYF_zlib_deflate_end(&session->zlib_send_stream);\n \tSPDYF_zlib_inflate_end(&session->zlib_recv_stream);\n-\t\n+\n \t\/\/clean up unsent data in the output queue\n \twhile (NULL != (response_queue = session->response_queue_head))\n \t{\n \t\tDLL_remove (session->response_queue_head,\n \t\t\tsession->response_queue_tail,\n \t\t\tresponse_queue);\n-\t\t\t\n+\n \t\tif(NULL != response_queue->frqcb)\n \t\t{\n \t\t\tresponse_queue->frqcb(response_queue->frqcb_cls, response_queue, SPDY_RESPONSE_RESULT_SESSION_CLOSED);\n@@ -1600,7 +1602,7 @@\n \t\tDLL_remove (session->streams_head,\n \t\t\tsession->streams_tail,\n \t\t\tstream);\n-\t\t\n+\n \t\tSPDYF_stream_destroy(stream);\n \t}\n \n@@ -1619,20 +1621,20 @@\n \tstruct SPDYF_Response_Queue *response_to_queue;\n \tstruct SPDYF_Control_Frame *control_frame;\n \tuint32_t *data;\n-\t\n+\n \tif(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue))))\n \t{\n \t\treturn SPDY_NO;\n \t}\n \tmemset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue));\n-\t\n+\n \tif(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame))))\n \t{\n \t\tfree(response_to_queue);\n \t\treturn SPDY_NO;\n \t}\n \tmemset(control_frame, 0, sizeof(struct SPDYF_Control_Frame));\n-\t\n+\n \tif(NULL == (data = malloc(4)))\n \t{\n \t\tfree(control_frame);\n@@ -1640,17 +1642,17 @@\n \t\treturn SPDY_NO;\n \t}\n \t*(data) = htonl(status);\n-\t\n+\n \tcontrol_frame->control_bit = 1;\n \tcontrol_frame->version = SPDY_VERSION;\n \tcontrol_frame->type = SPDY_CONTROL_FRAME_TYPES_GOAWAY;\n \tcontrol_frame->flags = 0;\n-\t\n+\n \tresponse_to_queue->control_frame = control_frame;\n \tresponse_to_queue->process_response_handler = &SPDYF_handler_write_goaway;\n \tresponse_to_queue->data = data;\n \tresponse_to_queue->data_size = 4;\n-\t\n+\n \tSPDYF_queue_response (response_to_queue,\n \t\t\t\t\t\tsession,\n \t\t\t\t\t\tin_front ? -1 : SPDY_NO);\n@@ -1668,25 +1670,25 @@\n \tstruct SPDYF_Control_Frame *control_frame;\n \tuint32_t *data;\n \tuint32_t stream_id;\n-\t\n+\n if(NULL == stream)\n stream_id = 0;\n else\n stream_id = stream->stream_id;\n- \n+\n \tif(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue))))\n \t{\n \t\treturn SPDY_NO;\n \t}\n \tmemset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue));\n-\t\n+\n \tif(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame))))\n \t{\n \t\tfree(response_to_queue);\n \t\treturn SPDY_NO;\n \t}\n \tmemset(control_frame, 0, sizeof(struct SPDYF_Control_Frame));\n-\t\n+\n \tif(NULL == (data = malloc(8)))\n \t{\n \t\tfree(control_frame);\n@@ -1695,18 +1697,18 @@\n \t}\n \t*(data) = HTON31(stream_id);\n \t*(data + 1) = htonl(status);\n-\t\n+\n \tcontrol_frame->control_bit = 1;\n \tcontrol_frame->version = SPDY_VERSION;\n \tcontrol_frame->type = SPDY_CONTROL_FRAME_TYPES_RST_STREAM;\n \tcontrol_frame->flags = 0;\n-\t\n+\n \tresponse_to_queue->control_frame = control_frame;\n \tresponse_to_queue->process_response_handler = &SPDYF_handler_write_rst_stream;\n \tresponse_to_queue->data = data;\n \tresponse_to_queue->data_size = 8;\n \tresponse_to_queue->stream = stream;\n-\t\n+\n \tSPDYF_queue_response (response_to_queue,\n \t\t\t\t\t\tsession,\n \t\t\t\t\t\t-1);\n@@ -1723,22 +1725,22 @@\n \tstruct SPDYF_Response_Queue *response_to_queue;\n \tstruct SPDYF_Control_Frame *control_frame;\n \tuint32_t *data;\n-\t\n+\n SPDYF_ASSERT(NULL != stream, \"stream cannot be NULL\");\n- \n+\n \tif(NULL == (response_to_queue = malloc(sizeof(struct SPDYF_Response_Queue))))\n \t{\n \t\treturn SPDY_NO;\n \t}\n \tmemset(response_to_queue, 0, sizeof(struct SPDYF_Response_Queue));\n-\t\n+\n \tif(NULL == (control_frame = malloc(sizeof(struct SPDYF_Control_Frame))))\n \t{\n \t\tfree(response_to_queue);\n \t\treturn SPDY_NO;\n \t}\n \tmemset(control_frame, 0, sizeof(struct SPDYF_Control_Frame));\n-\t\n+\n \tif(NULL == (data = malloc(8)))\n \t{\n \t\tfree(control_frame);\n@@ -1747,18 +1749,18 @@\n \t}\n \t*(data) = HTON31(stream->stream_id);\n \t*(data + 1) = HTON31(delta_window_size);\n-\t\n+\n \tcontrol_frame->control_bit = 1;\n \tcontrol_frame->version = SPDY_VERSION;\n \tcontrol_frame->type = SPDY_CONTROL_FRAME_TYPES_WINDOW_UPDATE;\n \tcontrol_frame->flags = 0;\n-\t\n+\n \tresponse_to_queue->control_frame = control_frame;\n \tresponse_to_queue->process_response_handler = &SPDYF_handler_write_window_update;\n \tresponse_to_queue->data = data;\n \tresponse_to_queue->data_size = 8;\n \tresponse_to_queue->stream = stream;\n-\t\n+\n \tSPDYF_queue_response (response_to_queue,\n \t\t\t\t\t\tsession,\n \t\t\t\t\t\t-1);\n"} {"commit":"74802cc751604465da00af1e074ed6f427006434","subject":"Fix tyop.","message":"Fix tyop.\n","repos":"gozer\/mod_authn_persona,gozer\/mod_authn_persona,gozer\/mod_authn_persona","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/mod_authn_persona.c\n+++ src\/mod_authn_persona.c\n@@ -311,8 +311,8 @@\n \n conf->secret = apr_pcalloc(p, sizeof(buffer_t));\n conf->assertion_header = PERSONA_ASSERTION_HEADER;\n- conf->cookie_name = PERSONA_COOKIE_NAME);\n- conf->issuer_note = PERSONA_ISSUER_NOTE);\n+ conf->cookie_name = PERSONA_COOKIE_NAME;\n+ conf->issuer_note = PERSONA_ISSUER_NOTE;\n conf->verifier_url = PERSONA_DEFAULT_VERIFIER_URL;\n conf->secret_size = PERSONA_SECRET_SIZE;\n \n"} {"commit":"b1d930139181812c57befbacb3c92fa56692d0ed","subject":"Fixes FwNULL 16\/16","message":"Fixes FwNULL 16\/16\n\npmo-trunk-r8180\n","repos":"community-ssu\/modest,community-ssu\/modest,community-ssu\/modest,community-ssu\/modest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modest-text-utils.c\n+++ src\/modest-text-utils.c\n@@ -286,6 +286,8 @@\n \t garbage in the s variable *\/\n \tif (s)\n \t\ts[0] = '\\0';\n+\telse\n+\t\treturn 0;\n \n \t\/* does not work on old maemo glib: \n \t * g_date_set_time_t (&date, timet);\n"} {"commit":"c409c11e6b31da8d19324777818037b75c0d8ced","subject":"Fix delete folder dialogs","message":"Fix delete folder dialogs\n","repos":"community-ssu\/modest,community-ssu\/modest,community-ssu\/modest,community-ssu\/modest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modest-ui-actions.c\n+++ src\/modest-ui-actions.c\n@@ -3452,11 +3452,8 @@\n \tGtkWidget *folder_view;\n \tgint response;\n \tgchar *message;\n-\tGtkWindow *toplevel;\n \n \tg_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE);\n-\n-\ttoplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);\n \n \tif (MODEST_IS_FOLDER_WINDOW (window)) {\n \t\tfolder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));\n@@ -3473,7 +3470,7 @@\n \n \t\/* Show an error if it's an account *\/\n \tif (!TNY_IS_FOLDER (folder)) {\n-\t\tmodest_platform_run_information_dialog (toplevel,\n+\t\tmodest_platform_run_information_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),\n \t\t\t\t\t\t\t_(\"mail_in_ui_folder_delete_error\"),\n \t\t\t\t\t\t\tFALSE);\n \t\tg_object_unref (G_OBJECT (folder));\n@@ -3483,7 +3480,7 @@\n \t\/* Ask the user *\/\n \tmessage = g_strdup_printf (_(\"mcen_nc_delete_folder_text\"),\n \t\t\t\t tny_folder_get_name (TNY_FOLDER (folder)));\n-\tresponse = modest_platform_run_confirmation_dialog (toplevel,\n+\tresponse = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),\n \t\t\t\t\t\t\t (const gchar *) message);\n \tg_free (message);\n \n"} {"commit":"abe5cf65015be8bfced5f3458a072a0254f7c695","subject":"qmqtt_client.h\/publish() - add namespace to message parameter","message":"qmqtt_client.h\/publish() - add namespace to message parameter\n\nAvoid collisions with eventual other 'Message' classes.","repos":"KonstantinRitt\/qmqtt,KonstantinRitt\/qmqtt,KonstantinRitt\/qmqtt,KonstantinRitt\/qmqtt","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/mqtt\/qmqtt_client.h\n+++ src\/mqtt\/qmqtt_client.h\n@@ -190,7 +190,7 @@\n void subscribe(const QString& topic, const quint8 qos = 0);\n void unsubscribe(const QString& topic);\n \n- quint16 publish(const Message& message);\n+ quint16 publish(const QMQTT::Message& message);\n \n signals:\n void connected();\n"} {"commit":"fa26a234adc84ca5d68ea61bbeda8b5ff50740af","subject":"Pointer asterisk swap","message":"Pointer asterisk swap\n","repos":"lovasko\/Svit,lovasko\/Svit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/node\/group\/simple.h\n+++ src\/node\/group\/simple.h\n@@ -21,7 +21,7 @@\n \t\t\tset_material (std::unique_ptr<Material> _material);\n \n \t\t\tvoid\n-\t\t\tadd (Node *_node);\n+\t\t\tadd (Node* _node);\n \n \t\t\tvoid\n \t\t\tfinish () { }\n"} {"commit":"2b0b3923e8baa14ee429cd0f27862568def57157","subject":"typefind: don't leak uri string","message":"typefind: don't leak uri string\n","repos":"StreamUtils\/gstreamer,surround-io\/gstreamer,cfoch\/gstreamer,mrchapp\/gstreamer,drothlis\/gstreamer,ylatuya\/gstreamer,justinjoy\/gstreamer,jpakkane\/gstreamer,cablelabs\/gstreamer,jpakkane\/gstreamer,ylatuya\/gstreamer,StreamUtils\/gstreamer,Lachann\/gstreamer,centricular\/gstreamer,StreamUtils\/gstreamer,krichter722\/gstreamer,ylatuya\/gstreamer,justinjoy\/gstreamer,drothlis\/gstreamer,surround-io\/gstreamer,krieger-od\/gstreamer,lovebug356\/gstreamer,lovebug356\/gstreamer,magcius\/gstreamer,lubosz\/gstreamer,justinjoy\/gstreamer,jpxiong\/gstreamer,lubosz\/gstreamer,centricular\/gstreamer,cfoch\/gstreamer,collects\/gstreamer,centricular\/gstreamer,StreamUtils\/gstreamer,shelsonjava\/gstreamer,surround-io\/gstreamer,mrchapp\/gstreamer,lovebug356\/gstreamer,centricular\/gstreamer,shelsonjava\/gstreamer,Lachann\/gstreamer,ensonic\/gstreamer,Lachann\/gstreamer,cfoch\/gstreamer,mrchapp\/gstreamer,krieger-od\/gstreamer,cablelabs\/gstreamer,surround-io\/gstreamer,shelsonjava\/gstreamer,magcius\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,shelsonjava\/gstreamer,mparis\/gstreamer,Distrotech\/gstreamer,krichter722\/gstreamer,drothlis\/gstreamer,cfoch\/gstreamer,krichter722\/gstreamer,magcius\/gstreamer,Lachann\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,ensonic\/gstreamer,mparis\/gstreamer,magcius\/gstreamer,lubosz\/gstreamer,surround-io\/gstreamer,jpxiong\/gstreamer,drothlis\/gstreamer,lubosz\/gstreamer,cablelabs\/gstreamer,ylatuya\/gstreamer,cablelabs\/gstreamer,StreamUtils\/gstreamer,justinjoy\/gstreamer,Distrotech\/gstreamer,jpxiong\/gstreamer,krieger-od\/gstreamer,krichter722\/gstreamer,jpakkane\/gstreamer,ylatuya\/gstreamer,justinjoy\/gstreamer,Distrotech\/gstreamer,lubosz\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,magcius\/gstreamer,ensonic\/gstreamer,drothlis\/gstreamer,mrchapp\/gstreamer,lovebug356\/gstreamer,mparis\/gstreamer,mparis\/gstreamer,krieger-od\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,lovebug356\/gstreamer,jpakkane\/gstreamer,ensonic\/gstreamer,mparis\/gstreamer,Distrotech\/gstreamer,collects\/gstreamer,collects\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,Lachann\/gstreamer,krichter722\/gstreamer,shelsonjava\/gstreamer,ensonic\/gstreamer,Distrotech\/gstreamer,jpxiong\/gstreamer,krieger-od\/gstreamer,cablelabs\/gstreamer,cfoch\/gstreamer,collects\/gstreamer,centricular\/gstreamer,jpxiong\/gstreamer,collects\/gstreamer,mrchapp\/gstreamer,jpakkane\/gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plugins\/elements\/gsttypefindelement.c\n+++ plugins\/elements\/gsttypefindelement.c\n@@ -650,6 +650,7 @@\n \n GST_DEBUG_OBJECT (typefind, \"found extension %s\", result);\n gst_query_unref (query);\n+ g_free (uri);\n \n return result;\n \n@@ -670,6 +671,7 @@\n {\n GST_WARNING_OBJECT (typefind, \"could not find uri extension in %s\", uri);\n gst_query_unref (query);\n+ g_free (uri);\n return NULL;\n }\n }\n"} {"commit":"03ce735b07c7551c7adb89722d573fc7521665e7","subject":"funnel: Fix buffer leak","message":"funnel: Fix buffer leak\n","repos":"drothlis\/gstreamer,drothlis\/gstreamer,drothlis\/gstreamer,drothlis\/gstreamer,drothlis\/gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plugins\/elements\/gstfunnel.c\n+++ plugins\/elements\/gstfunnel.c\n@@ -310,6 +310,7 @@\n if (GST_BUFFER_CAPS (buffer) && GST_BUFFER_CAPS (buffer) != padcaps) {\n if (!gst_pad_set_caps (funnel->srcpad, GST_BUFFER_CAPS (buffer))) {\n res = GST_FLOW_NOT_NEGOTIATED;\n+ gst_buffer_unref (buffer);\n goto out;\n }\n }\n"} {"commit":"ed98f0292d7510141fdb754c249719f11efba3d9","subject":"Restore mistakenly commented-out definitions","message":"Restore mistakenly commented-out definitions\n","repos":"GraniteDevices\/SimpleMotionV2,GraniteDevices\/SimpleMotionV2","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- simplemotion_defs.h\n+++ simplemotion_defs.h\n@@ -431,8 +431,8 @@\n #define FLAG_ALLOW_VOLTAGE_CLIPPING BV(10)\r\n #define FLAG_USE_INPUT_LP_FILTER BV(11)\r\n #define FLAG_USE_PID_CONTROLLER BV(12)\/\/PIV is the default if bit is 0\/*obsolete*\/\r\n- \/\/#define FLAG_INVERTED_HALLS BV(13) \/*becoming obsolete, no effect on device where param SMP_COMMUTATION_SENSOR_CONFIG is present *\/\r\n- \/\/#define FLAG_USE_HALLS BV(14) \/*becoming obsolete, no effect on device where param SMP_COMMUTATION_SENSOR_CONFIG is present *\/\r\n+ #define FLAG_INVERTED_HALLS BV(13) \/*becoming obsolete, no effect on device where param SMP_COMMUTATION_SENSOR_CONFIG is present *\/\r\n+ #define FLAG_USE_HALLS BV(14) \/*becoming obsolete, no effect on device where param SMP_COMMUTATION_SENSOR_CONFIG is present *\/\r\n #define FLAG_MECH_BRAKE_DURING_PHASING BV(15)\r\n \t#define FLAG_LIMIT_SWITCHES_NORMALLY_OPEN_TYPE BV(16)\r\n #define SMP_MOTION_FAULT_THRESHOLD 568\r\n"} {"commit":"39c163fffd39fafcdf1a284c82a44a7ea946be98","subject":"Added timing conversion for output","message":"Added timing conversion for output\n\nThe timing result that is output to file is converted from timing steps to an actual time in milliseconds. Conversion based on 1.5 ms transfer time of the TelosB mote.","repos":"raveious\/delay-tolerant-network,raveious\/delay-tolerant-network,raveious\/delay-tolerant-network,raveious\/delay-tolerant-network,raveious\/delay-tolerant-network","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- simulations\/sim00.c\n+++ simulations\/sim00.c\n@@ -17,6 +17,8 @@\n #define START_TIME 40\n #define ACK_WAIT 10\n #define SEEN_TIME_MAX 50\n+#define TIMECONVERT 1.5 \/\/ 1.5 ms\n+\n \n \n \/*\n@@ -652,15 +654,15 @@\n \tfor( i=0; i<run; i++){\n \t\tfinalAvg = finalAvg + testTimeDataSrcToDst[i];\n \t}\n-\tfinalAvg = finalAvg \/ run;\n-\tfprintf(f, \"Final Results:\\nAvg Src to Dst Time,%d,\\n\", finalAvg);\n+\tfinalAvg = (finalAvg \/ run) * TIMECONVERT;\n+\tfprintf(f, \"Final Results:\\nAvg Src to Dst Time,%d,ms\\n\", finalAvg);\n \t\n \tfinalAvg = 0;\n \tfor( i=0; i<run; i++){\n \t\tfinalAvg = finalAvg + testTimeDataDstToSrc[i];\n \t}\t\n-\tfinalAvg = finalAvg \/ run;\n-\tfprintf(f, \"Avg Dst to Src Time,%d\\n\", finalAvg);\n+\tfinalAvg = (finalAvg \/ run) * TIMECONVERT;\n+\tfprintf(f, \"Avg Dst to Src Time,%d,ms\\n\", finalAvg);\n \t\n \tfinalAvg = 0;\n \tfor( i=0; i<run; i++){\n"} {"commit":"d9d6633a349511cdaa3d0876495bf3c7e35d6699","subject":"ongoing","message":"ongoing\n","repos":"pewsou\/SCUD","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- CPP\/scud.h\n+++ CPP\/scud.h\n@@ -112,9 +112,9 @@\n SCUD_RC_FAIL_LINK_NO_PACKET_AVAILABLE,\n SCUD_RC_FAIL_OBJ_PROPAGATION_FAILED\n } SCUD_RC;\n- \n+#ifdef SCUD_WFQ_AVAILABLE\n typedef long long SCUDTimestamp;\n- \n+#endif\n typedef struct _Prim{\n SCUD_RC retCode;\n \n@@ -297,7 +297,8 @@\n #else\n #include \"scud_custom_minordered_list.h\"\n #endif\n- \n+ \n+#ifdef SCUD_WFQ_AVAILABLE\n class SCTime{\n public:\n SCTime();\n@@ -305,6 +306,7 @@\n static SCUDTimestamp getCurrentTime();\n ~SCTime();\n };\n+#endif\n \n #ifndef SCUD_CUSTOM_RNG_AVAILABLE\n #include <stdlib.h>\n"} {"commit":"6d7aa9b8266ae982d9fb064fd7b9e055bdf99b66","subject":"Set background variance to zero if number of background pixels used is zero.","message":"Set background variance to zero if number of background pixels used is zero.","repos":"dials\/dials,dials\/dials,dials\/dials,dials\/dials,dials\/dials","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- algorithms\/integration\/summation.h\n+++ algorithms\/integration\/summation.h\n@@ -161,7 +161,8 @@\n * @returns the variance on the background intensity\n *\/\n FloatType background_variance() const {\n- double m_n = (double)n_signal_ \/ (double)n_background_;\n+ double m_n = n_background_ > 0 ?\n+ (double)n_signal_ \/ (double)n_background_ : 0.0;\n return background_variance_ * m_n;\n }\n \n@@ -199,7 +200,6 @@\n std::size_t n_background)\n {\n \/\/ Check both arrays are the same size\n- DIALS_ASSERT(n_background > 0);\n DIALS_ASSERT(signal.size() == background.size());\n \n \/\/ Save the number of background pixels\n@@ -232,7 +232,6 @@\n std::size_t n_background)\n {\n \/\/ Check both arrays are the same size\n- DIALS_ASSERT(n_background > 0);\n DIALS_ASSERT(signal.size() == background.size());\n DIALS_ASSERT(signal.size() == mask.size());\n \n"} {"commit":"8224deeeb3cb52679d39e6da01d3182d016c319b","subject":"Issue 2119: The f2c.h file included with COPASI recognizes now the C_LOGICAL definition.","message":"Issue 2119: The f2c.h file included with COPASI recognizes now the\nC_LOGICAL definition.\n","repos":"copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- copasi\/lapack\/f2c.h\n+++ copasi\/lapack\/f2c.h\n@@ -1,4 +1,4 @@\n-\/\/ Copyright (C) 2013 by Pedro Mendes, Virginia Tech Intellectual\n+\/\/ Copyright (C) 2013 - 2015 by Pedro Mendes, Virginia Tech Intellectual\n \/\/ Properties, Inc., University of Heidelberg, and The University\n \/\/ of Manchester.\n \/\/ All rights reserved.\n@@ -15,7 +15,7 @@\n \/\/ for compatibility with default CLAPACK f2c\n typedef C_INT integer;\n typedef unsigned C_INT uinteger;\n-typedef C_INT logical;\n+typedef C_LOGICAL logical;\n \n typedef char *address;\n typedef short int shortint;\n"} {"commit":"b49c19ee090ef1104ad3e09f1693bd5e6b904c32","subject":"Create pcl_to_pdf.c","message":"Create pcl_to_pdf.c","repos":"DaDaDadeo\/GetCycle,DaDaDadeo\/GetCycle,DaDaDadeo\/GetCycle,DaDaDadeo\/GetCycle","returncode":1,"stderr":"error: pathspec 'pcl_to_pdf.c' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- pcl_to_pdf.c\n+++ pcl_to_pdf.c\n@@ -0,0 +1,225 @@\n+\/*\n+ * << Haru Free PDF Library 2.0.0 >> -- font_demo.c\n+ *\n+ * Copyright (c) 1999-2006 Takeshi Kanno <takeshi_kanno@est.hi-ho.ne.jp>\n+ *\n+ * Permission to use, copy, modify, distribute and sell this software\n+ * and its documentation for any purpose is hereby granted without fee,\n+ * provided that the above copyright notice appear in all copies and\n+ * that both that copyright notice and this permission notice appear\n+ * in supporting documentation.\n+ * It is provided \"as is\" without express or implied warranty.\n+ *\n+ **********************************************************************\n+ *\n+ * Remix by Dan Lindamood III\n+ * \n+ * Scope: Create PDF file from text with plc code. \n+ * \t Match formatting to printers using raw 9100 telnet protocol.\n+ *\n+ * Rev 1 2014Jun30\n+ * Compile using command: gcc -o pcl_to_pdf -O2 -Wall pcl_to_pdf.c -lhpdf -lz -lm\n+ *\n+ *\/\n+\n+\n+#include <stdlib.h>\n+#include <stdio.h>\n+#include <string.h>\n+#include <setjmp.h>\n+#include \"hpdf.h\"\n+#include <time.h>\n+\n+jmp_buf env;\n+\n+#ifdef HPDF_DLL\n+void __stdcall\n+#else\n+void\n+#endif\n+error_handler (HPDF_STATUS error_no,\n+ HPDF_STATUS detail_no,\n+ void *user_data)\n+{\n+ printf (\"ERROR: error_no=%04X, detail_no=%u\\n\", (HPDF_UINT)error_no,\n+ (HPDF_UINT)detail_no);\n+ longjmp(env, 1);\n+}\n+\n+\/\/RANDOM PASSWORD\/\/\/\/\/\/\/\/\/\/\/\/\/\/RANDOM PASSWORD\/\/\/\/\/\/\/\/\/\/\/\/\/\/RANDOM PASSWORD\/\/\/\/\/\/\/\/\/\/\/\/\/\/RANDOM PASSWORD\/\/\/\/\/\/\/\/\/\/\n+\n+\n+char *rand_str(char *dst, int size)\n+{\n+ static const char text[] = \"abcdefghijklmnopqrstuvwxyz\"\n+ \"ABCDEFGHIJKLMNOPQRSTUVWXYZ\"\n+ \"1234567890\";\n+ int i;\n+ for ( i = 0; i < 8; ++i )\n+ {\n+ dst[i] = text[rand() % (sizeof text - 1)];\n+ }\n+ dst[i] = '\\0';\n+ return dst;\n+}\n+\n+\n+\n+\/\/MAIN \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/MAIN\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/MAIN\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/MAIN\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+int main (int argc, char **argv)\n+{\n+ HPDF_Doc pdf;\n+ char fname[256];\n+ HPDF_Page page;\n+ HPDF_REAL height;\n+ HPDF_REAL width;\n+\n+\n+\n+ if (argc < 4) {\n+ printf(\"\\nAdd [Printed File] [File to Print] [Lines Per Page]\\n\\n\\\n+\t\tExample: \/home\/user\/newfile.pdf \/home\/user\/filetoprint.txt 62\\n\\n\\\n+\t\tAdditional Options:\\n\\\n+\t\tAuthor\\n\\\n+\t\tCreator\\n\\\n+\t\tTitle\\n\\\n+\t\tSubject\\n\\\n+\t\tKeywords\\n\\n\");\n+ return 0;\n+ }\n+\n+ strcpy (fname, argv[1]);\n+\n+ pdf = HPDF_New (error_handler, NULL);\n+ if (!pdf) {\n+ printf (\"error: cannot create PdfDoc object\\n\");\n+ return 1;\n+ }\n+\n+ if (setjmp(env)) {\n+ HPDF_Free (pdf);\n+ return 1;\n+ }\n+\n+ \/* Start with the first page. *\/\n+ page = HPDF_AddPage (pdf);\n+\n+ if (argc >= 5) HPDF_SetInfoAttr(pdf, HPDF_INFO_AUTHOR, argv[4]);\n+ if (argc >= 6) HPDF_SetInfoAttr(pdf, HPDF_INFO_CREATOR, argv[5]);\n+ if (argc >= 7)HPDF_SetInfoAttr(pdf, HPDF_INFO_TITLE, argv[6]);\n+ if (argc >= 8)HPDF_SetInfoAttr(pdf, HPDF_INFO_SUBJECT, argv[7]);\n+ if (argc == 9)HPDF_SetInfoAttr(pdf, HPDF_INFO_KEYWORDS, argv[8]);\n+\n+\n+\n+\n+ char owner_passwd[10];\n+ srand(time(0)); \n+ rand_str(owner_passwd, sizeof owner_passwd);\/\/Create random password\n+\/\/ printf(\"Password Test: %s\\n\", owner_passwd);\/\/For Testing\n+\n+ HPDF_SetPassword (pdf, owner_passwd, \"\"); \n+ HPDF_SetPermission (pdf, HPDF_ENABLE_PRINT | HPDF_ENABLE_COPY);\n+ HPDF_SetEncryptionMode (pdf, HPDF_ENCRYPT_R3, 16);\n+ HPDF_Page_SetRGBFill (page, 0.0, 0.0, 0);\n+ HPDF_Page_SetSize(page,HPDF_PAGE_SIZE_LETTER,HPDF_PAGE_PORTRAIT); \n+ \n+ height = HPDF_Page_GetHeight (page);\n+ width = HPDF_Page_GetWidth (page);\n+\n+\n+ HPDF_Page_BeginText (page);\n+ HPDF_Page_MoveTextPos (page, 25, height - 25);\n+\n+\n+ FILE * pFile;\n+ int line_num = 0;\n+ char temp[138];\n+ char *find_ff;\n+ int newpage = 0;\n+ int null_loc = -1 ;\n+ int page_line = 0;\n+\tpFile = fopen (argv[2] , \"r\");\/\/text file to print\n+\n+ while((fgets(temp, 138, pFile) != NULL)) { \/\/Retrieve each line from text file and check it for printing.\n+\n+\n+ if ((newpage == 1) || (page_line == atoi(argv[3]))){ \/\/if new page is triggered and \\f at end of previous line (or line count == ##), go ahead and start new page now\n+ page = HPDF_AddPage (pdf);\n+ HPDF_Page_SetSize(page,HPDF_PAGE_SIZE_LETTER,HPDF_PAGE_PORTRAIT);\n+ newpage = 0;\n+ page_line = 0;\/\/reset line count for new page\n+\t\t\theight = HPDF_Page_GetHeight (page);\n+ width = HPDF_Page_GetWidth (page);\n+ HPDF_Page_BeginText (page);\n+ HPDF_Page_MoveTextPos (page, 25, height - 25);\n+\t\t}\n+\n+\t\tfind_ff = strchr(temp, '\\f');\n+\n+\t\tif(find_ff){ \/\/If a new form feed (\\f ascii 12) character or 61 lines, trigger new page bit\n+\t\t\t\/* Add a new page object. *\/\n+\t\t\tnewpage++;\n+\t\t\tsize_t len = find_ff - temp;\n+\t\t\tmemmove(&temp[len], &temp[len+1], strlen(temp) - len);\/\/Remove character from print\n+\n+\t\t}\n+ if (newpage == 1 && ((find_ff-temp)==0)){ \/\/if new page is triggered and \\f at start of string, start new page now\n+ page = HPDF_AddPage (pdf);\n+ HPDF_Page_SetSize(page,HPDF_PAGE_SIZE_LETTER,HPDF_PAGE_PORTRAIT);\n+\t\t\tnewpage = 0;\n+ page_line = 0;\/\/reset line count for new page\n+\t\t\theight = HPDF_Page_GetHeight (page);\n+ width = HPDF_Page_GetWidth (page);\n+ HPDF_Page_BeginText (page);\n+ HPDF_Page_MoveTextPos (page, 25, height - 25);\n+ }\n+\n+ HPDF_Font font = HPDF_GetFont (pdf, \"Courier\", NULL);\/\/Use this font for entire print.\n+\n+ if (strstr(temp, \"(s16H\")!= NULL) { \/\/Change font size to small if pcl6 code indicates to do so\n+\t\t\tHPDF_Page_SetFontAndSize (page, font, 7.5);\n+ memmove(temp,temp+6,strlen(temp)-6);\/\/Remove pcl6 code\n+\t\t\tif (strstr(temp, \"(s10H\")!= NULL) null_loc = strstr(temp, \"(s10H\")- temp - 1;\/\/Look for location of dead pcl6 code at end of line\n+ \telse null_loc = 120;\/\/Default to 120 characters in case of error\n+\/\/\t\t\tprintf(\"%d\\n\",null_loc);\/\/For Testing\n+\t\t \ttemp[null_loc]= '\\0';\/\/Nullify the pcl6 code at end of line.\n+\t\t}\n+\t\telse HPDF_Page_SetFontAndSize (page, font, 12);\n+\t\tif (strstr(temp, \"*r-3U\")!= NULL) { \/\/Change font color to red if pcl6 code indicates to do so. (for alarms).\n+\t\t\tHPDF_Page_SetRGBFill (page, 1.0, 0.0, 0);\/\/code for red\n+ memmove(temp,temp+12,strlen(temp)-12);\/\/Remove pcl6 code\n+\/\/\t\t\tprintf(\"%s\\n\",temp);\/\/For Testing\n+\t\t\tif (strstr(temp, \"v07S\")!= NULL) null_loc = strstr(temp, \"v07S\")- temp - 2;\/\/Remove pcl6 code\n+ else null_loc = 120;\/\/Default to 120 characters in case of error\n+\/\/\t\t\tprintf(\"%d\\n\",null_loc);\/\/For Testing\n+ temp[null_loc]= '\\0';\/\/Nullify the pcl6 code at end of line.\n+ }\n+ else HPDF_Page_SetRGBFill (page, 0.0, 0.0, 0);\/\/Default to black font colr if not alarm\n+\/\/\t\tprintf(\"%s\\n\",temp); \/\/For Testing\n+ HPDF_Page_ShowText (page, temp);\/\/Send line to pdf print\n+ HPDF_Page_MoveTextPos (page, 0 , - 12);\/\/Set next position for new line\n+\n+\n+ \tline_num++;\n+\t\tpage_line++;\n+ }\n+\n+ fclose (pFile);\n+\n+\n+\n+\n+ HPDF_Page_EndText (page);\n+\n+ HPDF_SaveToFile (pdf, fname);\n+\n+ \/* clean up *\/\n+ HPDF_Free (pdf);\n+\n+ return 0;\n+}\n+\n+\n+\n+\n"} {"commit":"fdd50edb76378fbc9c642bba6b5120a6b53d06c7","subject":"[Core][ROOT-4578] Prevent usage of non integer id in ClassDef macro","message":"[Core][ROOT-4578] Prevent usage of non integer id in ClassDef macro\n\nusing a static assert. The error prompted by dictionary generation is:\n```\ninput_line_9:7:1: error: static_assert failed \"ClassDef(Inline) macro: the specified ID is not an integer.\"\nClassDef(A, 1.4f)\n^~~~~~~~~~~~~~~~~\n\/Users\/danilopiparo\/RootDevel\/Root6\/head\/build\/include\/Rtypes.h:326:4: note: expanded from macro 'ClassDef'\n _ClassDefOutline_(name,id,virtual,) \\\n ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\/Users\/danilopiparo\/RootDevel\/Root6\/head\/build\/include\/Rtypes.h:300:4: note: expanded from macro '_ClassDefOutline_'\n _ClassDefBase_(name,id, virtual_keyword, overrd) \\\n ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\/Users\/danilopiparo\/RootDevel\/Root6\/head\/build\/include\/Rtypes.h:271:4: note: expanded from macro '_ClassDefBase_'\n static_assert(std::is_integral<decltype(id)>::value, \"ClassDef(Inline) macro: the specified ID is not an integer.\")...\n```\n","repos":"root-mirror\/root,olifre\/root,root-mirror\/root,karies\/root,olifre\/root,olifre\/root,karies\/root,olifre\/root,root-mirror\/root,karies\/root,karies\/root,karies\/root,root-mirror\/root,karies\/root,karies\/root,karies\/root,olifre\/root,root-mirror\/root,root-mirror\/root,root-mirror\/root,root-mirror\/root,root-mirror\/root,olifre\/root,root-mirror\/root,olifre\/root,karies\/root,karies\/root,karies\/root,root-mirror\/root,olifre\/root,olifre\/root,olifre\/root,olifre\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/base\/inc\/Rtypes.h\n+++ core\/base\/inc\/Rtypes.h\n@@ -267,7 +267,8 @@\n \/\/ DeclFileLine() is not part of it since CINT uses that as trigger for\n \/\/ the class comment string.\n #define _ClassDefBase_(name, id, virtual_keyword, overrd) \\\n-private: \\\n+private: \\\n+ static_assert(std::is_integral<decltype(id)>::value, \"ClassDef(Inline) macro: the specified ID is not an integer.\"); \\\n virtual_keyword Bool_t CheckTObjectHashConsistency() const overrd \\\n { \\\n static std::atomic<UChar_t> recurseBlocker(0); \\\n"} {"commit":"3646219d19af7c5241a39aa45908bfb547484918","subject":"Add the method SetAlpha do set the alpha value of a color.","message":"Add the method SetAlpha do set the alpha value of a color.\n\n\ngit-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@43459 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/base\/inc\/TColor.h\n+++ core\/base\/inc\/TColor.h\n@@ -93,6 +93,7 @@\n virtual Float_t GetGrayscale() const { \/*ITU*\/ return 0.299f*fRed + 0.587f*fGreen + 0.114f*fBlue; }\n virtual void ls(Option_t *option=\"\") const;\n virtual void Print(Option_t *option=\"\") const;\n+ virtual void SetAlpha(Float_t a) { fAlpha = a; }\n virtual void SetRGB(Float_t r, Float_t g, Float_t b);\n \n static void InitializeColors();\n"} {"commit":"a50535d7dcc22648c2b7843d512b629e78be7d55","subject":"unix: use dlopen's lookup mechanism when not specifying a path","message":"unix: use dlopen's lookup mechanism when not specifying a path\n\nThis allows FFI modules to be specified in the same manner as you would\nwhen linking to them (-lGL --> GL, instead of \/usr\/lib\/x86_64-linux-gnu\/libGL.so\nas was required before this change, unless you manually placed\n\/usr\/lib\/x86_64-linux-gnu in your LD_LIBRARY_PATH).\n","repos":"OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/unix\/vm\/sqUnixExternalPrims.c\n+++ platforms\/unix\/vm\/sqUnixExternalPrims.c\n@@ -222,6 +222,9 @@\n * moduleName and suffix. Answer the new module entry, or 0 if the shared\n * library could not be loaded. Try all combinations of prefixes and suffixes,\n *\tincluding no prefix or suffix.\n+ *\n+ * Passing an empty string means to not consider a directory but let dlopen\n+ * figure out the path.\n *\/\n static void *\n tryLoading(char *dirName, char *moduleName)\n@@ -231,10 +234,11 @@\n void *handle= 0;\n char\t **prefix= 0, **suffix= 0;\n struct stat buf;\n+\tint useFullPath = dirName[0] != 0;\n \n DPRINTF((stderr, __FILE__ \" %d tryLoadModule(%s,%s)\\n\", __LINE__, dirName, moduleName));\n \/* If dirName does not exist it is pointless searching for libraries in it. *\/\n- if (stat(dirName,&buf)) {\n+ if (useFullPath && stat(dirName,&buf)) {\n \tif (errno != ENOENT) {\n \t\tfprintf(stderr,\n \t\t\t\t\"tryLoading(%s,%s): stat(%s) %s\\n\",\n@@ -249,15 +253,18 @@\n \t\tint n;\n \t\tn = snprintf(libName, sizeof(libName), \"%s%s%s%s\",dirName,*prefix,moduleName,*suffix);\n \t\tassert(n >= 0 && n < NAME_MAX + 32);\n-\t\tif (!stat(libName, &buf)) {\n-\t\t\tif (S_ISDIR(buf.st_mode))\n+\t\tif (!useFullPath || !stat(libName, &buf)) {\n+\t\t\tif (useFullPath && S_ISDIR(buf.st_mode))\n \t\t\t\tDPRINTF((stderr, __FILE__ \" %d ignoring directory: %s\\n\", __LINE__, libName));\n \t\t\telse {\n \t\t\t\thandle = dlopen(libName, RTLD_NOW | RTLD_GLOBAL);\n \t\t\t\tDPRINTF((stderr, __FILE__ \" %d tryLoading dlopen(%s) = %p\\n\", __LINE__, libName, handle));\n \t\t\t\tif (handle == 0) {\n-\t\t\t\t\tfprintf(stderr,\"%s tryLoading %s: dlopen: %s\\n\", moduleName, libName, dlerror());\n-\t\t\t\t\tfflush(stderr);\n+\t\t\t\t\t\/\/ only report a failure to load if we definitely expected to be able to load something\n+\t\t\t\t\tif (useFullPath) {\n+\t\t\t\t\t\tfprintf(stderr,\"%s tryLoading %s: dlopen: %s\\n\", moduleName, libName, dlerror());\n+\t\t\t\t\t\tfflush(stderr);\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\telse {\n # if DEBUG\n"} {"commit":"119e9b2ef67e10192a6ab75fc074a03ce555e6d8","subject":"Clarify copyright status","message":"Clarify copyright status\n\nSigned-off-by: Luca Bruno <54b63133bb17564df145c2c274f1bc31eb9aa743@rocket-internet.de>\n","repos":"vidiecan\/nginx-http-shibboleth","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ngx_http_shibboleth_module.c\n+++ ngx_http_shibboleth_module.c\n@@ -1,7 +1,16 @@\n \n \/*\n+\n+ Original ngx_http_auth_request module:\n * Copyright (C) Maxim Dounin\n * Copyright (C) Nginx, Inc.\n+\n+ Forked Shibboleth dedicated module:\n+ * Copyright (C) 2013, David Beitey (davidjb)\n+ * Copyright (C) 2014, Luca Bruno\n+\n+ Distributed under 2-clause BSD license, see LICENSE file.\n+\n *\/\n \n \n"} {"commit":"06f4b2578a272a2c7f4d1968b0cc9bd89196f8c5","subject":"mesh: Proxy: Fine-tune subnet advertising rotation","message":"mesh: Proxy: Fine-tune subnet advertising rotation\n\nCreate a slightly smarter algorithm for choosing how long to advertise\neach subnet. This is particularly important for the mesh_shell app,\nsince it uses a 10 second NODE_ID_TIMEOUT, meaning starting Node ID\nadvertising through user interaction would only succeed in advertising\none subnet (due to this being configured to 10 seconds).\n\nX-Original-Commit: ae81ee5336cd087597cbfbd9f22659cf27d86195\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/host\/mesh\/src\/proxy.c\n+++ nimble\/host\/mesh\/src\/proxy.c\n@@ -1116,6 +1116,7 @@\n static s32_t gatt_proxy_advertise(struct bt_mesh_subnet *sub)\n {\n \ts32_t remaining = K_FOREVER;\n+\tint subnet_count;\n \n \tBT_DBG(\"\");\n \n@@ -1146,8 +1147,22 @@\n \t\t}\n \t}\n \n-\tif (sub_count() > 1 && (remaining > K_SECONDS(10) || remaining < 0)) {\n-\t\tremaining = K_SECONDS(10);\n+\tsubnet_count = sub_count();\n+\tBT_DBG(\"sub_count %u\", subnet_count);\n+\tif (subnet_count > 1) {\n+\t\ts32_t max_timeout;\n+\n+\t\t\/* We use NODE_ID_TIMEOUT as a starting point since it may\n+\t\t * be less than 60 seconds. Divide this period into at least\n+\t\t * 6 slices, but make sure that a slice is at least one\n+\t\t * second long (to avoid excessive rotation).\n+\t\t *\/\n+\t\tmax_timeout = NODE_ID_TIMEOUT \/ max(subnet_count, 6);\n+\t\tmax_timeout = max(max_timeout, K_SECONDS(1));\n+\n+\t\tif (remaining > max_timeout || remaining < 0) {\n+\t\t\tremaining = max_timeout;\n+\t\t}\n \t}\n \n \tBT_DBG(\"Advertising %d ms for net_idx 0x%04x\", remaining, sub->net_idx);\n"} {"commit":"e713c3fb84d5cda5021961518ce3f15145d10d80","subject":"nimble\/ll: Start LL response timer on PHY REQ as a slave","message":"nimble\/ll: Start LL response timer on PHY REQ as a slave\n\nIf master does not end PHY Update procedure, Slave is responsible to\ndrop the link.\n\nIt fixes test LL\/CON\/SLA\/BV-51\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_ctrl.c\n+++ nimble\/controller\/src\/ble_ll_ctrl.c\n@@ -513,6 +513,36 @@\n return BLE_ERR_MAX;\n }\n \n+\/**\n+ * Callback when LL control procedure times out (for a given connection). If\n+ * this is called, it means that we need to end the connection because it\n+ * has not responded to a LL control request.\n+ *\n+ * Context: Link Layer\n+ *\n+ * @param arg Pointer to connection state machine.\n+ *\/\n+void\n+ble_ll_ctrl_proc_rsp_timer_cb(struct ble_npl_event *ev)\n+{\n+ \/* Control procedure has timed out. Kill the connection *\/\n+ ble_ll_conn_timeout((struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev),\n+ BLE_ERR_LMP_LL_RSP_TMO);\n+}\n+\n+static void\n+ble_ll_ctrl_start_rsp_timer(struct ble_ll_conn_sm *connsm)\n+{\n+ ble_npl_callout_init(&connsm->ctrl_proc_rsp_timer,\n+ &g_ble_ll_data.ll_evq,\n+ ble_ll_ctrl_proc_rsp_timer_cb,\n+ connsm);\n+\n+ \/* Re-start timer. Control procedure timeout is 40 seconds *\/\n+ ble_npl_callout_reset(&connsm->ctrl_proc_rsp_timer,\n+ ble_npl_time_ms_to_ticks32(BLE_LL_CTRL_PROC_TIMEOUT_MS));\n+}\n+\n #if (BLE_LL_BT5_PHY_SUPPORTED == 1)\n void\n ble_ll_ctrl_phy_update_proc_complete(struct ble_ll_conn_sm *connsm)\n@@ -793,6 +823,10 @@\n CONN_F_PEER_PHY_UPDATE(connsm) = 1;\n ble_ll_ctrl_phy_req_rsp_make(connsm, rsp);\n rsp_opcode = BLE_LL_CTRL_PHY_RSP;\n+\n+ \/* Start response timer *\/\n+ connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_PHY_UPDATE;\n+ ble_ll_ctrl_start_rsp_timer(connsm);\n }\n return rsp_opcode;\n }\n@@ -1822,23 +1856,6 @@\n connsm->csmflags.cfbit.chanmap_update_scheduled = 1;\n }\n }\n-}\n-\n-\/**\n- * Callback when LL control procedure times out (for a given connection). If\n- * this is called, it means that we need to end the connection because it\n- * has not responded to a LL control request.\n- *\n- * Context: Link Layer\n- *\n- * @param arg Pointer to connection state machine.\n- *\/\n-void\n-ble_ll_ctrl_proc_rsp_timer_cb(struct ble_npl_event *ev)\n-{\n- \/* Control procedure has timed out. Kill the connection *\/\n- ble_ll_conn_timeout((struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev),\n- BLE_ERR_LMP_LL_RSP_TMO);\n }\n \n \/**\n@@ -2038,14 +2055,7 @@\n \n \/* Initialize the procedure response timeout *\/\n if (ctrl_proc != BLE_LL_CTRL_PROC_CHAN_MAP_UPD) {\n- ble_npl_callout_init(&connsm->ctrl_proc_rsp_timer,\n- &g_ble_ll_data.ll_evq,\n- ble_ll_ctrl_proc_rsp_timer_cb,\n- connsm);\n-\n- \/* Re-start timer. Control procedure timeout is 40 seconds *\/\n- ble_npl_callout_reset(&connsm->ctrl_proc_rsp_timer,\n- ble_npl_time_ms_to_ticks32(BLE_LL_CTRL_PROC_TIMEOUT_MS));\n+ ble_ll_ctrl_start_rsp_timer(connsm);\n }\n }\n }\n"} {"commit":"1a98de0cb75ce92795d4f6b6805e5886959a1561","subject":"MFC 1.3: Fix an off-by-one bug.","message":"MFC 1.3: Fix an off-by-one bug.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sbin\/ifconfig\/af_link.c\n+++ sbin\/ifconfig\/af_link.c\n@@ -79,7 +79,7 @@\n \n \tif (which != ADDR)\n \t\terrx(1, \"can't set link-level netmask or broadcast\");\n-\tif ((temp = malloc(strlen(addr) + 1)) == NULL)\n+\tif ((temp = malloc(strlen(addr) + 2)) == NULL)\n \t\terrx(1, \"malloc failed\");\n \ttemp[0] = ':';\n \tstrcpy(temp + 1, addr);\n"} {"commit":"80b1e816c6a86dc14585050e91ef45b958f9103d","subject":"Remove unused drawable parameter","message":"Remove unused drawable parameter\n\nSigned-off-by: Frediano Ziglio <55d48b080b2e443e395cde84d2c83b135a4ff48e@redhat.com>\nAcked-by: Pavel Grunt <fbda40b445316123f12a5a6bd7556918ea74f4bc@redhat.com>\n","repos":"fgouget\/spice,fgouget\/spice,fgouget\/spice,fgouget\/spice","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- server\/dcc-send.c\n+++ server\/dcc-send.c\n@@ -129,7 +129,7 @@\n all the surface is considered. out_lossy_data will hold info about the bitmap, and its lossy\n area in case it is lossy and part of a surface. *\/\n static int is_bitmap_lossy(RedChannelClient *rcc, SpiceImage *image, SpiceRect *area,\n- Drawable *drawable, BitmapData *out_data)\n+ BitmapData *out_data)\n {\n DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);\n \n@@ -165,11 +165,11 @@\n }\n \n static int is_brush_lossy(RedChannelClient *rcc, SpiceBrush *brush,\n- Drawable *drawable, BitmapData *out_data)\n+ BitmapData *out_data)\n {\n if (brush->type == SPICE_BRUSH_TYPE_PATTERN) {\n return is_bitmap_lossy(rcc, brush->u.pattern.pat, NULL,\n- drawable, out_data);\n+ out_data);\n } else {\n out_data->type = BITMAP_DATA_TYPE_INVALID;\n return FALSE;\n@@ -832,7 +832,7 @@\n (rop & SPICE_ROPD_OP_AND) ||\n (rop & SPICE_ROPD_OP_XOR));\n \n- brush_is_lossy = is_brush_lossy(rcc, &drawable->u.fill.brush, item,\n+ brush_is_lossy = is_brush_lossy(rcc, &drawable->u.fill.brush,\n &brush_bitmap_data);\n if (!dest_allowed_lossy) {\n dest_is_lossy = is_surface_area_lossy(dcc, item->surface_id, &drawable->bbox,\n@@ -922,13 +922,12 @@\n (rop & SPICE_ROPD_OP_AND) ||\n (rop & SPICE_ROPD_OP_XOR));\n \n- brush_is_lossy = is_brush_lossy(rcc, &drawable->u.opaque.brush, item,\n+ brush_is_lossy = is_brush_lossy(rcc, &drawable->u.opaque.brush,\n &brush_bitmap_data);\n \n if (!src_allowed_lossy) {\n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.opaque.src_bitmap,\n &drawable->u.opaque.src_area,\n- item,\n &src_bitmap_data);\n }\n \n@@ -1007,7 +1006,7 @@\n FillBitsType src_send_type;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.copy.src_bitmap,\n- &drawable->u.copy.src_area, item, &src_bitmap_data);\n+ &drawable->u.copy.src_area, &src_bitmap_data);\n \n src_send_type = red_marshall_qxl_draw_copy(rcc, base_marshaller, dpi, TRUE);\n if (src_send_type == FILL_BITS_TYPE_COMPRESS_LOSSY) {\n@@ -1049,7 +1048,7 @@\n BitmapData src_bitmap_data;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.transparent.src_bitmap,\n- &drawable->u.transparent.src_area, item, &src_bitmap_data);\n+ &drawable->u.transparent.src_area, &src_bitmap_data);\n \n if (!src_is_lossy || (src_bitmap_data.type != BITMAP_DATA_TYPE_SURFACE)) {\n red_marshall_qxl_draw_transparent(rcc, base_marshaller, dpi);\n@@ -1103,7 +1102,7 @@\n FillBitsType src_send_type;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.alpha_blend.src_bitmap,\n- &drawable->u.alpha_blend.src_area, item, &src_bitmap_data);\n+ &drawable->u.alpha_blend.src_area, &src_bitmap_data);\n \n src_send_type = red_marshall_qxl_draw_alpha_blend(rcc, base_marshaller, dpi, TRUE);\n \n@@ -1199,7 +1198,7 @@\n SpiceRect dest_lossy_area;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.blend.src_bitmap,\n- &drawable->u.blend.src_area, item, &src_bitmap_data);\n+ &drawable->u.blend.src_area, &src_bitmap_data);\n dest_is_lossy = is_surface_area_lossy(dcc, drawable->surface_id,\n &drawable->bbox, &dest_lossy_area);\n \n@@ -1366,8 +1365,8 @@\n SpiceRect dest_lossy_area;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.rop3.src_bitmap,\n- &drawable->u.rop3.src_area, item, &src_bitmap_data);\n- brush_is_lossy = is_brush_lossy(rcc, &drawable->u.rop3.brush, item,\n+ &drawable->u.rop3.src_area, &src_bitmap_data);\n+ brush_is_lossy = is_brush_lossy(rcc, &drawable->u.rop3.brush,\n &brush_bitmap_data);\n dest_is_lossy = is_surface_area_lossy(dcc, drawable->surface_id,\n &drawable->bbox, &dest_lossy_area);\n@@ -1446,9 +1445,9 @@\n SpiceRect dest_lossy_area;\n \n src_is_lossy = is_bitmap_lossy(rcc, drawable->u.composite.src_bitmap,\n- NULL, item, &src_bitmap_data);\n+ NULL, &src_bitmap_data);\n mask_is_lossy = drawable->u.composite.mask_bitmap &&\n- is_bitmap_lossy(rcc, drawable->u.composite.mask_bitmap, NULL, item, &mask_bitmap_data);\n+ is_bitmap_lossy(rcc, drawable->u.composite.mask_bitmap, NULL, &mask_bitmap_data);\n \n dest_is_lossy = is_surface_area_lossy(dcc, drawable->surface_id,\n &drawable->bbox, &dest_lossy_area);\n@@ -1525,7 +1524,7 @@\n SpiceRect dest_lossy_area;\n int rop;\n \n- brush_is_lossy = is_brush_lossy(rcc, &drawable->u.stroke.brush, item,\n+ brush_is_lossy = is_brush_lossy(rcc, &drawable->u.stroke.brush,\n &brush_bitmap_data);\n \n \/\/ back_mode is not used at the client. Ignoring.\n@@ -1609,9 +1608,9 @@\n SpiceRect dest_lossy_area;\n int rop = 0;\n \n- fg_is_lossy = is_brush_lossy(rcc, &drawable->u.text.fore_brush, item,\n+ fg_is_lossy = is_brush_lossy(rcc, &drawable->u.text.fore_brush,\n &fg_bitmap_data);\n- bg_is_lossy = is_brush_lossy(rcc, &drawable->u.text.back_brush, item,\n+ bg_is_lossy = is_brush_lossy(rcc, &drawable->u.text.back_brush,\n &bg_bitmap_data);\n \n \/\/ assuming that if the brush type is solid, the destination can\n"} {"commit":"94656c6817a660d4f075994da7dbf8a71783c769","subject":"Remove forward declaration of GeolocationDispatcherOld from render_view.h","message":"Remove forward declaration of GeolocationDispatcherOld from render_view.h\n\nBUG=None\nTEST=Compile\n\nReview URL: http:\/\/codereview.chromium.org\/6719032\n\ngit-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@79558 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n","repos":"wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- content\/renderer\/render_view.h\n+++ content\/renderer\/render_view.h\n@@ -62,7 +62,6 @@\n class ExternalPopupMenu;\n class FilePath;\n class GeolocationDispatcher;\n-class GeolocationDispatcherOld;\n class GURL;\n class ListValue;\n class LoadProgressTracker;\n"} {"commit":"add99eb0f195cd37f22e39bf103a326128aa2881","subject":"DiffEntry: drop useless words from ToString() output","message":"DiffEntry: drop useless words from ToString() output\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- stingraykit\/collection\/DiffEntry.h\n+++ stingraykit\/collection\/DiffEntry.h\n@@ -30,7 +30,7 @@\n \t\t{ return CompareMembersCmp(&DiffEntry::Op, &DiffEntry::Item)(*this, other); }\n \n \t\tstd::string ToString() const\n-\t\t{ return StringBuilder() % \"DiffEntry { op: \" % Op % \", item: \" % Item % \" }\"; }\n+\t\t{ return StringBuilder() % \"{ \" % Op % \": \" % Item % \" }\"; }\n \t};\n \n \n"} {"commit":"226a05b64e359c31003ede6305502425aa2ec433","subject":"some template code for James to play with inorder to bind threads.","message":"some template code for James to play with inorder to bind threads.\n","repos":"SESA\/EBBlib,jmcadden\/EBBlib,jmcadden\/EBBlib,SESA\/EBBlib,jmcadden\/EBBlib,SESA\/EBBlib,SESA\/EBBlib,jmcadden\/EBBlib","returncode":1,"stderr":"error: pathspec 'contrib\/jmcddn\/ssac_cpp\/bind.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- contrib\/jmcddn\/ssac_cpp\/bind.c\n+++ contrib\/jmcddn\/ssac_cpp\/bind.c\n@@ -0,0 +1,93 @@\n+int\n+static num_phys_cores()\n+{\n+#ifdef __APPLE__\n+ \/\/ based on doc I could find on net about OSX\/mach internals\n+ int mib[4], numcores;\n+ size_t len, size;\n+ \n+ len = 4;\n+ sysctlnametomib(\"hw.physicalcpu_max\", mib, &len);\n+\n+ size = sizeof(numcores);\n+ if (sysctl(mib, len, &numcores, &size, NULL, 0)==-1) {\n+\tperror(\"sysctl\");\n+\treturn -1;\n+ }\n+ return numcores;\n+#else \n+ return sysconf(_SC_NPROCESSORS_ONLN);\n+#endif\n+}\n+\n+#ifndef __APPLE__\n+struct linux_thread_init_arg {\n+ void *(*func)(void *);\n+ void *arg;\n+};\n+\n+void *\n+linux_thread_init(void *arg, int processor)\n+{\n+ struct linux_thread_init_arg *a = (struct linux_thread_init_arg *)arg;\n+ void *(*func)(void *) = a->func;\n+ void *theArg = a->arg;\n+\n+ free(arg);\n+\n+ cpu_set_t mask;\n+ \/\/ Pin process to cpu\n+ CPU_ZERO( &mask );\n+ CPU_SET(processor, &mask);\n+ if (sched_setaffinity(0, sizeof(mask), &mask) == -1) {\n+ perror(\"ERROR: Could not set CPU Affinity, exiting...\\n\");\n+ exit(-1);\n+ }\n+ return func(arg);\n+}\n+#endif\n+\n+pthread_t\n+create_bound_thread(int id, void *(*func)(void *), void *arg);\n+{\n+ int numcores, physicalcore, pid, rc;\n+ thread_affinity_policy_data_t affinityinfo;\n+ pthread_t tid;\n+\n+ numcores = num_phys_cores();\n+ pid = id % numcores;\n+\n+ if (id < 0 || id >= numcores) return -1;\n+\n+#ifdef __APPLE__\n+ rc = pthread_create_suspended_np(&tid, NULL, func, arg);\n+ if (rc != 0) {\n+ perror(\"pthread_create_suspended_np\");\n+ return -1;\n+ }\n+\n+ affinityinfo.affinity_tag = pid+1;\n+ rc = thread_policy_set(pthread_mach_thread_np(tids[id]), \n+\t\t\t THREAD_AFFINITY_POLICY,\n+\t\t\t &affinityinfo,\n+\t\t\t THREAD_AFFINITY_POLICY_COUNT);\n+ if (rc != KERN_SUCCESS) {\n+ perror(\"thread_policy_set\");\n+ return -1;\n+ }\n+\n+ thread_resume(pthread_mach_thread_np(tids[id]));\n+#else\n+ \/\/ Linux code here\n+ struct linux_thread_init_arg *args;\n+ args->func = proc;\n+ args->arg = arg;\n+ rc = pthread_create(&tid, NULL, linux_thread_init, (void *)args) < 0);\n+ if (rc != 0) {\n+ perror(\"pthread_create\");\n+ return -1;\n+ }\n+#endif\n+ \n+ return tid;\n+}\n"} {"commit":"6920597d63261fc2e4508f201e25316181001fe4","subject":"more tweaks, but output all 6s.","message":"more tweaks, but output all 6s.\n","repos":"LukeStorry\/JuliaSets,LukeStorry\/JuliaSets,LukeStorry\/JuliaSets,LukeStorry\/JuliaSets","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/Julia.c\n+++ c\/Julia.c\n@@ -13,10 +13,10 @@\n const maxX = 2;\n const minY = -2;\n const maxY = 2;\n-const resX = 10;\n-const resY = 10;\n-const maxIts = 100;\n-const complex julC = {-1,0};\n+const resX = 20;\n+const resY = 20;\n+const maxIts = 1000;\n+const complex julC = {0,0};\n \n complex transform(int i, int j) {\n complex output;\n@@ -26,25 +26,25 @@\n };\n \n short exceededMax(int input){\n- if (input = maxIts) {return 1;}\n+ if (input == maxIts) {return 1;}\n else {return 0;};\n };\n \n short escaped(complex input){\n- if (input.x>ESCX||input.y>ESCY) {return 1;}\n+ if ( abs(input.x + julC.x) > 5 || abs(input.y + julC.y) > 5 ){return 1;}\n else {return 0;};\n };\n \n complex iterate(complex input) {\n complex output;\n- output.x=input.x*input.x-input.y*input.y +julC.x;\n- output.y=2*input.x*input.y +julC.y;\n+ output.x = input.x*input.x-input.y*input.y +julC.x;\n+ output.y = 2*input.x*input.y +julC.y;\n return output;\n };\n \n int findValue(int i, int j){\n- complex point=transform(i,j);\n- int iterations=0;\n+ complex point = transform(i,j);\n+ int iterations = 0;\n while( (! exceededMax(iterations)) && (! escaped(point))){\n iterate(point);\n iterations++;\n@@ -55,17 +55,17 @@\n \n void calcJuliaSet(int *start) {\n int i,j;\n- for(j=0;j<(resY);j++){\n- for(i=0;i<(resX);i++){\n- *(start+(j*resY)+i)=findValue(i,j);\n+ for(j=0 ; j<(resY) ; j++){\n+ for(i=0 ; i<(resX) ; i++){\n+ *(start+(j*resY)+i) = findValue(i,j);\n };\n };\n };\n \n void output(int* start){\n int i,j;\n- for(j=0;j<(resY);j++){\n- for(i=0;i<(resX);i++){\n+ for(j=0 ; j<(resY) ; j++){\n+ for(i=0 ; i<(resX) ; i++){\n printf(\"%4d\", *(start+(j*resY)+i));\n };\n printf(\"\\n\");\n"} {"commit":"1eba476fd95f2b37f35be513eef141fdc35dcd1f","subject":"ppc32: fix icache flush","message":"ppc32: fix icache flush\n","repos":"mflatt\/ChezScheme,mflatt\/ChezScheme,mflatt\/ChezScheme","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c\/ppc32.c\n+++ c\/ppc32.c\n@@ -40,7 +40,7 @@\n #endif\n \n start &= ~(l1_max_cache_line_size - 1);\n- end = (end + l1_max_cache_line_size) & ~(l1_max_cache_line_size - 1);\n+ end = (end + l1_max_cache_line_size - 1) & ~(l1_max_cache_line_size - 1);\n \n for(i = start; i < end; i += l1_dcache_line_size) {\n __asm__ __volatile__ (\"dcbst 0, %0\" :: \"r\" (i));\n"} {"commit":"d72adf2abf6c5cb00fdf64a7c7ec997f54ce73d1","subject":"ignore result of `mktime`","message":"ignore result of `mktime`\n\nThe result of `mktime` is -1 for an error. The result is also -1 if\nthe time is 1 second before the epoch. That's not useful, so ignore\nit.\n","repos":"mflatt\/ChezScheme,mflatt\/ChezScheme,mflatt\/ChezScheme","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c\/stats.c\n+++ c\/stats.c\n@@ -351,7 +351,7 @@\n if (tzoff == Sfalse) {\n if (localtime_r(&tx, &tmx) == NULL) return Sfalse;\n tmx.tm_isdst = -1; \/* have mktime determine the DST status *\/\n- if (mktime(&tmx) == (time_t)-1) return Sfalse;\n+ mktime(&tmx);\n (void) adjust_time_zone(dtvec, &tmx, Sfalse);\n } else {\n tx += Sinteger_value(tzoff);\n"} {"commit":"8cdfb9fedb70bbee1a5cbfb86fdef36770337326","subject":"Added tests base","message":"Added tests base","repos":"qwc\/cmdlineoptions,qwc\/cmdlineoptions","returncode":1,"stderr":"error: pathspec 'c\/tests.c' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- c\/tests.c\n+++ c\/tests.c\n@@ -0,0 +1,32 @@\n+\/*\n+ * tests.c\n+ *\n+ * Created on: 22.02.2014\n+ * Author: qwc\n+ *\/\n+\n+#include \"cmdlineoptions.h\"\n+\n+void configureDefaultSet(){\n+\tCmdLO_Init(1);\n+\tCmdLO_Add(\"test\", \"--test\");\n+\tCmdLO_Add(\"test\", \"-t\");\n+\tCmdLO_Add(\"example\", \"--example\");\n+\tCmdLO_Add(\"example\", \"-e\");\n+\tCmdLO_Add(\"something\", \"-s\");\n+\tCmdLO_AddDefaultParameter(\"something\", \"sometest\");\n+\tCmdLO_AddDescription(\"test\",\"Well, this is a test command line option.\");\n+\tCmdLO_AddDescription(\"example\", \"An example commandline option\");\n+\tCmdLO_AddPossibleParameter(\"example\",\"test\");\n+\tCmdLO_AddPossibleParameter(\"example\",\"test2\");\n+}\n+\n+\n+int main(int argc, char** argv) {\n+\n+\n+\n+\treturn 0;\n+}\n+\n+\n"} {"commit":"181cf07f521c674a778832994a86144fd82e6a44","subject":"Add coefficient of L in Lab color space","message":"Add coefficient of L in Lab color space\n","repos":"astnohk\/ImgClass,sh-konta\/ImgClass,sh-konta\/ImgClass","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- Segmentation_private.h\n+++ Segmentation_private.h\n@@ -580,6 +580,7 @@\n \n \t\t\tif (0 <= r.x && r.x < _width && 0 <= r.y && r.y < _height) {\n \t\t\t\tImgClass::Lab diff(_image.get(r.x, r.y) - center);\n+\t\t\t\tdiff.L \/= 4.0; \/\/ Difference of Lighting is not so important in segmentation\n \n \t\t\t\tif (norm_squared(diff) <= (100 * _kernel_intensity) * (100 * _kernel_intensity)) {\n \t\t\t\t\tdouble coeff = 1.0 - (\n"} {"commit":"cece1ea22c4e1565d980eb3364fdfe21558db6db","subject":"Fixing typo that broke verbose logging","message":"Fixing typo that broke verbose logging\n\nBase verbose log method had a typo in its name which meant it failed to compile \":5: Implicit declaration of function 'SRLogVerboase' is invalid in C99\" when one of the verbose methods was used.","repos":"DyKnow\/SignalR-ObjC","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SignalR.Client\/SRLog.h\n+++ SignalR.Client\/SRLog.h\n@@ -50,7 +50,7 @@\n #define SRLogPrefixedWarn(type, frmt, ...) SRLogWarn(@\"%@:\\t%@\", type, [NSString stringWithFormat:frmt, ##__VA_ARGS__]);\n #define SRLogPrefixedInfo(type, frmt, ...) SRLogInfo(@\"%@:\\t%@\", type, [NSString stringWithFormat:frmt, ##__VA_ARGS__]);\n #define SRLogPrefixedDebug(type, frmt, ...) SRLogDebug(@\"%@:\\t%@\", type, [NSString stringWithFormat:frmt, ##__VA_ARGS__]);\n-#define SRLogPrefixedVerbose(type, frmt, ...) SRLogVerboase(@\"%@:\\t%@\", type, [NSString stringWithFormat:frmt, ##__VA_ARGS__]);\n+#define SRLogPrefixedVerbose(type, frmt, ...) SRLogVerbose(@\"%@:\\t%@\", type, [NSString stringWithFormat:frmt, ##__VA_ARGS__]);\n \n #define SRLogConnectionError(frmt, ...) SRLogPrefixedError(@\"CONNECTION\", frmt, ##__VA_ARGS__);\n #define SRLogConnectionWarn(frmt, ...) SRLogPrefixedWarn(@\"CONNECTION\", frmt, ##__VA_ARGS__);\n"} {"commit":"be78631c45e4a554fb88919608df632f56cac155","subject":"Be smarter about what an reference is.","message":"Be smarter about what an reference is.\n\nThat's because an rv might be an SVt_IV.\n","repos":"xdg\/mongo-perl-driver,gormanb\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,dagolden\/mongo-perl-driver,gormanb\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,dagolden\/mongo-perl-driver,gormanb\/mongo-perl-driver,dagolden\/mongo-perl-driver,jorol\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,mongodb\/mongo-perl-driver,jorol\/mongo-perl-driver,jorol\/mongo-perl-driver,xdg\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,xdg\/mongo-perl-driver,dagolden\/mongo-perl-driver,jorol\/mongo-perl-driver,mongodb\/mongo-perl-driver,gormanb\/mongo-perl-driver,mongodb\/mongo-perl-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- perl_mongo.c\n+++ perl_mongo.c\n@@ -237,41 +237,41 @@\n static void\n append_sv (mongo::BSONObjBuilder *builder, const char *key, SV *sv, const char *oid_class)\n {\n- switch (SvTYPE (sv)) {\n- case SVt_IV:\n- builder->append(key, (int)SvIV (sv));\n- break;\n- case SVt_PV:\n- builder->append(key, (char *)SvPV_nolen (sv));\n- break;\n- case SVt_RV: {\n- mongo::BSONObjBuilder *subobj = new mongo::BSONObjBuilder();\n- if (sv_isobject (sv)) {\n- if (sv_derived_from (sv, oid_class)) {\n- SV *attr = perl_mongo_call_reader (sv, \"value\");\n- std::string *str = new string(SvPV_nolen (attr));\n- mongo::OID *id = new mongo::OID();\n- id->init(*str);\n- builder->appendOID(key, id);\n- SvREFCNT_dec (attr);\n- }\n- } else {\n- switch (SvTYPE (SvRV (sv))) {\n- case SVt_PVHV:\n- hv_to_bson (subobj, (HV *)SvRV (sv), oid_class);\n- break;\n- case SVt_PVAV:\n- av_to_bson (subobj, (AV *)SvRV (sv), oid_class);\n- break;\n- default:\n- croak (\"type unhandled\");\n- }\n- builder->append(key, subobj->done());\n- }\n- break;\n- }\n- default:\n- croak (\"type unhandled\");\n+ if (SvROK (sv)) {\n+ mongo::BSONObjBuilder *subobj = new mongo::BSONObjBuilder();\n+ if (sv_isobject (sv)) {\n+ if (sv_derived_from (sv, oid_class)) {\n+ SV *attr = perl_mongo_call_reader (sv, \"value\");\n+ std::string *str = new string(SvPV_nolen (attr));\n+ mongo::OID *id = new mongo::OID();\n+ id->init(*str);\n+ builder->appendOID(key, id);\n+ SvREFCNT_dec (attr);\n+ }\n+ } else {\n+ switch (SvTYPE (SvRV (sv))) {\n+ case SVt_PVHV:\n+ hv_to_bson (subobj, (HV *)SvRV (sv), oid_class);\n+ break;\n+ case SVt_PVAV:\n+ av_to_bson (subobj, (AV *)SvRV (sv), oid_class);\n+ break;\n+ default:\n+ croak (\"type unhandled\");\n+ }\n+ builder->append(key, subobj->done());\n+ }\n+ } else {\n+ switch (SvTYPE (sv)) {\n+ case SVt_IV:\n+ builder->append(key, (int)SvIV (sv));\n+ break;\n+ case SVt_PV:\n+ builder->append(key, (char *)SvPV_nolen (sv));\n+ break;\n+ default:\n+ croak (\"type unhandled\");\n+ }\n }\n }\n \n"} {"commit":"ea08d1ae8744039ac7f0e6f397387da71aa29a11","subject":"Deserialize arrays as arrays, not hashes with funny keys.","message":"Deserialize arrays as arrays, not hashes with funny keys.\n","repos":"dagolden\/mongo-perl-driver,mongodb\/mongo-perl-driver,jorol\/mongo-perl-driver,jorol\/mongo-perl-driver,dagolden\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,jorol\/mongo-perl-driver,dagolden\/mongo-perl-driver,xdg\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,jorol\/mongo-perl-driver,gormanb\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,mongodb\/mongo-perl-driver,xdg\/mongo-perl-driver,dagolden\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver,mongodb\/mongo-perl-driver,gormanb\/mongo-perl-driver,gormanb\/mongo-perl-driver,xdg\/mongo-perl-driver,gormanb\/mongo-perl-driver,kainwinterheart\/mongo-perl-driver,rahuldhodapkar\/mongo-perl-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- perl_mongo.c\n+++ perl_mongo.c\n@@ -252,14 +252,15 @@\n switch (SvTYPE (SvRV (sv))) {\n case SVt_PVHV:\n hv_to_bson (subobj, (HV *)SvRV (sv), oid_class);\n+ builder->append(key, subobj->done());\n break;\n case SVt_PVAV:\n av_to_bson (subobj, (AV *)SvRV (sv), oid_class);\n+ builder->appendArray(key, subobj->done());\n break;\n default:\n croak (\"type unhandled\");\n }\n- builder->append(key, subobj->done());\n }\n } else {\n switch (SvTYPE (sv)) {\n"} {"commit":"82547db2db6276e2ce22eef4ce470b08a9714e16","subject":"Prepare the pcm handle after recovering","message":"Prepare the pcm handle after recovering\n","repos":"EddieRingle\/openal-soft,irungentoo\/openal-soft-tox,jims\/openal-soft,Wemersive\/openal-soft,cambridgehackers\/klaatu-openal-soft,cambridgehackers\/klaatu-openal-soft,Wemersive\/openal-soft,BeamNG\/openal-soft,AerialX\/openal-soft-android,irungentoo\/openal-soft-tox,aaronmjacobs\/openal-soft,soundsrc\/openal-soft,arkana-fts\/openal-soft,dapetcu21\/openal-soft,EddieRingle\/openal-soft,zorbathut\/opengal32,jims\/openal-soft,aaronmjacobs\/openal-soft,BeamNG\/openal-soft,arkana-fts\/openal-soft,alexxvk\/openal-soft,mmozeiko\/OpenAL-Soft,mmozeiko\/OpenAL-Soft,rryan\/openal-soft,alexxvk\/openal-soft,soundsrc\/openal-soft,cambridgehackers\/klaatu-openal-soft,franklixuefei\/openal-soft,franklixuefei\/openal-soft,rryan\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Alc\/alsa.c\n+++ Alc\/alsa.c\n@@ -228,6 +228,8 @@\n if(err == -EINTR || err == -EPIPE || err == -ESTRPIPE)\n {\n err = psnd_pcm_recover(handle, err, 1);\n+ if(err >= 0)\n+ err = psnd_pcm_prepare(handle);\n if(err < 0)\n AL_PRINT(\"recover failed: %s\\n\", psnd_strerror(err));\n }\n@@ -365,6 +367,8 @@\n case -EPIPE:\n case -EINTR:\n ret = psnd_pcm_recover(data->pcmHandle, ret, 1);\n+ if(ret >= 0)\n+ psnd_pcm_prepare(data->pcmHandle);\n break;\n default:\n if (ret >= 0)\n@@ -414,6 +418,8 @@\n case -EPIPE:\n case -EINTR:\n avail = psnd_pcm_recover(data->pcmHandle, avail, 1);\n+ if(avail >= 0)\n+ psnd_pcm_prepare(data->pcmHandle);\n break;\n default:\n if (avail >= 0 && data->doCapture)\n"} {"commit":"665adf658ed8db4850fe492616aec2138baa3404","subject":"export aggr item","message":"export aggr item\n","repos":"globbie\/knowdy,globbie\/knowdy,globbie\/knowdy","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- core\/src\/knd_concept.c\n+++ core\/src\/knd_concept.c\n@@ -4983,6 +4983,7 @@\n {\n struct kndAttrItem *item;\n struct glbOutput *out;\n+ struct kndConcept *c;\n bool in_list = false;\n int err;\n \n@@ -5016,7 +5017,19 @@\n if (err) return err;\n break;\n case KND_ATTR_AGGR:\n- knd_log(\".. aggr attr..\");\n+ if (!item->conc) {\n+ err = out->write(out, \"{}\", strlen(\"{}\"));\n+ if (err) return err;\n+ } else {\n+ c = item->conc;\n+ c->out = self->out;\n+ c->task = self->task;\n+ c->format = KND_FORMAT_JSON;\n+ c->depth = self->depth;\n+ err = c->export(c);\n+ if (err) return err;\n+ }\n+ \n break;\n default:\n err = out->write(out, \"\\\"\", strlen(\"\\\"\"));\n@@ -5258,6 +5271,8 @@\n err = unfreeze_class(self, dir, &c); RET_ERR();\n }\n err = export_gloss_JSON(c); RET_ERR();\n+\n+ err = export_concise_JSON(c); RET_ERR();\n \n err = out->write(out, \"}\", 1);\n if (err) return err;\n"} {"commit":"ee825d7ceeca19d65b55a5d20a9c99608ff77047","subject":"XSDL: fixed mouse in XSDL startup menu","message":"XSDL: fixed mouse in XSDL startup menu\n","repos":"pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius,pelya\/commandergenius","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- project\/jni\/application\/xserver\/gfx.c\n+++ project\/jni\/application\/xserver\/gfx.c\n@@ -552,6 +552,7 @@\n \t}\n \n \tSDL_Joystick * j0 = SDL_JoystickOpen(0);\n+\tint mouse = 0;\n \n \twhile ( res < 0 )\n \t{\n@@ -565,7 +566,6 @@\n \t\t\t\tbreak;\n \t\t\t\tcase SDL_MOUSEBUTTONUP:\n \t\t\t\t{\n-\t\t\t\t\t\/\/SDL_GetMouseState(&x, &y);\n \t\t\t\t\tif( vertical )\n \t\t\t\t\t{\n \t\t\t\t\t\tint z = x;\n@@ -582,6 +582,11 @@\n \t\t\t\t\tx = event.jball.xrel;\n \t\t\t\t\ty = event.jball.yrel;\n \t\t\t\tbreak;\n+\t\t\t\tcase SDL_MOUSEMOTION:\n+\t\t\t\t\tmouse = 1;\n+\t\t\t\t\tx = event.motion.x;\n+\t\t\t\t\ty = event.motion.y;\n+\t\t\t\tbreak;\n \t\t\t}\n \t\t}\n \n@@ -600,8 +605,8 @@\n \t\t\tif( i == 2 && ii == 3 && !vertical )\n \t\t\t\trenderString(\"custom\", VID_X\/8 + (ii*VID_X\/4), VID_Y\/6 - VID_Y\/12 + (i*VID_Y\/3));\n \t\t}\n-\t\t\/\/SDL_GetMouseState(&x, &y);\n-\t\t\/\/renderString(\"X\", x, y);\n+\t\tif( mouse )\n+\t\t\trenderString(\"\u2206\", x, y);\n \t\tSDL_Delay(50);\n \t\tSDL_Flip(SDL_GetVideoSurface());\n \t\tif (res == MODE_CUSTOM)\n@@ -661,6 +666,7 @@\n \t\t*resolutionW = customX;\n \t\t*resolutionH = customY;\n \t}\n+\tmouse = 0;\n \twhile ( dpi < 0 )\n \t{\n \t\twhile (SDL_PollEvent(&event))\n@@ -673,7 +679,6 @@\n \t\t\t\tbreak;\n \t\t\t\tcase SDL_MOUSEBUTTONUP:\n \t\t\t\t{\n-\t\t\t\t\t\/\/SDL_GetMouseState(&x, &y);\n \t\t\t\t\tif( vertical )\n \t\t\t\t\t{\n \t\t\t\t\t\tint z = x;\n@@ -690,6 +695,11 @@\n \t\t\t\t\tx = event.jball.xrel;\n \t\t\t\t\ty = event.jball.yrel;\n \t\t\t\tbreak;\n+\t\t\t\tcase SDL_MOUSEMOTION:\n+\t\t\t\t\tmouse = 1;\n+\t\t\t\t\tx = event.motion.x;\n+\t\t\t\t\ty = event.motion.y;\n+\t\t\t\tbreak;\n \t\t\t}\n \t\t}\n \t\tSDL_FillRect(SDL_GetVideoSurface(), NULL, 0);\n@@ -703,14 +713,15 @@\n \t\t\telse\n \t\t\t\trenderStringScaled(fontsStr[i*4+ii], scale, VID_X\/8 + (ii*VID_X\/4), VID_Y\/8 + (i*VID_Y\/4), 255, 255, 255, SDL_GetVideoSurface());\n \t\t}\n-\t\t\/\/SDL_GetMouseState(&x, &y);\n-\t\t\/\/renderString(\"X\", x, y);\n-\t\tSDL_Delay(100);\n+\t\tif( mouse )\n+\t\t\trenderString(\"\u2206\", x, y);\n+\t\tSDL_Delay(50);\n \t\tSDL_Flip(SDL_GetVideoSurface());\n \t}\n \t*displayW = *displayW \/ fontsVal[dpi];\n \t*displayH = *displayH \/ fontsVal[dpi];\n \n+\tmouse = 0;\n \tokay = !config;\n \twhile ( !okay )\n \t{\n@@ -726,7 +737,6 @@\n \t\t\t\tbreak;\n \t\t\t\tcase SDL_MOUSEBUTTONUP:\n \t\t\t\t{\n-\t\t\t\t\t\/\/SDL_GetMouseState(&x, &y);\n \t\t\t\t\tif( vertical )\n \t\t\t\t\t{\n \t\t\t\t\t\tint z = x;\n@@ -761,6 +771,11 @@\n \t\t\t\t\tx = event.jball.xrel;\n \t\t\t\t\ty = event.jball.yrel;\n \t\t\t\tbreak;\n+\t\t\t\tcase SDL_MOUSEMOTION:\n+\t\t\t\t\tmouse = 1;\n+\t\t\t\t\tx = event.motion.x;\n+\t\t\t\t\ty = event.motion.y;\n+\t\t\t\tbreak;\n \t\t\t}\n \t\t}\n \t\tSDL_FillRect(SDL_GetVideoSurface(), NULL, 0);\n@@ -779,6 +794,8 @@\n \t\tsprintf(buf, \"Okay\");\n \t\trenderString(buf, VID_X\/2, VID_Y * 5 \/ 6);\n \n+\t\tif( mouse )\n+\t\t\trenderString(\"\u2206\", x, y);\n \t\tSDL_Delay(50);\n \t\tSDL_Flip(SDL_GetVideoSurface());\n \t}\n"} {"commit":"c2cbcbc42ddb06c7ab8ef14cc32c5e131a2a726a","subject":"Remove extra include and typedef","message":"Remove extra include and typedef\n","repos":"tangrams\/tangram-es,tangrams\/tangram-es,cleeus\/tangram-es,cleeus\/tangram-es,quitejonny\/tangram-es,tangrams\/tangram-es,cleeus\/tangram-es,tangrams\/tangram-es,cleeus\/tangram-es,tangrams\/tangram-es,quitejonny\/tangram-es,tangrams\/tangram-es,quitejonny\/tangram-es,xvilan\/tangram-es,cleeus\/tangram-es,xvilan\/tangram-es,xvilan\/tangram-es,quitejonny\/tangram-es,quitejonny\/tangram-es,cleeus\/tangram-es,tangrams\/tangram-es,quitejonny\/tangram-es,xvilan\/tangram-es","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- core\/src\/style\/style.h\n+++ core\/src\/style\/style.h\n@@ -6,8 +6,6 @@\n #include \"scene\/sceneLayer.h\"\n #include \"styleParamMap.h\"\n #include \"util\/shaderProgram.h\"\n-\n-#include \"csscolorparser.hpp\"\n \n #include <bitset>\n #include <memory>\n@@ -144,6 +142,3 @@\n const std::string& getName() const { return m_name; }\n \n };\n-\n-\n-typedef std::vector<std::unique_ptr<Style>> StyleSet;\n"} {"commit":"2287a06f71a68283730ab4aac59d809e25ddd7d7","subject":"Updated timestamps to be microsecond resolution","message":"Updated timestamps to be microsecond resolution\n","repos":"jamessnee\/clacks,jamessnee\/clacks,jamessnee\/clacks","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- clacksd\/src\/storage\/cl_file_module.c\n+++ clacksd\/src\/storage\/cl_file_module.c\n@@ -24,7 +24,7 @@\n \n clock_gettime(CLOCK_MONOTONIC, &time);\n \/\/ Convert time to ms\n- us = (time.tv_sec * 1000) + (time.tv_nsec \/ 1000);\n+ us = (time.tv_sec * 1000000) + (time.tv_nsec \/ 1000);\n \n \/\/ Construct the output\n rtn = asprintf(&to_write, \"%lld||%s||%s\\n\", us, msg->act_id, msg->msg);\n"} {"commit":"de3f5449181e001ef378929e6acece57d141621c","subject":"ENH: Declaration order of m_CellsContainer and m_CellLinksContainer changed. It should correspond to initialization in the constructor.","message":"ENH: Declaration order of m_CellsContainer and m_CellLinksContainer changed.\n It should correspond to initialization in the constructor.\n","repos":"zachary-williamson\/ITK,hendradarwin\/ITK,hinerm\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,paulnovo\/ITK,vfonov\/ITK,ajjl\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,hjmjohnson\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,thewtex\/ITK,hjmjohnson\/ITK,fedral\/ITK,rhgong\/itk-with-dom,PlutoniumHeart\/ITK,heimdali\/ITK,fbudin69500\/ITK,eile\/ITK,msmolens\/ITK,LucasGandel\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,stnava\/ITK,paulnovo\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,stnava\/ITK,spinicist\/ITK,vfonov\/ITK,hendradarwin\/ITK,jcfr\/ITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,vfonov\/ITK,paulnovo\/ITK,zachary-williamson\/ITK,hjmjohnson\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,blowekamp\/ITK,daviddoria\/itkHoughTransform,hinerm\/ITK,zachary-williamson\/ITK,paulnovo\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,blowekamp\/ITK,atsnyder\/ITK,CapeDrew\/DITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,ajjl\/ITK,eile\/ITK,GEHC-Surgery\/ITK,eile\/ITK,jmerkow\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,jcfr\/ITK,zachary-williamson\/ITK,stnava\/ITK,CapeDrew\/DCMTK-ITK,LucasGandel\/ITK,wkjeong\/ITK,paulnovo\/ITK,biotrump\/ITK,BRAINSia\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,spinicist\/ITK,BlueBrain\/ITK,CapeDrew\/DCMTK-ITK,msmolens\/ITK,vfonov\/ITK,fedral\/ITK,hendradarwin\/ITK,richardbeare\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,rhgong\/itk-with-dom,malaterre\/ITK,ajjl\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,thewtex\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,CapeDrew\/DITK,spinicist\/ITK,malaterre\/ITK,ajjl\/ITK,GEHC-Surgery\/ITK,malaterre\/ITK,atsnyder\/ITK,itkvideo\/ITK,malaterre\/ITK,eile\/ITK,richardbeare\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,eile\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,thewtex\/ITK,eile\/ITK,jmerkow\/ITK,Kitware\/ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,eile\/ITK,BlueBrain\/ITK,thewtex\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,BRAINSia\/ITK,hendradarwin\/ITK,hinerm\/ITK,hendradarwin\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,fedral\/ITK,ajjl\/ITK,fbudin69500\/ITK,blowekamp\/ITK,jcfr\/ITK,jcfr\/ITK,wkjeong\/ITK,paulnovo\/ITK,LucHermitte\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,biotrump\/ITK,eile\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,hjmjohnson\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,itkvideo\/ITK,eile\/ITK,itkvideo\/ITK,biotrump\/ITK,InsightSoftwareConsortium\/ITK,Kitware\/ITK,stnava\/ITK,itkvideo\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,itkvideo\/ITK,vfonov\/ITK,jcfr\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DCMTK-ITK,fedral\/ITK,LucHermitte\/ITK,spinicist\/ITK,fedral\/ITK,rhgong\/itk-with-dom,itkvideo\/ITK,Kitware\/ITK,spinicist\/ITK,InsightSoftwareConsortium\/ITK,hjmjohnson\/ITK,jmerkow\/ITK,jcfr\/ITK,jcfr\/ITK,Kitware\/ITK,hinerm\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,CapeDrew\/DITK,PlutoniumHeart\/ITK,vfonov\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,spinicist\/ITK,atsnyder\/ITK,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,heimdali\/ITK,LucHermitte\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,atsnyder\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,atsnyder\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,msmolens\/ITK,stnava\/ITK,paulnovo\/ITK,wkjeong\/ITK,wkjeong\/ITK,blowekamp\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,hendradarwin\/ITK,jmerkow\/ITK,richardbeare\/ITK,malaterre\/ITK,vfonov\/ITK,LucHermitte\/ITK,Kitware\/ITK,Kitware\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,hjmjohnson\/ITK,thewtex\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DITK,wkjeong\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,malaterre\/ITK,atsnyder\/ITK,itkvideo\/ITK,CapeDrew\/DCMTK-ITK,richardbeare\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,msmolens\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,stnava\/ITK,biotrump\/ITK,stnava\/ITK,daviddoria\/itkHoughTransform,stnava\/ITK,msmolens\/ITK,BRAINSia\/ITK,fedral\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,blowekamp\/ITK,LucHermitte\/ITK,Kitware\/ITK,vfonov\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,heimdali\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,vfonov\/ITK,ajjl\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,malaterre\/ITK,ajjl\/ITK,hendradarwin\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,CapeDrew\/DITK,spinicist\/ITK,BlueBrain\/ITK,heimdali\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,itkvideo\/ITK,jcfr\/ITK,itkvideo\/ITK,jmerkow\/ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,thewtex\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkMesh.h\n+++ Code\/Common\/itkMesh.h\n@@ -275,18 +275,19 @@\n *\/\n PointDataContainerPointer m_PointDataContainer;\n \n+ \n+ \/**\n+ * An object containing cells used by the mesh. Individual cells are\n+ * accessed through cell identifiers.\n+ *\/\n+ CellsContainerPointer m_CellsContainer;\n+\n \/**\n * An object containing parent cell links for each point. Since a point\n * can be used by multiple cells, each point identifier accesses another\n * container which holds the cell identifiers\n *\/\n CellLinksContainerPointer m_CellLinksContainer;\n- \n- \/**\n- * An object containing cells used by the mesh. Individual cells are\n- * accessed through cell identifiers.\n- *\/\n- CellsContainerPointer m_CellsContainer;\n \n \/**\n * An object containing data associated with the mesh's cells.\n"} {"commit":"455053db114c92501fba43ec4f84cfcc339dd6f6","subject":"Updated messages.","message":"Updated messages.\n","repos":"AlexandrKurochkin\/iOSTools,AlexandrKurochkin\/iOSTools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Common\/AlertManager.h\n+++ Common\/AlertManager.h\n@@ -49,14 +49,14 @@\n \n \/\/User data messages\n #define kBirthdayValidationMessage @\"Wrong date of birth. You must be at least %d years old.\"\n-#define kRadiusValidatiomMessage @\"Radius should contain only digital and should be more than 0\"\n+#define kRadiusValidatiomMessage @\"Radius should contain only digits and should be more than 0.\"\n \n \/\/Password messages\n #define kWrongPswdMessage @\"Wrong Password.\"\n #define kNewPswdNoMatxgMessage @\"New password doesn't match.\"\n #define kNewPswdSmallLenghtMessage @\"Length of password should be 6 and more characters.\"\n #define kNewCurrentPswdVoidMessage @\"Current password is empty.\"\n-#define kNewPswdChangedSuccessMessage @\"Password changed successfully.\"\n+#define kNewPswdChangedSuccessMessage @\"Password was changed successfully.\"\n \n \/\/This part in development\n #define kThisPartInDevelopment @\"Sorry. This part is in the development\"\n"} {"commit":"c1d7712882e1eebc596ebba1dbf597deb66a105a","subject":"demos: particle: fix typo.","message":"demos: particle: fix typo.\n","repos":"gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- demos\/particle\/space.c\n+++ demos\/particle\/space.c\n@@ -131,7 +131,7 @@\n \tunsigned int i;\n \n \tfor (i = 0; i < space->particle_count; i++) { \n-\t\tspace->particles[i].vy += space->gax * time; \n+\t\tspace->particles[i].vx += space->gax * time; \n \t\tspace->particles[i].vy += space->gay * time; \n \t}\n }\n"} {"commit":"a2327f1781f8209a346c66bff729e08ae1bcb379","subject":"- fix for issue 2056: don't include local lapack.h on OSX","message":"- fix for issue 2056: don't include local lapack.h on OSX\n","repos":"jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- copasi\/lapack\/lapackwrap.h\n+++ copasi\/lapack\/lapackwrap.h\n@@ -1,4 +1,4 @@\n-\/\/ Copyright (C) 2013 by Pedro Mendes, Virginia Tech Intellectual\n+\/\/ Copyright (C) 2013 - 2014 by Pedro Mendes, Virginia Tech Intellectual\n \/\/ Properties, Inc., University of Heidelberg, and The University\n \/\/ of Manchester.\n \/\/ All rights reserved.\n@@ -1249,13 +1249,15 @@\n # include \"copasi\/lapack\/f2c.h\"\n # endif\n \n-# if (defined HAVE_LAPACK_H)\n+# if defined (HAVE_LAPACK_H) && !defined(HAVE_APPLE)\n # include <lapack.h>\n # else\n # if (defined HAVE_CLAPACK_H)\n # include <clapack.h>\n # else\n-# include \"copasi\/lapack\/lapack.h\"\n+# if !defined(HAVE_APPLE)\n+# include \"copasi\/lapack\/lapack.h\"\n+# endif\n # endif\n # endif\n \n"} {"commit":"03264b61446e6fa742cd2b88bf8b7cd5b03f4604","subject":"fix compile error with older systems missing R_{386,X86_64}_IRELATIVE","message":"fix compile error with older systems missing R_{386,X86_64}_IRELATIVE\n\nSVN-Revision: 934\n","repos":"bl4ckic3\/dynamorio,code4bones\/dynamorio,bl4ckic3\/dynamorio,bl4ckic3\/dynamorio,AmesianX\/dynamorio,code4bones\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,code4bones\/dynamorio,bl4ckic3\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,daksunt\/dynamorio,sigma-random\/dynamorio,sigma-random\/dynamorio,code4bones\/dynamorio,AmesianX\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/linux\/module.h\n+++ core\/linux\/module.h\n@@ -1,4 +1,5 @@\n \/* **********************************************************\n+ * Copyright (c) 2011 Google, Inc. All rights reserved.\n * Copyright (c) 2008-2010 VMware, Inc. All rights reserved.\n * **********************************************************\/\n \n@@ -82,6 +83,9 @@\n # define ELF_R_GLOB_DAT R_X86_64_GLOB_DAT \/* GOT entry *\/\n # define ELF_R_JUMP_SLOT R_X86_64_JUMP_SLOT \/* PLT entry *\/\n # define ELF_R_RELATIVE R_X86_64_RELATIVE \/* Adjust by program delta *\/\n+# ifndef R_X86_64_IRELATIVE\n+# define R_X86_64_IRELATIVE 37\n+# endif\n # define ELF_R_IRELATIVE R_X86_64_IRELATIVE \/* Adjust indirectly by program base *\/\n \/* TLS hanlding *\/\n # define ELF_R_TLS_DTPMOD R_X86_64_DTPMOD64 \/* Module ID *\/\n@@ -99,6 +103,9 @@\n # define ELF_R_GLOB_DAT R_386_GLOB_DAT \/* GOT entry *\/\n # define ELF_R_JUMP_SLOT R_386_JMP_SLOT \/* PLT entry *\/\n # define ELF_R_RELATIVE R_386_RELATIVE \/* Adjust by program delta *\/\n+# ifndef R_386_IRELATIVE\n+# define R_386_IRELATIVE 42\n+# endif\n # define ELF_R_IRELATIVE R_386_IRELATIVE \/* Adjust indirectly by program base *\/\n \/* tls related *\/\n # define ELF_R_TLS_DTPMOD R_386_TLS_DTPMOD32 \/* Module ID *\/\n"} {"commit":"5b4f614c745e4cc73a87e15bad508a4beff1bd1f","subject":"i#359: Squash alarm signals before thread signals are initialized.","message":"i#359: Squash alarm signals before thread signals are initialized.\n\nFixes issue 359.\n\nAs discussed in the tracker, this is really a work around. A more\nbulletproof solution would be to initialize the dcontext and its signal\ndata in the parent, so it could be installed atomically into TLS soon\nafter the child starts.\n\nSVN-Revision: 1372\n","repos":"AmesianX\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,code4bones\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,code4bones\/dynamorio,AmesianX\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,code4bones\/dynamorio,bl4ckic3\/dynamorio,bl4ckic3\/dynamorio,daksunt\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/linux\/signal.c\n+++ core\/linux\/signal.c\n@@ -524,6 +524,11 @@\n *\/\n kernel_sigaction_t **app_sigaction;\n \n+ \/* True after signal_thread_inherit or signal_fork_init are called. We\n+ * squash alarm or profiling signals up until this point.\n+ *\/\n+ bool fully_initialized;\n+\n \/* with CLONE_SIGHAND we may have to share app_sigaction *\/\n bool shared_app_sigaction;\n mutex_t *shared_lock;\n@@ -1405,6 +1410,9 @@\n (record == NULL) ? NULL : record->pcprofile_info);\n }\n \n+ \/* Assumed to be async safe. *\/\n+ info->fully_initialized = true;\n+\n return res;\n }\n \n@@ -1484,6 +1492,9 @@\n if (INTERNAL_OPTION(profile_pcs)) {\n pcprofile_fork_init(dcontext);\n }\n+\n+ \/* Assumed to be async safe. *\/\n+ info->fully_initialized = true;\n }\n \n void\n@@ -3769,7 +3780,9 @@\n * that could have been interrupted\n * e.g., synchronize_dynamic_options grabs the stats_lock!\n *\/\n- if (dcontext == NULL) { \/* FIXME: || !intercept_asynch, or maybe !under_our_control *\/\n+ if (dcontext == NULL || dcontext->signal_field == NULL ||\n+ !((thread_sig_info_t*)dcontext->signal_field)->fully_initialized) {\n+ \/* FIXME: || !intercept_asynch, or maybe !under_our_control *\/\n \/* FIXME i#26: this could be a signal arbitrarily sent to this thread.\n * We could try to route it to another thread, using a global queue\n * of pending signals. But what if it was targeted to this thread\n@@ -3777,8 +3790,8 @@\n * we watch the kill syscalls: could come from another process?\n *\/\n if (sig_is_alarm_signal(sig)) {\n- \/* assuming an alarm during thread exit (xref PR 596127):\n- * suppressing is fine\n+ \/* assuming an alarm during thread exit or init (xref PR 596127,\n+ * i#359): suppressing is fine\n *\/\n } else if (sig == SUSPEND_SIGNAL &&\n thread_lookup(get_thread_id()) == NULL) {\n"} {"commit":"4245502ae287df9c457621b3f4cccb519c4d4878","subject":"Fix the bug under mongo c driver v1.5","message":"Fix the bug under mongo c driver v1.5\n\nI misunderstand the interface when querying with projection\nwhen the version of Mongo C Driver is lower than 1.5.\n\nFor reference, in case of Ubuntu 16.04, Mongo C Driver v1.3.1\nwill be installed, so when using 'Dedicated Bearer', v0.1.1\nshould be used because it does not work normally.\n","repos":"acetcom\/nextepc,acetcom\/nextepc,acetcom\/nextepc,acetcom\/nextepc,acetcom\/nextepc,acetcom\/nextepc,acetcom\/nextepc","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/pcrf\/pcrf_context.c\n+++ src\/pcrf\/pcrf_context.c\n@@ -256,31 +256,25 @@\n \n mutex_lock(self.db_lock);\n \n+ query = BCON_NEW(\n+ \"imsi\", BCON_UTF8(imsi_bcd),\n+ \"pdn.apn\", BCON_UTF8(apn));\n+#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 5\n opts = BCON_NEW(\n \"projection\", \"{\",\n \"imsi\", BCON_INT64(1),\n \"pdn.$\", BCON_INT64(1),\n \"}\"\n );\n-#if MONGOC_MAJOR_VERSION >= 1 && MONGOC_MINOR_VERSION >= 5\n- query = BCON_NEW(\n- \"imsi\", BCON_UTF8(imsi_bcd),\n- \"pdn.apn\", BCON_UTF8(apn));\n cursor = mongoc_collection_find_with_opts(\n self.subscriberCollection, query, opts, NULL);\n #else\n- query = BCON_NEW(\n- \"$query\", \"{\",\n- \"imsi\", BCON_UTF8(imsi_bcd),\n- \"pdn.apn\", BCON_UTF8(apn),\n- \"}\",\n- \"$projection\", \"{\",\n- \"imsi\", BCON_INT64(1),\n- \"pdn.$\", BCON_INT64(1),\n- \"}\"\n+ opts = BCON_NEW(\n+ \"imsi\", BCON_INT64(1),\n+ \"pdn.$\", BCON_INT64(1)\n );\n cursor = mongoc_collection_find(self.subscriberCollection,\n- MONGOC_QUERY_NONE, 0, 0, 0, query, NULL, NULL);\n+ MONGOC_QUERY_NONE, 0, 0, 0, query, opts, NULL);\n #endif\n \n if (!mongoc_cursor_next(cursor, &document))\n"} {"commit":"911aaacdf25c518a7ed6217b6f2ae7f5a28893eb","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\ngit-svn-id: 17d41c460f3ddabe6271dd210d2e0bf85f349cae@37 29311d96-e01e-0410-9327-a35deaab8ce9\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":1,"stderr":"error: pathspec 'ceph\/messages\/MExportDirNotify.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- ceph\/messages\/MExportDirNotify.h\n+++ ceph\/messages\/MExportDirNotify.h\n@@ -0,0 +1,21 @@\n+#ifndef __MEXPORTDIRNOTIFY_H\n+#define __MEXPORTDIRNOTIFY_H\n+\n+#include \"include\/Message.h\"\n+#include <string>\n+using namespace std;\n+\n+class MExportDirNotify : public Message {\n+ public:\n+ string path;\n+ int new_auth;\n+\n+ MExportDirNotify(string& path, int new_auth) :\n+\tMessage(MSG_MDS_EXPORTDIRNOTIFY) {\n+\tthis->path = path;\n+\tthis->new_auth = new_auth;\n+ }\n+ virtual char *get_type_name() { return \"exnot\"; }\n+};\n+\n+#endif\n"} {"commit":"ac3619e4ec606e4024abd65d937d6c8b580c243c","subject":"Give some config assistance","message":"Give some config assistance\n\nIn case we have a host link but no corresponding subnet link, suggest adding a \"route\" statement.\n","repos":"bictorv\/chaosnet-bridge,bictorv\/chaosnet-bridge,bictorv\/chaosnet-bridge","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cbridge.c\n+++ cbridge.c\n@@ -1900,6 +1900,25 @@\n }\n #endif\n \n+ \/\/ Check if routes might need some help\n+ if (nchaddr > 1) {\n+ \/\/ Only do this if we have more than one Chaos address, which indicates we are connected to more than one subnet,\n+ \/\/ with subnet link or a host link to another subnet, or that we might get a dynamic link.\n+ int i;\n+ for (i = 0; i < rttbl_host_len; i++) {\n+ if ((rttbl_host[i].rt_link != LINK_NOLINK) && (rttbl_host[i].rt_link != LINK_TLS)) {\n+\tif (rttbl_net[rttbl_host[i].rt_dest >> 8].rt_link == LINK_NOLINK) {\n+\t int sn = rttbl_host[i].rt_dest >> 8;\n+\t fprintf(stderr,\"Warning: you have a host %s link to %#o but no subnet route declared\\n\"\n+\t\t \" Consider adding a \\\"route subnet %o bridge %o\\\" statement (after all link statements),\\n\"\n+\t\t \" so the rest of the network gets to know about net %#o?\\n\",\n+\t\t rt_linkname(rttbl_host[i].rt_link), rttbl_host[i].rt_dest,\n+\t\t sn, rttbl_host[i].rt_dest, sn);\n+\t}\n+ }\n+ }\n+ }\n+\n #if 1\n if (verbose)\n \/\/ Print config\n"} {"commit":"a9e07c169777c3484756be6eabc4441897ee4b4c","subject":"fix short form for threshold","message":"fix short form for threshold\n","repos":"pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- pfl\/ctlcli.c\n+++ pfl\/ctlcli.c\n@@ -749,7 +749,7 @@\n \t \"%7s %6s %6s %5s \"\n \t \"%10s %3s %3s\\n\",\n \t \"mem-pool\", \"flag\", \"#free\", \"#use\", \"total\",\n-\t \"%use\", \"min\", \"max\", \"thres\",\n+\t \"%use\", \"min\", \"max\", \"thrsh\",\n \t \"#shrnx\", \"#em\", \"#wa\");\n \t\/* XXX add ngets and waiting\/sleep time *\/\n \treturn(PSC_CTL_DISPLAY_WIDTH+11);\n"} {"commit":"f458f3b37f0361e05d216d6e0c02dce385a28b67","subject":"better","message":"better\n","repos":"pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- pfl\/ctlsvr.c\n+++ pfl\/ctlsvr.c\n@@ -632,13 +632,13 @@\n \t} else {\n \t\tchar linkname[128], logname[1024];\n \n-\t\tsnprintf(linkname, 128, \"\/proc\/%d\/fd\/%d\", \n+\t\tsnprintf(linkname, sizeof(linkname), \"\/proc\/%d\/fd\/%d\",\n \t\t pfl_pid, fileno(stderr));\n-\t\trc = readlink(linkname, logname, 1024);\n+\t\trc = readlink(linkname, logname, sizeof(logname));\n \t\tif (rc != -1)\n \t\t\tlogname[rc] = '\\0';\n \t\telse\n-\t\t\tsnprintf(logname, sizeof(logname), \n+\t\t\tsnprintf(logname, sizeof(logname),\n \t\t\t \"%s\", \"stderr\");\n \t\trc = psc_ctlmsg_param_send(fd, mh, pcp,\n \t\t PCTHRNAME_EVERYONE, levels, 2, logname);\n"} {"commit":"f5c1824ac979b53b1c2ce4ccb7756f4bbbf1e4ce","subject":"pgmemcache.c: don't use XACT_EVENT_PRE_COMMIT in pg < 9.3 [#37]","message":"pgmemcache.c: don't use XACT_EVENT_PRE_COMMIT in pg < 9.3 [#37]\n","repos":"ohmu\/pgmemcache,saaros\/pgmemcache,ohmu\/pgmemcache,ohmu\/pgmemcache","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pgmemcache.c\n+++ pgmemcache.c\n@@ -162,8 +162,12 @@\n \/* called at end of transaction, flush all buffers to memcache *\/\n static void pgmemcache_xact_callback(XactEvent event, void *arg)\n {\n- if ((event == XACT_EVENT_COMMIT || event == XACT_EVENT_PRE_COMMIT) &&\n- globals.flush_on_commit && globals.flush_needed)\n+ if (globals.flush_on_commit && globals.flush_needed &&\n+ (event == XACT_EVENT_COMMIT\n+#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 90300)\n+ || event == XACT_EVENT_PRE_COMMIT\n+#endif \/* PG_VERSION_NUM >= 90300 *\/\n+ ))\n {\n #ifdef USE_LIBMEMCACHED\n memcached_return rc = memcached_flush_buffers(globals.mc);\n"} {"commit":"d07c2bc7c324896d373d3ff92ef97fb4b23fd61e","subject":"fixed valgrind warning in test_utils","message":"fixed valgrind warning in test_utils\n","repos":"mikey-austin\/greyd,mikey-austin\/greyd,mikey-austin\/greyd,mikey-austin\/greyd,mikey-austin\/greyd","returncode":0,"stderr":"unknown","license":"isc","lang":"C","diff":""} {"commit":"1cf4225cd4cf81aacef14ce383f90c81c243cbb2","subject":"Add (some?) missing checks to PER encoding of unsigned integer (addressing deficiencies of vlm\/#260).","message":"Add (some?) missing checks to PER encoding of unsigned integer (addressing\ndeficiencies of vlm\/#260).\n","repos":"mouse07410\/asn1c,mouse07410\/asn1c,mouse07410\/asn1c,mouse07410\/asn1c","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- skeletons\/INTEGER.c\n+++ skeletons\/INTEGER.c\n@@ -778,6 +778,14 @@\n \t\tASN_DEBUG(\"Encoding integer %ld (%lu) with range %d bits\",\n \t\t\tvalue, value - ct->lower_bound, ct->range_bits);\n \tif(specs && specs->field_unsigned) {\n+\t\tif ( ((unsigned long)ct->lower_bound > (unsigned long)(ct->upper_bound)\n+\t\t || ((unsigned long)value < (unsigned long)ct->lower_bound))\n+\t\t || ((unsigned long)value > (unsigned long)ct->upper_bound)\n+\t\t) {\n+\t\t\tASN_DEBUG(\"Value %lu to-be-encoded is outside the bounds [%lu, %lu]!\",\n+\t\t\t\tvalue, ct->lower_bound, ct->upper_bound);\n+\t\t\tASN__ENCODE_FAILED;\n+\t\t}\n \t\tv = (unsigned long)value - (unsigned long)ct->lower_bound;\n \t} else {\n \t\tif(per_long_range_rebase(value, ct->lower_bound, ct->upper_bound, &v)) {\n"} {"commit":"9e0d7f6582a54bf6e79bf26a4a7f943b0dd8c90f","subject":"New GCC version.","message":"New GCC version.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/gcc\/version.c\n+++ contrib\/gcc\/version.c\n@@ -8,7 +8,7 @@\n please modify this string to indicate that, e.g. by putting your\n organization's name in parentheses at the end of the string. *\/\n \n-const char version_string[] = \"3.3.1 [FreeBSD]\";\n+const char version_string[] = \"3.3.3 [FreeBSD] 20031106\";\n \n \/* This is the location of the online document giving instructions for\n reporting bugs. If you distribute a modified version of GCC,\n"} {"commit":"f2516b14ff5d9a3586951e8bf51d083f06c4f6e4","subject":"Don't create more than SLJ_MDS_MAX_JNENTS log entries.","message":"Don't create more than SLJ_MDS_MAX_JNENTS log entries.\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slmkjrnl\/slmkjrnl.c\n+++ slmkjrnl\/slmkjrnl.c\n@@ -469,7 +469,7 @@\n \tssize_t newnents, nents = 0;\n \tchar *endp, c, fn[PATH_MAX];\n \tuint64_t uuid = 0;\n-\tlong l;\n+\tlong long ll;\n \n \tpfl_init();\n \tsl_subsys_register();\n@@ -489,12 +489,12 @@\n \t\t\tbreak;\n \t\tcase 'n':\n \t\t\tendp = NULL;\n-\t\t\tl = strtol(optarg, &endp, 10);\n-\t\t\tif (l <= 0 || l > INT_MAX ||\n+\t\t\tll = strtoll(optarg, &endp, 10);\n+\t\t\tif (ll <= 0 || ll > (long long)SLJ_MDS_MAX_JNENTS ||\n \t\t\t endp == optarg || *endp)\n \t\t\t\terrx(1, \"invalid -n nentries: %s\",\n \t\t\t\t optarg);\n-\t\t\tnents = (ssize_t)l;\n+\t\t\tnents = (ssize_t)ll;\n \t\t\tbreak;\n \t\tcase 'q':\n \t\t\tquery = 1;\n"} {"commit":"0846059646990fd4fbe4a884dbd1a8ff46d559c1","subject":"fmuv5:Repurpose TIM5_SPARE_4 as nARMED","message":"fmuv5:Repurpose TIM5_SPARE_4 as nARMED\n\n nARMED is a Digital OUTPUT. GPIO will be set as input while not\n armed HW will have Pull UP. While armed it will be configured\n as a GPIO OUT set LOW.\n","repos":"mje-nz\/PX4-Firmware,dagar\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,acfloria\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,acfloria\/Firmware,krbeverx\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,dagar\/Firmware,acfloria\/Firmware,mje-nz\/PX4-Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,krbeverx\/Firmware,PX4\/Firmware,acfloria\/Firmware,acfloria\/Firmware,PX4\/Firmware,dagar\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,dagar\/Firmware,krbeverx\/Firmware,PX4\/Firmware,krbeverx\/Firmware,dagar\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,dagar\/Firmware,dagar\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- boards\/px4\/fmu-v5\/src\/board_config.h\n+++ boards\/px4\/fmu-v5\/src\/board_config.h\n@@ -347,9 +347,14 @@\n \n #define DIRECT_PWM_CAPTURE_CHANNELS 3\n \n-\/* TIM5_CH4 SPARE PIN *\/\n-#define GPIO_TIM5_CH4IN \/* PI0 T5C4 TIM5_SPARE_4 *\/ GPIO_TIM5_CH4IN_2\n-#define GPIO_TIM5_CH4OUT \/* PI0 T5C4 TIM5_SPARE_4 *\/ GPIO_TIM5_CH4OUT_2\n+\/* PI0 is nARMED\n+ * The GPIO will be set as input while not armed HW will have external HW Pull UP.\n+ * While armed it shall be configured at a GPIO OUT set LOW\n+ *\/\n+#define GPIO_nARMED_INIT \/* PI0 *\/ (GPIO_INPUT|GPIO_PULLUP|GPIO_PORTI|GPIO_PIN1)\n+#define GPIO_nARMED \/* PI0 *\/ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTI|GPIO_PIN1)\n+\n+#define BOARD_INDICATE_ARMED_STATE(on_armed) px4_arch_configgpio((on_armed) ? GPIO_nARMED : GPIO_nARMED_INIT)\n \n \/* PWM\n *\n@@ -662,7 +667,8 @@\n \t\tGPIO_TONE_ALARM_IDLE, \\\n \t\tGPIO_RSSI_IN_INIT, \\\n \t\tGPIO_nSAFETY_SWITCH_LED_OUT_INIT, \\\n-\t\tGPIO_SAFETY_SWITCH_IN \\\n+\t\tGPIO_SAFETY_SWITCH_IN, \\\n+\t\tGPIO_nARMED_INIT \\\n \t}\n \n __BEGIN_DECLS\n"} {"commit":"5d85d078caf7acaad75e2b2ca854b19db68d44c3","subject":"Use the build_config defines in atomicops.h. This still uses the compiler\/platform specific defines in the platform dependent internals headers, keeping them closer to the original implementation.","message":"Use the build_config defines in atomicops.h. This still uses the compiler\/platform specific defines in the platform dependent internals headers, keeping them closer to the original implementation.\n\ngit-svn-id: http:\/\/src.chromium.org\/svn\/trunk\/src@372 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n\nFormer-commit-id: 8155881433f379db51a49a785e8a58a0e8be3261","repos":"meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- base\/atomicops.h\n+++ base\/atomicops.h\n@@ -54,20 +54,17 @@\n #define BASE_ATOMICOPS_H_\n \n #include \"base\/basictypes.h\"\n-\n-#if defined(_WIN64) || defined(__x86_64__) || defined(__LP64)\n-#define HAS_64_BIT\n-#endif\n-#ifndef WIN32\n-#define __w64\n-#endif\n+#include \"base\/port.h\"\n \n namespace base {\n namespace subtle {\n \n \/\/ Bug 1308991. We need this for \/Wp64, to mark it safe for AtomicWord casting.\n+#ifndef OS_WIN\n+#define __w64\n+#endif\n typedef __w64 int32 Atomic32;\n-#ifdef HAS_64_BIT\n+#ifdef CPU_ARCH_64_BITS\n typedef int64 Atomic64;\n #endif\n \n@@ -126,7 +123,7 @@\n Atomic32 Release_Load(volatile const Atomic32* ptr);\n \n \/\/ 64-bit atomic operations (only available on 64-bit processors).\n-#ifdef HAS_64_BIT\n+#ifdef CPU_ARCH_64_BITS\n Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,\n Atomic64 old_value,\n Atomic64 new_value);\n@@ -146,17 +143,17 @@\n Atomic64 NoBarrier_Load(volatile const Atomic64* ptr);\n Atomic64 Acquire_Load(volatile const Atomic64* ptr);\n Atomic64 Release_Load(volatile const Atomic64* ptr);\n-#endif \/\/ HAS_64_bit\n+#endif \/\/ CPU_ARCH_64_BITS\n \n } \/\/ namespace base::subtle\n } \/\/ namespace base\n \n \/\/ Include our platform specific implementation.\n-#if defined(_MSC_VER) && defined(_M_IX86)\n+#if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY)\n #include \"base\/atomicops_internals_x86_msvc.h\"\n-#elif defined(__MACH__) && defined(__APPLE__) && defined(__i386__)\n+#elif defined(OS_APPLE) && defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)\n #include \"base\/atomicops_internals_x86_macosx.h\"\n-#elif defined(__GNUC__) && (defined(__i386) || defined(ARCH_K8))\n+#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)\n #include \"base\/atomicops_internals_x86_gcc.h\"\n #else\n #error \"Atomic operations are not supported on your platform\"\n"} {"commit":"526032643f4fcd4e03283c0f131cf99be8707735","subject":"GEN: regenerate spatial\/ckdtree.c","message":"GEN: regenerate spatial\/ckdtree.c\n","repos":"rgommers\/scipy,person142\/scipy,anntzer\/scipy,jonycgn\/scipy,zaxliu\/scipy,ortylp\/scipy,sauliusl\/scipy,richardotis\/scipy,WillieMaddox\/scipy,apbard\/scipy,nonhermitian\/scipy,perimosocordiae\/scipy,anielsen001\/scipy,kalvdans\/scipy,woodscn\/scipy,rmcgibbo\/scipy,mikebenfield\/scipy,ogrisel\/scipy,grlee77\/scipy,ogrisel\/scipy,mdhaber\/scipy,vberaudi\/scipy,Dapid\/scipy,cpaulik\/scipy,efiring\/scipy,argriffing\/scipy,anntzer\/scipy,jakevdp\/scipy,vberaudi\/scipy,kalvdans\/scipy,jamestwebber\/scipy,Stefan-Endres\/scipy,behzadnouri\/scipy,argriffing\/scipy,teoliphant\/scipy,ndchorley\/scipy,woodscn\/scipy,tylerjereddy\/scipy,aman-iitj\/scipy,WarrenWeckesser\/scipy,andyfaff\/scipy,maniteja123\/scipy,cpaulik\/scipy,jor-\/scipy,nvoron23\/scipy,jor-\/scipy,felipebetancur\/scipy,maciejkula\/scipy,njwilson23\/scipy,jamestwebber\/scipy,ChanderG\/scipy,nmayorov\/scipy,pyramania\/scipy,kalvdans\/scipy,dominicelse\/scipy,fredrikw\/scipy,maniteja123\/scipy,anielsen001\/scipy,minhlongdo\/scipy,vanpact\/scipy,Srisai85\/scipy,Dapid\/scipy,kleskjr\/scipy,endolith\/scipy,ndchorley\/scipy,scipy\/scipy,vhaasteren\/scipy,njwilson23\/scipy,maniteja123\/scipy,fredrikw\/scipy,perimosocordiae\/scipy,jseabold\/scipy,vigna\/scipy,trankmichael\/scipy,hainm\/scipy,WarrenWeckesser\/scipy,behzadnouri\/scipy,ChanderG\/scipy,woodscn\/scipy,mortada\/scipy,mhogg\/scipy,fernand\/scipy,hainm\/scipy,teoliphant\/scipy,witcxc\/scipy,jseabold\/scipy,matthewalbani\/scipy,matthew-brett\/scipy,richardotis\/scipy,Gillu13\/scipy,nmayorov\/scipy,andim\/scipy,fernand\/scipy,juliantaylor\/scipy,trankmichael\/scipy,jjhelmus\/scipy,jsilter\/scipy,gef756\/scipy,Dapid\/scipy,juliantaylor\/scipy,lukauskas\/scipy,haudren\/scipy,Stefan-Endres\/scipy,mdhaber\/scipy,fernand\/scipy,mtrbean\/scipy,pyramania\/scipy,sonnyhu\/scipy,arokem\/scipy,felipebetancur\/scipy,raoulbq\/scipy,Newman101\/scipy,Newman101\/scipy,WarrenWeckesser\/scipy,aman-iitj\/scipy,anielsen001\/scipy,ortylp\/scipy,Srisai85\/scipy,matthewalbani\/scipy,pschella\/scipy,jsilter\/scipy,trankmichael\/scipy,raoulbq\/scipy,jamestwebber\/scipy,felipebetancur\/scipy,rgommers\/scipy,vberaudi\/scipy,mortada\/scipy,arokem\/scipy,josephcslater\/scipy,pnedunuri\/scipy,ChanderG\/scipy,dch312\/scipy,mgaitan\/scipy,WillieMaddox\/scipy,lukauskas\/scipy,gdooper\/scipy,zerothi\/scipy,ales-erjavec\/scipy,aman-iitj\/scipy,sargas\/scipy,bkendzior\/scipy,aeklant\/scipy,njwilson23\/scipy,apbard\/scipy,befelix\/scipy,ales-erjavec\/scipy,raoulbq\/scipy,rgommers\/scipy,maciejkula\/scipy,Eric89GXL\/scipy,ortylp\/scipy,newemailjdm\/scipy,andyfaff\/scipy,jamestwebber\/scipy,jsilter\/scipy,pnedunuri\/scipy,efiring\/scipy,Gillu13\/scipy,vhaasteren\/scipy,Stefan-Endres\/scipy,Dapid\/scipy,befelix\/scipy,rmcgibbo\/scipy,perimosocordiae\/scipy,gef756\/scipy,nvoron23\/scipy,sriki18\/scipy,andyfaff\/scipy,efiring\/scipy,gfyoung\/scipy,dch312\/scipy,endolith\/scipy,minhlongdo\/scipy,mtrbean\/scipy,WillieMaddox\/scipy,andim\/scipy,chatcannon\/scipy,jsilter\/scipy,mikebenfield\/scipy,mdhaber\/scipy,lhilt\/scipy,ilayn\/scipy,Shaswat27\/scipy,e-q\/scipy,richardotis\/scipy,gef756\/scipy,mingwpy\/scipy,fernand\/scipy,zxsted\/scipy,gertingold\/scipy,ilayn\/scipy,pizzathief\/scipy,scipy\/scipy,sargas\/scipy,jor-\/scipy,surhudm\/scipy,aman-iitj\/scipy,aeklant\/scipy,endolith\/scipy,mortonjt\/scipy,Newman101\/scipy,mtrbean\/scipy,matthew-brett\/scipy,maniteja123\/scipy,perimosocordiae\/scipy,sriki18\/scipy,anntzer\/scipy,ogrisel\/scipy,mdhaber\/scipy,surhudm\/scipy,ortylp\/scipy,lukauskas\/scipy,jonycgn\/scipy,endolith\/scipy,FRidh\/scipy,raoulbq\/scipy,nvoron23\/scipy,jamestwebber\/scipy,lhilt\/scipy,nonhermitian\/scipy,sargas\/scipy,piyush0609\/scipy,nmayorov\/scipy,sonnyhu\/scipy,behzadnouri\/scipy,anielsen001\/scipy,larsmans\/scipy,befelix\/scipy,juliantaylor\/scipy,rgommers\/scipy,Kamp9\/scipy,raoulbq\/scipy,sonnyhu\/scipy,lhilt\/scipy,njwilson23\/scipy,pbrod\/scipy,aarchiba\/scipy,mortada\/scipy,fernand\/scipy,ales-erjavec\/scipy,fredrikw\/scipy,WillieMaddox\/scipy,jakevdp\/scipy,vberaudi\/scipy,nmayorov\/scipy,juliantaylor\/scipy,aman-iitj\/scipy,jseabold\/scipy,woodscn\/scipy,vigna\/scipy,Gillu13\/scipy,mgaitan\/scipy,dch312\/scipy,zxsted\/scipy,kleskjr\/scipy,pschella\/scipy,kalvdans\/scipy,Kamp9\/scipy,giorgiop\/scipy,futurulus\/scipy,jjhelmus\/scipy,sriki18\/scipy,ortylp\/scipy,pizzathief\/scipy,WarrenWeckesser\/scipy,pizzathief\/scipy,niknow\/scipy,andim\/scipy,gertingold\/scipy,aarchiba\/scipy,maciejkula\/scipy,gertingold\/scipy,zerothi\/scipy,vberaudi\/scipy,aeklant\/scipy,bkendzior\/scipy,maniteja123\/scipy,hainm\/scipy,Dapid\/scipy,Kamp9\/scipy,mtrbean\/scipy,petebachant\/scipy,jonycgn\/scipy,argriffing\/scipy,minhlongdo\/scipy,josephcslater\/scipy,argriffing\/scipy,grlee77\/scipy,sargas\/scipy,sriki18\/scipy,person142\/scipy,grlee77\/scipy,jjhelmus\/scipy,Gillu13\/scipy,cpaulik\/scipy,vhaasteren\/scipy,mhogg\/scipy,petebachant\/scipy,Gillu13\/scipy,njwilson23\/scipy,Srisai85\/scipy,sargas\/scipy,endolith\/scipy,matthew-brett\/scipy,aeklant\/scipy,argriffing\/scipy,Eric89GXL\/scipy,anielsen001\/scipy,larsmans\/scipy,futurulus\/scipy,giorgiop\/scipy,FRidh\/scipy,arokem\/scipy,nonhermitian\/scipy,gef756\/scipy,ndchorley\/scipy,jjhelmus\/scipy,matthewalbani\/scipy,Eric89GXL\/scipy,chatcannon\/scipy,aarchiba\/scipy,surhudm\/scipy,tylerjereddy\/scipy,gfyoung\/scipy,richardotis\/scipy,ndchorley\/scipy,Srisai85\/scipy,nmayorov\/scipy,mtrbean\/scipy,trankmichael\/scipy,pbrod\/scipy,pbrod\/scipy,pyramania\/scipy,njwilson23\/scipy,aeklant\/scipy,kleskjr\/scipy,gdooper\/scipy,jakevdp\/scipy,lukauskas\/scipy,tylerjereddy\/scipy,hainm\/scipy,ales-erjavec\/scipy,niknow\/scipy,sonnyhu\/scipy,haudren\/scipy,zxsted\/scipy,surhudm\/scipy,andyfaff\/scipy,scipy\/scipy,FRidh\/scipy,matthewalbani\/scipy,zaxliu\/scipy,giorgiop\/scipy,futurulus\/scipy,niknow\/scipy,petebachant\/scipy,dominicelse\/scipy,vanpact\/scipy,pschella\/scipy,kleskjr\/scipy,vigna\/scipy,ChanderG\/scipy,vhaasteren\/scipy,petebachant\/scipy,gdooper\/scipy,pyramania\/scipy,pnedunuri\/scipy,jakevdp\/scipy,piyush0609\/scipy,WarrenWeckesser\/scipy,futurulus\/scipy,ilayn\/scipy,chatcannon\/scipy,scipy\/scipy,mikebenfield\/scipy,cpaulik\/scipy,fredrikw\/scipy,haudren\/scipy,nvoron23\/scipy,gertingold\/scipy,mortonjt\/scipy,zerothi\/scipy,witcxc\/scipy,mortonjt\/scipy,pizzathief\/scipy,zxsted\/scipy,giorgiop\/scipy,kleskjr\/scipy,witcxc\/scipy,chatcannon\/scipy,maciejkula\/scipy,behzadnouri\/scipy,vigna\/scipy,haudren\/scipy,dominicelse\/scipy,nvoron23\/scipy,larsmans\/scipy,trankmichael\/scipy,mhogg\/scipy,Kamp9\/scipy,Shaswat27\/scipy,gdooper\/scipy,sauliusl\/scipy,Newman101\/scipy,vanpact\/scipy,mortada\/scipy,Stefan-Endres\/scipy,minhlongdo\/scipy,sauliusl\/scipy,ndchorley\/scipy,mortonjt\/scipy,e-q\/scipy,aarchiba\/scipy,lukauskas\/scipy,mingwpy\/scipy,anntzer\/scipy,pbrod\/scipy,larsmans\/scipy,lhilt\/scipy,rmcgibbo\/scipy,Srisai85\/scipy,gdooper\/scipy,dominicelse\/scipy,andyfaff\/scipy,zerothi\/scipy,ogrisel\/scipy,sauliusl\/scipy,mingwpy\/scipy,WarrenWeckesser\/scipy,vanpact\/scipy,anielsen001\/scipy,giorgiop\/scipy,apbard\/scipy,andim\/scipy,kleskjr\/scipy,sonnyhu\/scipy,jseabold\/scipy,Gillu13\/scipy,dch312\/scipy,larsmans\/scipy,petebachant\/scipy,behzadnouri\/scipy,zerothi\/scipy,futurulus\/scipy,josephcslater\/scipy,grlee77\/scipy,Dapid\/scipy,person142\/scipy,richardotis\/scipy,andim\/scipy,vhaasteren\/scipy,ogrisel\/scipy,e-q\/scipy,scipy\/scipy,teoliphant\/scipy,jsilter\/scipy,efiring\/scipy,felipebetancur\/scipy,lukauskas\/scipy,niknow\/scipy,dominicelse\/scipy,piyush0609\/scipy,gef756\/scipy,pyramania\/scipy,mtrbean\/scipy,matthew-brett\/scipy,gfyoung\/scipy,Kamp9\/scipy,person142\/scipy,jonycgn\/scipy,Shaswat27\/scipy,newemailjdm\/scipy,arokem\/scipy,vberaudi\/scipy,matthew-brett\/scipy,FRidh\/scipy,Shaswat27\/scipy,mortonjt\/scipy,zerothi\/scipy,mhogg\/scipy,josephcslater\/scipy,mhogg\/scipy,rmcgibbo\/scipy,zxsted\/scipy,zaxliu\/scipy,haudren\/scipy,sauliusl\/scipy,e-q\/scipy,sriki18\/scipy,pschella\/scipy,newemailjdm\/scipy,surhudm\/scipy,Kamp9\/scipy,jor-\/scipy,mingwpy\/scipy,FRidh\/scipy,richardotis\/scipy,zaxliu\/scipy,ilayn\/scipy,lhilt\/scipy,rgommers\/scipy,newemailjdm\/scipy,teoliphant\/scipy,chatcannon\/scipy,befelix\/scipy,trankmichael\/scipy,hainm\/scipy,cpaulik\/scipy,nvoron23\/scipy,perimosocordiae\/scipy,Shaswat27\/scipy,Eric89GXL\/scipy,piyush0609\/scipy,felipebetancur\/scipy,jonycgn\/scipy,jjhelmus\/scipy,andyfaff\/scipy,sauliusl\/scipy,cpaulik\/scipy,mgaitan\/scipy,mortada\/scipy,witcxc\/scipy,piyush0609\/scipy,jor-\/scipy,teoliphant\/scipy,anntzer\/scipy,befelix\/scipy,Newman101\/scipy,sriki18\/scipy,mdhaber\/scipy,ales-erjavec\/scipy,jseabold\/scipy,pizzathief\/scipy,gfyoung\/scipy,Newman101\/scipy,apbard\/scipy,maciejkula\/scipy,rmcgibbo\/scipy,vhaasteren\/scipy,pnedunuri\/scipy,person142\/scipy,felipebetancur\/scipy,Eric89GXL\/scipy,behzadnouri\/scipy,Stefan-Endres\/scipy,vigna\/scipy,nonhermitian\/scipy,jakevdp\/scipy,Shaswat27\/scipy,pnedunuri\/scipy,anntzer\/scipy,haudren\/scipy,petebachant\/scipy,sonnyhu\/scipy,pbrod\/scipy,pnedunuri\/scipy,ortylp\/scipy,newemailjdm\/scipy,matthewalbani\/scipy,argriffing\/scipy,fernand\/scipy,josephcslater\/scipy,zxsted\/scipy,ChanderG\/scipy,fredrikw\/scipy,tylerjereddy\/scipy,mdhaber\/scipy,newemailjdm\/scipy,fredrikw\/scipy,vanpact\/scipy,andim\/scipy,mikebenfield\/scipy,mhogg\/scipy,larsmans\/scipy,dch312\/scipy,pschella\/scipy,mingwpy\/scipy,Srisai85\/scipy,perimosocordiae\/scipy,jseabold\/scipy,aarchiba\/scipy,ndchorley\/scipy,jonycgn\/scipy,endolith\/scipy,gef756\/scipy,maniteja123\/scipy,woodscn\/scipy,ilayn\/scipy,futurulus\/scipy,woodscn\/scipy,mgaitan\/scipy,chatcannon\/scipy,FRidh\/scipy,rmcgibbo\/scipy,vanpact\/scipy,zaxliu\/scipy,juliantaylor\/scipy,raoulbq\/scipy,efiring\/scipy,Eric89GXL\/scipy,hainm\/scipy,ChanderG\/scipy,gfyoung\/scipy,minhlongdo\/scipy,e-q\/scipy,giorgiop\/scipy,mortada\/scipy,scipy\/scipy,witcxc\/scipy,niknow\/scipy,aman-iitj\/scipy,ilayn\/scipy,WillieMaddox\/scipy,kalvdans\/scipy,bkendzior\/scipy,apbard\/scipy,minhlongdo\/scipy,niknow\/scipy,zaxliu\/scipy,efiring\/scipy,surhudm\/scipy,nonhermitian\/scipy,bkendzior\/scipy,grlee77\/scipy,mgaitan\/scipy,mingwpy\/scipy,piyush0609\/scipy,mortonjt\/scipy,mikebenfield\/scipy,tylerjereddy\/scipy,ales-erjavec\/scipy,mgaitan\/scipy,bkendzior\/scipy,arokem\/scipy,gertingold\/scipy,Stefan-Endres\/scipy,WillieMaddox\/scipy,pbrod\/scipy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- scipy\/spatial\/ckdtree.c\n+++ scipy\/spatial\/ckdtree.c\n@@ -1,4 +1,4 @@\n-\/* Generated by Cython 0.16 on Fri Jul 13 00:21:48 2012 *\/\n+\/* Generated by Cython 0.16 on Sat Jul 14 12:25:58 2012 *\/\n \n #define PY_SSIZE_T_CLEAN\n #include \"Python.h\"\n@@ -672,98 +672,98 @@\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode;\n struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo;\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":17\n- * \n+\/* \"scipy\/spatial\/ckdtree.pyx\":33\n * # priority queue\n- * cdef union heapcontents: # <<<<<<<<<<<<<<\n- * int intdata\n+ * \n+ * cdef union heapcontents: # FIXME: Unions are not always portable, verify this # <<<<<<<<<<<<<<\n+ * np.npy_intp intdata # union is never used in an ABI dependent way.\n * char* ptrdata\n *\/\n union __pyx_t_5scipy_7spatial_7ckdtree_heapcontents {\n- int intdata;\n+ npy_intp intdata;\n char *ptrdata;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":21\n+\/* \"scipy\/spatial\/ckdtree.pyx\":37\n * char* ptrdata\n * \n * cdef struct heapitem: # <<<<<<<<<<<<<<\n- * double priority\n+ * np.float64_t priority\n * heapcontents contents\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem {\n- double priority;\n+ __pyx_t_5numpy_float64_t priority;\n union __pyx_t_5scipy_7spatial_7ckdtree_heapcontents contents;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":25\n+\/* \"scipy\/spatial\/ckdtree.pyx\":41\n * heapcontents contents\n * \n * cdef struct heap: # <<<<<<<<<<<<<<\n- * int n\n+ * np.npy_intp n\n * heapitem* heap\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_heap {\n- int n;\n+ npy_intp n;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *heap;\n- int space;\n+ npy_intp space;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":140\n+\/* \"scipy\/spatial\/ckdtree.pyx\":183\n * \n * # Interval arithmetic\n * cdef struct Rectangle: # <<<<<<<<<<<<<<\n- * int m\n- * double *mins\n+ * np.npy_intp m\n+ * np.float64_t *mins\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle {\n- int m;\n- double *mins;\n- double *maxes;\n+ npy_intp m;\n+ __pyx_t_5numpy_float64_t *mins;\n+ __pyx_t_5numpy_float64_t *maxes;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":223\n- * \n+\/* \"scipy\/spatial\/ckdtree.pyx\":296\n * # Tree structure\n+ * \n * cdef struct innernode: # <<<<<<<<<<<<<<\n- * int split_dim\n- * int children\n+ * np.npy_intp split_dim\n+ * np.npy_intp children\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode {\n- int split_dim;\n- int children;\n- double split;\n+ npy_intp split_dim;\n+ npy_intp children;\n+ __pyx_t_5numpy_float64_t split;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *less;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *greater;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":229\n- * innernode* less\n+\/* \"scipy\/spatial\/ckdtree.pyx\":303\n * innernode* greater\n+ * \n * cdef struct leafnode: # <<<<<<<<<<<<<<\n- * int split_dim\n- * int children\n+ * np.npy_intp split_dim\n+ * np.npy_intp children\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode {\n- int split_dim;\n- int children;\n- int start_idx;\n- int end_idx;\n+ npy_intp split_dim;\n+ npy_intp children;\n+ npy_intp start_idx;\n+ npy_intp end_idx;\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":237\n- * # this is the standard trick for variable-size arrays:\n- * # malloc sizeof(nodeinfo)+self.m*sizeof(double) bytes.\n+\/* \"scipy\/spatial\/ckdtree.pyx\":313\n+ * # malloc sizeof(nodeinfo)+self.m*sizeof(np.float64_t) bytes.\n+ * \n * cdef struct nodeinfo: # <<<<<<<<<<<<<<\n * innernode* node\n- * double side_distances[0]\n+ * np.float64_t side_distances[0] # FIXME: Only valid in C99, invalid C++ and C89\n *\/\n struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo {\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *node;\n- double side_distances[0];\n+ __pyx_t_5numpy_float64_t side_distances[0];\n };\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":288\n+\/* \"scipy\/spatial\/ckdtree.pyx\":364\n * shape=shape)\n * \n * cdef class cKDTree: # <<<<<<<<<<<<<<\n@@ -775,48 +775,48 @@\n struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *__pyx_vtab;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *tree;\n PyObject *data;\n- double *raw_data;\n- int n;\n- int m;\n- int leafsize;\n+ __pyx_t_5numpy_float64_t *raw_data;\n+ npy_intp n;\n+ npy_intp m;\n+ npy_intp leafsize;\n PyObject *maxes;\n- double *raw_maxes;\n+ __pyx_t_5numpy_float64_t *raw_maxes;\n PyObject *mins;\n- double *raw_mins;\n+ __pyx_t_5numpy_float64_t *raw_mins;\n PyObject *indices;\n- __pyx_t_5numpy_int32_t *raw_indices;\n+ npy_intp *raw_indices;\n };\n \n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":242\n+\/* \"scipy\/spatial\/ckdtree.pyx\":318\n * \n * # Utility for building a coo matrix incrementally\n * cdef class coo_entries: # <<<<<<<<<<<<<<\n * cdef:\n- * int n, n_max\n+ * np.npy_intp n, n_max\n *\/\n struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries {\n PyObject_HEAD\n struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *__pyx_vtab;\n- int n;\n- int n_max;\n+ npy_intp n;\n+ npy_intp n_max;\n PyArrayObject *i;\n PyArrayObject *j;\n PyArrayObject *v;\n- __pyx_t_5numpy_int_t *i_data;\n- __pyx_t_5numpy_int_t *j_data;\n- __pyx_t_5numpy_double_t *v_data;\n+ npy_intp *i_data;\n+ npy_intp *j_data;\n+ __pyx_t_5numpy_float64_t *v_data;\n };\n \n \n \n struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries {\n- void (*add)(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, int, int, double);\n+ void (*add)(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, npy_intp, npy_intp, __pyx_t_5numpy_float64_t);\n };\n static struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *__pyx_vtabptr_5scipy_7spatial_7ckdtree_coo_entries;\n \n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":288\n+\/* \"scipy\/spatial\/ckdtree.pyx\":364\n * shape=shape)\n * \n * cdef class cKDTree: # <<<<<<<<<<<<<<\n@@ -825,18 +825,18 @@\n *\/\n \n struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree {\n- struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *(*__pyx___build)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, int, int, double *, double *);\n+ struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *(*__pyx___build)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, npy_intp, npy_intp, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *);\n PyObject *(*__pyx___free_tree)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n- void (*__pyx___query)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, double *, int *, double *, int, double, double, double);\n- void (*__pyx___query_ball_point_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n- void (*__pyx___query_ball_point_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double);\n- PyObject *(*__pyx___query_ball_point)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, double *, double, double, double);\n- void (*__pyx___query_ball_tree_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n- void (*__pyx___query_ball_tree_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double);\n- void (*__pyx___query_pairs_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n- void (*__pyx___query_pairs_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double);\n- void (*__pyx___count_neighbors_traverse)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, int, double *, __pyx_t_5numpy_int_t *, __pyx_t_5numpy_int_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double);\n- void (*__pyx___sparse_distance_matrix_traverse)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double);\n+ int (*__pyx___query)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, __pyx_t_5numpy_float64_t *, npy_intp *, __pyx_t_5numpy_float64_t *, npy_intp, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ int (*__pyx___query_ball_point_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n+ int (*__pyx___query_ball_point_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ PyObject *(*__pyx___query_ball_point)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ int (*__pyx___query_ball_tree_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n+ int (*__pyx___query_ball_tree_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ int (*__pyx___query_pairs_traverse_no_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *);\n+ int (*__pyx___query_pairs_traverse_checking)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ int (*__pyx___count_neighbors_traverse)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, npy_intp, __pyx_t_5numpy_float64_t *, npy_intp *, npy_intp *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n+ int (*__pyx___sparse_distance_matrix_traverse)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t);\n };\n static struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *__pyx_vtabptr_5scipy_7spatial_7ckdtree_cKDTree;\n #ifndef CYTHON_REFNANNY\n@@ -900,8 +900,6 @@\n \n static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause); \/*proto*\/\n \n-static CYTHON_INLINE long __Pyx_div_long(long, long); \/* proto *\/\n-\n static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,\n Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); \/*proto*\/\n \n@@ -926,6 +924,8 @@\n static CYTHON_INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info);\n \n static void __Pyx_RaiseBufferFallbackError(void); \/*proto*\/\n+\n+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); \/*proto*\/\n \n static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {\n PyObject *r;\n@@ -1038,10 +1038,15 @@\n #endif \/* PyAnySet_CheckExact (<= Py2.4) *\/\n #endif \/* < Py2.5 *\/\n \n-#define __Pyx_BufPtrStrided1d(type, buf, i0, s0) (type)((char*)buf + i0 * s0)\n+#define __Pyx_BufPtrCContig1d(type, buf, i0, s0) ((type)buf + i0)\n static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);\n \n static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index); \/*proto*\/\n+\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_Py_intptr_t(Py_intptr_t);\n+\n+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); \/*proto*\/\n+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); \/*proto*\/\n \n typedef struct {\n Py_ssize_t shape, strides, suboffsets;\n@@ -1069,9 +1074,7 @@\n \n static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, long level); \/*proto*\/\n \n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_int32(npy_int32);\n-\n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_long(npy_long);\n+static CYTHON_INLINE Py_intptr_t __Pyx_PyInt_from_py_Py_intptr_t(PyObject *);\n \n #if CYTHON_CCOMPLEX\n #ifdef __cplusplus\n@@ -1262,53 +1265,54 @@\n static PyTypeObject *__pyx_ptype_5numpy_ufunc = 0;\n static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *, char *, char *, int *); \/*proto*\/\n \n+\/* Module declarations from 'cython' *\/\n+\n \/* Module declarations from 'scipy.spatial.ckdtree' *\/\n static PyTypeObject *__pyx_ptype_5scipy_7spatial_7ckdtree_coo_entries = 0;\n static PyTypeObject *__pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree = 0;\n-static double __pyx_v_5scipy_7spatial_7ckdtree_infinity;\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapcreate(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, int); \/*proto*\/\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapdestroy(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapresize(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, int); \/*proto*\/\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heappush(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem); \/*proto*\/\n+static __pyx_t_5numpy_float64_t __pyx_v_5scipy_7spatial_7ckdtree_infinity;\n+static PyObject *__pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype = 0;\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapcreate(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, npy_intp); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapresize(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, npy_intp); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heappush(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem); \/*proto*\/\n static struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_f_5scipy_7spatial_7ckdtree_heappeek(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n-static PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapremove(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n-static struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_f_5scipy_7spatial_7ckdtree_heappop(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_dmax(double, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_dabs(double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree__distance_p(double *, double *, double, int, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(double *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(double *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(double *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(double *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n-static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double, double, double, double *, double *); \/*proto*\/\n-static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, int, double, double *, double *, double, double); \/*proto*\/\n-static __Pyx_TypeInfo __Pyx_TypeInfo_double = { \"double\", NULL, sizeof(double), { 0 }, 0, 'R', 0, 0 };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t = { \"int32_t\", NULL, sizeof(__pyx_t_5numpy_int32_t), { 0 }, 0, 'I', IS_UNSIGNED(__pyx_t_5numpy_int32_t), 0 };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_int = { \"int\", NULL, sizeof(int), { 0 }, 0, 'I', IS_UNSIGNED(int), 0 };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_double_t = { \"double_t\", NULL, sizeof(__pyx_t_5numpy_double_t), { 0 }, 0, 'R', 0, 0 };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_int_t = { \"int_t\", NULL, sizeof(__pyx_t_5numpy_int_t), { 0 }, 0, 'I', IS_UNSIGNED(__pyx_t_5numpy_int_t), 0 };\n+static int __pyx_f_5scipy_7spatial_7ckdtree_heapremove(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *); \/*proto*\/\n+static int __pyx_f_5scipy_7spatial_7ckdtree_heappop(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_dabs(__pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree__distance_p(__pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, npy_intp, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_t_5numpy_float64_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(__pyx_t_5numpy_float64_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_t_5numpy_float64_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(__pyx_t_5numpy_float64_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle); \/*proto*\/\n+static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *); \/*proto*\/\n+static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, npy_intp, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t); \/*proto*\/\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t = { \"float64_t\", NULL, sizeof(__pyx_t_5numpy_float64_t), { 0 }, 0, 'R', 0, 0 };\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn_npy_intp = { \"npy_intp\", NULL, sizeof(npy_intp), { 0 }, 0, 'I', IS_UNSIGNED(npy_intp), 0 };\n #define __Pyx_MODULE_NAME \"scipy.spatial.ckdtree\"\n int __pyx_module_is_main_scipy__spatial__ckdtree = 0;\n \n \/* Implementation of 'scipy.spatial.ckdtree' *\/\n+static PyObject *__pyx_builtin_ImportError;\n+static PyObject *__pyx_builtin_MemoryError;\n static PyObject *__pyx_builtin_ValueError;\n static PyObject *__pyx_builtin_range;\n-static PyObject *__pyx_builtin_xrange;\n static PyObject *__pyx_builtin_RuntimeError;\n static int __pyx_pf_5scipy_7spatial_7ckdtree_11coo_entries___init__(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_self); \/* proto *\/\n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_11coo_entries_2to_matrix(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_self, PyObject *__pyx_v_shape); \/* proto *\/\n-static int __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree___init__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_data, int __pyx_v_leafsize); \/* proto *\/\n+static int __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree___init__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_data, npy_intp __pyx_v_leafsize); \/* proto *\/\n static void __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_2__dealloc__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, int __pyx_v_k, double __pyx_v_eps, double __pyx_v_p, double __pyx_v_distance_upper_bound); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_6query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_10query_pairs(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_12count_neighbors(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_r, double __pyx_v_p); \/* proto *\/\n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, double __pyx_v_r, double __pyx_v_p); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_eps, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_distance_upper_bound); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_6query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_10query_pairs(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_12count_neighbors(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p); \/* proto *\/\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p); \/* proto *\/\n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4data___get__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self); \/* proto *\/\n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_1n___get__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self); \/* proto *\/\n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_1m___get__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self); \/* proto *\/\n@@ -1320,7 +1324,7 @@\n static char __pyx_k_1[] = \"Heap containing %d items cannot be resized to %d\";\n static char __pyx_k_2[] = \"leafsize must be at least 1\";\n static char __pyx_k_4[] = \"distance_upper_bound\";\n-static char __pyx_k_6[] = \"x must consist of vectors of length %d but has shape %s\";\n+static char __pyx_k_6[] = \"x must consist of vectors of length %d but hasshape %s\";\n static char __pyx_k_7[] = \"Only p-norms with 1<=p<=infinity permitted\";\n static char __pyx_k_12[] = \"Searching for a %d-dimensional point in a %d-dimensional KDTree\";\n static char __pyx_k_13[] = \"Trees passed to query_ball_trees have different dimensionality\";\n@@ -1332,8 +1336,9 @@\n static char __pyx_k_26[] = \"Format string allocated too short, see comment in numpy.pxd\";\n static char __pyx_k_29[] = \"Format string allocated too short.\";\n static char __pyx_k_31[] = \"scipy.sparse\";\n-static char __pyx_k_32[] = \"cKDTree.query_ball_point (line 875)\";\n-static char __pyx_k_33[] = \"query_ball_point(self, x, r, p, eps)\\n \\n Find all points within distance r of point(s) x.\\n\\n Parameters\\n ----------\\n x : array_like, shape tuple + (self.m,)\\n The point or points to search for neighbors of.\\n r : positive float\\n The radius of points to return.\\n p : float, optional\\n Which Minkowski p-norm to use. Should be in the range [1, inf].\\n eps : nonnegative float, optional\\n Approximate search. Branches of the tree are not explored if their\\n nearest points are further than ``r \/ (1 + eps)``, and branches are\\n added in bulk if their furthest points are nearer than\\n ``r * (1 + eps)``.\\n\\n Returns\\n -------\\n results : list or array of lists\\n If `x` is a single point, returns a list of the indices of the\\n neighbors of `x`. If `x` is an array of points, returns an object\\n array of shape tuple containing lists of neighbors.\\n\\n Notes\\n -----\\n If you have many points whose neighbors you want to find, you may save\\n substantial amounts of time by putting them in a cKDTree and using\\n query_ball_tree.\\n\\n Examples\\n --------\\n >>> from scipy import spatial\\n >>> x, y = np.mgrid[0:4, 0:4]\\n >>> points = zip(x.ravel(), y.ravel())\\n >>> tree = spatial.cKDTree(points)\\n >>> tree.query_ball_point([2, 0], 1)\\n [4, 8, 9, 12]\\n\\n \";\n+static char __pyx_k_32[] = \"Unexpected length of npy_intp\";\n+static char __pyx_k_33[] = \"cKDTree.query_ball_point (line 1041)\";\n+static char __pyx_k_34[] = \"query_ball_point(self, x, r, p, eps)\\n \\n Find all points within distance r of point(s) x.\\n\\n Parameters\\n ----------\\n x : array_like, shape tuple + (self.m,)\\n The point or points to search for neighbors of.\\n r : positive float\\n The radius of points to return.\\n p : float, optional\\n Which Minkowski p-norm to use. Should be in the range [1, inf].\\n eps : nonnegative float, optional\\n Approximate search. Branches of the tree are not explored if their\\n nearest points are further than ``r \/ (1 + eps)``, and branches are\\n added in bulk if their furthest points are nearer than\\n ``r * (1 + eps)``.\\n\\n Returns\\n -------\\n results : list or array of lists\\n If `x` is a single point, returns a list of the indices of the\\n neighbors of `x`. If `x` is an array of points, returns an object\\n array of shape tuple containing lists of neighbors.\\n\\n Notes\\n -----\\n If you have many points whose neighbors you want to find, you may save\\n substantial amounts of time by putting them in a cKDTree and using\\n query_ball_tree.\\n\\n Examples\\n --------\\n >>> from scipy import spatial\\n >>> x, y = np.mgrid[0:4, 0:4]\\n >>> points = zip(x.ravel(), y.ravel())\\n >>> tree = spatial.cKDTree(points)\\n >>> tree.query_ball_point([2, 0], 1)\\n [4, 8, 9, 12]\\n\\n \";\n static char __pyx_k__B[] = \"B\";\n static char __pyx_k__H[] = \"H\";\n static char __pyx_k__I[] = \"I\";\n@@ -1358,18 +1363,16 @@\n static char __pyx_k__np[] = \"np\";\n static char __pyx_k__eps[] = \"eps\";\n static char __pyx_k__inf[] = \"inf\";\n-static char __pyx_k__int[] = \"int\";\n static char __pyx_k__amax[] = \"amax\";\n static char __pyx_k__amin[] = \"amin\";\n static char __pyx_k__axis[] = \"axis\";\n static char __pyx_k__data[] = \"data\";\n static char __pyx_k__fill[] = \"fill\";\n static char __pyx_k__prod[] = \"prod\";\n-static char __pyx_k__array[] = \"array\";\n static char __pyx_k__dtype[] = \"dtype\";\n static char __pyx_k__empty[] = \"empty\";\n-static char __pyx_k__float[] = \"float\";\n static char __pyx_k__int32[] = \"int32\";\n+static char __pyx_k__int64[] = \"int64\";\n static char __pyx_k__numpy[] = \"numpy\";\n static char __pyx_k__other[] = \"other\";\n static char __pyx_k__range[] = \"range\";\n@@ -1379,15 +1382,14 @@\n static char __pyx_k__zeros[] = \"zeros\";\n static char __pyx_k__arange[] = \"arange\";\n static char __pyx_k__astype[] = \"astype\";\n-static char __pyx_k__double[] = \"double\";\n static char __pyx_k__kdtree[] = \"kdtree\";\n static char __pyx_k__object[] = \"object\";\n static char __pyx_k__resize[] = \"resize\";\n static char __pyx_k__sparse[] = \"sparse\";\n-static char __pyx_k__xrange[] = \"xrange\";\n static char __pyx_k____all__[] = \"__all__\";\n static char __pyx_k__asarray[] = \"asarray\";\n static char __pyx_k__cKDTree[] = \"cKDTree\";\n+static char __pyx_k__float64[] = \"float64\";\n static char __pyx_k__ndindex[] = \"ndindex\";\n static char __pyx_k__newaxis[] = \"newaxis\";\n static char __pyx_k__reshape[] = \"reshape\";\n@@ -1397,6 +1399,8 @@\n static char __pyx_k__to_matrix[] = \"to_matrix\";\n static char __pyx_k__ValueError[] = \"ValueError\";\n static char __pyx_k__coo_matrix[] = \"coo_matrix\";\n+static char __pyx_k__ImportError[] = \"ImportError\";\n+static char __pyx_k__MemoryError[] = \"MemoryError\";\n static char __pyx_k__RuntimeError[] = \"RuntimeError\";\n static char __pyx_k__ascontiguousarray[] = \"ascontiguousarray\";\n static PyObject *__pyx_kp_s_1;\n@@ -1411,11 +1415,14 @@\n static PyObject *__pyx_kp_u_26;\n static PyObject *__pyx_kp_u_29;\n static PyObject *__pyx_n_s_31;\n-static PyObject *__pyx_kp_u_32;\n+static PyObject *__pyx_kp_s_32;\n static PyObject *__pyx_kp_u_33;\n+static PyObject *__pyx_kp_u_34;\n static PyObject *__pyx_n_s_4;\n static PyObject *__pyx_kp_s_6;\n static PyObject *__pyx_kp_s_7;\n+static PyObject *__pyx_n_s__ImportError;\n+static PyObject *__pyx_n_s__MemoryError;\n static PyObject *__pyx_n_s__RuntimeError;\n static PyObject *__pyx_n_s__ValueError;\n static PyObject *__pyx_n_s____all__;\n@@ -1424,7 +1431,6 @@\n static PyObject *__pyx_n_s__amax;\n static PyObject *__pyx_n_s__amin;\n static PyObject *__pyx_n_s__arange;\n-static PyObject *__pyx_n_s__array;\n static PyObject *__pyx_n_s__asarray;\n static PyObject *__pyx_n_s__ascontiguousarray;\n static PyObject *__pyx_n_s__astype;\n@@ -1432,16 +1438,15 @@\n static PyObject *__pyx_n_s__cKDTree;\n static PyObject *__pyx_n_s__coo_matrix;\n static PyObject *__pyx_n_s__data;\n-static PyObject *__pyx_n_s__double;\n static PyObject *__pyx_n_s__dtype;\n static PyObject *__pyx_n_s__empty;\n static PyObject *__pyx_n_s__eps;\n static PyObject *__pyx_n_s__fill;\n-static PyObject *__pyx_n_s__float;\n+static PyObject *__pyx_n_s__float64;\n static PyObject *__pyx_n_s__i;\n static PyObject *__pyx_n_s__inf;\n-static PyObject *__pyx_n_s__int;\n static PyObject *__pyx_n_s__int32;\n+static PyObject *__pyx_n_s__int64;\n static PyObject *__pyx_n_s__k;\n static PyObject *__pyx_n_s__kdtree;\n static PyObject *__pyx_n_s__leafsize;\n@@ -1463,12 +1468,10 @@\n static PyObject *__pyx_n_s__to_matrix;\n static PyObject *__pyx_n_s__todok;\n static PyObject *__pyx_n_s__x;\n-static PyObject *__pyx_n_s__xrange;\n static PyObject *__pyx_n_s__zeros;\n static PyObject *__pyx_int_0;\n-static PyObject *__pyx_int_1;\n static PyObject *__pyx_int_15;\n-static double __pyx_k_5;\n+static __pyx_t_5numpy_float64_t __pyx_k_5;\n static PyObject *__pyx_k_slice_9;\n static PyObject *__pyx_k_tuple_3;\n static PyObject *__pyx_k_tuple_8;\n@@ -1485,90 +1488,174 @@\n static PyObject *__pyx_k_tuple_28;\n static PyObject *__pyx_k_tuple_30;\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":30\n- * int space\n- * \n- * cdef inline heapcreate(heap* self,int initial_size): # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":46\n+ * np.npy_intp space\n+ * \n+ * cdef inline int heapcreate(heap* self, np.npy_intp initial_size) except -1: # <<<<<<<<<<<<<<\n+ * cdef void *tmp\n * self.space = initial_size\n- * self.heap = <heapitem*>stdlib.malloc(sizeof(heapitem)*self.space)\n- *\/\n-\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapcreate(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, int __pyx_v_initial_size) {\n- PyObject *__pyx_r = NULL;\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapcreate(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, npy_intp __pyx_v_initial_size) {\n+ void *__pyx_v_tmp;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ int __pyx_lineno = 0;\n+ const char *__pyx_filename = NULL;\n+ int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"heapcreate\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":31\n- * \n- * cdef inline heapcreate(heap* self,int initial_size):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":48\n+ * cdef inline int heapcreate(heap* self, np.npy_intp initial_size) except -1:\n+ * cdef void *tmp\n * self.space = initial_size # <<<<<<<<<<<<<<\n- * self.heap = <heapitem*>stdlib.malloc(sizeof(heapitem)*self.space)\n- * self.n=0\n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.malloc(sizeof(heapitem)*self.space)\n *\/\n __pyx_v_self->space = __pyx_v_initial_size;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":32\n- * cdef inline heapcreate(heap* self,int initial_size):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":49\n+ * cdef void *tmp\n * self.space = initial_size\n- * self.heap = <heapitem*>stdlib.malloc(sizeof(heapitem)*self.space) # <<<<<<<<<<<<<<\n- * self.n=0\n- * \n- *\/\n- __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem)) * __pyx_v_self->space)));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":33\n+ * self.heap = <heapitem*> NULL # <<<<<<<<<<<<<<\n+ * tmp = stdlib.malloc(sizeof(heapitem)*self.space)\n+ * if tmp == NULL:\n+ *\/\n+ __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":50\n * self.space = initial_size\n- * self.heap = <heapitem*>stdlib.malloc(sizeof(heapitem)*self.space)\n- * self.n=0 # <<<<<<<<<<<<<<\n- * \n- * cdef inline heapdestroy(heap* self):\n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.malloc(sizeof(heapitem)*self.space) # <<<<<<<<<<<<<<\n+ * if tmp == NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_tmp = malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem)) * __pyx_v_self->space));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":51\n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.malloc(sizeof(heapitem)*self.space)\n+ * if tmp == NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp\n+ *\/\n+ __pyx_t_1 = (__pyx_v_tmp == NULL);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":52\n+ * tmp = stdlib.malloc(sizeof(heapitem)*self.space)\n+ * if tmp == NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * self.heap = <heapitem*> tmp\n+ * self.n = 0\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":53\n+ * if tmp == NULL:\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp # <<<<<<<<<<<<<<\n+ * self.n = 0\n+ * return 0\n+ *\/\n+ __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)__pyx_v_tmp);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":54\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp\n+ * self.n = 0 # <<<<<<<<<<<<<<\n+ * return 0\n+ * \n *\/\n __pyx_v_self->n = 0;\n \n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n- __Pyx_XGIVEREF(__pyx_r);\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":55\n+ * self.heap = <heapitem*> tmp\n+ * self.n = 0\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline int heapdestroy(heap* self) except -1:\n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.heapcreate\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":35\n- * self.n=0\n- * \n- * cdef inline heapdestroy(heap* self): # <<<<<<<<<<<<<<\n- * stdlib.free(self.heap)\n- * \n- *\/\n-\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapdestroy(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self) {\n- PyObject *__pyx_r = NULL;\n+\/* \"scipy\/spatial\/ckdtree.pyx\":57\n+ * return 0\n+ * \n+ * cdef inline int heapdestroy(heap* self) except -1: # <<<<<<<<<<<<<<\n+ * if self.heap != <heapitem*> NULL:\n+ * stdlib.free(self.heap)\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self) {\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"heapdestroy\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":36\n- * \n- * cdef inline heapdestroy(heap* self):\n- * stdlib.free(self.heap) # <<<<<<<<<<<<<<\n- * \n- * cdef inline heapresize(heap* self, int new_space):\n- *\/\n- free(__pyx_v_self->heap);\n-\n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n- __Pyx_XGIVEREF(__pyx_r);\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":58\n+ * \n+ * cdef inline int heapdestroy(heap* self) except -1:\n+ * if self.heap != <heapitem*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(self.heap)\n+ * return 0\n+ *\/\n+ __pyx_t_1 = (__pyx_v_self->heap != ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":59\n+ * cdef inline int heapdestroy(heap* self) except -1:\n+ * if self.heap != <heapitem*> NULL:\n+ * stdlib.free(self.heap) # <<<<<<<<<<<<<<\n+ * return 0\n+ * \n+ *\/\n+ free(__pyx_v_self->heap);\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":60\n+ * if self.heap != <heapitem*> NULL:\n+ * stdlib.free(self.heap)\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline int heapresize(heap* self, np.npy_intp new_space) except -1:\n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":38\n- * stdlib.free(self.heap)\n- * \n- * cdef inline heapresize(heap* self, int new_space): # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":62\n+ * return 0\n+ * \n+ * cdef inline int heapresize(heap* self, np.npy_intp new_space) except -1: # <<<<<<<<<<<<<<\n+ * cdef void *tmp\n * if new_space<self.n:\n- * raise ValueError(\"Heap containing %d items cannot be resized to %d\" % (self.n, new_space))\n- *\/\n-\n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapresize(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, int __pyx_v_new_space) {\n- PyObject *__pyx_r = NULL;\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heapresize(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, npy_intp __pyx_v_new_space) {\n+ void *__pyx_v_tmp;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n PyObject *__pyx_t_2 = NULL;\n@@ -1579,9 +1666,9 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"heapresize\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":39\n- * \n- * cdef inline heapresize(heap* self, int new_space):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":64\n+ * cdef inline int heapresize(heap* self, np.npy_intp new_space) except -1:\n+ * cdef void *tmp\n * if new_space<self.n: # <<<<<<<<<<<<<<\n * raise ValueError(\"Heap containing %d items cannot be resized to %d\" % (self.n, new_space))\n * self.space = new_space\n@@ -1589,18 +1676,18 @@\n __pyx_t_1 = (__pyx_v_new_space < __pyx_v_self->n);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":40\n- * cdef inline heapresize(heap* self, int new_space):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":65\n+ * cdef void *tmp\n * if new_space<self.n:\n * raise ValueError(\"Heap containing %d items cannot be resized to %d\" % (self.n, new_space)) # <<<<<<<<<<<<<<\n * self.space = new_space\n- * self.heap = <heapitem*>stdlib.realloc(<void*>self.heap,new_space*sizeof(heapitem))\n- *\/\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.heap = <heapitem*> NULL\n+ *\/\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_new_space); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_new_space); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n@@ -1608,71 +1695,120 @@\n __Pyx_GIVEREF(__pyx_t_3);\n __pyx_t_2 = 0;\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_1), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_1), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n __Pyx_Raise(__pyx_t_3, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":41\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":66\n * if new_space<self.n:\n * raise ValueError(\"Heap containing %d items cannot be resized to %d\" % (self.n, new_space))\n * self.space = new_space # <<<<<<<<<<<<<<\n- * self.heap = <heapitem*>stdlib.realloc(<void*>self.heap,new_space*sizeof(heapitem))\n- * \n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))\n *\/\n __pyx_v_self->space = __pyx_v_new_space;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":42\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":67\n * raise ValueError(\"Heap containing %d items cannot be resized to %d\" % (self.n, new_space))\n * self.space = new_space\n- * self.heap = <heapitem*>stdlib.realloc(<void*>self.heap,new_space*sizeof(heapitem)) # <<<<<<<<<<<<<<\n- * \n- * cdef inline heappush(heap* self, heapitem item):\n- *\/\n- __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)realloc(((void *)__pyx_v_self->heap), (__pyx_v_new_space * (sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem)))));\n-\n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ * self.heap = <heapitem*> NULL # <<<<<<<<<<<<<<\n+ * tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))\n+ * if tmp == NULL:\n+ *\/\n+ __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":68\n+ * self.space = new_space\n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem)) # <<<<<<<<<<<<<<\n+ * if tmp == NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_tmp = realloc(((void *)__pyx_v_self->heap), (__pyx_v_new_space * (sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":69\n+ * self.heap = <heapitem*> NULL\n+ * tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))\n+ * if tmp == NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp\n+ *\/\n+ __pyx_t_1 = (__pyx_v_tmp == NULL);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":70\n+ * tmp = stdlib.realloc(<void*>self.heap, new_space*sizeof(heapitem))\n+ * if tmp == NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * self.heap = <heapitem*> tmp\n+ * return 0\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L4;\n+ }\n+ __pyx_L4:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":71\n+ * if tmp == NULL:\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp # <<<<<<<<<<<<<<\n+ * return 0\n+ * \n+ *\/\n+ __pyx_v_self->heap = ((struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *)__pyx_v_tmp);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":72\n+ * raise MemoryError\n+ * self.heap = <heapitem*> tmp\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * @cython.cdivision(True)\n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_2);\n __Pyx_XDECREF(__pyx_t_3);\n __Pyx_XDECREF(__pyx_t_4);\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.heapresize\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = 0;\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":44\n- * self.heap = <heapitem*>stdlib.realloc(<void*>self.heap,new_space*sizeof(heapitem))\n- * \n- * cdef inline heappush(heap* self, heapitem item): # <<<<<<<<<<<<<<\n- * cdef int i\n+\/* \"scipy\/spatial\/ckdtree.pyx\":75\n+ * \n+ * @cython.cdivision(True)\n+ * cdef inline int heappush(heap* self, heapitem item) except -1: # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp i\n * cdef heapitem t\n *\/\n \n-static CYTHON_INLINE PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heappush(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_item) {\n- int __pyx_v_i;\n+static CYTHON_INLINE int __pyx_f_5scipy_7spatial_7ckdtree_heappush(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_item) {\n+ npy_intp __pyx_v_i;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_t;\n- PyObject *__pyx_r = NULL;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- PyObject *__pyx_t_2 = NULL;\n+ int __pyx_t_2;\n int __pyx_t_3;\n int __pyx_t_4;\n int __pyx_lineno = 0;\n@@ -1680,50 +1816,48 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"heappush\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":48\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":78\n+ * cdef np.npy_intp i\n * cdef heapitem t\n- * \n * self.n += 1 # <<<<<<<<<<<<<<\n * if self.n>self.space:\n * heapresize(self,2*self.space+1)\n *\/\n __pyx_v_self->n = (__pyx_v_self->n + 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":49\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":79\n+ * cdef heapitem t\n * self.n += 1\n * if self.n>self.space: # <<<<<<<<<<<<<<\n * heapresize(self,2*self.space+1)\n- * \n+ * i = self.n-1\n *\/\n __pyx_t_1 = (__pyx_v_self->n > __pyx_v_self->space);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":50\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":80\n * self.n += 1\n * if self.n>self.space:\n * heapresize(self,2*self.space+1) # <<<<<<<<<<<<<<\n- * \n * i = self.n-1\n- *\/\n- __pyx_t_2 = __pyx_f_5scipy_7spatial_7ckdtree_heapresize(__pyx_v_self, ((2 * __pyx_v_self->space) + 1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ * self.heap[i] = item\n+ *\/\n+ __pyx_t_2 = __pyx_f_5scipy_7spatial_7ckdtree_heapresize(__pyx_v_self, ((2 * __pyx_v_self->space) + 1)); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":52\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":81\n+ * if self.n>self.space:\n * heapresize(self,2*self.space+1)\n- * \n * i = self.n-1 # <<<<<<<<<<<<<<\n * self.heap[i] = item\n * while i>0 and self.heap[i].priority<self.heap[(i-1)\/\/2].priority:\n *\/\n __pyx_v_i = (__pyx_v_self->n - 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":53\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":82\n+ * heapresize(self,2*self.space+1)\n * i = self.n-1\n * self.heap[i] = item # <<<<<<<<<<<<<<\n * while i>0 and self.heap[i].priority<self.heap[(i-1)\/\/2].priority:\n@@ -1731,7 +1865,7 @@\n *\/\n (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_item;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":54\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":83\n * i = self.n-1\n * self.heap[i] = item\n * while i>0 and self.heap[i].priority<self.heap[(i-1)\/\/2].priority: # <<<<<<<<<<<<<<\n@@ -1741,64 +1875,72 @@\n while (1) {\n __pyx_t_1 = (__pyx_v_i > 0);\n if (__pyx_t_1) {\n- __pyx_t_3 = ((__pyx_v_self->heap[__pyx_v_i]).priority < (__pyx_v_self->heap[__Pyx_div_long((__pyx_v_i - 1), 2)]).priority);\n+ __pyx_t_3 = ((__pyx_v_self->heap[__pyx_v_i]).priority < (__pyx_v_self->heap[((__pyx_v_i - 1) \/ 2)]).priority);\n __pyx_t_4 = __pyx_t_3;\n } else {\n __pyx_t_4 = __pyx_t_1;\n }\n if (!__pyx_t_4) break;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":55\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":84\n * self.heap[i] = item\n * while i>0 and self.heap[i].priority<self.heap[(i-1)\/\/2].priority:\n * t = self.heap[(i-1)\/\/2] # <<<<<<<<<<<<<<\n * self.heap[(i-1)\/\/2] = self.heap[i]\n * self.heap[i] = t\n *\/\n- __pyx_v_t = (__pyx_v_self->heap[__Pyx_div_long((__pyx_v_i - 1), 2)]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":56\n+ __pyx_v_t = (__pyx_v_self->heap[((__pyx_v_i - 1) \/ 2)]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":85\n * while i>0 and self.heap[i].priority<self.heap[(i-1)\/\/2].priority:\n * t = self.heap[(i-1)\/\/2]\n * self.heap[(i-1)\/\/2] = self.heap[i] # <<<<<<<<<<<<<<\n * self.heap[i] = t\n * i = (i-1)\/\/2\n *\/\n- (__pyx_v_self->heap[__Pyx_div_long((__pyx_v_i - 1), 2)]) = (__pyx_v_self->heap[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":57\n+ (__pyx_v_self->heap[((__pyx_v_i - 1) \/ 2)]) = (__pyx_v_self->heap[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":86\n * t = self.heap[(i-1)\/\/2]\n * self.heap[(i-1)\/\/2] = self.heap[i]\n * self.heap[i] = t # <<<<<<<<<<<<<<\n * i = (i-1)\/\/2\n- * \n+ * return 0\n *\/\n (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_t;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":58\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":87\n * self.heap[(i-1)\/\/2] = self.heap[i]\n * self.heap[i] = t\n * i = (i-1)\/\/2 # <<<<<<<<<<<<<<\n- * \n- * cdef heapitem heappeek(heap* self):\n- *\/\n- __pyx_v_i = __Pyx_div_long((__pyx_v_i - 1), 2);\n+ * return 0\n+ * \n+ *\/\n+ __pyx_v_i = ((__pyx_v_i - 1) \/ 2);\n }\n \n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":88\n+ * self.heap[i] = t\n+ * i = (i-1)\/\/2\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_2);\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.heappush\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = 0;\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":60\n- * i = (i-1)\/\/2\n+\/* \"scipy\/spatial\/ckdtree.pyx\":91\n+ * \n * \n * cdef heapitem heappeek(heap* self): # <<<<<<<<<<<<<<\n * return self.heap[0]\n@@ -1810,12 +1952,12 @@\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"heappeek\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":61\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":92\n * \n * cdef heapitem heappeek(heap* self):\n * return self.heap[0] # <<<<<<<<<<<<<<\n * \n- * cdef heapremove(heap* self):\n+ * @cython.cdivision(True)\n *\/\n __pyx_r = (__pyx_v_self->heap[0]);\n goto __pyx_L0;\n@@ -1825,34 +1967,34 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":63\n- * return self.heap[0]\n- * \n- * cdef heapremove(heap* self): # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":95\n+ * \n+ * @cython.cdivision(True)\n+ * cdef int heapremove(heap* self) except -1: # <<<<<<<<<<<<<<\n * cdef heapitem t\n- * cdef int i, j, k, l\n- *\/\n-\n-static PyObject *__pyx_f_5scipy_7spatial_7ckdtree_heapremove(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self) {\n+ * cdef np.npy_intp i, j, k, l\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_heapremove(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_t;\n- int __pyx_v_i;\n- int __pyx_v_j;\n- int __pyx_v_k;\n- int __pyx_v_l;\n- PyObject *__pyx_r = NULL;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ npy_intp __pyx_v_k;\n+ npy_intp __pyx_v_l;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n int __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n+ int __pyx_t_4;\n int __pyx_t_5;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"heapremove\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":67\n- * cdef int i, j, k, l\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":99\n+ * cdef np.npy_intp i, j, k, l\n * \n * self.heap[0] = self.heap[self.n-1] # <<<<<<<<<<<<<<\n * self.n -= 1\n@@ -1860,7 +2002,7 @@\n *\/\n (__pyx_v_self->heap[0]) = (__pyx_v_self->heap[(__pyx_v_self->n - 1)]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":68\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":100\n * \n * self.heap[0] = self.heap[self.n-1]\n * self.n -= 1 # <<<<<<<<<<<<<<\n@@ -1869,14 +2011,14 @@\n *\/\n __pyx_v_self->n = (__pyx_v_self->n - 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":69\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":101\n * self.heap[0] = self.heap[self.n-1]\n * self.n -= 1\n * if self.n < self.space\/\/4 and self.space>40: #FIXME: magic number # <<<<<<<<<<<<<<\n * heapresize(self,self.space\/\/2+1)\n- * \n- *\/\n- __pyx_t_1 = (__pyx_v_self->n < __Pyx_div_long(__pyx_v_self->space, 4));\n+ * i=0\n+ *\/\n+ __pyx_t_1 = (__pyx_v_self->n < (__pyx_v_self->space \/ 4));\n if (__pyx_t_1) {\n __pyx_t_2 = (__pyx_v_self->space > 40);\n __pyx_t_3 = __pyx_t_2;\n@@ -1885,31 +2027,29 @@\n }\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":70\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":102\n * self.n -= 1\n * if self.n < self.space\/\/4 and self.space>40: #FIXME: magic number\n * heapresize(self,self.space\/\/2+1) # <<<<<<<<<<<<<<\n- * \n * i=0\n- *\/\n- __pyx_t_4 = __pyx_f_5scipy_7spatial_7ckdtree_heapresize(__pyx_v_self, (__Pyx_div_long(__pyx_v_self->space, 2) + 1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ * j=1\n+ *\/\n+ __pyx_t_4 = __pyx_f_5scipy_7spatial_7ckdtree_heapresize(__pyx_v_self, ((__pyx_v_self->space \/ 2) + 1)); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":72\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":103\n+ * if self.n < self.space\/\/4 and self.space>40: #FIXME: magic number\n * heapresize(self,self.space\/\/2+1)\n- * \n * i=0 # <<<<<<<<<<<<<<\n * j=1\n * k=2\n *\/\n __pyx_v_i = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":73\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":104\n+ * heapresize(self,self.space\/\/2+1)\n * i=0\n * j=1 # <<<<<<<<<<<<<<\n * k=2\n@@ -1917,7 +2057,7 @@\n *\/\n __pyx_v_j = 1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":74\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":105\n * i=0\n * j=1\n * k=2 # <<<<<<<<<<<<<<\n@@ -1926,7 +2066,7 @@\n *\/\n __pyx_v_k = 2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":75\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":106\n * j=1\n * k=2\n * while ((j<self.n and # <<<<<<<<<<<<<<\n@@ -1935,7 +2075,7 @@\n *\/\n while (1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":76\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":107\n * k=2\n * while ((j<self.n and\n * self.heap[i].priority > self.heap[j].priority or # <<<<<<<<<<<<<<\n@@ -1951,7 +2091,7 @@\n }\n if (!__pyx_t_2) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":77\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":108\n * while ((j<self.n and\n * self.heap[i].priority > self.heap[j].priority or\n * k<self.n and # <<<<<<<<<<<<<<\n@@ -1961,7 +2101,7 @@\n __pyx_t_3 = (__pyx_v_k < __pyx_v_self->n);\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":78\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":109\n * self.heap[i].priority > self.heap[j].priority or\n * k<self.n and\n * self.heap[i].priority > self.heap[k].priority)): # <<<<<<<<<<<<<<\n@@ -1979,7 +2119,7 @@\n }\n if (!__pyx_t_3) break;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":79\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":110\n * k<self.n and\n * self.heap[i].priority > self.heap[k].priority)):\n * if k<self.n and self.heap[j].priority>self.heap[k].priority: # <<<<<<<<<<<<<<\n@@ -1995,7 +2135,7 @@\n }\n if (__pyx_t_5) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":80\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":111\n * self.heap[i].priority > self.heap[k].priority)):\n * if k<self.n and self.heap[j].priority>self.heap[k].priority:\n * l = k # <<<<<<<<<<<<<<\n@@ -2007,7 +2147,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":82\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":113\n * l = k\n * else:\n * l = j # <<<<<<<<<<<<<<\n@@ -2018,7 +2158,7 @@\n }\n __pyx_L6:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":83\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":114\n * else:\n * l = j\n * t = self.heap[l] # <<<<<<<<<<<<<<\n@@ -2027,7 +2167,7 @@\n *\/\n __pyx_v_t = (__pyx_v_self->heap[__pyx_v_l]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":84\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":115\n * l = j\n * t = self.heap[l]\n * self.heap[l] = self.heap[i] # <<<<<<<<<<<<<<\n@@ -2036,7 +2176,7 @@\n *\/\n (__pyx_v_self->heap[__pyx_v_l]) = (__pyx_v_self->heap[__pyx_v_i]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":85\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":116\n * t = self.heap[l]\n * self.heap[l] = self.heap[i]\n * self.heap[i] = t # <<<<<<<<<<<<<<\n@@ -2045,7 +2185,7 @@\n *\/\n (__pyx_v_self->heap[__pyx_v_i]) = __pyx_v_t;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":86\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":117\n * self.heap[l] = self.heap[i]\n * self.heap[i] = t\n * i = l # <<<<<<<<<<<<<<\n@@ -2054,111 +2194,117 @@\n *\/\n __pyx_v_i = __pyx_v_l;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":87\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":118\n * self.heap[i] = t\n * i = l\n * j = 2*i+1 # <<<<<<<<<<<<<<\n * k = 2*i+2\n- * \n+ * return 0\n *\/\n __pyx_v_j = ((2 * __pyx_v_i) + 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":88\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":119\n * i = l\n * j = 2*i+1\n * k = 2*i+2 # <<<<<<<<<<<<<<\n- * \n- * cdef heapitem heappop(heap* self):\n+ * return 0\n+ * \n *\/\n __pyx_v_k = ((2 * __pyx_v_i) + 2);\n }\n \n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":120\n+ * j = 2*i+1\n+ * k = 2*i+2\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_4);\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.heapremove\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = 0;\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":90\n- * k = 2*i+2\n- * \n- * cdef heapitem heappop(heap* self): # <<<<<<<<<<<<<<\n- * cdef heapitem it\n- * it = heappeek(self)\n- *\/\n-\n-static struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_f_5scipy_7spatial_7ckdtree_heappop(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self) {\n- struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_it;\n- struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_r;\n+\/* \"scipy\/spatial\/ckdtree.pyx\":123\n+ * \n+ * \n+ * cdef int heappop(heap* self, heapitem *it) except -1: # <<<<<<<<<<<<<<\n+ * # cdef heapitem it\n+ * it[0] = heappeek(self)\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_heappop(struct __pyx_t_5scipy_7spatial_7ckdtree_heap *__pyx_v_self, struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem *__pyx_v_it) {\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n+ int __pyx_t_1;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"heappop\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":92\n- * cdef heapitem heappop(heap* self):\n- * cdef heapitem it\n- * it = heappeek(self) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":125\n+ * cdef int heappop(heap* self, heapitem *it) except -1:\n+ * # cdef heapitem it\n+ * it[0] = heappeek(self) # <<<<<<<<<<<<<<\n * heapremove(self)\n- * return it\n- *\/\n- __pyx_v_it = __pyx_f_5scipy_7spatial_7ckdtree_heappeek(__pyx_v_self);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":93\n- * cdef heapitem it\n- * it = heappeek(self)\n+ * # return it\n+ *\/\n+ (__pyx_v_it[0]) = __pyx_f_5scipy_7spatial_7ckdtree_heappeek(__pyx_v_self);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":126\n+ * # cdef heapitem it\n+ * it[0] = heappeek(self)\n * heapremove(self) # <<<<<<<<<<<<<<\n- * return it\n- * \n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapremove(__pyx_v_self); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":94\n- * it = heappeek(self)\n+ * # return it\n+ * return 0\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapremove(__pyx_v_self); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":128\n * heapremove(self)\n- * return it # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __pyx_r = __pyx_v_it;\n+ * # return it\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n goto __pyx_L0;\n \n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.heappop\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.heappop\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":101\n+\/* \"scipy\/spatial\/ckdtree.pyx\":134\n * \n * # utility functions\n- * cdef inline double dmax(double x, double y): # <<<<<<<<<<<<<<\n+ * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y): # <<<<<<<<<<<<<<\n * if x>y:\n * return x\n *\/\n \n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_dmax(double __pyx_v_x, double __pyx_v_y) {\n- double __pyx_r;\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_t_5numpy_float64_t __pyx_v_x, __pyx_t_5numpy_float64_t __pyx_v_y) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"dmax\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":102\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":135\n * # utility functions\n- * cdef inline double dmax(double x, double y):\n+ * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):\n * if x>y: # <<<<<<<<<<<<<<\n * return x\n * else:\n@@ -2166,8 +2312,8 @@\n __pyx_t_1 = (__pyx_v_x > __pyx_v_y);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":103\n- * cdef inline double dmax(double x, double y):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":136\n+ * cdef inline np.float64_t dmax(np.float64_t x, np.float64_t y):\n * if x>y:\n * return x # <<<<<<<<<<<<<<\n * else:\n@@ -2179,12 +2325,12 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":105\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":138\n * return x\n * else:\n * return y # <<<<<<<<<<<<<<\n- * cdef inline double dabs(double x):\n- * if x>0:\n+ * \n+ * cdef inline np.float64_t dabs(np.float64_t x):\n *\/\n __pyx_r = __pyx_v_y;\n goto __pyx_L0;\n@@ -2197,23 +2343,23 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":106\n- * else:\n+\/* \"scipy\/spatial\/ckdtree.pyx\":140\n * return y\n- * cdef inline double dabs(double x): # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline np.float64_t dabs(np.float64_t x): # <<<<<<<<<<<<<<\n * if x>0:\n * return x\n *\/\n \n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_dabs(double __pyx_v_x) {\n- double __pyx_r;\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_dabs(__pyx_t_5numpy_float64_t __pyx_v_x) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"dabs\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":107\n- * return y\n- * cdef inline double dabs(double x):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":141\n+ * \n+ * cdef inline np.float64_t dabs(np.float64_t x):\n * if x>0: # <<<<<<<<<<<<<<\n * return x\n * else:\n@@ -2221,8 +2367,8 @@\n __pyx_t_1 = (__pyx_v_x > 0.0);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":108\n- * cdef inline double dabs(double x):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":142\n+ * cdef inline np.float64_t dabs(np.float64_t x):\n * if x>0:\n * return x # <<<<<<<<<<<<<<\n * else:\n@@ -2234,12 +2380,12 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":110\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":144\n * return x\n * else:\n * return -x # <<<<<<<<<<<<<<\n- * cdef inline double _distance_p(double*x,double*y,double p,int k,double upperbound):\n- * \"\"\"Compute the distance between x and y\n+ * \n+ * cdef inline np.float64_t _distance_p(np.float64_t *x, np.float64_t *y,\n *\/\n __pyx_r = (-__pyx_v_x);\n goto __pyx_L0;\n@@ -2252,46 +2398,112 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":111\n- * else:\n+\/* \"scipy\/spatial\/ckdtree.pyx\":146\n * return -x\n- * cdef inline double _distance_p(double*x,double*y,double p,int k,double upperbound): # <<<<<<<<<<<<<<\n- * \"\"\"Compute the distance between x and y\n- * \n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree__distance_p(double *__pyx_v_x, double *__pyx_v_y, double __pyx_v_p, int __pyx_v_k, double __pyx_v_upperbound) {\n- int __pyx_v_i;\n- double __pyx_v_r;\n- double __pyx_r;\n+ * \n+ * cdef inline np.float64_t _distance_p(np.float64_t *x, np.float64_t *y, # <<<<<<<<<<<<<<\n+ * np.float64_t p, np.npy_intp k,\n+ * np.float64_t upperbound):\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree__distance_p(__pyx_t_5numpy_float64_t *__pyx_v_x, __pyx_t_5numpy_float64_t *__pyx_v_y, __pyx_t_5numpy_float64_t __pyx_v_p, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_upperbound) {\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_r;\n+ __pyx_t_5numpy_float64_t __pyx_v_z;\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- int __pyx_t_2;\n- int __pyx_t_3;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n __Pyx_RefNannySetupContext(\"_distance_p\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":120\n- * cdef int i\n- * cdef double r\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":157\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t r, z\n * r = 0 # <<<<<<<<<<<<<<\n- * if p==infinity:\n+ * if p==2:\n * for i in range(k):\n *\/\n __pyx_v_r = 0.0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":121\n- * cdef double r\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":158\n+ * cdef np.float64_t r, z\n * r = 0\n- * if p==infinity: # <<<<<<<<<<<<<<\n+ * if p==2: # <<<<<<<<<<<<<<\n+ * for i in range(k):\n+ * z = x[i] - y[i]\n+ *\/\n+ __pyx_t_1 = (__pyx_v_p == 2.0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":159\n+ * r = 0\n+ * if p==2:\n+ * for i in range(k): # <<<<<<<<<<<<<<\n+ * z = x[i] - y[i]\n+ * r += z*z\n+ *\/\n+ __pyx_t_2 = __pyx_v_k;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":160\n+ * if p==2:\n+ * for i in range(k):\n+ * z = x[i] - y[i] # <<<<<<<<<<<<<<\n+ * r += z*z\n+ * if r>upperbound:\n+ *\/\n+ __pyx_v_z = ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":161\n+ * for i in range(k):\n+ * z = x[i] - y[i]\n+ * r += z*z # <<<<<<<<<<<<<<\n+ * if r>upperbound:\n+ * return r\n+ *\/\n+ __pyx_v_r = (__pyx_v_r + (__pyx_v_z * __pyx_v_z));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":162\n+ * z = x[i] - y[i]\n+ * r += z*z\n+ * if r>upperbound: # <<<<<<<<<<<<<<\n+ * return r\n+ * elif p==infinity:\n+ *\/\n+ __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":163\n+ * r += z*z\n+ * if r>upperbound:\n+ * return r # <<<<<<<<<<<<<<\n+ * elif p==infinity:\n+ * for i in range(k):\n+ *\/\n+ __pyx_r = __pyx_v_r;\n+ goto __pyx_L0;\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+ }\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":164\n+ * if r>upperbound:\n+ * return r\n+ * elif p==infinity: # <<<<<<<<<<<<<<\n * for i in range(k):\n * r = dmax(r,dabs(x[i]-y[i]))\n *\/\n __pyx_t_1 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":122\n- * r = 0\n- * if p==infinity:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":165\n+ * return r\n+ * elif p==infinity:\n * for i in range(k): # <<<<<<<<<<<<<<\n * r = dmax(r,dabs(x[i]-y[i]))\n * if r>upperbound:\n@@ -2300,8 +2512,8 @@\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":123\n- * if p==infinity:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":166\n+ * elif p==infinity:\n * for i in range(k):\n * r = dmax(r,dabs(x[i]-y[i])) # <<<<<<<<<<<<<<\n * if r>upperbound:\n@@ -2309,7 +2521,7 @@\n *\/\n __pyx_v_r = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_r, __pyx_f_5scipy_7spatial_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":124\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":167\n * for i in range(k):\n * r = dmax(r,dabs(x[i]-y[i]))\n * if r>upperbound: # <<<<<<<<<<<<<<\n@@ -2319,7 +2531,7 @@\n __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":125\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":168\n * r = dmax(r,dabs(x[i]-y[i]))\n * if r>upperbound:\n * return r # <<<<<<<<<<<<<<\n@@ -2328,14 +2540,14 @@\n *\/\n __pyx_r = __pyx_v_r;\n goto __pyx_L0;\n- goto __pyx_L6;\n+ goto __pyx_L9;\n }\n- __pyx_L6:;\n+ __pyx_L9:;\n }\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":126\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":169\n * if r>upperbound:\n * return r\n * elif p==1: # <<<<<<<<<<<<<<\n@@ -2345,7 +2557,7 @@\n __pyx_t_1 = (__pyx_v_p == 1.0);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":127\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":170\n * return r\n * elif p==1:\n * for i in range(k): # <<<<<<<<<<<<<<\n@@ -2356,7 +2568,7 @@\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":128\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":171\n * elif p==1:\n * for i in range(k):\n * r += dabs(x[i]-y[i]) # <<<<<<<<<<<<<<\n@@ -2365,7 +2577,7 @@\n *\/\n __pyx_v_r = (__pyx_v_r + __pyx_f_5scipy_7spatial_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":129\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":172\n * for i in range(k):\n * r += dabs(x[i]-y[i])\n * if r>upperbound: # <<<<<<<<<<<<<<\n@@ -2375,7 +2587,7 @@\n __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":130\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":173\n * r += dabs(x[i]-y[i])\n * if r>upperbound:\n * return r # <<<<<<<<<<<<<<\n@@ -2384,15 +2596,15 @@\n *\/\n __pyx_r = __pyx_v_r;\n goto __pyx_L0;\n- goto __pyx_L9;\n+ goto __pyx_L12;\n }\n- __pyx_L9:;\n+ __pyx_L12:;\n }\n goto __pyx_L3;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":132\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":175\n * return r\n * else:\n * for i in range(k): # <<<<<<<<<<<<<<\n@@ -2403,7 +2615,7 @@\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":133\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":176\n * else:\n * for i in range(k):\n * r += dabs(x[i]-y[i])**p # <<<<<<<<<<<<<<\n@@ -2412,7 +2624,7 @@\n *\/\n __pyx_v_r = (__pyx_v_r + pow(__pyx_f_5scipy_7spatial_7ckdtree_dabs(((__pyx_v_x[__pyx_v_i]) - (__pyx_v_y[__pyx_v_i]))), __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":134\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":177\n * for i in range(k):\n * r += dabs(x[i]-y[i])**p\n * if r>upperbound: # <<<<<<<<<<<<<<\n@@ -2422,7 +2634,7 @@\n __pyx_t_1 = (__pyx_v_r > __pyx_v_upperbound);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":135\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":178\n * r += dabs(x[i]-y[i])**p\n * if r>upperbound:\n * return r # <<<<<<<<<<<<<<\n@@ -2431,14 +2643,14 @@\n *\/\n __pyx_r = __pyx_v_r;\n goto __pyx_L0;\n- goto __pyx_L12;\n+ goto __pyx_L15;\n }\n- __pyx_L12:;\n+ __pyx_L15:;\n }\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":136\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":179\n * if r>upperbound:\n * return r\n * return r # <<<<<<<<<<<<<<\n@@ -2454,25 +2666,25 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":147\n+\/* \"scipy\/spatial\/ckdtree.pyx\":190\n * # 1-d pieces\n * # These should only be used if p != infinity\n- * cdef inline double min_dist_point_interval_p(double* x, Rectangle rect, int k, double p): # <<<<<<<<<<<<<<\n- * \n- * \"\"\"Compute the minimum distance along dimension k between x and a point in the hyperrectangle.\"\"\"\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(double *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, int __pyx_v_k, double __pyx_v_p) {\n- double __pyx_r;\n+ * cdef inline np.float64_t min_dist_point_interval_p(np.float64_t* x, # <<<<<<<<<<<<<<\n+ * Rectangle rect,\n+ * np.npy_intp k,\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_t_5numpy_float64_t *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"min_dist_point_interval_p\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":150\n- * \n- * \"\"\"Compute the minimum distance along dimension k between x and a point in the hyperrectangle.\"\"\"\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":197\n+ * a point in the hyperrectangle.\n+ * \"\"\"\n * return dmax(0, dmax(rect.mins[k] - x[k], x[k] - rect.maxes[k])) ** p # <<<<<<<<<<<<<<\n * \n- * cdef inline double max_dist_point_interval_p(double* x, Rectangle rect, int k, double p):\n+ * cdef inline np.float64_t max_dist_point_interval_p(np.float64_t* x,\n *\/\n __pyx_r = pow(__pyx_f_5scipy_7spatial_7ckdtree_dmax(0.0, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect.mins[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect.maxes[__pyx_v_k])))), __pyx_v_p);\n goto __pyx_L0;\n@@ -2483,25 +2695,25 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":152\n+\/* \"scipy\/spatial\/ckdtree.pyx\":199\n * return dmax(0, dmax(rect.mins[k] - x[k], x[k] - rect.maxes[k])) ** p\n * \n- * cdef inline double max_dist_point_interval_p(double* x, Rectangle rect, int k, double p): # <<<<<<<<<<<<<<\n- * \n- * \"\"\"Compute the maximum distance along dimension k between x and a point in the hyperrectangle.\"\"\"\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(double *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, int __pyx_v_k, double __pyx_v_p) {\n- double __pyx_r;\n+ * cdef inline np.float64_t max_dist_point_interval_p(np.float64_t* x, # <<<<<<<<<<<<<<\n+ * Rectangle rect,\n+ * np.npy_intp k,\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(__pyx_t_5numpy_float64_t *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"max_dist_point_interval_p\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":155\n- * \n- * \"\"\"Compute the maximum distance along dimension k between x and a point in the hyperrectangle.\"\"\"\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":206\n+ * a point in the hyperrectangle.\n+ * \"\"\"\n * return dmax(rect.maxes[k] - x[k], x[k] - rect.mins[k]) ** p # <<<<<<<<<<<<<<\n * \n- * cdef inline double min_dist_interval_interval_p(Rectangle rect1, Rectangle rect2, int k, double p):\n+ * cdef inline np.float64_t min_dist_interval_interval_p(Rectangle rect1,\n *\/\n __pyx_r = pow(__pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect.maxes[__pyx_v_k]) - (__pyx_v_x[__pyx_v_k])), ((__pyx_v_x[__pyx_v_k]) - (__pyx_v_rect.mins[__pyx_v_k]))), __pyx_v_p);\n goto __pyx_L0;\n@@ -2512,25 +2724,25 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":157\n+\/* \"scipy\/spatial\/ckdtree.pyx\":208\n * return dmax(rect.maxes[k] - x[k], x[k] - rect.mins[k]) ** p\n * \n- * cdef inline double min_dist_interval_interval_p(Rectangle rect1, Rectangle rect2, int k, double p): # <<<<<<<<<<<<<<\n- * \n- * \"\"\"Compute the minimum distance along dimension k between points in two hyperrectangles.\"\"\"\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, int __pyx_v_k, double __pyx_v_p) {\n- double __pyx_r;\n+ * cdef inline np.float64_t min_dist_interval_interval_p(Rectangle rect1, # <<<<<<<<<<<<<<\n+ * Rectangle rect2,\n+ * np.npy_intp k,\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"min_dist_interval_interval_p\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":160\n- * \n- * \"\"\"Compute the minimum distance along dimension k between points in two hyperrectangles.\"\"\"\n- * return dmax(0, dmax(rect1.mins[k] - rect2.maxes[k], rect2.mins[k] - rect1.maxes[k])) ** p # <<<<<<<<<<<<<<\n- * \n- * cdef inline double max_dist_interval_interval_p(Rectangle rect1, Rectangle rect2, int k, double p):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":216\n+ * \"\"\"\n+ * return dmax(0, dmax(rect1.mins[k] - rect2.maxes[k],\n+ * rect2.mins[k] - rect1.maxes[k])) ** p # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline np.float64_t max_dist_interval_interval_p(Rectangle rect1,\n *\/\n __pyx_r = pow(__pyx_f_5scipy_7spatial_7ckdtree_dmax(0.0, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect1.mins[__pyx_v_k]) - (__pyx_v_rect2.maxes[__pyx_v_k])), ((__pyx_v_rect2.mins[__pyx_v_k]) - (__pyx_v_rect1.maxes[__pyx_v_k])))), __pyx_v_p);\n goto __pyx_L0;\n@@ -2541,22 +2753,22 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":162\n- * return dmax(0, dmax(rect1.mins[k] - rect2.maxes[k], rect2.mins[k] - rect1.maxes[k])) ** p\n- * \n- * cdef inline double max_dist_interval_interval_p(Rectangle rect1, Rectangle rect2, int k, double p): # <<<<<<<<<<<<<<\n- * \n- * \"\"\"Compute the maximum distance along dimension k between points in two hyperrectangles.\"\"\"\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, int __pyx_v_k, double __pyx_v_p) {\n- double __pyx_r;\n+\/* \"scipy\/spatial\/ckdtree.pyx\":218\n+ * rect2.mins[k] - rect1.maxes[k])) ** p\n+ * \n+ * cdef inline np.float64_t max_dist_interval_interval_p(Rectangle rect1, # <<<<<<<<<<<<<<\n+ * Rectangle rect2,\n+ * np.npy_intp k,\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"max_dist_interval_interval_p\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":165\n- * \n- * \"\"\"Compute the maximum distance along dimension k between points in two hyperrectangles.\"\"\"\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":225\n+ * two hyperrectangles.\n+ * \"\"\"\n * return dmax(rect1.maxes[k] - rect2.mins[k], rect2.maxes[k] - rect1.mins[k]) ** p # <<<<<<<<<<<<<<\n * \n * # Interval arithmetic in m-D\n@@ -2570,35 +2782,35 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":170\n+\/* \"scipy\/spatial\/ckdtree.pyx\":230\n * \n * # These should be used only for p == infinity\n- * cdef inline double min_dist_point_rect_p_inf(double* x, Rectangle rect): # <<<<<<<<<<<<<<\n+ * cdef inline np.float64_t min_dist_point_rect_p_inf(np.float64_t* x, # <<<<<<<<<<<<<<\n+ * Rectangle rect):\n * \"\"\"Compute the minimum distance between x and the given hyperrectangle.\"\"\"\n- * cdef int i\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(double *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect) {\n- int __pyx_v_i;\n- double __pyx_v_min_dist;\n- double __pyx_r;\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_t_5numpy_float64_t *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect) {\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_dist;\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n- int __pyx_t_1;\n- int __pyx_t_2;\n+ npy_intp __pyx_t_1;\n+ npy_intp __pyx_t_2;\n __Pyx_RefNannySetupContext(\"min_dist_point_rect_p_inf\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":173\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":234\n * \"\"\"Compute the minimum distance between x and the given hyperrectangle.\"\"\"\n- * cdef int i\n- * cdef double min_dist = 0. # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t min_dist = 0. # <<<<<<<<<<<<<<\n * for i in range(rect.m):\n * min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i]))\n *\/\n __pyx_v_min_dist = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":174\n- * cdef int i\n- * cdef double min_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":235\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t min_dist = 0.\n * for i in range(rect.m): # <<<<<<<<<<<<<<\n * min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i]))\n * return min_dist\n@@ -2607,8 +2819,8 @@\n for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n __pyx_v_i = __pyx_t_2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":175\n- * cdef double min_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":236\n+ * cdef np.float64_t min_dist = 0.\n * for i in range(rect.m):\n * min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i])) # <<<<<<<<<<<<<<\n * return min_dist\n@@ -2617,12 +2829,12 @@\n __pyx_v_min_dist = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_dist, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect.mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect.maxes[__pyx_v_i]))));\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":176\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":237\n * for i in range(rect.m):\n * min_dist = dmax(min_dist, dmax(rect.mins[i]-x[i], x[i]-rect.maxes[i]))\n * return min_dist # <<<<<<<<<<<<<<\n * \n- * cdef inline double max_dist_point_rect_p_inf(double* x, Rectangle rect):\n+ * cdef inline np.float64_t max_dist_point_rect_p_inf(np.float64_t* x,\n *\/\n __pyx_r = __pyx_v_min_dist;\n goto __pyx_L0;\n@@ -2633,35 +2845,35 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":178\n+\/* \"scipy\/spatial\/ckdtree.pyx\":239\n * return min_dist\n * \n- * cdef inline double max_dist_point_rect_p_inf(double* x, Rectangle rect): # <<<<<<<<<<<<<<\n+ * cdef inline np.float64_t max_dist_point_rect_p_inf(np.float64_t* x, # <<<<<<<<<<<<<<\n+ * Rectangle rect):\n * \"\"\"Compute the maximum distance between x and the given hyperrectangle.\"\"\"\n- * cdef int i\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(double *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect) {\n- int __pyx_v_i;\n- double __pyx_v_max_dist;\n- double __pyx_r;\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(__pyx_t_5numpy_float64_t *__pyx_v_x, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect) {\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_dist;\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n- int __pyx_t_1;\n- int __pyx_t_2;\n+ npy_intp __pyx_t_1;\n+ npy_intp __pyx_t_2;\n __Pyx_RefNannySetupContext(\"max_dist_point_rect_p_inf\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":181\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":243\n * \"\"\"Compute the maximum distance between x and the given hyperrectangle.\"\"\"\n- * cdef int i\n- * cdef double max_dist = 0. # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t max_dist = 0. # <<<<<<<<<<<<<<\n * for i in range(rect.m):\n * max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i]))\n *\/\n __pyx_v_max_dist = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":182\n- * cdef int i\n- * cdef double max_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":244\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t max_dist = 0.\n * for i in range(rect.m): # <<<<<<<<<<<<<<\n * max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i]))\n * return max_dist\n@@ -2670,8 +2882,8 @@\n for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n __pyx_v_i = __pyx_t_2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":183\n- * cdef double max_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":245\n+ * cdef np.float64_t max_dist = 0.\n * for i in range(rect.m):\n * max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i])) # <<<<<<<<<<<<<<\n * return max_dist\n@@ -2680,12 +2892,12 @@\n __pyx_v_max_dist = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_max_dist, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect.maxes[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i])), ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_rect.mins[__pyx_v_i]))));\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":184\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":246\n * for i in range(rect.m):\n * max_dist = dmax(max_dist, dmax(rect.maxes[i]-x[i], x[i]-rect.mins[i]))\n * return max_dist # <<<<<<<<<<<<<<\n * \n- * cdef inline double min_dist_rect_rect_p_inf(Rectangle rect1, Rectangle rect2):\n+ * cdef inline np.float64_t min_dist_rect_rect_p_inf(Rectangle rect1,\n *\/\n __pyx_r = __pyx_v_max_dist;\n goto __pyx_L0;\n@@ -2696,59 +2908,59 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":186\n+\/* \"scipy\/spatial\/ckdtree.pyx\":248\n * return max_dist\n * \n- * cdef inline double min_dist_rect_rect_p_inf(Rectangle rect1, Rectangle rect2): # <<<<<<<<<<<<<<\n+ * cdef inline np.float64_t min_dist_rect_rect_p_inf(Rectangle rect1, # <<<<<<<<<<<<<<\n+ * Rectangle rect2):\n * \"\"\"Compute the minimum distance between points in two hyperrectangles.\"\"\"\n- * cdef int i\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2) {\n- int __pyx_v_i;\n- double __pyx_v_min_dist;\n- double __pyx_r;\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2) {\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_dist;\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n- int __pyx_t_1;\n- int __pyx_t_2;\n+ npy_intp __pyx_t_1;\n+ npy_intp __pyx_t_2;\n __Pyx_RefNannySetupContext(\"min_dist_rect_rect_p_inf\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":189\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":252\n * \"\"\"Compute the minimum distance between points in two hyperrectangles.\"\"\"\n- * cdef int i\n- * cdef double min_dist = 0. # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t min_dist = 0. # <<<<<<<<<<<<<<\n * for i in range(rect1.m):\n- * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i], rect2.mins[i] - rect1.maxes[i]))\n+ * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],\n *\/\n __pyx_v_min_dist = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":190\n- * cdef int i\n- * cdef double min_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":253\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t min_dist = 0.\n * for i in range(rect1.m): # <<<<<<<<<<<<<<\n- * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i], rect2.mins[i] - rect1.maxes[i]))\n- * return min_dist\n+ * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],\n+ * rect2.mins[i] - rect1.maxes[i]))\n *\/\n __pyx_t_1 = __pyx_v_rect1.m;\n for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n __pyx_v_i = __pyx_t_2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":191\n- * cdef double min_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":255\n * for i in range(rect1.m):\n- * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i], rect2.mins[i] - rect1.maxes[i])) # <<<<<<<<<<<<<<\n+ * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],\n+ * rect2.mins[i] - rect1.maxes[i])) # <<<<<<<<<<<<<<\n * return min_dist\n * \n *\/\n __pyx_v_min_dist = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_dist, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect1.mins[__pyx_v_i]) - (__pyx_v_rect2.maxes[__pyx_v_i])), ((__pyx_v_rect2.mins[__pyx_v_i]) - (__pyx_v_rect1.maxes[__pyx_v_i]))));\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":192\n- * for i in range(rect1.m):\n- * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i], rect2.mins[i] - rect1.maxes[i]))\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":256\n+ * min_dist = dmax(min_dist, dmax(rect1.mins[i] - rect2.maxes[i],\n+ * rect2.mins[i] - rect1.maxes[i]))\n * return min_dist # <<<<<<<<<<<<<<\n * \n- * cdef inline double max_dist_rect_rect_p_inf(Rectangle rect1, Rectangle rect2):\n+ * cdef inline np.float64_t max_dist_rect_rect_p_inf(Rectangle rect1,\n *\/\n __pyx_r = __pyx_v_min_dist;\n goto __pyx_L0;\n@@ -2759,56 +2971,56 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":194\n+\/* \"scipy\/spatial\/ckdtree.pyx\":258\n * return min_dist\n * \n- * cdef inline double max_dist_rect_rect_p_inf(Rectangle rect1, Rectangle rect2): # <<<<<<<<<<<<<<\n+ * cdef inline np.float64_t max_dist_rect_rect_p_inf(Rectangle rect1, # <<<<<<<<<<<<<<\n+ * Rectangle rect2):\n * \"\"\"Compute the maximum distance between points in two hyperrectangles.\"\"\"\n- * cdef int i\n- *\/\n-\n-static CYTHON_INLINE double __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2) {\n- int __pyx_v_i;\n- double __pyx_v_max_dist;\n- double __pyx_r;\n+ *\/\n+\n+static CYTHON_INLINE __pyx_t_5numpy_float64_t __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2) {\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_dist;\n+ __pyx_t_5numpy_float64_t __pyx_r;\n __Pyx_RefNannyDeclarations\n- int __pyx_t_1;\n- int __pyx_t_2;\n+ npy_intp __pyx_t_1;\n+ npy_intp __pyx_t_2;\n __Pyx_RefNannySetupContext(\"max_dist_rect_rect_p_inf\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":197\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":262\n * \"\"\"Compute the maximum distance between points in two hyperrectangles.\"\"\"\n- * cdef int i\n- * cdef double max_dist = 0. # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t max_dist = 0. # <<<<<<<<<<<<<<\n * for i in range(rect1.m):\n- * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i], rect2.maxes[i] - rect1.mins[i]))\n+ * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],\n *\/\n __pyx_v_max_dist = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":198\n- * cdef int i\n- * cdef double max_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":263\n+ * cdef np.npy_intp i\n+ * cdef np.float64_t max_dist = 0.\n * for i in range(rect1.m): # <<<<<<<<<<<<<<\n- * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i], rect2.maxes[i] - rect1.mins[i]))\n- * return max_dist\n+ * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],\n+ * rect2.maxes[i] - rect1.mins[i]))\n *\/\n __pyx_t_1 = __pyx_v_rect1.m;\n for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n __pyx_v_i = __pyx_t_2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":199\n- * cdef double max_dist = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":265\n * for i in range(rect1.m):\n- * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i], rect2.maxes[i] - rect1.mins[i])) # <<<<<<<<<<<<<<\n+ * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],\n+ * rect2.maxes[i] - rect1.mins[i])) # <<<<<<<<<<<<<<\n * return max_dist\n * \n *\/\n __pyx_v_max_dist = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_max_dist, __pyx_f_5scipy_7spatial_7ckdtree_dmax(((__pyx_v_rect1.maxes[__pyx_v_i]) - (__pyx_v_rect2.mins[__pyx_v_i])), ((__pyx_v_rect2.maxes[__pyx_v_i]) - (__pyx_v_rect1.mins[__pyx_v_i]))));\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":200\n- * for i in range(rect1.m):\n- * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i], rect2.maxes[i] - rect1.mins[i]))\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":266\n+ * max_dist = dmax(max_dist, dmax(rect1.maxes[i] - rect2.mins[i],\n+ * rect2.maxes[i] - rect1.mins[i]))\n * return max_dist # <<<<<<<<<<<<<<\n * \n * # A pair of functions to do incremental updates of min and max distances\n@@ -2822,22 +3034,22 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":204\n+\/* \"scipy\/spatial\/ckdtree.pyx\":270\n * # A pair of functions to do incremental updates of min and max distances\n * # between two hyperrectangles\n- * cdef inline void __rect_preupdate(Rectangle rect1, Rectangle rect2, int k, double p, # <<<<<<<<<<<<<<\n- * double min_distance, double max_distance,\n- * double *part_min, double *part_max):\n- *\/\n-\n-static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, int __pyx_v_k, double __pyx_v_p, double __pyx_v_min_distance, double __pyx_v_max_distance, double *__pyx_v_part_min, double *__pyx_v_part_max) {\n+ * cdef inline void __rect_preupdate(Rectangle rect1, Rectangle rect2, # <<<<<<<<<<<<<<\n+ * np.npy_intp k, np.float64_t p,\n+ * np.float64_t min_distance,\n+ *\/\n+\n+static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance, __pyx_t_5numpy_float64_t *__pyx_v_part_min, __pyx_t_5numpy_float64_t *__pyx_v_part_max) {\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"__rect_preupdate\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":207\n- * double min_distance, double max_distance,\n- * double *part_min, double *part_max):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":276\n+ * np.float64_t *part_min,\n+ * np.float64_t *part_max):\n * if p != infinity: # <<<<<<<<<<<<<<\n * part_min[0] = min_distance - min_dist_interval_interval_p(rect1, rect2, k, p)\n * part_max[0] = max_distance - max_dist_interval_interval_p(rect1, rect2, k, p)\n@@ -2845,8 +3057,8 @@\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":208\n- * double *part_min, double *part_max):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":277\n+ * np.float64_t *part_max):\n * if p != infinity:\n * part_min[0] = min_distance - min_dist_interval_interval_p(rect1, rect2, k, p) # <<<<<<<<<<<<<<\n * part_max[0] = max_distance - max_dist_interval_interval_p(rect1, rect2, k, p)\n@@ -2854,12 +3066,12 @@\n *\/\n (__pyx_v_part_min[0]) = (__pyx_v_min_distance - __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k, __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":209\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":278\n * if p != infinity:\n * part_min[0] = min_distance - min_dist_interval_interval_p(rect1, rect2, k, p)\n * part_max[0] = max_distance - max_dist_interval_interval_p(rect1, rect2, k, p) # <<<<<<<<<<<<<<\n * \n- * cdef inline void __rect_postupdate(Rectangle rect1, Rectangle rect2, int k, double p,\n+ * cdef inline void __rect_postupdate(Rectangle rect1, Rectangle rect2,\n *\/\n (__pyx_v_part_max[0]) = (__pyx_v_max_distance - __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k, __pyx_v_p));\n goto __pyx_L3;\n@@ -2869,22 +3081,22 @@\n __Pyx_RefNannyFinishContext();\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":211\n+\/* \"scipy\/spatial\/ckdtree.pyx\":280\n * part_max[0] = max_distance - max_dist_interval_interval_p(rect1, rect2, k, p)\n * \n- * cdef inline void __rect_postupdate(Rectangle rect1, Rectangle rect2, int k, double p, # <<<<<<<<<<<<<<\n- * double *min_distance, double *max_distance,\n- * double part_min, double part_max):\n- *\/\n-\n-static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, int __pyx_v_k, double __pyx_v_p, double *__pyx_v_min_distance, double *__pyx_v_max_distance, double __pyx_v_part_min, double __pyx_v_part_max) {\n+ * cdef inline void __rect_postupdate(Rectangle rect1, Rectangle rect2, # <<<<<<<<<<<<<<\n+ * np.npy_intp k, np.float64_t p,\n+ * np.float64_t *min_distance,\n+ *\/\n+\n+static CYTHON_INLINE void __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t *__pyx_v_min_distance, __pyx_t_5numpy_float64_t *__pyx_v_max_distance, __pyx_t_5numpy_float64_t __pyx_v_part_min, __pyx_t_5numpy_float64_t __pyx_v_part_max) {\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"__rect_postupdate\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":214\n- * double *min_distance, double *max_distance,\n- * double part_min, double part_max):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":286\n+ * np.float64_t part_min,\n+ * np.float64_t part_max):\n * if p != infinity: # <<<<<<<<<<<<<<\n * min_distance[0] = part_min + min_dist_interval_interval_p(rect1, rect2, k, p)\n * max_distance[0] = part_max + max_dist_interval_interval_p(rect1, rect2, k, p)\n@@ -2892,8 +3104,8 @@\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":215\n- * double part_min, double part_max):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":287\n+ * np.float64_t part_max):\n * if p != infinity:\n * min_distance[0] = part_min + min_dist_interval_interval_p(rect1, rect2, k, p) # <<<<<<<<<<<<<<\n * max_distance[0] = part_max + max_dist_interval_interval_p(rect1, rect2, k, p)\n@@ -2901,7 +3113,7 @@\n *\/\n (__pyx_v_min_distance[0]) = (__pyx_v_part_min + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k, __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":216\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":288\n * if p != infinity:\n * min_distance[0] = part_min + min_dist_interval_interval_p(rect1, rect2, k, p)\n * max_distance[0] = part_max + max_dist_interval_interval_p(rect1, rect2, k, p) # <<<<<<<<<<<<<<\n@@ -2913,7 +3125,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":218\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":290\n * max_distance[0] = part_max + max_dist_interval_interval_p(rect1, rect2, k, p)\n * else:\n * min_distance[0] = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n@@ -2922,7 +3134,7 @@\n *\/\n (__pyx_v_min_distance[0]) = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":219\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":291\n * else:\n * min_distance[0] = min_dist_rect_rect_p_inf(rect1, rect2)\n * max_distance[0] = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n@@ -2950,8 +3162,8 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":250\n- * np.double_t *v_data\n+\/* \"scipy\/spatial\/ckdtree.pyx\":326\n+ * np.float64_t *v_data\n * \n * def __init__(self): # <<<<<<<<<<<<<<\n * self.n = 0\n@@ -2971,170 +3183,167 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__init__\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":251\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":327\n * \n * def __init__(self):\n * self.n = 0 # <<<<<<<<<<<<<<\n * self.n_max = 10\n- * self.i = np.empty(self.n_max, dtype=np.int)\n+ * self.i = np.empty(self.n_max, dtype=npy_intp_dtype)\n *\/\n __pyx_v_self->n = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":252\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":328\n * def __init__(self):\n * self.n = 0\n * self.n_max = 10 # <<<<<<<<<<<<<<\n- * self.i = np.empty(self.n_max, dtype=np.int)\n- * self.j = np.empty(self.n_max, dtype=np.int)\n+ * self.i = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.j = np.empty(self.n_max, dtype=npy_intp_dtype)\n *\/\n __pyx_v_self->n_max = 10;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":253\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":329\n * self.n = 0\n * self.n_max = 10\n- * self.i = np.empty(self.n_max, dtype=np.int) # <<<<<<<<<<<<<<\n- * self.j = np.empty(self.n_max, dtype=np.int)\n- * self.v = np.empty(self.n_max, dtype=np.double)\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i = np.empty(self.n_max, dtype=npy_intp_dtype) # <<<<<<<<<<<<<<\n+ * self.j = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.v = np.empty(self.n_max, dtype=np.float64)\n+ *\/\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_1);\n __pyx_t_1 = 0;\n- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GIVEREF(__pyx_t_5);\n+ if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GIVEREF(__pyx_t_4);\n __Pyx_GOTREF(__pyx_v_self->i);\n __Pyx_DECREF(((PyObject *)__pyx_v_self->i));\n- __pyx_v_self->i = ((PyArrayObject *)__pyx_t_5);\n- __pyx_t_5 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":254\n+ __pyx_v_self->i = ((PyArrayObject *)__pyx_t_4);\n+ __pyx_t_4 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":330\n * self.n_max = 10\n- * self.i = np.empty(self.n_max, dtype=np.int)\n- * self.j = np.empty(self.n_max, dtype=np.int) # <<<<<<<<<<<<<<\n- * self.v = np.empty(self.n_max, dtype=np.double)\n- * self.i_data = <np.int_t*>self.i.data\n- *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__empty); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.j = np.empty(self.n_max, dtype=npy_intp_dtype) # <<<<<<<<<<<<<<\n+ * self.v = np.empty(self.n_max, dtype=np.float64)\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ *\/\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__empty); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n- __pyx_t_5 = 0;\n- __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__dtype), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GIVEREF(__pyx_t_4);\n- __Pyx_GOTREF(__pyx_v_self->j);\n- __Pyx_DECREF(((PyObject *)__pyx_v_self->j));\n- __pyx_v_self->j = ((PyArrayObject *)__pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":255\n- * self.i = np.empty(self.n_max, dtype=np.int)\n- * self.j = np.empty(self.n_max, dtype=np.int)\n- * self.v = np.empty(self.n_max, dtype=np.double) # <<<<<<<<<<<<<<\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- *\/\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__empty); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_4);\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__double); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GIVEREF(__pyx_t_2);\n+ __Pyx_GOTREF(__pyx_v_self->j);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_self->j));\n+ __pyx_v_self->j = ((PyArrayObject *)__pyx_t_2);\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":331\n+ * self.i = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.j = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.v = np.empty(self.n_max, dtype=np.float64) # <<<<<<<<<<<<<<\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__empty); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__float64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GIVEREF(__pyx_t_5);\n __Pyx_GOTREF(__pyx_v_self->v);\n __Pyx_DECREF(((PyObject *)__pyx_v_self->v));\n- __pyx_v_self->v = ((PyArrayObject *)__pyx_t_2);\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":256\n- * self.j = np.empty(self.n_max, dtype=np.int)\n- * self.v = np.empty(self.n_max, dtype=np.double)\n- * self.i_data = <np.int_t*>self.i.data # <<<<<<<<<<<<<<\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data\n- *\/\n- __pyx_v_self->i_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->i->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":257\n- * self.v = np.empty(self.n_max, dtype=np.double)\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data # <<<<<<<<<<<<<<\n- * self.v_data = <np.double_t*>self.v.data\n- * \n- *\/\n- __pyx_v_self->j_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->j->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":258\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data # <<<<<<<<<<<<<<\n- * \n- * cdef void add(coo_entries self, int i, int j, double v):\n- *\/\n- __pyx_v_self->v_data = ((__pyx_t_5numpy_double_t *)__pyx_v_self->v->data);\n+ __pyx_v_self->v = ((PyArrayObject *)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":332\n+ * self.j = np.empty(self.n_max, dtype=npy_intp_dtype)\n+ * self.v = np.empty(self.n_max, dtype=np.float64)\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i) # <<<<<<<<<<<<<<\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n+ *\/\n+ __pyx_t_5 = ((PyObject *)__pyx_v_self->i);\n+ __Pyx_INCREF(__pyx_t_5);\n+ __pyx_v_self->i_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_5)));\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":333\n+ * self.v = np.empty(self.n_max, dtype=np.float64)\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j) # <<<<<<<<<<<<<<\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n+ * \n+ *\/\n+ __pyx_t_5 = ((PyObject *)__pyx_v_self->j);\n+ __Pyx_INCREF(__pyx_t_5);\n+ __pyx_v_self->j_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_5)));\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":334\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v) # <<<<<<<<<<<<<<\n+ * \n+ * cdef void add(coo_entries self, np.npy_intp i, np.npy_intp j, np.float64_t v):\n+ *\/\n+ __pyx_t_5 = ((PyObject *)__pyx_v_self->v);\n+ __Pyx_INCREF(__pyx_t_5);\n+ __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_5)));\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n __pyx_r = 0;\n goto __pyx_L0;\n@@ -3151,16 +3360,16 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":260\n- * self.v_data = <np.double_t*>self.v.data\n- * \n- * cdef void add(coo_entries self, int i, int j, double v): # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":336\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n+ * \n+ * cdef void add(coo_entries self, np.npy_intp i, np.npy_intp j, np.float64_t v): # <<<<<<<<<<<<<<\n+ * cdef np.npy_intp k\n * if self.n == self.n_max:\n- * self.n_max *= 2\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_11coo_entries_add(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_self, int __pyx_v_i, int __pyx_v_j, double __pyx_v_v) {\n- int __pyx_v_k;\n+ *\/\n+\n+static void __pyx_f_5scipy_7spatial_7ckdtree_11coo_entries_add(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_self, npy_intp __pyx_v_i, npy_intp __pyx_v_j, __pyx_t_5numpy_float64_t __pyx_v_v) {\n+ npy_intp __pyx_v_k;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n PyObject *__pyx_t_2 = NULL;\n@@ -3171,9 +3380,9 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"add\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":261\n- * \n- * cdef void add(coo_entries self, int i, int j, double v):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":338\n+ * cdef void add(coo_entries self, np.npy_intp i, np.npy_intp j, np.float64_t v):\n+ * cdef np.npy_intp k\n * if self.n == self.n_max: # <<<<<<<<<<<<<<\n * self.n_max *= 2\n * self.i.resize(self.n_max)\n@@ -3181,8 +3390,8 @@\n __pyx_t_1 = (__pyx_v_self->n == __pyx_v_self->n_max);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":262\n- * cdef void add(coo_entries self, int i, int j, double v):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":339\n+ * cdef np.npy_intp k\n * if self.n == self.n_max:\n * self.n_max *= 2 # <<<<<<<<<<<<<<\n * self.i.resize(self.n_max)\n@@ -3190,113 +3399,122 @@\n *\/\n __pyx_v_self->n_max = (__pyx_v_self->n_max * 2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":263\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":340\n * if self.n == self.n_max:\n * self.n_max *= 2\n * self.i.resize(self.n_max) # <<<<<<<<<<<<<<\n * self.j.resize(self.n_max)\n * self.v.resize(self.n_max)\n *\/\n- __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_self->i), __pyx_n_s__resize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_self->i), __pyx_n_s__resize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);\n __Pyx_GIVEREF(__pyx_t_3);\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":264\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":341\n * self.n_max *= 2\n * self.i.resize(self.n_max)\n * self.j.resize(self.n_max) # <<<<<<<<<<<<<<\n * self.v.resize(self.n_max)\n- * self.i_data = <np.int_t*>self.i.data\n- *\/\n- __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_self->j), __pyx_n_s__resize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ *\/\n+ __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_self->j), __pyx_n_s__resize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_4);\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":265\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":342\n * self.i.resize(self.n_max)\n * self.j.resize(self.n_max)\n * self.v.resize(self.n_max) # <<<<<<<<<<<<<<\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- *\/\n- __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_self->v), __pyx_n_s__resize); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ *\/\n+ __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_self->v), __pyx_n_s__resize); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_self->n_max); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n_max); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":266\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":343\n * self.j.resize(self.n_max)\n * self.v.resize(self.n_max)\n- * self.i_data = <np.int_t*>self.i.data # <<<<<<<<<<<<<<\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data\n- *\/\n- __pyx_v_self->i_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->i->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":267\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i) # <<<<<<<<<<<<<<\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n+ *\/\n+ __pyx_t_2 = ((PyObject *)__pyx_v_self->i);\n+ __Pyx_INCREF(__pyx_t_2);\n+ __pyx_v_self->i_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":344\n * self.v.resize(self.n_max)\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data # <<<<<<<<<<<<<<\n- * self.v_data = <np.double_t*>self.v.data\n- * \n- *\/\n- __pyx_v_self->j_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->j->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":268\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data # <<<<<<<<<<<<<<\n- * \n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j) # <<<<<<<<<<<<<<\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * k = self.n\n *\/\n- __pyx_v_self->v_data = ((__pyx_t_5numpy_double_t *)__pyx_v_self->v->data);\n+ __pyx_t_2 = ((PyObject *)__pyx_v_self->j);\n+ __Pyx_INCREF(__pyx_t_2);\n+ __pyx_v_self->j_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":345\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v) # <<<<<<<<<<<<<<\n+ * k = self.n\n+ * self.i_data[k] = i\n+ *\/\n+ __pyx_t_2 = ((PyObject *)__pyx_v_self->v);\n+ __Pyx_INCREF(__pyx_t_2);\n+ __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_2)));\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":270\n- * self.v_data = <np.double_t*>self.v.data\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":346\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * k = self.n # <<<<<<<<<<<<<<\n * self.i_data[k] = i\n * self.j_data[k] = j\n *\/\n __pyx_v_k = __pyx_v_self->n;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":271\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":347\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * k = self.n\n * self.i_data[k] = i # <<<<<<<<<<<<<<\n * self.j_data[k] = j\n@@ -3304,7 +3522,7 @@\n *\/\n (__pyx_v_self->i_data[__pyx_v_k]) = __pyx_v_i;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":272\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":348\n * k = self.n\n * self.i_data[k] = i\n * self.j_data[k] = j # <<<<<<<<<<<<<<\n@@ -3313,7 +3531,7 @@\n *\/\n (__pyx_v_self->j_data[__pyx_v_k]) = __pyx_v_j;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":273\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":349\n * self.i_data[k] = i\n * self.j_data[k] = j\n * self.v_data[k] = v # <<<<<<<<<<<<<<\n@@ -3322,7 +3540,7 @@\n *\/\n (__pyx_v_self->v_data[__pyx_v_k]) = __pyx_v_v;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":274\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":350\n * self.j_data[k] = j\n * self.v_data[k] = v\n * self.n += 1 # <<<<<<<<<<<<<<\n@@ -3352,7 +3570,7 @@\n {\n PyObject* values[1] = {0};\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":276\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":352\n * self.n += 1\n * \n * def to_matrix(coo_entries self, shape=None): # <<<<<<<<<<<<<<\n@@ -3377,7 +3595,7 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"to_matrix\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"to_matrix\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -3390,7 +3608,7 @@\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"to_matrix\", 0, 0, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"to_matrix\", 0, 0, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.coo_entries.to_matrix\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -3413,125 +3631,134 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"to_matrix\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":278\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":354\n * def to_matrix(coo_entries self, shape=None):\n * # Shrink arrays to size\n * self.i.resize(self.n) # <<<<<<<<<<<<<<\n * self.j.resize(self.n)\n * self.v.resize(self.n)\n *\/\n- __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self->i), __pyx_n_s__resize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_self->i), __pyx_n_s__resize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 354; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":279\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":355\n * # Shrink arrays to size\n * self.i.resize(self.n)\n * self.j.resize(self.n) # <<<<<<<<<<<<<<\n * self.v.resize(self.n)\n- * self.i_data = <np.int_t*>self.i.data\n- *\/\n- __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_self->j), __pyx_n_s__resize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ *\/\n+ __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_self->j), __pyx_n_s__resize); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n __Pyx_GIVEREF(__pyx_t_3);\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":280\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":356\n * self.i.resize(self.n)\n * self.j.resize(self.n)\n * self.v.resize(self.n) # <<<<<<<<<<<<<<\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- *\/\n- __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_self->v), __pyx_n_s__resize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ *\/\n+ __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_self->v), __pyx_n_s__resize); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_1);\n __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":281\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":357\n * self.j.resize(self.n)\n * self.v.resize(self.n)\n- * self.i_data = <np.int_t*>self.i.data # <<<<<<<<<<<<<<\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data\n- *\/\n- __pyx_v_self->i_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->i->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":282\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i) # <<<<<<<<<<<<<<\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n+ *\/\n+ __pyx_t_1 = ((PyObject *)__pyx_v_self->i);\n+ __Pyx_INCREF(__pyx_t_1);\n+ __pyx_v_self->i_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":358\n * self.v.resize(self.n)\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data # <<<<<<<<<<<<<<\n- * self.v_data = <np.double_t*>self.v.data\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j) # <<<<<<<<<<<<<<\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * self.n_max = self.n\n *\/\n- __pyx_v_self->j_data = ((__pyx_t_5numpy_int_t *)__pyx_v_self->j->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":283\n- * self.i_data = <np.int_t*>self.i.data\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data # <<<<<<<<<<<<<<\n+ __pyx_t_1 = ((PyObject *)__pyx_v_self->j);\n+ __Pyx_INCREF(__pyx_t_1);\n+ __pyx_v_self->j_data = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":359\n+ * self.i_data = <np.npy_intp *>np.PyArray_DATA(self.i)\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v) # <<<<<<<<<<<<<<\n * self.n_max = self.n\n * return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),\n *\/\n- __pyx_v_self->v_data = ((__pyx_t_5numpy_double_t *)__pyx_v_self->v->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":284\n- * self.j_data = <np.int_t*>self.j.data\n- * self.v_data = <np.double_t*>self.v.data\n+ __pyx_t_1 = ((PyObject *)__pyx_v_self->v);\n+ __Pyx_INCREF(__pyx_t_1);\n+ __pyx_v_self->v_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_t_1)));\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":360\n+ * self.j_data = <np.npy_intp *>np.PyArray_DATA(self.j)\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * self.n_max = self.n # <<<<<<<<<<<<<<\n * return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),\n * shape=shape)\n *\/\n __pyx_v_self->n_max = __pyx_v_self->n;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":285\n- * self.v_data = <np.double_t*>self.v.data\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":361\n+ * self.v_data = <np.float64_t*>np.PyArray_DATA(self.v)\n * self.n_max = self.n\n * return scipy.sparse.coo_matrix((self.v, (self.i, self.j)), # <<<<<<<<<<<<<<\n * shape=shape)\n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__scipy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__scipy); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__sparse); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__sparse); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__coo_matrix); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__coo_matrix); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(((PyObject *)__pyx_v_self->i));\n PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self->i));\n@@ -3539,7 +3766,7 @@\n __Pyx_INCREF(((PyObject *)__pyx_v_self->j));\n PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self->j));\n __Pyx_GIVEREF(((PyObject *)__pyx_v_self->j));\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(((PyObject *)__pyx_v_self->v));\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_self->v));\n@@ -3547,23 +3774,23 @@\n PyTuple_SET_ITEM(__pyx_t_3, 1, ((PyObject *)__pyx_t_2));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_2));\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_3));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":286\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":362\n * self.n_max = self.n\n * return scipy.sparse.coo_matrix((self.v, (self.i, self.j)),\n * shape=shape) # <<<<<<<<<<<<<<\n * \n * cdef class cKDTree:\n *\/\n- if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__shape), __pyx_v_shape) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__shape), __pyx_v_shape) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n@@ -3591,7 +3818,7 @@\n static int __pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n static int __pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_data = 0;\n- int __pyx_v_leafsize;\n+ npy_intp __pyx_v_leafsize;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__data,&__pyx_n_s__leafsize,0};\n int __pyx_r;\n __Pyx_RefNannyDeclarations\n@@ -3620,11 +3847,11 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"__init__\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"__init__\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[1]) {\n } else {\n- __pyx_v_leafsize = ((int)10);\n+ __pyx_v_leafsize = ((npy_intp)10);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -3636,14 +3863,14 @@\n }\n __pyx_v_data = values[0];\n if (values[1]) {\n- __pyx_v_leafsize = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_leafsize == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_leafsize = __Pyx_PyInt_from_py_Py_intptr_t(values[1]); if (unlikely((__pyx_v_leafsize == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_leafsize = ((int)10);\n+ __pyx_v_leafsize = ((npy_intp)10);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"__init__\", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"__init__\", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__init__\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -3654,15 +3881,15 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":341\n- * cdef object indices\n- * cdef np.int32_t* raw_indices\n- * def __init__(cKDTree self, data, int leafsize=10): # <<<<<<<<<<<<<<\n- * cdef np.ndarray[double, ndim=2] inner_data\n- * cdef np.ndarray[double, ndim=1] inner_maxes\n- *\/\n-\n-static int __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree___init__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_data, int __pyx_v_leafsize) {\n+\/* \"scipy\/spatial\/ckdtree.pyx\":418\n+ * cdef np.npy_intp* raw_indices\n+ * \n+ * def __init__(cKDTree self, data, np.npy_intp leafsize=10): # <<<<<<<<<<<<<<\n+ * cdef np.ndarray[np.float64_t, ndim=2] inner_data\n+ * cdef np.ndarray[np.float64_t, ndim=1] inner_maxes\n+ *\/\n+\n+static int __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree___init__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_data, npy_intp __pyx_v_leafsize) {\n PyArrayObject *__pyx_v_inner_data = 0;\n PyArrayObject *__pyx_v_inner_maxes = 0;\n PyArrayObject *__pyx_v_inner_mins = 0;\n@@ -3683,17 +3910,18 @@\n PyObject *__pyx_t_4 = NULL;\n PyObject *__pyx_t_5 = NULL;\n PyObject *(*__pyx_t_6)(PyObject *);\n- int __pyx_t_7;\n- int __pyx_t_8;\n+ npy_intp __pyx_t_7;\n+ npy_intp __pyx_t_8;\n int __pyx_t_9;\n- PyObject *__pyx_t_10 = NULL;\n- PyArrayObject *__pyx_t_11 = NULL;\n+ PyArrayObject *__pyx_t_10 = NULL;\n+ int __pyx_t_11;\n PyObject *__pyx_t_12 = NULL;\n PyObject *__pyx_t_13 = NULL;\n PyObject *__pyx_t_14 = NULL;\n PyArrayObject *__pyx_t_15 = NULL;\n PyArrayObject *__pyx_t_16 = NULL;\n PyArrayObject *__pyx_t_17 = NULL;\n+ struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_t_18;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n@@ -3715,33 +3943,33 @@\n __pyx_pybuffernd_inner_indices.data = NULL;\n __pyx_pybuffernd_inner_indices.rcbuffer = &__pyx_pybuffer_inner_indices;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":346\n- * cdef np.ndarray[double, ndim=1] inner_mins\n- * cdef np.ndarray[np.int32_t, ndim=1] inner_indices\n- * self.data = np.ascontiguousarray(data,dtype=np.float) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":423\n+ * cdef np.ndarray[np.float64_t, ndim=1] inner_mins\n+ * cdef np.ndarray[np.npy_intp, ndim=1] inner_indices\n+ * self.data = np.ascontiguousarray(data,dtype=np.float64) # <<<<<<<<<<<<<<\n * self.n, self.m = np.shape(self.data)\n * self.leafsize = leafsize\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_data);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_data);\n __Pyx_GIVEREF(__pyx_v_data);\n- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__float); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__float64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n@@ -3752,24 +3980,24 @@\n __pyx_v_self->data = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":347\n- * cdef np.ndarray[np.int32_t, ndim=1] inner_indices\n- * self.data = np.ascontiguousarray(data,dtype=np.float)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":424\n+ * cdef np.ndarray[np.npy_intp, ndim=1] inner_indices\n+ * self.data = np.ascontiguousarray(data,dtype=np.float64)\n * self.n, self.m = np.shape(self.data) # <<<<<<<<<<<<<<\n * self.leafsize = leafsize\n * if self.leafsize<1:\n *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_INCREF(__pyx_v_self->data);\n PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_self->data);\n __Pyx_GIVEREF(__pyx_v_self->data);\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n@@ -3779,7 +4007,7 @@\n if (unlikely(PyTuple_GET_SIZE(sequence) != 2)) {\n if (PyTuple_GET_SIZE(sequence) > 2) __Pyx_RaiseTooManyValuesError(2);\n else __Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(sequence));\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_5 = PyTuple_GET_ITEM(sequence, 0); \n __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); \n@@ -3787,7 +4015,7 @@\n if (unlikely(PyList_GET_SIZE(sequence) != 2)) {\n if (PyList_GET_SIZE(sequence) > 2) __Pyx_RaiseTooManyValuesError(2);\n else __Pyx_RaiseNeedMoreValuesError(PyList_GET_SIZE(sequence));\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_5 = PyList_GET_ITEM(sequence, 0); \n __pyx_t_3 = PyList_GET_ITEM(sequence, 1); \n@@ -3797,7 +4025,7 @@\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n } else {\n Py_ssize_t index = -1;\n- __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_t_6 = Py_TYPE(__pyx_t_2)->tp_iternext;\n@@ -3805,25 +4033,25 @@\n __Pyx_GOTREF(__pyx_t_5);\n index = 1; __pyx_t_3 = __pyx_t_6(__pyx_t_2); if (unlikely(!__pyx_t_3)) goto __pyx_L3_unpacking_failed;\n __Pyx_GOTREF(__pyx_t_3);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_2), 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_2), 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n goto __pyx_L4_unpacking_done;\n __pyx_L3_unpacking_failed:;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_StopIteration)) PyErr_Clear();\n if (!PyErr_Occurred()) __Pyx_RaiseNeedMoreValuesError(index);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_L4_unpacking_done:;\n }\n- __pyx_t_7 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = __Pyx_PyInt_from_py_Py_intptr_t(__pyx_t_5); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_8 = __Pyx_PyInt_AsInt(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = __Pyx_PyInt_from_py_Py_intptr_t(__pyx_t_3); if (unlikely((__pyx_t_8 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __pyx_v_self->n = __pyx_t_7;\n __pyx_v_self->m = __pyx_t_8;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":348\n- * self.data = np.ascontiguousarray(data,dtype=np.float)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":425\n+ * self.data = np.ascontiguousarray(data,dtype=np.float64)\n * self.n, self.m = np.shape(self.data)\n * self.leafsize = leafsize # <<<<<<<<<<<<<<\n * if self.leafsize<1:\n@@ -3831,191 +4059,205 @@\n *\/\n __pyx_v_self->leafsize = __pyx_v_leafsize;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":349\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":426\n * self.n, self.m = np.shape(self.data)\n * self.leafsize = leafsize\n * if self.leafsize<1: # <<<<<<<<<<<<<<\n * raise ValueError(\"leafsize must be at least 1\")\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0))\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)\n *\/\n __pyx_t_9 = (__pyx_v_self->leafsize < 1);\n if (__pyx_t_9) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":350\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":427\n * self.leafsize = leafsize\n * if self.leafsize<1:\n * raise ValueError(\"leafsize must be at least 1\") # <<<<<<<<<<<<<<\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0))\n- * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0))\n- *\/\n- __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)\n+ * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)\n+ *\/\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L5;\n }\n __pyx_L5:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":351\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":428\n * if self.leafsize<1:\n * raise ValueError(\"leafsize must be at least 1\")\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0)) # <<<<<<<<<<<<<<\n- * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0))\n- * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.int32))\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64) # <<<<<<<<<<<<<<\n+ * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)\n+ * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=npy_intp_dtype))\n+ *\/\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__amax); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__amax); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_self->data);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_self->data);\n __Pyx_GIVEREF(__pyx_v_self->data);\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n- if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_4 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_4);\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__float64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __Pyx_GIVEREF(__pyx_t_4);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ __Pyx_GIVEREF(__pyx_t_5);\n __Pyx_GOTREF(__pyx_v_self->maxes);\n __Pyx_DECREF(__pyx_v_self->maxes);\n- __pyx_v_self->maxes = __pyx_t_4;\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":352\n+ __pyx_v_self->maxes = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":429\n * raise ValueError(\"leafsize must be at least 1\")\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0))\n- * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0)) # <<<<<<<<<<<<<<\n- * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.int32))\n- * \n- *\/\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)\n+ * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64) # <<<<<<<<<<<<<<\n+ * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=npy_intp_dtype))\n+ * \n+ *\/\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__amin); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(__pyx_v_self->data);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_self->data);\n+ __Pyx_GIVEREF(__pyx_v_self->data);\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__float64); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __Pyx_GOTREF(__pyx_v_self->mins);\n+ __Pyx_DECREF(__pyx_v_self->mins);\n+ __pyx_v_self->mins = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":430\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)\n+ * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)\n+ * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=npy_intp_dtype)) # <<<<<<<<<<<<<<\n+ * \n+ * inner_data = self.data\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__arange); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__amin); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_INCREF(__pyx_v_self->data);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_self->data);\n- __Pyx_GIVEREF(__pyx_v_self->data);\n- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n- if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_4), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_4), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_5);\n __Pyx_GIVEREF(__pyx_t_5);\n __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n __Pyx_GIVEREF(__pyx_t_5);\n- __Pyx_GOTREF(__pyx_v_self->mins);\n- __Pyx_DECREF(__pyx_v_self->mins);\n- __pyx_v_self->mins = __pyx_t_5;\n- __pyx_t_5 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":353\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0))\n- * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0))\n- * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.int32)) # <<<<<<<<<<<<<<\n- * \n- * inner_data = self.data\n- *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__arange); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n- __pyx_t_5 = 0;\n- __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_10 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__int32); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__dtype), __pyx_t_10) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_t_10 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_4), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_10);\n- __Pyx_GIVEREF(__pyx_t_10);\n- __pyx_t_10 = 0;\n- __pyx_t_10 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __Pyx_GIVEREF(__pyx_t_10);\n __Pyx_GOTREF(__pyx_v_self->indices);\n __Pyx_DECREF(__pyx_v_self->indices);\n- __pyx_v_self->indices = __pyx_t_10;\n- __pyx_t_10 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":355\n- * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=np.int32))\n+ __pyx_v_self->indices = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":432\n+ * self.indices = np.ascontiguousarray(np.arange(self.n,dtype=npy_intp_dtype))\n * \n * inner_data = self.data # <<<<<<<<<<<<<<\n- * self.raw_data = <double*>inner_data.data\n+ * self.raw_data = <np.float64_t*>np.PyArray_DATA(inner_data)\n * inner_maxes = self.maxes\n *\/\n- if (!(likely(((__pyx_v_self->data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_11 = ((PyArrayObject *)__pyx_v_self->data);\n+ if (!(likely(((__pyx_v_self->data) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->data, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 432; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_10 = ((PyArrayObject *)__pyx_v_self->data);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n+ __pyx_t_11 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer, (PyObject*)__pyx_t_10, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_11 < 0)) {\n PyErr_Fetch(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_data, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_data, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_12); Py_XDECREF(__pyx_t_13); Py_XDECREF(__pyx_t_14);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -4023,37 +4265,37 @@\n }\n }\n __pyx_pybuffernd_inner_data.diminfo[0].strides = __pyx_pybuffernd_inner_data.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_inner_data.diminfo[0].shape = __pyx_pybuffernd_inner_data.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_inner_data.diminfo[1].strides = __pyx_pybuffernd_inner_data.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_inner_data.diminfo[1].shape = __pyx_pybuffernd_inner_data.rcbuffer->pybuffer.shape[1];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_11 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 432; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n- __pyx_t_11 = 0;\n+ __pyx_t_10 = 0;\n __Pyx_INCREF(__pyx_v_self->data);\n __pyx_v_inner_data = ((PyArrayObject *)__pyx_v_self->data);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":356\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":433\n * \n * inner_data = self.data\n- * self.raw_data = <double*>inner_data.data # <<<<<<<<<<<<<<\n+ * self.raw_data = <np.float64_t*>np.PyArray_DATA(inner_data) # <<<<<<<<<<<<<<\n * inner_maxes = self.maxes\n- * self.raw_maxes = <double*>inner_maxes.data\n- *\/\n- __pyx_v_self->raw_data = ((double *)__pyx_v_inner_data->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":357\n+ * self.raw_maxes = <np.float64_t*>np.PyArray_DATA(inner_maxes)\n+ *\/\n+ __pyx_v_self->raw_data = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_inner_data)));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":434\n * inner_data = self.data\n- * self.raw_data = <double*>inner_data.data\n+ * self.raw_data = <np.float64_t*>np.PyArray_DATA(inner_data)\n * inner_maxes = self.maxes # <<<<<<<<<<<<<<\n- * self.raw_maxes = <double*>inner_maxes.data\n+ * self.raw_maxes = <np.float64_t*>np.PyArray_DATA(inner_maxes)\n * inner_mins = self.mins\n *\/\n- if (!(likely(((__pyx_v_self->maxes) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->maxes, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_v_self->maxes) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->maxes, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_15 = ((PyArrayObject *)__pyx_v_self->maxes);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer, (PyObject*)__pyx_t_15, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n+ __pyx_t_11 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer, (PyObject*)__pyx_t_15, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_11 < 0)) {\n PyErr_Fetch(&__pyx_t_14, &__pyx_t_13, &__pyx_t_12);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_maxes, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_maxes, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_14); Py_XDECREF(__pyx_t_13); Py_XDECREF(__pyx_t_12);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -4061,37 +4303,37 @@\n }\n }\n __pyx_pybuffernd_inner_maxes.diminfo[0].strides = __pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_inner_maxes.diminfo[0].shape = __pyx_pybuffernd_inner_maxes.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_11 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 434; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_15 = 0;\n __Pyx_INCREF(__pyx_v_self->maxes);\n __pyx_v_inner_maxes = ((PyArrayObject *)__pyx_v_self->maxes);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":358\n- * self.raw_data = <double*>inner_data.data\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":435\n+ * self.raw_data = <np.float64_t*>np.PyArray_DATA(inner_data)\n * inner_maxes = self.maxes\n- * self.raw_maxes = <double*>inner_maxes.data # <<<<<<<<<<<<<<\n+ * self.raw_maxes = <np.float64_t*>np.PyArray_DATA(inner_maxes) # <<<<<<<<<<<<<<\n * inner_mins = self.mins\n- * self.raw_mins = <double*>inner_mins.data\n- *\/\n- __pyx_v_self->raw_maxes = ((double *)__pyx_v_inner_maxes->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":359\n+ * self.raw_mins = <np.float64_t*>np.PyArray_DATA(inner_mins)\n+ *\/\n+ __pyx_v_self->raw_maxes = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_inner_maxes)));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":436\n * inner_maxes = self.maxes\n- * self.raw_maxes = <double*>inner_maxes.data\n+ * self.raw_maxes = <np.float64_t*>np.PyArray_DATA(inner_maxes)\n * inner_mins = self.mins # <<<<<<<<<<<<<<\n- * self.raw_mins = <double*>inner_mins.data\n+ * self.raw_mins = <np.float64_t*>np.PyArray_DATA(inner_mins)\n * inner_indices = self.indices\n *\/\n- if (!(likely(((__pyx_v_self->mins) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->mins, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_v_self->mins) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->mins, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_16 = ((PyArrayObject *)__pyx_v_self->mins);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_inner_mins.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_mins.rcbuffer->pybuffer, (PyObject*)__pyx_t_16, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n+ __pyx_t_11 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_mins.rcbuffer->pybuffer, (PyObject*)__pyx_t_16, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_11 < 0)) {\n PyErr_Fetch(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_mins.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_mins, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_mins.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_mins, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_12); Py_XDECREF(__pyx_t_13); Py_XDECREF(__pyx_t_14);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -4099,37 +4341,37 @@\n }\n }\n __pyx_pybuffernd_inner_mins.diminfo[0].strides = __pyx_pybuffernd_inner_mins.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_inner_mins.diminfo[0].shape = __pyx_pybuffernd_inner_mins.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_11 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_16 = 0;\n __Pyx_INCREF(__pyx_v_self->mins);\n __pyx_v_inner_mins = ((PyArrayObject *)__pyx_v_self->mins);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":360\n- * self.raw_maxes = <double*>inner_maxes.data\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":437\n+ * self.raw_maxes = <np.float64_t*>np.PyArray_DATA(inner_maxes)\n * inner_mins = self.mins\n- * self.raw_mins = <double*>inner_mins.data # <<<<<<<<<<<<<<\n+ * self.raw_mins = <np.float64_t*>np.PyArray_DATA(inner_mins) # <<<<<<<<<<<<<<\n * inner_indices = self.indices\n- * self.raw_indices = <np.int32_t*>inner_indices.data\n- *\/\n- __pyx_v_self->raw_mins = ((double *)__pyx_v_inner_mins->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":361\n+ * self.raw_indices = <np.npy_intp*>np.PyArray_DATA(inner_indices)\n+ *\/\n+ __pyx_v_self->raw_mins = ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_inner_mins)));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":438\n * inner_mins = self.mins\n- * self.raw_mins = <double*>inner_mins.data\n+ * self.raw_mins = <np.float64_t*>np.PyArray_DATA(inner_mins)\n * inner_indices = self.indices # <<<<<<<<<<<<<<\n- * self.raw_indices = <np.int32_t*>inner_indices.data\n- * \n- *\/\n- if (!(likely(((__pyx_v_self->indices) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->indices, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.raw_indices = <np.npy_intp*>np.PyArray_DATA(inner_indices)\n+ * \n+ *\/\n+ if (!(likely(((__pyx_v_self->indices) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_self->indices, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 438; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_17 = ((PyArrayObject *)__pyx_v_self->indices);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_inner_indices.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_indices.rcbuffer->pybuffer, (PyObject*)__pyx_t_17, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n+ __pyx_t_11 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_indices.rcbuffer->pybuffer, (PyObject*)__pyx_t_17, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_11 < 0)) {\n PyErr_Fetch(&__pyx_t_14, &__pyx_t_13, &__pyx_t_12);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_indices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int32_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_inner_indices.rcbuffer->pybuffer, (PyObject*)__pyx_v_inner_indices, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_14); Py_XDECREF(__pyx_t_13); Py_XDECREF(__pyx_t_12);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -4137,29 +4379,30 @@\n }\n }\n __pyx_pybuffernd_inner_indices.diminfo[0].strides = __pyx_pybuffernd_inner_indices.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_inner_indices.diminfo[0].shape = __pyx_pybuffernd_inner_indices.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_11 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 438; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_17 = 0;\n __Pyx_INCREF(__pyx_v_self->indices);\n __pyx_v_inner_indices = ((PyArrayObject *)__pyx_v_self->indices);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":362\n- * self.raw_mins = <double*>inner_mins.data\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":439\n+ * self.raw_mins = <np.float64_t*>np.PyArray_DATA(inner_mins)\n * inner_indices = self.indices\n- * self.raw_indices = <np.int32_t*>inner_indices.data # <<<<<<<<<<<<<<\n+ * self.raw_indices = <np.npy_intp*>np.PyArray_DATA(inner_indices) # <<<<<<<<<<<<<<\n * \n * self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins)\n *\/\n- __pyx_v_self->raw_indices = ((__pyx_t_5numpy_int32_t *)__pyx_v_inner_indices->data);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":364\n- * self.raw_indices = <np.int32_t*>inner_indices.data\n+ __pyx_v_self->raw_indices = ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_v_inner_indices)));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":441\n+ * self.raw_indices = <np.npy_intp*>np.PyArray_DATA(inner_indices)\n * \n * self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins) # <<<<<<<<<<<<<<\n * \n- * cdef innernode* __build(cKDTree self, int start_idx, int end_idx, double* maxes, double* mins):\n- *\/\n- __pyx_v_self->tree = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, 0, __pyx_v_self->n, __pyx_v_self->raw_maxes, __pyx_v_self->raw_mins);\n+ * cdef innernode* __build(cKDTree self, np.npy_intp start_idx, np.npy_intp end_idx,\n+ *\/\n+ __pyx_t_18 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, 0, __pyx_v_self->n, __pyx_v_self->raw_maxes, __pyx_v_self->raw_mins); if (unlikely(__pyx_t_18 == ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_v_self->tree = __pyx_t_18;\n \n __pyx_r = 0;\n goto __pyx_L0;\n@@ -4169,7 +4412,6 @@\n __Pyx_XDECREF(__pyx_t_3);\n __Pyx_XDECREF(__pyx_t_4);\n __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_XDECREF(__pyx_t_10);\n { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_inner_data.rcbuffer->pybuffer);\n@@ -4194,66 +4436,98 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":366\n+\/* \"scipy\/spatial\/ckdtree.pyx\":443\n * self.tree = self.__build(0, self.n, self.raw_maxes, self.raw_mins)\n * \n- * cdef innernode* __build(cKDTree self, int start_idx, int end_idx, double* maxes, double* mins): # <<<<<<<<<<<<<<\n+ * cdef innernode* __build(cKDTree self, np.npy_intp start_idx, np.npy_intp end_idx, # <<<<<<<<<<<<<<\n+ * np.float64_t* maxes, np.float64_t* mins) except? <innernode*> NULL:\n * cdef leafnode* n\n- * cdef innernode* ni\n- *\/\n-\n-static struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___build(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, int __pyx_v_start_idx, int __pyx_v_end_idx, double *__pyx_v_maxes, double *__pyx_v_mins) {\n+ *\/\n+\n+static struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___build(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, npy_intp __pyx_v_start_idx, npy_intp __pyx_v_end_idx, __pyx_t_5numpy_float64_t *__pyx_v_maxes, __pyx_t_5numpy_float64_t *__pyx_v_mins) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_n;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_ni;\n- int __pyx_v_i;\n- int __pyx_v_j;\n- int __pyx_v_t;\n- int __pyx_v_p;\n- int __pyx_v_q;\n- int __pyx_v_d;\n- double __pyx_v_size;\n- double __pyx_v_split;\n- double __pyx_v_minval;\n- double __pyx_v_maxval;\n- double *__pyx_v_mids;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ npy_intp __pyx_v_t;\n+ npy_intp __pyx_v_p;\n+ npy_intp __pyx_v_q;\n+ npy_intp __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_size;\n+ __pyx_t_5numpy_float64_t __pyx_v_split;\n+ __pyx_t_5numpy_float64_t __pyx_v_minval;\n+ __pyx_t_5numpy_float64_t __pyx_v_maxval;\n+ __pyx_t_5numpy_float64_t *__pyx_v_mids;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- int __pyx_t_2;\n- int __pyx_t_3;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n long __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyObject *__pyx_t_7 = NULL;\n+ struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_t_8;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyObject *__pyx_t_11 = NULL;\n+ int __pyx_lineno = 0;\n+ const char *__pyx_filename = NULL;\n+ int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__build\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":372\n- * cdef double size, split, minval, maxval\n- * cdef double*mids\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":450\n+ * cdef np.float64_t size, split, minval, maxval\n+ * cdef np.float64_t*mids\n * if end_idx-start_idx<=self.leafsize: # <<<<<<<<<<<<<<\n * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n- * n.split_dim = -1\n+ * if n == <leafnode*> NULL:\n *\/\n __pyx_t_1 = ((__pyx_v_end_idx - __pyx_v_start_idx) <= __pyx_v_self->leafsize);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":373\n- * cdef double*mids\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":451\n+ * cdef np.float64_t*mids\n * if end_idx-start_idx<=self.leafsize:\n * n = <leafnode*>stdlib.malloc(sizeof(leafnode)) # <<<<<<<<<<<<<<\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_n = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":452\n+ * if end_idx-start_idx<=self.leafsize:\n+ * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ * if n == <leafnode*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * n.split_dim = -1\n+ *\/\n+ __pyx_t_1 = (__pyx_v_n == ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":453\n+ * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n * n.split_dim = -1\n * n.children = end_idx - start_idx\n *\/\n- __pyx_v_n = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":374\n- * if end_idx-start_idx<=self.leafsize:\n- * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L4;\n+ }\n+ __pyx_L4:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":454\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError\n * n.split_dim = -1 # <<<<<<<<<<<<<<\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx\n *\/\n __pyx_v_n->split_dim = -1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":375\n- * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":455\n+ * raise MemoryError\n * n.split_dim = -1\n * n.children = end_idx - start_idx # <<<<<<<<<<<<<<\n * n.start_idx = start_idx\n@@ -4261,7 +4535,7 @@\n *\/\n __pyx_v_n->children = (__pyx_v_end_idx - __pyx_v_start_idx);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":376\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":456\n * n.split_dim = -1\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx # <<<<<<<<<<<<<<\n@@ -4270,7 +4544,7 @@\n *\/\n __pyx_v_n->start_idx = __pyx_v_start_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":377\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":457\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx\n * n.end_idx = end_idx # <<<<<<<<<<<<<<\n@@ -4279,7 +4553,7 @@\n *\/\n __pyx_v_n->end_idx = __pyx_v_end_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":378\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":458\n * n.start_idx = start_idx\n * n.end_idx = end_idx\n * return <innernode*>n # <<<<<<<<<<<<<<\n@@ -4292,7 +4566,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":380\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":460\n * return <innernode*>n\n * else:\n * d = 0 # <<<<<<<<<<<<<<\n@@ -4301,7 +4575,7 @@\n *\/\n __pyx_v_d = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":381\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":461\n * else:\n * d = 0\n * size = 0 # <<<<<<<<<<<<<<\n@@ -4310,7 +4584,7 @@\n *\/\n __pyx_v_size = 0.0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":382\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":462\n * d = 0\n * size = 0\n * for i in range(self.m): # <<<<<<<<<<<<<<\n@@ -4321,7 +4595,7 @@\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":383\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":463\n * size = 0\n * for i in range(self.m):\n * if maxes[i]-mins[i] > size: # <<<<<<<<<<<<<<\n@@ -4331,7 +4605,7 @@\n __pyx_t_1 = (((__pyx_v_maxes[__pyx_v_i]) - (__pyx_v_mins[__pyx_v_i])) > __pyx_v_size);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":384\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":464\n * for i in range(self.m):\n * if maxes[i]-mins[i] > size:\n * d = i # <<<<<<<<<<<<<<\n@@ -4340,7 +4614,7 @@\n *\/\n __pyx_v_d = __pyx_v_i;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":385\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":465\n * if maxes[i]-mins[i] > size:\n * d = i\n * size = maxes[i]-mins[i] # <<<<<<<<<<<<<<\n@@ -4348,12 +4622,12 @@\n * minval = mins[d]\n *\/\n __pyx_v_size = ((__pyx_v_maxes[__pyx_v_i]) - (__pyx_v_mins[__pyx_v_i]));\n- goto __pyx_L6;\n+ goto __pyx_L7;\n }\n- __pyx_L6:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":386\n+ __pyx_L7:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":466\n * d = i\n * size = maxes[i]-mins[i]\n * maxval = maxes[d] # <<<<<<<<<<<<<<\n@@ -4362,7 +4636,7 @@\n *\/\n __pyx_v_maxval = (__pyx_v_maxes[__pyx_v_d]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":387\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":467\n * size = maxes[i]-mins[i]\n * maxval = maxes[d]\n * minval = mins[d] # <<<<<<<<<<<<<<\n@@ -4371,7 +4645,7 @@\n *\/\n __pyx_v_minval = (__pyx_v_mins[__pyx_v_d]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":388\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":468\n * maxval = maxes[d]\n * minval = mins[d]\n * if maxval==minval: # <<<<<<<<<<<<<<\n@@ -4381,26 +4655,48 @@\n __pyx_t_1 = (__pyx_v_maxval == __pyx_v_minval);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":390\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":470\n * if maxval==minval:\n * # all points are identical; warn user?\n * n = <leafnode*>stdlib.malloc(sizeof(leafnode)) # <<<<<<<<<<<<<<\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_n = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":471\n+ * # all points are identical; warn user?\n+ * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ * if n == <leafnode*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * n.split_dim = -1\n+ *\/\n+ __pyx_t_1 = (__pyx_v_n == ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":472\n+ * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n * n.split_dim = -1\n * n.children = end_idx - start_idx\n *\/\n- __pyx_v_n = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)malloc((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":391\n- * # all points are identical; warn user?\n- * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":473\n+ * if n == <leafnode*> NULL:\n+ * raise MemoryError\n * n.split_dim = -1 # <<<<<<<<<<<<<<\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx\n *\/\n __pyx_v_n->split_dim = -1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":392\n- * n = <leafnode*>stdlib.malloc(sizeof(leafnode))\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":474\n+ * raise MemoryError\n * n.split_dim = -1\n * n.children = end_idx - start_idx # <<<<<<<<<<<<<<\n * n.start_idx = start_idx\n@@ -4408,7 +4704,7 @@\n *\/\n __pyx_v_n->children = (__pyx_v_end_idx - __pyx_v_start_idx);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":393\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":475\n * n.split_dim = -1\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx # <<<<<<<<<<<<<<\n@@ -4417,7 +4713,7 @@\n *\/\n __pyx_v_n->start_idx = __pyx_v_start_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":394\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":476\n * n.children = end_idx - start_idx\n * n.start_idx = start_idx\n * n.end_idx = end_idx # <<<<<<<<<<<<<<\n@@ -4426,7 +4722,7 @@\n *\/\n __pyx_v_n->end_idx = __pyx_v_end_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":395\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":477\n * n.start_idx = start_idx\n * n.end_idx = end_idx\n * return <innernode*>n # <<<<<<<<<<<<<<\n@@ -4435,11 +4731,11 @@\n *\/\n __pyx_r = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)__pyx_v_n);\n goto __pyx_L0;\n- goto __pyx_L7;\n- }\n- __pyx_L7:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":397\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":479\n * return <innernode*>n\n * \n * split = (maxval+minval)\/2 # <<<<<<<<<<<<<<\n@@ -4448,7 +4744,7 @@\n *\/\n __pyx_v_split = ((__pyx_v_maxval + __pyx_v_minval) \/ 2.0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":399\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":481\n * split = (maxval+minval)\/2\n * \n * p = start_idx # <<<<<<<<<<<<<<\n@@ -4457,7 +4753,7 @@\n *\/\n __pyx_v_p = __pyx_v_start_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":400\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":482\n * \n * p = start_idx\n * q = end_idx-1 # <<<<<<<<<<<<<<\n@@ -4466,7 +4762,7 @@\n *\/\n __pyx_v_q = (__pyx_v_end_idx - 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":401\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":483\n * p = start_idx\n * q = end_idx-1\n * while p<=q: # <<<<<<<<<<<<<<\n@@ -4477,7 +4773,7 @@\n __pyx_t_1 = (__pyx_v_p <= __pyx_v_q);\n if (!__pyx_t_1) break;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":402\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":484\n * q = end_idx-1\n * while p<=q:\n * if self.raw_data[self.raw_indices[p]*self.m+d]<split: # <<<<<<<<<<<<<<\n@@ -4487,7 +4783,7 @@\n __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_p]) * __pyx_v_self->m) + __pyx_v_d)]) < __pyx_v_split);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":403\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":485\n * while p<=q:\n * if self.raw_data[self.raw_indices[p]*self.m+d]<split:\n * p+=1 # <<<<<<<<<<<<<<\n@@ -4495,10 +4791,10 @@\n * q-=1\n *\/\n __pyx_v_p = (__pyx_v_p + 1);\n- goto __pyx_L10;\n+ goto __pyx_L12;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":404\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":486\n * if self.raw_data[self.raw_indices[p]*self.m+d]<split:\n * p+=1\n * elif self.raw_data[self.raw_indices[q]*self.m+d]>=split: # <<<<<<<<<<<<<<\n@@ -4508,7 +4804,7 @@\n __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_q]) * __pyx_v_self->m) + __pyx_v_d)]) >= __pyx_v_split);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":405\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":487\n * p+=1\n * elif self.raw_data[self.raw_indices[q]*self.m+d]>=split:\n * q-=1 # <<<<<<<<<<<<<<\n@@ -4516,11 +4812,11 @@\n * t = self.raw_indices[p]\n *\/\n __pyx_v_q = (__pyx_v_q - 1);\n- goto __pyx_L10;\n+ goto __pyx_L12;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":407\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":489\n * q-=1\n * else:\n * t = self.raw_indices[p] # <<<<<<<<<<<<<<\n@@ -4529,7 +4825,7 @@\n *\/\n __pyx_v_t = (__pyx_v_self->raw_indices[__pyx_v_p]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":408\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":490\n * else:\n * t = self.raw_indices[p]\n * self.raw_indices[p] = self.raw_indices[q] # <<<<<<<<<<<<<<\n@@ -4538,7 +4834,7 @@\n *\/\n (__pyx_v_self->raw_indices[__pyx_v_p]) = (__pyx_v_self->raw_indices[__pyx_v_q]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":409\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":491\n * t = self.raw_indices[p]\n * self.raw_indices[p] = self.raw_indices[q]\n * self.raw_indices[q] = t # <<<<<<<<<<<<<<\n@@ -4547,7 +4843,7 @@\n *\/\n (__pyx_v_self->raw_indices[__pyx_v_q]) = __pyx_v_t;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":410\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":492\n * self.raw_indices[p] = self.raw_indices[q]\n * self.raw_indices[q] = t\n * p+=1 # <<<<<<<<<<<<<<\n@@ -4556,7 +4852,7 @@\n *\/\n __pyx_v_p = (__pyx_v_p + 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":411\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":493\n * self.raw_indices[q] = t\n * p+=1\n * q-=1 # <<<<<<<<<<<<<<\n@@ -4565,10 +4861,10 @@\n *\/\n __pyx_v_q = (__pyx_v_q - 1);\n }\n- __pyx_L10:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":414\n+ __pyx_L12:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":496\n * \n * # slide midpoint if necessary\n * if p==start_idx: # <<<<<<<<<<<<<<\n@@ -4578,7 +4874,7 @@\n __pyx_t_1 = (__pyx_v_p == __pyx_v_start_idx);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":416\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":498\n * if p==start_idx:\n * # no points less than split\n * j = start_idx # <<<<<<<<<<<<<<\n@@ -4587,7 +4883,7 @@\n *\/\n __pyx_v_j = __pyx_v_start_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":417\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":499\n * # no points less than split\n * j = start_idx\n * split = self.raw_data[self.raw_indices[j]*self.m+d] # <<<<<<<<<<<<<<\n@@ -4596,7 +4892,7 @@\n *\/\n __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":418\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":500\n * j = start_idx\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * for i in range(start_idx+1, end_idx): # <<<<<<<<<<<<<<\n@@ -4607,7 +4903,7 @@\n for (__pyx_t_3 = (__pyx_v_start_idx + 1); __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":419\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":501\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * for i in range(start_idx+1, end_idx):\n * if self.raw_data[self.raw_indices[i]*self.m+d]<split: # <<<<<<<<<<<<<<\n@@ -4617,7 +4913,7 @@\n __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m) + __pyx_v_d)]) < __pyx_v_split);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":420\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":502\n * for i in range(start_idx+1, end_idx):\n * if self.raw_data[self.raw_indices[i]*self.m+d]<split:\n * j = i # <<<<<<<<<<<<<<\n@@ -4626,7 +4922,7 @@\n *\/\n __pyx_v_j = __pyx_v_i;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":421\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":503\n * if self.raw_data[self.raw_indices[i]*self.m+d]<split:\n * j = i\n * split = self.raw_data[self.raw_indices[j]*self.m+d] # <<<<<<<<<<<<<<\n@@ -4634,12 +4930,12 @@\n * self.raw_indices[start_idx] = self.raw_indices[j]\n *\/\n __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);\n- goto __pyx_L14;\n+ goto __pyx_L16;\n }\n- __pyx_L14:;\n+ __pyx_L16:;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":422\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":504\n * j = i\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * t = self.raw_indices[start_idx] # <<<<<<<<<<<<<<\n@@ -4648,7 +4944,7 @@\n *\/\n __pyx_v_t = (__pyx_v_self->raw_indices[__pyx_v_start_idx]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":423\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":505\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * t = self.raw_indices[start_idx]\n * self.raw_indices[start_idx] = self.raw_indices[j] # <<<<<<<<<<<<<<\n@@ -4657,7 +4953,7 @@\n *\/\n (__pyx_v_self->raw_indices[__pyx_v_start_idx]) = (__pyx_v_self->raw_indices[__pyx_v_j]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":424\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":506\n * t = self.raw_indices[start_idx]\n * self.raw_indices[start_idx] = self.raw_indices[j]\n * self.raw_indices[j] = t # <<<<<<<<<<<<<<\n@@ -4666,7 +4962,7 @@\n *\/\n (__pyx_v_self->raw_indices[__pyx_v_j]) = __pyx_v_t;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":425\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":507\n * self.raw_indices[start_idx] = self.raw_indices[j]\n * self.raw_indices[j] = t\n * p = start_idx+1 # <<<<<<<<<<<<<<\n@@ -4675,7 +4971,7 @@\n *\/\n __pyx_v_p = (__pyx_v_start_idx + 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":426\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":508\n * self.raw_indices[j] = t\n * p = start_idx+1\n * q = start_idx # <<<<<<<<<<<<<<\n@@ -4683,10 +4979,10 @@\n * # no points greater than split\n *\/\n __pyx_v_q = __pyx_v_start_idx;\n- goto __pyx_L11;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":427\n+ goto __pyx_L13;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":509\n * p = start_idx+1\n * q = start_idx\n * elif p==end_idx: # <<<<<<<<<<<<<<\n@@ -4696,7 +4992,7 @@\n __pyx_t_1 = (__pyx_v_p == __pyx_v_end_idx);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":429\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":511\n * elif p==end_idx:\n * # no points greater than split\n * j = end_idx-1 # <<<<<<<<<<<<<<\n@@ -4705,7 +5001,7 @@\n *\/\n __pyx_v_j = (__pyx_v_end_idx - 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":430\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":512\n * # no points greater than split\n * j = end_idx-1\n * split = self.raw_data[self.raw_indices[j]*self.m+d] # <<<<<<<<<<<<<<\n@@ -4714,7 +5010,7 @@\n *\/\n __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":431\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":513\n * j = end_idx-1\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * for i in range(start_idx, end_idx-1): # <<<<<<<<<<<<<<\n@@ -4725,7 +5021,7 @@\n for (__pyx_t_2 = __pyx_v_start_idx; __pyx_t_2 < __pyx_t_4; __pyx_t_2+=1) {\n __pyx_v_i = __pyx_t_2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":432\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":514\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * for i in range(start_idx, end_idx-1):\n * if self.raw_data[self.raw_indices[i]*self.m+d]>split: # <<<<<<<<<<<<<<\n@@ -4735,7 +5031,7 @@\n __pyx_t_1 = ((__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m) + __pyx_v_d)]) > __pyx_v_split);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":433\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":515\n * for i in range(start_idx, end_idx-1):\n * if self.raw_data[self.raw_indices[i]*self.m+d]>split:\n * j = i # <<<<<<<<<<<<<<\n@@ -4744,7 +5040,7 @@\n *\/\n __pyx_v_j = __pyx_v_i;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":434\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":516\n * if self.raw_data[self.raw_indices[i]*self.m+d]>split:\n * j = i\n * split = self.raw_data[self.raw_indices[j]*self.m+d] # <<<<<<<<<<<<<<\n@@ -4752,12 +5048,12 @@\n * self.raw_indices[end_idx-1] = self.raw_indices[j]\n *\/\n __pyx_v_split = (__pyx_v_self->raw_data[(((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m) + __pyx_v_d)]);\n- goto __pyx_L17;\n+ goto __pyx_L19;\n }\n- __pyx_L17:;\n+ __pyx_L19:;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":435\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":517\n * j = i\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * t = self.raw_indices[end_idx-1] # <<<<<<<<<<<<<<\n@@ -4766,7 +5062,7 @@\n *\/\n __pyx_v_t = (__pyx_v_self->raw_indices[(__pyx_v_end_idx - 1)]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":436\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":518\n * split = self.raw_data[self.raw_indices[j]*self.m+d]\n * t = self.raw_indices[end_idx-1]\n * self.raw_indices[end_idx-1] = self.raw_indices[j] # <<<<<<<<<<<<<<\n@@ -4775,7 +5071,7 @@\n *\/\n (__pyx_v_self->raw_indices[(__pyx_v_end_idx - 1)]) = (__pyx_v_self->raw_indices[__pyx_v_j]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":437\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":519\n * t = self.raw_indices[end_idx-1]\n * self.raw_indices[end_idx-1] = self.raw_indices[j]\n * self.raw_indices[j] = t # <<<<<<<<<<<<<<\n@@ -4784,7 +5080,7 @@\n *\/\n (__pyx_v_self->raw_indices[__pyx_v_j]) = __pyx_v_t;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":438\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":520\n * self.raw_indices[end_idx-1] = self.raw_indices[j]\n * self.raw_indices[j] = t\n * p = end_idx-1 # <<<<<<<<<<<<<<\n@@ -4793,7 +5089,7 @@\n *\/\n __pyx_v_p = (__pyx_v_end_idx - 1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":439\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":521\n * self.raw_indices[j] = t\n * p = end_idx-1\n * q = end_idx-2 # <<<<<<<<<<<<<<\n@@ -4801,126 +5097,297 @@\n * # construct new node representation\n *\/\n __pyx_v_q = (__pyx_v_end_idx - 2);\n- goto __pyx_L11;\n- }\n- __pyx_L11:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":442\n+ goto __pyx_L13;\n+ }\n+ __pyx_L13:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":524\n * \n * # construct new node representation\n * ni = <innernode*>stdlib.malloc(sizeof(innernode)) # <<<<<<<<<<<<<<\n- * \n- * mids = <double*>stdlib.malloc(sizeof(double)*self.m)\n+ * if ni == <innernode*> NULL:\n+ * raise MemoryError\n *\/\n __pyx_v_ni = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)malloc((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_innernode))));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":444\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":525\n+ * # construct new node representation\n * ni = <innernode*>stdlib.malloc(sizeof(innernode))\n- * \n- * mids = <double*>stdlib.malloc(sizeof(double)*self.m) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * mids[i] = maxes[i]\n- *\/\n- __pyx_v_mids = ((double *)malloc(((sizeof(double)) * __pyx_v_self->m)));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":445\n- * \n- * mids = <double*>stdlib.malloc(sizeof(double)*self.m)\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * mids[i] = maxes[i]\n- * mids[d] = split\n- *\/\n- __pyx_t_2 = __pyx_v_self->m;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":446\n- * mids = <double*>stdlib.malloc(sizeof(double)*self.m)\n- * for i in range(self.m):\n- * mids[i] = maxes[i] # <<<<<<<<<<<<<<\n- * mids[d] = split\n- * ni.less = self.__build(start_idx,p,mids,mins)\n- *\/\n- (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_maxes[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":447\n- * for i in range(self.m):\n- * mids[i] = maxes[i]\n- * mids[d] = split # <<<<<<<<<<<<<<\n- * ni.less = self.__build(start_idx,p,mids,mins)\n- * \n- *\/\n- (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":448\n- * mids[i] = maxes[i]\n- * mids[d] = split\n- * ni.less = self.__build(start_idx,p,mids,mins) # <<<<<<<<<<<<<<\n- * \n- * for i in range(self.m):\n- *\/\n- __pyx_v_ni->less = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, __pyx_v_start_idx, __pyx_v_p, __pyx_v_mids, __pyx_v_mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":450\n- * ni.less = self.__build(start_idx,p,mids,mins)\n- * \n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * mids[i] = mins[i]\n- * mids[d] = split\n- *\/\n- __pyx_t_2 = __pyx_v_self->m;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":451\n- * \n- * for i in range(self.m):\n- * mids[i] = mins[i] # <<<<<<<<<<<<<<\n- * mids[d] = split\n- * ni.greater = self.__build(p,end_idx,maxes,mids)\n- *\/\n- (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_mins[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":452\n- * for i in range(self.m):\n- * mids[i] = mins[i]\n- * mids[d] = split # <<<<<<<<<<<<<<\n- * ni.greater = self.__build(p,end_idx,maxes,mids)\n- * \n- *\/\n- (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":453\n- * mids[i] = mins[i]\n- * mids[d] = split\n- * ni.greater = self.__build(p,end_idx,maxes,mids) # <<<<<<<<<<<<<<\n- * \n- * ni.children = ni.less.children + ni.greater.children\n- *\/\n- __pyx_v_ni->greater = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, __pyx_v_p, __pyx_v_end_idx, __pyx_v_maxes, __pyx_v_mids);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":455\n- * ni.greater = self.__build(p,end_idx,maxes,mids)\n- * \n- * ni.children = ni.less.children + ni.greater.children # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(mids)\n- *\/\n- __pyx_v_ni->children = (__pyx_v_ni->less->children + __pyx_v_ni->greater->children);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":457\n- * ni.children = ni.less.children + ni.greater.children\n- * \n- * stdlib.free(mids) # <<<<<<<<<<<<<<\n+ * if ni == <innernode*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_ni == ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":526\n+ * ni = <innernode*>stdlib.malloc(sizeof(innernode))\n+ * if ni == <innernode*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * try:\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L20;\n+ }\n+ __pyx_L20:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":528\n+ * raise MemoryError\n+ * \n+ * try: # <<<<<<<<<<<<<<\n+ * mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)\n+ * if mids == <np.float64_t*> NULL:\n+ *\/\n+ {\n+ __Pyx_ExceptionSave(&__pyx_t_5, &__pyx_t_6, &__pyx_t_7);\n+ __Pyx_XGOTREF(__pyx_t_5);\n+ __Pyx_XGOTREF(__pyx_t_6);\n+ __Pyx_XGOTREF(__pyx_t_7);\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":529\n+ * \n+ * try:\n+ * mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m) # <<<<<<<<<<<<<<\n+ * if mids == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_mids = ((__pyx_t_5numpy_float64_t *)malloc(((sizeof(__pyx_t_5numpy_float64_t)) * __pyx_v_self->m)));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":530\n+ * try:\n+ * mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)\n+ * if mids == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_mids == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":531\n+ * mids = <np.float64_t*>stdlib.malloc(sizeof(np.float64_t)*self.m)\n+ * if mids == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(self.m):\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; __pyx_clineno = __LINE__; goto __pyx_L21_error;}\n+ goto __pyx_L29;\n+ }\n+ __pyx_L29:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":533\n+ * raise MemoryError\n+ * \n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * mids[i] = maxes[i]\n+ * mids[d] = split\n+ *\/\n+ __pyx_t_2 = __pyx_v_self->m;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":534\n+ * \n+ * for i in range(self.m):\n+ * mids[i] = maxes[i] # <<<<<<<<<<<<<<\n+ * mids[d] = split\n+ * ni.less = self.__build(start_idx,p,mids,mins)\n+ *\/\n+ (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":535\n+ * for i in range(self.m):\n+ * mids[i] = maxes[i]\n+ * mids[d] = split # <<<<<<<<<<<<<<\n+ * ni.less = self.__build(start_idx,p,mids,mins)\n+ * \n+ *\/\n+ (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":536\n+ * mids[i] = maxes[i]\n+ * mids[d] = split\n+ * ni.less = self.__build(start_idx,p,mids,mins) # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(self.m):\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, __pyx_v_start_idx, __pyx_v_p, __pyx_v_mids, __pyx_v_mins); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L21_error;}\n+ __pyx_v_ni->less = __pyx_t_8;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":538\n+ * ni.less = self.__build(start_idx,p,mids,mins)\n+ * \n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * mids[i] = mins[i]\n+ * mids[d] = split\n+ *\/\n+ __pyx_t_2 = __pyx_v_self->m;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":539\n+ * \n+ * for i in range(self.m):\n+ * mids[i] = mins[i] # <<<<<<<<<<<<<<\n+ * mids[d] = split\n+ * ni.greater = self.__build(p,end_idx,maxes,mids)\n+ *\/\n+ (__pyx_v_mids[__pyx_v_i]) = (__pyx_v_mins[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":540\n+ * for i in range(self.m):\n+ * mids[i] = mins[i]\n+ * mids[d] = split # <<<<<<<<<<<<<<\n+ * ni.greater = self.__build(p,end_idx,maxes,mids)\n+ * \n+ *\/\n+ (__pyx_v_mids[__pyx_v_d]) = __pyx_v_split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":541\n+ * mids[i] = mins[i]\n+ * mids[d] = split\n+ * ni.greater = self.__build(p,end_idx,maxes,mids) # <<<<<<<<<<<<<<\n+ * \n+ * ni.children = ni.less.children + ni.greater.children\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___build(__pyx_v_self, __pyx_v_p, __pyx_v_end_idx, __pyx_v_maxes, __pyx_v_mids); if (unlikely(__pyx_t_8 == ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; __pyx_clineno = __LINE__; goto __pyx_L21_error;}\n+ __pyx_v_ni->greater = __pyx_t_8;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":543\n+ * ni.greater = self.__build(p,end_idx,maxes,mids)\n+ * \n+ * ni.children = ni.less.children + ni.greater.children # <<<<<<<<<<<<<<\n+ * \n+ * except:\n+ *\/\n+ __pyx_v_ni->children = (__pyx_v_ni->less->children + __pyx_v_ni->greater->children);\n+ }\n+ \/*else:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":553\n+ * raise\n+ * else:\n+ * if mids != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(mids)\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_mids != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":554\n+ * else:\n+ * if mids != <np.float64_t*> NULL:\n+ * stdlib.free(mids) # <<<<<<<<<<<<<<\n * \n * ni.split_dim = d\n *\/\n- free(__pyx_v_mids);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":459\n- * stdlib.free(mids)\n+ free(__pyx_v_mids);\n+ goto __pyx_L34;\n+ }\n+ __pyx_L34:;\n+ }\n+ __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ goto __pyx_L28_try_end;\n+ __pyx_L21_error:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":545\n+ * ni.children = ni.less.children + ni.greater.children\n+ * \n+ * except: # <<<<<<<<<<<<<<\n+ * # free ni if it cannot be returned\n+ * if ni != <innernode*> NULL:\n+ *\/\n+ \/*except:*\/ {\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__build\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ if (__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; __pyx_clineno = __LINE__; goto __pyx_L23_except_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __Pyx_GOTREF(__pyx_t_10);\n+ __Pyx_GOTREF(__pyx_t_11);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":547\n+ * except:\n+ * # free ni if it cannot be returned\n+ * if ni != <innernode*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(mids)\n+ * if mids != <np.float64_t*> NULL:\n+ *\/\n+ __pyx_t_1 = (__pyx_v_ni != ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":548\n+ * # free ni if it cannot be returned\n+ * if ni != <innernode*> NULL:\n+ * stdlib.free(mids) # <<<<<<<<<<<<<<\n+ * if mids != <np.float64_t*> NULL:\n+ * stdlib.free(mids)\n+ *\/\n+ free(__pyx_v_mids);\n+ goto __pyx_L37;\n+ }\n+ __pyx_L37:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":549\n+ * if ni != <innernode*> NULL:\n+ * stdlib.free(mids)\n+ * if mids != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(mids)\n+ * raise\n+ *\/\n+ __pyx_t_1 = (__pyx_v_mids != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":550\n+ * stdlib.free(mids)\n+ * if mids != <np.float64_t*> NULL:\n+ * stdlib.free(mids) # <<<<<<<<<<<<<<\n+ * raise\n+ * else:\n+ *\/\n+ free(__pyx_v_mids);\n+ goto __pyx_L38;\n+ }\n+ __pyx_L38:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":551\n+ * if mids != <np.float64_t*> NULL:\n+ * stdlib.free(mids)\n+ * raise # <<<<<<<<<<<<<<\n+ * else:\n+ * if mids != <np.float64_t*> NULL:\n+ *\/\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_10);\n+ __Pyx_GIVEREF(__pyx_t_11);\n+ __Pyx_ErrRestore(__pyx_t_9, __pyx_t_10, __pyx_t_11);\n+ __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; \n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; __pyx_clineno = __LINE__; goto __pyx_L23_except_error;}\n+ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n+ __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n+ goto __pyx_L22_exception_handled;\n+ }\n+ __pyx_L23_except_error:;\n+ __Pyx_XGIVEREF(__pyx_t_5);\n+ __Pyx_XGIVEREF(__pyx_t_6);\n+ __Pyx_XGIVEREF(__pyx_t_7);\n+ __Pyx_ExceptionReset(__pyx_t_5, __pyx_t_6, __pyx_t_7);\n+ goto __pyx_L1_error;\n+ __pyx_L22_exception_handled:;\n+ __Pyx_XGIVEREF(__pyx_t_5);\n+ __Pyx_XGIVEREF(__pyx_t_6);\n+ __Pyx_XGIVEREF(__pyx_t_7);\n+ __Pyx_ExceptionReset(__pyx_t_5, __pyx_t_6, __pyx_t_7);\n+ __pyx_L28_try_end:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":556\n+ * stdlib.free(mids)\n * \n * ni.split_dim = d # <<<<<<<<<<<<<<\n * ni.split = split\n@@ -4928,7 +5395,7 @@\n *\/\n __pyx_v_ni->split_dim = __pyx_v_d;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":460\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":557\n * \n * ni.split_dim = d\n * ni.split = split # <<<<<<<<<<<<<<\n@@ -4937,7 +5404,7 @@\n *\/\n __pyx_v_ni->split = __pyx_v_split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":462\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":559\n * ni.split = split\n * \n * return ni # <<<<<<<<<<<<<<\n@@ -4950,12 +5417,19 @@\n __pyx_L3:;\n \n __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_XDECREF(__pyx_t_10);\n+ __Pyx_XDECREF(__pyx_t_11);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__build\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)NULL);\n __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":464\n+\/* \"scipy\/spatial\/ckdtree.pyx\":561\n * return ni\n * \n * cdef __free_tree(cKDTree self, innernode* node): # <<<<<<<<<<<<<<\n@@ -4973,7 +5447,7 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__free_tree\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":465\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":562\n * \n * cdef __free_tree(cKDTree self, innernode* node):\n * if node.split_dim!=-1: # <<<<<<<<<<<<<<\n@@ -4983,32 +5457,32 @@\n __pyx_t_1 = (__pyx_v_node->split_dim != -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":466\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":563\n * cdef __free_tree(cKDTree self, innernode* node):\n * if node.split_dim!=-1:\n * self.__free_tree(node.less) # <<<<<<<<<<<<<<\n * self.__free_tree(node.greater)\n * stdlib.free(node)\n *\/\n- __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_node->less); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_node->less); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":467\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":564\n * if node.split_dim!=-1:\n * self.__free_tree(node.less)\n * self.__free_tree(node.greater) # <<<<<<<<<<<<<<\n * stdlib.free(node)\n * \n *\/\n- __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_node->greater); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_node->greater); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":468\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":565\n * self.__free_tree(node.less)\n * self.__free_tree(node.greater)\n * stdlib.free(node) # <<<<<<<<<<<<<<\n@@ -5038,11 +5512,11 @@\n __Pyx_RefNannyFinishContext();\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":470\n+\/* \"scipy\/spatial\/ckdtree.pyx\":567\n * stdlib.free(node)\n * \n * def __dealloc__(cKDTree self): # <<<<<<<<<<<<<<\n- * if <int>(self.tree) == 0:\n+ * if <np.npy_intp>(self.tree) == 0:\n * # should happen only if __init__ was never called\n *\/\n \n@@ -5055,18 +5529,18 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__dealloc__\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":471\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":568\n * \n * def __dealloc__(cKDTree self):\n- * if <int>(self.tree) == 0: # <<<<<<<<<<<<<<\n+ * if <np.npy_intp>(self.tree) == 0: # <<<<<<<<<<<<<<\n * # should happen only if __init__ was never called\n * return\n *\/\n- __pyx_t_1 = (((int)__pyx_v_self->tree) == 0);\n+ __pyx_t_1 = (((npy_intp)__pyx_v_self->tree) == 0);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":473\n- * if <int>(self.tree) == 0:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":570\n+ * if <np.npy_intp>(self.tree) == 0:\n * # should happen only if __init__ was never called\n * return # <<<<<<<<<<<<<<\n * self.__free_tree(self.tree)\n@@ -5077,14 +5551,14 @@\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":474\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":571\n * # should happen only if __init__ was never called\n * return\n * self.__free_tree(self.tree) # <<<<<<<<<<<<<<\n * \n- * cdef void __query(cKDTree self,\n- *\/\n- __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_self->tree); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * cdef int __query(cKDTree self,\n+ *\/\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___free_tree(__pyx_v_self, __pyx_v_self->tree); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 571; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n@@ -5096,25 +5570,25 @@\n __Pyx_RefNannyFinishContext();\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":476\n+\/* \"scipy\/spatial\/ckdtree.pyx\":573\n * self.__free_tree(self.tree)\n * \n- * cdef void __query(cKDTree self, # <<<<<<<<<<<<<<\n- * double*result_distances,\n- * int*result_indices,\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, double *__pyx_v_result_distances, int *__pyx_v_result_indices, double *__pyx_v_x, int __pyx_v_k, double __pyx_v_eps, double __pyx_v_p, double __pyx_v_distance_upper_bound) {\n+ * cdef int __query(cKDTree self, # <<<<<<<<<<<<<<\n+ * np.float64_t*result_distances,\n+ * np.npy_intp*result_indices,\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, __pyx_t_5numpy_float64_t *__pyx_v_result_distances, npy_intp *__pyx_v_result_indices, __pyx_t_5numpy_float64_t *__pyx_v_x, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_eps, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_distance_upper_bound) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_heap __pyx_v_q;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heap __pyx_v_neighbors;\n- int __pyx_v_i;\n- double __pyx_v_t;\n+ npy_intp __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_t;\n struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *__pyx_v_inf;\n struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *__pyx_v_inf2;\n- double __pyx_v_d;\n- double __pyx_v_epsfac;\n- double __pyx_v_min_distance;\n- double __pyx_v_far_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_epsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_far_min_distance;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_it;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_it2;\n struct __pyx_t_5scipy_7spatial_7ckdtree_heapitem __pyx_v_neighbor;\n@@ -5122,917 +5596,1146 @@\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_inode;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_near;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_far;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n+ int __pyx_t_1;\n int __pyx_t_2;\n- int __pyx_t_3;\n- int __pyx_t_4;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n int __pyx_t_5;\n int __pyx_t_6;\n- double __pyx_t_7;\n+ __pyx_t_5numpy_float64_t __pyx_t_7;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":507\n- * # distances between the nearest side of the cell and the target\n- * # the head node of the cell\n- * heapcreate(&q,12) # <<<<<<<<<<<<<<\n- * \n- * # priority queue for the nearest neighbors\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapcreate((&__pyx_v_q), 12); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 507; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":512\n- * # furthest known neighbor first\n- * # entries are (-distance**p, i)\n- * heapcreate(&neighbors,k) # <<<<<<<<<<<<<<\n- * \n- * # set up first nodeinfo\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapcreate((&__pyx_v_neighbors), __pyx_v_k); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 512; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":515\n- * \n- * # set up first nodeinfo\n- * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double)) # <<<<<<<<<<<<<<\n- * inf.node = self.tree\n- * for i in range(self.m):\n- *\/\n- __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(double))))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":516\n- * # set up first nodeinfo\n- * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double))\n- * inf.node = self.tree # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * inf.side_distances[i] = 0\n- *\/\n- __pyx_v_inf->node = __pyx_v_self->tree;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":517\n- * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double))\n- * inf.node = self.tree\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * inf.side_distances[i] = 0\n- * t = x[i]-self.raw_maxes[i]\n- *\/\n- __pyx_t_2 = __pyx_v_self->m;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":518\n- * inf.node = self.tree\n- * for i in range(self.m):\n- * inf.side_distances[i] = 0 # <<<<<<<<<<<<<<\n- * t = x[i]-self.raw_maxes[i]\n- * if t>inf.side_distances[i]:\n- *\/\n- (__pyx_v_inf->side_distances[__pyx_v_i]) = 0.0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":519\n- * for i in range(self.m):\n- * inf.side_distances[i] = 0\n- * t = x[i]-self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * if t>inf.side_distances[i]:\n- * inf.side_distances[i] = t\n- *\/\n- __pyx_v_t = ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_self->raw_maxes[__pyx_v_i]));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":520\n- * inf.side_distances[i] = 0\n- * t = x[i]-self.raw_maxes[i]\n- * if t>inf.side_distances[i]: # <<<<<<<<<<<<<<\n- * inf.side_distances[i] = t\n- * else:\n- *\/\n- __pyx_t_4 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));\n- if (__pyx_t_4) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":521\n- * t = x[i]-self.raw_maxes[i]\n- * if t>inf.side_distances[i]:\n- * inf.side_distances[i] = t # <<<<<<<<<<<<<<\n- * else:\n- * t = self.raw_mins[i]-x[i]\n- *\/\n- (__pyx_v_inf->side_distances[__pyx_v_i]) = __pyx_v_t;\n- goto __pyx_L5;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":523\n- * inf.side_distances[i] = t\n- * else:\n- * t = self.raw_mins[i]-x[i] # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":601\n+ * \n+ * \n+ * inf = inf2 = <nodeinfo*> NULL # <<<<<<<<<<<<<<\n+ * \n+ * try:\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+ __pyx_v_inf2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":603\n+ * inf = inf2 = <nodeinfo*> NULL\n+ * \n+ * try: # <<<<<<<<<<<<<<\n+ * # priority queue for chasing nodes\n+ * # entries are:\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":609\n+ * # distances between the nearest side of the cell and the target\n+ * # the head node of the cell\n+ * heapcreate(&q,12) # <<<<<<<<<<<<<<\n+ * \n+ * # priority queue for the nearest neighbors\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapcreate((&__pyx_v_q), 12); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":614\n+ * # furthest known neighbor first\n+ * # entries are (-distance**p, i)\n+ * heapcreate(&neighbors,k) # <<<<<<<<<<<<<<\n+ * \n+ * # set up first nodeinfo\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapcreate((&__pyx_v_neighbors), __pyx_v_k); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 614; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":617\n+ * \n+ * # set up first nodeinfo\n+ * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if inf == <nodeinfo*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t))))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":618\n+ * # set up first nodeinfo\n+ * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))\n+ * if inf == <nodeinfo*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * inf.node = self.tree\n+ *\/\n+ __pyx_t_2 = (__pyx_v_inf == ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL));\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":619\n+ * inf = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))\n+ * if inf == <nodeinfo*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * inf.node = self.tree\n+ * for i in range(self.m):\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 619; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":620\n+ * if inf == <nodeinfo*> NULL:\n+ * raise MemoryError\n+ * inf.node = self.tree # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * inf.side_distances[i] = 0\n+ *\/\n+ __pyx_v_inf->node = __pyx_v_self->tree;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":621\n+ * raise MemoryError\n+ * inf.node = self.tree\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * inf.side_distances[i] = 0\n+ * t = x[i]-self.raw_maxes[i]\n+ *\/\n+ __pyx_t_3 = __pyx_v_self->m;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":622\n+ * inf.node = self.tree\n+ * for i in range(self.m):\n+ * inf.side_distances[i] = 0 # <<<<<<<<<<<<<<\n+ * t = x[i]-self.raw_maxes[i]\n+ * if t>inf.side_distances[i]:\n+ *\/\n+ (__pyx_v_inf->side_distances[__pyx_v_i]) = 0.0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":623\n+ * for i in range(self.m):\n+ * inf.side_distances[i] = 0\n+ * t = x[i]-self.raw_maxes[i] # <<<<<<<<<<<<<<\n * if t>inf.side_distances[i]:\n * inf.side_distances[i] = t\n *\/\n- __pyx_v_t = ((__pyx_v_self->raw_mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i]));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":524\n- * else:\n- * t = self.raw_mins[i]-x[i]\n+ __pyx_v_t = ((__pyx_v_x[__pyx_v_i]) - (__pyx_v_self->raw_maxes[__pyx_v_i]));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":624\n+ * inf.side_distances[i] = 0\n+ * t = x[i]-self.raw_maxes[i]\n * if t>inf.side_distances[i]: # <<<<<<<<<<<<<<\n * inf.side_distances[i] = t\n- * if p!=1 and p!=infinity:\n- *\/\n- __pyx_t_4 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));\n- if (__pyx_t_4) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":525\n- * t = self.raw_mins[i]-x[i]\n+ * else:\n+ *\/\n+ __pyx_t_2 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":625\n+ * t = x[i]-self.raw_maxes[i]\n * if t>inf.side_distances[i]:\n * inf.side_distances[i] = t # <<<<<<<<<<<<<<\n- * if p!=1 and p!=infinity:\n- * inf.side_distances[i]=inf.side_distances[i]**p\n+ * else:\n+ * t = self.raw_mins[i]-x[i]\n *\/\n (__pyx_v_inf->side_distances[__pyx_v_i]) = __pyx_v_t;\n- goto __pyx_L6;\n+ goto __pyx_L9;\n }\n- __pyx_L6:;\n- }\n- __pyx_L5:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":526\n- * if t>inf.side_distances[i]:\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":627\n * inf.side_distances[i] = t\n- * if p!=1 and p!=infinity: # <<<<<<<<<<<<<<\n- * inf.side_distances[i]=inf.side_distances[i]**p\n- * \n- *\/\n- __pyx_t_4 = (__pyx_v_p != 1.0);\n- if (__pyx_t_4) {\n- __pyx_t_5 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- __pyx_t_6 = __pyx_t_5;\n- } else {\n- __pyx_t_6 = __pyx_t_4;\n- }\n+ * else:\n+ * t = self.raw_mins[i]-x[i] # <<<<<<<<<<<<<<\n+ * if t>inf.side_distances[i]:\n+ * inf.side_distances[i] = t\n+ *\/\n+ __pyx_v_t = ((__pyx_v_self->raw_mins[__pyx_v_i]) - (__pyx_v_x[__pyx_v_i]));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":628\n+ * else:\n+ * t = self.raw_mins[i]-x[i]\n+ * if t>inf.side_distances[i]: # <<<<<<<<<<<<<<\n+ * inf.side_distances[i] = t\n+ * if p!=1 and p!=infinity:\n+ *\/\n+ __pyx_t_2 = (__pyx_v_t > (__pyx_v_inf->side_distances[__pyx_v_i]));\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":629\n+ * t = self.raw_mins[i]-x[i]\n+ * if t>inf.side_distances[i]:\n+ * inf.side_distances[i] = t # <<<<<<<<<<<<<<\n+ * if p!=1 and p!=infinity:\n+ * inf.side_distances[i]=inf.side_distances[i]**p\n+ *\/\n+ (__pyx_v_inf->side_distances[__pyx_v_i]) = __pyx_v_t;\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":630\n+ * if t>inf.side_distances[i]:\n+ * inf.side_distances[i] = t\n+ * if p!=1 and p!=infinity: # <<<<<<<<<<<<<<\n+ * inf.side_distances[i]=inf.side_distances[i]**p\n+ * \n+ *\/\n+ __pyx_t_2 = (__pyx_v_p != 1.0);\n+ if (__pyx_t_2) {\n+ __pyx_t_5 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ __pyx_t_6 = __pyx_t_5;\n+ } else {\n+ __pyx_t_6 = __pyx_t_2;\n+ }\n+ if (__pyx_t_6) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":631\n+ * inf.side_distances[i] = t\n+ * if p!=1 and p!=infinity:\n+ * inf.side_distances[i]=inf.side_distances[i]**p # <<<<<<<<<<<<<<\n+ * \n+ * # compute first distance\n+ *\/\n+ (__pyx_v_inf->side_distances[__pyx_v_i]) = pow((__pyx_v_inf->side_distances[__pyx_v_i]), __pyx_v_p);\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":634\n+ * \n+ * # compute first distance\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * if p==infinity:\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":635\n+ * # compute first distance\n+ * min_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * if p==infinity:\n+ * min_distance = dmax(min_distance,inf.side_distances[i])\n+ *\/\n+ __pyx_t_3 = __pyx_v_self->m;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":636\n+ * min_distance = 0.\n+ * for i in range(self.m):\n+ * if p==infinity: # <<<<<<<<<<<<<<\n+ * min_distance = dmax(min_distance,inf.side_distances[i])\n+ * else:\n+ *\/\n+ __pyx_t_6 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_6) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":637\n+ * for i in range(self.m):\n+ * if p==infinity:\n+ * min_distance = dmax(min_distance,inf.side_distances[i]) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance += inf.side_distances[i]\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_distance, (__pyx_v_inf->side_distances[__pyx_v_i]));\n+ goto __pyx_L14;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":639\n+ * min_distance = dmax(min_distance,inf.side_distances[i])\n+ * else:\n+ * min_distance += inf.side_distances[i] # <<<<<<<<<<<<<<\n+ * \n+ * # fiddle approximation factor\n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + (__pyx_v_inf->side_distances[__pyx_v_i]));\n+ }\n+ __pyx_L14:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":642\n+ * \n+ * # fiddle approximation factor\n+ * if eps==0: # <<<<<<<<<<<<<<\n+ * epsfac=1\n+ * elif p==infinity:\n+ *\/\n+ __pyx_t_6 = (__pyx_v_eps == 0.0);\n if (__pyx_t_6) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":527\n- * inf.side_distances[i] = t\n- * if p!=1 and p!=infinity:\n- * inf.side_distances[i]=inf.side_distances[i]**p # <<<<<<<<<<<<<<\n- * \n- * # compute first distance\n- *\/\n- (__pyx_v_inf->side_distances[__pyx_v_i]) = pow((__pyx_v_inf->side_distances[__pyx_v_i]), __pyx_v_p);\n- goto __pyx_L7;\n- }\n- __pyx_L7:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":530\n- * \n- * # compute first distance\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * if p==infinity:\n- *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":531\n- * # compute first distance\n- * min_distance = 0.\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * if p==infinity:\n- * min_distance = dmax(min_distance,inf.side_distances[i])\n- *\/\n- __pyx_t_2 = __pyx_v_self->m;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":532\n- * min_distance = 0.\n- * for i in range(self.m):\n- * if p==infinity: # <<<<<<<<<<<<<<\n- * min_distance = dmax(min_distance,inf.side_distances[i])\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":643\n+ * # fiddle approximation factor\n+ * if eps==0:\n+ * epsfac=1 # <<<<<<<<<<<<<<\n+ * elif p==infinity:\n+ * epsfac = 1\/(1+eps)\n+ *\/\n+ __pyx_v_epsfac = 1.0;\n+ goto __pyx_L15;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":644\n+ * if eps==0:\n+ * epsfac=1\n+ * elif p==infinity: # <<<<<<<<<<<<<<\n+ * epsfac = 1\/(1+eps)\n * else:\n *\/\n __pyx_t_6 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_6) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":533\n- * for i in range(self.m):\n- * if p==infinity:\n- * min_distance = dmax(min_distance,inf.side_distances[i]) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":645\n+ * epsfac=1\n+ * elif p==infinity:\n+ * epsfac = 1\/(1+eps) # <<<<<<<<<<<<<<\n * else:\n- * min_distance += inf.side_distances[i]\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_distance, (__pyx_v_inf->side_distances[__pyx_v_i]));\n- goto __pyx_L10;\n+ * epsfac = 1\/(1+eps)**p\n+ *\/\n+ __pyx_t_7 = (1.0 + __pyx_v_eps);\n+ if (unlikely(__pyx_t_7 == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ }\n+ __pyx_v_epsfac = (1.0 \/ __pyx_t_7);\n+ goto __pyx_L15;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":535\n- * min_distance = dmax(min_distance,inf.side_distances[i])\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":647\n+ * epsfac = 1\/(1+eps)\n * else:\n- * min_distance += inf.side_distances[i] # <<<<<<<<<<<<<<\n- * \n- * # fiddle approximation factor\n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + (__pyx_v_inf->side_distances[__pyx_v_i]));\n- }\n- __pyx_L10:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":538\n- * \n- * # fiddle approximation factor\n- * if eps==0: # <<<<<<<<<<<<<<\n- * epsfac=1\n- * elif p==infinity:\n- *\/\n- __pyx_t_6 = (__pyx_v_eps == 0.0);\n- if (__pyx_t_6) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":539\n- * # fiddle approximation factor\n- * if eps==0:\n- * epsfac=1 # <<<<<<<<<<<<<<\n- * elif p==infinity:\n- * epsfac = 1\/(1+eps)\n- *\/\n- __pyx_v_epsfac = 1.0;\n- goto __pyx_L11;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":540\n- * if eps==0:\n- * epsfac=1\n- * elif p==infinity: # <<<<<<<<<<<<<<\n- * epsfac = 1\/(1+eps)\n- * else:\n- *\/\n- __pyx_t_6 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_6) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":541\n- * epsfac=1\n- * elif p==infinity:\n- * epsfac = 1\/(1+eps) # <<<<<<<<<<<<<<\n- * else:\n- * epsfac = 1\/(1+eps)**p\n- *\/\n- __pyx_t_7 = (1.0 + __pyx_v_eps);\n- if (unlikely(__pyx_t_7 == 0)) {\n- PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_v_epsfac = (1.0 \/ __pyx_t_7);\n- goto __pyx_L11;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":543\n- * epsfac = 1\/(1+eps)\n- * else:\n- * epsfac = 1\/(1+eps)**p # <<<<<<<<<<<<<<\n- * \n- * # internally we represent all distances as distance**p\n- *\/\n- __pyx_t_7 = pow((1.0 + __pyx_v_eps), __pyx_v_p);\n- if (unlikely(__pyx_t_7 == 0)) {\n- PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_v_epsfac = (1.0 \/ __pyx_t_7);\n- }\n- __pyx_L11:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":546\n- * \n- * # internally we represent all distances as distance**p\n- * if p!=infinity and distance_upper_bound!=infinity: # <<<<<<<<<<<<<<\n- * distance_upper_bound = distance_upper_bound**p\n- * \n- *\/\n- __pyx_t_6 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_6) {\n- __pyx_t_4 = (__pyx_v_distance_upper_bound != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- __pyx_t_5 = __pyx_t_4;\n- } else {\n- __pyx_t_5 = __pyx_t_6;\n- }\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":547\n- * # internally we represent all distances as distance**p\n- * if p!=infinity and distance_upper_bound!=infinity:\n- * distance_upper_bound = distance_upper_bound**p # <<<<<<<<<<<<<<\n- * \n- * while True:\n- *\/\n- __pyx_v_distance_upper_bound = pow(__pyx_v_distance_upper_bound, __pyx_v_p);\n- goto __pyx_L12;\n- }\n- __pyx_L12:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":549\n- * distance_upper_bound = distance_upper_bound**p\n- * \n- * while True: # <<<<<<<<<<<<<<\n- * if inf.node.split_dim==-1:\n- * node = <leafnode*>inf.node\n- *\/\n- while (1) {\n- if (!1) break;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":550\n- * \n- * while True:\n- * if inf.node.split_dim==-1: # <<<<<<<<<<<<<<\n- * node = <leafnode*>inf.node\n- * \n- *\/\n- __pyx_t_5 = (__pyx_v_inf->node->split_dim == -1);\n+ * epsfac = 1\/(1+eps)**p # <<<<<<<<<<<<<<\n+ * \n+ * # internally we represent all distances as distance**p\n+ *\/\n+ __pyx_t_7 = pow((1.0 + __pyx_v_eps), __pyx_v_p);\n+ if (unlikely(__pyx_t_7 == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ }\n+ __pyx_v_epsfac = (1.0 \/ __pyx_t_7);\n+ }\n+ __pyx_L15:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":650\n+ * \n+ * # internally we represent all distances as distance**p\n+ * if p!=infinity and distance_upper_bound!=infinity: # <<<<<<<<<<<<<<\n+ * distance_upper_bound = distance_upper_bound**p\n+ * \n+ *\/\n+ __pyx_t_6 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_6) {\n+ __pyx_t_2 = (__pyx_v_distance_upper_bound != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ __pyx_t_5 = __pyx_t_2;\n+ } else {\n+ __pyx_t_5 = __pyx_t_6;\n+ }\n if (__pyx_t_5) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":551\n- * while True:\n- * if inf.node.split_dim==-1:\n- * node = <leafnode*>inf.node # <<<<<<<<<<<<<<\n- * \n- * # brute-force\n- *\/\n- __pyx_v_node = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_inf->node);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":554\n- * \n- * # brute-force\n- * for i in range(node.start_idx,node.end_idx): # <<<<<<<<<<<<<<\n- * d = _distance_p(\n- * self.raw_data+self.raw_indices[i]*self.m,\n- *\/\n- __pyx_t_2 = __pyx_v_node->end_idx;\n- for (__pyx_t_3 = __pyx_v_node->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":557\n- * d = _distance_p(\n- * self.raw_data+self.raw_indices[i]*self.m,\n- * x,p,self.m,distance_upper_bound) # <<<<<<<<<<<<<<\n- * \n- * if d<distance_upper_bound:\n- *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_x, __pyx_v_p, __pyx_v_self->m, __pyx_v_distance_upper_bound);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":559\n- * x,p,self.m,distance_upper_bound)\n- * \n- * if d<distance_upper_bound: # <<<<<<<<<<<<<<\n- * # replace furthest neighbor\n- * if neighbors.n==k:\n- *\/\n- __pyx_t_5 = (__pyx_v_d < __pyx_v_distance_upper_bound);\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":651\n+ * # internally we represent all distances as distance**p\n+ * if p!=infinity and distance_upper_bound!=infinity:\n+ * distance_upper_bound = distance_upper_bound**p # <<<<<<<<<<<<<<\n+ * \n+ * while True:\n+ *\/\n+ __pyx_v_distance_upper_bound = pow(__pyx_v_distance_upper_bound, __pyx_v_p);\n+ goto __pyx_L16;\n+ }\n+ __pyx_L16:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":653\n+ * distance_upper_bound = distance_upper_bound**p\n+ * \n+ * while True: # <<<<<<<<<<<<<<\n+ * if inf.node.split_dim==-1:\n+ * node = <leafnode*>inf.node\n+ *\/\n+ while (1) {\n+ if (!1) break;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":654\n+ * \n+ * while True:\n+ * if inf.node.split_dim==-1: # <<<<<<<<<<<<<<\n+ * node = <leafnode*>inf.node\n+ * \n+ *\/\n+ __pyx_t_5 = (__pyx_v_inf->node->split_dim == -1);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":655\n+ * while True:\n+ * if inf.node.split_dim==-1:\n+ * node = <leafnode*>inf.node # <<<<<<<<<<<<<<\n+ * \n+ * # brute-force\n+ *\/\n+ __pyx_v_node = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_inf->node);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":658\n+ * \n+ * # brute-force\n+ * for i in range(node.start_idx,node.end_idx): # <<<<<<<<<<<<<<\n+ * d = _distance_p(\n+ * self.raw_data+self.raw_indices[i]*self.m,\n+ *\/\n+ __pyx_t_3 = __pyx_v_node->end_idx;\n+ for (__pyx_t_4 = __pyx_v_node->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":661\n+ * d = _distance_p(\n+ * self.raw_data+self.raw_indices[i]*self.m,\n+ * x,p,self.m,distance_upper_bound) # <<<<<<<<<<<<<<\n+ * \n+ * if d<distance_upper_bound:\n+ *\/\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_x, __pyx_v_p, __pyx_v_self->m, __pyx_v_distance_upper_bound);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":663\n+ * x,p,self.m,distance_upper_bound)\n+ * \n+ * if d<distance_upper_bound: # <<<<<<<<<<<<<<\n+ * # replace furthest neighbor\n+ * if neighbors.n==k:\n+ *\/\n+ __pyx_t_5 = (__pyx_v_d < __pyx_v_distance_upper_bound);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":665\n+ * if d<distance_upper_bound:\n+ * # replace furthest neighbor\n+ * if neighbors.n==k: # <<<<<<<<<<<<<<\n+ * heapremove(&neighbors)\n+ * neighbor.priority = -d\n+ *\/\n+ __pyx_t_5 = (__pyx_v_neighbors.n == __pyx_v_k);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":666\n+ * # replace furthest neighbor\n+ * if neighbors.n==k:\n+ * heapremove(&neighbors) # <<<<<<<<<<<<<<\n+ * neighbor.priority = -d\n+ * neighbor.contents.intdata = self.raw_indices[i]\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapremove((&__pyx_v_neighbors)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L23;\n+ }\n+ __pyx_L23:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":667\n+ * if neighbors.n==k:\n+ * heapremove(&neighbors)\n+ * neighbor.priority = -d # <<<<<<<<<<<<<<\n+ * neighbor.contents.intdata = self.raw_indices[i]\n+ * heappush(&neighbors,neighbor)\n+ *\/\n+ __pyx_v_neighbor.priority = (-__pyx_v_d);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":668\n+ * heapremove(&neighbors)\n+ * neighbor.priority = -d\n+ * neighbor.contents.intdata = self.raw_indices[i] # <<<<<<<<<<<<<<\n+ * heappush(&neighbors,neighbor)\n+ * \n+ *\/\n+ __pyx_v_neighbor.contents.intdata = (__pyx_v_self->raw_indices[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":669\n+ * neighbor.priority = -d\n+ * neighbor.contents.intdata = self.raw_indices[i]\n+ * heappush(&neighbors,neighbor) # <<<<<<<<<<<<<<\n+ * \n+ * # adjust upper bound for efficiency\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappush((&__pyx_v_neighbors), __pyx_v_neighbor); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":672\n+ * \n+ * # adjust upper bound for efficiency\n+ * if neighbors.n==k: # <<<<<<<<<<<<<<\n+ * distance_upper_bound = -heappeek(&neighbors).priority\n+ * \n+ *\/\n+ __pyx_t_5 = (__pyx_v_neighbors.n == __pyx_v_k);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":673\n+ * # adjust upper bound for efficiency\n+ * if neighbors.n==k:\n+ * distance_upper_bound = -heappeek(&neighbors).priority # <<<<<<<<<<<<<<\n+ * \n+ * # done with this node, get another\n+ *\/\n+ __pyx_v_distance_upper_bound = (-__pyx_f_5scipy_7spatial_7ckdtree_heappeek((&__pyx_v_neighbors)).priority);\n+ goto __pyx_L24;\n+ }\n+ __pyx_L24:;\n+ goto __pyx_L22;\n+ }\n+ __pyx_L22:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":676\n+ * \n+ * # done with this node, get another\n+ * stdlib.free(inf) # <<<<<<<<<<<<<<\n+ * inf = <nodeinfo*> NULL\n+ * \n+ *\/\n+ free(__pyx_v_inf);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":677\n+ * # done with this node, get another\n+ * stdlib.free(inf)\n+ * inf = <nodeinfo*> NULL # <<<<<<<<<<<<<<\n+ * \n+ * if q.n==0:\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":679\n+ * inf = <nodeinfo*> NULL\n+ * \n+ * if q.n==0: # <<<<<<<<<<<<<<\n+ * # no more nodes to visit\n+ * break\n+ *\/\n+ __pyx_t_5 = (__pyx_v_q.n == 0);\n if (__pyx_t_5) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":561\n- * if d<distance_upper_bound:\n- * # replace furthest neighbor\n- * if neighbors.n==k: # <<<<<<<<<<<<<<\n- * heapremove(&neighbors)\n- * neighbor.priority = -d\n- *\/\n- __pyx_t_5 = (__pyx_v_neighbors.n == __pyx_v_k);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":562\n- * # replace furthest neighbor\n- * if neighbors.n==k:\n- * heapremove(&neighbors) # <<<<<<<<<<<<<<\n- * neighbor.priority = -d\n- * neighbor.contents.intdata = self.raw_indices[i]\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapremove((&__pyx_v_neighbors)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- goto __pyx_L19;\n- }\n- __pyx_L19:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":563\n- * if neighbors.n==k:\n- * heapremove(&neighbors)\n- * neighbor.priority = -d # <<<<<<<<<<<<<<\n- * neighbor.contents.intdata = self.raw_indices[i]\n- * heappush(&neighbors,neighbor)\n- *\/\n- __pyx_v_neighbor.priority = (-__pyx_v_d);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":564\n- * heapremove(&neighbors)\n- * neighbor.priority = -d\n- * neighbor.contents.intdata = self.raw_indices[i] # <<<<<<<<<<<<<<\n- * heappush(&neighbors,neighbor)\n- * \n- *\/\n- __pyx_v_neighbor.contents.intdata = (__pyx_v_self->raw_indices[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":565\n- * neighbor.priority = -d\n- * neighbor.contents.intdata = self.raw_indices[i]\n- * heappush(&neighbors,neighbor) # <<<<<<<<<<<<<<\n- * \n- * # adjust upper bound for efficiency\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappush((&__pyx_v_neighbors), __pyx_v_neighbor); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":568\n- * \n- * # adjust upper bound for efficiency\n- * if neighbors.n==k: # <<<<<<<<<<<<<<\n- * distance_upper_bound = -heappeek(&neighbors).priority\n- * # done with this node, get another\n- *\/\n- __pyx_t_5 = (__pyx_v_neighbors.n == __pyx_v_k);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":569\n- * # adjust upper bound for efficiency\n- * if neighbors.n==k:\n- * distance_upper_bound = -heappeek(&neighbors).priority # <<<<<<<<<<<<<<\n- * # done with this node, get another\n- * stdlib.free(inf)\n- *\/\n- __pyx_v_distance_upper_bound = (-__pyx_f_5scipy_7spatial_7ckdtree_heappeek((&__pyx_v_neighbors)).priority);\n- goto __pyx_L20;\n- }\n- __pyx_L20:;\n- goto __pyx_L18;\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":681\n+ * if q.n==0:\n+ * # no more nodes to visit\n+ * break # <<<<<<<<<<<<<<\n+ * else:\n+ * heappop(&q, &it)\n+ *\/\n+ goto __pyx_L18_break;\n+ goto __pyx_L25;\n }\n- __pyx_L18:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":571\n- * distance_upper_bound = -heappeek(&neighbors).priority\n- * # done with this node, get another\n- * stdlib.free(inf) # <<<<<<<<<<<<<<\n- * if q.n==0:\n- * # no more nodes to visit\n- *\/\n- free(__pyx_v_inf);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":572\n- * # done with this node, get another\n- * stdlib.free(inf)\n- * if q.n==0: # <<<<<<<<<<<<<<\n- * # no more nodes to visit\n- * break\n- *\/\n- __pyx_t_5 = (__pyx_v_q.n == 0);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":574\n- * if q.n==0:\n- * # no more nodes to visit\n- * break # <<<<<<<<<<<<<<\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":683\n+ * break\n+ * else:\n+ * heappop(&q, &it) # <<<<<<<<<<<<<<\n+ * inf = <nodeinfo*>it.contents.ptrdata\n+ * min_distance = it.priority\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappop((&__pyx_v_q), (&__pyx_v_it)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 683; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":684\n+ * else:\n+ * heappop(&q, &it)\n+ * inf = <nodeinfo*>it.contents.ptrdata # <<<<<<<<<<<<<<\n+ * min_distance = it.priority\n * else:\n- * it = heappop(&q)\n- *\/\n- goto __pyx_L14_break;\n- goto __pyx_L21;\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)__pyx_v_it.contents.ptrdata);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":685\n+ * heappop(&q, &it)\n+ * inf = <nodeinfo*>it.contents.ptrdata\n+ * min_distance = it.priority # <<<<<<<<<<<<<<\n+ * else:\n+ * inode = <innernode*>inf.node\n+ *\/\n+ __pyx_v_min_distance = __pyx_v_it.priority;\n+ }\n+ __pyx_L25:;\n+ goto __pyx_L19;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":576\n- * break\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":687\n+ * min_distance = it.priority\n * else:\n- * it = heappop(&q) # <<<<<<<<<<<<<<\n- * inf = <nodeinfo*>it.contents.ptrdata\n- * min_distance = it.priority\n- *\/\n- __pyx_v_it = __pyx_f_5scipy_7spatial_7ckdtree_heappop((&__pyx_v_q));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":577\n+ * inode = <innernode*>inf.node # <<<<<<<<<<<<<<\n+ * \n+ * # we don't push cells that are too far onto the queue at all,\n+ *\/\n+ __pyx_v_inode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)__pyx_v_inf->node);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":692\n+ * # but since the distance_upper_bound decreases, we might get\n+ * # here even if the cell's too far\n+ * if min_distance>distance_upper_bound*epsfac: # <<<<<<<<<<<<<<\n+ * \n+ * # since this is the nearest cell, we're done, bail out\n+ *\/\n+ __pyx_t_5 = (__pyx_v_min_distance > (__pyx_v_distance_upper_bound * __pyx_v_epsfac));\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":695\n+ * \n+ * # since this is the nearest cell, we're done, bail out\n+ * stdlib.free(inf) # <<<<<<<<<<<<<<\n+ * inf = <nodeinfo*> NULL\n+ * \n+ *\/\n+ free(__pyx_v_inf);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":696\n+ * # since this is the nearest cell, we're done, bail out\n+ * stdlib.free(inf)\n+ * inf = <nodeinfo*> NULL # <<<<<<<<<<<<<<\n+ * \n+ * # free all the nodes still on the heap\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":699\n+ * \n+ * # free all the nodes still on the heap\n+ * for i in range(q.n): # <<<<<<<<<<<<<<\n+ * stdlib.free(q.heap[i].contents.ptrdata)\n+ * q.heap[i].contents.ptrdata = <char*> NULL\n+ *\/\n+ __pyx_t_3 = __pyx_v_q.n;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":700\n+ * # free all the nodes still on the heap\n+ * for i in range(q.n):\n+ * stdlib.free(q.heap[i].contents.ptrdata) # <<<<<<<<<<<<<<\n+ * q.heap[i].contents.ptrdata = <char*> NULL\n+ * break\n+ *\/\n+ free((__pyx_v_q.heap[__pyx_v_i]).contents.ptrdata);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":701\n+ * for i in range(q.n):\n+ * stdlib.free(q.heap[i].contents.ptrdata)\n+ * q.heap[i].contents.ptrdata = <char*> NULL # <<<<<<<<<<<<<<\n+ * break\n+ * \n+ *\/\n+ (__pyx_v_q.heap[__pyx_v_i]).contents.ptrdata = ((char *)NULL);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":702\n+ * stdlib.free(q.heap[i].contents.ptrdata)\n+ * q.heap[i].contents.ptrdata = <char*> NULL\n+ * break # <<<<<<<<<<<<<<\n+ * \n+ * # set up children for searching\n+ *\/\n+ goto __pyx_L18_break;\n+ goto __pyx_L26;\n+ }\n+ __pyx_L26:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":705\n+ * \n+ * # set up children for searching\n+ * if x[inode.split_dim]<inode.split: # <<<<<<<<<<<<<<\n+ * near = inode.less\n+ * far = inode.greater\n+ *\/\n+ __pyx_t_5 = ((__pyx_v_x[__pyx_v_inode->split_dim]) < __pyx_v_inode->split);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":706\n+ * # set up children for searching\n+ * if x[inode.split_dim]<inode.split:\n+ * near = inode.less # <<<<<<<<<<<<<<\n+ * far = inode.greater\n+ * else:\n+ *\/\n+ __pyx_v_near = __pyx_v_inode->less;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":707\n+ * if x[inode.split_dim]<inode.split:\n+ * near = inode.less\n+ * far = inode.greater # <<<<<<<<<<<<<<\n+ * else:\n+ * near = inode.greater\n+ *\/\n+ __pyx_v_far = __pyx_v_inode->greater;\n+ goto __pyx_L29;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":709\n+ * far = inode.greater\n+ * else:\n+ * near = inode.greater # <<<<<<<<<<<<<<\n+ * far = inode.less\n+ * \n+ *\/\n+ __pyx_v_near = __pyx_v_inode->greater;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":710\n+ * else:\n+ * near = inode.greater\n+ * far = inode.less # <<<<<<<<<<<<<<\n+ * \n+ * # near child is at the same distance as the current node\n+ *\/\n+ __pyx_v_far = __pyx_v_inode->less;\n+ }\n+ __pyx_L29:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":715\n+ * # we're going here next, so no point pushing it on the queue\n+ * # no need to recompute the distance or the side_distances\n+ * inf.node = near # <<<<<<<<<<<<<<\n+ * \n+ * # far child is further by an amount depending only\n+ *\/\n+ __pyx_v_inf->node = __pyx_v_near;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":720\n+ * # on the split value; compute its distance and side_distances\n+ * # and push it on the queue if it's near enough\n+ * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if inf2 == <nodeinfo*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_inf2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t))))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":721\n+ * # and push it on the queue if it's near enough\n+ * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))\n+ * if inf2 == <nodeinfo*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_5 = (__pyx_v_inf2 == ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL));\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":722\n+ * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(np.float64_t))\n+ * if inf2 == <nodeinfo*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * it2.contents.ptrdata = <char*> inf2\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 722; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L30;\n+ }\n+ __pyx_L30:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":724\n+ * raise MemoryError\n+ * \n+ * it2.contents.ptrdata = <char*> inf2 # <<<<<<<<<<<<<<\n+ * inf2.node = far\n+ * # most side distances unchanged\n+ *\/\n+ __pyx_v_it2.contents.ptrdata = ((char *)__pyx_v_inf2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":725\n+ * \n+ * it2.contents.ptrdata = <char*> inf2\n+ * inf2.node = far # <<<<<<<<<<<<<<\n+ * # most side distances unchanged\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_inf2->node = __pyx_v_far;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":727\n+ * inf2.node = far\n+ * # most side distances unchanged\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * inf2.side_distances[i] = inf.side_distances[i]\n+ * \n+ *\/\n+ __pyx_t_3 = __pyx_v_self->m;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":728\n+ * # most side distances unchanged\n+ * for i in range(self.m):\n+ * inf2.side_distances[i] = inf.side_distances[i] # <<<<<<<<<<<<<<\n+ * \n+ * # one side distance changes\n+ *\/\n+ (__pyx_v_inf2->side_distances[__pyx_v_i]) = (__pyx_v_inf->side_distances[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":732\n+ * # one side distance changes\n+ * # we can adjust the minimum distance without recomputing\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * # we never use side_distances in the l_infinity case\n+ * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n+ *\/\n+ __pyx_t_5 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":735\n+ * # we never use side_distances in the l_infinity case\n+ * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n+ * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim])) # <<<<<<<<<<<<<<\n+ * elif p == 1:\n+ * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n+ *\/\n+ __pyx_v_far_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_distance, __pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))));\n+ goto __pyx_L33;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":736\n+ * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n+ * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))\n+ * elif p == 1: # <<<<<<<<<<<<<<\n+ * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n+ * far_min_distance = min_distance - \\\n+ *\/\n+ __pyx_t_5 = (__pyx_v_p == 1.0);\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":737\n+ * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))\n+ * elif p == 1:\n+ * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim]) # <<<<<<<<<<<<<<\n+ * far_min_distance = min_distance - \\\n+ * inf.side_distances[inode.split_dim] + \\\n+ *\/\n+ (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = __pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim])));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":740\n+ * far_min_distance = min_distance - \\\n+ * inf.side_distances[inode.split_dim] + \\\n+ * inf2.side_distances[inode.split_dim] # <<<<<<<<<<<<<<\n+ * else:\n+ * inf2.side_distances[inode.split_dim] = dabs(inode.split -\n+ *\/\n+ __pyx_v_far_min_distance = ((__pyx_v_min_distance - (__pyx_v_inf->side_distances[__pyx_v_inode->split_dim])) + (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]));\n+ goto __pyx_L33;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":742\n+ * inf2.side_distances[inode.split_dim]\n+ * else:\n+ * inf2.side_distances[inode.split_dim] = dabs(inode.split - # <<<<<<<<<<<<<<\n+ * x[inode.split_dim])**p\n+ * far_min_distance = min_distance - \\\n+ *\/\n+ (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = pow(__pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))), __pyx_v_p);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":746\n+ * far_min_distance = min_distance - \\\n+ * inf.side_distances[inode.split_dim] + \\\n+ * inf2.side_distances[inode.split_dim] # <<<<<<<<<<<<<<\n+ * \n+ * it2.priority = far_min_distance\n+ *\/\n+ __pyx_v_far_min_distance = ((__pyx_v_min_distance - (__pyx_v_inf->side_distances[__pyx_v_inode->split_dim])) + (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]));\n+ }\n+ __pyx_L33:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":748\n+ * inf2.side_distances[inode.split_dim]\n+ * \n+ * it2.priority = far_min_distance # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_v_it2.priority = __pyx_v_far_min_distance;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":752\n+ * \n+ * # far child might be too far, if so, don't bother pushing it\n+ * if far_min_distance<=distance_upper_bound*epsfac: # <<<<<<<<<<<<<<\n+ * heappush(&q,it2)\n+ * else:\n+ *\/\n+ __pyx_t_5 = (__pyx_v_far_min_distance <= (__pyx_v_distance_upper_bound * __pyx_v_epsfac));\n+ if (__pyx_t_5) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":753\n+ * # far child might be too far, if so, don't bother pushing it\n+ * if far_min_distance<=distance_upper_bound*epsfac:\n+ * heappush(&q,it2) # <<<<<<<<<<<<<<\n+ * else:\n+ * stdlib.free(inf2)\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappush((&__pyx_v_q), __pyx_v_it2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 753; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L34;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":755\n+ * heappush(&q,it2)\n+ * else:\n+ * stdlib.free(inf2) # <<<<<<<<<<<<<<\n+ * inf2 = <nodeinfo*> NULL\n+ * # just in case\n+ *\/\n+ free(__pyx_v_inf2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":756\n+ * else:\n+ * stdlib.free(inf2)\n+ * inf2 = <nodeinfo*> NULL # <<<<<<<<<<<<<<\n+ * # just in case\n+ * it2.contents.ptrdata = <char*> NULL\n+ *\/\n+ __pyx_v_inf2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":758\n+ * inf2 = <nodeinfo*> NULL\n+ * # just in case\n+ * it2.contents.ptrdata = <char*> NULL # <<<<<<<<<<<<<<\n+ * \n+ * # fill output arrays with sorted neighbors\n+ *\/\n+ __pyx_v_it2.contents.ptrdata = ((char *)NULL);\n+ }\n+ __pyx_L34:;\n+ }\n+ __pyx_L19:;\n+ }\n+ __pyx_L18_break:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":761\n+ * \n+ * # fill output arrays with sorted neighbors\n+ * for i in range(neighbors.n-1,-1,-1): # <<<<<<<<<<<<<<\n+ * heappop(&neighbors, &neighbor) # FIXME: neighbors may be realloced\n+ * result_indices[i] = neighbor.contents.intdata\n+ *\/\n+ for (__pyx_t_3 = (__pyx_v_neighbors.n - 1); __pyx_t_3 > -1; __pyx_t_3-=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":762\n+ * # fill output arrays with sorted neighbors\n+ * for i in range(neighbors.n-1,-1,-1):\n+ * heappop(&neighbors, &neighbor) # FIXME: neighbors may be realloced # <<<<<<<<<<<<<<\n+ * result_indices[i] = neighbor.contents.intdata\n+ * if p==1 or p==infinity:\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappop((&__pyx_v_neighbors), (&__pyx_v_neighbor)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":763\n+ * for i in range(neighbors.n-1,-1,-1):\n+ * heappop(&neighbors, &neighbor) # FIXME: neighbors may be realloced\n+ * result_indices[i] = neighbor.contents.intdata # <<<<<<<<<<<<<<\n+ * if p==1 or p==infinity:\n+ * result_distances[i] = -neighbor.priority\n+ *\/\n+ (__pyx_v_result_indices[__pyx_v_i]) = __pyx_v_neighbor.contents.intdata;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":764\n+ * heappop(&neighbors, &neighbor) # FIXME: neighbors may be realloced\n+ * result_indices[i] = neighbor.contents.intdata\n+ * if p==1 or p==infinity: # <<<<<<<<<<<<<<\n+ * result_distances[i] = -neighbor.priority\n * else:\n- * it = heappop(&q)\n- * inf = <nodeinfo*>it.contents.ptrdata # <<<<<<<<<<<<<<\n- * min_distance = it.priority\n- * else:\n- *\/\n- __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)__pyx_v_it.contents.ptrdata);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":578\n- * it = heappop(&q)\n- * inf = <nodeinfo*>it.contents.ptrdata\n- * min_distance = it.priority # <<<<<<<<<<<<<<\n- * else:\n- * inode = <innernode*>inf.node\n- *\/\n- __pyx_v_min_distance = __pyx_v_it.priority;\n+ *\/\n+ __pyx_t_5 = (__pyx_v_p == 1.0);\n+ if (!__pyx_t_5) {\n+ __pyx_t_6 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ __pyx_t_2 = __pyx_t_6;\n+ } else {\n+ __pyx_t_2 = __pyx_t_5;\n }\n- __pyx_L21:;\n- goto __pyx_L15;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":580\n- * min_distance = it.priority\n- * else:\n- * inode = <innernode*>inf.node # <<<<<<<<<<<<<<\n- * \n- * # we don't push cells that are too far onto the queue at all,\n- *\/\n- __pyx_v_inode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)__pyx_v_inf->node);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":585\n- * # but since the distance_upper_bound decreases, we might get\n- * # here even if the cell's too far\n- * if min_distance>distance_upper_bound*epsfac: # <<<<<<<<<<<<<<\n- * # since this is the nearest cell, we're done, bail out\n- * stdlib.free(inf)\n- *\/\n- __pyx_t_5 = (__pyx_v_min_distance > (__pyx_v_distance_upper_bound * __pyx_v_epsfac));\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":587\n- * if min_distance>distance_upper_bound*epsfac:\n- * # since this is the nearest cell, we're done, bail out\n- * stdlib.free(inf) # <<<<<<<<<<<<<<\n- * # free all the nodes still on the heap\n- * for i in range(q.n):\n- *\/\n- free(__pyx_v_inf);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":589\n- * stdlib.free(inf)\n- * # free all the nodes still on the heap\n- * for i in range(q.n): # <<<<<<<<<<<<<<\n- * stdlib.free(q.heap[i].contents.ptrdata)\n- * break\n- *\/\n- __pyx_t_2 = __pyx_v_q.n;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":590\n- * # free all the nodes still on the heap\n- * for i in range(q.n):\n- * stdlib.free(q.heap[i].contents.ptrdata) # <<<<<<<<<<<<<<\n- * break\n- * \n- *\/\n- free((__pyx_v_q.heap[__pyx_v_i]).contents.ptrdata);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":591\n- * for i in range(q.n):\n- * stdlib.free(q.heap[i].contents.ptrdata)\n- * break # <<<<<<<<<<<<<<\n- * \n- * # set up children for searching\n- *\/\n- goto __pyx_L14_break;\n- goto __pyx_L22;\n- }\n- __pyx_L22:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":594\n- * \n- * # set up children for searching\n- * if x[inode.split_dim]<inode.split: # <<<<<<<<<<<<<<\n- * near = inode.less\n- * far = inode.greater\n- *\/\n- __pyx_t_5 = ((__pyx_v_x[__pyx_v_inode->split_dim]) < __pyx_v_inode->split);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":595\n- * # set up children for searching\n- * if x[inode.split_dim]<inode.split:\n- * near = inode.less # <<<<<<<<<<<<<<\n- * far = inode.greater\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":765\n+ * result_indices[i] = neighbor.contents.intdata\n+ * if p==1 or p==infinity:\n+ * result_distances[i] = -neighbor.priority # <<<<<<<<<<<<<<\n * else:\n- *\/\n- __pyx_v_near = __pyx_v_inode->less;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":596\n- * if x[inode.split_dim]<inode.split:\n- * near = inode.less\n- * far = inode.greater # <<<<<<<<<<<<<<\n- * else:\n- * near = inode.greater\n- *\/\n- __pyx_v_far = __pyx_v_inode->greater;\n- goto __pyx_L25;\n+ * result_distances[i] = (-neighbor.priority)**(1.\/p)\n+ *\/\n+ (__pyx_v_result_distances[__pyx_v_i]) = (-__pyx_v_neighbor.priority);\n+ goto __pyx_L37;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":598\n- * far = inode.greater\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":767\n+ * result_distances[i] = -neighbor.priority\n * else:\n- * near = inode.greater # <<<<<<<<<<<<<<\n- * far = inode.less\n- * \n- *\/\n- __pyx_v_near = __pyx_v_inode->greater;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":599\n- * else:\n- * near = inode.greater\n- * far = inode.less # <<<<<<<<<<<<<<\n- * \n- * # near child is at the same distance as the current node\n- *\/\n- __pyx_v_far = __pyx_v_inode->less;\n+ * result_distances[i] = (-neighbor.priority)**(1.\/p) # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ if (unlikely(__pyx_v_p == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ }\n+ (__pyx_v_result_distances[__pyx_v_i]) = pow((-__pyx_v_neighbor.priority), (1. \/ __pyx_v_p));\n }\n- __pyx_L25:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":604\n- * # we're going here next, so no point pushing it on the queue\n- * # no need to recompute the distance or the side_distances\n- * inf.node = near # <<<<<<<<<<<<<<\n- * \n- * # far child is further by an amount depending only\n- *\/\n- __pyx_v_inf->node = __pyx_v_near;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":609\n- * # on the split value; compute its distance and side_distances\n- * # and push it on the queue if it's near enough\n- * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double)) # <<<<<<<<<<<<<<\n- * it2.contents.ptrdata = <char*> inf2\n- * inf2.node = far\n- *\/\n- __pyx_v_inf2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)malloc(((sizeof(struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo)) + (__pyx_v_self->m * (sizeof(double))))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":610\n- * # and push it on the queue if it's near enough\n- * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double))\n- * it2.contents.ptrdata = <char*> inf2 # <<<<<<<<<<<<<<\n- * inf2.node = far\n- * # most side distances unchanged\n- *\/\n- __pyx_v_it2.contents.ptrdata = ((char *)__pyx_v_inf2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":611\n- * inf2 = <nodeinfo*>stdlib.malloc(sizeof(nodeinfo)+self.m*sizeof(double))\n- * it2.contents.ptrdata = <char*> inf2\n- * inf2.node = far # <<<<<<<<<<<<<<\n- * # most side distances unchanged\n- * for i in range(self.m):\n- *\/\n- __pyx_v_inf2->node = __pyx_v_far;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":613\n- * inf2.node = far\n- * # most side distances unchanged\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * inf2.side_distances[i] = inf.side_distances[i]\n- * \n- *\/\n- __pyx_t_2 = __pyx_v_self->m;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":614\n- * # most side distances unchanged\n- * for i in range(self.m):\n- * inf2.side_distances[i] = inf.side_distances[i] # <<<<<<<<<<<<<<\n- * \n- * # one side distance changes\n- *\/\n- (__pyx_v_inf2->side_distances[__pyx_v_i]) = (__pyx_v_inf->side_distances[__pyx_v_i]);\n+ __pyx_L37:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":770\n+ * \n+ * \n+ * inf = inf2 = <nodeinfo*> NULL # <<<<<<<<<<<<<<\n+ * \n+ * finally:\n+ *\/\n+ __pyx_v_inf = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+ __pyx_v_inf2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":774\n+ * finally:\n+ * \n+ * if inf2 != <nodeinfo*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(inf2)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L5;\n+ __pyx_L4: {\n+ __pyx_why = 4;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+ __pyx_t_2 = (__pyx_v_inf2 != ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL));\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":775\n+ * \n+ * if inf2 != <nodeinfo*> NULL:\n+ * stdlib.free(inf2) # <<<<<<<<<<<<<<\n+ * \n+ * if inf != <nodeinfo*> NULL:\n+ *\/\n+ free(__pyx_v_inf2);\n+ goto __pyx_L39;\n+ }\n+ __pyx_L39:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":777\n+ * stdlib.free(inf2)\n+ * \n+ * if inf != <nodeinfo*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(inf)\n+ * try:\n+ *\/\n+ __pyx_t_2 = (__pyx_v_inf != ((struct __pyx_t_5scipy_7spatial_7ckdtree_nodeinfo *)NULL));\n+ if (__pyx_t_2) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":778\n+ * \n+ * if inf != <nodeinfo*> NULL:\n+ * stdlib.free(inf) # <<<<<<<<<<<<<<\n+ * try:\n+ * heapdestroy(&q)\n+ *\/\n+ free(__pyx_v_inf);\n+ goto __pyx_L40;\n+ }\n+ __pyx_L40:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":779\n+ * if inf != <nodeinfo*> NULL:\n+ * stdlib.free(inf)\n+ * try: # <<<<<<<<<<<<<<\n+ * heapdestroy(&q)\n+ * finally:\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":780\n+ * stdlib.free(inf)\n+ * try:\n+ * heapdestroy(&q) # <<<<<<<<<<<<<<\n+ * finally:\n+ * heapdestroy(&neighbors)\n+ *\/\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy((&__pyx_v_q)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; __pyx_clineno = __LINE__; goto __pyx_L42;}\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":782\n+ * heapdestroy(&q)\n+ * finally:\n+ * heapdestroy(&neighbors) # <<<<<<<<<<<<<<\n+ * \n+ * return 0\n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L43;\n+ __pyx_L42: {\n+ __pyx_why = 4;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L43;\n }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":618\n- * # one side distance changes\n- * # we can adjust the minimum distance without recomputing\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * # we never use side_distances in the l_infinity case\n- * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- *\/\n- __pyx_t_5 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":621\n- * # we never use side_distances in the l_infinity case\n- * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim])) # <<<<<<<<<<<<<<\n- * elif p == 1:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- *\/\n- __pyx_v_far_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_dmax(__pyx_v_min_distance, __pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))));\n- goto __pyx_L28;\n+ __pyx_L43:;\n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy((&__pyx_v_neighbors)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L44_error;}\n+ goto __pyx_L45;\n+ __pyx_L44_error:;\n+ if (__pyx_why == 4) {\n+ Py_XDECREF(__pyx_exc_type);\n+ Py_XDECREF(__pyx_exc_value);\n+ Py_XDECREF(__pyx_exc_tb);\n }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":622\n- * # inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))\n- * elif p == 1: # <<<<<<<<<<<<<<\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim]\n- *\/\n- __pyx_t_5 = (__pyx_v_p == 1.0);\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":623\n- * far_min_distance = dmax(min_distance, dabs(inode.split-x[inode.split_dim]))\n- * elif p == 1:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim]) # <<<<<<<<<<<<<<\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim]\n- * else:\n- *\/\n- (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = __pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim])));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":624\n- * elif p == 1:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim] # <<<<<<<<<<<<<<\n- * else:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])**p\n- *\/\n- __pyx_v_far_min_distance = ((__pyx_v_min_distance - (__pyx_v_inf->side_distances[__pyx_v_inode->split_dim])) + (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]));\n- goto __pyx_L28;\n+ goto __pyx_L38_error;\n+ __pyx_L45:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L38_error;\n+ }\n }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":626\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim]\n- * else:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])**p # <<<<<<<<<<<<<<\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim]\n- * \n- *\/\n- (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]) = pow(__pyx_f_5scipy_7spatial_7ckdtree_dabs((__pyx_v_inode->split - (__pyx_v_x[__pyx_v_inode->split_dim]))), __pyx_v_p);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":627\n- * else:\n- * inf2.side_distances[inode.split_dim] = dabs(inode.split-x[inode.split_dim])**p\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim] # <<<<<<<<<<<<<<\n- * \n- * it2.priority = far_min_distance\n- *\/\n- __pyx_v_far_min_distance = ((__pyx_v_min_distance - (__pyx_v_inf->side_distances[__pyx_v_inode->split_dim])) + (__pyx_v_inf2->side_distances[__pyx_v_inode->split_dim]));\n+ }\n+ goto __pyx_L46;\n+ __pyx_L38_error:;\n+ if (__pyx_why == 4) {\n+ Py_XDECREF(__pyx_exc_type);\n+ Py_XDECREF(__pyx_exc_value);\n+ Py_XDECREF(__pyx_exc_tb);\n+ }\n+ goto __pyx_L1_error;\n+ __pyx_L46:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n }\n- __pyx_L28:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":629\n- * far_min_distance = min_distance - inf.side_distances[inode.split_dim] + inf2.side_distances[inode.split_dim]\n- * \n- * it2.priority = far_min_distance # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __pyx_v_it2.priority = __pyx_v_far_min_distance;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":633\n- * \n- * # far child might be too far, if so, don't bother pushing it\n- * if far_min_distance<=distance_upper_bound*epsfac: # <<<<<<<<<<<<<<\n- * heappush(&q,it2)\n- * else:\n- *\/\n- __pyx_t_5 = (__pyx_v_far_min_distance <= (__pyx_v_distance_upper_bound * __pyx_v_epsfac));\n- if (__pyx_t_5) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":634\n- * # far child might be too far, if so, don't bother pushing it\n- * if far_min_distance<=distance_upper_bound*epsfac:\n- * heappush(&q,it2) # <<<<<<<<<<<<<<\n- * else:\n- * stdlib.free(inf2)\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heappush((&__pyx_v_q), __pyx_v_it2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- goto __pyx_L29;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":636\n- * heappush(&q,it2)\n- * else:\n- * stdlib.free(inf2) # <<<<<<<<<<<<<<\n- * # just in case\n- * it2.contents.ptrdata = <char*> 0\n- *\/\n- free(__pyx_v_inf2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":638\n- * stdlib.free(inf2)\n- * # just in case\n- * it2.contents.ptrdata = <char*> 0 # <<<<<<<<<<<<<<\n- * \n- * # fill output arrays with sorted neighbors\n- *\/\n- __pyx_v_it2.contents.ptrdata = ((char *)0);\n- }\n- __pyx_L29:;\n- }\n- __pyx_L15:;\n+ }\n }\n- __pyx_L14_break:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":641\n- * \n- * # fill output arrays with sorted neighbors\n- * for i in range(neighbors.n-1,-1,-1): # <<<<<<<<<<<<<<\n- * neighbor = heappop(&neighbors) # FIXME: neighbors may be realloced\n- * result_indices[i] = neighbor.contents.intdata\n- *\/\n- for (__pyx_t_2 = (__pyx_v_neighbors.n - 1); __pyx_t_2 > -1; __pyx_t_2-=1) {\n- __pyx_v_i = __pyx_t_2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":642\n- * # fill output arrays with sorted neighbors\n- * for i in range(neighbors.n-1,-1,-1):\n- * neighbor = heappop(&neighbors) # FIXME: neighbors may be realloced # <<<<<<<<<<<<<<\n- * result_indices[i] = neighbor.contents.intdata\n- * if p==1 or p==infinity:\n- *\/\n- __pyx_v_neighbor = __pyx_f_5scipy_7spatial_7ckdtree_heappop((&__pyx_v_neighbors));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":643\n- * for i in range(neighbors.n-1,-1,-1):\n- * neighbor = heappop(&neighbors) # FIXME: neighbors may be realloced\n- * result_indices[i] = neighbor.contents.intdata # <<<<<<<<<<<<<<\n- * if p==1 or p==infinity:\n- * result_distances[i] = -neighbor.priority\n- *\/\n- (__pyx_v_result_indices[__pyx_v_i]) = __pyx_v_neighbor.contents.intdata;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":644\n- * neighbor = heappop(&neighbors) # FIXME: neighbors may be realloced\n- * result_indices[i] = neighbor.contents.intdata\n- * if p==1 or p==infinity: # <<<<<<<<<<<<<<\n- * result_distances[i] = -neighbor.priority\n- * else:\n- *\/\n- __pyx_t_5 = (__pyx_v_p == 1.0);\n- if (!__pyx_t_5) {\n- __pyx_t_6 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- __pyx_t_4 = __pyx_t_6;\n- } else {\n- __pyx_t_4 = __pyx_t_5;\n- }\n- if (__pyx_t_4) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":645\n- * result_indices[i] = neighbor.contents.intdata\n- * if p==1 or p==infinity:\n- * result_distances[i] = -neighbor.priority # <<<<<<<<<<<<<<\n- * else:\n- * result_distances[i] = (-neighbor.priority)**(1.\/p)\n- *\/\n- (__pyx_v_result_distances[__pyx_v_i]) = (-__pyx_v_neighbor.priority);\n- goto __pyx_L32;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":647\n- * result_distances[i] = -neighbor.priority\n- * else:\n- * result_distances[i] = (-neighbor.priority)**(1.\/p) # <<<<<<<<<<<<<<\n- * \n- * heapdestroy(&q)\n- *\/\n- if (unlikely(__pyx_v_p == 0)) {\n- PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 647; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- (__pyx_v_result_distances[__pyx_v_i]) = pow((-__pyx_v_neighbor.priority), (1. \/ __pyx_v_p));\n- }\n- __pyx_L32:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":649\n- * result_distances[i] = (-neighbor.priority)**(1.\/p)\n- * \n- * heapdestroy(&q) # <<<<<<<<<<<<<<\n- * heapdestroy(&neighbors)\n- * \n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy((&__pyx_v_q)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 649; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":650\n- * \n- * heapdestroy(&q)\n- * heapdestroy(&neighbors) # <<<<<<<<<<<<<<\n- * \n- * def query(cKDTree self, object x, int k=1, double eps=0, double p=2,\n- *\/\n- __pyx_t_1 = __pyx_f_5scipy_7spatial_7ckdtree_heapdestroy((&__pyx_v_neighbors)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":784\n+ * heapdestroy(&neighbors)\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n \/* Python wrapper *\/\n@@ -6040,10 +6743,10 @@\n static char __pyx_doc_5scipy_7spatial_7ckdtree_7cKDTree_4query[] = \"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\\n \\n Query the kd-tree for nearest neighbors\\n\\n Parameters\\n ----------\\n x : array_like, last dimension self.m\\n An array of points to query.\\n k : integer\\n The number of nearest neighbors to return.\\n eps : non-negative float\\n Return approximate nearest neighbors; the kth returned value \\n is guaranteed to be no further than (1+eps) times the \\n distance to the real k-th nearest neighbor.\\n p : float, 1<=p<=infinity\\n Which Minkowski p-norm to use. \\n 1 is the sum-of-absolute-values \\\"Manhattan\\\" distance\\n 2 is the usual Euclidean distance\\n infinity is the maximum-coordinate-difference distance\\n distance_upper_bound : nonnegative float\\n Return only neighbors within this distance. This is used to prune\\n tree searches, so if you are doing a series of nearest-neighbor\\n queries, it may help to supply the distance to the nearest neighbor\\n of the most recent point.\\n\\n Returns\\n -------\\n d : array of floats\\n The distances to the nearest neighbors. \\n If x has shape tuple+(self.m,), then d has shape tuple+(k,).\\n Missing neighbors are indicated with infinite distances.\\n i : ndarray of ints\\n The locations of the neighbors in self.data.\\n If `x` has shape tuple+(self.m,), then `i` has shape tuple+(k,).\\n Missing neighbors are indicated with self.n.\\n\\n \";\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_5query(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_x = 0;\n- int __pyx_v_k;\n- double __pyx_v_eps;\n- double __pyx_v_p;\n- double __pyx_v_distance_upper_bound;\n+ npy_intp __pyx_v_k;\n+ __pyx_t_5numpy_float64_t __pyx_v_eps;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_distance_upper_bound;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__x,&__pyx_n_s__k,&__pyx_n_s__eps,&__pyx_n_s__p,&__pyx_n_s_4,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -6090,27 +6793,35 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[1]) {\n } else {\n- __pyx_v_k = ((int)1);\n+ __pyx_v_k = ((npy_intp)1);\n }\n if (values[2]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":652\n- * heapdestroy(&neighbors)\n- * \n- * def query(cKDTree self, object x, int k=1, double eps=0, double p=2, # <<<<<<<<<<<<<<\n- * double distance_upper_bound=infinity):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":787\n+ * \n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0, # <<<<<<<<<<<<<<\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity):\n * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n *\/\n- __pyx_v_eps = ((double)0.0);\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n if (values[3]) {\n } else {\n- __pyx_v_p = ((double)2.0);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":788\n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0,\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity): # <<<<<<<<<<<<<<\n+ * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n+ * \n+ *\/\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.0);\n }\n if (values[4]) {\n } else {\n@@ -6129,29 +6840,45 @@\n }\n __pyx_v_x = values[0];\n if (values[1]) {\n- __pyx_v_k = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_k == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_k = __Pyx_PyInt_from_py_Py_intptr_t(values[1]); if (unlikely((__pyx_v_k == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_k = ((int)1);\n+ __pyx_v_k = ((npy_intp)1);\n }\n if (values[2]) {\n- __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_eps = ((double)0.0);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":787\n+ * \n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0, # <<<<<<<<<<<<<<\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity):\n+ * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n+ *\/\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n if (values[3]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.0);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":788\n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0,\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity): # <<<<<<<<<<<<<<\n+ * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n+ * \n+ *\/\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.0);\n }\n if (values[4]) {\n- __pyx_v_distance_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_distance_upper_bound == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_distance_upper_bound = __pyx_PyFloat_AsDouble(values[4]); if (unlikely((__pyx_v_distance_upper_bound == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n __pyx_v_distance_upper_bound = __pyx_k_5;\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"query\", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query\", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.query\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -6162,11 +6889,19 @@\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, int __pyx_v_k, double __pyx_v_eps, double __pyx_v_p, double __pyx_v_distance_upper_bound) {\n+\/* \"scipy\/spatial\/ckdtree.pyx\":787\n+ * \n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0, # <<<<<<<<<<<<<<\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity):\n+ * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n+ *\/\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4query(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, npy_intp __pyx_v_k, __pyx_t_5numpy_float64_t __pyx_v_eps, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_distance_upper_bound) {\n PyArrayObject *__pyx_v_ii = 0;\n PyArrayObject *__pyx_v_dd = 0;\n PyArrayObject *__pyx_v_xx = 0;\n- int __pyx_v_c;\n+ npy_intp __pyx_v_c;\n int __pyx_v_single;\n PyObject *__pyx_v_retshape = NULL;\n PyObject *__pyx_v_n = NULL;\n@@ -6193,9 +6928,10 @@\n PyArrayObject *__pyx_t_13 = NULL;\n PyArrayObject *__pyx_t_14 = NULL;\n long __pyx_t_15;\n- long __pyx_t_16;\n+ npy_intp __pyx_t_16;\n long __pyx_t_17;\n long __pyx_t_18;\n+ long __pyx_t_19;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n@@ -6214,41 +6950,41 @@\n __pyx_pybuffernd_xx.data = NULL;\n __pyx_pybuffernd_xx.rcbuffer = &__pyx_pybuffer_xx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":695\n- * cdef np.ndarray[double, ndim=2] xx\n- * cdef int c\n- * x = np.asarray(x).astype(np.float) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":830\n+ * cdef np.ndarray[np.float64_t, ndim=2] xx\n+ * cdef np.npy_intp c\n+ * x = np.asarray(x).astype(np.float64) # <<<<<<<<<<<<<<\n * if np.shape(x)[-1] != self.m:\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x)))\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * raise ValueError(\"x must consist of vectors of length %d but has\"\n+ *\/\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__asarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__asarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__astype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__astype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__float); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__float64); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n@@ -6256,64 +6992,64 @@\n __pyx_v_x = __pyx_t_2;\n __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":696\n- * cdef int c\n- * x = np.asarray(x).astype(np.float)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":831\n+ * cdef np.npy_intp c\n+ * x = np.asarray(x).astype(np.float64)\n * if np.shape(x)[-1] != self.m: # <<<<<<<<<<<<<<\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x)))\n- * if p<1:\n- *\/\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * raise ValueError(\"x must consist of vectors of length %d but has\"\n+ * \"shape %s\" % (self.m, np.shape(x)))\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_t_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_t_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":697\n- * x = np.asarray(x).astype(np.float)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":833\n * if np.shape(x)[-1] != self.m:\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x))) # <<<<<<<<<<<<<<\n- * if p<1:\n+ * raise ValueError(\"x must consist of vectors of length %d but has\"\n+ * \"shape %s\" % (self.m, np.shape(x))) # <<<<<<<<<<<<<<\n+ * if p < 1:\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\")\n *\/\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n __Pyx_GIVEREF(__pyx_t_3);\n@@ -6321,65 +7057,65 @@\n __Pyx_GIVEREF(__pyx_t_5);\n __pyx_t_3 = 0;\n __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_6), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_6), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_t_5));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_5));\n __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n __Pyx_Raise(__pyx_t_5, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":698\n- * if np.shape(x)[-1] != self.m:\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x)))\n- * if p<1: # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":834\n+ * raise ValueError(\"x must consist of vectors of length %d but has\"\n+ * \"shape %s\" % (self.m, np.shape(x)))\n+ * if p < 1: # <<<<<<<<<<<<<<\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\")\n * if len(x.shape)==1:\n *\/\n __pyx_t_4 = (__pyx_v_p < 1.0);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":699\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x)))\n- * if p<1:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":835\n+ * \"shape %s\" % (self.m, np.shape(x)))\n+ * if p < 1:\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\") # <<<<<<<<<<<<<<\n * if len(x.shape)==1:\n * single = True\n *\/\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_8), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_8), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_Raise(__pyx_t_5, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L4;\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":700\n- * if p<1:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":836\n+ * if p < 1:\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\")\n * if len(x.shape)==1: # <<<<<<<<<<<<<<\n * single = True\n * x = x[np.newaxis,:]\n *\/\n- __pyx_t_5 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_6 = PyObject_Length(__pyx_t_5); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyObject_Length(__pyx_t_5); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_t_4 = (__pyx_t_6 == 1);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":701\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":837\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\")\n * if len(x.shape)==1:\n * single = True # <<<<<<<<<<<<<<\n@@ -6388,19 +7124,19 @@\n *\/\n __pyx_v_single = 1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":702\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":838\n * if len(x.shape)==1:\n * single = True\n * x = x[np.newaxis,:] # <<<<<<<<<<<<<<\n * else:\n * single = False\n *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__newaxis); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__newaxis); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_1);\n@@ -6408,7 +7144,7 @@\n PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_k_slice_9);\n __Pyx_GIVEREF(__pyx_k_slice_9);\n __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_GetItem(__pyx_v_x, ((PyObject *)__pyx_t_5)); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetItem(__pyx_v_x, ((PyObject *)__pyx_t_5)); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n __Pyx_DECREF(__pyx_v_x);\n@@ -6418,7 +7154,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":704\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":840\n * x = x[np.newaxis,:]\n * else:\n * single = False # <<<<<<<<<<<<<<\n@@ -6429,72 +7165,72 @@\n }\n __pyx_L5:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":705\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":841\n * else:\n * single = False\n * retshape = np.shape(x)[:-1] # <<<<<<<<<<<<<<\n * n = np.prod(retshape)\n * xx = np.reshape(x,(n,self.m))\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_PySequence_GetSlice(__pyx_t_3, 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PySequence_GetSlice(__pyx_t_3, 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __pyx_v_retshape = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":706\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":842\n * single = False\n * retshape = np.shape(x)[:-1]\n * n = np.prod(retshape) # <<<<<<<<<<<<<<\n * xx = np.reshape(x,(n,self.m))\n- * xx = np.ascontiguousarray(xx)\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * xx = np.ascontiguousarray(xx,dtype=np.float64)\n+ *\/\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__prod); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__prod); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_retshape);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_retshape);\n __Pyx_GIVEREF(__pyx_v_retshape);\n- __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n __pyx_v_n = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":707\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":843\n * retshape = np.shape(x)[:-1]\n * n = np.prod(retshape)\n * xx = np.reshape(x,(n,self.m)) # <<<<<<<<<<<<<<\n- * xx = np.ascontiguousarray(xx)\n- * dd = np.empty((n,k),dtype=np.float)\n- *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * xx = np.ascontiguousarray(xx,dtype=np.float64)\n+ * dd = np.empty((n,k),dtype=np.float64)\n+ *\/\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__reshape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__reshape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(__pyx_v_n);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_n);\n@@ -6502,7 +7238,7 @@\n PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_5);\n __Pyx_GIVEREF(__pyx_t_5);\n __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_x);\n@@ -6510,19 +7246,19 @@\n PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_t_3));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_7 = ((PyArrayObject *)__pyx_t_3);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_xx.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -6530,42 +7266,52 @@\n }\n }\n __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_xx.diminfo[1].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_xx.diminfo[1].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[1];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_7 = 0;\n __pyx_v_xx = ((PyArrayObject *)__pyx_t_3);\n __pyx_t_3 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":708\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":844\n * n = np.prod(retshape)\n * xx = np.reshape(x,(n,self.m))\n- * xx = np.ascontiguousarray(xx) # <<<<<<<<<<<<<<\n- * dd = np.empty((n,k),dtype=np.float)\n+ * xx = np.ascontiguousarray(xx,dtype=np.float64) # <<<<<<<<<<<<<<\n+ * dd = np.empty((n,k),dtype=np.float64)\n * dd.fill(infinity)\n *\/\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(((PyObject *)__pyx_v_xx));\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_xx));\n __Pyx_GIVEREF(((PyObject *)__pyx_v_xx));\n- __pyx_t_1 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_12 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__float64); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_t_12) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __pyx_t_12 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_7 = ((PyArrayObject *)__pyx_t_1);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ if (!(likely(((__pyx_t_12) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_12, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = ((PyArrayObject *)__pyx_t_12);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_xx.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -6573,63 +7319,63 @@\n }\n }\n __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_xx.diminfo[1].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_xx.diminfo[1].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[1];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_7 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_v_xx));\n- __pyx_v_xx = ((PyArrayObject *)__pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":709\n+ __pyx_v_xx = ((PyArrayObject *)__pyx_t_12);\n+ __pyx_t_12 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":845\n * xx = np.reshape(x,(n,self.m))\n- * xx = np.ascontiguousarray(xx)\n- * dd = np.empty((n,k),dtype=np.float) # <<<<<<<<<<<<<<\n+ * xx = np.ascontiguousarray(xx,dtype=np.float64)\n+ * dd = np.empty((n,k),dtype=np.float64) # <<<<<<<<<<<<<<\n * dd.fill(infinity)\n * ii = np.empty((n,k),dtype='i')\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_12 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_12, __pyx_n_s__empty); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __pyx_t_12 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_k); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(__pyx_v_n);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_n);\n+ __Pyx_GIVEREF(__pyx_v_n);\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_12);\n+ __Pyx_GIVEREF(__pyx_t_12);\n+ __pyx_t_12 = 0;\n+ __pyx_t_12 = PyTuple_New(1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ PyTuple_SET_ITEM(__pyx_t_12, 0, ((PyObject *)__pyx_t_3));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__float64); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_12), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_k); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_INCREF(__pyx_v_n);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_n);\n- __Pyx_GIVEREF(__pyx_v_n);\n- PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_t_5));\n- __Pyx_GIVEREF(((PyObject *)__pyx_t_5));\n- __pyx_t_5 = 0;\n- __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_12 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__float); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__dtype), __pyx_t_12) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- if (!(likely(((__pyx_t_12) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_12, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_13 = ((PyArrayObject *)__pyx_t_12);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_13 = ((PyArrayObject *)__pyx_t_2);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_dd.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dd.rcbuffer->pybuffer, (PyObject*)__pyx_t_13, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dd.rcbuffer->pybuffer, (PyObject*)__pyx_t_13, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dd.rcbuffer->pybuffer, (PyObject*)__pyx_v_dd, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dd.rcbuffer->pybuffer, (PyObject*)__pyx_v_dd, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -6637,78 +7383,78 @@\n }\n }\n __pyx_pybuffernd_dd.diminfo[0].strides = __pyx_pybuffernd_dd.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_dd.diminfo[0].shape = __pyx_pybuffernd_dd.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_dd.diminfo[1].strides = __pyx_pybuffernd_dd.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_dd.diminfo[1].shape = __pyx_pybuffernd_dd.rcbuffer->pybuffer.shape[1];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_13 = 0;\n- __pyx_v_dd = ((PyArrayObject *)__pyx_t_12);\n- __pyx_t_12 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":710\n- * xx = np.ascontiguousarray(xx)\n- * dd = np.empty((n,k),dtype=np.float)\n+ __pyx_v_dd = ((PyArrayObject *)__pyx_t_2);\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":846\n+ * xx = np.ascontiguousarray(xx,dtype=np.float64)\n+ * dd = np.empty((n,k),dtype=np.float64)\n * dd.fill(infinity) # <<<<<<<<<<<<<<\n * ii = np.empty((n,k),dtype='i')\n * ii.fill(self.n)\n *\/\n- __pyx_t_12 = PyObject_GetAttr(((PyObject *)__pyx_v_dd), __pyx_n_s__fill); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_dd), __pyx_n_s__fill); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyFloat_FromDouble(__pyx_v_5scipy_7spatial_7ckdtree_infinity); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_12 = PyTuple_New(1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_5 = PyFloat_FromDouble(__pyx_v_5scipy_7spatial_7ckdtree_infinity); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n- __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_t_12, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":711\n- * dd = np.empty((n,k),dtype=np.float)\n+ PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_12), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":847\n+ * dd = np.empty((n,k),dtype=np.float64)\n * dd.fill(infinity)\n * ii = np.empty((n,k),dtype='i') # <<<<<<<<<<<<<<\n * ii.fill(self.n)\n * for c in range(n):\n *\/\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__empty); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_12 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__empty); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_k); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_v_n);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_n);\n+ __Pyx_GIVEREF(__pyx_v_n);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), ((PyObject *)__pyx_n_s__i)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_t_12, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyInt_FromLong(__pyx_v_k); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_INCREF(__pyx_v_n);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_v_n);\n- __Pyx_GIVEREF(__pyx_v_n);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n- __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_12));\n- __Pyx_GIVEREF(((PyObject *)__pyx_t_12));\n- __pyx_t_12 = 0;\n- __pyx_t_12 = PyDict_New(); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_12));\n- if (PyDict_SetItem(__pyx_t_12, ((PyObject *)__pyx_n_s__dtype), ((PyObject *)__pyx_n_s__i)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n- if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_14 = ((PyArrayObject *)__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_14 = ((PyArrayObject *)__pyx_t_1);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_ii.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_ii.rcbuffer->pybuffer, (PyObject*)__pyx_t_14, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_ii.rcbuffer->pybuffer, (PyObject*)__pyx_t_14, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_ii.rcbuffer->pybuffer, (PyObject*)__pyx_v_ii, &__Pyx_TypeInfo_int, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_ii.rcbuffer->pybuffer, (PyObject*)__pyx_v_ii, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -6716,56 +7462,56 @@\n }\n }\n __pyx_pybuffernd_ii.diminfo[0].strides = __pyx_pybuffernd_ii.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_ii.diminfo[0].shape = __pyx_pybuffernd_ii.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_ii.diminfo[1].strides = __pyx_pybuffernd_ii.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_ii.diminfo[1].shape = __pyx_pybuffernd_ii.rcbuffer->pybuffer.shape[1];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_14 = 0;\n- __pyx_v_ii = ((PyArrayObject *)__pyx_t_3);\n- __pyx_t_3 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":712\n+ __pyx_v_ii = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":848\n * dd.fill(infinity)\n * ii = np.empty((n,k),dtype='i')\n * ii.fill(self.n) # <<<<<<<<<<<<<<\n * for c in range(n):\n * self.__query(\n *\/\n- __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_ii), __pyx_n_s__fill); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_ii), __pyx_n_s__fill); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_12 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":713\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":849\n * ii = np.empty((n,k),dtype='i')\n * ii.fill(self.n)\n * for c in range(n): # <<<<<<<<<<<<<<\n * self.__query(\n- * (<double*>dd.data)+c*k,\n- *\/\n- __pyx_t_15 = __Pyx_PyInt_AsLong(__pyx_v_n); if (unlikely((__pyx_t_15 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_15; __pyx_t_8+=1) {\n- __pyx_v_c = __pyx_t_8;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":721\n+ * (<np.float64_t*>np.PyArray_DATA(dd))+c*k,\n+ *\/\n+ __pyx_t_15 = __Pyx_PyInt_AsLong(__pyx_v_n); if (unlikely((__pyx_t_15 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) {\n+ __pyx_v_c = __pyx_t_16;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":857\n * eps,\n * p,\n * distance_upper_bound) # <<<<<<<<<<<<<<\n * if single:\n * if k==1:\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query(__pyx_v_self, (((double *)__pyx_v_dd->data) + (__pyx_v_c * __pyx_v_k)), (((int *)__pyx_v_ii->data) + (__pyx_v_c * __pyx_v_k)), (((double *)__pyx_v_xx->data) + (__pyx_v_c * __pyx_v_self->m)), __pyx_v_k, __pyx_v_eps, __pyx_v_p, __pyx_v_distance_upper_bound);\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query(__pyx_v_self, (((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_dd))) + (__pyx_v_c * __pyx_v_k)), (((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_v_ii))) + (__pyx_v_c * __pyx_v_k)), (((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_xx))) + (__pyx_v_c * __pyx_v_self->m)), __pyx_v_k, __pyx_v_eps, __pyx_v_p, __pyx_v_distance_upper_bound); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":722\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":858\n * p,\n * distance_upper_bound)\n * if single: # <<<<<<<<<<<<<<\n@@ -6774,7 +7520,7 @@\n *\/\n if (__pyx_v_single) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":723\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":859\n * distance_upper_bound)\n * if single:\n * if k==1: # <<<<<<<<<<<<<<\n@@ -6784,7 +7530,7 @@\n __pyx_t_4 = (__pyx_v_k == 1);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":724\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":860\n * if single:\n * if k==1:\n * return dd[0,0], ii[0,0] # <<<<<<<<<<<<<<\n@@ -6793,55 +7539,55 @@\n *\/\n __Pyx_XDECREF(__pyx_r);\n __pyx_t_15 = 0;\n- __pyx_t_16 = 0;\n+ __pyx_t_17 = 0;\n __pyx_t_8 = -1;\n if (__pyx_t_15 < 0) {\n __pyx_t_15 += __pyx_pybuffernd_dd.diminfo[0].shape;\n if (unlikely(__pyx_t_15 < 0)) __pyx_t_8 = 0;\n } else if (unlikely(__pyx_t_15 >= __pyx_pybuffernd_dd.diminfo[0].shape)) __pyx_t_8 = 0;\n- if (__pyx_t_16 < 0) {\n- __pyx_t_16 += __pyx_pybuffernd_dd.diminfo[1].shape;\n- if (unlikely(__pyx_t_16 < 0)) __pyx_t_8 = 1;\n- } else if (unlikely(__pyx_t_16 >= __pyx_pybuffernd_dd.diminfo[1].shape)) __pyx_t_8 = 1;\n+ if (__pyx_t_17 < 0) {\n+ __pyx_t_17 += __pyx_pybuffernd_dd.diminfo[1].shape;\n+ if (unlikely(__pyx_t_17 < 0)) __pyx_t_8 = 1;\n+ } else if (unlikely(__pyx_t_17 >= __pyx_pybuffernd_dd.diminfo[1].shape)) __pyx_t_8 = 1;\n if (unlikely(__pyx_t_8 != -1)) {\n __Pyx_RaiseBufferIndexError(__pyx_t_8);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n- __pyx_t_12 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(double *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_15, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_16, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_17 = 0;\n+ __pyx_t_2 = PyFloat_FromDouble((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_dd.rcbuffer->pybuffer.buf, __pyx_t_15, __pyx_pybuffernd_dd.diminfo[0].strides, __pyx_t_17, __pyx_pybuffernd_dd.diminfo[1].strides))); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_18 = 0;\n+ __pyx_t_19 = 0;\n __pyx_t_8 = -1;\n- if (__pyx_t_17 < 0) {\n- __pyx_t_17 += __pyx_pybuffernd_ii.diminfo[0].shape;\n- if (unlikely(__pyx_t_17 < 0)) __pyx_t_8 = 0;\n- } else if (unlikely(__pyx_t_17 >= __pyx_pybuffernd_ii.diminfo[0].shape)) __pyx_t_8 = 0;\n if (__pyx_t_18 < 0) {\n- __pyx_t_18 += __pyx_pybuffernd_ii.diminfo[1].shape;\n- if (unlikely(__pyx_t_18 < 0)) __pyx_t_8 = 1;\n- } else if (unlikely(__pyx_t_18 >= __pyx_pybuffernd_ii.diminfo[1].shape)) __pyx_t_8 = 1;\n+ __pyx_t_18 += __pyx_pybuffernd_ii.diminfo[0].shape;\n+ if (unlikely(__pyx_t_18 < 0)) __pyx_t_8 = 0;\n+ } else if (unlikely(__pyx_t_18 >= __pyx_pybuffernd_ii.diminfo[0].shape)) __pyx_t_8 = 0;\n+ if (__pyx_t_19 < 0) {\n+ __pyx_t_19 += __pyx_pybuffernd_ii.diminfo[1].shape;\n+ if (unlikely(__pyx_t_19 < 0)) __pyx_t_8 = 1;\n+ } else if (unlikely(__pyx_t_19 >= __pyx_pybuffernd_ii.diminfo[1].shape)) __pyx_t_8 = 1;\n if (unlikely(__pyx_t_8 != -1)) {\n __Pyx_RaiseBufferIndexError(__pyx_t_8);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n- __pyx_t_5 = PyInt_FromLong((*__Pyx_BufPtrStrided2d(int *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_17, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_18, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_PyInt_to_py_Py_intptr_t((*__Pyx_BufPtrStrided2d(npy_intp *, __pyx_pybuffernd_ii.rcbuffer->pybuffer.buf, __pyx_t_18, __pyx_pybuffernd_ii.diminfo[0].strides, __pyx_t_19, __pyx_pybuffernd_ii.diminfo[1].strides))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n- __pyx_t_12 = 0;\n- __pyx_t_5 = 0;\n- __pyx_r = ((PyObject *)__pyx_t_3);\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_2 = 0;\n __pyx_t_3 = 0;\n+ __pyx_r = ((PyObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n goto __pyx_L0;\n goto __pyx_L9;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":726\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":862\n * return dd[0,0], ii[0,0]\n * else:\n * return dd[0], ii[0] # <<<<<<<<<<<<<<\n@@ -6849,20 +7595,20 @@\n * if k==1:\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_dd), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 726; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_dd), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ii), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = __Pyx_GetItemInt(((PyObject *)__pyx_v_ii), 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 726; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 726; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_3);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);\n __Pyx_GIVEREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_1 = 0;\n __pyx_t_3 = 0;\n- __pyx_t_5 = 0;\n- __pyx_r = ((PyObject *)__pyx_t_12);\n- __pyx_t_12 = 0;\n+ __pyx_r = ((PyObject *)__pyx_t_2);\n+ __pyx_t_2 = 0;\n goto __pyx_L0;\n }\n __pyx_L9:;\n@@ -6870,7 +7616,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":728\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":864\n * return dd[0], ii[0]\n * else:\n * if k==1: # <<<<<<<<<<<<<<\n@@ -6880,7 +7626,7 @@\n __pyx_t_4 = (__pyx_v_k == 1);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":729\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":865\n * else:\n * if k==1:\n * return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape) # <<<<<<<<<<<<<<\n@@ -6888,131 +7634,131 @@\n * return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_12 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__reshape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetItem(((PyObject *)__pyx_v_dd), ((PyObject *)__pyx_k_tuple_10)); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_v_retshape);\n+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_retshape);\n+ __Pyx_GIVEREF(__pyx_v_retshape);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__reshape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetItem(((PyObject *)__pyx_v_ii), ((PyObject *)__pyx_k_tuple_11)); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_12, __pyx_n_s__reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __Pyx_INCREF(__pyx_v_retshape);\n+ PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_v_retshape);\n+ __Pyx_GIVEREF(__pyx_v_retshape);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_12), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_2 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_r = ((PyObject *)__pyx_t_12);\n+ __pyx_t_12 = 0;\n+ goto __pyx_L0;\n+ goto __pyx_L10;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":867\n+ * return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)\n+ * else:\n+ * return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)) # <<<<<<<<<<<<<<\n+ * \n+ * # ----------------\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_12 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_12, __pyx_n_s__reshape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_GetItem(((PyObject *)__pyx_v_dd), ((PyObject *)__pyx_k_tuple_10)); if (!__pyx_t_12) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_12 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_k); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_12);\n+ __Pyx_GIVEREF(__pyx_t_12);\n+ __pyx_t_12 = 0;\n+ __pyx_t_12 = PyNumber_Add(__pyx_v_retshape, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(((PyObject *)__pyx_v_dd));\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_dd));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_v_dd));\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_12);\n+ __Pyx_GIVEREF(__pyx_t_12);\n+ __pyx_t_12 = 0;\n+ __pyx_t_12 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__reshape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_k); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyNumber_Add(__pyx_v_retshape, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_v_ii));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_ii));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_v_ii));\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_12);\n __Pyx_GIVEREF(__pyx_t_12);\n- __Pyx_INCREF(__pyx_v_retshape);\n- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_v_retshape);\n- __Pyx_GIVEREF(__pyx_v_retshape);\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_ii), ((PyObject *)__pyx_k_tuple_11)); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __Pyx_INCREF(__pyx_v_retshape);\n- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_retshape);\n- __Pyx_GIVEREF(__pyx_v_retshape);\n+ __pyx_t_2 = 0;\n+ __pyx_r = ((PyObject *)__pyx_t_3);\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_12 = 0;\n- __pyx_t_3 = 0;\n- __pyx_r = ((PyObject *)__pyx_t_1);\n- __pyx_t_1 = 0;\n- goto __pyx_L0;\n- goto __pyx_L10;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":731\n- * return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape)\n- * else:\n- * return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,)) # <<<<<<<<<<<<<<\n- * \n- * # ----------------\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__reshape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_k); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_12 = PyTuple_New(1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_t_1 = PyNumber_Add(__pyx_v_retshape, ((PyObject *)__pyx_t_12)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_INCREF(((PyObject *)__pyx_v_dd));\n- PyTuple_SET_ITEM(__pyx_t_12, 0, ((PyObject *)__pyx_v_dd));\n- __Pyx_GIVEREF(((PyObject *)__pyx_v_dd));\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_12), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n- __pyx_t_12 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_12, __pyx_n_s__reshape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __pyx_t_12 = PyInt_FromLong(__pyx_v_k); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- __pyx_t_12 = 0;\n- __pyx_t_12 = PyNumber_Add(__pyx_v_retshape, ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_INCREF(((PyObject *)__pyx_v_ii));\n- PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_v_ii));\n- __Pyx_GIVEREF(((PyObject *)__pyx_v_ii));\n- PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- __pyx_t_1 = 0;\n- __pyx_t_12 = 0;\n- __pyx_r = ((PyObject *)__pyx_t_5);\n- __pyx_t_5 = 0;\n goto __pyx_L0;\n }\n __pyx_L10:;\n@@ -7052,51 +7798,53 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":736\n+\/* \"scipy\/spatial\/ckdtree.pyx\":872\n * # query_ball_point\n * # ----------------\n- * cdef void __query_ball_point_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n+ * cdef int __query_ball_point_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n * list results,\n- * innernode* node):\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node) {\n+ * innernode* node) except -1:\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_inode;\n- int __pyx_v_i;\n+ npy_intp __pyx_v_i;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- int __pyx_t_2;\n- int __pyx_t_3;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n PyObject *__pyx_t_4 = NULL;\n int __pyx_t_5;\n+ int __pyx_t_6;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_ball_point_traverse_no_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":741\n- * cdef leafnode* lnode\n- * cdef innernode* inode\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":879\n+ * cdef np.npy_intp i\n+ * \n * if node.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n- * lnode = <leafnode*>node\n+ * lnode = <leafnode*> node\n * for i in range(lnode.start_idx, lnode.end_idx):\n *\/\n __pyx_t_1 = (__pyx_v_node->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":742\n- * cdef innernode* inode\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":880\n+ * \n * if node.split_dim == -1: # leaf node\n- * lnode = <leafnode*>node # <<<<<<<<<<<<<<\n+ * lnode = <leafnode*> node # <<<<<<<<<<<<<<\n * for i in range(lnode.start_idx, lnode.end_idx):\n * results.append(self.raw_indices[i])\n *\/\n __pyx_v_lnode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":743\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":881\n * if node.split_dim == -1: # leaf node\n- * lnode = <leafnode*>node\n+ * lnode = <leafnode*> node\n * for i in range(lnode.start_idx, lnode.end_idx): # <<<<<<<<<<<<<<\n * results.append(self.raw_indices[i])\n * else:\n@@ -7105,26 +7853,26 @@\n for (__pyx_t_3 = __pyx_v_lnode->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":744\n- * lnode = <leafnode*>node\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":882\n+ * lnode = <leafnode*> node\n * for i in range(lnode.start_idx, lnode.end_idx):\n * results.append(self.raw_indices[i]) # <<<<<<<<<<<<<<\n * else:\n * inode = <innernode*>node\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyList_Append(__pyx_v_results, __pyx_t_4); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyList_Append(__pyx_v_results, __pyx_t_4); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n }\n goto __pyx_L3;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":746\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":884\n * results.append(self.raw_indices[i])\n * else:\n * inode = <innernode*>node # <<<<<<<<<<<<<<\n@@ -7133,97 +7881,113 @@\n *\/\n __pyx_v_inode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)__pyx_v_node);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":747\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":885\n * else:\n * inode = <innernode*>node\n * self.__query_ball_point_traverse_no_checking(results, inode.less) # <<<<<<<<<<<<<<\n * self.__query_ball_point_traverse_no_checking(results, inode.greater)\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->less);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":748\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->less); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":886\n * inode = <innernode*>node\n * self.__query_ball_point_traverse_no_checking(results, inode.less)\n * self.__query_ball_point_traverse_no_checking(results, inode.greater) # <<<<<<<<<<<<<<\n * \n- * cdef void __query_ball_point_traverse_checking(cKDTree self,\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->greater);\n+ * return 0\n+ *\/\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->greater); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L3:;\n \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":888\n+ * self.__query_ball_point_traverse_no_checking(results, inode.greater)\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_ball_point_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_ball_point_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":750\n- * self.__query_ball_point_traverse_no_checking(results, inode.greater)\n- * \n- * cdef void __query_ball_point_traverse_checking(cKDTree self, # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":892\n+ * \n+ * \n+ * cdef int __query_ball_point_traverse_checking(cKDTree self, # <<<<<<<<<<<<<<\n * list results,\n * innernode* node,\n *\/\n \n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node, double *__pyx_v_x, double __pyx_v_r, double __pyx_v_p, double __pyx_v_epsfac, double __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, double __pyx_v_min_distance, double __pyx_v_max_distance) {\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node, __pyx_t_5numpy_float64_t *__pyx_v_x, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_epsfac, __pyx_t_5numpy_float64_t __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode;\n struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_inode;\n- int __pyx_v_k;\n- double __pyx_v_save_min;\n- double __pyx_v_save_max;\n- double __pyx_v_part_min_distance;\n- double __pyx_v_part_max_distance;\n- int __pyx_v_i;\n- double __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ npy_intp __pyx_v_k;\n+ npy_intp __pyx_v_i;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n- int __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n- int __pyx_t_5;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ int __pyx_t_6;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_ball_point_traverse_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":764\n- * cdef int k\n- * cdef double save_min, save_max\n- * cdef double part_min_distance = 0., part_max_distance = 0. # <<<<<<<<<<<<<<\n- * \n- * if min_distance > r*epsfac:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":907\n+ * \n+ * cdef np.float64_t save_min, save_max\n+ * cdef np.float64_t part_min_distance = 0., part_max_distance = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t d\n+ * cdef np.npy_intp k, i, j\n *\/\n __pyx_v_part_min_distance = 0.;\n __pyx_v_part_max_distance = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":766\n- * cdef double part_min_distance = 0., part_max_distance = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":911\n+ * cdef np.npy_intp k, i, j\n * \n * if min_distance > r*epsfac: # <<<<<<<<<<<<<<\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac:\n *\/\n __pyx_t_1 = (__pyx_v_min_distance > (__pyx_v_r * __pyx_v_epsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":767\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":912\n * \n * if min_distance > r*epsfac:\n- * return # <<<<<<<<<<<<<<\n+ * return 0 # <<<<<<<<<<<<<<\n * elif max_distance < r*invepsfac:\n * self.__query_ball_point_traverse_no_checking(results, node)\n *\/\n+ __pyx_r = 0;\n goto __pyx_L0;\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":768\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":913\n * if min_distance > r*epsfac:\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac: # <<<<<<<<<<<<<<\n * self.__query_ball_point_traverse_no_checking(results, node)\n * elif node.split_dim == -1: # leaf node\n@@ -7231,18 +7995,18 @@\n __pyx_t_1 = (__pyx_v_max_distance < (__pyx_v_r * __pyx_v_invepsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":769\n- * return\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":914\n+ * return 0\n * elif max_distance < r*invepsfac:\n * self.__query_ball_point_traverse_no_checking(results, node) # <<<<<<<<<<<<<<\n * elif node.split_dim == -1: # leaf node\n * lnode = <leafnode*>node\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 914; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":770\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":915\n * elif max_distance < r*invepsfac:\n * self.__query_ball_point_traverse_no_checking(results, node)\n * elif node.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n@@ -7252,7 +8016,7 @@\n __pyx_t_1 = (__pyx_v_node->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":771\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":916\n * self.__query_ball_point_traverse_no_checking(results, node)\n * elif node.split_dim == -1: # leaf node\n * lnode = <leafnode*>node # <<<<<<<<<<<<<<\n@@ -7261,18 +8025,18 @@\n *\/\n __pyx_v_lnode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":773\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":918\n * lnode = <leafnode*>node\n * # brute-force\n * for i in range(lnode.start_idx, lnode.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_2 = __pyx_v_lnode->end_idx;\n- for (__pyx_t_3 = __pyx_v_lnode->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":776\n+ __pyx_t_3 = __pyx_v_lnode->end_idx;\n+ for (__pyx_t_4 = __pyx_v_lnode->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":921\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n * x, p, self.m, r) # <<<<<<<<<<<<<<\n@@ -7281,7 +8045,7 @@\n *\/\n __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), __pyx_v_x, __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":777\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":922\n * self.raw_data + self.raw_indices[i] * self.m,\n * x, p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -7291,7 +8055,7 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":778\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":923\n * x, p, self.m, r)\n * if d <= r:\n * results.append(self.raw_indices[i]) # <<<<<<<<<<<<<<\n@@ -7299,12 +8063,12 @@\n * inode = <innernode*>node\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyList_Append(__pyx_v_results, __pyx_t_4); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = PyList_Append(__pyx_v_results, __pyx_t_5); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n goto __pyx_L6;\n }\n __pyx_L6:;\n@@ -7313,7 +8077,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":780\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":925\n * results.append(self.raw_indices[i])\n * else:\n * inode = <innernode*>node # <<<<<<<<<<<<<<\n@@ -7322,7 +8086,7 @@\n *\/\n __pyx_v_inode = ((struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *)__pyx_v_node);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":782\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":927\n * inode = <innernode*>node\n * \n * k = inode.split_dim # <<<<<<<<<<<<<<\n@@ -7331,7 +8095,7 @@\n *\/\n __pyx_v_k = __pyx_v_inode->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":783\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":928\n * \n * k = inode.split_dim\n * if p != infinity: # <<<<<<<<<<<<<<\n@@ -7341,7 +8105,7 @@\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":784\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":929\n * k = inode.split_dim\n * if p != infinity:\n * part_min_distance = min_distance - min_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7350,7 +8114,7 @@\n *\/\n __pyx_v_part_min_distance = (__pyx_v_min_distance - __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_k, __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":785\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":930\n * if p != infinity:\n * part_min_distance = min_distance - min_dist_point_interval_p(x, rect, k, p)\n * part_max_distance = max_distance - max_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7362,7 +8126,7 @@\n }\n __pyx_L7:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":789\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":934\n * # Go to box with lesser component along k\n * # less.maxes[k] goes from rect.maxes[k] to inode.split\n * save_max = rect.maxes[k] # <<<<<<<<<<<<<<\n@@ -7371,7 +8135,7 @@\n *\/\n __pyx_v_save_max = (__pyx_v_rect.maxes[__pyx_v_k]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":790\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":935\n * # less.maxes[k] goes from rect.maxes[k] to inode.split\n * save_max = rect.maxes[k]\n * rect.maxes[k] = inode.split # <<<<<<<<<<<<<<\n@@ -7380,7 +8144,7 @@\n *\/\n (__pyx_v_rect.maxes[__pyx_v_k]) = __pyx_v_inode->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":791\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":936\n * save_max = rect.maxes[k]\n * rect.maxes[k] = inode.split\n * if p != infinity: # <<<<<<<<<<<<<<\n@@ -7390,7 +8154,7 @@\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":792\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":937\n * rect.maxes[k] = inode.split\n * if p != infinity:\n * min_distance = part_min_distance + min_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7399,7 +8163,7 @@\n *\/\n __pyx_v_min_distance = (__pyx_v_part_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_k, __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":793\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":938\n * if p != infinity:\n * min_distance = part_min_distance + min_dist_point_interval_p(x, rect, k, p)\n * max_distance = part_max_distance + max_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7411,7 +8175,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":795\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":940\n * max_distance = part_max_distance + max_dist_point_interval_p(x, rect, k, p)\n * else:\n * min_distance = min_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n@@ -7420,7 +8184,7 @@\n *\/\n __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":796\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":941\n * else:\n * min_distance = min_dist_point_rect_p_inf(x, rect)\n * max_distance = max_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n@@ -7431,16 +8195,16 @@\n }\n __pyx_L8:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":801\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":946\n * x, r, p, epsfac, invepsfac,\n * rect,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect.maxes[k] = save_max\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->less, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":802\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->less, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":947\n * rect,\n * min_distance, max_distance)\n * rect.maxes[k] = save_max # <<<<<<<<<<<<<<\n@@ -7449,7 +8213,7 @@\n *\/\n (__pyx_v_rect.maxes[__pyx_v_k]) = __pyx_v_save_max;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":806\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":951\n * # Go to box with greater component along k\n * # greater.mins[k] goes from rect.mins[k] to inode.split\n * save_min = rect.mins[k] # <<<<<<<<<<<<<<\n@@ -7458,7 +8222,7 @@\n *\/\n __pyx_v_save_min = (__pyx_v_rect.mins[__pyx_v_k]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":807\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":952\n * # greater.mins[k] goes from rect.mins[k] to inode.split\n * save_min = rect.mins[k]\n * rect.mins[k] = inode.split # <<<<<<<<<<<<<<\n@@ -7467,7 +8231,7 @@\n *\/\n (__pyx_v_rect.mins[__pyx_v_k]) = __pyx_v_inode->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":808\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":953\n * save_min = rect.mins[k]\n * rect.mins[k] = inode.split\n * if p != infinity: # <<<<<<<<<<<<<<\n@@ -7477,7 +8241,7 @@\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":809\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":954\n * rect.mins[k] = inode.split\n * if p != infinity:\n * min_distance = part_min_distance + min_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7486,7 +8250,7 @@\n *\/\n __pyx_v_min_distance = (__pyx_v_part_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_k, __pyx_v_p));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":810\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":955\n * if p != infinity:\n * min_distance = part_min_distance + min_dist_point_interval_p(x, rect, k, p)\n * max_distance = part_max_distance + max_dist_point_interval_p(x, rect, k, p) # <<<<<<<<<<<<<<\n@@ -7498,7 +8262,7 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":812\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":957\n * max_distance = part_max_distance + max_dist_point_interval_p(x, rect, k, p)\n * else:\n * min_distance = min_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n@@ -7507,7 +8271,7 @@\n *\/\n __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":813\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":958\n * else:\n * min_distance = min_dist_point_rect_p_inf(x, rect)\n * max_distance = max_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n@@ -7518,65 +8282,79 @@\n }\n __pyx_L9:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":818\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":963\n * x, r, p, epsfac, invepsfac,\n * rect,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect.mins[k] = save_min\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->greater, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":819\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_inode->greater, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":964\n * rect,\n * min_distance, max_distance)\n * rect.mins[k] = save_min # <<<<<<<<<<<<<<\n * \n- * cdef list __query_ball_point(cKDTree self,\n+ * return 0\n *\/\n (__pyx_v_rect.mins[__pyx_v_k]) = __pyx_v_save_min;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":966\n+ * rect.mins[k] = save_min\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n }\n __pyx_L3:;\n \n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_ball_point_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_ball_point_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":821\n- * rect.mins[k] = save_min\n+\/* \"scipy\/spatial\/ckdtree.pyx\":969\n+ * \n * \n * cdef list __query_ball_point(cKDTree self, # <<<<<<<<<<<<<<\n- * double* x,\n- * double r,\n- *\/\n-\n-static PyObject *__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, double *__pyx_v_x, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps) {\n+ * np.float64_t* x,\n+ * np.float64_t r,\n+ *\/\n+\n+static PyObject *__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, __pyx_t_5numpy_float64_t *__pyx_v_x, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps) {\n PyObject *__pyx_v_results = 0;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect;\n- double __pyx_v_epsfac;\n- double __pyx_v_invepsfac;\n- double __pyx_v_min_distance;\n- double __pyx_v_max_distance;\n- int __pyx_v_i;\n+ __pyx_t_5numpy_float64_t __pyx_v_epsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_invepsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_distance;\n+ npy_intp __pyx_v_i;\n PyObject *__pyx_r = NULL;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n int __pyx_t_3;\n- double __pyx_t_4;\n- int __pyx_t_5;\n- int __pyx_t_6;\n+ __pyx_t_5numpy_float64_t __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n PyObject *__pyx_t_7 = NULL;\n+ int __pyx_t_8;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_ball_point\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":833\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":983\n * \n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity: # <<<<<<<<<<<<<<\n@@ -7592,7 +8370,7 @@\n }\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":834\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":984\n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity:\n * r = r ** p # <<<<<<<<<<<<<<\n@@ -7604,7 +8382,7 @@\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":837\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":987\n * \n * # fiddle approximation factor\n * if eps == 0: # <<<<<<<<<<<<<<\n@@ -7614,7 +8392,7 @@\n __pyx_t_3 = (__pyx_v_eps == 0.0);\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":838\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":988\n * # fiddle approximation factor\n * if eps == 0:\n * epsfac = 1 # <<<<<<<<<<<<<<\n@@ -7625,7 +8403,7 @@\n goto __pyx_L4;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":839\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":989\n * if eps == 0:\n * epsfac = 1\n * elif p == infinity: # <<<<<<<<<<<<<<\n@@ -7635,7 +8413,7 @@\n __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":840\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":990\n * epsfac = 1\n * elif p == infinity:\n * epsfac = 1\/(1+eps) # <<<<<<<<<<<<<<\n@@ -7645,14 +8423,14 @@\n __pyx_t_4 = (1.0 + __pyx_v_eps);\n if (unlikely(__pyx_t_4 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_4);\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":842\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":992\n * epsfac = 1\/(1+eps)\n * else:\n * epsfac = 1\/(1+eps)**p # <<<<<<<<<<<<<<\n@@ -7662,13 +8440,13 @@\n __pyx_t_4 = pow((1.0 + __pyx_v_eps), __pyx_v_p);\n if (unlikely(__pyx_t_4 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_4);\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":843\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":993\n * else:\n * epsfac = 1\/(1+eps)**p\n * invepsfac = 1\/epsfac # <<<<<<<<<<<<<<\n@@ -7677,193 +8455,308 @@\n *\/\n if (unlikely(__pyx_v_epsfac == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_invepsfac = (1.0 \/ __pyx_v_epsfac);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":846\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":996\n * \n * # Calculate mins and maxes to outer box\n * rect.m = self.m # <<<<<<<<<<<<<<\n- * rect.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n+ * rect.mins = rect.maxes = <np.float64_t*> NULL\n+ * try:\n *\/\n __pyx_v_rect.m = __pyx_v_self->m;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":847\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":997\n * # Calculate mins and maxes to outer box\n * rect.m = self.m\n- * rect.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- *\/\n- __pyx_v_rect.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":848\n+ * rect.mins = rect.maxes = <np.float64_t*> NULL # <<<<<<<<<<<<<<\n+ * try:\n+ * \n+ *\/\n+ __pyx_v_rect.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":998\n * rect.m = self.m\n- * rect.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * rect.mins[i] = self.raw_mins[i]\n- *\/\n- __pyx_v_rect.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":849\n- * rect.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * rect.mins[i] = self.raw_mins[i]\n- * rect.maxes[i] = self.raw_maxes[i]\n- *\/\n- __pyx_t_5 = __pyx_v_self->m;\n- for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n- __pyx_v_i = __pyx_t_6;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":850\n- * rect.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- * rect.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect.maxes[i] = self.raw_maxes[i]\n- * \n- *\/\n- (__pyx_v_rect.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":851\n- * for i in range(self.m):\n- * rect.mins[i] = self.raw_mins[i]\n- * rect.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * \n- * # Computer first min and max distances\n- *\/\n- (__pyx_v_rect.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":854\n- * \n- * # Computer first min and max distances\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * min_distance = min_dist_point_rect_p_inf(x, rect)\n- * max_distance = max_dist_point_rect_p_inf(x, rect)\n- *\/\n- __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":855\n- * # Computer first min and max distances\n- * if p == infinity:\n- * min_distance = min_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n- * max_distance = max_dist_point_rect_p_inf(x, rect)\n- * else:\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":856\n- * if p == infinity:\n- * min_distance = min_dist_point_rect_p_inf(x, rect)\n- * max_distance = max_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n- * else:\n- * min_distance = 0.\n- *\/\n- __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n- goto __pyx_L7;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":858\n- * max_distance = max_dist_point_rect_p_inf(x, rect)\n- * else:\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * max_distance = 0.\n+ * rect.mins = rect.maxes = <np.float64_t*> NULL\n+ * try: # <<<<<<<<<<<<<<\n+ * \n+ * rect.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1000\n+ * try:\n+ * \n+ * rect.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1001\n+ * \n+ * rect.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1002\n+ * rect.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1004\n+ * raise MemoryError\n+ * \n+ * rect.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1005\n+ * \n+ * rect.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1006\n+ * rect.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n * for i in range(self.m):\n *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":859\n- * else:\n- * min_distance = 0.\n- * max_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * min_distance += min_dist_point_interval_p(x, rect, i, p)\n- *\/\n- __pyx_v_max_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":860\n- * min_distance = 0.\n- * max_distance = 0.\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1008\n+ * raise MemoryError\n+ * \n * for i in range(self.m): # <<<<<<<<<<<<<<\n- * min_distance += min_dist_point_interval_p(x, rect, i, p)\n- * max_distance += max_dist_point_interval_p(x, rect, i, p)\n+ * rect.mins[i] = self.raw_mins[i]\n+ * rect.maxes[i] = self.raw_maxes[i]\n *\/\n __pyx_t_5 = __pyx_v_self->m;\n for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n __pyx_v_i = __pyx_t_6;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":861\n- * max_distance = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1009\n+ * \n * for i in range(self.m):\n- * min_distance += min_dist_point_interval_p(x, rect, i, p) # <<<<<<<<<<<<<<\n- * max_distance += max_dist_point_interval_p(x, rect, i, p)\n- * \n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_i, __pyx_v_p));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":862\n+ * rect.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect.maxes[i] = self.raw_maxes[i]\n+ * \n+ *\/\n+ (__pyx_v_rect.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1010\n * for i in range(self.m):\n- * min_distance += min_dist_point_interval_p(x, rect, i, p)\n- * max_distance += max_dist_point_interval_p(x, rect, i, p) # <<<<<<<<<<<<<<\n- * \n- * results = []\n- *\/\n- __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_i, __pyx_v_p));\n- }\n+ * rect.mins[i] = self.raw_mins[i]\n+ * rect.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * \n+ * # Computer first min and max distances\n+ *\/\n+ (__pyx_v_rect.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1013\n+ * \n+ * # Computer first min and max distances\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * min_distance = min_dist_point_rect_p_inf(x, rect)\n+ * max_distance = max_dist_point_rect_p_inf(x, rect)\n+ *\/\n+ __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1014\n+ * # Computer first min and max distances\n+ * if p == infinity:\n+ * min_distance = min_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n+ * max_distance = max_dist_point_rect_p_inf(x, rect)\n+ * else:\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1015\n+ * if p == infinity:\n+ * min_distance = min_dist_point_rect_p_inf(x, rect)\n+ * max_distance = max_dist_point_rect_p_inf(x, rect) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance = 0.\n+ *\/\n+ __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_rect_p_inf(__pyx_v_x, __pyx_v_rect);\n+ goto __pyx_L12;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1017\n+ * max_distance = max_dist_point_rect_p_inf(x, rect)\n+ * else:\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1018\n+ * else:\n+ * min_distance = 0.\n+ * max_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * min_distance += min_dist_point_interval_p(x, rect, i, p)\n+ *\/\n+ __pyx_v_max_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1019\n+ * min_distance = 0.\n+ * max_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * min_distance += min_dist_point_interval_p(x, rect, i, p)\n+ * max_distance += max_dist_point_interval_p(x, rect, i, p)\n+ *\/\n+ __pyx_t_5 = __pyx_v_self->m;\n+ for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n+ __pyx_v_i = __pyx_t_6;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1020\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ * min_distance += min_dist_point_interval_p(x, rect, i, p) # <<<<<<<<<<<<<<\n+ * max_distance += max_dist_point_interval_p(x, rect, i, p)\n+ * \n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_i, __pyx_v_p));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1021\n+ * for i in range(self.m):\n+ * min_distance += min_dist_point_interval_p(x, rect, i, p)\n+ * max_distance += max_dist_point_interval_p(x, rect, i, p) # <<<<<<<<<<<<<<\n+ * \n+ * results = []\n+ *\/\n+ __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_point_interval_p(__pyx_v_x, __pyx_v_rect, __pyx_v_i, __pyx_v_p));\n+ }\n+ }\n+ __pyx_L12:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1023\n+ * max_distance += max_dist_point_interval_p(x, rect, i, p)\n+ * \n+ * results = [] # <<<<<<<<<<<<<<\n+ * self.__query_ball_point_traverse_checking(results, self.tree,\n+ * x, r, p, epsfac, invepsfac,\n+ *\/\n+ __pyx_t_7 = PyList_New(0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_v_results = __pyx_t_7;\n+ __pyx_t_7 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1027\n+ * x, r, p, epsfac, invepsfac,\n+ * rect,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * \n+ * finally:\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; __pyx_clineno = __LINE__; goto __pyx_L6;}\n }\n- __pyx_L7:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":864\n- * max_distance += max_dist_point_interval_p(x, rect, i, p)\n- * \n- * results = [] # <<<<<<<<<<<<<<\n- * self.__query_ball_point_traverse_checking(results, self.tree,\n- * x, r, p, epsfac, invepsfac,\n- *\/\n- __pyx_t_7 = PyList_New(0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_v_results = __pyx_t_7;\n- __pyx_t_7 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":868\n- * x, r, p, epsfac, invepsfac,\n- * rect,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(rect.mins)\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_x, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":870\n- * min_distance, max_distance)\n- * \n- * stdlib.free(rect.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect.maxes)\n- * \n- *\/\n- free(__pyx_v_rect.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":871\n- * \n- * stdlib.free(rect.mins)\n- * stdlib.free(rect.maxes) # <<<<<<<<<<<<<<\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1031\n+ * finally:\n+ * \n+ * if rect.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect.mins)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L7;\n+ __pyx_L6: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+ __pyx_t_3 = (__pyx_v_rect.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1032\n+ * \n+ * if rect.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect.mins);\n+ goto __pyx_L16;\n+ }\n+ __pyx_L16:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1034\n+ * stdlib.free(rect.mins)\n+ * \n+ * if rect.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect.maxes)\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1035\n+ * \n+ * if rect.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect.maxes) # <<<<<<<<<<<<<<\n * \n * return results\n *\/\n- free(__pyx_v_rect.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":873\n- * stdlib.free(rect.maxes)\n+ free(__pyx_v_rect.maxes);\n+ goto __pyx_L17;\n+ }\n+ __pyx_L17:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1037\n+ * stdlib.free(rect.maxes)\n * \n * return results # <<<<<<<<<<<<<<\n * \n- * def query_ball_point(cKDTree self, object x, double r,\n+ * \n *\/\n __Pyx_XDECREF(((PyObject *)__pyx_r));\n __Pyx_INCREF(((PyObject *)__pyx_v_results));\n@@ -7888,9 +8781,9 @@\n static char __pyx_doc_5scipy_7spatial_7ckdtree_7cKDTree_6query_ball_point[] = \"query_ball_point(self, x, r, p, eps)\\n \\n Find all points within distance r of point(s) x.\\n\\n Parameters\\n ----------\\n x : array_like, shape tuple + (self.m,)\\n The point or points to search for neighbors of.\\n r : positive float\\n The radius of points to return.\\n p : float, optional\\n Which Minkowski p-norm to use. Should be in the range [1, inf].\\n eps : nonnegative float, optional\\n Approximate search. Branches of the tree are not explored if their\\n nearest points are further than ``r \/ (1 + eps)``, and branches are\\n added in bulk if their furthest points are nearer than\\n ``r * (1 + eps)``.\\n\\n Returns\\n -------\\n results : list or array of lists\\n If `x` is a single point, returns a list of the indices of the\\n neighbors of `x`. If `x` is an array of points, returns an object\\n array of shape tuple containing lists of neighbors.\\n\\n Notes\\n -----\\n If you have many points whose neighbors you want to find, you may save\\n substantial amounts of time by putting them in a cKDTree and using\\n query_ball_tree.\\n\\n Examples\\n --------\\n >>> from scipy import spatial\\n >>> x, y = np.mgrid[0:4, 0:4]\\n >>> points = zip(x.ravel(), y.ravel())\\n >>> tree = spatial.cKDTree(points)\\n >>> tree.query_ball_point([2, 0], 1)\\n [4, 8, 9, 12]\\n\\n \";\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_7query_ball_point(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_x = 0;\n- double __pyx_v_r;\n- double __pyx_v_p;\n- double __pyx_v_eps;\n+ __pyx_t_5numpy_float64_t __pyx_v_r;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_eps;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__x,&__pyx_n_s__r,&__pyx_n_s__p,&__pyx_n_s__eps,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -7918,7 +8811,7 @@\n values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__r);\n if (likely(values[1])) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"query_ball_point\", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query_ball_point\", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1041; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n case 2:\n if (kw_args > 0) {\n@@ -7932,23 +8825,23 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_ball_point\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_ball_point\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1041; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[2]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":876\n- * \n- * def query_ball_point(cKDTree self, object x, double r,\n- * double p=2., double eps=0): # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1042\n+ * \n+ * def query_ball_point(cKDTree self, object x, np.float64_t r,\n+ * np.float64_t p=2., np.float64_t eps=0): # <<<<<<<<<<<<<<\n * \"\"\"query_ball_point(self, x, r, p, eps)\n * \n *\/\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[3]) {\n } else {\n- __pyx_v_eps = ((double)0.0);\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -7961,21 +8854,21 @@\n }\n }\n __pyx_v_x = values[0];\n- __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1041; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n if (values[2]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[3]) {\n- __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_eps = ((double)0.0);\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"query_ball_point\", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query_ball_point\", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1041; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.query_ball_point\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -7986,15 +8879,15 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":875\n- * return results\n- * \n- * def query_ball_point(cKDTree self, object x, double r, # <<<<<<<<<<<<<<\n- * double p=2., double eps=0):\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1041\n+ * \n+ * \n+ * def query_ball_point(cKDTree self, object x, np.float64_t r, # <<<<<<<<<<<<<<\n+ * np.float64_t p=2., np.float64_t eps=0):\n * \"\"\"query_ball_point(self, x, r, p, eps)\n *\/\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_6query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps) {\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_6query_ball_point(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_x, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps) {\n PyArrayObject *__pyx_v_xx = 0;\n PyObject *__pyx_v_retshape = NULL;\n PyObject *__pyx_v_result = NULL;\n@@ -8008,14 +8901,15 @@\n PyObject *__pyx_t_3 = NULL;\n int __pyx_t_4;\n Py_ssize_t __pyx_t_5;\n- PyArrayObject *__pyx_t_6 = NULL;\n- int __pyx_t_7;\n- PyObject *__pyx_t_8 = NULL;\n- PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyObject *__pyx_t_7 = NULL;\n+ PyArrayObject *__pyx_t_8 = NULL;\n+ int __pyx_t_9;\n PyObject *__pyx_t_10 = NULL;\n PyObject *__pyx_t_11 = NULL;\n PyObject *__pyx_t_12 = NULL;\n PyObject *(*__pyx_t_13)(PyObject *);\n+ PyObject *__pyx_t_14 = NULL;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n@@ -8026,41 +8920,41 @@\n __pyx_pybuffernd_xx.data = NULL;\n __pyx_pybuffernd_xx.rcbuffer = &__pyx_pybuffer_xx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":920\n- * cdef np.ndarray[double, ndim=1] xx\n- * \n- * x = np.asarray(x).astype(np.float) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1086\n+ * cdef np.ndarray[np.float64_t, ndim=1, mode=\"c\"] xx\n+ * \n+ * x = np.asarray(x).astype(np.float64) # <<<<<<<<<<<<<<\n * if x.shape[-1] != self.m:\n * raise ValueError(\"Searching for a %d-dimensional point in a \" \\\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__asarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__asarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__astype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__astype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__float); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__float64); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n@@ -8068,43 +8962,43 @@\n __pyx_v_x = __pyx_t_2;\n __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":921\n- * \n- * x = np.asarray(x).astype(np.float)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1087\n+ * \n+ * x = np.asarray(x).astype(np.float64)\n * if x.shape[-1] != self.m: # <<<<<<<<<<<<<<\n * raise ValueError(\"Searching for a %d-dimensional point in a \" \\\n * \"%d-dimensional KDTree\" % (x.shape[-1], self.m))\n *\/\n- __pyx_t_2 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":923\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1089\n * if x.shape[-1] != self.m:\n * raise ValueError(\"Searching for a %d-dimensional point in a \" \\\n * \"%d-dimensional KDTree\" % (x.shape[-1], self.m)) # <<<<<<<<<<<<<<\n * if len(x.shape) == 1:\n- * xx = np.ascontiguousarray(x)\n- *\/\n- __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * xx = np.ascontiguousarray(x, dtype=np.float64)\n+ *\/\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_2);\n@@ -8112,270 +9006,290 @@\n __Pyx_GIVEREF(__pyx_t_1);\n __pyx_t_2 = 0;\n __pyx_t_1 = 0;\n- __pyx_t_1 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_12), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_12), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_1));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_1));\n __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":924\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1090\n * raise ValueError(\"Searching for a %d-dimensional point in a \" \\\n * \"%d-dimensional KDTree\" % (x.shape[-1], self.m))\n * if len(x.shape) == 1: # <<<<<<<<<<<<<<\n- * xx = np.ascontiguousarray(x)\n- * return self.__query_ball_point(<double*>xx.data, r, p, eps)\n- *\/\n- __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * xx = np.ascontiguousarray(x, dtype=np.float64)\n+ * return self.__query_ball_point(<np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n+ *\/\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_t_4 = (__pyx_t_5 == 1);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":925\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1091\n * \"%d-dimensional KDTree\" % (x.shape[-1], self.m))\n * if len(x.shape) == 1:\n- * xx = np.ascontiguousarray(x) # <<<<<<<<<<<<<<\n- * return self.__query_ball_point(<double*>xx.data, r, p, eps)\n+ * xx = np.ascontiguousarray(x, dtype=np.float64) # <<<<<<<<<<<<<<\n+ * return self.__query_ball_point(<np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n * else:\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_v_x);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_x);\n __Pyx_GIVEREF(__pyx_v_x);\n- __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_7 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__float64); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_7) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_t_7 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_6 = ((PyArrayObject *)__pyx_t_2);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_7) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_7, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = ((PyArrayObject *)__pyx_t_7);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_xx.rcbuffer->pybuffer);\n- __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_7 < 0)) {\n- PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n- Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __pyx_t_9 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_8, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_9 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_11, &__pyx_t_12);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_12);\n __Pyx_RaiseBufferFallbackError();\n } else {\n- PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ PyErr_Restore(__pyx_t_10, __pyx_t_11, __pyx_t_12);\n }\n }\n __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_t_6 = 0;\n- __pyx_v_xx = ((PyArrayObject *)__pyx_t_2);\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":926\n+ if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_8 = 0;\n+ __pyx_v_xx = ((PyArrayObject *)__pyx_t_7);\n+ __pyx_t_7 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1092\n * if len(x.shape) == 1:\n- * xx = np.ascontiguousarray(x)\n- * return self.__query_ball_point(<double*>xx.data, r, p, eps) # <<<<<<<<<<<<<<\n+ * xx = np.ascontiguousarray(x, dtype=np.float64)\n+ * return self.__query_ball_point(<np.float64_t*>np.PyArray_DATA(xx), r, p, eps) # <<<<<<<<<<<<<<\n * else:\n * retshape = x.shape[:-1]\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_2 = ((PyObject *)((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point(__pyx_v_self, ((double *)__pyx_v_xx->data), __pyx_v_r, __pyx_v_p, __pyx_v_eps)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_r = __pyx_t_2;\n- __pyx_t_2 = 0;\n+ __pyx_t_7 = ((PyObject *)((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point(__pyx_v_self, ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_xx))), __pyx_v_r, __pyx_v_p, __pyx_v_eps)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1092; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_r = __pyx_t_7;\n+ __pyx_t_7 = 0;\n goto __pyx_L0;\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":928\n- * return self.__query_ball_point(<double*>xx.data, r, p, eps)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1094\n+ * return self.__query_ball_point(<np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n * else:\n * retshape = x.shape[:-1] # <<<<<<<<<<<<<<\n * result = np.empty(retshape, dtype=np.object)\n * for c in np.ndindex(retshape):\n *\/\n- __pyx_t_2 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_2 = __Pyx_PySequence_GetSlice(__pyx_t_7, 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = __Pyx_PySequence_GetSlice(__pyx_t_2, 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_v_retshape = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":929\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_v_retshape = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1095\n * else:\n * retshape = x.shape[:-1]\n * result = np.empty(retshape, dtype=np.object) # <<<<<<<<<<<<<<\n * for c in np.ndindex(retshape):\n- * xx = np.ascontiguousarray(x[c])\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * xx = np.ascontiguousarray(x[c], dtype=np.float64)\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_7 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__empty); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(__pyx_v_retshape);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_retshape);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_retshape);\n __Pyx_GIVEREF(__pyx_v_retshape);\n- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n- __pyx_t_11 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_11);\n- __pyx_t_12 = PyObject_GetAttr(__pyx_t_11, __pyx_n_s__object); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_12) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __pyx_t_12 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__object); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- __pyx_v_result = __pyx_t_12;\n- __pyx_t_12 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":930\n+ __pyx_v_result = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1096\n * retshape = x.shape[:-1]\n * result = np.empty(retshape, dtype=np.object)\n * for c in np.ndindex(retshape): # <<<<<<<<<<<<<<\n- * xx = np.ascontiguousarray(x[c])\n+ * xx = np.ascontiguousarray(x[c], dtype=np.float64)\n * result[c] = self.__query_ball_point(\n *\/\n- __pyx_t_12 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_12, __pyx_n_s__ndindex); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __pyx_t_12 = PyTuple_New(1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__ndindex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n __Pyx_INCREF(__pyx_v_retshape);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_v_retshape);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_retshape);\n __Pyx_GIVEREF(__pyx_v_retshape);\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_12), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n- if (PyList_CheckExact(__pyx_t_1) || PyTuple_CheckExact(__pyx_t_1)) {\n- __pyx_t_12 = __pyx_t_1; __Pyx_INCREF(__pyx_t_12); __pyx_t_5 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n+ if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {\n+ __pyx_t_6 = __pyx_t_2; __Pyx_INCREF(__pyx_t_6); __pyx_t_5 = 0;\n __pyx_t_13 = NULL;\n } else {\n- __pyx_t_5 = -1; __pyx_t_12 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_13 = Py_TYPE(__pyx_t_12)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_5 = -1; __pyx_t_6 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_13 = Py_TYPE(__pyx_t_6)->tp_iternext;\n+ }\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n for (;;) {\n- if (!__pyx_t_13 && PyList_CheckExact(__pyx_t_12)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_12)) break;\n- __pyx_t_1 = PyList_GET_ITEM(__pyx_t_12, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++;\n- } else if (!__pyx_t_13 && PyTuple_CheckExact(__pyx_t_12)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_12)) break;\n- __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_12, __pyx_t_5); __Pyx_INCREF(__pyx_t_1); __pyx_t_5++;\n+ if (!__pyx_t_13 && PyList_CheckExact(__pyx_t_6)) {\n+ if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_6)) break;\n+ __pyx_t_2 = PyList_GET_ITEM(__pyx_t_6, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++;\n+ } else if (!__pyx_t_13 && PyTuple_CheckExact(__pyx_t_6)) {\n+ if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_6)) break;\n+ __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_6, __pyx_t_5); __Pyx_INCREF(__pyx_t_2); __pyx_t_5++;\n } else {\n- __pyx_t_1 = __pyx_t_13(__pyx_t_12);\n- if (unlikely(!__pyx_t_1)) {\n+ __pyx_t_2 = __pyx_t_13(__pyx_t_6);\n+ if (unlikely(!__pyx_t_2)) {\n if (PyErr_Occurred()) {\n if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n break;\n }\n- __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_GOTREF(__pyx_t_2);\n }\n __Pyx_XDECREF(__pyx_v_c);\n- __pyx_v_c = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":931\n+ __pyx_v_c = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1097\n * result = np.empty(retshape, dtype=np.object)\n * for c in np.ndindex(retshape):\n- * xx = np.ascontiguousarray(x[c]) # <<<<<<<<<<<<<<\n+ * xx = np.ascontiguousarray(x[c], dtype=np.float64) # <<<<<<<<<<<<<<\n * result[c] = self.__query_ball_point(\n- * <double*>xx.data, r, p, eps)\n- *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * <np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetItem(__pyx_v_x, __pyx_v_c); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_14 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__float64); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_14);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_14) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;\n+ __pyx_t_14 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_7), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_14);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_GetItem(__pyx_v_x, __pyx_v_c); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_6 = ((PyArrayObject *)__pyx_t_1);\n+ if (!(likely(((__pyx_t_14) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_14, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = ((PyArrayObject *)__pyx_t_14);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_xx.rcbuffer->pybuffer);\n- __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_7 < 0)) {\n- PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_double, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n- Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __pyx_t_9 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_t_8, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_9 < 0)) {\n+ PyErr_Fetch(&__pyx_t_12, &__pyx_t_11, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_xx.rcbuffer->pybuffer, (PyObject*)__pyx_v_xx, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_12); Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10);\n __Pyx_RaiseBufferFallbackError();\n } else {\n- PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ PyErr_Restore(__pyx_t_12, __pyx_t_11, __pyx_t_10);\n }\n }\n __pyx_pybuffernd_xx.diminfo[0].strides = __pyx_pybuffernd_xx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_xx.diminfo[0].shape = __pyx_pybuffernd_xx.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n- __pyx_t_6 = 0;\n+ __pyx_t_8 = 0;\n __Pyx_XDECREF(((PyObject *)__pyx_v_xx));\n- __pyx_v_xx = ((PyArrayObject *)__pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":933\n- * xx = np.ascontiguousarray(x[c])\n+ __pyx_v_xx = ((PyArrayObject *)__pyx_t_14);\n+ __pyx_t_14 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1099\n+ * xx = np.ascontiguousarray(x[c], dtype=np.float64)\n * result[c] = self.__query_ball_point(\n- * <double*>xx.data, r, p, eps) # <<<<<<<<<<<<<<\n+ * <np.float64_t*>np.PyArray_DATA(xx), r, p, eps) # <<<<<<<<<<<<<<\n * return result\n * \n *\/\n- __pyx_t_1 = ((PyObject *)((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point(__pyx_v_self, ((double *)__pyx_v_xx->data), __pyx_v_r, __pyx_v_p, __pyx_v_eps)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":932\n+ __pyx_t_14 = ((PyObject *)((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_point(__pyx_v_self, ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_xx))), __pyx_v_r, __pyx_v_p, __pyx_v_eps)); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_14);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1098\n * for c in np.ndindex(retshape):\n- * xx = np.ascontiguousarray(x[c])\n+ * xx = np.ascontiguousarray(x[c], dtype=np.float64)\n * result[c] = self.__query_ball_point( # <<<<<<<<<<<<<<\n- * <double*>xx.data, r, p, eps)\n+ * <np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n * return result\n *\/\n- if (PyObject_SetItem(__pyx_v_result, __pyx_v_c, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- }\n- __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":934\n+ if (PyObject_SetItem(__pyx_v_result, __pyx_v_c, __pyx_t_14) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;\n+ }\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1100\n * result[c] = self.__query_ball_point(\n- * <double*>xx.data, r, p, eps)\n+ * <np.float64_t*>np.PyArray_DATA(xx), r, p, eps)\n * return result # <<<<<<<<<<<<<<\n * \n * # ---------------\n@@ -8393,8 +9307,9 @@\n __Pyx_XDECREF(__pyx_t_1);\n __Pyx_XDECREF(__pyx_t_2);\n __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_11);\n- __Pyx_XDECREF(__pyx_t_12);\n+ __Pyx_XDECREF(__pyx_t_6);\n+ __Pyx_XDECREF(__pyx_t_7);\n+ __Pyx_XDECREF(__pyx_t_14);\n { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_xx.rcbuffer->pybuffer);\n@@ -8415,35 +9330,37 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":939\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1105\n * # query_ball_tree\n * # ---------------\n- * cdef void __query_ball_tree_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n+ * cdef int __query_ball_tree_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n * cKDTree other,\n * list results,\n *\/\n \n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2) {\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n PyObject *__pyx_v_results_i = 0;\n- int __pyx_v_i;\n- int __pyx_v_j;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- int __pyx_t_2;\n- int __pyx_t_3;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n PyObject *__pyx_t_4 = NULL;\n- int __pyx_t_5;\n- int __pyx_t_6;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n int __pyx_t_7;\n+ int __pyx_t_8;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_ball_tree_traverse_no_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":947\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1114\n+ * cdef np.npy_intp i, j\n * \n * if node1.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n * lnode1 = <leafnode*>node1\n@@ -8452,7 +9369,7 @@\n __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":948\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1115\n * \n * if node1.split_dim == -1: # leaf node\n * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n@@ -8461,7 +9378,7 @@\n *\/\n __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":950\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1117\n * lnode1 = <leafnode*>node1\n * \n * if node2.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n@@ -8471,7 +9388,7 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":951\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1118\n * \n * if node2.split_dim == -1: # leaf node\n * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n@@ -8480,7 +9397,7 @@\n *\/\n __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":953\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1120\n * lnode2 = <leafnode*>node2\n * \n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n@@ -8491,21 +9408,21 @@\n for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":954\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1121\n * \n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * results_i = results[self.raw_indices[i]] # <<<<<<<<<<<<<<\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * results_i.append(other.raw_indices[j])\n *\/\n- __pyx_t_4 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_results), (__pyx_v_self->raw_indices[__pyx_v_i]), sizeof(__pyx_t_5numpy_int32_t), __Pyx_PyInt_to_py_npy_int32); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_results), (__pyx_v_self->raw_indices[__pyx_v_i]), sizeof(npy_intp), __Pyx_PyInt_to_py_Py_intptr_t); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- if (!(likely(PyList_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected list, got %.200s\", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(PyList_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected list, got %.200s\", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_XDECREF(((PyObject *)__pyx_v_results_i));\n __pyx_v_results_i = ((PyObject*)__pyx_t_4);\n __pyx_t_4 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":955\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1122\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * results_i = results[self.raw_indices[i]]\n * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n@@ -8516,7 +9433,7 @@\n for (__pyx_t_6 = __pyx_v_lnode2->start_idx; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n __pyx_v_j = __pyx_t_6;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":956\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1123\n * results_i = results[self.raw_indices[i]]\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * results_i.append(other.raw_indices[j]) # <<<<<<<<<<<<<<\n@@ -8524,11 +9441,11 @@\n * \n *\/\n if (unlikely(((PyObject *)__pyx_v_results_i) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyList_Append(__pyx_v_results_i, __pyx_t_4); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyList_Append(__pyx_v_results_i, __pyx_t_4); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n }\n }\n@@ -8536,140 +9453,156 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":959\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1126\n * else:\n * \n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.less) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.greater)\n * else:\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":960\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1127\n * \n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.less)\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2.greater) # <<<<<<<<<<<<<<\n * else:\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater);\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L4:;\n goto __pyx_L3;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":963\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1130\n * else:\n * \n * self.__query_ball_tree_traverse_no_checking(other, results, node1.less, node2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":964\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1131\n * \n * self.__query_ball_tree_traverse_no_checking(other, results, node1.less, node2)\n * self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2) # <<<<<<<<<<<<<<\n * \n- * cdef void __query_ball_tree_traverse_checking(cKDTree self, cKDTree other,\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2);\n+ * return 0\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L3:;\n \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1133\n+ * self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_ball_tree_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_ball_tree_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_XDECREF(__pyx_v_results_i);\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":966\n- * self.__query_ball_tree_traverse_no_checking(other, results, node1.greater, node2)\n- * \n- * cdef void __query_ball_tree_traverse_checking(cKDTree self, cKDTree other, # <<<<<<<<<<<<<<\n- * list results,\n- * innernode* node1, innernode* node2,\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, double __pyx_v_r, double __pyx_v_p, double __pyx_v_epsfac, double __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, double __pyx_v_min_distance, double __pyx_v_max_distance) {\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1137\n+ * \n+ * \n+ * cdef int __query_ball_tree_traverse_checking(cKDTree self, # <<<<<<<<<<<<<<\n+ * cKDTree other,\n+ * list results,\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_epsfac, __pyx_t_5numpy_float64_t __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n- int __pyx_v_k1;\n- int __pyx_v_k2;\n- double __pyx_v_save_min1;\n- double __pyx_v_save_max1;\n- double __pyx_v_save_min2;\n- double __pyx_v_save_max2;\n- double __pyx_v_part_min_distance1;\n- double __pyx_v_part_max_distance1;\n- double __pyx_v_part_min_distance2;\n- double __pyx_v_part_max_distance2;\n PyObject *__pyx_v_results_i = 0;\n- int __pyx_v_i;\n- int __pyx_v_j;\n- double __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min2;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ npy_intp __pyx_v_k1;\n+ npy_intp __pyx_v_k2;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n- int __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n- int __pyx_t_5;\n- int __pyx_t_6;\n- int __pyx_t_7;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ npy_intp __pyx_t_6;\n+ npy_intp __pyx_t_7;\n+ int __pyx_t_8;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_ball_tree_traverse_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":981\n- * cdef double save_min1, save_max1\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0.\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1155\n+ * cdef np.float64_t save_min1, save_max1\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0.\n+ * cdef np.float64_t d\n *\/\n __pyx_v_part_min_distance1 = 0.;\n __pyx_v_part_max_distance1 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":982\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0.\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n- * cdef list results_i\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1156\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0.\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t d\n+ * cdef np.npy_intp k1, k2, i, j\n *\/\n __pyx_v_part_min_distance2 = 0.;\n __pyx_v_part_max_distance2 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":985\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1161\n+ * \n * \n * if min_distance > r*epsfac: # <<<<<<<<<<<<<<\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac:\n *\/\n __pyx_t_1 = (__pyx_v_min_distance > (__pyx_v_r * __pyx_v_epsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":986\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1162\n * \n * if min_distance > r*epsfac:\n- * return # <<<<<<<<<<<<<<\n+ * return 0 # <<<<<<<<<<<<<<\n * elif max_distance < r*invepsfac:\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)\n *\/\n+ __pyx_r = 0;\n goto __pyx_L0;\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":987\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1163\n * if min_distance > r*epsfac:\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac: # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node\n@@ -8677,18 +9610,18 @@\n __pyx_t_1 = (__pyx_v_max_distance < (__pyx_v_r * __pyx_v_invepsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":988\n- * return\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1164\n+ * return 0\n * elif max_distance < r*invepsfac:\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2) # <<<<<<<<<<<<<<\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_no_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":989\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1165\n * elif max_distance < r*invepsfac:\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node # <<<<<<<<<<<<<<\n@@ -8698,7 +9631,7 @@\n __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":990\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1166\n * self.__query_ball_tree_traverse_no_checking(other, results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n@@ -8707,7 +9640,7 @@\n *\/\n __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":992\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1168\n * lnode1 = <leafnode*>node1\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves # <<<<<<<<<<<<<<\n@@ -8717,7 +9650,7 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":993\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1169\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves\n * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n@@ -8726,43 +9659,43 @@\n *\/\n __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":996\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1172\n * \n * # brute-force\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * results_i = results[self.raw_indices[i]]\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n *\/\n- __pyx_t_2 = __pyx_v_lnode1->end_idx;\n- for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_v_i = __pyx_t_3;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":997\n+ __pyx_t_3 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1173\n * # brute-force\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * results_i = results[self.raw_indices[i]] # <<<<<<<<<<<<<<\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * d = _distance_p(\n *\/\n- __pyx_t_4 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_results), (__pyx_v_self->raw_indices[__pyx_v_i]), sizeof(__pyx_t_5numpy_int32_t), __Pyx_PyInt_to_py_npy_int32); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- if (!(likely(PyList_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected list, got %.200s\", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_results), (__pyx_v_self->raw_indices[__pyx_v_i]), sizeof(npy_intp), __Pyx_PyInt_to_py_Py_intptr_t); if (!__pyx_t_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ if (!(likely(PyList_CheckExact(__pyx_t_5))||((__pyx_t_5) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected list, got %.200s\", Py_TYPE(__pyx_t_5)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_XDECREF(((PyObject *)__pyx_v_results_i));\n- __pyx_v_results_i = ((PyObject*)__pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":998\n+ __pyx_v_results_i = ((PyObject*)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1174\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * results_i = results[self.raw_indices[i]]\n * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_5 = __pyx_v_lnode2->end_idx;\n- for (__pyx_t_6 = __pyx_v_lnode2->start_idx; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n- __pyx_v_j = __pyx_t_6;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1002\n+ __pyx_t_6 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_7 = __pyx_v_lnode2->start_idx; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n+ __pyx_v_j = __pyx_t_7;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1178\n * self.raw_data + self.raw_indices[i] * self.m,\n * other.raw_data + other.raw_indices[j] * other.m,\n * p, self.m, r) # <<<<<<<<<<<<<<\n@@ -8771,7 +9704,7 @@\n *\/\n __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1003\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1179\n * other.raw_data + other.raw_indices[j] * other.m,\n * p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -8781,7 +9714,7 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1004\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1180\n * p, self.m, r)\n * if d <= r:\n * results_i.append(other.raw_indices[j]) # <<<<<<<<<<<<<<\n@@ -8789,12 +9722,12 @@\n * else: # 1 is a leaf node, 2 is inner node\n *\/\n if (unlikely(((PyObject *)__pyx_v_results_i) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"append\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1180; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyList_Append(__pyx_v_results_i, __pyx_t_4); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_other->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_8 = PyList_Append(__pyx_v_results_i, __pyx_t_5); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n goto __pyx_L9;\n }\n __pyx_L9:;\n@@ -8804,61 +9737,61 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1007\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1183\n * \n * else: # 1 is a leaf node, 2 is inner node\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1008\n- * else: # 1 is a leaf node, 2 is inner node\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1186\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1012\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1190\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1013\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1191\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1014\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1194\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1019\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1199\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1020\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1200\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -8867,43 +9800,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1024\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1204\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1025\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1205\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1026\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1208\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1031\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1213\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1032\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1214\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -8917,53 +9850,53 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1036\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1218\n * \n * else: # 1 is an inner node\n * k1 = node1.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1)\n- * \n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n *\/\n __pyx_v_k1 = __pyx_v_node1->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1037\n- * else: # 1 is an inner node\n- * k1 = node1.split_dim\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1221\n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n+ * &part_max_distance1) # <<<<<<<<<<<<<<\n * \n * # node1 goes to box with lesser component along k1\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance1), (&__pyx_v_part_max_distance1));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1041\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1225\n * # node1 goes to box with lesser component along k1\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1] # <<<<<<<<<<<<<<\n * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_max1 = (__pyx_v_rect1.maxes[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1042\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1226\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1]\n * rect1.maxes[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1043\n- * save_max1 = rect1.maxes[k1]\n- * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1229\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1045\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1231\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n@@ -8972,73 +9905,73 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1050\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1236\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L10;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1052\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1238\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1053\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1241\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1057\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1245\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1058\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1246\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1059\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1249\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1.less, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1064\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1254\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1065\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1255\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -9047,43 +9980,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1069\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1259\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1070\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1260\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1071\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1263\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1.less, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1076\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1268\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1077\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1269\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -9094,7 +10027,7 @@\n }\n __pyx_L10:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1079\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1271\n * rect2.mins[k2] = save_min2\n * \n * rect1.maxes[k1] = save_max1 # <<<<<<<<<<<<<<\n@@ -9103,35 +10036,35 @@\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_save_max1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1083\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1275\n * # node1 goes to box with greater component along k1\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1] # <<<<<<<<<<<<<<\n * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_min1 = (__pyx_v_rect1.mins[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1084\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1276\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1]\n * rect1.mins[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1085\n- * save_min1 = rect1.mins[k1]\n- * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1279\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1087\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1281\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n@@ -9140,73 +10073,73 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1092\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1286\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L11;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1094\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1288\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1095\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1291\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1099\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1295\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1100\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1296\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1101\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1299\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1.greater, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1106\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1304\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1107\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1305\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -9215,43 +10148,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1111\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1309\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1112\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1310\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_ball_tree_traverse_checking(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1113\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1313\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_ball_tree_traverse_checking(other, results,\n * node1.greater, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1118\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1318\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1119\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1319\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -9262,24 +10195,37 @@\n }\n __pyx_L11:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1121\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1321\n * rect2.mins[k2] = save_min2\n * \n * rect1.mins[k1] = save_min1 # <<<<<<<<<<<<<<\n * \n- * \n+ * return 0\n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_save_min1;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1323\n+ * rect1.mins[k1] = save_min1\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n }\n __pyx_L3:;\n \n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_ball_tree_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_ball_tree_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n __Pyx_XDECREF(__pyx_v_results_i);\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n \/* Python wrapper *\/\n@@ -9287,9 +10233,9 @@\n static char __pyx_doc_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree[] = \"query_ball_tree(self, other, r, p, eps)\\n\\n Find all pairs of points whose distance is at most r\\n\\n Parameters\\n ----------\\n other : KDTree instance\\n The tree containing points to search against.\\n r : float\\n The maximum distance, has to be positive.\\n p : float, optional\\n Which Minkowski norm to use. `p` has to meet the condition\\n ``1 <= p <= infinity``.\\n eps : float, optional\\n Approximate search. Branches of the tree are not explored\\n if their nearest points are further than ``r\/(1+eps)``, and\\n branches are added in bulk if their furthest points are nearer\\n than ``r * (1+eps)``. `eps` has to be non-negative.\\n\\n Returns\\n -------\\n results : list of lists\\n For each element ``self.data[i]`` of this tree, ``results[i]`` is a\\n list of the indices of its neighbors in ``other.data``.\\n\\n \";\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_9query_ball_tree(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other = 0;\n- double __pyx_v_r;\n- double __pyx_v_p;\n- double __pyx_v_eps;\n+ __pyx_t_5numpy_float64_t __pyx_v_r;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_eps;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__other,&__pyx_n_s__r,&__pyx_n_s__p,&__pyx_n_s__eps,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -9317,7 +10263,7 @@\n values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__r);\n if (likely(values[1])) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"query_ball_tree\", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query_ball_tree\", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1326; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n case 2:\n if (kw_args > 0) {\n@@ -9331,23 +10277,23 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_ball_tree\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_ball_tree\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1326; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[2]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1125\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1327\n * \n * def query_ball_tree(cKDTree self, cKDTree other,\n- * double r, double p=2., double eps=0): # <<<<<<<<<<<<<<\n+ * np.float64_t r, np.float64_t p=2., np.float64_t eps=0): # <<<<<<<<<<<<<<\n * \"\"\"query_ball_tree(self, other, r, p, eps)\n * \n *\/\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[3]) {\n } else {\n- __pyx_v_eps = ((double)0.0);\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -9360,27 +10306,27 @@\n }\n }\n __pyx_v_other = ((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)values[0]);\n- __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n if (values[2]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[3]) {\n- __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_eps = __pyx_PyFloat_AsDouble(values[3]); if (unlikely((__pyx_v_eps == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_eps = ((double)0.0);\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"query_ball_tree\", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query_ball_tree\", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1326; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.query_ball_tree\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_r = __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree(((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_r, __pyx_v_p, __pyx_v_eps);\n goto __pyx_L0;\n __pyx_L1_error:;\n@@ -9390,39 +10336,40 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":1124\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1326\n * \n * \n * def query_ball_tree(cKDTree self, cKDTree other, # <<<<<<<<<<<<<<\n- * double r, double p=2., double eps=0):\n+ * np.float64_t r, np.float64_t p=2., np.float64_t eps=0):\n * \"\"\"query_ball_tree(self, other, r, p, eps)\n *\/\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps) {\n- int __pyx_v_i;\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8query_ball_tree(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps) {\n PyObject *__pyx_v_results = 0;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2;\n- double __pyx_v_epsfac;\n- double __pyx_v_invepsfac;\n- double __pyx_v_min_distance;\n- double __pyx_v_max_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_epsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_invepsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_distance;\n+ npy_intp __pyx_v_i;\n PyObject *__pyx_r = NULL;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n PyObject *__pyx_t_2 = NULL;\n int __pyx_t_3;\n int __pyx_t_4;\n- double __pyx_t_5;\n- int __pyx_t_6;\n- int __pyx_t_7;\n+ __pyx_t_5numpy_float64_t __pyx_t_5;\n+ npy_intp __pyx_t_6;\n+ npy_intp __pyx_t_7;\n PyObject *__pyx_t_8 = NULL;\n+ int __pyx_t_9;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"query_ball_tree\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1159\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1362\n * \n * # Make sure trees are compatible\n * if self.m != other.m: # <<<<<<<<<<<<<<\n@@ -9432,23 +10379,23 @@\n __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1160\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1363\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_14), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_14), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_Raise(__pyx_t_2, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1163\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1366\n * \n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity: # <<<<<<<<<<<<<<\n@@ -9464,7 +10411,7 @@\n }\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1164\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1367\n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity:\n * r = r ** p # <<<<<<<<<<<<<<\n@@ -9476,7 +10423,7 @@\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1167\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1370\n * \n * # fiddle approximation factor\n * if eps == 0: # <<<<<<<<<<<<<<\n@@ -9486,7 +10433,7 @@\n __pyx_t_4 = (__pyx_v_eps == 0.0);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1168\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1371\n * # fiddle approximation factor\n * if eps == 0:\n * epsfac = 1 # <<<<<<<<<<<<<<\n@@ -9497,7 +10444,7 @@\n goto __pyx_L5;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1169\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1372\n * if eps == 0:\n * epsfac = 1\n * elif p == infinity: # <<<<<<<<<<<<<<\n@@ -9507,7 +10454,7 @@\n __pyx_t_4 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1170\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1373\n * epsfac = 1\n * elif p == infinity:\n * epsfac = 1\/(1+eps) # <<<<<<<<<<<<<<\n@@ -9517,14 +10464,14 @@\n __pyx_t_5 = (1.0 + __pyx_v_eps);\n if (unlikely(__pyx_t_5 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1373; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_5);\n goto __pyx_L5;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1172\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1375\n * epsfac = 1\/(1+eps)\n * else:\n * epsfac = 1\/(1+eps)**p # <<<<<<<<<<<<<<\n@@ -9534,13 +10481,13 @@\n __pyx_t_5 = pow((1.0 + __pyx_v_eps), __pyx_v_p);\n if (unlikely(__pyx_t_5 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_5);\n }\n __pyx_L5:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1173\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1376\n * else:\n * epsfac = 1\/(1+eps)**p\n * invepsfac = 1\/epsfac # <<<<<<<<<<<<<<\n@@ -9549,253 +10496,441 @@\n *\/\n if (unlikely(__pyx_v_epsfac == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_invepsfac = (1.0 \/ __pyx_v_epsfac);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1176\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1379\n * \n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m # <<<<<<<<<<<<<<\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try:\n *\/\n __pyx_v_rect1.m = __pyx_v_self->m;\n __pyx_v_rect2.m = __pyx_v_self->m;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1177\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1380\n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1178\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL # <<<<<<<<<<<<<<\n+ * try:\n+ * \n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1381\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1179\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- *\/\n- __pyx_v_rect2.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1180\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- *\/\n- __pyx_v_rect2.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1181\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- *\/\n- __pyx_t_6 = __pyx_v_self->m;\n- for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n- __pyx_v_i = __pyx_t_7;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1182\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1183\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i]\n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1184\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect2.maxes[i] = other.raw_maxes[i]\n- * \n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1185\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n- * \n- * # Compute first min and max distances\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1188\n- * \n- * # Compute first min and max distances\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- *\/\n- __pyx_t_4 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_4) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1189\n- * # Compute first min and max distances\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1190\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * else:\n- * min_distance = 0.\n- *\/\n- __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n- goto __pyx_L8;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1192\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * max_distance = 0.\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try: # <<<<<<<<<<<<<<\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1383\n+ * try:\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1384\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1385\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1387\n+ * raise MemoryError\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1388\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1389\n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1391\n+ * raise MemoryError\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1392\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1393\n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1393; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1395\n+ * raise MemoryError\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1396\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1397\n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n * for i in range(self.m):\n *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1193\n- * else:\n- * min_distance = 0.\n- * max_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- *\/\n- __pyx_v_max_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1194\n- * min_distance = 0.\n- * max_distance = 0.\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1397; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1399\n+ * raise MemoryError\n+ * \n * for i in range(self.m): # <<<<<<<<<<<<<<\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n *\/\n __pyx_t_6 = __pyx_v_self->m;\n for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n __pyx_v_i = __pyx_t_7;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1195\n- * max_distance = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1400\n+ * \n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1196\n+ * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1401\n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * \n- * results = [[] for i in range(self.n)]\n- *\/\n- __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n- }\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1402\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ * \n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1403\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * \n+ * # Compute first min and max distances\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1406\n+ * \n+ * # Compute first min and max distances\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ *\/\n+ __pyx_t_4 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1407\n+ * # Compute first min and max distances\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1408\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance = 0.\n+ *\/\n+ __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+ goto __pyx_L15;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1410\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1411\n+ * else:\n+ * min_distance = 0.\n+ * max_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_v_max_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1412\n+ * min_distance = 0.\n+ * max_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_t_6 = __pyx_v_self->m;\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1413\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1414\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * \n+ * results = [[] for i in range(self.n)]\n+ *\/\n+ __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+ }\n+ }\n+ __pyx_L15:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1416\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ * results = [[] for i in range(self.n)] # <<<<<<<<<<<<<<\n+ * self.__query_ball_tree_traverse_checking(other, results,\n+ * self.tree, other.tree,\n+ *\/\n+ __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1416; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_6 = __pyx_v_self->n;\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+ __pyx_t_8 = PyList_New(0); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1416; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ if (unlikely(PyList_Append(__pyx_t_2, (PyObject*)__pyx_t_8))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1416; __pyx_clineno = __LINE__; goto __pyx_L7;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;\n+ }\n+ __Pyx_INCREF(((PyObject *)__pyx_t_2));\n+ __pyx_v_results = __pyx_t_2;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1421\n+ * r, p, epsfac, invepsfac,\n+ * rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * \n+ * finally:\n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1417; __pyx_clineno = __LINE__; goto __pyx_L7;}\n }\n- __pyx_L8:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1198\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- * results = [[] for i in range(self.n)] # <<<<<<<<<<<<<<\n- * self.__query_ball_tree_traverse_checking(other, results,\n- * self.tree, other.tree,\n- *\/\n- __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_6 = __pyx_v_self->n;\n- for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n- __pyx_v_i = __pyx_t_7;\n- __pyx_t_8 = PyList_New(0); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_8);\n- if (unlikely(PyList_Append(__pyx_t_2, (PyObject*)__pyx_t_8))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1425\n+ * finally:\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.mins)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L8;\n+ __pyx_L7: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+ __pyx_t_4 = (__pyx_v_rect1.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1426\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.mins);\n+ goto __pyx_L21;\n+ }\n+ __pyx_L21:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1428\n+ * stdlib.free(rect1.mins)\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.maxes)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1429\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.maxes);\n+ goto __pyx_L22;\n+ }\n+ __pyx_L22:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1431\n+ * stdlib.free(rect1.maxes)\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.mins)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1432\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect2.mins);\n+ goto __pyx_L23;\n+ }\n+ __pyx_L23:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1434\n+ * stdlib.free(rect2.mins)\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.maxes)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1435\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * return results\n+ *\/\n+ free(__pyx_v_rect2.maxes);\n+ goto __pyx_L24;\n+ }\n+ __pyx_L24:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n }\n- __Pyx_INCREF(((PyObject *)__pyx_t_2));\n- __pyx_v_results = __pyx_t_2;\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1203\n- * r, p, epsfac, invepsfac,\n- * rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(rect1.mins)\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_ball_tree_traverse_checking(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1205\n- * min_distance, max_distance)\n- * \n- * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- *\/\n- free(__pyx_v_rect1.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1206\n- * \n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes)\n- *\/\n- free(__pyx_v_rect1.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1207\n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.maxes)\n- * \n- *\/\n- free(__pyx_v_rect2.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1208\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n- * \n- * return results\n- *\/\n- free(__pyx_v_rect2.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1210\n- * stdlib.free(rect2.maxes)\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1437\n+ * stdlib.free(rect2.maxes)\n * \n * return results # <<<<<<<<<<<<<<\n * \n@@ -9820,40 +10955,38 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":1215\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1442\n * # query_pairs\n * # -----------\n- * cdef void __query_pairs_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n+ * cdef int __query_pairs_traverse_no_checking(cKDTree self, # <<<<<<<<<<<<<<\n * set results,\n * innernode* node1,\n *\/\n \n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2) {\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_no_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n- PyObject *__pyx_v_i = NULL;\n- PyObject *__pyx_v_j = NULL;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- Py_ssize_t __pyx_t_5;\n- PyObject *(*__pyx_t_6)(PyObject *);\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ PyObject *__pyx_t_6 = NULL;\n PyObject *__pyx_t_7 = NULL;\n- Py_ssize_t __pyx_t_8;\n- PyObject *(*__pyx_t_9)(PyObject *);\n- Py_ssize_t __pyx_t_10;\n- Py_ssize_t __pyx_t_11;\n- PyObject *__pyx_t_12 = NULL;\n- int __pyx_t_13;\n+ PyObject *__pyx_t_8 = NULL;\n+ int __pyx_t_9;\n+ int __pyx_t_10;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_pairs_traverse_no_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1222\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1450\n+ * cdef np.npy_intp i, j\n * \n * if node1.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n * lnode1 = <leafnode*>node1\n@@ -9862,7 +10995,7 @@\n __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1223\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1451\n * \n * if node1.split_dim == -1: # leaf node\n * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n@@ -9871,7 +11004,7 @@\n *\/\n __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1225\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1453\n * lnode1 = <leafnode*>node1\n * \n * if node2.split_dim == -1: # leaf node # <<<<<<<<<<<<<<\n@@ -9881,7 +11014,7 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1226\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1454\n * \n * if node2.split_dim == -1: # leaf node\n * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n@@ -9890,7 +11023,7 @@\n *\/\n __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1229\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1457\n * \n * # Special care here to avoid duplicate pairs\n * if node1 == node2: # <<<<<<<<<<<<<<\n@@ -9900,125 +11033,39 @@\n __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1230\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1458\n * # Special care here to avoid duplicate pairs\n * if node1 == node2:\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(i+1, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]:\n *\/\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_2 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- if (PyList_CheckExact(__pyx_t_3) || PyTuple_CheckExact(__pyx_t_3)) {\n- __pyx_t_4 = __pyx_t_3; __Pyx_INCREF(__pyx_t_4); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else {\n- __pyx_t_3 = __pyx_t_6(__pyx_t_4);\n- if (unlikely(!__pyx_t_3)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_3);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n+ __pyx_t_2 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n- __pyx_t_3 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1231\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1459\n * if node1 == node2:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(i+1, lnode2.end_idx): # <<<<<<<<<<<<<<\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n *\/\n- __pyx_t_3 = PyNumber_Add(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- __pyx_t_3 = 0;\n- __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n- if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {\n- __pyx_t_7 = __pyx_t_2; __Pyx_INCREF(__pyx_t_7); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_9 = Py_TYPE(__pyx_t_7)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else {\n- __pyx_t_2 = __pyx_t_9(__pyx_t_7);\n- if (unlikely(!__pyx_t_2)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_2);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_2;\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1232\n+ __pyx_t_4 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_5 = (__pyx_v_i + 1); __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_j = __pyx_t_5;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1460\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(i+1, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]: # <<<<<<<<<<<<<<\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_t_10]) < (__pyx_v_self->raw_indices[__pyx_t_11]));\n+ __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_v_i]) < (__pyx_v_self->raw_indices[__pyx_v_j]));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1233\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1461\n * for j in range(i+1, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j])) # <<<<<<<<<<<<<<\n@@ -10026,29 +11073,27 @@\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_2 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_11])); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_3 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_11])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_2 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_12)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __pyx_t_6 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6);\n+ __Pyx_GIVEREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_7);\n+ __pyx_t_6 = 0;\n+ __pyx_t_7 = 0;\n+ __pyx_t_9 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_8)); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;\n goto __pyx_L10;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1235\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1463\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n * results.add((self.raw_indices[j], self.raw_indices[i])) # <<<<<<<<<<<<<<\n@@ -10056,153 +11101,63 @@\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_11])); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_3 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_11])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_12 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_7);\n+ __pyx_t_8 = 0;\n+ __pyx_t_7 = 0;\n+ __pyx_t_9 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_6)); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n }\n __pyx_L10:;\n }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n goto __pyx_L5;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1237\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1465\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]:\n *\/\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_4 = 0;\n- __pyx_t_7 = 0;\n- __pyx_t_7 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (PyList_CheckExact(__pyx_t_7) || PyTuple_CheckExact(__pyx_t_7)) {\n- __pyx_t_2 = __pyx_t_7; __Pyx_INCREF(__pyx_t_2); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_6 = Py_TYPE(__pyx_t_2)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else {\n- __pyx_t_7 = __pyx_t_6(__pyx_t_2);\n- if (unlikely(!__pyx_t_7)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_7);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n- __pyx_v_i = __pyx_t_7;\n- __pyx_t_7 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1238\n+ __pyx_t_2 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1466\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n *\/\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode2->start_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- __pyx_t_7 = 0;\n- __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- if (PyList_CheckExact(__pyx_t_4) || PyTuple_CheckExact(__pyx_t_4)) {\n- __pyx_t_3 = __pyx_t_4; __Pyx_INCREF(__pyx_t_3); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_9 = Py_TYPE(__pyx_t_3)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else {\n- __pyx_t_4 = __pyx_t_9(__pyx_t_3);\n- if (unlikely(!__pyx_t_4)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_4);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_4;\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1239\n+ __pyx_t_4 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_5 = __pyx_v_lnode2->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_j = __pyx_t_5;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1467\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]: # <<<<<<<<<<<<<<\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_t_11]) < (__pyx_v_self->raw_indices[__pyx_t_10]));\n+ __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_v_i]) < (__pyx_v_self->raw_indices[__pyx_v_j]));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1240\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1468\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j])) # <<<<<<<<<<<<<<\n@@ -10210,29 +11165,27 @@\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_7 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_7);\n+ __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6);\n+ __Pyx_GIVEREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_4 = 0;\n+ __pyx_t_6 = 0;\n __pyx_t_7 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_12)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __pyx_t_9 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_8)); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;\n goto __pyx_L15;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1242\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1470\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n * results.add((self.raw_indices[j], self.raw_indices[i])) # <<<<<<<<<<<<<<\n@@ -10240,60 +11193,56 @@\n * else:\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_7 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_7);\n+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_12 = 0;\n+ __pyx_t_8 = 0;\n __pyx_t_7 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ __pyx_t_9 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_6)); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n }\n __pyx_L15:;\n }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n }\n __pyx_L5:;\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1246\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1474\n * else:\n * \n * self.__query_pairs_traverse_no_checking(results, node1, node2.less) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_no_checking(results, node1, node2.greater)\n * else:\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1247\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1475\n * \n * self.__query_pairs_traverse_no_checking(results, node1, node2.less)\n * self.__query_pairs_traverse_no_checking(results, node1, node2.greater) # <<<<<<<<<<<<<<\n * else:\n * if node1 == node2:\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater);\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L4:;\n goto __pyx_L3;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1249\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1477\n * self.__query_pairs_traverse_no_checking(results, node1, node2.greater)\n * else:\n * if node1 == node2: # <<<<<<<<<<<<<<\n@@ -10303,159 +11252,167 @@\n __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1254\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1482\n * # over, which is the source of the complication in the\n * # original KDTree.query_pairs)\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.less) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater)\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1255\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1482; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1483\n * # original KDTree.query_pairs)\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.less)\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)\n * else:\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1256\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1484\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.less)\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2.greater)\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater) # <<<<<<<<<<<<<<\n * else:\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2)\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater);\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L16;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1258\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1486\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2.greater)\n * else:\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2)\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1259\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1487\n * else:\n * self.__query_pairs_traverse_no_checking(results, node1.less, node2)\n * self.__query_pairs_traverse_no_checking(results, node1.greater, node2) # <<<<<<<<<<<<<<\n * \n- * cdef void __query_pairs_traverse_checking(cKDTree self,\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2);\n+ * return 0\n+ *\/\n+ __pyx_t_10 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1487; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L16:;\n }\n __pyx_L3:;\n \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1489\n+ * self.__query_pairs_traverse_no_checking(results, node1.greater, node2)\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_6);\n __Pyx_XDECREF(__pyx_t_7);\n- __Pyx_XDECREF(__pyx_t_12);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_pairs_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_XDECREF(__pyx_t_8);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_pairs_traverse_no_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_i);\n- __Pyx_XDECREF(__pyx_v_j);\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":1261\n- * self.__query_pairs_traverse_no_checking(results, node1.greater, node2)\n- * \n- * cdef void __query_pairs_traverse_checking(cKDTree self, # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1493\n+ * \n+ * \n+ * cdef int __query_pairs_traverse_checking(cKDTree self, # <<<<<<<<<<<<<<\n * set results,\n- * innernode* node1, innernode* node2,\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, double __pyx_v_r, double __pyx_v_p, double __pyx_v_epsfac, double __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, double __pyx_v_min_distance, double __pyx_v_max_distance) {\n+ * innernode* node1,\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_checking(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, PyObject *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_epsfac, __pyx_t_5numpy_float64_t __pyx_v_invepsfac, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n- int __pyx_v_k1;\n- int __pyx_v_k2;\n- double __pyx_v_save_min1;\n- double __pyx_v_save_max1;\n- double __pyx_v_save_min2;\n- double __pyx_v_save_max2;\n- double __pyx_v_part_min_distance1;\n- double __pyx_v_part_max_distance1;\n- double __pyx_v_part_min_distance2;\n- double __pyx_v_part_max_distance2;\n- PyObject *__pyx_v_i = NULL;\n- PyObject *__pyx_v_j = NULL;\n- double __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min2;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ npy_intp __pyx_v_k1;\n+ npy_intp __pyx_v_k2;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- Py_ssize_t __pyx_t_5;\n- PyObject *(*__pyx_t_6)(PyObject *);\n+ int __pyx_t_2;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n PyObject *__pyx_t_7 = NULL;\n- Py_ssize_t __pyx_t_8;\n- PyObject *(*__pyx_t_9)(PyObject *);\n- Py_ssize_t __pyx_t_10;\n- Py_ssize_t __pyx_t_11;\n- PyObject *__pyx_t_12 = NULL;\n- int __pyx_t_13;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ int __pyx_t_10;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__query_pairs_traverse_checking\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1276\n- * cdef double save_min1, save_max1\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0.\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1510\n+ * cdef np.float64_t save_min1, save_max1\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0.\n+ * cdef np.float64_t d\n *\/\n __pyx_v_part_min_distance1 = 0.;\n __pyx_v_part_max_distance1 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1277\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0.\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n- * cdef list results_i\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1511\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0.\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t d\n+ * cdef np.npy_intp k1, k2, i, j\n *\/\n __pyx_v_part_min_distance2 = 0.;\n __pyx_v_part_max_distance2 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1280\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1515\n+ * cdef np.npy_intp k1, k2, i, j\n * \n * if min_distance > r*epsfac: # <<<<<<<<<<<<<<\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac:\n *\/\n __pyx_t_1 = (__pyx_v_min_distance > (__pyx_v_r * __pyx_v_epsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1281\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1516\n * \n * if min_distance > r*epsfac:\n- * return # <<<<<<<<<<<<<<\n+ * return 0 # <<<<<<<<<<<<<<\n * elif max_distance < r*invepsfac:\n * self.__query_pairs_traverse_no_checking(results, node1, node2)\n *\/\n+ __pyx_r = 0;\n goto __pyx_L0;\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1282\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1517\n * if min_distance > r*epsfac:\n- * return\n+ * return 0\n * elif max_distance < r*invepsfac: # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_no_checking(results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node\n@@ -10463,18 +11420,18 @@\n __pyx_t_1 = (__pyx_v_max_distance < (__pyx_v_r * __pyx_v_invepsfac));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1283\n- * return\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1518\n+ * return 0\n * elif max_distance < r*invepsfac:\n * self.__query_pairs_traverse_no_checking(results, node1, node2) # <<<<<<<<<<<<<<\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_no_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1284\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1519\n * elif max_distance < r*invepsfac:\n * self.__query_pairs_traverse_no_checking(results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node # <<<<<<<<<<<<<<\n@@ -10484,7 +11441,7 @@\n __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1285\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1520\n * self.__query_pairs_traverse_no_checking(results, node1, node2)\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n@@ -10493,7 +11450,7 @@\n *\/\n __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1287\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1522\n * lnode1 = <leafnode*>node1\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves # <<<<<<<<<<<<<<\n@@ -10503,7 +11460,7 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1288\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1523\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves\n * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n@@ -10512,7 +11469,7 @@\n *\/\n __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1292\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1527\n * # brute-force\n * # Special care here to avoid duplicate pairs\n * if node1 == node2: # <<<<<<<<<<<<<<\n@@ -10522,140 +11479,38 @@\n __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1293\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1528\n * # Special care here to avoid duplicate pairs\n * if node1 == node2:\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(i+1, lnode2.end_idx):\n * d = _distance_p(\n *\/\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_2 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- if (PyList_CheckExact(__pyx_t_3) || PyTuple_CheckExact(__pyx_t_3)) {\n- __pyx_t_4 = __pyx_t_3; __Pyx_INCREF(__pyx_t_4); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else {\n- __pyx_t_3 = __pyx_t_6(__pyx_t_4);\n- if (unlikely(!__pyx_t_3)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_3);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n- __pyx_v_i = __pyx_t_3;\n- __pyx_t_3 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1294\n+ __pyx_t_3 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1529\n * if node1 == node2:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(i+1, lnode2.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_3 = PyNumber_Add(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- __pyx_t_3 = 0;\n- __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n- if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {\n- __pyx_t_7 = __pyx_t_2; __Pyx_INCREF(__pyx_t_7); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_9 = Py_TYPE(__pyx_t_7)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else {\n- __pyx_t_2 = __pyx_t_9(__pyx_t_7);\n- if (unlikely(!__pyx_t_2)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_2);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_2;\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1296\n- * for j in range(i+1, lnode2.end_idx):\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m, # <<<<<<<<<<<<<<\n- * self.raw_data + self.raw_indices[j] * self.m,\n- * p, self.m, r)\n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1297\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m,\n- * self.raw_data + self.raw_indices[j] * self.m, # <<<<<<<<<<<<<<\n- * p, self.m, r)\n- * if d <= r:\n- *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1297; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1298\n+ __pyx_t_5 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_6 = (__pyx_v_i + 1); __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n+ __pyx_v_j = __pyx_t_6;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1533\n * self.raw_data + self.raw_indices[i] * self.m,\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r) # <<<<<<<<<<<<<<\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]:\n *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_10]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_11]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1299\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1534\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -10665,19 +11520,17 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1300\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1535\n * p, self.m, r)\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]: # <<<<<<<<<<<<<<\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1300; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_t_11]) < (__pyx_v_self->raw_indices[__pyx_t_10]));\n+ __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_v_i]) < (__pyx_v_self->raw_indices[__pyx_v_j]));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1301\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1536\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j])) # <<<<<<<<<<<<<<\n@@ -10685,29 +11538,27 @@\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1536; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_2 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_3 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_2 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_12)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_7);\n+ PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ __pyx_t_7 = 0;\n+ __pyx_t_8 = 0;\n+ __pyx_t_10 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_9)); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_9)); __pyx_t_9 = 0;\n goto __pyx_L11;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1303\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1538\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n * results.add((self.raw_indices[j], self.raw_indices[i])) # <<<<<<<<<<<<<<\n@@ -10715,171 +11566,65 @@\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1538; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_3 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_12 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __pyx_t_9 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1538; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1538; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1538; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ __pyx_t_9 = 0;\n+ __pyx_t_8 = 0;\n+ __pyx_t_10 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_7)); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1538; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n }\n __pyx_L11:;\n goto __pyx_L10;\n }\n __pyx_L10:;\n }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n goto __pyx_L5;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1305\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1540\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * d = _distance_p(\n *\/\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_4 = 0;\n- __pyx_t_7 = 0;\n- __pyx_t_7 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (PyList_CheckExact(__pyx_t_7) || PyTuple_CheckExact(__pyx_t_7)) {\n- __pyx_t_2 = __pyx_t_7; __Pyx_INCREF(__pyx_t_2); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_6 = Py_TYPE(__pyx_t_2)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else {\n- __pyx_t_7 = __pyx_t_6(__pyx_t_2);\n- if (unlikely(!__pyx_t_7)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_7);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n- __pyx_v_i = __pyx_t_7;\n- __pyx_t_7 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1306\n+ __pyx_t_3 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_4 = __pyx_v_lnode1->start_idx; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1541\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode2->start_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- __pyx_t_7 = 0;\n- __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- if (PyList_CheckExact(__pyx_t_4) || PyTuple_CheckExact(__pyx_t_4)) {\n- __pyx_t_3 = __pyx_t_4; __Pyx_INCREF(__pyx_t_3); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_9 = Py_TYPE(__pyx_t_3)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else {\n- __pyx_t_4 = __pyx_t_9(__pyx_t_3);\n- if (unlikely(!__pyx_t_4)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_4);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_4;\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1308\n- * for j in range(lnode2.start_idx, lnode2.end_idx):\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m, # <<<<<<<<<<<<<<\n- * self.raw_data + self.raw_indices[j] * self.m,\n- * p, self.m, r)\n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1309\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m,\n- * self.raw_data + self.raw_indices[j] * self.m, # <<<<<<<<<<<<<<\n- * p, self.m, r)\n- * if d <= r:\n- *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1310\n+ __pyx_t_5 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_6 = __pyx_v_lnode2->start_idx; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n+ __pyx_v_j = __pyx_t_6;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1545\n * self.raw_data + self.raw_indices[i] * self.m,\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r) # <<<<<<<<<<<<<<\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]:\n *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_10]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_11]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1311\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1546\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -10889,19 +11634,17 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1312\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1547\n * p, self.m, r)\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]: # <<<<<<<<<<<<<<\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_t_11]) < (__pyx_v_self->raw_indices[__pyx_t_10]));\n+ __pyx_t_1 = ((__pyx_v_self->raw_indices[__pyx_v_i]) < (__pyx_v_self->raw_indices[__pyx_v_j]));\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1313\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1548\n * if d <= r:\n * if self.raw_indices[i] < self.raw_indices[j]:\n * results.add((self.raw_indices[i], self.raw_indices[j])) # <<<<<<<<<<<<<<\n@@ -10909,29 +11652,27 @@\n * results.add((self.raw_indices[j], self.raw_indices[i]))\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_7 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_7);\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_4 = 0;\n+ PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n __pyx_t_7 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_12)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_12)); __pyx_t_12 = 0;\n+ __pyx_t_8 = 0;\n+ __pyx_t_10 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_9)); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_9)); __pyx_t_9 = 0;\n goto __pyx_L17;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1315\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1550\n * results.add((self.raw_indices[i], self.raw_indices[j]))\n * else:\n * results.add((self.raw_indices[j], self.raw_indices[i])) # <<<<<<<<<<<<<<\n@@ -10939,94 +11680,90 @@\n * else: # 1 is a leaf node, 2 is inner node\n *\/\n if (unlikely(((PyObject *)__pyx_v_results) == Py_None)) {\n- PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"add\"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1550; __pyx_clineno = __LINE__; goto __pyx_L1_error;} \n }\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_12 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_12);\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_7 = __Pyx_PyInt_to_py_npy_int32((__pyx_v_self->raw_indices[__pyx_t_10])); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_9 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_j])); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1550; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_8 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_self->raw_indices[__pyx_v_i])); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1550; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1550; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_12);\n- __Pyx_GIVEREF(__pyx_t_12);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_12 = 0;\n- __pyx_t_7 = 0;\n- __pyx_t_13 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ __pyx_t_9 = 0;\n+ __pyx_t_8 = 0;\n+ __pyx_t_10 = PySet_Add(__pyx_v_results, ((PyObject *)__pyx_t_7)); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1550; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n }\n __pyx_L17:;\n goto __pyx_L16;\n }\n __pyx_L16:;\n }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n }\n __pyx_L5:;\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1318\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1553\n * \n * else: # 1 is a leaf node, 2 is inner node\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1319\n- * else: # 1 is a leaf node, 2 is inner node\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1556\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1323\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1560\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1324\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1561\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1325\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1564\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1330\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1569\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1331\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1565; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1570\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -11035,43 +11772,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1335\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1574\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1336\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1575\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1337\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1578\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1342\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1583\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1343\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1579; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1584\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -11085,53 +11822,53 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1347\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1588\n * \n * else: # 1 is an inner node\n * k1 = node1.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1)\n- * \n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n *\/\n __pyx_v_k1 = __pyx_v_node1->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1348\n- * else: # 1 is an inner node\n- * k1 = node1.split_dim\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1591\n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n+ * &part_max_distance1) # <<<<<<<<<<<<<<\n * \n * # node1 goes to box with lesser component along k1\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance1), (&__pyx_v_part_max_distance1));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1352\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1595\n * # node1 goes to box with lesser component along k1\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1] # <<<<<<<<<<<<<<\n * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_max1 = (__pyx_v_rect1.maxes[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1353\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1596\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1]\n * rect1.maxes[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1354\n- * save_max1 = rect1.maxes[k1]\n- * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1599\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1356\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1601\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n@@ -11140,73 +11877,73 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1361\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1606\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1602; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L18;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1363\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1608\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1364\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1611\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1368\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1615\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1369\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1616\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1370\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1619\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1.less, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1375\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1624\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1376\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1620; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1625\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -11215,43 +11952,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1380\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1629\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1381\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1630\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1382\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1633\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1.less, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1387\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1638\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1388\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1634; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1639\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -11262,7 +11999,7 @@\n }\n __pyx_L18:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1390\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1641\n * rect2.mins[k2] = save_min2\n * \n * rect1.maxes[k1] = save_max1 # <<<<<<<<<<<<<<\n@@ -11271,35 +12008,35 @@\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_save_max1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1394\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1645\n * # node1 goes to box with greater component along k1\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1] # <<<<<<<<<<<<<<\n * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_min1 = (__pyx_v_rect1.mins[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1395\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1646\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1]\n * rect1.mins[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1396\n- * save_min1 = rect1.mins[k1]\n- * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1649\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1398\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1651\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n@@ -11308,38 +12045,38 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1403\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1656\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1652; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L19;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1405\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1658\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1406\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1661\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * if node1 != node2:\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1408\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1663\n+ * &part_max_distance2)\n * \n * if node1 != node2: # <<<<<<<<<<<<<<\n * # Avoid traversing (node1.less, node2.greater) and\n@@ -11348,43 +12085,43 @@\n __pyx_t_1 = (__pyx_v_node1 != __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1416\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1671\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1417\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1672\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1418\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1675\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1.greater, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1423\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1680\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1424\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1681\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -11396,43 +12133,43 @@\n }\n __pyx_L20:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1428\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1685\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1429\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1686\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__query_pairs_traverse_checking(results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1430\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1689\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__query_pairs_traverse_checking(results,\n * node1.greater, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1435\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1694\n * r, p, epsfac, invepsfac,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1436\n+ __pyx_t_2 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1695\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -11443,38 +12180,47 @@\n }\n __pyx_L19:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1438\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1697\n * rect2.mins[k2] = save_min2\n * \n * rect1.mins[k1] = save_min1 # <<<<<<<<<<<<<<\n- * \n+ * return 0\n * \n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_save_min1;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1698\n+ * \n+ * rect1.mins[k1] = save_min1\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n }\n __pyx_L3:;\n \n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n __Pyx_XDECREF(__pyx_t_7);\n- __Pyx_XDECREF(__pyx_t_12);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__query_pairs_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_XDECREF(__pyx_t_8);\n+ __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__query_pairs_traverse_checking\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_i);\n- __Pyx_XDECREF(__pyx_v_j);\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_11query_pairs(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n static char __pyx_doc_5scipy_7spatial_7ckdtree_7cKDTree_10query_pairs[] = \"query_pairs(self, r, p, eps)\\n\\n Find all pairs of points whose distance is at most r.\\n\\n Parameters\\n ----------\\n r : positive float\\n The maximum distance.\\n p : float, optional\\n Which Minkowski norm to use. `p` has to meet the condition\\n ``1 <= p <= infinity``.\\n eps : float, optional\\n Approximate search. Branches of the tree are not explored\\n if their nearest points are further than ``r\/(1+eps)``, and\\n branches are added in bulk if their furthest points are nearer\\n than ``r * (1+eps)``. `eps` has to be non-negative.\\n\\n Returns\\n -------\\n results : set\\n Set of pairs ``(i,j)``, with ``i < j`, for which the corresponding\\n positions are close.\\n\\n \";\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_11query_pairs(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n- double __pyx_v_r;\n- double __pyx_v_p;\n- double __pyx_v_eps;\n+ __pyx_t_5numpy_float64_t __pyx_v_r;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_eps;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__r,&__pyx_n_s__p,&__pyx_n_s__eps,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -11509,23 +12255,31 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_pairs\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1441; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"query_pairs\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[1]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1441\n- * \n- * \n- * def query_pairs(cKDTree self, double r, double p=2., double eps=0): # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1701\n+ * \n+ * \n+ * def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2., # <<<<<<<<<<<<<<\n+ * np.float64_t eps=0):\n * \"\"\"query_pairs(self, r, p, eps)\n- * \n- *\/\n- __pyx_v_p = ((double)2.);\n+ *\/\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[2]) {\n } else {\n- __pyx_v_eps = ((double)0.0);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1702\n+ * \n+ * def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,\n+ * np.float64_t eps=0): # <<<<<<<<<<<<<<\n+ * \"\"\"query_pairs(self, r, p, eps)\n+ * \n+ *\/\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -11536,21 +12290,37 @@\n default: goto __pyx_L5_argtuple_error;\n }\n }\n- __pyx_v_r = __pyx_PyFloat_AsDouble(values[0]); if (unlikely((__pyx_v_r == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1441; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_r = __pyx_PyFloat_AsDouble(values[0]); if (unlikely((__pyx_v_r == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n if (values[1]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1441; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1701\n+ * \n+ * \n+ * def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2., # <<<<<<<<<<<<<<\n+ * np.float64_t eps=0):\n+ * \"\"\"query_pairs(self, r, p, eps)\n+ *\/\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n if (values[2]) {\n- __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1441; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_eps = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_eps == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_eps = ((double)0.0);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1702\n+ * \n+ * def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2.,\n+ * np.float64_t eps=0): # <<<<<<<<<<<<<<\n+ * \"\"\"query_pairs(self, r, p, eps)\n+ * \n+ *\/\n+ __pyx_v_eps = ((__pyx_t_5numpy_float64_t)0.0);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"query_pairs\", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1441; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"query_pairs\", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.query_pairs\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -11561,30 +12331,39 @@\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_10query_pairs(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, double __pyx_v_r, double __pyx_v_p, double __pyx_v_eps) {\n- int __pyx_v_i;\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1701\n+ * \n+ * \n+ * def query_pairs(cKDTree self, np.float64_t r, np.float64_t p=2., # <<<<<<<<<<<<<<\n+ * np.float64_t eps=0):\n+ * \"\"\"query_pairs(self, r, p, eps)\n+ *\/\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_10query_pairs(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, __pyx_t_5numpy_float64_t __pyx_v_eps) {\n+ npy_intp __pyx_v_i;\n PyObject *__pyx_v_results = 0;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2;\n- double __pyx_v_epsfac;\n- double __pyx_v_invepsfac;\n- double __pyx_v_min_distance;\n- double __pyx_v_max_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_epsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_invepsfac;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_distance;\n PyObject *__pyx_r = NULL;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n int __pyx_t_3;\n- double __pyx_t_4;\n- int __pyx_t_5;\n- int __pyx_t_6;\n+ __pyx_t_5numpy_float64_t __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n PyObject *__pyx_t_7 = NULL;\n+ int __pyx_t_8;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"query_pairs\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1473\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1734\n * \n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity: # <<<<<<<<<<<<<<\n@@ -11600,7 +12379,7 @@\n }\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1474\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1735\n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity:\n * r = r ** p # <<<<<<<<<<<<<<\n@@ -11612,7 +12391,7 @@\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1477\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1738\n * \n * # fiddle approximation factor\n * if eps == 0: # <<<<<<<<<<<<<<\n@@ -11622,7 +12401,7 @@\n __pyx_t_3 = (__pyx_v_eps == 0.0);\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1478\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1739\n * # fiddle approximation factor\n * if eps == 0:\n * epsfac = 1 # <<<<<<<<<<<<<<\n@@ -11633,7 +12412,7 @@\n goto __pyx_L4;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1479\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1740\n * if eps == 0:\n * epsfac = 1\n * elif p == infinity: # <<<<<<<<<<<<<<\n@@ -11643,7 +12422,7 @@\n __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_3) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1480\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1741\n * epsfac = 1\n * elif p == infinity:\n * epsfac = 1\/(1+eps) # <<<<<<<<<<<<<<\n@@ -11653,14 +12432,14 @@\n __pyx_t_4 = (1.0 + __pyx_v_eps);\n if (unlikely(__pyx_t_4 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1480; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1741; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_4);\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1482\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1743\n * epsfac = 1\/(1+eps)\n * else:\n * epsfac = 1\/(1+eps)**p # <<<<<<<<<<<<<<\n@@ -11670,13 +12449,13 @@\n __pyx_t_4 = pow((1.0 + __pyx_v_eps), __pyx_v_p);\n if (unlikely(__pyx_t_4 == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1482; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1743; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_epsfac = (1.0 \/ __pyx_t_4);\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1483\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1744\n * else:\n * epsfac = 1\/(1+eps)**p\n * invepsfac = 1\/epsfac # <<<<<<<<<<<<<<\n@@ -11685,244 +12464,431 @@\n *\/\n if (unlikely(__pyx_v_epsfac == 0)) {\n PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1744; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_v_invepsfac = (1.0 \/ __pyx_v_epsfac);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1486\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1747\n * \n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m # <<<<<<<<<<<<<<\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try:\n *\/\n __pyx_v_rect1.m = __pyx_v_self->m;\n __pyx_v_rect2.m = __pyx_v_self->m;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1487\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1748\n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1488\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL # <<<<<<<<<<<<<<\n+ * try:\n+ * \n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1749\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1489\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- *\/\n- __pyx_v_rect2.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1490\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- *\/\n- __pyx_v_rect2.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1491\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- *\/\n- __pyx_t_5 = __pyx_v_self->m;\n- for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n- __pyx_v_i = __pyx_t_6;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1492\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = rect1.mins[i]\n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1493\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * rect2.mins[i] = rect1.mins[i]\n- * rect2.maxes[i] = rect2.maxes[i]\n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1494\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = rect1.mins[i] # <<<<<<<<<<<<<<\n- * rect2.maxes[i] = rect2.maxes[i]\n- * \n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_rect1.mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1495\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = rect1.mins[i]\n- * rect2.maxes[i] = rect2.maxes[i] # <<<<<<<<<<<<<<\n- * \n- * # Compute first min and max distances\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_rect2.maxes[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1498\n- * \n- * # Compute first min and max distances\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- *\/\n- __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1499\n- * # Compute first min and max distances\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1500\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * else:\n- * min_distance = 0.\n- *\/\n- __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n- goto __pyx_L7;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1502\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * max_distance = 0.\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try: # <<<<<<<<<<<<<<\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1751\n+ * try:\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1752\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect1.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1753\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1753; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1755\n+ * raise MemoryError\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1756\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect1.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1757\n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1757; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1759\n+ * raise MemoryError\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1760\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect2.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1761\n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1761; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1763\n+ * raise MemoryError\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1764\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect2.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1765\n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n * for i in range(self.m):\n *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1503\n- * else:\n- * min_distance = 0.\n- * max_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- *\/\n- __pyx_v_max_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1504\n- * min_distance = 0.\n- * max_distance = 0.\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1765; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1767\n+ * raise MemoryError\n+ * \n * for i in range(self.m): # <<<<<<<<<<<<<<\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n *\/\n __pyx_t_5 = __pyx_v_self->m;\n for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n __pyx_v_i = __pyx_t_6;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1505\n- * max_distance = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1768\n+ * \n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1506\n+ * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = rect1.mins[i]\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1769\n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * \n- * results = set()\n- *\/\n- __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n- }\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * rect2.mins[i] = rect1.mins[i]\n+ * rect2.maxes[i] = rect2.maxes[i]\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1770\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = rect1.mins[i] # <<<<<<<<<<<<<<\n+ * rect2.maxes[i] = rect2.maxes[i]\n+ * \n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_rect1.mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1771\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = rect1.mins[i]\n+ * rect2.maxes[i] = rect2.maxes[i] # <<<<<<<<<<<<<<\n+ * \n+ * # Compute first min and max distances\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_rect2.maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1774\n+ * \n+ * # Compute first min and max distances\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ *\/\n+ __pyx_t_3 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1775\n+ * # Compute first min and max distances\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1776\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance = 0.\n+ *\/\n+ __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+ goto __pyx_L14;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1778\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1779\n+ * else:\n+ * min_distance = 0.\n+ * max_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_v_max_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1780\n+ * min_distance = 0.\n+ * max_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_t_5 = __pyx_v_self->m;\n+ for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n+ __pyx_v_i = __pyx_t_6;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1781\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1782\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * \n+ * results = set()\n+ *\/\n+ __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+ }\n+ }\n+ __pyx_L14:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1784\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ * results = set() # <<<<<<<<<<<<<<\n+ * self.__query_pairs_traverse_checking(results,\n+ * self.tree, self.tree,\n+ *\/\n+ __pyx_t_7 = PySet_New(0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1784; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_7));\n+ __pyx_v_results = __pyx_t_7;\n+ __pyx_t_7 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1789\n+ * r, p, epsfac, invepsfac,\n+ * rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * \n+ * finally:\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_self->tree, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1785; __pyx_clineno = __LINE__; goto __pyx_L6;}\n }\n- __pyx_L7:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1508\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- * results = set() # <<<<<<<<<<<<<<\n- * self.__query_pairs_traverse_checking(results,\n- * self.tree, self.tree,\n- *\/\n- __pyx_t_7 = PySet_New(0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1508; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_7));\n- __pyx_v_results = __pyx_t_7;\n- __pyx_t_7 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1513\n- * r, p, epsfac, invepsfac,\n- * rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(rect1.mins)\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___query_pairs_traverse_checking(__pyx_v_self, __pyx_v_results, __pyx_v_self->tree, __pyx_v_self->tree, __pyx_v_r, __pyx_v_p, __pyx_v_epsfac, __pyx_v_invepsfac, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1515\n- * min_distance, max_distance)\n- * \n- * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- *\/\n- free(__pyx_v_rect1.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1516\n- * \n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes)\n- *\/\n- free(__pyx_v_rect1.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1517\n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.maxes)\n- * \n- *\/\n- free(__pyx_v_rect2.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1518\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1793\n+ * finally:\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.mins)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L7;\n+ __pyx_L6: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+ __pyx_t_3 = (__pyx_v_rect1.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1794\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.mins);\n+ goto __pyx_L18;\n+ }\n+ __pyx_L18:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1796\n+ * stdlib.free(rect1.mins)\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.maxes)\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect1.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1797\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.maxes);\n+ goto __pyx_L19;\n+ }\n+ __pyx_L19:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1799\n+ * stdlib.free(rect1.maxes)\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.mins)\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect2.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1800\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect2.mins);\n+ goto __pyx_L20;\n+ }\n+ __pyx_L20:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1802\n+ * stdlib.free(rect2.mins)\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.maxes)\n+ * \n+ *\/\n+ __pyx_t_3 = (__pyx_v_rect2.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_3) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1803\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n * \n * return results\n *\/\n- free(__pyx_v_rect2.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1520\n- * stdlib.free(rect2.maxes)\n+ free(__pyx_v_rect2.maxes);\n+ goto __pyx_L21;\n+ }\n+ __pyx_L21:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1805\n+ * stdlib.free(rect2.maxes)\n * \n * return results # <<<<<<<<<<<<<<\n * \n@@ -11946,766 +12912,857 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":1525\n+\/* \"scipy\/spatial\/ckdtree.pyx\":1810\n * # count_neighbors\n * # ---------------\n- * cdef void __count_neighbors_traverse(cKDTree self, cKDTree other, # <<<<<<<<<<<<<<\n- * int n_queries, double* r, np.int_t* results, np.int_t* idx,\n- * innernode* node1, innernode* node2,\n- *\/\n-\n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___count_neighbors_traverse(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, int __pyx_v_n_queries, double *__pyx_v_r, __pyx_t_5numpy_int_t *__pyx_v_results, __pyx_t_5numpy_int_t *__pyx_v_idx, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, double __pyx_v_p, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, double __pyx_v_min_distance, double __pyx_v_max_distance) {\n+ * cdef int __count_neighbors_traverse(cKDTree self, # <<<<<<<<<<<<<<\n+ * cKDTree other,\n+ * np.npy_intp n_queries,\n+ *\/\n+\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___count_neighbors_traverse(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, npy_intp __pyx_v_n_queries, __pyx_t_5numpy_float64_t *__pyx_v_r, npy_intp *__pyx_v_results, npy_intp *__pyx_v_idx, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, __pyx_t_5numpy_float64_t __pyx_v_p, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n- int __pyx_v_k1;\n- int __pyx_v_k2;\n- double __pyx_v_save_min1;\n- double __pyx_v_save_max1;\n- double __pyx_v_save_min2;\n- double __pyx_v_save_max2;\n- double __pyx_v_part_min_distance1;\n- double __pyx_v_part_max_distance1;\n- double __pyx_v_part_min_distance2;\n- double __pyx_v_part_max_distance2;\n- __pyx_t_5numpy_int_t *__pyx_v_old_idx;\n- int __pyx_v_old_n_queries;\n- int __pyx_v_i;\n- int __pyx_v_j;\n- double __pyx_v_d;\n- int __pyx_v_l;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min2;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ npy_intp *__pyx_v_old_idx;\n+ npy_intp __pyx_v_old_n_queries;\n+ npy_intp __pyx_v_k1;\n+ npy_intp __pyx_v_k2;\n+ npy_intp __pyx_v_l;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- int __pyx_t_2;\n- int __pyx_t_3;\n- __pyx_t_5numpy_int_t __pyx_t_4;\n- int __pyx_t_5;\n- int __pyx_t_6;\n- int __pyx_t_7;\n- int __pyx_t_8;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n+ npy_intp __pyx_t_7;\n+ npy_intp __pyx_t_8;\n+ int __pyx_t_9;\n+ int __pyx_lineno = 0;\n+ const char *__pyx_filename = NULL;\n+ int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__count_neighbors_traverse\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1537\n- * cdef double save_min1, save_max1\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0.\n- * cdef np.int_t *old_idx\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1828\n+ * cdef np.float64_t save_min1, save_max1\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0.\n+ * cdef np.float64_t d\n *\/\n __pyx_v_part_min_distance1 = 0.;\n __pyx_v_part_max_distance1 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1538\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0.\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n- * cdef np.int_t *old_idx\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1829\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0.\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t d\n+ * cdef np.npy_intp *old_idx\n *\/\n __pyx_v_part_min_distance2 = 0.;\n __pyx_v_part_max_distance2 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1543\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1836\n * # Speed through pairs of nodes all of whose children are close\n * # and see if any work remains to be done\n * old_idx = idx # <<<<<<<<<<<<<<\n- * idx = <np.int_t*>stdlib.malloc(n_queries * sizeof(np.int_t))\n- * old_n_queries = n_queries\n+ * \n+ * \n *\/\n __pyx_v_old_idx = __pyx_v_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1544\n- * # and see if any work remains to be done\n- * old_idx = idx\n- * idx = <np.int_t*>stdlib.malloc(n_queries * sizeof(np.int_t)) # <<<<<<<<<<<<<<\n- * old_n_queries = n_queries\n- * n_queries = 0\n- *\/\n- __pyx_v_idx = ((__pyx_t_5numpy_int_t *)malloc((__pyx_v_n_queries * (sizeof(__pyx_t_5numpy_int_t)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1545\n- * old_idx = idx\n- * idx = <np.int_t*>stdlib.malloc(n_queries * sizeof(np.int_t))\n- * old_n_queries = n_queries # <<<<<<<<<<<<<<\n- * n_queries = 0\n- * \n- *\/\n- __pyx_v_old_n_queries = __pyx_v_n_queries;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1546\n- * idx = <np.int_t*>stdlib.malloc(n_queries * sizeof(np.int_t))\n- * old_n_queries = n_queries\n- * n_queries = 0 # <<<<<<<<<<<<<<\n- * \n- * for i in xrange(old_n_queries):\n- *\/\n- __pyx_v_n_queries = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1548\n- * n_queries = 0\n- * \n- * for i in xrange(old_n_queries): # <<<<<<<<<<<<<<\n- * if max_distance < r[old_idx[i]]:\n- * results[old_idx[i]] += node1.children * node2.children\n- *\/\n- __pyx_t_1 = __pyx_v_old_n_queries;\n- for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n- __pyx_v_i = __pyx_t_2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1549\n- * \n- * for i in xrange(old_n_queries):\n- * if max_distance < r[old_idx[i]]: # <<<<<<<<<<<<<<\n- * results[old_idx[i]] += node1.children * node2.children\n- * elif min_distance <= r[old_idx[i]]:\n- *\/\n- __pyx_t_3 = (__pyx_v_max_distance < (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1550\n- * for i in xrange(old_n_queries):\n- * if max_distance < r[old_idx[i]]:\n- * results[old_idx[i]] += node1.children * node2.children # <<<<<<<<<<<<<<\n- * elif min_distance <= r[old_idx[i]]:\n- * idx[n_queries] = old_idx[i]\n- *\/\n- __pyx_t_4 = (__pyx_v_old_idx[__pyx_v_i]);\n- (__pyx_v_results[__pyx_t_4]) = ((__pyx_v_results[__pyx_t_4]) + (__pyx_v_node1->children * __pyx_v_node2->children));\n- goto __pyx_L5;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1551\n- * if max_distance < r[old_idx[i]]:\n- * results[old_idx[i]] += node1.children * node2.children\n- * elif min_distance <= r[old_idx[i]]: # <<<<<<<<<<<<<<\n- * idx[n_queries] = old_idx[i]\n- * n_queries += 1\n- *\/\n- __pyx_t_3 = (__pyx_v_min_distance <= (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1552\n- * results[old_idx[i]] += node1.children * node2.children\n- * elif min_distance <= r[old_idx[i]]:\n- * idx[n_queries] = old_idx[i] # <<<<<<<<<<<<<<\n- * n_queries += 1\n- * \n- *\/\n- (__pyx_v_idx[__pyx_v_n_queries]) = (__pyx_v_old_idx[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1553\n- * elif min_distance <= r[old_idx[i]]:\n- * idx[n_queries] = old_idx[i]\n- * n_queries += 1 # <<<<<<<<<<<<<<\n- * \n- * if n_queries >= 0:\n- *\/\n- __pyx_v_n_queries = (__pyx_v_n_queries + 1);\n- goto __pyx_L5;\n- }\n- __pyx_L5:;\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1555\n- * n_queries += 1\n- * \n- * if n_queries >= 0: # <<<<<<<<<<<<<<\n- * # OK, need to probe a bit deeper\n- * if node1.split_dim == -1: # 1 is leaf node\n- *\/\n- __pyx_t_3 = (__pyx_v_n_queries >= 0);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1557\n- * if n_queries >= 0:\n- * # OK, need to probe a bit deeper\n- * if node1.split_dim == -1: # 1 is leaf node # <<<<<<<<<<<<<<\n- * lnode1 = <leafnode*>node1\n- * \n- *\/\n- __pyx_t_3 = (__pyx_v_node1->split_dim == -1);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1558\n- * # OK, need to probe a bit deeper\n- * if node1.split_dim == -1: # 1 is leaf node\n- * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n- * \n- * if node2.split_dim == -1: # 1 & 2 are leaves\n- *\/\n- __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1560\n- * lnode1 = <leafnode*>node1\n- * \n- * if node2.split_dim == -1: # 1 & 2 are leaves # <<<<<<<<<<<<<<\n- * lnode2 = <leafnode*>node2\n- * \n- *\/\n- __pyx_t_3 = (__pyx_v_node2->split_dim == -1);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1561\n- * \n- * if node2.split_dim == -1: # 1 & 2 are leaves\n- * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n- * \n- * # brute-force\n- *\/\n- __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1564\n- * \n- * # brute-force\n- * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n- * for j in range(lnode2.start_idx, lnode2.end_idx):\n- * d = _distance_p(\n- *\/\n- __pyx_t_1 = __pyx_v_lnode1->end_idx;\n- for (__pyx_t_2 = __pyx_v_lnode1->start_idx; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n- __pyx_v_i = __pyx_t_2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1565\n- * # brute-force\n- * for i in range(lnode1.start_idx, lnode1.end_idx):\n- * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m,\n- *\/\n- __pyx_t_5 = __pyx_v_lnode2->end_idx;\n- for (__pyx_t_6 = __pyx_v_lnode2->start_idx; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n- __pyx_v_j = __pyx_t_6;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1569\n- * self.raw_data + self.raw_indices[i] * self.m,\n- * other.raw_data + other.raw_indices[j] * other.m,\n- * p, self.m, max_distance) # <<<<<<<<<<<<<<\n- * \n- * # I think it's usually cheaper to test d against all r's\n- *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1574\n- * # than to generate a distance array, sort it, then\n- * # search for all r's via binary search\n- * for l in range(n_queries): # <<<<<<<<<<<<<<\n- * if d <= r[idx[l]]:\n- * results[idx[l]] += 1\n- *\/\n- __pyx_t_7 = __pyx_v_n_queries;\n- for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) {\n- __pyx_v_l = __pyx_t_8;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1575\n- * # search for all r's via binary search\n- * for l in range(n_queries):\n- * if d <= r[idx[l]]: # <<<<<<<<<<<<<<\n- * results[idx[l]] += 1\n- * \n- *\/\n- __pyx_t_3 = (__pyx_v_d <= (__pyx_v_r[(__pyx_v_idx[__pyx_v_l])]));\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1576\n- * for l in range(n_queries):\n- * if d <= r[idx[l]]:\n- * results[idx[l]] += 1 # <<<<<<<<<<<<<<\n- * \n- * else: # 1 is a leaf node, 2 is inner node\n- *\/\n- __pyx_t_4 = (__pyx_v_idx[__pyx_v_l]);\n- (__pyx_v_results[__pyx_t_4]) = ((__pyx_v_results[__pyx_t_4]) + 1);\n- goto __pyx_L15;\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1839\n+ * \n+ * \n+ * try: # <<<<<<<<<<<<<<\n+ * \n+ * idx = <np.npy_intp *> stdlib.malloc(n_queries * sizeof(np.npy_intp ))\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1841\n+ * try:\n+ * \n+ * idx = <np.npy_intp *> stdlib.malloc(n_queries * sizeof(np.npy_intp )) # <<<<<<<<<<<<<<\n+ * if idx == <np.npy_intp *> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_idx = ((npy_intp *)malloc((__pyx_v_n_queries * (sizeof(npy_intp)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1842\n+ * \n+ * idx = <np.npy_intp *> stdlib.malloc(n_queries * sizeof(np.npy_intp ))\n+ * if idx == <np.npy_intp *> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_idx == ((npy_intp *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1843\n+ * idx = <np.npy_intp *> stdlib.malloc(n_queries * sizeof(np.npy_intp ))\n+ * if idx == <np.npy_intp *> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * old_n_queries = n_queries\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1843; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1845\n+ * raise MemoryError\n+ * \n+ * old_n_queries = n_queries # <<<<<<<<<<<<<<\n+ * n_queries = 0\n+ * \n+ *\/\n+ __pyx_v_old_n_queries = __pyx_v_n_queries;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1846\n+ * \n+ * old_n_queries = n_queries\n+ * n_queries = 0 # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(old_n_queries):\n+ *\/\n+ __pyx_v_n_queries = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1848\n+ * n_queries = 0\n+ * \n+ * for i in range(old_n_queries): # <<<<<<<<<<<<<<\n+ * if max_distance < r[old_idx[i]]:\n+ * results[old_idx[i]] += node1.children * node2.children\n+ *\/\n+ __pyx_t_2 = __pyx_v_old_n_queries;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1849\n+ * \n+ * for i in range(old_n_queries):\n+ * if max_distance < r[old_idx[i]]: # <<<<<<<<<<<<<<\n+ * results[old_idx[i]] += node1.children * node2.children\n+ * elif min_distance <= r[old_idx[i]]:\n+ *\/\n+ __pyx_t_1 = (__pyx_v_max_distance < (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1850\n+ * for i in range(old_n_queries):\n+ * if max_distance < r[old_idx[i]]:\n+ * results[old_idx[i]] += node1.children * node2.children # <<<<<<<<<<<<<<\n+ * elif min_distance <= r[old_idx[i]]:\n+ * idx[n_queries] = old_idx[i]\n+ *\/\n+ __pyx_t_4 = (__pyx_v_old_idx[__pyx_v_i]);\n+ (__pyx_v_results[__pyx_t_4]) = ((__pyx_v_results[__pyx_t_4]) + (__pyx_v_node1->children * __pyx_v_node2->children));\n+ goto __pyx_L9;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1851\n+ * if max_distance < r[old_idx[i]]:\n+ * results[old_idx[i]] += node1.children * node2.children\n+ * elif min_distance <= r[old_idx[i]]: # <<<<<<<<<<<<<<\n+ * idx[n_queries] = old_idx[i]\n+ * n_queries += 1\n+ *\/\n+ __pyx_t_1 = (__pyx_v_min_distance <= (__pyx_v_r[(__pyx_v_old_idx[__pyx_v_i])]));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1852\n+ * results[old_idx[i]] += node1.children * node2.children\n+ * elif min_distance <= r[old_idx[i]]:\n+ * idx[n_queries] = old_idx[i] # <<<<<<<<<<<<<<\n+ * n_queries += 1\n+ * \n+ *\/\n+ (__pyx_v_idx[__pyx_v_n_queries]) = (__pyx_v_old_idx[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1853\n+ * elif min_distance <= r[old_idx[i]]:\n+ * idx[n_queries] = old_idx[i]\n+ * n_queries += 1 # <<<<<<<<<<<<<<\n+ * \n+ * if n_queries >= 0:\n+ *\/\n+ __pyx_v_n_queries = (__pyx_v_n_queries + 1);\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1855\n+ * n_queries += 1\n+ * \n+ * if n_queries >= 0: # <<<<<<<<<<<<<<\n+ * # OK, need to probe a bit deeper\n+ * if node1.split_dim == -1: # 1 is leaf node\n+ *\/\n+ __pyx_t_1 = (__pyx_v_n_queries >= 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1857\n+ * if n_queries >= 0:\n+ * # OK, need to probe a bit deeper\n+ * if node1.split_dim == -1: # 1 is leaf node # <<<<<<<<<<<<<<\n+ * lnode1 = <leafnode*>node1\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1858\n+ * # OK, need to probe a bit deeper\n+ * if node1.split_dim == -1: # 1 is leaf node\n+ * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n+ * \n+ * if node2.split_dim == -1: # 1 & 2 are leaves\n+ *\/\n+ __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1860\n+ * lnode1 = <leafnode*>node1\n+ * \n+ * if node2.split_dim == -1: # 1 & 2 are leaves # <<<<<<<<<<<<<<\n+ * lnode2 = <leafnode*>node2\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1861\n+ * \n+ * if node2.split_dim == -1: # 1 & 2 are leaves\n+ * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n+ * \n+ * # brute-force\n+ *\/\n+ __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1864\n+ * \n+ * # brute-force\n+ * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n+ * for j in range(lnode2.start_idx, lnode2.end_idx):\n+ * d = _distance_p(\n+ *\/\n+ __pyx_t_2 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1865\n+ * # brute-force\n+ * for i in range(lnode1.start_idx, lnode1.end_idx):\n+ * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n+ * d = _distance_p(\n+ * self.raw_data + self.raw_indices[i] * self.m,\n+ *\/\n+ __pyx_t_4 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_5 = __pyx_v_lnode2->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_j = __pyx_t_5;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1869\n+ * self.raw_data + self.raw_indices[i] * self.m,\n+ * other.raw_data + other.raw_indices[j] * other.m,\n+ * p, self.m, max_distance) # <<<<<<<<<<<<<<\n+ * \n+ * # I think it's usually cheaper to test d against all r's\n+ *\/\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_other->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_max_distance);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1874\n+ * # than to generate a distance array, sort it, then\n+ * # search for all r's via binary search\n+ * for l in range(n_queries): # <<<<<<<<<<<<<<\n+ * if d <= r[idx[l]]:\n+ * results[idx[l]] += 1\n+ *\/\n+ __pyx_t_6 = __pyx_v_n_queries;\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n+ __pyx_v_l = __pyx_t_7;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1875\n+ * # search for all r's via binary search\n+ * for l in range(n_queries):\n+ * if d <= r[idx[l]]: # <<<<<<<<<<<<<<\n+ * results[idx[l]] += 1\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_d <= (__pyx_v_r[(__pyx_v_idx[__pyx_v_l])]));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1876\n+ * for l in range(n_queries):\n+ * if d <= r[idx[l]]:\n+ * results[idx[l]] += 1 # <<<<<<<<<<<<<<\n+ * \n+ * else: # 1 is a leaf node, 2 is inner node\n+ *\/\n+ __pyx_t_8 = (__pyx_v_idx[__pyx_v_l]);\n+ (__pyx_v_results[__pyx_t_8]) = ((__pyx_v_results[__pyx_t_8]) + 1);\n+ goto __pyx_L19;\n+ }\n+ __pyx_L19:;\n }\n- __pyx_L15:;\n }\n }\n+ goto __pyx_L12;\n }\n- goto __pyx_L8;\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1879\n+ * \n+ * else: # 1 is a leaf node, 2 is inner node\n+ * k2 = node2.split_dim # <<<<<<<<<<<<<<\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ *\/\n+ __pyx_v_k2 = __pyx_v_node2->split_dim;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1882\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with lesser component along k2\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1886\n+ * # node2 goes to box with lesser component along k2\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1887\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2]\n+ * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1890\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1, node2.less,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1894\n+ * node1, node2.less,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = save_max2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1891; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1895\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with greater component along k2\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1899\n+ * # node2 goes to box with greater component along k2\n+ * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n+ * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1900\n+ * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n+ * save_min2 = rect2.mins[k2]\n+ * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1903\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1, node2.greater,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1907\n+ * node1, node2.greater,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = save_min2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1904; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1908\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n+ }\n+ __pyx_L12:;\n+ goto __pyx_L11;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1579\n- * \n- * else: # 1 is a leaf node, 2 is inner node\n- * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n- *\/\n- __pyx_v_k2 = __pyx_v_node2->split_dim;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1580\n- * else: # 1 is a leaf node, 2 is inner node\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with lesser component along k2\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1584\n- * # node2 goes to box with lesser component along k2\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1585\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1586\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1, node2.less,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1590\n- * node1, node2.less,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = save_max2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1591\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with greater component along k2\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1595\n- * # node2 goes to box with greater component along k2\n- * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n- * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1596\n- * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1597\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1, node2.greater,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1601\n- * node1, node2.greater,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = save_min2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1602\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1912\n+ * \n+ * else: # 1 is an inner node\n+ * k1 = node1.split_dim # <<<<<<<<<<<<<<\n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n+ *\/\n+ __pyx_v_k1 = __pyx_v_node1->split_dim;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1915\n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n+ * &part_max_distance1) # <<<<<<<<<<<<<<\n+ * \n+ * # node1 goes to box with lesser component along k1\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance1), (&__pyx_v_part_max_distance1));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1919\n+ * # node1 goes to box with lesser component along k1\n+ * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n+ * save_max1 = rect1.maxes[k1] # <<<<<<<<<<<<<<\n+ * rect1.maxes[k1] = node1.split\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ *\/\n+ __pyx_v_save_max1 = (__pyx_v_rect1.maxes[__pyx_v_k1]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1920\n+ * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n+ * save_max1 = rect1.maxes[k1]\n+ * rect1.maxes[k1] = node1.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_node1->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1923\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n+ * \n+ * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1925\n+ * part_max_distance1)\n+ * \n+ * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.less, node2,\n+ *\/\n+ __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1929\n+ * node1.less, node2,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * else: # 1 and 2 are inner nodes\n+ * k2 = node2.split_dim\n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1926; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L20;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1931\n+ * min_distance, max_distance)\n+ * else: # 1 and 2 are inner nodes\n+ * k2 = node2.split_dim # <<<<<<<<<<<<<<\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ *\/\n+ __pyx_v_k2 = __pyx_v_node2->split_dim;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1934\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with lesser component along k2\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1938\n+ * # node2 goes to box with lesser component along k2\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1939\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2]\n+ * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1942\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.less, node2.less,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1946\n+ * node1.less, node2.less,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = save_max2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1943; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1947\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with greater component along k2\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1951\n+ * # node2 goes to box with greater component along k2\n+ * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n+ * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1952\n+ * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n+ * save_min2 = rect2.mins[k2]\n+ * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1955\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.less, node2.greater,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1959\n+ * node1.less, node2.greater,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = save_min2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1956; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1960\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n+ * \n+ * rect1.maxes[k1] = save_max1\n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n+ }\n+ __pyx_L20:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1962\n+ * rect2.mins[k2] = save_min2\n+ * \n+ * rect1.maxes[k1] = save_max1 # <<<<<<<<<<<<<<\n+ * \n+ * # node1 goes to box with greater component along k1\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_save_max1;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1966\n+ * # node1 goes to box with greater component along k1\n+ * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n+ * save_min1 = rect1.mins[k1] # <<<<<<<<<<<<<<\n+ * rect1.mins[k1] = node1.split\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ *\/\n+ __pyx_v_save_min1 = (__pyx_v_rect1.mins[__pyx_v_k1]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1967\n+ * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n+ * save_min1 = rect1.mins[k1]\n+ * rect1.mins[k1] = node1.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_node1->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1970\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n+ * \n+ * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1972\n+ * part_max_distance1)\n+ * \n+ * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.greater, node2,\n+ *\/\n+ __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1976\n+ * node1.greater, node2,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * else: # 1 and 2 are inner nodes\n+ * k2 = node2.split_dim\n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1973; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+ goto __pyx_L21;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1978\n+ * min_distance, max_distance)\n+ * else: # 1 and 2 are inner nodes\n+ * k2 = node2.split_dim # <<<<<<<<<<<<<<\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ *\/\n+ __pyx_v_k2 = __pyx_v_node2->split_dim;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1981\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with lesser component along k2\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1985\n+ * # node2 goes to box with lesser component along k2\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1986\n+ * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n+ * save_max2 = rect2.maxes[k2]\n+ * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1989\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.greater, node2.less,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1993\n+ * node1.greater, node2.less,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.maxes[k2] = save_max2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1990; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1994\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n+ * \n+ * # node2 goes to box with greater component along k2\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1998\n+ * # node2 goes to box with greater component along k2\n+ * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n+ * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = node2.split\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ *\/\n+ __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1999\n+ * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n+ * save_min2 = rect2.mins[k2]\n+ * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2002\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n+ * node1.greater, node2.greater,\n+ *\/\n+ __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2006\n+ * node1.greater, node2.greater,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * rect2.mins[k2] = save_min2\n+ * \n+ *\/\n+ __pyx_t_9 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2003; __pyx_clineno = __LINE__; goto __pyx_L4;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2007\n+ * p, rect1, rect2,\n+ * min_distance, max_distance)\n+ * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n+ * \n+ * rect1.mins[k1] = save_min1\n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n+ }\n+ __pyx_L21:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2009\n+ * rect2.mins[k2] = save_min2\n+ * \n+ * rect1.mins[k1] = save_min1 # <<<<<<<<<<<<<<\n+ * finally:\n+ * # Free memory\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_save_min1;\n }\n- __pyx_L8:;\n- goto __pyx_L7;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1606\n- * \n- * else: # 1 is an inner node\n- * k1 = node1.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1)\n- * \n- *\/\n- __pyx_v_k1 = __pyx_v_node1->split_dim;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1607\n- * else: # 1 is an inner node\n- * k1 = node1.split_dim\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1) # <<<<<<<<<<<<<<\n- * \n- * # node1 goes to box with lesser component along k1\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance1), (&__pyx_v_part_max_distance1));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1611\n- * # node1 goes to box with lesser component along k1\n- * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n- * save_max1 = rect1.maxes[k1] # <<<<<<<<<<<<<<\n- * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- *\/\n- __pyx_v_save_max1 = (__pyx_v_rect1.maxes[__pyx_v_k1]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1612\n- * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n- * save_max1 = rect1.maxes[k1]\n- * rect1.maxes[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_node1->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1613\n- * save_max1 = rect1.maxes[k1]\n- * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n- * \n- * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1615\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n- * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.less, node2,\n- *\/\n- __pyx_t_3 = (__pyx_v_node2->split_dim == -1);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1619\n- * node1.less, node2,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n- goto __pyx_L16;\n+ __pyx_L11:;\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2012\n+ * finally:\n+ * # Free memory\n+ * if idx != <np.npy_intp *> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(idx)\n+ * return 0\n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L5;\n+ __pyx_L4: {\n+ __pyx_why = 4;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+ __pyx_t_1 = (__pyx_v_idx != ((npy_intp *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2013\n+ * # Free memory\n+ * if idx != <np.npy_intp *> NULL:\n+ * stdlib.free(idx) # <<<<<<<<<<<<<<\n+ * return 0\n+ * \n+ *\/\n+ free(__pyx_v_idx);\n+ goto __pyx_L23;\n+ }\n+ __pyx_L23:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1621\n- * min_distance, max_distance)\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n- *\/\n- __pyx_v_k2 = __pyx_v_node2->split_dim;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1622\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with lesser component along k2\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1626\n- * # node2 goes to box with lesser component along k2\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1627\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1628\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.less, node2.less,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1632\n- * node1.less, node2.less,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = save_max2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1633\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with greater component along k2\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1637\n- * # node2 goes to box with greater component along k2\n- * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n- * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1638\n- * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1639\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.less, node2.greater,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1643\n- * node1.less, node2.greater,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = save_min2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1644\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n- * \n- * rect1.maxes[k1] = save_max1\n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n- }\n- __pyx_L16:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1646\n- * rect2.mins[k2] = save_min2\n- * \n- * rect1.maxes[k1] = save_max1 # <<<<<<<<<<<<<<\n- * \n- * # node1 goes to box with greater component along k1\n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_save_max1;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1650\n- * # node1 goes to box with greater component along k1\n- * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n- * save_min1 = rect1.mins[k1] # <<<<<<<<<<<<<<\n- * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- *\/\n- __pyx_v_save_min1 = (__pyx_v_rect1.mins[__pyx_v_k1]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1651\n- * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n- * save_min1 = rect1.mins[k1]\n- * rect1.mins[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_node1->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1652\n- * save_min1 = rect1.mins[k1]\n- * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n- * \n- * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1654\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n- * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.greater, node2,\n- *\/\n- __pyx_t_3 = (__pyx_v_node2->split_dim == -1);\n- if (__pyx_t_3) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1658\n- * node1.greater, node2,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n- goto __pyx_L17;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1660\n- * min_distance, max_distance)\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n- *\/\n- __pyx_v_k2 = __pyx_v_node2->split_dim;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1661\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with lesser component along k2\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1665\n- * # node2 goes to box with lesser component along k2\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1666\n- * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1667\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.greater, node2.less,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1671\n- * node1.greater, node2.less,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.maxes[k2] = save_max2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1672\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n- * \n- * # node2 goes to box with greater component along k2\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1676\n- * # node2 goes to box with greater component along k2\n- * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n- * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- *\/\n- __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1677\n- * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1678\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other, n_queries, r, results, idx,\n- * node1.greater, node2.greater,\n- *\/\n- __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1682\n- * node1.greater, node2.greater,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * rect2.mins[k2] = save_min2\n- * \n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, __pyx_v_r, __pyx_v_results, __pyx_v_idx, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1683\n- * p, rect1, rect2,\n- * min_distance, max_distance)\n- * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n- * \n- * rect1.mins[k1] = save_min1\n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_save_min2;\n- }\n- __pyx_L17:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1685\n- * rect2.mins[k2] = save_min2\n- * \n- * rect1.mins[k1] = save_min1 # <<<<<<<<<<<<<<\n- * \n- * # Free memory\n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_save_min1;\n- }\n- __pyx_L7:;\n- goto __pyx_L6;\n+ }\n }\n- __pyx_L6:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1688\n- * \n- * # Free memory\n- * stdlib.free(idx) # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- free(__pyx_v_idx);\n-\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2014\n+ * if idx != <np.npy_intp *> NULL:\n+ * stdlib.free(idx)\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__count_neighbors_traverse\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n \/* Python wrapper *\/\n@@ -12714,7 +13771,7 @@\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_13count_neighbors(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other = 0;\n PyObject *__pyx_v_r = 0;\n- double __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__other,&__pyx_n_s__r,&__pyx_n_s__p,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -12741,7 +13798,7 @@\n values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__r);\n if (likely(values[1])) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"count_neighbors\", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"count_neighbors\", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2019; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n case 2:\n if (kw_args > 0) {\n@@ -12750,19 +13807,19 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"count_neighbors\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"count_neighbors\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2019; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[2]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1691\n- * \n- * \n- * def count_neighbors(cKDTree self, cKDTree other, object r, double p=2.): # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2019\n+ * @cython.boundscheck(False)\n+ * @cython.wraparound(False)\n+ * def count_neighbors(cKDTree self, cKDTree other, object r, np.float64_t p=2.): # <<<<<<<<<<<<<<\n * \"\"\"count_neighbors(self, other, r, p)\n * \n *\/\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -12776,20 +13833,20 @@\n __pyx_v_other = ((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)values[0]);\n __pyx_v_r = values[1];\n if (values[2]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2019; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"count_neighbors\", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"count_neighbors\", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2019; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.count_neighbors\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2019; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_r = __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_12count_neighbors(((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_r, __pyx_v_p);\n goto __pyx_L0;\n __pyx_L1_error:;\n@@ -12799,13 +13856,13 @@\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_12count_neighbors(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_r, double __pyx_v_p) {\n- int __pyx_v_i;\n- int __pyx_v_n_queries;\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_12count_neighbors(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, PyObject *__pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_n_queries;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2;\n- double __pyx_v_min_distance;\n- double __pyx_v_max_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_distance;\n PyArrayObject *__pyx_v_real_r = 0;\n PyArrayObject *__pyx_v_results = 0;\n PyArrayObject *__pyx_v_idx = 0;\n@@ -12829,11 +13886,11 @@\n PyObject *__pyx_t_10 = NULL;\n PyObject *__pyx_t_11 = NULL;\n Py_ssize_t __pyx_t_12;\n- int __pyx_t_13;\n- int __pyx_t_14;\n- int __pyx_t_15;\n- int __pyx_t_16;\n- int __pyx_t_17;\n+ npy_intp __pyx_t_13;\n+ npy_intp __pyx_t_14;\n+ npy_intp __pyx_t_15;\n+ npy_intp __pyx_t_16;\n+ npy_intp __pyx_t_17;\n PyArrayObject *__pyx_t_18 = NULL;\n long __pyx_t_19;\n int __pyx_lineno = 0;\n@@ -12853,7 +13910,7 @@\n __pyx_pybuffernd_idx.data = NULL;\n __pyx_pybuffernd_idx.rcbuffer = &__pyx_pybuffer_idx;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1729\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2057\n * \n * # Make sure trees are compatible\n * if self.m != other.m: # <<<<<<<<<<<<<<\n@@ -12863,95 +13920,95 @@\n __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1730\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2058\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # Make a copy of r array to ensure it's contiguous and to modify it\n *\/\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_15), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1730; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_15), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_Raise(__pyx_t_2, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1730; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1734\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2062\n * # Make a copy of r array to ensure it's contiguous and to modify it\n * # below\n * if np.shape(r) == (): # <<<<<<<<<<<<<<\n- * real_r = np.array([r], dtype=np.double)\n+ * real_r = np.ascontiguousarray([r], dtype=np.float64)\n * n_queries = 1\n *\/\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(__pyx_v_r);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_r);\n __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, ((PyObject *)__pyx_empty_tuple), Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, ((PyObject *)__pyx_empty_tuple), Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2062; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1735\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2063\n * # below\n * if np.shape(r) == ():\n- * real_r = np.array([r], dtype=np.double) # <<<<<<<<<<<<<<\n+ * real_r = np.ascontiguousarray([r], dtype=np.float64) # <<<<<<<<<<<<<<\n * n_queries = 1\n * elif len(np.shape(r))==1:\n *\/\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__array); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(__pyx_v_r);\n PyList_SET_ITEM(__pyx_t_2, 0, __pyx_v_r);\n __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));\n __Pyx_GIVEREF(((PyObject *)__pyx_t_2));\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__float64); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_7 = ((PyArrayObject *)__pyx_t_6);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_v_real_r, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_v_real_r, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -12959,89 +14016,89 @@\n }\n }\n __pyx_pybuffernd_real_r.diminfo[0].strides = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_real_r.diminfo[0].shape = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_7 = 0;\n __pyx_v_real_r = ((PyArrayObject *)__pyx_t_6);\n __pyx_t_6 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1736\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2064\n * if np.shape(r) == ():\n- * real_r = np.array([r], dtype=np.double)\n+ * real_r = np.ascontiguousarray([r], dtype=np.float64)\n * n_queries = 1 # <<<<<<<<<<<<<<\n * elif len(np.shape(r))==1:\n- * real_r = np.array(r, dtype=np.double)\n+ * real_r = np.ascontiguousarray(r, dtype=np.float64)\n *\/\n __pyx_v_n_queries = 1;\n goto __pyx_L4;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1737\n- * real_r = np.array([r], dtype=np.double)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2065\n+ * real_r = np.ascontiguousarray([r], dtype=np.float64)\n * n_queries = 1\n * elif len(np.shape(r))==1: # <<<<<<<<<<<<<<\n- * real_r = np.array(r, dtype=np.double)\n+ * real_r = np.ascontiguousarray(r, dtype=np.float64)\n * n_queries = r.shape[0]\n *\/\n- __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2065; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2065; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2065; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_INCREF(__pyx_v_r);\n PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_r);\n __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2065; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n- __pyx_t_12 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_12 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2065; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __pyx_t_1 = (__pyx_t_12 == 1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1738\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2066\n * n_queries = 1\n * elif len(np.shape(r))==1:\n- * real_r = np.array(r, dtype=np.double) # <<<<<<<<<<<<<<\n+ * real_r = np.ascontiguousarray(r, dtype=np.float64) # <<<<<<<<<<<<<<\n * n_queries = r.shape[0]\n * else:\n *\/\n- __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_6 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__array); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(__pyx_v_r);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_r);\n __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__float64); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_3), ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_7 = ((PyArrayObject *)__pyx_t_5);\n {\n __Pyx_BufFmt_StackElem __pyx_stack[1];\n __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n if (unlikely(__pyx_t_8 < 0)) {\n PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_v_real_r, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_real_r.rcbuffer->pybuffer, (PyObject*)__pyx_v_real_r, &__Pyx_TypeInfo_nn___pyx_t_5numpy_float64_t, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n __Pyx_RaiseBufferFallbackError();\n } else {\n@@ -13049,115 +14106,88 @@\n }\n }\n __pyx_pybuffernd_real_r.diminfo[0].strides = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_real_r.diminfo[0].shape = __pyx_pybuffernd_real_r.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_t_7 = 0;\n __pyx_v_real_r = ((PyArrayObject *)__pyx_t_5);\n __pyx_t_5 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1739\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2067\n * elif len(np.shape(r))==1:\n- * real_r = np.array(r, dtype=np.double)\n+ * real_r = np.ascontiguousarray(r, dtype=np.float64)\n * n_queries = r.shape[0] # <<<<<<<<<<<<<<\n * else:\n * raise ValueError(\"r must be either a single value or a one-dimensional array of values\")\n *\/\n- __pyx_t_5 = PyObject_GetAttr(__pyx_v_r, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1739; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_v_r, __pyx_n_s__shape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_5, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1739; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_5, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_8 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1739; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_13 = __Pyx_PyInt_from_py_Py_intptr_t(__pyx_t_2); if (unlikely((__pyx_t_13 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_v_n_queries = __pyx_t_8;\n+ __pyx_v_n_queries = __pyx_t_13;\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1741\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2069\n * n_queries = r.shape[0]\n * else:\n * raise ValueError(\"r must be either a single value or a one-dimensional array of values\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_17), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1741; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_17), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2069; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_Raise(__pyx_t_2, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1741; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2069; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1744\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2072\n * \n * # internally we represent all distances as distance**p\n * if p != infinity: # <<<<<<<<<<<<<<\n- * for i in xrange(n_queries):\n+ * for i in range(n_queries):\n * if real_r[i] != infinity:\n *\/\n __pyx_t_1 = (__pyx_v_p != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1745\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2073\n * # internally we represent all distances as distance**p\n * if p != infinity:\n- * for i in xrange(n_queries): # <<<<<<<<<<<<<<\n+ * for i in range(n_queries): # <<<<<<<<<<<<<<\n * if real_r[i] != infinity:\n * real_r[i] = real_r[i] ** p\n *\/\n- __pyx_t_8 = __pyx_v_n_queries;\n- for (__pyx_t_13 = 0; __pyx_t_13 < __pyx_t_8; __pyx_t_13+=1) {\n- __pyx_v_i = __pyx_t_13;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1746\n+ __pyx_t_13 = __pyx_v_n_queries;\n+ for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {\n+ __pyx_v_i = __pyx_t_14;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2074\n * if p != infinity:\n- * for i in xrange(n_queries):\n+ * for i in range(n_queries):\n * if real_r[i] != infinity: # <<<<<<<<<<<<<<\n * real_r[i] = real_r[i] ** p\n * \n *\/\n- __pyx_t_14 = __pyx_v_i;\n- __pyx_t_15 = -1;\n- if (__pyx_t_14 < 0) {\n- __pyx_t_14 += __pyx_pybuffernd_real_r.diminfo[0].shape;\n- if (unlikely(__pyx_t_14 < 0)) __pyx_t_15 = 0;\n- } else if (unlikely(__pyx_t_14 >= __pyx_pybuffernd_real_r.diminfo[0].shape)) __pyx_t_15 = 0;\n- if (unlikely(__pyx_t_15 != -1)) {\n- __Pyx_RaiseBufferIndexError(__pyx_t_15);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1746; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_t_1 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_double_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_14, __pyx_pybuffernd_real_r.diminfo[0].strides)) != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ __pyx_t_15 = __pyx_v_i;\n+ __pyx_t_1 = ((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_15, __pyx_pybuffernd_real_r.diminfo[0].strides)) != __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1747\n- * for i in xrange(n_queries):\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2075\n+ * for i in range(n_queries):\n * if real_r[i] != infinity:\n * real_r[i] = real_r[i] ** p # <<<<<<<<<<<<<<\n * \n * # Calculate mins and maxes to outer box\n *\/\n- __pyx_t_15 = __pyx_v_i;\n- __pyx_t_16 = -1;\n- if (__pyx_t_15 < 0) {\n- __pyx_t_15 += __pyx_pybuffernd_real_r.diminfo[0].shape;\n- if (unlikely(__pyx_t_15 < 0)) __pyx_t_16 = 0;\n- } else if (unlikely(__pyx_t_15 >= __pyx_pybuffernd_real_r.diminfo[0].shape)) __pyx_t_16 = 0;\n- if (unlikely(__pyx_t_16 != -1)) {\n- __Pyx_RaiseBufferIndexError(__pyx_t_16);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1747; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n __pyx_t_16 = __pyx_v_i;\n- __pyx_t_17 = -1;\n- if (__pyx_t_16 < 0) {\n- __pyx_t_16 += __pyx_pybuffernd_real_r.diminfo[0].shape;\n- if (unlikely(__pyx_t_16 < 0)) __pyx_t_17 = 0;\n- } else if (unlikely(__pyx_t_16 >= __pyx_pybuffernd_real_r.diminfo[0].shape)) __pyx_t_17 = 0;\n- if (unlikely(__pyx_t_17 != -1)) {\n- __Pyx_RaiseBufferIndexError(__pyx_t_17);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1747; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_double_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides) = pow(((double)(*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_double_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_15, __pyx_pybuffernd_real_r.diminfo[0].strides))), __pyx_v_p);\n+ __pyx_t_17 = __pyx_v_i;\n+ *__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_17, __pyx_pybuffernd_real_r.diminfo[0].strides) = pow((*__Pyx_BufPtrCContig1d(__pyx_t_5numpy_float64_t *, __pyx_pybuffernd_real_r.rcbuffer->pybuffer.buf, __pyx_t_16, __pyx_pybuffernd_real_r.diminfo[0].strides)), __pyx_v_p);\n goto __pyx_L8;\n }\n __pyx_L8:;\n@@ -13166,370 +14196,549 @@\n }\n __pyx_L5:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1750\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2078\n * \n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m # <<<<<<<<<<<<<<\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try:\n *\/\n __pyx_v_rect1.m = __pyx_v_self->m;\n __pyx_v_rect2.m = __pyx_v_self->m;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1751\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2079\n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1752\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL # <<<<<<<<<<<<<<\n+ * try:\n+ * \n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2080\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1753\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- *\/\n- __pyx_v_rect2.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1754\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- *\/\n- __pyx_v_rect2.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1755\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- *\/\n- __pyx_t_8 = __pyx_v_self->m;\n- for (__pyx_t_13 = 0; __pyx_t_13 < __pyx_t_8; __pyx_t_13+=1) {\n- __pyx_v_i = __pyx_t_13;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1756\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1757\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i]\n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1758\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect2.maxes[i] = other.raw_maxes[i]\n- * \n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1759\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n- * \n- * # Compute first min and max distances\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try: # <<<<<<<<<<<<<<\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2082\n+ * try:\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2083\n+ * \n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect1.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2084\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2084; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2086\n+ * raise MemoryError\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2087\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect1.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2088\n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2088; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ goto __pyx_L13;\n+ }\n+ __pyx_L13:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2090\n+ * raise MemoryError\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2091\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect2.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2092\n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2092; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ goto __pyx_L14;\n+ }\n+ __pyx_L14:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2094\n+ * raise MemoryError\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2095\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect2.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2096\n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(self.m):\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2096; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ goto __pyx_L15;\n+ }\n+ __pyx_L15:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2098\n+ * raise MemoryError\n+ * \n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ *\/\n+ __pyx_t_13 = __pyx_v_self->m;\n+ for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {\n+ __pyx_v_i = __pyx_t_14;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2099\n+ * \n+ * for i in range(self.m):\n+ * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2100\n+ * for i in range(self.m):\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2101\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ * \n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2102\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * \n+ * # Compute first min and max distances\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2105\n+ * \n+ * # Compute first min and max distances\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ *\/\n+ __pyx_t_1 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2106\n+ * # Compute first min and max distances\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2107\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance = 0.\n+ *\/\n+ __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+ goto __pyx_L18;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2109\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2110\n+ * else:\n+ * min_distance = 0.\n+ * max_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_v_max_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2111\n+ * min_distance = 0.\n+ * max_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_t_13 = __pyx_v_self->m;\n+ for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {\n+ __pyx_v_i = __pyx_t_14;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2112\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2113\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * \n+ * # Go!\n+ *\/\n+ __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+ }\n+ }\n+ __pyx_L18:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2116\n+ * \n+ * # Go!\n+ * results = np.zeros((n_queries,), dtype=npy_intp_dtype) # <<<<<<<<<<<<<<\n+ * idx = np.arange(n_queries, dtype=npy_intp_dtype)\n+ * self.__count_neighbors_traverse(other, n_queries,\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__zeros); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_n_queries); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_3));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __pyx_t_18 = ((PyArrayObject *)__pyx_t_6);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_results.rcbuffer->pybuffer);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_results.rcbuffer->pybuffer, (PyObject*)__pyx_t_18, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_8 < 0)) {\n+ PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_results.rcbuffer->pybuffer, (PyObject*)__pyx_v_results, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_9, __pyx_t_10, __pyx_t_11);\n+ }\n+ }\n+ __pyx_pybuffernd_results.diminfo[0].strides = __pyx_pybuffernd_results.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_results.diminfo[0].shape = __pyx_pybuffernd_results.rcbuffer->pybuffer.shape[0];\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2116; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ }\n+ __pyx_t_18 = 0;\n+ __pyx_v_results = ((PyArrayObject *)__pyx_t_6);\n+ __pyx_t_6 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2117\n+ * # Go!\n+ * results = np.zeros((n_queries,), dtype=npy_intp_dtype)\n+ * idx = np.arange(n_queries, dtype=npy_intp_dtype) # <<<<<<<<<<<<<<\n+ * self.__count_neighbors_traverse(other, n_queries,\n+ * <np.float64_t*>np.PyArray_DATA(real_r),\n+ *\/\n+ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__arange); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_n_queries); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_6);\n+ __Pyx_GIVEREF(__pyx_t_6);\n+ __pyx_t_6 = 0;\n+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_6));\n+ if (PyDict_SetItem(__pyx_t_6, ((PyObject *)__pyx_n_s__dtype), __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ __pyx_t_18 = ((PyArrayObject *)__pyx_t_5);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_idx.rcbuffer->pybuffer);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_idx.rcbuffer->pybuffer, (PyObject*)__pyx_t_18, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_8 < 0)) {\n+ PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_idx.rcbuffer->pybuffer, (PyObject*)__pyx_v_idx, &__Pyx_TypeInfo_nn_npy_intp, PyBUF_FORMAT| PyBUF_C_CONTIGUOUS, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_11, __pyx_t_10, __pyx_t_9);\n+ }\n+ }\n+ __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0];\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2117; __pyx_clineno = __LINE__; goto __pyx_L10;}\n+ }\n+ __pyx_t_18 = 0;\n+ __pyx_v_idx = ((PyArrayObject *)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2124\n+ * self.tree, other.tree,\n+ * p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * \n+ * finally:\n+ *\/\n+ __pyx_t_8 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, ((__pyx_t_5numpy_float64_t *)PyArray_DATA(((PyArrayObject *)__pyx_v_real_r))), ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_v_results))), ((npy_intp *)PyArray_DATA(((PyArrayObject *)__pyx_v_idx))), __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2118; __pyx_clineno = __LINE__; goto __pyx_L10;}\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1762\n- * \n- * # Compute first min and max distances\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- *\/\n- __pyx_t_1 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_1) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1763\n- * # Compute first min and max distances\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1764\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * else:\n- * min_distance = 0.\n- *\/\n- __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n- goto __pyx_L11;\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2128\n+ * finally:\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.mins)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L11;\n+ __pyx_L10: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+ __pyx_t_1 = (__pyx_v_rect1.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2129\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.mins);\n+ goto __pyx_L22;\n+ }\n+ __pyx_L22:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2131\n+ * stdlib.free(rect1.mins)\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.maxes)\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect1.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2132\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.maxes);\n+ goto __pyx_L23;\n+ }\n+ __pyx_L23:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2134\n+ * stdlib.free(rect1.maxes)\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.mins)\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect2.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2135\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect2.mins);\n+ goto __pyx_L24;\n+ }\n+ __pyx_L24:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2137\n+ * stdlib.free(rect2.mins)\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.maxes)\n+ * \n+ *\/\n+ __pyx_t_1 = (__pyx_v_rect2.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_1) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2138\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * if np.shape(r) == ():\n+ *\/\n+ free(__pyx_v_rect2.maxes);\n+ goto __pyx_L25;\n+ }\n+ __pyx_L25:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1766\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * max_distance = 0.\n- * for i in range(self.m):\n- *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1767\n- * else:\n- * min_distance = 0.\n- * max_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- *\/\n- __pyx_v_max_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1768\n- * min_distance = 0.\n- * max_distance = 0.\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- *\/\n- __pyx_t_8 = __pyx_v_self->m;\n- for (__pyx_t_13 = 0; __pyx_t_13 < __pyx_t_8; __pyx_t_13+=1) {\n- __pyx_v_i = __pyx_t_13;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1769\n- * max_distance = 0.\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1770\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * \n- * # Go!\n- *\/\n- __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n- }\n- }\n- __pyx_L11:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1773\n- * \n- * # Go!\n- * results = np.zeros((n_queries,), dtype=np.int) # <<<<<<<<<<<<<<\n- * idx = np.arange(n_queries, dtype=np.int)\n- * self.__count_neighbors_traverse(other,\n- *\/\n- __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__zeros); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_n_queries); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- __pyx_t_2 = 0;\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_3));\n- __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n- __pyx_t_3 = 0;\n- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n- __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_4 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_18 = ((PyArrayObject *)__pyx_t_4);\n- {\n- __Pyx_BufFmt_StackElem __pyx_stack[1];\n- __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_results.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_results.rcbuffer->pybuffer, (PyObject*)__pyx_t_18, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n- PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_results.rcbuffer->pybuffer, (PyObject*)__pyx_v_results, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n- Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n- __Pyx_RaiseBufferFallbackError();\n- } else {\n- PyErr_Restore(__pyx_t_9, __pyx_t_10, __pyx_t_11);\n- }\n- }\n- __pyx_pybuffernd_results.diminfo[0].strides = __pyx_pybuffernd_results.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_results.diminfo[0].shape = __pyx_pybuffernd_results.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1773; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_t_18 = 0;\n- __pyx_v_results = ((PyArrayObject *)__pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1774\n- * # Go!\n- * results = np.zeros((n_queries,), dtype=np.int)\n- * idx = np.arange(n_queries, dtype=np.int) # <<<<<<<<<<<<<<\n- * self.__count_neighbors_traverse(other,\n- * n_queries, <double*>real_r.data, <np.int_t*>results.data, <np.int_t*>idx.data,\n- *\/\n- __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__arange); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_n_queries); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- __pyx_t_4 = 0;\n- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n- __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__int); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_18 = ((PyArrayObject *)__pyx_t_6);\n- {\n- __Pyx_BufFmt_StackElem __pyx_stack[1];\n- __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_idx.rcbuffer->pybuffer);\n- __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_idx.rcbuffer->pybuffer, (PyObject*)__pyx_t_18, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n- if (unlikely(__pyx_t_8 < 0)) {\n- PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n- if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_idx.rcbuffer->pybuffer, (PyObject*)__pyx_v_idx, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n- Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n- __Pyx_RaiseBufferFallbackError();\n- } else {\n- PyErr_Restore(__pyx_t_11, __pyx_t_10, __pyx_t_9);\n- }\n- }\n- __pyx_pybuffernd_idx.diminfo[0].strides = __pyx_pybuffernd_idx.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_idx.diminfo[0].shape = __pyx_pybuffernd_idx.rcbuffer->pybuffer.shape[0];\n- if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1774; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_t_18 = 0;\n- __pyx_v_idx = ((PyArrayObject *)__pyx_t_6);\n- __pyx_t_6 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1779\n- * self.tree, other.tree,\n- * p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(rect1.mins)\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___count_neighbors_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_n_queries, ((double *)__pyx_v_real_r->data), ((__pyx_t_5numpy_int_t *)__pyx_v_results->data), ((__pyx_t_5numpy_int_t *)__pyx_v_idx->data), __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1781\n- * min_distance, max_distance)\n- * \n- * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- *\/\n- free(__pyx_v_rect1.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1782\n- * \n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes)\n- *\/\n- free(__pyx_v_rect1.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1783\n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.maxes)\n- * \n- *\/\n- free(__pyx_v_rect2.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1784\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n- * \n- * if np.shape(r) == ():\n- *\/\n- free(__pyx_v_rect2.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1786\n- * stdlib.free(rect2.maxes)\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2140\n+ * stdlib.free(rect2.maxes)\n * \n * if np.shape(r) == (): # <<<<<<<<<<<<<<\n * return results[0]\n * elif len(np.shape(r))==1:\n *\/\n- __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__shape); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_4 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(__pyx_v_r);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_r);\n+ __Pyx_GIVEREF(__pyx_v_r);\n+ __pyx_t_2 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_INCREF(__pyx_v_r);\n- PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_r);\n- __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_2 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), Py_EQ); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1787\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2141\n * \n * if np.shape(r) == ():\n * return results[0] # <<<<<<<<<<<<<<\n@@ -13538,50 +14747,41 @@\n *\/\n __Pyx_XDECREF(__pyx_r);\n __pyx_t_19 = 0;\n- __pyx_t_8 = -1;\n- if (__pyx_t_19 < 0) {\n- __pyx_t_19 += __pyx_pybuffernd_results.diminfo[0].shape;\n- if (unlikely(__pyx_t_19 < 0)) __pyx_t_8 = 0;\n- } else if (unlikely(__pyx_t_19 >= __pyx_pybuffernd_results.diminfo[0].shape)) __pyx_t_8 = 0;\n- if (unlikely(__pyx_t_8 != -1)) {\n- __Pyx_RaiseBufferIndexError(__pyx_t_8);\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- __pyx_t_6 = __Pyx_PyInt_to_py_npy_long((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_r = __pyx_t_6;\n- __pyx_t_6 = 0;\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t((*__Pyx_BufPtrCContig1d(npy_intp *, __pyx_pybuffernd_results.rcbuffer->pybuffer.buf, __pyx_t_19, __pyx_pybuffernd_results.diminfo[0].strides))); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_r = __pyx_t_5;\n+ __pyx_t_5 = 0;\n goto __pyx_L0;\n- goto __pyx_L14;\n+ goto __pyx_L26;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1788\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2142\n * if np.shape(r) == ():\n * return results[0]\n * elif len(np.shape(r))==1: # <<<<<<<<<<<<<<\n * return results\n * \n *\/\n- __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(__pyx_v_r);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_r);\n+ __Pyx_GIVEREF(__pyx_v_r);\n+ __pyx_t_6 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n+ __pyx_t_12 = PyObject_Length(__pyx_t_6); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_INCREF(__pyx_v_r);\n- PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_r);\n- __Pyx_GIVEREF(__pyx_v_r);\n- __pyx_t_4 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n- __pyx_t_12 = PyObject_Length(__pyx_t_4); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_t_1 = (__pyx_t_12 == 1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1789\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2143\n * return results[0]\n * elif len(np.shape(r))==1:\n * return results # <<<<<<<<<<<<<<\n@@ -13592,9 +14792,9 @@\n __Pyx_INCREF(((PyObject *)__pyx_v_results));\n __pyx_r = ((PyObject *)__pyx_v_results);\n goto __pyx_L0;\n- goto __pyx_L14;\n+ goto __pyx_L26;\n }\n- __pyx_L14:;\n+ __pyx_L26:;\n \n __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n goto __pyx_L0;\n@@ -13626,91 +14826,88 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":1794\n+\/* \"scipy\/spatial\/ckdtree.pyx\":2148\n * # sparse_distance_matrix\n * # ----------------------\n- * cdef void __sparse_distance_matrix_traverse(cKDTree self, cKDTree other, # <<<<<<<<<<<<<<\n+ * cdef int __sparse_distance_matrix_traverse(cKDTree self, cKDTree other, # <<<<<<<<<<<<<<\n * coo_entries results,\n * innernode* node1, innernode* node2,\n *\/\n \n-static void __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___sparse_distance_matrix_traverse(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, double __pyx_v_r, double __pyx_v_p, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, double __pyx_v_min_distance, double __pyx_v_max_distance) {\n+static int __pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___sparse_distance_matrix_traverse(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_results, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node1, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *__pyx_v_node2, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2, __pyx_t_5numpy_float64_t __pyx_v_min_distance, __pyx_t_5numpy_float64_t __pyx_v_max_distance) {\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *__pyx_v_lnode2;\n- int __pyx_v_k1;\n- int __pyx_v_k2;\n- double __pyx_v_save_min1;\n- double __pyx_v_save_max1;\n- double __pyx_v_save_min2;\n- double __pyx_v_save_max2;\n- double __pyx_v_part_min_distance1;\n- double __pyx_v_part_max_distance1;\n- double __pyx_v_part_min_distance2;\n- double __pyx_v_part_max_distance2;\n- PyObject *__pyx_v_i = NULL;\n- PyObject *__pyx_v_j = NULL;\n- double __pyx_v_d;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max1;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_min2;\n+ __pyx_t_5numpy_float64_t __pyx_v_save_max2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance1;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_min_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_part_max_distance2;\n+ __pyx_t_5numpy_float64_t __pyx_v_d;\n+ npy_intp __pyx_v_k1;\n+ npy_intp __pyx_v_k2;\n+ npy_intp __pyx_v_i;\n+ npy_intp __pyx_v_j;\n+ int __pyx_r;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n- PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- Py_ssize_t __pyx_t_5;\n- PyObject *(*__pyx_t_6)(PyObject *);\n- PyObject *__pyx_t_7 = NULL;\n- Py_ssize_t __pyx_t_8;\n- PyObject *(*__pyx_t_9)(PyObject *);\n- Py_ssize_t __pyx_t_10;\n- Py_ssize_t __pyx_t_11;\n+ npy_intp __pyx_t_2;\n+ npy_intp __pyx_t_3;\n+ npy_intp __pyx_t_4;\n+ npy_intp __pyx_t_5;\n+ int __pyx_t_6;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__sparse_distance_matrix_traverse\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1808\n- * cdef double save_min1, save_max1\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0.\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2163\n+ * cdef np.float64_t save_min1, save_max1\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0.\n+ * cdef np.float64_t d\n *\/\n __pyx_v_part_min_distance1 = 0.;\n __pyx_v_part_max_distance1 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1809\n- * cdef double save_min2, save_max2\n- * cdef double part_min_distance1 = 0., part_max_distance1 = 0.\n- * cdef double part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n- * cdef list results_i\n- * \n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2164\n+ * cdef np.float64_t save_min2, save_max2\n+ * cdef np.float64_t part_min_distance1 = 0., part_max_distance1 = 0.\n+ * cdef np.float64_t part_min_distance2 = 0., part_max_distance2 = 0. # <<<<<<<<<<<<<<\n+ * cdef np.float64_t d\n+ * cdef np.npy_intp k1, k2, i, j\n *\/\n __pyx_v_part_min_distance2 = 0.;\n __pyx_v_part_max_distance2 = 0.;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1812\n- * cdef list results_i\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2168\n+ * cdef np.npy_intp k1, k2, i, j\n * \n * if min_distance > r: # <<<<<<<<<<<<<<\n- * return\n+ * return 0\n * elif node1.split_dim == -1: # 1 is leaf node\n *\/\n __pyx_t_1 = (__pyx_v_min_distance > __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1813\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2169\n * \n * if min_distance > r:\n- * return # <<<<<<<<<<<<<<\n+ * return 0 # <<<<<<<<<<<<<<\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1\n *\/\n+ __pyx_r = 0;\n goto __pyx_L0;\n goto __pyx_L3;\n }\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1814\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2170\n * if min_distance > r:\n- * return\n+ * return 0\n * elif node1.split_dim == -1: # 1 is leaf node # <<<<<<<<<<<<<<\n * lnode1 = <leafnode*>node1\n * \n@@ -13718,8 +14915,8 @@\n __pyx_t_1 = (__pyx_v_node1->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1815\n- * return\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2171\n+ * return 0\n * elif node1.split_dim == -1: # 1 is leaf node\n * lnode1 = <leafnode*>node1 # <<<<<<<<<<<<<<\n * \n@@ -13727,7 +14924,7 @@\n *\/\n __pyx_v_lnode1 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1817\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2173\n * lnode1 = <leafnode*>node1\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves # <<<<<<<<<<<<<<\n@@ -13737,7 +14934,7 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1818\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2174\n * \n * if node2.split_dim == -1: # 1 & 2 are leaves\n * lnode2 = <leafnode*>node2 # <<<<<<<<<<<<<<\n@@ -13746,7 +14943,7 @@\n *\/\n __pyx_v_lnode2 = ((struct __pyx_t_5scipy_7spatial_7ckdtree_leafnode *)__pyx_v_node2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1822\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2178\n * # brute-force\n * # Special care here to avoid duplicate pairs\n * if node1 == node2: # <<<<<<<<<<<<<<\n@@ -13756,140 +14953,38 @@\n __pyx_t_1 = (__pyx_v_node1 == __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1824\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2180\n * if node1 == node2:\n * # self == other if we get here\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(i+1, lnode2.end_idx):\n * d = _distance_p(\n *\/\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_2 = 0;\n- __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n- if (PyList_CheckExact(__pyx_t_3) || PyTuple_CheckExact(__pyx_t_3)) {\n- __pyx_t_4 = __pyx_t_3; __Pyx_INCREF(__pyx_t_4); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_4)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_5); __Pyx_INCREF(__pyx_t_3); __pyx_t_5++;\n- } else {\n- __pyx_t_3 = __pyx_t_6(__pyx_t_4);\n- if (unlikely(!__pyx_t_3)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_3);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n+ __pyx_t_2 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_i = __pyx_t_3;\n- __pyx_t_3 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1825\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2181\n * # self == other if we get here\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(i+1, lnode2.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_3 = PyNumber_Add(__pyx_v_i, __pyx_int_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_2);\n- __pyx_t_3 = 0;\n- __pyx_t_2 = 0;\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n- if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {\n- __pyx_t_7 = __pyx_t_2; __Pyx_INCREF(__pyx_t_7); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_9 = Py_TYPE(__pyx_t_7)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_7)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_7)) break;\n- __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_7, __pyx_t_8); __Pyx_INCREF(__pyx_t_2); __pyx_t_8++;\n- } else {\n- __pyx_t_2 = __pyx_t_9(__pyx_t_7);\n- if (unlikely(!__pyx_t_2)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_2);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_2;\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1827\n- * for j in range(i+1, lnode2.end_idx):\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m, # <<<<<<<<<<<<<<\n- * self.raw_data + self.raw_indices[j] * self.m,\n- * p, self.m, r)\n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1828\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m,\n- * self.raw_data + self.raw_indices[j] * self.m, # <<<<<<<<<<<<<<\n- * p, self.m, r)\n- * if d <= r:\n- *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1829\n+ __pyx_t_4 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_5 = (__pyx_v_i + 1); __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_j = __pyx_t_5;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2185\n * self.raw_data + self.raw_indices[i] * self.m,\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r) # <<<<<<<<<<<<<<\n * if d <= r:\n * results.add(self.raw_indices[i],\n *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_10]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_11]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1830\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2186\n * self.raw_data + self.raw_indices[j] * self.m,\n * p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -13899,188 +14994,64 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1831\n- * p, self.m, r)\n- * if d <= r:\n- * results.add(self.raw_indices[i], # <<<<<<<<<<<<<<\n- * self.raw_indices[j], d)\n- * results.add(self.raw_indices[j],\n- *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1832\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2188\n * if d <= r:\n * results.add(self.raw_indices[i],\n * self.raw_indices[j], d) # <<<<<<<<<<<<<<\n * results.add(self.raw_indices[j],\n * self.raw_indices[i], d)\n *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_t_11]), (__pyx_v_self->raw_indices[__pyx_t_10]), __pyx_v_d);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1833\n- * results.add(self.raw_indices[i],\n- * self.raw_indices[j], d)\n- * results.add(self.raw_indices[j], # <<<<<<<<<<<<<<\n- * self.raw_indices[i], d)\n- * else:\n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1833; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1834\n+ ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_self->raw_indices[__pyx_v_j]), __pyx_v_d);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2190\n * self.raw_indices[j], d)\n * results.add(self.raw_indices[j],\n * self.raw_indices[i], d) # <<<<<<<<<<<<<<\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1834; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_t_10]), (__pyx_v_self->raw_indices[__pyx_t_11]), __pyx_v_d);\n+ ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_j]), (__pyx_v_self->raw_indices[__pyx_v_i]), __pyx_v_d);\n goto __pyx_L10;\n }\n __pyx_L10:;\n }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n goto __pyx_L5;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1836\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2192\n * self.raw_indices[i], d)\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx): # <<<<<<<<<<<<<<\n * for j in range(lnode2.start_idx, lnode2.end_idx):\n * d = _distance_p(\n *\/\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode1->start_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode1->end_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- __pyx_t_4 = 0;\n- __pyx_t_7 = 0;\n- __pyx_t_7 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n- if (PyList_CheckExact(__pyx_t_7) || PyTuple_CheckExact(__pyx_t_7)) {\n- __pyx_t_2 = __pyx_t_7; __Pyx_INCREF(__pyx_t_2); __pyx_t_5 = 0;\n- __pyx_t_6 = NULL;\n- } else {\n- __pyx_t_5 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_6 = Py_TYPE(__pyx_t_2)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- for (;;) {\n- if (!__pyx_t_6 && PyList_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyList_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else if (!__pyx_t_6 && PyTuple_CheckExact(__pyx_t_2)) {\n- if (__pyx_t_5 >= PyTuple_GET_SIZE(__pyx_t_2)) break;\n- __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_5); __Pyx_INCREF(__pyx_t_7); __pyx_t_5++;\n- } else {\n- __pyx_t_7 = __pyx_t_6(__pyx_t_2);\n- if (unlikely(!__pyx_t_7)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_7);\n- }\n- __Pyx_XDECREF(__pyx_v_i);\n- __pyx_v_i = __pyx_t_7;\n- __pyx_t_7 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1837\n+ __pyx_t_2 = __pyx_v_lnode1->end_idx;\n+ for (__pyx_t_3 = __pyx_v_lnode1->start_idx; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2193\n * else:\n * for i in range(lnode1.start_idx, lnode1.end_idx):\n * for j in range(lnode2.start_idx, lnode2.end_idx): # <<<<<<<<<<<<<<\n * d = _distance_p(\n * self.raw_data + self.raw_indices[i] * self.m,\n *\/\n- __pyx_t_7 = PyInt_FromLong(__pyx_v_lnode2->start_idx); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_4 = PyInt_FromLong(__pyx_v_lnode2->end_idx); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n- __pyx_t_7 = 0;\n- __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n- if (PyList_CheckExact(__pyx_t_4) || PyTuple_CheckExact(__pyx_t_4)) {\n- __pyx_t_3 = __pyx_t_4; __Pyx_INCREF(__pyx_t_3); __pyx_t_8 = 0;\n- __pyx_t_9 = NULL;\n- } else {\n- __pyx_t_8 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_9 = Py_TYPE(__pyx_t_3)->tp_iternext;\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- for (;;) {\n- if (!__pyx_t_9 && PyList_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else if (!__pyx_t_9 && PyTuple_CheckExact(__pyx_t_3)) {\n- if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_3)) break;\n- __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_8); __Pyx_INCREF(__pyx_t_4); __pyx_t_8++;\n- } else {\n- __pyx_t_4 = __pyx_t_9(__pyx_t_3);\n- if (unlikely(!__pyx_t_4)) {\n- if (PyErr_Occurred()) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();\n- else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_4);\n- }\n- __Pyx_XDECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_4;\n- __pyx_t_4 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1839\n- * for j in range(lnode2.start_idx, lnode2.end_idx):\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m, # <<<<<<<<<<<<<<\n- * other.raw_data + other.raw_indices[j] * self.m,\n- * p, self.m, r)\n- *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1839; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1840\n- * d = _distance_p(\n- * self.raw_data + self.raw_indices[i] * self.m,\n- * other.raw_data + other.raw_indices[j] * self.m, # <<<<<<<<<<<<<<\n- * p, self.m, r)\n- * if d <= r:\n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1840; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1841\n+ __pyx_t_4 = __pyx_v_lnode2->end_idx;\n+ for (__pyx_t_5 = __pyx_v_lnode2->start_idx; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_j = __pyx_t_5;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2197\n * self.raw_data + self.raw_indices[i] * self.m,\n * other.raw_data + other.raw_indices[j] * self.m,\n * p, self.m, r) # <<<<<<<<<<<<<<\n * if d <= r:\n * results.add(self.raw_indices[i],\n *\/\n- __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_t_11]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_t_10]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1842\n+ __pyx_v_d = __pyx_f_5scipy_7spatial_7ckdtree__distance_p((__pyx_v_self->raw_data + ((__pyx_v_self->raw_indices[__pyx_v_i]) * __pyx_v_self->m)), (__pyx_v_other->raw_data + ((__pyx_v_other->raw_indices[__pyx_v_j]) * __pyx_v_self->m)), __pyx_v_p, __pyx_v_self->m, __pyx_v_r);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2198\n * other.raw_data + other.raw_indices[j] * self.m,\n * p, self.m, r)\n * if d <= r: # <<<<<<<<<<<<<<\n@@ -14090,92 +15061,80 @@\n __pyx_t_1 = (__pyx_v_d <= __pyx_v_r);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1843\n- * p, self.m, r)\n- * if d <= r:\n- * results.add(self.raw_indices[i], # <<<<<<<<<<<<<<\n- * other.raw_indices[j], d)\n- * \n- *\/\n- __pyx_t_10 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_10 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1843; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1844\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2200\n * if d <= r:\n * results.add(self.raw_indices[i],\n * other.raw_indices[j], d) # <<<<<<<<<<<<<<\n * \n * else: # 1 is a leaf node, 2 is inner node\n *\/\n- __pyx_t_11 = __Pyx_PyIndex_AsSsize_t(__pyx_v_j); if (unlikely((__pyx_t_11 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1844; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_t_10]), (__pyx_v_other->raw_indices[__pyx_t_11]), __pyx_v_d);\n+ ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_v_results->__pyx_vtab)->add(__pyx_v_results, (__pyx_v_self->raw_indices[__pyx_v_i]), (__pyx_v_other->raw_indices[__pyx_v_j]), __pyx_v_d);\n goto __pyx_L15;\n }\n __pyx_L15:;\n }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n }\n __pyx_L5:;\n goto __pyx_L4;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1847\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2203\n * \n * else: # 1 is a leaf node, 2 is inner node\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1848\n- * else: # 1 is a leaf node, 2 is inner node\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2206\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1852\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2210\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1853\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2211\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1854\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2214\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1859\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2219\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1860\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2215; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2220\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -14184,43 +15143,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1864\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2224\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1865\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2225\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1866\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2228\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1871\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2233\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1872\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2234\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -14234,53 +15193,53 @@\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1876\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2238\n * \n * else: # 1 is an inner node\n * k1 = node1.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1)\n- * \n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n *\/\n __pyx_v_k1 = __pyx_v_node1->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1877\n- * else: # 1 is an inner node\n- * k1 = node1.split_dim\n- * __rect_preupdate(rect1, rect2, k1, p, min_distance, max_distance, &part_min_distance1, &part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2241\n+ * __rect_preupdate(rect1, rect2, k1, p, min_distance,\n+ * max_distance, &part_min_distance1,\n+ * &part_max_distance1) # <<<<<<<<<<<<<<\n * \n * # node1 goes to box with lesser component along k1\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance1), (&__pyx_v_part_max_distance1));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1881\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2245\n * # node1 goes to box with lesser component along k1\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1] # <<<<<<<<<<<<<<\n * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_max1 = (__pyx_v_rect1.maxes[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1882\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2246\n * # node1.less.maxes[k1] changes from rect1.maxes[k1] to node1.split\n * save_max1 = rect1.maxes[k1]\n * rect1.maxes[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1883\n- * save_max1 = rect1.maxes[k1]\n- * rect1.maxes[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2249\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1885\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2251\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n@@ -14289,73 +15248,73 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1890\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2256\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L16;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1892\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2258\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1893\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2261\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * # node2 goes to box with lesser component along k2\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1897\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2265\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1898\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2266\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1899\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2269\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1.less, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1904\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2274\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1905\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2275\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -14364,43 +15323,43 @@\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_save_max2;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1909\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2279\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1910\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2280\n * # node2.greater.mins[k2] changes from mins2[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1911\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2283\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1.less, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1916\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2288\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1917\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->less, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2289\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -14411,7 +15370,7 @@\n }\n __pyx_L16:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1919\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2291\n * rect2.mins[k2] = save_min2\n * \n * rect1.maxes[k1] = save_max1 # <<<<<<<<<<<<<<\n@@ -14420,35 +15379,35 @@\n *\/\n (__pyx_v_rect1.maxes[__pyx_v_k1]) = __pyx_v_save_max1;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1923\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2295\n * # node1 goes to box with greater component along k1\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1] # <<<<<<<<<<<<<<\n * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n *\/\n __pyx_v_save_min1 = (__pyx_v_rect1.mins[__pyx_v_k1]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1924\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2296\n * # node1.greater.mins[k1] changes from rect1.mins[k1] to node1.split\n * save_min1 = rect1.mins[k1]\n * rect1.mins[k1] = node1.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n- * \n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_node1->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1925\n- * save_min1 = rect1.mins[k1]\n- * rect1.mins[k1] = node1.split\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2299\n+ * __rect_postupdate(rect1, rect2, k1, p, &min_distance,\n+ * &max_distance, part_min_distance1,\n+ * part_max_distance1) # <<<<<<<<<<<<<<\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k1, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance1, __pyx_v_part_max_distance1);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1927\n- * __rect_postupdate(rect1, rect2, k1, p, &min_distance, &max_distance, part_min_distance1, part_max_distance1)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2301\n+ * part_max_distance1)\n * \n * if node2.split_dim == -1: # 1 is an inner node, 2 is a leaf node # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n@@ -14457,38 +15416,38 @@\n __pyx_t_1 = (__pyx_v_node2->split_dim == -1);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1932\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2306\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim\n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2302; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L17;\n }\n \/*else*\/ {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1934\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2308\n * min_distance, max_distance)\n * else: # 1 and 2 are inner nodes\n * k2 = node2.split_dim # <<<<<<<<<<<<<<\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n- * \n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n *\/\n __pyx_v_k2 = __pyx_v_node2->split_dim;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1935\n- * else: # 1 and 2 are inner nodes\n- * k2 = node2.split_dim\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2311\n+ * __rect_preupdate(rect1, rect2, k2, p, min_distance,\n+ * max_distance, &part_min_distance2,\n+ * &part_max_distance2) # <<<<<<<<<<<<<<\n * \n * if node1 != node2:\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_preupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, __pyx_v_min_distance, __pyx_v_max_distance, (&__pyx_v_part_min_distance2), (&__pyx_v_part_max_distance2));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1937\n- * __rect_preupdate(rect1, rect2, k2, p, min_distance, max_distance, &part_min_distance2, &part_max_distance2)\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2313\n+ * &part_max_distance2)\n * \n * if node1 != node2: # <<<<<<<<<<<<<<\n * # Avoid traversing (node1.less, node2.greater) and\n@@ -14497,43 +15456,43 @@\n __pyx_t_1 = (__pyx_v_node1 != __pyx_v_node2);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1945\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2321\n * # node2 goes to box with lesser component along k2\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2] # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_max2 = (__pyx_v_rect2.maxes[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1946\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2322\n * # node2.less.maxes[k2] changes from rect2.maxes[k2] to node2.split\n * save_max2 = rect2.maxes[k2]\n * rect2.maxes[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.maxes[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1947\n- * save_max2 = rect2.maxes[k2]\n- * rect2.maxes[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2325\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1.greater, node2.less,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1952\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2330\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.maxes[k2] = save_max2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1953\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->less, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2331\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.maxes[k2] = save_max2 # <<<<<<<<<<<<<<\n@@ -14545,43 +15504,43 @@\n }\n __pyx_L18:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1957\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2335\n * # node2 goes to box with greater component along k2\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2] # <<<<<<<<<<<<<<\n * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n *\/\n __pyx_v_save_min2 = (__pyx_v_rect2.mins[__pyx_v_k2]);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1958\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2336\n * # node2.greater.mins[k2] changes from rect2.mins[k2] to node2.split\n * save_min2 = rect2.mins[k2]\n * rect2.mins[k2] = node2.split # <<<<<<<<<<<<<<\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2)\n- * self.__sparse_distance_matrix_traverse(other, results,\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n *\/\n (__pyx_v_rect2.mins[__pyx_v_k2]) = __pyx_v_node2->split;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1959\n- * save_min2 = rect2.mins[k2]\n- * rect2.mins[k2] = node2.split\n- * __rect_postupdate(rect1, rect2, k2, p, &min_distance, &max_distance, part_min_distance2, part_max_distance2) # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2339\n+ * __rect_postupdate(rect1, rect2, k2, p, &min_distance,\n+ * &max_distance, part_min_distance2,\n+ * part_max_distance2) # <<<<<<<<<<<<<<\n * self.__sparse_distance_matrix_traverse(other, results,\n * node1.greater, node2.greater,\n *\/\n __pyx_f_5scipy_7spatial_7ckdtree___rect_postupdate(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_k2, __pyx_v_p, (&__pyx_v_min_distance), (&__pyx_v_max_distance), __pyx_v_part_min_distance2, __pyx_v_part_max_distance2);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1964\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2344\n * r, p,\n * rect1, rect2,\n * min_distance, max_distance) # <<<<<<<<<<<<<<\n * rect2.mins[k2] = save_min2\n * \n *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":1965\n+ __pyx_t_6 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_node1->greater, __pyx_v_node2->greater, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2340; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2345\n * rect1, rect2,\n * min_distance, max_distance)\n * rect2.mins[k2] = save_min2 # <<<<<<<<<<<<<<\n@@ -14592,28 +15551,35 @@\n }\n __pyx_L17:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1967\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2347\n * rect2.mins[k2] = save_min2\n * \n * rect1.mins[k1] = save_min1 # <<<<<<<<<<<<<<\n- * \n+ * return 0\n * \n *\/\n (__pyx_v_rect1.mins[__pyx_v_k1]) = __pyx_v_save_min1;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2348\n+ * \n+ * rect1.mins[k1] = save_min1\n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n }\n __pyx_L3:;\n \n+ __pyx_r = 0;\n goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_7);\n- __Pyx_WriteUnraisable(\"scipy.spatial.ckdtree.cKDTree.__sparse_distance_matrix_traverse\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.__sparse_distance_matrix_traverse\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_i);\n- __Pyx_XDECREF(__pyx_v_j);\n __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n }\n \n \/* Python wrapper *\/\n@@ -14621,8 +15587,8 @@\n static char __pyx_doc_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix[] = \"sparse_distance_matrix(self, r, p)\\n\\n Compute a sparse distance matrix\\n\\n Computes a distance matrix between two KDTrees, leaving as zero\\n any distance greater than r.\\n\\n Parameters\\n ----------\\n other : cKDTree\\n\\n r : positive float\\n FIXME: KDTree calls this parameter max_distance\\n\\n Returns\\n -------\\n result : dok_matrix\\n Sparse matrix representing the results in \\\"dictionary of keys\\\" format.\\n FIXME: Internally, built as a COO matrix, it would be more\\n efficient to return this COO matrix.\\n\\n \";\n static PyObject *__pyx_pw_5scipy_7spatial_7ckdtree_7cKDTree_15sparse_distance_matrix(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other = 0;\n- double __pyx_v_r;\n- double __pyx_v_p;\n+ __pyx_t_5numpy_float64_t __pyx_v_r;\n+ __pyx_t_5numpy_float64_t __pyx_v_p;\n static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__other,&__pyx_n_s__r,&__pyx_n_s__p,0};\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -14649,7 +15615,7 @@\n values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__r);\n if (likely(values[1])) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"sparse_distance_matrix\", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"sparse_distance_matrix\", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2351; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n case 2:\n if (kw_args > 0) {\n@@ -14658,19 +15624,19 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"sparse_distance_matrix\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"sparse_distance_matrix\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2351; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n }\n if (values[2]) {\n } else {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1970\n- * \n- * \n- * def sparse_distance_matrix(cKDTree self, cKDTree other, double r, double p=2.): # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2352\n+ * \n+ * def sparse_distance_matrix(cKDTree self, cKDTree other, np.float64_t r,\n+ * np.float64_t p=2.): # <<<<<<<<<<<<<<\n * \"\"\"sparse_distance_matrix(self, r, p)\n * \n *\/\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -14682,22 +15648,22 @@\n }\n }\n __pyx_v_other = ((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)values[0]);\n- __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_r = __pyx_PyFloat_AsDouble(values[1]); if (unlikely((__pyx_v_r == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2351; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n if (values[2]) {\n- __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_p = __pyx_PyFloat_AsDouble(values[2]); if (unlikely((__pyx_v_p == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n } else {\n- __pyx_v_p = ((double)2.);\n+ __pyx_v_p = ((__pyx_t_5numpy_float64_t)2.);\n }\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"sparse_distance_matrix\", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __Pyx_RaiseArgtupleInvalid(\"sparse_distance_matrix\", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2351; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.sparse_distance_matrix\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1970; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree, 1, \"other\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_r = __pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix(((struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self), __pyx_v_other, __pyx_v_r, __pyx_v_p);\n goto __pyx_L0;\n __pyx_L1_error:;\n@@ -14707,31 +15673,40 @@\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, double __pyx_v_r, double __pyx_v_p) {\n- int __pyx_v_i;\n+\/* \"scipy\/spatial\/ckdtree.pyx\":2351\n+ * \n+ * \n+ * def sparse_distance_matrix(cKDTree self, cKDTree other, np.float64_t r, # <<<<<<<<<<<<<<\n+ * np.float64_t p=2.):\n+ * \"\"\"sparse_distance_matrix(self, r, p)\n+ *\/\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_14sparse_distance_matrix(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_other, __pyx_t_5numpy_float64_t __pyx_v_r, __pyx_t_5numpy_float64_t __pyx_v_p) {\n+ npy_intp __pyx_v_i;\n struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *__pyx_v_results = 0;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect1;\n struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle __pyx_v_rect2;\n- double __pyx_v_min_distance;\n- double __pyx_v_max_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_min_distance;\n+ __pyx_t_5numpy_float64_t __pyx_v_max_distance;\n PyObject *__pyx_r = NULL;\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n PyObject *__pyx_t_2 = NULL;\n int __pyx_t_3;\n int __pyx_t_4;\n- int __pyx_t_5;\n- int __pyx_t_6;\n- PyObject *__pyx_t_7 = NULL;\n+ npy_intp __pyx_t_5;\n+ npy_intp __pyx_t_6;\n+ int __pyx_t_7;\n PyObject *__pyx_t_8 = NULL;\n PyObject *__pyx_t_9 = NULL;\n PyObject *__pyx_t_10 = NULL;\n+ PyObject *__pyx_t_11 = NULL;\n int __pyx_lineno = 0;\n const char *__pyx_filename = NULL;\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"sparse_distance_matrix\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1999\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2381\n * \n * # Make sure trees are compatible\n * if self.m != other.m: # <<<<<<<<<<<<<<\n@@ -14741,23 +15716,23 @@\n __pyx_t_1 = (__pyx_v_self->m != __pyx_v_other->m);\n if (__pyx_t_1) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2000\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2382\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_18), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2000; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_18), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2382; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_Raise(__pyx_t_2, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2000; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2382; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L3;\n }\n __pyx_L3:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2003\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2385\n * \n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity: # <<<<<<<<<<<<<<\n@@ -14773,7 +15748,7 @@\n }\n if (__pyx_t_4) {\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2004\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2386\n * # internally we represent all distances as distance**p\n * if p != infinity and r != infinity:\n * r = r ** p # <<<<<<<<<<<<<<\n@@ -14785,284 +15760,472 @@\n }\n __pyx_L4:;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2007\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2389\n * \n * # Calculate mins and maxes to outer box\n * rect1.m = rect2.m = self.m # <<<<<<<<<<<<<<\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n+ * \n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n *\/\n __pyx_v_rect1.m = __pyx_v_self->m;\n __pyx_v_rect2.m = __pyx_v_self->m;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2008\n- * # Calculate mins and maxes to outer box\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2391\n * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2009\n- * rect1.m = rect2.m = self.m\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- *\/\n- __pyx_v_rect1.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2010\n- * rect1.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- *\/\n- __pyx_v_rect2.mins = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2011\n- * rect1.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double)) # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- *\/\n- __pyx_v_rect2.maxes = ((double *)malloc((__pyx_v_self->m * (sizeof(double)))));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2012\n- * rect2.mins = <double*>stdlib.malloc(self.m * sizeof(double))\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m): # <<<<<<<<<<<<<<\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- *\/\n- __pyx_t_5 = __pyx_v_self->m;\n- for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n- __pyx_v_i = __pyx_t_6;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2013\n- * rect2.maxes = <double*>stdlib.malloc(self.m * sizeof(double))\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- *\/\n- (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2014\n- * for i in range(self.m):\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i]\n- *\/\n- (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2015\n- * rect1.mins[i] = self.raw_mins[i]\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n- * rect2.maxes[i] = other.raw_maxes[i]\n- * \n- *\/\n- (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2016\n- * rect1.maxes[i] = self.raw_maxes[i]\n- * rect2.mins[i] = other.raw_mins[i]\n- * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n- * \n- * # Compute first min and max distances\n- *\/\n- (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n- }\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2019\n- * \n- * # Compute first min and max distances\n- * if p == infinity: # <<<<<<<<<<<<<<\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- *\/\n- __pyx_t_4 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n- if (__pyx_t_4) {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2020\n- * # Compute first min and max distances\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- *\/\n- __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2021\n- * if p == infinity:\n- * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n- * else:\n- * min_distance = 0.\n- *\/\n- __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n- goto __pyx_L7;\n- }\n- \/*else*\/ {\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2023\n- * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n- * else:\n- * min_distance = 0. # <<<<<<<<<<<<<<\n- * max_distance = 0.\n+ * \n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL # <<<<<<<<<<<<<<\n+ * try:\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)NULL);\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)NULL);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2392\n+ * \n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try: # <<<<<<<<<<<<<<\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ *\/\n+ \/*try:*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2393\n+ * rect1.mins = rect1.maxes = rect2.mins = rect2.maxes = <np.float64_t*> NULL\n+ * try:\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2394\n+ * try:\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2395\n+ * rect1.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2395; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2397\n+ * raise MemoryError\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect1.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2398\n+ * \n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2399\n+ * rect1.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect1.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2399; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2401\n+ * raise MemoryError\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.mins = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2402\n+ * \n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.mins == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2403\n+ * rect2.mins = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.mins == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ *\/\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2403; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2405\n+ * raise MemoryError\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t)) # <<<<<<<<<<<<<<\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError\n+ *\/\n+ __pyx_v_rect2.maxes = ((__pyx_t_5numpy_float64_t *)malloc((__pyx_v_self->m * (sizeof(__pyx_t_5numpy_float64_t)))));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2406\n+ * \n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * raise MemoryError\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.maxes == ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2407\n+ * rect2.maxes = <np.float64_t*>stdlib.malloc(self.m * sizeof(np.float64_t))\n+ * if rect2.maxes == <np.float64_t*> NULL:\n+ * raise MemoryError # <<<<<<<<<<<<<<\n+ * \n * for i in range(self.m):\n *\/\n- __pyx_v_min_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2024\n- * else:\n- * min_distance = 0.\n- * max_distance = 0. # <<<<<<<<<<<<<<\n- * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- *\/\n- __pyx_v_max_distance = 0.;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2025\n- * min_distance = 0.\n- * max_distance = 0.\n+ PyErr_NoMemory(); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2407; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2409\n+ * raise MemoryError\n+ * \n * for i in range(self.m): # <<<<<<<<<<<<<<\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n *\/\n __pyx_t_5 = __pyx_v_self->m;\n for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n __pyx_v_i = __pyx_t_6;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2026\n- * max_distance = 0.\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2410\n+ * \n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- *\/\n- __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2027\n+ * rect1.mins[i] = self.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ *\/\n+ (__pyx_v_rect1.mins[__pyx_v_i]) = (__pyx_v_self->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2411\n * for i in range(self.m):\n- * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n- * \n- * results = coo_entries()\n- *\/\n- __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n- }\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ *\/\n+ (__pyx_v_rect1.maxes[__pyx_v_i]) = (__pyx_v_self->raw_maxes[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2412\n+ * rect1.mins[i] = self.raw_mins[i]\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i] # <<<<<<<<<<<<<<\n+ * rect2.maxes[i] = other.raw_maxes[i]\n+ * \n+ *\/\n+ (__pyx_v_rect2.mins[__pyx_v_i]) = (__pyx_v_other->raw_mins[__pyx_v_i]);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2413\n+ * rect1.maxes[i] = self.raw_maxes[i]\n+ * rect2.mins[i] = other.raw_mins[i]\n+ * rect2.maxes[i] = other.raw_maxes[i] # <<<<<<<<<<<<<<\n+ * \n+ * # Compute first min and max distances\n+ *\/\n+ (__pyx_v_rect2.maxes[__pyx_v_i]) = (__pyx_v_other->raw_maxes[__pyx_v_i]);\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2416\n+ * \n+ * # Compute first min and max distances\n+ * if p == infinity: # <<<<<<<<<<<<<<\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ *\/\n+ __pyx_t_4 = (__pyx_v_p == __pyx_v_5scipy_7spatial_7ckdtree_infinity);\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2417\n+ * # Compute first min and max distances\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ *\/\n+ __pyx_v_min_distance = __pyx_f_5scipy_7spatial_7ckdtree_min_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2418\n+ * if p == infinity:\n+ * min_distance = min_dist_rect_rect_p_inf(rect1, rect2)\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2) # <<<<<<<<<<<<<<\n+ * else:\n+ * min_distance = 0.\n+ *\/\n+ __pyx_v_max_distance = __pyx_f_5scipy_7spatial_7ckdtree_max_dist_rect_rect_p_inf(__pyx_v_rect1, __pyx_v_rect2);\n+ goto __pyx_L14;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2420\n+ * max_distance = max_dist_rect_rect_p_inf(rect1, rect2)\n+ * else:\n+ * min_distance = 0. # <<<<<<<<<<<<<<\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ *\/\n+ __pyx_v_min_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2421\n+ * else:\n+ * min_distance = 0.\n+ * max_distance = 0. # <<<<<<<<<<<<<<\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_v_max_distance = 0.;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2422\n+ * min_distance = 0.\n+ * max_distance = 0.\n+ * for i in range(self.m): # <<<<<<<<<<<<<<\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ *\/\n+ __pyx_t_5 = __pyx_v_self->m;\n+ for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {\n+ __pyx_v_i = __pyx_t_6;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2423\n+ * max_distance = 0.\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ *\/\n+ __pyx_v_min_distance = (__pyx_v_min_distance + __pyx_f_5scipy_7spatial_7ckdtree_min_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2424\n+ * for i in range(self.m):\n+ * min_distance += min_dist_interval_interval_p(rect1, rect2, i, p)\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p) # <<<<<<<<<<<<<<\n+ * \n+ * results = coo_entries()\n+ *\/\n+ __pyx_v_max_distance = (__pyx_v_max_distance + __pyx_f_5scipy_7spatial_7ckdtree_max_dist_interval_interval_p(__pyx_v_rect1, __pyx_v_rect2, __pyx_v_i, __pyx_v_p));\n+ }\n+ }\n+ __pyx_L14:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2426\n+ * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n+ * \n+ * results = coo_entries() # <<<<<<<<<<<<<<\n+ * self.__sparse_distance_matrix_traverse(other, results,\n+ * self.tree, other.tree,\n+ *\/\n+ __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5scipy_7spatial_7ckdtree_coo_entries)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2426; __pyx_clineno = __LINE__; goto __pyx_L6;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_v_results = ((struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_t_2);\n+ __pyx_t_2 = 0;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2430\n+ * self.tree, other.tree,\n+ * r, p, rect1, rect2,\n+ * min_distance, max_distance) # <<<<<<<<<<<<<<\n+ * finally:\n+ * \n+ *\/\n+ __pyx_t_7 = ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2427; __pyx_clineno = __LINE__; goto __pyx_L6;}\n }\n- __pyx_L7:;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2029\n- * max_distance += max_dist_interval_interval_p(rect1, rect2, i, p)\n- * \n- * results = coo_entries() # <<<<<<<<<<<<<<\n- * self.__sparse_distance_matrix_traverse(other, results,\n- * self.tree, other.tree,\n- *\/\n- __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5scipy_7spatial_7ckdtree_coo_entries)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2029; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2433\n+ * finally:\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.mins)\n+ * \n+ *\/\n+ \/*finally:*\/ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L7;\n+ __pyx_L6: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+ __pyx_t_4 = (__pyx_v_rect1.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2434\n+ * \n+ * if rect1.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.mins);\n+ goto __pyx_L18;\n+ }\n+ __pyx_L18:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2436\n+ * stdlib.free(rect1.mins)\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect1.maxes)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect1.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2437\n+ * \n+ * if rect1.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect1.maxes);\n+ goto __pyx_L19;\n+ }\n+ __pyx_L19:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2439\n+ * stdlib.free(rect1.maxes)\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.mins)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.mins != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2440\n+ * \n+ * if rect2.mins != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ *\/\n+ free(__pyx_v_rect2.mins);\n+ goto __pyx_L20;\n+ }\n+ __pyx_L20:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2442\n+ * stdlib.free(rect2.mins)\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL: # <<<<<<<<<<<<<<\n+ * stdlib.free(rect2.maxes)\n+ * \n+ *\/\n+ __pyx_t_4 = (__pyx_v_rect2.maxes != ((__pyx_t_5numpy_float64_t *)NULL));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2443\n+ * \n+ * if rect2.maxes != <np.float64_t*> NULL:\n+ * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n+ * \n+ * return results.to_matrix(shape=(self.n, other.n)).todok()\n+ *\/\n+ free(__pyx_v_rect2.maxes);\n+ goto __pyx_L21;\n+ }\n+ __pyx_L21:;\n+ switch (__pyx_why) {\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2445\n+ * stdlib.free(rect2.maxes)\n+ * \n+ * return results.to_matrix(shape=(self.n, other.n)).todok() # <<<<<<<<<<<<<<\n+ * \n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_results), __pyx_n_s__to_matrix); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_v_results = ((struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *)__pyx_t_2);\n- __pyx_t_2 = 0;\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2033\n- * self.tree, other.tree,\n- * r, p, rect1, rect2,\n- * min_distance, max_distance) # <<<<<<<<<<<<<<\n- * \n- * stdlib.free(rect1.mins)\n- *\/\n- ((struct __pyx_vtabstruct_5scipy_7spatial_7ckdtree_cKDTree *)__pyx_v_self->__pyx_vtab)->__pyx___sparse_distance_matrix_traverse(__pyx_v_self, __pyx_v_other, __pyx_v_results, __pyx_v_self->tree, __pyx_v_other->tree, __pyx_v_r, __pyx_v_p, __pyx_v_rect1, __pyx_v_rect2, __pyx_v_min_distance, __pyx_v_max_distance);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2035\n- * min_distance, max_distance)\n- * \n- * stdlib.free(rect1.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- *\/\n- free(__pyx_v_rect1.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2036\n- * \n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes)\n- *\/\n- free(__pyx_v_rect1.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2037\n- * stdlib.free(rect1.mins)\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins) # <<<<<<<<<<<<<<\n- * stdlib.free(rect2.maxes)\n- * \n- *\/\n- free(__pyx_v_rect2.mins);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2038\n- * stdlib.free(rect1.maxes)\n- * stdlib.free(rect2.mins)\n- * stdlib.free(rect2.maxes) # <<<<<<<<<<<<<<\n- * \n- * return results.to_matrix(shape=(self.n, other.n)).todok()\n- *\/\n- free(__pyx_v_rect2.maxes);\n-\n- \/* \"scipy\/spatial\/ckdtree.pyx\":2040\n- * stdlib.free(rect2.maxes)\n- * \n- * return results.to_matrix(shape=(self.n, other.n)).todok() # <<<<<<<<<<<<<<\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_results), __pyx_n_s__to_matrix); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(((PyObject *)__pyx_t_7));\n- __pyx_t_8 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = PyDict_New(); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_8));\n+ __pyx_t_9 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_10 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_other->n); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_10);\n+ __pyx_t_11 = PyTuple_New(2); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_10);\n+ __Pyx_GIVEREF(__pyx_t_10);\n+ __pyx_t_9 = 0;\n+ __pyx_t_10 = 0;\n+ if (PyDict_SetItem(__pyx_t_8, ((PyObject *)__pyx_n_s__shape), ((PyObject *)__pyx_t_11)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;\n+ __pyx_t_11 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_8)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;\n+ __pyx_t_8 = PyObject_GetAttr(__pyx_t_11, __pyx_n_s__todok); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_9 = PyInt_FromLong(__pyx_v_other->n); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8);\n- __Pyx_GIVEREF(__pyx_t_8);\n- PyTuple_SET_ITEM(__pyx_t_10, 1, __pyx_t_9);\n- __Pyx_GIVEREF(__pyx_t_9);\n- __pyx_t_8 = 0;\n- __pyx_t_9 = 0;\n- if (PyDict_SetItem(__pyx_t_7, ((PyObject *)__pyx_n_s__shape), ((PyObject *)__pyx_t_10)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(((PyObject *)__pyx_t_10)); __pyx_t_10 = 0;\n- __pyx_t_10 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_7)); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;\n- __pyx_t_7 = PyObject_GetAttr(__pyx_t_10, __pyx_n_s__todok); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_t_10 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_r = __pyx_t_10;\n- __pyx_t_10 = 0;\n+ __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n+ __pyx_t_11 = PyObject_Call(__pyx_t_8, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2445; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n+ __pyx_r = __pyx_t_11;\n+ __pyx_t_11 = 0;\n goto __pyx_L0;\n \n __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n goto __pyx_L0;\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_7);\n __Pyx_XDECREF(__pyx_t_8);\n __Pyx_XDECREF(__pyx_t_9);\n __Pyx_XDECREF(__pyx_t_10);\n+ __Pyx_XDECREF(__pyx_t_11);\n __Pyx_AddTraceback(\"scipy.spatial.ckdtree.cKDTree.sparse_distance_matrix\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n@@ -15083,12 +16246,12 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":331\n+\/* \"scipy\/spatial\/ckdtree.pyx\":407\n * \n * cdef innernode* tree\n * cdef readonly object data # <<<<<<<<<<<<<<\n- * cdef double* raw_data\n- * cdef readonly int n, m\n+ * cdef np.float64_t* raw_data\n+ * cdef readonly np.npy_intp n, m\n *\/\n \n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_4data___get__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self) {\n@@ -15118,11 +16281,11 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":333\n+\/* \"scipy\/spatial\/ckdtree.pyx\":409\n * cdef readonly object data\n- * cdef double* raw_data\n- * cdef readonly int n, m # <<<<<<<<<<<<<<\n- * cdef readonly int leafsize\n+ * cdef np.float64_t* raw_data\n+ * cdef readonly np.npy_intp n, m # <<<<<<<<<<<<<<\n+ * cdef readonly np.npy_intp leafsize\n * cdef readonly object maxes\n *\/\n \n@@ -15135,7 +16298,7 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__get__\", 0);\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 409; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -15173,7 +16336,7 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__get__\", 0);\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 333; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->m); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 409; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -15202,12 +16365,12 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":334\n- * cdef double* raw_data\n- * cdef readonly int n, m\n- * cdef readonly int leafsize # <<<<<<<<<<<<<<\n+\/* \"scipy\/spatial\/ckdtree.pyx\":410\n+ * cdef np.float64_t* raw_data\n+ * cdef readonly np.npy_intp n, m\n+ * cdef readonly np.npy_intp leafsize # <<<<<<<<<<<<<<\n * cdef readonly object maxes\n- * cdef double* raw_maxes\n+ * cdef np.float64_t* raw_maxes\n *\/\n \n static PyObject *__pyx_pf_5scipy_7spatial_7ckdtree_7cKDTree_8leafsize___get__(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *__pyx_v_self) {\n@@ -15219,7 +16382,7 @@\n int __pyx_clineno = 0;\n __Pyx_RefNannySetupContext(\"__get__\", 0);\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyInt_FromLong(__pyx_v_self->leafsize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_PyInt_to_py_Py_intptr_t(__pyx_v_self->leafsize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -15248,11 +16411,11 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":335\n- * cdef readonly int n, m\n- * cdef readonly int leafsize\n+\/* \"scipy\/spatial\/ckdtree.pyx\":411\n+ * cdef readonly np.npy_intp n, m\n+ * cdef readonly np.npy_intp leafsize\n * cdef readonly object maxes # <<<<<<<<<<<<<<\n- * cdef double* raw_maxes\n+ * cdef np.float64_t* raw_maxes\n * cdef readonly object mins\n *\/\n \n@@ -15283,11 +16446,11 @@\n return __pyx_r;\n }\n \n-\/* \"scipy\/spatial\/ckdtree.pyx\":337\n+\/* \"scipy\/spatial\/ckdtree.pyx\":413\n * cdef readonly object maxes\n- * cdef double* raw_maxes\n+ * cdef np.float64_t* raw_maxes\n * cdef readonly object mins # <<<<<<<<<<<<<<\n- * cdef double* raw_mins\n+ * cdef np.float64_t* raw_mins\n * cdef object indices\n *\/\n \n@@ -17768,11 +18931,14 @@\n {&__pyx_kp_u_26, __pyx_k_26, sizeof(__pyx_k_26), 0, 1, 0, 0},\n {&__pyx_kp_u_29, __pyx_k_29, sizeof(__pyx_k_29), 0, 1, 0, 0},\n {&__pyx_n_s_31, __pyx_k_31, sizeof(__pyx_k_31), 0, 0, 1, 1},\n- {&__pyx_kp_u_32, __pyx_k_32, sizeof(__pyx_k_32), 0, 1, 0, 0},\n+ {&__pyx_kp_s_32, __pyx_k_32, sizeof(__pyx_k_32), 0, 0, 1, 0},\n {&__pyx_kp_u_33, __pyx_k_33, sizeof(__pyx_k_33), 0, 1, 0, 0},\n+ {&__pyx_kp_u_34, __pyx_k_34, sizeof(__pyx_k_34), 0, 1, 0, 0},\n {&__pyx_n_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 1},\n {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0},\n {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0},\n+ {&__pyx_n_s__ImportError, __pyx_k__ImportError, sizeof(__pyx_k__ImportError), 0, 0, 1, 1},\n+ {&__pyx_n_s__MemoryError, __pyx_k__MemoryError, sizeof(__pyx_k__MemoryError), 0, 0, 1, 1},\n {&__pyx_n_s__RuntimeError, __pyx_k__RuntimeError, sizeof(__pyx_k__RuntimeError), 0, 0, 1, 1},\n {&__pyx_n_s__ValueError, __pyx_k__ValueError, sizeof(__pyx_k__ValueError), 0, 0, 1, 1},\n {&__pyx_n_s____all__, __pyx_k____all__, sizeof(__pyx_k____all__), 0, 0, 1, 1},\n@@ -17781,7 +18947,6 @@\n {&__pyx_n_s__amax, __pyx_k__amax, sizeof(__pyx_k__amax), 0, 0, 1, 1},\n {&__pyx_n_s__amin, __pyx_k__amin, sizeof(__pyx_k__amin), 0, 0, 1, 1},\n {&__pyx_n_s__arange, __pyx_k__arange, sizeof(__pyx_k__arange), 0, 0, 1, 1},\n- {&__pyx_n_s__array, __pyx_k__array, sizeof(__pyx_k__array), 0, 0, 1, 1},\n {&__pyx_n_s__asarray, __pyx_k__asarray, sizeof(__pyx_k__asarray), 0, 0, 1, 1},\n {&__pyx_n_s__ascontiguousarray, __pyx_k__ascontiguousarray, sizeof(__pyx_k__ascontiguousarray), 0, 0, 1, 1},\n {&__pyx_n_s__astype, __pyx_k__astype, sizeof(__pyx_k__astype), 0, 0, 1, 1},\n@@ -17789,16 +18954,15 @@\n {&__pyx_n_s__cKDTree, __pyx_k__cKDTree, sizeof(__pyx_k__cKDTree), 0, 0, 1, 1},\n {&__pyx_n_s__coo_matrix, __pyx_k__coo_matrix, sizeof(__pyx_k__coo_matrix), 0, 0, 1, 1},\n {&__pyx_n_s__data, __pyx_k__data, sizeof(__pyx_k__data), 0, 0, 1, 1},\n- {&__pyx_n_s__double, __pyx_k__double, sizeof(__pyx_k__double), 0, 0, 1, 1},\n {&__pyx_n_s__dtype, __pyx_k__dtype, sizeof(__pyx_k__dtype), 0, 0, 1, 1},\n {&__pyx_n_s__empty, __pyx_k__empty, sizeof(__pyx_k__empty), 0, 0, 1, 1},\n {&__pyx_n_s__eps, __pyx_k__eps, sizeof(__pyx_k__eps), 0, 0, 1, 1},\n {&__pyx_n_s__fill, __pyx_k__fill, sizeof(__pyx_k__fill), 0, 0, 1, 1},\n- {&__pyx_n_s__float, __pyx_k__float, sizeof(__pyx_k__float), 0, 0, 1, 1},\n+ {&__pyx_n_s__float64, __pyx_k__float64, sizeof(__pyx_k__float64), 0, 0, 1, 1},\n {&__pyx_n_s__i, __pyx_k__i, sizeof(__pyx_k__i), 0, 0, 1, 1},\n {&__pyx_n_s__inf, __pyx_k__inf, sizeof(__pyx_k__inf), 0, 0, 1, 1},\n- {&__pyx_n_s__int, __pyx_k__int, sizeof(__pyx_k__int), 0, 0, 1, 1},\n {&__pyx_n_s__int32, __pyx_k__int32, sizeof(__pyx_k__int32), 0, 0, 1, 1},\n+ {&__pyx_n_s__int64, __pyx_k__int64, sizeof(__pyx_k__int64), 0, 0, 1, 1},\n {&__pyx_n_s__k, __pyx_k__k, sizeof(__pyx_k__k), 0, 0, 1, 1},\n {&__pyx_n_s__kdtree, __pyx_k__kdtree, sizeof(__pyx_k__kdtree), 0, 0, 1, 1},\n {&__pyx_n_s__leafsize, __pyx_k__leafsize, sizeof(__pyx_k__leafsize), 0, 0, 1, 1},\n@@ -17820,18 +18984,14 @@\n {&__pyx_n_s__to_matrix, __pyx_k__to_matrix, sizeof(__pyx_k__to_matrix), 0, 0, 1, 1},\n {&__pyx_n_s__todok, __pyx_k__todok, sizeof(__pyx_k__todok), 0, 0, 1, 1},\n {&__pyx_n_s__x, __pyx_k__x, sizeof(__pyx_k__x), 0, 0, 1, 1},\n- {&__pyx_n_s__xrange, __pyx_k__xrange, sizeof(__pyx_k__xrange), 0, 0, 1, 1},\n {&__pyx_n_s__zeros, __pyx_k__zeros, sizeof(__pyx_k__zeros), 0, 0, 1, 1},\n {0, 0, 0, 0, 0, 0, 0}\n };\n static int __Pyx_InitCachedBuiltins(void) {\n- __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- #if PY_MAJOR_VERSION >= 3\n- __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- #else\n- __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__xrange); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- #endif\n+ __pyx_builtin_ImportError = __Pyx_GetName(__pyx_b, __pyx_n_s__ImportError); if (!__pyx_builtin_ImportError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_MemoryError = __Pyx_GetName(__pyx_b, __pyx_n_s__MemoryError); if (!__pyx_builtin_MemoryError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_n_s__RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 798; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n return 0;\n __pyx_L1_error:;\n@@ -17842,53 +19002,53 @@\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"__Pyx_InitCachedConstants\", 0);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":350\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":427\n * self.leafsize = leafsize\n * if self.leafsize<1:\n * raise ValueError(\"leafsize must be at least 1\") # <<<<<<<<<<<<<<\n- * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0))\n- * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0))\n- *\/\n- __pyx_k_tuple_3 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * self.maxes = np.ascontiguousarray(np.amax(self.data,axis=0), dtype=np.float64)\n+ * self.mins = np.ascontiguousarray(np.amin(self.data,axis=0), dtype=np.float64)\n+ *\/\n+ __pyx_k_tuple_3 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_3);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_2));\n PyTuple_SET_ITEM(__pyx_k_tuple_3, 0, ((PyObject *)__pyx_kp_s_2));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_2));\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_3));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":699\n- * raise ValueError(\"x must consist of vectors of length %d but has shape %s\" % (self.m, np.shape(x)))\n- * if p<1:\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":835\n+ * \"shape %s\" % (self.m, np.shape(x)))\n+ * if p < 1:\n * raise ValueError(\"Only p-norms with 1<=p<=infinity permitted\") # <<<<<<<<<<<<<<\n * if len(x.shape)==1:\n * single = True\n *\/\n- __pyx_k_tuple_8 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_8 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_8);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_7));\n PyTuple_SET_ITEM(__pyx_k_tuple_8, 0, ((PyObject *)__pyx_kp_s_7));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7));\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_8));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":702\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":838\n * if len(x.shape)==1:\n * single = True\n * x = x[np.newaxis,:] # <<<<<<<<<<<<<<\n * else:\n * single = False\n *\/\n- __pyx_k_slice_9 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_k_slice_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_slice_9 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_k_slice_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_slice_9);\n __Pyx_GIVEREF(__pyx_k_slice_9);\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":729\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":865\n * else:\n * if k==1:\n * return np.reshape(dd[...,0],retshape), np.reshape(ii[...,0],retshape) # <<<<<<<<<<<<<<\n * else:\n * return np.reshape(dd,retshape+(k,)), np.reshape(ii,retshape+(k,))\n *\/\n- __pyx_k_tuple_10 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_10 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_10);\n __Pyx_INCREF(Py_Ellipsis);\n PyTuple_SET_ITEM(__pyx_k_tuple_10, 0, Py_Ellipsis);\n@@ -17897,7 +19057,7 @@\n PyTuple_SET_ITEM(__pyx_k_tuple_10, 1, __pyx_int_0);\n __Pyx_GIVEREF(__pyx_int_0);\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_10));\n- __pyx_k_tuple_11 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_11 = PyTuple_New(2); if (unlikely(!__pyx_k_tuple_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_11);\n __Pyx_INCREF(Py_Ellipsis);\n PyTuple_SET_ITEM(__pyx_k_tuple_11, 0, Py_Ellipsis);\n@@ -17907,56 +19067,56 @@\n __Pyx_GIVEREF(__pyx_int_0);\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_11));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1160\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":1363\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_k_tuple_14 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_14 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_14)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_14);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_13));\n PyTuple_SET_ITEM(__pyx_k_tuple_14, 0, ((PyObject *)__pyx_kp_s_13));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13));\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_14));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1730\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2058\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # Make a copy of r array to ensure it's contiguous and to modify it\n *\/\n- __pyx_k_tuple_15 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1730; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_15 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_15);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_13));\n PyTuple_SET_ITEM(__pyx_k_tuple_15, 0, ((PyObject *)__pyx_kp_s_13));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_13));\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_15));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":1741\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2069\n * n_queries = r.shape[0]\n * else:\n * raise ValueError(\"r must be either a single value or a one-dimensional array of values\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_k_tuple_17 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1741; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_17 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_17)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2069; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_17);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_16));\n PyTuple_SET_ITEM(__pyx_k_tuple_17, 0, ((PyObject *)__pyx_kp_s_16));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_16));\n __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_17));\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":2000\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":2382\n * # Make sure trees are compatible\n * if self.m != other.m:\n * raise ValueError(\"Trees passed to query_ball_trees have different dimensionality\") # <<<<<<<<<<<<<<\n * \n * # internally we represent all distances as distance**p\n *\/\n- __pyx_k_tuple_18 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2000; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_k_tuple_18 = PyTuple_New(1); if (unlikely(!__pyx_k_tuple_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2382; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_k_tuple_18);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_13));\n PyTuple_SET_ITEM(__pyx_k_tuple_18, 0, ((PyObject *)__pyx_kp_s_13));\n@@ -18056,7 +19216,6 @@\n static int __Pyx_InitGlobals(void) {\n if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n- __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n return 0;\n __pyx_L1_error:;\n@@ -18073,7 +19232,8 @@\n {\n PyObject *__pyx_t_1 = NULL;\n PyObject *__pyx_t_2 = NULL;\n- double __pyx_t_3;\n+ __pyx_t_5numpy_float64_t __pyx_t_3;\n+ int __pyx_t_4;\n __Pyx_RefNannyDeclarations\n #if CYTHON_REFNANNY\n __Pyx_RefNanny = __Pyx_RefNannyImportAPI(\"refnanny\");\n@@ -18127,31 +19287,32 @@\n \/*--- Constants init code ---*\/\n if (unlikely(__Pyx_InitCachedConstants() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n \/*--- Global init code ---*\/\n+ __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype = Py_None; Py_INCREF(Py_None);\n \/*--- Variable export code ---*\/\n \/*--- Function export code ---*\/\n \/*--- Type init code ---*\/\n __pyx_vtabptr_5scipy_7spatial_7ckdtree_coo_entries = &__pyx_vtable_5scipy_7spatial_7ckdtree_coo_entries;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_coo_entries.add = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, int, int, double))__pyx_f_5scipy_7spatial_7ckdtree_11coo_entries_add;\n- if (PyType_Ready(&__pyx_type_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- if (__Pyx_SetVtable(__pyx_type_5scipy_7spatial_7ckdtree_coo_entries.tp_dict, __pyx_vtabptr_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- if (__Pyx_SetAttrString(__pyx_m, \"coo_entries\", (PyObject *)&__pyx_type_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_coo_entries.add = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, npy_intp, npy_intp, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_11coo_entries_add;\n+ if (PyType_Ready(&__pyx_type_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_SetVtable(__pyx_type_5scipy_7spatial_7ckdtree_coo_entries.tp_dict, __pyx_vtabptr_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_SetAttrString(__pyx_m, \"coo_entries\", (PyObject *)&__pyx_type_5scipy_7spatial_7ckdtree_coo_entries) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_ptype_5scipy_7spatial_7ckdtree_coo_entries = &__pyx_type_5scipy_7spatial_7ckdtree_coo_entries;\n __pyx_vtabptr_5scipy_7spatial_7ckdtree_cKDTree = &__pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___build = (struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *(*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, int, int, double *, double *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___build;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___build = (struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *(*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, npy_intp, npy_intp, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___build;\n __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___free_tree = (PyObject *(*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___free_tree;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, double *, int *, double *, int, double, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point_traverse_no_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_no_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point_traverse_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point = (PyObject *(*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, double *, double, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_tree_traverse_no_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_no_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_tree_traverse_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_pairs_traverse_no_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_no_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_pairs_traverse_checking = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_checking;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___count_neighbors_traverse = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, int, double *, __pyx_t_5numpy_int_t *, __pyx_t_5numpy_int_t *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___count_neighbors_traverse;\n- __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___sparse_distance_matrix_traverse = (void (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, double, double, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, double, double))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___sparse_distance_matrix_traverse;\n- if (PyType_Ready(&__pyx_type_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- if (__Pyx_SetVtable(__pyx_type_5scipy_7spatial_7ckdtree_cKDTree.tp_dict, __pyx_vtabptr_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- if (__Pyx_SetAttrString(__pyx_m, \"cKDTree\", (PyObject *)&__pyx_type_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, __pyx_t_5numpy_float64_t *, npy_intp *, __pyx_t_5numpy_float64_t *, npy_intp, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point_traverse_no_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_no_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point_traverse_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point_traverse_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_point = (PyObject *(*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, __pyx_t_5numpy_float64_t *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_point;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_tree_traverse_no_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_no_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_ball_tree_traverse_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_ball_tree_traverse_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_pairs_traverse_no_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_no_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___query_pairs_traverse_checking = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, PyObject *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___query_pairs_traverse_checking;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___count_neighbors_traverse = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, npy_intp, __pyx_t_5numpy_float64_t *, npy_intp *, npy_intp *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___count_neighbors_traverse;\n+ __pyx_vtable_5scipy_7spatial_7ckdtree_cKDTree.__pyx___sparse_distance_matrix_traverse = (int (*)(struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_cKDTree *, struct __pyx_obj_5scipy_7spatial_7ckdtree_coo_entries *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, struct __pyx_t_5scipy_7spatial_7ckdtree_innernode *, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, struct __pyx_t_5scipy_7spatial_7ckdtree_Rectangle, __pyx_t_5numpy_float64_t, __pyx_t_5numpy_float64_t))__pyx_f_5scipy_7spatial_7ckdtree_7cKDTree___sparse_distance_matrix_traverse;\n+ if (PyType_Ready(&__pyx_type_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_SetVtable(__pyx_type_5scipy_7spatial_7ckdtree_cKDTree.tp_dict, __pyx_vtabptr_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_SetAttrString(__pyx_m, \"cKDTree\", (PyObject *)&__pyx_type_5scipy_7spatial_7ckdtree_cKDTree) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_ptype_5scipy_7spatial_7ckdtree_cKDTree = &__pyx_type_5scipy_7spatial_7ckdtree_cKDTree;\n \/*--- Type import code ---*\/\n __pyx_ptype_5numpy_dtype = __Pyx_ImportType(\"numpy\", \"dtype\", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -18175,65 +19336,138 @@\n if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":7\n- * cimport libc.stdlib as stdlib\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":8\n+ * cimport cython\n * \n * import scipy.sparse # <<<<<<<<<<<<<<\n * \n * import kdtree\n *\/\n- __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s_31), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s_31), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__scipy, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s__scipy, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":9\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":10\n * import scipy.sparse\n * \n * import kdtree # <<<<<<<<<<<<<<\n * \n- * cdef double infinity = np.inf\n- *\/\n- __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__kdtree), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ * cdef np.float64_t infinity = np.inf\n+ *\/\n+ __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__kdtree), 0, -1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__kdtree, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s__kdtree, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":11\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":12\n * import kdtree\n * \n- * cdef double infinity = np.inf # <<<<<<<<<<<<<<\n+ * cdef np.float64_t infinity = np.inf # <<<<<<<<<<<<<<\n * \n * __all__ = ['cKDTree']\n *\/\n- __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__inf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__inf); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_t_2); if (unlikely((__pyx_t_3 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_t_2); if (unlikely((__pyx_t_3 == (npy_float64)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __pyx_v_5scipy_7spatial_7ckdtree_infinity = __pyx_t_3;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":13\n- * cdef double infinity = np.inf\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":14\n+ * cdef np.float64_t infinity = np.inf\n * \n * __all__ = ['cKDTree'] # <<<<<<<<<<<<<<\n * \n * \n *\/\n- __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(((PyObject *)__pyx_n_s__cKDTree));\n PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s__cKDTree));\n __Pyx_GIVEREF(((PyObject *)__pyx_n_s__cKDTree));\n- if (PyObject_SetAttr(__pyx_m, __pyx_n_s____all__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s____all__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n \n- \/* \"scipy\/spatial\/ckdtree.pyx\":653\n- * \n- * def query(cKDTree self, object x, int k=1, double eps=0, double p=2,\n- * double distance_upper_bound=infinity): # <<<<<<<<<<<<<<\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":22\n+ * cdef object npy_intp_dtype\n+ * \n+ * if sizeof(np.npy_intp) == sizeof(np.int32_t): # <<<<<<<<<<<<<<\n+ * npy_intp_dtype = np.int32\n+ * elif sizeof(np.npy_intp) == sizeof(np.int64_t):\n+ *\/\n+ __pyx_t_4 = ((sizeof(npy_intp)) == (sizeof(__pyx_t_5numpy_int32_t)));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":23\n+ * \n+ * if sizeof(np.npy_intp) == sizeof(np.int32_t):\n+ * npy_intp_dtype = np.int32 # <<<<<<<<<<<<<<\n+ * elif sizeof(np.npy_intp) == sizeof(np.int64_t):\n+ * npy_intp_dtype = np.int64\n+ *\/\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__int32); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_XGOTREF(__pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype);\n+ __Pyx_DECREF(__pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L2;\n+ }\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":24\n+ * if sizeof(np.npy_intp) == sizeof(np.int32_t):\n+ * npy_intp_dtype = np.int32\n+ * elif sizeof(np.npy_intp) == sizeof(np.int64_t): # <<<<<<<<<<<<<<\n+ * npy_intp_dtype = np.int64\n+ * else:\n+ *\/\n+ __pyx_t_4 = ((sizeof(npy_intp)) == (sizeof(__pyx_t_5numpy_int64_t)));\n+ if (__pyx_t_4) {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":25\n+ * npy_intp_dtype = np.int32\n+ * elif sizeof(np.npy_intp) == sizeof(np.int64_t):\n+ * npy_intp_dtype = np.int64 # <<<<<<<<<<<<<<\n+ * else:\n+ * raise ImportError, 'Unexpected length of npy_intp'\n+ *\/\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__int64); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_XGOTREF(__pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype);\n+ __Pyx_DECREF(__pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_v_5scipy_7spatial_7ckdtree_npy_intp_dtype = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ goto __pyx_L2;\n+ }\n+ \/*else*\/ {\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":27\n+ * npy_intp_dtype = np.int64\n+ * else:\n+ * raise ImportError, 'Unexpected length of npy_intp' # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __Pyx_Raise(__pyx_builtin_ImportError, ((PyObject *)__pyx_kp_s_32), 0, 0);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_L2:;\n+\n+ \/* \"scipy\/spatial\/ckdtree.pyx\":788\n+ * \n+ * def query(cKDTree self, object x, np.npy_intp k=1, np.float64_t eps=0,\n+ * np.float64_t p=2, np.float64_t distance_upper_bound=infinity): # <<<<<<<<<<<<<<\n * \"\"\"query(self, x, k=1, eps=0, p=2, distance_upper_bound=np.inf)\n * \n *\/\n@@ -18246,7 +19480,7 @@\n *\/\n __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n- if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_32), ((PyObject *)__pyx_kp_u_33)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_kp_u_33), ((PyObject *)__pyx_kp_u_34)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n if (PyObject_SetAttr(__pyx_m, __pyx_n_s____test__, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n \n@@ -18460,13 +19694,6 @@\n return;\n }\n #endif\n-\n-static CYTHON_INLINE long __Pyx_div_long(long a, long b) {\n- long q = a \/ b;\n- long r = a - q*b;\n- q -= ((r != 0) & ((r ^ b) < 0));\n- return q;\n-}\n \n static void __Pyx_RaiseArgtupleInvalid(\n const char* func_name,\n@@ -19198,6 +20425,51 @@\n \"Buffer acquisition failed on assignment; and then reacquiring the old buffer failed too!\");\n }\n \n+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {\n+ PyObject *local_type, *local_value, *local_tb;\n+ PyObject *tmp_type, *tmp_value, *tmp_tb;\n+ PyThreadState *tstate = PyThreadState_GET();\n+ local_type = tstate->curexc_type;\n+ local_value = tstate->curexc_value;\n+ local_tb = tstate->curexc_traceback;\n+ tstate->curexc_type = 0;\n+ tstate->curexc_value = 0;\n+ tstate->curexc_traceback = 0;\n+ PyErr_NormalizeException(&local_type, &local_value, &local_tb);\n+ if (unlikely(tstate->curexc_type))\n+ goto bad;\n+ #if PY_MAJOR_VERSION >= 3\n+ if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))\n+ goto bad;\n+ #endif\n+ *type = local_type;\n+ *value = local_value;\n+ *tb = local_tb;\n+ Py_INCREF(local_type);\n+ Py_INCREF(local_value);\n+ Py_INCREF(local_tb);\n+ tmp_type = tstate->exc_type;\n+ tmp_value = tstate->exc_value;\n+ tmp_tb = tstate->exc_traceback;\n+ tstate->exc_type = local_type;\n+ tstate->exc_value = local_value;\n+ tstate->exc_traceback = local_tb;\n+ \/* Make sure tstate is in a consistent state when we XDECREF\n+ these objects (XDECREF may run arbitrary code). *\/\n+ Py_XDECREF(tmp_type);\n+ Py_XDECREF(tmp_value);\n+ Py_XDECREF(tmp_tb);\n+ return 0;\n+bad:\n+ *type = 0;\n+ *value = 0;\n+ *tb = 0;\n+ Py_XDECREF(local_type);\n+ Py_XDECREF(local_value);\n+ Py_XDECREF(local_tb);\n+ return -1;\n+}\n+\n \n \n static void __Pyx_RaiseBufferIndexError(int axis) {\n@@ -19237,6 +20509,54 @@\n } else {\n __Pyx_RaiseTooManyValuesError(index);\n }\n+}\n+\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_Py_intptr_t(Py_intptr_t val) {\n+ const Py_intptr_t neg_one = (Py_intptr_t)-1, const_zero = (Py_intptr_t)0;\n+ const int is_unsigned = const_zero < neg_one;\n+ if ((sizeof(Py_intptr_t) == sizeof(char)) ||\n+ (sizeof(Py_intptr_t) == sizeof(short))) {\n+ return PyInt_FromLong((long)val);\n+ } else if ((sizeof(Py_intptr_t) == sizeof(int)) ||\n+ (sizeof(Py_intptr_t) == sizeof(long))) {\n+ if (is_unsigned)\n+ return PyLong_FromUnsignedLong((unsigned long)val);\n+ else\n+ return PyInt_FromLong((long)val);\n+ } else if (sizeof(Py_intptr_t) == sizeof(PY_LONG_LONG)) {\n+ if (is_unsigned)\n+ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val);\n+ else\n+ return PyLong_FromLongLong((PY_LONG_LONG)val);\n+ } else {\n+ int one = 1; int little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ return _PyLong_FromByteArray(bytes, sizeof(Py_intptr_t),\n+ little, !is_unsigned);\n+ }\n+}\n+\n+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {\n+ PyThreadState *tstate = PyThreadState_GET();\n+ *type = tstate->exc_type;\n+ *value = tstate->exc_value;\n+ *tb = tstate->exc_traceback;\n+ Py_XINCREF(*type);\n+ Py_XINCREF(*value);\n+ Py_XINCREF(*tb);\n+}\n+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) {\n+ PyObject *tmp_type, *tmp_value, *tmp_tb;\n+ PyThreadState *tstate = PyThreadState_GET();\n+ tmp_type = tstate->exc_type;\n+ tmp_value = tstate->exc_value;\n+ tmp_tb = tstate->exc_traceback;\n+ tstate->exc_type = type;\n+ tstate->exc_value = value;\n+ tstate->exc_traceback = tb;\n+ Py_XDECREF(tmp_type);\n+ Py_XDECREF(tmp_value);\n+ Py_XDECREF(tmp_tb);\n }\n \n #if PY_MAJOR_VERSION < 3\n@@ -19401,53 +20721,55 @@\n return module;\n }\n \n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_int32(npy_int32 val) {\n- const npy_int32 neg_one = (npy_int32)-1, const_zero = (npy_int32)0;\n+static CYTHON_INLINE Py_intptr_t __Pyx_PyInt_from_py_Py_intptr_t(PyObject* x) {\n+ const Py_intptr_t neg_one = (Py_intptr_t)-1, const_zero = (Py_intptr_t)0;\n const int is_unsigned = const_zero < neg_one;\n- if ((sizeof(npy_int32) == sizeof(char)) ||\n- (sizeof(npy_int32) == sizeof(short))) {\n- return PyInt_FromLong((long)val);\n- } else if ((sizeof(npy_int32) == sizeof(int)) ||\n- (sizeof(npy_int32) == sizeof(long))) {\n+ if (sizeof(Py_intptr_t) == sizeof(char)) {\n if (is_unsigned)\n- return PyLong_FromUnsignedLong((unsigned long)val);\n+ return (Py_intptr_t)__Pyx_PyInt_AsUnsignedChar(x);\n else\n- return PyInt_FromLong((long)val);\n- } else if (sizeof(npy_int32) == sizeof(PY_LONG_LONG)) {\n+ return (Py_intptr_t)__Pyx_PyInt_AsSignedChar(x);\n+ } else if (sizeof(Py_intptr_t) == sizeof(short)) {\n if (is_unsigned)\n- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val);\n+ return (Py_intptr_t)__Pyx_PyInt_AsUnsignedShort(x);\n else\n- return PyLong_FromLongLong((PY_LONG_LONG)val);\n- } else {\n- int one = 1; int little = (int)*(unsigned char *)&one;\n- unsigned char *bytes = (unsigned char *)&val;\n- return _PyLong_FromByteArray(bytes, sizeof(npy_int32),\n- little, !is_unsigned);\n- }\n-}\n-\n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_long(npy_long val) {\n- const npy_long neg_one = (npy_long)-1, const_zero = (npy_long)0;\n- const int is_unsigned = const_zero < neg_one;\n- if ((sizeof(npy_long) == sizeof(char)) ||\n- (sizeof(npy_long) == sizeof(short))) {\n- return PyInt_FromLong((long)val);\n- } else if ((sizeof(npy_long) == sizeof(int)) ||\n- (sizeof(npy_long) == sizeof(long))) {\n+ return (Py_intptr_t)__Pyx_PyInt_AsSignedShort(x);\n+ } else if (sizeof(Py_intptr_t) == sizeof(int)) {\n if (is_unsigned)\n- return PyLong_FromUnsignedLong((unsigned long)val);\n+ return (Py_intptr_t)__Pyx_PyInt_AsUnsignedInt(x);\n else\n- return PyInt_FromLong((long)val);\n- } else if (sizeof(npy_long) == sizeof(PY_LONG_LONG)) {\n+ return (Py_intptr_t)__Pyx_PyInt_AsSignedInt(x);\n+ } else if (sizeof(Py_intptr_t) == sizeof(long)) {\n if (is_unsigned)\n- return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val);\n+ return (Py_intptr_t)__Pyx_PyInt_AsUnsignedLong(x);\n else\n- return PyLong_FromLongLong((PY_LONG_LONG)val);\n- } else {\n- int one = 1; int little = (int)*(unsigned char *)&one;\n- unsigned char *bytes = (unsigned char *)&val;\n- return _PyLong_FromByteArray(bytes, sizeof(npy_long),\n- little, !is_unsigned);\n+ return (Py_intptr_t)__Pyx_PyInt_AsSignedLong(x);\n+ } else if (sizeof(Py_intptr_t) == sizeof(PY_LONG_LONG)) {\n+ if (is_unsigned)\n+ return (Py_intptr_t)__Pyx_PyInt_AsUnsignedLongLong(x);\n+ else\n+ return (Py_intptr_t)__Pyx_PyInt_AsSignedLongLong(x);\n+ } else {\n+ Py_intptr_t val;\n+ PyObject *v = __Pyx_PyNumber_Int(x);\n+ #if PY_VERSION_HEX < 0x03000000\n+ if (likely(v) && !PyLong_Check(v)) {\n+ PyObject *tmp = v;\n+ v = PyNumber_Long(tmp);\n+ Py_DECREF(tmp);\n+ }\n+ #endif\n+ if (likely(v)) {\n+ int one = 1; int is_little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ int ret = _PyLong_AsByteArray((PyLongObject *)v,\n+ bytes, sizeof(val),\n+ is_little, !is_unsigned);\n+ Py_DECREF(v);\n+ if (likely(!ret))\n+ return val;\n+ }\n+ return (Py_intptr_t)-1;\n }\n }\n \n"} {"commit":"4f381fa8f3d4cc4c107423f387684ffd49bf9452","subject":"Add pelican example","message":"Add pelican example\n","repos":"jawebada\/libmbb,jawebada\/libmbb,jawebada\/libmbb,jawebada\/libmbb","returncode":1,"stderr":"error: pathspec 'examples\/pelican.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- examples\/pelican.c\n+++ examples\/pelican.c\n@@ -0,0 +1,367 @@\n+\/* * Copyright (C) 2015 Jan Weil\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\n+ * this software and associated documentation files (the \"Software\"), to deal in\n+ * the Software without restriction, including without limitation the rights to\n+ * use, copy, modify, merge, publish, distribute, sublicense, and\/or sell copies of\n+ * the Software, and to permit persons to whom the Software is furnished to do so,\n+ * subject to the following conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be included in all\n+ * copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\n+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\n+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\n+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\n+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+ *\/\n+\n+\/*\n+ * PElican LIght CONtrolled Crossing Example\n+ * http:\/\/www.state-machine.com\/resources\/AN_PELICAN.pdf\n+ *\n+ * Press space to trigger PEDS_WAITING event.\n+ * Press 'o' to trigger OFF\/ON events.\n+ *\/\n+\n+#include \"mbb\/hsm.h\"\n+#include \"mbb\/timer.h\"\n+#include \"mbb\/debug.h\"\n+#include <stdio.h>\n+#include <stdlib.h>\n+\n+#define PELICAN_PERIOD\t\t\t\t(MTMR_ONE_SEC \/ 20)\n+#define PELICAN_TIMEOUT_CARS_GREEN_MIN\t\t(8 * MTMR_ONE_SEC)\n+#define PELICAN_TIMEOUT_CARS_YELLOW\t\t(3 * MTMR_ONE_SEC)\n+#define PELICAN_TIMEOUT_PEDS_WALK\t\t(3 * MTMR_ONE_SEC)\n+#define PELICAN_TIMEOUT_PEDS_FLASH\t\t(MTMR_ONE_SEC \/ 5)\n+#define PELICAN_PEDS_NROF_FLASHES\t\t10\n+#define PELICAN_TIMEOUT_OFF_FLASH\t\t(MTMR_ONE_SEC \/ 2)\n+\n+enum {\n+\tPELICAN_CARS_BLANK,\n+\tPELICAN_CARS_RED,\n+\tPELICAN_CARS_YELLOW,\n+\tPELICAN_CARS_GREEN\n+};\n+\n+enum {\n+\tPELICAN_PEDS_BLANK,\n+\tPELICAN_PEDS_DONT_WALK,\n+\tPELICAN_PEDS_WALK\n+};\n+\n+enum {\n+\tPELICAN_EVENT_TIMEOUT_CARS_GREEN_MIN = MHSM_EVENT_CUSTOM,\n+\tPELICAN_EVENT_TIMEOUT_CARS_YELLOW,\n+\tPELICAN_EVENT_TIMEOUT_PEDS_WALK,\n+\tPELICAN_EVENT_TIMEOUT_PEDS_FLASH,\n+\tPELICAN_EVENT_TIMEOUT_OFF_FLASH,\n+\tPELICAN_EVENT_PEDS_WAITING,\n+\tPELICAN_EVENT_OFF,\n+\tPELICAN_EVENT_ON\n+};\n+\n+MHSM_DEFINE_STATE(operational, NULL);\n+MHSM_DEFINE_STATE(cars_enabled, &operational);\n+MHSM_DEFINE_STATE(cars_green, &cars_enabled);\n+MHSM_DEFINE_STATE(cars_green_no_ped, &cars_green);\n+MHSM_DEFINE_STATE(cars_green_int, &cars_green);\n+MHSM_DEFINE_STATE(cars_green_ped_wait, &cars_green);\n+MHSM_DEFINE_STATE(cars_yellow, &cars_enabled);\n+MHSM_DEFINE_STATE(peds_enabled, &operational);\n+MHSM_DEFINE_STATE(peds_walk, &peds_enabled);\n+MHSM_DEFINE_STATE(peds_flash, &peds_enabled);\n+MHSM_DEFINE_STATE(offline, NULL);\n+\n+typedef struct {\n+\tmtmr_t timers[MTMR_NROF_TIMERS(PELICAN_EVENT_TIMEOUT_OFF_FLASH)];\n+\tint cars_light_state;\n+\tint peds_light_state;\n+\tint peds_flash_counter;\n+} pelican_state_t;\n+\n+static void print_state(pelican_state_t *state)\n+{\n+\tint i;\n+\n+\tprintf(\"\\r\");\n+\tfor (i = 0; i < 80; i++) printf(\" \");\n+\n+\tprintf(\"\\r\");\n+\tprintf(\"cars: \");\n+\tswitch (state->cars_light_state) {\n+\t\tcase PELICAN_CARS_RED:\n+\t\t\tprintf(\"red\");\n+\t\t\tbreak;\n+\t\tcase PELICAN_CARS_YELLOW:\n+\t\t\tprintf(\"yellow\");\n+\t\t\tbreak;\n+\t\tcase PELICAN_CARS_GREEN:\n+\t\t\tprintf(\"green\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tprintf(\" \");\n+\t\t\tbreak;\n+\t}\n+\tprintf(\"\\tpedestrians: \");\n+\tswitch (state->peds_light_state) {\n+\t\tcase PELICAN_PEDS_WALK:\n+\t\t\tprintf(\"walk\");\n+\t\t\tbreak;\n+\t\tcase PELICAN_PEDS_DONT_WALK:\n+\t\t\tprintf(\"don't walk\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tprintf(\" \");\n+\t\t\tbreak;\n+\t}\n+\tfflush(stdout);\n+}\n+\n+static void set_cars_light(pelican_state_t *state, int light_state)\n+{\n+\tstate->cars_light_state = light_state;\n+\tprint_state(state);\n+}\n+\n+static void set_peds_light(pelican_state_t *state, int light_state)\n+{\n+\tstate->peds_light_state = light_state;\n+\tprint_state(state);\n+}\n+\n+mhsm_state_t *operational_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tset_cars_light(state, PELICAN_CARS_RED);\n+\t\t\tset_peds_light(state, PELICAN_PEDS_DONT_WALK);\n+\t\t\tstate->peds_flash_counter = 0;\n+\t\t\tbreak;\n+\t\tcase MHSM_EVENT_INITIAL:\n+\t\t\treturn &cars_enabled;\n+\t\tcase PELICAN_EVENT_OFF:\n+\t\t\treturn &offline;\n+\t}\n+\n+\treturn &operational;\n+}\n+\n+mhsm_state_t *cars_enabled_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tbreak;\n+\t\tcase MHSM_EVENT_INITIAL:\n+\t\t\treturn &cars_green;\n+\t\tcase MHSM_EVENT_EXIT:\n+\t\t\tset_cars_light(state, PELICAN_CARS_RED);\n+\t\t\tbreak;\n+\t}\n+\n+\treturn &cars_enabled;\n+}\n+\n+mhsm_state_t *cars_green_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tset_cars_light(state, PELICAN_CARS_GREEN);\n+\t\t\tbreak;\n+\t\tcase MHSM_EVENT_INITIAL:\n+\t\t\treturn &cars_green_no_ped;\n+\t}\n+\n+\treturn &cars_green;\n+}\n+\n+mhsm_state_t *cars_green_no_ped_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_CARS_GREEN_MIN, PELICAN_TIMEOUT_CARS_GREEN_MIN);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_TIMEOUT_CARS_GREEN_MIN:\n+\t\t\treturn &cars_green_int;\n+\t\tcase PELICAN_EVENT_PEDS_WAITING:\n+\t\t\treturn &cars_green_ped_wait;\n+\t}\n+\n+\treturn &cars_green_no_ped;\n+}\n+\n+mhsm_state_t *cars_green_int_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tswitch (event.id) {\n+\t\tcase PELICAN_EVENT_PEDS_WAITING:\n+\t\t\treturn &cars_yellow;\n+\t}\n+\n+\treturn &cars_green_int;\n+}\n+\n+mhsm_state_t *cars_green_ped_wait_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tswitch (event.id) {\n+\t\tcase PELICAN_EVENT_TIMEOUT_CARS_GREEN_MIN:\n+\t\t\treturn &cars_yellow;\n+\t}\n+\n+\treturn &cars_green_ped_wait;\n+}\n+\n+mhsm_state_t *cars_yellow_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tset_cars_light(state, PELICAN_CARS_YELLOW);\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_CARS_YELLOW, PELICAN_TIMEOUT_CARS_YELLOW);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_TIMEOUT_CARS_YELLOW:\n+\t\t\treturn &peds_enabled;\n+\t}\n+\n+\treturn &cars_yellow;\n+}\n+\n+mhsm_state_t *peds_enabled_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_INITIAL:\n+\t\t\treturn &peds_walk;\n+\t\tcase MHSM_EVENT_EXIT:\n+\t\t\tset_peds_light(state, PELICAN_PEDS_DONT_WALK);\n+\t\t\tbreak;\n+\t}\n+\n+\treturn &peds_enabled;\n+}\n+\n+mhsm_state_t *peds_walk_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_PEDS_WALK, PELICAN_TIMEOUT_PEDS_WALK);\n+\t\t\tset_peds_light(state, PELICAN_PEDS_WALK);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_TIMEOUT_PEDS_WALK:\n+\t\t\treturn &peds_flash;\n+\t}\n+\n+\treturn &peds_walk;\n+}\n+\n+mhsm_state_t *peds_flash_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tstate->peds_flash_counter = PELICAN_PEDS_NROF_FLASHES;\n+\t\t\tset_peds_light(state, PELICAN_PEDS_BLANK);\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_PEDS_FLASH, PELICAN_TIMEOUT_PEDS_FLASH);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_TIMEOUT_PEDS_FLASH:\n+\t\t\tstate->peds_flash_counter--;\n+\t\t\tif (state->peds_flash_counter == 0)\n+\t\t\t\treturn &cars_enabled;\n+\t\t\tset_peds_light(state, (state->peds_flash_counter % 2) ? PELICAN_PEDS_WALK : PELICAN_PEDS_BLANK);\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_PEDS_FLASH, PELICAN_TIMEOUT_PEDS_FLASH);\n+\t\t\tbreak;\n+\t}\n+\n+\treturn &peds_flash;\n+}\n+\n+mhsm_state_t *offline_fun(mhsm_hsm_t *hsm, mhsm_event_t event)\n+{\n+\tpelican_state_t *state = (pelican_state_t*) mhsm_context(hsm);\n+\n+\tswitch (event.id) {\n+\t\tcase MHSM_EVENT_ENTRY:\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_OFF_FLASH, PELICAN_TIMEOUT_OFF_FLASH);\n+\t\t\tset_cars_light(state, PELICAN_CARS_RED);\n+\t\t\tset_peds_light(state, PELICAN_PEDS_DONT_WALK);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_TIMEOUT_OFF_FLASH:\n+\t\t\tset_cars_light(state, state->cars_light_state == PELICAN_CARS_RED ? PELICAN_CARS_BLANK : PELICAN_CARS_RED);\n+\t\t\tset_peds_light(state, state->peds_light_state == PELICAN_PEDS_DONT_WALK ? PELICAN_PEDS_BLANK : PELICAN_PEDS_DONT_WALK);\n+\t\t\tmhsm_start_timer(hsm, PELICAN_EVENT_TIMEOUT_OFF_FLASH, PELICAN_TIMEOUT_OFF_FLASH);\n+\t\t\tbreak;\n+\t\tcase PELICAN_EVENT_ON:\n+\t\t\treturn &operational;\n+\t}\n+\n+\treturn &offline;\n+}\n+\n+#include \"periodic.incl\"\n+#include \"keyboard.incl\"\n+\n+static int process(mhsm_hsm_t *pelican, void *state)\n+{\n+\tif (kbhit()) {\n+\t\tchar c = fgetc(stdin);\n+\n+\t\tswitch (c) {\n+\t\t\tcase ' ':\n+\t\t\t\tmhsm_dispatch_event(pelican, PELICAN_EVENT_PEDS_WAITING);\n+\t\t\t\tbreak;\n+\t\t\tcase 'o':\n+\t\t\t\t\/* ON is ignored in operational, OFF is ignored in offline. *\/\n+\t\t\t\tmhsm_dispatch_event(pelican, mhsm_is_in(pelican, &operational) ? PELICAN_EVENT_OFF : PELICAN_EVENT_ON);\n+\t\t\t\tbreak;\n+\t\t\tcase 'q':\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tMDBG_PRINT1(\"unhandled key press: '%c'\\n\", c);\n+\t\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (c == 'q') return -1;\n+\t}\n+\n+\tmtmr_increment_timers(pelican, PELICAN_EVENT_TIMEOUT_OFF_FLASH, PELICAN_PERIOD);\n+\n+\treturn 0;\n+}\n+\n+int main(void)\n+{\n+\tmhsm_hsm_t pelican;\n+\tpelican_state_t pelican_state;\n+\n+\tprintf(\"press [space] to trigger PEDS_WAITING event\\n\");\n+\tprintf(\"press 'o' to trigger ON\/OFF events\\n\");\n+\tprintf(\"press 'q' to quit\\n\");\n+\n+\tmhsm_initialise(&pelican, &pelican_state, &operational);\n+\tif (mtmr_initialise_timers(&pelican, PELICAN_EVENT_TIMEOUT_OFF_FLASH) != 0) {\n+\t\tMDBG_PRINT_LN(\"failed to initialise timers\");\n+\t\texit(EXIT_FAILURE);\n+\t}\n+\tmhsm_dispatch_event(&pelican, MHSM_EVENT_INITIAL);\n+\n+\tnonblock(1);\n+\tperiodic(PELICAN_PERIOD, process, &pelican, &pelican_state);\n+\tnonblock(0);\n+\n+\tprintf(\"\\nquitting\\n\");\n+\n+\treturn 0;\n+}\n"} {"commit":"ff9462751c3565d206c29d1f72de972a7ab382dd","subject":"remove unnecessary code since our compiler is fairly modern","message":"remove unnecessary code since our compiler is fairly modern\n\nSummary: TSIA\n\nReviewed By: bwasti\n\nDifferential Revision: D4343001\n\nfbshipit-source-id: ff7496f720602e433170ab7ac52be4c18e916e43\n","repos":"pietern\/caffe2,pietern\/caffe2,xzturn\/caffe2,pietern\/caffe2,Yangqing\/caffe2,caffe2\/caffe2,davinwang\/caffe2,bwasti\/caffe2,Yangqing\/caffe2,sf-wind\/caffe2,davinwang\/caffe2,sf-wind\/caffe2,davinwang\/caffe2,xzturn\/caffe2,xzturn\/caffe2,Yangqing\/caffe2,bwasti\/caffe2,davinwang\/caffe2,bwasti\/caffe2,bwasti\/caffe2,sf-wind\/caffe2,bwasti\/caffe2,xzturn\/caffe2,pietern\/caffe2,xzturn\/caffe2,sf-wind\/caffe2,pietern\/caffe2,Yangqing\/caffe2,sf-wind\/caffe2,Yangqing\/caffe2,davinwang\/caffe2","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- caffe2\/operators\/conv_pool_op_base.h\n+++ caffe2\/operators\/conv_pool_op_base.h\n@@ -198,8 +198,6 @@\n default:\n CAFFE_THROW(\"Unknown Storage order: \", order_);\n }\n- \/\/ To suppress old compiler warnings\n- return true;\n }\n \n \/\/ The actual function that does the computation, if the different\n"} {"commit":"2024cc6d62bead2e6236405f58e33dbc3a8904d5","subject":"Fix crash when inserting a group that was already present but had no description.","message":"Fix crash when inserting a group that was already present but had no description.","repos":"BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode,BackupTheBerlios\/leafnode","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- activutil.c\n+++ activutil.c\n@@ -72,8 +72,8 @@\n \tg = findgroup(name, active, -1);\n \tif (g) {\n \t g->status = status;\n-\t if (desc && strcmp(g->desc, desc)) {\n-\t\tfree(g->desc);\n+\t if (desc && (g->desc == NULL || strcmp(g->desc, desc) != 0)) {\n+\t\tif (g->desc) free(g->desc);\n \t\tg->desc = critstrdup(desc, \"insertgroup\");\n \t }\n \t return;\n"} {"commit":"d62e9e09d1f6c049cd32d2ebe24aa9f780ba6470","subject":"ESP8266 Support","message":"ESP8266 Support","repos":"wizard97\/ArduinoRingBuffer,wizard97\/ArduinoRingBuffer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- RingBuf.h\n+++ RingBuf.h\n@@ -34,7 +34,7 @@\n #define xt_wsr_ps(state) __asm__ __volatile__(\"wsr %0,ps; isync\" :: \"a\" (state) : \"memory\")\n #endif\n \n- #define RB_ATOMIC_START do { uint32_t _savedIS = xt_rsil(1) ;\n+ #define RB_ATOMIC_START do { uint32_t _savedIS = xt_rsil(15) ;\n #define RB_ATOMIC_END xt_wsr_ps(_savedIS) ;} while(0);\n #else\n #error \u201cThis library only supports AVR and ESP8266 Boards.\u201d\n"} {"commit":"55d6070b29b616fe6f5cc07de3b87f7cdec8041e","subject":"3K: do not use PyOS_ascii_strtod -- it segfaults and is deprecated","message":"3K: do not use PyOS_ascii_strtod -- it segfaults and is deprecated\n","repos":"abalkin\/numpy,ewmoore\/numpy,pyparallel\/numpy,leifdenby\/numpy,rajathkumarmp\/numpy,has2k1\/numpy,BabeNovelty\/numpy,SiccarPoint\/numpy,KaelChen\/numpy,yiakwy\/numpy,dwf\/numpy,joferkington\/numpy,pizzathief\/numpy,dwillmer\/numpy,ChanderG\/numpy,pizzathief\/numpy,dato-code\/numpy,SiccarPoint\/numpy,bmorris3\/numpy,Srisai85\/numpy,charris\/numpy,Linkid\/numpy,pbrod\/numpy,seberg\/numpy,nbeaver\/numpy,mathdd\/numpy,ogrisel\/numpy,jschueller\/numpy,trankmichael\/numpy,gfyoung\/numpy,jankoslavic\/numpy,ContinuumIO\/numpy,andsor\/numpy,mwiebe\/numpy,ViralLeadership\/numpy,skwbc\/numpy,nguyentu1602\/numpy,kirillzhuravlev\/numpy,endolith\/numpy,sigma-random\/numpy,anntzer\/numpy,BabeNovelty\/numpy,MichaelAquilina\/numpy,matthew-brett\/numpy,numpy\/numpy-refactor,bertrand-l\/numpy,BMJHayward\/numpy,ogrisel\/numpy,Linkid\/numpy,mindw\/numpy,embray\/numpy,cjermain\/numpy,sigma-random\/numpy,CMartelLML\/numpy,Srisai85\/numpy,rhythmsosad\/numpy,pdebuyl\/numpy,cowlicks\/numpy,shoyer\/numpy,Dapid\/numpy,grlee77\/numpy,immerrr\/numpy,cjermain\/numpy,pelson\/numpy,numpy\/numpy,ahaldane\/numpy,gfyoung\/numpy,ahaldane\/numpy,mingwpy\/numpy,embray\/numpy,pyparallel\/numpy,ahaldane\/numpy,chatcannon\/numpy,rherault-insa\/numpy,skymanaditya1\/numpy,dch312\/numpy,b-carter\/numpy,ChanderG\/numpy,dwillmer\/numpy,groutr\/numpy,rmcgibbo\/numpy,rmcgibbo\/numpy,MaPePeR\/numpy,dwf\/numpy,ddasilva\/numpy,SunghanKim\/numpy,drasmuss\/numpy,rudimeier\/numpy,cowlicks\/numpy,KaelChen\/numpy,SiccarPoint\/numpy,WillieMaddox\/numpy,immerrr\/numpy,has2k1\/numpy,cjermain\/numpy,ddasilva\/numpy,GrimDerp\/numpy,WarrenWeckesser\/numpy,Linkid\/numpy,gmcastil\/numpy,behzadnouri\/numpy,musically-ut\/numpy,nguyentu1602\/numpy,stefanv\/numpy,rudimeier\/numpy,naritta\/numpy,hainm\/numpy,CMartelLML\/numpy,pdebuyl\/numpy,andsor\/numpy,stuarteberg\/numpy,pelson\/numpy,utke1\/numpy,Anwesh43\/numpy,matthew-brett\/numpy,simongibbons\/numpy,charris\/numpy,joferkington\/numpy,musically-ut\/numpy,dwf\/numpy,grlee77\/numpy,mhvk\/numpy,shoyer\/numpy,BMJHayward\/numpy,numpy\/numpy,chatcannon\/numpy,jonathanunderwood\/numpy,ChristopherHogan\/numpy,mattip\/numpy,yiakwy\/numpy,ahaldane\/numpy,pelson\/numpy,Yusa95\/numpy,dimasad\/numpy,endolith\/numpy,abalkin\/numpy,BabeNovelty\/numpy,Yusa95\/numpy,GrimDerp\/numpy,MaPePeR\/numpy,ssanderson\/numpy,mortada\/numpy,ewmoore\/numpy,pizzathief\/numpy,yiakwy\/numpy,solarjoe\/numpy,bertrand-l\/numpy,rherault-insa\/numpy,felipebetancur\/numpy,mortada\/numpy,rudimeier\/numpy,numpy\/numpy-refactor,ChristopherHogan\/numpy,astrofrog\/numpy,groutr\/numpy,rajathkumarmp\/numpy,ekalosak\/numpy,githubmlai\/numpy,ChristopherHogan\/numpy,ogrisel\/numpy,chiffa\/numpy,WarrenWeckesser\/numpy,Eric89GXL\/numpy,stefanv\/numpy,trankmichael\/numpy,anntzer\/numpy,moreati\/numpy,pbrod\/numpy,Anwesh43\/numpy,AustereCuriosity\/numpy,jonathanunderwood\/numpy,stuarteberg\/numpy,stuarteberg\/numpy,jankoslavic\/numpy,Yusa95\/numpy,argriffing\/numpy,CMartelLML\/numpy,pdebuyl\/numpy,GaZ3ll3\/numpy,ViralLeadership\/numpy,numpy\/numpy,numpy\/numpy-refactor,githubmlai\/numpy,Eric89GXL\/numpy,dch312\/numpy,ESSS\/numpy,ChristopherHogan\/numpy,jorisvandenbossche\/numpy,BabeNovelty\/numpy,KaelChen\/numpy,bringingheavendown\/numpy,grlee77\/numpy,jschueller\/numpy,ContinuumIO\/numpy,MSeifert04\/numpy,jorisvandenbossche\/numpy,tacaswell\/numpy,mathdd\/numpy,stuarteberg\/numpy,NextThought\/pypy-numpy,sinhrks\/numpy,felipebetancur\/numpy,WarrenWeckesser\/numpy,tynn\/numpy,njase\/numpy,GrimDerp\/numpy,stefanv\/numpy,hainm\/numpy,pelson\/numpy,numpy\/numpy-refactor,simongibbons\/numpy,solarjoe\/numpy,githubmlai\/numpy,jankoslavic\/numpy,MichaelAquilina\/numpy,tacaswell\/numpy,madphysicist\/numpy,pelson\/numpy,drasmuss\/numpy,pizzathief\/numpy,immerrr\/numpy,naritta\/numpy,pbrod\/numpy,mattip\/numpy,mortada\/numpy,pyparallel\/numpy,joferkington\/numpy,trankmichael\/numpy,ViralLeadership\/numpy,andsor\/numpy,dwf\/numpy,NextThought\/pypy-numpy,brandon-rhodes\/numpy,empeeu\/numpy,b-carter\/numpy,jakirkham\/numpy,tacaswell\/numpy,mathdd\/numpy,hainm\/numpy,AustereCuriosity\/numpy,bmorris3\/numpy,Yusa95\/numpy,mhvk\/numpy,mattip\/numpy,githubmlai\/numpy,cjermain\/numpy,jschueller\/numpy,sonnyhu\/numpy,maniteja123\/numpy,larsmans\/numpy,anntzer\/numpy,nguyentu1602\/numpy,rhythmsosad\/numpy,ChanderG\/numpy,sonnyhu\/numpy,jakirkham\/numpy,larsmans\/numpy,mingwpy\/numpy,tdsmith\/numpy,yiakwy\/numpy,SiccarPoint\/numpy,pbrod\/numpy,dato-code\/numpy,rudimeier\/numpy,rgommers\/numpy,bertrand-l\/numpy,WillieMaddox\/numpy,rmcgibbo\/numpy,mingwpy\/numpy,dch312\/numpy,ekalosak\/numpy,empeeu\/numpy,kirillzhuravlev\/numpy,embray\/numpy,MichaelAquilina\/numpy,kiwifb\/numpy,groutr\/numpy,seberg\/numpy,shoyer\/numpy,simongibbons\/numpy,moreati\/numpy,ogrisel\/numpy,Linkid\/numpy,CMartelLML\/numpy,Dapid\/numpy,AustereCuriosity\/numpy,naritta\/numpy,madphysicist\/numpy,empeeu\/numpy,naritta\/numpy,ESSS\/numpy,madphysicist\/numpy,ajdawson\/numpy,astrofrog\/numpy,GaZ3ll3\/numpy,sigma-random\/numpy,mindw\/numpy,simongibbons\/numpy,solarjoe\/numpy,sigma-random\/numpy,brandon-rhodes\/numpy,felipebetancur\/numpy,rgommers\/numpy,WarrenWeckesser\/numpy,seberg\/numpy,matthew-brett\/numpy,astrofrog\/numpy,ddasilva\/numpy,NextThought\/pypy-numpy,WillieMaddox\/numpy,ahaldane\/numpy,ogrisel\/numpy,mhvk\/numpy,skymanaditya1\/numpy,jankoslavic\/numpy,MichaelAquilina\/numpy,cowlicks\/numpy,chiffa\/numpy,sinhrks\/numpy,immerrr\/numpy,ewmoore\/numpy,utke1\/numpy,pizzathief\/numpy,dch312\/numpy,chiffa\/numpy,skymanaditya1\/numpy,rgommers\/numpy,ESSS\/numpy,endolith\/numpy,ekalosak\/numpy,rgommers\/numpy,ekalosak\/numpy,MSeifert04\/numpy,MSeifert04\/numpy,tdsmith\/numpy,chatcannon\/numpy,argriffing\/numpy,shoyer\/numpy,kiwifb\/numpy,sinhrks\/numpy,SunghanKim\/numpy,njase\/numpy,jakirkham\/numpy,cowlicks\/numpy,dato-code\/numpy,rajathkumarmp\/numpy,mwiebe\/numpy,Srisai85\/numpy,maniteja123\/numpy,Eric89GXL\/numpy,anntzer\/numpy,ewmoore\/numpy,ContinuumIO\/numpy,drasmuss\/numpy,has2k1\/numpy,simongibbons\/numpy,pbrod\/numpy,mhvk\/numpy,kirillzhuravlev\/numpy,SunghanKim\/numpy,MaPePeR\/numpy,bmorris3\/numpy,hainm\/numpy,musically-ut\/numpy,sinhrks\/numpy,joferkington\/numpy,Anwesh43\/numpy,shoyer\/numpy,astrofrog\/numpy,endolith\/numpy,tdsmith\/numpy,dwillmer\/numpy,madphysicist\/numpy,trankmichael\/numpy,brandon-rhodes\/numpy,has2k1\/numpy,Eric89GXL\/numpy,rmcgibbo\/numpy,madphysicist\/numpy,utke1\/numpy,NextThought\/pypy-numpy,GrimDerp\/numpy,mattip\/numpy,charris\/numpy,skwbc\/numpy,empeeu\/numpy,leifdenby\/numpy,dwillmer\/numpy,numpy\/numpy-refactor,abalkin\/numpy,nbeaver\/numpy,njase\/numpy,jorisvandenbossche\/numpy,dimasad\/numpy,seberg\/numpy,kirillzhuravlev\/numpy,behzadnouri\/numpy,mingwpy\/numpy,nbeaver\/numpy,Srisai85\/numpy,gfyoung\/numpy,ssanderson\/numpy,behzadnouri\/numpy,nguyentu1602\/numpy,stefanv\/numpy,ewmoore\/numpy,WarrenWeckesser\/numpy,bmorris3\/numpy,ssanderson\/numpy,Dapid\/numpy,MSeifert04\/numpy,mathdd\/numpy,bringingheavendown\/numpy,maniteja123\/numpy,jorisvandenbossche\/numpy,grlee77\/numpy,numpy\/numpy,MaPePeR\/numpy,jschueller\/numpy,charris\/numpy,stefanv\/numpy,MSeifert04\/numpy,andsor\/numpy,Anwesh43\/numpy,sonnyhu\/numpy,b-carter\/numpy,grlee77\/numpy,GaZ3ll3\/numpy,astrofrog\/numpy,dimasad\/numpy,jakirkham\/numpy,gmcastil\/numpy,mindw\/numpy,SunghanKim\/numpy,matthew-brett\/numpy,brandon-rhodes\/numpy,dato-code\/numpy,larsmans\/numpy,pdebuyl\/numpy,ajdawson\/numpy,ChanderG\/numpy,embray\/numpy,larsmans\/numpy,KaelChen\/numpy,moreati\/numpy,skymanaditya1\/numpy,tdsmith\/numpy,BMJHayward\/numpy,skwbc\/numpy,ajdawson\/numpy,mortada\/numpy,gmcastil\/numpy,rherault-insa\/numpy,mhvk\/numpy,GaZ3ll3\/numpy,rajathkumarmp\/numpy,sonnyhu\/numpy,mindw\/numpy,argriffing\/numpy,ajdawson\/numpy,leifdenby\/numpy,dimasad\/numpy,jakirkham\/numpy,mwiebe\/numpy,matthew-brett\/numpy,jonathanunderwood\/numpy,felipebetancur\/numpy,rhythmsosad\/numpy,dwf\/numpy,embray\/numpy,BMJHayward\/numpy,jorisvandenbossche\/numpy,rhythmsosad\/numpy,tynn\/numpy,tynn\/numpy,bringingheavendown\/numpy,kiwifb\/numpy,musically-ut\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/multiarray\/numpyos.c\n+++ numpy\/core\/src\/multiarray\/numpyos.c\n@@ -506,7 +506,11 @@\n }\n memcpy(buffer, s, n);\n buffer[n] = '\\0';\n+#if defined(NPY_PY3K)\n+ result = PyOS_string_to_double(buffer, &q, NULL);\n+#else\n result = PyOS_ascii_strtod(buffer, &q);\n+#endif\n if (endptr != NULL) {\n *endptr = (char*)(s + (q - buffer));\n }\n@@ -515,7 +519,11 @@\n }\n \/* End of ##2 *\/\n \n+#if defined(NPY_PY3K)\n+ return PyOS_string_to_double(s, endptr, NULL);\n+#else\n return PyOS_ascii_strtod(s, endptr);\n+#endif\n }\n \n \n"} {"commit":"4a79dcb8f282de2cf25d185ed958a557454d49fe","subject":"Fixed missing clear fp error call.","message":"Fixed missing clear fp error call.\n","repos":"numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -824,8 +824,8 @@\n if (res < 0) {\n return -1;\n }\n- }\n- PyUFunc_clearfperr(); *\/\n+ } *\/\n+ PyUFunc_clearfperr(); \n \n self = PyUFunc_UFUNC(pySelf);\n \n"} {"commit":"0444ef17797ab9e968a29448cdbbe161aa41cc86","subject":"Changed documentation so that subsections are on their own pages as well","message":"Changed documentation so that subsections are on their own pages as well\n","repos":"gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten,gservera\/baseten","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Sources\/BaseTen.h\n+++ Sources\/BaseTen.h\n@@ -145,7 +145,12 @@\n * Since BaseTen relies on database introspection, SQL may be used to define the database schema.\n * Another option is to create a data model using Xcode's data modeler and import it using BaseTen Assistant.\n *\n- * \\subsection sql_views SQL views\n+ * \\see \\subpage sql_views\n+ * \\see \\subpage baseten_enabling\n+ *\/\n+\n+\/**\n+ * \\page sql_views SQL views\n *\n * Contents of SQL views may be manipulated using database objects provided that some conditions are met.\n * Unlike tables, views don't have primary keys but BaseTen still needs to be able to reference individual \n@@ -161,9 +166,10 @@\n *\n * PostgreSQL allows INSERT and UPDATE queries to target views if rules have been created to handle them.\n * In this case, the view contents may be modified also with BaseTen.\n- *\n- *\n- * \\subsection baseten_enabling More detail on enabling relations\n+ *\/\n+\n+\/**\n+ * \\page baseten_enabling More detail on enabling relations\n *\n * Some tables are created in BaseTen schema to track changes in other relations. The tables and relations\n * correspond to each other based on their names. The BaseTen tables store values for the actual relations' \n@@ -191,12 +197,12 @@\n *\n * Typically accessing a database consists roughly of the following steps:\n * <ul>\n- * <li>Creating an instance of BXDatabaseContext<\/li>\n- * <li>Connecting to a database<\/li>\n- * <li>Getting an entity description from the context<\/li>\n- * <li>Possibly creating an NSPredicate for reducing the number of fetched objects<\/li>\n- * <li>Performing a fetch using the entity and the predicate<\/li>\n- * <li>Handling the results<\/li>\n+ * <li>\\subpage creating_a_database_context \"Creating an instance of BXDatabaseContext\"<\/li>\n+ * <li>\\subpage connecting_to_a_database \"Connecting to a database\"<\/li>\n+ * <li>\\subpage getting_an_entity_and_a_predicate \"Getting an entity description from the context\"<\/li>\n+ * <li>\\subpage getting_an_entity_and_a_predicate \"Possibly creating an NSPredicate for reducing the number of fetched objects\"<\/li>\n+ * <li>\\subpage performing_a_fetch \"Performing a fetch using the entity and the predicate\"<\/li>\n+ * <li>\\subpage handling_the_results \"Handling the results\"<\/li>\n * <\/ul>\n * Here is a small walkthrough with sample code.\n *\n@@ -247,9 +253,10 @@\n * return 0;\n * }<\/pre>\n * \\endhtmlonly\n- *\n- *\n- * \\subsection creating_a_database_context Creating a database context\n+ *\/\n+ \n+\/**\n+ * \\page creating_a_database_context Creating a database context\n *\n * The designated initializer of BXDatabaseContext is <tt>-initWithDatabaseURI:<\/tt>. <tt>-init<\/tt> is also\n * available but the context does require an URI before connecting.\n@@ -262,9 +269,10 @@\n * Various methods in BXDatabaseContext take a double pointer to an NSError object as a parameter. if the \n * called method fails, the NSError will be set on return. If the parameter is NULL, the default error\n * handler raises a BXException. BXDatabaseContext's delegate may change this behaviour.\n- *\n- *\n- * \\subsection connecting_to_a_database Connecting to a database\n+ *\/\n+\n+\/**\n+ * \\page connecting_to_a_database Connecting to a database\n *\n * \\latexonly \n * \\begin{lstlisting}[fontadjust, columns=fullflexible, float=h, frame=single, title=Connecting to a database]\n@@ -291,9 +299,10 @@\n *\n * Since \\em NULL is passed in place of an NSError double pointer, a BXException will be thrown on error.\n * See BXDatabaseContext's documentation for details on error handling.\n- *\n- * \n- * \\subsection getting_an_entity_and_a_predicate Getting a BXEntityDescription and an NSPredicate\n+ *\/\n+\n+\/** \n+ * \\page getting_an_entity_and_a_predicate Getting a BXEntityDescription and an NSPredicate\n *\n * \\latexonly\n * \\begin{lstlisting}[fontadjust, columns=fullflexible, float=h, frame=single, title=Getting a BXEntityDescription]\n@@ -312,9 +321,10 @@\n * NSPredicates are created by various Cocoa objects and may be passed directly to BXDatabaseContext.\n * One way to create ad-hoc predicates is by using <tt>-[NSPredicate predicateWithFormat]<\/tt>.\n * In this example, we fetch all the objects instead of filtering them, though.\n- *\n- *\n- * \\subsection performing_a_fetch Performing a fetch using the entity and the predicate\n+ *\/\n+\n+\/**\n+ * \\page performing_a_fetch Performing a fetch using the entity and the predicate\n *\n * \\latexonly\n * \\begin{lstlisting}[fontadjust, columns=fullflexible, float=h, frame=single, title=Performing a fetch]\n@@ -328,9 +338,10 @@\n * BXDatabaseContext's method <tt>-executeFetchForEntity:withPredicate:error:<\/tt> and its variations may \n * be used to fetch objects from the database. The method takes a BXEntityDescription and an NSPredicate and\n * performs a fetch synchronously. The fetched objects are returned in an NSArray.\n- *\n- *\n- * \\subsection handling_the_results Handling the results\n+ *\/\n+\n+\/**\n+ * \\page handling_the_results Handling the results\n *\n * \\latexonly\n * \\begin{lstlisting}[fontadjust, columns=fullflexible, float=h, frame=single, title=Handling fetch results]\n@@ -588,7 +599,7 @@\n * \\page building_baseten Building BaseTen\n *\n * BaseTen has several subprojects, namely BaseTenAppKit and a plug-in for Interface Builder 3. The default target in \n- * BaseTen.xcodeproj, BaseTen + GC, builds them as well; the plug-in and the AppKit framework will appear in the \n+ * BaseTen.xcodeproj, <em>BaseTen + GC<\/em>, builds them as well; the plug-in and the AppKit framework will appear in the \n * subprojects' build folders, which are set to the default folder. The built files will probably be either in \n * \\em build folders in the subprojects' folders or in the user-specified build folder. The documentation will be\n * in the \\em Documentation folder.\n@@ -596,7 +607,8 @@\n *\n * \\subsection Building for the release DMG\n *\n- * The files needed to build the release disk image are in the SVN repository as well. To create the DMG, follow these steps:\n+ * The files needed to build the release disk image are in the SVN repository as well. Doxygen and LateX are needed during \n+ * the process. To create the DMG, follow these steps:\n * <ol>\n * <li>From the checked-out directory, <tt>cd ReleaseDMG<\/tt>.<\/li>\n * <li>The default location for the built files is <em>~\/Build\/BaseTen-dmg-build<\/em>. To set a custom path, edit the \\em SYMROOT variable in <em>create_release_dmg.sh<\/em>.<\/li>\n"} {"commit":"deb290356248b39176518b2b22af743e11e91496","subject":"STY: Add comment about errobj reference ownership","message":"STY: Add comment about errobj reference ownership\n","repos":"sonnyhu\/numpy,rhythmsosad\/numpy,embray\/numpy,mwiebe\/numpy,dwf\/numpy,immerrr\/numpy,has2k1\/numpy,tacaswell\/numpy,skymanaditya1\/numpy,yiakwy\/numpy,pyparallel\/numpy,GrimDerp\/numpy,sigma-random\/numpy,has2k1\/numpy,cowlicks\/numpy,Yusa95\/numpy,seberg\/numpy,gmcastil\/numpy,empeeu\/numpy,CMartelLML\/numpy,ESSS\/numpy,bringingheavendown\/numpy,rmcgibbo\/numpy,mingwpy\/numpy,felipebetancur\/numpy,joferkington\/numpy,jorisvandenbossche\/numpy,SiccarPoint\/numpy,nguyentu1602\/numpy,njase\/numpy,sinhrks\/numpy,jorisvandenbossche\/numpy,endolith\/numpy,felipebetancur\/numpy,jankoslavic\/numpy,argriffing\/numpy,ahaldane\/numpy,mingwpy\/numpy,embray\/numpy,Srisai85\/numpy,NextThought\/pypy-numpy,dch312\/numpy,nbeaver\/numpy,mwiebe\/numpy,ssanderson\/numpy,madphysicist\/numpy,KaelChen\/numpy,ChristopherHogan\/numpy,rudimeier\/numpy,ogrisel\/numpy,dch312\/numpy,jorisvandenbossche\/numpy,Eric89GXL\/numpy,tacaswell\/numpy,grlee77\/numpy,MichaelAquilina\/numpy,rudimeier\/numpy,SiccarPoint\/numpy,hainm\/numpy,kirillzhuravlev\/numpy,MaPePeR\/numpy,ChanderG\/numpy,ChristopherHogan\/numpy,shoyer\/numpy,SunghanKim\/numpy,leifdenby\/numpy,AustereCuriosity\/numpy,kiwifb\/numpy,maniteja123\/numpy,njase\/numpy,KaelChen\/numpy,rhythmsosad\/numpy,naritta\/numpy,leifdenby\/numpy,pelson\/numpy,BabeNovelty\/numpy,groutr\/numpy,anntzer\/numpy,joferkington\/numpy,b-carter\/numpy,BMJHayward\/numpy,jonathanunderwood\/numpy,jankoslavic\/numpy,pbrod\/numpy,ahaldane\/numpy,rajathkumarmp\/numpy,Linkid\/numpy,bmorris3\/numpy,kiwifb\/numpy,jschueller\/numpy,mortada\/numpy,Anwesh43\/numpy,githubmlai\/numpy,Yusa95\/numpy,tynn\/numpy,shoyer\/numpy,embray\/numpy,skymanaditya1\/numpy,matthew-brett\/numpy,mortada\/numpy,ogrisel\/numpy,rgommers\/numpy,AustereCuriosity\/numpy,Srisai85\/numpy,yiakwy\/numpy,endolith\/numpy,githubmlai\/numpy,trankmichael\/numpy,argriffing\/numpy,skymanaditya1\/numpy,ChanderG\/numpy,endolith\/numpy,gfyoung\/numpy,tynn\/numpy,chatcannon\/numpy,pbrod\/numpy,NextThought\/pypy-numpy,madphysicist\/numpy,pelson\/numpy,mattip\/numpy,MSeifert04\/numpy,simongibbons\/numpy,mingwpy\/numpy,astrofrog\/numpy,endolith\/numpy,SunghanKim\/numpy,nbeaver\/numpy,astrofrog\/numpy,cowlicks\/numpy,simongibbons\/numpy,matthew-brett\/numpy,abalkin\/numpy,shoyer\/numpy,BMJHayward\/numpy,Dapid\/numpy,ekalosak\/numpy,skymanaditya1\/numpy,WillieMaddox\/numpy,grlee77\/numpy,jankoslavic\/numpy,ChristopherHogan\/numpy,Dapid\/numpy,dwf\/numpy,stuarteberg\/numpy,skwbc\/numpy,madphysicist\/numpy,matthew-brett\/numpy,dwillmer\/numpy,joferkington\/numpy,GrimDerp\/numpy,dimasad\/numpy,musically-ut\/numpy,rmcgibbo\/numpy,mathdd\/numpy,empeeu\/numpy,ogrisel\/numpy,mindw\/numpy,larsmans\/numpy,bmorris3\/numpy,b-carter\/numpy,jorisvandenbossche\/numpy,seberg\/numpy,cjermain\/numpy,madphysicist\/numpy,mhvk\/numpy,immerrr\/numpy,dimasad\/numpy,rgommers\/numpy,githubmlai\/numpy,sigma-random\/numpy,tacaswell\/numpy,ContinuumIO\/numpy,dwf\/numpy,charris\/numpy,pelson\/numpy,ekalosak\/numpy,WarrenWeckesser\/numpy,embray\/numpy,jakirkham\/numpy,maniteja123\/numpy,charris\/numpy,pizzathief\/numpy,Srisai85\/numpy,trankmichael\/numpy,stuarteberg\/numpy,bringingheavendown\/numpy,tdsmith\/numpy,drasmuss\/numpy,simongibbons\/numpy,KaelChen\/numpy,sonnyhu\/numpy,mindw\/numpy,skwbc\/numpy,larsmans\/numpy,dch312\/numpy,rherault-insa\/numpy,CMartelLML\/numpy,chiffa\/numpy,felipebetancur\/numpy,moreati\/numpy,ewmoore\/numpy,Linkid\/numpy,BMJHayward\/numpy,pbrod\/numpy,kirillzhuravlev\/numpy,ViralLeadership\/numpy,musically-ut\/numpy,rgommers\/numpy,MichaelAquilina\/numpy,grlee77\/numpy,b-carter\/numpy,Eric89GXL\/numpy,ContinuumIO\/numpy,dwf\/numpy,joferkington\/numpy,musically-ut\/numpy,brandon-rhodes\/numpy,dwillmer\/numpy,rhythmsosad\/numpy,simongibbons\/numpy,mathdd\/numpy,rmcgibbo\/numpy,jakirkham\/numpy,sinhrks\/numpy,cjermain\/numpy,seberg\/numpy,andsor\/numpy,pdebuyl\/numpy,sinhrks\/numpy,MSeifert04\/numpy,yiakwy\/numpy,gmcastil\/numpy,ajdawson\/numpy,andsor\/numpy,utke1\/numpy,cjermain\/numpy,WarrenWeckesser\/numpy,ChanderG\/numpy,mingwpy\/numpy,ajdawson\/numpy,Yusa95\/numpy,yiakwy\/numpy,hainm\/numpy,stuarteberg\/numpy,chiffa\/numpy,GaZ3ll3\/numpy,dch312\/numpy,pizzathief\/numpy,drasmuss\/numpy,madphysicist\/numpy,stefanv\/numpy,MichaelAquilina\/numpy,empeeu\/numpy,SiccarPoint\/numpy,ahaldane\/numpy,musically-ut\/numpy,rmcgibbo\/numpy,mattip\/numpy,pbrod\/numpy,SunghanKim\/numpy,ahaldane\/numpy,Anwesh43\/numpy,kirillzhuravlev\/numpy,astrofrog\/numpy,solarjoe\/numpy,jonathanunderwood\/numpy,mhvk\/numpy,nbeaver\/numpy,immerrr\/numpy,rherault-insa\/numpy,jakirkham\/numpy,larsmans\/numpy,MSeifert04\/numpy,pyparallel\/numpy,mattip\/numpy,bringingheavendown\/numpy,githubmlai\/numpy,grlee77\/numpy,CMartelLML\/numpy,ddasilva\/numpy,mathdd\/numpy,SiccarPoint\/numpy,rhythmsosad\/numpy,jschueller\/numpy,ahaldane\/numpy,tdsmith\/numpy,behzadnouri\/numpy,brandon-rhodes\/numpy,ChanderG\/numpy,WillieMaddox\/numpy,cjermain\/numpy,solarjoe\/numpy,gfyoung\/numpy,ewmoore\/numpy,dato-code\/numpy,empeeu\/numpy,kiwifb\/numpy,Srisai85\/numpy,tynn\/numpy,gmcastil\/numpy,Linkid\/numpy,drasmuss\/numpy,pizzathief\/numpy,dato-code\/numpy,embray\/numpy,jschueller\/numpy,stefanv\/numpy,immerrr\/numpy,stuarteberg\/numpy,dimasad\/numpy,NextThought\/pypy-numpy,tdsmith\/numpy,SunghanKim\/numpy,chiffa\/numpy,larsmans\/numpy,ViralLeadership\/numpy,ewmoore\/numpy,utke1\/numpy,ddasilva\/numpy,jakirkham\/numpy,rgommers\/numpy,rudimeier\/numpy,ChristopherHogan\/numpy,cowlicks\/numpy,stefanv\/numpy,nguyentu1602\/numpy,dwillmer\/numpy,dimasad\/numpy,mindw\/numpy,CMartelLML\/numpy,MaPePeR\/numpy,naritta\/numpy,hainm\/numpy,andsor\/numpy,matthew-brett\/numpy,charris\/numpy,ajdawson\/numpy,ContinuumIO\/numpy,rherault-insa\/numpy,has2k1\/numpy,mhvk\/numpy,mortada\/numpy,Anwesh43\/numpy,WarrenWeckesser\/numpy,mattip\/numpy,skwbc\/numpy,moreati\/numpy,Dapid\/numpy,abalkin\/numpy,GaZ3ll3\/numpy,andsor\/numpy,mwiebe\/numpy,jankoslavic\/numpy,pbrod\/numpy,dwillmer\/numpy,BabeNovelty\/numpy,nguyentu1602\/numpy,BMJHayward\/numpy,shoyer\/numpy,dato-code\/numpy,Anwesh43\/numpy,argriffing\/numpy,bertrand-l\/numpy,rajathkumarmp\/numpy,solarjoe\/numpy,WillieMaddox\/numpy,MichaelAquilina\/numpy,ewmoore\/numpy,behzadnouri\/numpy,stefanv\/numpy,ewmoore\/numpy,GrimDerp\/numpy,numpy\/numpy,naritta\/numpy,naritta\/numpy,GaZ3ll3\/numpy,chatcannon\/numpy,pdebuyl\/numpy,pelson\/numpy,Eric89GXL\/numpy,BabeNovelty\/numpy,GaZ3ll3\/numpy,numpy\/numpy,pyparallel\/numpy,MaPePeR\/numpy,moreati\/numpy,AustereCuriosity\/numpy,ekalosak\/numpy,hainm\/numpy,rajathkumarmp\/numpy,njase\/numpy,pdebuyl\/numpy,tdsmith\/numpy,Eric89GXL\/numpy,WarrenWeckesser\/numpy,anntzer\/numpy,ssanderson\/numpy,cowlicks\/numpy,groutr\/numpy,matthew-brett\/numpy,bmorris3\/numpy,groutr\/numpy,ESSS\/numpy,rajathkumarmp\/numpy,brandon-rhodes\/numpy,sinhrks\/numpy,jschueller\/numpy,utke1\/numpy,ajdawson\/numpy,MaPePeR\/numpy,grlee77\/numpy,gfyoung\/numpy,anntzer\/numpy,trankmichael\/numpy,ESSS\/numpy,abalkin\/numpy,jakirkham\/numpy,numpy\/numpy,seberg\/numpy,brandon-rhodes\/numpy,trankmichael\/numpy,sigma-random\/numpy,felipebetancur\/numpy,ddasilva\/numpy,jonathanunderwood\/numpy,pizzathief\/numpy,charris\/numpy,ViralLeadership\/numpy,mortada\/numpy,Linkid\/numpy,ssanderson\/numpy,maniteja123\/numpy,ogrisel\/numpy,numpy\/numpy,ogrisel\/numpy,behzadnouri\/numpy,has2k1\/numpy,chatcannon\/numpy,ekalosak\/numpy,MSeifert04\/numpy,anntzer\/numpy,astrofrog\/numpy,pelson\/numpy,KaelChen\/numpy,dato-code\/numpy,shoyer\/numpy,mindw\/numpy,MSeifert04\/numpy,mhvk\/numpy,mhvk\/numpy,BabeNovelty\/numpy,simongibbons\/numpy,bmorris3\/numpy,stefanv\/numpy,astrofrog\/numpy,leifdenby\/numpy,bertrand-l\/numpy,GrimDerp\/numpy,jorisvandenbossche\/numpy,sonnyhu\/numpy,sonnyhu\/numpy,nguyentu1602\/numpy,dwf\/numpy,WarrenWeckesser\/numpy,Yusa95\/numpy,pizzathief\/numpy,rudimeier\/numpy,mathdd\/numpy,kirillzhuravlev\/numpy,sigma-random\/numpy,bertrand-l\/numpy,NextThought\/pypy-numpy,pdebuyl\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -442,7 +442,11 @@\n \n \n \n-\/*UFUNC_API*\/\n+\/*UFUNC_API\n+ *\n+ * On return, if errobj is populated with a non-NULL value, the caller\n+ * owns a new reference to errobj.\n+ *\/\n NPY_NO_EXPORT int\n PyUFunc_GetPyValues(char *name, int *bufsize, int *errmask, PyObject **errobj)\n {\n"} {"commit":"e2740334e8f205faee2e307db44bcc2c65ca586e","subject":"Goto done when an error condition is reached","message":"Goto done when an error condition is reached","repos":"numpy\/numpy,mhvk\/numpy,anntzer\/numpy,rgommers\/numpy,pbrod\/numpy,endolith\/numpy,pbrod\/numpy,mhvk\/numpy,jakirkham\/numpy,mattip\/numpy,mattip\/numpy,pbrod\/numpy,jakirkham\/numpy,pdebuyl\/numpy,numpy\/numpy,charris\/numpy,mhvk\/numpy,pbrod\/numpy,endolith\/numpy,jakirkham\/numpy,rgommers\/numpy,pbrod\/numpy,mattip\/numpy,seberg\/numpy,charris\/numpy,simongibbons\/numpy,mattip\/numpy,simongibbons\/numpy,rgommers\/numpy,endolith\/numpy,seberg\/numpy,simongibbons\/numpy,numpy\/numpy,rgommers\/numpy,anntzer\/numpy,simongibbons\/numpy,charris\/numpy,simongibbons\/numpy,pdebuyl\/numpy,numpy\/numpy,mhvk\/numpy,endolith\/numpy,seberg\/numpy,anntzer\/numpy,pdebuyl\/numpy,seberg\/numpy,anntzer\/numpy,pdebuyl\/numpy,jakirkham\/numpy,mhvk\/numpy,jakirkham\/numpy,charris\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -5222,6 +5222,7 @@\n if (current->arg_dtypes == NULL) {\n PyErr_NoMemory();\n result = -1;\n+ goto done;\n }\n else if (arg_dtypes != NULL) {\n for (i = 0; i < ufunc->nargs; i++) {\n"} {"commit":"1090a5b5d7f41de535708062dea6c8058fc76328","subject":"Remove compiler warning and clean up (refs #258)","message":"Remove compiler warning and clean up (refs #258)\n\n","repos":"vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/access\/http.c\n+++ modules\/access\/http.c\n@@ -598,37 +598,31 @@\n {\n access_sys_t *p_sys = p_access->p_sys;\n \n- uint8_t buffer[1];\n- char *psz_meta;\n+ uint8_t buffer;\n+ char *p, *psz_meta;\n int i_read;\n- char *p;\n \n \/* Read meta data length *\/\n- i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, buffer, 1,\n+ i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs, &buffer, 1,\n VLC_TRUE );\n- if( i_read <= 0 )\n+ if( ( i_read <= 0 ) || ( buffer == 0 ) )\n return VLC_EGENERIC;\n \n-\n- if( buffer[0] <= 0 )\n- return VLC_SUCCESS;\n-\n- msg_Dbg( p_access, \"ICY meta size=%d\", buffer[0] * 16);\n-\n- psz_meta = malloc( buffer[0] * 16 + 1 );\n- i_read = net_Read( p_access, p_sys->fd, p_sys->p_vs,\n- psz_meta, buffer[0] * 16, VLC_TRUE );\n-\n- if( i_read != buffer[0] * 16 )\n+ i_read = buffer << 4;\n+ msg_Dbg( p_access, \"ICY meta size=%u\", i_read);\n+\n+ psz_meta = malloc( i_read + 1 );\n+ if( net_Read( p_access, p_sys->fd, p_sys->p_vs,\n+ (uint8_t *)psz_meta, i_read, VLC_TRUE ) != i_read )\n return VLC_EGENERIC;\n \n- psz_meta[buffer[0]*16] = '\\0'; \/* Just in case *\/\n+ psz_meta[i_read] = '\\0'; \/* Just in case *\/\n \n msg_Dbg( p_access, \"icy-meta=%s\", psz_meta );\n \n \/* Now parse the meta *\/\n \/* Look for StreamTitle= *\/\n- p = strcasestr( psz_meta, \"StreamTitle=\" );\n+ p = strcasestr( (char *)psz_meta, \"StreamTitle=\" );\n if( p )\n {\n p += strlen( \"StreamTitle=\" );\n"} {"commit":"17ed8b545d5e1e60367bc7a3616e7551043e4a8c","subject":"Patch by Richard Hosking: Userptr IO buffers need to be aligned according to the V4L2 reference capture c example (which has been updated with this recently). Also, the reference program has the device close operations after the 'free' calls so they have been moved. This fixes the issue I was having with my device crashing vlc on close. Also fixed a typo in an error message and renamed a local function which was badly named by me. ","message":"Patch by Richard Hosking: Userptr IO buffers need to be aligned according to the V4L2 reference capture c example (which has been updated with this recently). Also, the reference program has the device close operations after the 'free' calls so they have been moved. This fixes the issue I was having with my device crashing vlc on close. Also fixed a typo in an error message and renamed a local function which was badly named by me. \n\n","repos":"vlc-mirror\/vlc,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/access\/v4l2.c\n+++ modules\/access\/v4l2.c\n@@ -158,7 +158,7 @@\n static block_t* GrabAudio( demux_t *p_demux );\n \n vlc_bool_t IsChromaSupported( demux_t *p_demux, unsigned int i_v4l2 );\n-unsigned int GetChromaFromFourcc( char *psz_fourcc );\n+unsigned int GetFourccFromString( char *psz_fourcc );\n \n static int OpenVideoDev( demux_t *, char *psz_device );\n static int OpenAudioDev( demux_t *, char *psz_device );\n@@ -192,6 +192,7 @@\n {\n void * start;\n size_t length;\n+ void * orig_userp;\n };\n \n struct demux_sys_t\n@@ -297,7 +298,7 @@\n p_sys->i_sample_rate = val.i_int;\n \n psz = var_CreateGetString( p_demux, \"v4l2-chroma\" );\n- p_sys->i_fourcc = GetChromaFromFourcc( psz );\n+ p_sys->i_fourcc = GetFourccFromString( psz );\n free( psz );\n \n var_Create( p_demux, \"v4l2-stereo\", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );\n@@ -489,7 +490,7 @@\n }\n \n char* chroma = strndup( psz_parser, i_len );\n- p_sys->i_fourcc = GetChromaFromFourcc( chroma );\n+ p_sys->i_fourcc = GetFourccFromString( chroma );\n free( chroma );\n \n psz_parser += i_len;\n@@ -614,10 +615,6 @@\n }\n }\n \n- \/* Close *\/\n- if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video );\n- if( p_sys->i_fd_audio >= 0 ) close( p_sys->i_fd_audio );\n-\n \/* Free Video Buffers *\/\n if( p_sys->p_buffers ) {\n switch( p_sys->io )\n@@ -639,12 +636,16 @@\n case IO_METHOD_USERPTR:\n for( i = 0; i < p_sys->i_nbuffers; ++i )\n {\n- free( p_sys->p_buffers[i].start );\n+ free( p_sys->p_buffers[i].orig_userp );\n }\n break;\n }\n free( p_sys->p_buffers );\n }\n+\n+ \/* Close *\/\n+ if( p_sys->i_fd_video >= 0 ) close( p_sys->i_fd_video );\n+ if( p_sys->i_fd_audio >= 0 ) close( p_sys->i_fd_audio );\n \n if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );\n if( p_sys->psz_device ) free( p_sys->psz_device );\n@@ -1031,6 +1032,10 @@\n {\n demux_sys_t *p_sys = p_demux->p_sys;\n struct v4l2_requestbuffers req;\n+ unsigned int i_page_size;\n+\n+ i_page_size = getpagesize();\n+ i_buffer_size = ( i_buffer_size + i_page_size - 1 ) & ~( i_page_size - 1);\n \n memset( &req, 0, sizeof(req) );\n req.count = 4;\n@@ -1053,7 +1058,9 @@\n for( p_sys->i_nbuffers = 0; p_sys->i_nbuffers < 4; ++p_sys->i_nbuffers )\n {\n p_sys->p_buffers[p_sys->i_nbuffers].length = i_buffer_size;\n- p_sys->p_buffers[p_sys->i_nbuffers].start = malloc( i_buffer_size );\n+ p_sys->p_buffers[p_sys->i_nbuffers].start =\n+ vlc_memalign( &p_sys->p_buffers[p_sys->i_nbuffers].orig_userp,\n+ \/* boundary *\/ i_page_size, i_buffer_size );\n \n if( !p_sys->p_buffers[p_sys->i_nbuffers].start )\n {\n@@ -1070,9 +1077,9 @@\n }\n \n \/*****************************************************************************\n- * GetChromaFromFourcc: Returns the fourcc code from the given string\n- *****************************************************************************\/\n-unsigned int GetChromaFromFourcc( char *psz_fourcc )\n+ * GetFourccFromString: Returns the fourcc code from the given string\n+ *****************************************************************************\/\n+unsigned int GetFourccFromString( char *psz_fourcc )\n {\n if( strlen( psz_fourcc ) >= 4 )\n {\n@@ -1487,8 +1494,6 @@\n int i_fd;\n demux_sys_t *p_sys = p_demux->p_sys;\n \n-\/* msg_Dbg( p_demux, \"main device='%s'\", p_sys->psz_device ); *\/\n-\n if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )\n {\n msg_Err( p_demux, \"cannot open video device (%m)\" );\n@@ -1602,7 +1607,7 @@\n {\n if( ioctl( i_fd, VIDIOC_G_AUDIO, &p_sys->p_audios[ p_sys->i_audio] ) < 0 )\n {\n- msg_Err( p_demux, \"cannot get video input characteristics (%m)\" );\n+ msg_Err( p_demux, \"cannot get audio input characteristics (%m)\" );\n goto open_failed;\n }\n \n"} {"commit":"bccc9d0c806afba2e03674f970e7b56d296de43a","subject":"Don't use FAST moves on aligned flexible data-types to avoid bus errors on SPARC archiecture.","message":"Don't use FAST moves on aligned flexible data-types to avoid bus errors on SPARC archiecture.\n","repos":"numpy\/numpy-refactor,bmorris3\/numpy,simongibbons\/numpy,stefanv\/numpy,mattip\/numpy,MSeifert04\/numpy,endolith\/numpy,dch312\/numpy,jankoslavic\/numpy,maniteja123\/numpy,mathdd\/numpy,pbrod\/numpy,skymanaditya1\/numpy,WarrenWeckesser\/numpy,andsor\/numpy,ChanderG\/numpy,joferkington\/numpy,maniteja123\/numpy,ahaldane\/numpy,ewmoore\/numpy,pdebuyl\/numpy,pizzathief\/numpy,jakirkham\/numpy,trankmichael\/numpy,brandon-rhodes\/numpy,NextThought\/pypy-numpy,MichaelAquilina\/numpy,jorisvandenbossche\/numpy,ChanderG\/numpy,trankmichael\/numpy,dimasad\/numpy,ddasilva\/numpy,gfyoung\/numpy,mortada\/numpy,nguyentu1602\/numpy,dato-code\/numpy,tdsmith\/numpy,musically-ut\/numpy,ogrisel\/numpy,cjermain\/numpy,endolith\/numpy,Anwesh43\/numpy,embray\/numpy,ChristopherHogan\/numpy,ogrisel\/numpy,felipebetancur\/numpy,groutr\/numpy,BabeNovelty\/numpy,yiakwy\/numpy,pelson\/numpy,tacaswell\/numpy,skwbc\/numpy,GrimDerp\/numpy,ekalosak\/numpy,dwillmer\/numpy,andsor\/numpy,mattip\/numpy,leifdenby\/numpy,gmcastil\/numpy,tacaswell\/numpy,immerrr\/numpy,chiffa\/numpy,AustereCuriosity\/numpy,has2k1\/numpy,mhvk\/numpy,brandon-rhodes\/numpy,seberg\/numpy,numpy\/numpy,pyparallel\/numpy,argriffing\/numpy,cjermain\/numpy,mhvk\/numpy,Srisai85\/numpy,numpy\/numpy-refactor,jonathanunderwood\/numpy,GrimDerp\/numpy,MSeifert04\/numpy,pbrod\/numpy,numpy\/numpy,kiwifb\/numpy,dwf\/numpy,mattip\/numpy,bmorris3\/numpy,ViralLeadership\/numpy,CMartelLML\/numpy,Dapid\/numpy,ajdawson\/numpy,AustereCuriosity\/numpy,mathdd\/numpy,jonathanunderwood\/numpy,ContinuumIO\/numpy,matthew-brett\/numpy,BMJHayward\/numpy,GrimDerp\/numpy,sonnyhu\/numpy,matthew-brett\/numpy,GrimDerp\/numpy,madphysicist\/numpy,ContinuumIO\/numpy,leifdenby\/numpy,stuarteberg\/numpy,ChristopherHogan\/numpy,stuarteberg\/numpy,nguyentu1602\/numpy,astrofrog\/numpy,andsor\/numpy,larsmans\/numpy,charris\/numpy,tacaswell\/numpy,naritta\/numpy,rmcgibbo\/numpy,MSeifert04\/numpy,numpy\/numpy-refactor,cowlicks\/numpy,b-carter\/numpy,felipebetancur\/numpy,mhvk\/numpy,numpy\/numpy-refactor,rmcgibbo\/numpy,simongibbons\/numpy,grlee77\/numpy,madphysicist\/numpy,ewmoore\/numpy,chatcannon\/numpy,mortada\/numpy,dato-code\/numpy,embray\/numpy,yiakwy\/numpy,drasmuss\/numpy,mattip\/numpy,pbrod\/numpy,mingwpy\/numpy,moreati\/numpy,behzadnouri\/numpy,KaelChen\/numpy,matthew-brett\/numpy,nguyentu1602\/numpy,musically-ut\/numpy,cjermain\/numpy,abalkin\/numpy,madphysicist\/numpy,dimasad\/numpy,GaZ3ll3\/numpy,MichaelAquilina\/numpy,moreati\/numpy,charris\/numpy,MichaelAquilina\/numpy,ekalosak\/numpy,MaPePeR\/numpy,leifdenby\/numpy,mortada\/numpy,ajdawson\/numpy,behzadnouri\/numpy,jorisvandenbossche\/numpy,empeeu\/numpy,astrofrog\/numpy,kirillzhuravlev\/numpy,rajathkumarmp\/numpy,jorisvandenbossche\/numpy,pyparallel\/numpy,rhythmsosad\/numpy,argriffing\/numpy,rgommers\/numpy,WarrenWeckesser\/numpy,matthew-brett\/numpy,Eric89GXL\/numpy,empeeu\/numpy,endolith\/numpy,jakirkham\/numpy,dch312\/numpy,charris\/numpy,sinhrks\/numpy,jschueller\/numpy,bmorris3\/numpy,grlee77\/numpy,GaZ3ll3\/numpy,MichaelAquilina\/numpy,WillieMaddox\/numpy,rgommers\/numpy,simongibbons\/numpy,skwbc\/numpy,embray\/numpy,dwillmer\/numpy,SunghanKim\/numpy,chiffa\/numpy,stefanv\/numpy,dch312\/numpy,Srisai85\/numpy,hainm\/numpy,njase\/numpy,mhvk\/numpy,rudimeier\/numpy,BMJHayward\/numpy,has2k1\/numpy,tynn\/numpy,ahaldane\/numpy,WarrenWeckesser\/numpy,bringingheavendown\/numpy,ESSS\/numpy,pizzathief\/numpy,dwf\/numpy,sonnyhu\/numpy,SunghanKim\/numpy,WarrenWeckesser\/numpy,naritta\/numpy,jonathanunderwood\/numpy,pdebuyl\/numpy,dato-code\/numpy,drasmuss\/numpy,WillieMaddox\/numpy,Anwesh43\/numpy,ahaldane\/numpy,ddasilva\/numpy,matthew-brett\/numpy,MSeifert04\/numpy,rajathkumarmp\/numpy,jankoslavic\/numpy,cjermain\/numpy,astrofrog\/numpy,pbrod\/numpy,stefanv\/numpy,seberg\/numpy,yiakwy\/numpy,gfyoung\/numpy,dwillmer\/numpy,AustereCuriosity\/numpy,ssanderson\/numpy,gmcastil\/numpy,bertrand-l\/numpy,skymanaditya1\/numpy,bringingheavendown\/numpy,ChristopherHogan\/numpy,shoyer\/numpy,mindw\/numpy,jakirkham\/numpy,nbeaver\/numpy,njase\/numpy,groutr\/numpy,utke1\/numpy,pdebuyl\/numpy,solarjoe\/numpy,musically-ut\/numpy,hainm\/numpy,dimasad\/numpy,pelson\/numpy,kiwifb\/numpy,anntzer\/numpy,astrofrog\/numpy,pizzathief\/numpy,gmcastil\/numpy,WarrenWeckesser\/numpy,kirillzhuravlev\/numpy,larsmans\/numpy,empeeu\/numpy,rhythmsosad\/numpy,mindw\/numpy,sonnyhu\/numpy,joferkington\/numpy,brandon-rhodes\/numpy,CMartelLML\/numpy,tynn\/numpy,ESSS\/numpy,bertrand-l\/numpy,immerrr\/numpy,madphysicist\/numpy,abalkin\/numpy,brandon-rhodes\/numpy,bmorris3\/numpy,numpy\/numpy,tdsmith\/numpy,NextThought\/pypy-numpy,sinhrks\/numpy,rherault-insa\/numpy,ContinuumIO\/numpy,KaelChen\/numpy,ViralLeadership\/numpy,mathdd\/numpy,tdsmith\/numpy,mhvk\/numpy,jorisvandenbossche\/numpy,grlee77\/numpy,githubmlai\/numpy,ESSS\/numpy,dimasad\/numpy,Eric89GXL\/numpy,rajathkumarmp\/numpy,chatcannon\/numpy,rgommers\/numpy,ajdawson\/numpy,githubmlai\/numpy,grlee77\/numpy,Dapid\/numpy,BMJHayward\/numpy,seberg\/numpy,SiccarPoint\/numpy,mwiebe\/numpy,rudimeier\/numpy,ekalosak\/numpy,tdsmith\/numpy,ogrisel\/numpy,musically-ut\/numpy,trankmichael\/numpy,drasmuss\/numpy,BabeNovelty\/numpy,has2k1\/numpy,shoyer\/numpy,empeeu\/numpy,astrofrog\/numpy,embray\/numpy,MaPePeR\/numpy,pelson\/numpy,GaZ3ll3\/numpy,trankmichael\/numpy,ChristopherHogan\/numpy,cowlicks\/numpy,stefanv\/numpy,stuarteberg\/numpy,groutr\/numpy,skymanaditya1\/numpy,mwiebe\/numpy,tynn\/numpy,WillieMaddox\/numpy,solarjoe\/numpy,pelson\/numpy,anntzer\/numpy,sigma-random\/numpy,pyparallel\/numpy,b-carter\/numpy,nguyentu1602\/numpy,joferkington\/numpy,b-carter\/numpy,Eric89GXL\/numpy,dwf\/numpy,endolith\/numpy,jankoslavic\/numpy,shoyer\/numpy,abalkin\/numpy,BMJHayward\/numpy,andsor\/numpy,pizzathief\/numpy,sinhrks\/numpy,anntzer\/numpy,rhythmsosad\/numpy,cowlicks\/numpy,kirillzhuravlev\/numpy,mingwpy\/numpy,CMartelLML\/numpy,hainm\/numpy,Linkid\/numpy,Yusa95\/numpy,utke1\/numpy,maniteja123\/numpy,anntzer\/numpy,rhythmsosad\/numpy,ahaldane\/numpy,sinhrks\/numpy,ChanderG\/numpy,larsmans\/numpy,pbrod\/numpy,simongibbons\/numpy,githubmlai\/numpy,jorisvandenbossche\/numpy,KaelChen\/numpy,jschueller\/numpy,rajathkumarmp\/numpy,CMartelLML\/numpy,bertrand-l\/numpy,ogrisel\/numpy,BabeNovelty\/numpy,dwillmer\/numpy,rmcgibbo\/numpy,mindw\/numpy,ssanderson\/numpy,ekalosak\/numpy,simongibbons\/numpy,mathdd\/numpy,sigma-random\/numpy,ewmoore\/numpy,NextThought\/pypy-numpy,ewmoore\/numpy,naritta\/numpy,sigma-random\/numpy,gfyoung\/numpy,mortada\/numpy,ajdawson\/numpy,Srisai85\/numpy,Eric89GXL\/numpy,stefanv\/numpy,immerrr\/numpy,kiwifb\/numpy,shoyer\/numpy,skymanaditya1\/numpy,Dapid\/numpy,bringingheavendown\/numpy,rudimeier\/numpy,SunghanKim\/numpy,ewmoore\/numpy,joferkington\/numpy,Yusa95\/numpy,mingwpy\/numpy,NextThought\/pypy-numpy,KaelChen\/numpy,Yusa95\/numpy,MaPePeR\/numpy,njase\/numpy,Anwesh43\/numpy,jakirkham\/numpy,felipebetancur\/numpy,numpy\/numpy-refactor,jakirkham\/numpy,MSeifert04\/numpy,Linkid\/numpy,charris\/numpy,ssanderson\/numpy,hainm\/numpy,rherault-insa\/numpy,mwiebe\/numpy,ddasilva\/numpy,grlee77\/numpy,madphysicist\/numpy,naritta\/numpy,numpy\/numpy,SiccarPoint\/numpy,shoyer\/numpy,stuarteberg\/numpy,dwf\/numpy,solarjoe\/numpy,seberg\/numpy,ChanderG\/numpy,embray\/numpy,chiffa\/numpy,utke1\/numpy,rgommers\/numpy,rudimeier\/numpy,pizzathief\/numpy,rmcgibbo\/numpy,githubmlai\/numpy,felipebetancur\/numpy,ahaldane\/numpy,dato-code\/numpy,skwbc\/numpy,argriffing\/numpy,sonnyhu\/numpy,moreati\/numpy,nbeaver\/numpy,GaZ3ll3\/numpy,Yusa95\/numpy,SiccarPoint\/numpy,jschueller\/numpy,dch312\/numpy,yiakwy\/numpy,pdebuyl\/numpy,pelson\/numpy,Srisai85\/numpy,behzadnouri\/numpy,ogrisel\/numpy,has2k1\/numpy,cowlicks\/numpy,dwf\/numpy,kirillzhuravlev\/numpy,MaPePeR\/numpy,Linkid\/numpy,SunghanKim\/numpy,nbeaver\/numpy,chatcannon\/numpy,mindw\/numpy,jankoslavic\/numpy,rherault-insa\/numpy,immerrr\/numpy,sigma-random\/numpy,mingwpy\/numpy,Linkid\/numpy,jschueller\/numpy,larsmans\/numpy,SiccarPoint\/numpy,BabeNovelty\/numpy,ViralLeadership\/numpy,Anwesh43\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/arrayobject.c\n+++ numpy\/core\/src\/arrayobject.c\n@@ -758,7 +758,12 @@\n sptr = aligned;\n }\n else sptr = src->data;\n- if (PyArray_ISALIGNED(dest)) {\n+ \/* FIXME: This should check for a flag on the data-type\n+ that states whether or not it is variable length.\n+ Because the ISFLEXIBLE check is hard-coded to the \n+ built-in data-types.\n+ *\/ \n+ if (PyArray_ISALIGNED(dest) && !PyArray_ISFLEXIBLE(dest)) {\n myfunc = _strided_byte_copy;\n }\n else if (usecopy) {\n"} {"commit":"f57fd93258703f565380f19b940648f6b3cbdf01","subject":"(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6","message":"(partially) Fix Bug#55227 Fix compiler warnings in innodb with gcc 4.6\n\nFix compiler warning:\nlog\/log0recv.c: In function 'recv_recovery_from_checkpoint_start':\nlog\/log0recv.c:2509:10: error: variable 'archived_lsn' set but not used [-Werror=unused-but-set-variable]\n","repos":"natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,slanterns\/server,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- storage\/innobase\/log\/log0recv.c\n+++ storage\/innobase\/log\/log0recv.c\n@@ -2506,7 +2506,9 @@\n \tdulint\t\told_scanned_lsn;\n \tdulint\t\tgroup_scanned_lsn;\n \tdulint\t\tcontiguous_lsn;\n+#ifdef UNIV_LOG_ARCHIVE\n \tdulint\t\tarchived_lsn;\n+#endif \/* UNIV_LOG_ARCHIVE *\/\n \tulint\t\tcapacity;\n \tbyte*\t\tbuf;\n \tbyte\t\tlog_hdr_buf[LOG_FILE_HDR_SIZE];\n@@ -2552,7 +2554,9 @@\n \n \tcheckpoint_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_LSN);\n \tcheckpoint_no = mach_read_from_8(buf + LOG_CHECKPOINT_NO);\n+#ifdef UNIV_LOG_ARCHIVE\n \tarchived_lsn = mach_read_from_8(buf + LOG_CHECKPOINT_ARCHIVED_LSN);\n+#endif \/* UNIV_LOG_ARCHIVE *\/\n \n \t\/* Read the first log file header to print a note if this is\n \ta recovery from a restored InnoDB Hot Backup *\/\n"} {"commit":"bc3e42dac2c5d8b3a6d01e9c10156e6b5156a29d","subject":"improve dma reset code","message":"improve dma reset code\n","repos":"Wallacoloo\/printipi,harry159821\/printipi,Igor-Rast\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,harry159821\/printipi,harry159821\/printipi,Wallacoloo\/printipi,Wallacoloo\/printipi,Igor-Rast\/printipi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/proof-of-concept\/DMA\/dma-gpio.c\n+++ code\/proof-of-concept\/DMA\/dma-gpio.c\n@@ -94,6 +94,7 @@\n \/\/flags used in the DmaChannelHeader struct:\n #define DMA_CS_RESET (1<<31)\n #define DMA_CS_ABORT (1<<30)\n+#define DMA_CS_END (1<<1)\n #define DMA_CS_ACTIVE (1<<0)\n \n #define DMA_DEBUG_READ_ERROR (1<<2)\n@@ -440,12 +441,13 @@\n struct DmaChannelHeader *dmaHeader = (struct DmaChannelHeader*)(dmaBaseMem + DMACH3);\n \/\/abort previous DMA:\n dmaHeader->NEXTCONBK = 0;\n- dmaHeader->CS = DMA_CS_ABORT; \/\/make sure to disable dma first.\n+ dmaHeader->CS |= DMA_CS_ABORT; \/\/make sure to disable dma first.\n sleep(1); \/\/give time for the abort command to be handled.\n \n dmaHeader->CS = DMA_CS_RESET;\n sleep(1);\n \n+ writeBitmasked(&dmaHeader->CS, DMA_CS_END, DMA_CS_END); \/\/clear the end flag\n dmaHeader->DEBUG = DMA_DEBUG_READ_ERROR | DMA_DEBUG_FIFO_ERROR | DMA_DEBUG_READ_LAST_NOT_SET_ERROR; \/\/ clear debug error flags\n dmaHeader->CONBLK_AD = (uint32_t)physCbPage + ((void*)cbArr - virtCbPage); \/\/we have to point it to the PHYSICAL address of the control block (cb1)\n \/\/uint64_t t1 = readSysTime(timerBaseMem);\n"} {"commit":"50b051ecc183278cd233314c334201a786ab4c79","subject":"Comment changes.","message":"Comment changes.\n\ngit-svn-id: 77a43f9646713b91fea7788fad5dfbf67e151ece@2788 94b884b6-d6fd-0310-90d3-974f1d3f35e1\n","repos":"chadnetzer\/numpy-gaurdro,teoliphant\/numpy-refactor,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,illume\/numpy3k,chadnetzer\/numpy-gaurdro,jasonmccampbell\/numpy-refactor-sprint,efiring\/numpy-work,efiring\/numpy-work,chadnetzer\/numpy-gaurdro,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,illume\/numpy3k,Ademan\/NumPy-GSoC,efiring\/numpy-work,Ademan\/NumPy-GSoC,teoliphant\/numpy-refactor,illume\/numpy3k,Ademan\/NumPy-GSoC,illume\/numpy3k,jasonmccampbell\/numpy-refactor-sprint,Ademan\/NumPy-GSoC,teoliphant\/numpy-refactor,efiring\/numpy-work,chadnetzer\/numpy-gaurdro","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/arrayobject.c\n+++ numpy\/core\/src\/arrayobject.c\n@@ -4560,6 +4560,8 @@\n \n \/* Check whether the given array is stored contiguously (row-wise) in\n memory. *\/\n+\n+\/* 0-strided arrays are not contiguous (even if dimension == 1) *\/\n static int\n _IsContiguous(PyArrayObject *ap)\n {\n@@ -4582,6 +4584,7 @@\n }\n \n \n+\/* 0-strided arrays are not contiguous (even if dimension == 1) *\/\n static int\n _IsFortranContiguous(PyArrayObject *ap)\n {\n"} {"commit":"88a5a0a946d553f6a01f52d81f10f2876d725626","subject":"indent","message":"indent\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/isa\/if_ef_isapnp.c\n+++ dev\/isa\/if_ef_isapnp.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: if_ef_isapnp.c,v 1.6 2000\/05\/26 16:24:30 jason Exp $\t*\/\n+\/*\t$OpenBSD: if_ef_isapnp.c,v 1.7 2000\/06\/07 02:48:22 aaron Exp $\t*\/\n \n \/*\n * Copyright (c) 1999 Jason L. Wright (jason@thought.net)\n@@ -115,31 +115,31 @@\n #define\tEF_MII_DATA\t\t0x02\t\t\/* data bit *\/\n #define\tEF_MII_DIR\t\t0x04\t\t\/* direction *\/\n \n-int ef_isapnp_match __P((struct device *, void *, void *));\n-void ef_isapnp_attach __P((struct device *, struct device *, void *));\n-\n-void efstart __P((struct ifnet *));\n-int efioctl __P((struct ifnet *, u_long, caddr_t));\n-void efwatchdog __P((struct ifnet *));\n-void efreset __P((struct ef_softc *));\n-void efstop __P((struct ef_softc *));\n-void efsetmulti __P((struct ef_softc *));\n-int efbusyeeprom __P((struct ef_softc *));\n-int efintr __P((void *));\n-void efinit __P((struct ef_softc *));\n-void efcompletecmd __P((struct ef_softc *, u_int, u_int));\n-void eftxstat __P((struct ef_softc *));\n-void efread __P((struct ef_softc *));\n-struct mbuf *efget __P((struct ef_softc *, int totlen));\n-\n-void ef_miibus_writereg __P((struct device *, int, int, int));\n-void ef_miibus_statchg __P((struct device *));\n-int ef_miibus_readreg __P((struct device *, int, int));\n-void ef_mii_writeb __P((struct ef_softc *, int));\n-void ef_mii_sync __P((struct ef_softc *));\n-int ef_ifmedia_upd __P((struct ifnet *));\n-void ef_ifmedia_sts __P((struct ifnet *, struct ifmediareq *));\n-void ef_tick __P((void *));\n+int ef_isapnp_match\t__P((struct device *, void *, void *));\n+void ef_isapnp_attach\t__P((struct device *, struct device *, void *));\n+\n+void efstart\t\t__P((struct ifnet *));\n+int efioctl\t\t__P((struct ifnet *, u_long, caddr_t));\n+void efwatchdog\t\t__P((struct ifnet *));\n+void efreset\t\t__P((struct ef_softc *));\n+void efstop\t\t__P((struct ef_softc *));\n+void efsetmulti\t\t__P((struct ef_softc *));\n+int efbusyeeprom\t__P((struct ef_softc *));\n+int efintr\t\t__P((void *));\n+void efinit\t\t__P((struct ef_softc *));\n+void efcompletecmd\t__P((struct ef_softc *, u_int, u_int));\n+void eftxstat\t\t__P((struct ef_softc *));\n+void efread\t\t__P((struct ef_softc *));\n+struct mbuf *efget\t__P((struct ef_softc *, int totlen));\n+\n+void ef_miibus_writereg\t__P((struct device *, int, int, int));\n+void ef_miibus_statchg\t__P((struct device *));\n+int ef_miibus_readreg\t__P((struct device *, int, int));\n+void ef_mii_writeb\t__P((struct ef_softc *, int));\n+void ef_mii_sync\t__P((struct ef_softc *));\n+int ef_ifmedia_upd\t__P((struct ifnet *));\n+void ef_ifmedia_sts\t__P((struct ifnet *, struct ifmediareq *));\n+void ef_tick\t\t__P((void *));\n \n struct cfdriver ef_cd = {\n \tNULL, \"ef\", DV_IFNET\n"} {"commit":"7503554b5a732eeb4765d20cd857410e27332a52","subject":"Diagnostics","message":"Diagnostics\n","repos":"Wallacoloo\/printipi,harry159821\/printipi,Wallacoloo\/printipi,harry159821\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,Wallacoloo\/printipi,harry159821\/printipi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/proof-of-concept\/DMA\/dma-gpio.c\n+++ code\/proof-of-concept\/DMA\/dma-gpio.c\n@@ -572,7 +572,8 @@\n \/\/This function takes a pin, a mode (0=off, 1=on) and a time. It then manipulates the GpioBufferFrame array in order to ensure that the pin switches to the desired level at the desired time. It will sleep if necessary.\n \/\/Sleep until we are on the right iteration of the circular buffer (otherwise we cannot queue the command)\n uint64_t callTime = readSysTime(timerBaseMem);\n- sleepUntilMicros(micros-((uint64_t)SOURCE_BUFFER_FRAMES)*1000000\/FRAMES_PER_SEC, timerBaseMem);\n+ uint64_t desiredTime = micros-((uint64_t)SOURCE_BUFFER_FRAMES)*1000000\/FRAMES_PER_SEC;\n+ sleepUntilMicros(desiredTime, timerBaseMem);\n uint64_t awakeTime = readSysTime(timerBaseMem);\n \/\/get the current source index at the current time:\n \/\/must ensure we aren't interrupted during this calculation, hence the two timers instead of 1. \n@@ -592,7 +593,7 @@\n int usecFromNow = micros - curTime2;\n int framesFromNow = usecFromNow*FRAMES_PER_SEC\/1000000; \n if (framesFromNow < 10) { \/\/Not safe to schedule less than ~10uS into the future.\n- printf(\"Warning: behind schedule: %i (%i) (tries: %i) (sleep %llu -> %llu (want %llu)) (curTime1: %llu, curTime2: %llu)\\n\", framesFromNow, usecFromNow, tries, callTime, awakeTime, micros, curTime1, curTime2);\n+ printf(\"Warning: behind schedule: %i (%i) (tries: %i) (sleep %llu -> %llu (want %llu)) (curTime1: %llu, curTime2: %llu)\\n\", framesFromNow, usecFromNow, tries, callTime, awakeTime, desiredTime, curTime1, curTime2);\n framesFromNow = 10;\n }\n int newIdx = (srcIdx + framesFromNow)%SOURCE_BUFFER_FRAMES;\n"} {"commit":"f0e6c7b486fde1a2bd5248e5a5c4158c62dd58d8","subject":"Additional gtt alignment paranoia:","message":"Additional gtt alignment paranoia:\n\nwhen we go to pin, additionally check alignment against that required\nfor tiling and unbind\/rebind if needed. We shouldn't hit this case, but\nit is a good to check (would have found the bug in the last commit).\n\ntested by mlarkin and matthieu (and myself, of course)\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/drm\/i915_drv.c\n+++ dev\/pci\/drm\/i915_drv.c\n@@ -3170,9 +3170,11 @@\n \t * otherwise, so just fail the pin (with a printf so we can fix a\n \t * wrong userland).\n \t *\/\n-\tif ((alignment && obj_priv->dmamap != NULL &&\n-\t obj_priv->gtt_offset & (alignment - 1)) || (needs_fence &&\n-\t !i915_gem_object_fence_offset_ok(obj, obj_priv->tiling_mode))) {\n+\tif (obj_priv->dmamap != NULL &&\n+\t ((alignment && obj_priv->gtt_offset & (alignment - 1)) ||\n+\t obj_priv->gtt_offset & (i915_gem_get_gtt_alignment(obj) - 1) ||\n+\t (needs_fence && !i915_gem_object_fence_offset_ok(obj,\n+\t obj_priv->tiling_mode)))) {\n \t\tif (obj_priv->pin_count == 0) {\n \t\t\tret = i915_gem_object_unbind(obj, 1);\n \t\t\tif (ret)\n"} {"commit":"18b8ea1511364a8db652677b8f0039c37c315aba","subject":"Added Set functions and comments","message":"Added Set functions and comments\n","repos":"ipsusila\/RTK,ldqcarbon\/RTK,SimonRit\/RTK,fabienmomey\/RTK,SimonRit\/RTK,SimonRit\/RTK,ldqcarbon\/RTK,dsarrut\/RTK,ldqcarbon\/RTK,ipsusila\/RTK,ipsusila\/RTK,ipsusila\/RTK,dsarrut\/RTK,fabienmomey\/RTK,fabienmomey\/RTK,ldqcarbon\/RTK,dsarrut\/RTK,ipsusila\/RTK,ldqcarbon\/RTK,ipsusila\/RTK,dsarrut\/RTK,dsarrut\/RTK,fabienmomey\/RTK,SimonRit\/RTK,ipsusila\/RTK,dsarrut\/RTK,fabienmomey\/RTK,ldqcarbon\/RTK,dsarrut\/RTK,fabienmomey\/RTK,fabienmomey\/RTK,ldqcarbon\/RTK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- code\/rtkRayBoxIntersectionFunction.h\n+++ code\/rtkRayBoxIntersectionFunction.h\n@@ -33,7 +33,13 @@\n * image coordinate system. The ray origin must be set first. The direction\n * of the ray is then passed to the Evaluate function. It returns false if\n * there is no intersection. It returns true otherwise and the nearest and\n- * farthest distance\/point may be accessed.\n+ * farthest distance\/point may be accessed. Nearest and farthest distance are\n+ * defined such that NearestDistance < FarthestDistance.\n+ *\n+ * The default behavior of the function is to return the intersection between\n+ * the line defined by the origin and direction. You need to modify the\n+ * nearest and farthest distance if you want to account for the position of the\n+ * source and the detector along the ray.\n *\n * \\author Simon Rit\n *\n@@ -88,10 +94,12 @@\n \/** Get the distance with the nearest intersection.\n * \\warning Only relevant if called after Evaluate. *\/\n itkGetMacro(NearestDistance, TCoordRep);\n+ itkSetMacro(NearestDistance, TCoordRep);\n \n \/** Get the distance with the farthest intersection.\n * \\warning Only relevant if called after Evaluate. *\/\n itkGetMacro(FarthestDistance, TCoordRep);\n+ itkSetMacro(FarthestDistance, TCoordRep);\n \n \/** Get the nearest point coordinates.\n * \\warning Only relevant if called after Evaluate. *\/\n"} {"commit":"017423786c0149e061fcf8e7ab96855032cb05cd","subject":"remove doubled #define; openbsd@davidkrause.com","message":"remove doubled #define; openbsd@davidkrause.com\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pcmcia\/pcmciavar.h\n+++ dev\/pcmcia\/pcmciavar.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: pcmciavar.h,v 1.13 2001\/08\/17 21:52:16 deraadt Exp $\t*\/\n+\/*\t$OpenBSD: pcmciavar.h,v 1.14 2002\/01\/02 20:33:40 deraadt Exp $\t*\/\n \/*\t$NetBSD: pcmciavar.h,v 1.5 1998\/07\/19 17:28:17 christos Exp $\t*\/\n \n \/*\n@@ -250,9 +250,6 @@\n \t(pcmcia_chip_io_alloc((pf)->sc->pct, pf->sc->pch, (start),\t\\\n \t (size), (align), (pciop)))\n \n-#define\tpcmcia_io_free(pf, pciohp)\t\t\t\t\t\\\n-\t(pcmcia_chip_io_free((pf)->sc->pct, (pf)->sc->pch, (pciohp)))\n-\n int\tpcmcia_io_map __P((struct pcmcia_function *, int, bus_addr_t,\n \t bus_size_t, struct pcmcia_io_handle *, int *));\n \n"} {"commit":"2ed22e3c3bec5b92b9aba4afdef0cc5e6d859a11","subject":"xen-blkback: fix memory leak when persistent grants are used","message":"xen-blkback: fix memory leak when persistent grants are used\n\nCurrently shrink_free_pagepool() is called before the pages used for\npersistent grants are released via free_persistent_gnts(). This\nresults in a memory leak when a VBD that uses persistent grants is\ntorn down.\n\nCc: Konrad Rzeszutek Wilk <da3a51b335cef0eb0e2c329c5ef6bcd6acef687a@oracle.com>\nCc: \"Roger Pau Monn\u00e9\" <1c35b25b17252e1e5021df00666589fc74f64580@citrix.com>\nCc: Ian Campbell <d07012418334d2b85843de1e24273f2477041b61@citrix.com>\nReviewed-by: David Vrabel <b9d45bd1f671e508cd8daa63dfc3cabb597562df@citrix.com>\nCc: 2578944098299abf708b08eff6fcf60565553586@vger.kernel.org\nCc: 196a79ea1bad81d8c954adf793448b0a45442f28@lists.xen.org\nCc: Anthony Liguori <0212dd00c21e75e861d960b0cf505645317aaa0b@amazon.com>\nSigned-off-by: Matt Rushton <38485a4ec8a14139c43075204ae53dccb385704f@amazon.com>\nSigned-off-by: Matt Wilson <260f5074942ca36dab941199ff6b19fcaa26ccde@amazon.com>\nSigned-off-by: Konrad Rzeszutek Wilk <da3a51b335cef0eb0e2c329c5ef6bcd6acef687a@oracle.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"bc03a0eedf0f0d153aee59121b7325506e042b07","subject":"Add support for Roland UM-ONE, from Tom Ivar Helbekkmo in NetBSD PR 45908. ok ratchov@","message":"Add support for Roland UM-ONE, from Tom Ivar Helbekkmo in NetBSD PR 45908.\nok ratchov@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/usb\/umidi_quirks.c\n+++ dev\/usb\/umidi_quirks.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: umidi_quirks.c,v 1.9 2008\/06\/26 05:42:19 ray Exp $\t*\/\n+\/*\t$OpenBSD: umidi_quirks.c,v 1.10 2012\/02\/28 23:53:02 jsg Exp $\t*\/\n \/*\t$NetBSD: umidi_quirks.c,v 1.4 2002\/06\/19 13:55:30 tshiozak Exp $\t*\/\n \n \/*\n@@ -338,6 +338,20 @@\n \tUMQ_TERMINATOR\n };\n \n+\/*\n+ * ROLAND UM-ONE\n+ *\/\n+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UMONE, ANYIFACE, 1, 1) = {\n+\t\/* out *\/\n+\t{ 0, 1 },\n+\t\/* in *\/\n+\t{ 1, 1 }\n+};\n+\n+UMQ_DEF(ROLAND, ROLAND_UMONE, ANYIFACE) = {\n+\tUMQ_FIXED_EP_REG(ROLAND, ROLAND_UMONE, ANYIFACE),\n+\tUMQ_TERMINATOR\n+};\n \n \/*\n * quirk list\n@@ -361,6 +375,7 @@\n \tUMQ_REG(ROLAND, ROLAND_SD20, 0),\n \tUMQ_REG(ROLAND, ROLAND_SD80, 0),\n \tUMQ_REG(ROLAND, ROLAND_UA700, 3),\n+\tUMQ_REG(ROLAND, ROLAND_UMONE, ANYIFACE),\n \tUMQ_TERMINATOR\n };\n \n"} {"commit":"496b318eb65558c1a3a4fe882cb9da6d1dc6493a","subject":"xen\/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()","message":"xen\/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()\n\nvbd_resize() up_read()'s xs_state.suspend_mutex twice in a row via double\nxenbus_transaction_end() calls. The next down_read() in\nxenbus_transaction_start() (at eg. the next resize attempt) hangs.\n\nBugzilla: https:\/\/bugzilla.redhat.com\/show_bug.cgi?id=618317\n\nAcked-by: Jan Beulich <01de09643e0ae62e116f8bd77de435799874b456@novell.com>\nAcked-by: Ian Campbell <9be92b3dbbd6611e3e4c9209fb3d04b4919e7cca@citrix.com>\nSigned-off-by: Laszlo Ersek <7437296077edea1cb64451c122c4dac071f0cfbc@redhat.com>\nSigned-off-by: Konrad Rzeszutek Wilk <da3a51b335cef0eb0e2c329c5ef6bcd6acef687a@oracle.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/xen-blkback\/blkback.c\n+++ drivers\/block\/xen-blkback\/blkback.c\n@@ -226,6 +226,7 @@\n \t\tgoto again;\n \tif (err)\n \t\tpr_warn(DRV_PFX \"Error ending transaction\");\n+\treturn;\n abort:\n \txenbus_transaction_end(xbt, 1);\n }\n"} {"commit":"3913f1ae2fac961be8f0163c5bb6575cfb01d5a5","subject":"drivers: eth: Enable LLDP support for native_posix board","message":"drivers: eth: Enable LLDP support for native_posix board\n\nNeeded for testing LLDP.\n\nSigned-off-by: Jukka Rissanen <f9f077d1da4c7aa947f9864fa5a28c3588f6a45d@linux.intel.com>\n","repos":"zephyrproject-rtos\/zephyr,punitvara\/zephyr,kraj\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,galak\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,explora26\/zephyr,ldts\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,explora26\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,ldts\/zephyr,punitvara\/zephyr,explora26\/zephyr,nashif\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,kraj\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,nashif\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,kraj\/zephyr,explora26\/zephyr,finikorg\/zephyr,galak\/zephyr,punitvara\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,nashif\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,ldts\/zephyr,nashif\/zephyr,punitvara\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ethernet\/eth_native_posix.c\n+++ drivers\/ethernet\/eth_native_posix.c\n@@ -47,6 +47,35 @@\n #else\n #define ETH_HDR_LEN sizeof(struct net_eth_hdr)\n #endif\n+\n+#if defined(CONFIG_NET_LLDP)\n+static const struct net_lldpdu lldpdu = {\n+\t.chassis_id = {\n+\t\t.type_length = htons((LLDP_TLV_CHASSIS_ID << 9) |\n+\t\t\tNET_LLDP_CHASSIS_ID_TLV_LEN),\n+\t\t.subtype = CONFIG_NET_LLDP_CHASSIS_ID_SUBTYPE,\n+\t\t.value = NET_LLDP_CHASSIS_ID_VALUE\n+\t},\n+\t.port_id = {\n+\t\t.type_length = htons((LLDP_TLV_PORT_ID << 9) |\n+\t\t\tNET_LLDP_PORT_ID_TLV_LEN),\n+\t\t.subtype = CONFIG_NET_LLDP_PORT_ID_SUBTYPE,\n+\t\t.value = NET_LLDP_PORT_ID_VALUE\n+\t},\n+\t.ttl = {\n+\t\t.type_length = htons((LLDP_TLV_TTL << 9) |\n+\t\t\tNET_LLDP_TTL_TLV_LEN),\n+\t\t.ttl = htons(NET_LLDP_TTL)\n+\t},\n+#if defined(CONFIG_NET_LLDP_END_LLDPDU_TLV_ENABLED)\n+\t.end_lldpdu_tlv = NET_LLDP_END_LLDPDU_VALUE\n+#endif \/* CONFIG_NET_LLDP_END_LLDPDU_TLV_ENABLED *\/\n+};\n+\n+#define lldpdu_ptr (&lldpdu)\n+#else\n+#define lldpdu_ptr NULL\n+#endif \/* CONFIG_NET_LLDP *\/\n \n struct eth_context {\n \tu8_t recv[_ETH_MTU + ETH_HDR_LEN];\n@@ -381,6 +410,8 @@\n \t\treturn;\n \t}\n \n+\tnet_eth_set_lldpdu(iface, lldpdu_ptr);\n+\n \tctx->init_done = true;\n \n #if defined(CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC)\n@@ -439,6 +470,9 @@\n #if defined(CONFIG_NET_PROMISCUOUS_MODE)\n \t\t| ETHERNET_PROMISC_MODE\n #endif\n+#if defined(CONFIG_NET_LLDP)\n+\t\t| ETHERNET_LLDP\n+#endif\n \t\t;\n }\n \n@@ -491,6 +525,20 @@\n \treturn ret;\n }\n \n+#if defined(CONFIG_NET_VLAN)\n+static int vlan_setup(struct device *dev, struct net_if *iface,\n+\t\t u16_t tag, bool enable)\n+{\n+\tif (enable) {\n+\t\tnet_eth_set_lldpdu(iface, lldpdu_ptr);\n+\t} else {\n+\t\tnet_eth_unset_lldpdu(iface);\n+\t}\n+\n+\treturn 0;\n+}\n+#endif \/* CONFIG_NET_VLAN *\/\n+\n static const struct ethernet_api eth_if_api = {\n \t.iface_api.init = eth_iface_init,\n \t.iface_api.send = eth_send,\n@@ -498,6 +546,9 @@\n \t.get_capabilities = eth_posix_native_get_capabilities,\n \t.set_config = set_config,\n \n+#if defined(CONFIG_NET_VLAN)\n+\t.vlan_setup = vlan_setup,\n+#endif\n #if defined(CONFIG_NET_STATISTICS_ETHERNET)\n \t.get_stats = get_stats,\n #endif\n"} {"commit":"4e6b9319bce7a2be878d79bcbe2cb558b619b360","subject":"firewire: WQ_NON_REENTRANT is meaningless and going away","message":"firewire: WQ_NON_REENTRANT is meaningless and going away\n\ndbf2576e37 (\"workqueue: make all workqueues non-reentrant\") made\nWQ_NON_REENTRANT no-op and the flag is going away. Remove its usages.\n\nThis patch doesn't introduce any behavior changes.\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nSigned-off-by: Stefan Richter <fbd796546fc801b34e01e453c6fd30283e012038@s5r6.in-berlin.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/firewire\/core-transaction.c\n+++ drivers\/firewire\/core-transaction.c\n@@ -1262,8 +1262,7 @@\n {\n \tint ret;\n \n-\tfw_workqueue = alloc_workqueue(\"firewire\",\n-\t\t\t\t WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);\n+\tfw_workqueue = alloc_workqueue(\"firewire\", WQ_MEM_RECLAIM, 0);\n \tif (!fw_workqueue)\n \t\treturn -ENOMEM;\n \n"} {"commit":"f2d52cd4db08db06200176cfebead9778878d4fc","subject":"drm\/amdgpu\/cz: implement voltage validation properly","message":"drm\/amdgpu\/cz: implement voltage validation properly\n\nCZ uses a different set of registers compared to previous asics\nand supports separate NB and GFX planes.\n\nReviewed-by: Jammy Zhou <302958b3037f7fa601b11152090f51ed851f29fd@amd.com>\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"da64c6fc4aba6f02aa800db72411f459a9f86809","subject":"drm\/i915: show interrupt info on IVB","message":"drm\/i915: show interrupt info on IVB\n\nIVB uses the same interrupt reg layout as SNB, so add an IS_GEN7 to the\ninterrupt debugfs file.\n\nSigned-off-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\nSigned-off-by: Keith Packard <fd7f967895e9f35e58ec8a62a847a54d7fa7275f@keithp.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/i915_debugfs.c\n+++ drivers\/gpu\/drm\/i915\/i915_debugfs.c\n@@ -499,7 +499,7 @@\n \tseq_printf(m, \"Interrupts received: %d\\n\",\n \t\t atomic_read(&dev_priv->irq_received));\n \tfor (i = 0; i < I915_NUM_RINGS; i++) {\n-\t\tif (IS_GEN6(dev)) {\n+\t\tif (IS_GEN6(dev) || IS_GEN7(dev)) {\n \t\t\tseq_printf(m, \"Graphics Interrupt mask (%s):\t%08x\\n\",\n \t\t\t\t dev_priv->ring[i].name,\n \t\t\t\t I915_READ_IMR(&dev_priv->ring[i]));\n"} {"commit":"8a1ebd7480fe8e80119d12bef2906f9480c2916f","subject":"drm\/i915\/gtt: Remove _single from page table allocator","message":"drm\/i915\/gtt: Remove _single from page table allocator\n\nWe are always allocating a single page. No need to be verbose so\nremove the suffix.\n\nSigned-off-by: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>\nReviewed-by: Joonas Lahtinen <a11ca63949063c01fa551bf27c25e0fe898387c4@linux.intel.com>\nReviewed-by: Michel Thierry <c65ff7d3dfaea3345301797f027f123ededb124c@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"686135da9055c84283a86e19ee2aea0b127344d7","subject":"drm\/i915: fix a printk format","message":"drm\/i915: fix a printk format\n\nThis printk leads to the following Smatch warning:\n\n\tdrivers\/gpu\/drm\/i915\/i915_gem_gtt.c:336 alloc_pt_range()\n\t\terror: '%pa' expects argument of type 'phys_addr_t*',\n\t\targument 5 has type 'struct i915_page_table_entry*'\n\nIt looks like a simple typo to me where \"%p\" was intended instead of\n\"%pa\".\n\nSigned-off-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6fe7286530d9b9ce13421e3628bf564e896662a6","subject":"drm\/i915: Streamline VLV forcewake handling","message":"drm\/i915: Streamline VLV forcewake handling\n\nIt occured to me that when we're trying to wake up both render\nand media wells on VLV, we might end up calling the low level\nforce_wake_get\/put two times even though one call would be\nenough. Make that happen by figuring out which wells really\nneed to be woken up based on the forcewake counts.\n\nSigned-off-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nReviewed-by:Deepak S <b64e3b722d60644e9e2f2e15d0b99e87ffd5f23c@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a87ff62a80a6a65fc664cd410061910b8c52b896","subject":"drm\/nv50: delete ramfc object after disabling fifo, not before","message":"drm\/nv50: delete ramfc object after disabling fifo, not before\n\nramfc is zero'ed upon destruction, so it's safer to do things in the right\norder.\n\nSigned-off-by: Maarten Maathuis <1b771fd801ced5cd2f084249253ddbe77757dff5@gmail.com>\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/nv50_fifo.c\n+++ drivers\/gpu\/drm\/nouveau\/nv50_fifo.c\n@@ -317,17 +317,20 @@\n nv50_fifo_destroy_context(struct nouveau_channel *chan)\n {\n \tstruct drm_device *dev = chan->dev;\n+\tstruct nouveau_gpuobj_ref *ramfc = chan->ramfc;\n \n \tNV_DEBUG(dev, \"ch%d\\n\", chan->id);\n \n-\tnouveau_gpuobj_ref_del(dev, &chan->ramfc);\n-\tnouveau_gpuobj_ref_del(dev, &chan->cache);\n-\n+\t\/* This will ensure the channel is seen as disabled. *\/\n+\tchan->ramfc = NULL;\n \tnv50_fifo_channel_disable(dev, chan->id, false);\n \n \t\/* Dummy channel, also used on ch 127 *\/\n \tif (chan->id == 0)\n \t\tnv50_fifo_channel_disable(dev, 127, false);\n+\n+\tnouveau_gpuobj_ref_del(dev, &ramfc);\n+\tnouveau_gpuobj_ref_del(dev, &chan->cache);\n }\n \n int\n"} {"commit":"3dcbb02b3a9ad1722005290e7c9ac47097de517d","subject":"drm\/nvc0\/fifo: avoid touching missing subfifos","message":"drm\/nvc0\/fifo: avoid touching missing subfifos\n\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/nvc0_fifo.c\n+++ drivers\/gpu\/drm\/nouveau\/nvc0_fifo.c\n@@ -322,7 +322,7 @@\n \t}\n \n \t\/* PSUBFIFO[n] *\/\n-\tfor (i = 0; i < 3; i++) {\n+\tfor (i = 0; i < priv->spoon_nr; i++) {\n \t\tnv_mask(dev, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);\n \t\tnv_wr32(dev, 0x040108 + (i * 0x2000), 0xffffffff); \/* INTR *\/\n \t\tnv_wr32(dev, 0x04010c + (i * 0x2000), 0xfffffeff); \/* INTR_EN *\/\n"} {"commit":"893d6e6e122386d7aada4c71cf20c2d2794640fd","subject":"drm\/radeon: cleanup radeon_ttm debugfs handling","message":"drm\/radeon: cleanup radeon_ttm debugfs handling\n\nOtherwise we not necessary export the right information.\n\nSigned-off-by: Christian K\u00f6nig <c7ea837d7a46effe4232b086213468b8b31643bf@amd.com>\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"21e88620aa21b48d4f62d29275e3e2944a5ea2b5","subject":"drm\/vmwgfx: fix lock breakage","message":"drm\/vmwgfx: fix lock breakage\n\nAfter:\n\ncommit d059f652e73c35678d28d4cd09ab2cec89696af9\nAuthor: Daniel Vetter <daniel.vetter@ffwll.ch>\nAuthorDate: Fri Jul 25 18:07:40 2014 +0200\n\n drm: Handle legacy per-crtc locking with full acquire ctx\n\ndrm_mode_cursor_common() was switched to use drm_modeset_(un)lock_crtc()\nwhich uses full aquire ctx. So dropping\/reaquiring the lock via\ndrm_modeset_(un)lock() directly isn't the right thing to do, as lockdep\nkindly points out.\n\nThe 'FIXME's about sorting out whether vmwgfx *really* needs to lock-all\nfor cursor updates still apply.\n\nSigned-off-by: Rob Clark <915c10c999604870200b6defbe633d857c856ca0@gmail.com>\nReviewed-by: Jakob Bornecrantz <6c68cabc7124e43c9b4d50f86510600f69e74c99@vmware.com>\nTested-by: Thomas Hellstrom <a26490dfbee4be3d38287ad6448444504f58193c@vmware.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e8ca413558de8ea235a1223074c4ed09616b9034","subject":"IB\/srp: Bump driver version and release date","message":"IB\/srp: Bump driver version and release date\n\nSigned-off-by: Vu Pham <a29d050bee78d40bb3e7e30370dd97c890d98c36@mellanox.com>\nSigned-off-by: Bart Van Assche <89ed62d80e76c0eb24ee0d6433b48a91c2273b5e@acm.org>\nSigned-off-by: Roland Dreier <0d270388f2f92757a5de0f4bd891d3b392c44c4f@purestorage.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/infiniband\/ulp\/srp\/ib_srp.c\n+++ drivers\/infiniband\/ulp\/srp\/ib_srp.c\n@@ -53,8 +53,8 @@\n \n #define DRV_NAME\t\"ib_srp\"\n #define PFX\t\tDRV_NAME \": \"\n-#define DRV_VERSION\t\"0.2\"\n-#define DRV_RELDATE\t\"November 1, 2005\"\n+#define DRV_VERSION\t\"1.0\"\n+#define DRV_RELDATE\t\"July 1, 2013\"\n \n MODULE_AUTHOR(\"Roland Dreier\");\n MODULE_DESCRIPTION(\"InfiniBand SCSI RDMA Protocol initiator \"\n"} {"commit":"8e1765bd619e80da15d95d2e04344d86ebca566e","subject":"lirc_mceusb2: add another compro device ID, from Emile van der Merwe via the lirc mailing list","message":"lirc_mceusb2: add another compro device ID, from Emile van der Merwe via the lirc mailing list\n","repos":"stb-tester\/lirc,stb-tester\/lirc,stb-tester\/lirc,stb-tester\/lirc,stb-tester\/lirc,stb-tester\/lirc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/lirc_mceusb2\/lirc_mceusb2.c\n+++ drivers\/lirc_mceusb2\/lirc_mceusb2.c\n@@ -61,7 +61,7 @@\n #include \"drivers\/kcompat.h\"\n #include \"drivers\/lirc_dev\/lirc_dev.h\"\n \n-#define DRIVER_VERSION\t\"$Revision: 1.84 $\"\n+#define DRIVER_VERSION\t\"$Revision: 1.85 $\"\n #define DRIVER_AUTHOR\t\"Daniel Melander <lirc@rajidae.se>, \" \\\n \t\t\t\"Martin Blatter <martin_a_blatter@yahoo.com>\"\n #define DRIVER_DESC\t\"Philips eHome USB IR Transceiver and Microsoft \" \\\n@@ -198,6 +198,8 @@\n \t{ USB_DEVICE(VENDOR_WISTRON, 0x0002) },\n \t\/* Compro K100 *\/\n \t{ USB_DEVICE(VENDOR_COMPRO, 0x3020) },\n+\t\/* Compro K100 v2 *\/\n+\t{ USB_DEVICE(VENDOR_COMPRO, 0x3082) },\n \t\/* Northstar Systems eHome Infrared Transceiver *\/\n \t{ USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) },\n \t\/* Terminating entry *\/\n"} {"commit":"0359b5fa9eff3c07e2c9a8993a471816f42990b7","subject":"[media] dvb_usb_v2: add macro for filling usb_device_id table entry","message":"[media] dvb_usb_v2: add macro for filling usb_device_id table entry\n\nSigned-off-by: Antti Palosaari <293134fe763ce2d9d8609280ea107c73cbd2eb86@iki.fi>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/dvb_usb.h\n+++ drivers\/media\/dvb\/dvb-usb\/dvb_usb.h\n@@ -65,6 +65,16 @@\n \tconst char *rc_map;\n \tconst struct dvb_usb_device_properties *props;\n };\n+\n+#define DVB_USB_DEVICE(vend, prod, props_, name_, rc) \\\n+\t.match_flags = USB_DEVICE_ID_MATCH_DEVICE, \\\n+\t.idVendor = (vend), \\\n+\t.idProduct = (prod), \\\n+\t.driver_info = (kernel_ulong_t) &((struct dvb_usb_driver_info) { \\\n+\t\t.props = (props_), \\\n+\t\t.name = (name_), \\\n+\t\t.rc_map = (rc), \\\n+\t})\n \n struct dvb_usb_device;\n struct dvb_usb_adapter;\n"} {"commit":"4ab9b256b5908afbdc030a8c3184ce243f5aca39","subject":"V4L\/DVB (11092): cx18: Optimize processing of VBI buffers from the capture unit","message":"V4L\/DVB (11092): cx18: Optimize processing of VBI buffers from the capture unit\n\nRemoved some unnecessary memcpy()'s by reworking the compress_*_vbi_buf()\nfunctions.\n\nSigned-off-by: Andy Walls <87098e5036de39f00cafe8d8f6114135f55ad2e7@radix.net>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/cx18\/cx18-vbi.c\n+++ drivers\/media\/video\/cx18\/cx18-vbi.c\n@@ -105,54 +105,72 @@\n \n \/* Compress raw VBI format, removes leading SAV codes and surplus space\n after the frame. Returns new compressed size. *\/\n-static u32 compress_raw_buf(struct cx18 *cx, u8 *buf, u32 size)\n+static u32 compress_raw_buf(struct cx18 *cx, u8 *buf, u32 size, u32 hdr_size)\n {\n \tu32 line_size = vbi_active_samples;\n \tu32 lines = cx->vbi.count * 2;\n-\tu8 sav1 = raw_vbi_sav_rp[0];\n-\tu8 sav2 = raw_vbi_sav_rp[1];\n \tu8 *q = buf;\n \tu8 *p;\n \tint i;\n \n+\t\/* Skip the header *\/\n+\tbuf += hdr_size;\n+\n \tfor (i = 0; i < lines; i++) {\n \t\tp = buf + i * line_size;\n \n \t\t\/* Look for SAV code *\/\n \t\tif (p[0] != 0xff || p[1] || p[2] ||\n-\t\t (p[3] != sav1 && p[3] != sav2))\n+\t\t (p[3] != raw_vbi_sav_rp[0] &&\n+\t\t p[3] != raw_vbi_sav_rp[1]))\n \t\t\tbreak;\n-\t\tmemcpy(q, p + 4, line_size - 4);\n-\t\tq += line_size - 4;\n+\t\tif (i == lines - 1) {\n+\t\t\t\/* last line is hdr_size bytes short - extrapolate it *\/\n+\t\t\tmemcpy(q, p + 4, line_size - 4 - hdr_size);\n+\t\t\tq += line_size - 4 - hdr_size;\n+\t\t\tp += line_size - hdr_size - 1;\n+\t\t\tmemset(q, (int) *p, hdr_size);\n+\t\t} else {\n+\t\t\tmemcpy(q, p + 4, line_size - 4);\n+\t\t\tq += line_size - 4;\n+\t\t}\n \t}\n \treturn lines * (line_size - 4);\n }\n \n-\n-\/* Compressed VBI format, all found sliced blocks put next to one another\n- Returns new compressed size *\/\n-static u32 compress_sliced_buf(struct cx18 *cx, u32 line, u8 *buf,\n-\t\t\t u32 size, u8 eav)\n+static u32 compress_sliced_buf(struct cx18 *cx, u8 *buf, u32 size,\n+\t\t\t const u32 hdr_size)\n {\n \tstruct v4l2_decode_vbi_line vbi;\n \tint i;\n+\tu32 line = 0;\n \tu32 line_size = cx->is_60hz ? vbi_hblank_samples_60Hz\n \t\t\t\t : vbi_hblank_samples_50Hz;\n \n \t\/* find the first valid line *\/\n-\tfor (i = 0; i < size; i++, buf++) {\n-\t\tif (buf[0] == 0xff && !buf[1] && !buf[2] && buf[3] == eav)\n+\tfor (i = hdr_size, buf += hdr_size; i < size; i++, buf++) {\n+\t\tif (buf[0] == 0xff && !buf[1] && !buf[2] &&\n+\t\t (buf[3] == sliced_vbi_eav_rp[0] ||\n+\t\t buf[3] == sliced_vbi_eav_rp[1]))\n \t\t\tbreak;\n \t}\n \n-\tsize -= i;\n+\t\/*\n+\t * The last line is short by hdr_size bytes, but for the remaining\n+\t * checks against size, we pretend that it is not, by counting the\n+\t * header bytes we knowingly skipped\n+\t *\/\n+\tsize -= (i - hdr_size);\n \tif (size < line_size)\n \t\treturn line;\n+\n \tfor (i = 0; i < size \/ line_size; i++) {\n \t\tu8 *p = buf + i * line_size;\n \n \t\t\/* Look for EAV code *\/\n-\t\tif (p[0] != 0xff || p[1] || p[2] || p[3] != eav)\n+\t\tif (p[0] != 0xff || p[1] || p[2] ||\n+\t\t (p[3] != sliced_vbi_eav_rp[0] &&\n+\t\t p[3] != sliced_vbi_eav_rp[1]))\n \t\t\tcontinue;\n \t\tvbi.p = p + 4;\n \t\tv4l2_subdev_call(cx->sd_av, video, decode_vbi_line, &vbi);\n@@ -170,8 +188,17 @@\n void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf,\n \t\t\t int streamtype)\n {\n+\t\/*\n+\t * The CX23418 provides a 12 byte header in its raw VBI buffers to us:\n+\t * 0x3fffffff [4 bytes of something] [4 byte presentation time stamp]\n+\t *\/\n+\tstruct vbi_data_hdr {\n+\t\t__be32 magic;\n+\t\t__be32 unknown;\n+\t\t__be32 pts;\n+\t} *hdr = (struct vbi_data_hdr *) buf->buf;\n+\n \tu8 *p = (u8 *) buf->buf;\n-\t__be32 *q = (__be32 *) buf->buf;\n \tu32 size = buf->bytesused;\n \tu32 pts;\n \tint lines;\n@@ -182,32 +209,15 @@\n \t\/*\n \t * The CX23418 sends us data that is 32 bit little-endian swapped,\n \t * but we want the raw VBI bytes in the order they were in the raster\n-\t * line. This has a side effect of making the 12 byte header big endian\n+\t * line. This has a side effect of making the header big endian\n \t *\/\n \tcx18_buf_swap(buf);\n \n-\t\/*\n-\t * The CX23418 provides a 12 byte header in it's raw VBI buffers to us:\n-\t * 0x3fffffff [4 bytes of something] [4 byte presentation time stamp?]\n-\t *\/\n-\n \t\/* Raw VBI data *\/\n \tif (cx18_raw_vbi(cx)) {\n-\t\tu8 type;\n-\n-\t\t\/*\n-\t\t * We've set up to get a frame's worth of VBI data at a time.\n-\t\t * Skip 12 bytes of header prefixing the first field.\n-\t\t *\/\n-\t\tsize -= 12;\n-\t\tmemcpy(p, &buf->buf[12], size);\n-\t\ttype = p[3];\n-\n-\t\t\/* Extrapolate the last 12 bytes of the frame's last line *\/\n-\t\tmemset(&p[size], (int) p[size - 1], 12);\n-\t\tsize += 12;\n-\n-\t\tsize = buf->bytesused = compress_raw_buf(cx, p, size);\n+\n+\t\tsize = buf->bytesused =\n+\t\t compress_raw_buf(cx, p, size, sizeof(struct vbi_data_hdr));\n \n \t\t\/*\n \t\t * Hack needed for compatibility with old VBI software.\n@@ -221,26 +231,11 @@\n \n \t\/* Sliced VBI data with data insertion *\/\n \n-\tpts = (be32_to_cpu(q[0]) == 0x3fffffff) ? be32_to_cpu(q[2]) : 0;\n-\n-\t\/*\n-\t * For calls to compress_sliced_buf(), ensure there are an integral\n-\t * number of lines by shifting the real data up over the 12 bytes header\n-\t * that got stuffed in.\n-\t * FIXME - there's a smarter way to do this with pointers, but for some\n-\t * reason I can't get it to work correctly right now.\n-\t *\/\n-\tmemcpy(p, &buf->buf[12], size-12);\n-\n-\t\/* first field *\/\n-\tlines = compress_sliced_buf(cx, 0, p, size \/ 2, sliced_vbi_eav_rp[0]);\n-\t\/*\n-\t * second field\n-\t * In case the second half does not always begin at the exact address,\n-\t * start a bit earlier (hence 32).\n-\t *\/\n-\tlines = compress_sliced_buf(cx, lines, p + size \/ 2 - 32,\n-\t\t\tsize \/ 2 + 32, sliced_vbi_eav_rp[1]);\n+\tpts = (be32_to_cpu(hdr->magic) == 0x3fffffff) ? be32_to_cpu(hdr->pts)\n+\t\t\t\t\t\t : 0;\n+\n+\tlines = compress_sliced_buf(cx, p, size, sizeof(struct vbi_data_hdr));\n+\n \t\/* always return at least one empty line *\/\n \tif (lines == 0) {\n \t\tcx->vbi.sliced_data[0].id = 0;\n"} {"commit":"6b1e56763b50f169d8446c43df6adb70f69552db","subject":"V4L\/DVB (6742): ivtv: fix incorrect debug message","message":"V4L\/DVB (6742): ivtv: fix incorrect debug message\n\nSigned-off-by: Hans Verkuil <f625be9dbdcbbd12a043857af148e8fb895d9a1d@xs4all.nl>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/ivtv\/ivtv-irq.c\n+++ drivers\/media\/video\/ivtv\/ivtv-irq.c\n@@ -436,7 +436,7 @@\n \t\ts_vbi->sg_pending_size = 0;\n \t\ts_vbi->dma_xfer_cnt++;\n \t\tset_bit(IVTV_F_S_DMA_HAS_VBI, &s->s_flags);\n-\t\tIVTV_DEBUG_HI_DMA(\"include DMA for %s\\n\", s->name);\n+\t\tIVTV_DEBUG_HI_DMA(\"include DMA for %s\\n\", s_vbi->name);\n \t}\n \n \ts->dma_xfer_cnt++;\n"} {"commit":"4938c88c922fad23f0a9f404eeda0207a819e4df","subject":"mtd: maps: Blackfin async: fix memory leaks in probe\/remove funcs","message":"mtd: maps: Blackfin async: fix memory leaks in probe\/remove funcs\n\nSigned-off-by: Mike Frysinger <8f3f75c74bd5184edcfa6534cab3c13a00a2f794@gentoo.org>\nSigned-off-by: Bryan Wu <956b36c0f472d2edb239225c10f7e4411d1efbb9@kernel.org>\nSigned-off-by: Artem Bityutskiy <19b5733dcea388885746d36043d3568bba5b4df7@nokia.com>\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mtd\/maps\/bfin-async-flash.c\n+++ drivers\/mtd\/maps\/bfin-async-flash.c\n@@ -40,6 +40,9 @@\n \tuint32_t flash_ambctl0, flash_ambctl1;\n \tuint32_t save_ambctl0, save_ambctl1;\n \tunsigned long irq_flags;\n+#ifdef CONFIG_MTD_PARTITIONS\n+\tstruct mtd_partition *parts;\n+#endif\n };\n \n static void switch_to_flash(struct async_state *state)\n@@ -170,6 +173,7 @@\n \tif (ret > 0) {\n \t\tpr_devinit(KERN_NOTICE DRIVER_NAME \": Using commandline partition definition\\n\");\n \t\tadd_mtd_partitions(state->mtd, pdata->parts, ret);\n+\t\tstate->parts = pdata->parts;\n \n \t} else if (pdata->nr_parts) {\n \t\tpr_devinit(KERN_NOTICE DRIVER_NAME \": Using board partition definition\\n\");\n@@ -193,6 +197,7 @@\n \tgpio_free(state->enet_flash_pin);\n #ifdef CONFIG_MTD_PARTITIONS\n \tdel_mtd_partitions(state->mtd);\n+\tkfree(state->parts);\n #endif\n \tmap_destroy(state->mtd);\n \tkfree(state);\n"} {"commit":"c092b43906098a6879d0fa9f74e5141516b9b856","subject":"mtd: mtd_nandecctest: support injecting bit error for ecc code","message":"mtd: mtd_nandecctest: support injecting bit error for ecc code\n\nCurrently inject_single_bit_error() is used to inject single bit error\ninto randomly selected bit position of the 256 or 512 bytes data block.\n\nLater change will add tests which inject bit errors into the ecc code.\nUnfortunately, inject_single_bit_error() doesn't work for the ecc code\nwhich is not a multiple of sizeof(unsigned long).\n\nBecause bit fliping at random position is done by __change_bit().\nFor example, flipping bit position 0 by __change_bit(0, addr) modifies\n3rd byte (32bit) or 7th byte (64bit) on big-endian systems.\n\nUsing little-endian version of bitops can fix this issue. But\nlittle-endian version of __change_bit is not yet available.\nSo this defines __change_bit_le() locally in a similar fashion to\nasm-generic\/bitops\/le.h and use it.\n\nSigned-off-by: Akinobu Mita <3807cf899f217da549814bf6c330d3b6e6819ccf@gmail.com>\nSigned-off-by: Artem Bityutskiy <2f96f8cd3e2780a209d0ab27d1b44624d0019d3f@linux.intel.com>\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mtd\/tests\/mtd_nandecctest.c\n+++ drivers\/mtd\/tests\/mtd_nandecctest.c\n@@ -9,11 +9,25 @@\n \n #if defined(CONFIG_MTD_NAND) || defined(CONFIG_MTD_NAND_MODULE)\n \n+\/*\n+ * The reason for this __change_bit_le() instead of __change_bit() is to inject\n+ * bit error properly within the region which is not a multiple of\n+ * sizeof(unsigned long) on big-endian systems\n+ *\/\n+#ifdef __LITTLE_ENDIAN\n+#define __change_bit_le(nr, addr) __change_bit(nr, addr)\n+#elif defined(__BIG_ENDIAN)\n+#define __change_bit_le(nr, addr) \\\n+\t\t__change_bit((nr) ^ ((BITS_PER_LONG - 1) & ~0x7), addr)\n+#else\n+#error \"Unknown byte order\"\n+#endif\n+\n static void inject_single_bit_error(void *data, size_t size)\n {\n-\tunsigned long offset = random32() % (size * BITS_PER_BYTE);\n+\tunsigned int offset = random32() % (size * BITS_PER_BYTE);\n \n-\t__change_bit(offset, data);\n+\t__change_bit_le(offset, data);\n }\n \n static void dump_data_ecc(void *error_data, void *error_ecc, void *correct_data,\n"} {"commit":"ec2a5466b3ce680c92e8e05617b020fd825854b9","subject":"sky2: add bql support","message":"sky2: add bql support\n\nThis adds support for byte queue limits and aggregates statistics\nupdate (suggestion from Eric).\n\nSigned-off-by: Stephen Hemminger <a072e933f45880fe04500ea083d5c7f6e81a06f0@vyatta.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@drr.davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/marvell\/sky2.c\n+++ drivers\/net\/ethernet\/marvell\/sky2.c\n@@ -1110,6 +1110,7 @@\n \tsky2->tx_prod = sky2->tx_cons = 0;\n \tsky2->tx_tcpsum = 0;\n \tsky2->tx_last_mss = 0;\n+\tnetdev_reset_queue(sky2->netdev);\n \n \tle = get_tx_le(sky2, &sky2->tx_prod);\n \tle->addr = 0;\n@@ -1971,6 +1972,7 @@\n \tif (tx_avail(sky2) <= MAX_SKB_TX_LE)\n \t\tnetif_stop_queue(dev);\n \n+\tnetdev_sent_queue(dev, skb->len);\n \tsky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod);\n \n \treturn NETDEV_TX_OK;\n@@ -2002,7 +2004,8 @@\n static void sky2_tx_complete(struct sky2_port *sky2, u16 done)\n {\n \tstruct net_device *dev = sky2->netdev;\n-\tunsigned idx;\n+\tu16 idx;\n+\tunsigned int bytes_compl = 0, pkts_compl = 0;\n \n \tBUG_ON(done >= sky2->tx_ring_size);\n \n@@ -2017,10 +2020,8 @@\n \t\t\tnetif_printk(sky2, tx_done, KERN_DEBUG, dev,\n \t\t\t\t \"tx done %u\\n\", idx);\n \n-\t\t\tu64_stats_update_begin(&sky2->tx_stats.syncp);\n-\t\t\t++sky2->tx_stats.packets;\n-\t\t\tsky2->tx_stats.bytes += skb->len;\n-\t\t\tu64_stats_update_end(&sky2->tx_stats.syncp);\n+\t\t\tpkts_compl++;\n+\t\t\tbytes_compl += skb->len;\n \n \t\t\tre->skb = NULL;\n \t\t\tdev_kfree_skb_any(skb);\n@@ -2031,6 +2032,13 @@\n \n \tsky2->tx_cons = idx;\n \tsmp_mb();\n+\n+\tnetdev_completed_queue(dev, pkts_compl, bytes_compl);\n+\n+\tu64_stats_update_begin(&sky2->tx_stats.syncp);\n+\tsky2->tx_stats.packets += pkts_compl;\n+\tsky2->tx_stats.bytes += bytes_compl;\n+\tu64_stats_update_end(&sky2->tx_stats.syncp);\n }\n \n static void sky2_tx_reset(struct sky2_hw *hw, unsigned port)\n"} {"commit":"807dd827b32677bd06266b31a71efcee50c85cd1","subject":"net\/failsafe: advertise supported RSS functions","message":"net\/failsafe: advertise supported RSS functions\n\nAdvertise failsafe supported RSS functions as part of dev_infos_get\ncallback. Set failsafe default RSS hash functions to be:\nETH_RSS_IP, ETH_RSS_UDP, and ETH_RSS_TCP.\nThe result of failsafe RSS hash functions is the logical AND of the\nRSS hash functions among all failsafe sub_devices and failsafe own\ndefaults.\n\nPrevious to this commit RSS support was reported as none. Since the\nintroduction of [1] it is required that all RSS configurations be\nverified.\n\n[1] commit 8863a1fbfc66 (\"ethdev: add supported hash function check\")\n\nSigned-off-by: Ophir Munk <da2dc1f9ae64c8bd405ef0cf049405a44490d24e@mellanox.com>\nAcked-by: Gaetan Rivet <a6b9f1aecd7707f01344f211143eb3bcaeb0c5c3@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/failsafe\/failsafe_ops.c\n+++ drivers\/net\/failsafe\/failsafe_ops.c\n@@ -83,7 +83,10 @@\n \t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n \t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n \t\tDEV_TX_OFFLOAD_TCP_TSO,\n-\t.flow_type_rss_offloads = 0x0,\n+\t.flow_type_rss_offloads =\n+\t\t\tETH_RSS_IP |\n+\t\t\tETH_RSS_UDP |\n+\t\t\tETH_RSS_TCP,\n };\n \n static int\n@@ -805,26 +808,29 @@\n \t} else {\n \t\tuint64_t rx_offload_capa;\n \t\tuint64_t rxq_offload_capa;\n+\t\tuint64_t rss_hf_offload_capa;\n \n \t\trx_offload_capa = default_infos.rx_offload_capa;\n \t\trxq_offload_capa = default_infos.rx_queue_offload_capa;\n+\t\trss_hf_offload_capa = default_infos.flow_type_rss_offloads;\n \t\tFOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {\n \t\t\trte_eth_dev_info_get(PORT_ID(sdev),\n \t\t\t\t\t&PRIV(dev)->infos);\n \t\t\trx_offload_capa &= PRIV(dev)->infos.rx_offload_capa;\n \t\t\trxq_offload_capa &=\n \t\t\t\t\tPRIV(dev)->infos.rx_queue_offload_capa;\n+\t\t\trss_hf_offload_capa &=\n+\t\t\t\t\tPRIV(dev)->infos.flow_type_rss_offloads;\n \t\t}\n \t\tsdev = TX_SUBDEV(dev);\n \t\trte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);\n \t\tPRIV(dev)->infos.rx_offload_capa = rx_offload_capa;\n \t\tPRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;\n+\t\tPRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;\n \t\tPRIV(dev)->infos.tx_offload_capa &=\n \t\t\t\t\tdefault_infos.tx_offload_capa;\n \t\tPRIV(dev)->infos.tx_queue_offload_capa &=\n \t\t\t\t\tdefault_infos.tx_queue_offload_capa;\n-\t\tPRIV(dev)->infos.flow_type_rss_offloads &=\n-\t\t\t\t\tdefault_infos.flow_type_rss_offloads;\n \t}\n \trte_memcpy(infos, &PRIV(dev)->infos, sizeof(*infos));\n }\n"} {"commit":"71e761862774b1816a1ddcc67b88af978017bf15","subject":"net\/thunderx: add secondary queue set support in start","message":"net\/thunderx: add secondary queue set support in start\n\nSigned-off-by: Maciej Czekaj <8d42daaa8d68ad54ca06613337e5c27633935527@caviumnetworks.com>\nSigned-off-by: Kamil Rytarowski <c5f25be57ec63af57c261bfcaad64f8e4a79258b@caviumnetworks.com>\nSigned-off-by: Zyta Szpak <e7f7ad3646dd4fe5e92a80fc64776bf64859c785@semihalf.com>\nSigned-off-by: Slawomir Rosek <9eb5b0a7dcda67bfc31471595b7cdd6ce51b0869@semihalf.com>\nSigned-off-by: Radoslaw Biernacki <bade5d26b78d94e5efb27f8cf03d43b298f69915@semihalf.com>\nSigned-off-by: Jerin Jacob <5bca7d2a432bc0f5422b70b2701a4e4fa32edd00@caviumnetworks.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/thunderx\/nicvf_ethdev.c\n+++ drivers\/net\/thunderx\/nicvf_ethdev.c\n@@ -653,27 +653,33 @@\n }\n \n static inline int\n-nicvf_start_tx_queue(struct rte_eth_dev *dev, uint16_t qidx)\n+nicvf_vf_start_tx_queue(struct rte_eth_dev *dev, struct nicvf *nic,\n+\t\t\tuint16_t qidx)\n {\n \tstruct nicvf_txq *txq;\n \tint ret;\n \n-\tif (dev->data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)\n+\tassert(qidx < MAX_SND_QUEUES_PER_QS);\n+\n+\tif (dev->data->tx_queue_state[nicvf_netdev_qidx(nic, qidx)] ==\n+\t\tRTE_ETH_QUEUE_STATE_STARTED)\n \t\treturn 0;\n \n-\ttxq = dev->data->tx_queues[qidx];\n+\ttxq = dev->data->tx_queues[nicvf_netdev_qidx(nic, qidx)];\n \ttxq->pool = NULL;\n-\tret = nicvf_qset_sq_config(nicvf_pmd_priv(dev), qidx, txq);\n+\tret = nicvf_qset_sq_config(nic, qidx, txq);\n \tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to configure sq %d %d\", qidx, ret);\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure sq VF%d %d %d\",\n+\t\t\t nic->vf_id, qidx, ret);\n \t\tgoto config_sq_error;\n \t}\n \n-\tdev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;\n+\tdev->data->tx_queue_state[nicvf_netdev_qidx(nic, qidx)] =\n+\t\tRTE_ETH_QUEUE_STATE_STARTED;\n \treturn ret;\n \n config_sq_error:\n-\tnicvf_qset_sq_reclaim(nicvf_pmd_priv(dev), qidx);\n+\tnicvf_qset_sq_reclaim(nic, qidx);\n \treturn ret;\n }\n \n@@ -977,31 +983,37 @@\n }\n \n static inline int\n-nicvf_start_rx_queue(struct rte_eth_dev *dev, uint16_t qidx)\n-{\n-\tstruct nicvf *nic = nicvf_pmd_priv(dev);\n+nicvf_vf_start_rx_queue(struct rte_eth_dev *dev, struct nicvf *nic,\n+\t\t\tuint16_t qidx)\n+{\n \tstruct nicvf_rxq *rxq;\n \tint ret;\n \n-\tif (dev->data->rx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)\n+\tassert(qidx < MAX_RCV_QUEUES_PER_QS);\n+\n+\tif (dev->data->rx_queue_state[nicvf_netdev_qidx(nic, qidx)] ==\n+\t\tRTE_ETH_QUEUE_STATE_STARTED)\n \t\treturn 0;\n \n \t\/* Update rbdr pointer to all rxq *\/\n-\trxq = dev->data->rx_queues[qidx];\n+\trxq = dev->data->rx_queues[nicvf_netdev_qidx(nic, qidx)];\n \trxq->shared_rbdr = nic->rbdr;\n \n \tret = nicvf_qset_rq_config(nic, qidx, rxq);\n \tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to configure rq %d %d\", qidx, ret);\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure rq VF%d %d %d\",\n+\t\t\t nic->vf_id, qidx, ret);\n \t\tgoto config_rq_error;\n \t}\n \tret = nicvf_qset_cq_config(nic, qidx, rxq);\n \tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to configure cq %d %d\", qidx, ret);\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure cq VF%d %d %d\",\n+\t\t\t nic->vf_id, qidx, ret);\n \t\tgoto config_cq_error;\n \t}\n \n-\tdev->data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;\n+\tdev->data->rx_queue_state[nicvf_netdev_qidx(nic, qidx)] =\n+\t\tRTE_ETH_QUEUE_STATE_STARTED;\n \treturn 0;\n \n config_cq_error:\n@@ -1054,9 +1066,15 @@\n static int\n nicvf_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t qidx)\n {\n+\tstruct nicvf *nic = nicvf_pmd_priv(dev);\n \tint ret;\n \n-\tret = nicvf_start_rx_queue(dev, qidx);\n+\tif (qidx >= MAX_RCV_QUEUES_PER_QS)\n+\t\tnic = nic->snicvf[(qidx \/ MAX_RCV_QUEUES_PER_QS - 1)];\n+\n+\tqidx = qidx % MAX_RCV_QUEUES_PER_QS;\n+\n+\tret = nicvf_vf_start_rx_queue(dev, nic, qidx);\n \tif (ret)\n \t\treturn ret;\n \n@@ -1087,7 +1105,14 @@\n static int\n nicvf_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx)\n {\n-\treturn nicvf_start_tx_queue(dev, qidx);\n+\tstruct nicvf *nic = nicvf_pmd_priv(dev);\n+\n+\tif (qidx >= MAX_SND_QUEUES_PER_QS)\n+\t\tnic = nic->snicvf[(qidx \/ MAX_SND_QUEUES_PER_QS - 1)];\n+\n+\tqidx = qidx % MAX_SND_QUEUES_PER_QS;\n+\n+\treturn nicvf_vf_start_tx_queue(dev, nic, qidx);\n }\n \n static int\n@@ -1274,25 +1299,25 @@\n }\n \n static int\n-nicvf_dev_start(struct rte_eth_dev *dev)\n+nicvf_vf_start(struct rte_eth_dev *dev, struct nicvf *nic, uint32_t rbdrsz)\n {\n \tint ret;\n \tuint16_t qidx;\n-\tuint32_t buffsz = 0, rbdrsz = 0;\n \tuint32_t total_rxq_desc, nb_rbdr_desc, exp_buffs;\n \tuint64_t mbuf_phys_off = 0;\n \tstruct nicvf_rxq *rxq;\n-\tstruct rte_pktmbuf_pool_private *mbp_priv;\n \tstruct rte_mbuf *mbuf;\n-\tstruct nicvf *nic = nicvf_pmd_priv(dev);\n-\tstruct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;\n-\tuint16_t mtu;\n+\tuint16_t rx_start, rx_end;\n+\tuint16_t tx_start, tx_end;\n \n \tPMD_INIT_FUNC_TRACE();\n \n \t\/* Userspace process exited without proper shutdown in last run *\/\n \tif (nicvf_qset_rbdr_active(nic, 0))\n-\t\tnicvf_dev_stop(dev);\n+\t\tnicvf_vf_stop(dev, nic, false);\n+\n+\t\/* Get queue ranges for this VF *\/\n+\tnicvf_rx_range(dev, nic, &rx_start, &rx_end);\n \n \t\/*\n \t * Thunderx nicvf PMD can support more than one pool per port only when\n@@ -1307,6 +1332,176 @@\n \t *\n \t *\/\n \n+\t\/* Validate mempool attributes *\/\n+\tfor (qidx = rx_start; qidx <= rx_end; qidx++) {\n+\t\trxq = dev->data->rx_queues[qidx];\n+\t\trxq->mbuf_phys_off = nicvf_mempool_phy_offset(rxq->pool);\n+\t\tmbuf = rte_pktmbuf_alloc(rxq->pool);\n+\t\tif (mbuf == NULL) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed allocate mbuf VF%d qid=%d \"\n+\t\t\t\t \"pool=%s\",\n+\t\t\t\t nic->vf_id, qidx, rxq->pool->name);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t\trxq->mbuf_phys_off -= nicvf_mbuff_meta_length(mbuf);\n+\t\trxq->mbuf_phys_off -= RTE_PKTMBUF_HEADROOM;\n+\t\trte_pktmbuf_free(mbuf);\n+\n+\t\tif (mbuf_phys_off == 0)\n+\t\t\tmbuf_phys_off = rxq->mbuf_phys_off;\n+\t\tif (mbuf_phys_off != rxq->mbuf_phys_off) {\n+\t\t\tPMD_INIT_LOG(ERR, \"pool params not same,%s VF%d %\"\n+\t\t\t\t PRIx64, rxq->pool->name, nic->vf_id,\n+\t\t\t\t mbuf_phys_off);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\t\/* Check the level of buffers in the pool *\/\n+\ttotal_rxq_desc = 0;\n+\tfor (qidx = rx_start; qidx <= rx_end; qidx++) {\n+\t\trxq = dev->data->rx_queues[qidx];\n+\t\t\/* Count total numbers of rxq descs *\/\n+\t\ttotal_rxq_desc += rxq->qlen_mask + 1;\n+\t\texp_buffs = RTE_MEMPOOL_CACHE_MAX_SIZE + rxq->rx_free_thresh;\n+\t\texp_buffs *= dev->data->nb_rx_queues;\n+\t\tif (rte_mempool_avail_count(rxq->pool) < exp_buffs) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Buff shortage in pool=%s (%d\/%d)\",\n+\t\t\t\t rxq->pool->name,\n+\t\t\t\t rte_mempool_avail_count(rxq->pool),\n+\t\t\t\t exp_buffs);\n+\t\t\treturn -ENOENT;\n+\t\t}\n+\t}\n+\n+\t\/* Check RBDR desc overflow *\/\n+\tret = nicvf_qsize_rbdr_roundup(total_rxq_desc);\n+\tif (ret == 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Reached RBDR desc limit, reduce nr desc \"\n+\t\t\t \"VF%d\", nic->vf_id);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\t\/* Enable qset *\/\n+\tret = nicvf_qset_config(nic);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to enable qset %d VF%d\", ret,\n+\t\t\t nic->vf_id);\n+\t\treturn ret;\n+\t}\n+\n+\t\/* Allocate RBDR and RBDR ring desc *\/\n+\tnb_rbdr_desc = nicvf_qsize_rbdr_roundup(total_rxq_desc);\n+\tret = nicvf_qset_rbdr_alloc(dev, nic, nb_rbdr_desc, rbdrsz);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to allocate memory for rbdr alloc \"\n+\t\t\t \"VF%d\", nic->vf_id);\n+\t\tgoto qset_reclaim;\n+\t}\n+\n+\t\/* Enable and configure RBDR registers *\/\n+\tret = nicvf_qset_rbdr_config(nic, 0);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure rbdr %d VF%d\", ret,\n+\t\t\t nic->vf_id);\n+\t\tgoto qset_rbdr_free;\n+\t}\n+\n+\t\/* Fill rte_mempool buffers in RBDR pool and precharge it *\/\n+\tret = nicvf_qset_rbdr_precharge(dev, nic, 0, rbdr_rte_mempool_get,\n+\t\t\t\t\ttotal_rxq_desc);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to fill rbdr %d VF%d\", ret,\n+\t\t\t nic->vf_id);\n+\t\tgoto qset_rbdr_reclaim;\n+\t}\n+\n+\tPMD_DRV_LOG(INFO, \"Filled %d out of %d entries in RBDR VF%d\",\n+\t\t nic->rbdr->tail, nb_rbdr_desc, nic->vf_id);\n+\n+\t\/* Configure VLAN Strip *\/\n+\tnicvf_vlan_hw_strip(nic, dev->data->dev_conf.rxmode.hw_vlan_strip);\n+\n+\t\/* Get queue ranges for this VF *\/\n+\tnicvf_tx_range(dev, nic, &tx_start, &tx_end);\n+\n+\t\/* Configure TX queues *\/\n+\tfor (qidx = tx_start; qidx <= tx_end; qidx++) {\n+\t\tret = nicvf_vf_start_tx_queue(dev, nic,\n+\t\t\tqidx % MAX_SND_QUEUES_PER_QS);\n+\t\tif (ret)\n+\t\t\tgoto start_txq_error;\n+\t}\n+\n+\t\/* Configure RX queues *\/\n+\tfor (qidx = rx_start; qidx <= rx_end; qidx++) {\n+\t\tret = nicvf_vf_start_rx_queue(dev, nic,\n+\t\t\tqidx % MAX_RCV_QUEUES_PER_QS);\n+\t\tif (ret)\n+\t\t\tgoto start_rxq_error;\n+\t}\n+\n+\tif (!nic->sqs_mode) {\n+\t\t\/* Configure CPI algorithm *\/\n+\t\tret = nicvf_configure_cpi(dev);\n+\t\tif (ret)\n+\t\t\tgoto start_txq_error;\n+\n+\t\tret = nicvf_mbox_get_rss_size(nic);\n+\t\tif (ret) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to get rss table size\");\n+\t\t\tgoto qset_rss_error;\n+\t\t}\n+\n+\t\t\/* Configure RSS *\/\n+\t\tret = nicvf_configure_rss(dev);\n+\t\tif (ret)\n+\t\t\tgoto qset_rss_error;\n+\t}\n+\n+\t\/* Done; Let PF make the BGX's RX and TX switches to ON position *\/\n+\tnicvf_mbox_cfg_done(nic);\n+\treturn 0;\n+\n+qset_rss_error:\n+\tnicvf_rss_term(nic);\n+start_rxq_error:\n+\tfor (qidx = rx_start; qidx <= rx_end; qidx++)\n+\t\tnicvf_vf_stop_rx_queue(dev, nic, qidx % MAX_RCV_QUEUES_PER_QS);\n+start_txq_error:\n+\tfor (qidx = tx_start; qidx <= tx_end; qidx++)\n+\t\tnicvf_vf_stop_tx_queue(dev, nic, qidx % MAX_SND_QUEUES_PER_QS);\n+qset_rbdr_reclaim:\n+\tnicvf_qset_rbdr_reclaim(nic, 0);\n+\tnicvf_rbdr_release_mbufs(dev, nic);\n+qset_rbdr_free:\n+\tif (nic->rbdr) {\n+\t\trte_free(nic->rbdr);\n+\t\tnic->rbdr = NULL;\n+\t}\n+qset_reclaim:\n+\tnicvf_qset_reclaim(nic);\n+\treturn ret;\n+}\n+\n+static int\n+nicvf_dev_start(struct rte_eth_dev *dev)\n+{\n+\tuint16_t qidx;\n+\tint ret;\n+\tsize_t i;\n+\tstruct nicvf *nic = nicvf_pmd_priv(dev);\n+\tstruct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;\n+\tuint16_t mtu;\n+\tuint32_t buffsz = 0, rbdrsz = 0;\n+\tstruct rte_pktmbuf_pool_private *mbp_priv;\n+\tstruct nicvf_rxq *rxq;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t\/* This function must be called for a primary device *\/\n+\tassert_primary(nic);\n+\n \t\/* Validate RBDR buff size *\/\n \tfor (qidx = 0; qidx < dev->data->nb_rx_queues; qidx++) {\n \t\trxq = dev->data->rx_queues[qidx];\n@@ -1319,131 +1514,24 @@\n \t\tif (rbdrsz == 0)\n \t\t\trbdrsz = buffsz;\n \t\tif (rbdrsz != buffsz) {\n-\t\t\tPMD_INIT_LOG(ERR, \"buffsz not same, qid=%d (%d\/%d)\",\n+\t\t\tPMD_INIT_LOG(ERR, \"buffsz not same, qidx=%d (%d\/%d)\",\n \t\t\t\t qidx, rbdrsz, buffsz);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n-\n-\t\/* Validate mempool attributes *\/\n-\tfor (qidx = 0; qidx < dev->data->nb_rx_queues; qidx++) {\n-\t\trxq = dev->data->rx_queues[qidx];\n-\t\trxq->mbuf_phys_off = nicvf_mempool_phy_offset(rxq->pool);\n-\t\tmbuf = rte_pktmbuf_alloc(rxq->pool);\n-\t\tif (mbuf == NULL) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Failed allocate mbuf qid=%d pool=%s\",\n-\t\t\t\t qidx, rxq->pool->name);\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\t\trxq->mbuf_phys_off -= nicvf_mbuff_meta_length(mbuf);\n-\t\trxq->mbuf_phys_off -= RTE_PKTMBUF_HEADROOM;\n-\t\trte_pktmbuf_free(mbuf);\n-\n-\t\tif (mbuf_phys_off == 0)\n-\t\t\tmbuf_phys_off = rxq->mbuf_phys_off;\n-\t\tif (mbuf_phys_off != rxq->mbuf_phys_off) {\n-\t\t\tPMD_INIT_LOG(ERR, \"pool params not same,%s %\" PRIx64,\n-\t\t\t\t rxq->pool->name, mbuf_phys_off);\n-\t\t\treturn -EINVAL;\n-\t\t}\n-\t}\n-\n-\t\/* Check the level of buffers in the pool *\/\n-\ttotal_rxq_desc = 0;\n-\tfor (qidx = 0; qidx < dev->data->nb_rx_queues; qidx++) {\n-\t\trxq = dev->data->rx_queues[qidx];\n-\t\t\/* Count total numbers of rxq descs *\/\n-\t\ttotal_rxq_desc += rxq->qlen_mask + 1;\n-\t\texp_buffs = RTE_MEMPOOL_CACHE_MAX_SIZE + rxq->rx_free_thresh;\n-\t\texp_buffs *= dev->data->nb_rx_queues;\n-\t\tif (rte_mempool_avail_count(rxq->pool) < exp_buffs) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Buff shortage in pool=%s (%d\/%d)\",\n-\t\t\t\t rxq->pool->name,\n-\t\t\t\t rte_mempool_avail_count(rxq->pool),\n-\t\t\t\t exp_buffs);\n-\t\t\treturn -ENOENT;\n-\t\t}\n-\t}\n-\n-\t\/* Check RBDR desc overflow *\/\n-\tret = nicvf_qsize_rbdr_roundup(total_rxq_desc);\n-\tif (ret == 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Reached RBDR desc limit, reduce nr desc\");\n-\t\treturn -ENOMEM;\n-\t}\n-\n-\t\/* Enable qset *\/\n-\tret = nicvf_qset_config(nic);\n-\tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to enable qset %d\", ret);\n-\t\treturn ret;\n-\t}\n-\n-\t\/* Allocate RBDR and RBDR ring desc *\/\n-\tnb_rbdr_desc = nicvf_qsize_rbdr_roundup(total_rxq_desc);\n-\tret = nicvf_qset_rbdr_alloc(dev, nic, nb_rbdr_desc, rbdrsz);\n-\tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate memory for rbdr alloc\");\n-\t\tgoto qset_reclaim;\n-\t}\n-\n-\t\/* Enable and configure RBDR registers *\/\n-\tret = nicvf_qset_rbdr_config(nic, 0);\n-\tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to configure rbdr %d\", ret);\n-\t\tgoto qset_rbdr_free;\n-\t}\n-\n-\t\/* Fill rte_mempool buffers in RBDR pool and precharge it *\/\n-\tret = nicvf_qset_rbdr_precharge(dev, nic, 0, rbdr_rte_mempool_get,\n-\t\t\t\t\ttotal_rxq_desc);\n-\tif (ret) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to fill rbdr %d\", ret);\n-\t\tgoto qset_rbdr_reclaim;\n-\t}\n-\n-\tPMD_DRV_LOG(INFO, \"Filled %d out of %d entries in RBDR\",\n-\t\t nic->rbdr->tail, nb_rbdr_desc);\n-\n-\t\/* Configure RX queues *\/\n-\tfor (qidx = 0; qidx < dev->data->nb_rx_queues; qidx++) {\n-\t\tret = nicvf_start_rx_queue(dev, qidx);\n-\t\tif (ret)\n-\t\t\tgoto start_rxq_error;\n-\t}\n-\n-\t\/* Configure VLAN Strip *\/\n-\tnicvf_vlan_hw_strip(nic, dev->data->dev_conf.rxmode.hw_vlan_strip);\n-\n-\t\/* Configure TX queues *\/\n-\tfor (qidx = 0; qidx < dev->data->nb_tx_queues; qidx++) {\n-\t\tret = nicvf_start_tx_queue(dev, qidx);\n-\t\tif (ret)\n-\t\t\tgoto start_txq_error;\n-\t}\n-\n-\t\/* Configure CPI algorithm *\/\n-\tret = nicvf_configure_cpi(dev);\n-\tif (ret)\n-\t\tgoto start_txq_error;\n-\n-\t\/* Configure RSS *\/\n-\tret = nicvf_configure_rss(dev);\n-\tif (ret)\n-\t\tgoto qset_rss_error;\n \n \t\/* Configure loopback *\/\n \tret = nicvf_loopback_config(nic, dev->data->dev_conf.lpbk_mode);\n \tif (ret) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to configure loopback %d\", ret);\n-\t\tgoto qset_rss_error;\n+\t\treturn ret;\n \t}\n \n \t\/* Reset all statistics counters attached to this port *\/\n \tret = nicvf_mbox_reset_stat_counters(nic, 0x3FFF, 0x1F, 0xFFFF, 0xFFFF);\n \tif (ret) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to reset stat counters %d\", ret);\n-\t\tgoto qset_rss_error;\n+\t\treturn ret;\n \t}\n \n \t\/* Setup scatter mode if needed by jumbo *\/\n@@ -1464,33 +1552,23 @@\n \t\treturn -EBUSY;\n \t}\n \n+\tret = nicvf_vf_start(dev, nic, rbdrsz);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\tfor (i = 0; i < nic->sqs_count; i++) {\n+\t\tassert(nic->snicvf[i]);\n+\n+\t\tret = nicvf_vf_start(dev, nic->snicvf[i], rbdrsz);\n+\t\tif (ret != 0)\n+\t\t\treturn ret;\n+\t}\n+\n \t\/* Configure callbacks based on scatter mode *\/\n \tnicvf_set_tx_function(dev);\n \tnicvf_set_rx_function(dev);\n \n-\t\/* Done; Let PF make the BGX's RX and TX switches to ON position *\/\n-\tnicvf_mbox_cfg_done(nic);\n \treturn 0;\n-\n-qset_rss_error:\n-\tnicvf_rss_term(nic);\n-start_txq_error:\n-\tfor (qidx = 0; qidx < dev->data->nb_tx_queues; qidx++)\n-\t\tnicvf_vf_stop_tx_queue(dev, nic, qidx);\n-start_rxq_error:\n-\tfor (qidx = 0; qidx < dev->data->nb_rx_queues; qidx++)\n-\t\tnicvf_vf_stop_rx_queue(dev, nic, qidx);\n-qset_rbdr_reclaim:\n-\tnicvf_qset_rbdr_reclaim(nic, 0);\n-\tnicvf_rbdr_release_mbufs(dev, nic);\n-qset_rbdr_free:\n-\tif (nic->rbdr) {\n-\t\trte_free(nic->rbdr);\n-\t\tnic->rbdr = NULL;\n-\t}\n-qset_reclaim:\n-\tnicvf_qset_reclaim(nic);\n-\treturn ret;\n }\n \n static void\n"} {"commit":"174beab7d4451bc392e92b548d35f500510a2f84","subject":"at76c50x-usb: Don't perform DMA from stack memory","message":"at76c50x-usb: Don't perform DMA from stack memory\n\nLoading the driver with DMA debugging enabled makes the kernel to complain\nabout the ehci driver trying to perform DMA from memory from the stack.\n\n[ 9848.229514] WARNING: CPU: 1 PID: 627 at lib\/dma-debug.c:1153 check_for_stack+0xa4\/0xf0()\n[ 9848.237678] ehci-pci 0000:00:04.1: DMA-API: device driver maps memory fromstack [addr=ffff88006c80da01]\n\nThis is due to at76c50x-usb driver passing buffers allocated on the stack to\nthe USB layer, that attempts DMA. This occurs is several places.\n\nThis patch fixes the problem by allocating those buffers via kmalloc.\n\nSince this adds some kfree() before leaving a couple of functions, I caught the\noccasion to clean-up the exit path on error.\n\nSigned-off-by: Andrea Merello <7867dfae3c89ddcc122759b67d7b1e515ee6c0fd@gmail.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ba3907e508454520569bf1a3c1570f05ea578768","subject":"at76c50x-usb: add link to the TODO list","message":"at76c50x-usb: add link to the TODO list\n\nIt's easier to have the TODO list in wiki, so add a link to the list.\n\nSigned-off-by: Kalle Valo <caa20ba0e0e4cb20683f1eb6eacae433f722076d@iki.fi>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/at76c50x-usb.c\n+++ drivers\/net\/wireless\/at76c50x-usb.c\n@@ -18,14 +18,10 @@\n *\n * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed\n *\n- * TODO for the mac80211 port:\n- * o adhoc support\n- * o RTS\/CTS support\n- * o Power Save Mode support\n- * o support for short\/long preambles\n- * o export variables through debugfs\/sysfs\n- * o remove hex2str\n- * o remove mac2str\n+ * TODO list is at the wiki:\n+ *\n+ * http:\/\/wireless.kernel.org\/en\/users\/Drivers\/at76c50x-usb#TODO\n+ *\n *\/\n \n #include <linux\/init.h>\n"} {"commit":"bb8e6a1ee881d131e404f0f1f5e8dc9281002771","subject":"mwifiex: add NULL check for PCIe Rx skb","message":"mwifiex: add NULL check for PCIe Rx skb\n\nWe may get a NULL pointer here if skb allocation for Rx packet\nwas failed earlier.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org> # 3.9+\nSigned-off-by: Amitkumar Karwar <7343c7ffb424bf4c3ebd1cd0c94117b3c12118ff@marvell.com>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"75ac9a28a0c6b818ba1aba874b6b3ae17241552c","subject":"drivers\/net\/wireless\/mwifiex\/scan.c: convert GFP_KERNEL to GFP_ATOMIC","message":"drivers\/net\/wireless\/mwifiex\/scan.c: convert GFP_KERNEL to GFP_ATOMIC\n\nThe function is called with locks held and thus should not use GFP_KERNEL.\n\nThe semantic patch that makes this report is available\nin scripts\/coccinelle\/locks\/call_kern.cocci.\n\nMore information about semantic patching is available at\nhttp:\/\/coccinelle.lip6.fr\/\n\nSigned-off-by: Julia Lawall <018ee4f95fc49739477deedb13d2cd210889e607@lip6.fr>\nAcked-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/mwifiex\/scan.c\n+++ drivers\/net\/wireless\/mwifiex\/scan.c\n@@ -2001,7 +2001,7 @@\n \n \t\tkfree(priv->curr_bcn_buf);\n \t\tpriv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,\n-\t\t\t\t\t\tGFP_KERNEL);\n+\t\t\t\t\t\tGFP_ATOMIC);\n \t\tif (!priv->curr_bcn_buf) {\n \t\t\tdev_err(priv->adapter->dev,\n \t\t\t\t\t\"failed to alloc curr_bcn_buf\\n\");\n"} {"commit":"dd321acddc3be1371263b8c9e6c6f2af89f63d57","subject":"mwifiex: report error to MMC core if we cannot suspend","message":"mwifiex: report error to MMC core if we cannot suspend\n\nWhen host_sleep_config command fails we should return error to\nMMC core to indicate the failure for our device.\n\nThe misspelled variable is also removed as it's redundant.\n\nCc: \"3.0+\" <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/mwifiex\/sdio.c\n+++ drivers\/net\/wireless\/mwifiex\/sdio.c\n@@ -161,7 +161,6 @@\n \tstruct sdio_mmc_card *card;\n \tstruct mwifiex_adapter *adapter;\n \tmmc_pm_flag_t pm_flag = 0;\n-\tint hs_actived = 0;\n \tint i;\n \tint ret = 0;\n \n@@ -188,11 +187,13 @@\n \tadapter = card->adapter;\n \n \t\/* Enable the Host Sleep *\/\n-\ths_actived = mwifiex_enable_hs(adapter);\n-\tif (hs_actived) {\n-\t\tpr_debug(\"cmd: suspend with MMC_PM_KEEP_POWER\\n\");\n-\t\tret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);\n-\t}\n+\tif (!mwifiex_enable_hs(adapter)) {\n+\t\tdev_err(adapter->dev, \"cmd: failed to suspend\\n\");\n+\t\treturn -EFAULT;\n+\t}\n+\n+\tdev_dbg(adapter->dev, \"cmd: suspend with MMC_PM_KEEP_POWER\\n\");\n+\tret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);\n \n \t\/* Indicate device suspended *\/\n \tadapter->is_suspended = true;\n"} {"commit":"619ce76f8bb850b57032501a39f26aa6c6731c70","subject":"rtlwifi: Set the link state","message":"rtlwifi: Set the link state\n\nThe present code fails to set the linked state when an interface is\nadded.\n\nSigned-off-by: Larry Finger <ed0f1d78b8c21b2970494a178da4bdfa8beba2a7@lwfinger.net>\nCc: Stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"626596e295d477c0fefa08cd5daa7dd011b1bb2c","subject":"modpost: use a table rather than a giant if\/else statement.","message":"modpost: use a table rather than a giant if\/else statement.\n\nWe look for symbols of form __mod_<busname>_device_table, and for all\nbut three cases we use a standard interation function (do_table) to\nwalk over the contents and dump out the aliases.\n\nAlessandro Rubini did this first, I just repainted the bikeshed a bit.\n\nSigned-off-by: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\nCc: Alessandro Rubini <bc08dd6b821ed1cc3641822f9bf2e85bb4fd6e75@gnudd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- scripts\/mod\/file2alias.c\n+++ scripts\/mod\/file2alias.c\n@@ -28,6 +28,7 @@\n #endif\n \n #include <ctype.h>\n+#include <stdbool.h>\n \n typedef uint32_t\t__u32;\n typedef uint16_t\t__u16;\n@@ -948,15 +949,13 @@\n \treturn 1;\n }\n \n-\/* Ignore any prefix, eg. some architectures prepend _ *\/\n-static inline int sym_is(const char *symbol, const char *name)\n-{\n-\tconst char *match;\n-\n-\tmatch = strstr(symbol, name);\n-\tif (!match)\n-\t\treturn 0;\n-\treturn match[strlen(name)] == '\\0';\n+\/* Does namelen bytes of name exactly match the symbol? *\/\n+static bool sym_is(const char *name, unsigned namelen, const char *symbol)\n+{\n+\tif (namelen != strlen(symbol))\n+\t\treturn false;\n+\n+\treturn memcmp(name, symbol, namelen) == 0;\n }\n \n static void do_table(void *symval, unsigned long size,\n@@ -981,6 +980,43 @@\n \t}\n }\n \n+\/* This array collects all instances that use the generic do_table above *\/\n+struct devtable_switch {\n+\tconst char *device_id; \/* name of table, __mod_<name>_device_table. *\/\n+\tunsigned long id_size;\n+\tvoid *function;\n+};\n+\n+static const struct devtable_switch devtable_switch[] = {\n+\t{ \"acpi\", sizeof(struct acpi_device_id), do_acpi_entry },\n+\t{ \"amba\", sizeof(struct amba_id), do_amba_entry },\n+\t{ \"ap\", sizeof(struct ap_device_id), do_ap_entry },\n+\t{ \"bcma\", sizeof(struct bcma_device_id), do_bcma_entry },\n+\t{ \"ccw\", sizeof(struct ccw_device_id), do_ccw_entry },\n+\t{ \"css\", sizeof(struct css_device_id), do_css_entry },\n+\t{ \"dmi\", sizeof(struct dmi_system_id), do_dmi_entry },\n+\t{ \"eisa\", sizeof(struct eisa_device_id), do_eisa_entry },\n+\t{ \"hid\", sizeof(struct hid_device_id), do_hid_entry },\n+\t{ \"i2c\", sizeof(struct i2c_device_id), do_i2c_entry },\n+\t{ \"ieee1394\", sizeof(struct ieee1394_device_id), do_ieee1394_entry },\n+\t{ \"input\", sizeof(struct input_device_id), do_input_entry },\n+\t{ \"isa\", sizeof(struct isapnp_device_id), do_isapnp_entry },\n+\t{ \"mdio\", sizeof(struct mdio_device_id), do_mdio_entry },\n+\t{ \"of\", sizeof(struct of_device_id), do_of_entry },\n+\t{ \"parisc\", sizeof(struct parisc_device_id), do_parisc_entry },\n+\t{ \"pci\", sizeof(struct pci_device_id), do_pci_entry },\n+\t{ \"pcmcia\", sizeof(struct pcmcia_device_id), do_pcmcia_entry },\n+\t{ \"platform\", sizeof(struct platform_device_id), do_platform_entry },\n+\t{ \"sdio\", sizeof(struct sdio_device_id), do_sdio_entry },\n+\t{ \"serio\", sizeof(struct serio_device_id), do_serio_entry },\n+\t{ \"spi\", sizeof(struct spi_device_id), do_spi_entry },\n+\t{ \"ssb\", sizeof(struct ssb_device_id), do_ssb_entry },\n+\t{ \"vio\", sizeof(struct vio_device_id), do_vio_entry },\n+\t{ \"virtio\", sizeof(struct virtio_device_id), do_virtio_entry },\n+\t{ \"vmbus\", sizeof(struct hv_vmbus_device_id), do_vmbus_entry },\n+\t{ \"zorro\", sizeof(struct zorro_device_id), do_zorro_entry },\n+};\n+\n \/* Create MODULE_ALIAS() statements.\n * At this time, we cannot write the actual output C source yet,\n * so we write into the mod->dev_table_buf buffer. *\/\n@@ -989,10 +1025,24 @@\n {\n \tvoid *symval;\n \tchar *zeros = NULL;\n+\tconst char *name;\n+\tunsigned int namelen;\n \n \t\/* We're looking for a section relative symbol *\/\n \tif (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)\n \t\treturn;\n+\n+\t\/* All our symbols are of form <prefix>__mod_XXX_device_table. *\/\n+\tname = strstr(symname, \"__mod_\");\n+\tif (!name)\n+\t\treturn;\n+\tname += strlen(\"__mod_\");\n+\tnamelen = strlen(name);\n+\tif (namelen < strlen(\"_device_table\"))\n+\t\treturn;\n+\tif (strcmp(name + namelen - strlen(\"_device_table\"), \"_device_table\"))\n+\t\treturn;\n+\tnamelen -= strlen(\"_device_table\");\n \n \t\/* Handle all-NULL symbols allocated into .bss *\/\n \tif (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {\n@@ -1004,121 +1054,25 @@\n \t\t\t+ sym->st_value;\n \t}\n \n-\tif (sym_is(symname, \"__mod_pci_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct pci_device_id), \"pci\",\n-\t\t\t do_pci_entry, mod);\n-\telse if (sym_is(symname, \"__mod_usb_device_table\"))\n-\t\t\/* special case to handle bcdDevice ranges *\/\n+\t\/* First handle the \"special\" cases *\/\n+\tif (sym_is(name, namelen, \"usb\"))\n \t\tdo_usb_table(symval, sym->st_size, mod);\n-\telse if (sym_is(symname, \"__mod_hid_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct hid_device_id), \"hid\",\n-\t\t\t do_hid_entry, mod);\n-\telse if (sym_is(symname, \"__mod_ieee1394_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct ieee1394_device_id), \"ieee1394\",\n-\t\t\t do_ieee1394_entry, mod);\n-\telse if (sym_is(symname, \"__mod_ccw_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct ccw_device_id), \"ccw\",\n-\t\t\t do_ccw_entry, mod);\n-\telse if (sym_is(symname, \"__mod_ap_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct ap_device_id), \"ap\",\n-\t\t\t do_ap_entry, mod);\n-\telse if (sym_is(symname, \"__mod_css_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct css_device_id), \"css\",\n-\t\t\t do_css_entry, mod);\n-\telse if (sym_is(symname, \"__mod_serio_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct serio_device_id), \"serio\",\n-\t\t\t do_serio_entry, mod);\n-\telse if (sym_is(symname, \"__mod_acpi_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct acpi_device_id), \"acpi\",\n-\t\t\t do_acpi_entry, mod);\n-\telse if (sym_is(symname, \"__mod_pnp_device_table\"))\n+\telse if (sym_is(name, namelen, \"pnp\"))\n \t\tdo_pnp_device_entry(symval, sym->st_size, mod);\n-\telse if (sym_is(symname, \"__mod_pnp_card_device_table\"))\n+\telse if (sym_is(name, namelen, \"pnp_card\"))\n \t\tdo_pnp_card_entries(symval, sym->st_size, mod);\n-\telse if (sym_is(symname, \"__mod_pcmcia_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct pcmcia_device_id), \"pcmcia\",\n-\t\t\t do_pcmcia_entry, mod);\n- else if (sym_is(symname, \"__mod_of_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct of_device_id), \"of\",\n-\t\t\t do_of_entry, mod);\n- else if (sym_is(symname, \"__mod_vio_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct vio_device_id), \"vio\",\n-\t\t\t do_vio_entry, mod);\n-\telse if (sym_is(symname, \"__mod_input_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct input_device_id), \"input\",\n-\t\t\t do_input_entry, mod);\n-\telse if (sym_is(symname, \"__mod_eisa_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct eisa_device_id), \"eisa\",\n-\t\t\t do_eisa_entry, mod);\n-\telse if (sym_is(symname, \"__mod_parisc_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct parisc_device_id), \"parisc\",\n-\t\t\t do_parisc_entry, mod);\n-\telse if (sym_is(symname, \"__mod_sdio_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct sdio_device_id), \"sdio\",\n-\t\t\t do_sdio_entry, mod);\n-\telse if (sym_is(symname, \"__mod_ssb_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct ssb_device_id), \"ssb\",\n-\t\t\t do_ssb_entry, mod);\n-\telse if (sym_is(symname, \"__mod_bcma_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct bcma_device_id), \"bcma\",\n-\t\t\t do_bcma_entry, mod);\n-\telse if (sym_is(symname, \"__mod_virtio_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct virtio_device_id), \"virtio\",\n-\t\t\t do_virtio_entry, mod);\n-\telse if (sym_is(symname, \"__mod_vmbus_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct hv_vmbus_device_id), \"vmbus\",\n-\t\t\t do_vmbus_entry, mod);\n-\telse if (sym_is(symname, \"__mod_i2c_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct i2c_device_id), \"i2c\",\n-\t\t\t do_i2c_entry, mod);\n-\telse if (sym_is(symname, \"__mod_spi_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct spi_device_id), \"spi\",\n-\t\t\t do_spi_entry, mod);\n-\telse if (sym_is(symname, \"__mod_dmi_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct dmi_system_id), \"dmi\",\n-\t\t\t do_dmi_entry, mod);\n-\telse if (sym_is(symname, \"__mod_platform_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct platform_device_id), \"platform\",\n-\t\t\t do_platform_entry, mod);\n-\telse if (sym_is(symname, \"__mod_mdio_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct mdio_device_id), \"mdio\",\n-\t\t\t do_mdio_entry, mod);\n-\telse if (sym_is(symname, \"__mod_zorro_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\t sizeof(struct zorro_device_id), \"zorro\",\n-\t\t\t do_zorro_entry, mod);\n-\telse if (sym_is(symname, \"__mod_isapnp_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\tsizeof(struct isapnp_device_id), \"isa\",\n-\t\t\tdo_isapnp_entry, mod);\n-\telse if (sym_is(symname, \"__mod_amba_device_table\"))\n-\t\tdo_table(symval, sym->st_size,\n-\t\t\tsizeof(struct amba_id), \"amba\",\n-\t\t\tdo_amba_entry, mod);\n+\telse {\n+\t\tconst struct devtable_switch *p = devtable_switch;\n+\t\tunsigned int i;\n+\n+\t\tfor (i = 0; i < ARRAY_SIZE(devtable_switch); i++, p++) {\n+\t\t\tif (sym_is(name, namelen, p->device_id)) {\n+\t\t\t\tdo_table(symval, sym->st_size, p->id_size,\n+\t\t\t\t\t p->device_id, p->function, mod);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t}\n \tfree(zeros);\n }\n \n"} {"commit":"7defac36db43df73feef44e0f6edc298868ae1ac","subject":"staging: dgrp: fix potential NULL defereference issue","message":"staging: dgrp: fix potential NULL defereference issue\n\nFix a coccinelle warning catched by Fengguang's 0-DAY system:\n+ drivers\/staging\/dgrp\/dgrp_net_ops.c:1061:11-27: ERROR: nd is NULL but dereferenced.\n\nPut the \"done:\" label a bit down would solve this issue.\n\nCc: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nCc: Julia Lawall <018ee4f95fc49739477deedb13d2cd210889e607@lip6.fr>\nCc: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\nSigned-off-by: Yuanhan Liu <5dcef21195e64c9c08aa779bb62b25e9133eaa33@linux.intel.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/dgrp\/dgrp_net_ops.c\n+++ drivers\/staging\/dgrp\/dgrp_net_ops.c\n@@ -1057,13 +1057,13 @@\n \n \tspin_unlock_irqrestore(&dgrp_poll_data.poll_lock, lock_flags);\n \n+\tdown(&nd->nd_net_semaphore);\n+\n+\tdgrp_monitor_message(nd, \"Net Close\");\n+\n+\tup(&nd->nd_net_semaphore);\n+\n done:\n-\tdown(&nd->nd_net_semaphore);\n-\n-\tdgrp_monitor_message(nd, \"Net Close\");\n-\n-\tup(&nd->nd_net_semaphore);\n-\n \tmodule_put(THIS_MODULE);\n \tfile->private_data = NULL;\n \treturn 0;\n"} {"commit":"f4914e5ef087961b3bf17cdf166e947f69cc9089","subject":"staging\/iio\/mxs-lradc: cleanup masklength","message":"staging\/iio\/mxs-lradc: cleanup masklength\n\nWe know the exact iio->masklength = LRADC_MAX_TOTAL_CHANS.\nLet's use it consistently.\n\nSigned-off-by: Micha\u0142 Miros\u0142aw <a6cdb63bb4a601d03a6f05cfd687541da1200a64@rere.qmqm.pl>\nSigned-off-by: Jonathan Cameron <09f65b71b7655725897b2fd41a09a0cefe2e1ace@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"4a6b1518d702d4bf4bb9262993c47263a8573518","subject":"staging: xgifb: checkpatch cleanup printk() -> pr_lvl()","message":"staging: xgifb: checkpatch cleanup printk() -> pr_lvl()\n\nRewrote code to use pr_lvl() instead of printk(). There are still a few\ninstances of printk(), mainly in the debug code which looks like it's going to\nbe dropped\/rewrote (most of it is blocked out).\n\nSigned-off-by: Sam Hansen <b202a7067cfddd7f94c5d73cf9f7b68e3afd6b6f@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/xgifb\/XGI_main_26.c\n+++ drivers\/staging\/xgifb\/XGI_main_26.c\n@@ -57,7 +57,7 @@\n #undef XGIFBDEBUG\n \n #ifdef XGIFBDEBUG\n-#define DPRINTK(fmt, args...) printk(KERN_DEBUG \"%s: \" fmt, __func__ , ## args)\n+#define DPRINTK(fmt, args...) pr_debug(\"%s: \" fmt, __func__ , ## args)\n #else\n #define DPRINTK(fmt, args...)\n #endif\n@@ -144,7 +144,7 @@\n #if 1\n #define DEBUGPRN(x)\n #else\n-#define DEBUGPRN(x) printk(KERN_INFO x \"\\n\");\n+#define DEBUGPRN(x) pr_info(x \"\\n\");\n #endif\n \n \/* --------------- Hardware Access Routines -------------------------- *\/\n@@ -426,7 +426,7 @@\n \t\ti++;\n \t}\n \tif (!j)\n-\t\tprintk(KERN_INFO \"XGIfb: Invalid mode '%s'\\n\", name);\n+\t\tpr_info(\"Invalid mode '%s'\\n\", name);\n }\n \n static void XGIfb_search_vesamode(struct xgifb_video_info *xgifb_info,\n@@ -451,7 +451,7 @@\n \n invalid:\n \tif (!j)\n-\t\tprintk(KERN_INFO \"XGIfb: Invalid VESA mode 0x%x'\\n\", vesamode);\n+\t\tpr_info(\"Invalid VESA mode 0x%x'\\n\", vesamode);\n }\n \n static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)\n@@ -688,7 +688,7 @@\n \t\ti++;\n \t}\n \tif (XGIfb_crt2type < 0)\n-\t\tprintk(KERN_INFO \"XGIfb: Invalid CRT2 type: %s\\n\", name);\n+\t\tpr_info(\"Invalid CRT2 type: %s\\n\", name);\n }\n \n static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info,\n@@ -738,7 +738,7 @@\n \tif (xgifb_info->rate_idx > 0) {\n \t\treturn xgifb_info->rate_idx;\n \t} else {\n-\t\tprintk(KERN_INFO \"XGIfb: Unsupported rate %d for %dx%d\\n\",\n+\t\tpr_info(\"Unsupported rate %d for %dx%d\\n\",\n \t\t rate, xres, yres);\n \t\treturn 0;\n \t}\n@@ -1114,7 +1114,7 @@\n \tif (!htotal || !vtotal) {\n \t\tDPRINTK(\"XGIfb: Invalid 'var' information\\n\");\n \t\treturn -EINVAL;\n-\t} printk(KERN_DEBUG \"XGIfb: var->pixclock=%d, htotal=%d, vtotal=%d\\n\",\n+\t} pr_debug(\"var->pixclock=%d, htotal=%d, vtotal=%d\\n\",\n \t\t\tvar->pixclock, htotal, vtotal);\n \n \tif (var->pixclock && htotal && vtotal) {\n@@ -1126,7 +1126,7 @@\n \t\txgifb_info->refresh_rate = 60;\n \t}\n \n-\tprintk(KERN_DEBUG \"XGIfb: Change mode to %dx%dx%d-%dHz\\n\",\n+\tpr_debug(\"Change mode to %dx%dx%d-%dHz\\n\",\n \t var->xres,\n \t var->yres,\n \t var->bits_per_pixel,\n@@ -1154,7 +1154,7 @@\n \t\txgifb_info->mode_idx = -1;\n \n \tif (xgifb_info->mode_idx < 0) {\n-\t\tprintk(KERN_ERR \"XGIfb: Mode %dx%dx%d not supported\\n\",\n+\t\tpr_err(\"Mode %dx%dx%d not supported\\n\",\n \t\t var->xres, var->yres, var->bits_per_pixel);\n \t\txgifb_info->mode_idx = old_mode;\n \t\treturn -EINVAL;\n@@ -1173,7 +1173,7 @@\n \t\tif (XGISetModeNew(xgifb_info, hw_info,\n \t\t\t\t XGIbios_mode[xgifb_info->mode_idx].mode_no)\n \t\t\t\t\t== 0) {\n-\t\t\tprintk(KERN_ERR \"XGIfb: Setting mode[0x%x] failed\\n\",\n+\t\t\tpr_err(\"Setting mode[0x%x] failed\\n\",\n \t\t\t XGIbios_mode[xgifb_info->mode_idx].mode_no);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -1235,7 +1235,7 @@\n \t\t\tbreak;\n \t\tdefault:\n \t\t\txgifb_info->video_cmap_len = 16;\n-\t\t\tprintk(KERN_ERR \"XGIfb: Unsupported depth %d\",\n+\t\t\tpr_err(\"Unsupported depth %d\",\n \t\t\t xgifb_info->video_bpp);\n \t\t\tbreak;\n \t\t}\n@@ -1437,7 +1437,7 @@\n \t\thrate = (drate * 1000) \/ htotal;\n \t\txgifb_info->refresh_rate =\n \t\t\t(unsigned int) (hrate * 2 \/ vtotal);\n-\t\tprintk(KERN_DEBUG\n+\t\tpr_debug(\n \t\t\t\"%s: pixclock = %d ,htotal=%d, vtotal=%d\\n\"\n \t\t\t\"%s: drate=%d, hrate=%d, refresh_rate=%d\\n\",\n \t\t\t__func__, var->pixclock, htotal, vtotal,\n@@ -1475,7 +1475,7 @@\n \n \tif (!found_mode) {\n \n-\t\tprintk(KERN_ERR \"XGIfb: %dx%dx%d is no valid mode\\n\",\n+\t\tpr_err(\"%dx%dx%d is no valid mode\\n\",\n \t\t\tvar->xres, var->yres, var->bits_per_pixel);\n \t\tsearch_idx = 0;\n \t\twhile (XGIbios_mode[search_idx].mode_no != 0) {\n@@ -1494,11 +1494,11 @@\n \t\tif (found_mode) {\n \t\t\tvar->xres = XGIbios_mode[search_idx].xres;\n \t\t\tvar->yres = XGIbios_mode[search_idx].yres;\n-\t\t\tprintk(KERN_DEBUG \"XGIfb: Adapted to mode %dx%dx%d\\n\",\n+\t\t\tpr_debug(\"Adapted to mode %dx%dx%d\\n\",\n \t\t\t\tvar->xres, var->yres, var->bits_per_pixel);\n \n \t\t} else {\n-\t\t\tprintk(KERN_ERR \"XGIfb: Failed to find similar mode to %dx%dx%d\\n\",\n+\t\t\tpr_err(\"Failed to find similar mode to %dx%dx%d\\n\",\n \t\t\t\tvar->xres, var->yres, var->bits_per_pixel);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -1707,7 +1707,7 @@\n \t\/* xgifb_info->video_size = 0x200000; *\/ \/* 1024x768x16 *\/\n \t\/* xgifb_info->video_size = 0x1000000; *\/ \/* benchmark *\/\n \n-\tprintk(\"XGIfb: SR14=%x DramSzie %x ChannelNum %x\\n\",\n+\tpr_info(\"SR14=%x DramSzie %x ChannelNum %x\\n\",\n \t reg,\n \t xgifb_info->video_size, ChannelNum);\n \treturn 0;\n@@ -1913,7 +1913,7 @@\n \txgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30;\n \thw_info->pjIOAddress = (unsigned char *)xgifb_info->vga_base;\n \t\/* XGI_Pr.RelIO = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; *\/\n-\tprintk(\"XGIfb: Relocate IO address: %lx [%08lx]\\n\",\n+\tpr_info(\"Relocate IO address: %lx [%08lx]\\n\",\n \t (unsigned long)pci_resource_start(pdev, 2),\n \t xgifb_info->dev_info.RelIO);\n \n@@ -1933,7 +1933,7 @@\n \treg1 = xgifb_reg_get(XGISR, IND_SIS_PASSWORD);\n \n \tif (reg1 != 0xa1) { \/*I\/O error *\/\n-\t\tprintk(\"\\nXGIfb: I\/O error!!!\");\n+\t\tpr_err(\"I\/O error!!!\");\n \t\tret = -EIO;\n \t\tgoto error;\n \t}\n@@ -1964,11 +1964,11 @@\n \t\tgoto error;\n \t}\n \n-\tprintk(\"XGIfb:chipid = %x\\n\", xgifb_info->chip);\n+\tpr_info(\"chipid = %x\\n\", xgifb_info->chip);\n \thw_info->jChipType = xgifb_info->chip;\n \n \tif (XGIfb_get_dram_size(xgifb_info)) {\n-\t\tprintk(KERN_INFO \"XGIfb: Fatal error: Unable to determine RAM size.\\n\");\n+\t\tpr_err(\"Fatal error: Unable to determine RAM size.\\n\");\n \t\tret = -ENODEV;\n \t\tgoto error;\n \t}\n@@ -1985,10 +1985,10 @@\n \tif (!request_mem_region(xgifb_info->video_base,\n \t\t\t\txgifb_info->video_size,\n \t\t\t\t\"XGIfb FB\")) {\n-\t\tprintk(\"unable request memory size %x\",\n+\t\tpr_err(\"unable request memory size %x\\n\",\n \t\t xgifb_info->video_size);\n-\t\tprintk(KERN_ERR \"XGIfb: Fatal error: Unable to reserve frame buffer memory\\n\");\n-\t\tprintk(KERN_ERR \"XGIfb: Is there another framebuffer driver active?\\n\");\n+\t\tpr_err(\"Fatal error: Unable to reserve frame buffer memory\\n\");\n+\t\tpr_err(\"Is there another framebuffer driver active?\\n\");\n \t\tret = -ENODEV;\n \t\tgoto error;\n \t}\n@@ -1996,7 +1996,7 @@\n \tif (!request_mem_region(xgifb_info->mmio_base,\n \t\t\t\txgifb_info->mmio_size,\n \t\t\t\t\"XGIfb MMIO\")) {\n-\t\tprintk(KERN_ERR \"XGIfb: Fatal error: Unable to reserve MMIO region\\n\");\n+\t\tpr_err(\"Fatal error: Unable to reserve MMIO region\\n\");\n \t\tret = -ENODEV;\n \t\tgoto error_0;\n \t}\n@@ -2006,20 +2006,18 @@\n \txgifb_info->mmio_vbase = ioremap(xgifb_info->mmio_base,\n \t\t\t\t\t xgifb_info->mmio_size);\n \n-\tprintk(KERN_INFO \"XGIfb: Framebuffer at 0x%lx, mapped to 0x%p, size %dk\\n\",\n+\tpr_info(\"Framebuffer at 0x%lx, mapped to 0x%p, size %dk\\n\",\n \t xgifb_info->video_base,\n \t xgifb_info->video_vbase,\n \t xgifb_info->video_size \/ 1024);\n \n-\tprintk(KERN_INFO \"XGIfb: MMIO at 0x%lx, mapped to 0x%p, size %ldk\\n\",\n+\tpr_info(\"MMIO at 0x%lx, mapped to 0x%p, size %ldk\\n\",\n \t xgifb_info->mmio_base, xgifb_info->mmio_vbase,\n \t xgifb_info->mmio_size \/ 1024);\n-\tprintk(\"XGIfb: XGIInitNew() ...\");\n+\n \tpci_set_drvdata(pdev, xgifb_info);\n-\tif (XGIInitNew(pdev))\n-\t\tprintk(\"OK\\n\");\n-\telse\n-\t\tprintk(\"Fail\\n\");\n+\tif (!XGIInitNew(pdev))\n+\t\tpr_err(\"XGIInitNew() failed!\\n\");\n \n \txgifb_info->mtrr = (unsigned int) 0;\n \n@@ -2048,10 +2046,10 @@\n \t\treg = xgifb_reg_get(XGIPART4, 0x01);\n \t\tif (reg >= 0xE0) {\n \t\t\thw_info->ujVBChipID = VB_CHIP_302LV;\n-\t\t\tprintk(KERN_INFO \"XGIfb: XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n+\t\t\tpr_info(\"XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n \t\t} else if (reg >= 0xD0) {\n \t\t\thw_info->ujVBChipID = VB_CHIP_301LV;\n-\t\t\tprintk(KERN_INFO \"XGIfb: XGI301LV bridge detected (revision 0x%02x)\\n\", reg);\n+\t\t\tpr_info(\"XGI301LV bridge detected (revision 0x%02x)\\n\", reg);\n \t\t}\n \t\t\/* else if (reg >= 0xB0) {\n \t\t\thw_info->ujVBChipID = VB_CHIP_301B;\n@@ -2060,17 +2058,17 @@\n \t\t} *\/\n \t\telse {\n \t\t\thw_info->ujVBChipID = VB_CHIP_301;\n-\t\t\tprintk(\"XGIfb: XGI301 bridge detected\\n\");\n+\t\t\tpr_info(\"XGI301 bridge detected\\n\");\n \t\t}\n \t\tbreak;\n \tcase HASVB_302:\n \t\treg = xgifb_reg_get(XGIPART4, 0x01);\n \t\tif (reg >= 0xE0) {\n \t\t\thw_info->ujVBChipID = VB_CHIP_302LV;\n-\t\t\tprintk(KERN_INFO \"XGIfb: XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n+\t\t\tpr_info(\"XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n \t\t} else if (reg >= 0xD0) {\n \t\t\thw_info->ujVBChipID = VB_CHIP_301LV;\n-\t\t\tprintk(KERN_INFO \"XGIfb: XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n+\t\t\tpr_info(\"XGI302LV bridge detected (revision 0x%02x)\\n\", reg);\n \t\t} else if (reg >= 0xB0) {\n \t\t\treg1 = xgifb_reg_get(XGIPART4, 0x23);\n \n@@ -2078,27 +2076,27 @@\n \n \t\t} else {\n \t\t\thw_info->ujVBChipID = VB_CHIP_302;\n-\t\t\tprintk(KERN_INFO \"XGIfb: XGI302 bridge detected\\n\");\n+\t\t\tpr_info(\"XGI302 bridge detected\\n\");\n \t\t}\n \t\tbreak;\n \tcase HASVB_LVDS:\n \t\thw_info->ulExternalChip = 0x1;\n-\t\tprintk(KERN_INFO \"XGIfb: LVDS transmitter detected\\n\");\n+\t\tpr_info(\"LVDS transmitter detected\\n\");\n \t\tbreak;\n \tcase HASVB_TRUMPION:\n \t\thw_info->ulExternalChip = 0x2;\n-\t\tprintk(KERN_INFO \"XGIfb: Trumpion Zurac LVDS scaler detected\\n\");\n+\t\tpr_info(\"Trumpion Zurac LVDS scaler detected\\n\");\n \t\tbreak;\n \tcase HASVB_CHRONTEL:\n \t\thw_info->ulExternalChip = 0x4;\n-\t\tprintk(KERN_INFO \"XGIfb: Chrontel TV encoder detected\\n\");\n+\t\tpr_info(\"Chrontel TV encoder detected\\n\");\n \t\tbreak;\n \tcase HASVB_LVDS_CHRONTEL:\n \t\thw_info->ulExternalChip = 0x5;\n-\t\tprintk(KERN_INFO \"XGIfb: LVDS transmitter and Chrontel TV encoder detected\\n\");\n+\t\tpr_info(\"LVDS transmitter and Chrontel TV encoder detected\\n\");\n \t\tbreak;\n \tdefault:\n-\t\tprintk(KERN_INFO \"XGIfb: No or unknown bridge type detected\\n\");\n+\t\tpr_info(\"No or unknown bridge type detected\\n\");\n \t\tbreak;\n \t}\n \n@@ -2210,12 +2208,12 @@\n \t\tbreak;\n \tdefault:\n \t\txgifb_info->video_cmap_len = 16;\n-\t\tprintk(KERN_INFO \"XGIfb: Unsupported depth %d\",\n+\t\tpr_info(\"Unsupported depth %d\\n\",\n \t\t xgifb_info->video_bpp);\n \t\tbreak;\n \t}\n \n-\tprintk(KERN_INFO \"XGIfb: Default mode is %dx%dx%d (%dHz)\\n\",\n+\tpr_info(\"Default mode is %dx%dx%d (%dHz)\\n\",\n \t xgifb_info->video_width,\n \t xgifb_info->video_height,\n \t xgifb_info->video_bpp,\n@@ -2392,7 +2390,7 @@\n static void __exit xgifb_remove_module(void)\n {\n \tpci_unregister_driver(&xgifb_driver);\n-\tprintk(KERN_DEBUG \"xgifb: Module unloaded\\n\");\n+\tpr_debug(\"Module unloaded\\n\");\n }\n \n module_exit(xgifb_remove_module);\n"} {"commit":"28aaa950320fc7b8df3f6d2d34fa7833391a9b72","subject":"iscsi-target: Fix potential NULL pointer in solicited NOPOUT reject","message":"iscsi-target: Fix potential NULL pointer in solicited NOPOUT reject\n\nThis patch addresses a potential NULL pointer dereference regression in\niscsit_setup_nop_out() code, specifically for two cases when a solicited\nNOPOUT triggers a ISCSI_REASON_PROTOCOL_ERROR reject to be generated.\n\nThis is because iscsi_cmd is expected to be NULL for solicited NOPOUT\ncase before iscsit_process_nop_out() locates the descriptor via TTT\nusing iscsit_find_cmd_from_ttt().\n\nThis regression was originally introduced in:\n\ncommit ba159914086f06532079fc15141f46ffe7e04a41\nAuthor: Nicholas Bellinger <978acd1567d5598152161fdf8bf3ca568f950c9b@linux-iscsi.org>\nDate: Wed Jul 3 03:48:24 2013 -0700\n\n iscsi-target: Fix iscsit_add_reject* usage for iser\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org # 3.10+\nSigned-off-by: Nicholas Bellinger <978acd1567d5598152161fdf8bf3ca568f950c9b@linux-iscsi.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b790f210fe8423eff881b2a8a93ba5dbc45534d0","subject":"tty: serial: 8250_core.c Bug fix for Exar chips.","message":"tty: serial: 8250_core.c Bug fix for Exar chips.\n\nThe sleep function was updated to put the serial port to sleep only when necessary.\nThis appears to resolve the errant behavior of the driver as described in\nKernel Bug 61961 \u2013 \"My Exar Corp. XR17C\/D152 Dual PCI UART modem does not\nwork with 3.8.0\".\n\nSigned-off-by: Michael Welling <0be6b46d22db2f730b2107511aee020d642b52a4@ieee.org>\nCc: stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6ae4a16cf4b6d449778697701de1b2ea86726def","subject":"tty: serial: 8250_core: Remove trailing whitespaces","message":"tty: serial: 8250_core: Remove trailing whitespaces\n\nNo functional changes.\n\nSigned-off-by: Michal Simek <b20e59da6aeb5cea6c82b021069d69f63616c55d@xilinx.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"da891641b6c92e260966dfce3dd93111d08656c8","subject":"serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup","message":"serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup\n\nThe XR17V35X UART needs the ECB bit set in its XR_EFR\nregister to enable access to IER [7:5], ISR [5:4], FCR[5:4],\nMCR[7:5], and MSR [7:0].\n\nAlso reset the IER register to mask interrupts after access\nto all bits of this register has been enabled.\n\nThis makes my 8-port XR17V35X working with the in-kernel\nserial driver.\n\nCc: Joe Schultz <f50f0d0b9d6e16148ec76277cc2a77e543c23b09@xes-inc.com>\nSigned-off-by: Joerg Roedel <61aff96566804ea1da8a65de5bcc892ce07caceb@suse.de>\nReviewed-by: Peter Hurley <4b8373d016f277527198385ba72fda0feb5da015@hurleysoftware.com>\nReviewed-by: Michael Welling <0be6b46d22db2f730b2107511aee020d642b52a4@ieee.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"de36a7d7f4a60dba73c7d893bc3187cd8fdbb8c3","subject":"drivers: usb_dc_kinetis: set thread name","message":"drivers: usb_dc_kinetis: set thread name\n\nThread name is useful when debugging or using shell with\nCONFIG_THREAD_NAME=y.\n\nSigned-off-by: Marcin Niestroj <63506c06cfbc47ace147db1702f6e751f5ac2132@emb.dev>\n","repos":"galak\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/device\/usb_dc_kinetis.c\n+++ drivers\/usb\/device\/usb_dc_kinetis.c\n@@ -1045,6 +1045,7 @@\n \t\t\tUSBD_THREAD_STACK_SIZE,\n \t\t\tusb_kinetis_thread_main, NULL, NULL, NULL,\n \t\t\tK_PRIO_COOP(2), 0, K_NO_WAIT);\n+\tk_thread_name_set(&dev_data.thread, \"usb_kinetis\");\n \n \tIRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority),\n \t\t usb_kinetis_isr_handler, 0, 0);\n"} {"commit":"3fd450a3199c92e89492c49f21f412988fbacdc8","subject":"mass_storage: Always allow disabling mass storage by writing to lun file","message":"mass_storage: Always allow disabling mass storage by writing to lun file\n\nFor android builds we disable the check for curlun->prevent_medium_removal.\nInstead we let the framework manage unmounting policy, as we sometimes need\nto unmount after the media has been removed.\nThis also helps support hosts that do not inform the device when the media\nhas been unmounted.\n\nCRs-Fixed: 407992\nChange-Id: I914d7961fe06074c09b76d5bbc336d1454598488\nSigned-off-by: Chiranjeevi Velempati <692a45b26f75473403cc09fb298f4dc2e885a389@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"d0893264db29b9bfdb1bc66e731f4ed7f8b52795","subject":"USB: gadget: storage_common: comments updated","message":"USB: gadget: storage_common: comments updated\n\nUpdated comment to describe why printing macros are needed even\nthought they are copied form the composite.h. Also, made multiline\ncomments follow the coding standard.\n\nSigned-off-by: Michal Nazarewicz <fad68416efb2dcf953403756bf832194ca95d084@samsung.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/gadget\/storage_common.c\n+++ drivers\/usb\/gadget\/storage_common.c\n@@ -57,10 +57,12 @@\n #include <asm\/unaligned.h>\n \n \n-\/* Thanks to NetChip Technologies for donating this product ID.\n+\/*\n+ * Thanks to NetChip Technologies for donating this product ID.\n *\n * DO NOT REUSE THESE IDs with any other driver!! Ever!!\n- * Instead: allocate your own, using normal USB-IF procedures. *\/\n+ * Instead: allocate your own, using normal USB-IF procedures.\n+ *\/\n #define FSG_VENDOR_ID\t0x0525\t\/* NetChip *\/\n #define FSG_PRODUCT_ID\t0xa4a5\t\/* Linux-USB File-backed Storage Gadget *\/\n \n@@ -84,14 +86,27 @@\n #define LWARN(lun, fmt, args...) dev_warn(&(lun)->dev, fmt, ## args)\n #define LINFO(lun, fmt, args...) dev_info(&(lun)->dev, fmt, ## args)\n \n-\/* Keep those macros in sync with thos in\n- * include\/linux\/ubs\/composite.h or else GCC will complain. If they\n+\/*\n+ * Keep those macros in sync with those in\n+ * include\/linux\/usb\/composite.h or else GCC will complain. If they\n * are identical (the same names of arguments, white spaces in the\n * same places) GCC will allow redefinition otherwise (even if some\n- * white space is removed or added) warning will be issued. No\n- * checking if those symbols is defined is performed because warning\n- * is desired when those macros were defined by someone else to mean\n- * something else. *\/\n+ * white space is removed or added) warning will be issued.\n+ *\n+ * Those macros are needed here because File Storage Gadget does not\n+ * include the composite.h header. For composite gadgets those macros\n+ * are redundant since composite.h is included any way.\n+ *\n+ * One could check whether those macros are already defined (which\n+ * would indicate composite.h had been included) or not (which would\n+ * indicate we were in FSG) but this is not done because a warning is\n+ * desired if definitions here differ from the ones in composite.h.\n+ *\n+ * We want the definitions to match and be the same in File Storage\n+ * Gadget as well as Mass Storage Function (and so composite gadgets\n+ * using MSF). If someone changes them in composite.h it will produce\n+ * a warning in this file when building MSF.\n+ *\/\n #define DBG(d, fmt, args...) dev_dbg(&(d)->gadget->dev , fmt , ## args)\n #define VDBG(d, fmt, args...) dev_vdbg(&(d)->gadget->dev , fmt , ## args)\n #define ERROR(d, fmt, args...) dev_err(&(d)->gadget->dev , fmt , ## args)\n@@ -313,9 +328,11 @@\n \tenum fsg_buffer_state\t\tstate;\n \tstruct fsg_buffhd\t\t*next;\n \n-\t\/* The NetChip 2280 is faster, and handles some protocol faults\n+\t\/*\n+\t * The NetChip 2280 is faster, and handles some protocol faults\n \t * better, if we don't submit any short bulk-out read requests.\n-\t * So we will record the intended request length here. *\/\n+\t * So we will record the intended request length here.\n+\t *\/\n \tunsigned int\t\t\tbulk_out_intended_length;\n \n \tstruct usb_request\t\t*inreq;\n@@ -395,8 +412,10 @@\n \t.iInterface =\t\tFSG_STRING_INTERFACE,\n };\n \n-\/* Three full-speed endpoint descriptors: bulk-in, bulk-out,\n- * and interrupt-in. *\/\n+\/*\n+ * Three full-speed endpoint descriptors: bulk-in, bulk-out, and\n+ * interrupt-in.\n+ *\/\n \n static struct usb_endpoint_descriptor\n fsg_fs_bulk_in_desc = {\n@@ -459,7 +478,7 @@\n *\n * That means alternate endpoint descriptors (bigger packets)\n * and a \"device qualifier\" ... plus more construction options\n- * for the config descriptor.\n+ * for the configuration descriptor.\n *\/\n static struct usb_endpoint_descriptor\n fsg_hs_bulk_in_desc = {\n@@ -547,8 +566,10 @@\n \n \/*-------------------------------------------------------------------------*\/\n \n-\/* If the next two routines are called while the gadget is registered,\n- * the caller must own fsg->filesem for writing. *\/\n+\/*\n+ * If the next two routines are called while the gadget is registered,\n+ * the caller must own fsg->filesem for writing.\n+ *\/\n \n static int fsg_lun_open(struct fsg_lun *curlun, const char *filename)\n {\n@@ -587,8 +608,10 @@\n \t\tgoto out;\n \t}\n \n-\t\/* If we can't read the file, it's no good.\n-\t * If we can't write the file, use it read-only. *\/\n+\t\/*\n+\t * If we can't read the file, it's no good.\n+\t * If we can't write the file, use it read-only.\n+\t *\/\n \tif (!filp->f_op || !(filp->f_op->read || filp->f_op->aio_read)) {\n \t\tLINFO(curlun, \"file not readable: %s\\n\", filename);\n \t\tgoto out;\n@@ -646,8 +669,10 @@\n \n \/*-------------------------------------------------------------------------*\/\n \n-\/* Sync the file data, don't bother with the metadata.\n- * This code was copied from fs\/buffer.c:sys_fdatasync(). *\/\n+\/*\n+ * Sync the file data, don't bother with the metadata.\n+ * This code was copied from fs\/buffer.c:sys_fdatasync().\n+ *\/\n static int fsg_lun_fsync_sub(struct fsg_lun *curlun)\n {\n \tstruct file\t*filp = curlun->filp;\n@@ -728,8 +753,10 @@\n \tif (sscanf(buf, \"%d\", &i) != 1)\n \t\treturn -EINVAL;\n \n-\t\/* Allow the write-enable status to change only while the backing file\n-\t * is closed. *\/\n+\t\/*\n+\t * Allow the write-enable status to change only while the\n+\t * backing file is closed.\n+\t *\/\n \tdown_read(filesem);\n \tif (fsg_lun_is_open(curlun)) {\n \t\tLDBG(curlun, \"read-only status change prevented\\n\");\n"} {"commit":"6962aa5d4c1ed1e8923cb3c489b3d14ab4440d0e","subject":"examples: avoid a clashing name with the recently added GstEGLImagePool","message":"examples: avoid a clashing name with the recently added GstEGLImagePool\n\nFixes build with current master.\n","repos":"CapOM\/gst-omx,GStreamer\/gst-omx,renesas-rcar\/gst-omx,ismelykh\/gst-omx-deinterlace,varunkumara\/test-repo,freedesktop-unofficial-mirror\/gstreamer__gst-omx,varunkumara\/test-repo,surround-io\/gst-omx,surround-io\/gst-omx,GStreamer\/gst-omx,varunkumara\/test-repo,pliu6\/gst-omx,pliu6\/gst-omx,renesas-rcar\/gst-omx,CapOM\/gst-omx,freedesktop-unofficial-mirror\/gstreamer__gst-omx,renesas-rcar\/gst-omx,GStreamer\/gst-omx,leio\/gst-omx,leio\/gst-omx,ismelykh\/gst-omx-deinterlace,CapOM\/gst-omx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/egl\/testegl.c\n+++ examples\/egl\/testegl.c\n@@ -207,15 +207,15 @@\n gboolean add_metavideo;\n gboolean want_eglimage;\n GstEGLDisplay *display;\n-} GstEGLImageBufferPool;\n-\n-typedef GstVideoBufferPoolClass GstEGLImageBufferPoolClass;\n-\n-#define GST_EGL_IMAGE_BUFFER_POOL(p) ((GstEGLImageBufferPool*)(p))\n-\n-GType gst_egl_image_buffer_pool_get_type (void);\n-\n-G_DEFINE_TYPE (GstEGLImageBufferPool, gst_egl_image_buffer_pool,\n+} GstCustomEGLImageBufferPool;\n+\n+typedef GstVideoBufferPoolClass GstCustomEGLImageBufferPoolClass;\n+\n+#define GST_CUSTOM_EGL_IMAGE_BUFFER_POOL(p) ((GstCustomEGLImageBufferPool*)(p))\n+\n+GType gst_custom_egl_image_buffer_pool_get_type (void);\n+\n+G_DEFINE_TYPE (GstCustomEGLImageBufferPool, gst_custom_egl_image_buffer_pool,\n GST_TYPE_VIDEO_BUFFER_POOL);\n \n static void init_ogl (APP_STATE_T * state);\n@@ -227,7 +227,7 @@\n static void update_model (APP_STATE_T * state);\n static void init_textures (APP_STATE_T * state);\n static APP_STATE_T _state, *state = &_state;\n-static GstBufferPool *gst_egl_image_buffer_pool_new (APP_STATE_T * state,\n+static GstBufferPool *gst_custom_egl_image_buffer_pool_new (APP_STATE_T * state,\n GstEGLDisplay * display);\n static gboolean queue_object (APP_STATE_T * state, GstMiniObject * obj,\n gboolean synchronous);\n@@ -402,7 +402,7 @@\n }\n \n static const gchar **\n-gst_egl_image_buffer_pool_get_options (GstBufferPool * bpool)\n+gst_custom_egl_image_buffer_pool_get_options (GstBufferPool * bpool)\n {\n static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL\n };\n@@ -411,10 +411,10 @@\n }\n \n static gboolean\n-gst_egl_image_buffer_pool_set_config (GstBufferPool * bpool,\n+gst_custom_egl_image_buffer_pool_set_config (GstBufferPool * bpool,\n GstStructure * config)\n {\n- GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (bpool);\n+ GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (bpool);\n GstCaps *caps;\n GstVideoInfo info;\n \n@@ -423,7 +423,8 @@\n pool->allocator = NULL;\n \n if (!GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->set_config (bpool, config))\n+ (gst_custom_egl_image_buffer_pool_parent_class)->set_config (bpool,\n+ config))\n return FALSE;\n \n if (!gst_buffer_pool_config_get_params (config, &caps, NULL, NULL, NULL)\n@@ -452,16 +453,16 @@\n }\n \n static GstFlowReturn\n-gst_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,\n+gst_custom_egl_image_buffer_pool_alloc_buffer (GstBufferPool * bpool,\n GstBuffer ** buffer, GstBufferPoolAcquireParams * params)\n {\n- GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (bpool);\n+ GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (bpool);\n *buffer = NULL;\n \n if (!pool->add_metavideo || !pool->want_eglimage)\n return\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n+ (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n buffer, params);\n \n if (!pool->allocator)\n@@ -487,8 +488,8 @@\n gst_query_unref (query);\n return\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n- buffer, params);\n+ (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer\n+ (bpool, buffer, params);\n }\n \n v = gst_structure_get_value (s, \"buffer\");\n@@ -499,8 +500,8 @@\n GST_WARNING (\"Fallback memory allocation\");\n return\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n- buffer, params);\n+ (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer\n+ (bpool, buffer, params);\n }\n \n return GST_FLOW_OK;\n@@ -509,7 +510,7 @@\n default:\n return\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n+ (gst_custom_egl_image_buffer_pool_parent_class)->alloc_buffer (bpool,\n buffer, params);\n break;\n }\n@@ -518,20 +519,20 @@\n }\n \n static GstFlowReturn\n-gst_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,\n+gst_custom_egl_image_buffer_pool_acquire_buffer (GstBufferPool * bpool,\n GstBuffer ** buffer, GstBufferPoolAcquireParams * params)\n {\n GstFlowReturn ret;\n- GstEGLImageBufferPool *pool;\n+ GstCustomEGLImageBufferPool *pool;\n \n ret =\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,\n+ (gst_custom_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,\n buffer, params);\n if (ret != GST_FLOW_OK || !*buffer)\n return ret;\n \n- pool = GST_EGL_IMAGE_BUFFER_POOL (bpool);\n+ pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (bpool);\n \n \/* XXX: Don't return the memory we just rendered, glEGLImageTargetTexture2DOES()\n * keeps the EGLImage unmappable until the next one is uploaded\n@@ -542,7 +543,7 @@\n \n ret =\n GST_BUFFER_POOL_CLASS\n- (gst_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,\n+ (gst_custom_egl_image_buffer_pool_parent_class)->acquire_buffer (bpool,\n buffer, params);\n gst_object_replace ((GstObject **) & oldbuf->pool, (GstObject *) pool);\n gst_buffer_unref (oldbuf);\n@@ -552,9 +553,9 @@\n }\n \n static void\n-gst_egl_image_buffer_pool_finalize (GObject * object)\n-{\n- GstEGLImageBufferPool *pool = GST_EGL_IMAGE_BUFFER_POOL (object);\n+gst_custom_egl_image_buffer_pool_finalize (GObject * object)\n+{\n+ GstCustomEGLImageBufferPool *pool = GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (object);\n \n if (pool->allocator)\n gst_object_unref (pool->allocator);\n@@ -564,34 +565,39 @@\n gst_egl_display_unref (pool->display);\n pool->display = NULL;\n \n- G_OBJECT_CLASS (gst_egl_image_buffer_pool_parent_class)->finalize (object);\n-}\n-\n-static void\n-gst_egl_image_buffer_pool_class_init (GstEGLImageBufferPoolClass * klass)\n+ G_OBJECT_CLASS (gst_custom_egl_image_buffer_pool_parent_class)->finalize\n+ (object);\n+}\n+\n+static void\n+gst_custom_egl_image_buffer_pool_class_init (GstCustomEGLImageBufferPoolClass *\n+ klass)\n {\n GObjectClass *gobject_class = (GObjectClass *) klass;\n GstBufferPoolClass *gstbufferpool_class = (GstBufferPoolClass *) klass;\n \n- gobject_class->finalize = gst_egl_image_buffer_pool_finalize;\n- gstbufferpool_class->get_options = gst_egl_image_buffer_pool_get_options;\n- gstbufferpool_class->set_config = gst_egl_image_buffer_pool_set_config;\n- gstbufferpool_class->alloc_buffer = gst_egl_image_buffer_pool_alloc_buffer;\n+ gobject_class->finalize = gst_custom_egl_image_buffer_pool_finalize;\n+ gstbufferpool_class->get_options =\n+ gst_custom_egl_image_buffer_pool_get_options;\n+ gstbufferpool_class->set_config = gst_custom_egl_image_buffer_pool_set_config;\n+ gstbufferpool_class->alloc_buffer =\n+ gst_custom_egl_image_buffer_pool_alloc_buffer;\n gstbufferpool_class->acquire_buffer =\n- gst_egl_image_buffer_pool_acquire_buffer;\n-}\n-\n-static void\n-gst_egl_image_buffer_pool_init (GstEGLImageBufferPool * pool)\n+ gst_custom_egl_image_buffer_pool_acquire_buffer;\n+}\n+\n+static void\n+gst_custom_egl_image_buffer_pool_init (GstCustomEGLImageBufferPool * pool)\n {\n }\n \n static GstBufferPool *\n-gst_egl_image_buffer_pool_new (APP_STATE_T * state, GstEGLDisplay * display)\n-{\n- GstEGLImageBufferPool *pool;\n-\n- pool = g_object_new (gst_egl_image_buffer_pool_get_type (), NULL);\n+gst_custom_egl_image_buffer_pool_new (APP_STATE_T * state,\n+ GstEGLDisplay * display)\n+{\n+ GstCustomEGLImageBufferPool *pool;\n+\n+ pool = g_object_new (gst_custom_egl_image_buffer_pool_get_type (), NULL);\n pool->display = gst_egl_display_ref (state->gst_display);\n pool->state = state;\n \n@@ -1131,7 +1137,7 @@\n \n buffer =\n gst_egl_allocate_eglimage (state,\n- GST_EGL_IMAGE_BUFFER_POOL (state->pool)->allocator, format,\n+ GST_CUSTOM_EGL_IMAGE_BUFFER_POOL (state->pool)->allocator, format,\n width, height);\n g_value_init (&v, G_TYPE_POINTER);\n g_value_set_pointer (&v, buffer);\n@@ -1301,7 +1307,7 @@\n \n GST_DEBUG (\"create new pool\");\n state->pool = pool =\n- gst_egl_image_buffer_pool_new (state, state->display);\n+ gst_custom_egl_image_buffer_pool_new (state, state->display);\n GST_DEBUG (\"done create new pool %p\", pool);\n \/* the normal size of a frame *\/\n size = info.size;\n"} {"commit":"0b4e9ba542ffca828e5d1bed6cc53038cdd9946c","subject":"removed dead code","message":"removed dead code\n","repos":"jeckersb\/Proton,alanconway\/qpid-proton,kgiusti\/qpid-proton,RobertoMalatesta\/qpid-proton,wprice\/qpid-proton,RobertoMalatesta\/qpid-proton,jeckersb\/Proton,prestona\/qpid-proton,gemmellr\/qpid-proton,apache\/qpid-proton,jeckersb\/Proton,wprice\/qpid-proton,astitcher\/qpid-proton,bozzzzo\/qpid-proton,apache\/qpid-proton,apache\/qpid-proton,wprice\/qpid-proton,ssorj\/qpid-proton,Karm\/qpid-proton,jeckersb\/Proton,prestona\/qpid-proton,FlaPer87\/qpid-proton,wprice\/qpid-proton,ssorj\/qpid-proton,Karm\/qpid-proton,datawire\/qpid-proton,datawire\/qpid-proton,kgiusti\/qpid-proton,ChugR\/qpid-proton,gemmellr\/qpid-proton-j,Karm\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,ChugR\/qpid-proton,FlaPer87\/qpid-proton,RobertoMalatesta\/qpid-proton,FlaPer87\/qpid-proton,clemensv\/qpid-proton,jeckersb\/Proton,jeckersb\/Proton,apache\/qpid-proton,bozzzzo\/qpid-proton,astitcher\/qpid-proton,astitcher\/qpid-proton,kgiusti\/qpid-proton,Karm\/qpid-proton,FlaPer87\/qpid-proton,clemensv\/qpid-proton,bozzzzo\/qpid-proton,FlaPer87\/qpid-proton,wprice\/qpid-proton,bozzzzo\/qpid-proton,Azure\/qpid-proton,jeckersb\/Proton,clemensv\/qpid-proton,wprice\/qpid-proton,datawire\/qpid-proton,gemmellr\/qpid-proton,datawire\/qpid-proton,Azure\/qpid-proton,bozzzzo\/qpid-proton,FlaPer87\/qpid-proton,alanconway\/qpid-proton,ssorj\/qpid-proton,alanconway\/qpid-proton,jeckersb\/Proton,jeckersb\/Proton,Karm\/qpid-proton,kgiusti\/qpid-proton,bozzzzo\/qpid-proton,datawire\/qpid-proton,clemensv\/qpid-proton,jeckersb\/Proton,bozzzzo\/qpid-proton,astitcher\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,RobertoMalatesta\/qpid-proton,FlaPer87\/qpid-proton,wprice\/qpid-proton,ssorj\/qpid-proton,datawire\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,FlaPer87\/qpid-proton,ChugR\/qpid-proton,Azure\/qpid-proton,FlaPer87\/qpid-proton,gemmellr\/qpid-proton,Azure\/qpid-proton,Karm\/qpid-proton,datawire\/qpid-proton,gemmellr\/qpid-proton,datawire\/qpid-proton,FlaPer87\/qpid-proton,jeckersb\/Proton,Karm\/qpid-proton,datawire\/qpid-proton,datawire\/qpid-proton,datawire\/qpid-proton,RobertoMalatesta\/qpid-proton,apache\/qpid-proton,Azure\/qpid-proton,bozzzzo\/qpid-proton,jeckersb\/Proton,prestona\/qpid-proton,Azure\/qpid-proton,Azure\/qpid-proton,RobertoMalatesta\/qpid-proton,apache\/qpid-proton,clemensv\/qpid-proton,gemmellr\/qpid-proton,Azure\/qpid-proton,prestona\/qpid-proton,bozzzzo\/qpid-proton,RobertoMalatesta\/qpid-proton,bozzzzo\/qpid-proton,ssorj\/qpid-proton,wprice\/qpid-proton,wprice\/qpid-proton,Karm\/qpid-proton,clemensv\/qpid-proton,FlaPer87\/qpid-proton,prestona\/qpid-proton,RobertoMalatesta\/qpid-proton,wprice\/qpid-proton,alanconway\/qpid-proton,astitcher\/qpid-proton,datawire\/qpid-proton,RobertoMalatesta\/qpid-proton,wprice\/qpid-proton,Azure\/qpid-proton,astitcher\/qpid-proton,gemmellr\/qpid-proton,FlaPer87\/qpid-proton,clemensv\/qpid-proton,ssorj\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,bozzzzo\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,kgiusti\/qpid-proton,clemensv\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,RobertoMalatesta\/qpid-proton,clemensv\/qpid-proton,prestona\/qpid-proton,kgiusti\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,clemensv\/qpid-proton,RobertoMalatesta\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,gemmellr\/qpid-proton-j,Karm\/qpid-proton,clemensv\/qpid-proton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- proton-c\/src\/engine\/engine-internal.h\n+++ proton-c\/src\/engine\/engine-internal.h\n@@ -307,8 +307,6 @@\n bool work;\n bool tpwork;\n bool done;\n- bool constructed; \/\/ track whether the delivery was explicitly\n- \/\/ constructed or not\n bool referenced;\n };\n \n"} {"commit":"bced89e7f7f52203f2d62a14c057913cdca37718","subject":"lower client timeout.","message":"lower client timeout.\n\nadd function declaration\n\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@4160 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/include\/psc_rpc\/rpc.h\n+++ psc_fsutil_libs\/include\/psc_rpc\/rpc.h\n@@ -605,6 +605,9 @@\n pscrpc_check_set(struct pscrpc_request_set *set,\n \t\t int check_allsent);\n \n+int \n+pscrpc_set_finalize(struct pscrpc_request_set *set, int block, int destroy);\n+\n int pscrpc_set_wait(struct pscrpc_request_set *);\n void pscrpc_set_destroy(struct pscrpc_request_set *);\n \n@@ -832,7 +835,7 @@\n *\tmodel can be used for server threads so long as liblustre_wait_event()\n *\tis replaced with something that uses timed waitq's.\n *\/\n-#define pscrpc_timeout 13\n+#define pscrpc_timeout 1\n #define __psc_client_wait_event(wq, condition, info, ret, excl)\t\t\\\n \tdo {\t\t\t\t\t\t\t\t\\\n \t\ttime_t __timeout = info->lwi_timeout;\t\t\t\\\n"} {"commit":"87f27a56d676cf2e6e1b3a10a97b31bcda95c79b","subject":"only define PAGE_SIZE if not already defined. this is insane, by the way","message":"only define PAGE_SIZE if not already defined. this is insane, by the way\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@3967 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/pfl","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/include\/psc_rpc\/rpc.h\n+++ psc_fsutil_libs\/include\/psc_rpc\/rpc.h\n@@ -80,7 +80,10 @@\n #define ZOBD_FREE(ptr, size) free(ptr)\n #define ZOBD_ALLOC(ptr, size) ((ptr) = PSCALLOC(size))\n \n+#ifndef PAGE_SIZE\n #define PAGE_SIZE 4096\n+#endif\n+\n #define PSCRPC_MAX_BRW_SIZE LNET_MTU\n #define PSCRPC_MAX_BRW_PAGES (PSCRPC_MAX_BRW_SIZE\/PAGE_SIZE)\n #define CURRENT_SECONDS time(NULL)\n"} {"commit":"f9509e0402b2911303027777cdec97a0afd630dd","subject":"Finished exercise 1.5","message":"Finished exercise 1.5\n","repos":"jdwissler\/the_c_book","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ch1\/1_5.c\n+++ ch1\/1_5.c\n@@ -12,11 +12,6 @@\n #define SORT_SIZE 5\n #define ASCII_ZERO 48\n \n-static char map[] = {\n- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',\n- 'A', 'B', 'C', 'D', 'E', 'F'\n-};\n-\n int get_int() {\n int integer_value = 0;\n char c;\n@@ -29,6 +24,7 @@\n }\n \n #define BUF_MAX 32 \/\/ I.e 32 bits\n+\n void print_base(int n, int b, char* digits) {\n char buf[BUF_MAX] = {0};\n int i = 0;\n@@ -37,6 +33,8 @@\n n \/= b;\n }\n \n+ \/\/ Since each digit is calculated in reverse we need to print the\n+ \/\/ result in reverse.\n while (i >= 0) {\n printf(\"%c\", buf[i--]);\n }\n"} {"commit":"bb2adacb8356ffd0d6f88142015e81d38e2a0522","subject":"Use stack-based BSON instead of heap-allocated","message":"Use stack-based BSON instead of heap-allocated\n","repos":"derickr\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,10gen-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,derickr\/mongo-php-driver,derickr\/mongo-php-driver-prototype,derickr\/mongo-php-driver,jmikola\/mongo-php-driver,10gen-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,jmikola\/mongo-php-driver-prototype,derickr\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,derickr\/mongo-php-driver,jmikola\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,10gen-labs\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,derickr\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,mongodb\/mongo-php-driver,jmikola\/mongo-php-driver,mongodb\/mongo-php-driver,derickr\/mongo-php-driver,mongodb\/mongo-php-driver,mongodb-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,derickr\/mongo-php-driver-prototype,10gen-labs\/mongo-php-driver-prototype,derickr\/mongo-php-driver,jmikola\/mongo-php-driver-prototype,10gen-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,derickr\/mongo-php-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- php_phongo.c\n+++ php_phongo.c\n@@ -621,7 +621,7 @@\n \tphp_phongo_writeresult_t *writeresult;\n \tzval *zwriteConcern = NULL;\n \tconst mongoc_write_concern_t *write_concern;\n-\tbson_t *opts;\n+\tbson_t opts = BSON_INITIALIZER;\n \n \tif (bulk_write->executed) {\n \t\tphongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, \"BulkWrite objects may only be executed once and this instance has already been executed\");\n@@ -633,14 +633,15 @@\n \t\treturn false;\n \t}\n \n-\topts = bson_new();\n-\n \t\/* FIXME: Legacy way of specifying the writeConcern option into this function *\/\n \tif (options && Z_TYPE_P(options) == IS_OBJECT && instanceof_function(Z_OBJCE_P(options), php_phongo_writeconcern_ce TSRMLS_CC)) {\n \t\tzwriteConcern = options;\n-\t} else if (!phongo_execute_parse_options(client, server_id, options, PHONGO_COMMAND_WRITE, opts, NULL, &zwriteConcern TSRMLS_CC)) {\n+\t} else if (!phongo_execute_parse_options(client, server_id, options, PHONGO_COMMAND_WRITE, &opts, NULL, &zwriteConcern TSRMLS_CC)) {\n+\t\tbson_destroy(&opts);\n \t\treturn false;\n \t}\n+\n+\tbson_destroy(&opts);\n \n \tmongoc_bulk_operation_set_database(bulk, bulk_write->database);\n \tmongoc_bulk_operation_set_collection(bulk, bulk_write->collection);\n@@ -727,7 +728,7 @@\n \tchar *collname;\n \tmongoc_collection_t *collection;\n \tzval *zreadPreference = NULL;\n-\tbson_t *opts;\n+\tbson_t opts = BSON_INITIALIZER;\n \n \tif (!phongo_split_namespace(namespace, &dbname, &collname)) {\n \t\tphongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, \"%s: %s\", \"Invalid namespace provided\", namespace);\n@@ -742,15 +743,16 @@\n \tif (query->read_concern) {\n \t\tmongoc_collection_set_read_concern(collection, query->read_concern);\n \t}\n-\t\n-\topts = bson_new();\n \n \t\/* FIXME: Legacy way of specifying the readPreference option into this function *\/\n \tif (options && Z_TYPE_P(options) == IS_OBJECT && instanceof_function(Z_OBJCE_P(options), php_phongo_readpreference_ce TSRMLS_CC)) {\n \t\tzreadPreference = options;\n-\t} else if (!phongo_execute_parse_options(client, server_id, options, PHONGO_COMMAND_READ, opts, &zreadPreference, NULL TSRMLS_CC)) {\n+\t} else if (!phongo_execute_parse_options(client, server_id, options, PHONGO_COMMAND_READ, &opts, &zreadPreference, NULL TSRMLS_CC)) {\n+\t\tbson_destroy(&opts);\n \t\treturn false;\n \t}\n+\n+\tbson_destroy(&opts);\n \n \tcursor = mongoc_collection_find_with_opts(collection, query->filter, query->opts, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC));\n \tmongoc_collection_destroy(collection);\n@@ -797,7 +799,7 @@\n \tbson_iter_t iter;\n \tbson_t reply;\n \tbson_error_t error;\n-\tbson_t *opts;\n+\tbson_t opts = BSON_INITIALIZER;\n \tmongoc_cursor_t *cmd_cursor;\n \tuint32_t selected_server_id;\n \tzval *zreadPreference = NULL;\n@@ -805,18 +807,16 @@\n \n \tcommand = Z_COMMAND_OBJ_P(zcommand);\n \n-\topts = bson_new();\n-\n \t\/* FIXME: Legacy way of specifying the readPreference option into this function *\/\n \tif (options && Z_TYPE_P(options) == IS_OBJECT && instanceof_function(Z_OBJCE_P(options), php_phongo_readpreference_ce TSRMLS_CC)) {\n \t\tzreadPreference = options;\n-\t} else if (!phongo_execute_parse_options(client, server_id, options, type, opts, &zreadPreference, NULL TSRMLS_CC)) {\n+\t} else if (!phongo_execute_parse_options(client, server_id, options, type, &opts, &zreadPreference, NULL TSRMLS_CC)) {\n \t\treturn false;\n \t}\n \n-\tselected_server_id = phongo_do_select_server(client, opts, zreadPreference, server_id TSRMLS_CC);\n+\tselected_server_id = phongo_do_select_server(client, &opts, zreadPreference, server_id TSRMLS_CC);\n \tif (!selected_server_id) {\n-\t\tbson_free(opts);\n+\t\tbson_destroy(&opts);\n \t\treturn false;\n \t}\n \n@@ -825,31 +825,31 @@\n \t * command construction. *\/\n \tswitch (type) {\n \t\tcase PHONGO_COMMAND_RAW:\n-\t\t\tresult = mongoc_client_command_with_opts(client, db, command->bson, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC), opts, &reply, &error);\n+\t\t\tresult = mongoc_client_command_with_opts(client, db, command->bson, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC), &opts, &reply, &error);\n \t\t\tbreak;\n \t\tcase PHONGO_COMMAND_READ:\n-\t\t\tresult = mongoc_client_read_command_with_opts(client, db, command->bson, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC), opts, &reply, &error);\n+\t\t\tresult = mongoc_client_read_command_with_opts(client, db, command->bson, phongo_read_preference_from_zval(zreadPreference TSRMLS_CC), &opts, &reply, &error);\n \t\t\tbreak;\n \t\tcase PHONGO_COMMAND_WRITE:\n-\t\t\tresult = mongoc_client_write_command_with_opts(client, db, command->bson, opts, &reply, &error);\n+\t\t\tresult = mongoc_client_write_command_with_opts(client, db, command->bson, &opts, &reply, &error);\n \t\t\tbreak;\n \t\tcase PHONGO_COMMAND_READ_WRITE:\n \t\t\t\/* We can pass NULL as readPreference, as this argument was added historically, but has no function *\/\n-\t\t\tresult = mongoc_client_read_write_command_with_opts(client, db, command->bson, NULL, opts, &reply, &error);\n+\t\t\tresult = mongoc_client_read_write_command_with_opts(client, db, command->bson, NULL, &opts, &reply, &error);\n \t\t\tbreak;\n \t\tdefault:\n \t\t\t\/* Should never happen, but if it does: exception *\/\n \t\t\tphongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, \"Type '%d' should never have been passed to phongo_execute_command, please file a bug report\", type);\n-\t\t\tbson_free(opts);\n+\t\t\tbson_destroy(&opts);\n \t\t\treturn false;\n \t}\n \tif (!result) {\n \t\tphongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);\n-\t\tbson_free(opts);\n+\t\tbson_destroy(&opts);\n \t\treturn false;\n \t}\n \n-\tbson_free(opts);\n+\tbson_destroy(&opts);\n \n \tif (!return_value_used) {\n \t\tbson_destroy(&reply);\n"} {"commit":"d09451f0e1887bbbfdd69a6b1f9b7b3bc68ba688","subject":"remark","message":"remark\n","repos":"dmacvicar\/qemacs,dmacvicar\/qemacs,dmacvicar\/qemacs,dmacvicar\/qemacs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- charset.c\n+++ charset.c\n@@ -418,6 +418,7 @@\n {\n int l, i, n;\n \n+ \/\/ could set utf8_length[128...0xc0] to 0 as invalid bytes\n memset(utf8_length, 1, 256);\n \n i = 0xc0;\n"} {"commit":"298cc84f0e3e6122a7bd1581d93c6dbb1c66701c","subject":"Added missing file.","message":"Added missing file.\n","repos":"dsroche\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,wbhart\/flint2,jpflori\/flint2,dsroche\/flint2,jpflori\/flint2,wbhart\/flint2,wbhart\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,jpflori\/flint2","returncode":1,"stderr":"error: pathspec 'clz_tab.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- clz_tab.c\n+++ clz_tab.c\n@@ -0,0 +1,37 @@\n+\/* __clz_tab -- support for longlong.h\n+\n+Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001 Free Software Foundation,\n+Inc.\n+\n+ This file is free software; you can redistribute it and\/or modify\n+ it under the terms of the GNU Lesser General Public License as published by\n+ the Free Software Foundation; either version 2.1 of the License, or (at your\n+ option) any later version.\n+\n+ This file is distributed in the hope that it will be useful, but\n+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public\n+ License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public License\n+ along with this file; see the file COPYING.LIB. If not, write to\n+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n+ MA 02110-1301, USA. \n+\n+*\/\n+\n+#include \"longlong.h\"\n+\n+#ifdef NEED_CLZ_TAB\n+\n+const\n+unsigned char __flint_clz_tab[128] =\n+{\n+ 1,2,3,3,4,4,4,4,5,5,5,5,5,5,5,5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,\n+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,\n+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,\n+ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8\n+};\n+\n+#endif\n+\n"} {"commit":"d4433b6cdf7b793d4ca0b7cd1c36ead54f754e0e","subject":"Bump version","message":"Bump version\n","repos":"mongodb-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,10gen-labs\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,derickr\/mongo-php-driver,xplodwild\/mongo-php-driver-prototype,derickr\/mongo-php-driver,derickr\/mongo-php-driver-prototype,serebro\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,derickr\/mongo-php-driver,derickr\/mongo-php-driver,jmikola\/mongo-php-driver,10gen-labs\/mongo-php-driver-prototype,derickr\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,derickr\/mongo-php-driver-prototype,xplodwild\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,xplodwild\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,mongodb\/mongo-php-driver,derickr\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,10gen-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,jmikola\/mongo-php-driver-prototype,bjori\/mongo-php-driver-prototype,xplodwild\/mongo-php-driver-prototype,derickr\/mongo-php-driver,bjori\/mongo-php-driver-prototype,derickr\/mongo-php-driver,bjori\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,10gen-labs\/mongo-php-driver-prototype,mongodb-labs\/mongo-php-driver-prototype,serebro\/mongo-php-driver-prototype,xplodwild\/mongo-php-driver-prototype,serebro\/mongo-php-driver-prototype,derickr\/mongo-php-driver-prototype,mongodb\/mongo-php-driver,10gen-labs\/mongo-php-driver-prototype,serebro\/mongo-php-driver-prototype,jmikola\/mongo-php-driver-prototype,serebro\/mongo-php-driver-prototype,bjori\/mongo-php-driver-prototype,jmikola\/mongo-php-driver,bjori\/mongo-php-driver-prototype","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- php_phongo.h\n+++ php_phongo.h\n@@ -29,7 +29,7 @@\n extern zend_module_entry mongodb_module_entry;\n \n \/* FIXME: Its annoying to bump version. Move into phongo_version.h.in *\/\n-#define MONGODB_VERSION_S \"0.3.0\"\n+#define MONGODB_VERSION_S \"0.4.0\"\n #define MONGODB_STABILITY_S \"alpha\"\n #define MONGODB_VERSION MONGODB_VERSION_S\n \n"} {"commit":"848febc04be33e61e51761f7ee7bb3cc0c9f078a","subject":"fixup, forgot to commit a file","message":"fixup, forgot to commit a file\n","repos":"OpenMusicKontrollers\/chimaera_firmware,OpenMusicKontrollers\/chimaera_firmware,OpenMusicKontrollers\/chimaera_firmware","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- cmc\/cmc.c\n+++ cmc\/cmc.c\n@@ -388,7 +388,7 @@\n \t{\n \t\ttimestamp64_t _now, _config, _offset;\n \n-\t\t_now.stamp = now;\n+\t\t_now.stamstamp = now;\n \t\t_config.stamp = config.tuio.offset;\n \t\t_offset.fix = _now.fix + _config.fix;\n \t\toffset = _offset.stamp;\n"} {"commit":"f4ec763ab77ec22f2bff7b132b80c04c8fb1c39e","subject":"Fixing minor typo from my previous commit.","message":"Fixing minor typo from my previous commit.\n\nSigned-off-by: Tyler Anthony Romeo <caa02191bac06813640cbdc07c71de12bdcfde06@gmail.com>\n","repos":"PatidarWeb\/php-scrypt,PatidarWeb\/php-scrypt,PatidarWeb\/php-scrypt,danemacmillan\/php-scrypt,danemacmillan\/php-scrypt,danemacmillan\/php-scrypt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- php_scrypt.c\n+++ php_scrypt.c\n@@ -121,7 +121,7 @@\n \tkeyLength = 64;\n \traw_output = 0;\n if (zend_parse_parameters(\n- ZEND_NUM_ARGS() TSRMLS_CC, \"ss|llllb\",\n+ ZEND_NUM_ARGS() TSRMLS_CC, \"ssllll|b\",\n &password, &password_len, &salt, &salt_len,\n &phpN, &phpR, &phpP, &keyLength, &raw_output\n ) == FAILURE)\n@@ -230,4 +230,4 @@\n \tadd_assoc_long(return_value, \"r\", phpR);\n \tadd_assoc_long(return_value, \"p\", phpP);\n \treturn;\n-}+}\n"} {"commit":"fd98f4009e4c51da61b504196fe8d4c8fdf6fe85","subject":"Default re-chroot to '\/'","message":"Default re-chroot to '\/'\n","repos":"google\/nsjail,google\/nsjail","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cmdline.c\n+++ cmdline.c\n@@ -245,7 +245,7 @@\n \t(*nsjconf) = (struct nsjconf_t) {\n \t\t.hostname = \"NSJAIL\",\n \t\t.cwd = \"\/\",\n-\t\t.chroot = \"\",\n+\t\t.chroot = \"\/\",\n \t\t.argv = NULL,\n \t\t.port = 31337,\n \t\t.daemonize = false,\n@@ -299,7 +299,7 @@\n \t\t\t\"\\te: Immediately launch a single process on a console using execve [MODE_STANDALONE_EXECVE]\\n\"\n \t\t\t\"\\tr: Immediately launch a single process on a console, keep doing it forever [MODE_STANDALONE_RERUN]\"},\n \t\t{{\"cmd\", no_argument, NULL, 0x500}, \"Equivalent of -Mo (MODE_STANDALONE_ONCE), run command on a local console, once\"},\n-\t\t{{\"chroot\", required_argument, NULL, 'c'}, \"Directory containing \/ of the jail (default: none)\"},\n+\t\t{{\"chroot\", required_argument, NULL, 'c'}, \"Directory containing \/ of the jail (default: \\\"\/\\\")\"},\n \t\t{{\"rw\", no_argument, NULL, 0x0601}, \"Mount \/ as RW (default: RO)\"},\n \t\t{{\"user\", required_argument, NULL, 'u'}, \"Username\/uid of processess inside the jail (default: 'nobody')\"},\n \t\t{{\"group\", required_argument, NULL, 'g'}, \"Groupname\/gid of processess inside the jail (default: 'nogroup')\"},\n@@ -553,7 +553,7 @@\n \t\tp->fs_type = \"proc\";\n \t\tTAILQ_INSERT_HEAD(&nsjconf->mountpts, p, pointers);\n \t}\n-\tif (strlen(nsjconf->chroot) > 0) {\n+\t{\n \t\tstruct mounts_t *p = util_malloc(sizeof(struct mounts_t));\n \t\tp->src = nsjconf->chroot;\n \t\tp->dst = \"\/\";\n"} {"commit":"d8bd5cd8fb3fe5a76466150802f177483e075dcc","subject":"Added PV-DBOW method","message":"Added PV-DBOW method\n\n-dbow switch becomes -model: 0, 1, 2 to decide between DM, DBOW, or BOTH\nParagraph structs now have two separate arrays to store the different vectors\nThese are concatenated at the end if necessary\n","repos":"zseymour\/phrase2vec,zseymour\/phrase2vec,zseymour\/phrase2vec","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- phrase2vec.c\n+++ phrase2vec.c\n@@ -41,7 +41,8 @@\n \n struct paragraph {\n long long word_count;\n- real *vector;\n+ real *dbow_vector;\n+ real *dm_vector;\n int label_index;\n char **words;\n };\n@@ -52,7 +53,7 @@\n struct vocab_word *vocab;\n struct paragraph *phrases;\n char **labels;\n-int binary = 0, dbow = 0, debug_mode = 2, window = 5, min_count = 5, num_threads = 1, min_reduce = 1;\n+int binary = 0, model = 2, debug_mode = 2, window = 5, min_count = 5, num_threads = 1, min_reduce = 1;\n int *vocab_hash;\n long long vocab_max_size = 10000, vocab_size = 0, phrase_max_size = 100000, phrase_size = 0, layer1_size = 100, label_max_size = 10, label_size = 0, labeled_instances = 0;\n long long train_words = 0, word_count_actual = 0, file_size = 0, classes = 0;\n@@ -633,10 +634,15 @@\n for (b = 0; b < layer1_size; b++) for (a = 0; a < vocab_size; a++)\n syn0[a * layer1_size + b] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n for (b = 0; b < phrase_size; b++) {\n- a = posix_memalign((void **)&phrases[b].vector, 128, (long long)layer1_size * sizeof(real));\n- if(phrases[b].vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n+ a = posix_memalign((void **)&phrases[b].dm_vector, 128, (long long)layer1_size * sizeof(real));\n+ if(phrases[b].dm_vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n for(c = 0; c < layer1_size; c++) {\n- phrases[b].vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n+ phrases[b].dm_vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n+ }\n+ a = posix_memalign((void **)&phrases[b].dbow_vector, 128, (long long)layer1_size * sizeof(real));\n+ if(phrases[b].dbow_vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n+ for(c = 0; c < layer1_size; c++) {\n+ phrases[b].dbow_vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n }\n }\n CreateBinaryTree();\n@@ -699,7 +705,7 @@\n for (c = 0; c < layer1_size; c++) neu1e[c] = 0;\n next_random = next_random * (unsigned long long)25214903917 + 11;\n b = next_random % window;\n- if (!dbow) { \/\/train pv-dm\n+ if (model == 0 || model == 2) { \/\/train pv-dm\n \t\/\/ in -> hidden\n \tfor (a = b; a < window * 2 + 1 - b; a++) {\n \t if (a != window) {\n@@ -711,7 +717,7 @@\n \t for (c = 0; c < layer1_size; c++) neu1[c] += syn0[c + last_word * layer1_size];\n \t }\n \t}\n-\tfor (c = 0; c < layer1_size; c++) neu1[c] += phrases[i].vector[c];\n+\tfor (c = 0; c < layer1_size; c++) neu1[c] += phrases[i].dm_vector[c];\n \tif (hs) for (d = 0; d < vocab[word].codelen; d++) {\n \t f = 0;\n \t l2 = vocab[word].point[d] * layer1_size;\n@@ -765,8 +771,12 @@\n \t for (c = 0; c < layer1_size; c++) syn0[c + last_word * layer1_size] += neu1e[c];\n \t }\n \t}\n-\tfor (c = 0; c < layer1_size; c++) phrases[i].vector[c] += neu1e[c];\n- } else { \/\/train pv-dbow\n+\tfor (c = 0; c < layer1_size; c++) phrases[i].dm_vector[c] += neu1e[c];\n+\t\n+ } \n+ for (c = 0; c < layer1_size; c++) neu1[c] = 0;\n+ for (c = 0; c < layer1_size; c++) neu1e[c] = 0;\n+ if (model == 1 || model == 2) { \/\/train pv-dbow\n \tfor (a = b; a < window * 2 + 1 - b; a++) if (a != window) {\n \t c = sentence_position - window + a;\n \t if (c < 0) continue;\n@@ -780,7 +790,7 @@\n \t\tf = 0;\n \t\tl2 = vocab[word].point[d] * layer1_size;\n \t\t\/\/ Propagate hidden -> output\n-\t\tfor (c = 0; c < layer1_size; c++) f += syn0[c + l1] * syn1[c + l2];\n+\t\tfor (c = 0; c < layer1_size; c++) f += phrases[i].dbow_vector[c] * syn1[c + l2];\n \t\tif (f <= -MAX_EXP) continue;\n \t\telse if (f >= MAX_EXP) continue;\n \t\telse f = expTable[(int)((f + MAX_EXP) * (EXP_TABLE_SIZE \/ MAX_EXP \/ 2))];\n@@ -813,7 +823,8 @@\n \t\tfor (c = 0; c < layer1_size; c++) syn1neg[c + l2] += g * syn0[c + l1];\n \t }\n \t \/\/ Learn weights input -> hidden\n-\t for (c = 0; c < layer1_size; c++) syn0[c + l1] += neu1e[c];\n+\t \/\/for (c = 0; c < layer1_size; c++) syn0[c + l1] += neu1e[c];\n+\t for(c = 0; c < layer1_size; c++) phrases[i].dbow_vector[c] += neu1e[c];\n \t }\n }\n }\n@@ -857,7 +868,12 @@\n int arr[label_size];\n memset(arr, 0, sizeof(arr));\n if(phrases[a].label_index == -1) continue;\n- for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].vector[b]);\n+ if(model == 0)\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dm_vector[b]);\n+ else if (model == 1)\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dbow_vector[b]);\n+ else\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dm_vector[b] + phrases[a].dbow_vector[b]);\n fprintf(fo, \"\\n\");\n arr[phrases[a].label_index] = 1;\n for (b = 0; b < label_size; b++) fprintf(fo, \"%d \", arr[b]);\n@@ -890,18 +906,25 @@\n \n if(para_file_test[0] == 0) return;\n printf(\"Now learning vectors for test paragraphs.\\n\");\n+ \/\/Reset to starting conditions\n pt = (pthread_t *)malloc(num_threads * sizeof(pthread_t));\n phrases = (struct paragraph *)calloc(phrase_max_size, sizeof(struct paragraph));\n for (b = 0; b < phrase_size; b++) {\n- a = posix_memalign((void **)&phrases[b].vector, 128, (long long)layer1_size * sizeof(real));\n- if(phrases[b].vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n+ a = posix_memalign((void **)&phrases[b].dm_vector, 128, (long long)layer1_size * sizeof(real));\n+ if(phrases[b].dm_vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n for(c = 0; c < layer1_size; c++) {\n- phrases[b].vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n+ phrases[b].dm_vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n+ }\n+ a = posix_memalign((void **)&phrases[b].dbow_vector, 128, (long long)layer1_size * sizeof(real));\n+ if(phrases[b].dbow_vector == NULL) {printf(\"Memory allocation failed\\n\"); exit(1);}\n+ for(c = 0; c < layer1_size; c++) {\n+ phrases[b].dbow_vector[c] = (rand() \/ (real)RAND_MAX - 0.5) \/ layer1_size;\n }\n }\n phrase_size = 0;\n train_words = 0;\n labeled_instances = 0;\n+ \/\/freeze_words to true so that we don't change any word vectors\n freeze_words = 1;\n alpha = initial_alpha;\n starting_alpha = initial_alpha;\n@@ -924,7 +947,13 @@\n int arr[label_size];\n memset(arr, 0, sizeof(arr));\n if(phrases[a].label_index == -1) continue;\n- for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].vector[b]);\n+\n+ if(model == 0)\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dm_vector[b]);\n+ else if (model == 1)\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dbow_vector[b]);\n+ else\n+ for (b = 0; b < layer1_size; b++) fprintf(fo, \"%lf \", phrases[a].dm_vector[b] + phrases[a].dbow_vector[b]);\n fprintf(fo, \"\\n\");\n arr[phrases[a].label_index] = 1;\n for (b = 0; b < label_size; b++) fprintf(fo, \"%d \", arr[b]);\n@@ -991,8 +1020,8 @@\n \/\/printf(\"\\t\\tThe vocabulary will be saved to <file>\\n\");\n \/\/printf(\"\\t-read-vocab <file>\\n\");\n \/\/printf(\"\\t\\tThe vocabulary will be read from <file>, not constructed from the training data\\n\");\n- printf(\"\\t-dbow <int>\\n\");\n- printf(\"\\t\\tUse the distributed bag of words model; default is 0 (PV-DM model)\\n\");\n+ printf(\"\\t-model <int>\\n\");\n+ printf(\"\\t\\t0 = PV-DM, 1 = PV-DBOW, 2 = Both (concatenate); default is 2\\n\");\n printf(\"\\nExamples:\\n\");\n printf(\".\/phrase2vec -train-dir dir -nn-train train.data -test-dir dir -nn-test test.data -debug 2 -size 200 -window 5 -sample 1e-4 -negative 5 -hs 0 -binary 0 -dbow 1\\n\\n\");\n return 0;\n@@ -1017,7 +1046,7 @@\n \/\/if ((i = ArgPos((char *)\"-read-vocab\", argc, argv)) > 0) strcpy(read_vocab_file, argv[i + 1]);\n if ((i = ArgPos((char *)\"-debug\", argc, argv)) > 0) debug_mode = atoi(argv[i + 1]);\n if ((i = ArgPos((char *)\"-binary\", argc, argv)) > 0) binary = atoi(argv[i + 1]);\n- if ((i = ArgPos((char *)\"-dbow\", argc, argv)) > 0) dbow = atoi(argv[i + 1]);\n+ if ((i = ArgPos((char *)\"-model\", argc, argv)) > 0) model = atoi(argv[i + 1]);\n if ((i = ArgPos((char *)\"-alpha\", argc, argv)) > 0) alpha = atof(argv[i + 1]);\n if ((i = ArgPos((char *)\"-output\", argc, argv)) > 0) strcpy(output_file, argv[i + 1]);\n if ((i = ArgPos((char *)\"-window\", argc, argv)) > 0) window = atoi(argv[i + 1]);\n"} {"commit":"7b19a257c44cede54424ddb656daa5c83766ed04","subject":"Error out if -p is used on unsupported platforms","message":"Error out if -p is used on unsupported platforms\n","repos":"google\/honggfuzz,google\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cmdline.c\n+++ cmdline.c\n@@ -651,6 +651,9 @@\n LOG_E(\"-p '%d' is invalid\", hfuzz->netbsd.pid);\n return false;\n }\n+#else\n+ LOG_E(\"-p not supported on this platform\");\n+ return false;\n #endif\n break;\n case 0x502:\n"} {"commit":"960eeaa8b8db54150a42299ed82d52dfa374650d","subject":"Added run length encoding header file","message":"Added run length encoding header file\n","repos":"couchbaselabs\/indexing,couchbaselabs\/indexing","returncode":1,"stderr":"error: pathspec 'cmp\/rle.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- cmp\/rle.h\n+++ cmp\/rle.h\n@@ -0,0 +1,72 @@\n+\/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- *\/\n+\/**\n+ * @copyright 2014 Couchbase, Inc.\n+ *\n+ * @author Fulu Li <fulu@couchbase.com>\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\"); you may not\n+ * use this file except in compliance with the License. You may obtain a copy of\n+ * the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n+ * License for the specific language governing permissions and limitations under\n+ * the License.\n+ **\/\n+\n+#ifndef _RLE_H\n+#define _RLE_H\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <stdint.h>\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+ typedef struct {\n+ char *buf;\n+ uint32_t size;\n+ } sized_buf;\n+\n+ typedef enum {\n+ RLE_ENCODE_SUCCESS,\n+ RLE_ENCODE_ERROR_INPUT_INVALID,\n+ RLE_ENCODE_ERROR_ALLOCATION_FAILURE\n+ } rle_encode_error_t;\n+\n+ typedef enum {\n+ RLE_DECODE_SUCCESS,\n+ RLE_DECODE_ERROR_INPUT_INVALID,\n+ RLE_DECODE_ERROR_ALLOCATION_FAILURE\n+ } rle_decode_error_t;\n+\n+ \/* traditional run length encoding algorithm that is suited for\n+ in memory compression\n+ *\/\n+ rle_encode_error_t rle_enc_trd(sized_buf *in,\n+ sized_buf **out);\n+\n+ rle_decode_error_t rle_dec_trd(sized_buf *in,\n+ sized_buf **out);\n+\n+\n+ \/* run length encoding based on PackBits algorithm that is suited for\n+ in memory compression\n+ *\/\n+ rle_encode_error_t rle_enc_pkb(sized_buf *in,\n+ sized_buf **out);\n+\n+ rle_decode_error_t rle_dec_pkb(sized_buf *in,\n+ sized_buf **out);\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif\n+\n"} {"commit":"696562db3c1f648c21b91340acb1cd93e504c754","subject":"Inlude a comment in generated files noting that they are generated","message":"Inlude a comment in generated files noting that they are generated\n","repos":"dpw\/euphemus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- codegen.c\n+++ codegen.c\n@@ -697,15 +697,20 @@\n \t\t*last_dot = 0;\n }\n \n-static void codegen_prolog(const char *out_path, FILE *c_out, FILE *h_out)\n-{\n-\tfprintf(h_out, \"#include \\\"euphemus.h\\\"\\n\\n\");\n+static void codegen_prolog(const char *path, const char *out_path,\n+\t\t\t FILE *c_out, FILE *h_out)\n+{\n+\tfprintf(h_out,\n+\t\t\"\/* Generated from \\\"%s\\\". You probably shouldn't edit this file. *\/\\n\\n\"\n+\t\t\"#include \\\"euphemus.h\\\"\\n\\n\",\n+\t\tpath);\n \n \tfprintf(c_out,\n+\t\t\"\/* Generated from \\\"%s\\\". You probably shouldn't edit this file. *\/\\n\\n\"\n \t\t\"#include <stddef.h>\\n\\n\"\n \t\t\"#include \\\"%s\\\"\\n\"\n \t\t\"#include \\\"euphemus.h\\\"\\n\\n\",\n-\t\tout_path);\n+\t\tpath, out_path);\n }\n \n static struct type_info *alloc_definition(struct codegen *codegen,\n@@ -825,7 +830,7 @@\n \tif (!codegen.h_out)\n \t\tdie(\"error opening \\\"%s\\\": %s\", out_path, strerror(errno));\n \n-\tcodegen_prolog(out_path, codegen.c_out, codegen.h_out);\n+\tcodegen_prolog(path, out_path, codegen.c_out, codegen.h_out);\n \n \tcodegen_init(&codegen);\n \n"} {"commit":"cfb6fbbb6ae7c523102a8882668f36539c6fd817","subject":"Update Configuration.h","message":"Update Configuration.h","repos":"wieslawsoltes\/BatchEncoder,wieslawsoltes\/BatchEncoder,wieslawsoltes\/BatchEncoder,wieslawsoltes\/BatchEncoder","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e70f15b4a4fc509ba95cf42855d2262c5f429d03","subject":"no message","message":"no message\n\n\ngit-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@1734 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"psteinb\/gpac,RodolpheFouquet\/gpac,canatella\/gpac,Bevara\/Access-open,RodolpheFouquet\/gpac,drakeguan\/gpac,aymanelyaagoubi\/gpac,nguyen-viet-thanh-trung\/gpac,DmitrySigaev\/gpac,emmanouil\/gpac,DmitrySigaev\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,nguyen-viet-thanh-trung\/gpac,vladimir-kazakov\/gpac,canatella\/gpac,epam\/gpac,gpac\/gpac,rauf\/gpac,epam\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,canatella\/gpac,DmitrySigaev\/gpac,DmitrySigaev\/gpac,rbouqueau\/gpac,vladimir-kazakov\/gpac,ARSekkat\/gpac,vladimir-kazakov\/gpac,rbouqueau\/gpac,porcelijn\/gpac,rbouqueau\/gpac_brew_travis,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,emmanouil\/gpac,drakeguan\/gpac,vladimir-kazakov\/gpac,Bevara\/Access-open,gpac\/gpac,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,porcelijn\/gpac,canatella\/gpac,psteinb\/gpac,nguyen-viet-thanh-trung\/gpac,drakeguan\/gpac,rbouqueau\/gpac_brew_travis,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,rauf\/gpac,gpac\/gpac,rauf\/gpac,rbouqueau\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,canatella\/gpac,epam\/gpac,porcelijn\/gpac,rbouqueau\/gpac,epam\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,rbouqueau\/gpac,vladimir-kazakov\/gpac,DmitrySigaev\/gpac,ARSekkat\/gpac,rauf\/gpac,ARSekkat\/gpac,drakeguan\/gpac,rbouqueau\/gpac,drakeguan\/gpac,ARSekkat\/gpac,DmitrySigaev\/gpac,ARSekkat\/gpac,aymanelyaagoubi\/gpac,drakeguan\/gpac,psteinb\/gpac,Bevara\/Access-open,psteinb\/gpac,RodolpheFouquet\/gpac,rauf\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,Bevara\/Access-open,emmanouil\/gpac,emmanouil\/gpac,rbouqueau\/gpac,nguyen-viet-thanh-trung\/gpac,vladimir-kazakov\/gpac,psteinb\/gpac,Bevara\/Access-open,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac,rauf\/gpac,ARSekkat\/gpac,canatella\/gpac,porcelijn\/gpac,epam\/gpac,psteinb\/gpac,gpac\/gpac,epam\/gpac,Bevara\/Access-open,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/dx_hw\/dx_2d.c\n+++ modules\/dx_hw\/dx_2d.c\n@@ -454,6 +454,7 @@\n \tHRESULT hr;\n \tDDCONTEXT;\n \n+\tif (!dd->pDD) return NULL;\n \t\/*yuv format*\/\n \tif (pixelformat_yuv(pixel_format)) {\n \t\tif (dr->yuv_pixel_format) {\n"} {"commit":"f8170db39088d577ab095f28b3ae12ae8c604fe5","subject":"esp8266: Enable WebREPL file transfer rate limiting.","message":"esp8266: Enable WebREPL file transfer rate limiting.\n","repos":"puuu\/micropython,TDAbboud\/micropython,infinnovation\/micropython,henriknelson\/micropython,adafruit\/micropython,mpalomer\/micropython,ganshun666\/micropython,turbinenreiter\/micropython,matthewelse\/micropython,alex-robbins\/micropython,Peetz0r\/micropython-esp32,redbear\/micropython,pozetroninc\/micropython,swegener\/micropython,pramasoul\/micropython,chrisdearman\/micropython,adafruit\/circuitpython,turbinenreiter\/micropython,HenrikSolver\/micropython,MrSurly\/micropython-esp32,matthewelse\/micropython,tuc-osg\/micropython,turbinenreiter\/micropython,infinnovation\/micropython,trezor\/micropython,swegener\/micropython,MrSurly\/micropython,oopy\/micropython,praemdonck\/micropython,Peetz0r\/micropython-esp32,lowRISC\/micropython,swegener\/micropython,tobbad\/micropython,micropython\/micropython-esp32,selste\/micropython,mhoffma\/micropython,HenrikSolver\/micropython,alex-march\/micropython,kerneltask\/micropython,Peetz0r\/micropython-esp32,adafruit\/micropython,HenrikSolver\/micropython,TDAbboud\/micropython,ryannathans\/micropython,toolmacher\/micropython,micropython\/micropython-esp32,swegener\/micropython,AriZuu\/micropython,drrk\/micropython,micropython\/micropython-esp32,infinnovation\/micropython,dxxb\/micropython,pozetroninc\/micropython,turbinenreiter\/micropython,MrSurly\/micropython,torwag\/micropython,MrSurly\/micropython-esp32,toolmacher\/micropython,pozetroninc\/micropython,pramasoul\/micropython,pfalcon\/micropython,torwag\/micropython,torwag\/micropython,pfalcon\/micropython,adafruit\/circuitpython,jmarcelino\/pycom-micropython,oopy\/micropython,tobbad\/micropython,selste\/micropython,toolmacher\/micropython,dxxb\/micropython,infinnovation\/micropython,dinau\/micropython,lowRISC\/micropython,trezor\/micropython,ganshun666\/micropython,alex-robbins\/micropython,alex-march\/micropython,cwyark\/micropython,emfcamp\/micropython,ryannathans\/micropython,drrk\/micropython,henriknelson\/micropython,tralamazza\/micropython,jmarcelino\/pycom-micropython,chrisdearman\/micropython,torwag\/micropython,ryannathans\/micropython,adafruit\/circuitpython,tralamazza\/micropython,selste\/micropython,cwyark\/micropython,dinau\/micropython,dmazzella\/micropython,matthewelse\/micropython,ryannathans\/micropython,adafruit\/circuitpython,pozetroninc\/micropython,tuc-osg\/micropython,alex-robbins\/micropython,redbear\/micropython,drrk\/micropython,hosaka\/micropython,PappaPeppar\/micropython,TDAbboud\/micropython,alex-robbins\/micropython,tuc-osg\/micropython,deshipu\/micropython,emfcamp\/micropython,hosaka\/micropython,dxxb\/micropython,micropython\/micropython-esp32,HenrikSolver\/micropython,tralamazza\/micropython,lowRISC\/micropython,cwyark\/micropython,drrk\/micropython,turbinenreiter\/micropython,MrSurly\/micropython-esp32,toolmacher\/micropython,pfalcon\/micropython,redbear\/micropython,bvernoux\/micropython,emfcamp\/micropython,SHA2017-badge\/micropython-esp32,dinau\/micropython,chrisdearman\/micropython,praemdonck\/micropython,hosaka\/micropython,SHA2017-badge\/micropython-esp32,selste\/micropython,tuc-osg\/micropython,mpalomer\/micropython,kerneltask\/micropython,hiway\/micropython,redbear\/micropython,puuu\/micropython,misterdanb\/micropython,mhoffma\/micropython,puuu\/micropython,kerneltask\/micropython,mpalomer\/micropython,lowRISC\/micropython,blazewicz\/micropython,mhoffma\/micropython,ganshun666\/micropython,tobbad\/micropython,deshipu\/micropython,TDAbboud\/micropython,misterdanb\/micropython,praemdonck\/micropython,blazewicz\/micropython,matthewelse\/micropython,bvernoux\/micropython,Timmenem\/micropython,chrisdearman\/micropython,SHA2017-badge\/micropython-esp32,PappaPeppar\/micropython,matthewelse\/micropython,alex-march\/micropython,misterdanb\/micropython,hiway\/micropython,pramasoul\/micropython,dxxb\/micropython,ryannathans\/micropython,torwag\/micropython,blazewicz\/micropython,pfalcon\/micropython,henriknelson\/micropython,henriknelson\/micropython,MrSurly\/micropython,jmarcelino\/pycom-micropython,dmazzella\/micropython,hiway\/micropython,misterdanb\/micropython,selste\/micropython,kerneltask\/micropython,hiway\/micropython,toolmacher\/micropython,TDAbboud\/micropython,praemdonck\/micropython,cwyark\/micropython,trezor\/micropython,bvernoux\/micropython,mpalomer\/micropython,drrk\/micropython,mhoffma\/micropython,bvernoux\/micropython,PappaPeppar\/micropython,lowRISC\/micropython,alex-march\/micropython,dinau\/micropython,emfcamp\/micropython,hosaka\/micropython,tralamazza\/micropython,AriZuu\/micropython,blazewicz\/micropython,blazewicz\/micropython,SHA2017-badge\/micropython-esp32,jmarcelino\/pycom-micropython,kerneltask\/micropython,puuu\/micropython,alex-robbins\/micropython,matthewelse\/micropython,adafruit\/circuitpython,pramasoul\/micropython,misterdanb\/micropython,AriZuu\/micropython,alex-march\/micropython,pozetroninc\/micropython,redbear\/micropython,micropython\/micropython-esp32,Peetz0r\/micropython-esp32,dmazzella\/micropython,ganshun666\/micropython,Timmenem\/micropython,PappaPeppar\/micropython,pramasoul\/micropython,adafruit\/micropython,MrSurly\/micropython-esp32,deshipu\/micropython,oopy\/micropython,Timmenem\/micropython,cwyark\/micropython,dxxb\/micropython,AriZuu\/micropython,AriZuu\/micropython,PappaPeppar\/micropython,tuc-osg\/micropython,deshipu\/micropython,MrSurly\/micropython,hosaka\/micropython,SHA2017-badge\/micropython-esp32,pfalcon\/micropython,trezor\/micropython,HenrikSolver\/micropython,swegener\/micropython,deshipu\/micropython,jmarcelino\/pycom-micropython,mpalomer\/micropython,bvernoux\/micropython,adafruit\/micropython,praemdonck\/micropython,trezor\/micropython,oopy\/micropython,Peetz0r\/micropython-esp32,chrisdearman\/micropython,puuu\/micropython,dmazzella\/micropython,mhoffma\/micropython,emfcamp\/micropython,adafruit\/circuitpython,adafruit\/micropython,dinau\/micropython,tobbad\/micropython,oopy\/micropython,MrSurly\/micropython-esp32,Timmenem\/micropython,ganshun666\/micropython,MrSurly\/micropython,Timmenem\/micropython,hiway\/micropython,tobbad\/micropython,henriknelson\/micropython,infinnovation\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- esp8266\/mpconfigport.h\n+++ esp8266\/mpconfigport.h\n@@ -53,6 +53,7 @@\n #define MICROPY_PY_MACHINE (1)\n #define MICROPY_PY_MACHINE_I2C (1)\n #define MICROPY_PY_WEBSOCKET (1)\n+#define MICROPY_PY_WEBREPL_DELAY (20)\n #define MICROPY_PY_FRAMEBUF (1)\n #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)\n #define MICROPY_PY_OS_DUPTERM (1)\n"} {"commit":"d267c7d13f2f8ca4b4af78c2f71272fb697063c5","subject":"Add support for OpenVZ interfaces","message":"Add support for OpenVZ interfaces\n\nThe default name of a network interface in an OpenVZ container is venet\nrather than the most common eth, e.g., venet0:0\n","repos":"xdddyzxzjyqc\/monitorhp,efengcloud\/tsar,bkeep\/tsar,tangyiyong\/tsar,kongjian\/tsar,leexingwang\/tsar,leexingwang\/tsar,allen-zkm\/tsar,bkeep\/tsar,xdddyzxzjyqc\/monitorhp,efengcloud\/tsar,billychou\/tsar,tangyiyong\/tsar,kongjian\/tsar,allen-zkm\/tsar,alibaba\/tsar,billychou\/tsar,justintung\/tsar,alibaba\/tsar,justintung\/tsar","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/mod_traffic.c\n+++ modules\/mod_traffic.c\n@@ -39,7 +39,7 @@\n memset(&total_st, 0, sizeof(cur_st));\n \n while (fgets(line, LEN_4096, fp) != NULL) {\n- if (strstr(line, \"eth\") || strstr(line, \"em\")) {\n+ if (strstr(line, \"eth\") || strstr(line, \"em\") || strstr(line, \"venet\")) {\n memset(&cur_st, 0, sizeof(cur_st));\n p = strchr(line, ':');\n sscanf(p + 1, \"%llu %llu %*u %*u %*u %*u %*u %*u \"\n"} {"commit":"60a63e042bc76cd9672a793c9f26e86efbbe0493","subject":"Add support to mpeg-ts muxer to pass keyframe flag (BLOCK_FLAG_TYPE_I) to access_out modules","message":"Add support to mpeg-ts muxer to pass keyframe flag (BLOCK_FLAG_TYPE_I) to access_out modules\n\nSigned-off-by: Jean-Baptiste Kempf <7b85a41a628204b76aba4326273a3ccc74bd009a@videolan.org>\n","repos":"shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/mux\/mpeg\/ts.c\n+++ modules\/mux\/mpeg\/ts.c\n@@ -2018,6 +2018,12 @@\n }\n \n p_ts = block_New( p_mux, 188 );\n+\n+ if (b_new_pes && !(p_pes->i_flags & BLOCK_FLAG_NO_KEYFRAME) && p_pes->i_flags & BLOCK_FLAG_TYPE_I)\n+ {\n+ p_ts->i_flags |= BLOCK_FLAG_TYPE_I;\n+ }\n+\n p_ts->i_dts = p_pes->i_dts;\n \n p_ts->p_buffer[0] = 0x47;\n"} {"commit":"28eaa461a51bd2b0c5ca0d0b22848ec804f14b3c","subject":"added logs and few fixes for nvdec","message":"added logs and few fixes for nvdec\n","repos":"porcelijn\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,porcelijn\/gpac,porcelijn\/gpac,porcelijn\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,porcelijn\/gpac,gpac\/gpac,ARSekkat\/gpac,gpac\/gpac,gpac\/gpac,porcelijn\/gpac,ARSekkat\/gpac,gpac\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,ARSekkat\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/nvdec\/nvdec.c\n+++ modules\/nvdec\/nvdec.c\n@@ -50,7 +50,8 @@\n \tGF_ESD *esd;\n \tBool use_gl_texture;\n \tu32 width, height, stride, pixel_ar, pix_fmt, out_size, bpp_luma, bpp_chroma;\n-\tBool reload_decoder;\n+\tu32 reload_decoder_state;\n+\tBool skip_next_frame;\n \tcudaVideoCodec codec_type;\n \tcudaVideoChromaFormat chroma_fmt;\n \tCUresult decode_error;\n@@ -82,94 +83,9 @@\n \n \/\/#define ENABLE_10BIT_OUTPUT\n \n-static int CUDAAPI HandleVideoSequence(void *pUserData, CUVIDEOFORMAT *pFormat)\n-{\n-\tBool use_10bits=GF_FALSE;\n-\tNVDecCtx *ctx = (NVDecCtx *)pUserData;\n-\tfprintf(stderr, \"HandleVideoSequence\\n\");\n-\tif( (ctx->width == pFormat->coded_width) \n-\t\t&& (ctx->height == pFormat->coded_height)\n-\t\t&& (ctx->bpp_luma == 8 + pFormat->bit_depth_luma_minus8)\n-\t\t&& (ctx->bpp_chroma == 8 + pFormat->bit_depth_chroma_minus8)\n-\t\t&& (ctx->codec_type == pFormat->codec)\n-\t\t&& (ctx->chroma_fmt == pFormat->chroma_format)\n-\t) {\n-\t\treturn 1;\n-\t}\n-\t\n-\t\/\/commented out since this falls back to soft decoding !\n-#ifdef ENABLE_10BIT_OUTPUT\n-\tif (ctx->bpp_luma + ctx->bpp_chroma > 16) use_10bits = GF_TRUE;\n-#endif\n-\n-\tctx->width = pFormat->coded_width;\n-\tctx->height = pFormat->coded_height;\n-\tctx->bpp_luma = 8 + pFormat->bit_depth_luma_minus8;\n-\tctx->bpp_chroma = 8 + pFormat->bit_depth_chroma_minus8;\n-\tctx->codec_type = pFormat->codec;\n-\tctx->chroma_fmt = pFormat->chroma_format;\n-\tctx->stride = use_10bits ? 2*ctx->width : ctx->width;\n-\t\n-\tswitch (ctx->chroma_fmt) {\n-\tcase cudaVideoChromaFormat_420:\n-\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_NV12_10 : GF_PIXEL_NV12;\n-\t\tctx->out_size = ctx->stride * ctx->height * 3 \/ 2;\n-\t\tbreak;\n-\tcase cudaVideoChromaFormat_422:\n-\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;\n-\t\tctx->out_size = ctx->stride * ctx->height * 2;\n-\t\tbreak;\n-\tcase cudaVideoChromaFormat_444:\n-\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;\n-\t\tctx->out_size = ctx->stride * ctx->height * 3;\n-\t\tbreak;\n-\tdefault:\n-\t\tctx->pix_fmt = 0;\n-\t\tctx->out_size = 0;\n-\t}\n-\n-\tctx->reload_decoder = GF_TRUE;\n-\treturn 1;\n-}\n-\n-static int CUDAAPI HandlePictureDecode(void *pUserData, CUVIDPICPARAMS *pPicParams)\n-{\n-\tNVDecCtx *ctx = (NVDecCtx *)pUserData;\n-\tctx->decode_error = cuvidDecodePicture(ctx->cu_decoder, pPicParams);\n-\tif (ctx->decode_error != CUDA_SUCCESS) {\n-\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to decode picture %s\\n\", cudaGetErrorEnum(ctx->decode_error) ) );\n-\t\treturn GF_IO_ERR;\n-\t}\n-\n-\treturn 1;\n-}\n-\n-static int CUDAAPI HandlePictureDisplay(void *pUserData, CUVIDPARSERDISPINFO *pPicParams)\n-{\n-\tu32 i, count;\n-\tNVDecFrame *f;\n-\tNVDecCtx *ctx = (NVDecCtx *)pUserData;\n-\n-\tf = gf_list_pop_back(ctx->frames_res);\n-\tif (!f) {\n-\t\tGF_SAFEALLOC(f, NVDecFrame);\n-\t}\n-\tf->frame_info = *pPicParams;\n-\tf->ctx = ctx;\n-\tcount = gf_list_count(ctx->frames);\n-\tfor (i=0; i<count; i++) {\n-\t\tNVDecFrame *af = gf_list_get(ctx->frames, i);\n-\t\tif (af->frame_info.timestamp > f->frame_info.timestamp) {\n-\t\t\tgf_list_insert(ctx->frames, f, i);\n-\t\t\treturn 1;\n-\t\t}\n-\t}\n-\tgf_list_add(ctx->frames, f);\n-\treturn 1;\n-}\n-\n-static GF_Err nvdec_init_decoder(NVDecCtx *ctx)\n-{\n+static GF_Err nvdec_init_decoder(GF_MediaDecoder *ifcg, NVDecCtx *ctx)\n+{\n+\tconst char *opt;\n \tCUresult res;\n \tCUVIDDECODECREATEINFO cuvid_info;\n \n@@ -221,14 +137,126 @@\n \tcuvid_info.display_area.bottom = ctx->height;\n \n cuvid_info.ulNumOutputSurfaces = 2;\n+\n cuvid_info.ulCreationFlags = cudaVideoCreate_PreferCUVID;\n+\topt = gf_modules_get_option((GF_BaseInterface *)ifcg, \"NVDec\", \"PreferMode\");\n+\tif (opt && !stricmp(opt, \"dxva\")) {\n+\t cuvid_info.ulCreationFlags = cudaVideoCreate_PreferDXVA;\n+\t} else if (opt && !stricmp(opt, \"cuda\")) {\n+\t cuvid_info.ulCreationFlags = cudaVideoCreate_PreferCUDA;\n+\t} else if (!opt) {\n+\t\tgf_modules_set_option((GF_BaseInterface *)ifcg, \"NVDec\", \"PreferMode\", \"cuvid\");\n+\t}\n+\n \/\/ create the decoder\n \tres = cuvidCreateDecoder(&ctx->cu_decoder, &cuvid_info);\n \tif (res != CUDA_SUCCESS) {\n \t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to create cuvid decoder %s\\n\", cudaGetErrorEnum(res) ) );\n \t\treturn GF_IO_ERR;\n \t}\n+\n+\tGF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, (\"[NVDec] decoder init OK\\n\") );\n+\n \treturn GF_OK;\n+}\n+\n+static int CUDAAPI HandleVideoSequence(void *pUserData, CUVIDEOFORMAT *pFormat)\n+{\n+\tBool use_10bits=GF_FALSE;\n+\tGF_MediaDecoder *ifcg = (GF_MediaDecoder *)pUserData;\n+\tNVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;\n+\n+\tGF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, (\"[NVDec] Video sequence change detected - new setup %u x %u, %u bpp\\n\", pFormat->coded_width, pFormat->coded_height, pFormat->bit_depth_luma_minus8 + 8) );\n+\n+\tif( (ctx->width == pFormat->coded_width) \n+\t\t&& (ctx->height == pFormat->coded_height)\n+\t\t&& (ctx->bpp_luma == 8 + pFormat->bit_depth_luma_minus8)\n+\t\t&& (ctx->bpp_chroma == 8 + pFormat->bit_depth_chroma_minus8)\n+\t\t&& (ctx->codec_type == pFormat->codec)\n+\t\t&& (ctx->chroma_fmt == pFormat->chroma_format)\n+\t) {\n+\t\treturn 1;\n+\t}\n+\t\n+\t\/\/commented out since this falls back to soft decoding !\n+#ifdef ENABLE_10BIT_OUTPUT\n+\tif (ctx->bpp_luma + ctx->bpp_chroma > 16) use_10bits = GF_TRUE;\n+#endif\n+\n+\tctx->width = pFormat->coded_width;\n+\tctx->height = pFormat->coded_height;\n+\tctx->bpp_luma = 8 + pFormat->bit_depth_luma_minus8;\n+\tctx->bpp_chroma = 8 + pFormat->bit_depth_chroma_minus8;\n+\tctx->codec_type = pFormat->codec;\n+\tctx->chroma_fmt = pFormat->chroma_format;\n+\tctx->stride = use_10bits ? 2*ctx->width : ctx->width;\n+\t\n+\tswitch (ctx->chroma_fmt) {\n+\tcase cudaVideoChromaFormat_420:\n+\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_NV12_10 : GF_PIXEL_NV12;\n+\t\tctx->out_size = ctx->stride * ctx->height * 3 \/ 2;\n+\t\tbreak;\n+\tcase cudaVideoChromaFormat_422:\n+\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;\n+\t\tctx->out_size = ctx->stride * ctx->height * 2;\n+\t\tbreak;\n+\tcase cudaVideoChromaFormat_444:\n+\t\tctx->pix_fmt = use_10bits ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;\n+\t\tctx->out_size = ctx->stride * ctx->height * 3;\n+\t\tbreak;\n+\tdefault:\n+\t\tctx->pix_fmt = 0;\n+\t\tctx->out_size = 0;\n+\t}\n+\n+\tif (! ctx->cu_decoder) {\n+\t\tnvdec_init_decoder(ifcg, ctx);\n+\t\tctx->reload_decoder_state = 1;\n+\t} else {\n+\t\tctx->reload_decoder_state = 2;\n+\t}\n+\treturn 1;\n+}\n+\n+static int CUDAAPI HandlePictureDecode(void *pUserData, CUVIDPICPARAMS *pPicParams)\n+{\n+\tGF_MediaDecoder *ifcg = (GF_MediaDecoder *)pUserData;\n+\tNVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;\n+\tctx->decode_error = cuvidDecodePicture(ctx->cu_decoder, pPicParams);\n+\tif (ctx->decode_error != CUDA_SUCCESS) {\n+\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to decode picture %s\\n\", cudaGetErrorEnum(ctx->decode_error) ) );\n+\t\treturn GF_IO_ERR;\n+\t}\n+\tGF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, (\"[NVDec] decoded picture %u OK\\n\", pPicParams->CurrPicIdx ) );\n+\n+\treturn 1;\n+}\n+\n+static int CUDAAPI HandlePictureDisplay(void *pUserData, CUVIDPARSERDISPINFO *pPicParams)\n+{\n+\tu32 i, count;\n+\tNVDecFrame *f;\n+\tGF_MediaDecoder *ifcg = (GF_MediaDecoder *)pUserData;\n+\tNVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;\n+\n+\tGF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, (\"[NVDec] picture %u ready for display, queuing it\\n\", pPicParams->picture_index) );\n+\n+\tf = gf_list_pop_back(ctx->frames_res);\n+\tif (!f) {\n+\t\tGF_SAFEALLOC(f, NVDecFrame);\n+\t}\n+\tf->frame_info = *pPicParams;\n+\tf->ctx = ctx;\n+\tcount = gf_list_count(ctx->frames);\n+\tfor (i=0; i<count; i++) {\n+\t\tNVDecFrame *af = gf_list_get(ctx->frames, i);\n+\t\tif (af->frame_info.timestamp > f->frame_info.timestamp) {\n+\t\t\tgf_list_insert(ctx->frames, f, i);\n+\t\t\treturn 1;\n+\t\t}\n+\t}\n+\tgf_list_add(ctx->frames, f);\n+\treturn 1;\n }\n \n static GF_Err NVDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)\n@@ -311,7 +339,7 @@\n oVideoParserParameters.pfnSequenceCallback = HandleVideoSequence; \/\/ Called before decoding frames and\/or whenever there is a format change\n oVideoParserParameters.pfnDecodePicture = HandlePictureDecode; \/\/ Called when a picture is ready to be decoded (decode order)\n oVideoParserParameters.pfnDisplayPicture = HandlePictureDisplay; \/\/ Called whenever a picture is ready to be displayed (display order)\n- oVideoParserParameters.pUserData = ctx;\n+ oVideoParserParameters.pUserData = ifcg;\n \n res = cuCtxPushCurrent(ctx->cuda_ctx);\n \tif (res != CUDA_SUCCESS) {\n@@ -323,6 +351,8 @@\n \t}\n \tcuCtxPopCurrent(NULL);\n \n+\tGF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, (\"[NVDec] video parser init OK\\n\") );\n+\n \treturn GF_OK;\n }\n \n@@ -336,6 +366,7 @@\n static GF_Err NVDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)\n {\n \tNVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;\n+\tconst char *opt;\n \t\n \tswitch (capability->CapCode) {\n \tcase GF_CODEC_RESILIENT:\n@@ -381,7 +412,8 @@\n \t\tcapability->cap.valueInt = 0;\n \t\tbreak;\n \tcase GF_CODEC_FRAME_OUTPUT:\n-\t\tcapability->cap.valueInt = 1;\n+\t\topt = gf_modules_get_option((GF_BaseInterface *)ifcg, \"NVDec\", \"DisableGL\");\n+\t\tcapability->cap.valueInt = (!opt || strcmp(opt, \"yes\")) ? 1 : 0;\n \t\tbreak;\n \tcase GF_CODEC_FORCE_ANNEXB:\n \t\tcapability->cap.valueInt = 1;\n@@ -433,8 +465,10 @@\n \n \tmemset(&cu_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET));\n \tcu_pkt.flags = CUVID_PKT_TIMESTAMP;\n-\tif (!inBuffer) \n+\tif (!inBuffer) {\n \t\tcu_pkt.flags |= CUVID_PKT_ENDOFSTREAM;\n+\t\tctx->skip_next_frame = GF_FALSE;\n+\t}\n \n \tcu_pkt.payload_size = inBufferLength;\n \tcu_pkt.payload = inBuffer;\n@@ -444,20 +478,28 @@\n \tif (res != CUDA_SUCCESS) {\n \t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to push CUDA CTX %s\\n\", cudaGetErrorEnum(res) ) );\n \t}\n-\tres = cuvidParseVideoData(ctx->cu_parser, &cu_pkt);\n-\tif (res != CUDA_SUCCESS) {\n-\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to parse video data CTX %s\\n\", cudaGetErrorEnum(res) ) );\n+\tif (ctx->skip_next_frame) {\n+\t\tctx->skip_next_frame = GF_FALSE;\n+\t} else {\n+\t\tres = cuvidParseVideoData(ctx->cu_parser, &cu_pkt);\n+\t\tif (res != CUDA_SUCCESS) {\n+\t\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to parse video data CTX %s\\n\", cudaGetErrorEnum(res) ) );\n+\t\t}\n \t}\n \t\n \t*outBufferLength = 0;\n \te = GF_OK;\n-\tif (ctx->reload_decoder) {\n-\t\tif (ctx->cu_decoder) {\n-\t\t\tcuvidDestroyDecoder(ctx->cu_decoder);\n-\t\t\tctx->cu_decoder = NULL;\n-\t\t}\n-\n-\t\tctx->reload_decoder = GF_FALSE;\n+\tif (ctx->reload_decoder_state) {\n+\t\tif (ctx->reload_decoder_state==2) {\n+\t\t\tif (ctx->cu_decoder) {\n+\t\t\t\tcuvidDestroyDecoder(ctx->cu_decoder);\n+\t\t\t\tctx->cu_decoder = NULL;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tctx->skip_next_frame = GF_TRUE;\n+\t\t}\n+\n+\t\tctx->reload_decoder_state = 0;\n \t\tif (!ctx->out_size || !ctx->pix_fmt) {\n \t\t\tcuCtxPopCurrent(NULL);\n \t\t\treturn GF_NOT_SUPPORTED;\n@@ -465,7 +507,7 @@\n \n \t\t\/\/need to setup decoder\n \t\tif (! ctx->cu_decoder) {\n-\t\t\tnvdec_init_decoder(ctx);\n+\t\t\tnvdec_init_decoder(ifcg, ctx);\n \t\t}\n \t\tcuCtxPopCurrent(NULL);\n \t\t*outBufferLength = ctx->out_size;\n@@ -677,6 +719,8 @@\n \n \tcuGLMapBufferObject(&tx_data, &tx_pitch, pbo_id);\n \tif (res != CUDA_SUCCESS) {\n+\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to map GL texture data %s\\n\", cudaGetErrorEnum(res) ) );\n+\t\treturn GF_IO_ERR;\n \t}\n \tassert(tx_pitch != 0);\n \n@@ -687,6 +731,8 @@\n \tres = cuvidMapVideoFrame(ctx->cu_decoder, f->frame_info.picture_index, &vid_data, &vid_pitch, ¶ms);\n \t\n \tif (res != CUDA_SUCCESS) {\n+\t\tGF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, (\"[NVDec] failed to map decoded picture data %s\\n\", cudaGetErrorEnum(res) ) );\n+\t\treturn GF_IO_ERR;\n \t}\n \tassert(vid_pitch != 0);\n \n"} {"commit":"6456c4b4e61a1b4ceb0e82fb8a0f82a19ac03e2a","subject":"examples\/intersection show uv intersection using texture","message":"examples\/intersection show uv intersection using texture\n","repos":"alexlarsson\/gthree","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/interactive.c\n+++ examples\/interactive.c\n@@ -11,12 +11,57 @@\n GthreeObject *intersected;\n graphene_vec3_t intersected_color;\n \n+cairo_surface_t *texture_surface;\n+GthreeTexture *texture;\n+\n+void\n+update_surface (float u, float v)\n+{\n+ cairo_t *cr = cairo_create (texture_surface);\n+\n+ \/\/ Flip y for OpenGL\n+ cairo_scale (cr, 1, -1);\n+ cairo_translate (cr, 0, -256);\n+\n+ cairo_set_source_rgb (cr, 0, 1, 0);\n+ cairo_paint (cr);\n+\n+ cairo_arc (cr, 256 * u, 256 * v, 32, 0, 2 * M_PI);\n+ cairo_close_path (cr);\n+\n+ cairo_set_source_rgb (cr, 0, 0, 1);\n+ cairo_fill_preserve (cr);\n+ cairo_set_source_rgb (cr, 0, 0, 0);\n+ cairo_set_line_width (cr, 8);\n+ cairo_stroke (cr);\n+\n+ cairo_destroy (cr);\n+\n+ gthree_texture_set_needs_update (texture, TRUE);\n+}\n+\n+static void\n+init_texture (void)\n+{\n+ texture_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 256, 256);\n+\n+ cairo_t *cr = cairo_create (texture_surface);\n+ cairo_set_source_rgb (cr, 0, 1, 0);\n+ cairo_paint (cr);\n+ cairo_destroy (cr);\n+\n+ texture = gthree_texture_new_from_surface (texture_surface);\n+ gthree_texture_set_flip_y (texture, FALSE); \/\/ We'll just draw upside down to avoid performance penalty\n+}\n+\n GthreeScene *\n init_scene (void)\n {\n graphene_vec3_t color, pos, scale;\n graphene_euler_t rotation;\n int i;\n+\n+ init_texture ();\n \n g_autoptr(GthreeGeometry) geometry = gthree_geometry_new_box (20, 42, 20, 1, 1, 1);\n g_autoptr(GthreeDirectionalLight) directional_light = NULL;\n@@ -121,6 +166,7 @@\n {\n GthreeMaterial *material = gthree_mesh_get_material (GTHREE_MESH (intersected), j);\n gthree_mesh_lambert_material_set_color (GTHREE_MESH_LAMBERT_MATERIAL (material), &intersected_color);\n+ gthree_mesh_lambert_material_set_map (GTHREE_MESH_LAMBERT_MATERIAL (material), NULL);\n }\n intersected = NULL;\n }\n@@ -129,14 +175,24 @@\n {\n GthreeRayIntersection *intersection = g_ptr_array_index (intersections, 0);\n intersected = intersection->object;\n+\n+ update_surface (graphene_vec2_get_x (&intersection->uv),\n+ graphene_vec2_get_y (&intersection->uv));\n+\n intersected_color = *gthree_mesh_lambert_material_get_color (GTHREE_MESH_LAMBERT_MATERIAL (gthree_mesh_get_material (GTHREE_MESH (intersected), 0)));\n for (int j = 0; j < 6; j++)\n {\n GthreeMaterial *material = gthree_mesh_get_material (GTHREE_MESH (intersected), j);\n if (j == intersection->material_index)\n- gthree_mesh_lambert_material_set_color (GTHREE_MESH_LAMBERT_MATERIAL (material), green ());\n+ {\n+ gthree_mesh_lambert_material_set_color (GTHREE_MESH_LAMBERT_MATERIAL (material), white ());\n+ gthree_mesh_lambert_material_set_map (GTHREE_MESH_LAMBERT_MATERIAL (material), texture);\n+ }\n else\n- gthree_mesh_lambert_material_set_color (GTHREE_MESH_LAMBERT_MATERIAL (material), red ());\n+ {\n+ gthree_mesh_lambert_material_set_color (GTHREE_MESH_LAMBERT_MATERIAL (material), red ());\n+ gthree_mesh_lambert_material_set_map (GTHREE_MESH_LAMBERT_MATERIAL (material), NULL);\n+ }\n }\n }\n \n"} {"commit":"be209e67a1a29d582b846356146e06b6abb5dafd","subject":"Mix Antoine et moi","message":"Mix Antoine et moi\n","repos":"anpar\/lingi1141-projet","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- protocol\/src\/packet_implem.c\n+++ protocol\/src\/packet_implem.c\n@@ -24,11 +24,7 @@\n {\n \tpkt_t * pkt = (pkt_t *) (malloc(sizeof(pkt_t)));\n \tif(pkt == NULL)\n-<<<<<<< HEAD\n-\treturn(NULL);\n-=======\n \t\treturn(NULL);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \tpkt->payload = NULL;\n \n@@ -39,11 +35,7 @@\n {\n \tif(pkt != NULL) {\n \t\tif(pkt->payload != NULL)\n-<<<<<<< HEAD\n-\t\tfree(pkt->payload);\n-=======\n \t\t\tfree(pkt->payload);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \t\tfree(pkt);\n \t}\n@@ -52,11 +44,7 @@\n pkt_status_code pkt_decode(const char *data, const size_t len, pkt_t *pkt)\n {\n \tif(len < 4)\n-<<<<<<< HEAD\n-\treturn(E_NOHEADER);\n-=======\n \t\treturn(E_NOHEADER);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \t\/*\n \t* @return says that unless the error is E_NOHEADER,\n@@ -80,23 +68,13 @@\n \n \t\/\/ Si le paquet est un (n)ack\n \tif(len == 4)\n-<<<<<<< HEAD\n-\treturn(PKT_OK);\n+\t\treturn(PKT_OK);\n \n \tif(len != 4 && pkt_get_type(pkt) != PTYPE_DATA)\n-\treturn(E_UNCONSISTENT);\n+\t\treturn(E_UNCONSISTENT);\n \n \tif(len < 8)\n-\treturn(E_UNCONSISTENT);\n-=======\n-\t\treturn(PKT_OK);\n-\n-\tif(len != 4 && pkt_get_type(pkt) != PTYPE_DATA)\n-\t\treturn(E_UNCONSISTENT);\n-\n-\tif(len < 8)\n-\t\treturn(E_UNCONSISTENT);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n+\t\treturn(E_UNCONSISTENT);\n \n \tuint32_t received_crc = (uint8_t) data[len-4];\n \treceived_crc = (received_crc << 8) + (uint8_t) data[len-3];\n@@ -105,11 +83,7 @@\n \tuint32_t computed_crc = crc32(0L, (Bytef *) data, len-4);\n \n \tif(received_crc != computed_crc)\n-<<<<<<< HEAD\n-\treturn(E_CRC);\n-=======\n \t\treturn(E_CRC);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \tpkt_status_code c5 = pkt_set_crc(pkt, received_crc);\n \tif(c5 != PKT_OK) \t{return(c5);}\n@@ -121,16 +95,6 @@\n \n \tuint16_t padding = (4 - (pkt_get_length(pkt) % 4)) % 4;\n \tif((4 + pkt_get_length(pkt) + padding + 4) != (uint16_t) len)\n-<<<<<<< HEAD\n-\treturn(E_UNCONSISTENT);\n-\n-\tif(pkt_get_type(pkt) != PTYPE_DATA && pkt_get_length(pkt) != 0)\n-\treturn(E_UNCONSISTENT);\n-\n-\tpkt_status_code c6 = pkt_set_payload(pkt, data+4, pkt_get_length(pkt));\n-\tif(c6 != PKT_OK)\n-\treturn(c6);\n-=======\n \t\treturn(E_UNCONSISTENT);\n \n \tif(pkt_get_type(pkt) != PTYPE_DATA && pkt_get_length(pkt) != 0)\n@@ -139,7 +103,6 @@\n \tpkt_status_code c6 = pkt_set_payload(pkt, data+4, pkt_get_length(pkt));\n \tif(c6 != PKT_OK)\n \t\treturn(c6);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \treturn(PKT_OK);\n }\n@@ -172,11 +135,7 @@\n \t* return E_NOMEM.\n \t*\/\n \tif(i != pkt_get_length(pkt) + padding)\n-<<<<<<< HEAD\n-\treturn(E_NOMEM);\n-=======\n \t\treturn(E_NOMEM);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \t\/*\n \t* Compute the CRC and add it at the end\n@@ -234,11 +193,7 @@\n pkt_status_code pkt_set_type(pkt_t *pkt, const ptypes_t type)\n {\n \tif(type != PTYPE_DATA && type != PTYPE_ACK && type != PTYPE_NACK)\n-<<<<<<< HEAD\n-\treturn(E_TYPE);\n-=======\n \t\treturn(E_TYPE);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \tpkt->type = type;\n \treturn(PKT_OK);\n@@ -247,11 +202,7 @@\n pkt_status_code pkt_set_window(pkt_t *pkt, const uint8_t window)\n {\n \tif(window > MAX_WINDOW_SIZE)\n-<<<<<<< HEAD\n-\treturn(E_WINDOW);\n-=======\n \t\treturn(E_WINDOW);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \tpkt->window = window;\n \treturn(PKT_OK);\n@@ -271,11 +222,7 @@\n pkt_status_code pkt_set_length(pkt_t *pkt, const uint16_t length)\n {\n \tif(length > 512)\n-<<<<<<< HEAD\n-\treturn(E_LENGTH);\n-=======\n \t\treturn(E_LENGTH);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \tpkt->length = length;\n \treturn(PKT_OK);\n@@ -292,11 +239,7 @@\n \t{\n \t\tpkt_status_code c = pkt_set_length(pkt, length);\n \t\tif(c != PKT_OK)\n-<<<<<<< HEAD\n-\t\treturn(c);\n-=======\n \t\t\treturn(c);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \t\tuint16_t padding = (4 - (length % 4)) % 4;\n \n@@ -306,19 +249,11 @@\n \t\t* to free'd it before reallocating.\n \t\t*\/\n \t\tif(pkt->payload != NULL)\n-<<<<<<< HEAD\n-\t\tfree(pkt->payload);\n-\n-\t\tpkt->payload = (char *) malloc((length + padding) * sizeof(char));\n-\t\tif(pkt->payload == NULL)\n-\t\treturn(E_NOMEM);\n-=======\n \t\t\tfree(pkt->payload);\n \n \t\tpkt->payload = (char *) malloc((length + padding) * sizeof(char));\n \t\tif(pkt->payload == NULL)\n \t\t\treturn(E_NOMEM);\n->>>>>>> 2c4e1e73638ecf8ef8feb178804b99da42dd0377\n \n \t\tint i;\n \t\tfor(i = 0; i < length; i++) {\n"} {"commit":"9305db90b5f909dcb6ded611d5fec749099da755","subject":"doc: document polling classes. (googleapis\/google-cloud-cpp-spanner#583)","message":"doc: document polling classes. (googleapis\/google-cloud-cpp-spanner#583)\n\n","repos":"googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- google\/cloud\/spanner\/polling_policy.h\n+++ google\/cloud\/spanner\/polling_policy.h\n@@ -24,15 +24,58 @@\n namespace spanner {\n inline namespace SPANNER_CLIENT_NS {\n \n+\/**\n+ * Control the Cloud Spanner C++ client library behavior with respect to polling\n+ * on long running operations.\n+ *\n+ * Some operations in Cloud Spanner return a `google.longrunning.Operation`\n+ * object. As their name implies, these objects represent requests that may take\n+ * a long time to complete, in the case of Cloud Spanner some operations may\n+ * take tens of seconds or even 30 minutes to complete.\n+ *\n+ * The Cloud Spanner C++ client library models these long running operations\n+ * as a `google::cloud::future<StatusOr<T>>`, where `T` represents the final\n+ * result of the operation. In the background, the library polls the service\n+ * until the operation completes (or fails) and then satisfies the future.\n+ *\n+ * This class defines the interface for policies that control the behavior of\n+ * this polling loop.\n+ *\n+ * @see https:\/\/aip.dev\/151 for more information on long running operations.\n+ *\/\n class PollingPolicy {\n public:\n virtual ~PollingPolicy() = default;\n \n+ \/**\n+ * Return a copy of the current policy.\n+ *\n+ * This function is called at the beginning of the polling loop. Policies that\n+ * are based on relative time should restart their timers when this function\n+ * is called.\n+ *\/\n virtual std::unique_ptr<PollingPolicy> clone() const = 0;\n+\n+ \/**\n+ * A callback to indicate that a polling attempt failed.\n+ *\n+ * This is called when a polling request fails. Note that this callback is not\n+ * invoked when the polling request succeeds with \"operation not done\".\n+ *\n+ * @return true if the failure should be treated as transient and the polling\n+ * loop should continue.\n+ *\/\n virtual bool OnFailure(google::cloud::Status const& status) = 0;\n+\n+ \/**\n+ * How long should the polling loop wait before trying again.\n+ *\/\n virtual std::chrono::milliseconds WaitPeriod() = 0;\n };\n \n+\/**\n+ * Combine a RetryPolicy and a BackoffPolicy to create simple polling policies.\n+ *\/\n template <typename Retry = LimitedTimeRetryPolicy,\n typename Backoff = ExponentialBackoffPolicy>\n class GenericPollingPolicy : public PollingPolicy {\n@@ -41,6 +84,7 @@\n : retry_policy_(std::move(retry_policy)),\n backoff_policy_(std::move(backoff_policy)) {}\n \n+ \/\/@{\n std::unique_ptr<PollingPolicy> clone() const override {\n return std::unique_ptr<PollingPolicy>(new GenericPollingPolicy(*this));\n }\n@@ -52,6 +96,7 @@\n std::chrono::milliseconds WaitPeriod() override {\n return backoff_policy_.OnCompletion();\n }\n+ \/\/@}\n \n private:\n Retry retry_policy_;\n"} {"commit":"ad5c329d2d51f9e68c22fcb7891ff8457714fe83","subject":"The coordinates on the status line should start from 1 rather than from 0. (dm)","message":"The coordinates on the status line should start from 1 rather than from 0. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@1651 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Programs\/main.c\n+++ Programs\/main.c\n@@ -422,7 +422,7 @@\n \n if (brl.x*brl.y >= 21) {\n snprintf(text, sizeof(text), \"%02d:%02d %02d:%02d %02d %c%c%c%c%c%c\",\n- p->winx, p->winy, scr.posx, scr.posy, scr.no, \n+ p->winx+1, p->winy+1, scr.posx+1, scr.posy+1, scr.no, \n p->trackCursor? 't': ' ',\n prefs.showCursor? (prefs.blinkingCursor? 'B': 'v'):\n (prefs.blinkingCursor? 'b': ' '),\n@@ -453,8 +453,8 @@\n int i;\n \n memset(&dots, 0, 5);\n- setCoordinateUpper(&dots[0], scr.posx, scr.posy);\n- setCoordinateLower(&dots[0], p->winx, p->winy);\n+ setCoordinateUpper(&dots[0], scr.posx+1, scr.posy+1);\n+ setCoordinateLower(&dots[0], p->winx+1, p->winy+1);\n setStateDots(&dots[4]);\n for (i=5; text[i]; i++) dots[i] = textTable[(unsigned char)text[i]];\n memcpy(brl.buffer, dots, brl.x*brl.y);\n"} {"commit":"979abfdd5c7ca4abe3f0157a6ea9bfef41114c89","subject":"ceph: fix trim caps","message":"ceph: fix trim caps\n\n- don't trim auth cap if there are flusing caps\n- don't trim auth cap if any 'write' cap is wanted\n- allow trimming non-auth cap even if the inode is dirty\n\nSigned-off-by: Yan, Zheng <45e2ee8c8b09e76a9d512320d4eb53c0cd9925c0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/ceph\/mds_client.c\n+++ fs\/ceph\/mds_client.c\n@@ -1214,7 +1214,7 @@\n {\n \tstruct ceph_mds_session *session = arg;\n \tstruct ceph_inode_info *ci = ceph_inode(inode);\n-\tint used, oissued, mine;\n+\tint used, wanted, oissued, mine;\n \n \tif (session->s_trim_caps <= 0)\n \t\treturn -1;\n@@ -1222,14 +1222,19 @@\n \tspin_lock(&ci->i_ceph_lock);\n \tmine = cap->issued | cap->implemented;\n \tused = __ceph_caps_used(ci);\n+\twanted = __ceph_caps_file_wanted(ci);\n \toissued = __ceph_caps_issued_other(ci, cap);\n \n-\tdout(\"trim_caps_cb %p cap %p mine %s oissued %s used %s\\n\",\n+\tdout(\"trim_caps_cb %p cap %p mine %s oissued %s used %s wanted %s\\n\",\n \t inode, cap, ceph_cap_string(mine), ceph_cap_string(oissued),\n-\t ceph_cap_string(used));\n-\tif (ci->i_dirty_caps)\n-\t\tgoto out; \/* dirty caps *\/\n-\tif ((used & ~oissued) & mine)\n+\t ceph_cap_string(used), ceph_cap_string(wanted));\n+\tif (cap == ci->i_auth_cap) {\n+\t\tif (ci->i_dirty_caps | ci->i_flushing_caps)\n+\t\t\tgoto out;\n+\t\tif ((used | wanted) & CEPH_CAP_ANY_WR)\n+\t\t\tgoto out;\n+\t}\n+\tif ((used | wanted) & ~oissued & mine)\n \t\tgoto out; \/* we need these caps *\/\n \n \tsession->s_trim_caps--;\n"} {"commit":"1065348d472f97b4b8eb53b60ec67e99148cbbca","subject":"hfsplus: fix up a comparism in hfsplus_file_extend","message":"hfsplus: fix up a comparism in hfsplus_file_extend\n\nRevert an incorrect hunk from commit b2837fcf4994e699a4def002e26f274d95b387c1,\n\n\t\"hfsplus: %L-to-%ll, macro correction, and remove unneeded braces\"\n\nrevert a pointless change of comparism operation argument order, which turned\nout to not even be equivalent.\n\nReported-by: Joe Perches <16a9a54ddf4259952e3c118c763138e83693d7fd@perches.com>\nSigned-off-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@tuxera.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/hfsplus\/extents.c\n+++ fs\/hfsplus\/extents.c\n@@ -397,8 +397,8 @@\n \tu32 start, len, goal;\n \tint res;\n \n-\tif (sbi->total_blocks - sbi->free_blocks + 8 >\n-\t\t\tsbi->alloc_file->i_size * 8) {\n+\tif (sbi->alloc_file->i_size * 8 <\n+\t sbi->total_blocks - sbi->free_blocks + 8) {\n \t\t\/* extend alloc file *\/\n \t\tprintk(KERN_ERR \"hfs: extend alloc file! \"\n \t\t\t\t\"(%llu,%u,%u)\\n\",\n"} {"commit":"4c41bd0ec953954158f92bed5d3062645062b98e","subject":"[JFFS2] fix mount crash caused by removed nodes","message":"[JFFS2] fix mount crash caused by removed nodes\n\nAt scan time we observed following scenario:\n\n node A inserted\n node B inserted\n node C inserted -> sets overlapped flag on node B\n\n node A is removed due to CRC failure -> overlapped flag on node B remains\n\n while (tn->overlapped)\n \t tn = tn_prev(tn);\n\n ==> crash, when tn_prev(B) is referenced.\n\nWhen the ultimate node is removed at scan time and the overlapped flag\nis set on the penultimate node, then nothing updates the overlapped\nflag of that node. The overlapped iterators blindly expect that the\nultimate node does not have the overlapped flag set, which causes the\nscan code to crash.\n\nIt would be a huge overhead to go through the node chain on node\nremoval and fix up the overlapped flags, so detecting such a case on\nthe fly in the overlapped iterators is a simpler and reliable\nsolution.\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org\nSigned-off-by: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/jffs2\/readinode.c\n+++ fs\/jffs2\/readinode.c\n@@ -220,7 +220,7 @@\n \t\t\t\tstruct jffs2_tmp_dnode_info *tn)\n {\n \tuint32_t fn_end = tn->fn->ofs + tn->fn->size;\n-\tstruct jffs2_tmp_dnode_info *this;\n+\tstruct jffs2_tmp_dnode_info *this, *ptn;\n \n \tdbg_readinode(\"insert fragment %#04x-%#04x, ver %u at %08x\\n\", tn->fn->ofs, fn_end, tn->version, ref_offset(tn->fn->raw));\n \n@@ -251,11 +251,18 @@\n \tif (this) {\n \t\t\/* If the node is coincident with another at a lower address,\n \t\t back up until the other node is found. It may be relevant *\/\n-\t\twhile (this->overlapped)\n-\t\t\tthis = tn_prev(this);\n-\n-\t\t\/* First node should never be marked overlapped *\/\n-\t\tBUG_ON(!this);\n+\t\twhile (this->overlapped) {\n+\t\t\tptn = tn_prev(this);\n+\t\t\tif (!ptn) {\n+\t\t\t\t\/*\n+\t\t\t\t * We killed a node which set the overlapped\n+\t\t\t\t * flags during the scan. Fix it up.\n+\t\t\t\t *\/\n+\t\t\t\tthis->overlapped = 0;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tthis = ptn;\n+\t\t}\n \t\tdbg_readinode(\"'this' found %#04x-%#04x (%s)\\n\", this->fn->ofs, this->fn->ofs + this->fn->size, this->fn ? \"data\" : \"hole\");\n \t}\n \n@@ -360,7 +367,17 @@\n \t\t\t}\n \t\t\tif (!this->overlapped)\n \t\t\t\tbreak;\n-\t\t\tthis = tn_prev(this);\n+\n+\t\t\tptn = tn_prev(this);\n+\t\t\tif (!ptn) {\n+\t\t\t\t\/*\n+\t\t\t\t * We killed a node which set the overlapped\n+\t\t\t\t * flags during the scan. Fix it up.\n+\t\t\t\t *\/\n+\t\t\t\tthis->overlapped = 0;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tthis = ptn;\n \t\t}\n \t}\n \n@@ -456,8 +473,15 @@\n \t\teat_last(&rii->tn_root, &last->rb);\n \t\tver_insert(&ver_root, last);\n \n-\t\tif (unlikely(last->overlapped))\n-\t\t\tcontinue;\n+\t\tif (unlikely(last->overlapped)) {\n+\t\t\tif (pen)\n+\t\t\t\tcontinue;\n+\t\t\t\/*\n+\t\t\t * We killed a node which set the overlapped\n+\t\t\t * flags during the scan. Fix it up.\n+\t\t\t *\/\n+\t\t\tlast->overlapped = 0;\n+\t\t}\n \n \t\t\/* Now we have a bunch of nodes in reverse version\n \t\t order, in the tree at ver_root. Most of the time,\n"} {"commit":"613a807fe7c793ceb7d6f059773527a5a6c84a96","subject":"fsnotify: walk the inode and vfsmount lists simultaneously","message":"fsnotify: walk the inode and vfsmount lists simultaneously\n\nWe currently walk the list of marks on an inode followed by the list of\nmarks on the vfsmount. These are in order (by the memory address of the\ngroup) so lets walk them both together. Eventually we can pass both the\ninode mark and the vfsmount mark to helpers simultaneously.\n\nSigned-off-by: Eric Paris <b0b36e3cd9ea4e5739ff430a3056fabf2fdb0376@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/notify\/fsnotify.c\n+++ fs\/notify\/fsnotify.c\n@@ -140,19 +140,31 @@\n }\n EXPORT_SYMBOL_GPL(__fsnotify_parent);\n \n-static int send_to_group(struct fsnotify_group *group, struct inode *to_tell,\n-\t\t\t struct vfsmount *mnt, struct fsnotify_mark *mark,\n-\t\t\t __u32 mask, void *data, int data_is, u32 cookie,\n+static int send_to_group(struct inode *to_tell, struct vfsmount *mnt,\n+\t\t\t struct fsnotify_mark *mark,\n+\t\t\t__u32 mask, void *data,\n+\t\t\t int data_is, u32 cookie,\n \t\t\t const unsigned char *file_name,\n \t\t\t struct fsnotify_event **event)\n {\n+\tstruct fsnotify_group *group = mark->group;\n+\t__u32 test_mask = (mask & ~FS_EVENT_ON_CHILD);\n+\n \tpr_debug(\"%s: group=%p to_tell=%p mnt=%p mark=%p mask=%x data=%p\"\n \t\t \" data_is=%d cookie=%d event=%p\\n\", __func__, group, to_tell,\n \t\t mnt, mark, mask, data, data_is, cookie, *event);\n \n+\tif ((mask & FS_MODIFY) &&\n+\t !(mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY))\n+\t\tmark->ignored_mask = 0;\n+\n+\tif (!(test_mask & mark->mask & ~mark->ignored_mask))\n+\t\treturn 0;\n+\n \tif (group->ops->should_send_event(group, to_tell, mnt, mark, mask,\n \t\t\t\t\t data, data_is) == false)\n \t\treturn 0;\n+\n \tif (!*event) {\n \t\t*event = fsnotify_create_event(to_tell, mask, data,\n \t\t\t\t\t\tdata_is, file_name,\n@@ -172,67 +184,89 @@\n int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,\n \t const unsigned char *file_name, u32 cookie)\n {\n-\tstruct fsnotify_mark *mark;\n-\tstruct fsnotify_group *group;\n+\tstruct hlist_node *inode_node, *vfsmount_node;\n+\tstruct fsnotify_mark *inode_mark = NULL, *vfsmount_mark = NULL;\n+\tstruct fsnotify_group *inode_group, *vfsmount_group;\n \tstruct fsnotify_event *event = NULL;\n-\tstruct hlist_node *node;\n-\tstruct vfsmount *mnt = NULL;\n+\tstruct vfsmount *mnt;\n \tint idx, ret = 0;\n+\tbool used_inode = false, used_vfsmount = false;\n \t\/* global tests shouldn't care about events on child only the specific event *\/\n \t__u32 test_mask = (mask & ~FS_EVENT_ON_CHILD);\n \n \tif (data_is == FSNOTIFY_EVENT_FILE)\n \t\tmnt = ((struct file *)data)->f_path.mnt;\n+\telse\n+\t\tmnt = NULL;\n+\n+\t\/*\n+\t * if this is a modify event we may need to clear the ignored masks\n+\t * otherwise return if neither the inode nor the vfsmount care about\n+\t * this type of event.\n+\t *\/\n+\tif (!(mask & FS_MODIFY) &&\n+\t !(test_mask & to_tell->i_fsnotify_mask) &&\n+\t !(mnt && test_mask & mnt->mnt_fsnotify_mask))\n+\t\treturn 0;\n \n \tidx = srcu_read_lock(&fsnotify_mark_srcu);\n \n-\tif ((test_mask & to_tell->i_fsnotify_mask) || (mask & FS_MODIFY)) {\n-\t\thlist_for_each_entry_rcu(mark, node, &to_tell->i_fsnotify_marks, i.i_list) {\n-\n-\t\t\tpr_debug(\"%s: inode_loop: mark=%p mark->mask=%x mark->ignored_mask=%x\\n\",\n-\t\t\t\t __func__, mark, mark->mask, mark->ignored_mask);\n-\n-\t\t\tif ((mask & FS_MODIFY) &&\n-\t\t\t !(mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY))\n-\t\t\t\tmark->ignored_mask = 0;\n-\n-\t\t\tif (test_mask & mark->mask & ~mark->ignored_mask) {\n-\t\t\t\tgroup = mark->group;\n-\t\t\t\tif (!group)\n-\t\t\t\t\tcontinue;\n-\t\t\t\tret = send_to_group(group, to_tell, NULL, mark, mask,\n-\t\t\t\t\t\t data, data_is, cookie, file_name,\n-\t\t\t\t\t\t &event);\n-\t\t\t\tif (ret)\n-\t\t\t\t\tgoto out;\n-\t\t\t}\n+\tif ((mask & FS_MODIFY) ||\n+\t (test_mask & to_tell->i_fsnotify_mask))\n+\t\tinode_node = to_tell->i_fsnotify_marks.first;\n+\telse\n+\t\tinode_node = NULL;\n+\n+\tif (mnt) {\n+\t\tif ((mask & FS_MODIFY) ||\n+\t\t (test_mask & mnt->mnt_fsnotify_mask))\n+\t\t\tvfsmount_node = mnt->mnt_fsnotify_marks.first;\n+\t\telse\n+\t\t\tvfsmount_node = NULL;\n+\t} else {\n+\t\tmnt = NULL;\n+\t\tvfsmount_node = NULL;\n+\t}\n+\n+\twhile (inode_node || vfsmount_node) {\n+\t\tif (inode_node) {\n+\t\t\tinode_mark = hlist_entry(srcu_dereference(inode_node, &fsnotify_mark_srcu),\n+\t\t\t\t\t\t struct fsnotify_mark, i.i_list);\n+\t\t\tinode_group = inode_mark->group;\n+\t\t} else\n+\t\t\tinode_group = (void *)-1;\n+\n+\t\tif (vfsmount_node) {\n+\t\t\tvfsmount_mark = hlist_entry(srcu_dereference(vfsmount_node, &fsnotify_mark_srcu),\n+\t\t\t\t\t\t\tstruct fsnotify_mark, m.m_list);\n+\t\t\tvfsmount_group = vfsmount_mark->group;\n+\t\t} else\n+\t\t\tvfsmount_group = (void *)-1;\n+\n+\t\tif (inode_group < vfsmount_group) {\n+\t\t\t\/* handle inode *\/\n+\t\t\tsend_to_group(to_tell, NULL, inode_mark, mask, data,\n+\t\t\t\t data_is, cookie, file_name, &event);\n+\t\t\tused_inode = true;\n+\t\t} else if (vfsmount_group < inode_group) {\n+\t\t\tsend_to_group(to_tell, mnt, vfsmount_mark, mask, data,\n+\t\t\t\t data_is, cookie, file_name, &event);\n+\t\t\tused_vfsmount = true;\n+\t\t} else {\n+\t\t\tsend_to_group(to_tell, mnt, vfsmount_mark, mask, data,\n+\t\t\t\t data_is, cookie, file_name, &event);\n+\t\t\tused_vfsmount = true;\n+\t\t\tsend_to_group(to_tell, NULL, inode_mark, mask, data,\n+\t\t\t\t data_is, cookie, file_name, &event);\n+\t\t\tused_inode = true;\n \t\t}\n-\t}\n-\n-\tif (mnt && ((test_mask & mnt->mnt_fsnotify_mask) ||\n-\t\t (mask & FS_MODIFY))) {\n-\t\thlist_for_each_entry_rcu(mark, node, &mnt->mnt_fsnotify_marks, m.m_list) {\n-\n-\t\t\tpr_debug(\"%s: mnt_loop: mark=%p mark->mask=%x mark->ignored_mask=%x\\n\",\n-\t\t\t\t __func__, mark, mark->mask, mark->ignored_mask);\n-\n-\t\t\tif ((mask & FS_MODIFY) &&\n-\t\t\t !(mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY))\n-\t\t\t\tmark->ignored_mask = 0;\n-\n-\t\t\tif (test_mask & mark->mask & ~mark->ignored_mask) {\n-\t\t\t\tgroup = mark->group;\n-\t\t\t\tif (!group)\n-\t\t\t\t\tcontinue;\n-\t\t\t\tret = send_to_group(group, to_tell, mnt, mark, mask,\n-\t\t\t\t\t\t data, data_is, cookie, file_name,\n-\t\t\t\t\t\t &event);\n-\t\t\t\tif (ret)\n-\t\t\t\t\tgoto out;\n-\t\t\t}\n-\t\t}\n-\t}\n-out:\n+\n+\t\tif (used_inode)\n+\t\t\tinode_node = inode_node->next;\n+\t\tif (used_vfsmount)\n+\t\t\tvfsmount_node = vfsmount_node->next;\n+\t}\n+\n \tsrcu_read_unlock(&fsnotify_mark_srcu, idx);\n \t\/*\n \t * fsnotify_create_event() took a reference so the event can't be cleaned\n"} {"commit":"53a08cb9b8bccfe58f1228c7c27baf34a83da78b","subject":"ovl: make upperdir optional","message":"ovl: make upperdir optional\n\nMake \"upperdir=\" mount option optional. If \"upperdir=\" is not given, then\nthe \"workdir=\" option is also optional (and ignored if given).\n\nSigned-off-by: Miklos Szeredi <84cd5483a2f9acd1c37251cba7c2908448f221b8@suse.cz>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/overlayfs\/super.c\n+++ fs\/overlayfs\/super.c\n@@ -516,8 +516,10 @@\n \tstruct ovl_fs *ufs = sb->s_fs_info;\n \n \tseq_printf(m, \",lowerdir=%s\", ufs->config.lowerdir);\n-\tseq_printf(m, \",upperdir=%s\", ufs->config.upperdir);\n-\tseq_printf(m, \",workdir=%s\", ufs->config.workdir);\n+\tif (ufs->config.upperdir) {\n+\t\tseq_printf(m, \",upperdir=%s\", ufs->config.upperdir);\n+\t\tseq_printf(m, \",workdir=%s\", ufs->config.workdir);\n+\t}\n \treturn 0;\n }\n \n@@ -768,8 +770,8 @@\n static int ovl_fill_super(struct super_block *sb, void *data, int silent)\n {\n \tstruct path lowerpath;\n-\tstruct path upperpath;\n-\tstruct path workpath;\n+\tstruct path upperpath = { NULL, NULL };\n+\tstruct path workpath = { NULL, NULL };\n \tstruct dentry *root_dentry;\n \tstruct ovl_entry *oe;\n \tstruct ovl_fs *ufs;\n@@ -786,31 +788,38 @@\n \tif (err)\n \t\tgoto out_free_config;\n \n-\t\/* FIXME: workdir is not needed for a R\/O mount *\/\n \terr = -EINVAL;\n-\tif (!ufs->config.upperdir || !ufs->config.lowerdir ||\n-\t !ufs->config.workdir) {\n-\t\tpr_err(\"overlayfs: missing upperdir or lowerdir or workdir\\n\");\n+\tif (!ufs->config.lowerdir) {\n+\t\tpr_err(\"overlayfs: missing 'lowerdir'\\n\");\n \t\tgoto out_free_config;\n \t}\n \n-\terr = ovl_mount_dir(ufs->config.upperdir, &upperpath);\n-\tif (err)\n-\t\tgoto out_free_config;\n-\n-\terr = ovl_mount_dir(ufs->config.workdir, &workpath);\n-\tif (err)\n-\t\tgoto out_put_upperpath;\n-\n-\tif (upperpath.mnt != workpath.mnt) {\n-\t\tpr_err(\"overlayfs: workdir and upperdir must reside under the same mount\\n\");\n-\t\tgoto out_put_workpath;\n-\t}\n-\tif (!ovl_workdir_ok(workpath.dentry, upperpath.dentry)) {\n-\t\tpr_err(\"overlayfs: workdir and upperdir must be separate subtrees\\n\");\n-\t\tgoto out_put_workpath;\n-\t}\n-\tsb->s_stack_depth = upperpath.mnt->mnt_sb->s_stack_depth;\n+\tsb->s_stack_depth = 0;\n+\tif (ufs->config.upperdir) {\n+\t\t\/* FIXME: workdir is not needed for a R\/O mount *\/\n+\t\tif (!ufs->config.workdir) {\n+\t\t\tpr_err(\"overlayfs: missing 'workdir'\\n\");\n+\t\t\tgoto out_free_config;\n+\t\t}\n+\n+\t\terr = ovl_mount_dir(ufs->config.upperdir, &upperpath);\n+\t\tif (err)\n+\t\t\tgoto out_free_config;\n+\n+\t\terr = ovl_mount_dir(ufs->config.workdir, &workpath);\n+\t\tif (err)\n+\t\t\tgoto out_put_upperpath;\n+\n+\t\tif (upperpath.mnt != workpath.mnt) {\n+\t\t\tpr_err(\"overlayfs: workdir and upperdir must reside under the same mount\\n\");\n+\t\t\tgoto out_put_workpath;\n+\t\t}\n+\t\tif (!ovl_workdir_ok(workpath.dentry, upperpath.dentry)) {\n+\t\t\tpr_err(\"overlayfs: workdir and upperdir must be separate subtrees\\n\");\n+\t\t\tgoto out_put_workpath;\n+\t\t}\n+\t\tsb->s_stack_depth = upperpath.mnt->mnt_sb->s_stack_depth;\n+\t}\n \n \terr = ovl_lower_dir(ufs->config.lowerdir, &lowerpath,\n \t\t\t &ufs->lower_namelen, &sb->s_stack_depth);\n@@ -824,19 +833,21 @@\n \t\tgoto out_put_lowerpath;\n \t}\n \n-\tufs->upper_mnt = clone_private_mount(&upperpath);\n-\terr = PTR_ERR(ufs->upper_mnt);\n-\tif (IS_ERR(ufs->upper_mnt)) {\n-\t\tpr_err(\"overlayfs: failed to clone upperpath\\n\");\n-\t\tgoto out_put_lowerpath;\n-\t}\n-\n-\tufs->workdir = ovl_workdir_create(ufs->upper_mnt, workpath.dentry);\n-\terr = PTR_ERR(ufs->workdir);\n-\tif (IS_ERR(ufs->workdir)) {\n-\t\tpr_err(\"overlayfs: failed to create directory %s\/%s\\n\",\n-\t\t ufs->config.workdir, OVL_WORKDIR_NAME);\n-\t\tgoto out_put_upper_mnt;\n+\tif (ufs->config.upperdir) {\n+\t\tufs->upper_mnt = clone_private_mount(&upperpath);\n+\t\terr = PTR_ERR(ufs->upper_mnt);\n+\t\tif (IS_ERR(ufs->upper_mnt)) {\n+\t\t\tpr_err(\"overlayfs: failed to clone upperpath\\n\");\n+\t\t\tgoto out_put_lowerpath;\n+\t\t}\n+\n+\t\tufs->workdir = ovl_workdir_create(ufs->upper_mnt, workpath.dentry);\n+\t\terr = PTR_ERR(ufs->workdir);\n+\t\tif (IS_ERR(ufs->workdir)) {\n+\t\t\tpr_err(\"overlayfs: failed to create directory %s\/%s\\n\",\n+\t\t\t ufs->config.workdir, OVL_WORKDIR_NAME);\n+\t\t\tgoto out_put_upper_mnt;\n+\t\t}\n \t}\n \n \tufs->lower_mnt = kcalloc(1, sizeof(struct vfsmount *), GFP_KERNEL);\n@@ -858,8 +869,8 @@\n \tufs->lower_mnt[0] = mnt;\n \tufs->numlower = 1;\n \n-\t\/* If the upper fs is r\/o, we mark overlayfs r\/o too *\/\n-\tif (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)\n+\t\/* If the upper fs is r\/o or nonexistent, we mark overlayfs r\/o too *\/\n+\tif (!ufs->upper_mnt || (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY))\n \t\tsb->s_flags |= MS_RDONLY;\n \n \tsb->s_d_op = &ovl_dentry_operations;\n"} {"commit":"89bd826c2b62f83e491b13b1a299529a33180c18","subject":" * Python\/import.c: support *.o\/*.so as alternative for *module.o\/*module.so","message":" * Python\/import.c: support *.o\/*.so as alternative for\n *module.o\/*module.so\n\n * Python\/import.c: if initializing a module did not enter the\n module into sys.modules, it may have raised an exception -- don't\n override this exception.\n\nMerged NT changes\n\n * Python\/import.c: add lost NT-specific code back in\n\nFixed NT changes\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Python\/import.c\n+++ Python\/import.c\n@@ -1,5 +1,5 @@\n \/***********************************************************\n-Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,\n+Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,\n Amsterdam, The Netherlands.\n \n All Rights Reserved\n@@ -38,9 +38,9 @@\n #include \"eval.h\"\n #include \"osdefs.h\"\n \n-extern int verbose; \/* Defined in pythonmain.c *\/\n-\n-extern long getmtime(); \/* Defined in posixmodule.c *\/\n+extern int verbose; \/* Defined in pythonrun.c *\/\n+\n+extern long getmtime(); \/* In getmtime.c *\/\n \n #ifdef DEBUG\n #define D(x) x\n@@ -48,20 +48,114 @@\n #define D(x)\n #endif\n \n+\/* Explanation of some of the the various #defines used by dynamic linking...\n+\n+ symbol\t-- defined for:\n+\n+ DYNAMIC_LINK -- any kind of dynamic linking\n+ USE_RLD\t-- NeXT dynamic linking\n+ USE_DL\t-- Jack's dl for IRIX 4 or GNU dld with emulation for Jack's dl\n+ USE_SHLIB\t-- SunOS or IRIX 5 (SVR4?) shared libraries\n+ _AIX\t\t-- AIX style dynamic linking\n+ NT\t\t-- NT style dynamic linking (using DLLs)\n+ _DL_FUNCPTR_DEFINED\t-- if the typedef dl_funcptr has been defined\n+ WITH_MAC_DL\t-- Mac dynamic linking (highly experimental)\n+ SHORT_EXT\t-- short extension for dynamic module, e.g. \".so\"\n+ LONG_EXT\t-- long extension, e.g. \"module.so\"\n+\n+ (The other WITH_* symbols are used only once, to set the\n+ appropriate symbols.)\n+*\/\n+\n+\/* Configure dynamic linking *\/\n+\n+#ifdef NT\n+#define DYNAMIC_LINK\n+#include <windows.h>\n+typedef FARPROC dl_funcptr;\n+#define _DL_FUNCPTR_DEFINED\n+#define SHORT_EXT \".dll\"\n+#define LONG_EXT \"module.dll\"\n+#endif\n+\n+#if defined(NeXT) || defined(WITH_RLD)\n+#define DYNAMIC_LINK\n+#define USE_RLD\n+#endif\n+\n+#ifdef WITH_SGI_DL\n+#define DYNAMIC_LINK\n+#define USE_DL\n+#endif\n+\n+#ifdef WITH_DL_DLD\n+#define DYNAMIC_LINK\n+#define USE_DL\n+#endif\n+\n+#ifdef WITH_MAC_DL\n+#define DYNAMIC_LINK\n+#endif\n+\n+#if !defined(DYNAMIC_LINK) && defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN)\n+#define DYNAMIC_LINK\n+#define USE_SHLIB\n+#endif\n+\n+#ifdef _AIX\n+#define DYNAMIC_LINK\n+#include <sys\/ldr.h>\n+typedef void (*dl_funcptr)();\n+#define _DL_FUNCPTR_DEFINED\n+static void aix_loaderror(char *name);\n+#endif\n+\n+#ifdef DYNAMIC_LINK\n+\n+#ifdef USE_SHLIB\n+#include <dlfcn.h>\n+#ifndef _DL_FUNCPTR_DEFINED\n+typedef void (*dl_funcptr)();\n+#endif\n+#ifndef RTLD_LAZY\n+#define RTLD_LAZY 1\n+#endif\n+#define SHORT_EXT \".so\"\n+#define LONG_EXT \"module.so\"\n+#endif \/* USE_SHLIB *\/\n+\n #ifdef USE_DL\n-#ifdef SUN_SHLIB\n-#include <dlfcn.h>\n+#include \"dl.h\"\n+#endif\n+\n+#ifdef WITH_MAC_DL\n+#include \"dynamic_load.h\"\n+#endif\n+\n+#ifdef USE_RLD\n+#include <mach-o\/rld.h>\n+#define FUNCNAME_PATTERN \"_init%s\"\n+#ifndef _DL_FUNCPTR_DEFINED\n typedef void (*dl_funcptr)();\n-#else\n-#include \"dl.h\"\n-#endif \/* SUN_SHLIB *\/\n-\n-extern char *argv0;\n-#endif\n+#endif\n+#endif \/* USE_RLD *\/\n+\n+extern char *getprogramname();\n+\n+#ifndef FUNCNAME_PATTERN\n+#define FUNCNAME_PATTERN \"init%s\"\n+#endif\n+\n+#if !defined(SHORT_EXT) && !defined(LONG_EXT)\n+#define SHORT_EXT \".o\"\n+#define LONG_EXT \"module.o\"\n+#endif \/* !SHORT_EXT && !LONG_EXT *\/\n+\n+#endif \/* DYNAMIC_LINK *\/\n \n \/* Magic word to reject .pyc files generated by other Python versions *\/\n \n-#define MAGIC 0x999902L \/* Increment by one for each incompatible change *\/\n+#define MAGIC 0x999903L \/* Increment by one for each incompatible change *\/\n \n static object *modules;\n \n@@ -108,17 +202,144 @@\n \tchar *mode;\n \tenum filetype type;\n } filetab[] = {\n-#ifdef USE_DL\n-#ifdef SUN_SHLIB\n-\t{\"module.so\", \"rb\", C_EXTENSION},\n-#else\n-\t{\"module.o\", \"rb\", C_EXTENSION},\n-#endif \/* SUN_SHLIB *\/\n-#endif \/* USE_DL *\/\n+#ifdef DYNAMIC_LINK\n+#ifdef SHORT_EXT\n+\t{SHORT_EXT, \"rb\", C_EXTENSION},\n+#endif \/* !SHORT_EXT *\/\n+#ifdef LONG_EXT\n+\t{LONG_EXT, \"rb\", C_EXTENSION},\n+#endif \/* !LONG_EXT *\/\n+#endif \/* DYNAMIC_LINK *\/\n \t{\".py\", \"r\", PY_SOURCE},\n \t{\".pyc\", \"rb\", PY_COMPILED},\n \t{0, 0}\n };\n+\n+#ifdef DYNAMIC_LINK\n+static object *\n+load_dynamic_module(name, namebuf, m, m_ret)\n+\tchar *name;\n+\tchar *namebuf;\n+\tobject *m;\n+\tobject **m_ret;\n+{\n+\tchar funcname[258];\n+\tdl_funcptr p = NULL;\n+\tif (m != NULL) {\n+\t\terr_setstr(ImportError,\n+\t\t\t \"cannot reload dynamically loaded module\");\n+\t\treturn NULL;\n+\t}\n+\tsprintf(funcname, FUNCNAME_PATTERN, name);\n+#ifdef WITH_MAC_DL\n+\t{\n+\t\tobject *v = dynamic_load(namebuf);\n+\t\tif (v == NULL)\n+\t\t\treturn NULL;\n+\t}\n+#else \/* !WITH_MAC_DL *\/\n+#ifdef USE_SHLIB\n+\t{\n+#ifdef RTLD_NOW\n+\t\t\/* RTLD_NOW: resolve externals now\n+\t\t (i.e. core dump now if some are missing) *\/\n+\t\tvoid *handle = dlopen(namebuf, RTLD_NOW);\n+#else\n+\t\tvoid *handle;\n+\t\tif (verbose)\n+\t\t\tprintf(\"dlopen(\\\"%s\\\", %d);\\n\", namebuf, RTLD_LAZY);\n+\t\thandle = dlopen(namebuf, RTLD_LAZY);\n+#endif \/* RTLD_NOW *\/\n+\t\tif (handle == NULL) {\n+\t\t\terr_setstr(ImportError, dlerror());\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tp = (dl_funcptr) dlsym(handle, funcname);\n+\t}\n+#endif \/* USE_SHLIB *\/\n+#ifdef _AIX\n+\tp = (dl_funcptr) load(namebuf, 1, 0);\n+\tif (p == NULL) {\n+\t\taix_loaderror(namebuf);\n+\t\treturn NULL;\n+\t}\n+#endif \/* _AIX *\/\n+#ifdef NT\n+\t{\n+\t\tHINSTANCE hDLL;\n+\t\thDLL = LoadLibrary(namebuf);\n+\t\tif (hDLL==NULL){\n+\t\t\tchar errBuf[64];\n+\t\t\tsprintf(errBuf, \"DLL load failed with error code %d\",\n+\t\t\t\tGetLastError());\n+\t\t\terr_setstr(ImportError, errBuf);\n+\t\treturn NULL;\n+\t\t}\n+\t\tp = GetProcAddress(hDLL, funcname);\n+\t}\n+#endif \/* NT *\/\n+#ifdef USE_DL\n+\tp = dl_loadmod(getprogramname(), namebuf, funcname);\n+#endif \/* USE_DL *\/\n+#ifdef USE_RLD\n+\t{\n+\t\tNXStream *errorStream;\n+\t\tstruct mach_header *new_header;\n+\t\tconst char *filenames[2];\n+\t\tlong ret;\n+\t\tunsigned long ptr;\n+\n+\t\terrorStream = NXOpenMemory(NULL, 0, NX_WRITEONLY);\n+\t\tfilenames[0] = namebuf;\n+\t\tfilenames[1] = NULL;\n+\t\tret = rld_load(errorStream, &new_header, \n+\t\t\t\tfilenames, NULL);\n+\n+\t\t\/* extract the error messages for the exception *\/\n+\t\tif(!ret) {\n+\t\t\tchar *streamBuf;\n+\t\t\tint len, maxLen;\n+\n+\t\t\tNXPutc(errorStream, (char)0);\n+\n+\t\t\tNXGetMemoryBuffer(errorStream,\n+\t\t\t\t&streamBuf, &len, &maxLen);\n+\t\t\terr_setstr(ImportError, streamBuf);\n+\t\t}\n+\n+\t\tif(ret && rld_lookup(errorStream, funcname, &ptr))\n+\t\t\tp = (dl_funcptr) ptr;\n+\n+\t\tNXCloseMemory(errorStream, NX_FREEBUFFER);\n+\n+\t\tif(!ret)\n+\t\t\treturn NULL;\n+\t}\n+#endif \/* USE_RLD *\/\n+\n+\tif (p == NULL) {\n+\t\terr_setstr(ImportError,\n+\t\t \"dynamic module does not define init function\");\n+\t\treturn NULL;\n+\t}\n+\t(*p)();\n+\n+#endif \/* !WITH_MAC_DL *\/\n+\t*m_ret = m = dictlookup(modules, name);\n+\tif (m == NULL) {\n+\t\tif (err_occurred() == NULL)\n+\t\t\terr_setstr(SystemError,\n+\t\t\t\t \"dynamic module not initialized properly\");\n+\t\treturn NULL;\n+\t}\n+\tif (verbose)\n+\t\tfprintf(stderr,\n+\t\t\t\"import %s # dynamically loaded from %s\\n\",\n+\t\t\tname, namebuf);\n+\tINCREF(None);\n+\treturn None;\n+}\n+#endif \/* DYNAMIC_LINK *\/\n \n static object *\n get_module(m, name, m_ret)\n@@ -182,35 +403,34 @@\n \t\t\tif (magic != MAGIC) {\n \t\t\t\tif (verbose)\n \t\t\t\t\tfprintf(stderr,\n-\t\t\t\t\t\t\"# %s.pyc has bad magic\\n\",\n-\t\t\t\t\t\tname);\n+\t\t\t\t\t\t\"# %s has bad magic\\n\",\n+\t\t\t\t\t\tnamebuf);\n \t\t\t}\n \t\t\telse {\n \t\t\t\tpyc_mtime = rd_long(fpc);\n \t\t\t\tif (pyc_mtime != mtime) {\n \t\t\t\t\tif (verbose)\n \t\t\t\t\t\tfprintf(stderr,\n-\t\t\t\t\t\t \"# %s.pyc has bad mtime\\n\",\n-\t\t\t\t\t\t name);\n+\t\t\t\t\t\t \"# %s has bad mtime\\n\",\n+\t\t\t\t\t\t namebuf);\n \t\t\t\t}\n \t\t\t\telse {\n \t\t\t\t\tfclose(fp);\n \t\t\t\t\tfp = fpc;\n \t\t\t\t\tif (verbose)\n \t\t\t\t\t fprintf(stderr,\n-\t\t\t\t\t \"# %s.pyc matches %s.py\\n\",\n-\t\t\t\t\t\t name, name);\n+\t\t\t\t\t \"# %s matches %s.py\\n\",\n+\t\t\t\t\t\t namebuf, name);\n \t\t\t\t\tgoto use_compiled;\n \t\t\t\t}\n \t\t\t}\n \t\t\tfclose(fpc);\n \t\t}\n \t\tnamebuf[len] = '\\0';\n-\t\terr = parse_file(fp, namebuf, file_input, &n);\n-\t\tif (err != E_DONE) {\n-\t\t\terr_input(err);\n-\t\t\treturn NULL;\n-\t\t}\n+\t\tn = parse_file(fp, namebuf, file_input);\n+\t\tfclose(fp);\n+\t\tif (n == NULL)\n+\t\t\treturn NULL;\n \t\tco = compile(n, namebuf);\n \t\tfreetree(n);\n \t\tif (co == NULL)\n@@ -254,8 +474,8 @@\n \n \tcase PY_COMPILED:\n \t\tif (verbose)\n-\t\t\tfprintf(stderr, \"# %s.pyc without %s.py\\n\",\n-\t\t\t\tname, name);\n+\t\t\tfprintf(stderr, \"# %s without %s.py\\n\",\n+\t\t\t\tnamebuf, name);\n \t\tmagic = rd_long(fp);\n \t\tif (magic != MAGIC) {\n \t\t\terr_setstr(ImportError,\n@@ -279,44 +499,11 @@\n \t\t\t\tname, namebuf);\n \t\tbreak;\n \n-#ifdef USE_DL\n+#ifdef DYNAMIC_LINK\n \tcase C_EXTENSION:\n-\t {\n-\t\tchar funcname[258];\n-\t\tdl_funcptr p;\n \t\tfclose(fp);\n-\t\tsprintf(funcname, \"init%s\", name);\n-#ifdef SUN_SHLIB\n-\t\t{\n-\t\t void *handle = dlopen (namebuf, 1);\n-\t\t p = (dl_funcptr) dlsym(handle, funcname);\n-\t\t}\n-#else\n-\t\tp = dl_loadmod(argv0, namebuf, funcname);\n-#endif \/* SUN_SHLIB *\/\n-\t\tif (p == NULL) {\n-\t\t\terr_setstr(ImportError,\n-\t\t\t \"dynamic module does not define init function\");\n-\t\t\treturn NULL;\n-\t\t} else {\n-\t\t\t(*p)();\n-\t\t\t*m_ret = m = dictlookup(modules, name);\n-\t\t\tif (m == NULL) {\n-\t\t\t\terr_setstr(SystemError,\n-\t\t\t\t \"dynamic module not initialized properly\");\n-\t\t\t\treturn NULL;\n-\t\t\t} else {\n-\t\t\t\tif (verbose)\n-\t\t\t\t\tfprintf(stderr,\n-\t\t\t\t\"import %s # dynamically loaded from %s\\n\",\n-\t\t\t\t\t\tname, namebuf);\n-\t\t\t\tINCREF(None);\n-\t\t\t\treturn None;\n-\t\t\t}\n-\t\t}\n-\t\tbreak;\n-\t }\n-#endif \/* USE_DL *\/\n+\t\treturn load_dynamic_module(name, namebuf, m, m_ret);\n+#endif \/* DYNAMIC_LINK *\/\n \n \tdefault:\n \t\tfclose(fp);\n@@ -363,9 +550,11 @@\n \t\tif ((n = init_builtin(name)) || (n = init_frozen(name))) {\n \t\t\tif (n < 0)\n \t\t\t\treturn NULL;\n-\t\t\tif ((m = dictlookup(modules, name)) == NULL)\n-\t\t\t\terr_setstr(SystemError,\n-\t\t\t\t\t \"builtin module missing\");\n+\t\t\tif ((m = dictlookup(modules, name)) == NULL) {\n+\t\t\t\tif (err_occurred() == NULL)\n+\t\t\t\t\terr_setstr(SystemError,\n+\t\t\t\t \"builtin module not initialized properly\");\n+\t\t\t}\n \t\t}\n \t\telse {\n \t\t\tm = load_module(name);\n@@ -379,6 +568,7 @@\n \tobject *m;\n {\n \tchar *name;\n+\tint i;\n \tif (m == NULL || !is_moduleobject(m)) {\n \t\terr_setstr(TypeError, \"reload() argument must be module\");\n \t\treturn NULL;\n@@ -386,7 +576,21 @@\n \tname = getmodulename(m);\n \tif (name == NULL)\n \t\treturn NULL;\n-\t\/* XXX Ought to check for builtin modules -- can't reload these... *\/\n+\t\/* Check for built-in modules *\/\n+\tfor (i = 0; inittab[i].name != NULL; i++) {\n+\t\tif (strcmp(name, inittab[i].name) == 0) {\n+\t\t\terr_setstr(ImportError,\n+\t\t\t\t \"cannot reload built-in module\");\n+\t\t\treturn NULL;\n+\t\t}\n+\t}\n+\t\/* Check for frozen modules *\/\n+\tif ((i = init_frozen(name)) != 0) {\n+\t\tif (i < 0)\n+\t\t\treturn NULL;\n+\t\tINCREF(None);\n+\t\treturn None;\n+\t}\n \treturn get_module(m, name, (object **)NULL);\n }\n \n@@ -423,6 +627,11 @@\n \tint i;\n \tfor (i = 0; inittab[i].name != NULL; i++) {\n \t\tif (strcmp(name, inittab[i].name) == 0) {\n+\t\t\tif (inittab[i].initfunc == NULL) {\n+\t\t\t\terr_setstr(ImportError,\n+\t\t\t\t\t \"cannot re-init internal module\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n \t\t\tif (verbose)\n \t\t\t\tfprintf(stderr, \"import %s # builtin\\n\",\n \t\t\t\t\tname);\n@@ -467,3 +676,58 @@\n \tDECREF(v);\n \treturn 1;\n }\n+\n+\n+#ifdef _AIX\n+\n+#include <ctype.h>\t\/* for isdigit()\t*\/\n+#include <errno.h>\t\/* for global errno\t*\/\n+#include <string.h>\t\/* for strerror()\t*\/\n+\n+void aix_loaderror(char *namebuf)\n+{\n+\n+\tchar *message[8], errbuf[1024];\n+\tint i,j;\n+\n+\tstruct errtab { \n+\t\tint errno;\n+\t\tchar *errstr;\n+\t} load_errtab[] = {\n+\t\t{L_ERROR_TOOMANY,\t\"to many errors, rest skipped.\"},\n+\t\t{L_ERROR_NOLIB,\t\t\"can't load library:\"},\n+\t\t{L_ERROR_UNDEF,\t\t\"can't find symbol in library:\"},\n+\t\t{L_ERROR_RLDBAD,\n+\t\t \"RLD index out of range or bad relocation type:\"},\n+\t\t{L_ERROR_FORMAT,\t\"not a valid, executable xcoff file:\"},\n+\t\t{L_ERROR_MEMBER,\n+\t\t \"file not an archive or does not contain requested member:\"},\n+\t\t{L_ERROR_TYPE,\t\t\"symbol table mismatch:\"},\n+\t\t{L_ERROR_ALIGN,\t\t\"text allignment in file is wrong.\"},\n+\t\t{L_ERROR_SYSTEM,\t\"System error:\"},\n+\t\t{L_ERROR_ERRNO,\t\tNULL}\n+\t};\n+\n+#define LOAD_ERRTAB_LEN\t(sizeof(load_errtab)\/sizeof(load_errtab[0]))\n+#define ERRBUF_APPEND(s)\tstrncat(errbuf, s, sizeof(errbuf))\n+\n+\tsprintf(errbuf, \" from module %s \", namebuf);\n+\n+\tif (!loadquery(1, &message[0], sizeof(message))) \n+\t\tERRBUF_APPEND(strerror(errno));\n+\tfor(i = 0; message[i] && *message[i]; i++) {\n+\t\tint nerr = atoi(message[i]);\n+\t\tfor (j=0; j<LOAD_ERRTAB_LEN ; j++) {\n+\t\t if (nerr == load_errtab[i].errno && load_errtab[i].errstr)\n+\t\t\tERRBUF_APPEND(load_errtab[i].errstr);\n+\t\t}\n+\t\twhile (isdigit(*message[i])) message[i]++ ; \n+\t\tERRBUF_APPEND(message[i]);\n+\t\tERRBUF_APPEND(\"\\n\");\n+\t}\n+\terrbuf[strlen(errbuf)-1] = '\\0' ;\t\/* trim off last newline *\/\n+\terr_setstr(ImportError, errbuf); \n+\treturn; \n+}\n+\n+#endif \/* _AIX *\/\n"} {"commit":"10b9f6097072000aceafde02d4530b1b2ff9120d","subject":"Fix hairtunes still bootup if alsa initialization fail","message":"Fix hairtunes still bootup if alsa initialization fail\n","repos":"skaman\/shairport,skaman\/shairport","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- audio_alsa.c\n+++ audio_alsa.c\n@@ -46,7 +46,7 @@\n rc = snd_pcm_open(&alsa_handle, \"default\", SND_PCM_STREAM_PLAYBACK, 0);\n if (rc < 0) {\n fprintf(stderr, \"unable to open pcm device: %s\\n\", snd_strerror(rc));\n- return NULL;\n+ die(\"alsa initialization failed\");\n }\n snd_pcm_hw_params_alloca(&alsa_params);\n snd_pcm_hw_params_any(alsa_handle, alsa_params);\n@@ -58,6 +58,7 @@\n rc = snd_pcm_hw_params(alsa_handle, alsa_params);\n if (rc < 0) {\n fprintf(stderr, \"unable to set hw parameters: %s\\n\", snd_strerror(rc));\n+ die(\"alsa initialization failed\");\n }\n return NULL;\n }\n"} {"commit":"7713dc4a8224d232c2f30b713c8453449cf27857","subject":"Generate 2048 RSA keys, with an ID and don't destroy the public key","message":"Generate 2048 RSA keys, with an ID and don't destroy the public key\n","repos":"Yubico\/pkcs11test,Yubico\/pkcs11test,Yubico\/pkcs11test,Yubico\/pkcs11test","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- pkcs11test.h\n+++ pkcs11test.h\n@@ -275,12 +275,15 @@\n : session_(session),\n public_attrs_(public_attrs), private_attrs_(private_attrs),\n public_key_(INVALID_OBJECT_HANDLE), private_key_(INVALID_OBJECT_HANDLE) {\n- CK_ULONG modulus_bits = 1024;\n+ CK_ULONG modulus_bits = 2048;\n CK_ATTRIBUTE modulus = {CKA_MODULUS_BITS, &modulus_bits, sizeof(modulus_bits)};\n public_attrs_.push_back(modulus);\n CK_BYTE public_exponent_value[] = {0x1, 0x0, 0x1}; \/\/ 65537=0x010001\n CK_ATTRIBUTE public_exponent = {CKA_PUBLIC_EXPONENT, public_exponent_value, sizeof(public_exponent_value)};\n public_attrs_.push_back(public_exponent);\n+ CK_ULONG key_id = std::rand() % 256;\n+ CK_ATTRIBUTE id = {CKA_ID, &key_id, 2};\n+ public_attrs_.push_back(id);\n \n CK_MECHANISM mechanism = {CKM_RSA_PKCS_KEY_PAIR_GEN, NULL_PTR, 0};\n EXPECT_CKR_OK(g_fns->C_GenerateKeyPair(session_, &mechanism,\n@@ -289,9 +292,9 @@\n &public_key_, &private_key_));\n }\n ~KeyPair() {\n- if (public_key_ != INVALID_OBJECT_HANDLE) {\n+ \/*if (public_key_ != INVALID_OBJECT_HANDLE) {\n EXPECT_CKR_OK(g_fns->C_DestroyObject(session_, public_key_));\n- }\n+ }*\/\n if (private_key_ != INVALID_OBJECT_HANDLE) {\n EXPECT_CKR_OK(g_fns->C_DestroyObject(session_, private_key_));\n }\n"} {"commit":"bb7a34a74778c7beacdcea380927b4460bec2253","subject":"fixed warning on gcc (regarding #endif)","message":"fixed warning on gcc (regarding #endif)\n","repos":"copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- copasi\/model\/CModel.h\n+++ copasi\/model\/CModel.h\n@@ -1,9 +1,9 @@\n \/\/ Begin CVS Header\n \/\/ $Source: \/Volumes\/Home\/Users\/shoops\/cvs\/copasi_dev\/copasi\/model\/CModel.h,v $\n-\/\/ $Revision: 1.152 $\n+\/\/ $Revision: 1.153 $\n \/\/ $Name: $\n-\/\/ $Author: aekamal $\n-\/\/ $Date: 2007\/10\/27 01:30:07 $\n+\/\/ $Author: ssahle $\n+\/\/ $Date: 2007\/10\/29 09:37:52 $\n \/\/ End CVS Header\n \n \/\/ Copyright (C) 2007 by Pedro Mendes, Virginia Tech Intellectual\n@@ -369,7 +369,7 @@\n * Stores the MIRIAM info of Model.\n *\/\n CModelMIRIAMInfo mMIRIAMInfo;\n-#endif COPASI_MIRIAM\n+#endif \/\/COPASI_MIRIAM\n \n public:\n \/**\n"} {"commit":"71af7702d5b85b23971d6b7802641f15f9abad9f","subject":"Changed declaration of enum and unit names to be public.","message":"Changed declaration of enum and unit names to be public.\n","repos":"copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- copasi\/model\/CModel.h\n+++ copasi\/model\/CModel.h\n@@ -21,6 +21,7 @@\n \/** @dia:pos 177.081,30.2423 *\/\n class CModel : public CCopasiContainer\n {\n+ public:\n \/**\n * Enum of valid volume units\n *\/\n"} {"commit":"7b38a2bd069bda428ee9f22c44ef4711c1d293ed","subject":"Added comments to two new methods in CTCoreMessage: rfc822 and messageAsEmlx","message":"Added comments to two new methods in CTCoreMessage: rfc822 and messageAsEmlx\n","repos":"MailCore\/MailCore,msdgwzhy6\/MailCore,alloy\/MailCore,tipbit\/MailCore,MailCore\/MailCore,tipbit\/MailCore,SuPair\/MailCore,proforov\/MailCoreOld,SuPair\/MailCore,alloy\/MailCore,Jazzo\/MailCore,proforov\/MailCoreOld,SuPair\/MailCore,proforov\/MailCoreOld,msdgwzhy6\/MailCore,Jazzo\/MailCore,Jazzo\/MailCore,tipbit\/MailCore,msdgwzhy6\/MailCore,msdgwzhy6\/MailCore,alloy\/MailCore,Jazzo\/MailCore,MailCore\/MailCore,SuPair\/MailCore","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Source\/CTCoreMessage.h\n+++ Source\/CTCoreMessage.h\n@@ -245,7 +245,15 @@\n *\/\n - (NSString *)render;\n \n+\/*!\n+ @abstract Returns the message in the format Mail.app uses, Emlx. This format stores the message\n+ headers, body, and flags.\n+*\/\n - (NSData *)messageAsEmlx;\n+\n+\/*!\n+ @abstract Fetches from the server the rfc822 content of the message, which is the headers and the message body.\n+*\/\n - (NSString *)rfc822;\n \n \/* Intended for advanced use only *\/\n"} {"commit":"41c2c4d0ed4d2232133f3cbabc78395644b9b48e","subject":"XSECURELOCK_WANT_FIRST_KEYPRESS: no longer forward the first keypress if it is purely control characters.","message":"XSECURELOCK_WANT_FIRST_KEYPRESS: no longer forward the first keypress if it is purely control characters.\n\nFixes \"trying to unlock with the escape key only causes the screen to\nquickly turn on and off again\", as well as \"immediate authentication\nfailure when trying to unlock with the enter key\".\n\nInternal reference: b\/72708660.\n","repos":"google\/xsecurelock,google\/xsecurelock","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- auth_child.c\n+++ auth_child.c\n@@ -16,6 +16,7 @@\n \n #include \"auth_child.h\"\n \n+#include <ctype.h> \/\/ for isprint\n #include <errno.h> \/\/ for ECHILD, EINTR, errno\n #include <signal.h> \/\/ for kill, SIGTERM\n #include <stdio.h> \/\/ for perror, fprintf, stderr\n@@ -52,6 +53,16 @@\n return 1;\n }\n return (auth_child_pid != 0);\n+}\n+\n+static int ContainsPrintable(const char* buf) {\n+ while (*buf) {\n+ if (isprint((unsigned char) *buf)) {\n+ return 1;\n+ }\n+ ++buf;\n+ }\n+ return 0;\n }\n \n int WatchAuthChild(const char *executable, int force_auth, const char *stdinbuf,\n@@ -126,7 +137,7 @@\n auth_child_fd = pc[1];\n auth_child_pid = pid;\n \n- if (!WantFirstKeypress()) {\n+ if (!(WantFirstKeypress() && ContainsPrintable(stdinbuf))) {\n \/\/ The auth child has just been started. Do not send any keystrokes to\n \/\/ it immediately.\n stdinbuf = NULL;\n"} {"commit":"5c91b5f7b52bbedea4a0ec2234552666afb9d6d6","subject":"fixes build issue for clang-3.2 and later (missing variable declaration in combination with -Werror causes build failure)","message":"fixes build issue for clang-3.2 and later (missing variable declaration in combination with -Werror causes build failure)\n","repos":"Open343\/pkg,en90\/pkg,khorben\/pkg,skoef\/pkg,junovitch\/pkg,khorben\/pkg,skoef\/pkg,en90\/pkg,junovitch\/pkg,khorben\/pkg,Open343\/pkg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- pkg\/pkgcli.h\n+++ pkg\/pkgcli.h\n@@ -28,7 +28,9 @@\n #define _PKGCLI_H\n \n extern bool quiet;\n+extern int nbactions;\n int nbactions;\n+extern int nbdone;\n int nbdone;\n \n \/* pkg add *\/\n"} {"commit":"d22a39c070b57d8f4b374bc2b89714ce8a806c54","subject":"Return an error in case a update did faile in multi repository mode","message":"Return an error in case a update did faile in multi repository mode\n","repos":"junovitch\/pkg,en90\/pkg,Open343\/pkg,khorben\/pkg,skoef\/pkg,junovitch\/pkg,skoef\/pkg,khorben\/pkg,Open343\/pkg,khorben\/pkg,en90\/pkg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- pkg\/update.c\n+++ pkg\/update.c\n@@ -92,6 +92,8 @@\n \t\t\t\t\t \"fresh copy\\n\", repo_name);\n \t\t\t\tretcode = EPKG_OK;\n \t\t\t}\n+\t\t\tif (retcode != EPKG_OK)\n+\t\t\t\tbreak;\n \t\t}\n \t}\n \n"} {"commit":"f11faf24e26c02948ab11aa2bca3e26eba302ec7","subject":"Bug: compile if","message":"Bug: compile if\n","repos":"masaedw\/lisp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compile.c\n+++ compile.c\n@@ -277,7 +277,7 @@\n \n if (!ST_NULLP(elseE))\n {\n- elseC = compile(elseE, m, e, s, next);\n+ elseC = compile(ST_CAR(elseE), m, e, s, next);\n }\n \n return compile(testE, m, e, s, ST_LIST3(I(\"test\"), thenC, elseC));\n"} {"commit":"158e251d5dac2c347f6afb84fac7694da6049bd7","subject":"output formats","message":"output formats\n","repos":"ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Top\/argdecode.c\n+++ Top\/argdecode.c\n@@ -120,13 +120,13 @@\n };\n \n static const char *longUsageList[] = {\n- \"--format={alaw,ulaw,schar,uchar,float,short,long,24bit,rescale}\",\n+ \"--precision={alaw,ulaw,schar,uchar,float,short,long,24bit,rescale}\",\n \"\\t\\t\\tSet sound type\",\n \"--aiff\\t\\t\\tSet AIFF format\",\n \"--au\\t\\t\\tSet AU format\",\n \"--wave\\t\\t\\tSet WAV format\",\n \"--ircam\\t\\t\\tSet IRCAM format\",\n- \"--oformat=xxx\\t\\tSet other formats\",\n+ \"--format=xxx\\t\\tSet other formats\",\n \"--noheader\\t\\tRaw format\",\n \"--nopeaks\\t\\tDo not write peak information\",\n \"\",\n@@ -305,7 +305,7 @@\n csound->smacros = nn;\n return 1;\n }\n- else if (!(strncmp(s, \"format=\", 7))) {\n+ else if (!(strncmp(s, \"precision=\", 10))) {\n SAMPLE_FORMAT_ENTRY *sfe = sample_format_map;\n char c = '\\0';\n s += 7;\n@@ -658,24 +658,24 @@\n }\n return 1;\n }\n- else if (!(strncmp(s, \"oformat=\", 8))) {\n+ else if (!(strncmp(s, \"format=\", 7))) {\n char *t = s+8;\n typedef struct {\n char *format;\n int type;\n } FORMATS;\n FORMATS form[] = { \n- { \"WAV\" , TYP_WAV}, { \"AIFF\" , TYP_AIFF},\n- { \"AU\" , TYP_AU}, { \"RAW\" , TYP_RAW},\n- { \"PAF\" , TYP_PAF}, { \"SVX\" , TYP_SVX},\n- { \"NIST\" , TYP_NIST}, { \"VOC\" , TYP_VOC},\n- { \"IRCAM\" , TYP_IRCAM}, { \"W64\" , TYP_W64},\n- { \"MAT4\" , TYP_MAT4}, { \"MAT5\" , TYP_MAT5},\n- { \"PVF\" , TYP_PVF}, { \"XI\" , TYP_XI},\n- { \"HTK\" , TYP_HTK}, { \"SDS\" , TYP_SDS},\n- { \"AVR\" , TYP_AVR}, { \"WAVEX\" , TYP_WAVEX},\n- { \"SD2\" , TYP_SD2}, { \"FLAC\", TYP_FLAC},\n- { \"CAF\" , TYP_CAF}, {NULL , -1}};\n+ { \"WAV\", TYP_WAV}, { \"AIFF\", TYP_AIFF},\n+ { \"AU\", TYP_AU}, { \"RAW\", TYP_RAW},\n+ { \"PAF\", TYP_PAF}, { \"SVX\", TYP_SVX},\n+ { \"NIST\", TYP_NIST}, { \"VOC\", TYP_VOC},\n+ { \"IRCAM\", TYP_IRCAM}, { \"W64\", TYP_W64},\n+ { \"MAT4\", TYP_MAT4}, { \"MAT5\", TYP_MAT5},\n+ { \"PVF\", TYP_PVF}, { \"XI\", TYP_XI},\n+ { \"HTK\", TYP_HTK}, { \"SDS\", TYP_SDS},\n+ { \"AVR\", TYP_AVR}, { \"WAVEX\", TYP_WAVEX},\n+ { \"SD2\", TYP_SD2}, { \"FLAC\", TYP_FLAC},\n+ { \"CAF\", TYP_CAF}, { NULL, -1}};\n FORMATS *ff = form;\n while (ff->type>=0) {\n if (strcmp(ff->format, t)==0) {\n"} {"commit":"67c198552b6f3b0b1be358a2412bf4ccc6b619d5","subject":"qubes-restore: guard against falling off the start of the buffer","message":"qubes-restore: guard against falling off the start of the buffer\n","repos":"woju\/qubes-core-admin,woju\/qubes-core-admin,QubesOS\/qubes-core-admin,QubesOS\/qubes-core-admin,woju\/qubes-core-admin,QubesOS\/qubes-core-admin,marmarek\/qubes-core-admin,marmarek\/qubes-core-admin,woju\/qubes-core-admin,marmarek\/qubes-core-admin","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- dispvm\/qubes-restore.c\n+++ dispvm\/qubes-restore.c\n@@ -226,9 +226,9 @@\n \t}\n \t*name = 0;\n \tslash = name - 1;\n-\twhile (slash[0] && slash[0] != '\/')\n+\twhile (slash >= buf && slash[0] && slash[0] != '\/')\n \t\tslash--;\n-\tif (!*slash) {\n+\tif (slash < buf || !*slash) {\n \t\tfprintf(stderr, \"cannot find \/ in savefile\\n\");\n \t\texit(1);\n \t}\n"} {"commit":"94ed8f096a6894551a7b36628ba97fecfd3b2363","subject":"MS-1405 Bumped SDK version to 2.4","message":"MS-1405 Bumped SDK version to 2.4\n","repos":"8tracks\/appnexus-mobile-sdk-ios,8tracks\/appnexus-mobile-sdk-ios,8tracks\/appnexus-mobile-sdk-ios,appnexus\/mobile-sdk-ios,appnexus\/mobile-sdk-ios,appnexus\/mobile-sdk-ios,appnexus\/mobile-sdk-ios,appnexus\/mobile-sdk-ios,appnexus\/mobile-sdk-ios,8tracks\/appnexus-mobile-sdk-ios,8tracks\/appnexus-mobile-sdk-ios","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sdk\/internal\/ANGlobal.h\n+++ sdk\/internal\/ANGlobal.h\n@@ -35,7 +35,7 @@\n #define AN_ERROR_TABLE @\"errors\"\n \n #define AN_DEFAULT_PLACEMENT_ID\t\t@\"default_placement_id\"\n-#define AN_SDK_VERSION @\"2.3.1\"\n+#define AN_SDK_VERSION @\"2.4\"\n \n #define APPNEXUS_BANNER_SIZE\t\t\tCGSizeMake(320, 50)\n #define APPNEXUS_MEDIUM_RECT_SIZE\t\tCGSizeMake(300, 250)\n"} {"commit":"9133e1861234324184c3bb23cc34386e7da8d128","subject":"1998-07-13 Ben Elliston <bje@cygnus.com>","message":"1998-07-13 Ben Elliston <bje@cygnus.com>\n\n\t* condvar.c (pthread_condattr_init): Implement.\n\t(pthread_condattr_destroy): Likewise.\n\t(pthread_condattr_setpshared): Likewise.\n\t(pthread_condattr_getpshared): Likewise.\n","repos":"nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32","returncode":1,"stderr":"error: pathspec 'condvar.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- condvar.c\n+++ condvar.c\n@@ -0,0 +1,65 @@\n+\/*\n+ * condvar.c\n+ *\n+ * Description:\n+ * This translation unit implements condition variables and their primitives.\n+ *\/\n+\n+#include \"pthread.h\"\n+\n+int\n+pthread_cond_init(pthread_condattr_t *attr)\n+{\n+ if (attr == NULL)\n+ {\n+ \/* This is disallowed. *\/\n+ return EINVAL;\n+ }\n+\n+ attr->ptr = malloc(sizeof(_pthread_condattr_t));\n+ if (attr->ptr == NULL)\n+ {\n+ return ENOMEM;\n+ }\n+\n+ \/* FIXME: fill out the structure with default values. *\/\n+ return 0;\n+}\n+\n+int\n+pthread_condattr_destroy(pthread_condattr_t *attr)\n+{\n+ if (is_attr(attr) != 0)\n+ {\n+ return EINVAL;\n+ }\n+ \n+ free(attr->ptr);\n+ return 0;\n+}\n+\n+int\n+pthread_condattr_setpshared(pthread_condattr_t *attr,\n+\t\t\t int pshared)\n+{\n+ if (is_attr(attr) != 0)\n+ {\n+ return EINVAL;\n+ }\n+\n+ (_pthread_condattr_t *) (attr->ptr)->pshared = pshared;\n+ return 0;\n+}\n+\n+int\n+pthread_condattr_getpshared(pthread_condattr_t *attr,\n+\t\t\t int *pshared)\n+{\n+ if (is_attr(attr) != 0)\n+ {\n+ return EINVAL;\n+ }\n+\n+ *pshared = (_pthread_condattr_t *) (attr->ptr)->pshared;\n+ return 0;\n+}\n"} {"commit":"a73e9c9e0e59349f35d77e480e6d2d2bd6bece6f","subject":"Add explicit keywords.","message":"Add explicit keywords.\n\n\ngit-svn-id: a4a6f32337ebd29ad4763b423022f00f68d1c7b7@53179 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"lodyagin\/bare_cxx,lodyagin\/bare_cxx,lodyagin\/bare_cxx,lodyagin\/bare_cxx,lodyagin\/bare_cxx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- TableGen\/Record.h\n+++ TableGen\/Record.h\n@@ -151,7 +151,7 @@\n class BitsRecTy : public RecTy {\n unsigned Size;\n public:\n- BitsRecTy(unsigned Sz) : Size(Sz) {}\n+ explicit BitsRecTy(unsigned Sz) : Size(Sz) {}\n \n unsigned getNumBits() const { return Size; }\n \n@@ -268,7 +268,7 @@\n class ListRecTy : public RecTy {\n RecTy *Ty;\n public:\n- ListRecTy(RecTy *T) : Ty(T) {}\n+ explicit ListRecTy(RecTy *T) : Ty(T) {}\n \n RecTy *getElementType() const { return Ty; }\n \n@@ -381,7 +381,7 @@\n class RecordRecTy : public RecTy {\n Record *Rec;\n public:\n- RecordRecTy(Record *R) : Rec(R) {}\n+ explicit RecordRecTy(Record *R) : Rec(R) {}\n \n Record *getRecord() const { return Rec; }\n \n@@ -966,7 +966,7 @@\n std::vector<Record*> SuperClasses;\n public:\n \n- Record(const std::string &N) : Name(N) {}\n+ explicit Record(const std::string &N) : Name(N) {}\n ~Record() {}\n \n const std::string &getName() const { return Name; }\n"} {"commit":"e60001a2e0c250a209b4edb03114be42b8a7aa73","subject":"add motion click example","message":"add motion click example\n","repos":"francois-berder\/LetMeCreate,francois-berder\/LetMeCreate","returncode":1,"stderr":"error: pathspec 'examples\/motion\/main.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- examples\/motion\/main.c\n+++ examples\/motion\/main.c\n@@ -0,0 +1,32 @@\n+#include <stdbool.h>\n+#include \"core\/led.h\"\n+#include \"click\/motion.h\"\n+#include \"core\/common.h\"\n+\n+void flash(uint8_t null)\n+{\n+\tint x = 0;\n+\tfor(x=0; x<10; x++)\n+\t{\n+\t\tled_switch_on(ALL_LEDS);\n+\t\tusleep(100000);\n+\t\tled_switch_off(ALL_LEDS);\n+\t\tusleep(100000);\n+\t}\n+}\n+\n+int main(void)\n+{\n+\tmotion_click_enable(MIKROBUS_1);\n+\tled_init();\n+\twhile(1)\n+\t{\n+\t\tstatic bool b = true;\n+\t\tif(b)\n+\t\t{\n+\t\t\tmotion_click_attach_callback(MIKROBUS_1, flash);\n+\t\t\tb = false; \n+\t\t} \n+\t}\n+}\n+\n"} {"commit":"06359e39cdf298b75c54f214d9fd42379484d5a6","subject":"examples: add return in spi_max7219.c","message":"examples: add return in spi_max7219.c\n\nSome compilers are raising an error if no value is returned in main.\nAdd a return 0 in spi_max7219.c main to quiet them.\n\nSigned-off-by: C\u00e9dric Bosdonnat <5de0be53dc3aabb89d8379dd21cea40e0795c9b1@suse.com>\nSigned-off-by: Brendan Le Foll <3e0e8c4069934e8b47d99704927a85c66c0ceb33@intel.com>\n","repos":"whbruce\/mraa,sergev\/mraa,stefan-andritoiu\/mraa,arfoll\/mraa,ncrastanaren\/mraa,jontrulson\/mraa,arunlee77\/mraa,stefan-andritoiu\/mraa,intel-iot-devkit\/mraa,g-vidal\/mraa,alext-mkrs\/mraa,intel-iot-devkit\/mraa,malikabhi05\/mraa,malikabhi05\/mraa,yongli3\/mraa,arfoll\/mraa,whbruce\/mraa,ncrastanaren\/mraa,ncrastanaren\/mraa,arfoll\/mraa,whbruce\/mraa,Jon-ICS\/mraa,spitfire88\/mraa,arunlee77\/mraa,alext-mkrs\/mraa,ncrastanaren\/mraa,spitfire88\/mraa,spitfire88\/mraa,g-vidal\/mraa,malikabhi05\/mraa,stefan-andritoiu\/mraa-gpio-chardev,g-vidal\/mraa,spitfire88\/mraa,Propanu\/mraa,stefan-andritoiu\/mraa,malikabhi05\/mraa,ncrastanaren\/mraa,KurtE\/mraa,intel-iot-devkit\/mraa,stefan-andritoiu\/mraa-gpio-chardev,arfoll\/mraa,stefan-andritoiu\/mraa,sergev\/mraa,jontrulson\/mraa,yongli3\/mraa,g-vidal\/mraa,stefan-andritoiu\/mraa-gpio-chardev,KurtE\/mraa,Propanu\/mraa,alext-mkrs\/mraa,KurtE\/mraa,arfoll\/mraa,arunlee77\/mraa,KurtE\/mraa,yongli3\/mraa,Propanu\/mraa,Propanu\/mraa,stefan-andritoiu\/mraa-gpio-chardev,stefan-andritoiu\/mraa-gpio-chardev,stefan-andritoiu\/mraa,sergev\/mraa,jontrulson\/mraa,Jon-ICS\/mraa,alext-mkrs\/mraa,Propanu\/mraa,jontrulson\/mraa,intel-iot-devkit\/mraa,KurtE\/mraa,sergev\/mraa,yongli3\/mraa,jontrulson\/mraa,yongli3\/mraa,intel-iot-devkit\/mraa,arunlee77\/mraa,whbruce\/mraa,sergev\/mraa,malikabhi05\/mraa,Jon-ICS\/mraa,g-vidal\/mraa,alext-mkrs\/mraa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/spi_max7219.c\n+++ examples\/spi_max7219.c\n@@ -85,4 +85,5 @@\n mraa_spi_stop(spi);\n \n \/\/! [Interesting]\n+ return 0;\n }\n"} {"commit":"8de27b2fe3c37d852c159d3107aabd9fd4386c59","subject":"* subversion\/libsvn_fs_fs\/revprops.c (serialize_revprops_header): Use svn_stream_puts() instead of svn_stream_printf().","message":"* subversion\/libsvn_fs_fs\/revprops.c\n (serialize_revprops_header): Use svn_stream_puts() instead of\n svn_stream_printf().\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1756264 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/revprops.c\n+++ subversion\/libsvn_fs_fs\/revprops.c\n@@ -836,7 +836,7 @@\n }\n \n \/* the double newline char indicates the end of the header *\/\n- SVN_ERR(svn_stream_printf(stream, iterpool, \"\\n\"));\n+ SVN_ERR(svn_stream_puts(stream, \"\\n\"));\n \n svn_pool_destroy(iterpool);\n return SVN_NO_ERROR;\n"} {"commit":"19d6804f8fb32979075a2903a7e1194f2f5d6aae","subject":"* subversion\/libsvn_ra_dav\/session.c (server_ssl_callback): Improve doc string.","message":"* subversion\/libsvn_ra_dav\/session.c\n (server_ssl_callback): Improve doc string.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@858115 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_ra_dav\/session.c\n+++ subversion\/libsvn_ra_dav\/session.c\n@@ -162,7 +162,8 @@\n }\n \n \/* A neon-session callback to validate the SSL certificate when the CA\n- is unknown or there are other SSL certificate problems. *\/\n+ is unknown (e.g. a self-signed cert), or there are other SSL\n+ certificate problems. *\/\n static int\n server_ssl_callback(void *userdata,\n int failures,\n"} {"commit":"a8479911fe93abf5ce3e0cdbba0db507cdfb72a2","subject":"Fix the pre-existing file check for ra_serf when flying HTTP-v2-ishly.","message":"Fix the pre-existing file check for ra_serf when flying HTTP-v2-ishly.\n\n* subversion\/libsvn_ra_serf\/commit.c\n (add_file): Use HTTP v1 check semantics, which are still correct\n after all.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_ra_serf\/commit.c\n+++ subversion\/libsvn_ra_serf\/commit.c\n@@ -1620,7 +1620,6 @@\n dir_context_t *dir = parent_baton;\n file_context_t *new_file;\n const char *deleted_parent = path;\n- const char *head_target_url = NULL;\n \n new_file = apr_pcalloc(file_pool, sizeof(*new_file));\n new_file->pool = file_pool;\n@@ -1644,13 +1643,7 @@\n {\n new_file->url = svn_path_url_add_component2(dir->commit->txn_root_url,\n path, new_file->pool);\n- head_target_url = new_file->url;\n- }\n- \/* Otherwise, we'll look at the public HEAD URL, but only if we\n- haven't deleted it in this commit already - directly, or\n- indirectly through its parent directories - or if the parent\n- directory was also added (without history) in this commit.\n- *\/\n+ }\n else\n {\n \/* Ensure our parent directory has been checked out *\/\n@@ -1660,28 +1653,20 @@\n svn_path_url_add_component2(dir->checkout->resource_url,\n svn_uri_basename(path, new_file->pool),\n new_file->pool);\n-\n- while (deleted_parent && deleted_parent[0] != '\\0')\n- {\n- if (apr_hash_get(dir->commit->deleted_entries,\n- deleted_parent, APR_HASH_KEY_STRING))\n- {\n- break;\n- }\n- deleted_parent = svn_uri_dirname(deleted_parent, file_pool);\n- };\n-\n- if (! ((dir->added && !dir->copy_path) ||\n- (deleted_parent && deleted_parent[0] != '\\0')))\n- {\n- head_target_url =\n- svn_path_url_add_component2(dir->commit->session->repos_url.path,\n- path, new_file->pool);\n- }\n- }\n-\n- \/* If we calculated a URL to run a HEAD existence check against, do so. *\/\n- if (head_target_url)\n+ }\n+\n+ while (deleted_parent && deleted_parent[0] != '\\0')\n+ {\n+ if (apr_hash_get(dir->commit->deleted_entries,\n+ deleted_parent, APR_HASH_KEY_STRING))\n+ {\n+ break;\n+ }\n+ deleted_parent = svn_uri_dirname(deleted_parent, file_pool);\n+ }\n+\n+ if (! ((dir->added && !dir->copy_path) ||\n+ (deleted_parent && deleted_parent[0] != '\\0')))\n {\n svn_ra_serf__simple_request_context_t *head_ctx;\n svn_ra_serf__handler_t *handler;\n@@ -1692,7 +1677,9 @@\n handler->session = new_file->commit->session;\n handler->conn = new_file->commit->conn;\n handler->method = \"HEAD\";\n- handler->path = head_target_url;\n+ handler->path = svn_path_url_add_component2(\n+ dir->commit->session->repos_url.path,\n+ path, new_file->pool);\n handler->response_handler = svn_ra_serf__handle_status_only;\n handler->response_baton = head_ctx;\n svn_ra_serf__request_create(handler);\n"} {"commit":"8dbff6bc0f29b0ac2776dceaf5d252b9956ed1c4","subject":"ra_serf: fix merge_tests 47. If multiple update-report's are sent in one session, ra_serf will keep creating extra connections but store them in the same location in memory, overwriting the previously created connections. This will create exceptions when cleaning up the connection list.","message":"ra_serf: fix merge_tests 47. If multiple update-report's are sent in one\nsession, ra_serf will keep creating extra connections but store them in the\nsame location in memory, overwriting the previously created connections. \nThis will create exceptions when cleaning up the connection list.\n\n* subversion\/libsvn_ra_serf\/update.c\n (finish_report): Create up till 3 extra connections, reuse them for later \n requests.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@866287 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_ra_serf\/update.c\n+++ subversion\/libsvn_ra_serf\/update.c\n@@ -2179,7 +2179,8 @@\n \n svn_ra_serf__request_create(handler);\n \n- for (i = 1; i < 4; i++) {\n+ for (i = sess->num_conns; i < 4; i++)\n+ {\n sess->conns[i] = apr_palloc(sess->pool, sizeof(*sess->conns[i]));\n sess->conns[i]->bkt_alloc = serf_bucket_allocator_create(sess->pool,\n NULL, NULL);\n@@ -2200,7 +2201,7 @@\n sess->conns[i],\n sess->pool);\n sess->num_conns++;\n- }\n+ }\n \n sess->cur_conn = 1;\n closed_root = FALSE;\n"} {"commit":"419a63da2892153dadb0e3f5dab523894586c08b","subject":"* subversion\/libsvn_ra_serf\/update.c: Restore linebreak lost in r1407545.","message":"* subversion\/libsvn_ra_serf\/update.c: Restore linebreak lost in r1407545.\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1408243 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_ra_serf\/update.c\n+++ subversion\/libsvn_ra_serf\/update.c\n@@ -408,6 +408,8 @@\n return conn;\n }\n \n+\f+\n \/** Report state management helper **\/\n \n static report_info_t *\n"} {"commit":"ddd9c037d8405d70dbee9356476e3c031187b64b","subject":"* subversion\/libsvn_repos\/reporter.c (read_path_info): Fix typo in a comment.","message":"* subversion\/libsvn_repos\/reporter.c\n (read_path_info): Fix typo in a comment.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@868041 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_repos\/reporter.c\n+++ subversion\/libsvn_repos\/reporter.c\n@@ -205,7 +205,7 @@\n SVN_ERR(svn_io_file_getc(&c, temp, pool));\n if (c == '+')\n {\n- \/* Could just read directly into &(*pi)->rev, but that would be\n+ \/* Could just read directly into &(*pi)->depth, but that would be\n bad form and perhaps also vulnerable to weird type promotion\n failures. *\/\n apr_uint64_t num;\n"} {"commit":"5ea872915a1a83fcaaa5a1f907575b335853ffc5","subject":"Follow-up to r1554807: Fix unbounded memory usage.","message":"Follow-up to r1554807: Fix unbounded memory usage.\n\n* subversion\/libsvn_repos\/rev_hunt.c\n (svn_repos_deleted_rev): Reduce scope of COPY_ROOT and COPY_PATH local\n variables to make code more clear about their lifetime. Use SUBPOOL\n for temporary allocations in the loop: it restores pre r1554807 \n memory usage characteristics.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1664084 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_repos\/rev_hunt.c\n+++ subversion\/libsvn_repos\/rev_hunt.c\n@@ -312,8 +312,7 @@\n apr_pool_t *pool)\n {\n apr_pool_t *subpool;\n- svn_fs_root_t *start_root, *root, *copy_root;\n- const char *copy_path;\n+ svn_fs_root_t *start_root, *root;\n svn_revnum_t mid_rev;\n svn_node_kind_t kind;\n svn_fs_node_relation_t node_relation;\n@@ -380,6 +379,8 @@\n root, path, pool));\n if (node_relation != svn_fs_node_unrelated)\n {\n+ svn_fs_root_t *copy_root;\n+ const char *copy_path;\n SVN_ERR(svn_fs_closest_copy(©_root, ©_path, root,\n path, pool));\n if (!copy_root ||\n@@ -441,7 +442,7 @@\n \n \/* Get revision root and node id for mid_rev at that revision. *\/\n SVN_ERR(svn_fs_revision_root(&root, fs, mid_rev, subpool));\n- SVN_ERR(svn_fs_check_path(&kind, root, path, pool));\n+ SVN_ERR(svn_fs_check_path(&kind, root, path, subpool));\n if (kind == svn_node_none)\n {\n \/* Case D: Look lower in the range. *\/\n@@ -450,13 +451,15 @@\n }\n else\n {\n+ svn_fs_root_t *copy_root;\n+ const char *copy_path;\n \/* Determine the relationship between the start node\n and the current node. *\/\n SVN_ERR(svn_fs_node_relation(&node_relation, start_root, path,\n- root, path, pool));\n+ root, path, subpool));\n if (node_relation != svn_fs_node_unrelated)\n- SVN_ERR(svn_fs_closest_copy(©_root, ©_path, root,\n- path, subpool));\n+ SVN_ERR(svn_fs_closest_copy(©_root, ©_path, root,\n+ path, subpool));\n if (node_relation == svn_fs_node_unrelated ||\n (copy_root &&\n (svn_fs_revision_root_revision(copy_root) > start)))\n"} {"commit":"9868fde5750fd5a372bbf9d3bb26c43fb6d1e0f9","subject":"Fix off-by-one error noticed by mbk.","message":"Fix off-by-one error noticed by mbk.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@843453 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_repos\/rev_hunt.c\n+++ subversion\/libsvn_repos\/rev_hunt.c\n@@ -120,7 +120,7 @@\n SVN_ERR (get_time (&next_time, fs, rev_mid + 1, pool));\n if (next_time > tm)\n {\n- *revision = rev_mid + 1;\n+ *revision = rev_mid;\n break;\n }\n \n"} {"commit":"39eaeb51644cac31231b26472fd1656ab162a876","subject":"* subversion\/libsvn_subr\/gpg_agent.c: Add a comment that explains how this auth cache provider operates, including security considerations.","message":"* subversion\/libsvn_subr\/gpg_agent.c: Add a comment that explains how this\n auth cache provider operates, including security considerations.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/gpg_agent.c\n+++ subversion\/libsvn_subr\/gpg_agent.c\n@@ -23,6 +23,36 @@\n \n \/* ==================================================================== *\/\n \n+\/* This auth provider stores a plaintext password in memory managed by\n+ * a running gpg-agent. In contrast to other password store providers\n+ * it does not save the password to disk.\n+ *\n+ * Prompting is performed by the gpg-agent using a \"pinentry\" program\n+ * which needs to be installed separately. There are several pinentry\n+ * implementations with different front-ends (e.g. qt, gtk, ncurses).\n+ *\n+ * The gpg-agent will let the password time out after a while,\n+ * or immediately when it receives the SIGHUP signal.\n+ * When the password has timed out it will automatically prompt the\n+ * user for the password again. This is transparent to Subversion.\n+ *\n+ * SECURITY CONSIDERATIONS:\n+ *\n+ * Communication to the agent happens over a UNIX socket, which is located\n+ * in a directory which only the user running Subversion can access.\n+ * However, any program the user runs could access this socket and get\n+ * the Subversion password if the program knows the \"cache ID\" Subversion\n+ * uses for the password.\n+ * The cache ID is very easy to obtain for programs running as the same user.\n+ * Subversion uses the MD5 of the realmstring as cache ID, and these checksums\n+ * are also used as filenames within ~\/.subversion\/auth\/svn.simple.\n+ * Unlike GNOME Keyring or KDE Wallet, the user is not prompted for\n+ * permission if another program attempts to access the password.\n+ *\n+ * Therefore, while the gpg-agent is running and has the password cached,\n+ * this provider is no more secure than a file storing the password in\n+ * plaintext.\n+ *\/\n \n \f \n"} {"commit":"1f35dd9d34480510135c6a58e3fed4d4681dd146","subject":"Remove a use of svn_wc__text_base_path() in favor of a stream of the file's pristine contents.","message":"Remove a use of svn_wc__text_base_path() in favor of a stream of the\nfile's pristine contents.\n\nA good chunk of svn_wc_translated_file2() was unraveled into place since\nthat function takes pathnames rather than streams.\n\n* subversion\/libsvn_wc\/adm_crawler.c:\n (restore_file): rejigger to use a pristine stream rather than a path.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/adm_crawler.c\n+++ subversion\/libsvn_wc\/adm_crawler.c\n@@ -59,23 +59,62 @@\n svn_boolean_t use_commit_times,\n apr_pool_t *pool)\n {\n- const char *tmp_file, *text_base_path;\n+ svn_stream_t *src_stream;\n+ svn_boolean_t special;\n svn_wc_entry_t newentry;\n- const char *bname;\n- svn_boolean_t special;\n-\n- text_base_path = svn_wc__text_base_path(file_path, FALSE, pool);\n- bname = svn_path_basename(file_path, pool);\n-\n- \/* Copy \/ translate into a temporary file, which afterwards can\n- be atomically moved over the original working copy file. *\/\n-\n- SVN_ERR(svn_wc_translated_file2(&tmp_file,\n- text_base_path, file_path, adm_access,\n- SVN_WC_TRANSLATE_FROM_NF\n- | SVN_WC_TRANSLATE_FORCE_COPY, pool));\n-\n- SVN_ERR(svn_io_file_rename(tmp_file, file_path, pool));\n+\n+ SVN_ERR(svn_wc_get_pristine_contents(&src_stream, file_path, pool, pool));\n+\n+ SVN_ERR(svn_wc__get_special(&special, file_path, adm_access, pool));\n+ if (special)\n+ {\n+ svn_stream_t *dst_stream;\n+\n+ \/* Copy the source into the destination to create the special file.\n+ The creation wil happen atomically. *\/\n+ SVN_ERR(svn_subst_create_specialfile(&dst_stream, file_path,\n+ pool, pool));\n+ \/* ### need a cancel_func\/baton *\/\n+ SVN_ERR(svn_stream_copy3(src_stream, dst_stream, NULL, NULL, pool));\n+ }\n+ else\n+ {\n+ svn_subst_eol_style_t style;\n+ const char *eol_str;\n+ apr_hash_t *keywords;\n+ const char *tmp_dir;\n+ const char *tmp_file;\n+ svn_stream_t *tmp_stream;\n+\n+ SVN_ERR(svn_wc__get_eol_style(&style, &eol_str, file_path, adm_access,\n+ pool));\n+ SVN_ERR(svn_wc__get_keywords(&keywords, file_path, adm_access, NULL,\n+ pool));\n+\n+ \/* Get a temporary destination so we can use a rename to create the\n+ real destination atomically. *\/\n+ tmp_dir = svn_wc__adm_child(svn_wc_adm_access_path(adm_access),\n+ SVN_WC__ADM_TMP, pool);\n+ SVN_ERR(svn_stream_open_unique(&tmp_stream, &tmp_file, tmp_dir,\n+ svn_io_file_del_none, pool, pool));\n+\n+ \/* Wrap the (temp) destination stream with a translating stream. *\/\n+ if (svn_subst_translation_required(style, eol_str, keywords,\n+ FALSE \/* special *\/,\n+ TRUE \/* force_eol_check *\/))\n+ {\n+ tmp_stream = svn_subst_stream_translated(tmp_stream,\n+ eol_str,\n+ TRUE \/* repair *\/,\n+ keywords,\n+ TRUE \/* expand *\/,\n+ pool);\n+ }\n+\n+ SVN_ERR(svn_stream_copy3(src_stream, tmp_stream, NULL, NULL, pool));\n+ \/* ### need a cancel_func\/baton *\/\n+ SVN_ERR(svn_io_file_rename(tmp_file, file_path, pool));\n+ }\n \n SVN_ERR(svn_wc__maybe_set_read_only(NULL, file_path, adm_access, pool));\n \n@@ -88,11 +127,6 @@\n svn_wc_conflict_choose_merged,\n NULL, NULL, NULL, NULL, pool));\n \n- if (use_commit_times)\n- {\n- SVN_ERR(svn_wc__get_special(&special, file_path, adm_access, pool));\n- }\n-\n \/* Possibly set timestamp to last-commit-time. *\/\n if (use_commit_times && (! special))\n {\n@@ -113,7 +147,7 @@\n }\n \n \/* Modify our entry's text-timestamp to match the working file. *\/\n- return svn_wc__entry_modify(adm_access, bname,\n+ return svn_wc__entry_modify(adm_access, svn_path_basename(file_path, pool),\n &newentry, SVN_WC__ENTRY_MODIFY_TEXT_TIME,\n TRUE \/* do_sync now *\/, pool);\n }\n"} {"commit":"531c252aeaa160a08794b851e30d13ff8b1704b9","subject":"Start producing copyfrom information for local additions in the repos-wc diff editor","message":"Start producing copyfrom information for local additions in the repos-wc diff\neditor\n\n* subversion\/libsvn_wc\/diff_editor.c\n (make_edit_baton): Suppress the copy_as_changed filter on git format.\n (file_diff): Produce proper adds for local additions, including all\n copyfrom information.\n\n (wrap_file_added): Forward copyfrom information.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1444547 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/diff_editor.c\n+++ subversion\/libsvn_wc\/diff_editor.c\n@@ -408,7 +408,7 @@\n if (reverse_order)\n processor = svn_diff__tree_processor_reverse_create(processor, NULL, pool);\n \n- if (! show_copies_as_adds)\n+ if (! show_copies_as_adds && !use_git_diff_format)\n processor = svn_diff__tree_processor_copy_as_changed_create(processor,\n pool);\n \n@@ -691,24 +691,22 @@\n * diff, and the file was copied, we need to report the file as added and\n * diff it against the text base, so that a \"copied\" git diff header, and\n * possibly a diff against the copy source, will be generated for it. *\/\n- if ((! replaced && status == svn_wc__db_status_added\n- && !original_repos_relpath)\n- || (replaced && ! eb->ignore_ancestry)\n- || (original_repos_relpath\n- && (eb->show_copies_as_adds || eb->use_git_diff_format)))\n+ if (status == svn_wc__db_status_added\n+ && !(eb->ignore_ancestry && replaced))\n {\n void *file_baton = NULL;\n svn_boolean_t skip = FALSE;\n const char *translated = NULL;\n svn_diff_source_t *copyfrom_src = NULL;\n- svn_diff_source_t *right_src = svn_diff__source_create(revision,\n- scratch_pool);\n-\n- \/* ### Needs reason *\/\n- if (! eb->show_copies_as_adds && eb->use_git_diff_format\n- && status != svn_wc__db_status_added)\n+ svn_diff_source_t *right_src = svn_diff__source_create(\n+ SVN_INVALID_REVNUM,\n+ scratch_pool);\n+\n+ if (original_repos_relpath)\n {\n- copyfrom_src = svn_diff__source_create(0, scratch_pool);\n+ copyfrom_src = svn_diff__source_create(original_revision,\n+ scratch_pool);\n+ copyfrom_src->repos_relpath = original_repos_relpath;\n }\n \n SVN_ERR(eb->processor->file_opened(&file_baton, &skip,\n@@ -2463,7 +2461,12 @@\n ? svn_prop_get_value(right_props,\n SVN_PROP_MIME_TYPE)\n : NULL,\n- NULL, SVN_INVALID_REVNUM,\n+ copyfrom_source\n+ ? copyfrom_source->repos_relpath\n+ : NULL,\n+ copyfrom_source\n+ ? copyfrom_source->revision\n+ : SVN_INVALID_REVNUM,\n prop_changes, copyfrom_props,\n wb->callback_baton,\n scratch_pool));\n"} {"commit":"27ffbfe26116459f40c9b2132affbadc053d3aae","subject":"apps\/btshell: fix typo","message":"apps\/btshell: fix typo\n","repos":"mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/btshell\/src\/cmd.c\n+++ apps\/btshell\/src\/cmd.c\n@@ -711,7 +711,7 @@\n if (argc > 1 && strcmp(argv[1], \"cancel\") == 0) {\n rc = btshell_scan_cancel();\n if (rc != 0) {\n- console_printf(\"connection cancel fail: %d\\n\", rc);\n+ console_printf(\"scan cancel fail: %d\\n\", rc);\n return rc;\n }\n return 0;\n"} {"commit":"972e458edfdf3824933ffb87747fa854e9db0a9b","subject":"Avoid compiler warning.","message":"Avoid compiler warning.\n","repos":"bluerover\/6lbr,arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- apps\/shell\/shell-gui.c\n+++ apps\/shell\/shell-gui.c\n@@ -28,7 +28,7 @@\n *\n * This file is part of the Contiki desktop OS.\n *\n- * $Id: shell-gui.c,v 1.1 2006\/06\/17 22:41:12 adamdunkels Exp $\n+ * $Id: shell-gui.c,v 1.2 2006\/08\/21 21:44:13 oliverschmidt Exp $\n *\n *\/\n \n@@ -87,7 +87,7 @@\n memset(&log[(SHELL_GUI_YSIZE - 1) * SHELL_GUI_XSIZE],\n \t 0, SHELL_GUI_XSIZE);\n \n- len = strlen(str1);\n+ len = (unsigned char)strlen(str1);\n \n strncpy(&log[(SHELL_GUI_YSIZE - 1) * SHELL_GUI_XSIZE],\n \t str1, SHELL_GUI_XSIZE);\n"} {"commit":"9a55b262a70d2b716b795e1112abf8014b31e63c","subject":"A struct_decl_idx of zero is valid - fixes abort in test1.","message":"A struct_decl_idx of zero is valid - fixes abort in test1.\n","repos":"libav\/c99-to-c89,mstorsjo\/c99-to-c89,mstorsjo\/c99-to-c89,libav\/c99-to-c89,rbultje\/c99-to-c89,rbultje\/c99-to-c89","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- convert.c\n+++ convert.c\n@@ -688,7 +688,7 @@\n \/\/ a struct typedef declared in advance, whereas the struct itself\n \/\/ was declared separately. In that case, we should find the struct\n \/\/ declaration delayed, e.g. here\/now.\n- if (td_decl && td_decl->struct_decl_idx)\n+ if (td_decl && td_decl->struct_decl_idx != (unsigned) -1)\n return td_decl->struct_decl_idx;\n }\n \n"} {"commit":"74bb84e3df2fe3f4589a3d912113a2f89214809d","subject":"Fix Windows drpreinject build error in dr_sscanf","message":"Fix Windows drpreinject build error in dr_sscanf\n\nI ran the suite on my Windows workstation with this change, but forgot to push\nit to my Linux machine where I executed the commit.\n\nReview URL: https:\/\/codereview.appspot.com\/6816102\n\nSVN-Revision: 1694\n","repos":"code4bones\/dynamorio,sigma-random\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,bl4ckic3\/dynamorio,daksunt\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,bl4ckic3\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/io.c\n+++ core\/io.c\n@@ -47,6 +47,14 @@\n #ifdef LINUX\n # include <wchar.h>\n #endif\n+\n+#ifdef NOT_DYNAMORIO_CORE_PROPER\n+\/* drpreinject doesn't link utils.c. We fail gracefully without the assertion,\n+ * so just define it away.\n+ *\/\n+# undef CLIENT_ASSERT\n+# define CLIENT_ASSERT(cond, msg)\n+#endif \/* NOT_DYNAMORIO_CORE_PROPER *\/\n \n #define VA_ARG_CHAR2INT\n #define BUF_SIZE 64\n"} {"commit":"568b0afef07ab19313f250832632034f8b858032","subject":"Bug fix for non-contiguous CPU's","message":"Bug fix for non-contiguous CPU's\n","repos":"aclements\/cpubars","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpubars.c\n+++ cpubars.c\n@@ -514,7 +514,7 @@\n for (i = 0; i <= cpus->max; ++i) {\n if (cpus->cpus[i].online) {\n printf(\" %*d\", length, i);\n- ui_bars[bar].start = 4 + i*(length+1);\n+ ui_bars[bar].start = 4 + (bar-1)*(length+1);\n ui_bars[bar].width = length;\n ui_bars[bar].cpu = i;\n bar++;\n"} {"commit":"56b9e14aac5f0ffedb912819f7dce13cf73ebffc","subject":"remove #include <sys\/workq.h> cos this driver doesnt use it.","message":"remove #include <sys\/workq.h> cos this driver doesnt use it.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/ixgbe.h\n+++ dev\/pci\/ixgbe.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ixgbe.h,v 1.13 2013\/08\/05 19:58:05 mikeb Exp $\t*\/\n+\/*\t$OpenBSD: ixgbe.h,v 1.14 2013\/10\/30 03:59:26 dlg Exp $\t*\/\n \n \/******************************************************************************\n \n@@ -52,7 +52,6 @@\n #include <sys\/timeout.h>\n #include <sys\/pool.h>\n #include <sys\/rwlock.h>\n-#include <sys\/workq.h>\n \n #include <net\/if.h>\n #include <net\/if_arp.h>\n"} {"commit":"7c5c4da63a495bacf6705e3b357a6c6ce07f46e6","subject":"Bluetooth: Mesh: PB-GATT common link closed","message":"Bluetooth: Mesh: PB-GATT common link closed\n\nMakes a common link_closed function for PB-GATT, getting rid of a bug\nwhere cb_data is reset before the link closed callback. Also ensures\nthat the link close and reset order is the same in both scenarios.\n\nSigned-off-by: Trond Einar Snekvik <cbf21a7cf058d7ce8e74b0726695057d761f6ae9@nordicsemi.no>\n","repos":"Vudentz\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,nashif\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,nashif\/zephyr,finikorg\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,Vudentz\/zephyr,nashif\/zephyr,Vudentz\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/bluetooth\/mesh\/pb_gatt.c\n+++ subsys\/bluetooth\/mesh\/pb_gatt.c\n@@ -40,16 +40,21 @@\n \tlink.rx_buf = bt_mesh_proxy_get_buf();\n }\n \n-static void protocol_timeout(struct k_work *work)\n+static void link_closed(enum prov_bearer_link_status status)\n {\n \tconst struct prov_bearer_cb *cb = link.cb;\n-\n-\tBT_DBG(\"Protocol timeout\");\n+\tvoid *cb_data = link.cb_data;\n \n \treset_state();\n \n-\tcb->link_closed(&pb_gatt, link.cb_data,\n-\t\t\tPROV_BEARER_LINK_STATUS_TIMEOUT);\n+\tcb->link_closed(&pb_gatt, cb_data, status);\n+}\n+\n+static void protocol_timeout(struct k_work *work)\n+{\n+\tBT_DBG(\"Protocol timeout\");\n+\n+\tlink_closed(PROV_BEARER_LINK_STATUS_TIMEOUT);\n }\n \n int bt_mesh_pb_gatt_recv(struct bt_conn *conn, struct net_buf_simple *buf)\n@@ -98,10 +103,7 @@\n \t\treturn -ENOTCONN;\n \t}\n \n-\tlink.cb->link_closed(&pb_gatt, link.cb_data,\n-\t\t\t PROV_BEARER_LINK_STATUS_SUCCESS);\n-\n-\treset_state();\n+\tlink_closed(PROV_BEARER_LINK_STATUS_SUCCESS);\n \n \treturn 0;\n }\n"} {"commit":"19a478d3f75941b91012f72db5dc9ca1b8aaed58","subject":"* subversion\/include\/svn_client.h (svn_client_commit, svn_client_update): we no longer have support for committing to or updating from xml, so there's no reason to describe an alternate set of requirements for the revision argument in the xml case.","message":"* subversion\/include\/svn_client.h\n (svn_client_commit, svn_client_update): we no longer have support for \n committing to or updating from xml, so there's no reason to describe \n an alternate set of requirements for the revision argument in the xml \n case.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@843785 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/include\/svn_client.h\n+++ subversion\/include\/svn_client.h\n@@ -211,9 +211,8 @@\n with AUTH_BATON.\n \n REVISION must be of kind svn_client_revision_number,\n- svn_client_revision_head, or svn_client_revision_date. In the xml\n- case (see below) svn_client_revision_unspecified is also allowed.\n- If REVISION does not meet these requirements, return the error\n+ svn_client_revision_head, or svn_client_revision_date. If REVISION \n+ does not meet these requirements, return the error\n SVN_ERR_CLIENT_BAD_REVISION.\n \n If NOTIFY_FUNC is non-null, invoke NOTIFY_FUNC with NOTIFY_BATON as\n@@ -235,9 +234,8 @@\n AUTH_BATON.\n \n REVISION must be of kind svn_client_revision_number,\n- svn_client_revision_head, or svn_client_revision_date. In the xml\n- case (see below) svn_client_revision_unspecified is also allowed.\n- If REVISION does not meet these requirements, return the error\n+ svn_client_revision_head, or svn_client_revision_date. If REVISION \n+ does not meet these requirements, return the error\n SVN_ERR_CLIENT_BAD_REVISION.\n \n If NOTIFY_FUNC is non-null, invoke NOTIFY_FUNC with NOTIFY_BATON\n"} {"commit":"9b29bbb3d8747fe96611f68f57ba96d3157d4d1e","subject":"* subversion\/include\/svn_config.h (svn_config_get_bool): \"recoginzed\" -> \"recognized\".","message":"* subversion\/include\/svn_config.h\n (svn_config_get_bool): \"recoginzed\" -> \"recognized\".\n\nPatch by: Lele Gaifax <lele@nautilus.homeip.net>\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@849301 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/include\/svn_config.h\n+++ subversion\/include\/svn_config.h\n@@ -172,7 +172,7 @@\n \n \/** Like @t svn_config_get, but for boolean values.\n *\n- * Parses the option as a boolean value. The recoginzed representations\n+ * Parses the option as a boolean value. The recognized representations\n * are 'true'\/'false', 'yes'\/'no', 'on'\/'off', '1'\/'0'; case does not\n * matter. Returns an error if the option doesn't contain a known string.\n *\/\n"} {"commit":"dd8758104ce9fd7573f46991ef522a2aca168ce5","subject":"* auth.c","message":"* auth.c\n\n (open_tmp_file): Bug fix. Make use of TRUEPATH, I mean, we\n constructed it for a reason, ya know.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/auth.c\n+++ subversion\/libsvn_client\/auth.c\n@@ -68,7 +68,7 @@\n \n \/* Open a unique file; use APR_DELONCLOSE. *\/\n SVN_ERR (svn_io_open_unique_file (fp, &ignored_filename,\n- cb->path, \".tmp\", TRUE, cb->pool));\n+ truepath, \".tmp\", TRUE, cb->pool));\n \n return SVN_NO_ERROR;\n }\n"} {"commit":"ff98f0f643c1a9f03fa3e6dd01b83f88a168e63c","subject":"Followup to r22955, hopefully fixing the build on Visual Studio.","message":"Followup to r22955, hopefully fixing the build on Visual Studio.\n\n* subversion\/libsvn_client\/copy.c\n (setup_copy): Move variable declarations back to the top of the block.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/copy.c\n+++ subversion\/libsvn_client\/copy.c\n@@ -1369,12 +1369,13 @@\n svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,\n svn_client__copy_pair_t *);\n \n- svn_pool_clear(iterpool);\n-\n \/* We can convert the working copy path to a URL based on the\n entries file. *\/\n svn_wc_adm_access_t *adm_access; \/* ### FIXME local *\/\n const svn_wc_entry_t *entry;\n+\n+ svn_pool_clear(iterpool);\n+\n SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL,\n pair->src, FALSE, 0,\n ctx->cancel_func,\n"} {"commit":"d49610a483a889275a34fa8d9e5a0e89185a4087","subject":"Track API changes recently merged into this branch.","message":"Track API changes recently merged into this branch.\n\n* subversion\/libsvn_client\/copy.c\n (calculate_target_mergeinfo): Use svn_ra_get_path_relative_to_root()\n instead of svn_client__path_relative_to_session().\n\n\ngit-svn-id: 8295248c8b6a81297c4f7d1e9d105410ff0f446c@880468 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/copy.c\n+++ subversion\/libsvn_client\/copy.c\n@@ -127,9 +127,8 @@\n const char *mergeinfo_path;\n \n \/* Fetch any existing (explicit) mergeinfo. *\/\n- SVN_ERR(svn_client__path_relative_to_session(&mergeinfo_path,\n- ra_session, src_url,\n- pool));\n+ SVN_ERR(svn_ra_get_path_relative_to_session(ra_session, &mergeinfo_path,\n+ src_url, pool));\n SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, &src_mergeinfo,\n mergeinfo_path, src_revnum,\n svn_mergeinfo_inherited,\n"} {"commit":"a5f67730eaddafdc460c408b0a8c41e7b1e2e987","subject":"* subversion\/libsvn_client\/diff.c (display_prop_diffs): Remove a wrongly placed call to adjust_paths_for_diff_labels(), it was committed by accident in r990172.","message":"* subversion\/libsvn_client\/diff.c\n (display_prop_diffs): Remove a wrongly placed call to\n adjust_paths_for_diff_labels(), it was committed by accident in r990172.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@990193 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/diff.c\n+++ subversion\/libsvn_client\/diff.c\n@@ -486,10 +486,6 @@\n \/* If we're creating a diff on the wc root, path would be empty. *\/\n if (path[0] == '\\0')\n path = apr_psprintf(pool, \".\");\n-\n- if (show_diff_header)\n- SVN_ERR(adjust_paths_for_diff_labels(&path, &path1, &path2,\n- relative_to_dir, pool));\n \n if (use_git_diff_format)\n {\n"} {"commit":"1131ae1ee5209709d96e37e4d3e355f7949d5abe","subject":"Avoid a potential crash by using an uninitialized variable.","message":"Avoid a potential crash by using an uninitialized variable.\n\n* subversion\/libsvn_client\/util.c\n (svn_client__path_relative_to_root): When getting the repos_relpath, do so\n in the temp variable, to ensure it is defined later.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/util.c\n+++ subversion\/libsvn_client\/util.c\n@@ -158,7 +158,7 @@\n SVN_ERR_ASSERT(ra_session != NULL);\n \n \/* Ask the RA layer to create a relative path for us *\/\n- err = svn_ra_get_path_relative_to_root(ra_session, rel_path,\n+ err = svn_ra_get_path_relative_to_root(ra_session, &repos_relpath,\n abspath_or_url, scratch_pool);\n \n if (err)\n"} {"commit":"c89f7dd816cf05d0e5210879684773fec3de3cd1","subject":"* subversion\/libsvn_fs_fs\/fs_fs.c (fetch_all_changes): eliminate cast","message":"* subversion\/libsvn_fs_fs\/fs_fs.c\n (fetch_all_changes): eliminate cast\n\nSuggested by: gstein\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1340956 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/fs_fs.c\n+++ subversion\/libsvn_fs_fs\/fs_fs.c\n@@ -4866,9 +4866,9 @@\n hi = apr_hash_next(hi))\n {\n \/* KEY is the path. *\/\n- const char *path;\n+ const void *path;\n apr_ssize_t klen;\n- apr_hash_this(hi, (const void **)&path, &klen, NULL);\n+ apr_hash_this(hi, &path, &klen, NULL);\n \n \/* If we come across a child of our path, remove it.\n Call svn_dirent_is_child only if there is a chance that\n"} {"commit":"f94ebf78382ab65cc3f811f889f0a54d0fa785d0","subject":"Revert r1088382 after Bert pointed out on IRC that this may cause incomplete data to be cached if some error causes the reader to abandon (and later auto-close) the stream.","message":"Revert r1088382 after Bert pointed out on IRC that this may\ncause incomplete data to be cached if some error causes the\nreader to abandon (and later auto-close) the stream.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/fs_fs.c\n+++ subversion\/libsvn_fs_fs\/fs_fs.c\n@@ -2224,7 +2224,6 @@\n return SVN_NO_ERROR;\n }\n \n-\n \/* Get the node-revision for the node ID in FS.\n Set *NODEREV_P to the new node-revision structure, allocated in POOL.\n See svn_fs_fs__get_node_revision, which wraps this and adds another\n@@ -3526,43 +3525,12 @@\n && svn_cache__is_cachable(ffd->fulltext_cache, (apr_size_t)size);\n }\n \n-\/* Store fulltext in RB in the fulltext cache used by said RB. Items that\n- * are too large to be cached won't. Also, this will be a no-op if no\n- * fulltext cache has been enabled in RB.\n- *\/\n-static svn_error_t *\n-cache_rep(struct rep_read_baton *rb)\n-{\n- fs_fs_data_t *ffd = rb->fs->fsap_data;\n- if (rb->current_fulltext &&\n- fulltext_size_is_cachable(ffd, rb->current_fulltext->len))\n- {\n- SVN_ERR(svn_cache__set(ffd->fulltext_cache, rb->fulltext_cache_key,\n- rb->current_fulltext, rb->pool));\n- }\n-\n- \/* prevent duplicate caching (this is only to aid performance) *\/\n- rb->current_fulltext = NULL;\n-\n- return SVN_NO_ERROR;\n-}\n-\n \/* Close method used on streams returned by read_representation().\n *\/\n static svn_error_t *\n rep_read_contents_close(void *baton)\n {\n struct rep_read_baton *rb = baton;\n-\n- \/* If the item size was not known in advance or is empty,\n- * we didn't attempt to add it to the fulltext cache, yet.\n- * Now, the data should be in.\n- *\n- * If the fulltext has already been cached, calling this\n- * function will be a no-op as it reset the current_fulltext\n- * member during the first call.\n- *\/\n- cache_rep(rb);\n \n svn_pool_destroy(rb->pool);\n svn_pool_destroy(rb->filehandle_pool);\n@@ -3755,11 +3723,13 @@\n }\n }\n \n- \/* If we read the whole content, cache it.\n- * Otherwise, the closing function the read stream will take care of that.\n- * Duplicate caching attemps will be handled \/ prevented by cache_rep. *\/\n- if (rb->off == rb->len && rb->len)\n- cache_rep(rb);\n+ if (rb->off == rb->len && rb->current_fulltext)\n+ {\n+ fs_fs_data_t *ffd = rb->fs->fsap_data;\n+ SVN_ERR(svn_cache__set(ffd->fulltext_cache, rb->fulltext_cache_key,\n+ rb->current_fulltext, rb->pool));\n+ rb->current_fulltext = NULL;\n+ }\n \n return SVN_NO_ERROR;\n }\n"} {"commit":"f18c5f5d2ed736caf8835219574f029a86d3c962","subject":"Don't retrieve the contents of *mutable* directories from the dir cache, because they might have been changed by another FS object. (To make this change as minimal as possible, we still do save them into the cache; we just don't retrieve them.)","message":"Don't retrieve the contents of *mutable* directories from the dir\ncache, because they might have been changed by another FS object.\n(To make this change as minimal as possible, we still do save them\ninto the cache; we just don't retrieve them.)\n\nThis fixed a user-reported error where some changes made by a\npre-commit txn don't \"stick\", because the cache of the root node\ncontents in the server process doesn't get invalidated when the hook\nmakes changes. (It's the root node because the cache only stores one\ndirectory per \"rev\", and that's the last one cached in \"rev\" -1.) One\ncan imagine other circumstances where this would be problematic as\nwell.\n\n* subversion\/libsvn_fs_fs\/fs_fs.c\n (svn_fs_fs__rep_contents_dir): Don't look in the cache for mutable\n directory contents.\n\nReported by: Dmitry Konyshev <dmitry.konyshev@gmail.com>\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/fs_fs.c\n+++ subversion\/libsvn_fs_fs\/fs_fs.c\n@@ -2500,7 +2500,8 @@\n hid = DIR_CACHE_ENTRIES_MASK(svn_fs_fs__id_rev(noderev->id));\n \n \/* If we have this directory cached, return it. *\/\n- if (ffd->dir_cache_id[hid] && svn_fs_fs__id_eq(ffd->dir_cache_id[hid],\n+ if (! svn_fs_fs__id_txn_id(noderev->id) &&\n+ ffd->dir_cache_id[hid] && svn_fs_fs__id_eq(ffd->dir_cache_id[hid],\n noderev->id))\n {\n *entries_p = ffd->dir_cache[hid];\n"} {"commit":"4195c7b489c4a7fb4ec3a9926237c829bf8ed392","subject":"* subversion\/libsvn_fs_fs\/fs_fs.c (svn_fs_fs__create): Shuffle some code around and add some extra comments when creating a new filesystem.","message":"* subversion\/libsvn_fs_fs\/fs_fs.c\n (svn_fs_fs__create): Shuffle some code around and add some extra comments\n when creating a new filesystem.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/fs_fs.c\n+++ subversion\/libsvn_fs_fs\/fs_fs.c\n@@ -5936,32 +5936,36 @@\n if (format >= SVN_FS_FS__MIN_LAYOUT_FORMAT_OPTION_FORMAT)\n ffd->max_files_per_dir = SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR;\n \n+ \/* Create the revision data directories. *\/\n if (ffd->max_files_per_dir)\n- {\n- SVN_ERR(svn_io_make_dir_recursively(path_rev_shard(fs, 0, pool),\n- pool));\n- SVN_ERR(svn_io_make_dir_recursively(path_revprops_shard(fs, 0, pool),\n- pool));\n- }\n+ SVN_ERR(svn_io_make_dir_recursively(path_rev_shard(fs, 0, pool), pool));\n else\n- {\n- SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path, PATH_REVS_DIR,\n+ SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path, PATH_REVS_DIR,\n pool),\n- pool));\n- SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path,\n- PATH_REVPROPS_DIR,\n- pool),\n- pool));\n- }\n+ pool));\n+\n+ \/* Create the revprops directory. *\/\n+ if (ffd->max_files_per_dir)\n+ SVN_ERR(svn_io_make_dir_recursively(path_revprops_shard(fs, 0, pool),\n+ pool));\n+ else\n+ SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path,\n+ PATH_REVPROPS_DIR,\n+ pool),\n+ pool));\n+\n+ \/* Create the transaction directory. *\/\n SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path, PATH_TXNS_DIR,\n pool),\n pool));\n \n+ \/* Create the protorevs directory. *\/\n if (format >= SVN_FS_FS__MIN_PROTOREVS_DIR_FORMAT)\n SVN_ERR(svn_io_make_dir_recursively(svn_path_join(path, PATH_TXN_PROTOS_DIR,\n pool),\n pool));\n \n+ \/* Create the 'current' file. *\/\n SVN_ERR(svn_io_file_create(svn_fs_fs__path_current(fs, pool),\n (format >= SVN_FS_FS__MIN_NO_GLOBAL_IDS_FORMAT\n ? \"0\\n\" : \"0 1 1\\n\"),\n"} {"commit":"30dc7944e1736fce7226aff72970d25a7521cb46","subject":"Port the BDB backend change from r926151 to the FSFS backend, also.","message":"Port the BDB backend change from r926151 to the FSFS backend, also.\n\n* subversion\/libsvn_fs_fs\/fs_fs.c\n (fold_change): Protect against another form of invalid sequence,\n where an 'add' follows other non-delete\/reset changes on the same\n node.\n\nSuggested by: glasser\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/fs_fs.c\n+++ subversion\/libsvn_fs_fs\/fs_fs.c\n@@ -3863,6 +3863,15 @@\n (SVN_ERR_FS_CORRUPT, NULL,\n _(\"Invalid change ordering: non-add change on deleted path\"));\n \n+ \/* Sanity check: an add can't follow anything except\n+ a delete or reset. *\/\n+ if ((change->kind == svn_fs_path_change_add)\n+ && (old_change->change_kind != svn_fs_path_change_delete)\n+ && (old_change->change_kind != svn_fs_path_change_reset))\n+ return svn_error_create\n+ (SVN_ERR_FS_CORRUPT, NULL,\n+ _(\"Invalid change ordering: add change on preexisting path\"));\n+\n \/* Now, merge that change in. *\/\n switch (change->kind)\n {\n"} {"commit":"133e7bf5e47736c5bf10bfe84ef2e7f220205b42","subject":"In the serf transition based xml parser: provide an explicit error if the root element isn't matched in the transition table.","message":"In the serf transition based xml parser: provide an explicit error if the root\nelement isn't matched in the transition table.\n\nWithout this most parsers just return success for every invalid element such\nas '<html>' when the file contains valid xml.\n\nThis requires a better (new) error code which I'll add as a separate commit, to\nallow backporting this.\n\n* subversion\/libsvn_ra_serf\/xml.c\n (svn_ra_serf__xml_cb_start): Expect transitions from the default state to\n succeed, by returning an error when it doesn't.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1498851 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_ra_serf\/xml.c\n+++ subversion\/libsvn_ra_serf\/xml.c\n@@ -617,6 +617,14 @@\n }\n if (scan->ns == NULL)\n {\n+ if (current->state == 0)\n+ {\n+ return svn_error_createf(\n+ SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,\n+ _(\"XML Parsing failed: Unexpected root element '%s'\"),\n+ elemname.name);\n+ }\n+\n xmlctx->waiting = elemname;\n \/* ### return? *\/\n return SVN_NO_ERROR;\n"} {"commit":"aaf1a92c1a6c39c8445c4f57dff3f41d3c8c390d","subject":"Follow-up to r27614: Fix segfault.","message":"Follow-up to r27614: Fix segfault.\n\n* subversion\/libsvn_repos\/hooks.c\n (svn_repos__hooks_start_commit): Allocate one more array element.\n\nPatch by: danielsh@fastmail.fm\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_repos\/hooks.c\n+++ subversion\/libsvn_repos\/hooks.c\n@@ -549,7 +549,7 @@\n }\n else if (hook)\n {\n- const char *args[4];\n+ const char *args[5];\n char *capabilities_string = svn_cstring_join(capabilities, \":\", pool);\n \n \/* Get rid of that annoying final colon. *\/\n"} {"commit":"fbbad88dc2e6ee019acb3a2547f91145c8892408","subject":"On the 'in-repo-authz' branch: Cleanup some whitespace.","message":"On the 'in-repo-authz' branch: Cleanup some whitespace.\n\nFollow up to r1423708.\n\n* subversion\/libsvn_repos\/repos.c\n (create_conf): Remove some extra whitespace.\n\n\ngit-svn-id: 5ae0fe07322ad0cddabbff4839617db8db3f805d@1423710 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_repos\/repos.c\n+++ subversion\/libsvn_repos\/repos.c\n@@ -1023,7 +1023,7 @@\n \"### directory containing this file. The specified path may be a\" NL\n \"### repository relative URL (^\/) or an absolute file:\/\/ URL to a text\" NL\n \"### file in a Subversion repository. If you don't specify an authz-db,\" NL\n-\"### no path-based access control is done.\" NL\n+\"### no path-based access control is done.\" NL\n \"### Uncomment the line below to use the default authorization file.\" NL\n \"# authz-db = \" SVN_REPOS__CONF_AUTHZ NL\n \"### This option specifies the authentication realm of the repository.\" NL\n"} {"commit":"ab36fc59ad480c7c975f0f0e6afc522e4ae6bba3","subject":"* subversion\/libsvn_subr\/config.c (read_all): Check return value for all calls to svn_config_read().","message":"* subversion\/libsvn_subr\/config.c (read_all):\n Check return value for all calls to svn_config_read().\n\nPatch by: David Kimdon <dwhedon@debian.org>\nReview by: me\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@843283 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/config.c\n+++ subversion\/libsvn_subr\/config.c\n@@ -135,7 +135,7 @@\n #ifdef SVN_WIN32\n if (sys_registry_path)\n {\n- svn_config_read (cfgp, sys_registry_path, FALSE, pool);\n+ SVN_ERR (svn_config_read (cfgp, sys_registry_path, FALSE, pool));\n red_config = TRUE;\n }\n #endif \/* SVN_WIN32 *\/\n@@ -162,7 +162,7 @@\n SVN_ERR (svn_config_merge (*cfgp, sys_file_path, FALSE));\n else\n {\n- svn_config_read (cfgp, sys_file_path, FALSE, pool);\n+ SVN_ERR (svn_config_read (cfgp, sys_file_path, FALSE, pool));\n red_config = TRUE;\n }\n }\n"} {"commit":"c155fcbbef4e07c2cf2b1bd88f1e3b0b1806635f","subject":"Follow-up to r1066087: * subversion\/libsvn_subr\/target.c (svn_path_condense_targets): Initialise *pcommon in case the first target was a URL.","message":"Follow-up to r1066087:\n* subversion\/libsvn_subr\/target.c\n (svn_path_condense_targets): Initialise *pcommon in case the first\n target was a URL.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1066143 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/target.c\n+++ subversion\/libsvn_subr\/target.c\n@@ -65,7 +65,10 @@\n first_target = APR_ARRAY_IDX(targets, 0, const char *);\n first_target_is_url = svn_path_is_url(first_target);\n if (first_target_is_url)\n- first_target = apr_pstrdup(pool, first_target);\n+ {\n+ first_target = apr_pstrdup(pool, first_target);\n+ *pcommon = first_target;\n+ }\n else\n SVN_ERR(svn_dirent_get_absolute(pcommon, first_target, pool));\n \n"} {"commit":"7c1b565e7d289eade6fbbf27bdbed500c0b54a7d","subject":"struct","message":"struct\n","repos":"objective-audio\/cpp_utils,objective-audio\/cpp_utils,objective-audio\/cpp_utils","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpp_utils\/yas_cf_ref.h\n+++ cpp_utils\/yas_cf_ref.h\n@@ -29,8 +29,7 @@\n };\n \n template <typename T>\n-class cf_ref : public base {\n- public:\n+struct cf_ref final : base {\n cf_ref();\n explicit cf_ref(T const);\n cf_ref(std::nullptr_t);\n"} {"commit":"da0450f463006289f793755940ae6b13bc253dd3","subject":"Fix size of platform and device responses","message":"Fix size of platform and device responses\n\nWhen a request to a platform or a device resource, added with\noc_add_device or oc_add_platform functions was done, the last byte of\nthe response was missing.\n\nThis was happening because oc_string_len function is decresing 1 from\npayload size, assuming it is a NULL terminated string, but the platform\nand device payload is used as a byte array with all bytes filled. So we\nare accessing payload size directly instead of using oc_string_len\nfunction.\n\nAnother approach to fix this issue is to allocate an extra byte to the\npayload in oc_add_device\/oc_add_platform functions, but current option\nwas prefered because payload is never used as a NULL terminated string.\n\nChange-Id: Ib85d127b9ce1272ec856e6ded64800a86b324925\nSigned-off-by: Otavio Pontes <a04f37e3ccb281cf4119e4b2fa8286ed94121d92@intel.com>\nSigned-off-by: Thiago Macieira <0ed1648d92ca0373297a182b1dba1b974ad10d88@intel.com>\nReviewed-on: https:\/\/gerrit.iotivity.org\/gerrit\/10379\n","repos":"iotivity\/iotivity-constrained,iotivity\/iotivity-constrained,iotivity\/iotivity-constrained,iotivity\/iotivity-constrained","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- api\/oc_core_res.c\n+++ api\/oc_core_res.c\n@@ -67,7 +67,7 @@\n uint8_t *buffer = request->response->response_buffer->buffer;\n uint16_t buffer_size = request->response->response_buffer->buffer_size;\n int payload_size =\n- oc_string_len(oc_device_info[request->resource->device].payload);\n+ oc_device_info[request->resource->device].payload.size;\n \n if (buffer_size < payload_size) {\n request->response->response_buffer->response_length = 0;\n@@ -155,7 +155,7 @@\n {\n uint8_t *buffer = request->response->response_buffer->buffer;\n uint16_t buffer_size = request->response->response_buffer->buffer_size;\n- int payload_size = oc_string_len(oc_platform_payload);\n+ int payload_size = oc_platform_payload.size;\n \n if (buffer_size < payload_size) {\n request->response->response_buffer->response_length = 0;\n@@ -180,7 +180,7 @@\n oc_string_t *\n oc_core_add_new_platform(const char *mfg_name)\n {\n- if (oc_string_len(oc_platform_payload) > 0)\n+ if (oc_platform_payload.size > 0)\n return NULL;\n \n \/* Populating resource obuject *\/\n"} {"commit":"bfd5312b2e79d4ad54dff18c1abb176c56556dda","subject":"Fix a typo in a comment.","message":"Fix a typo in a comment.\n\nBUG=none\nTEST=none\nReview URL: http:\/\/codereview.chromium.org\/244053\n\ngit-svn-id: http:\/\/src.chromium.org\/svn\/trunk\/src@27728 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n\nFormer-commit-id: 4912018501334f778ed34344d4443ef0ab2df7ca","repos":"meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser,meego-tablet-ux\/meego-app-browser","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chrome\/browser\/browser_process.h\n+++ chrome\/browser\/browser_process.h\n@@ -1,8 +1,8 @@\n-\/\/ Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.\n+\/\/ Copyright (c) 2009 The Chromium Authors. All rights reserved.\n \/\/ Use of this source code is governed by a BSD-style license that can be\n \/\/ found in the LICENSE file.\n \n-\/\/ This interfaces is for managing the global services of the application. Each\n+\/\/ This interface is for managing the global services of the application. Each\n \/\/ service is lazily created when requested the first time. The service getters\n \/\/ will return NULL if the service is not available, so callers must check for\n \/\/ this condition.\n"} {"commit":"cebc1bed339f053ffb1926ad19fb376fd17d591a","subject":"Updated HiddbgHdlsDeviceInfo struct.","message":"Updated HiddbgHdlsDeviceInfo struct.\n","repos":"switchbrew\/libnx","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- nx\/include\/switch\/services\/hiddbg.h\n+++ nx\/include\/switch\/services\/hiddbg.h\n@@ -10,10 +10,10 @@\n \n \/\/\/ HdlsDeviceInfo\n typedef struct {\n- u32 type; \/\/\/< Only one bit can be set. BIT(0) = Pro-Controller, BIT(1) = Joy-Con Left, BIT(2) = Joy-Con Right.\n+ u32 type; \/\/\/< Only one bit can be set. BIT(0) = Pro-Controller, BIT(1) = Joy-Con Left, BIT(2) = Joy-Con Right, BIT(21) = unknown.\n u32 singleColorBody; \/\/\/< RGBA Single Body Color\n u32 singleColorButtons; \/\/\/< RGBA Single Buttons Color\n- u8 unk_xc; \/\/\/< Unknown\n+ u8 type2; \/\/\/< Additional type field used with the above type field, if the value doesn't match one of the following a default is used. Type Pro-Controller: value 0x3 indicates that the controller is connected via USB. Type Joy-Con Left\/Right: with value 0x2 the system doesn't list the controller in hid sharedmem. Type BIT(21): value 0x3 = unknown.\n u8 pad[0x3]; \/\/\/< Padding\n } HiddbgHdlsDeviceInfo;\n \n"} {"commit":"e2ef8dbbe03fa94c084ee87769934805de820e92","subject":"Fix the GUI on some Windows 10 machines (Intel HD?). Fixes #112","message":"Fix the GUI on some Windows 10 machines (Intel HD?). Fixes #112\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SDL\/gui.c\n+++ SDL\/gui.c\n@@ -1185,6 +1185,10 @@\n }\n \n render_texture(pixels, NULL);\n+#ifdef _WIN32\n+ \/* Required for some Windows 10 machines, god knows why *\/\n+ render_texture(pixels, NULL);\n+#endif\n }\n } while (SDL_WaitEvent(&event));\n }\n"} {"commit":"09baeabb9d5ce6aa9e74e1723acbfc3b85350f25","subject":"Removed todo, after giving it a go and ending up with worse performance. I think the bugfix in r2841 went a long way to fixing the slowness anyway.","message":"Removed todo, after giving it a go and ending up with worse performance. I think the bugfix in r2841 went a long way to fixing the slowness anyway.\n","repos":"ruschelp\/cortex-vfx,code-google-com\/cortex-vfx,ruschelp\/cortex-vfx,code-google-com\/cortex-vfx,ruschelp\/cortex-vfx,code-google-com\/cortex-vfx,code-google-com\/cortex-vfx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/IECore\/PointDistribution.h\n+++ include\/IECore\/PointDistribution.h\n@@ -1,6 +1,6 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\n-\/\/ Copyright (c) 2009, Image Engine Design Inc. All rights reserved.\n+\/\/ Copyright (c) 2010, Image Engine Design Inc. All rights reserved.\n \/\/\n \/\/ Redistribution and use in source and binary forms, with or without\n \/\/ modification, are permitted provided that the following conditions are\n@@ -67,8 +67,6 @@\n \t\t\/\/\/ densitySampler must have signature float( const Imath::V2f &pos ) and return a density in the range 0-1.\n \t\t\/\/\/\n \t\t\/\/\/ pointEmitter is called for each point generated and must have the signature void( const Imath::V2f &pos ).\n-\t\t\/\/\/ \\todo This isn't particularly efficient when the bounds are small, as many points are considered and rejected. It might\n-\t\t\/\/\/ be possible to improve this by using some sort of acceleration structure within the Tile class.\n \t\ttemplate<typename DensityFunction, typename PointFunction>\n \t\tvoid operator () ( const Imath::Box2f &bounds, float density, DensityFunction &densitySampler, PointFunction &pointEmitter ) const;\n \t\n"} {"commit":"135e65d67ffbefadb27948b9c6e490c635bc9d74","subject":"iw: remove ifdefs for mcs mask","message":"iw: remove ifdefs for mcs mask\n\nThese are enums, not defines. Therefore the ifdef check can never be\ntrue.\n\nSigned-off-by: Simon Wunderlich <ee8cb2fe367357431f9fb32cc761adf92c257cce@hrz.tu-chemnitz.de>\nSigned-off-by: Mathias Kretschmer <d2456b0e21cb704958d2f558f9a4d561af050a3e@fokus.fraunhofer.de>\n","repos":"chunyeow\/iw,Distrotech\/iw,timduru\/platform-external-iw,greearb\/iw-ct,greearb\/iw-ct,SoluMachines\/external_iw,bw-oss\/iw,CTU-IIG\/802.11p-iw,SoluMachines\/external_iw,TeamEOS\/external_iw,cozybit\/iw,CTU-IIG\/802.11p-iw,cozybit\/iw,bw-oss\/iw,TeamEOS\/external_iw,Distrotech\/iw,chunyeow\/iw,timduru\/platform-external-iw","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- bitrate.c\n+++ bitrate.c\n@@ -17,12 +17,10 @@\n \tuint8_t *legacy = NULL;\n \tint *n_legacy = NULL;\n \tbool have_mcs_24 = false, have_mcs_5 = false;\n-#ifdef NL80211_TXRATE_MCS\n \tuint8_t mcs_24[77], mcs_5[77];\n \tint n_mcs_24 = 0, n_mcs_5 = 0;\n \tuint8_t *mcs = NULL;\n \tint *n_mcs = NULL;\n-#endif\n \tenum {\n \t\tS_NONE,\n \t\tS_LEGACY,\n@@ -32,9 +30,7 @@\n \tfor (i = 0; i < argc; i++) {\n \t\tchar *end;\n \t\tdouble tmpd;\n-#ifdef NL80211_TXRATE_MCS\n \t\tlong tmpl;\n-#endif\n \n \t\tif (strcmp(argv[i], \"legacy-2.4\") == 0) {\n \t\t\tif (have_legacy_24)\n@@ -51,7 +47,6 @@\n \t\t\tn_legacy = &n_legacy_5;\n \t\t\thave_legacy_5 = true;\n \t\t}\n-#ifdef NL80211_TXRATE_MCS\n \t\telse if (strcmp(argv[i], \"mcs-2.4\") == 0) {\n \t\t\tif (have_mcs_24)\n \t\t\t\treturn 1;\n@@ -67,7 +62,6 @@\n \t\t\tn_mcs = &n_mcs_5;\n \t\t\thave_mcs_5 = true;\n \t\t}\n-#endif\n \t\telse switch (parser_state) {\n \t\tcase S_LEGACY:\n \t\t\ttmpd = strtod(argv[i], &end);\n@@ -78,7 +72,6 @@\n \t\t\tlegacy[(*n_legacy)++] = tmpd * 2;\n \t\t\tbreak;\n \t\tcase S_MCS:\n-#ifdef NL80211_TXRATE_MCS\n \t\t\ttmpl = strtol(argv[i], &end, 0);\n \t\t\tif (*end != '\\0')\n \t\t\t\treturn 1;\n@@ -86,7 +79,6 @@\n \t\t\t\treturn 1;\n \t\t\tmcs[(*n_mcs)++] = tmpl;\n \t\t\tbreak;\n-#endif\n \t\tdefault:\n \t\t\treturn 1;\n \t\t}\n@@ -102,10 +94,8 @@\n \t\t\tgoto nla_put_failure;\n \t\tif (have_legacy_24)\n \t\t\tnla_put(msg, NL80211_TXRATE_LEGACY, n_legacy_24, legacy_24);\n-#ifdef NL80211_TXRATE_MCS\n \t\tif (have_mcs_24)\n \t\t\tnla_put(msg, NL80211_TXRATE_MCS, n_mcs_24, mcs_24);\n-#endif\n \t\tnla_nest_end(msg, nl_band);\n \t}\n \n@@ -115,10 +105,8 @@\n \t\t\tgoto nla_put_failure;\n \t\tif (have_legacy_5)\n \t\t\tnla_put(msg, NL80211_TXRATE_LEGACY, n_legacy_5, legacy_5);\n-#ifdef NL80211_TXRATE_MCS\n \t\tif (have_mcs_5)\n \t\t\tnla_put(msg, NL80211_TXRATE_MCS, n_mcs_5, mcs_5);\n-#endif\n \t\tnla_nest_end(msg, nl_band);\n \t}\n \n@@ -130,13 +118,9 @@\n }\n \n #define DESCR_LEGACY \"[legacy-<2.4|5> <legacy rate in Mbps>*]\"\n-#ifdef NL80211_TXRATE_MCS\n #define DESCR DESCR_LEGACY \" [mcs-<2.4|5> <MCS index>*]\"\n-#else\n-#define DESCR DESCR_LEGACY\n-#endif\n \n-COMMAND(set, bitrates, DESCR, NL80211_CMD_SET_TX_BITRATE_MASK, 0, CIB_NETDEV,\n-\thandle_bitrates,\n+COMMAND(set, bitrates, \"[legacy-<2.4|5> <legacy rate in Mbps>*] [mcs-<2.4|5> <MCS index>*]\",\n+\tNL80211_CMD_SET_TX_BITRATE_MASK, 0, CIB_NETDEV, handle_bitrates,\n \t\"Sets up the specified rate masks.\\n\"\n \t\"Not passing any arguments would clear the existing mask (if any).\");\n"} {"commit":"1bdd58d051edcaac579b592821a17edf5ceb8bb4","subject":"Auto-skip D-Pad configuration if hats are used, closes #480","message":"Auto-skip D-Pad configuration if hats are used, closes #480\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SDL\/gui.c\n+++ SDL\/gui.c\n@@ -1792,11 +1792,20 @@\n return;\n }\n }\n- case SDL_JOYBUTTONDOWN:\n- {\n+ case SDL_JOYBUTTONDOWN: {\n if (gui_state == WAITING_FOR_JBUTTON && joypad_configuration_progress != JOYPAD_BUTTONS_MAX) {\n should_render = true;\n configuration.joypad_configuration[joypad_configuration_progress++] = event.jbutton.button;\n+ }\n+ break;\n+ }\n+ case SDL_JOYHATMOTION: {\n+ if (gui_state == WAITING_FOR_JBUTTON && joypad_configuration_progress == JOYPAD_BUTTON_RIGHT) {\n+ should_render = true;\n+ configuration.joypad_configuration[joypad_configuration_progress++] = -1;\n+ configuration.joypad_configuration[joypad_configuration_progress++] = -1;\n+ configuration.joypad_configuration[joypad_configuration_progress++] = -1;\n+ configuration.joypad_configuration[joypad_configuration_progress++] = -1;\n }\n break;\n }\n"} {"commit":"9a8436fcbfbe2907e55513fd1b424b266abc51d5","subject":"Tweak the initialization in `CREATE()` to work around gcc deficiencies","message":"Tweak the initialization in `CREATE()` to work around gcc deficiencies\n","repos":"davidfstr\/discount,binki\/discount,davidfstr\/discount,OliverLetterer\/discount,binki\/discount,gm2bv\/discount,davidfstr\/discount,binki\/discount,binki\/discount,gm2bv\/discount,OliverLetterer\/discount,binki\/discount,OliverLetterer\/discount,gm2bv\/discount,gm2bv\/discount,davidfstr\/discount","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cstring.h\n+++ cstring.h\n@@ -18,7 +18,7 @@\n *\/\n #define STRING(type)\tstruct { type *text; int size, alloc; }\n \n-#define CREATE(x)\tT(x) = (void*)(S(x) = (x).alloc = 0)\n+#define CREATE(x)\t( (T(x) = (void*)0), (S(x) = (x).alloc = 0) )\n #define EXPAND(x)\t(S(x)++)[(S(x) < (x).alloc) \\\n \t\t\t ? (T(x)) \\\n \t\t\t : (T(x) = T(x) ? realloc(T(x), sizeof T(x)[0] * ((x).alloc += 100)) \\\n"} {"commit":"af348c6b1e446ba60528770518152dd0a86e599c","subject":"adding meat","message":"adding meat","repos":"jcwoods\/csvprof","returncode":1,"stderr":"error: pathspec 'csvprof.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- csvprof.c\n+++ csvprof.c\n@@ -0,0 +1,582 @@\n+#include <stdio.h>\n+#include <stdint.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <ctype.h>\n+#include <errno.h>\n+\n+#include \"libcsv\/csv.h\"\n+\n+#define INITIAL_FIELDS 16\n+#define INITIAL_OFFSETS 32\n+\n+#if 0\n+#define DEBUG 1\n+#endif\n+\n+struct Globals\n+{\n+ char delim;\n+ int hasHeader;\n+};\n+\n+struct Globals glb;\n+\n+\/* Data about what we've found in each offset location *\/\n+struct Offset\n+{\n+ uint8_t minVal; \/* MIN (byte) value found for this position *\/\n+ uint8_t maxVal; \/* MAX (byte) value found for this position *\/\n+ int64_t count; \/* number of times we've updated this offset *\/\n+\n+ int64_t vals[256]; \/* a counter of times each value has been observed *\/\n+};\n+\n+#define F_FL_NONASCII (0x0001)\n+#define F_FL_NONPRINT (0x0002)\n+#define F_FL_HASALPHA (0x0004)\n+#define F_FL_HASLOWER (0x0008)\n+#define F_FL_HASUPPER (0x0010)\n+#define F_FL_HASDIGIT (0x0020)\n+#define F_FL_HASSPACE (0x0040)\n+\n+struct Field\n+{\n+ char *name;\n+ uint32_t flags;\n+\n+ uint64_t minLen; \/* the MIN (byte) length found for this field *\/\n+ uint64_t maxLen; \/* the MAX (byte) length found for this field *\/\n+ uint64_t totLen; \/* the TOTAL number of bytes in this field *\/\n+ uint64_t numEmpty;\n+\n+ struct Offset **offsets; \/* data about what was found in each offset *\/\n+ uint64_t count; \/* number of times we've updated this field *\/\n+ uint64_t maxOffsets; \/* max number of offs which might be stored in\n+ the offsets[] array without having to\n+ resize the array. *\/\n+};\n+\n+struct Record\n+{\n+ int rown;\n+ int fieldn;\n+ int reclen;\n+\n+ uint64_t minLen; \/* min observed length (bytes) of a record *\/\n+ uint64_t maxLen; \/* max observed length (bytes) of a record *\/\n+ uint64_t count; \/* number of records read *\/\n+ uint64_t totLen; \/* total length (bytes) of all records combined *\/\n+\n+ struct Field **fields;\n+ int maxFields;\n+};\n+\n+static inline struct Offset *new_offset()\n+{\n+ struct Offset *off;\n+\n+ off = malloc(sizeof(struct Offset));\n+ if (off == (struct Offset *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ return (struct Offset *) NULL;\n+ }\n+\n+ memset(off, 0x00, sizeof(*off));\n+ off->minVal = (uint8_t) -1;\n+ off->maxVal = 0;\n+\n+ return off;\n+}\n+\n+\/* allocate a new field *\/\n+static inline struct Field *new_field()\n+{\n+ struct Field *fld;\n+ int i;\n+\n+ fld = malloc(sizeof(struct Field));\n+ if (fld == (struct Field *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ memset(fld, 0x00, sizeof(*fld));\n+ fld->minLen = (uint64_t) -1;\n+\n+ fld->offsets = (struct Offset **)\n+ malloc(sizeof(struct Offset *) * INITIAL_OFFSETS);\n+\n+ if (fld->offsets == (struct Offset **) NULL)\n+ {\n+ free(fld);\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ memset(fld->offsets, 0x00, sizeof(struct Offset *) * INITIAL_OFFSETS);\n+\n+ for (i = 0; i < INITIAL_OFFSETS; i++)\n+ {\n+ fld->offsets[i] = new_offset();\n+ if (fld->offsets[i] == (struct Offset *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+ }\n+\n+ fld->maxOffsets = i;\n+\n+ return fld;\n+}\n+\n+\/* allocate a new record stats block (one per process instance) *\/\n+static inline struct Record *new_record()\n+{\n+ struct Record *rec;\n+ int f;\n+\n+ rec = malloc(sizeof(struct Record));\n+ if (rec == (struct Record *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ memset(rec, 0x00, sizeof(*rec));\n+\n+ rec->minLen = (uint64_t) -1;\n+ rec->maxLen = 0;\n+ rec->count = 0;\n+ rec->totLen = 0;\n+\n+ rec->fields = (struct Field **)\n+ malloc(sizeof(struct Field *) * INITIAL_FIELDS);\n+ if (rec->fields == (struct Field **) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ memset(rec->fields, 0x00, sizeof(struct Field *) * INITIAL_FIELDS);\n+\n+ for (f = 0; f < INITIAL_FIELDS; f++)\n+ rec->fields[f] = new_field(); \/* does not return on error *\/\n+\n+ rec->maxFields = f;\n+ return rec;\n+}\n+\n+static inline void del_offset(struct Offset *off)\n+{\n+ free(off);\n+ return;\n+}\n+\n+static inline void del_field(struct Field *field)\n+{\n+ int off;\n+\n+ if (field->name != (char *) NULL) free(field->name);\n+\n+ for (off = 0; off < field->maxOffsets; off++)\n+ del_offset(field->offsets[off]);\n+\n+ free(field->offsets);\n+ free(field);\n+ return;\n+}\n+\n+static inline void del_record(struct Record *rec)\n+{\n+ int fno;\n+\n+ for (fno = 0; fno < rec->maxFields; fno++)\n+ del_field(rec->fields[fno]);\n+\n+ free(rec->fields);\n+ free(rec);\n+ return;\n+}\n+\n+static void resize_offsets_array(struct Field *field)\n+{\n+ struct Offset **old_offsets;\n+ struct Offset **new_offsets;\n+ int old_maxOffsets;\n+ int new_maxOffsets;\n+ int off;\n+ \n+ old_maxOffsets = field->maxOffsets;\n+ old_offsets = field->offsets;\n+ new_maxOffsets = old_maxOffsets * 2;\n+\n+#ifdef DEBUG\n+ printf(\" ** increasing offsets for field %d from %d to %d\\n\",\n+ f, old_maxOffsets, new_maxOffsets);\n+#endif\n+\n+ new_offsets = (struct Offset **)\n+ malloc(sizeof(struct Offset *) * new_maxOffsets);\n+\n+ if (new_offsets == (struct Offset **) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ \/* Copy the old offsets... *\/\n+ memcpy(new_offsets, old_offsets,\n+ sizeof(struct Offset **) * old_maxOffsets);\n+ \n+ \/* ...and initialize the new *\/\n+ for (off = old_maxOffsets; off < new_maxOffsets; off++)\n+ new_offsets[off] = new_offset();\n+\n+ field->offsets = new_offsets;\n+ field->maxOffsets = new_maxOffsets;\n+ free(old_offsets);\n+\n+ return;\n+}\n+\n+static void update_offset(struct Record *rec, int f, int o, uint8_t b)\n+{\n+ struct Field *field;\n+ struct Offset *offset;\n+\n+ field = rec->fields[f];\n+ offset = field->offsets[o];\n+\n+ if (b < offset->minVal) offset->minVal = b;\n+ if (b > offset->maxVal) offset->maxVal = b;\n+ offset->vals[b]++;\n+ offset->count++;\n+\n+ \/* TODO - we might optimize these checks for the more common\n+ cases first. *\/\n+\n+ if (! isascii(b)) field->flags |= F_FL_NONASCII;\n+ else\n+ {\n+ if (! isprint(b)) field->flags |= F_FL_NONPRINT;\n+ else\n+ {\n+ if (isalpha(b))\n+ {\n+ field->flags |= F_FL_HASALPHA;\n+\n+ if (islower(b)) field->flags |= F_FL_HASLOWER;\n+ if (isupper(b)) field->flags |= F_FL_HASUPPER;\n+ }\n+ else if (isdigit(b)) field->flags |= F_FL_HASDIGIT;\n+ else if (isspace(b)) field->flags |= F_FL_HASSPACE;\n+ }\n+ }\n+\n+ return;\n+}\n+\n+static void resize_fields_array(struct Record *rec)\n+{\n+ struct Field **old_fields;\n+ struct Field **new_fields;\n+ int old_maxFields;\n+ int new_maxFields;\n+ int fno;\n+\n+ old_fields = rec->fields;\n+ old_maxFields = rec->maxFields;\n+ new_maxFields = rec->maxFields * 2;\n+\n+#ifdef DEBUG\n+ printf(\"** increasing fields from %d to %d\\n\",\n+ old_maxFields, new_maxFields);\n+#endif\n+\n+ new_fields = (struct Field **)\n+ malloc(sizeof(struct Field *) * new_maxFields);\n+\n+ if (new_fields == (struct Field **) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ \/* copy old fields into new array *\/\n+ memcpy(new_fields, old_fields,\n+ sizeof(struct Field **) * old_maxFields);\n+\n+ \/* allocate new fields *\/\n+ for (fno = old_maxFields; fno < new_maxFields; fno++)\n+ {\n+ new_fields[fno] = new_field(); \n+ if (new_fields[fno] == (struct Field *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+ }\n+\n+ rec->fields = new_fields;\n+ rec->maxFields = new_maxFields;\n+ free(old_fields);\n+\n+ return;\n+}\n+\n+static inline void update_field(struct Record *rec, int fno, int len)\n+{\n+ struct Field *field;\n+\n+\n+ field = rec->fields[fno];\n+\n+ if (len < field->minLen) field->minLen = len;\n+ if (len > field->maxLen) field->maxLen = len;\n+ if (len == 0) field->numEmpty++;\n+ field->totLen += len;\n+ field->count++;\n+\n+ return;\n+}\n+\n+static inline void update_record(struct Record *rec, int len)\n+{\n+ if (len < rec->minLen) rec->minLen = len;\n+ if (len > rec->maxLen) rec->maxLen = len;\n+ rec->totLen += len;\n+ rec->count++;\n+\n+ if (rec->count % 1000 == 0)\n+ fprintf(stdout, \"%d records completed\\n\", (int) rec->count);\n+\n+ return;\n+}\n+\n+static void do_report(struct Record *rec)\n+{\n+ struct Field *fld;\n+ int fno;\n+\n+ printf(\"Total of %ld records read\\n\", rec->count);\n+ printf(\" Record Length: %lu (min), %lu (max), %lu (avg) bytes:\\n\",\n+ rec->minLen, rec->maxLen, (rec->totLen \/ rec->count));\n+ \n+ \/* if we hit a field which has never been updated (count == 0), we know\n+ we can stop. Even an empty field (length == 0) updates the counter. *\/\n+ for (fno = 0;\n+ fno < rec->maxFields && rec->fields[fno]->count > 0;\n+ fno++)\n+ {\n+ fld = rec->fields[fno];\n+ if (fld->name != (char *) NULL)\n+ printf(\" Field[%d]: %s\\n \", fno, fld->name);\n+ else\n+ printf(\" Field[%d]: \", fno);\n+\n+ printf(\"%5lu (min), %5lu (max), %5lu (avg) bytes, %5lu (empty)\\n\",\n+ fld->minLen, fld->maxLen,\n+ (fld->totLen \/ fld->count),\n+ fld->numEmpty);\n+\n+ int out = 0;\n+ if ((fld->flags & F_FL_NONASCII) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"**NONASCII** \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_NONPRINT) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"**NONPRINT** \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_HASALPHA) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"HAS_ALPHA \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_HASLOWER) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"HAS_LOWER \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_HASUPPER) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"HAS_UPPER \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_HASDIGIT) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"HAS_DIGIT \");\n+ out = 1;\n+ }\n+\n+ if ((fld->flags & F_FL_HASSPACE) != 0)\n+ {\n+ if (out == 0) printf(\" \");\n+ printf(\"HAS_SPACE \");\n+ out = 1;\n+ }\n+\n+ if (out != 0) printf(\"\\n\");\n+ }\n+\n+ return; \n+}\n+\n+void endoffield(void *s, size_t len, void *data)\n+{\n+ struct Record *rec;\n+ int fno;\n+ struct Field *field;\n+ uint8_t *bytes;\n+ int off;\n+\n+ rec = (struct Record *) data;\n+ bytes = (uint8_t *) s;\n+\n+ fno = rec->fieldn;\n+\n+ \/* There is no way to know how many fields are in a record before we hit\n+ the end of the record, so we'll need to check that we've not hit the\n+ end of the fields array prior to updating each field. We may need to\n+ resize the fields array if we've grown beyond what was previously\n+ allocated. *\/\n+ if (fno >= rec->maxFields)\n+ resize_fields_array(rec); \/* does not return on error *\/\n+\n+ field = rec->fields[fno];\n+ if (glb.hasHeader != 0 && rec->rown == 0)\n+ {\n+ \/* processing header row, copy field name *\/\n+ field->name = (char *) malloc(len + 1);\n+ if (field->name == (char *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: malloc() failed: %s (%s:%d)\\n\",\n+ strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+ \n+ memcpy(field->name, s, len);\n+ field->name[len] = '\\0';\n+\n+#ifdef DEBUG\n+ printf(\"[%d] %s\\n\", fno, field->name);\n+#endif\n+ }\n+ else\n+ {\n+ update_field(rec, fno, len);\n+ \n+ for (off = 0; off < len; off++)\n+ {\n+ \/* we may need to resize the offsets array if we've grown\n+ beyond what was previously allocated. *\/\n+\n+ \/* TODO - we know the length of the field (as an input\n+ parameter), so we don't need to do this check for\n+ every offset! *\/\n+\n+ if (off >= field->maxOffsets) resize_offsets_array(field);\n+\n+ update_offset(rec, fno, off, bytes[off]);\n+ }\n+ }\n+\n+ rec->reclen += len;\n+ rec->fieldn++;\n+ return;\n+}\n+\n+void endofrec(int c, void *data)\n+{\n+ struct Record *rec = (struct Record *) data;\n+\n+ update_record(rec, rec->reclen);\n+\n+ rec->rown++;\n+ rec->fieldn = 0;\n+ rec->reclen = 0;\n+ return;\n+}\n+\n+void Initialize(int argc, char **argv)\n+{\n+ memset(&glb, 0x00, sizeof(glb));\n+ \/* glb.delim = '\\t'; *\/\n+ glb.delim = '|';\n+ \/* glb.hasHeader = 1; *\/\n+ glb.hasHeader = 0;\n+\n+ \/* TODO - complete *\/\n+\n+ return;\n+}\n+\n+int main(int argc, char **argv)\n+{\n+ FILE *fp;\n+ struct csv_parser p;\n+ char buf[8192];\n+ size_t bytes_read;\n+ struct Record *rec;\n+\n+ Initialize(argc, argv);\n+\n+ rec = new_record(); \/* does not return on error *\/\n+\n+ if (csv_init(&p, 0) != 0) exit(EXIT_FAILURE);\n+ csv_set_delim(&p, glb.delim);\n+\n+ fp = fopen(argv[1], \"rb\");\n+ if (fp == (FILE *) NULL)\n+ {\n+ fprintf(stderr, \"ERROR: fopen(%s) failed: %s (%s:%d)\\n\",\n+ argv[1], strerror(errno), __FILE__, __LINE__);\n+ exit(1);\n+ }\n+\n+ while ((bytes_read = fread(buf, 1, sizeof(buf), fp)) > 0)\n+ {\n+ if (csv_parse(&p, buf, bytes_read,\n+ endoffield, endofrec, rec) != bytes_read)\n+ {\n+ fprintf(stderr, \"Error while parsing file: %s\\n\",\n+ csv_strerror(csv_error(&p)) );\n+ exit(EXIT_FAILURE);\n+ }\n+ }\n+\n+ csv_fini(&p, endoffield, endofrec, rec);\n+ fclose(fp);\n+ csv_free(&p);\n+\n+ do_report(rec);\n+ del_record(rec);\n+\n+ exit(EXIT_SUCCESS);\n+}\n"} {"commit":"690db0ea9a7f4e2c6622b38d50c70046df7031e2","subject":"pixbufhelper: render symbolic icons using widgets style context","message":"pixbufhelper: render symbolic icons using widgets style context\n\nIf the icon is symbolic, we need to render it using the widgets\nstyle context so that the symbolic colors match the stylescheme.\n","repos":"GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcepixbufhelper.c\n+++ gtksourceview\/gtksourcepixbufhelper.c\n@@ -292,7 +292,21 @@\n \n \tif (info)\n \t{\n-\t\tset_cache (helper, gtk_icon_info_load_icon (info, NULL));\n+\t\tGdkPixbuf *pixbuf;\n+\n+\t\tif (gtk_icon_info_is_symbolic (info))\n+\t\t{\n+\t\t\tGtkStyleContext *context;\n+\n+\t\t\tcontext = gtk_widget_get_style_context (widget);\n+\t\t\tpixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\tpixbuf = gtk_icon_info_load_icon (info, NULL);\n+\t\t}\n+\n+\t\tset_cache (helper, pixbuf);\n \t}\n }\n \n"} {"commit":"c1f27d7b27c4ef84797109bde3e45462523f6c60","subject":"Spacing","message":"Spacing\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Core\/apu.c\n+++ Core\/apu.c\n@@ -150,6 +150,7 @@\n \n (*volume) &= 0xF;\n }\n+\n void GB_apu_div_event(GB_gameboy_t *gb)\n {\n if (!gb->apu.global_enable) return;\n"} {"commit":"0c5e15b49dd8a8167dffc11a2fadecc74464bd33","subject":"Correct emulation of count overflow in ATTR_CHR, fixes #372","message":"Correct emulation of count overflow in ATTR_CHR, fixes #372\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Core\/sgb.c\n+++ Core\/sgb.c\n@@ -269,7 +269,8 @@\n #endif\n uint8_t x = command->x;\n uint8_t y = command->y;\n- if (x >= 20 || y >= 18 || (count + 3) \/ 4 > sizeof(gb->sgb->command) - sizeof(*command) - 1) {\n+ count = MIN(count, 20 * 18);\n+ if (x >= 20 || y >= 18) {\n \/* TODO: Verify with the SFC BIOS *\/\n break;\n }\n"} {"commit":"bbe9ce9b7c0cdb6df0f20565f7b6c67c82699c2e","subject":"mips: compilable for MSVC 2013","message":"mips: compilable for MSVC 2013\n","repos":"bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,bSr43\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- arch\/Mips\/MipsModule.c\n+++ arch\/Mips\/MipsModule.c\n@@ -11,7 +11,7 @@\n #include \"MipsModule.h\"\n \n \/\/ Returns mode value with implied bits set\n-static inline cs_mode updated_mode(cs_mode mode)\n+static cs_mode updated_mode(cs_mode mode)\n {\n \tif (mode & CS_MODE_MIPS32R6) {\n \t\tmode |= CS_MODE_32;\n"} {"commit":"433e0547e13596e6d96740071d6c1514cf3ae8a8","subject":"Oops, it's too early for this chunk of code... spotted by millert@.","message":"Oops, it's too early for this chunk of code... spotted by millert@.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/alpha\/tc\/tcasic.c\n+++ arch\/alpha\/tc\/tcasic.c\n@@ -1,4 +1,4 @@\n-\/* $OpenBSD: tcasic.c,v 1.10 2002\/05\/02 22:56:06 miod Exp $ *\/\n+\/* $OpenBSD: tcasic.c,v 1.11 2002\/05\/02 23:45:44 miod Exp $ *\/\n \/* $NetBSD: tcasic.c,v 1.36 2001\/08\/23 01:16:52 nisimura Exp $ *\/\n \n \/*\n@@ -163,6 +163,8 @@\n \treturn (UNCONF);\n }\n \n+#ifdef notyet\n+\n #include \"wsdisplay.h\"\n \n #if NWSDISPLAY > 0\n@@ -241,3 +243,5 @@\n \treturn (0);\n }\n #endif \/* if NWSDISPLAY > 0 *\/\n+\n+#endif\n"} {"commit":"7f5b276f4a89fe4de5800adad7bb72a73d7eaf64","subject":"Don't forget to register the i8254-based timecounter if we use the i8254 for clock interrupts. Unbreaks amd64 in PIC mode.","message":"Don't forget to register the i8254-based timecounter if we use the i8254\nfor clock interrupts. Unbreaks amd64 in PIC mode.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/amd64\/isa\/clock.c\n+++ arch\/amd64\/isa\/clock.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: clock.c,v 1.14 2010\/07\/25 21:43:38 deraadt Exp $\t*\/\n+\/*\t$OpenBSD: clock.c,v 1.15 2010\/07\/29 13:36:30 kettenis Exp $\t*\/\n \/*\t$NetBSD: clock.c,v 1.1 2003\/04\/26 18:39:50 fvdl Exp $\t*\/\n \n \/*-\n@@ -319,6 +319,8 @@\n \t 0, \"rtc\");\n \n \trtcstart();\t\t\t\/* start the mc146818 clock *\/\n+\n+\ti8254_inittimecounter();\t\/* hook the interrupt-based i8254 tc *\/\n }\n \n void\n"} {"commit":"e81942e5389424549688658b906046b75b285110","subject":"arc: do not include arch\/cpu.h, nanokernel.h has it","message":"arc: do not include arch\/cpu.h, nanokernel.h has it\n\nChange-Id: Ic8537168211292fcedcb9c1d283d638029473932\nSigned-off-by: Anas Nashif <0d9952ec84ac43c159f6b7e7ed99a9080c00dd6e@intel.com>\n","repos":"runchip\/zephyr-cc3200,zephyrproject-rtos\/zephyr,nashif\/zephyr,fbsder\/zephyr,pklazy\/zephyr,mbolivar\/zephyr,punitvara\/zephyr,tidyjiang8\/zephyr-doc,aceofall\/zephyr-iotos,jamesonwilliams\/zephyr-kernel,Vudentz\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,rsalveti\/zephyr,rsalveti\/zephyr,erwango\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,mbolivar\/zephyr,punitvara\/zephyr,32bitmicro\/zephyr,rsalveti\/zephyr,jamesonwilliams\/zephyr-kernel,galak\/zephyr,zephyriot\/zephyr,zephyriot\/zephyr,mirzak\/zephyr-os,fbsder\/zephyr,erwango\/zephyr,32bitmicro\/zephyr,fbsder\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,fractalclone\/zephyr-riscv,holtmann\/zephyr,galak\/zephyr,finikorg\/zephyr,tidyjiang8\/zephyr-doc,tidyjiang8\/zephyr-doc,sharronliu\/zephyr,nashif\/zephyr,bboozzoo\/zephyr,Vudentz\/zephyr,bboozzoo\/zephyr,ldts\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3200,fractalclone\/zephyr-riscv,holtmann\/zephyr,tidyjiang8\/zephyr-doc,fractalclone\/zephyr-riscv,kraj\/zephyr,32bitmicro\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,bigdinotech\/zephyr,sharronliu\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,runchip\/zephyr-cc3220,GiulianoFranchetto\/zephyr,bboozzoo\/zephyr,fbsder\/zephyr,punitvara\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,bboozzoo\/zephyr,nashif\/zephyr,zephyriot\/zephyr,32bitmicro\/zephyr,finikorg\/zephyr,nashif\/zephyr,aceofall\/zephyr-iotos,32bitmicro\/zephyr,jamesonwilliams\/zephyr-kernel,mbolivar\/zephyr,fractalclone\/zephyr-riscv,GiulianoFranchetto\/zephyr,erwango\/zephyr,kraj\/zephyr,bigdinotech\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,coldnew\/zephyr-project-fork,nashif\/zephyr,coldnew\/zephyr-project-fork,zephyriot\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,galak\/zephyr,aceofall\/zephyr-iotos,holtmann\/zephyr,zephyrproject-rtos\/zephyr,sharronliu\/zephyr,explora26\/zephyr,finikorg\/zephyr,fractalclone\/zephyr-riscv,holtmann\/zephyr,runchip\/zephyr-cc3220,coldnew\/zephyr-project-fork,holtmann\/zephyr,galak\/zephyr,mirzak\/zephyr-os,kraj\/zephyr,aceofall\/zephyr-iotos,pklazy\/zephyr,pklazy\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,mirzak\/zephyr-os,pklazy\/zephyr,zephyrproject-rtos\/zephyr,zephyriot\/zephyr,erwango\/zephyr,jamesonwilliams\/zephyr-kernel,runchip\/zephyr-cc3220,finikorg\/zephyr,jamesonwilliams\/zephyr-kernel,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3200,galak\/zephyr,Vudentz\/zephyr,sharronliu\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3220,bigdinotech\/zephyr,runchip\/zephyr-cc3200,erwango\/zephyr,coldnew\/zephyr-project-fork,coldnew\/zephyr-project-fork,ldts\/zephyr,runchip\/zephyr-cc3220,ldts\/zephyr,finikorg\/zephyr,kraj\/zephyr,mirzak\/zephyr-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arc\/core\/thread.c\n+++ arch\/arc\/core\/thread.c\n@@ -37,7 +37,6 @@\n *\/\n \n #include <nanokernel.h>\n-#include <arch\/cpu.h>\n #include <toolchain.h>\n #include <nano_private.h>\n #include <offsets.h>\n"} {"commit":"6a9b3f5ddd30123c1474e1cacb9075d5d0273e07","subject":"arch: arm: allocate a wide priv stack guard for FP-capable threads","message":"arch: arm: allocate a wide priv stack guard for FP-capable threads\n\nWhen an FP capable thread (i.e. with K_FP_REGS option)\ntransitions into user mode, we want to allocate a wider\nMPU stack guard region, to be able to successfully detect\noverflows of the privilege stack during system calls. For\nthat we also need to re-adjust the .priv_stack_start pointer,\nwhich denotes the start of the writable area of the privilege\nstack buffer.\n\nSigned-off-by: Ioannis Glaropoulos <5921cc8bab7e1d4329f52fd8f6268f9692e3de80@nordicsemi.no>\n","repos":"finikorg\/zephyr,galak\/zephyr,nashif\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,galak\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/core\/thread.c\n+++ arch\/arm\/core\/thread.c\n@@ -180,7 +180,13 @@\n \t * privileged stack. Adjust the available (writable) stack\n \t * buffer area accordingly.\n \t *\/\n+#if defined(CONFIG_FLOAT) && defined(CONFIG_FP_SHARING)\n+\t _current->arch.priv_stack_start +=\n+\t\t(_current->base.user_options & K_FP_REGS) ?\n+\t\tMPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;\n+#else\n \t _current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;\n+#endif \/* CONFIG_FLOAT && CONFIG_FP_SHARING *\/\n #endif \/* CONFIG_MPU_STACK_GUARD *\/\n \n \tz_arm_userspace_enter(user_entry, p1, p2, p3,\n"} {"commit":"0409d69c242f9ae2176975a5d32f1f99a61a9e36","subject":"* fixed reversed template parameters in @pcl::kdtree::KdTree@ in nearestKSearchT and radiusSearchT, thanks to Peter Bolla for reporting this. (#442)","message":"* fixed reversed template parameters in @pcl::kdtree::KdTree@ in nearestKSearchT and radiusSearchT, thanks to Peter Bolla for reporting this. (#442)\n\ngit-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@3336 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"sbec\/pcl,Nerei\/pcl_old_repo,simonleonard\/pcl,v4hn\/pcl,chatchavan\/pcl,starius\/pcl,MMiknis\/pcl,Tabjones\/pcl,locnx1984\/pcl,soulsheng\/pcl,KevenRing\/vlp,locnx1984\/pcl,pkuhto\/pcl,soulsheng\/pcl,stfuchs\/pcl,raydtang\/pcl,KevenRing\/vlp,sbec\/pcl,Tabjones\/pcl,locnx1984\/pcl,soulsheng\/pcl,pkuhto\/pcl,zavataafnan\/pcl-truck,srbhprajapati\/pcl,shivmalhotra\/pcl,mikhail-matrosov\/pcl,chatchavan\/pcl,fskuka\/pcl,lydhr\/pcl,Nerei\/pcl_old_repo,Tabjones\/pcl,krips89\/pcl_newfeatures,LZRS\/pcl,DaikiMaekawa\/pcl,srbhprajapati\/pcl,msalvato\/pcl_kinfu_highres,the-glu\/pcl,fanxiaochen\/mypcltest,shyamalschandra\/pcl,stfuchs\/pcl,jakobwilm\/pcl,drmateo\/pcl,damienjadeduff\/pcl,LZRS\/pcl,chenxingzhe\/pcl,jeppewalther\/kinfu_segmentation,KevenRing\/pcl,Tabjones\/pcl,mschoeler\/pcl,simonleonard\/pcl,shyamalschandra\/pcl,v4hn\/pcl,simonleonard\/pcl,cascheberg\/pcl,KevenRing\/pcl,RufaelDev\/pcc-mp3dg,wgapl\/pcl,msalvato\/pcl_kinfu_highres,pkuhto\/pcl,sbec\/pcl,chenxingzhe\/pcl,starius\/pcl,ResByte\/pcl,nikste\/pcl,Nerei\/pcl_old_repo,cascheberg\/pcl,nh2\/pcl,damienjadeduff\/pcl,kanster\/pcl,Tabjones\/pcl,lydhr\/pcl,ipa-rmb\/pcl,KevenRing\/pcl,simonleonard\/pcl,DaikiMaekawa\/pcl,lebronzhang\/pcl,mschoeler\/pcl,cascheberg\/pcl,krips89\/pcl_newfeatures,RufaelDev\/pcc-mp3dg,the-glu\/pcl,KevenRing\/vlp,lydhr\/pcl,locnx1984\/pcl,stefanbuettner\/pcl,shangwuhencc\/pcl,jakobwilm\/pcl,3dtof\/pcl,ipa-rmb\/pcl,zavataafnan\/pcl-truck,LZRS\/pcl,raydtang\/pcl,shangwuhencc\/pcl,damienjadeduff\/pcl,msalvato\/pcl_kinfu_highres,3dtof\/pcl,wgapl\/pcl,shangwuhencc\/pcl,ipa-rmb\/pcl,kanster\/pcl,LZRS\/pcl,3dtof\/pcl,jeppewalther\/kinfu_segmentation,DaikiMaekawa\/pcl,mikhail-matrosov\/pcl,shangwuhencc\/pcl,mikhail-matrosov\/pcl,krips89\/pcl_newfeatures,ResByte\/pcl,closerbibi\/pcl,ResByte\/pcl,ResByte\/pcl,mikhail-matrosov\/pcl,cascheberg\/pcl,cascheberg\/pcl,chenxingzhe\/pcl,kanster\/pcl,raydtang\/pcl,shivmalhotra\/pcl,zhangxaochen\/pcl,starius\/pcl,closerbibi\/pcl,sbec\/pcl,chenxingzhe\/pcl,the-glu\/pcl,fanxiaochen\/mypcltest,zhangxaochen\/pcl,drmateo\/pcl,srbhprajapati\/pcl,ResByte\/pcl,MMiknis\/pcl,krips89\/pcl_newfeatures,pkuhto\/pcl,the-glu\/pcl,shyamalschandra\/pcl,locnx1984\/pcl,RufaelDev\/pcc-mp3dg,zavataafnan\/pcl-truck,closerbibi\/pcl,fskuka\/pcl,stfuchs\/pcl,3dtof\/pcl,starius\/pcl,fskuka\/pcl,shyamalschandra\/pcl,lebronzhang\/pcl,kanster\/pcl,RufaelDev\/pcc-mp3dg,zavataafnan\/pcl-truck,stfuchs\/pcl,nikste\/pcl,fanxiaochen\/mypcltest,jeppewalther\/kinfu_segmentation,krips89\/pcl_newfeatures,zhangxaochen\/pcl,KevenRing\/vlp,soulsheng\/pcl,MMiknis\/pcl,DaikiMaekawa\/pcl,nh2\/pcl,drmateo\/pcl,stefanbuettner\/pcl,kanster\/pcl,ipa-rmb\/pcl,shivmalhotra\/pcl,DaikiMaekawa\/pcl,fskuka\/pcl,srbhprajapati\/pcl,KevenRing\/pcl,fskuka\/pcl,wgapl\/pcl,damienjadeduff\/pcl,nikste\/pcl,shivmalhotra\/pcl,damienjadeduff\/pcl,soulsheng\/pcl,starius\/pcl,msalvato\/pcl_kinfu_highres,MMiknis\/pcl,3dtof\/pcl,lydhr\/pcl,chatchavan\/pcl,nikste\/pcl,wgapl\/pcl,Nerei\/pcl_old_repo,MMiknis\/pcl,shivmalhotra\/pcl,nh2\/pcl,RufaelDev\/pcc-mp3dg,chatchavan\/pcl,shangwuhencc\/pcl,mschoeler\/pcl,closerbibi\/pcl,ipa-rmb\/pcl,fanxiaochen\/mypcltest,raydtang\/pcl,lebronzhang\/pcl,srbhprajapati\/pcl,raydtang\/pcl,drmateo\/pcl,nh2\/pcl,sbec\/pcl,nikste\/pcl,closerbibi\/pcl,KevenRing\/vlp,mschoeler\/pcl,chenxingzhe\/pcl,KevenRing\/pcl,jakobwilm\/pcl,jakobwilm\/pcl,zhangxaochen\/pcl,the-glu\/pcl,lebronzhang\/pcl,wgapl\/pcl,jeppewalther\/kinfu_segmentation,LZRS\/pcl,pkuhto\/pcl,stefanbuettner\/pcl,zhangxaochen\/pcl,zavataafnan\/pcl-truck,lydhr\/pcl,simonleonard\/pcl,jeppewalther\/kinfu_segmentation,stfuchs\/pcl,jakobwilm\/pcl,v4hn\/pcl,shyamalschandra\/pcl,mikhail-matrosov\/pcl,v4hn\/pcl,v4hn\/pcl,fanxiaochen\/mypcltest,lebronzhang\/pcl,mschoeler\/pcl,msalvato\/pcl_kinfu_highres,drmateo\/pcl,stefanbuettner\/pcl,stefanbuettner\/pcl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- kdtree\/include\/pcl\/kdtree\/kdtree.h\n+++ kdtree\/include\/pcl\/kdtree\/kdtree.h\n@@ -167,7 +167,7 @@\n typedef typename pcl::traits::fieldList<PointT>::type FieldListInT;\n typedef typename pcl::traits::fieldList<PointTDiff>::type FieldListOutT;\n typedef typename pcl::intersect<FieldListInT, FieldListOutT>::type FieldList;\n- pcl::for_each_type <FieldList> (pcl::NdConcatenateFunctor <PointT, PointTDiff> (\n+ pcl::for_each_type <FieldList> (pcl::NdConcatenateFunctor <PointTDiff, PointT> (\n point, p));\n return (nearestKSearch (p, k, k_indices, k_distances));\n }\n@@ -226,7 +226,7 @@\n typedef typename pcl::traits::fieldList<PointT>::type FieldListInT;\n typedef typename pcl::traits::fieldList<PointTDiff>::type FieldListOutT;\n typedef typename pcl::intersect<FieldListInT, FieldListOutT>::type FieldList;\n- pcl::for_each_type <FieldList> (pcl::NdConcatenateFunctor <PointT, PointTDiff> (\n+ pcl::for_each_type <FieldList> (pcl::NdConcatenateFunctor <PointTDiff, PointT> (\n point, p));\n return (radiusSearch (p, radius, k_indices, k_distances, max_nn));\n }\n"} {"commit":"14355288380e564a5c1f274b62232f03bb9b5a93","subject":"[#52] Fix formatting in neon_helper.c","message":"[#52] Fix formatting in neon_helper.c\n","repos":"emul8\/tlib,emul8\/tlib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- arch\/arm\/neon_helper.c\n+++ arch\/arm\/neon_helper.c\n@@ -52,13 +52,13 @@\n #define S8_0(x) ((int8_t)(x & 0xff))\n \n enum operation {\n-\tADD,\n-\tSUB\n+ ADD,\n+ SUB\n };\n \n enum flags {\n-\tUNSIGNED = 1,\n-\tSATURATING = 1 << 1,\n+ UNSIGNED = 1,\n+ SATURATING = 1 << 1,\n };\n \n static uint32_t qaddsub_8_common(CPUState *env, uint32_t a, uint32_t b, enum operation op, unsigned flags)\n@@ -78,14 +78,14 @@\n const int isUnsigned = flags & UNSIGNED;\n \n if(!isUnsigned) {\n-\t a0 = (int8_t)(uint8_t)a0;\n-\t a1 = (int8_t)(uint8_t)a1;\n-\t a2 = (int8_t)(uint8_t)a2;\n-\t a3 = (int8_t)(uint8_t)a3;\n-\t b0 = (int8_t)(uint8_t)b0;\n-\t b1 = (int8_t)(uint8_t)b1;\n-\t b2 = (int8_t)(uint8_t)b2;\n-\t b3 = (int8_t)(uint8_t)b3;\n+ a0 = (int8_t)(uint8_t)a0;\n+ a1 = (int8_t)(uint8_t)a1;\n+ a2 = (int8_t)(uint8_t)a2;\n+ a3 = (int8_t)(uint8_t)a3;\n+ b0 = (int8_t)(uint8_t)b0;\n+ b1 = (int8_t)(uint8_t)b1;\n+ b2 = (int8_t)(uint8_t)b2;\n+ b3 = (int8_t)(uint8_t)b3;\n }\n \n int16_t out0 = op == SUB ? a0 - b0 : a0 + b0;\n@@ -94,48 +94,48 @@\n int16_t out3 = op == SUB ? a3 - b3 : a3 + b3;\n \n if(flags & SATURATING) {\n-\t const int16_t max = isUnsigned ? UINT8_MAX : INT8_MAX;\n-\t const int16_t min = isUnsigned ? 0: INT8_MIN;\n-\n-\t if(out0 > max) {\n-\t\t saturated = 1;\n-\t\t out0 = max;\n-\t }\n-\t else if(out0 < min) {\n-\t\t saturated = 1;\n-\t\t out0 = min;\n-\t }\n-\n-\t if(out1 > max) {\n-\t\t saturated = 1;\n-\t\t out1 = max;\n-\t }\n-\t else if(out1 < min) {\n-\t\t saturated = 1;\n-\t\t out1 = min;\n-\t }\n-\n-\t if(out2 > max) {\n-\t\t saturated = 1;\n-\t\t out2 = max;\n-\t }\n-\t else if(out2 < min) {\n-\t\t saturated = 1;\n-\t\t out2 = min;\n-\t }\n-\n-\t if(out3 > max) {\n-\t\t saturated = 1;\n-\t\t out3 = max;\n-\t }\n-\t else if(out3 < min) {\n-\t\t saturated = 1;\n-\t\t out3 = min;\n-\t }\n-\n-\t if(saturated) {\n-\t\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t }\n+ const int16_t max = isUnsigned ? UINT8_MAX : INT8_MAX;\n+ const int16_t min = isUnsigned ? 0: INT8_MIN;\n+\n+ if(out0 > max) {\n+ saturated = 1;\n+ out0 = max;\n+ }\n+ else if(out0 < min) {\n+ saturated = 1;\n+ out0 = min;\n+ }\n+\n+ if(out1 > max) {\n+ saturated = 1;\n+ out1 = max;\n+ }\n+ else if(out1 < min) {\n+ saturated = 1;\n+ out1 = min;\n+ }\n+\n+ if(out2 > max) {\n+ saturated = 1;\n+ out2 = max;\n+ }\n+ else if(out2 < min) {\n+ saturated = 1;\n+ out2 = min;\n+ }\n+\n+ if(out3 > max) {\n+ saturated = 1;\n+ out3 = max;\n+ }\n+ else if(out3 < min) {\n+ saturated = 1;\n+ out3 = min;\n+ }\n+\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ }\n }\n \n return (uint8_t) out0 << 24 | (uint8_t) out1 << 16 | (uint8_t) out2 << 8 | (uint8_t) out3;\n@@ -153,52 +153,52 @@\n const int isUnsigned = flags & UNSIGNED;\n \n if(!isUnsigned) {\n-\t aHi = (int16_t)(uint16_t)aHi;\n-\t aLo = (int16_t)(uint16_t)aLo;\n-\n-\t bHi = (int16_t)(uint16_t)bHi;\n-\t bLo = (int16_t)(uint16_t)bLo;\n+ aHi = (int16_t)(uint16_t)aHi;\n+ aLo = (int16_t)(uint16_t)aLo;\n+\n+ bHi = (int16_t)(uint16_t)bHi;\n+ bLo = (int16_t)(uint16_t)bLo;\n }\n \n int32_t outHi = op == SUB ? aHi - bHi : aHi + bHi;\n int32_t outLo = op == SUB ? aLo - bLo : aLo + bLo;\n \n if(flags & SATURATING) {\n-\t const int32_t max = isUnsigned ? UINT16_MAX : INT16_MAX;\n-\t const int32_t min = isUnsigned ? 0: INT16_MIN;\n-\n-\t if(outHi > max) {\n-\t\t saturated = 1;\n-\t\t outHi = max;\n-\t }\n-\t else if(outHi < min) {\n-\t\t saturated = 1;\n-\t\t outHi = min;\n-\t }\n-\n-\t if(outLo > max) {\n-\t\t saturated = 1;\n-\t\t outLo = max;\n-\t }\n-\t else if(outLo < min) {\n-\t\t saturated = 1;\n-\t\t outLo = min;\n-\t }\n-\n-\t if(saturated) {\n-\t\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t }\n+ const int32_t max = isUnsigned ? UINT16_MAX : INT16_MAX;\n+ const int32_t min = isUnsigned ? 0: INT16_MIN;\n+\n+ if(outHi > max) {\n+ saturated = 1;\n+ outHi = max;\n+ }\n+ else if(outHi < min) {\n+ saturated = 1;\n+ outHi = min;\n+ }\n+\n+ if(outLo > max) {\n+ saturated = 1;\n+ outLo = max;\n+ }\n+ else if(outLo < min) {\n+ saturated = 1;\n+ outLo = min;\n+ }\n+\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ }\n }\n \n if(isUnsigned) {\n-\t const uint32_t ret = (uint16_t)outHi << 16 | (uint16_t)outLo;\n-\t return ret;\n+ const uint32_t ret = (uint16_t)outHi << 16 | (uint16_t)outLo;\n+ return ret;\n }\n else {\n-\t const int16_t outHi16 = outHi;\n-\t const int16_t outLo16 = outLo;\n-\t const uint32_t ret = ((uint16_t)outHi16) << 16 | (uint16_t)outLo16;\n-\t return ret;\n+ const int16_t outHi16 = outHi;\n+ const int16_t outLo16 = outLo;\n+ const uint32_t ret = ((uint16_t)outHi16) << 16 | (uint16_t)outLo16;\n+ return ret;\n }\n }\n \n@@ -232,8 +232,8 @@\n static int8_t qabs_s8(CPUState *env, int8_t a)\n {\n if(a == INT8_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT8_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT8_MAX;\n }\n \n return abs_s8(a);\n@@ -252,8 +252,8 @@\n static int16_t qabs_s16(CPUState *env, int16_t a)\n {\n if(a == INT16_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MAX;\n }\n \n return abs_s16(a);\n@@ -269,8 +269,8 @@\n uint32_t HELPER(neon_qabs_s32)(CPUState *env, uint32_t a)\n {\n if(a == INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n }\n \n return abs(a);\n@@ -279,8 +279,8 @@\n static int8_t qneg_s8(CPUState *env, int8_t a)\n {\n if(a == INT8_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT8_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT8_MAX;\n }\n \n return -a;\n@@ -299,8 +299,8 @@\n static int16_t qneg_s16(CPUState *env, int16_t a)\n {\n if(a == INT16_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MAX;\n }\n \n return -a;\n@@ -316,8 +316,8 @@\n uint32_t HELPER(neon_qneg_s32)(CPUState *env, uint32_t a)\n {\n if(a == INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n }\n \n return -a;\n@@ -393,10 +393,10 @@\n const uint8_t b3 = b & 0xff;\n \n return\n-\tabd_s8(a0, b0) << 24 |\n-\tabd_s8(a1, b1) << 16 |\n-\tabd_s8(a2, b2) << 8 |\n-\tabd_s8(a3, b3);\n+ abd_s8(a0, b0) << 24 |\n+ abd_s8(a1, b1) << 16 |\n+ abd_s8(a2, b2) << 8 |\n+ abd_s8(a3, b3);\n }\n \n uint32_t HELPER(neon_abd_u16)(uint32_t a, uint32_t b)\n@@ -443,7 +443,7 @@\n \n uint32_t HELPER(neon_abd_u32)(uint32_t a, uint32_t b)\n {\n-\treturn a > b ? a - b : b - a;\n+ return a > b ? a - b : b - a;\n }\n \n uint32_t HELPER(neon_abd_s32)(int32_t a, int32_t b)\n@@ -466,42 +466,42 @@\n \n uint32_t HELPER(neon_add_u8)(uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(NULL, a, b, ADD, UNSIGNED);\n+ return qaddsub_8_common(NULL, a, b, ADD, UNSIGNED);\n }\n \n uint32_t HELPER(neon_add_u16)(uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(NULL, a, b, ADD, UNSIGNED);\n+ return qaddsub_16_common(NULL, a, b, ADD, UNSIGNED);\n }\n \n uint32_t HELPER(neon_sub_u8)(uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(NULL, a, b, SUB, UNSIGNED);\n+ return qaddsub_8_common(NULL, a, b, SUB, UNSIGNED);\n }\n \n uint32_t HELPER(neon_sub_u16)(uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(NULL, a, b, SUB, UNSIGNED);\n+ return qaddsub_16_common(NULL, a, b, SUB, UNSIGNED);\n }\n \n uint32_t HELPER(neon_qadd_s8)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(env, a, b, ADD, SATURATING);\n+ return qaddsub_8_common(env, a, b, ADD, SATURATING);\n }\n \n uint32_t HELPER(neon_qadd_u8)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(env, a, b, ADD, SATURATING | UNSIGNED);\n+ return qaddsub_8_common(env, a, b, ADD, SATURATING | UNSIGNED);\n }\n \n uint32_t HELPER(neon_qadd_s16)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(env, a, b, ADD, SATURATING);\n+ return qaddsub_16_common(env, a, b, ADD, SATURATING);\n }\n \n uint32_t HELPER(neon_qadd_u16)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(env, a, b, ADD, SATURATING | UNSIGNED);\n+ return qaddsub_16_common(env, a, b, ADD, SATURATING | UNSIGNED);\n }\n \n uint32_t HELPER(neon_qadd_s32)(CPUState *env, uint32_t a, uint32_t b)\n@@ -510,18 +510,18 @@\n const int32_t bs = b;\n \n if(as > 0 && bs > 0) {\n-\tconst int saturated = bs > INT32_MAX - as;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT32_MAX;\n-\t}\n+ const int saturated = bs > INT32_MAX - as;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n+ }\n }\n else if(as < 0 && bs < 0) {\n-\tconst int saturated = bs < INT32_MIN - as;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT32_MIN;\n-\t}\n+ const int saturated = bs < INT32_MIN - as;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MIN;\n+ }\n }\n \n return as + bs;\n@@ -532,8 +532,8 @@\n const int saturated = b > UINT32_MAX - a;\n \n if(saturated) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT32_MAX;\n }\n \n return a + b;\n@@ -544,8 +544,8 @@\n const int saturated = b > UINT64_MAX - a;\n \n if(saturated) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT64_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT64_MAX;\n }\n \n return a + b;\n@@ -557,18 +557,18 @@\n const int64_t bs = b;\n \n if(as > 0 && bs > 0) {\n-\tconst int saturated = bs > INT64_MAX - as;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT64_MAX;\n-\t}\n+ const int saturated = bs > INT64_MAX - as;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MAX;\n+ }\n }\n else if(as < 0 && bs < 0) {\n-\tconst int saturated = bs < INT64_MIN - as;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT64_MIN;\n-\t}\n+ const int saturated = bs < INT64_MIN - as;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MIN;\n+ }\n }\n \n return as + bs;\n@@ -576,22 +576,22 @@\n \n uint32_t HELPER(neon_qsub_u8)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(env, a, b, SUB, SATURATING | UNSIGNED);\n+ return qaddsub_8_common(env, a, b, SUB, SATURATING | UNSIGNED);\n }\n \n uint32_t HELPER(neon_qsub_s8)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_8_common(env, a, b, SUB, SATURATING);\n+ return qaddsub_8_common(env, a, b, SUB, SATURATING);\n }\n \n uint32_t HELPER(neon_qsub_u16)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(env, a, b, SUB, SATURATING | UNSIGNED);\n+ return qaddsub_16_common(env, a, b, SUB, SATURATING | UNSIGNED);\n }\n \n uint32_t HELPER(neon_qsub_s16)(CPUState *env, uint32_t a, uint32_t b)\n {\n-\treturn qaddsub_16_common(env, a, b, SUB, SATURATING);\n+ return qaddsub_16_common(env, a, b, SUB, SATURATING);\n }\n \n uint32_t HELPER(neon_qsub_u32)(CPUState *env, uint32_t a, uint32_t b)\n@@ -599,8 +599,8 @@\n const int saturated = b > a;\n \n if(saturated) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return a - b;\n@@ -612,18 +612,18 @@\n const int32_t bs = b;\n \n if(as > 0 && bs < 0) {\n-\tconst int saturated = as > INT32_MAX + bs;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT32_MAX;\n-\t}\n+ const int saturated = as > INT32_MAX + bs;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n+ }\n }\n else if(as < 0 && bs > 0) {\n-\tconst int saturated = as < INT32_MIN + bs;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT32_MIN;\n-\t}\n+ const int saturated = as < INT32_MIN + bs;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MIN;\n+ }\n }\n \n return as - bs;\n@@ -634,8 +634,8 @@\n const int saturated = b > a;\n \n if(saturated) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return a - b;\n@@ -647,18 +647,18 @@\n const int64_t bs = b;\n \n if(as > 0 && bs < 0) {\n-\tconst int saturated = as > INT64_MAX + bs;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT64_MAX;\n-\t}\n+ const int saturated = as > INT64_MAX + bs;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MAX;\n+ }\n }\n else if(as < 0 && bs > 0) {\n-\tconst int saturated = as < INT64_MIN + bs;\n-\tif(saturated) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return INT64_MIN;\n-\t}\n+ const int saturated = as < INT64_MIN + bs;\n+ if(saturated) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MIN;\n+ }\n }\n \n return as - bs;\n@@ -847,7 +847,7 @@\n {\n int32_t diff = ((int32_t)a - (int32_t)b);\n if(diff < 0) {\n-\tdiff -= 1;\n+ diff -= 1;\n }\n const int32_t hdiff = diff \/ 2;\n return hdiff >= 0 ? hdiff : UINT16_MAX + 1 + hdiff;\n@@ -870,7 +870,7 @@\n {\n int64_t diff = ((int64_t)a - (int64_t)b);\n if(diff < 0) {\n-\tdiff -= 1;\n+ diff -= 1;\n }\n const int64_t hdiff = diff \/ 2;\n return hdiff >= 0 ? hdiff : UINT32_MAX + 1 + hdiff;\n@@ -1193,13 +1193,13 @@\n }\n \n if(b >= 0) {\n-\treturn au << b;\n+ return au << b;\n }\n else if(a >= 0) {\n-\treturn au >> -b;\n+ return au >> -b;\n }\n else { \/\/ sign extend when right-shifting negative\n-\treturn (au >> -b) | (0xffffffffu << ((8 * ((int)sizeof a)) + b));\n+ return (au >> -b) | (0xffffffffu << ((8 * ((int)sizeof a)) + b));\n }\n }\n \n@@ -1212,9 +1212,9 @@\n {\n \/\/ Shifting by the word size or more is undefined in C.\n if(abs(b) >= 8 * sizeof a) {\n- return 0;\n- }\n- return b >= 0 ? a << b : a >> -b;\n+ return 0;\n+ }\n+ return b >= 0 ? a << b : a >> -b;\n }\n \n uint32_t HELPER(neon_shl_u32)(uint32_t a, uint32_t b)\n@@ -1228,17 +1228,17 @@\n \n \/\/ Shifting by the word size or more is undefined in C.\n if(abs(b) >= 8 * ((int)sizeof a)) {\n-\treturn b < 0 && a < 0 ? 0xffffffffffffffffu : 0;\n+ return b < 0 && a < 0 ? 0xffffffffffffffffu : 0;\n }\n \n if(b >= 0) {\n-\treturn au << b;\n+ return au << b;\n }\n else if(a >= 0) {\n-\treturn au >> -b;\n+ return au >> -b;\n }\n else { \/\/ sign extend when right-shifting negative\n-\treturn (au >> -b) | (0xffffffffffffffffu << ((8 * ((int)sizeof a)) + b));\n+ return (au >> -b) | (0xffffffffffffffffu << ((8 * ((int)sizeof a)) + b));\n }\n }\n \n@@ -1310,7 +1310,7 @@\n uint16_t ret = shl_s16(a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += au >> (-b - 1) & 1;\n+ ret += au >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1328,7 +1328,7 @@\n uint16_t ret = shl_u16(a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += a >> (-b - 1) & 1;\n+ ret += a >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1347,7 +1347,7 @@\n uint32_t ret = shl_s32(a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1359,7 +1359,7 @@\n uint32_t ret = shl_u32(a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1371,7 +1371,7 @@\n uint64_t ret = shl_s64(a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1383,7 +1383,7 @@\n uint64_t ret = shl_u64(a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1490,9 +1490,9 @@\n {\n uint32_t result = shl_u16(a, b);\n if(result > UINT16_MAX) {\n-\t\/\/ Saturated?\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT16_MAX;\n+ \/\/ Saturated?\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT16_MAX;\n }\n \n return result;\n@@ -1508,19 +1508,19 @@\n static int32_t qshl_s32(CPUState *env, int32_t a, int8_t b)\n {\n if(b > 0) {\n-\tconst uint32_t mask = (INT32_MAX << (8 * sizeof a - b - 1)) & INT32_MAX;\n-\tif(a >= 0) {\n-\t if((b >= 8 * sizeof a) || (a & mask)) {\n-\t\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t\treturn INT32_MAX;\n-\t }\n-\t}\n-\telse { \/\/ a < 0\n-\t if((b >= 8 * sizeof a) || (~a & mask)) {\n-\t\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t\treturn INT32_MIN;\n-\t }\n-\t}\n+ const uint32_t mask = (INT32_MAX << (8 * sizeof a - b - 1)) & INT32_MAX;\n+ if(a >= 0) {\n+ if((b >= 8 * sizeof a) || (a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n+ }\n+ }\n+ else { \/\/ a < 0\n+ if((b >= 8 * sizeof a) || (~a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MIN;\n+ }\n+ }\n }\n \n return shl_s32(a, b);\n@@ -1534,12 +1534,12 @@\n static uint32_t qshl_u32(CPUState *env, uint32_t a, int8_t b)\n {\n if(b > 0) {\n-\t\/\/ Saturated?\n-\tconst uint32_t mask = UINT32_MAX << (8 * sizeof a - b);\n-\tif((b >= 8 * sizeof a) || (a & mask)) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return UINT32_MAX;\n-\t}\n+ \/\/ Saturated?\n+ const uint32_t mask = UINT32_MAX << (8 * sizeof a - b);\n+ if((b >= 8 * sizeof a) || (a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT32_MAX;\n+ }\n }\n \n return shl_u32(a, b);\n@@ -1553,19 +1553,19 @@\n static int64_t qshl_s64(CPUState *env, int64_t a, int8_t b)\n {\n if(b > 0) {\n-\tconst uint64_t mask = (INT64_MAX << (8 * sizeof a - b - 1)) & INT64_MAX;\n-\tif(a >= 0) {\n-\t if((b >= 8 * sizeof a) || (a & mask)) {\n-\t\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t\treturn INT64_MAX;\n-\t }\n-\t}\n-\telse { \/\/ a < 0\n-\t if((b >= 8 * sizeof a) || (~a & mask)) {\n-\t\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t\treturn INT64_MIN;\n-\t }\n-\t}\n+ const uint64_t mask = (INT64_MAX << (8 * sizeof a - b - 1)) & INT64_MAX;\n+ if(a >= 0) {\n+ if((b >= 8 * sizeof a) || (a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MAX;\n+ }\n+ }\n+ else { \/\/ a < 0\n+ if((b >= 8 * sizeof a) || (~a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT64_MIN;\n+ }\n+ }\n }\n \n return shl_s64(a, b);\n@@ -1579,12 +1579,12 @@\n static uint64_t qshl_u64(CPUState *env, uint64_t a, int8_t b)\n {\n if(b > 0) {\n-\t\/\/ Saturated?\n-\tconst uint64_t mask = UINT64_MAX << (8 * sizeof a - b);\n-\tif((b >= 8 * sizeof a) || (a & mask)) {\n-\t env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\t return UINT64_MAX;\n-\t}\n+ \/\/ Saturated?\n+ const uint64_t mask = UINT64_MAX << (8 * sizeof a - b);\n+ if((b >= 8 * sizeof a) || (a & mask)) {\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT64_MAX;\n+ }\n }\n \n return shl_u64(a, b);\n@@ -1598,8 +1598,8 @@\n static uint8_t qshlu_s8(CPUState *env, int8_t a, uint8_t b)\n {\n if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return qshl_u8(env, a, b);\n@@ -1619,8 +1619,8 @@\n static int16_t qshlu_s16(CPUState *env, int16_t a, int8_t b)\n {\n if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return qshl_u16(env, a, b);\n@@ -1636,8 +1636,8 @@\n static int32_t qshlu_s32(CPUState *env, int32_t a, int8_t b)\n {\n if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return qshl_u32(env, a, b);\n@@ -1651,8 +1651,8 @@\n static int64_t qshlu_s64(CPUState *env, int64_t a, int8_t b)\n {\n if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return qshl_u64(env, a, b);\n@@ -1669,7 +1669,7 @@\n uint8_t ret = qshl_s8(env, a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += au >> (-b - 1) & 1;\n+ ret += au >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1690,7 +1690,7 @@\n uint8_t ret = qshl_u8(env, a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += a >> (-b - 1) & 1;\n+ ret += a >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1712,7 +1712,7 @@\n uint16_t ret = qshl_s16(env, a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += au >> (-b - 1) & 1;\n+ ret += au >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1730,7 +1730,7 @@\n uint16_t ret = qshl_u16(env, a, b);\n \n if(b < 0 && -b <= 8 * sizeof a) {\n-\tret += a >> (-b - 1) & 1;\n+ ret += a >> (-b - 1) & 1;\n }\n \n return ret;\n@@ -1749,7 +1749,7 @@\n uint32_t ret = qshl_s32(env, a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1761,7 +1761,7 @@\n uint32_t ret = qshl_u32(env, a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1773,7 +1773,7 @@\n uint64_t ret = qshl_s64(env, a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1785,7 +1785,7 @@\n uint64_t ret = qshl_u64(env, a, b);\n \n if(bs < 0 && -bs <= 8 * sizeof a) {\n-\tret += a >> (-bs - 1) & 1;\n+ ret += a >> (-bs - 1) & 1;\n }\n \n return ret;\n@@ -1795,8 +1795,8 @@\n {\n uint8_t count = 0;\n while((a & 0x80) == 0 && count < 8) {\n-\ta <<= 1;\n-\tcount++;\n+ a <<= 1;\n+ count++;\n }\n return count;\n }\n@@ -1815,8 +1815,8 @@\n {\n uint16_t count = 0;\n while((a & 0x8000) == 0 && count < 16) {\n-\ta <<= 1;\n-\tcount++;\n+ a <<= 1;\n+ count++;\n }\n return count;\n }\n@@ -1833,8 +1833,8 @@\n uint8_t count = 0;\n const uint8_t sign = !!(a & 0x80);\n while(!!(a & 0x40) == sign && count < 7) {\n-\ta <<= 1;\n-\tcount++;\n+ a <<= 1;\n+ count++;\n }\n return count;\n }\n@@ -1854,8 +1854,8 @@\n uint16_t count = 0;\n const uint16_t sign = !!(a & 0x8000);\n while(!!(a & 0x4000) == sign && count < 15) {\n-\ta <<= 1;\n-\tcount++;\n+ a <<= 1;\n+ count++;\n }\n return count;\n }\n@@ -1872,8 +1872,8 @@\n uint32_t count = 0;\n const uint32_t sign = !!(a & 0x80000000);\n while(!!(a & 0x40000000) == sign && count < 31) {\n-\ta <<= 1;\n-\tcount++;\n+ a <<= 1;\n+ count++;\n }\n return count;\n }\n@@ -1883,8 +1883,8 @@\n int i;\n uint8_t count = 0;\n for(i = 0; i < 8; i++) {\n-\tcount += a & 1;\n-\ta >>= 1;\n+ count += a & 1;\n+ a >>= 1;\n }\n return count;\n }\n@@ -2111,8 +2111,8 @@\n static int16_t qdmulh_s16(CPUState *env, int16_t a, int16_t b)\n {\n if(a == INT16_MIN && b == INT16_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MAX;\n }\n \n return (a * b * 2) >> 16;\n@@ -2131,8 +2131,8 @@\n const int64_t b64 = b;\n \n if(a == INT32_MIN && b == INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n }\n \n return (a64 * b64 * 2) >> 32;\n@@ -2146,8 +2146,8 @@\n static int16_t qrdmulh_s16(CPUState *env, int16_t a, int16_t b)\n {\n if(a == INT16_MIN && b == INT16_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MAX;\n }\n \n const int32_t prod = a * b * 2;\n@@ -2165,8 +2165,8 @@\n static int32_t qrdmulh_s32(CPUState *env, int32_t a, int32_t b)\n {\n if(a == INT32_MIN && b == INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n }\n \n const int64_t prod = (int64_t) a * (int64_t) b * 2;\n@@ -2320,9 +2320,9 @@\n int i;\n uint16_t ret = 0;\n for(i = 0; i < 8; i++) {\n-\tif(b & (1 << i)) {\n-\t ret ^= a << i;\n-\t}\n+ if(b & (1 << i)) {\n+ ret ^= a << i;\n+ }\n }\n return ret;\n }\n@@ -2444,12 +2444,12 @@\n static int8 narrow_sat_s8(CPUState *env, int16_t a)\n {\n if(a > INT8_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT8_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT8_MAX;\n }\n else if(a < INT8_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT8_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT8_MIN;\n }\n \n return a;\n@@ -2468,8 +2468,8 @@\n static uint8 narrow_sat_u8(CPUState *env, uint16_t a)\n {\n if(a > UINT8_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT8_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT8_MAX;\n }\n \n return a;\n@@ -2488,12 +2488,12 @@\n static int16_t narrow_sat_s16(CPUState *env, int32_t a)\n {\n if(a > INT16_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MAX;\n }\n else if(a < INT16_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT16_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT16_MIN;\n }\n \n return a;\n@@ -2510,8 +2510,8 @@\n static uint16_t narrow_sat_u16(CPUState *env, uint32_t a)\n {\n if(a > UINT16_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT16_MAX;\n }\n \n return a;\n@@ -2530,12 +2530,12 @@\n const int64_t sa = a;\n \n if(sa > INT32_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MAX;\n }\n else if(sa < INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn INT32_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return INT32_MIN;\n }\n \n return a;\n@@ -2544,8 +2544,8 @@\n uint32_t HELPER(neon_narrow_sat_u32)(CPUState *env, uint64_t a)\n {\n if(a > UINT32_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT32_MAX;\n }\n \n return a;\n@@ -2554,12 +2554,12 @@\n static uint8 unarrow_sat8(CPUState *env, int16_t a)\n {\n if(a > UINT8_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT8_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT8_MAX;\n }\n else if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return a;\n@@ -2578,12 +2578,12 @@\n static uint16 unarrow_sat16(CPUState *env, int32_t a)\n {\n if(a > UINT16_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT16_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT16_MAX;\n }\n else if(a < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return a;\n@@ -2602,12 +2602,12 @@\n const int64_t sa = a;\n \n if(sa > UINT32_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn UINT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return UINT32_MAX;\n }\n else if(sa < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\treturn 0;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ return 0;\n }\n \n return a;\n@@ -2619,21 +2619,21 @@\n int64_t lo = (int64_t)S32_0(a) + (int64_t)S32_0(b);\n \n if(hi > INT32_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\thi = INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ hi = INT32_MAX;\n }\n else if (hi < INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\thi = INT32_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ hi = INT32_MIN;\n }\n \n if(lo > INT32_MAX) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\tlo = INT32_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ lo = INT32_MAX;\n }\n else if (lo < INT32_MIN) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\tlo = INT32_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ lo = INT32_MIN;\n }\n \n const uint32_t hi32 = hi;\n@@ -2650,12 +2650,12 @@\n int64_t sum = sa + sb;\n \n if(sa > 0 && sb > 0 && sum < 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\tsum = INT64_MAX;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ sum = INT64_MAX;\n }\n else if(sa < 0 && sb < 0 && sum > 0) {\n-\tenv->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n-\tsum = INT64_MIN;\n+ env->vfp.xregs[ARM_VFP_FPSCR] |= CPSR_Q;\n+ sum = INT64_MIN;\n }\n \n return sum;\n"} {"commit":"963ae00fc3236b99df41c6cca8d628f39c79b60b","subject":"Tidy up kshell messages","message":"Tidy up kshell messages\n","repos":"sam-truscott\/tinker-kernel,sam-truscott\/tinker-kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/src\/kernel\/c\/shell\/kshell.c\n+++ kernel\/src\/kernel\/c\/shell\/kshell.c\n@@ -127,7 +127,7 @@\n \tkshell->ksh_input_pointer = 0;\n \tbool_t running = true;\n \n-\tprint_out(\"KSHELL\\n\");\n+\tprint_out(\"Tinker Shell: Starting...\\n\");\n \tprint_out(\"Commands: procs, tasks, objects, mem\\n\");\n \n \ttinker_pipe_t pipe;\n@@ -144,6 +144,7 @@\n \t\treturn;\n \t}\n \n+\tprint_out(\"Tinker Shell: Ready\\n\");\n \twhile (running)\n \t{\n \t\tchar * received = NULL;\n@@ -165,7 +166,7 @@\n \t\t\t\tprintp_out(\"KSHELL Failed to ack packet with error %d\\n\", ack);\n \t\t\t}\n \t\t\tuint16_t p = 0;\n-\t\t\twhile(p != (*bytesReceived))\n+\t\t\twhile (p != (*bytesReceived))\n \t\t\t{\n \t\t\t\tkshell->ksh_input_buffer[kshell->ksh_input_pointer++] = received[p++];\n \t\t\t}\n@@ -185,6 +186,7 @@\n \t\t\t\t\t\tkshell_execute_command(kshell->ksh_input_buffer);\n \t\t\t\t\t\tkshell->ksh_input_pointer = 0;\n \t\t\t\t\t\tutil_memset(kshell->ksh_input_buffer, 0, MAX_LINE_INPUT);\n+\t\t\t\t\t\tprint_out(\"> \");\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n"} {"commit":"c4add2e537e6f60048dce8dc518254e7e605301d","subject":"[IA64] rename ioremap variables to match i386","message":"[IA64] rename ioremap variables to match i386\n\nNo functional change, just use the same names as i386.\n\nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nSigned-off-by: Tony Luck <e7984595ec0368ff920a7b3521dc7093683f6f26@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/ia64\/mm\/ioremap.c\n+++ arch\/ia64\/mm\/ioremap.c\n@@ -14,13 +14,13 @@\n #include <asm\/meminit.h>\n \n static inline void __iomem *\n-__ioremap (unsigned long offset, unsigned long size)\n+__ioremap (unsigned long phys_addr, unsigned long size)\n {\n-\treturn (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);\n+\treturn (void __iomem *) (__IA64_UNCACHED_OFFSET | phys_addr);\n }\n \n void __iomem *\n-ioremap (unsigned long offset, unsigned long size)\n+ioremap (unsigned long phys_addr, unsigned long size)\n {\n \tu64 attr;\n \tunsigned long gran_base, gran_size;\n@@ -30,31 +30,31 @@\n \t * as the rest of the kernel. For more details, see\n \t * Documentation\/ia64\/aliasing.txt.\n \t *\/\n-\tattr = kern_mem_attribute(offset, size);\n+\tattr = kern_mem_attribute(phys_addr, size);\n \tif (attr & EFI_MEMORY_WB)\n-\t\treturn (void __iomem *) phys_to_virt(offset);\n+\t\treturn (void __iomem *) phys_to_virt(phys_addr);\n \telse if (attr & EFI_MEMORY_UC)\n-\t\treturn __ioremap(offset, size);\n+\t\treturn __ioremap(phys_addr, size);\n \n \t\/*\n \t * Some chipsets don't support UC access to memory. If\n \t * WB is supported for the whole granule, we prefer that.\n \t *\/\n-\tgran_base = GRANULEROUNDDOWN(offset);\n-\tgran_size = GRANULEROUNDUP(offset + size) - gran_base;\n+\tgran_base = GRANULEROUNDDOWN(phys_addr);\n+\tgran_size = GRANULEROUNDUP(phys_addr + size) - gran_base;\n \tif (efi_mem_attribute(gran_base, gran_size) & EFI_MEMORY_WB)\n-\t\treturn (void __iomem *) phys_to_virt(offset);\n+\t\treturn (void __iomem *) phys_to_virt(phys_addr);\n \n-\treturn __ioremap(offset, size);\n+\treturn __ioremap(phys_addr, size);\n }\n EXPORT_SYMBOL(ioremap);\n \n void __iomem *\n-ioremap_nocache (unsigned long offset, unsigned long size)\n+ioremap_nocache (unsigned long phys_addr, unsigned long size)\n {\n-\tif (kern_mem_attribute(offset, size) & EFI_MEMORY_WB)\n+\tif (kern_mem_attribute(phys_addr, size) & EFI_MEMORY_WB)\n \t\treturn NULL;\n \n-\treturn __ioremap(offset, size);\n+\treturn __ioremap(phys_addr, size);\n }\n EXPORT_SYMBOL(ioremap_nocache);\n"} {"commit":"0302357aa94f84e1f6dadd1dd56ce0632a5d72ce","subject":"it helps to actually assign result_ts when you create them","message":"it helps to actually assign result_ts when you create them\n","repos":"globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- xio\/src\/globus_xio_system_select.c\n+++ xio\/src\/globus_xio_system_select.c\n@@ -2683,7 +2683,7 @@\n to = (globus_sockaddr_t *) globus_malloc(sizeof(globus_sockaddr_t));\n if(!to)\n {\n- GlobusXIOErrorMemory(\"to\");\n+ result = GlobusXIOErrorMemory(\"to\");\n goto error_to;\n }\n GlobusLibcSockaddrCopy(*to, *u_to, sizeof(globus_sockaddr_t));\n"} {"commit":"0ac2058f686a19fe8ab25c4f3104fc1580dce7cf","subject":"tracing\/filters: strloc should be unsigned short","message":"tracing\/filters: strloc should be unsigned short\n\nI forgot to update filter code accordingly in\n\"tracing\/events: change the type of __str_loc_item to unsigned short\"\n(commt b0aae68cc5508f3c2fbf728988c954db4c8b8a53)\n\nIt can cause system crash:\n\n # echo 1 > tracing\/events\/irq\/irq_handler_entry\/enable\n # echo 'name == eth0' > tracing\/events\/irq\/irq_handler_entry\/filter\n\n[ Impact: fix crash while filtering on __string() field ]\n\nAcked-by: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nSigned-off-by: Li Zefan <5dc16b054e85ffba6c8d314d8e55ae95dcab12a5@cn.fujitsu.com>\nLKML-Reference: <a682563d85925a996d9dbc880b3e95773e898279@cn.fujitsu.com>\nSigned-off-by: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/trace\/trace_events_filter.c\n+++ kernel\/trace\/trace_events_filter.c\n@@ -178,7 +178,7 @@\n static int filter_pred_strloc(struct filter_pred *pred, void *event,\n \t\t\t int val1, int val2)\n {\n-\tint str_loc = *(int *)(event + pred->offset);\n+\tunsigned short str_loc = *(unsigned short *)(event + pred->offset);\n \tchar *addr = (char *)(event + str_loc);\n \tint cmp, match;\n \n"} {"commit":"446f111a46406c449278e2ed88094f399e809001","subject":"plug sys.resources.SITE.MDS.connected in","message":"plug sys.resources.SITE.MDS.connected in\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mount_slash\/ctl_cli.c\n+++ mount_slash\/ctl_cli.c\n@@ -699,7 +699,7 @@\n }\n \n int\n-mslctl_resfieldi_connected(int fd, struct psc_ctlmsghdr *mh,\n+mslctl_resfield_connected(int fd, struct psc_ctlmsghdr *mh,\n struct psc_ctlmsg_param *pcp, char **levels, int nlevels, int set,\n struct sl_resource *r)\n {\n@@ -707,24 +707,27 @@\n \tstruct sl_resm *m;\n \tchar nbuf[8];\n \n+\tif (set && strcmp(pcp->pcp_value, \"0\") &&\n+\t strcmp(pcp->pcp_value, \"1\"))\n+\t\treturn (psc_ctlsenderr(fd, mh,\n+\t\t \"connected: invalid value\"));\n+\n \tm = res_getmemb(r);\n \tif (set) {\n-\t\tif (strcmp(pcp->pcp_value, \"0\") == 0) {\n+\t\tif (r->res_type == SLREST_MDS)\n \t\t\tcsvc = slc_geticsvc_nb(m);\n-\t\t\tif (csvc) {\n-\t\t\t\tsl_csvc_disconnect(csvc);\n-\t\t\t\tsl_csvc_decref(csvc);\n-\t\t\t}\n-\t\t} else if (strcmp(pcp->pcp_value, \"1\") == 0) {\n-\t\t\tcsvc = slc_geticsvc_nb(m);\n-\t\t\tif (csvc)\n-\t\t\t\tsl_csvc_decref(csvc);\n-\t\t} else\n-\t\t\treturn (psc_ctlsenderr(fd, mh,\n-\t\t\t \"connected: invalid value\"));\n+\t\telse\n+\t\t\tcsvc = slc_getmcsvc_nb(m);\n+\t\tif (strcmp(pcp->pcp_value, \"0\") == 0 && csvc)\n+\t\t\tsl_csvc_disconnect(csvc);\n+\t\tif (csvc)\n+\t\t\tsl_csvc_decref(csvc);\n \t\treturn (1);\n \t}\n-\tcsvc = slc_geticsvcf(m, CSVCF_NONBLOCK | CSVCF_NORECON);\n+\tif (r->res_type == SLREST_MDS)\n+\t\tcsvc = slc_geticsvcf(m, CSVCF_NONBLOCK | CSVCF_NORECON);\n+\telse\n+\t\tcsvc = slc_getmcsvcf(m, CSVCF_NONBLOCK | CSVCF_NORECON);\n \tsnprintf(nbuf, sizeof(nbuf), \"%d\", csvc ? 1 : 0);\n \tif (csvc)\n \t\tsl_csvc_decref(csvc);\n@@ -752,10 +755,13 @@\n \t levels, nlevels, nbuf));\n }\n \n-const struct slctl_res_field slctl_resmds_fields[] = { { NULL, NULL } };\n+const struct slctl_res_field slctl_resmds_fields[] = {\n+\t{ \"connected\",\t\tmslctl_resfield_connected },\n+\t{ NULL, NULL }\n+};\n \n const struct slctl_res_field slctl_resios_fields[] = {\n-\t{ \"connected\",\t\tmslctl_resfieldi_connected },\n+\t{ \"connected\",\t\tmslctl_resfield_connected },\n \t{ \"infl_rpcs\",\t\tmslctl_resfieldi_infl_rpcs },\n \t{ NULL, NULL }\n };\n"} {"commit":"18aa1ed3bf3c8338e1215900d3b70c92813b34e8","subject":"don't allocate memory under spinlock","message":"don't allocate memory under spinlock\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mount_slash\/pgcache.c\n+++ mount_slash\/pgcache.c\n@@ -572,6 +572,7 @@\n \t\t * We don't want to keep the lock for too long.\n \t\t *\/\n \t\tnitems = 3;\n+\tpsc_dynarray_ensurelen(&a, nitems);\n \tLIST_CACHE_FOREACH_SAFE(e, t, &msl_lru_pages) {\n \t\tif (!BMPCE_TRYLOCK(e))\n \t\t\tcontinue;\n"} {"commit":"234784038a845fbe37ad524e06bf9fb8a545d198","subject":"Removed unused macro.","message":"Removed unused macro.\n\n\ngit-svn-id: 7f95794b11232dbd4e9b1889d0a0f47808cff85a@214 bdc45a6f-1a19-0410-8385-c3db3a2b84f1\n","repos":"rpavlik\/cppdom-old-fork,rpavlik\/cppdom-old-fork,rpavlik\/cppdom-old-fork,rpavlik\/cppdom-old-fork","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cppdom\/cppdom\/config.h\n+++ cppdom\/cppdom\/config.h\n@@ -69,9 +69,6 @@\n # define CPPDOM_API __declspec(dllimport)\n # endif\n \n-\/\/ includes building of the httpinstream class\n-#define CPPDOM_WITH_CUSTOM_IOSTREAM\n-\n #endif\n \n \/\/ -----------------------------------\n"} {"commit":"2ad399cf96555f483d36b7dce941b87e40d1a9bc","subject":"return reclaimed bmpce earlier","message":"return reclaimed bmpce earlier\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mount_slash\/pgcache.c\n+++ mount_slash\/pgcache.c\n@@ -559,12 +559,11 @@\n int\n bmpce_reaper(struct psc_poolmgr *m)\n {\n-\tint i, nfreed;\n+\tint nfreed;\n \tstruct bmap *b;\n \tstruct bmap_cli_info *bci;\n \tstruct bmap_pagecache *bmpc;\n \tstruct bmap_pagecache_entry *e, *tmp;\n-\tstruct psc_dynarray a = DYNARRAY_INIT;\n \tstruct psc_thread *thr;\n \n \tthr = pscthr_get();\n@@ -572,7 +571,6 @@\n again:\n \n \tnfreed = 0;\n-\tpsc_dynarray_ensurelen(&a, psc_atomic32_read(&m->ppm_nwaiters));\n \tLIST_CACHE_LOCK(&bmpcLru);\n \tLIST_CACHE_FOREACH(bmpc, &bmpcLru) {\n \n@@ -582,6 +580,10 @@\n \n \t\tif (!BMAP_TRYLOCK(b))\n \t\t\tcontinue;\n+\t\tbmap_op_start_type(b, BMAP_OPCNT_WORK);\n+\n+\t\tbci = bmap_2_bci(b);\n+\t\tpfl_rwlock_wrlock(&bci->bci_rwlock);\n \n \t\tPLL_FOREACH_SAFE(e, tmp, &bmpc->bmpc_lru) {\n \t\t\tif (!BMPCE_TRYLOCK(e))\n@@ -596,14 +598,15 @@\n \t\t\te->bmpce_flags |= BMPCEF_TOFREE;\n \t\t\te->bmpce_flags &= ~BMPCEF_LRU;\n \t\t\tpll_remove(&bmpc->bmpc_lru, e);\n-\t\t\tpsc_dynarray_add(&a, e);\n-\t\t\tBMPCE_ULOCK(e);\n+\t\t\tbmpce_free(e, bmpc);\n+\t\t\tpsc_atomic32_dec(&b->bcm_opcnt);\n+\t\t\tpsc_assert(psc_atomic32_read(&b->bcm_opcnt));\n \n \t\t\tnfreed++;\n-\t\t\tif (nfreed >= PAGE_RECLAIM_BATCH &&\n-\t\t\t nfreed >= psc_atomic32_read(&m->ppm_nwaiters))\n+\t\t\tif (nfreed >= psc_atomic32_read(&m->ppm_nwaiters))\n \t\t\t\tbreak;\n \t\t}\n+\t\tpfl_rwlock_unlock(&bci->bci_rwlock);\n \n \t\tif (pll_nitems(&bmpc->bmpc_lru) > 0) {\n \t\t\te = pll_peekhead(&bmpc->bmpc_lru);\n@@ -613,35 +616,19 @@\n \t\t\tlc_add_sorted(&bmpcLru, bmpc, bmpc_lru_cmp);\n \t\t}\n \n-\t\tBMAP_ULOCK(b);\n-\n-\t\tif (nfreed >= PAGE_RECLAIM_BATCH &&\n-\t\t nfreed >= psc_atomic32_read(&m->ppm_nwaiters))\n+\t\tbmap_op_done_type(b, BMAP_OPCNT_WORK);\n+\n+\t\tif (nfreed >= psc_atomic32_read(&m->ppm_nwaiters))\n \t\t\tbreak;\n \t\n \t}\n \tLIST_CACHE_ULOCK(&bmpcLru);\n \n-\tDYNARRAY_FOREACH(e, i, &a) {\n- \t\tb = e->bmpce_bmap;\n-\t\tbci = bmap_2_bci(b);\n- \t\tbmpc = bmap_2_bmpc(b);\n-\n-\t\tpfl_rwlock_wrlock(&bci->bci_rwlock);\n-\t\tBMPCE_LOCK(e);\n-\t\tbmpce_free(e, bmpc);\n-\t\tpfl_rwlock_unlock(&bci->bci_rwlock);\n-\t\tbmap_op_done_type(b, BMAP_OPCNT_BMPCE);\n-\t}\n-\n-\tif (thr->pscthr_type == MSTHRT_REAP && m->ppm_nfree < 32) {\n+\tif (thr->pscthr_type == MSTHRT_REAP && m->ppm_nfree < 3) {\n \t\tpscthr_yield();\n \t\tOPSTAT_INCR(\"msl.reap-loop\");\n-\t\tpsc_dynarray_reset(&a);\n \t\tgoto again;\n \t}\n-\n-\tpsc_dynarray_free(&a);\n \n \tpsclog_diag(\"nfreed=%d, waiters=%d\", nfreed,\n \t psc_atomic32_read(&m->ppm_nwaiters));\n"} {"commit":"25d04c4742654c3a5d8fcb21e38be4dd96c269df","subject":"cpu\/esp32: fixes and cleanups of RTC timer","message":"cpu\/esp32: fixes and cleanups of RTC timer\n\n- Unecessary definitions are removed.\n\n- Since the 48-bit RTC hardware timer uses a RC oscillator as clock, it is pretty inaccurate and leads to a RTC time deviation of up to 3 seconds per minute. Therefore, a calibration during the boot time determines a correction factor for the 48-bit RTC hardware timer. Function _rtc_time_to_us uses now this correction factor and converts a raw 48-bit RTC time to a corrected time in microseconds. Thus, the 48-bit RTC timer becomes much more accurate, but it can't still reach the accuracy of the PLL driven 64-bit system timer. The Advantage of using RTC over 64-bit sydtem timer is that it also continues in deep sleep mode and after software reset.\n\n- If the 64-bit system timer is used to emulate the RTC timer, it uses the RTC hardware timer to continue its operation after software .\n","repos":"OTAkeys\/RIOT,miri64\/RIOT,ant9000\/RIOT,mtausig\/RIOT,josephnoir\/RIOT,jasonatran\/RIOT,basilfx\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,basilfx\/RIOT,smlng\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,josephnoir\/RIOT,OTAkeys\/RIOT,yogo1212\/RIOT,kYc0o\/RIOT,x3ro\/RIOT,x3ro\/RIOT,josephnoir\/RIOT,toonst\/RIOT,yogo1212\/RIOT,mtausig\/RIOT,smlng\/RIOT,OTAkeys\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,josephnoir\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,yogo1212\/RIOT,jasonatran\/RIOT,toonst\/RIOT,x3ro\/RIOT,toonst\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,kaspar030\/RIOT,miri64\/RIOT,kaspar030\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,smlng\/RIOT,mtausig\/RIOT,x3ro\/RIOT,ant9000\/RIOT,toonst\/RIOT,jasonatran\/RIOT,smlng\/RIOT,ant9000\/RIOT,x3ro\/RIOT,miri64\/RIOT,toonst\/RIOT,kYc0o\/RIOT,mtausig\/RIOT,basilfx\/RIOT,josephnoir\/RIOT,basilfx\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,OlegHahm\/RIOT,yogo1212\/RIOT,ant9000\/RIOT,yogo1212\/RIOT,basilfx\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,OlegHahm\/RIOT,ant9000\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,authmillenon\/RIOT,miri64\/RIOT,kaspar030\/RIOT,miri64\/RIOT,smlng\/RIOT,OlegHahm\/RIOT,authmillenon\/RIOT,mtausig\/RIOT,yogo1212\/RIOT,kYc0o\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/esp32\/periph\/rtc.c\n+++ cpu\/esp32\/periph\/rtc.c\n@@ -23,8 +23,8 @@\n * If module esp_rtc_timer is enabled, the 48-bit RTC hardware timer is used\n * directly. Otherwise the PLL driven 64-bit microsecond system timer is used\n * to emulate a RTC timer (default). This emulated RTC timer results into much\n- * better accuracy. The Advantage of using RTC hardware timer over sytem timer\n- * is that it would also continue in deep sleep mode.\n+ * better accuracy. The Advantage of using RTC hardware timer over system timer\n+ * is that it would also continue in deep sleep mode and after software reset.\n *\/\n \n #define ENABLE_DEBUG (0)\n@@ -43,26 +43,19 @@\n #include \"soc\/rtc_cntl_struct.h\"\n #include \"soc\/timer_group_struct.h\"\n #include \"syscalls.h\"\n+#include \"timex.h\"\n #include \"xtensa\/xtensa_api.h\"\n \n \/* TODO move to TIMER_SYSTEM definition in periph_cpu.h *\/\n #define TIMER_SYSTEM_GROUP TIMERG0\n #define TIMER_SYSTEM_INT_MASK BIT(0)\n #define TIMER_SYSTEM_INT_SRC ETS_TG0_T0_LEVEL_INTR_SOURCE\n-#define TIMER_SYSTEM_CLK_HZ (1000000UL)\n+\n+#define RTC_CLK_CAL_FRACT 19 \/* fractional bits of calibration value *\/\n \n \/* we can't include soc\/rtc.h because of rtc_init declaration conflicts *\/\n extern uint32_t rtc_clk_slow_freq_get_hz(void);\n-\n-#if RTC_TIMER_USED\n-\n-#define RTC_TIMER_CLK_HZ rtc_clk_slow_freq_get_hz()\n-\n-#else \/* RTC_TIMER_USED *\/\n-\n-#define RTC_TIMER_CLK_HZ TIMER_SYSTEM_CLK_HZ\n-\n-#endif \/* RTC_TIMER_USED *\/\n+extern uint32_t esp_clk_slowclk_cal_get(void);\n \n \/* static variables *\/\n static rtc_alarm_cb_t _rtc_alarm_cb = NULL;\n@@ -72,43 +65,38 @@\n #define RTC_BSS_ATTR __attribute__((section(\".rtc.bss\")))\n \n \/* save several time stamps *\/\n-static uint64_t RTC_BSS_ATTR _rtc_time_init_us;\n-static uint64_t RTC_BSS_ATTR _rtc_time_init;\n-static uint64_t RTC_BSS_ATTR _rtc_time_set_us;\n-static uint64_t RTC_BSS_ATTR _rtc_time_set;\n-static time_t RTC_BSS_ATTR _sys_time_set;\n+static uint64_t RTC_BSS_ATTR _rtc_time_init_us; \/* RTC time on init in us *\/\n+static uint64_t RTC_BSS_ATTR _rtc_time_init; \/* RTC time on init in cycles *\/\n+static uint64_t RTC_BSS_ATTR _rtc_time_set_us; \/* RTC time on set in us *\/\n+static uint64_t RTC_BSS_ATTR _rtc_time_set; \/* RTC time on set in cycles *\/\n+static uint64_t RTC_BSS_ATTR _sys_time_set_us; \/* system time on set in us *\/\n+static time_t RTC_BSS_ATTR _sys_time_set; \/* system time on set in sec *\/\n+static uint64_t RTC_BSS_ATTR _sys_time_off_us; \/* system time offset in us *\/\n \n \/* forward declarations *\/\n-static time_t _sys_get_time (void);\n-static uint64_t _rtc_get_time_raw(void);\n+static time_t _sys_get_time (void); \/* system time in seconds *\/\n+static uint64_t _rtc_get_time_raw(void); \/* RTC time in cycles *\/\n+static uint64_t _rtc_time_to_us(uint64_t raw); \/* convert RTC cycles to us *\/\n static void IRAM_ATTR _rtc_timer_handler(void* arg);\n \n void rtc_init(void)\n {\n+ uint64_t _rtc_time_us = _rtc_time_to_us(_rtc_get_time_raw());\n+\n if (_rtc_time_init == 0 && _rtc_time_init_us == 0) {\n \/* only set it new, if it was not set before *\/\n _rtc_time_init = _rtc_get_time_raw();\n- _rtc_time_init_us = _rtc_get_time_raw();\n+ _rtc_time_init_us = _rtc_time_us;\n+ _sys_time_off_us = 0;\n \n DEBUG(\"%s saved rtc_init=%lld rtc_init_us=%lld\\n\",\n __func__, _rtc_time_init, _rtc_time_init_us);\n- }\n-\n- #if RTC_TIMER_USED\n- \/* restore microsecond system timer from RTC timer *\/\n- uint64_t _rtc_time_now = _rtc_get_time_raw();\n- uint64_t _sys_time_now = (_rtc_time_now > UINT32_MAX) ?\n- _rtc_time_now \/ RTC_TIMER_CLK_HZ * TIMER_SYSTEM_CLK_HZ :\n- _rtc_time_now * TIMER_SYSTEM_CLK_HZ \/ RTC_TIMER_CLK_HZ;\n-\n- \/* restore system timer *\/\n- TIMER_SYSTEM.load_high = (uint32_t)(_sys_time_now >> 32);\n- TIMER_SYSTEM.load_low = (uint32_t)(_sys_time_now & 0xffffffff);\n- TIMER_SYSTEM.reload = 0;\n-\n- DEBUG(\"%s restored rtc_init=%lld rtc_init_us=%lld\\n\",\n- __func__, _rtc_time_init, _rtc_time_init_us);\n- #endif\n+\n+ }\n+ else {\n+ _sys_time_off_us = _rtc_time_us - _rtc_time_set_us;\n+ }\n+ _sys_time_set_us = 0;\n }\n \n void rtc_poweron(void)\n@@ -125,12 +113,15 @@\n \n int rtc_set_time(struct tm *ttime)\n {\n- _rtc_time_set_us = system_get_time_64();\n _rtc_time_set = _rtc_get_time_raw();\n- _sys_time_set = mktime (ttime);\n-\n- DEBUG(\"%s sys_time_set=%ld sys_time_us=%lld rtc_time_set=%lld\\n\",\n- __func__, _sys_time_set, system_get_time_64(), _rtc_time_set);\n+ _rtc_time_set_us = _rtc_time_to_us(_rtc_time_set);\n+\n+ _sys_time_set = mktime(ttime);\n+ _sys_time_set_us = system_get_time_64();\n+ _sys_time_off_us = 0;\n+\n+ DEBUG(\"%s sys_time=%ld rtc_time=%lld rtc_time_us=%lld\\n\",\n+ __func__, _sys_time_set, _rtc_time_set, _rtc_time_set_us);\n \n return 0;\n }\n@@ -139,8 +130,8 @@\n {\n time_t _sys_time = _sys_get_time();\n \n- DEBUG(\"%s sys_time=%ld rtc_time=%lld\\n\", __func__,\n- _sys_time, _rtc_get_time_raw());\n+ DEBUG(\"%s sys_time=%ld rtc_time=%lld rtc_time_us=%lld\\n\", __func__,\n+ _sys_time, _rtc_get_time_raw(), _rtc_time_to_us(_rtc_get_time_raw()));\n \n struct tm* _time = localtime(&_sys_time);\n if (_time) {\n@@ -183,7 +174,7 @@\n \n \/* determine the offset of alarm time to current time in RTC time *\/\n uint64_t _rtc_time_alarm;\n- _rtc_time_alarm = _rtc_time_set + _sys_time_offset * RTC_TIMER_CLK_HZ;\n+ _rtc_time_alarm = _rtc_time_set + _sys_time_offset * rtc_clk_slow_freq_get_hz();\n \n DEBUG(\"%s sys=%d sys_alarm=%d rtc=%lld rtc_alarm=%lld\\n\", __func__,\n _sys_get_time(), _sys_time_offset, _rtc_get_time_raw(), _rtc_time_alarm);\n@@ -210,27 +201,17 @@\n \n #else\n \n- \/* determine the offset of alarm time to the RTC set time *\/\n- uint64_t _rtc_time_alarm;\n-\n- #if RTC_TIMER_USED\n- \/* convert rtc_time_set to time in us taking care with big numbers *\/\n- _rtc_time_alarm = _rtc_time_set_us + _sys_time_offset * TIMER_SYSTEM_CLK_HZ;\n-\n- DEBUG(\"%s sys=%ld sys_alarm=%ld rtc_set_us=%lld rtc_us=%lld rtc_alarm_us=%lld\\n\", __func__,\n- _sys_get_time(), _sys_time_offset,\n- _rtc_time_set_us, system_get_time_64(), _rtc_time_alarm);\n- #else\n- _rtc_time_alarm = _rtc_time_set + _sys_time_offset * TIMER_SYSTEM_CLK_HZ;\n-\n- DEBUG(\"%s sys=%ld sys_alarm=%ld rtc=%lld rtc_alarm=%lld\\n\", __func__,\n- _sys_get_time(), _sys_time_offset, _rtc_get_time_raw(), _rtc_time_alarm);\n-\n- #endif\n+ \/* determine the offset of alarm time to the RTC set time in us *\/\n+ uint64_t _sys_alarm_us;\n+ _sys_alarm_us = _sys_time_set_us - _sys_time_off_us + _sys_time_offset * US_PER_SEC;\n+\n+ DEBUG(\"%s sys_time=%ld sys_time_offset=%ld \"\n+ \"sys_time_us=%lld sys_time_alarm_us=%lld\\n\", __func__,\n+ _sys_get_time(), _sys_time_offset, system_get_time_64(), _sys_alarm_us);\n \n \/* set the timer value *\/\n- TIMER_SYSTEM.alarm_high = (uint32_t)(_rtc_time_alarm >> 32);\n- TIMER_SYSTEM.alarm_low = (uint32_t)(_rtc_time_alarm & 0xffffffff);\n+ TIMER_SYSTEM.alarm_high = (uint32_t)(_sys_alarm_us >> 32);\n+ TIMER_SYSTEM.alarm_low = (uint32_t)(_sys_alarm_us & 0xffffffff);\n \n \/* clear the bit in status and set the bit in interrupt enable *\/\n TIMER_SYSTEM_GROUP.int_clr_timers.val |= TIMER_SYSTEM_INT_MASK;\n@@ -288,10 +269,10 @@\n static time_t _sys_get_time (void)\n {\n #if MODULE_ESP_RTC_TIMER\n- return _sys_time_set + \n+ return _sys_time_set +\n (_rtc_time_to_us(_rtc_get_time_raw() - _rtc_time_set) \/ US_PER_SEC);\n #else\n- return _sys_time_set + \n+ return _sys_time_set +\n ((_sys_time_off_us + system_get_time_64() - _sys_time_set_us) \/ US_PER_SEC);\n #endif\n }\n@@ -307,12 +288,13 @@\n rtc_time = RTCCNTL.time0;\n rtc_time += ((uint64_t)RTCCNTL.time1.val) << 32;\n return rtc_time;\n-\n- #else\n-\n- return system_get_time_64();\n-\n- #endif\n+}\n+\n+static uint64_t _rtc_time_to_us(uint64_t raw)\n+{\n+ const uint32_t cal = esp_clk_slowclk_cal_get();\n+ return ((((raw >> 32) * cal) << (32 - RTC_CLK_CAL_FRACT)) + \/* high part *\/\n+ (((raw & 0xffffffff) * cal) >> RTC_CLK_CAL_FRACT)); \/* low part *\/\n }\n \n static void IRAM_ATTR _rtc_timer_handler(void* arg)\n"} {"commit":"13517af4e83523c424e7fac5e1c6991740a4a87f","subject":"Fix condor_config_val -v to work after previous changes lost file info for tools","message":"Fix condor_config_val -v to work after previous changes lost file info for tools\n","repos":"bbockelm\/condor-network-accounting,htcondor\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,djw8605\/htcondor,djw8605\/condor,djw8605\/condor,bbockelm\/condor-network-accounting,djw8605\/htcondor,htcondor\/htcondor,djw8605\/htcondor,mambelli\/osg-bosco-marco,djw8605\/htcondor,bbockelm\/condor-network-accounting,zhangzhehust\/htcondor,djw8605\/htcondor,htcondor\/htcondor,djw8605\/condor,clalancette\/condor-dcloud,bbockelm\/condor-network-accounting,djw8605\/htcondor,clalancette\/condor-dcloud,djw8605\/condor,htcondor\/htcondor,neurodebian\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,djw8605\/condor,zhangzhehust\/htcondor,zhangzhehust\/htcondor,mambelli\/osg-bosco-marco,clalancette\/condor-dcloud,htcondor\/htcondor,bbockelm\/condor-network-accounting,djw8605\/condor,bbockelm\/condor-network-accounting,zhangzhehust\/htcondor,neurodebian\/htcondor,clalancette\/condor-dcloud,djw8605\/condor,neurodebian\/htcondor,zhangzhehust\/htcondor,mambelli\/osg-bosco-marco,bbockelm\/condor-network-accounting,bbockelm\/condor-network-accounting,djw8605\/htcondor,zhangzhehust\/htcondor,djw8605\/htcondor,clalancette\/condor-dcloud,neurodebian\/htcondor,clalancette\/condor-dcloud,neurodebian\/htcondor,djw8605\/condor,mambelli\/osg-bosco-marco,djw8605\/htcondor,zhangzhehust\/htcondor,mambelli\/osg-bosco-marco,htcondor\/htcondor,zhangzhehust\/htcondor,htcondor\/htcondor,neurodebian\/htcondor,mambelli\/osg-bosco-marco,clalancette\/condor-dcloud,htcondor\/htcondor,neurodebian\/htcondor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/condor_includes\/condor_config.h\n+++ src\/condor_includes\/condor_config.h\n@@ -112,7 +112,7 @@\n \todd since if a .c file includes this, these prototypes technically don't\n \texist.... *\/\n extern \"C\" {\n-\tvoid config( int wantsQuiet=0 , bool ignore_invalid_entry = false, bool wantsExtra = false );\n+\tvoid config( int wantsQuiet=0 , bool ignore_invalid_entry = false, bool wantsExtra = true );\n \tvoid config_host( char* host=NULL );\n \tvoid config_fill_ad( ClassAd*, const char* prefix=NULL );\n \tvoid condor_net_remap_config( bool force_param=false );\n"} {"commit":"7f6010f5b3af2a62158d6f4be239058cd62d7724","subject":"Paranoia: Added '#undef HAVE__LSTATI64'","message":"Paranoia: Added '#undef HAVE__LSTATI64'\n","repos":"neurodebian\/htcondor,djw8605\/condor,clalancette\/condor-dcloud,bbockelm\/condor-network-accounting,htcondor\/htcondor,djw8605\/htcondor,djw8605\/htcondor,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,zhangzhehust\/htcondor,djw8605\/condor,htcondor\/htcondor,mambelli\/osg-bosco-marco,neurodebian\/htcondor,djw8605\/htcondor,mambelli\/osg-bosco-marco,mambelli\/osg-bosco-marco,djw8605\/condor,zhangzhehust\/htcondor,djw8605\/htcondor,zhangzhehust\/htcondor,bbockelm\/condor-network-accounting,clalancette\/condor-dcloud,neurodebian\/htcondor,bbockelm\/condor-network-accounting,djw8605\/htcondor,mambelli\/osg-bosco-marco,bbockelm\/condor-network-accounting,zhangzhehust\/htcondor,bbockelm\/condor-network-accounting,djw8605\/htcondor,neurodebian\/htcondor,clalancette\/condor-dcloud,bbockelm\/condor-network-accounting,djw8605\/htcondor,htcondor\/htcondor,djw8605\/condor,clalancette\/condor-dcloud,clalancette\/condor-dcloud,djw8605\/htcondor,zhangzhehust\/htcondor,neurodebian\/htcondor,neurodebian\/htcondor,bbockelm\/condor-network-accounting,bbockelm\/condor-network-accounting,neurodebian\/htcondor,mambelli\/osg-bosco-marco,zhangzhehust\/htcondor,neurodebian\/htcondor,djw8605\/condor,djw8605\/condor,mambelli\/osg-bosco-marco,clalancette\/condor-dcloud,htcondor\/htcondor,htcondor\/htcondor,mambelli\/osg-bosco-marco,neurodebian\/htcondor,clalancette\/condor-dcloud,htcondor\/htcondor,djw8605\/htcondor,djw8605\/condor,djw8605\/condor,zhangzhehust\/htcondor,htcondor\/htcondor,htcondor\/htcondor,zhangzhehust\/htcondor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/condor_includes\/condor_sys_nt.h\n+++ src\/condor_includes\/condor_sys_nt.h\n@@ -198,14 +198,18 @@\n \n END_C_DECLS\n \n+\n \/* Some Win32 specifics - These should all be detected by configure *\/\n #if defined(WIN32)\n \/* Win32 uses _stati64() and _fstati64() *\/\n # define HAVE__STATI64\t1\n+# undef HAVE__LSTATI64\n # define HAVE__FSTATI64\t1\n+\n \/* Win32 has a __int64 type defined*\/\n # define HAVE___INT64\t1\n #endif\n+\n \n \/* Define the PRIx64 macros *\/\n \n"} {"commit":"210a77a07ebf51156bb7fbc1482ce71fd56cbcd2","subject":"Fix a typo","message":"Fix a typo\n","repos":"bratsche\/glib,johne53\/MB3Glib,johne53\/MB3Glib,lukasz-skalski\/glib,gale320\/glib,tamaskenez\/glib,krichter722\/glib,01org\/android-bluez-glib,mzabaluev\/glib,bluez-android\/glib,ahmedammar\/platform_external_gst_glib,tchakabam\/glib,darren-clark\/android_platform_external_bluetooth_glib,iConsole\/Console-OS_external_bluetooth_glib,cention-sany\/glib,01org\/android-bluez-glib,gale320\/glib,tamaskenez\/glib,tchakabam\/glib,cention-sany\/glib,tamaskenez\/glib,bluez-android\/glib,Distrotech\/glib,justinkb\/aosp-bluez.glib,bluez-android\/glib,ieei\/glib,mzabaluev\/glib,johne53\/MB3Glib,MathieuDuponchelle\/glib,pstglia\/external-bluetooth-glib,tchakabam\/glib,endlessm\/glib,ieei\/glib,ahmedammar\/platform_external_gst_glib,krichter722\/glib,zsx\/glib,Distrotech\/glib,bluez-android\/glib,bluez-android\/glib,gale320\/glib,ieei\/glib,cosimoc\/glib,endlessm\/glib,cention-sany\/glib,gale320\/glib,pstglia\/platform-external-bluetooth-glib,ahmedammar\/platform_external_gst_glib,MathieuDuponchelle\/glib,darren-clark\/android_platform_external_bluetooth_glib,cosimoc\/glib,antono\/glib,bratsche\/glib,zsx\/glib,krichter722\/glib,mzabaluev\/glib,ieei\/glib,Distrotech\/glib,cention-sany\/glib,lukasz-skalski\/glib,darren-clark\/android_platform_external_bluetooth_glib,antono\/glib,mzabaluev\/glib,iConsole\/Console-OS_external_bluetooth_glib,mzabaluev\/glib,01org\/android-bluez-glib,lukasz-skalski\/glib,endlessm\/glib,pstglia\/platform-external-bluetooth-glib,lukasz-skalski\/glib,antono\/glib,krichter722\/glib,ieei\/glib,johne53\/MB3Glib,tamaskenez\/glib,djdeath\/glib,bratsche\/glib,zsx\/glib,johne53\/MB3Glib,djdeath\/glib,tchakabam\/glib,krichter722\/glib,antono\/glib,endlessm\/glib,djdeath\/glib,iConsole\/Console-OS_external_bluetooth_glib,endlessm\/glib,djdeath\/glib,pstglia\/platform-external-bluetooth-glib,pstglia\/external-bluetooth-glib,pstglia\/external-bluetooth-glib,pstglia\/external-bluetooth-glib,darren-clark\/android_platform_external_bluetooth_glib,justinkb\/aosp-bluez.glib,Distrotech\/glib,justinkb\/aosp-bluez.glib,cosimoc\/glib,Distrotech\/glib,pstglia\/platform-external-bluetooth-glib,darren-clark\/android_platform_external_bluetooth_glib,MathieuDuponchelle\/glib,01org\/android-bluez-glib,tchakabam\/glib,djdeath\/glib,bratsche\/glib,iConsole\/Console-OS_external_bluetooth_glib,pstglia\/external-bluetooth-glib,cention-sany\/glib,iConsole\/Console-OS_external_bluetooth_glib,lukasz-skalski\/glib,johne53\/MB3Glib,gale320\/glib,ahmedammar\/platform_external_gst_glib,zsx\/glib,justinkb\/aosp-bluez.glib,MathieuDuponchelle\/glib,MathieuDuponchelle\/glib,justinkb\/aosp-bluez.glib,01org\/android-bluez-glib,pstglia\/platform-external-bluetooth-glib,cosimoc\/glib,tamaskenez\/glib,cosimoc\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/gapplication.c\n+++ gio\/gapplication.c\n@@ -253,8 +253,10 @@\n \n \/* GObject implementation stuff {{{1 *\/\n static void\n-g_application_set_property (GObject *object, guint prop_id,\n- const GValue *value, GParamSpec *pspec)\n+g_application_set_property (GObject *object,\n+ guint prop_id,\n+ const GValue *value,\n+ GParamSpec *pspec)\n {\n GApplication *application = G_APPLICATION (object);\n \n@@ -315,8 +317,10 @@\n }\n \n static void\n-g_application_get_property (GObject *object, guint prop_id,\n- GValue *value, GParamSpec *pspec)\n+g_application_get_property (GObject *object,\n+ guint prop_id,\n+ GValue *value,\n+ GParamSpec *pspec)\n {\n GApplication *application = G_APPLICATION (object);\n \n@@ -526,7 +530,7 @@\n \n return TRUE;\n }\n-\n+ \n \/* Public Constructor {{{1 *\/\n \/**\n * g_application_new:\n@@ -986,7 +990,7 @@\n * always being handled in the primary instance.\n *\n * Otherwise, the default implementation of handle_command_line() tries\n- * to do a couple of things that are probably reasoanble for most\n+ * to do a couple of things that are probably reasonable for most\n * applications. First, g_application_register() is called to attempt\n * to register the application. If that works, then the command line\n * arguments are inspected. If no commandline arguments are given, then\n"} {"commit":"d0aa549d92b974ef017efb5c5cc1e7d656328eac","subject":"signed __int128 support for ska_sort","message":"signed __int128 support for ska_sort\n","repos":"Morwenn\/cpp-sort,Morwenn\/cpp-sort,Morwenn\/cpp-sort,Morwenn\/cpp-sort","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cpp-sort\/detail\/ska_sort.h\n+++ include\/cpp-sort\/detail\/ska_sort.h\n@@ -11,6 +11,7 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n #include <algorithm>\n #include <array>\n+#include <climits>\n #include <cstddef>\n #include <cstdint>\n #include <iterator>\n@@ -129,6 +130,13 @@\n #ifdef __SIZEOF_INT128__\n #pragma GCC diagnostic push\n #pragma GCC diagnostic ignored \"-Wpedantic\"\n+ inline auto to_unsigned_or_bool(__int128 l)\n+ -> unsigned long long\n+ {\n+ return static_cast<unsigned __int128>(l)\n+ + static_cast<unsigned __int128>(__int128(1) << (CHAR_BIT * sizeof(__int128) - 1));\n+ }\n+\n inline auto to_unsigned_or_bool(unsigned __int128 l)\n -> unsigned __int128\n {\n"} {"commit":"e92f989efe3a7cd4eb6d54d1e54390ece9a68c2c","subject":"Add default handlers to character entity tests to extend coverage","message":"Add default handlers to character entity tests to extend coverage\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -579,6 +579,13 @@\n \"\\xC3\\xA4 \\xC3\\xB6 \\xC3\\xBC >\";\n run_character_check(text, utf8);\n XML_ParserReset(parser, NULL);\n+ run_attribute_check(text, utf8);\n+ \/* Repeat with a default handler *\/\n+ XML_ParserReset(parser, NULL);\n+ XML_SetDefaultHandler(parser, dummy_default_handler);\n+ run_character_check(text, utf8);\n+ XML_ParserReset(parser, NULL);\n+ XML_SetDefaultHandler(parser, dummy_default_handler);\n run_attribute_check(text, utf8);\n }\n END_TEST\n"} {"commit":"d325eca1842aee13b56105bab6d1d7d114d4bdd8","subject":"TArray: change add method signature and add documentation.","message":"TArray: change add method signature and add documentation.\n\nSigned-off-by: Kim Kulling <ab1850e765cb36d3d392c95b68ac3e34036b2afe@googlemail.com>\n","repos":"kimkulling\/cppcore,kimkulling\/cppcore,kimkulling\/cppcore,kimkulling\/cppcore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cppcore\/Container\/TArray.h\n+++ include\/cppcore\/Container\/TArray.h\n@@ -73,7 +73,10 @@\n \/\/\/\t@param\tnewValue [in] The value to add.\n void add( const T &newValue );\n \n- void add( T *newValues, size_t numItems );\n+ \/\/\/\t@brief\tAn array of new items will be added to the array.\n+ \/\/\/\t@param\tnewValues [in] The array of new values to add.\n+ \/\/\/\t@param\tnumItems [in] The number of items in the array.\n+ void add(const T *newValues, size_t numItems);\n \n \/\/\/\t@brief\tRemoves an item at the given index.\n \/\/\/\t@param\tindex\t [in] The index of the item to remove.\n@@ -226,7 +229,7 @@\n \/\/-------------------------------------------------------------------------------------------------\n template<class T>\n inline\n-void TArray<T>::add( T *newValues, size_t numItems ) {\n+void TArray<T>::add( const T *newValues, size_t numItems ) {\n if( 0 == numItems ) {\n return;\n }\n"} {"commit":"6939b2c812eabfb63d3f29699ef81f5a17147f77","subject":"SStream.c needs limits.h","message":"SStream.c needs limits.h\n","repos":"AmesianX\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,bSr43\/capstone,bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- SStream.c\n+++ SStream.c\n@@ -11,6 +11,7 @@\n #include <stdio.h>\n #endif\n #include <string.h>\n+#include <limits.h>\n \n #include <platform.h>\n \n"} {"commit":"1ead467e3c51da1ffa225502b39be58a3371aaf4","subject":"Test extension of URI buffer shared between element tags","message":"Test extension of URI buffer shared between element tags\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -3561,6 +3561,23 @@\n \" xmlns:bar='http:\/\/example.org\/'>\"\n \"<\/e>\";\n \n+ if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n+ XML_TRUE) == XML_STATUS_ERROR)\n+ xml_failure(parser);\n+}\n+END_TEST\n+\n+\/* Test having a long namespaced element name inside a short one.\n+ * This exercises some internal buffer reallocation that is shared\n+ * across elements with the same namespace URI.\n+ *\/\n+START_TEST(test_ns_extend_uri_buffer)\n+{\n+ const char *text =\n+ \"<foo:e xmlns:foo='http:\/\/example.org\/'>\"\n+ \" <foo:thisisalongenoughnametotriggerallocationaction\"\n+ \" foo:a='12' \/>\"\n+ \"<\/foo:e>\";\n if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n XML_TRUE) == XML_STATUS_ERROR)\n xml_failure(parser);\n@@ -5020,6 +5037,7 @@\n tcase_add_test(tc_namespace, test_ns_parser_reset);\n tcase_add_test(tc_namespace, test_ns_long_element);\n tcase_add_test(tc_namespace, test_ns_mixed_prefix_atts);\n+ tcase_add_test(tc_namespace, test_ns_extend_uri_buffer);\n \n suite_add_tcase(s, tc_misc);\n tcase_add_checked_fixture(tc_misc, NULL, basic_teardown);\n"} {"commit":"1aa8a0bf4deb645256fa5be7261cc7d098f9646a","subject":"Improved documentation to `dip::Not`, `dip::Invert`, and the unary operators `!`, `~` and `-`, and expanded use of operator `!`.","message":"Improved documentation to `dip::Not`, `dip::Invert`, and the unary operators `!`, `~` and `-`, and expanded use of operator `!`.\n","repos":"DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/diplib\/library\/operators.h\n+++ include\/diplib\/library\/operators.h\n@@ -226,9 +226,9 @@\n \/\/\/ \\brief Inverts each sample of the input image, yielding an image of the same type.\n \/\/\/\n \/\/\/ For unsigned images, the output is `std::numeric_limits::max() - in`. For\n-\/\/\/ signed and complex types, it is `0 - in`. For binary types it is the same as `dip::Not`.\n-\/\/\/\n-\/\/\/ \\see operator-(Image const&), Not\n+\/\/\/ signed and complex types, it is `0 - in`. For binary images it is the logical NOT.\n+\/\/\/\n+\/\/\/ \\see operator-(Image const&), operator!(Image const&), Not\n DIP_EXPORT void Invert( Image const& in, Image& out );\n inline Image Invert( Image const& in ) { Image out; Invert( in, out ); return out; }\n \n@@ -237,7 +237,7 @@\n \/\/ Functions for bit-wise operations\n \/\/\n \n-\/\/\/ \\brief Bit-wise and of two binary or integer images, sample-wise, with singleton expansion.\n+\/\/\/ \\brief Bit-wise AND of two integer images, or logical AND of two binary images, sample-wise, with singleton expansion.\n \/\/\/\n \/\/\/ Out will have the type of `lhs`, and `rhs` will be converted to that type\n \/\/\/ before applying the operation. `lhs` must be an image, but `rhs` can also be a pixel or a sample\n@@ -246,7 +246,7 @@\n \/\/\/ \\see Or, Xor, operator&(Image const&, T const&)\n DIP__DEFINE_DYADIC_OVERLOADS( And )\n \n-\/\/\/ \\brief Bit-wise or of two binary or integer images, sample-wise, with singleton expansion.\n+\/\/\/ \\brief Bit-wise OR of two integer images, or logical OR of two binary images, sample-wise, with singleton expansion.\n \/\/\/\n \/\/\/ Out will have the type of `lhs`, and `rhs` will be converted to that type\n \/\/\/ before applying the operation. `lhs` must be an image, but `rhs` can also be a pixel or a sample\n@@ -255,7 +255,9 @@\n \/\/\/ \\see And, Xor, operator|(Image const&, T const&)\n DIP__DEFINE_DYADIC_OVERLOADS( Or )\n \n-\/\/\/ \\brief Bit-wise exclusive-or of two binary or integer images, sample-wise, with singleton expansion.\n+\/\/\/ \\brief Bit-wise XOR of two integer images, or logical XOR of two binary images, sample-wise, with singleton expansion.\n+\/\/\/\n+\/\/\/ XOR is \"exclusive or\".\n \/\/\/\n \/\/\/ Out will have the type of `lhs`, and `rhs` will be converted to that type\n \/\/\/ before applying the operation. `lhs` must be an image, but `rhs` can also be a pixel or a sample\n@@ -264,12 +266,13 @@\n \/\/\/ \\see And, Or, operator^(Image const&, T const&)\n DIP__DEFINE_DYADIC_OVERLOADS( Xor )\n \n-\/\/\/ \\brief Applies bit-wise negation to each sample of the input image, yielding an\n-\/\/\/ image of the same type.\n-\/\/\/\n-\/\/\/ For binary images, this is identical to `dip::Invert`.\n-\/\/\/\n-\/\/\/ \\see operator!(Image const&), operator~(Image const&), Invert\n+\/\/\/ \\brief Bit-wise NOT of an integer image, or logical NOT of a binary image, sample-wise.\n+\/\/\/\n+\/\/\/ Out will have the type of `in`.\n+\/\/\/\n+\/\/\/ For binary images, this function calls `dip::Invert`.\n+\/\/\/\n+\/\/\/ \\see operator~(Image const&), Invert\n DIP_EXPORT void Not( Image const& in, Image& out );\n inline Image Not( Image const& in ) { Image out; Not( in, out ); return out; }\n \n@@ -308,19 +311,19 @@\n return Modulo( lhs, rhs );\n }\n \n-\/\/\/ \\brief Bit-wise operator, calls `dip::And`.\n+\/\/\/ \\brief Bit-wise and logical operator, calls `dip::And`.\n template< typename T >\n inline Image operator&( Image const& lhs, T const& rhs ) {\n return And( lhs, rhs );\n }\n \n-\/\/\/ \\brief Bit-wise operator, calls `dip::Or`.\n+\/\/\/ \\brief Bit-wise and logical operator, calls `dip::Or`.\n template< typename T >\n inline Image operator|( Image const& lhs, T const& rhs ) {\n return Or( lhs, rhs );\n }\n \n-\/\/\/ \\brief Bit-wise operator, calls `dip::Xor`.\n+\/\/\/ \\brief Bit-wise and logical operator, calls `dip::Xor`.\n template< typename T >\n inline Image operator^( Image const& lhs, T const& rhs ) {\n return Xor( lhs, rhs );\n@@ -331,16 +334,19 @@\n return Invert( in );\n }\n \n-\/\/\/ \\brief Bit-wise unary operator, calls `dip::Not` for integer images.\n+\/\/\/ \\brief Bit-wise and logical unary operator, calls `dip::Not`.\n inline Image operator~( Image const& in ) {\n- DIP_THROW_IF( !in.DataType().IsInteger(), \"Bit-wise unary not operator only applicable to integer images\" );\n return Not( in );\n }\n \n-\/\/\/ \\brief Boolean unary operator, calls `dip::Not` for binary images.\n+\/\/\/ \\brief Logical unary operator. The input is converted to a binary image, then calls `dip::Invert`.\n inline Image operator!( Image const& in ) {\n- DIP_THROW_IF( !in.DataType().IsBinary(), \"Boolean unary not operator only applicable to binary images\" );\n- return Not( in );\n+ if( in.DataType().IsBinary() ) {\n+ return Invert( in );\n+ }\n+ Image out = Convert( in, DT_BIN );\n+ Invert( out, out );\n+ return out;\n }\n \n \n"} {"commit":"c5b2418b1a841fe9054ee84bb0f9406217984919","subject":"Fixed code which moved buffer around as new data comes in to work","message":"Fixed code which moved buffer around as new data comes in to work\n\n1999-11-03 Michael Fulbright <drmike@redhat.com>\n\n\t* src\/io-jpg.c image_load_increment(): Fixed code which moved\n\tbuffer around as new data comes in to work properly. JPEG progressive\n\tloading should be working now except for grayscale JPEG's, which I\n","repos":"Distrotech\/gdk-pixbuf,YueLinHo\/MB3Gdk-pixbuf,djdeath\/gdk-pixbuf,Distrotech\/gdk-pixbuf,djdeath\/gdk-pixbuf,djdeath\/gdk-pixbuf,Distrotech\/gdk-pixbuf,Distrotech\/gdk-pixbuf,Distrotech\/gdk-pixbuf,YueLinHo\/MB3Gdk-pixbuf,GNOME\/gdk-pixbuf,YueLinHo\/MB3Gdk-pixbuf,YueLinHo\/MB3Gdk-pixbuf,YueLinHo\/MB3Gdk-pixbuf,GNOME\/gdk-pixbuf,GNOME\/gdk-pixbuf,GNOME\/gdk-pixbuf,djdeath\/gdk-pixbuf","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk-pixbuf\/io-jpeg.c\n+++ gdk-pixbuf\/io-jpeg.c\n@@ -45,6 +45,8 @@\n \n #include <config.h>\n #include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n #include <setjmp.h>\n #include <jpeglib.h>\n #include \"gdk-pixbuf.h\"\n@@ -54,11 +56,12 @@\n \n \n \/* we are a \"source manager\" as far as libjpeg is concerned *\/\n+#define JPEG_PROG_BUF_SIZE 4096\n+\n typedef struct {\n \tstruct jpeg_source_mgr pub; \/* public fields *\/\n \n-\tJOCTET * buffer; \/* start of buffer *\/\n-\tgboolean start_of_file; \/* have we gotten any data yet? *\/\n+\tJOCTET buffer[JPEG_PROG_BUF_SIZE]; \/* start of buffer *\/\n \tlong skip_next; \/* number of bytes to skip next read *\/\n \n } my_source_mgr;\n@@ -85,8 +88,6 @@\n \tstruct jpeg_decompress_struct cinfo;\n \tstruct error_handler_data jerr;\n } JpegProgContext;\n-\n-#define JPEG_PROG_BUF_SIZE 4096\n \n GdkPixbuf *image_load (FILE *f);\n gpointer image_begin_load (ModulePreparedNotifyFunc func, gpointer user_data);\n@@ -228,7 +229,6 @@\n {\n \tmy_src_ptr src = (my_src_ptr) cinfo->src;\n \n-\tsrc->start_of_file = TRUE;\n \tsrc->skip_next = 0;\n }\n \n@@ -279,7 +279,7 @@\n \tJpegProgContext *context;\n \tmy_source_mgr *src;\n \n-\tcontext = g_new (JpegProgContext, 1);\n+\tcontext = g_new0 (JpegProgContext, 1);\n \tcontext->notify_func = func;\n \tcontext->notify_user_data = user_data;\n \tcontext->pixbuf = NULL;\n@@ -290,9 +290,8 @@\n \t\/* create libjpeg structures *\/\n \tjpeg_create_decompress (&context->cinfo);\n \n-\tcontext->cinfo.src = (struct jpeg_source_mgr *) g_new (my_source_mgr, 1);\n+\tcontext->cinfo.src = (struct jpeg_source_mgr *) g_new0 (my_source_mgr, 1);\n \tsrc = (my_src_ptr) context->cinfo.src;\n-\tsrc->buffer = g_malloc (JPEG_PROG_BUF_SIZE);\n \n \tcontext->cinfo.err = jpeg_std_error (&context->jerr.pub);\n \n@@ -317,6 +316,7 @@\n image_stop_load (gpointer data)\n {\n \tJpegProgContext *context = (JpegProgContext *) data;\n+\n \tg_return_if_fail (context != NULL);\n \n \tif (context->pixbuf)\n@@ -325,8 +325,6 @@\n \tif (context->cinfo.src) {\n \t\tmy_src_ptr src = (my_src_ptr) context->cinfo.src;\n \t\t\n-\t\tif (src->buffer)\n-\t\t\tg_free (src->buffer);\n \t\tg_free (src);\n \t}\n \n@@ -353,12 +351,12 @@\n \tstruct jpeg_decompress_struct *cinfo;\n \tmy_src_ptr src;\n \tguint num_left, num_copy;\n-\tguchar *nextptr;\n \n \tg_return_val_if_fail (context != NULL, FALSE);\n \tg_return_val_if_fail (buf != NULL, FALSE);\n \n \tsrc = (my_src_ptr) context->cinfo.src;\n+\n \tcinfo = &context->cinfo;\n \n \t\/* skip over data if requested, handle unsigned int sizes cleanly *\/\n@@ -375,23 +373,24 @@\n \t\tnum_left = size;\n \t}\n \n+\n \twhile (num_left > 0) {\n \t\t\/* copy as much data into buffer as possible *\/\n+\n+\t\tif(src->pub.bytes_in_buffer && \n+\t\t src->pub.next_input_byte != src->buffer)\n+\t\t\tmemmove(src->buffer, src->pub.next_input_byte,\n+\t\t\t\tsrc->pub.bytes_in_buffer);\n+\n \t\tnum_copy = MIN (JPEG_PROG_BUF_SIZE - src->pub.bytes_in_buffer,\n \t\t\t\tsize);\n \n \t\tif (num_copy == 0) \n-\t\t\tg_assert (\"Buffer overflow!\\n\");\n-\n-\t\tnextptr = src->buffer + src->pub.bytes_in_buffer;\n-\t\tmemcpy (nextptr, buf, num_copy);\n-\t\t\n-\t\tif (src->pub.next_input_byte == NULL ||\n-\t\t src->pub.bytes_in_buffer == 0)\n+\t\t\tg_error (\"Buffer overflow!\");\n+\n+\t\tmemcpy(src->buffer + src->pub.bytes_in_buffer, buf, num_copy);\n \t\tsrc->pub.next_input_byte = src->buffer;\n-\n \t\tsrc->pub.bytes_in_buffer += num_copy;\n-\n \t\tnum_left -= num_copy;\n \n \t\t\/* try to load jpeg header *\/\n@@ -400,6 +399,7 @@\n \n \t\t\trc = jpeg_read_header (cinfo, TRUE);\n \t\t\tcontext->src_initialized = TRUE;\n+\n \t\t\tif (rc == JPEG_SUSPENDED)\n \t\t\t\tcontinue;\n \n@@ -419,7 +419,7 @@\n \n \t\t\tif (context->pixbuf == NULL) {\n \t\t\t\t\/* Failed to allocate memory *\/\n-\t\t\t\tg_assert (\"Couldn't allocate gdkpixbuf\\n\");\n+\t\t\t\tg_error (\"Couldn't allocate gdkpixbuf\");\n \t\t\t}\n \n \t\t\t\/* Use pixbuf buffer to store decompressed data *\/\n@@ -431,7 +431,6 @@\n \t\t\t\t(* context->notify_func) (context->pixbuf,\n \t\t\t\t\t\t\t context->notify_user_data);\n \n-\t\t\tsrc->start_of_file = FALSE;\n \t\t} else if (!context->did_prescan) {\n \t\t\tint rc;\n \n@@ -462,9 +461,11 @@\n \t\t\t\t\trowptr += context->pixbuf->art_pixbuf->rowstride;;\n \t\t\t\t}\n \n+#ifdef IO_JPEG_DEBUG_GREY\n \t\t\t\tfor (p=lines[0],i=0; i< context->pixbuf->art_pixbuf->rowstride;i++, p++)\n \t\t\t\t\t*p = 0;\n \t\t\t\t\n+#endif\n \t\t\t\tnlines = jpeg_read_scanlines (cinfo, lines,\n \t\t\t\t\t\t\t cinfo->rec_outbuf_height);\n \t\t\t\tif (nlines == 0)\n"} {"commit":"1460679a0c5959648ae3b256e28005638114cd17","subject":"Additional false sharing protections","message":"Additional false sharing protections\n","repos":"rigtorp\/Seqlock","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Seqlock.h\n+++ Seqlock.h\n@@ -25,6 +25,12 @@\n #include <atomic>\n #include <type_traits>\n \n+#ifndef NDEBUG\n+#define RIGTORP_SEQLOCK_NOINLINE __attribute__((noinline))\n+#else\n+#define RIGTORP_SEQLOCK_NOINLINE\n+#endif\n+\n namespace rigtorp {\n \n template <typename T> class Seqlock {\n@@ -33,8 +39,10 @@\n \"T must satisfy is_nothrow_copy_assignable\");\n static_assert(std::is_trivially_copy_assignable<T>::value,\n \"T must satisfy is_trivially_copy_assignable\");\n+\n Seqlock() : seq_(0) {}\n- T load() const noexcept {\n+\n+ RIGTORP_SEQLOCK_NOINLINE T load() const noexcept {\n T copy;\n std::size_t seq0, seq1;\n do {\n@@ -46,7 +54,8 @@\n } while (seq0 != seq1 || seq0 & 1);\n return copy;\n }\n- void store(const T &desired) noexcept {\n+\n+ RIGTORP_SEQLOCK_NOINLINE void store(const T &desired) noexcept {\n std::size_t seq0 = seq_.load(std::memory_order_relaxed);\n seq_.store(seq0 + 1, std::memory_order_release);\n std::atomic_signal_fence(std::memory_order_acq_rel);\n@@ -56,7 +65,17 @@\n }\n \n private:\n+ static const std::size_t kFalseSharingRange = 128;\n+\n+ \/\/ Align to prevent false sharing with adjecent data\n+ alignas(kFalseSharingRange) T value_;\n std::atomic<std::size_t> seq_;\n- T value_;\n+ \/\/ Padding to prevent false sharing with adjecent data\n+ char padding_[kFalseSharingRange -\n+ ((sizeof(value_) + sizeof(seq_)) % kFalseSharingRange)];\n+ static_assert(\n+ ((sizeof(value_) + sizeof(seq_) + sizeof(padding_)) %\n+ kFalseSharingRange) == 0,\n+ \"sizeof(Seqlock<T>) should be a multiple of kFalseSharingRange\");\n };\n }\n"} {"commit":"341240d6cf86068338b53945353c130e745587a5","subject":"Removed move constructor and assignment operator from SubdivMesh::Topology class. This was a workaround for some Windows compile issues with VS2012.","message":"Removed move constructor and assignment operator from SubdivMesh::Topology class.\nThis was a workaround for some Windows compile issues with VS2012.\n","repos":"embree\/embree,embree\/embree,embree\/embree,embree\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/common\/scene_subdiv_mesh.h\n+++ kernels\/common\/scene_subdiv_mesh.h\n@@ -155,27 +155,6 @@\n \/*! Topology initialization *\/\n Topology (SubdivMesh* mesh);\n \n- \/*! make the class movable *\/\n- public: \n- Topology (Topology&& other) \/\/ FIXME: this is only required to workaround compilation issues under Windows\n- : mesh(std::move(other.mesh)), \n- vertexIndices(std::move(other.vertexIndices)),\n- subdiv_mode(std::move(other.subdiv_mode)),\n- halfEdges(std::move(other.halfEdges)),\n- halfEdges0(std::move(other.halfEdges0)),\n- halfEdges1(std::move(other.halfEdges1)) {}\n- \n- Topology& operator= (Topology&& other) \/\/ FIXME: this is only required to workaround compilation issues under Windows\n- {\n- mesh = std::move(other.mesh); \n- vertexIndices = std::move(other.vertexIndices);\n- subdiv_mode = std::move(other.subdiv_mode);\n- halfEdges = std::move(other.halfEdges);\n- halfEdges0 = std::move(other.halfEdges0);\n- halfEdges1 = std::move(other.halfEdges1);\n- return *this;\n- }\n-\n public:\n \/*! check if the i'th primitive is valid in this topology *\/\n __forceinline bool valid(size_t i) const \n"} {"commit":"6a74417f7c6d97c6e16d54fbb98fede47cb7df4f","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\ngit-svn-id: 734069fa5dc9fbd4a6141f0e5f6f7ee18d385e6f@94 111db651-790d-0410-a044-b0abe44a5820\n","repos":"Joelgranados\/cmucam3,Joelgranados\/cmucam3,Joelgranados\/cmucam3,Joelgranados\/cmucam3,Joelgranados\/cmucam3","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hal\/lpc2106-cmucam3\/cc3_pin_defines.h\n+++ hal\/lpc2106-cmucam3\/cc3_pin_defines.h\n@@ -12,14 +12,14 @@\n 1 0 9 8 | 7 6 5 4 | 3 2 1 0 | 9 8 7 6 | 5 4 3 2 | 1 0 9 8 | 7 6 5 4 | 3 2 1 0\r\n *\/\r\n \r\n-#define _CC3_DEFAULT_PORT_DIR\t\t0x003EBD89\r\n+#define _CC3_DEFAULT_PORT_DIR\t\t0x003EFD89\r\n \/\/#define DEFAULT_PORT_DIR\t0x0 | BUF_WEE | CAM_RESET | BUF_WRST | BUF_RRST | BUF_RCK | BUF_RESET\r\n \r\n \/\/ I2C Config Constants\r\n-#define _CC3_I2C_PORT_DDR_IDLE\t\t0x001EBD89\r\n-#define _CC3_I2C_PORT_DDR_READ_SDA\t0x007EBD89\r\n-#define _CC3_I2C_PORT_DDR_READ_SCL\t0x00BEBD89\r\n-#define _CC3_I2C_PORT_DDR_WRITE\t\t0x00FEBD89\r\n+#define _CC3_I2C_PORT_DDR_IDLE\t\t0x001EFD89\r\n+#define _CC3_I2C_PORT_DDR_READ_SDA\t0x007EFD89\r\n+#define _CC3_I2C_PORT_DDR_READ_SCL\t0x00BEFD89\r\n+#define _CC3_I2C_PORT_DDR_WRITE\t\t0x00FEFD89\r\n \r\n \/\/ Camera Bus Constants\r\n #define _CC3_CAM_VSYNC\t\t0x10000\r\n"} {"commit":"dc59d17b9194bbce8f57661f2f41cfa926c46d35","subject":"macOS kernel has no limits.h but i386\/limits.h (#1172)","message":"macOS kernel has no limits.h but i386\/limits.h (#1172)\n\n","repos":"AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone,AmesianX\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,bSr43\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- SStream.c\n+++ SStream.c\n@@ -4,11 +4,12 @@\n #include <stdarg.h>\n #if defined(CAPSTONE_HAS_OSXKERNEL)\n #include <libkern\/libkern.h>\n+#include <i386\/limits.h>\n #else\n #include <stdio.h>\n+#include <limits.h>\n #endif\n #include <string.h>\n-#include <limits.h>\n \n #include <capstone\/platform.h>\n \n"} {"commit":"3406fcd73d00ea2787aaa3d411794d5d2abffec9","subject":"[MartVec] Add ceil and floor for Vector","message":"[MartVec] Add ceil and floor for Vector\n","repos":"tum-ei-rcs\/mart-common,tum-ei-rcs\/mart-common","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- experimental\/MartVec.h\n+++ experimental\/MartVec.h\n@@ -308,6 +308,22 @@\n \t\t}\n \t};\n \n+\ttemplate<class T>\n+\tstruct ceil {\n+\t\tT operator()(const T& l) {\n+\t\t\tusing std::ceil;\n+\t\t\treturn ceil(l);\n+\t\t}\n+\t};\n+\n+\ttemplate<class T>\n+\tstruct floor {\n+\t\tT operator()(const T& l) {\n+\t\t\tusing std::floor;\n+\t\t\treturn floor(l);\n+\t\t}\n+\t};\n+\n }\n \n \/**\n@@ -343,6 +359,9 @@\n DEFINE_ND_VECTOR_OP(operator-,std::minus)\n DEFINE_ND_VECTOR_OP(operator\/,std::divides)\n \n+DEFINE_UNARY_ND_VECTOR_OP(ceil, _impl_vec::ceil)\n+DEFINE_UNARY_ND_VECTOR_OP(floor, _impl_vec::floor)\n+\n \/\/min max\n DEFINE_ND_VECTOR_OP(max,_impl_vec::maximum)\n DEFINE_ND_VECTOR_OP(min,_impl_vec::minimum)\n"} {"commit":"8de2a5c3f7b349a42242719c9759285dd959d004","subject":"Fix clCreateFromGLBuffer error code result type","message":"Fix clCreateFromGLBuffer error code result type\n","repos":"KhronosGroup\/OpenCL-Headers,KhronosGroup\/OpenCL-Headers","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- CL\/cl_gl.h\n+++ CL\/cl_gl.h\n@@ -64,7 +64,7 @@\n clCreateFromGLBuffer(cl_context \/* context *\/,\n cl_mem_flags \/* flags *\/,\n cl_GLuint \/* bufobj *\/,\n- int * \/* errcode_ret *\/) CL_API_SUFFIX__VERSION_1_0;\n+ cl_int * \/* errcode_ret *\/) CL_API_SUFFIX__VERSION_1_0;\n \n #ifdef CL_VERSION_1_2\n \n"} {"commit":"d97a62b1266aca1ba98821b09cfaef1685e49548","subject":"Fix nearNB bug","message":"Fix nearNB bug\n\nAVG means avg, anything else becomes NNb\n","repos":"nasa-gibs\/mrf,nasa-gibs\/mrf,nasa-gibs\/mrf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mrf_apps\/mrf_insert.h\n+++ mrf_apps\/mrf_insert.h\n@@ -103,7 +103,7 @@\n void setResampling(const std::string &Resamp) {\n \tif (EQUALN(Resamp.c_str(), \"Avg\", 3))\n \t Resampling = GDAL_MRF::SAMPLING_Avg;\n-\telse if (EQUALN(Resamp.c_str(), \"NearNb\", 6))\n+\telse\n \t Resampling = GDAL_MRF::SAMPLING_Near;\n }\n \n"} {"commit":"ad1384e9fb4f4e48c7c1a17ccee271219cf63320","subject":"don't monopolize \"stats proxy\" namespace","message":"don't monopolize \"stats proxy\" namespace\n\nUse \"proxy\" \"buckets\" sub-subcommand to grab per-bucket stats.\n\nChange-Id: I968588c8bdfd50a0b2d91ce1ffd6181a3370e2cc\nReviewed-on: http:\/\/review.membase.org\/4494\nTested-by: Aliaksey Kandratsenka <340b8e09ca65cd3fc686427fcfed17e87eaf61e2@gmail.com>\nReviewed-by: Steve Yen <ef850f73f7832052d3c6d9b5ddd3a1716d9a57f1@gmail.com>\n","repos":"membase\/moxi,couchbase\/moxi,membase\/moxi,membase\/moxi,zbase\/moxi,zbase\/moxi,zbase\/moxi,zbase\/moxi,membase\/moxi,membase\/moxi,zbase\/moxi,couchbase\/moxi,couchbase\/moxi,membase\/moxi,couchbase\/moxi,couchbase\/moxi,couchbase\/moxi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cproxy_protocol_b.c\n+++ cproxy_protocol_b.c\n@@ -141,7 +141,7 @@\n if (c->binary_header.request.opcode == PROTOCOL_BINARY_CMD_STAT) {\n char *subcommand = binary_get_key(c);\n size_t nkey = c->binary_header.request.keylen;\n- if (nkey == 5 && memcmp(subcommand, \"proxy\", 5) == 0) {\n+ if (nkey == 13 && memcmp(subcommand, \"proxy buckets\", 13) == 0) {\n process_bin_proxy_stats(c);\n return;\n }\n"} {"commit":"9a20b09285bbd75ccc2ca78233241f8e31d54a28","subject":"MIPS: tlb-r3k: Optimise a TLBWI barrier in TLB invalidation","message":"MIPS: tlb-r3k: Optimise a TLBWI barrier in TLB invalidation\n\nReplace an explicit barrier with a useful processor instruction in TLB\ninvalidation, following several other such cases elsewhere in\n`tlb-r3k.c'.\n\nSigned-off-by: Maciej W. Rozycki <78f3a3d9d6e4d907a7d12e475d0a751d6b7e256b@linux-mips.org>\nCc: James Hogan <547fa85bb3888a0222eed8ec39e36708605c6d53@imgtec.com>\nCc: 562397917b9a8bf316569a848858b12fb417723f@linux-mips.org\nPatchwork: https:\/\/patchwork.linux-mips.org\/patch\/10196\/\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"82afaa0f36c1d5b590b06ff77f9e882993df7852","subject":"Fixed comment typo.","message":"Fixed comment typo.\n","repos":"digitalbazaar\/monarch,digitalbazaar\/monarch,digitalbazaar\/monarch,digitalbazaar\/monarch,digitalbazaar\/monarch","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- cpp\/data\/json\/JsonWriter.h\n+++ cpp\/data\/json\/JsonWriter.h\n@@ -118,7 +118,7 @@\n *\n * @param dyno the DynamicObject to write out.\n * @param stream the ostream to write to.\n- * @param compact true to use compact syntax, false no to.\n+ * @param compact true to use compact syntax, false not to.\n * @param strict the JSON stream must start with an object or array.\n *\n * @return true on success, false with exception set on failure.\n@@ -131,7 +131,7 @@\n * Writes a DynamicObject as JSON to a string.\n *\n * @param dyno the DynamicObject to write out.\n- * @param compact true to use compact syntax, false no to.\n+ * @param compact true to use compact syntax, false not to.\n * @param strict the JSON stream must start with an object or array.\n *\n * @return the string with JSON data on success, a blank string with\n@@ -144,7 +144,7 @@\n * Writes a DynamicObject as JSON to standard out.\n *\n * @param dyno the DynamicObject to write out.\n- * @param compact true to use compact syntax, false no to.\n+ * @param compact true to use compact syntax, false not to.\n * @param strict the JSON stream must start with an object or array.\n *\n * @return true on success, false with exception set on failure.\n"} {"commit":"48b4aba7a8a2b098f12259ffa13301243349cfab","subject":"MIPS: ralink: add PCI IRQ handling","message":"MIPS: ralink: add PCI IRQ handling\n\nThe Ralink IRQ code was not handling the PCI IRQ yet. Add this functionaility\nto make PCI work on rt3883.\n\nSigned-off-by: John Crispin <be6487f9df4dce44a640672d6c07330104d43593@openwrt.org>\nSigned-off-by: Gabor Juhos <0b85b0feb94c9a44e8676965f48a70291ba74edb@openwrt.org>\nPatchwork: http:\/\/patchwork.linux-mips.org\/patch\/5165\/\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/mips\/ralink\/irq.c\n+++ arch\/mips\/ralink\/irq.c\n@@ -31,6 +31,7 @@\n #define INTC_INT_GLOBAL\t\tBIT(31)\n \n #define RALINK_CPU_IRQ_INTC\t(MIPS_CPU_IRQ_BASE + 2)\n+#define RALINK_CPU_IRQ_PCI\t(MIPS_CPU_IRQ_BASE + 4)\n #define RALINK_CPU_IRQ_FE\t(MIPS_CPU_IRQ_BASE + 5)\n #define RALINK_CPU_IRQ_WIFI\t(MIPS_CPU_IRQ_BASE + 6)\n #define RALINK_CPU_IRQ_COUNTER\t(MIPS_CPU_IRQ_BASE + 7)\n@@ -103,6 +104,9 @@\n \n \telse if (pending & STATUSF_IP6)\n \t\tdo_IRQ(RALINK_CPU_IRQ_WIFI);\n+\n+\telse if (pending & STATUSF_IP4)\n+\t\tdo_IRQ(RALINK_CPU_IRQ_PCI);\n \n \telse if (pending & STATUSF_IP2)\n \t\tdo_IRQ(RALINK_CPU_IRQ_INTC);\n"} {"commit":"2b2612272c77288b2bd53d5831df737cd669cd93","subject":"[PATCH] powerpc numa: Consolidate assignment of cpus to nodes","message":"[PATCH] powerpc numa: Consolidate assignment of cpus to nodes\n\nWe can plug the boot cpu into its node independently of whether numa\ntopology is detected. And numa_setup_cpu does the right thing for all\ncases now, so remove special-casing for non-numa from the cpu hotplug\ncallback.\n\nSigned-off-by: Nathan Lynch <1f34d8d29e2350bf5536b3f62cd29505f7de48ee@austin.ibm.com>\nSigned-off-by: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/powerpc\/mm\/numa.c\n+++ arch\/powerpc\/mm\/numa.c\n@@ -321,10 +321,7 @@\n \n \tswitch (action) {\n \tcase CPU_UP_PREPARE:\n-\t\tif (min_common_depth == -1 || !numa_enabled)\n-\t\t\tmap_cpu_to_node(lcpu, 0);\n-\t\telse\n-\t\t\tnuma_setup_cpu(lcpu);\n+\t\tnuma_setup_cpu(lcpu);\n \t\tret = NOTIFY_OK;\n \t\tbreak;\n #ifdef CONFIG_HOTPLUG_CPU\n@@ -459,8 +456,6 @@\n \t\t\tgoto new_range;\n \t}\n \n-\tnuma_setup_cpu(boot_cpuid);\n-\n \treturn 0;\n }\n \n@@ -475,7 +470,6 @@\n \tprintk(KERN_INFO \"Memory hole size: %ldMB\\n\",\n \t (top_of_ram - total_ram) >> 20);\n \n-\tmap_cpu_to_node(boot_cpuid, 0);\n \tfor (i = 0; i < lmb.memory.cnt; ++i)\n \t\tadd_region(0, lmb.memory.region[i].base >> PAGE_SHIFT,\n \t\t\t lmb_size_pages(&lmb.memory, i));\n@@ -612,6 +606,8 @@\n \t\tdump_numa_memory_topology();\n \n \tregister_cpu_notifier(&ppc64_numa_nb);\n+\tcpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,\n+\t\t\t (void *)(unsigned long)boot_cpuid);\n \n \tfor_each_online_node(nid) {\n \t\tunsigned long start_pfn, end_pfn, pages_present;\n"} {"commit":"4b3811cfec5beb1cbe5648e0005325eccf64b32b","subject":"Add missing semicolon.","message":"Add missing semicolon.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/sparc64\/dev\/ldc.c\n+++ arch\/sparc64\/dev\/ldc.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ldc.c,v 1.5 2009\/05\/12 21:20:33 kettenis Exp $\t*\/\n+\/*\t$OpenBSD: ldc.c,v 1.6 2009\/05\/12 22:31:45 kettenis Exp $\t*\/\n \/*\n * Copyright (c) 2009 Mark Kettenis\n *\n@@ -77,6 +77,7 @@\n \t\t\tldc_send_ack(lc);\n \t\telse\n \t\t\t\/* XXX do nothing for now. *\/\n+\t\t\t;\n \t\tbreak;\n \n \tcase LDC_ACK:\n"} {"commit":"2589bca0fa2a00dcee35b752740a1c26f97bd462","subject":"There are anecdotal reports of firmware being writable on some Cougar machines, so don't poke blindly into the middle of its address space if we can tell dz is not going to be there by other means.","message":"There are anecdotal reports of firmware being writable on some Cougar\nmachines, so don't poke blindly into the middle of its address space\nif we can tell dz is not going to be there by other means.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/vax\/vsa\/dz_ibus.c\n+++ arch\/vax\/vsa\/dz_ibus.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: dz_ibus.c,v 1.8 2001\/08\/26 18:25:06 hugh Exp $\t*\/\n+\/*\t$OpenBSD: dz_ibus.c,v 1.9 2001\/10\/01 13:05:07 hugh Exp $\t*\/\n \/*\t$NetBSD: dz_ibus.c,v 1.15 1999\/08\/27 17:50:42 ragge Exp $ *\/\n \/*\n * Copyright (c) 1998 Ludd, University of Lule}, Sweden.\n@@ -125,10 +125,11 @@\n \tstruct ss_dz *dzP;\n \tshort i;\n \n-#if VAX53\n-\tif (vax_boardtype == VAX_BTYP_1303)\n+#if VAX53 || VAX49\n+\tif (vax_boardtype == VAX_BTYP_49 ||\n+\t vax_boardtype == VAX_BTYP_1303)\n \t\tif (cf->cf_loc[0] != 0x25000000)\n-\t\t\treturn 0; \/* Ugly *\/\n+\t\t\treturn 0; \/* don't probe unnecessarily *\/\n #endif\n \n \tdzP = (struct ss_dz *)va->va_addr;\n"} {"commit":"dfcfe09d4cfa8959a2d93c582c35eff10ffc13e7","subject":"Don't forget to bump version in Constants.h too.","message":"Don't forget to bump version in Constants.h too.\n","repos":"bf4\/passenger,bf4\/passenger,clemensg\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,kewaunited\/passenger,phusion\/passenger,pkmiec\/passenger,openSUSE\/passenger,kewaunited\/passenger,kewaunited\/passenger,antek-drzewiecki\/passenger,erikogan\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,erikogan\/passenger,phusion\/passenger,kewaunited\/passenger,jawj\/passenger,kewaunited\/passenger,gravitystorm\/passenger,cgvarela\/passenger,phusion\/passenger,pkmiec\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,cgvarela\/passenger,openSUSE\/passenger,erikogan\/passenger,bf4\/passenger,bf4\/passenger,erikogan\/passenger,erikogan\/passenger,phusion\/passenger,cgvarela\/passenger,phusion\/passenger,bf4\/passenger,jawj\/passenger,gravitystorm\/passenger,cgvarela\/passenger,jawj\/passenger,openSUSE\/passenger,kewaunited\/passenger,bf4\/passenger,jawj\/passenger,gravitystorm\/passenger,erikogan\/passenger,kewaunited\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,gravitystorm\/passenger,pkmiec\/passenger,jawj\/passenger,clemensg\/passenger,bf4\/passenger,openSUSE\/passenger,phusion\/passenger,openSUSE\/passenger,pkmiec\/passenger,gravitystorm\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,clemensg\/passenger,phusion\/passenger,gravitystorm\/passenger,clemensg\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,pkmiec\/passenger,jawj\/passenger,openSUSE\/passenger,pkmiec\/passenger,phusion\/passenger,pkmiec\/passenger,jawj\/passenger,kewaunited\/passenger","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/common\/Constants.h\n+++ ext\/common\/Constants.h\n@@ -1,6 +1,6 @@\n \/*\n * Phusion Passenger - http:\/\/www.modrails.com\/\n- * Copyright (c) 2010 Phusion\n+ * Copyright (c) 2010, 2011 Phusion\n *\n * \"Phusion Passenger\" is a trademark of Hongli Lai & Ninh Bui.\n *\n@@ -26,7 +26,7 @@\n #define _PASSENGER_CONSTANTS_H_\n \n \/* Don't forget to update lib\/phusion_passenger.rb too. *\/\n-#define PASSENGER_VERSION \"3.0.7\"\n+#define PASSENGER_VERSION \"3.0.8\"\n \n #define FEEDBACK_FD 3\n \n"} {"commit":"32ec7fd08b597586774b92ac1cd2678021ccac1b","subject":"x86, setup: preemptively save\/restore edi and ebp around INT 15 E820","message":"x86, setup: preemptively save\/restore edi and ebp around INT 15 E820\n\nImpact: BIOS bugproofing\n\nSince there are BIOSes known to clobber %ebx and %esi for INT 15 E820,\nassume there is something out there clobbering %edi and\/or %ebp too,\nand don't wait for it to fail.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/boot\/memory.c\n+++ arch\/x86\/boot\/memory.c\n@@ -20,7 +20,7 @@\n {\n \tint count = 0;\n \tu32 next = 0;\n-\tu32 size, id;\n+\tu32 size, id, edi;\n \tu8 err;\n \tstruct e820entry *desc = boot_params.e820_map;\n \n@@ -29,10 +29,11 @@\n \n \t\t\/* Important: %edx and %esi are clobbered by some BIOSes,\n \t\t so they must be either used for the error output\n-\t\t or explicitly marked clobbered. *\/\n-\t\tasm(\"int $0x15; setc %0\"\n+\t\t or explicitly marked clobbered. Given that, assume there\n+\t\t is something out there clobbering %ebp and %edi, too. *\/\n+\t\tasm(\"pushl %%ebp; int $0x15; popl %%ebp; setc %0\"\n \t\t : \"=d\" (err), \"+b\" (next), \"=a\" (id), \"+c\" (size),\n-\t\t \"=m\" (*desc)\n+\t\t \"=D\" (edi), \"=m\" (*desc)\n \t\t : \"D\" (desc), \"d\" (SMAP), \"a\" (0xe820)\n \t\t : \"esi\");\n \n"} {"commit":"f60c5f369f4980db5e6033f019466ab6f399cbc0","subject":"init tls","message":"init tls\n","repos":"boazsegev\/iodine,boazsegev\/iodine,boazsegev\/iodine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/iodine\/fiobj_str.c\n+++ ext\/iodine\/fiobj_str.c\n@@ -181,9 +181,11 @@\n static pthread_key_t str_tmp_key;\n static pthread_once_t str_tmp_once = PTHREAD_ONCE_INIT;\n static void init_str_tmp_key(void) {\n+ pthread_key_create(&str_tmp_key, free);\n+}\n+static void init_str_tmp_key_ptr(void) {\n fiobj_str_s *tmp = malloc(sizeof(fiobj_str_s));\n FIO_ASSERT_ALLOC(tmp);\n- pthread_key_create(&str_tmp_key, free);\n tmp->head.ref = ((~(uint32_t)0) >> 4);\n tmp->head.type = FIOBJ_T_STRING;\n tmp->str.small = 1;\n@@ -196,6 +198,10 @@\n FIOBJ fiobj_str_tmp(void) {\n pthread_once(&str_tmp_once, init_str_tmp_key);\n fiobj_str_s *tmp = (fiobj_str_s *)pthread_getspecific(str_tmp_key);\n+ if (!tmp) {\n+ init_str_tmp_key_ptr();\n+ tmp = (fiobj_str_s *)pthread_getspecific(str_tmp_key);\n+ }\n tmp->str.frozen = 0;\n fio_str_resize(&tmp->str, 0);\n return ((uintptr_t)tmp | FIOBJECT_STRING_FLAG);\n"} {"commit":"f692f5ef8e8554931ee987982f29131f24c02cbc","subject":"Don't send proxy auth headers after CONNECT tunnel established","message":"Don't send proxy auth headers after CONNECT tunnel established\n\nIt's not a serious, but a waste, since Pubnub servers will ignore it.\n","repos":"pubnub\/c-core,pubnub\/c-core,pubnub\/c-core,pubnub\/c-core","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- core\/pubnub_netcore.c\n+++ core\/pubnub_netcore.c\n@@ -551,25 +551,22 @@\n }\n else if (0 == i) {\n #if PUBNUB_PROXY_API\n- char hdr2send[1024] = \"\\r\\n\";\n- if (0 == pbproxy_http_header_to_send(pb, hdr2send + 2, sizeof hdr2send - 2)) {\n- PUBNUB_LOG_TRACE(\"Sending HTTP proxy header: '%s'\\n\", hdr2send);\n- pb->state = PBS_TX_PROXY_AUTHORIZATION;\n- if (-1 == pbpal_send_str(pb, hdr2send)) {\n- outcome_detected(pb, PNR_IO_ERROR);\n- break;\n- }\n- }\n- else {\n- pbpal_send_literal_str(\n- pb, \"\\r\\nUser-Agent: PubNub-C-core\/\" PUBNUB_SDK_VERSION \"\\r\\n\\r\\n\");\n- pb->state = PBS_TX_FIN_HEAD;\n- }\n-#else\n+ if (!pb->proxy_tunnel_established) {\n+ char hdr2send[1024] = \"\\r\\n\";\n+ if ((0 == pbproxy_http_header_to_send(pb, hdr2send + 2, sizeof hdr2send - 2))) {\n+ PUBNUB_LOG_TRACE(\"Sending HTTP proxy header: '%s'\\n\", hdr2send);\n+ pb->state = PBS_TX_PROXY_AUTHORIZATION;\n+ if (-1 == pbpal_send_str(pb, hdr2send)) {\n+ outcome_detected(pb, PNR_IO_ERROR);\n+ break;\n+ }\n+ goto next_state;\n+ }\n+ }\n+#endif\n pbpal_send_literal_str(\n pb, \"\\r\\nUser-Agent: PubNub-C-core\/\" PUBNUB_SDK_VERSION \"\\r\\n\\r\\n\");\n pb->state = PBS_TX_FIN_HEAD;\n-#endif\n goto next_state;\n }\n break;\n@@ -836,15 +833,11 @@\n #if PUBNUB_PROXY_API\n if (pb->retry_after_close) {\n pb->state = PBS_IDLE;\n- }\n- else {\n- pbpal_forget(pb);\n- pbntf_trans_outcome(pb);\n- }\n-#else\n+ break;\n+ }\n+#endif\n pbpal_forget(pb);\n pbntf_trans_outcome(pb);\n-#endif\n }\n break;\n case PBS_WAIT_CANCEL:\n@@ -858,17 +851,12 @@\n #if PUBNUB_PROXY_API\n if (pb->retry_after_close) {\n pb->state = PBS_IDLE;\n- }\n- else {\n- pbpal_forget(pb);\n- pb->core.msg_ofs = pb->core.msg_end = 0;\n- pbntf_trans_outcome(pb);\n- }\n-#else\n+ break;\n+ }\n+#endif\n pbpal_forget(pb);\n pb->core.msg_ofs = pb->core.msg_end = 0;\n pbntf_trans_outcome(pb);\n-#endif\n }\n break;\n case PBS_KEEP_ALIVE_IDLE:\n"} {"commit":"7fafd91d85181e946207bed18c44addc47e36c63","subject":"x86: fix integer as NULL pointer warning","message":"x86: fix integer as NULL pointer warning\n\narch\/x86\/boot\/printf.c:59:10: warning: Using plain integer as NULL pointer\n\nSigned-off-by: Harvey Harrison <eadbd6b462bf3c97df0300a934c12bc2e5d1fe51@gmail.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/boot\/printf.c\n+++ arch\/x86\/boot\/printf.c\n@@ -56,7 +56,7 @@\n \tif (type & LEFT)\n \t\ttype &= ~ZEROPAD;\n \tif (base < 2 || base > 36)\n-\t\treturn 0;\n+\t\treturn NULL;\n \tc = (type & ZEROPAD) ? '0' : ' ';\n \tsign = 0;\n \tif (type & SIGN) {\n"} {"commit":"3d5537bf1fdee06447bb2e6f34e09fb0f19b6f31","subject":"Fixing bug in operators","message":"Fixing bug in operators\n","repos":"Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,Zaszczyk\/cphalcon,Zaszczyk\/cphalcon,Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ext\/kernel\/operators.c\n+++ ext\/kernel\/operators.c\n@@ -317,7 +317,7 @@\n *\/\n int phalcon_less_equal(zval *op1, zval *op2 TSRMLS_DC) {\n \tzval result;\n-\tis_smaller_or_equal_function(&result, op1, op2 TSRMLS_CC);\n+\tis_smaller_function(&result, op1, op2 TSRMLS_CC);\n \treturn Z_BVAL(result);\n }\n \n@@ -331,7 +331,7 @@\n }\n \n \/**\n- * Check if two zvals are equal\n+ * Check for greater\/equal\n *\/\n int phalcon_greater_equal_long(zval *op1, long op2 TSRMLS_DC) {\n \tzval result, op2_zval;\n"} {"commit":"00b643a9d96958a8250dbead5e58f0b92eff4050","subject":"cleanup code spacing","message":"cleanup code spacing\n","repos":"community-ssu\/hildon,archlinuxarm-n900\/libhildon,archlinuxarm-n900\/libhildon,android-808\/libhildon,archlinuxarm-n900\/libhildon,Cordia\/libhildon,community-ssu\/hildon,android-808\/libhildon,Cordia\/libhildon,android-808\/libhildon,community-ssu\/hildon,Cordia\/libhildon","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hildon-widgets\/hildon-number-editor.h\n+++ hildon-widgets\/hildon-number-editor.h\n@@ -28,24 +28,25 @@\n #include <gtk\/gtkcontainer.h>\n \n G_BEGIN_DECLS\n-#define HILDON_TYPE_NUMBER_EDITOR \\\n- ( hildon_number_editor_get_type() )\n-#define HILDON_NUMBER_EDITOR(obj) \\\n- (GTK_CHECK_CAST (obj, HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor))\n-#define HILDON_NUMBER_EDITOR_CLASS(klass) \\\n- (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, \\\n- HildonNumberEditorClass))\n-#define HILDON_IS_NUMBER_EDITOR(obj) \\\n- (GTK_CHECK_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR))\n-#define HILDON_IS_NUMBER_EDITOR_CLASS(klass) \\\n- (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR))\n-typedef struct _HildonNumberEditor HildonNumberEditor;\n+\n+\n+\n+#define HILDON_TYPE_NUMBER_EDITOR ( hildon_number_editor_get_type() )\n+\n+#define HILDON_NUMBER_EDITOR(obj) (GTK_CHECK_CAST (obj, HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditor))\n+#define HILDON_NUMBER_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), HILDON_TYPE_NUMBER_EDITOR, HildonNumberEditorClass))\n+#define HILDON_IS_NUMBER_EDITOR(obj) (GTK_CHECK_TYPE (obj, HILDON_TYPE_NUMBER_EDITOR))\n+#define HILDON_IS_NUMBER_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_NUMBER_EDITOR))\n+\n+typedef struct _HildonNumberEditor HildonNumberEditor;\n typedef struct _HildonNumberEditorClass HildonNumberEditorClass;\n+\n \n struct _HildonNumberEditor \n {\n GtkContainer parent;\n };\n+\n \n typedef enum\n {\n@@ -53,28 +54,28 @@\n MINIMUM_VALUE_EXCEED,\n ERRONEOUS_VALUE\n \n-}HildonNumberEditorErrorType;\n+} HildonNumberEditorErrorType;\n+\n \n struct _HildonNumberEditorClass \n {\n GtkContainerClass parent_class;\n \n- gboolean\t(*range_error)\t(HildonNumberEditor *editor, \n-\t\t\t\t\t HildonNumberEditorErrorType type); \n+ gboolean\t(*range_error)\t(HildonNumberEditor *editor, HildonNumberEditorErrorType type); \n };\n \n-\/* Public API *\/\n \n GType \t\thildon_number_editor_get_type\t(void) G_GNUC_CONST;\n \n GtkWidget*\thildon_number_editor_new\t(gint min, gint max);\n \n void \t\thildon_number_editor_set_range\t(HildonNumberEditor *editor, \n-\t\t\t\t\t\t gint min, gint max);\n+ gint min,\n+ gint max);\n \n gint \t\thildon_number_editor_get_value\t(HildonNumberEditor *editor);\n-void \t\thildon_number_editor_set_value\t(HildonNumberEditor *editor, \n-\t\t\t\t\t\t gint value);\n+void \t\thildon_number_editor_set_value\t(HildonNumberEditor *editor, gint value);\n+\n \n G_END_DECLS\n #endif \/* __HILDON_NUMBER_EDITOR_H__ *\/\n"} {"commit":"d0a3748bdc601c59c76f7a07c9a9a87cf32f7b92","subject":"Fix reference counting bug in graphics state material.","message":"Fix reference counting bug in graphics state material.\n\ndarcs-hash:20080308121639-86a4e-0251207f7708cc1edac85b20af3967b0d74518e2.gz\n","repos":"nqv\/mupdf,nqv\/mupdf,nqv\/mupdf,nqv\/mupdf,nqv\/mupdf,nqv\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mupdf\/pdf_interpret.c\n+++ mupdf\/pdf_interpret.c\n@@ -62,9 +62,41 @@\n \tcsi->top = 0;\n }\n \n+static pdf_material *\n+pdf_keepmaterial(pdf_material *mat)\n+{\n+ if (mat->cs)\n+ fz_keepcolorspace(mat->cs);\n+ if (mat->indexed)\n+ fz_keepcolorspace(&mat->indexed->super);\n+ if (mat->pattern)\n+ pdf_keeppattern(mat->pattern);\n+ if (mat->shade)\n+ fz_keepshade(mat->shade);\n+\n+ return mat;\n+}\n+\n+static pdf_material *\n+pdf_dropmaterial(pdf_material *mat)\n+{\n+ if (mat->cs)\n+ fz_dropcolorspace(mat->cs);\n+ if (mat->indexed)\n+ fz_dropcolorspace(&mat->indexed->super);\n+ if (mat->pattern)\n+ pdf_droppattern(mat->pattern);\n+ if (mat->shade)\n+ fz_dropshade(mat->shade);\n+\n+ return mat;\n+}\n+\n static fz_error *\n gsave(pdf_csi *csi)\n {\n+ pdf_gstate *gs = csi->gstate + csi->gtop;\n+\n \tif (csi->gtop == 31)\n \t\treturn fz_throw(\"gstate overflow in content stream\");\n \n@@ -72,10 +104,8 @@\n \n \tcsi->gtop ++;\n \n-\tif (csi->gstate[csi->gtop].fill.cs)\n-\t\tfz_keepcolorspace(csi->gstate[csi->gtop].fill.cs);\n-\tif (csi->gstate[csi->gtop].stroke.cs)\n-\t\tfz_keepcolorspace(csi->gstate[csi->gtop].stroke.cs);\n+ pdf_keepmaterial(&gs->stroke);\n+ pdf_keepmaterial(&gs->fill);\n \n \treturn nil;\n }\n@@ -83,13 +113,13 @@\n static fz_error *\n grestore(pdf_csi *csi)\n {\n+ pdf_gstate *gs = csi->gstate + csi->gtop;\n+\n \tif (csi->gtop == 0)\n \t\treturn fz_throw(\"gstate underflow in content stream\");\n \n-\tif (csi->gstate[csi->gtop].fill.cs)\n-\t\tfz_dropcolorspace(csi->gstate[csi->gtop].fill.cs);\n-\tif (csi->gstate[csi->gtop].stroke.cs)\n-\t\tfz_dropcolorspace(csi->gstate[csi->gtop].stroke.cs);\n+ pdf_dropmaterial(&gs->stroke);\n+ pdf_dropmaterial(&gs->fill);\n \n \tcsi->gtop --;\n \n"} {"commit":"264ebb182e85f30aa473fa2189d5d5ea173ec3ab","subject":"x86: Introduce max_early_res and early_res_count","message":"x86: Introduce max_early_res and early_res_count\n\nTo prepare allocate early res array from fine_e820_area.\n\nSigned-off-by: Yinghai Lu <0674548f4d596393408a51d6287a76ebba2f42aa@kernel.org>\nLKML-Reference: <1265793639-15071-13-git-send-email-0674548f4d596393408a51d6287a76ebba2f42aa@kernel.org>\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kernel\/e820.c\n+++ arch\/x86\/kernel\/e820.c\n@@ -732,14 +732,18 @@\n \/*\n * Early reserved memory areas.\n *\/\n-#define MAX_EARLY_RES 32\n+\/*\n+ * need to make sure this one is bigger enough before\n+ * find_e820_area could be used\n+ *\/\n+#define MAX_EARLY_RES_X 32\n \n struct early_res {\n \tu64 start, end;\n-\tchar name[16];\n+\tchar name[15];\n \tchar overlap_ok;\n };\n-static struct early_res early_res[MAX_EARLY_RES] __initdata = {\n+static struct early_res early_res_x[MAX_EARLY_RES_X] __initdata = {\n \t{ 0, PAGE_SIZE, \"BIOS data page\", 1 },\t\/* BIOS data page *\/\n #if defined(CONFIG_X86_32) && defined(CONFIG_X86_TRAMPOLINE)\n \t\/*\n@@ -753,12 +757,22 @@\n \t{}\n };\n \n+static int max_early_res __initdata = MAX_EARLY_RES_X;\n+static struct early_res *early_res __initdata = &early_res_x[0];\n+static int early_res_count __initdata =\n+#ifdef CONFIG_X86_32\n+\t2\n+#else\n+\t1\n+#endif\n+\t;\n+\n static int __init find_overlapped_early(u64 start, u64 end)\n {\n \tint i;\n \tstruct early_res *r;\n \n-\tfor (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {\n+\tfor (i = 0; i < max_early_res && early_res[i].end; i++) {\n \t\tr = &early_res[i];\n \t\tif (end > r->start && start < r->end)\n \t\t\tbreak;\n@@ -776,13 +790,14 @@\n {\n \tint j;\n \n-\tfor (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++)\n+\tfor (j = i + 1; j < max_early_res && early_res[j].end; j++)\n \t\t;\n \n \tmemmove(&early_res[i], &early_res[i + 1],\n \t (j - 1 - i) * sizeof(struct early_res));\n \n \tearly_res[j - 1].end = 0;\n+\tearly_res_count--;\n }\n \n \/*\n@@ -801,9 +816,9 @@\n \tstruct early_res *r;\n \tu64 lower_start, lower_end;\n \tu64 upper_start, upper_end;\n-\tchar name[16];\n-\n-\tfor (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {\n+\tchar name[15];\n+\n+\tfor (i = 0; i < max_early_res && early_res[i].end; i++) {\n \t\tr = &early_res[i];\n \n \t\t\/* Continue past non-overlapping ranges *\/\n@@ -859,7 +874,7 @@\n \tstruct early_res *r;\n \n \ti = find_overlapped_early(start, end);\n-\tif (i >= MAX_EARLY_RES)\n+\tif (i >= max_early_res)\n \t\tpanic(\"Too many early reservations\");\n \tr = &early_res[i];\n \tif (r->end)\n@@ -872,6 +887,7 @@\n \tr->overlap_ok = overlap_ok;\n \tif (name)\n \t\tstrncpy(r->name, name, sizeof(r->name) - 1);\n+\tearly_res_count++;\n }\n \n \/*\n@@ -924,7 +940,7 @@\n \n \ti = find_overlapped_early(start, end);\n \tr = &early_res[i];\n-\tif (i >= MAX_EARLY_RES || r->end != end || r->start != start)\n+\tif (i >= max_early_res || r->end != end || r->start != start)\n \t\tpanic(\"free_early on not reserved area: %llx-%llx!\",\n \t\t\t start, end - 1);\n \n@@ -935,14 +951,15 @@\n {\n \tint i, count;\n \tu64 final_start, final_end;\n+\tint idx = 0;\n \n \tcount = 0;\n-\tfor (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++)\n+\tfor (i = 0; i < max_early_res && early_res[i].end; i++)\n \t\tcount++;\n \n-\tprintk(KERN_INFO \"(%d early reservations) ==> bootmem [%010llx - %010llx]\\n\",\n-\t\t\t count, start, end);\n-\tfor (i = 0; i < count; i++) {\n+\tprintk(KERN_INFO \"(%d\/%d early reservations) ==> bootmem [%010llx - %010llx]\\n\",\n+\t\t\t count - idx, max_early_res, start, end);\n+\tfor (i = idx; i < count; i++) {\n \t\tstruct early_res *r = &early_res[i];\n \t\tprintk(KERN_INFO \" #%d [%010llx - %010llx] %16s\", i,\n \t\t\tr->start, r->end, r->name);\n@@ -969,7 +986,7 @@\n again:\n \ti = find_overlapped_early(addr, addr + size);\n \tr = &early_res[i];\n-\tif (i < MAX_EARLY_RES && r->end) {\n+\tif (i < max_early_res && r->end) {\n \t\t*addrp = addr = round_up(r->end, align);\n \t\tchanged = 1;\n \t\tgoto again;\n@@ -986,7 +1003,7 @@\n \tint changed = 0;\n again:\n \tlast = addr + size;\n-\tfor (i = 0; i < MAX_EARLY_RES && early_res[i].end; i++) {\n+\tfor (i = 0; i < max_early_res && early_res[i].end; i++) {\n \t\tstruct early_res *r = &early_res[i];\n \t\tif (last > r->start && addr < r->start) {\n \t\t\tsize = r->start - addr;\n"} {"commit":"838989b572ea4a48f1cf60b927c67f14f4702968","subject":"Added the binding for virConnectFindStoragePoolSources.","message":"Added the binding for virConnectFindStoragePoolSources.\n","repos":"libvirt\/ruby-libvirt,libvirt\/ruby-libvirt,libvirt\/ruby-libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/libvirt\/_libvirt.c\n+++ ext\/libvirt\/_libvirt.c\n@@ -1292,6 +1292,25 @@\n _E(pool == NULL, create_error(e_DefinitionError, \"virStoragePoolDefineXML\", \"\", conn));\n \n return pool_new(pool, c);\n+}\n+\n+\/*\n+ * Call +virConnectFindStoragePoolSources+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virConnectFindStoragePoolSources]\n+ *\/\n+VALUE libvirt_conn_find_storage_pool_sources(int argc, VALUE *argv, VALUE c) {\n+ virConnectPtr conn = connect_get(c);\n+ VALUE type, srcSpec_val, flags;\n+ const char *srcSpec;\n+\n+ rb_scan_args(argc, argv, \"12\", &type, &srcSpec_val, &flags);\n+\n+ srcSpec = get_string_or_nil(srcSpec_val);\n+\n+ if (NIL_P(flags))\n+ flags = INT2FIX(0);\n+\n+ gen_call_string(virConnectFindStoragePoolSources, conn, 1, conn,\n+ StringValueCStr(type), srcSpec, NUM2UINT(flags));\n }\n \n \/*\n@@ -1839,6 +1858,8 @@\n libvirt_conn_create_pool_xml, -1);\n rb_define_method(c_connect, \"define_storage_pool_xml\",\n libvirt_conn_define_pool_xml, -1);\n+ rb_define_method(c_connect, \"discover_storage_pool_sources\",\n+ libvirt_conn_find_storage_pool_sources, -1);\n #endif\n \n \/*\n"} {"commit":"790aa776a641653d424df2da12ba88623f7f091e","subject":"use memcpy inside quadrant","message":"use memcpy inside quadrant\n","repos":"thfabian\/molec,thfabian\/molec,thfabian\/molec","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ForceQuadrant.c\n+++ src\/ForceQuadrant.c\n@@ -16,6 +16,8 @@\n #include <molec\/Force.h>\n #include <molec\/Quadrant.h>\n #include <molec\/Parameter.h>\n+\n+#include <string.h>\n \n \/**\n * Calculate distance between x and y taking periodic boundaries into account\n@@ -307,18 +309,19 @@\n molec_Quadrant_t q_idx = quadrants[idx];\n int N_idx = q_idx.N;\n \n- for(int i = 0; i < N_idx; ++i, ++n_1D)\n- {\n- x[n_1D] = q_idx.x[i];\n- y[n_1D] = q_idx.y[i];\n- z[n_1D] = q_idx.z[i];\n- v_x[n_1D] = q_idx.v_x[i];\n- v_y[n_1D] = q_idx.v_y[i];\n- v_z[n_1D] = q_idx.v_z[i];\n- f_x[n_1D] = q_idx.f_x[i];\n- f_y[n_1D] = q_idx.f_y[i];\n- f_z[n_1D] = q_idx.f_z[i];\n- }\n+ memcpy(x + n_1D, q_idx.x, N_idx * sizeof(float));\n+ memcpy(y + n_1D, q_idx.y, N_idx * sizeof(float));\n+ memcpy(z + n_1D, q_idx.z, N_idx * sizeof(float));\n+\n+ memcpy(v_x + n_1D, q_idx.v_x, N_idx * sizeof(float));\n+ memcpy(v_y + n_1D, q_idx.v_y, N_idx * sizeof(float));\n+ memcpy(v_z + n_1D, q_idx.v_z, N_idx * sizeof(float));\n+\n+ memcpy(f_x + n_1D, q_idx.f_x, N_idx * sizeof(float));\n+ memcpy(f_y + n_1D, q_idx.f_y, N_idx * sizeof(float));\n+ memcpy(f_z + n_1D, q_idx.f_z, N_idx * sizeof(float));\n+\n+ n_1D += N_idx;\n }\n \n \n"} {"commit":"5ca6c0ca5dbf105d7b0ffdae2289519982189730","subject":"x86: use kernel_stack_pointer() in kgdb.c","message":"x86: use kernel_stack_pointer() in kgdb.c\n\nThe way to obtain a kernel-mode stack pointer from a struct\npt_regs in 32-bit mode is \"subtle\": the stack doesn't actually\ncontain the stack pointer, but rather the location where it would\nhave been marks the actual previous stack frame. For clarity, use\nkernel_stack_pointer() instead of coding this weirdness\nexplicitly.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\nCc: Jason Wessel <3f19c87103ac4cd0301ffd05a2421b687c7b3c77@windriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kernel\/kgdb.c\n+++ arch\/x86\/kernel\/kgdb.c\n@@ -88,7 +88,6 @@\n \tgdb_regs[GDB_SS]\t= __KERNEL_DS;\n \tgdb_regs[GDB_FS]\t= 0xFFFF;\n \tgdb_regs[GDB_GS]\t= 0xFFFF;\n-\tgdb_regs[GDB_SP]\t= (int)®s->sp;\n #else\n \tgdb_regs[GDB_R8]\t= regs->r8;\n \tgdb_regs[GDB_R9]\t= regs->r9;\n@@ -101,8 +100,8 @@\n \tgdb_regs32[GDB_PS]\t= regs->flags;\n \tgdb_regs32[GDB_CS]\t= regs->cs;\n \tgdb_regs32[GDB_SS]\t= regs->ss;\n-\tgdb_regs[GDB_SP]\t= regs->sp;\n-#endif\n+#endif\n+\tgdb_regs[GDB_SP]\t= kernel_stack_pointer(regs);\n }\n \n \/**\n"} {"commit":"33686f37514e1ef68bb6c15a8dabaf868d595c02","subject":"changing options for release","message":"changing options for release\n","repos":"yorung\/XLE,yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE,yorung\/XLE,yorung\/XLE,yorung\/XLE,xlgames-inc\/XLE,yorung\/XLE,xlgames-inc\/XLE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/freetype\/config\/ftoption.h\n+++ include\/freetype\/config\/ftoption.h\n@@ -258,7 +258,7 @@\n \/* Don't define any of these macros to compile in `release' mode! *\/\n \/* *\/\n #undef FT_DEBUG_LEVEL_ERROR\n-#define FT_DEBUG_LEVEL_TRACE\n+#undef FT_DEBUG_LEVEL_TRACE\n \n \n \/*************************************************************************\/\n@@ -273,7 +273,7 @@\n \/* Note that the memory debugger is only activated at runtime when *\/\n \/* when the _environment_ variable \"FT_DEBUG_MEMORY\" is also defined! *\/\n \/* *\/\n-#define FT_DEBUG_MEMORY\n+#undef FT_DEBUG_MEMORY\n \n \n \/*************************************************************************\/\n@@ -294,19 +294,6 @@\n \/* FreeType library object. 16 is the default. *\/\n \/* *\/\n #define FT_MAX_MODULES 16\n-\n-\n- \/*************************************************************************\/\n- \/* *\/\n- \/* FT_MAX_EXTENSIONS *\/\n- \/* *\/\n- \/* The maximum number of extensions that can be registered in a single *\/\n- \/* font driver. 8 is the default. *\/\n- \/* *\/\n- \/* If you don't know what this means, you certainly do not need to *\/\n- \/* change this value. *\/\n- \/* *\/\n-#define FT_MAX_EXTENSIONS 8\n \n \n \/*************************************************************************\/\n"} {"commit":"f1e912b64fe0175dd32b3b6caff16521ac04708d","subject":"Map the B button to back on SDL menus","message":"Map the B button to back on SDL menus\n","repos":"LIJI32\/SameBoy,LIJI32\/SameBoy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SDL\/gui.c\n+++ SDL\/gui.c\n@@ -1793,7 +1793,7 @@\n if (button == JOYPAD_BUTTON_A) {\n event.key.keysym.scancode = SDL_SCANCODE_RETURN;\n }\n- else if (button == JOYPAD_BUTTON_MENU) {\n+ else if (button == JOYPAD_BUTTON_MENU || button == JOYPAD_BUTTON_B) {\n event.key.keysym.scancode = SDL_SCANCODE_ESCAPE;\n }\n else if (button == JOYPAD_BUTTON_UP) event.key.keysym.scancode = SDL_SCANCODE_UP;\n"} {"commit":"786f87ef30c0dfc852a63b6bb9cfb0e74ad6f598","subject":"shout2send: Retarget FIXME to 2.0","message":"shout2send: Retarget FIXME to 2.0\n","repos":"chamois94\/gst-plugins-good,strukturag\/gst-plugins-good,rawoul\/gst-plugins-good,sh0\/gst-plugins-good,davibe\/gst-plugins-good-1.0,wkatsak\/gst-plugins-good,surround-io\/gst-plugins-good,hizukiayaka\/gst-plugins-good,stfl\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,hizukiayaka\/gst-plugins-good,cfoch\/gst-plugins-good,cfoch\/gst-plugins-good,chamois94\/gst-plugins-good,ikonst\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,surround-io\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,BigBrother-International\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,veo-labs\/gst-plugins-good,greg80303\/gst-plugins-good,greg80303\/gst-plugins-good,kittee\/gst-plugins-good,ikonst\/gst-plugins-good,kittee\/gst-plugins-good,Lachann\/gst-plugins-good,pexip\/gst-plugins-good,Kurento\/gst-plugins-good,jcaden\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,kittee\/gst-plugins-good,rawoul\/gst-plugins-good,hizukiayaka\/gst-plugins-good,froggatt\/gst-plugins-good-m,loshca\/gst-plugins-good,cfoch\/gst-plugins-good,wkatsak\/gst-plugins-good,ndufresne\/gst-plugins-good,chamois94\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,GrokImageCompression\/gst-plugins-good,shelsonjava\/gst-plugins-good,Lachann\/gst-plugins-good,GStreamer\/gst-plugins-good,lovebug356\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,ikonst\/gst-plugins-good,sebras\/gst-plugins-good,shelsonjava\/gst-plugins-good,GStreamer\/gst-plugins-good,sebras\/gst-plugins-good,BigBrother-International\/gst-plugins-good,StreamUtils\/gst-plugins-good,vatavuserban\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,froggatt\/gst-plugins-good-m,ndufresne\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,surround-io\/gst-plugins-good,ikonst\/gst-plugins-good,loshca\/gst-plugins-good,cablelabs\/gst-plugins-good,veo-labs\/gst-plugins-good,Kurento\/gst-plugins-good,stfl\/gst-plugins-good,chamois94\/gst-plugins-good,stfl\/gst-plugins-good,strukturag\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,froggatt\/gst-plugins-good-m,stfl\/gst-plugins-good,pexip\/gst-plugins-good,wkatsak\/gst-plugins-good,Kurento\/gst-plugins-good,kittee\/gst-plugins-good,cablelabs\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,loshca\/gst-plugins-good,jcaden\/gst-plugins-good,Lachann\/gst-plugins-good,veo-labs\/gst-plugins-good,cablelabs\/gst-plugins-good,strukturag\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,StreamUtils\/gst-plugins-good,greg80303\/gst-plugins-good,davibe\/gst-plugins-good-1.0,rawoul\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,lovebug356\/gst-plugins-good,loshca\/gst-plugins-good,sebras\/gst-plugins-good,wkatsak\/gst-plugins-good,vatavuserban\/gst-plugins-good,GStreamer\/gst-plugins-good,ndufresne\/gst-plugins-good,froggatt\/gst-plugins-good-m,veo-labs\/gst-plugins-good,pexip\/gst-plugins-good,cablelabs\/gst-plugins-good,Kurento\/gst-plugins-good,StreamUtils\/gst-plugins-good,GStreamer\/gst-plugins-good,sh0\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,Lachann\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,surround-io\/gst-plugins-good,pexip\/gst-plugins-good,davibe\/gst-plugins-good-1.0,ndufresne\/gst-plugins-good,cfoch\/gst-plugins-good,strukturag\/gst-plugins-good,greg80303\/gst-plugins-good,sh0\/gst-plugins-good,StreamUtils\/gst-plugins-good,sebras\/gst-plugins-good,pexip\/gst-plugins-good,vatavuserban\/gst-plugins-good,BigBrother-International\/gst-plugins-good,davibe\/gst-plugins-good-1.0,jpakkane\/gstreamer-plugins-good,rawoul\/gst-plugins-good,shelsonjava\/gst-plugins-good,jcaden\/gst-plugins-good,lovebug356\/gst-plugins-good,jcaden\/gst-plugins-good,hizukiayaka\/gst-plugins-good,Kurento\/gst-plugins-good,sh0\/gst-plugins-good,shelsonjava\/gst-plugins-good,vatavuserban\/gst-plugins-good,BigBrother-International\/gst-plugins-good,lovebug356\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/shout2\/gstshout2.c\n+++ ext\/shout2\/gstshout2.c\n@@ -35,7 +35,7 @@\n \n enum\n {\n- SIGNAL_CONNECTION_PROBLEM, \/* 0.11 FIXME: remove this *\/\n+ SIGNAL_CONNECTION_PROBLEM, \/* FIXME 2.0: remove this *\/\n LAST_SIGNAL\n };\n \n"} {"commit":"286e5b97eb22baab9d9a41ca76c6b933a484252c","subject":"x86, olpc: Don't retry EC commands forever","message":"x86, olpc: Don't retry EC commands forever\n\nAvoids a potential infinite loop.\n\nIt was observed once, during an EC hacking\/debugging\nsession - not in regular operation.\n\nSigned-off-by: Daniel Drake <83b0c3d63e8a11eb6e40077030b59e95bfe31ffa@laptop.org>\nCc: 3945bcf5fa0c9ecb9066fe0f9d287073618c06cc@queued.net\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/kernel\/olpc.c\n+++ arch\/x86\/kernel\/olpc.c\n@@ -114,6 +114,7 @@\n \tunsigned long flags;\n \tint ret = -EIO;\n \tint i;\n+\tint restarts = 0;\n \n \tspin_lock_irqsave(&ec_lock, flags);\n \n@@ -169,7 +170,9 @@\n \t\t\tif (wait_on_obf(0x6c, 1)) {\n \t\t\t\tprintk(KERN_ERR \"olpc-ec: timeout waiting for\"\n \t\t\t\t\t\t\" EC to provide data!\\n\");\n-\t\t\t\tgoto restart;\n+\t\t\t\tif (restarts++ < 10)\n+\t\t\t\t\tgoto restart;\n+\t\t\t\tgoto err;\n \t\t\t}\n \t\t\toutbuf[i] = inb(0x68);\n \t\t\tpr_devel(\"olpc-ec: received 0x%x\\n\", outbuf[i]);\n"} {"commit":"74c2086cbe8872eb3d6f7bc40de506796ade70f1","subject":"menu: don't use deprecated GtkMisc","message":"menu: don't use deprecated GtkMisc\n","repos":"GNOME\/gnome-panel,GNOME\/gnome-panel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gnome-panel\/menu.c\n+++ gnome-panel\/menu.c\n@@ -776,7 +776,7 @@\n \n \tgtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuitem);\n \n-\tgtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);\n+\tgtk_label_set_xalign (GTK_LABEL (label), 0);\n \tgtk_widget_show (label);\n \n \tgtk_container_add (GTK_CONTAINER (menuitem), label);\n"} {"commit":"69443d0da007cf49bc343eb1b9549acb7da46165","subject":"ENGINE_load_[private|public]_key had error handling that could return without releasing a lock. This is the same fix as applied to OpenSSL-engine-0_9_6-stable, minus the ENGINE_ctrl() change - the HEAD already had that fixed.","message":"ENGINE_load_[private|public]_key had error handling that could return\nwithout releasing a lock. This is the same fix as applied to\nOpenSSL-engine-0_9_6-stable, minus the ENGINE_ctrl() change - the HEAD\nalready had that fixed.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/engine\/engine_lib.c\n+++ crypto\/engine\/engine_lib.c\n@@ -230,17 +230,18 @@\n \tCRYPTO_w_lock(CRYPTO_LOCK_ENGINE);\n \tif(e->funct_ref == 0)\n \t\t{\n+\t\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \t\tENGINEerr(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY,\n \t\t\tENGINE_R_NOT_INITIALISED);\n \t\treturn 0;\n \t\t}\n+\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \tif (!e->load_privkey)\n \t\t{\n \t\tENGINEerr(ENGINE_F_ENGINE_LOAD_PRIVATE_KEY,\n \t\t\tENGINE_R_NO_LOAD_FUNCTION);\n \t\treturn 0;\n \t\t}\n-\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \tpkey = e->load_privkey(key_id, passphrase);\n \tif (!pkey)\n \t\t{\n@@ -265,17 +266,18 @@\n \tCRYPTO_w_lock(CRYPTO_LOCK_ENGINE);\n \tif(e->funct_ref == 0)\n \t\t{\n+\t\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \t\tENGINEerr(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY,\n \t\t\tENGINE_R_NOT_INITIALISED);\n \t\treturn 0;\n \t\t}\n+\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \tif (!e->load_pubkey)\n \t\t{\n \t\tENGINEerr(ENGINE_F_ENGINE_LOAD_PUBLIC_KEY,\n \t\t\tENGINE_R_NO_LOAD_FUNCTION);\n \t\treturn 0;\n \t\t}\n-\tCRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);\n \tpkey = e->load_pubkey(key_id, passphrase);\n \tif (!pkey)\n \t\t{\n"} {"commit":"e2cefa746e7e2a1104931d411b6f5de159d98ec6","subject":"KVM: x86: Do not set access bit on accessed segments","message":"KVM: x86: Do not set access bit on accessed segments\n\nWhen segment is loaded, the segment access bit is set unconditionally. In\nfact, it should be set conditionally, based on whether the segment had the\naccessed bit set before. In addition, it can improve performance.\n\nSigned-off-by: Nadav Amit <592678034eb0a2c8d7d04a06101ed8b7dc7101dd@cs.technion.ac.il>\nSigned-off-by: Paolo Bonzini <69d3ebcf5ee4e7f05a50dc23cd96655b730804b4@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"fc0586807dc4e307da6d3ba4ed5c927b6d27276c","subject":"KVM: x86: Fix typos in emulate.c","message":"KVM: x86: Fix typos in emulate.c\n\nSigned-off-by: Guo Chao <e958ec5a56cd9794647c3623b3aa5a85122e74a5@linux.vnet.ibm.com>\nSigned-off-by: Marcelo Tosatti <958bcd1f4a7a8c36dca09fe3fa9cb5f1483adf51@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/kvm\/emulate.c\n+++ arch\/x86\/kvm\/emulate.c\n@@ -642,7 +642,7 @@\n \t\t\tif (addr.ea > lim || (u32)(addr.ea + size - 1) > lim)\n \t\t\t\tgoto bad;\n \t\t} else {\n-\t\t\t\/* exapand-down segment *\/\n+\t\t\t\/* expand-down segment *\/\n \t\t\tif (addr.ea <= lim || (u32)(addr.ea + size - 1) <= lim)\n \t\t\t\tgoto bad;\n \t\t\tlim = desc.d ? 0xffffffff : 0xffff;\n@@ -1383,7 +1383,7 @@\n \terr_code = selector & 0xfffc;\n \terr_vec = GP_VECTOR;\n \n-\t\/* can't load system descriptor into segment selecor *\/\n+\t\/* can't load system descriptor into segment selector *\/\n \tif (seg <= VCPU_SREG_GS && !seg_desc.s)\n \t\tgoto exception;\n \n@@ -2398,7 +2398,7 @@\n \tset_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);\n \n \t\/*\n-\t * Now load segment descriptors. If fault happenes at this stage\n+\t * Now load segment descriptors. If fault happens at this stage\n \t * it is handled in a context of new task\n \t *\/\n \tret = load_segment_descriptor(ctxt, tss->ldt, VCPU_SREG_LDTR);\n@@ -2640,7 +2640,7 @@\n \t *\n \t * 1. jmp\/call\/int to task gate: Check against DPL of the task gate\n \t * 2. Exception\/IRQ\/iret: No check is performed\n-\t * 3. jmp\/call to TSS: Check agains DPL of the TSS\n+\t * 3. jmp\/call to TSS: Check against DPL of the TSS\n \t *\/\n \tif (reason == TASK_SWITCH_GATE) {\n \t\tif (idt_index != -1) {\n@@ -2681,7 +2681,7 @@\n \t\tctxt->eflags = ctxt->eflags & ~X86_EFLAGS_NT;\n \n \t\/* set back link to prev task only if NT bit is set in eflags\n-\t note that old_tss_sel is not used afetr this point *\/\n+\t note that old_tss_sel is not used after this point *\/\n \tif (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE)\n \t\told_tss_sel = 0xffff;\n \n"} {"commit":"c3803ab1c4461112c2cf6bf7ae08b3b755d219d4","subject":"Adding support to read and write complex matrices in Matrix Market format","message":"Adding support to read and write complex matrices in Matrix Market format\n","repos":"madlib\/eigen,madlib\/eigen,madlib\/eigen,madlib\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- unsupported\/Eigen\/src\/SparseExtra\/MarketIO.h\n+++ unsupported\/Eigen\/src\/SparseExtra\/MarketIO.h\n@@ -2,6 +2,7 @@\n \/\/ for linear algebra.\n \/\/\n \/\/ Copyright (C) 2011 Gael Guennebaud <gael.guennebaud@inria.fr>\n+\/\/ Copyright (C) 2012 Desire NUENTSA WAKAM <desire.nuentsa_wakam@inria.fr>\n \/\/\n \/\/ Eigen is free software; you can redistribute it and\/or\n \/\/ modify it under the terms of the GNU Lesser General Public\n@@ -24,8 +25,120 @@\n \n #ifndef EIGEN_SPARSE_MARKET_IO_H\n #define EIGEN_SPARSE_MARKET_IO_H\n-\n-\n+namespace internal \n+{\n+ template <typename Scalar>\n+ inline bool GetMarketLine (std::stringstream& line, int& M, int& N, int& i, int& j, Scalar& value)\n+ {\n+ line >> i >> j >> value;\n+ i--;\n+ j--;\n+ if(i>=0 && j>=0 && i<M && j<N)\n+ {\n+ return true; \n+ }\n+ else\n+ return false;\n+ }\n+ template <typename Scalar>\n+ inline bool GetMarketLine (std::stringstream& line, int& M, int& N, int& i, int& j, std::complex<Scalar>& value)\n+ {\n+ Scalar valR, valI;\n+ line >> i >> j >> valR >> valI;\n+ i--;\n+ j--;\n+ if(i>=0 && j>=0 && i<M && j<N)\n+ {\n+ value = std::complex<Scalar>(valR, valI);\n+ return true; \n+ }\n+ else\n+ return false;\n+ }\n+\n+ template <typename RealScalar>\n+ inline void GetVectorElt (const std::string& line, RealScalar& val)\n+ {\n+ std::istringstream newline(line);\n+ newline >> val; \n+ }\n+\n+ template <typename RealScalar>\n+ inline void GetVectorElt (const std::string& line, std::complex<RealScalar>& val)\n+ {\n+ RealScalar valR, valI; \n+ std::istringstream newline(line);\n+ newline >> valR >> valI; \n+ val = std::complex<RealScalar>(valR, valI);\n+ }\n+ \n+ template<typename Scalar>\n+ inline void putMarketHeader(std::string& header,int sym)\n+ {\n+ header= \"%%MatrixMarket matrix coordinate \";\n+ if(internal::is_same<Scalar, std::complex<float> >::value || internal::is_same<Scalar, std::complex<double> >::value)\n+ {\n+ header += \" complex\"; \n+ if(sym == Symmetric) header += \" symmetric\";\n+ else if (sym == SelfAdjoint) header += \" hermitian\";\n+ else header += \" general\";\n+ }\n+ else\n+ {\n+ header += \" real\"; \n+ if(sym == Symmetric) header += \" symmetric\";\n+ else header += \" general\";\n+ }\n+ }\n+\n+ template<typename Scalar>\n+ inline void PutMatrixElt(Scalar value, int row, int col, std::ofstream& out)\n+ {\n+ out << row << \" \"<< col << \" \" << value << \"\\n\";\n+ }\n+ template<typename Scalar>\n+ inline void PutMatrixElt(std::complex<Scalar> value, int row, int col, std::ofstream& out)\n+ {\n+ out << row << \" \" << col << \" \" << value.real() << \" \" << value.imag() << \"\\n\";\n+ }\n+\n+\n+ template<typename Scalar>\n+ inline void putVectorElt(Scalar value, std::ofstream& out)\n+ {\n+ out << value << \"\\n\"; \n+ }\n+ template<typename Scalar>\n+ inline void putVectorElt(std::complex<Scalar> value, std::ofstream& out)\n+ {\n+ out << value.real << \" \" << value.imag()<< \"\\n\"; \n+ }\n+\n+}\n+\n+inline bool getMarketHeader(const std::string& filename, int& sym, bool& iscomplex, bool& isvector)\n+{\n+ sym = 0; \n+ isvector = false;\n+ std::ifstream in(filename.c_str(),std::ios::in);\n+ if(!in)\n+ return false;\n+ \n+ std::string line; \n+ \/\/ The matrix header is always the first line in the file \n+ std::getline(in, line); assert(in.good());\n+ \n+ std::stringstream fmtline(line); \n+ std::string substr[5];\n+ fmtline>> substr[0] >> substr[1] >> substr[2] >> substr[3] >> substr[4];\n+ if(substr[2].compare(\"array\") == 0) isvector = true;\n+ if(substr[3].compare(\"complex\") == 0) iscomplex = true;\n+ if(substr[4].compare(\"symmetric\") == 0) sym = Symmetric;\n+ else if (substr[4].compare(\"hermitian\") == 0) sym = SelfAdjoint;\n+ \n+ return true;\n+}\n+ \n template<typename SparseMatrixType>\n bool loadMarket(SparseMatrixType& mat, const std::string& filename)\n {\n@@ -41,10 +154,10 @@\n \n int M(-1), N(-1), NNZ(-1);\n int count = 0;\n- \n while(input.getline(buffer, maxBuffersize))\n {\n- \/\/ skip comments\n+ \/\/ skip comments \n+ \/\/NOTE An appropriate test should be done on the header to get the symmetry\n if(buffer[0]=='%')\n continue;\n \n@@ -59,23 +172,19 @@\n mat.reserve(NNZ);\n }\n else\n- {\n+ { \n int i(-1), j(-1);\n- Scalar v;\n- line >> i >> j >> v;\n- i--;\n- j--;\n- if(i>=0 && j>=0 && i<M && j<N)\n+ Scalar value; \n+ if( internal::GetMarketLine(line, M, N, i, j, value) ) \n {\n ++ count;\n- \/\/std::cout << \"M[\" << i << \",\" << j << \"] = \" << v << \"\\n\";\n- mat.insert(i,j) = v;\n+ mat.insert(i,j) = value;\n }\n- else\n- std::cerr << \"Invalid read: \" << i << \",\" << j << \"\\n\";\n- }\n- }\n- \n+ else \n+ std::cerr << \"Invalid read: \" << i << \",\" << j << \"\\n\"; \n+ }\n+ }\n+\n if(count!=NNZ)\n std::cerr << count << \"!=\" << NNZ << \"\\n\";\n \n@@ -83,25 +192,83 @@\n return true;\n }\n \n+template<typename VectorType>\n+bool loadMarketVector(VectorType& vec, const std::string& filename)\n+{\n+ typedef typename VectorType::Scalar Scalar;\n+ std::ifstream in(filename.c_str(), std::ios::in);\n+ if(!in)\n+ return false;\n+ \n+ std::string line; \n+ int n(0), col(0); \n+ do \n+ { \/\/ Skip comments\n+ std::getline(in, line); assert(in.good());\n+ } while (line[0] == '%');\n+ std::istringstream newline(line);\n+ newline >> n >> col; \n+ assert(n>0 && col>0);\n+ vec.resize(n);\n+ int i = 0; \n+ Scalar value; \n+ while ( std::getline(in, line) && (i < n) ){\n+ internal::GetVectorElt(line, value); \n+ vec(i++) = value; \n+ }\n+ in.close();\n+ if (i!=n){\n+ std::cerr<< \"Unable to read all elements from file \" << filename << \"\\n\";\n+ return false;\n+ }\n+ return true;\n+}\n+\n template<typename SparseMatrixType>\n-bool saveMarket(const SparseMatrixType& mat, const std::string& filename)\n-{\n+bool saveMarket(const SparseMatrixType& mat, const std::string& filename, int sym = 0)\n+{\n+ typedef typename SparseMatrixType::Scalar Scalar;\n std::ofstream out(filename.c_str(),std::ios::out);\n if(!out)\n return false;\n \n out.flags(std::ios_base::scientific);\n out.precision(64);\n+ std::string header; \n+ internal::putMarketHeader<Scalar>(header, sym); \n+ out << header << std::endl; \n out << mat.rows() << \" \" << mat.cols() << \" \" << mat.nonZeros() << \"\\n\";\n int count = 0;\n for(int j=0; j<mat.outerSize(); ++j)\n for(typename SparseMatrixType::InnerIterator it(mat,j); it; ++it)\n {\n- ++ count;\n- out << it.row()+1 << \" \" << it.col()+1 << \" \" << it.value() << \"\\n\";\n+\t++ count;\n+\tinternal::PutMatrixElt(it.value(), it.row()+1, it.col()+1, out);\n+\t\/\/ out << it.row()+1 << \" \" << it.col()+1 << \" \" << it.value() << \"\\n\";\n }\n out.close();\n return true;\n }\n \n+template<typename VectorType>\n+bool saveMarketVector (const VectorType& vec, const std::string& filename)\n+{\n+ typedef typename VectorType::Scalar Scalar; \n+ std::ofstream out(filename.c_str(),std::ios::out);\n+ if(!out)\n+ return false;\n+ \n+ out.flags(std::ios_base::scientific);\n+ out.precision(64);\n+ if(internal::is_same<Scalar, std::complex<float> >::value || internal::is_same<Scalar, std::complex<double> >::value)\n+ out << \"%%MatrixMarket matrix array complex general\\n\"; \n+ else\n+ out << \"%%MatrixMarket matrix array real general\\n\"; \n+ out << vec.size() << \" \"<< 1 << \"\\n\";\n+ for (int i=0; i < vec.size(); i++){\n+ internal::putVectorElt(vec(i), out); \n+ }\n+ out.close();\n+ return true; \n+}\n #endif \/\/ EIGEN_SPARSE_MARKET_IO_H\n"} {"commit":"9152a24cdf5961ed1a8fc3278a257332b218fdb8","subject":"Fix for bug#4312. Conditionalized patching of StackSpace so it's only done when patching is allowed. Use FindSymbol to dynamically lookup NewRoutineDescriptor and CallOSTrapUniversalProc so we can link against CarbonLib.","message":"Fix for bug#4312. Conditionalized patching of StackSpace so it's only done when patching is allowed. Use FindSymbol to dynamically lookup NewRoutineDescriptor and CallOSTrapUniversalProc so we can link against CarbonLib.\n","repos":"thespooler\/nspr,thespooler\/nspr,thespooler\/nspr,thespooler\/nspr,thespooler\/nspr","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- pr\/src\/md\/mac\/mdmac.c\n+++ pr\/src\/md\/mac\/mdmac.c\n@@ -41,6 +41,25 @@\n #include \"prgc.h\"\n \n \n+#define UNIMPLEMENTED_ROUTINE\t\t\t\\\n+\tDebugStr(\"\\pNot Implemented Yet\");\t\\\n+\treturn 0;\n+\n+\/\/\n+\/\/ Local routines\n+\/\/\n+void PStrFromCStr(const char *, Str255);\n+unsigned char GarbageCollectorCacheFlusher(PRUint32 size);\n+\n+extern PRThread *gPrimaryThread;\n+\n+\n+\n+\/\/##############################################################################\n+\/\/##############################################################################\n+#pragma mark -\n+#pragma mark CREATING MACINTOSH THREAD STACKS\n+\n \n enum {\n \tuppExitToShellProcInfo \t\t\t\t= kPascalStackBased,\n@@ -50,33 +69,12 @@\n \t\t \t\t\t\t\t\t\t\t | REGISTER_ROUTINE_PARAMETER(1, kRegisterD1, SIZE_CODE(sizeof(UInt16)))\n };\n \n-\n-#define UNIMPLEMENTED_ROUTINE\t\t\t\\\n-\tDebugStr(\"\\pNot Implemented Yet\");\t\\\n-\treturn 0;\n-\n-\/\/\n-\/\/ Local routines\n-\/\/\n-void PStrFromCStr(const char *, Str255);\n-unsigned char GarbageCollectorCacheFlusher(PRUint32 size);\n-\n-extern PRThread *gPrimaryThread;\n-\n-\n-UniversalProcPtr\tgStackSpacePatchCallThru = NULL;\n-pascal long StackSpacePatch(UInt16);\n-\n typedef CALLBACK_API( long , StackSpacePatchPtr )(UInt16 trapNo);\n typedef REGISTER_UPP_TYPE(StackSpacePatchPtr)\tStackSpacePatchUPP;\n-#define NewStackSpaceProc(userRoutine)\t(StackSpacePatchUPP)NewRoutineDescriptor((ProcPtr)(userRoutine), uppStackSpaceProcInfo, GetCurrentArchitecture())\n-StackSpacePatchUPP\tgStackSpacePatchUPP = NULL;\n-\n-\/\/##############################################################################\n-\/\/##############################################################################\n-#pragma mark -\n-#pragma mark CREATING MACINTOSH THREAD STACKS\n-\n+\n+StackSpacePatchUPP\t gStackSpacePatchUPP = NULL;\n+UniversalProcPtr\t gStackSpacePatchCallThru = NULL;\n+long\t\t\t\t(*gCallOSTrapUniversalProc)(UniversalProcPtr,ProcInfoType,...) = NULL;\n \n \n pascal long StackSpacePatch(UInt16 trapNo)\n@@ -92,11 +90,70 @@\n \tif ((thisThread == gPrimaryThread) || \t\n \t\t(&tos < thisThread->stack->stackBottom) || \n \t\t(&tos > thisThread->stack->stackTop)) {\n-\t\treturn CallOSTrapUniversalProc(gStackSpacePatchCallThru, uppStackSpaceProcInfo, trapNo);\n+\t\treturn gCallOSTrapUniversalProc(gStackSpacePatchCallThru, uppStackSpaceProcInfo, trapNo);\n \t}\n \telse {\n \t\treturn &tos - thisThread->stack->stackBottom;\n \t}\n+}\n+\n+\n+static void InstallStackSpacePatch(void)\n+{\n+\tlong\t\t\t\tsystemVersion;\n+\tOSErr\t\t\t\terr;\n+\tCFragConnectionID\tconnID;\n+\tStr255\t\t\t\terrMessage;\n+\tPtr\t\t\t\t\tinterfaceLibAddr;\n+\tCFragSymbolClass\tsymClass;\n+\tUniversalProcPtr\t(*getOSTrapAddressProc)(UInt16);\n+\tvoid\t\t\t\t(*setOSTrapAddressProc)(UniversalProcPtr, UInt16);\n+\tUniversalProcPtr\t(*newRoutineDescriptorProc)(ProcPtr,ProcInfoType,ISAType);\n+\t\n+\n+\terr = Gestalt(gestaltSystemVersion,&systemVersion);\n+\tif (systemVersion >= 0x00000A00)\t\/\/ we don't need to patch StackSpace()\n+\t\treturn;\n+\n+\t\/\/ open connection to \"InterfaceLib\"\n+\terr = GetSharedLibrary(\"\\pInterfaceLib\", kPowerPCCFragArch, kFindCFrag,\n+\t\t\t\t\t\t\t\t\t\t\t&connID, &interfaceLibAddr, errMessage);\n+\tPR_ASSERT(err == noErr);\n+\tif (err != noErr)\n+\t\treturn;\n+\n+\t\/\/ get symbol GetOSTrapAddress\n+\terr = FindSymbol(connID, \"\\pGetOSTrapAddress\", &(Ptr)getOSTrapAddressProc, &symClass);\n+\tif (err != noErr)\n+\t\treturn;\n+\n+\t\/\/ get symbol SetOSTrapAddress\n+\terr = FindSymbol(connID, \"\\pSetOSTrapAddress\", &(Ptr)setOSTrapAddressProc, &symClass);\n+\tif (err != noErr)\n+\t\treturn;\n+\t\n+\t\/\/ get symbol NewRoutineDescriptor\n+\terr = FindSymbol(connID, \"\\pNewRoutineDescriptor\", &(Ptr)newRoutineDescriptorProc, &symClass);\n+\tif (err != noErr)\n+\t\treturn;\n+\t\n+\t\/\/ get symbol CallOSTrapUniversalProc\n+\terr = FindSymbol(connID, \"\\pCallOSTrapUniversalProc\", &(Ptr)gCallOSTrapUniversalProc, &symClass);\n+\tif (err != noErr)\n+\t\treturn;\n+\n+\t\/\/ get and set trap address for StackSpace (A065)\n+\tgStackSpacePatchCallThru = getOSTrapAddressProc(0x0065);\n+\tif (gStackSpacePatchCallThru)\n+\t{\n+\t\tgStackSpacePatchUPP =\n+\t\t\t(StackSpacePatchUPP)newRoutineDescriptorProc((ProcPtr)(StackSpacePatch), uppStackSpaceProcInfo, GetCurrentArchitecture());\n+\t\tsetOSTrapAddressProc(gStackSpacePatchUPP, 0x0065);\n+\t}\n+\n+#if DEBUG\n+\tStackSpace();\n+#endif\n }\n \n \n@@ -213,8 +270,6 @@\n void _MD_EarlyInit()\n {\n \tHandle\t\t\t\tenvironmentVariables;\n-\tlong\t\t\t\tsystemVersion;\n-\tOSErr\t\t\t\terr;\n \n #if !defined(MAC_NSPR_STANDALONE)\n \t\/\/ MacintoshInitializeMemory(); Moved to mdmacmem.c: AllocateRawMemory(Size blockSize)\n@@ -256,40 +311,7 @@\n \t_MD_PutEnv (\"NSPR_LOG_MODULES=clock:6,cmon:6,io:6,mon:6,linker:6,cvar:6,sched:6,thread:6\");\n #endif\n \n-\terr = Gestalt(gestaltSystemVersion,&systemVersion);\n-\tif (systemVersion < 0x00000A00)\t\/\/ we still need to patch StackSpace()\n-\t{\n-\t\tCFragConnectionID\tconnID;\n-\t\tStr255\t\t\t\terrMessage;\n-\t\tPtr\t\t\t\t\tinterfaceLibAddr;\n-\t\tCFragSymbolClass\tsymClass;\n-\t\tUniversalProcPtr\t(*getOSTrapAddressProc)(UInt16);\n-\t\tvoid\t\t\t\t(*setOSTrapAddressProc)(UniversalProcPtr, UInt16);\n-\n-\t\t\/\/ open connection to \"InterfaceLib\"\n-\t\terr = GetSharedLibrary(\"\\pInterfaceLib\", kPowerPCCFragArch, kFindCFrag,\n-\t\t\t\t\t\t\t\t\t\t\t\t&connID, &interfaceLibAddr, errMessage);\n-\t\tPR_ASSERT(err == noErr);\n-\n-\t\t\/\/ get symbol GetOSTrapAddress and get trap address for StackSpace (A065)\n-\t\terr = FindSymbol(connID, \"\\pGetOSTrapAddress\", &(Ptr)getOSTrapAddressProc, &symClass);\n-\t\tPR_ASSERT(err == noErr);\n-\t\tPR_ASSERT(symClass == kTVectorCFragSymbol);\n-\t\tif (err == noErr)\n-\t\t{\n-\t\t\tgStackSpacePatchCallThru = getOSTrapAddressProc(0x0065); \n-\t\t}\n-\t\t\n-\t\t\/\/ get symbol SetOSTrapAddress and set trap address for _StackSpace (A065)\n-\t\terr = FindSymbol(connID, \"\\pSetOSTrapAddress\", &(Ptr)setOSTrapAddressProc, &symClass);\n-\t\tPR_ASSERT(err == noErr);\n-\t\tPR_ASSERT(symClass == kTVectorCFragSymbol);\n-\t\tif (err == noErr && gStackSpacePatchCallThru)\n-\t\t{\n-\t\t\tgStackSpacePatchUPP = NewStackSpaceProc(StackSpacePatch);\n-\t\t\tsetOSTrapAddressProc(gStackSpacePatchUPP, 0x0065);\n-\t\t}\n-\t}\n+\tInstallStackSpacePatch();\n }\n \n void _MD_FinalInit()\n@@ -435,9 +457,7 @@\n \tchar \t*newAllocation;\n \tsize_t\tstringLength;\n \n-#ifdef DEBUG\n \tPR_ASSERT(source);\n-#endif\n \t\n \tstringLength = strlen(source) + 1;\n \t\n"} {"commit":"75314fda5b6e6904764f2fbb360c8cc6fe443bd3","subject":"Before printf'ing message, in examples\/member_sign.c, ensure it's null-terminated.","message":"Before printf'ing message, in examples\/member_sign.c, ensure it's\nnull-terminated.\n","repos":"xaptum\/ecdaa,xaptum\/ecdaa,xaptum\/ecdaa","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- examples\/member_sign.c\n+++ examples\/member_sign.c\n@@ -104,6 +104,7 @@\n \/\/ Create signature\n struct ecdaa_signature_FP256BN sig;\n if (0 != ecdaa_signature_FP256BN_sign(&sig, message, msg_len, basename, basename_len, &sk, &cred, &rng)) {\n+ message[msg_len] = 0;\n fprintf(stderr, \"Error signing message: \\\"%s\\\"\\n\", (char*)message);\n return 1;\n }\n"} {"commit":"2569f0c2b7dd2dc355355534ec2835e45a6e800a","subject":"Add os:userinfo to os extension library","message":"Add os:userinfo to os extension library\n","repos":"Juniper\/libslax,Juniper\/libslax,Juniper\/libslax","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- extensions\/os\/ext_os.c\n+++ extensions\/os\/ext_os.c\n@@ -1293,6 +1293,77 @@\n valuePush(ctxt, xmlXPathWrapNodeSet(results));\n }\n \n+static void\n+extUserInfo (xmlXPathParserContext *ctxt UNUSED, int nargs UNUSED)\n+{\n+ uid_t euid = geteuid();\n+ struct passwd *pwd;\n+ xmlNodePtr userp = NULL;\n+\n+ if (euid) {\n+\tpwd = getpwuid(euid);\n+\n+\tif (pwd) {\n+\t xmlDocPtr container = slaxMakeRtf(ctxt);\n+\t xmlNodeSet *results = xmlXPathNodeSetCreate(NULL);\n+\n+\t userp = xmlNewDocNode(container, NULL, (const xmlChar *) \"user\",\n+\t\t\t\t NULL);\n+\t if (userp == NULL) {\n+\t\tslaxLog(\"os:userinfo: failed to create result node\");\n+\t\tgoto fail;\n+\t }\n+\n+\t xmlNodePtr namep = xmlNewDocNode(container, NULL, \n+\t\t\t\t\t (const xmlChar *) \"name\", \n+\t\t\t\t\t (const xmlChar *) pwd->pw_name);\n+\t xmlNodePtr passwdp = xmlNewDocNode(container, NULL, \n+\t\t\t\t\t (const xmlChar *) \"passwd\", \n+\t\t\t\t\t (const xmlChar *) pwd->pw_passwd);\n+\t xmlNodePtr gecosp = xmlNewDocNode(container, NULL, \n+\t\t\t\t\t (const xmlChar *) \"gecos\", \n+\t\t\t\t\t (const xmlChar *) pwd->pw_gecos);\n+\t xmlNodePtr dirp = xmlNewDocNode(container, NULL, \n+\t\t\t\t\t (const xmlChar *) \"dir\", \n+\t\t\t\t\t (const xmlChar *) pwd->pw_dir);\n+\t xmlNodePtr shellp = xmlNewDocNode(container, NULL, \n+\t\t\t\t\t (const xmlChar *) \"shell\", \n+\t\t\t\t\t (const xmlChar *) pwd->pw_shell);\n+\n+\t if (namep) {\n+\t\txmlAddChild(userp, namep);\n+\t }\n+\n+\t if (passwdp) {\n+\t\txmlAddChild(userp, passwdp);\n+\t }\n+\n+\t if (gecosp) {\n+\t\txmlAddChild(userp, gecosp);\n+\t }\n+\n+\t if (dirp) {\n+\t\txmlAddChild(userp, dirp);\n+\t }\n+\n+\t if (shellp) {\n+\t\txmlAddChild(userp, shellp);\n+\t }\n+\t \n+\t xmlXPathNodeSetAdd(results, userp);\n+\t xmlXPathObjectPtr ret = xmlXPathNewNodeSetList(results);\n+\n+\t valuePush(ctxt, ret);\n+\t xmlXPathFreeNodeSet(results);\n+\t}\n+ }\n+\n+fail:\n+ if (userp == NULL) {\n+\txmlXPathReturnEmptyString(ctxt);\n+ }\n+}\n+\n slax_function_table_t slaxOsTable[] = {\n {\n \t\"exit-code\", extOsExitCode,\n@@ -1331,6 +1402,11 @@\n \t\"Change ownership of a file\",\n \t\"(ownership, file-spec, ...)\", XPATH_UNDEFINED,\n },\n+ {\n+\t\"userinfo\", extUserInfo,\n+\t\"Return information about user running the script\",\n+\t\"()\", XPATH_UNDEFINED,\n+ },\n \n { NULL, NULL, NULL, NULL, XPATH_UNDEFINED }\n };\n"} {"commit":"b47f6ed4f42197383c9fe6b0b7773d56f199097d","subject":"INTEGRATION: CWS changefileheader (1.6.12); FILE MERGED 2008\/03\/31 13:33:21 rt 1.6.12.1: #i87441# Change license header to LPGL v3.","message":"INTEGRATION: CWS changefileheader (1.6.12); FILE MERGED\n2008\/03\/31 13:33:21 rt 1.6.12.1: #i87441# Change license header to LPGL v3.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- embeddedobj\/source\/msole\/platform.h\n+++ embeddedobj\/source\/msole\/platform.h\n@@ -1,35 +1,30 @@\n \/*************************************************************************\n *\n- * OpenOffice.org - a multi-platform office productivity suite\n+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n *\n- * $RCSfile: platform.h,v $\n+ * Copyright 2008 by Sun Microsystems, Inc.\n *\n- * $Revision: 1.6 $\n+ * OpenOffice.org - a multi-platform office productivity suite\n *\n- * last change: $Author: rt $ $Date: 2007-11-13 15:20:18 $\n+ * $RCSfile: platform.h,v $\n+ * $Revision: 1.7 $\n *\n- * The Contents of this file are made available subject to\n- * the terms of GNU Lesser General Public License Version 2.1.\n+ * This file is part of OpenOffice.org.\n *\n+ * OpenOffice.org is free software: you can redistribute it and\/or modify\n+ * it under the terms of the GNU Lesser General Public License version 3\n+ * only, as published by the Free Software Foundation.\n *\n- * GNU Lesser General Public License Version 2.1\n- * =============================================\n- * Copyright 2005 by Sun Microsystems, Inc.\n- * 901 San Antonio Road, Palo Alto, CA 94303, USA\n+ * OpenOffice.org is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU Lesser General Public License version 3 for more details\n+ * (a copy is included in the LICENSE file that accompanied this code).\n *\n- * This library is free software; you can redistribute it and\/or\n- * modify it under the terms of the GNU Lesser General Public\n- * License version 2.1, as published by the Free Software Foundation.\n- *\n- * This library is distributed in the hope that it will be useful,\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n- * Lesser General Public License for more details.\n- *\n- * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n- * MA 02111-1307 USA\n+ * You should have received a copy of the GNU Lesser General Public License\n+ * version 3 along with OpenOffice.org. If not, see\n+ * <http:\/\/www.openoffice.org\/license.html>\n+ * for a copy of the LGPLv3 License.\n *\n ************************************************************************\/\n \n"} {"commit":"9260f7e1715f87436036d7015d00ca8d01805e0a","subject":"examples\/ncdval_test.c: add some tests for ComposedString and other stuff","message":"examples\/ncdval_test.c: add some tests for ComposedString and other stuff\n","repos":"bakhet\/badvpn,bawaaaaah\/badvpn,walterDurin\/badvpn,walterDurin\/badvpn,bawaaaaah\/badvpn,fragmede\/badvpn,nuwaf\/badvpn,Rastii\/badvpn,ambrop72\/badvpn-googlecode-export,nuwaf\/badvpn,walterDurin\/badvpn,arevindh\/badvpn,bawaaaaah\/badvpn,adelshokhy112\/badvpn,bawaaaaah\/badvpn,Qnex93\/badvpn,walterDurin\/badvpn,bakhet\/badvpn,fffw\/badvpn,Rastii\/badvpn,kaliii\/badvpn,Qnex93\/badvpn,atavism\/badvpn,atavism\/badvpn,fragmede\/badvpn,adelshokhy112\/badvpn,arevindh\/badvpn,henryhwang\/badvpn,atavism\/badvpn,henryhwang\/badvpn,arevindh\/badvpn,adelshokhy112\/badvpn,adelshokhy112\/badvpn,fragmede\/badvpn,kaliii\/badvpn,bakhet\/badvpn,nuwaf\/badvpn,henryhwang\/badvpn,henryhwang\/badvpn,ambrop72\/badvpn-googlecode-export,nuwaf\/badvpn,kaliii\/badvpn,fragmede\/badvpn,fragmede\/badvpn,henryhwang\/badvpn,Qnex93\/badvpn,ambrop72\/badvpn-googlecode-export,ambrop72\/badvpn-googlecode-export,walterDurin\/badvpn,Qnex93\/badvpn,nuwaf\/badvpn,atavism\/badvpn,kaliii\/badvpn,fffw\/badvpn,bawaaaaah\/badvpn,bakhet\/badvpn,Rastii\/badvpn,atavism\/badvpn,kaliii\/badvpn,Rastii\/badvpn,arevindh\/badvpn,fffw\/badvpn,Qnex93\/badvpn,fffw\/badvpn,adelshokhy112\/badvpn,ambrop72\/badvpn-googlecode-export,Rastii\/badvpn,fffw\/badvpn,arevindh\/badvpn,bakhet\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/ncdval_test.c\n+++ examples\/ncdval_test.c\n@@ -34,8 +34,125 @@\n #include <ncd\/static_strings.h>\n #include <base\/BLog.h>\n #include <misc\/debug.h>\n+#include <misc\/balloc.h>\n+#include <misc\/offset.h>\n \n #define FORCE(cmd) if (!(cmd)) { fprintf(stderr, \"failed\\n\"); exit(1); }\n+\n+struct composed_string {\n+ NCDRefTarget ref_target;\n+ size_t length;\n+ size_t chunk_size;\n+ char **chunks;\n+};\n+\n+static void composed_string_ref_target_func_release (NCDRefTarget *ref_target)\n+{\n+ struct composed_string *cs = UPPER_OBJECT(ref_target, struct composed_string, ref_target);\n+ \n+ size_t num_chunks = cs->length \/ cs->chunk_size;\n+ if (cs->length % cs->chunk_size) {\n+ num_chunks++;\n+ }\n+ \n+ for (size_t i = 0; i < num_chunks; i++) {\n+ BFree(cs->chunks[i]);\n+ }\n+ \n+ BFree(cs->chunks);\n+ BFree(cs);\n+}\n+\n+static void composed_string_func_getptr (void *user, size_t offset, const char **out_data, size_t *out_length)\n+{\n+ struct composed_string *cs = user;\n+ ASSERT(offset < cs->length)\n+ \n+ *out_data = cs->chunks[offset \/ cs->chunk_size] + (offset % cs->chunk_size);\n+ *out_length = cs->chunk_size - (offset % cs->chunk_size);\n+}\n+\n+static NCDValRef build_composed_string (NCDValMem *mem, const char *data, size_t length, size_t chunk_size)\n+{\n+ ASSERT(chunk_size > 0)\n+ \n+ struct composed_string *cs = BAlloc(sizeof(*cs));\n+ if (!cs) {\n+ goto fail0;\n+ }\n+ \n+ cs->length = length;\n+ cs->chunk_size = chunk_size;\n+ \n+ size_t num_chunks = cs->length \/ cs->chunk_size;\n+ if (cs->length % cs->chunk_size) {\n+ num_chunks++;\n+ }\n+ \n+ cs->chunks = BAllocArray(num_chunks, sizeof(cs->chunks[0]));\n+ if (!cs->chunk_size) {\n+ goto fail1;\n+ }\n+ \n+ size_t i;\n+ for (i = 0; i < num_chunks; i++) {\n+ cs->chunks[i] = BAlloc(cs->chunk_size);\n+ if (!cs->chunks[i]) {\n+ goto fail2;\n+ }\n+ \n+ size_t to_copy = length;\n+ if (to_copy > cs->chunk_size) {\n+ to_copy = cs->chunk_size;\n+ }\n+ \n+ memcpy(cs->chunks[i], data, to_copy);\n+ data += to_copy;\n+ length -= to_copy;\n+ }\n+ \n+ NCDRefTarget_Init(&cs->ref_target, composed_string_ref_target_func_release);\n+ \n+ struct NCDVal_string_resource resource;\n+ resource.func_getptr = composed_string_func_getptr;\n+ resource.user = cs;\n+ resource.ref_target = &cs->ref_target;\n+ \n+ NCDValRef val = NCDVal_NewComposedString(mem, resource, 0, cs->length);\n+ NCDRefTarget_Deref(&cs->ref_target);\n+ return val;\n+ \n+fail2:\n+ while (i-- > 0) {\n+ BFree(cs->chunks[i]);\n+ }\n+ BFree(cs->chunks);\n+fail1:\n+ BFree(cs);\n+fail0:\n+ return NCDVal_NewInvalid();\n+}\n+\n+static void test_string (NCDValRef str, const char *data, size_t length)\n+{\n+ FORCE( !NCDVal_IsInvalid(str) )\n+ FORCE( NCDVal_IsString(str) )\n+ FORCE( NCDVal_StringLength(str) == length )\n+ FORCE( NCDVal_StringHasNulls(str) == !!memchr(data, '\\0', length) )\n+ FORCE( NCDVal_IsStringNoNulls(str) == !memchr(data, '\\0', length) )\n+ FORCE( NCDVal_StringRegionEquals(str, 0, length, data) )\n+ \n+ for (size_t i = 0; i < length; i++) {\n+ const char *chunk_data;\n+ size_t chunk_length;\n+ NCDVal_StringGetPtr(str, i, length - i, &chunk_data, &chunk_length);\n+ \n+ FORCE( chunk_length > 0 )\n+ FORCE( chunk_length <= length - i )\n+ FORCE( !memcmp(chunk_data, data + i, chunk_length) )\n+ FORCE( NCDVal_StringRegionEquals(str, i, chunk_length, data + i) )\n+ }\n+}\n \n static void print_indent (int indent)\n {\n@@ -104,7 +221,7 @@\n NCDValMem_Init(&mem);\n \n NCDValRef s1 = NCDVal_NewString(&mem, \"Hello World\");\n- FORCE( !NCDVal_IsInvalid(s1) )\n+ test_string(s1, \"Hello World\", 11);\n ASSERT( NCDVal_IsString(s1) )\n ASSERT( !NCDVal_IsIdString(s1) )\n ASSERT( NCDVal_Type(s1) == NCDVAL_STRING )\n@@ -143,7 +260,7 @@\n ASSERT( NCDVal_IsInvalid(NCDVal_MapGetValue(m1, \"K3\")) )\n \n NCDValRef ids1 = NCDVal_NewIdString(&mem, NCD_STRING_ARG1, &string_index);\n- FORCE( !NCDVal_IsInvalid(ids1) )\n+ test_string(ids1, \"_arg1\", 5);\n ASSERT( !memcmp(NCDVal_StringData(ids1), \"_arg1\", 5) )\n ASSERT( NCDVal_StringLength(ids1) == 5 )\n ASSERT( !NCDVal_StringHasNulls(ids1) )\n@@ -152,7 +269,7 @@\n ASSERT( NCDVal_IsIdString(ids1) )\n \n NCDValRef ids2 = NCDVal_NewIdString(&mem, NCD_STRING_ARG2, &string_index);\n- FORCE( !NCDVal_IsInvalid(ids2) )\n+ test_string(ids2, \"_arg2\", 5);\n ASSERT( !memcmp(NCDVal_StringData(ids2), \"_arg2\", 5) )\n ASSERT( NCDVal_StringLength(ids2) == 5 )\n ASSERT( !NCDVal_StringHasNulls(ids2) )\n@@ -200,6 +317,60 @@\n \n NCDValMem_Free(&mem);\n \n+ NCDValMem_Init(&mem);\n+ \n+ NCDValRef cstr1 = build_composed_string(&mem, \"Hello World\", 11, 3);\n+ test_string(cstr1, \"Hello World\", 11);\n+ FORCE( NCDVal_IsComposedString(cstr1) )\n+ FORCE( !NCDVal_IsContinuousString(cstr1) )\n+ FORCE( NCDVal_StringEquals(cstr1, \"Hello World\") )\n+ FORCE( !NCDVal_StringEquals(cstr1, \"Hello World \") )\n+ FORCE( !NCDVal_StringEquals(cstr1, \"Hello WorlD\") )\n+ \n+ NCDValRef cstr2 = build_composed_string(&mem, \"GoodBye\", 7, 1);\n+ test_string(cstr2, \"GoodBye\", 7);\n+ FORCE( NCDVal_IsComposedString(cstr2) )\n+ FORCE( !NCDVal_IsContinuousString(cstr2) )\n+ FORCE( NCDVal_StringEquals(cstr2, \"GoodBye\") )\n+ FORCE( !NCDVal_StringEquals(cstr2, \" GoodBye\") )\n+ FORCE( !NCDVal_StringEquals(cstr2, \"goodBye\") )\n+ \n+ NCDValRef cstr3 = build_composed_string(&mem, \"Bad\\x00String\", 10, 4);\n+ test_string(cstr3, \"Bad\\x00String\", 10);\n+ FORCE( NCDVal_IsComposedString(cstr3) )\n+ FORCE( !NCDVal_IsContinuousString(cstr3) )\n+ \n+ FORCE( NCDVal_StringMemCmp(cstr1, cstr2, 1, 2, 3) < 0 )\n+ FORCE( NCDVal_StringMemCmp(cstr1, cstr2, 7, 1, 4) > 0 )\n+ \n+ char buf[10];\n+ NCDVal_StringCopyOut(cstr1, 1, 10, buf);\n+ FORCE( !memcmp(buf, \"ello World\", 10) )\n+ \n+ NCDValRef clist1 = NCDVal_NewList(&mem, 3);\n+ FORCE( !NCDVal_IsInvalid(clist1) )\n+ FORCE( NCDVal_ListAppend(clist1, cstr1) )\n+ FORCE( NCDVal_ListAppend(clist1, cstr2) )\n+ FORCE( NCDVal_ListAppend(clist1, cstr3) )\n+ FORCE( NCDVal_ListCount(clist1) == 3 )\n+ \n+ FORCE( NCDValMem_ConvertNonContinuousStrings(&mem, &clist1) )\n+ FORCE( NCDVal_ListCount(clist1) == 3 )\n+ \n+ NCDValRef fixed_str1 = NCDVal_ListGet(clist1, 0);\n+ NCDValRef fixed_str2 = NCDVal_ListGet(clist1, 1);\n+ NCDValRef fixed_str3 = NCDVal_ListGet(clist1, 2);\n+ \n+ FORCE( NCDVal_IsContinuousString(fixed_str1) )\n+ FORCE( NCDVal_IsContinuousString(fixed_str2) )\n+ FORCE( NCDVal_IsContinuousString(fixed_str3) )\n+ \n+ test_string(fixed_str1, \"Hello World\", 11);\n+ test_string(fixed_str2, \"GoodBye\", 7);\n+ test_string(fixed_str3, \"Bad\\x00String\", 10);\n+ \n+ NCDValMem_Free(&mem);\n+ \n NCDStringIndex_Free(&string_index);\n \n return 0;\n"} {"commit":"75fddc786c9d5476cab1d5d4699e95d8907d0b51","subject":"Fix ATOMIC_{ACQUIRE,RELEASE,ACQ_REL} definitions.","message":"Fix ATOMIC_{ACQUIRE,RELEASE,ACQ_REL} definitions.\n","repos":"wqfish\/jemalloc,wqfish\/jemalloc,wqfish\/jemalloc,wqfish\/jemalloc,wqfish\/jemalloc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/jemalloc\/internal\/atomic.h\n+++ include\/jemalloc\/internal\/atomic.h\n@@ -39,9 +39,9 @@\n * quite so often.\n *\/\n #define ATOMIC_RELAXED atomic_memory_order_relaxed\n-#define ATOMIC_ACQUIRE atomic_memory_order_acquire,\n-#define ATOMIC_RELEASE atomic_memory_order_release,\n-#define ATOMIC_ACQ_REL atomic_memory_order_acq_rel,\n+#define ATOMIC_ACQUIRE atomic_memory_order_acquire\n+#define ATOMIC_RELEASE atomic_memory_order_release\n+#define ATOMIC_ACQ_REL atomic_memory_order_acq_rel\n #define ATOMIC_SEQ_CST atomic_memory_order_seq_cst\n \n \/*\n"} {"commit":"a3065c522bb700e0ea49fcf39f30fada047b3149","subject":"fix #127, hopefully finally","message":"fix #127, hopefully finally\n","repos":"JGrothoff\/open62541,jpfr\/open62541,jpfr\/open62541,bostjanv\/open62541,JGrothoff\/open62541,open62541\/open62541,JGrothoff\/open62541,JGrothoff\/open62541,StalderT\/open62541,StalderT\/open62541,AGIsmail\/open62541,bostjanv\/open62541,AGIsmail\/open62541,StalderT\/open62541,StalderT\/open62541,open62541\/open62541,open62541\/open62541,open62541\/open62541,jpfr\/open62541,jpfr\/open62541","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- examples\/opcuaServer.c\n+++ examples\/opcuaServer.c\n@@ -71,8 +71,8 @@\n \tstruct timeval callback_interval = {1, 0}; \/\/ 1 second\n \tUA_Int32 retval = NetworkLayerTCP_run(nl, &server, callback_interval,\n \t\t\t\t\t\t\t\t\t\t serverCallback, &running);\n+\tUA_Server_deleteMembers(&server);\n \tNetworklayerTCP_delete(nl);\n-\tUA_Server_deleteMembers(&server);\n UA_String_deleteMembers(&endpointUrl);\n \treturn retval == UA_SUCCESS ? 0 : retval;\n }\n"} {"commit":"708efc675edf8152fe5f8819063906a4d869ac0d","subject":"pll|example: adding active PI filter","message":"pll|example: adding active PI filter\n","repos":"cjcliffe\/liquid-dsp,wangning223\/liquid-dsp,manuts\/liquid-dsp,cjcliffe\/liquid-dsp,JayKickliter\/liquid-dsp,jgaeddert\/liquid-dsp,wangning223\/liquid-dsp,cjcliffe\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,wangning223\/liquid-dsp,biotrump\/liquid-dsp,JayKickliter\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,jgaeddert\/liquid-dsp,cjcliffe\/liquid-dsp,biotrump\/liquid-dsp,andrepuschmann\/liquid-dsp,manuts\/liquid-dsp,wangning223\/liquid-dsp,biotrump\/liquid-dsp,andrepuschmann\/liquid-dsp,manuts\/liquid-dsp,manuts\/liquid-dsp,biotrump\/liquid-dsp,wangning223\/liquid-dsp,manuts\/liquid-dsp,andrepuschmann\/liquid-dsp,cjcliffe\/liquid-dsp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/pll_example.c\n+++ examples\/pll_example.c\n@@ -38,7 +38,8 @@\n float zeta = pll_damping_factor;\n float K = 1000; \/\/ loop gain\n \n- \/\/ loop filter\n+#if 0\n+ \/\/ loop filter (active lag)\n float t1 = K\/(wn*wn);\n float t2 = 2*zeta\/wn - 1\/K;\n \n@@ -49,7 +50,21 @@\n a[0] = 1 + t1\/2.0f;\n a[1] = -t1;\n a[2] = -1 + t1\/2.0f;\n+#else\n+ \/\/ loop filter (active PI)\n+ float t1 = K\/(wn*wn);\n+ float t2 = 2*zeta\/wn;\n+\n+ b[0] = 2*K*(1.+t2\/2.0f);\n+ b[1] = 2*K*2.;\n+ b[2] = 2*K*(1.-t2\/2.0f);\n+\n+ a[0] = t1\/2.0f;\n+ a[1] = -t1;\n+ a[2] = t1\/2.0f;\n+#endif\n iir_filter_rrrf H = iir_filter_rrrf_create(b,3,a,3);\n+ iir_filter_rrrf_print(H);\n \n unsigned int i;\n \n"} {"commit":"d705d63b81cc866cfad81c963a7cf7cd7eb9663a","subject":"fixes issue 550 + relax CONTEXT ymm flag assert to only when YMM_ENABLED","message":"fixes issue 550\n+ relax CONTEXT ymm flag assert to only when YMM_ENABLED\n\nSVN-Revision: 973\n","repos":"AmesianX\/dynamorio,sigma-random\/dynamorio,bl4ckic3\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,code4bones\/dynamorio,bl4ckic3\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,daksunt\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,bl4ckic3\/dynamorio,bl4ckic3\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/win32\/callback.c\n+++ core\/win32\/callback.c\n@@ -3996,7 +3996,7 @@\n }\n if (all || TESTALL(CONTEXT_YMM_FLAG, context->ContextFlags)) {\n \/* FIXME i#437: NYI. See comments in context_to_mcontext(). *\/\n- ASSERT_NOT_IMPLEMENTED(all && \"i#437: no ymm CONTEXT support yet\");\n+ ASSERT_NOT_IMPLEMENTED(!YMM_ENABLED() && \"i#437: no ymm CONTEXT support yet\");\n }\n \n if (all || context->ContextFlags & CONTEXT_FLOATING_POINT) {\n"} {"commit":"ea3df2473588eb2060a181161b51ef9e6efc1623","subject":"gadget: fix copy\/paste error in documentation","message":"gadget: fix copy\/paste error in documentation\n","repos":"grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita,grubersjoe\/adwaita","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"992155d0ea1d59d20f0c242ea400434cd8370fe1","subject":"Add bwrite_conv and bread_conv values to methods_dgramp_sctp","message":"Add bwrite_conv and bread_conv values to methods_dgramp_sctp\n\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/2116)","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/bio\/bss_dgram.c\n+++ crypto\/bio\/bss_dgram.c\n@@ -91,7 +91,11 @@\n static const BIO_METHOD methods_dgramp_sctp = {\n BIO_TYPE_DGRAM_SCTP,\n \"datagram sctp socket\",\n+ \/* TODO: Convert to new style write function *\/\n+ bwrite_conv,\n dgram_sctp_write,\n+ \/* TODO: Convert to new style write function *\/\n+ bread_conv,\n dgram_sctp_read,\n dgram_sctp_puts,\n NULL, \/* dgram_gets, *\/\n"} {"commit":"6c58ea43204c239bba336135635342c818f4c73b","subject":"hipe_mfait_lock needs to be below proc_main.","message":"hipe_mfait_lock needs to be below proc_main.\n","repos":"kvakvs\/otp,yangchengjian\/otp,marquisthunder\/otp,jamesruan\/otp,g-andrade\/otp,emile\/otp,awetzel\/otp,basho\/otp,kvakvs\/otp,tuncer\/otp,lianghaivv\/otp,GinjaNinja32\/otp,platinumthinker\/otp,mikpe\/otp,neeraj9\/otp,lemenkov\/otp,kvakvs\/otp,entropiae\/otp,lucafavatella\/otp,lucafavatella\/otp,mujiatong\/otp,Teino1978-Corp\/erlang-otp,paladim\/otp,c-rack\/otp,vic\/otp,bsmr-erlang\/otp,bugs-erlang-org\/otp,bjorng\/otp,paulcager\/otp,dumbbell\/otp,RJ\/otp,msantos\/otp,entropiae\/otp,Teino1978-Corp\/otp,vinoski\/otp,hairyhum\/otp,basho\/otp,VincentHHL\/otp,hairyhum\/otp,rlipscombe\/otp,vladdu\/otp,emile\/otp,cobusc\/otp,goertzenator\/otp,uabboli\/otp,schlagert\/otp,haguenau\/otp,getong\/otp,dumbbell\/otp,psyeugenic\/otp,bugs-erlang-org\/otp,lightcyphers\/otp,sitexa\/otp,bernardd\/otp,krishnakumar4a4\/otp,palas\/otp,ader1990\/otp,paladim\/otp,falkevik\/otp,RGafiyatullin\/otp,theom\/otp,RichMorin\/otp,weisslj\/otp,lantti\/otp,uabboli\/otp,mujiatong\/otp,RJ\/otp,theom\/otp,dumbbell\/otp,msantos\/otp,cobusc\/otp,vladdu\/otp,RGafiyatullin\/otp,rlipscombe\/otp,getong\/otp,vinoski\/otp,vladdu\/otp,electricimp\/otp,RGafiyatullin\/otp,Teino1978-Corp\/erlang-otp,fenollp\/otp,lantti\/otp,lianghaivv\/otp,electricimp\/otp,lemenkov\/otp,matwey\/otp,sitexa\/otp,jj1bdx\/otp,fenollp\/otp,cnbin\/otp,isvilen\/otp,release-project\/otp,ahmedshafeeq\/otp,uabboli\/otp,vinoski\/otp,gjaldon\/otp,palas\/otp,enikki\/otp,yangchengjian\/otp,RaimoNiskanen\/otp,RoadRunnr\/otp,fenollp\/otp,isvilen\/otp,jamesruan\/otp,lucafavatella\/otp,bsmr-erlang\/otp,marquisthunder\/otp,emacsmirror\/erlang,NOMORECOFFEE\/otp,goertzenator\/otp,bjorng\/otp,falkevik\/otp,saleyn\/otp,lantti\/otp,emile\/otp,isvilen\/otp,matwey\/otp,sammoth-wazoku\/otp,mikpe\/otp,bugs-erlang-org\/otp,bsmr-erlang\/otp,cnbin\/otp,aboroska\/otp,lemenkov\/otp,ferd\/otp,bernardd\/otp,getong\/otp,legoscia\/otp,potatosalad\/otp,mikpe\/otp,enikki\/otp,emile\/otp,vic\/otp,johanclaesson\/otp,potatosalad\/otp,msantos\/otp,sammoth-wazoku\/otp,saleyn\/otp,sammoth-wazoku\/otp,RJ\/otp,awetzel\/otp,paladim\/otp,stolen\/otp,klarna\/otp,electricimp\/otp,klarna\/otp,basho\/otp,sitexa\/otp,getong\/otp,RGafiyatullin\/otp,jinshana\/otp,fenollp\/otp,fenollp\/otp,RaimoNiskanen\/otp,benoitc\/otp-1,ferd\/otp,isvilen\/otp,awetzel\/otp,jinshana\/otp,g-andrade\/otp,GinjaNinja32\/otp,schlagert\/otp,haguenau\/otp,yangchengjian\/otp,VincentHHL\/otp,lightcyphers\/otp,stolen\/otp,lightcyphers\/otp,RaimoNiskanen\/otp,haguenau\/otp,ahmedshafeeq\/otp,vinoski\/otp,saleyn\/otp,legoscia\/otp,jj1bdx\/otp,derek121\/otp,matwey\/otp,enikki\/otp,sammoth-wazoku\/otp,haguenau\/otp,legoscia\/otp,vinoski\/otp,massemanet\/otp,release-project\/otp,weisslj\/otp,c-rack\/otp,dgud\/otp,jj1bdx\/otp,goertzenator\/otp,paladim\/otp,bugs-erlang-org\/otp,NOMORECOFFEE\/otp,lrascao\/otp,paulcager\/otp,rlipscombe\/otp,ahmedshafeeq\/otp,erlang\/otp,potatosalad\/otp,mujiatong\/otp,jinshana\/otp,jinshana\/otp,vinoski\/otp,theom\/otp,entropiae\/otp,krishnakumar4a4\/otp,sammoth-wazoku\/otp,electricimp\/otp,jamesruan\/otp,marquisthunder\/otp,cnbin\/otp,bsmr-erlang\/otp,entropiae\/otp,basho\/otp,sdebnath\/otp,sdebnath\/otp,ferd\/otp,psyeugenic\/otp,yangchengjian\/otp,lemenkov\/otp,fenollp\/otp,emacsmirror\/erlang,lightcyphers\/otp,theom\/otp,vladdu\/otp,dgud\/otp,Teino1978-Corp\/otp,isvilen\/otp,riverrun\/otp,dgud\/otp,ferd\/otp,enikki\/otp,g-andrade\/otp,cobusc\/otp,lantti\/otp,krishnakumar4a4\/otp,getong\/otp,sdebnath\/otp,potatosalad\/otp,Teino1978-Corp\/erlang-otp,matwey\/otp,bjorng\/otp,g-andrade\/otp,tuncer\/otp,krishnakumar4a4\/otp,aboroska\/otp,mikpe\/otp,vladdu\/otp,dumbbell\/otp,awetzel\/otp,yangchengjian\/otp,bjorng\/otp,cnbin\/otp,paulcager\/otp,Teino1978-Corp\/otp,falkevik\/otp,release-project\/otp,RJ\/otp,GinjaNinja32\/otp,cobusc\/otp,jinshana\/otp,uabboli\/otp,isvilen\/otp,potatosalad\/otp,potatosalad\/otp,mikpe\/otp,lemenkov\/otp,dumbbell\/otp,neeraj9\/otp,riverrun\/otp,RoadRunnr\/otp,mujiatong\/otp,platinumthinker\/otp,lucafavatella\/otp,lemenkov\/otp,mujiatong\/otp,platinumthinker\/otp,lightcyphers\/otp,RJ\/otp,c-rack\/otp,electricimp\/otp,saleyn\/otp,vinoski\/otp,weisslj\/otp,jamesruan\/otp,emacsmirror\/erlang,theom\/otp,electricimp\/otp,dumbbell\/otp,lemenkov\/otp,basho\/otp,bsmr-erlang\/otp,Teino1978-Corp\/otp,Teino1978-Corp\/erlang-otp,VincentHHL\/otp,uabboli\/otp,RoadRunnr\/otp,VincentHHL\/otp,palas\/otp,jemsbhai\/otp,mikpe\/otp,vinoski\/otp,neeraj9\/otp,emacsmirror\/erlang,tuncer\/otp,ader1990\/otp,Teino1978-Corp\/otp,RGafiyatullin\/otp,paladim\/otp,cnbin\/otp,bernardd\/otp,falkevik\/otp,ader1990\/otp,vladdu\/otp,ader1990\/otp,release-project\/otp,aboroska\/otp,erlang\/otp,neeraj9\/otp,sitexa\/otp,ahmedshafeeq\/otp,haguenau\/otp,jj1bdx\/otp,emacsmirror\/erlang,NOMORECOFFEE\/otp,NOMORECOFFEE\/otp,enikki\/otp,lantti\/otp,jinshana\/otp,erlang\/otp,paulcager\/otp,entropiae\/otp,vic\/otp,riverrun\/otp,potatosalad\/otp,uabboli\/otp,bernardd\/otp,getong\/otp,beni55\/otp,lhslll\/otp,neeraj9\/otp,bsmr-erlang\/otp,msantos\/otp,ferd\/otp,c-rack\/otp,hairyhum\/otp,jinshana\/otp,paulcager\/otp,saleyn\/otp,fenollp\/otp,gjaldon\/otp,sdebnath\/otp,emile\/otp,sdebnath\/otp,RichMorin\/otp,erlang\/otp,derek121\/otp,lrascao\/otp,RJ\/otp,isvilen\/otp,matwey\/otp,bugs-erlang-org\/otp,goertzenator\/otp,release-project\/otp,RaimoNiskanen\/otp,ferd\/otp,paulcager\/otp,tuncer\/otp,msantos\/otp,bsmr-erlang\/otp,emile\/otp,neeraj9\/otp,jemsbhai\/otp,goertzenator\/otp,RoadRunnr\/otp,basho\/otp,palas\/otp,legoscia\/otp,palas\/otp,awetzel\/otp,entropiae\/otp,emacsmirror\/erlang,derek121\/otp,kvakvs\/otp,psyeugenic\/otp,dgud\/otp,mikpe\/otp,vladdu\/otp,klarna\/otp,beni55\/otp,jemsbhai\/otp,bsmr-erlang\/otp,massemanet\/otp,sammoth-wazoku\/otp,gjaldon\/otp,jj1bdx\/otp,jj1bdx\/otp,getong\/otp,mikpe\/otp,paulcager\/otp,marquisthunder\/otp,lhslll\/otp,potatosalad\/otp,emacsmirror\/erlang,jemsbhai\/otp,VincentHHL\/otp,bernardd\/otp,weisslj\/otp,dgud\/otp,lucafavatella\/otp,g-andrade\/otp,derek121\/otp,erlang\/otp,massemanet\/otp,matwey\/otp,beni55\/otp,goertzenator\/otp,vic\/otp,kvakvs\/otp,beni55\/otp,entropiae\/otp,cnbin\/otp,riverrun\/otp,gjaldon\/otp,derek121\/otp,vic\/otp,kvakvs\/otp,vladdu\/otp,johanclaesson\/otp,marquisthunder\/otp,electricimp\/otp,GinjaNinja32\/otp,awetzel\/otp,lightcyphers\/otp,c-rack\/otp,ahmedshafeeq\/otp,dgud\/otp,Teino1978-Corp\/otp,jj1bdx\/otp,lightcyphers\/otp,rlipscombe\/otp,bjorng\/otp,Teino1978-Corp\/erlang-otp,bernardd\/otp,tuncer\/otp,lhslll\/otp,lhslll\/otp,massemanet\/otp,kvakvs\/otp,johanclaesson\/otp,krishnakumar4a4\/otp,bjorng\/otp,benoitc\/otp-1,psyeugenic\/otp,jemsbhai\/otp,massemanet\/otp,dgud\/otp,jj1bdx\/otp,jemsbhai\/otp,matwey\/otp,bernardd\/otp,dgud\/otp,sdebnath\/otp,vladdu\/otp,mikpe\/otp,RoadRunnr\/otp,massemanet\/otp,derek121\/otp,beni55\/otp,platinumthinker\/otp,palas\/otp,cobusc\/otp,cnbin\/otp,RaimoNiskanen\/otp,legoscia\/otp,lhslll\/otp,getong\/otp,GinjaNinja32\/otp,haguenau\/otp,isvilen\/otp,vic\/otp,vinoski\/otp,falkevik\/otp,bugs-erlang-org\/otp,vic\/otp,paulcager\/otp,matwey\/otp,gjaldon\/otp,jj1bdx\/otp,sammoth-wazoku\/otp,bsmr-erlang\/otp,electricimp\/otp,palas\/otp,stolen\/otp,goertzenator\/otp,dumbbell\/otp,falkevik\/otp,lianghaivv\/otp,paladim\/otp,vic\/otp,bugs-erlang-org\/otp,jj1bdx\/otp,gjaldon\/otp,RJ\/otp,enikki\/otp,ahmedshafeeq\/otp,emile\/otp,release-project\/otp,lemenkov\/otp,gjaldon\/otp,g-andrade\/otp,stolen\/otp,erlang\/otp,jamesruan\/otp,aboroska\/otp,hairyhum\/otp,RaimoNiskanen\/otp,ahmedshafeeq\/otp,mujiatong\/otp,rlipscombe\/otp,benoitc\/otp-1,RoadRunnr\/otp,psyeugenic\/otp,weisslj\/otp,lrascao\/otp,legoscia\/otp,RJ\/otp,GinjaNinja32\/otp,yangchengjian\/otp,electricimp\/otp,beni55\/otp,paladim\/otp,marquisthunder\/otp,benoitc\/otp-1,NOMORECOFFEE\/otp,getong\/otp,rlipscombe\/otp,stolen\/otp,lantti\/otp,falkevik\/otp,theom\/otp,krishnakumar4a4\/otp,yangchengjian\/otp,matwey\/otp,NOMORECOFFEE\/otp,VincentHHL\/otp,falkevik\/otp,sdebnath\/otp,riverrun\/otp,release-project\/otp,ahmedshafeeq\/otp,emacsmirror\/erlang,rlipscombe\/otp,jamesruan\/otp,platinumthinker\/otp,sitexa\/otp,yangchengjian\/otp,awetzel\/otp,lucafavatella\/otp,RoadRunnr\/otp,dumbbell\/otp,weisslj\/otp,RichMorin\/otp,aboroska\/otp,theom\/otp,haguenau\/otp,klarna\/otp,erlang\/otp,enikki\/otp,weisslj\/otp,ader1990\/otp,lianghaivv\/otp,lucafavatella\/otp,johanclaesson\/otp,RichMorin\/otp,massemanet\/otp,enikki\/otp,isvilen\/otp,saleyn\/otp,johanclaesson\/otp,riverrun\/otp,benoitc\/otp-1,jamesruan\/otp,derek121\/otp,lianghaivv\/otp,psyeugenic\/otp,benoitc\/otp-1,isvilen\/otp,riverrun\/otp,jamesruan\/otp,VincentHHL\/otp,bernardd\/otp,benoitc\/otp-1,massemanet\/otp,c-rack\/otp,klarna\/otp,johanclaesson\/otp,ader1990\/otp,tuncer\/otp,marquisthunder\/otp,gjaldon\/otp,RGafiyatullin\/otp,msantos\/otp,entropiae\/otp,goertzenator\/otp,aboroska\/otp,platinumthinker\/otp,RoadRunnr\/otp,johanclaesson\/otp,legoscia\/otp,saleyn\/otp,bjorng\/otp,emacsmirror\/erlang,RichMorin\/otp,aboroska\/otp,potatosalad\/otp,lianghaivv\/otp,msantos\/otp,klarna\/otp,bjorng\/otp,ader1990\/otp,jinshana\/otp,weisslj\/otp,basho\/otp,uabboli\/otp,cnbin\/otp,rlipscombe\/otp,krishnakumar4a4\/otp,mikpe\/otp,lrascao\/otp,dgud\/otp,erlang\/otp,neeraj9\/otp,theom\/otp,ader1990\/otp,GinjaNinja32\/otp,saleyn\/otp,platinumthinker\/otp,jemsbhai\/otp,haguenau\/otp,RoadRunnr\/otp,emile\/otp,tuncer\/otp,jemsbhai\/otp,hairyhum\/otp,lightcyphers\/otp,c-rack\/otp,krishnakumar4a4\/otp,msantos\/otp,johanclaesson\/otp,palas\/otp,beni55\/otp,schlagert\/otp,falkevik\/otp,schlagert\/otp,RGafiyatullin\/otp,saleyn\/otp,Teino1978-Corp\/otp,lhslll\/otp,aboroska\/otp,massemanet\/otp,Teino1978-Corp\/otp,cobusc\/otp,NOMORECOFFEE\/otp,RichMorin\/otp,RichMorin\/otp,kvakvs\/otp,schlagert\/otp,legoscia\/otp,benoitc\/otp-1,fenollp\/otp,lrascao\/otp,RaimoNiskanen\/otp,lrascao\/otp,lhslll\/otp,ferd\/otp,emile\/otp,potatosalad\/otp,erlang\/otp,GinjaNinja32\/otp,lantti\/otp,dgud\/otp,dumbbell\/otp,stolen\/otp,Teino1978-Corp\/erlang-otp,rlipscombe\/otp,lhslll\/otp,lantti\/otp,sitexa\/otp,lianghaivv\/otp,release-project\/otp,platinumthinker\/otp,tuncer\/otp,erlang\/otp,emacsmirror\/erlang,RGafiyatullin\/otp,Teino1978-Corp\/erlang-otp,stolen\/otp,derek121\/otp,bjorng\/otp,lrascao\/otp,stolen\/otp,sdebnath\/otp,kvakvs\/otp,cobusc\/otp,neeraj9\/otp,RichMorin\/otp,mujiatong\/otp,weisslj\/otp,aboroska\/otp,riverrun\/otp,release-project\/otp,g-andrade\/otp,RaimoNiskanen\/otp,uabboli\/otp,NOMORECOFFEE\/otp,g-andrade\/otp,g-andrade\/otp,marquisthunder\/otp,getong\/otp,beni55\/otp,goertzenator\/otp,RaimoNiskanen\/otp,hairyhum\/otp,lucafavatella\/otp,ferd\/otp,uabboli\/otp,mujiatong\/otp,bjorng\/otp,basho\/otp,lrascao\/otp,tuncer\/otp,basho\/otp,sitexa\/otp,klarna\/otp,VincentHHL\/otp,paladim\/otp,schlagert\/otp,bernardd\/otp,fenollp\/otp,rlipscombe\/otp,lrascao\/otp,Teino1978-Corp\/erlang-otp,lianghaivv\/otp,ferd\/otp,cobusc\/otp,hairyhum\/otp,schlagert\/otp,c-rack\/otp,dumbbell\/otp,legoscia\/otp,vinoski\/otp,hairyhum\/otp,awetzel\/otp,g-andrade\/otp,schlagert\/otp,psyeugenic\/otp,bugs-erlang-org\/otp,sitexa\/otp,ahmedshafeeq\/otp,sammoth-wazoku\/otp,klarna\/otp,psyeugenic\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/emulator\/beam\/erl_lock_check.c\n+++ erts\/emulator\/beam\/erl_lock_check.c\n@@ -75,9 +75,6 @@\n *\t\t\t\t\t\t the lock name)\"\n *\/\n #ifdef ERTS_SMP\n-#ifdef HIPE\n- {\t\"hipe_mfait_lock\",\t\t\tNULL\t\t\t},\n-#endif\n {\t\"driver_lock\",\t\t\t\t\"driver_name\"\t\t},\n {\t\"port_lock\",\t\t\t\t\"port_id\"\t\t},\n #endif\n@@ -87,6 +84,9 @@\n {\t\"reg_tab\",\t\t\t\tNULL\t\t\t},\n {\t\"migration_info_update\",\t\tNULL\t\t\t},\n {\t\"proc_main\",\t\t\t\t\"pid\"\t\t\t},\n+#ifdef HIPE\n+ {\t\"hipe_mfait_lock\",\t\t\tNULL\t\t\t},\n+#endif\n {\t\"nodes_monitors\",\t\t\tNULL\t\t\t},\n { \"driver_list\", NULL },\n {\t\"proc_link\",\t\t\t\t\"pid\"\t\t\t},\n"} {"commit":"f22b77d49cdb677e33aef74ab33e7cc5fc27ee9e","subject":"Fixed GFX flags and CapsConfirm return checks","message":"Fixed GFX flags and CapsConfirm return checks\n","repos":"FreeRDP\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,cloudbase\/FreeRDP-dev,akallabeth\/FreeRDP,erbth\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,mfleisz\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,mfleisz\/FreeRDP,mfleisz\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,cedrozor\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,awakecoding\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,Devolutions\/FreeRDP,akallabeth\/FreeRDP,cloudbase\/FreeRDP-dev,ivan-83\/FreeRDP,awakecoding\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,mfleisz\/FreeRDP,cloudbase\/FreeRDP-dev,cloudbase\/FreeRDP-dev,chipitsine\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,cloudbase\/FreeRDP-dev,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,ivan-83\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,chipitsine\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- channels\/rdpgfx\/client\/rdpgfx_main.c\n+++ channels\/rdpgfx\/client\/rdpgfx_main.c\n@@ -240,7 +240,10 @@\n \t\t}\n \n \t\tif (gfx->ThinClient)\n-\t\t\tcaps10Flags |= RDPGFX_CAPS_FLAG_AVC_THINCLIENT;\n+\t\t{\n+\t\t\tif ((caps10Flags & RDPGFX_CAPS_FLAG_AVC_DISABLED) == 0)\n+\t\t\t\tcaps10Flags |= RDPGFX_CAPS_FLAG_AVC_THINCLIENT;\n+\t\t}\n \n \t\tif (!rdpgfx_is_capability_filtered(gfx, RDPGFX_CAPVERSION_103))\n \t\t{\n@@ -305,12 +308,10 @@\n \tWLog_Print(gfx->log, WLOG_DEBUG, \"RecvCapsConfirmPdu: version: 0x%08\"PRIX32\" flags: 0x%08\"PRIX32\"\",\n \t capsSet.version, capsSet.flags);\n \n-\tif (context)\n-\t{\n-\t\tIFCALL(context->CapsConfirm, context, &pdu);\n-\t}\n-\n-\treturn CHANNEL_RC_OK;\n+\tif (!context)\n+\t\treturn ERROR_BAD_CONFIGURATION;\n+\n+\treturn IFCALLRESULT(CHANNEL_RC_OK, context->CapsConfirm, context, &pdu);\n }\n \n \/**\n"} {"commit":"57b30fd03373092469361c5db91121d29da4a68e","subject":"DrMem i#1419: add comments to dr_syscall_{get,set}_param() that it's up the caller to ensure they're safe.","message":"DrMem i#1419: add comments to dr_syscall_{get,set}_param() that it's\nup the caller to ensure they're safe.\n\nSVN-Revision: 2496\n","repos":"sigma-random\/dynamorio,code4bones\/dynamorio,code4bones\/dynamorio,daksunt\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,bl4ckic3\/dynamorio,code4bones\/dynamorio,AmesianX\/dynamorio,sigma-random\/dynamorio,code4bones\/dynamorio,sigma-random\/dynamorio,daksunt\/dynamorio,code4bones\/dynamorio,sigma-random\/dynamorio,bl4ckic3\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,sigma-random\/dynamorio,AmesianX\/dynamorio,daksunt\/dynamorio,AmesianX\/dynamorio,bl4ckic3\/dynamorio,daksunt\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/x86\/instrument.h\n+++ core\/x86\/instrument.h\n@@ -1,5 +1,5 @@\n \/* **********************************************************\n- * Copyright (c) 2010-2013 Google, Inc. All rights reserved.\n+ * Copyright (c) 2010-2014 Google, Inc. All rights reserved.\n * Copyright (c) 2002-2010 VMware, Inc. All rights reserved.\n * **********************************************************\/\n \n@@ -3127,6 +3127,11 @@\n \/**\n * Usable only from a pre-syscall (dr_register_pre_syscall_event()) \n * event. Returns the value of system call parameter number \\p param_num.\n+ *\n+ * It is up to the caller to ensure that reading this parameter is\n+ * safe: this routine does not know the number of parameters for each\n+ * system call, nor does it check whether this might read off the base\n+ * of the stack.\n *\/\n reg_t\n dr_syscall_get_param(void *drcontext, int param_num);\n@@ -3137,6 +3142,11 @@\n * event, or from a post-syscall (dr_register_post_syscall_event())\n * event when also using dr_syscall_invoke_another(). Sets the value\n * of system call parameter number \\p param_num to \\p new_value.\n+ *\n+ * It is up to the caller to ensure that writing this parameter is\n+ * safe: this routine does not know the number of parameters for each\n+ * system call, nor does it check whether this might write beyond the\n+ * base of the stack.\n *\/\n void\n dr_syscall_set_param(void *drcontext, int param_num, reg_t new_value);\n"} {"commit":"076fc1a62105f9b15ad94a534614bd2dccf612e1","subject":"myrg_open.c: comment fixed, bad flag hack removed","message":"myrg_open.c:\n comment fixed, bad flag hack removed\n","repos":"natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,slanterns\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- myisammrg\/myrg_open.c\n+++ myisammrg\/myrg_open.c\n@@ -23,10 +23,10 @@\n #include \"mrg_static.c\"\n #endif\n \n-\/*\t\n+\/*\n \topen a MyISAM MERGE table\n-\tif handle_locking is 0 then exit with error if some database is locked\n-\tif handle_locking is 1 then wait if database is locked\n+\tif handle_locking is 0 then exit with error if some table is locked\n+\tif handle_locking is 1 then wait if table is locked\n *\/\n \n \n@@ -78,7 +78,7 @@\n sizeof(name_buff)-1-dir_length));\n VOID(cleanup_dirname(buff,name_buff));\n }\n- if (!(isam=mi_open(buff,mode,test(handle_locking))))\n+ if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))\n \tgoto err;\n files++;\n last_isam=isam;\n"} {"commit":"a53f58ff4fc68f069c395966a0b7375523c77b65","subject":"erts: Fix getting of poll events on linux >= 4.15.0","message":"erts: Fix getting of poll events on linux >= 4.15.0\n","repos":"getong\/otp,dumbbell\/otp,bjorng\/otp,dumbbell\/otp,bjorng\/otp,kvakvs\/otp,lrascao\/otp,legoscia\/otp,jj1bdx\/otp,RoadRunnr\/otp,dumbbell\/otp,dgud\/otp,electricimp\/otp,mikpe\/otp,vladdu\/otp,bjorng\/otp,bsmr-erlang\/otp,electricimp\/otp,vinoski\/otp,legoscia\/otp,ferd\/otp,dumbbell\/otp,kvakvs\/otp,electricimp\/otp,lrascao\/otp,rlipscombe\/otp,emacsmirror\/erlang,potatosalad\/otp,uabboli\/otp,electricimp\/otp,ferd\/otp,vinoski\/otp,jj1bdx\/otp,legoscia\/otp,RoadRunnr\/otp,erlang\/otp,dgud\/otp,vinoski\/otp,dumbbell\/otp,jj1bdx\/otp,dumbbell\/otp,erlang\/otp,bjorng\/otp,aboroska\/otp,dgud\/otp,g-andrade\/otp,legoscia\/otp,isvilen\/otp,potatosalad\/otp,RoadRunnr\/otp,dgud\/otp,vladdu\/otp,isvilen\/otp,jj1bdx\/otp,ferd\/otp,dgud\/otp,isvilen\/otp,aboroska\/otp,g-andrade\/otp,lrascao\/otp,mikpe\/otp,electricimp\/otp,uabboli\/otp,potatosalad\/otp,erlang\/otp,rlipscombe\/otp,dumbbell\/otp,lrascao\/otp,jj1bdx\/otp,mikpe\/otp,rlipscombe\/otp,legoscia\/otp,g-andrade\/otp,RoadRunnr\/otp,aboroska\/otp,isvilen\/otp,aboroska\/otp,dgud\/otp,vinoski\/otp,erlang\/otp,emacsmirror\/erlang,RoadRunnr\/otp,rlipscombe\/otp,bsmr-erlang\/otp,jj1bdx\/otp,vinoski\/otp,lrascao\/otp,mikpe\/otp,RoadRunnr\/otp,mikpe\/otp,dumbbell\/otp,potatosalad\/otp,RoadRunnr\/otp,vladdu\/otp,mikpe\/otp,erlang\/otp,emacsmirror\/erlang,isvilen\/otp,ferd\/otp,bsmr-erlang\/otp,rlipscombe\/otp,vinoski\/otp,jj1bdx\/otp,bsmr-erlang\/otp,kvakvs\/otp,dgud\/otp,getong\/otp,mikpe\/otp,electricimp\/otp,uabboli\/otp,dgud\/otp,uabboli\/otp,vinoski\/otp,vladdu\/otp,rlipscombe\/otp,g-andrade\/otp,lrascao\/otp,bjorng\/otp,isvilen\/otp,kvakvs\/otp,bjorng\/otp,kvakvs\/otp,getong\/otp,lrascao\/otp,lrascao\/otp,legoscia\/otp,isvilen\/otp,erlang\/otp,electricimp\/otp,jj1bdx\/otp,getong\/otp,uabboli\/otp,getong\/otp,kvakvs\/otp,kvakvs\/otp,uabboli\/otp,aboroska\/otp,isvilen\/otp,mikpe\/otp,lrascao\/otp,dumbbell\/otp,aboroska\/otp,getong\/otp,g-andrade\/otp,ferd\/otp,uabboli\/otp,uabboli\/otp,jj1bdx\/otp,getong\/otp,g-andrade\/otp,bsmr-erlang\/otp,ferd\/otp,potatosalad\/otp,legoscia\/otp,ferd\/otp,emacsmirror\/erlang,isvilen\/otp,bsmr-erlang\/otp,bsmr-erlang\/otp,vladdu\/otp,bsmr-erlang\/otp,rlipscombe\/otp,jj1bdx\/otp,bjorng\/otp,vladdu\/otp,vladdu\/otp,uabboli\/otp,vinoski\/otp,aboroska\/otp,g-andrade\/otp,kvakvs\/otp,RoadRunnr\/otp,emacsmirror\/erlang,dgud\/otp,rlipscombe\/otp,bjorng\/otp,emacsmirror\/erlang,ferd\/otp,aboroska\/otp,erlang\/otp,RoadRunnr\/otp,erlang\/otp,emacsmirror\/erlang,emacsmirror\/erlang,rlipscombe\/otp,vinoski\/otp,mikpe\/otp,vinoski\/otp,legoscia\/otp,kvakvs\/otp,potatosalad\/otp,g-andrade\/otp,dgud\/otp,emacsmirror\/erlang,isvilen\/otp,legoscia\/otp,bjorng\/otp,bjorng\/otp,ferd\/otp,rlipscombe\/otp,erlang\/otp,electricimp\/otp,aboroska\/otp,erlang\/otp,dumbbell\/otp,vladdu\/otp,g-andrade\/otp,bsmr-erlang\/otp,potatosalad\/otp,potatosalad\/otp,potatosalad\/otp,mikpe\/otp,vladdu\/otp,potatosalad\/otp,getong\/otp,getong\/otp,g-andrade\/otp,getong\/otp,emacsmirror\/erlang,electricimp\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/emulator\/sys\/common\/erl_poll.c\n+++ erts\/emulator\/sys\/common\/erl_poll.c\n@@ -2326,6 +2326,7 @@\n {\n \/* For epoll we read the information about what is selected upon from the proc fs.*\/\n char fname[30];\n+ char s[256];\n FILE *f;\n unsigned int pos, flags, mnt_id;\n int line = 0;\n@@ -2343,12 +2344,12 @@\n }\n if (fscanf(f,\"\\nmnt_id:\\t%x\\n\", &mnt_id));\n line += 3;\n- while (!feof(f)) {\n+ while (fgets(s, sizeof(s) \/ sizeof(*s), f)) {\n \/* tfd: 10 events: 40000019 data: 180000000a *\/\n int ev_fd;\n uint32_t events;\n uint64_t data;\n- if (fscanf(f,\"tfd:%d events:%x data:%llx\\n\", &ev_fd, &events,\n+ if (sscanf(s,\"tfd:%d events:%x data:%llx\", &ev_fd, &events,\n (unsigned long long*)&data) != 3) {\n fprintf(stderr,\"failed to parse file %s on line %d, errno = %d\\n\", fname,\n line,\n@@ -2392,6 +2393,7 @@\n \n \/* For epoll we read the information about what is selected upon from the proc fs.*\/\n char fname[30];\n+ char s[256];\n FILE *f;\n unsigned int pos, flags, mnt_id;\n int line = 0;\n@@ -2410,12 +2412,12 @@\n }\n if (fscanf(f,\"\\nmnt_id:\\t%x\\n\", &mnt_id));\n line += 3;\n- while (!feof(f)) {\n+ while (fgets(s, sizeof(s) \/ sizeof(*s), f)) {\n \/* tfd: 10 events: 40000019 data: 180000000a *\/\n int fd;\n uint32_t events;\n uint64_t data;\n- if (fscanf(f,\"tfd:%d events:%x data:%llx\\n\", &fd, &events,\n+ if (sscanf(s,\"tfd:%d events:%x data:%llx\", &fd, &events,\n (unsigned long long*)&data) != 3) {\n fprintf(stderr,\"failed to parse file %s on line %d, errno = %d\\n\",\n fname, line, errno);\n"} {"commit":"34374c2d2c94435a96d98b6527d04417849c0971","subject":"old_hmac_encode: check for NULL result when allocating *pder","message":"old_hmac_encode: check for NULL result when allocating *pder\n\nSigned-off-by: Kurt Roeckx <bb87b47479d83cec3c76132206933257ded727b2@openssl.org>\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/hmac\/hm_ameth.c\n+++ crypto\/hmac\/hm_ameth.c\n@@ -123,6 +123,8 @@\n \t\tif (!*pder)\n \t\t\t{\n \t\t\t*pder = OPENSSL_malloc(os->length);\n+\t\t\tif (*pder == NULL)\n+\t\t\t\treturn -1;\n \t\t\tinc = 0;\n \t\t\t}\n \t\telse inc = 1;\n"} {"commit":"ebdaf096ad3fb0ef5ee3253ea0e24ec6efa3ac3d","subject":"Aibned mem now compiles if pthreads are absent.","message":"Aibned mem now compiles if pthreads are absent.\n","repos":"oneminot\/libcvd,oneminot\/libcvd,oneminot\/libcvd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cvd\/internal\/aligned_mem.h\n+++ cvd\/internal\/aligned_mem.h\n@@ -92,7 +92,9 @@\n \t buffers.erase(it);\n \t}\n };\n- template<class T, int N> Synchronized aligned_mem<T,N>::mutex;\n+\t#if defined(CVD_HAVE_PTHREAD) && defined(_REENTRANT)\n+\t\ttemplate<class T, int N> Synchronized aligned_mem<T,N>::mutex;\n+\t#endif\n \n template <class T, int N> std::map<T*,typename aligned_mem<T,N>::entry> aligned_mem<T,N>::buffers;\n \n"} {"commit":"7debb5b80895b71e91b00506e6d1b2bca0eb0f93","subject":"Adding File","message":"Adding File\n\nAdding tes.c file.","repos":"FMCalisto\/NPG,FMCalisto\/NPG","returncode":1,"stderr":"error: pathspec 'gethostbyname\/test.c' did not match any file(s) known to git\n","license":"unlicense","lang":"C","diff":"--- gethostbyname\/test.c\n+++ gethostbyname\/test.c\n@@ -0,0 +1,25 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <netdb.h>\n+#include <sys\/socket.h>\n+#include <netinet\/in.h>\n+#include <arpa\/inet.h>\n+\n+int main(void)\n+{\n+\tstruct hostent *h;\n+\tstruct in_addr *a;\n+\t\n+\tif((h = gethostname(\"tejo\")) == NULL)\n+\t{\n+\t\texit(1); \/\/ error\n+\t}\n+\t\n+\tprintf(\"official hosta name: %s\\n\", h->h_name);\n+\t\n+\ta = (struct in_addr*) h->h_addr_list[0];\n+\t\n+\tprintf(\"internet address: %s (%081X)\\n\", inet_ntoa(*a), ntohl(a->s_addr));\n+\t\n+\texit(0);\n+}\n"} {"commit":"017bbe15a5191256bf3e3f05d46029082f3aaadb","subject":"-c option parsing was missing a break statement","message":"-c option parsing was missing a break statement\n","repos":"ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- myproxy\/myproxy_arq.c\n+++ myproxy\/myproxy_arq.c\n@@ -180,6 +180,7 @@\n \t break;\n case 'c':\n config_file = strdup(optarg);\n+ break;\n \tcase 'e':\t\/* expiring in <hours> *\/\n \t cred.end_time = (SECONDS_PER_HOUR * atoi(optarg)) + time(0);\n \t break;\n"} {"commit":"c9ba20a537056d645025e1c0f574cc093e909b48","subject":"Enable __atomic aquire\/release barriers for Apple's clang as of v12.0.0","message":"Enable __atomic aquire\/release barriers for Apple's clang as of v12.0.0\n","repos":"g-andrade\/otp,isvilen\/otp,emacsmirror\/erlang,rlipscombe\/otp,lrascao\/otp,dumbbell\/otp,getong\/otp,erlang\/otp,mikpe\/otp,getong\/otp,bjorng\/otp,g-andrade\/otp,emacsmirror\/erlang,jj1bdx\/otp,mikpe\/otp,erlang\/otp,vinoski\/otp,mikpe\/otp,g-andrade\/otp,vinoski\/otp,dumbbell\/otp,jj1bdx\/otp,isvilen\/otp,uabboli\/otp,lrascao\/otp,rlipscombe\/otp,bjorng\/otp,dumbbell\/otp,getong\/otp,vinoski\/otp,rlipscombe\/otp,uabboli\/otp,lrascao\/otp,dgud\/otp,potatosalad\/otp,mikpe\/otp,getong\/otp,isvilen\/otp,lrascao\/otp,isvilen\/otp,emacsmirror\/erlang,vinoski\/otp,isvilen\/otp,erlang\/otp,isvilen\/otp,ferd\/otp,lrascao\/otp,mikpe\/otp,ferd\/otp,vinoski\/otp,erlang\/otp,vinoski\/otp,lrascao\/otp,dgud\/otp,jj1bdx\/otp,ferd\/otp,getong\/otp,bjorng\/otp,uabboli\/otp,jj1bdx\/otp,ferd\/otp,erlang\/otp,bjorng\/otp,dumbbell\/otp,mikpe\/otp,uabboli\/otp,isvilen\/otp,emacsmirror\/erlang,rlipscombe\/otp,g-andrade\/otp,uabboli\/otp,emacsmirror\/erlang,bjorng\/otp,uabboli\/otp,erlang\/otp,mikpe\/otp,g-andrade\/otp,erlang\/otp,vinoski\/otp,mikpe\/otp,dumbbell\/otp,erlang\/otp,dumbbell\/otp,lrascao\/otp,rlipscombe\/otp,bjorng\/otp,potatosalad\/otp,emacsmirror\/erlang,lrascao\/otp,jj1bdx\/otp,jj1bdx\/otp,dumbbell\/otp,dumbbell\/otp,uabboli\/otp,erlang\/otp,potatosalad\/otp,dumbbell\/otp,dgud\/otp,potatosalad\/otp,dgud\/otp,dumbbell\/otp,potatosalad\/otp,uabboli\/otp,g-andrade\/otp,potatosalad\/otp,dgud\/otp,bjorng\/otp,ferd\/otp,dgud\/otp,mikpe\/otp,dgud\/otp,isvilen\/otp,emacsmirror\/erlang,rlipscombe\/otp,vinoski\/otp,dgud\/otp,dgud\/otp,g-andrade\/otp,bjorng\/otp,g-andrade\/otp,potatosalad\/otp,potatosalad\/otp,jj1bdx\/otp,mikpe\/otp,potatosalad\/otp,bjorng\/otp,isvilen\/otp,g-andrade\/otp,ferd\/otp,isvilen\/otp,ferd\/otp,ferd\/otp,jj1bdx\/otp,vinoski\/otp,rlipscombe\/otp,g-andrade\/otp,potatosalad\/otp,jj1bdx\/otp,jj1bdx\/otp,ferd\/otp,uabboli\/otp,rlipscombe\/otp,vinoski\/otp,rlipscombe\/otp,getong\/otp,emacsmirror\/erlang,getong\/otp,dgud\/otp,bjorng\/otp,lrascao\/otp,erlang\/otp,getong\/otp,getong\/otp,rlipscombe\/otp,emacsmirror\/erlang,emacsmirror\/erlang,getong\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/include\/internal\/gcc\/ethread.h\n+++ erts\/include\/internal\/gcc\/ethread.h\n@@ -44,6 +44,10 @@\n #undef ETHR_GCC_RELB_VERSIONS__\n #undef ETHR_GCC_RELB_MOD_VERSIONS__\n #undef ETHR_GCC_MB_MOD_VERSIONS__\n+#undef ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS__\n+\n+#define ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS__ \\\n+ ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS\n \n \/*\n * True GNU GCCs before version 4.8 do not emit a memory barrier\n@@ -52,15 +56,27 @@\n *\/\n #undef ETHR___atomic_load_ACQUIRE_barrier_bug\n #if ETHR_GCC_COMPILER != ETHR_GCC_COMPILER_TRUE\n-\/*\n- * A gcc compatible compiler. We have no information\n+ \n+#if ETHR_GCC_COMPILER == ETHR_GCC_COMPILER_CLANG \\\n+ && defined(__apple_build_version__) \\\n+ && __clang_major__ >= 12\n+\/* Apples clang verified not to have this bug *\/\n+# define ETHR___atomic_load_ACQUIRE_barrier_bug 0\n+\/* Also trust builtin barriers *\/\n+# undef ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS__\n+# define ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS__ 1\n+# else\n+\/*\n+ * Another gcc compatible compiler. We have no information\n * about the existence of this bug, but we assume\n * that it is not impossible that it could have\n * been \"inherited\". Therefore, until we are certain\n * that the bug does not exist, we assume that it\n * does.\n *\/\n-# define ETHR___atomic_load_ACQUIRE_barrier_bug ETHR_GCC_VERSIONS_MASK__\n+# define ETHR___atomic_load_ACQUIRE_barrier_bug ETHR_GCC_VERSIONS_MASK__\n+# endif\n+\n #elif !ETHR_AT_LEAST_GCC_VSN__(4, 8, 0)\n \/* True gcc of version < 4.8, i.e., bug exist... *\/\n # define ETHR___atomic_load_ACQUIRE_barrier_bug ETHR_GCC_VERSIONS_MASK__\n@@ -87,7 +103,7 @@\n #define ETHR_GCC_RELAXED_VERSIONS__ ETHR_GCC_VERSIONS_MASK__\n #define ETHR_GCC_RELAXED_MOD_VERSIONS__ ETHR_GCC_VERSIONS_MASK__\n \n-#if ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS\n+#if ETHR_TRUST_GCC_ATOMIC_BUILTINS_MEMORY_BARRIERS__\n # define ETHR_GCC_ACQB_VERSIONS__ ETHR_GCC_VERSIONS_MASK__\n # define ETHR_GCC_ACQB_MOD_VERSIONS__ ETHR_GCC_VERSIONS_MASK__\n # define ETHR_GCC_RELB_VERSIONS__ ETHR_GCC_VERSIONS_MASK__\n"} {"commit":"8df4053f0532df8fe47d0434af51676b0fa65491","subject":"platform_data: edma: Be precise with the paRAM struct","message":"platform_data: edma: Be precise with the paRAM struct\n\nThe edmacc_param struct should follow the layout of the paRAM area in the\nHW. Be explicit on the size of the fields (u32) and also mark the struct\nas packed to avoid any padding on non 32bit architectures.\n\nSigned-off-by: Peter Ujfalusi <e5c0b4cdf99ae1d408b9c497159e74b54e02e008@ti.com>\nAcked-by: Joel Fernandes <79b252d5caac623cbab67c059402178ee09b8945@ti.com>\nReviewed-and-Tested-by: Joel Fernandes <79b252d5caac623cbab67c059402178ee09b8945@ti.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/platform_data\/edma.h\n+++ include\/linux\/platform_data\/edma.h\n@@ -43,15 +43,15 @@\n \n \/* PaRAM slots are laid out like this *\/\n struct edmacc_param {\n-\tunsigned int opt;\n-\tunsigned int src;\n-\tunsigned int a_b_cnt;\n-\tunsigned int dst;\n-\tunsigned int src_dst_bidx;\n-\tunsigned int link_bcntrld;\n-\tunsigned int src_dst_cidx;\n-\tunsigned int ccnt;\n-};\n+\tu32 opt;\n+\tu32 src;\n+\tu32 a_b_cnt;\n+\tu32 dst;\n+\tu32 src_dst_bidx;\n+\tu32 link_bcntrld;\n+\tu32 src_dst_cidx;\n+\tu32 ccnt;\n+} __packed;\n \n \/* fields in edmacc_param.opt *\/\n #define SAM\t\tBIT(0)\n"} {"commit":"7abee0cedf45f25027d14a3d439d0e1874c5bc77","subject":"Jeffrey Altman convinced me this patch was really needed, or there is no way to make sure GetCursorInfo will give us a valid answer.","message":"Jeffrey Altman convinced me this patch was really needed, or there is\nno way to make sure GetCursorInfo will give us a valid answer.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/rand\/rand_win.c\n+++ crypto\/rand\/rand_win.c\n@@ -130,14 +130,27 @@\n static void readtimer(void);\n static void readscreen(void);\n \n-\/* It appears like PCURSORINFO is only defined when WINVER is 0x0500 and up,\n- which currently only happens on Win2000. Unfortunately, that is a typedef,\n- so it's a little bit difficult to detect properly. On the other hand, the\n- macro CURSOR_SHOWING is defined within the same conditional, so it can be\n- use to detect the absence of PCURSORINFO. *\/\n+\/* It appears like CURSORINFO, PCURSORINFO and LPCURSORINFO are only defined\n+ when WINVER is 0x0500 and up, which currently only happens on Win2000.\n+ Unfortunately, those are typedefs, so they're a little bit difficult to\n+ detect properly. On the other hand, the macro CURSOR_SHOWING is defined\n+ within the same conditional, so it can be use to detect the absence of said\n+ typedefs. *\/\n+\n #ifndef CURSOR_SHOWING\n-typedef void *PCURSORINFO;\n-#endif\n+\/*\n+ * Information about the global cursor.\n+ *\/\n+typedef struct tagCURSORINFO\n+{\n+ DWORD cbSize;\n+ DWORD flags;\n+ HCURSOR hCursor;\n+ POINT ptScreenPos;\n+} CURSORINFO, *PCURSORINFO, *LPCURSORINFO;\n+\n+#define CURSOR_SHOWING 0x00000001\n+#endif \/* CURSOR_SHOWING *\/\n \n typedef BOOL (WINAPI *CRYPTACQUIRECONTEXT)(HCRYPTPROV *, LPCTSTR, LPCTSTR,\n \t\t\t\t DWORD, DWORD);\n@@ -245,8 +258,10 @@\n \t\tif (cursor)\n \t\t\t{\n \t\t\t\/* cursor position *\/\n-\t\t\tcursor((PCURSORINFO)buf);\n-\t\t\tRAND_add(buf, sizeof(buf), 0);\n+ PCURSORINFO p = (PCURSORINFO) buf;\n+ p->cbSize = sizeof(CURSORINFO);\n+\t\t\tif (cursor(p))\n+\t\t\t RAND_add(p+sizeof(p->cbSize), p->cbSize-sizeof(p->cbSize), 0);\n \t\t\t}\n \n \t\tif (queue)\n"} {"commit":"c94c2137c01b179ec3372c1c28e8ceab3b63a7da","subject":"regulator: Include types.h in consumer.h","message":"regulator: Include types.h in consumer.h\n\nconsumer.h uses bool which is defined in types.h. Include it in\nthe consumer.h file so that users who include consumer.h first\ncompile correctly.\n\nSigned-off-by: Stephen Boyd <010521127f513270fe503d86ab8316ac5147f4b7@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/regulator\/consumer.h\n+++ include\/linux\/regulator\/consumer.h\n@@ -35,6 +35,7 @@\n #ifndef __LINUX_REGULATOR_CONSUMER_H_\n #define __LINUX_REGULATOR_CONSUMER_H_\n \n+#include <linux\/types.h>\n #include <linux\/compiler.h>\n \n struct device;\n"} {"commit":"a71b5abfa4c5515fcfb5b69281e04cf620e0c66c","subject":"use <= instead of ==","message":"use <= instead of ==\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/rand\/randfile.c\n+++ crypto\/rand\/randfile.c\n@@ -120,7 +120,7 @@\n \t\tif (bytes > 0)\n \t\t\t{\n \t\t\tbytes-=n;\n-\t\t\tif (bytes == 0) break;\n+\t\t\tif (bytes <= 0) break;\n \t\t\t}\n \t\t}\n \tfclose(in);\n"} {"commit":"4dceef96756b667360741712a8e37490f8458516","subject":"nfs: fix compile error in rpc_pipefs.h","message":"nfs: fix compile error in rpc_pipefs.h\n\nThis include is needed for the definition of delayed_work.\n\nSigned-off-by: J. Bruce Fields <51738506c1b2ccb0761f23bdc612c93babf738ea@citi.umich.edu>\nSigned-off-by: Trond Myklebust <6a1f9db795c9fc44be97d66ab114c53193bd3d13@netapp.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/sunrpc\/rpc_pipe_fs.h\n+++ include\/linux\/sunrpc\/rpc_pipe_fs.h\n@@ -2,6 +2,8 @@\n #define _LINUX_SUNRPC_RPC_PIPE_FS_H\n \n #ifdef __KERNEL__\n+\n+#include <linux\/workqueue.h>\n \n struct rpc_pipe_msg {\n \tstruct list_head list;\n"} {"commit":"133dcbb95ce76179595ccee62c860aab4d5602e4","subject":"[project @ 2000-11-13 17:17:40 by simonmar] Pull in inttypes.h if we have it, as the second-favourite option after stdint.h. This should fix problems building the readline cbits on Solaris.","message":"[project @ 2000-11-13 17:17:40 by simonmar]\nPull in inttypes.h if we have it, as the second-favourite option after\nstdint.h. This should fix problems building the readline cbits on Solaris.\n","repos":"shlevy\/ghc,sgillespie\/ghc,GaloisInc\/halvm-ghc,gridaphobe\/ghc,ekmett\/ghc,fmthoma\/ghc,tjakway\/ghcjvm,nushio3\/ghc,tibbe\/ghc,urbanslug\/ghc,GaloisInc\/halvm-ghc,snoyberg\/ghc,tjakway\/ghcjvm,ezyang\/ghc,lukexi\/ghc-7.8-arm64,forked-upstream-packages-for-ghcjs\/ghc,ghc-android\/ghc,vikraman\/ghc,GaloisInc\/halvm-ghc,TomMD\/ghc,urbanslug\/ghc,acowley\/ghc,bitemyapp\/ghc,mettekou\/ghc,mcmaniac\/ghc,mfine\/ghc,green-haskell\/ghc,vTurbine\/ghc,wxwxwwxxx\/ghc,acowley\/ghc,anton-dessiatov\/ghc,gcampax\/ghc,nkaretnikov\/ghc,ezyang\/ghc,holzensp\/ghc,mcschroeder\/ghc,forked-upstream-packages-for-ghcjs\/ghc,vTurbine\/ghc,elieux\/ghc,ekmett\/ghc,nomeata\/ghc,frantisekfarka\/ghc-dsi,nushio3\/ghc,mcmaniac\/ghc,bitemyapp\/ghc,vikraman\/ghc,snoyberg\/ghc,spacekitteh\/smcghc,mcschroeder\/ghc,acowley\/ghc,TomMD\/ghc,ilyasergey\/GHC-XAppFix,oldmanmike\/ghc,snoyberg\/ghc,mettekou\/ghc,sdiehl\/ghc,lukexi\/ghc,da-x\/ghc,vikraman\/ghc,gcampax\/ghc,sgillespie\/ghc,siddhanathan\/ghc,acowley\/ghc,ml9951\/ghc,mcschroeder\/ghc,snoyberg\/ghc,nathyong\/microghc-ghc,vTurbine\/ghc,anton-dessiatov\/ghc,hferreiro\/replay,sgillespie\/ghc,nushio3\/ghc,GaloisInc\/halvm-ghc,AlexanderPankiv\/ghc,shlevy\/ghc,christiaanb\/ghc,oldmanmike\/ghc,nkaretnikov\/ghc,christiaanb\/ghc,anton-dessiatov\/ghc,TomMD\/ghc,tibbe\/ghc,nkaretnikov\/ghc,ezyang\/ghc,green-haskell\/ghc,olsner\/ghc,mfine\/ghc,oldmanmike\/ghc,oldmanmike\/ghc,siddhanathan\/ghc,vikraman\/ghc,ezyang\/ghc,elieux\/ghc,fmthoma\/ghc,spacekitteh\/smcghc,vTurbine\/ghc,lukexi\/ghc,GaloisInc\/halvm-ghc,olsner\/ghc,urbanslug\/ghc,wxwxwwxxx\/ghc,nathyong\/microghc-ghc,AlexanderPankiv\/ghc,tibbe\/ghc,fmthoma\/ghc,olsner\/ghc,jstolarek\/ghc,ghc-android\/ghc,olsner\/ghc,wxwxwwxxx\/ghc,ryantm\/ghc,AlexanderPankiv\/ghc,nomeata\/ghc,hferreiro\/replay,christiaanb\/ghc,ezyang\/ghc,mcschroeder\/ghc,nushio3\/ghc,nathyong\/microghc-ghc,ghc-android\/ghc,ilyasergey\/GHC-XAppFix,anton-dessiatov\/ghc,sgillespie\/ghc,ml9951\/ghc,tibbe\/ghc,da-x\/ghc,fmthoma\/ghc,spacekitteh\/smcghc,sgillespie\/ghc,jstolarek\/ghc,ekmett\/ghc,sdiehl\/ghc,ghc-android\/ghc,gridaphobe\/ghc,sdiehl\/ghc,shlevy\/ghc,da-x\/ghc,mettekou\/ghc,mfine\/ghc,frantisekfarka\/ghc-dsi,sgillespie\/ghc,elieux\/ghc,olsner\/ghc,nomeata\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ml9951\/ghc,mcschroeder\/ghc,hferreiro\/replay,siddhanathan\/ghc,ml9951\/ghc,AlexanderPankiv\/ghc,snoyberg\/ghc,bitemyapp\/ghc,shlevy\/ghc,gridaphobe\/ghc,urbanslug\/ghc,mfine\/ghc,elieux\/ghc,mcschroeder\/ghc,green-haskell\/ghc,green-haskell\/ghc,holzensp\/ghc,fmthoma\/ghc,TomMD\/ghc,AlexanderPankiv\/ghc,mfine\/ghc,anton-dessiatov\/ghc,sdiehl\/ghc,fmthoma\/ghc,lukexi\/ghc-7.8-arm64,gridaphobe\/ghc,mcmaniac\/ghc,gcampax\/ghc,ilyasergey\/GHC-XAppFix,olsner\/ghc,nathyong\/microghc-ghc,ryantm\/ghc,nkaretnikov\/ghc,anton-dessiatov\/ghc,da-x\/ghc,AlexanderPankiv\/ghc,gcampax\/ghc,ghc-android\/ghc,vikraman\/ghc,elieux\/ghc,gridaphobe\/ghc,da-x\/ghc,ghc-android\/ghc,nushio3\/ghc,acowley\/ghc,fmthoma\/ghc,forked-upstream-packages-for-ghcjs\/ghc,TomMD\/ghc,mcmaniac\/ghc,forked-upstream-packages-for-ghcjs\/ghc,tjakway\/ghcjvm,urbanslug\/ghc,mcschroeder\/ghc,tjakway\/ghcjvm,nushio3\/ghc,lukexi\/ghc,green-haskell\/ghc,hferreiro\/replay,siddhanathan\/ghc,AlexanderPankiv\/ghc,siddhanathan\/ghc,sgillespie\/ghc,christiaanb\/ghc,lukexi\/ghc-7.8-arm64,hferreiro\/replay,mfine\/ghc,lukexi\/ghc-7.8-arm64,shlevy\/ghc,shlevy\/ghc,mcmaniac\/ghc,acowley\/ghc,vikraman\/ghc,elieux\/ghc,sdiehl\/ghc,holzensp\/ghc,oldmanmike\/ghc,mfine\/ghc,mettekou\/ghc,mettekou\/ghc,wxwxwwxxx\/ghc,nkaretnikov\/ghc,ml9951\/ghc,frantisekfarka\/ghc-dsi,siddhanathan\/ghc,wxwxwwxxx\/ghc,nomeata\/ghc,mettekou\/ghc,olsner\/ghc,ezyang\/ghc,sdiehl\/ghc,siddhanathan\/ghc,shlevy\/ghc,christiaanb\/ghc,oldmanmike\/ghc,da-x\/ghc,nkaretnikov\/ghc,holzensp\/ghc,bitemyapp\/ghc,urbanslug\/ghc,jstolarek\/ghc,holzensp\/ghc,GaloisInc\/halvm-ghc,da-x\/ghc,bitemyapp\/ghc,forked-upstream-packages-for-ghcjs\/ghc,tjakway\/ghcjvm,snoyberg\/ghc,ekmett\/ghc,acowley\/ghc,hferreiro\/replay,TomMD\/ghc,ryantm\/ghc,sdiehl\/ghc,frantisekfarka\/ghc-dsi,tjakway\/ghcjvm,nkaretnikov\/ghc,elieux\/ghc,gcampax\/ghc,ryantm\/ghc,nathyong\/microghc-ghc,nomeata\/ghc,lukexi\/ghc,spacekitteh\/smcghc,TomMD\/ghc,ghc-android\/ghc,tjakway\/ghcjvm,nathyong\/microghc-ghc,lukexi\/ghc,nathyong\/microghc-ghc,gcampax\/ghc,snoyberg\/ghc,mettekou\/ghc,gcampax\/ghc,nushio3\/ghc,ilyasergey\/GHC-XAppFix,vTurbine\/ghc,ryantm\/ghc,vTurbine\/ghc,hferreiro\/replay,wxwxwwxxx\/ghc,ekmett\/ghc,vikraman\/ghc,jstolarek\/ghc,jstolarek\/ghc,ml9951\/ghc,wxwxwwxxx\/ghc,GaloisInc\/halvm-ghc,tibbe\/ghc,vTurbine\/ghc,lukexi\/ghc-7.8-arm64,ezyang\/ghc,christiaanb\/ghc,frantisekfarka\/ghc-dsi,gridaphobe\/ghc,urbanslug\/ghc,christiaanb\/ghc,oldmanmike\/ghc,ml9951\/ghc,ml9951\/ghc,spacekitteh\/smcghc,gridaphobe\/ghc,anton-dessiatov\/ghc,forked-upstream-packages-for-ghcjs\/ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ghc\/includes\/HsFFI.h\n+++ ghc\/includes\/HsFFI.h\n@@ -1,5 +1,5 @@\n \/* -----------------------------------------------------------------------------\n- * $Id: HsFFI.h,v 1.8 2000\/11\/07 17:05:47 simonmar Exp $\n+ * $Id: HsFFI.h,v 1.9 2000\/11\/13 17:17:40 simonmar Exp $\n *\n * (c) The GHC Team, 2000\n *\n@@ -25,6 +25,8 @@\n *\/\n #define __STDC_LIMIT_MACROS\n #include <stdint.h>\n+#elif defined(HAVE_INTTYPES_H)\n+#include <inttypes.h>\n #else\n \/* second best guess (e.g. on Solaris) *\/\n #include <limits.h>\n"} {"commit":"123c2fef14b80f26f5a8504ccf7b819c2975a6fa","subject":"SM2: Make the EVP_PKEY_METHOD ctrl_str function listen to distid","message":"SM2: Make the EVP_PKEY_METHOD ctrl_str function listen to distid\n\nBecause we start using Distinguished ID, we also define the key name\n\"distid\", possibly prefixed with \"hex\", but keep \"sm2_id\" and\n\"sm2_hex_id\" for compatibility with GmSSL.\n\nFixes #11293\n\nReviewed-by: Paul Yang <184f6de988fc88cc661c91bad2c53ca35ab2d101@antfin.com>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/11302)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/sm2\/sm2_pmeth.c\n+++ crypto\/sm2\/sm2_pmeth.c\n@@ -26,7 +26,7 @@\n typedef struct {\n \/* message digest *\/\n const EVP_MD *md;\n- \/* Distinguishing Identifier, ISO\/IEC 15946-3 *\/\n+ \/* Distinguishing Identifier, ISO\/IEC 15946-3, FIPS 196 *\/\n uint8_t *id;\n size_t id_len;\n \/* id_set indicates if the 'id' field is set (1) or not (0) *\/\n@@ -247,14 +247,10 @@\n else\n return -2;\n return EVP_PKEY_CTX_set_ec_param_enc(ctx, param_enc);\n- } else if (strcmp(type, \"sm2_id\") == 0) {\n+ } else if (strcmp(type, \"distid\") == 0) {\n return pkey_sm2_ctrl(ctx, EVP_PKEY_CTRL_SET1_ID,\n (int)strlen(value), (void *)value);\n- } else if (strcmp(type, \"sm2_hex_id\") == 0) {\n- \/*\n- * TODO(3.0): reconsider the name \"sm2_hex_id\", OR change\n- * OSSL_PARAM_allocate_from_text() to handle infix \"_hex_\"\n- *\/\n+ } else if (strcmp(type, \"hexdistid\") == 0) {\n hex_id = OPENSSL_hexstr2buf((const char *)value, &hex_len);\n if (hex_id == NULL) {\n SM2err(SM2_F_PKEY_SM2_CTRL_STR, ERR_R_PASSED_INVALID_ARGUMENT);\n"} {"commit":"9f711252f5d5ef4e05f5277ab462bf7668b53cfd","subject":"Fix small bug in operator== for iterators","message":"Fix small bug in operator== for iterators\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@42331 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/ADT\/SparseBitVector.h\n+++ include\/llvm\/ADT\/SparseBitVector.h\n@@ -441,7 +441,7 @@\n \n bool operator==(const SparseBitVectorIterator &RHS) const {\n \/\/ If they are both at the end, ignore the rest of the fields.\n- if (AtEnd == RHS.AtEnd)\n+ if (AtEnd && RHS.AtEnd)\n return true;\n \/\/ Otherwise they are the same if they have the same bit number and\n \/\/ bitmap.\n"} {"commit":"1fc27acdc0bcf963ebfb080e05620851f97b5217","subject":"SlotIndexes - add missing initializer. NFCI.","message":"SlotIndexes - add missing initializer. NFCI.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@366015 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/SlotIndexes.h\n+++ include\/llvm\/CodeGen\/SlotIndexes.h\n@@ -347,7 +347,7 @@\n public:\n static char ID;\n \n- SlotIndexes() : MachineFunctionPass(ID) {\n+ SlotIndexes() : MachineFunctionPass(ID), mf(nullptr) {\n initializeSlotIndexesPass(*PassRegistry::getPassRegistry());\n }\n \n"} {"commit":"9ec47b85c7ca757795469e0962d046e98b2930ca","subject":"Remove dead forward declaration.","message":"Remove dead forward declaration.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@238205 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/MC\/MCObjectStreamer.h\n+++ include\/llvm\/MC\/MCObjectStreamer.h\n@@ -18,7 +18,6 @@\n namespace llvm {\n class MCAssembler;\n class MCCodeEmitter;\n-class MCSectionData;\n class MCSubtargetInfo;\n class MCExpr;\n class MCFragment;\n"} {"commit":"11c03fe898157c8cbc590f48b36be6348a8f9cda","subject":"Devirtualize OptionValue::~OptionValue in favor of protected in the base, with final derived classes","message":"Devirtualize OptionValue::~OptionValue in favor of protected in the base, with final derived classes\n\nThese objects are never polymorphically owned, so there's no need for\nvirtual dtors - just make the dtor protected in the base classes, and\nmake the derived classes final.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@231217 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Support\/CommandLine.h\n+++ include\/llvm\/Support\/CommandLine.h\n@@ -352,8 +352,10 @@\n \n \/\/ Support value comparison outside the template.\n struct GenericOptionValue {\n- virtual ~GenericOptionValue() {}\n virtual bool compare(const GenericOptionValue &V) const = 0;\n+\n+protected:\n+ ~GenericOptionValue() = default;\n \n private:\n virtual void anchor();\n@@ -380,12 +382,18 @@\n bool compare(const GenericOptionValue & \/*V*\/) const override {\n return false;\n }\n+\n+protected:\n+ ~OptionValueBase() = default;\n };\n \n \/\/ Simple copy of the option value.\n template <class DataType> class OptionValueCopy : public GenericOptionValue {\n DataType Value;\n bool Valid;\n+\n+protected:\n+ ~OptionValueCopy() = default;\n \n public:\n OptionValueCopy() : Valid(false) {}\n@@ -417,12 +425,16 @@\n template <class DataType>\n struct OptionValueBase<DataType, false> : OptionValueCopy<DataType> {\n typedef DataType WrapperType;\n+\n+protected:\n+ ~OptionValueBase() = default;\n };\n \n \/\/ Top-level option class.\n template <class DataType>\n-struct OptionValue : OptionValueBase<DataType, std::is_class<DataType>::value> {\n- OptionValue() {}\n+struct OptionValue final\n+ : OptionValueBase<DataType, std::is_class<DataType>::value> {\n+ OptionValue() = default;\n \n OptionValue(const DataType &V) { this->setValue(V); }\n \/\/ Some options may take their value from a different data type.\n@@ -435,7 +447,8 @@\n \/\/ Other safe-to-copy-by-value common option types.\n enum boolOrDefault { BOU_UNSET, BOU_TRUE, BOU_FALSE };\n template <>\n-struct OptionValue<cl::boolOrDefault> : OptionValueCopy<cl::boolOrDefault> {\n+struct OptionValue<cl::boolOrDefault> final\n+ : OptionValueCopy<cl::boolOrDefault> {\n typedef cl::boolOrDefault WrapperType;\n \n OptionValue() {}\n@@ -450,7 +463,8 @@\n void anchor() override;\n };\n \n-template <> struct OptionValue<std::string> : OptionValueCopy<std::string> {\n+template <>\n+struct OptionValue<std::string> final : OptionValueCopy<std::string> {\n typedef StringRef WrapperType;\n \n OptionValue() {}\n"} {"commit":"a220bd54399a58c3af0221c40555a6979cf12283","subject":"CommandLine: Use variadic templates to simplify opt constructors.","message":"CommandLine: Use variadic templates to simplify opt constructors.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@229332 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Support\/CommandLine.h\n+++ include\/llvm\/Support\/CommandLine.h\n@@ -1040,8 +1040,14 @@\n static void opt(MiscFlags MF, Option &O) { O.setMiscFlag(MF); }\n };\n \n-\/\/ apply method - Apply a modifier to an option in a type safe way.\n-template <class Mod, class Opt> void apply(const Mod &M, Opt *O) {\n+\/\/ apply method - Apply modifiers to an option in a type safe way.\n+template <class Opt, class Mod, class... Mods>\n+void apply(Opt *O, const Mod &M, const Mods &... Ms) {\n+ applicator<Mod>::opt(M, *O);\n+ apply(O, Ms...);\n+}\n+\n+template <class Opt, class Mod> void apply(Opt *O, const Mod &M) {\n applicator<Mod>::opt(M, *O);\n }\n \n@@ -1209,95 +1215,10 @@\n return this->getValue();\n }\n \n- \/\/ One option...\n- template <class M0t>\n- explicit opt(const M0t &M0)\n+ template <class... Mods>\n+ explicit opt(const Mods &... Ms)\n : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- done();\n- }\n-\n- \/\/ Two options...\n- template <class M0t, class M1t>\n- opt(const M0t &M0, const M1t &M1)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- done();\n- }\n-\n- \/\/ Three options...\n- template <class M0t, class M1t, class M2t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- done();\n- }\n- \/\/ Four options...\n- template <class M0t, class M1t, class M2t, class M3t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- done();\n- }\n- \/\/ Five options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3, const M4t &M4)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- done();\n- }\n- \/\/ Six options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3, const M4t &M4,\n- const M5t &M5)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- done();\n- }\n- \/\/ Seven options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3, const M4t &M4,\n- const M5t &M5, const M6t &M6)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- done();\n- }\n- \/\/ Eight options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t, class M7t>\n- opt(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3, const M4t &M4,\n- const M5t &M5, const M6t &M6, const M7t &M7)\n- : Option(Optional, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- apply(M7, this);\n+ apply(this, Ms...);\n done();\n }\n };\n@@ -1407,94 +1328,10 @@\n \n void setNumAdditionalVals(unsigned n) { Option::setNumAdditionalVals(n); }\n \n- \/\/ One option...\n- template <class M0t>\n- explicit list(const M0t &M0)\n+ template <class... Mods>\n+ explicit list(const Mods &... Ms)\n : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- done();\n- }\n- \/\/ Two options...\n- template <class M0t, class M1t>\n- list(const M0t &M0, const M1t &M1)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- done();\n- }\n- \/\/ Three options...\n- template <class M0t, class M1t, class M2t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- done();\n- }\n- \/\/ Four options...\n- template <class M0t, class M1t, class M2t, class M3t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- done();\n- }\n- \/\/ Five options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- done();\n- }\n- \/\/ Six options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- done();\n- }\n- \/\/ Seven options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5, const M6t &M6)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- done();\n- }\n- \/\/ Eight options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t, class M7t>\n- list(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5, const M6t &M6, const M7t &M7)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- apply(M7, this);\n+ apply(this, Ms...);\n done();\n }\n };\n@@ -1629,94 +1466,10 @@\n return Positions[optnum];\n }\n \n- \/\/ One option...\n- template <class M0t>\n- explicit bits(const M0t &M0)\n+ template <class... Mods>\n+ explicit bits(const Mods &... Ms)\n : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- done();\n- }\n- \/\/ Two options...\n- template <class M0t, class M1t>\n- bits(const M0t &M0, const M1t &M1)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- done();\n- }\n- \/\/ Three options...\n- template <class M0t, class M1t, class M2t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- done();\n- }\n- \/\/ Four options...\n- template <class M0t, class M1t, class M2t, class M3t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- done();\n- }\n- \/\/ Five options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- done();\n- }\n- \/\/ Six options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- done();\n- }\n- \/\/ Seven options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5, const M6t &M6)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- done();\n- }\n- \/\/ Eight options...\n- template <class M0t, class M1t, class M2t, class M3t, class M4t, class M5t,\n- class M6t, class M7t>\n- bits(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3,\n- const M4t &M4, const M5t &M5, const M6t &M6, const M7t &M7)\n- : Option(ZeroOrMore, NotHidden), Parser(*this) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n- apply(M4, this);\n- apply(M5, this);\n- apply(M6, this);\n- apply(M7, this);\n+ apply(this, Ms...);\n done();\n }\n };\n@@ -1766,38 +1519,10 @@\n AliasFor = &O;\n }\n \n- \/\/ One option...\n- template <class M0t>\n- explicit alias(const M0t &M0)\n+ template <class... Mods>\n+ explicit alias(const Mods &... Ms)\n : Option(Optional, Hidden), AliasFor(nullptr) {\n- apply(M0, this);\n- done();\n- }\n- \/\/ Two options...\n- template <class M0t, class M1t>\n- alias(const M0t &M0, const M1t &M1)\n- : Option(Optional, Hidden), AliasFor(nullptr) {\n- apply(M0, this);\n- apply(M1, this);\n- done();\n- }\n- \/\/ Three options...\n- template <class M0t, class M1t, class M2t>\n- alias(const M0t &M0, const M1t &M1, const M2t &M2)\n- : Option(Optional, Hidden), AliasFor(nullptr) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- done();\n- }\n- \/\/ Four options...\n- template <class M0t, class M1t, class M2t, class M3t>\n- alias(const M0t &M0, const M1t &M1, const M2t &M2, const M3t &M3)\n- : Option(Optional, Hidden), AliasFor(nullptr) {\n- apply(M0, this);\n- apply(M1, this);\n- apply(M2, this);\n- apply(M3, this);\n+ apply(this, Ms...);\n done();\n }\n };\n"} {"commit":"aabca0dcc5dc20ac64f89fea5c99d60a47ac199b","subject":"Anonymous namespace for TrackerInstance to avoid symbol collisions.","message":"Anonymous namespace for TrackerInstance to avoid symbol collisions.\n","repos":"OSVR\/OSVR-Vuzix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- TrackerInstance.h\n+++ TrackerInstance.h\n@@ -35,6 +35,7 @@\n \/\/ Standard includes\n \/\/ - none\n \n+namespace {\n class TrackerInstance {\n public:\n TrackerInstance() { status = IWRLoadDll(); }\n@@ -49,5 +50,6 @@\n \n long status;\n };\n+} \/\/ namespace\n \n #endif \/\/ INCLUDED_TrackerInstance_h_GUID_9253C2FC_831E_4D97_45C7_A681F310C5D8\n"} {"commit":"e1e5fa0600bc1e38a04106127ccc6f501cdc3384","subject":"added more g_pollable_input_stream_is_readable checks","message":"added more g_pollable_input_stream_is_readable checks\n","repos":"endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/tests\/pollable.c\n+++ gio\/tests\/pollable.c\n@@ -38,10 +38,13 @@\n gssize nread;\n gboolean *success = user_data;\n \n+ g_assert_true (g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (in)));\n+\n nread = g_pollable_input_stream_read_nonblocking (in, buf, 2, NULL, &error);\n g_assert_no_error (error);\n g_assert_cmpint (nread, ==, 2);\n g_assert_cmpstr (buf, ==, \"x\");\n+ g_assert_false (g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (in)));\n \n *success = TRUE;\n return G_SOURCE_REMOVE;\n"} {"commit":"9998338cad330d2a5a6fc9f2725e419d96717b5d","subject":"More comments","message":"More comments\n","repos":"mehrdada\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,baylabs\/grpc,dklempner\/grpc,vjpai\/grpc,nicolasnoble\/grpc,grani\/grpc,chrisdunelm\/grpc,deepaklukose\/grpc,matt-kwong\/grpc,7anner\/grpc,apolcyn\/grpc,baylabs\/grpc,a11r\/grpc,stanley-cheung\/grpc,Crevil\/grpc,muxi\/grpc,wcevans\/grpc,grpc\/grpc,pszemus\/grpc,pszemus\/grpc,kskalski\/grpc,ipylypiv\/grpc,7anner\/grpc,vsco\/grpc,rjshade\/grpc,chrisdunelm\/grpc,ncteisen\/grpc,fuchsia-mirror\/third_party-grpc,murgatroid99\/grpc,quizlet\/grpc,ipylypiv\/grpc,ctiller\/grpc,baylabs\/grpc,zhimingxie\/grpc,simonkuang\/grpc,donnadionne\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,thinkerou\/grpc,Vizerai\/grpc,7anner\/grpc,yongni\/grpc,murgatroid99\/grpc,ipylypiv\/grpc,makdharma\/grpc,deepaklukose\/grpc,thinkerou\/grpc,ejona86\/grpc,ctiller\/grpc,jboeuf\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,quizlet\/grpc,jtattermusch\/grpc,thinkerou\/grpc,kpayson64\/grpc,fuchsia-mirror\/third_party-grpc,ipylypiv\/grpc,vjpai\/grpc,donnadionne\/grpc,jtattermusch\/grpc,Vizerai\/grpc,MakMukhi\/grpc,firebase\/grpc,kumaralokgithub\/grpc,sreecha\/grpc,ncteisen\/grpc,kumaralokgithub\/grpc,baylabs\/grpc,Vizerai\/grpc,pszemus\/grpc,hstefan\/grpc,quizlet\/grpc,msmania\/grpc,rjshade\/grpc,murgatroid99\/grpc,adelez\/grpc,carl-mastrangelo\/grpc,kpayson64\/grpc,wcevans\/grpc,pszemus\/grpc,simonkuang\/grpc,ncteisen\/grpc,mehrdada\/grpc,sreecha\/grpc,adelez\/grpc,dgquintas\/grpc,kriswuollett\/grpc,pszemus\/grpc,vsco\/grpc,dklempner\/grpc,grpc\/grpc,zhimingxie\/grpc,7anner\/grpc,msmania\/grpc,firebase\/grpc,7anner\/grpc,quizlet\/grpc,ipylypiv\/grpc,kriswuollett\/grpc,philcleveland\/grpc,daniel-j-born\/grpc,grpc\/grpc,a11r\/grpc,donnadionne\/grpc,pszemus\/grpc,mehrdada\/grpc,matt-kwong\/grpc,donnadionne\/grpc,kriswuollett\/grpc,chrisdunelm\/grpc,kumaralokgithub\/grpc,nicolasnoble\/grpc,chrisdunelm\/grpc,yongni\/grpc,MakMukhi\/grpc,jboeuf\/grpc,ncteisen\/grpc,MakMukhi\/grpc,dgquintas\/grpc,jtattermusch\/grpc,kskalski\/grpc,Crevil\/grpc,makdharma\/grpc,kumaralokgithub\/grpc,pszemus\/grpc,a11r\/grpc,ctiller\/grpc,matt-kwong\/grpc,royalharsh\/grpc,kskalski\/grpc,kpayson64\/grpc,Crevil\/grpc,ncteisen\/grpc,PeterFaiman\/ruby-grpc-minimal,simonkuang\/grpc,kriswuollett\/grpc,wcevans\/grpc,dgquintas\/grpc,chrisdunelm\/grpc,wcevans\/grpc,ejona86\/grpc,dklempner\/grpc,carl-mastrangelo\/grpc,yang-g\/grpc,adelez\/grpc,simonkuang\/grpc,PeterFaiman\/ruby-grpc-minimal,quizlet\/grpc,makdharma\/grpc,kpayson64\/grpc,MakMukhi\/grpc,Crevil\/grpc,baylabs\/grpc,fuchsia-mirror\/third_party-grpc,sreecha\/grpc,stanley-cheung\/grpc,jboeuf\/grpc,MakMukhi\/grpc,sreecha\/grpc,donnadionne\/grpc,a11r\/grpc,ncteisen\/grpc,jboeuf\/grpc,philcleveland\/grpc,daniel-j-born\/grpc,grani\/grpc,dgquintas\/grpc,geffzhang\/grpc,7anner\/grpc,baylabs\/grpc,fuchsia-mirror\/third_party-grpc,geffzhang\/grpc,rjshade\/grpc,vjpai\/grpc,matt-kwong\/grpc,daniel-j-born\/grpc,stanley-cheung\/grpc,hstefan\/grpc,carl-mastrangelo\/grpc,apolcyn\/grpc,fuchsia-mirror\/third_party-grpc,a11r\/grpc,msmania\/grpc,hstefan\/grpc,ejona86\/grpc,vjpai\/grpc,vjpai\/grpc,PeterFaiman\/ruby-grpc-minimal,sreecha\/grpc,philcleveland\/grpc,mehrdada\/grpc,zhimingxie\/grpc,nicolasnoble\/grpc,geffzhang\/grpc,yang-g\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,ipylypiv\/grpc,firebase\/grpc,dgquintas\/grpc,sreecha\/grpc,royalharsh\/grpc,yongni\/grpc,jboeuf\/grpc,yongni\/grpc,PeterFaiman\/ruby-grpc-minimal,sreecha\/grpc,dgquintas\/grpc,vsco\/grpc,jtattermusch\/grpc,yongni\/grpc,dklempner\/grpc,kriswuollett\/grpc,msmania\/grpc,ejona86\/grpc,matt-kwong\/grpc,daniel-j-born\/grpc,vsco\/grpc,grani\/grpc,muxi\/grpc,firebase\/grpc,kpayson64\/grpc,simonkuang\/grpc,grani\/grpc,nicolasnoble\/grpc,MakMukhi\/grpc,ejona86\/grpc,murgatroid99\/grpc,philcleveland\/grpc,mehrdada\/grpc,daniel-j-born\/grpc,thinkerou\/grpc,ejona86\/grpc,apolcyn\/grpc,muxi\/grpc,Vizerai\/grpc,vjpai\/grpc,ctiller\/grpc,Vizerai\/grpc,deepaklukose\/grpc,donnadionne\/grpc,MakMukhi\/grpc,firebase\/grpc,rjshade\/grpc,carl-mastrangelo\/grpc,7anner\/grpc,adelez\/grpc,baylabs\/grpc,PeterFaiman\/ruby-grpc-minimal,jtattermusch\/grpc,a11r\/grpc,grpc\/grpc,grani\/grpc,quizlet\/grpc,msmania\/grpc,yang-g\/grpc,matt-kwong\/grpc,stanley-cheung\/grpc,dklempner\/grpc,yongni\/grpc,firebase\/grpc,philcleveland\/grpc,daniel-j-born\/grpc,thinkerou\/grpc,grani\/grpc,geffzhang\/grpc,kpayson64\/grpc,makdharma\/grpc,vsco\/grpc,murgatroid99\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,thinkerou\/grpc,nicolasnoble\/grpc,7anner\/grpc,kpayson64\/grpc,kskalski\/grpc,rjshade\/grpc,royalharsh\/grpc,murgatroid99\/grpc,ipylypiv\/grpc,ctiller\/grpc,makdharma\/grpc,donnadionne\/grpc,firebase\/grpc,philcleveland\/grpc,sreecha\/grpc,Crevil\/grpc,apolcyn\/grpc,mehrdada\/grpc,ncteisen\/grpc,royalharsh\/grpc,ctiller\/grpc,wcevans\/grpc,matt-kwong\/grpc,philcleveland\/grpc,mehrdada\/grpc,PeterFaiman\/ruby-grpc-minimal,dklempner\/grpc,apolcyn\/grpc,mehrdada\/grpc,ejona86\/grpc,ctiller\/grpc,ctiller\/grpc,hstefan\/grpc,muxi\/grpc,kpayson64\/grpc,baylabs\/grpc,grpc\/grpc,ejona86\/grpc,deepaklukose\/grpc,MakMukhi\/grpc,hstefan\/grpc,pszemus\/grpc,kpayson64\/grpc,yang-g\/grpc,jboeuf\/grpc,Vizerai\/grpc,Vizerai\/grpc,yang-g\/grpc,jboeuf\/grpc,kpayson64\/grpc,jtattermusch\/grpc,ctiller\/grpc,grpc\/grpc,vjpai\/grpc,ncteisen\/grpc,a11r\/grpc,dgquintas\/grpc,adelez\/grpc,makdharma\/grpc,nicolasnoble\/grpc,stanley-cheung\/grpc,geffzhang\/grpc,kumaralokgithub\/grpc,sreecha\/grpc,mehrdada\/grpc,grpc\/grpc,grpc\/grpc,msmania\/grpc,kskalski\/grpc,chrisdunelm\/grpc,kskalski\/grpc,quizlet\/grpc,deepaklukose\/grpc,Vizerai\/grpc,chrisdunelm\/grpc,thinkerou\/grpc,zhimingxie\/grpc,vjpai\/grpc,royalharsh\/grpc,dklempner\/grpc,royalharsh\/grpc,muxi\/grpc,philcleveland\/grpc,mehrdada\/grpc,donnadionne\/grpc,grani\/grpc,jboeuf\/grpc,MakMukhi\/grpc,royalharsh\/grpc,mehrdada\/grpc,ejona86\/grpc,kskalski\/grpc,hstefan\/grpc,adelez\/grpc,rjshade\/grpc,stanley-cheung\/grpc,ipylypiv\/grpc,apolcyn\/grpc,nicolasnoble\/grpc,stanley-cheung\/grpc,sreecha\/grpc,apolcyn\/grpc,apolcyn\/grpc,makdharma\/grpc,grpc\/grpc,kriswuollett\/grpc,grpc\/grpc,quizlet\/grpc,msmania\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,matt-kwong\/grpc,quizlet\/grpc,zhimingxie\/grpc,makdharma\/grpc,jtattermusch\/grpc,yongni\/grpc,ctiller\/grpc,zhimingxie\/grpc,dklempner\/grpc,deepaklukose\/grpc,yongni\/grpc,Vizerai\/grpc,grpc\/grpc,pszemus\/grpc,ctiller\/grpc,firebase\/grpc,vsco\/grpc,Crevil\/grpc,firebase\/grpc,daniel-j-born\/grpc,simonkuang\/grpc,adelez\/grpc,thinkerou\/grpc,rjshade\/grpc,kumaralokgithub\/grpc,fuchsia-mirror\/third_party-grpc,ejona86\/grpc,fuchsia-mirror\/third_party-grpc,ncteisen\/grpc,nicolasnoble\/grpc,ncteisen\/grpc,kumaralokgithub\/grpc,donnadionne\/grpc,ejona86\/grpc,PeterFaiman\/ruby-grpc-minimal,stanley-cheung\/grpc,grpc\/grpc,muxi\/grpc,yang-g\/grpc,carl-mastrangelo\/grpc,jtattermusch\/grpc,geffzhang\/grpc,muxi\/grpc,nicolasnoble\/grpc,kskalski\/grpc,Crevil\/grpc,muxi\/grpc,stanley-cheung\/grpc,msmania\/grpc,ncteisen\/grpc,Crevil\/grpc,kriswuollett\/grpc,hstefan\/grpc,firebase\/grpc,7anner\/grpc,jtattermusch\/grpc,adelez\/grpc,muxi\/grpc,royalharsh\/grpc,jboeuf\/grpc,nicolasnoble\/grpc,kumaralokgithub\/grpc,msmania\/grpc,vsco\/grpc,yang-g\/grpc,daniel-j-born\/grpc,matt-kwong\/grpc,vjpai\/grpc,wcevans\/grpc,grani\/grpc,dgquintas\/grpc,dklempner\/grpc,murgatroid99\/grpc,jtattermusch\/grpc,fuchsia-mirror\/third_party-grpc,jboeuf\/grpc,geffzhang\/grpc,jboeuf\/grpc,zhimingxie\/grpc,deepaklukose\/grpc,muxi\/grpc,yang-g\/grpc,jtattermusch\/grpc,royalharsh\/grpc,kskalski\/grpc,thinkerou\/grpc,PeterFaiman\/ruby-grpc-minimal,carl-mastrangelo\/grpc,apolcyn\/grpc,jtattermusch\/grpc,wcevans\/grpc,a11r\/grpc,donnadionne\/grpc,muxi\/grpc,wcevans\/grpc,Vizerai\/grpc,carl-mastrangelo\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,Crevil\/grpc,kriswuollett\/grpc,simonkuang\/grpc,sreecha\/grpc,pszemus\/grpc,jboeuf\/grpc,simonkuang\/grpc,sreecha\/grpc,Vizerai\/grpc,kriswuollett\/grpc,wcevans\/grpc,yang-g\/grpc,thinkerou\/grpc,rjshade\/grpc,deepaklukose\/grpc,vsco\/grpc,adelez\/grpc,pszemus\/grpc,carl-mastrangelo\/grpc,grani\/grpc,muxi\/grpc,chrisdunelm\/grpc,nicolasnoble\/grpc,vsco\/grpc,simonkuang\/grpc,nicolasnoble\/grpc,murgatroid99\/grpc,donnadionne\/grpc,hstefan\/grpc,kumaralokgithub\/grpc,pszemus\/grpc,geffzhang\/grpc,PeterFaiman\/ruby-grpc-minimal,ejona86\/grpc,dgquintas\/grpc,daniel-j-born\/grpc,philcleveland\/grpc,carl-mastrangelo\/grpc,ctiller\/grpc,ipylypiv\/grpc,rjshade\/grpc,firebase\/grpc,zhimingxie\/grpc,murgatroid99\/grpc,chrisdunelm\/grpc,zhimingxie\/grpc,PeterFaiman\/ruby-grpc-minimal,firebase\/grpc,a11r\/grpc,kpayson64\/grpc,hstefan\/grpc,carl-mastrangelo\/grpc,deepaklukose\/grpc,yongni\/grpc,baylabs\/grpc,geffzhang\/grpc,chrisdunelm\/grpc,vjpai\/grpc,ncteisen\/grpc,mehrdada\/grpc,murgatroid99\/grpc,dgquintas\/grpc,makdharma\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/lib\/iomgr\/ev_epoll_linux.c\n+++ src\/core\/lib\/iomgr\/ev_epoll_linux.c\n@@ -144,14 +144,42 @@\n other than GRPC_ERROR_NONE, it indicates that the fd is shutdown and this\n contains the reason for shutdown. Once an fd is shutdown, any pending or\n future read\/write closures on the fd should fail *\/\n- gpr_atm shutdown_error1;\n-\n- \/* The fd is either closed or we relinquished control of it. In either cases,\n- this indicates that the 'fd' on this structure is no longer valid *\/\n+ gpr_atm shutdown_error;\n+\n+ \/* The fd is either closed or we relinquished control of it. In either\n+ cases, this indicates that the 'fd' on this structure is no longer\n+ valid *\/\n bool orphaned;\n \n- \/* Closures to call when the fd is readable or writable. The actual type\n- stored in these is (grpc_closure *) *\/\n+ \/* Closures to call when the fd is readable or writable respectively. These\n+ fields contain one of the following values:\n+ CLOSURE_READY : The fd has an I\/O event of interest but there is no\n+ closure yet to execute\n+\n+ CLOSURE_NOT_READY : The fd has no I\/O event of interest\n+\n+ closure ptr : The closure to be executed when the fd has an I\/O event\n+ of interest.\n+ shutdown_error |\n+ CLOSURE_SHUTDOWN : 'shutdown_error' field OR'ed with CLOSURE_SHUTDOWN.\n+ This indicates that the fd is shutdown. Since all\n+ memory allocations are word-aligned, the lower to\n+ bits of the shutdown_error pointer are always 0. So\n+ it is safe to OR these with CLOSURE_SHUTDOWN.\n+\n+ Valid state transitions:\n+\n+ <closure ptr> <-----3------ CLOSURE_NOT_READY ----1----> CLOSURE_READY\n+ | | ^ | ^ | |\n+ | | | | | | |\n+ | +--------------4----------+ 6 +---------2---------------+ |\n+ | | |\n+ | v |\n+ +-----5-------> [shutdown_error | CLOSURE_SHUTDOWN] <--------7----+\n+\n+ For 1, 4 : See set_ready() function\n+ For 2, 3 : See notify_on() function\n+ For 5,6,7: See set_shutdown() function *\/\n gpr_atm read_closure;\n gpr_atm write_closure;\n \n@@ -185,7 +213,6 @@\n \n #define CLOSURE_NOT_READY ((gpr_atm)0)\n #define CLOSURE_READY ((gpr_atm)1)\n-\n #define CLOSURE_SHUTDOWN ((gpr_atm)2)\n \n \/*******************************************************************************\n@@ -1212,7 +1239,7 @@\n }\n \n static bool fd_is_shutdown(grpc_fd *fd) {\n- grpc_error *err = (grpc_error *)gpr_atm_acq_load(&fd->shutdown_error1);\n+ grpc_error *err = (grpc_error *)gpr_atm_acq_load(&fd->shutdown_error);\n return (err != GRPC_ERROR_NONE);\n }\n \n@@ -1224,7 +1251,7 @@\n why = GRPC_ERROR_INTERNAL;\n }\n \n- if (gpr_atm_acq_cas(&fd->shutdown_error1, (gpr_atm)GRPC_ERROR_NONE,\n+ if (gpr_atm_acq_cas(&fd->shutdown_error, (gpr_atm)GRPC_ERROR_NONE,\n (gpr_atm)why)) {\n shutdown(fd->fd, SHUT_RDWR);\n \n@@ -1234,22 +1261,6 @@\n \/\/ Shutdown already called\n GRPC_ERROR_UNREF(why);\n }\n-\n- \/\/ gpr_mu_lock(&fd->po.mu);\n- \/* Do the actual shutdown only once *\/\n- \/\/ if (!fd->shutdown) {\n- \/\/ fd->shutdown = true;\n- \/\/ fd->shutdown_error = why;\n-\n- \/\/ shutdown(fd->fd, SHUT_RDWR);\n- \/* Flush any pending read and write closures. Since fd->shutdown is 'true'\n- at this point, the closures would be called with 'success = false' *\/\n- \/\/ set_ready(exec_ctx, fd, &fd->read_closure);\n- \/\/ set_ready(exec_ctx, fd, &fd->write_closure);\n- \/\/ } else {\n- \/\/ GRPC_ERROR_UNREF(why);\n- \/\/ }\n- \/\/ gpr_mu_unlock(&fd->po.mu);\n }\n \n static void fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd,\n"} {"commit":"499b94b7988eb75064d2d8727171e3e8a8414672","subject":"Replace pollset_add_fd with add_poll_obj","message":"Replace pollset_add_fd with add_poll_obj\n","repos":"carl-mastrangelo\/grpc,yugui\/grpc,ppietrasa\/grpc,dgquintas\/grpc,dklempner\/grpc,jtattermusch\/grpc,PeterFaiman\/ruby-grpc-minimal,dgquintas\/grpc,wcevans\/grpc,a11r\/grpc,mehrdada\/grpc,thunderboltsid\/grpc,ppietrasa\/grpc,ctiller\/grpc,PeterFaiman\/ruby-grpc-minimal,a11r\/grpc,yongni\/grpc,jtattermusch\/grpc,baylabs\/grpc,yang-g\/grpc,stanley-cheung\/grpc,daniel-j-born\/grpc,greasypizza\/grpc,ncteisen\/grpc,kpayson64\/grpc,infinit\/grpc,a11r\/grpc,matt-kwong\/grpc,grpc\/grpc,msmania\/grpc,greasypizza\/grpc,nicolasnoble\/grpc,firebase\/grpc,carl-mastrangelo\/grpc,mehrdada\/grpc,ipylypiv\/grpc,muxi\/grpc,deepaklukose\/grpc,LuminateWireless\/grpc,Vizerai\/grpc,sreecha\/grpc,ipylypiv\/grpc,Vizerai\/grpc,thinkerou\/grpc,grani\/grpc,LuminateWireless\/grpc,chrisdunelm\/grpc,firebase\/grpc,Vizerai\/grpc,murgatroid99\/grpc,Vizerai\/grpc,fuchsia-mirror\/third_party-grpc,pmarks-net\/grpc,kriswuollett\/grpc,kumaralokgithub\/grpc,makdharma\/grpc,7anner\/grpc,muxi\/grpc,thunderboltsid\/grpc,chrisdunelm\/grpc,PeterFaiman\/ruby-grpc-minimal,msmania\/grpc,muxi\/grpc,carl-mastrangelo\/grpc,carl-mastrangelo\/grpc,matt-kwong\/grpc,wcevans\/grpc,apolcyn\/grpc,royalharsh\/grpc,ipylypiv\/grpc,kpayson64\/grpc,sreecha\/grpc,dgquintas\/grpc,grpc\/grpc,vsco\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,vjpai\/grpc,soltanmm-google\/grpc,sreecha\/grpc,MakMukhi\/grpc,donnadionne\/grpc,matt-kwong\/grpc,MakMukhi\/grpc,a11r\/grpc,royalharsh\/grpc,thinkerou\/grpc,simonkuang\/grpc,muxi\/grpc,thinkerou\/grpc,vsco\/grpc,pszemus\/grpc,thinkerou\/grpc,kriswuollett\/grpc,thinkerou\/grpc,yongni\/grpc,pmarks-net\/grpc,deepaklukose\/grpc,Crevil\/grpc,LuminateWireless\/grpc,msmania\/grpc,vsco\/grpc,rjshade\/grpc,kumaralokgithub\/grpc,murgatroid99\/grpc,quizlet\/grpc,stanley-cheung\/grpc,ctiller\/grpc,simonkuang\/grpc,yugui\/grpc,nicolasnoble\/grpc,ejona86\/grpc,kumaralokgithub\/grpc,nicolasnoble\/grpc,vjpai\/grpc,greasypizza\/grpc,donnadionne\/grpc,pszemus\/grpc,makdharma\/grpc,murgatroid99\/grpc,jboeuf\/grpc,grpc\/grpc,hstefan\/grpc,Vizerai\/grpc,grpc\/grpc,donnadionne\/grpc,quizlet\/grpc,msmania\/grpc,baylabs\/grpc,hstefan\/grpc,geffzhang\/grpc,yugui\/grpc,adelez\/grpc,Crevil\/grpc,jtattermusch\/grpc,ncteisen\/grpc,jtattermusch\/grpc,rjshade\/grpc,Vizerai\/grpc,jboeuf\/grpc,geffzhang\/grpc,quizlet\/grpc,wcevans\/grpc,soltanmm-google\/grpc,kriswuollett\/grpc,hstefan\/grpc,pmarks-net\/grpc,yugui\/grpc,kpayson64\/grpc,baylabs\/grpc,vjpai\/grpc,mehrdada\/grpc,ppietrasa\/grpc,simonkuang\/grpc,donnadionne\/grpc,geffzhang\/grpc,ejona86\/grpc,apolcyn\/grpc,ejona86\/grpc,jboeuf\/grpc,royalharsh\/grpc,kskalski\/grpc,donnadionne\/grpc,thinkerou\/grpc,royalharsh\/grpc,quizlet\/grpc,grpc\/grpc,hstefan\/grpc,makdharma\/grpc,firebase\/grpc,grpc\/grpc,stanley-cheung\/grpc,philcleveland\/grpc,PeterFaiman\/ruby-grpc-minimal,makdharma\/grpc,nicolasnoble\/grpc,vsco\/grpc,jtattermusch\/grpc,nicolasnoble\/grpc,vjpai\/grpc,philcleveland\/grpc,kskalski\/grpc,yugui\/grpc,soltanmm-google\/grpc,jtattermusch\/grpc,philcleveland\/grpc,apolcyn\/grpc,ppietrasa\/grpc,MakMukhi\/grpc,matt-kwong\/grpc,ejona86\/grpc,rjshade\/grpc,sreecha\/grpc,fuchsia-mirror\/third_party-grpc,yang-g\/grpc,pmarks-net\/grpc,PeterFaiman\/ruby-grpc-minimal,thinkerou\/grpc,matt-kwong\/grpc,matt-kwong\/grpc,adelez\/grpc,7anner\/grpc,daniel-j-born\/grpc,hstefan\/grpc,ejona86\/grpc,grani\/grpc,yongni\/grpc,philcleveland\/grpc,ppietrasa\/grpc,ejona86\/grpc,muxi\/grpc,rjshade\/grpc,murgatroid99\/grpc,kriswuollett\/grpc,nicolasnoble\/grpc,sreecha\/grpc,dklempner\/grpc,dklempner\/grpc,stanley-cheung\/grpc,soltanmm-google\/grpc,MakMukhi\/grpc,carl-mastrangelo\/grpc,chrisdunelm\/grpc,vjpai\/grpc,Crevil\/grpc,firebase\/grpc,ctiller\/grpc,msmania\/grpc,donnadionne\/grpc,rjshade\/grpc,MakMukhi\/grpc,ppietrasa\/grpc,quizlet\/grpc,donnadionne\/grpc,pmarks-net\/grpc,grpc\/grpc,firebase\/grpc,thinkerou\/grpc,ejona86\/grpc,royalharsh\/grpc,baylabs\/grpc,yang-g\/grpc,makdharma\/grpc,kpayson64\/grpc,stanley-cheung\/grpc,pmarks-net\/grpc,deepaklukose\/grpc,simonkuang\/grpc,fuchsia-mirror\/third_party-grpc,mehrdada\/grpc,apolcyn\/grpc,carl-mastrangelo\/grpc,firebase\/grpc,ipylypiv\/grpc,kumaralokgithub\/grpc,yang-g\/grpc,greasypizza\/grpc,zhimingxie\/grpc,pszemus\/grpc,dgquintas\/grpc,infinit\/grpc,stanley-cheung\/grpc,grani\/grpc,ctiller\/grpc,kpayson64\/grpc,deepaklukose\/grpc,a11r\/grpc,dklempner\/grpc,vjpai\/grpc,Vizerai\/grpc,dgquintas\/grpc,ctiller\/grpc,kpayson64\/grpc,LuminateWireless\/grpc,wcevans\/grpc,grpc\/grpc,donnadionne\/grpc,dgquintas\/grpc,msmania\/grpc,PeterFaiman\/ruby-grpc-minimal,mehrdada\/grpc,dgquintas\/grpc,pszemus\/grpc,philcleveland\/grpc,LuminateWireless\/grpc,adelez\/grpc,royalharsh\/grpc,soltanmm-google\/grpc,grpc\/grpc,vsco\/grpc,vsco\/grpc,chrisdunelm\/grpc,greasypizza\/grpc,soltanmm-google\/grpc,jtattermusch\/grpc,philcleveland\/grpc,yongni\/grpc,nicolasnoble\/grpc,ncteisen\/grpc,chrisdunelm\/grpc,adelez\/grpc,geffzhang\/grpc,jboeuf\/grpc,quizlet\/grpc,geffzhang\/grpc,geffzhang\/grpc,daniel-j-born\/grpc,pmarks-net\/grpc,sreecha\/grpc,jboeuf\/grpc,nicolasnoble\/grpc,mehrdada\/grpc,infinit\/grpc,grani\/grpc,ejona86\/grpc,thunderboltsid\/grpc,jboeuf\/grpc,baylabs\/grpc,grani\/grpc,kskalski\/grpc,mehrdada\/grpc,kskalski\/grpc,chrisdunelm\/grpc,ncteisen\/grpc,ncteisen\/grpc,vjpai\/grpc,royalharsh\/grpc,fuchsia-mirror\/third_party-grpc,7anner\/grpc,murgatroid99\/grpc,fuchsia-mirror\/third_party-grpc,ppietrasa\/grpc,adelez\/grpc,makdharma\/grpc,msmania\/grpc,zhimingxie\/grpc,vsco\/grpc,Crevil\/grpc,quizlet\/grpc,pszemus\/grpc,wcevans\/grpc,kpayson64\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,daniel-j-born\/grpc,pszemus\/grpc,dklempner\/grpc,kskalski\/grpc,kriswuollett\/grpc,greasypizza\/grpc,mehrdada\/grpc,zhimingxie\/grpc,thunderboltsid\/grpc,matt-kwong\/grpc,yang-g\/grpc,thunderboltsid\/grpc,apolcyn\/grpc,adelez\/grpc,kumaralokgithub\/grpc,apolcyn\/grpc,pszemus\/grpc,MakMukhi\/grpc,matt-kwong\/grpc,infinit\/grpc,ejona86\/grpc,carl-mastrangelo\/grpc,yongni\/grpc,mehrdada\/grpc,deepaklukose\/grpc,murgatroid99\/grpc,ctiller\/grpc,yongni\/grpc,PeterFaiman\/ruby-grpc-minimal,deepaklukose\/grpc,stanley-cheung\/grpc,donnadionne\/grpc,thunderboltsid\/grpc,pszemus\/grpc,baylabs\/grpc,kriswuollett\/grpc,pszemus\/grpc,yugui\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,adelez\/grpc,murgatroid99\/grpc,deepaklukose\/grpc,thinkerou\/grpc,infinit\/grpc,infinit\/grpc,kskalski\/grpc,LuminateWireless\/grpc,LuminateWireless\/grpc,muxi\/grpc,kumaralokgithub\/grpc,7anner\/grpc,rjshade\/grpc,simonkuang\/grpc,wcevans\/grpc,yugui\/grpc,sreecha\/grpc,vsco\/grpc,kumaralokgithub\/grpc,yang-g\/grpc,vsco\/grpc,vjpai\/grpc,a11r\/grpc,kumaralokgithub\/grpc,makdharma\/grpc,kpayson64\/grpc,dgquintas\/grpc,chrisdunelm\/grpc,Vizerai\/grpc,philcleveland\/grpc,ctiller\/grpc,ipylypiv\/grpc,adelez\/grpc,matt-kwong\/grpc,zhimingxie\/grpc,PeterFaiman\/ruby-grpc-minimal,Vizerai\/grpc,jtattermusch\/grpc,Vizerai\/grpc,baylabs\/grpc,stanley-cheung\/grpc,sreecha\/grpc,ncteisen\/grpc,ncteisen\/grpc,baylabs\/grpc,wcevans\/grpc,7anner\/grpc,7anner\/grpc,fuchsia-mirror\/third_party-grpc,firebase\/grpc,pszemus\/grpc,Crevil\/grpc,dklempner\/grpc,adelez\/grpc,yang-g\/grpc,royalharsh\/grpc,muxi\/grpc,dgquintas\/grpc,thinkerou\/grpc,zhimingxie\/grpc,sreecha\/grpc,zhimingxie\/grpc,grpc\/grpc,apolcyn\/grpc,wcevans\/grpc,carl-mastrangelo\/grpc,quizlet\/grpc,rjshade\/grpc,chrisdunelm\/grpc,fuchsia-mirror\/third_party-grpc,muxi\/grpc,zhimingxie\/grpc,LuminateWireless\/grpc,ctiller\/grpc,fuchsia-mirror\/third_party-grpc,grpc\/grpc,ncteisen\/grpc,ejona86\/grpc,muxi\/grpc,thunderboltsid\/grpc,firebase\/grpc,infinit\/grpc,simonkuang\/grpc,kpayson64\/grpc,vjpai\/grpc,muxi\/grpc,yugui\/grpc,pmarks-net\/grpc,donnadionne\/grpc,ncteisen\/grpc,grpc\/grpc,murgatroid99\/grpc,fuchsia-mirror\/third_party-grpc,kskalski\/grpc,kpayson64\/grpc,donnadionne\/grpc,jboeuf\/grpc,MakMukhi\/grpc,murgatroid99\/grpc,deepaklukose\/grpc,7anner\/grpc,muxi\/grpc,yongni\/grpc,carl-mastrangelo\/grpc,muxi\/grpc,philcleveland\/grpc,chrisdunelm\/grpc,thinkerou\/grpc,kriswuollett\/grpc,kskalski\/grpc,nicolasnoble\/grpc,7anner\/grpc,jtattermusch\/grpc,infinit\/grpc,a11r\/grpc,zhimingxie\/grpc,murgatroid99\/grpc,firebase\/grpc,daniel-j-born\/grpc,thinkerou\/grpc,ipylypiv\/grpc,PeterFaiman\/ruby-grpc-minimal,ejona86\/grpc,mehrdada\/grpc,greasypizza\/grpc,jboeuf\/grpc,daniel-j-born\/grpc,soltanmm-google\/grpc,grani\/grpc,stanley-cheung\/grpc,jboeuf\/grpc,apolcyn\/grpc,soltanmm-google\/grpc,soltanmm-google\/grpc,PeterFaiman\/ruby-grpc-minimal,daniel-j-born\/grpc,pszemus\/grpc,Crevil\/grpc,MakMukhi\/grpc,hstefan\/grpc,Vizerai\/grpc,sreecha\/grpc,simonkuang\/grpc,carl-mastrangelo\/grpc,yang-g\/grpc,jboeuf\/grpc,geffzhang\/grpc,hstefan\/grpc,ctiller\/grpc,kriswuollett\/grpc,msmania\/grpc,kumaralokgithub\/grpc,dgquintas\/grpc,jtattermusch\/grpc,ncteisen\/grpc,stanley-cheung\/grpc,ppietrasa\/grpc,ctiller\/grpc,yongni\/grpc,a11r\/grpc,infinit\/grpc,royalharsh\/grpc,kskalski\/grpc,mehrdada\/grpc,grani\/grpc,mehrdada\/grpc,ncteisen\/grpc,jtattermusch\/grpc,quizlet\/grpc,hstefan\/grpc,baylabs\/grpc,jboeuf\/grpc,jboeuf\/grpc,firebase\/grpc,chrisdunelm\/grpc,yongni\/grpc,nicolasnoble\/grpc,sreecha\/grpc,ipylypiv\/grpc,dklempner\/grpc,wcevans\/grpc,ejona86\/grpc,ncteisen\/grpc,dgquintas\/grpc,thunderboltsid\/grpc,Crevil\/grpc,kriswuollett\/grpc,MakMukhi\/grpc,ipylypiv\/grpc,daniel-j-born\/grpc,ctiller\/grpc,geffzhang\/grpc,yugui\/grpc,kpayson64\/grpc,vjpai\/grpc,jtattermusch\/grpc,grani\/grpc,Crevil\/grpc,geffzhang\/grpc,msmania\/grpc,dklempner\/grpc,rjshade\/grpc,nicolasnoble\/grpc,Crevil\/grpc,ctiller\/grpc,7anner\/grpc,makdharma\/grpc,philcleveland\/grpc,carl-mastrangelo\/grpc,yang-g\/grpc,donnadionne\/grpc,grani\/grpc,hstefan\/grpc,makdharma\/grpc,ppietrasa\/grpc,chrisdunelm\/grpc,vjpai\/grpc,apolcyn\/grpc,deepaklukose\/grpc,firebase\/grpc,daniel-j-born\/grpc,firebase\/grpc,pszemus\/grpc,a11r\/grpc,LuminateWireless\/grpc,simonkuang\/grpc,greasypizza\/grpc,greasypizza\/grpc,simonkuang\/grpc,dklempner\/grpc,sreecha\/grpc,zhimingxie\/grpc,rjshade\/grpc,thunderboltsid\/grpc,pmarks-net\/grpc,carl-mastrangelo\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/lib\/iomgr\/ev_epoll_linux.c\n+++ src\/core\/lib\/iomgr\/ev_epoll_linux.c\n@@ -1158,8 +1158,8 @@\n \n static grpc_workqueue *fd_get_workqueue(grpc_fd *fd) {\n gpr_mu_lock(&fd->po.mu);\n- grpc_workqueue *workqueue = GRPC_WORKQUEUE_REF(\n- (grpc_workqueue *)fd->po.pi, \"fd_get_workqueue\");\n+ grpc_workqueue *workqueue =\n+ GRPC_WORKQUEUE_REF((grpc_workqueue *)fd->po.pi, \"fd_get_workqueue\");\n gpr_mu_unlock(&fd->po.mu);\n return workqueue;\n }\n@@ -1677,7 +1677,6 @@\n return error;\n }\n \n-#if 0\n static void add_poll_object(grpc_exec_ctx *exec_ctx, poll_obj *bag,\n poll_obj *item, poll_obj_type bag_type,\n poll_obj_type item_type) {\n@@ -1732,8 +1731,13 @@\n getting to this branch: if they've changed, we need to throw away our\n work and figure things out again. *\/\n if (item->pi != NULL) {\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_object: Raced creating new polling island. pi_new: %p \"\n+ \"(fd: %d, %s: %p)\",\n+ (void *)pi_new, FD_FROM_PO(item)->fd, poll_obj_string(bag_type),\n+ (void *)bag);\n \/* No need to lock 'pi_new' here since this is a new polling island\n- * and no one has a reference to it yet *\/\n+ * and no one has a reference to it yet *\/\n polling_island_remove_all_fds_locked(pi_new, true, &error);\n \n \/* Ref and unref so that the polling island gets deleted during unref\n@@ -1745,6 +1749,17 @@\n } else {\n pi_new = polling_island_create(exec_ctx, NULL, &error);\n }\n+\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_object: Created new polling island. pi_new: %p (%s: %p, \"\n+ \"%s: %p)\",\n+ (void *)pi_new, poll_obj_string(item_type), (void *)item,\n+ poll_obj_string(bag_type), (void *)bag);\n+ } else {\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_object: Same polling island. pi: %p (%s, %s)\",\n+ (void *)pi_new, poll_obj_string(item_type),\n+ poll_obj_string(bag_type));\n }\n } else if (item->pi == NULL) {\n \/* GPR_ASSERT(bag->pi != NULL) *\/\n@@ -1757,14 +1772,28 @@\n }\n \n gpr_mu_unlock(&pi_new->mu);\n-\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_obj: item->pi was NULL. pi_new: %p (item(%s): %p, \"\n+ \"bag(%s): %p)\",\n+ (void *)pi_new, poll_obj_string(item_type), (void *)item,\n+ poll_obj_string(bag_type), (void *)bag);\n } else if (bag->pi == NULL) {\n \/* GPR_ASSERT(item->pi != NULL) *\/\n \/* Make pi_new to point to latest pi *\/\n pi_new = polling_island_lock(item->pi);\n gpr_mu_unlock(&pi_new->mu);\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_obj: bag->pi was NULL. pi_new: %p (item(%s): %p, \"\n+ \"bag(%s): %p)\",\n+ (void *)pi_new, poll_obj_string(item_type), (void *)item,\n+ poll_obj_string(bag_type), (void *)bag);\n } else {\n pi_new = polling_island_merge(item->pi, bag->pi, &error);\n+ GRPC_POLLING_TRACE(\n+ \"add_poll_obj: polling islands merged. pi_new: %p (item(%s): %p, \"\n+ \"bag(%s): %p)\",\n+ (void *)pi_new, poll_obj_string(item_type), (void *)item,\n+ poll_obj_string(bag_type), (void *)bag);\n }\n \n \/* At this point, pi_new is the polling island that both item->pi and bag->pi\n@@ -1792,8 +1821,14 @@\n GRPC_LOG_IF_ERROR(\"add_poll_object\", error);\n GPR_TIMER_END(\"add_poll_object\", 0);\n }\n-#endif\n-\n+\n+static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,\n+ grpc_fd *fd) {\n+ add_poll_object(exec_ctx, &pollset->po, &fd->po, POLL_OBJ_POLLSET,\n+ POLL_OBJ_FD);\n+}\n+\n+#if 0\n static void pollset_add_fd(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,\n grpc_fd *fd) {\n GPR_TIMER_BEGIN(\"pollset_add_fd\", 0);\n@@ -1914,9 +1949,8 @@\n gpr_mu_unlock(&pollset->po.mu);\n \n GRPC_LOG_IF_ERROR(\"pollset_add_fd\", error);\n-\n- GPR_TIMER_END(\"pollset_add_fd\", 0);\n-}\n+}\n+#endif\n \n \/*******************************************************************************\n * Pollset-set Definitions\n"} {"commit":"e7fe38e3c4e27a5944b149c4f33422f4919e23f6","subject":"Clean up the GLFW triangle sample a bit","message":"Clean up the GLFW triangle sample a bit\n","repos":"floooh\/sokol-samples,floooh\/sokol-samples,floooh\/sokol-samples,floooh\/sokol-samples,floooh\/sokol-samples","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- glfw\/triangle-glfw.c\n+++ glfw\/triangle-glfw.c\n@@ -11,80 +11,78 @@\n \n int main() {\n \n- const int WIDTH = 640;\n- const int HEIGHT = 480;\n-\n \/* create window and GL context via GLFW *\/\n glfwInit();\n glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);\n glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);\n glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);\n glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);\n- GLFWwindow* w = glfwCreateWindow(WIDTH, HEIGHT, \"Sokol Triangle GLFW\", 0, 0);\n+ GLFWwindow* w = glfwCreateWindow(640, 480, \"Sokol Triangle GLFW\", 0, 0);\n glfwMakeContextCurrent(w);\n glfwSwapInterval(1);\n flextInit(w);\n \n \/* setup sokol_gfx *\/\n- sg_desc desc = {0}; \n- sg_setup(&desc);\n- assert(sg_isvalid());\n+ sg_setup(&(sg_desc){0});\n \n- \/* default pass action (clears to grey) *\/\n- sg_pass_action pass_action = {0};\n-\n- \/* vertex data for the triangle *\/\n+ \/* a vertex buffer *\/\n const float vertices[] = {\n \/\/ positions \/\/ colors\n 0.0f, 0.5f, 0.5f, 1.0f, 0.0f, 0.0f, 1.0f,\n 0.5f, -0.5f, 0.5f, 0.0f, 1.0f, 0.0f, 1.0f,\n -0.5f, -0.5f, 0.5f, 0.0f, 0.0f, 1.0f, 1.0f \n };\n+ sg_buffer vbuf = sg_make_buffer(&(sg_buffer_desc){\n+ .size = sizeof(vertices),\n+ .content = vertices, \n+ });\n \n- \/*\n- Ok, this is maybe a bit ridiculous.\n+ \/* a shader *\/\n+ sg_shader shd = sg_make_shader(&(sg_shader_desc){\n+ .vs.source = \n+ \"#version 330\\n\"\n+ \"in vec4 position;\\n\"\n+ \"in vec4 color0;\\n\"\n+ \"out vec4 color;\\n\"\n+ \"void main() {\\n\"\n+ \" gl_Position = position;\\n\"\n+ \" color = color0;\\n\"\n+ \"}\\n\",\n+ .fs.source =\n+ \"#version 330\\n\"\n+ \"in vec4 color;\\n\"\n+ \"out vec4 frag_color;\\n\"\n+ \"void main() {\\n\"\n+ \" frag_color = color;\\n\"\n+ \"}\\n\"\n+ });\n \n- The following initializes a sg_draw_state struct containing\n- a pipeline and buffer resource, and creates these resources\n- 'in-place'.\n- *\/\n+ \/* a pipeline state object *\/\n+ sg_pipeline pip = sg_make_pipeline(&(sg_pipeline_desc){\n+ .shader = shd,\n+ .vertex_layouts[0] = {\n+ .stride = 28,\n+ .attrs = {\n+ [0] = { .name=\"position\", .offset=0, .format=SG_VERTEXFORMAT_FLOAT3 },\n+ [1] = { .name=\"color0\", .offset=12, .format=SG_VERTEXFORMAT_FLOAT4 }\n+ }\n+ }\n+ });\n+\n+ \/* a draw state with all the resource binding *\/\n sg_draw_state draw_state = {\n- .pipeline = sg_make_pipeline(&(sg_pipeline_desc){\n- .vertex_layouts[0] = {\n- .stride = 28,\n- .attrs = {\n- [0] = { .name=\"position\", .offset=0, .format=SG_VERTEXFORMAT_FLOAT3 },\n- [1] = { .name=\"color0\", .offset=12, .format=SG_VERTEXFORMAT_FLOAT4 }\n- }\n- },\n- .shader = sg_make_shader(&(sg_shader_desc){\n- .vs.source = \n- \"#version 330\\n\"\n- \"in vec4 position;\\n\"\n- \"in vec4 color0;\\n\"\n- \"out vec4 color;\\n\"\n- \"void main() {\\n\"\n- \" gl_Position = position;\\n\"\n- \" color = color0;\\n\"\n- \"}\\n\",\n- .fs.source =\n- \"#version 330\\n\"\n- \"in vec4 color;\\n\"\n- \"out vec4 frag_color;\\n\"\n- \"void main() {\\n\"\n- \" frag_color = color;\\n\"\n- \"}\\n\"\n- })\n- }),\n- .vertex_buffers[0] = sg_make_buffer(&(sg_buffer_desc){\n- .size = sizeof(vertices),\n- .content = vertices, \n- })\n+ .pipeline = pip,\n+ .vertex_buffers[0] = vbuf\n };\n+\n+ \/* default pass action (clear to grey) *\/\n+ sg_pass_action pass_action = {0};\n \n \/* draw loop *\/\n while (!glfwWindowShouldClose(w)) {\n- sg_begin_default_pass(&pass_action, WIDTH, HEIGHT);\n+ int cur_width, cur_height;\n+ glfwGetWindowSize(w, &cur_width, &cur_height);\n+ sg_begin_default_pass(&pass_action, cur_width, cur_height);\n sg_apply_draw_state(&draw_state);\n sg_draw(0, 3, 1);\n sg_end_pass();\n"} {"commit":"1985411a36de8b77471cef2ad8bdbc176aafbd5e","subject":"Remove debug code. Sorry!","message":"Remove debug code. Sorry!\n\n","repos":"benolee\/ruby-gnome2,benolee\/ruby-gnome2,benolee\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib\/src\/rbgobject.c\n+++ glib\/src\/rbgobject.c\n@@ -4,7 +4,7 @@\n rbgobject.c -\n \n $Author: mutoh $\n- $Date: 2003\/05\/20 17:12:02 $\n+ $Date: 2003\/05\/20 17:14:10 $\n \n Copyright (C) 2002,2003 Masahiro Sakai\n \n@@ -106,7 +106,6 @@\n rbgobj_mark(holder)\n gobj_holder* holder;\n {\n- printf(\"rbgobj_mark: holder %s\\n\", g_type_name(G_TYPE_FROM_INSTANCE(holder->gobj)));\n if (holder->gobj && !holder->destroyed\n && holder->cinfo && holder->cinfo->mark)\n holder->cinfo->mark(holder->gobj);\n"} {"commit":"f4eed7cd0ef9649b1b78928206da9afb058c5a7b","subject":"Doxument and cleanup (D&C) a bit of the clienthandler","message":"Doxument and cleanup (D&C) a bit of the clienthandler\n\nSigned-off-by: Olivier Mehani <9858fe98d2c7f5f35e0d2a08f134cfc58afd42d3@nicta.com.au>\n","repos":"lees0414\/EUproject,alco90\/soml,lees0414\/EUproject,mytestbed\/oml,alco90\/soml,alco90\/soml,mytestbed\/oml,mytestbed\/oml,lees0414\/EUproject,mytestbed\/oml,mytestbed\/oml,alco90\/soml,alco90\/soml,lees0414\/EUproject,lees0414\/EUproject","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- server\/client_handler.c\n+++ server\/client_handler.c\n@@ -141,11 +141,17 @@\n return 0;\n }\n \n-\/*\n- * (Re)allocate the values vector for the table with the given index,\n- * so that it is expanded or contracted to have nvalues elements.\n- *\/\n- int\n+\/** (Re)allocate the values vector for the table with the given index,\n+ * so that it is expanded (never reduced) to hold nvalues elements.\n+ *\n+ * \\param self ClientHandler holding the vectors\n+ * \\param idx index of the vector to reallocate\n+ * \\param nvalues number of values to allow in that vector\n+ * \\return 0 on success, -1 otherwise\n+ *\n+ * \\see client_realloc_tables\n+ *\/\n+int\n client_realloc_values (ClientHandler *self, int idx, int nvalues)\n {\n int curnvalues;\n@@ -156,15 +162,18 @@\n curnvalues = self->values_vector_counts[idx];\n \n if (nvalues > curnvalues) {\n- OmlValue *new_values = xrealloc (self->values_vectors[idx], nvalues * sizeof (OmlValue));\n- if (!new_values)\n+ OmlValue *new_values = xrealloc (self->values_vectors[idx],\n+ nvalues * sizeof (OmlValue));\n+ if (!new_values) {\n+ logwarn(\"%s: Could not reallocate memory for values for table %d\\n\",\n+ self->name, idx);\n return -1;\n+ }\n \n oml_value_array_init(&new_values[curnvalues], nvalues - curnvalues);\n \n self->values_vectors[idx] = new_values;\n self->values_vector_counts[idx] = nvalues;\n-\n }\n \n return 0;\n"} {"commit":"20da870b470b752559df75143144517658d8df8f","subject":"conditions for Lab colorspace added","message":"conditions for Lab colorspace added\n","repos":"cogsys-tuebingen\/csapex_core_plugins,cogsys-tuebingen\/csapex_core_plugins,cogsys-tuebingen\/csapex_core_plugins","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- csapex_vision\/include\/csapex_vision\/encoding.h\n+++ csapex_vision\/include\/csapex_vision\/encoding.h\n@@ -126,6 +126,9 @@\n \n static const Channel depth(\"d\", 0.0f, 255.0f, g_channels);\n static const Channel unknown(\"?\",0,1, g_channels);\n+\n+static const Channel a(\"a\",0,255, g_channels);\n+static const Channel b(\"b\",0,255, g_channels);\n }\n \n static const Encoding mono = { channel::gray };\n@@ -136,6 +139,7 @@\n static const Encoding hsl = { channel::hue, channel::saturation, channel::l };\n static const Encoding yuv = { channel::y, channel::u, channel::v };\n static const Encoding depth = { channel::depth };\n+static const Encoding lab = {channel::l, channel::a, channel::b };\n }\n \n }\n"} {"commit":"37f5c785584dbc2d16ce579a7876fce86fb98547","subject":"Removed templates from RK variable step size interface functions","message":"Removed templates from RK variable step size interface functions\n\n","repos":"Tudat\/tudat,Tudat\/tudat,Tudat\/tudat,Tudat\/tudat","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/tudat\/math\/integrators\/createNumericalIntegrator.h\n+++ include\/tudat\/math\/integrators\/createNumericalIntegrator.h\n@@ -574,22 +574,22 @@\n rungeKutta4, initialTime, initialTimeStep, saveFrequency, assessTerminationOnMinorSteps );\n }\n \n-template< typename IndependentVariableType = double >\n-std::shared_ptr< IntegratorSettings< IndependentVariableType > > rungeKuttaVariableStepSettings(\n- const IndependentVariableType initialTime,\n- const IndependentVariableType initialTimeStep,\n+\/\/template< typename IndependentVariableType = double >\n+std::shared_ptr< IntegratorSettings< double > > rungeKuttaVariableStepSettings(\n+ const double initialTime,\n+ const double initialTimeStep,\n const numerical_integrators::RungeKuttaCoefficients::CoefficientSets coefficientSet,\n- const IndependentVariableType minimumStepSize, const IndependentVariableType maximumStepSize,\n- const IndependentVariableType& relativeErrorTolerance,\n- const IndependentVariableType& absoluteErrorTolerance,\n+ const double minimumStepSize, const double maximumStepSize,\n+ const double& relativeErrorTolerance,\n+ const double& absoluteErrorTolerance,\n const int saveFrequency = 1,\n const bool assessTerminationOnMinorSteps = false,\n- const IndependentVariableType safetyFactorForNextStepSize = 0.8,\n- const IndependentVariableType maximumFactorIncreaseForNextStepSize = 4.0,\n- const IndependentVariableType minimumFactorDecreaseForNextStepSize = 0.1 )\n+ const double safetyFactorForNextStepSize = 0.8,\n+ const double maximumFactorIncreaseForNextStepSize = 4.0,\n+ const double minimumFactorDecreaseForNextStepSize = 0.1 )\n {\n return std::make_shared< RungeKuttaVariableStepSizeSettingsScalarTolerances<\n- IndependentVariableType > >(\n+ double > >(\n initialTime, initialTimeStep,\n coefficientSet, minimumStepSize, maximumStepSize,\n relativeErrorTolerance, absoluteErrorTolerance,\n@@ -597,22 +597,22 @@\n maximumFactorIncreaseForNextStepSize, minimumFactorDecreaseForNextStepSize );\n }\n \n-template< typename IndependentVariableType = double, typename DependentVariableType = Eigen::VectorXd >\n-std::shared_ptr< IntegratorSettings< IndependentVariableType > > rungeKuttaVariableStepSettings(\n- const IndependentVariableType initialTime,\n- const IndependentVariableType initialTimeStep,\n+\/\/template< typename IndependentVariableType = double, typename DependentVariableType = Eigen::VectorXd >\n+std::shared_ptr< IntegratorSettings< double > > rungeKuttaVariableStepSettings(\n+ const double initialTime,\n+ const double initialTimeStep,\n const numerical_integrators::RungeKuttaCoefficients::CoefficientSets coefficientSet,\n- const IndependentVariableType minimumStepSize, const IndependentVariableType maximumStepSize,\n- const DependentVariableType& relativeErrorTolerance,\n- const DependentVariableType& absoluteErrorTolerance,\n+ const double minimumStepSize, const double maximumStepSize,\n+ const Eigen::VectorXd& relativeErrorTolerance,\n+ const Eigen::VectorXd& absoluteErrorTolerance,\n const int saveFrequency = 1,\n const bool assessTerminationOnMinorSteps = false,\n- const IndependentVariableType safetyFactorForNextStepSize = 0.8,\n- const IndependentVariableType maximumFactorIncreaseForNextStepSize = 4.0,\n- const IndependentVariableType minimumFactorDecreaseForNextStepSize = 0.1 )\n+ const double safetyFactorForNextStepSize = 0.8,\n+ const double maximumFactorIncreaseForNextStepSize = 4.0,\n+ const double minimumFactorDecreaseForNextStepSize = 0.1 )\n {\n return std::make_shared< RungeKuttaVariableStepSizeSettingsVectorTolerances<\n- IndependentVariableType, DependentVariableType > >(\n+ double, Eigen::VectorXd > >(\n initialTime, initialTimeStep,\n coefficientSet, minimumStepSize, maximumStepSize,\n relativeErrorTolerance, absoluteErrorTolerance,\n"} {"commit":"bb3df3780c07fc2f10718c7433b55b259f9df95f","subject":"added alias (mlk::fs::dir_handle\/mlk::fs::file_handle)","message":"added alias (mlk::fs::dir_handle\/mlk::fs::file_handle)\n","repos":"Malekblubb\/mlk,Malekblubb\/mlk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/mlk\/filesystem\/fs_handle.h\n+++ include\/mlk\/filesystem\/fs_handle.h\n@@ -230,6 +230,9 @@\n \t\t\t\t}\n \t\t\t}\n \t\t};\n+\n+\t\tusing dir_handle = fs_handle<fs_type::dir>;\n+\t\tusing file_handle = fs_handle<fs_type::file>;\n \t}\n }\n \n"} {"commit":"1c9f5adf3e2c15c8d17ab665938ed23bb805114b","subject":"aio: Move aio restore related code from __export_restore_task to separate function","message":"aio: Move aio restore related code from __export_restore_task to separate function\n\nSigned-off-by: Kirill Tkhai <e5b39230c99b4d3ebd6aa54f6d823f95134bc39d@virtuozzo.com>\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@virtuozzo.com>\n","repos":"KKoukiou\/criu-remote,eabatalov\/criu,efiop\/criu,efiop\/criu,eabatalov\/criu,KKoukiou\/criu-remote,AuthenticEshkinKot\/criu,AuthenticEshkinKot\/criu,eabatalov\/criu,AuthenticEshkinKot\/criu,KKoukiou\/criu-remote,eabatalov\/criu,AuthenticEshkinKot\/criu,efiop\/criu,efiop\/criu,KKoukiou\/criu-remote,AuthenticEshkinKot\/criu,AuthenticEshkinKot\/criu,KKoukiou\/criu-remote,efiop\/criu,KKoukiou\/criu-remote,eabatalov\/criu,efiop\/criu,eabatalov\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- criu\/pie\/restorer.c\n+++ criu\/pie\/restorer.c\n@@ -543,6 +543,57 @@\n \t\tsys_close(vma_entry->fd);\n \n \treturn addr;\n+}\n+\n+static int restore_aio_ring(struct rst_aio_ring *raio)\n+{\n+\tunsigned long ctx = 0;\n+\tint ret;\n+\n+\tret = sys_io_setup(raio->nr_req, &ctx);\n+\tif (ret < 0) {\n+\t\tpr_err(\"Ring setup failed with %d\\n\", ret);\n+\t\treturn -1;\n+\t}\n+\n+\tif (ctx == raio->addr) \/* Lucky bastards we are! *\/\n+\t\treturn 0;\n+\n+\t\/*\n+\t * If we failed to get the proper nr_req right and\n+\t * created smaller or larger ring, then this remap\n+\t * will (should) fail, since AIO rings has immutable\n+\t * size.\n+\t *\n+\t * This is not great, but anyway better than putting\n+\t * a ring of wrong size into correct place.\n+\t *\/\n+\n+\tctx = sys_mremap(ctx, raio->len, raio->len,\n+\t\t\t\tMREMAP_FIXED | MREMAP_MAYMOVE,\n+\t\t\t\traio->addr);\n+\tif (ctx != raio->addr) {\n+\t\tpr_err(\"Ring remap failed with %ld\\n\", ctx);\n+\t\treturn -1;\n+\t}\n+\n+\t\/*\n+\t * Now check that kernel not just remapped the\n+\t * ring into new place, but updated the internal\n+\t * context state respectively.\n+\t *\/\n+\n+\tret = sys_io_getevents(ctx, 0, 1, NULL, NULL);\n+\tif (ret != 0) {\n+\t\tif (ret < 0)\n+\t\t\tpr_err(\"Kernel doesn't remap AIO rings\\n\");\n+\t\telse\n+\t\t\tpr_err(\"AIO context screwed up\\n\");\n+\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n }\n \n static void rst_tcp_repair_off(struct rst_tcp_sock *rts)\n@@ -999,54 +1050,9 @@\n \t * up AIO rings.\n \t *\/\n \n-\tfor (i = 0; i < args->rings_n; i++) {\n-\t\tstruct rst_aio_ring *raio = &args->rings[i];\n-\t\tunsigned long ctx = 0;\n-\t\tint ret;\n-\n-\t\tret = sys_io_setup(raio->nr_req, &ctx);\n-\t\tif (ret < 0) {\n-\t\t\tpr_err(\"Ring setup failed with %d\\n\", ret);\n+\tfor (i = 0; i < args->rings_n; i++)\n+\t\tif (restore_aio_ring(&args->rings[i]) < 0)\n \t\t\tgoto core_restore_end;\n-\t\t}\n-\n-\t\tif (ctx == raio->addr) \/* Lucky bastards we are! *\/\n-\t\t\tcontinue;\n-\n-\t\t\/*\n-\t\t * If we failed to get the proper nr_req right and\n-\t\t * created smaller or larger ring, then this remap\n-\t\t * will (should) fail, since AIO rings has immutable\n-\t\t * size.\n-\t\t *\n-\t\t * This is not great, but anyway better than putting\n-\t\t * a ring of wrong size into correct place.\n-\t\t *\/\n-\n-\t\tctx = sys_mremap(ctx, raio->len, raio->len,\n-\t\t\t\t\tMREMAP_FIXED | MREMAP_MAYMOVE,\n-\t\t\t\t\traio->addr);\n-\t\tif (ctx != raio->addr) {\n-\t\t\tpr_err(\"Ring remap failed with %ld\\n\", ctx);\n-\t\t\tgoto core_restore_end;\n-\t\t}\n-\n-\t\t\/*\n-\t\t * Now check that kernel not just remapped the\n-\t\t * ring into new place, but updated the internal\n-\t\t * context state respectively.\n-\t\t *\/\n-\n-\t\tret = sys_io_getevents(ctx, 0, 1, NULL, NULL);\n-\t\tif (ret != 0) {\n-\t\t\tif (ret < 0)\n-\t\t\t\tpr_err(\"Kernel doesn't remap AIO rings\\n\");\n-\t\t\telse\n-\t\t\t\tpr_err(\"AIO context screwed up\\n\");\n-\n-\t\t\tgoto core_restore_end;\n-\t\t}\n-\t}\n \n \t\/*\n \t * Finally restore madivse() bits\n"} {"commit":"57264ec12d8904ce806fbf2b2499d9b8d0713e3a","subject":"Added ability for any spaces found in the Ganglia Group name (source) to be converted to underscores \"_\" before sending to Graphite.","message":"Added ability for any spaces found in the Ganglia Group name (source) to be\nconverted to underscores \"_\" before sending to Graphite.\n\nIf the Ganglia GRid \/ Group for any given metric has spaces in the name e.g.\ndata_source \"Development Servers\", this space will be rejected by Graphite.\nThis patch converts spaces to underscores \"_\".\n","repos":"lawrencewu\/monitor-core,hinesmr\/monitor-core,fastly\/monitor-core,sdgdsffdsfff\/monitor-core,fastly\/monitor-core,NoodlesNZ\/monitor-core,NoodlesNZ\/monitor-core,sdgdsffdsfff\/monitor-core,sdgdsffdsfff\/monitor-core,dmourati\/monitor-core,ganglia\/monitor-core,sdgdsffdsfff\/monitor-core,mjzhou\/monitor-core,torkelsson\/monitor-core,fastly\/monitor-core,phreakocious\/monitor-core,mjzhou\/monitor-core,lawrencewu\/monitor-core,lawrencewu\/monitor-core,torkelsson\/monitor-core,ganglia\/monitor-core,sdgdsffdsfff\/monitor-core,phreakocious\/monitor-core,phreakocious\/monitor-core,mjzhou\/monitor-core,sdgdsffdsfff\/monitor-core,ganglia\/monitor-core,hinesmr\/monitor-core,NoodlesNZ\/monitor-core,hinesmr\/monitor-core,lawrencewu\/monitor-core,mjzhou\/monitor-core,lawrencewu\/monitor-core,torkelsson\/monitor-core,dmourati\/monitor-core,lawrencewu\/monitor-core,dmourati\/monitor-core,sdgdsffdsfff\/monitor-core,fastly\/monitor-core,lawrencewu\/monitor-core,fastly\/monitor-core,ganglia\/monitor-core,phreakocious\/monitor-core,fastly\/monitor-core,NoodlesNZ\/monitor-core,NoodlesNZ\/monitor-core,dmourati\/monitor-core,mjzhou\/monitor-core,torkelsson\/monitor-core,phreakocious\/monitor-core,hinesmr\/monitor-core,dmourati\/monitor-core,torkelsson\/monitor-core,torkelsson\/monitor-core,torkelsson\/monitor-core,phreakocious\/monitor-core,mjzhou\/monitor-core,phreakocious\/monitor-core,mjzhou\/monitor-core,fastly\/monitor-core,ganglia\/monitor-core,NoodlesNZ\/monitor-core,ganglia\/monitor-core,dmourati\/monitor-core,ganglia\/monitor-core,hinesmr\/monitor-core,ganglia\/monitor-core,NoodlesNZ\/monitor-core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gmetad\/rrd_helpers.c\n+++ gmetad\/rrd_helpers.c\n@@ -324,9 +324,25 @@\n \/* Build the path *\/\n strncpy(graphite_msg, gmetad_config.graphite_prefix, PATHSIZE);\n \n+\n+\n+\n if (source) {\n+\t\tint sourcelen=strlen(source);\t\t\n+\t\tchar sourcecp[sourcelen+1];\n+\n+\t\t\/* find and replace space for _ in the hostname*\/\n+\t\tfor(i=0; i<=sourcelen; i++){\n+\tif ( source[i] == ' ') {\n+\t sourcecp[i]='_';\n+\t}else{\n+\t sourcecp[i]=source[i];\n+\t}\n+ }\n+\t\tsourcecp[i+1]=0;\n+ \n strncat(graphite_msg, \".\", PATHSIZE-strlen(graphite_msg));\n- strncat(graphite_msg, source, PATHSIZE-strlen(graphite_msg));\n+ strncat(graphite_msg, sourcecp, PATHSIZE-strlen(graphite_msg));\n }\n \n \n"} {"commit":"746fc2526ffc17d57a5fb87568d01400cbcf62fd","subject":"Fix compiler warnings in crypto\/evp\/bio_ok.c as pointed out by Geoff.","message":"Fix compiler warnings in crypto\/evp\/bio_ok.c as pointed out by Geoff.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/evp\/bio_ok.c\n+++ crypto\/evp\/bio_ok.c\n@@ -286,6 +286,8 @@\n \tint ret=0,n,i;\n \tBIO_OK_CTX *ctx;\n \n+\tif (inl <= 0) return inl;\n+\n \tctx=(BIO_OK_CTX *)b->ptr;\n \tret=inl;\n \n@@ -321,7 +323,7 @@\n \t\tif ((in == NULL) || (inl <= 0)) return(0);\n \n \t\tn= (inl+ ctx->buf_len > OK_BLOCK_SIZE+ OK_BLOCK_BLOCK) ? \n-\t\t\t\tOK_BLOCK_SIZE+ OK_BLOCK_BLOCK- ctx->buf_len : inl;\n+\t\t\t(int)(OK_BLOCK_SIZE+OK_BLOCK_BLOCK-ctx->buf_len) : inl;\n \n \t\tmemcpy((unsigned char *)(&(ctx->buf[ctx->buf_len])),(unsigned char *)in,n);\n \t\tctx->buf_len+= n;\n@@ -489,7 +491,7 @@\n \tctx=b->ptr;\n \tmd=&ctx->md;\n \n-\tif(ctx->buf_len- ctx->buf_off < 2* md->digest->md_size) return;\n+\tif((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return;\n \n \tEVP_DigestInit_ex(md, md->digest, NULL);\n \tmemcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size);\n"} {"commit":"e3b1ccad694aabfffbde68c56fb8d44c011f98b1","subject":"EVP_MD_CTX_ctrl(): Remove unnecessary control","message":"EVP_MD_CTX_ctrl(): Remove unnecessary control\n\nA check was present as to what operation is performed with this\ncontext. It may have been useful at some point, but isn't any more.\n\nReviewed-by: Shane Lontis <452ce16516ceed26291fe7de3f8b53540d83864e@oracle.com>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/10947)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/evp\/digest.c\n+++ crypto\/evp\/digest.c\n@@ -662,10 +662,7 @@\n return 0;\n }\n \n- if (ctx->digest->prov == NULL\n- && (ctx->pctx == NULL\n- || (ctx->pctx->operation != EVP_PKEY_OP_VERIFYCTX\n- && ctx->pctx->operation != EVP_PKEY_OP_SIGNCTX)))\n+ if (ctx->digest->prov == NULL)\n goto legacy;\n \n switch (cmd) {\n"} {"commit":"e517bc11214e4b32abbe5316cb1f925fbb258ea6","subject":"Fix comments.","message":"Fix comments.\n","repos":"e-maxx\/pimpl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/pimpl\/dynamic_unique_ptr.h\n+++ include\/pimpl\/dynamic_unique_ptr.h\n@@ -6,14 +6,14 @@\n * Smart pointer providing sole ownership.\n *\n * From the user point of view, that's a std::unique_ptr, but with dynamic\n- * deleter. This means that he completeness of type T is required only when\n+ * deleter. This means that the completeness of type T is required only when\n * instantiating the DynamicUniquePtr(T*) constructor; all other\n * DynamicUniquePtr members can work when the T type is incomplete yet.\n *\/\n template <typename T>\n class DynamicUniquePtr {\n \/**\n- * Abstract class providing methods for T cloning and destruction.\n+ * Abstract class providing methods for T destruction.\n *\n * The actual implementation is located inside the Traits subclass; this\n * trick is necessary in order to work when T type is incomplete yet. The\n@@ -31,7 +31,7 @@\n };\n \n \/**\n- * Class with implementation of methods for T cloning and destruction.\n+ * Class with implementation of methods for T destruction.\n *\n * Instantiation of this class must happen when the T is already a\n * complete type.\n@@ -57,7 +57,7 @@\n }\n \n \/**\n- * Pointer to the traits providing methods for T cloning and destruction.\n+ * Pointer to the traits providing methods for T destruction.\n *\n * Actually, this will always point to the static object of Traits class\n * (which, in turn, is the same among all DynamicUniquePtr's of the same\n"} {"commit":"6a33c2b963ce7a05df66267585331c7cb3733e4d","subject":"Add legacy script to enable skia roll into chromium. Review URL: https:\/\/codereview.appspot.com\/6277045","message":"Add legacy script to enable skia roll into chromium.\nReview URL: https:\/\/codereview.appspot.com\/6277045\n","repos":"csulmone\/skia,csulmone\/skia,csulmone\/skia,csulmone\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/ports\/SkTypeface_android.h\n+++ include\/ports\/SkTypeface_android.h\n@@ -29,6 +29,11 @@\n kFallbackScriptNumber\n };\n \n+\/\/ This particular mapping will be removed after WebKit is updated to use the\n+\/\/ new mappings. No new caller should use the kTamil_FallbackScript but rather\n+\/\/ the more specific Tamil scripts in the standard enum.\n+static FallbackScripts kTamil_FallbackScript = kTamilRegular_FallbackScript;\n+\n #define SkTypeface_ValidScript(s) (s >= 0 && s < kFallbackScriptNumber)\n \n \/**\n"} {"commit":"cdc9f5842550207f458e437a96b028691e1176b1","subject":"Use switch","message":"Use switch\n","repos":"elohim-meth\/rtti,elohim-meth\/rtti","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/rtti\/detail\/variant_impl.h\n+++ include\/rtti\/detail\/variant_impl.h\n@@ -56,15 +56,18 @@\n \n static MetaType_ID type(type_attribute attr)\n {\n- if (attr == type_attribute::NONE)\n- return metaTypeId<U>();\n- else if (attr == type_attribute::LREF)\n+ switch (attr) {\n+ case type_attribute::NONE:\n+ return metaTypeId<U>();\n+ case type_attribute::LREF:\n return metaTypeId<ULref>();\n- else if (attr == type_attribute::RREF)\n+ case type_attribute::RREF:\n return metaTypeId<URref>();\n- else if (attr == type_attribute::LREF_CONST)\n+ case type_attribute::LREF_CONST:\n return metaTypeId<UConstLref>();\n- return metaTypeId<U>();\n+ default:\n+ return metaTypeId<U>();\n+ }\n }\n \n static void const* access(variant_type_storage const &value) noexcept\n@@ -118,15 +121,18 @@\n {\n static MetaType_ID type(type_attribute attr)\n {\n- if (attr == type_attribute::NONE)\n- return metaTypeId<U>();\n- else if (attr == type_attribute::LREF)\n+ switch (attr) {\n+ case type_attribute::NONE:\n+ return metaTypeId<U>();\n+ case type_attribute::LREF:\n return metaTypeId<ULref>();\n- else if (attr == type_attribute::RREF)\n+ case type_attribute::RREF:\n return metaTypeId<URref>();\n- else if (attr == type_attribute::LREF_CONST)\n+ case type_attribute::LREF_CONST:\n return metaTypeId<UConstLref>();\n- return metaTypeId<U>();\n+ default:\n+ return metaTypeId<U>();\n+ }\n }\n \n static void const* access(variant_type_storage const &value) noexcept\n@@ -185,15 +191,18 @@\n \n static MetaType_ID type(type_attribute attr)\n {\n- if (attr == type_attribute::NONE)\n- return metaTypeId<U>();\n- else if (attr == type_attribute::LREF)\n+ switch (attr) {\n+ case type_attribute::NONE:\n+ return metaTypeId<U>();\n+ case type_attribute::LREF:\n return metaTypeId<ULref>();\n- else if (attr == type_attribute::RREF)\n+ case type_attribute::RREF:\n return metaTypeId<URref>();\n- else if (attr == type_attribute::LREF_CONST)\n+ case type_attribute::LREF_CONST:\n return metaTypeId<UConstLref>();\n- return metaTypeId<U>();\n+ default:\n+ return metaTypeId<U>();\n+ }\n }\n \n static void const* access(variant_type_storage const &value) noexcept\n@@ -254,15 +263,18 @@\n \n static MetaType_ID type(type_attribute attr)\n {\n- if (attr == type_attribute::NONE)\n- return metaTypeId<U>();\n- else if (attr == type_attribute::LREF)\n+ switch (attr) {\n+ case type_attribute::NONE:\n+ return metaTypeId<U>();\n+ case type_attribute::LREF:\n return metaTypeId<ULref>();\n- else if (attr == type_attribute::RREF)\n+ case type_attribute::RREF:\n return metaTypeId<URref>();\n- else if (attr == type_attribute::LREF_CONST)\n+ case type_attribute::LREF_CONST:\n return metaTypeId<UConstLref>();\n- return metaTypeId<U>();\n+ default:\n+ return metaTypeId<U>();\n+ }\n }\n \n static void const* access(variant_type_storage const &value) noexcept\n@@ -334,6 +346,7 @@\n else\n {\n using is_registered = typename has_method_classInfo<ClassInfo(C::*)() const>::type;\n+\n auto instance = Selector::access(value);\n if constexpr(std::is_class_v<Decay>)\n {\n"} {"commit":"b81965cbf3b2397560b392accba8405ba40a247b","subject":"New functions to fetch invariants from tensors","message":"New functions to fetch invariants from tensors\n","repos":"amelmquist\/chrono,armanpazouki\/chrono,projectchrono\/chrono,hsu\/chrono,amelmquist\/chrono,rserban\/chrono,jcmadsen\/chrono,dariomangoni\/chrono,rserban\/chrono,Milad-Rakhsha\/chrono,rserban\/chrono,Bryan-Peterson\/chrono,jcmadsen\/chrono,Bryan-Peterson\/chrono,armanpazouki\/chrono,amelmquist\/chrono,projectchrono\/chrono,rserban\/chrono,amelmquist\/chrono,scpeters\/chrono,armanpazouki\/chrono,Milad-Rakhsha\/chrono,hsu\/chrono,jcmadsen\/chrono,amelmquist\/chrono,andrewseidl\/chrono,armanpazouki\/chrono,Bryan-Peterson\/chrono,armanpazouki\/chrono,tjolsen\/chrono,projectchrono\/chrono,Milad-Rakhsha\/chrono,andrewseidl\/chrono,hsu\/chrono,jcmadsen\/chrono,PedroTrujilloV\/chrono,jcmadsen\/chrono,scpeters\/chrono,tjolsen\/chrono,jcmadsen\/chrono,projectchrono\/chrono,hsu\/chrono,dariomangoni\/chrono,tjolsen\/chrono,PedroTrujilloV\/chrono,PedroTrujilloV\/chrono,scpeters\/chrono,hsu\/chrono,jcmadsen\/chrono,rserban\/chrono,scpeters\/chrono,armanpazouki\/chrono,Bryan-Peterson\/chrono,andrewseidl\/chrono,projectchrono\/chrono,Milad-Rakhsha\/chrono,dariomangoni\/chrono,rserban\/chrono,PedroTrujilloV\/chrono,Bryan-Peterson\/chrono,dariomangoni\/chrono,Milad-Rakhsha\/chrono,Milad-Rakhsha\/chrono,amelmquist\/chrono,rserban\/chrono,PedroTrujilloV\/chrono,dariomangoni\/chrono,andrewseidl\/chrono,dariomangoni\/chrono,tjolsen\/chrono,tjolsen\/chrono,andrewseidl\/chrono,projectchrono\/chrono,scpeters\/chrono","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/physics\/ChTensors.h\n+++ src\/physics\/ChTensors.h\n@@ -218,6 +218,24 @@\n \t\t\t\treturn sqrt( 0.5*(pow(this->XX()-this->YY(),2.) + pow(this->YY()-this->ZZ(),2.) + pow(this->ZZ()-this->XX(),2.)) + 3.0*( this->XY()*this->XY() + this->XZ()*this->XZ() + this->YZ()*this->YZ()) );\n \t\t\t}\n \n+\n+\t\t\t\/\/\/ Compute the mean hydrostatic value (aka volumetric, normal)\n+\tdouble GetEquivalentMeanHydrostatic() const\n+\t\t\t{\t\n+\t\t\t\treturn (this->GetInvariant_I1() \/3.);\n+\t\t\t}\n+\n+\t\t\t\/\/\/ Compute the octahedral normal invariant (aka hydrostatic, volumetric)\n+\tdouble GetEquivalentOctahedralNormal() const\n+\t\t\t{\t\n+\t\t\t\treturn this->GetEquivalentMeanHydrostatic();\n+\t\t\t}\n+\t\t\t\/\/\/ Compute the octahedral deviatoric invariant (aka shear)\n+\tdouble GetEquivalentOctahedralDeviatoric() const\n+\t\t\t{\t\n+\t\t\t\treturn sqrt((2.\/3.)*this->GetInvariant_J2());\n+\t\t\t}\n+\n };\n \n \/\/\/ Class for stress tensors, in compact Voight notation\n"} {"commit":"a3cebb06b8e0e28fe43fbb22e6bd9f0c499271e3","subject":"pass final likelihood back up","message":"pass final likelihood back up\n","repos":"cboettig\/wrightscape,cboettig\/wrightscape","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- src\/piecewise_regimes.c\n+++ src\/piecewise_regimes.c\n@@ -304,7 +304,8 @@\n \tdouble * branch_length, \n \tdouble * traits, \n \tint * n_nodes, \n-\tint * n_regimes )\n+\tint * n_regimes,\n+\tdouble * llik)\n {\n \tint i,j;\n \ttree * mytree = (tree *) malloc(sizeof(tree));\n@@ -339,8 +340,7 @@\n \t\tgsl_vector_set(x, 1+2 * *n_regimes+i, mytree->sigma[i]);\n \t}\n \t\n-\tmultimin(x, mytree);\n-\/\/\toptim_func(x, mytree);\n+\t*llik = multimin(x, mytree);\n \n \tgsl_vector_free(x);\n \tfree(mytree->lca_matrix);\n@@ -401,13 +401,13 @@\n \tdouble theta[3] = {3.355242, 3.0407, 2.565};\n \tdouble sigma[3] = {sqrt(0.0505), sqrt(0.0505), sqrt(0.0505) };\n \tint n_regimes = 3;\n-\n-\n-\tfit_model(&Xo, alpha, theta, sigma, regimes, ancestor, branch_length, traits, &n_nodes, &n_regimes);\n+\tdouble llik = 0;\n+\n+\tfit_model(&Xo, alpha, theta, sigma, regimes, ancestor, branch_length, traits, &n_nodes, &n_regimes, &llik);\n \tprintf(\"Xo = %g\\n\", Xo);\n \tprintf(\"alphas: %g %g %g\\n\", alpha[0], alpha[1], alpha[2]);\n \tprintf(\"thetas: %g %g %g\\n\", theta[0], theta[1], theta[2]);\n \tprintf(\"sigmas: %g %g %g\\n\", sigma[0], sigma[1], sigma[2]);\n-\n+\tprintf(\"log likelihood: %g\\n\", llik);\n \treturn 0;\n }\n"} {"commit":"bfbaf508a72edf6815e7859035a3f962318ac12e","subject":"Destroy pending tasks marshaled through windows messages avoiding possible crashes when object is destroyed and there is tasks in the queue. BUG=none TEST=none","message":"Destroy pending tasks marshaled through windows messages avoiding possible crashes when object is destroyed and there is tasks in the queue.\nBUG=none\nTEST=none\n\nReview URL: http:\/\/codereview.chromium.org\/661145\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@40125 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"mogoweb\/chromium-crosswalk,axinging\/chromium-crosswalk,rogerwang\/chromium,Fireblend\/chromium-crosswalk,Jonekee\/chromium.src,Just-D\/chromium-1,mohamed--abdel-maksoud\/chromium.src,zcbenz\/cefode-chromium,rogerwang\/chromium,rogerwang\/chromium,hgl888\/chromium-crosswalk-efl,pozdnyakov\/chromium-crosswalk,Jonekee\/chromium.src,bright-sparks\/chromium-spacewalk,Pluto-tv\/chromium-crosswalk,ltilve\/chromium,Jonekee\/chromium.src,jaruba\/chromium.src,M4sse\/chromium.src,littlstar\/chromium.src,axinging\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,ondra-novak\/chromium.src,rogerwang\/chromium,littlstar\/chromium.src,mogoweb\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,chuan9\/chromium-crosswalk,markYoungH\/chromium.src,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Chilledheart\/chromium,Fireblend\/chromium-crosswalk,rogerwang\/chromium,fujunwei\/chromium-crosswalk,dednal\/chromium.src,hgl888\/chromium-crosswalk,keishi\/chromium,ondra-novak\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Chilledheart\/chromium,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,markYoungH\/chromium.src,keishi\/chromium,anirudhSK\/chromium,timopulkkinen\/BubbleFish,rogerwang\/chromium,chuan9\/chromium-crosswalk,littlstar\/chromium.src,patrickm\/chromium.src,mogoweb\/chromium-crosswalk,anirudhSK\/chromium,dushu1203\/chromium.src,jaruba\/chromium.src,robclark\/chromium,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk-efl,Pluto-tv\/chromium-crosswalk,patrickm\/chromium.src,nacl-webkit\/chrome_deps,TheTypoMaster\/chromium-crosswalk,timopulkkinen\/BubbleFish,PeterWangIntel\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,robclark\/chromium,Jonekee\/chromium.src,markYoungH\/chromium.src,hgl888\/chromium-crosswalk-efl,ondra-novak\/chromium.src,keishi\/chromium,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,crosswalk-project\/chromium-crosswalk-efl,pozdnyakov\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk-efl,crosswalk-project\/chromium-crosswalk-efl,zcbenz\/cefode-chromium,keishi\/chromium,Just-D\/chromium-1,Chilledheart\/chromium,robclark\/chromium,fujunwei\/chromium-crosswalk,nacl-webkit\/chrome_deps,ondra-novak\/chromium.src,TheTypoMaster\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,anirudhSK\/chromium,junmin-zhu\/chromium-rivertrail,chuan9\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,markYoungH\/chromium.src,axinging\/chromium-crosswalk,patrickm\/chromium.src,anirudhSK\/chromium,PeterWangIntel\/chromium-crosswalk,timopulkkinen\/BubbleFish,jaruba\/chromium.src,hgl888\/chromium-crosswalk,Fireblend\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src,Jonekee\/chromium.src,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,ChromiumWebApps\/chromium,pozdnyakov\/chromium-crosswalk,nacl-webkit\/chrome_deps,TheTypoMaster\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,robclark\/chromium,hujiajie\/pa-chromium,bright-sparks\/chromium-spacewalk,PeterWangIntel\/chromium-crosswalk,Chilledheart\/chromium,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk-efl,ChromiumWebApps\/chromium,ChromiumWebApps\/chromium,mohamed--abdel-maksoud\/chromium.src,dushu1203\/chromium.src,M4sse\/chromium.src,mogoweb\/chromium-crosswalk,zcbenz\/cefode-chromium,Chilledheart\/chromium,crosswalk-project\/chromium-crosswalk-efl,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk,anirudhSK\/chromium,M4sse\/chromium.src,dushu1203\/chromium.src,markYoungH\/chromium.src,anirudhSK\/chromium,M4sse\/chromium.src,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,patrickm\/chromium.src,jaruba\/chromium.src,keishi\/chromium,markYoungH\/chromium.src,nacl-webkit\/chrome_deps,ltilve\/chromium,Just-D\/chromium-1,M4sse\/chromium.src,PeterWangIntel\/chromium-crosswalk,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,axinging\/chromium-crosswalk,Jonekee\/chromium.src,dushu1203\/chromium.src,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,keishi\/chromium,krieger-od\/nwjs_chromium.src,Jonekee\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,Chilledheart\/chromium,littlstar\/chromium.src,zcbenz\/cefode-chromium,dednal\/chromium.src,rogerwang\/chromium,dushu1203\/chromium.src,ChromiumWebApps\/chromium,timopulkkinen\/BubbleFish,patrickm\/chromium.src,ChromiumWebApps\/chromium,junmin-zhu\/chromium-rivertrail,fujunwei\/chromium-crosswalk,dushu1203\/chromium.src,timopulkkinen\/BubbleFish,pozdnyakov\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,Fireblend\/chromium-crosswalk,Just-D\/chromium-1,Just-D\/chromium-1,patrickm\/chromium.src,axinging\/chromium-crosswalk,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,dednal\/chromium.src,ondra-novak\/chromium.src,ltilve\/chromium,ChromiumWebApps\/chromium,robclark\/chromium,nacl-webkit\/chrome_deps,mogoweb\/chromium-crosswalk,hujiajie\/pa-chromium,fujunwei\/chromium-crosswalk,keishi\/chromium,M4sse\/chromium.src,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,markYoungH\/chromium.src,anirudhSK\/chromium,mogoweb\/chromium-crosswalk,nacl-webkit\/chrome_deps,dednal\/chromium.src,hujiajie\/pa-chromium,robclark\/chromium,pozdnyakov\/chromium-crosswalk,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,crosswalk-project\/chromium-crosswalk-efl,ondra-novak\/chromium.src,mohamed--abdel-maksoud\/chromium.src,hujiajie\/pa-chromium,Fireblend\/chromium-crosswalk,dushu1203\/chromium.src,PeterWangIntel\/chromium-crosswalk,keishi\/chromium,littlstar\/chromium.src,fujunwei\/chromium-crosswalk,anirudhSK\/chromium,pozdnyakov\/chromium-crosswalk,timopulkkinen\/BubbleFish,nacl-webkit\/chrome_deps,axinging\/chromium-crosswalk,patrickm\/chromium.src,M4sse\/chromium.src,pozdnyakov\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk,Chilledheart\/chromium,Chilledheart\/chromium,robclark\/chromium,robclark\/chromium,zcbenz\/cefode-chromium,Fireblend\/chromium-crosswalk,markYoungH\/chromium.src,bright-sparks\/chromium-spacewalk,ltilve\/chromium,mogoweb\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,dushu1203\/chromium.src,bright-sparks\/chromium-spacewalk,krieger-od\/nwjs_chromium.src,jaruba\/chromium.src,robclark\/chromium,PeterWangIntel\/chromium-crosswalk,rogerwang\/chromium,TheTypoMaster\/chromium-crosswalk,patrickm\/chromium.src,jaruba\/chromium.src,krieger-od\/nwjs_chromium.src,dednal\/chromium.src,keishi\/chromium,TheTypoMaster\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,pozdnyakov\/chromium-crosswalk,chuan9\/chromium-crosswalk,timopulkkinen\/BubbleFish,M4sse\/chromium.src,dednal\/chromium.src,M4sse\/chromium.src,chuan9\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,hujiajie\/pa-chromium,zcbenz\/cefode-chromium,rogerwang\/chromium,chuan9\/chromium-crosswalk,dednal\/chromium.src,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,Just-D\/chromium-1,krieger-od\/nwjs_chromium.src,Pluto-tv\/chromium-crosswalk,mogoweb\/chromium-crosswalk,Just-D\/chromium-1,Chilledheart\/chromium,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk,rogerwang\/chromium,TheTypoMaster\/chromium-crosswalk,jaruba\/chromium.src,ondra-novak\/chromium.src,anirudhSK\/chromium,Just-D\/chromium-1,jaruba\/chromium.src,ltilve\/chromium,TheTypoMaster\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,markYoungH\/chromium.src,hujiajie\/pa-chromium,bright-sparks\/chromium-spacewalk,dednal\/chromium.src,hgl888\/chromium-crosswalk-efl,chuan9\/chromium-crosswalk,Fireblend\/chromium-crosswalk,keishi\/chromium,chuan9\/chromium-crosswalk,hgl888\/chromium-crosswalk,robclark\/chromium,littlstar\/chromium.src,Jonekee\/chromium.src,ChromiumWebApps\/chromium,M4sse\/chromium.src,chuan9\/chromium-crosswalk,nacl-webkit\/chrome_deps,junmin-zhu\/chromium-rivertrail,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src,fujunwei\/chromium-crosswalk,ChromiumWebApps\/chromium,crosswalk-project\/chromium-crosswalk-efl,jaruba\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,keishi\/chromium,anirudhSK\/chromium,timopulkkinen\/BubbleFish,ltilve\/chromium,Pluto-tv\/chromium-crosswalk,ondra-novak\/chromium.src,zcbenz\/cefode-chromium,Pluto-tv\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,junmin-zhu\/chromium-rivertrail,jaruba\/chromium.src,mohamed--abdel-maksoud\/chromium.src,junmin-zhu\/chromium-rivertrail,fujunwei\/chromium-crosswalk,timopulkkinen\/BubbleFish,anirudhSK\/chromium,Pluto-tv\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,jaruba\/chromium.src,mogoweb\/chromium-crosswalk,timopulkkinen\/BubbleFish,crosswalk-project\/chromium-crosswalk-efl,bright-sparks\/chromium-spacewalk,Fireblend\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,M4sse\/chromium.src,axinging\/chromium-crosswalk,patrickm\/chromium.src,ltilve\/chromium,littlstar\/chromium.src,ltilve\/chromium,fujunwei\/chromium-crosswalk,dushu1203\/chromium.src,dednal\/chromium.src,dednal\/chromium.src,bright-sparks\/chromium-spacewalk,hgl888\/chromium-crosswalk-efl,ChromiumWebApps\/chromium,mogoweb\/chromium-crosswalk,dednal\/chromium.src,ChromiumWebApps\/chromium,mohamed--abdel-maksoud\/chromium.src,junmin-zhu\/chromium-rivertrail,pozdnyakov\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,Just-D\/chromium-1,Fireblend\/chromium-crosswalk,littlstar\/chromium.src,zcbenz\/cefode-chromium,anirudhSK\/chromium,zcbenz\/cefode-chromium,nacl-webkit\/chrome_deps,bright-sparks\/chromium-spacewalk,hujiajie\/pa-chromium,ChromiumWebApps\/chromium,ltilve\/chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chrome_frame\/chrome_frame_delegate.h\n+++ chrome_frame\/chrome_frame_delegate.h\n@@ -7,7 +7,9 @@\n \n #include <atlbase.h>\n #include <atlwin.h>\n+#include <queue>\n \n+#include \"base\/lock.h\"\n #include \"chrome\/test\/automation\/automation_messages.h\"\n #include \"ipc\/ipc_message.h\"\n \n@@ -125,15 +127,35 @@\n template <class T> class TaskMarshallerThroughWindowsMessages\n : public TaskMarshaller {\n public:\n+ TaskMarshallerThroughWindowsMessages() {}\n virtual void PostTask(const tracked_objects::Location& from_here,\n Task* task) {\n task->SetBirthPlace(from_here);\n T* this_ptr = static_cast<T*>(this);\n if (this_ptr->IsWindow()) {\n this_ptr->AddRef();\n+ PushTask(task);\n this_ptr->PostMessage(MSG_EXECUTE_TASK, reinterpret_cast<WPARAM>(task));\n } else {\n DLOG(INFO) << \"Dropping MSG_EXECUTE_TASK message for destroyed window.\";\n+ delete task;\n+ }\n+ }\n+\n+\n+ protected:\n+ ~TaskMarshallerThroughWindowsMessages() {\n+ DeleteAllPendingTasks();\n+ }\n+\n+ void DeleteAllPendingTasks() {\n+ AutoLock lock(lock_);\n+ DLOG_IF(INFO, !pending_tasks_.empty()) << \"Destroying \" <<\n+ pending_tasks_.size() << \" pending tasks\";\n+ while (!pending_tasks_.empty()) {\n+ Task* task = pending_tasks_.front();\n+ pending_tasks_.pop();\n+ delete task;\n }\n }\n \n@@ -146,12 +168,27 @@\n inline LRESULT ExecuteTask(UINT, WPARAM wparam, LPARAM,\n BOOL& handled) { \/\/ NOLINT\n Task* task = reinterpret_cast<Task*>(wparam);\n+ PopTask(task);\n task->Run();\n delete task;\n T* this_ptr = static_cast<T*>(this);\n this_ptr->Release();\n return 0;\n }\n+\n+ inline void PushTask(Task* task) {\n+ AutoLock lock(lock_);\n+ pending_tasks_.push(task);\n+ }\n+\n+ inline void PopTask(Task* task) {\n+ AutoLock lock(lock_);\n+ DCHECK_EQ(task, pending_tasks_.front());\n+ pending_tasks_.pop();\n+ }\n+\n+ Lock lock_;\n+ std::queue<Task*> pending_tasks_;\n };\n \n #endif \/\/ CHROME_FRAME_CHROME_FRAME_DELEGATE_H_\n"} {"commit":"b22380990fbf75a0d6df378834d65e06146e19b2","subject":"fix DEBUG in syscalls","message":"fix DEBUG in syscalls\n","repos":"msolters\/RIOT,neiljay\/RIOT,cladmi\/RIOT,AnonMall\/RIOT,EmuxEvans\/RIOT,katezilla\/RIOT,herrfz\/RIOT-old,msolters\/RIOT,basilfx\/RIOT,LudwigKnuepfer\/RIOT,ntrtrung\/RIOT,jasonatran\/RIOT,alignan\/RIOT,PSHIVANI\/Riot-Code,koenning\/RIOT,khhhh\/RIOT,automote\/RIOT,gebart\/RIOT,toonst\/RIOT,mziegert\/RIOT,robixnai\/RIOT,smlng\/RIOT,mziegert\/RIOT,PSHIVANI\/Riot-Code,spium\/IoT-RIOT,jhollister\/RIOT,x3ro\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,locicontrols\/RIOT,BytesGalore\/PetersRIOT,immesys\/RiSyn,Darredevil\/RIOT,marcosalm\/RIOT,adrianghc\/RIOT,sumanpanchal\/RIOT,neumodisch\/RIOT,backenklee\/RIOT,wentaoshang\/RIOT,zhuoshuguo\/RIOT,aeneby\/RIOT,1blankz7\/RIOT,gbarnett\/RIOT,dhruvvyas90\/RIOT,asanka-code\/RIOT,gautric\/RIOT,PSHIVANI\/Riot-Code,altairpearl\/RIOT,benoit-canet\/RIOT,gbarnett\/RIOT,LudwigKnuepfer\/RIOT,lebrush\/RIOT,kaleb-himes\/RIOT,latsku\/RIOT,rajma996\/RIOT,nsol-nmsu\/RIOT,marcosalm\/RIOT,hamilton-mote\/RIOT-OS,OlegHahm\/RIOT,openkosmosorg\/RIOT,fnack\/RIOT,locicontrols\/RIOT,rakendrathapa\/RIOT,ximus\/RIOT,benoit-canet\/RIOT,biboc\/RIOT,ros2\/ros2_embedded_riot,dkm\/RIOT,BytesGalore\/PetersRIOT,adrianghc\/RIOT,sumanpanchal\/RIOT,jferreir\/RIOT,mziegert\/RIOT,alex1818\/RIOT,brettswann\/RIOT,robixnai\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,kb2ma\/RIOT,authmillenon\/RIOT,FrancescoErmini\/RIOT,d00616\/RIOT,openkosmosorg\/RIOT,ximus\/RIOT,abkam07\/RIOT,jfischer-phytec-iot\/RIOT,msolters\/RIOT,ntrtrung\/RIOT,d00616\/RIOT,locicontrols\/RIOT,herrfz\/RIOT-old,patkan\/RIOT,stevenj\/RIOT,biboc\/RIOT,changbiao\/RIOT,herrfz\/RIOT,adrianghc\/RIOT,Hyungsin\/RIOT-OS,dhruvvyas90\/RIOT,herrfz\/RIOT,ros2\/ros2_embedded_riot,dkm\/RIOT,l3nko\/RIOT,kerneltask\/RIOT,rfuentess\/RIOT,kYc0o\/RIOT,chris-wood\/RIOT,OTAkeys\/RIOT,rfuentess\/RIOT,neiljay\/RIOT,adjih\/RIOT,RBartz\/RIOT,luciotorre\/RIOT,watr-li\/RIOT,neumodisch\/RIOT,AnonMall\/RIOT,benoit-canet\/RIOT,abp719\/RIOT,MohmadAyman\/RIOT,hamilton-mote\/RIOT-OS,beurdouche\/RIOT,AnonMall\/RIOT,sumanpanchal\/RIOT,MarkXYang\/RIOT,alignan\/RIOT,rousselk\/RIOT,nsol-nmsu\/RIOT,dailab\/RIOT,spium\/IoT-RIOT,ks156\/RIOT,EmuxEvans\/RIOT,Darredevil\/RIOT,lazytech-org\/RIOT,l3nko\/RIOT,Osblouf\/RIOT,ThanhVic\/RIOT,smlng\/RIOT,EmuxEvans\/RIOT,OlegHahm\/RIOT,rfuentess\/RIOT,JensErdmann\/RIOT,Josar\/RIOT,cladmi\/RIOT,cladmi\/RIOT,l3nko\/RIOT,rfswarm\/RIOT,alex1818\/RIOT,Yonezawa-T2\/RIOT,adrianghc\/RIOT,RubikonAlpha\/RIOT,arvindpdmn\/RIOT,MonsterCode8000\/RIOT,Lotterleben\/RIOT,Lexandro92\/RIOT-CoAP,roberthartung\/RIOT,jbeyerstedt\/RIOT-OTA-update,beurdouche\/RIOT,arvindpdmn\/RIOT,centurysys\/RIOT,binarylemon\/RIOT,Osblouf\/RIOT,dailab\/RIOT,alignan\/RIOT,jbeyerstedt\/RIOT-OTA-update,Ell-i\/RIOT,sgso\/RIOT,thomaseichinger\/RIOT,ant9000\/RIOT,Josar\/RIOT,jferreir\/RIOT,LudwigOrtmann\/RIOT,arvindpdmn\/RIOT,jfischer-phytec-iot\/RIOT,msolters\/RIOT,A-Paul\/RIOT,patkan\/RIOT,rousselk\/RIOT,rfswarm\/RIOT,ros2\/ros2_embedded_riot,thiagohd\/RIOT,rakendrathapa\/RIOT,shady33\/RIOT,marcosalm\/RIOT,Yonezawa-T2\/RIOT,attdona\/RIOT,smlng\/RIOT,asanka-code\/RIOT,koenning\/RIOT,malosek\/RIOT,tfar\/RIOT,watr-li\/RIOT,changbiao\/RIOT,jasonatran\/RIOT,LudwigOrtmann\/RIOT,Hyungsin\/RIOT-OS,Hyungsin\/RIOT-OS,openkosmosorg\/RIOT,luciotorre\/RIOT,Darredevil\/RIOT,jasonatran\/RIOT,patkan\/RIOT,daniel-k\/RIOT,rfswarm2\/RIOT,JensErdmann\/RIOT,ant9000\/RIOT,gautric\/RIOT,alex1818\/RIOT,tfar\/RIOT,A-Paul\/RIOT,alex1818\/RIOT,Lexandro92\/RIOT-CoAP,shady33\/RIOT,ros2\/ros2_embedded_riot,kushalsingh007\/RIOT,MarkXYang\/RIOT,Josar\/RIOT,backenklee\/RIOT,AnonMall\/RIOT,toonst\/RIOT,dkm\/RIOT,immesys\/RiSyn,altairpearl\/RIOT,gbarnett\/RIOT,daniel-k\/RIOT,alignan\/RIOT,mtausig\/RIOT,jremmert-phytec-iot\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,aeneby\/RIOT,JensErdmann\/RIOT,ant9000\/RIOT,cladmi\/RIOT,LudwigKnuepfer\/RIOT,ThanhVic\/RIOT,basilfx\/RIOT,chris-wood\/RIOT,ximus\/RIOT,Ell-i\/RIOT,jhollister\/RIOT,kaleb-himes\/RIOT,dhruvvyas90\/RIOT,josephnoir\/RIOT,nsol-nmsu\/RIOT,MohmadAyman\/RIOT,Josar\/RIOT,automote\/RIOT,emmanuelsearch\/RIOT,katezilla\/RIOT,lebrush\/RIOT,locicontrols\/RIOT,beurdouche\/RIOT,yogo1212\/RIOT,thomaseichinger\/RIOT,spium\/IoT-RIOT,AnonMall\/RIOT,herrfz\/RIOT,centurysys\/RIOT,cladmi\/RIOT,PSHIVANI\/Riot-Code,MohmadAyman\/RIOT,Lexandro92\/RIOT-CoAP,Osblouf\/RIOT,Osblouf\/RIOT,bartfaizoltan\/RIOT,asanka-code\/RIOT,kbumsik\/RIOT,mtausig\/RIOT,dailab\/RIOT,rfswarm2\/RIOT,benoit-canet\/RIOT,locicontrols\/RIOT,thiagohd\/RIOT,plushvoxel\/RIOT,1blankz7\/RIOT,MonsterCode8000\/RIOT,MarkXYang\/RIOT,thiagohd\/RIOT,josephnoir\/RIOT,alex1818\/RIOT,emmanuelsearch\/RIOT,adjih\/RIOT,koenning\/RIOT,BytesGalore\/PetersRIOT,biboc\/RIOT,mfrey\/RIOT,Hyungsin\/RIOT-OS,arvindpdmn\/RIOT,gebart\/RIOT,rfuentess\/RIOT,kYc0o\/RIOT,plushvoxel\/RIOT,rajma996\/RIOT,MohmadAyman\/RIOT,khhhh\/RIOT,josephnoir\/RIOT,abp719\/RIOT,smlng\/RIOT,d00616\/RIOT,authmillenon\/RIOT,ntrtrung\/RIOT,automote\/RIOT,brettswann\/RIOT,adjih\/RIOT,mtausig\/RIOT,PSHIVANI\/Riot-Code,nsol-nmsu\/RIOT,openkosmosorg\/RIOT,yogo1212\/RIOT,tdautc19841202\/RIOT,BytesGalore\/PetersRIOT,rakendrathapa\/RIOT,1blankz7\/RIOT,tdautc19841202\/RIOT,attdona\/RIOT,basilfx\/RIOT,TobiasFredersdorf\/RIOT,shady33\/RIOT,chris-wood\/RIOT,kerneltask\/RIOT,ros2\/ros2_embedded_riot,tdautc19841202\/RIOT,LudwigOrtmann\/RIOT,RBartz\/RIOT,kaleb-himes\/RIOT,mfrey\/RIOT,koenning\/RIOT,ximus\/RIOT,thiagohd\/RIOT,OlegHahm\/RIOT,LudwigKnuepfer\/RIOT,jremmert-phytec-iot\/RIOT,daniel-k\/RIOT,authmillenon\/RIOT,MarkXYang\/RIOT,alex1818\/RIOT,rajma996\/RIOT,watr-li\/RIOT,katezilla\/RIOT,BytesGalore\/RIOT,robixnai\/RIOT,smlng\/RIOT,RIOT-OS\/RIOT,roberthartung\/RIOT,asanka-code\/RIOT,sgso\/RIOT,tdautc19841202\/RIOT,haoyangyu\/RIOT,abkam07\/RIOT,DipSwitch\/RIOT,centurysys\/RIOT,kaspar030\/RIOT,msolters\/RIOT,mfrey\/RIOT,latsku\/RIOT,rfuentess\/RIOT,jremmert-phytec-iot\/RIOT,nsol-nmsu\/RIOT,herrfz\/RIOT,avmelnikoff\/RIOT,aeneby\/RIOT,emmanuelsearch\/RIOT,kYc0o\/RIOT,altairpearl\/RIOT,kaspar030\/RIOT,khhhh\/RIOT,herrfz\/RIOT-old,thomaseichinger\/RIOT,patkan\/RIOT,automote\/RIOT,ros2\/ros2_embedded_riot,aeneby\/RIOT,hamilton-mote\/RIOT-OS,Lotterleben\/RIOT,lazytech-org\/RIOT,RBartz\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,Osblouf\/RIOT,rajma996\/RIOT,thiagohd\/RIOT,emmanuelsearch\/RIOT,LudwigOrtmann\/RIOT,emmanuelsearch\/RIOT,1blankz7\/RIOT,sgso\/RIOT,abp719\/RIOT,stevenj\/RIOT,chris-wood\/RIOT,josephnoir\/RIOT,sumanpanchal\/RIOT,abkam07\/RIOT,latsku\/RIOT,x3ro\/RIOT,stevenj\/RIOT,neumodisch\/RIOT,jbeyerstedt\/RIOT-OTA-update,DipSwitch\/RIOT,Osblouf\/RIOT,gebart\/RIOT,aeneby\/RIOT,brettswann\/RIOT,MonsterCode8000\/RIOT,Darredevil\/RIOT,watr-li\/RIOT,emmanuelsearch\/RIOT,gbarnett\/RIOT,rakendrathapa\/RIOT,jferreir\/RIOT,Lotterleben\/RIOT,benoit-canet\/RIOT,rousselk\/RIOT,x3ro\/RIOT,plushvoxel\/RIOT,robixnai\/RIOT,centurysys\/RIOT,EmuxEvans\/RIOT,kYc0o\/RIOT,kb2ma\/RIOT,attdona\/RIOT,kushalsingh007\/RIOT,DipSwitch\/RIOT,d00616\/RIOT,wentaoshang\/RIOT,herrfz\/RIOT,rfswarm\/RIOT,sumanpanchal\/RIOT,koenning\/RIOT,thomaseichinger\/RIOT,jremmert-phytec-iot\/RIOT,kushalsingh007\/RIOT,malosek\/RIOT,abp719\/RIOT,Lexandro92\/RIOT-CoAP,jremmert-phytec-iot\/RIOT,JensErdmann\/RIOT,JensErdmann\/RIOT,herrfz\/RIOT-old,wentaoshang\/RIOT,LudwigKnuepfer\/RIOT,marcosalm\/RIOT,phiros\/RIOT,neiljay\/RIOT,ThanhVic\/RIOT,rajma996\/RIOT,ant9000\/RIOT,phiros\/RIOT,Yonezawa-T2\/RIOT,ximus\/RIOT,abkam07\/RIOT,A-Paul\/RIOT,marcosalm\/RIOT,basilfx\/RIOT,dailab\/RIOT,asanka-code\/RIOT,avmelnikoff\/RIOT,hamilton-mote\/RIOT-OS,Ell-i\/RIOT,lebrush\/RIOT,haoyangyu\/RIOT,herrfz\/RIOT-old,phiros\/RIOT,malosek\/RIOT,FrancescoErmini\/RIOT,dhruvvyas90\/RIOT,FrancescoErmini\/RIOT,rousselk\/RIOT,BytesGalore\/RIOT,jfischer-phytec-iot\/RIOT,lebrush\/RIOT,kerneltask\/RIOT,haoyangyu\/RIOT,biboc\/RIOT,bartfaizoltan\/RIOT,MohmadAyman\/RIOT,robixnai\/RIOT,l3nko\/RIOT,syin2\/RIOT,gbarnett\/RIOT,OTAkeys\/RIOT,rajma996\/RIOT,spium\/IoT-RIOT,kb2ma\/RIOT,BytesGalore\/RIOT,mtausig\/RIOT,changbiao\/RIOT,phiros\/RIOT,TobiasFredersdorf\/RIOT,ximus\/RIOT,backenklee\/RIOT,ros2\/ros2_embedded_riot,foss-for-synopsys-dwc-arc-processors\/RIOT,A-Paul\/RIOT,roberthartung\/RIOT,LudwigOrtmann\/RIOT,benoit-canet\/RIOT,syin2\/RIOT,mtausig\/RIOT,jasonatran\/RIOT,wentaoshang\/RIOT,stevenj\/RIOT,mfrey\/RIOT,abp719\/RIOT,DipSwitch\/RIOT,ntrtrung\/RIOT,zhuoshuguo\/RIOT,basilfx\/RIOT,ks156\/RIOT,kaspar030\/RIOT,MarkXYang\/RIOT,zhuoshuguo\/RIOT,lebrush\/RIOT,latsku\/RIOT,bartfaizoltan\/RIOT,neiljay\/RIOT,daniel-k\/RIOT,adjih\/RIOT,bartfaizoltan\/RIOT,neumodisch\/RIOT,abkam07\/RIOT,immesys\/RiSyn,x3ro\/RIOT,chris-wood\/RIOT,watr-li\/RIOT,luciotorre\/RIOT,ks156\/RIOT,kushalsingh007\/RIOT,avmelnikoff\/RIOT,zhuoshuguo\/RIOT,malosek\/RIOT,herrfz\/RIOT,MonsterCode8000\/RIOT,MohmadAyman\/RIOT,OlegHahm\/RIOT,kbumsik\/RIOT,OTAkeys\/RIOT,syin2\/RIOT,gautric\/RIOT,sgso\/RIOT,miri64\/RIOT,khhhh\/RIOT,binarylemon\/RIOT,luciotorre\/RIOT,changbiao\/RIOT,chris-wood\/RIOT,rfswarm\/RIOT,mziegert\/RIOT,lazytech-org\/RIOT,authmillenon\/RIOT,mfrey\/RIOT,immesys\/RiSyn,kerneltask\/RIOT,haoyangyu\/RIOT,EmuxEvans\/RIOT,arvindpdmn\/RIOT,syin2\/RIOT,lazytech-org\/RIOT,Lexandro92\/RIOT-CoAP,RubikonAlpha\/RIOT,BytesGalore\/PetersRIOT,OTAkeys\/RIOT,brettswann\/RIOT,robixnai\/RIOT,jfischer-phytec-iot\/RIOT,haoyangyu\/RIOT,Lexandro92\/RIOT-CoAP,FrancescoErmini\/RIOT,katezilla\/RIOT,changbiao\/RIOT,gbarnett\/RIOT,BytesGalore\/PetersRIOT,ThanhVic\/RIOT,biboc\/RIOT,l3nko\/RIOT,msolters\/RIOT,RIOT-OS\/RIOT,rakendrathapa\/RIOT,centurysys\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,dhruvvyas90\/RIOT,toonst\/RIOT,BytesGalore\/RIOT,FrancescoErmini\/RIOT,backenklee\/RIOT,neumodisch\/RIOT,brettswann\/RIOT,dkm\/RIOT,JensErdmann\/RIOT,fnack\/RIOT,spium\/IoT-RIOT,josephnoir\/RIOT,binarylemon\/RIOT,MonsterCode8000\/RIOT,EmuxEvans\/RIOT,MarkXYang\/RIOT,DipSwitch\/RIOT,AnonMall\/RIOT,jferreir\/RIOT,fnack\/RIOT,fnack\/RIOT,kaleb-himes\/RIOT,RIOT-OS\/RIOT,yogo1212\/RIOT,altairpearl\/RIOT,jasonatran\/RIOT,dailab\/RIOT,MonsterCode8000\/RIOT,LudwigOrtmann\/RIOT,plushvoxel\/RIOT,latsku\/RIOT,Lotterleben\/RIOT,BytesGalore\/PetersRIOT,jremmert-phytec-iot\/RIOT,A-Paul\/RIOT,toonst\/RIOT,kb2ma\/RIOT,miri64\/RIOT,arvindpdmn\/RIOT,Yonezawa-T2\/RIOT,binarylemon\/RIOT,adrianghc\/RIOT,immesys\/RiSyn,automote\/RIOT,khhhh\/RIOT,openkosmosorg\/RIOT,yogo1212\/RIOT,lebrush\/RIOT,adjih\/RIOT,bartfaizoltan\/RIOT,sumanpanchal\/RIOT,Ell-i\/RIOT,fnack\/RIOT,d00616\/RIOT,BytesGalore\/RIOT,wentaoshang\/RIOT,phiros\/RIOT,gautric\/RIOT,Lotterleben\/RIOT,daniel-k\/RIOT,ntrtrung\/RIOT,syin2\/RIOT,shady33\/RIOT,thomaseichinger\/RIOT,kbumsik\/RIOT,malosek\/RIOT,jhollister\/RIOT,roberthartung\/RIOT,spium\/IoT-RIOT,beurdouche\/RIOT,zhuoshuguo\/RIOT,jhollister\/RIOT,kbumsik\/RIOT,beurdouche\/RIOT,kushalsingh007\/RIOT,locicontrols\/RIOT,zhuoshuguo\/RIOT,d00616\/RIOT,Ell-i\/RIOT,patkan\/RIOT,rousselk\/RIOT,tdautc19841202\/RIOT,jbeyerstedt\/RIOT-OTA-update,asanka-code\/RIOT,Lotterleben\/RIOT,Lotterleben\/RIOT,backenklee\/RIOT,TobiasFredersdorf\/RIOT,automote\/RIOT,attdona\/RIOT,RubikonAlpha\/RIOT,rakendrathapa\/RIOT,roberthartung\/RIOT,tfar\/RIOT,lazytech-org\/RIOT,gebart\/RIOT,rfswarm\/RIOT,Hyungsin\/RIOT-OS,rfswarm2\/RIOT,TobiasFredersdorf\/RIOT,dkm\/RIOT,altairpearl\/RIOT,dhruvvyas90\/RIOT,immesys\/RiSyn,binarylemon\/RIOT,haoyangyu\/RIOT,ant9000\/RIOT,rfswarm2\/RIOT,shady33\/RIOT,altairpearl\/RIOT,katezilla\/RIOT,RubikonAlpha\/RIOT,abp719\/RIOT,locicontrols\/RIOT,centurysys\/RIOT,shady33\/RIOT,hamilton-mote\/RIOT-OS,authmillenon\/RIOT,jferreir\/RIOT,x3ro\/RIOT,RBartz\/RIOT,mziegert\/RIOT,kushalsingh007\/RIOT,rfswarm\/RIOT,tdautc19841202\/RIOT,phiros\/RIOT,jhollister\/RIOT,attdona\/RIOT,gebart\/RIOT,luciotorre\/RIOT,RIOT-OS\/RIOT,tfar\/RIOT,wentaoshang\/RIOT,kYc0o\/RIOT,stevenj\/RIOT,Yonezawa-T2\/RIOT,kbumsik\/RIOT,RIOT-OS\/RIOT,bartfaizoltan\/RIOT,abkam07\/RIOT,gautric\/RIOT,miri64\/RIOT,rousselk\/RIOT,jbeyerstedt\/RIOT-OTA-update,Darredevil\/RIOT,ntrtrung\/RIOT,miri64\/RIOT,kaleb-himes\/RIOT,TobiasFredersdorf\/RIOT,1blankz7\/RIOT,malosek\/RIOT,ThanhVic\/RIOT,openkosmosorg\/RIOT,neumodisch\/RIOT,Yonezawa-T2\/RIOT,miri64\/RIOT,alignan\/RIOT,brettswann\/RIOT,yogo1212\/RIOT,Josar\/RIOT,RubikonAlpha\/RIOT,kb2ma\/RIOT,avmelnikoff\/RIOT,rfswarm2\/RIOT,sgso\/RIOT,watr-li\/RIOT,kerneltask\/RIOT,l3nko\/RIOT,Darredevil\/RIOT,tfar\/RIOT,RubikonAlpha\/RIOT,DipSwitch\/RIOT,binarylemon\/RIOT,PSHIVANI\/Riot-Code,changbiao\/RIOT,luciotorre\/RIOT,khhhh\/RIOT,FrancescoErmini\/RIOT,1blankz7\/RIOT,thiagohd\/RIOT,latsku\/RIOT,rfswarm2\/RIOT,sgso\/RIOT,authmillenon\/RIOT,koenning\/RIOT,stevenj\/RIOT,yogo1212\/RIOT,attdona\/RIOT,ks156\/RIOT,jhollister\/RIOT,patkan\/RIOT,OTAkeys\/RIOT,marcosalm\/RIOT,plushvoxel\/RIOT,avmelnikoff\/RIOT,daniel-k\/RIOT,fnack\/RIOT,toonst\/RIOT,ks156\/RIOT,RBartz\/RIOT,neiljay\/RIOT,ThanhVic\/RIOT,mziegert\/RIOT,jfischer-phytec-iot\/RIOT,jferreir\/RIOT,RBartz\/RIOT,kaspar030\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/native\/syscalls.c\n+++ cpu\/native\/syscalls.c\n@@ -50,13 +50,13 @@\n void _native_syscall_enter()\n {\n _native_in_syscall++;\n- DEBUG(\"> _native_in_syscall: %d\\n\", _native_in_syscall);\n+ \/\/real_write(STDOUT_FILENO, \"> _native_in_syscall\\n\", 21);\n }\n \n void _native_syscall_leave()\n {\n+ \/\/real_write(STDOUT_FILENO, \"< _native_in_syscall\\n\", 21);\n _native_in_syscall--;\n- DEBUG(\"< _native_in_syscall: %d\\n\", _native_in_syscall);\n if (\n (_native_sigpend > 0)\n && (_native_in_isr == 0)\n"} {"commit":"21b0c52ad6c650e7640d701dd27d620981df3a6a","subject":"Use auto instead of repeating explicit class names","message":"Use auto instead of repeating explicit class names","repos":"russbishop\/swift,huonw\/swift,xedin\/swift,roambotics\/swift,ahoppen\/swift,russbishop\/swift,uasys\/swift,kperryua\/swift,frootloops\/swift,airspeedswift\/swift,ben-ng\/swift,stephentyrone\/swift,return\/swift,OscarSwanros\/swift,alblue\/swift,amraboelela\/swift,danielmartin\/swift,JaSpa\/swift,russbishop\/swift,gribozavr\/swift,Jnosh\/swift,atrick\/swift,swiftix\/swift,KrishMunot\/swift,jmgc\/swift,hooman\/swift,shajrawi\/swift,hughbe\/swift,roambotics\/swift,gmilos\/swift,xedin\/swift,shajrawi\/swift,stephentyrone\/swift,bitjammer\/swift,return\/swift,gribozavr\/swift,gribozavr\/swift,tjw\/swift,return\/swift,therealbnut\/swift,IngmarStein\/swift,djwbrown\/swift,practicalswift\/swift,tinysun212\/swift-windows,practicalswift\/swift,alblue\/swift,johnno1962d\/swift,ben-ng\/swift,jmgc\/swift,JGiola\/swift,alblue\/swift,tinysun212\/swift-windows,amraboelela\/swift,harlanhaskins\/swift,OscarSwanros\/swift,JGiola\/swift,JaSpa\/swift,johnno1962d\/swift,manavgabhawala\/swift,airspeedswift\/swift,shahmishal\/swift,deyton\/swift,deyton\/swift,tinysun212\/swift-windows,JaSpa\/swift,tjw\/swift,nathawes\/swift,russbishop\/swift,ahoppen\/swift,sschiau\/swift,huonw\/swift,roambotics\/swift,CodaFi\/swift,parkera\/swift,brentdax\/swift,Jnosh\/swift,IngmarStein\/swift,karwa\/swift,natecook1000\/swift,rudkx\/swift,Jnosh\/swift,devincoughlin\/swift,arvedviehweger\/swift,zisko\/swift,xedin\/swift,shahmishal\/swift,rudkx\/swift,uasys\/swift,milseman\/swift,austinzheng\/swift,hughbe\/swift,calebd\/swift,sschiau\/swift,austinzheng\/swift,frootloops\/swift,shajrawi\/swift,xwu\/swift,devincoughlin\/swift,tardieu\/swift,kstaring\/swift,arvedviehweger\/swift,Jnosh\/swift,JaSpa\/swift,jtbandes\/swift,glessard\/swift,xedin\/swift,swiftix\/swift,codestergit\/swift,natecook1000\/swift,roambotics\/swift,kstaring\/swift,JGiola\/swift,gmilos\/swift,gribozavr\/swift,KrishMunot\/swift,parkera\/swift,benlangmuir\/swift,jtbandes\/swift,manavgabhawala\/swift,practicalswift\/swift,gribozavr\/swift,johnno1962d\/swift,gregomni\/swift,parkera\/swift,aschwaighofer\/swift,felix91gr\/swift,djwbrown\/swift,russbishop\/swift,alblue\/swift,CodaFi\/swift,modocache\/swift,shahmishal\/swift,IngmarStein\/swift,jckarter\/swift,tjw\/swift,KrishMunot\/swift,ahoppen\/swift,arvedviehweger\/swift,therealbnut\/swift,hughbe\/swift,apple\/swift,alblue\/swift,kperryua\/swift,huonw\/swift,ken0nek\/swift,swiftix\/swift,lorentey\/swift,gottesmm\/swift,frootloops\/swift,austinzheng\/swift,alblue\/swift,felix91gr\/swift,bitjammer\/swift,brentdax\/swift,gottesmm\/swift,amraboelela\/swift,therealbnut\/swift,austinzheng\/swift,lorentey\/swift,kperryua\/swift,stephentyrone\/swift,felix91gr\/swift,codestergit\/swift,zisko\/swift,shajrawi\/swift,milseman\/swift,OscarSwanros\/swift,stephentyrone\/swift,parkera\/swift,danielmartin\/swift,shahmishal\/swift,harlanhaskins\/swift,tjw\/swift,milseman\/swift,allevato\/swift,calebd\/swift,milseman\/swift,tardieu\/swift,shahmishal\/swift,modocache\/swift,glessard\/swift,harlanhaskins\/swift,atrick\/swift,codestergit\/swift,djwbrown\/swift,jckarter\/swift,swiftix\/swift,return\/swift,huonw\/swift,johnno1962d\/swift,shajrawi\/swift,kperryua\/swift,tinysun212\/swift-windows,therealbnut\/swift,hooman\/swift,shahmishal\/swift,aschwaighofer\/swift,xwu\/swift,zisko\/swift,uasys\/swift,huonw\/swift,modocache\/swift,KrishMunot\/swift,brentdax\/swift,hughbe\/swift,codestergit\/swift,xedin\/swift,ahoppen\/swift,jmgc\/swift,jtbandes\/swift,arvedviehweger\/swift,devincoughlin\/swift,IngmarStein\/swift,devincoughlin\/swift,airspeedswift\/swift,stephentyrone\/swift,jtbandes\/swift,gmilos\/swift,ken0nek\/swift,hughbe\/swift,gottesmm\/swift,jckarter\/swift,karwa\/swift,ben-ng\/swift,benlangmuir\/swift,hooman\/swift,deyton\/swift,allevato\/swift,kstaring\/swift,ahoppen\/swift,tardieu\/swift,gribozavr\/swift,modocache\/swift,russbishop\/swift,felix91gr\/swift,jopamer\/swift,stephentyrone\/swift,JaSpa\/swift,shahmishal\/swift,swiftix\/swift,alblue\/swift,calebd\/swift,swiftix\/swift,austinzheng\/swift,karwa\/swift,airspeedswift\/swift,tjw\/swift,ken0nek\/swift,gregomni\/swift,xedin\/swift,xwu\/swift,milseman\/swift,therealbnut\/swift,CodaFi\/swift,parkera\/swift,OscarSwanros\/swift,felix91gr\/swift,tkremenek\/swift,brentdax\/swift,tkremenek\/swift,deyton\/swift,JGiola\/swift,rudkx\/swift,uasys\/swift,gottesmm\/swift,airspeedswift\/swift,return\/swift,hooman\/swift,austinzheng\/swift,calebd\/swift,frootloops\/swift,jopamer\/swift,apple\/swift,shajrawi\/swift,apple\/swift,tjw\/swift,glessard\/swift,jmgc\/swift,codestergit\/swift,tkremenek\/swift,felix91gr\/swift,kperryua\/swift,KrishMunot\/swift,devincoughlin\/swift,therealbnut\/swift,djwbrown\/swift,djwbrown\/swift,russbishop\/swift,IngmarStein\/swift,jckarter\/swift,modocache\/swift,johnno1962d\/swift,harlanhaskins\/swift,modocache\/swift,nathawes\/swift,harlanhaskins\/swift,lorentey\/swift,tardieu\/swift,tkremenek\/swift,devincoughlin\/swift,return\/swift,allevato\/swift,austinzheng\/swift,allevato\/swift,zisko\/swift,ken0nek\/swift,milseman\/swift,karwa\/swift,jmgc\/swift,ken0nek\/swift,brentdax\/swift,calebd\/swift,tkremenek\/swift,rudkx\/swift,sschiau\/swift,airspeedswift\/swift,gribozavr\/swift,ben-ng\/swift,aschwaighofer\/swift,frootloops\/swift,SwiftAndroid\/swift,tinysun212\/swift-windows,benlangmuir\/swift,ken0nek\/swift,airspeedswift\/swift,atrick\/swift,jopamer\/swift,jopamer\/swift,xedin\/swift,danielmartin\/swift,felix91gr\/swift,jtbandes\/swift,lorentey\/swift,amraboelela\/swift,OscarSwanros\/swift,lorentey\/swift,SwiftAndroid\/swift,roambotics\/swift,benlangmuir\/swift,rudkx\/swift,shajrawi\/swift,parkera\/swift,devincoughlin\/swift,SwiftAndroid\/swift,OscarSwanros\/swift,CodaFi\/swift,dreamsxin\/swift,codestergit\/swift,SwiftAndroid\/swift,OscarSwanros\/swift,danielmartin\/swift,hooman\/swift,calebd\/swift,manavgabhawala\/swift,sschiau\/swift,JGiola\/swift,tardieu\/swift,bitjammer\/swift,tinysun212\/swift-windows,JGiola\/swift,lorentey\/swift,calebd\/swift,apple\/swift,brentdax\/swift,uasys\/swift,zisko\/swift,milseman\/swift,zisko\/swift,natecook1000\/swift,gmilos\/swift,lorentey\/swift,gregomni\/swift,tinysun212\/swift-windows,huonw\/swift,dreamsxin\/swift,karwa\/swift,shajrawi\/swift,ahoppen\/swift,parkera\/swift,sschiau\/swift,manavgabhawala\/swift,arvedviehweger\/swift,ken0nek\/swift,CodaFi\/swift,glessard\/swift,IngmarStein\/swift,codestergit\/swift,gottesmm\/swift,allevato\/swift,tkremenek\/swift,amraboelela\/swift,ben-ng\/swift,natecook1000\/swift,deyton\/swift,apple\/swift,gmilos\/swift,natecook1000\/swift,gmilos\/swift,devincoughlin\/swift,natecook1000\/swift,kstaring\/swift,return\/swift,tkremenek\/swift,johnno1962d\/swift,gmilos\/swift,sschiau\/swift,jckarter\/swift,aschwaighofer\/swift,swiftix\/swift,nathawes\/swift,SwiftAndroid\/swift,hooman\/swift,xwu\/swift,djwbrown\/swift,arvedviehweger\/swift,KrishMunot\/swift,manavgabhawala\/swift,practicalswift\/swift,jtbandes\/swift,hughbe\/swift,gregomni\/swift,tardieu\/swift,sschiau\/swift,amraboelela\/swift,brentdax\/swift,aschwaighofer\/swift,kperryua\/swift,amraboelela\/swift,aschwaighofer\/swift,bitjammer\/swift,jckarter\/swift,atrick\/swift,harlanhaskins\/swift,jmgc\/swift,modocache\/swift,xedin\/swift,atrick\/swift,parkera\/swift,deyton\/swift,gottesmm\/swift,JaSpa\/swift,bitjammer\/swift,jopamer\/swift,bitjammer\/swift,gregomni\/swift,johnno1962d\/swift,benlangmuir\/swift,frootloops\/swift,ben-ng\/swift,hughbe\/swift,IngmarStein\/swift,JaSpa\/swift,gottesmm\/swift,nathawes\/swift,roambotics\/swift,aschwaighofer\/swift,frootloops\/swift,karwa\/swift,rudkx\/swift,karwa\/swift,apple\/swift,arvedviehweger\/swift,jckarter\/swift,nathawes\/swift,natecook1000\/swift,jopamer\/swift,bitjammer\/swift,Jnosh\/swift,gribozavr\/swift,jopamer\/swift,CodaFi\/swift,practicalswift\/swift,KrishMunot\/swift,danielmartin\/swift,jmgc\/swift,kperryua\/swift,tardieu\/swift,CodaFi\/swift,manavgabhawala\/swift,kstaring\/swift,huonw\/swift,hooman\/swift,danielmartin\/swift,SwiftAndroid\/swift,practicalswift\/swift,stephentyrone\/swift,xwu\/swift,danielmartin\/swift,tjw\/swift,Jnosh\/swift,SwiftAndroid\/swift,ben-ng\/swift,Jnosh\/swift,nathawes\/swift,shahmishal\/swift,zisko\/swift,nathawes\/swift,xwu\/swift,xwu\/swift,djwbrown\/swift,harlanhaskins\/swift,atrick\/swift,benlangmuir\/swift,glessard\/swift,gregomni\/swift,therealbnut\/swift,uasys\/swift,lorentey\/swift,uasys\/swift,practicalswift\/swift,kstaring\/swift,sschiau\/swift,jtbandes\/swift,kstaring\/swift,karwa\/swift,practicalswift\/swift,manavgabhawala\/swift,glessard\/swift,allevato\/swift,allevato\/swift,deyton\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/Basic\/DiverseStack.h\n+++ include\/swift\/Basic\/DiverseStack.h\n@@ -256,7 +256,7 @@\n return *this;\n }\n iterator operator++(int _) {\n- iterator copy = *this;\n+ auto copy = *this;\n operator++();\n return copy;\n }\n@@ -304,7 +304,7 @@\n return *this;\n }\n const_iterator operator++(int _) {\n- const_iterator copy = *this;\n+ auto copy = *this;\n operator++();\n return copy;\n }\n"} {"commit":"c52810df853667d1bcffbbbc3834e64e51db0a94","subject":"runtime: print g0 stack if we throw on it and GOTRACEBACK>=2.","message":"runtime: print g0 stack if we throw on it and GOTRACEBACK>=2.\n\nR=golang-dev, rsc\nCC=golang-dev\nhttps:\/\/codereview.appspot.com\/11385045\n","repos":"webfd\/go-zh,d0f\/go-zh,webfd\/go-zh,mhennings\/marcohennings-go,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,webfd\/go-zh,d0f\/go-zh,d0f\/go-zh,bryanxu\/go-zh,bryanxu\/go-zh,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,bryanxu\/go-zh,d0f\/go-zh,webfd\/go-zh,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,d0f\/go-zh,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,d0f\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,mhennings\/marcohennings-go,webfd\/go-zh,webfd\/go-zh,mhennings\/marcohennings-go,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,rdp\/rogerpack2005-golang,d0f\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/panic.c\n+++ src\/pkg\/runtime\/panic.c\n@@ -410,15 +410,19 @@\n {\n \tstatic bool didothers;\n \tbool crash;\n+\tint32 t;\n \n \tif(g->sig != 0)\n \t\truntime\u00b7printf(\"[signal %x code=%p addr=%p pc=%p]\\n\",\n \t\t\tg->sig, g->sigcode0, g->sigcode1, g->sigpc);\n \n-\tif(runtime\u00b7gotraceback(&crash)){\n+\tif((t = runtime\u00b7gotraceback(&crash)) > 0){\n \t\tif(g != m->g0) {\n \t\t\truntime\u00b7printf(\"\\n\");\n \t\t\truntime\u00b7goroutineheader(g);\n+\t\t\truntime\u00b7traceback((uintptr)runtime\u00b7getcallerpc(&unused), (uintptr)runtime\u00b7getcallersp(&unused), 0, g);\n+\t\t} else if(t >= 2) {\n+\t\t\truntime\u00b7printf(\"\\nruntime stack:\\n\");\n \t\t\truntime\u00b7traceback((uintptr)runtime\u00b7getcallerpc(&unused), (uintptr)runtime\u00b7getcallersp(&unused), 0, g);\n \t\t}\n \t\tif(!didothers) {\n"} {"commit":"c883c967dec80767749c6534945fcd8c1d6c16ff","subject":"add include files","message":"add include files\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@13200 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"YongYang86\/dealii,johntfoster\/dealii,Arezou-gh\/dealii,Arezou-gh\/dealii,nicolacavallini\/dealii,lpolster\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,jperryhouts\/dealii,gpitton\/dealii,rrgrove6\/dealii,gpitton\/dealii,JaeryunYim\/dealii,kalj\/dealii,JaeryunYim\/dealii,kalj\/dealii,angelrca\/dealii,pesser\/dealii,naliboff\/dealii,mtezzele\/dealii,kalj\/dealii,angelrca\/dealii,lue\/dealii,rrgrove6\/dealii,johntfoster\/dealii,gpitton\/dealii,mtezzele\/dealii,ibkim11\/dealii,shakirbsm\/dealii,sriharisundar\/dealii,andreamola\/dealii,EGP-CIG-REU\/dealii,jperryhouts\/dealii,natashasharma\/dealii,danshapero\/dealii,lpolster\/dealii,msteigemann\/dealii,lue\/dealii,lue\/dealii,lpolster\/dealii,natashasharma\/dealii,shakirbsm\/dealii,naliboff\/dealii,jperryhouts\/dealii,gpitton\/dealii,shakirbsm\/dealii,rrgrove6\/dealii,YongYang86\/dealii,msteigemann\/dealii,lue\/dealii,EGP-CIG-REU\/dealii,andreamola\/dealii,lue\/dealii,sriharisundar\/dealii,pesser\/dealii,natashasharma\/dealii,EGP-CIG-REU\/dealii,ibkim11\/dealii,flow123d\/dealii,mac-a\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,natashasharma\/dealii,angelrca\/dealii,danshapero\/dealii,msteigemann\/dealii,danshapero\/dealii,lue\/dealii,ibkim11\/dealii,sriharisundar\/dealii,YongYang86\/dealii,johntfoster\/dealii,spco\/dealii,msteigemann\/dealii,nicolacavallini\/dealii,natashasharma\/dealii,sairajat\/dealii,maieneuro\/dealii,ESeNonFossiIo\/dealii,gpitton\/dealii,adamkosik\/dealii,ESeNonFossiIo\/dealii,mtezzele\/dealii,msteigemann\/dealii,shakirbsm\/dealii,andreamola\/dealii,spco\/dealii,ibkim11\/dealii,flow123d\/dealii,adamkosik\/dealii,Arezou-gh\/dealii,natashasharma\/dealii,kalj\/dealii,msteigemann\/dealii,nicolacavallini\/dealii,mac-a\/dealii,jperryhouts\/dealii,pesser\/dealii,adamkosik\/dealii,ibkim11\/dealii,naliboff\/dealii,nicolacavallini\/dealii,sriharisundar\/dealii,Arezou-gh\/dealii,johntfoster\/dealii,johntfoster\/dealii,lpolster\/dealii,ibkim11\/dealii,mtezzele\/dealii,sriharisundar\/dealii,ESeNonFossiIo\/dealii,EGP-CIG-REU\/dealii,nicolacavallini\/dealii,Arezou-gh\/dealii,JaeryunYim\/dealii,sairajat\/dealii,sriharisundar\/dealii,maieneuro\/dealii,msteigemann\/dealii,angelrca\/dealii,sairajat\/dealii,angelrca\/dealii,angelrca\/dealii,adamkosik\/dealii,kalj\/dealii,sairajat\/dealii,flow123d\/dealii,mtezzele\/dealii,johntfoster\/dealii,lpolster\/dealii,JaeryunYim\/dealii,spco\/dealii,mac-a\/dealii,EGP-CIG-REU\/dealii,kalj\/dealii,JaeryunYim\/dealii,gpitton\/dealii,flow123d\/dealii,angelrca\/dealii,andreamola\/dealii,rrgrove6\/dealii,naliboff\/dealii,rrgrove6\/dealii,mac-a\/dealii,maieneuro\/dealii,naliboff\/dealii,YongYang86\/dealii,spco\/dealii,YongYang86\/dealii,maieneuro\/dealii,danshapero\/dealii,adamkosik\/dealii,JaeryunYim\/dealii,spco\/dealii,jperryhouts\/dealii,lpolster\/dealii,danshapero\/dealii,mac-a\/dealii,natashasharma\/dealii,mtezzele\/dealii,nicolacavallini\/dealii,ibkim11\/dealii,YongYang86\/dealii,sriharisundar\/dealii,andreamola\/dealii,mac-a\/dealii,pesser\/dealii,maieneuro\/dealii,YongYang86\/dealii,danshapero\/dealii,gpitton\/dealii,pesser\/dealii,jperryhouts\/dealii,danshapero\/dealii,shakirbsm\/dealii,mtezzele\/dealii,ESeNonFossiIo\/dealii,mac-a\/dealii,kalj\/dealii,naliboff\/dealii,jperryhouts\/dealii,nicolacavallini\/dealii,sairajat\/dealii,Arezou-gh\/dealii,andreamola\/dealii,pesser\/dealii,sairajat\/dealii,flow123d\/dealii,pesser\/dealii,johntfoster\/dealii,ESeNonFossiIo\/dealii,rrgrove6\/dealii,JaeryunYim\/dealii,EGP-CIG-REU\/dealii,adamkosik\/dealii,adamkosik\/dealii,ESeNonFossiIo\/dealii,Arezou-gh\/dealii,spco\/dealii,flow123d\/dealii,sairajat\/dealii,maieneuro\/dealii,flow123d\/dealii,andreamola\/dealii,lpolster\/dealii,maieneuro\/dealii,rrgrove6\/dealii,naliboff\/dealii,spco\/dealii,lue\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/deal.II\/include\/fe\/fe_poly.templates.h\n+++ deal.II\/deal.II\/include\/fe\/fe_poly.templates.h\n@@ -11,6 +11,8 @@\n \/\/\n \/\/---------------------------------------------------------------------------\n \n+#include <base\/qprojector.h>\n+#include <fe\/fe_values.h>\n \n template <class POLY, int dim>\n FE_Poly<POLY,dim>::FE_Poly (const POLY& poly_space,\n"} {"commit":"333e63d645497c3ac6bcaf6dfc4fcd9a69225c82","subject":"Header fixes, C++ bools","message":"Header fixes, C++ bools\n\n\ngit-svn-id: 7e36d3665aeca4d4e1f6df8911a80efc6ef565e7@42 1f79f812-37fb-46fe-a122-30589dd2bf55\n","repos":"ronys\/pwsafe-test,sorinAche23\/Psafe,sorinAche23\/Psafe,Sp1l\/pwsafe,sorinAche23\/Psafe,ronys\/pwsafe-test,Sp1l\/pwsafe,sorinAche23\/Psafe,gpmidi\/pwsafe,sorinAche23\/Psafe,Sp1l\/pwsafe,ronys\/pwsafe-test,gpmidi\/pwsafe,Sp1l\/pwsafe,ronys\/pwsafe-test,gpmidi\/pwsafe,sorinAche23\/Psafe,ronys\/pwsafe-test,ronys\/pwsafe-test,sorinAche23\/Psafe,gpmidi\/pwsafe,Sp1l\/pwsafe,Sp1l\/pwsafe,Sp1l\/pwsafe,ronys\/pwsafe-test,Sp1l\/pwsafe,sorinAche23\/Psafe,ronys\/pwsafe-test,gpmidi\/pwsafe,gpmidi\/pwsafe,gpmidi\/pwsafe,gpmidi\/pwsafe","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- pwsafe\/pwsafe\/PasskeyEntry.h\n+++ pwsafe\/pwsafe\/PasskeyEntry.h\n@@ -2,6 +2,7 @@\n \/\/-----------------------------------------------------------------------------\n \n #include \"SysColStatic.h\"\n+#include \"MyString.h\"\n \n \/\/-----------------------------------------------------------------------------\n class CPasskeyEntry\n@@ -11,13 +12,15 @@\n public:\n CPasskeyEntry(CWnd* pParent,\n const CString& a_filespec,\n- BOOL first = FALSE); \n+ bool first = false); \n \n- int GetCancelReturnValue();\n+ int GetStatus()\n+ { return m_status; }\n \n \/\/ Dialog Data\n \/\/{{AFX_DATA(CPasskeyEntry)\n- enum { IDD = IDD_PASSKEYENTRY, IDDFIRST = IDD_PASSKEYENTRY_FIRST };\n+ enum { IDD = IDD_PASSKEYENTRY,\n+ IDDFIRST = IDD_PASSKEYENTRY_FIRST };\n CMyString\tm_passkey;\n \/\/}}AFX_DATA\n CString\tm_message;\n@@ -26,15 +29,15 @@\n \/\/ ClassWizard generated virtual function overrides\n \/\/{{AFX_VIRTUAL(CPasskeyEntry)\n protected:\n- virtual void DoDataExchange(CDataExchange* pDX); \/\/ DDX\/DDV support\n+ virtual void DoDataExchange(CDataExchange* pDX);\n \/\/}}AFX_VIRTUAL\n \n \/\/ Implementation\n protected:\n CSysColStatic m_Static,m_Static2,m_Static3;\n- int numtimes;\n- int tryagainreturnval;\n- BOOL m_first;\n+ int m_tries;\n+ int m_status;\n+ bool m_first;\n \n \/\/ Generated message map functions\n \/\/{{AFX_MSG(CPasskeyEntry)\n"} {"commit":"8f83f19137412af0df125a29b6ba632dfb706792","subject":"[gardening] Fix recently introduced typo: \"metadat\" \u2192 \"metadata\"","message":"[gardening] Fix recently introduced typo: \"metadat\" \u2192 \"metadata\"\n","repos":"khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/Reflection\/TypeRef.h\n+++ include\/swift\/Reflection\/TypeRef.h\n@@ -70,7 +70,7 @@\n template <typename Runtime>\n TypeRefPointer\n substituteGenerics(ReflectionContext<Runtime> &RC,\n- typename Runtime::StoredPointer MetadatAddress);\n+ typename Runtime::StoredPointer MetadataAddress);\n static TypeRefPointer fromDemangleNode(Demangle::NodePointer Node);\n };\n \n"} {"commit":"b09175151249b3c407322170bf2a7c6f98fe7e0b","subject":"3DS: Drastically improve sound","message":"3DS: Drastically improve sound\n","repos":"libretro\/mgba,askotx\/mgba,fr500\/mgba,libretro\/mgba,fr500\/mgba,Anty-Lemon\/mgba,Touched\/mgba,jeremyherbert\/mgba,sergiobenrocha2\/mgba,iracigt\/mgba,AdmiralCurtiss\/mgba,libretro\/mgba,cassos\/mgba,sergiobenrocha2\/mgba,sergiobenrocha2\/mgba,askotx\/mgba,Touched\/mgba,MerryMage\/mgba,iracigt\/mgba,sergiobenrocha2\/mgba,MerryMage\/mgba,Anty-Lemon\/mgba,jeremyherbert\/mgba,cassos\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,mgba-emu\/mgba,fr500\/mgba,mgba-emu\/mgba,Iniquitatis\/mgba,iracigt\/mgba,Iniquitatis\/mgba,cassos\/mgba,iracigt\/mgba,libretro\/mgba,AdmiralCurtiss\/mgba,Iniquitatis\/mgba,askotx\/mgba,askotx\/mgba,Touched\/mgba,libretro\/mgba,jeremyherbert\/mgba,fr500\/mgba,AdmiralCurtiss\/mgba,mgba-emu\/mgba,jeremyherbert\/mgba,Anty-Lemon\/mgba,sergiobenrocha2\/mgba,Anty-Lemon\/mgba,MerryMage\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/platform\/3ds\/main.c\n+++ src\/platform\/3ds\/main.c\n@@ -18,7 +18,8 @@\n #include <3ds.h>\n #include <sf2d.h>\n \n-#define AUDIO_SAMPLES 0x800\n+#define AUDIO_SAMPLES 0x80\n+#define AUDIO_SAMPLE_BUFFER (AUDIO_SAMPLES * 32)\n \n FS_archive sdmcArchive;\n \n@@ -35,6 +36,7 @@\n static struct GBAAVStream stream;\n static int16_t* audioLeft = 0;\n static int16_t* audioRight = 0;\n+static size_t audioPos = 0;\n static sf2d_texture* tex;\n \n extern bool allocateRomBuffer(void);\n@@ -81,13 +83,16 @@\n \t}\n \n #if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF\n-\tdouble ratio = GBAAudioCalculateRatio(1, 60, 1);\n-\tblip_set_rates(runner->context.gba->audio.left, GBA_ARM7TDMI_FREQUENCY, 0x8000 * ratio);\n-\tblip_set_rates(runner->context.gba->audio.right, GBA_ARM7TDMI_FREQUENCY, 0x8000 * ratio);\n+\tdouble ratio = GBAAudioCalculateRatio(1, 59.826, 1);\n+\tblip_set_rates(runner->context.gba->audio.left, GBA_ARM7TDMI_FREQUENCY, 44100 * ratio);\n+\tblip_set_rates(runner->context.gba->audio.right, GBA_ARM7TDMI_FREQUENCY, 44100 * ratio);\n #endif\n \tif (hasSound) {\n-\t\tmemset(audioLeft, 0, AUDIO_SAMPLES * sizeof(int16_t));\n-\t\tmemset(audioRight, 0, AUDIO_SAMPLES * sizeof(int16_t));\n+\t\tmemset(audioLeft, 0, AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n+\t\tmemset(audioRight, 0, AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n+\t\taudioPos = 0;\n+\t\tcsndPlaySound(0x8, SOUND_REPEAT | SOUND_FORMAT_16BIT, 44100, 1.0, -1.0, audioLeft, audioLeft, AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n+\t\tcsndPlaySound(0x9, SOUND_REPEAT | SOUND_FORMAT_16BIT, 44100, 1.0, 1.0, audioRight, audioRight, AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n \t}\n }\n \n@@ -184,21 +189,24 @@\n \n static void _postAudioBuffer(struct GBAAVStream* stream, struct GBAAudio* audio) {\n \tUNUSED(stream);\n-\tmemset(audioLeft, 0, AUDIO_SAMPLES * sizeof(int16_t));\n-\tmemset(audioRight, 0, AUDIO_SAMPLES * sizeof(int16_t));\n #if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF\n-\tblip_read_samples(audio->left, audioLeft, AUDIO_SAMPLES, false);\n-\tblip_read_samples(audio->right, audioRight, AUDIO_SAMPLES, false);\n+\tblip_read_samples(audio->left, &audioLeft[audioPos], AUDIO_SAMPLES, false);\n+\tblip_read_samples(audio->right, &audioRight[audioPos], AUDIO_SAMPLES, false);\n #elif RESAMPLE_LIBRARY == RESAMPLE_NN\n-\tGBAAudioCopy(audio, audioLeft, audioRight, AUDIO_SAMPLES);\n+\tGBAAudioCopy(audio, &audioLeft[audioPos], &audioRight[audioPos], AUDIO_SAMPLES);\n #endif\n-\tGSPGPU_FlushDataCache(0, (void*) audioLeft, AUDIO_SAMPLES * sizeof(int16_t));\n-\tGSPGPU_FlushDataCache(0, (void*) audioRight, AUDIO_SAMPLES * sizeof(int16_t));\n-\tcsndPlaySound(0x8, SOUND_ONE_SHOT | SOUND_FORMAT_16BIT, 0x8000, 1.0, -1.0, audioLeft, audioLeft, AUDIO_SAMPLES * sizeof(int16_t));\n-\tcsndPlaySound(0x9, SOUND_ONE_SHOT | SOUND_FORMAT_16BIT, 0x8000, 1.0, 1.0, audioRight, audioRight, AUDIO_SAMPLES * sizeof(int16_t));\n-\tCSND_SetPlayState(0x8, 1);\n-\tCSND_SetPlayState(0x9, 1);\n-\tcsndExecCmds(false);\n+\tGSPGPU_FlushDataCache(0, (void*) &audioLeft[audioPos], AUDIO_SAMPLES * sizeof(int16_t));\n+\tGSPGPU_FlushDataCache(0, (void*) &audioRight[audioPos], AUDIO_SAMPLES * sizeof(int16_t));\n+\taudioPos = (audioPos + AUDIO_SAMPLES) % AUDIO_SAMPLE_BUFFER;\n+\tif (audioPos == AUDIO_SAMPLE_BUFFER \/ 2) {\n+\t\tu8 playing = 0;\n+\t\tcsndIsPlaying(0x8, &playing);\n+\t\tif (!playing) {\n+\t\t\tCSND_SetPlayState(0x8, 1);\n+\t\t\tCSND_SetPlayState(0x9, 1);\n+\t\t\tcsndExecCmds(false);\n+\t\t}\n+\t}\n }\n \n int main() {\n@@ -218,8 +226,8 @@\n \t}\n \n \tif (hasSound) {\n-\t\taudioLeft = linearAlloc(AUDIO_SAMPLES * sizeof(int16_t));\n-\t\taudioRight = linearAlloc(AUDIO_SAMPLES * sizeof(int16_t));\n+\t\taudioLeft = linearAlloc(AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n+\t\taudioRight = linearAlloc(AUDIO_SAMPLE_BUFFER * sizeof(int16_t));\n \t}\n \n \tsf2d_init();\n"} {"commit":"fde9825658e9ec97c4b5e756639f04e0526ac08c","subject":"Add CastBranchInstBase::SuccessorPath for easier factoring.","message":"Add CastBranchInstBase::SuccessorPath for easier factoring.\n\nCode that handles checked_cast_br can not be factored easily without\ncoding separate paths for each successor.\n","repos":"glessard\/swift,benlangmuir\/swift,JGiola\/swift,ahoppen\/swift,ahoppen\/swift,xwu\/swift,roambotics\/swift,roambotics\/swift,gregomni\/swift,rudkx\/swift,atrick\/swift,benlangmuir\/swift,atrick\/swift,apple\/swift,roambotics\/swift,ahoppen\/swift,benlangmuir\/swift,atrick\/swift,JGiola\/swift,rudkx\/swift,xwu\/swift,gregomni\/swift,atrick\/swift,ahoppen\/swift,xwu\/swift,gregomni\/swift,apple\/swift,gregomni\/swift,rudkx\/swift,glessard\/swift,gregomni\/swift,xwu\/swift,rudkx\/swift,rudkx\/swift,apple\/swift,roambotics\/swift,atrick\/swift,rudkx\/swift,roambotics\/swift,roambotics\/swift,glessard\/swift,atrick\/swift,xwu\/swift,benlangmuir\/swift,gregomni\/swift,xwu\/swift,JGiola\/swift,benlangmuir\/swift,glessard\/swift,glessard\/swift,glessard\/swift,apple\/swift,apple\/swift,xwu\/swift,JGiola\/swift,benlangmuir\/swift,JGiola\/swift,ahoppen\/swift,JGiola\/swift,ahoppen\/swift,apple\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/SIL\/SILInstruction.h\n+++ include\/swift\/SIL\/SILInstruction.h\n@@ -8767,10 +8767,13 @@\n \n TermInst::SuccessorListTy getSuccessors() { return DestBBs; }\n \n- SILBasicBlock *getSuccessBB() { return DestBBs[0]; }\n- const SILBasicBlock *getSuccessBB() const { return DestBBs[0]; }\n- SILBasicBlock *getFailureBB() { return DestBBs[1]; }\n- const SILBasicBlock *getFailureBB() const { return DestBBs[1]; }\n+ \/\/ Enumerate the successor indices\n+ enum SuccessorPath { SuccessIdx = 0, FailIdx = 1};\n+\n+ SILBasicBlock *getSuccessBB() { return DestBBs[SuccessIdx]; }\n+ const SILBasicBlock *getSuccessBB() const { return DestBBs[SuccessIdx]; }\n+ SILBasicBlock *getFailureBB() { return DestBBs[FailIdx]; }\n+ const SILBasicBlock *getFailureBB() const { return DestBBs[FailIdx]; }\n \n \/\/\/ The number of times the True branch was executed\n ProfileCounter getTrueBBCount() const { return DestBBs[0].getCount(); }\n"} {"commit":"f01777fdfcbc3ecf202a4c8b1bb920cbf7169692","subject":"MYNEWT-401: HAL Timer","message":"MYNEWT-401: HAL Timer\n\nThe hal timer for the samd21 needs to be disabled in init. This\nis in case it was previously enabled by something (bootloader).\n","repos":"runtimeinc\/mynewt_arduino_zero,runtimeinc\/mynewt_arduino_zero,runtimeinc\/mynewt_arduino_zero","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/mcu\/atmel\/samd21xx\/src\/hal_timer.c\n+++ hw\/mcu\/atmel\/samd21xx\/src\/hal_timer.c\n@@ -361,6 +361,8 @@\n NVIC_DisableIRQ(irq_num);\n NVIC_SetPriority(irq_num, (1 << __NVIC_PRIO_BITS) - 1);\n NVIC_SetVector(irq_num, (uint32_t)irq_isr);\n+\n+ tc_disable(&bsptimer->tc_mod);\n \n return 0;\n \n"} {"commit":"39230ca9acbf63224aadf43e030bfa7b95264181","subject":"Wii: Fix modes for non-NTSC TVs","message":"Wii: Fix modes for non-NTSC TVs\n","repos":"iracigt\/mgba,Anty-Lemon\/mgba,sergiobenrocha2\/mgba,jeremyherbert\/mgba,sergiobenrocha2\/mgba,iracigt\/mgba,mgba-emu\/mgba,mgba-emu\/mgba,jeremyherbert\/mgba,fr500\/mgba,Anty-Lemon\/mgba,Anty-Lemon\/mgba,MerryMage\/mgba,iracigt\/mgba,fr500\/mgba,Anty-Lemon\/mgba,jeremyherbert\/mgba,libretro\/mgba,MerryMage\/mgba,libretro\/mgba,Iniquitatis\/mgba,jeremyherbert\/mgba,sergiobenrocha2\/mgba,sergiobenrocha2\/mgba,sergiobenrocha2\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,libretro\/mgba,iracigt\/mgba,fr500\/mgba,libretro\/mgba,fr500\/mgba,MerryMage\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,libretro\/mgba,Iniquitatis\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/platform\/wii\/main.c\n+++ src\/platform\/wii\/main.c\n@@ -123,19 +123,52 @@\n \twAdjust = 1.f;\n \thAdjust = 1.f;\n \n+\ts32 signalMode = CONF_GetVideo();\n+\n \tswitch (videoMode) {\n \tcase VM_AUTODETECT:\n \tdefault:\n \t\tvmode = VIDEO_GetPreferredMode(0);\n \t\tbreak;\n \tcase VM_480i:\n-\t\tvmode = &TVNtsc480Int;\n+\t\tswitch (signalMode) {\n+\t\tcase CONF_VIDEO_NTSC:\n+\t\t\tvmode = &TVNtsc480IntDf;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_MPAL:\n+\t\t\tvmode = &TVMpal480IntDf;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_PAL:\n+\t\t\tvmode = &TVEurgb60Hz480IntDf;\n+\t\t\tbreak;\n+\t\t}\n \t\tbreak;\n \tcase VM_480p:\n-\t\tvmode = &TVNtsc480Prog;\n+\t\tswitch (signalMode) {\n+\t\tcase CONF_VIDEO_NTSC:\n+\t\t\tvmode = &TVNtsc480Prog;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_MPAL:\n+\t\t\tvmode = &TVMpal480Prog;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_PAL:\n+\t\t\tvmode = &TVEurgb60Hz480Prog;\n+\t\t\tbreak;\n+\t\t}\n \t\tbreak;\n \tcase VM_240p:\n-\t\tvmode = &TVNtsc240Ds;\n+\t\tswitch (signalMode) {\n+\t\tcase CONF_VIDEO_NTSC:\n+\t\t\tvmode = &TVNtsc240Ds;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_MPAL:\n+\t\t\tvmode = &TVMpal240Ds;\n+\t\t\tbreak;\n+\t\tcase CONF_VIDEO_PAL:\n+\t\t\tvmode = &TVEurgb60Hz240Ds;\n+\t\t\tbreak;\n+\t\t}\n+\t\tbreak;\n \t\twAdjust = 0.5f;\n \t\tbreak;\n \t}\n"} {"commit":"7bc027d73bc51cfa0ae23fbfd91134be9464d694","subject":"Fallback to legacy pem decoding if OSSL_DECODER fails","message":"Fallback to legacy pem decoding if OSSL_DECODER fails\n\nReviewed-by: Paul Dale <ddec78389666b4f7c9b4d110380c848489a3e4aa@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/15045)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/pem\/pem_pkey.c\n+++ crypto\/pem\/pem_pkey.c\n@@ -28,10 +28,11 @@\n \n int ossl_pem_check_suffix(const char *pem_str, const char *suffix);\n \n-static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,\n- pem_password_cb *cb, void *u,\n- OSSL_LIB_CTX *libctx, const char *propq,\n- int selection)\n+static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,\n+ pem_password_cb *cb, void *u,\n+ OSSL_LIB_CTX *libctx,\n+ const char *propq,\n+ int selection)\n {\n EVP_PKEY *pkey = NULL;\n OSSL_DECODER_CTX *dctx = NULL;\n@@ -67,6 +68,151 @@\n err:\n OSSL_DECODER_CTX_free(dctx);\n return pkey;\n+}\n+\n+static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,\n+ pem_password_cb *cb, void *u,\n+ OSSL_LIB_CTX *libctx,\n+ const char *propq,\n+ int selection)\n+{\n+ char *nm = NULL;\n+ const unsigned char *p = NULL;\n+ unsigned char *data = NULL;\n+ long len;\n+ int slen;\n+ EVP_PKEY *ret = NULL;\n+\n+ ERR_set_mark(); \/* not interested in PEM read errors *\/\n+ if (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) {\n+ if (!PEM_bytes_read_bio_secmem(&data, &len, &nm,\n+ PEM_STRING_EVP_PKEY,\n+ bp, cb, u)) {\n+ ERR_pop_to_mark();\n+ return NULL;\n+ }\n+ } else {\n+ const char *pem_string = PEM_STRING_PARAMETERS;\n+\n+ if (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY)\n+ pem_string = PEM_STRING_PUBLIC;\n+ if (!PEM_bytes_read_bio(&data, &len, &nm,\n+ pem_string,\n+ bp, cb, u)) {\n+ ERR_pop_to_mark();\n+ return NULL;\n+ }\n+ }\n+ ERR_clear_last_mark();\n+ p = data;\n+\n+ if (strcmp(nm, PEM_STRING_PKCS8INF) == 0) {\n+ PKCS8_PRIV_KEY_INFO *p8inf;\n+\n+ if ((p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len)) == NULL)\n+ goto p8err;\n+ ret = evp_pkcs82pkey_legacy(p8inf, libctx, propq);\n+ if (x != NULL) {\n+ EVP_PKEY_free(*x);\n+ *x = ret;\n+ }\n+ PKCS8_PRIV_KEY_INFO_free(p8inf);\n+ } else if (strcmp(nm, PEM_STRING_PKCS8) == 0) {\n+ PKCS8_PRIV_KEY_INFO *p8inf;\n+ X509_SIG *p8;\n+ int klen;\n+ char psbuf[PEM_BUFSIZE];\n+\n+ if ((p8 = d2i_X509_SIG(NULL, &p, len)) == NULL)\n+ goto p8err;\n+ if (cb != NULL)\n+ klen = cb(psbuf, PEM_BUFSIZE, 0, u);\n+ else\n+ klen = PEM_def_callback(psbuf, PEM_BUFSIZE, 0, u);\n+ if (klen < 0) {\n+ ERR_raise(ERR_LIB_PEM, PEM_R_BAD_PASSWORD_READ);\n+ X509_SIG_free(p8);\n+ goto err;\n+ }\n+ p8inf = PKCS8_decrypt(p8, psbuf, klen);\n+ X509_SIG_free(p8);\n+ OPENSSL_cleanse(psbuf, klen);\n+ if (p8inf == NULL)\n+ goto p8err;\n+ ret = evp_pkcs82pkey_legacy(p8inf, libctx, propq);\n+ if (x != NULL) {\n+ EVP_PKEY_free(*x);\n+ *x = ret;\n+ }\n+ PKCS8_PRIV_KEY_INFO_free(p8inf);\n+ } else if ((slen = ossl_pem_check_suffix(nm, \"PRIVATE KEY\")) > 0) {\n+ const EVP_PKEY_ASN1_METHOD *ameth;\n+ ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);\n+ if (ameth == NULL || ameth->old_priv_decode == NULL)\n+ goto p8err;\n+ ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);\n+ } else if (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) {\n+ ret = d2i_PUBKEY(x, &p, len);\n+ } else if ((slen = ossl_pem_check_suffix(nm, \"PARAMETERS\")) > 0) {\n+ ret = EVP_PKEY_new();\n+ if (ret == NULL)\n+ goto err;\n+ if (!EVP_PKEY_set_type_str(ret, nm, slen)\n+ || !ret->ameth->param_decode\n+ || !ret->ameth->param_decode(ret, &p, len)) {\n+ EVP_PKEY_free(ret);\n+ ret = NULL;\n+ goto err;\n+ }\n+ if (x) {\n+ EVP_PKEY_free(*x);\n+ *x = ret;\n+ }\n+ }\n+\n+ p8err:\n+ if (ret == NULL)\n+ ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);\n+ err:\n+ OPENSSL_secure_free(nm);\n+ OPENSSL_secure_clear_free(data, len);\n+ return ret;\n+}\n+\n+static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,\n+ pem_password_cb *cb, void *u,\n+ OSSL_LIB_CTX *libctx,\n+ const char *propq,\n+ int selection)\n+{\n+ EVP_PKEY *ret;\n+ BIO *new_bio = NULL;\n+ int pos;\n+\n+ if ((pos = BIO_tell(bp)) < 0) {\n+ new_bio = BIO_new(BIO_f_readbuffer());\n+ if (new_bio == NULL)\n+ return NULL;\n+ bp = BIO_push(new_bio, bp);\n+ pos = BIO_tell(bp);\n+ }\n+\n+ ERR_set_mark();\n+ ret = pem_read_bio_key_decoder(bp, x, cb, u, libctx, propq, selection);\n+ if (ret == NULL\n+ && (BIO_seek(bp, pos) < 0\n+ || (ret = pem_read_bio_key_legacy(bp, x, cb, u,\n+ libctx, propq,\n+ selection)) == NULL))\n+ ERR_clear_last_mark();\n+ else\n+ ERR_pop_to_mark();\n+\n+ if (new_bio != NULL) {\n+ BIO_pop(new_bio);\n+ BIO_free(new_bio);\n+ }\n+ return ret;\n }\n \n EVP_PKEY *PEM_read_bio_PUBKEY_ex(BIO *bp, EVP_PKEY **x,\n"} {"commit":"0a501c1645b3f2e28944ee29bf1c45ffdd5c21cd","subject":"v4l: Fix conflicting values of two controls","message":"v4l: Fix conflicting values of two controls\n\nDue to an errant conflict resolution, V4L2_CID_MPEG_VIDC_VIDEO_H264_\\\nVUI_TIMING_INFO and V4L2_CID_MPEG_VIDC_VIDEO_SYNC_FRAME_DECODE share\nthe same constant value. This commit assigns a new constant to\nVUI_TIMING_INFO.\n\nChange-Id: I34170dc1e5de9d5d0ff37d56112cf2b59ea7eefc\nSigned-off-by: Deva Ramasubramanian <8f8b6109cd5e7b75746932bf5dcf69e763e1f0b2@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/uapi\/linux\/v4l2-controls.h\n+++ include\/uapi\/linux\/v4l2-controls.h\n@@ -735,12 +735,6 @@\n \tV4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO,\n \tV4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP\n };\n-#define V4L2_CID_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO \\\n-\t\t(V4L2_CID_MPEG_MSM_VIDC_BASE + 23)\n-enum v4l2_mpeg_vidc_video_h264_vui_timing_info {\n-\tV4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_DISABLED = 0,\n-\tV4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_ENABLED = 1\n-};\n \n #define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26)\n enum v4l2_mpeg_vidc_perf_level {\n@@ -749,9 +743,17 @@\n \tV4L2_CID_MPEG_VIDC_PERF_LEVEL_TURBO\t\t\t= 2,\n };\n #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_GOB\t\t\\\n-\t(V4L2_CID_MPEG_MSM_VIDC_BASE+27)\n+\t\t(V4L2_CID_MPEG_MSM_VIDC_BASE + 27)\n+\n #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_DELIVERY_MODE\t\\\n-\t(V4L2_CID_MPEG_MSM_VIDC_BASE+28)\n+\t(V4L2_CID_MPEG_MSM_VIDC_BASE + 28)\n+\n+#define V4L2_CID_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO \\\n+\t\t(V4L2_CID_MPEG_MSM_VIDC_BASE + 29)\n+enum v4l2_mpeg_vidc_video_h264_vui_timing_info {\n+\tV4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_DISABLED = 0,\n+\tV4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_ENABLED = 1\n+};\n \/* Camera class control IDs *\/\n \n #define V4L2_CID_CAMERA_CLASS_BASE \t(V4L2_CTRL_CLASS_CAMERA | 0x900)\n"} {"commit":"5256537a84b95a29d7fb443ecd0add79b2ba4f3d","subject":"fixed class comment","message":"fixed class comment\n\nSigned-off-by: Jeff Wolski <940778aa76d12690778953312fced6caa237989a@gmail.com>\n","repos":"ActiveStack\/active-client-sdk-objc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- client-library\/model\/RemoveRequest.h\n+++ client-library\/model\/RemoveRequest.h\n@@ -4,7 +4,7 @@\n \/\/\n \/\/ Created by Jeff Wolski on 3\/26\/13.\n \/\/\n-\/\/ The client will use this class to initiate the deletion of an object from the system.\n+\/\/ Use this class to initiate the deletion of an object from the system.\n \n #import \"SyncRequest.h\"\n #import \"ClassIDPair.h\"\n"} {"commit":"2900b14b11648da2d749ad254175a19ac041a599","subject":"Adapt ssl_client2 to parse DER encoded test CRTs if PEM is disabled","message":"Adapt ssl_client2 to parse DER encoded test CRTs if PEM is disabled\n","repos":"NXPmicro\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- programs\/ssl\/ssl_client2.c\n+++ programs\/ssl\/ssl_client2.c\n@@ -1511,6 +1511,8 @@\n else\n #endif\n #if defined(MBEDTLS_CERTS_C)\n+ {\n+#if defined(MBEDTLS_PEM_PARSE_C)\n for( i = 0; mbedtls_test_cas[i] != NULL; i++ )\n {\n ret = mbedtls_x509_crt_parse( &cacert,\n@@ -1519,12 +1521,23 @@\n if( ret != 0 )\n break;\n }\n+ if( ret == 0 )\n+#endif \/* MBEDTLS_PEM_PARSE_C *\/\n+ for( i = 0; mbedtls_test_cas_der[i] != NULL; i++ )\n+ {\n+ ret = mbedtls_x509_crt_parse_der( &cacert,\n+ (const unsigned char *) mbedtls_test_cas_der[i],\n+ mbedtls_test_cas_der_len[i] );\n+ if( ret != 0 )\n+ break;\n+ }\n+ }\n #else\n {\n ret = 1;\n mbedtls_printf( \"MBEDTLS_CERTS_C not defined.\" );\n }\n-#endif\n+#endif \/* MBEDTLS_CERTS_C *\/\n if( ret < 0 )\n {\n mbedtls_printf( \" failed\\n ! mbedtls_x509_crt_parse returned -0x%x\\n\\n\",\n"} {"commit":"2375791ac4069a968a83a7eecff640c82bfeb9f8","subject":"Less includes","message":"Less includes\n","repos":"szellmann\/visionaray,szellmann\/visionaray","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/visionaray\/result_record.h\n+++ include\/visionaray\/result_record.h\n@@ -6,7 +6,8 @@\n #ifndef VSNRAY_RESULT_RECORD_H\n #define VSNRAY_RESULT_RECORD_H 1\n \n-#include \"math\/math.h\"\n+#include \"math\/simd\/type_traits.h\"\n+#include \"math\/vector.h\"\n \n namespace visionaray\n {\n"} {"commit":"c43d637345f8b90d247426b26980926195601621","subject":"BUG(2007): Prevent most jack output underruns and failures","message":"BUG(2007): Prevent most jack output underruns and failures\n\nThis patch makes use of the xmms_output_bytes_available function to\ncheck if enough bytes are in the output buffer to run the jack callback.\nIf not it will fill the buffer with silence. This fixes most but not all\ncases of jack underuns and hangups.\n\nIncrease the buffersize to handle up to 4096 frame periods in one\nread. Start the port numbers at one instead of zero as starting at\none is generally convention. When an underrun happens, count it and\nprint it.\n","repos":"six600110\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,six600110\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,chrippa\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,six600110\/xmms2,chrippa\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,xmms2\/xmms2-stable,chrippa\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,xmms2\/xmms2-stable,six600110\/xmms2,krad-radio\/xmms2-krad,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/jack\/jack.c\n+++ src\/plugins\/jack\/jack.c\n@@ -40,6 +40,7 @@\n \tgint chunksiz;\n \tgboolean error;\n \tgboolean running;\n+\tguint underruns;\n } xmms_jack_data_t;\n \n \n@@ -116,7 +117,7 @@\n \n \tfor (i = 0; i < CHANNELS; i++) {\n \t\tgchar name[16];\n-\t\tg_snprintf (name, sizeof (name), \"out_%d\", i);\n+\t\tg_snprintf (name, sizeof (name), \"out_%d\", i + 1);\n \t\tdata->ports[i] = jack_port_register (data->jack, name,\n \t\t JACK_DEFAULT_AUDIO_TYPE,\n \t\t (JackPortIsOutput |\n@@ -143,6 +144,8 @@\n \n \tg_return_val_if_fail (output, FALSE);\n \tdata = g_new0 (xmms_jack_data_t, 1);\n+\n+\tdata->underruns = 0;\n \n \txmms_output_private_data_set (output, data);\n \n@@ -254,7 +257,7 @@\n \txmms_output_t *output = (xmms_output_t*) arg;\n \txmms_jack_data_t *data;\n \txmms_samplefloat_t *buf[CHANNELS];\n-\txmms_samplefloat_t tbuf[CHANNELS*1024];\n+\txmms_samplefloat_t tbuf[CHANNELS*4096];\n \tgint i, j, res, toread;\n \n \tg_return_val_if_fail (output, -1);\n@@ -269,16 +272,28 @@\n \n \tif (data->running) {\n \t\twhile (toread) {\n-\t\t\tgint t;\n+\t\t\tgint t, avail;\n \n \t\t\tt = MIN (toread * CHANNELS * sizeof (xmms_samplefloat_t),\n \t\t\t sizeof (tbuf));\n \n+\t\t\tavail = xmms_output_bytes_available (output);\n+\n+\t\t\tif (avail < t) {\n+\t\t\t\tdata->underruns++;\n+\t\t\t\tXMMS_DBG (\"jack output underun number %d! Not enough bytes available. Wanted: %d Available: %d\", data->underruns, t, avail);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n \t\t\tres = xmms_output_read (output, (gchar *)tbuf, t);\n \n \t\t\tif (res <= 0) {\n-\t\t\t\tXMMS_DBG (\"output_read returned %d\", res);\n+\t\t\t\tXMMS_DBG (\"Output read returned %d unexpectedly\", res);\n \t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\tif (res < t) {\n+\t\t\t\tXMMS_DBG (\"Less bytes read than expected. (Probably a ringbuffer hotspot)\");\n \t\t\t}\n \n \t\t\tres \/= CHANNELS * sizeof (xmms_samplefloat_t);\n"} {"commit":"2883219edbb54d02d2954d8fec43b820e64a0b48","subject":"Improve output message","message":"Improve output message\n\nSigned-off-by: Jerry Yu <c6cd1413a9492a82cc7fe506fb3a273f7dc9927d@arm.com>\n","repos":"Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- programs\/ssl\/ssl_client2.c\n+++ programs\/ssl\/ssl_client2.c\n@@ -2241,7 +2241,7 @@\n \"to an appropriate value.\\n\"\n \" Alternatively, you may want to use \"\n \"auth_mode=optional for testing purposes if \"\n- \"server is not TLS 1.3.\\n\"\n+ \"not using TLS 1.3.\\n\"\n \" For TLS 1.3 server, try `ca_path=\/etc\/ssl\/certs\/`\"\n \"or other folder that has root certificates\\n\" );\n mbedtls_printf( \"\\n\" );\n"} {"commit":"24c397dbf888e9dc8a8b5ce4010f34eeb9158881","subject":"viewporter: add doc comment explaining compositor requirements","message":"viewporter: add doc comment explaining compositor requirements\n","repos":"SirCmpwn\/wlroots,swaywm\/wlroots,swaywm\/wlroots","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/wlr\/types\/wlr_viewporter.h\n+++ include\/wlr\/types\/wlr_viewporter.h\n@@ -11,6 +11,17 @@\n \n #include <wayland-server-core.h>\n \n+\/**\n+ * Implementation for the viewporter protocol.\n+ *\n+ * When enabling viewporter, compositors need to update their rendering logic:\n+ *\n+ * - The size of the surface texture may not match the surface size anymore.\n+ * Compositors must use the surface size only.\n+ * - Compositors must call wlr_render_subtexture_with_matrix when rendering a\n+ * surface texture with the source box returned by\n+ * wlr_surface_get_buffer_source_box.\n+ *\/\n struct wlr_viewporter {\n \tstruct wl_global *global;\n \n"} {"commit":"1fa611111e84074e07512fb5a9fbff7963e166b9","subject":"SPEC: fixed memleak","message":"SPEC: fixed memleak\n","repos":"BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,petermax2\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/spec\/spec.c\n+++ src\/plugins\/spec\/spec.c\n@@ -1200,7 +1200,10 @@\n \tksDel (conflictCut);\n \tKey * specKey = keyNew (\"spec\", KEY_END);\n \tKeySet * specKS = ksCut (returned, specKey);\n-\tpluginConfig->ks = ksDup (specKS);\n+\tif (pluginConfig->ks)\n+\t\tksAppend (pluginConfig->ks, specKS);\n+\telse\n+\t\tpluginConfig->ks = ksDup (specKS);\n \telektraPluginSetData (handle, pluginConfig);\n \tkeyDel (specKey);\n \tKeySet * ks = ksCut (returned, parentKey);\n"} {"commit":"d0d01c584e79ce8a3240a1d07f3ddd45c8c5a9e3","subject":"Document `psk_list` parameter of ssl_server2 example program","message":"Document `psk_list` parameter of ssl_server2 example program\n","repos":"NXPmicro\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- programs\/ssl\/ssl_server2.c\n+++ programs\/ssl\/ssl_server2.c\n@@ -220,8 +220,11 @@\n #endif \/* MBEDTLS_SSL_ASYNC_PRIVATE *\/\n \n #if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)\n-#define USAGE_PSK \\\n- \" psk=%%s default: \\\"\\\" (in hex, without 0x)\\n\" \\\n+#define USAGE_PSK \\\n+ \" psk=%%s default: \\\"\\\" (in hex, without 0x)\\n\" \\\n+ \" psk_list=%%s default: \\\"\\\"\\n\" \\\n+ \" A list of (PSK identity, PSK value) pairs in (hex format, without 0x)\\n\" \\\n+ \" id1,psk1[,id2,psk2[,...]]\\n\" \\\n \" psk_identity=%%s default: \\\"Client_identity\\\"\\n\"\n #else\n #define USAGE_PSK \"\"\n"} {"commit":"bcc62170f5dc5e5f8da63334298ed39db35d5541","subject":"yajl: fix check if user config","message":"yajl: fix check if user config\n","repos":"ElektraInitiative\/libelektra,e1528532\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,e1528532\/libelektra,mpranj\/libelektra,petermax2\/libelektra,petermax2\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,mpranj\/libelektra,mpranj\/libelektra,petermax2\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/yajl\/yajl.c\n+++ src\/plugins\/yajl\/yajl.c\n@@ -344,7 +344,7 @@\n \tKeySet *config= elektraPluginGetConfig(handle);\n \n \t\/\/ ksClear (returned);\n-\tif (!strcmp(keyName(parentKey), \"user\"))\n+\tif (!strncmp(keyName(parentKey), \"user\", 4))\n \t{\n \t\tconst Key * lookup = ksLookupByName(config, \"\/user_path\", 0);\n \t\tif (!lookup)\n"} {"commit":"d6ee3ca2e4db427b78eefc7c9e1e5eb099c2e55b","subject":"Client\/crypto: Started moving the client crypto implementation to the new 'only encrypt the body' implementation, but it's not quite done","message":"Client\/crypto: Started moving the client crypto implementation to the new 'only encrypt the body' implementation, but it's not quite done\n","repos":"iagox86\/dnscat2,iagox86\/dnscat2,EricSB\/dnscat2,EricSB\/dnscat2,EricSB\/dnscat2,iagox86\/dnscat2,iagox86\/dnscat2,iagox86\/dnscat2","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- client\/controller\/encrypted_packet.c\n+++ client\/controller\/encrypted_packet.c\n@@ -33,15 +33,38 @@\n static NBBOOL check_signature(buffer_t *buffer, uint8_t *mac_key)\n {\n sha3_ctx ctx;\n+\n+ uint8_t header[5];\n uint8_t their_signature[6];\n+ uint8_t nonce[8];\n uint8_t good_signature[32];\n+ uint8_t *body;\n+ size_t body_length;\n+\n uint8_t *signed_data = NULL;\n size_t signed_length = -1;\n \n- \/* Read their 48-bit signature off the front of the packet. *\/\n+ \/* Read the 5-byte header. *\/\n+ buffer_read_bytes(buffer, header, 5);\n+\n+ \/* Read their 6-byte (48-bit) signature off the front of the packet. *\/\n buffer_read_next_bytes(buffer, their_signature, 6);\n \n- \/* Read the entirety of the signed data (without consuming it!) *\/\n+ \/* Read the nonce, padded with NUL bytes. *\/\n+ memset(nonce, '\\0', 8);\n+ buffer_read_next_bytes(buffer, nonce+6, 2);\n+\n+ \/* Read the body. *\/\n+ body = buffer_read_remaining_bytes(buffer, &body_length, -1, FALSE);\n+\n+ \/* Re-build the buffer without the signature. *\/\n+ buffer_clear(buffer);\n+ buffer = buffer_create(BO_BIG_ENDIAN);\n+ buffer_add_bytes(buffer, header, 5);\n+ buffer_add_bytes(buffer, nonce, 8);\n+ buffer_add_bytes(buffer, body, body_length);\n+\n+ \/* Get it out as a string. *\/\n signed_data = buffer_read_remaining_bytes(buffer, &signed_length, -1, FALSE);\n \n \/* Calculate H(mac_key || data) *\/\n@@ -52,6 +75,7 @@\n \n \/* Free the data we allocated. *\/\n safe_free(signed_data);\n+ safe_free(body);\n \n \/* Validate the signature *\/\n return (NBBOOL)!memcmp(their_signature, good_signature, 6);\n@@ -60,9 +84,14 @@\n static void sign_buffer(buffer_t *buffer, uint8_t *mac_key)\n {\n sha3_ctx ctx;\n+ uint8_t header[5];\n+ uint8_t *body;\n+ uint8_t *signed_data = NULL;\n size_t signed_length;\n- uint8_t *signed_data = buffer_read_remaining_bytes(buffer, &signed_length, -1, FALSE);\n uint8_t signature[32];\n+\n+ \/* Read in all the data so we can generate a signature. *\/\n+ signed_data = buffer_read_remaining_bytes(buffer, &signed_length, -1, FALSE);\n \n \/* Generate the signature. *\/\n sha3_256_init(&ctx);\n@@ -72,8 +101,9 @@\n \n \/* Add the truncated signature to the packet. *\/\n buffer_clear(buffer);\n+ buffer_add_bytes(buffer, signed_data, 5);\n buffer_add_bytes(buffer, signature, 6);\n- buffer_add_bytes(buffer, signed_data, signed_length);\n+ buffer_add_bytes(buffer, signed_data+5, signed_length-5);\n }\n \n void decrypt_buffer(buffer_t *buffer, uint8_t *write_key)\n"} {"commit":"2adb5a15be382d6a9f3b3ca35af39c0a168decc0","subject":"Idle timeout should have been 180 seconds, not 180 milliseconds.","message":"Idle timeout should have been 180 seconds, not 180 milliseconds.\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/pop3-login\/client.c\n+++ src\/pop3-login\/client.c\n@@ -27,7 +27,7 @@\n #define MAX_OUTBUF_SIZE 4096\n \n \/* Disconnect client after idling this many milliseconds *\/\n-#define CLIENT_LOGIN_IDLE_TIMEOUT_MSECS (3*60)\n+#define CLIENT_LOGIN_IDLE_TIMEOUT_MSECS (3*60*1000)\n \n \/* Disconnect client when it sends too many bad commands *\/\n #define CLIENT_MAX_BAD_COMMANDS 10\n"} {"commit":"4f3477519dc1be0cdc567f1454a5008c76679fd4","subject":"proxy (TLS client) can now detect when cert has SCT list in extension, but the code to extract it is currently failing","message":"proxy (TLS client) can now detect when cert has SCT list in extension,\nbut the code to extract it is currently failing\n","repos":"trawick\/ct-httpd,tomrittervg\/ct-httpd,trawick\/ct-httpd,tomrittervg\/ct-httpd,tomrittervg\/ct-httpd,trawick\/ct-httpd","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/proto1\/mod_ssl_ct.c\n+++ src\/proto1\/mod_ssl_ct.c\n@@ -40,6 +40,8 @@\n * . ??\n *\n * + Known low-level code kludges\/problems\n+ * . proxy can recognize when certificate has SCT list in extension but currently\n+ * fails to extract it\n * . no way to log CT-awareness of backend server (put it in configurable response\n * header to allow logging or easy testing from client)\n * . shouldn't have to read collation of server SCTs on every handshake\n@@ -89,6 +91,8 @@\n \n #include \"ssl_hooks.h\"\n \n+#include \"openssl\/x509v3.h\"\n+\n #ifdef WIN32\n #define DOTEXE \".exe\"\n #else\n@@ -124,6 +128,11 @@\n \n typedef struct ct_conn_config {\n int peer_ct_aware;\n+ \/* proxy mode only *\/\n+ int server_cert_has_sct_list;\n+ void *cert_sct_list;\n+ int serverhello_has_sct_list;\n+ void *serverhello_sct_list;\n } ct_conn_config;\n \n typedef struct ct_callback_info {\n@@ -141,6 +150,49 @@\n static int refresh_all_scts(server_rec *s_main, apr_pool_t *p);\n \n static apr_thread_t *service_thread;\n+\n+\/* from c-t\/src\/log\/ct_extensions.cc *\/\n+static int NID_ctSignedCertificateTimestampList;\n+static int NID_ctEmbeddedSignedCertificateTimestampList;\n+static X509V3_EXT_METHOD ct_sctlist_method = {\n+ 0, \/* ext_nid, NID, will be created by OBJ_create() *\/\n+ 0, \/* flags *\/\n+ ASN1_ITEM_ref(ASN1_OCTET_STRING), \/* the object is an octet string *\/\n+ 0, 0, 0, 0, \/* ignored since the field above is set *\/\n+ \/* Create from, and print to, a hex string\n+ * Allows to specify the extension configuration like so:\n+ * ctSCT = <hexstring_value>\n+ * (Unused - we just plumb the bytes in the fake cert directly.)\n+ *\/\n+ (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,\n+ (X509V3_EXT_S2I)s2i_ASN1_OCTET_STRING,\n+ 0, 0,\n+ 0, 0,\n+ NULL \/* usr_data *\/\n+};\n+\n+static X509V3_EXT_METHOD ct_embeddedsctlist_method = {\n+ 0, \/* ext_nid, NID, will be created by OBJ_create() *\/\n+ 0, \/* flags *\/\n+ ASN1_ITEM_ref(ASN1_OCTET_STRING), \/* the object is an octet string *\/\n+ 0, 0, 0, 0, \/* ignored since the field above is set *\/\n+ \/* Create from, and print to, a hex string\n+ * Allows to specify the extension configuration like so:\n+ * ctEmbeddedSCT = <hexstring_value>\n+ * (Unused, as we're not issuing certs.)\n+ *\/\n+ (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,\n+ (X509V3_EXT_S2I)s2i_ASN1_OCTET_STRING,\n+ 0, 0,\n+ 0, 0,\n+ NULL \/* usr_data *\/\n+};\n+\n+\/* The SCT list embedded in the certificate itself *\/\n+const char kEmbeddedSCTListOID[] = \"1.3.6.1.4.1.11129.2.4.2\";\n+static const char kEmbeddedSCTListSN[] = \"ctEmbeddedSCT\";\n+static const char kEmbeddedSCTListLN[] = \"X509v3 Certificate Transparency \"\n+ \"Embedded Signed Certificate Timestamp List\";\n \n #ifdef HAVE_SCT_DAEMON\n \n@@ -1360,7 +1412,7 @@\n return OK;\n }\n \n-static void client_is_ct_aware(conn_rec *c)\n+static ct_conn_config *get_conn_config(conn_rec *c)\n {\n ct_conn_config *conncfg =\n ap_get_module_config(c->conn_config, &ssl_ct_module);\n@@ -1370,15 +1422,26 @@\n ap_set_module_config(c->conn_config, &ssl_ct_module, conncfg);\n }\n \n+ return conncfg;\n+}\n+\n+static void client_is_ct_aware(conn_rec *c)\n+{\n+ ct_conn_config *conncfg = get_conn_config(c);\n conncfg->peer_ct_aware = 1;\n }\n \n static int is_client_ct_aware(conn_rec *c)\n {\n- ct_conn_config *conncfg =\n- ap_get_module_config(c->conn_config, &ssl_ct_module);\n-\n- return conncfg && conncfg->peer_ct_aware;\n+ ct_conn_config *conncfg = get_conn_config(c);\n+\n+ return conncfg->peer_ct_aware;\n+}\n+\n+static void server_cert_has_sct_list(conn_rec *c)\n+{\n+ ct_conn_config *conncfg = get_conn_config(c);\n+ conncfg->server_cert_has_sct_list = 1;\n }\n \n \/* Look at SSLClient::VerifyCallback() and WriteSSLClientCTData()\n@@ -1434,6 +1497,7 @@\n int *al, void *arg)\n {\n conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);\n+ ct_conn_config *conncfg = get_conn_config(c);\n \n \/* need to retrieve SCT(s) from ServerHello (or certificate or stapled response) *\/\n \n@@ -1448,14 +1512,75 @@\n * SSL_get_peer_certificate(ssl)\n *\/\n \n+ conncfg->serverhello_has_sct_list = 1;\n+ conncfg->serverhello_sct_list = apr_pmemdup(c->pool, in, inlen);\n return 1;\n }\n \n+\/* See SSLClient::VerifyCallback() in c-t\/src\/client\/ssl_client.cc *\/\n static int ssl_ct_ssl_proxy_verify(server_rec *s, conn_rec *c, SSL *ssl,\n X509_STORE_CTX *ctx)\n {\n+ ct_conn_config *conncfg = get_conn_config(c);\n+ int chain_size = sk_X509_num(ctx->chain);\n+ int extension_index;\n+ X509 *leaf;\n+\n ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,\n \"ssl_ct_ssl_proxy_verify() - get server certificate info\");\n+\n+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,\n+ \"chain size: %d\"\n+ ,\n+ chain_size\n+ );\n+\n+ if (chain_size < 1) {\n+ ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,\n+ \"odd chain size %d -- cannot proceed\", chain_size);\n+ return APR_EINVAL;\n+ }\n+\n+ \/* Note: SSLClient::Verify looks in both the input chain and the\n+ * verified chain.\n+ *\/\n+ leaf = X509_dup(sk_X509_value(ctx->chain, 0));\n+ if (!leaf) {\n+ ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,\n+ \"can't get leaf\");\n+ return APR_EINVAL;\n+ }\n+\n+ extension_index = X509_get_ext_by_NID(leaf, NID_ctEmbeddedSignedCertificateTimestampList, -1);\n+ \/* use X509_get_ext(leaf, extension_index) to obtain X509_EXTENSION * *\/\n+\n+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,\n+ \"Extension for embedded SCT list: %d\",\n+ extension_index);\n+\n+ if (extension_index >= 0) {\n+ void *ext_struct;\n+ int crit;\n+\n+ server_cert_has_sct_list(c);\n+ \/* as in Cert::ExtensionStructure() *\/\n+ ext_struct = X509_get_ext_d2i(leaf,\n+ NID_ctEmbeddedSignedCertificateTimestampList,\n+ &crit, NULL);\n+\n+ if (ext_struct == NULL || crit != -1) {\n+ ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c,\n+ \"Could not retrieve SCT list from certificate (unexpected)\");\n+ }\n+ else {\n+ \/* as in Cert::OctetStringExtensionData *\/\n+ ASN1_OCTET_STRING *octet = (ASN1_OCTET_STRING *)ext_struct;\n+ conncfg->cert_sct_list = apr_pmemdup(c->pool,\n+ octet->data,\n+ octet->length);\n+ ASN1_OCTET_STRING_free(octet);\n+ }\n+ }\n \n #if 0\n if (!peer_cert) {\n@@ -1474,7 +1599,12 @@\n }\n #endif\n \n- return APR_SUCCESS;\n+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c,\n+ \"SCT list received in: %s%s%s\",\n+ conncfg->serverhello_has_sct_list ? \"ServerHello \" : \"\",\n+ conncfg->server_cert_has_sct_list ? \"certificate extension \" : \"\",\n+ \"\"); \/* no logic for stapled response yet *\/\n+ return OK;\n }\n \n static int server_extension_callback_1(SSL *ssl, unsigned short ext_type,\n@@ -1632,11 +1762,39 @@\n return DECLINED;\n }\n \n+\/* from LoadCtExtensions() in c-t\/src\/log\/ct_extensions.cc *\/\n+static apr_status_t build_extensions(void)\n+{\n+ \/* NID_ctSignedCertificateTimestampList *\/\n+ ct_sctlist_method.ext_nid = OBJ_create(kEmbeddedSCTListOID,\n+ kEmbeddedSCTListSN,\n+ kEmbeddedSCTListLN);\n+ ap_assert(ct_sctlist_method.ext_nid != 0);\n+ ap_assert(1 == X509V3_EXT_add(&ct_sctlist_method));\n+ NID_ctSignedCertificateTimestampList = ct_sctlist_method.ext_nid;\n+\n+ \/* NID_ctEmbeddedSignedCertificateTimestampList; *\/\n+ ct_embeddedsctlist_method.ext_nid = OBJ_create(kEmbeddedSCTListOID,\n+ kEmbeddedSCTListSN,\n+ kEmbeddedSCTListLN);\n+ ap_assert(ct_embeddedsctlist_method.ext_nid != 0);\n+ ap_assert(1 == X509V3_EXT_add(&ct_embeddedsctlist_method));\n+ NID_ctEmbeddedSignedCertificateTimestampList =\n+ ct_embeddedsctlist_method.ext_nid;\n+\n+ return APR_SUCCESS;\n+}\n+\n static int ssl_ct_pre_config(apr_pool_t *pconf, apr_pool_t *plog,\n apr_pool_t *ptemp)\n {\n apr_status_t rv = ap_mutex_register(pconf, SSL_CT_MUTEX_TYPE, NULL,\n APR_LOCK_DEFAULT, 0);\n+ if (rv != APR_SUCCESS) {\n+ return rv;\n+ }\n+\n+ rv = build_extensions();\n if (rv != APR_SUCCESS) {\n return rv;\n }\n"} {"commit":"789b50a1022e033e4c44398bdabc3e27342b7ec0","subject":"Whitespace fix.","message":"Whitespace fix.\n","repos":"rene0\/dcf77pi,rene0\/dcf77pi","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- dcf77pi.c\n+++ dcf77pi.c\n@@ -164,7 +164,7 @@\n \t\t\tcase 'S':\n \t\t\t\tsettime = 1 - settime;\n \t\t\t\tstatusbar(main_win, \"Time synchronization %s\",\n-\t\t\t\t settime ? \"on\" : \"off\");\n+\t\t\t\t settime ? \"on\" : \"off\");\n \t\t\t\told_bitpos = bitpos; \/* start timer *\/\n \t\t\t\tbreak;\n \t\t\t}\n"} {"commit":"bed38cec713d2256c87cb324acfa46af9960bb54","subject":"GUACAMOLE-117: Do not stop connection when the intent is to reconnect (originally broken by commit a64c3e0).","message":"GUACAMOLE-117: Do not stop connection when the intent is to reconnect (originally broken by commit a64c3e0).\n","repos":"apache\/guacamole-server,glyptodon\/guacamole-server,mike-jumper\/incubator-guacamole-server,mike-jumper\/incubator-guacamole-server,mike-jumper\/incubator-guacamole-server,apache\/guacamole-server,apache\/guacamole-server,glyptodon\/guacamole-server,glyptodon\/guacamole-server,mike-jumper\/incubator-guacamole-server","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/protocols\/rdp\/rdp.c\n+++ src\/protocols\/rdp\/rdp.c\n@@ -850,10 +850,6 @@\n \n }\n \n- \/* Kill client and finish connection *\/\n- guac_client_stop(client);\n- guac_client_log(client, GUAC_LOG_INFO, \"Internal RDP client disconnected\");\n-\n pthread_mutex_lock(&(rdp_client->rdp_lock));\n \n \/* Disconnect client and channels *\/\n@@ -880,6 +876,10 @@\n guac_common_display_free(rdp_client->display);\n \n pthread_mutex_unlock(&(rdp_client->rdp_lock));\n+\n+ \/* Client is now disconnected *\/\n+ guac_client_log(client, GUAC_LOG_INFO, \"Internal RDP client disconnected\");\n+\n return 0;\n \n }\n"} {"commit":"4606607309761cca9f69dbd8e15be2376950dac3","subject":"GUACAMOLE-622: Start terminal for SSH only after SSH connection succeeds.","message":"GUACAMOLE-622: Start terminal for SSH only after SSH connection succeeds.\n","repos":"mike-jumper\/incubator-guacamole-server,glyptodon\/guacamole-server,apache\/guacamole-server,mike-jumper\/incubator-guacamole-server,apache\/guacamole-server,apache\/guacamole-server,mike-jumper\/incubator-guacamole-server,glyptodon\/guacamole-server,mike-jumper\/incubator-guacamole-server,glyptodon\/guacamole-server","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/protocols\/ssh\/ssh.c\n+++ src\/protocols\/ssh\/ssh.c\n@@ -335,6 +335,7 @@\n \n \/* Logged in *\/\n guac_client_log(client, GUAC_LOG_INFO, \"SSH connection successful.\");\n+ guac_terminal_start(ssh_client->term);\n \n \/* Start input thread *\/\n if (pthread_create(&(input_thread), NULL, ssh_input_thread, (void*) client)) {\n"} {"commit":"4218f3378f9bd907b62ecf485203ce0749347e71","subject":"fix stereo playback and looping logic in WAV decoder (#196)","message":"fix stereo playback and looping logic in WAV decoder (#196)\n\n* fix looping logic bug in WAV streaming decoder.\r\n\r\nThis was meant to make it into my earlier PR that added non-canonical WAV support. I fixed it over a week ago, but apparently it's hard to keep 5+ simultaneous PRs organized.\r\n\r\n* Fix wav stereo sample playback too.\r\n\r\n(I had only tested stereo ogg formats so far)","repos":"libretro\/libretro-lutro,libretro\/libretro-lutro,libretro\/libretro-lutro","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- decoder.c\n+++ decoder.c\n@@ -351,27 +351,31 @@\n \n \/\/ this is a pseudo template with several cont literal parameters.\n \/\/ it should always be agressively inlined.\n-static __always_inline bool _inl_decode_wav(dec_WavData *data, intmax_t bufsz, mixer_presaturate_t* dst, int bytesPerSample, int chan_src, int chan_dst, float volume, bool loop)\n+static __always_inline bool _inl_decode_wav(dec_WavData *data, intmax_t bufsz, mixer_presaturate_t* dst, int bytesPerSamplePerChan, int chan_src, int chan_dst, float volume, bool loop)\n {\n \/\/ a normalized sound sample is considered range -1.0 to 1.0\n \/\/ 16-bit wav outputs values range 32767 to -32768\n \/\/ 8-bit wav is scaled up to 16 bit and then normalized using 16-bit divisor.\n float mul_volume_and_normalize = volume \/ 32767;\n \n- int numSamples = data->headc2.Subchunk2Size \/ bytesPerSample;\n-\n- for (int j = 0; j < bufsz; j++, data->pos += (bytesPerSample * chan_src))\n+ int bytesPerMultiSample = bytesPerSamplePerChan * chan_src;\n+\n+ int byteLen = data->headc2.Subchunk2Size;\n+ int numSamples = data->headc2.Subchunk2Size \/ bytesPerMultiSample;\n+\n+ for (int j = 0; j < bufsz; j++, data->pos += bytesPerMultiSample)\n { \n uint8_t sample_raw[8];\n int readResult = 0;\n- if (data->pos < numSamples)\n- readResult = (int)fread(sample_raw, bytesPerSample * chan_src, 1, data->fp);\n+\n+ reloadSample:\n+ if (data->pos < byteLen)\n+ readResult = (int)fread(sample_raw, bytesPerMultiSample, 1, data->fp);\n \n if (!readResult)\n {\n- intmax_t seekpos = decWav_CalcOffsetDataStart(data) + data->pos;\n- dbg_assertf(ftell(data->fp) == seekpos, \"numSamples=%jd dataPos=%jd and ftell=%jd\",\n- (intmax_t)numSamples, (intmax_t)data->pos, ftell(data->fp)\n+ dbg_assertf(data->pos == ftell(data->fp) - decWav_CalcOffsetDataStart(data), \"numSamples=%jd byteLen=%jd dataPos=%jd and ftell=%jd\",\n+ (intmax_t)numSamples, (intmax_t)byteLen, (intmax_t)data->pos, (intmax_t)ftell(data->fp)\n );\n \n if (!loop)\n@@ -383,22 +387,22 @@\n }\n \n data->pos = 0;\n- fseek(data->fp, seekpos, SEEK_SET);\n- --j; continue; \/\/ attempt to re-read sample.\n+ fseek(data->fp, decWav_CalcOffsetDataStart(data), SEEK_SET);\n+ --j; goto reloadSample; \/\/ attempt to re-read sample.\n }\n \n if (chan_src == 2)\n {\n if (chan_dst == 1)\n {\n- dst[j] += inl_get_sample(sample_raw, bytesPerSample, 0) * mul_volume_and_normalize;\n- dst[j] += inl_get_sample(sample_raw, bytesPerSample, 1) * mul_volume_and_normalize;\n+ dst[j] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 0) * mul_volume_and_normalize;\n+ dst[j] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 1) * mul_volume_and_normalize;\n }\n \n if (chan_dst == 2)\n {\n- dst[(j*2)+0] += inl_get_sample(sample_raw, bytesPerSample, 0) * mul_volume_and_normalize;\n- dst[(j*2)+1] += inl_get_sample(sample_raw, bytesPerSample, 1) * mul_volume_and_normalize;\n+ dst[(j*2)+0] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 0) * mul_volume_and_normalize;\n+ dst[(j*2)+1] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 1) * mul_volume_and_normalize;\n }\n }\n \n@@ -406,19 +410,19 @@\n {\n if (chan_dst == 1)\n {\n- dst[j] += inl_get_sample(sample_raw, bytesPerSample, 0) * mul_volume_and_normalize;\n+ dst[j] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 0) * mul_volume_and_normalize;\n }\n \n if (chan_dst == 2)\n {\n- dst[(j*2)+0] += inl_get_sample(sample_raw, bytesPerSample, 0) * mul_volume_and_normalize;\n- dst[(j*2)+1] += inl_get_sample(sample_raw, bytesPerSample, 0) * mul_volume_and_normalize;\n- }\n- }\n- }\n-\n- dbg_assertf(ftell(data->fp) == decWav_CalcOffsetDataStart(data) + data->pos, \"numSamples=%jd dataPos=%jd and ftell=%jd\",\n- (intmax_t)numSamples, (intmax_t)data->pos, ftell(data->fp)\n+ dst[(j*2)+0] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 0) * mul_volume_and_normalize;\n+ dst[(j*2)+1] += inl_get_sample(sample_raw, bytesPerSamplePerChan, 0) * mul_volume_and_normalize;\n+ }\n+ }\n+ }\n+\n+ dbg_assertf(data->pos == ftell(data->fp) - decWav_CalcOffsetDataStart(data), \"numSamples=%jd byteLen=%jd dataPos=%jd and ftell=%jd\",\n+ (intmax_t)numSamples, (intmax_t)byteLen, (intmax_t)data->pos, (intmax_t)ftell(data->fp)\n );\n return 0;\n }\n"} {"commit":"c65b7e98b4edce7faf534154b28eae8fb579144b","subject":"ARM: 7785\/1: mm: restrict early_alloc to section-aligned memory","message":"ARM: 7785\/1: mm: restrict early_alloc to section-aligned memory\n\nWhen map_lowmem() runs, and processes a memory bank whose start or end\nis not section-aligned, memory must be allocated to store the 2nd-level\npage tables. Those allocations are made by calling memblock_alloc().\n\nAt this point, the only memory that is free *and* mapped is memory which\nhas already been mapped by map_lowmem() itself. For this reason, we must\ncalculate the first point at which map_lowmem() will need to allocate\nmemory, and set the memblock allocation limit to a lower address, so that\nmemblock_alloc() is guaranteed to return memory that is already mapped.\n\nThis patch enhances sanity_check_meminfo() to calculate that memory\naddress, and pass it to memblock_set_current_limit(), rather than just\nassuming the limit is arm_lowmem_limit.\n\nThe algorithm applied is:\n\n* Default memblock_limit to arm_lowmem_limit in the absence of any other\n limit; arm_lowmem_limit is the highest memory that is mapped by\n map_lowmem().\n\n* While walking the list of memblocks, if the start of a block is not\n aligned, 2nd-level page tables will need to be allocated to map the\n first few pages of the block. Hence, the memblock_limit must be before\n the start of the block.\n\n* Similarly, if the end of any block is not aligned, 2nd-level page\n tables will need to be allocated to map the last few pages of the\n block. Hence, the memblock_limit must point at the end of the block,\n rounded down to section-alignment.\n\n* The memory blocks are assumed to be sorted in address order, so the\n first unaligned block start or end is used to set the limit.\n\nWith this algorithm, the start or end of almost any bank can be non-\nsection-aligned. The only exception is that the start of bank 0 must\nbe section-aligned, since otherwise memory would need to be allocated\nwhen mapping the start of bank 0, which occurs before any free memory\nis mapped.\n\n[swarren, wrote commit description, rewrote calculation of memblock_limit]\n\nSigned-off-by: Stephen Warren <5ef2a23ba3aff51d1cfc8c113c1ec34b608b3b13@nvidia.com>\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/mm\/mmu.c\n+++ arch\/arm\/mm\/mmu.c\n@@ -989,6 +989,7 @@\n \n void __init sanity_check_meminfo(void)\n {\n+\tphys_addr_t memblock_limit = 0;\n \tint i, j, highmem = 0;\n \tphys_addr_t vmalloc_limit = __pa(vmalloc_min - 1) + 1;\n \n@@ -1052,9 +1053,32 @@\n \t\t\tbank->size = size_limit;\n \t\t}\n #endif\n-\t\tif (!bank->highmem && bank->start + bank->size > arm_lowmem_limit)\n-\t\t\tarm_lowmem_limit = bank->start + bank->size;\n-\n+\t\tif (!bank->highmem) {\n+\t\t\tphys_addr_t bank_end = bank->start + bank->size;\n+\n+\t\t\tif (bank_end > arm_lowmem_limit)\n+\t\t\t\tarm_lowmem_limit = bank_end;\n+\n+\t\t\t\/*\n+\t\t\t * Find the first non-section-aligned page, and point\n+\t\t\t * memblock_limit at it. This relies on rounding the\n+\t\t\t * limit down to be section-aligned, which happens at\n+\t\t\t * the end of this function.\n+\t\t\t *\n+\t\t\t * With this algorithm, the start or end of almost any\n+\t\t\t * bank can be non-section-aligned. The only exception\n+\t\t\t * is that the start of the bank 0 must be section-\n+\t\t\t * aligned, since otherwise memory would need to be\n+\t\t\t * allocated when mapping the start of bank 0, which\n+\t\t\t * occurs before any free memory is mapped.\n+\t\t\t *\/\n+\t\t\tif (!memblock_limit) {\n+\t\t\t\tif (!IS_ALIGNED(bank->start, SECTION_SIZE))\n+\t\t\t\t\tmemblock_limit = bank->start;\n+\t\t\t\telse if (!IS_ALIGNED(bank_end, SECTION_SIZE))\n+\t\t\t\t\tmemblock_limit = bank_end;\n+\t\t\t}\n+\t\t}\n \t\tj++;\n \t}\n #ifdef CONFIG_HIGHMEM\n@@ -1079,7 +1103,18 @@\n #endif\n \tmeminfo.nr_banks = j;\n \thigh_memory = __va(arm_lowmem_limit - 1) + 1;\n-\tmemblock_set_current_limit(arm_lowmem_limit);\n+\n+\t\/*\n+\t * Round the memblock limit down to a section size. This\n+\t * helps to ensure that we will allocate memory from the\n+\t * last full section, which should be mapped.\n+\t *\/\n+\tif (memblock_limit)\n+\t\tmemblock_limit = round_down(memblock_limit, SECTION_SIZE);\n+\tif (!memblock_limit)\n+\t\tmemblock_limit = arm_lowmem_limit;\n+\n+\tmemblock_set_current_limit(memblock_limit);\n }\n \n static inline void prepare_page_table(void)\n@@ -1276,8 +1311,6 @@\n {\n \tvoid *zero_page;\n \n-\tmemblock_set_current_limit(arm_lowmem_limit);\n-\n \tbuild_mem_type_table();\n \tprepare_page_table();\n \tmap_lowmem();\n"} {"commit":"c9c146228cc87237f4841503dca6800cbaf70620","subject":"Reduce dump usage","message":"Reduce dump usage\n\nSigned-off-by: Daniel Lezcano <e9fa45941f2ebe89c1b9d6c5f339ab42eadb8567@free.fr>\nSigned-off-by: Amit Kucheria <f352f8f7e4567da77f569289775ad284524dea88@linaro.org>\n","repos":"gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug,gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- powerdebug.c\n+++ powerdebug.c\n@@ -141,13 +141,21 @@\n \t\t}\n \t}\n \n-\tif (options->dump && !(options->regulators ||\n-\t\t options->clocks || options->sensors)) {\n-\t\t\/* By Default lets show everything we have *\/\n-\t\toptions->regulators = options->clocks = options->sensors = true;\n-\t}\n-\n-\tif (!options->dump && options->selectedwindow == -1)\n+\tif (options->dump) {\n+\n+\t\t\/* No system specified to be dump, let's default to all *\/\n+\t\tif (!options->regulators &&\n+\t\t !options->clocks &&\n+\t\t !options->sensors) {\n+\t\t\toptions->regulators = options->clocks =\n+\t\t\t\toptions->sensors = true;\n+\n+\t\t\treturn 0;\n+\t\t}\n+\n+\t}\n+\n+\tif (options->selectedwindow == -1)\n \t\toptions->selectedwindow = CLOCK;\n \n \treturn 0;\n"} {"commit":"335ef896d4c6639849d79367f0fef9abc06d121b","subject":"x86, pat: Add rbtree to do quick lookup in memtype tracking","message":"x86, pat: Add rbtree to do quick lookup in memtype tracking\n\nPAT memtype tracking uses a linear link list to keep track of IO\n(non-RAM) regions and their memtypes. The code used a last_accessed\npointer as a cache to speedup the lookup. As per discussions with\nH. Peter Anvin a while back, having a rbtree here will avoid bad\nperformances in pathological cases where we may end up with huge\nlinked list. This may not add any noticable performance speedup\nin normal case as the number of entires in PAT memtype list tend\nto be ~20-30 range. The patch removes the \"cached_entry\" logic\nas with rbtree we have more generic way of speeding up the lookup.\n\nWith this patch, we use rbtree to do the quick lookup. We still use\nlinked list as the memtype range tracked can be of different sizes\nand can overlap in different ways. We also keep track of usage counts\nwith linked list.\n\nExample:\nMultiple ioremaps with different sizes\nuncached-minus @ 0xfffff00000-0xfffff04000\nuncached-minus @ 0xfffff02000-0xfffff03000\n\nAnd one userlevel mmap and the thread forks a new process\nuncached-minus @ 0xbf453000-0xbf454000\nuncached-minus @ 0xbf453000-0xbf454000\n\nSigned-off-by: Venkatesh Pallipadi <6b7ddbe82beec4500037cfc9bc14de0a76fca340@intel.com>\nSigned-off-by: Suresh Siddha <a42fd12510d3895be740fb89f87586733ee62f57@intel.com>\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/mm\/pat.c\n+++ arch\/x86\/mm\/pat.c\n@@ -15,6 +15,7 @@\n #include <linux\/gfp.h>\n #include <linux\/mm.h>\n #include <linux\/fs.h>\n+#include <linux\/rbtree.h>\n \n #include <asm\/cacheflush.h>\n #include <asm\/processor.h>\n@@ -148,11 +149,10 @@\n * areas). All the aliases have the same cache attributes of course.\n * Zero attributes are represented as holes.\n *\n- * Currently the data structure is a list because the number of mappings\n- * are expected to be relatively small. If this should be a problem\n- * it could be changed to a rbtree or similar.\n- *\n- * memtype_lock protects the whole list.\n+ * The data structure is a list that is also organized as an rbtree\n+ * sorted on the start address of memtype range.\n+ *\n+ * memtype_lock protects both the linear list and rbtree.\n *\/\n \n struct memtype {\n@@ -160,10 +160,52 @@\n \tu64\t\t\tend;\n \tunsigned long\t\ttype;\n \tstruct list_head\tnd;\n+\tstruct rb_node\t\trb;\n };\n \n+static struct rb_root memtype_rbroot = RB_ROOT;\n static LIST_HEAD(memtype_list);\n static DEFINE_SPINLOCK(memtype_lock);\t\/* protects memtype list *\/\n+\n+static struct memtype *memtype_rb_search(struct rb_root *root, u64 start)\n+{\n+\tstruct rb_node *node = root->rb_node;\n+\tstruct memtype *last_lower = NULL;\n+\n+\twhile (node) {\n+\t\tstruct memtype *data = container_of(node, struct memtype, rb);\n+\n+\t\tif (data->start < start) {\n+\t\t\tlast_lower = data;\n+\t\t\tnode = node->rb_right;\n+\t\t} else if (data->start > start) {\n+\t\t\tnode = node->rb_left;\n+\t\t} else\n+\t\t\treturn data;\n+\t}\n+\n+\t\/* Will return NULL if there is no entry with its start <= start *\/\n+\treturn last_lower;\n+}\n+\n+static void memtype_rb_insert(struct rb_root *root, struct memtype *data)\n+{\n+\tstruct rb_node **new = &(root->rb_node);\n+\tstruct rb_node *parent = NULL;\n+\n+\twhile (*new) {\n+\t\tstruct memtype *this = container_of(*new, struct memtype, rb);\n+\n+\t\tparent = *new;\n+\t\tif (data->start <= this->start)\n+\t\t\tnew = &((*new)->rb_left);\n+\t\telse if (data->start > this->start)\n+\t\t\tnew = &((*new)->rb_right);\n+\t}\n+\n+\trb_link_node(&data->rb, parent, new);\n+\trb_insert_color(&data->rb, root);\n+}\n \n \/*\n * Does intersection of PAT memory type and MTRR memory type and returns\n@@ -217,9 +259,6 @@\n \t new->end, cattr_name(new->type), cattr_name(entry->type));\n \treturn -EBUSY;\n }\n-\n-static struct memtype *cached_entry;\n-static u64 cached_start;\n \n static int pat_pagerange_is_ram(unsigned long start, unsigned long end)\n {\n@@ -382,17 +421,19 @@\n \n \tspin_lock(&memtype_lock);\n \n-\tif (cached_entry && start >= cached_start)\n-\t\tentry = cached_entry;\n-\telse\n+\tentry = memtype_rb_search(&memtype_rbroot, new->start);\n+\tif (likely(entry != NULL)) {\n+\t\t\/* To work correctly with list_for_each_entry_continue *\/\n+\t\tentry = list_entry(entry->nd.prev, struct memtype, nd);\n+\t} else {\n \t\tentry = list_entry(&memtype_list, struct memtype, nd);\n+\t}\n \n \t\/* Search for existing mapping that overlaps the current range *\/\n \twhere = NULL;\n \tlist_for_each_entry_continue(entry, &memtype_list, nd) {\n \t\tif (end <= entry->start) {\n \t\t\twhere = entry->nd.prev;\n-\t\t\tcached_entry = list_entry(where, struct memtype, nd);\n \t\t\tbreak;\n \t\t} else if (start <= entry->start) { \/* end > entry->start *\/\n \t\t\terr = chk_conflict(new, entry, new_type);\n@@ -400,8 +441,6 @@\n \t\t\t\tdprintk(\"Overlap at 0x%Lx-0x%Lx\\n\",\n \t\t\t\t\tentry->start, entry->end);\n \t\t\t\twhere = entry->nd.prev;\n-\t\t\t\tcached_entry = list_entry(where,\n-\t\t\t\t\t\t\tstruct memtype, nd);\n \t\t\t}\n \t\t\tbreak;\n \t\t} else if (start < entry->end) { \/* start > entry->start *\/\n@@ -409,8 +448,6 @@\n \t\t\tif (!err) {\n \t\t\t\tdprintk(\"Overlap at 0x%Lx-0x%Lx\\n\",\n \t\t\t\t\tentry->start, entry->end);\n-\t\t\t\tcached_entry = list_entry(entry->nd.prev,\n-\t\t\t\t\t\t\tstruct memtype, nd);\n \n \t\t\t\t\/*\n \t\t\t\t * Move to right position in the linked\n@@ -438,13 +475,13 @@\n \t\treturn err;\n \t}\n \n-\tcached_start = start;\n-\n \tif (where)\n \t\tlist_add(&new->nd, where);\n \telse\n \t\tlist_add_tail(&new->nd, &memtype_list);\n \n+\tmemtype_rb_insert(&memtype_rbroot, new);\n+\n \tspin_unlock(&memtype_lock);\n \n \tdprintk(\"reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\\n\",\n@@ -456,7 +493,7 @@\n \n int free_memtype(u64 start, u64 end)\n {\n-\tstruct memtype *entry;\n+\tstruct memtype *entry, *saved_entry;\n \tint err = -EINVAL;\n \tint is_range_ram;\n \n@@ -474,17 +511,46 @@\n \t\treturn -EINVAL;\n \n \tspin_lock(&memtype_lock);\n+\n+\tentry = memtype_rb_search(&memtype_rbroot, start);\n+\tif (unlikely(entry == NULL))\n+\t\tgoto unlock_ret;\n+\n+\t\/*\n+\t * Saved entry points to an entry with start same or less than what\n+\t * we searched for. Now go through the list in both directions to look\n+\t * for the entry that matches with both start and end, with list stored\n+\t * in sorted start address\n+\t *\/\n+\tsaved_entry = entry;\n \tlist_for_each_entry(entry, &memtype_list, nd) {\n \t\tif (entry->start == start && entry->end == end) {\n-\t\t\tif (cached_entry == entry || cached_start == start)\n-\t\t\t\tcached_entry = NULL;\n-\n+\t\t\trb_erase(&entry->rb, &memtype_rbroot);\n \t\t\tlist_del(&entry->nd);\n \t\t\tkfree(entry);\n \t\t\terr = 0;\n \t\t\tbreak;\n+\t\t} else if (entry->start > start) {\n+\t\t\tbreak;\n \t\t}\n \t}\n+\n+\tif (!err)\n+\t\tgoto unlock_ret;\n+\n+\tentry = saved_entry;\n+\tlist_for_each_entry_reverse(entry, &memtype_list, nd) {\n+\t\tif (entry->start == start && entry->end == end) {\n+\t\t\trb_erase(&entry->rb, &memtype_rbroot);\n+\t\t\tlist_del(&entry->nd);\n+\t\t\tkfree(entry);\n+\t\t\terr = 0;\n+\t\t\tbreak;\n+\t\t} else if (entry->start < start) {\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+unlock_ret:\n \tspin_unlock(&memtype_lock);\n \n \tif (err) {\n"} {"commit":"353e126441dfd2045a6c8299030c8c05953e7e38","subject":"Improved the interface of DiskPool.h","message":"Improved the interface of DiskPool.h\n","repos":"agustingianni\/ThreadProfiler,agustingianni\/ThreadProfiler","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- DiskPool.h\n+++ DiskPool.h\n@@ -62,7 +62,7 @@\n }\n \n uint8_t *alloc(size_t size) {\n- return static_cast<T>(this)->alloc(size);\n+ return static_cast<T *>(this)->allocImpl(size);\n }\n \n \/\/ Flush to disk so we release physical pages.\n@@ -76,13 +76,17 @@\n \n \/\/ Single thread disk pool. This does not implement any locking, use with care.\n class DiskPool_st : public DiskPool<DiskPool_st> {\n+ \/\/ Let DiskPool access our private fields.\n+ friend class DiskPool;\n+\n size_t m_top;\n \n public:\n DiskPool_st(const std::string &filename, size_t size) : DiskPool<DiskPool_st>{filename, size}, m_top{0} {\n }\n \n- uint8_t *alloc(size_t size) {\n+private:\n+ uint8_t *allocImpl(size_t size) {\n auto tmp = m_top;\n m_top += size;\n return m_address + tmp;\n@@ -91,13 +95,17 @@\n \n \/\/ Thread safe disk pool. Uses atomic to handle accesses from multiple threads.\n class DiskPool_mt : public DiskPool<DiskPool_mt> {\n+ \/\/ Let DiskPool access our private fields.\n+ friend class DiskPool;\n+\n std::atomic<size_t> m_top;\n \n public:\n DiskPool_mt(const std::string &filename, size_t size) : DiskPool<DiskPool_mt>{filename, size}, m_top{0} {\n }\n \n- uint8_t *alloc(size_t size) {\n+private:\n+ uint8_t *allocImpl(size_t size) {\n return m_address + m_top.fetch_add(size, std::memory_order_relaxed);\n }\n };\n"} {"commit":"62f3a7f4492c630fca81671425c32720354a46ef","subject":"[videosink] Refactor Renderer::init()","message":"[videosink] Refactor Renderer::init()\n\nThe first argument, the target ClutterActor was both unneeded and still\nreachable from the sink.\n","repos":"ystreet\/clutter-gst,ystreet\/clutter-gst,GNOME\/clutter-gst,GNOME\/clutter-gst,lubosz\/clutter-gst,lubosz\/clutter-gst,skinkie\/clutter-gst,skinkie\/clutter-gst,GNOME\/clutter-gst,lubosz\/clutter-gst,ystreet\/clutter-gst,GNOME\/clutter-gst,skinkie\/clutter-gst,ystreet\/clutter-gst","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- clutter-gst\/clutter-gst-video-sink.c\n+++ clutter-gst\/clutter-gst-video-sink.c\n@@ -167,8 +167,7 @@\n int flags; \/* ClutterGstFeatures ORed flags *\/\n GstStaticCaps caps; \/* caps handled by the renderer *\/\n \n- void (*init) (ClutterActor *actor,\n- ClutterGstVideoSink *sink);\n+ void (*init) (ClutterGstVideoSink *sink);\n void (*upload) (ClutterGstVideoSink *sink,\n GstBuffer *buffer);\n void (*paint) (ClutterActor *actor,\n@@ -350,8 +349,7 @@\n \n \/* some renderers don't need all the ClutterGstRenderer vtable *\/\n static void\n-clutter_gst_dummy_init (ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_dummy_init (ClutterGstVideoSink *sink)\n {\n }\n \n@@ -432,14 +430,12 @@\n *\/\n \n static void\n-clutter_gst_yv12_glsl_init (ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_yv12_glsl_init (ClutterGstVideoSink *sink)\n {\n ClutterGstVideoSinkPrivate *priv= sink->priv;\n GLint location;\n \n- clutter_gst_video_sink_set_shader (sink,\n- yv12_to_rgba_shader);\n+ clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader);\n \n cogl_program_use (priv->program);\n location = cogl_program_get_uniform_location (priv->program, \"ytex\");\n@@ -543,8 +539,7 @@\n \n #ifdef CLUTTER_COGL_HAS_GL\n static void\n-clutter_gst_yv12_fp_init (ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_yv12_fp_init (ClutterGstVideoSink *sink)\n {\n gchar *shader;\n \n@@ -593,14 +588,12 @@\n *\/\n \n static void\n-clutter_gst_i420_glsl_init (ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_i420_glsl_init (ClutterGstVideoSink *sink)\n {\n ClutterGstVideoSinkPrivate *priv = sink->priv;\n GLint location;\n \n- clutter_gst_video_sink_set_shader (sink,\n- yv12_to_rgba_shader);\n+ clutter_gst_video_sink_set_shader (sink, yv12_to_rgba_shader);\n \n cogl_program_use (priv->program);\n location = cogl_program_get_uniform_location (priv->program, \"ytex\");\n@@ -633,8 +626,7 @@\n \n #ifdef CLUTTER_COGL_HAS_GL\n static void\n-clutter_gst_i420_fp_init (ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_i420_fp_init (ClutterGstVideoSink *sink)\n {\n gchar *shader;\n \n@@ -669,8 +661,7 @@\n *\/\n \n static void\n-clutter_gst_ayuv_glsl_init(ClutterActor *actor,\n- ClutterGstVideoSink *sink)\n+clutter_gst_ayuv_glsl_init(ClutterGstVideoSink *sink)\n {\n clutter_gst_video_sink_set_shader (sink, ayuv_to_rgba_shader);\n }\n@@ -875,7 +866,7 @@\n {\n gulong handler_id;\n \n- priv->renderer->init (CLUTTER_ACTOR (priv->texture), sink);\n+ priv->renderer->init (sink);\n \n handler_id =\n g_signal_connect (priv->texture,\n"} {"commit":"2843c5da88d51b1e00de620142920183a764abc0","subject":"Event: Added QProperty support to all class properties.","message":"Event: Added QProperty support to all class properties.\n\nProperties:\n- Id;\n- Timestamp;\n- Interpratation;\n- Manifestation;\n- Actor;\n- Subjects;\n- Payload;\n","repos":"KDE\/libqzeitgeist,KDE\/libqzeitgeist,Sidnioulz\/QZeitgeist5,Sidnioulz\/QZeitgeist5,Sidnioulz\/QZeitgeist5,KDE\/libqzeitgeist","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/QtZeitgeist\/DataModel\/event.h\n+++ include\/QtZeitgeist\/DataModel\/event.h\n@@ -37,7 +37,14 @@\n \n class Q_DECL_EXPORT Event : public QObject\n {\n-Q_OBJECT\n+ Q_OBJECT\n+ Q_PROPERTY(quint32 id READ id WRITE setId)\n+ Q_PROPERTY(QDateTime timestamp READ timestamp WRITE setTimestamp)\n+ Q_PROPERTY(QString interpretation READ interpretation WRITE setInterpretation)\n+ Q_PROPERTY(QString manifestation READ manifestation WRITE setManifestation)\n+ Q_PROPERTY(QString actor READ actor WRITE setActor)\n+ Q_PROPERTY(QList<QStringList> subjects READ subjects WRITE setSubjects)\n+ Q_PROPERTY(QByteArray payload READ payload WRITE setPayload)\n \n public:\n \n"} {"commit":"03e5386e1e6e4f19c18c33fb69afd43054d448b2","subject":"[ARM] 4530\/1: MXC: fix elf_hwcap compile breakage as in iop13xx","message":"[ARM] 4530\/1: MXC: fix elf_hwcap compile breakage as in iop13xx\n\nMXC needs the same change as IOP. See [ARM] 4494\/1\nor commit 7dea1b20066cd30fb54da7e686b16b5e38b46b2d\n\nAn undefined reference to elf_hwcap prevents linkage, due\nto changes made by f884b1cf578e079f01682514ae1ae64c74586602\nand d1cbbd6b413510c6512f4f80ffd48db1a8dd554a\n\nRemoving processor.h removes the extern definition of\nelf_hwcap, which fixes the link issue, but forgets cpu_relax().\nSo, instead, we'll call barrier() directly.\n\nCc: Lennert Buytenhek <c65a0fb7e74ffd2c9fc3a0f9aacb0f6a24b0a68b@wantstofly.org>\nCc: Catalin Marinas <15ce75b290ebaf27c3f9fd73ab848685ed3d8261@arm.com>\nAcked-by: Ross Wille <d577a69204fb3f75176eecf995fca122803cdb47@freescale.com>\nSigned-off-by: Quinn Jensen <212675614cfa3760144b4a77f7da474c9f30efbd@freescale.com>\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/asm-arm\/arch-mxc\/uncompress.h\n+++ include\/asm-arm\/arch-mxc\/uncompress.h\n@@ -26,7 +26,6 @@\n #define __MXC_BOOT_UNCOMPRESS\n \n #include <asm\/hardware.h>\n-#include <asm\/processor.h>\n \n #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))\n \n@@ -62,7 +61,7 @@\n \t}\n \n \twhile (!(UART(USR2) & USR2_TXFE))\n-\t\tcpu_relax();\n+\t\tbarrier();\n \n \tUART(TXR) = ch;\n }\n"} {"commit":"6403683411dac55afbe3435ceb19033e27cd9f96","subject":"Fix bad typo reported by I-Jui Sung.","message":"Fix bad typo reported by I-Jui Sung.\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@154986 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/clang\/Analysis\/ProgramPoint.h\n+++ include\/clang\/Analysis\/ProgramPoint.h\n@@ -129,7 +129,7 @@\n static bool classof(const ProgramPoint*) { return true; }\n \n bool operator==(const ProgramPoint & RHS) const {\n- return Data1 == Data1 &&\n+ return Data1 == RHS.Data1 &&\n Data2 == RHS.Data2 &&\n L == RHS.L &&\n Tag == RHS.Tag;\n"} {"commit":"b4a1e4bea978b9a2978f8bcbd7eb518cc98b25d9","subject":"Added function interfaces for generating prolog and epilog code. The functions must be implemented by the target-specific code generator.","message":"Added function interfaces for generating prolog and epilog code.\nThe functions must be implemented by the target-specific code generator.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@951 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/InstrSelection.h\n+++ include\/llvm\/CodeGen\/InstrSelection.h\n@@ -34,6 +34,14 @@\n extern unsigned\tGetInstructionsByRule\t(InstructionNode* subtreeRoot,\n \t\t\t\t\t int ruleForNode,\n \t\t\t\t\t short* nts,\n+\t\t\t\t\t TargetMachine &Target,\n+\t\t\t\t\t MachineInstr** minstrVec);\n+\n+extern unsigned\tGetInstructionsForProlog(BasicBlock* entryBB,\n+\t\t\t\t\t TargetMachine &Target,\n+\t\t\t\t\t MachineInstr** minstrVec);\n+\n+extern unsigned\tGetInstructionsForEpilog(BasicBlock* anExitBB,\n \t\t\t\t\t TargetMachine &Target,\n \t\t\t\t\t MachineInstr** minstrVec);\n \n"} {"commit":"3a27f1022ca80f1ff51f5ed524fd6fc4e86f08df","subject":"pragma once","message":"pragma once\n","repos":"mp3guy\/Pangolin,renzodenardi\/Pangolin,renzodenardi\/Pangolin,stevenlovegrove\/Pangolin,stevenlovegrove\/Pangolin,mp3guy\/Pangolin,mp3guy\/Pangolin,tschmidt23\/Pangolin,tschmidt23\/Pangolin,tschmidt23\/Pangolin,stevenlovegrove\/Pangolin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/pangolin\/tools\/video_viewer.h\n+++ include\/pangolin\/tools\/video_viewer.h\n@@ -1,3 +1,5 @@\n+#pragma once\n+\n #include <pangolin\/display\/window.h>\n #include <pangolin\/platform.h>\n #include <pangolin\/video\/video_input.h>\n"} {"commit":"ee610efd7d27bd28da539b02e2a76ae7c37ab3b0","subject":"Add assignment operator to ansi color sink. Adjust default colors.","message":"Add assignment operator to ansi color sink. Adjust default colors.\n","repos":"hunter-packages\/spdlog,GreatFruitOmsk\/spdlog,mihadyuk\/spdlog,icylord\/spdlog,icylord\/spdlog,hunter-packages\/spdlog,GreatFruitOmsk\/spdlog,godbyk\/spdlog,mihadyuk\/spdlog,icylord\/spdlog,godbyk\/spdlog,COMBINE-lab\/spdlog,COMBINE-lab\/spdlog,hunter-packages\/spdlog,COMBINE-lab\/spdlog,mihadyuk\/spdlog,godbyk\/spdlog","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/spdlog\/sinks\/ansicolor_sink.h\n+++ include\/spdlog\/sinks\/ansicolor_sink.h\n@@ -23,6 +23,9 @@\n public:\n ansicolor_sink(sink_ptr sink);\n virtual ~ansicolor_sink();\n+\n+ ansicolor_sink(const ansicolor_sink& other);\n+ ansicolor_sink& operator=(const ansicolor_sink& other);\n \n virtual void log(const details::log_msg& msg) override;\n virtual void flush() override;\n@@ -72,10 +75,10 @@\n \n inline ansicolor_sink::ansicolor_sink(sink_ptr sink) : sink_(sink)\n {\n- colors_[level::trace] = grey;\n- colors_[level::debug] = grey;\n+ colors_[level::trace] = white;\n+ colors_[level::debug] = white;\n colors_[level::info] = white;\n- colors_[level::notice] = yellow;\n+ colors_[level::notice] = bold + white;\n colors_[level::warn] = bold + yellow;\n colors_[level::err] = red;\n colors_[level::critical] = bold + red;\n@@ -87,6 +90,22 @@\n inline ansicolor_sink::~ansicolor_sink()\n {\n flush();\n+}\n+\n+inline ansicolor_sink::ansicolor_sink(const ansicolor_sink& other) : sink_(other.sink_), colors_(other.colors_)\n+{\n+ \/\/ do nothing\n+}\n+\n+\n+inline ansicolor_sink& ansicolor_sink::operator=(const ansicolor_sink& other)\n+{\n+ if (this == &other)\n+ return *this;\n+\n+ sink_ = other.sink_;\n+ colors_ = other.colors_;\n+ return *this;\n }\n \n inline void ansicolor_sink::log(const details::log_msg& msg)\n"} {"commit":"eaa96f690403c377595d208a337f95bafc4c43db","subject":"remove clutter_stage_set_color() calls","message":"remove clutter_stage_set_color() calls\n","repos":"michaelgwood\/pinpoint,GNOME\/pinpoint,michaelgwood\/pinpoint,tyll\/pinpoint,robclark\/pinpoint,tyll\/pinpoint,robclark\/pinpoint,GNOME\/pinpoint,robclark\/pinpoint","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pp-clutter.c\n+++ pp-clutter.c\n@@ -836,8 +836,8 @@\n renderer->speaker_prog_slide = pp_rectangle_new_with_color (&c_prog_slide);\n renderer->speaker_slide_prog_warning = pp_rectangle_new_with_color (&red);\n \n- clutter_stage_set_color (CLUTTER_STAGE (renderer->speaker_screen), &black);\n- clutter_stage_set_color (CLUTTER_STAGE (renderer->speaker_screen), &black);\n+ clutter_actor_set_background_color (renderer->speaker_screen, &black);\n+ clutter_actor_set_background_color (renderer->speaker_screen, &black);\n clutter_stage_set_user_resizable (CLUTTER_STAGE (renderer->speaker_screen), TRUE);\n \n \n@@ -962,7 +962,7 @@\n clutter_actor_show (stage);\n \n \n- clutter_stage_set_color (CLUTTER_STAGE (stage), &black);\n+ clutter_actor_set_background_color (stage, &black);\n g_signal_connect (stage, \"delete-event\",\n G_CALLBACK (stage_deleted), renderer);\n g_signal_connect (stage, \"key-press-event\",\n@@ -2103,7 +2103,7 @@\n if (point->stage_color)\n {\n clutter_color_from_string (&color, point->stage_color);\n- clutter_stage_set_color (CLUTTER_STAGE (renderer->stage), &color);\n+ clutter_actor_set_background_color (renderer->stage, &color);\n }\n \n if (data->background)\n"} {"commit":"28ad2bcf397f72f265d0f1cd369160f901c518b0","subject":"qemu_command: use VIR_AUTOPTR for virJSONValue","message":"qemu_command: use VIR_AUTOPTR for virJSONValue\n\nSigned-off-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\nReviewed-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\n","repos":"olafhering\/libvirt,olafhering\/libvirt,zippy2\/libvirt,olafhering\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,libvirt\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_command.c\n+++ src\/qemu\/qemu_command.c\n@@ -738,7 +738,7 @@\n {\n VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;\n int ret = -1;\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n \n if (qemuBuildSecretInfoProps(secinfo, &props) < 0)\n return -1;\n@@ -752,7 +752,6 @@\n ret = 0;\n \n cleanup:\n- virJSONValueFree(props);\n return ret;\n }\n \n@@ -935,7 +934,7 @@\n {\n VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;\n int ret = -1;\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n \n if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias,\n certEncSecretAlias, qemuCaps, &props) < 0)\n@@ -950,7 +949,6 @@\n ret = 0;\n \n cleanup:\n- virJSONValueFree(props);\n return ret;\n }\n \n@@ -1595,16 +1593,14 @@\n static virJSONValuePtr\n qemuDiskSourceGetProps(virStorageSourcePtr src)\n {\n- virJSONValuePtr props;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n virJSONValuePtr ret;\n \n if (!(props = qemuBlockStorageSourceGetBackendProps(src, true, false, false)))\n return NULL;\n \n- if (virJSONValueObjectCreate(&ret, \"a:file\", &props, NULL) < 0) {\n- virJSONValueFree(props);\n+ if (virJSONValueObjectCreate(&ret, \"a:file\", &props, NULL) < 0)\n return NULL;\n- }\n \n return ret;\n }\n@@ -1641,7 +1637,7 @@\n qemuDomainStorageSourcePrivatePtr srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);\n qemuDomainSecretInfoPtr secinfo = NULL;\n qemuDomainSecretInfoPtr encinfo = NULL;\n- virJSONValuePtr srcprops = NULL;\n+ VIR_AUTOPTR(virJSONValue) srcprops = NULL;\n char *source = NULL;\n bool rawluks = false;\n int ret = -1;\n@@ -1729,7 +1725,6 @@\n \n cleanup:\n VIR_FREE(source);\n- virJSONValueFree(srcprops);\n return ret;\n }\n \n@@ -3407,7 +3402,7 @@\n bool prealloc = false;\n virBitmapPtr nodemask = NULL;\n int ret = -1;\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, mem->targetNode);\n unsigned long long pagesize = mem->pagesize;\n bool needHugepage = !!pagesize;\n@@ -3651,7 +3646,6 @@\n ret = -1;\n \n cleanup:\n- virJSONValueFree(props);\n VIR_FREE(memPath);\n return ret;\n }\n@@ -3664,7 +3658,7 @@\n qemuDomainObjPrivatePtr priv,\n virBufferPtr buf)\n {\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n char *alias = NULL;\n int ret = -1;\n int rc;\n@@ -3690,7 +3684,6 @@\n \n cleanup:\n VIR_FREE(alias);\n- virJSONValueFree(props);\n \n return ret;\n }\n@@ -3703,7 +3696,7 @@\n virQEMUDriverConfigPtr cfg,\n qemuDomainObjPrivatePtr priv)\n {\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n char *alias = NULL;\n int ret = -1;\n \n@@ -3727,7 +3720,6 @@\n \n cleanup:\n VIR_FREE(alias);\n- virJSONValueFree(props);\n \n return ret;\n }\n@@ -5022,7 +5014,7 @@\n char *ret = NULL;\n VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;\n char *netsource = NULL;\n- virJSONValuePtr srcprops = NULL;\n+ VIR_AUTOPTR(virJSONValue) srcprops = NULL;\n virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi;\n virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi;\n qemuDomainStorageSourcePrivatePtr srcPriv =\n@@ -5051,7 +5043,6 @@\n \n cleanup:\n VIR_FREE(netsource);\n- virJSONValueFree(srcprops);\n return ret;\n }\n \n@@ -6036,7 +6027,7 @@\n size_t i;\n \n for (i = 0; i < def->nrngs; i++) {\n- virJSONValuePtr props;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n virBuffer buf = VIR_BUFFER_INITIALIZER;\n virDomainRNGDefPtr rng = def->rngs[i];\n char *tmp;\n@@ -6063,7 +6054,6 @@\n return -1;\n \n rc = virQEMUBuildObjectCommandlineFromJSON(&buf, props);\n- virJSONValueFree(props);\n \n if (rc < 0)\n return -1;\n@@ -9225,7 +9215,7 @@\n virQEMUCapsPtr qemuCaps,\n bool chardevStdioLogd)\n {\n- virJSONValuePtr memProps = NULL;\n+ VIR_AUTOPTR(virJSONValue) memProps = NULL;\n VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;\n char *devstr = NULL;\n int rc;\n@@ -9270,7 +9260,6 @@\n return -1;\n \n rc = virQEMUBuildObjectCommandlineFromJSON(&buf, memProps);\n- virJSONValueFree(memProps);\n \n if (rc < 0)\n return -1;\n@@ -10247,7 +10236,7 @@\n qemuDomainObjPrivatePtr priv)\n {\n VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;\n- virJSONValuePtr props = NULL;\n+ VIR_AUTOPTR(virJSONValue) props = NULL;\n int ret = -1;\n \n if (!virDomainDefHasManagedPR(def))\n@@ -10264,7 +10253,6 @@\n \n ret = 0;\n cleanup:\n- virJSONValueFree(props);\n return ret;\n }\n \n"} {"commit":"aeb0953f3a269b73f02615dbf80467329c59e2cc","subject":"CORE-10: Add support for AES-CTR","message":"CORE-10: Add support for AES-CTR\n","repos":"breadwallet\/breadwallet-core,breadwallet\/breadwallet-core,breadwallet\/breadwallet-core,breadwallet\/breadwallet-core,breadwallet\/breadwallet-core,breadwallet\/breadwallet-core","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ethereum\/les\/BREthereumFrameCoder.c\n+++ ethereum\/les\/BREthereumFrameCoder.c\n@@ -56,6 +56,22 @@\n \n \/\/ Egress ciphertext size\n size_t egressMacSize;\n+ \n+ \/\/IV for the AES-CTR\n+ UInt128 iv;\n+ \n+ \/\/Encrpty Key for AES-CTR frame\n+ uint8_t* aesEncryptKey;\n+ \n+ \/\/Decrypty Key for AES-CTR frame\n+ uint8_t* aesDecryptKey;\n+ \n+ \/\/Cipher for AES-CTR encryption\n+ uint8_t* aesEncryptCipher;\n+ \n+ \/\/Cipher for AES-CTR decryption\n+ uint8_t* aesDecryptCipher;\n+ \n };\n \n \/\/\n@@ -248,8 +264,20 @@\n \n \/\/ aes-secret = sha3(ecdhe-shared-secret || shared-secret)\n BRKeccak256(&keyMaterial[32], &keyMaterial[32], 32);\n- \/\/ TODO: Maybe, I might need an encryption\/decryption frame?\n- \n+\n+ \/\/ ase-crt iv: 1\n+ memset(fcoder->iv.u8, 0, 16);\n+ array_new(fcoder->aesDecryptKey, 32);\n+ array_new(fcoder->aesEncryptKey, 32);\n+ array_new(fcoder->aesDecryptCipher, 32);\n+ array_new(fcoder->aesEncryptCipher, 32);\n+\n+ array_add_array(fcoder->aesDecryptKey, &keyMaterial[32], 32);\n+ array_add_array(fcoder->aesEncryptKey, &keyMaterial[32], 32);\n+ array_add_array(fcoder->aesDecryptCipher, &keyMaterial[32], 32);\n+ array_add_array(fcoder->aesEncryptKey, &keyMaterial[32], 32);\n+ \n+\n \/\/ mac-secret = sha3(ecdhe-shared-secret || aes-secret)\n BRKeccak256(&keyMaterial[32], &keyMaterial[32], 32);\n memcpy(fcoder->macSecretKey.u8,&keyMaterial[32], 32);\n@@ -332,13 +360,15 @@\n uint8_t headerPlain[16] = {(uint8_t)((payloadSize >> 16) & 0xff), (uint8_t)((payloadSize >> 8) & 0xff), (uint8_t)(payloadSize & 0xff)};\n headerPlainItem = rlpEncodeItemBytes(coder, headerPlain, sizeof(headerPlain));\n \n- BRRlpData headerCipher;\n- rlpDataExtract(coder, headerPlainItem, &headerCipher.bytes, &headerCipher.bytesCount);\n-\n+ BRRlpData headerPlainData;\n+ rlpDataExtract(coder, headerPlainItem, &headerPlainData.bytes, &headerPlainData.bytesCount);\n \n \/\/ TODO: Need AES-CTRL encryption to headerCipher\n \/\/ aes256_encrypt(&ctx->aes_sercret, 16, headerCipher.bytes, headerCipher.bytes);\n- \n+ uint8_t headerCipher[headerPlainData.bytesCount];\n+ BRAESCTR(headerCipher, fCoder->aesEncryptKey, 32, fCoder->iv.u8, headerPlainData.bytes, headerPlainData.bytesCount);\n+ array_add_array(fCoder->aesEncryptCipher, headerPlainData.bytes, headerPlainData.bytesCount);\n+ \n \/\/ Encrypt HEADER-MAC\n UInt256 egressDigest;\n BRKeccak256(egressDigest.u8, fCoder->egressMac , fCoder->egressMacSize);\n@@ -347,7 +377,7 @@\n memcpy(macSecret, egressDigest.u8, 16);\n _BRAES256ECBEncrypt(fCoder->macSecretKey.u8, macSecret);\n uint8_t xORMacCipher[16];\n- ethereumXORBytes(macSecret, headerCipher.bytes, xORMacCipher, 16);\n+ ethereumXORBytes(macSecret, headerCipher, xORMacCipher, 16);\n array_add_array(fCoder->egressMac, xORMacCipher, 16);\n fCoder->egressMacSize += 16;\n \n@@ -360,19 +390,22 @@\n size_t oBytesSize = 32 + payloadSize + payloadPadding + 16; \/\/ header_cipher + headerMac + payload + padding + frameMac\n uint8_t * oBytes = (uint8_t*)malloc(oBytesSize);\n \n- memcpy(oBytes, headerCipher.bytes, headerCipher.bytesCount);\n+ memcpy(oBytes, headerCipher, headerPlainData.bytesCount);\n memcpy(&oBytes[16], headerMac, 16);\n \n uint8_t * frameCipher = &oBytes[32];\n \n \/\/ TODO: Need AES-CTRL encryption to frameCipher\n- memcpy(frameCipher, payload, payloadSize);\n+ uint8_t frameData[payloadPadding + payloadSize];\n+ memcpy(frameData, payload, payloadSize);\n+ \n if(payloadPadding){\n- memset(&frameCipher[payloadSize], 0, payloadPadding);\n+ memset(&frameData[payloadSize], 0, payloadPadding);\n \/\/ aes256_encrypt(&fCoder->aes_sercret, payloadPadding + payloadSize, frameCipher, frameCipher);\n-\n+ BRAESCTR(frameCipher, fCoder->aesEncryptKey, 32, fCoder->iv.u8, frameData, payloadPadding + payloadSize);\n }else {\n \/\/ aes256_encrypt(&fCoder->aes_sercret, payloadSize, frameCipher, frameCipher);\n+ BRAESCTR(frameCipher, fCoder->aesEncryptKey, 32, fCoder->iv.u8, frameData, payloadSize);\n }\n array_add_array(fCoder->egressMac, frameCipher, payloadSize + payloadPadding);\n fCoder->egressMacSize += (payloadPadding + payloadSize);\n@@ -392,7 +425,7 @@\n *rlpBytes = oBytes;\n *rlpBytesSize = oBytesSize;\n \n- rlpDataRelease(headerCipher);\n+ rlpDataRelease(headerPlainData);\n rlpCoderRelease(coder);\n }\n BREthereumBoolean ethereumFrameCoderDecryptHeader(BREthereumFrameCoder fCoder, uint8_t * oBytes, size_t outSize) {\n@@ -423,6 +456,10 @@\n \n \/\/ TODO: AES-CTR decryption function\n \/\/ aes256_decrypt(&fCoder->aes_sercret, 16, oBytes);\n+ uint8_t cipher[outSize];\n+ memcpy(cipher, oBytes, outSize);\n+ BRAESCTR(oBytes, fCoder->aesDecryptKey, 32, fCoder->iv.u8, cipher, outSize);\n+\n \n return ETHEREUM_BOOLEAN_TRUE;\n \n@@ -459,7 +496,10 @@\n }\n \n \/\/ TODO: AES-CTR decryption function\n- \/\/ aes256_encrypt.update(&fCoder->aes_sercret,, outSize, oBytes, oBytes);\n+ \/\/aes256_encrypt.update(&fCoder->aes_sercret,, outSize, oBytes, oBytes);\n+ uint8_t cipher[outSize];\n+ memcpy(cipher, oBytes, outSize);\n+ BRAESCTR(oBytes, fCoder->aesDecryptKey, 32, fCoder->iv.u8, cipher, outSize);\n \n return ETHEREUM_BOOLEAN_TRUE;\n }\n"} {"commit":"d05b6844c91f5b1041a7d6390122665c52775c9f","subject":"qemu: Split out code to generate SPICE command line","message":"qemu: Split out code to generate SPICE command line\n\nDecrease size of qemuBuildGraphicsCommandLine() by splitting out\nspice-related code into qemuBuildGraphicsSPICECommandLine().\n\nThis patch also fixes 2 possible memory leaks on error path in the code\nthat was split-out. The buffer containing the already generated options\nand a listen address string could be leaked.\n\nAlso break a few very long lines.\n","repos":"fabianfreyer\/libvirt,rlaager\/libvirt,crobinso\/libvirt,shugaoye\/libvirt,taget\/libvirt,jardasgit\/libvirt,shugaoye\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,rlaager\/libvirt,jardasgit\/libvirt,taget\/libvirt,cbosdo\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,cbosdo\/libvirt,fabianfreyer\/libvirt,shugaoye\/libvirt,jfehlig\/libvirt,datto\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,rlaager\/libvirt,taget\/libvirt,zippy2\/libvirt,eskultety\/libvirt,jfehlig\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,zhlcindy\/libvirt-1.1.4-maintain,andreabolognani\/libvirt,elmarco\/libvirt,rlaager\/libvirt,elmarco\/libvirt,crobinso\/libvirt,cbosdo\/libvirt,shugaoye\/libvirt,datto\/libvirt,olafhering\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,agx\/libvirt,cbosdo\/libvirt,agx\/libvirt,zippy2\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,elmarco\/libvirt,taget\/libvirt,eskultety\/libvirt,rlaager\/libvirt,eskultety\/libvirt,libvirt\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,libvirt\/libvirt,andreabolognani\/libvirt,shugaoye\/libvirt,olafhering\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,agx\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,eskultety\/libvirt,taget\/libvirt,datto\/libvirt,libvirt\/libvirt,crobinso\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_command.c\n+++ src\/qemu\/qemu_command.c\n@@ -5498,6 +5498,181 @@\n return ret;\n }\n \n+\n+static int\n+qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,\n+ virCommandPtr cmd,\n+ virQEMUCapsPtr qemuCaps,\n+ virDomainGraphicsDefPtr graphics)\n+{\n+ virBuffer opt = VIR_BUFFER_INITIALIZER;\n+ const char *listenNetwork;\n+ const char *listenAddr = NULL;\n+ char *netAddr = NULL;\n+ int ret;\n+ int defaultMode = graphics->data.spice.defaultMode;\n+ int port = graphics->data.spice.port;\n+ int tlsPort = graphics->data.spice.tlsPort;\n+ int i;\n+\n+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n+ _(\"spice graphics are not supported with this QEMU\"));\n+ goto error;\n+ }\n+\n+ if (port > 0 || tlsPort <= 0)\n+ virBufferAsprintf(&opt, \"port=%u\", port);\n+\n+ if (tlsPort > 0) {\n+ if (!cfg->spiceTLS) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n+ _(\"spice TLS port set in XML configuration,\"\n+ \" but TLS is disabled in qemu.conf\"));\n+ goto error;\n+ }\n+ if (port > 0)\n+ virBufferAddChar(&opt, ',');\n+ virBufferAsprintf(&opt, \"tls-port=%u\", tlsPort);\n+ }\n+\n+ switch (virDomainGraphicsListenGetType(graphics, 0)) {\n+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:\n+ listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);\n+ break;\n+\n+ case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:\n+ listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0);\n+ if (!listenNetwork)\n+ break;\n+ ret = networkGetNetworkAddress(listenNetwork, &netAddr);\n+ if (ret <= -2) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n+ \"%s\", _(\"network-based listen not possible, \"\n+ \"network driver not present\"));\n+ goto error;\n+ }\n+ if (ret < 0) {\n+ virReportError(VIR_ERR_XML_ERROR,\n+ _(\"listen network '%s' had no usable address\"),\n+ listenNetwork);\n+ goto error;\n+ }\n+ listenAddr = netAddr;\n+ \/* store the address we found in the <graphics> element so it will\n+ * show up in status. *\/\n+ if (virDomainGraphicsListenSetAddress(graphics, 0,\n+ listenAddr, -1, false) < 0)\n+ goto error;\n+ break;\n+ }\n+\n+ if (!listenAddr)\n+ listenAddr = cfg->spiceListen;\n+ if (listenAddr)\n+ virBufferAsprintf(&opt, \",addr=%s\", listenAddr);\n+\n+ VIR_FREE(netAddr);\n+\n+ if (graphics->data.spice.mousemode) {\n+ switch (graphics->data.spice.mousemode) {\n+ case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER:\n+ virBufferAsprintf(&opt, \",agent-mouse=off\");\n+ break;\n+ case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT:\n+ virBufferAsprintf(&opt, \",agent-mouse=on\");\n+ break;\n+ default:\n+ break;\n+ }\n+ }\n+\n+ \/* In the password case we set it via monitor command, to avoid\n+ * making it visible on CLI, so there's no use of password=XXX\n+ * in this bit of the code *\/\n+ if (!graphics->data.spice.auth.passwd &&\n+ !cfg->spicePassword)\n+ virBufferAddLit(&opt, \",disable-ticketing\");\n+\n+ if (cfg->spiceTLS)\n+ virBufferAsprintf(&opt, \",x509-dir=%s\",\n+ cfg->spiceTLSx509certdir);\n+\n+ switch (defaultMode) {\n+ case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:\n+ virBufferAsprintf(&opt, \",tls-channel=default\");\n+ break;\n+ case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:\n+ virBufferAsprintf(&opt, \",plaintext-channel=default\");\n+ break;\n+ case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:\n+ \/* nothing *\/\n+ break;\n+ }\n+\n+ for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {\n+ int mode = graphics->data.spice.channels[i];\n+ switch (mode) {\n+ case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:\n+ if (!cfg->spiceTLS) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n+ _(\"spice secure channels set in XML configuration, \"\n+ \"but TLS is disabled in qemu.conf\"));\n+ goto error;\n+ }\n+ virBufferAsprintf(&opt, \",tls-channel=%s\",\n+ virDomainGraphicsSpiceChannelNameTypeToString(i));\n+ break;\n+ case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:\n+ virBufferAsprintf(&opt, \",plaintext-channel=%s\",\n+ virDomainGraphicsSpiceChannelNameTypeToString(i));\n+ break;\n+ }\n+ }\n+ if (graphics->data.spice.image)\n+ virBufferAsprintf(&opt, \",image-compression=%s\",\n+ virDomainGraphicsSpiceImageCompressionTypeToString(graphics->data.spice.image));\n+ if (graphics->data.spice.jpeg)\n+ virBufferAsprintf(&opt, \",jpeg-wan-compression=%s\",\n+ virDomainGraphicsSpiceJpegCompressionTypeToString(graphics->data.spice.jpeg));\n+ if (graphics->data.spice.zlib)\n+ virBufferAsprintf(&opt, \",zlib-glz-wan-compression=%s\",\n+ virDomainGraphicsSpiceZlibCompressionTypeToString(graphics->data.spice.zlib));\n+ if (graphics->data.spice.playback)\n+ virBufferAsprintf(&opt, \",playback-compression=%s\",\n+ virDomainGraphicsSpicePlaybackCompressionTypeToString(graphics->data.spice.playback));\n+ if (graphics->data.spice.streaming)\n+ virBufferAsprintf(&opt, \",streaming-video=%s\",\n+ virDomainGraphicsSpiceStreamingModeTypeToString(graphics->data.spice.streaming));\n+ if (graphics->data.spice.copypaste == VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_NO)\n+ virBufferAddLit(&opt, \",disable-copy-paste\");\n+\n+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) {\n+ \/* If qemu supports seamless migration turn it\n+ * unconditionally on. If migration destination\n+ * doesn't support it, it fallbacks to previous\n+ * migration algorithm silently. *\/\n+ virBufferAddLit(&opt, \",seamless-migration=on\");\n+ }\n+\n+ virCommandAddArg(cmd, \"-spice\");\n+ virCommandAddArgBuffer(cmd, &opt);\n+ if (graphics->data.spice.keymap)\n+ virCommandAddArgList(cmd, \"-k\",\n+ graphics->data.spice.keymap, NULL);\n+ \/* SPICE includes native support for tunnelling audio, so we\n+ * set the audio backend to point at SPICE's own driver\n+ *\/\n+ virCommandAddEnvString(cmd, \"QEMU_AUDIO_DRV=spice\");\n+\n+ return 0;\n+\n+error:\n+ VIR_FREE(netAddr);\n+ virBufferFreeAndReset(&opt);\n+ return -1;\n+}\n+\n static int\n qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,\n virCommandPtr cmd,\n@@ -5505,8 +5680,6 @@\n virQEMUCapsPtr qemuCaps,\n virDomainGraphicsDefPtr graphics)\n {\n- int i;\n-\n if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {\n virBuffer opt = VIR_BUFFER_INITIALIZER;\n \n@@ -5658,165 +5831,8 @@\n virCommandAddArg(cmd, \"-sdl\");\n \n } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {\n- virBuffer opt = VIR_BUFFER_INITIALIZER;\n- const char *listenNetwork;\n- const char *listenAddr = NULL;\n- char *netAddr = NULL;\n- int ret;\n- int defaultMode = graphics->data.spice.defaultMode;\n- int port = graphics->data.spice.port;\n- int tlsPort = graphics->data.spice.tlsPort;\n-\n- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n- _(\"spice graphics are not supported with this QEMU\"));\n- goto error;\n- }\n-\n- if (port > 0 || tlsPort <= 0)\n- virBufferAsprintf(&opt, \"port=%u\", port);\n-\n- if (tlsPort > 0) {\n- if (!cfg->spiceTLS) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n- _(\"spice TLS port set in XML configuration,\"\n- \" but TLS is disabled in qemu.conf\"));\n- goto error;\n- }\n- if (port > 0)\n- virBufferAddChar(&opt, ',');\n- virBufferAsprintf(&opt, \"tls-port=%u\", tlsPort);\n- }\n-\n- switch (virDomainGraphicsListenGetType(graphics, 0)) {\n- case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:\n- listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);\n- break;\n-\n- case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:\n- listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0);\n- if (!listenNetwork)\n- break;\n- ret = networkGetNetworkAddress(listenNetwork, &netAddr);\n- if (ret <= -2) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n- \"%s\", _(\"network-based listen not possible, \"\n- \"network driver not present\"));\n- goto error;\n- }\n- if (ret < 0) {\n- virReportError(VIR_ERR_XML_ERROR,\n- _(\"listen network '%s' had no usable address\"),\n- listenNetwork);\n- goto error;\n- }\n- listenAddr = netAddr;\n- \/* store the address we found in the <graphics> element so it will\n- * show up in status. *\/\n- if (virDomainGraphicsListenSetAddress(graphics, 0,\n- listenAddr, -1, false) < 0)\n- goto error;\n- break;\n- }\n-\n- if (!listenAddr)\n- listenAddr = cfg->spiceListen;\n- if (listenAddr)\n- virBufferAsprintf(&opt, \",addr=%s\", listenAddr);\n-\n- VIR_FREE(netAddr);\n-\n- int mm = graphics->data.spice.mousemode;\n- if (mm) {\n- switch (mm) {\n- case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER:\n- virBufferAsprintf(&opt, \",agent-mouse=off\");\n- break;\n- case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT:\n- virBufferAsprintf(&opt, \",agent-mouse=on\");\n- break;\n- default:\n- break;\n- }\n- }\n-\n- \/* In the password case we set it via monitor command, to avoid\n- * making it visible on CLI, so there's no use of password=XXX\n- * in this bit of the code *\/\n- if (!graphics->data.spice.auth.passwd &&\n- !cfg->spicePassword)\n- virBufferAddLit(&opt, \",disable-ticketing\");\n-\n- if (cfg->spiceTLS)\n- virBufferAsprintf(&opt, \",x509-dir=%s\",\n- cfg->spiceTLSx509certdir);\n-\n- switch (defaultMode) {\n- case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:\n- virBufferAsprintf(&opt, \",tls-channel=default\");\n- break;\n- case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:\n- virBufferAsprintf(&opt, \",plaintext-channel=default\");\n- break;\n- case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:\n- \/* nothing *\/\n- break;\n- }\n-\n- for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {\n- int mode = graphics->data.spice.channels[i];\n- switch (mode) {\n- case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:\n- if (!cfg->spiceTLS) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n- _(\"spice secure channels set in XML configuration, but TLS is disabled in qemu.conf\"));\n- goto error;\n- }\n- virBufferAsprintf(&opt, \",tls-channel=%s\",\n- virDomainGraphicsSpiceChannelNameTypeToString(i));\n- break;\n- case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:\n- virBufferAsprintf(&opt, \",plaintext-channel=%s\",\n- virDomainGraphicsSpiceChannelNameTypeToString(i));\n- break;\n- }\n- }\n- if (graphics->data.spice.image)\n- virBufferAsprintf(&opt, \",image-compression=%s\",\n- virDomainGraphicsSpiceImageCompressionTypeToString(graphics->data.spice.image));\n- if (graphics->data.spice.jpeg)\n- virBufferAsprintf(&opt, \",jpeg-wan-compression=%s\",\n- virDomainGraphicsSpiceJpegCompressionTypeToString(graphics->data.spice.jpeg));\n- if (graphics->data.spice.zlib)\n- virBufferAsprintf(&opt, \",zlib-glz-wan-compression=%s\",\n- virDomainGraphicsSpiceZlibCompressionTypeToString(graphics->data.spice.zlib));\n- if (graphics->data.spice.playback)\n- virBufferAsprintf(&opt, \",playback-compression=%s\",\n- virDomainGraphicsSpicePlaybackCompressionTypeToString(graphics->data.spice.playback));\n- if (graphics->data.spice.streaming)\n- virBufferAsprintf(&opt, \",streaming-video=%s\",\n- virDomainGraphicsSpiceStreamingModeTypeToString(graphics->data.spice.streaming));\n- if (graphics->data.spice.copypaste == VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_NO)\n- virBufferAddLit(&opt, \",disable-copy-paste\");\n-\n- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) {\n- \/* If qemu supports seamless migration turn it\n- * unconditionally on. If migration destination\n- * doesn't support it, it fallbacks to previous\n- * migration algorithm silently. *\/\n- virBufferAddLit(&opt, \",seamless-migration=on\");\n- }\n-\n- virCommandAddArg(cmd, \"-spice\");\n- virCommandAddArgBuffer(cmd, &opt);\n- if (graphics->data.spice.keymap)\n- virCommandAddArgList(cmd, \"-k\",\n- graphics->data.spice.keymap, NULL);\n- \/* SPICE includes native support for tunnelling audio, so we\n- * set the audio backend to point at SPICE's own driver\n- *\/\n- virCommandAddEnvString(cmd, \"QEMU_AUDIO_DRV=spice\");\n-\n+ if (qemuBuildGraphicsSPICECommandLine(cfg, cmd, qemuCaps, graphics) < 0)\n+ goto error;\n } else {\n virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n _(\"unsupported graphics type '%s'\"),\n"} {"commit":"c373622f60308927c6666e3c9a9698010944690b","subject":"Test PWM enable","message":"Test PWM enable\n","repos":"harry159821\/printipi,Wallacoloo\/printipi,Wallacoloo\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,harry159821\/printipi,Wallacoloo\/printipi,harry159821\/printipi,Igor-Rast\/printipi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/proof-of-concept\/DMA\/dma-gpio.c\n+++ code\/proof-of-concept\/DMA\/dma-gpio.c\n@@ -6,6 +6,9 @@\n * pg 38 for DMA\n * pg 61 for DMA DREQ PERMAP\n * pg 89 for gpio\n+ * pg 119 for PCM\n+ * pg 138 for PWM\n+ * pg 172 for timer info\n *\n * A few annotations for GPIO\/DMA\/PWM are available here: https:\/\/github.com\/626Pilot\/RaspberryPi-NeoPixel-WS2812\/blob\/master\/ws2812-RPi.c\n *\n@@ -24,8 +27,12 @@\n * Or use 2 dma channels:\n * Have one sending the data into PWM, which is DREQ limited\n * Have another copying from PWM Fifo to GPIOs at a non-limited rate. This is peripheral -> peripheral, so I think it will have its own data bus.\n- * Unfortunately, the destination can only be one word. Luckily, we have 2 PWM channels - one for setting & one for clearing GPIOs. All gpios that are broken out into the header are in the first register (I think)\n- * \n+ * Unfortunately, the destination can only be one word. Luckily, we have 2 PWM channels - one for setting & one for clearing GPIOs. All gpios that are broken out into the header are in the first register (verified)\n+ * Sadly, it appears that the PWM FIFO cannot be read from. One can read the current PWM output, but only if the FIFO is disabled, in which case the DREQ is too.\n+ *\n+ **Or use 1 dma channel, but additionally write to a dreq-able peripheral (PWM):\n+ * By using control-blocks, one can copy a word to the GPIOs, then have the next CB copy a word to the PWM fifo, and repeat\n+ * By having BOTH control-blocks be dreq-limited by the PWM's dreq, they can BOTH be rate-limited.\n *\n * http:\/\/www.raspberrypi.org\/forums\/viewtopic.php?f=44&t=26907\n * Says gpu halts all DMA for 16us every 500ms. Bypassable.\n@@ -104,6 +111,35 @@\n \n \/\/Dma Control Blocks must be located at addresses that are multiples of 32 bytes\n #define DMA_CONTROL_BLOCK_ALIGNMENT 32 \n+\n+#define PWM_BASE 0x2020C000\n+#define PWM_BASE_BUS 0x7E20C000\n+#define PWM_CTL 0x00000000 \/\/control register\n+#define PWM_STA 0x00000004 \/\/status register\n+#define PWM_DMAC 0x00000008 \/\/DMA control register\n+#define PWM_RNG1 0x00000010 \/\/channel 1 range register (# output bits to use per sample)\n+#define PWM_DAT1 0x00000014 \/\/channel 1 data\n+#define PWM_FIF1 0x00000018 \/\/channel 1 fifo (write to this register to queue an output)\n+#define PWM_RNG2 0x00000020 \/\/channel 2 range register\n+#define PWM_DAT2 0x00000024 \/\/channel 2 data\n+\n+#define PWM_CTL_USEFIFO2 (1<<13)\n+#define PWM_CTL_REPEATEMPTY2 (1<<10)\n+#define PWM_CTL_ENABLE2 (1<<8)\n+#define PWM_CTL_CLRFIFO (1<<6)\n+#define PWM_CTL_USEFIFO1 (1<<5)\n+#define PWM_CTL_REPEATEMPTY1 (1<<2)\n+#define PWM_CTL_ENABLE1 (1<<0)\n+\n+#define PWM_STA_BUSERR (1<<8)\n+#define PWM_STA_GAPERRS (0xf << 4)\n+#define PWM_STA_FIFOREADERR (1<<3)\n+#define PWM_STA_FIFOWRITEERR (1<<2)\n+#define PWM_STA_ERRS PWM_STA_BUSERR | PWM_STA_GAPERRS | PWM_STA_FIFOREADERR | PWM_STA_FIFOWRITEERR\n+\n+#define PWM_DMAC_EN (1<<31)\n+#define PWM_DMAC_PANIC(P) ((P&0xff)<<8)\n+#define PWM_DMAC_DREQ(D) ((D&0xff)<<0)\n \n \/\/set bits designated by (mask) at the address (dest) to (value), without affecting the other bits\n \/\/eg if x = 0b11001100\n@@ -172,6 +208,52 @@\n uint32_t _reserved[2];\n };\n \n+struct PwmHeader {\n+ volatile uint32_t CTL; \/\/ 0x00000000 \/\/control register\n+ \/\/16-31 reserved\n+ \/\/15 MSEN2 (0: PWM algorithm, 1:M\/S transmission used)\n+ \/\/14 reserved\n+ \/\/13 USEF2 (0: data register is used for transmission, 1: FIFO is used for transmission)\n+ \/\/12 POLA2 (0: 0=low, 1=high. 1: 0=high, 1=low (inversion))\n+ \/\/11 SBIT2; defines the state of the output when no transmission is in place\n+ \/\/10 RPTL2; 0: transmission interrupts when FIFO is empty. 1: last data in FIFO is retransmitted when FIFO is empty\n+ \/\/9 MODE2; 0: PWM mode. 1: serializer mode\n+ \/\/8 PWMEN2; 0: channel is disabled. 1: channel is enabled\n+ \/\/7 MSEN1;\n+ \/\/6 CLRF1; writing a 1 to this bit clears the channel 1 (and channel 2?) fifo\n+ \/\/5 USEF1;\n+ \/\/4 POLA1;\n+ \/\/3 SBIT1;\n+ \/\/2 RPTL1;\n+ \/\/1 MODE1;\n+ \/\/0 PWMEN1; \n+ volatile uint32_t STA; \/\/ 0x00000004 \/\/status register\n+ \/\/13-31 reserved\n+ \/\/9-12 STA1-4; indicates whether each channel is transmitting\n+ \/\/8 BERR; Bus Error Flag. Write 1 to clear\n+ \/\/4-7 GAPO1-4; Gap Occured Flag. Write 1 to clear\n+ \/\/3 RERR1; Fifo Read Error Flag (attempt to read empty fifo). Write 1 to clear\n+ \/\/2 WERR1; Fifo Write Error Flag (attempt to write to full fifo). Write 1 to clear\n+ \/\/1 EMPT1; Reads as 1 if fifo is empty\n+ \/\/0 FULL1; Reads as 1 if fifo is full\n+ volatile uint32_t DMAC; \/\/ 0x00000008 \/\/DMA control register\n+ \/\/31 ENAB; set to 1 to enable DMA\n+ \/\/16-30 reserved\n+ \/\/8-15 PANIC; DMA threshold for panic signal\n+ \/\/0-7 DREQ; DMA threshold for DREQ signal\n+ uint32_t _padding1;\n+ volatile uint32_t RNG1; \/\/ 0x00000010 \/\/channel 1 range register (# output bits to use per sample)\n+ \/\/0-31 PWM_RNGi; #of bits to modulate PWM. (eg if PWM_RNGi=1024, then each 32-bit sample sent through the FIFO will be modulated into 1024 bits.)\n+ volatile uint32_t DAT1; \/\/ 0x00000014 \/\/channel 1 data\n+ \/\/0-31 PWM_DATi; Stores the 32-bit data to be sent to the PWM controller ONLY WHEN USEFi=0 (FIFO is disabled)\n+ volatile uint32_t FIF1; \/\/ 0x00000018 \/\/channel 1 fifo (write to this register to queue an output)\n+ \/\/writing to this register will queue a sample into the fifo. If 2 channels are enabled, then each even sample (0-indexed) is sent to channel 1, and odd samples are sent to channel 2. WRITE-ONLY\n+ uint32_t _padding2;\n+ volatile uint32_t RNG2; \/\/ 0x00000020 \/\/channel 2 range register\n+ volatile uint32_t DAT2; \/\/ 0x00000024 \/\/channel 2 data\n+ \/\/0-31 PWM_DATi; Stores the 32-bit data to be sent to the PWM controller ONLY WHEN USEFi=1 (FIFO is enabled). TODO: Typo???\n+};\n+\n \/\/allocate a page & simultaneously determine its physical address.\n \/\/virtAddr and physAddr are essentially passed by-reference.\n \/\/this allows for:\n@@ -249,6 +331,7 @@\n \/\/now map \/dev\/mem into memory, but only map specific peripheral sections:\n volatile uint32_t *gpioBaseMem = mapPeripheral(memfd, GPIO_BASE);\n volatile uint32_t *dmaBaseMem = mapPeripheral(memfd, DMA_BASE);\n+ volatile uint32_t *pwmBaseMem = mapPeripheral(memfd, PWM_BASE);\n volatile uint32_t *timerBaseMem = mapPeripheral(memfd, TIMER_BASE);\n \n \/\/now set our pin (#4) as an output:\n@@ -276,8 +359,14 @@\n makeVirtPhysPage(&virtCbPage, &physCbPage);\n \n \/\/dedicate the first 8 bytes of this page to holding the cb.\n- struct DmaControlBlock *cbPwmToGpio = (struct DmaControlBlock*)virtCbPage;\n- struct DmaControlBlock *cb1 = (struct DmaControlBlock*)(virtCbPage+DMA_CONTROL_BLOCK_ALIGNMENT);\n+ struct DmaControlBlock *cb1 = (struct DmaControlBlock*)virtCbPage;\n+ struct DmaControlBlock *cb2 = (struct DmaControlBlock*)(virtCbPage+DMA_CONTROL_BLOCK_ALIGNMENT);\n+ struct PwmHeader *pwmHeader = (struct PwmHeader*)(pwmBaseMem);\n+ \n+ pwmHeader->STA = PWM_STA_ERRS; \/\/clear PWM errors\n+ pwmHeader->DMAC = PWM_DMAC_EN | PWM_DMAC_DREQ(7) | PWM_DMAC_PANIC(7);\n+ pwmHeader->RNG1 = 32; \/\/32-bit output periods (used only for timing purposes)\n+ pwmHeader->CTL = PWM_CTL_REPEATEMPTY1 | PWM_CTL_ENABLE1 | PWM_CTL_USEFIFO1;\n \n \/\/fill the control block:\n \/\/after each 4-byte copy, we want to increment the source and destination address of the copy, otherwise we'll be copying to the same address:\n@@ -287,7 +376,15 @@\n cb1->TXFR_LEN = 24; \/\/number of bytes to transfer\n cb1->STRIDE = 0; \/\/no 2D stride\n \/\/cb1->NEXTCONBK = (uint32_t)physCbPage; \/\/loop back to this block.\n- cb1->NEXTCONBK = 0; \/\/end block.\n+ \/\/cb1->NEXTCONBK = 0; \/\/end block.\n+ cb1->NEXTCONBK = (uint32_t)(physCbPage + ((void*)cb2-virtCbPage)); \/\/next block is control-block #2\n+ \n+ cb2->TI = DMA_CB_TI_PERMAP_PWM | DMA_CB_TI_DEST_DREQ | DMA_CB_TI_NO_WIDE_BURSTS;\n+ cb2->SOURCE_AD = (uint32_t)physSrcPage; \/\/can write junk into PWM, so just use an address that's likely to be cached already\n+ cb2->DEST_AD = PWM_BASE_BUS + PWM_FIF1; \/\/write to the FIFO\n+ cb2->TXFR_LEN = 4; \/\/just one sample\n+ cb2->STRIDE = 0; \/\/no 2D stride\n+ cb2->NEXTCONBK = 0; \/\/no next block.\n \n \/\/enable DMA channel (it's probably already enabled, but we want to be sure):\n writeBitmasked(dmaBaseMem + DMAENABLE, 1 << 3, 1 << 3);\n"} {"commit":"022f4d431b7fffc5caa28b9872a061360410e0b2","subject":"qemuDomainDiskControllerIsBusy: Fix logic of matching disk bus to controller type","message":"qemuDomainDiskControllerIsBusy: Fix logic of matching disk bus to controller type\n\nThe tests which match the disk bus to the controller type were backwards\nin this function. This meant that any disk bus type (such as\nVIR_DOMAIN_DISK_BUS_SATA) would not skip the controller index comparison\neven if the removed controller was of a different type.\n\nSwitch the internals to a switch statement with selects the controller\ntype in the first place and a proper type so that new controller types\nare added in the future.\n\nResolves: https:\/\/bugzilla.redhat.com\/show_bug.cgi?id=1870072\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"crobinso\/libvirt,crobinso\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,zippy2\/libvirt,zippy2\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,olafhering\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_hotplug.c\n+++ src\/qemu\/qemu_hotplug.c\n@@ -5327,15 +5327,47 @@\n continue;\n \n \/* check whether the disk uses this type controller *\/\n- if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE &&\n- detach->type != VIR_DOMAIN_CONTROLLER_TYPE_IDE)\n+ switch ((virDomainControllerType) detach->type) {\n+ case VIR_DOMAIN_CONTROLLER_TYPE_IDE:\n+ if (disk->bus != VIR_DOMAIN_DISK_BUS_IDE)\n+ continue;\n+ break;\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_FDC:\n+ if (disk->bus != VIR_DOMAIN_DISK_BUS_FDC)\n+ continue;\n+ break;\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:\n+ if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI)\n+ continue;\n+ break;\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_SATA:\n+ if (disk->bus != VIR_DOMAIN_DISK_BUS_SATA)\n+ continue;\n+ break;\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS:\n+ \/* xenbus is not supported by the qemu driver *\/\n continue;\n- if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC &&\n- detach->type != VIR_DOMAIN_CONTROLLER_TYPE_FDC)\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:\n+ \/* virtio-serial does not host any disks *\/\n continue;\n- if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI &&\n- detach->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI)\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_CCID:\n+ case VIR_DOMAIN_CONTROLLER_TYPE_USB:\n+ case VIR_DOMAIN_CONTROLLER_TYPE_PCI:\n+ case VIR_DOMAIN_CONTROLLER_TYPE_ISA:\n+ \/* These buses have (also) other device types too so they need to\n+ * be checked elsewhere *\/\n continue;\n+\n+ case VIR_DOMAIN_CONTROLLER_TYPE_LAST:\n+ default:\n+ continue;\n+ }\n \n if (disk->info.addr.drive.controller == detach->idx)\n return true;\n"} {"commit":"354e6d4ed0b71cc90084faea32c360ce86a85b42","subject":"qemu: Fix mem leak in qemuProcessInitCpuAffinity","message":"qemu: Fix mem leak in qemuProcessInitCpuAffinity\n\nIf placement mode is AUTO, on some return paths char *cpumap or\nchar *nodeset are leaked.\n","repos":"warewolf\/libvirt,andreabolognani\/libvirt,elmarco\/libvirt,dumbbell\/libvirt,iam-TJ\/libvirt,shugaoye\/libvirt,cbosdo\/libvirt,bjzhang\/libvirt,iam-TJ\/libvirt,cbosdo\/libvirt,dumbbell\/libvirt,foomango\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,rmarwaha\/libvirt,datto\/libvirt,olafhering\/libvirt,emaste\/libvirt,emaste\/libvirt,wiedi\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,iam-TJ\/libvirt,emaste\/libvirt,novel\/fbsd-libvirt,agx\/libvirt,cbosdo\/libvirt,wiedi\/libvirt,rmarwaha\/libvirt1,rmarwaha\/libvirt,foomango\/libvirt,elmarco\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,jeckersb\/libvirt,jeckersb\/libvirt,rmarwaha\/libvirt1,datto\/libvirt,foomango\/libvirt,emaste\/libvirt,libvirt\/libvirt,siboulet\/libvirt-openvz,rlaager\/libvirt,jeckersb\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,trainstack\/libvirt,andreabolognani\/libvirt,rmarwaha\/libvirt1,novel\/fbsd-libvirt,andreabolognani\/libvirt,warewolf\/libvirt,rlaager\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,foomango\/libvirt,wiedi\/libvirt,warewolf\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,novel\/fbsd-libvirt,elmarco\/libvirt,trainstack\/libvirt,trainstack\/libvirt,rmarwaha\/libvirt1,datto\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,cbosdo\/libvirt,novel\/fbsd-libvirt,nertpinx\/libvirt,trainstack\/libvirt,warewolf\/libvirt,rmarwaha\/libvirt,bjzhang\/libvirt,bjzhang\/libvirt,rmarwaha\/libvirt,emaste\/libvirt,emaste\/libvirt,shugaoye\/libvirt,nertpinx\/libvirt,rmarwaha\/libvirt1,taget\/libvirt,jardasgit\/libvirt,datto\/libvirt,rmarwaha\/libvirt,rlaager\/libvirt,jardasgit\/libvirt,taget\/libvirt,cbosdo\/libvirt,novel\/fbsd-libvirt,shugaoye\/libvirt,emaste\/libvirt,crobinso\/libvirt,siboulet\/libvirt-openvz,jardasgit\/libvirt,agx\/libvirt,jeckersb\/libvirt,novel\/fbsd-libvirt,agx\/libvirt,iam-TJ\/libvirt,olafhering\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,dumbbell\/libvirt,dumbbell\/libvirt,zippy2\/libvirt,datto\/libvirt,bjzhang\/libvirt,elmarco\/libvirt,wiedi\/libvirt,siboulet\/libvirt-openvz,rmarwaha\/libvirt1,VenkatDatta\/libvirt,olafhering\/libvirt,VenkatDatta\/libvirt,siboulet\/libvirt-openvz,taget\/libvirt,taget\/libvirt,dumbbell\/libvirt,elmarco\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,novel\/fbsd-libvirt,rmarwaha\/libvirt,novel\/fbsd-libvirt,warewolf\/libvirt,fabianfreyer\/libvirt,shugaoye\/libvirt,trainstack\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,jeckersb\/libvirt,agx\/libvirt,zippy2\/libvirt,wiedi\/libvirt,VenkatDatta\/libvirt,trainstack\/libvirt,foomango\/libvirt,eskultety\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,taget\/libvirt,jardasgit\/libvirt,iam-TJ\/libvirt,eskultety\/libvirt,warewolf\/libvirt,iam-TJ\/libvirt,novel\/fbsd-libvirt,crobinso\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,jeckersb\/libvirt,libvirt\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,warewolf\/libvirt,iam-TJ\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,trainstack\/libvirt,fabianfreyer\/libvirt,shugaoye\/libvirt,wiedi\/libvirt,rlaager\/libvirt,zippy2\/libvirt,rlaager\/libvirt,jeckersb\/libvirt,dumbbell\/libvirt,jardasgit\/libvirt,siboulet\/libvirt-openvz,wiedi\/libvirt,bjzhang\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_process.c\n+++ src\/qemu\/qemu_process.c\n@@ -1796,6 +1796,7 @@\n qemuProcessInitCpuAffinity(struct qemud_driver *driver,\n virDomainObjPtr vm)\n {\n+ int ret = -1;\n int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN;\n virNodeInfo nodeinfo;\n unsigned char *cpumap;\n@@ -1824,19 +1825,21 @@\n \n nodeset = qemuGetNumadAdvice(vm->def);\n if (!nodeset)\n- return -1;\n+ goto cleanup;\n \n if (VIR_ALLOC_N(tmp_cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) {\n virReportOOMError();\n- return -1;\n+ VIR_FREE(nodeset);\n+ goto cleanup;\n }\n \n if (virDomainCpuSetParse(nodeset, 0, tmp_cpumask,\n VIR_DOMAIN_CPUMASK_LEN) < 0) {\n VIR_FREE(tmp_cpumask);\n VIR_FREE(nodeset);\n- return -1;\n- }\n+ goto cleanup;\n+ }\n+ VIR_FREE(nodeset);\n \n for (i = 0; i < maxcpu && i < VIR_DOMAIN_CPUMASK_LEN; i++) {\n if (tmp_cpumask[i])\n@@ -1849,7 +1852,6 @@\n VIR_WARN(\"Unable to save status on vm %s after state change\",\n vm->def->name);\n }\n- VIR_FREE(nodeset);\n } else {\n if (vm->def->cpumask) {\n \/* XXX why don't we keep 'cpumask' in the libvirt cpumap\n@@ -1872,13 +1874,14 @@\n * running at this point\n *\/\n if (virProcessInfoSetAffinity(0, \/* Self *\/\n- cpumap, cpumaplen, maxcpu) < 0) {\n- VIR_FREE(cpumap);\n- return -1;\n- }\n+ cpumap, cpumaplen, maxcpu) < 0)\n+ goto cleanup;\n+\n+ ret = 0;\n+\n+cleanup:\n VIR_FREE(cpumap);\n-\n- return 0;\n+ return ret;\n }\n \n \/* set link states to down on interfaces at qemu start *\/\n"} {"commit":"b3c91b8a50ac0d772f883e737252202d48658139","subject":"qemu: process: Disallow VMs with 0 vcpus","message":"qemu: process: Disallow VMs with 0 vcpus\n\nCounterintuitively the user would end up with a VM with maximum number\nof vCPUs available.\n\nResolves: https:\/\/bugzilla.redhat.com\/show_bug.cgi?id=1290324\n","repos":"taget\/libvirt,zippy2\/libvirt,VenkatDatta\/libvirt,rlaager\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,libvirt\/libvirt,rlaager\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,taget\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,taget\/libvirt,jardasgit\/libvirt,datto\/libvirt,crobinso\/libvirt,rlaager\/libvirt,zippy2\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,taget\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,libvirt\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,datto\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,datto\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,rlaager\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_process.c\n+++ src\/qemu\/qemu_process.c\n@@ -3897,6 +3897,12 @@\n {\n unsigned int maxCpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, def->os.machine);\n \n+ if (virDomainDefGetVcpus(def) == 0) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n+ _(\"Domain requires at least 1 vCPU\"));\n+ return -1;\n+ }\n+\n if (maxCpus > 0 && virDomainDefGetVcpusMax(def) > maxCpus) {\n virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n _(\"Maximum CPUs greater than specified machine type limit\"));\n"} {"commit":"8ab121b57c5efe5f6f0cc26a5abbf8c77d87056e","subject":"fptu: rename fptu::string_view::nil().","message":"fptu: rename fptu::string_view::nil().\n","repos":"leo-yuriev\/libfpta,leo-yuriev\/libfpta,leo-yuriev\/libfptu,leo-yuriev\/libfptu","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fast_positive\/tuples.h\n+++ fast_positive\/tuples.h\n@@ -1469,7 +1469,7 @@\n constexpr const char *data() const { return str; }\n constexpr size_t length() const { return (len >= 0) ? (size_t)len : 0u; }\n constexpr bool empty() const { return len <= 0; }\n- constexpr bool null() const { return len < 0; }\n+ constexpr bool nil() const { return len < 0; }\n constexpr size_t size() const { return length(); }\n constexpr size_type max_size() const { return 32767; }\n \n"} {"commit":"63d5893b30be4e49706ad22788b8ae6eb33d296e","subject":"[NbtkGtkFrame] remove unused variable","message":"[NbtkGtkFrame] remove unused variable\n","repos":"clutter-project\/mx,jonnylamb\/mx,jonnylamb\/mx,pwithnall\/mx,pwithnall\/mx,pwithnall\/mx,jonnylamb\/mx,clutter-project\/mx,jonnylamb\/mx,pwithnall\/mx,clutter-project\/mx,clutter-project\/mx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- nbtk\/nbtk-gtk-frame.c\n+++ nbtk\/nbtk-gtk-frame.c\n@@ -220,7 +220,6 @@\n GtkAllocation *allocation)\n {\n GtkBin *bin = GTK_BIN (widget);\n- NbtkGtkFrame *nbtk_gtk_frame = NBTK_GTK_FRAME (widget);\n GtkFrame *frame = GTK_FRAME (widget);\n GtkAllocation child_allocation, title_allocation;\n int xmargin, ymargin;\n"} {"commit":"e80d8295a3e459db9aaabd7d770babfa510e40d0","subject":"ncd: modules: foreach: use int's instead of size_t's for statement indices","message":"ncd: modules: foreach: use int's instead of size_t's for statement indices\n\n","repos":"tempbottle\/badvpn,chrisballinger\/badvpn,chrisballinger\/badvpn,binondord\/badvpn,chrisballinger\/badvpn,PowerOlive\/badvpn,tempbottle\/badvpn,linfengfeiye\/badvpn,linfengfeiye\/badvpn,linfengfeiye\/badvpn,chrisballinger\/badvpn,Git-Host\/badvpn,PowerOlive\/badvpn,Git-Host\/badvpn,LazyZhu\/badvpn,tempbottle\/badvpn,LazyZhu\/badvpn,Git-Host\/badvpn,Git-Host\/badvpn,PowerOlive\/badvpn,LazyZhu\/badvpn,tempbottle\/badvpn,PowerOlive\/badvpn,tempbottle\/badvpn,linfengfeiye\/badvpn,LazyZhu\/badvpn,binondord\/badvpn,binondord\/badvpn,LazyZhu\/badvpn,binondord\/badvpn,PowerOlive\/badvpn,binondord\/badvpn,Git-Host\/badvpn,linfengfeiye\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/modules\/foreach.c\n+++ ncd\/modules\/foreach.c\n@@ -65,9 +65,12 @@\n *\/\n \n #include <stdlib.h>\n+#include <string.h>\n+#include <limits.h>\n \n #include <misc\/balloc.h>\n #include <misc\/string_begins_with.h>\n+#include <misc\/debug.h>\n #include <system\/BReactor.h>\n #include <ncd\/NCDModule.h>\n \n@@ -90,22 +93,21 @@\n \n struct instance {\n NCDModuleInst *i;\n- int type;\n const char *template_name;\n NCDValRef args;\n const char *name1;\n const char *name2;\n BTimer timer;\n- size_t num_elems;\n struct element *elems;\n- size_t gp; \/\/ good pointer\n- size_t ip; \/\/ initialized pointer\n+ int type;\n+ int num_elems;\n+ int gp; \/\/ good pointer\n+ int ip; \/\/ initialized pointer\n int state;\n };\n \n struct element {\n struct instance *inst;\n- size_t i;\n union {\n struct {\n NCDValRef list_elem;\n@@ -116,6 +118,7 @@\n };\n };\n NCDModuleProcess process;\n+ int i;\n int state;\n };\n \n@@ -134,13 +137,16 @@\n \n static void assert_state (struct instance *o)\n {\n+ ASSERT(o->num_elems >= 0)\n+ ASSERT(o->gp >= 0)\n+ ASSERT(o->ip >= 0)\n ASSERT(o->gp <= o->num_elems)\n ASSERT(o->ip <= o->num_elems)\n ASSERT(o->gp <= o->ip)\n \n #ifndef NDEBUG\n \/\/ check GP\n- for (size_t i = 0; i < o->gp; i++) {\n+ for (int i = 0; i < o->gp; i++) {\n if (i == o->gp - 1) {\n ASSERT(o->elems[i].state == ESTATE_UP || o->elems[i].state == ESTATE_DOWN ||\n o->elems[i].state == ESTATE_WAITING)\n@@ -150,14 +156,14 @@\n }\n \n \/\/ check IP\n- size_t ip = o->num_elems;\n+ int ip = o->num_elems;\n while (ip > 0 && o->elems[ip - 1].state == ESTATE_FORGOTTEN) {\n ip--;\n }\n ASSERT(o->ip == ip)\n \n \/\/ check gap\n- for (size_t i = o->gp; i < o->ip; i++) {\n+ for (int i = o->gp; i < o->ip; i++) {\n if (i == o->ip - 1) {\n ASSERT(o->elems[i].state == ESTATE_UP || o->elems[i].state == ESTATE_DOWN ||\n o->elems[i].state == ESTATE_WAITING || o->elems[i].state == ESTATE_TERMINATING)\n@@ -410,7 +416,7 @@\n }\n \n char str[64];\n- snprintf(str, sizeof(str), \"%zu\", e->i);\n+ snprintf(str, sizeof(str), \"%d\", e->i);\n \n *out = NCDVal_NewString(mem, str);\n if (NCDVal_IsInvalid(*out)) {\n@@ -490,20 +496,27 @@\n btime_t retry_time = NCDModuleInst_Backend_InterpGetRetryTime(i);\n BTimer_Init(&o->timer, retry_time, (BTimer_handler)timer_handler, o);\n \n+ size_t num_elems;\n NCDValMapElem cur_map_elem;\n \n switch (o->type) {\n case NCDVAL_LIST: {\n- o->num_elems = NCDVal_ListCount(collection);\n+ num_elems = NCDVal_ListCount(collection);\n } break;\n case NCDVAL_MAP: {\n- o->num_elems = NCDVal_MapCount(collection);\n+ num_elems = NCDVal_MapCount(collection);\n cur_map_elem = NCDVal_MapOrderedFirst(collection); \n } break;\n default:\n ModuleLog(i, BLOG_ERROR, \"invalid collection type\");\n goto fail0;\n }\n+ \n+ if (num_elems > INT_MAX) {\n+ ModuleLog(i, BLOG_ERROR, \"too many elements\");\n+ goto fail0;\n+ }\n+ o->num_elems = num_elems;\n \n \/\/ allocate elements\n if (!(o->elems = BAllocArray(o->num_elems, sizeof(o->elems[0])))) {\n@@ -511,7 +524,7 @@\n goto fail0;\n }\n \n- for (size_t j = 0; j < o->num_elems; j++) {\n+ for (int j = 0; j < o->num_elems; j++) {\n struct element *e = &o->elems[j];\n \n \/\/ set instance\n"} {"commit":"31201d49033a0519e3272e3359ca75b97c183e6d","subject":"FFmpeg: Fix build","message":"FFmpeg: Fix build\n","repos":"libretro\/mgba,Iniquitatis\/mgba,libretro\/mgba,mgba-emu\/mgba,libretro\/mgba,mgba-emu\/mgba,libretro\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,Iniquitatis\/mgba,libretro\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/feature\/ffmpeg\/ffmpeg-encoder.c\n+++ src\/feature\/ffmpeg\/ffmpeg-encoder.c\n@@ -12,7 +12,7 @@\n \n #include <libavcodec\/version.h>\n #include <libavcodec\/avcodec.h>\n-#if LIBAVCODEC_VERSION_MAJOR >= 58\n+#if LIBAVCODEC_VERSION_MAJOR >= 59\n #include <libavcodec\/bsf.h>\n #endif\n \n"} {"commit":"eed664e077cb768c44638608cf46de056163ffff","subject":"fixed some mistakes","message":"fixed some mistakes\n","repos":"ReCodEx\/worker,ReCodEx\/worker,ReCodEx\/worker","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/fileman\/prefixed_file_manager.h\n+++ src\/fileman\/prefixed_file_manager.h\n@@ -4,12 +4,12 @@\n #include <memory>\n #include \"file_manager_base.h\"\n \n-class prefixed_file_manager : file_manager_base {\n+class prefixed_file_manager : public file_manager_base {\n private:\n \tconst std::string prefix_;\n \tstd::shared_ptr<file_manager_base> fm_;\n public:\n-\tprefixed_file_manager(std::shared_ptr<file_manager_base> fm_, const std::string &prefix);\n+\tprefixed_file_manager(std::shared_ptr<file_manager_base> fm, const std::string &prefix);\n \tvirtual void get_file(const std::string &src_name, const std::string &dst_path);\n \tvirtual void put_file(const std::string &src_name, const std::string &dst_path);\n };\n"} {"commit":"841a66f784facae1ebc3d638e9f629c16d4ac867","subject":"Fixed small bug","message":"Fixed small bug\n","repos":"guptashail\/SYMPHONY,tkralphs\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,guptashail\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,tkralphs\/SYMPHONY","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- src\/LP\/lp_wrapper.c\n+++ src\/LP\/lp_wrapper.c\n@@ -584,6 +584,8 @@\n \n cnt = collect_nonzeros(p, lp_data->x, indices, values);\n \n+ heur_solution = (double *) malloc(lp_data->n*DSIZE);\n+ \n #ifdef USE_SYM_APPLICATION\n user_res = user_is_feasible(p->user, lpetol, cnt, indices, values,\n \t\t\t &feasible, &true_objval, branching,\n"} {"commit":"a297cbf124605ee9bef2ce592c951ce6d3077eb5","subject":"example: classifier: add odp_cls_cos_pool_set() api","message":"example: classifier: add odp_cls_cos_pool_set() api\n\nAdds packet pool to CoS using odp_cls_cos_pool_set() api.\n\nSigned-off-by: Balasubramanian Manoharan <affd9aba178b6c6e9aaff69252817fd03d71ae35@linaro.org>\nReviewed-by: Petri Savolainen <d528fd253b9aaf78fa72edbcc6249e82047f6ce6@nokia.com>\nReviewed-and-tested-by: Bill Fischofer <52f3c909d51cc5d355a68a403df6906b3c1a8f83@linaro.org>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"nmorey\/odp,erachmi\/odp,ravineet-singh\/odp,nmorey\/odp,nmorey\/odp,ravineet-singh\/odp,dkrot\/odp,mike-holmes-linaro\/odp,rsalveti\/odp,kalray\/odp-mppa,kalray\/odp-mppa,mike-holmes-linaro\/odp,rsalveti\/odp,rsalveti\/odp,dkrot\/odp,erachmi\/odp,mike-holmes-linaro\/odp,erachmi\/odp,mike-holmes-linaro\/odp,erachmi\/odp,kalray\/odp-mppa,dkrot\/odp,kalray\/odp-mppa,ravineet-singh\/odp,kalray\/odp-mppa,dkrot\/odp,nmorey\/odp,kalray\/odp-mppa,ravineet-singh\/odp,rsalveti\/odp,kalray\/odp-mppa,rsalveti\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example\/classifier\/odp_classifier.c\n+++ example\/classifier\/odp_classifier.c\n@@ -49,10 +49,12 @@\n \n typedef struct {\n \todp_queue_t queue;\t\/**< Associated queue handle *\/\n+\todp_pool_t pool;\t\/**< Associated pool handle *\/\n \todp_cos_t cos;\t\t\/**< Associated cos handle *\/\n \todp_pmr_t pmr;\t\t\/**< Associated pmr handle *\/\n-\todp_atomic_u64_t packet_count;\t\/**< count of received packets *\/\n-\tchar queue_name[ODP_QUEUE_NAME_LEN];\t\/**< queue name *\/\n+\todp_atomic_u64_t queue_pkt_count; \/**< count of received packets *\/\n+\todp_atomic_u64_t pool_pkt_count; \/**< count of received packets *\/\n+\tchar cos_name[ODP_COS_NAME_LEN];\t\/**< cos name *\/\n \tstruct {\n \t\todp_pmr_term_e term;\t\/**< odp pmr term value *\/\n \t\tuint64_t val;\t\/**< pmr term value *\/\n@@ -85,8 +87,8 @@\n static void parse_args(int argc, char *argv[], appl_args_t *appl_args);\n static void print_info(char *progname, appl_args_t *appl_args);\n static void usage(char *progname);\n-static void configure_cos_queue(odp_pktio_t pktio, appl_args_t *args);\n-static void configure_default_queue(odp_pktio_t pktio, appl_args_t *args);\n+static void configure_cos(odp_pktio_t pktio, appl_args_t *args);\n+static void configure_default_cos(odp_pktio_t pktio, appl_args_t *args);\n static int convert_str_to_pmr_enum(char *token, odp_pmr_term_e *term,\n \t\t\t\t uint32_t *offset);\n static int parse_pmr_policy(appl_args_t *appl_args, char *argv[], char *optarg);\n@@ -109,12 +111,12 @@\n \tprintf(\"\\n\");\n \tprintf(\"CONFIGURATION\\n\");\n \tprintf(\"\\n\");\n-\tprintf(\"QUEUE\\tVALUE\\t\\tMASK\\n\");\n+\tprintf(\"COS\\tVALUE\\t\\tMASK\\n\");\n \tfor (i = 0; i < 40; i++)\n \t\tprintf(\"-\");\n \tprintf(\"\\n\");\n \tfor (i = 0; i < args->policy_count - 1; i++) {\n-\t\tprintf(\"%s\\t\", args->stats[i].queue_name);\n+\t\tprintf(\"%s\\t\", args->stats[i].cos_name);\n \t\tprintf(\"%s\\t\", args->stats[i].value);\n \t\tprintf(\"%s\\n\", args->stats[i].mask);\n \t}\n@@ -124,8 +126,11 @@\n \t\tprintf(\"-\");\n \tprintf(\"\\n\");\n \tfor (i = 0; i < args->policy_count; i++)\n-\t\tprintf(\"%-12s \", args->stats[i].queue_name);\n+\t\tprintf(\"%-12s |\", args->stats[i].cos_name);\n \tprintf(\"Total Packets\");\n+\tprintf(\"\\n\");\n+\tfor (i = 0; i < args->policy_count; i++)\n+\t\tprintf(\"%-6s %-6s|\", \"queue\", \"pool\");\n \tprintf(\"\\n\");\n \n \ttimeout = args->time;\n@@ -136,10 +141,14 @@\n \t\tinfinite = 1;\n \n \tfor (; timeout > 0 || infinite; timeout--) {\n-\t\tfor (i = 0; i < args->policy_count; i++)\n-\t\t\tprintf(\"%-12\" PRIu64 \" \",\n+\t\tfor (i = 0; i < args->policy_count; i++) {\n+\t\t\tprintf(\"%-6\" PRIu64 \" \",\n \t\t\t odp_atomic_load_u64(&args->stats[i]\n-\t\t\t\t\t\t .packet_count));\n+\t\t\t\t\t\t .queue_pkt_count));\n+\t\t\tprintf(\"%-6\" PRIu64 \"|\",\n+\t\t\t odp_atomic_load_u64(&args->stats[i]\n+\t\t\t\t\t\t .pool_pkt_count));\n+\t\t}\n \n \t\tprintf(\"%-\" PRIu64, odp_atomic_load_u64(&args->\n \t\t\t\t\t\t\ttotal_packets));\n@@ -278,6 +287,7 @@\n \tint thr;\n \todp_queue_t outq_def;\n \todp_packet_t pkt;\n+\todp_pool_t pool;\n \todp_event_t ev;\n \tunsigned long err_cnt = 0;\n \todp_queue_t queue;\n@@ -317,13 +327,16 @@\n \t\t\treturn NULL;\n \t\t}\n \n+\t\tpool = odp_packet_pool(pkt);\n+\n \t\t\/* Swap Eth MACs and possibly IP-addrs before sending back *\/\n \t\tswap_pkt_addrs(&pkt, 1);\n-\n \t\tfor (i = 0; i < MAX_PMR_COUNT; i++) {\n \t\t\tstats = &appl->stats[i];\n \t\t\tif (queue == stats->queue)\n-\t\t\t\todp_atomic_inc_u64(&stats->packet_count);\n+\t\t\t\todp_atomic_inc_u64(&stats->queue_pkt_count);\n+\t\t\tif (pool == stats->pool)\n+\t\t\t\todp_atomic_inc_u64(&stats->pool_pkt_count);\n \t\t}\n \n \t\tif (appl->appl_mode == APPL_MODE_DROP)\n@@ -340,16 +353,18 @@\n \treturn NULL;\n }\n \n-static void configure_default_queue(odp_pktio_t pktio, appl_args_t *args)\n+static void configure_default_cos(odp_pktio_t pktio, appl_args_t *args)\n {\n \todp_queue_param_t qparam;\n \todp_cos_t cos_default;\n-\tchar cos_name[ODP_COS_NAME_LEN];\n \tconst char *queue_name = \"DefaultQueue\";\n+\tconst char *pool_name = \"DefaultPool\";\n+\tconst char *cos_name = \"DefaultCos\";\n \todp_queue_t queue_default;\n+\todp_pool_t pool_default;\n+\todp_pool_param_t pool_params;\n \tglobal_statistics *stats = args->stats;\n \n-\tsnprintf(cos_name, sizeof(cos_name), \"Default%s\", args->if_name);\n \tcos_default = odp_cos_create(cos_name);\n \n \todp_queue_param_init(&qparam);\n@@ -364,6 +379,24 @@\n \t\texit(EXIT_FAILURE);\n \t}\n \n+\todp_pool_param_init(&pool_params);\n+\tpool_params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE;\n+\tpool_params.pkt.len = SHM_PKT_POOL_BUF_SIZE;\n+\tpool_params.pkt.num = SHM_PKT_POOL_SIZE \/ SHM_PKT_POOL_BUF_SIZE;\n+\tpool_params.type = ODP_POOL_PACKET;\n+\n+\tpool_default = odp_pool_create(pool_name, &pool_params);\n+\n+\tif (pool_default == ODP_POOL_INVALID) {\n+\t\tEXAMPLE_ERR(\"Error: default pool create failed.\\n\");\n+\t\texit(EXIT_FAILURE);\n+\t}\n+\n+\tif (0 > odp_cls_cos_pool_set(cos_default, pool_default)) {\n+\t\tEXAMPLE_ERR(\"odp_cls_cos_pool_set failed\");\n+\t\texit(EXIT_FAILURE);\n+\t}\n+\n \tif (0 > odp_pktio_default_cos_set(pktio, cos_default)) {\n \t\tEXAMPLE_ERR(\"odp_pktio_default_cos_set failed\");\n \t\texit(EXIT_FAILURE);\n@@ -371,17 +404,21 @@\n \tstats[args->policy_count].cos = cos_default;\n \t\/* add default queue to global stats *\/\n \tstats[args->policy_count].queue = queue_default;\n-\tsnprintf(stats[args->policy_count].queue_name,\n-\t\t sizeof(stats[args->policy_count].queue_name),\n-\t\t \"%s\", queue_name);\n-\todp_atomic_init_u64(&stats[args->policy_count].packet_count, 0);\n+\tstats[args->policy_count].pool = pool_default;\n+\tsnprintf(stats[args->policy_count].cos_name,\n+\t\t sizeof(stats[args->policy_count].cos_name),\n+\t\t \"%s\", cos_name);\n+\todp_atomic_init_u64(&stats[args->policy_count].queue_pkt_count, 0);\n+\todp_atomic_init_u64(&stats[args->policy_count].pool_pkt_count, 0);\n \targs->policy_count++;\n }\n \n-static void configure_cos_queue(odp_pktio_t pktio, appl_args_t *args)\n+static void configure_cos(odp_pktio_t pktio, appl_args_t *args)\n {\n \tchar cos_name[ODP_COS_NAME_LEN];\n \tchar queue_name[ODP_QUEUE_NAME_LEN];\n+\tchar pool_name[ODP_POOL_NAME_LEN];\n+\todp_pool_param_t pool_params;\n \tint i;\n \tglobal_statistics *stats;\n \todp_queue_param_t qparam;\n@@ -389,7 +426,7 @@\n \tfor (i = 0; i < args->policy_count; i++) {\n \t\tstats = &args->stats[i];\n \t\tsnprintf(cos_name, sizeof(cos_name), \"CoS%s\",\n-\t\t\t stats->queue_name);\n+\t\t\t stats->cos_name);\n \t\tstats->cos = odp_cos_create(cos_name);\n \n \t\tconst odp_pmr_match_t match = {\n@@ -406,22 +443,44 @@\n \t\tqparam.sched.sync = ODP_SCHED_SYNC_NONE;\n \t\tqparam.sched.group = ODP_SCHED_GROUP_ALL;\n \n-\t\tsnprintf(queue_name, sizeof(queue_name), \"%s%d\",\n-\t\t\t args->stats[i].queue_name, i);\n+\t\tsnprintf(queue_name, sizeof(queue_name), \"%sQueue%d\",\n+\t\t\t args->stats[i].cos_name, i);\n \t\tstats->queue = odp_queue_create(queue_name,\n \t\t\t\t\t\t ODP_QUEUE_TYPE_SCHED,\n \t\t\t\t\t\t &qparam);\n+\t\tif (ODP_QUEUE_INVALID == stats->queue) {\n+\t\t\tEXAMPLE_ERR(\"odp_queue_create failed\");\n+\t\t\texit(EXIT_FAILURE);\n+\t\t}\n+\n \t\tif (0 > odp_cos_queue_set(stats->cos, stats->queue)) {\n \t\t\tEXAMPLE_ERR(\"odp_cos_queue_set failed\");\n \t\t\texit(EXIT_FAILURE);\n \t\t}\n \n+\t\todp_pool_param_init(&pool_params);\n+\t\tpool_params.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE;\n+\t\tpool_params.pkt.len = SHM_PKT_POOL_BUF_SIZE;\n+\t\tpool_params.pkt.num = SHM_PKT_POOL_SIZE \/\n+\t\t\t\t\tSHM_PKT_POOL_BUF_SIZE;\n+\t\tpool_params.type = ODP_POOL_PACKET;\n+\n+\t\tsnprintf(pool_name, sizeof(pool_name), \"%sPool%d\",\n+\t\t\t args->stats[i].cos_name, i);\n+\t\tstats->pool = odp_pool_create(pool_name, &pool_params);\n+\n+\t\tif (0 > odp_cls_cos_pool_set(stats->cos, stats->pool)) {\n+\t\t\tEXAMPLE_ERR(\"odp_cls_cos_pool_set failed\");\n+\t\t\texit(EXIT_FAILURE);\n+\t\t}\n+\n \t\tif (0 > odp_pktio_pmr_cos(stats->pmr, pktio, stats->cos)) {\n \t\t\tEXAMPLE_ERR(\"odp_pktio_pmr_cos failed\");\n \t\t\texit(EXIT_FAILURE);\n \t\t}\n \n-\t\todp_atomic_init_u64(&stats->packet_count, 0);\n+\t\todp_atomic_init_u64(&stats->queue_pkt_count, 0);\n+\t\todp_atomic_init_u64(&stats->pool_pkt_count, 0);\n \t}\n }\n \n@@ -440,6 +499,7 @@\n \todp_pool_param_t params;\n \todp_pktio_t pktio;\n \tappl_args_t *args;\n+\todp_queue_t inq;\n \todp_shm_t shm;\n \n \t\/* Init ODP before calling anything else *\/\n@@ -494,7 +554,7 @@\n \todp_pool_param_init(¶ms);\n \tparams.pkt.seg_len = SHM_PKT_POOL_BUF_SIZE;\n \tparams.pkt.len = SHM_PKT_POOL_BUF_SIZE;\n-\tparams.pkt.num = SHM_PKT_POOL_SIZE\/SHM_PKT_POOL_BUF_SIZE;\n+\tparams.pkt.num = SHM_PKT_POOL_SIZE \/ SHM_PKT_POOL_BUF_SIZE;\n \tparams.type = ODP_POOL_PACKET;\n \n \tpool = odp_pool_create(\"packet_pool\", ¶ms);\n@@ -510,10 +570,10 @@\n \t\/* create pktio per interface *\/\n \tpktio = create_pktio(args->if_name, pool);\n \n-\tconfigure_cos_queue(pktio, args);\n-\n-\t\/* configure default Cos and default queue *\/\n-\tconfigure_default_queue(pktio, args);\n+\tconfigure_cos(pktio, args);\n+\n+\t\/* configure default Cos *\/\n+\tconfigure_default_cos(pktio, args);\n \n \tif (odp_pktio_start(pktio)) {\n \t\tEXAMPLE_ERR(\"Error: unable to start pktio.\\n\");\n@@ -542,10 +602,16 @@\n \tfor (i = 0; i < args->policy_count; i++) {\n \t\todp_cos_destroy(args->stats[i].cos);\n \t\todp_queue_destroy(args->stats[i].queue);\n+\t\todp_pool_destroy(args->stats[i].pool);\n \t}\n \n \tfree(args->if_name);\n \todp_shm_free(shm);\n+\todp_pool_destroy(pool);\n+\tinq = odp_pktio_inq_getdef(pktio);\n+\todp_pktio_inq_remdef(pktio);\n+\todp_queue_destroy(inq);\n+\todp_pktio_close(pktio);\n \tprintf(\"Exit\\n\\n\");\n \n \treturn 0;\n@@ -706,7 +772,7 @@\n \t\/* Queue Name *\/\n \ttoken = strtok(NULL, \":\");\n \n-\tstrncpy(stats[policy_count].queue_name, token, ODP_QUEUE_NAME_LEN - 1);\n+\tstrncpy(stats[policy_count].cos_name, token, ODP_QUEUE_NAME_LEN - 1);\n \tappl_args->policy_count++;\n \tfree(pmr_str);\n \treturn 0;\n"} {"commit":"d2724a773360d1fb566f1aa6e39bd6a4ef4cc128","subject":"Minor improvement","message":"Minor improvement\n\nChanged a Uint8 to a Uint64 in AE_PseudoRandomFromSeed_Int()","repos":"WulffHunter\/ArrentalEngine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arrental_engine.c\n+++ arrental_engine.c\n@@ -1295,7 +1295,7 @@\n int AE_PseudoRandomFromSeed_Int(Uint64 seed, int x, int y, Uint64 set, int min, int max)\n {\n \/\/Create a shifted number to manipulate the seed value based on the set\n- Uint8 setshift_1 = ((set << x)) | ((Uint8)pow(set,3));\n+ Uint8 setshift_1 = ((set << x)) | ((Uint64)pow(set,3));\n Uint8 setshift_2 = ((set << y)) | set;\n Uint8 setshift_3 = set + x + y - setshift_1;\n Uint8 setshift_4 = -set - x - y + setshift_2;\n"} {"commit":"8d69fc108d0a92713f770cffdb7bddd3f77da484","subject":"base update","message":"base update\n","repos":"grrrwaaa\/max_kinect,grrrwaaa\/max_kinect","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/MaxKinectBase.h\n+++ src\/MaxKinectBase.h\n@@ -296,82 +296,7 @@\n \t}\n \t\n \tvoid depth_map(t_symbol * name) {\n-\t\tt_jit_matrix_info in_info;\n-\t\tlong in_savelock;\n-\t\tchar * in_bp;\n-\t\tt_jit_err err = 0;\n-\t\t\n-\t\t\/\/ get matrix from name:\n-\t\tvoid * in_mat = jit_object_findregistered(name);\n-\t\tif (!in_mat) {\n-\t\t\tobject_error(&ob, \"failed to acquire matrix\");\n-\t\t\terr = JIT_ERR_INVALID_INPUT;\n-\t\t\tgoto out;\n-\t\t}\n-\t\t\n-\t\t\/\/ lock it:\n-\t\tin_savelock = (long)jit_object_method(in_mat, _jit_sym_lock, 1);\n-\t\t\n-\t\t\/\/ first ensure the type is correct:\n-\t\tjit_object_method(in_mat, _jit_sym_getinfo, &in_info);\n-\t\tjit_object_method(in_mat, _jit_sym_getdata, &in_bp);\n-\t\tif (!in_bp) {\n-\t\t\terr = JIT_ERR_INVALID_INPUT;\n-\t\t\tgoto unlock;\n-\t\t}\n-\t\t\n-\t\tif (in_info.planecount != 2) {\n-\t\t\terr = JIT_ERR_MISMATCH_PLANE;\n-\t\t\tgoto unlock;\n-\t\t}\n-\t\t\n-\t\tif (in_info.type != _jit_sym_float32) {\n-\t\t\terr = JIT_ERR_MISMATCH_TYPE;\n-\t\t\tgoto unlock;\n-\t\t}\n-\t\t\n-\t\tif (in_info.dimcount != 2 || in_info.dim[0] != DEPTH_WIDTH || in_info.dim[1] != DEPTH_HEIGHT) {\n-\t\t\terr = JIT_ERR_MISMATCH_DIM;\n-\t\t\tgoto unlock;\n-\t\t}\n-\n-\t\t\/\/ copy matrix data into depth map:\n-\t\tfor (int i=0, y=0; y<DEPTH_HEIGHT; y++) {\n-\t\t\t\/\/ get row pointer:\n-\t\t\tchar * ip = in_bp + y*in_info.dimstride[1];\n-\t\t\t\n-\t\t\tfor (int x=0; x<DEPTH_WIDTH; x++, i++) {\n-\t\t\t\t\n-\t\t\t\t\/\/ convert column pointer to vec2f:\n-\t\t\t\tconst vec2f& v = *(vec2f *)(ip);\n-\t\t\t\tfloat ix = (v.x);\n-\t\t\t\tfloat iy = (v.y);\n-\t\t\t\t\n-\t\t\t\t\/\/ shift index by +0.5 so that (int) rounding (in cloud_process) \n-\t\t\t\t\/\/ puts it in the proper pixel center\n-\t\t\t\tix += 0.5;\n-\t\t\t\tiy += 0.5;\n-\t\t\t\t\n-\t\t\t\t\/\/ clip at boundaries:\n-\t\t\t\tix = ix < 0 ? 0 : ix >= DEPTH_WIDTH-1 ? DEPTH_WIDTH-1 : ix;\n-\t\t\t\tiy = iy < 0 ? 0 : iy >= DEPTH_HEIGHT-1 ? DEPTH_HEIGHT-1 : iy;\n-\t\t\t\t\n-\t\t\t\t\/\/ store:\n-\t\t\t\tdepth_map_data[i].x = ix;\n-\t\t\t\tdepth_map_data[i].y = iy;\n-\t\t\t\t\n-\t\t\t\t\/\/ move to next column:\n-\t\t\t\tip += in_info.dimstride[0];\n-\t\t\t}\n-\t\t}\n-\t\t\n-\tunlock:\n-\t\t\/\/ restore matrix lock state:\n-\t\tjit_object_method(in_mat, _jit_sym_lock, in_savelock);\n-\tout:\n-\t\tif (err) {\n-\t\t\tjit_error_code(&ob, err);\n-\t\t}\n+\t\t`\n \t}\n \t\n \tvoid rgb_map(t_symbol * name) {\n"} {"commit":"ab6c10bfda0b61952add512858e1677d2f90fe10","subject":"calendardemo: Fix for symbian build (again)","message":"calendardemo: Fix for symbian build (again)\n","repos":"qtproject\/qt-mobility,kaltsi\/qt-mobility,tmcguire\/qt-mobility,kaltsi\/qt-mobility,enthought\/qt-mobility,enthought\/qt-mobility,enthought\/qt-mobility,kaltsi\/qt-mobility,kaltsi\/qt-mobility,tmcguire\/qt-mobility,kaltsi\/qt-mobility,tmcguire\/qt-mobility,enthought\/qt-mobility,qtproject\/qt-mobility,qtproject\/qt-mobility,enthought\/qt-mobility,enthought\/qt-mobility,KDE\/android-qt-mobility,tmcguire\/qt-mobility,tmcguire\/qt-mobility,qtproject\/qt-mobility,kaltsi\/qt-mobility,KDE\/android-qt-mobility,qtproject\/qt-mobility,KDE\/android-qt-mobility,KDE\/android-qt-mobility,qtproject\/qt-mobility","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/calendardemo\/src\/daypage.h\n+++ examples\/calendardemo\/src\/daypage.h\n@@ -57,6 +57,7 @@\n class QListWidget;\n class QListWidgetItem;\n class QMenuBar;\n+class QMenu;\n \n class DayPage : public QWidget\n {\n"} {"commit":"982cdd10a3edaee5cde68cb8205ef28d97c59a8a","subject":"more on ccn_btree_insert_entry","message":"more on ccn_btree_insert_entry\n","repos":"svartika\/ccnx,cawka\/ndnx,ebollens\/ccnmp,svartika\/ccnx,svartika\/ccnx,svartika\/ccnx,svartika\/ccnx,ebollens\/ccnmp,cawka\/ndnx,svartika\/ccnx,cawka\/ndnx,cawka\/ndnx,ebollens\/ccnmp,cawka\/ndnx,ebollens\/ccnmp,svartika\/ccnx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- csrc\/lib2\/ccn_btree.c\n+++ csrc\/lib2\/ccn_btree.c\n@@ -406,23 +406,55 @@\n return(srchres);\n }\n \n+\/* See if we can reuse a leading portion of the key *\/\n+static void\n+scan_reusable(const unsigned char *key, size_t keysize,\n+ struct ccn_btree_node *node, int ndx, unsigned reuse[2])\n+{\n+ \/* this is an optimization - leave out for now *\/\n+}\n+\n int\n ccn_btree_insert_entry(struct ccn_btree *btree,\n const unsigned char *key, size_t keysize,\n- struct ccn_btree_node *leaf, int i,\n+ struct ccn_btree_node *node, int i,\n void *payload, size_t payload_bytes)\n {\n size_t k, pb;\n- \n+ struct ccn_btree_entry_trailer space;\n+ struct ccn_btree_entry_trailer *t = &space;\n+ unsigned reuse[2] = {0, 0};\n+ \n+ if (node->freelow == 0)\n+ ccn_btree_chknode(node, 0);\n+ if (node->corrupt)\n+ return(-1);\n pb = (payload_bytes + CCN_BT_SIZE_UNITS - 1)\n \/ CCN_BT_SIZE_UNITS\n * CCN_BT_SIZE_UNITS;\n- k = ccn_btree_node_getentrysize(leaf);\n+ k = ccn_btree_node_getentrysize(node);\n if (k == 0)\n k = pb + sizeof(struct ccn_btree_entry_trailer);\n if (k != pb + sizeof(struct ccn_btree_entry_trailer))\n return(-1);\n- abort();\n+ scan_reusable(key, keysize, node, i, reuse);\n+ if (reuse[1] != 0) {\n+ MYSTORE(t, koff0, reuse[0]);\n+ MYSTORE(t, ksiz0, reuse[1]);\n+ MYSTORE(t, koff1, node->freelow);\n+ MYSTORE(t, ksiz1, keysize - reuse[1]);\n+ }\n+ else {\n+ MYSTORE(t, koff0, node->freelow);\n+ MYSTORE(t, ksiz0, keysize);\n+ MYSTORE(t, koff1, 0);\n+ MYSTORE(t, ksiz1, 0);\n+ }\n+ MYSTORE(t, level, ccn_btree_node_level(node));\n+ MYSTORE(t, entsz, k \/ CCN_BT_SIZE_UNITS);\n+ if (keysize != reuse[1] && node->clean > node->freelow)\n+ node->clean = node->freelow;\n+ return(-1); \/\/ XXX not all coded yet\n }\n \n #define CCN_BTREE_MAGIC 0x53ade78\n"} {"commit":"5d12c7b755cd405c41d44ef9102e826a366323e3","subject":"util\/u_rect: Make it C++ safe.","message":"util\/u_rect: Make it C++ safe.\n\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\nReviewed-by: Roland Scheidegger <7d58aee419d6f9201d75517c885374dff5e7d848@vmware.com>\n","repos":"mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/util\/u_rect.h\n+++ src\/gallium\/auxiliary\/util\/u_rect.h\n@@ -30,6 +30,10 @@\n #define U_RECT_H\n \n #include \"pipe\/p_compiler.h\"\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n \n struct u_rect {\n int x0, x1;\n@@ -75,6 +79,10 @@\n }\n }\n \n+#ifdef __cplusplus\n+}\n+#endif\n+\n #include \"pipe\/p_format.h\"\n #include \"util\/u_pack_color.h\"\n \n@@ -88,6 +96,10 @@\n *\/\n #include \"pipe\/p_format.h\"\n \n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n extern void\n util_copy_rect(ubyte * dst, enum pipe_format format,\n unsigned dst_stride, unsigned dst_x, unsigned dst_y,\n@@ -99,5 +111,8 @@\n unsigned dst_stride, unsigned dst_x, unsigned dst_y,\n unsigned width, unsigned height, union util_color *uc);\n \n+#ifdef __cplusplus\n+}\n+#endif\n \n #endif \/* U_RECT_H *\/\n"} {"commit":"7a5fac56b2ff041a49784117103aa5a8772aef02","subject":"r300g: hyperz fixing typo.","message":"r300g: hyperz fixing typo.\n\nReally no idea why I didn't see this before, but these values were opposite\nthe register spec.\n\nthis seems to fix rv530 HiZ on my laptop, will reenable in next commit.\n\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_reg.h\n+++ src\/gallium\/drivers\/r300\/r300_reg.h\n@@ -2631,8 +2631,8 @@\n #define R300_ZB_BW_CNTL 0x4f1c\n #\tdefine R300_HIZ_DISABLE (0 << 0)\n #\tdefine R300_HIZ_ENABLE (1 << 0)\n-#\tdefine R300_HIZ_MIN (0 << 1)\n-#\tdefine R300_HIZ_MAX (1 << 1)\n+#\tdefine R300_HIZ_MAX (0 << 1)\n+#\tdefine R300_HIZ_MIN (1 << 1)\n #\tdefine R300_FAST_FILL_DISABLE (0 << 2)\n #\tdefine R300_FAST_FILL_ENABLE (1 << 2)\n #\tdefine R300_RD_COMP_DISABLE (0 << 3)\n"} {"commit":"00ea271e3262340b2e6c7615fb0e3a4dd8b5aa0d","subject":"add missing newlines to atexit.c","message":"add missing newlines to atexit.c\n","repos":"skuhl\/sys-prog-examples,skuhl\/sys-prog-examples,skuhl\/sys-prog-examples","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- simple-examples\/atexit.c\n+++ simple-examples\/atexit.c\n@@ -14,10 +14,10 @@\n \n int main(void)\n {\n-\tprintf(\"This is main() before we set up the atexit functions.\");\n+\tprintf(\"This is main() before we set up the atexit functions.\\n\");\n \tatexit(func1);\n \tatexit(func2);\n-\tprintf(\"This is main() after we set up the atexit functions.\");\n+\tprintf(\"This is main() after we set up the atexit functions.\\n\");\n \n \t\/\/ atexit() does not get called if we interrupt the program with a\n \t\/\/ SIGINT signal (i.e., if we press Ctrl+C while the program is\n"} {"commit":"e737a99a6fbafe3ba4b5175eea25d1598dbeb9d8","subject":"Fix PPC detection on darwin","message":"Fix PPC detection on darwin\n\nFixes regression introduced by 7004582c1894ede839c44e292b413fe4916d7e9e\n\nSigned-off-by: Jeremy Huddleston <db3cec0cba09acb9cf8fd8bd399a3b27498cf883@apple.com>\n","repos":"wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/include\/pipe\/p_config.h\n+++ src\/gallium\/include\/pipe\/p_config.h\n@@ -99,9 +99,9 @@\n #endif\n #endif\n \n-#if defined(__PPC__)\n+#if defined(__ppc__) || defined(__ppc64__) || defined(__PPC__)\n #define PIPE_ARCH_PPC\n-#if defined(__PPC64__)\n+#if defined(__ppc64__) || defined(__PPC64__)\n #define PIPE_ARCH_PPC_64\n #endif\n #endif\n"} {"commit":"4eb768b13bb618b36d936fff666ccb8d540955ca","subject":"Fix GLSL type cast;","message":"Fix GLSL type cast;\n","repos":"bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/resources\/shaders.c\n+++ src\/resources\/shaders.c\n@@ -197,7 +197,7 @@\n \/\/ Indirect lighting\n \"#ifdef FLAG_indirectLighting \\n\"\n \" vec2 lookup = prefilteredBRDF(NoV, roughness); \\n\"\n-\" float mipmapCount = log2(textureSize(lovrEnvironmentMap, 0).x); \\n\"\n+\" float mipmapCount = log2(float(textureSize(lovrEnvironmentMap, 0).x)); \\n\"\n \" vec3 specularIndirect = (F0 * lookup.r + lookup.g) * textureLod(lovrEnvironmentMap, R, roughness * mipmapCount).rgb; \\n\"\n \" vec3 diffuseIndirect = diffuseDirect * E_SphericalHarmonics(lovrSphericalHarmonics, N); \\n\"\n \"#ifdef FLAG_occlusion \\n\" \/\/ Occlusion only affects indirect diffuse light\n"} {"commit":"e418e2e4b6baf60074987339efe96c156ccaee91","subject":"Hide splash screen","message":"Hide splash screen\n\nAlso restructured code to remove duplication\n","repos":"fizzaly\/qgroundcontrol,greenoaktree\/qgroundcontrol,dagoodma\/qgroundcontrol,BMP-TECH\/qgroundcontrol,fizzaly\/qgroundcontrol,BMP-TECH\/qgroundcontrol,nado1688\/qgroundcontrol,LIKAIMO\/qgroundcontrol,Hunter522\/qgroundcontrol,fizzaly\/qgroundcontrol,dagoodma\/qgroundcontrol,caoxiongkun\/qgroundcontrol,kd0aij\/qgroundcontrol,scott-eddy\/qgroundcontrol,kd0aij\/qgroundcontrol,lis-epfl\/qgroundcontrol,hejunbok\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,cfelipesouza\/qgroundcontrol,jy723\/qgroundcontrol,UAVenture\/qgroundcontrol,nado1688\/qgroundcontrol,scott-eddy\/qgroundcontrol,iidioter\/qgroundcontrol,ethz-asl\/qgc_asl,remspoor\/qgroundcontrol,devbharat\/qgroundcontrol,lis-epfl\/qgroundcontrol,jy723\/qgroundcontrol,LIKAIMO\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,mihadyuk\/qgroundcontrol,iidioter\/qgroundcontrol,dagoodma\/qgroundcontrol,greenoaktree\/qgroundcontrol,Hunter522\/qgroundcontrol,TheIronBorn\/qgroundcontrol,iidioter\/qgroundcontrol,devbharat\/qgroundcontrol,BMP-TECH\/qgroundcontrol,remspoor\/qgroundcontrol,nado1688\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,TheIronBorn\/qgroundcontrol,UAVenture\/qgroundcontrol,RedoXyde\/PX4_qGCS,UAVenture\/qgroundcontrol,fizzaly\/qgroundcontrol,lis-epfl\/qgroundcontrol,RedoXyde\/PX4_qGCS,kd0aij\/qgroundcontrol,BMP-TECH\/qgroundcontrol,scott-eddy\/qgroundcontrol,RedoXyde\/PX4_qGCS,fizzaly\/qgroundcontrol,remspoor\/qgroundcontrol,dagoodma\/qgroundcontrol,lis-epfl\/qgroundcontrol,greenoaktree\/qgroundcontrol,iidioter\/qgroundcontrol,remspoor\/qgroundcontrol,greenoaktree\/qgroundcontrol,kd0aij\/qgroundcontrol,ethz-asl\/qgc_asl,cfelipesouza\/qgroundcontrol,caoxiongkun\/qgroundcontrol,cfelipesouza\/qgroundcontrol,BMP-TECH\/qgroundcontrol,nado1688\/qgroundcontrol,mihadyuk\/qgroundcontrol,cfelipesouza\/qgroundcontrol,greenoaktree\/qgroundcontrol,devbharat\/qgroundcontrol,caoxiongkun\/qgroundcontrol,hejunbok\/qgroundcontrol,Hunter522\/qgroundcontrol,ethz-asl\/qgc_asl,Hunter522\/qgroundcontrol,hejunbok\/qgroundcontrol,jy723\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,ethz-asl\/qgc_asl,fizzaly\/qgroundcontrol,mihadyuk\/qgroundcontrol,hejunbok\/qgroundcontrol,dagoodma\/qgroundcontrol,remspoor\/qgroundcontrol,UAVenture\/qgroundcontrol,kd0aij\/qgroundcontrol,remspoor\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,jy723\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,hejunbok\/qgroundcontrol,kd0aij\/qgroundcontrol,BMP-TECH\/qgroundcontrol,iidioter\/qgroundcontrol,scott-eddy\/qgroundcontrol,dagoodma\/qgroundcontrol,Hunter522\/qgroundcontrol,hejunbok\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,mihadyuk\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,UAVenture\/qgroundcontrol,mihadyuk\/qgroundcontrol,caoxiongkun\/qgroundcontrol,RedoXyde\/PX4_qGCS,RedoXyde\/PX4_qGCS,TheIronBorn\/qgroundcontrol,mihadyuk\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,lis-epfl\/qgroundcontrol,devbharat\/qgroundcontrol,catch-twenty-two\/qgroundcontrol,LIKAIMO\/qgroundcontrol,greenoaktree\/qgroundcontrol,LIKAIMO\/qgroundcontrol,LIKAIMO\/qgroundcontrol,TheIronBorn\/qgroundcontrol,caoxiongkun\/qgroundcontrol,TheIronBorn\/qgroundcontrol,TheIronBorn\/qgroundcontrol,devbharat\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,nado1688\/qgroundcontrol,RedoXyde\/PX4_qGCS,scott-eddy\/qgroundcontrol,LIKAIMO\/qgroundcontrol,UAVenture\/qgroundcontrol,nado1688\/qgroundcontrol,devbharat\/qgroundcontrol,ethz-asl\/qgc_asl,Hunter522\/qgroundcontrol,scott-eddy\/qgroundcontrol,jy723\/qgroundcontrol,cfelipesouza\/qgroundcontrol,CornerOfSkyline\/qgroundcontrol,jy723\/qgroundcontrol,cfelipesouza\/qgroundcontrol,caoxiongkun\/qgroundcontrol,iidioter\/qgroundcontrol","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/QGCMessageBox.h\n+++ src\/QGCMessageBox.h\n@@ -87,48 +87,35 @@\n return (parent == NULL) ? MainWindow::instance() : parent;\n }\n \n-#ifdef Q_OS_MAC\n static StandardButton _messageBox(Icon icon, const QString& title, const QString& text, StandardButtons buttons, StandardButton defaultButton, QWidget* parent)\n {\n \/\/ You can't use QGCMessageBox if QGCApplication is not created yet.\n Q_ASSERT(qgcApp());\n \n parent = _validateParameters(buttons, &defaultButton, parent);\n+\n+ if (MainWindow::instance()) {\n+ MainWindow::instance()->hideSplashScreen();\n+ }\n \n #ifdef QT_DEBUG\n if (qgcApp()->runningUnitTests()) {\n return UnitTest::_messageBox(icon, title, text, buttons, defaultButton);\n } else\n-#endif \/\/ QT_DEBUG\n+#endif\n {\n+#ifdef Q_OS_MAC\n QString emptyTitle;\n QMessageBox box(icon, emptyTitle, title, buttons, parent);\n box.setDefaultButton(defaultButton);\n box.setInformativeText(text);\n+#else\n+ QMessageBox box(icon, title, text, buttons, parent);\n+ box.setDefaultButton(defaultButton);\n+#endif\n return static_cast<QMessageBox::StandardButton>(box.exec());\n }\n }\n-#else\n- static StandardButton _messageBox(Icon icon, const QString& title, const QString& text, StandardButtons buttons, StandardButton defaultButton, QWidget* parent)\n- {\n- \/\/ You can't use QGCMessageBox if QGCApplication is not created yet.\n- Q_ASSERT(qgcApp());\n- \n- parent = _validateParameters(buttons, &defaultButton, parent);\n- \n-#ifdef QT_DEBUG\n- if (qgcApp()->runningUnitTests()) {\n- return UnitTest::_messageBox(icon, title, text, buttons, defaultButton);\n- } else\n-#endif \/\/ QT_DEBUG\n- {\n- QMessageBox box(icon, title, text, buttons, parent);\n- box.setDefaultButton(defaultButton);\n- return static_cast<QMessageBox::StandardButton>(box.exec());\n- }\n- }\n- \n-#endif \/\/ Q_OS_MAC\n };\n \n #endif\n"} {"commit":"fdeb176830a1e45aee7924104175964a75ba9732","subject":"MFC r261422","message":"MFC r261422\n\nMake gas accept any PowerPC instruction by default. This is a local change,\nand will not be submitted upstream.\n\nDiscussed with: nwhitehorn,rdivacky\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"bc1b1f8bee63966649dd5ac7d10d31a6556bf19b","subject":"Bluetooth: Only check SAR bits if frame is an I-frame","message":"Bluetooth: Only check SAR bits if frame is an I-frame\n\nThe SAR bits doesn't make sense for an S-frame. It doesn't use SAR.\n\nChecking SAR for a S-frames can lead to L2CAP errors, it could close\nthe channel with an invalid packet length, since we was removing the 2\nof the of any frame that match SAR start bits, without check if it is\nan I-frame.\n\nSigned-off-by: Gustavo F. Padovan <8463bae6aa74c6c37654a5ac7ce3bbb9fe6ffff8@profusion.mobi>\nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/bluetooth\/l2cap.c\n+++ net\/bluetooth\/l2cap.c\n@@ -4117,7 +4117,7 @@\n \t\tskb_pull(skb, 2);\n \t\tlen = skb->len;\n \n-\t\tif (__is_sar_start(control))\n+\t\tif (__is_sar_start(control) && __is_iframe(control))\n \t\t\tlen -= 2;\n \n \t\tif (pi->fcs == L2CAP_FCS_CRC16)\n"} {"commit":"57be59d79def12e04dae8ed9d7b565d5b41fee38","subject":"Make failed open non fatal.","message":"Make failed open non fatal.\n","repos":"ammongit\/c-utils,ammongit\/c-utils","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- print-exts.c\n+++ print-exts.c\n@@ -28,6 +28,8 @@\n } ignore;\n \n static int debug, recursive;\n+\n+static int ret;\n static unsigned int depth;\n \n \/* Returns true if x is '.' or '..' *\/\n@@ -145,14 +147,16 @@\n \t\tfprintf(stderr,\n \t\t\t\"Unable to open handle for '%s': %s\\n\",\n \t\t\tpath, strerror(errno));\n-\t\texit(1);\n+\t\tret = 1;\n+\t\treturn;\n \t}\n \tdh = fdopendir(fd);\n \tif (!dh) {\n \t\tfprintf(stderr,\n \t\t\t\"Unable to open directory '%s': %s\\n\",\n \t\t\tpath, strerror(errno));\n-\t\texit(1);\n+\t\tret = 1;\n+\t\treturn;\n \t}\n \tdepth++;\n \n@@ -166,6 +170,7 @@\n \t\t\tfprintf(stderr,\n \t\t\t\t\"Unable to stat '%s': %s\\n\",\n \t\t\t\tdirent->d_name, strerror(errno));\n+\t\t\tret = 1;\n \t\t\tcontinue;\n \t\t}\n \t\tif (S_ISREG(stbuf.st_mode)) {\n@@ -269,5 +274,5 @@\n \telse for (i = optind; i < argc; i++)\n \t\tscan_dir(argv[i], AT_FDCWD);\n \tprint_result(reverse);\n-\treturn 0;\n-}\n+\treturn ret;\n+}\n"} {"commit":"95ffa97827371ede501615d9bd048eb5b49e8fe1","subject":"Bluetooth: Fix L2CAP control bit field corruption","message":"Bluetooth: Fix L2CAP control bit field corruption\n\nWhen resending an I-frame, ERTM was reusing the control bits from the last\ntime it was sent, that was causing a corruption in the new control field\ndue to it dirty fields.\n\nThis patches extracts only the SAR bits from the old field and reuse it to\nresend the packet, the others bits should be reset and receive the\nupdated value.\n\nSigned-off-by: Gustavo F. Padovan <8463bae6aa74c6c37654a5ac7ce3bbb9fe6ffff8@profusion.mobi>\nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/bluetooth\/l2cap.c\n+++ net\/bluetooth\/l2cap.c\n@@ -1430,6 +1430,8 @@\n \ttx_skb = skb_clone(skb, GFP_ATOMIC);\n \tbt_cb(skb)->retries++;\n \tcontrol = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);\n+\tcontrol &= L2CAP_CTRL_SAR;\n+\n \tcontrol |= (pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT)\n \t\t\t| (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);\n \tput_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);\n@@ -1465,6 +1467,8 @@\n \t\tbt_cb(skb)->retries++;\n \n \t\tcontrol = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);\n+\t\tcontrol &= L2CAP_CTRL_SAR;\n+\n \t\tif (pi->conn_state & L2CAP_CONN_SEND_FBIT) {\n \t\t\tcontrol |= L2CAP_CTRL_FINAL;\n \t\t\tpi->conn_state &= ~L2CAP_CONN_SEND_FBIT;\n"} {"commit":"8d7c020ebe5b778c0ec2020e5bb3ba1f3e62e6f3","subject":"Add print-utf8.","message":"Add print-utf8.\n","repos":"ammongit\/c-utils,ammongit\/c-utils","returncode":1,"stderr":"error: pathspec 'print-utf8.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- print-utf8.c\n+++ print-utf8.c\n@@ -0,0 +1,89 @@\n+#include <stdlib.h>\n+#include <stdio.h>\n+\n+#define BIT_8(x)\t(x)\n+#define BIT_10(x)\t((x) | 0x80)\n+#define BIT_110(x)\t((x) | 0xc0)\n+#define BIT_1110(x)\t((x) | 0xe0)\n+#define BIT_11110(x)\t((x) | 0xf0)\n+\n+int main(int argc, const char *argv[])\n+{\n+\tunsigned int cp, max_cp;\n+\tchar i, j, k, l;\n+\n+\t\/* Parse argument *\/\n+\tif (argc == 1) {\n+\t\tmax_cp = 0x10ffff;\n+\t} else {\n+\t\tlong val;\n+\t\tchar *ptr;\n+\n+\t\tval = strtol(argv[1], &ptr, 0);\n+\t\tif (!*argv[1] || *ptr) {\n+\t\t\tfprintf(stderr, \"%s: invalid numeric value: '%s'\\n\",\n+\t\t\t\targv[0], argv[1]);\n+\t\t\treturn 1;\n+\t\t} else if (val < 0) {\n+\t\t\tfprintf(stderr, \"%s: value cannot be negative: '%s'\\n\",\n+\t\t\t\targv[0], argv[1]);\n+\t\t\treturn 1;\n+\t\t} else if (val > 0x10ffff) {\n+\t\t\tval = 0x10ffff;\n+\t\t}\n+\t\tmax_cp = val;\n+\t}\n+\n+\t\/* U+0000 to U+007F *\/\n+\tcp = 0;\n+\tfor (i = 0; i < 0x7f; i++) {\n+\t\tif (cp++ > max_cp)\n+\t\t\treturn 0;\n+\t\tprintf(\"U+%04X '%c'\\n\", cp, BIT_8(i));\n+\t}\n+\n+\t\/* U+0080 to U+07FF *\/\n+\tfor (i = 0; i < 0x1f; i++) {\n+\t\tfor (j = 0; j < 0x3f; j++) {\n+\t\t\tif (cp++ > max_cp)\n+\t\t\t\treturn 0;\n+\t\t\tprintf(\"U+%04X '%c%c'\\n\",\n+\t\t\t\tcp, BIT_110(i), BIT_10(j));\n+\t\t}\n+\t}\n+\n+\t\/* U+0800 to U+FFFF *\/\n+\tfor (i = 0; i < 0x0f; i++) {\n+\t\tfor (j = 0; j < 0x3f; j++) {\n+\t\t\tfor (k = 0; k < 0x3f; k++) {\n+\t\t\t\tif (cp++ > max_cp)\n+\t\t\t\t\treturn 0;\n+\t\t\t\tprintf(\"U+%04X '%c%c%c'\\n\",\n+\t\t\t\t\tcp,\n+\t\t\t\t\tBIT_1110(i),\n+\t\t\t\t\tBIT_10(j),\n+\t\t\t\t\tBIT_10(k));\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\t\/* U+10000 + U+10FFFF *\/\n+\tfor (i = 0; i < 0x7; i++) {\n+\t\tfor (j = 0; j < 0x3f; j++) {\n+\t\t\tfor (k = 0; k < 0x3f; k++) {\n+\t\t\t\tfor (l = 0; l < 0x3f; l++) {\n+\t\t\t\t\tif (cp++ > max_cp)\n+\t\t\t\t\t\treturn 0;\n+\t\t\t\t\tprintf(\"U+%05X '%c%c%c%c'\\n\",\n+\t\t\t\t\t\tcp,\n+\t\t\t\t\t\tBIT_11110(i),\n+\t\t\t\t\t\tBIT_10(j),\n+\t\t\t\t\t\tBIT_10(k),\n+\t\t\t\t\t\tBIT_10(l));\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n"} {"commit":"e072745f4adb01b909bd08a0cfc8f79348f4d2c6","subject":"Bluetooth: Split l2cap_data_channel_sframe()","message":"Bluetooth: Split l2cap_data_channel_sframe()\n\nCreate a function for each type fo S-frame and avoid a lot of nested\ncode.\n\nSigned-off-by: Gustavo F. Padovan <8463bae6aa74c6c37654a5ac7ce3bbb9fe6ffff8@profusion.mobi>\nReviewed-by: Jo\u00e3o Paulo Rechi Vita <73d291f08d13d32632b832fa7d85a63d7a7e1fab@profusion.mobi>\nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/bluetooth\/l2cap.c\n+++ net\/bluetooth\/l2cap.c\n@@ -3475,120 +3475,146 @@\n \treturn 0;\n }\n \n-static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, struct sk_buff *skb)\n+static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control)\n {\n \tstruct l2cap_pinfo *pi = l2cap_pi(sk);\n \tu8 tx_seq = __get_reqseq(rx_control);\n \n-\tBT_DBG(\"sk %p rx_control 0x%4.4x len %d\", sk, rx_control, skb->len);\n-\n-\tif (L2CAP_CTRL_FINAL & rx_control) {\n-\t\tdel_timer(&pi->monitor_timer);\n-\t\tif (pi->unacked_frames > 0)\n-\t\t\t__mod_retrans_timer();\n-\t\tpi->conn_state &= ~L2CAP_CONN_WAIT_F;\n-\t}\n-\n-\tswitch (rx_control & L2CAP_CTRL_SUPERVISE) {\n-\tcase L2CAP_SUPER_RCV_READY:\n-\t\tif (rx_control & L2CAP_CTRL_POLL) {\n-\t\t\tl2cap_send_i_or_rr_or_rnr(sk);\n-\t\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n-\n-\t\t} else if (rx_control & L2CAP_CTRL_FINAL) {\n-\t\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n-\t\t\tpi->expected_ack_seq = tx_seq;\n-\t\t\tl2cap_drop_acked_frames(sk);\n-\n-\t\t\tif (pi->conn_state & L2CAP_CONN_REJ_ACT)\n-\t\t\t\tpi->conn_state &= ~L2CAP_CONN_REJ_ACT;\n-\t\t\telse {\n-\t\t\t\tsk->sk_send_head = TX_QUEUE(sk)->next;\n-\t\t\t\tpi->next_tx_seq = pi->expected_ack_seq;\n-\t\t\t\tl2cap_ertm_send(sk);\n-\t\t\t}\n-\n-\t\t} else {\n-\t\t\tpi->expected_ack_seq = tx_seq;\n-\t\t\tl2cap_drop_acked_frames(sk);\n-\n-\t\t\tif ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&\n-\t\t\t (pi->unacked_frames > 0))\n-\t\t\t\t__mod_retrans_timer();\n-\n-\t\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n-\t\t\tif (pi->conn_state & L2CAP_CONN_SREJ_SENT)\n-\t\t\t\tl2cap_send_ack(pi);\n-\t\t\telse\n-\t\t\t\tl2cap_ertm_send(sk);\n-\t\t}\n-\t\tbreak;\n-\n-\tcase L2CAP_SUPER_REJECT:\n+\tif (rx_control & L2CAP_CTRL_POLL) {\n+\t\tl2cap_send_i_or_rr_or_rnr(sk);\n \t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n \n-\t\tpi->expected_ack_seq = __get_reqseq(rx_control);\n+\t} else if (rx_control & L2CAP_CTRL_FINAL) {\n+\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n+\t\tpi->expected_ack_seq = tx_seq;\n \t\tl2cap_drop_acked_frames(sk);\n \n-\t\tif (rx_control & L2CAP_CTRL_FINAL) {\n-\t\t\tif (pi->conn_state & L2CAP_CONN_REJ_ACT)\n-\t\t\t\tpi->conn_state &= ~L2CAP_CONN_REJ_ACT;\n-\t\t\telse {\n-\t\t\t\tsk->sk_send_head = TX_QUEUE(sk)->next;\n-\t\t\t\tpi->next_tx_seq = pi->expected_ack_seq;\n-\t\t\t\tl2cap_ertm_send(sk);\n-\t\t\t}\n-\t\t} else {\n+\t\tif (pi->conn_state & L2CAP_CONN_REJ_ACT)\n+\t\t\tpi->conn_state &= ~L2CAP_CONN_REJ_ACT;\n+\t\telse {\n \t\t\tsk->sk_send_head = TX_QUEUE(sk)->next;\n \t\t\tpi->next_tx_seq = pi->expected_ack_seq;\n \t\t\tl2cap_ertm_send(sk);\n-\n-\t\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n-\t\t\t\tpi->srej_save_reqseq = tx_seq;\n-\t\t\t\tpi->conn_state |= L2CAP_CONN_REJ_ACT;\n-\t\t\t}\n-\t\t}\n-\n-\t\tbreak;\n-\n-\tcase L2CAP_SUPER_SELECT_REJECT:\n-\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n-\n-\t\tif (rx_control & L2CAP_CTRL_POLL) {\n-\t\t\tpi->expected_ack_seq = tx_seq;\n-\t\t\tl2cap_drop_acked_frames(sk);\n-\t\t\tl2cap_retransmit_frame(sk, tx_seq);\n-\t\t\tl2cap_ertm_send(sk);\n-\t\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n-\t\t\t\tpi->srej_save_reqseq = tx_seq;\n-\t\t\t\tpi->conn_state |= L2CAP_CONN_SREJ_ACT;\n-\t\t\t}\n-\t\t} else if (rx_control & L2CAP_CTRL_FINAL) {\n-\t\t\tif ((pi->conn_state & L2CAP_CONN_SREJ_ACT) &&\n-\t\t\t\t\tpi->srej_save_reqseq == tx_seq)\n-\t\t\t\tpi->conn_state &= ~L2CAP_CONN_SREJ_ACT;\n-\t\t\telse\n-\t\t\t\tl2cap_retransmit_frame(sk, tx_seq);\n-\t\t}\n-\t\telse {\n-\t\t\tl2cap_retransmit_frame(sk, tx_seq);\n-\t\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n-\t\t\t\tpi->srej_save_reqseq = tx_seq;\n-\t\t\t\tpi->conn_state |= L2CAP_CONN_SREJ_ACT;\n-\t\t\t}\n-\t\t}\n-\t\tbreak;\n-\n-\tcase L2CAP_SUPER_RCV_NOT_READY:\n-\t\tpi->conn_state |= L2CAP_CONN_REMOTE_BUSY;\n+\t\t}\n+\n+\t} else {\n \t\tpi->expected_ack_seq = tx_seq;\n \t\tl2cap_drop_acked_frames(sk);\n \n-\t\tdel_timer(&pi->retrans_timer);\n-\t\tif (rx_control & L2CAP_CTRL_POLL) {\n-\t\t\tu16 control = L2CAP_CTRL_FINAL;\n-\t\t\tl2cap_send_rr_or_rnr(pi, control);\n-\t\t}\n+\t\tif ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&\n+\t\t\t\t(pi->unacked_frames > 0))\n+\t\t\t__mod_retrans_timer();\n+\n+\t\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n+\t\tif (pi->conn_state & L2CAP_CONN_SREJ_SENT)\n+\t\t\tl2cap_send_ack(pi);\n+\t\telse\n+\t\t\tl2cap_ertm_send(sk);\n+\t}\n+}\n+\n+static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)\n+{\n+\tstruct l2cap_pinfo *pi = l2cap_pi(sk);\n+\tu8 tx_seq = __get_reqseq(rx_control);\n+\n+\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n+\n+\tpi->expected_ack_seq = __get_reqseq(rx_control);\n+\tl2cap_drop_acked_frames(sk);\n+\n+\tif (rx_control & L2CAP_CTRL_FINAL) {\n+\t\tif (pi->conn_state & L2CAP_CONN_REJ_ACT)\n+\t\t\tpi->conn_state &= ~L2CAP_CONN_REJ_ACT;\n+\t\telse {\n+\t\t\tsk->sk_send_head = TX_QUEUE(sk)->next;\n+\t\t\tpi->next_tx_seq = pi->expected_ack_seq;\n+\t\t\tl2cap_ertm_send(sk);\n+\t\t}\n+\t} else {\n+\t\tsk->sk_send_head = TX_QUEUE(sk)->next;\n+\t\tpi->next_tx_seq = pi->expected_ack_seq;\n+\t\tl2cap_ertm_send(sk);\n+\n+\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n+\t\t\tpi->srej_save_reqseq = tx_seq;\n+\t\t\tpi->conn_state |= L2CAP_CONN_REJ_ACT;\n+\t\t}\n+\t}\n+}\n+static inline void l2cap_data_channel_srejframe(struct sock *sk, u16 rx_control)\n+{\n+\tstruct l2cap_pinfo *pi = l2cap_pi(sk);\n+\tu8 tx_seq = __get_reqseq(rx_control);\n+\n+\tpi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;\n+\n+\tif (rx_control & L2CAP_CTRL_POLL) {\n+\t\tpi->expected_ack_seq = tx_seq;\n+\t\tl2cap_drop_acked_frames(sk);\n+\t\tl2cap_retransmit_frame(sk, tx_seq);\n+\t\tl2cap_ertm_send(sk);\n+\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n+\t\t\tpi->srej_save_reqseq = tx_seq;\n+\t\t\tpi->conn_state |= L2CAP_CONN_SREJ_ACT;\n+\t\t}\n+\t} else if (rx_control & L2CAP_CTRL_FINAL) {\n+\t\tif ((pi->conn_state & L2CAP_CONN_SREJ_ACT) &&\n+\t\t\t\tpi->srej_save_reqseq == tx_seq)\n+\t\t\tpi->conn_state &= ~L2CAP_CONN_SREJ_ACT;\n+\t\telse\n+\t\t\tl2cap_retransmit_frame(sk, tx_seq);\n+\t} else {\n+\t\tl2cap_retransmit_frame(sk, tx_seq);\n+\t\tif (pi->conn_state & L2CAP_CONN_WAIT_F) {\n+\t\t\tpi->srej_save_reqseq = tx_seq;\n+\t\t\tpi->conn_state |= L2CAP_CONN_SREJ_ACT;\n+\t\t}\n+\t}\n+}\n+\n+static inline void l2cap_data_channel_rnrframe(struct sock *sk, u16 rx_control)\n+{\n+\tstruct l2cap_pinfo *pi = l2cap_pi(sk);\n+\tu8 tx_seq = __get_reqseq(rx_control);\n+\n+\tpi->conn_state |= L2CAP_CONN_REMOTE_BUSY;\n+\tpi->expected_ack_seq = tx_seq;\n+\tl2cap_drop_acked_frames(sk);\n+\n+\tdel_timer(&pi->retrans_timer);\n+\tif (rx_control & L2CAP_CTRL_POLL) {\n+\t\tu16 control = L2CAP_CTRL_FINAL;\n+\t\tl2cap_send_rr_or_rnr(pi, control);\n+\t}\n+}\n+\n+static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, struct sk_buff *skb)\n+{\n+\tBT_DBG(\"sk %p rx_control 0x%4.4x len %d\", sk, rx_control, skb->len);\n+\n+\tif (L2CAP_CTRL_FINAL & rx_control) {\n+\t\tdel_timer(&l2cap_pi(sk)->monitor_timer);\n+\t\tif (l2cap_pi(sk)->unacked_frames > 0)\n+\t\t\t__mod_retrans_timer();\n+\t\tl2cap_pi(sk)->conn_state &= ~L2CAP_CONN_WAIT_F;\n+\t}\n+\n+\tswitch (rx_control & L2CAP_CTRL_SUPERVISE) {\n+\tcase L2CAP_SUPER_RCV_READY:\n+\t\tl2cap_data_channel_rrframe(sk, rx_control);\n+\t\tbreak;\n+\n+\tcase L2CAP_SUPER_REJECT:\n+\t\tl2cap_data_channel_rejframe(sk, rx_control);\n+\t\tbreak;\n+\n+\tcase L2CAP_SUPER_SELECT_REJECT:\n+\t\tl2cap_data_channel_srejframe(sk, rx_control);\n+\t\tbreak;\n+\n+\tcase L2CAP_SUPER_RCV_NOT_READY:\n+\t\tl2cap_data_channel_rnrframe(sk, rx_control);\n \t\tbreak;\n \t}\n \n"} {"commit":"20581c1faf7b15ae1f8b80c0ec757877b0b53151","subject":"libceph: init monitor connection when opening","message":"libceph: init monitor connection when opening\n\nHold off initializing a monitor client's connection until just\nbefore it gets opened for use.\n\nSigned-off-by: Alex Elder <f429030cf5c0faf36fac3d102073b6e63a647baa@inktank.com>\nReviewed-by: Sage Weil <6dd34506bbd5e58221bbb3e4732d97c91f02277b@inktank.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/ceph\/mon_client.c\n+++ net\/ceph\/mon_client.c\n@@ -119,6 +119,7 @@\n \tdout(\"__close_session closing mon%d\\n\", monc->cur_mon);\n \tceph_con_revoke(&monc->con, monc->m_auth);\n \tceph_con_close(&monc->con);\n+\tmonc->con.private = NULL;\n \tmonc->cur_mon = -1;\n \tmonc->pending_auth = 0;\n \tceph_auth_reset(monc->auth);\n@@ -141,9 +142,13 @@\n \t\tmonc->sub_renew_after = jiffies; \/* i.e., expired *\/\n \t\tmonc->want_next_osdmap = !!monc->want_next_osdmap;\n \n-\t\tdout(\"open_session mon%d opening\\n\", monc->cur_mon);\n+\t\tceph_con_init(&monc->client->msgr, &monc->con);\n+\t\tmonc->con.private = monc;\n+\t\tmonc->con.ops = &mon_con_ops;\n \t\tmonc->con.peer_name.type = CEPH_ENTITY_TYPE_MON;\n \t\tmonc->con.peer_name.num = cpu_to_le64(monc->cur_mon);\n+\n+\t\tdout(\"open_session mon%d opening\\n\", monc->cur_mon);\n \t\tceph_con_open(&monc->con,\n \t\t\t &monc->monmap->mon_inst[monc->cur_mon].addr);\n \n@@ -760,10 +765,6 @@\n \t\tgoto out;\n \n \t\/* connection *\/\n-\tceph_con_init(&monc->client->msgr, &monc->con);\n-\tmonc->con.private = monc;\n-\tmonc->con.ops = &mon_con_ops;\n-\n \t\/* authentication *\/\n \tmonc->auth = ceph_auth_init(cl->options->name,\n \t\t\t\t cl->options->key);\n@@ -835,8 +836,6 @@\n \n \tmutex_lock(&monc->mutex);\n \t__close_session(monc);\n-\n-\tmonc->con.private = NULL;\n \n \tmutex_unlock(&monc->mutex);\n \n"} {"commit":"3400112794724d9bdc3de6e1ce1475b726e6ca7d","subject":"[DECNET]: net\/decnet\/dn_route.c: fix inconsequent NULL checking","message":"[DECNET]: net\/decnet\/dn_route.c: fix inconsequent NULL checking\n\nThe Coverity checker noted this inconsequent NULL checking in\ndnrt_drop().\n\nSince all callers ensure that NULL isn't passed, we can simply remove\nthe check.\n\nSigned-off-by: Adrian Bunk <0b86548ef377da0031a3ff3f0c4e06f016e20105@stusta.de>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/decnet\/dn_route.c\n+++ net\/decnet\/dn_route.c\n@@ -149,8 +149,7 @@\n \n static inline void dnrt_drop(struct dn_route *rt)\n {\n-\tif (rt)\n-\t\tdst_release(&rt->u.dst);\n+\tdst_release(&rt->u.dst);\n \tcall_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);\n }\n \n"} {"commit":"b4ee194441d7e4457c7bac6c2a5da8428974db5a","subject":"mac802154: iface: fix hrtimer cancel on ifdown","message":"mac802154: iface: fix hrtimer cancel on ifdown\n\nThe interframe spacing timer is a per phy definition and is part of a\nieee802154_local structure. If we have possible multiple interfaces\nifdown one interface then the timer should not be cancled. First if the\nlast interface is down and the receive handling is stopped we should be\nsure that the interframe spacing timer isn't run anymore.\n\nSigned-off-by: Alexander Aring <d03dbcdedb9639e397df9b8578e8fc8274f4e6c4@gmail.com>\nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e5fba3d4781608f46c55fa4e7e98340473ff4ae7","subject":"Supported to sound beep.","message":"Supported to sound beep.\n\nSubmitted by:\tchi@bd.mbn.or.jp (Chiharu Shibata)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/boot\/pc98\/libpc98\/vidconsole.c\n+++ sys\/boot\/pc98\/libpc98\/vidconsole.c\n@@ -144,6 +144,17 @@\n return(0);\t\/* XXX reinit? *\/\n }\n \n+#ifdef PC98\n+static void\n+beep(void)\n+{\n+\toutb(0x37, 6);\n+\tdelay(40000);\n+\toutb(0x37, 7);\n+}\n+#endif\n+\n+#if 0\n static void\n vidc_biosputchar(int c)\n {\n@@ -196,6 +207,7 @@\n v86int();\n #endif\n }\n+#endif\n \n static void\n vidc_rawputchar(int c)\n@@ -207,13 +219,17 @@\n \tfor (i = 0; i < 8; i++)\n \t vidc_rawputchar(' ');\n else {\n-#ifndef TERM_EMU\n+#if !defined(TERM_EMU) && !defined(PC98)\n vidc_biosputchar(c);\n #else\n \t\/* Emulate AH=0eh (teletype output) *\/\n \tswitch(c) {\n \tcase '\\a':\n+#ifdef PC98\n+\t\tbeep();\n+#else\n \t\tvidc_biosputchar(c);\n+#endif\n \t\treturn;\n \tcase '\\r':\n \t\tcurx=0;\n"} {"commit":"db2c24175d149b55784f7cb2c303622ce962c1ae","subject":"act_pedit: access skb->data safely","message":"act_pedit: access skb->data safely\n\naccess skb->data safely\n\nwe should use skb_header_pointer() and skb_store_bits() to access skb->data to\nhandle small or non-linear skbs.\n\nSigned-off-by: Changli Gao <e0c990ad75746f704921cca52caa8fdda39c56b7@gmail.com>\n----\n net\/sched\/act_pedit.c | 24 ++++++++++++++----------\n 1 file changed, 14 insertions(+), 10 deletions(-)\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/sched\/act_pedit.c\n+++ net\/sched\/act_pedit.c\n@@ -125,7 +125,7 @@\n {\n \tstruct tcf_pedit *p = a->priv;\n \tint i, munged = 0;\n-\tu8 *pptr;\n+\tunsigned int off;\n \n \tif (!(skb->tc_verd & TC_OK2MUNGE)) {\n \t\t\/* should we set skb->cloned? *\/\n@@ -134,7 +134,7 @@\n \t\t}\n \t}\n \n-\tpptr = skb_network_header(skb);\n+\toff = skb_network_offset(skb);\n \n \tspin_lock(&p->tcf_lock);\n \n@@ -144,17 +144,17 @@\n \t\tstruct tc_pedit_key *tkey = p->tcfp_keys;\n \n \t\tfor (i = p->tcfp_nkeys; i > 0; i--, tkey++) {\n-\t\t\tu32 *ptr;\n+\t\t\tu32 *ptr, _data;\n \t\t\tint offset = tkey->off;\n \n \t\t\tif (tkey->offmask) {\n-\t\t\t\tif (skb->len > tkey->at) {\n-\t\t\t\t\t char *j = pptr + tkey->at;\n-\t\t\t\t\t offset += ((*j & tkey->offmask) >>\n-\t\t\t\t\t\t tkey->shift);\n-\t\t\t\t} else {\n+\t\t\t\tchar *d, _d;\n+\n+\t\t\t\td = skb_header_pointer(skb, off + tkey->at, 1,\n+\t\t\t\t\t\t &_d);\n+\t\t\t\tif (!d)\n \t\t\t\t\tgoto bad;\n-\t\t\t\t}\n+\t\t\t\toffset += (*d & tkey->offmask) >> tkey->shift;\n \t\t\t}\n \n \t\t\tif (offset % 4) {\n@@ -169,9 +169,13 @@\n \t\t\t\tgoto bad;\n \t\t\t}\n \n-\t\t\tptr = (u32 *)(pptr+offset);\n+\t\t\tptr = skb_header_pointer(skb, off + offset, 4, &_data);\n+\t\t\tif (!ptr)\n+\t\t\t\tgoto bad;\n \t\t\t\/* just do it, baby *\/\n \t\t\t*ptr = ((*ptr & tkey->mask) ^ tkey->val);\n+\t\t\tif (ptr == &_data)\n+\t\t\t\tskb_store_bits(skb, off + offset, ptr, 4);\n \t\t\tmunged++;\n \t\t}\n \n"} {"commit":"cd8694ee322192ad8cb60298a6a639d3c2ce60a4","subject":"Include <machine\/metadata.h>.","message":"Include <machine\/metadata.h>.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/boot\/sparc64\/loader\/metadata.c\n+++ sys\/boot\/sparc64\/loader\/metadata.c\n@@ -31,6 +31,8 @@\n #include <sys\/param.h>\n #include <sys\/reboot.h>\n #include <sys\/linker.h>\n+\n+#include <machine\/metadata.h>\n \n #include \"bootstrap.h\"\n #include \"libofw.h\"\n"} {"commit":"7a9885b93bb623524468b37d04146d3422e099eb","subject":"xfrm: use separated locks to protect pointers of struct xfrm_state_afinfo","message":"xfrm: use separated locks to protect pointers of struct xfrm_state_afinfo\n\nafinfo->type_map and afinfo->mode_map deserve separated locks,\nthey are different things.\n\nWe should just take RCU read lock to protect afinfo itself,\nbut not for the inner pointers.\n\nCc: Steffen Klassert <66deb1d63f85161cc287ce2bac0c65cb5ae958a7@secunet.com>\nCc: Herbert Xu <ef65de1c7be0aa837fe7b25ba9a7739905af6a55@gondor.apana.org.au>\nCc: \"David S. Miller\" <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\nSigned-off-by: Cong Wang <b08afa93ec8eabe95bc97d12956ca699fa65834c@redhat.com>\nSigned-off-by: Steffen Klassert <66deb1d63f85161cc287ce2bac0c65cb5ae958a7@secunet.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"0fd3e9eb56be2620350465b205f67aaee14318b1","subject":"When attaching a consumer from a volume to a plex, check if the volume already has a plex attached and adjust the access counts of the new consumer accordingly.","message":"When attaching a consumer from a volume to a plex, check if the\nvolume already has a plex attached and adjust the access counts\nof the new consumer accordingly.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/geom\/vinum\/geom_vinum_volume.c\n+++ sys\/geom\/vinum\/geom_vinum_volume.c\n@@ -176,11 +176,11 @@\n {\n \tstruct g_geom *gp;\n \tstruct g_provider *pp2;\n-\tstruct g_consumer *cp;\n+\tstruct g_consumer *cp, *ocp;\n \tstruct gv_softc *sc;\n \tstruct gv_volume *v;\n \tstruct gv_plex *p;\n-\tint first;\n+\tint error, first;\n \n \tg_trace(G_T_TOPOLOGY, \"gv_volume_taste(%s, %s)\", mp->name, pp->name);\n \tg_topology_assert();\n@@ -214,8 +214,27 @@\n \t} else\n \t\tgp = v->geom;\n \n+\t\/*\n+\t * Create a new consumer and attach it to the plex geom. Since this\n+\t * volume might already have a plex attached, we need to adjust the\n+\t * access counts of the new consumer.\n+\t *\/\n+\tocp = LIST_FIRST(&gp->consumer);\n \tcp = g_new_consumer(gp);\n \tg_attach(cp, pp);\n+\tif ((ocp != NULL) && (ocp->acr > 0 || ocp->acw > 0 || ocp->ace > 0)) {\n+\t\terror = g_access(cp, ocp->acr, ocp->acw, ocp->ace);\n+\t\tif (error) {\n+\t\t\tprintf(\"GEOM_VINUM: failed g_access %s -> %s; \"\n+\t\t\t \"errno %d\\n\", v->name, p->name, error);\n+\t\t\tg_detach(cp);\n+\t\t\tg_destroy_consumer(cp);\n+\t\t\tif (first)\n+\t\t\t\tg_destroy_geom(gp);\n+\t\t\treturn (NULL);\n+\t\t}\n+\t}\n+\n \tp->consumer = cp;\n \n \tif (p->vol_sc != v) {\n"} {"commit":"64d0cd009718ce64cf0f388142ead7ea41f1f3c8","subject":"netns xfrm: propagate netns into bydst\/bysrc\/byspi hash functions","message":"netns xfrm: propagate netns into bydst\/bysrc\/byspi hash functions\n\nSigned-off-by: Alexey Dobriyan <b99bff5923d24d2fb8e844db9dac7cd59203da1d@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/xfrm\/xfrm_state.c\n+++ net\/xfrm\/xfrm_state.c\n@@ -57,25 +57,27 @@\n #define xfrm_audit_state_replay(x, s, sq)\tdo { ; } while (0)\n #endif \/* CONFIG_AUDITSYSCALL *\/\n \n-static inline unsigned int xfrm_dst_hash(xfrm_address_t *daddr,\n+static inline unsigned int xfrm_dst_hash(struct net *net,\n+\t\t\t\t\t xfrm_address_t *daddr,\n \t\t\t\t\t xfrm_address_t *saddr,\n \t\t\t\t\t u32 reqid,\n \t\t\t\t\t unsigned short family)\n {\n-\treturn __xfrm_dst_hash(daddr, saddr, reqid, family, init_net.xfrm.state_hmask);\n-}\n-\n-static inline unsigned int xfrm_src_hash(xfrm_address_t *daddr,\n+\treturn __xfrm_dst_hash(daddr, saddr, reqid, family, net->xfrm.state_hmask);\n+}\n+\n+static inline unsigned int xfrm_src_hash(struct net *net,\n+\t\t\t\t\t xfrm_address_t *daddr,\n \t\t\t\t\t xfrm_address_t *saddr,\n \t\t\t\t\t unsigned short family)\n {\n-\treturn __xfrm_src_hash(daddr, saddr, family, init_net.xfrm.state_hmask);\n+\treturn __xfrm_src_hash(daddr, saddr, family, net->xfrm.state_hmask);\n }\n \n static inline unsigned int\n-xfrm_spi_hash(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family)\n-{\n-\treturn __xfrm_spi_hash(daddr, spi, proto, family, init_net.xfrm.state_hmask);\n+xfrm_spi_hash(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family)\n+{\n+\treturn __xfrm_spi_hash(daddr, spi, proto, family, net->xfrm.state_hmask);\n }\n \n static void xfrm_hash_transfer(struct hlist_head *list,\n@@ -666,7 +668,7 @@\n \n static struct xfrm_state *__xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family)\n {\n-\tunsigned int h = xfrm_spi_hash(daddr, spi, proto, family);\n+\tunsigned int h = xfrm_spi_hash(&init_net, daddr, spi, proto, family);\n \tstruct xfrm_state *x;\n \tstruct hlist_node *entry;\n \n@@ -698,7 +700,7 @@\n \n static struct xfrm_state *__xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family)\n {\n-\tunsigned int h = xfrm_src_hash(daddr, saddr, family);\n+\tunsigned int h = xfrm_src_hash(&init_net, daddr, saddr, family);\n \tstruct xfrm_state *x;\n \tstruct hlist_node *entry;\n \n@@ -767,7 +769,7 @@\n \tto_put = NULL;\n \n \tspin_lock_bh(&xfrm_state_lock);\n-\th = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family);\n+\th = xfrm_dst_hash(&init_net, daddr, saddr, tmpl->reqid, family);\n \thlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+h, bydst) {\n \t\tif (x->props.family == family &&\n \t\t x->props.reqid == tmpl->reqid &&\n@@ -839,10 +841,10 @@\n \t\t\tx->km.state = XFRM_STATE_ACQ;\n \t\t\tlist_add(&x->km.all, &init_net.xfrm.state_all);\n \t\t\thlist_add_head(&x->bydst, init_net.xfrm.state_bydst+h);\n-\t\t\th = xfrm_src_hash(daddr, saddr, family);\n+\t\t\th = xfrm_src_hash(&init_net, daddr, saddr, family);\n \t\t\thlist_add_head(&x->bysrc, init_net.xfrm.state_bysrc+h);\n \t\t\tif (x->id.spi) {\n-\t\t\t\th = xfrm_spi_hash(&x->id.daddr, x->id.spi, x->id.proto, family);\n+\t\t\t\th = xfrm_spi_hash(&init_net, &x->id.daddr, x->id.spi, x->id.proto, family);\n \t\t\t\thlist_add_head(&x->byspi, init_net.xfrm.state_byspi+h);\n \t\t\t}\n \t\t\tx->lft.hard_add_expires_seconds = sysctl_xfrm_acq_expires;\n@@ -877,7 +879,7 @@\n \tstruct hlist_node *entry;\n \n \tspin_lock(&xfrm_state_lock);\n-\th = xfrm_dst_hash(daddr, saddr, reqid, family);\n+\th = xfrm_dst_hash(&init_net, daddr, saddr, reqid, family);\n \thlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+h, bydst) {\n \t\tif (x->props.family == family &&\n \t\t x->props.reqid == reqid &&\n@@ -908,15 +910,15 @@\n \n \tlist_add(&x->km.all, &init_net.xfrm.state_all);\n \n-\th = xfrm_dst_hash(&x->id.daddr, &x->props.saddr,\n+\th = xfrm_dst_hash(&init_net, &x->id.daddr, &x->props.saddr,\n \t\t\t x->props.reqid, x->props.family);\n \thlist_add_head(&x->bydst, init_net.xfrm.state_bydst+h);\n \n-\th = xfrm_src_hash(&x->id.daddr, &x->props.saddr, x->props.family);\n+\th = xfrm_src_hash(&init_net, &x->id.daddr, &x->props.saddr, x->props.family);\n \thlist_add_head(&x->bysrc, init_net.xfrm.state_bysrc+h);\n \n \tif (x->id.spi) {\n-\t\th = xfrm_spi_hash(&x->id.daddr, x->id.spi, x->id.proto,\n+\t\th = xfrm_spi_hash(&init_net, &x->id.daddr, x->id.spi, x->id.proto,\n \t\t\t\t x->props.family);\n \n \t\thlist_add_head(&x->byspi, init_net.xfrm.state_byspi+h);\n@@ -942,7 +944,7 @@\n \tstruct hlist_node *entry;\n \tunsigned int h;\n \n-\th = xfrm_dst_hash(&xnew->id.daddr, &xnew->props.saddr, reqid, family);\n+\th = xfrm_dst_hash(&init_net, &xnew->id.daddr, &xnew->props.saddr, reqid, family);\n \thlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+h, bydst) {\n \t\tif (x->props.family\t== family &&\n \t\t x->props.reqid\t== reqid &&\n@@ -964,7 +966,7 @@\n \/* xfrm_state_lock is held *\/\n static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 reqid, u8 proto, xfrm_address_t *daddr, xfrm_address_t *saddr, int create)\n {\n-\tunsigned int h = xfrm_dst_hash(daddr, saddr, reqid, family);\n+\tunsigned int h = xfrm_dst_hash(&init_net, daddr, saddr, reqid, family);\n \tstruct hlist_node *entry;\n \tstruct xfrm_state *x;\n \n@@ -1037,7 +1039,7 @@\n \t\tadd_timer(&x->timer);\n \t\tlist_add(&x->km.all, &init_net.xfrm.state_all);\n \t\thlist_add_head(&x->bydst, init_net.xfrm.state_bydst+h);\n-\t\th = xfrm_src_hash(daddr, saddr, family);\n+\t\th = xfrm_src_hash(&init_net, daddr, saddr, family);\n \t\thlist_add_head(&x->bysrc, init_net.xfrm.state_bysrc+h);\n \n \t\tinit_net.xfrm.state_num++;\n@@ -1189,7 +1191,7 @@\n \tstruct hlist_node *entry;\n \n \tif (m->reqid) {\n-\t\th = xfrm_dst_hash(&m->old_daddr, &m->old_saddr,\n+\t\th = xfrm_dst_hash(&init_net, &m->old_daddr, &m->old_saddr,\n \t\t\t\t m->reqid, m->old_family);\n \t\thlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+h, bydst) {\n \t\t\tif (x->props.mode != m->mode ||\n@@ -1206,7 +1208,7 @@\n \t\t\treturn x;\n \t\t}\n \t} else {\n-\t\th = xfrm_src_hash(&m->old_daddr, &m->old_saddr,\n+\t\th = xfrm_src_hash(&init_net, &m->old_daddr, &m->old_saddr,\n \t\t\t\t m->old_family);\n \t\thlist_for_each_entry(x, entry, init_net.xfrm.state_bysrc+h, bysrc) {\n \t\t\tif (x->props.mode != m->mode ||\n@@ -1514,7 +1516,7 @@\n \t}\n \tif (x->id.spi) {\n \t\tspin_lock_bh(&xfrm_state_lock);\n-\t\th = xfrm_spi_hash(&x->id.daddr, x->id.spi, x->id.proto, x->props.family);\n+\t\th = xfrm_spi_hash(&init_net, &x->id.daddr, x->id.spi, x->id.proto, x->props.family);\n \t\thlist_add_head(&x->byspi, init_net.xfrm.state_byspi+h);\n \t\tspin_unlock_bh(&xfrm_state_lock);\n \n"} {"commit":"9f2d2124bd025534b969fe17ace7a90be1600ceb","subject":"basemediamuxer: Return correct value on failure","message":"basemediamuxer: Return correct value on failure\n\nChange-Id: I836f2c9fe56108cad76c6bf9514fd5afeacde430\n","repos":"Kurento\/kms-elements,Kurento\/kms-elements,Kurento\/kms-elements","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gst-plugins\/kmsbasemediamuxer.c\n+++ src\/gst-plugins\/kmsbasemediamuxer.c\n@@ -95,7 +95,7 @@\n GstClock *\n kms_base_media_muxer_get_clock_impl (KmsBaseMediaMuxer * obj)\n {\n- g_return_val_if_fail (obj != NULL, GST_CLOCK_TIME_NONE);\n+ g_return_val_if_fail (obj != NULL, NULL);\n \n return GST_ELEMENT (KMS_BASE_MEDIA_MUXER_GET_PIPELINE (obj))->clock;\n }\n"} {"commit":"700dfb96d59000546c9e1b5890976f32065140cb","subject":"doxygen comments moved for more-correct output","message":"doxygen comments moved for more-correct output\n\ngit-svn-id: 285d6e11b92f44d073a8e12a14e649675b16fc71@469 3ec011a9-ccf5-4689-8f2f-5f4aa021d377\n","repos":"UniStuttgart-VISUS\/megamol,UniStuttgart-VISUS\/megamol,UniStuttgart-VISUS\/megamol,UniStuttgart-VISUS\/megamol,UniStuttgart-VISUS\/megamol","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/include\/vislib\/CmdLineParser.h\n+++ sys\/include\/vislib\/CmdLineParser.h\n@@ -77,9 +77,8 @@\n * using the or operator \"|\".\r\n *\/\r\n enum Flags {\r\n+ \/** Symbolic constant for no flags *\/\r\n FLAG_NULL = 0,\r\n- \/** Symbolic constant for no flags *\/\r\n- FLAG_UNIQUE = 1, \r\n \/**\r\n * Flag indicating that this option must not appear more then \r\n * once in the command line. If the option appears more then \r\n@@ -87,19 +86,20 @@\n * option. The other appearences will be ignored and there will\r\n * be a warning.\r\n *\/\r\n- FLAG_REQUIRED = 2,\r\n+ FLAG_UNIQUE = 1, \r\n \/**\r\n * Flag indicating that this option is required. If at least \r\n * one required option is missing in the command line there \r\n * will be an error.\r\n *\/\r\n- FLAG_EXCLUSIVE = 4\r\n+ FLAG_REQUIRED = 2,\r\n \/**\r\n * Flag indicating that this option may only appear as first \r\n * option. Any following parameters will be classified as\r\n * \"TYPE_UNKNOWN\". If this option is used not as first option,\r\n * an error is generated. (This implies \"FLAG_UNIQUE\").\r\n *\/\r\n+ FLAG_EXCLUSIVE = 4\r\n };\r\n \r\n \/** possible variable types *\/\r\n"} {"commit":"1fdbfb35fff0cdbfd4aca309b33bf9a3a7ba5d3e","subject":"alpha: Move chroma keying parameters into stack variables to prevent multiple pointer dereferences per pixel","message":"alpha: Move chroma keying parameters into stack variables to prevent multiple pointer dereferences per pixel\n","repos":"Kurento\/gst-plugins-good,StreamUtils\/gst-plugins-good,vatavuserban\/gst-plugins-good,ikonst\/gst-plugins-good,alessandrod\/gst-plugins-good,ariscop\/gst-plugins-good,cablelabs\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,mrchapp\/gst-plugins-good,hizukiayaka\/gst-plugins-good,rawoul\/gst-plugins-good,Distrotech\/gst-plugins-good,matsu\/gst-plugins-good,lovebug356\/gst-plugins-good,wkatsak\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,davibe\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,loshca\/gst-plugins-good,froggatt\/gst-plugins-good-m,chamois94\/gst-plugins-good,greg80303\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,mrchapp\/gst-plugins-good,ndufresne\/gst-plugins-good,jcaden\/gst-plugins-good,ariscop\/gst-plugins-good,jhodapp\/gst-plugins-good,shelsonjava\/gst-plugins-good,StreamUtils\/gst-plugins-good,cablelabs\/gst-plugins-good,alessandrod\/gst-plugins-good,cfoch\/gst-plugins-good,lovebug356\/gst-plugins-good,ylatuya\/gst-plugins-good,matsu\/gst-plugins-good,collects\/gst-plugins-good,cfoch\/gst-plugins-good,ikonst\/gst-plugins-good,BigBrother-International\/gst-plugins-good,ted-n\/gst-plugins-good,greg80303\/gst-plugins-good,krieger-od\/gst-plugins-good,dgerlach\/gst-plugins-good,davibe\/gst-plugins-good-1.0,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,offlinehacker\/gst-plugins-good,luisbg\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,knuesel\/gst-plugins-good,offlinehacker\/gst-plugins-good,veo-labs\/gst-plugins-good,jcaden\/gst-plugins-good,veo-labs\/gst-plugins-good,jhodapp\/gst-plugins-good,offlinehacker\/gst-plugins-good,jcaden\/gst-plugins-good,surround-io\/gst-plugins-good,shelsonjava\/gst-plugins-good,ndufresne\/gst-plugins-good,wkatsak\/gst-plugins-good,lovebug356\/gst-plugins-good,sebras\/gst-plugins-good,jahrome\/gst-plugins-good,an146\/gst-plugins-good,shelsonjava\/gst-plugins-good,mrchapp\/gst-plugins-good,Lachann\/gst-plugins-good,pexip\/gst-plugins-good,alessandrod\/gst-plugins-good,shelsonjava\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,Distrotech\/gst-plugins-good,knuesel\/gst-plugins-good,ndufresne\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,sebras\/gst-plugins-good,sebras\/gst-plugins-good,Kurento\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,an146\/gst-plugins-good,matsu\/gst-plugins-good,collects\/gst-plugins-good,surround-io\/gst-plugins-good,BigBrother-International\/gst-plugins-good,dgerlach\/gst-plugins-good,ariscop\/gst-plugins-good,sebras\/gst-plugins-good,davibe\/gst-plugins-good,surround-io\/gst-plugins-good,BigBrother-International\/gst-plugins-good,GStreamer\/gst-plugins-good,jhodapp\/gst-plugins-good,krieger-od\/gst-plugins-good,mrchapp\/gst-plugins-good,hizukiayaka\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,kittee\/gst-plugins-good,greg80303\/gst-plugins-good,loshca\/gst-plugins-good,ikonst\/gst-plugins-good,kittee\/gst-plugins-good,ylatuya\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,stfl\/gst-plugins-good,strukturag\/gst-plugins-good,rawoul\/gst-plugins-good,Distrotech\/gst-plugins-good,cfoch\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,cablelabs\/gst-plugins-good,chamois94\/gst-plugins-good,ndufresne\/gst-plugins-good,vatavuserban\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,ahmedammar\/platform_external_gst_plugins_good,jpakkane\/gstreamer-plugins-good,GrokImageCompression\/gst-plugins-good,chamois94\/gst-plugins-good,krieger-od\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,ylatuya\/gst-plugins-good,pexip\/gst-plugins-good,froggatt\/gst-plugins-good-m,rawoul\/gst-plugins-good,davibe\/gst-plugins-good-1.0,mrchapp\/gst-plugins-good,offlinehacker\/gst-plugins-good,surround-io\/gst-plugins-good,Lachann\/gst-plugins-good,ylatuya\/gst-plugins-good,strukturag\/gst-plugins-good,jcaden\/gst-plugins-good,davibe\/gst-plugins-good,zaheerm\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,chamois94\/gst-plugins-good,kittee\/gst-plugins-good,knuesel\/gst-plugins-good,wkatsak\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,cablelabs\/gst-plugins-good,sh0\/gst-plugins-good,luisbg\/gst-plugins-good,ted-n\/gst-plugins-good,jahrome\/gst-plugins-good,strukturag\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,stfl\/gst-plugins-good,sh0\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,zaheerm\/gst-plugins-good,davibe\/gst-plugins-good-1.0,kittee\/gst-plugins-good,stfl\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,froggatt\/gst-plugins-good-m,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,knuesel\/gst-plugins-good,froggatt\/gst-plugins-good-m,krad-radio\/gstreamer-plugins-good-krad,ted-n\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,zaheerm\/gst-plugins-good,StreamUtils\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,pexip\/gst-plugins-good,ariscop\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,sh0\/gst-plugins-good,ted-n\/gst-plugins-good,an146\/gst-plugins-good,dgerlach\/gst-plugins-good,wkatsak\/gst-plugins-good,matsu\/gst-plugins-good,loshca\/gst-plugins-good,veo-labs\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,strukturag\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,vatavuserban\/gst-plugins-good,rawoul\/gst-plugins-good,zaheerm\/gst-plugins-good,krieger-od\/gst-plugins-good,jahrome\/gst-plugins-good,Lachann\/gst-plugins-good,Distrotech\/gst-plugins-good,jhodapp\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,vatavuserban\/gst-plugins-good,ikonst\/gst-plugins-good,alessandrod\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,StreamUtils\/gst-plugins-good,GStreamer\/gst-plugins-good,sh0\/gst-plugins-good,an146\/gst-plugins-good,davibe\/gst-plugins-good-1.0,jahrome\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,Lachann\/gst-plugins-good,Distrotech\/gst-plugins-good,collects\/gst-plugins-good,luisbg\/gst-plugins-good,pexip\/gst-plugins-good,loshca\/gst-plugins-good,collects\/gst-plugins-good,greg80303\/gst-plugins-good,lovebug356\/gst-plugins-good,hizukiayaka\/gst-plugins-good,cfoch\/gst-plugins-good,stfl\/gst-plugins-good,Kurento\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,GStreamer\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,BigBrother-International\/gst-plugins-good,Kurento\/gst-plugins-good,Kurento\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,veo-labs\/gst-plugins-good,luisbg\/gst-plugins-good,hizukiayaka\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/alpha\/gstalpha.c\n+++ gst\/alpha\/gstalpha.c\n@@ -689,6 +689,13 @@\n gint a, y, u, v;\n gint smin, smax;\n gint pa = alpha->alpha * 255;\n+ gint8 cb = alpha->cb, cr = alpha->cr;\n+ gint8 kg = alpha->kg;\n+ guint8 accept_angle_tg = alpha->accept_angle_tg;\n+ guint8 accept_angle_ctg = alpha->accept_angle_ctg;\n+ guint8 one_over_kc = alpha->one_over_kc;\n+ guint8 kfgy_scale = alpha->kfgy_scale;\n+ guint noise_level2 = alpha->noise_level2;\n \n smin = 128 - alpha->black_sensitivity;\n smax = 128 + alpha->white_sensitivity;\n@@ -704,10 +711,9 @@\n u = src1[2] - 128;\n v = src1[3] - 128;\n \n- a = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb,\n- smin, smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb,\n+ smin, smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -735,10 +741,9 @@\n u = APPLY_MATRIX (matrix, 1, src1[1], src1[2], src1[3]) - 128;\n v = APPLY_MATRIX (matrix, 2, src1[1], src1[2], src1[3]) - 128;\n \n- a = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb,\n- smin, smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb,\n+ smin, smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -763,6 +768,13 @@\n gint xpos;\n gint a, a2, u, v;\n gint smin, smax;\n+ gint8 cb = alpha->cb, cr = alpha->cr;\n+ gint8 kg = alpha->kg;\n+ guint8 accept_angle_tg = alpha->accept_angle_tg;\n+ guint8 accept_angle_ctg = alpha->accept_angle_ctg;\n+ guint8 one_over_kc = alpha->one_over_kc;\n+ guint8 kfgy_scale = alpha->kfgy_scale;\n+ guint noise_level2 = alpha->noise_level2;\n \n a = 255 * alpha->alpha;\n smin = 128 - alpha->black_sensitivity;\n@@ -779,10 +791,9 @@\n u = srcU[0] - 128;\n v = srcV[0] - 128;\n \n- a2 = chroma_keying_yuv (a, y, 4, &u, &v, alpha->cr, alpha->cb, smin,\n- smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a2 = chroma_keying_yuv (a, y, 4, &u, &v, cr, cb, smin,\n+ smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -824,10 +835,9 @@\n u = APPLY_MATRIX (matrix, 1, srcY1[0], srcU[0], srcV[0]) - 128;\n v = APPLY_MATRIX (matrix, 2, srcY1[0], srcU[0], srcV[0]) - 128;\n \n- a2 = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb, smin,\n- smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a2 = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb, smin,\n+ smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -841,10 +851,9 @@\n u = APPLY_MATRIX (matrix, 1, srcY1[1], srcU[0], srcV[0]) - 128;\n v = APPLY_MATRIX (matrix, 2, srcY1[1], srcU[0], srcV[0]) - 128;\n \n- a2 = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb, smin,\n- smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a2 = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb, smin,\n+ smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -858,10 +867,9 @@\n u = APPLY_MATRIX (matrix, 1, srcY2[0], srcU[0], srcV[0]) - 128;\n v = APPLY_MATRIX (matrix, 2, srcY2[0], srcU[0], srcV[0]) - 128;\n \n- a2 = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb, smin,\n- smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a2 = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb, smin,\n+ smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n@@ -875,10 +883,9 @@\n u = APPLY_MATRIX (matrix, 1, srcY2[1], srcU[0], srcV[0]) - 128;\n v = APPLY_MATRIX (matrix, 2, srcY2[1], srcU[0], srcV[0]) - 128;\n \n- a2 = chroma_keying_yuv (a, &y, 1, &u, &v, alpha->cr, alpha->cb, smin,\n- smax, alpha->accept_angle_tg, alpha->accept_angle_ctg,\n- alpha->one_over_kc, alpha->kfgy_scale, alpha->kg,\n- alpha->noise_level2);\n+ a2 = chroma_keying_yuv (a, &y, 1, &u, &v, cr, cb, smin,\n+ smax, accept_angle_tg, accept_angle_ctg,\n+ one_over_kc, kfgy_scale, kg, noise_level2);\n \n u += 128;\n v += 128;\n"} {"commit":"a80e8464009899c85fa8360a4c2de4993ba1bbe6","subject":"del of duplicated coap_interface.h","message":"del of duplicated coap_interface.h\n","repos":"Lobaro\/lobaro-coap,Lobaro\/lobaro-coap,Lobaro\/lobaro-coap","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- interface\/_common\/coap_interface.h\n+++ interface\/_common\/coap_interface.h\n@@ -1,91 +0,0 @@\n-\/*******************************************************************************\n- * Copyright (c) 2015 Dipl.-Ing. Tobias Rohde, http:\/\/www.lobaro.com\n- *\n- * Permission is hereby granted, free of charge, to any person obtaining a copy\n- * of this software and associated documentation files (the \"Software\"), to deal\n- * in the Software without restriction, including without limitation the rights\n- * to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\n- * copies of the Software, and to permit persons to whom the Software is\n- * furnished to do so, subject to the following conditions:\n- *\n- * The above copyright notice and this permission notice shall be included in\n- * all copies or substantial portions of the Software.\n- *\n- * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n- * THE SOFTWARE.\n- *******************************************************************************\/\n-\n-#ifndef USER_LOBARO_COAP_INTERFACE_COAP_INTERFACE_H_\n-#define USER_LOBARO_COAP_INTERFACE_COAP_INTERFACE_H_\n-\n-\/\/ESP866 specific\n-#ifdef __ets__ \/\/to be defined (\"-D__ets__\") in makefile as compiler argument (normally given with ESP8266 SDK)\n-\n-\t\/\/ESP8266 with partial libC from SDK\n-\t#include <osapi.h>\n-\t#include <os_type.h>\n-\n-\t#define coap_sprintf os_sprintf\n-\t#define coap_printf ets_uart_printf\n-\t#define coap_memcpy os_memcpy\n-\t#define coap_memset os_memset\n-\t#define coap_memmove os_memmove\n-\t#define coap_strlen os_strlen\n-\t#define\tcoap_strstr os_strstr\n-\t#define coap_strcpy os_strcpy\n-\t#define coap_memcmp os_memcmp\n-\n-\/\/function section attributes to set sections of functions\n-\t#define _rom ICACHE_FLASH_ATTR\n-\t#define _ram\n-\n-#else\n-\t\/\/Standard c-libs\n-\t#include <stdint.h>\n-\t#include <stdbool.h>\n-\t#include <stdarg.h>\n-\t#include <stddef.h>\n-\t#include <stdio.h>\n-\t#include <string.h>\n-\t#include <stdlib.h>\n-\n-\t#define coap_sprintf sprintf\n-\t#define coap_printf printf\n-\t#define coap_memcpy memcpy\n-\t#define coap_memset memset\n-\t#define coap_memmove memmove\n-\t#define coap_strlen strlen\n-\t#define\tcoap_strstr strstr\n-\t#define coap_strcpy strcpy\n-\t#define coap_memcmp memcmp\n-\n-\t#define _rom\n-\t#define _ram\n-#endif\n-\n-\/\/Interface \"glue\" to surrounding project\/software\n-\/\/for use of the stack you have to provide some packet send\/receive functionality\n-\/\/it's up to you which packet format you use e.g. UDP is the most obvious...\n-\/\/-> see coap_main.h for more information and adding send\/receive interface functions\n-#include \"coap_if_Endpoint.h\"\n-#include \"coap_if_Packet.h\"\n-#include \"coap_if_Socket.h\"\n-\n-\/\/Implementation for these function prototypes must be provided externally:\n-\n-\/\/Uart\/Display function to print debug\/status messages to\n-void hal_uart_puts(char *s);\n-void hal_uart_putc(char c);\n-\/\/1Hz Clock used by timeout logic\n-uint32_t hal_rtc_1Hz_Cnt(void);\n-\/\/Non volatile memory e.g. flash\/sd-card\/eeprom\n-\/\/used to store observers during deepsleep of server\n-uint8_t* hal_nonVolatile_GetBufPtr();\n-bool hal_nonVolatile_WriteBuf(uint8_t* data, uint32_t len);\n-\n-#endif \/* USER_LOBARO_COAP_INTERFACE_COAP_INTERFACE_H_ *\/\n"} {"commit":"d8a0e03d761654d8775e052e4132c83f77f2fa1b","subject":"Fix a race condition where interrupts set up after boot could be enabled in the PIC before the interrupt handler was set. If the interrupt triggered in that window, then the interrupt vector would be disabled.","message":"Fix a race condition where interrupts set up after boot could be enabled in\nthe PIC before the interrupt handler was set. If the interrupt triggered in\nthat window, then the interrupt vector would be disabled.\n\nReported by:\tMarco Trillo\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/powerpc\/powerpc\/intr_machdep.c\n+++ sys\/powerpc\/powerpc\/intr_machdep.c\n@@ -243,7 +243,7 @@\n driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep)\n {\n \tstruct powerpc_intr *i;\n-\tint error;\n+\tint error, enable = 0;\n \n \ti = intr_lookup(irq);\n \tif (i == NULL)\n@@ -258,13 +258,16 @@\n \n \t\ti->cntp = &intrcnt[i->vector];\n \n-\t\tif (!cold)\n-\t\t\tPIC_ENABLE(pic, i->irq, i->vector);\n+\t\tenable = 1;\n \t}\n \n \terror = intr_event_add_handler(i->event, name, filter, handler, arg,\n \t intr_priority(flags), flags, cookiep);\n \tintrcnt_setname(i->event->ie_fullname, i->vector);\n+\n+\tif (!cold && enable)\n+\t\tPIC_ENABLE(pic, i->irq, i->vector);\n+\n \treturn (error);\n }\n \n"} {"commit":"a482babf5590e72a3277fcd05a8e122e9717e3b0","subject":"docs: fix gtk-doc syntax","message":"docs: fix gtk-doc syntax\n","repos":"mparis\/gstreamer,ylatuya\/gstreamer,StreamUtils\/gstreamer,justinjoy\/gstreamer,StreamUtils\/gstreamer,krieger-od\/gstreamer,justinjoy\/gstreamer,cfoch\/gstreamer,ylatuya\/gstreamer,magcius\/gstreamer,Lachann\/gstreamer,centricular\/gstreamer,shelsonjava\/gstreamer,centricular\/gstreamer,StreamUtils\/gstreamer,justinjoy\/gstreamer,cfoch\/gstreamer,ensonic\/gstreamer,surround-io\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,shelsonjava\/gstreamer,Lachann\/gstreamer,magcius\/gstreamer,krichter722\/gstreamer,krieger-od\/gstreamer,Distrotech\/gstreamer,lubosz\/gstreamer,krichter722\/gstreamer,krieger-od\/gstreamer,mparis\/gstreamer,Distrotech\/gstreamer,collects\/gstreamer,ensonic\/gstreamer,ylatuya\/gstreamer,ensonic\/gstreamer,jpakkane\/gstreamer,Distrotech\/gstreamer,shelsonjava\/gstreamer,lubosz\/gstreamer,StreamUtils\/gstreamer,lovebug356\/gstreamer,magcius\/gstreamer,cablelabs\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,drothlis\/gstreamer,krichter722\/gstreamer,shelsonjava\/gstreamer,jpakkane\/gstreamer,drothlis\/gstreamer,drothlis\/gstreamer,surround-io\/gstreamer,jpxiong\/gstreamer,krieger-od\/gstreamer,cablelabs\/gstreamer,mparis\/gstreamer,Distrotech\/gstreamer,jpakkane\/gstreamer,collects\/gstreamer,Lachann\/gstreamer,cablelabs\/gstreamer,mparis\/gstreamer,justinjoy\/gstreamer,mparis\/gstreamer,magcius\/gstreamer,lubosz\/gstreamer,lubosz\/gstreamer,centricular\/gstreamer,jpxiong\/gstreamer,ensonic\/gstreamer,jpxiong\/gstreamer,cablelabs\/gstreamer,surround-io\/gstreamer,jpxiong\/gstreamer,surround-io\/gstreamer,Distrotech\/gstreamer,centricular\/gstreamer,magcius\/gstreamer,StreamUtils\/gstreamer,drothlis\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,cfoch\/gstreamer,krieger-od\/gstreamer,collects\/gstreamer,cfoch\/gstreamer,cablelabs\/gstreamer,lubosz\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,lovebug356\/gstreamer,ensonic\/gstreamer,centricular\/gstreamer,jpxiong\/gstreamer,lovebug356\/gstreamer,ylatuya\/gstreamer,ylatuya\/gstreamer,lovebug356\/gstreamer,collects\/gstreamer,krichter722\/gstreamer,drothlis\/gstreamer,shelsonjava\/gstreamer,Lachann\/gstreamer,justinjoy\/gstreamer,collects\/gstreamer,jpakkane\/gstreamer,jpakkane\/gstreamer,surround-io\/gstreamer,lovebug356\/gstreamer,Lachann\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,krichter722\/gstreamer,cfoch\/gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/gstatomicqueue.h\n+++ gst\/gstatomicqueue.h\n@@ -29,6 +29,7 @@\n \n \/**\n * GstAtomicQueue:\n+ *\n * Opaque atomic data queue.\n *\n * Use the acessor functions to get the stored values.\n"} {"commit":"51e4bd00f6b413605ad94bf4bd9b691f131364bc","subject":"adding eigen new macro","message":"adding eigen new macro\n\n\ngit-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@1230 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- io\/include\/pcl\/io\/openni_grabber.h\n+++ io\/include\/pcl\/io\/openni_grabber.h\n@@ -267,6 +267,9 @@\n openni_wrapper::OpenNIDevice::CallbackHandle image_callback_handle;\n openni_wrapper::OpenNIDevice::CallbackHandle ir_callback_handle;\n bool running_;\n+\n+ public:\n+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW\n } ;\n \n const openni_wrapper::OpenNIDevice&\n"} {"commit":"595a9cb5c55e89f3f29824a30f8a07b779e17379","subject":"isomp4: fix incorrect masking for multiple tags","message":"isomp4: fix incorrect masking for multiple tags\n\nCoverity 206058\n","repos":"veo-labs\/gst-plugins-good,surround-io\/gst-plugins-good,StreamUtils\/gst-plugins-good,surround-io\/gst-plugins-good,loshca\/gst-plugins-good,hizukiayaka\/gst-plugins-good,sh0\/gst-plugins-good,stfl\/gst-plugins-good,ndufresne\/gst-plugins-good,rawoul\/gst-plugins-good,veo-labs\/gst-plugins-good,stfl\/gst-plugins-good,ikonst\/gst-plugins-good,sh0\/gst-plugins-good,sebras\/gst-plugins-good,GStreamer\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,jcaden\/gst-plugins-good,rawoul\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,loshca\/gst-plugins-good,ikonst\/gst-plugins-good,froggatt\/gst-plugins-good-m,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,cablelabs\/gst-plugins-good,wkatsak\/gst-plugins-good,stfl\/gst-plugins-good,sh0\/gst-plugins-good,vatavuserban\/gst-plugins-good,chamois94\/gst-plugins-good,rawoul\/gst-plugins-good,pexip\/gst-plugins-good,Lachann\/gst-plugins-good,cablelabs\/gst-plugins-good,sh0\/gst-plugins-good,veo-labs\/gst-plugins-good,BigBrother-International\/gst-plugins-good,StreamUtils\/gst-plugins-good,froggatt\/gst-plugins-good-m,kittee\/gst-plugins-good,vatavuserban\/gst-plugins-good,vatavuserban\/gst-plugins-good,GStreamer\/gst-plugins-good,hizukiayaka\/gst-plugins-good,chamois94\/gst-plugins-good,greg80303\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,jpakkane\/gstreamer-plugins-good,Kurento\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,wkatsak\/gst-plugins-good,ikonst\/gst-plugins-good,GStreamer\/gst-plugins-good,froggatt\/gst-plugins-good-m,cablelabs\/gst-plugins-good,kittee\/gst-plugins-good,Lachann\/gst-plugins-good,sebras\/gst-plugins-good,surround-io\/gst-plugins-good,veo-labs\/gst-plugins-good,loshca\/gst-plugins-good,wkatsak\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,rawoul\/gst-plugins-good,StreamUtils\/gst-plugins-good,sebras\/gst-plugins-good,ndufresne\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,greg80303\/gst-plugins-good,hizukiayaka\/gst-plugins-good,shelsonjava\/gst-plugins-good,shelsonjava\/gst-plugins-good,pexip\/gst-plugins-good,ndufresne\/gst-plugins-good,BigBrother-International\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,Lachann\/gst-plugins-good,cablelabs\/gst-plugins-good,pexip\/gst-plugins-good,hizukiayaka\/gst-plugins-good,chamois94\/gst-plugins-good,pexip\/gst-plugins-good,greg80303\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,GrokImageCompression\/gst-plugins-good,greg80303\/gst-plugins-good,wkatsak\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,BigBrother-International\/gst-plugins-good,vatavuserban\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,loshca\/gst-plugins-good,Lachann\/gst-plugins-good,GStreamer\/gst-plugins-good,Kurento\/gst-plugins-good,chamois94\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,shelsonjava\/gst-plugins-good,pexip\/gst-plugins-good,surround-io\/gst-plugins-good,sebras\/gst-plugins-good,froggatt\/gst-plugins-good-m,Kurento\/gst-plugins-good,kittee\/gst-plugins-good,jcaden\/gst-plugins-good,jcaden\/gst-plugins-good,shelsonjava\/gst-plugins-good,BigBrother-International\/gst-plugins-good,jcaden\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,Kurento\/gst-plugins-good,Kurento\/gst-plugins-good,kittee\/gst-plugins-good,StreamUtils\/gst-plugins-good,ndufresne\/gst-plugins-good,stfl\/gst-plugins-good,ikonst\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/isomp4\/qtdemux.c\n+++ gst\/isomp4\/qtdemux.c\n@@ -7362,7 +7362,7 @@\n GST_LOG_OBJECT (qtdemux, \"stsd type len: %d\", len);\n \n if ((fourcc == FOURCC_drms) || (fourcc == FOURCC_drmi) ||\n- ((fourcc & 0xFFFFFF00) == GST_MAKE_FOURCC ('e', 'n', 'c', 0)))\n+ ((fourcc & 0x00FFFFFF) == GST_MAKE_FOURCC ('e', 'n', 'c', 0)))\n goto error_encrypted;\n \n if (stream->subtype == FOURCC_vide) {\n"} {"commit":"3ff0c7136a94d87a142caea92382e3b6ed9dd92c","subject":"delete blank lines","message":"delete blank lines\n","repos":"namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ldd3\/chapter03\/firstdev\/firstdev.c\n+++ ldd3\/chapter03\/firstdev\/firstdev.c\n@@ -34,6 +34,7 @@\n loff_t fdev_llseek(struct file *filp, loff_t off, int whence)\n {\n \tpr_alert(\"fdev_llseek\");\n+\n \treturn 0;\n }\n \n@@ -43,6 +44,7 @@\n \tstruct firstdev *dev = filp->private_data;\n \n \tpr_alert(\"fdev_read, major=%d, minor=%d\", dev->major, dev->minor);\n+\n \treturn 0;\n }\n \n@@ -52,6 +54,7 @@\n \tstruct firstdev *dev = filp->private_data;\n \n \tpr_alert(\"fdev_write, major=%d, minor=%d\", dev->major, dev->minor);\n+\n \treturn 0;\n }\n \n@@ -67,7 +70,6 @@\n \n \tdev = container_of(inode->i_cdev, struct firstdev, cdev);\n \tfilp->private_data = dev;\n-\n \tpr_alert(\"fdev_open, major=%d, minor=%d\", dev->major, dev->minor);\n \n \treturn 0;\n@@ -78,6 +80,7 @@\n \tstruct firstdev *dev = filp->private_data;\n \n \tpr_alert(\"fdev_release, major=%d, minor=%d\", dev->major, dev->minor);\n+\n \treturn 0;\n }\n \n@@ -99,10 +102,8 @@\n \tpr_alert(\"DEVICE:%s\\n\", name);\n \tpr_alert(\"The process is \\\"%s\\\" (pid %i)\\n\",\n \t current->comm, current->pid);\n-\n \tpr_alert(\"UTS_RELEASE:%s\", UTS_RELEASE);\n \tpr_alert(\"KERNEL_VERSION:%d\", KERNEL_VERSION(2, 6, 10));\n-\n \n \tunsigned int firstminor = 0;\n \tint err;\n@@ -115,8 +116,6 @@\n \t} else {\n \t\tpr_alert(\"alloc_chrdev_region failed.\");\n \t}\n-\n-\n \n \tfirstdev_p = kmalloc_array(count, sizeof(struct firstdev), GFP_KERNEL);\n \tif (!firstdev_p) {\n@@ -132,7 +131,6 @@\n \tint i, major, devno;\n \n \tmajor = MAJOR(dev);\n-\n \tfor (i = 0; i < count; ++i) {\n \t\tstruct firstdev *p = &firstdev_p[i];\n \n@@ -166,11 +164,8 @@\n \t\tkfree(firstdev_p);\n \t\tpr_alert(\"kfree(firstdev_p);\");\n \t}\n-\n \tunregister_chrdev_region(dev, count);\n-\n \tpr_alert(\"unregister_chrdev_region(first, count);\");\n-\n \tpr_alert(\"Goodbye, beautiful world\\n\");\n }\n \n"} {"commit":"f98699427297875100d5ba633c7b4009e42ab334","subject":"proc: Move proc string parse into separate fn","message":"proc: Move proc string parse into separate fn\n\nWe'll have to parse it all and the format is not scanf\nfriendly, so it's simpler to have it in a separate fn.\n\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\n","repos":"LK4D4\/criu,eabatalov\/criu,ldu4\/criu,AuthenticEshkinKot\/criu,sdgdsffdsfff\/criu,wtf42\/criu,svloyso\/criu,tych0\/criu,svloyso\/criu,marcosnils\/criu,AuthenticEshkinKot\/criu,kawamuray\/criu,fbocharov\/criu,efiop\/criu,tych0\/criu,wtf42\/criu,eabatalov\/criu,tych0\/criu,sdgdsffdsfff\/criu,gablg1\/criu,gonkulator\/criu,tych0\/criu,tych0\/criu,rentzsch\/criu,efiop\/criu,svloyso\/criu,gablg1\/criu,kawamuray\/criu,kawamuray\/criu,gablg1\/criu,biddyweb\/criu,KKoukiou\/criu-remote,KKoukiou\/criu-remote,gonkulator\/criu,kawamuray\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,eabatalov\/criu,gonkulator\/criu,ldu4\/criu,gablg1\/criu,AuthenticEshkinKot\/criu,efiop\/criu,rentzsch\/criu,fbocharov\/criu,rentzsch\/criu,rentzsch\/criu,LK4D4\/criu,ldu4\/criu,gablg1\/criu,KKoukiou\/criu-remote,gonkulator\/criu,KKoukiou\/criu-remote,biddyweb\/criu,efiop\/criu,fbocharov\/criu,fbocharov\/criu,KKoukiou\/criu-remote,marcosnils\/criu,svloyso\/criu,tych0\/criu,sdgdsffdsfff\/criu,fbocharov\/criu,sdgdsffdsfff\/criu,efiop\/criu,gonkulator\/criu,wtf42\/criu,ldu4\/criu,sdgdsffdsfff\/criu,gablg1\/criu,efiop\/criu,marcosnils\/criu,kawamuray\/criu,eabatalov\/criu,ldu4\/criu,AuthenticEshkinKot\/criu,wtf42\/criu,biddyweb\/criu,wtf42\/criu,svloyso\/criu,biddyweb\/criu,LK4D4\/criu,kawamuray\/criu,biddyweb\/criu,KKoukiou\/criu-remote,marcosnils\/criu,rentzsch\/criu,fbocharov\/criu,biddyweb\/criu,gonkulator\/criu,eabatalov\/criu,LK4D4\/criu,marcosnils\/criu,wtf42\/criu,sdgdsffdsfff\/criu,eabatalov\/criu,ldu4\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,rentzsch\/criu,marcosnils\/criu,svloyso\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- proc_parse.c\n+++ proc_parse.c\n@@ -470,6 +470,21 @@\n \treturn 0;\n }\n \n+static int parse_mountinfo_ent(char *str, struct proc_mountinfo *new)\n+{\n+\tunsigned int kmaj, kmin;\n+\tint ret;\n+\n+\tret = sscanf(str, \"%i %i %u:%u %63s %63s\",\n+\t\t\t&new->mnt_id, &new->parent_mnt_id,\n+\t\t\t&kmaj, &kmin, new->root, new->mountpoint);\n+\tif (ret != 6)\n+\t\treturn -1;\n+\n+\tnew->s_dev = MKKDEV(kmaj, kmin);\n+\treturn 0;\n+}\n+\n struct proc_mountinfo *parse_mountinfo(pid_t pid)\n {\n \tstruct proc_mountinfo *list = NULL;\n@@ -485,22 +500,18 @@\n \n \twhile (fgets(str, sizeof(str), f)) {\n \t\tstruct proc_mountinfo *new;\n-\t\tunsigned int kmaj, kmin;\n \t\tint ret;\n \n \t\tnew = xmalloc(sizeof(*new));\n \t\tif (!new)\n \t\t\tgoto err;\n \n-\t\tret = sscanf(str, \"%i %i %u:%u %63s %63s\",\n-\t\t\t &new->mnt_id, &new->parent_mnt_id,\n-\t\t\t &kmaj, &kmin, new->root, new->mountpoint);\n-\t\tif (ret != 6) {\n+\t\tret = parse_mountinfo_ent(str, new);\n+\t\tif (ret < 0) {\n \t\t\tpr_err(\"Bad format in %d mountinfo\\n\", pid);\n \t\t\tgoto err;\n \t\t}\n \n-\t\tnew->s_dev = MKKDEV(kmaj, kmin);\n \t\tnew->next = list;\n \t\tlist = new;\n \t}\n"} {"commit":"95ef1053428c26e23b63678975a1882be4f57c7c","subject":"Fix the handling of ancillary data for SCTP socket. Implement sctp_process_cmsgs_for_init() and sctp_findassociation_cmsgs() similar to sctp_find_cmsg() to improve consistency and avoid the signed\/unsigned issues in sctp_process_cmsgs_for_init() and sctp_findassociation_cmsgs().","message":"Fix the handling of ancillary data for SCTP socket. Implement\nsctp_process_cmsgs_for_init() and sctp_findassociation_cmsgs()\nsimilar to sctp_find_cmsg() to improve consistency and avoid\nthe signed\/unsigned issues in sctp_process_cmsgs_for_init()\nand sctp_findassociation_cmsgs().\n\nThanks to andrew@ for reporting the problem he found using\nsyzcaller.\n","repos":"sctplab\/stream-reset-improved,sctplab\/stream-reset-improved","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- netinet\/sctp_output.c\n+++ netinet\/sctp_output.c\n@@ -34,7 +34,7 @@\n \n #ifdef __FreeBSD__\n #include <sys\/cdefs.h>\n-__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_output.c 339022 2018-09-30 12:16:06Z tuexen $\");\n+__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_output.c 339024 2018-09-30 16:21:31Z tuexen $\");\n #endif\n \n #include <netinet\/sctp_os.h>\n@@ -3674,7 +3674,6 @@\n #else\n \tstruct cmsghdr cmh;\n #endif\n-\tint tlen, at;\n \tstruct sctp_initmsg initmsg;\n #ifdef INET\n \tstruct sockaddr_in sin;\n@@ -3682,34 +3681,37 @@\n #ifdef INET6\n \tstruct sockaddr_in6 sin6;\n #endif\n-\n-\ttlen = SCTP_BUF_LEN(control);\n-\tat = 0;\n-\twhile (at < tlen) {\n-\t\tif ((tlen - at) < (int)CMSG_ALIGN(sizeof(cmh))) {\n+\tint tot_len, rem_len, cmsg_data_len, cmsg_data_off, off;\n+\n+\ttot_len = SCTP_BUF_LEN(control);\n+\tfor (off = 0; off < tot_len; off += CMSG_ALIGN(cmh.cmsg_len)) {\n+\t\trem_len = tot_len - off;\n+\t\tif (rem_len < (int)CMSG_ALIGN(sizeof(cmh))) {\n \t\t\t\/* There is not enough room for one more. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (1);\n \t\t}\n-\t\tm_copydata(control, at, sizeof(cmh), (caddr_t)&cmh);\n+\t\tm_copydata(control, off, sizeof(cmh), (caddr_t)&cmh);\n \t\tif (cmh.cmsg_len < CMSG_ALIGN(sizeof(cmh))) {\n \t\t\t\/* We dont't have a complete CMSG header. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (1);\n \t\t}\n-\t\tif (((int)cmh.cmsg_len + at) > tlen) {\n+\t\tif ((cmh.cmsg_len > INT_MAX) || ((int)cmh.cmsg_len > rem_len)) {\n \t\t\t\/* We don't have the complete CMSG. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (1);\n \t\t}\n+\t\tcmsg_data_len = (int)cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh));\n+\t\tcmsg_data_off = off + CMSG_ALIGN(sizeof(cmh));\n \t\tif (cmh.cmsg_level == IPPROTO_SCTP) {\n \t\t\tswitch (cmh.cmsg_type) {\n \t\t\tcase SCTP_INIT:\n-\t\t\t\tif ((size_t)(cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh))) < sizeof(struct sctp_initmsg)) {\n+\t\t\t\tif (cmsg_data_len < (int)sizeof(struct sctp_initmsg)) {\n \t\t\t\t\t*error = EINVAL;\n \t\t\t\t\treturn (1);\n \t\t\t\t}\n-\t\t\t\tm_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct sctp_initmsg), (caddr_t)&initmsg);\n+\t\t\t\tm_copydata(control, cmsg_data_off, sizeof(struct sctp_initmsg), (caddr_t)&initmsg);\n \t\t\t\tif (initmsg.sinit_max_attempts)\n \t\t\t\t\tstcb->asoc.max_init_times = initmsg.sinit_max_attempts;\n \t\t\t\tif (initmsg.sinit_num_ostreams)\n@@ -3764,7 +3766,7 @@\n \t\t\t\tbreak;\n #ifdef INET\n \t\t\tcase SCTP_DSTADDRV4:\n-\t\t\t\tif ((size_t)(cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh))) < sizeof(struct in_addr)) {\n+\t\t\t\tif (cmsg_data_len < (int)sizeof(struct in_addr)) {\n \t\t\t\t\t*error = EINVAL;\n \t\t\t\t\treturn (1);\n \t\t\t\t}\n@@ -3774,7 +3776,7 @@\n \t\t\t\tsin.sin_len = sizeof(struct sockaddr_in);\n #endif\n \t\t\t\tsin.sin_port = stcb->rport;\n-\t\t\t\tm_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct in_addr), (caddr_t)&sin.sin_addr);\n+\t\t\t\tm_copydata(control, cmsg_data_off, sizeof(struct in_addr), (caddr_t)&sin.sin_addr);\n \t\t\t\tif ((sin.sin_addr.s_addr == INADDR_ANY) ||\n \t\t\t\t (sin.sin_addr.s_addr == INADDR_BROADCAST) ||\n \t\t\t\t IN_MULTICAST(ntohl(sin.sin_addr.s_addr))) {\n@@ -3790,7 +3792,7 @@\n #endif\n #ifdef INET6\n \t\t\tcase SCTP_DSTADDRV6:\n-\t\t\t\tif ((size_t)(cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh))) < sizeof(struct in6_addr)) {\n+\t\t\t\tif (cmsg_data_len < (int)sizeof(struct in6_addr)) {\n \t\t\t\t\t*error = EINVAL;\n \t\t\t\t\treturn (1);\n \t\t\t\t}\n@@ -3800,7 +3802,7 @@\n \t\t\t\tsin6.sin6_len = sizeof(struct sockaddr_in6);\n #endif\n \t\t\t\tsin6.sin6_port = stcb->rport;\n-\t\t\t\tm_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct in6_addr), (caddr_t)&sin6.sin6_addr);\n+\t\t\t\tm_copydata(control, cmsg_data_off, sizeof(struct in6_addr), (caddr_t)&sin6.sin6_addr);\n \t\t\t\tif (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr) ||\n \t\t\t\t IN6_IS_ADDR_MULTICAST(&sin6.sin6_addr)) {\n \t\t\t\t\t*error = EINVAL;\n@@ -3833,7 +3835,6 @@\n \t\t\t\tbreak;\n \t\t\t}\n \t\t}\n-\t\tat += CMSG_ALIGN(cmh.cmsg_len);\n \t}\n \treturn (0);\n }\n@@ -3850,7 +3851,6 @@\n #else\n \tstruct cmsghdr cmh;\n #endif\n-\tint tlen, at;\n \tstruct sctp_tcb *stcb;\n \tstruct sockaddr *addr;\n #ifdef INET\n@@ -3859,31 +3859,34 @@\n #ifdef INET6\n \tstruct sockaddr_in6 sin6;\n #endif\n-\n-\ttlen = SCTP_BUF_LEN(control);\n-\tat = 0;\n-\twhile (at < tlen) {\n-\t\tif ((tlen - at) < (int)CMSG_ALIGN(sizeof(cmh))) {\n+\tint tot_len, rem_len, cmsg_data_len, cmsg_data_off, off;\n+\n+\ttot_len = SCTP_BUF_LEN(control);\n+\tfor (off = 0; off < tot_len; off += CMSG_ALIGN(cmh.cmsg_len)) {\n+\t\trem_len = tot_len - off;\n+\t\tif (rem_len < (int)CMSG_ALIGN(sizeof(cmh))) {\n \t\t\t\/* There is not enough room for one more. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (NULL);\n \t\t}\n-\t\tm_copydata(control, at, sizeof(cmh), (caddr_t)&cmh);\n+\t\tm_copydata(control, off, sizeof(cmh), (caddr_t)&cmh);\n \t\tif (cmh.cmsg_len < CMSG_ALIGN(sizeof(cmh))) {\n \t\t\t\/* We dont't have a complete CMSG header. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (NULL);\n \t\t}\n-\t\tif (((int)cmh.cmsg_len + at) > tlen) {\n+\t\tif ((cmh.cmsg_len > INT_MAX) || ((int)cmh.cmsg_len > rem_len)) {\n \t\t\t\/* We don't have the complete CMSG. *\/\n \t\t\t*error = EINVAL;\n \t\t\treturn (NULL);\n \t\t}\n+\t\tcmsg_data_len = (int)cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh));\n+\t\tcmsg_data_off = off + CMSG_ALIGN(sizeof(cmh));\n \t\tif (cmh.cmsg_level == IPPROTO_SCTP) {\n \t\t\tswitch (cmh.cmsg_type) {\n #ifdef INET\n \t\t\tcase SCTP_DSTADDRV4:\n-\t\t\t\tif ((size_t)(cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh))) < sizeof(struct in_addr)) {\n+\t\t\t\tif (cmsg_data_len < (int)sizeof(struct in_addr)) {\n \t\t\t\t\t*error = EINVAL;\n \t\t\t\t\treturn (NULL);\n \t\t\t\t}\n@@ -3893,13 +3896,13 @@\n \t\t\t\tsin.sin_len = sizeof(struct sockaddr_in);\n #endif\n \t\t\t\tsin.sin_port = port;\n-\t\t\t\tm_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct in_addr), (caddr_t)&sin.sin_addr);\n+\t\t\t\tm_copydata(control, cmsg_data_off, sizeof(struct in_addr), (caddr_t)&sin.sin_addr);\n \t\t\t\taddr = (struct sockaddr *)&sin;\n \t\t\t\tbreak;\n #endif\n #ifdef INET6\n \t\t\tcase SCTP_DSTADDRV6:\n-\t\t\t\tif ((size_t)(cmh.cmsg_len - CMSG_ALIGN(sizeof(cmh))) < sizeof(struct in6_addr)) {\n+\t\t\t\tif (cmsg_data_len < (int)sizeof(struct in6_addr)) {\n \t\t\t\t\t*error = EINVAL;\n \t\t\t\t\treturn (NULL);\n \t\t\t\t}\n@@ -3909,7 +3912,7 @@\n \t\t\t\tsin6.sin6_len = sizeof(struct sockaddr_in6);\n #endif\n \t\t\t\tsin6.sin6_port = port;\n-\t\t\t\tm_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct in6_addr), (caddr_t)&sin6.sin6_addr);\n+\t\t\t\tm_copydata(control, cmsg_data_off, sizeof(struct in6_addr), (caddr_t)&sin6.sin6_addr);\n #ifdef INET\n \t\t\t\tif (IN6_IS_ADDR_V4MAPPED(&sin6.sin6_addr)) {\n \t\t\t\t\tin6_sin6_2_sin(&sin, &sin6);\n@@ -3930,7 +3933,6 @@\n \t\t\t\t}\n \t\t\t}\n \t\t}\n-\t\tat += CMSG_ALIGN(cmh.cmsg_len);\n \t}\n \treturn (NULL);\n }\n"} {"commit":"b7134435eea7d57b032ad3100e6163e333d8cfb6","subject":"qtdemux: v210 is v210, not UYVY and yuv2 is YUY2, not I420","message":"qtdemux: v210 is v210, not UYVY and yuv2 is YUY2, not I420\n\nAlso add a few other raw video formats we support: v308, v216\nand add comments for a few others we don't support yet.\n\nhttps:\/\/developer.apple.com\/library\/mac\/technotes\/tn2162\/\n","repos":"freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,sh0\/gst-plugins-good,shelsonjava\/gst-plugins-good,chamois94\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,froggatt\/gst-plugins-good-m,kittee\/gst-plugins-good,chamois94\/gst-plugins-good,vatavuserban\/gst-plugins-good,chamois94\/gst-plugins-good,rawoul\/gst-plugins-good,Kurento\/gst-plugins-good,stfl\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,BigBrother-International\/gst-plugins-good,kittee\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,ikonst\/gst-plugins-good,rawoul\/gst-plugins-good,rawoul\/gst-plugins-good,BigBrother-International\/gst-plugins-good,sebras\/gst-plugins-good,veo-labs\/gst-plugins-good,stfl\/gst-plugins-good,Kurento\/gst-plugins-good,StreamUtils\/gst-plugins-good,vatavuserban\/gst-plugins-good,veo-labs\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,froggatt\/gst-plugins-good-m,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,hizukiayaka\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,veo-labs\/gst-plugins-good,Kurento\/gst-plugins-good,kittee\/gst-plugins-good,vatavuserban\/gst-plugins-good,pexip\/gst-plugins-good,loshca\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,shelsonjava\/gst-plugins-good,StreamUtils\/gst-plugins-good,sh0\/gst-plugins-good,stfl\/gst-plugins-good,Kurento\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,sebras\/gst-plugins-good,ikonst\/gst-plugins-good,ikonst\/gst-plugins-good,hizukiayaka\/gst-plugins-good,pexip\/gst-plugins-good,shelsonjava\/gst-plugins-good,BigBrother-International\/gst-plugins-good,StreamUtils\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,ikonst\/gst-plugins-good,vatavuserban\/gst-plugins-good,loshca\/gst-plugins-good,hizukiayaka\/gst-plugins-good,shelsonjava\/gst-plugins-good,GStreamer\/gst-plugins-good,loshca\/gst-plugins-good,froggatt\/gst-plugins-good-m,loshca\/gst-plugins-good,sebras\/gst-plugins-good,pexip\/gst-plugins-good,chamois94\/gst-plugins-good,sh0\/gst-plugins-good,BigBrother-International\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,sebras\/gst-plugins-good,Kurento\/gst-plugins-good,rawoul\/gst-plugins-good,stfl\/gst-plugins-good,froggatt\/gst-plugins-good-m,sh0\/gst-plugins-good,veo-labs\/gst-plugins-good,GStreamer\/gst-plugins-good,kittee\/gst-plugins-good,pexip\/gst-plugins-good,hizukiayaka\/gst-plugins-good,pexip\/gst-plugins-good,StreamUtils\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/isomp4\/qtdemux.c\n+++ gst\/isomp4\/qtdemux.c\n@@ -11127,12 +11127,31 @@\n break;\n case GST_MAKE_FOURCC ('2', 'v', 'u', 'y'):\n case GST_MAKE_FOURCC ('2', 'V', 'u', 'y'):\n+ format = GST_VIDEO_FORMAT_UYVY;\n+ break;\n+ case GST_MAKE_FOURCC ('v', '3', '0', '8'):\n+ format = GST_VIDEO_FORMAT_v308;\n+ break;\n+ case GST_MAKE_FOURCC ('v', '2', '1', '6'):\n+ format = GST_VIDEO_FORMAT_v216;\n+ break;\n case GST_MAKE_FOURCC ('v', '2', '1', '0'):\n- format = GST_VIDEO_FORMAT_UYVY;\n+ format = GST_VIDEO_FORMAT_v210;\n break;\n case GST_MAKE_FOURCC ('r', '2', '1', '0'):\n format = GST_VIDEO_FORMAT_r210;\n break;\n+ \/* Packed YUV 4:4:4 10 bit in 32 bits, complex\n+ case GST_MAKE_FOURCC ('v', '4', '1', '0'):\n+ format = GST_VIDEO_FORMAT_v410;\n+ break;\n+ *\/\n+ \/* Packed YUV 4:4:4:4 8 bit in 32 bits\n+ * but different order than AYUV\n+ case GST_MAKE_FOURCC ('v', '4', '0', '8'):\n+ format = GST_VIDEO_FORMAT_v408;\n+ break;\n+ *\/\n case GST_MAKE_FOURCC ('m', 'p', 'e', 'g'):\n case GST_MAKE_FOURCC ('m', 'p', 'g', '1'):\n _codec (\"MPEG-1 video\");\n"} {"commit":"e2db2bc4c4f9d0ef06fb18b7196d51d95b7030de","subject":"Fix typo in comment.","message":"Fix typo in comment.\n","repos":"tiran\/expat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,tiran\/expat,libexpat\/libexpat,tiran\/expat,tiran\/expat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -26,7 +26,7 @@\n }\n \n \/* Generate a failure using the parser state to create an error message;\n- * this should be used when the parser reports and error we weren't\n+ * this should be used when the parser reports an error we weren't\n * expecting.\n *\/\n static void\n"} {"commit":"90e8e1f54d47f54cfa87b404551e17906c43c838","subject":"Update vnfemastd.h","message":"Update vnfemastd.h\n","repos":"bigdig\/vnpy,vnpy\/vnpy,bigdig\/vnpy,vnpy\/vnpy,bigdig\/vnpy,bigdig\/vnpy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- vnpy\/api\/femas\/vnfemas\/vnfemastd\/vnfemastd.h\n+++ vnpy\/api\/femas\/vnfemas\/vnfemastd\/vnfemastd.h\n@@ -29,44 +29,47 @@\n #define ONRSPFORQUOTE 15\n #define ONRSPMARGINCOMBACTION 16\n #define ONRSPUSERDEPOSIT 17\n-#define ONRSPTRANSFERMONEY 18\n-#define ONRTNFLOWMESSAGECANCEL 19\n-#define ONRTNTRADE 20\n-#define ONRTNORDER 21\n-#define ONERRRTNORDERINSERT 22\n-#define ONERRRTNORDERACTION 23\n-#define ONRTNINSTRUMENTSTATUS 24\n-#define ONRTNINVESTORACCOUNTDEPOSIT 25\n-#define ONRTNQUOTE 26\n-#define ONERRRTNQUOTEINSERT 27\n-#define ONERRRTNQUOTEACTION 28\n-#define ONRTNFORQUOTE 29\n-#define ONRTNMARGINCOMBINATIONLEG 30\n-#define ONRTNMARGINCOMBACTION 31\n-#define ONRTNUSERDEPOSIT 32\n-#define ONRSPQUERYUSERLOGIN 33\n-#define ONRSPQRYORDER 34\n-#define ONRSPQRYTRADE 35\n-#define ONRSPQRYUSERINVESTOR 36\n-#define ONRSPQRYTRADINGCODE 37\n-#define ONRSPQRYINVESTORACCOUNT 38\n-#define ONRSPQRYINSTRUMENT 39\n-#define ONRSPQRYEXCHANGE 40\n-#define ONRSPQRYINVESTORPOSITION 41\n-#define ONRSPQRYCOMPLIANCEPARAM 42\n-#define ONRSPQRYINVESTORFEE 43\n-#define ONRSPQRYINVESTORMARGIN 44\n-#define ONRSPQRYINVESTORCOMBPOSITION 45\n-#define ONRSPQRYINVESTORLEGPOSITION 46\n-#define ONRSPQRYINSTRUMENTGROUP 47\n-#define ONRSPQRYCLIENTMARGINCOMBTYPE 48\n-#define ONRSPEXECORDERINSERT 49\n-#define ONRSPEXECORDERACTION 50\n-#define ONRTNEXECORDER 51\n-#define ONERRRTNEXECORDERINSERT 52\n-#define ONERRRTNEXECORDERACTION 53\n-#define ONRTNTRANSFERMONEY 54\n-#define ONRSPQRYSYSTEMTIME 55\n+#define ONRTNFLOWMESSAGECANCEL 18\n+#define ONRTNTRADE 19\n+#define ONRTNORDER 20\n+#define ONERRRTNORDERINSERT 21\n+#define ONERRRTNORDERACTION 22\n+#define ONRTNINSTRUMENTSTATUS 23\n+#define ONRTNINVESTORACCOUNTDEPOSIT 24\n+#define ONRTNQUOTE 25\n+#define ONERRRTNQUOTEINSERT 26\n+#define ONERRRTNQUOTEACTION 27\n+#define ONRTNFORQUOTE 28\n+#define ONRTNMARGINCOMBINATIONLEG 29\n+#define ONRTNMARGINCOMBACTION 30\n+#define ONRTNUSERDEPOSIT 31\n+#define ONRSPQUERYUSERLOGIN 32\n+#define ONRSPQRYORDER 33\n+#define ONRSPQRYTRADE 34\n+#define ONRSPQRYUSERINVESTOR 35\n+#define ONRSPQRYTRADINGCODE 36\n+#define ONRSPQRYINVESTORACCOUNT 37\n+#define ONRSPQRYINSTRUMENT 38\n+#define ONRSPQRYEXCHANGE 39\n+#define ONRSPQRYINVESTORPOSITION 40\n+#define ONRSPQRYCOMPLIANCEPARAM 41\n+#define ONRSPQRYINVESTORFEE 42\n+#define ONRSPQRYINVESTORMARGIN 43\n+#define ONRSPQRYINVESTORCOMBPOSITION 44\n+#define ONRSPQRYINVESTORLEGPOSITION 45\n+#define ONRSPQRYINSTRUMENTGROUP 46\n+#define ONRSPQRYCLIENTMARGINCOMBTYPE 47\n+#define ONRSPEXECORDERINSERT 48\n+#define ONRSPEXECORDERACTION 49\n+#define ONRTNEXECORDER 50\n+#define ONERRRTNEXECORDERINSERT 51\n+#define ONERRRTNEXECORDERACTION 52\n+#define ONRTNTRANSFERMONEY 53\n+#define ONRSPQRYSYSTEMTIME 54\n+#define ONRSPQRYMARGINPREFPARAM 55\n+#define ONRSPDSUSERCERTIFICATION 56\n+#define ONRSPDSPROXYSUBMITINFO 57\n+\n \n \n \n@@ -110,163 +113,176 @@\n \t\/\/\/ 0x2001 \u02b1\n \t\/\/\/ 0x2002 \u02a7\n \t\/\/\/ 0x2003 \u0575\n-\tvirtual void OnFrontDisconnected(int nReason) ;\n+\tvirtual void OnFrontDisconnected(int nReason);\n \tvirtual void OnQryFrontDisconnected(int nReason);\n \n \t\/\/\/\u02b1\u6863\u02b1\u03b4\u0575\u02b1\u00f7\u00e1\n \t\/\/\/@param nTimeLapse \u03f4\u03bd\u0571\u0135\u02b1\n-\tvirtual void OnHeartBeatWarning(int nTimeLapse) ;\n-\n+\tvirtual void OnHeartBeatWarning(int nTimeLapse);\n+\n+\t\/\/\/\u013b\u0635\u02bc\u0368\u05aaAPI\u0575\u04bb\u013a\u0235\u00f1\u023b\u01f8\u013b\u0635\u01f1\u013b\u0635\u0368\u05aa\n+\t\/\/\/@param nTopicID \ub8e8\u02fd\u0223\n+\t\/\/\/@param nSequenceNo \n \tvirtual void OnPackageStart(int nTopicID, int nSequenceNo);\n-\tvirtual void OnPackageEnd(int nTopicID, int nSequenceNo);\n+\n+\t\/\/\/\u013b\u0635\u0368\u05aaAPI\u0575\u04bb\u013a\u0235\u00f1\u013b\u0635\u02bc\u0368\u05aa\u023b\u01f8\u013b\u0635\u00f1\n+\t\/\/\/@param nTopicID \ub8e8\u02fd\u0223\n+\t\/\/\/@param nSequenceNo \n+\tvirtual void OnPackageEnd(int nTopicID, int nSequenceNo) ;\n+\n \n \t\/\/\/\u04e6\n-\tvirtual void OnRspError(CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspError(CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u01f0\u03f5\u0373\u00fb\u00bc\u04e6\n-\tvirtual void OnRspUserLogin(CUstpFtdcRspUserLoginField *pRspUserLogin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspUserLogin(CUstpFtdcRspUserLoginField *pRspUserLogin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u00fb\u02f3\u04e6\n-\tvirtual void OnRspUserLogout(CUstpFtdcRspUserLogoutField *pRspUserLogout, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspUserLogout(CUstpFtdcRspUserLogoutField *pRspUserLogout, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u00fb\u07b8\u04e6\n-\tvirtual void OnRspUserPasswordUpdate(CUstpFtdcUserPasswordUpdateField *pUserPasswordUpdate, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspUserPasswordUpdate(CUstpFtdcUserPasswordUpdateField *pUserPasswordUpdate, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u00bc\u04e6\n-\tvirtual void OnRspOrderInsert(CUstpFtdcInputOrderField *pInputOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspOrderInsert(CUstpFtdcInputOrderField *pInputOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u04e6\n-\tvirtual void OnRspOrderAction(CUstpFtdcOrderActionField *pOrderAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspOrderAction(CUstpFtdcOrderActionField *pOrderAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u00bc\u04e6\n-\tvirtual void OnRspQuoteInsert(CUstpFtdcInputQuoteField *pInputQuote, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQuoteInsert(CUstpFtdcInputQuoteField *pInputQuote, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u06f2\u04e6\n-\tvirtual void OnRspQuoteAction(CUstpFtdcQuoteActionField *pQuoteAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQuoteAction(CUstpFtdcQuoteActionField *pQuoteAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u046f\u04e6\n-\tvirtual void OnRspForQuote(CUstpFtdcReqForQuoteField *pReqForQuote, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspForQuote(CUstpFtdcReqForQuoteField *pReqForQuote, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u037b\u04e6\n-\tvirtual void OnRspMarginCombAction(CUstpFtdcInputMarginCombActionField *pInputMarginCombAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspMarginCombAction(CUstpFtdcInputMarginCombActionField *pInputMarginCombAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u00fb\u04e6\n-\tvirtual void OnRspUserDeposit(CUstpFtdcstpUserDepositField *pstpUserDeposit, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n-\n-\t\/\/\/\u00fb\u03ef\u04e6\n-\tvirtual void OnRspTransferMoney(CUstpFtdcstpTransferMoneyField *pstpTransferMoney, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspUserDeposit(CUstpFtdcstpUserDepositField *pstpUserDeposit, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0368\u05aa\n-\tvirtual void OnRtnFlowMessageCancel(CUstpFtdcFlowMessageCancelField *pFlowMessageCancel) ;\n+\tvirtual void OnRtnFlowMessageCancel(CUstpFtdcFlowMessageCancelField *pFlowMessageCancel);\n \n \t\/\/\/\u027d\u0631\n-\tvirtual void OnRtnTrade(CUstpFtdcTradeField *pTrade) ;\n+\tvirtual void OnRtnTrade(CUstpFtdcTradeField *pTrade);\n \n \t\/\/\/\u0631\n-\tvirtual void OnRtnOrder(CUstpFtdcOrderField *pOrder) ;\n+\tvirtual void OnRtnOrder(CUstpFtdcOrderField *pOrder);\n \n \t\/\/\/\u00bc\u0631\n-\tvirtual void OnErrRtnOrderInsert(CUstpFtdcInputOrderField *pInputOrder, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnOrderInsert(CUstpFtdcInputOrderField *pInputOrder, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u0631\n-\tvirtual void OnErrRtnOrderAction(CUstpFtdcOrderActionField *pOrderAction, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnOrderAction(CUstpFtdcOrderActionField *pOrderAction, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u053c\u05f4\u032c\u0368\u05aa\n-\tvirtual void OnRtnInstrumentStatus(CUstpFtdcInstrumentStatusField *pInstrumentStatus) ;\n+\tvirtual void OnRtnInstrumentStatus(CUstpFtdcInstrumentStatusField *pInstrumentStatus);\n \n \t\/\/\/\u02fb\u0631\n-\tvirtual void OnRtnInvestorAccountDeposit(CUstpFtdcInvestorAccountDepositResField *pInvestorAccountDepositRes) ;\n+\tvirtual void OnRtnInvestorAccountDeposit(CUstpFtdcInvestorAccountDepositResField *pInvestorAccountDepositRes);\n \n \t\/\/\/\u06fb\u0631\n-\tvirtual void OnRtnQuote(CUstpFtdcRtnQuoteField *pRtnQuote) ;\n+\tvirtual void OnRtnQuote(CUstpFtdcRtnQuoteField *pRtnQuote);\n \n \t\/\/\/\u00bc\u0631\n-\tvirtual void OnErrRtnQuoteInsert(CUstpFtdcInputQuoteField *pInputQuote, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnQuoteInsert(CUstpFtdcInputQuoteField *pInputQuote, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u06f3\u0631\n-\tvirtual void OnErrRtnQuoteAction(CUstpFtdcQuoteActionField *pQuoteAction, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnQuoteAction(CUstpFtdcQuoteActionField *pQuoteAction, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u046f\u06fb\u0631\n-\tvirtual void OnRtnForQuote(CUstpFtdcReqForQuoteField *pReqForQuote) ;\n+\tvirtual void OnRtnForQuote(CUstpFtdcReqForQuoteField *pReqForQuote);\n \n \t\/\/\/\u03f9\u0368\u05aa\n-\tvirtual void OnRtnMarginCombinationLeg(CUstpFtdcMarginCombinationLegField *pMarginCombinationLeg) ;\n+\tvirtual void OnRtnMarginCombinationLeg(CUstpFtdcMarginCombinationLegField *pMarginCombinationLeg);\n \n \t\/\/\/\u037b\u0237\n-\tvirtual void OnRtnMarginCombAction(CUstpFtdcInputMarginCombActionField *pInputMarginCombAction) ;\n+\tvirtual void OnRtnMarginCombAction(CUstpFtdcInputMarginCombActionField *pInputMarginCombAction);\n \n \t\/\/\/\u00fb\n-\tvirtual void OnRtnUserDeposit(CUstpFtdcstpUserDepositField *pstpUserDeposit) ;\n+\tvirtual void OnRtnUserDeposit(CUstpFtdcstpUserDepositField *pstpUserDeposit);\n \n \t\/\/\/\u046f\u01f0\u03f5\u0373\u00fb\u00bc\u04e6\n-\tvirtual void OnRspQueryUserLogin(CUstpFtdcRspUserLoginField *pRspUserLogin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQueryUserLogin(CUstpFtdcRspUserLoginField *pRspUserLogin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u046f\u04e6\n-\tvirtual void OnRspQryOrder(CUstpFtdcOrderField *pOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryOrder(CUstpFtdcOrderField *pOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u027d\u046f\u04e6\n-\tvirtual void OnRspQryTrade(CUstpFtdcTradeField *pTrade, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryTrade(CUstpFtdcTradeField *pTrade, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0376\u02fb\u046f\u04e6\n-\tvirtual void OnRspQryUserInvestor(CUstpFtdcRspUserInvestorField *pRspUserInvestor, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryUserInvestor(CUstpFtdcRspUserInvestorField *pRspUserInvestor, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u05f1\u046f\u04e6\n-\tvirtual void OnRspQryTradingCode(CUstpFtdcRspTradingCodeField *pRspTradingCode, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryTradingCode(CUstpFtdcRspTradingCodeField *pRspTradingCode, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0376\u02bd\u02fb\u046f\u04e6\n-\tvirtual void OnRspQryInvestorAccount(CUstpFtdcRspInvestorAccountField *pRspInvestorAccount, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInvestorAccount(CUstpFtdcRspInvestorAccountField *pRspInvestorAccount, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u053c\u046f\u04e6\n-\tvirtual void OnRspQryInstrument(CUstpFtdcRspInstrumentField *pRspInstrument, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInstrument(CUstpFtdcRspInstrumentField *pRspInstrument, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u046f\u04e6\n-\tvirtual void OnRspQryExchange(CUstpFtdcRspExchangeField *pRspExchange, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryExchange(CUstpFtdcRspExchangeField *pRspExchange, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0376\u07f3\u05b2\u05b2\u046f\u04e6\n-\tvirtual void OnRspQryInvestorPosition(CUstpFtdcRspInvestorPositionField *pRspInvestorPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInvestorPosition(CUstpFtdcRspInvestorPositionField *pRspInvestorPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u03f9\u046f\u04e6\n-\tvirtual void OnRspQryComplianceParam(CUstpFtdcRspComplianceParamField *pRspComplianceParam, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryComplianceParam(CUstpFtdcRspComplianceParamField *pRspComplianceParam, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0376\u02b2\u046f\u04e6\n-\tvirtual void OnRspQryInvestorFee(CUstpFtdcInvestorFeeField *pInvestorFee, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInvestorFee(CUstpFtdcInvestorFeeField *pInvestorFee, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0376\u07f1\u05a4\u02b2\u046f\u04e6\n-\tvirtual void OnRspQryInvestorMargin(CUstpFtdcInvestorMarginField *pInvestorMargin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n-\n-\t\/\/\/\u05f1\u03f3\u05b2\u05b2\u046f\u04e6\n-\tvirtual void OnRspQryInvestorCombPosition(CUstpFtdcRspInvestorCombPositionField *pRspInvestorCombPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n-\n-\t\/\/\/\u05f1\ubd65\u0233\u05b2\u05b2\u046f\u04e6\n-\tvirtual void OnRspQryInvestorLegPosition(CUstpFtdcRspInvestorLegPositionField *pRspInvestorLegPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInvestorMargin(CUstpFtdcInvestorMarginField *pInvestorMargin, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n+\n+\t\/\/\/\u0376\u03f3\u05b2\u05b2\u046f\u04e6\n+\tvirtual void OnRspQryInvestorCombPosition(CUstpFtdcRspInvestorCombPositionField *pRspInvestorCombPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n+\n+\t\/\/\/\u0376\u07f5\u0233\u05b2\u05b2\u046f\u04e6\n+\tvirtual void OnRspQryInvestorLegPosition(CUstpFtdcRspInvestorLegPositionField *pRspInvestorLegPosition, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u053c\u03e2\u046f\u04e6\n-\tvirtual void OnRspQryInstrumentGroup(CUstpFtdcRspInstrumentGroupField *pRspInstrumentGroup, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryInstrumentGroup(CUstpFtdcRspInstrumentGroupField *pRspInstrumentGroup, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u03f1\u05a4\u0372\u046f\u04e6\n-\tvirtual void OnRspQryClientMarginCombType(CUstpFtdcRspClientMarginCombTypeField *pRspClientMarginCombType, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspQryClientMarginCombType(CUstpFtdcRspClientMarginCombTypeField *pRspClientMarginCombType, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0228\u00bc\u04e6\n-\tvirtual void OnRspExecOrderInsert(CUstpFtdcInputExecOrderField *pInputExecOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspExecOrderInsert(CUstpFtdcInputExecOrderField *pInputExecOrder, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0228\u04e6\n-\tvirtual void OnRspExecOrderAction(CUstpFtdcInputExecOrderActionField *pInputExecOrderAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n+\tvirtual void OnRspExecOrderAction(CUstpFtdcInputExecOrderActionField *pInputExecOrderAction, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/\/\u0228\u0368\u05aa\n-\tvirtual void OnRtnExecOrder(CUstpFtdcExecOrderField *pExecOrder) ;\n+\tvirtual void OnRtnExecOrder(CUstpFtdcExecOrderField *pExecOrder);\n \n \t\/\/\/\u0228\u00bc\u0631\n-\tvirtual void OnErrRtnExecOrderInsert(CUstpFtdcInputExecOrderField *pInputExecOrder, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnExecOrderInsert(CUstpFtdcInputExecOrderField *pInputExecOrder, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u0228\u0631\n-\tvirtual void OnErrRtnExecOrderAction(CUstpFtdcInputExecOrderActionField *pInputExecOrderAction, CUstpFtdcRspInfoField *pRspInfo) ;\n+\tvirtual void OnErrRtnExecOrderAction(CUstpFtdcInputExecOrderActionField *pInputExecOrderAction, CUstpFtdcRspInfoField *pRspInfo);\n \n \t\/\/\/\u03ef\u02bd\u036c\u0368\u05aa\n-\tvirtual void OnRtnTransferMoney(CUstpFtdcSyncMoneyTransferField *pSyncMoneyTransfer) ;\n+\tvirtual void OnRtnTransferMoney(CUstpFtdcSyncMoneyTransferField *pSyncMoneyTransfer);\n \n \t\/\/\/\u03f5\u0373\u02b1\u046f\u04e6\n-\tvirtual void OnRspQrySystemTime(CUstpFtdcRspQrySystemTimeField *pRspQrySystemTime, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast) ;\n-\n+\tvirtual void OnRspQrySystemTime(CUstpFtdcRspQrySystemTimeField *pRspQrySystemTime, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n+\n+\t\/\/\/\u046f\u05a4\u017b\u0772\u04e6\n+\tvirtual void OnRspQryMarginPrefParam(CUstpFtdcRspQryMarginPrefParamField *pRspQryMarginPrefParam, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n+\n+\t\/\/\/\u0378\u073f\u037b\u05a4\u04e6\n+\tvirtual void OnRspDSUserCertification(CUstpFtdcDSUserCertRspDataField *pDSUserCertRspData, CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n+\n+\t\/\/\/\u0378\u03e2\u027c\u043c\u03f4\u03e2\u04e6\n+\tvirtual void OnRspDSProxySubmitInfo(CUstpFtdcRspInfoField *pRspInfo, int nRequestID, bool bIsLast);\n \n \t\/\/-------------------------------------------------------------------------------------\n \t\/\/task\n@@ -310,8 +326,6 @@\n \n \tvoid processRspUserDeposit(Task *task);\n \n-\tvoid processRspTransferMoney(Task *task);\n-\n \tvoid processRtnFlowMessageCancel(Task *task);\n \n \tvoid processRtnTrade(Task *task);\n@@ -385,6 +399,14 @@\n \tvoid processRtnTransferMoney(Task *task);\n \n \tvoid processRspQrySystemTime(Task *task);\n+\n+\tvoid processRspQryMarginPrefParam(Task *task);\n+\n+\tvoid processRspDSUserCertification(Task *task);\n+\n+\tvoid processRspDSProxySubmitInfo(Task *task);\n+\n+\n \n \n \n@@ -409,7 +431,7 @@\n \n \tvirtual void onPackageEnd(int reqid) {};\n \n-\tvirtual void onRspError(const dict &data, int reqid, bool last) {};\n+\tvirtual void onRspError(const dict &error, int reqid, bool last) {};\n \n \tvirtual void onRspUserLogin(const dict &data, const dict &error, int reqid, bool last) {};\n \n@@ -431,8 +453,6 @@\n \n \tvirtual void onRspUserDeposit(const dict &data, const dict &error, int reqid, bool last) {};\n \n-\tvirtual void onRspTransferMoney(const dict &data, const dict &error, int reqid, bool last) {};\n-\n \tvirtual void onRtnFlowMessageCancel(const dict &data) {};\n \n \tvirtual void onRtnTrade(const dict &data) {};\n@@ -507,6 +527,13 @@\n \n \tvirtual void onRspQrySystemTime(const dict &data, const dict &error, int reqid, bool last) {};\n \n+\tvirtual void onRspQryMarginPrefParam(const dict &data, const dict &error, int reqid, bool last) {};\n+\n+\tvirtual void onRspDSUserCertification(const dict &data, const dict &error, int reqid, bool last) {};\n+\n+\tvirtual void onRspDSProxySubmitInfo(const dict &error, int reqid, bool last) {};\n+\n+\n \n \n \t\/\/-------------------------------------------------------------------------------------\n@@ -553,8 +580,6 @@\n \n \tint reqUserDeposit(const dict &req, int reqid);\n \n-\tint reqTransferMoney(const dict &req, int reqid);\n-\n \tint reqQryOrder(const dict &req, int reqid);\n \n \tint reqQryTrade(const dict &req, int reqid);\n@@ -590,4 +615,12 @@\n \tint reqExecOrderAction(const dict &req, int reqid);\n \n \tint reqQrySystemTime(const dict &req, int reqid);\n+\n+\tint reqQryMarginPrefParam(const dict &req, int reqid);\n+\n+\tint reqDSUserCertification(const dict &req, int reqid);\n+\n+\tint reqDSProxySubmitInfo(const dict &req, int reqid);\n+\n+\n };\n"} {"commit":"3ccb198b513dc6ad287fe44117d03bec4d6a966a","subject":"Marking rank of vaapidecodebin as GST_RANK_MARGINAL for now.","message":"Marking rank of vaapidecodebin as GST_RANK_MARGINAL for now.\n\nUnfortunately vaapidecodebin element is not seems to be stable\nenough for autoplugging ahead of vaapidecode.\nLowering the rank for now (cosidering the immediate 0.6 release).\n\nSee this: https:\/\/bugzilla.gnome.org\/show_bug.cgi?id=749554\n\nSigned-off-by: Sreerenj Balachandran <8526e100bdc7a12d85af109c9f42b86756e50e67@intel.com>\n","repos":"CapOM\/gstreamer-vaapi,ceyusa\/gstreamer-vaapi,01org\/iotg-lin-gfx-gstreamer-vaapi,GStreamer\/gstreamer-vaapi,01org\/iotg-lin-gfx-gstreamer-vaapi,CapOM\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi,01org\/iotg-lin-gfx-gstreamer-vaapi,ceyusa\/gstreamer-vaapi,CapOM\/gstreamer-vaapi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/vaapi\/gstvaapi.c\n+++ gst\/vaapi\/gstvaapi.c\n@@ -81,7 +81,7 @@\n \n #if GST_CHECK_VERSION(1,4,0)\n gst_element_register (plugin, \"vaapidecodebin\",\n- GST_RANK_PRIMARY + 2, GST_TYPE_VAAPI_DECODE_BIN);\n+ GST_RANK_MARGINAL, GST_TYPE_VAAPI_DECODE_BIN);\n #endif\n return TRUE;\n }\n"} {"commit":"d024ce6e8f0e59ce0441ed38339f2dc15d398ce0","subject":"Fix external_entity_value_aborter() to work for UTF-16 builds","message":"Fix external_entity_value_aborter() to work for UTF-16 builds\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -4734,12 +4734,12 @@\n ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);\n if (ext_parser == NULL)\n fail(\"Could not create external entity parser\");\n- if (!strcmp(systemId, \"004-1.ent\")) {\n+ if (!xcstrcmp(systemId, XCS(\"004-1.ent\"))) {\n if (_XML_Parse_SINGLE_BYTES(ext_parser, text1, strlen(text1),\n XML_TRUE) == XML_STATUS_ERROR)\n xml_failure(ext_parser);\n }\n- if (!strcmp(systemId, \"004-2.ent\")) {\n+ if (!xcstrcmp(systemId, XCS(\"004-2.ent\"))) {\n XML_SetXmlDeclHandler(ext_parser, entity_suspending_xdecl_handler);\n XML_SetUserData(ext_parser, ext_parser);\n if (_XML_Parse_SINGLE_BYTES(ext_parser, text2, strlen(text2),\n"} {"commit":"4fc3186ebfb3964545a9eff70c764064714b571d","subject":"Use line_search to increase performance","message":"Use line_search to increase performance\n\nThis reduces the time to traverse the line list by a huge amount for a\nhuge number of lines, especially if the start is near the red end of the\nline list.\n","repos":"kaushik94\/tardis,kaushik94\/tardis,kaushik94\/tardis,kaushik94\/tardis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tardis\/montecarlo\/src\/integrator.c\n+++ tardis\/montecarlo\/src\/integrator.c\n@@ -8,10 +8,9 @@\n \n #include \"storage.h\"\n #include \"integrator.h\"\n-\n-#ifdef WITHOPENMP\n+#include \"cmontecarlo.h\"\n+\n #include <omp.h>\n-#endif\n \n #define NULEN 0\n #define LINELEN 1\n@@ -95,25 +94,28 @@\n }\n \n \n-void populate_z(const storage_model_t *storage, const double p, double *oz)\n+int64_t populate_z(const storage_model_t *storage, const double p, double *oz, int64_t *oshell_id)\n {\n \/\/const double *radius = storage->r_outer;\n \n \/\/ Abbreviations\n double *r = storage->r_outer;\n- const int N = storage->no_of_shells;\n+ const int64_t N = storage->no_of_shells;\n double inv_t = storage->inverse_time_explosion;\n double z = 0;\n \n- int i = 0, offset = -1, middle=N-1;\n+ int64_t i = 0, offset = -1, i_low, i_up;\n \n if (p <= storage->r_inner[0])\n {\n oz[0] = calculate_z(storage->r_inner[0], p, inv_t);\n+ oshell_id[0] = 0;\n for(i = 0; i < N; ++i)\n { \/\/ Loop from outside to inside\n oz[i+1] = calculate_z(r[i], p, inv_t);\n- }\n+ oshell_id[i+1] = i;\n+ }\n+ return N + 1;\n }\n else\n {\n@@ -125,12 +127,16 @@\n if (offset == -1)\n {\n offset = i;\n- middle = N - i - 1;\n- }\n-\n- oz[middle - (i - offset)] = -z;\n- oz[middle + (i - offset) + 1] = z;\n- }\n+ }\n+ i_low = N - i - 1;\n+ i_up = N + i - 2 * offset;\n+\n+ oz[i_low] = -z;\n+ oshell_id[i_low] = i;\n+ oz[i_up] = z;\n+ oshell_id[i_up] = i;\n+ }\n+ return 2*( N - offset);\n }\n }\n \n@@ -140,19 +146,27 @@\n {\n \/\/ Initialization phase\n double *I_nu = calloc(N, sizeof(double));\n- double *z = calloc( 2 * storage->no_of_shells + 1, sizeof(double));\n- double inv_t = storage->inverse_time_explosion;\n- int spectrum_length = (storage->spectrum_end_nu - storage->spectrum_start_nu)\/storage->spectrum_delta_nu;\n+ double *z = calloc(2 * storage->no_of_shells + 1, sizeof(double));\n+ int64_t *shell_id = calloc(2 * storage->no_of_shells + 1, sizeof(int64_t));\n+\n+\n+ int64_t offset = 0, i = 0,\n+ no_lines = storage->no_of_lines,\n+ no_shells = storage->no_of_shells;\n+ int64_t idx_nu_start = 0;\n+\n+ \/\/ TODO: This omits the last bin sometimes\n+ int64_t spectrum_length =\n+ (storage->spectrum_end_nu - storage->spectrum_start_nu)\/storage->spectrum_delta_nu;\n \n double R_ph = storage->r_inner[0];\n- double R_max = storage->r_outer[storage->no_of_shells - 1];\n- double p = 0, r = 0, nu_start, nu_end, nu, exp_factor;\n-\n- int offset = 0, inner_shell_idx=0, i;\n+ double R_max = storage->r_outer[no_shells - 1];\n+ double p = 0, nu_start, nu_end, nu, exp_factor;\n \n double *ptau, *patt_S_ul, *pline;\n \n \/\/ Loop over wavelengths in spectrum\n+ printf(\"sizeof shell_id: %ld\", sizeof(shell_id));\n for (int nu_idx = 0; nu_idx < spectrum_length ; ++nu_idx)\n {\n nu = storage->spectrum_start_nu + nu_idx * storage->spectrum_delta_nu;\n@@ -160,19 +174,17 @@\n \/\/ Loop over discrete values along line\n for (int p_idx = 0; p_idx < N; ++p_idx)\n {\n- \/\/ calloc should be moved to initialization\n- \/\/ memset here instead\n- \/\/ z is an array with\n- memset(z, 0, (2 * storage->no_of_shells + 1) * sizeof(z));\n-\n- \/\/ Maybe correct? At least this matches the BB\n+ \/\/ TODO: precompute these and save as 2D array\n+ memset(z, 0, (2 * no_shells + 1) * sizeof(*z));\n+ memset(shell_id, 0, (2 * no_shells + 1) * sizeof(*shell_id));\n+\n+ \/\/ Maybe correct? At least this matches the BB *exacly*\n p = R_max\/N * (p_idx + 0.5);\n \n- populate_z(storage, p, z);\n+ populate_z(storage, p, z, shell_id);\n \n \/\/ initialize I_nu\n if (p <= R_ph)\n- \/\/{\n I_nu[p_idx] = I_BB[nu_idx];\n else\n I_nu[p_idx] = 0;\n@@ -180,7 +192,8 @@\n \/\/ TODO: Ugly loop\n \/\/ Loop over all intersections\n \n- for (i = 0; i < 2*storage->no_of_shells + 1; ++i)\n+ \/\/ TODO: replace by number of intersections and remove break\n+ for (i = 0; i < 2*no_shells + 1; ++i)\n {\n if (z[i] == 0)\n break;\n@@ -189,38 +202,41 @@\n \n \/\/ Calculate offset properly\n \/\/ Which shell is important for photosphere?\n- \/\/ This is might be right\n-\n- if (i < storage->no_of_shells)\n- offset = (storage->no_of_shells - i - 1) * storage->no_of_lines;\n- else if (i == storage->no_of_shells)\n- offset = 0;\n- else\n- offset = (i - storage->no_of_shells - 1) * storage->no_of_lines;\n-\n- for (\n- pline = storage->line_list_nu,\n- ptau = &storage->line_lists_tau_sobolevs[offset],\n- patt_S_ul = &att_S_ul[offset];\n- pline < storage->line_list_nu + storage->no_of_lines;\n+ offset = shell_id[i] * no_lines;\n+\n+ \/\/ Find first contributing line\n+ line_search(\n+ storage->line_list_nu, nu_start, no_lines,\n+ &idx_nu_start);\n+ pline = storage->line_list_nu + idx_nu_start;\n+ ptau = storage->line_lists_tau_sobolevs + offset + idx_nu_start;\n+ patt_S_ul = att_S_ul + offset + idx_nu_start;\n+\n+ for (;pline < storage->line_list_nu + no_lines;\n+ \/\/ We have to increment all pointers simultanously\n ++pline,\n ++ptau,\n ++patt_S_ul)\n-\n {\n- if (*pline > nu_start)\n+ if (*pline > nu_start) \/\/ TODO: test if this can be removed\n continue;\n if (*pline < nu_end)\n break;\n- exp_factor = exp(- (*ptau) );\n+\n+ \/\/ maybe move to next line (optimization gets id of it anyway\n+ exp_factor = exp(- (*ptau) ); \n I_nu[p_idx] = I_nu[p_idx] * exp_factor + *patt_S_ul;\n+\n }\n }\n I_nu[p_idx] *= p;\n }\n L[nu_idx] = 8 * M_PI * M_PI * integrate_intensity(I_nu, R_max\/N, N);\n }\n+\n+ \/\/ Free everything allocated on heap\n free(z);\n+ free(shell_id);\n free(I_nu);\n printf(\"\\n\\n\");\n }\n"} {"commit":"b564a1e7abfbd86b5d0fa1c6ce02478d8846ec23","subject":"Add note on exit statuses","message":"Add note on exit statuses\n","repos":"svanderburg\/disnix,svanderburg\/disnix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/activate\/main.c\n+++ src\/activate\/main.c\n@@ -69,6 +69,14 @@\n printf(\" execute them\\n\");\n printf(\" -h, --help Shows the usage of this command to the user\\n\");\n printf(\" -v, --version Shows the version of this command to the user\\n\");\n+ \n+ printf(\"\\nExit status:\\n\");\n+ printf(\" 0 Transition succeeded.\\n\");\n+ printf(\" 1 Transition failed, but was successfully roll backed.\\n\");\n+ printf(\" 2 Transition failed and the rollback of the obsolete mappings\\n\");\n+ printf(\" failed.\\n\");\n+ printf(\" 3 Transition failed and the rollback of the new mappings\\n\");\n+ printf(\" failed.\\n\");\n \n printf(\"\\nEnvironment:\\n\");\n printf(\" DISNIX_PROFILE Sets the name of the profile that stores the manifest on the\\n\");\n"} {"commit":"1621b4b1fbda767f07b6784730e6dd5e00fe81b6","subject":"csi::readBytes -> avro::StreamReader::readBytes","message":"csi::readBytes -> avro::StreamReader::readBytes\n","repos":"bitbouncer\/csi-avro-cpp,bitbouncer\/csi-avro-cpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- csi_avro\/encoding.h\n+++ csi_avro\/encoding.h\n@@ -68,11 +68,14 @@\n \/\/get the data from the internals of avro stream\n auto x = avro::memoryInputStream(*os.get());\n avro::StreamReader reader(*x.get());\n- size_t content_length1 = os->byteCount();\n- assert(content_length1 <= capacity);\n- size_t content_length2 = csi::readBytes(&reader, (uint8_t*)buffer, capacity);\n- assert(content_length1 == content_length2);\n- return content_length1;\n+ size_t sz = os->byteCount();\n+\t\tif (sz <= capacity)\n+\t\t{\n+\t\t\treader.readBytes((uint8_t*)buffer, sz);\n+\t\t\treturn sz;\n+\t\t}\n+\t\tassert(sz <= capacity);\n+\t\treturn 0;\n }\n \n \t\/\/raw encoding without type info\n@@ -85,7 +88,6 @@\n \t\tavro::decode(*e, dst);\n \t\treturn dst;\n \t}\n-\n \n \/\/ encodes fingerprint first in 16 bytes\n template<class T>\n"} {"commit":"a058960647f76249e69dfdcb30e84340b3108ea0","subject":"Make test_nsalloc_realloc_long_ge_name() robust.","message":"Make test_nsalloc_realloc_long_ge_name() robust.\n\nMake test robust against memory allocation pattern changes\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -11605,15 +11605,9 @@\n { NULL, NULL }\n };\n int i;\n-#define MAX_REALLOC_COUNT 5\n- int repeat = 0;\n+#define MAX_REALLOC_COUNT 10\n \n for (i = 0; i < MAX_REALLOC_COUNT; i++) {\n- \/* Repeat some counts to defeat caching *\/\n- if (i == 2 && repeat < 3) {\n- i--;\n- repeat++;\n- }\n reallocation_count = i;\n XML_SetUserData(parser, options);\n XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);\n@@ -11621,7 +11615,9 @@\n if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n XML_TRUE) != XML_STATUS_ERROR)\n break;\n- XML_ParserReset(parser, NULL);\n+ \/* See comment in test_nsalloc_xmlns() *\/\n+ nsalloc_teardown();\n+ nsalloc_setup();\n }\n if (i == 0)\n fail(\"Parsing worked despite failing reallocations\");\n"} {"commit":"7685608c6977a3cf62fa071a2a7312cdef52f6ac","subject":"Added #include \"globus_logging.h\" for windows","message":"Added #include \"globus_logging.h\" for windows\n","repos":"ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/test\/globus_common_log_test.c\n+++ common\/test\/globus_common_log_test.c\n@@ -1,4 +1,7 @@\n #include \"globus_common.h\"\n+#ifdef WIN32\n+#include \"globus_logging.h\"\n+#endif\n \n int \n main(\n"} {"commit":"a67845bdd8ce6b21fe19f35e37427ee2111e90c4","subject":"Strings cause problems in AVR.","message":"Strings cause problems in AVR.","repos":"OlegHahm\/relic,ukscone\/relic,tfar\/relic,tfar\/relic,ace0\/relic,ace0\/relic,sruesch\/relic,ace0\/relic,ukscone\/relic,ukscone\/relic,OlegHahm\/relic,sruesch\/relic,sruesch\/relic,ace0\/relic,OlegHahm\/relic,tfar\/relic","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bench\/bench_cp.c\n+++ bench\/bench_cp.c\n@@ -254,6 +254,8 @@\n \tsokaka_t s_a;\n \tbn_t s;\n \tunsigned char key1[MD_LEN];\n+\tchar id_a[5] = {'A', 'l', 'i', 'c', 'e'};\n+\tchar id_b[3] = {'B', 'o', 'b'};\n \n \tsokaka_null(s_a);\n \n@@ -267,11 +269,11 @@\n \t} BENCH_END;\n \n \tBENCH_BEGIN(\"cp_sokaka_gen_prv\") {\n-\t\tBENCH_ADD(cp_sokaka_gen_prv(s_a, \"Alice\", 5, s));\n+\t\tBENCH_ADD(cp_sokaka_gen_prv(s_a, id_a, 5, s));\n \t} BENCH_END;\n \n \tBENCH_BEGIN(\"cp_sokaka_key\") {\n-\t\tBENCH_ADD(cp_sokaka_key(key1, MD_LEN, \"Alice\", 5, s_a, \"Bob\", 3));\n+\t\tBENCH_ADD(cp_sokaka_key(key1, MD_LEN, id_a, 5, s_a, id_b, 3));\n \t} BENCH_END;\n \n \tsokaka_free(s_a);\n"} {"commit":"5e66dc012fc20fa0f046781712dee71ced8ddea6","subject":"In ext2_mountfs(), check that the superblock size, SBSIZE, is aligned with the sectorsize value returned by GEOM, before doing a bread() of the superblock. This eliminates a panic when trying the following on an empty CD-ROM drive: mount_ext2fs \/dev\/acd0 \/mnt","message":"In ext2_mountfs(), check that the superblock size, SBSIZE,\nis aligned with the sectorsize value returned by GEOM, before\ndoing a bread() of the superblock.\nThis eliminates a panic when trying the following on an empty CD-ROM drive:\nmount_ext2fs \/dev\/acd0 \/mnt\n\nReviewed by:\tphk\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/gnu\/fs\/ext2fs\/ext2_vfsops.c\n+++ sys\/gnu\/fs\/ext2fs\/ext2_vfsops.c\n@@ -612,6 +612,18 @@\n \tVOP_UNLOCK(devvp, 0, td);\n \tif (error)\n \t\treturn (error);\n+\n+\t\/* XXX: should we check for some sectorsize or 512 instead? *\/\n+\tif (((SBSIZE % cp->provider->sectorsize) != 0) ||\n+\t (SBSIZE < cp->provider->sectorsize)) {\n+\t\tDROP_GIANT();\n+\t\tg_topology_lock();\n+\t\tg_vfs_close(cp, td);\n+\t\tg_topology_unlock();\n+\t\tPICKUP_GIANT();\n+\t\treturn (EINVAL);\n+\t}\n+\n \tbo = &devvp->v_bufobj;\n \tbo->bo_private = cp;\n \tbo->bo_ops = g_vfs_bufops;\n"} {"commit":"ab0e73944cc6a34945d5cd5cf41a766e0d120e29","subject":"lib-ssl-iostream: Compiler warning fix when compiling without ssl","message":"lib-ssl-iostream: Compiler warning fix when compiling without ssl\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-ssl-iostream\/iostream-ssl.c\n+++ src\/lib-ssl-iostream\/iostream-ssl.c\n@@ -5,7 +5,9 @@\n #include \"iostream-ssl-private.h\"\n \n static bool ssl_module_loaded = FALSE;\n+#ifdef HAVE_SSL\n static struct module *ssl_module = NULL;\n+#endif\n static const struct iostream_ssl_vfuncs *ssl_vfuncs = NULL;\n \n static int ssl_module_load(void)\n"} {"commit":"d020cb4aa34e786a15a71be72679f37b6164507e","subject":"Remove unused function","message":"Remove unused function\n","repos":"Adamovskiy\/gtk,jigpu\/gtk,ahodesuka\/gtk,Distrotech\/gtk,Unity-Technologies\/gtk,bratsche\/gtk-,davidgumberg\/gtk,chergert\/gtk,Distrotech\/gtk,jadahl\/gtk,davidgumberg\/gtk,jigpu\/gtk,chergert\/gtk,ahodesuka\/gtk,simokivimaki\/gtk,Lyude\/gtk-,bratsche\/gtk-,grubersjoe\/adwaita,jadahl\/gtk,davidgumberg\/gtk,bratsche\/gtk-,simokivimaki\/gtk,jessevdk\/gtk,chergert\/gtk,ebassi\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,Unity-Technologies\/gtk,jadahl\/gtk,Lyude\/gtk-,davidt\/gtk,msteinert\/gtk,jessevdk\/gtk,jigpu\/gtk,chergert\/gtk,chergert\/gtk,Lyude\/gtk-,jessevdk\/gtk,jigpu\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,johne53\/MB3Gtk-2,Lyude\/gtk-,davidt\/gtk,Adamovskiy\/gtk,Distrotech\/gtk,Adamovskiy\/gtk,Distrotech\/gtk2,ahodesuka\/gtk,msteinert\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,Adamovskiy\/gtk,Unity-Technologies\/gtk,msteinert\/gtk,chergert\/gtk,Adamovskiy\/gtk,simokivimaki\/gtk,Distrotech\/gtk,simokivimaki\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,Distrotech\/gtk2,davidt\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,chipx86\/gtk,chergert\/gtk,johne53\/MB3Gtk-2,jadahl\/gtk,alexlarsson\/gtk,chipx86\/gtk,alexlarsson\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,nacho\/gtk-,Sidnioulz\/SandboxGtk,jessevdk\/gtk,alexlarsson\/gtk,ebassi\/gtk,bratsche\/gtk-,grubersjoe\/adwaita,jadahl\/gtk,ahodesuka\/gtk,Distrotech\/gtk2,davidt\/gtk,jadahl\/gtk,ebassi\/gtk,msteinert\/gtk,grubersjoe\/adwaita,johne53\/MB3Gtk-2,nacho\/gtk-,jadahl\/gtk,chipx86\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,alexlarsson\/gtk,nacho\/gtk-,ahodesuka\/gtk,Unity-Technologies\/gtk,jessevdk\/gtk,johne53\/MB3Gtk-2,davidt\/gtk,grubersjoe\/adwaita,msteinert\/gtk,simokivimaki\/gtk,Distrotech\/gtk2,ahodesuka\/gtk,nacho\/gtk-,alexlarsson\/gtk,alexlarsson\/gtk,Lyude\/gtk-,jigpu\/gtk,ebassi\/gtk,Lyude\/gtk-,ebassi\/gtk,Unity-Technologies\/gtk,davidt\/gtk,jadahl\/gtk,Adamovskiy\/gtk,johne53\/MB3Gtk-2,Lyude\/gtk-,chergert\/gtk,Distrotech\/gtk,Distrotech\/gtk2,jigpu\/gtk,davidgumberg\/gtk,jigpu\/gtk,chipx86\/gtk,simokivimaki\/gtk,ebassi\/gtk,chipx86\/gtk,nacho\/gtk-,jigpu\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkaboutdialog.c\n+++ gtk\/gtkaboutdialog.c\n@@ -192,8 +192,6 @@\n static void gtk_about_dialog_show (GtkWidget *widge);\n static void update_name_version (GtkAboutDialog *about);\n static GtkIconSet * icon_set_new_from_pixbufs (GList *pixbufs);\n-static void activate_url (GtkWidget *widget,\n-\t\t\t\t\t\t\t gpointer data);\n static void follow_if_link (GtkAboutDialog *about,\n \t\t\t\t\t\t\t GtkTextView *text_view,\n \t\t\t\t\t\t\t GtkTextIter *iter);\n@@ -1753,30 +1751,6 @@\n g_object_notify (G_OBJECT (about), \"logo-icon-name\");\n \n g_object_thaw_notify (G_OBJECT (about));\n-}\n-\n-static void\n-activate_url (GtkWidget *widget, \n-\t gpointer data)\n-{\n- GtkAboutDialog *about = GTK_ABOUT_DIALOG (data);\n- const gchar *url = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget));\n- GtkAboutDialogActivateLinkFunc url_hook;\n- gpointer url_hook_data;\n-\n- if (activate_url_hook_set)\n- {\n- url_hook = activate_url_hook;\n- url_hook_data = activate_url_hook_data;\n- }\n- else\n- {\n- url_hook = default_url_hook;\n- url_hook_data = NULL;\n- }\n-\n- if (url_hook)\n- url_hook (about, url, url_hook_data);\n }\n \n static void\n"} {"commit":"38671d4ca9bdaa3ad849a8b470a10c8b82bb06e1","subject":"Fix warning;","message":"Fix warning;\n","repos":"bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/api\/l_headset.c\n+++ src\/api\/l_headset.c\n@@ -424,13 +424,13 @@\n float value[4];\n FOREACH_TRACKING_DRIVER(driver) {\n if (driver->getAxis(device, axis, value)) {\n- for (size_t i = 0; i < count; i++) {\n+ for (int i = 0; i < count; i++) {\n lua_pushnumber(L, value[i]);\n }\n return count;\n }\n }\n- for (size_t i = 0; i < count; i++) {\n+ for (int i = 0; i < count; i++) {\n lua_pushnumber(L, 0.);\n }\n return count;\n"} {"commit":"976f7a4078e126d7200f128ded84cb81c8761844","subject":"[nrf52840] fix IAR warning in radio.c (#2641)","message":"[nrf52840] fix IAR warning in radio.c (#2641)\n\nSigned-off-by: Robert Lubos <9d28997c6894a2d0321a7bb399169af7ce99b64e@nordicsemi.no>","repos":"gandreello\/openthread,erja-gp\/openthread,chshu\/openthread,mszczodrak\/openthread,lanyuwen\/openthread,bukepo\/openthread,mszczodrak\/openthread,pvanhorn\/openthread,chshu\/openthread,abtink\/openthread,chshu\/openthread,abtink\/openthread,srickardti\/openthread,abtink\/openthread,lanyuwen\/openthread,openthread\/openthread,abtink\/openthread,gandreello\/openthread,mszczodrak\/openthread,mszczodrak\/openthread,LeZhang2016\/openthread,LeZhang2016\/openthread,srickardti\/openthread,erja-gp\/openthread,pvanhorn\/openthread,jwhui\/openthread,pvanhorn\/openthread,lanyuwen\/openthread,erja-gp\/openthread,georgecpr\/openthread,erja-gp\/openthread,bukepo\/openthread,turon\/openthread,pvanhorn\/openthread,LeZhang2016\/openthread,jwhui\/openthread,pvanhorn\/openthread,georgecpr\/openthread,georgecpr\/openthread,chshu\/openthread,gandreello\/openthread,chshu\/openthread,gandreello\/openthread,georgecpr\/openthread,erja-gp\/openthread,LeZhang2016\/openthread,chshu\/openthread,turon\/openthread,jwhui\/openthread,LeZhang2016\/openthread,georgecpr\/openthread,srickardti\/openthread,gandreello\/openthread,turon\/openthread,gandreello\/openthread,openthread\/openthread,LeZhang2016\/openthread,srickardti\/openthread,openthread\/openthread,turon\/openthread,librasungirl\/openthread,bukepo\/openthread,georgecpr\/openthread,pvanhorn\/openthread,mszczodrak\/openthread,openthread\/openthread,librasungirl\/openthread,bukepo\/openthread,lanyuwen\/openthread,lanyuwen\/openthread,jwhui\/openthread,librasungirl\/openthread,librasungirl\/openthread,lanyuwen\/openthread,erja-gp\/openthread,mszczodrak\/openthread","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/platforms\/nrf52840\/radio.c\n+++ examples\/platforms\/nrf52840\/radio.c\n@@ -356,7 +356,7 @@\n {\n (void)aInstance;\n \n- return OT_RADIO_CAPS_ENERGY_SCAN | OT_RADIO_CAPS_ACK_TIMEOUT | OT_RADIO_CAPS_CSMA_BACKOFF;\n+ return (otRadioCaps)(OT_RADIO_CAPS_ENERGY_SCAN | OT_RADIO_CAPS_ACK_TIMEOUT | OT_RADIO_CAPS_CSMA_BACKOFF);\n }\n \n bool otPlatRadioGetPromiscuous(otInstance *aInstance)\n"} {"commit":"8e6613b6cd8f33d15b447bb851e7254ee8a08008","subject":"uint8_t is slightly faster than uint32_t","message":"uint8_t is slightly faster than uint32_t\n","repos":"tempbottle\/primesieve,tempbottle\/primesieve,anatoliyrazin\/primesieve,kimwalisch\/primesieve,anatoliyrazin\/primesieve,ZahidDev\/primesieve,kimwalisch\/primesieve,tempbottle\/primesieve,fredwang00\/primesieve,ZahidDev\/primesieve,anatoliyrazin\/primesieve,ZahidDev\/primesieve,kimwalisch\/primesieve,fredwang00\/primesieve,fredwang00\/primesieve","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- soe\/WheelFactorization.h\n+++ soe\/WheelFactorization.h\n@@ -149,8 +149,8 @@\n };\n \n struct InitWheel {\n- uint32_t nextMultipleFactor;\n- uint32_t wheelIndex;\n+ uint8_t nextMultipleFactor;\n+ uint8_t wheelIndex;\n };\n \n \/**\n@@ -174,7 +174,7 @@\n class ModuloWheel {\n private:\n \/** Is used to assign a wheel index to each prime number. *\/\n- static const uint32_t primeBitPosition_[30];\n+ static const uint8_t primeBitPosition_[30];\n protected:\n const uint64_t stopNumber_;\n \/**\n@@ -230,23 +230,24 @@\n multiple += static_cast<uint64_t> (*primeNumber) * INIT_WHEEL[index].nextMultipleFactor;\n if (multiple > stopNumber_)\n return false;\n- uint32_t wheelOffset = primeBitPosition_[*primeNumber % 30] * WHEEL_ELEMENTS;\n- *wheelIndex = INIT_WHEEL[index].wheelIndex + wheelOffset;\n+ uint32_t wheelOffset = WHEEL_ELEMENTS * primeBitPosition_[*primeNumber % 30];\n+ *wheelIndex = wheelOffset + INIT_WHEEL[index].wheelIndex;\n *sieveIndex = static_cast<uint32_t> (((multiple - lowerBound) - 6) \/ 30);\n *primeNumber \/= 15;\n return true;\n }\n };\n \n+\/\/ 0xff values are never accessed\n template<uint32_t WHEEL_MODULO, uint32_t WHEEL_ELEMENTS,\n const InitWheel* INIT_WHEEL>\n-const uint32_t\n- ModuloWheel<WHEEL_MODULO, WHEEL_ELEMENTS, INIT_WHEEL>::primeBitPosition_[30] = { ~0u,\n- 7, ~0u, ~0u, ~0u, ~0u, ~0u,\n- 0, ~0u, ~0u, ~0u, 1, ~0u,\n- 2, ~0u, ~0u, ~0u, 3, ~0u,\n- 4, ~0u, ~0u, ~0u, 5, ~0u,\n- ~0u, ~0u, ~0u, ~0u, 6 };\n+const uint8_t\n+ ModuloWheel<WHEEL_MODULO, WHEEL_ELEMENTS, INIT_WHEEL>::primeBitPosition_[30] = { 0xff,\n+ 7, 0xff, 0xff, 0xff, 0xff, 0xff,\n+ 0, 0xff, 0xff, 0xff, 1, 0xff,\n+ 2, 0xff, 0xff, 0xff, 3, 0xff,\n+ 4, 0xff, 0xff, 0xff, 5, 0xff,\n+ 0xff, 0xff, 0xff, 0xff, 6 };\n \n \/**\n * Uses wheel factorization to skip multiples of 2, 3 and 5.\n"} {"commit":"ad01c620333d05c430d583ee40647e396be1ab91","subject":"Fix a missing underscore.","message":"Fix a missing underscore.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gnu\/usr.bin\/cc\/cc_tools\/auto-host.h\n+++ gnu\/usr.bin\/cc\/cc_tools\/auto-host.h\n@@ -891,7 +891,7 @@\n \n \/* Define if your PowerPC64 linker only needs function descriptor syms. *\/\n #ifndef USED_FOR_TARGET\n-# ifdef __powerpc64_\n+# ifdef __powerpc64__\n # define HAVE_LD_NO_DOT_SYMS 1\n # endif\n #endif\n"} {"commit":"e6a6644f3002f3c8478b4af6fb24906c464d9ee9","subject":"[ALSA] Introduced audio buffer scaling for bad latency devices","message":"[ALSA] Introduced audio buffer scaling for bad latency devices\n","repos":"f1nalspace\/final_game_tech,f1nalspace\/final_game_tech,f1nalspace\/final_game_tech","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- final_platform_layer.h\n+++ final_platform_layer.h\n@@ -146,6 +146,8 @@\n \t- Changed: Removed redundant field bufferSizeInBytes from fplAudioDeviceFormat struct\n \t- Changed: Simplified audio system default values initialization\n \t- Changed: Use default audio buffer size based on set fplAudioLatencyMode in fplAudioTargetFormat\n+\t\n+\t- Changed: [ALSA] Introduced audio buffer scaling for bad latency devices\n \n \t## v0.9.4 beta\n \n@@ -18250,6 +18252,11 @@\n \treturn(1.0f);\n }\n \n+fpl_internal uint32_t fpl__AlsaScaleBufferSize(const uint32_t bufferSize, const float scale) {\n+\tuint32_t result = fplMax(1, (uint32_t)(bufferSize * scale));\n+\treturn(result);\n+}\n+\n #if defined(FPL__ANONYMOUS_ALSA_HEADERS)\n typedef void snd_pcm_t;\n typedef void snd_pcm_format_mask_t;\n@@ -18416,10 +18423,10 @@\n typedef FPL__ALSA_FUNC_snd_device_name_hint(fpl__alsa_func_snd_device_name_hint);\n #define FPL__ALSA_FUNC_snd_device_name_get_hint(name) char *name(const void *hint, const char *id)\n typedef FPL__ALSA_FUNC_snd_device_name_get_hint(fpl__alsa_func_snd_device_name_get_hint);\n+#define FPL__ALSA_FUNC_snd_device_name_free_hint(name) int name(void **hints)\n+typedef FPL__ALSA_FUNC_snd_device_name_free_hint(fpl__alsa_func_snd_device_name_free_hint);\n #define FPL__ALSA_FUNC_snd_card_get_index(name) int name(const char *name)\n typedef FPL__ALSA_FUNC_snd_card_get_index(fpl__alsa_func_snd_card_get_index);\n-#define FPL__ALSA_FUNC_snd_device_name_free_hint(name) int name(void **hints)\n-typedef FPL__ALSA_FUNC_snd_device_name_free_hint(fpl__alsa_func_snd_device_name_free_hint);\n #define FPL__ALSA_FUNC_snd_pcm_mmap_begin(name) int name(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames)\n typedef FPL__ALSA_FUNC_snd_pcm_mmap_begin(fpl__alsa_func_snd_pcm_mmap_begin);\n #define FPL__ALSA_FUNC_snd_pcm_mmap_commit(name) snd_pcm_sframes_t name(snd_pcm_t *pcm, snd_pcm_uframes_t offset, snd_pcm_uframes_t frames)\n@@ -18434,6 +18441,12 @@\n typedef FPL__ALSA_FUNC_snd_pcm_avail_update(fpl__alsa_func_snd_pcm_avail_update);\n #define FPL__ALSA_FUNC_snd_pcm_wait(name) int name(snd_pcm_t *pcm, int timeout)\n typedef FPL__ALSA_FUNC_snd_pcm_wait(fpl__alsa_func_snd_pcm_wait);\n+#define FPL__ALSA_FUNC_snd_pcm_info_sizeof(name) size_t name(void)\n+typedef FPL__ALSA_FUNC_snd_pcm_info_sizeof(fpl__alsa_func_snd_pcm_info_sizeof);\n+#define FPL__ALSA_FUNC_snd_pcm_info(name) int name(snd_pcm_t *handle, snd_pcm_info_t *info)\n+typedef FPL__ALSA_FUNC_snd_pcm_info(fpl__alsa_func_snd_pcm_info);\n+#define FPL__ALSA_FUNC_snd_pcm_info_get_name(name) const char* name(const snd_pcm_info_t *obj)\n+typedef FPL__ALSA_FUNC_snd_pcm_info_get_name(fpl__alsa_func_snd_pcm_info_get_name);\n \n typedef struct fpl__AlsaAudioApi {\n \tvoid *libHandle;\n@@ -18471,8 +18484,8 @@\n \tfpl__alsa_func_snd_pcm_drop *snd_pcm_drop;\n \tfpl__alsa_func_snd_device_name_hint *snd_device_name_hint;\n \tfpl__alsa_func_snd_device_name_get_hint *snd_device_name_get_hint;\n+\tfpl__alsa_func_snd_device_name_free_hint *snd_device_name_free_hint;\n \tfpl__alsa_func_snd_card_get_index *snd_card_get_index;\n-\tfpl__alsa_func_snd_device_name_free_hint *snd_device_name_free_hint;\n \tfpl__alsa_func_snd_pcm_mmap_begin *snd_pcm_mmap_begin;\n \tfpl__alsa_func_snd_pcm_mmap_commit *snd_pcm_mmap_commit;\n \tfpl__alsa_func_snd_pcm_recover *snd_pcm_recover;\n@@ -18480,6 +18493,9 @@\n \tfpl__alsa_func_snd_pcm_avail *snd_pcm_avail;\n \tfpl__alsa_func_snd_pcm_avail_update *snd_pcm_avail_update;\n \tfpl__alsa_func_snd_pcm_wait *snd_pcm_wait;\n+\tfpl__alsa_func_snd_pcm_info_sizeof *snd_pcm_info_sizeof;\n+\tfpl__alsa_func_snd_pcm_info *snd_pcm_info;\n+\tfpl__alsa_func_snd_pcm_info_get_name *snd_pcm_info_get_name;\n } fpl__AlsaAudioApi;\n \n typedef struct fpl__AlsaAudioState {\n@@ -18544,8 +18560,8 @@\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_drop, snd_pcm_drop);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_device_name_hint, snd_device_name_hint);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_device_name_get_hint, snd_device_name_get_hint);\n+\t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_device_name_free_hint, snd_device_name_free_hint);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_card_get_index, snd_card_get_index);\n-\t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_device_name_free_hint, snd_device_name_free_hint);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_mmap_begin, snd_pcm_mmap_begin);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_mmap_commit, snd_pcm_mmap_commit);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_recover, snd_pcm_recover);\n@@ -18553,6 +18569,9 @@\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_avail, snd_pcm_avail);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_avail_update, snd_pcm_avail_update);\n \t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_wait, snd_pcm_wait);\n+\t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_info_sizeof, snd_pcm_info_sizeof);\n+\t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_info, snd_pcm_info);\n+\t\t\tFPL__POSIX_GET_FUNCTION_ADDRESS(FPL__MODULE_AUDIO_ALSA, libHandle, libName, alsaApi, fpl__alsa_func_snd_pcm_info_get_name, snd_pcm_info_get_name);\n \t\t\talsaApi->libHandle = libHandle;\n \t\t\tresult = true;\n \t\t} while (0);\n@@ -18853,7 +18872,7 @@\n \tsnd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;\n \tint openMode = SND_PCM_NO_AUTO_RESAMPLE | SND_PCM_NO_AUTO_CHANNELS | SND_PCM_NO_AUTO_FORMAT;\n \tif (fplGetStringLength(deviceInfo.id.alsa) == 0) {\n-\t\tconst char *defaultDeviceNames[16];\n+\t\tconst char *defaultDeviceNames[16] = fplZeroInit;\n \t\tint defaultDeviceCount = 0;\n \t\tdefaultDeviceNames[defaultDeviceCount++] = \"default\";\n \t\tif (!targetFormat->preferExclusiveMode) {\n@@ -18888,6 +18907,69 @@\n \t\t\tFPL__ALSA_INIT_ERROR(fplAudioResultType_NoDeviceFound, \"PCM audio device by id '%s' not found!\", forcedDeviceId);\n \t\t}\n \t\tfplCopyString(forcedDeviceId, deviceName, fplArrayCount(deviceName));\n+\t}\n+\t\n+\t\/\/\n+\t\/\/ Buffer sizes\n+\t\/\/\n+\t\/\/ Some audio devices have high latency, so using the default buffer size will not work.\n+\t\/\/ We have to scale the buffer sizes for special devices, such as broadcom audio (Raspberry Pi)\n+\t\/\/ See fpl__AlsaGetBufferScale for details\n+\t\/\/ Idea comes from miniaudio, which does the same thing - so the code is almost identically here\n+\t\/\/\n+\tfloat bufferSizeScaleFactor = 1.0f;\n+\tif ((targetFormat->defaultFields & fplAudioDefaultFields_BufferSize) == fplAudioDefaultFields_BufferSize) {\n+\t\t\/\/ TODO(final): Do not allocate snd_pcm_info_t on the stack, use temporary memory instead\n+\t\tsize_t pcmInfoSize = alsaApi->snd_pcm_info_sizeof();\n+\t\tsnd_pcm_info_t *pcmInfo = fplStackAllocate(pcmInfoSize);\n+\t\tif (pcmInfo == fpl_null) {\n+\t\t\tFPL__ALSA_INIT_ERROR(fplAudioResultType_OutOfMemory, \"Out of stack memory for snd_pcm_info_t!\");\n+\t\t}\n+\t\t\n+\t\t\/\/ Query device name\n+\t\tif (alsaApi->snd_pcm_info(alsaState->pcmDevice, pcmInfo) == 0) {\n+\t\t\tconst char* deviceName = alsaApi->snd_pcm_info_get_name(pcmInfo);\n+\t\t\tif (deviceName != fpl_null) {\n+\t\t\t\tif (fplIsStringEqual(\"default\", deviceName)) {\n+\t\t\t\t\t\/\/ The device name \"default\" is useless for buffer-scaling, so we search for the real device name in the hint-table\n+\t\t\t\t\tchar** ppDeviceHints;\n+\t\t\t\t\tif (alsaApi->snd_device_name_hint(-1, \"pcm\", (void***)&ppDeviceHints) == 0) {\n+\t\t\t\t\t\tchar** ppNextDeviceHint = ppDeviceHints;\n+\t\t\t\t\t\t\n+\t\t\t\t\t\twhile (*ppNextDeviceHint != fpl_null) {\n+\t\t\t\t\t\t\tchar* hintName = alsaApi->snd_device_name_get_hint(*ppNextDeviceHint, \"NAME\");\n+\t\t\t\t\t\t\tchar* hintDesc = alsaApi->snd_device_name_get_hint(*ppNextDeviceHint, \"DESC\");\n+\t\t\t\t\t\t\tchar* hintIOID = alsaApi->snd_device_name_get_hint(*ppNextDeviceHint, \"IOID\");\n+\t\n+\t\t\t\t\t\t\tbool foundDevice = false;\n+\t\t\t\t\t\t\tif (hintIOID == fpl_null || fplIsStringEqual(hintIOID, \"Output\")) {\n+\t\t\t\t\t\t\t\tif (fplIsStringEqual(hintName, deviceName)) {\n+\t\t\t\t\t\t\t\t\t\/\/ We found the default device and can now get the scale for the description\n+\t\t\t\t\t\t\t\t\tbufferSizeScaleFactor = fpl__AlsaGetBufferScale(hintDesc);\n+\t\t\t\t\t\t\t\t\tfoundDevice = true;\n+\t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t}\n+\t\n+\t\t\t\t\t\t\t\/\/ Unfortunatly the hint strings are malloced, so we have to free it :(\n+\t\t\t\t\t\t\tfree(hintName);\n+\t\t\t\t\t\t\tfree(hintDesc);\n+\t\t\t\t\t\t\tfree(hintIOID);\n+\t\t\t\t\t\t\t\n+\t\t\t\t\t\t\t++ppNextDeviceHint;\n+\t\n+\t\t\t\t\t\t\tif (foundDevice) {\n+\t\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\t\n+\t\t\t\t\t\talsaApi->snd_device_name_free_hint((void**)ppDeviceHints);\n+\t\t\t\t\t}\n+\t\t\t\t} else {\n+\t\t\t\t\tbufferSizeScaleFactor = fpl__AlsaGetBufferScale(deviceName);\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\t\n \t}\n \n \t\/\/\n@@ -18981,20 +19063,28 @@\n \n \t\/\/ @NOTE(final): The caller is responsible to convert to the sample rate FPL expects, so we disable any resampling\n \talsaApi->snd_pcm_hw_params_set_rate_resample(alsaState->pcmDevice, hardwareParams, 0);\n-\tunsigned int internalSampleRate = targetFormat->sampleRate;\n-\tif (alsaApi->snd_pcm_hw_params_set_rate_near(alsaState->pcmDevice, hardwareParams, &internalSampleRate, 0) < 0) {\n-\t\tFPL__ALSA_INIT_ERROR(fplAudioResultType_Failed, \"Failed setting PCM sample rate '%lu' for device '%s'!\", internalSampleRate, deviceName);\n-\t}\n-\tinternalFormat.sampleRate = internalSampleRate;\n+\tunsigned int actualSampleRate = targetFormat->sampleRate;\n+\tfplAssert(actualSampleRate > 0);\n+\tif (alsaApi->snd_pcm_hw_params_set_rate_near(alsaState->pcmDevice, hardwareParams, &actualSampleRate, 0) < 0) {\n+\t\tFPL__ALSA_INIT_ERROR(fplAudioResultType_Failed, \"Failed setting PCM sample rate '%lu' for device '%s'!\", actualSampleRate, deviceName);\n+\t}\n+\tinternalFormat.sampleRate = actualSampleRate;\n \n \t\/\/\n-\t\/\/ Buffer size\n+\t\/\/ Buffer size + Scaling\n \t\/\/\n-\tsnd_pcm_uframes_t actualBufferSize = targetFormat->bufferSizeInFrames;\n+\tsnd_pcm_uframes_t actualBufferSize;\n+\tif ((targetFormat->defaultFields & fplAudioDefaultFields_BufferSize) == fplAudioDefaultFields_BufferSize) {\n+\t\tactualBufferSize = fpl__AlsaScaleBufferSize(targetFormat->bufferSizeInFrames, bufferSizeScaleFactor);\n+\t} else {\n+\t\tactualBufferSize = targetFormat->bufferSizeInFrames;\n+\t}\n+\tfplAssert(actualBufferSize > 0);\n \tif (alsaApi->snd_pcm_hw_params_set_buffer_size_near(alsaState->pcmDevice, hardwareParams, &actualBufferSize) < 0) {\n \t\tFPL__ALSA_INIT_ERROR(fplAudioResultType_Failed, \"Failed setting PCM buffer size '%lu' for device '%s'!\", actualBufferSize, deviceName);\n \t}\n \tinternalFormat.bufferSizeInFrames = actualBufferSize;\n+\n \tuint32_t bufferSizeInBytes = fplGetAudioBufferSizeInBytes(internalFormat.type, internalFormat.channels, internalFormat.bufferSizeInFrames);\n \n \t\/\/\n"} {"commit":"0d464de3fffdd8a4cd7ce5bb1afc1b971a094902","subject":"removed","message":"removed\n","repos":"felicepantaleo\/kdtree,felicepantaleo\/kdtree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- experiments\/FKDPoint.h\n+++ experiments\/FKDPoint.h\n@@ -1,51 +0,0 @@\n-\/*\n- * KDPoint.h\n- *\n- * Created on: Feb 9, 2016\n- * Author: fpantale\n- *\/\n-\n-#ifndef FKDPOINT_H_\n-#define FKDPOINT_H_\n-\n-\/* A utility function to construct a Point from a range of iterators. *\/\n-template <size_t N, typename IteratorType>\n-Point<N> PointFromRange(IteratorType begin, IteratorType end) {\n- Point<N> result;\n- copy(begin, end, result.begin());\n- return result;\n-}\n-\n-\/* Utility functions to create 1-, 2-, 3-, or 4-Points from values. *\/\n-Point<1> MakePoint(double x) {\n- Point<1> result;\n- result[0] = x;\n- return result;\n-}\n-Point<2> MakePoint(double x, double y) {\n- Point<2> result;\n- result[0] = x;\n- result[1] = y;\n- return result;\n-}\n-Point<3> MakePoint(double x, double y, double z) {\n- Point<3> result;\n- result[0] = x;\n- result[1] = y;\n- result[2] = z;\n- return result;\n-}\n-Point<4> MakePoint(double x, double y, double z, double w) {\n- Point<4> result;\n- result[0] = x;\n- result[1] = y;\n- result[2] = z;\n- result[3] = w;\n- return result;\n-}\n-\n-\n-\n-\n-\n-#endif \/* FKDPOINT_H_ *\/\n"} {"commit":"d4e60dae2e4f1301c13d72baa8e3a84747494bc1","subject":"gnrc_netif: join\/leave solicited nodes IPv6 address add\/remove","message":"gnrc_netif: join\/leave solicited nodes IPv6 address add\/remove\n","repos":"kYc0o\/RIOT,rfuentess\/RIOT,basilfx\/RIOT,LudwigKnuepfer\/RIOT,OlegHahm\/RIOT,lazytech-org\/RIOT,miri64\/RIOT,mfrey\/RIOT,gebart\/RIOT,authmillenon\/RIOT,miri64\/RIOT,avmelnikoff\/RIOT,Josar\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,immesys\/RiSyn,RIOT-OS\/RIOT,kbumsik\/RIOT,josephnoir\/RIOT,neiljay\/RIOT,ant9000\/RIOT,avmelnikoff\/RIOT,aeneby\/RIOT,aeneby\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,x3ro\/RIOT,OTAkeys\/RIOT,smlng\/RIOT,LudwigOrtmann\/RIOT,toonst\/RIOT,biboc\/RIOT,kbumsik\/RIOT,A-Paul\/RIOT,biboc\/RIOT,LudwigOrtmann\/RIOT,Josar\/RIOT,yogo1212\/RIOT,cladmi\/RIOT,toonst\/RIOT,A-Paul\/RIOT,immesys\/RiSyn,immesys\/RiSyn,lazytech-org\/RIOT,josephnoir\/RIOT,cladmi\/RIOT,kYc0o\/RIOT,mtausig\/RIOT,cladmi\/RIOT,basilfx\/RIOT,LudwigKnuepfer\/RIOT,OlegHahm\/RIOT,immesys\/RiSyn,immesys\/RiSyn,mtausig\/RIOT,roberthartung\/RIOT,x3ro\/RIOT,yogo1212\/RIOT,kaspar030\/RIOT,mfrey\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,A-Paul\/RIOT,miri64\/RIOT,mfrey\/RIOT,kaspar030\/RIOT,josephnoir\/RIOT,smlng\/RIOT,gebart\/RIOT,OTAkeys\/RIOT,ant9000\/RIOT,immesys\/RiSyn,LudwigKnuepfer\/RIOT,cladmi\/RIOT,biboc\/RIOT,neiljay\/RIOT,mtausig\/RIOT,Josar\/RIOT,authmillenon\/RIOT,kbumsik\/RIOT,mfrey\/RIOT,Josar\/RIOT,yogo1212\/RIOT,LudwigKnuepfer\/RIOT,avmelnikoff\/RIOT,LudwigOrtmann\/RIOT,kaspar030\/RIOT,smlng\/RIOT,OlegHahm\/RIOT,yogo1212\/RIOT,miri64\/RIOT,A-Paul\/RIOT,avmelnikoff\/RIOT,mfrey\/RIOT,aeneby\/RIOT,biboc\/RIOT,gebart\/RIOT,jasonatran\/RIOT,toonst\/RIOT,ant9000\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,RIOT-OS\/RIOT,josephnoir\/RIOT,lazytech-org\/RIOT,BytesGalore\/RIOT,jasonatran\/RIOT,x3ro\/RIOT,roberthartung\/RIOT,gebart\/RIOT,BytesGalore\/RIOT,neiljay\/RIOT,miri64\/RIOT,lazytech-org\/RIOT,yogo1212\/RIOT,rfuentess\/RIOT,RIOT-OS\/RIOT,kbumsik\/RIOT,A-Paul\/RIOT,roberthartung\/RIOT,OlegHahm\/RIOT,rfuentess\/RIOT,kaspar030\/RIOT,toonst\/RIOT,authmillenon\/RIOT,OTAkeys\/RIOT,Josar\/RIOT,LudwigOrtmann\/RIOT,gebart\/RIOT,kYc0o\/RIOT,jasonatran\/RIOT,josephnoir\/RIOT,RIOT-OS\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,cladmi\/RIOT,kbumsik\/RIOT,jasonatran\/RIOT,neiljay\/RIOT,aeneby\/RIOT,x3ro\/RIOT,LudwigOrtmann\/RIOT,BytesGalore\/RIOT,LudwigKnuepfer\/RIOT,basilfx\/RIOT,smlng\/RIOT,mtausig\/RIOT,ant9000\/RIOT,kYc0o\/RIOT,lazytech-org\/RIOT,aeneby\/RIOT,roberthartung\/RIOT,LudwigOrtmann\/RIOT,ant9000\/RIOT,roberthartung\/RIOT,avmelnikoff\/RIOT,mtausig\/RIOT,basilfx\/RIOT,x3ro\/RIOT,rfuentess\/RIOT,biboc\/RIOT,BytesGalore\/RIOT,neiljay\/RIOT,basilfx\/RIOT,BytesGalore\/RIOT,toonst\/RIOT,yogo1212\/RIOT,rfuentess\/RIOT,smlng\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sys\/net\/gnrc\/netif\/gnrc_netif.c\n+++ sys\/net\/gnrc\/netif\/gnrc_netif.c\n@@ -551,6 +551,24 @@\n netif->ipv6.addrs_flags[idx] = flags;\n memcpy(&netif->ipv6.addrs[idx], addr, sizeof(netif->ipv6.addrs[idx]));\n #ifdef MODULE_GNRC_IPV6_NIB\n+#if GNRC_IPV6_NIB_CONF_ARSM\n+ ipv6_addr_t sol_nodes;\n+ int res;\n+\n+ \/* TODO: SHOULD delay join between 0 and MAX_RTR_SOLICITATION_DELAY\n+ * for SLAAC *\/\n+ ipv6_addr_set_solicited_nodes(&sol_nodes, addr);\n+ res = gnrc_netif_ipv6_group_join(netif, &sol_nodes);\n+#if ENABLE_DEBUG\n+ if (res < 0) {\n+ DEBUG(\"nib: Can't join solicited-nodes of %s on interface %u\\n\",\n+ ipv6_addr_to_str(addr_str, addr, sizeof(addr_str)),\n+ netif->pid);\n+ }\n+#else\n+ (void)res;\n+#endif\n+#endif \/* GNRC_IPV6_NIB_CONF_ARSM *\/\n if (_get_state(netif, idx) == GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID) {\n void *state = NULL;\n gnrc_ipv6_nib_pl_t ple;\n@@ -581,14 +599,30 @@\n void gnrc_netif_ipv6_addr_remove(gnrc_netif_t *netif,\n const ipv6_addr_t *addr)\n {\n- int idx;\n+ bool remove_sol_nodes = true;\n+ ipv6_addr_t sol_nodes;\n \n assert((netif != NULL) && (addr != NULL));\n+ ipv6_addr_set_solicited_nodes(&sol_nodes, addr);\n gnrc_netif_acquire(netif);\n- idx = _addr_idx(netif, addr);\n- if (idx >= 0) {\n- netif->ipv6.addrs_flags[idx] = 0;\n- ipv6_addr_set_unspecified(&netif->ipv6.addrs[idx]);\n+ for (unsigned i = 0; i < GNRC_NETIF_IPV6_ADDRS_NUMOF; i++) {\n+ if (ipv6_addr_equal(&netif->ipv6.addrs[i], addr)) {\n+ netif->ipv6.addrs_flags[i] = 0;\n+ ipv6_addr_set_unspecified(&netif->ipv6.addrs[i]);\n+ }\n+ else {\n+ ipv6_addr_t tmp;\n+\n+ ipv6_addr_set_solicited_nodes(&tmp, &netif->ipv6.addrs[i]);\n+ \/* there is still an address on the interface with the same\n+ * solicited nodes address *\/\n+ if (ipv6_addr_equal(&tmp, &sol_nodes)) {\n+ remove_sol_nodes = false;\n+ }\n+ }\n+ }\n+ if (remove_sol_nodes) {\n+ gnrc_netif_ipv6_group_leave(netif, &sol_nodes);\n }\n gnrc_netif_release(netif);\n }\n"} {"commit":"177b1144c93b42c88d5214b4daa9f81f4e5b3861","subject":"lib-storage: Avoid crashes if listing subscriptions for a namespace that can't have any. i.e. the namespace and its parents all have subscriptions=no","message":"lib-storage: Avoid crashes if listing subscriptions for a namespace that can't have any.\ni.e. the namespace and its parents all have subscriptions=no\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/mailbox-list-iter.c\n+++ src\/lib-storage\/mailbox-list-iter.c\n@@ -61,7 +61,12 @@\n \t\tns = mail_namespace_find_subscribable(ns->user->namespaces,\n \t\t\t\t\t\t ns->prefix);\n \t\tif (ns == NULL) {\n-\t\t\t\/* no subscriptions *\/\n+\t\t\t\/* no subscriptions. avoid crashes by initializing\n+\t\t\t a subscriptions tree. *\/\n+\t\t\tif (list->subscriptions == NULL) {\n+\t\t\t\tchar sep = mail_namespace_get_sep(list->ns);\n+\t\t\t\tlist->subscriptions = mailbox_tree_init(sep);\n+\t\t\t}\n \t\t\treturn 0;\n \t\t}\n \t}\n"} {"commit":"9af88217d1b2220d03487d700356b206da30206a","subject":"GtkFontChooser: Compilation warning cleanups","message":"GtkFontChooser: Compilation warning cleanups\n","repos":"Distrotech\/gtk2,Adamovskiy\/gtk,ahodesuka\/gtk,Distrotech\/gtk2,Distrotech\/gtk2,ahodesuka\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,chergert\/gtk,jessevdk\/gtk,jigpu\/gtk,ahodesuka\/gtk,chergert\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,chergert\/gtk,jessevdk\/gtk,jadahl\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,Lyude\/gtk-,davidgumberg\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,jadahl\/gtk,Adamovskiy\/gtk,msteinert\/gtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,alexlarsson\/gtk,jadahl\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,bratsche\/gtk-,bratsche\/gtk-,alexlarsson\/gtk,msteinert\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,davidt\/gtk,davidgumberg\/gtk,Lyude\/gtk-,jadahl\/gtk,chergert\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,ebassi\/gtk,ebassi\/gtk,jadahl\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,davidt\/gtk,msteinert\/gtk,jessevdk\/gtk,Lyude\/gtk-,bratsche\/gtk-,ebassi\/gtk,ebassi\/gtk,chergert\/gtk,davidgumberg\/gtk,jessevdk\/gtk,ebassi\/gtk,Adamovskiy\/gtk,davidt\/gtk,chergert\/gtk,jadahl\/gtk,grubersjoe\/adwaita,davidt\/gtk,msteinert\/gtk,Lyude\/gtk-,ebassi\/gtk,Adamovskiy\/gtk,jadahl\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,davidt\/gtk,Lyude\/gtk-,bratsche\/gtk-,jigpu\/gtk,Lyude\/gtk-,msteinert\/gtk,msteinert\/gtk,Lyude\/gtk-,jigpu\/gtk,jigpu\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,Distrotech\/gtk2,jigpu\/gtk,jigpu\/gtk,davidt\/gtk,davidgumberg\/gtk,chergert\/gtk,jigpu\/gtk,chergert\/gtk,jigpu\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,ahodesuka\/gtk,ahodesuka\/gtk,jadahl\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkfontchooser.c\n+++ gtk\/gtkfontchooser.c\n@@ -60,6 +60,7 @@\n #include \"gtkalignment.h\"\n #include \"gtkscale.h\"\n #include \"gtkbox.h\"\n+#include \"gtkspinbutton.h\"\n \n \n \/**\n@@ -131,7 +132,7 @@\n #define FONT_STYLE_LIST_WIDTH\t170\n #define FONT_SIZE_LIST_WIDTH\t60\n \n-#define ROW_FORMAT_STRING \"<span foreground=\\\"%s\\\">%s %s<\/span>\\n<span font_desc=\\\"%s\\\">%s<\/span>\"\n+#define ROW_FORMAT_STRING \"<span size=\\\"small\\\" foreground=\\\"%s\\\">%s %s<\/span>\\n<span font_desc=\\\"%s\\\">%s<\/span>\"\n \n \/* These are what we use as the standard font sizes, for the size list.\n *\/\n@@ -172,7 +173,7 @@\n \t\t\t\t\t\t\t PangoFontFamily *family);\n static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,\n \t\t\t\t\t\t\t PangoFontFace *face);\n-static void gtk_font_selection_bootstrap_fontlist (GtkTreeView* treeview);\n+static void gtk_font_selection_bootstrap_fontlist (GtkFontSelection *fontsel);\n \n G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_VBOX)\n \n@@ -289,8 +290,10 @@\n GtkWidget *alignment;\n GtkWidget *preview_and_size;\n GtkWidget *size_controls;\n+#if 0\n GList *focus_chain = NULL;\n AtkObject *atk_obj;\n+#endif\n \n fontsel->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontsel,\n GTK_TYPE_FONT_SELECTION,\n@@ -344,7 +347,7 @@\n gtk_widget_show_all (GTK_WIDGET (fontsel));\n gtk_widget_hide (GTK_WIDGET (fontsel));\n \n- gtk_font_selection_bootstrap_fontlist (GTK_TREE_VIEW (priv->family_face_list));\n+ gtk_font_selection_bootstrap_fontlist (fontsel);\n \n gtk_widget_pop_composite_child();\n }\n@@ -388,16 +391,21 @@\n }\n \n static void \n-gtk_font_selection_populate_list (GtkTreeView *treeview)\n-{\n- GtkListStore *model;\n- PangoFontFamily *match_family;\n+populate_list (GtkTreeView *treeview)\n+{\n+ GtkStyleContext *style_context;\n+ GdkRGBA g_color;\n+ PangoColor p_color;\n+ gchar *color_string;\n+\n+ GtkListStore *model;\n+ GtkTreeIter match_row;\n+\n+ gint n_families, i; \n PangoFontFamily **families;\n- gint n_families, i;\n- GtkTreeIter match_row;\n- GString *tmp = g_string_new (NULL);\n- const gchar* row_format = ROW_FORMAT_STRING;\n- \n+\n+ GString *tmp = g_string_new (NULL);\n+\n model = GTK_LIST_STORE (gtk_tree_view_get_model (treeview));\n \n pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (treeview)),\n@@ -407,9 +415,19 @@\n qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);\n \n gtk_list_store_clear (model);\n- \n- \/* FIXME: Get theme color here *\/\n-\n+\n+ \/* Get row header font color *\/\n+ style_context = gtk_widget_get_style_context (GTK_WIDGET (treeview));\n+ gtk_style_context_get_color (style_context,\n+ GTK_STATE_FLAG_NORMAL |GTK_STATE_FLAG_INSENSITIVE,\n+ &g_color);\n+\n+ p_color.red = (guint16)((gdouble)G_MAXUINT16 * g_color.red);\n+ p_color.green = (guint16)((gdouble)G_MAXUINT16 * g_color.green);\n+ p_color.blue = (guint16)((gdouble)G_MAXUINT16 * g_color.blue);\n+ color_string = pango_color_to_string (&p_color);\n+\n+ \/* Iterate over families and faces *\/\n for (i=0; i<n_families; i++)\n {\n GtkTreeIter iter;\n@@ -427,7 +445,7 @@\n \n \/* foreground_color, family_name, face_name, desc, sample string *\/\n g_string_printf (tmp, ROW_FORMAT_STRING,\n- \"darkgrey\", \/* FIXME: This has to be a theme color *\/\n+ color_string,\n fam_name,\n face_name,\n font_desc,\n@@ -445,7 +463,6 @@\n if ((i == 0 && j == 0) ||\n (!g_ascii_strcasecmp (face_name, \"sans\") && j == 0))\n {\n- match_family = families[i];\n match_row = iter;\n }\n \n@@ -459,14 +476,18 @@\n set_cursor_to_iter (treeview, &match_row);\n \n g_string_free (tmp, TRUE);\n+ g_free (color_string);\n g_free (families);\n }\n \n static void\n-gtk_font_selection_bootstrap_fontlist (GtkTreeView* treeview)\n-{\n+gtk_font_selection_bootstrap_fontlist (GtkFontSelection* fontsel)\n+{\n+ GtkListStore *fonts_model;\n+ GtkTreeView *treeview = GTK_TREE_VIEW (fontsel->priv->family_face_list);\n GtkTreeViewColumn *col;\n- GtkListStore *fonts_model;\n+\n+\n \n fonts_model = gtk_list_store_new (4,\n PANGO_TYPE_FONT_FAMILY,\n@@ -484,7 +505,7 @@\n NULL);\n gtk_tree_view_append_column (treeview, col);\n \n- gtk_font_selection_populate_list (treeview); \n+ populate_list (treeview); \n }\n \n \n@@ -741,10 +762,12 @@\n gtk_font_selection_set_font_name (GtkFontSelection *fontsel,\n \t\t\t\t const gchar *fontname)\n {\n+#if 0\n PangoFontFamily *family = NULL;\n PangoFontFace *face = NULL;\n PangoFontDescription *new_desc;\n- \n+#endif\n+\n g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE);\n \n return TRUE;\n@@ -779,12 +802,14 @@\n gtk_font_selection_set_preview_text (GtkFontSelection *fontsel,\n \t\t\t\t const gchar *text)\n {\n+#if 0\n GtkFontSelectionPrivate *priv;\n \n g_return_if_fail (GTK_IS_FONT_SELECTION (fontsel));\n g_return_if_fail (text != NULL);\n \n priv = fontsel->priv;\n+#endif\n }\n \n \n"} {"commit":"14ba61505f5e170ca3e9dd2e0fddac322a5e5fbf","subject":"fixed windows mmap code","message":"fixed windows mmap code\n","repos":"noname007\/nginx-rtmp-module,junaidnasir\/nginx-rtmp-HLS-rabbitmq,copystudy\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,devaos\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,chrisp22\/nginx-rtmp-module,UweM\/nginx-rtmp-module,devaos\/nginx-rtmp-module,arut\/nginx-rtmp-module,lu-zero\/nginx-rtmp-module,oceanho\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,WTF001\/nginx-rtmp-module,WTF001\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,cine-io\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,oceanho\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,arut\/nginx-rtmp-module,noname007\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,arut\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,oceanho\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,copystudy\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,noname007\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,cine-io\/nginx-rtmp-module,copystudy\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,arut\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,jiangbing9293\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module,jiangbing9293\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,chrisp22\/nginx-rtmp-module,lu-zero\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,jiangbing9293\/nginx-rtmp-module,UweM\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,chrisp22\/nginx-rtmp-module,devaos\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,UweM\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,WTF001\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,junaidnasir\/nginx-rtmp-HLS-rabbitmq,lu-zero\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ngx_rtmp_mp4_module.c\n+++ ngx_rtmp_mp4_module.c\n@@ -275,7 +275,7 @@\n }\n \n if (CloseHandle(*extra) == 0) {\n- ret = NGX_ERROR;\n+ rc = NGX_ERROR;\n }\n \n return rc;\n"} {"commit":"033dbb16da82e470f719e1e9e4baa9dbfeebefce","subject":"Command line arg","message":"Command line arg\n","repos":"Baltoli\/peggo,Baltoli\/peggo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/apps\/ast\/main.c\n+++ src\/apps\/ast\/main.c\n@@ -9,8 +9,8 @@\n return extract(s, parse(s, g));\n }\n \n-int main(void) {\n- char *source = \"1+2+3+4+5\";\n+int main(int argc, char **argv) {\n+ char *source = argv[1];\n ast_t *a = parse_extract(source, arith_grammar());\n print_ast(a);\n printf(\"%lld\\n\", eval(a));\n"} {"commit":"44a6cbe33e8f2ea4dfeed761d6179ecb64fbcb8f","subject":"Handle subdirectories for inotify on Linux\/Android","message":"Handle subdirectories for inotify on Linux\/Android\n","repos":"nowsecure\/fsmon,nowsecure\/fsmon","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- backend\/inotify.c\n+++ backend\/inotify.c\n@@ -10,6 +10,7 @@\n #include <signal.h>\n #include <unistd.h>\n #include <string.h>\n+#include <dirent.h>\n #include <sys\/ioctl.h>\n #include <sys\/types.h>\n #include <sys\/syscall.h>\n@@ -99,7 +100,9 @@\n \tev->file = path;\n \tev->pid = metadata->pid;\n \tev->proc = get_proc_name (ev->pid, &ev->ppid);\n-\tif (metadata->mask & FAN_ACCESS) ev->type = FSE_STAT_CHANGED;\n+\tif (metadata->mask & FAN_ACCESS) {\n+\t\tev->type = FSE_STAT_CHANGED;\n+\t}\n \tif (metadata->mask & FAN_OPEN) ev->type = FSE_OPEN;\n \tif (metadata->mask & FAN_MODIFY) ev->type = FSE_CONTENT_MODIFIED;\n \tif (metadata->mask & FAN_CLOSE) {\n@@ -117,8 +120,9 @@\n \t\tev->type = FSE_STAT_CHANGED;\n \t}\n \tif (metadata->mask & FAN_ALL_PERM_EVENTS) {\n-\t\tif (handle_perm (fan_fd, metadata))\n+\t\tif (handle_perm (fan_fd, metadata)) {\n \t\t\treturn false;\n+\t\t}\n \t}\n \treturn true;\n }\n@@ -209,32 +213,94 @@\n \n \/* inotify fallback *\/\n \n-static void parseEvent(FileMonitor *fm, struct inotify_event *i, FileMonitorEvent *ev) {\n+typedef struct PidPath {\n+\tint fd;\n+\tchar *path;\n+} PidPath;\n+\n+static int skipevents = 0;\n+static int pidpathn = 0;\n+static PidPath* pidpaths = NULL;\n+\n+static void setPathForFd(int fd, const char *path) {\n+\tint last = pidpathn++;\n+\tPidPath* tmp = realloc (pidpaths, pidpathn * sizeof (PidPath));\n+\tif (tmp) {\n+\t\ttmp[last].fd = fd;\n+\t\ttmp[last].path = strdup (path);\n+\t\tpidpaths = tmp;\n+\t\tskipevents += 2;\n+\t}\n+}\n+\n+static bool invalidPathForFd(int fd) {\n+\tint i;\n+\tif (fd == -1) {\n+\t\treturn false;\n+\t}\n+\tfor (i = 0; i < pidpathn; i++) {\n+\t\tPidPath *pp = &pidpaths[i];\n+\t\tif (pp->fd == fd) {\n+\t\t\tclose (pp->fd);\n+\t\t\tpp->fd = -1;\n+\t\t\tfree (pp->path);\n+\t\t\tpp->path = NULL;\n+\t\t\treturn true;\n+\t\t}\n+\t}\n+\treturn false;\n+}\n+\n+static const char *getPathForFd(int fd) {\n+\tint i;\n+\tif (fd == -1) {\n+\t\treturn false;\n+\t}\n+\tfor (i = 0; i < pidpathn; i++) {\n+\t\tPidPath *pp = &pidpaths[i];\n+\t\tif (pp->fd == fd) {\n+\t\t\treturn pp->path;\n+\t\t}\n+\t}\n+\treturn \"\";\n+}\n+\n+static void freePathForFd() {\n+\tfree (pidpaths);\n+\tpidpaths = NULL;\n+\tpidpathn = 0;\n+}\n+\n+static void parseEvent(FileMonitor *fm, struct inotify_event *ie, FileMonitorEvent *ev) {\n \tstatic char absfile[PATH_MAX];\n \tev->type = FSE_INVALID;\n-\tif (i->mask & IN_ACCESS) {\n+\tif (ie->mask & IN_ACCESS) {\n+\t\tif (ie->mask & IN_ISDIR) {\n+\t\t\treturn;\n+\t\t}\n \t\tev->type = FSE_STAT_CHANGED;\n-\t} else if (i->mask & IN_MODIFY) {\n+\t} else if (ie->mask & IN_MODIFY) {\n \t\tev->type = FSE_CONTENT_MODIFIED;\n-\t} else if (i->mask & IN_ACCESS) {\n-\t\tev->type = FSE_STAT_CHANGED; \/\/ XXX\n-\t} else if (i->mask & IN_ATTRIB) {\n+\t} else if (ie->mask & IN_ATTRIB) {\n \t\tev->type = FSE_STAT_CHANGED;\n-\t} else if (i->mask & IN_OPEN) {\n+\t} else if (ie->mask & IN_OPEN) {\n+\t\tif (ie->mask & IN_ISDIR) {\n+\t\t\treturn;\n+\t\t}\n \t\tev->type = FSE_OPEN;\n-\t} else if (i->mask & IN_CREATE) {\n-\t\tev->type = (i->mask & IN_ISDIR)\n+\t} else if (ie->mask & IN_CREATE) {\n+\t\tev->type = (ie->mask & IN_ISDIR)\n \t\t\t? FSE_CREATE_DIR\n \t\t\t: FSE_CREATE_FILE;\n-\t} else if (i->mask & IN_DELETE) {\n+\t} else if (ie->mask & IN_DELETE) {\n \t\tev->type = FSE_DELETE;\n-\t} else if (i->mask & IN_DELETE_SELF) {\n+\t} else if (ie->mask & IN_DELETE_SELF) {\n \t\tev->type = FSE_DELETE;\n-\t} else if (i->mask & IN_MOVE_SELF) {\n+\t} else if (ie->mask & IN_MOVE_SELF) {\n \t\tev->type = FSE_RENAME;\n-\t} else if (i->mask & IN_MOVED_FROM) {\n+\t} else if (ie->mask & IN_MOVED_FROM) {\n \t\tev->type = FSE_RENAME;\n-\t} else if (i->mask & IN_MOVED_TO) {\n+\t} else if (ie->mask & IN_MOVED_TO) {\n \t\tev->type = FSE_RENAME;\n \t}\n \t#if 0\n@@ -243,17 +309,54 @@\n \tif (i->mask & IN_Q_OVERFLOW) printf(\"IN_Q_OVERFLOW \");\n \tif (i->mask & IN_UNMOUNT) printf(\"IN_UNMOUNT \");\n \t#endif\n-\tif (i->len > 0) {\n-\t\tif (i->name && fm->root && *fm->root) {\n-\t\t\tsnprintf (absfile, sizeof (absfile), \"%s\/%s\", fm->root, i->name);\n+\tif (ie->len > 0) {\n+\t\tif (ie->name && fm->root && *fm->root) {\n+\t\t\tconst char *root = getPathForFd (ie->wd);\n+\t\t\tsnprintf (absfile, sizeof (absfile), \"%s\/%s\", root, ie->name);\n \t\t} else {\n-\t\t\tif (i->name)\n-\t\t\t\tsnprintf (absfile, sizeof (absfile), \"%s\", i->name);\n+\t\t\tif (ie->name) {\n+\t\t\t\tsnprintf (absfile, sizeof (absfile), \"%s\", ie->name);\n+\t\t\t}\n \t\t}\n \t\tev->file = absfile;\n+\t\tif (ev->type == FSE_CREATE_DIR) {\n+\t\t\tint wd = inotify_add_watch (fd, ev->file, IN_ALL_EVENTS);\n+\t\t\tsetPathForFd (wd, ev->file);\n+\t\t}\n \t} else {\n \t\tev->file = \".\"; \/\/ directory itself\n \t}\n+}\n+\n+static void fm_inotify_add_dirtree(int fd, const char *name) {\n+\tstruct dirent *entry;\n+\tchar path[1024];\n+\tDIR *dir;\n+\n+\tif (!(dir = opendir (name))) {\n+\t\treturn;\n+\t}\n+\tif (!(entry = readdir (dir))) {\n+\t\treturn;\n+\t}\n+\t\/\/eprintf (\"Monitor %s\\n\", name);\n+\tint wd = inotify_add_watch (fd, name, IN_ALL_EVENTS);\n+\tsetPathForFd (wd, name);\n+\tdo {\n+\t\tif (entry->d_type == DT_DIR) {\n+\t\t\tif (!strcmp (entry->d_name, \".\") || !strcmp (entry->d_name, \"..\")) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tpath[0] = 0;\n+\t\t\tint len = snprintf (path, sizeof (path) - 1, \"%s\/%s\", name, entry->d_name);\n+\t\t\tif (len < 1) {\n+\t\t\t\tpath[sizeof (path) - 1] = 0;\n+\t\t\t}\n+\t\t\tpath[len] = 0;\n+\t\t\tfm_inotify_add_dirtree (fd, path);\n+\t\t}\n+\t} while ((entry = readdir (dir)));\n+\tclosedir (dir);\n }\n \n static bool fm_begin (FileMonitor *fm) {\n@@ -263,21 +366,20 @@\n \t\treturn (rc == 1);\n \t}\n #endif\n-\teprintf (\"Warning: inotify can't monitor subdirectories\\n\");\n \tfm->control_c = fm_control_c;\n \tfd = inotify_init ();\n \tif (fd == -1) {\n \t\tperror (\"inotify_init\");\n \t\treturn false;\n \t}\n-\tinotify_add_watch (fd, fm->root? fm->root: \".\", IN_ALL_EVENTS);\n+\tfm_inotify_add_dirtree (fd, fm->root? fm->root: \".\");\n \treturn true;\n }\n \n static bool fm_loop (FileMonitor *fm, FileMonitorCallback cb) {\n \tchar buf[BUF_LEN] __attribute__ ((aligned(8)));\n \tstruct inotify_event *event;\n-\tFileMonitorEvent ev = {0};\n+\tFileMonitorEvent ev = { 0 };\n \tint c;\n \tchar *p;\n #if HAVE_FANOTIFY\n@@ -287,11 +389,16 @@\n #endif\n \tfor (; fm->running; ) {\n \t\tc = read (fd, buf, BUF_LEN);\n-\t\tif (c < 1) return false;\n+\t\tif (c < 1) {\n+\t\t\tinvalidPathForFd (fd);\n+\t\t\treturn 0;\n+\t\t}\n \t\tfor (p = buf; p < buf + c; ) {\n \t\t\tevent = (struct inotify_event *) p;\n \t\t\tparseEvent (fm, event, &ev);\n-\t\t\tif (ev.type != -1) cb (fm, &ev);\n+\t\t\tif (ev.type != -1 && ev.file) {\n+\t\t\t\tcb (fm, &ev);\n+\t\t\t}\n \t\t\tmemset (&ev, 0, sizeof (ev));\n \t\t\tp += sizeof (struct inotify_event) + event->len;\n \t\t}\n@@ -312,6 +419,7 @@\n \tFMCLOSE (fan_fd);\n #endif\n \tFMCLOSE (fd);\n+\tfreePathForFd ();\n \treturn done;\n }\n \n"} {"commit":"cbd40f8357437a15c653cb8cccd7124a1bb55ae2","subject":"type can be null","message":"type can be null\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@134601 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Bitcode\/Reader\/BitcodeReader.h\n+++ lib\/Bitcode\/Reader\/BitcodeReader.h\n@@ -212,7 +212,7 @@\n private:\n const Type *getTypeByID(unsigned ID, bool isTypeTable = false);\n Value *getFnValueByID(unsigned ID, const Type *Ty) {\n- if (Ty->isMetadataTy())\n+ if (Ty && Ty->isMetadataTy())\n return MDValueList.getValueFwdRef(ID);\n return ValueList.getValueFwdRef(ID, Ty);\n }\n"} {"commit":"8c6bb486b8f19f6f0a4739c30e5ea54308feb82d","subject":"Don't use struct timezone.","message":"Don't use struct timezone.\n\nThe timezone structure acquired by gettimeofday() is not used at all.\nJust remove it.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/libalias\/alias_db.c\n+++ sys\/netinet\/libalias\/alias_db.c\n@@ -2181,7 +2181,6 @@\n \tint i, n;\n #ifndef\t_KERNEL\n \tstruct timeval tv;\n-\tstruct timezone tz;\n #endif\n \n \tLIBALIAS_LOCK_ASSERT(la);\n@@ -2193,7 +2192,7 @@\n #ifdef\t_KERNEL\n \tla->timeStamp = time_uptime;\n #else\n-\tgettimeofday(&tv, &tz);\n+\tgettimeofday(&tv, NULL);\n \tla->timeStamp = tv.tv_sec;\n #endif\n \n@@ -2488,7 +2487,6 @@\n \tint i;\n #ifndef\t_KERNEL\n \tstruct timeval tv;\n-\tstruct timezone tz;\n #endif\n \n \tif (la == NULL) {\n@@ -2506,7 +2504,7 @@\n \t\tla->timeStamp = time_uptime;\n \t\tla->lastCleanupTime = time_uptime;\n #else\n-\t\tgettimeofday(&tv, &tz);\n+\t\tgettimeofday(&tv, NULL);\n \t\tla->timeStamp = tv.tv_sec;\n \t\tla->lastCleanupTime = tv.tv_sec;\n #endif\n"} {"commit":"b79802789d3385e8c97eb3a4aa378ca0a7f92ad5","subject":"GtkFontChooser: Iterate over faces as well as families to list them","message":"GtkFontChooser: Iterate over faces as well as families to list them\n","repos":"ebassi\/gtk,ebassi\/gtk,Adamovskiy\/gtk,jigpu\/gtk,ahodesuka\/gtk,bratsche\/gtk-,jadahl\/gtk,davidt\/gtk,jadahl\/gtk,grubersjoe\/adwaita,jigpu\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,davidt\/gtk,Distrotech\/gtk2,ebassi\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,jessevdk\/gtk,Distrotech\/gtk2,bratsche\/gtk-,davidgumberg\/gtk,chergert\/gtk,jessevdk\/gtk,jadahl\/gtk,bratsche\/gtk-,ebassi\/gtk,davidt\/gtk,Lyude\/gtk-,bratsche\/gtk-,jadahl\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,jigpu\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,chergert\/gtk,ebassi\/gtk,chergert\/gtk,jessevdk\/gtk,jessevdk\/gtk,Lyude\/gtk-,jigpu\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,msteinert\/gtk,davidgumberg\/gtk,Lyude\/gtk-,alexlarsson\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,chergert\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,jigpu\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,jigpu\/gtk,grubersjoe\/adwaita,msteinert\/gtk,Distrotech\/gtk2,jadahl\/gtk,ahodesuka\/gtk,msteinert\/gtk,ahodesuka\/gtk,bratsche\/gtk-,Sidnioulz\/SandboxGtk,msteinert\/gtk,bratsche\/gtk-,chergert\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,Distrotech\/gtk2,chergert\/gtk,chergert\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,Lyude\/gtk-,msteinert\/gtk,Lyude\/gtk-,jessevdk\/gtk,davidt\/gtk,Adamovskiy\/gtk,davidt\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,Distrotech\/gtk2,davidgumberg\/gtk,jessevdk\/gtk,chergert\/gtk,jigpu\/gtk,jadahl\/gtk,msteinert\/gtk,Lyude\/gtk-,jadahl\/gtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,davidt\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkfontchooser.c\n+++ gtk\/gtkfontchooser.c\n@@ -131,7 +131,7 @@\n #define FONT_STYLE_LIST_WIDTH\t170\n #define FONT_SIZE_LIST_WIDTH\t60\n \n-#define ROW_FORMAT_STRING \"<span size=\\\"small\\\" foreground=\\\"%s\\\">%s %s<\/span>\\n<span>%s<\/span>\"\n+#define ROW_FORMAT_STRING \"<span foreground=\\\"%s\\\">%s %s<\/span>\\n<span font_desc=\\\"%s\\\">%s<\/span>\"\n \n \/* These are what we use as the standard font sizes, for the size list.\n *\/\n@@ -393,7 +393,7 @@\n GtkListStore *model;\n PangoFontFamily *match_family;\n PangoFontFamily **families;\n- gint n_families, n_faces, i, j;\n+ gint n_families, i;\n GtkTreeIter match_row;\n GString *tmp = g_string_new (NULL);\n const gchar* row_format = ROW_FORMAT_STRING;\n@@ -407,32 +407,53 @@\n qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);\n \n gtk_list_store_clear (model);\n+ \n+ \/* FIXME: Get theme color here *\/\n \n for (i=0; i<n_families; i++)\n {\n- const gchar *name = pango_font_family_get_name (families[i]);\n- GtkTreeIter iter;\n+ GtkTreeIter iter;\n+ PangoFontFace **faces;\n+ int j, n_faces;\n+ const gchar *fam_name = pango_font_family_get_name (families[i]);\n+\n+ pango_font_family_list_faces (families[i], &faces, &n_faces);\n \n- \/* foreground_color, default family, face, family, desc, sample string *\/\n- g_string_printf (tmp, ROW_FORMAT_STRING,\n- \"darkgrey\",\n- \"sans\", \/* FIXME: This has to be the global font *\/\n- \"Regular\",\n- PREVIEW_TEXT);\n- \n-\n- gtk_list_store_append (model, &iter);\n- gtk_list_store_set (model, &iter,\n- FAMILY_COLUMN, families[i],\n- FAMILY_NAME_COLUMN, name,\n- TEXT_COLUMN, tmp->str,\n- -1);\n-\n- if (i == 0 || !g_ascii_strcasecmp (name, \"sans\"))\n+ for (j=0; j<n_faces; j++)\n {\n- match_family = families[i];\n- match_row = iter;\n+ PangoFontDescription *pango_desc = pango_font_face_describe (faces[j]);\n+ const gchar *face_name = pango_font_face_get_face_name (faces[j]);\n+ gchar *font_desc = pango_font_description_to_string (pango_desc);\n+ \n+ \/* foreground_color, family_name, face_name, desc, sample string *\/\n+ g_string_printf (tmp, ROW_FORMAT_STRING,\n+ \"darkgrey\", \/* FIXME: This has to be a theme color *\/\n+ fam_name,\n+ face_name,\n+ font_desc,\n+ PREVIEW_TEXT);\n+\n+\n+ gtk_list_store_append (model, &iter);\n+ gtk_list_store_set (model, &iter,\n+ FAMILY_COLUMN, families[i],\n+ FACE_COLUMN, faces[j],\n+ FAMILY_NAME_COLUMN, fam_name,\n+ TEXT_COLUMN, tmp->str,\n+ -1);\n+\n+ if ((i == 0 && j == 0) ||\n+ (!g_ascii_strcasecmp (face_name, \"sans\") && j == 0))\n+ {\n+ match_family = families[i];\n+ match_row = iter;\n+ }\n+\n+ pango_font_description_free(pango_desc);\n+ g_free (font_desc);\n }\n+\n+ g_free (faces);\n }\n \n set_cursor_to_iter (treeview, &match_row);\n@@ -460,7 +481,6 @@\n col = gtk_tree_view_column_new_with_attributes (\"Family\",\n gtk_cell_renderer_text_new (),\n \"markup\", TEXT_COLUMN,\n- \"font\", FAMILY_NAME_COLUMN,\n NULL);\n gtk_tree_view_append_column (treeview, col);\n \n"} {"commit":"1c6a819ee593a64412bb94a9c97528e990952c94","subject":"Network: Properly compare IPv6 Addresses mapped into IPv4","message":"Network: Properly compare IPv6 Addresses mapped into IPv4\n\nSigned-off-by: Guilherme Iscaro <cb2533f884a82b148f26e9601523457e695503d6@intel.com>\n","repos":"edersondisouza\/soletta,wzhen12\/soletta,lpereira\/soletta,wzhen12\/soletta,edersondisouza\/soletta,dorileo\/soletta,bsmelo\/soletta,lpereira\/soletta,wzhen12\/soletta,wzhen12\/soletta,dorileo\/soletta,wzhen12\/soletta,lpereira\/soletta,lpereira\/soletta,dorileo\/soletta,lpereira\/soletta,edersondisouza\/soletta,dorileo\/soletta,edersondisouza\/soletta,bsmelo\/soletta,bsmelo\/soletta,edersondisouza\/soletta,bsmelo\/soletta,bsmelo\/soletta,wzhen12\/soletta,bsmelo\/soletta,edersondisouza\/soletta,dorileo\/soletta,dorileo\/soletta","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib\/comms\/include\/sol-network.h\n+++ src\/lib\/comms\/include\/sol-network.h\n@@ -24,6 +24,7 @@\n #include <sol-vector.h>\n #include <sol-str-slice.h>\n #include <sol-buffer.h>\n+#include <sol-util.h>\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -234,31 +235,66 @@\n sol_network_link_addr_eq(const struct sol_network_link_addr *a,\n const struct sol_network_link_addr *b)\n {\n- const uint8_t *addr_a, *addr_b;\n size_t bytes;\n \n- if (a->family != b->family)\n- return false;\n-\n- if (a->family == SOL_NETWORK_FAMILY_INET) {\n- addr_a = a->addr.in;\n- addr_b = b->addr.in;\n+ if (a->family == b->family) {\n+ const uint8_t *addr_a, *addr_b;\n+\n+ if (a->family == SOL_NETWORK_FAMILY_INET) {\n+ addr_a = a->addr.in;\n+ addr_b = b->addr.in;\n+ bytes = sizeof(a->addr.in);\n+ } else if (a->family == SOL_NETWORK_FAMILY_INET6) {\n+ addr_a = a->addr.in6;\n+ addr_b = b->addr.in6;\n+ bytes = sizeof(a->addr.in6);\n+ } else if (a->family == SOL_NETWORK_FAMILY_BLUETOOTH) {\n+ if (a->addr.bt_type != b->addr.bt_type)\n+ return false;\n+\n+ addr_a = a->addr.bt_addr;\n+ addr_b = b->addr.bt_addr;\n+ bytes = sizeof(a->addr.bt_addr);\n+ } else\n+ return false;\n+ return !memcmp(addr_a, addr_b, bytes);\n+ }\n+\n+ if ((a->family == SOL_NETWORK_FAMILY_INET &&\n+ b->family == SOL_NETWORK_FAMILY_INET6) ||\n+ (a->family == SOL_NETWORK_FAMILY_INET6 &&\n+ b->family == SOL_NETWORK_FAMILY_INET)) {\n+\n+ struct ipv6_map_prefix {\n+ const uint8_t zeroes[10];\n+ const uint16_t ones;\n+ } __attribute__ ((packed)) prefix = {\n+ { 0 }, sol_util_be16_to_cpu(0xffff)\n+ };\n+ const uint8_t *addr_ipv6, *addr_ipv4;\n+\n+\n+ if (a->family == SOL_NETWORK_FAMILY_INET6) {\n+ addr_ipv6 = a->addr.in6;\n+ addr_ipv4 = b->addr.in;\n+ } else {\n+ addr_ipv6 = b->addr.in6;\n+ addr_ipv4 = a->addr.in;\n+ }\n+\n bytes = sizeof(a->addr.in);\n- } else if (a->family == SOL_NETWORK_FAMILY_INET6) {\n- addr_a = a->addr.in6;\n- addr_b = b->addr.in6;\n- bytes = sizeof(a->addr.in6);\n- } else if (a->family == SOL_NETWORK_FAMILY_BLUETOOTH) {\n- if (a->addr.bt_type != b->addr.bt_type)\n- return false;\n-\n- addr_a = a->addr.bt_addr;\n- addr_b = b->addr.bt_addr;\n- bytes = sizeof(a->addr.bt_addr);\n- } else\n- return false;\n-\n- return !memcmp(addr_a, addr_b, bytes);\n+\n+ \/**\n+ * An IPv6 is Mapped into v4 when:\n+ * First 80 bits are zero\n+ * The next 16 bits are 0xffff\n+ *\/\n+ if (!memcmp(addr_ipv6, &prefix, sizeof(struct ipv6_map_prefix)) &&\n+ !memcmp(addr_ipv6 + 12, addr_ipv4, bytes))\n+ return true;\n+ }\n+\n+ return false;\n }\n \n \/**\n"} {"commit":"1080e4ad5c680f3bd71c41cf6030160f16cbbd26","subject":"use snd_pcm_hw_params_set_rate_near()","message":"use snd_pcm_hw_params_set_rate_near()\n","repos":"i-rinat\/apulse,i-rinat\/apulse","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/apulse-stream.c\n+++ src\/apulse-stream.c\n@@ -137,6 +137,7 @@\n snd_pcm_hw_params_t *hw_params;\n snd_pcm_sw_params_t *sw_params;\n int dir;\n+ unsigned int rate;\n const char *dev_name;\n \n switch (stream_direction) {\n@@ -155,7 +156,10 @@\n CHECK_A(snd_pcm_hw_params_any, (s->ph, hw_params));\n CHECK_A(snd_pcm_hw_params_set_access, (s->ph, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED));\n CHECK_A(snd_pcm_hw_params_set_format, (s->ph, hw_params, pa_format_to_alsa(s->ss.format)));\n- CHECK_A(snd_pcm_hw_params_set_rate, (s->ph, hw_params, s->ss.rate, 0));\n+ CHECK_A(snd_pcm_hw_params_set_rate_resample, (s->ph, hw_params, 1));\n+ rate = s->ss.rate;\n+ dir = 0;\n+ CHECK_A(snd_pcm_hw_params_set_rate_near, (s->ph, hw_params, &rate, &dir));\n CHECK_A(snd_pcm_hw_params_set_channels, (s->ph, hw_params, s->ss.channels));\n \n unsigned int period_time = 20 * 1000;\n"} {"commit":"0a3463391406ca95b5c5538c7b777ae7e82effe5","subject":"GtkScaleButton: Set +\/- sensitivity","message":"GtkScaleButton: Set +\/- sensitivity\n\nThe buttons should go insensitive when we are at their end of\nthe scale.\n","repos":"ahodesuka\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,chergert\/gtk,jigpu\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,jigpu\/gtk,Adamovskiy\/gtk,jigpu\/gtk,Adamovskiy\/gtk,chergert\/gtk,alexlarsson\/gtk,Lyude\/gtk-,davidgumberg\/gtk,jadahl\/gtk,jigpu\/gtk,jessevdk\/gtk,ahodesuka\/gtk,jadahl\/gtk,chergert\/gtk,davidgumberg\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,jadahl\/gtk,Adamovskiy\/gtk,jadahl\/gtk,alexlarsson\/gtk,chergert\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,davidgumberg\/gtk,jadahl\/gtk,Lyude\/gtk-,jigpu\/gtk,jessevdk\/gtk,alexlarsson\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,chergert\/gtk,Lyude\/gtk-,jadahl\/gtk,alexlarsson\/gtk,Lyude\/gtk-,chergert\/gtk,alexlarsson\/gtk,jessevdk\/gtk,Lyude\/gtk-,ahodesuka\/gtk,chergert\/gtk,jigpu\/gtk,jigpu\/gtk,chergert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,davidgumberg\/gtk,davidgumberg\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,jadahl\/gtk,Lyude\/gtk-,ahodesuka\/gtk,jadahl\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,jessevdk\/gtk,jessevdk\/gtk,jigpu\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkscalebutton.c\n+++ gtk\/gtkscalebutton.c\n@@ -1040,10 +1040,16 @@\n {\n GtkScaleButton *button = user_data;\n gdouble value;\n+ gdouble upper, lower;\n \n value = gtk_range_get_value (range);\n+ upper = gtk_adjustment_get_upper (button->priv->adjustment);\n+ lower = gtk_adjustment_get_lower (button->priv->adjustment);\n \n gtk_scale_button_update_icon (button);\n+\n+ gtk_widget_set_sensitive (button->priv->plus_button, value < upper);\n+ gtk_widget_set_sensitive (button->priv->minus_button, lower < value);\n \n g_signal_emit (button, signals[VALUE_CHANGED], 0, value);\n g_object_notify (G_OBJECT (button), \"value\");\n"} {"commit":"388f9005832e82fa224bbbe8ebdaa70e725b4893","subject":"fix a null deref","message":"fix a null deref\n\n\ngit-svn-id: ea5ea25908b0b363893e799f51beeda82c91f594@64985 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/edbus,jordemort\/edbus","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/connman\/e_connman_element.c\n+++ src\/lib\/connman\/e_connman_element.c\n@@ -178,27 +178,17 @@\n static void\n _e_connman_element_listeners_call_do(E_Connman_Element *element)\n {\n- E_Connman_Element_Listener *l, **shadow;\n- unsigned int i, count;\n+ E_Connman_Element_Listener *l;\n+ Eina_Inlist *x;\n \n \/* NB: iterate on a copy in order to allow listeners to be deleted\n * from callbacks. number of listeners should be small, so the\n * following should do fine.\n *\/\n- count = eina_inlist_count(element->_listeners);\n- if (count < 1)\n- goto end;\n-\n- shadow = alloca(sizeof(*shadow) * count);\n- if (!shadow)\n- goto end;\n-\n- i = 0;\n- EINA_INLIST_FOREACH(element->_listeners, l)\n- shadow[i++] = l;\n-\n- for (i = 0; i < count; i++)\n- shadow[i]->cb(shadow[i]->data, element);\n+ if (eina_inlist_count(element->_listeners) < 1) goto end;\n+\n+ EINA_INLIST_FOREACH_SAFE(element->_listeners, x, l)\n+ l->cb(l->data, element);\n \n end:\n e_connman_element_event_add(E_CONNMAN_EVENT_ELEMENT_UPDATED, element);\n"} {"commit":"b39109fab910d60eed7835a83021d01bbb1784a7","subject":"validate well-formedness of array\/hash","message":"validate well-formedness of array\/hash\n","repos":"mongodb\/bson-ruby,mongodb\/bson-ruby,mongodb\/bson-ruby,mongodb\/bson-ruby","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ext\/bson\/bson_native.c\n+++ ext\/bson\/bson_native.c\n@@ -109,6 +109,7 @@\n static VALUE pvt_read_field(byte_buffer_t *b, VALUE rb_buffer, uint8_t type);\n static void pvt_replace_int32(byte_buffer_t *b, int32_t position, int32_t newval);\n static void pvt_skip_cstring(byte_buffer_t *b);\n+static void pvt_validate_length(byte_buffer_t *b);\n \n \n static void pvt_put_field(byte_buffer_t *b, VALUE rb_buffer, VALUE val, VALUE validating_keys);\n@@ -694,9 +695,8 @@\n VALUE cDocument = rb_const_get(rb_const_get(rb_cObject, rb_intern(\"BSON\")), rb_intern(\"Document\"));\n TypedData_Get_Struct(self, byte_buffer_t, &rb_byte_buffer_data_type, b);\n \n- \/* skip length *\/\n- ENSURE_BSON_READ(b, 4);\n- b->read_position += 4;\n+ pvt_validate_length(b);\n+\n doc = rb_funcall(cDocument, rb_intern(\"allocate\"),0);\n \n ENSURE_BSON_READ(b, 1);\n@@ -715,12 +715,12 @@\n byte_buffer_t *b;\n VALUE array = Qnil;\n char type;\n- int32_t length_in_bytes;\n- TypedData_Get_Struct(self, byte_buffer_t, &rb_byte_buffer_data_type, b);\n-\n- ENSURE_BSON_READ(b, 4);\n+\n+ TypedData_Get_Struct(self, byte_buffer_t, &rb_byte_buffer_data_type, b);\n+\n+ pvt_validate_length(b);\n+\n array = rb_ary_new();\n- length_in_bytes = pvt_get_int32(b);\n ENSURE_BSON_READ(b, 1);\n while((type = (uint8_t)*READ_PTR(b)) != 0){\n b->read_position += 1;\n@@ -916,6 +916,26 @@\n memcpy(WRITE_PTR(b), &i64, 8);\n b->write_position += 8;\n \n+}\n+\n+\/**\n+ * validate the buffer contains the amount of bytes the array \/ hash claimns\n+ * and that it is null terminated\n+ *\/\n+void pvt_validate_length(byte_buffer_t *b)\n+{\n+ int32_t length;\n+ \n+ ENSURE_BSON_READ(b, 4);\n+ memcpy(&length, READ_PTR(b), 4);\n+ length = BSON_UINT32_TO_LE(length);\n+\n+ ENSURE_BSON_READ(b, length);\n+\n+ if( *(READ_PTR(b) + length) != 0 ){\n+ rb_raise(rb_eRangeError, \"Buffer should have contained null terminator at %zu but contained %c\", b->read_position + (size_t)length, *(READ_PTR(b) + length));\n+ }\n+ b->read_position += 4;\n }\n \n \/**\n"} {"commit":"c7908a45f7745b57a263c853b4577d1ee8daebaf","subject":"Merging COMP_TYPE_AMOUNT into fileCompression enum","message":"Merging COMP_TYPE_AMOUNT into fileCompression enum\n\nApparently, this is the 'good practice' way. Enums start at 0 as per the\nstandard, so this is safe.\n","repos":"Clownacy\/CaptainPlaneEd,Clownacy\/CaptainPlaneEd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- TxtRead.h\n+++ TxtRead.h\n@@ -4,15 +4,14 @@\n #include <cstdio>\n #include <cstring>\n \n-#define COMP_TYPE_AMOUNT 5\n-\n \/* compression types *\/\n typedef enum {\n-\tNONE = 0,\n-\tENIGMA = 1,\n-\tKOSINSKI = 2,\n-\tNEMESIS = 3,\n-\tKIDCHAMELEON = 4,\n+\tNONE,\n+\tENIGMA,\n+\tKOSINSKI,\n+\tNEMESIS,\n+\tKIDCHAMELEON,\n+\tCOMP_TYPE_AMOUNT,\n \tINVALID = -1\n } fileCompression;\n \n"} {"commit":"a3eec4f2d6621c87ad2019ea953c05a5c0fe0944","subject":"Update RingRayLib - raylib.c - Add Function : void SetMusicVolume(Music music, float volume)","message":"Update RingRayLib - raylib.c - Add Function : void SetMusicVolume(Music music, float volume)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d78c6bfde99069fbac0bf8adba738e44fe12b1c0","subject":"\u4fee\u6b63 i64_load32_s \u6307\u6a19\u578b\u5225\u932f\u8aa4","message":"\u4fee\u6b63 i64_load32_s \u6307\u6a19\u578b\u5225\u932f\u8aa4\n","repos":"LuisHsu\/WasmVM,LuisHsu\/WasmVM,LuisHsu\/WasmVM","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib\/core\/runtime\/i64_load32_s.c\n+++ src\/lib\/core\/runtime\/i64_load32_s.c\n@@ -17,7 +17,7 @@\n return -1;\n }\n \n- int32_t *data = (int32_t)((uint8_t*)memory->data->data + ea);\n+ int32_t *data = (int32_t*)((uint8_t*)memory->data->data + ea);\n \n push_Value(stack, new_i64Value((int64_t)*data));\n \n"} {"commit":"6f5246b9ec309cc9c6d9cb48df1f55d8e2b0baa1","subject":"Update copyright date.","message":"Update copyright date.\n","repos":"antek-drzewiecki\/passenger,antek-drzewiecki\/passenger,jawj\/passenger,jawj\/passenger,kewaunited\/passenger,jawj\/passenger,phusion\/passenger,bf4\/passenger,antek-drzewiecki\/passenger,kewaunited\/passenger,antek-drzewiecki\/passenger,phusion\/passenger,clemensg\/passenger,cgvarela\/passenger,bf4\/passenger,jawj\/passenger,bf4\/passenger,kewaunited\/passenger,cgvarela\/passenger,bf4\/passenger,jawj\/passenger,cgvarela\/passenger,clemensg\/passenger,clemensg\/passenger,cgvarela\/passenger,cgvarela\/passenger,pkmiec\/passenger,antek-drzewiecki\/passenger,bf4\/passenger,kewaunited\/passenger,phusion\/passenger,kewaunited\/passenger,phusion\/passenger,phusion\/passenger,phusion\/passenger,jawj\/passenger,jawj\/passenger,clemensg\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,kewaunited\/passenger,cgvarela\/passenger,clemensg\/passenger,kewaunited\/passenger,pkmiec\/passenger,bf4\/passenger,antek-drzewiecki\/passenger,antek-drzewiecki\/passenger,pkmiec\/passenger,clemensg\/passenger,pkmiec\/passenger,pkmiec\/passenger,pkmiec\/passenger,phusion\/passenger,cgvarela\/passenger,bf4\/passenger,cgvarela\/passenger,clemensg\/passenger,phusion\/passenger,kewaunited\/passenger,pkmiec\/passenger","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/common\/SafeLibev.h\n+++ ext\/common\/SafeLibev.h\n@@ -1,6 +1,6 @@\n \/*\n * Phusion Passenger - http:\/\/www.modrails.com\/\n- * Copyright (c) 2010 Phusion\n+ * Copyright (c) 2010, 2011 Phusion\n *\n * \"Phusion Passenger\" is a trademark of Hongli Lai & Ninh Bui.\n *\n"} {"commit":"0c5d43135059ed9386782e12f4499038ca02e2e5","subject":"Add Arm BF16 support for Apple platforms (#104)","message":"Add Arm BF16 support for Apple platforms (#104)\n\nCo-authored-by: Developer-Ecosystem-Engineering <67526d3877593388ce0e24470d57906696666e79@users.noreply.github.com>","repos":"Maratyszcza\/cpuinfo,pytorch\/cpuinfo,pytorch\/cpuinfo,pytorch\/cpuinfo,Maratyszcza\/cpuinfo,Maratyszcza\/cpuinfo,Maratyszcza\/cpuinfo,pytorch\/cpuinfo","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/arm\/mach\/init.c\n+++ src\/arm\/mach\/init.c\n@@ -366,6 +366,11 @@\n \t\t\tcpuinfo_isa.dot = true;\n \t}\n \n+\tconst uint32_t has_FEAT_BF16 = get_sys_info_by_name(\"hw.optional.arm.FEAT_BF16\");\n+\tif (has_FEAT_BF16 != 0) {\n+\t\tcpuinfo_isa.bf16 = true;\n+\t}\n+\n \tuint32_t num_clusters = 1;\n \tfor (uint32_t i = 0; i < mach_topology.cores; i++) {\n \t\tcores[i] = (struct cpuinfo_core) {\n"} {"commit":"50712289b617fa4f856544365526dcf360951403","subject":"Removing unnecessary information; it's not clarifying things.","message":"Removing unnecessary information; it's not clarifying things.\n\ngit-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@537 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n","repos":"wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- base\/basictypes.h\n+++ base\/basictypes.h\n@@ -330,9 +330,6 @@\n \/\/ If pos is large enough, \"pos + N\" may overflow. For example,\n \/\/ pos==0xfffff000 and N==1MB.\n \/\/\n-\/\/ This often happens on Nacona's in 32-bit mode, because the\n-\/\/ main thread's stack is put very close to address 0xffffffff.\n-\/\/\n \/\/ PointerRangeSize(a,b) returns the size of the range [a,b-1]\n inline size_t PointerRangeSize(const char* start, const char* end) {\n assert(start <= end);\n"} {"commit":"064ebc702d5a0c31d75b62c1b65c7bb9148152cd","subject":"Version bump to 0.2.3","message":"Version bump to 0.2.3\n","repos":"glibersat\/firmware,glibersat\/firmware,BrewPi\/firmware,glibersat\/firmware,BrewPi\/firmware,glibersat\/firmware,glibersat\/firmware,BrewPi\/firmware,etk29321\/firmware,etk29321\/firmware,BrewPi\/firmware,etk29321\/firmware,glibersat\/firmware,BrewPi\/firmware,glibersat\/firmware,etk29321\/firmware,etk29321\/firmware,BrewPi\/firmware,BrewPi\/firmware,BrewPi\/firmware,etk29321\/firmware","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- Version.h\n+++ Version.h\n@@ -20,7 +20,7 @@\n #ifndef VERSION_H_\n #define VERSION_H_\n \n-#define VERSION_STRING \"0.2.2\"\n+#define VERSION_STRING \"0.2.3\"\n \n \n #endif \/* VERSION_H_ *\/\t"} {"commit":"4c9edd7f02afd765cc8353bb9f598a4885004f48","subject":"Update RingRayLib - raylib.c - Add Function : void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat)","message":"Update RingRayLib - raylib.c - Add Function : void SetShaderValueMatrix(Shader shader, int uniformLoc, Matrix mat)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b91c5a33b47fd80cbb7dc83e06dddb19fbb9b27d","subject":"Change API: TransWatcher: remove T(unsigned) function support","message":"Change API: TransWatcher: remove T(unsigned) function support\n","repos":"ziqin\/ArdComLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Watcher.h\n+++ Watcher.h\n@@ -80,8 +80,6 @@\n func(func) {}\n \n Variant value() override {\n- if (!func)\n- return Variant(null);\n return Variant(func(analogRead(thePin)));\n }\n \n@@ -94,48 +92,16 @@\n public:\n TransWatcher(const String& name, uint8_t pin, T (*func)(int)):\n AnalogWatcher(name, pin),\n- func(new IFunc(func)) {}\n-\n- TransWatcher(const String& name, uint8_t pin, T (*func)(unsigned)):\n- AnalogWatcher(name, pin),\n- func(new UFunc(func)) {}\n-\n- ~TransWatcher() {\n- delete func;\n- }\n+ func(func) {}\n \n Variant value() override {\n if (!func)\n return Variant(null);\n- return Variant((*func)(analogRead(thePin)));\n+ return Variant(func(analogRead(thePin)));\n }\n \n private:\n- class FuncBase {\n- public:\n- virtual T operator()(unsigned n) const = 0;\n- virtual ~FuncBase() = default;\n- } *func;\n-\n- class IFunc final: public FuncBase {\n- public:\n- IFunc(T (*func)(int)): func(func) {}\n- T operator()(unsigned n) const override {\n- return func(n);\n- }\n- private:\n- T (*func)(int);\n- };\n-\n- class UFunc final: public FuncBase {\n- public:\n- UFunc(T (*func)(unsigned)): func(func) {}\n- T operator()(unsigned n) const override {\n- return func(n);\n- }\n- private:\n- T (*func)(unsigned);\n- };\n+ T (*func)(int);\n };\n #endif\n \n"} {"commit":"5c79e9b8d0b018ebe6a0753ac871b7b7de4303f8","subject":"Add assert to ensure that the internal object is initialised","message":"Add assert to ensure that the internal object is initialised\n\nSigned-off-by: Krzysztof Wilczy\u0144ski <5f1c0be89013f8fde969a8dcb2fa1d522e94ee00@linux.com>\n","repos":"kwilczynski\/ruby-magic,kwilczynski\/ruby-magic","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ext\/magic\/ruby-magic.c\n+++ ext\/magic\/ruby-magic.c\n@@ -1344,6 +1344,9 @@\n \t\t\t\t E_NOT_ENOUGH_MEMORY);\n \t}\n \n+\tassert(mgc != NULL &&\n+\t \"Must be a valid pointer to `rb_mgc_object_t' type\");\n+\n \tmgc->cookie = NULL;\n \tmgc->mutex = Qundef;\n \tmgc->database_loaded = 0;\n"} {"commit":"10d524e09c93fb49cdf5deba279aab920ea38a37","subject":"Correct English in tp_dbus_tube_channel_offer_async()","message":"Correct English in tp_dbus_tube_channel_offer_async()\n","repos":"Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-glib\/dbus-tube-channel.c\n+++ telepathy-glib\/dbus-tube-channel.c\n@@ -564,7 +564,7 @@\n * @result: a #GAsyncResult\n * @error: a #GError to fill\n *\n- * Finishes to offer an outgoing D-Bus tube. The returned #GDBusConnection\n+ * Finishes offering an outgoing D-Bus tube. The returned #GDBusConnection\n * is ready to be used to exchange data through the tube.\n *\n * Returns: (transfer full): a reference on a #GDBusConnection if the tube\n"} {"commit":"4bbea2c3b98471d86330030de1898efb85686bd2","subject":"set kTRUE and kFALSE to true and flase and not 1 and 0.","message":"set kTRUE and kFALSE to true and flase and not 1 and 0.\n\n\ngit-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@10550 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"dawehner\/root,bbannier\/ROOT,dawehner\/root,bbannier\/ROOT,dawehner\/root,dawehner\/root,bbannier\/ROOT,dawehner\/root,bbannier\/ROOT,dawehner\/root,dawehner\/root,dawehner\/root,bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- base\/inc\/Rtypes.h\n+++ base\/inc\/Rtypes.h\n@@ -1,4 +1,4 @@\n-\/* @(#)root\/base:$Name: $:$Id: Rtypes.h,v 1.45 2004\/07\/30 19:09:51 brun Exp $ *\/\n+\/* @(#)root\/base:$Name: $:$Id: Rtypes.h,v 1.46 2004\/07\/30 23:46:34 rdm Exp $ *\/\n \n \/*************************************************************************\n * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *\n@@ -66,7 +66,7 @@\n #endif\n typedef float Float_t; \/\/Float 4 bytes (float)\n typedef double Double_t; \/\/Double 8 bytes\n-typedef double Double32_t; \/\/Double 8 bytes in memory, written as a Float 4 bytes \n+typedef double Double32_t; \/\/Double 8 bytes in memory, written as a 4 bytes float\n typedef char Text_t; \/\/General string (char)\n typedef bool Bool_t; \/\/Boolean (0=false, 1=true) (bool)\n typedef unsigned char Byte_t; \/\/Byte (8 bits) (unsigned char)\n@@ -82,7 +82,7 @@\n typedef unsigned long long ULong64_t; \/\/Portable unsigned long integer 8 bytes\n #endif\n \n-\/\/ There is several streamer concepts. \n+\/\/ There is several streamer concepts.\n class TClassStreamer; \/\/ Streamer functor for a class\n class TMemberStreamer; \/\/ Streamer functor for a data member\n typedef void (*ClassStreamerFunc_t)(TBuffer&, void*); \/\/ Streamer function for a class\n@@ -100,8 +100,8 @@\n #define NULL 0\n #endif\n \n-const Bool_t kTRUE = 1;\n-const Bool_t kFALSE = 0;\n+const Bool_t kTRUE = true;\n+const Bool_t kFALSE = false;\n \n const Int_t kMaxUShort = 65534;\n const Int_t kMaxShort = kMaxUShort >> 1;\n@@ -375,7 +375,7 @@\n }\n \n #if defined(__CINT__)\n-#define RootStreamer(name,STREAMER) \n+#define RootStreamer(name,STREAMER)\n #else\n #define RootStreamer(name,STREAMER) \\\n namespace ROOT { \\\n"} {"commit":"c3f6187d666b28723913eee67d025132f17f32ac","subject":"- Changed Surface#get_colorkey to Surface#colorkey to be consistent with Surface#alpha and Surface#set_alpha. - First attempt at documentation comments in RDoc format.","message":"- Changed Surface#get_colorkey to Surface#colorkey to be consistent with\n Surface#alpha and Surface#set_alpha.\n- First attempt at documentation comments in RDoc format.\n\n","repos":"firstval\/rubygame,singpolyma\/rubygame,Dami-coding\/rubygame,singpolyma\/rubygame,rubygame\/rubygame","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/rubygame\/surface.c\n+++ ext\/rubygame\/surface.c\n@@ -20,6 +20,36 @@\n #include \"rubygame.h\"\n \n \/* Surface class *\/\n+\n+\/* Rubygame::Surface.new(size, depth=nil, flags=0)\n+ *\n+ * Create and initialize a new Surface object. A display window must be set\n+ * using Rubygame::Display.set_mode before creating a surface.\n+ *\n+ * A Surface is a grid of image data which you blit (i.e. copy) onto other\n+ * Surfaces. Since the Rubygame display is also a Surface (see the Screen \n+ * class), this method can be used to show images on the screen.\n+ *\n+ * This function takes these arguments:\n+ * - size:: requested surface size; an array of the form +[width, height]+.\n+ * - depth:: color depth (bits per pixel) of the surface; defaults to the\n+ * depth of the Rubygame display.\n+ * - flags:: a bitwise OR'd ( | ) list of zero or more of the following flags\n+ * (located in the Rubygame module, e.g. Rubygame::SWSURFACE).\n+ * This argument may be omitted, in which case the Surface \n+ * will be a normal software surface (this is not necessarily a bad\n+ * thing).\n+ * - SWSURFACE:: (default) request a software surface.\n+ * - HWSURFACE:: request a hardware-accelerated surface (using a \n+ * graphics card), if available. Creates a software\n+ * surface if hardware surfaces are not available.\n+ * - SRCCOLORKEY:: request a colorkeyed surface. Surface#set_colorkey\n+ * will enable colorkey as needed. For a description\n+ * of colorkeys, see Surface#set_colorkey.\n+ * - SRCALPHA:: request an alpha channel. Surface#set_alpha will\n+ * also enable alpha. as needed. For a description of\n+ * alpha, see Surface#alpha.\n+ *\/\n VALUE rbgm_surface_new(int argc, VALUE *argv, VALUE class)\n {\n \tVALUE self;\n@@ -103,6 +133,12 @@\n \treturn self;\n }\n \n+\n+\/* Rubygame::Surface#width\n+ * Rubygame::Surface#w\n+ *\n+ * Return the width (in pixels) of the surface. \n+ *\/\n VALUE rbgm_surface_get_w(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -110,6 +146,11 @@\n \treturn INT2NUM(surf->w);\n }\n \n+\/* Rubygame::Surface#height\n+ * Rubygame::Surface#h\n+ *\n+ * Return the height (in pixels) of the surface. \n+ *\/\n VALUE rbgm_surface_get_h(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -117,6 +158,10 @@\n \treturn INT2NUM(surf->h);\n }\n \n+\/* Rubygame::Surface#size\n+ *\n+ * Return the surface's width and height (in pixels) in an Array.\n+ *\/\n VALUE rbgm_surface_get_size(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -124,6 +169,10 @@\n \treturn rb_ary_new3( 2, INT2NUM(surf->w), INT2NUM(surf->h) );\n }\n \n+\/* Rubygame::Surface#depth\n+ *\n+ * Return the color depth (in bits per pixel) of the surface.\n+ *\/\n VALUE rbgm_surface_get_depth(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -131,6 +180,10 @@\n \treturn INT2NUM(surf->format->BitsPerPixel);\n }\n \n+\/* Rubygame::Surface#flags\n+ *\n+ * Return any flags the surface was initialized with.\n+ *\/\n VALUE rbgm_surface_get_flags(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -138,6 +191,12 @@\n \treturn INT2NUM(surf->flags);\n }\n \n+\/* Rubygame::Surface#masks\n+ *\n+ * Return the color masks +[r,g,b,a]+ of the surface. Almost everyone will\n+ * not need to use this function. Color masks are used to separate an\n+ * integer representation of a color into its seperate channels.\n+ *\/\n VALUE rbgm_surface_get_masks(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -152,6 +211,11 @@\n \t\tINT2NUM(format->Amask));\n }\n \n+\/* Rubygame::Surface#alpha\n+ *\n+ * Return the per-surface alpha (opacity; non-transparency) of the surface.\n+ * It can range from 0 (full transparent) to 255 (full opaque).\n+ *\/\n VALUE rbgm_surface_get_alpha(VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -159,6 +223,18 @@\n \treturn INT2NUM(surf->format->alpha);\n }\n \n+\/* Rubygame::Surface#set_alpha(alpha, flags=Rubygame::SRC_ALPHA)\n+ *\n+ * Set the per-surface alpha (opacity; non-transparency) of the surface.\n+ *\n+ * This function takes these arguments:\n+ * - alpha:: requested opacity of the surface. Alpha must be from 0 \n+ * (fully transparent) to 255 (fully opaque).\n+ * - flags:: +0+ or Rubygame::SRC_ALPHA (default). Most people will want the\n+ * default, in which case this argument can be omitted. For advanced\n+ * users: this flag affects the surface as described in the docs for\n+ * the SDL C function, SDL_SetAlpha.\n+ *\/\n VALUE rbgm_surface_set_alpha(int argc, VALUE *argv, VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -187,6 +263,14 @@\n \treturn self;\n }\n \n+\/* Rubygame::Surface#colorkey\n+ *\n+ * Return the colorkey of the surface in the form +[r,g,b]+ (or +nil+ if there\n+ * is no key). The colorkey of a surface is the exact color which will be\n+ * ignored when the surface is blitted, effectively turning that color\n+ * transparent. This is often used to make a blue (for example) background\n+ * on an image seem transparent.\n+ *\/\n VALUE rbgm_surface_get_colorkey( VALUE self )\n {\n \tSDL_Surface *surf;\n@@ -201,6 +285,20 @@\n \treturn rb_ary_new3(3,INT2NUM(r),INT2NUM(g),INT2NUM(b));\n }\n \n+\/* Rubygame::Surface#set_colorkey(color,flags=0)\n+ *\n+ * Set the colorkey of the surface. See Surface#colorkey for a description\n+ * of colorkeys.\n+ *\n+ * This method takes these arguments:\n+ * - color:: color to use as the key, in the form +[r,g,b]+. Can be +nil+ to\n+ * un-set the colorkey.\n+ * - flags:: +0+ or Rubygame::SRC_COLORKEY (default) or \n+ * Rubygame::SRC_COLORKEY|Rubygame::SDL_RLEACCEL. Most people will \n+ * want the default, in which case this argument can be omitted. For\n+ * advanced users: this flag affects the surface as described in the\n+ * docs for the SDL C function, SDL_SetColorkey.\n+ *\/\n VALUE rbgm_surface_set_colorkey( int argc, VALUE *argv, VALUE self)\n {\n \tSDL_Surface *surf;\n@@ -241,6 +339,22 @@\n return a > b ? b : a;\n }\n \n+\/* Rubygame::Surface#blit(target,dest,source=nil)\n+ *\n+ * Blit (copy & paste) all or part of the surface's image onto another surface,\n+ * at a given position. Returns a Rubygame::Rect representing the area of \n+ * +target+ which was affected by the blit.\n+ *\n+ * This method takes these arguments:\n+ * - target:: the target Surface on which to paste the image.\n+ * - dest:: the coordinates of the top-left corner of the blit. Affects the\n+ * area of +other+ over which the image data is \/pasted\/.\n+ * Can also be a Rubygame::Rect or an Array larger than 2, but\n+ * width and height will be ignored. \n+ * - source:: a Rect representing the area of the source surface to get data\n+ * from. Affects the location from which the image data is \/copied\/.\n+ * Can also be an Array of no less than 4 values. \n+ *\/\n VALUE rbgm_surface_blit(int argc, VALUE *argv, VALUE self)\n {\n \tif(argc < 2 || argc > 3)\n@@ -304,6 +418,16 @@\n \treturn returnrect;\n }\n \n+\/* Rubygame::Surface#fill(color,rect=nil)\n+ *\n+ * Fill all or part of a Surface with a color.\n+ *\n+ * This method takes these arguments:\n+ * - color:: color to fill with, in the form +[r,g,b]+ or +[r,g,b,a]+ (for\n+ * partially transparent fills).\n+ * - rect:: a Rubygame::Rect representing the area of the surface to fill with\n+ * color, or +nil+ to fill the entire surface.\n+ *\/\n VALUE rbgm_surface_fill( int argc, VALUE *argv, VALUE self )\n {\n \tSDL_Surface *surf;\n@@ -355,6 +479,17 @@\n \treturn self;\n }\n \n+\/* Rubygame::Surface#get_at(pos)\n+ * Rubygame::Surface#get_at(x,y)\n+ *\n+ * Return the color (+[r,g,b,a]+) of the pixel at the given coordinate. \n+ *\n+ * This method takes these argument:\n+ * - pos:: the coordinate of the pixel to get the color of.\n+ *\n+ * The coordinate can also be given as two arguments, separate +x+ and +y+\n+ * positions.\n+ *\/\n VALUE rbgm_surface_getat( int argc, VALUE *argv, VALUE self )\n {\n \tSDL_Surface *surf;\n@@ -454,7 +589,7 @@\n \trb_define_method(cSurface,\"masks\",rbgm_surface_get_masks,0);\n \trb_define_method(cSurface,\"alpha\",rbgm_surface_get_alpha,0);\n \trb_define_method(cSurface,\"set_alpha\",rbgm_surface_set_alpha,-1);\n-\trb_define_method(cSurface,\"get_colorkey\",rbgm_surface_get_colorkey,0);\n+\trb_define_method(cSurface,\"colorkey\",rbgm_surface_get_colorkey,0);\n \trb_define_method(cSurface,\"set_colorkey\",rbgm_surface_set_colorkey,-1);\n \trb_define_method(cSurface,\"blit\",rbgm_surface_blit,-1);\n \trb_define_method(cSurface,\"fill\",rbgm_surface_fill,-1);\n"} {"commit":"5159147da3b31aa3e9071254fb0d83c648e741a5","subject":"Better xlink integration","message":"Better xlink integration\n","repos":"turran\/egueb,turran\/egueb,turran\/egueb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/smil\/egueb_smil_animation.c\n+++ src\/lib\/smil\/egueb_smil_animation.c\n@@ -58,6 +58,10 @@\n \tint64_t offset;\n } Egueb_Smil_Animation_Event_Foreach_Data;\n \n+\/* Forward declarations *\/\n+static void _egueb_smil_animation_target_destroyed_cb(Egueb_Dom_Event *e,\n+\t\tvoid *user_data);\n+\n \/* convert a timing into a duration *\/\n static Eina_Bool _egueb_smil_animation_timing_duration(\n \t\tEgueb_Smil_Timing *t, Egueb_Smil_Duration *d)\n@@ -321,7 +325,40 @@\n \t_egueb_smil_animation_end(thiz);\n }\n \n-static Egueb_Smil_Signal * _egueb_dom_animation_setup(Egueb_Smil_Animation *thiz,\n+static void _egueb_smil_animation_cleanup(Egueb_Smil_Animation *thiz)\n+{\n+\tEgueb_Smil_Animation_Class *klass;\n+\n+\t_egueb_smil_animation_begin_release(thiz);\n+\t_egueb_smil_animation_end_release(thiz);\n+\n+\tklass = EGUEB_SMIL_ANIMATION_CLASS_GET(thiz);\n+\tif (klass->cleanup)\n+\t\tklass->cleanup(thiz, thiz->target);\n+\n+\tif (thiz->attr)\n+\t{\n+\t\tegueb_dom_node_unref(thiz->attr);\n+\t\tthiz->attr = NULL;\n+\t}\n+\n+\tif (thiz->target)\n+\t{\n+\t\tegueb_dom_node_weak_unref(thiz->target,\n+\t\t\t\t_egueb_smil_animation_target_destroyed_cb,\n+\t\t\t\tthiz);\n+\t\tthiz->target = NULL;\n+\t}\n+\n+\t\/* If we have a signal for sure we have a timeline *\/\n+\tif (thiz->signal)\n+\t{\n+\t\tegueb_smil_timeline_signal_remove(thiz->timeline, thiz->signal);\n+\t\tthiz->signal = NULL;\n+\t}\n+}\n+\n+static Egueb_Smil_Signal * _egueb_smil_animation_setup(Egueb_Smil_Animation *thiz,\n \t\tEgueb_Dom_Node *target, int64_t *begin_offset)\n {\n \tEgueb_Smil_Animation_Class *klass;\n@@ -330,7 +367,11 @@\n \tEgueb_Smil_Signal *ret = NULL;\n \n \t\/* set our target *\/\n+\tegueb_dom_node_weak_ref(target,\n+\t\t\t_egueb_smil_animation_target_destroyed_cb,\n+\t\t\tthiz);\n \tthiz->target = target;\n+\n \tegueb_dom_attr_final_get(thiz->attribute_name, &attribute_name);\n \tif (!attribute_name)\n \t{\n@@ -383,31 +424,21 @@\n \treturn ret;\n }\n \n-static void _egueb_dom_animation_cleanup(Egueb_Smil_Animation *thiz,\n-\t\tEgueb_Dom_Node *target)\n-{\n-\tEgueb_Smil_Animation_Class *klass;\n-\tklass = EGUEB_SMIL_ANIMATION_CLASS_GET(thiz);\n-\n-\t_egueb_smil_animation_begin_release(thiz);\n-\t_egueb_smil_animation_end_release(thiz);\n-\n-\tif (klass->cleanup) klass->cleanup(thiz, target);\n-\tif (thiz->attr)\n-\t{\n-\t\tegueb_dom_node_unref(thiz->attr);\n-\t\tthiz->attr = NULL;\n-\t}\n-\tthiz->target = NULL;\n-\n-\t\/* If we have a signal fo sure we have a timeline *\/\n-\tif (thiz->signal)\n-\t{\n-\t\tegueb_smil_timeline_signal_remove(thiz->timeline, thiz->signal);\n-\t\tthiz->signal = NULL;\n-\t}\n-}\n-\n+\/* Called whenever the xlink:href's target has changed (because it was\n+ * removed from the document, the node changed id, etc). We need to cleanup\n+ * given that the target is no longer valid\n+ *\/\n+static void _egueb_smil_animation_xlink_href_target_removed_cb(Egueb_Dom_Node *n)\n+{\n+\tEgueb_Smil_Animation *thiz;\n+\tEgueb_Dom_Node *parent;\n+\n+\tparent = egueb_dom_attr_owner_get(n);\n+\tthiz = EGUEB_SMIL_ANIMATION(parent);\n+\tDBG(\"xlink target removed, cleaning up\");\n+\t_egueb_smil_animation_cleanup(thiz);\n+\tegueb_dom_node_unref(parent);\n+}\n \/*----------------------------------------------------------------------------*\n * Event handlers *\n *----------------------------------------------------------------------------*\/\n@@ -420,13 +451,22 @@\n \tEgueb_Smil_Animation *thiz = data;\n \n \tINFO(\"Smil animation removed from document\");\n-\t_egueb_dom_animation_cleanup(thiz, thiz->target);\n+\t_egueb_smil_animation_cleanup(thiz);\n \tif (thiz->timeline)\n \t{\n \t\tegueb_smil_timeline_unref(thiz->timeline);\n \t\tthiz->timeline = NULL;\n \t}\n }\n+\n+static void _egueb_smil_animation_target_destroyed_cb(Egueb_Dom_Event *e,\n+\t\tvoid *user_data)\n+{\n+\tEgueb_Smil_Animation *thiz = user_data;\n+\tERR(\"Destroying target\");\n+\t_egueb_smil_animation_cleanup(thiz);\n+}\n+\n \/*----------------------------------------------------------------------------*\n * Animation interface *\n *----------------------------------------------------------------------------*\/\n@@ -450,6 +490,7 @@\n \ttarget = _egueb_smil_animation_target_get(thiz);\n \tif (!target)\n \t{\n+\t\tWARN(\"No target found\");\n \t\treturn EINA_FALSE;\n \t}\n \n@@ -477,12 +518,13 @@\n \t\t\tthiz->target == target && !thiz->document_changed)\n \t{\n \t\tegueb_dom_node_unref(target);\n+\t\tINFO(\"Nothing to do\");\n \t\treturn EINA_TRUE;\n \t}\n \n \t\/* now the setup *\/\n-\t_egueb_dom_animation_cleanup(thiz, target);\n-\tsignal = _egueb_dom_animation_setup(thiz, target, &begin_offset);\n+\t_egueb_smil_animation_cleanup(thiz);\n+\tsignal = _egueb_smil_animation_setup(thiz, target, &begin_offset);\n \t\/* TODO the repeat count *\/\n \t\/* TODO the repeat dur *\/\n \tif (signal)\n@@ -561,6 +603,9 @@\n \t\t\tegueb_dom_string_ref(EGUEB_SMIL_END), NULL);\n \tthiz->xlink_href = egueb_xlink_attr_href_new(\n \t\t\tegueb_dom_string_ref(EGUEB_DOM_NAME_XLINK_HREF), NULL);\n+\tegueb_xlink_attr_href_on_target_removed_set(thiz->xlink_href,\n+\t\t\t_egueb_smil_animation_xlink_href_target_removed_cb);\n+\n \tthiz->repeat_count = egueb_smil_attr_repeat_count_new();\n \tthiz->repeat_dur = egueb_smil_attr_duration_new(\n \t\t\tegueb_dom_string_ref(EGUEB_SMIL_NAME_REPEAT_DUR), NULL);\n"} {"commit":"32fae765c20715178a19a52060ca30b1a37c0a6c","subject":"Bugfix: Occasional segfault on web3tracer_disable","message":"Bugfix: Occasional segfault on web3tracer_disable\n","repos":"exteon\/web3tracer,exteon\/web3tracer,exteon\/web3tracer,exteon\/web3tracer","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- extension\/web3tracer.c\n+++ extension\/web3tracer.c\n@@ -259,15 +259,11 @@\n \t\t\tRETURN_LONG(WEB3TRACER_OK_VAL);\n \t\t\tbreak;\n \t\tcase WEB3TRACER_OUTPUT_PROCESSED_VAL:\n-\t\t\tif (WEB3TRACER_G(z_out)) {\n-\t\t\t\tzval_dtor(WEB3TRACER_G(z_out));\n-\t\t\t\tFREE_ZVAL(WEB3TRACER_G(z_out));\n-\t\t\t}\n \t\t\tMAKE_STD_ZVAL(WEB3TRACER_G(z_out));\n \t\t\tarray_init(WEB3TRACER_G(z_out));\n \t\t\tweb3tracer_process_output();\n \t\t\tweb3tracer_free(TSRMLS_C);\n-\t\t\tRETURN_ZVAL(WEB3TRACER_G(z_out),0,0);\n+\t\t\tRETURN_ZVAL(WEB3TRACER_G(z_out),0,1);\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tweb3tracer_free(TSRMLS_C);\n"} {"commit":"87c721f64b8079cd66389e0f613a030b645b2f3a","subject":"printinfo.c: Adding support for compressed audio data to the printfileinfo routine.","message":"printinfo.c:\n Adding support for compressed audio data to the printfileinfo routine.\n\nBKrev: 3b84ac382zq48TDOoCgjfVbVsN7gaw\n","repos":"eriser\/audiofile,Distrotech\/audiofile,eriser\/audiofile,mpruett\/audiofile,eriser\/audiofile,Distrotech\/audiofile,mpruett\/audiofile,mpruett\/audiofile,Distrotech\/audiofile,fabzzap\/audiofile,fabzzap\/audiofile,fabzzap\/audiofile","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sfcommands\/printinfo.c\n+++ sfcommands\/printinfo.c\n@@ -41,7 +41,7 @@\n {\n \tint\t\tversion;\n \tAFfilehandle\tfile;\n-\tint\t\tsampleFormat, sampleWidth, byteOrder;\n+\tint\t\tsampleFormat, sampleWidth, byteOrder, compressionType;\n \tchar\t\t*copyright, *formatstring, *labelstring;\n \n \tfile = afOpenFile(filename, \"r\", NULL);\n@@ -65,33 +65,52 @@\n \n \tprintf(\"Data Format \");\n \n-\tswitch (sampleFormat)\n+\tcompressionType = afGetCompression(file, AF_DEFAULT_TRACK);\n+\n+\tif (compressionType == AF_COMPRESSION_NONE)\n \t{\n-\t\tcase AF_SAMPFMT_TWOSCOMP:\n-\t\t\tprintf(\"%d-bit integer (2's complement, %s)\\n\",\n-\t\t\t\tsampleWidth,\n-\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n-\t\t\t\t\t\"big endian\" : \"little endian\");\n-\t\t\tbreak;\n-\t\tcase AF_SAMPFMT_UNSIGNED:\n-\t\t\tprintf(\"%d-bit integer (unsigned, %s)\\n\", sampleWidth,\n-\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n-\t\t\t\t\t\"big endian\" : \"little endian\");\n-\t\t\tbreak;\n-\t\tcase AF_SAMPFMT_FLOAT:\n-\t\t\tprintf(\"single-precision (32-bit) floating point, %s\\n\",\n-\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n-\t\t\t\t\t\"big endian\" : \"little endian\");\n-\t\t\tbreak;\n-\t\tcase AF_SAMPFMT_DOUBLE:\n-\t\t\tprintf(\"double-precision (64-bit) floating point, %s\\n\",\n-\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n-\t\t\t\t\t\"big endian\" : \"little endian\");\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tprintf(\"unknown\\n\");\n-\t\t\tbreak;\n+\t\tswitch (sampleFormat)\n+\t\t{\n+\t\t\tcase AF_SAMPFMT_TWOSCOMP:\n+\t\t\t\tprintf(\"%d-bit integer (2's complement, %s)\",\n+\t\t\t\t\tsampleWidth,\n+\t\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n+\t\t\t\t\t\t\"big endian\" : \"little endian\");\n+\t\t\t\tbreak;\n+\t\t\tcase AF_SAMPFMT_UNSIGNED:\n+\t\t\t\tprintf(\"%d-bit integer (unsigned, %s)\",\n+\t\t\t\t\tsampleWidth,\n+\t\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n+\t\t\t\t\t\t\"big endian\" : \"little endian\");\n+\t\t\t\tbreak;\n+\t\t\tcase AF_SAMPFMT_FLOAT:\n+\t\t\t\tprintf(\"single-precision (32-bit) floating point, %s\",\n+\t\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n+\t\t\t\t\t\t\"big endian\" : \"little endian\");\n+\t\t\t\tbreak;\n+\t\t\tcase AF_SAMPFMT_DOUBLE:\n+\t\t\t\tprintf(\"double-precision (64-bit) floating point, %s\",\n+\t\t\t\t\tbyteOrder == AF_BYTEORDER_BIGENDIAN ?\n+\t\t\t\t\t\t\"big endian\" : \"little endian\");\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tprintf(\"unknown\");\n+\t\t\t\tbreak;\n+\t\t}\n \t}\n+\telse\n+\t{\n+\t\tchar\t*compressionName;\n+\t\tcompressionName = afQueryPointer(AF_QUERYTYPE_COMPRESSION,\n+\t\t\tAF_QUERY_NAME, compressionType,\n+\t\t\t0, 0);\n+\n+\t\tif (compressionName == NULL)\n+\t\t\tprintf(\"unknown compression\");\n+\t\telse\n+\t\t\tprintf(\"%s compression\", compressionName);\n+\t}\n+\tprintf(\"\\n\");\n \n \tprintf(\"Audio Data %ld bytes begins at offset %ld (%lx hex)\\n\",\n \t\tafGetTrackBytes(file, AF_DEFAULT_TRACK),\n"} {"commit":"aa5dac17ae28530f94bd00d91543430d82a4d165","subject":"Fix test race condition of get_num_threads not recognizing zombie processes by calling pid_is_running() before starting to retrieve the number of threads.","message":"Fix test race condition of get_num_threads not recognizing zombie processes by calling pid_is_running() before starting to retrieve the number of threads.\n\ngit-svn-id: 9f18dd852162ff6c59c5533c0914e9cf81af9e7c@792 d8a29897-7e4b-0410-a74a-8bb4c295346f\n","repos":"tamentis\/psutil,tamentis\/psutil","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- psutil\/_psutil_mswindows.c\n+++ psutil\/_psutil_mswindows.c\n@@ -1016,6 +1016,7 @@\n get_process_num_threads(PyObject* self, PyObject* args)\n {\n long pid;\n+ int pid_return;\n long nthreads = 0;\n HANDLE hThreadSnap = NULL;\n THREADENTRY32 te32 = {0};\n@@ -1026,6 +1027,14 @@\n \/\/ raise AD instead of returning 0 as procexp is able to\n \/\/ retrieve useful information somehow\n return AccessDenied();\n+ }\n+\n+ pid_return = pid_is_running(pid);\n+ if (pid_return == 0) {\n+ return NoSuchProcess();\n+ }\n+ if (pid_return == -1) {\n+ return NULL;\n }\n \n hThreadSnap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);\n"} {"commit":"42603cb0d3082c2dfb0585b396aafdc6e31cab97","subject":"Added unescaping","message":"Added unescaping\n","repos":"GwenIves\/Exercises,GwenIves\/Exercises,GwenIves\/Exercises,GwenIves\/Exercises","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tcpl\/1_10_visible_white_space.c\n+++ tcpl\/1_10_visible_white_space.c\n@@ -1,28 +1,88 @@\n \/*\n- * Copy stdin to stdout replacing tabs with \\t and backspace with \\b\n+ * Copy stdin to stdout escaping\/unescaping special characters\n *\/\n \n #include <stdio.h>\n+#include <unistd.h>\n+#include <stdbool.h>\n \n-int main (void) {\n+static void escape (int);\n+static void unescape (int);\n+\n+int main (int argc, char ** argv) {\n+\tbool should_escape = true;\n+\n+\tint arg = 0;\n+\n+\twhile ((arg = getopt (argc, argv, \"u\")) != -1) {\n+\t\tswitch (arg) {\n+\t\t\tcase 'u':\n+\t\t\t\tshould_escape = false;\n+\t\t\t\tbreak;\n+\t\t\tcase '?':\n+\t\t\tdefault:\n+\t\t\t\tbreak;\n+\t\t}\n+\t}\n+\n \tint c = 0;\n \n-\twhile ((c = getchar ()) != EOF) {\n+\tif (should_escape) {\n+\t\twhile ((c = getchar ()) != EOF)\n+\t\t\tescape (c);\n+\t} else {\n+\t\twhile ((c = getchar ()) != EOF)\n+\t\t\tunescape (c);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void escape (int c) {\n+\tswitch (c) {\n+\t\tcase '\\t':\n+\t\t\tprintf (\"\\\\t\");\n+\t\t\tbreak;\n+\t\tcase '\\b':\n+\t\t\tprintf (\"\\\\b\");\n+\t\t\tbreak;\n+\t\tcase '\\n':\n+\t\t\tprintf (\"\\\\n\");\n+\t\t\tbreak;\n+\t\tcase '\\\\':\n+\t\t\tprintf (\"\\\\\\\\\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tputchar (c);\n+\t\t\tbreak;\n+\t}\n+}\n+\n+static void unescape (int c) {\n+\tstatic bool in_escape = false;\n+\n+\tif (in_escape) {\n \t\tswitch (c) {\n-\t\t\tcase '\\t':\n-\t\t\t\tprintf (\"\\\\t\");\n+\t\t\tcase 't':\n+\t\t\t\tputchar ('\\t');\n \t\t\t\tbreak;\n-\t\t\tcase '\\b':\n-\t\t\t\tprintf (\"\\\\b\");\n+\t\t\tcase 'b':\n+\t\t\t\tputchar ('\\b');\n+\t\t\t\tbreak;\n+\t\t\tcase 'n':\n+\t\t\t\tputchar ('\\n');\n \t\t\t\tbreak;\n \t\t\tcase '\\\\':\n-\t\t\t\tprintf (\"\\\\\\\\\");\n+\t\t\t\tputchar ('\\\\');\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tputchar (c);\n \t\t\t\tbreak;\n \t\t}\n-\t}\n \n-\treturn 0;\n+\t\tin_escape = false;\n+\t} else if (c == '\\\\')\n+\t\tin_escape = true;\n+\telse\n+\t\tputchar (c);\n }\n"} {"commit":"9747b59f5ea766da9fedd69f0d9649bf5e26eb95","subject":"animation stop fix","message":"animation stop fix\n","repos":"turanszkij\/WickedEngine,turanszkij\/WickedEngine,turanszkij\/WickedEngine,turanszkij\/WickedEngine","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c37af7902d302780ad517bdf1c5cbc36a1f191d8","subject":"[style]: \u65b0\u589e\u53ef\u8bfb\u6027\u66f4\u597d\u7684 strstr_glibc_old2()","message":"[style]: \u65b0\u589e\u53ef\u8bfb\u6027\u66f4\u597d\u7684 strstr_glibc_old2()\n\nSigned-off-by: shines77 <c816ee361b8bcaf7cf19d627e3bc89a63016b2b4@msn.com>\n","repos":"shines77\/StringMatch,shines77\/StringMatch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/main\/algorithm\/GlibcStrStrOld.h\n+++ src\/main\/algorithm\/GlibcStrStrOld.h\n@@ -116,6 +116,121 @@\n return (const char_type *)haystack;\n \n ret_0:\n+ return nullptr;\n+}\n+\n+template <typename char_type>\n+static\n+SM_NOINLINE_DECLARE(const char_type *)\n+strstr_glibc_old2(const char_type * phaystack, const char_type * pneedle)\n+{\n+ typedef unsigned unsigned_type;\n+ typedef typename jstd::uchar_traits<char_type>::type uchar_type;\n+\n+ const uchar_type * haystack = (const uchar_type * )phaystack;\n+ const uchar_type * needle = (const uchar_type *)pneedle;\n+ unsigned_type needle_01 = *needle;\n+ \n+ if (needle_01 != char_type('\\0')) {\n+ \/* possible ANSI violation *\/\n+ --haystack;\n+\n+ \/\/ Find first char in haystack is equal to the first char of needle.\n+ unsigned_type scan;\n+ do {\n+ ++haystack;\n+ scan = *haystack;\n+ if (scan == char_type('\\0')) {\n+ goto ret_nullptr;\n+ }\n+ } while (scan != needle_01);\n+\n+ ++needle;\n+ unsigned_type needle_02 = *needle;\n+ if (needle_02 == char_type('\\0')) {\n+ goto found_needle;\n+ }\n+\n+ ++needle;\n+ goto jin;\n+\n+ for (;;) {\n+ {\n+ unsigned_type cur;\n+ if (0) {\n+jin:\n+ {\n+ ++haystack;\n+ cur = *haystack;\n+ if (cur == needle_02) {\n+ goto crest;\n+ }\n+ } \/\/ jin: end\n+ }\n+ else {\n+ ++haystack;\n+ cur = *haystack;\n+ }\n+\n+ do {\n+ for (; cur != needle_01; cur = *++haystack) {\n+ if (cur == char_type('\\0')) {\n+ goto ret_nullptr;\n+ }\n+\n+ if ((cur = *++haystack) == needle_01) {\n+ break;\n+ }\n+\n+ if (cur == char_type('\\0')) {\n+ goto ret_nullptr;\n+ }\n+ }\n+ cur = *++haystack;\n+ } while (cur != needle_02);\n+ }\n+crest:\n+ {\n+ const uchar_type * rneedle;\n+ unsigned_type rcursor;\n+ {\n+ const uchar_type * rhaystack = (haystack--) + 1;\n+ rneedle = needle;\n+ rcursor = *rneedle;\n+ if (rcursor == *rhaystack) {\n+ do {\n+ if (rcursor == char_type('\\0')) {\n+ goto found_needle;\n+ }\n+\n+ rcursor = *++needle;\n+ if (rcursor != *++rhaystack) {\n+ break;\n+ }\n+\n+ if (rcursor == char_type('\\0')) {\n+ goto found_needle;\n+ }\n+\n+ rcursor = *++needle;\n+ } while (rcursor == *++rhaystack);\n+ }\n+\n+ \/* took the register-poor approach *\/\n+ needle = rneedle;\n+ }\n+\n+ if (rcursor == char_type('\\0')) {\n+ break;\n+ }\n+ }\n+ } \/\/ for (;;) \n+ } \/\/ if\n+\n+found_needle:\n+ return (const char_type *)haystack;\n+\n+ret_nullptr:\n return nullptr;\n }\n \n"} {"commit":"b5bf2e83f76e6828829fa0376a7c0041708dc3b9","subject":"vaapivideobufferpool: add video meta to config when needed","message":"vaapivideobufferpool: add video meta to config when needed\n\nIn cases where we know the video meta must be present, add it to\nthe pool configuration.\n\nSigned-off-by: Scott D Phillips <scott.d.phillips@intel.com>\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=766184\n","repos":"ceyusa\/gstreamer-vaapi,ceyusa\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/vaapi\/gstvaapivideobufferpool.c\n+++ gst\/vaapi\/gstvaapivideobufferpool.c\n@@ -139,6 +139,7 @@\n const GstVideoInfo *alloc_vip;\n GstVideoAlignment align;\n GstAllocator *allocator;\n+ gboolean ret, updated = FALSE;\n \n GST_DEBUG_OBJECT (pool, \"config %\" GST_PTR_FORMAT, config);\n \n@@ -184,6 +185,21 @@\n if (gst_buffer_pool_config_has_option (config,\n GST_BUFFER_POOL_OPTION_VIDEO_META))\n priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META;\n+ else {\n+ gint i;\n+ for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&priv->video_info); i++) {\n+ if (GST_VIDEO_INFO_PLANE_OFFSET (&priv->video_info, i) !=\n+ GST_VIDEO_INFO_PLANE_OFFSET (&priv->alloc_info, i) ||\n+ GST_VIDEO_INFO_PLANE_STRIDE (&priv->video_info, i) !=\n+ GST_VIDEO_INFO_PLANE_STRIDE (&priv->alloc_info, i)) {\n+ priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_VIDEO_META;\n+ gst_buffer_pool_config_add_option (config,\n+ GST_BUFFER_POOL_OPTION_VIDEO_META);\n+ updated = TRUE;\n+ break;\n+ }\n+ }\n+ }\n \n if (gst_buffer_pool_config_has_option (config,\n GST_BUFFER_POOL_OPTION_VIDEO_ALIGNMENT)) {\n@@ -195,9 +211,10 @@\n GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META))\n priv->options |= GST_VAAPI_VIDEO_BUFFER_POOL_OPTION_GL_TEXTURE_UPLOAD;\n \n- return\n+ ret =\n GST_BUFFER_POOL_CLASS\n (gst_vaapi_video_buffer_pool_parent_class)->set_config (pool, config);\n+ return !updated && ret;\n \n \/* ERRORS *\/\n error_invalid_config:\n"} {"commit":"b9f8e2a48f9d2030abe4dd9c4f4956c84556a23b","subject":"completion: cleanup destruction of assistant","message":"completion: cleanup destruction of assistant\n","repos":"GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcecompletion.c\n+++ gtksourceview\/gtksourcecompletion.c\n@@ -881,11 +881,7 @@\n \tgtk_source_signal_group_set_target (self->buffer_signals, NULL);\n \tgtk_source_signal_group_set_target (self->view_signals, NULL);\n \n-\tif (self->display != NULL)\n-\t{\n-\t\t_gtk_source_assistant_destroy (GTK_SOURCE_ASSISTANT (self->display));\n-\t\tself->display = NULL;\n-\t}\n+\tg_clear_pointer ((GtkSourceAssistant **)&self->display, _gtk_source_assistant_destroy);\n \n \tg_clear_object (&self->context);\n \tg_clear_object (&self->cancellable);\n"} {"commit":"a422a72abdd298b8b9ab27b922ccf414501d1e0e","subject":"FileLoader: g_task_return for all valid cases","message":"FileLoader: g_task_return for all valid cases\n\nThat way, the GAsyncReadyCallback is always called (in valid cases), so\nthe code using a FileLoader can continue its execution.\n","repos":"cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcefileloader.c\n+++ gtksourceview\/gtksourcefileloader.c\n@@ -1032,21 +1032,22 @@\n \tg_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));\n \tg_return_if_fail (loader->priv->task == NULL);\n \n+\treset (loader);\n+\n+\tloader->priv->task = g_task_new (loader, cancellable, callback, user_data);\n+\tg_task_set_priority (loader->priv->task, io_priority);\n+\n+\tloader->priv->progress_cb = progress_callback;\n+\tloader->priv->progress_cb_data = progress_callback_data;\n+\tloader->priv->progress_cb_notify = progress_callback_notify;\n+\n \tif (loader->priv->source_buffer == NULL ||\n \t loader->priv->file == NULL ||\n \t (loader->priv->location == NULL && loader->priv->input_stream_property == NULL))\n \t{\n+\t\tg_task_return_boolean (loader->priv->task, FALSE);\n \t\treturn;\n \t}\n-\n-\treset (loader);\n-\n-\tloader->priv->task = g_task_new (loader, cancellable, callback, user_data);\n-\tg_task_set_priority (loader->priv->task, io_priority);\n-\n-\tloader->priv->progress_cb = progress_callback;\n-\tloader->priv->progress_cb_data = progress_callback_data;\n-\tloader->priv->progress_cb_notify = progress_callback_notify;\n \n \tDEBUG ({\n \t g_print (\"Start loading\\n\");\n"} {"commit":"b737d84ad3564b448aeb0784d212fbd6dd3164f6","subject":"update changelog","message":"update changelog\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@28427 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"danshapero\/dealii,naliboff\/dealii,flow123d\/dealii,EGP-CIG-REU\/dealii,sriharisundar\/dealii,adamkosik\/dealii,nicolacavallini\/dealii,johntfoster\/dealii,shakirbsm\/dealii,Arezou-gh\/dealii,lue\/dealii,natashasharma\/dealii,angelrca\/dealii,sairajat\/dealii,Arezou-gh\/dealii,mac-a\/dealii,ibkim11\/dealii,nicolacavallini\/dealii,gpitton\/dealii,pesser\/dealii,lpolster\/dealii,EGP-CIG-REU\/dealii,sairajat\/dealii,jperryhouts\/dealii,pesser\/dealii,kalj\/dealii,spco\/dealii,shakirbsm\/dealii,natashasharma\/dealii,flow123d\/dealii,pesser\/dealii,mac-a\/dealii,JaeryunYim\/dealii,pesser\/dealii,lue\/dealii,natashasharma\/dealii,nicolacavallini\/dealii,Arezou-gh\/dealii,spco\/dealii,mtezzele\/dealii,rrgrove6\/dealii,jperryhouts\/dealii,johntfoster\/dealii,rrgrove6\/dealii,msteigemann\/dealii,gpitton\/dealii,nicolacavallini\/dealii,danshapero\/dealii,lue\/dealii,angelrca\/dealii,danshapero\/dealii,msteigemann\/dealii,jperryhouts\/dealii,maieneuro\/dealii,kalj\/dealii,lpolster\/dealii,ibkim11\/dealii,naliboff\/dealii,spco\/dealii,mtezzele\/dealii,jperryhouts\/dealii,spco\/dealii,JaeryunYim\/dealii,JaeryunYim\/dealii,Arezou-gh\/dealii,YongYang86\/dealii,natashasharma\/dealii,YongYang86\/dealii,sriharisundar\/dealii,andreamola\/dealii,andreamola\/dealii,danshapero\/dealii,mac-a\/dealii,maieneuro\/dealii,naliboff\/dealii,sairajat\/dealii,ESeNonFossiIo\/dealii,sriharisundar\/dealii,maieneuro\/dealii,ibkim11\/dealii,Arezou-gh\/dealii,YongYang86\/dealii,adamkosik\/dealii,andreamola\/dealii,andreamola\/dealii,rrgrove6\/dealii,lue\/dealii,JaeryunYim\/dealii,adamkosik\/dealii,ESeNonFossiIo\/dealii,naliboff\/dealii,flow123d\/dealii,kalj\/dealii,spco\/dealii,sriharisundar\/dealii,pesser\/dealii,nicolacavallini\/dealii,angelrca\/dealii,msteigemann\/dealii,andreamola\/dealii,maieneuro\/dealii,mtezzele\/dealii,shakirbsm\/dealii,sairajat\/dealii,lpolster\/dealii,angelrca\/dealii,gpitton\/dealii,EGP-CIG-REU\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,angelrca\/dealii,andreamola\/dealii,mtezzele\/dealii,ibkim11\/dealii,naliboff\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,nicolacavallini\/dealii,rrgrove6\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,lue\/dealii,danshapero\/dealii,YongYang86\/dealii,msteigemann\/dealii,lue\/dealii,adamkosik\/dealii,YongYang86\/dealii,ibkim11\/dealii,lpolster\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,flow123d\/dealii,ESeNonFossiIo\/dealii,natashasharma\/dealii,natashasharma\/dealii,johntfoster\/dealii,ESeNonFossiIo\/dealii,mtezzele\/dealii,flow123d\/dealii,sriharisundar\/dealii,lpolster\/dealii,maieneuro\/dealii,sriharisundar\/dealii,EGP-CIG-REU\/dealii,lpolster\/dealii,kalj\/dealii,rrgrove6\/dealii,johntfoster\/dealii,gpitton\/dealii,andreamola\/dealii,spco\/dealii,ibkim11\/dealii,lue\/dealii,johntfoster\/dealii,shakirbsm\/dealii,YongYang86\/dealii,maieneuro\/dealii,nicolacavallini\/dealii,adamkosik\/dealii,naliboff\/dealii,jperryhouts\/dealii,angelrca\/dealii,msteigemann\/dealii,sriharisundar\/dealii,mac-a\/dealii,msteigemann\/dealii,angelrca\/dealii,shakirbsm\/dealii,danshapero\/dealii,danshapero\/dealii,sairajat\/dealii,kalj\/dealii,mac-a\/dealii,maieneuro\/dealii,flow123d\/dealii,flow123d\/dealii,pesser\/dealii,mac-a\/dealii,ESeNonFossiIo\/dealii,pesser\/dealii,spco\/dealii,sairajat\/dealii,adamkosik\/dealii,rrgrove6\/dealii,mtezzele\/dealii,johntfoster\/dealii,gpitton\/dealii,mtezzele\/dealii,JaeryunYim\/dealii,msteigemann\/dealii,lpolster\/dealii,ESeNonFossiIo\/dealii,ESeNonFossiIo\/dealii,adamkosik\/dealii,jperryhouts\/dealii,gpitton\/dealii,ibkim11\/dealii,mac-a\/dealii,sairajat\/dealii,johntfoster\/dealii,naliboff\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,EGP-CIG-REU\/dealii,kalj\/dealii,YongYang86\/dealii,gpitton\/dealii,rrgrove6\/dealii,EGP-CIG-REU\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/doc\/news\/changes.h\n+++ deal.II\/doc\/news\/changes.h\n@@ -193,6 +193,17 @@\n <h3>Specific improvements<\/h3>\n \n <ol>\n+<li> PETScWrappers::MPI::Vector with ghost entries are read-only\n+now.\n+<br>\n+(Timo Heister, 2013\/02\/16)\n+\n+<li> PETScWrappers::*Vector::operator= now calls update_ghost_values()\n+automatically if necessary. This means that update_ghost_values()\n+does not need to be from user code at all anymore.\n+<br>\n+(Timo Heister, 2013\/02\/14)\n+\n <li> Fixed: VectorTools::interpolate did not work properly in 1d if\n boundary indicators had been set to anything but the default (i.e.,\n zero at the left and one at the right end of the domain). This was\n"} {"commit":"d28d62cd32bc744bc2601f9a4c4f959807879789","subject":"Fix namespace.","message":"Fix namespace.\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@19206 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"johntfoster\/dealii,msteigemann\/dealii,nicolacavallini\/dealii,nicolacavallini\/dealii,shakirbsm\/dealii,sairajat\/dealii,ESeNonFossiIo\/dealii,lpolster\/dealii,lpolster\/dealii,msteigemann\/dealii,mtezzele\/dealii,EGP-CIG-REU\/dealii,Arezou-gh\/dealii,angelrca\/dealii,natashasharma\/dealii,maieneuro\/dealii,maieneuro\/dealii,johntfoster\/dealii,lue\/dealii,danshapero\/dealii,gpitton\/dealii,lpolster\/dealii,gpitton\/dealii,mtezzele\/dealii,johntfoster\/dealii,JaeryunYim\/dealii,lpolster\/dealii,rrgrove6\/dealii,maieneuro\/dealii,jperryhouts\/dealii,flow123d\/dealii,nicolacavallini\/dealii,sriharisundar\/dealii,sairajat\/dealii,kalj\/dealii,mtezzele\/dealii,YongYang86\/dealii,mtezzele\/dealii,adamkosik\/dealii,pesser\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,ibkim11\/dealii,angelrca\/dealii,natashasharma\/dealii,flow123d\/dealii,sairajat\/dealii,flow123d\/dealii,adamkosik\/dealii,sriharisundar\/dealii,spco\/dealii,danshapero\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,andreamola\/dealii,nicolacavallini\/dealii,EGP-CIG-REU\/dealii,pesser\/dealii,angelrca\/dealii,jperryhouts\/dealii,Arezou-gh\/dealii,YongYang86\/dealii,sriharisundar\/dealii,lpolster\/dealii,kalj\/dealii,natashasharma\/dealii,sriharisundar\/dealii,shakirbsm\/dealii,Arezou-gh\/dealii,nicolacavallini\/dealii,lue\/dealii,lue\/dealii,ibkim11\/dealii,andreamola\/dealii,flow123d\/dealii,EGP-CIG-REU\/dealii,kalj\/dealii,angelrca\/dealii,rrgrove6\/dealii,rrgrove6\/dealii,adamkosik\/dealii,angelrca\/dealii,spco\/dealii,danshapero\/dealii,danshapero\/dealii,Arezou-gh\/dealii,andreamola\/dealii,naliboff\/dealii,spco\/dealii,gpitton\/dealii,naliboff\/dealii,naliboff\/dealii,jperryhouts\/dealii,EGP-CIG-REU\/dealii,mtezzele\/dealii,mtezzele\/dealii,johntfoster\/dealii,maieneuro\/dealii,kalj\/dealii,shakirbsm\/dealii,maieneuro\/dealii,danshapero\/dealii,kalj\/dealii,adamkosik\/dealii,JaeryunYim\/dealii,gpitton\/dealii,ibkim11\/dealii,johntfoster\/dealii,sriharisundar\/dealii,JaeryunYim\/dealii,naliboff\/dealii,danshapero\/dealii,natashasharma\/dealii,gpitton\/dealii,ESeNonFossiIo\/dealii,shakirbsm\/dealii,lue\/dealii,spco\/dealii,pesser\/dealii,jperryhouts\/dealii,mtezzele\/dealii,jperryhouts\/dealii,andreamola\/dealii,msteigemann\/dealii,gpitton\/dealii,jperryhouts\/dealii,spco\/dealii,naliboff\/dealii,adamkosik\/dealii,rrgrove6\/dealii,natashasharma\/dealii,ibkim11\/dealii,pesser\/dealii,lue\/dealii,Arezou-gh\/dealii,rrgrove6\/dealii,angelrca\/dealii,ESeNonFossiIo\/dealii,flow123d\/dealii,pesser\/dealii,naliboff\/dealii,mac-a\/dealii,msteigemann\/dealii,ESeNonFossiIo\/dealii,Arezou-gh\/dealii,sairajat\/dealii,kalj\/dealii,andreamola\/dealii,mac-a\/dealii,adamkosik\/dealii,johntfoster\/dealii,maieneuro\/dealii,YongYang86\/dealii,sairajat\/dealii,pesser\/dealii,ibkim11\/dealii,angelrca\/dealii,YongYang86\/dealii,mac-a\/dealii,YongYang86\/dealii,ibkim11\/dealii,YongYang86\/dealii,EGP-CIG-REU\/dealii,mac-a\/dealii,msteigemann\/dealii,gpitton\/dealii,spco\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,rrgrove6\/dealii,lue\/dealii,nicolacavallini\/dealii,naliboff\/dealii,mac-a\/dealii,natashasharma\/dealii,lpolster\/dealii,ESeNonFossiIo\/dealii,ibkim11\/dealii,lpolster\/dealii,msteigemann\/dealii,sairajat\/dealii,JaeryunYim\/dealii,flow123d\/dealii,shakirbsm\/dealii,mac-a\/dealii,andreamola\/dealii,sriharisundar\/dealii,pesser\/dealii,msteigemann\/dealii,mac-a\/dealii,JaeryunYim\/dealii,ESeNonFossiIo\/dealii,kalj\/dealii,spco\/dealii,sairajat\/dealii,maieneuro\/dealii,andreamola\/dealii,johntfoster\/dealii,nicolacavallini\/dealii,natashasharma\/dealii,jperryhouts\/dealii,flow123d\/dealii,lue\/dealii,rrgrove6\/dealii,EGP-CIG-REU\/dealii,sriharisundar\/dealii,adamkosik\/dealii,YongYang86\/dealii,JaeryunYim\/dealii,danshapero\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/doc\/news\/changes.h\n+++ deal.II\/doc\/news\/changes.h\n@@ -159,7 +159,7 @@\n <ol>\n <li>\n <p>\n- New: The Utilities::System::comm_self function return an MPI\n+ New: The Utilities::Trilinos::comm_self function return an MPI\n communicator that consists only of the current processor.\n <br>\n (WB 2009\/08\/07)\n"} {"commit":"6c3db86ae0bd207ac87b5c6a9ffb13f4ab8d80c6","subject":"changing camera perspective parameters","message":"changing camera perspective parameters\n","repos":"victorkendy\/PandoraBox,victorkendy\/PandoraBox","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tensor_field\/SceneInitialization.h\n+++ tensor_field\/SceneInitialization.h\n@@ -24,7 +24,6 @@\n window->getRenderer()->addPostProcessor(new pbge::BlitToFramebuffer);\n pbge::SceneGraph * scene;\n int cam_node_name;\n- \/\/ FIXME: remove the state change line\n scene = new pbge::SceneGraph(new pbge::TransformationNode);\n loadField(gfx);\n createSceneTransformations(scene);\n"} {"commit":"4b050362c5aa640a356aef2e0f50ce6add8f8267","subject":"paysages : Fixed header.","message":"paysages : Fixed header.\n\ngit-svn-id: 44933db1765edead690e673ca515319db8bff75a@376 b1fd45b6-86a6-48da-8261-f70d1f35bdcc\n","repos":"thunderk\/paysages3d,thunderk\/paysages3d,thunderk\/paysages3d","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- gui_qt\/basepreview.h\n+++ gui_qt\/basepreview.h\n@@ -8,6 +8,7 @@\n #include <QVector>\n #include <QList>\n #include <QLabel>\n+#include <QHash>\n #include \"previewosd.h\"\n #include \"..\/lib_paysages\/pack.h\"\n \n"} {"commit":"25653e8a4a6b0e331162133d198c63e38e37fbec","subject":"running usage included","message":"running usage included","repos":"gabordemooij\/citrine,gabordemooij\/citrine,gabordemooij\/citrine","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- citrine.c\n+++ citrine.c\n@@ -36,6 +36,9 @@\n \tprintf( CTR_MSG_COPYRIGHT );\n \tprintf( CTR_VERSION );\n \tprintf(\"\\n\");\n+\tprintf(\"Usage:\\n\");\n+\tprintf(\" ctr[version] filename\\n\");\n+\tprintf(\" ctrus program.ctr\");\n }\n \n \/**\n"} {"commit":"0bdc503ce9193c2a84f302b70811b689d851f97f","subject":"Update version info.","message":"Update version info.\n","repos":"gabordemooij\/citrine,gabordemooij\/citrine,gabordemooij\/citrine","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- citrine.c\n+++ citrine.c\n@@ -19,8 +19,8 @@\n *\/\n void ctr_cli_welcome() {\n \tprintf(\"\\n\");\n-\tprintf(\"Citrine Programming Language V 0.7.1\\n\");\n-\tprintf(\"Written by Gabor de Mooij (c) copyright 2016, Licensed BSD.\\n\");\n+\tprintf(\"Citrine Programming Language V 0.7.2\\n\");\n+\tprintf(\"Written by Gabor de Mooij (c) copyright 2017, Licensed BSD.\\n\");\n \tprintf(\"\\n\");\n }\n \n"} {"commit":"a46776ad02c8b46578848d782bc7b487dc6bdcab","subject":"Add WolfSSL esp_tls TLS1.3 configuration option","message":"Add WolfSSL esp_tls TLS1.3 configuration option\n\nCloses https:\/\/github.com\/espressif\/esp-idf\/issues\/8313\n","repos":"espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/esp-tls\/esp_tls_wolfssl.c\n+++ components\/esp-tls\/esp_tls_wolfssl.c\n@@ -168,7 +168,13 @@\n static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls_cfg_t *cfg, esp_tls_t *tls)\n {\n int ret = WOLFSSL_FAILURE;\n+\n+#ifdef WOLFSSL_TLS13\n+ tls->priv_ctx = (void *)wolfSSL_CTX_new(wolfTLSv1_3_client_method());\n+#else\n tls->priv_ctx = (void *)wolfSSL_CTX_new(wolfTLSv1_2_client_method());\n+#endif\n+\n if (!tls->priv_ctx) {\n ESP_LOGE(TAG, \"Set wolfSSL ctx failed\");\n ESP_INT_EVENT_TRACKER_CAPTURE(tls->error_handle, ESP_TLS_ERR_TYPE_WOLFSSL, ret);\n@@ -310,7 +316,13 @@\n static esp_err_t set_server_config(esp_tls_cfg_server_t *cfg, esp_tls_t *tls)\n {\n int ret = WOLFSSL_FAILURE;\n+\n+#ifdef WOLFSSL_TLS13\n+ tls->priv_ctx = (void *)wolfSSL_CTX_new(wolfTLSv1_3_server_method());\n+#else\n tls->priv_ctx = (void *)wolfSSL_CTX_new(wolfTLSv1_2_server_method());\n+#endif\n+\n if (!tls->priv_ctx) {\n ESP_LOGE(TAG, \"Set wolfSSL ctx failed\");\n return ESP_ERR_WOLFSSL_CTX_SETUP_FAILED;\n"} {"commit":"8c4783da059002e22bd97e3b4e60d3760a3a9d01","subject":"demos\/gtk-demo\/hypertext.c: Use accessor functions to access GtkWidget","message":"demos\/gtk-demo\/hypertext.c: Use accessor functions to access GtkWidget\n","repos":"grubersjoe\/adwaita,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,jadahl\/gtk,simokivimaki\/gtk,Adamovskiy\/gtk,Distrotech\/gtk2,ahodesuka\/gtk,simokivimaki\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,davidt\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,jessevdk\/gtk,simokivimaki\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,msteinert\/gtk,Distrotech\/gtk2,chergert\/gtk,simokivimaki\/gtk,jessevdk\/gtk,davidgumberg\/gtk,msteinert\/gtk,ebassi\/gtk,jigpu\/gtk,davidgumberg\/gtk,jigpu\/gtk,jessevdk\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,jadahl\/gtk,Distrotech\/gtk2,bratsche\/gtk-,ahodesuka\/gtk,Lyude\/gtk-,chergert\/gtk,davidt\/gtk,chergert\/gtk,ebassi\/gtk,bratsche\/gtk-,davidt\/gtk,grubersjoe\/adwaita,ebassi\/gtk,davidgumberg\/gtk,chergert\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,Lyude\/gtk-,Lyude\/gtk-,Adamovskiy\/gtk,grubersjoe\/adwaita,jigpu\/gtk,davidt\/gtk,jadahl\/gtk,jadahl\/gtk,jadahl\/gtk,jadahl\/gtk,jadahl\/gtk,jessevdk\/gtk,jigpu\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,bratsche\/gtk-,alexlarsson\/gtk,ebassi\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,msteinert\/gtk,Adamovskiy\/gtk,jigpu\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,jessevdk\/gtk,alexlarsson\/gtk,simokivimaki\/gtk,jigpu\/gtk,Lyude\/gtk-,msteinert\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,bratsche\/gtk-,jigpu\/gtk,chergert\/gtk,davidt\/gtk,chergert\/gtk,ahodesuka\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,msteinert\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,simokivimaki\/gtk,chergert\/gtk,davidgumberg\/gtk,davidt\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,chergert\/gtk,ahodesuka\/gtk,bratsche\/gtk-,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,Distrotech\/gtk2,jadahl\/gtk,jigpu\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- demos\/gtk-demo\/hypertext.c\n+++ demos\/gtk-demo\/hypertext.c\n@@ -225,7 +225,8 @@\n \n set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);\n \n- gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);\n+ gdk_window_get_pointer (gtk_widget_get_window (text_view),\n+ NULL, NULL, NULL);\n return FALSE;\n }\n \n@@ -237,9 +238,10 @@\n GdkEventVisibility *event)\n {\n gint wx, wy, bx, by;\n- \n- gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);\n- \n+\n+ gdk_window_get_pointer (gtk_widget_get_window (text_view),\n+ &wx, &wy, NULL);\n+\n gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), \n GTK_TEXT_WINDOW_WIDGET,\n wx, wy, &bx, &by);\n"} {"commit":"2aa51d42f910781cc25747347eea4e0ae6bd1b77","subject":"ymodem: increase the default RYM_CHD_INTV_TICK","message":"ymodem: increase the default RYM_CHD_INTV_TICK\n\nFrequent 'C' on the handshake will confuse some sender(lrzsz for\nexample).\n","repos":"weety\/rt-thread,weiyuliang\/rt-thread,geniusgogo\/rt-thread,ArdaFu\/rt-thread,igou\/rt-thread,armink\/rt-thread,nongxiaoming\/rt-thread,zhaojuntao\/rt-thread,yongli3\/rt-thread,wolfgangz2013\/rt-thread,weiyuliang\/rt-thread,weety\/rt-thread,gbcwbz\/rt-thread,zhaojuntao\/rt-thread,igou\/rt-thread,FlyLu\/rt-thread,zhaojuntao\/rt-thread,yongli3\/rt-thread,igou\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,wolfgangz2013\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,igou\/rt-thread,zhaojuntao\/rt-thread,gbcwbz\/rt-thread,zhaojuntao\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,weety\/rt-thread,weety\/rt-thread,igou\/rt-thread,nongxiaoming\/rt-thread,gbcwbz\/rt-thread,geniusgogo\/rt-thread,yongli3\/rt-thread,gbcwbz\/rt-thread,hezlog\/rt-thread,FlyLu\/rt-thread,hezlog\/rt-thread,AubrCool\/rt-thread,RT-Thread\/rt-thread,weiyuliang\/rt-thread,wolfgangz2013\/rt-thread,weiyuliang\/rt-thread,geniusgogo\/rt-thread,AubrCool\/rt-thread,zhaojuntao\/rt-thread,ArdaFu\/rt-thread,igou\/rt-thread,yongli3\/rt-thread,FlyLu\/rt-thread,ArdaFu\/rt-thread,AubrCool\/rt-thread,weety\/rt-thread,gbcwbz\/rt-thread,FlyLu\/rt-thread,AubrCool\/rt-thread,armink\/rt-thread,AubrCool\/rt-thread,yongli3\/rt-thread,AubrCool\/rt-thread,wolfgangz2013\/rt-thread,hezlog\/rt-thread,wolfgangz2013\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,nongxiaoming\/rt-thread,wolfgangz2013\/rt-thread,zhaojuntao\/rt-thread,geniusgogo\/rt-thread,weiyuliang\/rt-thread,igou\/rt-thread,armink\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,AubrCool\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,ArdaFu\/rt-thread,hezlog\/rt-thread,FlyLu\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,gbcwbz\/rt-thread,hezlog\/rt-thread,ArdaFu\/rt-thread,FlyLu\/rt-thread,ArdaFu\/rt-thread,RT-Thread\/rt-thread,yongli3\/rt-thread,yongli3\/rt-thread,hezlog\/rt-thread,armink\/rt-thread,weiyuliang\/rt-thread,geniusgogo\/rt-thread,ArdaFu\/rt-thread,wolfgangz2013\/rt-thread,weiyuliang\/rt-thread,gbcwbz\/rt-thread,FlyLu\/rt-thread,nongxiaoming\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/utilities\/ymodem\/ymodem.h\n+++ components\/utilities\/ymodem\/ymodem.h\n@@ -52,7 +52,7 @@\n #endif\n \/* how many ticks between two handshake code. *\/\n #ifndef RYM_CHD_INTV_TICK\n-#define RYM_CHD_INTV_TICK (RT_TICK_PER_SECOND \/ 4)\n+#define RYM_CHD_INTV_TICK (RT_TICK_PER_SECOND * 3)\n #endif\n \n enum rym_stage {\n"} {"commit":"52ec8777be85a475ab53e05a0ccce08c93a81dc6","subject":"Fix errors in parser","message":"Fix errors in parser\n","repos":"imminfo\/ymir,imminfo\/ymir,imminfo\/ymir,imminfo\/ymir","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Ymir\/src\/parser.h\n+++ Ymir\/src\/parser.h\n@@ -140,8 +140,7 @@\n bool res = false;\n if (ifs.is_open()) {\n std::cout << \"Parsing input file:\\t\" << filepath << endl;\n- res = this->parseRepertoire(filepath, \n- ifs, \n+ res = this->parseRepertoire(ifs, \n clonevec, \n gene_segments, \n aligner, \n@@ -179,6 +178,11 @@\n _stream.open(filepath);\n if (_stream.is_open()) {\n std::cout << \"Open the stream to the input file:\\t\" << filepath << endl;\n+ _genes = gene_segments;\n+ _aligner = aligner;\n+ _recomb = recomb;\n+ _opts = opts;\n+ _seq_type = seq_type;\n return true;\n } else {\n std::cout << \"Repertoire parser error:\" << \"\\tinput file [\" << filepath << \"] not found\" << endl;\n@@ -195,15 +199,14 @@\n ClonotypeVector clonevec;\n clonevec.reserve(DEFAULT_REPERTOIRE_RESERVE_SIZE);\n \n- bool res = this->parseRepertoire(filepath, \n- ifs, \n- clonevec, \n- gene_segments, \n- aligner, \n- seq_type, \n- opts, \n- recomb, \n- block_size);\n+ bool res = this->parseRepertoire(_stream, \n+ clonevec, \n+ _genes, \n+ _aligner, \n+ _seq_type, \n+ _opts, \n+ _recomb, \n+ block_size);\n if (res) {\n rep->swap(clonevec);\n }\n@@ -212,7 +215,7 @@\n }\n \n if (_stream.eof()) { \n- _stream.close()\n+ _stream.close();\n }\n }\n \n@@ -222,10 +225,14 @@\n \/\/ ParserConfig _config;\n \/\/ bool _config_is_loaded;\n std::ifstream _stream;\n-\n-\n- virtual bool parseRepertoire(const string &filename,\n- ifstream& ifs,\n+ VDJRecombinationGenes _genes;\n+ AbstractAligner _aligner;\n+ Recombination _recomb;\n+ AlignmentColumnOptions _opts;\n+ SequenceType _seq_type;\n+\n+\n+ virtual bool parseRepertoire(ifstream& ifs,\n ClonotypeVector& vec,\n const VDJRecombinationGenes& gene_segments,\n const AbstractAligner& aligner,\n@@ -379,7 +386,7 @@\n ++index;\n \n if (glob_index % 50000 == 0) {\n- cout << this->get_prefix(filename) + \"parsed \" << (size_t) glob_index << \" lines\" << endl;\n+ cout << \"Parsed \" << (size_t) glob_index << \" lines\" << endl;\n }\n ++glob_index;\n \n"} {"commit":"513fcbdfa80a54111cea8bb3fbe9a1a6ba640de8","subject":"Workaround gcc oddity with Future::within()","message":"Workaround gcc oddity with Future::within()\n\nSummary:\nPrior to this diff, the two `Future::within(Duration, Timekeeper* = nullptr)` overloads were the same typewise but they used different symbols:\n\nReturn-type differences:\n* rvalue-qualified overload returned `Future<T>`\n* lvalue-qualified overload returned `auto` (which resolved to `Future<T>`)\n\nParameter *name* differences:\n* rvalue-qualified overload has unnamed formal-parameters (it is a declaration but not a definition).\n* lvalue-qualified overload has named formal-parameters (it is both a declaration and a definition).\n\nThese seemingly innocuous differences caused gcc to choke: when the `this` object was a `Future<...>` object returned by value, gcc reported the following error: \"error: call of overloaded \u2018within(std::chrono::minutes)\u2019 is ambiguous\", specifically pointing to the two `Future::within(Duration, Timekeeper* = nullptr)` overloads.\n\nConversely clang had no problem with that callsite.\n\ngcc stopped issuing the spurious error-message after this diff's changes, that is, after making the signatures of the two overloads identical in every respect except for the rvalue-qualification vs. lvalue-qualification.\n\nReviewed By: yfeldblum\n\nDifferential Revision: D9474736\n\nfbshipit-source-id: 758001090e5487bd70c9853940807cbdeba8ac94\n","repos":"facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/futures\/Future.h\n+++ folly\/futures\/Future.h\n@@ -1541,9 +1541,9 @@\n \/\/\/ - Calling code should act as if `valid() == false`,\n \/\/\/ i.e., as if `*this` was moved into RESULT.\n \/\/\/ - `RESULT.valid() == true`\n- Future<T> within(Duration, Timekeeper* = nullptr) &&;\n-\n- auto within(Duration dur, Timekeeper* tk = nullptr) & {\n+ Future<T> within(Duration dur, Timekeeper* tk = nullptr) &&;\n+\n+ Future<T> within(Duration dur, Timekeeper* tk = nullptr) & {\n return std::move(*this).within(dur, tk);\n }\n \n@@ -1561,10 +1561,10 @@\n \/\/\/ i.e., as if `*this` was moved into RESULT.\n \/\/\/ - `RESULT.valid() == true`\n template <class E>\n- Future<T> within(Duration, E exception, Timekeeper* = nullptr) &&;\n+ Future<T> within(Duration dur, E exception, Timekeeper* tk = nullptr) &&;\n \n template <class E>\n- auto within(Duration dur, E exception, Timekeeper* tk = nullptr) & {\n+ Future<T> within(Duration dur, E exception, Timekeeper* tk = nullptr) & {\n return std::move(*this).within(dur, exception, tk);\n }\n \n"} {"commit":"e39480b3d476bc10675f49e4500bc3b1e35a64aa","subject":"Be safe when CM sends change state multiple times","message":"Be safe when CM sends change state multiple times\n\nI've notice that Gabble sends the ended state twice some times. This is\na but in the CM, but better be safe.\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-logger\/call-channel.c\n+++ telepathy-logger\/call-channel.c\n@@ -208,6 +208,9 @@\n \n case TP_CALL_STATE_ENDED:\n {\n+ if (priv->end_actor != NULL)\n+ g_object_unref (priv->end_actor);\n+\n priv->end_actor = g_hash_table_lookup (priv->entities,\n GUINT_TO_POINTER (reason->actor));\n \n@@ -218,6 +221,8 @@\n g_object_ref (priv->end_actor);\n \n priv->end_reason = reason->reason;\n+\n+ g_free (priv->detailed_end_reason);\n \n if (reason->dbus_reason == NULL)\n priv->detailed_end_reason = g_strdup (\"\");\n"} {"commit":"ba933a2ccb8a1573477c7db978673a3edbf6ba77","subject":"Add check send acceleration scale","message":"Add check send acceleration scale\n","repos":"open-rdc\/cit_embedded_imu,open-rdc\/cit_embedded_imu","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- adisUtils.c\n+++ adisUtils.c\n@@ -518,6 +518,12 @@\n { \r\n \timu_genericIncremental_3axis(&imu_angle.dw, BASE_DELTA_ANG);\r\n imu_angle.dw.y = imu_accele.dw.x;\r\n+ if(imu_angle.dw.y > 0x04C50000 && imu_angle.dw.y < 0x55D50000){\r\n+ imu_angle.dw.y = 0x04C40000;\r\n+ }\r\n+ else if(imu_angle.dw.y < 0xFB3B0000 && imu_angle.dw.y > 0xAA2B0000){\r\n+ imu_angle.dw.y = 0xFB3C0000;\r\n+ }\r\n \timu_discrete2real_3axis(imu_angle.dw, &imu_angle.f, DELTA_ANG_UNIT);\r\n \timu_check_switch_pm();\r\n \/*\r\n"} {"commit":"3b637e7d08a3c659b2a8258acc6a12595820e2cd","subject":"Use the contacts cache when receiving a message","message":"Use the contacts cache when receiving a message\n\nAlso update the cache if the sender wasn't in the cache.\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-logger\/channel-text.c\n+++ telepathy-logger\/channel-text.c\n@@ -1311,10 +1311,6 @@\n }\n \n \n-\/* the only function of this CB is resolving the remote TpHandle, in case\n- * cannot be known at preparation time (ie on chatrooms channels)\n- *\n- * It sets gets a TplEntryText as weak_ref and sets the sender for it *\/\n static void\n on_received_signal_with_contact_cb (TpConnection *connection,\n guint n_contacts,\n@@ -1328,6 +1324,7 @@\n TplEntryText *log = user_data;\n TplChannelText *tpl_text;\n TpContact *remote;\n+ TpHandle handle;\n \n g_return_if_fail (TPL_IS_ENTRY_TEXT (log));\n \n@@ -1354,6 +1351,10 @@\n }\n \n remote = contacts[0];\n+ handle = tp_contact_get_handle (remote);\n+\n+ g_hash_table_insert (tpl_text->priv->contacts, GUINT_TO_POINTER (handle),\n+ remote);\n \n keepon_on_receiving_signal (log, remote);\n }\n@@ -1493,11 +1494,12 @@\n _tpl_entry_set_timestamp (log, (time_t) arg_Timestamp);\n \n tp_conn = tp_channel_borrow_connection (TP_CHANNEL (tpl_chan));\n- remote = _tpl_channel_text_get_remote_contact (tpl_text);\n+ remote = g_hash_table_lookup (tpl_text->priv->contacts,\n+ GUINT_TO_POINTER (sender));\n \n if (remote == NULL)\n {\n- \/* it's a chatroom and no contact has been pre-cached *\/\n+ \/* Contact is not in the cache *\/\n tp_connection_get_contacts_by_handle (tp_conn, 1, &sender,\n G_N_ELEMENTS (features), features, on_received_signal_with_contact_cb,\n log, NULL, G_OBJECT (tpl_text));\n"} {"commit":"8c78a803fe8a661411b66e9b78206e1302aac24f","subject":"torching unused framework","message":"torching unused framework\n","repos":"sqwiggle\/sqwiggle-ios-sdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- iOSSDK\/constants.h\n+++ iOSSDK\/constants.h\n@@ -22,34 +22,4 @@\n #define SqwiggleUser [SQUser class]\n #define SqwiggleCompany [SQCompany class]\n #define SqwiggleStreamItem [SQStreamItem class]\n-#define SqwiggleWorkroom [SQWorkroom class]\n-\n-\/\/Stolen from AFNetworking. Trust me, it's easier this way\n-static NSString * AFBase64EncodedStringFromString(NSString *string) {\n- NSData *data = [NSData dataWithBytes:[string UTF8String] length:[string lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];\n- NSUInteger length = [data length];\n- NSMutableData *mutableData = [NSMutableData dataWithLength:((length + 2) \/ 3) * 4];\n- \n- uint8_t *input = (uint8_t *)[data bytes];\n- uint8_t *output = (uint8_t *)[mutableData mutableBytes];\n- \n- for (NSUInteger i = 0; i < length; i += 3) {\n- NSUInteger value = 0;\n- for (NSUInteger j = i; j < (i + 3); j++) {\n- value <<= 8;\n- if (j < length) {\n- value |= (0xFF & input[j]);\n- }\n- }\n- \n- static uint8_t const kAFBase64EncodingTable[] = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+\/\";\n- \n- NSUInteger idx = (i \/ 3) * 4;\n- output[idx + 0] = kAFBase64EncodingTable[(value >> 18) & 0x3F];\n- output[idx + 1] = kAFBase64EncodingTable[(value >> 12) & 0x3F];\n- output[idx + 2] = (i + 1) < length ? kAFBase64EncodingTable[(value >> 6) & 0x3F] : '=';\n- output[idx + 3] = (i + 2) < length ? kAFBase64EncodingTable[(value >> 0) & 0x3F] : '=';\n- }\n- \n- return [[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding];\n-}+#define SqwiggleWorkroom [SQWorkroom class]"} {"commit":"89c01a7b2249dc004eca4a6a28a6a9271db437ad","subject":":art: tree_path.h","message":":art: tree_path.h\n","repos":"tree-sitter\/tree-sitter,tree-sitter\/tree-sitter,tree-sitter\/tree-sitter,tree-sitter\/tree-sitter,tree-sitter\/tree-sitter,tree-sitter\/tree-sitter,tree-sitter\/tree-sitter","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/runtime\/tree_path.h\n+++ src\/runtime\/tree_path.h\n@@ -89,10 +89,11 @@\n \n static void tree_path_init(TreePath *path, TSTree *tree) {\n array_clear(path);\n- array_push(path,\n- ((TreePathEntry){\n- .tree = tree, .position = { 0, 0, { 0, 0 } }, .child_index = 0,\n- }));\n+ array_push(path, ((TreePathEntry){\n+ .tree = tree,\n+ .position = { 0, 0, { 0, 0 } },\n+ .child_index = 0,\n+ }));\n if (!tree->visible)\n tree_path_descend(path, (TSPoint){ 0, 0 });\n }\n"} {"commit":"023fd3ba6e689cd720b8bbd4af7dbd3757162407","subject":"get_message_timestamp: debug if timestamp is wildly out","message":"get_message_timestamp: debug if timestamp is wildly out\n\nHopefully, this will help CM authors a little.\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger,freedesktop-unofficial-mirror\/telepathy__telepathy-logger","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-logger\/text-channel.c\n+++ telepathy-logger\/text-channel.c\n@@ -310,6 +310,8 @@\n static guint\n get_message_timestamp (TpMessage *message)\n {\n+ GDateTime *datetime = g_date_time_new_now_utc ();\n+ guint64 now = g_date_time_to_unix (datetime);\n gint64 timestamp;\n \n timestamp = tp_message_get_sent_timestamp (message);\n@@ -317,13 +319,15 @@\n if (timestamp == 0)\n timestamp = tp_message_get_received_timestamp (message);\n \n+ if (timestamp - now > 60 * 60)\n+ DEBUG (\"timestamp is more than an hour in the future.\");\n+ else if (now - timestamp > 60 * 60)\n+ DEBUG (\"timestamp is more than an hour in the past.\");\n+\n if (timestamp == 0)\n- {\n- GDateTime *datetime = g_date_time_new_now_utc ();\n- timestamp = g_date_time_to_unix (datetime);\n- g_date_time_unref (datetime);\n- }\n-\n+ timestamp = now;\n+\n+ g_date_time_unref (datetime);\n return timestamp;\n }\n \n"} {"commit":"ebb0ad045c034b7a8a6118668336ee863ebf5f15","subject":"Pass (const) reference not copy of listener and sender lists","message":"Pass (const) reference not copy of listener and sender lists\n\nResolves #246","repos":"docsteer\/sacnview,docsteer\/sacnview,docsteer\/sacnview,docsteer\/sacnview,docsteer\/sacnview,docsteer\/sacnview,docsteer\/sacnview","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/sacn\/streamingacn.h\n+++ src\/sacn\/streamingacn.h\n@@ -129,10 +129,10 @@\n \n public:\n tListener getListener(quint16 universe);\n- const decltype(m_listenerHash) getListenerList() { return m_listenerHash; }\n+ const decltype(m_listenerHash) &getListenerList() { return m_listenerHash; }\n \n tSender getSender(quint16 universe, CID cid = CID::CreateCid());\n- const decltype(m_senderHash) getSenderList() { return m_senderHash; }\n+ const decltype(m_senderHash) &getSenderList() { return m_senderHash; }\n \n signals:\n void newSender();\n"} {"commit":"e012f7d426084e68d2c81e0550ec99182dfee057","subject":"salut-muc-channel: use guint to iterate over GArray","message":"salut-muc-channel: use guint to iterate over GArray\n\n\n20071019151030-53eee-4398c236f7449d56d1cbee979da63389c367250c.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/salut-muc-channel.c\n+++ src\/salut-muc-channel.c\n@@ -1016,7 +1016,7 @@\n TpHandleRepoIface *contact_repo = tp_base_connection_get_handles\n (base_connection, TP_HANDLE_TYPE_CONTACT);\n TpIntSet *empty, *changes;\n- int i;\n+ guint i;\n \n empty = tp_intset_new ();\n changes = tp_intset_new ();\n"} {"commit":"e6e5e17e0decc1bcd7da0eb5c18c6e8e5b397cb0","subject":"Let the muc manager listen for stanza's instead of messages and add some extra debugging info","message":"Let the muc manager listen for stanza's instead of messages and add some extra debugging info\n\n\n20070124225108-93b9a-230e507f93b014c9e6c578c7fcf458aab7f034af.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/salut-muc-manager.c\n+++ src\/salut-muc-manager.c\n@@ -321,7 +321,7 @@\n }\n \n static gboolean\n-_received_message(SalutImChannel *imchannel, \n+_received_stanza(SalutImChannel *imchannel, \n SalutXmppStanza *message, gpointer data) {\n SalutMucManager *self = SALUT_MUC_MANAGER(data);\n SalutMucManagerPrivate *priv = SALUT_MUC_MANAGER_GET_PRIVATE(data);\n@@ -344,9 +344,13 @@\n if (node == NULL) \n return FALSE;\n \n+ DEBUG(\"Got an invitation\");\n+\n invite = salut_xmpp_node_get_child(node, \"invite\");\n- if (invite == NULL)\n+ if (invite == NULL) {\n+ DEBUG(\"Got invitation, but no invite block!?\");\n return FALSE;\n+ }\n \n room_node = salut_xmpp_node_get_child(invite, \"roomname\");\n \n@@ -435,8 +439,8 @@\n gpointer data) {\n SalutImChannel *imchannel = SALUT_IM_CHANNEL(channel);\n SalutMucManager *self = SALUT_MUC_MANAGER(data);\n- g_signal_connect(imchannel, \"received-message\", \n- G_CALLBACK(_received_message),\n+ g_signal_connect(imchannel, \"received-stanza\", \n+ G_CALLBACK(_received_stanza),\n self);\n }\n \n"} {"commit":"feb5f5fef726955e5ed1b0bb6e295c6eb4aa016e","subject":"read and write headers in imager.c","message":"read and write headers in imager.c\n","repos":"zuiko21\/minimOS,zuiko21\/minimOS,zuiko21\/minimOS,zuiko21\/minimOS,zuiko21\/minimOS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- forge\/filesys\/imager.c\n+++ forge\/filesys\/imager.c\n@@ -1,6 +1,6 @@\n-\/* minimOS disk imager v0.2 *\n+\/* minimOS disk imager v0.3 *\n * (c) 2021 Carlos J. Santisteban *\n- * last modified 20210128-1412 *\n+ * last modified 20210129-1428 *\n *\/\n \n #include <stdio.h>\n@@ -151,30 +151,21 @@\n }\n \n ERR\tcreate(PIM ptr, long tama, char *nom) {\n-\tint i = 0;\n+\tint\t\t\t\ti = 0;\n+\tstruct cabecera\tc;\n \n \tptr->byte = (char*)malloc(tama);\t\/* allocate RAM *\/\n \tif (ptr->byte == NULL)\treturn -2;\t\/* ** not enough memory ** *\/\n \tptr->size = tama;\n \tptr->dirty = 1;\n \/* create minimOS header *\/\n-\tptr->byte[0]=0;\n-\tptr->byte[1]='a';\n-\tptr->byte[2]='V';\n-\tptr->byte[3]='*';\n-\tptr->byte[4]='*';\n-\tptr->byte[5]='*';\n-\tptr->byte[6]='*';\n-\tptr->byte[7]=13;\n-\/* copy volume name into header *\/\n-\twhile(nom[i]!='\\0')\t{\n-\t\tptr->byte[8+i] = nom[i];\n-\t\ti++;\n-\t}\n-\/* name and comment terminators *\/\n-\tptr->byte[8+i] = 0;\n-\tptr->byte[9+i] = 0;\n+\tmemcpy(c.tipo, \"aV\", 2);\n+\tmemcpy(c.extra, \"****\", 4);\t\t\t\/* does this include volume size? *\/\n+\tstrcpy(c.nombre, nom);\n+\tc.coment[0]='\\0';\n \/* to do the rest of the header *\/\n+\/* create header as start sector *\/\n+\tw_sector(ptr->byte, &c);\n \n \treturn\t0;\n }\n@@ -273,21 +264,46 @@\n }\n \n ERR\t\tw_sector(char *sec, struct cabecera* c) {\n-\tint i=0, j=0;\n-\n-\tsec[0] = 0;\n+\tint \t\t\ti=0, j=0;\n+\tunsigned int\thora, fecha;\n+\n+\tsec[0] = 0;\t\t\t\t\t\t\t\t\/* minimOS header ID *\/\n \tsec[7] = 13;\n-\tmemcpy(&(sec[1]), c->tipo, 2);\n+\tmemcpy(&(sec[1]), c->tipo, 2);\t\t\t\/* type and value signature *\/\n \tmemcpy(&(sec[3]), c->extra, 4);\n \twhile(c->nombre[i++]!='\\0');\t\t\t\/* i is name length, incl. term *\/\n \twhile(c->coment[j++]!='\\0');\t\t\t\/* j is comment length, incl. term *\/\n-\tif (i+j>240) \tc->coment[239]='\\0';\t\/* truncate comment if filename is too long *\/\n+\tif (i+j>240) \tc->coment[239-i]='\\0';\t\/* truncate comment if filename is too long *\/\n \tstrcpy(&(sec[8]), c->nombre);\n \tstrcpy(&(sec[8+i]), c->coment);\n+\thora = c->hora << 11;\t\t\t\t\t\/* compose timestamp *\/\n+\thora |= c->minuto << 5;\n+\thora |= c->segundo >> 1;\n+\tfecha = (c->year-1980) << 9;\t\t\t\/* compose datestamp *\/\n+\tfecha |= c->mes << 5;\n+\tfecha |= c->dia;\n+\tmemcpy(&(sec[248]), &hora, 2);\t\t\t\/* transfer modified time *\/\n+\tmemcpy(&(sec[250]), &fecha, 2);\n+\n \treturn 0;\n }\n \n ERR\t\tr_sector(char *sec, struct cabecera* c) {\n+\tint\t\t\t\ti=0;\n+\tunsigned int\thora, fecha;\n+\n \tif ((sec[0]!=0) || (sec[7]!=13))\treturn -7;\t\/* bad header *\/\n-\treturn 0;\n-}\n+\tstrcpy(c->nombre, &(sec[8]));\n+\twhile(c->nombre[i++]!='\\0');\t\t\t\/* i is name length, incl. term *\/\n+\tstrcpy(c->coment, &(sec[8+i]));\n+\tmemcpy(&hora, &(sec[248]), 2);\t\t\t\/* extract modified time *\/\n+\tmemcpy(&fecha, &(sec[250]), 2);\n+\tc->hora = hora >> 11;\t\t\t\t\t\/* decompose timestamp *\/\n+\tc->minuto = (hora >> 5) & 0b111111;\n+\tc->segundo = (hora & 0b11111) << 1;\n+\tc->year = fecha >> 9;\t\t\t\t\t\/* decompose datestamp *\/\n+\tc->mes = (fecha >> 5) & 0b1111;\n+\tc->dia = fecha & 0b11111;\n+\n+\treturn 0;\n+}\n"} {"commit":"ce2f2f96f5ddc96114b2febcdd818c638ffda269","subject":"hardcode the font that i like for now","message":"hardcode the font that i like for now\n","repos":"doy\/runes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -13,7 +13,7 @@\n \n void runes_display_init(RunesTerm *t)\n {\n- t->font_name = \"monospace 10\";\n+ t->font_name = \"Fixed 10.5\";\n runes_display_recalculate_font_metrics(t);\n \n t->colors[0] = cairo_pattern_create_rgb(0.0, 0.0, 0.0);\n"} {"commit":"935d77a61e4190714fc7e68a39c392122b793032","subject":"remove unselect line","message":"remove unselect line\n\nSigned-off-by: Daniel Lezcano <e9fa45941f2ebe89c1b9d6c5f339ab42eadb8567@linaro.org>\n","repos":"gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug,gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -269,25 +269,13 @@\n \t\t\t0, 2, 0, maxy - 2, maxx);\n }\n \n-static int inline display_show_un_selection(int win, int line,\n-\t\t\t\t\t bool highlight, bool bold)\n+int display_show_unselection(int win, int line, bool bold)\n {\n \tif (mvwchgat(windata[win].pad, line, 0, -1,\n-\t\t highlight ? WA_STANDOUT :\n \t\t bold ? WA_BOLD: WA_NORMAL, 0, NULL) < 0)\n \t\treturn -1;\n \n \treturn display_refresh_pad(win);\n-}\n-\n-int display_show_selection(int win, int line)\n-{\n-\treturn display_show_un_selection(win, line, true, false);\n-}\n-\n-int display_show_unselection(int win, int line, bool bold)\n-{\n-\treturn display_show_un_selection(win, line, false, bold);\n }\n \n void *display_get_row_data(int win)\n@@ -360,7 +348,6 @@\n \t\t\tscrolling++;\n \t\tcursor++;\n \t}\n-\tdisplay_show_selection(current_win, cursor);\n \n \twindata[current_win].scrolling = scrolling;\n \twindata[current_win].cursor = cursor;\n@@ -384,7 +371,6 @@\n \t\t\tscrolling--;\n \t\tcursor--;\n \t}\n-\tdisplay_show_selection(current_win, cursor);\n \n \twindata[current_win].scrolling = scrolling;\n \twindata[current_win].cursor = cursor;\n"} {"commit":"49fee833241a5609005ddaa25ceb92d7ff770a8a","subject":"make indent","message":"make indent\n","repos":"google\/honggfuzz,google\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -216,8 +216,8 @@\n ATOMIC_GET(hfuzz->cnts.timeoutedCnt), (unsigned long)hfuzz->timing.tmOut);\n \/* Feedback data sources. Common headers. *\/\n display_put(\" Corpus Size : \" ESC_BOLD \"%\" _HF_NONMON_SEP \"zu\" ESC_RESET \", max size: \" ESC_BOLD\n- \"%\" _HF_NONMON_SEP \"zu\" ESC_RESET \" bytes, init dir: \" ESC_BOLD\n- \"%\" _HF_NONMON_SEP \"zu\" ESC_RESET \" files\\n\",\n+ \"%\" _HF_NONMON_SEP \"zu\" ESC_RESET \" bytes, init dir: \" ESC_BOLD \"%\" _HF_NONMON_SEP\n+ \"zu\" ESC_RESET \" files\\n\",\n hfuzz->dynfileqCnt, hfuzz->maxFileSz, ATOMIC_GET(hfuzz->io.fileCnt));\n display_put(\" Cov Update : \" ESC_BOLD \"%s\" ESC_RESET \" ago\\n\" ESC_RESET, lastCovStr);\n display_put(\" Coverage :\");\n"} {"commit":"0bd8eda8d199f181e0a9c77f3ba4760cbca309cb","subject":"LUCY-176 More INCREF\/DECREF symbol collisions under Windows.","message":"LUCY-176 More INCREF\/DECREF symbol collisions under Windows.\n\nINCREF and DECREF are defined in windows.h, so we need to make sure that the\nprefixed variants CFISH_INCREF and CFISH_DECREF are used in our own code\nwhereever collisions may occur.\n\n\ngit-svn-id: 0e6074679e66e8f1cc73dfc755b08bab367f805b@1164648 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"nwellnhof\/lucy,kidaa\/lucy,kidaa\/lucy,apache\/lucy,rbevers\/lucy,nwellnhof\/lucy,kidaa\/lucy,apache\/lucy,rbevers\/lucy,kidaa\/lucy,rbevers\/lucy,rectang\/lucy,nwellnhof\/lucy,apache\/lucy,rbevers\/lucy,nwellnhof\/lucy,apache\/lucy,pombredanne\/apache-lucy,pombredanne\/apache-lucy,rectang\/lucy,apache\/lucy,rbevers\/lucy,apache\/lucy,rectang\/lucy,kidaa\/lucy,nwellnhof\/lucy,pombredanne\/apache-lucy,rectang\/lucy,nwellnhof\/lucy,rbevers\/lucy,pombredanne\/apache-lucy,rbevers\/lucy,nwellnhof\/lucy,pombredanne\/apache-lucy,pombredanne\/apache-lucy,rectang\/lucy,kidaa\/lucy,rectang\/lucy,apache\/lucy,pombredanne\/apache-lucy,rectang\/lucy,kidaa\/lucy,kidaa\/lucy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/Lucy\/Store\/FSFileHandle.c\n+++ core\/Lucy\/Store\/FSFileHandle.c\n@@ -92,7 +92,7 @@\n FH_do_open((FileHandle*)self, path, flags);\n if (!path || !CB_Get_Size(path)) {\n Err_set_error(Err_new(CB_newf(\"Missing required param 'path'\")));\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n \n@@ -103,7 +103,7 @@\n self->fd = 0;\n Err_set_error(Err_new(CB_newf(\"Attempt to open '%o' failed: %s\",\n path, strerror(errno))));\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n if (flags & FH_EXCLUSIVE) {\n@@ -115,7 +115,7 @@\n if (self->len == -1) {\n Err_set_error(Err_new(CB_newf(\"lseek64 on %o failed: %s\",\n self->path, strerror(errno))));\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n else {\n@@ -123,7 +123,7 @@\n if (check_val == -1) {\n Err_set_error(Err_new(CB_newf(\"lseek64 on %o failed: %s\",\n self->path, strerror(errno))));\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n }\n@@ -137,20 +137,20 @@\n if (!self->buf) {\n \/\/ An error occurred during SI_map, which has set\n \/\/ Err_error for us already.\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n }\n }\n else {\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n }\n else {\n Err_set_error(Err_new(CB_newf(\"Must specify FH_READ_ONLY or FH_WRITE_ONLY to open '%o'\",\n path)));\n- DECREF(self);\n+ CFISH_DECREF(self);\n return NULL;\n }\n \n"} {"commit":"bf42519769d85fb393a5ac169ee0bc202760746d","subject":"[CHG] Little optimisation on GRRLIB_GetPixelFromtexImg and GRRLIB_SetPixelTotexImg","message":"[CHG] Little optimisation on GRRLIB_GetPixelFromtexImg and \nGRRLIB_SetPixelTotexImg\n\n\ngit-svn-id: 50c32b27f42067071765738a4001fbe82ae75e2b@26 eccdf170-e2e9-11dd-a8eb-ddf07f3c1838\n","repos":"mirror\/grrlib,mirror\/grrlib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- template\/source\/GRRLIB\/GRRLIB.c\n+++ template\/source\/GRRLIB\/GRRLIB.c\n@@ -441,23 +441,17 @@\n *\/\r\n u32 GRRLIB_GetPixelFromtexImg(int x, int y, GRRLIB_texImg tex){\r\n u8 *truc = (u8*)tex.data;\r\n- u32 x1, y1;\r\n u8 r, g, b, a;\r\n- u32 value;\r\n u32 offset;\r\n \r\n- x1 = x >> 2;\r\n- y1 = y >> 2; \r\n- offset = (y1*16*tex.w) + (x1*64) + ((y%4 * 4 + x%4 ) * 2); \/\/ Fuckin equation found by NoNameNo ;)\r\n+ offset = (((y >> 2)<<4)*tex.w) + ((x >> 2)<<6) + (((y%4 << 2) + x%4 ) << 1); \/\/ Fuckin equation found by NoNameNo ;)\r\n \r\n a=*(truc+offset);\r\n r=*(truc+offset+1);\r\n g=*(truc+offset+32);\r\n b=*(truc+offset+33);\r\n \r\n- value = (r<<24) | (g<<16) | (b<<8) | a;\r\n-\r\n- return(value);\r\n+ return((r<<24) | (g<<16) | (b<<8) | a);\r\n }\r\n \r\n \/**\r\n@@ -469,26 +463,16 @@\n *\/\r\n void GRRLIB_SetPixelTotexImg(int x, int y, GRRLIB_texImg tex, u32 color){\r\n u8 *truc = (u8*)tex.data;\r\n- u32 x1, y1;\r\n- u8 r, g, b, a;\r\n u32 offset;\r\n \r\n- x1 = x >> 2;\r\n- y1 = y >> 2;\r\n- offset = (y1*16*tex.w) + (x1*64) + ((y%4 * 4 + x%4 ) * 2); \/\/ Fuckin equation found by NoNameNo ;)\r\n-\r\n- a=color & 0xFF;\r\n- b=(color>>8) & 0xFF;\r\n- g=(color>>16) & 0xFF;\r\n- r=(color>>24) & 0xFF;\r\n-\r\n- *(truc+offset)=a;\r\n- *(truc+offset+1)=r;\r\n- *(truc+offset+32)=g;\r\n- *(truc+offset+33)=b;\r\n+ offset = (((y >> 2)<<4)*tex.w) + ((x >> 2)<<6) + (((y%4 << 2) + x%4 ) <<1); \/\/ Fuckin equation found by NoNameNo ;)\r\n+\r\n+ *(truc+offset)=color & 0xFF;\r\n+ *(truc+offset+1)=(color>>24) & 0xFF;\r\n+ *(truc+offset+32)=(color>>16) & 0xFF;\r\n+ *(truc+offset+33)=(color>>8) & 0xFF;\r\n \r\n DCFlushRange(tex.data, tex.w * tex.h * 4);\r\n-\r\n }\r\n \r\n \/**\r\n"} {"commit":"4051a2a1dad9ce163d9c2c2c263a8f827fd55de5","subject":"arm: mm: v7 panic when device's va conflicts with TA address space","message":"arm: mm: v7 panic when device's va conflicts with TA address space\n\nIf mm->va is smaller than 32M, then mm->va will conflict with\nuser TA address space. This mapping will be overridden\/hidden\nlater when a user TA is loaded since these low addresses are\nused as TA virtual address space.\n\nSome SoCs have devices at low addresses, so we need to map at\nleast those devices at a virtual address which isn't the same\nas the physical.\n\nTODO: support mapping devices at a virtual address which isn't\nthe same as the physical address.\n\nSigned-off-by: Peng Fan <7351ee4254d3ae583dd8772c904897a231cf4948@gmail.com>\nReviewed-by: Pascal Brand <0b55292d2562685bad4ce52d64f802e8f1cd299e@linaro.org>\nTested-by: Pascal Brand <0b55292d2562685bad4ce52d64f802e8f1cd299e@linaro.org> (QEMU platform)\n","repos":"Microsoft\/optee_os,matt2048\/optee_os,chshxi1989\/optee_os,pascal-brand-st-dev\/optee_os,chshxi1989\/optee_os,pascal-brand-st-dev\/optee_os,chshxi1989\/optee_os,cedric-chaumont-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,matt2048\/optee_os,matt2048\/optee_os,cedric-chaumont-st-dev\/optee_os,Microsoft\/optee_os,Microsoft\/optee_os,chshxi1989\/optee_os,Microsoft\/optee_os,pascal-brand-st-dev\/optee_os,cedric-chaumont-st-dev\/optee_os,chshxi1989\/optee_os,Microsoft\/optee_os,cedric-chaumont-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,matt2048\/optee_os","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- core\/arch\/arm\/mm\/core_mmu_v7.c\n+++ core\/arch\/arm\/mm\/core_mmu_v7.c\n@@ -600,6 +600,25 @@\n \n \tTEE_ASSERT(mm && ttb);\n \n+\t\/*\n+\t * If mm->va is smaller than 32M, then mm->va will conflict with\n+\t * user TA address space. This mapping will be overridden\/hidden\n+\t * later when a user TA is loaded since these low addresses are\n+\t * used as TA virtual address space.\n+\t *\n+\t * Some SoCs have devices at low addresses, so we need to map at\n+\t * least those devices at a virtual address which isn't the same\n+\t * as the physical.\n+\t *\n+\t * TODO: support mapping devices at a virtual address which isn't\n+\t * the same as the physical address.\n+\t *\/\n+\tif (mm->va < (TEE_MMU_UL1_NUM_ENTRIES * SECTION_SIZE)) {\n+\t\tEMSG(\"va 0x%\" PRIxVA \" conflicts with user ta address!\",\n+\t\t mm->va);\n+\t\tpanic();\n+\t}\n+\n \tif ((mm->va | mm->pa | mm->size) & SECTION_MASK) {\n \t\tregion_size = SMALL_PAGE_SIZE;\n \n"} {"commit":"16aeadb1fb0a7fed460446b01ee1efc81ca8eb80","subject":"const correctness","message":"const correctness\n","repos":"drmonkeysee\/CinyTest","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sample\/binarytree.c\n+++ src\/sample\/binarytree.c\n@@ -96,7 +96,7 @@\n }\n \n *depth = (ldepth > rdepth ? ldepth : rdepth) + 1;\n- ptrdiff_t depth_diff = ldepth - rdepth;\n+ const ptrdiff_t depth_diff = ldepth - rdepth;\n return lbalanced && rbalanced && depth_diff >= -1 && depth_diff <= 1;\n }\n \n"} {"commit":"c5f522e72260cd2c8cddd13c06211279ada23ad0","subject":"Remove duplication of comments at the top of the file.","message":"Remove duplication of comments at the top of the file.\n\ngit-svn-id: 43aea61533866f88f23079d48f4f5dc2d5288937@2122 1d2547de-c912-0410-9cb9-b8ca96c0e9e2\n","repos":"Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- FreeRTOS\/Demo\/CORTEX_M4_ATSAM4L_Atmel_Studio\/src\/main.c\n+++ FreeRTOS\/Demo\/CORTEX_M4_ATSAM4L_Atmel_Studio\/src\/main.c\n@@ -1,68 +1,3 @@\n-\/*\r\n- FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r\n- All rights reserved\r\n-\r\n- VISIT http:\/\/www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r\n-\r\n- ***************************************************************************\r\n- * *\r\n- * FreeRTOS provides completely free yet professionally developed, *\r\n- * robust, strictly quality controlled, supported, and cross *\r\n- * platform software that has become a de facto standard. *\r\n- * *\r\n- * Help yourself get started quickly and support the FreeRTOS *\r\n- * project by purchasing a FreeRTOS tutorial book, reference *\r\n- * manual, or both from: http:\/\/www.FreeRTOS.org\/Documentation *\r\n- * *\r\n- * Thank you! *\r\n- * *\r\n- ***************************************************************************\r\n-\r\n- This file is part of the FreeRTOS distribution.\r\n-\r\n- FreeRTOS is free software; you can redistribute it and\/or modify it under\r\n- the terms of the GNU General Public License (version 2) as published by the\r\n- Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r\n-\r\n- >>! NOTE: The modification to the GPL is included to allow you to distribute\r\n- >>! a combined work that includes FreeRTOS without being obliged to provide\r\n- >>! the source code for proprietary components outside of the FreeRTOS\r\n- >>! kernel.\r\n-\r\n- FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r\n- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r\n- FOR A PARTICULAR PURPOSE. Full license text is available from the following\r\n- link: http:\/\/www.freertos.org\/a00114.html\r\n-\r\n- 1 tab == 4 spaces!\r\n-\r\n- ***************************************************************************\r\n- * *\r\n- * Having a problem? Start by reading the FAQ \"My application does *\r\n- * not run, what could be wrong?\" *\r\n- * *\r\n- * http:\/\/www.FreeRTOS.org\/FAQHelp.html *\r\n- * *\r\n- ***************************************************************************\r\n-\r\n- http:\/\/www.FreeRTOS.org - Documentation, books, training, latest versions,\r\n- license and Real Time Engineers Ltd. contact details.\r\n-\r\n- http:\/\/www.FreeRTOS.org\/plus - A selection of FreeRTOS ecosystem products,\r\n- including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r\n- compatible FAT file system, and our tiny thread aware UDP\/IP stack.\r\n-\r\n- http:\/\/www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r\n- Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS\r\n- licenses offer ticketed support, indemnification and middleware.\r\n-\r\n- http:\/\/www.SafeRTOS.com - High Integrity Systems also provide a safety\r\n- engineered and independently SIL3 certified version for use in safety and\r\n- mission critical applications that require provable dependability.\r\n-\r\n- 1 tab == 4 spaces!\r\n-*\/\r\n-\r\n \/*\r\n FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r\n All rights reserved\r\n"} {"commit":"eaa8e7ab99d1b33db9362f35c1d65df8df39dea9","subject":"drm\/nouveau\/i2c: fix a bit of a thinko in nv_wri2cr helper functions","message":"drm\/nouveau\/i2c: fix a bit of a thinko in nv_wri2cr helper functions\n\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/core\/subdev\/i2c\/base.c\n+++ drivers\/gpu\/drm\/nouveau\/core\/subdev\/i2c\/base.c\n@@ -46,13 +46,13 @@\n int\n nv_wri2cr(struct nouveau_i2c_port *port, u8 addr, u8 reg, u8 val)\n {\n+\tu8 buf[2] = { reg, val };\n \tstruct i2c_msg msgs[] = {\n-\t\t{ .addr = addr, .flags = 0, .len = 1, .buf = ® },\n-\t\t{ .addr = addr, .flags = 0, .len = 1, .buf = &val },\n+\t\t{ .addr = addr, .flags = 0, .len = 2, .buf = buf },\n \t};\n \n-\tint ret = i2c_transfer(&port->adapter, msgs, 2);\n-\tif (ret != 2)\n+\tint ret = i2c_transfer(&port->adapter, msgs, 1);\n+\tif (ret != 1)\n \t\treturn -EIO;\n \n \treturn 0;\n"} {"commit":"d71042c1fa1c3b32bfd55151eef6b2e104301a11","subject":"[media] mx1-camera: move interface activation and deactivation to clock callbacks","message":"[media] mx1-camera: move interface activation and deactivation to clock callbacks\n\nWhen adding and removing a client, the mx1-camera driver only activates\nand deactivates its camera interface respectively, which doesn't include\nany client-specific actions. Move this functionality into .clock_start()\nand .clock_stop() callbacks.\n\nSigned-off-by: Guennadi Liakhovetski <50875182aae23d69ca7738697596f18a14e926fc@gmx.de>\nAcked-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nAcked-by: Laurent Pinchart <3ded2f39a78f0d7044839546f95841842b4d7c96@ideasonboard.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/platform\/soc_camera\/mx1_camera.c\n+++ drivers\/media\/platform\/soc_camera\/mx1_camera.c\n@@ -399,7 +399,7 @@\n {\n \tunsigned int csicr1 = CSICR1_EN;\n \n-\tdev_dbg(pcdev->soc_host.icd->parent, \"Activate device\\n\");\n+\tdev_dbg(pcdev->soc_host.v4l2_dev.dev, \"Activate device\\n\");\n \n \tclk_prepare_enable(pcdev->clk);\n \n@@ -415,34 +415,43 @@\n \n static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)\n {\n-\tdev_dbg(pcdev->soc_host.icd->parent, \"Deactivate device\\n\");\n+\tdev_dbg(pcdev->soc_host.v4l2_dev.dev, \"Deactivate device\\n\");\n \n \t\/* Disable all CSI interface *\/\n \t__raw_writel(0x00, pcdev->base + CSICR1);\n \n \tclk_disable_unprepare(pcdev->clk);\n+}\n+\n+static int mx1_camera_add_device(struct soc_camera_device *icd)\n+{\n+\tdev_info(icd->parent, \"MX1 Camera driver attached to camera %d\\n\",\n+\t\t icd->devnum);\n+\n+\treturn 0;\n+}\n+\n+static void mx1_camera_remove_device(struct soc_camera_device *icd)\n+{\n+\tdev_info(icd->parent, \"MX1 Camera driver detached from camera %d\\n\",\n+\t\t icd->devnum);\n }\n \n \/*\n * The following two functions absolutely depend on the fact, that\n * there can be only one camera on i.MX1\/i.MXL camera sensor interface\n *\/\n-static int mx1_camera_add_device(struct soc_camera_device *icd)\n-{\n-\tstruct soc_camera_host *ici = to_soc_camera_host(icd->parent);\n+static int mx1_camera_clock_start(struct soc_camera_host *ici)\n+{\n \tstruct mx1_camera_dev *pcdev = ici->priv;\n \n-\tdev_info(icd->parent, \"MX1 Camera driver attached to camera %d\\n\",\n-\t\t icd->devnum);\n-\n \tmx1_camera_activate(pcdev);\n \n \treturn 0;\n }\n \n-static void mx1_camera_remove_device(struct soc_camera_device *icd)\n-{\n-\tstruct soc_camera_host *ici = to_soc_camera_host(icd->parent);\n+static void mx1_camera_clock_stop(struct soc_camera_host *ici)\n+{\n \tstruct mx1_camera_dev *pcdev = ici->priv;\n \tunsigned int csicr1;\n \n@@ -452,9 +461,6 @@\n \n \t\/* Stop DMA engine *\/\n \timx_dma_disable(pcdev->dma_chan);\n-\n-\tdev_info(icd->parent, \"MX1 Camera driver detached from camera %d\\n\",\n-\t\t icd->devnum);\n \n \tmx1_camera_deactivate(pcdev);\n }\n@@ -669,6 +675,8 @@\n \t.owner\t\t= THIS_MODULE,\n \t.add\t\t= mx1_camera_add_device,\n \t.remove\t\t= mx1_camera_remove_device,\n+\t.clock_start\t= mx1_camera_clock_start,\n+\t.clock_stop\t= mx1_camera_clock_stop,\n \t.set_bus_param\t= mx1_camera_set_bus_param,\n \t.set_fmt\t= mx1_camera_set_fmt,\n \t.try_fmt\t= mx1_camera_try_fmt,\n"} {"commit":"e335f224e35f413775a549889318afe6bd0342b0","subject":"V4L\/DVB (11410): gspca - m5602-ov9650: Always init the ov9650 before starting a stream","message":"V4L\/DVB (11410): gspca - m5602-ov9650: Always init the ov9650 before starting a stream\n\nThis is a hack preventing a suspend-to-ram\/disk regression.\n\nSigned-off-by: Erik Andr\u00e9n <1e681b7888245a64a1352e28c19b66ddbad14d09@gmail.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/m5602\/m5602_ov9650.c\n+++ drivers\/media\/video\/gspca\/m5602\/m5602_ov9650.c\n@@ -139,6 +139,7 @@\n \t\tdata = 0x30;\n \t\terr = m5602_write_sensor(sd, OV9650_MVFP, &data, 1);\n \t}\n+\n \treturn err;\n }\n \n@@ -146,6 +147,10 @@\n {\n \tint i, err = 0;\n \tstruct cam *cam = &sd->gspca_dev.cam;\n+\n+\terr = ov9650_init(sd);\n+\tif (err < 0)\n+\t\treturn err;\n \n \tfor (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {\n \t\tif (res_init_ov9650[i][0] == BRIDGE)\n"} {"commit":"9204df650808cf6cf1d84e027c3fec66d7d845d2","subject":"staging: brcm80211: resolved checkpatch warnings in N phy","message":"staging: brcm80211: resolved checkpatch warnings in N phy\n\nCode that exceeded the 80 char limit has been placed in separate\nfunctions. Checkpatch warnings for the phy dir are now reduced to 1.\n\nReviewed-by: Pieter-Paul Giesberts <d101f7ec36e185d305862a92a05a9a0c1b62aa38@broadcom.com>\nReviewed-by: Henry Ptasinski <a2bfa192d69f2dcfd5f53307558e46c4ad79ca40@broadcom.com>\nSigned-off-by: Arend van Spriel <06447fbe43693466d3293d0b5eaeeb2efd3d7d3a@broadcom.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/brcm80211\/brcmsmac\/phy\/phy_n.c\n+++ drivers\/staging\/brcm80211\/brcmsmac\/phy\/phy_n.c\n@@ -14544,6 +14544,44 @@\n \t\tpi->phy_5g_pwrgain = true;\n }\n \n+static s32 get_rf_pwr_offset(struct brcms_phy *pi, s16 pga_gn, s16 pad_gn)\n+{\n+\ts32 rfpwr_offset = 0;\n+\n+\tif (CHSPEC_IS2G(pi->radio_chanspec)) {\n+\t\tif ((pi->pubpi.radiorev == 3) ||\n+\t\t (pi->pubpi.radiorev == 4) ||\n+\t\t (pi->pubpi.radiorev == 6))\n+\t\t\trfpwr_offset = (s16)\n+\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev3n4\n+\t\t\t\t [pad_gn];\n+\t\telse if (pi->pubpi.radiorev == 5)\n+\t\t\trfpwr_offset = (s16)\n+\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev5\n+\t\t\t\t [pad_gn];\n+\t\telse if ((pi->pubpi.radiorev == 7)\n+\t\t\t || (pi->pubpi.radiorev ==\n+\t\t\t 8))\n+\t\t\trfpwr_offset = (s16)\n+\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev7\n+\t\t\t\t [pad_gn];\n+\t} else {\n+\t\tif ((pi->pubpi.radiorev == 3) ||\n+\t\t (pi->pubpi.radiorev == 4) ||\n+\t\t (pi->pubpi.radiorev == 6))\n+\t\t\trfpwr_offset = (s16)\n+\t\t\t\t nphy_papd_pgagain_dlt_5g_2057\n+\t\t\t\t [pga_gn];\n+\t\telse if ((pi->pubpi.radiorev == 7)\n+\t\t\t || (pi->pubpi.radiorev ==\n+\t\t\t 8))\n+\t\t\trfpwr_offset = (s16)\n+\t\t\t\t nphy_papd_pgagain_dlt_5g_2057rev7\n+\t\t\t\t [pga_gn];\n+\t}\n+\treturn rfpwr_offset;\n+}\n+\n void wlc_phy_init_nphy(struct brcms_phy *pi)\n {\n \tu16 val;\n@@ -14714,7 +14752,7 @@\n \t\tu16 idx;\n \t\ts16 pga_gn = 0;\n \t\ts16 pad_gn = 0;\n-\t\ts32 rfpwr_offset = 0;\n+\t\ts32 rfpwr_offset;\n \n \t\tif (PHY_IPA(pi)) {\n \t\t\ttx_pwrctrl_tbl = wlc_phy_get_ipa_gaintbl_nphy(pi);\n@@ -14764,38 +14802,8 @@\n \t\t\tfor (idx = 0; idx < 128; idx++) {\n \t\t\t\tpga_gn = (tx_pwrctrl_tbl[idx] >> 24) & 0xf;\n \t\t\t\tpad_gn = (tx_pwrctrl_tbl[idx] >> 19) & 0x1f;\n-\n-\t\t\t\tif (CHSPEC_IS2G(pi->radio_chanspec)) {\n-\t\t\t\t\tif ((pi->pubpi.radiorev == 3) ||\n-\t\t\t\t\t (pi->pubpi.radiorev == 4) ||\n-\t\t\t\t\t (pi->pubpi.radiorev == 6))\n-\t\t\t\t\t\trfpwr_offset = (s16)\n-\t\t\t\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev3n4\n-\t\t\t\t\t\t\t [pad_gn];\n-\t\t\t\t\telse if (pi->pubpi.radiorev == 5)\n-\t\t\t\t\t\trfpwr_offset = (s16)\n-\t\t\t\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev5\n-\t\t\t\t\t\t\t [pad_gn];\n-\t\t\t\t\telse if ((pi->pubpi.radiorev == 7)\n-\t\t\t\t\t\t || (pi->pubpi.radiorev ==\n-\t\t\t\t\t\t 8))\n-\t\t\t\t\t\trfpwr_offset = (s16)\n-\t\t\t\t\t\t\t nphy_papd_padgain_dlt_2g_2057rev7\n-\t\t\t\t\t\t\t [pad_gn];\n-\t\t\t\t} else {\n-\t\t\t\t\tif ((pi->pubpi.radiorev == 3) ||\n-\t\t\t\t\t (pi->pubpi.radiorev == 4) ||\n-\t\t\t\t\t (pi->pubpi.radiorev == 6))\n-\t\t\t\t\t\trfpwr_offset = (s16)\n-\t\t\t\t\t\t\t nphy_papd_pgagain_dlt_5g_2057\n-\t\t\t\t\t\t\t [pga_gn];\n-\t\t\t\t\telse if ((pi->pubpi.radiorev == 7)\n-\t\t\t\t\t\t || (pi->pubpi.radiorev ==\n-\t\t\t\t\t\t 8))\n-\t\t\t\t\t\trfpwr_offset = (s16)\n-\t\t\t\t\t\t\t nphy_papd_pgagain_dlt_5g_2057rev7\n-\t\t\t\t\t\t\t [pga_gn];\n-\t\t\t\t}\n+\t\t\t\trfpwr_offset = get_rf_pwr_offset(pi, pga_gn,\n+\t\t\t\t\t\t\t\t pad_gn);\n \t\t\t\twlc_phy_table_write_nphy(\n \t\t\t\t\tpi,\n \t\t\t\t\tNPHY_TBL_ID_CORE1TXPWRCTL,\n@@ -20407,6 +20415,45 @@\n \t\twrite_phy_reg(pi, 0x1bb, valuetostuff);\n }\n \n+static void brcms_phy_wr_tx_mux(struct brcms_phy *pi, u8 core)\n+{\n+\tif (PHY_IPA(pi)) {\n+\t\tif (NREV_GE(pi->pubpi.phy_rev, 7))\n+\t\t\twrite_radio_reg(pi,\n+\t\t\t\t\t((core == PHY_CORE_0) ?\n+\t\t\t\t\t RADIO_2057_TX0_TX_SSI_MUX :\n+\t\t\t\t\t RADIO_2057_TX1_TX_SSI_MUX),\n+\t\t\t\t\t(CHSPEC_IS5G(pi->radio_chanspec) ?\n+\t\t\t\t\t0xc : 0xe));\n+\t\telse\n+\t\t\twrite_radio_reg(pi,\n+\t\t\t\t\tRADIO_2056_TX_TX_SSI_MUX |\n+\t\t\t\t\t((core == PHY_CORE_0) ?\n+\t\t\t\t\t RADIO_2056_TX0 : RADIO_2056_TX1),\n+\t\t\t\t\t(CHSPEC_IS5G(pi->radio_chanspec) ?\n+\t\t\t\t\t0xc : 0xe));\n+\t} else {\n+\t\tif (NREV_GE(pi->pubpi.phy_rev, 7)) {\n+\t\t\twrite_radio_reg(pi,\n+\t\t\t\t\t((core == PHY_CORE_0) ?\n+\t\t\t\t\t RADIO_2057_TX0_TX_SSI_MUX :\n+\t\t\t\t\t RADIO_2057_TX1_TX_SSI_MUX),\n+\t\t\t\t\t0x11);\n+\n+\t\t\tif (pi->pubpi.radioid == BCM2057_ID)\n+\t\t\t\twrite_radio_reg(pi,\n+\t\t\t\t\t\tRADIO_2057_IQTEST_SEL_PU, 0x1);\n+\n+\t\t} else {\n+\t\t\twrite_radio_reg(pi,\n+\t\t\t\t\tRADIO_2056_TX_TX_SSI_MUX |\n+\t\t\t\t\t((core == PHY_CORE_0) ?\n+\t\t\t\t\t RADIO_2056_TX0 : RADIO_2056_TX1),\n+\t\t\t\t\t0x11);\n+\t\t}\n+\t}\n+}\n+\n void wlc_phy_rssisel_nphy(struct brcms_phy *pi, u8 core_code, u8 rssi_type)\n {\n \tu16 mask, val;\n@@ -20529,103 +20576,13 @@\n \t\t\t\t\t\t\t (core ==\n \t\t\t\t\t\t\t PHY_CORE_0) ? 0xa6\n \t\t\t\t\t\t\t : 0xa7, mask, val);\n-\n-\t\t\t\t\t\tif (PHY_IPA(pi)) {\n-\t\t\t\t\t\t\tif (NREV_GE\n-\t\t\t\t\t\t\t\t (pi->pubpi.\n-\t\t\t\t\t\t\t\t phy_rev,\n-\t\t\t\t\t\t\t\t 7))\n-\t\t\t\t\t\t\t\twrite_radio_reg\n-\t\t\t\t\t\t\t\t\t(pi,\n-\t\t\t\t\t\t\t\t\t((core\n-\t\t\t\t\t\t\t\t\t ==\n-\t\t\t\t\t\t\t\t\t PHY_CORE_0)\n-\t\t\t\t\t\t\t\t\t ?\n-\t\t\t\t\t\t\t\t\t RADIO_2057_TX0_TX_SSI_MUX\n-\t\t\t\t\t\t\t\t\t :\n-\t\t\t\t\t\t\t\t\t RADIO_2057_TX1_TX_SSI_MUX),\n-\t\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\t\tCHSPEC_IS5G\n-\t\t\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\t\t\tpi\n-\t\t\t\t\t\t\t\t\t\t\t->\n-\t\t\t\t\t\t\t\t\t\t\tradio_chanspec)\n-\t\t\t\t\t\t\t\t\t\t?\n-\t\t\t\t\t\t\t\t\t\t0xc\n-\t\t\t\t\t\t\t\t\t\t:\n-\t\t\t\t\t\t\t\t\t\t0xe));\n-\t\t\t\t\t\t\telse\n-\t\t\t\t\t\t\t\twrite_radio_reg\n-\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\tpi,\n-\t\t\t\t\t\t\t\t\tRADIO_2056_TX_TX_SSI_MUX\n-\t\t\t\t\t\t\t\t\t|\n-\t\t\t\t\t\t\t\t\t((core\n-\t\t\t\t\t\t\t\t\t ==\n-\t\t\t\t\t\t\t\t\t PHY_CORE_0)\n-\t\t\t\t\t\t\t\t\t ?\n-\t\t\t\t\t\t\t\t\t RADIO_2056_TX0\n-\t\t\t\t\t\t\t\t\t :\n-\t\t\t\t\t\t\t\t\t RADIO_2056_TX1),\n-\t\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\t\tCHSPEC_IS5G\n-\t\t\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\t\t\tpi\n-\t\t\t\t\t\t\t\t\t\t\t->\n-\t\t\t\t\t\t\t\t\t\t\tradio_chanspec)\n-\t\t\t\t\t\t\t\t\t\t?\n-\t\t\t\t\t\t\t\t\t\t0xc\n-\t\t\t\t\t\t\t\t\t\t:\n-\t\t\t\t\t\t\t\t\t\t0xe));\n-\t\t\t\t\t\t} else {\n-\n-\t\t\t\t\t\t\tif (NREV_GE\n-\t\t\t\t\t\t\t\t (pi->pubpi.\n-\t\t\t\t\t\t\t\t phy_rev,\n-\t\t\t\t\t\t\t\t 7)) {\n-\t\t\t\t\t\t\t\twrite_radio_reg\n-\t\t\t\t\t\t\t\t\t(pi,\n-\t\t\t\t\t\t\t\t\t((core\n-\t\t\t\t\t\t\t\t\t ==\n-\t\t\t\t\t\t\t\t\t PHY_CORE_0)\n-\t\t\t\t\t\t\t\t\t ?\n-\t\t\t\t\t\t\t\t\t RADIO_2057_TX0_TX_SSI_MUX\n-\t\t\t\t\t\t\t\t\t :\n-\t\t\t\t\t\t\t\t\t RADIO_2057_TX1_TX_SSI_MUX),\n-\t\t\t\t\t\t\t\t\t0x11);\n-\n-\t\t\t\t\t\t\t\tif (pi->pubpi.\n-\t\t\t\t\t\t\t\t radioid ==\n-\t\t\t\t\t\t\t\t BCM2057_ID)\n-\t\t\t\t\t\t\t\t\twrite_radio_reg\n-\t\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\t\tpi,\n-\t\t\t\t\t\t\t\t\t\tRADIO_2057_IQTEST_SEL_PU,\n-\t\t\t\t\t\t\t\t\t\t0x1);\n-\n-\t\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\t\twrite_radio_reg\n-\t\t\t\t\t\t\t\t(\n-\t\t\t\t\t\t\t\t\tpi,\n-\t\t\t\t\t\t\t\t\tRADIO_2056_TX_TX_SSI_MUX\n-\t\t\t\t\t\t\t\t\t|\n-\t\t\t\t\t\t\t\t\t((core\n-\t\t\t\t\t\t\t\t\t ==\n-\t\t\t\t\t\t\t\t\t PHY_CORE_0)\n-\t\t\t\t\t\t\t\t\t ?\n-\t\t\t\t\t\t\t\t\t RADIO_2056_TX0\n-\t\t\t\t\t\t\t\t\t :\n-\t\t\t\t\t\t\t\t\t RADIO_2056_TX1),\n-\t\t\t\t\t\t\t\t\t0x11);\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\n+\t\t\t\t\t\tbrcms_phy_wr_tx_mux(pi, core);\n \t\t\t\t\t\tafectrlovr_rssi_val = 1 << 9;\n \t\t\t\t\t\tmod_phy_reg(pi,\n-\t\t\t\t\t\t\t (core ==\n-\t\t\t\t\t\t\t PHY_CORE_0) ? 0x8f\n-\t\t\t\t\t\t\t : 0xa5, (0x1 << 9),\n-\t\t\t\t\t\t\t afectrlovr_rssi_val);\n+\t\t\t\t\t\t\t (core ==\n+\t\t\t\t\t\t\t PHY_CORE_0) ? 0x8f\n+\t\t\t\t\t\t\t : 0xa5, (0x1 << 9),\n+\t\t\t\t\t\t\t afectrlovr_rssi_val);\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n@@ -22441,6 +22398,47 @@\n \t\twlc_phy_stay_in_carriersearch_nphy(pi, false);\n }\n \n+static u32 *brcms_phy_get_tx_pwrctrl_tbl(struct brcms_phy *pi)\n+{\n+\tu32 *tx_pwrctrl_tbl = NULL;\n+\tuint phyrev = pi->pubpi.phy_rev;\n+\n+\tif (PHY_IPA(pi)) {\n+\t\ttx_pwrctrl_tbl =\n+\t\t\twlc_phy_get_ipa_gaintbl_nphy(pi);\n+\t} else {\n+\t\tif (CHSPEC_IS5G(pi->radio_chanspec)) {\n+\t\t\tif (NREV_IS(phyrev, 3))\n+\t\t\t\ttx_pwrctrl_tbl = nphy_tpc_5GHz_txgain_rev3;\n+\t\t\telse if (NREV_IS(phyrev, 4))\n+\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\t(pi->srom_fem5g.extpagain == 3) ?\n+\t\t\t\t\tnphy_tpc_5GHz_txgain_HiPwrEPA :\n+\t\t\t\t\tnphy_tpc_5GHz_txgain_rev4;\n+\t\t\telse\n+\t\t\t\ttx_pwrctrl_tbl = nphy_tpc_5GHz_txgain_rev5;\n+\t\t} else {\n+\t\t\tif (NREV_GE(phyrev, 7)) {\n+\t\t\t\tif (pi->pubpi.radiorev == 3)\n+\t\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\t\tnphy_tpc_txgain_epa_2057rev3;\n+\t\t\t\telse if (pi->pubpi.radiorev == 5)\n+\t\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\t\tnphy_tpc_txgain_epa_2057rev5;\n+\t\t\t} else {\n+\t\t\t\tif (NREV_GE(phyrev, 5) &&\n+\t\t\t\t (pi->srom_fem2g.extpagain ==\t3))\n+\t\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\t\tnphy_tpc_txgain_HiPwrEPA;\n+\t\t\t\telse\n+\t\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\t\tnphy_tpc_txgain_rev3;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn tx_pwrctrl_tbl;\n+}\n+\n struct nphy_txgains wlc_phy_get_tx_gain_nphy(struct brcms_phy *pi)\n {\n \tu16 base_idx[2], curr_gain[2];\n@@ -22497,54 +22495,8 @@\n \t\tbase_idx[1] = (read_phy_reg(pi, 0x1ee) >> 8) & 0x7f;\n \t\tfor (core_no = 0; core_no < 2; core_no++) {\n \t\t\tif (NREV_GE(phyrev, 3)) {\n-\t\t\t\tif (PHY_IPA(pi)) {\n-\t\t\t\t\ttx_pwrctrl_tbl =\n-\t\t\t\t\t\twlc_phy_get_ipa_gaintbl_nphy(pi);\n-\t\t\t\t} else {\n-\t\t\t\t\tif (CHSPEC_IS5G(pi->radio_chanspec)) {\n-\t\t\t\t\t\tif (NREV_IS(phyrev, 3))\n-\t\t\t\t\t\t\ttx_pwrctrl_tbl =\n-\t\t\t\t\t\t\t\tnphy_tpc_5GHz_txgain_rev3;\n-\t\t\t\t\t\telse if (NREV_IS(phyrev, 4))\n-\t\t\t\t\t\t\ttx_pwrctrl_tbl =\n-\t\t\t\t\t\t\t\t(pi->srom_fem5g\n-\t\t\t\t\t\t\t\t .\n-\t\t\t\t\t\t\t\t extpagain ==\n-\t\t\t\t\t\t\t\t 3) ?\n-\t\t\t\t\t\t\t\tnphy_tpc_5GHz_txgain_HiPwrEPA\n-\t\t\t\t\t\t\t\t:\n-\t\t\t\t\t\t\t\tnphy_tpc_5GHz_txgain_rev4;\n-\t\t\t\t\t\telse\n-\t\t\t\t\t\t\ttx_pwrctrl_tbl =\n-\t\t\t\t\t\t\t\tnphy_tpc_5GHz_txgain_rev5;\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\tif (NREV_GE(phyrev, 7)) {\n-\t\t\t\t\t\t\tif (pi->pubpi.\n-\t\t\t\t\t\t\t radiorev == 3)\n-\t\t\t\t\t\t\t\ttx_pwrctrl_tbl\n-\t\t\t\t\t\t\t\t\t=\n-\t\t\t\t\t\t\t\t\t\tnphy_tpc_txgain_epa_2057rev3;\n-\t\t\t\t\t\t\telse if (pi->pubpi.\n-\t\t\t\t\t\t\t\t radiorev ==\n-\t\t\t\t\t\t\t\t 5)\n-\t\t\t\t\t\t\t\ttx_pwrctrl_tbl\n-\t\t\t\t\t\t\t\t\t=\n-\t\t\t\t\t\t\t\t\t\tnphy_tpc_txgain_epa_2057rev5;\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tif (NREV_GE(phyrev, 5)\n-\t\t\t\t\t\t\t && (pi->srom_fem2g.\n-\t\t\t\t\t\t\t\textpagain ==\n-\t\t\t\t\t\t\t\t3))\n-\t\t\t\t\t\t\t\ttx_pwrctrl_tbl\n-\t\t\t\t\t\t\t\t\t=\n-\t\t\t\t\t\t\t\t\t\tnphy_tpc_txgain_HiPwrEPA;\n-\t\t\t\t\t\t\telse\n-\t\t\t\t\t\t\t\ttx_pwrctrl_tbl\n-\t\t\t\t\t\t\t\t\t=\n-\t\t\t\t\t\t\t\t\t\tnphy_tpc_txgain_rev3;\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n+\t\t\t\ttx_pwrctrl_tbl =\n+\t\t\t\t\tbrcms_phy_get_tx_pwrctrl_tbl(pi);\n \t\t\t\tif (NREV_GE(phyrev, 7)) {\n \t\t\t\t\ttarget_gain.ipa[core_no] =\n \t\t\t\t\t\t(tx_pwrctrl_tbl\n"} {"commit":"de77968e82a4c109da62b79425f490b21d2a075b","subject":"Fix indentation","message":"Fix indentation\n","repos":"aery32\/aery32,aery32\/aery32,denravonska\/aery32,denravonska\/aery32","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- aery32\/pm.c\n+++ aery32\/pm.c\n@@ -246,12 +246,12 @@\n \t\/* Check that PBA and PBB clocks are smaller than CPU clock *\/\n \tif (cksel & AVR32_PM_CKSEL_CPUDIV_MASK) {\n \t\tif ((cksel & AVR32_PM_CKSEL_PBADIV_MASK) == 0 ||\n-\t\t\t(cksel & AVR32_PM_CKSEL_PBBDIV_MASK) == 0)\n+\t\t (cksel & AVR32_PM_CKSEL_PBBDIV_MASK) == 0)\n \t\t{\n \t\t\treturn -1;\n \t\t}\n \t\tif (CKSEL_DIVIDER(cksel, CPU) > CKSEL_DIVIDER(cksel, PBA) ||\n-\t\t\tCKSEL_DIVIDER(cksel, CPU) > CKSEL_DIVIDER(cksel, PBB))\n+\t\t CKSEL_DIVIDER(cksel, CPU) > CKSEL_DIVIDER(cksel, PBB))\n \t\t{\n \t\t\treturn -1;\n \t\t}\n"} {"commit":"159427e6d9db88d3feae2f27c0ebb8b2635af9ba","subject":"Remove unused use_mp variable","message":"Remove unused use_mp variable\n","repos":"chitianhao\/trafficserver,rpufky\/trafficserver,dyrock\/trafficserver,rahmalik\/trafficserver,reveller\/trafficserver,chitianhao\/trafficserver,PSUdaemon\/trafficserver,rahmalik\/trafficserver,chitianhao\/trafficserver,chenglongwei\/trafficserver,taoyunxing\/trafficserver,reveller\/trafficserver,clearswift\/trafficserver,bryancall\/trafficserver,PSUdaemon\/trafficserver,clearswift\/trafficserver,duke8253\/trafficserver,pbchou\/trafficserver,reveller\/trafficserver,reveller\/trafficserver,dyrock\/trafficserver,reveller\/trafficserver,clearswift\/trafficserver,davidbz\/trafficserver,duke8253\/trafficserver,persiaAziz\/trafficserver,bryancall\/trafficserver,rpufky\/trafficserver,persiaAziz\/trafficserver,bryancall\/trafficserver,vmamidi\/trafficserver,clearswift\/trafficserver,taoyunxing\/trafficserver,SolidWallOfCode\/trafficserver,PSUdaemon\/trafficserver,persiaAziz\/trafficserver,clearswift\/trafficserver,chitianhao\/trafficserver,bryancall\/trafficserver,pbchou\/trafficserver,PSUdaemon\/trafficserver,duke8253\/trafficserver,rahmalik\/trafficserver,reveller\/trafficserver,PSUdaemon\/trafficserver,dyrock\/trafficserver,dyrock\/trafficserver,vmamidi\/trafficserver,rahmalik\/trafficserver,chenglongwei\/trafficserver,rpufky\/trafficserver,SolidWallOfCode\/trafficserver,rpufky\/trafficserver,dyrock\/trafficserver,chitianhao\/trafficserver,vmamidi\/trafficserver,persiaAziz\/trafficserver,rpufky\/trafficserver,davidbz\/trafficserver,chitianhao\/trafficserver,clearswift\/trafficserver,PSUdaemon\/trafficserver,rahmalik\/trafficserver,rpufky\/trafficserver,duke8253\/trafficserver,chenglongwei\/trafficserver,davidbz\/trafficserver,duke8253\/trafficserver,taoyunxing\/trafficserver,SolidWallOfCode\/trafficserver,vmamidi\/trafficserver,taoyunxing\/trafficserver,chenglongwei\/trafficserver,reveller\/trafficserver,SolidWallOfCode\/trafficserver,davidbz\/trafficserver,davidbz\/trafficserver,vmamidi\/trafficserver,chenglongwei\/trafficserver,reveller\/trafficserver,rahmalik\/trafficserver,PSUdaemon\/trafficserver,pbchou\/trafficserver,SolidWallOfCode\/trafficserver,PSUdaemon\/trafficserver,dyrock\/trafficserver,bryancall\/trafficserver,clearswift\/trafficserver,taoyunxing\/trafficserver,rpufky\/trafficserver,pbchou\/trafficserver,duke8253\/trafficserver,taoyunxing\/trafficserver,chenglongwei\/trafficserver,persiaAziz\/trafficserver,persiaAziz\/trafficserver,rahmalik\/trafficserver,pbchou\/trafficserver,rpufky\/trafficserver,SolidWallOfCode\/trafficserver,duke8253\/trafficserver,taoyunxing\/trafficserver,rahmalik\/trafficserver,persiaAziz\/trafficserver,davidbz\/trafficserver,rpufky\/trafficserver,persiaAziz\/trafficserver,chitianhao\/trafficserver,chenglongwei\/trafficserver,chenglongwei\/trafficserver,PSUdaemon\/trafficserver,taoyunxing\/trafficserver,dyrock\/trafficserver,clearswift\/trafficserver,SolidWallOfCode\/trafficserver,vmamidi\/trafficserver,bryancall\/trafficserver,rahmalik\/trafficserver,pbchou\/trafficserver,reveller\/trafficserver,taoyunxing\/trafficserver,clearswift\/trafficserver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- proxy\/Main.h\n+++ proxy\/Main.h\n@@ -60,8 +60,6 @@\n inkcoreapi extern int qt_accept_file_descriptor;\n inkcoreapi extern int cache_clustering_enabled;\n \n-extern int use_mp;\n-\n \/\/ Debugging Configuration\n extern char debug_host[MAXDNAME + 1];\n extern int debug_port;\n"} {"commit":"705d6082ea42eeb772dbddff7e6c931e6757aea4","subject":"Moved Qt platform section as it was interfering with GTK+ sub-platforms.","message":"Moved Qt platform section as it was interfering with GTK+ sub-platforms.\n","repos":"timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla,timonwong\/foo_uie_wsh_panel_mod.scintilla","returncode":0,"stderr":"unknown","license":"isc","lang":"C","diff":""} {"commit":"811e7ee2b94d93a3e247a022a2ee5c31e6a27cbd","subject":"MB-15483: config_parse: Fix leaks during reconfiguring","message":"MB-15483: config_parse: Fix leaks during reconfiguring\n\nFix memory leaks found during Valgrind testing of memcached config\nreload. Note that while these leaks should be rare (as reloading\nconfig is a rare occurance, and an admin-only command) they *can*\nhappen in production.\n\n(cherry picked from commit 5d1fbfbdad882c341d468fc613a1e5a6f7469698)\n\nChange-Id: I4992b52a08a71c981a38d7f62e4d65bcb4dccf04\nReviewed-on: http:\/\/review.couchbase.org\/52736\nReviewed-by: Trond Norbye <60edd2ef23891a753f231b0c6f161dc634079a93@gmail.com>\nTested-by: buildbot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>\n","repos":"owendCB\/memcached,daverigby\/kv_engine,daverigby\/kv_engine,daverigby\/kv_engine,daverigby\/memcached,couchbase\/memcached,owendCB\/memcached,owendCB\/memcached,couchbase\/memcached,daverigby\/kv_engine,couchbase\/memcached,daverigby\/memcached,owendCB\/memcached,daverigby\/memcached,couchbase\/memcached,daverigby\/memcached","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- daemon\/config_parse.c\n+++ daemon\/config_parse.c\n@@ -1457,7 +1457,6 @@\n void reload_config_file(void) {\n struct settings new_settings = {0};\n char* error_msg;\n- cJSON* errors = cJSON_CreateArray();\n int ii;\n bool valid = true;\n \n@@ -1467,6 +1466,7 @@\n \n \/* parse config into a new settings structure *\/\n if (!parse_config_file(get_config_file(), &new_settings, &error_msg)) {\n+ free_settings(&new_settings);\n settings.extensions.logger->log(EXTENSION_LOG_WARNING, NULL,\n \"Failed to reload config file %s : %s\\n\", get_config_file(),\n error_msg);\n@@ -1475,6 +1475,7 @@\n }\n \n \/* Validate *\/\n+ cJSON* errors = cJSON_CreateArray();\n for (ii = 0; handlers[ii].key != NULL; ii++) {\n valid &= handlers[ii].dynamic_validate(&new_settings, errors);\n }\n@@ -1497,6 +1498,7 @@\n free(json);\n }\n }\n+ free_settings(&new_settings);\n cJSON_Delete(errors);\n }\n \n"} {"commit":"b5143dbbfca041d71f957abcad61861107c8eb12","subject":"MB-19339: Reset username cache as part of authentication","message":"MB-19339: Reset username cache as part of authentication\n\nChange-Id: Icf01a663a57aa143a1f98c2f7e7b8b1db7a74caf\nReviewed-on: http:\/\/review.couchbase.org\/73564\nTested-by: Build Bot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>\nReviewed-by: Jim Walker <1cd02e31b43620d7c664e038ca42a060d61727b9@couchbase.com>\n","repos":"daverigby\/kv_engine,daverigby\/kv_engine,daverigby\/kv_engine,daverigby\/kv_engine,couchbase\/memcached,couchbase\/memcached,daverigby\/memcached,couchbase\/memcached,daverigby\/memcached,daverigby\/memcached,daverigby\/memcached,couchbase\/memcached","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- daemon\/connection.h\n+++ daemon\/connection.h\n@@ -152,6 +152,7 @@\n \n void setAuthenticated(bool authenticated) {\n Connection::authenticated = authenticated;\n+ resetUsernameCache();\n if (authenticated) {\n privilegeContext = cb::rbac::createContext(username, \"\");\n } else {\n"} {"commit":"58c5ff14b4b1485d781397c275ee0e1f17ae2eac","subject":"","message":"\n\nmartin geisler's patch :)\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_actions.c\n+++ src\/bin\/e_actions.c\n@@ -288,6 +288,112 @@\n }\n \n \/***************************************************************************\/\n+ACT_FN_GO(move_relative)\n+{\n+ if (!obj) obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ if (obj->type != E_BORDER_TYPE)\n+ {\n+ obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ }\n+ if (params)\n+ {\n+ int dx, dy;\n+\n+ if (sscanf(params, \"%i %i\", &dx, &dy) == 2) {\n+ E_Border *bd;\n+ \n+ bd = (E_Border *)obj;\n+\n+ e_border_move(bd, bd->x + dx, bd->y + dy);\n+ \n+ if (e_config->focus_policy != E_FOCUS_CLICK)\n+ ecore_x_pointer_warp(bd->zone->container->win,\n+ bd->x + (bd->w \/ 2),\n+ bd->y + (bd->h \/ 2));\n+ }\n+ }\n+}\n+\n+\/***************************************************************************\/\n+ACT_FN_GO(move_absolute)\n+{\n+ if (!obj) obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ if (obj->type != E_BORDER_TYPE)\n+ {\n+ obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ }\n+ if (params)\n+ {\n+ E_Border *bd;\n+ int x, y;\n+ char cx, cy;\n+ \n+ bd = (E_Border *)obj;\n+\n+ if (sscanf(params, \"%c%i %c%i\", &cx, &x, &cy, &y) == 4)\n+ {\n+ \/\/ Nothing, both x and y is updated.\n+ }\n+ else if (sscanf(params, \"* %c%i\", &cy, &y) == 2)\n+ {\n+ \/\/ Updated y, reset x.\n+ x = bd->x;\n+ }\n+ else if (sscanf(params, \"%c%i *\", &cx, &x) == 2)\n+ {\n+ \/\/ Updated x, reset y.\n+ y = bd->y;\n+ }\n+\n+ if (cx == '-') x = bd->zone->w - bd->w - x;\n+ if (cy == '-') y = bd->zone->h - bd->h - y;\n+\n+ if (x != bd->x || y != bd->y)\n+ {\n+ e_border_move(bd, x, y);\n+\n+ if (e_config->focus_policy != E_FOCUS_CLICK)\n+ ecore_x_pointer_warp(bd->zone->container->win,\n+ bd->x + (bd->w \/ 2),\n+ bd->y + (bd->h \/ 2));\n+ }\n+ }\n+}\n+\n+\/***************************************************************************\/\n+ACT_FN_GO(resize)\n+{\n+ if (!obj) obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ if (obj->type != E_BORDER_TYPE)\n+ {\n+ obj = E_OBJECT(e_border_focused_get());\n+ if (!obj) return;\n+ }\n+\n+ if (params)\n+ {\n+ int dw, dh;\n+\n+ if (sscanf(params, \"%i %i\", &dw, &dh) == 2) {\n+ E_Border *bd;\n+ bd = (E_Border *)obj;\n+\n+ e_border_resize(bd, bd->w + dw, bd->h + dh);\n+ \n+ if (e_config->focus_policy != E_FOCUS_CLICK)\n+ ecore_x_pointer_warp(bd->zone->container->win,\n+ bd->x + (bd->w \/ 2),\n+ bd->y + (bd->h \/ 2));\n+ }\n+ }\n+}\n+\n+\/***************************************************************************\/\n ACT_FN_GO(desk_flip_by)\n {\n E_Zone *zone;\n@@ -788,6 +894,12 @@\n \n ACT_GO(desk_linear_flip_to);\n \n+ ACT_GO(move_absolute);\n+\n+ ACT_GO(move_relative);\n+\n+ ACT_GO(resize);\n+\n ACT_GO(menu_show);\n ACT_GO_MOUSE(menu_show);\n ACT_GO_KEY(menu_show);\n"} {"commit":"479e2b8ca88d6a7d2ed4945a2fbe50b061c713dd","subject":"staging: rtl8192e: Rename rtl8192_net_update","message":"staging: rtl8192e: Rename rtl8192_net_update\n\nUse naming schema found in other rtlwifi devices.\nRename rtl8192_net_update to _rtl92e_net_update.\n\nSigned-off-by: Mateusz Kulikowski <9d63947b0d9341537b72491be8062d0cafcabb3f@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/rtl8192e\/rtl8192e\/r8192E_dev.c\n+++ drivers\/staging\/rtl8192e\/rtl8192e\/r8192E_dev.c\n@@ -955,7 +955,7 @@\n \treturn rtStatus;\n }\n \n-static void rtl8192_net_update(struct net_device *dev)\n+static void _rtl92e_net_update(struct net_device *dev)\n {\n \n \tstruct r8192_priv *priv = rtllib_priv(dev);\n@@ -993,7 +993,7 @@\n \t\treturn;\n \n \tif (ieee->state == RTLLIB_LINKED) {\n-\t\trtl8192_net_update(dev);\n+\t\t_rtl92e_net_update(dev);\n \t\tpriv->ops->update_ratr_table(dev);\n \t\tif ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||\n \t\t (KEY_TYPE_WEP104 == ieee->pairwise_key_type))\n"} {"commit":"7ba8841b73f1928bbadbe18327a438f1b7d11a5a","subject":"os\/svcall: Fix TZ context handling issue","message":"os\/svcall: Fix TZ context handling issue\n\nTZ context is freed but not updated in the task tcb. This will lead\nto reuse of old freed context. So, we set the tz_context in tcb to\nNULL.\n\nSigned-off-by: Kishore S N <33058dcca7ce956a91a61ef5ae8fb790ece75b5f@samsung.com>\n","repos":"jeongarmy\/TizenRT,junmin-kim\/TizenRT,jeongarmy\/TizenRT,Samsung\/TizenRT,jsdosa\/TizenRT,pillip8282\/TizenRT,junmin-kim\/TizenRT,junmin-kim\/TizenRT,Samsung\/TizenRT,pillip8282\/TizenRT,an4967\/TizenRT,pillip8282\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,jeongchanKim\/TizenRT,sunghan-chang\/TizenRT,jeongarmy\/TizenRT,Samsung\/TizenRT,Samsung\/TizenRT,Samsung\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,junmin-kim\/TizenRT,pillip8282\/TizenRT,sunghan-chang\/TizenRT,jeongarmy\/TizenRT,jeongchanKim\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,jeongchanKim\/TizenRT,an4967\/TizenRT,sunghan-chang\/TizenRT,pillip8282\/TizenRT,jeongchanKim\/TizenRT,jeongarmy\/TizenRT,jeongarmy\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,jsdosa\/TizenRT,jsdosa\/TizenRT,pillip8282\/TizenRT,Samsung\/TizenRT,jeongchanKim\/TizenRT,jsdosa\/TizenRT,an4967\/TizenRT,Samsung\/TizenRT,jsdosa\/TizenRT,junmin-kim\/TizenRT,jeongchanKim\/TizenRT,an4967\/TizenRT,jeongchanKim\/TizenRT,jeongarmy\/TizenRT,pillip8282\/TizenRT,junmin-kim\/TizenRT,an4967\/TizenRT","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- os\/arch\/arm\/src\/armv8-m\/up_svcall.c\n+++ os\/arch\/arm\/src\/armv8-m\/up_svcall.c\n@@ -568,6 +568,7 @@\n \tcase SYS_free_securecontext: {\n \t\t\/* Free the secure context. *\/\n \t\tTZ_FreeModuleContext_S(rtcb->tz_context);\n+\t\trtcb->tz_context = NULL;\n \t}\n \tbreak;\n #endif\n"} {"commit":"8f197eba71a8ac3e10a0c504165dd6d3dd538aed","subject":"compare against e_client_action_get() for rejecting wl mouse events","message":"compare against e_client_action_get() for rejecting wl mouse events\n\nsignal actions do not set the cur_mouse_action pointer, but the return\nof this function will still match the client for a more accurate heuristic\n","repos":"tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_wl.c\n+++ src\/bin\/e_comp_wl.c\n@@ -250,7 +250,7 @@\n Eina_List *l;\n uint32_t serial;\n \n- if (ec->cur_mouse_action && e_grabinput_mouse_win_get()) return;\n+ if ((ec == e_client_action_get()) && e_grabinput_mouse_win_get()) return;\n \/* FIXME? this is a hack to just reset the cursor whenever we mouse out. not sure if accurate *\/\n {\n e_pointer_object_set(e_comp->pointer, NULL, 0, 0);\n@@ -362,7 +362,7 @@\n E_Client *ec = data;\n Evas_Event_Mouse_Move *ev = event;\n \n- if (ec->cur_mouse_action) return;\n+ if (ec == e_client_action_get()) return;\n if (!ec->mouse.in) return;\n if (e_object_is_del(E_OBJECT(ec))) return;\n if (ec->ignored) return;\n@@ -406,7 +406,7 @@\n \n ev = event;\n if (!(ec = data)) return;\n- if (ec->cur_mouse_action) return;\n+ if (ec == e_client_action_get()) return;\n if (e_object_is_del(E_OBJECT(ec))) return;\n if (ec->ignored) return;\n if (!ec->mouse.in) return;\n"} {"commit":"1d260d7b3b03f96dfbc9781ec046edc729220f09","subject":"ALSA: hda\/proc - Fix racy string access for power states","message":"ALSA: hda\/proc - Fix racy string access for power states\n\nThe power states in a proc file are printed in a racy manner on a\nsingle static string buffer. Fix it by calling snd_iprintf() directly\nfor each state instead of processing on a temporary buffer.\n\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"327e422aab04f669316f17226864eb3580260a17","subject":"set output->scale to e_scale, and when we wl_output_send_scale actually send output->scale","message":"set output->scale to e_scale, and when we wl_output_send_scale\nactually send output->scale\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,rvandegrift\/e,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_wl.c\n+++ src\/bin\/e_comp_wl.c\n@@ -2282,7 +2282,7 @@\n output->transform);\n \n if (version >= WL_OUTPUT_SCALE_SINCE_VERSION)\n- wl_output_send_scale(resource, e_scale);\n+ wl_output_send_scale(resource, output->scale);\n \n \/* 3 == preferred + current *\/\n wl_output_send_mode(resource, 3, output->w, output->h, output->refresh);\n@@ -2793,7 +2793,7 @@\n output->global = wl_global_create(cdata->wl.disp, &wl_output_interface,\n 2, output, _e_comp_wl_cb_output_bind);\n output->resources = NULL;\n- output->scale = 1.0;\n+ output->scale = e_scale;\n }\n \n \/* update the output details *\/\n@@ -2808,7 +2808,7 @@\n output->transform = transform;\n \n if (output->scale <= 0)\n- output->scale = 1.0;\n+ output->scale = e_scale;\n \n \/* if we have bound resources, send updates *\/\n EINA_LIST_FOREACH(output->resources, l2, resource)\n@@ -2822,7 +2822,7 @@\n output->transform);\n \n if (wl_resource_get_version(resource) >= WL_OUTPUT_SCALE_SINCE_VERSION)\n- wl_output_send_scale(resource, e_scale);\n+ wl_output_send_scale(resource, output->scale);\n \n \/* 3 == preferred + current *\/\n wl_output_send_mode(resource, 3, output->w, output->h, output->refresh);\n"} {"commit":"b1cd8457dadd52bdd3e38c6f34b5465f4430b34f","subject":"ASoC: rt286: Replace direct snd_soc_codec dapm field access","message":"ASoC: rt286: Replace direct snd_soc_codec dapm field access\n\nThe dapm field of the snd_soc_codec struct is eventually going to be\nremoved, in preparation for this replace all manual access to\ncodec->dapm.bias_level with snd_soc_codec_get_bias_level() and replace all\nother manual access to codec->dapm with snd_soc_codec_get_dapm().\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/codecs\/rt286.c\n+++ sound\/soc\/codecs\/rt286.c\n@@ -301,6 +301,7 @@\n \n static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic)\n {\n+\tstruct snd_soc_dapm_context *dapm;\n \tunsigned int val, buf;\n \n \t*hp = false;\n@@ -308,6 +309,9 @@\n \n \tif (!rt286->codec)\n \t\treturn -EINVAL;\n+\n+\tdapm = snd_soc_codec_get_dapm(rt286->codec);\n+\n \tif (rt286->pdata.cbj_en) {\n \t\tregmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);\n \t\t*hp = buf & 0x80000000;\n@@ -316,14 +320,11 @@\n \t\t\tregmap_update_bits(rt286->regmap,\n \t\t\t\tRT286_DC_GAIN, 0x200, 0x200);\n \n-\t\t\tsnd_soc_dapm_force_enable_pin(&rt286->codec->dapm,\n-\t\t\t\t\t\t\t\"HV\");\n-\t\t\tsnd_soc_dapm_force_enable_pin(&rt286->codec->dapm,\n-\t\t\t\t\t\t\t\"VREF\");\n+\t\t\tsnd_soc_dapm_force_enable_pin(dapm, \"HV\");\n+\t\t\tsnd_soc_dapm_force_enable_pin(dapm, \"VREF\");\n \t\t\t\/* power LDO1 *\/\n-\t\t\tsnd_soc_dapm_force_enable_pin(&rt286->codec->dapm,\n-\t\t\t\t\t\t\t\"LDO1\");\n-\t\t\tsnd_soc_dapm_sync(&rt286->codec->dapm);\n+\t\t\tsnd_soc_dapm_force_enable_pin(dapm, \"LDO1\");\n+\t\t\tsnd_soc_dapm_sync(dapm);\n \n \t\t\tregmap_write(rt286->regmap, RT286_SET_MIC1, 0x24);\n \t\t\tmsleep(50);\n@@ -360,11 +361,11 @@\n \t\t*mic = buf & 0x80000000;\n \t}\n \n-\tsnd_soc_dapm_disable_pin(&rt286->codec->dapm, \"HV\");\n-\tsnd_soc_dapm_disable_pin(&rt286->codec->dapm, \"VREF\");\n+\tsnd_soc_dapm_disable_pin(dapm, \"HV\");\n+\tsnd_soc_dapm_disable_pin(dapm, \"VREF\");\n \tif (!*hp)\n-\t\tsnd_soc_dapm_disable_pin(&rt286->codec->dapm, \"LDO1\");\n-\tsnd_soc_dapm_sync(&rt286->codec->dapm);\n+\t\tsnd_soc_dapm_disable_pin(dapm, \"LDO1\");\n+\tsnd_soc_dapm_sync(dapm);\n \n \treturn 0;\n }\n@@ -391,6 +392,7 @@\n \n int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)\n {\n+\tstruct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);\n \tstruct rt286_priv *rt286 = snd_soc_codec_get_drvdata(codec);\n \n \trt286->jack = jack;\n@@ -398,7 +400,7 @@\n \tif (jack) {\n \t\t\/* enable IRQ *\/\n \t\tif (rt286->jack->status & SND_JACK_HEADPHONE)\n-\t\t\tsnd_soc_dapm_force_enable_pin(&codec->dapm, \"LDO1\");\n+\t\t\tsnd_soc_dapm_force_enable_pin(dapm, \"LDO1\");\n \t\tregmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2);\n \t\t\/* Send an initial empty report *\/\n \t\tsnd_soc_jack_report(rt286->jack, rt286->jack->status,\n@@ -406,9 +408,9 @@\n \t} else {\n \t\t\/* disable IRQ *\/\n \t\tregmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x0);\n-\t\tsnd_soc_dapm_disable_pin(&codec->dapm, \"LDO1\");\n-\t}\n-\tsnd_soc_dapm_sync(&codec->dapm);\n+\t\tsnd_soc_dapm_disable_pin(dapm, \"LDO1\");\n+\t}\n+\tsnd_soc_dapm_sync(dapm);\n \n \treturn 0;\n }\n@@ -985,7 +987,7 @@\n {\n \tswitch (level) {\n \tcase SND_SOC_BIAS_PREPARE:\n-\t\tif (SND_SOC_BIAS_STANDBY == codec->dapm.bias_level) {\n+\t\tif (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) {\n \t\t\tsnd_soc_write(codec,\n \t\t\t\tRT286_SET_AUDIO_POWER, AC_PWRST_D0);\n \t\t\tsnd_soc_update_bits(codec,\n"} {"commit":"67170f40a1a901101591c8102631dbec8e49794b","subject":"Fix issue of compositor surface create passing wrong parameter to e_pixmap_new function","message":"Fix issue of compositor surface create passing wrong parameter to\ne_pixmap_new function\n\ne_pixmap_new (when creating wayland windows) is expecting to get a\nuintptr_t type passed into it (surface id). Previously we were passing\nthe entire wl_resource.\n\nref T3058\n\nSigned-off-by: Chris Michael <2c9adca9bdb4861297f022d161a6a7c2d4597bd5@osg.samsung.com>\n","repos":"tasn\/enlightenment,rvandegrift\/e,tasn\/enlightenment,rvandegrift\/e,rvandegrift\/e,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_wl.c\n+++ src\/bin\/e_comp_wl.c\n@@ -1502,7 +1502,7 @@\n E_Pixmap *ep;\n \n \/* try to create new pixmap *\/\n- if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, res)))\n+ if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, (uintptr_t)id)))\n {\n ERR(\"Could not create new pixmap\");\n wl_resource_destroy(res);\n"} {"commit":"c5910a703889cf44ac1aa9405642a7d3b5bc6f24","subject":"ASoC: SDP3430: Add support for EXTMUTE using TWL GPIO6","message":"ASoC: SDP3430: Add support for EXTMUTE using TWL GPIO6\n\nBoard sdp3430 has hardware support for EXTMUTE using TWL4030 GPIO6\nline, controlled by register INTBR_PMBR1. Machine driver takes care\nof enabling gpio line through i2c and codec driver manipulates the\nline during headset ramp up\/down sequence.\n\nSigned-off-by: Jorge Eduardo Candelaria <b2a54fe05ef1e75adf02439bda903a5e62177dc2@ti.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sound\/soc\/omap\/sdp3430.c\n+++ sound\/soc\/omap\/sdp3430.c\n@@ -24,6 +24,7 @@\n \n #include <linux\/clk.h>\n #include <linux\/platform_device.h>\n+#include <linux\/i2c\/twl4030.h>\n #include <sound\/core.h>\n #include <sound\/pcm.h>\n #include <sound\/soc.h>\n@@ -38,6 +39,9 @@\n #include \"omap-mcbsp.h\"\n #include \"omap-pcm.h\"\n #include \"..\/codecs\/twl4030.h\"\n+\n+#define TWL4030_INTBR_PMBR1\t0x0D\n+#define EXTMUTE(value)\t\t(value << 2)\n \n static struct snd_soc_card snd_soc_sdp3430;\n \n@@ -280,6 +284,7 @@\n static struct twl4030_setup_data twl4030_setup = {\n \t.ramp_delay_value = 3,\n \t.sysclk = 26000,\n+\t.hs_extmute = 1,\n };\n \n \/* Audio subsystem *\/\n@@ -312,6 +317,10 @@\n \t*(unsigned int *)sdp3430_dai[0].cpu_dai->private_data = 1; \/* McBSP2 *\/\n \t*(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; \/* McBSP3 *\/\n \n+\t\/* Set TWL4030 GPIO6 as EXTMUTE signal *\/\n+\ttwl4030_i2c_write_u8(TWL4030_MODULE_INTBR, EXTMUTE(0x02),\n+\t\t\t\t\t\t\tTWL4030_MODULE_INTBR);\n+\n \tret = platform_device_add(sdp3430_snd_device);\n \tif (ret)\n \t\tgoto err1;\n"} {"commit":"57fdd5613dc2465bac0917bd341b6bc7de35aaf2","subject":"send screen paramaters in proper order to e_comp_wl_output_init","message":"send screen paramaters in proper order to e_comp_wl_output_init\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"rvandegrift\/e,tasn\/enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,rvandegrift\/e,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,tasn\/enlightenment,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_wl.c\n+++ src\/bin\/e_comp_wl.c\n@@ -731,8 +731,8 @@\n break;\n }\n \n- if (!e_comp_wl_output_init(screen->id, screen->info.screen,\n- screen->info.name,\n+ if (!e_comp_wl_output_init(screen->id, screen->info.name,\n+ screen->info.screen,\n screen->config.geom.x, screen->config.geom.y,\n screen->config.geom.w, screen->config.geom.h,\n screen->info.size.w, screen->info.size.h,\n"} {"commit":"885c3060c193c9f4c3e3430c82c8c3e8fc574398","subject":"IntelFrameworkModulePkg GenericBdsLib: Potential read over memory boudary","message":"IntelFrameworkModulePkg GenericBdsLib: Potential read over memory boudary\n\nThis commit will resolve the issue brought by r17733.\n\nStringBuffer1 = AllocateCopyPool (\n MAX_STRING_LEN * sizeof (CHAR16),\n L\"Configuration changed. Reset to apply it Now.\"\n );\n\nThe above using of AllocateCopyPool() will read contents out of the scope\nof the constant string. Potential risk for the constant string allocated\nat the boundary of memory region.\n\nContributed-under: TianoCore Contribution Agreement 1.0\nSigned-off-by: Hao Wu <hao.a.wu@intel.com>\nReviewed-by: Qiu Shumin <shumin.qiu@intel.com>\nReviewed-by: Jeff Fan <jeff.fan@intel.com>\n\ngit-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@17929 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- IntelFrameworkModulePkg\/Library\/GenericBdsLib\/BdsMisc.c\n+++ IntelFrameworkModulePkg\/Library\/GenericBdsLib\/BdsMisc.c\n@@ -1127,16 +1127,20 @@\n if (IsResetReminderFeatureEnable ()) {\r\n if (IsResetRequired ()) {\r\n \r\n- StringBuffer1 = AllocateCopyPool (\r\n- MAX_STRING_LEN * sizeof (CHAR16),\r\n- L\"Configuration changed. Reset to apply it Now.\"\r\n- );\r\n+ StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));\r\n ASSERT (StringBuffer1 != NULL);\r\n- StringBuffer2 = AllocateCopyPool (\r\n- MAX_STRING_LEN * sizeof (CHAR16),\r\n- L\"Press ENTER to reset\"\r\n- );\r\n+ StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));\r\n ASSERT (StringBuffer2 != NULL);\r\n+ StrCpyS (\r\n+ StringBuffer1,\r\n+ MAX_STRING_LEN,\r\n+ L\"Configuration changed. Reset to apply it Now.\"\r\n+ );\r\n+ StrCpyS (\r\n+ StringBuffer2,\r\n+ MAX_STRING_LEN,\r\n+ L\"Press ENTER to reset\"\r\n+ );\r\n \/\/\r\n \/\/ Popup a menu to notice user\r\n \/\/\r\n"} {"commit":"69c71a16bbf23dce7981527c0b2590f15fb4faaf","subject":"e-comp-wl: Implement client idler for sending configure during resize. Cleanup surface commit function to work with new pixmap caching code.","message":"e-comp-wl: Implement client idler for sending configure during resize.\nCleanup surface commit function to work with new pixmap caching code.\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e,rvandegrift\/e,tasn\/enlightenment,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_wl.c\n+++ src\/bin\/e_comp_wl.c\n@@ -23,6 +23,8 @@\n \/* local variables *\/\n \/* static Eina_Hash *clients_win_hash = NULL; *\/\n static Eina_List *handlers = NULL;\n+static Eina_List *_idle_clients = NULL;\n+static Ecore_Idle_Enterer *_client_idler = NULL;\n \n \/* local functions *\/\n static void \n@@ -487,6 +489,43 @@\n EINA_FALSE, EINA_TRUE, EINA_FALSE);\n }\n \n+static Eina_Bool \n+_e_comp_wl_client_cb_idle(void *data EINA_UNUSED)\n+{\n+ E_Client *ec;\n+\n+ EINA_LIST_FREE(_idle_clients, ec)\n+ {\n+ if ((e_object_is_del(E_OBJECT(ec)) || (!ec->comp_data))) continue;\n+\n+ if ((ec->post_resize) && (!ec->maximized))\n+ {\n+ if (ec->comp_data->shell.configure_send)\n+ ec->comp_data->shell.configure_send(ec->comp_data->shell.surface, \n+ ec->comp->wl_comp_data->resize.edges, \n+ ec->client.w, ec->client.h);\n+ }\n+\n+ ec->post_move = EINA_FALSE;\n+ ec->post_resize = EINA_FALSE;\n+ }\n+\n+ _client_idler = NULL;\n+ return EINA_FALSE;\n+}\n+\n+static void \n+_e_comp_wl_client_idler_add(E_Client *ec)\n+{\n+ if (!ec) return;\n+\n+ if (!_client_idler)\n+ _client_idler = ecore_idle_enterer_add(_e_comp_wl_client_cb_idle, NULL);\n+\n+ if (!eina_list_data_find(_idle_clients, ec))\n+ _idle_clients = eina_list_append(_idle_clients, ec);\n+}\n+\n static void \n _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)\n {\n@@ -570,10 +609,9 @@\n \n E_COMP_WL_PIXMAP_CHECK;\n \n- if ((ec->comp_data) && (ec->comp_data->shell.configure_send))\n- ec->comp_data->shell.configure_send(ec->comp_data->shell.surface, \n- ec->comp->wl_comp_data->resize.edges, \n- ec->client.w, ec->client.h);\n+ if ((ec->shading) || (ec->shaded)) return;\n+ ec->post_resize = EINA_TRUE;\n+ _e_comp_wl_client_idler_add(ec);\n }\n \n static void \n@@ -757,8 +795,6 @@\n E_Pixmap *ep;\n E_Client *ec;\n \n- DBG(\"Surface Attach: %d\", wl_resource_get_id(resource));\n-\n \/* get the e_pixmap reference *\/\n if (!(ep = wl_resource_get_user_data(resource))) return;\n \n@@ -788,6 +824,8 @@\n ERR(\"\\tE_Client has no comp data\");\n return;\n }\n+\n+ DBG(\"Surface Attach: %d\", wl_resource_get_id(resource));\n \n \/* reset client pending information *\/\n ec->comp_data->pending.x = sx;\n@@ -818,27 +856,27 @@\n E_Client *ec;\n Eina_Rectangle *dmg = NULL;\n \n+ \/* get the e_pixmap reference *\/\n+ if (!(ep = wl_resource_get_user_data(resource))) return;\n+\n+ \/* try to find the associated e_client *\/\n+ if (!(ec = e_pixmap_client_get(ep)))\n+ {\n+ uint64_t pixid;\n+\n+ pixid = e_pixmap_window_get(ep);\n+ if (!(ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, pixid)))\n+ {\n+ ERR(\"\\tCould not find client from pixmap %\"PRIu64\"\", pixid);\n+ return;\n+ }\n+ }\n+\n+ if (e_object_is_del(E_OBJECT(ec))) return;\n+ if (!ec->comp_data) return;\n+\n DBG(\"Surface Cb Damage: %d\", wl_resource_get_id(resource));\n DBG(\"\\tGeom: %d %d %d %d\", x, y, w, h);\n-\n- \/* get the e_pixmap reference *\/\n- if (!(ep = wl_resource_get_user_data(resource))) return;\n-\n- \/* try to find the associated e_client *\/\n- if (!(ec = e_pixmap_client_get(ep)))\n- {\n- uint64_t pixid;\n-\n- pixid = e_pixmap_window_get(ep);\n- if (!(ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, pixid)))\n- {\n- ERR(\"\\tCould not find client from pixmap %\"PRIu64\"\", pixid);\n- return;\n- }\n- }\n-\n- if (e_object_is_del(E_OBJECT(ec))) return;\n- if (!ec->comp_data) return;\n \n \/* create new damage rectangle *\/\n if (!(dmg = eina_rectangle_new(x, y, w, h))) return;\n@@ -992,8 +1030,6 @@\n E_Client *ec, *subc;\n Eina_List *l;\n \n- DBG(\"Surface Commit: %d\", wl_resource_get_id(resource));\n-\n \/* get the e_pixmap reference *\/\n if (!(ep = wl_resource_get_user_data(resource))) return;\n \n@@ -1012,6 +1048,8 @@\n \n \/* trap for clients which are being deleted *\/\n if (e_object_is_del(E_OBJECT(ec))) return;\n+\n+ DBG(\"Surface Commit: %d\", wl_resource_get_id(resource));\n \n \/* call the subsurface commit function\n * \n@@ -2228,13 +2266,6 @@\n ec->comp->wl_comp_data->resize.edges = 0;\n break;\n }\n-\n- if ((ec->comp_data) && (ec->comp_data->shell.configure_send))\n- {\n- ec->comp_data->shell.configure_send(ec->comp_data->shell.surface, \n- ec->comp->wl_comp_data->resize.edges, \n- ec->client.w, ec->client.h);\n- }\n }\n \n static void \n@@ -2250,9 +2281,9 @@\n if (ec->pending_resize)\n {\n \n- EC_CHANGED(ec);\n ec->changes.pos = 1;\n ec->changes.size = 1;\n+ EC_CHANGED(ec);\n }\n \n E_FREE_LIST(ec->pending_resize, free);\n@@ -2506,18 +2537,13 @@\n \n if (!(ep = ec->pixmap)) return EINA_FALSE;\n \n- if (ec->comp_data->pending.buffer)\n- {\n- \/* set pixmap resource *\/\n- e_pixmap_resource_set(ep, ec->comp_data->pending.buffer);\n-\n- \/* mark the pixmap as usable or not *\/\n- e_pixmap_usable_set(ep, (ec->comp_data->pending.buffer != NULL));\n- }\n+ \/* mark the pixmap as usable or not *\/\n+ e_pixmap_usable_set(ep, (ec->comp_data->pending.buffer != NULL));\n \n \/* mark the pixmap as dirty *\/\n e_pixmap_dirty(ep);\n \n+ \/* refresh pixmap *\/\n e_pixmap_refresh(ep);\n \n \/* check for any pending attachments *\/\n"} {"commit":"62aece583537eb5a6c44f4d219c3e7098113690d","subject":"Let CancelableRequest Execute callbacks which do delete this.","message":"Let CancelableRequest Execute callbacks which do delete this.\n\nBy checking canceled() again before calling NotifyCompleted, we avoid\nassumptions that we're not canceled from the callback. This solves 2 issues:\n1) The NOTREACHED in the provider which tries to remove the pending_request.\n2) Trying to call DidExecute on a deleted consumer_.\n\nBUG=77777, 82156\nR=sky@chromium.org\nTEST=python chrome\/test\/functional\/imports.py imports.ImportsTest.testImportFirefoxDataTwice\n\nReview URL: http:\/\/codereview.chromium.org\/7001015\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@84889 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"ropik\/chromium,gavinp\/chromium,gavinp\/chromium,gavinp\/chromium,yitian134\/chromium,adobe\/chromium,gavinp\/chromium,adobe\/chromium,gavinp\/chromium,ropik\/chromium,adobe\/chromium,yitian134\/chromium,adobe\/chromium,adobe\/chromium,adobe\/chromium,gavinp\/chromium,yitian134\/chromium,ropik\/chromium,yitian134\/chromium,adobe\/chromium,adobe\/chromium,adobe\/chromium,yitian134\/chromium,adobe\/chromium,yitian134\/chromium,ropik\/chromium,ropik\/chromium,yitian134\/chromium,ropik\/chromium,yitian134\/chromium,gavinp\/chromium,gavinp\/chromium,yitian134\/chromium,ropik\/chromium,yitian134\/chromium,ropik\/chromium,adobe\/chromium,ropik\/chromium,gavinp\/chromium,gavinp\/chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- content\/browser\/cancelable_request.h\n+++ content\/browser\/cancelable_request.h\n@@ -659,11 +659,13 @@\n \n \/\/ Execute the callback.\n callback_->RunWithParams(param);\n-\n- \/\/ Notify the provider that the request is complete. The provider will\n- \/\/ notify the consumer for us.\n+ }\n+\n+ \/\/ Notify the provider that the request is complete. The provider will\n+ \/\/ notify the consumer for us. Note that it is possible for the callback to\n+ \/\/ cancel this request; we must check canceled again.\n+ if (!canceled_.IsSet())\n NotifyCompleted();\n- }\n }\n \n \/\/ This should only be executed if !canceled_.IsSet(),\n"} {"commit":"bf1c3725ef6f02834a46a367c356f7d4e181d9fc","subject":"","message":"\n\nand restore res on login - if requested.\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_manager.c\n+++ src\/bin\/e_manager.c\n@@ -111,6 +111,23 @@\n else\n {\n \tman->win = man->root;\n+ }\n+\n+ \/* FIXME: this handles 1 screen only - not multihead. multihead randr\n+ * and xinerama are complex oin terms of interaction, so for now only\n+ * really have this work in single head. the randr module kept this\n+ * as a list, and i might move it to be the same too, but for now, keep\n+ * it as is\n+ *\/\n+ if (e_config->display_res_restore)\n+ {\n+ Ecore_X_Screen_Size size;\n+\tEcore_X_Screen_Refresh_Rate rate;\n+\t\n+\tsize.width = e_config->display_res_width;\n+\tsize.height = e_config->display_res_height;\n+\trate.rate = e_config->display_res_hz;\n+\tecore_x_randr_screen_refresh_rate_set(man->root, size, rate);\n }\n \n h = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST, _e_manager_cb_window_show_request, man);\n"} {"commit":"9b436d3c264d54275e4b23815fa624b6caa27ded","subject":"e: if 0 to disable code","message":"e: if 0 to disable code\n\nSVN revision: 77624\n","repos":"tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,FlorentRevest\/Enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,rvandegrift\/e,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_signals.c\n+++ src\/bin\/e_signals.c\n@@ -55,19 +55,18 @@\n }\n \n static void\n-_e_gdb_print_backtrace(int fd)\n+_e_gdb_print_backtrace(int fd __UNUSED__)\n {\n- char cmd[1024];\n- size_t size;\n- int ret;\n-\n \/\/ FIXME: we are in a segv'd state. do as few function calls and things\n \/\/ depending on a known working state as possible. this also prevents the\n \/\/ white box allowing recovery or deeper gdbing, thus until this works\n \/\/ properly, it's disabled (properly means always reliable, always\n \/\/ printf bt and allows e to continue and pop up box, perferably allowing\n \/\/ debugging in the gui etc. etc.\n- return;\n+#if 0\n+ char cmd[1024];\n+ size_t size;\n+ int ret;\n \n if (getenv(\"E_NO_GDB_BACKTRACE\"))\n return;\n@@ -84,6 +83,7 @@\n _e_write_safe_int(fd, cmd, size);\n _e_write_safe(fd, \"\\n\");\n ret = system(cmd); \/\/ TODO: use popen() or fork()+pipe()+exec() and save to 'fd'\n+#endif\n }\n \n #define _e_backtrace(msg) _e_backtrace_int(2, msg, sizeof(msg))\n"} {"commit":"1768ec751867ed3b4caa8b56651642d1361bdcb4","subject":"Increase timeout for spurious e_border mouse up.","message":"Increase timeout for spurious e_border mouse up.\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e,rvandegrift\/e,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_surface.c\n+++ src\/bin\/e_surface.c\n@@ -414,7 +414,7 @@\n if (!(sd = evas_object_smart_data_get(data))) return;\n \n timestamp = ecore_loop_time_get();\n- if (fabs(timestamp - sd->mouse_down_time) <= 0.001) return;\n+ if (fabs(timestamp - sd->mouse_down_time) <= 0.010) return;\n \n evas_object_smart_callback_call(data, \"mouse_up\", event);\n }\n"} {"commit":"d9a00ebbbac84b417b616b5a8eaaa9331736f2c8","subject":"Try to defend against the possibility that libpq is still in COPY_IN state when we reach the post-COPY \"pump it dry\" error recovery code that was added 2006-11-24. Per a report from Neil Best, there is at least one code path in which this occurs, leading to an infinite loop in code that's supposed to be making it more robust not less so. A reasonable response seems to be to call PQputCopyEnd() again, so let's try that.","message":"Try to defend against the possibility that libpq is still in COPY_IN state\nwhen we reach the post-COPY \"pump it dry\" error recovery code that was added\n2006-11-24. Per a report from Neil Best, there is at least one code path\nin which this occurs, leading to an infinite loop in code that's supposed\nto be making it more robust not less so. A reasonable response seems to be\nto call PQputCopyEnd() again, so let's try that.\n\nBack-patch to all versions that contain the cleanup loop.\n","repos":"ashwinstar\/gpdb,cjcjameson\/gpdb,xuegang\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,rvs\/gpdb,xinzweb\/gpdb,chrishajas\/gpdb,lintzc\/gpdb,ahachete\/gpdb,rvs\/gpdb,rvs\/gpdb,50wu\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,greenplum-db\/gpdb,cjcjameson\/gpdb,greenplum-db\/gpdb,CraigHarris\/gpdb,ashwinstar\/gpdb,Chibin\/gpdb,rvs\/gpdb,adam8157\/gpdb,rvs\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,edespino\/gpdb,janebeckman\/gpdb,rvs\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,xuegang\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,lintzc\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,Chibin\/gpdb,50wu\/gpdb,chrishajas\/gpdb,royc1\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,kaknikhil\/gpdb,ahachete\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,xuegang\/gpdb,kaknikhil\/gpdb,royc1\/gpdb,kaknikhil\/gpdb,50wu\/gpdb,xinzweb\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,lintzc\/gpdb,adam8157\/gpdb,lintzc\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,chrishajas\/gpdb,jmcatamney\/gpdb,xuegang\/gpdb,chrishajas\/gpdb,lisakowen\/gpdb,rvs\/gpdb,zaksoup\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,xuegang\/gpdb,kaknikhil\/gpdb,0x0FFF\/gpdb,lintzc\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,chrishajas\/gpdb,edespino\/gpdb,xuegang\/gpdb,Quikling\/gpdb,greenplum-db\/gpdb,Quikling\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,zaksoup\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,royc1\/gpdb,Chibin\/gpdb,adam8157\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,xuegang\/gpdb,chrishajas\/gpdb,50wu\/gpdb,ahachete\/gpdb,Quikling\/gpdb,royc1\/gpdb,Chibin\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,zaksoup\/gpdb,chrishajas\/gpdb,Quikling\/gpdb,royc1\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,rvs\/gpdb,royc1\/gpdb,Quikling\/gpdb,zaksoup\/gpdb,50wu\/gpdb,yuanzhao\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,50wu\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,janebeckman\/gpdb,zaksoup\/gpdb,kaknikhil\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,edespino\/gpdb,adam8157\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,royc1\/gpdb,janebeckman\/gpdb,jmcatamney\/gpdb,0x0FFF\/gpdb,edespino\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,royc1\/gpdb,cjcjameson\/gpdb,janebeckman\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,xinzweb\/gpdb,rvs\/gpdb,Quikling\/gpdb,50wu\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,0x0FFF\/gpdb,xuegang\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,greenplum-db\/gpdb,ahachete\/gpdb,0x0FFF\/gpdb,ashwinstar\/gpdb,ahachete\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,jmcatamney\/gpdb,yuanzhao\/gpdb,Quikling\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bin\/psql\/copy.c\n+++ src\/bin\/psql\/copy.c\n@@ -3,7 +3,7 @@\n *\n * Copyright (c) 2000-2008, PostgreSQL Global Development Group\n *\n- * $PostgreSQL: pgsql\/src\/bin\/psql\/copy.c,v 1.77 2008\/01\/01 19:45:55 momjian Exp $\n+ * $PostgreSQL: pgsql\/src\/bin\/psql\/copy.c,v 1.77.2.1 2009\/08\/07 20:16:22 tgl Exp $\n *\/\n #include \"postgres_fe.h\"\n #include \"copy.h\"\n@@ -563,6 +563,9 @@\n \t\tsuccess = false;\n \t\tpsql_error(\"\\\\copy: unexpected response (%d)\\n\",\n \t\t\t\t PQresultStatus(result));\n+\t\t\/* if still in COPY IN state, try to get out of it *\/\n+\t\tif (PQresultStatus(result) == PGRES_COPY_IN)\n+\t\t\tPQputCopyEnd(pset.db, _(\"trying to exit copy mode\"));\n \t\tPQclear(result);\n \t}\n \n"} {"commit":"bcf658d0c861ac1b5420bb4e9409b0d685135cc9","subject":"@todo","message":"@todo\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Foundation\/Containers\/Mapping.h\n+++ Library\/Sources\/Stroika\/Foundation\/Containers\/Mapping.h\n@@ -25,6 +25,10 @@\n * \\version <a href=\"code_status.html#Alpha-Late\">Alpha-Late<\/a>\n *\n * TODO:\n+ *\n+ *\n+ * @todo ContainsValue() needs to be redone as template method template <typename VALUE_EQUALS_COMPARER = Common::ComparerWithEquals<VALUE_TYPE>>\n+ * like Equals()\n *\n * @todo Support more backends\n * Especially HashTable, RedBlackTree, and stlhashmap\n"} {"commit":"57e2e798a5cbaadc6fe41ae9360dbc38efd5ef1a","subject":"Small docs cleanups","message":"Small docs cleanups\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Foundation\/Traversal\/Iterable.h\n+++ Library\/Sources\/Stroika\/Foundation\/Traversal\/Iterable.h\n@@ -39,6 +39,8 @@\n \n \n \/**\n+ * Stroika's Memory::SharedPtr<> appears to be a bit faster than the std::shated_ptr. Iterable\n+ * can be configured (at compile time) to use one or the other, but not both.\n *\/\n #ifndef qStroika_Foundation_Traveral_IterableUsesStroikaSharedPtr\n #define qStroika_Foundation_Traveral_IterableUsesStroikaSharedPtr 1\n@@ -95,6 +97,18 @@\n * exceedingly simplistic pattern of access.\n *\n * *Important Design Note*:\n+ * The Lifetime of Iterator<T> objects created by an Iterable<T> instance must always be less\n+ * than the creating Iterable's lifetime.\n+ *\n+ * This may not be enforced by implementations (but generally will be in debug builds). But\n+ * it is a rule!\n+ *\n+ * The reason for this is that the underlying memory referenced by the iterator may be going away.\n+ * We could avoid this by adding a shared_ptr<> reference count into each iterator, but that\n+ * would make iterator objects significantly more expensive, and with little apparent value added.\n+ * Similarly for weak_ptr<> references.\n+ *\n+ * *Important Design Note*:\n * We have no:\n * nonvirtual void _SetRep (SharedIRepPtr rep);\n *\n@@ -102,6 +116,9 @@\n * to assure that the underlying type is of the appropriate subtype.\n *\n * For example - see Bag_Array<T>::GetRep_().\n+ *\n+ * Note - instead - you can 'assign' (operator=) to replace the value (and dynamic type) of\n+ * an Iterable<> (or subclass) instance.\n *\n * *Design Note*:\n * Why does Iterable<T> contain a GetLength () method?\n@@ -135,24 +152,12 @@\n * importantly because it doesnt appear to me to make sense so say that a Stack<T> == Set<T>, even if\n * their values were the same.\n *\n- * ((REVISION - 2013-12-21 - SEE NEW SETEUQALS\/TALLYEQUALS\/EXACTEUALS methods below)\n+ * ((REVISION - 2013-12-21 - SEE NEW SetEquals\/MultiSetEquals\/ExactEquals methods below)\n *\n * *Important Design Note*:\n * Probably important - for performance??? - that all these methods are const,\n * so ??? think through - what this implies- but probably soemthing about not\n * threading stuff and ???\n- *\n- * *Important Design Note*:\n- * The Lifetime of Iterator<T> objects created by an Iterable<T> instance must always be less\n- * than the creating Iterable's lifetime.\n- *\n- * This may not be enforced by implementations (but generally will be in debug builds). But\n- * it is a rule!\n- *\n- * The reason for this is that the underlying memory referenced by the iterator may be going away.\n- * We could avoid this by adding a shared_ptr<> reference count into each iterator, but that\n- * would make iterator objects significantly more expensive, and with little apparent value added.\n- * Similarly for weak_ptr<> references.\n *\n * *Design Note*:\n * Rejected idea:\n@@ -509,8 +514,6 @@\n };\n \n \n-\n-\n \/**\n * EXPERIMENTAL -- LGP 2014-02-21\n *\/\n@@ -520,8 +523,10 @@\n public:\n _ReadOnlyIterableIRepReference fAccessor;\n \n+ public:\n _SafeReadRepAccessor (const Iterable<T>& s);\n \n+ public:\n nonvirtual const REP_SUB_TYPE& _ConstGetRep () const;\n };\n \n@@ -530,12 +535,15 @@\n * EXPERIMENTAL -- LGP 2014-02-21\n *\n * ***NYI***\n+ * *** instea d of storing\n+ * MAYBE what this does is operate on the given coy but whne the DTOR happens, assign overwriting the original container!\n+ * (on dtor *this - fAccessor) - maybe only if there is a change in ptr).\n *\/\n template <typename T>\n template <typename REP_SUB_TYPE>\n class Iterable<T>::_SafeReadWriteRepAccessor {\n public:\n- _ReadOnlyIterableIRepReference fAccessor;\n+ SharedByValueRepType_ fAccessor;\n \n _SafeReadWriteRepAccessor (const Iterable<T>& s);\n \n@@ -547,7 +555,6 @@\n \/\/ enter in IFDEFS til weve worked this out\n nonvirtual REP_SUB_TYPE& _GetWriteableRep () const;\n };\n-\n \n \n \/**\n"} {"commit":"d56fc21be4e65f1fa2c44984a24f922a4fb8cb1e","subject":"Comments","message":"Comments\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Frameworks\/WebServer\/Response.h\n+++ Library\/Sources\/Stroika\/Frameworks\/WebServer\/Response.h\n@@ -88,10 +88,6 @@\n template <typename FUNCTION>\n nonvirtual auto ReadHeader (FUNCTION&& f) const;\n \n-\n- \/\/\/ <summary>\n- \/\/\/ \/*&******&&&&&&&&&&&&&&&&&& BEOFRE COMMITING THIS - RE DO GET\/SET CONTENTTYPE AND LENGTH USING THE HEADER OBJECT\n- \/\/\/ <\/summary>\n public:\n \/*\n * Note - this refers to an HTTP \"Content-Type\" - which is really potentially more than just a InternetMediaType, often\n@@ -102,12 +98,10 @@\n * NOTE - if DataExchange::InternetMediaTypeRegistry::Get ().IsTextFormat (fContentType_), then\n * the characterset will be automatically folded into the used contentType. To avoid this, \n * Use UpdateHeader() to mdofiy teh contenttype field directly.\n- * \n- * \n- *\/\n- nonvirtual void SetContentType (const InternetMediaType& contentType);\n-\n-\n+ *\/\n+ nonvirtual void SetContentType (const InternetMediaType& contentType);\n+\n+ public:\n [[deprecated (\"Since Stroika 2.1b10 - use UpdateHeader()\")]] InternetMediaType GetContentType () const;\n \n public:\n@@ -124,10 +118,9 @@\n * GetState () == eInProgress\n * TotalBytesWritten == 0\n * \n- * \n- * * NOTE - if DataExchange::InternetMediaTypeRegistry::Get ().IsTextFormat (fContentType_), then\n- * the characterset will be automatically folded into the used contentType. To avoid this, \n- * Use UpdateHeader() to mdofiy teh contenttype field directly.\n+ * \\note - if DataExchange::InternetMediaTypeRegistry::Get ().IsTextFormat (fContentType_), then\n+ * the characterset will be automatically folded into the used contentType. To avoid this, \n+ * Use UpdateHeader() to mdofiy teh contenttype field directly.\n * \n *\/\n nonvirtual Characters::CodePage GetCodePage () const;\n@@ -253,16 +246,6 @@\n nonvirtual void SetStatus (Status newStatus, const String& overrideReason = wstring{});\n \n public:\n- \/*\n- * Add the given 'non-special' header to the list of headers to be associated with this reponse.\n- * Certain SPECIAL headers are handled differently, via other attributes of the request. The special headers\n- * that cannot be specified here include:\n- * o IO::Network::HTTP::HeaderName::kContentLength\n- * o IO::Network::HTTP::HeaderName::kContentType\n- *\n- * It is legal to call anytime before Flush. Illegal to call after flush. \n- * It is legal to call to replace existing headers values.\n- *\/\n [[deprecated (\"Since Stroika 2.1b10 - use UpdateHeader\")]] void AddHeader (const String& headerName, const String& value);\n \n public:\n@@ -293,10 +276,6 @@\n nonvirtual IO::Network::HTTP::Headers GetHeaders () const;\n \n public:\n- \/**\n- * This includes the user-set headers (AddHeader) and any special infered headers from other options, like\n- * Connection: close, Content-Type, etc.\n- *\/\n [[deprecated (\"Since 2.1b10, use GetHeaders() directly\")]] IO::Network::HTTP::Headers GetEffectiveHeaders () const\n {\n return GetHeaders ();\n@@ -307,7 +286,6 @@\n * @see Characters::ToString ();\n *\/\n nonvirtual String ToString () const;\n-\n \n private:\n InternetMediaType AdjustContentTypeForCodePageIfNeeded_ (const InternetMediaType& ct) const;\n"} {"commit":"fdcf08a98f35d9ece60d64cc1bf2307d97345351","subject":"BUG: missing include","message":"BUG: missing include\n","repos":"orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/Radiometry\/Simulation\/include\/otbSoilDataBase.h\n+++ Modules\/Radiometry\/Simulation\/include\/otbSoilDataBase.h\n@@ -25,6 +25,7 @@\n #include \"OTBSimulationExport.h\"\n #include <vector>\n #include <unordered_map>\n+#include <string>\n \n namespace otb\n {\n"} {"commit":"3124986f54260c9bdf0e911d1a9185b5b6cbf450","subject":"Added a new error to check a bug on iphone x","message":"Added a new error to check a bug on iphone x\n","repos":"owncloud\/ios-library","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OCCommunicationLib\/OCCommunicationLib\/OCCommunication.h\n+++ OCCommunicationLib\/OCCommunicationLib\/OCCommunication.h\n@@ -57,7 +57,8 @@\n OCErrorPrivateLinkRedirectionFailed = 1200,\n OCErrorPrivateLinkFileNotExists = 1201,\n OCErrorPrivateLinkFileNotCachedOffline = 1202,\n- OCErrorPrivateLinkErrorCachingFile = 1203\n+ OCErrorPrivateLinkErrorCachingFile = 1203,\n+ OCErrorPrivateLinkErrorCachingFile4 = 1204\n \n } OCErrorEnum;\n \n"} {"commit":"54a706e8bc8c2840c9b69d282322aa385aca7e51","subject":"Added clausifyAs function","message":"Added clausifyAs function\n","repos":"niklasso\/mcl,niklasso\/mcl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Clausify.h\n+++ Clausify.h\n@@ -195,6 +195,16 @@\n \n Var clausify (Gate g){ clausifyIter(g); return vmap[g]; }\n Lit clausify (Sig x){ return mkLit(clausify(gate(x)), sign(x)); }\n+\n+ Lit clausifyAs (Gate g, Lit a){ return clausifyAs(mkSig(g), a); }\n+ Lit clausifyAs (Sig x, Lit a){\n+ \/\/ this is a naive implementation;\n+ \/\/ TODO: a real implementation avoids the creation of an extra literal\n+ Lit b = clausify(x);\n+ solver.addClause(~a,b);\n+ solver.addClause(a,~b);\n+ return a;\n+ }\n \n Var lookup(Gate g){\n vmap.growTo(g, var_Undef);\n"} {"commit":"4634479055dd7b39ae54847138c63c531fb86d25","subject":"Add alignment.h.","message":"Add alignment.h.\n","repos":"AlericInglewood\/ai-utils","returncode":1,"stderr":"error: pathspec 'alignment.h' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- alignment.h\n+++ alignment.h\n@@ -0,0 +1,91 @@\n+\/**\n+ * \\file alignment.h\n+ * \\brief Definition of alignment related utilities.\n+ *\n+ * Copyright (C) 2015 Aleric Inglewood.\n+ *\n+ * This program is free software: you can redistribute it and\/or modify\n+ * it under the terms of the GNU Affero General Public License as published\n+ * by the Free Software Foundation, either version 3 of the License, or\n+ * (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU Affero General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Affero General Public License\n+ * along with this program. If not, see <http:\/\/www.gnu.org\/licenses\/>.\n+ *\/\n+\n+#ifndef UTILS_ALIGNMENT_H\n+#define UTILS_ALIGNMENT_H\n+\n+template<int size>\n+struct size_to_type\n+{\n+ typedef long long integral_t;\n+};\n+\n+#if __SIZEOF_LONG__ < __SIZEOF_LONG_LONG__\n+template<>\n+struct size_to_type<sizeof(long)>\n+{\n+ typedef long integral_t;\n+}\n+#endif\n+\n+#if __SIZEOF_INT__ < __SIZEOF_LONG__\n+template<>\n+struct size_to_type<sizeof(int)>\n+{\n+ typedef int integral_t;\n+};\n+#endif\n+\n+#if __SIZEOF_SHORT__ < __SIZEOF_INT__\n+template<>\n+struct size_to_type<sizeof(short int)>\n+{\n+ typedef short int integral_t;\n+};\n+#endif\n+\n+#if 1 < __SIZEOF_SHORT__\n+template<>\n+struct size_to_type<sizeof(char)>\n+{\n+ typedef char integral_t;\n+};\n+#endif\n+\n+template<int x>\n+struct ilog2\n+{\n+ enum { value = (1 + ilog2<x\/2>::value) };\n+};\n+\n+template<>\n+struct ilog2<1>\n+{\n+ enum { value = 0 };\n+};\n+\n+\/\/ Calculate alignment.\n+\/\/\n+\/\/ SIZE: the size of the type (struct) that needs alignment.\n+\/\/ max_size must be a power of two and less than or equal sizeof(long long).\n+\/\/\n+\/\/ alignment<SIZE>::log2 is the log base 2 of SIZE (rounded down to nearest integer).\n+\/\/ alignment<SIZE>::size is SIZE rounded down to the nearest power of 2.\n+\/\/ alignment<SIZE>::type is an integral type whose size (and alignment) is equal to size,\n+\/\/ unless size is larger than max_size, then it is equal to max_size.\n+template<int SIZE, int max_size = sizeof(long)>\n+struct alignment\n+{\n+ enum { log2 = ilog2<SIZE>::value };\n+ enum { size = 1 << log2 };\n+ typedef typename size_to_type<size >= max_size ? max_size : size>::integral_t type;\n+};\n+\n+#endif \/\/ UTILS_ALIGNMENT_H\n"} {"commit":"b139a149b1b5b33478298ed38dbe78765ed6e552","subject":"Proper casting","message":"Proper casting","repos":"Igor-Rast\/printipi,Wallacoloo\/printipi,harry159821\/printipi,Wallacoloo\/printipi,Igor-Rast\/printipi,harry159821\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,harry159821\/printipi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/firmware\/src\/common\/timeutil.h\n+++ code\/firmware\/src\/common\/timeutil.h\n@@ -34,7 +34,7 @@\n template <typename T> timespec durationToTimespec(const T& abs) {\n \tauto sec = std::chrono::duration_cast<std::chrono::seconds>(abs);\n \tauto nsec = abs-sec;\n-\treturn timespec{sec.count(), nsec.count()};\n+\treturn timespec{(time_t)sec.count(), (long int)nsec.count()};\n }\n template <typename T> timespec timepointToTimespec(const T& timepoint) {\n \tauto abs = timepoint.time_since_epoch(); \/\/clock's epoch, not 1970.\n"} {"commit":"165a39237a78d498967e4f5972f112407911dcc5","subject":"Adding reference to AVR application note.","message":"Adding reference to AVR application note.\n","repos":"dansut\/Cosa,rrobinet\/Cosa,mikaelpatel\/Cosa,SinishaDjukic\/Meshwork,mikaelpatel\/Cosa,jeditekunum\/Cosa,jeditekunum\/Cosa,rrobinet\/Cosa,jeditekunum\/Cosa,SinishaDjukic\/Meshwork,kc9jud\/Cosa,dansut\/Cosa,SinishaDjukic\/Meshwork,rrobinet\/Cosa,dansut\/Cosa,dansut\/Cosa,SinishaDjukic\/Meshwork,mikaelpatel\/Cosa,kc9jud\/Cosa,mikaelpatel\/Cosa,kc9jud\/Cosa,jeditekunum\/Cosa,kc9jud\/Cosa,rrobinet\/Cosa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Cosa\/BCD.h\n+++ Cosa\/BCD.h\n@@ -25,6 +25,9 @@\n *\n * @section Limitations\n * Handles only two digit BCD numbers (0..99).\n+ *\n+ * @section References\n+ * [1] AVR204: BCD Arithmetics, Atmel Corporation, 0938B\u2013AVR\u201301\/03.\n *\n * This file is part of the Arduino Che Cosa project.\n *\/\n"} {"commit":"8656919bf023e0f6a656e193fd3d1f8399c3949d","subject":"Remove duplicate declaration","message":"Remove duplicate declaration\n\nSummary:\nChangelog: [internal]\n\nThis is already defined in Touch.h\n\nReviewed By: shergin\n\nDifferential Revision: D25242843\n\nfbshipit-source-id: 23bac2a60f3d995e34d342c3a189760875f4bc77\n","repos":"myntra\/react-native,arthuralee\/react-native,pandiaraj44\/react-native,myntra\/react-native,pandiaraj44\/react-native,janicduplessis\/react-native,pandiaraj44\/react-native,facebook\/react-native,facebook\/react-native,pandiaraj44\/react-native,myntra\/react-native,janicduplessis\/react-native,javache\/react-native,javache\/react-native,javache\/react-native,myntra\/react-native,janicduplessis\/react-native,facebook\/react-native,javache\/react-native,myntra\/react-native,janicduplessis\/react-native,facebook\/react-native,janicduplessis\/react-native,facebook\/react-native,arthuralee\/react-native,pandiaraj44\/react-native,pandiaraj44\/react-native,arthuralee\/react-native,facebook\/react-native,pandiaraj44\/react-native,janicduplessis\/react-native,janicduplessis\/react-native,arthuralee\/react-native,arthuralee\/react-native,pandiaraj44\/react-native,facebook\/react-native,myntra\/react-native,facebook\/react-native,javache\/react-native,janicduplessis\/react-native,javache\/react-native,javache\/react-native,myntra\/react-native,javache\/react-native,facebook\/react-native,myntra\/react-native,javache\/react-native,myntra\/react-native","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ReactCommon\/react\/renderer\/components\/view\/TouchEvent.h\n+++ ReactCommon\/react\/renderer\/components\/view\/TouchEvent.h\n@@ -15,8 +15,6 @@\n \n namespace facebook {\n namespace react {\n-\n-using Touches = std::unordered_set<Touch, Touch::Hasher, Touch::Comparator>;\n \n \/*\n * Defines the `touchstart`, `touchend`, `touchmove`, and `touchcancel` event\n"} {"commit":"d2bcef385d3421b574895ad41012c0eb19944a81","subject":"Added context references.","message":"Added context references.\n","repos":"paroj\/ogre,OGRECave\/ogre,paroj\/ogre,RealityFactory\/ogre,OGRECave\/ogre,OGRECave\/ogre,OGRECave\/ogre,OGRECave\/ogre,RealityFactory\/ogre,paroj\/ogre,RealityFactory\/ogre,paroj\/ogre,RealityFactory\/ogre,RealityFactory\/ogre,paroj\/ogre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- RenderSystems\/GLES2\/include\/Android\/OgreAndroidWindow.h\n+++ RenderSystems\/GLES2\/include\/Android\/OgreAndroidWindow.h\n@@ -34,10 +34,18 @@\n namespace Ogre {\n \tclass AndroidGLContext;\n \t\n+\tclass AndroidWindowDelegate\n+\t{\n+\tpublic:\n+\t\t\n+\t};\n+\t\n class _OgrePrivate AndroidWindow : public RenderWindow\n {\n \tprotected:\n \t\tAndroidGLSupport* mGLSupport;\n+\t\tAndroidGLContext* mContext;\n+\t\tAndroidWindowDelegate *mDelegate;\n \t\tbool mClosed;\n \t\tint mHandle;\n \n@@ -59,6 +67,7 @@\n \t\t@remarks\n \t\t* Get custom attribute; the following attributes are valid:\n \t\t* HANDLE The integer id of the android window\n+\t\t* GLCONTEXT The Ogre GLContext used for rendering.\n \t\t*\/\n \t\tvoid getCustomAttribute(const String& name, void* pData);\n \t\t\n"} {"commit":"cd21322616c3af265d39bf15321d436e667a5dd1","subject":"ext4: Fix delalloc release block reservation for truncate","message":"ext4: Fix delalloc release block reservation for truncate\n\nExt4 will release the reserved blocks for delayed allocations when\ninode is truncated\/unlinked. If there is no reserved block at all, we\nshouldn't need to do so. But current code still tries to release the\nreserved blocks regardless whether the counters's value is 0.\nContinue to do that causes the later calculation to go wrong and a\nkernel BUG_ON() caught that. This doesn't happen for extent-based\nfiles, as the calculation for 0 reserved blocks was right for extent\nbased file.\n\nThis patch fixed the kernel BUG() due to above reason. It adds checks\nfor 0 to avoid unnecessary release and fix calculation for non-extent\nfiles.\n\nSigned-off-by: Mingming Cao <89e10773c335857ac236dfae53fd89ae361ca3d4@us.ibm.com>\nSigned-off-by: \"Theodore Ts'o\" <4ed386e0495d3e109932df055831d9ec2f824927@mit.edu>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/ext4\/inode.c\n+++ fs\/ext4\/inode.c\n@@ -1005,6 +1005,9 @@\n *\/\n static int ext4_calc_metadata_amount(struct inode *inode, int blocks)\n {\n+\tif (!blocks)\n+\t\treturn 0;\n+\n \tif (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)\n \t\treturn ext4_ext_calc_metadata_amount(inode, blocks);\n \n@@ -1559,7 +1562,25 @@\n \tstruct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);\n \tint total, mdb, mdb_free, release;\n \n+\tif (!to_free)\n+\t\treturn;\t\t\/* Nothing to release, exit *\/\n+\n \tspin_lock(&EXT4_I(inode)->i_block_reservation_lock);\n+\n+\tif (!EXT4_I(inode)->i_reserved_data_blocks) {\n+\t\t\/*\n+\t\t * if there is no reserved blocks, but we try to free some\n+\t\t * then the counter is messed up somewhere.\n+\t\t * but since this function is called from invalidate\n+\t\t * page, it's harmless to return without any action\n+\t\t *\/\n+\t\tprintk(KERN_INFO \"ext4 delalloc try to release %d reserved \"\n+\t\t\t \"blocks for inode %lu, but there is no reserved \"\n+\t\t\t \"data blocks\\n\", to_free, inode->i_ino);\n+\t\tspin_unlock(&EXT4_I(inode)->i_block_reservation_lock);\n+\t\treturn;\n+\t}\n+\n \t\/* recalculate the number of metablocks still need to be reserved *\/\n \ttotal = EXT4_I(inode)->i_reserved_data_blocks - to_free;\n \tmdb = ext4_calc_metadata_amount(inode, total);\n"} {"commit":"fe137103d5e3c471f3be89ac156fef9ffd97ec83","subject":"release GIL to prevent blocking on nmsg.Device()","message":"release GIL to prevent blocking on nmsg.Device()","repos":"tonysimpson\/nanomsg-python,tempbottle\/nanomsg-python,tempbottle\/nanomsg-python,tonysimpson\/nanomsg-python","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- _nanomsg_cpy\/wrapper.c\n+++ _nanomsg_cpy\/wrapper.c\n@@ -375,10 +375,13 @@\n static PyObject *\n _nanomsg_cpy_nn_device(PyObject *self, PyObject *args)\n {\n- int socket_1, socket_2;\n+ int socket_1, socket_2, nn_result;\n if (!PyArg_ParseTuple(args, \"ii\", &socket_1, &socket_2))\n return NULL;\n- return Py_BuildValue(\"i\", nn_device(socket_1, socket_2));\n+ CONCURRENCY_POINT_BEGIN\n+ nn_result = nn_device(socket_1, socket_2);\n+ CONCURRENCY_POINT_END\n+ return Py_BuildValue(\"i\", nn_result);\n }\n \n static PyObject *\n"} {"commit":"fa65a83f61626772203ba8813b84c30384ae080f","subject":"master header files: Automated master header file repair. Visual-C++ project files: Automated Visual-C++ project file repair. Texinfo files: Automated Texinfo @node and @menu repair. Swig Python files: Automated Swig Python file repair. Swig Perl5 files: Automated Swig Perl5 file repair. User's Manual: Automated Texinfo to HTML conversion. csver.h: Automated csver.h regeneration.","message":"master header files: Automated master header file repair.\nVisual-C++ project files: Automated Visual-C++ project file repair.\nTexinfo files: Automated Texinfo @node and @menu repair.\nSwig Python files: Automated Swig Python file repair.\nSwig Perl5 files: Automated Swig Perl5 file repair.\nUser's Manual: Automated Texinfo to HTML conversion.\ncsver.h: Automated csver.h regeneration.\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@35630 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/csver.h\n+++ include\/csver.h\n@@ -57,7 +57,7 @@\n *\/\n \/\/CS_RCSREV_OFFSET 513\n #ifndef CS_VERSION_RCSREV\n-#define CS_VERSION_RCSREV\t3006\n+#define CS_VERSION_RCSREV\t3015\n #endif\n \n \/**\\name Version number definitions (numeric)\n"} {"commit":"80a163320c963dc6cb5d65d9cbfa708fdc4f6e9e","subject":"Remove some comments in error.h","message":"Remove some comments in error.h\n","repos":"SuperV1234\/cpr,msuvajac\/cpr,msuvajac\/cpr,msuvajac\/cpr,SuperV1234\/cpr,whoshuu\/cpr,SuperV1234\/cpr,whoshuu\/cpr,whoshuu\/cpr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/error.h\n+++ include\/error.h\n@@ -28,7 +28,7 @@\n UNKNOWN_ERROR = 1000,\n };\n \n-ErrorCode getErrorCodeForCurlError(int curl_code); \/\/int so we don't have to include curl.h\n+ErrorCode getErrorCodeForCurlError(int curl_code);\n \n class Error {\n public:\n@@ -43,8 +43,6 @@\n ErrorCode code;\n std::string message;\n \n- \/\/allow easy checking of errors with:\n- \/\/ if(error) { do something; }\n explicit operator bool() const {\n return code != ErrorCode::OK;\n }\n"} {"commit":"b0c8228755e6d86a77f3a74999216b31feb44a6b","subject":"Remove no longer used SkipEncodingUnusedStreams.","message":"Remove no longer used SkipEncodingUnusedStreams.\n\nR=andrew@webrtc.org\n\nReview URL: https:\/\/webrtc-codereview.appspot.com\/18829004\n\ngit-svn-id: 917f5d3ca488f358c4d40eaec14422cf392ccec9@6753 4adac7df-926f-26a2-2b94-8c16560cd09d\n","repos":"mwgoldsmith\/libilbc,TimothyGu\/libilbc,mwgoldsmith\/ilbc,mwgoldsmith\/ilbc,ShiftMediaProject\/libilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc,mwgoldsmith\/libilbc,ShiftMediaProject\/libilbc,ShiftMediaProject\/libilbc,ShiftMediaProject\/libilbc,mwgoldsmith\/ilbc,mwgoldsmith\/libilbc,mwgoldsmith\/ilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,mwgoldsmith\/libilbc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- webrtc\/experiments.h\n+++ webrtc\/experiments.h\n@@ -21,15 +21,6 @@\n uint32_t min_rate;\n };\n \n-struct SkipEncodingUnusedStreams {\n- SkipEncodingUnusedStreams() : enabled(false) {}\n- explicit SkipEncodingUnusedStreams(bool set_enabled)\n- : enabled(set_enabled) {}\n- virtual ~SkipEncodingUnusedStreams() {}\n-\n- const bool enabled;\n-};\n-\n struct AimdRemoteRateControl {\n AimdRemoteRateControl() : enabled(false) {}\n explicit AimdRemoteRateControl(bool set_enabled)\n"} {"commit":"6cb1c53fa0059ba6200e1e5ab0bc9a97cb25171e","subject":"Per \"Marshall M. Midden\" <m4@brecis.com>, remove double define of _PATH_LOCALE.","message":"Per \"Marshall M. Midden\" <m4@brecis.com>, remove double\ndefine of _PATH_LOCALE.\n","repos":"waweber\/uclibc-clang,foss-xtensa\/uClibc,ysat0\/uClibc,mephi42\/uClibc,czankel\/xtensa-uclibc,skristiansson\/uClibc-or1k,klee\/klee-uclibc,gittup\/uClibc,brgl\/uclibc-ng,foss-xtensa\/uClibc,gittup\/uClibc,ndmsystems\/uClibc,OpenInkpot-archive\/iplinux-uclibc,klee\/klee-uclibc,hjl-tools\/uClibc,kraj\/uclibc-ng,groundwater\/uClibc,ChickenRunjyd\/klee-uclibc,mephi42\/uClibc,atgreen\/uClibc-moxie,czankel\/xtensa-uclibc,majek\/uclibc-vx32,ChickenRunjyd\/klee-uclibc,atgreen\/uClibc-moxie,waweber\/uclibc-clang,foss-for-synopsys-dwc-arc-processors\/uClibc,ChickenRunjyd\/klee-uclibc,ffainelli\/uClibc,groundwater\/uClibc,waweber\/uclibc-clang,m-labs\/uclibc-lm32,skristiansson\/uClibc-or1k,ndmsystems\/uClibc,ddcc\/klee-uclibc-0.9.33.2,OpenInkpot-archive\/iplinux-uclibc,atgreen\/uClibc-moxie,foss-xtensa\/uClibc,kraj\/uClibc,foss-xtensa\/uClibc,hjl-tools\/uClibc,ysat0\/uClibc,kraj\/uclibc-ng,ffainelli\/uClibc,kraj\/uClibc,mephi42\/uClibc,ChickenRunjyd\/klee-uclibc,majek\/uclibc-vx32,OpenInkpot-archive\/iplinux-uclibc,wbx-github\/uclibc-ng,ffainelli\/uClibc,brgl\/uclibc-ng,ysat0\/uClibc,ffainelli\/uClibc,m-labs\/uclibc-lm32,waweber\/uclibc-clang,hjl-tools\/uClibc,klee\/klee-uclibc,hjl-tools\/uClibc,wbx-github\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,skristiansson\/uClibc-or1k,groundwater\/uClibc,gittup\/uClibc,ffainelli\/uClibc,kraj\/uClibc,hjl-tools\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,wbx-github\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,groundwater\/uClibc,ndmsystems\/uClibc,hwoarang\/uClibc,hwoarang\/uClibc,atgreen\/uClibc-moxie,skristiansson\/uClibc-or1k,kraj\/uclibc-ng,czankel\/xtensa-uclibc,m-labs\/uclibc-lm32,brgl\/uclibc-ng,klee\/klee-uclibc,gittup\/uClibc,wbx-github\/uclibc-ng,ndmsystems\/uClibc,hwoarang\/uClibc,ysat0\/uClibc,majek\/uclibc-vx32,majek\/uclibc-vx32,ddcc\/klee-uclibc-0.9.33.2,brgl\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,kraj\/uClibc,kraj\/uclibc-ng,OpenInkpot-archive\/iplinux-uclibc,czankel\/xtensa-uclibc,mephi42\/uClibc,hwoarang\/uClibc,groundwater\/uClibc,m-labs\/uclibc-lm32,ddcc\/klee-uclibc-0.9.33.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/paths.h\n+++ include\/paths.h\n@@ -63,6 +63,10 @@\n #define\t_PATH_VI\t\"\/usr\/bin\/vi\"\n #define\t_PATH_WTMP\t\"\/var\/log\/wtmp\"\n #define\t_PATH_LOCALE\t\"\/usr\/lib\/locale\"\n+#define\t_PATH_LASTLOG\t\"\/var\/log\/lastlog\"\n+#define\t_PATH_SHADOW\t\"\/etc\/shadow\"\n+#define\t_PATH_PASSWD\t\"\/etc\/passwd\"\n+#define\t_PATH_GROUP\t\"\/etc\/group\"\n \n \/* Provide trailing slash, since mostly used for building pathnames. *\/\n #define\t_PATH_DEV\t\"\/dev\/\"\n@@ -70,10 +74,5 @@\n #define\t_PATH_VARDB\t\"\/var\/lib\/misc\/\"\n #define\t_PATH_VARRUN\t\"\/var\/run\/\"\n #define\t_PATH_VARTMP\t\"\/var\/tmp\/\"\n-#define\t_PATH_LASTLOG\t\"\/var\/log\/lastlog\"\n-#define\t_PATH_LOCALE\t\"\/usr\/lib\/locale\"\n-#define\t_PATH_SHADOW\t\"\/etc\/shadow\"\n-#define\t_PATH_PASSWD\t\"\/etc\/passwd\"\n-#define\t_PATH_GROUP\t\"\/etc\/group\"\n \n #endif \/* !_PATHS_H_ *\/\n"} {"commit":"491bed5187421b283b3a21d380b32bfb3c0cd194","subject":"Also defined wint_t","message":"Also defined wint_t\n","repos":"DeforaOS\/libc,DeforaOS\/libc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/wchar.h\n+++ include\/wchar.h\n@@ -37,6 +37,10 @@\n # define wchar_t wchar_t\n typedef char wchar_t;\n # endif\n+# ifndef wint_t\n+# define wint_t wint_t\n+typedef int wint_t;\n+# endif\n \n \n \/* constants *\/\n"} {"commit":"25a0ff2d41a6b0c7dfd444ca7baba99dbf7f31b7","subject":"Add HIC IDs for existing and new Maxim HICs","message":"Add HIC IDs for existing and new Maxim HICs\n\nThis reserves the HIC IDs for the MAX32620, MAX32625 and MAX32550 hardware interface circuits.","repos":"google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/daplink\/daplink.h\n+++ source\/daplink\/daplink.h\n@@ -54,7 +54,10 @@\n #define DAPLINK_HIC_ID_KL26 0x97969901\n #define DAPLINK_HIC_ID_LPC11U35 0x97969902\n #define DAPLINK_HIC_ID_SAM3U2C 0x97969903\n+#define DAPLINK_HIC_ID_MAX32620 0x97969904\n #define DAPLINK_HIC_ID_LPC4322 0x97969905\n+#define DAPLINK_HIC_ID_MAX32625 0x97969906\n+#define DAPLINK_HIC_ID_MAX32550 0x97969907\n \n #define DAPLINK_INFO_OFFSET 0x20\n \n"} {"commit":"77209c6e150b02ff6d21088d8edd028873fe5c32","subject":"Contiki: Removed size from coap_address_t","message":"Contiki: Removed size from coap_address_t\n","repos":"authmillenon\/libcoap,gebart\/libcoap,gebart\/libcoap,authmillenon\/libcoap,authmillenon\/libcoap,gebart\/libcoap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- address.h\n+++ address.h\n@@ -61,14 +61,12 @@\n #include \"uip.h\"\n \n typedef struct coap_address_t {\n- unsigned char size;\n uip_ipaddr_t addr;\n unsigned short port;\n } coap_address_t;\n \n #define _coap_address_equals_impl(A,B)\t\t\t\t\\\n- ((A)->size == (B)->size\t\t\t\t\t\\\n- && (A)->port == (B)->port\t\t\t\t\t\\\n+ ((A)->port == (B)->port\t\t\t\t\t\\\n && uip_ipaddr_cmp(&((A)->addr),&((B)->addr)))\n \n \/** @todo implementation of _coap_address_isany_impl() for Contiki *\/\n@@ -156,8 +154,8 @@\n coap_address_init(coap_address_t *addr) {\n assert(addr);\n memset(addr, 0, sizeof(coap_address_t));\n-#ifndef WITH_LWIP\n- \/* lwip has constandt address sizes and doesn't need the .size part *\/\n+#ifdef WITH_POSIX\n+ \/* lwip and Contiki have constant address sizes and doesn't need the .size part *\/\n addr->size = sizeof(addr->addr);\n #endif\n }\n"} {"commit":"47240923cb5dd54fb6b3db7a3b28cc61bb284166","subject":"Remove extra semicolon.","message":"Remove extra semicolon.\n","repos":"justmoon\/bzing,justmoon\/bzing,justmoon\/bzing","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bzing_engines.h\n+++ src\/bzing_engines.h\n@@ -92,7 +92,7 @@\n \n #include \"ulib\/alignhash_tpl.h\"\n \n-DECLARE_ALIGNHASH(inv, uint64_t, bz_inv_t, 1, alignhash_hashfn, alignhash_equalfn);\n+DECLARE_ALIGNHASH(inv, uint64_t, bz_inv_t, 1, alignhash_hashfn, alignhash_equalfn)\n \n #endif\n \n"} {"commit":"543775282c3ddca7e7982ba070688fe7b2861ef5","subject":"Briefly light up on settings receive","message":"Briefly light up on settings receive\n","repos":"Spitemare\/constructor,Spitemare\/constructor,Spitemare\/constructor,Spitemare\/constructor,Spitemare\/constructor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/c\/constructor.c\n+++ src\/c\/constructor.c\n@@ -15,6 +15,7 @@\n \n static void settings_handler(void *context) {\n log_func();\n+ light_enable_interaction();\n window_set_background_color(s_window, enamel_get_BACKGROUND_COLOR());\n connection_vibes_set_state(atoi(enamel_get_CONNECTION_VIBE()));\n hourly_vibes_set_enabled(enamel_get_HOURLY_VIBE());\n"} {"commit":"8a194872637b0269e3dfdcfe9a5e933db1d49ba0","subject":"Planning on how to support continuations and native functions","message":"Planning on how to support continuations and native functions\n","repos":"liljencrantz\/anna,liljencrantz\/anna,liljencrantz\/anna,liljencrantz\/anna,liljencrantz\/anna","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- anna_vm.h\n+++ anna_vm.h\n@@ -1,5 +1,7 @@\n #ifndef ANNA_VM_H\n #define ANNA_VM_H\n+\n+typedef anna_object_t **(*anna_vm_callback_t)(void *aux);\n \n void anna_vm_compile(\n anna_function_t *fun);\n@@ -8,6 +10,10 @@\n \n void anna_vm_init(void);\n anna_object_t *anna_vm_run(anna_object_t *entry, int argc, anna_object_t **argv);\n+\n+void anna_vm_call_loop(anna_vm_callback_t callback, void *aux, anna_object_t *entry, int argc);\n+void anna_vm_call_once(anna_object_t *entry, int argc, anna_object_t **argv);\n+\n size_t anna_vm_stack_frame_count();\n anna_vmstack_t *anna_vm_stack_get(size_t idx);\n void anna_vm_mark_code(anna_function_t *f);\n"} {"commit":"37673d6876297dd4bedb0c9afa5bc06eb6c5c67e","subject":"fptu: alter error codes for POSIX.","message":"fptu: alter error codes for POSIX.\n","repos":"leo-yuriev\/libfptu,leo-yuriev\/libfpta,leo-yuriev\/libfptu,leo-yuriev\/libfpta","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fast_positive\/tuples.h\n+++ fast_positive\/tuples.h\n@@ -126,9 +126,14 @@\n FPTU_EINVAL = 0x00000057 \/* ERROR_INVALID_PARAMETER *\/,\n FPTU_ENOSPACE = 0x00000540 \/* ERROR_ALLOTTED_SPACE_EXCEEDED *\/,\n #else\n- FPTU_ENOFIELD = ENOENT,\n- FPTU_EINVAL = EINVAL,\n- FPTU_ENOSPACE = ENOSPC,\n+#ifdef ENOKEY\n+ FPTU_ENOFIELD = ENOKEY \/* Required key not available *\/,\n+#else\n+ FPTU_ENOFIELD = ENOENT \/* No such file or directory (POSIX) *\/,\n+#endif\n+ FPTU_EINVAL = EINVAL \/* Invalid argument (POSIX) *\/,\n+ FPTU_ENOSPACE = ENOBUFS \/* No buffer space available (POSIX) *\/,\n+\/* OVERFLOW - Value too large to be stored in data type (POSIX) *\/\n #endif\n };\n \n"} {"commit":"4a0e88e1e8a855041aca783d77d87f15bf8281af","subject":"fix self-assignment","message":"fix self-assignment\n","repos":"konoha-project\/konoha3,konoha-project\/minikonoha,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/minikonoha,konoha-project\/minikonoha","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- package\/konoha.assign\/assign_glue.c\n+++ package\/konoha.assign\/assign_glue.c\n@@ -105,22 +105,22 @@\n \tfor(i = beginIdx; i < operatorIdx; i++) {\n \t\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[i]);\n \t}\n-\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+0]);\n-\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+1]);\n+\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+1]); \/\/ template: =\n+\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+2]); \/\/ template; (\n \tfor(i = beginIdx; i < operatorIdx; i++) {\n \t\tkTokenVar *tk = GCSAFE_new(TokenVar, 0);\n \t\tkToken_copy(kctx, tk, tokenList->tokenItems[i]);\n \t\tKLIB kArray_add(kctx, tokenList, tk);\n \t}\n-\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+2]);\n+\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+3]); \/\/ template: )\n \tkTokenVar *opToken = GCSAFE_new(TokenVar, TokenType_SYMBOL);\n \tKSETv(opToken->text, KLIB new_kString(kctx, S_text(selfAssignToken->text), S_size(selfAssignToken->text) - 1, SPOL_ASCII));\n \tKLIB kArray_add(kctx, tokenList, opToken);\n-\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+3]);\n+\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+4]); \/\/ template: (\n \tfor(i = operatorIdx+1; i < endIdx; i++) {\n \t\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[i]);\n \t}\n-\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+4]);\n+\tKLIB kArray_add(kctx, tokenList, tokenList->tokenItems[beginTemplateIdx+5]); \/\/ template: )\n \n \tsize_t beginResolovedIdx = kArray_size(tokenList);\n \tif(SUGAR kNameSpace_resolveTokenArray(kctx, ns, tokenList, beginNewIdx, beginResolovedIdx, tokenList)) {\n"} {"commit":"e2526f4ac8e77a7a2436920727a9c33841d9afc8","subject":"fixed reldep pointer NULL comparison","message":"fixed reldep pointer NULL comparison","repos":"Conan-Kudo\/libhif,Conan-Kudo\/libhif,hughsie\/libhif,rpm-software-management\/libhif,rpm-software-management\/libdnf,rpm-software-management\/libdnf,rpm-software-management\/libhif,Conan-Kudo\/libhif,edynox\/libdnf,rpm-software-management\/libdnf,cgwalters\/libhif,edynox\/libdnf,rpm-software-management\/libdnf,Conan-Kudo\/libhif,hughsie\/libhif,hughsie\/libhif,rpm-software-management\/libhif,hughsie\/libhif,cgwalters\/libhif,rpm-software-management\/libhif,edynox\/libdnf,cgwalters\/libhif,edynox\/libdnf,cgwalters\/libhif","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hawkey\/src\/subject.c\n+++ hawkey\/src\/subject.c\n@@ -52,7 +52,6 @@\n flags |= HY_NAME_ONLY;\n int allow_glob = flags & HY_GLOB;\n char *version = nevra->version;\n- const char **existing_arches;\n if (nevra->name != NULL && !(allow_glob && is_glob_pattern(nevra->version))) {\n \tif (allow_glob && is_glob_pattern(nevra->version))\n \t version = NULL;\n@@ -64,7 +63,7 @@\n if (nevra->arch != NULL && !(allow_glob && is_glob_pattern(nevra->arch))) {\n \tif (strcmp(nevra->arch, \"src\") == 0)\n \t return 1;\n-\texisting_arches = hy_sack_list_arches(sack);\n+\tconst char **existing_arches = hy_sack_list_arches(sack);\n \tint ret = 0;\n \tfor (int i = 0; existing_arches[i] != NULL; ++i) {\n \t if (strcmp(nevra->arch, existing_arches[i]) == 0) {\n@@ -151,7 +150,7 @@\n \t*out_reldep = hy_reldep_create(iter->sack, name, cmp_type, evr);\n \tsolv_free(name);\n \tsolv_free(evr);\n-\tif (out_reldep == NULL)\n+\tif (*out_reldep == NULL)\n \t return -1;\n \treturn 0;\n }\n"} {"commit":"124a912079addd834348f0015f958f03fde3fe83","subject":"Point Light Shadow \uac70\ub9ac\uc5d0 \ub530\ub978 bias\uac12 \uc57d\uac04 \ubcc0\uacbd","message":"Point Light Shadow \uac70\ub9ac\uc5d0 \ub530\ub978 bias\uac12 \uc57d\uac04 \ubcc0\uacbd\n","repos":"Jin02\/SOCEngine,Jin02\/SOCEngine,Jin02\/SOCEngine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SOCEngine\/SOCEngine\/ShaderCodes\/DynamicLightingCommon.h\n+++ SOCEngine\/SOCEngine\/ShaderCodes\/DynamicLightingCommon.h\n@@ -105,7 +105,7 @@\n \tshadowUV.x = (shadowUV.x \/ 2.0f) + 0.5f;\n \tshadowUV.y = (shadowUV.y \/-2.0f) + 0.5f;\n \n-\tshadowUV.xy *= (shadowGlobalParam_pointLightTexelOffset).xx;\n+\tshadowUV.xy *= shadowGlobalParam_pointLightTexelOffset.xx;\n \tshadowUV.xy += (shadowGlobalParam_pointLightUnderscanScale).xx;\n \n \tshadowUV.y += (float)faceIndex;\n@@ -118,7 +118,7 @@\n \tshadowUV.x *= rcp((float)lightCount);\/\/(1.0f \/ (float)lightCount);\n \n \tfloat bias = (float)g_inputPointLightShadowParams[lightIndex].bias;\n-\tfloat depth = shadowUV.z - lerp(10.0f, 1.0f, saturate(2.5f * shadowDistanceTerm)) * bias;\n+\tfloat depth = shadowUV.z - lerp(10.0f, 1.0f, saturate(5 * shadowDistanceTerm)) * bias;\n \tfloat shadow = saturate( Shadowing(g_inputPointLightShadowMapAtlas, shadowUV.xy, depth) );\n \n \tfloat3 shadowColor = g_inputPointLightShadowColors[lightIndex].rgb;\n"} {"commit":"f5e9390ef2b32749970f907bbf75f8500d994f2d","subject":"SecurityPkg Variable: Add SysPrepOrder and SysPrep#### to global list.","message":"SecurityPkg Variable: Add SysPrepOrder and SysPrep#### to global list.\n\nContributed-under: TianoCore Contribution Agreement 1.0\nSigned-off-by: Star Zeng <star.zeng@intel.com>\nReviewed-by: Jiewen Yao <jiewen.yao@intel.com>\n\ngit-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@17578 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- SecurityPkg\/VariableAuthenticated\/RuntimeDxe\/VarCheck.c\n+++ SecurityPkg\/VariableAuthenticated\/RuntimeDxe\/VarCheck.c\n@@ -405,6 +405,17 @@\n InternalVarCheckSizeArray\r\n },\r\n {\r\n+ EFI_SYS_PREP_ORDER_VARIABLE_NAME,\r\n+ {\r\n+ VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r\n+ 0,\r\n+ VARIABLE_ATTRIBUTE_NV_BS_RT,\r\n+ sizeof (UINT16),\r\n+ MAX_UINTN\r\n+ },\r\n+ InternalVarCheckSizeArray\r\n+ },\r\n+ {\r\n EFI_HW_ERR_REC_SUPPORT_VARIABLE_NAME,\r\n {\r\n VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r\n@@ -573,6 +584,17 @@\n },\r\n {\r\n L\"Driver####\",\r\n+ {\r\n+ VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r\n+ 0,\r\n+ VARIABLE_ATTRIBUTE_NV_BS_RT,\r\n+ sizeof (UINT32) + sizeof (UINT16),\r\n+ MAX_UINTN\r\n+ },\r\n+ InternalVarCheckLoadOption\r\n+ },\r\n+ {\r\n+ L\"SysPrep####\",\r\n {\r\n VAR_CHECK_VARIABLE_PROPERTY_REVISION,\r\n 0,\r\n"} {"commit":"dd75e174ec29df04867783bd5b8643dd0a66d78c","subject":"typo in usage message","message":"typo in usage message\n","repos":"pecharmin\/bind9,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bin\/named\/main.c\n+++ bin\/named\/main.c\n@@ -164,7 +164,7 @@\n usage(void) {\n \tfprintf(stderr,\n \t\t\"usage: named [-c conffile] [-d debuglevel] [-f] [-N number_of_cpus]\\n\"\n-\t\t\" [-p port] ] [-s] [-t chrootdir] [-u username]\\n\");\n+\t\t\" [-p port] [-s] [-t chrootdir] [-u username]\\n\");\n }\n \n static void \n"} {"commit":"9939e05851cb58a219eb06f61209d347d1810546","subject":"Fixed condition for keep edges to blocks.","message":"Fixed condition for keep edges to blocks.\n\nThis partially fixes opt\/fehler217.c.\n","repos":"killbug2004\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/ir\/iredges.c\n+++ ir\/ir\/iredges.c\n@@ -351,7 +351,8 @@\n \t\t\t}\n \n \t\t\tedges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg);\n-\t\t} else if (get_irn_mode(src) == mode_X && old_tgt != NULL && is_Block(old_tgt)) {\n+\t\t} else if (get_irn_mode(src) == mode_X && old_tgt != NULL && pos == -1) {\n+\t\t\tassert(is_Block(old_tgt));\n \t\t\t\/* moving a jump node from one block to another *\/\n \t\t\tforeach_out_edge_kind_safe(old_tgt, edge, EDGE_KIND_BLOCK) {\n \t\t\t\tir_node *succ = get_edge_src_irn(edge);\n"} {"commit":"28e373ef8ffe76576dd9c81e9833c68a8203cc67","subject":"fix can_conv_lossless_to after float rewrites","message":"fix can_conv_lossless_to after float rewrites\n","repos":"libfirm\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,8l\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,8l\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/tv\/fltcalc.c\n+++ ir\/tv\/fltcalc.c\n@@ -1046,8 +1046,9 @@\n \tint v = fc_get_exponent(value) + exp_bias;\n \tif (0 < v && v < (1 << desc->exponent_size) - 1) {\n \t\t\/* exponent can be encoded, now check the mantissa *\/\n-\t\tv = value->desc.mantissa_size + ROUNDING_BITS - sc_get_lowest_set_bit(_mant(value));\n-\t\treturn v <= (int)desc->mantissa_size;\n+\t\tv = (value->desc.mantissa_size - value->desc.explicit_one)\n+\t\t + ROUNDING_BITS - sc_get_lowest_set_bit(_mant(value));\n+\t\treturn v <= desc->mantissa_size - desc->explicit_one;\n \t}\n \treturn false;\n }\n"} {"commit":"5aaeca14c7e9292a8f155dfa5ccad14e2e1ba7dc","subject":"isl_union_map.c: is_subset_of_identity: rename \"dim\" variable to \"space\"","message":"isl_union_map.c: is_subset_of_identity: rename \"dim\" variable to \"space\"\n\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_union_map.c\n+++ isl_union_map.c\n@@ -2765,7 +2765,7 @@\n static isl_bool is_subset_of_identity(__isl_keep isl_map *map)\n {\n \tisl_bool is_subset;\n-\tisl_space *dim;\n+\tisl_space *space;\n \tisl_map *id;\n \n \tif (!map)\n@@ -2775,8 +2775,8 @@\n \t\t\t\t\tmap->dim, isl_dim_out))\n \t\treturn isl_bool_false;\n \n-\tdim = isl_map_get_space(map);\n-\tid = isl_map_identity(dim);\n+\tspace = isl_map_get_space(map);\n+\tid = isl_map_identity(space);\n \n \tis_subset = isl_map_is_subset(map, id);\n \n"} {"commit":"82d3615f6c88839571c6626f12c50f982032acc5","subject":"pinmap: Added spi and i2c to board definition.","message":"pinmap: Added spi and i2c to board definition.\n\nSigned-off-by: Thomas Ingleby <cea8b9d820e871fd22532c955ca84ff867a004a3@intel.com>\n","repos":"ProfFan\/mraa,sergev\/mraa,alexandru-elisei\/mraa,noahchense\/mraa,intel-iot-devkit\/mraa,neuberfran\/mraa,yangjae\/mraa,alext-mkrs\/mraa,matt-auld\/mraa,stefan-andritoiu\/mraa,smileboywtu\/mraa,KurtE\/mraa,KurtE\/mraa,w4ilun\/mraa,malikabhi05\/mraa,anonymouse64\/mraa,alexandru-elisei\/mraa,zBMNForks\/mraa,whbruce\/mraa,pctj101\/mraa,anonymouse64\/mraa,intel-iot-devkit\/mraa,neuberfran\/mraa,nioinnovation\/mraa,Meirtz\/mraa,nioinnovation\/mraa,sundw2014\/mraa,seem-sky\/mraa,stefan-andritoiu\/mraa,stefan-andritoiu\/mraa,Hbrinj\/mraa,alext-mkrs\/mraa,Propanu\/mraa,g-vidal\/mraa,Hbrinj\/mraa,Propanu\/mraa,neuroidss\/mraa,g-vidal\/mraa,pctj101\/mraa,alexandru-elisei\/mraa,arfoll\/mraa,pctj101\/mraa,sergev\/mraa,KurtE\/mraa,pctj101\/mraa,nioinnovation\/mraa,malikabhi05\/mraa,tripzero\/mraa,KurtE\/mraa,malikabhi05\/mraa,petreeftime\/mraa,spitfire88\/mraa,stefan-andritoiu\/mraa-gpio-chardev,stefan-andritoiu\/mraa-gpio-chardev,Propanu\/mraa,stefan-andritoiu\/mraa,ProfFan\/mraa,g-vidal\/mraa,w4ilun\/mraa,yangjae\/mraa,Pillar1989\/mraa,arfoll\/mraa,Meirtz\/mraa,yangjae\/mraa,yoyojacky\/mraa,Jon-ICS\/mraa,noahchense\/mraa,malikabhi05\/mraa,Hbrinj\/mraa,ProfFan\/mraa,neuberfran\/mraa,timrtoo\/Intel,SyrianSpock\/mraa,petreeftime\/mraa,KurtE\/mraa,alext-mkrs\/mraa,malikabhi05\/mraa,matt-auld\/mraa,yoyojacky\/mraa,intel-iot-devkit\/mraa,Jon-ICS\/mraa,yoyojacky\/mraa,sergev\/mraa,tripzero\/mraa,timrtoo\/Intel,STANAPO\/mraa,arfoll\/mraa,SyrianSpock\/mraa,arunlee77\/mraa,andreivasiliu2211\/mraa,g-vidal\/mraa,noahchense\/mraa,arfoll\/mraa,Pillar1989\/mraa,Propanu\/mraa,ProfFan\/mraa,whbruce\/mraa,noahchense\/mraa,andreivasiliu2211\/mraa,spitfire88\/mraa,alex1818\/mraa,damcclos\/mraa,yongli3\/mraa,mircea\/mraa,Hbrinj\/mraa,ncrastanaren\/mraa,seem-sky\/mraa,ncrastanaren\/mraa,allela-roy\/mraa,arunlee77\/mraa,seem-sky\/mraa,alexandru-elisei\/mraa,timrtoo\/Intel,seem-sky\/mraa,yangjae\/mraa,smileboywtu\/mraa,allela-roy\/mraa,arfoll\/mraa,sundw2014\/mraa,pctj101\/mraa,w4ilun\/mraa,neuberfran\/mraa,spitfire88\/mraa,STANAPO\/mraa,petreeftime\/mraa,stefan-andritoiu\/mraa-gpio-chardev,jontrulson\/mraa,ncrastanaren\/mraa,yongli3\/mraa,damcclos\/mraa,g-vidal\/mraa,whbruce\/mraa,arunlee77\/mraa,stefan-andritoiu\/mraa,alext-mkrs\/mraa,zBMNForks\/mraa,w4ilun\/mraa,Kiritoalex\/mraa,alexandru-elisei\/mraa,intel-iot-devkit\/mraa,stefan-andritoiu\/mraa-gpio-chardev,neuroidss\/mraa,smileboywtu\/mraa,SyrianSpock\/mraa,sundw2014\/mraa,noahchense\/mraa,zBMNForks\/mraa,andreivasiliu2211\/mraa,timrtoo\/Intel,jontrulson\/mraa,matt-auld\/mraa,yongli3\/mraa,andreivasiliu2211\/mraa,petreeftime\/mraa,Kiritoalex\/mraa,Jon-ICS\/mraa,sergev\/mraa,seem-sky\/mraa,Kiritoalex\/mraa,jontrulson\/mraa,timrtoo\/Intel,alex1818\/mraa,STANAPO\/mraa,intel-iot-devkit\/mraa,jontrulson\/mraa,neuberfran\/mraa,ncrastanaren\/mraa,spitfire88\/mraa,jontrulson\/mraa,neuroidss\/mraa,stefan-andritoiu\/mraa-gpio-chardev,ncrastanaren\/mraa,sundw2014\/mraa,mircea\/mraa,Pillar1989\/mraa,tripzero\/mraa,arunlee77\/mraa,yongli3\/mraa,yongli3\/mraa,alex1818\/mraa,mircea\/mraa,anonymouse64\/mraa,Propanu\/mraa,allela-roy\/mraa,sergev\/mraa,sundw2014\/mraa,whbruce\/mraa,Meirtz\/mraa,alext-mkrs\/mraa,damcclos\/mraa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- api\/maa.h\n+++ api\/maa.h\n@@ -107,6 +107,10 @@\n unsigned int gpio_count; \/**< GPIO Count *\/\n unsigned int aio_count; \/**< Analog In Count *\/\n unsigned int pwm_count; \/**< PWM Count *\/\n+ unsigned int i2c_bus_count; \/**< Usable i2c Count *\/\n+ unsigned int i2c_bus[8]; \/**< Array of i2c *\/\n+ unsigned int spi_bus_count; \/**< Usable spi Count *\/\n+ double spi_bus[8]; \/**< Array of spi *\/\n maa_pininfo_t* pins; \/**< Pointer to pin array *\/\n \/*@}*\/\n } maa_board_t;\n"} {"commit":"bf0b0fb10844ae228f7c5ad656915b329d535551","subject":"Allow to specify ROOT::TSeq<I> as a collection.","message":"Allow to specify ROOT::TSeq<I> as a collection.\n","repos":"Y--\/root,georgtroska\/root,olifre\/root,CristinaCristescu\/root,gganis\/root,agarciamontoro\/root,lgiommi\/root,abhinavmoudgil95\/root,davidlt\/root,lgiommi\/root,veprbl\/root,olifre\/root,krafczyk\/root,bbockelm\/root,olifre\/root,abhinavmoudgil95\/root,beniz\/root,gbitzes\/root,gbitzes\/root,pspe\/root,simonpf\/root,lgiommi\/root,davidlt\/root,olifre\/root,gbitzes\/root,beniz\/root,bbockelm\/root,olifre\/root,karies\/root,abhinavmoudgil95\/root,agarciamontoro\/root,root-mirror\/root,bbockelm\/root,mhuwiler\/rootauto,zzxuanyuan\/root-compressor-dummy,root-mirror\/root,Y--\/root,beniz\/root,BerserkerTroll\/root,sawenzel\/root,CristinaCristescu\/root,beniz\/root,karies\/root,buuck\/root,Y--\/root,mhuwiler\/rootauto,karies\/root,root-mirror\/root,georgtroska\/root,abhinavmoudgil95\/root,bbockelm\/root,sawenzel\/root,gganis\/root,olifre\/root,gganis\/root,sawenzel\/root,gganis\/root,lgiommi\/root,zzxuanyuan\/root,pspe\/root,bbockelm\/root,satyarth934\/root,thomaskeck\/root,thomaskeck\/root,zzxuanyuan\/root-compressor-dummy,gbitzes\/root,agarciamontoro\/root,abhinavmoudgil95\/root,krafczyk\/root,BerserkerTroll\/root,gganis\/root,satyarth934\/root,beniz\/root,zzxuanyuan\/root,simonpf\/root,satyarth934\/root,olifre\/root,beniz\/root,bbockelm\/root,satyarth934\/root,krafczyk\/root,olifre\/root,agarciamontoro\/root,veprbl\/root,georgtroska\/root,zzxuanyuan\/root,krafczyk\/root,bbockelm\/root,bbockelm\/root,root-mirror\/root,BerserkerTroll\/root,mhuwiler\/rootauto,pspe\/root,pspe\/root,mhuwiler\/rootauto,krafczyk\/root,beniz\/root,zzxuanyuan\/root,satyarth934\/root,mhuwiler\/rootauto,root-mirror\/root,thomaskeck\/root,olifre\/root,georgtroska\/root,olifre\/root,buuck\/root,buuck\/root,simonpf\/root,karies\/root,Y--\/root,CristinaCristescu\/root,veprbl\/root,CristinaCristescu\/root,CristinaCristescu\/root,sawenzel\/root,root-mirror\/root,simonpf\/root,CristinaCristescu\/root,lgiommi\/root,BerserkerTroll\/root,simonpf\/root,sawenzel\/root,zzxuanyuan\/root,zzxuanyuan\/root,zzxuanyuan\/root-compressor-dummy,davidlt\/root,gganis\/root,BerserkerTroll\/root,davidlt\/root,mhuwiler\/rootauto,satyarth934\/root,sawenzel\/root,karies\/root,thomaskeck\/root,zzxuanyuan\/root-compressor-dummy,Y--\/root,satyarth934\/root,krafczyk\/root,davidlt\/root,satyarth934\/root,gbitzes\/root,beniz\/root,root-mirror\/root,krafczyk\/root,simonpf\/root,agarciamontoro\/root,zzxuanyuan\/root,abhinavmoudgil95\/root,karies\/root,buuck\/root,gganis\/root,BerserkerTroll\/root,karies\/root,BerserkerTroll\/root,simonpf\/root,zzxuanyuan\/root-compressor-dummy,CristinaCristescu\/root,georgtroska\/root,thomaskeck\/root,BerserkerTroll\/root,davidlt\/root,abhinavmoudgil95\/root,Y--\/root,bbockelm\/root,agarciamontoro\/root,zzxuanyuan\/root,simonpf\/root,buuck\/root,gganis\/root,CristinaCristescu\/root,root-mirror\/root,zzxuanyuan\/root-compressor-dummy,karies\/root,mhuwiler\/rootauto,buuck\/root,krafczyk\/root,BerserkerTroll\/root,gganis\/root,davidlt\/root,davidlt\/root,lgiommi\/root,abhinavmoudgil95\/root,georgtroska\/root,karies\/root,lgiommi\/root,karies\/root,CristinaCristescu\/root,davidlt\/root,lgiommi\/root,mhuwiler\/rootauto,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root,buuck\/root,veprbl\/root,zzxuanyuan\/root-compressor-dummy,Y--\/root,buuck\/root,olifre\/root,georgtroska\/root,pspe\/root,bbockelm\/root,lgiommi\/root,zzxuanyuan\/root,pspe\/root,agarciamontoro\/root,agarciamontoro\/root,thomaskeck\/root,thomaskeck\/root,georgtroska\/root,pspe\/root,simonpf\/root,sawenzel\/root,gbitzes\/root,georgtroska\/root,zzxuanyuan\/root,simonpf\/root,mhuwiler\/rootauto,lgiommi\/root,thomaskeck\/root,bbockelm\/root,georgtroska\/root,krafczyk\/root,gbitzes\/root,sawenzel\/root,BerserkerTroll\/root,CristinaCristescu\/root,zzxuanyuan\/root-compressor-dummy,veprbl\/root,gbitzes\/root,abhinavmoudgil95\/root,davidlt\/root,zzxuanyuan\/root,thomaskeck\/root,zzxuanyuan\/root-compressor-dummy,karies\/root,sawenzel\/root,gganis\/root,veprbl\/root,Y--\/root,gbitzes\/root,gganis\/root,pspe\/root,CristinaCristescu\/root,veprbl\/root,beniz\/root,buuck\/root,Y--\/root,gbitzes\/root,veprbl\/root,agarciamontoro\/root,beniz\/root,root-mirror\/root,gbitzes\/root,buuck\/root,thomaskeck\/root,lgiommi\/root,agarciamontoro\/root,simonpf\/root,root-mirror\/root,Y--\/root,pspe\/root,abhinavmoudgil95\/root,abhinavmoudgil95\/root,buuck\/root,veprbl\/root,sawenzel\/root,veprbl\/root,krafczyk\/root,veprbl\/root,satyarth934\/root,zzxuanyuan\/root-compressor-dummy,BerserkerTroll\/root,mhuwiler\/rootauto,satyarth934\/root,davidlt\/root,root-mirror\/root,satyarth934\/root,georgtroska\/root,agarciamontoro\/root,beniz\/root,krafczyk\/root,pspe\/root,sawenzel\/root,pspe\/root,mhuwiler\/rootauto,Y--\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/multiproc\/inc\/TProcPool.h\n+++ core\/multiproc\/inc\/TProcPool.h\n@@ -26,6 +26,7 @@\n #include \"TChainElement.h\"\n #include \"THashList.h\"\n #include \"TFileInfo.h\"\n+#include \"ROOT\/TSeq.h\"\n #include <vector>\n #include <string>\n #include <initializer_list>\n@@ -52,6 +53,7 @@\n template<class F> TObjArray Map(F func, TCollection &args);\n template<class F, class T> auto Map(F func, std::initializer_list<T> args) -> std::vector<decltype(func(*args.begin()))>;\n template<class F, class T> auto Map(F func, std::vector<T> &args) -> std::vector<decltype(func(args.front()))>;\n+ template<class F, class INTEGER> auto Map(F func, ROOT::TSeq<INTEGER> args) -> std::vector<decltype(func(*args.begin()))>;\n \/\/\/ \\endcond\n \n \/\/ MapReduce\n@@ -245,6 +247,16 @@\n fTask = ETask::kNoTask;\n return reslist;\n }\n+\n+template<class F, class INTEGER>\n+auto TProcPool::Map(F func, ROOT::TSeq<INTEGER> args) -> std::vector<decltype(func(*args.begin()))>\n+{\n+ std::vector<INTEGER> vargs(args.size());\n+ std::copy(args.begin(), args.end(), vargs.begin());\n+ const auto &reslist = Map(func, vargs);\n+ return reslist;\n+}\n+\n \/\/ tell doxygen to stop ignoring code\n \/\/\/ \\endcond\n \n"} {"commit":"6b59c60c241ee1d047c1c482675828232829fe38","subject":"white space","message":"white space\n","repos":"tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/thread\/inc\/ThreadLocalStorage.h\n+++ core\/thread\/inc\/ThreadLocalStorage.h\n@@ -66,10 +66,10 @@\n #endif\n #if __cplusplus >= 201103L\n # if __GNUC__ <= 4 && __GNUC_MINOR__ < 80\n-\/\/ The C++11 thread_local keyword is supported in GCC only since 4.8\n-#define R__HAS___THREAD\n-#else\n-#define R__HAS_THREAD_LOCAL\n+ \/\/ The C++11 thread_local keyword is supported in GCC only since 4.8\n+# define R__HAS___THREAD\n+# else\n+# define R__HAS_THREAD_LOCAL\n #endif\n \n #endif\n"} {"commit":"ae79fa9d73de99c0e36d454fb52387152b812024","subject":"more beautiful src\/camera_model.h","message":"more beautiful src\/camera_model.h\n","repos":"victorpoughon\/master-thesis,victorpoughon\/master-thesis","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/camera_models.h\n+++ src\/camera_models.h\n@@ -4,22 +4,48 @@\n #include \"ceres\/ceres.h\"\n #include \"internal.h\"\n \n-template <typename T>\n-Eigen::Matrix<T, 3, 3, Eigen::ColMajor> rotation_matrix(const T* external) {\n- Eigen::Matrix<T, 3, 3, Eigen::ColMajor> Yaw, Pitch, Roll;\n- Yaw << cos(external[5]), -sin(external[5]), T(0),\n- sin(external[5]), cos(external[5]), T(0),\n- T(0), T(0), T(1);\n- Pitch << T(1), T(0), T(0),\n- T(0), cos(external[4]), sin(external[4]),\n- T(0), -sin(external[4]), cos(external[4]);\n- Roll << -cos(external[3]), T(0), -sin(external[3]),\n- T(0), T(1), T(0),\n- sin(external[3]), T(0), -cos(external[3]);\n-\treturn Pitch * Roll * Yaw;\n-}\n \/\/ Could use quaternions to implement the above function\n \/\/ Same inputs, compute Rotatino matrix using quaternions instead\n+template <typename T>\n+Eigen::Matrix<T, 3, 3, Eigen::ColMajor> rotation_matrix_3(const T* ext) {\n+ Eigen::Matrix<T, 3, 3, Eigen::ColMajor> Yaw, Pitch, Roll;\n+\n+ Yaw << cos(ext[5]), -sin(ext[5]), T(0),\n+ sin(ext[5]), cos(ext[5]), T(0),\n+ T(0), T(0), T(1);\n+\n+ Pitch << T(1), T(0), T(0),\n+ T(0), cos(ext[4]), sin(ext[4]),\n+ T(0), -sin(ext[4]), cos(ext[4]);\n+\n+ Roll << -cos(ext[3]), T(0), -sin(ext[3]),\n+ T(0), T(1), T(0),\n+ sin(ext[3]), T(0), -cos(ext[3]);\n+\n+\treturn Pitch*Roll*Yaw;\n+}\n+\n+template <typename T>\n+Eigen::Matrix<T, 4, 4, Eigen::ColMajor> rotation_matrix_4(const T* ext) {\n+ Eigen::Matrix<T, 4, 4, Eigen::ColMajor> Yaw, Pitch, Roll;\n+\n+ Yaw << cos(ext[5]), -sin(ext[5]), T(0), T(0),\n+ sin(ext[5]), cos(ext[5]), T(0), T(0),\n+ T(0), T(0), T(1), T(0),\n+ T(0), T(0), T(0), T(1);\n+\n+ Pitch << T(1), T(0), T(0), T(0),\n+ T(0), cos(ext[4]), sin(ext[4]), T(0),\n+ T(0), -sin(ext[4]), cos(ext[4]), T(0),\n+ T(0), T(0), T(0), T(1);\n+\n+ Roll << -cos(ext[3]), T(0), -sin(ext[3]), T(0),\n+ T(0), T(1), T(0), T(0),\n+ sin(ext[3]), T(0), -cos(ext[3]), T(0),\n+ T(0), T(0), T(0), T(1);\n+\n+ return Pitch*Roll*Yaw;\n+}\n \n template <typename T>\n bool model0_projection(\n@@ -28,7 +54,7 @@\n const T* const point,\n T* residuals) {\n \n- Eigen::Matrix<T, 3, 3, Eigen::ColMajor> R = rotation_matrix(external);\n+ Eigen::Matrix<T, 3, 3, Eigen::ColMajor> R = rotation_matrix_3(external);\n \n \/\/ Translate and rotate to camera frame\n Eigen::Matrix<T, 3, 1, Eigen::ColMajor> Q;\n@@ -60,39 +86,27 @@\n const T* elevation,\n T* dx, T* dy) {\n \/\/ Rotation matrices\n- Eigen::Matrix<T, 4, 4, Eigen::ColMajor> Yaw1, Pitch1, Roll1, T1;\n+ Eigen::Matrix<T, 4, 4, Eigen::ColMajor> T1;\n Eigen::Matrix<T, 4, 3, Eigen::ColMajor> B;\n Eigen::Matrix<T, 3, 4, Eigen::ColMajor> P;\n- Yaw1 << cos(external[5]), -sin(external[5]), T(0), T(0),\n- sin(external[5]), cos(external[5]), T(0), T(0),\n- T(0), T(0), T(1), T(0),\n- T(0), T(0), T(0), T(1);\n \n- Pitch1 << T(1), T(0), T(0), T(0),\n- T(0), cos(external[4]), sin(external[4]), T(0),\n- T(0), -sin(external[4]), cos(external[4]), T(0),\n- T(0), T(0), T(0), T(1);\n+ Eigen::Matrix<T, 4, 4, Eigen::ColMajor> R1 = rotation_matrix_4(external);\n \n- Roll1 << -cos(external[3]), T(0), -sin(external[3]), T(0),\n- T(0), T(1), T(0), T(0),\n- sin(external[3]), T(0), -cos(external[3]), T(0),\n- T(0), T(0), T(0), T(1);\n+ T1 << T(1), T(0), T( 0), -external[0],\n+ T(0), T(1), T( 0), -external[1],\n+ T(0), T(0), T(-1), external[2],\n+ T(0), T(0), T( 0), T(1);\n \n- Eigen::Matrix<T, 4, 4, Eigen::ColMajor> R1 = Pitch1 * Roll1 * Yaw1;\n- T1 << T(1), T(0), T(0), -external[0],\n- T(0), T(1), T(0), -external[1],\n- T(0), T(0), T(-1), external[2],\n- T(0), T(0), T(0), T(1);\n- B << T(1), T(0), T(0),\n- T(0), T(1), T(0),\n- T(0), T(0), elevation[0],\n- T(0), T(0), T(1);\n+ B << T(1), T(0), T(0),\n+ T(0), T(1), T(0),\n+ T(0), T(0), elevation[0],\n+ T(0), T(0), T(1);\n \n- P << focal_length(internal), T(0), pp_x(internal), T(0),\n- T(0), focal_length(internal), pp_y(internal), T(0),\n- T(0), T(0), T(1), T(0);\n+ P << focal_length(internal), T(0), pp_x(internal), T(0),\n+ T(0), focal_length(internal), pp_y(internal), T(0),\n+ T(0), T(0), T(1), T(0);\n \n- Eigen::Matrix<T, 3, 3, Eigen::ColMajor> A = P * R1* T1*B;\n+ Eigen::Matrix<T, 3, 3, Eigen::ColMajor> A = P * R1 * T1 * B;\n Eigen::Matrix<T, 3, 1, Eigen::ColMajor> b;\n b << T(pix[0]), T(pix[1]), T(1);\n Eigen::FullPivLU< Eigen::Matrix<T, 3, 3, Eigen::ColMajor> > lu(A);\n"} {"commit":"af49d6b3bf13925ac61f3c950391cc63e15211e8","subject":"Change error to warning for multiple loggers. (#384)","message":"Change error to warning for multiple loggers. (#384)\n\n* Change error to warning for multiple loggers\r\n\r\n* Updating warning message\r\n\r\n* Updating TODO message.\r\n\r\n* Reformatting todo and uncrustify warn message.\r\n\r\n* Add early return back in.\r\n\r\n* Break string literal across multiple lines.\r\n\r\nSigned-off-by: Steven! Ragnar\u00f6k <4068f0880b399410602d694b3cc711c8a8f4727e@nuclearsandwich.com>\r\n\r\n* Remove commented-out error and return block.\r\n\r\nSigned-off-by: Steven! Ragnar\u00f6k <4068f0880b399410602d694b3cc711c8a8f4727e@nuclearsandwich.com>\r\n","repos":"ros2\/rcl,ros2\/rcl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- rcl\/src\/rcl\/logging_rosout.c\n+++ rcl\/src\/rcl\/logging_rosout.c\n@@ -21,6 +21,7 @@\n #include \"rcl\/visibility_control.h\"\n #include \"rcl_interfaces\/msg\/log.h\"\n #include \"rcutils\/allocator.h\"\n+#include \"rcutils\/logging_macros.h\"\n #include \"rcutils\/macros.h\"\n #include \"rcutils\/types\/hash_map.h\"\n #include \"rcutils\/types\/rcutils_ret.h\"\n@@ -153,8 +154,15 @@\n return RCL_RET_ERROR;\n }\n if (rcutils_hash_map_key_exists(&__logger_map, &logger_name)) {\n- RCL_SET_ERROR_MSG(\"Logger already initialized for node.\");\n- return RCL_RET_ALREADY_INIT;\n+ \/\/ @TODO(nburek) Update behavior to either enforce unique names or work with non-unique\n+ \/\/ names based on the outcome here: https:\/\/github.com\/ros2\/design\/issues\/187\n+ RCUTILS_LOG_WARN_NAMED(\"rcl.logging_rosout\",\n+ \"Publisher already registered for provided node name. If this is due to multiple nodes \"\n+ \"with the same name then all logs for that logger name will go out over the existing \"\n+ \"publisher. As soon as any node with that name is destructed it will unregister the \"\n+ \"publisher, preventing any further logs for that name from being published on the rosout \"\n+ \"topic.\");\n+ return RCL_RET_OK;\n }\n \n \/\/ Create a new Log message publisher on the node\n"} {"commit":"be483b71a77fc17bf9ba9cd1e324ec75b8c97661","subject":"fix ocp driver devtree parsing","message":"fix ocp driver devtree parsing\n","repos":"iVeia\/meta-iveia,iVeia\/meta-iveia","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- recipes-kernel\/ocp\/src\/ocp.c\n+++ recipes-kernel\/ocp\/src\/ocp.c\n@@ -363,6 +363,9 @@\n \tplatform_set_drvdata(pdev, ocp_devp);\n \tocp_devp->dev = &pdev->dev;\n \n+ ocp_devp->num_addr_spaces = of_property_count_elems_of_size(pdev->dev.of_node, \"reg\", sizeof(u64));\n+ ocp_devp->num_addr_spaces \/= 2;\n+\n \/*\n * Get a range of minor numbers to work with, using static major.\n *\/\n@@ -370,7 +373,6 @@\n if (err) {\n goto fail;\n }\n- \n \n cdev_init(&ocp_devp->cdev, &ocp_fops);\n ocp_devp->cdev.owner = THIS_MODULE;\n@@ -382,8 +384,6 @@\n }\n \n \/\/TODO: allocate mappings array here, free in remove()\n- ocp_devp->num_addr_spaces = of_property_count_elems_of_size(pdev->dev.of_node, \"reg\", sizeof(u64));\n- ocp_devp->num_addr_spaces \/= 2;\n ocp_devp->mappings = kzalloc(sizeof(struct ocp_mapping) * ocp_devp->num_addr_spaces, GFP_KERNEL);\n \n ocp_devp->class = class_create(THIS_MODULE, \"ocp\");\n"} {"commit":"a54b86c4baa8ee935c659436abde6ba94715c439","subject":"Failure of set_safety_mode falls back to SILENT. Failure to set silent results in hanging","message":"Failure of set_safety_mode falls back to SILENT. Failure to set silent results in hanging\n","repos":"commaai\/panda,commaai\/panda,commaai\/panda,commaai\/panda","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- board\/main.c\n+++ board\/main.c\n@@ -117,43 +117,49 @@\n void set_safety_mode(uint16_t mode, int16_t param) {\n int err = set_safety_hooks(mode, param);\n if (err == -1) {\n- puts(\"Error: safety set mode failed\\n\");\n- while (true) {} \/\/ ERROR: we can't continue if safety mode isn't succesfully set\n- } else {\n- switch (mode) {\n- case SAFETY_SILENT:\n- set_intercept_relay(false);\n- if(board_has_obd()){\n- current_board->set_can_mode(CAN_MODE_NORMAL);\n- }\n- can_silent = ALL_CAN_SILENT;\n- break;\n- case SAFETY_NOOUTPUT:\n- set_intercept_relay(false);\n- if(board_has_obd()){\n- current_board->set_can_mode(CAN_MODE_NORMAL);\n- }\n- can_silent = ALL_CAN_LIVE;\n- break;\n- case SAFETY_ELM327:\n- set_intercept_relay(false);\n- heartbeat_counter = 0U;\n- if(board_has_obd()){\n- current_board->set_can_mode(CAN_MODE_OBD_CAN2);\n- }\n- can_silent = ALL_CAN_LIVE;\n- break;\n- default:\n- set_intercept_relay(true);\n- heartbeat_counter = 0U;\n- if(board_has_obd()){\n- current_board->set_can_mode(CAN_MODE_NORMAL);\n- }\n- can_silent = ALL_CAN_LIVE;\n- break;\n- }\n- can_init_all();\n- }\n+ puts(\"Error: safety set mode failed. Falling back to SILENT\\n\");\n+ mode = SAFETY_SILENT;\n+ err = set_safety_hooks(mode, 0);\n+ if (err == -1) {\n+ puts(\"Error: Failed setting SILENT mode. Hanging\\n\");\n+ while (true) {\n+ \/\/ TERMINAL ERROR: we can't continue if SILENT safety mode isn't succesfully set\n+ }\n+ }\n+ }\n+ switch (mode) {\n+ case SAFETY_SILENT:\n+ set_intercept_relay(false);\n+ if (board_has_obd()) {\n+ current_board->set_can_mode(CAN_MODE_NORMAL);\n+ }\n+ can_silent = ALL_CAN_SILENT;\n+ break;\n+ case SAFETY_NOOUTPUT:\n+ set_intercept_relay(false);\n+ if (board_has_obd()) {\n+ current_board->set_can_mode(CAN_MODE_NORMAL);\n+ }\n+ can_silent = ALL_CAN_LIVE;\n+ break;\n+ case SAFETY_ELM327:\n+ set_intercept_relay(false);\n+ heartbeat_counter = 0U;\n+ if (board_has_obd()) {\n+ current_board->set_can_mode(CAN_MODE_OBD_CAN2);\n+ }\n+ can_silent = ALL_CAN_LIVE;\n+ break;\n+ default:\n+ set_intercept_relay(true);\n+ heartbeat_counter = 0U;\n+ if (board_has_obd()) {\n+ current_board->set_can_mode(CAN_MODE_NORMAL);\n+ }\n+ can_silent = ALL_CAN_LIVE;\n+ break;\n+ }\n+ can_init_all();\n }\n \n \/\/ ***************************** USB port *****************************\n"} {"commit":"d184af0f49c13f96ea24c18e6da223530f9f6ace","subject":"declaration of 'aln_format_sam'","message":"declaration of 'aln_format_sam'\n","repos":"ilveroluca\/rapi,ilveroluca\/rapi,ilveroluca\/rapi,ilveroluca\/rapi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- aligner.h\n+++ aligner.h\n@@ -302,6 +302,8 @@\n \treturn len;\n }\n \n+int aln_format_sam(const aln_read* read, const aln_read* mate, kstring_t* output);\n+\n void aln_put_cigar(int n_ops, const aln_cigar* ops, int force_hard_clip, kstring_t* output);\n \n #endif\n"} {"commit":"2e45a10a8b6d8d8018b3da078557fb6c3eff690e","subject":"edit argument","message":"edit argument\n","repos":"yangf4\/core,yangf4\/core,yangf4\/core,yangf4\/core,yangf4\/core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- dsp\/dsp.h\n+++ dsp\/dsp.h\n@@ -14,7 +14,10 @@\n \n void displace(apf::Mesh2* m, apf::Field* df,\n Smoother* smoother, Adapter* adapter,\n- Boundary& fixed, Boundary& moving);\n+ Boundary& fixed, Boundary& moving,\n+ vector < apf::MeshEntity* >& V_total,\n+ vector < apf::Vector3 >& D_total,\n+ int& in_0, int& fb_0);\n \n apf::Field* applyRigidMotion(apf::Mesh* m, Boundary& moving,\n apf::Matrix3x3 const& r, apf::Vector3 const& t);\n"} {"commit":"f13a2c8e9af91762d86b6cd26cba57f2f0cb47fd","subject":"Fix function implementation coding style","message":"Fix function implementation coding style\n","repos":"noonien-d\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky,freedesktop-unofficial-mirror\/wocky,freedesktop-unofficial-mirror\/wocky,noonien-d\/wocky","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- wocky\/wocky-porter.c\n+++ wocky\/wocky-porter.c\n@@ -1723,8 +1723,8 @@\n *\n * Returns: a reffed #WockyStanza on success, %NULL on error\n *\/\n-WockyStanza * wocky_porter_send_iq_finish (\n- WockyPorter *self,\n+WockyStanza *\n+wocky_porter_send_iq_finish (WockyPorter *self,\n GAsyncResult *result,\n GError **error)\n {\n"} {"commit":"4de61409172bfca64759701965713e9990c860ed","subject":"new utility, dumpmat, which prints out the contents of a mat file","message":"new utility, dumpmat, which prints out the contents of a mat file\n","repos":"pauldmccarthy\/ccnet,pauldmccarthy\/ccnet","returncode":1,"stderr":"error: pathspec 'dumpmat.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- dumpmat.c\n+++ dumpmat.c\n@@ -0,0 +1,239 @@\n+\/**\n+ * Prints out the data in, or information about, a .mat file.\n+ *\n+ * Author: Paul McCarthy <pauld.mccarthy@gmail.com> \n+ *\/\n+\n+#include <argp.h>\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <stdint.h>\n+\n+#include \"io\/mat.h\"\n+#include \"util\/startup.h\"\n+#include \"graph\/graph.h\"\n+\n+typedef struct _args {\n+\n+ char *input;\n+ uint8_t meta;\n+ uint8_t stats;\n+ uint8_t labels;\n+ uint8_t data;\n+\n+} args_t;\n+\n+static char doc[] =\n+\"dumpmat -- print the contents of a .mat file\";\n+\n+static struct argp_option options[] = {\n+ {\"meta\", 'm', NULL, 0, \"print information about the file\"},\n+ {\"stats\", 's', NULL, 0, \"print basic data statistics\"},\n+ {\"labels\", 'l', NULL, 0, \"print row\/column labels\"},\n+ {\"data\", 'd', NULL, 0, \"print the data in the file\"},\n+ {0},\n+};\n+\n+static error_t _parse_opt (int key, char *arg, struct argp_state *state) {\n+\n+ args_t *args;\n+\n+ args = state->input;\n+\n+ switch(key) {\n+ \n+ case 'm': args->meta = 1; break;\n+ case 's': args->stats = 1; break;\n+ case 'l': args->labels = 1; break;\n+ case 'd': args->data = 1; break;\n+ \n+ case ARGP_KEY_ARG:\n+ if (state->arg_num == 0) args->input = arg;\n+ else argp_usage(state);\n+ break;\n+\n+ case ARGP_KEY_END:\n+ if (state->arg_num != 1) argp_usage(state);\n+ break;\n+\n+ default:\n+ return ARGP_ERR_UNKNOWN;\n+ }\n+\n+ return 0;\n+}\n+\n+\/**\n+ * Prints file header information.\n+ *\/\n+static void _print_meta(\n+ mat_t *mat \/**< mat file to query *\/\n+);\n+\n+\/**\n+ * Calculates and prints basic statistics on the data.\n+ *\/\n+static void _print_stats(\n+ mat_t *mat \/**< mat file to query *\/\n+);\n+\n+\/**\n+ * Prints row\/column labels.\n+ *\/\n+static void _print_labels(\n+ mat_t *mat \/**< mat file to query *\/\n+);\n+\n+\/**\n+ * Prints the matrix data.\n+ *\/\n+static void _print_data(\n+ mat_t *mat \/**< mat file to query *\/\n+);\n+\n+\n+int main (int argc, char *argv[]) {\n+\n+ struct argp argp = {options, _parse_opt, \"INPUT\", doc};\n+ args_t args;\n+ mat_t *mat;\n+\n+ memset(&args, 0, sizeof(args));\n+\n+ startup(\"dumpmat\", argc, argv, &argp, &args);\n+\n+ mat = mat_open(args.input);\n+ if (mat == NULL) {\n+\n+ printf(\"error opening %s\\n\", args.input);\n+ goto fail;\n+ }\n+\n+ if (args.meta) _print_meta( mat);\n+ if (args.stats) _print_stats( mat);\n+ if (args.labels) _print_labels(mat);\n+ if (args.data) _print_data( mat);\n+\n+ mat_close(mat);\n+ return 0;\n+\n+fail:\n+ return 1;\n+}\n+\n+static void _print_meta(mat_t *mat) {\n+\n+ uint16_t hdrsize;\n+ char *hdrdata;\n+\n+ hdrdata = NULL;\n+ hdrsize = mat_hdr_data_size(mat);\n+\n+ printf(\"rows: %llu\\n\", mat_num_rows( mat));\n+ printf(\"cols: %llu\\n\", mat_num_cols( mat));\n+ printf(\"hdr data size: %u\\n\", hdrsize);\n+ printf(\"label size: %u\\n\", mat_label_size( mat));\n+ printf(\"symmetric: %u\\n\", mat_is_symmetric( mat));\n+ printf(\"has row labels: %u\\n\", mat_has_row_labels(mat));\n+ printf(\"has col labels: %u\\n\", mat_has_col_labels(mat));\n+\n+ if (hdrsize > 0) {\n+ \n+ hdrdata = calloc(hdrsize+1, 1);\n+ if (hdrdata == NULL) goto fail;\n+\n+ if (mat_read_hdr_data(mat, hdrdata)) {\n+ printf(\"error reading header data\\n\");\n+ goto fail;\n+ }\n+\n+ hdrdata[hdrsize] = '\\0';\n+\n+ printf(\"hdr data:\\n\\n\");\n+ printf(\"%s\", hdrdata);\n+ printf(\"\\n\\n\");\n+\n+ free(hdrdata);\n+ }\n+\n+fail:\n+ if (hdrdata != NULL) free(hdrdata);\n+}\n+\n+static void _print_stats(mat_t *mat) {\n+\n+}\n+\n+static void _print_labels(mat_t *mat) {\n+\n+ uint64_t i;\n+ uint64_t nrows;\n+ uint64_t ncols;\n+ graph_label_t label;\n+\n+ nrows = mat_num_rows(mat);\n+ ncols = mat_num_cols(mat);\n+ \n+\n+ if (mat_has_row_labels(mat)) {\n+ for (i = 0; i < nrows; i++) {\n+ if (mat_read_row_label(mat, i, &label)) {\n+ printf(\"error reading row label %llu\\n\", i);\n+ break;\n+ }\n+ printf(\n+ \"row %5llu: %0.3f %0.3f %0.3f %u\\n\",\n+ i, label.xval, label.yval, label.zval, label.labelval);\n+ }\n+ }\n+\n+ if (mat_has_col_labels(mat)) {\n+ for (i = 0; i < ncols; i++) {\n+ if (mat_read_col_label(mat, i, &label)) {\n+ printf(\"error reading col label %llu\\n\", i);\n+ break;\n+ }\n+ printf(\n+ \"col %5llu: %0.3f %0.3f %0.3f %u\\n\",\n+ i, label.xval, label.yval, label.zval, label.labelval);\n+ }\n+ }\n+}\n+\n+static void _print_data(mat_t *mat) {\n+\n+ uint64_t i;\n+ uint64_t j;\n+ uint64_t nrows;\n+ uint64_t ncols;\n+ double *rowvals;\n+\n+ \n+ rowvals = NULL;\n+ nrows = mat_num_rows(mat);\n+ ncols = mat_num_cols(mat);\n+\n+ rowvals = malloc(ncols*sizeof(double));\n+\n+ for (i = 0; i < nrows; i++) {\n+\n+ if (mat_read_row(mat, i, rowvals)) {\n+ printf(\"error reading row %llu data\\n\", i);\n+ goto fail;\n+ }\n+\n+ for (j = 0; j < ncols; j++) {\n+ \n+ printf(\"%0.3f\", rowvals[j]);\n+ if (j < ncols - 1) printf(\" \");\n+ }\n+ printf(\"\\n\");\n+ }\n+\n+\n+ free(rowvals);\n+ \n+fail:\n+ if (rowvals != NULL) free(rowvals);\n+}\n"} {"commit":"9e33305a8cb3ccbaa544581635362b00770b4a0a","subject":"More comment cleanups.","message":"More comment cleanups.\n","repos":"dhess\/echoev","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- echoevc.c\n+++ echoevc.c\n@@ -233,25 +233,17 @@\n typedef void (* shutdown_fn)(ev_io *);\n \n \/*\n- * A special shutdown function for the echo server writer\n- * watcher. It's called when there's no more data to be written from\n- * stdin. The writer watcher must not close(2) the echo server\n- * connection, because the client might still be waiting for data to\n- * be echoed back from the echo server.\n+ * A half-close shutdown for the watcher that writes to the echo\n+ * server. Call it when stdin gets an EOF.\n *\/\n void\n shutdown_srv_writer(ev_io *w)\n {\n- \/* Half-close. *\/\n if (shutdown(w->fd, SHUT_WR) == -1)\n log(LOG_WARNING, \"shutdown_srv_writer shutdown: %m\");\n mark_as_finished(w);\n }\n \n-\/*\n- * The default shutdown function: just close(2) the watcher's file\n- * descriptor, and mark it as finished.\n- *\/\n void\n close_watcher(ev_io *w)\n {\n"} {"commit":"07a1d0ee546ebdb66a145c03541c135c0db9527b","subject":"Mess with press start interface","message":"Mess with press start interface\n","repos":"OrenjiAkira\/spacegame,OrenjiAkira\/spacegame,OrenjiAkira\/spacegame","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/scenes\/pressstart.c\n+++ src\/scenes\/pressstart.c\n@@ -5,29 +5,68 @@\n #include \"config\/font.h\"\n #include \"utility\/vector.h\"\n #include \"components\/drawpos.h\"\n+#include \"components\/drawquad.h\"\n+#include \"components\/sprite.h\"\n #include \"components\/textbox.h\"\n #include \"controllers\/pressstart.h\"\n #include \"scenes\/pressstart.h\"\n \n-static FRONTTEXT;\n+static FRONTTEXT, TUTORIAL1, TUTORIAL2;\n \n static void PressStart_loadFrontText() {\n Vector pos;\n int dpos, textbox;\n \n dpos = DrawPos_new(-1, 0, 0, 0, 0);\n- textbox = Textbox_new(\"[ PRESS SHIFT ]\", dpos, TEXTALIGN_CENTER, FONTSIZE_MEDIUM, FONTCOLOR_WHITE);\n+ textbox = Textbox_new(\"[ PRESS ANY SHIFT ]\", dpos, TEXTALIGN_CENTER, FONTSIZE_MEDIUM, FONTCOLOR_WHITE);\n Vector_set(&pos, 0, 0);\n Vector_print(&pos);\n DrawPos_setPos(dpos, &pos);\n FRONTTEXT = Entity_new(-1, -1, dpos, -1, textbox);\n }\n \n+static void PressStart_loadTutorialText2() {\n+ Vector pos;\n+ int dpos, dquad, textbox, sprite;\n+\n+ dpos = DrawPos_new(-1, 64, 64, 32, 32);\n+ dquad = DrawQuad_new(768, 64, 64, 64);\n+ sprite = Sprite_new(\"cat01.png\", dpos, dquad, LAYER_MIDGROUND1);\n+ Vector_set(&pos, -Map_getWidth()\/4, Map_getHeight()\/4 - 3);\n+ DrawPos_setPos(dpos, &pos);\n+ dpos = DrawPos_new(-1, 0, 0, 0, 0);\n+ textbox = Textbox_new(\"use WASD keys to move\", dpos, TEXTALIGN_CENTER, FONTSIZE_SMALL, FONTCOLOR_WHITE);\n+ Vector_set(&pos, -Map_getWidth()\/4, Map_getHeight()\/4);\n+ DrawPos_setPos(dpos, &pos);\n+ TUTORIAL2 = Entity_new(-1, dquad, dpos, sprite, textbox);\n+}\n+\n+static void PressStart_loadTutorialText1() {\n+ Vector pos;\n+ int dpos, dquad, textbox, sprite;\n+\n+ dpos = DrawPos_new(-1, 64, 64, 32, 32);\n+ dquad = DrawQuad_new(768, 64, 64, 64);\n+ sprite = Sprite_new(\"cat00.png\", dpos, dquad, LAYER_MIDGROUND1);\n+ Vector_set(&pos, Map_getWidth()\/4, Map_getHeight()\/4 - 3);\n+ DrawPos_setPos(dpos, &pos);\n+ dpos = DrawPos_new(-1, 0, 0, 0, 0);\n+ textbox = Textbox_new(\"use directional keys to move\", dpos, TEXTALIGN_CENTER, FONTSIZE_SMALL, FONTCOLOR_WHITE);\n+ Vector_set(&pos, Map_getWidth()\/4, Map_getHeight()\/4);\n+ Vector_print(&pos);\n+ DrawPos_setPos(dpos, &pos);\n+ TUTORIAL1 = Entity_new(-1, dquad, dpos, sprite, textbox);\n+}\n+\n void PressStart_load() {\n+ PressStart_loadTutorialText1();\n+ PressStart_loadTutorialText2();\n PressStart_loadFrontText();\n PressStartController_load();\n }\n \n void PressStart_close() {\n Entity_destroy(FRONTTEXT);\n+ Entity_destroy(TUTORIAL1);\n+ Entity_destroy(TUTORIAL2);\n }\n"} {"commit":"10e81bda78aa13410d0e260569fd3c55220ae630","subject":"more information in return of gfm_solve","message":"more information in return of gfm_solve\n","repos":"aszepieniec\/barff,aszepieniec\/barff","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- algebra.c\n+++ algebra.c\n@@ -497,7 +497,7 @@\n #ifdef DEBUG\n if( dest.height != left.height || dest.width != rightT.height || left.width != rightT.width )\n {\n- printf(\"in gfm_multiply_transpose: trying to multiply matrices with unmatched dimensions: %ix%i * (%ix%i)^T = %ix%i\\n\", left.height, left.width, right.height, right.width, dest.height, dest.width);\n+ printf(\"in gfm_multiply_transpose: trying to multiply matrices with unmatched dimensions: %ix%i * (%ix%i)^T = %ix%i\\n\", left.height, left.width, rightT.height, rightT.width, dest.height, dest.width);\n return 0;\n }\n #endif\n@@ -810,8 +810,9 @@\n * * for all kernel.width x 1 vectors \"random\" holds:\n * coeffs * (solution + kernel * random) = target\n * @return\n- * * 1 if success; 0 otherwise or if target is not in col span of\n- * coefficient matrix\n+ * * r : int, which is equal up to sign to the rank of the kernel;\n+ * the sign is positive if the target is in the coefficient\n+ * matrix's column span.\n *\/\n int gfm_solve( gfmatrix coeffs, gfmatrix target, gfmatrix solution, gfmatrix * kernel )\n {\n@@ -835,10 +836,17 @@\n \n \/* initialize mat and copy coeffs and target to it *\/\n mat = gfm_init(coeffs.height, coeffs.width+1);\n- gfm_copy(mat, coeffs);\n- for( i = 0 ; i < coeffs.height ; ++i )\n- {\n- mat.data[i*mat.width + mat.width - 1] = target.data[i*target.width];\n+ \/*gfm_copy(mat, coeffs);*\/\n+ for( i = 0 ; i < mat.height ; ++i )\n+ {\n+ for( j = 0 ; j < coeffs.width ; ++j )\n+ {\n+ mat.data[i*mat.width + j] = coeffs.data[i*coeffs.width + j];\n+ }\n+ }\n+ for( i = 0 ; i < mat.height ; ++i )\n+ {\n+ mat.data[i*mat.width + mat.width - 1] = target.data[i*target.width + 0];\n }\n \n \/* perform row echelon reduction *\/\n@@ -893,8 +901,8 @@\n }\n break;\n }\n- }\n-\n+\n+ }\n \n \/* read out solution if the system is consistent *\/\n have_solution = (pivots[num_pivots-1] != mat.width-1);\n@@ -904,10 +912,10 @@\n }\n if( have_solution == 1 )\n {\n- for( i = 0 ; i < num_pivots ; ++i )\n- {\n- solution.data[pivots[i]*solution.width] = mat.data[i*mat.width + mat.width - 1];\n- }\n+ for( i = 0 ; i < num_pivots ; ++i )\n+ {\n+ solution.data[pivots[i]*solution.width] = mat.data[i*mat.width + mat.width - 1];\n+ }\n }\n \n \/* read out kernel *\/\n@@ -927,7 +935,14 @@\n free(pivots);\n free(npivots);\n \n- return have_solution;\n+ if( have_solution == 1 )\n+ {\n+ return num_npivots-1;\n+ }\n+ else\n+ {\n+ return 1-num_npivots;\n+ }\n }\n \n \n@@ -1210,7 +1225,7 @@\n }\n \n \/**\n- * hqs_copy_new\n+ * hqs_clone\n * Copy one homogeneous quadratic system to a new one. Remember to\n * destroy it when scope ends!\n * @params\n@@ -1218,7 +1233,7 @@\n * @return\n * * dest : a new homogeneous quadratic system identical to source\n *\/\n-hqsystem hqs_copy_new( hqsystem source )\n+hqsystem hqs_clone( hqsystem source )\n {\n hqsystem dest;\n dest = hqs_init(source.n, source.m);\n@@ -1257,7 +1272,8 @@\n {\n for( j = 0 ; j < sys.n ; ++j )\n {\n- sys.quadratic_forms[k].data[i*sys.n + j] = randomness[l++] % MOD;\n+ sys.quadratic_forms[k].data[i*sys.n + j] = randomness[l] % MOD;\n+ l++;\n }\n }\n }\n"} {"commit":"1d2fac5d794f0764db0599f43b3a8d6b4262a700","subject":"TODO for array initialiser","message":"TODO for array initialiser\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/decl_init.c\n+++ src\/cc1\/decl_init.c\n@@ -92,6 +92,23 @@\n \tdecl_init_create_assignments(\n \t\t\td->init, d->ref,\n \t\t\texpr_new_identifier(d->spel), init_code);\n+}\n+\n+void decl_initialise_array(decl_init *dinit, type_ref *tfor, expr *base, stmt *init_code)\n+{\n+\t\/* check type of tfor - we want dinit->bits.inits[0] to be that type\n+\t *\n+\t * possible cases:\n+\t *\n+\t * tfor=`int[]`, dinit=`{ 1, 2, 3, 4 }`\n+\t * tfor=`int[][2]`, dinit=`{ 1, 2, 3, 4 }`\n+\t * tfor=`int[][2]`, dinit=`{ { 1, 2 }, { 3, 4 } }`\n+\t * tfor=`int[][2]`, dinit=`{ { 1 }, { 3 } }`\n+\t * tfor=`T[]`, dinit=`{ 5 }` (5 must match first member of T)\n+\t *\n+\t * etc\n+\t *\/\n+\tICE(\"TODO: %s\", __func__);\n }\n \n void fold_decl_init(decl_init *di, symtable *stab)\n@@ -130,7 +147,7 @@\n \t\t\t\tbreak;\n \t\t}\n \n-\t\tICE(\"TODO: array init\");\n+\t\tdecl_initialise_array(dinit, tfor, base, init_code);\n \n \t}else if((sue = type_ref_is_s_or_u(tfor_wrapped))){\n \t\tICE(\"TODO: sue init\");\n"} {"commit":"4ee95a615a064830fbf679d06e2643b216c27f78","subject":"src\/ccutil\/bits16.h remove warnings (#2726)","message":"src\/ccutil\/bits16.h remove warnings (#2726)\n\n","repos":"UB-Mannheim\/tesseract,amitdo\/tesseract,tesseract-ocr\/tesseract,tesseract-ocr\/tesseract,UB-Mannheim\/tesseract,amitdo\/tesseract,stweil\/tesseract,amitdo\/tesseract,tesseract-ocr\/tesseract,tesseract-ocr\/tesseract,amitdo\/tesseract,stweil\/tesseract,UB-Mannheim\/tesseract,amitdo\/tesseract,stweil\/tesseract,tesseract-ocr\/tesseract,stweil\/tesseract,stweil\/tesseract,UB-Mannheim\/tesseract,UB-Mannheim\/tesseract","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/ccutil\/bits16.h\n+++ src\/ccutil\/bits16.h\n@@ -31,21 +31,21 @@\n \n void turn_on_bit( \/\/ flip specified bit\n uint8_t bit_num) { \/\/ bit to flip 0..7\n- val = val | 01 << bit_num;\n+ val = static_cast<uint16_t>(val | 01 << bit_num);\n }\n \n void turn_off_bit( \/\/ flip specified bit\n uint8_t bit_num) { \/\/ bit to flip 0..7\n- val = val & ~(01 << bit_num);\n+ val = static_cast<uint16_t>(val & ~(01 << bit_num));\n }\n \n void set_bit( \/\/ flip specified bit\n uint8_t bit_num, \/\/ bit to flip 0..7\n bool value) { \/\/ value to flip to\n if (value)\n- val = val | 01 << bit_num;\n+ val = static_cast<uint16_t>(val | 01 << bit_num);\n else\n- val = val & ~(01 << bit_num);\n+ val = static_cast<uint16_t>(val & ~(01 << bit_num));\n }\n \n bool bit( \/\/ access bit\n"} {"commit":"83ccd58e1b11ecb72e0217493010f6f12ec57662","subject":"write jpeg_metadata_index.bin and jpeg_metadata.bin","message":"write jpeg_metadata_index.bin and jpeg_metadata.bin\n","repos":"bugdanov\/jpeg_metadata_size","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- jpeg_metadata.c\n+++ jpeg_metadata.c\n@@ -31,6 +31,10 @@\n \n char *buf=0;\n size_t bufsize=BUF_INCREMENT;\n+FILE *index_file;\n+FILE *output_file;\n+char *index_filename=\"jpeg_metadata_index.bin\";\n+char *output_filename=\"jpeg_metadata.bin\";\n \n int print_jpeg_metadata(char *filename);\n \n@@ -48,6 +52,18 @@\n if (!buf) {\n fprintf(stderr,\"out of memory !\\n\");\n exit(1);\n+ }\n+\n+ index_file=fopen(index_filename,\"w\");\n+ if (!index_file) {\n+ fprintf(stderr,\"error: cannot open output file %s\\n\",index_filename);\n+ return errno;\n+ }\n+\n+ output_file=fopen(output_filename,\"w\");\n+ if (!output_file) {\n+ fprintf(stderr,\"error: cannot open output file %s\\n\",output_filename);\n+ return errno;\n }\n \n for (i=1; i<argc; ++i) {\n@@ -89,12 +105,12 @@\n \/\/ write results\n metadata_size=offset-2;\n if (metadata_size!=ftell(f)-2 || metadata_size<0) {\n- fprintf(stderr,\"unexpected error\\n\");\n- break;\n+ fprintf(stderr,\"unexpected error while processing %s\\n\",filename);\n+ exit(1);\n }\n err=0;\n \n- fprintf(stderr,\"%d %s\\n\",metadata_size,filename);\n+ fprintf(stderr,\"%li %s\\n\",metadata_size,filename);\n break;\n }\n \n@@ -102,21 +118,21 @@\n \n if ((d=fgetc(f))==EOF) {\n fprintf(stderr,\"error: unexpected end of file %s\\n\",filename);\n- break;\n+ exit(1);\n }\n buf[offset++]=d;\n length+=d<<8;\n \n if ((d=fgetc(f))==EOF) {\n fprintf(stderr,\"error: unexpected end of file %s\\n\",filename);\n- break;\n+ exit(1);\n }\n buf[offset++]=d;\n length+=d;\n \n if (length<2) {\n fprintf(stderr,\"error: invalid segment length in %s\\n\",filename);\n- break;\n+ exit(1);\n }\n \n length-=2;\n@@ -126,7 +142,7 @@\n char *newbuf=realloc(buf,newsize);\n if (!newbuf) {\n fprintf(stderr,\"error: out of memory while processing %s\\n\",filename);\n- break;\n+ exit(1);\n }\n buf=newbuf;\n bufsize=newsize;\n@@ -138,7 +154,7 @@\n if (length) {\n if (fread(buf+offset, 1, length, f)!=length){\n fprintf(stderr,\"error: read error while processing %s\\n\",filename);\n- break;\n+ exit(1);\n }\n offset+=length;\n }\n@@ -159,30 +175,46 @@\n \n fclose(f);\n \n+ \/*\n \/\/ write filename\n int len=strlen(filename)+1;\n if (fwrite(filename,1,len,stdout)!=len) {\n fprintf(stderr,\"error: write error while processing %s\\n\",filename);\n exit(1);\n }\n+ *\/\n+\n+ \/\/ write index\n+ long file_offset=ftell(output_file);\n+ if (file_offset<0) {\n+ fprintf(stderr,\"error: write error while processing %s\\n\",filename);\n+ exit(1);\n+ }\n+\n+ uint32_t file_offset32=(uint32_t)file_offset;\n+\n+ if (fwrite(&file_offset32,1,sizeof(file_offset32),index_file)!=sizeof(file_offset32)) {\n+ fprintf(stderr,\"error: write error while processing %s\\n\",filename);\n+ exit(1);\n+ }\n \n uint32_t size32=(uint32_t)metadata_size;\n \n \/\/ write metadata size\n- if (fwrite(&size32,1,sizeof(size32),stdout)!=sizeof(size32)) {\n+ if (fwrite(&size32,1,sizeof(size32),output_file)!=sizeof(size32)) {\n fprintf(stderr,\"error: write error while processing %s\\n\",filename);\n exit(1);\n }\n \n if (metadata_size) {\n \/\/ write metadata \n- if (fwrite(buf,1,size32,stdout)!=size32){\n+ if (fwrite(buf,1,size32,output_file)!=size32){\n fprintf(stderr,\"error: write error while processing %s\\n\",filename);\n exit(1);\n }\n }\n \n- fflush(stdout);\n+ fflush(output_file);\n \n return err;\n \n"} {"commit":"5efcbaec5ccd318f57e4e0c583d9973516978322","subject":"changed background color to white","message":"changed background color to white\n","repos":"porst17\/appchoo","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- appchoo.c\n+++ appchoo.c\n@@ -223,6 +223,8 @@\n \tif (hide_cursor)\n \t\tSDL_SetCursor(empty_cursor());\n \n+ SDL_FillRect(screen , NULL , 0xFFFFFF);\n+\t\n \tint num_x = 1;\n \tint num_y = 1;\n \n"} {"commit":"437db75b943ba0f72eb27d49f660a6d69dfddf1b","subject":"Bugfixes for noemailDN option. Make it use the correct name (instead of NULL) if nomailDN is not set, fix memory leaks and retain DN structure when deleting emailAddress.","message":"Bugfixes for noemailDN option. Make it use the\ncorrect name (instead of NULL) if nomailDN is\nnot set, fix memory leaks and retain DN structure\nwhen deleting emailAddress.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/ca.c\n+++ apps\/ca.c\n@@ -2046,29 +2046,25 @@\n \t\/* Build the correct Subject if no e-mail is wanted in the subject *\/\n \t\/* and add it later on because of the method extensions are added (altName) *\/\n \t \n-\tif (!email_dn)\n-\t\t{\n-\t\tif ((dn_subject=X509_NAME_new()) == NULL)\n+\tif (email_dn)\n+\t\tdn_subject = subject;\n+\telse\n+\t\t{\n+\t\tX509_NAME_ENTRY *tmpne;\n+\t\t\/* Its best to dup the subject DN and then delete any email\n+\t\t * addresses because this retains its structure.\n+\t\t *\/\n+\t\tif (!(dn_subject = X509_NAME_dup(subject)))\n \t\t\t{\n \t\t\tBIO_printf(bio_err,\"Memory allocation failure\\n\");\n \t\t\tgoto err;\n \t\t\t}\n-\n-\t\tfor (i=0; i<X509_NAME_entry_count(subject); i++)\n-\t\t\t{\n-\t\t\tne= X509_NAME_get_entry(subject,i);\n-\t\t\tobj=X509_NAME_ENTRY_get_object(ne);\n-\t\t\tnid=OBJ_obj2nid(obj);\n-\n-\t\t\tstr=X509_NAME_ENTRY_get_data(ne);\n-\n-\t\t\tif (nid == NID_pkcs9_emailAddress) continue;\n-\n-\t\t\tif (!X509_NAME_add_entry(dn_subject,ne, -1, 0))\n-\t\t\t\t{\n-\t\t\t\tBIO_printf(bio_err,\"Memory allocation failure\\n\");\n-\t\t\t\tgoto err;\n-\t\t\t\t}\n+\t\twhile((i = X509_NAME_get_index_by_NID(dn_subject,\n+\t\t\t\t\tNID_pkcs9_emailAddress, -1) >= 0))\n+\t\t\t{\n+\t\t\ttmpne = X509_NAME_get_entry(dn_subject, i);\n+\t\t\tX509_NAME_delete_entry(dn_subject, i);\n+\t\t\tX509_NAME_ENTRY_free(tmpne);\n \t\t\t}\n \t\t}\n \n@@ -2327,6 +2323,8 @@\n \t\tX509_NAME_free(CAname);\n \tif (subject != NULL)\n \t\tX509_NAME_free(subject);\n+\tif ((dn_subject != NULL) && !email_dn)\n+\t\tX509_NAME_free(dn_subject);\n \tif (tmptm != NULL)\n \t\tASN1_UTCTIME_free(tmptm);\n \tif (ok <= 0)\n"} {"commit":"b6d3cb543c2e91aa6820cde637db55ad1cee525f","subject":"RT1369: don't do \"helpful\" access check.","message":"RT1369: don't do \"helpful\" access check.\n\nDon't do access check on destination directory; it breaks when euid\/egid\nis different from real uid\/gid.\n\nReviewed-by: Richard Levitte <5fb523282dd7956571c80524edc2dccfa0bd8234@openssl.org>\nSigned-off-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@akamai.com>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/ca.c\n+++ apps\/ca.c\n@@ -703,24 +703,13 @@\n #ifndef OPENSSL_SYS_VMS\n \/*\n * outdir is a directory spec, but access() for VMS demands a\n- * filename. In any case, stat(), below, will catch the problem if\n- * outdir is not a directory spec, and the fopen() or open() will\n- * catch an error if there is no write access.\n- *\n- * Presumably, this problem could also be solved by using the DEC C\n- * routines to convert the directory syntax to Unixly, and give that\n- * to access(). However, time's too short to do that just now.\n+ * filename. We could use the DEC C routine to convert the\n+ * directory syntax to Unixly, and give that to app_isdir,\n+ * but for now the fopen will catch the error if it's not a\n+ * directory\n *\/\n- if (app_access(outdir, R_OK | W_OK | X_OK) != 0)\n- {\n- BIO_printf(bio_err, \"I am unable to access the %s directory\\n\",\n- outdir);\n- perror(outdir);\n- goto end;\n- }\n-\n if (app_isdir(outdir) <= 0) {\n- BIO_printf(bio_err, \"%s need to be a directory\\n\", outdir);\n+ BIO_printf(bio_err, \"%s: %s is not a directory\\n\", prog, outdir);\n perror(outdir);\n goto end;\n }\n"} {"commit":"b038f45bb301ff09fabeafdbc3a45cd86b156051","subject":"+ add eutil header for eutil","message":"+ add eutil header for eutil\n","repos":"ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study","returncode":1,"stderr":"error: pathspec 'cplusplus\/eutil3\/eutil\/eutil.h' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- cplusplus\/eutil3\/eutil\/eutil.h\n+++ cplusplus\/eutil3\/eutil\/eutil.h\n@@ -0,0 +1,157 @@\n+\/\/ Copyright (c) 2015 ASMlover. All rights reserved.\n+\/\/\n+\/\/ Redistribution and use in source and binary forms, with or without\n+\/\/ modification, are permitted provided that the following conditions\n+\/\/ are met:\n+\/\/\n+\/\/ * Redistributions of source code must retain the above copyright\n+\/\/ notice, this list ofconditions and the following disclaimer.\n+\/\/\n+\/\/ * Redistributions in binary form must reproduce the above copyright\n+\/\/ notice, this list of conditions and the following disclaimer in\n+\/\/ the documentation and\/or other materialsprovided with the\n+\/\/ distribution.\n+\/\/\n+\/\/ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\/\/ \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+\/\/ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n+\/\/ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n+\/\/ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n+\/\/ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n+\/\/ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+\/\/ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n+\/\/ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n+\/\/ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n+\/\/ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n+\/\/ POSSIBILITY OF SUCH DAMAGE.\n+#ifndef __EUTIL_HEADER_H__\n+#define __EUTIL_HEADER_H__\n+\n+#if !defined(EUTIL_OS_WIN) || !defined(EUTIL_OS_LINUX) || \\\n+ !defined(EUTIL_OS_MAC)\n+# undef EUTIL_OS_WIN\n+# undef EUTIL_OS_LINUX\n+# undef EUTIL_OS_MAC\n+\n+# if defined(__WINDOWS__) || defined(_MSC_VER) || defined(_WIN32) || \\\n+ defined(WIN32) || defined(_WIN64) || defined(WIN64) || \\\n+ defined(__WIN32__) || defined(__TOS_WIN__) || defined(__MINGW32) || \\\n+ defined(__MINGW64) || defined(__MINGW32__) || defined(__MINGW64__)\n+# define EUTIL_OS_NAME \"Windows\"\n+# define EUTIL_OS_WIN\n+# elif defined(__linux__) || defined(linux) || defined(__linux) || \\\n+ defined(__LINUX__) || defined(LINUX) || defined(_LINUX)\n+# define EUTIL_OS_NAME \"Linux\"\n+# define EUTIL_OS_LINUX\n+# elif defined(__APPLE__) || defined(__apple__) || defined(__MACH__) || \\\n+ defined(__MACOSX__)\n+# define EUTIL_OS_NAME \"Mac\"\n+# define EUTIL_OS_MAC\n+# else\n+# define EUTIL_OS_NAME \"Unknown\"\n+# error \"DOES NOT SUPPORT THIS PLATFORM !!!\"\n+# endif\n+#endif\n+\n+#if defined(_WIN64) || defined(WIN64) || defined(__amd64__) || \\\n+ defined(__amd64) || defined(__LP64__) || defined(_LP64) || \\\n+ defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || \\\n+ defined(__ia64__) || defined(_IA64) || defined(__IA64__) || \\\n+ defined(__ia64) || defined(_M_IA64)\n+# define EUTIL_BITS_NAME \"64\"\n+# define EUTIL_BITS_64\n+#elif defined(_WIN32) || defined(WIN32) || defined(__32BIT__) || \\\n+ defined(__ILP32__) || defined(_ILP32) || defined(i386) || \\\n+ defined(__i386__) || defined(__i486__) || defined(__i586__) || \\\n+ defined(__i686__) || defined(__i386) || defined(_M_IX86) || \\\n+ defined(__X86__) || defined(_X86_) || defined(__I86__)\n+# define EUTIL_BITS_NAME \"32\"\n+# define EUTIL_BITS_32\n+#else\n+# define EUTIL_BITS_NAME \"Unknown\"\n+# error \"DOES NOT SUPPORT THIS BITS !!!\"\n+#endif\n+\n+#if defined(_MSC_VER)\n+# define EUTIL_COMPILER_NAME \"MSVC\"\n+# define EUTIL_COMPILER_MSVC\n+#elif defined(__MINGW32) || defined(__MINGW64) || \\\n+ defined(__MINGW32__) || defined(__MINGW64__)\n+# define EUTIL_COMPILER_NAME \"MINGW\"\n+# define EUTIL_COMPILER_MINGW\n+# define EUTIL_COMPILER_GCC\n+#elif defined(__GNUG__) || defined(__GNUC__)\n+# define EUTIL_COMPILER_NAME \"GCC\"\n+# define EUTIL_COMPILER_GCC\n+#elif defined(__clang__) || defined(__CLANG__)\n+# define EUTIL_COMPILER_NAME \"CLANG\"\n+# define EUTIL_COMPILER_CLANG\n+#else\n+# define EUTIL_COMPILER_NAME \"Unknown\"\n+# error \"UNKNOWN COMPILER !!!\"\n+#endif\n+\n+#if defined(EUTIL_COMPILER_GCC)\n+# define EUTIL_GCC_VER (__GNUC__ * 100 + __GNUC_MINOR__ * 10)\n+#elif defined(EUTIL_COMPILER_CLANG)\n+# define EUTIL_CLANG_VER (__clang_major__ * 100 + __clang_minor__ * 10)\n+#endif\n+\n+#if (defined(EUTIL_COMPILER_MSVC) && (_MSC_VER < 1700)) || \\\n+ (defined(EUTIL_COMPILER_GCC) && (EUTIL_GCC_VER < 470)) || \\\n+ (defined(EUTIL_COMPILER_CLANG) && (EUTIL_CLANG_VER < 330))\n+# error \"PLEASE USE A HIGHER VERSION OF THE COMPILER !!!\"\n+#endif\n+\n+\/\/ SYSTEM INTERFACES HEADERS\n+#if defined(EUTIL_OS_WIN)\n+# include <direct.h>\n+# include <io.h>\n+# include <mmsystem.h>\n+# include <process.h>\n+# include <windows.h>\n+\n+# undef __func__\n+# define __func__ __FUNCSIG__\n+#else\n+# include <sys\/stat.h>\n+# include <sys\/time.h>\n+# include <sys\/types.h>\n+# include <fcntl.h>\n+# include <limits.h>\n+# include <pthread.h>\n+# include <unistd.h>\n+\n+# define MAX_PATH PATH_MAX\n+# if defined(EUTIL_OS_MAC)\n+# include <libkern\/OSAtomic.h>\n+# include <mach\/mach.h>\n+# include <mach\/mach_time.h>\n+# endif\n+#endif\n+\n+\/\/ ANSI C HEADERS\n+#include <assert.h>\n+#include <sys\/timeb.h>\n+#include <stdarg.h>\n+#include <stdint.h>\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <time.h>\n+\n+\/\/ ANSI C++ HEADERS\n+#include <codecvt>\n+#include <functional>\n+#include <memory>\n+#include <stdexcept>\n+#include <string>\n+\n+\/\/ STL HEADERS\n+#include <algorithm>\n+#include <map>\n+#include <queue>\n+#include <unordered_map>\n+#include <vector>\n+\n+#endif \/\/ __EUTIL_HEADER_H__\n"} {"commit":"f57c293f56d79d760fa0cc0e07e55a28966fe4ea","subject":"Add initial async alloc test","message":"Add initial async alloc test\n","repos":"jboeuf\/grpc,adelez\/grpc,msmania\/grpc,stanley-cheung\/grpc,royalharsh\/grpc,Crevil\/grpc,baylabs\/grpc,fuchsia-mirror\/third_party-grpc,baylabs\/grpc,adelez\/grpc,nicolasnoble\/grpc,thinkerou\/grpc,jtattermusch\/grpc,grani\/grpc,sreecha\/grpc,dklempner\/grpc,Crevil\/grpc,yongni\/grpc,ncteisen\/grpc,jtattermusch\/grpc,grpc\/grpc,nicolasnoble\/grpc,thinkerou\/grpc,msmania\/grpc,grpc\/grpc,royalharsh\/grpc,rjshade\/grpc,nicolasnoble\/grpc,carl-mastrangelo\/grpc,7anner\/grpc,simonkuang\/grpc,hstefan\/grpc,dklempner\/grpc,Vizerai\/grpc,firebase\/grpc,simonkuang\/grpc,vjpai\/grpc,dgquintas\/grpc,philcleveland\/grpc,grpc\/grpc,wcevans\/grpc,stanley-cheung\/grpc,rjshade\/grpc,hstefan\/grpc,kriswuollett\/grpc,yang-g\/grpc,kumaralokgithub\/grpc,jboeuf\/grpc,daniel-j-born\/grpc,zhimingxie\/grpc,pszemus\/grpc,thinkerou\/grpc,vsco\/grpc,LuminateWireless\/grpc,chrisdunelm\/grpc,pmarks-net\/grpc,kskalski\/grpc,rjshade\/grpc,Crevil\/grpc,simonkuang\/grpc,muxi\/grpc,yang-g\/grpc,nicolasnoble\/grpc,ejona86\/grpc,stanley-cheung\/grpc,kskalski\/grpc,kriswuollett\/grpc,ncteisen\/grpc,pszemus\/grpc,ppietrasa\/grpc,msmania\/grpc,ctiller\/grpc,a11r\/grpc,msmania\/grpc,donnadionne\/grpc,yongni\/grpc,sreecha\/grpc,infinit\/grpc,thinkerou\/grpc,deepaklukose\/grpc,7anner\/grpc,adelez\/grpc,murgatroid99\/grpc,dgquintas\/grpc,wcevans\/grpc,donnadionne\/grpc,rjshade\/grpc,muxi\/grpc,MakMukhi\/grpc,adelez\/grpc,murgatroid99\/grpc,makdharma\/grpc,apolcyn\/grpc,greasypizza\/grpc,daniel-j-born\/grpc,grpc\/grpc,mehrdada\/grpc,royalharsh\/grpc,dgquintas\/grpc,greasypizza\/grpc,ppietrasa\/grpc,matt-kwong\/grpc,nicolasnoble\/grpc,kpayson64\/grpc,Crevil\/grpc,thunderboltsid\/grpc,daniel-j-born\/grpc,daniel-j-born\/grpc,sreecha\/grpc,Vizerai\/grpc,donnadionne\/grpc,makdharma\/grpc,kpayson64\/grpc,apolcyn\/grpc,fuchsia-mirror\/third_party-grpc,stanley-cheung\/grpc,jtattermusch\/grpc,carl-mastrangelo\/grpc,Vizerai\/grpc,jboeuf\/grpc,ipylypiv\/grpc,fuchsia-mirror\/third_party-grpc,wcevans\/grpc,7anner\/grpc,MakMukhi\/grpc,kumaralokgithub\/grpc,jboeuf\/grpc,jtattermusch\/grpc,kumaralokgithub\/grpc,7anner\/grpc,royalharsh\/grpc,daniel-j-born\/grpc,baylabs\/grpc,mehrdada\/grpc,soltanmm-google\/grpc,geffzhang\/grpc,ipylypiv\/grpc,grpc\/grpc,kriswuollett\/grpc,geffzhang\/grpc,makdharma\/grpc,donnadionne\/grpc,kskalski\/grpc,pmarks-net\/grpc,muxi\/grpc,ctiller\/grpc,murgatroid99\/grpc,MakMukhi\/grpc,daniel-j-born\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,ipylypiv\/grpc,yang-g\/grpc,Vizerai\/grpc,ctiller\/grpc,carl-mastrangelo\/grpc,murgatroid99\/grpc,thunderboltsid\/grpc,jtattermusch\/grpc,grani\/grpc,a11r\/grpc,philcleveland\/grpc,ejona86\/grpc,vjpai\/grpc,dgquintas\/grpc,ppietrasa\/grpc,greasypizza\/grpc,matt-kwong\/grpc,nicolasnoble\/grpc,wcevans\/grpc,ctiller\/grpc,jtattermusch\/grpc,kpayson64\/grpc,quizlet\/grpc,kpayson64\/grpc,pszemus\/grpc,dklempner\/grpc,hstefan\/grpc,royalharsh\/grpc,dklempner\/grpc,infinit\/grpc,baylabs\/grpc,simonkuang\/grpc,rjshade\/grpc,baylabs\/grpc,mehrdada\/grpc,philcleveland\/grpc,grpc\/grpc,stanley-cheung\/grpc,LuminateWireless\/grpc,firebase\/grpc,greasypizza\/grpc,yugui\/grpc,dgquintas\/grpc,PeterFaiman\/ruby-grpc-minimal,a11r\/grpc,carl-mastrangelo\/grpc,Vizerai\/grpc,donnadionne\/grpc,vjpai\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,ctiller\/grpc,yang-g\/grpc,chrisdunelm\/grpc,kpayson64\/grpc,matt-kwong\/grpc,geffzhang\/grpc,stanley-cheung\/grpc,ncteisen\/grpc,kpayson64\/grpc,MakMukhi\/grpc,apolcyn\/grpc,7anner\/grpc,Vizerai\/grpc,yugui\/grpc,vsco\/grpc,ctiller\/grpc,ejona86\/grpc,carl-mastrangelo\/grpc,philcleveland\/grpc,yongni\/grpc,thinkerou\/grpc,msmania\/grpc,deepaklukose\/grpc,royalharsh\/grpc,nicolasnoble\/grpc,pszemus\/grpc,carl-mastrangelo\/grpc,greasypizza\/grpc,grani\/grpc,dgquintas\/grpc,pszemus\/grpc,vsco\/grpc,dklempner\/grpc,greasypizza\/grpc,ejona86\/grpc,soltanmm-google\/grpc,philcleveland\/grpc,ejona86\/grpc,LuminateWireless\/grpc,firebase\/grpc,hstefan\/grpc,zhimingxie\/grpc,MakMukhi\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,chrisdunelm\/grpc,nicolasnoble\/grpc,jtattermusch\/grpc,pmarks-net\/grpc,firebase\/grpc,dgquintas\/grpc,msmania\/grpc,matt-kwong\/grpc,infinit\/grpc,ctiller\/grpc,ipylypiv\/grpc,yugui\/grpc,kskalski\/grpc,a11r\/grpc,quizlet\/grpc,grani\/grpc,ctiller\/grpc,jtattermusch\/grpc,muxi\/grpc,yugui\/grpc,vsco\/grpc,soltanmm-google\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,sreecha\/grpc,dgquintas\/grpc,matt-kwong\/grpc,yongni\/grpc,ejona86\/grpc,makdharma\/grpc,deepaklukose\/grpc,muxi\/grpc,grani\/grpc,daniel-j-born\/grpc,PeterFaiman\/ruby-grpc-minimal,MakMukhi\/grpc,muxi\/grpc,quizlet\/grpc,PeterFaiman\/ruby-grpc-minimal,msmania\/grpc,ppietrasa\/grpc,muxi\/grpc,thunderboltsid\/grpc,thunderboltsid\/grpc,dklempner\/grpc,kskalski\/grpc,PeterFaiman\/ruby-grpc-minimal,vsco\/grpc,stanley-cheung\/grpc,jtattermusch\/grpc,donnadionne\/grpc,firebase\/grpc,murgatroid99\/grpc,apolcyn\/grpc,vsco\/grpc,7anner\/grpc,ejona86\/grpc,chrisdunelm\/grpc,yang-g\/grpc,kskalski\/grpc,thunderboltsid\/grpc,soltanmm-google\/grpc,apolcyn\/grpc,rjshade\/grpc,dgquintas\/grpc,ejona86\/grpc,7anner\/grpc,kpayson64\/grpc,sreecha\/grpc,matt-kwong\/grpc,adelez\/grpc,donnadionne\/grpc,ncteisen\/grpc,pszemus\/grpc,wcevans\/grpc,grpc\/grpc,chrisdunelm\/grpc,rjshade\/grpc,Vizerai\/grpc,LuminateWireless\/grpc,yongni\/grpc,dklempner\/grpc,ejona86\/grpc,thunderboltsid\/grpc,zhimingxie\/grpc,royalharsh\/grpc,ipylypiv\/grpc,ncteisen\/grpc,murgatroid99\/grpc,adelez\/grpc,sreecha\/grpc,grpc\/grpc,sreecha\/grpc,ipylypiv\/grpc,chrisdunelm\/grpc,zhimingxie\/grpc,firebase\/grpc,muxi\/grpc,hstefan\/grpc,MakMukhi\/grpc,simonkuang\/grpc,baylabs\/grpc,thinkerou\/grpc,pszemus\/grpc,pszemus\/grpc,simonkuang\/grpc,jboeuf\/grpc,yugui\/grpc,vsco\/grpc,zhimingxie\/grpc,LuminateWireless\/grpc,ejona86\/grpc,jboeuf\/grpc,kriswuollett\/grpc,ctiller\/grpc,baylabs\/grpc,infinit\/grpc,thinkerou\/grpc,Crevil\/grpc,muxi\/grpc,murgatroid99\/grpc,Vizerai\/grpc,adelez\/grpc,firebase\/grpc,yongni\/grpc,ncteisen\/grpc,mehrdada\/grpc,mehrdada\/grpc,murgatroid99\/grpc,pszemus\/grpc,muxi\/grpc,ppietrasa\/grpc,kumaralokgithub\/grpc,thinkerou\/grpc,kpayson64\/grpc,MakMukhi\/grpc,quizlet\/grpc,pmarks-net\/grpc,apolcyn\/grpc,yugui\/grpc,donnadionne\/grpc,hstefan\/grpc,quizlet\/grpc,yang-g\/grpc,firebase\/grpc,thinkerou\/grpc,soltanmm-google\/grpc,matt-kwong\/grpc,kriswuollett\/grpc,baylabs\/grpc,ncteisen\/grpc,ipylypiv\/grpc,vjpai\/grpc,fuchsia-mirror\/third_party-grpc,kumaralokgithub\/grpc,ejona86\/grpc,yugui\/grpc,yugui\/grpc,geffzhang\/grpc,PeterFaiman\/ruby-grpc-minimal,soltanmm-google\/grpc,ncteisen\/grpc,grpc\/grpc,carl-mastrangelo\/grpc,PeterFaiman\/ruby-grpc-minimal,Vizerai\/grpc,kpayson64\/grpc,daniel-j-born\/grpc,royalharsh\/grpc,PeterFaiman\/ruby-grpc-minimal,philcleveland\/grpc,vjpai\/grpc,yugui\/grpc,pmarks-net\/grpc,deepaklukose\/grpc,apolcyn\/grpc,matt-kwong\/grpc,sreecha\/grpc,vjpai\/grpc,nicolasnoble\/grpc,wcevans\/grpc,sreecha\/grpc,yang-g\/grpc,philcleveland\/grpc,vsco\/grpc,PeterFaiman\/ruby-grpc-minimal,dklempner\/grpc,makdharma\/grpc,LuminateWireless\/grpc,donnadionne\/grpc,wcevans\/grpc,infinit\/grpc,jboeuf\/grpc,kriswuollett\/grpc,thunderboltsid\/grpc,simonkuang\/grpc,philcleveland\/grpc,jboeuf\/grpc,a11r\/grpc,Crevil\/grpc,fuchsia-mirror\/third_party-grpc,LuminateWireless\/grpc,carl-mastrangelo\/grpc,dgquintas\/grpc,mehrdada\/grpc,kskalski\/grpc,grpc\/grpc,jtattermusch\/grpc,quizlet\/grpc,chrisdunelm\/grpc,muxi\/grpc,vjpai\/grpc,grani\/grpc,fuchsia-mirror\/third_party-grpc,kumaralokgithub\/grpc,ppietrasa\/grpc,stanley-cheung\/grpc,kskalski\/grpc,Crevil\/grpc,pmarks-net\/grpc,carl-mastrangelo\/grpc,deepaklukose\/grpc,greasypizza\/grpc,thunderboltsid\/grpc,philcleveland\/grpc,donnadionne\/grpc,sreecha\/grpc,muxi\/grpc,infinit\/grpc,royalharsh\/grpc,jboeuf\/grpc,yang-g\/grpc,jtattermusch\/grpc,matt-kwong\/grpc,kriswuollett\/grpc,msmania\/grpc,grpc\/grpc,sreecha\/grpc,a11r\/grpc,grani\/grpc,yongni\/grpc,soltanmm-google\/grpc,carl-mastrangelo\/grpc,yongni\/grpc,mehrdada\/grpc,donnadionne\/grpc,makdharma\/grpc,jboeuf\/grpc,deepaklukose\/grpc,jboeuf\/grpc,7anner\/grpc,thunderboltsid\/grpc,ipylypiv\/grpc,vjpai\/grpc,vjpai\/grpc,yongni\/grpc,yang-g\/grpc,apolcyn\/grpc,geffzhang\/grpc,geffzhang\/grpc,soltanmm-google\/grpc,MakMukhi\/grpc,greasypizza\/grpc,wcevans\/grpc,nicolasnoble\/grpc,makdharma\/grpc,deepaklukose\/grpc,firebase\/grpc,hstefan\/grpc,geffzhang\/grpc,infinit\/grpc,simonkuang\/grpc,Crevil\/grpc,hstefan\/grpc,kumaralokgithub\/grpc,mehrdada\/grpc,firebase\/grpc,grpc\/grpc,stanley-cheung\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,dklempner\/grpc,kriswuollett\/grpc,a11r\/grpc,rjshade\/grpc,a11r\/grpc,grani\/grpc,zhimingxie\/grpc,apolcyn\/grpc,kskalski\/grpc,ncteisen\/grpc,mehrdada\/grpc,murgatroid99\/grpc,infinit\/grpc,LuminateWireless\/grpc,Crevil\/grpc,ejona86\/grpc,firebase\/grpc,makdharma\/grpc,jboeuf\/grpc,quizlet\/grpc,ctiller\/grpc,mehrdada\/grpc,ctiller\/grpc,chrisdunelm\/grpc,quizlet\/grpc,ppietrasa\/grpc,kriswuollett\/grpc,vjpai\/grpc,adelez\/grpc,deepaklukose\/grpc,ipylypiv\/grpc,thinkerou\/grpc,a11r\/grpc,fuchsia-mirror\/third_party-grpc,nicolasnoble\/grpc,nicolasnoble\/grpc,kpayson64\/grpc,sreecha\/grpc,ncteisen\/grpc,kpayson64\/grpc,makdharma\/grpc,pszemus\/grpc,LuminateWireless\/grpc,thinkerou\/grpc,jtattermusch\/grpc,baylabs\/grpc,deepaklukose\/grpc,rjshade\/grpc,adelez\/grpc,chrisdunelm\/grpc,7anner\/grpc,wcevans\/grpc,stanley-cheung\/grpc,msmania\/grpc,infinit\/grpc,geffzhang\/grpc,Vizerai\/grpc,daniel-j-born\/grpc,vjpai\/grpc,ncteisen\/grpc,thinkerou\/grpc,grani\/grpc,zhimingxie\/grpc,ppietrasa\/grpc,dgquintas\/grpc,PeterFaiman\/ruby-grpc-minimal,quizlet\/grpc,geffzhang\/grpc,carl-mastrangelo\/grpc,murgatroid99\/grpc,soltanmm-google\/grpc,carl-mastrangelo\/grpc,vsco\/grpc,greasypizza\/grpc,PeterFaiman\/ruby-grpc-minimal,pszemus\/grpc,hstefan\/grpc,firebase\/grpc,fuchsia-mirror\/third_party-grpc,pszemus\/grpc,chrisdunelm\/grpc,fuchsia-mirror\/third_party-grpc,ncteisen\/grpc,simonkuang\/grpc,ppietrasa\/grpc,pmarks-net\/grpc,mehrdada\/grpc,pmarks-net\/grpc,mehrdada\/grpc,ctiller\/grpc,Vizerai\/grpc,pmarks-net\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/core\/iomgr\/buffer_pool_test.c\n+++ test\/core\/iomgr\/buffer_pool_test.c\n@@ -107,6 +107,28 @@\n destroy_user(&usr);\n }\n \n+static void test_simple_async_alloc(void) {\n+ gpr_log(GPR_INFO, \"** test_simple_async_alloc **\");\n+ grpc_buffer_pool *p = grpc_buffer_pool_create();\n+ grpc_buffer_pool_resize(p, 1024 * 1024);\n+ grpc_buffer_user usr;\n+ grpc_buffer_user_init(&usr, p);\n+ {\n+ bool done = false;\n+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;\n+ grpc_buffer_user_alloc(&exec_ctx, &usr, 1024, set_bool(&done));\n+ grpc_exec_ctx_finish(&exec_ctx);\n+ GPR_ASSERT(done);\n+ }\n+ {\n+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;\n+ grpc_buffer_user_free(&exec_ctx, &usr, 1024);\n+ grpc_exec_ctx_finish(&exec_ctx);\n+ }\n+ grpc_buffer_pool_unref(p);\n+ destroy_user(&usr);\n+}\n+\n int main(int argc, char **argv) {\n grpc_test_init(argc, argv);\n grpc_init();\n@@ -115,6 +137,7 @@\n test_buffer_user_no_op();\n test_instant_alloc_then_free();\n test_instant_alloc_free_pair();\n+ test_simple_async_alloc();\n grpc_shutdown();\n return 0;\n }\n"} {"commit":"113e8e1cef7b507a7d698349eac6c633280d0e95","subject":"Tweak clang\/test\/CodeGen\/debug-prefix-map.c to appease win32 hosts.","message":"Tweak clang\/test\/CodeGen\/debug-prefix-map.c to appease win32 hosts.\n\n !1 = !DIFile(filename: \"\/var\/empty\\5C<stdin>\", directory: \"E:\\5Cllvm\\5Cbuild\\5Ccmake-ninja\\5Ctools\\5Cclang\\5Ctest\\5CCodeGen\")\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@250136 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/CodeGen\/debug-prefix-map.c\n+++ test\/CodeGen\/debug-prefix-map.c\n@@ -16,7 +16,7 @@\n vprintf(\"string\", argp);\n }\n \n-\/\/ CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: \"\/var\/empty{{[\/\\\\]}}<stdin>\"\n+\/\/ CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: \"\/var\/empty{{\/|\\\\5C}}<stdin>\"\n \/\/ CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: \"\/var\/empty{{[\/\\\\]}}{{.*}}\"\n \/\/ CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: \"\/var\/empty{{[\/\\\\]}}Inputs\/stdio.h\"\n \/\/ CHECK-NO-MAIN-FILE-NAME-NOT: !DIFile(filename:\n"} {"commit":"efb39b37bbfbbd4802ade43357f7bfa79ca89d5d","subject":"[arm][mmu] fix domain check bug as uncovered by clang","message":"[arm][mmu] fix domain check bug as uncovered by clang\n","repos":"travisg\/armemu,travisg\/armemu,travisg\/armemu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arm\/mmu.c\n+++ arm\/mmu.c\n@@ -247,7 +247,7 @@\n \t\t\treturn CLIENT;\n \t\tcase 0: \/\/ no access\n \t\tcase 2: \/\/ reserved\n-\t\t\treturn NO_ACCESS;\n+\t\t\treturn DOMAIN_FAULT;\n \t}\n }\n \n"} {"commit":"1cbcfd23d39ac291853f39500f060dbf605b5a50","subject":"create socket with the right protocol family","message":"create socket with the right protocol family\n","repos":"each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bin\/tests\/sdig.c\n+++ bin\/tests\/sdig.c\n@@ -212,9 +212,6 @@\n \tresult = isc_socketmgr_create(mctx, &socketmgr);\n \tcheck_result(result, \"isc_socketmgr_create()\");\n \tsock = NULL;\n-\tresult = isc_socket_create(socketmgr, PF_INET, isc_sockettype_udp,\n-\t\t\t\t &sock);\n-\tcheck_result(result, \"isc_socket_create()\");\n \n \tserver = \"localhost\";\n \tport = 5544;\n@@ -297,6 +294,10 @@\n \n \tget_address(server, port, &sockaddr);\n \n+\tresult = isc_socket_create(socketmgr, isc_sockaddr_pf(&sockaddr),\n+\t\t\t\t isc_sockettype_udp, &sock);\n+\tcheck_result(result, \"isc_socket_create()\");\n+\n \tisc_buffer_init(&b2, data2, sizeof data2, ISC_BUFFERTYPE_BINARY);\n \tisc_buffer_available(&b2, &r);\n \tresult = isc_socket_recv(sock, &r, 1, task, recv_done, NULL);\n"} {"commit":"9f7c43c96727a53bea45f7f2549d897f0a6117b8","subject":"Btrfs: fix memory leak of empty filesystem after balance","message":"Btrfs: fix memory leak of empty filesystem after balance\n\nAfter Josef's patch(commit 3c14874acc71180553fb5aba528e3cf57c5b958b),\nbtrfs will exclude super bytes when reading block groups(by marking a extent\nstate UPTODATE). However, these bytes do not get freed while balance remove\nunused block groups, and we won't process those removed ones any more, when\nwe do umount and unload the btrfs module, btrfs hits a memory leak.\n\nThis patch add the missing free operation.\n\nReproduce steps:\n$ mkfs.btrfs disk\n$ mount disk \/mnt\/btrfs -o loop\n$ btrfs filesystem balance \/mnt\/btrfs\n$ umount \/mnt\/btrfs\n$ rmmod btrfs\n\nSigned-off-by: Liu Bo <00b627b8656913e4df3ede997ad1311ebf4b82a4@cn.fujitsu.com>\nSigned-off-by: Chris Mason <a169954b4cb1a46cee25f659d3bddfebe02b5fba@oracle.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -8669,6 +8669,12 @@\n \tBUG_ON(!block_group);\n \tBUG_ON(!block_group->ro);\n \n+\t\/*\n+\t * Free the reserved super bytes from this block group before\n+\t * remove it.\n+\t *\/\n+\tfree_excluded_extents(root, block_group);\n+\n \tmemcpy(&key, &block_group->key, sizeof(key));\n \tif (block_group->flags & (BTRFS_BLOCK_GROUP_DUP |\n \t\t\t\t BTRFS_BLOCK_GROUP_RAID1 |\n"} {"commit":"d3154b44c28affc94a4fbaf26706f075b58733a7","subject":"Use \"git_config_string\" to simplify \"builtin-gc.c\" code where \"prune_expire\" is set","message":"Use \"git_config_string\" to simplify \"builtin-gc.c\" code where \"prune_expire\" is set\n\nSigned-off-by: David Bryson <aa743a0aaec8f7d7a1f01442503957f4d7a2d634@statichacks.org>\nSigned-off-by: Shawn O. Pearce <f01032651c12a22b2103346ba96b3b6b231f9d3c@spearce.org>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- builtin-gc.c\n+++ builtin-gc.c\n@@ -26,7 +26,7 @@\n static int aggressive_window = -1;\n static int gc_auto_threshold = 6700;\n static int gc_auto_pack_limit = 50;\n-static char *prune_expire = \"2.weeks.ago\";\n+static const char *prune_expire = \"2.weeks.ago\";\n \n #define MAX_ADD 10\n static const char *argv_pack_refs[] = {\"pack-refs\", \"--all\", \"--prune\", NULL};\n@@ -57,15 +57,12 @@\n \t\treturn 0;\n \t}\n \tif (!strcmp(var, \"gc.pruneexpire\")) {\n-\t\tif (!value)\n-\t\t\treturn config_error_nonbool(var);\n-\t\tif (strcmp(value, \"now\")) {\n+\t\tif (value && strcmp(value, \"now\")) {\n \t\t\tunsigned long now = approxidate(\"now\");\n \t\t\tif (approxidate(value) >= now)\n \t\t\t\treturn error(\"Invalid %s: '%s'\", var, value);\n \t\t}\n-\t\tprune_expire = xstrdup(value);\n-\t\treturn 0;\n+\t\treturn git_config_string(&prune_expire, var, value);\n \t}\n \treturn git_default_config(var, value, cb);\n }\n"} {"commit":"6f33434850ed87dc5e56b60ebbad3d3cf405f296","subject":"btrfs: Fix early enospc because 'unused' calculated with wrong sign.","message":"btrfs: Fix early enospc because 'unused' calculated with wrong sign.\n\n'unused' calculated with wrong sign in reserve_metadata_bytes().\nThis might have lead to unwanted over-reservations.\n\nSigned-off-by: Arne Jansen <1ac75ecdee0e8d99a7251fd3af35e29d91a85db3@gmx.net>\nReviewed-by: Josef Bacik <78b342861d821967b29f951b7366f5a0267e0c38@redhat.com>\nSigned-off-by: Chris Mason <a169954b4cb1a46cee25f659d3bddfebe02b5fba@oracle.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -3413,7 +3413,7 @@\n \t * our reservation.\n \t *\/\n \tif (unused <= space_info->total_bytes) {\n-\t\tunused -= space_info->total_bytes;\n+\t\tunused = space_info->total_bytes - unused;\n \t\tif (unused >= num_bytes) {\n \t\t\tif (!reserved)\n \t\t\t\tspace_info->bytes_reserved += orig_bytes;\n"} {"commit":"6c24c5c0a5f761f698f61a7a2c84d26a3589ef6b","subject":"builtin-am: invoke pre-applypatch hook","message":"builtin-am: invoke pre-applypatch hook\n\nSince d1c5f2a (Add git-am, applymbox replacement., 2005-10-07),\ngit-am.sg will invoke the pre-applypatch hook after applying the patch\nto the index, but before a commit is made. Should the hook exit with a\nnon-zero status, git am will exit.\n\nRe-implement this in builtin\/am.c.\n\nSigned-off-by: Paul Tan <ca5433e1cdd25b4a4001c54525dea593b33edc0c@gmail.com>\nSigned-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- builtin\/am.c\n+++ builtin\/am.c\n@@ -1333,6 +1333,9 @@\n \tstruct commit_list *parents = NULL;\n \tconst char *reflog_msg, *author;\n \tstruct strbuf sb = STRBUF_INIT;\n+\n+\tif (run_hook_le(NULL, \"pre-applypatch\", NULL))\n+\t\texit(1);\n \n \tif (write_cache_as_tree(tree, 0, NULL))\n \t\tdie(_(\"git write-tree failed to write a tree\"));\n"} {"commit":"798bc034aa37140fd1e8a4325bded699a07a7c8a","subject":"remove superflous declaration of vnops, it's now in <sys\/file.h>","message":"remove superflous declaration of vnops, it's now in <sys\/file.h>\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- xfs\/xfs_vfsops-bsd.c\n+++ xfs\/xfs_vfsops-bsd.c\n@@ -38,7 +38,7 @@\n \n #include <xfs\/xfs_locl.h>\n \n-RCSID(\"$Id: xfs_vfsops-bsd.c,v 1.1 1999\/04\/30 01:59:01 art Exp $\");\n+RCSID(\"$Id: xfs_vfsops-bsd.c,v 1.2 2000\/02\/01 04:12:19 assar Exp $\");\n \n \/*\n * XFS vfs operations.\n@@ -336,7 +336,6 @@\n int flags = FFLAGS(user_flags);\n int index;\n struct file *fp;\n- extern struct fileops vnops;\n \n XFSDEB(XDEBVFOPS, (\"xfs_fhopen: fileid = %ld, flags = %d\\n\",\n \t\t fileid, user_flags));\n"} {"commit":"a5087b245906efd4f63800a6f5e701f84c218d6e","subject":"Fix compile warnings.","message":"Fix compile warnings.\n","repos":"ueno\/ibus,ibus\/ibus-cros,j717273419\/ibus,fujiwarat\/ibus,ueno\/ibus,ueno\/ibus,luoxsbupt\/ibus,luoxsbupt\/ibus,j717273419\/ibus,ibus\/ibus,j717273419\/ibus,phuang\/ibus,ibus\/ibus,phuang\/ibus,Keruspe\/ibus,ueno\/ibus,luoxsbupt\/ibus,ibus\/ibus,fujiwarat\/ibus,ibus\/ibus-cros,ibus\/ibus-cros,fujiwarat\/ibus,j717273419\/ibus,phuang\/ibus,ibus\/ibus,luoxsbupt\/ibus,Keruspe\/ibus,Keruspe\/ibus,phuang\/ibus,luoxsbupt\/ibus,fujiwarat\/ibus,Keruspe\/ibus,ueno\/ibus,ibus\/ibus-cros","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bus\/server.c\n+++ bus\/server.c\n@@ -17,10 +17,10 @@\n * Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n * Boston, MA 02111-1307, USA.\n *\/\n-\n+#include <unistd.h>\n #include <sys\/stat.h>\n #include <sys\/types.h>\n-#include <libgen.h>\n+#include <stdlib.h>\n \n #include \"server.h\"\n #include \"connection.h\"\n"} {"commit":"d4bcda4f604939b366602b18825ee82c7a4b97d2","subject":"fixed gcc warning for fread() call","message":"fixed gcc warning for fread() call\n","repos":"alexpreynolds\/byte-store,alexpreynolds\/byte-store,alexpreynolds\/byte-store,alexpreynolds\/byte-store","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- byte-store.c\n+++ byte-store.c\n@@ -1139,7 +1139,11 @@\n for (uint32_t row_idx = 0; row_idx < s->attr->nelems - 1; row_idx++) {\n \/* copy row of score bytes to a temporary buffer *\/\n fseek(os, bs_sqr_byte_offset_for_element_ij(s->attr->nelems, row_idx, row_idx + 1), SEEK_SET);\n- fread(row_bytes, sizeof(unsigned char), s->attr->nelems - row_idx - 1, os);\n+ size_t bytes_to_read = s->attr->nelems - row_idx - 1;\n+ if (fread(row_bytes, sizeof(unsigned char), bytes_to_read, os) != bytes_to_read) {\n+ fprintf(stderr, \"Error: Could not read row bytes from square matrix store!\\n\");\n+ exit(EXIT_FAILURE);\n+ }\n \/* copy temporary buffer to equivalent column *\/\n start_offset = bs_sqr_byte_offset_for_element_ij(s->attr->nelems, row_idx + 1, row_idx);\n end_offset = bs_sqr_byte_offset_for_element_ij(s->attr->nelems, s->attr->nelems - 1, row_idx);\n"} {"commit":"e42e9989a7cf0520a78f34b8022bd1c76f5705d9","subject":"USE_WROVER_BOARD support","message":"USE_WROVER_BOARD support\n","repos":"blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/Export_Demo\/Template_ESP32\/Settings.h\n+++ examples\/Export_Demo\/Template_ESP32\/Settings.h\n@@ -27,6 +27,18 @@\n \/\/#define BOARD_LED_PIN_G 26\n \/\/#define BOARD_LED_PIN_B 25\n \/\/#define BOARD_LED_PIN_WS2812 33 \/\/ Set if your LED is WS2812 RGB\n+ #define BOARD_LED_INVERSE false \/\/ true if LED is common anode, false if common cathode\n+ #define BOARD_LED_BRIGHTNESS 32 \/\/ 0..255 brightness control\n+\n+#elif defined(USE_WROVER_BOARD)\n+\n+ \/\/ Custom board configuration\n+ #define BOARD_BUTTON_PIN 15 \/\/ Pin where user button is attached\n+ #define BOARD_BUTTON_ACTIVE_LOW true \/\/ true if button is \"active-low\"\n+\n+ #define BOARD_LED_PIN_R 0 \/\/ Set R,G,B pins - if your LED is PWM RGB \n+ #define BOARD_LED_PIN_G 2\n+ #define BOARD_LED_PIN_B 4\n #define BOARD_LED_INVERSE false \/\/ true if LED is common anode, false if common cathode\n #define BOARD_LED_BRIGHTNESS 32 \/\/ 0..255 brightness control\n \n"} {"commit":"85f10f43b72168f7ed105d6e7cdba214bfc0c6f9","subject":"Remove old sound declarations","message":"Remove old sound declarations\n","repos":"N00byEdge\/Neohuman","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Neohuman.h\n+++ Neohuman.h\n@@ -11,8 +11,6 @@\n \n class Neohuman : public BWAPI::AIModule {\n \tpublic:\n-\t\tNeohuman();\n-\n \t\tvirtual void onStart();\n \t\tvirtual void onEnd(bool isWinner);\n \t\tvirtual void onFrame();\n@@ -36,7 +34,6 @@\n \t\tBWAPI::Race playingRace;\n \n \t\tNeolib::Timer timer_drawinfo, timer_managequeue, timer_buildbuildings, timer_unitlogic, timer_marinelogic, timer_total;\n-\t\tNeolib::SoundFile seinfeld, shittyflute;\n };\n \n extern Neohuman* neoInstance;\n"} {"commit":"bab7cbc1ed4ae3a51c608293cc484b282bae8c2b","subject":"","message":"\nENH: KernelFunction now derives from FunctionBase.\n","repos":"ajjl\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,eile\/ITK,vfonov\/ITK,fbudin69500\/ITK,hendradarwin\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,biotrump\/ITK,zachary-williamson\/ITK,hjmjohnson\/ITK,msmolens\/ITK,LucHermitte\/ITK,vfonov\/ITK,thewtex\/ITK,ajjl\/ITK,fedral\/ITK,atsnyder\/ITK,paulnovo\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,stnava\/ITK,hendradarwin\/ITK,blowekamp\/ITK,atsnyder\/ITK,BlueBrain\/ITK,msmolens\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,eile\/ITK,daviddoria\/itkHoughTransform,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,atsnyder\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,jcfr\/ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,paulnovo\/ITK,hinerm\/ITK,richardbeare\/ITK,CapeDrew\/DCMTK-ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,BRAINSia\/ITK,ajjl\/ITK,wkjeong\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,eile\/ITK,malaterre\/ITK,blowekamp\/ITK,richardbeare\/ITK,BlueBrain\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,CapeDrew\/DITK,malaterre\/ITK,thewtex\/ITK,paulnovo\/ITK,thewtex\/ITK,fedral\/ITK,vfonov\/ITK,LucasGandel\/ITK,wkjeong\/ITK,atsnyder\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,richardbeare\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,malaterre\/ITK,hendradarwin\/ITK,daviddoria\/itkHoughTransform,itkvideo\/ITK,GEHC-Surgery\/ITK,blowekamp\/ITK,hinerm\/ITK,CapeDrew\/DITK,CapeDrew\/DITK,Kitware\/ITK,hjmjohnson\/ITK,jmerkow\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,hjmjohnson\/ITK,jcfr\/ITK,msmolens\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,jcfr\/ITK,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,stnava\/ITK,ajjl\/ITK,jmerkow\/ITK,richardbeare\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,spinicist\/ITK,blowekamp\/ITK,blowekamp\/ITK,fedral\/ITK,fbudin69500\/ITK,jcfr\/ITK,eile\/ITK,CapeDrew\/DITK,vfonov\/ITK,richardbeare\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,GEHC-Surgery\/ITK,hjmjohnson\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,jmerkow\/ITK,biotrump\/ITK,hinerm\/ITK,eile\/ITK,biotrump\/ITK,eile\/ITK,LucHermitte\/ITK,jmerkow\/ITK,heimdali\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,msmolens\/ITK,biotrump\/ITK,stnava\/ITK,zachary-williamson\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,jmerkow\/ITK,thewtex\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,paulnovo\/ITK,vfonov\/ITK,CapeDrew\/DITK,vfonov\/ITK,GEHC-Surgery\/ITK,jcfr\/ITK,zachary-williamson\/ITK,stnava\/ITK,GEHC-Surgery\/ITK,fedral\/ITK,hinerm\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,spinicist\/ITK,msmolens\/ITK,eile\/ITK,spinicist\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,hendradarwin\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,spinicist\/ITK,atsnyder\/ITK,ajjl\/ITK,heimdali\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,jcfr\/ITK,hjmjohnson\/ITK,malaterre\/ITK,itkvideo\/ITK,biotrump\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,hendradarwin\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,rhgong\/itk-with-dom,BlueBrain\/ITK,jcfr\/ITK,heimdali\/ITK,stnava\/ITK,stnava\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,LucasGandel\/ITK,jcfr\/ITK,malaterre\/ITK,ajjl\/ITK,fbudin69500\/ITK,fedral\/ITK,fbudin69500\/ITK,biotrump\/ITK,fbudin69500\/ITK,eile\/ITK,Kitware\/ITK,LucasGandel\/ITK,spinicist\/ITK,LucasGandel\/ITK,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,itkvideo\/ITK,atsnyder\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,spinicist\/ITK,hinerm\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,BlueBrain\/ITK,blowekamp\/ITK,wkjeong\/ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,vfonov\/ITK,CapeDrew\/DITK,richardbeare\/ITK,PlutoniumHeart\/ITK,itkvideo\/ITK,hinerm\/ITK,InsightSoftwareConsortium\/ITK,ajjl\/ITK,fbudin69500\/ITK,jmerkow\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,itkvideo\/ITK,Kitware\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,malaterre\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,stnava\/ITK,fedral\/ITK,ajjl\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,thewtex\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,hjmjohnson\/ITK,thewtex\/ITK,fbudin69500\/ITK,fuentesdt\/InsightToolkit-dev,BRAINSia\/ITK,CapeDrew\/DITK,heimdali\/ITK,LucHermitte\/ITK,itkvideo\/ITK,GEHC-Surgery\/ITK,LucasGandel\/ITK,hinerm\/ITK,Kitware\/ITK,CapeDrew\/DITK,rhgong\/itk-with-dom,fedral\/ITK,msmolens\/ITK,BRAINSia\/ITK,InsightSoftwareConsortium\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Algorithms\/itkKernelFunction.h\n+++ Code\/Algorithms\/itkKernelFunction.h\n@@ -41,6 +41,7 @@\n #define _itkKernelFunction_h\n \n #include \"vnl\/vnl_math.h\"\n+#include \"itkFunctionBase.h\"\n \n namespace itk\n {\n@@ -49,9 +50,9 @@\n * \\class KernelFunction\n * \\brief Kernel used for kernel function\/density estimation.\n * \n- * \\ingroup Operators\n+ * \\ingroup Functions\n *\/\n-class ITK_EXPORT KernelFunction : public Object\n+class ITK_EXPORT KernelFunction : public FunctionBase<double,double>\n {\n public: \n \/**\n@@ -62,7 +63,7 @@\n \/**\n * Standard \"Superclass\" typedef.\n *\/\n- typedef Object Superclass;\n+ typedef FunctionBase<double,double> Superclass;\n \n \/** \n * Smart pointer typedef support.\n@@ -73,7 +74,7 @@\n \/**\n * Evaluate the function.\n *\/\n- virtual double Evaluate (const double u) = 0;\n+ virtual double Evaluate (const double& u) const = 0;\n \n protected: \n KernelFunction(){}; \n@@ -85,7 +86,7 @@\n * \\class GaussianKernelFunction\n * \\brief Gaussian kernel used for kernel function\/density estimation.\n *\n- * \\ingroup Operators\n+ * \\ingroup Functions\n *\n *\/\n class ITK_EXPORT GaussianKernelFunction : public KernelFunction\n@@ -114,7 +115,7 @@\n \/**\n * Evaluate the function.\n *\/\n- inline double Evaluate (const double u)\n+ inline double Evaluate (const double& u) const\n {\n return ( exp( -0.5 * vnl_math_sqr( u ) ) * m_Factor );\n }\n"} {"commit":"25f1234830855d9d7a5f1ab40241df971579e1af","subject":"png: Drop pixmap when not writing an image without pixels.","message":"png: Drop pixmap when not writing an image without pixels.\n","repos":"muennich\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,knielsen\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,muennich\/mupdf,sebras\/mupdf,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,poor-grad-student\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,sebras\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,muennich\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,ccxvii\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,sebras\/mupdf,knielsen\/mupdf,TamirEvan\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/fitz\/output-png.c\n+++ source\/fitz\/output-png.c\n@@ -314,7 +314,11 @@\n \tfz_var(pix2);\n \n \tif (pix->w == 0 || pix->h == 0)\n+\t{\n+\t\tif (drop)\n+\t\t\tfz_drop_pixmap(ctx, pix);\n \t\treturn NULL;\n+\t}\n \n \tif (color_params == NULL)\n \t\tcolor_params = fz_default_color_params(ctx);\n"} {"commit":"90fa6203ad032fe161d85a3e580941ce3d1216f0","subject":"Add SVG_TEXT_AS_TEXT define.","message":"Add SVG_TEXT_AS_TEXT define.\n\nBuild with this defined, and we no longer send text as\nreusable symbols, but instead send it as genuine text,\nwith all the potential problems (mismatching fonts etc)\nthat this entails.\n\nRequested by a customer.\n","repos":"muennich\/mupdf,fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,ccxvii\/mupdf,sebras\/mupdf,knielsen\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,sebras\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,ccxvii\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,ccxvii\/mupdf,muennich\/mupdf,poor-grad-student\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,ccxvii\/mupdf,ccxvii\/mupdf,muennich\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,knielsen\/mupdf,muennich\/mupdf,sebras\/mupdf,poor-grad-student\/mupdf,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/fitz\/svg-device.c\n+++ source\/fitz\/svg-device.c\n@@ -1,5 +1,11 @@\n #include \"fitz-imp.h\"\n #include \"glyph-cache-imp.h\"\n+\n+#ifdef SVG_TEXT_AS_TEXT\n+#define SVG_TEXT_ALPHA(A) A\n+#else\n+#define SVG_TEXT_ALPHA(A) 0\n+#endif\n \n typedef struct svg_device_s svg_device;\n \n@@ -595,14 +601,16 @@\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfz_printf(ctx, out, \"<text\");\n-\t\tsvg_dev_fill_color(ctx, sdev, colorspace, color, 0.0f);\n+\t\tsvg_dev_fill_color(ctx, sdev, colorspace, color, SVG_TEXT_ALPHA(alpha));\n \t\tsvg_dev_text_span(ctx, sdev, ctm, span);\n \t}\n+#ifndef SVG_TEXT_AS_TEXT\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfnt = svg_dev_text_span_as_paths_defs(ctx, dev, span, ctm);\n \t\tsvg_dev_text_span_as_paths_fill(ctx, dev, span, ctm, colorspace, color, alpha, fnt);\n \t}\n+#endif\n }\n \n static void\n@@ -617,14 +625,16 @@\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfz_printf(ctx, out, \"<text\");\n-\t\tsvg_dev_fill_color(ctx, sdev, colorspace, color, 0.0f);\n+\t\tsvg_dev_fill_color(ctx, sdev, colorspace, color, SVG_TEXT_ALPHA(alpha));\n \t\tsvg_dev_text_span(ctx, sdev, ctm, span);\n \t}\n+#ifndef SVG_TEXT_AS_TEXT\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfnt = svg_dev_text_span_as_paths_defs(ctx, dev, span, ctm);\n \t\tsvg_dev_text_span_as_paths_stroke(ctx, dev, span, stroke, ctm, colorspace, color, alpha, fnt);\n \t}\n+#endif\n }\n \n static void\n@@ -647,14 +657,16 @@\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfz_printf(ctx, out, \"<text\");\n-\t\tsvg_dev_fill_color(ctx, sdev, fz_device_rgb(ctx), white, 0.0f);\n+\t\tsvg_dev_fill_color(ctx, sdev, fz_device_rgb(ctx), white, SVG_TEXT_ALPHA(1));\n \t\tsvg_dev_text_span(ctx, sdev, ctm, span);\n \t}\n+#ifndef SVG_TEXT_AS_TEXT\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfnt = svg_dev_text_span_as_paths_defs(ctx, dev, span, ctm);\n \t\tsvg_dev_text_span_as_paths_fill(ctx, dev, span, ctm, fz_device_rgb(ctx), white, 1.0f, fnt);\n \t}\n+#endif\n \tfz_printf(ctx, out, \"<\/mask>\\n\");\n \tout = end_def(ctx, sdev);\n \tfz_printf(ctx, out, \"<g mask=\\\"url(#ma%d)\\\">\\n\", num);\n@@ -681,14 +693,16 @@\n \t{\n \t\tfz_printf(ctx, out, \"<text\");\n \t\tsvg_dev_stroke_state(ctx, sdev, stroke, &fz_identity);\n-\t\tsvg_dev_stroke_color(ctx, sdev, fz_device_rgb(ctx), white, 0.0f);\n+\t\tsvg_dev_stroke_color(ctx, sdev, fz_device_rgb(ctx), white, SVG_TEXT_ALPHA(1));\n \t\tsvg_dev_text_span(ctx, sdev, ctm, span);\n \t}\n+#ifndef SVG_TEXT_AS_TEXT\n \tfor (span = text->head; span; span = span->next)\n \t{\n \t\tfnt = svg_dev_text_span_as_paths_defs(ctx, dev, span, ctm);\n \t\tsvg_dev_text_span_as_paths_stroke(ctx, dev, span, stroke, ctm, fz_device_rgb(ctx), white, 1.0f, fnt);\n \t}\n+#endif\n \tfz_printf(ctx, out, \"<\/mask>\\n\");\n \tout = end_def(ctx, sdev);\n \tfz_printf(ctx, out, \"<g mask=\\\"url(#ma%d)\\\">\\n\", num);\n"} {"commit":"8d2d021fc369ce0b24206930ea46e9b1a94847a3","subject":"Handle byte integer arithmetic","message":"Handle byte integer arithmetic\n","repos":"mohamed-anwar\/avr-tcc,mohamed-anwar\/avr-tcc,mohamed-anwar\/avr-tcc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- avr-gen.c\n+++ avr-gen.c\n@@ -283,6 +283,7 @@\n fr = sv->r;\n ft = sv->type.t;\n fc = sv->c.ul;\n+ AVR_DEBUG(\"fr = %X, ft=%X, fc=%d\\n\", fr, ft, fc);\n \n v = fr & VT_VALMASK;\n if (fr & VT_LVAL) {\n@@ -305,7 +306,8 @@\n \/\/o(0xdb); \/* fldt *\/\n \/\/r = 5;\n } else if ((ft & VT_TYPE) == VT_BYTE) {\n- \/\/o(0xbe0f); \/* movsbl *\/\n+ AVR_DEBUG(\"ldd %s, Y%+d\\n\", reg_names[r], fc);\n+ o4(0x8 | ((fc >> 4) & 0x2), (0xC & (fc >> 1)) | (reg_idx[r] >> 4), reg_idx[r] & 0xF, 0x8 | (fc & 0x7));\n } else if ((ft & VT_TYPE) == (VT_BYTE | VT_UNSIGNED)) {\n \/\/o(0xb60f); \/* movzbl *\/\n } else if ((ft & VT_TYPE) == VT_SHORT) {\n@@ -434,7 +436,7 @@\n if ((vtop->r & (VT_VALMASK | VT_LVAL)) == VT_CONST) {\n \/* constant case *\/\n if (vtop->r & VT_SYM) {\n- AVR_DEBUG(\"reolcation\\n\");\n+ AVR_DEBUG(\"rcall .%d\\n\", vtop->sym->c);\n \/* relocation case *\/\n greloc(cur_text_section, vtop->sym,\n ind, R_AVR_13_PCREL);\n@@ -633,7 +635,7 @@\n {\n AVR_DEBUG(\"# gen_opi(op=%d)\\n\", op);\n \n- int r, _op;\n+ int r, _op, t;\n unsigned c, _c;\n \n switch (op) {\n@@ -645,28 +647,47 @@\n \/* Immediate Operand *\/\n int r2;\n vswap();\n- r = gv(RC_INT);\n- r2 = vtop->r2;\n+ t = vtop->type.t & VT_BTYPE;\n+\n+ if (t == VT_BYTE) {\n+ r = gv(RC_BYTE);\n+ } else {\n+ r = gv(RC_INT);\n+ r2 = vtop->r2;\n+ }\n+\n vswap();\n c = vtop->c.ui;\n \n- if (reg_idx[r] >= 24 && \n- reg_idx[r2] == reg_idx[r] + 1 &&\n- c >> 6 < 2) { \/* Could be done in utmost 2 ADIW operations *\/\n- while (c & 0x3F) {\n- _c = c & 0x3F;\n- AVR_DEBUG(\"adiw %s, %d\\n\", reg_names[r], c & 0x3F);\n- c >>= 6;\n+ if (t == VT_BYTE) {\n+ if (reg_idx[r] >= 16) { \/* Can use subi *\/\n+ c = _op? c : -c;\n+ AVR_DEBUG(\"subi %s, %d\\n\", reg_names[r], c & 0xFF);\n+ o4(0x5, (c >> 4) & 0xF, reg_idx[r], c & 0xF);\n+ } else {\n+ tcc_error(\"XXX: Operation on register unsupported\");\n }\n- } else if (reg_idx[r] >= 16) { \/* Can use subi and sbci *\/\n- c = -c;\n- AVR_DEBUG(\"subi %s, %d\\n\", reg_names[r], c & 0xFF);\n- o4(0x5, (c >> 4) & 0xF, reg_idx[r], c & 0xF);\n- c >>= 16;\n- AVR_DEBUG(\"sbci %s, %d\\n\", reg_names[r2], (c >> 8) & 0xFF);\n- o4(0x4, (c >> 4) & 0xF, reg_idx[r2], c & 0xF);\n } else {\n- tcc_error(\"XXX: Operation on register unsupported\");\n+ if (reg_idx[r] >= 24 && \n+ reg_idx[r2] == reg_idx[r] + 1 &&\n+ c >> 6 < 2) { \/* Could be done in utmost 2 ADIW operations *\/\n+ while (c & 0x3F) {\n+ _c = c & 0x3F;\n+ AVR_DEBUG(\"adiw %s, %d\\n\", reg_names[r], c & 0x3F);\n+ c >>= 6;\n+ }\n+ } else if (reg_idx[r] >= 16) { \/* Can use subi and sbci *\/\n+ c = _op? c : -c;\n+ AVR_DEBUG(\"subi %s, %d\\n\", reg_names[r], c & 0xFF);\n+ o4(0x5, (c >> 4) & 0xF, reg_idx[r], c & 0xF);\n+ c >>= 16;\n+ if (c) {\n+ AVR_DEBUG(\"sbci %s, %d\\n\", reg_names[r2], (c >> 8) & 0xFF);\n+ o4(0x4, (c >> 4) & 0xF, reg_idx[r2], c & 0xF);\n+ }\n+ } else {\n+ tcc_error(\"XXX: Operation on register unsupported\");\n+ }\n }\n } else {\n int r12, r21, r22;\n"} {"commit":"1d267afe7b13af8835f3b2f4de44972282f96911","subject":"Optimize svg text output.","message":"Optimize svg text output.\n\nEmit one <tspan> per line, so we only need to emit one 'y' coordinate\nfor the whole line, instead of repeating it for each character.\n","repos":"sebras\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,poor-grad-student\/mupdf,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,ccxvii\/mupdf,knielsen\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,knielsen\/mupdf,muennich\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ccxvii\/mupdf,sebras\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,poor-grad-student\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,sebras\/mupdf,sebras\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,ccxvii\/mupdf,poor-grad-student\/mupdf,muennich\/mupdf,sebras\/mupdf,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,knielsen\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/fitz\/svg-device.c\n+++ source\/fitz\/svg-device.c\n@@ -258,6 +258,48 @@\n \tif (p) *p = 0;\n }\n \n+static int\n+find_first_char(fz_context *ctx, const fz_text_span *span, int i)\n+{\n+\tfor (; i < span->len; ++i)\n+\t\tif (span->items[i].ucs >= 0)\n+\t\t\treturn i;\n+\treturn i;\n+}\n+\n+static int\n+find_next_line_break(fz_context *ctx, const fz_text_span *span, const fz_matrix *inv_tm, int i)\n+{\n+\tfz_point p, old_p;\n+\n+\told_p.x = span->items[i].x;\n+\told_p.y = span->items[i].y;\n+\tfz_transform_point(&old_p, inv_tm);\n+\n+\tfor (++i; i < span->len; ++i)\n+\t{\n+\t\tif (span->items[i].ucs >= 0)\n+\t\t{\n+\t\t\tp.x = span->items[i].x;\n+\t\t\tp.y = span->items[i].y;\n+\t\t\tfz_transform_point(&p, inv_tm);\n+\t\t\tif (span->wmode == 0)\n+\t\t\t{\n+\t\t\t\tif (p.y != old_p.y)\n+\t\t\t\t\treturn i;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t{\n+\t\t\t\tif (p.x != old_p.x)\n+\t\t\t\t\treturn i;\n+\t\t\t}\n+\t\t\told_p = p;\n+\t\t}\n+\t}\n+\n+\treturn i;\n+}\n+\n static void\n svg_dev_text_span(fz_context *ctx, svg_device *sdev, const fz_matrix *ctm, const fz_text_span *span)\n {\n@@ -268,7 +310,7 @@\n \tfz_point p;\n \tfloat font_size;\n \tfz_text_item *it;\n-\tint i, c;\n+\tint start, end, i;\n \n \tif (span->len == 0)\n \t{\n@@ -302,51 +344,49 @@\n \tif (is_italic) fz_printf(ctx, out, \" font-style=\\\"italic\\\"\");\n \tif (span->wmode != 0) fz_printf(ctx, out, \" writing-mode=\\\"tb\\\"\");\n \n-\tfz_puts(ctx, out, \" x=\\\"\");\n-\tfor (i=0; i < span->len; ++i)\n-\t{\n-\t\tit = &span->items[i];\n-\t\tif (it->ucs >= 0)\n-\t\t{\n-\t\t\tp.x = it->x;\n-\t\t\tp.y = it->y;\n-\t\t\tfz_transform_point(&p, &inv_tm);\n-\t\t\tif (i > 0)\n-\t\t\t\tfz_putc(ctx, out, ' ');\n-\t\t\tfz_printf(ctx, out, \"%g\", p.x);\n-\t\t}\n-\t}\n-\tfz_putc(ctx, out, '\"');\n-\n-\tfz_puts(ctx, out, \" y=\\\"\");\n-\tfor (i=0; i < span->len; ++i)\n-\t{\n-\t\tit = &span->items[i];\n-\t\tif (it->ucs >= 0)\n-\t\t{\n-\t\t\tp.x = it->x;\n-\t\t\tp.y = it->y;\n-\t\t\tfz_transform_point(&p, &inv_tm);\n-\t\t\tif (i > 0)\n-\t\t\t\tfz_putc(ctx, out, ' ');\n-\t\t\tfz_printf(ctx, out, \"%g\", p.y);\n-\t\t}\n-\t}\n-\tfz_putc(ctx, out, '\"');\n-\n \tfz_putc(ctx, out, '>');\n-\tfor (i=0; i < span->len; ++i)\n-\t{\n-\t\tit = &span->items[i];\n-\t\tif (it->ucs >= 0)\n-\t\t{\n-\t\t\tc = it->ucs;\n-\t\t\tif (c >= 32 && c <= 127 && c != '<' && c != '&' && c != '>')\n-\t\t\t\tfz_putc(ctx, out, c);\n-\t\t\telse\n-\t\t\t\tfz_printf(ctx, out, \"&#x%04x;\", c);\n-\t\t}\n-\t}\n+\n+\tstart = find_first_char(ctx, span, 0);\n+\twhile (start < span->len)\n+\t{\n+\t\tend = find_next_line_break(ctx, span, &inv_tm, start);\n+\n+\t\tp.x = span->items[start].x;\n+\t\tp.y = span->items[start].y;\n+\t\tfz_transform_point(&p, &inv_tm);\n+\t\tif (span->wmode == 0)\n+\t\t\tfz_printf(ctx, out, \"<tspan y=\\\"%g\\\" x=\\\"%g\", p.y, p.x);\n+\t\telse\n+\t\t\tfz_printf(ctx, out, \"<tspan x=\\\"%g\\\" y=\\\"%g\", p.x, p.y);\n+\t\tfor (i = start + 1; i < end; ++i)\n+\t\t{\n+\t\t\tit = &span->items[i];\n+\t\t\tif (it->ucs >= 0)\n+\t\t\t{\n+\t\t\t\tp.x = it->x;\n+\t\t\t\tp.y = it->y;\n+\t\t\t\tfz_transform_point(&p, &inv_tm);\n+\t\t\t\tfz_printf(ctx, out, \" %g\", span->wmode == 0 ? p.x : p.y);\n+\t\t\t}\n+\t\t}\n+\t\tfz_printf(ctx, out, \"\\\">\");\n+\t\tfor (i = start; i < end; ++i)\n+\t\t{\n+\t\t\tit = &span->items[i];\n+\t\t\tif (it->ucs >= 0)\n+\t\t\t{\n+\t\t\t\tint c = it->ucs;\n+\t\t\t\tif (c >= 32 && c <= 127 && c != '<' && c != '&' && c != '>')\n+\t\t\t\t\tfz_putc(ctx, out, c);\n+\t\t\t\telse\n+\t\t\t\t\tfz_printf(ctx, out, \"&#x%04x;\", c);\n+\t\t\t}\n+\t\t}\n+\t\tfz_printf(ctx, out, \"<\/tspan>\");\n+\n+\t\tstart = find_first_char(ctx, span, end);\n+\t}\n+\n \tfz_printf(ctx, out, \"<\/text>\\n\");\n }\n \n"} {"commit":"b3e19c98e72a14eb7362678a390e5236924f8240","subject":"Clean up error handling around do_instruction","message":"Clean up error handling around do_instruction\n\nNo more calls to die().\n","repos":"dpw\/avrchap","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- avrchap.c\n+++ avrchap.c\n@@ -13,34 +13,6 @@\n \n #include <linux\/spi\/spidev.h>\n \n-static void die(const char *fmt, ...)\n-\t__attribute__ ((noreturn,format (printf, 1, 2)));\n-static void die_errno(const char *fmt, ...)\n-\t__attribute__ ((noreturn,format (printf, 1, 2)));\n-\n-static void die(const char *fmt, ...)\n-{\n- va_list ap;\n-\n- va_start(ap, fmt);\n- vfprintf(stderr, fmt, ap);\n- va_end(ap);\n-\tputc('\\n', stderr);\n- exit(1);\n-}\n-\n-static void die_errno(const char *fmt, ...)\n-{\n- va_list ap;\n-\n- va_start(ap, fmt);\n- vfprintf(stderr, fmt, ap);\n- va_end(ap);\n-\n- fprintf(stderr, \": %s\\n\", strerror(errno));\n- exit(1);\n-}\n-\n static void die_alloc()\n {\n \tfprintf(stderr, \"failed to allocate memory\\n\");\n@@ -187,7 +159,7 @@\n \treturn -1;\n }\n \n-static void do_instruction(int fd, uint8_t tx[4], uint8_t rx[4])\n+static int do_instruction(int fd, uint8_t tx[4], uint8_t rx[4])\n {\n \tstruct spi_ioc_transfer xfer;\n \tint res;\n@@ -198,14 +170,18 @@\n \txfer.len = 4;\n \n \tres = ioctl(fd, SPI_IOC_MESSAGE(1), &xfer);\n+\tif (res == 4)\n+\t\treturn 1;\n+\n \tif (res < 0)\n-\t\tdie_errno(\"SPI_IOC_MESSAGE\");\n-\n-\tif (res < 4)\n-\t\tdie(\"short response from SPI_IOC_MESSAGE\");\n-}\n-\n-static void read_signature(int fd, uint8_t sig[4])\n+\t\tprint_err(\"SPI_IOC_MESSAGE\");\n+\telse\n+\t\tprint_err(\"short response from SPI_IOC_MESSAGE\");\n+\n+\treturn 0;\n+}\n+\n+static int read_signature(int fd, uint8_t sig[4])\n {\n \tuint8_t tx[4], rx[4];\n \tuint8_t i;\n@@ -215,9 +191,13 @@\n \n \tfor (i = 0; i < 4; i++) {\n \t\ttx[2] = i;\n-\t\tdo_instruction(fd, tx, rx);\n+\t\tif (!do_instruction(fd, tx, rx))\n+\t\t\treturn 0;\n+\n \t\tsig[i] = rx[3];\n \t}\n+\n+\treturn 1;\n }\n \n static int hex_digit(unsigned char c, const char *path)\n@@ -431,7 +411,7 @@\n \treturn 0;\n }\n \n-static void load_page(int spidev, uint8_t *data, unsigned int len)\n+static int load_page(int spidev, uint8_t *data, unsigned int len)\n {\n \tunsigned int i = 0;\n \tuint8_t tx[4], rx[4];\n@@ -443,17 +423,21 @@\n \t\ttx[0] = 0x40;\n \t\ttx[2] = i++;\n \t\ttx[3] = *data++;\n-\t\tdo_instruction(spidev, tx, rx);\n+\t\tif (!do_instruction(spidev, tx, rx))\n+\t\t\treturn 0;\n \n \t\ttx[0] = 0x48;\n \t\ttx[3] = *data++;\n-\t\tdo_instruction(spidev, tx, rx);\n+\t\tif (!do_instruction(spidev, tx, rx))\n+\t\t\treturn 0;\n \n \t\tlen -= 2;\n \t}\n-}\n-\n-static void write_program_page(int spidev, unsigned int addr)\n+\n+\treturn 1;\n+}\n+\n+static int write_program_page(int spidev, unsigned int addr)\n {\n \tuint8_t tx[4], rx[4];\n \tint i;\n@@ -464,7 +448,8 @@\n \ttx[2] = addr >> 1;\n \ttx[3] = 0;\n \n-\tdo_instruction(spidev, tx, rx);\n+\tif (!do_instruction(spidev, tx, rx))\n+\t\treturn 0;\n \n \t\/* Wait until the Flash write is completed. *\/\n \ttx[0] = 0xf0;\n@@ -472,15 +457,19 @@\n \n \tfor (i = 0; i < 100; i++) {\n \t\tusleep(1000);\n-\t\tdo_instruction(spidev, tx, rx);\n+\n+\t\tif (!do_instruction(spidev, tx, rx))\n+\t\t\treturn 0;\n+\n \t\tif (!(rx[3] & 1))\n-\t\t\treturn;\n-\t}\n-\n-\tdie(\"Timed out waiting for program memory page write to complete\");\n-}\n-\n-static void write_program(int spidev, struct hex *hex)\n+\t\t\treturn 1;\n+\t}\n+\n+\tprint_err(\"Time out waiting for program memory page write to complete\");\n+\treturn 0;\n+}\n+\n+static int write_program(int spidev, struct hex *hex)\n {\n \tconst unsigned int page_len = 128;\n \tunsigned int addr, len;\n@@ -488,18 +477,24 @@\n \n \tdata = hex->data;\n \tlen = hex->len;\n-\tif (len & 1)\n-\t\tdie(\"Program is not a whole number of words\");\n+\tif (len & 1) {\n+\t\tprint_err(\"Program is not a whole number of words\");\n+\t\treturn 0;\n+\t}\n \n \taddr = hex->origin;\n-\tif (addr & (page_len - 1))\n-\t\tdie(\"Program does not start on page boundary\");\n+\tif (addr & (page_len - 1)) {\n+\t\tprint_err(\"Program does not start on page boundary\");\n+\t\treturn 0;\n+\t}\n \n \tfprintf(stderr, \"Writing program: \");\n \n \twhile (len >= page_len) {\n-\t\tload_page(spidev, data, page_len);\n-\t\twrite_program_page(spidev, addr);\n+\t\tif (!load_page(spidev, data, page_len)\n+\t\t || !write_program_page(spidev, addr))\n+\t\t\treturn 0;\n+\n \t\tputc('.', stderr);\n \t\tdata += page_len;\n \t\tlen -= page_len;\n@@ -507,15 +502,18 @@\n \t}\n \n \tif (len) {\n-\t\tload_page(spidev, data, len);\n-\t\twrite_program_page(spidev, addr);\n+\t\tif (!load_page(spidev, data, len)\n+\t\t || !write_program_page(spidev, addr))\n+\t\t\treturn 0;\n+\n \t\tputc('.', stderr);\n \t}\n \n \tputc('\\n', stderr);\n-}\n-\n-static void verify_program(int spidev, struct hex *hex)\n+\treturn 1;\n+}\n+\n+static int verify_program(int spidev, struct hex *hex)\n {\n \tunsigned int addr, len;\n \tuint8_t *data;\n@@ -523,8 +521,10 @@\n \n \tdata = hex->data;\n \tlen = hex->len;\n-\tif (len & 1)\n-\t\tdie(\"Program is not a whole number of words\");\n+\tif (len & 1) {\n+\t\tprint_err(\"Program is not a whole number of words\");\n+\t\treturn 0;\n+\t}\n \n \taddr = hex->origin;\n \n@@ -538,14 +538,18 @@\n \t\ttx[1] = addr >> 9;\n \t\ttx[2] = addr >> 1;\n \t\ttx[3] = 0;\n-\t\tdo_instruction(spidev, tx, rx);\n+\t\tif (!do_instruction(spidev, tx, rx))\n+\t\t\treturn 0;\n+\n \t\tif (rx[3] != *data)\n \t\t\tgoto mismatch;\n \n \t\tdata++;\n \t\taddr++;\n \t\ttx[0] = 0x28;\n-\t\tdo_instruction(spidev, tx, rx);\n+\t\tif (!do_instruction(spidev, tx, rx))\n+\t\t\treturn 0;\n+\n \t\tif (rx[3] != *data)\n \t\t\tgoto mismatch;\n \n@@ -555,11 +559,12 @@\n \t}\n \n \tputc('\\n', stderr);\n-\treturn;\n+\treturn 1;\n \n mismatch:\n-\tdie(\"\\nVerification error: Expected %x, got %x at address %x\",\n-\t *data, rx[3], addr);\n+\tprint_err(\"\\nVerification error: Expected %x, got %x at address %x\",\n+\t\t *data, rx[3], addr);\n+\treturn 0;\n }\n \n int main(int argc, char **argv)\n@@ -589,7 +594,9 @@\n \ttx[0] = 0xac;\n \ttx[1] = 0x53;\n \ttx[2] = tx[3] = 0;\n-\tdo_instruction(spidev, tx, rx);\n+\tif (!do_instruction(spidev, tx, rx))\n+\t\tgoto err_close_spidev;\n+\n \tif (rx[2] != 0x53) {\n \t\tfprintf(stderr,\n \t\t\t\"Unacknowledged 'Programming Enable' instruction \"\n@@ -598,12 +605,16 @@\n \t\tgoto err_close_spidev;\n \t}\n \n-\tread_signature(spidev, rx);\n+\tif (!read_signature(spidev, rx))\n+\t\tgoto err_close_spidev;\n+\n \tfprintf(stderr, \"Signature: %02x %02x %02x %02x\\n\",\n \t\trx[0], rx[1], rx[2], rx[3]);\n \n-\twrite_program(spidev, &hex);\n-\tverify_program(spidev, &hex);\n+\tif (!write_program(spidev, &hex)\n+\t || !verify_program(spidev, &hex))\n+\t\tgoto err_close_spidev;\n+\n \tclose(spidev);\n \treturn 0;\n \n"} {"commit":"3fd4b7b6d8e7b3e84d7131075a93772f6d338313","subject":"#00000","message":"#00000\n\nTESTS_RAN: manually\n\nFix memory leaks in SDFCreateBufferedObject and SDFFinishEnumeration\n\n\n\ngit-svn-id: d1c2905f61b4ba12f871876155ef23cf296c0275@1322 01a69087-22d5-4a29-8152-8a1d5e10e5e9\n","repos":"SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- api\/sdf.c\n+++ api\/sdf.c\n@@ -1262,7 +1262,7 @@\n \n pac = (SDF_action_init_t *) sdf_thread_state;\n \n-#if 1\n+#if 0\n struct SDF_shared_state *state = &sdf_shared_state;\n flashDev_t *flash_dev;\n struct SDF_iterator *iterator;\n@@ -1671,6 +1671,8 @@\n uint64_t curr_seqno;\n uint32_t version;\n \n+\tplat_assert(iterator);\n+\n \/\/ stop the backup\n status = backup_container( iterator->shard,\n 1, \/\/ full\n@@ -1681,6 +1683,8 @@\n &prev_seqno,\n &curr_seqno,\n &backup_time );\n+\n+\tplat_free(iterator);\n \n return(status);\n }\n@@ -1717,6 +1721,8 @@\n SDF_status_t ret;\n SDF_action_init_t *pai = (SDF_action_init_t *) sdf_thread_state;\n \n+\tplat_assert(iterator);\n+\n ret = process_raw_get_command_enum(\n \t\t\t\t (mcd_osd_shard_t *) iterator->shard,\n \t\t\t\t (osd_state_t *) pai->paio_ctxt,\n"} {"commit":"5ab2703476971d355af12a70072df613dc0cc00e","subject":"delay cast from NumbaFunctionObject* to PyObject*","message":"delay cast from NumbaFunctionObject* to PyObject*\n","repos":"sklam\/numba,gmarkall\/numba,stuartarchibald\/numba,stuartarchibald\/numba,IntelLabs\/numba,stonebig\/numba,pombredanne\/numba,gdementen\/numba,stefanseefeld\/numba,jriehl\/numba,stonebig\/numba,ssarangi\/numba,jriehl\/numba,numba\/numba,cpcloud\/numba,sklam\/numba,pitrou\/numba,stuartarchibald\/numba,sklam\/numba,shiquanwang\/numba,sklam\/numba,numba\/numba,ssarangi\/numba,gmarkall\/numba,stefanseefeld\/numba,seibert\/numba,pitrou\/numba,sklam\/numba,IntelLabs\/numba,cpcloud\/numba,stuartarchibald\/numba,seibert\/numba,stefanseefeld\/numba,numba\/numba,stonebig\/numba,GaZ3ll3\/numba,pitrou\/numba,GaZ3ll3\/numba,seibert\/numba,pitrou\/numba,seibert\/numba,gdementen\/numba,IntelLabs\/numba,cpcloud\/numba,ssarangi\/numba,stuartarchibald\/numba,stefanseefeld\/numba,numba\/numba,cpcloud\/numba,shiquanwang\/numba,seibert\/numba,pombredanne\/numba,gmarkall\/numba,IntelLabs\/numba,IntelLabs\/numba,stonebig\/numba,ssarangi\/numba,gdementen\/numba,gmarkall\/numba,GaZ3ll3\/numba,gdementen\/numba,jriehl\/numba,cpcloud\/numba,gdementen\/numba,ssarangi\/numba,shiquanwang\/numba,pombredanne\/numba,numba\/numba,pitrou\/numba,GaZ3ll3\/numba,jriehl\/numba,stonebig\/numba,gmarkall\/numba,GaZ3ll3\/numba,pombredanne\/numba,pombredanne\/numba,stefanseefeld\/numba,jriehl\/numba","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- numba\/numbafunction.c\n+++ numba\/numbafunction.c\n@@ -63,11 +63,11 @@\n \n static PyTypeObject *NumbaFunctionType = 0;\n \n-static PyObject *NumbaFunction_New(PyTypeObject *type,\n- PyMethodDef *ml, int flags,\n- PyObject *closure,\n- PyObject *self, PyObject *module,\n- PyObject* code);\n+static NumbaFunctionObject *NumbaFunction_New(PyTypeObject *type,\n+ PyMethodDef *ml, int flags,\n+ PyObject *closure,\n+ PyObject *self, PyObject *module,\n+ PyObject* code);\n \n static NUMBA_INLINE void *NumbaFunction_InitDefaults(PyObject *m,\n size_t size,\n@@ -285,7 +285,7 @@\n };\n \n \n-static PyObject *NumbaFunction_New(\n+static NumbaFunctionObject *NumbaFunction_New(\n PyTypeObject *type, PyMethodDef *ml, int flags, PyObject *closure,\n PyObject *module, PyObject *code, PyObject *keep_alive)\n {\n@@ -319,8 +319,8 @@\n op->native_func = NULL;\n op->native_signature = NULL;\n \n- PyObject_GC_Track(op);\n- return (PyObject *) op;\n+ PyObject_GC_Track((PyObject *)op);\n+ return op;\n }\n \n \/* Create a new function and set the closure scope *\/\n@@ -337,7 +337,7 @@\n Py_XINCREF(native_signature);\n result->native_signature = native_signature;\n }\n- return result;\n+ return (PyObject *)result;\n }\n \n static int\n"} {"commit":"48ef98ab3c01dfb4b45ed86f9754e3f354d8eb5a","subject":"ensure close() doesn't get interrupted","message":"ensure close() doesn't get interrupted\n","repos":"GravisZro\/pdtk,GravisZro\/pdtk","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- asocket.h\n+++ asocket.h\n@@ -7,7 +7,7 @@\n #include <mutex>\n #include <condition_variable>\n \n-\/\/ project\n+\/\/ PDTK\n #include \"object.h\"\n #include \"cxxutils\/socket_helpers.h\"\n #include \"cxxutils\/vqueue.h\"\n@@ -41,7 +41,7 @@\n struct async_pkg_t\n {\n inline async_pkg_t(void) : buffer(0) { } \/\/ empty buffer\n- inline ~async_pkg_t(void) { ::close(socket); thread.detach(); }\n+ inline ~async_pkg_t(void) { posix::close(socket); thread.detach(); }\n posix::fd_t socket;\n vqueue buffer;\n std::thread thread;\n"} {"commit":"ad89fab4d37d5d97ac1a175ce2cff5dc28c99aa8","subject":"Messing around with the settings.","message":"Messing around with the settings.\n","repos":"silky\/frequensea,fdb\/frequensea,fdb\/frequensea,fdb\/frequensea,silky\/frequensea,silky\/frequensea,silky\/frequensea,silky\/frequensea,fdb\/frequensea,fdb\/frequensea","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/audio.c\n+++ c\/audio.c\n@@ -55,7 +55,7 @@\n ALuint buffer;\n ALenum format = AL_FORMAT_MONO8;\n const ALsizei freq = 48000;\n-const ALsizei size = freq * 3;\n+const ALsizei size = freq * 5;\n ALuint source;\n \n ALuint *data;\n@@ -70,7 +70,7 @@\n for (int i = 0; i < transfer->valid_length; i += 200) {\n float ii = transfer->buffer[i];\n float qq = transfer->buffer[i+1];\n- int mag = sqrt(ii * ii + qq * qq) * 1;\n+ ALuint mag = sqrt(ii * ii + qq * qq) * 1;\n data[received_size++] = mag ;\n }\n printf(\"Received %.1f%%\\n\", received_size \/ (float)size * 100);\n@@ -90,7 +90,7 @@\n int status;\n hackrf_device *hrf;\n \n- data = calloc(size, sizeof(ALuint));\n+ data = calloc(size + freq, sizeof(ALuint)); \/\/ We need a bit of extra data because we go over the buffer size.\n \n \/\/ Initialize the audio context\n ALCdevice *device = alcOpenDevice(NULL);\n@@ -130,7 +130,7 @@\n status = hackrf_open(&hrf);\n HACKRF_CHECK_STATUS(hrf, status, \"hackrf_open\");\n \n- status = hackrf_set_freq(hrf, 124.2e6);\n+ status = hackrf_set_freq(hrf, 124.20005e6);\n HACKRF_CHECK_STATUS(hrf, status, \"hackrf_set_freq\");\n \n status = hackrf_set_sample_rate(hrf, 5e6);\n@@ -150,7 +150,7 @@\n \n \n \/\/ Playing is asynchronous so wait a while\n- sleep(7);\n+ sleep(10);\n \n \/\/ Cleanup\n alDeleteBuffers(1, &buffer);\n"} {"commit":"571dc137e395cdf33b55f7e559562cbf7970b5a1","subject":"Simple C print test","message":"Simple C print test\n\n.0f \ucd9c\ub825 \ud655\uc778\uc744 \uc704\ud55c \ucf54\ub4dc \uc791\uc131\n","repos":"honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice,honux77\/practice","returncode":1,"stderr":"error: pathspec 'c\/print.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- c\/print.c\n+++ c\/print.c\n@@ -0,0 +1,7 @@\n+#include <stdio.h>\n+\n+int main() {\n+\tprintf(\"%.0f\\n\", (double) 11 \/ 2);\n+\treturn 0;\n+}\n+\n"} {"commit":"228f1d0018ba6b24c9f718a97a5bc35b24f1e1e3","subject":"workqueue: remove @wakeup from worker_set_flags()","message":"workqueue: remove @wakeup from worker_set_flags()\n\nworker_set_flags() has only two callers, each specifying %true and\n%false for @wakeup. Let's push the wake up to the caller and remove\n@wakeup from worker_set_flags(). The caller can use the following\ninstead if wakeup is necessary:\n\n\tworker_set_flags();\n\tif (need_more_worker(pool))\n \t\twake_up_worker(pool);\n\nThis makes the code simpler. This patch doesn't introduce behavior\nchanges.\n\ntj: Updated description and comments.\n\nSigned-off-by: Lai Jiangshan <4c9eb49378914b743bdd32292c04df29b820d73e@cn.fujitsu.com>\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/workqueue.c\n+++ kernel\/workqueue.c\n@@ -867,35 +867,22 @@\n * worker_set_flags - set worker flags and adjust nr_running accordingly\n * @worker: self\n * @flags: flags to set\n- * @wakeup: wakeup an idle worker if necessary\n- *\n- * Set @flags in @worker->flags and adjust nr_running accordingly. If\n- * nr_running becomes zero and @wakeup is %true, an idle worker is\n- * woken up.\n+ *\n+ * Set @flags in @worker->flags and adjust nr_running accordingly.\n *\n * CONTEXT:\n * spin_lock_irq(pool->lock)\n *\/\n-static inline void worker_set_flags(struct worker *worker, unsigned int flags,\n-\t\t\t\t bool wakeup)\n+static inline void worker_set_flags(struct worker *worker, unsigned int flags)\n {\n \tstruct worker_pool *pool = worker->pool;\n \n \tWARN_ON_ONCE(worker->task != current);\n \n-\t\/*\n-\t * If transitioning into NOT_RUNNING, adjust nr_running and\n-\t * wake up an idle worker as necessary if requested by\n-\t * @wakeup.\n-\t *\/\n+\t\/* If transitioning into NOT_RUNNING, adjust nr_running. *\/\n \tif ((flags & WORKER_NOT_RUNNING) &&\n \t !(worker->flags & WORKER_NOT_RUNNING)) {\n-\t\tif (wakeup) {\n-\t\t\tif (atomic_dec_and_test(&pool->nr_running) &&\n-\t\t\t !list_empty(&pool->worklist))\n-\t\t\t\twake_up_worker(pool);\n-\t\t} else\n-\t\t\tatomic_dec(&pool->nr_running);\n+\t\tatomic_dec(&pool->nr_running);\n \t}\n \n \tworker->flags |= flags;\n@@ -2041,18 +2028,20 @@\n \tlist_del_init(&work->entry);\n \n \t\/*\n-\t * CPU intensive works don't participate in concurrency\n-\t * management. They're the scheduler's responsibility.\n+\t * CPU intensive works don't participate in concurrency management.\n+\t * They're the scheduler's responsibility. This takes @worker out\n+\t * of concurrency management and the next code block will chain\n+\t * execution of the pending work items.\n \t *\/\n \tif (unlikely(cpu_intensive))\n-\t\tworker_set_flags(worker, WORKER_CPU_INTENSIVE, true);\n+\t\tworker_set_flags(worker, WORKER_CPU_INTENSIVE);\n \n \t\/*\n \t * Wake up another worker if necessary. The condition is always\n \t * false for normal per-cpu workers since nr_running would always\n \t * be >= 1 at this point. This is used to chain execution of the\n \t * pending work items for WORKER_NOT_RUNNING workers such as the\n-\t * UNBOUND ones.\n+\t * UNBOUND and CPU_INTENSIVE ones.\n \t *\/\n \tif (need_more_worker(pool))\n \t\twake_up_worker(pool);\n@@ -2210,7 +2199,7 @@\n \t\t}\n \t} while (keep_working(pool));\n \n-\tworker_set_flags(worker, WORKER_PREP, false);\n+\tworker_set_flags(worker, WORKER_PREP);\n sleep:\n \t\/*\n \t * pool->lock is held and there's no work to process and no need to\n"} {"commit":"70ab5027ca454797e87a3993d4671b9c6f4b2cda","subject":"disallow invalid subblock addresses","message":"disallow invalid subblock addresses\n","repos":"marcel-goldschen-ohm\/EigenLab","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- EigenLab.h\n+++ EigenLab.h\n@@ -198,6 +198,7 @@\n \t\t\n \t\tvoid evalNumericRange(const std::string & str, Value<Derived> & mat);\n \t\tinline bool isVariable(const std::string & name) const { return mVariables.count(name) > 0; }\n+\t\tbool isBlockValid(const Derived & map, typename ChunkArray::iterator & it);\n \t\tinline bool isOperator(const char c) const { return (std::find(mOperators1.begin(), mOperators1.end(), c) != mOperators1.end()); }\n \t\tbool isOperator(const std::string & str) const;\n \t\tinline bool isFunction(const std::string & str) const { return (std::find(mFunctions.begin(), mFunctions.end(), str) != mFunctions.end()); }\n@@ -1104,7 +1105,19 @@\n \t\t}\n \t\treturn false;\n \t}\n-\t\n+\n+\ttemplate <typename Derived>\n+\tbool Parser<Derived>::isBlockValid(const Derived & map, typename ChunkArray::iterator & it)\n+\t{\n+\t\treturn\n+\t\t\tmap.rows() >= it->row0 + it->rows &&\n+\t\t\tmap.cols() >= it->col0 + it->cols &&\n+\t\t\tit->row0 >= 0 &&\n+\t\t\tit->col0 >= 0 &&\n+\t\t\tit->rows >= 0 &&\n+\t\t\tit->cols >= 0;\n+\t}\n+\n \ttemplate <typename Derived>\n \tvoid Parser<Derived>::evalIndices(ChunkArray & chunks)\n \t{\n@@ -1116,12 +1129,16 @@\n \t\tfor(typename ChunkArray::iterator it = chunks.begin(); it != chunks.end(); it++) {\n \t\t\tif(it->row0 != -1 && (it->type == VALUE || (it->type == VARIABLE && (it + 1 == chunks.end() || (it + 1)->type != OPERATOR || (it + 1)->field != \"=\")))) {\n \t\t\t\tif(it->type == VALUE) {\n+\t\t\t\t\tif (!isBlockValid(it->value.local(), it))\n+\t\t\t\t\t\tthrow std::runtime_error(\"Invalid submatrix bounds '\" + it->field + \"'.\");\n \t\t\t\t\tDerived temp = it->value.local().block(it->row0, it->col0, it->rows, it->cols);\n \t\t\t\t\tit->value.local() = temp;\n \t\t\t\t\tit->value.mapLocal();\n \t\t\t\t} else { \/\/if(it->type == VARIABLE) {\n \t\t\t\t\tif(!isVariable(it->field))\n \t\t\t\t\t\tthrow std::runtime_error(\"Attempted indexing into uninitialized variable '\" + it->field + \"'.\");\n+\t\t\t\t\tif (!isBlockValid(mVariables[it->field].matrix(), it))\n+\t\t\t\t\t\tthrow std::runtime_error(\"Invalid submatrix bounds '\" + it->field + \"'.\");\n \t\t\t\t\tit->value.local() = mVariables[it->field].matrix().block(it->row0, it->col0, it->rows, it->cols);\n \t\t\t\t\tit->value.mapLocal();\n \t\t\t\t\tit->type = VALUE;\n@@ -1465,6 +1482,8 @@\n \t\t\t\t\t\t} else { \/\/if(lhs->row0 != -1) {\n \t\t\t\t\t\t\tif (lhs->rows != rhs->value.matrix().rows() || lhs->cols != rhs->value.matrix().cols())\n \t\t\t\t\t\t\t\tthrow std::runtime_error(\"Attempted assigment of sub-matrix '\" + lhs->field + \"' from wrong sized source '\" + rhs->field + \"'.\");\n+\t\t\t\t\t\t\tif (!isBlockValid(lhs->value.matrix(), lhs))\n+\t\t\t\t\t\t\t\tthrow std::runtime_error(\"Invalid submatrix bounds '\" + lhs->field + \"'.\");\n \t\t\t\t\t\t\tlhs->value.matrix().block(lhs->row0, lhs->col0, lhs->rows, lhs->cols) = rhs->value.matrix();\n \t\t\t\t\t\t\tlhs->value.local() = rhs->value.matrix();\n \t\t\t\t\t\t\tlhs->value.mapLocal();\n@@ -1982,7 +2001,16 @@\n \t\tresultMatrix = a34.block(1, 2, 2, 2);\n \t\tif(resultMatrix.isApprox(resultValue.matrix())) std::cout << \"OK\" << std::endl;\n \t\telse { std::cout << \"FAIL\" << std::endl; ++numFails; }\n-\t\t\n+\n+\t\ttry {\n+\t\t\tstd::cout << \"Test invalid submatrix block access: a(1:2,2:8)\";\n+\t\t\tresultValue = eval(\"a(1:2,2:8)\"); \/\/ <-- Should NOT succeed!!!\n+\t\t\tstd::cout << \"FAIL\" << std::endl; ++numFails;\n+\t\t} catch(std::runtime_error &err) {\n+\t\t\tstd::cout << err.what() << std::endl;\n+\t\t\tstd::cout << \"Exception caught, so we're OK\" << std::endl;\n+\t\t}\n+\n \t\tstd::cout << \"Test submatrix block access using 'end' and ':' identifiers a(i:end,:): \";\n \t\tresultValue = eval(\"a(1:end,:)\");\n \t\tresultMatrix = a34.block(1, 0, a34.rows() - 1, a34.cols());\n"} {"commit":"20f89fc8e0c68ac2011956cbd6db762fde1c0c16","subject":"Typo fix.","message":"Typo fix.\n","repos":"adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm,adeschamps\/lcm","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"b63c54893fae250aab2ddcd654d6bd5e9fa31b34","subject":"Fix behaviour for 'mkdir -m 777 \/ \/tmp\/foo'. Play \"guess the style bug\" with Bruce again.","message":"Fix behaviour for 'mkdir -m 777 \/ \/tmp\/foo'. Play \"guess the style bug\"\nwith Bruce again.\n\nReported by:\tbde\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bin\/mkdir\/mkdir.c\n+++ bin\/mkdir\/mkdir.c\n@@ -63,7 +63,7 @@\n \tint argc;\n \tchar *argv[];\n {\n-\tint ch, exitval, omode, pflag;\n+\tint ch, exitval, success, omode, pflag;\n \tmode_t *set = (mode_t *)NULL;\n \tchar *mode;\n \n@@ -96,13 +96,16 @@\n \t}\n \n \tfor (exitval = 0; *argv != NULL; ++argv) {\n+\t\tsuccess = 1;\n \t\tif (pflag) {\n \t\t\tif (build(*argv, omode))\n-\t\t\t\texitval = 1;\n+\t\t\t\tsuccess = 0;\n \t\t} else if (mkdir(*argv, omode) < 0) {\n \t\t\twarn(\"%s\", *argv);\n+\t\t\tsuccess = 0;\n+\t\t}\n+\t\tif (!success)\n \t\t\texitval = 1;\n-\t\t}\n \t\t\/*\n \t\t * The mkdir() and umask() calls both honor only the low\n \t\t * nine bits, so if you try to set a mode including the\n@@ -110,9 +113,8 @@\n \t\t * this unless the user has specifically requested a mode,\n \t\t * as chmod will (obviously) ignore the umask.\n \t\t *\/\n-\t\tif ((exitval == 0) && \n-\t\t (mode != NULL) && (chmod(*argv, omode) == -1)) {\n-\t\t\twarn(\"chmod %s\", *argv);\n+\t\tif (success && mode != NULL && chmod(*argv, omode) == -1) {\n+\t\t\twarn(\"%s\", *argv);\n \t\t\texitval = 1;\n \t\t}\n \t}\n"} {"commit":"b567992d5c0f0ace6e93fb60479d98223f42ff73","subject":"copyright and email update","message":"copyright and email update\n\ngit-svn-id: 9146c88ff6d39b48099bf954d15d68f687b3fa69@9839 28e8926c-6b08-0410-baaa-805c5e19b8d6\n","repos":"acontes\/programming,lpellegr\/programming,mnip91\/programming-multiactivities,fviale\/programming,ow2-proactive\/programming,mnip91\/proactive-component-monitoring,lpellegr\/programming,acontes\/programming,mnip91\/proactive-component-monitoring,lpellegr\/programming,ow2-proactive\/programming,acontes\/programming,lpellegr\/programming,mnip91\/programming-multiactivities,fviale\/programming,mnip91\/programming-multiactivities,mnip91\/proactive-component-monitoring,PaulKh\/scale-proactive,mnip91\/proactive-component-monitoring,jrochas\/scale-proactive,paraita\/programming,fviale\/programming,mnip91\/programming-multiactivities,PaulKh\/scale-proactive,ow2-proactive\/programming,acontes\/programming,jrochas\/scale-proactive,ow2-proactive\/programming,ow2-proactive\/programming,paraita\/programming,paraita\/programming,PaulKh\/scale-proactive,jrochas\/scale-proactive,mnip91\/programming-multiactivities,ow2-proactive\/programming,PaulKh\/scale-proactive,PaulKh\/scale-proactive,fviale\/programming,acontes\/programming,paraita\/programming,mnip91\/programming-multiactivities,jrochas\/scale-proactive,acontes\/programming,paraita\/programming,jrochas\/scale-proactive,mnip91\/proactive-component-monitoring,lpellegr\/programming,jrochas\/scale-proactive,fviale\/programming,lpellegr\/programming,paraita\/programming,mnip91\/proactive-component-monitoring,jrochas\/scale-proactive,acontes\/programming,fviale\/programming,PaulKh\/scale-proactive,PaulKh\/scale-proactive","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- doc-src\/mpi_files\/jacobi.c\n+++ doc-src\/mpi_files\/jacobi.c\n@@ -4,8 +4,8 @@\n * ProActive: The Java(TM) library for Parallel, Distributed, Concurrent\n * computing with Security and Mobility\n * \n- * Copyright (C) 1997-2005 INRIA\/University of Nice-Sophia Antipolis Contact:\n- * proactive@objectweb.org\n+ * Copyright (C) 1997-2008 INRIA\/University of Nice-Sophia Antipolis Contact:\n+ * proactive@ow2.org\n * \n * This library is free software; you can redistribute it and\/or modify it under\n * the terms of the GNU Lesser General Public License as published by the Free\n"} {"commit":"097a2e4c8849d4938d8a027985ce3816fd9785ed","subject":"Add target field field to BNRelocationInfo structure","message":"Add target field field to BNRelocationInfo structure\n","repos":"Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,joshwatson\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- binaryninjacore.h\n+++ binaryninjacore.h\n@@ -1148,6 +1148,7 @@\n \t\tsize_t symbolIndex; \/\/ Index into symbol table\n \t\tsize_t sectionIndex; \/\/ Index into the section table\n \t\tuint64_t address; \/\/ Absolute address or segment offset\n+\t\tuint64_t target; \/\/ Target (set automatically)\n \t\tbool dataRelocation; \/\/ This relocation is effecting data not code\n \t\tuint8_t relocationDataCache[MAX_RELOCATION_SIZE];\n \t\tstruct BNRelocationInfo* prev; \/\/ Link to relocation another related relocation\n"} {"commit":"19b66619718e8b114db2fefc498018af44010ac6","subject":"Add API to get file size","message":"Add API to get file size\n","repos":"Vector35\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- binaryninjacore.h\n+++ binaryninjacore.h\n@@ -3325,6 +3325,7 @@\n \tBINARYNINJACOREAPI bool BNPathExists(const char* path);\n \tBINARYNINJACOREAPI bool BNIsPathDirectory(const char* path);\n \tBINARYNINJACOREAPI bool BNIsPathRegularFile(const char* path);\n+\tBINARYNINJACOREAPI bool BNFileSize(const char* path, uint64_t* size);\n \n \t\/\/ Settings APIs\n \tBINARYNINJACOREAPI bool BNSettingGetBool(const char* settingGroup, const char* name, bool defaultValue);\n"} {"commit":"c066317dce9dded25029337f7eda7a966438f104","subject":"Notification connector expect now user list instead of one username","message":"Notification connector expect now user list instead of one username\n","repos":"FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- core\/mobile_app\/notifications_sink.c\n+++ core\/mobile_app\/notifications_sink.c\n@@ -410,6 +410,7 @@\n \t\t\t\t\t\t\t\t\t\t\tListAdd( usersList, username );\n \t\t\t\t\t\t\t\t\t\t\tp++;\n \t\t\t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\t\t\tp--;\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t\t\n \t\t\t\t\t\t\t\t}\n"} {"commit":"651c4a0ec6363ace495c2f3f2f58b4b1bd679029","subject":"Add hx509_certs_filter().","message":"Add hx509_certs_filter().\n\ngit-svn-id: 193148810cf65385f3a195dbc9a8b504846da3a2@24582 ec53bebd-3082-4978-b11e-865c3cabbd6b\n","repos":"madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"f407e0870216a9e0063a909b2b56f824b2ea7fd0","subject":"document HX509_CERTS_UNPROTECT_ALL","message":"document HX509_CERTS_UNPROTECT_ALL\n\n\ngit-svn-id: 193148810cf65385f3a195dbc9a8b504846da3a2@22466 ec53bebd-3082-4978-b11e-865c3cabbd6b\n","repos":"madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal,madscientist159\/heimdal","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"f9c1a1420a45369cdc389bde8b1441c81af70b75","subject":"Fixed bug in math\/hermite.h","message":"Fixed bug in math\/hermite.h\n","repos":"MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3","returncode":0,"stderr":"unknown","license":"mpl-2.0","lang":"C","diff":""} {"commit":"c668951fa45e95c1dedb23560992b9c67dd75b4b","subject":"USMSendDoorNotification - disabled","message":"USMSendDoorNotification - disabled\n","repos":"FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup,FriendSoftwareLabs\/friendup","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- core\/system\/fsys\/door_notification.c\n+++ core\/system\/fsys\/door_notification.c\n@@ -373,7 +373,7 @@\n \t\t\t\n \t\t\tDEBUG(\"[DoorNotificationCommunicateChanges] send door notification to: %lu\\n\", notification->dn_OwnerID );\n \t\t\t\n-\t\t\tUSMSendDoorNotification( sb->sl_USM, notification, ses, device, path );\n+\t\t\t\/\/USMSendDoorNotification( sb->sl_USM, notification, ses, device, path );\n \t\t\t\n \t\t\tnotification = (DoorNotification *)notification->node.mln_Succ;\n \t\t\t\n"} {"commit":"b4ac48cb99fb3aea1a503a357d0508f34d8d64e8","subject":"fixed GCC compile warnings","message":"fixed GCC compile warnings\n","repos":"Sjoerdie\/embree,embree\/embree,Sjoerdie\/embree,embree\/embree,embree\/embree,Sjoerdie\/embree,Sjoerdie\/embree,embree\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/builders\/bvh_builder_sah.h\n+++ kernels\/builders\/bvh_builder_sah.h\n@@ -30,7 +30,7 @@\n \t__forceinline GeneralBuildRecord () {}\n \n __forceinline GeneralBuildRecord (size_t depth) \n- : depth(depth), pinfo(empty) {}\n+ : parent(nullptr), depth(depth), pinfo(empty) {}\n \n __forceinline GeneralBuildRecord (const PrimInfo& pinfo, size_t depth, size_t* parent) \n : parent(parent), depth(depth), pinfo(pinfo) {}\n"} {"commit":"1154a7901774f1ed05fc456d91580cb0a858f824","subject":"Slighly faster operation","message":"Slighly faster operation\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@14091 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"f02c9bac3a569255eba7213e8eecadd149ecca4c","subject":"Supporting large prime factors in the FFT","message":"Supporting large prime factors in the FFT\n","repos":"Distrotech\/celt,dezelin\/celt,Distrotech\/celt,Distrotech\/celt,mumble-voip\/celt-0.11.0,mumble-voip\/celt-0.7.0,mumble-voip\/celt-0.7.0,oneman\/opus-oneman,dezelin\/celt,oneman\/opus-oneman,oneman\/opus-oneman,mumble-voip\/celt-0.7.0,mumble-voip\/celt-0.11.0,dezelin\/celt,mumble-voip\/celt-0.11.0","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libcelt\/kiss_fft.c\n+++ libcelt\/kiss_fft.c\n@@ -25,6 +25,7 @@\n #include \"arch.h\"\n #include \"os_support.h\"\n #include \"mathops.h\"\n+#include \"stack_alloc.h\"\n \n \/* The guts header contains all the multiplication and addition macros that are defined for\n complex numbers. It also delares the kf_ internal functions.\n@@ -409,13 +410,10 @@\n int u,k,q1,q;\n kiss_twiddle_cpx * twiddles = st->twiddles;\n kiss_fft_cpx t;\n- kiss_fft_cpx scratchbuf[17];\n+ VARDECL(kiss_fft_cpx, scratchbuf);\n int Norig = st->nfft;\n-\n- \/*CHECKBUF(scratchbuf,nscratchbuf,p);*\/\n- if (p>17)\n- celt_fatal(\"KissFFT: max radix supported is 17\");\n- \n+ ALLOC(scratchbuf, p, kiss_fft_cpx);\n+\n for ( u=0; u<m; ++u ) {\n k=u;\n for ( q1=0 ; q1<p ; ++q1 ) {\n@@ -450,13 +448,10 @@\n int u,k,q1,q;\n kiss_twiddle_cpx * twiddles = st->twiddles;\n kiss_fft_cpx t;\n- kiss_fft_cpx scratchbuf[17];\n+ VARDECL(kiss_fft_cpx, scratchbuf);\n int Norig = st->nfft;\n-\n- \/*CHECKBUF(scratchbuf,nscratchbuf,p);*\/\n- if (p>17)\n- celt_fatal(\"KissFFT: max radix supported is 17\");\n- \n+ ALLOC(scratchbuf, p, kiss_fft_cpx);\n+\n for ( u=0; u<m; ++u ) {\n k=u;\n for ( q1=0 ; q1<p ; ++q1 ) {\n"} {"commit":"ebc5a497cebdd4946b9a5f66fc7eb24d891e5e46","subject":"marked up a bit","message":"marked up a bit\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@10287 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libgphoto2\/bayer.c\n+++ libgphoto2\/bayer.c\n@@ -119,6 +119,13 @@\n \n #define AD(x, y, w) ((y)*(w)*3+3*(x))\n \n+\/**\n+ * \\brief Interpolate a expanded bayer array into an RGB image.\n+ *\n+ * This function interpolates a bayer array which has been pre-expanded\n+ * by gp_bayer_expand() to an RGB image. It uses various interpolation\n+ * methods, also see gp_bayer_accrue().\n+ *\/\n int\n gp_bayer_interpolate (unsigned char *image, int w, int h, BayerTile tile)\n {\n"} {"commit":"f69c24680907580fd78a506f8e8394a4a9b80a1d","subject":"Avoid strcpy to crash","message":"Avoid strcpy to crash\n\n\"key\" is passed after assert() check so cannot be Null.\r\nAt line no 320 - checked \"d\" instead -- to make same check as in line no 253.","repos":"sofar\/buxton,sofar\/buxton","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared\/dictionary.c\n+++ src\/shared\/dictionary.c\n@@ -250,7 +250,7 @@\n int i ;\n unsigned hash ;\n \n- if (d==NULL || key==NULL) return -1 ;\n+ if (d==NULL) return -1 ;\n \n \/* Compute hash for this key *\/\n hash = dictionary_hash(key) ;\n@@ -317,7 +317,7 @@\n unsigned hash ;\n int i ;\n \n- if (key == NULL) {\n+ if (d == NULL) {\n return;\n }\n \n"} {"commit":"4b02fe8d7f07c24dddacc428c901b10fba9cccd4","subject":"fixed a crash when opening a non-json file","message":"fixed a crash when opening a non-json file\n","repos":"engineerOfLies\/simple_json","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/simple_json_parse.c\n+++ src\/simple_json_parse.c\n@@ -129,7 +129,7 @@\n str_length = p - parse->position;\n if (str_length <= 0)\n {\n- sj_set_error(\"sj_parse_string: string is a zero or negative length\\nerror parsing string at: %s\\n\",parse->position);\n+ sj_set_error(\"sj_parse_string: string is a zero or negative length\\nerror parsing string at: %s\",parse->position);\n sj_string_free(string);\n return NULL;\n }\n@@ -220,18 +220,13 @@\n sj_set_error(\"sj_parse_object: expected first character to be a {\\n\");\n return NULL;\n }\n- if (parse->position[1] == '}')\n- {\n- \/\/NULL object\n- parse->position+=2;\n- return sj_null_new();\n- }\n \n \/\/ allocate working space\n json = sj_object_new();\n if (!json)return NULL;\n \n \/\/chomp first character\n+ parse->position++;\n do\n {\n parse->position = get_next_relevant_char(parse->position);\n@@ -246,7 +241,7 @@\n parse->position = get_next_relevant_char(parse->position);\n if (*parse->position != ':')\n {\n- sj_set_error(\"sj_parse_object: no colon (:) delimeter for object\\nnear: %s\\n\",parse->position);\n+ sj_set_error(\"sj_parse_object: no colon (:) delimeter for object\\n\");\n sj_object_free(json);\n sj_string_free(key);\n return NULL;\n@@ -286,6 +281,11 @@\n }\n parse.buffer = string;\n parse.position = strchr(string, '{');\n+ if (parse.position == NULL)\n+ {\n+ sj_set_error(\"sj_parse_buffer: --=== invalid file ===--\");\n+ return NULL;\n+ }\n parse.end = &string[length -1];\n json = sj_parse_object(&parse);\n return json;\n"} {"commit":"4a2c6163f0bd4945e86e7b349db64e5af3abb44e","subject":"We are getting closer to detect all the cases for dirrmtry","message":"We are getting closer to detect all the cases for dirrmtry\n","repos":"junovitch\/pkg,khorben\/pkg,skoef\/pkg,junovitch\/pkg,Open343\/pkg,Open343\/pkg,en90\/pkg,khorben\/pkg,khorben\/pkg,en90\/pkg,skoef\/pkg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libpkg\/pkg_ports.c\n+++ libpkg\/pkg_ports.c\n@@ -107,22 +107,24 @@\n \t\t\t\t\t\tcomment[1] = '\\0';\n \t\t\t\t\t}\n \t\t\t\t\t\/* remove the glob if any *\/\n-\t\t\t\t\tif (strchr(cmd, '*'))\n+\t\t\t\t\tif (comment[0] == '#') {\n+\t\t\t\t\t\tif (strchr(cmd, '*'))\n \t\t\t\t\t\tcomment[0] = '\\0';\n \n-\t\t\t\t\tbuf = cmd;\n-\n-\t\t\t\t\t\/* start remove mkdir -? *\/\n-\t\t\t\t\t\/* remove the command *\/\n-\t\t\t\t\twhile (!isspace(buf[0]))\n-\t\t\t\t\t\tbuf++;\n-\n-\t\t\t\t\twhile (isspace(buf[0]))\n-\t\t\t\t\t\tbuf++;\n-\n-\t\t\t\t\tif (buf[0] == '-')\n-\t\t\t\t\t\tcomment[0] = '\\0';\n-\t\t\t\t\t\/* end remove mkdir -? *\/\n+\t\t\t\t\t\tbuf = cmd;\n+\n+\t\t\t\t\t\t\/* start remove mkdir -? *\/\n+\t\t\t\t\t\t\/* remove the command *\/\n+\t\t\t\t\t\twhile (!isspace(buf[0]))\n+\t\t\t\t\t\t\tbuf++;\n+\n+\t\t\t\t\t\twhile (isspace(buf[0]))\n+\t\t\t\t\t\t\tbuf++;\n+\n+\t\t\t\t\t\tif (buf[0] == '-')\n+\t\t\t\t\t\t\tcomment[0] = '\\0';\n+\t\t\t\t\t\t\/* end remove mkdir -? *\/\n+\t\t\t\t\t}\n \n \t\t\t\t\tif (filestarted) {\n \t\t\t\t\t\tif (sbuf_len(unexec_scripts) == 0)\n@@ -143,7 +145,9 @@\n \t\t\t\t\t\twhile (!isspace(buf[0]))\n \t\t\t\t\t\t\tbuf++;\n \n-\t\t\t\t\t\tif (strchr(buf, '\"')) {\n+\t\t\t\t\t\tsplit_chr(buf, '|');\n+\n+\t\t\t\t\t\tif (strstr(buf, \"\\\"\/\")) {\n \t\t\t\t\t\t\twhile (regexec(&preg1, buf, 2, pmatch, 0) == 0) {\n \t\t\t\t\t\t\t\tstrlcpy(path, &buf[pmatch[1].rm_so], pmatch[1].rm_eo - pmatch[1].rm_so + 1);\n \t\t\t\t\t\t\t\tbuf+=pmatch[1].rm_eo;\n"} {"commit":"18547b5db62c4fc63513c545f38f10edf9541d85","subject":"Refactor find_parent() to merge two call sites","message":"Refactor find_parent() to merge two call sites\n","repos":"Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- library\/x509_crt.c\n+++ library\/x509_crt.c\n@@ -2051,35 +2051,39 @@\n mbedtls_x509_crt_restart_ctx *rs_ctx )\n {\n int ret;\n-\n- \/* Look for a parent in trusted CAs *\/\n+ mbedtls_x509_crt *search_list;\n+\n *parent_is_trusted = 1;\n- ret = x509_crt_find_parent_in( child, trust_ca,\n- parent, signature_is_good,\n- 1, path_cnt, self_cnt, rs_ctx );\n+\n+ while( 1 ) {\n+ search_list = *parent_is_trusted ? trust_ca : child->next;\n+\n+ ret = x509_crt_find_parent_in( child, search_list,\n+ parent, signature_is_good,\n+ *parent_is_trusted,\n+ path_cnt, self_cnt, rs_ctx );\n \n #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)\n- if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) {\n- \/\/ TODO: stave state\n- return( ret );\n- }\n+ if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) {\n+ \/\/ TODO: stave state\n+ return( ret );\n+ }\n #endif \/* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE *\/\n \n- if( *parent != NULL )\n- return( 0 );\n-\n- \/* Look for a parent upwards the chain *\/\n- *parent_is_trusted = 0;\n- ret = x509_crt_find_parent_in( child, child->next,\n- parent, signature_is_good,\n- 0, path_cnt, self_cnt, rs_ctx );\n-\n-#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)\n- if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) {\n- \/\/ TODO: stave state\n- return( ret );\n- }\n-#endif \/* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE *\/\n+ \/* stop here if found or already in second iteration *\/\n+ if( *parent != NULL || *parent_is_trusted == 0 )\n+ break;\n+\n+ \/* prepare second iteration *\/\n+ *parent_is_trusted = 0;\n+ }\n+\n+ \/* extra precaution against mistakes in the caller *\/\n+ if( parent == NULL )\n+ {\n+ parent_is_trusted = 0;\n+ signature_is_good = 0;\n+ }\n \n return( 0 );\n }\n"} {"commit":"7a71b4316a0c0dd05c11db427fc8852aaf7054ac","subject":"cleanup: separated VAD and AGC from the denoising (put them in different functions) and added some comments","message":"cleanup: separated VAD and AGC from the denoising (put them in different\nfunctions) and added some comments\n\n\ngit-svn-id: 42b1393cca5d551bec90c34575d0b84245f1dba8@5235 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"Distrotech\/speex,jiangjianping\/speex,jiangjianping\/speex,Distrotech\/speex,felipebetancur\/speexdsp,ksophocleous\/speex,lu-zero\/speex,felipebetancur\/speex,jiangjianping\/speex,ksophocleous\/speex,felipebetancur\/speexdsp,maolin-cdzl\/speexdsp,ksophocleous\/speexdsp,mwgoldsmith\/speex,lu-zero\/speex,lowlevel-studios\/speex-android,ksophocleous\/speexdsp,lowlevel-studios\/speex-android,ksophocleous\/speexdsp,ksophocleous\/speexdsp,ksophocleous\/speex,maolin-cdzl\/speexdsp,lowlevel-studios\/speex-android,jiangjianping\/speex,felipebetancur\/speexdsp,lu-zero\/speex,felipebetancur\/speex,mwgoldsmith\/speex,maolin-cdzl\/speexdsp,felipebetancur\/speex,jiangjianping\/speex,felipebetancur\/speexdsp,felipebetancur\/speex,mwgoldsmith\/speex,mwgoldsmith\/speex,Distrotech\/speex,Distrotech\/speex,maolin-cdzl\/speexdsp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libspeex\/denoise.c\n+++ libspeex\/denoise.c\n@@ -2,7 +2,7 @@\n Written by Jean-Marc Valin\n \n File: denoise.c\n-\n+ Denoiser based on the algorithm by Ephraim and Malah\n \n Redistribution and use in source and binary forms, with or without\n modification, are permitted provided that the following conditions are\n@@ -240,211 +240,13 @@\n }\n }\n \n-int speex_denoise(SpeexDenoiseState *st, float *x, float *echo)\n+static int speex_compute_vad(SpeexDenoiseState *st, float *ps, float mean_prior, float mean_post)\n {\n- int i;\n- int is_speech=0;\n- float mean_post=0;\n- float mean_prior=0;\n- float energy;\n+ int i, is_speech=0;\n int N = st->ps_size;\n- int N3 = 2*N - st->frame_size;\n- int N4 = st->frame_size - N3;\n float scale=.5\/N;\n- float *ps=st->ps;\n-\n- \/* 'Build' input frame *\/\n- for (i=0;i<N3;i++)\n- st->frame[i]=st->inbuf[i];\n- for (i=0;i<st->frame_size;i++)\n- st->frame[N3+i]=x[i];\n- \n- \/* Update inbuf *\/\n- for (i=0;i<N3;i++)\n- st->inbuf[i]=x[N4+i];\n-\n- \/* Windowing *\/\n- for (i=0;i<2*N;i++)\n- st->frame[i] *= st->window[i];\n-\n- \/* Perform FFT *\/\n- drft_forward(&st->fft_lookup, st->frame);\n-\n- \/************************************************************** \n- * Denoise in spectral domain using Ephraim-Malah algorithm *\n- **************************************************************\/\n-\n- \/* Power spectrum *\/\n- ps[0]=1;\n- for (i=1;i<N;i++)\n- ps[i]=1+st->frame[2*i-1]*st->frame[2*i-1] + st->frame[2*i]*st->frame[2*i];\n-\n- energy=0;\n- for (i=1;i<N;i++)\n- energy += log(100+ps[i]);\n- energy \/= 160;\n- st->last_energy[st->nb_denoise%STABILITY_TIME]=energy;\n-\n- if (st->nb_denoise>=STABILITY_TIME)\n- {\n- float E=0, E2=0;\n- float std;\n- for (i=0;i<STABILITY_TIME;i++)\n- {\n- E+=st->last_energy[i];\n- E2+=st->last_energy[i]*st->last_energy[i];\n- }\n- E2=E2\/STABILITY_TIME;\n- E=E\/STABILITY_TIME;\n- std = sqrt(E2-E*E);\n- if (std<.15 && st->last_update>20)\n- {\n- update_noise(st, &st->last_ps[st->last_id*N], echo);\n- }\n- \/*fprintf (stderr, \"%f\\n\", std);*\/\n- }\n-\n- st->nb_denoise++;\n-#if 0\n- if (st->nb_min_estimate<50)\n- {\n- float ener=0;\n- for (i=1;i<N;i++)\n- ener += ps[i];\n- \/*fprintf (stderr, \"%f\\n\", ener);*\/\n- if (ener < st->min_ener || st->nb_min_estimate==0)\n- {\n- st->min_ener = ener;\n- for (i=1;i<N;i++)\n- st->min_ps[i] = ps[i];\n- }\n- st->nb_min_estimate++;\n- } else {\n- float noise_ener=0;\n- st->nb_min_estimate=0;\n- for (i=1;i<N;i++)\n- noise_ener += st->noise[i];\n- \/*fprintf (stderr, \"%f %f\\n\", noise_ener, st->min_ener);*\/\n- if (0&&(st->last_update>50 && st->min_ener > 3*noise_ener) || st->last_update>50)\n- {\n- for (i=1;i<N;i++)\n- {\n- if (st->noise[i] < st->min_ps[i])\n- st->noise[i] = st->min_ps[i];\n- }\n- \/*fprintf (stderr, \"tata %d\\n\",st->last_update);*\/\n- st->last_update=0;\n- } else {\n- \/*fprintf (stderr, \"+\");*\/\n- }\n- }\n-#endif\n-\n- \/* Noise estimation always updated for the 20 first times *\/\n- if (st->nb_adapt<15)\n- \/*if (st->nb_adapt<25 && st->nb_adapt>15)*\/\n- {\n- update_noise(st, ps, echo);\n- st->last_update=0;\n- }\n-\n- if (echo)\n- for (i=1;i<N;i++)\n- st->echo_noise[i] = (.7*st->echo_noise[i] + .3* 2*echo[i]);\n-\n- \/* Compute a posteriori SNR *\/\n- for (i=1;i<N;i++)\n- {\n- st->post[i] = ps[i]\/(1+st->noise[i]+st->echo_noise[i]) - 1;\n- if (st->post[i]>100)\n- st->post[i]=100;\n- \/*if (st->post[i]<0)\n- st->post[i]=0;*\/\n- mean_post+=st->post[i];\n- }\n- mean_post \/= N;\n- if (mean_post<0)\n- mean_post=0;\n-\n- \/* Special case for first frame *\/\n- if (st->nb_adapt==1)\n- for (i=1;i<N;i++)\n- st->old_ps[i] = ps[i];\n-\n- \/* Compute a priori SNR *\/\n- {\n- \/* A priori update rate *\/\n- float gamma;\n- float min_gamma=0.12;\n- gamma = 1.0\/st->nb_denoise;\n-\n- \/*Make update rate smaller when there's no speech*\/\n-#if 0\n- if (mean_post<3.5 && mean_prior < 1)\n- min_gamma *= (mean_post+.5);\n- else\n- min_gamma *= 4.;\n-#else\n- min_gamma = .2*fabs(mean_prior - mean_post)*fabs(mean_prior - mean_post);\n- if (min_gamma>.6)\n- min_gamma = .6;\n- if (min_gamma<.01)\n- min_gamma = .01;\n-#endif\n- min_gamma = .6;\n-\n- if (gamma<min_gamma)\n- gamma=min_gamma;\n- \n- for (i=1;i<N;i++)\n- {\n- \n- \/* A priori SNR update *\/\n- st->prior[i] = gamma*max(0.0,st->post[i]) +\n- (1-gamma)*st->gain[i]*st->gain[i]*st->old_ps[i]\/(1+st->noise[i]+st->echo_noise[i]);\n- \n- if (st->prior[i]>100)\n- st->prior[i]=100;\n- \n- mean_prior+=st->prior[i];\n- }\n- }\n- mean_prior \/= N;\n-\n-#if 0\n- for (i=0;i<N;i++)\n- {\n- fprintf (stderr, \"%f \", st->prior[i]);\n- }\n- fprintf (stderr, \"\\n\");\n-#endif\n- \/*fprintf (stderr, \"%f %f\\n\", mean_prior,mean_post);*\/\n-\n- if (st->nb_denoise>=20)\n- {\n- int do_update = 0;\n- float noise_ener=0, sig_ener=0;\n- \/* If SNR is low (both a priori and a posteriori), update the noise estimate*\/\n- \/*if (mean_prior<.23 && mean_post < .5)*\/\n- if (mean_prior<.23 && mean_post < .5)\n- do_update = 1;\n- for (i=1;i<N;i++)\n- {\n- noise_ener += st->noise[i];\n- sig_ener += ps[i];\n- }\n- if (noise_ener > 3*sig_ener)\n- do_update = 1;\n- \/*do_update = 0;*\/\n- if (do_update)\n- {\n- st->consec_noise++;\n- } else {\n- st->consec_noise=0;\n- }\n- }\n-\n- \/*fprintf (stderr, \"%f %f \", mean_prior, mean_post);*\/\n+\n+ \/* FIXME: Clean this up a bit *\/\n {\n float bands[NB_BANDS];\n int j;\n@@ -631,6 +433,223 @@\n \n }\n \n+ return is_speech;\n+}\n+\n+static void speex_compute_agc(SpeexDenoiseState *st, float mean_prior)\n+{\n+ int i;\n+ int N = st->ps_size;\n+ float scale=.5\/N;\n+\n+ \/** BEGIN AGC *\/\n+ if ((mean_prior>3&&mean_prior>3))\n+ {\n+ float loudness=0;\n+ float rate;\n+ st->nb_loudness_adapt++;\n+ rate=2.0\/(1+st->nb_loudness_adapt);\n+ if (rate < .01)\n+ rate = .01;\n+\n+ for (i=2;i<N;i++)\n+ {\n+ loudness += scale*st->ps[i] * st->gain2[i] * st->gain2[i] * st->loudness_weight[i];\n+ }\n+ loudness=sqrt(loudness);\n+ \/*if (loudness < 2*pow(st->loudness, 1.0\/LOUDNESS_EXP) &&\n+ loudness*2 > pow(st->loudness, 1.0\/LOUDNESS_EXP))*\/\n+ st->loudness = (1-rate)*st->loudness + (rate)*pow(loudness, LOUDNESS_EXP);\n+ \n+ st->loudness2 = (1-rate)*st->loudness2 + rate*pow(st->loudness, 1.0\/LOUDNESS_EXP);\n+\n+ loudness = pow(st->loudness, 1.0\/LOUDNESS_EXP);\n+\n+ \/*fprintf (stderr, \"%f %f %f\\n\", loudness, st->loudness2, rate);*\/\n+ }\n+ for (i=0;i<N;i++)\n+ st->gain2[i] *= 6000.0\/st->loudness2;\n+ \n+\n+ \/** END AGC *\/\n+\n+}\n+\n+int speex_denoise(SpeexDenoiseState *st, float *x, float *echo)\n+{\n+ int i;\n+ int is_speech=0;\n+ float mean_post=0;\n+ float mean_prior=0;\n+ float energy;\n+ int N = st->ps_size;\n+ int N3 = 2*N - st->frame_size;\n+ int N4 = st->frame_size - N3;\n+ float scale=.5\/N;\n+ float *ps=st->ps;\n+\n+ \/* 'Build' input frame *\/\n+ for (i=0;i<N3;i++)\n+ st->frame[i]=st->inbuf[i];\n+ for (i=0;i<st->frame_size;i++)\n+ st->frame[N3+i]=x[i];\n+ \n+ \/* Update inbuf *\/\n+ for (i=0;i<N3;i++)\n+ st->inbuf[i]=x[N4+i];\n+\n+ \/* Windowing *\/\n+ for (i=0;i<2*N;i++)\n+ st->frame[i] *= st->window[i];\n+\n+ \/* Perform FFT *\/\n+ drft_forward(&st->fft_lookup, st->frame);\n+\n+ \/************************************************************** \n+ * Denoise in spectral domain using Ephraim-Malah algorithm *\n+ **************************************************************\/\n+\n+ \/* Power spectrum *\/\n+ ps[0]=1;\n+ for (i=1;i<N;i++)\n+ ps[i]=1+st->frame[2*i-1]*st->frame[2*i-1] + st->frame[2*i]*st->frame[2*i];\n+\n+ energy=0;\n+ for (i=1;i<N;i++)\n+ energy += log(100+ps[i]);\n+ energy \/= 160;\n+ st->last_energy[st->nb_denoise%STABILITY_TIME]=energy;\n+\n+ if (st->nb_denoise>=STABILITY_TIME)\n+ {\n+ float E=0, E2=0;\n+ float std;\n+ for (i=0;i<STABILITY_TIME;i++)\n+ {\n+ E+=st->last_energy[i];\n+ E2+=st->last_energy[i]*st->last_energy[i];\n+ }\n+ E2=E2\/STABILITY_TIME;\n+ E=E\/STABILITY_TIME;\n+ std = sqrt(E2-E*E);\n+ if (std<.15 && st->last_update>20)\n+ {\n+ update_noise(st, &st->last_ps[st->last_id*N], echo);\n+ }\n+ \/*fprintf (stderr, \"%f\\n\", std);*\/\n+ }\n+\n+ st->nb_denoise++;\n+\n+ \/* Noise estimation always updated for the 20 first times *\/\n+ if (st->nb_adapt<15)\n+ \/*if (st->nb_adapt<25 && st->nb_adapt>15)*\/\n+ {\n+ update_noise(st, ps, echo);\n+ st->last_update=0;\n+ }\n+\n+ \/* Deal with residual echo if provided *\/\n+ if (echo)\n+ for (i=1;i<N;i++)\n+ st->echo_noise[i] = (.7*st->echo_noise[i] + .3* echo[i]);\n+\n+ \/* Compute a posteriori SNR *\/\n+ for (i=1;i<N;i++)\n+ {\n+ st->post[i] = ps[i]\/(1+st->noise[i]+st->echo_noise[i]) - 1;\n+ if (st->post[i]>100)\n+ st->post[i]=100;\n+ \/*if (st->post[i]<0)\n+ st->post[i]=0;*\/\n+ mean_post+=st->post[i];\n+ }\n+ mean_post \/= N;\n+ if (mean_post<0)\n+ mean_post=0;\n+\n+ \/* Special case for first frame *\/\n+ if (st->nb_adapt==1)\n+ for (i=1;i<N;i++)\n+ st->old_ps[i] = ps[i];\n+\n+ \/* Compute a priori SNR *\/\n+ {\n+ \/* A priori update rate *\/\n+ float gamma;\n+ float min_gamma=0.12;\n+ gamma = 1.0\/st->nb_denoise;\n+\n+ \/*Make update rate smaller when there's no speech*\/\n+#if 0\n+ if (mean_post<3.5 && mean_prior < 1)\n+ min_gamma *= (mean_post+.5);\n+ else\n+ min_gamma *= 4.;\n+#else\n+ min_gamma = .2*fabs(mean_prior - mean_post)*fabs(mean_prior - mean_post);\n+ if (min_gamma>.6)\n+ min_gamma = .6;\n+ if (min_gamma<.01)\n+ min_gamma = .01;\n+#endif\n+ min_gamma = .6;\n+\n+ if (gamma<min_gamma)\n+ gamma=min_gamma;\n+ \n+ for (i=1;i<N;i++)\n+ {\n+ \n+ \/* A priori SNR update *\/\n+ st->prior[i] = gamma*max(0.0,st->post[i]) +\n+ (1-gamma)*st->gain[i]*st->gain[i]*st->old_ps[i]\/(1+st->noise[i]+st->echo_noise[i]);\n+ \n+ if (st->prior[i]>100)\n+ st->prior[i]=100;\n+ \n+ mean_prior+=st->prior[i];\n+ }\n+ }\n+ mean_prior \/= N;\n+\n+#if 0\n+ for (i=0;i<N;i++)\n+ {\n+ fprintf (stderr, \"%f \", st->prior[i]);\n+ }\n+ fprintf (stderr, \"\\n\");\n+#endif\n+ \/*fprintf (stderr, \"%f %f\\n\", mean_prior,mean_post);*\/\n+\n+ if (st->nb_denoise>=20)\n+ {\n+ int do_update = 0;\n+ float noise_ener=0, sig_ener=0;\n+ \/* If SNR is low (both a priori and a posteriori), update the noise estimate*\/\n+ \/*if (mean_prior<.23 && mean_post < .5)*\/\n+ if (mean_prior<.23 && mean_post < .5)\n+ do_update = 1;\n+ for (i=1;i<N;i++)\n+ {\n+ noise_ener += st->noise[i];\n+ sig_ener += ps[i];\n+ }\n+ if (noise_ener > 3*sig_ener)\n+ do_update = 1;\n+ \/*do_update = 0;*\/\n+ if (do_update)\n+ {\n+ st->consec_noise++;\n+ } else {\n+ st->consec_noise=0;\n+ }\n+ }\n+\n+\n+ is_speech = speex_compute_vad(st, ps, mean_prior, mean_post);\n+\n+\n if (st->consec_noise>=3)\n {\n update_noise(st, st->old_ps, echo);\n@@ -638,6 +657,7 @@\n } else {\n st->last_update++;\n }\n+\n \n \/* Compute gain according to the Ephraim-Malah algorithm *\/\n for (i=1;i<N;i++)\n@@ -689,33 +709,10 @@\n }\n st->gain2[N-1]=0;\n \n- if ((mean_prior>3&&mean_prior>3))\n- {\n- float loudness=0;\n- float rate;\n- st->nb_loudness_adapt++;\n- rate=2.0\/(1+st->nb_loudness_adapt);\n- if (rate < .01)\n- rate = .01;\n-\n- for (i=2;i<N;i++)\n- {\n- loudness += scale*st->ps[i] * st->gain2[i] * st->gain2[i] * st->loudness_weight[i];\n- }\n- loudness=sqrt(loudness);\n- \/*if (loudness < 2*pow(st->loudness, 1.0\/LOUDNESS_EXP) &&\n- loudness*2 > pow(st->loudness, 1.0\/LOUDNESS_EXP))*\/\n- st->loudness = (1-rate)*st->loudness + (rate)*pow(loudness, LOUDNESS_EXP);\n- \n- st->loudness2 = (1-rate)*st->loudness2 + rate*pow(st->loudness, 1.0\/LOUDNESS_EXP);\n-\n- loudness = pow(st->loudness, 1.0\/LOUDNESS_EXP);\n-\n- \/*fprintf (stderr, \"%f %f %f\\n\", loudness, st->loudness2, rate);*\/\n- }\n- for (i=0;i<N;i++)\n- st->gain2[i] *= 6000.0\/st->loudness2;\n- \n+\n+ \/* FIXME: Add an option to enable\/disable AGC *\/\n+ speex_compute_agc(st, mean_prior);\n+\n #if 0\n if (!is_speech)\n {\n@@ -729,12 +726,14 @@\n }\n #endif\n #endif\n+\n \/* Apply computed gain *\/\n for (i=1;i<N;i++)\n {\n st->frame[2*i-1] *= st->gain2[i];\n st->frame[2*i] *= st->gain2[i];\n }\n+\n \/* Get rid of the DC and very low frequencies *\/\n st->frame[0]=0;\n st->frame[1]=0;\n"} {"commit":"9bc55caa74747cd7ac8a4e1dbbd9e6484c6f15cd","subject":"Fixed missing device name in state changed","message":"Fixed missing device name in state changed\n","repos":"f1nalspace\/final_game_tech,f1nalspace\/final_game_tech,f1nalspace\/final_game_tech","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- final_platform_layer.h\n+++ final_platform_layer.h\n@@ -9752,6 +9752,7 @@\n \t\t\t\t\tev.gamepad.deviceName = xinputState->deviceNames[controllerIndex];\n \t\t\t\t\tconst XINPUT_GAMEPAD *newPadState = &controllerState.Gamepad;\n \t\t\t\t\tfpl__Win32XInputGamepadToGamepadState(newPadState, &ev.gamepad.state);\n+\t\t\t\t\tev.gamepad.state.deviceName = ev.gamepad.deviceName;\n \t\t\t\t\tfpl__PushInternalEvent(&ev);\n \t\t\t\t}\n \t\t\t}\n"} {"commit":"44e89cb8e279abdf83581a10e592c2451bae7824","subject":"ocfs2: adjust switch_case syntax at o2net_state_change()","message":"ocfs2: adjust switch_case syntax at o2net_state_change()\n\nAdjust switch..case syntax at o2net_state_change to meet the kernel coding\nstandard.\n\ns\/printk\/pr_info\/.\n\n[5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org: revert pr_foo() change]\nSigned-off-by: Jie Liu <9edab3d8932dbb8f20eb55cd8199c20e7fb56c12@oracle.com>\nAcked-by: Joel Becker <9d3d88cacb47f143c6cf36b9a61c09b528b2c49a@evilplan.org>\nCc: Gurudas Pai <c21c0d03bc493950488c92eda4a45c164c2ba956@oracle.com>\nCc: Mark Fasheh <8f0bc92cac940f3e83deb53ced7a1f201bce5732@suse.com>\nCc: Noboru Iwamatsu <6f3b599af5ae280a4d3d5fb40a578d1b37644c28@jp.fujitsu.com>\nCc: Srinivas Eeeda <8f9f858169f43720adbcf205a4574a40abf39c4d@oracle.com>\nCc: Sunil Mushran <71202349b6bab84fd697c8fc05379fc0e6724c25@gmail.com>\nCc: Tao Ma <a547db31280d14f095c760a23a7523d0b1e55fe6@tao.ma>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e32c7e02333664edcc83e2d5585ae7f245feec09","subject":"Refactor objective integrand in preparation for reuse in weak form integrand.","message":"Refactor objective integrand in preparation for reuse in weak form integrand.\n","repos":"bueler\/p4pdes,bueler\/p4pdes,bueler\/p4pdes,bueler\/p4pdes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/ch5\/plap.c\n+++ c\/ch5\/plap.c\n@@ -164,14 +164,18 @@\n }\n \n \/\/STARTOBJECTIVE\n+PetscReal GraduPow(gradRef du, PetscReal P, PLapCtx *user) {\n+ PetscReal z;\n+ z = (4.0 \/ (user->hx * user->hx)) * du.xi * du.xi;\n+ z += (4.0 \/ (user->hy * user->hy)) * du.eta * du.eta;\n+ return PetscPowScalar(z, P \/ 2.0);\n+}\n+\n PetscReal ObjIntegrand(PetscInt i, PetscInt j,\n const PetscReal f[4], const PetscReal u[4],\n PetscReal xi, PetscReal eta, PLapCtx *user) {\n- const gradRef du = deval(u,xi,eta);\n- PetscReal z;\n- z = (4.0 \/ (user->hx * user->hx)) * du.xi * du.xi;\n- z += (4.0 \/ (user->hy * user->hy)) * du.eta * du.eta;\n- return PetscPowScalar(z,user->p\/2.0) \/ user->p - eval(f,xi,eta) * eval(u,xi,eta);\n+ const gradRef du = deval(u,xi,eta);\n+ return GraduPow(du,user->p,user) \/ user->p - eval(f,xi,eta) * eval(u,xi,eta);\n }\n \n static PetscReal zq[2] = {-0.577350269189626,0.577350269189626},\n"} {"commit":"2096d4b9a2758ea94892763457a6d4c534c28dd8","subject":"reference to libhfuzz.a","message":"reference to libhfuzz.a\n","repos":"riusksk\/riufuzz,riusksk\/riufuzz,google\/honggfuzz,riusksk\/riufuzz,riusksk\/riufuzz,riusksk\/riufuzz,google\/honggfuzz,riusksk\/riufuzz,riusksk\/riufuzz,anestisb\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cmdline.c\n+++ cmdline.c\n@@ -81,7 +81,7 @@\n LOG_HELP_BOLD(\" \" PROG_NAME \" -f input_dir -C -- \/usr\/bin\/tiffinfo -D \" _HF_FILE_PLACEHOLDER);\n LOG_HELP(\" Use compile-time instrumentation (libhfuzz\/instrument.c):\");\n LOG_HELP_BOLD(\" \" PROG_NAME \" -f input_dir -z -- \/usr\/bin\/tiffinfo -D \" _HF_FILE_PLACEHOLDER);\n- LOG_HELP(\" Use persistent mode (libhfuzz\/persistent.c):\");\n+ LOG_HELP(\" Use persistent mode (libhfuzz\/libhfuzz.a):\");\n LOG_HELP_BOLD(\" \" PROG_NAME \" -f input_dir -P -- \/usr\/bin\/tiffinfo_persistent\");\n #if defined(_HF_ARCH_LINUX)\n LOG_HELP(\" Run the binary over a dynamic file, maximize total no. of instructions:\");\n@@ -257,7 +257,7 @@\n {{\"env\", required_argument, NULL, 'E'}, \"Pass this environment variable, can be used multiple times\"},\n {{\"save_all\", no_argument, NULL, 'u'}, \"Save all test-cases (not only the unique ones) by appending the current time-stamp to the filenames\"},\n {{\"sancov\", no_argument, NULL, 'C'}, \"Enable sanitizer coverage feedback\"},\n- {{\"instr\", no_argument, NULL, 'z'}, \"Enable compile-time instrumentation (see libraries\/instrument_func.c)\"},\n+ {{\"instr\", no_argument, NULL, 'z'}, \"Enable compile-time instrumentation (link with libraries\/libhfuzz.a)\"},\n {{\"msan_report_umrs\", no_argument, NULL, 0x102}, \"Report MSAN's UMRS (uninitialized memory access)\"},\n {{\"persistent\", no_argument, NULL, 'P'}, \"Enable persistent fuzzing (link with libraries\/persistent.mode.main.o)\"},\n \n"} {"commit":"e949d8c32cc9b8853b3a78e88861d3d45649cd86","subject":"Added quadratic equations","message":"Added quadratic equations\n","repos":"AfaanBilal\/math-tools-in-c","returncode":1,"stderr":"error: pathspec 'quadratic-equations.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- quadratic-equations.c\n+++ quadratic-equations.c\n@@ -0,0 +1,40 @@\n+\/*\n+ * Math Tools in C \n+ * Quadratic Equations\n+ *\n+ * https:\/\/afaan.ml\/math-tools-in-c \n+ * \n+ * (c) Afaan Bilal (https:\/\/google.com\/+AfaanBilal)\n+ *\n+ *\/\n+ \n+#include <stdio.h>\n+#include <math.h>\n+\n+int main()\n+{\n+ float a, b, c, D, x1, x2;\n+ \n+ printf(\"Quadratic Equations - Roots Calculator \\n\");\n+ printf(\"General form: ax2 + bx + c = 0 \\n\");\n+ printf(\"Enter the value of a, b, c (space separated): \");\n+ \n+ scanf(\"%f %f %f\", &a, &b, &c);\n+ \n+ D = b * b - 4 * a * c;\n+ \n+ if (D < 0)\n+ printf(\"The value of the discriminant is %f < zero, hence no real roots exist.\", D);\n+ else\n+ {\n+ printf(\"The value of the discriminant is %f \", D);\n+ \n+ x1 = ( -b + sqrt(D) ) \/ ( 2 * a );\n+ x2 = ( -b - sqrt(D) ) \/ ( 2 * a );\n+ \n+ printf(\"\\nThe roots of the equation are %f and %f \", x1, x2);\n+ }\n+ \n+ getch();\n+\treturn 0;\n+};\n"} {"commit":"856d533415508f9e6b21148482ebbf8b4ad02f32","subject":"change the default clevel to 1 for speed","message":"change the default clevel to 1 for speed\n","repos":"dondelelcaro\/samtools,lh3\/samtools-legacy,lh3\/samtools-legacy,dondelelcaro\/samtools,dondelelcaro\/samtools,mcshane\/samtools,lh3\/samtools-legacy,mcshane\/samtools,kdmurray91\/samtools,Kontakter\/samtools,Kontakter\/samtools,mcshane\/samtools,kdmurray91\/samtools,kdmurray91\/samtools,kdmurray91\/samtools,dondelelcaro\/samtools,peterjc\/samtools,peterjc\/samtools,peterjc\/samtools,mcshane\/samtools,mcshane\/samtools,peterjc\/samtools,Kontakter\/samtools,peterjc\/samtools,Kontakter\/samtools,mcshane\/samtools,lh3\/samtools-legacy,lh3\/samtools-legacy,dondelelcaro\/samtools,Kontakter\/samtools,kdmurray91\/samtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bamshuf.c\n+++ bamshuf.c\n@@ -6,7 +6,7 @@\n #include \"sam.h\"\n #include \"ksort.h\"\n \n-#define DEF_CLEVEL 3\n+#define DEF_CLEVEL 1\n \n static inline unsigned hash_Wang(unsigned key)\n {\n"} {"commit":"373afbe2950713ac417acd352a25c273a0120eb5","subject":"Split out draw_for_percent().","message":"Split out draw_for_percent().\n","repos":"jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- battery.c\n+++ battery.c\n@@ -76,7 +76,6 @@\n \trect.width = get_width_for_percent(rect.width, pct);\n \t\/\/ fill rectangle per percent full:\n \txcb_poly_fill_rectangle(xc, w, gc, 1, &rect);\n-\n }\n __attribute__((const))\n static uint16_t get_x(const struct JBDim range)\n@@ -96,6 +95,13 @@\n \t\tinitialize_gcs(xc, xstatus_get_window(xc), gc);\n \treturn gc;\n }\n+static void draw_for_percent(xcb_connection_t * restrict xc,\n+\tconst struct JBDim range, const uint8_t pct)\n+{\n+\txcb_gc_t * gc = get_gcs(xc);\n+\tconst uint8_t i = get_gc(pct);\n+\tdraw_for_gc(xc, gc[i], gc[BATTERY_GC_BACKGROUND], range, pct);\n+}\n void xstatus_draw_battery(xcb_connection_t * xc, const uint16_t start,\n \tconst uint16_t end)\n {\n@@ -105,8 +111,6 @@\n \t\tLOG(\"Could not get percent, returning\");\n \t\treturn;\n \t}\n-\txcb_gc_t * gc = get_gcs(xc);\n-\tdraw_for_gc(xc, gc[get_gc(pct)], gc[BATTERY_GC_BACKGROUND],\n-\t\t(struct JBDim){.start = start, .end = end}, pct);\n+\tdraw_for_percent(xc, (struct JBDim){.start = start, .end = end}, pct);\n \txcb_flush(xc);\n }\n"} {"commit":"af4e76402fc02f0d9bd909d2ea69b6efff48414a","subject":"[AArch64] Add a few isTarget* API to AArch64 Subtarget.","message":"[AArch64] Add a few isTarget* API to AArch64 Subtarget.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@214977 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Target\/AArch64\/AArch64Subtarget.h\n+++ lib\/Target\/AArch64\/AArch64Subtarget.h\n@@ -99,9 +99,12 @@\n bool isLittleEndian() const { return DL.isLittleEndian(); }\n \n bool isTargetDarwin() const { return TargetTriple.isOSDarwin(); }\n+ bool isTargetIOS() const { return TargetTriple.isiOS(); }\n+ bool isTargetLinux() const { return TargetTriple.isOSLinux(); }\n+ bool isTargetWindows() const { return TargetTriple.isOSWindows(); }\n \n+ bool isTargetCOFF() const { return TargetTriple.isOSBinFormatCOFF(); }\n bool isTargetELF() const { return TargetTriple.isOSBinFormatELF(); }\n-\n bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }\n \n bool isCyclone() const { return CPUString == \"cyclone\"; }\n"} {"commit":"e2d8d407927516d0190de403b2329d5fd03d8587","subject":"cortexm_common: Enable MPU after configuring regions","message":"cortexm_common: Enable MPU after configuring regions\n\nReordering this ensures that the MPU regions are configured before\nenabling the MPU and restricting the memory access.\n","repos":"OTAkeys\/RIOT,OlegHahm\/RIOT,OTAkeys\/RIOT,jasonatran\/RIOT,kaspar030\/RIOT,ant9000\/RIOT,authmillenon\/RIOT,kYc0o\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,OTAkeys\/RIOT,miri64\/RIOT,kaspar030\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,authmillenon\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,kYc0o\/RIOT,ant9000\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,ant9000\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,miri64\/RIOT,kaspar030\/RIOT,jasonatran\/RIOT,kYc0o\/RIOT,authmillenon\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,RIOT-OS\/RIOT,ant9000\/RIOT,miri64\/RIOT,kaspar030\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/cortexm_common\/vectors_cortexm.c\n+++ cpu\/cortexm_common\/vectors_cortexm.c\n@@ -140,10 +140,6 @@\n }\n #endif \/* CPU_HAS_BACKUP_RAM *\/\n \n-#if defined(MODULE_MPU_STACK_GUARD) || defined(MODULE_MPU_NOEXEC_RAM)\n- mpu_enable();\n-#endif\n-\n #ifdef MODULE_MPU_NOEXEC_RAM\n \/* Mark the RAM non executable. This is a protection mechanism which\n * makes exploitation of buffer overflows significantly harder.\n@@ -167,6 +163,10 @@\n );\n \n }\n+#endif\n+\n+#if defined(MODULE_MPU_STACK_GUARD) || defined(MODULE_MPU_NOEXEC_RAM)\n+ mpu_enable();\n #endif\n \n post_startup();\n"} {"commit":"a870dd950cdb845a29157d8a6bb07f71ddc7c76c","subject":"Fix X::String hashing.","message":"Fix X::String hashing.\n","repos":"LEW21\/Xtreeme,LEW21\/Xtreeme,LEW21\/Xtreeme","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- libxtypes\/String.h\n+++ libxtypes\/String.h\n@@ -55,7 +55,7 @@\n \ttemplate<> struct isX<String> : public std::true_type {};\n \ttemplate<> struct isStorable<String> : public std::true_type {};\n \ttemplate<> struct isTemporary<String> : public std::false_type {};\n-\t\n+\n \ttemplate<> struct canConvert<bool, String> : public std::true_type {};\n \ttemplate<> struct canConvert<String, bool> : public std::true_type {};\n }\n@@ -122,7 +122,7 @@\n \t{\n \t\tsize_t operator()(const X::String& v) const\n \t\t{\n-\t\t\treturn std::hash<const char16_t*>()(v.utf16());\n+\t\t\treturn std::hash<std::u16string>()(std::u16string{v.utf16(), v.utf16().size()});\n \t\t}\n \t};\n }\n"} {"commit":"65265b6b972afa72eb14dbedf54f24c02faaf43b","subject":"Improvement: assertion check for array boundary violation added","message":"Improvement: assertion check for array boundary violation added","repos":"nabijaczleweli\/ODE,nabijaczleweli\/ODE,keletskiy\/ode,keletskiy\/ode,nabijaczleweli\/ODE,nabijaczleweli\/ODE,keletskiy\/ode,keletskiy\/ode,keletskiy\/ode,nabijaczleweli\/ODE,nabijaczleweli\/ODE,keletskiy\/ode","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ode\/src\/heightfield.h\n+++ ode\/src\/heightfield.h\n@@ -158,6 +158,8 @@\n \r\n void addTriangle(HeightFieldTriangle *tri)\r\n {\r\n+\t\tdIASSERT(trianglelistCurrentSize < trianglelistReservedSize);\r\n+\r\n trianglelist[trianglelistCurrentSize++] = tri;\r\n }\r\n \r\n"} {"commit":"b3603ccf58aa361109e23272cd082c94d4ffde2a","subject":"esp_wifi header: Fix typo","message":"esp_wifi header: Fix typo\n","repos":"empoweredhomes\/esp-idf,Hermiedapwdrman\/esp-idf,armada-ai\/esp-idf,dschaefer\/esp-idf,nineisk\/esp-idf,www220\/esp-idf,empoweredhomes\/esp-idf,empoweredhomes\/esp-idf,espressif\/esp-idf,nineisk\/esp-idf,ajs124\/esp-idf,espressif\/esp-idf,armada-ai\/esp-idf,dschaefer\/esp-idf,ajs124\/esp-idf,jaracil\/esp-idf,Hermiedapwdrman\/esp-idf,shukyisme\/esp-idf-kwik,armada-ai\/esp-idf,mashaoze\/esp-idf,jaracil\/esp-idf,mashaoze\/esp-idf,empoweredhomes\/esp-idf,Hermiedapwdrman\/esp-idf,www220\/esp-idf,nineisk\/esp-idf,dschaefer\/esp-idf,MIhanguangyi\/esp-idf,MIhanguangyi\/esp-idf,nineisk\/esp-idf,empoweredhomes\/esp-idf,MIhanguangyi\/esp-idf,MIhanguangyi\/esp-idf,www220\/esp-idf,dschaefer\/esp-idf,Hermiedapwdrman\/esp-idf,www220\/esp-idf,mashaoze\/esp-idf,mashaoze\/esp-idf,espressif\/esp-idf,jaracil\/esp-idf,MIhanguangyi\/esp-idf,Hermiedapwdrman\/esp-idf,shukyisme\/esp-idf-kwik,ajs124\/esp-idf,shukyisme\/esp-idf-kwik,ajs124\/esp-idf,espressif\/esp-idf,shukyisme\/esp-idf-kwik,shukyisme\/esp-idf-kwik,mashaoze\/esp-idf,dschaefer\/esp-idf,www220\/esp-idf,armada-ai\/esp-idf,jaracil\/esp-idf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/esp32\/include\/esp_wifi.h\n+++ components\/esp32\/include\/esp_wifi.h\n@@ -196,7 +196,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - others: refer to error code in esp_err.h\n *\/\n@@ -209,7 +209,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_mode(wifi_mode_t *mode);\n@@ -222,7 +222,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_NO_MEM: out of memory\n * - ESP_ERR_WIFI_CONN: WiFi internal error, station or soft-AP control block wrong\n@@ -238,7 +238,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_stop(void);\n \n@@ -253,7 +253,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_restore(void);\n \n@@ -265,7 +265,7 @@\n *\n * @return \n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_START: WiFi is not started by esp_wifi_start\n * - ESP_ERR_WIFI_CONN: WiFi internal error, station or soft-AP control block wrong\n * - ESP_ERR_WIFI_SSID: SSID of AP which station connects is invalid\n@@ -277,7 +277,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi was not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi was not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi was not started by esp_wifi_start\n * - ESP_ERR_WIFI_FAIL: other WiFi internal errors\n *\/\n@@ -300,7 +300,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi was not started by esp_wifi_start\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_MODE: WiFi mode is wrong\n@@ -322,7 +322,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi was not started by esp_wifi_start\n * - ESP_ERR_WIFI_TIMEOUT: blocking scan is timeout\n * - others: refer to error code in esp_err.h\n@@ -334,7 +334,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start\n *\/\n esp_err_t esp_wifi_scan_stop(void);\n@@ -348,7 +348,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n@@ -363,7 +363,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_NO_MEM: out of memory\n@@ -415,7 +415,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_IF: invalid interface\n * - others: refer to error codes in esp_err.h\n *\/\n@@ -429,7 +429,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - others: refer to error codes in esp_err.h\n@@ -447,7 +447,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - others: refer to error codes in esp_err.h\n@@ -464,7 +464,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n@@ -481,7 +481,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n@@ -497,7 +497,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_channel(uint8_t *primary, wifi_second_chan_t *second);\n@@ -510,7 +510,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - others: refer to error code in esp_err.h\n *\/\n@@ -523,7 +523,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_country(wifi_country_t *country);\n@@ -541,7 +541,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_MAC: invalid mac address\n@@ -558,7 +558,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_IF: invalid interface\n *\/\n@@ -583,7 +583,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_set_promiscuous_rx_cb(wifi_promiscuous_cb_t cb);\n \n@@ -594,7 +594,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_set_promiscuous(bool en);\n \n@@ -605,7 +605,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_promiscuous(bool *en);\n@@ -619,7 +619,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_set_promiscuous_filter(const wifi_promiscuous_filter_t *filter);\n \n@@ -630,7 +630,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_promiscuous_filter(wifi_promiscuous_filter_t *filter);\n@@ -648,7 +648,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_IF: invalid interface\n * - ESP_ERR_WIFI_MODE: invalid mode\n@@ -666,7 +666,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_IF: invalid interface\n *\/\n@@ -681,7 +681,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_MODE: WiFi mode is wrong\n * - ESP_ERR_WIFI_CONN: WiFi internal error, the station\/soft-AP control block is invalid\n@@ -698,7 +698,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_set_storage(wifi_storage_t storage);\n@@ -711,7 +711,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_MODE: WiFi internal error, the station\/soft-AP control block is invalid\n * - others: refer to error code in esp_err.h\n *\/\n@@ -724,7 +724,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n *\/\n esp_err_t esp_wifi_get_auto_connect(bool *en);\n@@ -742,6 +742,7 @@\n * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n * - ESP_ERR_WIFI_ARG: invalid argument\n * - ESP_ERR_WIFI_NO_MEM: out of memory\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init()\n *\/\n esp_err_t esp_wifi_set_vendor_ie(bool enable, wifi_vendor_ie_type_t type, wifi_vendor_ie_id_t idx, uint8_t *vnd_ie);\n \n@@ -763,7 +764,7 @@\n *\n * @return\n * - ESP_OK: succeed\n- * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by eps_wifi_init\n+ * - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init\n *\/\n esp_err_t esp_wifi_set_vendor_ie_cb(esp_vendor_ie_cb_t cb, void *ctx);\n \n"} {"commit":"18d4c846297672b5350791c009a70dc1cce3f948","subject":"Remove extra indent","message":"Remove extra indent\n","repos":"cupy\/cupy,cupy\/cupy,cupy\/cupy,cupy\/cupy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cupy_backends\/stub\/cupy_cusparselt.h\n+++ cupy_backends\/stub\/cupy_cusparselt.h\n@@ -7,92 +7,92 @@\n \n extern \"C\" {\n \n- typedef enum {\n-\tCUSPARSE_STATUS_SUCCESS=0,\n- } cusparseStatus_t;\n- typedef enum {} cudaDataType;\n- typedef enum {} cusparseOrder_t;\n- typedef enum {} cusparseOperation_t;\n- typedef enum {} cusparseLtSparsity_t;\n- typedef enum {} cusparseComputeType;\n- typedef enum {} cusparseLtMatmulAlg_t;\n- typedef enum {} cusparseLtMatmulAlgAttribute_t;\n- typedef enum {} cusparseLtPruneAlg_t;\n+typedef enum {\n+ CUSPARSE_STATUS_SUCCESS=0,\n+} cusparseStatus_t;\n+typedef enum {} cudaDataType;\n+typedef enum {} cusparseOrder_t;\n+typedef enum {} cusparseOperation_t;\n+typedef enum {} cusparseLtSparsity_t;\n+typedef enum {} cusparseComputeType;\n+typedef enum {} cusparseLtMatmulAlg_t;\n+typedef enum {} cusparseLtMatmulAlgAttribute_t;\n+typedef enum {} cusparseLtPruneAlg_t;\n \n- typedef void* cudaStream_t;\n- typedef void* cusparseLtHandle_t;\n- typedef void* cusparseLtMatDescriptor_t;\n- typedef void* cusparseLtMatmulDescriptor_t;\n- typedef void* cusparseLtMatmulAlgSelection_t;\n- typedef void* cusparseLtMatmulPlan_t;\n+typedef void* cudaStream_t;\n+typedef void* cusparseLtHandle_t;\n+typedef void* cusparseLtMatDescriptor_t;\n+typedef void* cusparseLtMatmulDescriptor_t;\n+typedef void* cusparseLtMatmulAlgSelection_t;\n+typedef void* cusparseLtMatmulPlan_t;\n \n- cusparseStatus_t cusparseLtInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtDestroy(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtDestroy(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtDenseDescriptorInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtDenseDescriptorInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtStructuredDescriptorInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtStructuredDescriptorInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulDescriptorInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulDescriptorInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulAlgSelectionInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulAlgSelectionInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulAlgSetAttribute(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulAlgSetAttribute(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulAlgGetAttribute(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulAlgGetAttribute(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulGetWorkspace(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulGetWorkspace(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulPlanInit(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulPlanInit(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulPlanDestroy(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulPlanDestroy(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmul(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmul(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtMatmulSearch(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtMatmulSearch(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtSpMMAPrune(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtSpMMAPrune(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtSpMMAPruneCheck(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtSpMMAPruneCheck(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtSpMMACompressedSize(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtSpMMACompressedSize(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n- cusparseStatus_t cusparseLtSpMMACompress(...) {\n-\treturn CUSPARSE_STATUS_SUCCESS;\n- }\n+cusparseStatus_t cusparseLtSpMMACompress(...) {\n+ return CUSPARSE_STATUS_SUCCESS;\n+}\n \n } \/\/ extern \"C\"\n \n"} {"commit":"c9b370b833935693c5e8ab2aa57e3dfba05c5bf3","subject":"LCD12864ST: Silence warning about signed\/unsigned comparison","message":"LCD12864ST: Silence warning about signed\/unsigned comparison\n","repos":"DrMcCoy\/OpenM128-Lib,DrMcCoy\/OpenM128-Lib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- openm128\/lcd12864st.c\n+++ openm128\/lcd12864st.c\n@@ -109,7 +109,7 @@\n \n \tchar *data = lcd12864st_buffer + y * LCD12864ST_COLUMNS + x;\n \n-\tmemcpy(data, str, MIN(LCD12864ST_COLUMNS - x, strlen(str)));\n+\tmemcpy(data, str, MIN((size_t) LCD12864ST_COLUMNS - x, strlen(str)));\n }\n \n void lcd12864st_print_P(uint8_t x, uint8_t y, const char *str) {\n@@ -118,7 +118,7 @@\n \n \tchar *data = lcd12864st_buffer + y * LCD12864ST_COLUMNS + x;\n \n-\tmemcpy_P(data, str, MIN(LCD12864ST_COLUMNS - x, strlen_P(str)));\n+\tmemcpy_P(data, str, MIN((size_t) LCD12864ST_COLUMNS - x, strlen_P(str)));\n }\n \n void lcd12864st_print_centered(uint8_t line, const char *str) {\n"} {"commit":"993f830a60449a7190444c6161d8c3ad91765259","subject":"added .h","message":"added .h\n","repos":"patemckin\/HestonOptions,patemckin\/HestonOptions","returncode":1,"stderr":"error: pathspec 'testCalc\/testCalc\/DEforHestonOLE.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- testCalc\/testCalc\/DEforHestonOLE.h\n+++ testCalc\/testCalc\/DEforHestonOLE.h\n@@ -0,0 +1,28 @@\n+#define N_DIM 5\n+#define N_POP 100\n+#define MAX_GENERATIONS\t100\n+#include \"DESolver.h\"\n+#include <vector>\n+\n+struct optionParams{\n+\tdouble S; \/\/spot\n+\tdouble K; \/\/strike\n+\tdouble T; \/\/time to expiration\n+\tdouble r; \/\/ current interest rate\n+\tdouble price; \/\/ current price\n+};\n+\n+\n+class DEforHestonOLE : public DESolver\n+{\n+public:\n+\tDEforHestonOLE( double _min[], double _max[], vector <optionParams> data);\n+\tdouble EnergyFunction(double trial[], bool &bAtSolution);\n+\n+private:\n+\tint count;\n+\tdouble min[N_DIM];\n+\tdouble max[N_DIM];\n+\tdouble meanPrice;\n+\tvector <optionParams> marketData;\n+};\n"} {"commit":"544a72ea4c1580dabfd0315a39b4274e0cb852d4","subject":"Made NativeFunctionMap and ReceiveMapCallback typedefs top-level in cidart namespace","message":"Made NativeFunctionMap and ReceiveMapCallback typedefs top-level in cidart namespace","repos":"richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/cidart\/Script.h\n+++ src\/cidart\/Script.h\n@@ -15,19 +15,20 @@\n typedef std::shared_ptr<class Script>\t\tScriptRef;\n typedef std::map<std::string, Dart_Handle>\tDataMap;\n \n+typedef std::map<std::string, Dart_NativeFunction> NativeFunctionMap;\n+typedef std::function<void( const DataMap& )>\tReceiveMapCallback;\n+\n \/\/ TODO: consider whether to name this Isolate or Script\n \/\/ - is it at all useful to create an Isolate that doesn't spawn a new script?\n \/\/ - need to read up more on how Isolates are created in plain dart, and their uses\n class Script {\n public:\n-\ttypedef std::map<std::string, Dart_NativeFunction> NativeFunctionMap;\n-\ttypedef std::function<void( const DataMap& )>\tReceiveMapCallback;\n-\n \tstruct Options {\n \t\tOptions& native( const std::string &dartFuncName, Dart_NativeFunction nativeFunc ) { mNativeFunctionMap[dartFuncName] = nativeFunc; return *this; }\n \t\tOptions& mapReceiver( const ReceiveMapCallback &callback )\t{ mReceiveMapCallback = callback; return *this; }\n \n \t\tconst NativeFunctionMap&\tgetNativeFunctionMap() const\t{ return mNativeFunctionMap; }\n+\t\tNativeFunctionMap&\t\t\tgetNativeFunctionMap()\t\t\t{ return mNativeFunctionMap; }\n \t\tconst ReceiveMapCallback&\tgetReceiveMapCallback() const\t{ return mReceiveMapCallback; }\n \n \t private:\n"} {"commit":"b18769fe8e22a49a41bc5c8bac2fe97bbe19634f","subject":"indent fix","message":"indent fix\n","repos":"hathach\/tinyusb,hathach\/tinyusb,hathach\/tinyusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/class\/hid\/hid.h\n+++ src\/class\/hid\/hid.h\n@@ -217,7 +217,7 @@\n GAMEPAD_BUTTON_TR = TU_BIT(7), \/\/\/< R1 button\n GAMEPAD_BUTTON_TL2 = TU_BIT(8), \/\/\/< L2 button\n GAMEPAD_BUTTON_TR2 = TU_BIT(9), \/\/\/< R2 button\n- GAMEPAD_BUTTON_SELECT = TU_BIT(10), \/\/\/< Select button\n+ GAMEPAD_BUTTON_SELECT = TU_BIT(10), \/\/\/< Select button\n GAMEPAD_BUTTON_START = TU_BIT(11), \/\/\/< Start button\n GAMEPAD_BUTTON_MODE = TU_BIT(12), \/\/\/< Mode button\n GAMEPAD_BUTTON_THUMBL = TU_BIT(13), \/\/\/< L3 button\n"} {"commit":"d27c42af4503a304652c7f641b33169edf6d5c08","subject":"FlowSshMaster: Don't emit connect-finished if a connection attempt is still in progress.","message":"FlowSshMaster: Don't emit connect-finished if a connection attempt is still in progress.\n","repos":"hpjansson\/flow,hpjansson\/flow","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- flow\/flow-ssh-master.c\n+++ flow\/flow-ssh-master.c\n@@ -233,11 +233,14 @@\n confirm_already_connected (FlowSshMaster *ssh_master)\n {\n FlowSshMasterPrivate *priv = ssh_master->priv;\n+ gboolean is_connecting = FALSE;\n gboolean reconnect = FALSE;\n \n g_mutex_lock (priv->mutex);\n \n- if (!priv->is_connected && !priv->is_connecting)\n+ is_connected = priv->is_connected;\n+\n+ if (!is_connected && !priv->is_connecting)\n {\n \/* The existing connection failed while waiting for this callback\n * to fire. We need to connect for real. *\/\n@@ -248,7 +251,7 @@\n \n if (reconnect)\n flow_ssh_master_connect (ssh_master);\n- else\n+ else if (is_connected)\n g_signal_emit_by_name (ssh_master, \"connect-finished\");\n \n return FALSE;\n"} {"commit":"4ba7957b557789812ef027a9b816b4cccb108e51","subject":"Updated square fn","message":"Updated square fn\n","repos":"fredrik-johansson\/flint2,dsroche\/flint2,jpflori\/flint2,jpflori\/flint2,jpflori\/flint2,jpflori\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,dsroche\/flint2,wbhart\/flint2,wbhart\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmpz_mat\/sqr_bodrato.c\n+++ fmpz_mat\/sqr_bodrato.c\n@@ -89,28 +89,22 @@\n fmpz_add(temp13, E(A, 0, 0), E(A, 2, 2));\n fmpz_add(temp23, E(A, 1, 1), E(A, 2, 2));\n \n- fmpz_zero(E(B, 0, 1));\n- fmpz_addmul(E(B, 0, 1), temp12, E(A, 0, 1));\n+ fmpz_mul(E(B, 0, 1), temp12, E(A, 0, 1));\n fmpz_addmul(E(B, 0, 1), E(A, 0, 2), E(A, 2, 1));\n \n- fmpz_zero(E(B, 0, 2));\n- fmpz_addmul(E(B, 0, 2), temp13, E(A, 0, 2));\n+ fmpz_mul(E(B, 0, 2), temp13, E(A, 0, 2));\n fmpz_addmul(E(B, 0, 2), E(A, 0, 1), E(A, 1, 2)); \n \n- fmpz_zero(E(B, 1, 0));\n- fmpz_addmul(E(B, 1, 0), temp12, E(A, 1, 0));\n+ fmpz_mul(E(B, 1, 0), temp12, E(A, 1, 0));\n fmpz_addmul(E(B, 1, 0), E(A, 2, 0), E(A, 1, 2));\n \n- fmpz_zero(E(B, 1, 2));\n- fmpz_addmul(E(B, 1, 2), temp23, E(A, 1, 2));\n+ fmpz_mul(E(B, 1, 2), temp23, E(A, 1, 2));\n fmpz_addmul(E(B, 1, 2), E(A, 1, 0), E(A, 0, 2));\n \n- fmpz_zero(E(B, 2, 0));\n- fmpz_addmul(E(B, 2, 0), temp13, E(A, 2, 0));\n+ fmpz_mul(E(B, 2, 0), temp13, E(A, 2, 0));\n fmpz_addmul(E(B, 2, 0), E(A, 2, 1), E(A, 1, 0));\n \n- fmpz_zero(E(B, 2, 1));\n- fmpz_addmul(E(B, 2, 1), temp23, E(A, 2, 1));\n+ fmpz_mul(E(B, 2, 1), temp23, E(A, 2, 1));\n fmpz_addmul(E(B, 2, 1), E(A, 0, 1), E(A, 2, 0));\n \n fmpz_clear(temp13);\n"} {"commit":"a310bdbf5cdc650f7ce15a94fff14358fc57eef9","subject":"Fixing findBiggerEqualThan(): All same keys should be found","message":"Fixing findBiggerEqualThan(): All same keys should be found\n","repos":"StefanoD\/AVLTree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- avltree.h\n+++ avltree.h\n@@ -218,12 +218,6 @@\n {\n if (p != nullptr) {\n if (p->value == value) {\n- \/\/ Get all equal values which are stored on the right branch\n- \/\/ See insertR().\n- while (p->right != nullptr && p->right->value == value) {\n- p = p->right;\n- }\n-\n return p;\n } else if (p->value < value) {\n if (p->right == nullptr) {\n"} {"commit":"f2319a6ca90b2a82b72ea7f8ebab5a55c632c823","subject":"Minor comment fix and a couple of typos","message":"Minor comment fix and a couple of typos\n\nSummary: `s\/Future\/SemiFuture\/` on `SemiFuture` ctor and fixed typo `s\/Timeekeeper\/Timekeeper\/`.\n\nReviewed By: yfeldblum\n\nDifferential Revision: D8290658\n\nfbshipit-source-id: 99ddbdecc0302e620bd2b4ebce74c6080cf81aec\n","repos":"facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/futures\/Future.h\n+++ folly\/futures\/Future.h\n@@ -337,7 +337,7 @@\n \/\/ a FutureBase pointer\n using typename Base::value_type;\n \n- \/\/\/ Construct a Future from a value (perfect forwarding)\n+ \/\/\/ Construct a SemiFuture from a value (perfect forwarding)\n template <\n class T2 = T,\n typename = typename std::enable_if<\n@@ -925,11 +925,11 @@\n Future<T> onTimeout(Duration, F&& func, Timekeeper* = nullptr);\n \n \/\/\/ Throw FutureTimeout if this Future does not complete within the given\n- \/\/\/ duration from now. The optional Timeekeeper is as with futures::sleep().\n+ \/\/\/ duration from now. The optional Timekeeper is as with futures::sleep().\n Future<T> within(Duration, Timekeeper* = nullptr);\n \n \/\/\/ Throw the given exception if this Future does not complete within the\n- \/\/\/ given duration from now. The optional Timeekeeper is as with\n+ \/\/\/ given duration from now. The optional Timekeeper is as with\n \/\/\/ futures::sleep().\n template <class E>\n Future<T> within(Duration, E exception, Timekeeper* = nullptr);\n"} {"commit":"62b14356463a7d6776bdfca66f4e0df76ebc94f9","subject":"cortexm: Remove __dso_handle from startup.c in favour of sys\/cpp11-compat\/cppsupport.cpp","message":"cortexm: Remove __dso_handle from startup.c in favour of sys\/cpp11-compat\/cppsupport.cpp\n","repos":"l3nko\/RIOT,haoyangyu\/RIOT,arvindpdmn\/RIOT,patkan\/RIOT,daniel-k\/RIOT,rfuentess\/RIOT,altairpearl\/RIOT,LudwigOrtmann\/RIOT,ThanhVic\/RIOT,dhruvvyas90\/RIOT,alex1818\/RIOT,ThanhVic\/RIOT,cladmi\/RIOT,kaleb-himes\/RIOT,Ell-i\/RIOT,abkam07\/RIOT,asanka-code\/RIOT,khhhh\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,RBartz\/RIOT,wentaoshang\/RIOT,neiljay\/RIOT,A-Paul\/RIOT,DipSwitch\/RIOT,authmillenon\/RIOT,Lexandro92\/RIOT-CoAP,backenklee\/RIOT,abkam07\/RIOT,dailab\/RIOT,Osblouf\/RIOT,kYc0o\/RIOT,kYc0o\/RIOT,A-Paul\/RIOT,plushvoxel\/RIOT,kerneltask\/RIOT,robixnai\/RIOT,rakendrathapa\/RIOT,brettswann\/RIOT,basilfx\/RIOT,yogo1212\/RIOT,smlng\/RIOT,jasonatran\/RIOT,zhuoshuguo\/RIOT,abkam07\/RIOT,abp719\/RIOT,x3ro\/RIOT,kYc0o\/RIOT,rfuentess\/RIOT,beurdouche\/RIOT,shady33\/RIOT,FrancescoErmini\/RIOT,daniel-k\/RIOT,malosek\/RIOT,mtausig\/RIOT,toonst\/RIOT,BytesGalore\/RIOT,binarylemon\/RIOT,latsku\/RIOT,RBartz\/RIOT,adjih\/RIOT,msolters\/RIOT,adrianghc\/RIOT,abp719\/RIOT,zhuoshuguo\/RIOT,adjih\/RIOT,herrfz\/RIOT,Hyungsin\/RIOT-OS,attdona\/RIOT,kYc0o\/RIOT,yogo1212\/RIOT,kb2ma\/RIOT,haoyangyu\/RIOT,RBartz\/RIOT,Hyungsin\/RIOT-OS,OTAkeys\/RIOT,altairpearl\/RIOT,OlegHahm\/RIOT,Josar\/RIOT,Lexandro92\/RIOT-CoAP,jremmert-phytec-iot\/RIOT,yogo1212\/RIOT,kaleb-himes\/RIOT,automote\/RIOT,ks156\/RIOT,MohmadAyman\/RIOT,adjih\/RIOT,binarylemon\/RIOT,Yonezawa-T2\/RIOT,basilfx\/RIOT,openkosmosorg\/RIOT,toonst\/RIOT,x3ro\/RIOT,RIOT-OS\/RIOT,asanka-code\/RIOT,asanka-code\/RIOT,gautric\/RIOT,khhhh\/RIOT,FrancescoErmini\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,MarkXYang\/RIOT,thomaseichinger\/RIOT,OTAkeys\/RIOT,Osblouf\/RIOT,Osblouf\/RIOT,TobiasFredersdorf\/RIOT,miri64\/RIOT,jbeyerstedt\/RIOT-OTA-update,kaleb-himes\/RIOT,lazytech-org\/RIOT,yogo1212\/RIOT,basilfx\/RIOT,backenklee\/RIOT,watr-li\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,cladmi\/RIOT,jfischer-phytec-iot\/RIOT,alex1818\/RIOT,mziegert\/RIOT,tfar\/RIOT,avmelnikoff\/RIOT,kerneltask\/RIOT,kbumsik\/RIOT,wentaoshang\/RIOT,neiljay\/RIOT,Hyungsin\/RIOT-OS,latsku\/RIOT,msolters\/RIOT,syin2\/RIOT,kaspar030\/RIOT,dhruvvyas90\/RIOT,shady33\/RIOT,watr-li\/RIOT,dkm\/RIOT,RIOT-OS\/RIOT,thiagohd\/RIOT,lazytech-org\/RIOT,RubikonAlpha\/RIOT,msolters\/RIOT,openkosmosorg\/RIOT,mziegert\/RIOT,Josar\/RIOT,msolters\/RIOT,LudwigKnuepfer\/RIOT,herrfz\/RIOT,plushvoxel\/RIOT,beurdouche\/RIOT,d00616\/RIOT,JensErdmann\/RIOT,d00616\/RIOT,daniel-k\/RIOT,mfrey\/RIOT,Josar\/RIOT,EmuxEvans\/RIOT,rfuentess\/RIOT,A-Paul\/RIOT,adjih\/RIOT,mfrey\/RIOT,abp719\/RIOT,smlng\/RIOT,ks156\/RIOT,BytesGalore\/RIOT,syin2\/RIOT,rousselk\/RIOT,Lexandro92\/RIOT-CoAP,biboc\/RIOT,watr-li\/RIOT,l3nko\/RIOT,dkm\/RIOT,wentaoshang\/RIOT,katezilla\/RIOT,neiljay\/RIOT,BytesGalore\/RIOT,EmuxEvans\/RIOT,neumodisch\/RIOT,hamilton-mote\/RIOT-OS,d00616\/RIOT,adrianghc\/RIOT,shady33\/RIOT,adrianghc\/RIOT,gbarnett\/RIOT,authmillenon\/RIOT,rakendrathapa\/RIOT,smlng\/RIOT,syin2\/RIOT,LudwigKnuepfer\/RIOT,kb2ma\/RIOT,wentaoshang\/RIOT,rousselk\/RIOT,l3nko\/RIOT,DipSwitch\/RIOT,d00616\/RIOT,automote\/RIOT,MonsterCode8000\/RIOT,jfischer-phytec-iot\/RIOT,asanka-code\/RIOT,yogo1212\/RIOT,kaspar030\/RIOT,tfar\/RIOT,LudwigOrtmann\/RIOT,RIOT-OS\/RIOT,mziegert\/RIOT,ThanhVic\/RIOT,haoyangyu\/RIOT,stevenj\/RIOT,biboc\/RIOT,avmelnikoff\/RIOT,MohmadAyman\/RIOT,gebart\/RIOT,mziegert\/RIOT,alex1818\/RIOT,DipSwitch\/RIOT,abkam07\/RIOT,kbumsik\/RIOT,roberthartung\/RIOT,kb2ma\/RIOT,stevenj\/RIOT,openkosmosorg\/RIOT,patkan\/RIOT,khhhh\/RIOT,Ell-i\/RIOT,immesys\/RiSyn,openkosmosorg\/RIOT,LudwigOrtmann\/RIOT,OTAkeys\/RIOT,jremmert-phytec-iot\/RIOT,jremmert-phytec-iot\/RIOT,mziegert\/RIOT,MarkXYang\/RIOT,gautric\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,adrianghc\/RIOT,dailab\/RIOT,dkm\/RIOT,dhruvvyas90\/RIOT,haoyangyu\/RIOT,d00616\/RIOT,roberthartung\/RIOT,A-Paul\/RIOT,daniel-k\/RIOT,MohmadAyman\/RIOT,OlegHahm\/RIOT,dkm\/RIOT,katezilla\/RIOT,lazytech-org\/RIOT,alignan\/RIOT,wentaoshang\/RIOT,rajma996\/RIOT,lebrush\/RIOT,thiagohd\/RIOT,lebrush\/RIOT,biboc\/RIOT,LudwigKnuepfer\/RIOT,binarylemon\/RIOT,Josar\/RIOT,arvindpdmn\/RIOT,malosek\/RIOT,kerneltask\/RIOT,brettswann\/RIOT,shady33\/RIOT,roberthartung\/RIOT,Lexandro92\/RIOT-CoAP,neumodisch\/RIOT,gbarnett\/RIOT,BytesGalore\/RIOT,JensErdmann\/RIOT,malosek\/RIOT,jfischer-phytec-iot\/RIOT,kbumsik\/RIOT,shady33\/RIOT,RubikonAlpha\/RIOT,mtausig\/RIOT,daniel-k\/RIOT,kaspar030\/RIOT,MonsterCode8000\/RIOT,abp719\/RIOT,ks156\/RIOT,jremmert-phytec-iot\/RIOT,x3ro\/RIOT,luciotorre\/RIOT,OlegHahm\/RIOT,patkan\/RIOT,neumodisch\/RIOT,jremmert-phytec-iot\/RIOT,rfuentess\/RIOT,l3nko\/RIOT,khhhh\/RIOT,syin2\/RIOT,RubikonAlpha\/RIOT,brettswann\/RIOT,avmelnikoff\/RIOT,robixnai\/RIOT,openkosmosorg\/RIOT,zhuoshuguo\/RIOT,immesys\/RiSyn,tfar\/RIOT,attdona\/RIOT,alignan\/RIOT,RIOT-OS\/RIOT,MohmadAyman\/RIOT,herrfz\/RIOT,aeneby\/RIOT,robixnai\/RIOT,MarkXYang\/RIOT,latsku\/RIOT,ant9000\/RIOT,ntrtrung\/RIOT,khhhh\/RIOT,TobiasFredersdorf\/RIOT,hamilton-mote\/RIOT-OS,miri64\/RIOT,thiagohd\/RIOT,backenklee\/RIOT,hamilton-mote\/RIOT-OS,JensErdmann\/RIOT,RBartz\/RIOT,rakendrathapa\/RIOT,neumodisch\/RIOT,msolters\/RIOT,robixnai\/RIOT,d00616\/RIOT,brettswann\/RIOT,RubikonAlpha\/RIOT,ThanhVic\/RIOT,cladmi\/RIOT,mtausig\/RIOT,MohmadAyman\/RIOT,josephnoir\/RIOT,FrancescoErmini\/RIOT,zhuoshuguo\/RIOT,MarkXYang\/RIOT,alex1818\/RIOT,x3ro\/RIOT,basilfx\/RIOT,rajma996\/RIOT,Lexandro92\/RIOT-CoAP,patkan\/RIOT,altairpearl\/RIOT,MohmadAyman\/RIOT,roberthartung\/RIOT,ant9000\/RIOT,luciotorre\/RIOT,katezilla\/RIOT,rajma996\/RIOT,patkan\/RIOT,malosek\/RIOT,Yonezawa-T2\/RIOT,mziegert\/RIOT,kerneltask\/RIOT,authmillenon\/RIOT,EmuxEvans\/RIOT,aeneby\/RIOT,biboc\/RIOT,altairpearl\/RIOT,stevenj\/RIOT,Ell-i\/RIOT,ant9000\/RIOT,mfrey\/RIOT,EmuxEvans\/RIOT,watr-li\/RIOT,jbeyerstedt\/RIOT-OTA-update,dhruvvyas90\/RIOT,FrancescoErmini\/RIOT,JensErdmann\/RIOT,jbeyerstedt\/RIOT-OTA-update,immesys\/RiSyn,gautric\/RIOT,yogo1212\/RIOT,gbarnett\/RIOT,gebart\/RIOT,Ell-i\/RIOT,robixnai\/RIOT,Osblouf\/RIOT,rfuentess\/RIOT,gebart\/RIOT,rakendrathapa\/RIOT,kbumsik\/RIOT,toonst\/RIOT,Hyungsin\/RIOT-OS,ant9000\/RIOT,LudwigKnuepfer\/RIOT,watr-li\/RIOT,aeneby\/RIOT,rousselk\/RIOT,miri64\/RIOT,rajma996\/RIOT,plushvoxel\/RIOT,A-Paul\/RIOT,EmuxEvans\/RIOT,dkm\/RIOT,alignan\/RIOT,josephnoir\/RIOT,arvindpdmn\/RIOT,luciotorre\/RIOT,abp719\/RIOT,automote\/RIOT,msolters\/RIOT,LudwigOrtmann\/RIOT,Yonezawa-T2\/RIOT,immesys\/RiSyn,jasonatran\/RIOT,aeneby\/RIOT,Hyungsin\/RIOT-OS,mtausig\/RIOT,avmelnikoff\/RIOT,robixnai\/RIOT,beurdouche\/RIOT,gbarnett\/RIOT,rousselk\/RIOT,Yonezawa-T2\/RIOT,TobiasFredersdorf\/RIOT,malosek\/RIOT,herrfz\/RIOT,MonsterCode8000\/RIOT,RBartz\/RIOT,RIOT-OS\/RIOT,thomaseichinger\/RIOT,attdona\/RIOT,immesys\/RiSyn,LudwigOrtmann\/RIOT,rousselk\/RIOT,stevenj\/RIOT,kaleb-himes\/RIOT,Yonezawa-T2\/RIOT,brettswann\/RIOT,automote\/RIOT,alex1818\/RIOT,herrfz\/RIOT,josephnoir\/RIOT,l3nko\/RIOT,kerneltask\/RIOT,toonst\/RIOT,lazytech-org\/RIOT,cladmi\/RIOT,kaspar030\/RIOT,neiljay\/RIOT,abkam07\/RIOT,gbarnett\/RIOT,tfar\/RIOT,josephnoir\/RIOT,LudwigOrtmann\/RIOT,rajma996\/RIOT,dailab\/RIOT,haoyangyu\/RIOT,attdona\/RIOT,MarkXYang\/RIOT,jfischer-phytec-iot\/RIOT,alignan\/RIOT,dhruvvyas90\/RIOT,thomaseichinger\/RIOT,abkam07\/RIOT,smlng\/RIOT,luciotorre\/RIOT,binarylemon\/RIOT,neiljay\/RIOT,LudwigKnuepfer\/RIOT,jbeyerstedt\/RIOT-OTA-update,BytesGalore\/RIOT,haoyangyu\/RIOT,hamilton-mote\/RIOT-OS,TobiasFredersdorf\/RIOT,stevenj\/RIOT,latsku\/RIOT,automote\/RIOT,asanka-code\/RIOT,aeneby\/RIOT,latsku\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,Josar\/RIOT,adrianghc\/RIOT,arvindpdmn\/RIOT,beurdouche\/RIOT,wentaoshang\/RIOT,latsku\/RIOT,gebart\/RIOT,rajma996\/RIOT,backenklee\/RIOT,JensErdmann\/RIOT,RubikonAlpha\/RIOT,ntrtrung\/RIOT,FrancescoErmini\/RIOT,TobiasFredersdorf\/RIOT,roberthartung\/RIOT,MonsterCode8000\/RIOT,watr-li\/RIOT,mfrey\/RIOT,khhhh\/RIOT,thiagohd\/RIOT,ks156\/RIOT,dhruvvyas90\/RIOT,altairpearl\/RIOT,kb2ma\/RIOT,Ell-i\/RIOT,immesys\/RiSyn,DipSwitch\/RIOT,openkosmosorg\/RIOT,syin2\/RIOT,mtausig\/RIOT,ntrtrung\/RIOT,gautric\/RIOT,FrancescoErmini\/RIOT,luciotorre\/RIOT,RBartz\/RIOT,authmillenon\/RIOT,smlng\/RIOT,daniel-k\/RIOT,kbumsik\/RIOT,dailab\/RIOT,rakendrathapa\/RIOT,lebrush\/RIOT,authmillenon\/RIOT,kb2ma\/RIOT,adjih\/RIOT,malosek\/RIOT,altairpearl\/RIOT,josephnoir\/RIOT,katezilla\/RIOT,basilfx\/RIOT,Osblouf\/RIOT,l3nko\/RIOT,ThanhVic\/RIOT,x3ro\/RIOT,Osblouf\/RIOT,ThanhVic\/RIOT,Lexandro92\/RIOT-CoAP,katezilla\/RIOT,zhuoshuguo\/RIOT,plushvoxel\/RIOT,neumodisch\/RIOT,jasonatran\/RIOT,OlegHahm\/RIOT,stevenj\/RIOT,ntrtrung\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,miri64\/RIOT,MonsterCode8000\/RIOT,arvindpdmn\/RIOT,attdona\/RIOT,lebrush\/RIOT,patkan\/RIOT,ntrtrung\/RIOT,JensErdmann\/RIOT,OTAkeys\/RIOT,RubikonAlpha\/RIOT,jfischer-phytec-iot\/RIOT,binarylemon\/RIOT,arvindpdmn\/RIOT,miri64\/RIOT,rakendrathapa\/RIOT,lazytech-org\/RIOT,mfrey\/RIOT,binarylemon\/RIOT,jremmert-phytec-iot\/RIOT,zhuoshuguo\/RIOT,rousselk\/RIOT,thomaseichinger\/RIOT,alex1818\/RIOT,MonsterCode8000\/RIOT,automote\/RIOT,ks156\/RIOT,Yonezawa-T2\/RIOT,brettswann\/RIOT,lebrush\/RIOT,kYc0o\/RIOT,avmelnikoff\/RIOT,thiagohd\/RIOT,attdona\/RIOT,authmillenon\/RIOT,biboc\/RIOT,backenklee\/RIOT,alignan\/RIOT,thomaseichinger\/RIOT,neumodisch\/RIOT,ntrtrung\/RIOT,thiagohd\/RIOT,toonst\/RIOT,gautric\/RIOT,kaleb-himes\/RIOT,dailab\/RIOT,plushvoxel\/RIOT,abp719\/RIOT,tfar\/RIOT,EmuxEvans\/RIOT,herrfz\/RIOT,DipSwitch\/RIOT,luciotorre\/RIOT,jasonatran\/RIOT,cladmi\/RIOT,gebart\/RIOT,beurdouche\/RIOT,lebrush\/RIOT,jbeyerstedt\/RIOT-OTA-update,OlegHahm\/RIOT,DipSwitch\/RIOT,asanka-code\/RIOT,jasonatran\/RIOT,gbarnett\/RIOT,MarkXYang\/RIOT,ant9000\/RIOT,hamilton-mote\/RIOT-OS,shady33\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/cortexm_common\/vectors_cortexm.c\n+++ cpu\/cortexm_common\/vectors_cortexm.c\n@@ -47,11 +47,6 @@\n * 'while (1);', i.e. an infinite loop.\n *\/\n #define STACK_CANARY_WORD 0xE7FEE7FEu\n-\n-\/**\n- * @brief Required by g++ cross compiler\n- *\/\n-void *__dso_handle;\n \n \/**\n * @brief Pre-start routine for CPU-specific settings\n"} {"commit":"1238241c4ee39ea648b11c235ef3a5d2491c7a86","subject":"[IOT-1810]Fix for Double free of payload in C for Notification Message","message":"[IOT-1810]Fix for Double free of payload in C for Notification Message\n\nChange-Id: I8f1ddb3208e6383e4e4154c78b03838aa579c902\nSigned-off-by: abitha.s <7d9cb1db66e8c4253ed1ec60238bd2c1e14411d8@samsung.com>\nReviewed-on: https:\/\/gerrit.iotivity.org\/gerrit\/17149\nReviewed-by: Chihyun Cho <b32a386441682bfbcf78768049c86636501c53fa@samsung.com>\nTested-by: jenkins-iotivity <d95b56ce41a2e1ac4cecdd398defd7414407cc08@iotivity.org>\nReviewed-by: Uze Choi <3a26c91d8a4a3c9e246e43339f4782bb2483aece@samsung.com>\n","repos":"iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- service\/notification\/src\/provider\/NSProviderNotification.c\n+++ service\/notification\/src\/provider\/NSProviderNotification.c\n@@ -136,6 +136,7 @@\n {\n NS_LOG(ERROR, \"SubList->head is NULL, empty SubList\");\n OCRepPayloadDestroy(payload);\n+ msg->extraInfo = NULL;\n return NS_ERROR;\n }\n \n@@ -203,6 +204,7 @@\n {\n NS_LOG(ERROR, \"observer count is zero\");\n OCRepPayloadDestroy(payload);\n+ msg->extraInfo = NULL;\n return NS_ERROR;\n }\n \n"} {"commit":"56fc8bd4c78fa84221c6019410eaa438f19fd1b8","subject":"Changed some files","message":"Changed some files\n","repos":"izenecloud\/sf1r-ad-delivery,pombredanne\/sf1r-lite,izenecloud\/sf1r-lite,izenecloud\/sf1r-lite,izenecloud\/sf1r-lite,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-lite,pombredanne\/sf1r-lite,izenecloud\/sf1r-ad-delivery,pombredanne\/sf1r-lite,pombredanne\/sf1r-lite,izenecloud\/sf1r-ad-delivery,izenecloud\/sf1r-lite,pombredanne\/sf1r-lite","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/core\/mining-manager\/ad-index-manager\/AdMiningTask.h\n+++ source\/core\/mining-manager\/ad-index-manager\/AdMiningTask.h\n@@ -6,7 +6,7 @@\n #define SF1_AD_MINING_TASK_H_\n \n #include \"..\/MiningTask.h\"\n-#include <ir\/be_index\/DNFInvIndex.hpp>\n+#include <ir\/be_index\/InvIndex.hpp>\n \n #include <boost\/shared_ptr.hpp>\n \n@@ -21,7 +21,7 @@\n const std::string& path,\n boost::shared_ptr<DocumentManager> dm);\n ~AdMiningTask();\n- typedef izenelib::ir::be::DNFInvIndex AdIndexType;\n+ typedef izenelib::ir::be_index::DNFInvIndex AdIndexType;\n bool buildDocument(docid_t docID, const Document& doc);\n bool preProcess(int64_t timestamp);\n bool postProcess();\n"} {"commit":"959cd8307820d51bedb295c0db9ca139bfd83e8f","subject":"Another fix for zstd (de)compression","message":"Another fix for zstd (de)compression\n","repos":"sergey-dryabzhinsky\/dedupsqlfs,sergey-dryabzhinsky\/dedupsqlfs,sergey-dryabzhinsky\/dedupsqlfs,sergey-dryabzhinsky\/dedupsqlfs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib-dynload\/zstd\/src\/python-zstd.c\n+++ lib-dynload\/zstd\/src\/python-zstd.c\n@@ -87,7 +87,7 @@\n return NULL;\n #endif\n \n- header_size = sizeof(dest_size)\n+ header_size = sizeof(dest_size);\n \n memcpy(&dest_size, source, header_size);\n result = PyBytes_FromStringAndSize(NULL, dest_size);\n"} {"commit":"25ec9a9d50cc6d0b6663394b9b03e42189dcdd9f","subject":"Fix stub header file","message":"Fix stub header file\n","repos":"cupy\/cupy,cupy\/cupy,cupy\/cupy,cupy\/cupy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cupy_backends\/cuda\/libs\/cupy_cudnn.h\n+++ cupy_backends\/cuda\/libs\/cupy_cudnn.h\n@@ -9,7 +9,7 @@\n \n #else \/\/ #ifndef CUPY_NO_CUDA\n \n-#include \"..\/..\/cupy_cuda_common.h\"\n+#include \"..\/cupy_cuda_common.h\"\n \n #define CUDNN_VERSION 0\n \n"} {"commit":"eb75364020aad1af558b756e4a5e2eeea91be36f","subject":"Remove <iostream>.","message":"Remove <iostream>.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@79146 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/CodeGen\/PBQP\/HeuristicSolver.h\n+++ lib\/CodeGen\/PBQP\/HeuristicSolver.h\n@@ -18,9 +18,8 @@\n \n #include \"Solver.h\"\n #include \"AnnotatedGraph.h\"\n-\n+#include \"llvm\/Support\/raw_ostream.h\"\n #include <limits>\n-#include <iostream>\n \n namespace PBQP {\n \n@@ -470,26 +469,24 @@\n }\n \n void printNode(const GraphNodeIterator &nodeItr) {\n-\n- std::cerr << \"Node \" << g.getNodeID(nodeItr) << \" (\" << &*nodeItr << \"):\\n\"\n- << \" costs = \" << g.getNodeCosts(nodeItr) << \"\\n\"\n- << \" link degree = \" << g.getNodeData(nodeItr).getLinkDegree() << \"\\n\"\n- << \" links = [ \";\n+ llvm::errs() << \"Node \" << g.getNodeID(nodeItr) << \" (\" << &*nodeItr << \"):\\n\"\n+ << \" costs = \" << g.getNodeCosts(nodeItr) << \"\\n\"\n+ << \" link degree = \" << g.getNodeData(nodeItr).getLinkDegree() << \"\\n\"\n+ << \" links = [ \";\n \n for (typename HSIT::NodeData::AdjLinkIterator \n aeItr = g.getNodeData(nodeItr).adjLinksBegin(),\n aeEnd = g.getNodeData(nodeItr).adjLinksEnd();\n aeItr != aeEnd; ++aeItr) {\n- std::cerr << \"(\" << g.getNodeID(g.getEdgeNode1Itr(*aeItr))\n- << \", \" << g.getNodeID(g.getEdgeNode2Itr(*aeItr))\n- << \") \";\n- }\n- std::cout << \"]\\n\";\n+ llvm::errs() << \"(\" << g.getNodeID(g.getEdgeNode1Itr(*aeItr))\n+ << \", \" << g.getNodeID(g.getEdgeNode2Itr(*aeItr))\n+ << \") \";\n+ }\n+ llvm::errs() << \"]\\n\";\n }\n \n void dumpState() {\n-\n- std::cerr << \"\\n\";\n+ llvm::errs() << \"\\n\";\n \n for (GraphNodeIterator nodeItr = g.nodesBegin(), nodeEnd = g.nodesEnd();\n nodeItr != nodeEnd; ++nodeItr) {\n@@ -501,22 +498,22 @@\n for (unsigned b = 0; b < 3; ++b) {\n NodeList &bucket = *buckets[b];\n \n- std::cerr << \"Bucket \" << b << \": [ \";\n+ llvm::errs() << \"Bucket \" << b << \": [ \";\n \n for (NodeListIterator nItr = bucket.begin(), nEnd = bucket.end();\n nItr != nEnd; ++nItr) {\n- std::cerr << g.getNodeID(*nItr) << \" \";\n- }\n-\n- std::cerr << \"]\\n\";\n- }\n-\n- std::cerr << \"Stack: [ \";\n+ llvm::errs() << g.getNodeID(*nItr) << \" \";\n+ }\n+\n+ llvm::errs() << \"]\\n\";\n+ }\n+\n+ llvm::errs() << \"Stack: [ \";\n for (NodeStackIterator nsItr = stack.begin(), nsEnd = stack.end();\n nsItr != nsEnd; ++nsItr) {\n- std::cerr << g.getNodeID(*nsItr) << \" \";\n- }\n- std::cerr << \"]\\n\";\n+ llvm::errs() << g.getNodeID(*nsItr) << \" \";\n+ }\n+ llvm::errs() << \"]\\n\";\n }\n \n void reduce() {\n@@ -549,7 +546,7 @@\n \n solution.incR1Reductions();\n \n- \/\/std::cerr << \"Applying R1 to \" << g.getNodeID(xNodeItr) << \"\\n\";\n+ \/\/llvm::errs() << \"Applying R1 to \" << g.getNodeID(xNodeItr) << \"\\n\";\n \n assert((g.getNodeData(xNodeItr).getLinkDegree() == 1) &&\n \"Node in R1 bucket has degree != 1\");\n"} {"commit":"df4276c97583a289a8d31661fdf6674add5709a9","subject":"Remove more extra generated code.","message":"Remove more extra generated code.\n","repos":"grandquista\/ReQL-Core,grandquista\/ReQL-Core,grandquista\/ReQL-Core,grandquista\/ReQL-Core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ReQL-ast.c\n+++ ReQL-ast.c\n@@ -1381,1354 +1381,3 @@\n term->obj.args.args = args;\n term->obj.args.kwargs = kwargs;\n }\n-_ReQL_Op _reql_ast_june_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_JUNE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_keys(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_keys_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_keys_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_KEYS;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_le(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_le_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_le_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_LE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_limit(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_limit_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_limit_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_LIMIT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_line(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_line_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_line_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_LINE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_literal(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_literal_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_literal_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_LITERAL;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_lt(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_lt_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_lt_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_LT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_make_array(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_make_array_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_make_array_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MAKE_ARRAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_make_obj(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_make_obj_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_make_obj_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MAKE_OBJ;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_map(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_map_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_map_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MAP;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_march(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_march_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_march_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MARCH;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_match(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_match_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_match_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MATCH;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_max(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_max_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_max_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MAX;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_may(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_may_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_may_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_merge(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_merge_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_merge_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MERGE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_min(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_min_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_min_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MIN;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_minutes(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_minutes_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_minutes_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MINUTES;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_mod(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_mod_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_mod_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MOD;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_monday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_monday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_monday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MONDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_month(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_month_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_month_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MONTH;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_mul(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_mul_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_mul_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_MUL;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_ne(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_ne_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_ne_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_NE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_not(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_not_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_not_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_NOT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_november(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_november_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_november_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_NOVEMBER;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_now(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_now_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_now_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_NOW;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_nth(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_nth_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_nth_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_NTH;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_object(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_object_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_object_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_OBJECT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_october(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_october_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_october_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_OCTOBER;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_order_by(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_order_by_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_order_by_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_ORDER_BY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_outer_join(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_outer_join_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_outer_join_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_OUTER_JOIN;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_pluck(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_pluck_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_pluck_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_PLUCK;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_point(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_point_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_point_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_POINT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_polygon(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_polygon_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_polygon_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_POLYGON;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_polygon_sub(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_polygon_sub_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_polygon_sub_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_POLYGON_SUB;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_prepend(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_prepend_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_prepend_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_PREPEND;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_random(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_random_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_random_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_RANDOM;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_range(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_range_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_range_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_RANGE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_rebalance(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_rebalance_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_rebalance_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_REBALANCE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_reconfigure(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_reconfigure_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_reconfigure_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_RECONFIGURE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_reduce(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_reduce_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_reduce_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_REDUCE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_replace(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_replace_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_replace_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_REPLACE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sample(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_sample_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sample_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SAMPLE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_saturday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_saturday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_saturday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SATURDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_seconds(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_seconds_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_seconds_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SECONDS;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_september(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_september_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_september_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SEPTEMBER;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_difference(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_set_difference_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_difference_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SET_DIFFERENCE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_insert(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_set_insert_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_insert_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SET_INSERT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_intersection(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_set_intersection_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_intersection_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SET_INTERSECTION;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_union(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_set_union_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_set_union_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SET_UNION;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_skip(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_skip_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_skip_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SKIP;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_slice(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_slice_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_slice_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SLICE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_splice_at(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_splice_at_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_splice_at_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SPLICE_AT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_split(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_split_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_split_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SPLIT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sub(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_sub_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sub_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SUB;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sum(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_sum_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sum_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SUM;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sunday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_sunday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sunday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SUNDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sync(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_sync_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_sync_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_SYNC;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_config(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_config_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_config_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_CONFIG;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_create(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_create_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_create_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_CREATE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_drop(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_drop_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_drop_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_DROP;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_list(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_list_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_list_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_LIST;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_status(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_status_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_status_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_STATUS;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_wait(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_table_wait_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_table_wait_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TABLE_WAIT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_thursday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_thursday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_thursday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_THURSDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_time(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_time_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_time_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TIME;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_timezone(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_timezone_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_timezone_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TIMEZONE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_time_of_day(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_time_of_day_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_time_of_day_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TIME_OF_DAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_epoch_time(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_to_epoch_time_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_epoch_time_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TO_EPOCH_TIME;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_geojson(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_to_geojson_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_geojson_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TO_GEOJSON;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_iso8601(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_to_iso8601_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_iso8601_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TO_ISO8601;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_json_string(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_to_json_string_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_to_json_string_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TO_JSON_STRING;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_tuesday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_tuesday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_tuesday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TUESDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_type_of(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_type_of_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_type_of_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_TYPE_OF;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_ungroup(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_ungroup_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_ungroup_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_UNGROUP;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_union(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_union_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_union_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_UNION;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_upcase(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_upcase_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_upcase_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_UPCASE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_update(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_update_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_update_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_UPDATE;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_uuid(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_uuid_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_uuid_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_UUID;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_var(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_var_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_var_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_VAR;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_wednesday(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_wednesday_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_wednesday_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_WEDNESDAY;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_without(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_without_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_without_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_WITHOUT;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_with_fields(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_with_fields_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_with_fields_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_WITH_FIELDS;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_year(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_year_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_year_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_YEAR;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_zip(_ReQL_Op args, _ReQL_Op kwargs) {\n- return _reql_ast_zip_(NULL, args, kwargs);\n-}\n-\n-\/**\n- *\/\n-_ReQL_Op _reql_ast_zip_(_ReQL_Op term, _ReQL_Op args, _ReQL_Op kwargs) {\n- term = _reql_json_null(term);\n- term->tt = _REQL_ZIP;\n- term->obj.args.args = args;\n- term->obj.args.kwargs = kwargs;\n- return term;\n-}\n"} {"commit":"6fd327da8ce1756cfe5bf0d1fa1f3c0f2b674621","subject":"api fix","message":"api fix\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- testmud\/mud\/home\/Game\/lib\/object.c\n+++ testmud\/mud\/home\/Game\/lib\/object.c\n@@ -28,7 +28,7 @@\n \tset_id_base(parts[sz - 1]);\n }\n \n-int forbid_insert()\n+int forbid_insert(object obj)\n {\n \treturn destructing;\n }\n"} {"commit":"c529d0a420ba4ba2031f61a4b86f59e31ddc964e","subject":"ASoC: hx4700: Automatically disconnect non-connected pins","message":"ASoC: hx4700: Automatically disconnect non-connected pins\n\nAll DAPM input and output pins of the ak4641 are either used in the card's\nDAPM routing table or are marked as not connected.\n\nSet the fully_routed flag of the card instead of manually marking the unused\ninputs and outputs as not connected. This makes the code a bit shorter and\ncleaner.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"9b389a8a022110b4bc055a19b888283544d9eba6","subject":"ALSA: 6fire: Fix probe of multiple cards","message":"ALSA: 6fire: Fix probe of multiple cards\n\nThe probe code of snd-usb-6fire driver overrides the devices[] pointer\nwrongly without checking whether it's already occupied or not. This\nwould screw up the device disconnection later.\n\nSpotted by coverity CID 141423.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/usb\/6fire\/chip.c\n+++ sound\/usb\/6fire\/chip.c\n@@ -101,7 +101,7 @@\n \t\t\tusb_set_intfdata(intf, chips[i]);\n \t\t\tmutex_unlock(®ister_mutex);\n \t\t\treturn 0;\n-\t\t} else if (regidx < 0)\n+\t\t} else if (!devices[i] && regidx < 0)\n \t\t\tregidx = i;\n \t}\n \tif (regidx < 0) {\n"} {"commit":"5edcdf1ceeb8ff051ea3533396f47e60375e7156","subject":"mcu\/stm32f3; new prototype for hal_gpio_toggle().","message":"mcu\/stm32f3; new prototype for hal_gpio_toggle().\n","repos":"runtimeinc\/mynewt_stm32f3,runtimeinc\/mynewt_stm32f3","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/mcu\/stm\/stm32f3xx\/src\/hal_gpio.c\n+++ hw\/mcu\/stm\/stm32f3xx\/src\/hal_gpio.c\n@@ -532,10 +532,14 @@\n *\n * @param pin Pin number to toggle\n *\/\n-void\n+int\n hal_gpio_toggle(int pin)\n {\n- hal_gpio_write(pin, !hal_gpio_read(pin));\n+ int pin_state = !hal_gpio_read(pin);\n+\n+ hal_gpio_write(pin, pin_state);\n+\n+ return pin_state;\n }\n \n \/**\n"} {"commit":"fd75cc6e3dbfc29b982d724e17357cb6edf35e2e","subject":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_PACK_SWAP_BYTES","message":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_PACK_SWAP_BYTES\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extensions\/ringopengl\/opengl11\/ring_opengl11.c\n+++ extensions\/ringopengl\/opengl11\/ring_opengl11.c\n@@ -1133,6 +1133,11 @@\n RING_FUNC(ring_get_gl_unpack_alignment)\n {\n \tRING_API_RETNUMBER(GL_UNPACK_ALIGNMENT);\n+}\n+\n+RING_FUNC(ring_get_gl_pack_swap_bytes)\n+{\n+\tRING_API_RETNUMBER(GL_PACK_SWAP_BYTES);\n }\n \n RING_API void ringlib_init(RingState *pRingState)\n@@ -1362,4 +1367,5 @@\n \tring_vm_funcregister(\"get_gl_unpack_skip_rows\",ring_get_gl_unpack_skip_rows);\n \tring_vm_funcregister(\"get_gl_unpack_skip_pixels\",ring_get_gl_unpack_skip_pixels);\n \tring_vm_funcregister(\"get_gl_unpack_alignment\",ring_get_gl_unpack_alignment);\n-}\n+\tring_vm_funcregister(\"get_gl_pack_swap_bytes\",ring_get_gl_pack_swap_bytes);\n+}\n"} {"commit":"b598cbb58072c95ec6ae330b543a23cc908badc1","subject":"Update RingOpenGL 1.1 - Add Function (Source Code) : void glTexCoord1dv(const GLdouble *v)","message":"Update RingOpenGL 1.1 - Add Function (Source Code) : void glTexCoord1dv(const GLdouble *v)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extensions\/ringopengl\/opengl11\/ring_opengl11.c\n+++ extensions\/ringopengl\/opengl11\/ring_opengl11.c\n@@ -7614,6 +7614,20 @@\n \t\treturn ;\n \t}\n \tglTexCoord1d( (GLdouble ) RING_API_GETNUMBER(1));\n+}\n+\n+\n+RING_FUNC(ring_glTexCoord1dv)\n+{\n+\tif ( RING_API_PARACOUNT != 1 ) {\n+\t\tRING_API_ERROR(RING_API_MISS1PARA);\n+\t\treturn ;\n+\t}\n+\tif ( ! RING_API_ISPOINTER(1) ) {\n+\t\tRING_API_ERROR(RING_API_BADPARATYPE);\n+\t\treturn ;\n+\t}\n+\tglTexCoord1dv((GLdouble *) RING_API_GETCPOINTER(1,\"GLdouble\"));\n }\n \n RING_API void ringlib_init(RingState *pRingState)\n@@ -7876,6 +7890,7 @@\n \tring_vm_funcregister(\"glstencilmask\",ring_glStencilMask);\n \tring_vm_funcregister(\"glstencilop\",ring_glStencilOp);\n \tring_vm_funcregister(\"gltexcoord1d\",ring_glTexCoord1d);\n+\tring_vm_funcregister(\"gltexcoord1dv\",ring_glTexCoord1dv);\n \tring_vm_funcregister(\"get_gl_zero\",ring_get_gl_zero);\n \tring_vm_funcregister(\"get_gl_false\",ring_get_gl_false);\n \tring_vm_funcregister(\"get_gl_logic_op\",ring_get_gl_logic_op);\n"} {"commit":"c8c56eec911d58e167d3772dbc10f4e4242c10c0","subject":"core: Correctly track JSON reader state when cloning nodes","message":"core: Correctly track JSON reader state when cloning nodes\n\nIt is not safe to call json_reader_get_member_name() after recursing the\nparser state, so we have to copy the list of member names before\niterating.\n","repos":"pwithnall\/libgdata,GNOME\/libgdata,pwithnall\/libgdata","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdata\/gdata-parsable.c\n+++ gdata\/gdata-parsable.c\n@@ -209,16 +209,19 @@\n \t\t}\n \t} else if (json_reader_is_object (reader) == TRUE) {\n \t\t\/* Object nodes require deep copies. *\/\n-\t\tgint i, members;\n+\t\tgint i;\n+\t\tgchar **members;\n \t\tJsonObject *obj;\n \n \t\tobj = json_object_new ();\n \n-\t\tfor (i = 0, members = json_reader_count_members (reader); i < members; i++) {\n-\t\t\tjson_reader_read_element (reader, i);\n-\t\t\tjson_object_set_member (obj, json_reader_get_member_name (reader), _json_reader_dup_current_node (reader));\n-\t\t\tjson_reader_end_element (reader);\n+\t\tfor (i = 0, members = json_reader_list_members (reader); members[i] != NULL; i++) {\n+\t\t\tjson_reader_read_member (reader, members[i]);\n+\t\t\tjson_object_set_member (obj, members[i], _json_reader_dup_current_node (reader));\n+\t\t\tjson_reader_end_member (reader);\n \t\t}\n+\n+\t\tg_strfreev (members);\n \n \t\tvalue = json_node_new (JSON_NODE_OBJECT);\n \t\tjson_node_take_object (value, obj);\n"} {"commit":"6cdb418e5d86cd6f68f130162f0b7c754ea69408","subject":"tests: drivers: can: fd: test returned error codes when started\/stopped","message":"tests: drivers: can: fd: test returned error codes when started\/stopped\n\nAdd tests for the required error return codes when the CAN controller is\nstarted\/stopped.\n\nSigned-off-by: Henrik Brix Andersen <24a3f13c22635bab658e39fc5f1e63c575328aae@vestas.com>\n","repos":"finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/drivers\/can\/canfd\/src\/main.c\n+++ tests\/drivers\/can\/canfd\/src\/main.c\n@@ -14,6 +14,16 @@\n * @defgroup t_can_canfd test_can_canfd\n * @}\n *\/\n+\n+\/**\n+ * Test bitrates in bits\/second.\n+ *\/\n+#define TEST_BITRATE 1000000\n+\n+\/**\n+ * Test sample points in per mille.\n+ *\/\n+#define TEST_SAMPLE_POINT 750\n \n \n \/**\n@@ -380,6 +390,36 @@\n \t\t &test_std_frame_fd_1, &test_std_frame_2);\n }\n \n+\/**\n+ * @brief Test setting bitrate is not allowed while started.\n+ *\/\n+ZTEST_USER(canfd, test_set_bitrate_data_while_started)\n+{\n+\tint err;\n+\n+\terr = can_set_bitrate_data(can_dev, TEST_BITRATE);\n+\tzassert_not_equal(err, 0, \"changed data bitrate while started\");\n+\tzassert_equal(err, -EBUSY, \"wrong error return code (err %d)\", err);\n+}\n+\n+\/**\n+ * @brief Test setting timing is not allowed while started.\n+ *\/\n+ZTEST_USER(canfd, test_set_timing_data_while_started)\n+{\n+\tstruct can_timing timing;\n+\tint err;\n+\n+\ttiming.sjw = CAN_SJW_NO_CHANGE;\n+\n+\terr = can_calc_timing_data(can_dev, &timing, TEST_BITRATE, TEST_SAMPLE_POINT);\n+\tzassert_ok(err, \"failed to calculate data timing (err %d)\", err);\n+\n+\terr = can_set_timing(can_dev, &timing);\n+\tzassert_not_equal(err, 0, \"changed data timing while started\");\n+\tzassert_equal(err, -EBUSY, \"wrong error return code (err %d)\", err);\n+}\n+\n void *canfd_setup(void)\n {\n \tint err;\n"} {"commit":"cc24e448ec10defdb5e5c369b6fa94a82c46a8c5","subject":"Skip XCCDF 1.1 schematron validation","message":"Skip XCCDF 1.1 schematron validation\n\nXCCDF 1.1 schematron doesn't exist, so we shouldn't fail the schematron\nvalidation when given an XCCDF 1.1 document but instead we can just\nskip it.\n","repos":"OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/source\/schematron.c\n+++ src\/source\/schematron.c\n@@ -656,6 +656,10 @@\n \t\tfprintf(outfile_fd, \"Skipped\\n\");\n \t\treturn 0;\n \t}\n+\tif (scap_type == OSCAP_DOCUMENT_XCCDF && !strcmp(version, \"1.1\")) {\n+\t\tfprintf(outfile_fd, \"Skipped\\n\");\n+\t\treturn 0;\n+\t}\n \n \t\/* find a right schematron file *\/\n \tconst char *schematron_path = NULL;\n"} {"commit":"89e1c9833933ada28a20c12b4c0151c8257f6ba1","subject":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_DECR","message":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_DECR\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extensions\/ringopengl\/opengl11\/ring_opengl11.c\n+++ extensions\/ringopengl\/opengl11\/ring_opengl11.c\n@@ -1923,6 +1923,11 @@\n RING_FUNC(ring_get_gl_incr)\n {\n \tRING_API_RETNUMBER(GL_INCR);\n+}\n+\n+RING_FUNC(ring_get_gl_decr)\n+{\n+\tRING_API_RETNUMBER(GL_DECR);\n }\n \n RING_API void ringlib_init(RingState *pRingState)\n@@ -2310,4 +2315,5 @@\n \tring_vm_funcregister(\"get_gl_keep\",ring_get_gl_keep);\n \tring_vm_funcregister(\"get_gl_replace\",ring_get_gl_replace);\n \tring_vm_funcregister(\"get_gl_incr\",ring_get_gl_incr);\n-}\n+\tring_vm_funcregister(\"get_gl_decr\",ring_get_gl_decr);\n+}\n"} {"commit":"e676fa3f5f262956533ece94160e8863e1422545","subject":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_TEXTURE_GEN_R","message":"Update RingOpenGL 1.1 - Add Constant (Source Code) : GL_TEXTURE_GEN_R\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extensions\/ringopengl\/opengl11\/ring_opengl11.c\n+++ extensions\/ringopengl\/opengl11\/ring_opengl11.c\n@@ -993,6 +993,11 @@\n RING_FUNC(ring_get_gl_texture_gen_t)\n {\n \tRING_API_RETNUMBER(GL_TEXTURE_GEN_T);\n+}\n+\n+RING_FUNC(ring_get_gl_texture_gen_r)\n+{\n+\tRING_API_RETNUMBER(GL_TEXTURE_GEN_R);\n }\n \n RING_API void ringlib_init(RingState *pRingState)\n@@ -1194,4 +1199,5 @@\n \tring_vm_funcregister(\"get_gl_fog_hint\",ring_get_gl_fog_hint);\n \tring_vm_funcregister(\"get_gl_texture_gen_s\",ring_get_gl_texture_gen_s);\n \tring_vm_funcregister(\"get_gl_texture_gen_t\",ring_get_gl_texture_gen_t);\n-}\n+\tring_vm_funcregister(\"get_gl_texture_gen_r\",ring_get_gl_texture_gen_r);\n+}\n"} {"commit":"281b66d58c39f2abd0f78ab62f5e4e7dbec28a6b","subject":"Allow snake to be calculated for an FE_field which is not a coordinate field, say the radius of a tree branch in a tree mesh.","message":"Allow snake to be calculated for an FE_field which is not a coordinate field,\nsay the radius of a tree branch in a tree mesh.\n\n\ngit-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@4338 3c1deb5b-d424-0410-962d-aba41a686d42\n","repos":"OpenCMISS\/zinc,hsorby\/zinc,OpenCMISS\/zinc,hsorby\/zinc,hsorby\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc,hsorby\/zinc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/command\/cmiss.c\n+++ source\/command\/cmiss.c\n@@ -4686,9 +4686,8 @@\n \n \t\toption_table = CREATE(Option_table)();\n \t\t\/* coordinate *\/\n-\t\tset_coordinate_field_data.conditional_function =\n-\t\t\tFE_field_is_coordinate_field;\n-\t\tset_coordinate_field_data.user_data = (void *)NULL;\n+\t\tset_coordinate_field_data.conditional_function = FE_field_has_value_type;\n+\t\tset_coordinate_field_data.user_data = (void *)FE_VALUE_VALUE;\n \t\tset_coordinate_field_data.fe_region =\n \t\t\tCmiss_region_get_FE_region(command_data->root_region);\n \t\tOption_table_add_entry(option_table, \"coordinate\",\n"} {"commit":"02de3b2b79dc2a3c4341c8da9c73508746c9e098","subject":"*blush* - I forgot to change the check for fscanf()'s return value after altering the argument count.","message":"*blush* - I forgot to change the check for fscanf()'s return value\nafter altering the argument count.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- release\/sysinstall\/uc_main.c\n+++ release\/sysinstall\/uc_main.c\n@@ -24,7 +24,7 @@\n * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n * library functions for userconfig library\n *\n- * $Id: uc_main.c,v 1.10 1996\/10\/05 16:33:05 jkh Exp $\n+ * $Id: uc_main.c,v 1.11 1996\/10\/06 02:56:22 jkh Exp $\n *\/\n \n #include <sys\/types.h>\n@@ -99,7 +99,12 @@\n \t free(kern);\n \t return NULL;\n \t}\n+\telse if (isDebug())\n+\t msgDebug(\"uc_open: opened \/stand\/symbols file, reading %d entries.\\n\", size);\n+\n+\n \tkern->nl = nl = (struct nlist *)malloc((size + 1) * sizeof(struct nlist));\n+\tbzero(nl, (size + 1) * sizeof(struct nlist));\n \tfor (i = 0; i < size; i++) {\n \t char *cp, name[255];\n \t int c1;\n@@ -115,21 +120,16 @@\n \t if ((cp = index(name, '\\n')) != NULL)\n \t\t*cp = '\\0';\n \t nl[i].n_name = strdup(name);\n-\t if (fscanf(fp, \"%u %d %hd %ld\\n\", &uc1, &c1, &d1, &v1) == 5) {\n+\t if (fscanf(fp, \"%u %d %hd %ld\\n\", &uc1, &c1, &d1, &v1) == 4) {\n \t\tnl[i].n_type = (unsigned char)uc1;\n \t\tnl[i].n_other = (char)c1;\n \t\tnl[i].n_desc = d1;\n \t\tnl[i].n_value = v1;\n \t\tif (isDebug())\n-\t\t msgDebug(\"uc_open: for entry %d, decoded: \\\"%s\\\", %d %d %hd %ld\\n\", i, nl[i].n_name, nl[i].n_type, nl[i].n_other, nl[i].n_desc, nl[i].n_value);\n-\t }\n-\t else {\n-\t\tnl[i].n_type = 0;\n-\t\tnl[i].n_other = 0;\n-\t\tnl[i].n_desc = 0;\n-\t\tnl[i].n_value = 0;\n-\t }\n-\t}\n+\t\t msgDebug(\"uc_open: for entry %d, decoded: \\\"%s\\\", %u %d %hd %ld\\n\", i, nl[i].n_name, nl[i].n_type, nl[i].n_other, nl[i].n_desc, nl[i].n_value);\n+\t }\n+\t}\n+\tnl[i].n_name = \"\";\n \tfclose(fp);\n \ti = 0;\n }\n@@ -149,13 +149,14 @@\n \tkern->nl=(struct nlist *)malloc(sizeof(_nl));\n \tbcopy(_nl, kern->nl, sizeof(_nl));\n }\n-\t\n+\n if (incore) {\n-\tif ((kd=open(\"\/dev\/kmem\", O_RDONLY)) < 0) {\n-\t free(kern);\n-\t kern = (struct kernel *)-3;\n+\tif (isDebug())\n+\t msgDebug(\"uc_open: attempting to open \/dev\/kmem for incore.\\n\");\n+\tif ((kd = open(\"\/dev\/kmem\", O_RDONLY)) < 0) {\n+\t free(kern);\n \t msgDebug(\"uc_open: Unable to open \/dev\/kmem.\\n\");\n-\t return kern;\n+\t return NULL;\n \t}\n \tkern->core = (caddr_t)NULL;\n \tkern->incore = 1;\n@@ -164,65 +165,59 @@\n else {\n \tif (stat(kname, &sb) < 0) {\n \t free(kern);\n-\t kern = (struct kernel *)-1;\n \t msgDebug(\"uc_open: Unable to stat %s.\\n\", kname);\n-\t return kern;\n+\t return NULL;\n \t}\n \tkern->size = sb.st_size;\n \tflags = sb.st_flags;\n-\t\n+\n \tif (chflags(kname, 0) < 0) {\n \t free(kern);\n-\t kern = (struct kernel *)-2;\n \t msgDebug(\"uc_open: Unable to chflags %s.\\n\", kname);\n-\t return kern;\n+\t return NULL;\n \t}\n \t\n \tif (isDebug())\n \t msgDebug(\"uc_open: attempting to open %s\\n\", kname);\n-\tif((kd = open(kname, O_RDWR, 0644)) < 0) {\n-\t free(kern);\n-\t kern = (struct kernel *)-3;\n+\tif ((kd = open(kname, O_RDWR, 0644)) < 0) {\n+\t free(kern);\n \t msgDebug(\"uc_open: Unable to open %s.\\n\", kname);\n-\t return kern;\n+\t return NULL;\n \t}\n \t\n \tfchflags(kd, flags);\n-\t\n+\n \tif (isDebug())\n \t msgDebug(\"uc_open: attempting to mmap %d bytes\\n\", sb.st_size);\n \tkern->core = mmap((caddr_t)0, sb.st_size, PROT_READ | PROT_WRITE,\n \t\t\t MAP_SHARED, kd, 0);\n \tkern->incore = 0;\n-\t\n \tif (kern->core == (caddr_t)0) {\n \t free(kern);\n-\t kern = (struct kernel *)-4;\n \t msgDebug(\"uc_open: Unable to mmap from %s.\\n\", kname);\n-\t return kern;\n+\t return NULL;\n \t}\n }\n \n kern->fd = kd;\n- if (isDebug())\n-\tmsgDebug(\"uc_open: getting isa information\\n\");\n get_isa_info(kern);\n- \n- if (isDebug())\n-\tmsgDebug(\"uc_open: getting pci information\\n\");\n+ if (isDebug())\n+\tmsgDebug(\"uc_open: got isa information\\n\");\n+\n get_pci_info(kern);\n- \n- if (isDebug())\n-\tmsgDebug(\"uc_open: getting eisa information\\n\");\n+ if (isDebug())\n+\tmsgDebug(\"uc_open: got pci information\\n\");\n+\n get_eisa_info(kern);\n- \n- if (isDebug())\n-\tmsgDebug(\"uc_open: getting scsi information\\n\");\n+ if (isDebug())\n+\tmsgDebug(\"uc_open: got eisa information\\n\");\n+\n get_scsi_info(kern);\n- \n+ if (isDebug())\n+\tmsgDebug(\"uc_open: got scsi information\\n\");\n return kern;\n }\n- \n+ \n int\n uc_close(struct kernel *kern, int writeback)\n {\n"} {"commit":"2bfa662e8a9ba4594f10640f53b37867ebedb030","subject":"add spec\/sample_arith_spec.c","message":"add spec\/sample_arith_spec.c\n","repos":"flon-io\/aabro","returncode":1,"stderr":"error: pathspec 'spec\/sample_arith_spec.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- spec\/sample_arith_spec.c\n+++ spec\/sample_arith_spec.c\n@@ -0,0 +1,34 @@\n+\n+\/\/\n+\/\/ specifying aabro\n+\/\/\n+\/\/ Mon Apr 21 06:06:30 JST 2014\n+\/\/\n+\n+#include \"aabro.h\"\n+\n+context \"sample, arith\"\n+{\n+ before all\n+ {\n+ \/\/abr_parser *number =\n+ \/\/ abr_regex_s(\"^-?[0-9]+\");\n+ \/\/abr_parser *parentheses =\n+ \/\/ abr_seq(abr_string(\"(\"), expression, abr_string(\")\"));\n+ \/\/abr_parser *value =\n+ \/\/ abr_alt(parentheses, number);\n+ \/\/abr_parser *operator =\n+ \/\/ abr_regex_s(\"^[\\+\\-\\*\\\/]\");\n+ \/\/abr_parser *operation =\n+ \/\/ abr_seq(value, abr_rep(abr_seq(operator, value), 0, -1));\n+ \/\/\n+ \/\/abr_parser *expression =\n+ \/\/ operation;\n+ }\n+\n+ it \"parses numbers\"\n+ {\n+ ensure(1 == 1);\n+ }\n+}\n+\n"} {"commit":"aba6b84ce52c27b642d01bafd1703386bda97f3a","subject":"Define __DRI_IMAGE_FORMAT_SARGB8","message":"Define __DRI_IMAGE_FORMAT_SARGB8\n\nThis format will be used by the i965 driver\n\nSigned-off-by: Keith Packard <fd7f967895e9f35e58ec8a62a847a54d7fa7275f@keithp.com>\nReviewed-by: Jordan Justen <a79006884ba9cf5f4f7fcbb92a15b208780d8c97@intel.com>\n","repos":"djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/GL\/internal\/dri_interface.h\n+++ include\/GL\/internal\/dri_interface.h\n@@ -1013,6 +1013,7 @@\n #define __DRI_IMAGE_FORMAT_NONE 0x1008\n #define __DRI_IMAGE_FORMAT_XRGB2101010 0x1009\n #define __DRI_IMAGE_FORMAT_ARGB2101010 0x100a\n+#define __DRI_IMAGE_FORMAT_SARGB8 0x100b\n \n #define __DRI_IMAGE_USE_SHARE\t\t0x0001\n #define __DRI_IMAGE_USE_SCANOUT\t\t0x0002\n"} {"commit":"c4e046b9d46da5e718ddf4ef5c863315dea8d274","subject":"crypto: Abort VM if out of memory","message":"crypto: Abort VM if out of memory\n\nNice crash instead of segv or worse.\n","repos":"ahmedshafeeq\/otp,matwey\/otp,derek121\/otp,massemanet\/otp,lantti\/otp,bjorng\/otp,isvilen\/otp,entropiae\/otp,isvilen\/otp,dumbbell\/otp,sdebnath\/otp,lhslll\/otp,uabboli\/otp,jj1bdx\/otp,g-andrade\/otp,matwey\/otp,bernardd\/otp,potatosalad\/otp,lrascao\/otp,lucafavatella\/otp,ferd\/otp,erlang\/otp,gjaldon\/otp,fenollp\/otp,vladdu\/otp,riverrun\/otp,yangchengjian\/otp,ferd\/otp,mikpe\/otp,stolen\/otp,matwey\/otp,cobusc\/otp,emile\/otp,entropiae\/otp,hairyhum\/otp,lemenkov\/otp,jinshana\/otp,isvilen\/otp,enikki\/otp,fenollp\/otp,neeraj9\/otp,palas\/otp,jinshana\/otp,g-andrade\/otp,platinumthinker\/otp,sammoth-wazoku\/otp,lrascao\/otp,electricimp\/otp,uabboli\/otp,sitexa\/otp,lightcyphers\/otp,jemsbhai\/otp,vladdu\/otp,massemanet\/otp,neeraj9\/otp,ahmedshafeeq\/otp,getong\/otp,lucafavatella\/otp,aboroska\/otp,enikki\/otp,johanclaesson\/otp,msantos\/otp,theom\/otp,emacsmirror\/erlang,GinjaNinja32\/otp,weisslj\/otp,marquisthunder\/otp,aboroska\/otp,NOMORECOFFEE\/otp,mikpe\/otp,cnbin\/otp,psyeugenic\/otp,c-rack\/otp,goertzenator\/otp,yangchengjian\/otp,vinoski\/otp,RJ\/otp,erlang\/otp,gjaldon\/otp,c-rack\/otp,platinumthinker\/otp,potatosalad\/otp,sdebnath\/otp,haguenau\/otp,vinoski\/otp,cobusc\/otp,sdebnath\/otp,paulcager\/otp,johanclaesson\/otp,GinjaNinja32\/otp,bjorng\/otp,paulcager\/otp,saleyn\/otp,lucafavatella\/otp,psyeugenic\/otp,legoscia\/otp,RGafiyatullin\/otp,ahmedshafeeq\/otp,awetzel\/otp,emacsmirror\/erlang,riverrun\/otp,sitexa\/otp,vinoski\/otp,aboroska\/otp,erlang\/otp,jamesruan\/otp,emacsmirror\/erlang,potatosalad\/otp,RJ\/otp,lantti\/otp,bsmr-erlang\/otp,gjaldon\/otp,GinjaNinja32\/otp,beni55\/otp,cobusc\/otp,mikpe\/otp,palas\/otp,bernardd\/otp,potatosalad\/otp,vinoski\/otp,klarna\/otp,bjorng\/otp,tuncer\/otp,RichMorin\/otp,basho\/otp,stolen\/otp,platinumthinker\/otp,jemsbhai\/otp,RichMorin\/otp,awetzel\/otp,schlagert\/otp,krishnakumar4a4\/otp,Teino1978-Corp\/otp,c-rack\/otp,RoadRunnr\/otp,lucafavatella\/otp,msantos\/otp,jamesruan\/otp,falkevik\/otp,tuncer\/otp,potatosalad\/otp,vic\/otp,rlipscombe\/otp,RGafiyatullin\/otp,haguenau\/otp,goertzenator\/otp,lianghaivv\/otp,rlipscombe\/otp,bernardd\/otp,bjorng\/otp,fenollp\/otp,lrascao\/otp,enikki\/otp,msantos\/otp,krishnakumar4a4\/otp,lantti\/otp,bsmr-erlang\/otp,sdebnath\/otp,benoitc\/otp-1,uabboli\/otp,beni55\/otp,platinumthinker\/otp,sitexa\/otp,GinjaNinja32\/otp,goertzenator\/otp,riverrun\/otp,aboroska\/otp,derek121\/otp,vinoski\/otp,potatosalad\/otp,lhslll\/otp,rlipscombe\/otp,rlipscombe\/otp,tuncer\/otp,jamesruan\/otp,Teino1978-Corp\/otp,RoadRunnr\/otp,cobusc\/otp,erlang\/otp,psyeugenic\/otp,vic\/otp,sitexa\/otp,lantti\/otp,bugs-erlang-org\/otp,sitexa\/otp,jj1bdx\/otp,jemsbhai\/otp,awetzel\/otp,lianghaivv\/otp,emile\/otp,RJ\/otp,jj1bdx\/otp,vic\/otp,basho\/otp,massemanet\/otp,uabboli\/otp,jemsbhai\/otp,ahmedshafeeq\/otp,bjorng\/otp,lhslll\/otp,johanclaesson\/otp,msantos\/otp,emile\/otp,RaimoNiskanen\/otp,dgud\/otp,jamesruan\/otp,derek121\/otp,basho\/otp,haguenau\/otp,psyeugenic\/otp,isvilen\/otp,getong\/otp,emacsmirror\/erlang,weisslj\/otp,lucafavatella\/otp,NOMORECOFFEE\/otp,bsmr-erlang\/otp,RGafiyatullin\/otp,ader1990\/otp,ader1990\/otp,GinjaNinja32\/otp,lightcyphers\/otp,ader1990\/otp,fenollp\/otp,neeraj9\/otp,emacsmirror\/erlang,GinjaNinja32\/otp,stolen\/otp,jinshana\/otp,emile\/otp,sammoth-wazoku\/otp,bernardd\/otp,lightcyphers\/otp,jj1bdx\/otp,bugs-erlang-org\/otp,palas\/otp,entropiae\/otp,ahmedshafeeq\/otp,RichMorin\/otp,rlipscombe\/otp,c-rack\/otp,uabboli\/otp,RGafiyatullin\/otp,VincentHHL\/otp,sammoth-wazoku\/otp,g-andrade\/otp,lucafavatella\/otp,electricimp\/otp,paulcager\/otp,vic\/otp,RaimoNiskanen\/otp,legoscia\/otp,riverrun\/otp,theom\/otp,lightcyphers\/otp,riverrun\/otp,lianghaivv\/otp,lianghaivv\/otp,jj1bdx\/otp,vic\/otp,RJ\/otp,entropiae\/otp,bernardd\/otp,Teino1978-Corp\/erlang-otp,paladim\/otp,tuncer\/otp,isvilen\/otp,isvilen\/otp,kvakvs\/otp,krishnakumar4a4\/otp,mikpe\/otp,awetzel\/otp,ahmedshafeeq\/otp,derek121\/otp,bugs-erlang-org\/otp,kvakvs\/otp,emacsmirror\/erlang,lrascao\/otp,g-andrade\/otp,sammoth-wazoku\/otp,lrascao\/otp,falkevik\/otp,fenollp\/otp,msantos\/otp,g-andrade\/otp,falkevik\/otp,johanclaesson\/otp,jamesruan\/otp,emacsmirror\/erlang,uabboli\/otp,hairyhum\/otp,msantos\/otp,haguenau\/otp,basho\/otp,rlipscombe\/otp,stolen\/otp,isvilen\/otp,awetzel\/otp,vinoski\/otp,getong\/otp,jemsbhai\/otp,RichMorin\/otp,legoscia\/otp,NOMORECOFFEE\/otp,getong\/otp,RGafiyatullin\/otp,mikpe\/otp,krishnakumar4a4\/otp,lemenkov\/otp,derek121\/otp,aboroska\/otp,massemanet\/otp,matwey\/otp,RaimoNiskanen\/otp,marquisthunder\/otp,mujiatong\/otp,GinjaNinja32\/otp,stolen\/otp,dgud\/otp,dumbbell\/otp,schlagert\/otp,RaimoNiskanen\/otp,klarna\/otp,cnbin\/otp,rlipscombe\/otp,jamesruan\/otp,matwey\/otp,sitexa\/otp,weisslj\/otp,dumbbell\/otp,VincentHHL\/otp,dgud\/otp,lantti\/otp,msantos\/otp,massemanet\/otp,rlipscombe\/otp,platinumthinker\/otp,cobusc\/otp,kvakvs\/otp,neeraj9\/otp,getong\/otp,g-andrade\/otp,awetzel\/otp,g-andrade\/otp,vic\/otp,saleyn\/otp,emile\/otp,hairyhum\/otp,jj1bdx\/otp,Teino1978-Corp\/erlang-otp,RJ\/otp,NOMORECOFFEE\/otp,psyeugenic\/otp,krishnakumar4a4\/otp,vladdu\/otp,lhslll\/otp,vinoski\/otp,Teino1978-Corp\/erlang-otp,krishnakumar4a4\/otp,platinumthinker\/otp,RGafiyatullin\/otp,bernardd\/otp,ader1990\/otp,Teino1978-Corp\/erlang-otp,dgud\/otp,electricimp\/otp,release-project\/otp,kvakvs\/otp,kvakvs\/otp,erlang\/otp,lianghaivv\/otp,potatosalad\/otp,massemanet\/otp,emile\/otp,goertzenator\/otp,sitexa\/otp,dgud\/otp,benoitc\/otp-1,vinoski\/otp,bjorng\/otp,vladdu\/otp,rlipscombe\/otp,johanclaesson\/otp,theom\/otp,marquisthunder\/otp,legoscia\/otp,dgud\/otp,Teino1978-Corp\/otp,fenollp\/otp,hairyhum\/otp,mujiatong\/otp,paladim\/otp,basho\/otp,dumbbell\/otp,mikpe\/otp,bernardd\/otp,VincentHHL\/otp,vinoski\/otp,legoscia\/otp,bjorng\/otp,ahmedshafeeq\/otp,enikki\/otp,Teino1978-Corp\/otp,falkevik\/otp,RJ\/otp,RoadRunnr\/otp,release-project\/otp,dumbbell\/otp,dgud\/otp,lrascao\/otp,electricimp\/otp,dumbbell\/otp,tuncer\/otp,platinumthinker\/otp,lemenkov\/otp,klarna\/otp,mujiatong\/otp,jj1bdx\/otp,palas\/otp,schlagert\/otp,bsmr-erlang\/otp,beni55\/otp,jinshana\/otp,getong\/otp,bugs-erlang-org\/otp,RichMorin\/otp,paladim\/otp,getong\/otp,saleyn\/otp,release-project\/otp,weisslj\/otp,jemsbhai\/otp,matwey\/otp,derek121\/otp,uabboli\/otp,release-project\/otp,weisslj\/otp,emacsmirror\/erlang,NOMORECOFFEE\/otp,lightcyphers\/otp,mikpe\/otp,cnbin\/otp,RichMorin\/otp,getong\/otp,paulcager\/otp,entropiae\/otp,basho\/otp,matwey\/otp,isvilen\/otp,release-project\/otp,sammoth-wazoku\/otp,mikpe\/otp,jinshana\/otp,platinumthinker\/otp,falkevik\/otp,jemsbhai\/otp,derek121\/otp,lucafavatella\/otp,lrascao\/otp,lantti\/otp,lemenkov\/otp,fenollp\/otp,RaimoNiskanen\/otp,RoadRunnr\/otp,RaimoNiskanen\/otp,ferd\/otp,kvakvs\/otp,aboroska\/otp,gjaldon\/otp,jj1bdx\/otp,jamesruan\/otp,release-project\/otp,enikki\/otp,sdebnath\/otp,electricimp\/otp,yangchengjian\/otp,benoitc\/otp-1,ahmedshafeeq\/otp,electricimp\/otp,cobusc\/otp,haguenau\/otp,yangchengjian\/otp,lightcyphers\/otp,basho\/otp,basho\/otp,erlang\/otp,marquisthunder\/otp,VincentHHL\/otp,basho\/otp,dgud\/otp,lucafavatella\/otp,RJ\/otp,klarna\/otp,benoitc\/otp-1,legoscia\/otp,dgud\/otp,ahmedshafeeq\/otp,massemanet\/otp,saleyn\/otp,erlang\/otp,marquisthunder\/otp,tuncer\/otp,Teino1978-Corp\/erlang-otp,lrascao\/otp,marquisthunder\/otp,getong\/otp,tuncer\/otp,Teino1978-Corp\/erlang-otp,getong\/otp,neeraj9\/otp,electricimp\/otp,beni55\/otp,vladdu\/otp,c-rack\/otp,erlang\/otp,vladdu\/otp,cnbin\/otp,theom\/otp,beni55\/otp,weisslj\/otp,bjorng\/otp,saleyn\/otp,marquisthunder\/otp,riverrun\/otp,theom\/otp,isvilen\/otp,weisslj\/otp,schlagert\/otp,goertzenator\/otp,sdebnath\/otp,benoitc\/otp-1,Teino1978-Corp\/otp,lemenkov\/otp,lightcyphers\/otp,RoadRunnr\/otp,paulcager\/otp,sammoth-wazoku\/otp,entropiae\/otp,beni55\/otp,hairyhum\/otp,Teino1978-Corp\/erlang-otp,haguenau\/otp,mujiatong\/otp,lantti\/otp,jinshana\/otp,goertzenator\/otp,awetzel\/otp,riverrun\/otp,kvakvs\/otp,RoadRunnr\/otp,c-rack\/otp,vic\/otp,benoitc\/otp-1,gjaldon\/otp,palas\/otp,vic\/otp,paulcager\/otp,entropiae\/otp,johanclaesson\/otp,vladdu\/otp,erlang\/otp,RoadRunnr\/otp,hairyhum\/otp,fenollp\/otp,NOMORECOFFEE\/otp,aboroska\/otp,riverrun\/otp,jj1bdx\/otp,bjorng\/otp,lantti\/otp,paulcager\/otp,VincentHHL\/otp,klarna\/otp,palas\/otp,psyeugenic\/otp,paladim\/otp,Teino1978-Corp\/otp,dumbbell\/otp,dumbbell\/otp,lightcyphers\/otp,emile\/otp,ader1990\/otp,bugs-erlang-org\/otp,ferd\/otp,potatosalad\/otp,kvakvs\/otp,mikpe\/otp,Teino1978-Corp\/otp,ferd\/otp,massemanet\/otp,g-andrade\/otp,erlang\/otp,jemsbhai\/otp,dumbbell\/otp,lhslll\/otp,GinjaNinja32\/otp,stolen\/otp,goertzenator\/otp,RJ\/otp,Teino1978-Corp\/erlang-otp,krishnakumar4a4\/otp,krishnakumar4a4\/otp,paladim\/otp,goertzenator\/otp,ader1990\/otp,kvakvs\/otp,paladim\/otp,enikki\/otp,psyeugenic\/otp,gjaldon\/otp,dgud\/otp,emile\/otp,bugs-erlang-org\/otp,RoadRunnr\/otp,g-andrade\/otp,mujiatong\/otp,release-project\/otp,paladim\/otp,beni55\/otp,mujiatong\/otp,awetzel\/otp,cnbin\/otp,ader1990\/otp,weisslj\/otp,rlipscombe\/otp,benoitc\/otp-1,yangchengjian\/otp,potatosalad\/otp,cobusc\/otp,enikki\/otp,massemanet\/otp,electricimp\/otp,schlagert\/otp,RichMorin\/otp,johanclaesson\/otp,lhslll\/otp,RaimoNiskanen\/otp,entropiae\/otp,benoitc\/otp-1,bjorng\/otp,legoscia\/otp,matwey\/otp,neeraj9\/otp,bsmr-erlang\/otp,sdebnath\/otp,sammoth-wazoku\/otp,bsmr-erlang\/otp,klarna\/otp,weisslj\/otp,VincentHHL\/otp,uabboli\/otp,g-andrade\/otp,gjaldon\/otp,sammoth-wazoku\/otp,schlagert\/otp,hairyhum\/otp,bugs-erlang-org\/otp,bernardd\/otp,psyeugenic\/otp,hairyhum\/otp,NOMORECOFFEE\/otp,johanclaesson\/otp,saleyn\/otp,theom\/otp,cnbin\/otp,uabboli\/otp,theom\/otp,lhslll\/otp,klarna\/otp,lemenkov\/otp,VincentHHL\/otp,mujiatong\/otp,jinshana\/otp,yangchengjian\/otp,ferd\/otp,beni55\/otp,RichMorin\/otp,falkevik\/otp,haguenau\/otp,bsmr-erlang\/otp,stolen\/otp,sitexa\/otp,NOMORECOFFEE\/otp,dumbbell\/otp,yangchengjian\/otp,neeraj9\/otp,aboroska\/otp,marquisthunder\/otp,VincentHHL\/otp,electricimp\/otp,haguenau\/otp,cobusc\/otp,stolen\/otp,vladdu\/otp,tuncer\/otp,emile\/otp,lianghaivv\/otp,paulcager\/otp,mikpe\/otp,cnbin\/otp,vinoski\/otp,klarna\/otp,c-rack\/otp,bugs-erlang-org\/otp,lrascao\/otp,emacsmirror\/erlang,falkevik\/otp,Teino1978-Corp\/otp,isvilen\/otp,legoscia\/otp,RGafiyatullin\/otp,falkevik\/otp,lemenkov\/otp,paladim\/otp,ferd\/otp,derek121\/otp,RoadRunnr\/otp,lhslll\/otp,saleyn\/otp,release-project\/otp,RGafiyatullin\/otp,palas\/otp,goertzenator\/otp,RaimoNiskanen\/otp,vladdu\/otp,schlagert\/otp,fenollp\/otp,matwey\/otp,gjaldon\/otp,yangchengjian\/otp,bernardd\/otp,lianghaivv\/otp,enikki\/otp,lianghaivv\/otp,saleyn\/otp,neeraj9\/otp,theom\/otp,palas\/otp,sdebnath\/otp,aboroska\/otp,jinshana\/otp,msantos\/otp,potatosalad\/otp,ferd\/otp,falkevik\/otp,emacsmirror\/erlang,bsmr-erlang\/otp,bsmr-erlang\/otp,mujiatong\/otp,RaimoNiskanen\/otp,tuncer\/otp,ader1990\/otp,saleyn\/otp,jj1bdx\/otp,legoscia\/otp,c-rack\/otp,release-project\/otp,lemenkov\/otp,cnbin\/otp,jamesruan\/otp,schlagert\/otp,ferd\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/crypto\/c_src\/crypto_callback.c\n+++ lib\/crypto\/c_src\/crypto_callback.c\n@@ -1,7 +1,7 @@\n \/* \n * %CopyrightBegin%\n *\n- * Copyright Ericsson AB 2012. All Rights Reserved.\n+ * Copyright Ericsson AB 2014. All Rights Reserved.\n *\n * The contents of this file are subject to the Erlang Public License,\n * Version 1.1, (the \"License\"); you may not use this file except in\n@@ -17,6 +17,7 @@\n * %CopyrightEnd%\n *\/\n \n+#include <stdio.h>\n #include <string.h>\n #include <openssl\/opensslconf.h>\n \n@@ -51,13 +52,28 @@\n \n static ErlNifRWLock** lock_vec = NULL; \/* Static locks used by openssl *\/\n \n+static void nomem(size_t size, const char* op)\n+{\n+ fprintf(stderr, \"Out of memory abort. Crypto failed to %s %zu bytes.\\r\\n\",\n+\t op, size);\n+ abort();\n+}\n+\n static void* crypto_alloc(size_t size)\n {\n- return enif_alloc(size);\n+ void *ret = enif_alloc(size);\n+\n+ if (!ret && size)\n+\tnomem(size, \"allocate\");\n+ return ret;\n }\n static void* crypto_realloc(void* ptr, size_t size)\n {\n- return enif_realloc(ptr, size);\n+ void* ret = enif_realloc(ptr, size);\n+\n+ if (!ret && size)\n+\tnomem(size, \"reallocate\");\n+ return ret;\n }\n static void crypto_free(void* ptr)\n {\n"} {"commit":"6354286f79cd38f1143071d50d096d1c9263d747","subject":"Fix write buffering","message":"Fix write buffering\n","repos":"dklempner\/grpc,firebase\/grpc,grani\/grpc,sreecha\/grpc,simonkuang\/grpc,ncteisen\/grpc,kumaralokgithub\/grpc,fuchsia-mirror\/third_party-grpc,firebase\/grpc,jboeuf\/grpc,daniel-j-born\/grpc,zhimingxie\/grpc,muxi\/grpc,yugui\/grpc,grpc\/grpc,murgatroid99\/grpc,infinit\/grpc,yugui\/grpc,grpc\/grpc,matt-kwong\/grpc,kriswuollett\/grpc,dgquintas\/grpc,mehrdada\/grpc,matt-kwong\/grpc,vsco\/grpc,hstefan\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,daniel-j-born\/grpc,royalharsh\/grpc,stanley-cheung\/grpc,carl-mastrangelo\/grpc,pmarks-net\/grpc,grpc\/grpc,kskalski\/grpc,Vizerai\/grpc,thunderboltsid\/grpc,wcevans\/grpc,LuminateWireless\/grpc,infinit\/grpc,dgquintas\/grpc,adelez\/grpc,zhimingxie\/grpc,Vizerai\/grpc,PeterFaiman\/ruby-grpc-minimal,yang-g\/grpc,yongni\/grpc,msmania\/grpc,deepaklukose\/grpc,kumaralokgithub\/grpc,7anner\/grpc,ppietrasa\/grpc,carl-mastrangelo\/grpc,pszemus\/grpc,dklempner\/grpc,jboeuf\/grpc,soltanmm-google\/grpc,geffzhang\/grpc,yugui\/grpc,carl-mastrangelo\/grpc,thunderboltsid\/grpc,mehrdada\/grpc,soltanmm-google\/grpc,kumaralokgithub\/grpc,perumaalgoog\/grpc,fuchsia-mirror\/third_party-grpc,Vizerai\/grpc,yongni\/grpc,royalharsh\/grpc,kskalski\/grpc,sreecha\/grpc,thinkerou\/grpc,rjshade\/grpc,nicolasnoble\/grpc,MakMukhi\/grpc,jboeuf\/grpc,firebase\/grpc,thinkerou\/grpc,makdharma\/grpc,stanley-cheung\/grpc,jboeuf\/grpc,Crevil\/grpc,kpayson64\/grpc,soltanmm-google\/grpc,ejona86\/grpc,baylabs\/grpc,dgquintas\/grpc,perumaalgoog\/grpc,ejona86\/grpc,carl-mastrangelo\/grpc,dgquintas\/grpc,7anner\/grpc,baylabs\/grpc,deepaklukose\/grpc,thinkerou\/grpc,PeterFaiman\/ruby-grpc-minimal,makdharma\/grpc,murgatroid99\/grpc,muxi\/grpc,sreecha\/grpc,philcleveland\/grpc,dklempner\/grpc,vjpai\/grpc,nicolasnoble\/grpc,greasypizza\/grpc,ctiller\/grpc,stanley-cheung\/grpc,ppietrasa\/grpc,adelez\/grpc,greasypizza\/grpc,hstefan\/grpc,andrewpollock\/grpc,muxi\/grpc,vjpai\/grpc,yang-g\/grpc,ncteisen\/grpc,dgquintas\/grpc,grpc\/grpc,matt-kwong\/grpc,geffzhang\/grpc,quizlet\/grpc,firebase\/grpc,LuminateWireless\/grpc,baylabs\/grpc,philcleveland\/grpc,ctiller\/grpc,pszemus\/grpc,perumaalgoog\/grpc,mehrdada\/grpc,thunderboltsid\/grpc,thinkerou\/grpc,murgatroid99\/grpc,msmania\/grpc,kpayson64\/grpc,perumaalgoog\/grpc,nicolasnoble\/grpc,baylabs\/grpc,apolcyn\/grpc,murgatroid99\/grpc,zhimingxie\/grpc,grani\/grpc,andrewpollock\/grpc,vsco\/grpc,a11r\/grpc,thunderboltsid\/grpc,ejona86\/grpc,ipylypiv\/grpc,yang-g\/grpc,Vizerai\/grpc,sreecha\/grpc,a11r\/grpc,Vizerai\/grpc,chrisdunelm\/grpc,thinkerou\/grpc,chrisdunelm\/grpc,andrewpollock\/grpc,rjshade\/grpc,makdharma\/grpc,dklempner\/grpc,nicolasnoble\/grpc,pmarks-net\/grpc,ncteisen\/grpc,pszemus\/grpc,quizlet\/grpc,fuchsia-mirror\/third_party-grpc,Crevil\/grpc,andrewpollock\/grpc,kumaralokgithub\/grpc,MakMukhi\/grpc,kskalski\/grpc,thunderboltsid\/grpc,kriswuollett\/grpc,yang-g\/grpc,a11r\/grpc,baylabs\/grpc,infinit\/grpc,Vizerai\/grpc,carl-mastrangelo\/grpc,vsco\/grpc,nicolasnoble\/grpc,philcleveland\/grpc,ncteisen\/grpc,MakMukhi\/grpc,donnadionne\/grpc,apolcyn\/grpc,kpayson64\/grpc,geffzhang\/grpc,kriswuollett\/grpc,makdharma\/grpc,rjshade\/grpc,royalharsh\/grpc,grpc\/grpc,kumaralokgithub\/grpc,Vizerai\/grpc,ctiller\/grpc,Crevil\/grpc,MakMukhi\/grpc,Vizerai\/grpc,hstefan\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,mehrdada\/grpc,fuchsia-mirror\/third_party-grpc,greasypizza\/grpc,Vizerai\/grpc,royalharsh\/grpc,firebase\/grpc,stanley-cheung\/grpc,quizlet\/grpc,dklempner\/grpc,pszemus\/grpc,geffzhang\/grpc,yongni\/grpc,soltanmm-google\/grpc,ncteisen\/grpc,infinit\/grpc,deepaklukose\/grpc,pmarks-net\/grpc,chrisdunelm\/grpc,kpayson64\/grpc,adelez\/grpc,ctiller\/grpc,yugui\/grpc,kpayson64\/grpc,ejona86\/grpc,soltanmm-google\/grpc,sreecha\/grpc,stanley-cheung\/grpc,yongni\/grpc,grani\/grpc,mehrdada\/grpc,grpc\/grpc,nicolasnoble\/grpc,deepaklukose\/grpc,jboeuf\/grpc,PeterFaiman\/ruby-grpc-minimal,stanley-cheung\/grpc,makdharma\/grpc,jtattermusch\/grpc,yongni\/grpc,a11r\/grpc,ctiller\/grpc,jboeuf\/grpc,perumaalgoog\/grpc,stanley-cheung\/grpc,jboeuf\/grpc,kumaralokgithub\/grpc,zhimingxie\/grpc,matt-kwong\/grpc,vjpai\/grpc,yang-g\/grpc,PeterFaiman\/ruby-grpc-minimal,kriswuollett\/grpc,adelez\/grpc,donnadionne\/grpc,jtattermusch\/grpc,carl-mastrangelo\/grpc,jboeuf\/grpc,infinit\/grpc,wcevans\/grpc,geffzhang\/grpc,perumaalgoog\/grpc,soltanmm-google\/grpc,hstefan\/grpc,Crevil\/grpc,msmania\/grpc,sreecha\/grpc,philcleveland\/grpc,daniel-j-born\/grpc,ncteisen\/grpc,mehrdada\/grpc,jtattermusch\/grpc,philcleveland\/grpc,vjpai\/grpc,donnadionne\/grpc,ejona86\/grpc,philcleveland\/grpc,7anner\/grpc,MakMukhi\/grpc,LuminateWireless\/grpc,grani\/grpc,donnadionne\/grpc,apolcyn\/grpc,ctiller\/grpc,ppietrasa\/grpc,philcleveland\/grpc,ncteisen\/grpc,soltanmm-google\/grpc,makdharma\/grpc,kpayson64\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,7anner\/grpc,perumaalgoog\/grpc,thinkerou\/grpc,PeterFaiman\/ruby-grpc-minimal,pmarks-net\/grpc,thunderboltsid\/grpc,grani\/grpc,ejona86\/grpc,matt-kwong\/grpc,quizlet\/grpc,ejona86\/grpc,jtattermusch\/grpc,kskalski\/grpc,infinit\/grpc,thinkerou\/grpc,vsco\/grpc,dgquintas\/grpc,simonkuang\/grpc,rjshade\/grpc,royalharsh\/grpc,ppietrasa\/grpc,soltanmm-google\/grpc,thunderboltsid\/grpc,mehrdada\/grpc,MakMukhi\/grpc,jtattermusch\/grpc,hstefan\/grpc,rjshade\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,firebase\/grpc,muxi\/grpc,pmarks-net\/grpc,carl-mastrangelo\/grpc,murgatroid99\/grpc,ipylypiv\/grpc,vsco\/grpc,mehrdada\/grpc,deepaklukose\/grpc,msmania\/grpc,ejona86\/grpc,greasypizza\/grpc,yongni\/grpc,infinit\/grpc,Crevil\/grpc,daniel-j-born\/grpc,chrisdunelm\/grpc,ppietrasa\/grpc,PeterFaiman\/ruby-grpc-minimal,donnadionne\/grpc,hstefan\/grpc,apolcyn\/grpc,rjshade\/grpc,ppietrasa\/grpc,wcevans\/grpc,jtattermusch\/grpc,muxi\/grpc,quizlet\/grpc,LuminateWireless\/grpc,sreecha\/grpc,kskalski\/grpc,jboeuf\/grpc,wcevans\/grpc,muxi\/grpc,greasypizza\/grpc,LuminateWireless\/grpc,carl-mastrangelo\/grpc,deepaklukose\/grpc,grpc\/grpc,sreecha\/grpc,chrisdunelm\/grpc,LuminateWireless\/grpc,vjpai\/grpc,firebase\/grpc,ejona86\/grpc,muxi\/grpc,nicolasnoble\/grpc,donnadionne\/grpc,pszemus\/grpc,geffzhang\/grpc,chrisdunelm\/grpc,makdharma\/grpc,zhimingxie\/grpc,daniel-j-born\/grpc,a11r\/grpc,yugui\/grpc,Crevil\/grpc,7anner\/grpc,kpayson64\/grpc,nicolasnoble\/grpc,donnadionne\/grpc,ejona86\/grpc,pmarks-net\/grpc,pszemus\/grpc,adelez\/grpc,chrisdunelm\/grpc,Vizerai\/grpc,grpc\/grpc,wcevans\/grpc,infinit\/grpc,matt-kwong\/grpc,mehrdada\/grpc,vjpai\/grpc,muxi\/grpc,dgquintas\/grpc,kskalski\/grpc,stanley-cheung\/grpc,muxi\/grpc,kumaralokgithub\/grpc,baylabs\/grpc,adelez\/grpc,7anner\/grpc,rjshade\/grpc,pmarks-net\/grpc,jtattermusch\/grpc,nicolasnoble\/grpc,ppietrasa\/grpc,rjshade\/grpc,rjshade\/grpc,murgatroid99\/grpc,jtattermusch\/grpc,pszemus\/grpc,dklempner\/grpc,zhimingxie\/grpc,7anner\/grpc,LuminateWireless\/grpc,thinkerou\/grpc,Vizerai\/grpc,yongni\/grpc,chrisdunelm\/grpc,mehrdada\/grpc,grpc\/grpc,perumaalgoog\/grpc,simonkuang\/grpc,murgatroid99\/grpc,msmania\/grpc,greasypizza\/grpc,fuchsia-mirror\/third_party-grpc,adelez\/grpc,geffzhang\/grpc,7anner\/grpc,carl-mastrangelo\/grpc,sreecha\/grpc,firebase\/grpc,PeterFaiman\/ruby-grpc-minimal,jboeuf\/grpc,apolcyn\/grpc,quizlet\/grpc,grani\/grpc,vjpai\/grpc,deepaklukose\/grpc,ctiller\/grpc,andrewpollock\/grpc,murgatroid99\/grpc,matt-kwong\/grpc,infinit\/grpc,pmarks-net\/grpc,daniel-j-born\/grpc,Crevil\/grpc,vsco\/grpc,MakMukhi\/grpc,a11r\/grpc,kriswuollett\/grpc,dklempner\/grpc,donnadionne\/grpc,grani\/grpc,kriswuollett\/grpc,yugui\/grpc,kskalski\/grpc,greasypizza\/grpc,matt-kwong\/grpc,ipylypiv\/grpc,kskalski\/grpc,ncteisen\/grpc,greasypizza\/grpc,quizlet\/grpc,LuminateWireless\/grpc,simonkuang\/grpc,MakMukhi\/grpc,kumaralokgithub\/grpc,ctiller\/grpc,andrewpollock\/grpc,msmania\/grpc,a11r\/grpc,simonkuang\/grpc,ipylypiv\/grpc,ipylypiv\/grpc,jtattermusch\/grpc,PeterFaiman\/ruby-grpc-minimal,ppietrasa\/grpc,jtattermusch\/grpc,grpc\/grpc,philcleveland\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,MakMukhi\/grpc,firebase\/grpc,royalharsh\/grpc,kpayson64\/grpc,simonkuang\/grpc,grani\/grpc,ncteisen\/grpc,yongni\/grpc,vjpai\/grpc,makdharma\/grpc,yang-g\/grpc,greasypizza\/grpc,jtattermusch\/grpc,mehrdada\/grpc,zhimingxie\/grpc,ejona86\/grpc,a11r\/grpc,fuchsia-mirror\/third_party-grpc,jboeuf\/grpc,donnadionne\/grpc,quizlet\/grpc,Crevil\/grpc,baylabs\/grpc,thunderboltsid\/grpc,firebase\/grpc,PeterFaiman\/ruby-grpc-minimal,PeterFaiman\/ruby-grpc-minimal,pszemus\/grpc,kpayson64\/grpc,kriswuollett\/grpc,zhimingxie\/grpc,andrewpollock\/grpc,vjpai\/grpc,dklempner\/grpc,daniel-j-born\/grpc,simonkuang\/grpc,firebase\/grpc,ncteisen\/grpc,apolcyn\/grpc,vsco\/grpc,a11r\/grpc,hstefan\/grpc,chrisdunelm\/grpc,deepaklukose\/grpc,deepaklukose\/grpc,dgquintas\/grpc,ncteisen\/grpc,msmania\/grpc,apolcyn\/grpc,adelez\/grpc,Crevil\/grpc,kriswuollett\/grpc,kriswuollett\/grpc,dgquintas\/grpc,ejona86\/grpc,murgatroid99\/grpc,apolcyn\/grpc,simonkuang\/grpc,vsco\/grpc,sreecha\/grpc,kumaralokgithub\/grpc,nicolasnoble\/grpc,chrisdunelm\/grpc,sreecha\/grpc,ctiller\/grpc,thunderboltsid\/grpc,pszemus\/grpc,hstefan\/grpc,philcleveland\/grpc,ncteisen\/grpc,kpayson64\/grpc,carl-mastrangelo\/grpc,apolcyn\/grpc,stanley-cheung\/grpc,chrisdunelm\/grpc,carl-mastrangelo\/grpc,fuchsia-mirror\/third_party-grpc,grpc\/grpc,ipylypiv\/grpc,pszemus\/grpc,ctiller\/grpc,msmania\/grpc,geffzhang\/grpc,royalharsh\/grpc,pszemus\/grpc,7anner\/grpc,geffzhang\/grpc,ppietrasa\/grpc,daniel-j-born\/grpc,baylabs\/grpc,baylabs\/grpc,vsco\/grpc,soltanmm-google\/grpc,thinkerou\/grpc,hstefan\/grpc,matt-kwong\/grpc,sreecha\/grpc,vjpai\/grpc,royalharsh\/grpc,quizlet\/grpc,firebase\/grpc,jboeuf\/grpc,pszemus\/grpc,makdharma\/grpc,yugui\/grpc,nicolasnoble\/grpc,kpayson64\/grpc,dgquintas\/grpc,LuminateWireless\/grpc,vjpai\/grpc,yang-g\/grpc,thinkerou\/grpc,muxi\/grpc,yugui\/grpc,mehrdada\/grpc,daniel-j-born\/grpc,muxi\/grpc,thinkerou\/grpc,fuchsia-mirror\/third_party-grpc,pmarks-net\/grpc,ctiller\/grpc,wcevans\/grpc,ipylypiv\/grpc,ctiller\/grpc,muxi\/grpc,murgatroid99\/grpc,jtattermusch\/grpc,wcevans\/grpc,royalharsh\/grpc,ipylypiv\/grpc,andrewpollock\/grpc,kskalski\/grpc,yang-g\/grpc,andrewpollock\/grpc,wcevans\/grpc,msmania\/grpc,fuchsia-mirror\/third_party-grpc,grpc\/grpc,donnadionne\/grpc,grani\/grpc,donnadionne\/grpc,donnadionne\/grpc,dklempner\/grpc,simonkuang\/grpc,zhimingxie\/grpc,adelez\/grpc,yongni\/grpc,yang-g\/grpc,wcevans\/grpc,yugui\/grpc,perumaalgoog\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/ext\/transport\/chttp2\/transport\/chttp2_transport.c\n+++ src\/core\/ext\/transport\/chttp2\/transport\/chttp2_transport.c\n@@ -949,7 +949,7 @@\n s->fetching_slice_end_offset =\n (ssize_t)s->flow_controlled_buffer.length + (ssize_t)len;\n if (flags & GRPC_WRITE_BUFFER_HINT) {\n- s->fetched_send_message_length -= 65536;\n+ s->fetching_slice_end_offset -= 65536;\n }\n continue_fetching_send_locked(exec_ctx, t, s);\n if (s->id != 0) {\n"} {"commit":"436fd560f49a9413c60df2a85cc7e5f53356d7b1","subject":"gfx create lines\/surfaces\/etc. commands were changed when default_coordinate was removed to require a coordinate field to be specified. Modified to give a more human-readable message that this is what is required when not specified.","message":"gfx create lines\/surfaces\/etc. commands were changed when\ndefault_coordinate was removed to require a coordinate field to be\nspecified. Modified to give a more human-readable message that this is\nwhat is required when not specified.\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/command\/cmiss.c\n+++ source\/command\/cmiss.c\n@@ -1631,7 +1631,7 @@\n static int gfx_create_cylinders(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE CYLINDERS command.\n@@ -1737,6 +1737,14 @@\n \t\t\t\/* no errors, not asking for help *\/\n \t\t\tif (return_code)\n \t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (return_code)\n+\t\t\t{\n \t\t\t\tface_number -= 2;\n \t\t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n \t\t\t\t\tgraphics_object_name,command_data->graphics_object_list))\n@@ -1950,7 +1958,7 @@\n static int gfx_create_element_points(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 8 May 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE ELEMENT_POINTS command.\n@@ -2156,6 +2164,11 @@\n \t\t\t\t\t\"No density field specified for cell_density|cell_poisson\");\n \t\t\t\treturn_code = 0;\n \t\t\t}\n+\t\t\tif (!coordinate_field)\n+\t\t\t{\n+\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\treturn_code = 0;\n+\t\t\t}\n \t\t\tif (return_code)\n \t\t\t{\n \t\t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n@@ -2735,7 +2748,7 @@\n static int gfx_create_flow_particles(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE FLOW_PARTICLES command.\n@@ -2842,6 +2855,14 @@\n \t\t\t\/* no errors,not asking for help *\/\n \t\t\tif (return_code)\n \t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (return_code)\n+\t\t\t{\n \t\t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n \t\t\t\t\tgraphics_object_name,command_data->graphics_object_list))\n \t\t\t\t{\n@@ -2990,7 +3011,7 @@\n static int gfx_create_more_flow_particles(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE MORE_FLOW_PARTICLES command.\n@@ -3097,6 +3118,14 @@\n \t\t\t\/* no errors,not asking for help *\/\n \t\t\tif (return_code)\n \t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (return_code)\n+\t\t\t{\n \t\t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n \t\t\t\t\tgraphics_object_name,command_data->graphics_object_list))\n \t\t\t\t{\n@@ -3759,7 +3788,7 @@\n static int gfx_create_iso_surfaces(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 18 January 2002\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE ISO_SURFACES command.\n@@ -3951,6 +3980,11 @@\n \t\t\t\t\tdisplay_message(WARNING_MESSAGE,\"Missing iso_scalar field\");\n \t\t\t\t\treturn_code=0;\n \t\t\t\t}\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Missing coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n \t\t\t\tSTRING_TO_ENUMERATOR(Use_element_type)(use_element_type_string,\n \t\t\t\t\t&use_element_type);\n \t\t\t\telement_to_iso_scalar_data.use_element_type = use_element_type;\n@@ -4416,7 +4450,7 @@\n static int gfx_create_lines(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE LINES command.\n@@ -4505,6 +4539,14 @@\n \t\t\t\/* no errors, not asking for help *\/\n \t\t\tif (return_code)\n \t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Missing coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (return_code)\n+\t\t\t{\n \t\t\t\tface_number -= 2;\n \t\t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n \t\t\t\t\tgraphics_object_name,command_data->graphics_object_list))\n@@ -5168,7 +5210,7 @@\n static int gfx_create_node_points(struct Parse_state *state,\n \tvoid *use_data,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 16 November 2000\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE NODE_POINTS or GFX CREATE DATA_POINTS command.\n@@ -5321,7 +5363,16 @@\n \t\tset_variable_scale_field_data.conditional_function_user_data=(void *)NULL;\n \t\tOption_table_add_entry(option_table,\"variable_scale\",&variable_scale_field,\n \t\t\t&set_variable_scale_field_data,set_Computed_field_conditional);\n-\t\tif (return_code=Option_table_multi_parse(option_table,state))\n+\t\treturn_code = Option_table_multi_parse(option_table,state);\n+\t\tif (return_code)\n+\t\t{\n+\t\t\tif (!coordinate_field)\n+\t\t\t{\n+\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\treturn_code = 0;\n+\t\t\t}\n+\t\t}\n+\t\tif (return_code)\n \t\t{\n \t\t\tif (graphics_object=FIND_BY_IDENTIFIER_IN_LIST(GT_object,name)(\n \t\t\t\tgraphics_object_name,command_data->graphics_object_list))\n@@ -6447,7 +6498,7 @@\n static int gfx_create_streamlines(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE STREAMLINES command.\n@@ -6608,6 +6659,11 @@\n \t\t\t\t\tdisplay_message(ERROR_MESSAGE,\"Must specify a vector\");\n \t\t\t\t\treturn_code=0;\n \t\t\t\t}\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n \t\t\t\tSTRING_TO_ENUMERATOR(Streamline_type)(streamline_type_string,\n \t\t\t\t\t&streamline_type);\n \t\t\t\tSTRING_TO_ENUMERATOR(Streamline_data_type)(streamline_data_type_string,\n@@ -7250,7 +7306,7 @@\n static int gfx_create_surfaces(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 29 March 2001\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE SURFACES command.\n@@ -7368,6 +7424,14 @@\n \t\t\t\tcommand_data->user_interface,set_Element_discretization);\n \t\t\treturn_code=Option_table_multi_parse(option_table,state);\n \t\t\t\/* no errors, not asking for help *\/\n+\t\t\tif (return_code)\n+\t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Missing coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t}\n \t\t\tif (return_code)\n \t\t\t{\n \t\t\t\tif (nurb)\n@@ -9005,7 +9069,7 @@\n static int gfx_create_volumes(struct Parse_state *state,\n \tvoid *dummy_to_be_modified,void *command_data_void)\n \/*******************************************************************************\n-LAST MODIFIED : 18 January 2002\n+LAST MODIFIED : 22 January 2002\n \n DESCRIPTION :\n Executes a GFX CREATE VOLUMES command.\n@@ -9161,17 +9225,25 @@\n \t\t\t\t&volume_texture,command_data->volume_texture_manager,\n \t\t\t\tset_VT_volume_texture);\n \t\t\treturn_code=Option_table_multi_parse(option_table,state);\n-\t\t\tif(surface_data_group&&(!surface_data_density_field))\n-\t\t\t{\n-\t\t\t\tdisplay_message(ERROR_MESSAGE,\"gfx_create_volumes. \"\n-\t\t\t\t\t\"Must supply a surface_data_density_field with a surface_data_group\");\n-\t\t\t\treturn_code=0;\n-\t\t\t}\n-\t\t\tif((!surface_data_group)&&surface_data_density_field)\n-\t\t\t{\n-\t\t\t\tdisplay_message(ERROR_MESSAGE,\"gfx_create_volumes. \"\n-\t\t\t\t\t\"Must supply a surface_data_group with a surface_data_density_field\");\n-\t\t\t\treturn_code=0;\n+\t\t\tif (return_code)\n+\t\t\t{\n+\t\t\t\tif (!coordinate_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(WARNING_MESSAGE, \"Must specify a coordinate field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t\tif(surface_data_group&&(!surface_data_density_field))\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(ERROR_MESSAGE,\"gfx_create_volumes. Must supply a \"\n+\t\t\t\t\t\t\"surface_data_density_field with a surface_data_group\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n+\t\t\t\tif((!surface_data_group)&&surface_data_density_field)\n+\t\t\t\t{\n+\t\t\t\t\tdisplay_message(ERROR_MESSAGE,\"gfx_create_volumes. Must supply a \"\n+\t\t\t\t\t\t\"surface_data_group with a surface_data_density_field\");\n+\t\t\t\t\treturn_code = 0;\n+\t\t\t\t}\n \t\t\t}\n \n \t\t\t\/* no errors, not asking for help *\/\n"} {"commit":"fd092be23982c160a3855f1e396b7311b5225bf9","subject":"Add get_current_el_maybe_constant()","message":"Add get_current_el_maybe_constant()\n\nThere are some cases where we want to run EL-dependent code in the\nshared code.\n\nWe could use #ifdef, but it leaves slight possibility where we do not\nknow the exception level at the build-time (e.g. library code).\n\nThe counter approach is to use get_current_el(), but it is run-time\ndetection, so all EL code is linked, some of which might be unneeded.\n\nThis commit adds get_current_el_maybe_constant(). This is a static\ninline function that returns a constant value if we know the exception\nlevel at build-time. This is mostly the case.\n\n if (get_current_el_maybe_constant() == 1) {\n \/* do something for EL1 *\/\n } else if (get_current_el_maybe_constant() == 3) {\n \/* do something for EL3 *\/\n }\n\nIf get_current_el_maybe_constant() is build-time constant, the compiler\nwill optimize out the unreachable code.\n\nIf such code is included from the library code, it is not built-time\nconstant. In this case, it falls back to get_current_el(), so it still\nworks.\n\nChange-Id: Idb03c20342a5b5173fe2d6b40e1fac7998675ad3\nSigned-off-by: Masahiro Yamada <378b411a8a63ecc7605ec4272234862d7781c6ae@socionext.com>\n","repos":"achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/arch\/aarch64\/arch_helpers.h\n+++ include\/arch\/aarch64\/arch_helpers.h\n@@ -531,6 +531,23 @@\n \treturn GET_EL(read_CurrentEl());\n }\n \n+static inline unsigned int get_current_el_maybe_constant(void)\n+{\n+#if defined(IMAGE_AT_EL1)\n+\treturn 1;\n+#elif defined(IMAGE_AT_EL2)\n+\treturn 2;\t\/* no use-case in TF-A *\/\n+#elif defined(IMAGE_AT_EL3)\n+\treturn 3;\n+#else\n+\t\/*\n+\t * If we do not know which exception level this is being built for\n+\t * (e.g. built for library), fall back to run-time detection.\n+\t *\/\n+\treturn get_current_el();\n+#endif\n+}\n+\n \/*\n * Check if an EL is implemented from AA64PFR0 register fields.\n *\/\n"} {"commit":"562fff7027dfb0107946b15f780622af8ae29ab6","subject":"Fix message generated from \"gfx read elements\" to mention elements rather than nodes.","message":"Fix message generated from \"gfx read elements\" to mention elements rather than\nnodes.\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/command\/cmiss.c\n+++ source\/command\/cmiss.c\n@@ -16217,7 +16217,7 @@\n \t\t\t\telse\n \t\t\t\t{\n \t\t\t\t\tdisplay_message(ERROR_MESSAGE,\n-\t\t\t\t\t\t\"Could not open node file: %s\", file_name);\n+\t\t\t\t\t\t\"Could not open element file: %s\", file_name);\n \t\t\t\t\treturn_code = 0;\n \t\t\t\t}\n \t\t\t}\n"} {"commit":"36d8b17b4364915615aff312ba20a1b90e22b963","subject":"[ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols","message":"[ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols\n\nMake the cpu_is_pxaXXX() macros define to zero when support for a\nparticular CPU is disabled. This allows us to eliminate code for\nCPUs which aren't enabled.\n\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-arm\/arch-pxa\/hardware.h\n+++ include\/asm-arm\/arch-pxa\/hardware.h\n@@ -62,6 +62,7 @@\n \n #ifndef __ASSEMBLY__\n \n+#ifdef CONFIG_PXA25x\n #define __cpu_is_pxa21x(id)\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n \t\tunsigned int _id = (id) >> 4 & 0xf3f;\t\\\n@@ -73,30 +74,50 @@\n \t\tunsigned int _id = (id) >> 4 & 0xfff;\t\\\n \t\t_id == 0x2d0 || _id == 0x290;\t\t\\\n \t})\n-\n+#else\n+#define __cpu_is_pxa21x(id)\t(0)\n+#define __cpu_is_pxa25x(id)\t(0)\n+#endif\n+\n+#ifdef CONFIG_PXA27x\n #define __cpu_is_pxa27x(id)\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n \t\tunsigned int _id = (id) >> 4 & 0xfff;\t\\\n \t\t_id == 0x411;\t\t\t\t\\\n \t})\n-\n+#else\n+#define __cpu_is_pxa27x(id)\t(0)\n+#endif\n+\n+#ifdef CONFIG_CPU_PXA300\n #define __cpu_is_pxa300(id)\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n \t\tunsigned int _id = (id) >> 4 & 0xfff;\t\\\n \t\t_id == 0x688;\t\t\t\t\\\n \t })\n-\n+#else\n+#define __cpu_is_pxa300(id)\t(0)\n+#endif\n+\n+#ifdef CONFIG_CPU_PXA310\n #define __cpu_is_pxa310(id)\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n \t\tunsigned int _id = (id) >> 4 & 0xfff;\t\\\n \t\t_id == 0x689;\t\t\t\t\\\n \t })\n-\n+#else\n+#define __cpu_is_pxa310(id)\t(0)\n+#endif\n+\n+#ifdef CONFIG_CPU_PXA320\n #define __cpu_is_pxa320(id)\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n \t\tunsigned int _id = (id) >> 4 & 0xfff;\t\\\n \t\t_id == 0x603 || _id == 0x682;\t\t\\\n \t })\n+#else\n+#define __cpu_is_pxa320(id)\t(0)\n+#endif\n \n #define cpu_is_pxa21x()\t\t\t\t\t\\\n \t({\t\t\t\t\t\t\\\n"} {"commit":"b79d50c61be98f10fda26828790ac12c0949f373","subject":"disable buggy sse3 routine! test showed it in ello.","message":"disable buggy sse3 routine! test showed it in ello.\n\n\n\ngit-svn-id: 6d771e449150288cc513807b7f4d2af31e9482bd@63985 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/uifw-evas,TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/engines\/common\/evas_op_blend\/op_blend_color_sse3.c\n+++ src\/lib\/engines\/common\/evas_op_blend\/op_blend_color_sse3.c\n@@ -56,7 +56,8 @@\n op_blend_span_funcs[SP_N][SM_N][SC][DP][CPU_SSE3] = _op_blend_c_dp_sse3;\n op_blend_span_funcs[SP_N][SM_N][SC_AA][DP][CPU_SSE3] = _op_blend_caa_dp_sse3;\n \n- op_blend_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_SSE3] = _op_blend_c_dpan_sse3;\n+\/\/ BUGGY BUGGY BUGGY!!!! <- disabled.\n+\/\/ op_blend_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_SSE3] = _op_blend_c_dpan_sse3;\n op_blend_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_SSE3] = _op_blend_caa_dpan_sse3;\n }\n \n"} {"commit":"b240e31c1c25c07ffe046a3433d43fa8b862c136","subject":"Safer fixed wing mode switching","message":"Safer fixed wing mode switching\n","repos":"acfloria\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,dagar\/Firmware,darknight-007\/Firmware,PX4\/Firmware,darknight-007\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,dagar\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,dagar\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,dagar\/Firmware,PX4\/Firmware,krbeverx\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,darknight-007\/Firmware,darknight-007\/Firmware,mcgill-robotics\/Firmware,jlecoeur\/Firmware,acfloria\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,Aerotenna\/Firmware,jlecoeur\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,mje-nz\/PX4-Firmware,mje-nz\/PX4-Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,Aerotenna\/Firmware,darknight-007\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,mje-nz\/PX4-Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,acfloria\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- apps\/fixedwing_att_control\/fixedwing_att_control_main.c\n+++ apps\/fixedwing_att_control\/fixedwing_att_control_main.c\n@@ -240,7 +240,7 @@\n \t\t\t\t\/* set flaps to zero *\/\n \t\t\t\tactuators.control[4] = 0.0f;\n \n-\t\t\t} else {\n+\t\t\t} else if (vstatus.state_machine == SYSTEM_STATE_MANUAL) {\n \t\t\t\tif (vstatus.manual_control_mode == VEHICLE_MANUAL_CONTROL_MODE_SAS) {\n \n \t\t\t\t\t\/* if the RC signal is lost, try to stay level and go slowly back down to ground *\/\n"} {"commit":"e469c66ab4b3bc93a5317171793ee692aacd29bd","subject":"Update comment for Actor::SetPosition()","message":"Update comment for Actor::SetPosition()\n\nChange-Id: Iad49f543e121f518abf3840b91895dcb96cf93b2\n","repos":"dalihub\/dali-core,dalihub\/dali-core,dalihub\/dali-core,dalihub\/dali-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- dali\/public-api\/actors\/actor.h\n+++ dali\/public-api\/actors\/actor.h\n@@ -665,8 +665,12 @@\n Vector3 GetNaturalSize() const;\n \n \/**\n- * @brief Sets the position of the actor.\n- *\n+ * @brief Sets the position of the Actor.\n+ *\n+ * By default, sets the position vector between the parent origin and anchor point (default).\n+ *\n+ * When SetInheritPosition(true) has called, sets the position vector between the world origin (0,0,0) and anchor point.\n+ * @image html actor-position.png\n * The Actor's z position will be set to 0.0f.\n * @SINCE_1_0.0\n * @param [in] x The new x position\n@@ -679,6 +683,10 @@\n \/**\n * @brief Sets the position of the Actor.\n *\n+ * By default, sets the position vector between the parent origin and anchor point (default).\n+ *\n+ * When SetInheritPosition(true) has called, sets the position vector between the world origin (0,0,0) and anchor point.\n+ * @image html actor-position.png\n * @SINCE_1_0.0\n * @param [in] x The new x position\n * @param [in] y The new y position\n@@ -691,6 +699,10 @@\n \/**\n * @brief Sets the position of the Actor.\n *\n+ * By default, sets the position vector between the parent origin and anchor point (default).\n+ *\n+ * When SetInheritPosition(true) has called, sets the position vector between the world origin (0,0,0) and anchor point.\n+ * @image html actor-position.png\n * @SINCE_1_0.0\n * @param [in] position The new position\n * @pre The Actor has been initialized.\n"} {"commit":"48c4da547b0ee70bbab2d3d8e0bae96bfe209c06","subject":"added 10 minutes timeout","message":"added 10 minutes timeout\n","repos":"porst17\/appchoo,xdsopl\/appchoo","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- appchoo.c\n+++ appchoo.c\n@@ -153,6 +153,8 @@\n \tSDL_Flip(screen);\n \n \tfor (;;) {\n+\t\tif (SDL_GetTicks() > (10 * 60 * 1000))\n+\t\t\texit(0);\n \t\tSDL_Delay(100);\n \t\thandle_events();\n \t}\n"} {"commit":"40691e340ee5edd1e7328a8d7c0391625186b297","subject":"let RNN connect to arbitrary previous states","message":"let RNN connect to arbitrary previous states\n\n\nFormer-commit-id: 0c4f386c8be505213511246ed861fc4bd402bf39","repos":"danielhers\/dynet,shuheik\/dynet,clab\/cnn,chunyang-wen\/dynet,danielhers\/dynet,shuheik\/dynet,xunzhang\/dynet,xunzhang\/dynet,xunzhang\/dynet,xunzhang\/dynet,clab\/dynet,clab\/dynet,shuheik\/dynet,clab\/dynet,shuheik\/dynet,clab\/dynet,clab\/dynet,shuheik\/dynet,clab\/dynet,chunyang-wen\/dynet,danielhers\/dynet,danielhers\/dynet,chunyang-wen\/dynet,clab\/cnn,danielhers\/dynet,shuheik\/dynet,chunyang-wen\/dynet,danielhers\/dynet,clab\/cnn,shuheik\/dynet,danielhers\/dynet,clab\/dynet","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cnn\/rnn.h\n+++ cnn\/rnn.h\n@@ -49,6 +49,16 @@\n int rcp = cur;\n cur = head.size() - 1;\n return add_input_impl(rcp, x);\n+ }\n+\n+ \/\/ add another timestep, but define recurrent connection to prev\n+ \/\/ rather than to head[cur]\n+ \/\/ this can be used to construct trees, implement beam search, etc.\n+ Expression add_input(const RNNPointer& prev, const Expression& x) {\n+ sm.transition(RNNOp::add_input);\n+ head.push_back(prev);\n+ cur = head.size() - 1;\n+ return add_input_impl(prev, x);\n }\n \n \/\/ rewind the last timestep - this DOES NOT remove the variables\n"} {"commit":"3bcd26209998b7930dfd8b9b3bc5ab15f77c580b","subject":"parameter can be made const","message":"parameter can be made const\n","repos":"oxidase\/osrm-backend,antoinegiret\/osrm-geovelo,nagyistoce\/osrm-backend,stevevance\/Project-OSRM,neilbu\/osrm-backend,raymond0\/osrm-backend,ibikecph\/osrm-backend,jpizarrom\/osrm-backend,KnockSoftware\/osrm-backend,deniskoronchik\/osrm-backend,skyborla\/osrm-backend,yuryleb\/osrm-backend,prembasumatary\/osrm-backend,arnekaiser\/osrm-backend,bjtaylor1\/Project-OSRM-Old,oxidase\/osrm-backend,keesklopt\/matrix,ramyaragupathy\/osrm-backend,antoinegiret\/osrm-geovelo,ammeurer\/osrm-backend,arnekaiser\/osrm-backend,chaupow\/osrm-backend,ammeurer\/osrm-backend,felixguendling\/osrm-backend,alex85k\/Project-OSRM,Tristramg\/osrm-backend,skyborla\/osrm-backend,yuryleb\/osrm-backend,oxidase\/osrm-backend,ammeurer\/osrm-backend,agruss\/osrm-backend,Conggge\/osrm-backend,Project-OSRM\/osrm-backend,ammeurer\/osrm-backend,keesklopt\/matrix,neilbu\/osrm-backend,jpizarrom\/osrm-backend,deniskoronchik\/osrm-backend,ammeurer\/osrm-backend,prembasumatary\/osrm-backend,keesklopt\/matrix,hydrays\/osrm-backend,antoinegiret\/osrm-backend,raymond0\/osrm-backend,arnekaiser\/osrm-backend,nagyistoce\/osrm-backend,antoinegiret\/osrm-geovelo,bjtaylor1\/osrm-backend,bitsteller\/osrm-backend,skyborla\/osrm-backend,Conggge\/osrm-backend,raymond0\/osrm-backend,KnockSoftware\/osrm-backend,Project-OSRM\/osrm-backend,ramyaragupathy\/osrm-backend,KnockSoftware\/osrm-backend,duizendnegen\/osrm-backend,atsuyim\/osrm-backend,antoinegiret\/osrm-backend,frodrigo\/osrm-backend,atsuyim\/osrm-backend,nagyistoce\/osrm-backend,ramyaragupathy\/osrm-backend,felixguendling\/osrm-backend,alex85k\/Project-OSRM,bjtaylor1\/osrm-backend,KnockSoftware\/osrm-backend,bitsteller\/osrm-backend,raymond0\/osrm-backend,bjtaylor1\/Project-OSRM-Old,bjtaylor1\/osrm-backend,Conggge\/osrm-backend,ibikecph\/osrm-backend,Tristramg\/osrm-backend,alex85k\/Project-OSRM,prembasumatary\/osrm-backend,hydrays\/osrm-backend,felixguendling\/osrm-backend,duizendnegen\/osrm-backend,Conggge\/osrm-backend,frodrigo\/osrm-backend,Tristramg\/osrm-backend,Carsten64\/OSRM-aux-git,tkhaxton\/osrm-backend,chaupow\/osrm-backend,frodrigo\/osrm-backend,Carsten64\/OSRM-aux-git,ammeurer\/osrm-backend,frodrigo\/osrm-backend,stevevance\/Project-OSRM,hydrays\/osrm-backend,arnekaiser\/osrm-backend,bitsteller\/osrm-backend,yuryleb\/osrm-backend,duizendnegen\/osrm-backend,beemogmbh\/osrm-backend,tkhaxton\/osrm-backend,yuryleb\/osrm-backend,oxidase\/osrm-backend,deniskoronchik\/osrm-backend,keesklopt\/matrix,agruss\/osrm-backend,antoinegiret\/osrm-backend,jpizarrom\/osrm-backend,beemogmbh\/osrm-backend,deniskoronchik\/osrm-backend,ibikecph\/osrm-backend,Carsten64\/OSRM-aux-git,beemogmbh\/osrm-backend,Carsten64\/OSRM-aux-git,ammeurer\/osrm-backend,tkhaxton\/osrm-backend,bjtaylor1\/osrm-backend,neilbu\/osrm-backend,duizendnegen\/osrm-backend,neilbu\/osrm-backend,chaupow\/osrm-backend,hydrays\/osrm-backend,stevevance\/Project-OSRM,agruss\/osrm-backend,bjtaylor1\/Project-OSRM-Old,atsuyim\/osrm-backend,Project-OSRM\/osrm-backend,stevevance\/Project-OSRM,Project-OSRM\/osrm-backend,beemogmbh\/osrm-backend,bjtaylor1\/Project-OSRM-Old","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- DataStructures\/PolylineCompressor.h\n+++ DataStructures\/PolylineCompressor.h\n@@ -27,7 +27,7 @@\n \n class PolylineCompressor {\n private:\n- inline string encodeSignedNumber(int number) const {\n+ inline string encodeSignedNumber(const int number) const {\n int signedNumber = number << 1;\n if (number < 0) {\n signedNumber = ~(signedNumber);\n"} {"commit":"463cf8416c604084fca380c5d52f6e74860e5357","subject":"version bump","message":"version bump\n","repos":"DrCrypto\/darkcoin,bitgoldcoin-project\/bitgoldcoin,DrCrypto\/darkcoin,bitgoldcoin-project\/bitgoldcoin,bitgoldcoin-project\/bitgoldcoin,DrCrypto\/darkcoin,DrCrypto\/darkcoin,bitgoldcoin-project\/bitgoldcoin,bitgoldcoin-project\/bitgoldcoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -9,7 +9,7 @@\n #define CLIENT_VERSION_MAJOR 0\n #define CLIENT_VERSION_MINOR 8\n #define CLIENT_VERSION_REVISION 9\n-#define CLIENT_VERSION_BUILD 5\n+#define CLIENT_VERSION_BUILD 6\n \n \/\/ Set to true for release, false for prerelease or test build\n #define CLIENT_VERSION_IS_RELEASE true\n"} {"commit":"608852b84098cebdda1fd3c1016ec30d3890ccb3","subject":"g: Add help message for test_rdd command","message":"g: Add help message for test_rdd command\n\nBUG=none\nBRANCH=none\nTEST=make buildall\n\nBefore:\n\n > help test_rdd\n Usage: test_rdd\n\n >\n\nAfter:\n\n > help test_rdd\n Usage: test_rdd\n Fake an RDD-detected interrupt\n >\n\nChange-Id: I41bcc6c642bcad6577834e81436be712324ae64d\nSigned-off-by: Bill Richardson <129945214b1d548d8e49b6c29c43094f8c78057f@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/376098\nReviewed-by: Vadim Bendebury <5515d6d2d0829cbe0dd0dcf2094aaded06d58514@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chip\/g\/rdd.c\n+++ chip\/g\/rdd.c\n@@ -87,4 +87,5 @@\n \tGWRITE_FIELD(RDD, INT_TEST, INTR_DEBUG_STATE_DETECTED, 1);\n \treturn EC_SUCCESS;\n }\n-DECLARE_CONSOLE_COMMAND(test_rdd, command_test_rdd, \"\", \"\");\n+DECLARE_CONSOLE_COMMAND(test_rdd, command_test_rdd, NULL,\n+\t\t\t\"Fake an RDD-detected interrupt\");\n"} {"commit":"fca446a294836a37030bc811e1a55aef22170d45","subject":"Fixed buggy implementation of stpcpy on mingw","message":"Fixed buggy implementation of stpcpy on mingw\n","repos":"franko\/regress-pro,franko\/regress-pro","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fox-gui\/registration.c\n+++ fox-gui\/registration.c\n@@ -22,9 +22,9 @@\n #ifdef WIN32\n static char * stpcpy (char *dst, const char *src)\n {\n- dst += strlen (dst);\n for ( ; *src; dst++, src++)\n *dst = *src;\n+ *dst = 0;\n return dst;\n }\n #endif\n"} {"commit":"295d0a727d272be90810f309dfa85662503a99cd","subject":"Replaced get_width_for_percent with simple float expression.","message":"Replaced get_width_for_percent with simple float expression.\n","repos":"jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- battery.c\n+++ battery.c\n@@ -57,12 +57,6 @@\n \t\t.height = XSTATUS_CONST_HEIGHT >> 1,\n \t\t.width = range.end - range.start - XSTATUS_CONST_PAD};\n }\n-__attribute__((const))\n-static uint16_t get_width_for_percent(const uint16_t width,\n-\tconst uint8_t pct)\n-{\n-\treturn width * pct \/ 100;\n-}\n static void draw_rectangles(struct XSWidget * widget, const struct JBDim\n \trange, const uint8_t pct)\n {\n@@ -71,7 +65,7 @@\n \txcb_connection_t * xc = widget->connection;\n \t\/\/ clear:\n \txcb_poly_fill_rectangle(xc, w, widget->background, 1, &rect);\n-\trect.width = get_width_for_percent(rect.width, pct);\n+\trect.width *= pct \/ 100.0;\n \t\/\/ fill rectangle per percent full:\n \txcb_poly_fill_rectangle(xc, w, widget->foreground, 1, &rect);\n }\n"} {"commit":"748042a9bac37ef5adea3e50782fe459dc45602f","subject":"API docs for main class","message":"API docs for main class\n\n\nsvn path=\/trunk\/KDE\/kdepim\/console\/kabcclient\/; revision=704455\n","repos":"lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- console\/kabcclient\/src\/kabcclient.h\n+++ console\/kabcclient\/src\/kabcclient.h\n@@ -1,5 +1,5 @@\n \/\/\n-\/\/ Copyright (C) 2005 - 2006Kevin Krammer <kevin.krammer@gmx.at>\n+\/\/ Copyright (C) 2005 - 2006 Kevin Krammer <kevin.krammer@gmx.at>\n \/\/\n \/\/ This program is free software; you can redistribute it and\/or modify\n \/\/ it under the terms of the GNU General Public License as published by\n@@ -38,42 +38,242 @@\n class Picture;\n }\n \n+\/**\n+* @brief Main handler of the program\n+*\n+* This class is the \"program\", it gets configured with the options passed\n+* by the user at the command line, retrieves the necessary components from its\n+* factories (see FormatFactory) and then executes the desired #Operation\n+*\n+* @author Kevin Krammer, <kevin.krammer@gmx.at>\n+*\/\n class KABCClient: public QObject\n {\n Q_OBJECT\n \n public:\n+ \/**\n+ * @brief List of supported operations\n+ *\/\n enum Operation\n {\n+ \/**\n+ * @brief Writes all contacts of the address book\n+ *\n+ * Does not consume any input\n+ *\/\n List = 0,\n+\n+ \/**\n+ * @brief Adds the input to the address book\n+ *\n+ * Reads contacts from the input stream in a loop and tries to add each\n+ * one to the address book.\n+ *\n+ * Writes the each contacts data to the output stream.\n+ *\n+ * @see KABC::AddressBook::insertAddressee()\n+ * @see @ref formathandling\n+ *\/\n Add,\n+\n+ \/**\n+ * @brief Removes matching contact from the address book\n+ *\n+ * Reads contacts from the input stream in a loop and checks for each\n+ * which entries in the address book match. If there is more than one\n+ * match, it will not remove any of them. Else (only one match) it will\n+ * remove the match from the address book.\n+ *\n+ * Can use SearchInput and DialogInput\n+ *\n+ * Writes the remove contact's data to the output stream\n+ *\n+ * @see KABC::AddressBook::removeAddressee()\n+ * @see @ref formathandling\n+ *\/\n Remove,\n+\n+ \/**\n+ * @brief Merges input data into the address book\n+ *\n+ * Reads contacts from the input stream in a loop and checks for each\n+ * which entries in the address book match. If there is more than one\n+ * match, it will not attempt to merge. Else (only one match) it will\n+ * use the found contact and merge information from the input contact\n+ * into it and then replace the one inside the address book with the\n+ * merged one.\n+ *\n+ * Writes the merged contact's data to the output stream.\n+ *\n+ * @see KABC::AddressBook::insertAddressee()\n+ * @see @ref formathandling\n+ *\/\n Merge,\n+\n+ \/**\n+ * @brief Searches for matching entries in the address book\n+ *\n+ * Reads contacts from the input stream in a loop and checks for each\n+ * which entries in the address book match.\n+ *\n+ * Can use SearchInput and DialogInput\n+ *\n+ * Writes all matches per input to the output stream.\n+ *\/\n Search\n };\n \n+ \/**\n+ * @brief Creates and initializes the instance\n+ *\n+ * @param operation the operation to perform on the address book\n+ * @param factory the factory to get the input and output format handlers from\n+ *\/\n KABCClient(Operation operation, FormatFactory* factory);\n \n+ \/**\n+ * @brief Destroys the instance\n+ *\/\n virtual ~KABCClient();\n \n+ \/**\n+ * @brief Sets the input format to use\n+ *\n+ * Checks if the given @p name is a valid input format for the #Operation\n+ * specified at the construction.\n+ * If it is not blacklisted, the respective InputFormat will be retrieved\n+ * from the FormatFactory.\n+ *\n+ * @param name the name of an InputFormat to use for parsing the input data\n+ *\n+ * @return @c true if the format is allowed for the selected #Operation and\n+ * its format parser can be created, otherwise @c false\n+ *\n+ * @see setInputOptions()\n+ * @see setInputCodec()\n+ * @see setOutputFormat()\n+ *\/\n bool setInputFormat(const QByteArray& name);\n+\n+ \/**\n+ * @brief Sets the output format to use\n+ *\n+ * Retrieves the respective OutputFormat from the FormatFactory\n+ *\n+ * @param name the name of an OutputFormat to use for formatting the output\n+ * data\n+ *\n+ * @return @c true if the format has been created, otherwise @c false\n+ *\n+ * @see setOutputOptions()\n+ * @see setOutputCodec()\n+ * @see setInputFormat()\n+ *\/\n bool setOutputFormat(const QByteArray& name);\n \n+ \/**\n+ * @brief Sets the options for the input format\n+ *\n+ * Passes the @p options to the InputFormat set with setInputFormat()\n+ *\n+ * @param options the options for the InputFormat\n+ *\n+ * @return @c true if the InputFormat accepts the options, @c false if it\n+ * doesn't or if there is not InputFormat set\n+ *\n+ * @see InputFormat::setOptions()\n+ * @see setInputCodec()\n+ *\/\n bool setInputOptions(const QByteArray& options);\n+\n+ \/**\n+ * @brief Sets the options for the output format\n+ *\n+ * Passes the @p options to the OutputFormat set with setOutputFormat()\n+ *\n+ * @param options the options for the OutputFormat\n+ *\n+ * @return @c true if the OutputFormat accepts the options, @c false if it\n+ * doesn't or if there is not OutputFormat set\n+ *\n+ * @see OutputFormat::setOptions()\n+ * @see setOutputCodec()\n+ *\/\n bool setOutputOptions(const QByteArray& options);\n \n+ \/**\n+ * @brief Sets the text codec for reading the input data\n+ *\n+ * Translates @c utf, @c utf8, @c utf-8 to @c UTF-8 and @c local, @c locale\n+ * the codec for the current locale.\n+ *\n+ * @param name the name of the QTextCodec. See QTextCodec::codecForName()\n+ *\n+ * @return return value of QTextCodec::codecForName()\n+ *\n+ * @see setInputFormat()\n+ *\/\n bool setInputCodec(const QByteArray& name);\n+\n+ \/**\n+ * @brief Sets the text codec for writing the output data\n+ *\n+ * Translates @c utf, @c utf8, @c utf-8 to @c UTF-8 and @c local, @c locale\n+ * the codec for the current locale.\n+ *\n+ * @param name the name of the QTextCodec. See QTextCodec::codecForName()\n+ *\n+ * @return return value of QTextCodec::codecForName()\n+ *\n+ * @see setOutputFormat()\n+ *\/\n bool setOutputCodec(const QByteArray& name);\n \n+ \/**\n+ * @brief Sets the input stream to read data from\n+ *\n+ * Depending on the input mode this can be either a @c stringstream on\n+ * the additional command arguments or @c cin\n+ *\n+ * @param stream the input stream for reading\n+ *\/\n void setInputStream(std::istream* stream);\n \n+ \/**\n+ * @brief Checks if #Operation setup is correct and schedules execution\n+ *\n+ * Loads the KABC::StandardAddressBook syncronously and deactivates its\n+ * \"auto save\", so the user can operate the program in \"simulate\" mode\n+ *\n+ * @return @c true when #Operation can start, otherwise @c false\n+ *\/\n bool initOperation();\n \n+ \/**\n+ * @brief Sets the string matching mode\n+ *\n+ * Default if @c Qt::CaseInsensitive\n+ *\n+ * @param sensitivity whether to do string comparisons case sensitive or not\n+ *\/\n inline void setMatchCaseSensitivity(Qt::CaseSensitivity sensitivity)\n {\n m_matchCaseSensitivity = sensitivity;\n }\n \n+ \/**\n+ * @brief Sets the save behavior\n+ *\n+ * When saving is @p on to address book data will be written to the\n+ * address book storage, otherwise they will just be performed on the\n+ * in-memory data.\n+ *\n+ * Default is @c true\n+ *\n+ * @param on when @c true write data to address book store, when @c false\n+ * operate in \"simulate\" mode\n+ *\/\n inline void setAllowSaving(bool on) { m_allowSaving = on; }\n \n private:\n"} {"commit":"7b4330191f98214c524e98106130e4b9f517cec1","subject":"py, compiler: Fix up creation of default positionals tuple.","message":"py, compiler: Fix up creation of default positionals tuple.\n\nWith new order of evaluation of defaults, creating the tuple was done in\nthe wrong spot.\n","repos":"neilh10\/micropython,oopy\/micropython,cwyark\/micropython,trezor\/micropython,lbattraw\/micropython,SHA2017-badge\/micropython-esp32,henriknelson\/micropython,dinau\/micropython,selste\/micropython,HenrikSolver\/micropython,dxxb\/micropython,omtinez\/micropython,firstval\/micropython,Timmenem\/micropython,blazewicz\/micropython,ganshun666\/micropython,pozetroninc\/micropython,jmarcelino\/pycom-micropython,kerneltask\/micropython,Peetz0r\/micropython-esp32,TDAbboud\/micropython,vitiral\/micropython,orionrobots\/micropython,emfcamp\/micropython,AriZuu\/micropython,jimkmc\/micropython,kostyll\/micropython,hosaka\/micropython,aitjcize\/micropython,SungEun-Steve-Kim\/test-mp,selste\/micropython,redbear\/micropython,praemdonck\/micropython,suda\/micropython,torwag\/micropython,hosaka\/micropython,aitjcize\/micropython,emfcamp\/micropython,neilh10\/micropython,vitiral\/micropython,vriera\/micropython,ryannathans\/micropython,infinnovation\/micropython,feilongfl\/micropython,paul-xxx\/micropython,adafruit\/circuitpython,firstval\/micropython,mhoffma\/micropython,MrSurly\/micropython,ahotam\/micropython,orionrobots\/micropython,blmorris\/micropython,kostyll\/micropython,micropython\/micropython-esp32,mgyenik\/micropython,misterdanb\/micropython,mhoffma\/micropython,blmorris\/micropython,martinribelotta\/micropython,skybird6672\/micropython,noahwilliamsson\/micropython,hosaka\/micropython,tuc-osg\/micropython,mgyenik\/micropython,PappaPeppar\/micropython,pozetroninc\/micropython,Vogtinator\/micropython,stonegithubs\/micropython,xyb\/micropython,alex-robbins\/micropython,xhat\/micropython,adamkh\/micropython,utopiaprince\/micropython,noahchense\/micropython,supergis\/micropython,adafruit\/circuitpython,orionrobots\/micropython,ruffy91\/micropython,selste\/micropython,ryannathans\/micropython,bvernoux\/micropython,aethaniel\/micropython,drrk\/micropython,tuc-osg\/micropython,tdautc19841202\/micropython,alex-march\/micropython,xyb\/micropython,adafruit\/micropython,SHA2017-badge\/micropython-esp32,vriera\/micropython,vriera\/micropython,adafruit\/circuitpython,EcmaXp\/micropython,omtinez\/micropython,warner83\/micropython,emfcamp\/micropython,pozetroninc\/micropython,feilongfl\/micropython,blazewicz\/micropython,jimkmc\/micropython,micropython\/micropython-esp32,SHA2017-badge\/micropython-esp32,slzatz\/micropython,stonegithubs\/micropython,suda\/micropython,swegener\/micropython,tralamazza\/micropython,blazewicz\/micropython,cnoviello\/micropython,oopy\/micropython,dinau\/micropython,Peetz0r\/micropython-esp32,neilh10\/micropython,skybird6672\/micropython,ericsnowcurrently\/micropython,HenrikSolver\/micropython,noahchense\/micropython,ryannathans\/micropython,rubencabrera\/micropython,danicampora\/micropython,emfcamp\/micropython,vitiral\/micropython,ernesto-g\/micropython,warner83\/micropython,jmarcelino\/pycom-micropython,mgyenik\/micropython,dhylands\/micropython,rubencabrera\/micropython,utopiaprince\/micropython,orionrobots\/micropython,Vogtinator\/micropython,redbear\/micropython,supergis\/micropython,pfalcon\/micropython,AriZuu\/micropython,drrk\/micropython,hiway\/micropython,heisewangluo\/micropython,ahotam\/micropython,chrisdearman\/micropython,noahwilliamsson\/micropython,emfcamp\/micropython,dinau\/micropython,slzatz\/micropython,adafruit\/micropython,danicampora\/micropython,mpalomer\/micropython,ernesto-g\/micropython,ChuckM\/micropython,cloudformdesign\/micropython,tobbad\/micropython,suda\/micropython,ryannathans\/micropython,dxxb\/micropython,tdautc19841202\/micropython,skybird6672\/micropython,hiway\/micropython,MrSurly\/micropython-esp32,mianos\/micropython,galenhz\/micropython,micropython\/micropython-esp32,deshipu\/micropython,aitjcize\/micropython,tralamazza\/micropython,lbattraw\/micropython,EcmaXp\/micropython,drrk\/micropython,MrSurly\/micropython-esp32,methoxid\/micropystat,matthewelse\/micropython,infinnovation\/micropython,oopy\/micropython,supergis\/micropython,hiway\/micropython,paul-xxx\/micropython,cloudformdesign\/micropython,galenhz\/micropython,lowRISC\/micropython,KISSMonX\/micropython,omtinez\/micropython,neilh10\/micropython,heisewangluo\/micropython,jlillest\/micropython,methoxid\/micropystat,warner83\/micropython,PappaPeppar\/micropython,jlillest\/micropython,EcmaXp\/micropython,ChuckM\/micropython,puuu\/micropython,jlillest\/micropython,tralamazza\/micropython,kerneltask\/micropython,ryannathans\/micropython,dhylands\/micropython,stonegithubs\/micropython,chrisdearman\/micropython,lbattraw\/micropython,feilongfl\/micropython,skybird6672\/micropython,vitiral\/micropython,blmorris\/micropython,pozetroninc\/micropython,stonegithubs\/micropython,cloudformdesign\/micropython,AriZuu\/micropython,paul-xxx\/micropython,lowRISC\/micropython,kerneltask\/micropython,ernesto-g\/micropython,cnoviello\/micropython,lowRISC\/micropython,xyb\/micropython,mianos\/micropython,ceramos\/micropython,puuu\/micropython,oopy\/micropython,puuu\/micropython,xuxiaoxin\/micropython,slzatz\/micropython,orionrobots\/micropython,rubencabrera\/micropython,kostyll\/micropython,tdautc19841202\/micropython,TDAbboud\/micropython,drrk\/micropython,firstval\/micropython,MrSurly\/micropython,pfalcon\/micropython,KISSMonX\/micropython,aitjcize\/micropython,bvernoux\/micropython,toolmacher\/micropython,ernesto-g\/micropython,praemdonck\/micropython,martinribelotta\/micropython,bvernoux\/micropython,jmarcelino\/pycom-micropython,ruffy91\/micropython,oopy\/micropython,Vogtinator\/micropython,trezor\/micropython,jimkmc\/micropython,ceramos\/micropython,misterdanb\/micropython,lowRISC\/micropython,neilh10\/micropython,cloudformdesign\/micropython,xyb\/micropython,ceramos\/micropython,cwyark\/micropython,infinnovation\/micropython,ericsnowcurrently\/micropython,adamkh\/micropython,blazewicz\/micropython,alex-march\/micropython,MrSurly\/micropython-esp32,firstval\/micropython,rubencabrera\/micropython,EcmaXp\/micropython,ChuckM\/micropython,TDAbboud\/micropython,SungEun-Steve-Kim\/test-mp,chrisdearman\/micropython,matthewelse\/micropython,vriera\/micropython,pramasoul\/micropython,dhylands\/micropython,torwag\/micropython,heisewangluo\/micropython,ruffy91\/micropython,Timmenem\/micropython,martinribelotta\/micropython,MrSurly\/micropython-esp32,dmazzella\/micropython,martinribelotta\/micropython,ganshun666\/micropython,MrSurly\/micropython,pramasoul\/micropython,mgyenik\/micropython,PappaPeppar\/micropython,vriera\/micropython,swegener\/micropython,mpalomer\/micropython,dhylands\/micropython,puuu\/micropython,toolmacher\/micropython,MrSurly\/micropython,henriknelson\/micropython,cnoviello\/micropython,jmarcelino\/pycom-micropython,Peetz0r\/micropython-esp32,xhat\/micropython,alex-robbins\/micropython,misterdanb\/micropython,kerneltask\/micropython,hiway\/micropython,kostyll\/micropython,slzatz\/micropython,firstval\/micropython,dxxb\/micropython,pfalcon\/micropython,Vogtinator\/micropython,mpalomer\/micropython,mhoffma\/micropython,dmazzella\/micropython,mpalomer\/micropython,praemdonck\/micropython,bvernoux\/micropython,tdautc19841202\/micropython,misterdanb\/micropython,ericsnowcurrently\/micropython,feilongfl\/micropython,henriknelson\/micropython,Vogtinator\/micropython,adamkh\/micropython,SungEun-Steve-Kim\/test-mp,pramasoul\/micropython,suda\/micropython,cnoviello\/micropython,noahwilliamsson\/micropython,paul-xxx\/micropython,dxxb\/micropython,ahotam\/micropython,kostyll\/micropython,methoxid\/micropystat,galenhz\/micropython,Timmenem\/micropython,xhat\/micropython,chrisdearman\/micropython,adamkh\/micropython,turbinenreiter\/micropython,tobbad\/micropython,alex-robbins\/micropython,noahchense\/micropython,slzatz\/micropython,methoxid\/micropystat,dinau\/micropython,stonegithubs\/micropython,jmarcelino\/pycom-micropython,tuc-osg\/micropython,AriZuu\/micropython,pramasoul\/micropython,noahwilliamsson\/micropython,adafruit\/circuitpython,chrisdearman\/micropython,danicampora\/micropython,cwyark\/micropython,galenhz\/micropython,pramasoul\/micropython,swegener\/micropython,noahchense\/micropython,xuxiaoxin\/micropython,dmazzella\/micropython,noahchense\/micropython,matthewelse\/micropython,cnoviello\/micropython,Timmenem\/micropython,MrSurly\/micropython,mianos\/micropython,jimkmc\/micropython,ganshun666\/micropython,mgyenik\/micropython,PappaPeppar\/micropython,matthewelse\/micropython,turbinenreiter\/micropython,omtinez\/micropython,heisewangluo\/micropython,tobbad\/micropython,tdautc19841202\/micropython,blmorris\/micropython,dinau\/micropython,utopiaprince\/micropython,redbear\/micropython,ChuckM\/micropython,jimkmc\/micropython,matthewelse\/micropython,toolmacher\/micropython,Timmenem\/micropython,ceramos\/micropython,deshipu\/micropython,turbinenreiter\/micropython,lbattraw\/micropython,lbattraw\/micropython,bvernoux\/micropython,aethaniel\/micropython,alex-robbins\/micropython,pfalcon\/micropython,mhoffma\/micropython,ernesto-g\/micropython,pfalcon\/micropython,HenrikSolver\/micropython,danicampora\/micropython,adamkh\/micropython,infinnovation\/micropython,praemdonck\/micropython,PappaPeppar\/micropython,paul-xxx\/micropython,blazewicz\/micropython,hosaka\/micropython,swegener\/micropython,cwyark\/micropython,micropython\/micropython-esp32,deshipu\/micropython,dhylands\/micropython,kerneltask\/micropython,deshipu\/micropython,KISSMonX\/micropython,deshipu\/micropython,ericsnowcurrently\/micropython,micropython\/micropython-esp32,selste\/micropython,aethaniel\/micropython,swegener\/micropython,tuc-osg\/micropython,vitiral\/micropython,heisewangluo\/micropython,alex-march\/micropython,jlillest\/micropython,adafruit\/micropython,danicampora\/micropython,adafruit\/micropython,xuxiaoxin\/micropython,lowRISC\/micropython,matthewelse\/micropython,aethaniel\/micropython,tralamazza\/micropython,martinribelotta\/micropython,warner83\/micropython,toolmacher\/micropython,redbear\/micropython,jlillest\/micropython,mianos\/micropython,henriknelson\/micropython,rubencabrera\/micropython,xyb\/micropython,tobbad\/micropython,trezor\/micropython,trezor\/micropython,trezor\/micropython,torwag\/micropython,galenhz\/micropython,TDAbboud\/micropython,KISSMonX\/micropython,alex-march\/micropython,infinnovation\/micropython,SHA2017-badge\/micropython-esp32,ganshun666\/micropython,cloudformdesign\/micropython,mhoffma\/micropython,utopiaprince\/micropython,xhat\/micropython,cwyark\/micropython,drrk\/micropython,hosaka\/micropython,xhat\/micropython,tuc-osg\/micropython,blmorris\/micropython,warner83\/micropython,alex-march\/micropython,redbear\/micropython,supergis\/micropython,mpalomer\/micropython,ruffy91\/micropython,ChuckM\/micropython,EcmaXp\/micropython,KISSMonX\/micropython,HenrikSolver\/micropython,ahotam\/micropython,dxxb\/micropython,turbinenreiter\/micropython,hiway\/micropython,ahotam\/micropython,praemdonck\/micropython,omtinez\/micropython,dmazzella\/micropython,feilongfl\/micropython,misterdanb\/micropython,skybird6672\/micropython,turbinenreiter\/micropython,AriZuu\/micropython,adafruit\/circuitpython,utopiaprince\/micropython,selste\/micropython,xuxiaoxin\/micropython,torwag\/micropython,ericsnowcurrently\/micropython,SHA2017-badge\/micropython-esp32,HenrikSolver\/micropython,methoxid\/micropystat,aethaniel\/micropython,suda\/micropython,alex-robbins\/micropython,SungEun-Steve-Kim\/test-mp,Peetz0r\/micropython-esp32,tobbad\/micropython,adafruit\/circuitpython,ganshun666\/micropython,henriknelson\/micropython,supergis\/micropython,ceramos\/micropython,mianos\/micropython,puuu\/micropython,TDAbboud\/micropython,toolmacher\/micropython,noahwilliamsson\/micropython,SungEun-Steve-Kim\/test-mp,MrSurly\/micropython-esp32,ruffy91\/micropython,xuxiaoxin\/micropython,Peetz0r\/micropython-esp32,pozetroninc\/micropython,adafruit\/micropython,torwag\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- py\/compile.c\n+++ py\/compile.c\n@@ -915,6 +915,11 @@\n #if !MICROPY_EMIT_CPYTHON\n \/\/ in Micro Python we put the default dict parameters into a dictionary using the bytecode\n if (comp->num_dict_params == 1) {\n+ \/\/ in Micro Python we put the default positional parameters into a tuple using the bytecode\n+ \/\/ we need to do this here before we start building the map for the default keywords\n+ if (comp->num_default_params > 0) {\n+ EMIT_ARG(build_tuple, comp->num_default_params);\n+ }\n \/\/ first default dict param, so make the map\n EMIT_ARG(build_map, 0);\n }\n@@ -963,7 +968,8 @@\n \n #if !MICROPY_EMIT_CPYTHON\n \/\/ in Micro Python we put the default positional parameters into a tuple using the bytecode\n- if (comp->num_default_params > 0) {\n+ \/\/ the default keywords args may have already made the tuple; if not, do it now\n+ if (comp->num_default_params > 0 && comp->num_dict_params == 0) {\n EMIT_ARG(build_tuple, comp->num_default_params);\n }\n #endif\n"} {"commit":"41e7fdd95fb30ef955b7c9579dc6909882ecc0fb","subject":"Fixed missing initialisation of position variable.","message":"Fixed missing initialisation of position variable.\n","repos":"rjcorrig\/FreeRDP,realjiangms\/FreeRDP,yurashek\/FreeRDP,bmiklautz\/FreeRDP,ivan-83\/FreeRDP,BUGgs\/FreeRDP,RolKau\/FreeRDP,weinyzhou\/FreeRDP,ssieb\/FreeRDP,tc-anssi\/FreeRDP,vaginessa\/FreeRDP,awakecoding\/FreeRDP,MartinHaimberger\/FreeRDP,anjoah\/FreeRDP,akallabeth\/FreeRDP,chipitsine\/FreeRDP,llyzs\/FreeRDP,ondrejholy\/FreeRDP,xproax\/FreeRDP,MartinHaimberger\/FreeRDP,bceverly\/FreeRDP,clivest\/FreeRDP,ivan-83\/FreeRDP,zhangximin\/FreeRDP,peterh\/FreeRDP,infelt\/FreeRDP,cedrozor\/FreeRDP,eledoux\/FreeRDP,yurashek\/FreeRDP,zhangximin\/FreeRDP,cedrozor\/FreeRDP,xhaakon\/FreeRDP,ondrejholy\/FreeRDP,cedrozor\/FreeRDP,BUGgs\/FreeRDP,Testinos\/Freerdp,BUGgs\/FreeRDP,tc-anssi\/FreeRDP,ondrejholy\/FreeRDP,briggsbog\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,vaginessa\/FreeRDP,nanxiongchao\/FreeRDP,ivan-83\/FreeRDP,everhopingandwaiting\/FreeRDP,llyzs\/FreeRDP,RangeeGmbH\/FreeRDP,briggsbog\/FreeRDP,nanxiongchao\/FreeRDP,zavadovsky\/FreeRDP,tc-anssi\/FreeRDP,zavadovsky\/FreeRDP,cloudbase\/FreeRDP-dev,nfedera\/FreeRDP,oshogbo\/FreeRDP,infelt\/FreeRDP,zavadovsky\/FreeRDP,vaginessa\/FreeRDP,eledoux\/FreeRDP,bjcollins\/FreeRDP,xproax\/FreeRDP,colemickens\/FreeRDP,everhopingandwaiting\/FreeRDP,akallabeth\/FreeRDP,Testinos\/Freerdp,realjiangms\/FreeRDP,bjcollins\/FreeRDP,cloudbase\/FreeRDP-dev,nanxiongchao\/FreeRDP,MartinHaimberger\/FreeRDP,weinyzhou\/FreeRDP,lmcro\/FreeRDP,zhangximin\/FreeRDP,bsagal\/FreeRDP,bsagal\/FreeRDP,vworkspace\/FreeRDP,ivan-83\/FreeRDP,ssieb\/FreeRDP,tc-anssi\/FreeRDP,peterh\/FreeRDP,mcnestrb\/FreeRDP,DavBfr\/FreeRDP,dvincent-devolutions\/FreeRDP,Devolutions\/FreeRDP,yurashek\/FreeRDP,chipitsine\/FreeRDP,Distrotech\/FreeRDP,briggsbog\/FreeRDP,Distrotech\/FreeRDP,rjcorrig\/FreeRDP,RolKau\/FreeRDP,nanxiongchao\/FreeRDP,bsagal\/FreeRDP,xhaakon\/FreeRDP,mfleisz\/FreeRDP,weinyzhou\/FreeRDP,zhangximin\/FreeRDP,clivest\/FreeRDP,vaginessa\/FreeRDP,zavadovsky\/FreeRDP,aballier\/FreeRDP,xproax\/FreeRDP,bceverly\/FreeRDP,vworkspace\/FreeRDP,lmcro\/FreeRDP,oshogbo\/FreeRDP,bjcollins\/FreeRDP,oshogbo\/FreeRDP,ilammy\/FreeRDP,nfedera\/FreeRDP,infelt\/FreeRDP,hyacinthes\/FreeRDP,anjoah\/FreeRDP,Distrotech\/FreeRDP,oshogbo\/FreeRDP,BUGgs\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,everhopingandwaiting\/FreeRDP,dvincent-devolutions\/FreeRDP,yurashek\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP,dvincent-devolutions\/FreeRDP,clivest\/FreeRDP,awakecoding\/FreeRDP,mcnestrb\/FreeRDP,daneshih1125\/FreeRDP,ondrejholy\/FreeRDP,ondrejholy\/FreeRDP,vworkspace\/FreeRDP,hyacinthes\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,yurashek\/FreeRDP,tinixx\/FreeRDP,tinixx\/FreeRDP,weinyzhou\/FreeRDP,RangeeGmbH\/FreeRDP,infelt\/FreeRDP,bceverly\/FreeRDP,mcnestrb\/FreeRDP,briggsbog\/FreeRDP,zavadovsky\/FreeRDP,daneshih1125\/FreeRDP,hyacinthes\/FreeRDP,hyacinthes\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,hyacinthes\/FreeRDP,llyzs\/FreeRDP,Distrotech\/FreeRDP,realjiangms\/FreeRDP,MartinHaimberger\/FreeRDP,mfleisz\/FreeRDP,kingland\/FreeRDP,daneshih1125\/FreeRDP,Devolutions\/FreeRDP,zavadovsky\/FreeRDP,xhaakon\/FreeRDP,ilammy\/FreeRDP,colemickens\/FreeRDP,nfedera\/FreeRDP,bmiklautz\/FreeRDP,llyzs\/FreeRDP,massuda-marcelo\/FreeRDP,FreeRDP\/FreeRDP,realjiangms\/FreeRDP,anjoah\/FreeRDP,tinixx\/FreeRDP,cedrozor\/FreeRDP,llyzs\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,eledoux\/FreeRDP,xproax\/FreeRDP,clivest\/FreeRDP,nfedera\/FreeRDP,bjcollins\/FreeRDP,akallabeth\/FreeRDP,rjcorrig\/FreeRDP,everhopingandwaiting\/FreeRDP,massuda-marcelo\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,tinixx\/FreeRDP,cloudbase\/FreeRDP-dev,BUGgs\/FreeRDP,kingland\/FreeRDP,cloudbase\/FreeRDP-dev,everhopingandwaiting\/FreeRDP,xproax\/FreeRDP,eledoux\/FreeRDP,massuda-marcelo\/FreeRDP,cedrozor\/FreeRDP,dvincent-devolutions\/FreeRDP,DavBfr\/FreeRDP,tinixx\/FreeRDP,ilammy\/FreeRDP,kingland\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,colemickens\/FreeRDP,cloudbase\/FreeRDP-dev,weinyzhou\/FreeRDP,bjcollins\/FreeRDP,mcnestrb\/FreeRDP,ondrejholy\/FreeRDP,RolKau\/FreeRDP,eledoux\/FreeRDP,nanxiongchao\/FreeRDP,ilammy\/FreeRDP,DavBfr\/FreeRDP,xhaakon\/FreeRDP,aballier\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,infelt\/FreeRDP,RolKau\/FreeRDP,cedrozor\/FreeRDP,aballier\/FreeRDP,Distrotech\/FreeRDP,cloudbase\/FreeRDP-dev,zhangximin\/FreeRDP,nfedera\/FreeRDP,llyzs\/FreeRDP,massuda-marcelo\/FreeRDP,Devolutions\/FreeRDP,everhopingandwaiting\/FreeRDP,xhaakon\/FreeRDP,infelt\/FreeRDP,rjcorrig\/FreeRDP,lmcro\/FreeRDP,bceverly\/FreeRDP,FreeRDP\/FreeRDP,mfleisz\/FreeRDP,FreeRDP\/FreeRDP,ondrejholy\/FreeRDP,vworkspace\/FreeRDP,daneshih1125\/FreeRDP,RangeeGmbH\/FreeRDP,kingland\/FreeRDP,anjoah\/FreeRDP,realjiangms\/FreeRDP,awakecoding\/FreeRDP,bsagal\/FreeRDP,bjcollins\/FreeRDP,lmcro\/FreeRDP,everhopingandwaiting\/FreeRDP,ssieb\/FreeRDP,lmcro\/FreeRDP,daneshih1125\/FreeRDP,aballier\/FreeRDP,chipitsine\/FreeRDP,weinyzhou\/FreeRDP,peterh\/FreeRDP,erbth\/FreeRDP,zhangximin\/FreeRDP,aballier\/FreeRDP,aballier\/FreeRDP,anjoah\/FreeRDP,nanxiongchao\/FreeRDP,BUGgs\/FreeRDP,Testinos\/Freerdp,kingland\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,peterh\/FreeRDP,rjcorrig\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,dvincent-devolutions\/FreeRDP,mcnestrb\/FreeRDP,Testinos\/Freerdp,mcnestrb\/FreeRDP,erbth\/FreeRDP,ssieb\/FreeRDP,hyacinthes\/FreeRDP,vaginessa\/FreeRDP,peterh\/FreeRDP,colemickens\/FreeRDP,briggsbog\/FreeRDP,mfleisz\/FreeRDP,Testinos\/Freerdp,chipitsine\/FreeRDP,oshogbo\/FreeRDP,akallabeth\/FreeRDP,tc-anssi\/FreeRDP,clivest\/FreeRDP,daneshih1125\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,kingland\/FreeRDP,bsagal\/FreeRDP,MartinHaimberger\/FreeRDP,weinyzhou\/FreeRDP,mfleisz\/FreeRDP,xproax\/FreeRDP,massuda-marcelo\/FreeRDP,clivest\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,lmcro\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,vworkspace\/FreeRDP,clivest\/FreeRDP,colemickens\/FreeRDP,xhaakon\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,vaginessa\/FreeRDP,vaginessa\/FreeRDP,peterh\/FreeRDP,awakecoding\/FreeRDP,Distrotech\/FreeRDP,ivan-83\/FreeRDP,anjoah\/FreeRDP,bsagal\/FreeRDP,tinixx\/FreeRDP,bmiklautz\/FreeRDP,ilammy\/FreeRDP,massuda-marcelo\/FreeRDP,oshogbo\/FreeRDP,clivest\/FreeRDP,lmcro\/FreeRDP,tc-anssi\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,mcnestrb\/FreeRDP,infelt\/FreeRDP,awakecoding\/FreeRDP,mcnestrb\/FreeRDP,peterh\/FreeRDP,Testinos\/Freerdp,kingland\/FreeRDP,xhaakon\/FreeRDP,bceverly\/FreeRDP,zhangximin\/FreeRDP,briggsbog\/FreeRDP,hyacinthes\/FreeRDP,MartinHaimberger\/FreeRDP,nfedera\/FreeRDP,chipitsine\/FreeRDP,massuda-marcelo\/FreeRDP,ilammy\/FreeRDP,realjiangms\/FreeRDP,tinixx\/FreeRDP,RangeeGmbH\/FreeRDP,anjoah\/FreeRDP,yurashek\/FreeRDP,ivan-83\/FreeRDP,tc-anssi\/FreeRDP,aballier\/FreeRDP,vworkspace\/FreeRDP,RangeeGmbH\/FreeRDP,rjcorrig\/FreeRDP,cedrozor\/FreeRDP,massuda-marcelo\/FreeRDP,mfleisz\/FreeRDP,Distrotech\/FreeRDP,ivan-83\/FreeRDP,MartinHaimberger\/FreeRDP,BUGgs\/FreeRDP,nanxiongchao\/FreeRDP,nanxiongchao\/FreeRDP,xproax\/FreeRDP,bceverly\/FreeRDP,bsagal\/FreeRDP,bmiklautz\/FreeRDP,colemickens\/FreeRDP,BUGgs\/FreeRDP,peterh\/FreeRDP,anjoah\/FreeRDP,ssieb\/FreeRDP,mfleisz\/FreeRDP,colemickens\/FreeRDP,tinixx\/FreeRDP,infelt\/FreeRDP,briggsbog\/FreeRDP,ssieb\/FreeRDP,daneshih1125\/FreeRDP,xhaakon\/FreeRDP,RolKau\/FreeRDP,RolKau\/FreeRDP,realjiangms\/FreeRDP,RolKau\/FreeRDP,Devolutions\/FreeRDP,bsagal\/FreeRDP,tc-anssi\/FreeRDP,oshogbo\/FreeRDP,Distrotech\/FreeRDP,chipitsine\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,bceverly\/FreeRDP,llyzs\/FreeRDP,xproax\/FreeRDP,rjcorrig\/FreeRDP,ivan-83\/FreeRDP,RangeeGmbH\/FreeRDP,vworkspace\/FreeRDP,dvincent-devolutions\/FreeRDP,realjiangms\/FreeRDP,aballier\/FreeRDP,daneshih1125\/FreeRDP,MartinHaimberger\/FreeRDP,erbth\/FreeRDP,RolKau\/FreeRDP,nfedera\/FreeRDP,chipitsine\/FreeRDP,kingland\/FreeRDP,briggsbog\/FreeRDP,dvincent-devolutions\/FreeRDP,bjcollins\/FreeRDP,vworkspace\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,akallabeth\/FreeRDP,rjcorrig\/FreeRDP,DavBfr\/FreeRDP,Testinos\/Freerdp,vaginessa\/FreeRDP,zhangximin\/FreeRDP,colemickens\/FreeRDP,eledoux\/FreeRDP,zavadovsky\/FreeRDP,zavadovsky\/FreeRDP,bmiklautz\/FreeRDP,ssieb\/FreeRDP,dvincent-devolutions\/FreeRDP,eledoux\/FreeRDP,everhopingandwaiting\/FreeRDP,lmcro\/FreeRDP,ondrejholy\/FreeRDP,ilammy\/FreeRDP,yurashek\/FreeRDP,bceverly\/FreeRDP,ssieb\/FreeRDP,yurashek\/FreeRDP,bmiklautz\/FreeRDP,weinyzhou\/FreeRDP,llyzs\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- winpr\/libwinpr\/utils\/collections\/BitStream.c\n+++ winpr\/libwinpr\/utils\/collections\/BitStream.c\n@@ -168,7 +168,7 @@\n \tconst char* str;\n \tconst char** strs;\n \tchar pbuffer[64 * 8 + 1];\n-\tsize_t pos, len = sizeof(pbuffer);\n+\tsize_t pos = 0, len = sizeof(pbuffer);\n \tstrs = (flags & BITDUMP_MSB_FIRST) ? BYTE_BIT_STRINGS_MSB : BYTE_BIT_STRINGS_LSB;\n \n \tfor (i = 0; i < length; i += 8)\n"} {"commit":"eb9c9bbff4e832df7fe94ecd17d61bfce9201a72","subject":"fixed 32bit interrupt increments","message":"fixed 32bit interrupt increments\n","repos":"jnk0le\/AVR-FAST-ENCODER","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- encoder.c\n+++ encoder.c\n@@ -296,9 +296,9 @@\n \t\t\t\t\"rjmp\tENC_INC_%= \\n\\t\" \/* 2 *\/\n \t\t\t\n \t\t\t\t\"subi\tr24, 1 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr25, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr26, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr27, 0 \\n\\t\"\n \t\t\t\t\"rjmp ENC_EXIT_%= \\n\\t\" \/* 2 *\/\n \n \t\t\t\"ENC_INC_%=: \"\n@@ -432,9 +432,9 @@\n \t\t\t \/\/ 6\/5\/5\/6\n \t\t\t\"ENCODER_DEC_%=:\"\n \t\t\t\t\"subi\tr24, 1 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n-\t\t\t\t\"sbci\tr24, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr25, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr26, 0 \\n\\t\"\n+\t\t\t\t\"sbci\tr27, 0 \\n\\t\"\n \t\t\t\t\"rjmp\tENCODER_EXIT_%= \\n\\t\"\n \t\t\t\n \t\t\t\"ENCODER_INC_%=:\"\n"} {"commit":"639b26767398657d67a15340f8d6aca4ac3a9065","subject":"Fixed coco_problem_allocate() and coco_problem_duplicate() to include index.","message":"Fixed coco_problem_allocate() and coco_problem_duplicate() to include index.\n","repos":"dtusar\/coco,NDManh\/numbbo,dtusar\/coco,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,dtusar\/coco,dtusar\/coco,NDManh\/numbbo,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- code-experiments\/src\/coco_problem.c\n+++ code-experiments\/src\/coco_problem.c\n@@ -59,6 +59,7 @@\n problem->best_value = coco_allocate_vector(number_of_objectives);\n problem->problem_name = NULL;\n problem->problem_id = NULL;\n+ problem->index = 0;\n problem->evaluations = 0;\n problem->final_target_delta[0] = 1e-8; \/* in case to be modified by the benchmark *\/\n problem->best_observed_fvalue[0] = DBL_MAX;\n@@ -92,6 +93,7 @@\n \n problem->problem_name = coco_strdup(other->problem_name);\n problem->problem_id = coco_strdup(other->problem_id);\n+ problem->index = other->index;\n return problem;\n }\n \n"} {"commit":"29af1da1a39cc60382e3a3ed13c1e51553fa3fda","subject":"Fixed Argument Handling and Print Statements; Commenting","message":"Fixed Argument Handling and Print Statements; Commenting\n","repos":"not--p\/stats","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- central.c\n+++ central.c\n@@ -10,6 +10,7 @@\n void usage(void);\n double mean(double numbers[], int count);\n double median(double numbers[], int count);\n+double mode(double numbers[], int count);\n \n #define MAX_NUMBERS 1000000\n \n@@ -21,16 +22,16 @@\n double numbers[MAX_NUMBERS] = {0.0};\n int count = 0;\n \n- if (argc == 1 || argc < 1 || argc > 3 || !validateCSV(argv[2])) {\n+ if (argc != 3 || !validateCSV(argv[2])) {\n usage();\n }\n else {\n translateCSV(argv[2], numbers, &count);\n if (strcmp(argv[1], \"mean\") == 0) {\n- mean(numbers, count);\n+ printf(\"The mean is: %f\\n\", mean(numbers, count));\n }\n else if (strcmp(argv[1], \"median\") == 0) {\n- median(numbers, count);\n+ printf(\"The median is: %f\\n\", median(numbers, count));\n }\n else {\n usage();\n@@ -62,10 +63,12 @@\n \/**\n * mean\n *\n- * @param char numbers[] a string representation of a csv list of\n- * numbers (ints or doubles).\n+ * Finds the mean of a given numerical dataset.\n *\n- * @return void\n+ * @param double numbers[] Our numerical dataset.\n+ * @param int count The number of items in the dataset.\n+ *\n+ * @return double The mean of the dataset.\n *\/\n \n double mean(double numbers[], int count)\n@@ -77,7 +80,6 @@\n sum = sum + numbers[i];\n }\n \n- printf(\"The mean is: %f\\n\", sum\/count);\n return sum\/count;\n }\n \n@@ -85,10 +87,12 @@\n \/**\n * median\n *\n- * @param char numbers[] a string representation of a csv list of\n- * numbers (ints or doubles).\n+ * Finds the median of a given numerical dataset.\n *\n- * @return double The median of the given numbers.\n+ * @param double numbers[] Our numerical dataset.\n+ * @param int count The number of items in the dataset.\n+ *\n+ * @return double The median of the dataset.\n *\/\n \n double median(double numbers[], int count)\n@@ -106,7 +110,6 @@\n tmp[0] = mean(tmp, 2);\n }\n \n- printf(\"The meadian is: %f\\n\", tmp[0]);\n return tmp[0];\n }\n \n@@ -114,15 +117,17 @@\n \/**\n * mode\n *\n- * @param char numbers[] a string representation of a csv list of\n- * numbers (ints or doubles).\n+ * Finds the mode of a given numerical dataset.\n *\n- * @return void\n+ * @param double numbers[] Our numerical dataset.\n+ * @param int count The number of items in the dataset.\n+ *\n+ * @return double The mode of the dataset.\n *\/\n \n-double mode(char numbers[])\n+double mode(double numbers[], int count)\n {\n- printf(\"mode numbers are %s\\n\", numbers);\n+ printf(\"mode numbers is: \");\n \n return 0.0;\n }\n"} {"commit":"7b647c6fdec4ff1303815d684a5374e40742fe94","subject":"MFC: Eliminate a bunch of unused fields from the read structure. Most are write-specific values that are leftovers from when read and write used a shared structure.","message":"MFC: Eliminate a bunch of unused fields from the read structure.\nMost are write-specific values that are leftovers from when read and\nwrite used a shared structure.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libarchive\/archive_read_private.h\n+++ lib\/libarchive\/archive_read_private.h\n@@ -41,10 +41,6 @@\n \tdev_t\t\t skip_file_dev;\n \tino_t\t\t skip_file_ino;\n \n-\t\/* Utility: Pointer to a block of nulls. *\/\n-\tconst unsigned char\t*nulls;\n-\tsize_t\t\t\t null_length;\n-\n \t\/*\n \t * Used by archive_read_data() to track blocks and copy\n \t * data to client buffers, filling gaps with zero bytes.\n@@ -58,29 +54,8 @@\n \tarchive_open_callback\t*client_opener;\n \tarchive_read_callback\t*client_reader;\n \tarchive_skip_callback\t*client_skipper;\n-\tarchive_write_callback\t*client_writer;\n \tarchive_close_callback\t*client_closer;\n \tvoid\t\t\t*client_data;\n-\n-\t\/*\n-\t * Blocking information. Note that bytes_in_last_block is\n-\t * misleadingly named; I should find a better name. These\n-\t * control the final output from all compressors, including\n-\t * compression_none.\n-\t *\/\n-\tint\t\t bytes_per_block;\n-\tint\t\t bytes_in_last_block;\n-\n-\t\/*\n-\t * These control whether data within a gzip\/bzip2 compressed\n-\t * stream gets padded or not. If pad_uncompressed is set,\n-\t * the data will be padded to a full block before being\n-\t * compressed. The pad_uncompressed_byte determines the value\n-\t * that will be used for padding. Note that these have no\n-\t * effect on compression \"none.\"\n-\t *\/\n-\tint\t\t pad_uncompressed;\n-\tint\t\t pad_uncompressed_byte; \/* TODO: Support this. *\/\n \n \t\/* File offset of beginning of most recently-read header. *\/\n \toff_t\t\t header_position;\n@@ -118,17 +93,10 @@\n \n \t\/*\n \t * Format detection is mostly the same as compression\n-\t * detection, with two significant differences: The bidders\n+\t * detection, with one significant difference: The bidders\n \t * use the read_ahead calls above to examine the stream rather\n \t * than having the supervisor hand them a block of data to\n-\t * examine, and the auction is repeated for every header.\n-\t * Winning bidders should set the archive_format and\n-\t * archive_format_name appropriately. Bid routines should\n-\t * check archive_format and decline to bid if the format of\n-\t * the last header was incompatible.\n-\t *\n-\t * Again, write support is considerably simpler because there's\n-\t * no need for an auction.\n+\t * examine.\n \t *\/\n \n \tstruct archive_format_descriptor {\n@@ -140,18 +108,6 @@\n \t\tint\t(*cleanup)(struct archive_read *);\n \t}\tformats[8];\n \tstruct archive_format_descriptor\t*format; \/* Active format. *\/\n-\n-\t\/*\n-\t * Pointers to format-specific functions for writing. They're\n-\t * initialized by archive_write_set_format_XXX() calls.\n-\t *\/\n-\tint\t(*format_init)(struct archive *); \/* Only used on write. *\/\n-\tint\t(*format_finish)(struct archive *);\n-\tint\t(*format_finish_entry)(struct archive *);\n-\tint \t(*format_write_header)(struct archive *,\n-\t\t struct archive_entry *);\n-\tssize_t\t(*format_write_data)(struct archive *,\n-\t\t const void *buff, size_t);\n \n \t\/*\n \t * Various information needed by archive_extract.\n"} {"commit":"f3ef75b773b38fe2028fa4627cab3991e2c60180","subject":"sh: Nopped out p3_cache_init() on SH-5 also.","message":"sh: Nopped out p3_cache_init() on SH-5 also.\n\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/asm-sh\/cpu-sh5\/cacheflush.h\n+++ include\/asm-sh\/cpu-sh5\/cacheflush.h\n@@ -27,6 +27,7 @@\n #define flush_dcache_mmap_unlock(mapping)\tdo { } while (0)\n \n #define flush_icache_page(vma, page)\tdo { } while (0)\n+#define p3_cache_init()\t\t\tdo { } while (0)\n \n #endif \/* __ASSEMBLY__ *\/\n \n"} {"commit":"446d8b69bfe08727f177271da8a2ce0ab0b172d8","subject":"The computed_field arithmetic operators are now in computed_field rather than image_processing","message":"The computed_field arithmetic operators are now in computed_field rather than image_processing\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"unknown","license":"mpl-2.0","lang":"C","diff":""} {"commit":"8313809ef3bfa8fa366d416add2150787235f192","subject":"cris arch-v10: use generic ptrace_resume code","message":"cris arch-v10: use generic ptrace_resume code\n\nUse the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and\nPTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it\npreviously succeeded despite not actually causing any kind of single\nstepping.\n\nAlso the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which\nit previously wasn't which is consistent with all architectures using the\nmodern ptrace code.\n\nSigned-off-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@lst.de>\nCc: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@redhat.com>\nCc: Roland McGrath <0d270388f2f92757a5de0f4bd891d3b392c44c4f@redhat.com>\nCc: Mikael Starvik <6c4d7924b92058127b0499322f0d64063fb5d591@axis.com>\nCc: Jesper Nilsson <987a7dbc972893e93e5578401bedc3a0f2ccb5e3@axis.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/cris\/arch-v10\/kernel\/ptrace.c\n+++ arch\/cris\/arch-v10\/kernel\/ptrace.c\n@@ -124,57 +124,6 @@\n \t\t\t}\n \t\t\tif (put_reg(child, addr, data))\n \t\t\t\tbreak;\n-\t\t\tret = 0;\n-\t\t\tbreak;\n-\n-\t\tcase PTRACE_SYSCALL:\n-\t\tcase PTRACE_CONT:\n-\t\t\tret = -EIO;\n-\t\t\t\n-\t\t\tif (!valid_signal(data))\n-\t\t\t\tbreak;\n- \n-\t\t\tif (request == PTRACE_SYSCALL) {\n-\t\t\t\tset_tsk_thread_flag(child, TIF_SYSCALL_TRACE);\n-\t\t\t}\n-\t\t\telse {\n-\t\t\t\tclear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);\n-\t\t\t}\n-\t\t\t\n-\t\t\tchild->exit_code = data;\n-\t\t\t\n-\t\t\t\/* TODO: make sure any pending breakpoint is killed *\/\n-\t\t\twake_up_process(child);\n-\t\t\tret = 0;\n-\t\t\t\n-\t\t\tbreak;\n-\t\t\n- \t\t\/* Make the child exit by sending it a sigkill. *\/\n-\t\tcase PTRACE_KILL:\n-\t\t\tret = 0;\n-\t\t\t\n-\t\t\tif (child->exit_state == EXIT_ZOMBIE)\n-\t\t\t\tbreak;\n-\t\t\t\n-\t\t\tchild->exit_code = SIGKILL;\n-\t\t\t\n-\t\t\t\/* TODO: make sure any pending breakpoint is killed *\/\n-\t\t\twake_up_process(child);\n-\t\t\tbreak;\n-\n-\t\t\/* Set the trap flag. *\/\n-\t\tcase PTRACE_SINGLESTEP:\n-\t\t\tret = -EIO;\n-\t\t\t\n-\t\t\tif (!valid_signal(data))\n-\t\t\t\tbreak;\n-\t\t\t\n-\t\t\tclear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);\n-\n-\t\t\t\/* TODO: set some clever breakpoint mechanism... *\/\n-\n-\t\t\tchild->exit_code = data;\n-\t\t\twake_up_process(child);\n \t\t\tret = 0;\n \t\t\tbreak;\n \n"} {"commit":"c15f40fff8bcc51920778440a929bccc723d5edd","subject":"pamu2fcfg: remove unused variables","message":"pamu2fcfg: remove unused variables\n","repos":"Yubico\/pam-u2f,Yubico\/pam-u2f,Yubico\/pam-u2f","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- pamu2fcfg\/pamu2fcfg.c\n+++ pamu2fcfg\/pamu2fcfg.c\n@@ -32,8 +32,6 @@\n char buf[BUFSIZE];\n char prompt[BUFSIZE];\n char pin[BUFSIZE];\n- char *p;\n- char *response;\n fido_cred_t *cred = NULL;\n fido_dev_info_t *devlist = NULL;\n fido_dev_t *dev = NULL;\n@@ -59,7 +57,6 @@\n unsigned char userid[32];\n unsigned char challenge[32];\n unsigned i;\n- unsigned max_index = 0;\n \n if (cmdline_parser(argc, argv, &args_info) != 0)\n exit(EXIT_FAILURE);\n"} {"commit":"e55141303364493774d441c4c6c6dbb764bf72b8","subject":"updated copyright year to 2015 ","message":"updated copyright year to 2015 \n\nok I realize it is still 2014 but with 2015 days away I am putting it in now","repos":"cinnamoncoin\/sifcoin,cinnamoncoin\/sifcoin,cinnamoncoin\/sifcoin,cinnamoncoin\/sifcoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -16,7 +16,7 @@\n \n \/\/ Copyright year (2009-this)\n \/\/ Todo: update this when changing our copyright comments in the source\n-#define COPYRIGHT_YEAR 2013\n+#define COPYRIGHT_YEAR 2015\n \n \/\/ Converts the parameter X to a string after macro replacement on X has been performed.\n \/\/ Don't merge these into one macro!\n"} {"commit":"67e978e9f1f4c4db9fb091b7996a054b9a735c0a","subject":"testing gh5","message":"testing gh5\n","repos":"timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- lib\/libgphoto2_ptp2_updates\/library.c\n+++ lib\/libgphoto2_ptp2_updates\/library.c\n@@ -4175,7 +4175,7 @@\n \tunsigned char\t*buffer = NULL;\n \tuint16_t\tret;\n \n-\tPTP_CNT_INIT(ptp, 0x9404, 0x3000011); \/\/ initiate capture\n+\tPTP_CNT_INIT(ptp, PTP_OC_PANASONIC_InitiateCapture, 0x3000011); \/\/ initiate capture\n \tret = ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);\n \n \n@@ -4433,8 +4433,8 @@\n \t\treturn camera_fuji_capture (camera, type, path, context);\n \t}\n \n-\tif (\t(params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) &&\n-\t\tptp_operation_issupported(params, 0x9404)\n+\tif (\t(params->deviceinfo.VendorExtensionID == PTP_VENDOR_PANASONIC) \/\/&&\n+\t\t\/\/ptp_operation_issupported(params, PTP_OC_PANASONIC_InitiateCapture)\n \t) {\n \t\treturn camera_panasonic_capture (camera, type, path, context);\n \t}\n"} {"commit":"6885edb8f872e08b4161453d5eb63be186d09d2f","subject":"Remove checks for NO_FTN_STRING_LEN_AT_END","message":"Remove checks for NO_FTN_STRING_LEN_AT_END\n\nThis variable is never defined (and would not work correctly even if it were).\n","repos":"imitrichev\/cantera,imitrichev\/cantera,imitrichev\/cantera,imitrichev\/cantera,imitrichev\/cantera,imitrichev\/cantera","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/cantera\/numerics\/ctlapack.h\n+++ include\/cantera\/numerics\/ctlapack.h\n@@ -5,10 +5,6 @@\n \n #ifndef CT_CTLAPACK_H\n #define CT_CTLAPACK_H\n-\n-#ifdef DARWIN\n-#undef NO_FTN_STRING_LEN_AT_END\n-#endif\n \n #include \"cantera\/base\/ct_defs.h\"\n \n@@ -225,17 +221,12 @@\n integer f_m = m, f_n = n, f_lda = lda, f_incX = incX, f_incY = incY;\n doublereal f_alpha = alpha, f_beta = beta;\n ftnlen trsize = 1;\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DGEMV_(&no_yes[trans], &f_m, &f_n, &f_alpha, a,\n- &f_lda, x, &f_incX, &f_beta, y, &f_incY);\n-#else\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DGEMV_(&no_yes[trans], &f_m, &f_n, &f_alpha, a,\n &f_lda, x, &f_incX, &f_beta, y, &f_incY, trsize);\n #else\n _DGEMV_(&no_yes[trans], trsize, &f_m, &f_n, &f_alpha, a,\n &f_lda, x, &f_incX, &f_beta, y, &f_incY);\n-#endif\n #endif\n }\n \n@@ -296,10 +287,6 @@\n integer f_ldb = (int) ldb;\n integer f_info = 0;\n char tr = no_yes[trans];\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DGBTRS_(&tr, &f_n, &f_kl, &f_ku, &f_nrhs, a, &f_lda, ipiv,\n- b, &f_ldb, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DGBTRS_(&tr, &f_n, &f_kl, &f_ku, &f_nrhs, a, &f_lda, ipiv,\n@@ -307,7 +294,6 @@\n #else\n _DGBTRS_(&tr, trsize, &f_n, &f_kl, &f_ku, &f_nrhs, a, &f_lda, ipiv,\n b, &f_ldb, &f_info);\n-#endif\n #endif\n info = f_info;\n }\n@@ -333,17 +319,11 @@\n integer f_ldb = (int) ldb;\n integer f_info = 0;\n char tr = no_yes[trans];\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DGETRS_(&tr, &f_n, &f_nrhs, a, &f_lda, ipiv, b, &f_ldb,\n- &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DGETRS_(&tr, &f_n, &f_nrhs, a, &f_lda, ipiv, b, &f_ldb, &f_info, trsize);\n #else\n _DGETRS_(&tr, trsize, &f_n, &f_nrhs, a, &f_lda, ipiv, b, &f_ldb, &f_info);\n-#endif\n #endif\n info = f_info;\n }\n@@ -386,15 +366,11 @@\n integer f_lda = static_cast<integer>(lda);\n integer f_ldc = static_cast<integer>(ldc);\n integer f_info = 0;\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DORMQR_(&side, &tr, &f_m, &f_n, &f_k, a, &f_lda, tau, c, &f_ldc, work, &f_lwork, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DORMQR_(&side, &tr, &f_m, &f_n, &f_k, a, &f_lda, tau, c, &f_ldc, work, &f_lwork, &f_info, trsize, trsize);\n #else\n _DORMQR_(&side, trsize, &tr, trsize, &f_m, &f_n, &f_k, a, &f_lda, tau, c, &f_ldc, work, &f_lwork, &f_info);\n-#endif\n #endif\n info = f_info;\n }\n@@ -413,15 +389,11 @@\n integer f_lda = static_cast<integer>(lda);\n integer f_ldb = static_cast<integer>(ldb);\n integer f_info = 0;\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DTRTRS_(&uplo, &tr, &dd, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DTRTRS_(&uplo, &tr, &dd, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info, trsize, trsize, trsize);\n #else\n _DTRTRS_(&uplo, trsize, &tr, trsize, &dd, trsize, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);\n-#endif\n #endif\n info = f_info;\n }\n@@ -446,16 +418,12 @@\n integer f_lda = static_cast<integer>(lda);\n integer f_info = 0;\n doublereal rcond;\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DTRCON_(&nn, &uplo, &dd, &f_n, a, &f_lda, &rcond, work, iwork, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DTRCON_(&nn, &uplo, &dd, &f_n, a, &f_lda, &rcond, work, iwork, &f_info, trsize, trsize, trsize);\n #else\n _DTRCON_(&nn, trsize, &uplo, trsize, &dd, trsize, &f_n, a, &f_lda, &rcond, work, iwork, &f_info);\n #endif\n-#endif\n info = f_info;\n return rcond;\n }\n@@ -466,16 +434,11 @@\n integer f_n = static_cast<integer>(n);\n integer f_lda = static_cast<integer>(lda);\n integer f_info = 0;\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DPOTRF_(&uplo, &f_n, a, &f_lda, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DPOTRF_(&uplo, &f_n, a, &f_lda, &f_info, trsize);\n #else\n _DPOTRF_(&uplo, trsize, &f_n, a, &f_lda, &f_info);\n-#endif\n #endif\n info = f_info;\n return;\n@@ -490,16 +453,11 @@\n integer f_lda = static_cast<integer>(lda);\n integer f_ldb = static_cast<integer>(ldb);\n integer f_info = 0;\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DPOTRS_(&uplo, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DPOTRS_(&uplo, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info, trsize);\n #else\n _DPOTRS_(&uplo, trsize, &f_n, &f_nrhs, a, &f_lda, b, &f_ldb, &f_info);\n-#endif\n #endif\n info = f_info;\n return;\n@@ -516,16 +474,11 @@\n integer f_lda = static_cast<integer>(lda);\n integer f_info = 0;\n doublereal rcond;\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DGECON_(&cnorm, &f_n a, &f_lda, &anorm, &rcond, work, iwork, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DGECON_(&cnorm, &f_n, a, &f_lda, &anorm, &rcond, work, iwork, &f_info, trsize);\n #else\n _DGECON_(&cnorm, trsize, &f_n, a, &f_lda, &anorm, &rcond, work, iwork, &f_info);\n-#endif\n #endif\n info = f_info;\n return rcond;\n@@ -545,16 +498,11 @@\n integer f_ldab = static_cast<integer>(ldab);\n integer f_info = 0;\n doublereal rcond;\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- _DGBCON_(&cnorm, &f_n , &f_kl, &f_ku, a, &f_ldab, ipiv, &anorm, &rcond, work, iwork, &f_info);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n _DGBCON_(&cnorm, &f_n, &f_kl, &f_ku, a, &f_ldab, ipiv, &anorm, &rcond, work, iwork, &f_info, trsize);\n #else\n _DGBCON_(&cnorm, trsize, &f_n, &f_kl, &f_ku, a, &f_ldab, ipiv, &anorm, &rcond, work, iwork, &f_info);\n-#endif\n #endif\n info = f_info;\n return rcond;\n@@ -571,17 +519,12 @@\n integer f_n = static_cast<integer>(n);\n integer f_lda = static_cast<integer>(lda);\n doublereal anorm;\n-\n-#ifdef NO_FTN_STRING_LEN_AT_END\n- anorm = _DLANGE_(&cnorm, &f_m, &f_n a, &f_lda, work);\n-#else\n ftnlen trsize = 1;\n #ifdef LAPACK_FTN_STRING_LEN_AT_END\n anorm = _DLANGE_(&cnorm, &f_m, &f_n, a, &f_lda, work, trsize);\n #else\n anorm = _DLANGE_(&cnorm, trsize, &f_m, &f_n, a, &f_lda, work);\n #endif\n-#endif\n return anorm;\n }\n \n"} {"commit":"6a515e988f2ae1628258a6dec2c0e9cf2d04790f","subject":"Implemented dsdot() and sdsdot() in compat layer.","message":"Implemented dsdot() and sdsdot() in compat layer.\n\nDetails:\n- Replaced \"not yet implemented\" error messages in dsdot() and sdsdot()\n with actual implementations. (These routines are so rarely used that\n this log message will probably lead to some people learning of their\n existence for the first time.)\n","repos":"arm-hpc\/blis,scibuilder\/blis,xianyi\/blis,arm-hpc\/blis,rwl\/blis,rwl\/blis,arm-hpc\/blis,xianyi\/blis,xianyi\/blis,rwl\/blis,scibuilder\/blis,xianyi\/blis,scibuilder\/blis,rwl\/blis,scibuilder\/blis,arm-hpc\/blis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- frame\/compat\/bla_dot.c\n+++ frame\/compat\/bla_dot.c\n@@ -93,9 +93,9 @@\n float* y, f77_int* incy\n )\n {\n-\tbli_check_error_code( BLIS_NOT_YET_IMPLEMENTED );\n-\n-\treturn 0.0F;\n+\treturn ( float )PASTEF77(d,sdot)( n,\n+\t x, incx,\n+\t y, incy );\n }\n \n \/\/ Input vectors stored in single precision, computed in double precision,\n@@ -105,9 +105,39 @@\n float* y, f77_int* incy\n )\n {\n-\tbli_check_error_code( BLIS_NOT_YET_IMPLEMENTED );\n+\tdim_t n0;\n+\tfloat* x0;\n+\tfloat* y0;\n+\tinc_t incx0;\n+\tinc_t incy0;\n+\tdouble rho;\n+\tdim_t i;\n \n-\treturn 0.0;\n+\t\/* Initialization of BLIS is not required. *\/\n+\n+\t\/* Convert\/typecast negative values of n to zero. *\/\n+\tbli_convert_blas_dim1( *n, n0 );\n+\n+\t\/* If the input increments are negative, adjust the pointers so we can\n+\t use positive increments instead. *\/\n+\tbli_convert_blas_incv( n0, x, *incx, x0, incx0 );\n+\tbli_convert_blas_incv( n0, y, *incy, y0, incy0 );\n+\n+\trho = 0.0;\n+\n+\tfor ( i = 0; i < n0; i++ )\n+\t{\n+\t\tfloat* chi1 = x0 + (i )*incx0;\n+\t\tfloat* psi1 = y0 + (i )*incy0;\n+\n+\t\tbli_ddots( (( double )(*chi1)),\n+\t\t (( double )(*psi1)), rho );\n+\t}\n+\n+\t\/* Finalization of BLIS is not required, because initialization was\n+\t not required. *\/\n+\n+\treturn rho;\n }\n \n #endif\n"} {"commit":"3ec4438ea3364cd12d0f6488763fbc6e4c39a647","subject":"Make the -a cmdline flag actually work. If specified, -a says what file to open as the unix socket.","message":"Make the -a cmdline flag actually work.\nIf specified, -a says what file to open as the unix socket.\n","repos":"wesleyd\/charade,wesleyd\/charade,wesleyd\/charade,wesleyd\/charade","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- charade.c\n+++ charade.c\n@@ -135,8 +135,14 @@\n \n remove_socket_at_exit = 1;\n \n- int ret = snprintf(socket_name, sizeof(socket_name), \n+ int ret;\n+ if (g_socket_name) {\n+ ret = snprintf(socket_name, sizeof(socket_name), \n+ \"%s\", g_socket_name);\n+ } else {\n+ ret = snprintf(socket_name, sizeof(socket_name), \n \"%s\/agent.%ld\", socket_dir, (long)getpid());\n+ }\n if (ret >= sizeof(socket_name)) {\n \/\/ Would have liked to print more...\n EPRINTF(0, \"socket_name too long (%d >= %d).\\n\", \n"} {"commit":"dfc3b91d8a399da66bde6b65061df4d6385ae146","subject":"py\/objtype: Use mp_obj_dict_copy() for creating obj.__dict__ attribute.","message":"py\/objtype: Use mp_obj_dict_copy() for creating obj.__dict__ attribute.\n\nThe resulting dict is now marked as read-only (is_fixed=1) to enforce the\nfact that changes to this dict will not be reflected in the class instance.\n\nThis commit reduces code size by about 20 bytes, and should be more\nefficient because it creates a direct copy of the dict rather than\nreinserting all elements.\n","repos":"pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- py\/objtype.c\n+++ py\/objtype.c\n@@ -618,16 +618,13 @@\n #if MICROPY_CPYTHON_COMPAT\n if (attr == MP_QSTR___dict__) {\n \/\/ Create a new dict with a copy of the instance's map items.\n- \/\/ This creates, unlike CPython, a 'read-only' __dict__: modifying\n- \/\/ it will not result in modifications to the actual instance members.\n- mp_map_t *map = &self->members;\n- mp_obj_t attr_dict = mp_obj_new_dict(map->used);\n- for (size_t i = 0; i < map->alloc; ++i) {\n- if (mp_map_slot_is_filled(map, i)) {\n- mp_obj_dict_store(attr_dict, map->table[i].key, map->table[i].value);\n- }\n- }\n- dest[0] = attr_dict;\n+ \/\/ This creates, unlike CPython, a read-only __dict__ that can't be modified.\n+ mp_obj_dict_t dict;\n+ dict.base.type = &mp_type_dict;\n+ dict.map = self->members;\n+ dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(&dict));\n+ mp_obj_dict_t *dest_dict = MP_OBJ_TO_PTR(dest[0]);\n+ dest_dict->map.is_fixed = 1;\n return;\n }\n #endif\n"} {"commit":"dbffa471611d3fc4b401ebabf7bb63ac0e0272b1","subject":"[PATCH] PM-Timer: don't use workaround if chipset is not buggy","message":"[PATCH] PM-Timer: don't use workaround if chipset is not buggy\n\nCurrent timer_pm.c reads I\/O port triple times, in order to avoid the bug\nof chipset. But I\/O port is slow.\n\n2.6.16 (pmtmr)\nSimple gettimeofday: 3.6532 microseconds\n\n2.6.16+patch (pmtmr)\nSimple gettimeofday: 1.4582 microseconds\n\n[if chip is buggy, probably it will be 7us or more in 4.2% of probability.]\n\nThis patch adds blacklist of buggy chip, and if chip is not buggy, this\nuses fast normal version instead of slow workaround version.\n\nIf chip is buggy, warnings \"pmtmr is slow\". But sounds like there is gray\nzone. I found the PIIX4 errata, but I couldn't find the ICH4 errata. But\nsome motherboard seems to have problem.\n\nSo, if we found a ICH4, generate warnings, and use a workaround version.\nIf user's ICH4 is good, the user can specify the \"pmtmr_good\" boot\nparameter to use fast version.\n\nAcked-by: John Stultz <2dbbc9a029f6af74f2c2786ce8fa25d932fcaf8c@us.ibm.com>\nSigned-off-by: OGAWA Hirofumi <1dd685eef08048be95744a1b104ca593a93cc914@mail.parknet.co.jp>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/i386\/kernel\/timers\/timer_pm.c\n+++ arch\/i386\/kernel\/timers\/timer_pm.c\n@@ -15,6 +15,7 @@\n #include <linux\/module.h>\n #include <linux\/device.h>\n #include <linux\/init.h>\n+#include <linux\/pci.h>\n #include <asm\/types.h>\n #include <asm\/timer.h>\n #include <asm\/smp.h>\n@@ -45,24 +46,31 @@\n \n #define ACPI_PM_MASK 0xFFFFFF \/* limit it to 24 bits *\/\n \n+static int pmtmr_need_workaround __read_mostly = 1;\n+\n \/*helper function to safely read acpi pm timesource*\/\n static inline u32 read_pmtmr(void)\n {\n-\tu32 v1=0,v2=0,v3=0;\n-\t\/* It has been reported that because of various broken\n-\t * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time\n-\t * source is not latched, so you must read it multiple\n-\t * times to insure a safe value is read.\n-\t *\/\n-\tdo {\n-\t\tv1 = inl(pmtmr_ioport);\n-\t\tv2 = inl(pmtmr_ioport);\n-\t\tv3 = inl(pmtmr_ioport);\n-\t} while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1)\n-\t\t\t|| (v3 > v1 && v3 < v2));\n-\n-\t\/* mask the output to 24 bits *\/\n-\treturn v2 & ACPI_PM_MASK;\n+\tif (pmtmr_need_workaround) {\n+\t\tu32 v1, v2, v3;\n+\n+\t\t\/* It has been reported that because of various broken\n+\t\t * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time\n+\t\t * source is not latched, so you must read it multiple\n+\t\t * times to insure a safe value is read.\n+\t\t *\/\n+\t\tdo {\n+\t\t\tv1 = inl(pmtmr_ioport);\n+\t\t\tv2 = inl(pmtmr_ioport);\n+\t\t\tv3 = inl(pmtmr_ioport);\n+\t\t} while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1)\n+\t\t\t || (v3 > v1 && v3 < v2));\n+\n+\t\t\/* mask the output to 24 bits *\/\n+\t\treturn v2 & ACPI_PM_MASK;\n+\t}\n+\n+\treturn inl(pmtmr_ioport) & ACPI_PM_MASK;\n }\n \n \n@@ -263,6 +271,72 @@\n \t.opts = &timer_pmtmr,\n };\n \n+#ifdef CONFIG_PCI\n+\/*\n+ * PIIX4 Errata:\n+ *\n+ * The power management timer may return improper results when read.\n+ * Although the timer value settles properly after incrementing,\n+ * while incrementing there is a 3 ns window every 69.8 ns where the\n+ * timer value is indeterminate (a 4.2% chance that the data will be\n+ * incorrect when read). As a result, the ACPI free running count up\n+ * timer specification is violated due to erroneous reads.\n+ *\/\n+static int __init pmtmr_bug_check(void)\n+{\n+\tstatic struct pci_device_id gray_list[] __initdata = {\n+\t\t\/* these chipsets may have bug. *\/\n+\t\t{ PCI_DEVICE(PCI_VENDOR_ID_INTEL,\n+\t\t\t\tPCI_DEVICE_ID_INTEL_82801DB_0) },\n+\t\t{ },\n+\t};\n+\tstruct pci_dev *dev;\n+\tint pmtmr_has_bug = 0;\n+\tu8 rev;\n+\n+\tif (cur_timer != &timer_pmtmr || !pmtmr_need_workaround)\n+\t\treturn 0;\n+\n+\tdev = pci_get_device(PCI_VENDOR_ID_INTEL,\n+\t\t\t PCI_DEVICE_ID_INTEL_82371AB_3, NULL);\n+\tif (dev) {\n+\t\tpci_read_config_byte(dev, PCI_REVISION_ID, &rev);\n+\t\t\/* the bug has been fixed in PIIX4M *\/\n+\t\tif (rev < 3) {\n+\t\t\tprintk(KERN_WARNING \"* Found PM-Timer Bug on this \"\n+\t\t\t\t\"chipset. Due to workarounds for a bug,\\n\"\n+\t\t\t\t\"* this time source is slow. Consider trying \"\n+\t\t\t\t\"other time sources (clock=)\\n\");\n+\t\t\tpmtmr_has_bug = 1;\n+\t\t}\n+\t\tpci_dev_put(dev);\n+\t}\n+\n+\tif (pci_dev_present(gray_list)) {\n+\t\tprintk(KERN_WARNING \"* This chipset may have PM-Timer Bug. Due\"\n+\t\t\t\" to workarounds for a bug,\\n\"\n+\t\t\t\"* this time source is slow. If you are sure your timer\"\n+\t\t\t\" does not have\\n\"\n+\t\t\t\"* this bug, please use \\\"pmtmr_good\\\" to disable the \"\n+\t\t\t\"workaround\\n\");\n+\t\tpmtmr_has_bug = 1;\n+\t}\n+\n+\tif (!pmtmr_has_bug)\n+\t\tpmtmr_need_workaround = 0;\n+\n+\treturn 0;\n+}\n+device_initcall(pmtmr_bug_check);\n+#endif\n+\n+static int __init pmtr_good_setup(char *__str)\n+{\n+\tpmtmr_need_workaround = 0;\n+\treturn 1;\n+}\n+__setup(\"pmtmr_good\", pmtr_good_setup);\n+\n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Dominik Brodowski <linux@brodo.de>\");\n MODULE_DESCRIPTION(\"Power Management Timer (PMTMR) as primary timing source for x86\");\n"} {"commit":"ad7c1c5488a234c97d2ad27332177ff69081b925","subject":"Update Client version","message":"Update Client version","repos":"LIMXTEC\/LIMX,LIMXTEC\/BitSend,LIMXTEC\/BitSend,LIMXTEC\/BitSend,LIMXTEC\/LIMX,LIMXTEC\/LIMX,LIMXTEC\/LIMX,LIMXTEC\/LIMX,LIMXTEC\/BitSend,LIMXTEC\/BitSend","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -19,7 +19,7 @@\n #define CLIENT_VERSION_MAJOR 0\n #define CLIENT_VERSION_MINOR 14\n #define CLIENT_VERSION_REVISION 0\n-#define CLIENT_VERSION_BUILD 4\n+#define CLIENT_VERSION_BUILD 5\n \n \/\/! Set to true for release, false for prerelease or test build\n #define CLIENT_VERSION_IS_RELEASE true\n"} {"commit":"47e0245097bee85b7dbe021dca152e6aae7b6719","subject":"enfim...","message":"enfim...","repos":"nullable\/libxmlquery,nullable\/libxmlquery,nullable\/libxmlquery,nullable\/libxmlquery","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- shell\/command.c\n+++ shell\/command.c\n@@ -138,7 +138,7 @@\n doc* document;\n \n filename = argp[0];\n- document = parse_dom(filename);\n+ document = parse_xml(filename);\n id = argp[1];\n set_symbol(id, document, destroy_dom_symbol);\n \n"} {"commit":"a02b387b3c60b71d65c6e85169f1f9eb46359860","subject":"Coverity 77152: Avoid memcpy of 0 bytes.","message":"Coverity 77152: Avoid memcpy of 0 bytes.\n","repos":"ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/pdf\/pdf-crypt.c\n+++ source\/pdf\/pdf-crypt.c\n@@ -683,7 +683,8 @@\n \t\tif (pwlen > 32)\n \t\t\tpwlen = 32;\n \t\tmemcpy(pwbuf, ownerpass, pwlen);\n-\t\tmemcpy(pwbuf + pwlen, padding, 32 - pwlen);\n+\t\tif (pwlen < 32)\n+\t\t\tmemcpy(pwbuf + pwlen, padding, 32 - pwlen);\n \n \t\tfz_md5_init(&md5);\n \t\tfz_md5_update(&md5, pwbuf, 32);\n"} {"commit":"36572831720450f3657480de36721fee7c65f92d","subject":"cryptodev: clarify API for AES-CCM","message":"cryptodev: clarify API for AES-CCM\n\nAES-CCM algorithm has some restrictions when\nhandling nonce (IV) and AAD information.\n\nAs the API stated, the nonce needs to be place 1 byte\nafter the start of the IV field. This field needs\nto be 16 bytes long, regardless the length of the nonce,\nbut it is important to clarify that the first byte\nand the padding added after the nonce may be modified\nby the PMDs using this algorithm.\n\nSame happens with the AAD. It needs to be placed 18 bytes\nafter the start of the AAD field. The field also needs\nto be multiple of 16 bytes long and all memory reserved\n(the first bytes and the padding (may be modified by the PMDs).\n\nLastly, nonce is not needed to be placed in the first 16 bytes\nof the AAD, as the API stated, as that depends on the PMD\nused, so the comment has been removed.\n\nSigned-off-by: Pablo de Lara <28355d9cfe41bb8148aea0fb24f47aae8f4217a1@intel.com>\nAcked-by: Fiona Trahe <7ba562cc372916cd557d0be347608f8b4da4f746@intel.com>\nAcked-by: Fan Zhang <b46d470dc79aa6fd718cd24d07380f6203b7fc3c@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_cryptodev\/rte_crypto_sym.h\n+++ lib\/librte_cryptodev\/rte_crypto_sym.h\n@@ -196,7 +196,9 @@\n \t\t * space for the implementation to write in the flags\n \t\t * in the first byte). Note that a full 16 bytes should\n \t\t * be allocated, even though the length field will\n-\t\t * have a value less than this.\n+\t\t * have a value less than this. Note that the PMDs may\n+\t\t * modify the memory reserved (the first byte and the\n+\t\t * final padding)\n \t\t *\n \t\t * - For AES-XTS, this is the 128bit tweak, i, from\n \t\t * IEEE Std 1619-2007.\n@@ -555,20 +557,19 @@\n \t\t\t\t * Specifically for CCM (@ref RTE_CRYPTO_AEAD_AES_CCM),\n \t\t\t\t * the caller should setup this field as follows:\n \t\t\t\t *\n-\t\t\t\t * - the nonce should be written starting at an offset\n-\t\t\t\t * of one byte into the array, leaving room for the\n-\t\t\t\t * implementation to write in the flags to the first\n-\t\t\t\t * byte.\n-\t\t\t\t *\n-\t\t\t\t * - the additional authentication data itself should\n+\t\t\t\t * - the additional authentication data itself should\n \t\t\t\t * be written starting at an offset of 18 bytes into\n-\t\t\t\t * the array, leaving room for the length encoding in\n-\t\t\t\t * the first two bytes of the second block.\n+\t\t\t\t * the array, leaving room for the first block (16 bytes)\n+\t\t\t\t * and the length encoding in the first two bytes of the\n+\t\t\t\t * second block.\n \t\t\t\t *\n \t\t\t\t * - the array should be big enough to hold the above\n-\t\t\t\t * fields, plus any padding to round this up to the\n-\t\t\t\t * nearest multiple of the block size (16 bytes).\n-\t\t\t\t * Padding will be added by the implementation.\n+\t\t\t\t * fields, plus any padding to round this up to the\n+\t\t\t\t * nearest multiple of the block size (16 bytes).\n+\t\t\t\t * Padding will be added by the implementation.\n+\t\t\t\t *\n+\t\t\t\t * - Note that PMDs may modify the memory reserved\n+\t\t\t\t * (first 18 bytes and the final padding).\n \t\t\t\t *\n \t\t\t\t * Finally, for GCM (@ref RTE_CRYPTO_AEAD_AES_GCM), the\n \t\t\t\t * caller should setup this field as follows:\n"} {"commit":"a2acee83bfc30ae6e00cfe156450f810cade708f","subject":"rtos\/os-mqueue.h: define Message_queue as class","message":"rtos\/os-mqueue.h: define Message_queue as class\n\n- make the definition explicit, for better visibility\n","repos":"micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cmsis-plus\/rtos\/os-mqueue.h\n+++ include\/cmsis-plus\/rtos\/os-mqueue.h\n@@ -598,12 +598,63 @@\n \n };\n \n+ \/\/ ========================================================================\n+\n \/**\n * @brief Instance of the POSIX compliant **message queue** template\n * using the standard allocator.\n * @ingroup cmsis-plus-rtos\n *\/\n- using Message_queue = Message_queue_allocated<>;\n+ class Message_queue : public Message_queue_allocated<>\n+ {\n+ public:\n+\n+ \/**\n+ * @name Constructors & Destructor\n+ * @{\n+ *\/\n+\n+ \/**\n+ * @brief Create a message queue with default settings.\n+ * @param [in] msgs The number of messages.\n+ * @param [in] msg_size_bytes The message size, in bytes.\n+ *\/\n+ Message_queue (mqueue::size_t msgs, mqueue::msg_size_t msg_size_bytes);\n+\n+ \/**\n+ * @brief Create a message queue with custom settings.\n+ * @param [in] attr Reference to attributes.\n+ * @param [in] msgs The number of messages.\n+ * @param [in] msg_size_bytes The message size, in bytes.\n+ *\/\n+ Message_queue (const mqueue::Attributes& attr, mqueue::size_t msgs,\n+ mqueue::msg_size_t msg_size_bytes);\n+\n+ \/**\n+ * @cond ignore\n+ *\/\n+ public:\n+\n+ Message_queue (const Message_queue&) = delete;\n+ Message_queue (Message_queue&&) = delete;\n+ Message_queue&\n+ operator= (const Message_queue&) = delete;\n+ Message_queue&\n+ operator= (Message_queue&&) = delete;\n+ \/**\n+ * @endcond\n+ *\/\n+\n+ \/**\n+ * @brief Destroy the message queue.\n+ *\/\n+ ~Message_queue ();\n+\n+ \/**\n+ * @}\n+ *\/\n+\n+ };\n \n \/\/ ========================================================================\n \n@@ -613,8 +664,7 @@\n * @headerfile os.h <cmsis-plus\/rtos\/os.h>\n * @ingroup cmsis-plus-rtos\n *\/\n- template<typename T, typename Allocator = memory::allocator<\n- void*>>\n+ template<typename T, typename Allocator = memory::allocator<void*>>\n class Message_queue_typed : public Message_queue_allocated<Allocator>\n {\n public:\n@@ -1248,6 +1298,46 @@\n * message queue objects.\n *\n * For default message queue objects, the storage is dynamically\n+ * allocated using the RTOS specific allocator\n+ * (`rtos::memory::allocator`).\n+ *\n+ * @warning Cannot be invoked from Interrupt Service Routines.\n+ *\/\n+ inline\n+ Message_queue::Message_queue (mqueue::size_t msgs,\n+ mqueue::msg_size_t msg_size_bytes) :\n+ Message_queue_allocated (msgs, msg_size_bytes)\n+ {\n+ ;\n+ }\n+\n+ \/**\n+ * @details\n+ * Deallocate memory using the RTOS specific allocator\n+ * (`rtos::memory::allocator`).\n+ *\/\n+ inline\n+ Message_queue::~Message_queue ()\n+ {\n+ ;\n+ }\n+\n+ \/\/ ========================================================================\n+\n+ \/**\n+ * @details\n+ * This constructor shall initialise the message queue object\n+ * with the given number of messages and default settings.\n+ * The effect shall be equivalent to creating a message queue object\n+ * referring to the attributes in `mqueue::initializer`.\n+ * Upon successful initialisation, the state of the message queue\n+ * object shall become initialised, with no messages in the queue.\n+ *\n+ * Only the message queue object itself may be used for performing\n+ * synchronisation. It is not allowed to make copies of\n+ * message queue objects.\n+ *\n+ * For default message queue objects, the storage is dynamically\n * allocated using the default allocator.\n *\n * Implemented as a wrapper over the parent constructor, automatically\n"} {"commit":"ad7ef26d433bbf21a915652d96ad07048a0a4e26","subject":"nios2: Remove unused prepare_to_copy()","message":"nios2: Remove unused prepare_to_copy()\n\nprepare_to_copy() was removed from all architectures supported at that\ntime in commit 55ccf3fe3f9a (\"fork: move the real prepare_to_copy()\nusers to arch_dup_task_struct()\"). Remove it from nios2 as well.\n\nSigned-off-by: Tobias Klauser <9249c549618448e4c699e8032ba6c7f0d7fd4b7f@distanz.ch>\nAcked-by: Ley Foon Tan <95f178e5e278816be0436ff61f034a97684bdd0e@altera.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/nios2\/include\/asm\/processor.h\n+++ arch\/nios2\/include\/asm\/processor.h\n@@ -85,9 +85,6 @@\n \n extern unsigned long get_wchan(struct task_struct *p);\n \n-\/* Prepare to copy thread state - unlazy all lazy status *\/\n-#define prepare_to_copy(tsk)\tdo { } while (0)\n-\n #define task_pt_regs(p) \\\n \t((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)\n \n"} {"commit":"881302f9bf6d411cf1a2033780e9ac9e446a818b","subject":"bump version v.1.5.1.0","message":"bump version v.1.5.1.0","repos":"madross\/incakoin-new,madross\/incakoin-new,madross\/incakoin-new,madross\/incakoin-new","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -8,7 +8,7 @@\n \/\/ These need to be macros, as version.cpp's and IncaKoin-qt.rc's voodoo requires it\n #define CLIENT_VERSION_MAJOR 1\n #define CLIENT_VERSION_MINOR 5\n-#define CLIENT_VERSION_REVISION 0\n+#define CLIENT_VERSION_REVISION 1\n #define CLIENT_VERSION_BUILD 0\n \n \/\/! Set to true for release, false for prerelease or test build\n"} {"commit":"2b29a7a4c1a440a1b4929e52ed6085512e37eadf","subject":"pci: fix ioport support for uio_pci_generic on x86","message":"pci: fix ioport support for uio_pci_generic on x86\n\nuio_pci_generic does not offer the same sysfs helpers as igb_uio.\nIn this case, ioport number can only be retrieved by parsing \/proc\/ioports.\n\nFixes: 756ce64b1ecd (\"eal: introduce PCI ioport API\")\n\nReported-by: Mauricio Vasquez B <3c3d05761bb6e7ed574fac8375065a4e1e1e099e@studenti.polito.it>\nSigned-off-by: David Marchand <f28529695cfa9e3e1eb84e7072aa626af4abb18e@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_eal\/linuxapp\/eal\/eal_pci.c\n+++ lib\/librte_eal\/linuxapp\/eal\/eal_pci.c\n@@ -620,7 +620,11 @@\n \t\tret = pci_uio_ioport_map(dev, bar, p);\n \t\tbreak;\n \tcase RTE_KDRV_UIO_GENERIC:\n+#if defined(RTE_ARCH_X86)\n+\t\tret = pci_ioport_map(dev, bar, p);\n+#else\n \t\tret = pci_uio_ioport_map(dev, bar, p);\n+#endif\n \t\tbreak;\n \tcase RTE_KDRV_NONE:\n #if defined(RTE_ARCH_X86)\n@@ -705,7 +709,11 @@\n \t\tret = pci_uio_ioport_unmap(p);\n \t\tbreak;\n \tcase RTE_KDRV_UIO_GENERIC:\n+#if defined(RTE_ARCH_X86)\n+\t\tret = 0;\n+#else\n \t\tret = pci_uio_ioport_unmap(p);\n+#endif\n \t\tbreak;\n \tcase RTE_KDRV_NONE:\n #if defined(RTE_ARCH_X86)\n"} {"commit":"47ab3da08fb8b1a5c270b4143772ac1f733af4ce","subject":"rtos\/os-thread.h: refurbish thread::state","message":"rtos\/os-thread.h: refurbish thread::state\n\n- the enum class was hard to use in the C API\n","repos":"micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cmsis-plus\/rtos\/os-thread.h\n+++ include\/cmsis-plus\/rtos\/os-thread.h\n@@ -220,27 +220,33 @@\n \n \/**\n * @brief Type of a variable holding the thread state.\n- * @details\n- * An enumeration with the possible thread states. The enumeration\n- * is restricted to one of these values.\n- *\/\n- using state_t = enum class state\n- : uint8_t\n- {\n- \/**\n- * @brief Used to catch uninitialised threads.\n- *\/\n- undefined = 0, \/\/\n- inactive = 1,\/\/\n- ready = 2,\/\/\n- running = 3,\/\/\n- waiting = 4,\/\/\n+ *\/\n+ using state_t = uint8_t;\n+\n+ struct state\n+ {\n+ \/**\n+ * @brief An enumeration with all possible thread states.\n+ *\/\n+ enum\n+ : state_t\n+ {\n+ \/**\n+ * @brief Used to catch uninitialised threads.\n+ *\/\n+ undefined = 0, \/\/\n+ inactive = 1, \/\/\n+ ready = 2, \/\/\n+ running = 3, \/\/\n+ waiting = 4, \/\/\n \/**\n * @brief Reuse possible if terminated or higher.\n *\/\n terminated = 5, \/\/ Test for here up for reuse\n- destroyed = 6\n- }; \/* enum class state *\/\n+ destroyed = 6 \/\/!< destroyed\n+ };\n+ \/* enum *\/\n+ }; \/* struct state *\/\n \n \/**\n * @brief Thread signals.\n"} {"commit":"2957d9a6f2d84d0b50b3f775dbc3264ce0463d0b","subject":"Updated client version for testing","message":"Updated client version for testing\n","repos":"ahmedbodi\/test2,ahmedbodi\/test2,ahmedbodi\/test2,ahmedbodi\/test2,ahmedbodi\/test2,ahmedbodi\/test2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -17,7 +17,7 @@\n #define CLIENT_VERSION_MAJOR 1\n #define CLIENT_VERSION_MINOR 12\n #define CLIENT_VERSION_REVISION 0\n-#define CLIENT_VERSION_BUILD 1\n+#define CLIENT_VERSION_BUILD 2\n \n \/\/! Set to true for release, false for prerelease or test build\n #define CLIENT_VERSION_IS_RELEASE true\n"} {"commit":"ec749a15b0d695f8f154b6fafaaf3d6e1ac1fab7","subject":"Simplify a bit of code in the HandyTech braille driver. (ml)","message":"Simplify a bit of code in the HandyTech braille driver. (ml)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@6651 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -1535,10 +1535,8 @@\n break;\n \n case HT_EXTPKT_Scancode: {\n- while (length) {\n- enqueueCommand(BRL_BLK_PASSAT + bytes++[0]);\n- length -= 1;\n- }\n+ while (length--)\n+ enqueueCommand(BRL_BLK_PASSAT | BRL_ARG(*bytes++));\n break;\n }\n \n"} {"commit":"f27112a85fa901dd0be97d279462e3bf7d42f8fe","subject":"v0.8.99.14","message":"v0.8.99.14\n","repos":"joulecoin\/joulecoin,joulecoin\/joulecoin,joulecoin\/joulecoin,joulecoin\/joulecoin,joulecoin\/joulecoin,joulecoin\/joulecoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -9,7 +9,7 @@\n #define CLIENT_VERSION_MAJOR 0\n #define CLIENT_VERSION_MINOR 8\n #define CLIENT_VERSION_REVISION 99\n-#define CLIENT_VERSION_BUILD 13\n+#define CLIENT_VERSION_BUILD 14\n \n \/\/ Set to true for release, false for prerelease or test build\n #define CLIENT_VERSION_IS_RELEASE true\n"} {"commit":"6e03a73c2dbf15a5868d9dec89f4f3d0032b7893","subject":"Fix Actilino Joystick key processing. (ml)","message":"Fix Actilino Joystick key processing. (ml)\n\nThe Joystick Keys are an exception to how key codes have worked until now.\nRelax the check for navigation key group to allow them to be mapped.\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -1433,7 +1433,7 @@\n return enqueueKeyEvent(brl, HT_GRP_NavigationKeys, byte, !release);\n }\n \n- if ((byte > 0) && (byte < 0X20)) {\n+ if (byte > 0) {\n return enqueueKeyEvent(brl, HT_GRP_NavigationKeys, byte, !release);\n }\n \n"} {"commit":"42e34672fca77637f23289f0d8a23afaede5bafb","subject":"bump energi version to 1.0.0","message":"bump energi version to 1.0.0\n","repos":"RyanLucchese\/energi,RyanLucchese\/energi,RyanLucchese\/energi,RyanLucchese\/energi,RyanLucchese\/energi,RyanLucchese\/energi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clientversion.h\n+++ src\/clientversion.h\n@@ -14,8 +14,8 @@\n *\/\n \n \/\/! These need to be macros, as clientversion.cpp's and energi*-res.rc's voodoo requires it\n-#define CLIENT_VERSION_MAJOR 0\n-#define CLIENT_VERSION_MINOR 1\n+#define CLIENT_VERSION_MAJOR 1\n+#define CLIENT_VERSION_MINOR 0\n #define CLIENT_VERSION_REVISION 0\n #define CLIENT_VERSION_BUILD 0\n \n@@ -26,7 +26,7 @@\n * Copyright year (2009-this)\n * Todo: update this when changing our copyright comments in the source\n *\/\n-#define COPYRIGHT_YEAR 2017\n+#define COPYRIGHT_YEAR 2018\n \n #endif \/\/HAVE_CONFIG_H\n \n@@ -40,7 +40,7 @@\n \/\/! Copyright string used in Windows .rc files\n #define COPYRIGHT_STR \"2009-\" STRINGIZE(COPYRIGHT_YEAR) \" The Bitcoin Core Developers, 2014-\" \\\n STRINGIZE(COPYRIGHT_YEAR) \" The Dash Core Developers 2017-\" \\\n- STRINGIZE(COPYRIGHT_YEAR) \" The Energi Core Developers\"\n+ STRINGIZE(COPYRIGHT_YEAR) \" The Energi Core Developers 2017-\"\n \n \n \/**\n"} {"commit":"03dfb6d0df08cef86c844995d34db49bd7eb6757","subject":"cmd\/ld: drop gcargs, gclocals symbols from symbol table","message":"cmd\/ld: drop gcargs, gclocals symbols from symbol table\n\nUpdate issue 6853\n\nEvery function now has a gcargs and gclocals symbol\nholding associated garbage collection information.\nPut them all in the same meta-symbol as the go.func data\nand then drop individual entries from symbol table.\n\nRemoving gcargs and gclocals reduces the size of a\ntypical binary by 10%.\n\nLGTM=r\nR=r\nCC=golang-codereviews\nhttps:\/\/codereview.appspot.com\/65870044\n","repos":"glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,rdp\/rogerpack2005-golang,d0f\/go-zh,webfd\/go-zh,bryanxu\/go-zh,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,webfd\/go-zh,d0f\/go-zh,webfd\/go-zh,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,d0f\/go-zh,rdp\/rogerpack2005-golang,bryanxu\/go-zh,rdp\/rogerpack2005-golang,webfd\/go-zh,d0f\/go-zh,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,d0f\/go-zh,webfd\/go-zh,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,webfd\/go-zh,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,bryanxu\/go-zh,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,webfd\/go-zh,bryanxu\/go-zh,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,d0f\/go-zh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/ld\/symtab.c\n+++ src\/cmd\/ld\/symtab.c\n@@ -409,5 +409,10 @@\n \t\t\ts->hide = 1;\n \t\t\ts->outer = symgofunc;\n \t\t}\n-\t}\n-}\n+\t\tif(strstr(s->name, \".gcargs\u00b7\") != nil || strstr(s->name, \".gclocals\u00b7\") != nil || strncmp(s->name, \"gcargs\u00b7\", 8) == 0 || strncmp(s->name, \"gclocals\u00b7\", 10) == 0) {\n+\t\t\ts->type = SGOFUNC;\n+\t\t\ts->hide = 1;\n+\t\t\ts->outer = symgofunc;\n+\t\t}\n+\t}\n+}\n"} {"commit":"db56801e5d55ff3d69a4160ed59c5a4b1b01852d","subject":"partially support version option","message":"partially support version option\n","repos":"snmsts\/roswell,JulienBoubechtoulaAmabis\/roswell,Rudolph-Miller\/roswell,amarie-formation\/roswell,pradhyu\/roswell,roswell\/roswell,roswell\/roswell,JulienBoubechtoulaAmabis\/roswell,Rudolph-Miller\/roswell,kubov\/roswell,snmsts\/roswell,kubov\/roswell,amarie-formation\/roswell,Rudolph-Miller\/roswell,pradhyu\/roswell,fukamachi\/roswell,guicho271828\/roswell,kubov\/roswell,fukamachi\/roswell,amarie-formation\/roswell,fukamachi\/roswell,guicho271828\/roswell,pradhyu\/roswell,amarie-formation\/roswell,snmsts\/roswell,JulienBoubechtoulaAmabis\/roswell,JulienBoubechtoulaAmabis\/roswell,guicho271828\/roswell,snmsts\/roswell,JulienBoubechtoulaAmabis\/roswell,fukamachi\/roswell,roswell\/roswell,pradhyu\/roswell,guicho271828\/roswell,Rudolph-Miller\/roswell,roswell\/roswell,kubov\/roswell","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cmds\/run\/sbcl.c\n+++ src\/cmds\/run\/sbcl.c\n@@ -16,6 +16,7 @@\n char* program=get_opt(\"program\");\n char* dynamic_space_size=get_opt(\"dynamic-space-size\");\n char* dynamic_stack_size=get_opt(\"dynamic-stack-size\");\n+ char* sbcl_version=get_opt(\"version\");\n int paramc=0;\n char *bin= cat(impl_path,SLASH,\"bin\",SLASH,\"sbcl\",\n #ifdef _WIN32\n@@ -30,6 +31,8 @@\n offset+=2;\n if(dynamic_stack_size)\n offset+=2;\n+ if(sbcl_version)\n+ offset+=1;\n if(program)\n offset+=4;\n \n@@ -63,6 +66,9 @@\n arg[paramc++]=q(\"--dynamic-stack-size\");\n arg[paramc++]=q(dynamic_stack_size);\n }\n+ if(sbcl_version) {\n+ arg[paramc++]=q(\"--version\");\n+ }\n \/* runtime options end here *\/\n for(i=1;i<argc;++i) {\n arg[paramc++]=argv[i];\n@@ -83,7 +89,6 @@\n arg[paramc++]=s_cat2(lisp_path,q(\"init.lisp\"));\n arg[paramc++]=q(\"--eval\");\n arg[paramc++]=cat(\"(ros:run '(\",program,\"))\",NULL);\n- fprintf(stderr,\"rosrun:%s\\n\",arg[paramc-1]);\n }\n \n s(impl_path);\n"} {"commit":"73474158b202a8f003f2e51e1ce88f5a51dccc2a","subject":"fix potential warning","message":"fix potential warning\n","repos":"pthulhu\/eigen,cjntaylor\/eigen,cjntaylor\/eigen,pthulhu\/eigen,cjntaylor\/eigen,pthulhu\/eigen,pthulhu\/eigen,cjntaylor\/eigen,pthulhu\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/Householder\/Householder.h\n+++ Eigen\/src\/Householder\/Householder.h\n@@ -76,7 +76,7 @@\n else\n {\n beta = ei_sqrt(ei_abs2(c0) + tailSqNorm);\n- if (ei_real(c0)>=0.)\n+ if (ei_real(c0)>=RealScalar(0))\n beta = -beta;\n essential = tail \/ (c0 - beta);\n tau = ei_conj((beta - c0) \/ beta);\n"} {"commit":"1425aa5c39ca3751eb15adf3669c6966ce0809f7","subject":"Fusion the two similar specialization of Sparse2Dense Assignment. This change also fixes a compilation issue with MSVC<=2013.","message":"Fusion the two similar specialization of Sparse2Dense Assignment.\nThis change also fixes a compilation issue with MSVC<=2013.\n","repos":"pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/SparseCore\/SparseAssign.h\n+++ Eigen\/src\/SparseCore\/SparseAssign.h\n@@ -136,9 +136,13 @@\n template< typename DstXprType, typename SrcXprType, typename Functor>\n struct Assignment<DstXprType, SrcXprType, Functor, Sparse2Dense>\n {\n+ typedef typename DstXprType::Scalar Scalar;\n static void run(DstXprType &dst, const SrcXprType &src, const Functor &func)\n {\n eigen_assert(dst.rows() == src.rows() && dst.cols() == src.cols());\n+\n+ if(internal::is_same<Functor,internal::assign_op<Scalar> >::value)\n+ dst.setZero();\n \n internal::evaluator<SrcXprType> srcEval(src);\n internal::evaluator<DstXprType> dstEval(dst);\n@@ -149,23 +153,6 @@\n }\n };\n \n-template< typename DstXprType, typename SrcXprType>\n-struct Assignment<DstXprType, SrcXprType, internal::assign_op<typename DstXprType::Scalar>, Sparse2Dense>\n-{\n- static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<typename DstXprType::Scalar> &)\n- {\n- eigen_assert(dst.rows() == src.rows() && dst.cols() == src.cols());\n- \n- dst.setZero();\n- internal::evaluator<SrcXprType> srcEval(src);\n- internal::evaluator<DstXprType> dstEval(dst);\n- const Index outerEvaluationSize = (internal::evaluator<SrcXprType>::Flags&RowMajorBit) ? src.rows() : src.cols();\n- for (Index j=0; j<outerEvaluationSize; ++j)\n- for (typename internal::evaluator<SrcXprType>::InnerIterator i(srcEval,j); i; ++i)\n- dstEval.coeffRef(i.row(),i.col()) = i.value();\n- }\n-};\n-\n \/\/ Specialization for \"dst = dec.solve(rhs)\"\n \/\/ NOTE we need to specialize it for Sparse2Sparse to avoid ambiguous specialization error\n template<typename DstXprType, typename DecType, typename RhsType, typename Scalar>\n"} {"commit":"efc2feb15de38fc3c5038d8e549c80be57b79470","subject":"client: Stop processing saved changes when needed","message":"client: Stop processing saved changes when needed\n","repos":"AwesomePatrol\/ncursed-tanks","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- client_net.c\n+++ client_net.c\n@@ -31,6 +31,8 @@\n {\n for (int i=0; i<NetUpdates.count; i++) {\n struct update *update=dyn_arr_get(&NetUpdates, i);\n+ if (save_updates)\n+ return;\n process_update(update);\n }\n dyn_arr_clear(&NetUpdates);\n"} {"commit":"e0ca1f10b2c60a6cf97a26ecc8e58053204ce381","subject":"utf8: remove unnecessary code.","message":"utf8: remove unnecessary code.\n\nSwitch to using bson_utf8_get_sequence() from bson_utf8_escape_for_json().\nThis removes the need for any external UTF-8 includes.\n","repos":"remicollet\/libbson,jqk6\/libbson,jqk6\/libbson,mongodb\/libbson,bjori\/libbson,mongodb\/libbson,rayyang2000\/libbson,rayyang2000\/libbson,paulmelnikow\/libbson,Machyne\/libbson,alexeyvo\/libbson,mapr\/libbson,4Second2None\/libbson_tmp,Machyne\/libbson,alexeyvo\/libbson,4Second2None\/libbson_tmp,hanumantmk\/libbson,Convey-Compliance\/libbson,4Second2None\/libbson_tmp,mapr\/libbson,ksuarz\/libbson,paulmelnikow\/libbson,Machyne\/libbson,hanumantmk\/libbson,ksuarz\/libbson,rayyang2000\/libbson,jqk6\/libbson,remicollet\/libbson,alexeyvo\/libbson,Convey-Compliance\/libbson,mongodbinc-interns\/libbson,mongodbinc-interns\/libbson,ksuarz\/libbson,ajdavis\/libbson,rcsanchez97\/libbson,jqk6\/libbson,mongodbinc-interns\/libbson,rcsanchez97\/libbson,paulmelnikow\/libbson,ajdavis\/libbson,Machyne\/libbson,rayyang2000\/libbson,mongodb\/libbson,derickr\/libbson,derickr\/libbson,remicollet\/libbson,mongodbinc-interns\/libbson,bjori\/libbson,mapr\/libbson,rcsanchez97\/libbson,paulmelnikow\/libbson,derickr\/libbson,ajdavis\/libbson,Convey-Compliance\/libbson,remicollet\/libbson,4Second2None\/libbson_tmp,bjori\/libbson,hanumantmk\/libbson,paulmelnikow\/libbson,hanumantmk\/libbson,derickr\/libbson","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bson\/bson-utf8.c\n+++ bson\/bson-utf8.c\n@@ -21,120 +21,6 @@\n #include \"bson-utf8.h\"\n \n \n-\/*\n- * Portions Copyright 2001 Unicode, Inc.\n- *\n- * Disclaimer\n- *\n- * This source code is provided as is by Unicode, Inc. No claims are\n- * made as to fitness for any particular purpose. No warranties of any\n- * kind are expressed or implied. The recipient agrees to determine\n- * applicability of information provided. If this file has been\n- * purchased on magnetic or optical media from Unicode, Inc., the\n- * sole remedy for any claim will be exchange of defective media\n- * within 90 days of receipt.\n- *\n- * Limitations on Rights to Redistribute This Code\n- *\n- * Unicode, Inc. hereby grants the right to freely use the information\n- * supplied in this file in the creation of products supporting the\n- * Unicode Standard, and to make copies of this file in any form\n- * for internal or external distribution as long as this notice\n- * remains attached.\n- *\/\n-\n-\n-#define VALID 0\n-#define NOT_UTF_8 1\n-#define HAS_NULL 2\n-\n-\n-\/*\n- * Index into the table below with the first byte of a UTF-8 sequence to\n- * get the number of trailing bytes that are supposed to follow it.\n- *\/\n-static const char trailingBytesForUTF8[256] = {\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\n- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,\n- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5\n-};\n-\n-\n-\/* --------------------------------------------------------------------- *\/\n-\n-\/*\n- * Utility routine to tell whether a sequence of bytes is legal UTF-8.\n- * This must be called with the length pre-determined by the first byte.\n- * The length can be set by:\n- * length = trailingBytesForUTF8[*source]+1;\n- * and the sequence is illegal right away if there aren't that many bytes\n- * available.\n- * If presented with a length > 4, this returns 0. The Unicode\n- * definition of UTF-8 goes up to 4-byte sequences.\n- *\/\n-static unsigned char isLegalUTF8(const unsigned char* source, int length) {\n- unsigned char a;\n- const unsigned char* srcptr = source + length;\n- switch (length) {\n- default: return 0;\n- \/* Everything else falls through when \"true\"... *\/\n- case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;\n- case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;\n- case 2: if ((a = (*--srcptr)) > 0xBF) return 0;\n- switch (*source) {\n- \/* no fall-through in this inner switch *\/\n- case 0xE0: if (a < 0xA0) return 0; break;\n- case 0xF0: if (a < 0x90) return 0; break;\n- case 0xF4: if (a > 0x8F) return 0; break;\n- default: if (a < 0x80) return 0;\n- }\n- case 1: if (*source >= 0x80 && *source < 0xC2) return 0;\n- if (*source > 0xF4) return 0;\n- }\n- return 1;\n-}\n-\n-\n-static int\n-check_string (const unsigned char* string,\n- const int length,\n- const char check_utf8,\n- const char check_null)\n-{\n- int position = 0;\n- \/* By default we go character by character. Will be different for checking\n- * UTF-8 *\/\n- int sequence_length = 1;\n-\n- if (!check_utf8 && !check_null) {\n- return VALID;\n- }\n-\n- while (position < length) {\n- if (check_null && !*(string + position)) {\n- return HAS_NULL;\n- }\n- if (check_utf8) {\n- sequence_length = trailingBytesForUTF8[*(string + position)] + 1;\n- if ((position + sequence_length) > length) {\n- return NOT_UTF_8;\n- }\n- if (!isLegalUTF8(string + position, sequence_length)) {\n- return NOT_UTF_8;\n- }\n- }\n- position += sequence_length;\n- }\n-\n- return VALID;\n-}\n-\n-\n static BSON_INLINE void\n bson_utf8_get_sequence (const char *utf8,\n bson_uint8_t *seq_length,\n@@ -143,6 +29,15 @@\n unsigned char c = *(const unsigned char *)utf8;\n bson_uint8_t m;\n bson_uint8_t n;\n+\n+ \/*\n+ * See the following[1] for a description of what the given multi-byte\n+ * sequences will be based on the bits set of the first byte. We also need\n+ * to mask the first byte based on that. All subsequent bytes are masked\n+ * against 0x3F.\n+ *\n+ * [1] http:\/\/www.joelonsoftware.com\/articles\/Unicode.html\n+ *\/\n \n if ((c & 0x80) == 0) {\n n = 1;\n@@ -212,7 +107,8 @@\n {\n unsigned int i = 0;\n unsigned int o = 0;\n- size_t seq_len;\n+ bson_uint8_t seq_len;\n+ bson_uint8_t mask;\n char *ret;\n \n bson_return_val_if_fail(utf8, NULL);\n@@ -224,7 +120,8 @@\n ret = bson_malloc0((utf8_len * 2) + 1);\n \n while (i < utf8_len) {\n- seq_len = 1 + trailingBytesForUTF8[((const bson_uint8_t *)utf8)[i]];\n+ bson_utf8_get_sequence(&utf8[i], &seq_len, &mask);\n+\n if ((i + seq_len) > utf8_len) {\n bson_free(ret);\n return NULL;\n"} {"commit":"467c17bb917cd2e7d734d6552e9859b1af0d06a5","subject":"Added minor fixme comment.","message":"Added minor fixme comment.\n","repos":"fintler\/tomatodb,fintler\/tomatodb,fintler\/tomatodb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/common\/common.h\n+++ src\/common\/common.h\n@@ -19,6 +19,7 @@\n * Author: Jon Bringhurst <jon@bringhurst.org>\n *\/\n \n+\/\/ FIXME: make this configurable.\n #define HVN_BASE_STATE_DIR \"\/var\/lib\/haven\"\n \n #define HVN_SUCCESS (1)\n"} {"commit":"ab5eff60e1369d946ee91867468204e45aae08eb","subject":"common\/paging.c: fix unaligned pointer access","message":"common\/paging.c: fix unaligned pointer access\n\nPassing a pointer to a packed structure to tmsi_mi_to_uint() may\nresult in unaligned pointer value. Found with clang-8.\n\nChange-Id: Ief69854973a098e6da7c05f4417dc11988edd777\n","repos":"osmocom\/osmo-bts,osmocom\/osmo-bts,osmocom\/osmo-bts","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/common\/paging.c\n+++ src\/common\/paging.c\n@@ -302,7 +302,9 @@\n \t\t\t\tuint8_t cneed2, const uint8_t *identity3_lv)\n {\n \tstruct gsm48_paging2 *pt2 = (struct gsm48_paging2 *) out_buf;\n+\tuint32_t tmsi;\n \tuint8_t *cur;\n+\tint rc;\n \n \tmemset(out_buf, 0, sizeof(*pt2));\n \n@@ -311,8 +313,12 @@\n \tpt2->pag_mode = GSM48_PM_NORMAL;\n \tpt2->cneed1 = cneed1;\n \tpt2->cneed2 = cneed2;\n-\ttmsi_mi_to_uint(&pt2->tmsi1, tmsi1_lv);\n-\ttmsi_mi_to_uint(&pt2->tmsi2, tmsi2_lv);\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi1_lv);\n+\tif (rc == 0)\n+\t\tpt2->tmsi1 = tmsi;\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi2_lv);\n+\tif (rc == 0)\n+\t\tpt2->tmsi2 = tmsi;\n \tcur = out_buf + sizeof(*pt2);\n \n \tif (identity3_lv)\n@@ -329,6 +335,8 @@\n \t\t\t\tconst uint8_t *tmsi4_lv, uint8_t cneed4)\n {\n \tstruct gsm48_paging3 *pt3 = (struct gsm48_paging3 *) out_buf;\n+\tuint32_t tmsi;\n+\tint rc;\n \n \tmemset(out_buf, 0, sizeof(*pt3));\n \n@@ -337,10 +345,18 @@\n \tpt3->pag_mode = GSM48_PM_NORMAL;\n \tpt3->cneed1 = cneed1;\n \tpt3->cneed2 = cneed2;\n-\ttmsi_mi_to_uint(&pt3->tmsi1, tmsi1_lv);\n-\ttmsi_mi_to_uint(&pt3->tmsi2, tmsi2_lv);\n-\ttmsi_mi_to_uint(&pt3->tmsi3, tmsi3_lv);\n-\ttmsi_mi_to_uint(&pt3->tmsi4, tmsi4_lv);\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi1_lv);\n+\tif (rc == 0)\n+\t\tpt3->tmsi1 = tmsi;\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi2_lv);\n+\tif (rc == 0)\n+\t\tpt3->tmsi2 = tmsi;\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi3_lv);\n+\tif (rc == 0)\n+\t\tpt3->tmsi3 = tmsi;\n+\trc = tmsi_mi_to_uint(&tmsi, tmsi4_lv);\n+\tif (rc == 0)\n+\t\tpt3->tmsi4 = tmsi;\n \n \t\/* The structure definition in libosmocore is wrong. It includes as last\n \t * byte some invalid definition of chneed3\/chneed4, so we must do this by hand\n"} {"commit":"0cf88c1d35bbc86fdfc1b8035222b248d6725807","subject":"mgmt\/glusterd: initialize addrinfo variables","message":"mgmt\/glusterd: initialize addrinfo variables\n\nSigned-off-by: Pranith Kumar K <pranithk@gluster.com>\nSigned-off-by: Vijay Bellur <vijay@dev.gluster.com>\n\nBUG: 1695 ()\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=1695\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/mgmt\/glusterd\/src\/glusterd-handler.c\n+++ xlators\/mgmt\/glusterd\/src\/glusterd-handler.c\n@@ -62,7 +62,8 @@\n glusterd_conf_t *priv = NULL;\n glusterd_peerinfo_t *entry = NULL;\n glusterd_peer_hostname_t *name = NULL;\n- struct addrinfo *addr, *p;\n+ struct addrinfo *addr = NULL;\n+ struct addrinfo *p = NULL;\n char *host = NULL;\n struct sockaddr_in6 *s6 = NULL;\n struct sockaddr_in *s4 = NULL;\n"} {"commit":"203e682d22a89af23dab21418e841e3b54b136d4","subject":"compat: extract and document MAX_PATH","message":"compat: extract and document MAX_PATH\n","repos":"jambolo\/bitcoin,tecnovert\/particl-core,particl\/particl-core,kallewoof\/bitcoin,sipsorcery\/bitcoin,bitcoin\/bitcoin,kallewoof\/bitcoin,tecnovert\/particl-core,AkioNak\/bitcoin,Xekyo\/bitcoin,namecoin\/namecoin-core,namecoin\/namecoin-core,mruddy\/bitcoin,fujicoin\/fujicoin,sstone\/bitcoin,fujicoin\/fujicoin,fanquake\/bitcoin,jambolo\/bitcoin,sipsorcery\/bitcoin,bitcoin\/bitcoin,fanquake\/bitcoin,sipsorcery\/bitcoin,Xekyo\/bitcoin,sipsorcery\/bitcoin,fanquake\/bitcoin,jamesob\/bitcoin,jambolo\/bitcoin,bitcoinsSG\/bitcoin,lateminer\/bitcoin,AkioNak\/bitcoin,sstone\/bitcoin,fujicoin\/fujicoin,Xekyo\/bitcoin,fanquake\/bitcoin,ajtowns\/bitcoin,particl\/particl-core,Xekyo\/bitcoin,namecoin\/namecoin-core,ajtowns\/bitcoin,tecnovert\/particl-core,AkioNak\/bitcoin,jambolo\/bitcoin,bitcoin\/bitcoin,ajtowns\/bitcoin,sipsorcery\/bitcoin,fujicoin\/fujicoin,bitcoinsSG\/bitcoin,lateminer\/bitcoin,fanquake\/bitcoin,namecoin\/namecoin-core,namecoin\/namecore,namecoin\/namecore,mruddy\/bitcoin,mruddy\/bitcoin,kallewoof\/bitcoin,AkioNak\/bitcoin,mruddy\/bitcoin,fanquake\/bitcoin,bitcoinsSG\/bitcoin,namecoin\/namecore,namecoin\/namecoin-core,fujicoin\/fujicoin,particl\/particl-core,bitcoin\/bitcoin,namecoin\/namecore,jamesob\/bitcoin,particl\/particl-core,jamesob\/bitcoin,ajtowns\/bitcoin,kallewoof\/bitcoin,namecoin\/namecoin-core,jamesob\/bitcoin,Xekyo\/bitcoin,sstone\/bitcoin,mruddy\/bitcoin,bitcoinsSG\/bitcoin,sstone\/bitcoin,jamesob\/bitcoin,lateminer\/bitcoin,fujicoin\/fujicoin,bitcoinsSG\/bitcoin,jambolo\/bitcoin,namecoin\/namecore,lateminer\/bitcoin,sipsorcery\/bitcoin,particl\/particl-core,lateminer\/bitcoin,bitcoin\/bitcoin,AkioNak\/bitcoin,tecnovert\/particl-core,bitcoinsSG\/bitcoin,kallewoof\/bitcoin,jamesob\/bitcoin,sstone\/bitcoin,AkioNak\/bitcoin,tecnovert\/particl-core,kallewoof\/bitcoin,jambolo\/bitcoin,bitcoin\/bitcoin,ajtowns\/bitcoin,particl\/particl-core,ajtowns\/bitcoin,Xekyo\/bitcoin,tecnovert\/particl-core,lateminer\/bitcoin,sstone\/bitcoin,mruddy\/bitcoin,namecoin\/namecore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/compat\/compat.h\n+++ src\/compat\/compat.h\n@@ -65,9 +65,14 @@\n #define S_IRUSR 0400\n #define S_IWUSR 0200\n #endif\n-#else\n+#endif\n+\n+\/\/ Windows defines MAX_PATH as it's maximum path length.\n+\/\/ We define MAX_PATH for use on non-Windows systems.\n+#ifndef WIN32\n #define MAX_PATH 1024\n #endif\n+\n #ifdef _MSC_VER\n #if !defined(ssize_t)\n #ifdef _WIN64\n"} {"commit":"1f6a710fb181c030f57deec4af4a4068a2cd743c","subject":"space\/load-string.93: add UTF\/mushcell versions","message":"space\/load-string.93: add UTF\/mushcell versions\n","repos":"Deewiant\/mushspace,Deewiant\/mushspace,Deewiant\/mushspace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- space\/load-string.93.c\n+++ space\/load-string.93.c\n@@ -1,6 +1,8 @@\n \/\/ File created: 2012-01-29 11:05:32\n \n #include \"space\/load-string.all.h\"\n+\n+#include \"lib\/icu\/utf.h\"\n \n static bool newline(bool* got_cr, mushcoords* pos) {\n *got_cr = false;\n@@ -51,4 +53,7 @@\n }\n \n #define PLAIN_NEXT(s, s_end, c) do { (void)s_end; (c = (*(s)++)); } while (0)\n-define_load_string(, char, PLAIN_NEXT)\n+define_load_string(, char, PLAIN_NEXT)\n+define_load_string(_utf8, uint8_t, U8_NEXT_PTR)\n+define_load_string(_utf16, uint16_t, U16_NEXT_PTR)\n+define_load_string(_cell, mushcell, PLAIN_NEXT)\n"} {"commit":"45e5443bb47f6de66c7c3af07906513accd90e8d","subject":"rds: don't shutdown on sigpipe","message":"rds: don't shutdown on sigpipe\n","repos":"awakecoding\/FreeRDS,awakecoding\/FreeRDS,vworkspace\/FreeRDS,vworkspace\/FreeRDS,awakecoding\/FreeRDS,vworkspace\/FreeRDS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- freerds\/core\/freerds.c\n+++ freerds\/core\/freerds.c\n@@ -257,7 +257,6 @@\n \tsignal(SIGINT, freerds_shutdown);\n \tsignal(SIGKILL, freerds_shutdown);\n \tsignal(SIGPIPE, pipe_sig);\n-\tsignal(SIGPIPE, freerds_shutdown);\n \n \tpid = GetCurrentProcessId();\n \n"} {"commit":"ba64b2a3faeb99910e2a4c082c16ea185594164c","subject":"* Add a couple of action definitions for FreeBSD extensions. * Handle the different ioctl design. * Add support for the get and set error location. * Add support for freopen().","message":"* Add a couple of action definitions for FreeBSD extensions.\n* Handle the different ioctl design.\n* Add support for the get and set error location.\n* Add support for freopen().\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cddl\/contrib\/opensolaris\/lib\/libdtrace\/common\/dt_impl.h\n+++ cddl\/contrib\/opensolaris\/lib\/libdtrace\/common\/dt_impl.h\n@@ -18,6 +18,7 @@\n *\n * CDDL HEADER END\n *\/\n+\n \/*\n * Copyright 2008 Sun Microsystems, Inc. All rights reserved.\n * Use is subject to license terms.\n@@ -30,6 +31,13 @@\n \n #include <sys\/param.h>\n #include <sys\/objfs.h>\n+#if !defined(sun)\n+#include <sys\/bitmap.h>\n+#include <sys\/utsname.h>\n+#include <sys\/ioccom.h>\n+#include <sys\/time.h>\n+#include <string.h>\n+#endif\n #include <setjmp.h>\n #include <libctf.h>\n #include <dtrace.h>\n@@ -127,6 +135,9 @@\n \tGElf_Addr dm_bss_va;\t\/* virtual address of BSS *\/\n \tGElf_Xword dm_bss_size;\t\/* size in bytes of BSS *\/\n \tdt_idhash_t *dm_extern;\t\/* external symbol definitions *\/\n+#if !defined(sun)\n+\tcaddr_t dm_reloc_offset;\t\/* Symbol relocation offset. *\/\n+#endif\n } dt_module_t;\n \n #define\tDT_DM_LOADED\t0x1\t\/* module symbol and type data is loaded *\/\n@@ -183,6 +194,7 @@\n \tchar *dtld_libpath;\t\t\/* library pathname *\/\n \tuint_t dtld_finish;\t\t\/* completion time in tsort for lib *\/\n \tuint_t dtld_start;\t\t\/* starting time in tsort for lib *\/\n+\tuint_t dtld_loaded;\t\t\/* boolean: is this library loaded *\/\n \tdt_list_t dtld_dependencies;\t\/* linked-list of lib dependencies *\/\n \tdt_list_t dtld_dependents;\t\/* linked-list of lib dependents *\/\n } dt_lib_depend_t;\n@@ -265,12 +277,20 @@\n \tint dt_version;\t\t\/* library version requested by client *\/\n \tint dt_ctferr;\t\t\/* error resulting from last CTF failure *\/\n \tint dt_errno;\t\t\/* error resulting from last failed operation *\/\n+#if !defined(sun)\n+\tconst char *dt_errfile;\n+\tint dt_errline;\n+#endif\n \tint dt_fd;\t\t\/* file descriptor for dtrace pseudo-device *\/\n \tint dt_ftfd;\t\t\/* file descriptor for fasttrap pseudo-device *\/\n \tint dt_fterr;\t\t\/* saved errno from failed open of dt_ftfd *\/\n \tint dt_cdefs_fd;\t\/* file descriptor for C CTF debugging cache *\/\n \tint dt_ddefs_fd;\t\/* file descriptor for D CTF debugging cache *\/\n+#if defined(sun)\n \tint dt_stdout_fd;\t\/* file descriptor for saved stdout *\/\n+#else\n+\tFILE *dt_freopen_fp;\t\/* file pointer for freopened stdout *\/\n+#endif\n \tdtrace_handle_err_f *dt_errhdlr; \/* error handler, if any *\/\n \tvoid *dt_errarg;\t\/* error handler argument *\/\n \tdtrace_prog_t *dt_errprog; \/* error handler program, if any *\/\n@@ -412,6 +432,8 @@\n #define\tDT_ACT_UMOD\t\tDT_ACT(26)\t\/* umod() action *\/\n #define\tDT_ACT_UADDR\t\tDT_ACT(27)\t\/* uaddr() action *\/\n #define\tDT_ACT_SETOPT\t\tDT_ACT(28)\t\/* setopt() action *\/\n+#define\tDT_ACT_PRINTM\t\tDT_ACT(29)\t\/* printm() action *\/\n+#define\tDT_ACT_PRINTT\t\tDT_ACT(30)\t\/* printt() action *\/\n \n \/*\n * Sentinel to tell freopen() to restore the saved stdout. This must not\n@@ -539,11 +561,21 @@\n extern char *dt_cpp_add_arg(dtrace_hdl_t *, const char *);\n extern char *dt_cpp_pop_arg(dtrace_hdl_t *);\n \n+#if defined(sun)\n extern int dt_set_errno(dtrace_hdl_t *, int);\n+#else\n+int _dt_set_errno(dtrace_hdl_t *, int, const char *, int);\n+void dt_get_errloc(dtrace_hdl_t *, const char **, int *);\n+#define dt_set_errno(_a,_b)\t_dt_set_errno(_a,_b,__FILE__,__LINE__)\n+#endif\n extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *,\n const char *, int, const char *, va_list);\n \n+#if defined(sun)\n extern int dt_ioctl(dtrace_hdl_t *, int, void *);\n+#else\n+extern int dt_ioctl(dtrace_hdl_t *, u_long, void *);\n+#endif\n extern int dt_status(dtrace_hdl_t *, processorid_t);\n extern long dt_sysconf(dtrace_hdl_t *, int);\n extern ssize_t dt_write(dtrace_hdl_t *, int, const void *, size_t);\n"} {"commit":"6f834c67479bc07de6d5fbe552e3eb8d55f5c183","subject":"MFC r261122: dtrace: remove unexplained 16MB limitation from dt_alloc\/dt_zalloc","message":"MFC r261122: dtrace: remove unexplained 16MB limitation from dt_alloc\/dt_zalloc\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cddl\/contrib\/opensolaris\/lib\/libdtrace\/common\/dt_subr.c\n+++ cddl\/contrib\/opensolaris\/lib\/libdtrace\/common\/dt_subr.c\n@@ -734,11 +734,6 @@\n {\n \tvoid *data;\n \n-\tif (size > 16 * 1024 * 1024) {\n-\t\t(void) dt_set_errno(dtp, EDT_NOMEM);\n-\t\treturn (NULL);\n-\t}\n-\n \tif ((data = malloc(size)) == NULL)\n \t\t(void) dt_set_errno(dtp, EDT_NOMEM);\n \telse\n@@ -751,11 +746,6 @@\n dt_alloc(dtrace_hdl_t *dtp, size_t size)\n {\n \tvoid *data;\n-\n-\tif (size > 16 * 1024 * 1024) {\n-\t\t(void) dt_set_errno(dtp, EDT_NOMEM);\n-\t\treturn (NULL);\n-\t}\n \n \tif ((data = malloc(size)) == NULL)\n \t\t(void) dt_set_errno(dtp, EDT_NOMEM);\n"} {"commit":"624ebf9b63024d253949b8f7e209527b147fa396","subject":"allow missing log file at any time","message":"allow missing log file at any time\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@21678 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mdslog.c\n+++ slashd\/mdslog.c\n@@ -274,7 +274,7 @@\n }\n \n int\n-mds_remove_logfile(uint64_t batchno, int update, int cleanup)\n+mds_remove_logfile(uint64_t batchno, int update, __unusedx int cleanup)\n {\n \tchar logfn[PATH_MAX];\n \tint rc;\n@@ -290,7 +290,7 @@\n \t NULL, NULL);\n \tmds_note_update(-1);\n \n-\tif (rc && (rc != ENOENT || !cleanup))\n+\tif (rc && rc != ENOENT)\n \t\tpsc_fatalx(\"Failed to remove log file %s: %s\", logfn,\n \t\t slstrerror(rc));\n \tif (!rc) {\n"} {"commit":"cc02d5bd18381d3f6e25138d8689843ba783d7d6","subject":"fix meter bounds","message":"fix meter bounds\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@24681 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mdslog.c\n+++ slashd\/mdslog.c\n@@ -2006,6 +2006,7 @@\n \t\tsi->si_index = i;\n \t\tif (si->si_batchno > batchno)\n \t\t\tbatchno = si->si_batchno;\n+\t\tsi->si_batchmeter.pm_maxp = &reclaim_prg.cur_batchno;\n \t\tRPMI_ULOCK(rpmi);\n \t}\n \tif (stale) {\n"} {"commit":"61eb806ac5c5e2e9d77d7bf6283461c74b00445f","subject":"missing decref","message":"missing decref\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@15142 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mdslog.c\n+++ slashd\/mdslog.c\n@@ -1089,8 +1089,10 @@\n \t\t SRMM_BULK_PORTAL, &iov, 1);\n \n \t\trc = SL_RSX_WAITREP(csvc, rq, mp);\n+\n \t\tpscrpc_req_finished(rq);\n \t\trq = NULL;\n+\t\tsl_csvc_decref(csvc);\n \n \t\tif (rc == 0)\n \t\t\trc = mp->rc;\n@@ -1346,8 +1348,8 @@\n \n \t\t\tpscrpc_req_finished(rq);\n \t\t\trq = NULL;\n-\n \t\t\tsl_csvc_decref(csvc);\n+\n \t\t\tif (rc == 0)\n \t\t\t\trc = mp->rc;\n \t\t\tif (rc == 0) {\n"} {"commit":"0df0f79c8ee25564321564b676b245e339a77823","subject":"move code to mdslog.c","message":"move code to mdslog.c\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@11363 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mdslog.c\n+++ slashd\/mdslog.c\n@@ -383,12 +383,22 @@\n }\n \n void\n+mds_namespace_propagate(__unusedx struct psc_thread *thr)\n+{\n+\n+}\n+\n+void\n mds_journal_init(void)\n {\n \tchar fn[PATH_MAX];\n+\tstruct psc_thread *thr;\n \n \txmkfn(fn, \"%s\/%s\", sl_datadir, SL_FN_OPJOURNAL);\n \tmdsJournal = pjournal_replay(fn, mds_journal_replay, mds_shadow_handler);\n \tif (mdsJournal == NULL)\n \t\tpsc_fatal(\"Fail to load\/replay log file %s\", fn);\n-}\n+\n+\tthr = pscthr_init(SLMTHRT_JRNL_SEND, 0, mds_namespace_propagate,\n+\t NULL, 0, \"slmjsendthr\");\n+}\n"} {"commit":"6e118357d705799af23b1abb46e5227561e861b3","subject":"minor","message":"minor\n","repos":"lstorchi\/mpisttest","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"4fc498c61904da641740804109576e4c6121ec1f","subject":"Bugzilla Bug 279541: Fixed errors in code that was apparently copied and pasted. ipv6_to_v4_tcpMethods should be ipv6_to_v4_udpMethods. The patch is contributed by Justin Wood <116057@bacon.qcc.mass.edu>. r=wtc,darin.","message":"Bugzilla Bug 279541: Fixed errors in code that was apparently copied\nand pasted. ipv6_to_v4_tcpMethods should be ipv6_to_v4_udpMethods.\nThe patch is contributed by Justin Wood <116057@bacon.qcc.mass.edu>.\nr=wtc,darin.\n","repos":"makotokato\/nsprpub,makotokato\/nsprpub,makotokato\/nsprpub,makotokato\/nsprpub,makotokato\/nsprpub","returncode":0,"stderr":"unknown","license":"mpl-2.0","lang":"C","diff":""} {"commit":"8cdbffdc1ecd34963f5cf427493c5dfff436aa0e","subject":"Bug 482002: Update dtoa.c from http:\/\/www.netlib.org\/fp\/dtoa.c dated Wed Jul 7 09:25:46 MDT 2010","message":"Bug 482002: Update dtoa.c from http:\/\/www.netlib.org\/fp\/dtoa.c dated\nWed Jul 7 09:25:46 MDT 2010\n","repos":"thespooler\/nspr,thespooler\/nspr,thespooler\/nspr,thespooler\/nspr,thespooler\/nspr","returncode":0,"stderr":"unknown","license":"mpl-2.0","lang":"C","diff":""} {"commit":"5320bfade721a499798176bf454809a67bfcf54c","subject":"fixed","message":"fixed\n","repos":"xlcteam\/pynxc,xlcteam\/pynxc,xlcteam\/pynxc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pynxc\/defs.h\n+++ pynxc\/defs.h\n@@ -106,7 +106,7 @@\n continue;\n }\n \n- if(_cur_lcd_line == 8){\n+ if(_cur_lcd_line > 7){\n ClearScreen();\n _cur_lcd_line = 1;\n }\n@@ -114,10 +114,10 @@\n _line_position = 64 - _cur_lcd_line * 8;\n TextOut(char_pos*8, _line_position, character); \n char_pos++;\n+ }\n \n- if (i == StrLen(text)){\n- _cur_lcd_line = 1;\n- }\n+ if (SubStr(text, StrLen(text)-1, 1) != \"\\n\"){\n+ _cur_lcd_line++;\n }\n }\n \n"} {"commit":"b7e57d413b5a5bcb3a3736a6bc0b352eb96d392c","subject":"BUG: Fixing import statement.","message":"BUG: Fixing import statement.\n","repos":"candy7393\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,msmolens\/VTK,jmerkow\/VTK,berendkleinhaneveld\/VTK,Wuteyan\/VTK,daviddoria\/PointGraphsPhase1,sumedhasingla\/VTK,spthaolt\/VTK,sumedhasingla\/VTK,johnkit\/vtk-dev,mspark93\/VTK,spthaolt\/VTK,msmolens\/VTK,johnkit\/vtk-dev,jmerkow\/VTK,ashray\/VTK-EVM,jeffbaumes\/jeffbaumes-vtk,SimVascular\/VTK,aashish24\/VTK-old,aashish24\/VTK-old,biddisco\/VTK,biddisco\/VTK,hendradarwin\/VTK,naucoin\/VTKSlicerWidgets,naucoin\/VTKSlicerWidgets,biddisco\/VTK,aashish24\/VTK-old,candy7393\/VTK,demarle\/VTK,johnkit\/vtk-dev,arnaudgelas\/VTK,keithroe\/vtkoptix,cjh1\/VTK,sankhesh\/VTK,berendkleinhaneveld\/VTK,jmerkow\/VTK,naucoin\/VTKSlicerWidgets,keithroe\/vtkoptix,SimVascular\/VTK,sankhesh\/VTK,arnaudgelas\/VTK,SimVascular\/VTK,spthaolt\/VTK,sankhesh\/VTK,mspark93\/VTK,collects\/VTK,collects\/VTK,keithroe\/vtkoptix,daviddoria\/PointGraphsPhase1,collects\/VTK,sankhesh\/VTK,sumedhasingla\/VTK,Wuteyan\/VTK,gram526\/VTK,jmerkow\/VTK,gram526\/VTK,ashray\/VTK-EVM,aashish24\/VTK-old,mspark93\/VTK,candy7393\/VTK,jmerkow\/VTK,SimVascular\/VTK,arnaudgelas\/VTK,daviddoria\/PointGraphsPhase1,demarle\/VTK,spthaolt\/VTK,sankhesh\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,demarle\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,collects\/VTK,johnkit\/vtk-dev,demarle\/VTK,hendradarwin\/VTK,collects\/VTK,Wuteyan\/VTK,sankhesh\/VTK,daviddoria\/PointGraphsPhase1,Wuteyan\/VTK,jeffbaumes\/jeffbaumes-vtk,aashish24\/VTK-old,msmolens\/VTK,mspark93\/VTK,arnaudgelas\/VTK,spthaolt\/VTK,keithroe\/vtkoptix,cjh1\/VTK,mspark93\/VTK,sankhesh\/VTK,daviddoria\/PointGraphsPhase1,ashray\/VTK-EVM,keithroe\/vtkoptix,gram526\/VTK,gram526\/VTK,collects\/VTK,SimVascular\/VTK,sumedhasingla\/VTK,jeffbaumes\/jeffbaumes-vtk,arnaudgelas\/VTK,Wuteyan\/VTK,spthaolt\/VTK,jmerkow\/VTK,msmolens\/VTK,jeffbaumes\/jeffbaumes-vtk,ashray\/VTK-EVM,Wuteyan\/VTK,candy7393\/VTK,keithroe\/vtkoptix,jeffbaumes\/jeffbaumes-vtk,gram526\/VTK,SimVascular\/VTK,cjh1\/VTK,mspark93\/VTK,candy7393\/VTK,demarle\/VTK,msmolens\/VTK,SimVascular\/VTK,biddisco\/VTK,daviddoria\/PointGraphsPhase1,jeffbaumes\/jeffbaumes-vtk,berendkleinhaneveld\/VTK,demarle\/VTK,gram526\/VTK,ashray\/VTK-EVM,demarle\/VTK,cjh1\/VTK,mspark93\/VTK,hendradarwin\/VTK,hendradarwin\/VTK,hendradarwin\/VTK,spthaolt\/VTK,candy7393\/VTK,johnkit\/vtk-dev,candy7393\/VTK,sumedhasingla\/VTK,sumedhasingla\/VTK,keithroe\/vtkoptix,ashray\/VTK-EVM,demarle\/VTK,ashray\/VTK-EVM,gram526\/VTK,SimVascular\/VTK,berendkleinhaneveld\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,sumedhasingla\/VTK,arnaudgelas\/VTK,msmolens\/VTK,johnkit\/vtk-dev,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,gram526\/VTK,sankhesh\/VTK,jmerkow\/VTK,msmolens\/VTK,hendradarwin\/VTK,jmerkow\/VTK,cjh1\/VTK,candy7393\/VTK,ashray\/VTK-EVM,naucoin\/VTKSlicerWidgets,mspark93\/VTK,cjh1\/VTK,msmolens\/VTK,aashish24\/VTK-old,naucoin\/VTKSlicerWidgets","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Infovis\/vtkPCorrelativeStatistics.h\n+++ Infovis\/vtkPCorrelativeStatistics.h\n@@ -28,7 +28,7 @@\n \n class vtkMultiProcessController;\n \n-class VTK_EXPORT vtkPCorrelativeStatistics : public vtkCorrelativeStatistics\n+class VTK_INFOVIS_EXPORT vtkPCorrelativeStatistics : public vtkCorrelativeStatistics\n {\n public:\n static vtkPCorrelativeStatistics* New();\n"} {"commit":"97b82463b4e97a4589fd154396a77b5a3bd96c10","subject":"fix segfault when removing frames","message":"fix segfault when removing frames\n","repos":"mikedlowis\/afm,mikedlowis-prototypes\/afm,mikedlowis-prototypes\/afm,mikedlowis-prototypes\/afm,mikedlowis\/afm,mikedlowis\/afm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- source\/screen.c\n+++ source\/screen.c\n@@ -74,6 +74,7 @@\n list_node_t* doomed_node = state_get_focused_node();\n list_node_t* new_focus = doomed_node->next;\n if(new_focus == NULL) new_focus = Frame_List->tail;\n+ mem_retain(doomed_node);\n list_delete_node(Frame_List, doomed_node);\n state_set_focused_node(new_focus);\n state_set_refresh_state(REFRESH_ALL_WINS);\n@@ -193,9 +194,9 @@\n stoopid_redraw(ffoc, fpre);\n }else{\n list_node_t* prev = Frame_List->tail;\n- list_node_t* new_node = NULL;\n Frame_T* ffoc = (Frame_T*)focused->contents;\n Frame_T* fpre = (Frame_T*)prev->contents;\n+ list_node_t* new_node = NULL;\n mem_retain(ffoc);\n mem_retain(fpre);\n list_delete_node(Frame_List, focused);\n"} {"commit":"5c690fe9d20c242c4338f5885ceea4f198c8cd8a","subject":"Very early work on loading features from TNT files.","message":"Very early work on loading features from TNT files.\n","repos":"mackron\/openta,mackron\/openta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/ta_tnt.c\n+++ source\/ta_tnt.c\n@@ -282,21 +282,41 @@\n \n \n \n+ \/\/\/\/ Features \/\/\/\/\n+\n+ if (!ta_hpi_seek(pFile, specialItemsPtr, ta_hpi_seek_origin_start)) {\n+ goto on_error;\n+ }\n+\n+ for (uint32_t iSpecialItem = 0; iSpecialItem < specialItemsCount; ++iSpecialItem) {\n+ if (!ta_hpi_seek(pFile, 4, ta_hpi_seek_origin_current)) {\n+ goto on_error;\n+ }\n+\n+ char featureName[128];\n+ if (!ta_hpi_read(pFile, featureName, 128, NULL)) {\n+ goto on_error;\n+ }\n+\n+ printf(\"%s\\n\", featureName);\n+ }\n+\n+\n \n \n \/\/\/\/ Minimap \/\/\/\/\n \n \/\/ The minimap is a maximum of 252 x 252. We will use a 256x256 texture to keep it a power of 2.\n if (!ta_hpi_seek(pFile, minimapPtr, ta_hpi_seek_origin_start)) {\n- return NULL;\n+ goto on_error;\n }\n \n if (!ta_hpi_read(pFile, &pTNT->minimapWidth, 4, NULL)) {\n- return NULL;\n+ goto on_error;\n }\n \n if (!ta_hpi_read(pFile, &pTNT->minimapHeight, 4, NULL)) {\n- return NULL;\n+ goto on_error;\n }\n \n uint32_t minimapTextureWidth = ta_next_power_of_2(pTNT->minimapWidth);\n"} {"commit":"93ca0f8285d773357b05ec619a2a4c3fb173c4da","subject":"build: Update to 2.0.23-rc2","message":"build: Update to 2.0.23-rc2","repos":"diydrones\/apm_planner,diydrones\/apm_planner,kellyschrock\/apm_planner,mirkix\/apm_planner,kellyschrock\/apm_planner,kellyschrock\/apm_planner,kellyschrock\/apm_planner,diydrones\/apm_planner,dcarpy\/apm_planner,kellyschrock\/apm_planner,dcarpy\/apm_planner,dcarpy\/apm_planner,dcarpy\/apm_planner,mirkix\/apm_planner,diydrones\/apm_planner,dcarpy\/apm_planner,kellyschrock\/apm_planner,diydrones\/apm_planner,mirkix\/apm_planner,dcarpy\/apm_planner,mirkix\/apm_planner,mirkix\/apm_planner,mirkix\/apm_planner,diydrones\/apm_planner","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/configuration.h\n+++ src\/configuration.h\n@@ -15,7 +15,7 @@\n #define WITH_TEXT_TO_SPEECH 1\n \n #define QGC_APPLICATION_NAME \"APM Planner\"\n-#define QGC_APPLICATION_VERSION \"v2.0.23-rc1\"\n+#define QGC_APPLICATION_VERSION \"v2.0.23-rc2\"\n #define APP_DATA_DIRECTORY \"\/apmplanner2\"\n #define LOG_DIRECTORY \"\/dataflashLogs\"\n #define PARAMETER_DIRECTORY \"\/parameters\"\n"} {"commit":"c6543bd68a42d8355bd5386211c8980a60f900f7","subject":"Report an error if gabble can't publish location to a non PEP capable server","message":"Report an error if gabble can't publish location to a non PEP capable server\n","repos":"community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conn-location.c\n+++ src\/conn-location.c\n@@ -152,6 +152,15 @@\n \n TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED ((TpBaseConnection *) conn,\n context);\n+\n+ if (!(conn->features & GABBLE_CONNECTION_FEATURES_PEP))\n+ {\n+ GError error = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,\n+ \"Server does not support PEP, cannot publish geolocation\" };\n+\n+ dbus_g_method_return_error (context, &error);\n+ return;\n+ }\n \n gabble_connection_ensure_capabilities (conn, PRESENCE_CAP_GEOLOCATION);\n msg = pubsub_make_publish_msg (NULL, NS_GEOLOC, NS_GEOLOC, \"geoloc\",\n"} {"commit":"acbeead22ab9ffaac80cd782126bfd4b50b8ca69","subject":"Disable SQLite2 code in cats.h","message":"Disable SQLite2 code in cats.h\n","repos":"rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- bacula\/src\/cats\/cats.h\n+++ bacula\/src\/cats\/cats.h\n@@ -87,6 +87,7 @@\n \n #if defined(BUILDING_CATS)\n #ifdef HAVE_SQLITE\n+#error \"SQLite2 is now deprecated, use SQLite3 instead.\"\n \n #define BDB_VERSION 11\n \n"} {"commit":"799d9632011ca00a3455270f0816a09d956abb62","subject":"Actually deleted cc.h ","message":"Actually deleted cc.h \n\n","repos":"BookChan\/mlpack,datachand\/mlpack,palashahuja\/mlpack,Azizou\/mlpack,stereomatchingkiss\/mlpack,trungda\/mlpack,minhpqn\/mlpack,theranger\/mlpack,ranjan1990\/mlpack,bmswgnp\/mlpack,stereomatchingkiss\/mlpack,darcyliu\/mlpack,theranger\/mlpack,ajjl\/mlpack,theranger\/mlpack,thirdwing\/mlpack,thirdwing\/mlpack,chenmoshushi\/mlpack,ranjan1990\/mlpack,chenmoshushi\/mlpack,lezorich\/mlpack,datachand\/mlpack,ranjan1990\/mlpack,BookChan\/mlpack,BookChan\/mlpack,thirdwing\/mlpack,Azizou\/mlpack,ersanliqiao\/mlpack,lezorich\/mlpack,ajjl\/mlpack,trungda\/mlpack,erubboli\/mlpack,ersanliqiao\/mlpack,bmswgnp\/mlpack,bmswgnp\/mlpack,palashahuja\/mlpack,chenmoshushi\/mlpack,palashahuja\/mlpack,trungda\/mlpack,Azizou\/mlpack,erubboli\/mlpack,darcyliu\/mlpack,minhpqn\/mlpack,darcyliu\/mlpack,ersanliqiao\/mlpack,ajjl\/mlpack,datachand\/mlpack,lezorich\/mlpack,erubboli\/mlpack,minhpqn\/mlpack,stereomatchingkiss\/mlpack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fastlib\/branches\/fastlib-stl\/fastlib\/base\/cc.h\n+++ fastlib\/branches\/fastlib-stl\/fastlib\/base\/cc.h\n@@ -1,5 +0,0 @@\n-#ifndef BASE_CC_H\n-#define BASE_CC_H\n-#include <algorithm>\n-#include <limits> \n-#endif\n"} {"commit":"af75c0b7c69710ac512d97d9054a96d71b4f6b61","subject":"string_to_list don't add an empty entry from the end of the string","message":"string_to_list don't add an empty entry from the end of the string\n","repos":"ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/source\/library\/globus_list.c\n+++ common\/source\/library\/globus_list.c\n@@ -745,7 +745,7 @@\n globus_list_insert(&list, globus_libc_strdup(entry)); \n entry = ptr + 1;\n }\n- if(ptr == NULL)\n+ if(ptr == NULL && *entry != '\\0')\n {\n globus_list_insert(&list, globus_libc_strdup(entry)); \n } \n"} {"commit":"f9dfe4e59f16025f1c3a2d22a910c9b026e211d3","subject":"baseboard\/kukui\/emmc.c: Format with clang-format","message":"baseboard\/kukui\/emmc.c: Format with clang-format\n\nBUG=b:236386294\nBRANCH=none\nTEST=none\n\nChange-Id: If592118257f725b989fef6fd7710f184315a1369\nSigned-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3727922\nReviewed-by: Jeremy Bettis <4df7b5147fee087dca33c181f288ee7dbf56e022@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- baseboard\/kukui\/emmc.c\n+++ baseboard\/kukui\/emmc.c\n@@ -43,8 +43,8 @@\n \n #include \"bootblock_data.h\"\n \n-#define CPRINTS(format, args...) cprints(CC_SPI, format, ## args)\n-#define CPRINTF(format, args...) cprintf(CC_SPI, format, ## args)\n+#define CPRINTS(format, args...) cprints(CC_SPI, format, ##args)\n+#define CPRINTF(format, args...) cprintf(CC_SPI, format, ##args)\n \n #if EMMC_SPI_PORT == 1\n #define STM32_SPI_EMMC_REGS STM32_SPI1_REGS\n@@ -68,7 +68,7 @@\n \n \/* 1024 bytes circular buffer is enough for ~0.6ms @ 13Mhz. *\/\n #define SPI_RX_BUF_BYTES 1024\n-#define SPI_RX_BUF_WORDS (SPI_RX_BUF_BYTES\/4)\n+#define SPI_RX_BUF_WORDS (SPI_RX_BUF_BYTES \/ 4)\n static uint32_t in_msg[SPI_RX_BUF_WORDS];\n \n \/* Macros to advance in the circular buffer. *\/\n@@ -92,7 +92,7 @@\n static const struct dma_option dma_rx_option = {\n \tSTM32_DMAC_SPI_EMMC_RX, (void *)&STM32_SPI_EMMC_REGS->dr,\n \tSTM32_DMA_CCR_MSIZE_8_BIT | STM32_DMA_CCR_PSIZE_8_BIT |\n-\tSTM32_DMA_CCR_CIRC\n+\t\tSTM32_DMA_CCR_CIRC\n };\n \n \/* Setup DMA to transfer bootblock. *\/\n@@ -123,7 +123,7 @@\n \t *\/\n \tstart = __hw_clock_source_read();\n \twhile (STM32_SPI_EMMC_REGS->sr & STM32_SPI_SR_FTLVL &&\n-\t\t\t__hw_clock_source_read() - start < timeout)\n+\t __hw_clock_source_read() - start < timeout)\n \t\t;\n \n \t\/* Then flush SPI FIFO, and make sure DAT line stays idle (high). *\/\n@@ -152,8 +152,8 @@\n \t\/* Number of leading ones. *\/\n \tshift0 = __builtin_clz(~data[0]);\n \n-\tdata[0] = (data[0] << shift0) | (data[1] >> (32-shift0));\n-\tdata[1] = (data[1] << shift0) | (data[2] >> (32-shift0));\n+\tdata[0] = (data[0] << shift0) | (data[1] >> (32 - shift0));\n+\tdata[1] = (data[1] << shift0) | (data[2] >> (32 - shift0));\n \n \tif (data[0] == 0x40000000 && data[1] == 0x0095ffff) {\n \t\t\/* 400000000095 GO_IDLE_STATE *\/\n@@ -176,7 +176,6 @@\n \tCPRINTS(\"eMMC error\");\n \treturn EMMC_ERROR;\n }\n-\n \n \/*\n * Wake the EMMC task when there is a falling edge on the CMD line, so that we\n"} {"commit":"50a4f6d97b0fa8da29b944f4782f5e3ab86365e7","subject":"primitives: fixed flag detection for sign functions","message":"primitives: fixed flag detection for sign functions\n","repos":"eledoux\/FreeRDP,mcnestrb\/FreeRDP,ilammy\/FreeRDP,tc-anssi\/FreeRDP,erbth\/FreeRDP,eledoux\/FreeRDP,massuda-marcelo\/FreeRDP,clivest\/FreeRDP,nfedera\/FreeRDP,Testinos\/Freerdp,realjiangms\/FreeRDP,rjcorrig\/FreeRDP,llyzs\/FreeRDP,FreeRDP\/FreeRDP,peterh\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,everhopingandwaiting\/FreeRDP,daneshih1125\/FreeRDP,Distrotech\/FreeRDP,oshogbo\/FreeRDP,ondrejholy\/FreeRDP,ssieb\/FreeRDP,aballier\/FreeRDP,erbth\/FreeRDP,ondrejholy\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,mcnestrb\/FreeRDP,vaginessa\/FreeRDP,awakecoding\/FreeRDP,tinixx\/FreeRDP,rjcorrig\/FreeRDP,aballier\/FreeRDP,cedrozor\/FreeRDP,ssieb\/FreeRDP,awakecoding\/FreeRDP,colemickens\/FreeRDP,xproax\/FreeRDP,FreeRDP\/FreeRDP,ssieb\/FreeRDP,tinixx\/FreeRDP,daneshih1125\/FreeRDP,ivan-83\/FreeRDP,bceverly\/FreeRDP,colemickens\/FreeRDP,eledoux\/FreeRDP,MartinHaimberger\/FreeRDP,massuda-marcelo\/FreeRDP,vworkspace\/FreeRDP,eledoux\/FreeRDP,llyzs\/FreeRDP,oshogbo\/FreeRDP,FreeRDP\/FreeRDP,aballier\/FreeRDP,yurashek\/FreeRDP,hyacinthes\/FreeRDP,weinyzhou\/FreeRDP,vaginessa\/FreeRDP,ilammy\/FreeRDP,dvincent-devolutions\/FreeRDP,daneshih1125\/FreeRDP,peterh\/FreeRDP,hyacinthes\/FreeRDP,bjcollins\/FreeRDP,Testinos\/Freerdp,ondrejholy\/FreeRDP,kingland\/FreeRDP,bjcollins\/FreeRDP,colemickens\/FreeRDP,tc-anssi\/FreeRDP,Testinos\/Freerdp,yurashek\/FreeRDP,dvincent-devolutions\/FreeRDP,eledoux\/FreeRDP,tinixx\/FreeRDP,DavBfr\/FreeRDP,takenit2far\/FreeRDP,cedrozor\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP,bsagal\/FreeRDP,briggsbog\/FreeRDP,aballier\/FreeRDP,llyzs\/FreeRDP,lmcro\/FreeRDP,eledoux\/FreeRDP,FreeRDP\/FreeRDP,vworkspace\/FreeRDP,tc-anssi\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,nfedera\/FreeRDP,RangeeGmbH\/FreeRDP,kingland\/FreeRDP,RolKau\/FreeRDP,bmiklautz\/FreeRDP,Devolutions\/FreeRDP,xproax\/FreeRDP,MartinHaimberger\/FreeRDP,ivan-83\/FreeRDP,Distrotech\/FreeRDP,briggsbog\/FreeRDP,Testinos\/Freerdp,BUGgs\/FreeRDP,awakecoding\/FreeRDP,nanxiongchao\/FreeRDP,nfedera\/FreeRDP,RangeeGmbH\/FreeRDP,takenit2far\/FreeRDP,vaginessa\/FreeRDP,rjcorrig\/FreeRDP,RangeeGmbH\/FreeRDP,vworkspace\/FreeRDP,infelt\/FreeRDP,colemickens\/FreeRDP,everhopingandwaiting\/FreeRDP,kingland\/FreeRDP,xhaakon\/FreeRDP,mcnestrb\/FreeRDP,yurashek\/FreeRDP,vworkspace\/FreeRDP,ssieb\/FreeRDP,RolKau\/FreeRDP,bjcollins\/FreeRDP,infelt\/FreeRDP,massuda-marcelo\/FreeRDP,akallabeth\/FreeRDP,massuda-marcelo\/FreeRDP,nanxiongchao\/FreeRDP,Devolutions\/FreeRDP,BUGgs\/FreeRDP,zhangximin\/FreeRDP,cloudbase\/FreeRDP-dev,mcnestrb\/FreeRDP,vworkspace\/FreeRDP,Devolutions\/FreeRDP,bmiklautz\/FreeRDP,bmiklautz\/FreeRDP,ivan-83\/FreeRDP,tc-anssi\/FreeRDP,FreeRDP\/FreeRDP,zhangximin\/FreeRDP,bsagal\/FreeRDP,infelt\/FreeRDP,chipitsine\/FreeRDP,xhaakon\/FreeRDP,cloudbase\/FreeRDP-dev,briggsbog\/FreeRDP,bjcollins\/FreeRDP,clivest\/FreeRDP,akallabeth\/FreeRDP,anjoah\/FreeRDP,akallabeth\/FreeRDP,rjcorrig\/FreeRDP,llyzs\/FreeRDP,RangeeGmbH\/FreeRDP,yurashek\/FreeRDP,FreeRDP\/FreeRDP,peterh\/FreeRDP,xhaakon\/FreeRDP,cedrozor\/FreeRDP,clivest\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,cedrozor\/FreeRDP,daneshih1125\/FreeRDP,xproax\/FreeRDP,hyacinthes\/FreeRDP,daneshih1125\/FreeRDP,cedrozor\/FreeRDP,eledoux\/FreeRDP,oshogbo\/FreeRDP,Testinos\/Freerdp,llyzs\/FreeRDP,MartinHaimberger\/FreeRDP,llyzs\/FreeRDP,nfedera\/FreeRDP,awakecoding\/FreeRDP,infelt\/FreeRDP,zhangximin\/FreeRDP,realjiangms\/FreeRDP,takenit2far\/FreeRDP_SSL,ilammy\/FreeRDP,bsagal\/FreeRDP,cloudbase\/FreeRDP-dev,massuda-marcelo\/FreeRDP,ilammy\/FreeRDP,clivest\/FreeRDP,ssieb\/FreeRDP,mcnestrb\/FreeRDP,dvincent-devolutions\/FreeRDP,tc-anssi\/FreeRDP,akallabeth\/FreeRDP,xproax\/FreeRDP,xproax\/FreeRDP,oshogbo\/FreeRDP,infelt\/FreeRDP,cloudbase\/FreeRDP-dev,ssieb\/FreeRDP,Devolutions\/FreeRDP,lmcro\/FreeRDP,ssieb\/FreeRDP,cedrozor\/FreeRDP,takenit2far\/FreeRDP_SSL,everhopingandwaiting\/FreeRDP,kingland\/FreeRDP,lmcro\/FreeRDP,tinixx\/FreeRDP,vaginessa\/FreeRDP,erbth\/FreeRDP,yurashek\/FreeRDP,bjcollins\/FreeRDP,takenit2far\/FreeRDP,bsagal\/FreeRDP,ilammy\/FreeRDP,xhaakon\/FreeRDP,zhangximin\/FreeRDP,bmiklautz\/FreeRDP,cloudbase\/FreeRDP-dev,daneshih1125\/FreeRDP,bsagal\/FreeRDP,aballier\/FreeRDP,daneshih1125\/FreeRDP,nanxiongchao\/FreeRDP,vworkspace\/FreeRDP,ssieb\/FreeRDP,zavadovsky\/FreeRDP,zhangximin\/FreeRDP,everhopingandwaiting\/FreeRDP,RolKau\/FreeRDP,realjiangms\/FreeRDP,hyacinthes\/FreeRDP,zavadovsky\/FreeRDP,oshogbo\/FreeRDP,anjoah\/FreeRDP,takenit2far\/FreeRDP_SSL,realjiangms\/FreeRDP,lmcro\/FreeRDP,yurashek\/FreeRDP,colemickens\/FreeRDP,cloudbase\/FreeRDP-dev,lmcro\/FreeRDP,MartinHaimberger\/FreeRDP,MartinHaimberger\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,realjiangms\/FreeRDP,lmcro\/FreeRDP,Devolutions\/FreeRDP,nfedera\/FreeRDP,tinixx\/FreeRDP,ondrejholy\/FreeRDP,rjcorrig\/FreeRDP,rjcorrig\/FreeRDP,Devolutions\/FreeRDP,briggsbog\/FreeRDP,xhaakon\/FreeRDP,anjoah\/FreeRDP,vworkspace\/FreeRDP,mfleisz\/FreeRDP,BUGgs\/FreeRDP,kingland\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,everhopingandwaiting\/FreeRDP,ivan-83\/FreeRDP,nanxiongchao\/FreeRDP,Distrotech\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,bceverly\/FreeRDP,nfedera\/FreeRDP,bceverly\/FreeRDP,llyzs\/FreeRDP,weinyzhou\/FreeRDP,erbth\/FreeRDP,bceverly\/FreeRDP,clivest\/FreeRDP,xproax\/FreeRDP,cedrozor\/FreeRDP,bsagal\/FreeRDP,bjcollins\/FreeRDP,clivest\/FreeRDP,bsagal\/FreeRDP,dvincent-devolutions\/FreeRDP,infelt\/FreeRDP,RangeeGmbH\/FreeRDP,anjoah\/FreeRDP,zavadovsky\/FreeRDP,RolKau\/FreeRDP,nanxiongchao\/FreeRDP,bmiklautz\/FreeRDP,mfleisz\/FreeRDP,BUGgs\/FreeRDP,DavBfr\/FreeRDP,dvincent-devolutions\/FreeRDP,briggsbog\/FreeRDP,mfleisz\/FreeRDP,ilammy\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,weinyzhou\/FreeRDP,RangeeGmbH\/FreeRDP,cedrozor\/FreeRDP,anjoah\/FreeRDP,weinyzhou\/FreeRDP,kingland\/FreeRDP,BUGgs\/FreeRDP,mcnestrb\/FreeRDP,lmcro\/FreeRDP,bceverly\/FreeRDP,akallabeth\/FreeRDP,massuda-marcelo\/FreeRDP,nfedera\/FreeRDP,yurashek\/FreeRDP,RangeeGmbH\/FreeRDP,bmiklautz\/FreeRDP,zhangximin\/FreeRDP,ondrejholy\/FreeRDP,takenit2far\/FreeRDP_SSL,RolKau\/FreeRDP,chipitsine\/FreeRDP,dvincent-devolutions\/FreeRDP,colemickens\/FreeRDP,weinyzhou\/FreeRDP,DavBfr\/FreeRDP,bceverly\/FreeRDP,ondrejholy\/FreeRDP,takenit2far\/FreeRDP_SSL,tc-anssi\/FreeRDP,aballier\/FreeRDP,peterh\/FreeRDP,peterh\/FreeRDP,xhaakon\/FreeRDP,awakecoding\/FreeRDP,briggsbog\/FreeRDP,kingland\/FreeRDP,awakecoding\/FreeRDP,everhopingandwaiting\/FreeRDP,realjiangms\/FreeRDP,chipitsine\/FreeRDP,chipitsine\/FreeRDP,massuda-marcelo\/FreeRDP,nanxiongchao\/FreeRDP,tc-anssi\/FreeRDP,DavBfr\/FreeRDP,briggsbog\/FreeRDP,mfleisz\/FreeRDP,peterh\/FreeRDP,awakecoding\/FreeRDP,Testinos\/Freerdp,ivan-83\/FreeRDP,tinixx\/FreeRDP,colemickens\/FreeRDP,yurashek\/FreeRDP,ivan-83\/FreeRDP,bsagal\/FreeRDP,hyacinthes\/FreeRDP,RolKau\/FreeRDP,cloudbase\/FreeRDP-dev,dvincent-devolutions\/FreeRDP,realjiangms\/FreeRDP,Distrotech\/FreeRDP,infelt\/FreeRDP,aballier\/FreeRDP,aballier\/FreeRDP,colemickens\/FreeRDP,xproax\/FreeRDP,hyacinthes\/FreeRDP,akallabeth\/FreeRDP,nanxiongchao\/FreeRDP,nanxiongchao\/FreeRDP,chipitsine\/FreeRDP,FreeRDP\/FreeRDP,vaginessa\/FreeRDP,rjcorrig\/FreeRDP,BUGgs\/FreeRDP,weinyzhou\/FreeRDP,bceverly\/FreeRDP,zhangximin\/FreeRDP,zavadovsky\/FreeRDP,weinyzhou\/FreeRDP,zavadovsky\/FreeRDP,mcnestrb\/FreeRDP,clivest\/FreeRDP,anjoah\/FreeRDP,everhopingandwaiting\/FreeRDP,MartinHaimberger\/FreeRDP,weinyzhou\/FreeRDP,xhaakon\/FreeRDP,briggsbog\/FreeRDP,RolKau\/FreeRDP,zavadovsky\/FreeRDP,massuda-marcelo\/FreeRDP,vaginessa\/FreeRDP,tinixx\/FreeRDP,peterh\/FreeRDP,Distrotech\/FreeRDP,DavBfr\/FreeRDP,BUGgs\/FreeRDP,kingland\/FreeRDP,peterh\/FreeRDP,Distrotech\/FreeRDP,ilammy\/FreeRDP,lmcro\/FreeRDP,Testinos\/Freerdp,eledoux\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,DavBfr\/FreeRDP,oshogbo\/FreeRDP,MartinHaimberger\/FreeRDP,vaginessa\/FreeRDP,realjiangms\/FreeRDP,zhangximin\/FreeRDP,takenit2far\/FreeRDP,takenit2far\/FreeRDP_SSL,mcnestrb\/FreeRDP,dvincent-devolutions\/FreeRDP,xproax\/FreeRDP,MartinHaimberger\/FreeRDP,akallabeth\/FreeRDP,infelt\/FreeRDP,rjcorrig\/FreeRDP,mfleisz\/FreeRDP,tc-anssi\/FreeRDP,bmiklautz\/FreeRDP,anjoah\/FreeRDP,vworkspace\/FreeRDP,DavBfr\/FreeRDP,takenit2far\/FreeRDP,takenit2far\/FreeRDP,daneshih1125\/FreeRDP,bjcollins\/FreeRDP,hyacinthes\/FreeRDP,erbth\/FreeRDP,takenit2far\/FreeRDP_SSL,takenit2far\/FreeRDP,Distrotech\/FreeRDP,llyzs\/FreeRDP,bceverly\/FreeRDP,RangeeGmbH\/FreeRDP,anjoah\/FreeRDP,bmiklautz\/FreeRDP,BUGgs\/FreeRDP,everhopingandwaiting\/FreeRDP,DavBfr\/FreeRDP,clivest\/FreeRDP,erbth\/FreeRDP,tinixx\/FreeRDP,ondrejholy\/FreeRDP,RolKau\/FreeRDP,zavadovsky\/FreeRDP,Distrotech\/FreeRDP,vaginessa\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/primitives\/prim_sign_opt.c\n+++ libfreerdp\/primitives\/prim_sign_opt.c\n@@ -140,7 +140,7 @@\n \t\/* Pick tuned versions if possible. *\/\n \t\/* I didn't spot an IPP version of this. *\/\n #if defined(WITH_SSE2)\n-\tif (IsProcessorFeaturePresent(PF_SSE2_INSTRUCTIONS_AVAILABLE)\n+\tif (IsProcessorFeaturePresentEx(PF_EX_SSSE3)\n \t\t\t&& IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE))\n \t{\n \t\tprims->sign_16s = ssse3_sign_16s;\n"} {"commit":"cb0966858dd1877b87c457f79e1365e697fccc19","subject":"Fix fuzzing timeout in the new IFW CPD parsing","message":"Fix fuzzing timeout in the new IFW CPD parsing\n\nLimit the number of images to an order of magnitide more than we've ever seen.\n\nFixes https:\/\/oss-fuzz.com\/testcase-detail\/4842982326534144\n","repos":"fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libfwupdplugin\/fu-ifwi-cpd-firmware.c\n+++ libfwupdplugin\/fu-ifwi-cpd-firmware.c\n@@ -38,6 +38,7 @@\n #define GET_PRIVATE(o) (fu_ifwi_cpd_firmware_get_instance_private(o))\n \n #define FU_IFWI_CPD_FIRMWARE_HEADER_MARKER 0x44504324\n+#define FU_IFWI_CPD_FIRMWARE_ENTRIES_MAX 1024\n \n typedef struct __attribute__((packed)) {\n \tguint32 header_marker;\n@@ -258,6 +259,15 @@\n \t\t\t\t G_LITTLE_ENDIAN,\n \t\t\t\t error))\n \t\treturn FALSE;\n+\tif (num_of_entries > FU_IFWI_CPD_FIRMWARE_ENTRIES_MAX) {\n+\t\tg_set_error(error,\n+\t\t\t G_IO_ERROR,\n+\t\t\t G_IO_ERROR_INVALID_DATA,\n+\t\t\t \"too many entries 0x%x, expected <= 0x%x\",\n+\t\t\t num_of_entries,\n+\t\t\t (guint)FU_IFWI_CPD_FIRMWARE_ENTRIES_MAX);\n+\t\treturn FALSE;\n+\t}\n \toffset += header_length;\n \tfor (guint32 i = 0; i < num_of_entries; i++) {\n \t\tgchar name[12] = {0x0};\n"} {"commit":"3b25d3fc96282a69f86d8a87b1f723b8850090f7","subject":"Setting title_ so it gets printed...","message":"Setting title_ so it gets printed...\n\n\ngit-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@1435 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"fskuka\/pcl,v4hn\/pcl,soulsheng\/pcl,mschoeler\/pcl,MMiknis\/pcl,ResByte\/pcl,shangwuhencc\/pcl,lebronzhang\/pcl,cascheberg\/pcl,KevenRing\/vlp,Tabjones\/pcl,Tabjones\/pcl,KevenRing\/vlp,ResByte\/pcl,pkuhto\/pcl,simonleonard\/pcl,3dtof\/pcl,3dtof\/pcl,shivmalhotra\/pcl,RufaelDev\/pcc-mp3dg,nikste\/pcl,damienjadeduff\/pcl,krips89\/pcl_newfeatures,shyamalschandra\/pcl,jeppewalther\/kinfu_segmentation,v4hn\/pcl,closerbibi\/pcl,lydhr\/pcl,lebronzhang\/pcl,cascheberg\/pcl,shangwuhencc\/pcl,fskuka\/pcl,MMiknis\/pcl,jakobwilm\/pcl,kanster\/pcl,shivmalhotra\/pcl,kanster\/pcl,damienjadeduff\/pcl,ResByte\/pcl,KevenRing\/pcl,msalvato\/pcl_kinfu_highres,chatchavan\/pcl,Tabjones\/pcl,v4hn\/pcl,locnx1984\/pcl,ipa-rmb\/pcl,pkuhto\/pcl,chenxingzhe\/pcl,fanxiaochen\/mypcltest,RufaelDev\/pcc-mp3dg,stefanbuettner\/pcl,wgapl\/pcl,zavataafnan\/pcl-truck,ipa-rmb\/pcl,soulsheng\/pcl,fskuka\/pcl,shyamalschandra\/pcl,the-glu\/pcl,soulsheng\/pcl,zhangxaochen\/pcl,wgapl\/pcl,drmateo\/pcl,sbec\/pcl,ipa-rmb\/pcl,KevenRing\/pcl,RufaelDev\/pcc-mp3dg,pkuhto\/pcl,Tabjones\/pcl,closerbibi\/pcl,Nerei\/pcl_old_repo,srbhprajapati\/pcl,srbhprajapati\/pcl,pkuhto\/pcl,ipa-rmb\/pcl,Tabjones\/pcl,mikhail-matrosov\/pcl,RufaelDev\/pcc-mp3dg,v4hn\/pcl,jakobwilm\/pcl,jakobwilm\/pcl,ipa-rmb\/pcl,DaikiMaekawa\/pcl,drmateo\/pcl,zavataafnan\/pcl-truck,ResByte\/pcl,nikste\/pcl,chenxingzhe\/pcl,simonleonard\/pcl,raydtang\/pcl,DaikiMaekawa\/pcl,MMiknis\/pcl,nh2\/pcl,nh2\/pcl,lebronzhang\/pcl,srbhprajapati\/pcl,jakobwilm\/pcl,fanxiaochen\/mypcltest,KevenRing\/pcl,DaikiMaekawa\/pcl,stfuchs\/pcl,raydtang\/pcl,simonleonard\/pcl,jeppewalther\/kinfu_segmentation,KevenRing\/pcl,drmateo\/pcl,cascheberg\/pcl,zhangxaochen\/pcl,shyamalschandra\/pcl,jeppewalther\/kinfu_segmentation,raydtang\/pcl,wgapl\/pcl,locnx1984\/pcl,zhangxaochen\/pcl,drmateo\/pcl,stfuchs\/pcl,damienjadeduff\/pcl,lydhr\/pcl,KevenRing\/pcl,nh2\/pcl,zavataafnan\/pcl-truck,chatchavan\/pcl,sbec\/pcl,Nerei\/pcl_old_repo,mschoeler\/pcl,shangwuhencc\/pcl,srbhprajapati\/pcl,shivmalhotra\/pcl,shivmalhotra\/pcl,closerbibi\/pcl,starius\/pcl,KevenRing\/vlp,sbec\/pcl,mikhail-matrosov\/pcl,kanster\/pcl,Nerei\/pcl_old_repo,sbec\/pcl,LZRS\/pcl,LZRS\/pcl,chatchavan\/pcl,3dtof\/pcl,nikste\/pcl,shyamalschandra\/pcl,DaikiMaekawa\/pcl,msalvato\/pcl_kinfu_highres,KevenRing\/vlp,stfuchs\/pcl,DaikiMaekawa\/pcl,the-glu\/pcl,chatchavan\/pcl,closerbibi\/pcl,kanster\/pcl,lebronzhang\/pcl,fanxiaochen\/mypcltest,mschoeler\/pcl,lydhr\/pcl,mschoeler\/pcl,damienjadeduff\/pcl,msalvato\/pcl_kinfu_highres,chenxingzhe\/pcl,sbec\/pcl,mikhail-matrosov\/pcl,chenxingzhe\/pcl,starius\/pcl,zhangxaochen\/pcl,stfuchs\/pcl,the-glu\/pcl,starius\/pcl,3dtof\/pcl,starius\/pcl,msalvato\/pcl_kinfu_highres,msalvato\/pcl_kinfu_highres,mschoeler\/pcl,lydhr\/pcl,Nerei\/pcl_old_repo,nh2\/pcl,cascheberg\/pcl,KevenRing\/vlp,MMiknis\/pcl,krips89\/pcl_newfeatures,lydhr\/pcl,stefanbuettner\/pcl,fanxiaochen\/mypcltest,locnx1984\/pcl,RufaelDev\/pcc-mp3dg,MMiknis\/pcl,nikste\/pcl,soulsheng\/pcl,mikhail-matrosov\/pcl,closerbibi\/pcl,locnx1984\/pcl,damienjadeduff\/pcl,nikste\/pcl,lebronzhang\/pcl,stefanbuettner\/pcl,stefanbuettner\/pcl,simonleonard\/pcl,stefanbuettner\/pcl,jakobwilm\/pcl,krips89\/pcl_newfeatures,LZRS\/pcl,shyamalschandra\/pcl,soulsheng\/pcl,drmateo\/pcl,jeppewalther\/kinfu_segmentation,krips89\/pcl_newfeatures,fskuka\/pcl,zavataafnan\/pcl-truck,shivmalhotra\/pcl,LZRS\/pcl,raydtang\/pcl,mikhail-matrosov\/pcl,zavataafnan\/pcl-truck,raydtang\/pcl,zhangxaochen\/pcl,ResByte\/pcl,fanxiaochen\/mypcltest,jeppewalther\/kinfu_segmentation,shangwuhencc\/pcl,wgapl\/pcl,cascheberg\/pcl,the-glu\/pcl,chenxingzhe\/pcl,LZRS\/pcl,locnx1984\/pcl,starius\/pcl,wgapl\/pcl,v4hn\/pcl,pkuhto\/pcl,simonleonard\/pcl,shangwuhencc\/pcl,kanster\/pcl,krips89\/pcl_newfeatures,fskuka\/pcl,the-glu\/pcl,stfuchs\/pcl,3dtof\/pcl,srbhprajapati\/pcl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- common\/include\/pcl\/common\/time.h\n+++ common\/include\/pcl\/common\/time.h\n@@ -62,6 +62,7 @@\n inline ScopeTime (const char* title)\n {\n start_time_ = boost::posix_time::second_clock::local_time();\n+ title_ = std::string(title);\n }\n \n inline ~ScopeTime ()\n"} {"commit":"7eda171f9a9f17183335d53094a6e5f6ce5450cd","subject":"There is no reason that Intvar_log_event's constructor calls Log_event::Log_event() instead of Log_event::Log_event(THD*, ...) when the event is built in the master to be written in the binlog. Rand_log_event already used the good constructor, so there really is no reason for Intvar_log_event to be an exception. This fixes a test failure of last night (which appeared after I removed a useless e.server_id=thd->server_id in log.cc; in fact this line was not useless because it hid the bad constructor). Replication tests pass, with Valgrind too.","message":"There is no reason that Intvar_log_event's constructor calls Log_event::Log_event()\ninstead of Log_event::Log_event(THD*, ...) when the event is built in the master\nto be written in the binlog.\nRand_log_event already used the good constructor, so there really is no reason\nfor Intvar_log_event to be an exception.\nThis fixes a test failure of last night (which appeared after I removed a useless\ne.server_id=thd->server_id in log.cc; in fact this line was not useless because\nit hid the bad constructor).\nReplication tests pass, with Valgrind too.\n","repos":"natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,ollie314\/server,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,slanterns\/server,natsys\/mariadb_10.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sql\/log_event.h\n+++ sql\/log_event.h\n@@ -529,7 +529,7 @@\n \n #ifndef MYSQL_CLIENT \n Intvar_log_event(THD* thd_arg,uchar type_arg, ulonglong val_arg)\n- :Log_event(),val(val_arg),type(type_arg)\n+ :Log_event(thd_arg,0,0),val(val_arg),type(type_arg)\n {}\n void pack_info(String* packet);\n int exec_event(struct st_relay_log_info* rli);\n"} {"commit":"9cf42e0d84c538b33cd25d9e8b935bf48831f26e","subject":"chatter filer update","message":"chatter filer update\n","repos":"coolio107\/squeezepi-rotaryencoder","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- squeezerotate.c\n+++ squeezerotate.c\n@@ -287,15 +287,16 @@\n }\n \n \n-static unsigned long lasttime = 0;\n+static unsigned long lasttimeVol = 0;\n static long lastVolume = 0;\n void handleVolume() {\n struct timespec thistime;\n clock_gettime(0, &thistime);\n unsigned long time = thistime.tv_sec * 10 + thistime.tv_nsec \/ (1e8);\n- if (lasttime - time < 2) {\n+ \/\/ chatter filter 200ms - disabled... called every 100ms anyway plus waits fro network action to complete\n+ \/*if (lasttimeVol - time < 2) {\n return;\n- }\n+ }*\/\n if (lastVolume != encoder->value) {\n long delta = encoder->value - lastVolume;\n printf(\"Time: %u Volume Change: %d\\n\", time, delta);\n@@ -306,7 +307,7 @@\n \/\/ accumulate non-sent commands. Is this what we want?\n if (sendCommand(fragment)) {\n lastVolume = encoder->value;\n- lasttime = time;\n+ lasttimeVol = time;\n }\n }\n }\n@@ -316,10 +317,23 @@\n \/\/handleVolume();\n }\n \n+static unsigned long lasttimePause = 0;\n+\n void buttonPress(const struct button * button, int change) {\n+ struct timespec thistime;\n+ clock_gettime(0, &thistime);\n+ unsigned long time = thistime.tv_sec * 10 + thistime.tv_nsec \/ (1e8);\n+ \/\/chatter filter 500ms\n+ if (lasttimePause - time < 5) {\n+ return;\n+ }\n+ \n printf(\"Interrupt, button value: %d change: %d\\n\", button->value, change);\n- if (button->value)\n- sendCommand(\"[\\\"pause\\\"]\");\n+ if (button->value) {\n+ if (sendCommand(\"[\\\"pause\\\"]\")) {\n+ lasttimePause = time;\n+ }\n+ }\n }\n \n \n"} {"commit":"7025ea821189d285e07c288c4bd36882e2083569","subject":"Removed \"New Rekt\" couts.","message":"Removed \"New Rekt\" couts.\n","repos":"CollegeBart\/bart-sdl-engine-h16,CollegeBart\/bart-sdl-engine-h16,CollegeBart\/bart-sdl-engine-h16","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Core\/Rekt.h\n+++ src\/Core\/Rekt.h\n@@ -6,7 +6,6 @@\n {\n \tRekt() \n \t{\n-\t\tstd::cout << \"New Rekt\" << std::endl;\n \t\tthis->x = 0.f;\n \t\tthis->y = 0.f;\n \t\tthis->w = 0.f;\n@@ -15,7 +14,6 @@\n \n \tRekt(float x, float y, float w, float h)\n \t{\n-\t\tstd::cout << \"New Rekt\" << std::endl;\n \t\tthis->x = x;\n \t\tthis->y = y;\n \t\tthis->w = w;\n@@ -24,7 +22,6 @@\n \n \tRekt(SDL_Rect* rect)\n \t{\n-\t\tstd::cout << \"New Rekt\" << std::endl;\n \t\tthis->x = (const float)rect->x;\n \t\tthis->y = (const float)rect->y;\n \t\tthis->w = (const float)rect->w;\n@@ -33,7 +30,6 @@\n \n \t~Rekt()\n \t{\n-\t\tstd::cout << \"Delete Rekt\" << std::endl;\n \t}\n \n \tclass {\n"} {"commit":"fd01e872209932fe1265109cd907ffd7ff30df41","subject":"libvortex-1.1: * [fix] Updated regression client..","message":"libvortex-1.1:\n* [fix] Updated regression client..\n","repos":"ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/vortex-regression-client.c\n+++ test\/vortex-regression-client.c\n@@ -4901,7 +4901,8 @@\n \tchar * file_name;\n \tFILE * file;\n \tint bytes_written;\n-\tint iterator = 0;\n+\tint iterator = 0;\n+\tint iterator2 = 0;\n \taxl_bool disable_log = (times == 4);\n \n \tif (amount_transferred)\n@@ -4978,7 +4979,7 @@\n \t\/* wait for all replies *\/\n \tif (! disable_log)\n \t\tprintf (\"%sTest 04-ab: waiting replies having file: %s\\n\", prefix ? prefix : \"\", file_name);\n-\titerator = 0;\n+\titerator2 = 0;\n \twhile (axl_true) {\n \t\t\/* get the next message, blocking at this call. *\/\n \t\tframe = vortex_channel_get_reply (channel, queue);\n@@ -4989,9 +4990,9 @@\n \t\t\t}\n \n \t\t\t\/* next iterator *\/\n-\t\t\titerator++;\n-\t\t\tif (iterator > 10) {\n-\t\t\t\tprintf (\"Test 04-ab: too much timeouts was received while waiting for reply... failed to continue\\n\");\n+\t\t\titerator2++;\n+\t\t\tif (iterator2 > 10) {\n+\t\t\t\tprintf (\"Test 04-ab: too much timeouts was received while waiting for reply... failed to continue (after waiting for %d times)\\n\", iterator2);\n \t\t\t\treturn axl_false;\n \t\t\t} \/* end if *\/\n \n"} {"commit":"a80f4a9a345c79a0a2171bb430c7bfdefbdf9f4e","subject":"Copy files","message":"Copy files\n","repos":"AfonsoFGarcia\/cloudfuse,AfonsoFGarcia\/cloudfuse","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cloudfsapi.c\n+++ cloudfsapi.c\n@@ -389,6 +389,10 @@\n int cloudfs_object_write_fp(const char *path, FILE *fp)\n {\n int blocks = get_file_metadata(add_dot_to_path(path));\n+\n+ FILE *log = fopen(\"\/home\/osboxes\/log.txt\", \"a\");\n+ fprintf(log, \"%d\\s\", blocks);\n+ fclose(log);\n \n int result = rebuild_file(path, fp, blocks);\n \n@@ -641,7 +645,7 @@\n \n char * srcd;\n char * dstd;\n- \n+\n if((srcd = malloc(strlen(src)+strlen(num)+1)) != NULL){\n srcd[0] = '\\0'; \/\/ ensures the memory is an empty string\n strcat(srcd,src);\n"} {"commit":"ffd3d5c6c7a20fb718daf98a6c8a476d228f3995","subject":"ALSA: pcm - remove the dead code from snd_pcm_open_file()","message":"ALSA: pcm - remove the dead code from snd_pcm_open_file()\n\nThe rpcm_file parameter is never used in current ALSA code, so remove\nit to make it cleaner.\n\nSigned-off-by: Feng Tang <7685a6702c33a8c01ef22193062cb8069601cb3e@intel.com>\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sound\/core\/pcm_native.c\n+++ sound\/core\/pcm_native.c\n@@ -2058,15 +2058,11 @@\n \n static int snd_pcm_open_file(struct file *file,\n \t\t\t struct snd_pcm *pcm,\n-\t\t\t int stream,\n-\t\t\t struct snd_pcm_file **rpcm_file)\n+\t\t\t int stream)\n {\n \tstruct snd_pcm_file *pcm_file;\n \tstruct snd_pcm_substream *substream;\n \tint err;\n-\n-\tif (rpcm_file)\n-\t\t*rpcm_file = NULL;\n \n \terr = snd_pcm_open_substream(pcm, stream, file, &substream);\n \tif (err < 0)\n@@ -2083,8 +2079,7 @@\n \t\tsubstream->pcm_release = pcm_release_private;\n \t}\n \tfile->private_data = pcm_file;\n-\tif (rpcm_file)\n-\t\t*rpcm_file = pcm_file;\n+\n \treturn 0;\n }\n \n@@ -2113,7 +2108,6 @@\n static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream)\n {\n \tint err;\n-\tstruct snd_pcm_file *pcm_file;\n \twait_queue_t wait;\n \n \tif (pcm == NULL) {\n@@ -2131,7 +2125,7 @@\n \tadd_wait_queue(&pcm->open_wait, &wait);\n \tmutex_lock(&pcm->open_mutex);\n \twhile (1) {\n-\t\terr = snd_pcm_open_file(file, pcm, stream, &pcm_file);\n+\t\terr = snd_pcm_open_file(file, pcm, stream);\n \t\tif (err >= 0)\n \t\t\tbreak;\n \t\tif (err == -EAGAIN) {\n"} {"commit":"7f2aaa210cea2c58d6fecf3d2ae57fca0b8a35cd","subject":"\u3010doc\u3011format drivers\/src\/completion.c","message":"\u3010doc\u3011format drivers\/src\/completion.c\n","repos":"geniusgogo\/rt-thread,hezlog\/rt-thread,geniusgogo\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,hezlog\/rt-thread,nongxiaoming\/rt-thread,hezlog\/rt-thread,nongxiaoming\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,RT-Thread\/rt-thread,geniusgogo\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,hezlog\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,hezlog\/rt-thread,hezlog\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/drivers\/src\/completion.c\n+++ components\/drivers\/src\/completion.c\n@@ -17,7 +17,7 @@\n \n \/**\n * @brief initialize the completion object\n- * \n+ *\n * @param completion the point of completion object\n *\/\n void rt_completion_init(struct rt_completion *completion)\n@@ -34,14 +34,14 @@\n \n \/**\n * @brief waitting for the completion done\n- * NOTE: We should not use this api when \n- * \n+ * NOTE: We should not use this api when\n+ *\n * @param completion the point of completion object\n * @param timeout is a timeout period (unit: an OS tick). If the completion is unavailable, the thread will wait for\n * the completion up to the amount of time specified by the argument.\n * NOTE: Generally, we use the macro RT_WAITING_FOREVER to set this parameter, which means that when the\n * completion is unavailable, the thread will be waitting forever.\n- * \n+ *\n * @return Return the operation status. ONLY When the return value is RT_EOK, the operation is successful.\n * If the return value is any other values, it means that the completion wait failed.\n *\/\n@@ -114,7 +114,7 @@\n \n \/**\n * @brief indicate the completion has done\n- * \n+ *\n * @param completion the point of completion object\n *\/\n void rt_completion_done(struct rt_completion *completion)\n"} {"commit":"13564eb26e349f598dfe006aab30d2cc30f1fed9","subject":"obsolete line","message":"obsolete line\n","repos":"rpavlik\/chromium,rpavlik\/chromium,rpavlik\/chromium,rpavlik\/chromium,rpavlik\/chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- spu\/pack\/packspu_pixel.c\n+++ spu\/pack\/packspu_pixel.c\n@@ -1,9 +1,8 @@\n \/* Copyright (c) 2001, Stanford University\n-\tAll rights reserved.\n+ All rights reserved.\n \n-\tSee the file LICENSE.txt for information on redistributing this software. *\/\n+ See the file LICENSE.txt for information on redistributing this software. *\/\n \t\n-\/* DO NOT EDIT - AUTOMATICALLY GENERATED BY packspu_pixel.py *\/\n #include <stdio.h>\n #include \"packspu.h\"\n #include \"cr_packfunctions.h\"\n"} {"commit":"8962cc96ec2bc1eb561a438512adc5042e2c8d34","subject":"i965: Use nir_opt_trivial_continues and nir_opt_if","message":"i965: Use nir_opt_trivial_continues and nir_opt_if\n\nReviewed-by: Timothy Arceri <5dd83789ef3714029244367ba1ca09f1d7627408@collabora.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/i965\/brw_nir.c\n+++ src\/mesa\/drivers\/dri\/i965\/brw_nir.c\n@@ -429,6 +429,15 @@\n OPT(nir_opt_algebraic);\n OPT(nir_opt_constant_folding);\n OPT(nir_opt_dead_cf);\n+ if (OPT(nir_opt_trivial_continues)) {\n+ \/* If nir_opt_trivial_continues makes progress, then we need to clean\n+ * things up if we want any hope of nir_opt_if or nir_opt_loop_unroll\n+ * to make progress.\n+ *\/\n+ OPT(nir_copy_prop);\n+ OPT(nir_opt_dce);\n+ }\n+ OPT(nir_opt_if);\n if (nir->options->max_unroll_iterations != 0) {\n OPT(nir_opt_loop_unroll, indirect_mask);\n }\n"} {"commit":"08a869f36f84ef5536cea00512e19ea6277648ba","subject":"Added :x","message":"Added :x\n","repos":"bobrippling\/uvi,bobrippling\/uvi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -100,7 +100,7 @@\n \t\treturn;\n \t}\n \n-\tif(!strcmp(argv[0], \"wq\"))\n+\tif(!strcmp(argv[0], \"wq\") || !strcmp(argv[0], \"x\"))\n \t\tafter = QUIT;\n \telse if(!strcmp(argv[0], \"we\"))\n \t\tafter = EDIT;\n@@ -110,7 +110,7 @@\n \tif(argc > 1 && argv[1][0] == '!'){\n \t\t\/* pipe *\/\n \t\tchar *cmd = argv_to_str(argc, argv);\n-\t\tchar *bang = strchr(cmd, '!') + 1;\n+\t\tchar *bang = cmd + 1;\n \n \t\tshellout(bang, buffer_gethead(global_buffer));\n \n@@ -406,6 +406,7 @@\n \t\t{ \"!\", cmd_bang },\n \t\t{ \"we\", cmd_w },\n \t\t{ \"wq\", cmd_w },\n+\t\t{ \"x\", cmd_w },\n \t\tCMD(r),\n \t\tCMD(w),\n \t\tCMD(q),\n"} {"commit":"7c2db18667fb17ab79573865dd693794bad403cd","subject":"Allow ^L in source code","message":"Allow ^L in source code\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"df9d50815831b8106c8c9486d278baf5c8466eeb","subject":"Some bug fixes (some of which hg erased before) to fs2.c. Still no commit on rest of tree.","message":"Some bug fixes (some of which hg erased before) to fs2.c. Still no commit on rest of tree.\n\n","repos":"wingyplus\/wmii,sigmavirus24\/wmii,sigmavirus24\/wmii,wingyplus\/wmii,jerluc\/wmii,darkfeline\/wmii,jerluc\/wmii,rvedam\/wmii,Sirikid\/wmii,sigmavirus24\/wmii,jerluc\/wmii,darkfeline\/wmii,darkfeline\/wmii,Sirikid\/wmii,jerluc\/wmii,wingyplus\/wmii,Sirikid\/wmii,Sirikid\/wmii,wingyplus\/wmii,rvedam\/wmii,sigmavirus24\/wmii,wingyplus\/wmii,rvedam\/wmii,rvedam\/wmii,jerluc\/wmii,darkfeline\/wmii,rvedam\/wmii,Sirikid\/wmii,sigmavirus24\/wmii,darkfeline\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wm\/fs2.c\n+++ cmd\/wm\/fs2.c\n@@ -16,6 +16,8 @@\n };\n \n #define QID(t, i) (((long long)((t)&0xFF)<<32)|((i)&0xFFFFFFFF))\n+\/* Will I ever need these macros?\n+ * I don't think so. *\/\n #define TYPE(q) ((q)>>32&0xFF)\n #define ID(q) ((q)&0xFFFFFFFF)\n \n@@ -58,6 +60,8 @@\n static void dostat(Stat *s, unsigned int len, FileId *f);\n FileId *free_fileid = nil;\n \n+\/* ad-hoc file tree. Empty names (\"\") indicate a dynamic entry to be filled\n+ * in by lookup_file *\/\n static Dirtab\n dirtabroot[]=\t{{\".\",\t\tQTDIR,\t\tFsRoot,\t\t0500|DMDIR },\n \t\t {\"rbar\",\tQTDIR,\t\tFsDRBar,\t0700|DMDIR },\n@@ -77,7 +81,7 @@\n \t\t {\"ctl\",\tQTAPPEND,\tFsFCctl,\t0200|DMAPPEND },\n \t\t {\"props\",\tQTFILE,\t\tFsFprops,\t0400 },\n \t\t {nil}},\n-dirtabsclient[]={{\".\",\t\tQTDIR,\t\tFsDClient,\t0500|DMDIR },\n+dirtabsclient[]={{\".\",\t\tQTDIR,\t\tFsDSClient,\t0500|DMDIR },\n \t\t {\"ctl\",\tQTAPPEND,\tFsFCctl,\t0200|DMAPPEND },\n \t\t {\"index\",\tQTFILE,\t\tFsFCindex,\t0400 },\n \t\t {\"props\",\tQTFILE,\t\tFsFprops,\t0400 },\n@@ -95,6 +99,9 @@\n \t\t {\"ctl\",\tQTAPPEND,\tFsFTctl,\t0200|DMAPPEND },\n \t\t {\"index\",\tQTFILE,\t\tFsFTindex,\t0400 },\n \t\t {nil}};\n+\/* Writing the lists separately and using an array of their references\n+ * removes the need for casting and allows for C90 conformance,\n+ * since otherwise we would need to use compound literals *\/\n static Dirtab *dirtab[] = {\n \t[FsRoot]\tdirtabroot,\n \t[FsDRBar]\tdirtabbar,\n@@ -106,6 +113,9 @@\n \t[FsDTag]\tdirtabtag\n };\n \n+\/* get_file\/free_file save and reuse old FileId structs\n+ * since so many of them are needed for so many\n+ * purposes *\/\n static FileId *\n get_file() {\n \tFileId *temp;\n@@ -129,6 +139,8 @@\n \tfree_fileid = f;\n }\n \n+\/* All lookups and directory organization should be performed through\n+ * lookup_file, mostly through the dirtabs[] tree. *\/\n static FileId *\n lookup_file(FileId *parent, char *name)\n {\n@@ -143,31 +155,6 @@\n \tFileId *ret = nil, *temp, **last = &ret;\n \n \tfor(; dir->name; dir++) {\n-\t\tif(!name || !strcmp(name, dir->name)) {\n-\t\t\ttemp = get_file();\n-\t\t\t*last = temp;\n-\t\t\tlast = &temp->next;\n-\t\t\ttemp->id = 0;\n-\t\t\ttemp->ref = nil;\n-\t\t\ttemp->tab = *dir;\n-\n-\t\t\tswitch(temp->tab.type) {\n-\t\t\tcase FsDLBar:\n-\t\t\t\ttemp->ref = lbar;\n-\t\t\t\tbreak;\n-\t\t\tcase FsDRBar:\n-\t\t\t\ttemp->ref = rbar;\n-\t\t\t\tbreak;\n-\t\t\tcase FsFColRules:\n-\t\t\t\ttemp->ref = vrule;\n-\t\t\t\tbreak;\n-\t\t\tcase FsFTagRules:\n-\t\t\t\ttemp->ref = trule;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif(name)\n-\t\t\t\tbreak;\n-\t\t}else\n \t\tif(!*dir->name) { \/* strlen(dir->name) == 0 *\/\n \t\t\tswitch(parent->tab.type) {\n \t\t\tcase FsDClients:\n@@ -182,27 +169,30 @@\n \t\t\t\t\t\ttemp->tab = *dirtab[FsDSClient];\n \t\t\t\t\t\ttemp->tab.name = strdup(\"sel\");\n \t\t\t\t\t}\n-\t\t\t\t}else{\n-\t\t\t\t\tif(name) {\n-\t\t\t\t\t\tid = (unsigned int)strtol(name, &name, 10);\n-\t\t\t\t\t\tif(*name)\n-\t\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t}\n-\n-\t\t\t\t\tfor(c=client; c; c=c->next) {\n-\t\t\t\t\t\tif(name && c->id != id)\n-\t\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t\ttemp = get_file();\n-\t\t\t\t\t\t*last = temp;\n-\t\t\t\t\t\tlast = &temp->next;\n-\t\t\t\t\t\ttemp->ref = c;\n-\t\t\t\t\t\ttemp->id = c->id;\n-\t\t\t\t\t\ttemp->tab = *dirtab[FsDClient];\n-\t\t\t\t\t\tasprintf(&temp->tab.name, \"%d\", i);\n-\t\t\t\t\t\tif(name)\n-\t\t\t\t\t\t\tgoto LastItem;\n-\t\t\t\t\t}\n-\t\t\t\t}\n+\t\t\t\t\tif(name)\n+\t\t\t\t\t\tgoto LastItem;\n+\t\t\t\t}\n+\t\t\t\tif(name) {\n+\t\t\t\t\tid = (unsigned int)strtol(name, &name, 10);\n+\t\t\t\t\tif(*name)\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\n+\t\t\t\ti=0;\n+\t\t\t\tfor(c=client; c; c=c->next, i++) {\n+\t\t\t\t\tif(name && i != id)\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t\ttemp = get_file();\n+\t\t\t\t\t*last = temp;\n+\t\t\t\t\tlast = &temp->next;\n+\t\t\t\t\ttemp->ref = c;\n+\t\t\t\t\ttemp->id = c->id;\n+\t\t\t\t\ttemp->tab = *dirtab[FsDClient];\n+\t\t\t\t\tasprintf(&temp->tab.name, \"%d\", i);\n+\t\t\t\t\tif(name)\n+\t\t\t\t\t\tgoto LastItem;\n+\t\t\t\t}\n+\t\t\t\tbreak;\n \t\t\tcase FsDTags:\n \t\t\t\tif(!name || !strncmp(name, \"sel\", 4)) {\n \t\t\t\t\tif(sel) {\n@@ -214,18 +204,23 @@\n \t\t\t\t\t\ttemp->tab = *dirtab[FsDTag];\n \t\t\t\t\t\ttemp->tab.name = strdup(\"sel\");\n \t\t\t\t\t}\n-\t\t\t\t}else{\n-\t\t\t\t\tfor(v=view; v; v=v->next) {\n-\t\t\t\t\t\tif(name && strcmp(name, v->name))\n-\t\t\t\t\t\t\tcontinue;\n-\t\t\t\t\t\ttemp = get_file();\n-\t\t\t\t\t\t*last = temp;\n-\t\t\t\t\t\tlast = &temp->next;\n-\t\t\t\t\t\ttemp->ref = v;\n-\t\t\t\t\t\ttemp->id = v->id;\n-\t\t\t\t\t\ttemp->tab.name = strdup(v->name);\n-\t\t\t\t\t}\n-\t\t\t\t}\n+\t\t\t\t\tif(name)\n+\t\t\t\t\t\tgoto LastItem;\n+\t\t\t\t}\n+\t\t\t\tfor(v=view; v; v=v->next) {\n+\t\t\t\t\tif(name && strcmp(name, v->name))\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t\ttemp = get_file();\n+\t\t\t\t\t*last = temp;\n+\t\t\t\t\tlast = &temp->next;\n+\t\t\t\t\ttemp->ref = v;\n+\t\t\t\t\ttemp->id = v->id;\n+\t\t\t\t\ttemp->tab = *dirtab[FsDTag];\n+\t\t\t\t\ttemp->tab.name = strdup(v->name);\n+\t\t\t\t\tif(name)\n+\t\t\t\t\t\tgoto LastItem;\n+\t\t\t\t}\n+\t\t\t\tbreak;\n \t\t\tcase FsDRBar:\n \t\t\tcase FsDLBar:\n \t\t\t\tfor(b=parent->ref; b; b=b->next) {\n@@ -237,11 +232,36 @@\n \t\t\t\t\t\ttemp->id = b->id;\n \t\t\t\t\t\ttemp->tab = dirtab[FsDRBar][1];\n \t\t\t\t\t\ttemp->tab.name = strdup(b->name);\n+\t\t\t\t\t\tif(name)\n+\t\t\t\t\t\t\tgoto LastItem;\n \t\t\t\t\t}\n \t\t\t\t}\n+\t\t\t}\n+\t\t}else\n+\t\tif(!name || !strcmp(name, dir->name)) {\n+\t\t\ttemp = get_file();\n+\t\t\t*last = temp;\n+\t\t\tlast = &temp->next;\n+\t\t\ttemp->id = 0;\n+\t\t\ttemp->ref = nil;\n+\t\t\ttemp->tab = *dir;\n+\n+\t\t\tswitch(temp->tab.type) {\n+\t\t\tcase FsDLBar:\n+\t\t\t\ttemp->ref = lbar;\n+\t\t\t\tbreak;\n+\t\t\tcase FsDRBar:\n+\t\t\t\ttemp->ref = rbar;\n+\t\t\t\tbreak;\n+\t\t\tcase FsFColRules:\n+\t\t\t\ttemp->ref = vrule;\n+\t\t\t\tbreak;\n+\t\t\tcase FsFTagRules:\n+\t\t\t\ttemp->ref = trule;\n+\t\t\t\tbreak;\n \t\t\t}\n \t\t\tif(name)\n-\t\t\t\tgoto LastItem;\n+\t\t\t\tbreak;\n \t\t}\n \t}\n LastItem:\n@@ -273,7 +293,7 @@\n \t\t\tnf=f->next;\n \t\t\tfree_file(f);\n \t\t}\n-\t\trespond(r, Enofile);\n+\t\treturn respond(r, Enofile);\n \t}\n \n \tr->newfid->aux = f;\n@@ -312,6 +332,10 @@\n \trespond(r, nil);\n }\n \n+\/* This should probably be factored out like lookup_file\n+ * so we can use it to get size for stats and not write\n+ * data anywhere. -KM *\/\n+\/* This is obviously not a priority, however. -KM *\/\n void\n fs_read(Req *r) {\n \tunsigned char *buf;\n@@ -327,16 +351,16 @@\n \t\tr->ofcall.data = buf;\n \n \t\tf = lookup_file(f, nil);\n-\t\t\/* f->tab.name == \".\"; goto next *\/\n+\t\t\/* Note: f->tab.name == \".\"; goto next *\/\n \t\tfor(f=f->next; f; f=f->next) {\n \t\t\tdostat(&s, 0, f);\n \t\t\tn = ixp_sizeof_stat(&s);\n-\t\t\toffset += n;\n \t\t\tif(offset >= r->ifcall.offset) {\n \t\t\t\tif(size < n)\n \t\t\t\t\tbreak;\n \t\t\t\tixp_pack_stat(&buf, &size, &s);\n \t\t\t}\n+\t\t\toffset += n;\n \t\t}\n \n \t\twhile((tf = f)) {\n@@ -347,6 +371,7 @@\n \t\tr->ofcall.count = r->ifcall.count - size;\n \t\trespond(r, nil);\n \t}else{\n+\t\t\/* Read normal files *\/\n \t}\n }\n \n@@ -362,15 +387,7 @@\n \trespond(r, nil);\n }\n \n-void\n-fs_remove(Req *r) {\n-\trespond(r, \"not implemented\");\n-}\n-\n-void\n-fs_write(Req *r) {\n-\trespond(r, \"not implemented\");\n-}\n+\/* fs_* functions below here are yet to be properly implemented *\/\n \n void\n fs_open(Req *r) {\n@@ -381,10 +398,21 @@\n }\n \n void\n+fs_remove(Req *r) {\n+\trespond(r, \"not implemented\");\n+}\n+\n+void\n+fs_write(Req *r) {\n+\trespond(r, \"not implemented\");\n+}\n+\n+void\n fs_create(Req *r) {\n \trespond(r, \"not implemented\");\n }\n \n+\/* XXX: Shuts up the linker, but is yet to be written *\/\n void\n write_event(char *buf) {\n \treturn;\n"} {"commit":"9b2f138bb6a109c52c58d07b1ca26b2139698247","subject":"de-static","message":"de-static\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/azalia_codec.c\n+++ dev\/pci\/azalia_codec.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: azalia_codec.c,v 1.6 2006\/05\/11 05:12:46 brad Exp $\t*\/\n+\/*\t$OpenBSD: azalia_codec.c,v 1.7 2006\/05\/18 03:23:23 brad Exp $\t*\/\n \/*\t$NetBSD: azalia_codec.c,v 1.8 2006\/05\/10 11:17:27 kent Exp $\t*\/\n \n \/*-\n@@ -48,17 +48,17 @@\n #include <dev\/pci\/azalia.h>\n \n \n-static int\tazalia_codec_init_dacgroup(codec_t *);\n-static int\tazalia_codec_add_dacgroup(codec_t *, int, uint32_t);\n-static int\tazalia_codec_find_pin(const codec_t *, int, int, uint32_t);\n-static int\tazalia_codec_find_dac(const codec_t *, int, int);\n-static int\talc260_init_dacgroup(codec_t *);\n-static int\talc260_init_widget(const codec_t *, widget_t *, nid_t);\n-static int\talc880_init_dacgroup(codec_t *);\n-static int\talc882_init_dacgroup(codec_t *);\n-static int\talc882_init_widget(const codec_t *, widget_t *, nid_t);\n-static int\tad1981hd_init_widget(const codec_t *, widget_t *, nid_t);\n-static int\tstac9221_init_dacgroup(codec_t *);\n+int\tazalia_codec_init_dacgroup(codec_t *);\n+int\tazalia_codec_add_dacgroup(codec_t *, int, uint32_t);\n+int\tazalia_codec_find_pin(const codec_t *, int, int, uint32_t);\n+int\tazalia_codec_find_dac(const codec_t *, int, int);\n+int\talc260_init_dacgroup(codec_t *);\n+int\talc260_init_widget(const codec_t *, widget_t *, nid_t);\n+int\talc880_init_dacgroup(codec_t *);\n+int\talc882_init_dacgroup(codec_t *);\n+int\talc882_init_widget(const codec_t *, widget_t *, nid_t);\n+int\tad1981hd_init_widget(const codec_t *, widget_t *, nid_t);\n+int\tstac9221_init_dacgroup(codec_t *);\n \n \n int\n@@ -103,7 +103,7 @@\n * functions for generic codecs\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n azalia_codec_init_dacgroup(codec_t *this)\n {\n \tint i, j, assoc, group;\n@@ -161,7 +161,7 @@\n \treturn 0;\n }\n \n-static int\n+int\n azalia_codec_add_dacgroup(codec_t *this, int assoc, uint32_t digital)\n {\n \tint i, j, n, dac, seq;\n@@ -206,7 +206,7 @@\n \treturn 0;\n }\n \n-static int\n+int\n azalia_codec_find_pin(const codec_t *this, int assoc, int seq, uint32_t digital)\n {\n \tint i;\n@@ -227,7 +227,7 @@\n \treturn -1;\n }\n \n-static int\n+int\n azalia_codec_find_dac(const codec_t *this, int index, int depth)\n {\n \tconst widget_t *w;\n@@ -267,7 +267,7 @@\n * Realtek ALC260\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n alc260_init_dacgroup(codec_t *this)\n {\n \tstatic const convgroup_t dacs[2] = {\n@@ -285,7 +285,7 @@\n \treturn 0;\n }\n \n-static int\n+int\n alc260_init_widget(const codec_t *this, widget_t *w, nid_t nid)\n {\n \tswitch (nid) {\n@@ -337,7 +337,7 @@\n * Realtek ALC880\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n alc880_init_dacgroup(codec_t *this)\n {\n \tstatic const convgroup_t dacs[2] = {\n@@ -359,7 +359,7 @@\n * Realtek ALC882\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n alc882_init_dacgroup(codec_t *this)\n {\n \tstatic const convgroup_t dacs[3] = {\n@@ -380,7 +380,7 @@\n \treturn 0;\n }\n \n-static int\n+int\n alc882_init_widget(const codec_t *this, widget_t *w, nid_t nid)\n {\n \tswitch (nid) {\n@@ -423,7 +423,7 @@\n * Analog Devices AD1981HD\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n ad1981hd_init_widget(const codec_t *this, widget_t *w, nid_t nid)\n {\n \tswitch (nid) {\n@@ -465,7 +465,7 @@\n * Sigmatel STAC9221 and STAC9221D\n * ---------------------------------------------------------------- *\/\n \n-static int\n+int\n stac9221_init_dacgroup(codec_t *this)\n {\n \tstatic const convgroup_t dacs[3] = {\n"} {"commit":"cf161b1c8343aef21ae7d4d0e4281fd4db155ccb","subject":"ethernet: add start\/stop stress test","message":"ethernet: add start\/stop stress test\n","repos":"espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/esp_eth\/test\/test_emac.c\n+++ components\/esp_eth\/test\/test_emac.c\n@@ -225,6 +225,59 @@\n \/* wait for connection stop *\/\n bits = xEventGroupWaitBits(eth_event_group, ETH_STOP_BIT, true, true, pdMS_TO_TICKS(ETH_STOP_TIMEOUT_MS));\n TEST_ASSERT((bits & ETH_STOP_BIT) == ETH_STOP_BIT);\n+ TEST_ESP_OK(esp_eth_del_netif_glue(glue));\n+ \/* driver should be uninstalled within 2 seconds *\/\n+ TEST_ESP_OK(test_uninstall_driver(eth_handle, 2000));\n+ TEST_ESP_OK(phy->del(phy));\n+ TEST_ESP_OK(mac->del(mac));\n+ TEST_ESP_OK(esp_event_handler_unregister(IP_EVENT, IP_EVENT_ETH_GOT_IP, got_ip_event_handler));\n+ TEST_ESP_OK(esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, eth_event_handler));\n+ TEST_ESP_OK(esp_eth_clear_default_handlers(eth_netif));\n+ esp_netif_destroy(eth_netif);\n+ TEST_ESP_OK(esp_event_loop_delete_default());\n+ vEventGroupDelete(eth_event_group);\n+}\n+\n+TEST_CASE(\"esp32 ethernet start\/stop stress test\", \"[ethernet][test_env=UT_T2_Ethernet][timeout=240]\")\n+{\n+ EventBits_t bits = 0;\n+ EventGroupHandle_t eth_event_group = xEventGroupCreate();\n+ TEST_ASSERT(eth_event_group != NULL);\n+ test_case_uses_tcpip();\n+ TEST_ESP_OK(esp_event_loop_create_default());\n+ \/\/ create TCP\/IP netif\n+ esp_netif_config_t netif_cfg = ESP_NETIF_DEFAULT_ETH();\n+ esp_netif_t *eth_netif = esp_netif_new(&netif_cfg);\n+ \/\/ set default handlers to do layer 3 (and up) stuffs\n+ TEST_ESP_OK(esp_eth_set_default_handlers(eth_netif));\n+ \/\/ register user defined event handers\n+ TEST_ESP_OK(esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, ð_event_handler, eth_event_group));\n+ TEST_ESP_OK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &got_ip_event_handler, eth_event_group));\n+ eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();\n+ esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);\n+ eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();\n+ esp_eth_phy_t *phy = esp_eth_phy_new_ip101(&phy_config);\n+ esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, phy);\n+ esp_eth_handle_t eth_handle = NULL;\n+ \/\/ install Ethernet driver\n+ TEST_ESP_OK(esp_eth_driver_install(ð_config, ð_handle));\n+ \/\/ combine driver with netif\n+ void *glue = esp_eth_new_netif_glue(eth_handle);\n+ TEST_ESP_OK(esp_netif_attach(eth_netif, glue));\n+\n+ for (int i = 0; i < 10; i++) {\n+ \/\/ start Ethernet driver\n+ TEST_ESP_OK(esp_eth_start(eth_handle));\n+ \/* wait for IP lease *\/\n+ bits = xEventGroupWaitBits(eth_event_group, ETH_GOT_IP_BIT, true, true, pdMS_TO_TICKS(ETH_GET_IP_TIMEOUT_MS));\n+ TEST_ASSERT((bits & ETH_GOT_IP_BIT) == ETH_GOT_IP_BIT);\n+ \/\/ stop Ethernet driver\n+ TEST_ESP_OK(esp_eth_stop(eth_handle));\n+ \/* wait for connection stop *\/\n+ bits = xEventGroupWaitBits(eth_event_group, ETH_STOP_BIT, true, true, pdMS_TO_TICKS(ETH_STOP_TIMEOUT_MS));\n+ TEST_ASSERT((bits & ETH_STOP_BIT) == ETH_STOP_BIT);\n+ }\n+\n TEST_ESP_OK(esp_eth_del_netif_glue(glue));\n \/* driver should be uninstalled within 2 seconds *\/\n TEST_ESP_OK(test_uninstall_driver(eth_handle, 2000));\n"} {"commit":"c600e95360dac3a3b88f0a2106214dff8e5f56be","subject":"ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format","message":"ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format\n\nThe new playback format is needed for tda998x HDMI audio support. At\nthe moment the only other user of this codec is omap-hdmi-audio. This\nchange should not break anything because omap-hdmi-audio-dai, the\ncpu-dai of omap-hdmi-audio, enforces sufficient constraints to\navailable sample formats.\n\nSigned-off-by: Jyri Sarha <e4dfba208fcd45abd4fae1b9b3d55ae818ddca52@ti.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/codecs\/hdmi.c\n+++ sound\/soc\/codecs\/hdmi.c\n@@ -44,7 +44,7 @@\n \t\t\tSNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |\n \t\t\tSNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,\n \t\t.formats = SNDRV_PCM_FMTBIT_S16_LE |\n-\t\t\tSNDRV_PCM_FMTBIT_S24_LE,\n+\t\t\tSNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE,\n \t},\n \t.capture = {\n \t\t.stream_name = \"Capture\",\n"} {"commit":"afd19177e4e6571858fc94ab6be1b12bb54a04ed","subject":"tex comments","message":"tex comments\n","repos":"zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/pipe\/tgsi\/exec\/tgsi_exec.c\n+++ src\/mesa\/pipe\/tgsi\/exec\/tgsi_exec.c\n@@ -926,7 +926,7 @@\n break;\n \n case TGSI_FILE_OUTPUT:\n- \/* vertex varying\/output vars can be read too *\/\n+ \/* vertex\/fragment output vars can be read too *\/\n chan->u[0] = mach->Outputs[index->i[0]].xyzw[swizzle].u[0];\n chan->u[1] = mach->Outputs[index->i[1]].xyzw[swizzle].u[1];\n chan->u[2] = mach->Outputs[index->i[2]].xyzw[swizzle].u[2];\n@@ -1989,16 +1989,24 @@\n break;\n \n case TGSI_OPCODE_TEX:\n- \/* src arg0 is the texcoord *\/\n+ \/* simple texture lookup *\/\n+ \/* src[0] is the texcoord *\/\n+ \/* src[1] is the sampler unit *\/\n exec_tex(mach, inst, FALSE);\n break;\n \n case TGSI_OPCODE_TXB:\n- \/* Texture lookup with lod bias (src0.w) *\/\n+ \/* Texture lookup with lod bias *\/\n+ \/* src[0] is the texcoord (src[0].w = load bias) *\/\n+ \/* src[1] is the sampler unit *\/\n exec_tex(mach, inst, TRUE);\n break;\n \n case TGSI_OPCODE_TXD:\n+ \/* Texture lookup with explict partial derivatives *\/\n+ \/* src[0] = texcoord *\/\n+ \/* src[1] = d[strq]\/dx *\/\n+ \/* src[2] = d[strq]\/dy *\/\n assert (0);\n break;\n \n"} {"commit":"7a5cd023d6e2592514113c4efbd89897bcc75357","subject":"Add read flash command.","message":"Add read flash command.\n","repos":"cvra\/can-bootloader,cvra\/can-bootloader,cvra\/can-bootloader,cvra\/can-bootloader","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -43,6 +43,25 @@\n flash_writer_page_write(address, page_buffer, size);\n \n flash_writer_lock();\n+}\n+\n+void command_read_flash(int argc, cmp_ctx_t *args, cmp_ctx_t *out, bootloader_config_t *config)\n+{\n+ uint64_t tmp;\n+ uint32_t size;\n+\n+ if (cmp_read_u64(args, &tmp)) {\n+ return;\n+ }\n+ void *address = (void *)tmp;\n+\n+ if (cmp_read_u32(args, &size)) {\n+ return;\n+ }\n+\n+ if (cmp_write_bin(out, address, size)) {\n+ return;\n+ }\n }\n \n void command_jump_to_application(int argc, cmp_ctx_t *args, cmp_ctx_t *out, bootloader_config_t *config)\n"} {"commit":"effc022d1ccfeaf992c0ee9b23de81fa5b306a03","subject":"- recognize some more codecs - remove the codec datasheet URLs. URLs change and these particular datasheets are all easy to find.","message":"- recognize some more codecs\n- remove the codec datasheet URLs. URLs change and these particular\ndatasheets are all easy to find.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/azalia_codec.c\n+++ dev\/pci\/azalia_codec.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: azalia_codec.c,v 1.85 2008\/12\/23 04:12:19 jakemsr Exp $\t*\/\n+\/*\t$OpenBSD: azalia_codec.c,v 1.86 2008\/12\/23 09:46:38 jakemsr Exp $\t*\/\n \/*\t$NetBSD: azalia_codec.c,v 1.8 2006\/05\/10 11:17:27 kent Exp $\t*\/\n \n \/*-\n@@ -148,7 +148,6 @@\n \t\tthis->mixer_init = azalia_alc88x_mixer_init;\n \t\tbreak;\n \tcase 0x10ec0883:\n-\t\t\/* ftp:\/\/209.216.61.149\/pc\/audio\/ALC883_DataSheet_1.3.pdf *\/\n \t\tthis->name = \"Realtek ALC883\";\n \t\tthis->mixer_init = azalia_alc88x_mixer_init;\n \t\tbreak;\n@@ -160,12 +159,25 @@\n \t\tthis->name = \"Realtek ALC888\";\n \t\tthis->mixer_init = azalia_alc88x_mixer_init;\n \t\tbreak;\n+\tcase 0x111d76b2:\n+\t\tthis->name = \"IDT 92HD71B7\";\n+\t\tbreak;\n+\tcase 0x111d76b6:\n+\t\tthis->name = \"IDT 92HD71B5\";\n+\t\tbreak;\n+\tcase 0x11d41884:\n+\t\tthis->name = \"Analog Devices AD1884\";\n+\t\tbreak;\n+\tcase 0x11d4194a:\n+\t\tthis->name = \"Analog Devices AD1984A\";\n+\t\tbreak;\n+\tcase 0x11d41981:\n+\t\tthis->name = \"Analog Devices AD1981HD\";\n+\t\tbreak;\n \tcase 0x11d41983:\n-\t\t\/* http:\/\/www.analog.com\/en\/prod\/0,2877,AD1983,00.html *\/\n \t\tthis->name = \"Analog Devices AD1983\";\n \t\tbreak;\n \tcase 0x11d41984:\n-\t\t\/* http:\/\/www.analog.com\/en\/prod\/0,2877,AD1984,00.html *\/\n \t\tthis->name = \"Analog Devices AD1984\";\n \t\tthis->init_dacgroup = azalia_ad1984_init_dacgroup;\n \t\tthis->mixer_init = azalia_ad1984_mixer_init;\n@@ -173,11 +185,9 @@\n \t\tthis->set_port = azalia_ad1984_set_port;\n \t\tbreak;\n \tcase 0x11d41988:\n-\t\t\/* http:\/\/www.analog.com\/en\/prod\/0,2877,AD1988A,00.html *\/\n \t\tthis->name = \"Analog Devices AD1988A\";\n \t\tbreak;\n \tcase 0x11d4198b:\n-\t\t\/* http:\/\/www.analog.com\/en\/prod\/0,2877,AD1988B,00.html *\/\n \t\tthis->name = \"Analog Devices AD1988B\";\n \t\tbreak;\n \tcase 0x14f15045:\n@@ -250,7 +260,6 @@\n \t\tthis->name = \"Sigmatel STAC9221D\";\n \t\tbreak;\n \tcase 0x83847690:\n-\t\t\/* http:\/\/www.idt.com\/products\/getDoc.cfm?docID=17812077 *\/\n \t\tthis->name = \"Sigmatel STAC9200\";\n \t\tthis->mixer_init = azalia_stac9200_mixer_init;\n \t\tbreak;\n"} {"commit":"ff8b5bc0a7bbbe636377413a226cf61639fed884","subject":"esp_hw_support: Fix time jump after reboot","message":"esp_hw_support: Fix time jump after reboot\n\nCloses https:\/\/github.com\/espressif\/esp-idf\/issues\/9448\n","repos":"espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf,espressif\/esp-idf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/esp_hw_support\/esp_clk.c\n+++ components\/esp_hw_support\/esp_clk.c\n@@ -53,7 +53,7 @@\n static portMUX_TYPE s_esp_rtc_time_lock = portMUX_INITIALIZER_UNLOCKED;\n \n \/\/ TODO: IDF-4239\n-static RTC_DATA_ATTR uint64_t s_esp_rtc_time_us = 0, s_rtc_last_ticks = 0;\n+static RTC_NOINIT_ATTR uint64_t s_esp_rtc_time_us, s_rtc_last_ticks;\n \n inline static int IRAM_ATTR s_get_cpu_freq_mhz(void)\n {\n@@ -100,6 +100,10 @@\n #endif\n portENTER_CRITICAL_SAFE(&s_esp_rtc_time_lock);\n const uint32_t cal = esp_clk_slowclk_cal_get();\n+ if (cal == 0) {\n+ s_esp_rtc_time_us = 0;\n+ s_rtc_last_ticks = 0;\n+ }\n const uint64_t rtc_this_ticks = rtc_time_get();\n const uint64_t ticks = rtc_this_ticks - s_rtc_last_ticks;\n \/* RTC counter result is up to 2^48, calibration factor is up to 2^24,\n"} {"commit":"85e59af24056ca7ffaf617cf6201c519e31dc668","subject":"ASoC: fsl-ssi: make fsl,mode property optional","message":"ASoC: fsl-ssi: make fsl,mode property optional\n\nThe simple soundcard binding has its own way for specifying the dai\nformat. To be able to use this binding we have to make the fsl,mode\nproperty optional. As the property is used in existing devicetrees\nkeep the option around for compatibility reasons.\n\nSigned-off-by: Markus Pargmann <b9e0f7aed71fa470d5913fb2df2da788a8fb0eb2@pengutronix.de>\nTested-By: Michael Grzeschik <5bfcfbe428cce428952787978643f2a5993438aa@pengutronix.de>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/fsl\/fsl_ssi.c\n+++ sound\/soc\/fsl\/fsl_ssi.c\n@@ -660,12 +660,9 @@\n \treturn 0;\n }\n \n-\/**\n- * fsl_ssi_set_dai_fmt - configure Digital Audio Interface Format.\n- *\/\n-static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)\n-{\n-\tstruct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);\n+static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,\n+\t\tunsigned int fmt)\n+{\n \tstruct ccsr_ssi __iomem *ssi = ssi_private->ssi;\n \tu32 strcr = 0, stcr, srcr, scr, mask;\n \tu8 wm;\n@@ -804,6 +801,17 @@\n \t\tfsl_ssi_setup_ac97(ssi_private);\n \n \treturn 0;\n+\n+}\n+\n+\/**\n+ * fsl_ssi_set_dai_fmt - configure Digital Audio Interface Format.\n+ *\/\n+static int fsl_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)\n+{\n+\tstruct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(cpu_dai);\n+\n+\treturn _fsl_ssi_set_dai_fmt(ssi_private, fmt);\n }\n \n \/**\n@@ -1135,7 +1143,6 @@\n \tconst uint32_t *iprop;\n \tstruct resource res;\n \tchar name[64];\n-\tbool ac97 = false;\n \n \t\/* SSIs that are not connected on the board should have a\n \t * status = \"disabled\"\n@@ -1147,14 +1154,6 @@\n \tof_id = of_match_device(fsl_ssi_ids, &pdev->dev);\n \tif (!of_id || !of_id->data)\n \t\treturn -EINVAL;\n-\n-\tsprop = of_get_property(np, \"fsl,mode\", NULL);\n-\tif (!sprop) {\n-\t\tdev_err(&pdev->dev, \"fsl,mode property is necessary\\n\");\n-\t\treturn -EINVAL;\n-\t}\n-\tif (!strcmp(sprop, \"ac97-slave\"))\n-\t\tac97 = true;\n \n \tssi_private = devm_kzalloc(&pdev->dev, sizeof(*ssi_private),\n \t\t\tGFP_KERNEL);\n@@ -1165,10 +1164,19 @@\n \n \tssi_private->soc = of_id->data;\n \n+\tsprop = of_get_property(np, \"fsl,mode\", NULL);\n+\tif (sprop) {\n+\t\tif (!strcmp(sprop, \"ac97-slave\"))\n+\t\t\tssi_private->dai_fmt = SND_SOC_DAIFMT_AC97;\n+\t\telse if (!strcmp(sprop, \"i2s-slave\"))\n+\t\t\tssi_private->dai_fmt = SND_SOC_DAIFMT_I2S |\n+\t\t\t\tSND_SOC_DAIFMT_CBM_CFM;\n+\t}\n+\n \tssi_private->use_dma = !of_property_read_bool(np,\n \t\t\t\"fsl,fiq-stream-filter\");\n \n-\tif (ac97) {\n+\tif (fsl_ssi_is_ac97(ssi_private)) {\n \t\tmemcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_ac97_dai,\n \t\t\t\tsizeof(fsl_ssi_ac97_dai));\n \n@@ -1279,6 +1287,9 @@\n \t}\n \n done:\n+\tif (ssi_private->dai_fmt)\n+\t\t_fsl_ssi_set_dai_fmt(ssi_private, ssi_private->dai_fmt);\n+\n \treturn 0;\n \n error_sound_card:\n"} {"commit":"fb011d31578ada40c2755314db783522477d0ad4","subject":"program: Remove dead Aux field from prog_instruction.","message":"program: Remove dead Aux field from prog_instruction.\n\nAppears to have been last used by the i965 driver (removed by commit\n098acf6c).\n\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/program\/prog_instruction.h\n+++ src\/mesa\/program\/prog_instruction.h\n@@ -356,9 +356,6 @@\n *\/\n GLint BranchTarget;\n \n- \/** for driver use (try to remove someday) *\/\n- GLint Aux;\n-\n \/** for debugging purposes *\/\n const char *Comment;\n };\n"} {"commit":"cf280cb0f464cb182f12e1497067b8d5f83add4c","subject":"remove freebsd 2 and 3 support, from freebsd via jakemsr@jakemsr.com","message":"remove freebsd 2 and 3 support, from freebsd via jakemsr@jakemsr.com\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/bktr\/bktr_os.c\n+++ dev\/pci\/bktr\/bktr_os.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: bktr_os.c,v 1.16 2003\/07\/04 14:47:28 mickey Exp $\t*\/\n+\/*\t$OpenBSD: bktr_os.c,v 1.17 2004\/05\/24 21:45:36 mickey Exp $\t*\/\n \/* $FreeBSD: src\/sys\/dev\/bktr\/bktr_os.c,v 1.20 2000\/10\/20 08:16:53 roger Exp $ *\/\n \n \/*\n@@ -811,469 +811,6 @@\n }\n \n #endif\t\t\/* FreeBSD 4.x specific kernel interface routines *\/\n-\n-\/**********************************\/\n-\/* *** FreeBSD 2.2.x and 3.x *** *\/\n-\/**********************************\/\n-\n-#if ((__FreeBSD__ == 2) || (__FreeBSD__ == 3))\n-\n-static bktr_reg_t brooktree[ NBKTR ];\n-\n-static const char *bktr_probe( pcici_t tag, pcidi_t type );\n-static void\t\tbktr_attach( pcici_t tag, int unit );\n-static void\t\tbktr_intr(void *arg) { common_bktr_intr(arg); }\n-\n-static u_long\tbktr_count;\n-\n-static struct\tpci_device bktr_device = {\n-\t\"bktr\",\n-\tbktr_probe,\n-\tbktr_attach,\n-\t&bktr_count\n-};\n-\n-DATA_SET (pcidevice_set, bktr_device);\n-\n-static\td_open_t\tbktr_open;\n-static\td_close_t\tbktr_close;\n-static\td_read_t\tbktr_read;\n-static\td_write_t\tbktr_write;\n-static\td_ioctl_t\tbktr_ioctl;\n-static\td_mmap_t\tbktr_mmap;\n-static\td_poll_t\tbktr_poll;\n-\n-#define CDEV_MAJOR 92 \n-static struct cdevsw bktr_cdevsw = \n-{\n-\tbktr_open,\tbktr_close,\tbktr_read,\tbktr_write,\n-\tbktr_ioctl,\tnostop,\t\tnullreset,\tnodevtotty,\n-\tbktr_poll,\tbktr_mmap,\tNULL,\t\t\"bktr\",\n-\tNULL,\t\t-1\n-};\n-\n-static int bktr_devsw_installed;\n-\n-static void\n-bktr_drvinit( void *unused )\n-{\n-\tdev_t dev;\n-\n-\tif ( ! bktr_devsw_installed ) {\n-\t\tdev = makedev(CDEV_MAJOR, 0);\n-\t\tcdevsw_add(&dev,&bktr_cdevsw, NULL);\n-\t\tbktr_devsw_installed = 1;\n-\t}\n-}\n-\n-SYSINIT(bktrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bktr_drvinit,NULL)\n-\n-\/*\n- * the boot time probe routine.\n- *\/\n-static const char *\n-bktr_probe( pcici_t tag, pcidi_t type )\n-{\n- unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff;\n-\n-\tif (PCI_VENDOR(type) == PCI_VENDOR_BROOKTREE)\n-\t{\n-\t\tswitch (PCI_PRODUCT(type)) {\n-\t\tcase PCI_PRODUCT_BROOKTREE_BT848:\n-\t\t\tif (rev == 0x12) return(\"BrookTree 848A\");\n-\t\t\telse return(\"BrookTree 848\");\n-\t\tcase PCI_PRODUCT_BROOKTREE_BT849:\n-\t\t\treturn(\"BrookTree 849A\");\n-\t\tcase PCI_PRODUCT_BROOKTREE_BT878:\n-\t\t\treturn(\"BrookTree 878\");\n-\t\tcase PCI_PRODUCT_BROOKTREE_BT879:\n-\t\t\treturn(\"BrookTree 879\");\n-\t\t}\n-\t};\n-\n-\treturn ((char *)0);\n-}\n-\n-\/*\n- * the attach routine.\n- *\/\n-static\tvoid\n-bktr_attach( pcici_t tag, int unit )\n-{\n-\tbktr_ptr_t\tbktr;\n-\tu_long\t\tlatency;\n-\tu_long\t\tfun;\n-\tunsigned int\trev;\n-\tunsigned long\tbase;\n-#ifdef BROOKTREE_IRQ\n-\tu_long\t\told_irq, new_irq;\n-#endif \n-\n-\tbktr = &brooktree[unit];\n-\n-\tif (unit >= NBKTR) {\n-\t\tprintf(\"brooktree%d: attach: only %d units configured.\\n\",\n-\t\t unit, NBKTR);\n-\t\tprintf(\"brooktree%d: attach: invalid unit number.\\n\", unit);\n-\t\treturn;\n-\t}\n-\n-\t\/* build the device name for bktr_name() *\/\n-\tsnprintf(bktr->bktr_xname, sizeof(bktr->bktr_xname), \"bktr%d\",unit);\n-\n-\t\/* Enable Memory Mapping *\/\n-\tfun = pci_conf_read(tag, PCI_COMMAND_STATUS_REG);\n-\tpci_conf_write(tag, PCI_COMMAND_STATUS_REG, fun | 2);\n-\n-\t\/* Enable Bus Mastering *\/\n-\tfun = pci_conf_read(tag, PCI_COMMAND_STATUS_REG);\n-\tpci_conf_write(tag, PCI_COMMAND_STATUS_REG, fun | 4);\n-\n-\tbktr->tag = tag;\n-\n-\n-\t\/*\n-\t * Map control\/status registers\n-\t *\/\n-\tpci_map_mem( tag, PCI_MAP_REG_START, (vm_offset_t *) &base,\n-\t\t &bktr->phys_base );\n-#if (__FreeBSD_version >= 300000)\n-\tbktr->memt = I386_BUS_SPACE_MEM; \/* XXX should use proper bus space *\/\n-\tbktr->memh = (bus_space_handle_t)base; \/* XXX functions here *\/\n-#endif\n-\n-\t\/*\n-\t * Disable the brooktree device\n-\t *\/\n-\tOUTL(bktr, BKTR_INT_MASK, ALL_INTS_DISABLED);\n-\tOUTW(bktr, BKTR_GPIO_DMA_CTL, FIFO_RISC_DISABLED);\n-\n-#ifdef BROOKTREE_IRQ\t\t\/* from the configuration file *\/\n-\told_irq = pci_conf_read(tag, PCI_INTERRUPT_REG);\n-\tpci_conf_write(tag, PCI_INTERRUPT_REG, BROOKTREE_IRQ);\n-\tnew_irq = pci_conf_read(tag, PCI_INTERRUPT_REG);\n-\tprintf(\"bktr%d: attach: irq changed from %d to %d\\n\",\n-\t\tunit, (old_irq & 0xff), (new_irq & 0xff));\n-#endif \n-\n-\t\/*\n-\t * setup the interrupt handling routine\n-\t *\/\n-\tpci_map_int(tag, bktr_intr, (void *) bktr, &tty_imask);\n-\n-\n-\t\/* Update the Device Control Register *\/\n-\t\/* on Bt878 and Bt879 cards *\/\n-\tfun = pci_conf_read(tag, 0x40);\n- fun = fun | 1;\t\/* Enable writes to the sub-system vendor ID *\/\n-\n-#if defined( BKTR_430_FX_MODE )\n-\tif (bootverbose) printf(\"Using 430 FX chipset compatibility mode\\n\");\n- fun = fun | 2;\t\/* Enable Intel 430 FX compatibility mode *\/\n-#endif\n-\n-#if defined( BKTR_SIS_VIA_MODE )\n-\tif (bootverbose) printf(\"Using SiS\/VIA chipset compatibility mode\\n\");\n- fun = fun | 4;\t\/* Enable SiS\/VIA compatibility mode (usefull for\n- OPTi chipset motherboards too *\/\n-#endif\n-\tpci_conf_write(tag, 0x40, fun);\n-\n-\n-\t\/* XXX call bt848_i2c dependent attach() routine *\/\n-#if defined(BKTR_USE_FREEBSD_SMBUS)\n-\tif (bt848_i2c_attach(unit, bktr, &bktr->i2c_sc))\n-\t\tprintf(\"bktr%d: i2c_attach: can't attach\\n\", unit);\n-#endif\n-\n-\n-\/*\n- * PCI latency timer. 32 is a good value for 4 bus mastering slots, if\n- * you have more than four, then 16 would probably be a better value.\n- *\/\n-#ifndef BROOKTREE_DEF_LATENCY_VALUE\n-#define BROOKTREE_DEF_LATENCY_VALUE\t10\n-#endif\n-\tlatency = pci_conf_read(tag, PCI_LATENCY_TIMER);\n-\tlatency = (latency >> 8) & 0xff;\n-\tif ( bootverbose ) {\n-\t\tif (latency)\n-\t\t\tprintf(\"brooktree%d: PCI bus latency is\", unit);\n-\t\telse\n-\t\t\tprintf(\"brooktree%d: PCI bus latency was 0 changing to\",\n-\t\t\t\tunit);\n-\t}\n-\tif ( !latency ) {\n-\t\tlatency = BROOKTREE_DEF_LATENCY_VALUE;\n-\t\tpci_conf_write(tag, PCI_LATENCY_TIMER,\tlatency<<8);\n-\t}\n-\tif ( bootverbose ) {\n-\t\tprintf(\" %d.\\n\", (int) latency);\n-\t}\n-\n-\n-\t\/* read the pci device id and revision id *\/\n-\tfun = pci_conf_read(tag, PCI_ID_REG);\n- rev = pci_conf_read(tag, PCIR_REVID) & 0x000000ff;\n-\n-\t\/* call the common attach code *\/\n-\tcommon_bktr_attach( bktr, unit, fun, rev );\n-\n-}\n-\n-\n-\/*\n- * Special Memory Allocation\n- *\/\n-vm_offset_t\n-get_bktr_mem( int unit, unsigned size )\n-{\n-\tvm_offset_t\taddr = 0;\n-\n-\taddr = vm_page_alloc_contig(size, 0x100000, 0xffffffff, 1<<24);\n-\tif (addr == 0)\n-\t\taddr = vm_page_alloc_contig(size, 0x100000, 0xffffffff,\n-\t\t\t\t\t\t\t\tPAGE_SIZE);\n-\tif (addr == 0) {\n-\t\tprintf(\"bktr%d: Unable to allocate %d bytes of memory.\\n\",\n-\t\t\tunit, size);\n-\t}\n-\n-\treturn( addr );\n-}\n-\n-\/*---------------------------------------------------------\n-**\n-**\tBrookTree 848 character device driver routines\n-**\n-**---------------------------------------------------------\n-*\/\n-\n-\n-#define VIDEO_DEV\t0x00\n-#define TUNER_DEV\t0x01\n-#define VBI_DEV\t\t0x02\n-\n-#define UNIT(x)\t\t((x) & 0x0f)\n-#define FUNCTION(x)\t((x >> 4) & 0x0f)\n-\n-\n-\/*\n- * \n- *\/\n-int\n-bktr_open( dev_t dev, int flags, int fmt, struct proc *p )\n-{\n-\tbktr_ptr_t\tbktr;\n-\tint\t\tunit;\n-\n-\tunit = UNIT( minor(dev) );\n-\tif (unit >= NBKTR)\t\t\t\/* unit out of range *\/\n-\t\treturn( ENXIO );\n-\n-\tbktr = &(brooktree[ unit ]);\n-\n-\tif (!(bktr->flags & METEOR_INITALIZED)) \/* device not found *\/\n-\t\treturn( ENXIO );\t\n-\n-\n-\tif (bt848_card != -1) {\n-\t if ((bt848_card >> 8 == unit ) &&\n-\t ( (bt848_card & 0xff) < Bt848_MAX_CARD )) {\n-\t if ( bktr->bt848_card != (bt848_card & 0xff) ) {\n-\t bktr->bt848_card = (bt848_card & 0xff);\n-\t probeCard(bktr, FALSE, unit);\n-\t }\n-\t }\n-\t}\n-\n-\tif (bt848_tuner != -1) {\n-\t if ((bt848_tuner >> 8 == unit ) &&\n-\t ( (bt848_tuner & 0xff) < Bt848_MAX_TUNER )) {\n-\t if ( bktr->bt848_tuner != (bt848_tuner & 0xff) ) {\n-\t bktr->bt848_tuner = (bt848_tuner & 0xff);\n-\t probeCard(bktr, FALSE, unit);\n-\t }\n-\t }\n-\t}\n-\n-\tif (bt848_reverse_mute != -1) {\n-\t if ((bt848_reverse_mute >> 8) == unit ) {\n-\t bktr->reverse_mute = bt848_reverse_mute & 0xff;\n-\t }\n-\t}\n-\n-\tif (bt848_slow_msp_audio != -1) {\n-\t if ((bt848_slow_msp_audio >> 8) == unit ) {\n-\t bktr->slow_msp_audio = (bt848_slow_msp_audio & 0xff);\n-\t }\n-\t}\n-\n-\tswitch ( FUNCTION( minor(dev) ) ) {\n-\tcase VIDEO_DEV:\n-\t\treturn( video_open( bktr ) );\n-\tcase TUNER_DEV:\n-\t\treturn( tuner_open( bktr ) );\n-\tcase VBI_DEV:\n-\t\treturn( vbi_open( bktr ) );\n-\t}\n-\treturn( ENXIO );\n-}\n-\n-\n-\/*\n- * \n- *\/\n-int\n-bktr_close( dev_t dev, int flags, int fmt, struct proc *p )\n-{\n-\tbktr_ptr_t\tbktr;\n-\tint\t\tunit;\n-\n-\tunit = UNIT( minor(dev) );\n-\tif (unit >= NBKTR)\t\t\t\/* unit out of range *\/\n-\t\treturn( ENXIO );\n-\n-\tbktr = &(brooktree[ unit ]);\n-\n-\tswitch ( FUNCTION( minor(dev) ) ) {\n-\tcase VIDEO_DEV:\n-\t\treturn( video_close( bktr ) );\n-\tcase TUNER_DEV:\n-\t\treturn( tuner_close( bktr ) );\n-\tcase VBI_DEV:\n-\t\treturn( vbi_close( bktr ) );\n-\t}\n-\n-\treturn( ENXIO );\n-}\n-\n-\/*\n- * \n- *\/\n-int\n-bktr_read( dev_t dev, struct uio *uio, int ioflag )\n-{\n-\tbktr_ptr_t\tbktr;\n-\tint\t\tunit;\n-\t\n-\tunit = UNIT(minor(dev));\n-\tif (unit >= NBKTR)\t\/* unit out of range *\/\n-\t\treturn( ENXIO );\n-\n-\tbktr = &(brooktree[unit]);\n-\n-\tswitch ( FUNCTION( minor(dev) ) ) {\n-\tcase VIDEO_DEV:\n-\t\treturn( video_read( bktr, unit, dev, uio ) );\n-\tcase VBI_DEV:\n-\t\treturn( vbi_read( bktr, uio, ioflag ) );\n-\t}\n- return( ENXIO );\n-}\n-\n-\n-\/*\n- * \n- *\/\n-int\n-bktr_write( dev_t dev, struct uio *uio, int ioflag )\n-{\n-\treturn( EINVAL ); \/* XXX or ENXIO ? *\/\n-}\n-\n-\/*\n- * \n- *\/\n-int\n-bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr )\n-{\n-\tbktr_ptr_t\tbktr;\n-\tint\t\tunit;\n-\n-\tunit = UNIT(minor(dev));\n-\tif (unit >= NBKTR)\t\/* unit out of range *\/\n-\t\treturn( ENXIO );\n-\n-\tbktr = &(brooktree[ unit ]);\n-\n-\tif (bktr->bigbuf == 0)\t\/* no frame buffer allocated (ioctl failed) *\/\n-\t\treturn( ENOMEM );\n-\n-\tswitch ( FUNCTION( minor(dev) ) ) {\n-\tcase VIDEO_DEV:\n-\t\treturn( video_ioctl( bktr, unit, cmd, arg, pr ) );\n-\tcase TUNER_DEV:\n-\t\treturn( tuner_ioctl( bktr, unit, cmd, arg, pr ) );\n-\t}\n-\n-\treturn( ENXIO );\n-}\n-\n-\/*\n- * bktr_mmap.\n- * Note: 2.2.5\/2.2.6\/2.2.7\/3.0 users must manually\n- * edit the line below and change \"vm_offset_t\" to \"int\"\n- *\/\n-int bktr_mmap( dev_t dev, vm_offset_t offset, int nprot )\n-\n-{\n-\tint\t\tunit;\n-\tbktr_ptr_t\tbktr;\n-\n-\tunit = UNIT(minor(dev));\n-\n-\tif (unit >= NBKTR || FUNCTION(minor(dev)) > 0)\n-\t\treturn( -1 );\n-\n-\tbktr = &(brooktree[ unit ]);\n-\n-\tif (nprot & PROT_EXEC)\n-\t\treturn( -1 );\n-\n-\tif (offset < 0)\n-\t\treturn( -1 );\n-\n-\tif (offset >= bktr->alloc_pages * PAGE_SIZE)\n-\t\treturn( -1 );\n-\n-\treturn( i386_btop(vtophys(bktr->bigbuf) + offset) );\n-}\n-\n-int bktr_poll( dev_t dev, int events, struct proc *p)\n-{\n-\tint\t\tunit;\n-\tbktr_ptr_t\tbktr;\n-\tint revents = 0; \n-\n-\tunit = UNIT(minor(dev));\n-\n-\tif (unit >= NBKTR)\n-\t\treturn( -1 );\n-\n-\tbktr = &(brooktree[ unit ]);\n-\n-\tdisable_intr();\n-\n-\tif (events & (POLLIN | POLLRDNORM)) {\n-\n-\t\tswitch ( FUNCTION( minor(dev) ) ) {\n-\t\tcase VBI_DEV:\n-\t\t\tif(bktr->vbisize == 0)\n-\t\t\t\tselrecord(p, &bktr->vbi_select);\n-\t\t\telse\n-\t\t\t\trevents |= events & (POLLIN | POLLRDNORM);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n-\tenable_intr();\n-\n-\treturn (revents);\n-}\n-\n-\n-#endif\t\t\/* FreeBSD 2.2.x and 3.x specific kernel interface routines *\/\n \n \n \/*****************\/\n"} {"commit":"467e95088f8f885187f9ec8a733d1f47ee83faea","subject":" * change writting.","message":" * change writting.\n\n\ngit-svn-id: 29285e03eadf944384989fddbe8eccac9818e9d7@1399 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"unpush\/mod_chxj,unpush\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"98614cf68905961abcbab71dea8b3d9054a55d36","subject":"ASoC: SAMSUNG: i2s: use clk_prepare_enable and clk_disable_unprepare","message":"ASoC: SAMSUNG: i2s: use clk_prepare_enable and clk_disable_unprepare\n\nConvert clk_enable\/clk_disable to clk_prepare_enable\/clk_disable_unprepare\ncalls as required by common clock framework.\n\nSigned-off-by: Thomas Abraham <f8cb4d3099c555ac2fa0712396a78d2cd666d4bd@linaro.org>\nAcked-by: Sangbeom Kim <8f8c58bd4462a0bbd2070cd6f3da233ca14a58a9@samsung.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/samsung\/i2s.c\n+++ sound\/soc\/samsung\/i2s.c\n@@ -423,7 +423,7 @@\n \t\t\tif (i2s->op_clk) {\n \t\t\t\tif ((clk_id && !(mod & MOD_IMS_SYSMUX)) ||\n \t\t\t\t\t(!clk_id && (mod & MOD_IMS_SYSMUX))) {\n-\t\t\t\t\tclk_disable(i2s->op_clk);\n+\t\t\t\t\tclk_disable_unprepare(i2s->op_clk);\n \t\t\t\t\tclk_put(i2s->op_clk);\n \t\t\t\t} else {\n \t\t\t\t\ti2s->rclk_srcrate =\n@@ -434,7 +434,7 @@\n \n \t\t\ti2s->op_clk = clk_get(&i2s->pdev->dev,\n \t\t\t\t\t\ti2s->src_clk[clk_id]);\n-\t\t\tclk_enable(i2s->op_clk);\n+\t\t\tclk_prepare_enable(i2s->op_clk);\n \t\t\ti2s->rclk_srcrate = clk_get_rate(i2s->op_clk);\n \n \t\t\t\/* Over-ride the other's *\/\n@@ -880,7 +880,7 @@\n \t\tiounmap(i2s->addr);\n \t\treturn -ENOENT;\n \t}\n-\tclk_enable(i2s->clk);\n+\tclk_prepare_enable(i2s->clk);\n \n \tif (other) {\n \t\tother->addr = i2s->addr;\n@@ -922,7 +922,7 @@\n \t\tif (i2s->quirks & QUIRK_NEED_RSTCLR)\n \t\t\twritel(0, i2s->addr + I2SCON);\n \n-\t\tclk_disable(i2s->clk);\n+\t\tclk_disable_unprepare(i2s->clk);\n \t\tclk_put(i2s->clk);\n \n \t\tiounmap(i2s->addr);\n"} {"commit":"599ba515f979a343febbaf684a744ff525554727","subject":"remove unneeded dirty flag","message":"remove unneeded dirty flag\n","repos":"benaadams\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_atom_vs.c\n+++ src\/mesa\/state_tracker\/st_atom_vs.c\n@@ -176,7 +176,7 @@\n _NEW_TEXTURE |\n _NEW_TRANSFORM |\n _NEW_LIGHT), \/* XXX more? *\/\n- .st = ST_NEW_MESA, \/* XXX correct? *\/\n+ .st = 0\n },\n .update = update_tnl\n };\n"} {"commit":"23313a90811261b338494c16226af387d9d389ce","subject":" * Writing is changed.","message":" * Writing is changed.\n\n\ngit-svn-id: 941c396c0c997e7bb438e0bf88317cdf88a3ff60@1119 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"a57d15158113cb7f10e662e6df07f445c986a12d","subject":"[ALSA] emux - Avoid cast of function pointers","message":"[ALSA] emux - Avoid cast of function pointers\n\nModules: Common EMU synth\n\nPass the proper functions instead of cast of function pointers, which\ncan be dangerous with compiler optimizations.\n\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sound\/synth\/emux\/emux.c\n+++ sound\/synth\/emux\/emux.c\n@@ -66,6 +66,29 @@\n \n \/*\n *\/\n+static int sf_sample_new(void *private_data, snd_sf_sample_t *sp,\n+\t\t\t snd_util_memhdr_t *hdr,\n+\t\t\t const void __user *buf, long count)\n+{\n+\tsnd_emux_t *emu = private_data;\n+\treturn emu->ops.sample_new(emu, sp, hdr, buf, count);\n+\t\n+}\n+\n+static int sf_sample_free(void *private_data, snd_sf_sample_t *sp,\n+\t\t\t snd_util_memhdr_t *hdr)\n+{\n+\tsnd_emux_t *emu = private_data;\n+\treturn emu->ops.sample_free(emu, sp, hdr);\n+\t\n+}\n+\n+static void sf_sample_reset(void *private_data)\n+{\n+\tsnd_emux_t *emu = private_data;\n+\temu->ops.sample_reset(emu);\n+}\n+\n int snd_emux_register(snd_emux_t *emu, snd_card_t *card, int index, char *name)\n {\n \tint err;\n@@ -85,9 +108,12 @@\n \t\/* create soundfont list *\/\n \tmemset(&sf_cb, 0, sizeof(sf_cb));\n \tsf_cb.private_data = emu;\n-\tsf_cb.sample_new = (snd_sf_sample_new_t)emu->ops.sample_new;\n-\tsf_cb.sample_free = (snd_sf_sample_free_t)emu->ops.sample_free;\n-\tsf_cb.sample_reset = (snd_sf_sample_reset_t)emu->ops.sample_reset;\n+\tif (emu->ops.sample_new)\n+\t\tsf_cb.sample_new = sf_sample_new;\n+\tif (emu->ops.sample_free)\n+\t\tsf_cb.sample_free = sf_sample_free;\n+\tif (emu->ops.sample_reset)\n+\t\tsf_cb.sample_reset = sf_sample_reset;\n \temu->sflist = snd_sf_new(&sf_cb, emu->memhdr);\n \tif (emu->sflist == NULL)\n \t\treturn -ENOMEM;\n"} {"commit":"601a9ea9a79603763651db8dd93351691594b444","subject":"init glsl functions in st_init_driver_functions()","message":"init glsl functions in st_init_driver_functions()\n","repos":"djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_context.c\n+++ src\/mesa\/state_tracker\/st_context.c\n@@ -29,6 +29,7 @@\n #include \"main\/context.h\"\n #include \"main\/extensions.h\"\n #include \"vbo\/vbo.h\"\n+#include \"drivers\/common\/driverfuncs.h\"\n #include \"st_public.h\"\n #include \"st_context.h\"\n #include \"st_cb_accum.h\"\n@@ -180,6 +181,8 @@\n \n void st_init_driver_functions(struct dd_function_table *functions)\n {\n+ _mesa_init_glsl_driver_functions(functions);\n+\n st_init_accum_functions(functions);\n st_init_bufferobject_functions(functions);\n st_init_clear_functions(functions);\n"} {"commit":"47cab7d25d60b7be6c551d9342067bced82bf473","subject":"fix TX\/RX characteristic flip","message":"fix TX\/RX characteristic flip\n","repos":"ms-iot\/serial-wiring,ms-iot\/serial-wiring","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/CurieBleSerial.h\n+++ source\/CurieBleSerial.h\n@@ -48,8 +48,8 @@\n _bleSerial(ref new BleSerial(\n device_name_,\n Platform::Guid(0x6E400001, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n- Platform::Guid(0x6E400002, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n- Platform::Guid(0x6E400003, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E)\n+ Platform::Guid(0x6E400003, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n+ Platform::Guid(0x6E400002, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E)\n ))\n {\n };\n@@ -64,8 +64,8 @@\n _bleSerial(ref new BleSerial(\n device_,\n Platform::Guid(0x6E400001, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n- Platform::Guid(0x6E400002, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n- Platform::Guid(0x6E400003, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E)\n+ Platform::Guid(0x6E400003, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E),\n+ Platform::Guid(0x6E400002, 0xB5A3, 0xF393, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E)\n ))\n {\n };\n"} {"commit":"71d8292adf78e219cb67d4691b5353385ec58717","subject":"improvement: using attribute to warn of deprecation","message":"improvement: using attribute to warn of deprecation\n","repos":"PunchThrough\/Bean-iOS-OSX-SDK","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/Public\/PTDBean.h\n+++ source\/Public\/PTDBean.h\n@@ -621,12 +621,10 @@\n -(void)readTemperature;\n \n \/*\n- * This method is deprecated. Use <[PTDBean setArduinoPowerState:state:]> instead.\n- * @deprecated v2.2\n * Erases sketch with completion handler. Used to ensure sketch is cleared before updating from Sym. to Asym. FW\n * @param The handler to run once the sketch name has been updated. The sketchErased bool indicates whether the erasure was successful or not.\n *\/\n-- (void)eraseSketchWithHandler:(void (^)(BOOL sketchErased))handler;\n+- (void)eraseSketchWithHandler:(void (^)(BOOL sketchErased))handler __attribute__((deprecated((\"Use [setArduinoPowerState:] instead\"))));\n \n @end\n \n"} {"commit":"b4d74dc30d9af5fdcdf3b63c3971402202188bb9","subject":"comments","message":"comments\n","repos":"aeijdenberg\/certificate-transparency,aeijdenberg\/certificate-transparency,plietar\/certificate-transparency,grandamp\/certificate-transparency,aeijdenberg\/certificate-transparency,ksmaheshkumar\/certificate-transparency,katjoyce\/certificate-transparency,AlCutter\/certificate-transparency,eranmes\/certificate-transparency,eranmes\/certificate-transparency,lexibrent\/certificate-transparency,aeijdenberg\/certificate-transparency,eranmes\/certificate-transparency,phad\/certificate-transparency,benlaurie\/certificate-transparency,grandamp\/certificate-transparency,pphaneuf\/certificate-transparency,plietar\/certificate-transparency,Martin2112\/certificate-transparency,katjoyce\/certificate-transparency,taknira\/certificate-transparency,aeijdenberg\/certificate-transparency,rep\/certificate-transparency,ksmaheshkumar\/certificate-transparency,plietar\/certificate-transparency,plietar\/certificate-transparency,AlCutter\/certificate-transparency,ksmaheshkumar\/certificate-transparency,AlCutter\/certificate-transparency,taknira\/certificate-transparency,lexibrent\/certificate-transparency,plietar\/certificate-transparency,katjoyce\/certificate-transparency,rep\/certificate-transparency,lexibrent\/certificate-transparency,katjoyce\/certificate-transparency,google\/certificate-transparency,kyprizel\/certificate-transparency,AlCutter\/certificate-transparency,RJPercival\/certificate-transparency,katjoyce\/certificate-transparency,rep\/certificate-transparency,rep\/certificate-transparency,eranmes\/certificate-transparency,lexibrent\/certificate-transparency,kyprizel\/certificate-transparency,katjoyce\/certificate-transparency,kyprizel\/certificate-transparency,plietar\/certificate-transparency,Martin2112\/certificate-transparency,taknira\/certificate-transparency,Martin2112\/certificate-transparency,AlCutter\/certificate-transparency,taknira\/certificate-transparency,Martin2112\/certificate-transparency,ksmaheshkumar\/certificate-transparency,AlCutter\/certificate-transparency,aeijdenberg\/certificate-transparency,grandamp\/certificate-transparency,benlaurie\/certificate-transparency,phad\/certificate-transparency,google\/certificate-transparency,katjoyce\/certificate-transparency,phad\/certificate-transparency,taknira\/certificate-transparency,taknira\/certificate-transparency,benlaurie\/certificate-transparency,benlaurie\/certificate-transparency,rep\/certificate-transparency,pphaneuf\/certificate-transparency,kyprizel\/certificate-transparency,AlCutter\/certificate-transparency,plietar\/certificate-transparency,aeijdenberg\/certificate-transparency,RJPercival\/certificate-transparency,benlaurie\/certificate-transparency,grandamp\/certificate-transparency,google\/certificate-transparency,kyprizel\/certificate-transparency,kyprizel\/certificate-transparency,RJPercival\/certificate-transparency,Martin2112\/certificate-transparency,pphaneuf\/certificate-transparency,ksmaheshkumar\/certificate-transparency,Martin2112\/certificate-transparency,ksmaheshkumar\/certificate-transparency,rep\/certificate-transparency,benlaurie\/certificate-transparency,Martin2112\/certificate-transparency,pphaneuf\/certificate-transparency,eranmes\/certificate-transparency,google\/certificate-transparency,RJPercival\/certificate-transparency,rep\/certificate-transparency,phad\/certificate-transparency,ksmaheshkumar\/certificate-transparency,kyprizel\/certificate-transparency,eranmes\/certificate-transparency,taknira\/certificate-transparency,benlaurie\/certificate-transparency,eranmes\/certificate-transparency","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cpp\/log\/etcd_consistent_store-inl.h\n+++ cpp\/log\/etcd_consistent_store-inl.h\n@@ -625,11 +625,18 @@\n \"Non-master node cannot run cleanups.\");\n }\n \n+ \/\/ Figure out where we're cleaning up to...\n+ std::unique_lock<std::mutex> lock(mutex_);\n if (!serving_sth_) {\n LOG(INFO) << \"No current serving_sth, nothing to do.\";\n return util::Status::OK;\n }\n-\n+ const int64_t clean_up_to_sequence_number(\n+ serving_sth_->Entry().tree_size() - 1);\n+ lock.unlock();\n+\n+ LOG(INFO) << \"Cleaning old entries up to and including sequence number: \"\n+ << clean_up_to_sequence_number;\n \n std::vector<EntryHandle<Logged>> sequenced_entries;\n util::Status status(GetSequencedEntries(&sequenced_entries));\n@@ -637,11 +644,6 @@\n LOG(WARNING) << \"Couldn't get sequenced entries: \" << status;\n return status;\n }\n-\n- const int64_t clean_up_to_sequence_number(serving_sth_->Entry().tree_size() -\n- 1);\n- LOG(INFO) << \"Cleaning old entries up to and including sequence number: \"\n- << clean_up_to_sequence_number;\n \n for (auto& entry : sequenced_entries) {\n const uint64_t sequence_number(entry.Entry().sequence_number());\n"} {"commit":"5244365377464ec792540824a94104086c8ca540","subject":"1. [M] gosfs delete - check whether directory is empty","message":"1. [M] gosfs delete\n - check whether directory is empty\n","repos":"sinabeuro\/geekos5,sinabeuro\/geekos5,sinabeuro\/geekos5","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"57cb3abbac719ab5b75e7a9ab1e511c88cd327b7","subject":"Fix compilation errors from previous commit, need to include header message.h to use display_message in function template. https:\/\/tracker.physiomeproject.org\/show_bug.cgi?id=3288","message":"Fix compilation errors from previous commit, need to include header message.h to use display_message in function template. https:\/\/tracker.physiomeproject.org\/show_bug.cgi?id=3288\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/command\/parser.h\n+++ source\/command\/parser.h\n@@ -24,6 +24,7 @@\n #endif \/* defined (UNIX) *\/\n #include \"general\/object.h\"\n #include \"general\/value.h\"\n+#include \"general\/message.h\"\n \n \/*\n Global types\n"} {"commit":"ee2de989d19f32a59b644bf3111f69277c5128e7","subject":"`user` should default to that of the global configuration in case mapping-style arg","message":"`user` should default to that of the global configuration in case mapping-style arg\n","repos":"i110\/h2o,zotherstupidguy\/h2o,deweerdt\/h2o,matsumoto-r\/h2o,takahashim\/h2o,zlm2012\/h2o,karupanerura\/h2o,rayrapetyan\/h2o,mingodad\/h2o,mwasa\/h2o,zotherstupidguy\/h2o,rail44\/h2o,ntabee\/h2o-tile,fbbdev\/h2o,nkmideb\/h2o-server,yannick\/h2o,yannick\/h2o,netyog\/h2o,Ryezhang\/h2o,takahashim\/h2o,ntabee\/h2o-tile,cwyang\/h2o,deepakm\/h2o,karupanerura\/h2o,netyog\/h2o,mwasa\/h2o,i110\/h2o,h2o\/h2o,rail44\/h2o,rail44\/h2o,yannick\/h2o,karupanerura\/h2o,ntabee\/h2o-tile,karupanerura\/h2o,Ryezhang\/h2o,h2o\/h2o,willshion\/h2o,nkmideb\/h2o-server,deepakm\/h2o,devnexen\/h2o,tamediadigital\/h2o,karupanerura\/h2o,matsumoto-r\/h2o,willshion\/h2o,willshion\/h2o,deepakm\/h2o,h2o\/h2o,rayrapetyan\/h2o,willshion\/h2o,rayrapetyan\/h2o,i110\/h2o,deepakm\/h2o,Endika\/h2o,mingodad\/h2o,fbbdev\/h2o,zotherstupidguy\/h2o,cubicdaiya\/h2o,netyog\/h2o,zlm2012\/h2o,youprofit\/h2o,tamediadigital\/h2o,Endika\/h2o,fbbdev\/h2o,cwyang\/h2o,nkmideb\/h2o-server,devnexen\/h2o,youprofit\/h2o,deepakm\/h2o,liang179\/h2o,lkwg82\/h2o,h2o\/h2o,liang179\/h2o,yannick\/h2o,tamediadigital\/h2o,ntabee\/h2o-tile,Endika\/h2o,i110\/h2o,zlm2012\/h2o,Ryezhang\/h2o,nkmideb\/h2o-server,Endika\/h2o,zlm2012\/h2o,netyog\/h2o,deweerdt\/h2o,tamediadigital\/h2o,yoshida-mediba\/h2o,yannick\/h2o,lkwg82\/h2o,willshion\/h2o,Endika\/h2o,yannick\/h2o,mwasa\/h2o,liang179\/h2o,Ryezhang\/h2o,zlm2012\/h2o,yoshida-mediba\/h2o,cubicdaiya\/h2o,netyog\/h2o,h2o\/h2o,takahashim\/h2o,cwyang\/h2o,matsumoto-r\/h2o,cwyang\/h2o,cwyang\/h2o,i110\/h2o,Ryezhang\/h2o,cwyang\/h2o,deweerdt\/h2o,zlm2012\/h2o,rail44\/h2o,willshion\/h2o,deepakm\/h2o,lkwg82\/h2o,yannick\/h2o,zlm2012\/h2o,nkmideb\/h2o-server,mwasa\/h2o,cubicdaiya\/h2o,tamediadigital\/h2o,Endika\/h2o,matsumoto-r\/h2o,tamediadigital\/h2o,fbbdev\/h2o,liang179\/h2o,mingodad\/h2o,rouzier\/h2o,karupanerura\/h2o,yoshida-mediba\/h2o,ntabee\/h2o-tile,yoshida-mediba\/h2o,devnexen\/h2o,matsumoto-r\/h2o,tamediadigital\/h2o,takahashim\/h2o,matsumoto-r\/h2o,rouzier\/h2o,mingodad\/h2o,willshion\/h2o,cubicdaiya\/h2o,netyog\/h2o,rail44\/h2o,rouzier\/h2o,rayrapetyan\/h2o,cwyang\/h2o,youprofit\/h2o,liang179\/h2o,yoshida-mediba\/h2o,liang179\/h2o,nkmideb\/h2o-server,devnexen\/h2o,deepakm\/h2o,Ryezhang\/h2o,netyog\/h2o,liang179\/h2o,zotherstupidguy\/h2o,i110\/h2o,mingodad\/h2o,rouzier\/h2o,devnexen\/h2o,zlm2012\/h2o,karupanerura\/h2o,fbbdev\/h2o,lkwg82\/h2o,Ryezhang\/h2o,devnexen\/h2o,matsumoto-r\/h2o,deweerdt\/h2o,rayrapetyan\/h2o,rouzier\/h2o,i110\/h2o,yoshida-mediba\/h2o,lkwg82\/h2o,deweerdt\/h2o,rayrapetyan\/h2o,matsumoto-r\/h2o,rail44\/h2o,fbbdev\/h2o,mingodad\/h2o,yannick\/h2o,mwasa\/h2o,devnexen\/h2o,netyog\/h2o,devnexen\/h2o,devnexen\/h2o,zotherstupidguy\/h2o,mwasa\/h2o,mwasa\/h2o,zlm2012\/h2o,nkmideb\/h2o-server,lkwg82\/h2o,mingodad\/h2o,h2o\/h2o,yoshida-mediba\/h2o,rayrapetyan\/h2o,deepakm\/h2o,deweerdt\/h2o,tamediadigital\/h2o,deweerdt\/h2o,ntabee\/h2o-tile,i110\/h2o,nkmideb\/h2o-server,Endika\/h2o,cubicdaiya\/h2o,yoshida-mediba\/h2o,youprofit\/h2o,yannick\/h2o,i110\/h2o,zotherstupidguy\/h2o,mingodad\/h2o,matsumoto-r\/h2o,rayrapetyan\/h2o,deweerdt\/h2o,Ryezhang\/h2o,i110\/h2o,youprofit\/h2o,deweerdt\/h2o,rayrapetyan\/h2o,ntabee\/h2o-tile,mwasa\/h2o,cubicdaiya\/h2o,fbbdev\/h2o,lkwg82\/h2o,rail44\/h2o,fbbdev\/h2o,Endika\/h2o,cubicdaiya\/h2o,yoshida-mediba\/h2o,takahashim\/h2o,youprofit\/h2o,takahashim\/h2o,lkwg82\/h2o,takahashim\/h2o,cwyang\/h2o,ntabee\/h2o-tile,youprofit\/h2o,rail44\/h2o,youprofit\/h2o,h2o\/h2o,takahashim\/h2o,tamediadigital\/h2o,zotherstupidguy\/h2o,h2o\/h2o,h2o\/h2o,zotherstupidguy\/h2o,youprofit\/h2o,willshion\/h2o,rayrapetyan\/h2o,cubicdaiya\/h2o,karupanerura\/h2o,liang179\/h2o,fbbdev\/h2o,lkwg82\/h2o","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/handler\/configurator\/fastcgi.c\n+++ lib\/handler\/configurator\/fastcgi.c\n@@ -248,6 +248,7 @@\n return -1;\n }\n spawn_cmd = t->data.scalar;\n+ spawn_user = ctx->globalconf->user;\n if ((t = yoml_get(node, \"user\")) != NULL) {\n if (t->type != YOML_TYPE_SCALAR) {\n h2o_configurator_errprintf(cmd, node, \"attribute `user` must be scalar\");\n"} {"commit":"08955ff63f0094d05699c4b172f2e33814197aa8","subject":"[heap][cmpctmalloc] mark some internal functions as static","message":"[heap][cmpctmalloc] mark some internal functions as static\n","repos":"minglun-tsai\/lk,hollanderic\/lkstuff,ErikCorryGoogle\/lk,sndnvaps\/lk,ErikCorryGoogle\/lk,hollanderic\/lkstuff,travisg\/lk,ErikCorryGoogle\/lk,hollanderic\/lkstuff,minglun-tsai\/lk,travisg\/lk,ErikCorryGoogle\/lk,sndnvaps\/lk,minglun-tsai\/lk,travisg\/lk,littlekernel\/lk,sndnvaps\/lk,sndnvaps\/lk,sndnvaps\/lk,minglun-tsai\/lk,littlekernel\/lk,littlekernel\/lk,littlekernel\/lk,hollanderic\/lkstuff,travisg\/lk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/heap\/cmpctmalloc\/cmpctmalloc.c\n+++ lib\/heap\/cmpctmalloc\/cmpctmalloc.c\n@@ -239,7 +239,7 @@\n return -1;\n }\n \n-bool is_start_of_os_allocation(header_t *header)\n+static bool is_start_of_os_allocation(header_t *header)\n {\n uintptr_t address = (uintptr_t)header;\n if ((address & (PAGE_SIZE - 1)) != 0) return false;\n@@ -268,12 +268,12 @@\n #endif\n }\n \n-bool is_end_of_os_allocation(char *address)\n+static bool is_end_of_os_allocation(char *address)\n {\n return ((header_t *)address)->size == 0;\n }\n \n-void free_to_os(header_t *header, size_t size)\n+static void free_to_os(header_t *header, size_t size)\n {\n DEBUG_ASSERT(size == ROUNDUP(size, PAGE_SIZE));\n page_free(header, size >> PAGE_SIZE_SHIFT);\n@@ -320,13 +320,13 @@\n return standalone + 1;\n }\n \n-void FixLeftPointer(header_t *right, header_t *new_left)\n+static void FixLeftPointer(header_t *right, header_t *new_left)\n {\n int tag = (uintptr_t)right->left & 1;\n right->left = (header_t *)(((uintptr_t)new_left & ~1) | tag);\n }\n \n-void cmpct_test_buckets(void)\n+static void cmpct_test_buckets(void)\n {\n size_t rounded;\n unsigned bucket;\n@@ -379,7 +379,7 @@\n }\n }\n \n-void cmpct_test_get_back_newly_freed_helper(size_t size)\n+static void cmpct_test_get_back_newly_freed_helper(size_t size)\n {\n void *allocated = cmpct_alloc(size);\n if (allocated == NULL) return;\n@@ -404,7 +404,7 @@\n cmpct_free(allocated3);\n }\n \n-void cmpct_test_get_back_newly_freed(void)\n+static void cmpct_test_get_back_newly_freed(void)\n {\n size_t increment = 16;\n for (size_t i = 128; i <= 0x8000000; i *= 2, increment *= 2) {\n@@ -419,7 +419,7 @@\n }\n }\n \n-void cmpct_test_return_to_os(void)\n+static void cmpct_test_return_to_os(void)\n {\n cmpct_trim();\n size_t remaining = theheap.remaining;\n@@ -498,7 +498,7 @@\n cmpct_dump();\n }\n \n-void *large_alloc(size_t size)\n+static void *large_alloc(size_t size)\n {\n #ifdef CMPCT_DEBUG\n size_t requested_size = size;\n"} {"commit":"4973d38daa5b28cdf6e9ecd07075b18e9db586a4","subject":"auto-calibration on the F0","message":"auto-calibration on the F0\n","repos":"punkkeks\/stm32plus,spiralray\/stm32plus,trigrass2\/stm32plus,phynex\/stm32plus,punkkeks\/stm32plus,phynex\/stm32plus,ThanhVic\/stm32plus,punkkeks\/stm32plus,punkkeks\/stm32plus,tokoro10g\/stm32plus,ThanhVic\/stm32plus,ThanhVic\/stm32plus,punkkeks\/stm32plus,ThanhVic\/stm32plus,trigrass2\/stm32plus,punkkeks\/stm32plus,phynex\/stm32plus,lcbowling\/stm32plus,trigrass2\/stm32plus,trigrass2\/stm32plus,lcbowling\/stm32plus,lcbowling\/stm32plus,tokoro10g\/stm32plus,ThanhVic\/stm32plus,tokoro10g\/stm32plus,ThanhVic\/stm32plus,spiralray\/stm32plus,punkkeks\/stm32plus,lcbowling\/stm32plus,lcbowling\/stm32plus,trigrass2\/stm32plus,phynex\/stm32plus,spiralray\/stm32plus,phynex\/stm32plus,tokoro10g\/stm32plus,tokoro10g\/stm32plus,lcbowling\/stm32plus,spiralray\/stm32plus,tokoro10g\/stm32plus,phynex\/stm32plus,spiralray\/stm32plus,spiralray\/stm32plus,ThanhVic\/stm32plus,trigrass2\/stm32plus,lcbowling\/stm32plus,trigrass2\/stm32plus,spiralray\/stm32plus,phynex\/stm32plus,tokoro10g\/stm32plus","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/include\/adc\/f0\/AdcPeripheral.h\n+++ lib\/include\/adc\/f0\/AdcPeripheral.h\n@@ -55,6 +55,15 @@\n \r\n ClockControl<TPeripheralName>::On();\r\n \r\n+ \/\/ the peripheral must be disabled for auto-calibration to work\r\n+\r\n+ ADC_Cmd(ADC1,DISABLE);\r\n+ ADC_DeInit(ADC1);\r\n+\r\n+ \/\/ start the calibration\r\n+\r\n+ ADC_GetCalibrationFactor(ADC1);\r\n+\r\n \/\/ the features have been constructed, initialise it and\r\n \/\/ free the memory it was using\r\n \r\n"} {"commit":"a7e629303d82e3f912a3e1bf832ecdd5dfe332fd","subject":"[Adhoc]timer\u304cPageFault\u3092\u8d77\u3053\u3059\u306e\u3067\u7121\u52b9\u5316","message":"[Adhoc]timer\u304cPageFault\u3092\u8d77\u3053\u3059\u306e\u3067\u7121\u52b9\u5316\n","repos":"yakawa\/OS_x86_64,yakawa\/OS_x86_64","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2cfc670386e46b16bd3d9cf8ffe9ac87028b2fe4","subject":"Updated APU_SCALE to avoid consuming the processor","message":"Updated APU_SCALE to avoid consuming the processor\n","repos":"geky\/mbed-apu","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apu\/apu.h\n+++ apu\/apu.h\n@@ -13,7 +13,7 @@\n \n \/\/ APU Settings\n #define APU_FREQ 894886\n-#define APU_SCALE 8\n+#define APU_SCALE 16\n \n \n \/\/ Base channel representation\n"} {"commit":"348d48d27ff5c3211623e74656c1190456f20565","subject":"Remove reference to TGeoShape::kBig. TGeoShape is only a forward reference. This gives problems when compiling geom on Windows.","message":"Remove reference to TGeoShape::kBig. TGeoShape is only a forward reference.\nThis gives problems when compiling geom on Windows.\n\n\ngit-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@6000 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"Duraznos\/root,pspe\/root,vukasinmilosevic\/root,veprbl\/root,nilqed\/root,jrtomps\/root,root-mirror\/root,beniz\/root,sirinath\/root,perovic\/root,krafczyk\/root,mhuwiler\/rootauto,nilqed\/root,pspe\/root,mhuwiler\/rootauto,omazapa\/root-old,agarciamontoro\/root,sawenzel\/root,beniz\/root,Y--\/root,zzxuanyuan\/root,Dr15Jones\/root,krafczyk\/root,esakellari\/my_root_for_test,bbockelm\/root,sirinath\/root,omazapa\/root,buuck\/root,veprbl\/root,esakellari\/my_root_for_test,buuck\/root,esakellari\/root,davidlt\/root,thomaskeck\/root,sbinet\/cxx-root,strykejern\/TTreeReader,omazapa\/root,gbitzes\/root,esakellari\/my_root_for_test,olifre\/root,davidlt\/root,gganis\/root,CristinaCristescu\/root,abhinavmoudgil95\/root,zzxuanyuan\/root-compressor-dummy,kirbyherm\/root-r-tools,kirbyherm\/root-r-tools,omazapa\/root-old,omazapa\/root-old,gganis\/root,gganis\/root,root-mirror\/root,vukasinmilosevic\/root,jrtomps\/root,root-mirror\/root,esakellari\/my_root_for_test,beniz\/root,omazapa\/root,bbockelm\/root,esakellari\/root,alexschlueter\/cern-root,mkret2\/root,zzxuanyuan\/root,arch1tect0r\/root,sbinet\/cxx-root,evgeny-boger\/root,Duraznos\/root,dfunke\/root,beniz\/root,buuck\/root,0x0all\/ROOT,olifre\/root,lgiommi\/root,nilqed\/root,jrtomps\/root,CristinaCristescu\/root,thomaskeck\/root,alexschlueter\/cern-root,abhinavmoudgil95\/root,krafczyk\/root,ffurano\/root5,sbinet\/cxx-root,CristinaCristescu\/root,zzxuanyuan\/root,bbockelm\/root,satyarth934\/root,sirinath\/root,abhinavmoudgil95\/root,esakellari\/root,Y--\/root,mkret2\/root,cxx-hep\/root-cern,bbockelm\/root,zzxuanyuan\/root-compressor-dummy,pspe\/root,strykejern\/TTreeReader,kirbyherm\/root-r-tools,mhuwiler\/rootauto,esakellari\/root,Y--\/root,satyarth934\/root,sirinath\/root,davidlt\/root,root-mirror\/root,gbitzes\/root,evgeny-boger\/root,lgiommi\/root,vukasinmilosevic\/root,abhinavmoudgil95\/root,olifre\/root,mattkretz\/root,evgeny-boger\/root,Y--\/root,lgiommi\/root,omazapa\/root,abhinavmoudgil95\/root,abhinavmoudgil95\/root,satyarth934\/root,zzxuanyuan\/root,pspe\/root,gbitzes\/root,omazapa\/root-old,dfunke\/root,sbinet\/cxx-root,omazapa\/root,BerserkerTroll\/root,zzxuanyuan\/root,zzxuanyuan\/root,beniz\/root,omazapa\/root-old,esakellari\/my_root_for_test,zzxuanyuan\/root-compressor-dummy,Dr15Jones\/root,georgtroska\/root,olifre\/root,esakellari\/my_root_for_test,thomaskeck\/root,dfunke\/root,cxx-hep\/root-cern,bbockelm\/root,simonpf\/root,Duraznos\/root,zzxuanyuan\/root-compressor-dummy,esakellari\/my_root_for_test,agarciamontoro\/root,mattkretz\/root,karies\/root,veprbl\/root,gganis\/root,georgtroska\/root,CristinaCristescu\/root,beniz\/root,evgeny-boger\/root,karies\/root,tc3t\/qoot,arch1tect0r\/root,mattkretz\/root,krafczyk\/root,gganis\/root,simonpf\/root,perovic\/root,olifre\/root,simonpf\/root,veprbl\/root,cxx-hep\/root-cern,0x0all\/ROOT,jrtomps\/root,evgeny-boger\/root,sbinet\/cxx-root,pspe\/root,alexschlueter\/cern-root,alexschlueter\/cern-root,zzxuanyuan\/root,strykejern\/TTreeReader,gganis\/root,buuck\/root,sbinet\/cxx-root,0x0all\/ROOT,sawenzel\/root,arch1tect0r\/root,dfunke\/root,mkret2\/root,bbockelm\/root,gbitzes\/root,sbinet\/cxx-root,esakellari\/root,Duraznos\/root,gganis\/root,mhuwiler\/rootauto,perovic\/root,Duraznos\/root,arch1tect0r\/root,mattkretz\/root,mattkretz\/root,ffurano\/root5,lgiommi\/root,pspe\/root,lgiommi\/root,lgiommi\/root,thomaskeck\/root,Duraznos\/root,smarinac\/root,agarciamontoro\/root,sbinet\/cxx-root,thomaskeck\/root,bbockelm\/root,vukasinmilosevic\/root,tc3t\/qoot,georgtroska\/root,bbockelm\/root,omazapa\/root,kirbyherm\/root-r-tools,ffurano\/root5,omazapa\/root-old,BerserkerTroll\/root,karies\/root,omazapa\/root,cxx-hep\/root-cern,veprbl\/root,thomaskeck\/root,mhuwiler\/rootauto,sirinath\/root,abhinavmoudgil95\/root,ffurano\/root5,jrtomps\/root,pspe\/root,tc3t\/qoot,alexschlueter\/cern-root,davidlt\/root,Dr15Jones\/root,omazapa\/root,omazapa\/root-old,dfunke\/root,karies\/root,veprbl\/root,pspe\/root,krafczyk\/root,Y--\/root,georgtroska\/root,beniz\/root,alexschlueter\/cern-root,smarinac\/root,sbinet\/cxx-root,zzxuanyuan\/root-compressor-dummy,perovic\/root,gbitzes\/root,gbitzes\/root,nilqed\/root,alexschlueter\/cern-root,georgtroska\/root,BerserkerTroll\/root,0x0all\/ROOT,sirinath\/root,perovic\/root,georgtroska\/root,omazapa\/root,vukasinmilosevic\/root,lgiommi\/root,simonpf\/root,CristinaCristescu\/root,Duraznos\/root,vukasinmilosevic\/root,dfunke\/root,root-mirror\/root,omazapa\/root,esakellari\/root,mkret2\/root,davidlt\/root,smarinac\/root,thomaskeck\/root,karies\/root,gbitzes\/root,arch1tect0r\/root,thomaskeck\/root,Duraznos\/root,dfunke\/root,ffurano\/root5,kirbyherm\/root-r-tools,esakellari\/my_root_for_test,satyarth934\/root,perovic\/root,sirinath\/root,smarinac\/root,sawenzel\/root,zzxuanyuan\/root,bbockelm\/root,satyarth934\/root,abhinavmoudgil95\/root,Dr15Jones\/root,georgtroska\/root,veprbl\/root,abhinavmoudgil95\/root,Duraznos\/root,krafczyk\/root,nilqed\/root,mkret2\/root,dfunke\/root,karies\/root,tc3t\/qoot,cxx-hep\/root-cern,zzxuanyuan\/root-compressor-dummy,arch1tect0r\/root,tc3t\/qoot,pspe\/root,Y--\/root,omazapa\/root-old,agarciamontoro\/root,jrtomps\/root,mattkretz\/root,smarinac\/root,ffurano\/root5,simonpf\/root,esakellari\/root,cxx-hep\/root-cern,BerserkerTroll\/root,satyarth934\/root,nilqed\/root,strykejern\/TTreeReader,agarciamontoro\/root,esakellari\/root,gbitzes\/root,satyarth934\/root,Y--\/root,mhuwiler\/rootauto,vukasinmilosevic\/root,mhuwiler\/rootauto,davidlt\/root,olifre\/root,davidlt\/root,CristinaCristescu\/root,esakellari\/root,arch1tect0r\/root,kirbyherm\/root-r-tools,perovic\/root,jrtomps\/root,root-mirror\/root,evgeny-boger\/root,0x0all\/ROOT,root-mirror\/root,vukasinmilosevic\/root,simonpf\/root,abhinavmoudgil95\/root,omazapa\/root-old,nilqed\/root,dfunke\/root,gganis\/root,olifre\/root,strykejern\/TTreeReader,sawenzel\/root,simonpf\/root,0x0all\/ROOT,tc3t\/qoot,Y--\/root,BerserkerTroll\/root,esakellari\/root,buuck\/root,strykejern\/TTreeReader,vukasinmilosevic\/root,sawenzel\/root,mattkretz\/root,nilqed\/root,agarciamontoro\/root,CristinaCristescu\/root,veprbl\/root,gganis\/root,smarinac\/root,agarciamontoro\/root,agarciamontoro\/root,CristinaCristescu\/root,olifre\/root,mattkretz\/root,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root-compressor-dummy,BerserkerTroll\/root,beniz\/root,Y--\/root,zzxuanyuan\/root,beniz\/root,agarciamontoro\/root,veprbl\/root,buuck\/root,lgiommi\/root,nilqed\/root,Dr15Jones\/root,Y--\/root,buuck\/root,buuck\/root,mattkretz\/root,krafczyk\/root,BerserkerTroll\/root,sawenzel\/root,mkret2\/root,karies\/root,karies\/root,root-mirror\/root,satyarth934\/root,cxx-hep\/root-cern,davidlt\/root,sawenzel\/root,gganis\/root,satyarth934\/root,jrtomps\/root,sbinet\/cxx-root,tc3t\/qoot,smarinac\/root,kirbyherm\/root-r-tools,esakellari\/root,davidlt\/root,zzxuanyuan\/root-compressor-dummy,sirinath\/root,perovic\/root,agarciamontoro\/root,pspe\/root,pspe\/root,krafczyk\/root,Y--\/root,CristinaCristescu\/root,zzxuanyuan\/root-compressor-dummy,jrtomps\/root,simonpf\/root,sawenzel\/root,vukasinmilosevic\/root,gbitzes\/root,satyarth934\/root,smarinac\/root,mkret2\/root,0x0all\/ROOT,omazapa\/root-old,georgtroska\/root,olifre\/root,arch1tect0r\/root,ffurano\/root5,gbitzes\/root,abhinavmoudgil95\/root,mkret2\/root,veprbl\/root,Dr15Jones\/root,sirinath\/root,buuck\/root,0x0all\/ROOT,mkret2\/root,beniz\/root,BerserkerTroll\/root,mhuwiler\/rootauto,smarinac\/root,arch1tect0r\/root,Duraznos\/root,mkret2\/root,georgtroska\/root,zzxuanyuan\/root,davidlt\/root,thomaskeck\/root,lgiommi\/root,gganis\/root,sawenzel\/root,perovic\/root,mattkretz\/root,buuck\/root,bbockelm\/root,karies\/root,vukasinmilosevic\/root,evgeny-boger\/root,evgeny-boger\/root,krafczyk\/root,karies\/root,tc3t\/qoot,simonpf\/root,agarciamontoro\/root,cxx-hep\/root-cern,lgiommi\/root,arch1tect0r\/root,strykejern\/TTreeReader,sawenzel\/root,mattkretz\/root,omazapa\/root,jrtomps\/root,Duraznos\/root,mhuwiler\/rootauto,evgeny-boger\/root,beniz\/root,BerserkerTroll\/root,satyarth934\/root,karies\/root,thomaskeck\/root,tc3t\/qoot,gbitzes\/root,CristinaCristescu\/root,BerserkerTroll\/root,jrtomps\/root,simonpf\/root,dfunke\/root,sirinath\/root,omazapa\/root-old,Dr15Jones\/root,olifre\/root,nilqed\/root,nilqed\/root,davidlt\/root,buuck\/root,dfunke\/root,lgiommi\/root,0x0all\/ROOT,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root,bbockelm\/root,georgtroska\/root,smarinac\/root,esakellari\/my_root_for_test,BerserkerTroll\/root,root-mirror\/root,root-mirror\/root,mkret2\/root,sawenzel\/root,simonpf\/root,georgtroska\/root,olifre\/root,perovic\/root,perovic\/root,krafczyk\/root,krafczyk\/root,evgeny-boger\/root,tc3t\/qoot,sbinet\/cxx-root,mhuwiler\/rootauto,zzxuanyuan\/root,arch1tect0r\/root,sirinath\/root,root-mirror\/root,evgeny-boger\/root,CristinaCristescu\/root,esakellari\/my_root_for_test,veprbl\/root,mhuwiler\/rootauto","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- geom\/inc\/TGeoManager.h\n+++ geom\/inc\/TGeoManager.h\n@@ -1,4 +1,4 @@\n-\/\/ @(#)root\/geom:$Name: $:$Id: TGeoManager.h,v 1.22 2003\/01\/27 13:16:26 brun Exp $\n+\/\/ @(#)root\/geom:$Name: $:$Id: TGeoManager.h,v 1.23 2003\/01\/27 18:04:47 brun Exp $\n \/\/ Author: Andrei Gheata 25\/10\/01\n \n \/*************************************************************************\n@@ -237,7 +237,7 @@\n void SetTopVolume(TGeoVolume *vol);\n \n \/\/--- geometry queries\n- TGeoNode *FindNextBoundary(Double_t stepmax=TGeoShape::kBig,const char *path=\"\");\n+ TGeoNode *FindNextBoundary(Double_t stepmax=1e30,const char *path=\"\");\n TGeoNode *FindNode(Bool_t safe_start=kTRUE);\n TGeoNode *FindNode(Double_t x, Double_t y, Double_t z);\n TGeoNode *InitTrack(Double_t *point, Double_t *dir);\n"} {"commit":"1a1886b9eb9c5aceb76b2a1039ada198dd2284fe","subject":"remove unused import","message":"remove unused import\n","repos":"mrdomino\/autonet,mrdomino\/autonet","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- autonet.c\n+++ autonet.c\n@@ -11,7 +11,6 @@\n #include <assert.h>\n #include <err.h>\n #include <errno.h>\n-#include <inttypes.h>\n #include <stdbool.h>\n #include <stdio.h>\n #include <stdlib.h>\n"} {"commit":"7c11f890a5296ddd527ca956503bb33ceacd3ca9","subject":"keyboard_indicators: Clean up opening display","message":"keyboard_indicators: Clean up opening display\n","repos":"drkhsh\/slstatus,drkh5h\/slstatus","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- components\/keyboard_indicators.c\n+++ components\/keyboard_indicators.c\n@@ -7,10 +7,10 @@\n const char *\n keyboard_indicators(void)\n {\n-\tDisplay *dpy = XOpenDisplay(NULL);\n+\tDisplay *dpy;\n \tXKeyboardState state;\n \n-\tif (dpy == NULL) {\n+\tif (!(dpy = XOpenDisplay(NULL))) {\n \t\tfprintf(stderr, \"Cannot open display\\n\");\n \t\treturn NULL;\n \t}\n"} {"commit":"8f6009db363f9978f22826a413bbd0f7f0ddd2f9","subject":"epub: Whitespace separated by comments turn into two whitespace tokens.","message":"epub: Whitespace separated by comments turn into two whitespace tokens.\n\nDeal with it.\n","repos":"lustersir\/MuPDF,TamirEvan\/mupdf,hxx0215\/MuPDFMirror,lamemate\/mupdf,benoit-pierre\/mupdf,muennich\/mupdf,zeniko\/mupdf,muennich\/mupdf,benoit-pierre\/mupdf,tribals\/mupdf,FabriceSalvaire\/mupdf-cmake,zeniko\/mupdf,tribals\/mupdf,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,muennich\/mupdf,FabriceSalvaire\/mupdf-cmake,ziel\/mupdf,lamemate\/mupdf,asbloomf\/mupdf,tribals\/mupdf,zeniko\/mupdf,github201407\/MuPDF,zeniko\/mupdf,ziel\/mupdf,github201407\/MuPDF,poor-grad-student\/mupdf,ccxvii\/mupdf,ziel\/mupdf,muennich\/mupdf,knielsen\/mupdf,FabriceSalvaire\/mupdf-cmake,robamler\/mupdf-nacl,TamirEvan\/mupdf,zeniko\/mupdf,muennich\/mupdf,FabriceSalvaire\/mupdf-cmake,robamler\/mupdf-nacl,lustersir\/MuPDF,github201407\/MuPDF,fluks\/mupdf-x11-bookmarks,hackqiang\/mupdf,ccxvii\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,ccxvii\/mupdf,hackqiang\/mupdf,knielsen\/mupdf,tribals\/mupdf,lamemate\/mupdf,asbloomf\/mupdf,ArtifexSoftware\/mupdf,hackqiang\/mupdf,github201407\/MuPDF,TamirEvan\/mupdf,muennich\/mupdf,zeniko\/mupdf,MokiMobility\/muPDF,ccxvii\/mupdf,ziel\/mupdf,lamemate\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,hxx0215\/MuPDFMirror,poor-grad-student\/mupdf,asbloomf\/mupdf,benoit-pierre\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,knielsen\/mupdf,sebras\/mupdf,MokiMobility\/muPDF,poor-grad-student\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,MokiMobility\/muPDF,TamirEvan\/mupdf,tribals\/mupdf,hackqiang\/mupdf,TamirEvan\/mupdf,github201407\/MuPDF,MokiMobility\/muPDF,asbloomf\/mupdf,lustersir\/MuPDF,fluks\/mupdf-x11-bookmarks,FabriceSalvaire\/mupdf-cmake,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,benoit-pierre\/mupdf,lamemate\/mupdf,github201407\/MuPDF,benoit-pierre\/mupdf,ziel\/mupdf,hackqiang\/mupdf,lamemate\/mupdf,tribals\/mupdf,hxx0215\/MuPDFMirror,lustersir\/MuPDF,knielsen\/mupdf,robamler\/mupdf-nacl,asbloomf\/mupdf,robamler\/mupdf-nacl,lustersir\/MuPDF,MokiMobility\/muPDF,ziel\/mupdf,sebras\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,sebras\/mupdf,hxx0215\/MuPDFMirror,hackqiang\/mupdf,knielsen\/mupdf,FabriceSalvaire\/mupdf-cmake,benoit-pierre\/mupdf,robamler\/mupdf-nacl,robamler\/mupdf-nacl,MokiMobility\/muPDF,ccxvii\/mupdf,sebras\/mupdf,sebras\/mupdf,hxx0215\/MuPDFMirror,hxx0215\/MuPDFMirror,ArtifexSoftware\/mupdf,muennich\/mupdf,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf,lustersir\/MuPDF,knielsen\/mupdf,asbloomf\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/html\/css-parse.c\n+++ source\/html\/css-parse.c\n@@ -495,7 +495,8 @@\n \n static void white(struct lexbuf *buf)\n {\n-\taccept(buf, ' ');\n+\twhile (buf->lookahead == ' ')\n+\t\tnext(buf);\n }\n \n static int iscond(int t)\n@@ -873,7 +874,10 @@\n \twhile (buf->lookahead != EOF)\n \t{\n \t\tif (accept(buf, ';'))\n+\t\t{\n+\t\t\twhite(buf);\n \t\t\treturn;\n+\t\t}\n \t\tif (accept(buf, '{'))\n \t\t{\n \t\t\tint depth = 1;\n@@ -886,6 +890,7 @@\n \t\t\t\telse\n \t\t\t\t\tnext(buf);\n \t\t\t}\n+\t\t\twhite(buf);\n \t\t\treturn;\n \t\t}\n \t\tnext(buf);\n"} {"commit":"27e9fb84597e216b9ac65a6839dc710dd1ceaeb2","subject":"eventdev: fix build for clang 4","message":"eventdev: fix build for clang 4\n\nbuild error:\n...\/lib\/librte_eventdev\/rte_eventdev.c:371:6:\nerror: logical not is only applied to the left hand side of this\nbitwise operator [-Werror,-Wlogical-not-parentheses]\n if (!dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)\n ^\nAdded parentheses after the '!' to evaluate the bitwise operator first.\n\nSigned-off-by: Ferruh Yigit <ba8734c3c506d2e3557bd4ac8fdaccd25bdb9aa7@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_eventdev\/rte_eventdev.c\n+++ lib\/librte_eventdev\/rte_eventdev.c\n@@ -368,7 +368,7 @@\n \t(*dev->dev_ops->dev_infos_get)(dev, &info);\n \n \t\/* Check dequeue_timeout_ns value is in limit *\/\n-\tif (!dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) {\n+\tif (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) {\n \t\tif (dev_conf->dequeue_timeout_ns < info.min_dequeue_timeout_ns\n \t\t\t|| dev_conf->dequeue_timeout_ns >\n \t\t\t\t info.max_dequeue_timeout_ns) {\n"} {"commit":"88dfea9ffd3cf49cb82a00da14983810b65055e2","subject":"Tidying","message":"Tidying\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/node\/node_tool.c\n+++ source\/node\/node_tool.c\n@@ -2269,6 +2269,7 @@\n \t\tdisplay_message(ERROR_MESSAGE,\"DESTROY(Node_tool). Invalid argument(s)\");\n \t\treturn_code=0;\n \t}\n+\tLEAVE;\n \n \treturn (return_code);\n } \/* DESTROY(Node_tool) *\/\n"} {"commit":"65f01dc9ad5341f2996fef6b62de2702d9554060","subject":"added the logic to make the swap","message":"added the logic to make the swap\n","repos":"Jakeand3rson\/C_Data_Structures","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- quick_sort.c\n+++ quick_sort.c\n@@ -19,6 +19,9 @@\n right--;\n if (left >= right)\n break;\n+ temp = arr[left];\n+ arr[left] = arr[right];\n+ arr[right] = temp;\n }\n \n \n"} {"commit":"fc7c1077ceb99c35e5f9d0ce03dc7740565bb2bf","subject":"Btrfs: don't set up allocation result twice","message":"Btrfs: don't set up allocation result twice\n\nWe store the allocation start and length twice in ins, once right\nafter the other, but with intervening calls that may prevent the\nduplicate from being optimized out by the compiler. Remove one of the\nassignments.\n\nSigned-off-by: Alexandre Oliva <65310e8f4ce328edb4bdd56e25925d3ddf39023a@lsd.ic.unicamp.br>\nSigned-off-by: Chris Mason <a169954b4cb1a46cee25f659d3bddfebe02b5fba@oracle.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -5441,9 +5441,6 @@\n \t\t\tgoto loop;\n \t\t}\n \n-\t\tins->objectid = search_start;\n-\t\tins->offset = num_bytes;\n-\n \t\tif (offset < search_start)\n \t\t\tbtrfs_add_free_space(used_block_group, offset,\n \t\t\t\t\t search_start - offset);\n"} {"commit":"7fd83ca9b3c58bc3156611e2ad9349be9ef94718","subject":"Fix leaks in pdf-device.c","message":"Fix leaks in pdf-device.c\n\nThe Forms object should have been dropped once the reference was\ncreated for it. Also needed to clean up the group and font\nobjects that the device maintains.\n","repos":"fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,lustersir\/MuPDF,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,tribals\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,knielsen\/mupdf,tribals\/mupdf,lustersir\/MuPDF,poor-grad-student\/mupdf,muennich\/mupdf,tribals\/mupdf,muennich\/mupdf,knielsen\/mupdf,asbloomf\/mupdf,lustersir\/MuPDF,muennich\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,tribals\/mupdf,tribals\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,asbloomf\/mupdf,ArtifexSoftware\/mupdf,poor-grad-student\/mupdf,muennich\/mupdf,ccxvii\/mupdf,sebras\/mupdf,TamirEvan\/mupdf,lustersir\/MuPDF,TamirEvan\/mupdf,knielsen\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,knielsen\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,lustersir\/MuPDF,sebras\/mupdf,poor-grad-student\/mupdf,asbloomf\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,ccxvii\/mupdf,poor-grad-student\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,knielsen\/mupdf,lustersir\/MuPDF,ArtifexSoftware\/mupdf,sebras\/mupdf,asbloomf\/mupdf,asbloomf\/mupdf,tribals\/mupdf,asbloomf\/mupdf,ccxvii\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,knielsen\/mupdf,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/pdf\/pdf-device.c\n+++ source\/pdf\/pdf-device.c\n@@ -851,9 +851,12 @@\n \t\tpdf_dict_put_drop(ctx, form, PDF_NAME_BBox, pdf_new_rect(ctx, doc, bbox));\n \t\t*form_ref = pdf_new_ref(ctx, doc, form);\n \t}\n+\tfz_always(ctx)\n+\t{\n+\t\tpdf_drop_obj(ctx, form);\n+\t}\n \tfz_catch(ctx)\n \t{\n-\t\tpdf_drop_obj(ctx, form);\n \t\tfz_rethrow(ctx);\n \t}\n \n@@ -1285,6 +1288,11 @@\n \t\tpdf_drop_obj(ctx, pdev->images[i].ref);\n \t}\n \n+\tfor (i = pdev->num_groups - 1; i >= 0; i--)\n+\t{\n+\t\tpdf_drop_obj(ctx, pdev->groups[i].ref);\n+\t}\n+\n \tif (pdev->contents)\n \t{\n \t\tpdf_update_stream(ctx, doc, pdev->contents, pdev->gstates[0].buf, 0);\n@@ -1298,6 +1306,8 @@\n \n \tpdf_drop_obj(ctx, pdev->resources);\n \n+\tfz_free(ctx, pdev->groups);\n+\tfz_free(ctx, pdev->fonts);\n \tfz_free(ctx, pdev->images);\n \tfz_free(ctx, pdev->alphas);\n \tfz_free(ctx, pdev->gstates);\n"} {"commit":"3137967714cce85793d92b768bab806eb78b7117","subject":"Add basename and dirname test with a uri.","message":"Add basename and dirname test with a uri.\n","repos":"gco\/csync,gco\/csync,gco\/csync,meeh420\/csync,gco\/csync,meeh420\/csync,meeh420\/csync","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/std_tests\/check_std_c_path.c\n+++ tests\/std_tests\/check_std_c_path.c\n@@ -43,7 +43,16 @@\n bname = c_basename(NULL);\n fail_unless((strcmp(bname, \".\") == 0), NULL);\n SAFE_FREE(bname);\n+}\n+END_TEST\n \n+START_TEST (check_c_basename_uri)\n+{\n+ char *bname = NULL;\n+\n+ bname = c_basename(\"smb:\/\/server\/share\/dir\/\");\n+ fail_unless((strcmp(bname, \"dir\") == 0), NULL);\n+ SAFE_FREE(bname);\n }\n END_TEST\n \n@@ -85,10 +94,21 @@\n }\n END_TEST\n \n+START_TEST (check_c_dirname_uri)\n+{\n+ char *dname;\n+\n+ dname = c_dirname(\"smb:\/\/server\/share\/dir\");\n+ fail_unless((strcmp(dname, \"smb:\/\/server\/share\") == 0), \"c_dirname = %s\\n\", dname);\n+ SAFE_FREE(dname);\n+}\n+END_TEST\n+\n static Suite *make_std_c_basename_suite(void) {\n Suite *s = suite_create(\"std:path:c_basename\");\n \n create_case(s, \"check_c_basename\", check_c_basename);\n+ create_case(s, \"check_c_basename_uri\", check_c_basename_uri);\n \n return s;\n }\n@@ -97,6 +117,7 @@\n Suite *s = suite_create(\"std:path:c_dirname\");\n \n create_case(s, \"check_c_dirname\", check_c_dirname);\n+ create_case(s, \"check_c_dirname_uri\", check_c_dirname_uri);\n \n return s;\n }\n"} {"commit":"382279336f428c80f344edfc30d53797e3e76146","subject":"Btrfs: set trans to null in reserve_metadata_bytes if we commit the transaction","message":"Btrfs: set trans to null in reserve_metadata_bytes if we commit the transaction\n\nbtrfs_commit_transaction will free our trans, but because we pass trans to\nshrink_delalloc we could possibly have a use after free situation. So instead\nif we commit the transaction, set trans to null and set committed to true so we\ndon't keep trying to commit a transaction. This fixes a panic I could reproduce\nat will. Thanks,\n\nSigned-off-by: Josef Bacik <78b342861d821967b29f951b7366f5a0267e0c38@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -3157,6 +3157,7 @@\n \tint retries = 0;\n \tint ret = 0;\n \tbool reserved = false;\n+\tbool committed = false;\n \n again:\n \tret = -ENOSPC;\n@@ -3249,17 +3250,19 @@\n \t\tgoto out;\n \n \tret = -EAGAIN;\n-\tif (trans)\n+\tif (trans || committed)\n \t\tgoto out;\n-\n \n \tret = -ENOSPC;\n \ttrans = btrfs_join_transaction(root, 1);\n \tif (IS_ERR(trans))\n \t\tgoto out;\n \tret = btrfs_commit_transaction(trans, root);\n-\tif (!ret)\n+\tif (!ret) {\n+\t\ttrans = NULL;\n+\t\tcommitted = true;\n \t\tgoto again;\n+\t}\n \n out:\n \tif (reserved) {\n"} {"commit":"801f83a15740a4368a608dafe47914d7d6d8e773","subject":"Fix sign error","message":"Fix sign error\n","repos":"llewelld\/birthdayparadox,llewelld\/birthdayparadox","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- babydes.c\n+++ babydes.c\n@@ -39,7 +39,7 @@\n \t\t\t}\n \t\t}\n \t\t\/\/ Ensure output depends on input\n-\t\tsimplerandom_kiss_discard(&rng_kiss[pos % rngnum], bufferin[pos]);\n+\t\tsimplerandom_kiss_discard(&rng_kiss[pos % rngnum], (unsigned char)bufferin[pos]);\n \t\trandom += simplerandom_kiss_next(&rng_kiss[pos % rngnum]);\n \t\tbufferout[pos] = ((char *)& random)[pos % 4];\n \t}\n@@ -137,7 +137,7 @@\n \tmemcpy(keydata->key, key, keylen);\n \n \tkeydata->keylen = intlen;\n-\t\n+\n \treturn keydata;\n }\n \n"} {"commit":"e0f4b2b03b877e0360f56836ebfe454aa3a9dca5","subject":"gio\/tests\/proxy-test: fix cleanup","message":"gio\/tests\/proxy-test: fix cleanup\n\nmake sure the proxy threads are in the \"waiting for a connection\"\nstate when we do the final cleanup, or else there are race conditions\ninvolving which thread processes the GCancellable cancellation first.\n","repos":"johne53\/MB3Glib,gale320\/glib,endlessm\/glib,tamaskenez\/glib,lukasz-skalski\/glib,djdeath\/glib,djdeath\/glib,mzabaluev\/glib,ieei\/glib,johne53\/MB3Glib,mzabaluev\/glib,lukasz-skalski\/glib,tamaskenez\/glib,lukasz-skalski\/glib,gale320\/glib,Distrotech\/glib,endlessm\/glib,Distrotech\/glib,cosimoc\/glib,cosimoc\/glib,MathieuDuponchelle\/glib,mzabaluev\/glib,tchakabam\/glib,ieei\/glib,cention-sany\/glib,cention-sany\/glib,gale320\/glib,Distrotech\/glib,Distrotech\/glib,endlessm\/glib,djdeath\/glib,ieei\/glib,MathieuDuponchelle\/glib,djdeath\/glib,cention-sany\/glib,cention-sany\/glib,tchakabam\/glib,cosimoc\/glib,johne53\/MB3Glib,mzabaluev\/glib,gale320\/glib,johne53\/MB3Glib,krichter722\/glib,lukasz-skalski\/glib,MathieuDuponchelle\/glib,endlessm\/glib,lukasz-skalski\/glib,Distrotech\/glib,tchakabam\/glib,MathieuDuponchelle\/glib,krichter722\/glib,krichter722\/glib,ieei\/glib,cention-sany\/glib,gale320\/glib,johne53\/MB3Glib,mzabaluev\/glib,ieei\/glib,endlessm\/glib,cosimoc\/glib,tamaskenez\/glib,krichter722\/glib,djdeath\/glib,johne53\/MB3Glib,tchakabam\/glib,cosimoc\/glib,tchakabam\/glib,tamaskenez\/glib,krichter722\/glib,tamaskenez\/glib,MathieuDuponchelle\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/tests\/proxy-test.c\n+++ gio\/tests\/proxy-test.c\n@@ -1064,21 +1064,25 @@\n uri = g_strdup_printf (\"beta:\/\/no-such-host.xx:%u\", server.server_port);\n conn = g_socket_client_connect_to_uri (client, uri, 0, NULL, &error);\n g_assert_no_error (error);\n- g_clear_object (&conn);\n \n g_assert_no_error (proxy_a.last_error);\n g_assert_no_error (proxy_b.last_error);\n+\n+ do_echo_test (conn);\n+ g_clear_object (&conn);\n teardown_test (NULL, NULL);\n \n g_socket_client_connect_to_uri_async (client, uri, 0, NULL,\n \t\t\t\t\tasync_got_conn, &conn);\n while (conn == NULL)\n g_main_context_iteration (NULL, TRUE);\n- g_clear_object (&conn);\n g_free (uri);\n \n g_assert_no_error (proxy_a.last_error);\n g_assert_no_error (proxy_b.last_error);\n+\n+ do_echo_test (conn);\n+ g_clear_object (&conn);\n teardown_test (NULL, NULL);\n }\n \n"} {"commit":"3cba5b587142a7cedc5281257cf05e31c4595d2e","subject":"use 9 negative sampels","message":"use 9 negative sampels\n","repos":"kaishengyao\/cnn,kaishengyao\/cnn","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cnn\/macros.h\n+++ cnn\/macros.h\n@@ -65,7 +65,7 @@\n #define MAX_NUMBER_OF_HYPOTHESIS 200\n \n \/\/\/ for ranker \n-#define MAX_NUMBER_OF_CANDIDATES 49\n+#define MAX_NUMBER_OF_CANDIDATES 9\n \n \/\/\/ for random number generation\n \/\/\/ use curand to generate random numbers\n"} {"commit":"3fade9377f44586845e82d542368cbf78471653c","subject":"reiserfs: balance_leaf refactor, format balance_leaf_paste_left","message":"reiserfs: balance_leaf refactor, format balance_leaf_paste_left\n\nBreak up balance_leaf_paste_left into:\nbalance_leaf_paste_left_shift\nbalance_leaf_paste_left_shift_dirent\nbalance_leaf_paste_left_whole\n\nand keep balance_leaf_paste_left as a handler to select which is appropriate.\n\nAlso reformat to adhere to CodingStyle.\n\nSigned-off-by: Jeff Mahoney <5459ed423adecc5a7fe2249dd619058acc25c497@suse.com>\nSigned-off-by: Jan Kara <596727c8a0ea4db3ba2ceceedccbacd3d7b371b8@suse.cz>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"bfa5701cf0de0445546a8e388a8a09a24710cd1a","subject":"coders\/png.c: Added support for a proposed new PNG chunk (exIf read-write, eXIf read-only) that is currently being discussed on the png-mng-misc at lists.sourceforge.net mailing list.","message":"coders\/png.c: Added support for a proposed new PNG chunk (exIf\nread-write, eXIf read-only) that is currently being discussed on the\npng-mng-misc at lists.sourceforge.net mailing list.\n","repos":"Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- coders\/png.c\n+++ coders\/png.c\n@@ -527,6 +527,12 @@\n portable, we use ASCII numbers like this, not characters.\n *\/\n \n+\/* until registration of eXIf *\/\n+static const png_byte mng_exIf[5]={101, 120, 73, 102, (png_byte) '\\0'};\n+\n+\/* after registration of eXIf *\/\n+static const png_byte mng_eXIf[5]={101, 88, 73, 102, (png_byte) '\\0'};\n+\n static const png_byte mng_MHDR[5]={ 77, 72, 68, 82, (png_byte) '\\0'};\n static const png_byte mng_BACK[5]={ 66, 65, 67, 75, (png_byte) '\\0'};\n static const png_byte mng_BASI[5]={ 66, 65, 83, 73, (png_byte) '\\0'};\n@@ -804,6 +810,7 @@\n ping_exclude_bKGD,\n ping_exclude_cHRM,\n ping_exclude_date,\n+ ping_exclude_eXIf,\n ping_exclude_EXIF,\n ping_exclude_gAMA,\n ping_exclude_iCCP,\n@@ -1833,6 +1840,63 @@\n \" read_user_chunk: found %c%c%c%c chunk\",\n chunk->name[0],chunk->name[1],chunk->name[2],chunk->name[3]);\n \n+ if (chunk->name[0] == 101 &&\n+ (chunk->name[1] == 88 || chunk->name[1] == 120 ) &&\n+ chunk->name[2] == 73 &&\n+ chunk-> name[3] == 102)\n+ {\n+ \/* process eXIf or exIf chunk *\/\n+\n+ PNGErrorInfo\n+ *error_info;\n+\n+ StringInfo\n+ *profile;\n+\n+ unsigned char\n+ *p;\n+\n+ png_byte\n+ *s;\n+\n+ int\n+ i;\n+\n+ LogMagickEvent(CoderEvent,GetMagickModule(),\n+ \" recognized eXIf|exIf chunk\");\n+\n+ image=(Image *) png_get_user_chunk_ptr(ping);\n+\n+ error_info=(PNGErrorInfo *) png_get_error_ptr(ping);\n+\n+ profile=BlobToStringInfo((const void *) NULL,chunk->size+6);\n+ if (profile == (StringInfo *) NULL)\n+ {\n+ (void) ThrowMagickException(error_info->exception,GetMagickModule(),\n+ ResourceLimitError,\"MemoryAllocationFailed\",\"`%s'\",image->filename);\n+ return(-1);\n+ }\n+ p=GetStringInfoDatum(profile);\n+\n+ \/* Initialize profile with \"Exif\\0\\0\" *\/\n+ *p++ ='E';\n+ *p++ ='x';\n+ *p++ ='i';\n+ *p++ ='f';\n+ *p++ ='\\0';\n+ *p++ ='\\0';\n+\n+ \/* copy chunk->data to profile *\/\n+ s=chunk->data;\n+ for (i=0; i<chunk->size; i++)\n+ *p++ = *s++;\n+\n+ (void) SetImageProfile(image,\"exif\",profile,\n+ error_info->exception);\n+\n+ return(1);\n+ }\n+\n \/* vpAg (deprecated, replaced by caNv) *\/\n if (chunk->name[0] == 118 &&\n chunk->name[1] == 112 &&\n@@ -2309,12 +2373,14 @@\n #endif\n }\n #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)\n- \/* Ignore unused chunks and all unknown chunks except for caNv and vpAg *\/\n+ \/* Ignore unused chunks and all unknown chunks except for exIf, caNv,\n+ and vpAg *\/\n # if PNG_LIBPNG_VER < 10700 \/* Avoid libpng16 warning *\/\n png_set_keep_unknown_chunks(ping, 2, NULL, 0);\n # else\n png_set_keep_unknown_chunks(ping, 1, NULL, 0);\n # endif\n+ png_set_keep_unknown_chunks(ping, 2, (png_bytep) mng_exIf, 1);\n png_set_keep_unknown_chunks(ping, 2, (png_bytep) mng_caNv, 1);\n png_set_keep_unknown_chunks(ping, 2, (png_bytep) mng_vpAg, 1);\n png_set_keep_unknown_chunks(ping, 1, unused_chunks,\n@@ -7478,7 +7544,7 @@\n #endif\n \n entry=AcquireMagickInfo(\"PNG\",\"MNG\",\"Multiple-image Network Graphics\");\n- entry->flags|=CoderDecoderSeekableStreamFlag; \/* To do: eliminate this. *\/\n+ entry->flags|=CoderSeekableStreamFlag; \/* To do: eliminate this. *\/\n \n #if defined(MAGICKCORE_PNG_DELEGATE)\n entry->decoder=(DecodeImageHandler *) ReadMNGImage;\n@@ -8009,6 +8075,7 @@\n ping_have_non_bw,\n ping_have_PLTE,\n ping_have_bKGD,\n+ ping_have_eXIf,\n ping_have_iCCP,\n ping_have_pHYs,\n ping_have_sRGB,\n@@ -8018,6 +8085,7 @@\n ping_exclude_cHRM,\n ping_exclude_date,\n \/* ping_exclude_EXIF, *\/\n+ ping_exclude_eXIf,\n ping_exclude_gAMA,\n ping_exclude_iCCP,\n \/* ping_exclude_iTXt, *\/\n@@ -8167,6 +8235,7 @@\n ping_have_non_bw=MagickTrue;\n ping_have_PLTE=MagickFalse;\n ping_have_bKGD=MagickFalse;\n+ ping_have_eXIf=MagickTrue;\n ping_have_iCCP=MagickFalse;\n ping_have_pHYs=MagickFalse;\n ping_have_sRGB=MagickFalse;\n@@ -8177,6 +8246,7 @@\n ping_exclude_cHRM=mng_info->ping_exclude_cHRM;\n ping_exclude_date=mng_info->ping_exclude_date;\n \/* ping_exclude_EXIF=mng_info->ping_exclude_EXIF; *\/\n+ ping_exclude_eXIf=mng_info->ping_exclude_eXIf;\n ping_exclude_gAMA=mng_info->ping_exclude_gAMA;\n ping_exclude_iCCP=mng_info->ping_exclude_iCCP;\n \/* ping_exclude_iTXt=mng_info->ping_exclude_iTXt; *\/\n@@ -11359,6 +11429,65 @@\n \n \/* write any PNG-chunk-e profiles *\/\n (void) Magick_png_write_chunk_from_profile(image,\"PNG-chunk-e\",logging);\n+\n+ \/* write exIf profile *\/\n+ if (ping_have_eXIf != MagickFalse && ping_exclude_eXIf == MagickFalse)\n+ {\n+ char\n+ *name;\n+\n+ ResetImageProfileIterator(image);\n+\n+ for (name=GetNextImageProfile(image); name != (const char *) NULL; )\n+ {\n+ if (LocaleCompare(name,\"exif\") == 0)\n+ {\n+ const StringInfo\n+ *profile;\n+\n+ profile=GetImageProfile(image,name);\n+\n+ if (profile != (StringInfo *) NULL)\n+ {\n+ png_uint_32\n+ length;\n+ unsigned char\n+ chunk[4],\n+ *data;\n+\n+ StringInfo\n+ *ping_profile;\n+\n+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),\n+ \" Have eXIf profile\");\n+\n+ ping_profile=CloneStringInfo(profile);\n+ data=GetStringInfoDatum(ping_profile),\n+\n+ length=(png_uint_32) GetStringInfoLength(ping_profile);\n+\n+#if 0 \/* eXIf chunk is registered *\/\n+ PNGType(chunk,mng_eXIf);\n+#else \/* eXIf chunk not yet registered; write exIf instead *\/\n+ PNGType(chunk,mng_exIf);\n+#endif\n+ if (length < 7)\n+ break; \/* othewise crashes *\/\n+\n+ \/* skip the \"Exif\\0\\0\" JFIF Exif Header ID *\/\n+ length -= 6;\n+\n+ LogPNGChunk(logging,chunk,length);\n+ (void) WriteBlobMSBULong(image,length);\n+ (void) WriteBlob(image,4,chunk);\n+ (void) WriteBlob(image,length,data+6);\n+ (void) WriteBlobMSBULong(image,crc32(crc32(0,chunk,4),\n+ data+6, (uInt) length));\n+ break;\n+ }\n+ }\n+ }\n+ }\n \n if (logging != MagickFalse)\n (void) LogMagickEvent(CoderEvent,GetMagickModule(),\n@@ -11907,6 +12036,7 @@\n mng_info->ping_exclude_caNv=MagickFalse;\n mng_info->ping_exclude_cHRM=MagickFalse;\n mng_info->ping_exclude_date=MagickFalse;\n+ mng_info->ping_exclude_eXIf=MagickFalse;\n mng_info->ping_exclude_EXIF=MagickFalse; \/* hex-encoded EXIF in zTXt *\/\n mng_info->ping_exclude_gAMA=MagickFalse;\n mng_info->ping_exclude_iCCP=MagickFalse;\n@@ -12116,6 +12246,7 @@\n mng_info->ping_exclude_cHRM=excluding;\n mng_info->ping_exclude_date=excluding;\n mng_info->ping_exclude_EXIF=excluding;\n+ mng_info->ping_exclude_eXIf=excluding;\n mng_info->ping_exclude_gAMA=excluding;\n mng_info->ping_exclude_iCCP=excluding;\n \/* mng_info->ping_exclude_iTXt=excluding; *\/\n@@ -12139,6 +12270,8 @@\n mng_info->ping_exclude_cHRM=excluding != MagickFalse ? MagickFalse :\n MagickTrue;\n mng_info->ping_exclude_date=excluding != MagickFalse ? MagickFalse :\n+ MagickTrue;\n+ mng_info->ping_exclude_eXIf=excluding != MagickFalse ? MagickFalse :\n MagickTrue;\n mng_info->ping_exclude_EXIF=excluding != MagickFalse ? MagickFalse :\n MagickTrue;\n@@ -12180,7 +12313,10 @@\n mng_info->ping_exclude_date=excluding;\n \n if (IsOptionMember(\"exif\",value) != MagickFalse)\n- mng_info->ping_exclude_EXIF=excluding;\n+ {\n+ mng_info->ping_exclude_EXIF=excluding;\n+ mng_info->ping_exclude_eXIf=excluding;\n+ }\n \n if (IsOptionMember(\"gama\",value) != MagickFalse)\n mng_info->ping_exclude_gAMA=excluding;\n@@ -12240,6 +12376,9 @@\n if (mng_info->ping_exclude_EXIF != MagickFalse)\n (void) LogMagickEvent(CoderEvent,GetMagickModule(),\n \" EXIF\");\n+ if (mng_info->ping_exclude_eXIf != MagickFalse)\n+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),\n+ \" eXIf\");\n if (mng_info->ping_exclude_gAMA != MagickFalse)\n (void) LogMagickEvent(CoderEvent,GetMagickModule(),\n \" gAMA\");\n@@ -13761,6 +13900,7 @@\n mng_info->ping_exclude_cHRM=MagickTrue;\n mng_info->ping_exclude_date=MagickTrue;\n mng_info->ping_exclude_EXIF=MagickTrue;\n+ mng_info->ping_exclude_eXIf=MagickTrue;\n mng_info->ping_exclude_gAMA=MagickTrue;\n mng_info->ping_exclude_iCCP=MagickTrue;\n \/* mng_info->ping_exclude_iTXt=MagickTrue; *\/\n"} {"commit":"06dbfa3c08711b130f8684d1101558eb921d188d","subject":"Improve comment for coordinate connector comment.","message":"Improve comment for coordinate connector comment.\n\n[ci skip]\n","repos":"opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OpenSim\/Simulation\/Model\/ConditionalPathPoint.h\n+++ OpenSim\/Simulation\/Model\/ConditionalPathPoint.h\n@@ -54,7 +54,8 @@\n \/\/ CONNECTORS\n \/\/==============================================================================\n OpenSim_DECLARE_CONNECTOR(coordinate, Coordinate,\n- \"The coordinate whose value this path point depends on.\");\n+ \"The coordinate whose value determines when \"\n+ \"the path point is active according to the specified range.\");\n \n \/\/=============================================================================\n \/\/ METHODS\n"} {"commit":"104037a4c5c438fe7d426114c62ef070065e71cb","subject":"arm-asm: Raise error if user tries to use a shift instruction with an immediate source operand","message":"arm-asm: Raise error if user tries to use a shift instruction with an immediate source operand\n","repos":"mingodad\/tinycc,mirror\/tinycc,mirror\/tinycc,mirror\/tinycc,mingodad\/tinycc,mirror\/tinycc,mingodad\/tinycc,mingodad\/tinycc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- arm-asm.c\n+++ arm-asm.c\n@@ -865,7 +865,8 @@\n case OP_IM8:\n operands |= ENCODE_IMMEDIATE_FLAG;\n operands |= ops[1].e.v;\n- break;\n+ tcc_error(\"Using an immediate value as the source operand is not possible with '%s' instruction on ARM\", get_tok_str(token, NULL));\n+ return;\n }\n \n switch (ops[2].type) {\n"} {"commit":"6a2cb6c506fffbe1fb1cf4529fcb2f5be0340af3","subject":"Now working on 0.7.5","message":"Now working on 0.7.5\n","repos":"dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node,dreamllq\/node","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"2373b33e8f9ae24454dad7f399688efa1a22a33e","subject":"","message":"\n\navoifd duplicates with shadows\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/dropshadow\/e_mod_main.c\n+++ src\/modules\/dropshadow\/e_mod_main.c\n@@ -738,6 +738,7 @@\n for (i = 0; i < 4; i++)\n {\n \tsh->object[i] = evas_object_image_add(con->bg_evas);\n+\tevas_object_image_alpha_set(sh->object[i], 1);\n \tevas_object_layer_set(sh->object[i], 10);\n \tevas_object_pass_events_set(sh->object[i], 1);\n \tevas_object_move(sh->object[i], 0, 0);\n@@ -770,6 +771,7 @@\n \tif (so)\n \t {\n \t o = evas_object_image_add(con->bg_evas);\n+\t evas_object_image_alpha_set(o, 1);\n \t evas_object_layer_set(o, 10);\n \t evas_object_pass_events_set(o, 1);\n \t evas_object_move(o, r->x, r->y);\n@@ -2332,9 +2334,9 @@\n _ds_shstore_object_set(Shstore *st, Evas_Object *o)\n {\n evas_object_image_size_set(o, st->w, st->h);\n+ evas_object_image_alpha_set(o, 1);\n evas_object_image_data_set(o, st->pix);\n evas_object_image_data_update_add(o, 0, 0, st->w, st->h);\n- evas_object_image_alpha_set(o, 1);\n }\n \n static void\n"} {"commit":"87a4af9ec3f5d3bb94659eed8bdae460a67072d5","subject":"","message":"\n\ngit-svn-id: https:\/\/www.imagemagick.org\/subversion\/ImageMagick\/branches\/ImageMagick-6@13177 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74\n","repos":"Distrotech\/ImageMagick,Distrotech\/ImageMagick,Distrotech\/ImageMagick,Distrotech\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- coders\/txt.c\n+++ coders\/txt.c\n@@ -687,7 +687,7 @@\n (void) FormatLocaleString(buffer,MaxTextExtent,\n \"# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\\n\",(double)\n image->columns,(double) image->rows,(double)\n- GetQuantumRange(image->depth),colorspace);\n+ ((MagickOffsetType) GetQuantumRange(image->depth)),colorspace);\n (void) WriteBlobString(image,buffer);\n compliance=SVGCompliance;\n }\n"} {"commit":"90f640953d06fac44aae2970e062cfde626e0955","subject":"Minor FORMAT descriptor reprint fixes","message":"Minor FORMAT descriptor reprint fixes\n","repos":"CodethinkLabs\/ofc,CodethinkLabs\/ofc,CodethinkLabs\/ofc,CodethinkLabs\/ofc","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"6c9db282639ceb69f62abc5d2e0e630bdf770a6f","subject":"refactor","message":"refactor\n","repos":"GravisZro\/pdtk,GravisZro\/pdtk","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- asocket.h\n+++ asocket.h\n@@ -44,10 +44,10 @@\n void async_write(void);\n \n protected:\n- struct async_pkg_t\n+ struct async_channel_t\n {\n- inline async_pkg_t(void) : buffer(0) { } \/\/ empty buffer\n- inline ~async_pkg_t(void) { posix::close(socket); thread.detach(); }\n+ inline async_channel_t(void) : buffer(0) { } \/\/ empty buffer\n+ inline ~async_channel_t(void) { posix::close(socket); thread.detach(); }\n posix::fd_t socket;\n vqueue buffer;\n posix::fd_t fd;\n@@ -56,8 +56,8 @@\n };\n \n std::mutex m_connection;\n- async_pkg_t m_read;\n- async_pkg_t m_write;\n+ async_channel_t m_read;\n+ async_channel_t m_write;\n posix::sockaddr_t m_addr;\n bool m_connected;\n bool m_bound;\n"} {"commit":"05bb3730ea915217190862fc646efe40575877e0","subject":"Begin adding Node.js compliant Error throwing","message":"Begin adding Node.js compliant Error throwing\n","repos":"hypoalex\/mininode,hypoalex\/mininode,hypoalex\/mininode","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/modules\/fs\/methods\/chown_sync.c\n+++ src\/modules\/fs\/methods\/chown_sync.c\n@@ -1,5 +1,7 @@\n #include \"duktape.h\"\n-#include <unistd.h>\n+#include <unistd.h> \/* for chown() *\/\n+#include <string.h> \/* for strlen() *\/\n+#include <errno.h>\n \n \/*\n * We get the following duk stack arguments:\n@@ -11,21 +13,38 @@\n \n duk_ret_t\n mn_bi_fs_chown_sync(duk_context *ctx) {\n+\tconst char *path = duk_require_string(ctx, -3);\n+\tconst int uid = duk_require_int(ctx, -2);\n+\tconst int gid = duk_require_int(ctx, -1);\n+\tduk_idx_t err_idx;\n+\tint result;\n+\n \t\/*\n \t * Invoking with less than three arguments will raise an error:\n \t * TypeError: number required, found undefined (stack index -1)\n \t *\/\n-\tconst char *path = duk_require_string(ctx, -3);\n-\tconst int uid = duk_require_int(ctx, -2);\n-\tconst int gid = duk_require_int(ctx, -1);\n \n-\tint result = chown(path, uid, gid);\n+\tresult = chown(path, uid, gid);\n+\n \tif (result != -1) {\n \t\t\/* On success, we don't return anything on the stack. *\/\n \t\treturn 0;\n \t} else {\n-\t\tprintf(\"FIXME: Error!\\n\");\n-\t\t\/* TODO: On failure, raise Error and return it on the stack. *\/\n+\t\t\/*\n+\t\t * TODO: Raise Node.js compliant errors.\n+\t\t * { [Error: EPERM: operation not permitted, chown '\/wat']\n+\t\t * errno: -1,\n+\t\t * code: 'EPERM',\n+\t\t * syscall: 'chown',\n+\t\t * path: '\/wat' }\n+\t\t *\/\n+\t\terr_idx = duk_push_error_object(\n+\t\t\tctx,\n+\t\t\tDUK_ERR_API_ERROR,\n+\t\t\t\"chown() returned error: %d\",\n+\t\t\terrno\n+\t\t);\n+\t\tduk_throw(ctx);\n \t\treturn 1;\n \t}\n }\n"} {"commit":"d69461c185a0294c36f6ab7eb87d9710a7c61ae1","subject":"Add print() method;","message":"Add print() method;\n","repos":"MichaelZalla\/data-structures-review,MichaelZalla\/data-structures-review","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/07-vector\/Vector.h\n+++ src\/07-vector\/Vector.h\n@@ -1,3 +1,6 @@\n+#include <iostream>\n+#include <algorithm>\n+\n #include \"..\/assert.h\"\n #include \"..\/IndexOutOfBounds.h\"\n \n@@ -34,6 +37,29 @@\n \t\t\tdelete[] this->collection;\n \n \t\t}\n+\t}\n+\n+\tvoid print()\n+\t{\n+\n+\t\tstd::cout << \"Vector({ \";\n+\n+\t\tint lastIndex = this->size() - 1;\n+\n+\t\tfor(int i = 0; i < this->size(); i++)\n+\t\t{\n+\n+\t\t\tstd::cout << this->at(i);\n+\n+\t\t\tif(i != lastIndex)\n+\t\t\t{\n+\t\t\t\tstd::cout << \", \";\n+\t\t\t}\n+\n+\t\t}\n+\n+\t\tstd::cout << \" })\" << std::endl;\n+\n \t}\n \n \tint size() const\n"} {"commit":"070892ee12ab22682bd32ce36a95f50d20fbd665","subject":"Fix crash with lovr.event.quit(\"restart\") on Oculus Mobile","message":"Fix crash with lovr.event.quit(\"restart\") on Oculus Mobile\n\nBecause of how and when draws occur in our Oculus Mobile path, during a restart it would attempt to draw a frame after lovrGraphicsDestroy() is called, leading to a crash in lovrGraphicsSetCamera(). This blocks draws until the restart is finished and renderTo() has been called (conveniently detectable using the existing state.renderCallback).\n","repos":"bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr,bjornbytes\/lovr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/modules\/headset\/oculus_mobile.c\n+++ src\/modules\/headset\/oculus_mobile.c\n@@ -488,6 +488,9 @@\n }\n \n void bridgeLovrDraw(BridgeLovrDrawData *drawData) {\n+ if (!state.renderCallback) \/\/ Do not draw if there is nothing to draw.\n+ return;\n+\n lovrGpuDirtyTexture(); \/\/ Clear texture state since L\u00d6VR doesn't completely own the GL context\n \n \/\/ Initialize a temporary Canvas from the framebuffer handle created by lovr-oculus-mobile\n@@ -508,9 +511,7 @@\n \n lovrGraphicsSetCamera(&camera, true);\n \n- if (state.renderCallback) {\n- state.renderCallback(state.renderUserdata);\n- }\n+ state.renderCallback(state.renderUserdata);\n \n lovrGraphicsSetCamera(NULL, false);\n lovrCanvasDestroy(&canvas);\n"} {"commit":"18462f30676aef66d727357b576d8da0ed06f43d","subject":"add ecore_con_url callback only once and download posters files","message":"add ecore_con_url callback only once and download posters files\n","repos":"raoulh\/Enna-Media-Server,raoulh\/Enna-Media-Server,raoulh\/Enna-Media-Server,enna-project\/Enna-Media-Server,enna-project\/Enna-Media-Server,enna-project\/Enna-Media-Server,raoulh\/Enna-Media-Server,raoulh\/Enna-Media-Server,enna-project\/Enna-Media-Server,enna-project\/Enna-Media-Server","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/tmdb\/ems_grabber_tmdb.c\n+++ src\/modules\/tmdb\/ems_grabber_tmdb.c\n@@ -34,6 +34,7 @@\n #include \"ems_private.h\"\n #include \"ems_utils.h\"\n #include \"ems_database.h\"\n+#include \"ems_downloader.h\"\n #include \"cJSON.h\"\n \n \/*============================================================================*\n@@ -77,31 +78,6 @@\n static Eina_Hash *_hash_req = NULL;\n \n static void\n-_request_free_cb(Ems_Tmdb_Req *req)\n-{\n- if (!req)\n- return;\n- if (req->filename) eina_stringshare_del(req->filename);\n- if (req->search) eina_stringshare_del(req->search);\n- if (req->buf) eina_strbuf_free(req->buf);\n- free(req);\n-}\n-\n-\n-static Eina_Bool\n-_grabber_tmdb_init(void)\n-{\n- INF(\"Init TMDb grabber\");\n- ecore_con_init();\n- ecore_con_url_init();\n-\n- _hash_req = eina_hash_pointer_new((Eina_Free_Cb)_request_free_cb);\n-\n- return EINA_TRUE;\n-}\n-\n-\n-static void\n _grabber_tmdb_shutdown(void)\n {\n INF(\"Shutdown TMDb grabber\");\n@@ -116,13 +92,13 @@\n {\n Ems_Tmdb_Req *req = eina_hash_find(_hash_req, ev->url_con);\n \n- if (!req || ev->url_con != req->ec_url)\n- return ECORE_CALLBACK_RENEW;\n+ if (!req)\n+ return EINA_TRUE;\n \n if (req->buf)\n eina_strbuf_append_length(req->buf, (char*)&ev->data[0], ev->size);\n \n- return ECORE_CALLBACK_RENEW;\n+ return EINA_FALSE;\n }\n \n #define GETVAL(val, type, eina_type) \\\n@@ -159,11 +135,8 @@\n \n Ems_Tmdb_Req *req = eina_hash_find(_hash_req, url_complete->url_con);\n \n- if (!req || url_complete->url_con != req->ec_url)\n- {\n- ERR(\"There is maybe a problem here ?\");\n- return EINA_TRUE;\n- }\n+ if (!req)\n+ return EINA_TRUE;\n \n DBG(\"download completed for %s with status code: %d\", req->filename, url_complete->status);\n if (url_complete->status != 200)\n@@ -183,13 +156,15 @@\n {\n cJSON *root;\n cJSON *m;\n+ cJSON *posters;\n int size = 0;\n+ int i;\n \n \/\/DBG(\"Search request data : %s\", eina_strbuf_string_get(req->buf));\n root = cJSON_Parse(eina_strbuf_string_get(req->buf));\n if (root)\n size = cJSON_GetArraySize(root);\n-\n+ \/\/DBG(\"%s\", cJSON_Print(root));\n \/\/DBG(\"Size %d\", size);\n \n if (!size)\n@@ -230,7 +205,39 @@\n GETVALSTR(released, valuestring, EINA_VALUE_TYPE_STRINGSHARE);\n GETVAL(version, valueint, EINA_VALUE_TYPE_INT);\n GETVALSTR(last_modified_at, valuestring, EINA_VALUE_TYPE_STRINGSHARE);\n+\n+ posters = cJSON_GetObjectItem(m, \"posters\");\n+ if (posters)\n+ {\n+ size = cJSON_GetArraySize(posters);\n+ for (i = 0; i < size; i++)\n+ {\n+ cJSON *it_image, *it;\n+ m = cJSON_GetArrayItem(posters, i);\n+ it_image = cJSON_GetObjectItem(m, \"image\");\n+ if (it_image)\n+ {\n+ it = cJSON_GetObjectItem(it_image, \"size\");\n+ if (it && !strcmp(it->valuestring, \"original\"))\n+ {\n+ it = cJSON_GetObjectItem(it_image, \"url\");\n+ if (it)\n+ {\n+ Eina_Value v;\n+ eina_value_setup(&v, EINA_VALUE_TYPE_STRINGSHARE);\n+ eina_value_set(&v, eina_stringshare_add(it->valuestring));\n+ ems_database_meta_insert(ems_config->db, req->filename, \"poster_url\", &v);\n+ ems_downloader_url_download(it->valuestring, NULL, NULL);\n+ DBG(\"%s\", it->valuestring);\n+ break;\n+\n+ }\n+ }\n+ }\n+ }\n+ }\n ems_database_transaction_end(ems_config->db);\n+\n cJSON_Delete(root);\n end_req:\n if (req->end_cb)\n@@ -258,7 +265,32 @@\n return EINA_FALSE;\n }\n \n-\n+static void\n+_request_free_cb(Ems_Tmdb_Req *req)\n+{\n+ if (!req)\n+ return;\n+ if (req->filename) eina_stringshare_del(req->filename);\n+ if (req->search) eina_stringshare_del(req->search);\n+ if (req->buf) eina_strbuf_free(req->buf);\n+ free(req);\n+}\n+\n+\n+static Eina_Bool\n+_grabber_tmdb_init(void)\n+{\n+ INF(\"Init TMDb grabber\");\n+ ecore_con_init();\n+ ecore_con_url_init();\n+\n+ _hash_req = eina_hash_pointer_new((Eina_Free_Cb)_request_free_cb);\n+\n+ ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, (Ecore_Event_Handler_Cb)_search_complete_cb, NULL);\n+ ecore_event_handler_add(ECORE_CON_EVENT_URL_DATA, (Ecore_Event_Handler_Cb)_search_data_cb, NULL);\n+\n+ return EINA_TRUE;\n+}\n \n \n \/*============================================================================*\n@@ -310,8 +342,6 @@\n req->data = data;\n req->buf = eina_strbuf_new();\n \n- ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, (Ecore_Event_Handler_Cb)_search_complete_cb, NULL);\n- ecore_event_handler_add(ECORE_CON_EVENT_URL_DATA, (Ecore_Event_Handler_Cb)_search_data_cb, NULL);\n req->state = EMS_REQUEST_STATE_SEARCH;\n \n eina_hash_add(_hash_req, ec_url, req);\n"} {"commit":"6443545bca58ca1db7558529493edb64bc2a6be9","subject":"switched polarity of card detect pin","message":"switched polarity of card detect pin\n","repos":"Tech4Race\/nrf5x-base,lab11\/nrf5x-base,Tech4Race\/nrf5x-base,lab11\/nrf5x-base,Tech4Race\/nrf5x-base,lab11\/nrf5x-base,lab11\/nrf5x-base,Tech4Race\/nrf5x-base","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/simple_logger\/chanfs\/mmc_nrf.c\n+++ lib\/simple_logger\/chanfs\/mmc_nrf.c\n@@ -8,7 +8,7 @@\n \r\n #define CS_HIGH()\tnrf_gpio_pin_set(SPI_CS_PIN)\r\n #define CS_LOW()\tnrf_gpio_pin_clear(SPI_CS_PIN)\r\n-#define\tMMC_CD\t\tnrf_gpio_pin_read(CD_PIN)\r\n+#define\tMMC_CD\t\t!nrf_gpio_pin_read(CD_PIN)\r\n #define\tMMC_WP\t\t0\r\n \r\n #define SD_POWER_ON()\t\tnrf_gpio_pin_clear(SD_ENABLE_PIN)\r\n"} {"commit":"992681fc90ab34d2706e65d2ed953fa8c41cb87b","subject":"PWGDQ\/LMEE: quick fix to initialization of Q vector","message":"PWGDQ\/LMEE: quick fix to initialization of Q vector\n","repos":"SHornung1\/AliPhysics,alisw\/AliPhysics,mpuccio\/AliPhysics,rbailhac\/AliPhysics,alisw\/AliPhysics,dmuhlhei\/AliPhysics,pchrista\/AliPhysics,rbailhac\/AliPhysics,AMechler\/AliPhysics,rihanphys\/AliPhysics,AMechler\/AliPhysics,pchrista\/AliPhysics,fbellini\/AliPhysics,amaringarcia\/AliPhysics,hzanoli\/AliPhysics,rihanphys\/AliPhysics,rbailhac\/AliPhysics,SHornung1\/AliPhysics,nschmidtALICE\/AliPhysics,adriansev\/AliPhysics,victor-gonzalez\/AliPhysics,adriansev\/AliPhysics,amaringarcia\/AliPhysics,lcunquei\/AliPhysics,fbellini\/AliPhysics,adriansev\/AliPhysics,pchrista\/AliPhysics,SHornung1\/AliPhysics,hzanoli\/AliPhysics,AMechler\/AliPhysics,adriansev\/AliPhysics,fbellini\/AliPhysics,amaringarcia\/AliPhysics,fcolamar\/AliPhysics,mpuccio\/AliPhysics,dmuhlhei\/AliPhysics,nschmidtALICE\/AliPhysics,fcolamar\/AliPhysics,rihanphys\/AliPhysics,amaringarcia\/AliPhysics,SHornung1\/AliPhysics,dmuhlhei\/AliPhysics,victor-gonzalez\/AliPhysics,amaringarcia\/AliPhysics,victor-gonzalez\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,lcunquei\/AliPhysics,amaringarcia\/AliPhysics,lcunquei\/AliPhysics,SHornung1\/AliPhysics,alisw\/AliPhysics,dmuhlhei\/AliPhysics,dmuhlhei\/AliPhysics,fcolamar\/AliPhysics,adriansev\/AliPhysics,adriansev\/AliPhysics,mpuccio\/AliPhysics,dmuhlhei\/AliPhysics,lcunquei\/AliPhysics,AMechler\/AliPhysics,hzanoli\/AliPhysics,rihanphys\/AliPhysics,dmuhlhei\/AliPhysics,nschmidtALICE\/AliPhysics,fcolamar\/AliPhysics,mpuccio\/AliPhysics,alisw\/AliPhysics,rihanphys\/AliPhysics,lcunquei\/AliPhysics,AMechler\/AliPhysics,rbailhac\/AliPhysics,AMechler\/AliPhysics,victor-gonzalez\/AliPhysics,lcunquei\/AliPhysics,rihanphys\/AliPhysics,SHornung1\/AliPhysics,victor-gonzalez\/AliPhysics,nschmidtALICE\/AliPhysics,fbellini\/AliPhysics,hzanoli\/AliPhysics,rbailhac\/AliPhysics,AMechler\/AliPhysics,alisw\/AliPhysics,alisw\/AliPhysics,amaringarcia\/AliPhysics,nschmidtALICE\/AliPhysics,fbellini\/AliPhysics,fcolamar\/AliPhysics,lcunquei\/AliPhysics,hzanoli\/AliPhysics,mpuccio\/AliPhysics,fcolamar\/AliPhysics,alisw\/AliPhysics,fbellini\/AliPhysics,pchrista\/AliPhysics,pchrista\/AliPhysics,victor-gonzalez\/AliPhysics,pchrista\/AliPhysics,fbellini\/AliPhysics,fcolamar\/AliPhysics,rbailhac\/AliPhysics,adriansev\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,pchrista\/AliPhysics,rihanphys\/AliPhysics,mpuccio\/AliPhysics,SHornung1\/AliPhysics,mpuccio\/AliPhysics,victor-gonzalez\/AliPhysics,rbailhac\/AliPhysics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- PWGDQ\/dielectron\/core\/AliDielectronVarManager.h\n+++ PWGDQ\/dielectron\/core\/AliDielectronVarManager.h\n@@ -3053,20 +3053,20 @@\n values[AliDielectronVarManager::kV0ACxH2] = qvec[0];\n values[AliDielectronVarManager::kV0ACyH2] = qvec[1];\n values[AliDielectronVarManager::kV0ACrpH2] = qvec[2];\n- \/\/ VZERO event plane resolution\n- values[AliDielectronVarManager::kV0ArpResH2] = 1.0;\n- values[AliDielectronVarManager::kV0CrpResH2] = 1.0;\n- values[AliDielectronVarManager::kV0ACrpResH2] = 1.0;\n- \/\/ Q vector components correlations\n- values[AliDielectronVarManager::kV0XaXcH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0CxH2];\n- values[AliDielectronVarManager::kV0XaYaH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0AyH2];\n- values[AliDielectronVarManager::kV0XaYcH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0CyH2];\n- values[AliDielectronVarManager::kV0YaXcH2] = values[AliDielectronVarManager::kV0AyH2]*values[AliDielectronVarManager::kV0CxH2];\n- values[AliDielectronVarManager::kV0YaYcH2] = values[AliDielectronVarManager::kV0AyH2]*values[AliDielectronVarManager::kV0CyH2];\n- values[AliDielectronVarManager::kV0XcYcH2] = values[AliDielectronVarManager::kV0CxH2]*values[AliDielectronVarManager::kV0CyH2];\n-\n+ \/\/ VZERO event plane resolution\n+ values[AliDielectronVarManager::kV0ArpResH2] = 1.0;\n+ values[AliDielectronVarManager::kV0CrpResH2] = 1.0;\n+ values[AliDielectronVarManager::kV0ACrpResH2] = 1.0;\n+ \/\/ Q vector components correlations\n+ values[AliDielectronVarManager::kV0XaXcH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0CxH2];\n+ values[AliDielectronVarManager::kV0XaYaH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0AyH2];\n+ values[AliDielectronVarManager::kV0XaYcH2] = values[AliDielectronVarManager::kV0AxH2]*values[AliDielectronVarManager::kV0CyH2];\n+ values[AliDielectronVarManager::kV0YaXcH2] = values[AliDielectronVarManager::kV0AyH2]*values[AliDielectronVarManager::kV0CxH2];\n+ values[AliDielectronVarManager::kV0YaYcH2] = values[AliDielectronVarManager::kV0AyH2]*values[AliDielectronVarManager::kV0CyH2];\n+ values[AliDielectronVarManager::kV0XcYcH2] = values[AliDielectronVarManager::kV0CxH2]*values[AliDielectronVarManager::kV0CyH2];\n \n \/\/ TPC event plane quantities\n+ qvec[0]=0.0; qvec[1]=0.0; qvec[2]=0.0;\n GetTPCRP(event, qvec,0);\n values[AliDielectronVarManager::kTPCxH2] = qvec[0];\n values[AliDielectronVarManager::kTPCyH2] = qvec[1];\n@@ -4196,6 +4196,7 @@\n \/\/ 2nd harmonic\n qvec[0] += absWeight*(2.0*TMath::Power(x,2.0)-1);\n qvec[1] += absWeight*(2.0*x*y);\n+\n }\/\/end of track loop\n }\/\/end of AOD event\n \n@@ -4217,7 +4218,6 @@\n if(TMath::Abs(vtxZ)>10.) return;\n if(centralityV0M < 0. || centralityV0M > 90.) return;\n \n- Int_t binCent = -1; Int_t binVtx = -1;\n if(fgTPCRecentering[0]) {\n \/\/ printf(\"TPC: %p\\n\",fgTPCRecentering[0]);\n Int_t binCentRecenter = -1; Int_t binVtxRecenter = -1;\n"} {"commit":"ebfc0fdc676eb4e0e99fc59ab6da6919fa2ef471","subject":"Added comment.","message":"Added comment.","repos":"Tri125\/MCServer,thetaeo\/cuberite,nichwall\/cuberite,thetaeo\/cuberite,Fighter19\/cuberite,QUSpilPrgm\/cuberite,nicodinh\/cuberite,marvinkopf\/cuberite,zackp30\/cuberite,Altenius\/cuberite,jammet\/MCServer,Fighter19\/cuberite,tonibm19\/cuberite,ionux\/MCServer,Fighter19\/cuberite,birkett\/cuberite,Howaner\/MCServer,Howaner\/MCServer,linnemannr\/MCServer,Haxi52\/cuberite,nounoursheureux\/MCServer,electromatter\/cuberite,nounoursheureux\/MCServer,QUSpilPrgm\/cuberite,nounoursheureux\/MCServer,thetaeo\/cuberite,Fighter19\/cuberite,jammet\/MCServer,nicodinh\/cuberite,Haxi52\/cuberite,nevercast\/cuberite,johnsoch\/cuberite,tonibm19\/cuberite,nevercast\/cuberite,johnsoch\/cuberite,Schwertspize\/cuberite,HelenaKitty\/EbooMC,Altenius\/cuberite,mmdk95\/cuberite,Frownigami1\/cuberite,nevercast\/cuberite,kevinr\/cuberite,Altenius\/cuberite,marvinkopf\/cuberite,linnemannr\/MCServer,nicodinh\/cuberite,zackp30\/cuberite,nevercast\/cuberite,Fighter19\/cuberite,bendl\/cuberite,nichwall\/cuberite,Frownigami1\/cuberite,electromatter\/cuberite,mc-server\/MCServer,guijun\/MCServer,mc-server\/MCServer,nichwall\/cuberite,ionux\/MCServer,electromatter\/cuberite,Schwertspize\/cuberite,Tri125\/MCServer,linnemannr\/MCServer,birkett\/MCServer,Tri125\/MCServer,HelenaKitty\/EbooMC,mjssw\/cuberite,birkett\/MCServer,birkett\/MCServer,thetaeo\/cuberite,SamOatesPlugins\/cuberite,linnemannr\/MCServer,Haxi52\/cuberite,Howaner\/MCServer,electromatter\/cuberite,kevinr\/cuberite,zackp30\/cuberite,nicodinh\/cuberite,kevinr\/cuberite,QUSpilPrgm\/cuberite,tonibm19\/cuberite,birkett\/cuberite,mmdk95\/cuberite,guijun\/MCServer,ionux\/MCServer,HelenaKitty\/EbooMC,Howaner\/MCServer,HelenaKitty\/EbooMC,tonibm19\/cuberite,Tri125\/MCServer,nicodinh\/cuberite,tonibm19\/cuberite,birkett\/cuberite,johnsoch\/cuberite,nichwall\/cuberite,zackp30\/cuberite,mmdk95\/cuberite,birkett\/MCServer,SamOatesPlugins\/cuberite,thetaeo\/cuberite,Fighter19\/cuberite,Tri125\/MCServer,bendl\/cuberite,jammet\/MCServer,marvinkopf\/cuberite,mjssw\/cuberite,QUSpilPrgm\/cuberite,mjssw\/cuberite,mc-server\/MCServer,tonibm19\/cuberite,ionux\/MCServer,birkett\/cuberite,mmdk95\/cuberite,johnsoch\/cuberite,Altenius\/cuberite,ionux\/MCServer,guijun\/MCServer,kevinr\/cuberite,Frownigami1\/cuberite,marvinkopf\/cuberite,birkett\/MCServer,johnsoch\/cuberite,jammet\/MCServer,QUSpilPrgm\/cuberite,mjssw\/cuberite,Tri125\/MCServer,bendl\/cuberite,Altenius\/cuberite,kevinr\/cuberite,HelenaKitty\/EbooMC,Haxi52\/cuberite,Howaner\/MCServer,birkett\/cuberite,nichwall\/cuberite,nounoursheureux\/MCServer,nounoursheureux\/MCServer,electromatter\/cuberite,Schwertspize\/cuberite,thetaeo\/cuberite,Frownigami1\/cuberite,zackp30\/cuberite,Haxi52\/cuberite,zackp30\/cuberite,ionux\/MCServer,guijun\/MCServer,mc-server\/MCServer,Frownigami1\/cuberite,Schwertspize\/cuberite,birkett\/MCServer,mmdk95\/cuberite,linnemannr\/MCServer,QUSpilPrgm\/cuberite,nevercast\/cuberite,mjssw\/cuberite,SamOatesPlugins\/cuberite,marvinkopf\/cuberite,guijun\/MCServer,linnemannr\/MCServer,Schwertspize\/cuberite,mc-server\/MCServer,SamOatesPlugins\/cuberite,mmdk95\/cuberite,marvinkopf\/cuberite,birkett\/cuberite,nichwall\/cuberite,SamOatesPlugins\/cuberite,nevercast\/cuberite,kevinr\/cuberite,nicodinh\/cuberite,Howaner\/MCServer,jammet\/MCServer,guijun\/MCServer,bendl\/cuberite,jammet\/MCServer,bendl\/cuberite,electromatter\/cuberite,Haxi52\/cuberite,mc-server\/MCServer,nounoursheureux\/MCServer,mjssw\/cuberite","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/Blocks\/BlockSlab.h\n+++ src\/Blocks\/BlockSlab.h\n@@ -119,6 +119,9 @@\n \t\t\treturn;\n \t\t}\n \n+\t\t\/* Sends the slab back to the client.\n+\t\tThe normal back sending adds the block face to the locations, but this don't work because the Y-Coordinate with the block face\n+\t\tis one higher than the real slab position. *\/\n \t\ta_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);\n \t}\n \t\n"} {"commit":"4984be8e3fcc81c12932e620d923b6034aebe1b6","subject":"Tightly scope variables pct and a in xstatus_draw_battery().","message":"Tightly scope variables pct and a in xstatus_draw_battery().\n","repos":"jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus,jefbed\/xstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- battery.c\n+++ battery.c\n@@ -66,15 +66,23 @@\n \tconst xcb_window_t w = xstatus_get_window(xc);\n \tif (!*gc)\n \t\tinit_gcs(xc, w, gc);\n-\tconst uint8_t pct = get_percent();\n-\tconst enum BATGCs a = get_gc(pct);\n-\txcb_rectangle_t g = {.x=start, .y = XSTATUS_CONST_HEIGHT >> 2,\n-\t\t.height = XSTATUS_CONST_HEIGHT >> 1, .width = end - start\n-\t\t\t- XSTATUS_CONST_PAD};\n-\t++g.y;\n-\txcb_poly_fill_rectangle(xc, w, gc[BATTERY_GC_BACKGROUND], 1, &g);\n-\tg.width = g.width * pct \/ 100;\n-\txcb_poly_fill_rectangle(xc, w, gc[a], 1, &g);\n-\tdraw_percent(xc, gc[a], pct, start + (end-start)\/2);\n+\t{ \/\/ pct scope\n+\t\tconst uint8_t pct = get_percent();\n+\t\t{ \/\/ a scope\n+\t\t\tconst enum BATGCs a = get_gc(pct);\n+\t\t\t{ \/\/ g scope\n+\t\t\t\txcb_rectangle_t g = {.x=start,\n+\t\t\t\t\t.y = (XSTATUS_CONST_HEIGHT >> 2) + 1,\n+\t\t\t\t\t.height = XSTATUS_CONST_HEIGHT >> 1,\n+\t\t\t\t\t.width = end - start\n+\t\t\t\t\t\t- XSTATUS_CONST_PAD};\n+\t\t\t\txcb_poly_fill_rectangle(xc, w,\n+\t\t\t\t\tgc[BATTERY_GC_BACKGROUND], 1, &g);\n+\t\t\t\tg.width = g.width * pct \/ 100;\n+\t\t\t\txcb_poly_fill_rectangle(xc, w, gc[a], 1, &g);\n+\t\t\t}\n+\t\t\tdraw_percent(xc, gc[a], pct, start + (end-start)\/2);\n+\t\t}\n+\t}\n \txcb_flush(xc);\n }\n"} {"commit":"9115b8834c21ba5ca8e3d4a1e7a23cc2cd0b2996","subject":"Tidied create_Map (a little!)","message":"Tidied create_Map (a little!)\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/unemap\/mapping.c\n+++ source\/unemap\/mapping.c\n@@ -6540,8 +6540,11 @@\n \t\t\t\tmap->interpolation_type=BICUBIC_INTERPOLATION;\n \t\t\t}\n \t\t\telse\n-\t\t\t{if (POTENTIAL== *(map->type))\n-\t\t\t\tmap->interpolation_type=NO_INTERPOLATION;\n+\t\t\t{\n+\t\t\t\tif (POTENTIAL== *(map->type))\n+\t\t\t\t{\n+\t\t\t\t\tmap->interpolation_type=NO_INTERPOLATION;\n+\t\t\t\t}\n \t\t\t}\n \t\t\tXtVaGetApplicationResources(user_interface->application_shell,\n \t\t\t\t&electrodes_marker_type,resources_5,XtNumber(resources_5),\n@@ -6590,11 +6593,11 @@\n \t\t\t\t&draw_on_update,resources_10,XtNumber(resources_10),NULL);\n \t\t\tif (fuzzy_string_compare(draw_on_update,\"true\"))\n \t\t\t{\n-\t\t\t\tmap->draw_map_on_maunal_time_update=1;\t\t\t\n+\t\t\t\tmap->draw_map_on_manual_time_update=1;\t\t\t\n \t\t\t}\n \t\t\telse\n \t\t\t{\n-\t\t\t\tmap->draw_map_on_maunal_time_update=0;\t\t\t\t\n+\t\t\t\tmap->draw_map_on_manual_time_update=0;\t\t\t\t\n \t\t\t}\n \t\t\tmap->colour_electrodes_with_signal=1;\n \t\t\t\/*??? calculate from rig ? *\/\n"} {"commit":"46f08578146b172dafaa2f0b6bee89547587941c","subject":"overwrite select collision cand","message":"overwrite select collision cand\n\n","repos":"mpuccio\/AliPhysics,ALICEHLT\/AliPhysics,rbailhac\/AliPhysics,fcolamar\/AliPhysics,rderradi\/AliPhysics,fcolamar\/AliPhysics,mbjadhav\/AliPhysics,yowatana\/AliPhysics,dstocco\/AliPhysics,jgronefe\/AliPhysics,kreisl\/AliPhysics,hcab14\/AliPhysics,rbailhac\/AliPhysics,ALICEHLT\/AliPhysics,hzanoli\/AliPhysics,rihanphys\/AliPhysics,yowatana\/AliPhysics,fcolamar\/AliPhysics,pbatzing\/AliPhysics,rihanphys\/AliPhysics,mazimm\/AliPhysics,jmargutt\/AliPhysics,lcunquei\/AliPhysics,nschmidtALICE\/AliPhysics,mvala\/AliPhysics,hcab14\/AliPhysics,dstocco\/AliPhysics,victor-gonzalez\/AliPhysics,AMechler\/AliPhysics,aaniin\/AliPhysics,rihanphys\/AliPhysics,amaringarcia\/AliPhysics,pchrista\/AliPhysics,aaniin\/AliPhysics,mazimm\/AliPhysics,carstooon\/AliPhysics,mvala\/AliPhysics,lcunquei\/AliPhysics,adriansev\/AliPhysics,jgronefe\/AliPhysics,kreisl\/AliPhysics,pbatzing\/AliPhysics,mkrzewic\/AliPhysics,fbellini\/AliPhysics,lfeldkam\/AliPhysics,alisw\/AliPhysics,adriansev\/AliPhysics,rihanphys\/AliPhysics,pbatzing\/AliPhysics,hzanoli\/AliPhysics,ALICEHLT\/AliPhysics,dlodato\/AliPhysics,jmargutt\/AliPhysics,AudreyFrancisco\/AliPhysics,jmargutt\/AliPhysics,hcab14\/AliPhysics,dlodato\/AliPhysics,yowatana\/AliPhysics,rbailhac\/AliPhysics,dstocco\/AliPhysics,dmuhlhei\/AliPhysics,AMechler\/AliPhysics,ppribeli\/AliPhysics,preghenella\/AliPhysics,btrzecia\/AliPhysics,jmargutt\/AliPhysics,lcunquei\/AliPhysics,ppribeli\/AliPhysics,ALICEHLT\/AliPhysics,sebaleh\/AliPhysics,amaringarcia\/AliPhysics,preghenella\/AliPhysics,amaringarcia\/AliPhysics,btrzecia\/AliPhysics,lcunquei\/AliPhysics,mvala\/AliPhysics,lfeldkam\/AliPhysics,dlodato\/AliPhysics,alisw\/AliPhysics,pbuehler\/AliPhysics,carstooon\/AliPhysics,pbuehler\/AliPhysics,amatyja\/AliPhysics,jgronefe\/AliPhysics,pchrista\/AliPhysics,btrzecia\/AliPhysics,alisw\/AliPhysics,hzanoli\/AliPhysics,pchrista\/AliPhysics,carstooon\/AliPhysics,fcolamar\/AliPhysics,AMechler\/AliPhysics,pbuehler\/AliPhysics,dstocco\/AliPhysics,akubera\/AliPhysics,akubera\/AliPhysics,mpuccio\/AliPhysics,pbatzing\/AliPhysics,carstooon\/AliPhysics,jmargutt\/AliPhysics,AudreyFrancisco\/AliPhysics,rderradi\/AliPhysics,rihanphys\/AliPhysics,alisw\/AliPhysics,lcunquei\/AliPhysics,sebaleh\/AliPhysics,AudreyFrancisco\/AliPhysics,mpuccio\/AliPhysics,sebaleh\/AliPhysics,nschmidtALICE\/AliPhysics,ppribeli\/AliPhysics,carstooon\/AliPhysics,mkrzewic\/AliPhysics,dlodato\/AliPhysics,dstocco\/AliPhysics,rderradi\/AliPhysics,btrzecia\/AliPhysics,yowatana\/AliPhysics,btrzecia\/AliPhysics,aaniin\/AliPhysics,dmuhlhei\/AliPhysics,nschmidtALICE\/AliPhysics,lfeldkam\/AliPhysics,yowatana\/AliPhysics,adriansev\/AliPhysics,ALICEHLT\/AliPhysics,amaringarcia\/AliPhysics,pbuehler\/AliPhysics,amaringarcia\/AliPhysics,hzanoli\/AliPhysics,AMechler\/AliPhysics,kreisl\/AliPhysics,AudreyFrancisco\/AliPhysics,adriansev\/AliPhysics,fbellini\/AliPhysics,mazimm\/AliPhysics,mpuccio\/AliPhysics,pbatzing\/AliPhysics,jgronefe\/AliPhysics,rbailhac\/AliPhysics,amatyja\/AliPhysics,amatyja\/AliPhysics,amaringarcia\/AliPhysics,adriansev\/AliPhysics,pbuehler\/AliPhysics,hcab14\/AliPhysics,hcab14\/AliPhysics,lfeldkam\/AliPhysics,amaringarcia\/AliPhysics,mkrzewic\/AliPhysics,victor-gonzalez\/AliPhysics,victor-gonzalez\/AliPhysics,fbellini\/AliPhysics,dstocco\/AliPhysics,rbailhac\/AliPhysics,akubera\/AliPhysics,hzanoli\/AliPhysics,lcunquei\/AliPhysics,mbjadhav\/AliPhysics,pchrista\/AliPhysics,aaniin\/AliPhysics,fbellini\/AliPhysics,hzanoli\/AliPhysics,mkrzewic\/AliPhysics,mazimm\/AliPhysics,amatyja\/AliPhysics,lfeldkam\/AliPhysics,mbjadhav\/AliPhysics,dmuhlhei\/AliPhysics,aaniin\/AliPhysics,mpuccio\/AliPhysics,ALICEHLT\/AliPhysics,akubera\/AliPhysics,mvala\/AliPhysics,jgronefe\/AliPhysics,ppribeli\/AliPhysics,jgronefe\/AliPhysics,SHornung1\/AliPhysics,jmargutt\/AliPhysics,pchrista\/AliPhysics,adriansev\/AliPhysics,pbatzing\/AliPhysics,pbuehler\/AliPhysics,rderradi\/AliPhysics,preghenella\/AliPhysics,aaniin\/AliPhysics,btrzecia\/AliPhysics,rderradi\/AliPhysics,hzanoli\/AliPhysics,preghenella\/AliPhysics,yowatana\/AliPhysics,dlodato\/AliPhysics,pchrista\/AliPhysics,akubera\/AliPhysics,dmuhlhei\/AliPhysics,nschmidtALICE\/AliPhysics,hcab14\/AliPhysics,nschmidtALICE\/AliPhysics,ppribeli\/AliPhysics,AudreyFrancisco\/AliPhysics,dmuhlhei\/AliPhysics,yowatana\/AliPhysics,jmargutt\/AliPhysics,dmuhlhei\/AliPhysics,dmuhlhei\/AliPhysics,AudreyFrancisco\/AliPhysics,aaniin\/AliPhysics,AMechler\/AliPhysics,mbjadhav\/AliPhysics,lfeldkam\/AliPhysics,amatyja\/AliPhysics,dlodato\/AliPhysics,mkrzewic\/AliPhysics,mazimm\/AliPhysics,fcolamar\/AliPhysics,sebaleh\/AliPhysics,nschmidtALICE\/AliPhysics,alisw\/AliPhysics,akubera\/AliPhysics,preghenella\/AliPhysics,fcolamar\/AliPhysics,sebaleh\/AliPhysics,fbellini\/AliPhysics,dstocco\/AliPhysics,carstooon\/AliPhysics,sebaleh\/AliPhysics,preghenella\/AliPhysics,AMechler\/AliPhysics,AudreyFrancisco\/AliPhysics,kreisl\/AliPhysics,mazimm\/AliPhysics,alisw\/AliPhysics,mkrzewic\/AliPhysics,pbatzing\/AliPhysics,lcunquei\/AliPhysics,mazimm\/AliPhysics,nschmidtALICE\/AliPhysics,amatyja\/AliPhysics,mpuccio\/AliPhysics,AMechler\/AliPhysics,rderradi\/AliPhysics,amatyja\/AliPhysics,ppribeli\/AliPhysics,victor-gonzalez\/AliPhysics,victor-gonzalez\/AliPhysics,alisw\/AliPhysics,victor-gonzalez\/AliPhysics,SHornung1\/AliPhysics,mvala\/AliPhysics,mbjadhav\/AliPhysics,lfeldkam\/AliPhysics,mkrzewic\/AliPhysics,hcab14\/AliPhysics,rihanphys\/AliPhysics,btrzecia\/AliPhysics,pchrista\/AliPhysics,mvala\/AliPhysics,kreisl\/AliPhysics,mpuccio\/AliPhysics,victor-gonzalez\/AliPhysics,kreisl\/AliPhysics,kreisl\/AliPhysics,mbjadhav\/AliPhysics,SHornung1\/AliPhysics,carstooon\/AliPhysics,SHornung1\/AliPhysics,dlodato\/AliPhysics,rderradi\/AliPhysics,SHornung1\/AliPhysics,fcolamar\/AliPhysics,akubera\/AliPhysics,sebaleh\/AliPhysics,SHornung1\/AliPhysics,adriansev\/AliPhysics,ALICEHLT\/AliPhysics,preghenella\/AliPhysics,SHornung1\/AliPhysics,pbuehler\/AliPhysics,ppribeli\/AliPhysics,rbailhac\/AliPhysics,mvala\/AliPhysics,jgronefe\/AliPhysics,fbellini\/AliPhysics,rbailhac\/AliPhysics,mbjadhav\/AliPhysics,fbellini\/AliPhysics,rihanphys\/AliPhysics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- PWGGA\/EMCALTasks\/AliEmcalPhysicsSelectionTask.h\n+++ PWGGA\/EMCALTasks\/AliEmcalPhysicsSelectionTask.h\n@@ -5,7 +5,7 @@\n \n #include \"AliPhysicsSelectionTask.h\"\n \n-class AliPhysicsSelection;\n+class AliEmcalPhysicsSelection;\n class TH1;\n \n class AliEmcalPhysicsSelectionTask : public AliPhysicsSelectionTask {\n@@ -18,9 +18,11 @@\n virtual void UserCreateOutputObjects();\n virtual void Terminate(Option_t*);\n \n- void SetDoWriteHistos(Bool_t b) { fDoWriteHistos = b; }\n Int_t GetNCalled() const { return fNCalled; }\n Int_t GetNAccepted() const { return fNAccepted; }\n+ void SetDoWriteHistos(Bool_t b) { fDoWriteHistos = b; }\n+ void SelectCollisionCandidates(UInt_t offlineTriggerMask = AliVEvent::kMB) \n+ { static_cast<AliEmcalPhysicsSelection*>(fPhysicsSelection)->SetTriggers(offlineTriggerMask); }\n \n protected:\n Bool_t fDoWriteHistos; \/\/=true then write output\n"} {"commit":"5a7a3fd0acc83f9688c1b281642ceb57688d6164","subject":"Fix messages","message":"Fix messages\n","repos":"blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library,blynkkk\/blynk-library","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/BlynkMultiClient.h\n+++ src\/BlynkMultiClient.h\n@@ -42,10 +42,10 @@\n for (int i = 0; i < _conn_qty; i++) {\r\n BlynkArduinoClientGen<T>::setClient(_conn_array[i]);\r\n if (BlynkArduinoClientGen<T>::connect()) {\r\n- BLYNK_LOG2(BLYNK_F(\"Connection established:\"), i);\r\n+ BLYNK_LOG3(BLYNK_F(\"Connection \"), i, F(\" OK\"));\r\n return true;\r\n } else {\r\n- BLYNK_LOG2(BLYNK_F(\"Connection failed:\"), i);\r\n+ BLYNK_LOG3(BLYNK_F(\"Connection \"), i, F(\" failed\"));\r\n }\r\n }\r\n return false;\r\n"} {"commit":"7c4898cbb2d6e653ae77932b80259d4e9137a07d","subject":"document-portal: Fix warning","message":"document-portal: Fix warning\n\nWe need to return something from main()\n","repos":"chergert\/xdg-app,flatpak\/flatpak,chergert\/xdg-app,thiblahute\/xdg-app,handsome-feng\/flatpak,GeorgesStavracas\/flatpak,handsome-feng\/flatpak,matthiasclasen\/xdg-app,flatpak\/flatpak,matthiasclasen\/flatpak,thiblahute\/xdg-app,matthiasclasen\/flatpak,flatpak\/flatpak,GeorgesStavracas\/flatpak,alexlarsson\/xdg-app,handsome-feng\/flatpak,matthiasclasen\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/xdg-app,GeorgesStavracas\/flatpak,amigadave\/flatpak,amigadave\/flatpak,chergert\/xdg-app,amigadave\/flatpak,matthiasclasen\/xdg-app,alexlarsson\/xdg-app,GeorgesStavracas\/flatpak,flatpak\/flatpak,thiblahute\/xdg-app,alexlarsson\/xdg-app,matthiasclasen\/xdg-app,handsome-feng\/flatpak,chergert\/xdg-app,handsome-feng\/flatpak,thiblahute\/xdg-app,amigadave\/flatpak,alexlarsson\/xdg-app","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- document-portal\/xdp-main.c\n+++ document-portal\/xdp-main.c\n@@ -762,4 +762,6 @@\n g_dbus_node_info_unref (introspection_data);\n \n do_exit (final_exit_status);\n-}\n+\n+ return 0;\n+}\n"} {"commit":"d68f0c400d7021979d745360d4fb318938914a38","subject":"Clarify precedence, per cppcheck.","message":"Clarify precedence, per cppcheck.\n","repos":"jefbed\/batwarn,jefbed\/batwarn","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- batwarn.c\n+++ batwarn.c\n@@ -100,7 +100,7 @@\n \t\t? handle_normal_battery(flags)\n \t\t: handle_low_battery(flags, charge);\n \tLOG(\"charge: %d\\n\", charge);\n-\tsleep(flags & BW_BEEN_LOW? 1 : WAIT);\n+\tsleep((flags & BW_BEEN_LOW) ? 1 : WAIT);\n \tgoto check;\n }\n \n"} {"commit":"983f73b06f1c4f356c4cc68fcba6a32724a56fc4","subject":"removed the unimplemented assignment operator for request_type. it wasn't necessary anymore","message":"removed the unimplemented assignment operator for request_type.\nit wasn't necessary anymore\n","repos":"mdg\/snapl,mdg\/snapl","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"f731a1a2071b4c412bef9b38287a6796ed82a82b","subject":"Remove a work-around for an assembler bug that has been fixed since April, 1997. The work-around causes problems under ELF.","message":"Remove a work-around for an assembler bug that has been fixed since\nApril, 1997. The work-around causes problems under ELF.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- crypto\/kerberosIV\/lib\/krb\/et_list.c\n+++ crypto\/kerberosIV\/lib\/krb\/et_list.c\n@@ -44,7 +44,7 @@\n \n #include \"config.h\"\n \n-RCSID(\"$Id: et_list.c,v 1.12 1997\/05\/13 09:45:01 bg Exp $\");\n+RCSID(\"$Id: et_list.c,v 1.1.1.1 1997\/09\/04 06:04:22 markm Exp $\");\n \n struct et_list {\n struct et_list *next;\n@@ -53,9 +53,6 @@\n \n #if defined(__GNUC__)\n \n-#ifdef __FreeBSD__\n-asm(\".globl __et_list\");\t\/* FreeBSD bug workaround *\/\n-#endif\n struct et_list * _et_list __attribute__ ((weak)) = 0;\n \n #else \/* !__GNUC__ *\/\n"} {"commit":"bf2642ab60de5d8cd7af5fcd73148f81ddd02801","subject":"Alpha: fix dct_unquantize_h263_inter\/intra_axp()","message":"Alpha: fix dct_unquantize_h263_inter\/intra_axp()\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@16660 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/alpha\/mpegvideo_alpha.c\n+++ libavcodec\/alpha\/mpegvideo_alpha.c\n@@ -30,25 +30,29 @@\n uint64_t qmul, qadd;\n uint64_t correction;\n DCTELEM *orig_block = block;\n- DCTELEM block0; \/* might not be used uninitialized *\/\n+ DCTELEM block0 = block[0];\n \n- qadd = WORD_VEC((qscale - 1) | 1);\n qmul = qscale << 1;\n \/* This mask kills spill from negative subwords to the next subword. *\/\n- correction = WORD_VEC((qmul - 1) + 1); \/* multiplication \/ addition *\/\n+ correction = WORD_VEC(qmul * 255 >> 8);\n \n if (!s->h263_aic) {\n if (n < 4)\n- block0 = block[0] * s->y_dc_scale;\n+ block0 *= s->y_dc_scale;\n else\n- block0 = block[0] * s->c_dc_scale;\n+ block0 *= s->c_dc_scale;\n+ qadd = WORD_VEC((qscale - 1) | 1);\n } else {\n qadd = 0;\n }\n- n_coeffs = 63; \/\/ does not always use zigzag table\n+\n+ if(s->ac_pred)\n+ n_coeffs = 63;\n+ else\n+ n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];\n \n for(i = 0; i <= n_coeffs; block += 4, i += 4) {\n- uint64_t levels, negmask, zeros, add;\n+ uint64_t levels, negmask, zeros, add, sub;\n \n levels = ldq(block);\n if (levels == 0)\n@@ -73,19 +77,17 @@\n levels *= qmul;\n levels -= correction & (negmask << 16);\n \n- \/* Negate qadd for negative levels. *\/\n- add = qadd ^ negmask;\n- add += WORD_VEC(0x0001) & negmask;\n+ add = qadd & ~negmask;\n+ sub = qadd & negmask;\n \/* Set qadd to 0 for levels == 0. *\/\n add = zap(add, zeros);\n-\n levels += add;\n+ levels -= sub;\n \n stq(levels, block);\n }\n \n- if (s->mb_intra && !s->h263_aic)\n- orig_block[0] = block0;\n+ orig_block[0] = block0;\n }\n \n static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,\n@@ -100,7 +102,7 @@\n \/* This mask kills spill from negative subwords to the next subword. *\/\n correction = WORD_VEC((qmul - 1) + 1); \/* multiplication \/ addition *\/\n \n- n_coeffs = s->intra_scantable.raster_end[s->block_last_index[n]];\n+ n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];\n \n for(i = 0; i <= n_coeffs; block += 4, i += 4) {\n uint64_t levels, negmask, zeros, add;\n"} {"commit":"020fcae2b702af982daa7699e12b8bd438e13a2b","subject":"mtbdd: add check to ensure initialization is only done once","message":"mtbdd: add check to ensure initialization is only done once\n","repos":"Meijuh\/sylvan,Meijuh\/sylvan,trolando\/sylvan,utwente-fmt\/sylvan,utwente-fmt\/sylvan,trolando\/sylvan","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/sylvan_mtbdd.c\n+++ src\/sylvan_mtbdd.c\n@@ -334,6 +334,8 @@\n * Initialize and quit functions\n *\/\n \n+static int mtbdd_initialized = 0;\n+\n static void\n mtbdd_quit()\n {\n@@ -347,11 +349,16 @@\n cl_registry = NULL;\n cl_registry_count = 0;\n }\n+\n+ mtbdd_initialized = 0;\n }\n \n void\n sylvan_init_mtbdd()\n {\n+ if (mtbdd_initialized) return;\n+ mtbdd_initialized = 1;\n+\n sylvan_register_quit(mtbdd_quit);\n sylvan_gc_add_mark(10, TASK(mtbdd_gc_mark_external_refs));\n sylvan_gc_add_mark(10, TASK(mtbdd_gc_mark_protected));\n"} {"commit":"81dfe38316fc1b220269543e5a5112012d38733e","subject":"set stdout to be unbuffered to match stderr when debug is on","message":"set stdout to be unbuffered to match stderr when debug is on\n","repos":"emilcondrea\/trousers,Distrotech\/trousers,Distrotech\/trousers,Distrotech\/trousers,emilcondrea\/trousers,emilcondrea\/trousers","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tcsd\/svrside.c\n+++ src\/tcsd\/svrside.c\n@@ -130,6 +130,11 @@\n {\n \tTSS_RESULT result;\n \n+#ifdef TSS_DEBUG\n+\t\/* Set stdout to be unbuffered to match stderr and interleave output correctly *\/\n+\tsetvbuf(stdout, (char *)NULL, _IONBF, 0);\n+#endif\n+\n \tif ((result = signals_init()))\n \t\treturn result;\n \n"} {"commit":"e975532c4d8a9be95183d45d3ba1c0415b4edbca","subject":"Add RAII mutex implementation to fplutil.","message":"Add RAII mutex implementation to fplutil.\n\n- Add own implementation since std::mutex wouldn't be available in VS2010.\n\nChange-Id: I789885689a8b5da931b74c84c8617af8dfbca925\nTested: on OSX.\n","repos":"google\/fplutil,google\/fplutil,google\/fplutil,google\/fplutil,google\/fplutil,google\/fplutil","returncode":1,"stderr":"error: pathspec 'libfplutil\/include\/fplutil\/mutex.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- libfplutil\/include\/fplutil\/mutex.h\n+++ libfplutil\/include\/fplutil\/mutex.h\n@@ -0,0 +1,147 @@\n+\/\/ Copyright 2016 Google Inc. All rights reserved.\n+\/\/\n+\/\/ Licensed under the Apache License, Version 2.0 (the \"License\");\n+\/\/ you may not use this file except in compliance with the License.\n+\/\/ You may obtain a copy of the License at\n+\/\/\n+\/\/ http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+\/\/\n+\/\/ Unless required by applicable law or agreed to in writing, software\n+\/\/ distributed under the License is distributed on an \"AS IS\" BASIS,\n+\/\/ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+\/\/ See the License for the specific language governing permissions and\n+\/\/ limitations under the License.\n+\n+#ifndef FPLUTIL_FILE_MUTEX_H\n+#define FPLUTIL_FILE_MUTEX_H\n+\n+#include <assert.h>\n+#include <errno.h>\n+#if !defined(_WIN32)\n+#include <pthread.h>\n+#else\n+#include <windows.h>\n+#endif \/\/ !defined(_WIN32)\n+\n+namespace fplutil {\n+\n+\/\/\/ @brief A simple synchronization lock. Only one thread at a time can Acquire.\n+class Mutex {\n+ public:\n+ \/\/\/ @enum Mode\n+ \/\/\/\n+ \/\/\/ @brief Bitfield that describes the mutex configuration.\n+ \/\/\/ **Enumerations**:\n+ \/\/\/\n+ \/\/\/ * `kModeNonRecursive` (`0`) - The mutex is initialized as a non-recursive\n+ \/\/\/ mutex.\n+ \/\/\/ * `kModeRecursive` (`1`) - The mutex is initialized as a recursive mutex.\n+ enum Mode {\n+ kModeNonRecursive = (0 << 0),\n+ kModeRecursive = (1 << 0),\n+ };\n+\n+ \/\/\/ @brief Default constructor that initializes a mutex as a recursive one.\n+ Mutex() { Initialize(kModeRecursive); }\n+\n+ \/\/\/ @brief Constructor that initializes a mutex with a parameter.\n+ \/\/\/ @param[in] mode Mode indicating the mutex's recursive setting.\n+ explicit Mutex(Mode mode) { Initialize(mode); }\n+\n+ ~Mutex() {\n+#if !defined(_WIN32)\n+ int ret = pthread_mutex_destroy(&mutex_);\n+ assert(ret == 0);\n+ (void)ret;\n+#else\n+ CloseHandle(synchronization_object_);\n+#endif \/\/ !defined(_WIN32)\n+ }\n+\n+ \/\/\/ @brief Acquire the mutex's ownership.\n+ void Acquire() {\n+#if !defined(_WIN32)\n+ int ret = pthread_mutex_lock(&mutex_);\n+ assert(ret == 0);\n+ (void)ret;\n+#else\n+ WaitForSingleObject(synchronization_object_, INFINITE);\n+#endif \/\/ !defined(_WIN32)\n+ }\n+\n+ \/\/\/ @brief Release the mutex's ownership.\n+ void Release() {\n+#if !defined(_WIN32)\n+ int ret = pthread_mutex_unlock(&mutex_);\n+ assert(ret == 0);\n+ (void)ret;\n+#else\n+ if (mode_ & kModeRecursive) {\n+ ReleaseMutex(synchronization_object_);\n+ } else {\n+ ReleaseSemaphore(synchronization_object_, 1, 0);\n+ }\n+#endif \/\/ !defined(_WIN32)\n+ }\n+\n+ private:\n+ void Initialize(Mode mode) {\n+#if !defined(_WIN32)\n+ pthread_mutexattr_t attr;\n+ int ret = pthread_mutexattr_init(&attr);\n+ assert(ret == 0);\n+ if (mode & kModeRecursive) {\n+ ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);\n+ assert(ret == 0);\n+ }\n+ ret = pthread_mutex_init(&mutex_, &attr);\n+ assert(ret == 0);\n+ ret = pthread_mutexattr_destroy(&attr);\n+ assert(ret == 0);\n+#else\n+ mode_ = mode;\n+ if (mode & kModeRecursive) {\n+ synchronization_object_ = CreateMutex(nullptr, FALSE, nullptr);\n+ } else {\n+ synchronization_object_ = CreateSemaphore(nullptr, 1, 1, nullptr);\n+ }\n+#endif \/\/ !defined(_WIN32)\n+ }\n+\n+#if !defined(_WIN32)\n+ pthread_mutex_t mutex_;\n+#else\n+ HANDLE synchronization_object_;\n+ Mode mode_;\n+#endif \/\/ !defined(_WIN32)\n+};\n+\n+\/\/\/ @brief Acquire and hold a \/ref Mutex, while in scope.\n+\/\/\/\n+\/\/\/ Example usage:\n+\/\/\/ \\code{.cpp}\n+\/\/\/ Mutex syncronization_mutex;\n+\/\/\/ void MyFunctionThatRequiresSynchronization() {\n+\/\/\/ MutexLock lock(syncronization_mutex);\n+\/\/\/ \/\/ ... logic ...\n+\/\/\/ }\n+\/\/\/ \\endcode\n+class MutexLock {\n+ public:\n+ \/\/\/ @brief Acuires specified mutex's ownership for a life time of the object.\n+ \/\/\/\n+ \/\/\/ @param[in] mutex Mutex to aquire an ownership.\n+ explicit MutexLock(Mutex& mutex) : mutex_(&mutex) { mutex_->Acquire(); }\n+ ~MutexLock() { mutex_->Release(); }\n+\n+ private:\n+ \/\/ Copy is disallowed.\n+ MutexLock(const MutexLock& rhs);\n+ MutexLock& operator=(const MutexLock& rhs);\n+\n+ Mutex* mutex_;\n+};\n+\n+} \/\/ namespace fplutil\n+\n+#endif \/\/ FPLUTIL_FILE_MUTEX_H\n"} {"commit":"bf52858619db7dbce4d8cc37eaba2e1afdab5473","subject":"[DEV][src_msg] Tests for invalid source type at init","message":"[DEV][src_msg] Tests for invalid source type at init\n","repos":"ncarrier\/fusion,Parrot-Developers\/fusion,Parrot-Developers\/fusion,ncarrier\/fusion","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libioutils\/tests\/io_src_msg_test.c\n+++ libioutils\/tests\/io_src_msg_test.c\n@@ -198,6 +198,14 @@\n \tCU_ASSERT_NOT_EQUAL(ret, 0);\n \tret = io_src_msg_init(&(msg_src.msg_src), msg_src.pipefds[0], IO_IN,\n \t\t\tNULL, my_msg_src_clean, &(msg_src.msg),\n+\t\t\tsizeof(struct msg));\n+\tCU_ASSERT_NOT_EQUAL(ret, 0);\n+\tret = io_src_msg_init(&(msg_src.msg_src), msg_src.pipefds[0], 666,\n+\t\t\tmsg_cb_read, my_msg_src_clean, &(msg_src.msg),\n+\t\t\tsizeof(struct msg));\n+\tCU_ASSERT_NOT_EQUAL(ret, 0);\n+\tret = io_src_msg_init(&(msg_src.msg_src), msg_src.pipefds[0], 0,\n+\t\t\tmsg_cb_read, my_msg_src_clean, &(msg_src.msg),\n \t\t\tsizeof(struct msg));\n \tCU_ASSERT_NOT_EQUAL(ret, 0);\n }\n"} {"commit":"ea3f69aa9fe3112ca58c3b7a47195ae7ee87e7fd","subject":"[DEV][io] removed nested functions from src sep tests","message":"[DEV][io] removed nested functions from src sep tests\n\nChange-Id: I4ac7c8ae0376db06933b544f9780dfbb63259491\n","repos":"ncarrier\/fusion,Parrot-Developers\/fusion,ncarrier\/fusion,Parrot-Developers\/fusion","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libioutils\/tests\/io_src_sep_test.c\n+++ libioutils\/tests\/io_src_sep_test.c\n@@ -43,6 +43,7 @@\n struct my_sep_src {\n \tstruct io_src_sep src_sep;\n \tint pipefds[2];\n+\tint state;\n };\n \n #define to_my_src_sep(p) rs_container_of(p, struct my_sep_src, src_sep)\n@@ -62,44 +63,47 @@\n \tio_src_sep_clean(&(my_sep->src_sep));\n }\n \n-\/* main and only test. sends ourselves messages and check we receive them *\/\n-static void testSRC_SEP(const int sep_pair[2], const char *big_msg, size_t sz)\n-{\n-\tfd_set rfds;\n-\tint ret;\n-\tstruct io_mon mon;\n-\tstruct my_sep_src src_sep;\n-\tbool loop = true;\n-\tstruct timeval timeout;\n #define STATE_START 0\n #define STATE_MSG1_RECEIVED 1\n #define STATE_MSG2_RECEIVED 2\n #define STATE_MSG3_RECEIVED 4\n #define STATE_TIMER_EXPIRED 8\n #define STATE_ALL_DONE 15\n-\tint state = STATE_START;\n-\tvoid sep_cb(struct io_src_sep *sep, char *chunk, unsigned len)\n-\t{\n+static void sep_cb(struct io_src_sep *sep, char *chunk, unsigned len)\n+{\n+\tstruct my_sep_src *s = ut_container_of(sep, struct my_sep_src, src_sep);\n \/*\t\tprintf(\"received %u byte(s) : \\\"%.*s\\\"\\n\", len, len, chunk); *\/\n \n-\t\tCU_ASSERT_NOT_EQUAL(state,\n-\t\t\t\tSTATE_ALL_DONE & ~STATE_TIMER_EXPIRED);\n-\t\tCU_ASSERT_NOT_EQUAL(0, memcmp(chunk, MSG4, strlen(MSG4)));\n-\n-\t\tif (0 == memcmp(chunk, MSG1, strlen(MSG1))) {\n-\t\t\tCU_ASSERT_EQUAL(state, STATE_START);\n-\t\t\treached_state(&state, STATE_MSG1_RECEIVED);\n-\n-\t\t\tCU_ASSERT_EQUAL(len, strlen(MSG1) + 1 + sep->two_bytes);\n-\t\t} else if (0 == memcmp(chunk, MSG2, strlen(MSG2))) {\n-\t\t\tCU_ASSERT_EQUAL(state, STATE_MSG1_RECEIVED);\n-\t\t\treached_state(&state, STATE_MSG2_RECEIVED);\n-\t\t} else if (0 == memcmp(chunk, MSG3, strlen(MSG3))) {\n-\t\t\tCU_ASSERT_EQUAL(state, STATE_MSG1_RECEIVED |\n-\t\t\t\t\tSTATE_MSG2_RECEIVED);\n-\t\t\treached_state(&state, STATE_MSG3_RECEIVED);\n-\t\t}\n+\tCU_ASSERT_NOT_EQUAL(s->state,\n+\t\t\tSTATE_ALL_DONE & ~STATE_TIMER_EXPIRED);\n+\tCU_ASSERT_NOT_EQUAL(0, memcmp(chunk, MSG4, strlen(MSG4)));\n+\n+\tif (0 == memcmp(chunk, MSG1, strlen(MSG1))) {\n+\t\tCU_ASSERT_EQUAL(s->state, STATE_START);\n+\t\treached_state(&s->state, STATE_MSG1_RECEIVED);\n+\n+\t\tCU_ASSERT_EQUAL(len, strlen(MSG1) + 1 + sep->two_bytes);\n+\t} else if (0 == memcmp(chunk, MSG2, strlen(MSG2))) {\n+\t\tCU_ASSERT_EQUAL(s->state, STATE_MSG1_RECEIVED);\n+\t\treached_state(&s->state, STATE_MSG2_RECEIVED);\n+\t} else if (0 == memcmp(chunk, MSG3, strlen(MSG3))) {\n+\t\tCU_ASSERT_EQUAL(s->state, STATE_MSG1_RECEIVED |\n+\t\t\t\tSTATE_MSG2_RECEIVED);\n+\t\treached_state(&s->state, STATE_MSG3_RECEIVED);\n \t}\n+}\n+\n+\/* main and only test. sends ourselves messages and check we receive them *\/\n+static void testSRC_SEP(const int sep_pair[2], const char *big_msg, size_t sz)\n+{\n+\tfd_set rfds;\n+\tint ret;\n+\tstruct io_mon mon;\n+\tstruct my_sep_src src_sep = {\n+\t\t\t.state = STATE_START,\n+\t};\n+\tbool loop = true;\n+\tstruct timeval timeout;\n \n \tret = pipe(src_sep.pipefds);\n \tCU_ASSERT_EQUAL(ret, 0);\n@@ -133,8 +137,8 @@\n \n \t\t\/* timeout, normal *\/\n \t\tif (0 == ret) {\n-\t\t\tCU_ASSERT_NOT_EQUAL(state, STATE_ALL_DONE);\n-\t\t\treached_state(&state, STATE_TIMER_EXPIRED);\n+\t\t\tCU_ASSERT_NOT_EQUAL(src_sep.state, STATE_ALL_DONE);\n+\t\t\treached_state(&src_sep.state, STATE_TIMER_EXPIRED);\n \t\t} else {\n \t\t\tret = io_mon_process_events(&mon);\n \t\t\tCU_ASSERT(ret >= 0);\n@@ -142,15 +146,15 @@\n \t\t\t\tgoto out;\n \t\t}\n \n-\t\tloop = STATE_ALL_DONE != state;\n+\t\tloop = STATE_ALL_DONE != src_sep.state;\n \t}\n \n out:\n \t\/* debriefing *\/\n-\tCU_ASSERT(state & STATE_MSG1_RECEIVED);\n-\tCU_ASSERT(state & STATE_MSG2_RECEIVED);\n-\tCU_ASSERT(state & STATE_MSG3_RECEIVED);\n-\tCU_ASSERT(state & STATE_TIMER_EXPIRED);\n+\tCU_ASSERT(src_sep.state & STATE_MSG1_RECEIVED);\n+\tCU_ASSERT(src_sep.state & STATE_MSG2_RECEIVED);\n+\tCU_ASSERT(src_sep.state & STATE_MSG3_RECEIVED);\n+\tCU_ASSERT(src_sep.state & STATE_TIMER_EXPIRED);\n \n \t\/* error cases *\/\n \tret = io_src_sep_init(NULL, src_sep.pipefds[0], sep_cb, sep_pair[0],\n@@ -181,17 +185,17 @@\n \ttestSRC_SEP(sep_double, big_msg_double, strlen(big_msg_double));\n }\n \n+static void dummy_cb(struct io_src_sep *sep, char *chunk, unsigned len)\n+{\n+\n+}\n+\n static void testSRC_SEP_GET_SOURCE(void)\n {\n \tint ret;\n \tstruct io_src_sep sep_src;\n \tstruct io_src *src;\n \tint pipefd[2] = {-1, -1};\n-\n-\tvoid dummy_cb(struct io_src_sep *sep, char *chunk, unsigned len)\n-\t{\n-\n-\t}\n \n \tret = pipe(pipefd);\n \tCU_ASSERT_NOT_EQUAL_FATAL(ret, -1);\n"} {"commit":"1e36af516478e6c07fbc919541df226aac911fd7","subject":"Fix a tiny problem in the CVE patches","message":"Fix a tiny problem in the CVE patches\n","repos":"BueVest\/liblouis,BueVest\/liblouis,liblouis\/liblouis,BueVest\/liblouis,liblouis\/liblouis,hammera\/liblouis,IndexBraille\/liblouis,BueVest\/liblouis,hammera\/liblouis,IndexBraille\/liblouis,liblouis\/liblouis,liblouis\/liblouis,hammera\/liblouis,liblouis\/liblouis,hammera\/liblouis,IndexBraille\/liblouis,IndexBraille\/liblouis,hammera\/liblouis,BueVest\/liblouis,IndexBraille\/liblouis,BueVest\/liblouis,hammera\/liblouis,liblouis\/liblouis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- liblouis\/compileTranslationTable.c\n+++ liblouis\/compileTranslationTable.c\n@@ -3844,11 +3844,11 @@\n case CTO_Locale:\n break;\n case CTO_Undefined:\n+ tmp_offset = table->undefined;\n ok =\n-\ttmp_offset = table->undefined;\n \tcompileBrailleIndicator (nested, \"undefined character opcode\",\n \t\t\t\t CTO_Undefined, &tmp_offset, &lastToken, newRuleOffset, newRule, noback, nofor);\n-\ttable->undefined = tmp_offset;\n+ table->undefined = tmp_offset;\n break;\n \n case CTO_Match:\n"} {"commit":"c4420a75e61da997cf4bbf6729d9642a4c0ac646","subject":"gcc says spinlock.c:35: warning: matching constraint does not allow a register","message":"gcc says\n spinlock.c:35: warning: matching constraint does not allow a register\n\nUpdate the asm to match glibc.\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libpthread\/linuxthreads\/spinlock.c\n+++ libpthread\/linuxthreads\/spinlock.c\n@@ -32,7 +32,7 @@\n {\n WRITE_MEMORY_BARRIER();\n *spinlock = __LT_SPINLOCK_INIT;\n- __asm __volatile (\"\" : \"=m\" (*spinlock) : \"0\" (*spinlock));\n+ __asm __volatile (\"\" : \"=m\" (*spinlock) : \"m\" (*spinlock));\n }\n \n \n"} {"commit":"d5c5ed556c40f442eec96e071727de1cb07faf58","subject":"Make SkGIFLZWBlock modifiable so it is assignable","message":"Make SkGIFLZWBlock modifiable so it is assignable\n\nstd::vector needs to be able to assign objects contained inside it. With\nconst member variables, this isn't possible. Remove the consts so\nSkGIFLZWBlock can be assigned.\n\nBUG=skia:6072\n\nChange-Id: I990dc80fb1c49fbd584712c6d0c1154c2da36e85\nReviewed-on: https:\/\/skia-review.googlesource.com\/6362\nReviewed-by: Leon Scroggins <995cad867ca30d6399abe011583a53547c8afea1@google.com>\nCommit-Queue: Leon Scroggins <995cad867ca30d6399abe011583a53547c8afea1@google.com>\n","repos":"aosp-mirror\/platform_external_skia,rubenvb\/skia,HalCanary\/skia-hc,rubenvb\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,HalCanary\/skia-hc,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,google\/skia,google\/skia,HalCanary\/skia-hc,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,rubenvb\/skia,rubenvb\/skia,rubenvb\/skia,google\/skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,HalCanary\/skia-hc,HalCanary\/skia-hc,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- third_party\/gif\/SkGifImageReader.h\n+++ third_party\/gif\/SkGifImageReader.h\n@@ -142,8 +142,8 @@\n SkGIFLZWBlock(size_t position, size_t size)\n : blockPosition(position), blockSize(size) {}\n \n- const size_t blockPosition;\n- const size_t blockSize;\n+ size_t blockPosition;\n+ size_t blockSize;\n };\n \n class SkGIFColorMap final {\n"} {"commit":"eb72dc809c1f469e411aad16cfc4fc17287b3a73","subject":"gnutls: fix an uninitialized variable","message":"gnutls: fix an uninitialized variable\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=681636\n","repos":"GNOME\/glib-networking,Distrotech\/glib-networking,GNOME\/glib-networking,Distrotech\/glib-networking,GNOME\/glib-networking,Distrotech\/glib-networking","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tls\/gnutls\/gtlsconnection-gnutls.c\n+++ tls\/gnutls\/gtlsconnection-gnutls.c\n@@ -1461,7 +1461,7 @@\n {\n GTlsConnectionGnutls *gnutls = G_TLS_CONNECTION_GNUTLS (stream);\n gboolean success;\n- int ret;\n+ int ret = 0;\n \n if (!claim_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_CLOSE,\n \t\t TRUE, cancellable, error))\n"} {"commit":"c451662fcecafcdee7638784d5a76224acad1ecd","subject":"Added","message":"Added\n","repos":"willemt\/heapless-bencode,willemt\/heapless-bencode,willemt\/heapless-bencode","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bencode.c\n+++ bencode.c\n@@ -32,6 +32,7 @@\n }\n \n \/**\n+ * TODO: This needs to return an error code\n * @param end The point that we read out to\n * @return number represented by string *\/\n static long int __read_string_int(\n"} {"commit":"98fdcf11bef30f43013fe52ee3930e3b10d35fab","subject":"Version 2022.13. Changed centroid estimation to running average, this considerably reduced overhead in ultra-high dimensions. Improved solution generator 8 to use a variable multiplier. Changed DE operations from \"-\" to \"+\", to look more classical.","message":"Version 2022.13.\nChanged centroid estimation to running average, this considerably reduced overhead in ultra-high dimensions.\nImproved solution generator 8 to use a variable multiplier.\nChanged DE operations from \"-\" to \"+\", to look more classical.","repos":"avaneev\/biteopt,avaneev\/biteopt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- biteopt.h\n+++ biteopt.h\n@@ -31,7 +31,7 @@\n #ifndef BITEOPT_INCLUDED\r\n #define BITEOPT_INCLUDED\r\n \r\n-#define BITEOPT_VERSION \"2022.12\"\r\n+#define BITEOPT_VERSION \"2022.13\"\r\n \r\n #include \"spheropt.h\"\r\n #include \"nmsopt.h\"\r\n@@ -88,6 +88,7 @@\n \t\taddHist( Gen5BinvHist, \"Gen5BinvHist\" );\r\n \t\taddHist( Gen7PowFacHist, \"Gen7PowFacHist\" );\r\n \t\taddHist( Gen8NumHist, \"Gen8NumHist\" );\r\n+\t\taddHist( Gen8SpanHist, \"Gen8SpanHist\" );\r\n \t\taddHist( *ParOpt.getHists()[ 0 ], \"ParOpt.CentPowHist\" );\r\n \t\taddHist( *ParOpt.getHists()[ 1 ], \"ParOpt.RadPowHist\" );\r\n \t\taddHist( *ParOpt.getHists()[ 2 ], \"ParOpt.EvalFacHist\" );\r\n@@ -438,14 +439,14 @@\n \t\t\t\t\tPopParams[ CurPopSize1 ], false, true );\r\n \t\t\t}\r\n \r\n-\t\t\tconst int p = updatePop( NewCost, TmpParams, false, false );\r\n+\t\t\tconst int p = updatePop( NewCost, TmpParams, true, false );\r\n \t\t\tconst double pv = (double) p \/ CurPopSize1;\r\n \t\t\tapplyHistsIncr( rnd, 1.0 - pv * pv );\r\n \r\n \t\t\tif( PushOpt != NULL && PushOpt != this &&\r\n \t\t\t\t!PushOpt -> DoInitEvals && NewCost > PopCosts[ 0 ])\r\n \t\t\t{\r\n-\t\t\t\tPushOpt -> updatePop( NewCost, TmpParams, false, true );\r\n+\t\t\t\tPushOpt -> updatePop( NewCost, TmpParams, true, true );\r\n \t\t\t\tPushOpt -> updateParPop( NewCost, TmpParams );\r\n \t\t\t}\r\n \r\n@@ -466,12 +467,14 @@\n \r\n \t\tCentUpdateCtr++;\r\n \r\n-\t\tif( CentUpdateCtr >= CurPopSize * 32 )\r\n-\t\t{\r\n-\t\t\t\/\/ Update centroids of parallel populations that use running\r\n-\t\t\t\/\/ average, to reduce error accumulation.\r\n+\t\tif( CentUpdateCtr >= CurPopSize * 8 )\r\n+\t\t{\r\n+\t\t\t\/\/ Update centroids of populations that use running average, to\r\n+\t\t\t\/\/ reduce error accumulation.\r\n \r\n \t\t\tCentUpdateCtr = 0;\r\n+\r\n+\t\t\tupdateCentroid();\r\n \r\n \t\t\tfor( i = 0; i < ParPopCount; i++ )\r\n \t\t\t{\r\n@@ -550,6 +553,9 @@\n \t\t\/\/\/< histogram.\r\n \t\t\/\/\/<\r\n \tCBiteOptHist< 4 > Gen8NumHist; \/\/\/< Generator method 8's NumSols\r\n+\t\t\/\/\/< histogram.\r\n+\t\t\/\/\/<\r\n+\tCBiteOptHist< 4 > Gen8SpanHist; \/\/\/< Generator method 8's random span\r\n \t\t\/\/\/< histogram.\r\n \t\t\/\/\/<\r\n \tint CentUpdateCtr; \/\/\/< Centroid update counter.\r\n@@ -770,8 +776,8 @@\n \r\n \t\t\tfor( i = a; i < b; i++ )\r\n \t\t\t{\r\n-\t\t\t\tParams[ i ] -= (ptype) (( Params[ i ] - rp2[ i ]) * m1 );\r\n-\t\t\t\tParams[ i ] -= (ptype) (( Params[ i ] - rp2[ i ]) * m2 );\r\n+\t\t\t\tParams[ i ] += (ptype) (( rp2[ i ] - Params[ i ]) * m1 );\r\n+\t\t\t\tParams[ i ] += (ptype) (( rp2[ i ] - Params[ i ]) * m2 );\r\n \t\t\t}\r\n \t\t}\r\n \t}\r\n@@ -804,8 +810,8 @@\n \r\n \t\tfor( i = 0; i < ParamCount; i++ )\r\n \t\t{\r\n-\t\t\tParams[ i ] = rp1[ i ] - ((( rp3[ i ] - rp2[ i ]) +\r\n-\t\t\t\t( rp5[ i ] - rp4[ i ])) >> 1 );\r\n+\t\t\tParams[ i ] = rp1[ i ] + ((( rp2[ i ] - rp3[ i ]) +\r\n+\t\t\t\t( rp4[ i ] - rp5[ i ])) >> 1 );\r\n \t\t}\r\n \t}\r\n \r\n@@ -836,8 +842,8 @@\n \r\n \t\tfor( i = 0; i < ParamCount; i++ )\r\n \t\t{\r\n-\t\t\tParams[ i ] = rp1[ i ] - (( rp3[ i ] - rp2[ i ]) +\r\n-\t\t\t\t( rp5[ i ] - rp4[ i ]));\r\n+\t\t\tParams[ i ] = rp1[ i ] + (( rp2[ i ] - rp3[ i ]) +\r\n+\t\t\t\t( rp4[ i ] - rp5[ i ]));\r\n \t\t}\r\n \t}\r\n \r\n@@ -920,11 +926,6 @@\n \r\n \t\tconst ptype* const MinParams = getParamsOrdered(\r\n \t\t\tgetMinSolIndex( 3, rnd, CurPopSize ));\r\n-\r\n-\t\tif( NeedCentUpdate )\r\n-\t\t{\r\n-\t\t\tupdateCentroid();\r\n-\t\t}\r\n \r\n \t\tconst ptype* const cp = getCentroid();\r\n \r\n@@ -1165,7 +1166,8 @@\n \t\t\tParams[ i ] = (ptype) NewValues[ i ];\r\n \t\t}\r\n \r\n-\t\tconst double gm = 2.0 \/ sqrt( (double) NumSols );\r\n+\t\tstatic const double Spans[ 4 ] = { 1.5, 2.0, 2.5, 3.0 };\r\n+\t\tconst double gm = Spans[ select( Gen8SpanHist, rnd )] * sqrt( m );\r\n \r\n \t\tfor( j = 0; j < NumSols; j++ )\r\n \t\t{\r\n@@ -1174,7 +1176,7 @@\n \r\n \t\t\tfor( i = 0; i < ParamCount; i++ )\r\n \t\t\t{\r\n-\t\t\t\tParams[ i ] -= (ptype) (( NewValues[ i ] - rp0[ i ]) * r );\r\n+\t\t\t\tParams[ i ] += (ptype) (( rp0[ i ] - NewValues[ i ]) * r );\r\n \t\t\t}\r\n \t\t}\r\n \t}\r\n"} {"commit":"74466cb2163a42384a1127788635d495a53ece7f","subject":"Make transpose8x1 faster","message":"Make transpose8x1 faster\n","repos":"FastLED\/FastLED,remspoor\/FastLED,neographophobic\/FastLED,tullo-x86\/FastLED,felixLam\/FastLED,tullo-x86\/FastLED,remspoor\/FastLED,felixLam\/FastLED,NicoHood\/FastLED,PaulStoffregen\/FastLED,NicoHood\/FastLED,corbinstreehouse\/FastLED,corbinstreehouse\/FastLED,FastLED\/FastLED,PaulStoffregen\/FastLED,FastLED\/FastLED,eshkrab\/FastLED-esp32,neographophobic\/FastLED,kcouck\/FastLED,eshkrab\/FastLED-esp32,wilhelmryan\/FastLED,PaulStoffregen\/FastLED,kcouck\/FastLED,wilhelmryan\/FastLED,FastLED\/FastLED","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bitswap.h\n+++ bitswap.h\n@@ -175,8 +175,10 @@\n y = ((x << 4) & 0xF0F0F0F0) | (y & 0x0F0F0F0F);\n x = t;\n \n- \/\/((uint64_t*)B) = x<<32 | y;\n- \/\/\n+#if 1\n+ *((uint32_t*)B) = y; \n+ *((uint32_t*)(B+4)) = x; \n+#else\n B[7] = y; y >>= 8;\n B[6] = y; y >>= 8;\n B[5] = y; y >>= 8;\n@@ -186,6 +188,7 @@\n B[2] = x; x >>= 8;\n B[1] = x; x >>= 8;\n B[0] = x; \/* *\/\n+#endif\n }\n \n template<int m, int n>\n"} {"commit":"f6386bcefe3c7c924e48b08bd94d37f710d57ecf","subject":"Remove report ref.","message":"Remove report ref.\n","repos":"NordicSemiconductor\/nrf51-ble-app-lbs,stianrh\/nrf51-ble-app-lbs,mikew67\/nrf51-ble-app-lbs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ble_lbs.c\n+++ ble_lbs.c\n@@ -170,46 +170,6 @@\n {\n return err_code;\n }\n- \n- if (p_lbs_init->p_report_ref != NULL)\n- {\n- \/\/ Add Report Reference descriptor\n- BLE_UUID_BLE_ASSIGN(ble_uuid, BLE_UUID_REPORT_REF_DESCR);\n- \n- memset(&attr_md, 0, sizeof(attr_md));\n-\n- attr_md.read_perm = p_lbs_init->battery_level_report_read_perm;\n- BLE_GAP_CONN_SEC_MODE_SET_NO_ACCESS(&attr_md.write_perm);\n-\n- attr_md.vloc = BLE_GATTS_VLOC_STACK;\n- attr_md.rd_auth = 0;\n- attr_md.wr_auth = 0;\n- attr_md.vlen = 0;\n- \n- init_len = ble_srv_report_ref_encode(encoded_report_ref, p_lbs_init->p_report_ref);\n- \n- memset(&attr_char_value, 0, sizeof(attr_char_value));\n-\n- attr_char_value.p_uuid = &ble_uuid;\n- attr_char_value.p_attr_md = &attr_md;\n- attr_char_value.init_len = init_len;\n- attr_char_value.init_offs = 0;\n- attr_char_value.max_len = attr_char_value.init_len;\n- attr_char_value.p_value = encoded_report_ref;\n- \n- err_code = sd_ble_gatts_descriptor_add(p_lbs->battery_level_handles.value_handle,\n- &attr_char_value,\n- &p_lbs->report_ref_handle);\n- if (err_code != NRF_SUCCESS)\n- {\n- return err_code;\n- }\n- }\n- else\n- {\n- p_lbs->report_ref_handle = BLE_GATT_HANDLE_INVALID;\n- }\n- \n return NRF_SUCCESS;\n }\n #endif\n"} {"commit":"e24a95e12a61beb796b019b4d5b33c51de11eff2","subject":"wsaData evades with *nix.","message":"wsaData evades with *nix.\n","repos":"gavioto\/psqlodbc,hlinnaka\/psqlodbc,Distrotech\/psqlodbc,Distrotech\/psqlodbc,treasure-data\/prestogres-odbc,gavioto\/psqlodbc,hlinnaka\/psqlodbc,treasure-data\/prestogres-odbc,hlinnaka\/psqlodbc,treasure-data\/prestogres-odbc,gavioto\/psqlodbc,Distrotech\/psqlodbc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- environ.c\n+++ environ.c\n@@ -500,6 +500,7 @@\n {\n \tCSTR\tfunc = \"EN_Constructor\";\n \tEnvironmentClass *rv = NULL;\n+#ifdef WIN32\n #ifndef\t_WSASTARTUP_IN_DLLMAIN_\n \tWORD\t\twVersionRequested;\n \tWSADATA\t\twsaData;\n@@ -516,6 +517,7 @@\n \t\tgoto cleanup;\n \t}\n #endif \/* _WSASTARTUP_IN_DLLMAIN_ *\/\n+#endif\n \n \trv = (EnvironmentClass *) malloc(sizeof(EnvironmentClass));\n cleanup:\n"} {"commit":"e0ec210047e102b3e305c501657cf0e5f6ef08d5","subject":"commit","message":"commit\n","repos":"QCT-IQC\/qpp,vsoftco\/qpp,QCT-IQC\/qpp,vsoftco\/qpp,QCT-IQC\/qpp,vsoftco\/qpp,vsoftco\/qpp,QCT-IQC\/qpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/experimental\/experimental.h\n+++ include\/experimental\/experimental.h\n@@ -39,8 +39,8 @@\n *\/\n namespace experimental {\n \n-\/\/ TODO: add a quantum instruction pointer and a measurement instruction pointer\n-\/\/ TODO in progress: add QFT\/TFQ as a \"gate\" type, what about computing depths?!\n+\/\/ TODO: (in progress) add QFT\/TFQ as a \"gate\" type, what about computing\n+\/\/ depths?!\n \/\/ best is to apply it gate by gate in QCircuitDescription::gate(...)\n \n \/\/ TODO: perform exception checking before run() (such as wrong idx on apply or\n"} {"commit":"5ec3db45d6b637c695baa406b4128ef95edef02b","subject":"Check for GCC before checking version","message":"Check for GCC before checking version\n","repos":"skhoroshavin\/flatcc,skhoroshavin\/flatcc,dvidelabs\/flatcc,dvidelabs\/flatcc,skhoroshavin\/flatcc,dvidelabs\/flatcc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/flatcc\/portable\/pstdalign.h\n+++ include\/flatcc\/portable\/pstdalign.h\n@@ -4,7 +4,7 @@\n #ifndef __alignas_is_defined\n #ifndef __cplusplus\n \n-#if ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)) || defined(__IBMC__)\n+#if ((defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 7))) || defined(__IBMC__))\n #undef PORTABLE_C11_STDALIGN_MISSING\n #define PORTABLE_C11_STDALIGN_MISSING\n #endif\n"} {"commit":"07bb1cb41bd5acecd277b9e01cb5ade9d93b5d5d","subject":"Delete grpc_cb_core.h.","message":"Delete grpc_cb_core.h.\n","repos":"jinq0123\/grpc_cb_core,jinq0123\/grpc_cb_core,jinq0123\/grpc_cb_core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/grpc_cb_core\/grpc_cb_core.h\n+++ include\/grpc_cb_core\/grpc_cb_core.h\n@@ -1,29 +0,0 @@\n-\/\/ Licensed under the Apache License, Version 2.0.\n-\/\/ Author: Jin Qing (http:\/\/blog.csdn.net\/jq0123)\n-\n-#ifndef GRPC_CB_CORE_GRPC_CB_CORE_H\n-#define GRPC_CB_CORE_GRPC_CB_CORE_H\n-\n-#include <grpc_cb_core\/run.h> \/\/ for Run()\n-#include <grpc_cb_core\/channel.h> \/\/ for Channel\n-#include <grpc_cb_core\/client_async_reader.h>\n-#include <grpc_cb_core\/client_async_reader_writer.h>\n-#include <grpc_cb_core\/client_async_writer.h>\n-#include <grpc_cb_core\/client_sync_reader.h>\n-#include <grpc_cb_core\/client_sync_reader_writer.h>\n-#include <grpc_cb_core\/client_sync_writer.h>\n-#include <grpc_cb_core\/completion_queue_for_next.h> \/\/ for CompletionQueueForNext\n-#include <grpc_cb_core\/completion_queue_for_next_sptr.h> \/\/ for CompletionQueueForNextSptr\n-#include <grpc_cb_core\/server.h> \/\/ for Server\n-#include <grpc_cb_core\/server_reader.h> \/\/ for ServerReader\n-#include <grpc_cb_core\/server_reader_for_bidi_streaming.h>\n-#include <grpc_cb_core\/server_reader_for_client_only_streaming.h>\n-#include <grpc_cb_core\/server_replier.h> \/\/ for ServerReplier<>\n-#include <grpc_cb_core\/server_writer.h> \/\/ for ServerWriter<>\n-#include <grpc_cb_core\/service.h> \/\/ for Service\n-#include <grpc_cb_core\/service_sptr.h> \/\/ for ServiceSptr\n-#include <grpc_cb_core\/service_stub.h> \/\/ for ServiceStub\n-#include <grpc_cb_core\/status.h> \/\/ for Status\n-#include <grpc_cb_core\/status_callback.h> \/\/ for StatusCallback\n-\n-#endif \/\/ GRPC_CB_CORE_GRPC_CB_CORE_H\n"} {"commit":"cc1b37be11febca2ede7d92788774c662196c4db","subject":"Locking for Notification class.","message":"Locking for Notification class.\n","repos":"Perfexion\/googletest,gclone\/googletest,BeeswaxIO\/googletest,gclone\/googletest,Perfexion\/googletest,osamu0329nakamura\/googletest,dpull\/googletest,goby\/googletest,old8xp\/googletest-from-google,osamu0329nakamura\/googletest,BeeswaxIO\/googletest,goby\/googletest,BeeswaxIO\/googletest,dpull\/googletest,dpull\/googletest,Perfexion\/googletest,old8xp\/googletest-from-google,gclone\/googletest,goby\/googletest,osamu0329nakamura\/googletest,old8xp\/googletest-from-google","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -1102,22 +1102,37 @@\n \/\/ use it in user tests, either directly or indirectly.\n class Notification {\n public:\n- Notification() : notified_(false) {}\n+ Notification() : notified_(false) {\n+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));\n+ }\n+ ~Notification() {\n+ pthread_mutex_destroy(&mutex_);\n+ }\n \n \/\/ Notifies all threads created with this notification to start. Must\n \/\/ be called from the controller thread.\n- void Notify() { notified_ = true; }\n+ void Notify() {\n+ pthread_mutex_lock(&mutex_);\n+ notified_ = true;\n+ pthread_mutex_unlock(&mutex_);\n+ }\n \n \/\/ Blocks until the controller thread notifies. Must be called from a test\n \/\/ thread.\n void WaitForNotification() {\n- while (!notified_) {\n+ for (;;) {\n+ pthread_mutex_lock(&mutex_);\n+ const bool notified = notified_;\n+ pthread_mutex_unlock(&mutex_);\n+ if (notified)\n+ break;\n SleepMilliseconds(10);\n }\n }\n \n private:\n- volatile bool notified_;\n+ pthread_mutex_t mutex_;\n+ bool notified_;\n \n GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);\n };\n"} {"commit":"2922b2c24be75796ff071b0073a73982ecc22846","subject":"Fixes a typo in gtest-port.h, by Manuel Klimek.","message":"Fixes a typo in gtest-port.h, by Manuel Klimek.\n\n","repos":"sgss\/mirror-googletest,sgss\/mirror-googletest,sgss\/mirror-googletest,sgss\/mirror-googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -358,7 +358,7 @@\n \/\/ 2010 are the only mainstream compilers that come with a TR1 tuple\n \/\/ implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB\n \/\/ Feature Pack download, which we cannot assume the user has.\n-#if (defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)) || _MSV_VER >= 1600\n+#if (defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)) || _MSC_VER >= 1600\n #define GTEST_USE_OWN_TR1_TUPLE 0\n #else\n #define GTEST_USE_OWN_TR1_TUPLE 1\n"} {"commit":"cfee58b45a11221732c58582988d6bb47fb4de04","subject":"Fix Clang build. Enable death tests.","message":"Fix Clang build. Enable death tests.\n\nChange-Id: I15ef1c0a7412a1d66a92e3ff12c6083f9f6b03cf\n","repos":"AOKP\/external_gtest,yinquan529\/platform-external-gtest,SaleJumper\/android-source-browsing.platform--external--gtest,xhteam\/external-gtest,TeamNyx\/external_gtest,thiz11\/platform_external_gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,RichardLuo\/rowboat-external-gtest,olibc\/gtest,yinquan529\/platform-external-gtest,xhteam\/external-gtest,Omegaphora\/external_gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,Nico60\/external_gtest,olibc\/gtest,AOKP\/external_gtest,olibc\/gtest,IllusionRom-deprecated\/android_platform_external_gtest,xhteam\/external-gtest,PurityROM\/platform_external_gtest,SaleJumper\/android-source-browsing.platform--external--gtest,geekboxzone\/lollipop_external_gtest,aospX\/platform_external_gtest,SlimSaber\/android_external_gtest,SaleJumper\/android-source-browsing.platform--external--gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,SlimSaber\/android_external_gtest,RichardLuo\/rowboat-external-gtest,omapzoom\/platform-external-gtest,RichardLuo\/rowboat-external-gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,IllusionRom-deprecated\/android_platform_external_gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,omapzoom\/platform-external-gtest,android-ia\/platform_external_gtest,PurityROM\/platform_external_gtest,thiz11\/platform_external_gtest,Omegaphora\/external_gtest,PurityROM\/platform_external_gtest,TeamNyx\/external_gtest,geekboxzone\/mmallow_external_gtest,geekboxzone\/mmallow_external_gtest,Nico60\/external_gtest,thiz11\/platform_external_gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,aospX\/platform_external_gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,yinquan529\/platform-external-gtest,android-ia\/platform_external_gtest,SlimSaber\/android_external_gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,geekboxzone\/lollipop_external_gtest,IllusionRom-deprecated\/android_platform_external_gtest,aospX\/platform_external_gtest,Nico60\/external_gtest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -400,6 +400,15 @@\n # define GTEST_HAS_RTTI 0\n # endif\n \n+# elif defined(__clang__)\n+\n+\/\/ Android does not support RTTI\n+#if GTEST_OS_LINUX_ANDROID\n+#define GTEST_HAS_RTTI 0\n+#else\n+#define GTEST_HAS_RTTI 1\n+#endif \/\/ANDROID\n+\n # else\n \n \/\/ For all other compilers, we assume RTTI is enabled.\n@@ -546,7 +555,7 @@\n \/\/ pops up a dialog window that cannot be suppressed programmatically.\n #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \\\n (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \\\n- GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX)\n+ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || GTEST_OS_LINUX_ANDROID)\n # define GTEST_HAS_DEATH_TEST 1\n # include <vector> \/\/ NOLINT\n #endif\n"} {"commit":"c8fffbaafe45df2e51f6d87621cd9763e2b781eb","subject":"Remove unintended return value to remove a build warning.","message":"Remove unintended return value to remove a build warning.\n","repos":"juj\/kNet,juj\/kNet,nonconforme\/kNet,nonconforme\/kNet,juj\/kNet","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/kNet\/SequentialIntegerSet.h\n+++ include\/kNet\/SequentialIntegerSet.h\n@@ -47,7 +47,8 @@\n \r\n \tint Capacity() const { return tableSize; }\r\n \r\n-\tint CountSize()\r\n+ \/\/\/ Recomputes the size of this set, so that Size() returns the exact value.\r\n+\tvoid CountSize()\r\n \t{\r\n \t\tsize = 0;\r\n \t\tfor(int i = 0; i < tableSize; ++i)\r\n"} {"commit":"cf5a61a2e2662363896e25af8de7f2b88e57fe4a","subject":"change some constant's define","message":"change some constant's define\n","repos":"zq317157782\/Narukami,zq317157782\/Narukami,zq317157782\/Narukami","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/core\/constant.h\n+++ src\/core\/constant.h\n@@ -26,7 +26,7 @@\n #include \"core\/platform.h\"\n #include \"core\/narukami.h\"\n NARUKAMI_BEGIN\n-static MAYBE_UNUSED const float MIN_RCP_INPUT = 1E-18f;\n+static MAYBE_UNUSED constexpr float MIN_RCP_INPUT = 1E-18f;\n static MAYBE_UNUSED constexpr float EPSION = std::numeric_limits<float>::epsilon();\n \n static MAYBE_UNUSED constexpr float INFINITE =std::numeric_limits<float>::infinity();\n@@ -42,4 +42,5 @@\n static MAYBE_UNUSED constexpr float PI_OVER_FOUR = 0.78539816339744830961f;\n \n \n+\n NARUKAMI_END"} {"commit":"f241ad2b6466001b219e6ac1b984dafbdb3a52d9","subject":"Voxelization.h - InfoCBData \uc218\uc815 #40","message":"Voxelization.h - InfoCBData \uc218\uc815 #40","repos":"Jin02\/SOCEngine,Jin02\/SOCEngine,Jin02\/SOCEngine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SOCEngine\/SOCEngine\/Rendering\/GI\/Voxelization.h\n+++ SOCEngine\/SOCEngine\/Rendering\/GI\/Voxelization.h\n@@ -26,7 +26,11 @@\n \t\t\t\tMath::Matrix\tviewProjX;\n \t\t\t\tMath::Matrix\tviewProjY;\n \t\t\t\tMath::Matrix\tviewProjZ;\n-\n+#ifdef USE_BLOATING_IN_VOXELIZATION_PASS \n+\t\t\t\tMath::Matrix\tviewProjX_inv;\n+\t\t\t\tMath::Matrix\tviewProjY_inv;\n+\t\t\t\tMath::Matrix\tviewProjZ_inv;\t\t\t\t\n+#endif\t\t\t\t\n \t\t\t\tMath::Vector4\tvoxelizeMinPos;\n \t\t\t};\n \n@@ -65,4 +69,4 @@\n \t\t\tGET_ACCESSOR(VoxelEmissionRawBuffer,\tconst Buffer::RawBuffer*,\t\t\t\t\t_voxelEmissionRawBuffer);\n \t\t};\n \t}\n-}+}\n"} {"commit":"03ce43f6c07277a834c0462fac50d7e2159817c6","subject":"Add new error codes","message":"Add new error codes\n","repos":"MaxRoecker\/crux_algorithms-c,MaxRoecker\/crux_algorithms-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/core\/errcodes.h\n+++ src\/core\/errcodes.h\n@@ -7,4 +7,5 @@\n #pragma once\n #include \".\/types.h\"\n \n-#define CRUX__INTEGER_CAST_ERROR_CODE CRUX__as_iu32(0x00010000)\n+#define CRUX__MEMORY_UNAVAILABLE_ERROR_CODE CRUX__as_iu32(0x00010000)\n+#define CRUX__INTEGER_OVERFLOW_ERROR_CODE CRUX__as_iu32(0x00010001)\n"} {"commit":"515d3af751f58f1645d09f0a750b759cdc7820c3","subject":"Updating group definition to follow 3.13 kernel","message":"Updating group definition to follow 3.13 kernel\n\nThe 3.13 added NFNLGRP_NFTABLES to the list of nfnetlink\ngroups.\n\nAdding to the list in order to keep things synchronised.\n\nChange-Id: Ied34a23c3e7379c13a14e98915a072707c34bb0f\nSigned-off-by: Mathieu Poirier <b674a88f52ddcf15fbad298f5a49af203db9e3b7@linaro.org>\n","repos":"CyanogenMod\/android_external_libnl,CyanogenMod\/android_external_libnl,thiz11\/platform_external_libnl,xin3liang\/platform_external_libnl,geekboxzone\/lollipop_external_libnl,thiz11\/platform_external_libnl,geekboxzone\/lollipop_external_libnl,Omegaphora\/external_libnl,yinquan529\/platform-external-libnl,geekboxzone\/mmallow_external_libnl,yinquan529\/platform-external-libnl,geekboxzone\/mmallow_external_libnl,android-ia\/platform_external_libnl,Omegaphora\/external_libnl,android-ia\/platform_external_libnl,xin3liang\/platform_external_libnl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/linux\/netfilter\/nfnetlink.h\n+++ include\/linux\/netfilter\/nfnetlink.h\n@@ -28,6 +28,8 @@\n #define NFNLGRP_CONNTRACK_EXP_UPDATE\tNFNLGRP_CONNTRACK_EXP_UPDATE\n \tNFNLGRP_CONNTRACK_EXP_DESTROY,\n #define NFNLGRP_CONNTRACK_EXP_DESTROY\tNFNLGRP_CONNTRACK_EXP_DESTROY\n+\tNFNLGRP_NFTABLES,\n+#define NFNLGRP_NFTABLES\t\tNFNLGRP_NFTABLES\n \tNFNLGRP_ACCT_QUOTA,\n #define NFNLGRP_ACCT_QUOTA\t\tNFNLGRP_ACCT_QUOTA\n \t__NFNLGRP_MAX,\n"} {"commit":"80e7c6a6b2dbbf4765556bbe03db734009249bb9","subject":"Fix line endings and trim trailing whitespace. NFCI.","message":"Fix line endings and trim trailing whitespace. NFCI.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@352198 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/BasicTTIImpl.h\n+++ include\/llvm\/CodeGen\/BasicTTIImpl.h\n@@ -996,7 +996,7 @@\n \/\/ inside the loop.\n if (UseMaskForGaps)\n Cost += static_cast<T *>(this)->getArithmeticInstrCost(\n- BinaryOperator::And, MaskVT); \n+ BinaryOperator::And, MaskVT);\n \n return Cost;\n }\n@@ -1299,7 +1299,7 @@\n \/\/ Add:\n \/\/ Overflow -> (LHSSign == RHSSign) && (LHSSign != SumSign)\n \/\/ Sub:\n- \/\/ Overflow -> (LHSSign != RHSSign) && (LHSSign != SumSign)\r\n+ \/\/ Overflow -> (LHSSign != RHSSign) && (LHSSign != SumSign)\n unsigned Cost = 0;\n Cost += ConcreteTTI->getArithmeticInstrCost(Opcode, SumTy);\n Cost += 3 * ConcreteTTI->getCmpSelInstrCost(BinaryOperator::ICmp, SumTy,\n"} {"commit":"4de2c7654289bb655edfad70c18a4a1352827bd0","subject":"Fix m_Not and m_Neg to not match random ConstantInt's. Before these would try hard to match constants by inverting the bits and recursively matching. There are two problems with this: 1) some patterns would match when we didn't want them to (theoretical) 2) this is insanely expensive to do, and most often pointless.","message":"Fix m_Not and m_Neg to not match random ConstantInt's. Before\nthese would try hard to match constants by inverting the bits\nand recursively matching. There are two problems with this:\n1) some patterns would match when we didn't want them to (theoretical)\n2) this is insanely expensive to do, and most often pointless.\n\nThis was apparently useful in just 2 instcombine cases, which I\nadded code to handle explicitly. This change speeds up 'opt'\ntime on 176.gcc by 1% and produces bitwise identical code.\n\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@123518 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/Support\/PatternMatch.h\n+++ include\/llvm\/Support\/PatternMatch.h\n@@ -521,8 +521,6 @@\n if (ConstantExpr *CE = dyn_cast<ConstantExpr>(V))\n if (CE->getOpcode() == Instruction::Xor)\n return matchIfNot(CE->getOperand(0), CE->getOperand(1));\n- if (ConstantInt *CI = dyn_cast<ConstantInt>(V))\n- return L.match(ConstantExpr::getNot(CI));\n return false;\n }\n private:\n@@ -557,8 +555,6 @@\n if (ConstantExpr *CE = dyn_cast<ConstantExpr>(V))\n if (CE->getOpcode() == Instruction::Sub)\n return matchIfNeg(CE->getOperand(0), CE->getOperand(1));\n- if (ConstantInt *CI = dyn_cast<ConstantInt>(V))\n- return L.match(ConstantExpr::getNeg(CI));\n return false;\n }\n private:\n"} {"commit":"92267bb35a75fc83fe3c0302e9fce031a3f817ff","subject":"fix this harder.","message":"fix this harder.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@119994 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/System\/SwapByteOrder.h\n+++ include\/llvm\/System\/SwapByteOrder.h\n@@ -62,8 +62,8 @@\n #elif defined(_MSC_VER) && !defined(_DEBUG)\n return _byteswap_uint64(value);\n #else\n- uint64_t Hi = SwapByteOrder(uint32_t(value));\n- uint32_t Lo = SwapByteOrder(uint32_t(value >> 32));\n+ uint64_t Hi = SwapByteOrder_32(uint32_t(value));\n+ uint32_t Lo = SwapByteOrder_32(uint32_t(value >> 32));\n return (Hi << 32) | Lo;\n #endif\n }\n"} {"commit":"8026a6982e72f51cc231489fecfe19fbb973eb87","subject":"Simplify and document the new interface","message":"Simplify and document the new interface\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@11524 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/Target\/MRegisterInfo.h\n+++ include\/llvm\/Target\/MRegisterInfo.h\n@@ -242,14 +242,15 @@\n const TargetRegisterClass *RC) const = 0;\n \n \n- virtual bool canFoldMemoryOperand(MachineInstr* MI, unsigned i) const {\n+ \/\/\/ foldMemoryOperand - If this target supports it, fold a load or store of\n+ \/\/\/ the specified stack slot into the specified machine instruction for the\n+ \/\/\/ specified operand. If this is possible, the target should perform the\n+ \/\/\/ folding and return true, otherwise it should return false. If it folds\n+ \/\/\/ the instruction, it is likely that the MachineInstruction the iterator\n+ \/\/\/ references has been changed.\n+ virtual bool foldMemoryOperand(MachineBasicBlock::iterator &MI,\n+ unsigned OpNum, int FrameIndex) const {\n return false;\n- }\n-\n- virtual int foldMemoryOperand(MachineInstr* MI,\n- unsigned i,\n- int FrameIndex) const {\n- return 0;\n }\n \n \/\/\/ getCallFrameSetup\/DestroyOpcode - These methods return the opcode of the\n"} {"commit":"21293ac192d84f51c0f75c37ba50d90becc3e008","subject":"Comment typo fix.","message":"Comment typo fix.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@154488 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Target\/TargetOptions.h\n+++ include\/llvm\/Target\/TargetOptions.h\n@@ -24,7 +24,7 @@\n \/\/ Possible float ABI settings. Used with FloatABIType in TargetOptions.h.\n namespace FloatABI {\n enum ABIType {\n- Default, \/\/ Target-specific (either soft of hard depending on triple, etc).\n+ Default, \/\/ Target-specific (either soft or hard depending on triple, etc).\n Soft, \/\/ Soft float.\n Hard \/\/ Hard float.\n };\n"} {"commit":"8a2ee8e42361d166230071da6db013b6dac5024c","subject":"update platform_posix.h","message":"update platform_posix.h\n","repos":"konoha-project\/minikonoha,konoha-project\/minikonoha,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/minikonoha","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/minikonoha\/platform_posix.h\n+++ include\/minikonoha\/platform_posix.h\n@@ -661,97 +661,95 @@\n \t\treturn userFault | SoftwareFault | SystemFault;\n \tcase ELOOP: \/* 40 Too many symbolic links encountered *\/\n \t\treturn SystemFault;\n-\n-\t\/*** ***\/\n-#define EWOULDBLOCK EAGAIN \/* Operation would block *\/\n-#define ENOMSG 42 \/* No message of desired type *\/\n-#define EIDRM 43 \/* Identifier removed *\/\n-#define ECHRNG 44 \/* Channel number out of range *\/\n-#define EL2NSYNC 45 \/* Level 2 not synchronized *\/\n-#define EL3HLT 46 \/* Level 3 halted *\/\n-#define EL3RST 47 \/* Level 3 reset *\/\n-#define ELNRNG 48 \/* Link number out of range *\/\n-#define EUNATCH 49 \/* Protocol driver not attached *\/\n-#define ENOCSI 50 \/* No CSI structure available *\/\n-#define EL2HLT 51 \/* Level 2 halted *\/\n-#define EBADE 52 \/* Invalid exchange *\/\n-#define EBADR 53 \/* Invalid request descriptor *\/\n-#define EXFULL 54 \/* Exchange full *\/\n-#define ENOANO 55 \/* No anode *\/\n-#define EBADRQC 56 \/* Invalid request code *\/\n-#define EBADSLT 57 \/* Invalid slot *\/\n-\n-#define EDEADLOCK EDEADLK\n-\n-#define EBFONT 59 \/* Bad font file format *\/\n-#define ENOSTR 60 \/* Device not a stream *\/\n-#define ENODATA 61 \/* No data available *\/\n-#define ETIME 62 \/* Timer expired *\/\n-#define ENOSR 63 \/* Out of streams resources *\/\n-#define ENONET 64 \/* Machine is not on the network *\/\n-#define ENOPKG 65 \/* Package not installed *\/\n-#define EREMOTE 66 \/* Object is remote *\/\n-#define ENOLINK 67 \/* Link has been severed *\/\n-#define EADV 68 \/* Advertise error *\/\n-#define ESRMNT 69 \/* Srmount error *\/\n-#define ECOMM 70 \/* Communication error on send *\/\n-#define EPROTO 71 \/* Protocol error *\/\n-#define EMULTIHOP 72 \/* Multihop attempted *\/\n-#define EDOTDOT 73 \/* RFS specific error *\/\n-#define EBADMSG 74 \/* Not a data message *\/\n-#define EOVERFLOW 75 \/* Value too large for defined data type *\/\n-#define ENOTUNIQ 76 \/* Name not unique on network *\/\n-#define EBADFD 77 \/* File descriptor in bad state *\/\n-#define EREMCHG 78 \/* Remote address changed *\/\n-#define ELIBACC 79 \/* Can not access a needed shared library *\/\n-#define ELIBBAD 80 \/* Accessing a corrupted shared library *\/\n-#define ELIBSCN 81 \/* .lib section in a.out corrupted *\/\n-#define ELIBMAX 82 \/* Attempting to link in too many shared libraries *\/\n-#define ELIBEXEC 83 \/* Cannot exec a shared library directly *\/\n-#define EILSEQ 84 \/* Illegal byte sequence *\/\n-#define ERESTART 85 \/* Interrupted system call should be restarted *\/\n-#define ESTRPIPE 86 \/* Streams pipe error *\/\n-#define EUSERS 87 \/* Too many users *\/\n-#define ENOTSOCK 88 \/* Socket operation on non-socket *\/\n-#define EDESTADDRREQ 89 \/* Destination address required *\/\n-#define EMSGSIZE 90 \/* Message too long *\/\n-#define EPROTOTYPE 91 \/* Protocol wrong type for socket *\/\n-#define ENOPROTOOPT 92 \/* Protocol not available *\/\n-#define EPROTONOSUPPORT 93 \/* Protocol not supported *\/\n-#define ESOCKTNOSUPPORT 94 \/* Socket type not supported *\/\n-#define EOPNOTSUPP 95 \/* Operation not supported on transport endpoint *\/\n-#define EPFNOSUPPORT 96 \/* Protocol family not supported *\/\n-#define EAFNOSUPPORT 97 \/* Address family not supported by protocol *\/\n-#define EADDRINUSE 98 \/* Address already in use *\/\n-#define EADDRNOTAVAIL 99 \/* Cannot assign requested address *\/\n-#define ENETDOWN 100 \/* Network is down *\/\n-#define ENETUNREACH 101 \/* Network is unreachable *\/\n-#define ENETRESET 102 \/* Network dropped connection because of reset *\/\n-#define ECONNABORTED 103 \/* Software caused connection abort *\/\n-#define ECONNRESET 104 \/* Connection reset by peer *\/\n-#define ENOBUFS 105 \/* No buffer space available *\/\n-#define EISCONN 106 \/* Transport endpoint is already connected *\/\n-#define ENOTCONN 107 \/* Transport endpoint is not connected *\/\n-#define ESHUTDOWN 108 \/* Cannot send after transport endpoint shutdown *\/\n-#define ETOOMANYREFS 109 \/* Too many references: cannot splice *\/\n-#define ETIMEDOUT 110 \/* Connection timed out *\/\n-#define ECONNREFUSED 111 \/* Connection refused *\/\n-#define EHOSTDOWN 112 \/* Host is down *\/\n-#define EHOSTUNREACH 113 \/* No route to host *\/\n-#define EALREADY 114 \/* Operation already in progress *\/\n-#define EINPROGRESS 115 \/* Operation now in progress *\/\n-#define ESTALE 116 \/* Stale NFS file handle *\/\n-#define EUCLEAN 117 \/* Structure needs cleaning *\/\n-#define ENOTNAM 118 \/* Not a XENIX named type file *\/\n-#define ENAVAIL 119 \/* No XENIX semaphores available *\/\n-#define EISNAM 120 \/* Is a named type file *\/\n-#define EREMOTEIO 121 \/* Remote I\/O error *\/\n-#define EDQUOT 122 \/* Quota exceeded *\/\n-\n-#define ENOMEDIUM 123 \/* No medium found *\/\n-#define EMEDIUMTYPE 124 \/* Wrong medium type *\/\n-\n-\t\/*** ***\/\n+\t\t\/*** ***\/\n+\t\/\/case EWOULDBLOCK: \/* Operation would block *\/\n+\tcase ENOMSG: \/* No message of desired type *\/\n+\tcase EIDRM: \/* Identifier removed *\/\n+\t\/\/case ECHRNG: \/* Channel number out of range *\/\n+\t\/\/case EL2NSYNC: \/* Level 2 not synchronized *\/\n+\t\/\/case EL3HLT: \/* Level 3 halted *\/\n+\t\/\/case EL3RST: \/* Level 3 reset *\/\n+\t\/\/case ELNRNG: \/* Link number out of range *\/\n+\t\/\/case EUNATCH: \/* Protocol driver not attached *\/\n+\t\/\/case ENOCSI: \/* No CSI structure available *\/\n+\t\/\/case EL2HLT: \/* Level 2 halted *\/\n+\t\/\/case EBADE: \/* Invalid exchange *\/\n+\t\/\/case EBADR: \/* Invalid request descriptor *\/\n+\t\/\/case EXFULL: \/* Exchange full *\/\n+\t\/\/case ENOANO: \/* No anode *\/\n+\t\/\/case EBADRQC: \/* Invalid request code *\/\n+\t\/\/case EBADSLT: \/* Invalid slot *\/\n+\t\/\/case EDEADLOCK:\n+\t\/\/case EBFONT: \/* Bad font file format *\/\n+\tcase ENOSTR: \/* Device not a stream *\/\n+\tcase ENODATA: \/* No data available *\/\n+\tcase ETIME: \/* Timer expired *\/\n+\tcase ENOSR: \/* Out of streams resources *\/\n+\t\/\/case ENONET: \/* Machine is not on the network *\/\n+\t\/\/case ENOPKG: \/* Package not installed *\/\n+\tcase EREMOTE: \/* Object is remote *\/\n+\tcase ENOLINK: \/* Link has been severed *\/\n+\t\/\/case EADV: \/* Advertise error *\/\n+\t\/\/case ESRMNT: \/* Srmount error *\/\n+\t\/\/case ECOMM: \/* Communication error on send *\/\n+\tcase EPROTO: \/* Protocol error *\/\n+\tcase EMULTIHOP: \/* Multihop attempted *\/\n+\t\/\/case EDOTDOT: \/* RFS specific error *\/\n+\tcase EBADMSG: \/* Not a data message *\/\n+\tcase EOVERFLOW: \/* Value too large for defined data type *\/\n+\t\/\/case ENOTUNIQ: \/* Name not unique on network *\/\n+\t\/\/case EBADFD: \/* File descriptor in bad state *\/\n+\t\/\/case EREMCHG: \/* Remote address changed *\/\n+\t\/\/case ELIBACC: \/* Can not access a needed shared library *\/\n+\t\/\/case ELIBBAD: \/* Accessing a corrupted shared library *\/\n+\t\/\/case ELIBSCN: \/* .lib section in a.out corrupted *\/\n+\t\/\/case ELIBMAX: \/* Attempting to link in too many shared libraries *\/\n+\t\/\/case ELIBEXEC:\/* Cannot exec a shared library directly *\/\n+\tcase EILSEQ: \/* Illegal byte sequence *\/\n+\t\/\/case ERESTART:\/* Interrupted system call should be restarted *\/\n+\t\/\/case ESTRPIPE:\/* Streams pipe error *\/\n+\tcase EUSERS: \/* Too many users *\/\n+\tcase ENOTSOCK: \/* Socket operation on non-socket *\/\n+\tcase EDESTADDRREQ: \/* Destination address required *\/\n+\tcase EMSGSIZE: \/* Message too long *\/\n+\tcase EPROTOTYPE: \/* Protocol wrong type for socket *\/\n+\tcase ENOPROTOOPT: \/* Protocol not available *\/\n+\tcase EPROTONOSUPPORT: \/* Protocol not supported *\/\n+\tcase ESOCKTNOSUPPORT: \/* Socket type not supported *\/\n+\tcase EOPNOTSUPP: \/* Operation not supported on transport endpoint *\/\n+\tcase EPFNOSUPPORT: \/* Protocol family not supported *\/\n+\tcase EAFNOSUPPORT: \/* Address family not supported by protocol *\/\n+\tcase EADDRINUSE: \/* Address already in use *\/\n+\tcase EADDRNOTAVAIL: \/* Cannot assign requested address *\/\n+\tcase ENETDOWN: \/* Network is down *\/\n+\tcase ENETUNREACH: \/* Network is unreachable *\/\n+\tcase ENETRESET: \/* Network dropped connection because of reset *\/\n+\tcase ECONNABORTED: \/* Software caused connection abort *\/\n+\tcase ECONNRESET:\/* Connection reset by peer *\/\n+\tcase ENOBUFS: \/* No buffer space available *\/\n+\tcase EISCONN: \/* Transport endpoint is already connected *\/\n+\tcase ENOTCONN: \/* Transport endpoint is not connected *\/\n+\tcase ESHUTDOWN: \/* Cannot send after transport endpoint shutdown *\/\n+\tcase ETOOMANYREFS: \/* Too many references: cannot splice *\/\n+\tcase ETIMEDOUT: \/* Connection timed out *\/\n+\tcase ECONNREFUSED: \/* Connection refused *\/\n+\tcase EHOSTDOWN: \/* Host is down *\/\n+\tcase EHOSTUNREACH: \/* No route to host *\/\n+\tcase EALREADY: \/* Operation already in progress *\/\n+\tcase EINPROGRESS: \/* Operation now in progress *\/\n+\tcase ESTALE: \/* Stale NFS file handle *\/\n+\t\/\/case EUCLEAN: \/* Structure needs cleaning *\/\n+\t\/\/case ENOTNAM: \/* Not a XENIX named type file *\/\n+\t\/\/case ENAVAIL: \/* No XENIX semaphores available *\/\n+\t\/\/case EISNAM: \/* Is a named type file *\/\n+\t\/\/case EREMOTEIO: \/* Remote I\/O error *\/\n+\tcase EDQUOT: \/* Quota exceeded *\/\n+\t\/\/case ENOMEDIUM: \/* No medium found *\/\n+\t\/\/case EMEDIUMTYPE: \/* Wrong medium type *\/\n+\t\tbreak;\n+\n+\t\t\/*** ***\/\n+\n \n \t}\n \treturn userFault | SoftwareFault |SystemFault;\n"} {"commit":"16ab0cf09e4d68be995c1c9a6ead287af60cc9d9","subject":"Make sure that handler_allocator is aligned (in terms of size).","message":"Make sure that handler_allocator is aligned (in terms of size).\n","repos":"byllyfish\/oftr,byllyfish\/oftr,byllyfish\/libofp,byllyfish\/oftr,byllyfish\/oftr,byllyfish\/libofp,byllyfish\/oftr,byllyfish\/libofp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/ofp\/sys\/handler_allocator.h\n+++ include\/ofp\/sys\/handler_allocator.h\n@@ -10,37 +10,49 @@\n \/\/ It contains a single block of memory which may be returned for allocation\n \/\/ requests. If the memory is in use when an allocation request is made, the\n \/\/ allocator delegates allocation to the global heap.\n+\/\/\n+\/\/ The last byte of the memory block is reserved for the flag that indicates\n+\/\/ if the intrinsic memory block is in use.\n class handler_allocator {\n public:\n- handler_allocator() : in_use_(false) {}\n+ enum {\n+ IntrinsicSize = 183\n+ };\n+\n+ handler_allocator() { set_in_use(false); }\n \n handler_allocator(const handler_allocator &) = delete;\n handler_allocator &operator=(const handler_allocator &) = delete;\n \n void *allocate(std::size_t size) {\n- if (!in_use_ && size < sizeof(storage_)) {\n- in_use_ = true;\n- return &storage_;\n+ if (!in_use() && size <= sizeof(IntrinsicSize)) {\n+ set_in_use(true);\n+ return storage_;\n } else {\n+ log::debug(\"handler_allocator::allocate: intrinsic block in use:\", size);\n return ::operator new(size);\n }\n }\n \n void deallocate(void *pointer) {\n- if (pointer == &storage_) {\n- in_use_ = false;\n+ if (pointer == storage_) {\n+ set_in_use(false);\n } else {\n ::operator delete(pointer);\n }\n }\n \n private:\n- \/\/ Storage space used for handler-based custom memory allocation.\n- typename std::aligned_storage<180>::type storage_;\n+ \/\/ Storage space used for handler-based custom memory allocation. The last\n+ \/\/ byte is used for the in_use flag; the size of this object is aligned to\n+ \/\/ 8 bytes.\n+ OFP_ALIGNAS(8) UInt8 storage_[IntrinsicSize + 1];\n \n- \/\/ Whether the handler-based custom allocation storage has been used.\n- bool in_use_;\n+ bool in_use() const { return storage_[IntrinsicSize]; }\n+ void set_in_use(bool val) { storage_[IntrinsicSize] = val; }\n };\n+\n+static_assert(sizeof(handler_allocator) % 8 == 0, \"Expected aligned size.\");\n \n \/\/ Wrapper class template for handler objects to allow handler memory\n \/\/ allocation to be customised. Calls to operator() are forwarded to the\n"} {"commit":"c9244d22fcedf226bbfec51d28e6c86321d859fa","subject":"Fix two function name and args","message":"Fix two function name and args","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2kern\/kernel\/modulemgr.h\n+++ include\/psp2kern\/kernel\/modulemgr.h\n@@ -514,8 +514,29 @@\n *\/\n int ksceKernelGetModuleLibExportList(SceUID pid, SceUID libid, SceKernelModuleExportEntry *list, SceSize *num, SceSize cpy_skip_num);\n \n-int ksceKernelGetModuleUid(SceUID pid, SceUID modid, SceUID *modid_out, const void *unk1, int unk2);\n-int ksceKernelGetModuleUidList(SceUID pid, SceUID *modids, size_t *num);\n+\/**\n+ * @brief Get module id list by import\n+ *\n+ * @param[in] pid - target pid\n+ * @param[in] libid - target library uid\n+ * @param[out] modids - module id output list\n+ * @param[inout] num - in:list max num, out:get entry num\n+ * @param[in] cpy_skip_num - The index at which to start copying\n+ *\n+ * @return 0 on success, < 0 on error.\n+ *\/\n+int ksceKernelGetModuleListByImport(SceUID pid, SceUID libid, SceUID *modids, SceSize *num, SceSize cpy_skip_num);\n+\n+\/**\n+ * @brief Get module export list\n+ *\n+ * @param[in] pid - target pid\n+ * @param[out] libids - library id output list\n+ * @param[inout] num - in:list max num, out:get entry num\n+ *\n+ * @return 0 on success, < 0 on error.\n+ *\/\n+int ksceKernelGetModuleExportLibraryList(SceUID pid, SceUID *libids, SceSize *num);\n \n #ifdef __cplusplus\n }\n"} {"commit":"e35e36b11b0979963923d9faecfa28be70bd6bcc","subject":"Implemented a memory-static FSM.","message":"Implemented a memory-static FSM.\n","repos":"PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth","returncode":1,"stderr":"error: pathspec 'include\/smooth\/core\/fsm\/StaticFSM.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- include\/smooth\/core\/fsm\/StaticFSM.h\n+++ include\/smooth\/core\/fsm\/StaticFSM.h\n@@ -0,0 +1,96 @@\n+\/\/\n+\/\/ Created by permal on 7\/30\/17.\n+\/\/\n+\n+#pragma once\n+\n+#include <stdint.h>\n+#include \"esp_log.h\"\n+\n+namespace smooth\n+{\n+ namespace core\n+ {\n+ namespace fsm\n+ {\n+ \/\/ StaticFSM is a memory-static implementation of a Finite State Machine.\n+ \/\/ It consumes StateSize * 2 bytes of memory at all times.\n+\n+ \/\/ All states used with this FSM must support EnterState and LeaveState methods.\n+ \/\/ These are called after in such a way that they do not overlap the way constructors\n+ \/\/ and destructors do when switching between states.\n+\n+ template<typename BaseState, int StateSize>\n+ class StaticFSM\n+ {\n+ public:\n+ StaticFSM() = default;\n+ virtual ~StaticFSM();\n+\n+ void set_state(BaseState* state);\n+\n+ void* reclaim_state(int size);\n+\n+ private:\n+ uint8_t state[2][StateSize];\n+ BaseState* current_state = nullptr;\n+ };\n+\n+\n+ template<typename BaseState, int StateSize>\n+ StaticFSM<BaseState, StateSize>::~StaticFSM()\n+ {\n+ \/\/ Destroy any currently active state\n+ if (current_state)\n+ {\n+ current_state->~BaseState();\n+ }\n+ }\n+\n+ template<typename BaseState, int StateSize>\n+ void* StaticFSM<BaseState, StateSize>::reclaim_state(int size)\n+ {\n+ int max = static_cast<int>( sizeof(state[0]));\n+ if (size > max)\n+ {\n+ ESP_LOGE(\"StaticFSM\",\n+ \"Attempted to activate state that is larger (%d) than the designated buffer (%d)\",\n+ size,\n+ max);\n+ }\n+\n+ \/\/ Get the memory not currently used\n+ void* reclaimed =\n+ current_state == reinterpret_cast<BaseState*>(&state[0][0]) ? &state[1][0] : &state[0][0];\n+\n+ return reclaimed;\n+ }\n+\n+ template<typename BaseState, int StateSize>\n+ void StaticFSM<BaseState, StateSize>::set_state(BaseState* state)\n+ {\n+ if (current_state != nullptr)\n+ {\n+ current_state->LeaveState();\n+ current_state->~BaseState();\n+ }\n+\n+ current_state = state;\n+ current_state->EnterState();\n+ }\n+ }\n+ }\n+}\n+\n+template<typename BaseState, int StateSize>\n+void* operator new(size_t size, smooth::core::fsm::StaticFSM<BaseState, StateSize>& fsm)\n+{\n+ return fsm.reclaim_state(size);\n+}\n+\n+\n+template<typename BaseState, int StateSize>\n+void operator delete(void*, smooth::core::fsm::StaticFSM<BaseState, StateSize>& fsm)\n+{\n+ fsm.reclaim_state(0);\n+}\n"} {"commit":"eef5053773858f1ed7b8bbf553ec26e110b5f40a","subject":"added detailed performance measurement code in targeet side LET","message":"added detailed performance measurement code in targeet side LET\n","repos":"keisukefukuda\/tapas,keisukefukuda\/tapas,keisukefukuda\/tapas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/tapas\/hot\/target_side_let.h\n+++ include\/tapas\/hot\/target_side_let.h\n@@ -47,6 +47,8 @@\n using Vec = tapas::Vec<TSP::Dim, typename TSP::FP>;\n using Reg = Region<Dim, FP>;\n \n+ using AttrTuple = std::tuple<KeyType, CellAttr>;\n+\n \/**\n * Direction of Map-1 (Upward\/Downward)\n *\/\n@@ -191,79 +193,117 @@\n et_comm = MPI_Wtime();\n data.time_rec_.Record(data.timestep_, \"Map2-LET-req-comm\", et_comm - bt_comm);\n \n-#ifdef TAPAS_DEBUG_DUMP\n- {\n- assert(keys_body_recv.size() == body_src.size());\n- tapas::debug::DebugStream e(\"body_keys_recv\");\n- for (size_t i = 0; i < keys_body_recv.size(); i++) {\n- e.out() << SFC::Decode(keys_body_recv[i]) << \" from \" << body_src[i] << std::endl;\n- }\n- }\n-#endif\n-\n-#ifdef TAPAS_DEBUG_DUMP\n- BarrierExec([&](int rank, int) {\n- std::cout << \"rank \" << rank << \" req_keys_attr.size() = \" << req_keys_attr.size() << std::endl;\n- std::cout << \"rank \" << rank << \" req_keys_body.size() = \" << req_keys_body.size() << std::endl;\n+ et_all = MPI_Wtime();\n+ data.time_rec_.Record(data.timestep_, \"Map2-LET-req\", et_all - bt_all);\n+ }\n+\n+ \/**\n+ * \\brief Send response cells to each other\n+ *\/\n+ static std::tuple<std::vector<KeyType>, std::vector<CellAttr>, std::vector<AttrTuple>>\n+ ExchCells(Data &data,\n+ std::vector<KeyType> &keys, \/* in, out *\/\n+ std::vector<int> &dest_ranks, \/* in, out *\/\n+ std::vector<CellAttr> &attrs) \/* out *\/ {\n+ MPI_Barrier(data.mpi_comm_);\n+ double bt = MPI_Wtime();\n+ \n+ double bt_comp1 = MPI_Wtime();\n+ std::vector<AttrTuple> send_buf(keys.size());\n+ std::vector<int> send_count(data.mpi_size_);\n+\n+ int prev_rank = dest_ranks[0];\n+\n+ for (size_t i = 0; i < keys.size(); i++) {\n+ KeyType k = keys[i];\n+ int r = dest_ranks[i];\n+\n+ \/\/ debug\n+ assert(prev_rank <= r);\n+ assert(r < data.mpi_size_);\n+ assert(data.ht_.count(k) > 0);\n+\n+ send_buf[i] = std::make_tuple(k, data.ht_.at(k)->attr());\n+ send_count[r]++;\n+ prev_rank = r;\n+ }\n+\n+ std::vector<AttrTuple> recv_buf;\n+ std::vector<int> recv_count;\n+\n+ double et_comp1 = MPI_Wtime();\n+ data.time_rec_.Record(data.timestep_, \"Map2-LET-res-comp1\", et_comp1 - bt_comp1);\n+\n+ double bt_mpi = MPI_Wtime();\n+ tapas::mpi::Alltoallv(send_buf, send_count, recv_buf, recv_count, data.mpi_comm_);\n+ double et_mpi = MPI_Wtime();\n+\n+ MPI_Barrier(data.mpi_comm_);\n+\n+ double bt_comp2 = MPI_Wtime();\n+ std::vector<KeyType> res_keys(recv_buf.size());\n+ std::vector<CellAttr> res_attrs(recv_buf.size());\n+ \/\/res_keys.reserve(recv_buf.size());\n+ \/\/res_attrs.reserve(recv_buf.size());\n+ double et_comp2 = MPI_Wtime();\n+\n+ MPI_Barrier(data.mpi_comm_);\n+\n+ double bt_comp3 = MPI_Wtime();\n+ for (size_t i = 0; i < recv_buf.size(); i++) {\n+ res_keys[i] = std::get<0>(recv_buf[i]);\n+ res_attrs[i] = std::get<1>(recv_buf[i]);\n+ }\n+ double et_comp3 = MPI_Wtime();\n+ double et = MPI_Wtime();\n+\n+ MPI_Barrier(data.mpi_comm_);\n+\n+#if 1\n+ tapas::debug::BarrierExec([&](int rank, int) {\n+ size_t count = send_buf.size();\n+ double size = count * sizeof(send_buf[0]);\n+ std::cout << \"ExchCells: #cells = \" << count << \" size=\" << std::fixed << std::setprecision(2) << size\n+ << \"(=\" << std::fixed << std::setprecision(2) << (size\/1024\/1024) << \" MB)\"\n+ << std::endl;\n+ std::cout << \" ht_.size() = \" << data.ht_.size() << std::endl;\n+ });\n+\n+ tapas::debug::BarrierExec([&](int rank, int) {\n+ std::cout << \"ExchCell: [\" << rank << \"] send_count = \";\n+ for (int i : send_count) {\n+ std::cout << i << \" \";\n+ }\n std::cout << std::endl;\n });\n #endif\n-\n- et_all = MPI_Wtime();\n- data.time_rec_.Record(data.timestep_, \"Map2-LET-req\", et_all - bt_all);\n- }\n-\n- static void ExchCells(Data &data,\n- std::vector<KeyType> &req_attr_keys,\n- std::vector<int> &attr_src_ranks,\n- std::vector<CellAttr> &res_cell_attrs) {\n- double bt = MPI_Wtime();\n-\n- \/\/ ===== Pre-comm computation =====\n- \/\/ Create and send responses to the src processes of requests.\n- double bt_comp1 = MPI_Wtime();\n-\n- const auto &ht = data.ht_;\n- int mpi_size = data.mpi_size_;\n-\n- \/\/ Prepare cell attributes to send to <attr_src_ranks> processes\n- std::vector<KeyType> attr_keys_send = req_attr_keys; \/\/ copy (split senbuf and recvbuf)\n- std::vector<int> attr_dest_ranks = attr_src_ranks;\n- res_cell_attrs.clear();\n- std::vector<CellAttr> attr_sendbuf;\n- Partitioner<TSP>::KeysToAttrs(attr_keys_send, attr_sendbuf, data.ht_);\n-\n- double et_comp1 = MPI_Wtime();\n- data.time_rec_.Record(data.timestep_, \"Map2-LET-res-comp1\", et_comp1 - bt_comp1);\n-\n- \/\/ ===== 2. communication =====\n- \/\/ Send response keys and attributes\n-\n-\n- if (data.mpi_rank_ == 0) {\n- size_t count = attr_keys_send.size();\n- double size = count * sizeof(attr_keys_send[0]);\n- std::cout << \"ExchCells: #cells = \" << count << \" size=\" << std::fixed << std::setprecision(2) << size\n- << \"(=\" << std::fixed << std::setprecision(2) << (size\/1024\/1024) << \" MB)\"\n- << std::endl;\n- std::cout << \" ht_.size() = \" << data.ht_.size() << std::endl;\n- }\n- MPI_Barrier(data.mpi_comm_);\n-\n- double bt_mpi = MPI_Wtime();\n- tapas::mpi::Alltoallv2_X(attr_keys_send, attr_dest_ranks,\n- req_attr_keys, attr_src_ranks, data.mpi_type_key_, MPI_COMM_WORLD);\n- tapas::mpi::Alltoallv2_X(attr_sendbuf, attr_dest_ranks,\n- res_cell_attrs, attr_src_ranks, data.mpi_type_attr_, MPI_COMM_WORLD);\n- double et_mpi = MPI_Wtime();\n- double et = MPI_Wtime();\n-\n- if (data.mpi_rank_ == 0) {\n- std::cout << \"ExchCells: \" << (et - bt) << \" [s]\" << std::endl;\n- std::cout << \"ExchCells: MPI: \" << (et_mpi - bt_mpi) << \" [s]\" << std::endl;\n- }\n+ \n+ \/\/ if (data.mpi_rank_ == 0) {\n+ \/\/ std::cout << \"ExchCells: \" << (et - bt) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: MPI: \" << (et_mpi - bt_mpi) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: Pre1: \" << (et_comp1 - bt_comp1) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: Pre2: \" << (et_comp2 - bt_comp2) << \" [s]\" << std::endl;\n+ \/\/ }\n+ tapas::debug::BarrierExec([&](int rank, int) {\n+ if (rank == 0) {\n+ printf(\"%3s %7s %7s %7s %7s %7s %7s ExchCells\\n\", \"rank\", \"Total\", \"MPI\", \"Comp1\", \"Comp2\", \"Comp3\", \"recvbuf.size()\");\n+ }\n+ printf(\"%3d %10.4f %10.4f %10.4f %10.4f %10.4f %10d ExchCells\\n\",\n+ rank,\n+ et-bt,\n+ et_mpi - bt_mpi,\n+ et_comp1 - bt_comp1,\n+ et_comp2 - bt_comp2,\n+ et_comp3 - bt_comp3,\n+ (int)recv_buf.size());\n+ \/\/ std::cout << \"ExchCells: [\" << rank << \"] \" << (et - bt) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: [\" << rank << \"] MPI: \" << (et_mpi - bt_mpi) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: [\" << rank << \"] Pre1: \" << (et_comp1 - bt_comp1) << \" [s]\" << std::endl;\n+ \/\/ std::cout << \"ExchCells: [\" << rank << \"] Pre2: \" << (et_comp2 - bt_comp2) << \" [s]\" << std::endl;\n+ });\n \n data.time_rec_.Record(data.timestep_, \"Map2-LET-res-attr-comm\", et - bt);\n+ return std::make_tuple(res_keys, res_attrs, recv_buf);\n }\n \n static void ExchBodies(Data &data, \n@@ -388,11 +428,15 @@\n double bt=0, et=0;\n double bt_all=0, et_all=0;\n \n+ using AttrTuple = std::tuple<KeyType, CellAttr>;\n+ std::vector<AttrTuple> recv_attrs;\n+\n Partitioner<TSP>::SelectResponseCells(req_attr_keys, attr_src_ranks,\n req_leaf_keys, leaf_src_ranks,\n data.ht_);\n \n- ExchCells(data, req_attr_keys, attr_src_ranks, res_cell_attrs);\n+ std::tie(req_attr_keys, res_cell_attrs, recv_attrs)\n+ = ExchCells(data, req_attr_keys, attr_src_ranks, res_cell_attrs);\n \n ExchBodies(data, req_leaf_keys, leaf_src_ranks, res_cell_attrs, res_bodies, res_nb);\n \n"} {"commit":"91323ef9796d8b726287c1ff057e94abc27ec187","subject":"Revert \"instIDs for AVX512\"","message":"Revert \"instIDs for AVX512\"\n\nThis reverts commit b518176bb7e04e29a00b5dc1db20553299eac96f.\n","repos":"szellmann\/visionaray,szellmann\/visionaray","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/visionaray\/math\/intersect.h\n+++ include\/visionaray\/math\/intersect.h\n@@ -623,9 +623,6 @@\n int_array geom_id;\n store(geom_id, hr.geom_id);\n \n- int_array inst_id;\n- store(inst_id, hr.inst_id);\n-\n float_array t;\n store(t, hr.t);\n \n@@ -643,7 +640,6 @@\n result[i].hit = hit[i] != 0;\n result[i].prim_id = prim_id[i];\n result[i].geom_id = geom_id[i];\n- result[i].inst_id = inst_id[i];\n result[i].t = t[i];\n result[i].isect_pos = isect_pos[i];\n result[i].u = u[i];\n"} {"commit":"2217fa8667dd02264533196a1ace5cd7d256b10f","subject":"Fix for new definitions and more rigorous testing... Output on Opteron....","message":"Fix for new definitions and more rigorous testing...\nOutput on Opteron....\n\nL1 Instruction Write through Unknown policy Cache:\n Total size: 64KB\n Line size: 64B\n Number of Lines: 1024\n Associativity: 2\n\nL1 Data Write back Pseudo LRU policy Cache:\n Total size: 64KB\n Line size: 64B\n Number of Lines: 1024\n Associativity: 2\n\nL2 Unified Write through Pseudo LRU policy Cache:\n Total size: 1024KB\n Line size: 64B\n Number of Lines: 16384\n Associativity: 16\n","repos":"arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/ctests\/memory.c\n+++ src\/ctests\/memory.c\n@@ -91,17 +91,39 @@\n L = (PAPI_mh_level_t *) &(hwinfo->mem_hierarchy.level[0]);\n for (i=0; i<hwinfo->mem_hierarchy.levels; i++) {\n for (j=0; j<2; j++) {\n- switch (L[i].cache[j].type) {\n- case PAPI_MH_TYPE_UNIFIED:\n- printf(\"L%d Unified Cache:\\n\", i+1);\n- break;\n- case PAPI_MH_TYPE_DATA:\n- printf(\"L%d Data Cache:\\n\", i+1);\n- break;\n- case PAPI_MH_TYPE_INST:\n- printf(\"L%d Instruction Cache:\\n\", i+1);\n- break;\n- }\n+\t int tmp;\n+\n+\t tmp = PAPI_MH_CACHE_TYPE(L[i].cache[j].type);\n+\t if (tmp == PAPI_MH_TYPE_UNIFIED)\n+\t { printf(\"L%d Unified \",i+1);} \n+\t else if (tmp == PAPI_MH_TYPE_DATA)\n+\t { \t printf(\"L%d Data \",i+1);}\n+\t else if (tmp == PAPI_MH_TYPE_INST)\n+\t { printf(\"L%d Instruction \",i+1); } \n+\t else if (tmp == PAPI_MH_TYPE_EMPTY)\n+\t { break; }\n+\t else\n+\t { test_fail(__FILE__, __LINE__, \"PAPI_get_hardware_info\", PAPI_EBUG); }\n+\n+\t tmp = PAPI_MH_CACHE_WRITE_POLICY(L[i].cache[j].type);\n+\t if (tmp == PAPI_MH_TYPE_WB)\n+\t { printf(\"Write back \");} \n+\t else if (tmp == PAPI_MH_TYPE_WT)\n+\t { printf(\"Write through \");} \n+\t else \n+\t { test_fail(__FILE__, __LINE__, \"PAPI_get_hardware_info\", PAPI_EBUG); } \n+\n+\t tmp = PAPI_MH_CACHE_REPLACEMENT_POLICY(L[i].cache[j].type);\n+\t if (tmp == PAPI_MH_TYPE_PSEUDO_LRU)\n+\t { printf(\"Pseudo LRU policy \"); } \n+\t else if (tmp == PAPI_MH_TYPE_LRU)\n+\t { printf(\"LRU policy \");} \n+\t else if (tmp == PAPI_MH_TYPE_UNKNOWN)\n+\t { printf(\"Unknown policy \"); }\n+\t else\n+\t { test_fail(__FILE__, __LINE__, \"PAPI_get_hardware_info\", PAPI_EBUG); }\n+\n+\t printf(\"Cache:\\n\");\n if (L[i].cache[j].type) {\n printf(\" Total size: %dKB\\n Line size: %dB\\n Number of Lines: %d\\n Associativity: %d\\n\\n\",\n (L[i].cache[j].size)>>10, L[i].cache[j].line_size, L[i].cache[j].num_lines, L[i].cache[j].associativity);\n"} {"commit":"9709952edccdd2766fea482f657eb8b2628a7a73","subject":"Comment review","message":"Comment review\n","repos":"smartdevicelink\/sdl_ios,smartdevicelink\/sdl_ios,smartdevicelink\/sdl_ios,smartdevicelink\/sdl_ios,smartdevicelink\/sdl_ios","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- SmartDeviceLink\/public\/SDLDisplayCapabilities.h\n+++ SmartDeviceLink\/public\/SDLDisplayCapabilities.h\n@@ -17,7 +17,7 @@\n *\/\n \n NS_ASSUME_NONNULL_BEGIN\n-__deprecated_msg(\"Use the displayCapabilities property in SDLSystemCapabilityManager instead.\")\n+__deprecated_msg(\"Use SDLSystemCapabilityManager.defaultMainWindowCapability instead\")\n @interface SDLDisplayCapabilities : SDLRPCStruct\n \n \/**\n"} {"commit":"893bacf1e6b5a5eccf37af034cb8dc649e38b0c1","subject":"core: Fix grl_data_has_key() function","message":"core: Fix grl_data_has_key() function\n\nCheck if key has at least one value in data.\n\nSigned-off-by: Juan A. Suarez Romero <af79b5692270b306571bb1d8bbe0285ae3ac93d9@igalia.com>\n","repos":"MathieuDuponchelle\/grilo,MathieuDuponchelle\/grilo,GNOME\/grilo,jasuarez\/grilo,grilofw\/grilo,GNOME\/grilo,kyoushuu\/grilo,jasuarez\/grilo,grilofw\/grilo,grilofw\/grilo,kyoushuu\/grilo,kyoushuu\/grilo,jasuarez\/grilo,MathieuDuponchelle\/grilo,kyoushuu\/grilo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/data\/grl-data.c\n+++ src\/data\/grl-data.c\n@@ -537,7 +537,9 @@\n gboolean\n grl_data_has_key (GrlData *data, GrlKeyID key)\n {\n+ GList *related_keys;\n GrlKeyID sample_key;\n+ gboolean found = FALSE;\n \n g_return_val_if_fail (GRL_IS_DATA (data), FALSE);\n \n@@ -546,7 +548,13 @@\n return FALSE;\n }\n \n- return g_hash_table_lookup_extended (data->priv->data, sample_key, NULL, NULL);\n+ related_keys = g_hash_table_lookup (data->priv->data, sample_key);\n+ while (related_keys && !found) {\n+ found = grl_related_keys_has_key (related_keys->data, key);\n+ related_keys = g_list_next (related_keys);\n+ }\n+\n+ return found;\n }\n \n \/**\n"} {"commit":"ff607b7731dbc19e9b9b2cc67c7ee648b37e7dbd","subject":"Increased max typelist size","message":"Increased max typelist size\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- TypeList.h\n+++ TypeList.h\n@@ -12,7 +12,7 @@\n {\n \n \t\/*! \\cond GS_INTERNAL *\/\n-\t\n+\n \tstruct TypeListEndNode\n \t{ };\n \n@@ -37,10 +37,10 @@\n \n \tnamespace Detail\n \t{\n-\t\ttemplate < typename Signature > \n+\t\ttemplate < typename Signature >\n \t\tstruct TypeListCreator;\n \n-\t\ttemplate < TY T1 > \n+\t\ttemplate < TY T1 >\n \t\tstruct TypeListCreator<void(T1)> : public TypeList_1<T1>\n \t\t{ };\n \t}\n@@ -76,6 +76,16 @@\n \tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(18, 17, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18))\n \tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(19, 18, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19))\n \tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(20, 19, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(21, 20, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(22, 21, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(23, 22, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(24, 23, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(25, 24, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(26, 25, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25, TY T26), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(27, 26, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25, TY T26, TY T27), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(28, 27, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25, TY T26, TY T27, TY T28), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(29, 28, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25, TY T26, TY T27, TY T28, TY T29), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29))\n+\tDETAIL_DETAIL_TOOLKIT_DECLARE_TYPELIST(30, 29, MK_PARAM(TY T1, TY T2, TY T3, TY T4, TY T5, TY T6, TY T7, TY T8, TY T9, TY T10, TY T11, TY T12, TY T13, TY T14, TY T15, TY T16, TY T17, TY T18, TY T19, TY T20, TY T21, TY T22, TY T23, TY T24, TY T25, TY T26, TY T27, TY T28, TY T29, TY T30), MK_PARAM(T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30))\n \n \/*\n \ttemplate < TY T1, TY T2 >\n@@ -109,7 +119,7 @@\n \n \t\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n-\t\n+\n \ttemplate < typename FirstTypeList, typename SecondTypeList >\n \tstruct TypeListMerge\n \t{ typedef TypeListNode<typename FirstTypeList::ValueT, typename TypeListMerge<typename FirstTypeList::Next, SecondTypeList>::ValueT> ValueT; };\n@@ -160,12 +170,12 @@\n \t{ CompileTimeAssert<sizeof(TypeList) < 0>\tERROR_invalid_index; };\n \n \ttemplate < typename TypeList, typename T >\n-\tstruct IndexOfTypeListItem \n-\t{ \n+\tstruct IndexOfTypeListItem\n+\t{\n \tprivate:\n-\t\tstatic const int NextResult = IndexOfTypeListItem<typename TypeList::Next, T>::Value; \n+\t\tstatic const int NextResult = IndexOfTypeListItem<typename TypeList::Next, T>::Value;\n \tpublic:\n-\t\tstatic const int Value = (NextResult == -1) ? -1 : (NextResult + 1); \n+\t\tstatic const int Value = (NextResult == -1) ? -1 : (NextResult + 1);\n \t};\n \n \ttemplate < typename TypeList, typename T >\n@@ -191,11 +201,11 @@\n \tstruct EvaluateTypeListItem<TypeListEndNode, Predicate>\n \t{ static const bool Value = false; };\n \n-\ttemplate \n-\t\t< \n-\t\t\ttypename TypeList, \n-\t\t\ttemplate <typename> class Predicate, \n-\t\t\tbool CurrentIsOK = EvaluateTypeListItem<TypeList, Predicate>::Value \n+\ttemplate\n+\t\t<\n+\t\t\ttypename TypeList,\n+\t\t\ttemplate <typename> class Predicate,\n+\t\t\tbool CurrentIsOK = EvaluateTypeListItem<TypeList, Predicate>::Value\n \t\t>\n \tstruct TypeListCopyIf;\n \n@@ -209,7 +219,7 @@\n \ttemplate < typename TypeList, template <typename> class Predicate >\n \tstruct TypeListCopyIf<TypeList, Predicate, true>\n \t{ typedef TypeListNode<typename TypeList::ValueT, typename TypeListCopyIf<typename TypeList::Next, Predicate>::ValueT> ValueT; };\n-\t\n+\n \ttemplate < typename TypeList, template <typename> class Predicate >\n \tstruct TypeListCopyIf<TypeList, Predicate, false>\n \t{ typedef typename TypeListCopyIf<typename TypeList::Next, Predicate>::ValueT ValueT; };\n@@ -229,8 +239,8 @@\n \tstruct ForEachInTypeList\n \t{\n \t\tstatic void Do()\n-\t\t{ \n-\t\t\tFunctorClass<typename TypeList::ValueT>::Call(); \n+\t\t{\n+\t\t\tFunctorClass<typename TypeList::ValueT>::Call();\n \t\t\tForEachInTypeList<typename TypeList::Next, FunctorClass>::Do();\n \t\t}\n \n@@ -261,7 +271,7 @@\n \n \tnamespace Detail\n \t{\n-\t\t\n+\n \t\ttemplate < typename T, bool IsTypeList >\n \t\tstruct ToTypeListImpl { typedef T\tValueT; };\n \n"} {"commit":"2872e8f790b1bbf66b687b870b0e183bf63cf3c3","subject":"Simplify return.","message":"Simplify return.\n","repos":"mikew67\/nrf51-ble-app-lbs,stianrh\/nrf51-ble-app-lbs,NordicSemiconductor\/nrf51-ble-app-lbs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ble_lbs.c\n+++ ble_lbs.c\n@@ -119,7 +119,6 @@\n *\/\n static uint32_t button_char_add(ble_lbs_t * p_lbs, const ble_lbs_init_t * p_lbs_init)\n {\n- uint32_t err_code;\n ble_gatts_char_md_t char_md;\n ble_gatts_attr_md_t cccd_md;\n ble_gatts_attr_t attr_char_value;\n@@ -163,14 +162,9 @@\n attr_char_value.max_len = sizeof(uint8_t);\n attr_char_value.p_value = NULL;\n \n- err_code = sd_ble_gatts_characteristic_add(p_lbs->service_handle, &char_md,\n+ return sd_ble_gatts_characteristic_add(p_lbs->service_handle, &char_md,\n &attr_char_value,\n &p_lbs->button_char_handles);\n- if (err_code != NRF_SUCCESS)\n- {\n- return err_code;\n- }\n- return NRF_SUCCESS;\n }\n #endif\n \n"} {"commit":"1fd4f8935b1476967665f1aae2edbd464fedccff","subject":"Fixed build","message":"Fixed build\n","repos":"arbonagw\/HeliumRain,arbonagw\/HeliumRain,arbonagw\/HeliumRain,arbonagw\/HeliumRain,arbonagw\/HeliumRain","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Source\/Flare\/UI\/Style\/FlareWidgetStyleCatalog.h\n+++ Source\/Flare\/UI\/Style\/FlareWidgetStyleCatalog.h\n@@ -34,8 +34,6 @@\n \n \t\tOutBrushes.Add(&ButtonBackground);\n \t\tOutBrushes.Add(&ButtonActiveBackground);\n-\t\tOutBrushes.Add(&ButtonBorder);\n-\t\tOutBrushes.Add(&ButtonActiveBorder);\n \t\tOutBrushes.Add(&ButtonDecorator);\n \t\tOutBrushes.Add(&ButtonActiveDecorator);\n \n"} {"commit":"5bbb395e8165787d0cb36c29412f92718ada5958","subject":"simplify & clean up","message":"simplify & clean up\n","repos":"rnoth\/edna,rnoth\/edna","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -45,23 +45,18 @@\n int\n filename (State *st, Arg *arg, char *error)\n {\n-\tif (st->file)\n-\t\tif (fclose (st->file) == EOF) {\n-\t\t\twarn (\"fclose\");\n-\t\t\tstrcpy (error, \"could not close current file\");\n-\t\t\treturn 1;\n-\t\t}\n-\t\/* FIXME: no sanity checking on arg->vec or arg->cnt *\/\n-\tif (!arg->vec) {\n-\t\tif (0 > printf (\"%s\\n\", st->filename))\n-\t\t\tdie (\"printf\");\n-\t\treturn 0;\n-\t}\n-\tif (!arg->vec[0]) {\n+\tif (!arg->cnt && (0 > printf (\"%s\\n\", st->filename))) {\n+\t\tdie (\"printf\");\n+\t} else if (!arg->vec[0]) {\n \t\tstrcpy (error, \"parsing error. this is not your fault\");\n \t\treturn 1;\n+\t} else if (st->file && fclose (st->file) == EOF) {\n+\t\twarn (\"fclose\");\n+\t\tstrcpy (error, \"could not close current file\");\n+\t\treturn 1;\n+\t} else {\n+\t\tstrcpy (st->filename, arg->vec[0]);\n \t}\n-\tstrcpy (st->filename, arg->vec[0]);\n \treturn 0;\n }\n \n@@ -96,7 +91,7 @@\n \tsize_t bufsiz;\n \tint option;\n \n-\toption = INSERT; \/* -1 is putline's insert mode *\/\n+\toption = INSERT;\n \n \tif (arg->mode) {\n \t\tif (!strcmp (arg->mode, \"insert\")) {\n@@ -148,9 +143,8 @@\n int\n print (State *st, Arg *arg, char *error)\n {\n-\tif (arg->addr)\n-\t\tif (gotol (st, arg, error))\n-\t\t\treturn 1;\n+\tif (arg->addr && gotol (st, arg, error))\n+\t\treturn 1;\n \n \tif (!st->curline->str) {\n \t\tstrcpy (error, \"empty buffer\");\n@@ -179,7 +173,6 @@\n \t\treturn 1;\n \t}\n \n-end:\n \tstrcpy (error, \"quit\");\n \treturn 0;\n }\t\n@@ -187,14 +180,9 @@\n int\n write (State *st, Arg *arg, char *error)\n {\n-\tif (!st->file && !st->filename[0]) {\n-\t\tif (!arg->vec) {\n-\t\t\tstrcpy (error, \"no open file and no default filename\");\n-\t\t\treturn 1;\n-\t\t}\n-\t\tif(filename (st, arg, error))\n-\t\t\treturn 1;\n-\t}\n+\tif (arg->cnt && arg->vec[0]) {\n+\t\tstrcpy (st->filename, arg->vec[0]);\n+\n \targ->addr = -st->lineno + 1; \/* go to start of buffer *\/\n \tgotol (st, arg, error);\n \twritefile (st);\n"} {"commit":"fb20c849ea5ee9204daadbb720cf1dc84268d9f1","subject":"Added char info","message":"Added char info\n","repos":"bobrippling\/uvi,bobrippling\/uvi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -339,11 +339,16 @@\n \n void cmd_where(int argc, char **argv, int force, struct range *rng)\n {\n-\tif(argc != 1 || force || rng->start != -1 || rng->end != -1)\n+\tchar *line;\n+\tif(argc != 1 || force || rng->start != -1 || rng->end != -1){\n \t\tgui_status(GUI_ERR, \"usage: %s\", *argv);\n-\telse\n-\t\tgui_status(GUI_NONE, \"x=%d y=%d left=%d top=%d\",\n-\t\t\t\tgui_x(), gui_y(), gui_left(), gui_top());\n+\t\treturn;\n+\t}\n+\n+\tline = buffer_getindex(buffers_current(), gui_y())->data;\n+\n+\tgui_status(GUI_NONE, \"x=%d y=%d left=%d top=%d char=%d\",\n+\t\t\tgui_x(), gui_y(), gui_left(), gui_top(), line[gui_x()]);\n }\n \n void cmd_set(int argc, char **argv, int force, struct range *rng)\n"} {"commit":"325091c66268621913c5cf8ed2f477e0bf60d48f","subject":"debug","message":"debug\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compass.c\n+++ compass.c\n@@ -24,13 +24,14 @@\n \/\/\/\u30ad\u30e3\u30ea\u30d6\u30ec\u30fc\u30b7\u30e7\u30f3\u95a2\u4fc2\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\n static const double K_PARAMETER = 1.0;\/\/\u5730\u78c1\u6c17\u306e\u611f\u5ea6\u88dc\u6b63\u30d1\u30e9\u30e1\u30fc\u30bf\n \n-static const double COMPASS_X_OFFSET = -92.0; \/\/\u3053\u3053\u306b\u624b\u52d5\u3067\u30ad\u30e3\u30ea\u30d6\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u305foffset\u5024\u3092\u4ee3\u5165(EM\u306b\u3064\u3044\u3066\u308b\u30b3\u30f3\u30d1\u30b9\u306e\u5024)\n-static const double COMPASS_Y_OFFSET = -253.5;\n-\n \/*\n- static const double COMPASS_X_OFFSET = -15.5; \/\/\u3053\u3053\u306b\u624b\u52d5\u3067\u30ad\u30e3\u30ea\u30d6\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u305foffset\u5024\u3092\u4ee3\u5165(FM\u306b\u3064\u3044\u3066\u308b\u30b3\u30f3\u30d1\u30b9\u306e\u5024)\n- static const double COMPASS_Y_OFFSET = 401.5;\n+ static const double COMPASS_X_OFFSET = -92.0; \/\/\u3053\u3053\u306b\u624b\u52d5\u3067\u30ad\u30e3\u30ea\u30d6\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u305foffset\u5024\u3092\u4ee3\u5165(EM\u306b\u3064\u3044\u3066\u308b\u30b3\u30f3\u30d1\u30b9\u306e\u5024)\n+ static const double COMPASS_Y_OFFSET = -253.5;\n *\/\n+\n+static const double COMPASS_X_OFFSET = -15.5; \/\/\u3053\u3053\u306b\u624b\u52d5\u3067\u30ad\u30e3\u30ea\u30d6\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u305foffset\u5024\u3092\u4ee3\u5165(FM\u306b\u3064\u3044\u3066\u308b\u30b3\u30f3\u30d1\u30b9\u306e\u5024)\n+static const double COMPASS_Y_OFFSET = 401.5;\n+\n \n \/\/\u5468\u56f2\u306b\u5f37\u78c1\u5834\u304c\u3042\u308b\u6642\u306e\u9000\u907f\n static const int MAX_PWM_VAL = 100;\n"} {"commit":"6dd3e22b68fcd421dedf278857e22a74fe8465e0","subject":"debug","message":"debug\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compass.c\n+++ compass.c\n@@ -139,6 +139,7 @@\n \t\tprintf(\"1st bit of status resister = %d\\n\", (status_val >> 0) & 0x01);\/\/\u5730\u78c1\u6c17\u304c\u6b63\u5e38\u306a\u3089\u3053\u3053\u306f1(\u6b7b\u3093\u3067\u30821?)\n \t\tprintf(\"2nd bit of status resister = %d\\n\", (status_val >> 1) & 0x01);\/\/\u5730\u78c1\u6c17\u304c\u6b63\u5e38\u306a\u3089\u3053\u3053\u306f0(\u6b7b\u3093\u3060\u30891)\n \t\t*\/\n+ delay(10);\n \t}\n \tqsort(data->xList,10, sizeof(short), sCmp);\n \tqsort(data->yList,10, sizeof(short), sCmp);\n"} {"commit":"04268e5aa3e65c5d5222a4321c718cd60807ec79","subject":"\u5b8c\u6210\u63d0\u9ad8\u8981\u6c42\u4e09\uff0c\u563b\u563b","message":"\u5b8c\u6210\u63d0\u9ad8\u8981\u6c42\u4e09\uff0c\u563b\u563b\n","repos":"constroy\/GMF_WinSh","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- WinShell.c\n+++ WinShell.c\n@@ -31,6 +31,7 @@\n \tvoid help(); \/*\u02be\u03e2*\/\n \n \tchar c, *input, *arg[2], path[BUFSIZE];\n+\tchar str[256];\n \tint input_len = 0, is_bg = 0, i, j, k;\n \tHANDLE hprocess; \/*\u05b4\u043d\u063d\u033e*\/\n \tDWORD dwRet;\n@@ -150,8 +151,28 @@\n \t\t\t}\n \t\t\tis_bg = 0;\n \t\t\thprocess = process(is_bg,arg[1]);\n-\t\t\tif (WaitForSingleObject(hprocess,INFINITE)==WAIT_OBJECT_0)\n+\t\t\/\/\t\n \t\t\t\/*\u05b4\u03e3\u0377\u017f\u0328*\/\n+\n+\t\t\twhile(1){\n+\t\t\t\tscanf(\"%s\",str);\n+\t\t\t\tif(strcmp(str,\"Back\")==0)\n+\t\t\t\t{\t\n+\t\t\t\t\tif(SetConsoleCtrlHandler((PHANDLER_ROUTINE)ConsoleHandler,FALSE) == FALSE)\n+\t\t\t\t\t{\n+\t\t\t\t\t\t\tprintf(\"Unable to uninstall handler!\\n\");\n+\t\t\t\t\t\t\treturn 1;\n+\t\t\t\t\t}\n+\t\t\t\tc=getchar();\n+\t\t\t\t\tbreak;\n+\t\t\t\t\t\n+\t\t\t\t}\n+\t\t\t\tif (WaitForSingleObject(hprocess,500)==WAIT_OBJECT_0)\n+\t\t\t\t{\t\n+\t\t\t\t\tc=getchar();\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t}\n \t\t\tfree(input);\n \t\t\tcontinue;\n \t\t}\n@@ -175,8 +196,29 @@\n \t\tif (strcmp(arg[0], \"fp&\") == 0){\n \t\t\tadd_history(input);\n \t\t\thprocess = fp(arg[1]);\n-\t\t\tif (WaitForSingleObject(hprocess,INFINITE)==WAIT_OBJECT_0)\n-\t\t\t\/*\u05b4\u03e3\u0377\u017f\u0328*\/\n+\t\t\tif(hprocess==NULL){\n+\t\t\tfree(input);\n+\t\t\tcontinue;\n+\t\t\t}\n+\t\twhile(1){\n+\t\t\t\tscanf(\"%s\",str);\n+\t\t\t\tif(strcmp(str,\"Back\")==0)\n+\t\t\t\t{\t\n+\t\t\t\t\tif(SetConsoleCtrlHandler((PHANDLER_ROUTINE)ConsoleHandler,FALSE) == FALSE)\n+\t\t\t\t\t{\n+\t\t\t\t\t\t\tprintf(\"Unable to uninstall handler!\\n\");\n+\t\t\t\t\t\t\treturn 1;\n+\t\t\t\t\t}\n+\t\t\t\tc=getchar();\n+\t\t\t\t\tbreak;\n+\t\t\t\t\t\n+\t\t\t\t}\n+\t\t\t\tif (WaitForSingleObject(hprocess,500)==WAIT_OBJECT_0)\n+\t\t\t\t{\t\n+\t\t\t\t\tc=getchar();\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t}\n \t\t\tfree(input);\n \t\t\tcontinue;\n \t\t}\n@@ -220,7 +262,8 @@\n \t\t\tprintf(\"please type in correct command!\\n\");\n \t\t\tcontinue;\n \t\t}\n-\t}\t\n+\t}\n+\treturn 1;\n }\n \n \/*****************************************************************************\/\n@@ -537,7 +580,7 @@\n \t\t\tprintf(\"Unable to install handler!\\n\");\n \t\t\t\treturn NULL;\n \t} \n-\t\thp = OpenProcess(SYNCHRONIZE, FALSE, id);\n+\t\thp = OpenProcess(PROCESS_ALL_ACCESS, FALSE, id);\n \t\treturn hp;\n \t\n }\n@@ -567,7 +610,7 @@\n \t\t\n \tcase CTRL_C_EVENT: \/*\u03f5\u0373\u00bcctrl+c*\/\t\t\n \t\tbreak;\n-\tcase CTRL_BREAK_EVENT:\t\t\n+\tcase CTRL_BREAK_EVENT:\n \t\tbreak;\n \tcase CTRL_CLOSE_EVENT:\t\t\n \t\tbreak;\n"} {"commit":"cce5638baf1180c4458a12dbb18b9f419a777580","subject":"debug","message":"debug\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compass.c\n+++ compass.c\n@@ -16,7 +16,7 @@\n static const int y_msb_reg = 0x07;\n static const int y_lsb_reg = 0x08;\n static const double pi = 3.14159265;\n-static const double epsilon = 1e-10\n+static const double epsilon = 1e-10;\n \n short read_out(int file,int msb_reg, int lsb_reg)\n {\n"} {"commit":"84cf095bca7aaf4d5808b25e1378aa16cc6e38db","subject":"Added include headers to the stm32f4_discovery so that everything is defined.","message":"Added include headers to the stm32f4_discovery so that everything is defined.\n\nAdded (void)BufferSize to avoid warning about unused variable.\n","repos":"jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles,jedediahfrey\/STM32F4-Discovery_FW_V1.1.0_Makefiles","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Utilities\/STM32F4-Discovery\/stm32f4_discovery.c\n+++ Utilities\/STM32F4-Discovery\/stm32f4_discovery.c\n@@ -44,6 +44,9 @@\n \/* Includes ------------------------------------------------------------------*\/\r\n #include \"stm32f4_discovery.h\"\r\n \r\n+#include \"stm32f4xx_dma.h\"\r\n+#include \"stm32f4xx_exti.h\"\r\n+#include \"stm32f4xx_sdio.h\"\r\n \/** @addtogroup Utilities\r\n * @{\r\n *\/ \r\n@@ -437,6 +440,7 @@\n *\/\r\n void SD_LowLevel_DMA_TxConfig(uint32_t *BufferSRC, uint32_t BufferSize)\r\n {\r\n+ (void)BufferSize;\r\n DMA_InitTypeDef SDDMA_InitStructure;\r\n \r\n DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF);\r\n@@ -479,6 +483,7 @@\n *\/\r\n void SD_LowLevel_DMA_RxConfig(uint32_t *BufferDST, uint32_t BufferSize)\r\n {\r\n+ (void)BufferSize;\r\n DMA_InitTypeDef SDDMA_InitStructure;\r\n \r\n DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF);\r\n"} {"commit":"a37524f45a5925c25891211c7f70b175c5d8dcda","subject":"Add missing cast.","message":"Add missing cast.\n","repos":"zzxuanyuan\/root,zzxuanyuan\/root,mhuwiler\/rootauto,karies\/root,olifre\/root,zzxuanyuan\/root,mhuwiler\/rootauto,karies\/root,zzxuanyuan\/root,root-mirror\/root,mhuwiler\/rootauto,zzxuanyuan\/root,simonpf\/root,simonpf\/root,mhuwiler\/rootauto,simonpf\/root,simonpf\/root,olifre\/root,zzxuanyuan\/root,root-mirror\/root,karies\/root,karies\/root,olifre\/root,olifre\/root,zzxuanyuan\/root,olifre\/root,root-mirror\/root,olifre\/root,karies\/root,mhuwiler\/rootauto,simonpf\/root,root-mirror\/root,root-mirror\/root,mhuwiler\/rootauto,simonpf\/root,mhuwiler\/rootauto,zzxuanyuan\/root,olifre\/root,root-mirror\/root,karies\/root,simonpf\/root,zzxuanyuan\/root,root-mirror\/root,simonpf\/root,karies\/root,simonpf\/root,zzxuanyuan\/root,mhuwiler\/rootauto,olifre\/root,olifre\/root,olifre\/root,root-mirror\/root,karies\/root,olifre\/root,root-mirror\/root,karies\/root,root-mirror\/root,root-mirror\/root,mhuwiler\/rootauto,karies\/root,zzxuanyuan\/root,simonpf\/root,karies\/root,simonpf\/root,mhuwiler\/rootauto,zzxuanyuan\/root,mhuwiler\/rootauto","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tree\/treeplayer\/inc\/TBranchProxy.h\n+++ tree\/treeplayer\/inc\/TBranchProxy.h\n@@ -551,7 +551,7 @@\n const array_t &At(UInt_t i) {\n static array_t default_val;\n \/\/ should add out-of bound test\n- if (array_t *arr = GetAddressOfElement(i))\n+ if (array_t *arr = (array_t*)GetAddressOfElement(i))\n return *arr;\n return default_val;\n }\n"} {"commit":"01505fe726c5b7bebf91a1c61795c3379fbdb8ae","subject":"added read-only method to get d2xyzdzeta2","message":"added read-only method to get d2xyzdzeta2\n\n\ngit-svn-id: e88a1e38e13faf406e05cc89eca8dd613216f6c4@1356 434f946d-2f3d-0410-ba4c-cb9f52fb0dbf\n","repos":"libMesh\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,coreymbryant\/libmesh,BalticPinguin\/libmesh,svallaghe\/libmesh,capitalaslash\/libmesh,capitalaslash\/libmesh,balborian\/libmesh,libMesh\/libmesh,libMesh\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,jwpeterson\/libmesh,friedmud\/libmesh,balborian\/libmesh,giorgiobornia\/libmesh,dmcdougall\/libmesh,cahaynes\/libmesh,aeslaughter\/libmesh,dmcdougall\/libmesh,cahaynes\/libmesh,coreymbryant\/libmesh,pbauman\/libmesh,friedmud\/libmesh,dschwen\/libmesh,benkirk\/libmesh,90jrong\/libmesh,dknez\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,capitalaslash\/libmesh,jwpeterson\/libmesh,svallaghe\/libmesh,vikramvgarg\/libmesh,hrittich\/libmesh,cahaynes\/libmesh,roystgnr\/libmesh,hrittich\/libmesh,jwpeterson\/libmesh,roystgnr\/libmesh,dmcdougall\/libmesh,aeslaughter\/libmesh,giorgiobornia\/libmesh,jwpeterson\/libmesh,dknez\/libmesh,dmcdougall\/libmesh,90jrong\/libmesh,hrittich\/libmesh,dmcdougall\/libmesh,balborian\/libmesh,hrittich\/libmesh,giorgiobornia\/libmesh,giorgiobornia\/libmesh,capitalaslash\/libmesh,balborian\/libmesh,pbauman\/libmesh,vikramvgarg\/libmesh,dknez\/libmesh,jwpeterson\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,roystgnr\/libmesh,benkirk\/libmesh,giorgiobornia\/libmesh,libMesh\/libmesh,dknez\/libmesh,svallaghe\/libmesh,svallaghe\/libmesh,pbauman\/libmesh,friedmud\/libmesh,90jrong\/libmesh,dmcdougall\/libmesh,giorgiobornia\/libmesh,benkirk\/libmesh,cahaynes\/libmesh,roystgnr\/libmesh,friedmud\/libmesh,capitalaslash\/libmesh,90jrong\/libmesh,aeslaughter\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,roystgnr\/libmesh,dschwen\/libmesh,dmcdougall\/libmesh,dschwen\/libmesh,dschwen\/libmesh,libMesh\/libmesh,balborian\/libmesh,svallaghe\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,coreymbryant\/libmesh,vikramvgarg\/libmesh,vikramvgarg\/libmesh,svallaghe\/libmesh,aeslaughter\/libmesh,jwpeterson\/libmesh,hrittich\/libmesh,coreymbryant\/libmesh,giorgiobornia\/libmesh,aeslaughter\/libmesh,balborian\/libmesh,giorgiobornia\/libmesh,hrittich\/libmesh,pbauman\/libmesh,friedmud\/libmesh,balborian\/libmesh,vikramvgarg\/libmesh,aeslaughter\/libmesh,dknez\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,cahaynes\/libmesh,coreymbryant\/libmesh,balborian\/libmesh,pbauman\/libmesh,dschwen\/libmesh,cahaynes\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,friedmud\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,coreymbryant\/libmesh,hrittich\/libmesh,dmcdougall\/libmesh,roystgnr\/libmesh,coreymbryant\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,dknez\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,90jrong\/libmesh,friedmud\/libmesh,libMesh\/libmesh,libMesh\/libmesh,vikramvgarg\/libmesh,aeslaughter\/libmesh,cahaynes\/libmesh,jwpeterson\/libmesh,BalticPinguin\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,svallaghe\/libmesh,BalticPinguin\/libmesh,capitalaslash\/libmesh,90jrong\/libmesh,benkirk\/libmesh,friedmud\/libmesh,BalticPinguin\/libmesh,aeslaughter\/libmesh,jwpeterson\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,90jrong\/libmesh,coreymbryant\/libmesh,dschwen\/libmesh,vikramvgarg\/libmesh,90jrong\/libmesh,benkirk\/libmesh,dknez\/libmesh,balborian\/libmesh,pbauman\/libmesh,dknez\/libmesh,aeslaughter\/libmesh,90jrong\/libmesh,friedmud\/libmesh,cahaynes\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- trunk\/libmesh\/include\/fe\/fe_base.h\n+++ trunk\/libmesh\/include\/fe\/fe_base.h\n@@ -1,4 +1,4 @@\n-\/\/ $Id: fe_base.h,v 1.14 2005-06-29 22:38:12 roystgnr Exp $\n+\/\/ $Id: fe_base.h,v 1.15 2006-03-07 20:43:12 benkirk Exp $\n \n \/\/ The libMesh Finite Element Library.\n \/\/ Copyright (C) 2002-2005 Benjamin S. Kirk, John W. Peterson\n@@ -270,6 +270,13 @@\n *\/\n const std::vector<RealGradient>& get_dxyzdeta() const\n { return dxyzdeta_map; }\n+\n+ \/**\n+ * @returns the element tangents in zeta-direction at the quadrature\n+ * points.\n+ *\/\n+ const std::vector<RealGradient>& get_dxyzdzeta() const\n+ { return dxyzdzeta_map; }\n \n \/**\n * @returns the second partial derivatives in xi.\n@@ -278,17 +285,43 @@\n { return d2xyzdxi2_map; }\n \n \/**\n+ * @returns the second partial derivatives in eta.\n+ *\/\n+ const std::vector<RealGradient>& get_d2xyzdeta2() const\n+ { return d2xyzdeta2_map; }\n+\n+#ifdef ENABLE_SECOND_DERIVATIVES\n+ \n+ \/**\n+ * @returns the second partial derivatives in zeta.\n+ *\/\n+ const std::vector<RealGradient>& get_d2xyzdzeta2() const\n+ { return d2xyzdzeta2_map; }\n+ \n+#endif\n+ \n+ \/**\n * @returns the second partial derivatives in xi-eta.\n *\/\n const std::vector<RealGradient>& get_d2xyzdxideta() const\n { return d2xyzdxideta_map; }\n \n- \/**\n- * @returns the second partial derivatives in eta.\n- *\/\n- const std::vector<RealGradient>& get_d2xyzdeta2() const\n- { return d2xyzdeta2_map; }\n-\n+#ifdef ENABLE_SECOND_DERIVATIVES\n+ \n+ \/**\n+ * @returns the second partial derivatives in xi-zeta.\n+ *\/\n+ const std::vector<RealGradient>& get_d2xyzdxidzeta() const\n+ { return d2xyzdxidzeta_map; }\n+\n+ \/**\n+ * @returns the second partial derivatives in eta-zeta.\n+ *\/\n+ const std::vector<RealGradient>& get_d2xyzdetadzeta() const\n+ { return d2xyzdetadzeta_map; }\n+\n+#endif\n+ \n \/**\n * @returns the dxi\/dx entry in the transformation\n * matrix from physical to local coordinates. \n"} {"commit":"fbf626611ab86ae7936364af2d97d20c36935188","subject":"applying quilt patch: 03_bdb-error.diff","message":"applying quilt patch: 03_bdb-error.diff\n","repos":"community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server,community-ssu\/evolution-data-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- addressbook\/backends\/file\/e-book-backend-file.c\n+++ addressbook\/backends\/file\/e-book-backend-file.c\n@@ -79,6 +79,7 @@\n static struct {\n \tint ref_count;\n \tDB_ENV *env;\n+\tgboolean had_error;\n } global_env;\n \n static EBookBackendSyncStatus\n@@ -209,12 +210,16 @@\n \n \tstring_to_dbt (vcard, &vcard_dbt);\n \n+\tglobal_env.had_error = FALSE;\n \tdb_error = db->put (db, NULL, &id_dbt, &vcard_dbt, 0);\n+\tif (global_env.had_error) db_error = ENOSPC;\n \n \tg_free (vcard);\n \n \tif (0 == db_error) {\n+\t\tglobal_env.had_error = FALSE;\n \t\tdb_error = db->sync (db, 0);\n+\t\tif (global_env.had_error) db_error = ENOSPC;\n \t\tif (db_error != 0) {\n \t\t\tg_warning (\"db->sync failed with %s\", db_strerror (db_error));\n \t\t}\n@@ -333,7 +338,9 @@\n \tstring_to_dbt (dbt_id, &id_dbt);\n \tstring_to_dbt (vcard_with_rev, &vcard_dbt);\n \n+\tglobal_env.had_error = FALSE;\n \tdb_error = db->put (db, NULL, &id_dbt, &vcard_dbt, 0);\n+\tif (global_env.had_error) db_error = ENOSPC;\n \n \tg_free (vcard_with_rev);\n \t\n@@ -361,7 +368,9 @@\n \tstatus = modify_contact (bf, vcard, contact);\n \t\n \tif (status == GNOME_Evolution_Addressbook_Success) {\n+\t\tglobal_env.had_error = FALSE;\n \t\tdb_error = db->sync (db, 0);\n+\t\tif (global_env.had_error) db_error = ENOSPC;\n \t\tif (db_error == 0) {\n \t\t\te_book_backend_summary_remove_contact (bf->priv->summary,\n \t\t\t\t\t\t\t e_contact_get_const (*contact, E_CONTACT_UID));\n@@ -413,7 +422,9 @@\n \t}\n \n \t\/* Sync the database *\/\n+\tglobal_env.had_error = FALSE;\n \tdb_error = db->sync (db, 0);\n+\tif (global_env.had_error) db_error = ENOSPC;\n \tif (db_error != 0) {\n \t\treturn db_error_to_status (db_error);\n \t}\n@@ -1114,6 +1125,7 @@\n #endif\n {\n \tg_warning (\"libdb error: %s\", buf2);\n+\tglobal_env.had_error = TRUE;\n }\n \n \n@@ -1178,6 +1190,7 @@\n \t\t}\n \n \t\tglobal_env.env = env;\n+\t\tglobal_env.had_error = FALSE;\n \t\tglobal_env.ref_count = 1;\n \t}\n \tG_UNLOCK (global_env);\n"} {"commit":"ddc0be58660a396471e1035e2d45d2b4a33ebd9f","subject":"MdeModulePkg\/XhciDxe: Fix ICC compiler build warning.","message":"MdeModulePkg\/XhciDxe: Fix ICC compiler build warning.\n\nSigned-off-by: Feng Tian <feng.tian@intel.com>\n\ngit-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@14976 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- MdeModulePkg\/Bus\/Pci\/XhciDxe\/Xhci.c\n+++ MdeModulePkg\/Bus\/Pci\/XhciDxe\/Xhci.c\n@@ -451,7 +451,7 @@\n \n for (Index = 0; Index < MapSize; Index++) {\n if (XHC_BIT_IS_SET (State, mUsbClearPortChangeMap[Index].HwState)) {\n- XhcClearRootHubPortFeature (This, PortNumber, mUsbClearPortChangeMap[Index].Selector);\n+ XhcClearRootHubPortFeature (This, PortNumber, (EFI_USB_PORT_FEATURE)mUsbClearPortChangeMap[Index].Selector);\n }\n }\n \n"} {"commit":"4f787e71bab80eb51ec32b76bd5755b458b83c11","subject":"Added debuging stuf","message":"Added debuging stuf\n","repos":"epronk\/xtickertape,tphelps\/xtickertape,epronk\/xtickertape,tphelps\/xtickertape,tphelps\/xtickertape","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- acconfig.h\n+++ acconfig.h\n@@ -36,3 +36,8 @@\n \/* package version *\/\n #undef VERSION\n \n+\/* Define if you want lots of debugging information *\/\n+#undef DEBUG\n+\n+\/* Define to enable glyph debugging code *\/\n+#undef DEBUG_GLYPH\n"} {"commit":"529fd352d89587308bf8c2ad2002b71b496121ac","subject":"Last fix :D","message":"Last fix :D\n","repos":"jmolloy\/pedigree,jmolloy\/pedigree,jmolloy\/pedigree,jmolloy\/pedigree,jmolloy\/pedigree,jmolloy\/pedigree,jmolloy\/pedigree","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/subsys\/posix\/glue.c\n+++ src\/subsys\/posix\/glue.c\n@@ -1,4 +1,3 @@\n-733\n \/*\n * Copyright (c) 2008 James Molloy, J\u00f6rg Pf\u00e4hler, Matthew Iselin\n *\n"} {"commit":"8885b9ac520d750292cbc98d54e703604a252ac1","subject":"use get_signatures_list","message":"use get_signatures_list\n","repos":"kenhys\/sylpheed-switch-signature,kenhys\/sylpheed-switch-signature","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/switch_signatures.c\n+++ src\/switch_signatures.c\n@@ -420,6 +420,7 @@\n gint n_accounts;\n gint index;\n PrefsAccount *account;\n+ SwitchSignaturePair *pair;\n \n SYLPF_START_FUNC;\n \n@@ -445,45 +446,17 @@\n }\n }\n \n- n_signatures = SYLPF_GET_RC_INTEGER(SYLPF_OPTION.rcfile,\n- SYLPF_ID, \"signatures\");\n- SYLPF_DEBUG_VAL(\"n_signatures\", n_signatures);\n- \n-#define FETCH_RC_STRING(format, var) \\\n-\n- if (n_signatures > 0) {\n- for (signature_no = 1; signature_no < n_signatures; signature_no++) {\n- key = g_strdup_printf(\"signatures%d\", signature_no);\n- label = SYLPF_GET_RC_STRING(SYLPF_OPTION.rcfile, SYLPF_ID, key);\n- g_free(key);\n-\n- SYLPF_DEBUG_STR(\"label\", label);\n-\n- key = g_strdup_printf(\"%d.txt\", signature_no);\n- path = g_build_path(G_DIR_SEPARATOR_S,\n- get_rc_dir(),\n- \"plugins\",\n- SYLPF_ID,\n- key,\n- NULL);\n- g_free(key);\n- \n- SYLPF_DEBUG_STR(\"signature file\", path);\n-\n- g_file_get_contents(path, &signature, &length, &error);\n- \n- SYLPF_DEBUG_STR(\"signature\", signature);\n-\n- gtk_tree_store_append(store, &iter, NULL);\n- gtk_tree_store_set(store, &iter,\n- SIGNATURE_ACCOUNT_COLUMN, label,\n- SIGNATURE_SUMMARY_COLUMN, signature,\n- -1);\n-\n- g_free(signature);\n- }\n- }\n-#undef FETCH_RC_STRING\n+ account_list = get_signatures_list();\n+ n_signatures = g_list_length(account_list);\n+ for (index = 0; index < n_signatures; index++) {\n+ pair = g_list_nth_data(account_list, index);\n+\n+ gtk_tree_store_append(store, &iter, NULL);\n+ gtk_tree_store_set(store, &iter,\n+ SIGNATURE_ACCOUNT_COLUMN, pair->label,\n+ SIGNATURE_SUMMARY_COLUMN, pair->signature,\n+ -1);\n+ }\n \n tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));\n \n"} {"commit":"6b79c05dc26ebac152b71039ba35e05c6ef8a34d","subject":"Rename setting callbacks to clarify their purpose","message":"Rename setting callbacks to clarify their purpose\n","repos":"FluidSynth\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/synth\/fluid_synth.c\n+++ src\/synth\/fluid_synth.c\n@@ -43,8 +43,6 @@\n int vel);\n static int fluid_synth_noteoff_LOCAL(fluid_synth_t* synth, int chan, int key);\n static int fluid_synth_cc_LOCAL(fluid_synth_t* synth, int channum, int num);\n-static void fluid_synth_update_device_id (void *data, const char *name, int value);\n-static void fluid_synth_update_overflow (void *data, const char *name, double value);\n static int fluid_synth_sysex_midi_tuning (fluid_synth_t *synth, const char *data,\n int len, char *response,\n int *response_len, int avail_response,\n@@ -69,10 +67,7 @@\n unsigned int banknum, unsigned int prognum);\n \n static void fluid_synth_update_presets(fluid_synth_t* synth);\n-static void fluid_synth_update_sample_rate(void *data, const char* name, double value);\n-static void fluid_synth_update_gain(void *data, const char* name, double value);\n static void fluid_synth_update_gain_LOCAL(fluid_synth_t* synth);\n-static void fluid_synth_update_polyphony(void *data, const char* name, int value);\n static int fluid_synth_update_polyphony_LOCAL(fluid_synth_t* synth, int new_polyphony);\n static void init_dither(void);\n static FLUID_INLINE int roundi (float x);\n@@ -103,6 +98,12 @@\n int param, float value, int absolute);\n static void fluid_synth_stop_LOCAL (fluid_synth_t *synth, unsigned int id);\n \n+\/* Callback handlers for real-time settings *\/\n+static void fluid_synth_handle_sample_rate(void *data, const char *name, double value);\n+static void fluid_synth_handle_gain(void *data, const char *name, double value);\n+static void fluid_synth_handle_polyphony(void *data, const char *name, int value);\n+static void fluid_synth_handle_device_id(void *data, const char *name, int value);\n+static void fluid_synth_handle_overflow(void *data, const char *name, double value);\n \n \n \/***************************************************************\n@@ -578,23 +579,23 @@\n \n \/* register the callbacks *\/\n fluid_settings_callback_num(settings, \"synth.sample-rate\",\n-\t\t\t fluid_synth_update_sample_rate, synth);\n+\t\t\t fluid_synth_handle_sample_rate, synth);\n fluid_settings_callback_num(settings, \"synth.gain\",\n-\t\t\t fluid_synth_update_gain, synth);\n+\t\t\t fluid_synth_handle_gain, synth);\n fluid_settings_callback_int(settings, \"synth.polyphony\",\n-\t\t\t fluid_synth_update_polyphony, synth);\n+\t\t\t fluid_synth_handle_polyphony, synth);\n fluid_settings_callback_int(settings, \"synth.device-id\",\n- fluid_synth_update_device_id, synth);\n+ fluid_synth_handle_device_id, synth);\n fluid_settings_callback_num(settings, \"synth.overflow.percussion\",\n- fluid_synth_update_overflow, synth);\n+ fluid_synth_handle_overflow, synth);\n fluid_settings_callback_num(settings, \"synth.overflow.sustained\",\n- fluid_synth_update_overflow, synth);\n+ fluid_synth_handle_overflow, synth);\n fluid_settings_callback_num(settings, \"synth.overflow.released\",\n- fluid_synth_update_overflow, synth);\n+ fluid_synth_handle_overflow, synth);\n fluid_settings_callback_num(settings, \"synth.overflow.age\",\n- fluid_synth_update_overflow, synth);\n+ fluid_synth_handle_overflow, synth);\n fluid_settings_callback_num(settings, \"synth.overflow.volume\",\n- fluid_synth_update_overflow, synth);\n+ fluid_synth_handle_overflow, synth);\n \n \/* do some basic sanity checking on the settings *\/\n \n@@ -728,7 +729,7 @@\n \n fluid_synth_set_sample_rate(synth, synth->sample_rate);\n \n- fluid_synth_update_overflow(synth, \"\", 0.0f);\n+ fluid_synth_handle_overflow(synth, \"\", 0.0f);\n fluid_synth_update_mixer(synth, fluid_rvoice_mixer_set_polyphony, \n \t\t\t synth->polyphony, 0.0f);\n fluid_synth_set_reverb_on(synth, fluid_atomic_int_get(&synth->with_reverb));\n@@ -1327,7 +1328,7 @@\n * Handler for synth.device-id setting.\n *\/\n static void\n-fluid_synth_update_device_id (void *data, const char *name, int value)\n+fluid_synth_handle_device_id (void *data, const char *name, int value)\n {\n fluid_synth_t *synth = (fluid_synth_t *)data;\n fluid_return_if_fail(synth != NULL);\n@@ -2343,7 +2344,7 @@\n \n \/* Handler for synth.sample-rate setting. *\/\n static void\n-fluid_synth_update_sample_rate(void *data, const char* name, double value)\n+fluid_synth_handle_sample_rate(void *data, const char* name, double value)\n {\n fluid_synth_t *synth = (fluid_synth_t *)data;\n fluid_synth_set_sample_rate(synth, (float) value);\n@@ -2379,7 +2380,7 @@\n \n \/* Handler for synth.gain setting. *\/\n static void\n-fluid_synth_update_gain(void *data, const char* name, double value)\n+fluid_synth_handle_gain(void *data, const char* name, double value)\n {\n fluid_synth_t *synth = (fluid_synth_t *)data;\n fluid_synth_set_gain(synth, (float) value);\n@@ -2440,7 +2441,7 @@\n * Handler for synth.polyphony setting.\n *\/\n static void\n-fluid_synth_update_polyphony(void *data, const char* name, int value)\n+fluid_synth_handle_polyphony(void *data, const char* name, int value)\n {\n fluid_synth_t *synth = (fluid_synth_t *)data;\n fluid_synth_set_polyphony(synth, value);\n@@ -3126,7 +3127,10 @@\n }\n \n \n-static void fluid_synth_update_overflow (void *data, const char *name, double value)\n+\/*\n+ * Handler for synth.overflow.* settings.\n+ *\/\n+static void fluid_synth_handle_overflow (void *data, const char *name, double value)\n {\n double d;\n fluid_synth_t *synth = (fluid_synth_t *)data;\n"} {"commit":"b72db48069e91b0fb56aba965ed442731ce39838","subject":"Don't free arguments of char setters","message":"Don't free arguments of char setters\n","repos":"Abestanis\/APython,Abestanis\/APython,Abestanis\/APython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- app\/src\/main\/jni\/Interpreter\/py_compatibility.c\n+++ app\/src\/main\/jni\/Interpreter\/py_compatibility.c\n@@ -131,13 +131,13 @@\n func = dlsym(pythonLib, funcName);\n if (func != NULL) {\n wchar_t* wArg = charToWchar(arg);\n+ free(arg);\n if (wArg == NULL) {\n LOG_ERROR(\"Py_compatibility: Failed to convert argument of function \"\n \"'%s' to wchar_t.\", funcName);\n return;\n }\n func(wArg);\n- free(wArg);\n return;\n }\n }\n"} {"commit":"2cb96b33765ddd7d9bed9aed51ff24d19aaaa200","subject":"- ash is now mountable (again) - ash_fill_super actually READS from the usb drive - module can be inserted\/removed without oopsing YAY!","message":"- ash is now mountable (again)\n- ash_fill_super actually READS from the usb drive\n- module can be inserted\/removed without oopsing\nYAY!\n\n","repos":"sagab\/project-soa,sagab\/project-soa,sagab\/project-soa,sagab\/project-soa,sagab\/project-soa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ash\/super.c\n+++ src\/ash\/super.c\n@@ -13,6 +13,8 @@\n #include <linux\/init.h>\n #include <linux\/fs.h>\n #include <linux\/dcache.h>\n+#include <linux\/buffer_head.h>\n+#include <asm\/string.h>\n \n #define ASH_MAGIC\t0x123456\n #define ASH_BLOCKSIZE\t512\n@@ -40,6 +42,8 @@\n {\n \tstruct inode * root;\n \tstruct dentry * root_dentry;\n+\tstruct buffer_head * bh;\n+\tchar test[10];\n \n \t\/\/ init the superblock fields\n \tsb->s_magic = ASH_MAGIC;\n@@ -47,11 +51,16 @@\n \tsb->s_blocksize_bits = ASH_BSIZE_BITS;\n \tsb->s_op = &ash_super_operations;\n \n-\t\/\/ must also provide a root dentry for filesystem\n+\tprintk(\"phase 1 mounted \\n\");\n+\t\n+\tbh = sb_bread(sb, 0);\n+\tmemcpy(test, bh->b_data, 9);\n+\ttest[9]='\\0';\n+\n+\t\/\/ create the root inode\n \troot = ash_make_inode(sb, S_IFDIR | 0755);\n \tif (! root)\n \t\treturn -ENOMEM;\n-\n \troot->i_op = &simple_dir_inode_operations;\n \troot->i_fop = &simple_dir_operations;\n \n@@ -60,11 +69,12 @@\n \t\tiput(root);\n \t\treturn -ENOMEM;\n \t}\n-\n+\t\n \tsb->s_root = root_dentry;\n \n-\t\/\/ test file structure\n-\tash_create_testfile(sb, root_dentry);\n+\tprintk(\"all done: '%s'\", test);\n+\n+\tbrelse(bh);\n \n \treturn 0;\n }\n@@ -73,19 +83,19 @@\n \t\tint flags, const char *dev_name,\n \t\tvoid *data, struct vfsmount *mnt)\n {\n-\treturn get_sb_single(fs, flags, data, ash_fill_super, mnt);\n+\treturn get_sb_bdev(fs, flags, dev_name, data, ash_fill_super, mnt);\n }\n \n \n static void ash_kill_sb(struct super_block *sb)\n {\n-\tkill_litter_super(sb);\n+\tkill_block_super(sb);\n }\n \n \n static struct file_system_type ash_fs_type = {\n-\t.owner\t\t= THIS_MODULE,\n-\t.name \t\t= \"ash\",\n+\t.owner\t= THIS_MODULE,\n+\t.name \t= \"ash\",\n \t.get_sb \t= ash_get_sb,\n \t.kill_sb\t= ash_kill_sb,\n };\n"} {"commit":"2546977b5dab6096c6bd831a3fa07bf4d199d7e3","subject":"353902: klocwork bugs in stanpcertdb.c. r=nelson","message":"353902: klocwork bugs in stanpcertdb.c. r=nelson\n","repos":"nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/certdb\/stanpcertdb.c\n+++ security\/nss\/lib\/certdb\/stanpcertdb.c\n@@ -92,6 +92,11 @@\n NSSTrustDomain *td = STAN_GetDefaultTrustDomain();\n NSSCertificate *c = STAN_GetNSSCertificate(cert);\n \n+ if (c == NULL) {\n+ \/* error code is set *\/\n+ return SECFailure;\n+ }\n+\n \/* get rid of the token instances *\/\n nssrv = NSSCertificate_DeleteStoredObject(c, NULL);\n \n@@ -157,6 +162,11 @@\n NSSCertificate *c = STAN_GetNSSCertificate(cert);\n nssCertificateStoreTrace lockTrace = {NULL, NULL, PR_FALSE, PR_FALSE};\n nssCertificateStoreTrace unlockTrace = {NULL, NULL, PR_FALSE, PR_FALSE};\n+\n+ if (c == NULL) {\n+ \/* error code is set *\/\n+ return SECFailure;\n+ }\n \n context = c->object.cryptoContext;\n if (!context) {\n"} {"commit":"c875ac268c9820804b0b90ad991c8e810aa00ffe","subject":"removed '\\n' from LogDebug stmt","message":"removed '\\n' from LogDebug stmt\n","repos":"Distrotech\/trousers,emilcondrea\/trousers,emilcondrea\/trousers,emilcondrea\/trousers,Distrotech\/trousers,Distrotech\/trousers","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tcsd_api\/clntside.c\n+++ src\/tcsd_api\/clntside.c\n@@ -84,7 +84,7 @@\n \t\tmemcpy(&addr.sin_addr, hEnt->h_addr_list[0], 4);\n \t}\n \n-\tLogDebug(\"Resolved Address is %s\\n\", inet_ntoa(addr.sin_addr));\n+\tLogDebug(\"Resolved Address is %s\", inet_ntoa(addr.sin_addr));\n \n \tLogDebug1(\"Connecting\");\n \tif (connect(sd, (struct sockaddr *) &addr, sizeof (addr))) {\n"} {"commit":"c3dfc9b69c1e7269f4c5501ee5995fe6dcd965e0","subject":"ecore_x_.*_ungrab -> e_grabinput_release","message":"ecore_x_.*_ungrab -> e_grabinput_release\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_dnd.c\n+++ src\/bin\/e_dnd.c\n@@ -553,8 +553,7 @@\n \n _e_drag_hide(_drag_current);\n \n- ecore_x_pointer_ungrab();\n- ecore_x_keyboard_ungrab();\n+ e_grabinput_release(_drag_win, _drag_win);\n if (_drag_current->type == E_DRAG_XDND)\n {\n \te_object_del(E_OBJECT(_drag_current));\n"} {"commit":"bfecf0fc8170313aa7f32ecdef1adee5845c8fde","subject":"","message":"\n\nand disable that code too as we wont be using it later. just for reference now\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_ipc.c\n+++ src\/bin\/e_ipc.c\n@@ -4,12 +4,6 @@\n static int _e_ipc_cb_client_add(void *data, int type, void *event);\n static int _e_ipc_cb_client_del(void *data, int type, void *event);\n static int _e_ipc_cb_client_data(void *data, int type, void *event);\n-static void _e_ipc_reply_double_send(Ecore_Ipc_Client *client, double val, int opcode);\n-static void _e_ipc_reply_int_send(Ecore_Ipc_Client *client, int val, int opcode);\n-static void _e_ipc_reply_2int_send(Ecore_Ipc_Client *client, int val1, int val2, int opcode);\n-\n-static int _e_ipc_double_dec(char *data, int bytes, double *dest);\n-static int _e_ipc_int_dec(char *data, int bytes, int *dest);\n \n \/* local subsystem globals *\/\n static Ecore_Ipc_Server *_e_ipc_server = NULL;\n@@ -1119,6 +1113,7 @@\n return 1;\n } \n \n+#if 0\n static void\n _e_ipc_reply_double_send(Ecore_Ipc_Client *client, double val, int opcode)\n {\n@@ -1169,3 +1164,4 @@\n \tfree(data);\n }\n }\n+#endif\n"} {"commit":"c267535bfaa2255141687c72a3e413a87ac008e4","subject":"unalias internal wl client pixmaps in elm win hide trap callback","message":"unalias internal wl client pixmaps in elm win hide trap callback\n\nthis seems to be the best place to remove the alias since it is initially\nadded in the corresponding show callback\n","repos":"tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_win.c\n+++ src\/bin\/e_win.c\n@@ -51,6 +51,10 @@\n if (!ctx->visible) return EINA_FALSE;\n if (strncmp(ecore_evas_engine_name_get(e_win_ee_get(o)), \"wayland\", 7))\n E_FREE_FUNC(ctx->pointer, e_object_del);\n+#ifdef HAVE_WAYLAND\n+ else if (ctx->client)\n+ e_pixmap_alias(NULL, E_PIXMAP_TYPE_WL, ecore_wl2_window_surface_id_get(elm_win_wl_window_get(o)));\n+#endif\n \n if (!ctx->client) return EINA_TRUE;\n ctx->visible = 0;\n"} {"commit":"5277fdc91106a9c9b4338554035ae6b1e8ca1cbd","subject":"If we want to center a e_win, and it has a border, move it.","message":"If we want to center a e_win, and it has a border, move it.\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@16427 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_win.c\n+++ src\/bin\/e_win.c\n@@ -328,6 +328,13 @@\n \twin->state.centered = 1;\n \t_e_win_state_update(win);\n }\n+ if (win->border)\n+ {\n+\t\/* The window is visible, move it to the right spot *\/\n+\te_border_move(win->border,\n+\t\t win->border->zone->x + (win->border->zone->w - win->border->w) \/ 2,\n+\t\t win->border->zone->y + (win->border->zone->h - win->border->h) \/ 2);\n+ }\n }\n \n \/* local subsystem functions *\/\n"} {"commit":"80c4592719aa7ab77976d8116e029f0752e58523","subject":"Not checked push","message":"Not checked push\n","repos":"aharone\/edje_pick,aharone\/edje_pick","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/gpick.c\n+++ src\/bin\/gpick.c\n@@ -35,7 +35,8 @@\n EDJE_PICK_TYPE_GROUP, \/* Node contains a group name *\/\n EDJE_PICK_TYPE_IMAGE, \/* Node contains a image name *\/\n EDJE_PICK_TYPE_SAMPLE, \/* Node contains a sound-sample name *\/\n- EDJE_PICK_TYPE_FONT \/* Node contains a font name *\/\n+ EDJE_PICK_TYPE_FONT, \/* Node contains a font name *\/\n+ EDJE_PICK_TYPE_LAST \/* UNUSED, Marking Last *\/\n };\n typedef enum _Edje_Pick_Type Edje_Pick_Type;\n \n@@ -2935,43 +2936,33 @@\n \/* END - Drag And Drop Support *\/\n \n static int\n-_g_selected_types_count(Evas_Object *gl,\n- int *groups, int *images, int *samples, int *fonts)\n+_g_selected_types_count(Evas_Object *gl, int *types)\n { \/* Returns number of items selected for each type *\/\n- Eina_List *s = NULL;\n Eina_List *l;\n- gl_item_info *info;\n Elm_Object_Item *it;\n-\n- *groups = *images = *samples = *fonts = 0;\n+ int i;\n+ int n = 0;\n+\n+ memset(types, 0, sizeof(int) * EDJE_PICK_TYPE_LAST);\n const Eina_List *slct = elm_genlist_selected_items_get(gl);\n EINA_LIST_FOREACH((Eina_List *) slct, l, it)\n- { \/* Build a list of all selected-items infos *\/\n- s = eina_list_append(s, elm_object_item_data_get(it));\n- }\n-\n- EINA_LIST_FOREACH(s, l, info)\n- {\n- switch (info->type)\n+ {\n+ gl_item_info *info = elm_object_item_data_get(it);\n+ Edje_Pick_Type type = info->type;\n+ switch (type)\n {\n case EDJE_PICK_TYPE_LIST:\n if (strcmp(info->name, EDJE_PICK_GROUPS_STR))\n break;\n \n+ \/* Count Groups-List as a group, drop all others *\/\n+ type = EDJE_PICK_TYPE_GROUP;\n+\n case EDJE_PICK_TYPE_GROUP:\n- (*groups)++; \/* Also counting group-list as group *\/\n- break;\n-\n case EDJE_PICK_TYPE_IMAGE:\n- (*images)++;\n- break;\n-\n case EDJE_PICK_TYPE_SAMPLE:\n- (*samples)++;\n- break;\n-\n case EDJE_PICK_TYPE_FONT:\n- (*fonts)++;\n+ types[type]++;\n break;\n \n default:\n@@ -2979,9 +2970,57 @@\n }\n }\n \n- eina_list_free(s);\n-printf(\"<%s> (groups,images,samples,fonts)=(%d,%d,%d,%d)\\n\",__func__,*groups,*images,*samples,*fonts);\n- return ((*groups) + (*images) + (*samples) + (*fonts));\n+ printf(\"<%s> (groups,images,samples,fonts)=(%d,%d,%d,%d)\\n\",__func__, types[EDJE_PICK_TYPE_GROUP],types[EDJE_PICK_TYPE_IMAGE],types[EDJE_PICK_TYPE_SAMPLE],types[EDJE_PICK_TYPE_FONT]);\n+\n+ \/* Count how many different types were involved *\/\n+ for (i = EDJE_PICK_TYPE_GROUP; i < EDJE_PICK_TYPE_LAST; i++)\n+ if (types[i]) n++;\n+\n+ return n;\n+}\n+\n+static void\n+_gui_keys_reset(void *data,\n+ Evas_Object *obj,\n+ void *event_info)\n+{\n+ gui_elements *g = data;\n+ gl_item_info *info = elm_object_item_data_get(event_info);\n+ int src_types[EDJE_PICK_TYPE_LAST];\n+ int dst_types[EDJE_PICK_TYPE_LAST];\n+ int i;\n+ int n_src =_g_selected_types_count(g->gl_src, src_types);\n+ int n_dst = _g_selected_types_count(g->gl_dst,dst_types);\n+ Eina_Bool take_bt_disable = EINA_FALSE;\n+ Eina_Bool remove_bt_disable = EINA_FALSE;\n+\n+ \/* Same values should be 'turned on' in both arrays *\/\n+ Eina_Bool xval = EINA_FALSE;\n+ for (i = EDJE_PICK_TYPE_GROUP; i < EDJE_PICK_TYPE_LAST; i++)\n+ xval |= (src_types[i]) ^ (dst_types[i]);\n+\n+ if (n_src == 1)\n+ {\n+ if (src_types[EDJE_PICK_TYPE_GROUP] == 0)\n+ {\n+ take_bt_disable = (n_dst > 1) | xval;\n+ }\n+ }\n+ else\n+ take_bt_disable = EINA_TRUE;\n+\n+ if (n_dst == 1)\n+ {\n+ if (dst_types[EDJE_PICK_TYPE_GROUP] == 0)\n+ {\n+ remove_bt_disable = (n_src > 1) | xval;\n+ }\n+ }\n+ else\n+ remove_bt_disable = EINA_TRUE;\n+\n+ elm_object_item_disabled_set(g->actions.take_bt, take_bt_disable);\n+ elm_object_item_disabled_set(g->actions.remove_bt, remove_bt_disable);\n }\n \n static void\n@@ -2991,59 +3030,8 @@\n {\n gui_elements *g = data;\n gl_item_info *info = elm_object_item_data_get(event_info);\n- int src_groups, src_images, src_samples, src_fonts;\n- int dst_groups, dst_images, dst_samples, dst_fonts;\n- Eina_Bool en_take_bt = EINA_FALSE;\n- Eina_Bool en_remove_bt = EINA_FALSE;\n- int n_src =_g_selected_types_count(g->gl_src,\n- &src_groups, &src_images, &src_samples, &src_fonts);\n- int n_dst = _g_selected_types_count(g->gl_dst,\n- &dst_groups, &dst_images, &dst_samples, &dst_fonts);\n-\n printf(\"<%s> gl=<%p> selected <%s>\\n\", __func__, obj, info->name);\n- if (obj == g->gl_src)\n- {\n- if (!n_src)\n- en_take_bt = EINA_TRUE;\n-\n- if (src_groups)\n- {\n- if ((src_images + src_samples + src_fonts) != 0)\n- en_take_bt = EINA_TRUE;\n- }\n- else\n- {\n- if ((src_images + src_samples + src_fonts) > 1)\n- en_take_bt = EINA_TRUE;\n-\n- if (src_images && (dst_images == 0))\n- en_take_bt = EINA_TRUE;\n-\n- if (src_samples && (dst_samples == 0))\n- en_take_bt = EINA_TRUE;\n-\n- if (src_fonts && (dst_fonts == 0))\n- en_take_bt = EINA_TRUE;\n- }\n-\n- elm_object_item_disabled_set(g->actions.take_bt,\n- en_take_bt);\n- }\n-\n- if (obj == g->gl_dst)\n- {\n- if (!n_dst)\n- en_remove_bt = EINA_TRUE;\n-\n- if (dst_groups)\n- {\n- if ((dst_images + dst_samples + dst_fonts) != 0)\n- en_remove_bt = EINA_TRUE;\n- }\n-\n- elm_object_item_disabled_set(g->actions.remove_bt,\n- en_remove_bt);\n- }\n+ _gui_keys_reset(data, obj, event_info);\n }\n \n static void\n@@ -3053,53 +3041,8 @@\n {\n gui_elements *g = data;\n gl_item_info *info = elm_object_item_data_get(event_info);\n- int src_groups, src_images, src_samples, src_fonts;\n- int dst_groups, dst_images, dst_samples, dst_fonts;\n- Eina_Bool en_take_bt = EINA_FALSE;\n- Eina_Bool en_remove_bt = EINA_FALSE;\n- int n_dst = _g_selected_types_count(g->gl_dst,\n- &dst_groups, &dst_images, &dst_samples, &dst_fonts);\n-\n- printf(\"<%s> gl=<%p> unselected <%s>\\n\", __func__, obj, info->name);\n-\n- if (!_g_selected_types_count(g->gl_src,\n- &src_groups, &src_images, &src_samples, &src_fonts))\n- en_take_bt = EINA_TRUE;\n-\n- if ((src_groups + src_images + src_samples + src_fonts) == 0)\n- en_take_bt = EINA_TRUE;\n-\n- if (src_groups)\n- {\n- if ((src_images + src_samples + src_fonts) != 0)\n- en_take_bt = EINA_TRUE;\n- }\n- else\n- {\n- if ((src_images + src_samples + src_fonts) > 1)\n- en_take_bt = EINA_TRUE;\n-\n- if (src_images && (dst_images == 0))\n- en_take_bt = EINA_TRUE;\n-\n- if (src_samples && (dst_samples == 0))\n- en_take_bt = EINA_TRUE;\n-\n- if (src_fonts && (dst_fonts == 0))\n- en_take_bt = EINA_TRUE;\n- }\n-\n- elm_object_item_disabled_set(g->actions.take_bt,\n- en_take_bt);\n-\n- if (!n_dst)\n- en_remove_bt = EINA_TRUE;\n-\n- if ((!dst_groups) || (dst_images + dst_samples + dst_fonts) != 0)\n- en_remove_bt = EINA_TRUE;\n-\n- elm_object_item_disabled_set(g->actions.remove_bt,\n- en_remove_bt);\n+ printf(\"<%s> gl=<%p> selected <%s>\\n\", __func__, obj, info->name);\n+ _gui_keys_reset(data, obj, event_info);\n }\n \n static void\n"} {"commit":"94ac88ea83c4921e7a1b8d4832fa7d0c8f9bcbc6","subject":"removed dead typedef","message":"removed dead typedef\n\ngit-svn-id: 40192aece4a9e6664bc9a93aa558322db432a344@509 15ae5fad-cc11-0410-8fac-bce609e504b0\n","repos":"OlafRadicke\/cxxtools,OlafRadicke\/cxxtools,maekitalo\/cxxtools,maekitalo\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cxxtools\/include\/cxxtools\/convert.h\n+++ cxxtools\/include\/cxxtools\/convert.h\n@@ -76,8 +76,6 @@\n template<typename T>\n struct Convert\n {\n- typedef T result_type;\n-\n template <typename S>\n T operator()(const S& from) const\n {\n@@ -136,8 +134,6 @@\n : _loc(loc)\n { }\n \n- typedef T result_type;\n-\n template <typename S>\n T operator()(const S& from) const\n {\n"} {"commit":"ab9fb0541df1d3455060a24c3093f463a752951e","subject":"missing optional include (#23749)","message":"missing optional include (#23749)\n\n","repos":"commaai\/openpilot,commaai\/openpilot,commaai\/openpilot,commaai\/openpilot,commaai\/openpilot,commaai\/openpilot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- selfdrive\/ui\/qt\/offroad\/wifiManager.h\n+++ selfdrive\/ui\/qt\/offroad\/wifiManager.h\n@@ -1,5 +1,6 @@\n #pragma once\n \n+#include <optional>\n #include <QtDBus>\n #include <QTimer>\n \n"} {"commit":"15122b281e24785b0f2a74bc1667915253a1db7f","subject":"CDRIVER-1947 generate int64 as $numberLong","message":"CDRIVER-1947 generate int64 as $numberLong\n\nFixes CDRIVER-1938, there is now a lossless format for int64.\n","repos":"ajdavis\/libbson,rcsanchez97\/libbson,rcsanchez97\/libbson,ajdavis\/libbson,bjori\/libbson,bjori\/libbson,mongodb\/libbson,mapr\/libbson,mapr\/libbson,mongodb\/libbson,bjori\/libbson,ajdavis\/libbson,mapr\/libbson,rcsanchez97\/libbson,mongodb\/libbson","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bson\/bson.c\n+++ src\/bson\/bson.c\n@@ -2487,6 +2487,21 @@\n \n \n static bool\n+_bson_as_extended_json_visit_int64 (const bson_iter_t *iter,\n+ const char *key,\n+ int64_t v_int64,\n+ void *data)\n+{\n+ bson_json_state_t *state = data;\n+\n+ bson_string_append_printf (\n+ state->str, \"{ \\\"$numberLong\\\" : \\\"%\" PRId64 \"\\\"}\", v_int64);\n+\n+ return false;\n+}\n+\n+\n+static bool\n _bson_as_json_visit_int64 (const bson_iter_t *iter,\n const char *key,\n int64_t v_int64,\n@@ -2924,7 +2939,7 @@\n _bson_as_extended_json_visit_codewscope,\n _bson_as_extended_json_visit_int32,\n _bson_as_json_visit_timestamp,\n- _bson_as_json_visit_int64,\n+ _bson_as_extended_json_visit_int64,\n _bson_as_json_visit_maxkey,\n _bson_as_json_visit_minkey,\n NULL, \/* visit_unsupported_type *\/\n"} {"commit":"b3dec3df4038cf76821f43717673456c7f691030","subject":"Avoid redundant rollbacks","message":"Avoid redundant rollbacks\n","repos":"urweb\/debian-urweb,urweb\/debian-urweb,urweb\/debian-urweb,urweb\/debian-urweb,urweb\/debian-urweb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/c\/request.c\n+++ src\/c\/request.c\n@@ -503,6 +503,8 @@\n uw_write(ctx, uw_error_message(ctx));\n uw_write(ctx, \"\\n<\/body><\/html>\");\n \n+ try_rollback(ctx, 0, logger_data, log_error);\n+\n return FAILED;\n }\n } else\n@@ -514,8 +516,6 @@\n }\n else {\n log_error(logger_data, \"Fatal error (out of retries): %s\\n\", uw_error_message(ctx));\n-\n- try_rollback(ctx, 0, logger_data, log_error);\n \n if (!had_error && uw_get_app(ctx)->on_error) {\n had_error = 1;\n@@ -528,6 +528,8 @@\n uw_write(ctx, uw_error_message(ctx));\n uw_write(ctx, \"\\n\");\n \n+ try_rollback(ctx, 0, logger_data, log_error);\n+\n return FAILED;\n }\n }\n@@ -535,8 +537,6 @@\n log_debug(logger_data, \"Error triggers unlimited retry: %s\\n\", uw_error_message(ctx));\n else if (fk == FATAL) {\n log_error(logger_data, \"Fatal error: %s\\n\", uw_error_message(ctx));\n-\n- try_rollback(ctx, 0, logger_data, log_error);\n \n if (uw_get_app(ctx)->on_error && !had_error) {\n had_error = 1;\n@@ -550,12 +550,12 @@\n uw_write(ctx, uw_error_message(ctx));\n uw_write(ctx, \"\\n<\/body><\/html>\");\n \n+ try_rollback(ctx, 0, logger_data, log_error);\n+\n return FAILED;\n }\n } else {\n log_error(logger_data, \"Unknown uw_handle return code!\\n\");\n-\n- try_rollback(ctx, 0, logger_data, log_error);\n \n if (uw_get_app(ctx)->on_error && !had_error) {\n had_error = 1;\n@@ -566,6 +566,8 @@\n uw_write_header(ctx, \"Content-type: text\/plain\\r\\n\");\n uw_write(ctx, \"Unknown uw_handle return code!\\n\");\n \n+ try_rollback(ctx, 0, logger_data, log_error);\n+\n return FAILED;\n }\n }\n"} {"commit":"2dab2d273b8cb088ddc671da0a10ec4eced5c212","subject":"removed unnecessary calls","message":"removed unnecessary calls\n","repos":"ellert\/canl-c,ellert\/canl-c,CESNET\/canl-c,CESNET\/canl-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/canl_cred.h\n+++ src\/canl_cred.h\n@@ -80,16 +80,10 @@\n \/* Routines to handle X.509 requests *\/\n \n canl_err_code CANL_CALLCONV\n-canl_req_create(canl_ctx, canl_x509_req *);\n-\n-canl_err_code CANL_CALLCONV\n-canl_req_create_req(canl_ctx, canl_x509_req *, X509_REQ *);\n+canl_req_create(canl_ctx, canl_x509_req *, unsigned int);\n \n canl_err_code CANL_CALLCONV\n canl_req_free(canl_ctx, canl_x509_req);\n-\n-canl_err_code CANL_CALLCONV\n-canl_req_gen_key(canl_ctx, canl_x509_req, unsigned int);\n \n canl_err_code CANL_CALLCONV\n canl_req_get_req(canl_ctx, canl_x509_req, X509_REQ **);\n"} {"commit":"7131f1259ce2cabe93c38b37a6b9baf9b37e79e2","subject":"define a per-connection context for the particular authN mechs","message":"define a per-connection context for the particular authN mechs\n","repos":"ellert\/canl-c,CESNET\/canl-c,CESNET\/canl-c,ellert\/canl-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/canl_locl.h\n+++ src\/canl_locl.h\n@@ -90,35 +90,39 @@\n int sock;\n ossl_ctx *s_ctx;\n principal_int *princ_int;\n+ struct authn_mech {\n+\tCANL_AUTH_MECHANISM type;\n+\tvoid *ctx;\n+ } authn_mech;\n } io_handler;\n \n typedef struct canl_mech {\n CANL_AUTH_MECHANISM mech;\n- void *context;\n+ void *global_context;\n \n canl_err_code (*initialize)\n- (void);\n+ (void **);\n \n canl_err_code (*client_init)\n- (glb_ctx *);\n+ (glb_ctx *, void *);\n \n canl_err_code (*server_init)\n- (glb_ctx *);\n+ (glb_ctx *, void *);\n \n canl_err_code (*connect)\n- (glb_ctx *, io_handler *, struct timeval *, const char *);\n+ (glb_ctx *, void *, io_handler *, struct timeval *, const char *);\n \n canl_err_code (*accept)\n- (glb_ctx *, io_handler *, struct timeval *);\n+ (glb_ctx *, void *, io_handler *, struct timeval *);\n \n canl_err_code (*close)\n- (glb_ctx *, io_handler *);\n+ (glb_ctx *, void *, io_handler *);\n \n canl_err_code (*read)\n- (glb_ctx *, io_handler *, void *, size_t, struct timeval *);\n+ (glb_ctx *, void *, io_handler *, void *, size_t, struct timeval *);\n \n canl_err_code (*write)\n- (glb_ctx *, io_handler *, void *, size_t, struct timeval *);\n+ (glb_ctx *, void *, io_handler *, void *, size_t, struct timeval *);\n } canl_mech;\n \n extern struct canl_mech canl_mech_ssl;\n"} {"commit":"7b2cc7713db02cf13625e603769858a54b883d4c","subject":"structure for peer's identity information (not credentials) added","message":"structure for peer's identity information (not credentials) added\n","repos":"CESNET\/canl-c,ellert\/canl-c,ellert\/canl-c,CESNET\/canl-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/canl_locl.h\n+++ src\/canl_locl.h\n@@ -47,6 +47,11 @@\n netdb_error,\n } CANL_ERROR_ORIGIN;\n \n+typedef enum _CANL_AUTH_MECHANISM\n+{\n+ x509 = 0,\n+ kerberos = 1, \/* and others may be added*\/\n+} CANL_AUTH_MECHANISM;\n \n typedef struct _cert_key_store {\n X509 *cert;\n@@ -55,7 +60,6 @@\n \n typedef struct _glb_ctx\n {\n- int opened_ios;\n char * err_msg;\n unsigned long err_code;\n CANL_ERROR_ORIGIN err_orig;\n@@ -73,10 +77,17 @@\n int err;\n } asyn_result;\n \n+typedef struct _principal_int {\n+ char *name;\n+ CANL_AUTH_MECHANISM mech_oid;\n+ char *raw; \/* e.g. the PEM encoded cert\/chain *\/\n+} principal_int;\n+\n typedef struct _io_handler\n {\n int sock;\n- ossl_ctx * s_ctx;\n+ ossl_ctx *s_ctx;\n+ principal_int *princ_int;\n } io_handler;\n \n void reset_error (glb_ctx *cc, unsigned long err_code);\n"} {"commit":"9a210cd792ebe848f20dd09486e105dc40bc4e3a","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"xmirror\/m17n-lib,xmirror\/m17n-lib,xmirror\/m17n-lib,xmirror\/m17n-lib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/character.c\n+++ src\/character.c\n@@ -228,7 +228,7 @@\n names listed as abbreviations for <em>General Category<\/em> in\n Unicode. *\/\n \n-\/***oldja\n+\/***ja\n @brief \u0325\u01a5\u027d\uf939.\n \n \u0725 #Mcategory <tt>\"category\"<\/tt> \u0224\u033e\u02b8\n"} {"commit":"4248eb198327dec36628c2ce519e3a9bfd0df25c","subject":"\u958b\u767a\u7528\u306b\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3092\u5909\u66f4","message":"\u958b\u767a\u7528\u306b\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3092\u5909\u66f4\n","repos":"MetalPhaeton\/sayuri,MetalPhaeton\/sayuri,MetalPhaeton\/sayuri,MetalPhaeton\/sayuri","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/chess_def.h\n+++ src\/chess_def.h\n@@ -42,7 +42,7 @@\n \/\/ \u30a8\u30f3\u30b8\u30f3\u60c5\u5831 \/\/\n \/\/ ============ \/\/\n \/** Sayuri\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3002 *\/\n- constexpr const char* ID_NAME = \"Sayuri 2015.01.29\";\n+ constexpr const char* ID_NAME = \"Sayuri 2015.01.29 devel\";\n \/** Sayuri\u306e\u4f5c\u8005\u540d\u3002 *\/\n constexpr const char* ID_AUTHOR = \"Hironori Ishibashi\";\n \n"} {"commit":"cf55479c80e1e0ec94c5f5dd742c6318f8d8eec2","subject":"\u958b\u767a\u7528\u306b\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3092\u5909\u66f4","message":"\u958b\u767a\u7528\u306b\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3092\u5909\u66f4\n","repos":"MetalPhaeton\/sayuri,MetalPhaeton\/sayuri,MetalPhaeton\/sayuri,MetalPhaeton\/sayuri","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/chess_def.h\n+++ src\/chess_def.h\n@@ -42,7 +42,7 @@\n \/\/ \u30a8\u30f3\u30b8\u30f3\u60c5\u5831 \/\/\n \/\/ ============ \/\/\n \/** Sayuri\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3002 *\/\n- constexpr const char* ID_NAME = \"Sayuri 2015.07.09\";\n+ constexpr const char* ID_NAME = \"Sayuri 2015.07.09 devel\";\n \/** Sayuri\u306e\u4f5c\u8005\u540d\u3002 *\/\n constexpr const char* ID_AUTHOR = \"Hironori Ishibashi\";\n \n"} {"commit":"48947b2f9410286a18fae51c50a3d0ffdd1e8a15","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\ngit-svn-id: 941c396c0c997e7bb438e0bf88317cdf88a3ff60@354 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/chxj_hdml.c\n+++ src\/chxj_hdml.c\n@@ -511,6 +511,7 @@\n }\n }\n hdml->out[hdml->out_len] = 0;\n+\n return hdml->out;\n }\n \n"} {"commit":"8f8f9a78ba97705efa1488c4565043fe96df31bf","subject":"Response: check if the headers were already sent","message":"Response: check if the headers were already sent\n\nSigned-off-by: Eduardo Silva <b6525c140147034c280e3cd2f39161f32f3f4f62@gmail.com>\n","repos":"monkey\/duda,monkey\/duda","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/duda_response.c\n+++ src\/duda_response.c\n@@ -287,9 +287,12 @@\n }\n \n dr->end_callback = end_cb;\n- duda_response_send_headers(dr);\n+ ret = duda_response_send_headers(dr);\n+ if (ret == -1) {\n+ return -1;\n+ }\n+\n ret = duda_queue_flush(dr);\n-\n if (ret == 0) {\n duda_service_end(dr);\n }\n"} {"commit":"45be04f708ed833b07d479250fea5de5e6ed6863","subject":" * Writing is changed.","message":" * Writing is changed.\n\n\ngit-svn-id: 29285e03eadf944384989fddbe8eccac9818e9d7@1070 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"unpush\/mod_chxj,unpush\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/chxj_hdml.c\n+++ src\/chxj_hdml.c\n@@ -2704,9 +2704,8 @@\n hdml->postdata[hdml->pure_form_cnt],\n qs_trim_string(r, s),\n NULL);\n- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, \n- \"POSTDATA:[%s]\", \n- hdml->postdata[hdml->pure_form_cnt] );\n+\n+ DBG1(r, \"POSTDATA:[%s]\", hdml->postdata[hdml->pure_form_cnt] );\n }\n \n \/**\n"} {"commit":"e75af25fdab9a52e2059d7c950567e7ddbd09022","subject":"make file_read callable outside compilation unit","message":"make file_read callable outside compilation unit\n\nMake file_read usable from other compilation units allowing reuse\nof code when splitting functionality to multiple files.\n\nSigned-off-by: Joonas Lahtinen <a11ca63949063c01fa551bf27c25e0fe898387c4@linux.intel.com>\nReviewed-by: Darren Hart <38f9eaa30910c40b06f5a60020b1222f2a953801@linux.intel.com>\nReviewed-by: Mikko Ylinen <abf10a3f4012ad01778af181914ce7d6fddc40b3@intel.com>\n","repos":"miguelinux\/gummiboot2systemd-boot,todorez\/gummiboot-multiboot2,todorez\/tummiboot,trilean\/gummiboot,todorez\/gummiboot-multiboot2,liliang365\/my_gummiboot,liliang365\/my_gummiboot,aaronp24\/gummiboot,FrozenCow\/gummiboot,aaronp24\/gummiboot,FrozenCow\/gummiboot,trilean\/gummiboot,freedesktop-unofficial-mirror\/gummiboot,freedesktop-unofficial-mirror\/gummiboot,todorez\/tummiboot,miguelinux\/gummiboot2systemd-boot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/efi\/gummiboot.c\n+++ src\/efi\/gummiboot.c\n@@ -1595,7 +1595,7 @@\n config_add_entry(config, entry);\n }\n \n-static UINTN file_read(EFI_FILE_HANDLE dir, CHAR16 *name, CHAR8 **content) {\n+UINTN file_read(EFI_FILE_HANDLE dir, CHAR16 *name, CHAR8 **content) {\n EFI_FILE_HANDLE handle;\n EFI_FILE_INFO *info;\n CHAR8 *buf;\n"} {"commit":"d6c253e4517a3baa052dc930a9cb07b75c8704c0","subject":"CrH_GFX3: \u5b8c\u6210\u7eb9\u7406\u53c2\u6570\u8bfb\u53d6\u7684\u6846\u67b6","message":"CrH_GFX3: \u5b8c\u6210\u7eb9\u7406\u53c2\u6570\u8bfb\u53d6\u7684\u6846\u67b6\n","repos":"prefetchnta\/questlab,prefetchnta\/questlab,prefetchnta\/questlab,prefetchnta\/questlab,prefetchnta\/questlab,prefetchnta\/questlab,prefetchnta\/questlab","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/CrH_GFX3\/wavefront.c\n+++ src\/CrH_GFX3\/wavefront.c\n@@ -448,7 +448,7 @@\n goto _failure;\r\n }\r\n \r\n- \/* \u5fc5\u987b\u6709\u524d\u540e\u987a\u5e8f\u4e14\u4e0d\u91cd\u590d *\/\r\n+ \/* \u5fc5\u987b\u4e0d\u91cd\u590d *\/\r\n if (obj->mtl != NULL) {\r\n err_set(__CR_WAVEFRONT_C__, idx,\r\n \"wfront_obj_load()\", \"repeat <mtllib>\");\r\n@@ -561,6 +561,7 @@\n sINIu* ini;\r\n sARRAY a_m;\r\n leng_t skip;\r\n+ ansi_t** stmp;\r\n vec3d_t* vtmp;\r\n sWAVEFRONT_M mtmp;\r\n const ansi_t* line;\r\n@@ -788,25 +789,120 @@\n \"wfront_mtl_load()\", \"invalid <map_K>\");\r\n goto _failure;\r\n }\r\n-\r\n- \/* \u89e3\u6790\u989c\u8272\u77e2\u91cf *\/\r\n if (line[1] == CR_AC('a')) {\r\n+ if (mtmp.map_ka != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_Ka>\");\r\n+ goto _failure;\r\n+ }\r\n+ stmp = &mtmp.map_ka;\r\n }\r\n else\r\n if (line[1] == CR_AC('d')) {\r\n+ if (mtmp.map_kd != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_Kd>\");\r\n+ goto _failure;\r\n+ }\r\n+ stmp = &mtmp.map_kd;\r\n }\r\n else\r\n if (line[1] == CR_AC('s')) {\r\n+ if (mtmp.map_ks != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_Ks>\");\r\n+ goto _failure;\r\n+ }\r\n+ stmp = &mtmp.map_ks;\r\n }\r\n else {\r\n err_set(__CR_WAVEFRONT_C__, idx,\r\n \"wfront_mtl_load()\", \"invalid <map_K>\");\r\n goto _failure;\r\n }\r\n- continue;\r\n- }\r\n-\r\n- }\r\n+ line += 3;\r\n+ }\r\n+ else\r\n+ if (line[0] == CR_AC('d'))\r\n+ {\r\n+ \/* \u975e\u6cd5\u7684\u884c *\/\r\n+ if (!is_spaceA(line[1])) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_d>\");\r\n+ goto _failure;\r\n+ }\r\n+ if (mtmp.map_d != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_d>\");\r\n+ goto _failure;\r\n+ }\r\n+ stmp = &mtmp.map_d;\r\n+ line += 2;\r\n+ }\r\n+ else\r\n+ if (line[0] == CR_AC('N') && line[1] == CR_AC('s'))\r\n+ {\r\n+ \/* \u975e\u6cd5\u7684\u884c *\/\r\n+ if (!is_spaceA(line[2])) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_Ns>\");\r\n+ goto _failure;\r\n+ }\r\n+ if (mtmp.map_ns != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_Ns>\");\r\n+ goto _failure;\r\n+ }\r\n+ stmp = &mtmp.map_ns;\r\n+ line += 3;\r\n+ }\r\n+ else\r\n+ {\r\n+ \/* \u975e\u6cd5\u53c2\u6570\u540d\u79f0 *\/\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <map_>\");\r\n+ goto _failure;\r\n+ }\r\n+\r\n+ \/* \u8df3\u8fc7\u53c2\u6570\u76f4\u63a5\u53d6\u6587\u4ef6\u540d *\/\r\n+ *stmp = wfront_parse_file(skip_spaceA(line));\r\n+ if (*stmp == NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, CR_NULL,\r\n+ \"wfront_mtl_load()\", \"wfront_parse_file() failure\");\r\n+ goto _failure;\r\n+ }\r\n+ continue;\r\n+ }\r\n+ if (mem_cmp(line, \"bump\", 4) == 0)\r\n+ {\r\n+ \/* \u975e\u6cd5\u7684\u884c *\/\r\n+ if (!is_spaceA(line[4])) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <bump>\");\r\n+ goto _failure;\r\n+ }\r\n+\r\n+ \/* \u4e0d\u80fd\u91cd\u590d *\/\r\n+ if (mtmp.bump != NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid <bump>\");\r\n+ goto _failure;\r\n+ }\r\n+\r\n+ \/* \u8df3\u8fc7\u53c2\u6570\u76f4\u63a5\u53d6\u6587\u4ef6\u540d *\/\r\n+ *stmp = wfront_parse_file(skip_spaceA(line + 5));\r\n+ if (*stmp == NULL) {\r\n+ err_set(__CR_WAVEFRONT_C__, CR_NULL,\r\n+ \"wfront_mtl_load()\", \"wfront_parse_file() failure\");\r\n+ goto _failure;\r\n+ }\r\n+ continue;\r\n+ }\r\n+\r\n+ \/* \u975e\u6cd5\u7684\u884c *\/\r\n+ err_set(__CR_WAVEFRONT_C__, idx,\r\n+ \"wfront_mtl_load()\", \"invalid MTL format\");\r\n+ goto _failure;\r\n }\r\n \r\n \/* \u538b\u5165\u6700\u540e\u4e00\u4e2a\u6750\u8d28 *\/\r\n"} {"commit":"d87141f529356cb54fa86458fd59989f201a0018","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\ngit-svn-id: 29285e03eadf944384989fddbe8eccac9818e9d7@391 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"unpush\/mod_chxj,unpush\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/chxj_hdml.c\n+++ src\/chxj_hdml.c\n@@ -959,7 +959,7 @@\n \/* ignore *\/\n }\n else\n- if (strcasecmp(name, \"ijam\") == 0) {\n+ if ((*name == 'i' || *name == 'I') && strcasecmp(name, \"ijam\") == 0) {\n \/* ignore *\/\n }\n else\n"} {"commit":"3d8a7b3a8ae476fa03e51ff7d12db798ab7f9778","subject":"Whitespace fix","message":"Whitespace fix\n","repos":"rv8-io\/rv8,rv8-io\/rv8,rv8-io\/rv8","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/emu\/riscv-tlb.h\n+++ src\/emu\/riscv-tlb.h\n@@ -56,7 +56,7 @@\n \t static_assert(ispow2(tlb_size), \"tlb_size must be a power of 2\");\n \n \t\ttypedef typename PARAM::UX UX; \/* address type *\/\n-\t typedef tagged_tlb_entry<PARAM> tlb_entry_t; \/* TLB entry type *\/\n+\t\ttypedef tagged_tlb_entry<PARAM> tlb_entry_t; \/* TLB entry type *\/\n \n \t\tenum : UX {\n \t\t\tsize = tlb_size,\n"} {"commit":"52d901ccb5437aa1704a2eb27727e48cfcb7eb69","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\ngit-svn-id: 29285e03eadf944384989fddbe8eccac9818e9d7@405 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"unpush\/mod_chxj,unpush\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/chxj_hdml.c\n+++ src\/chxj_hdml.c\n@@ -1195,8 +1195,7 @@\n char* name = qs_get_attr_name(doc,attr);\n char* value = qs_get_attr_value(doc,attr);\n \n- if (strcasecmp(name, \"type\") == 0) \n- {\n+ if (strcasecmp(name, \"type\") == 0) {\n if (strcasecmp(value, \"text\") == 0)\n {\n \/*--------------------------------------------------------------------*\/\n"} {"commit":"ca4b27c0005c1db4d4d5a55561aa22b60d321be6","subject":"Added distinct to CountAvailablePredicates","message":"Added distinct to CountAvailablePredicates\n","repos":"Buchhold\/QLever,Buchhold\/QLever,Buchhold\/QLever,Buchhold\/QLever,Buchhold\/QLever","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/engine\/Engine.h\n+++ src\/engine\/Engine.h\n@@ -681,8 +681,14 @@\n ad_utility::HashMap<size_t, size_t> patternCounts;\n size_t posInput = 0;\n size_t subject;\n+ size_t lastSubject = ID_NO_VALUE;\n while (posInput < input->size()) {\n+ while ((*input)[posInput][subjectColumn] == lastSubject\n+ && posInput < input->size()) {\n+ posInput++;\n+ }\n subject = (*input)[posInput][subjectColumn];\n+ lastSubject = subject;\n if (subject < hasPattern.size() && hasPattern[subject] != NO_PATTERN) {\n \/\/ The subject matches a pattern\n patternCounts[hasPattern[subject]]++;\n"} {"commit":"ccf05bdfb52bbe8c1b31045d429fbfffc03c8c50","subject":"Issue #86: IVideoSource inherits from IObservable","message":"Issue #86: IVideoSource inherits from IObservable\n","repos":"gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/api\/ivideosource.h\n+++ src\/api\/ivideosource.h\n@@ -2,6 +2,7 @@\n \n #include \"videoframe.h\"\n #include \"except.h\"\n+#include \"iobservable.h\"\n \n \/\/!\n \/\/! \\brief This abstract class defines the interface that every video source\n@@ -10,7 +11,7 @@\n \/\/! This enables the underlying algorithms to be agnostic of\n \/\/! the data sources.\n \/\/!\n-class IVideoSource\n+class IVideoSource : public gg::IObservable\n {\n public:\n \/\/!\n"} {"commit":"6a94a99f39a8920bf26c38d345c0887ae7144e7f","subject":"clipboard: don't crash if the source client does not send a mime type","message":"clipboard: don't crash if the source client does not send a mime type\n\nReviewed-by: Daniel Stone <62e7e355d5d8400fa8384448796af0bf6be4ffae@collabora.com>\n","repos":"Gnurou\/weston,Tarnyko\/weston-xdg_surface_present,jonnylamb\/weston,mchalupa\/weston,udoprog\/weston,kwm81\/weston,Fantu\/compositor-spice,xorgy\/weston,krezovic\/weston,xorgy\/weston,Fantu\/compositor-spice,eyolfson\/weston,Fantu\/compositor-spice,udoprog\/weston,Tarnyko\/weston-xdg_surface_present,sir-murray\/weston,sir-murray\/weston,jonnylamb\/weston,mchalupa\/weston,giucam\/weston,kwm81\/weston,krezovic\/weston,Gnurou\/weston,giucam\/weston,eyolfson\/weston","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/clipboard.c\n+++ src\/clipboard.c\n@@ -254,7 +254,7 @@\n \n \tmime_types = source->mime_types.data;\n \n-\tif (pipe2(p, O_CLOEXEC) == -1)\n+\tif (!mime_types || pipe2(p, O_CLOEXEC) == -1)\n \t\treturn;\n \n \tsource->send(source, mime_types[0], p[1]);\n"} {"commit":"5a56df989fbc07a058cc973cff600c89e2f923bd","subject":"can't xref this right now","message":"can't xref this right now\n","repos":"adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- shared-bindings\/rgbmatrix\/RGBMatrix.c\n+++ shared-bindings\/rgbmatrix\/RGBMatrix.c\n@@ -164,7 +164,7 @@\n \/\/| \"RGB565\" means that it is organized as a series of 16-bit numbers\n \/\/| where the highest 5 bits are interpreted as red, the next 6 as\n \/\/| green, and the final 5 as blue. The object can be any buffer, but\n-\/\/| `array.array` and `ulab.ndarray` objects are most often useful.\n+\/\/| `array.array` and ``ulab.ndarray`` objects are most often useful.\n \/\/| To update the content, modify the framebuffer and call refresh.\n \/\/|\n \/\/| If a framebuffer is not passed in, one is allocated and initialized\n"} {"commit":"b666816857051f3d1491da49bf3386688bb4aea6","subject":"ld: typo","message":"ld: typo\n\nR=ken2\nCC=golang-dev\nhttp:\/\/codereview.appspot.com\/194073","repos":"abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/ld\/go.c\n+++ src\/cmd\/ld\/go.c\n@@ -111,7 +111,7 @@\n \t\t\treturn;\n \t\t}\n \t\tp0 += 8;\n-\t\twhile(p0 < p1 && *p0 == ' ' || *p0 == '\\t' || *p0 == '\\n')\n+\t\twhile(p0 < p1 && (*p0 == ' ' || *p0 == '\\t' || *p0 == '\\n'))\n \t\t\tp0++;\n \t\tname = p0;\n \t\twhile(p0 < p1 && *p0 != ' ' && *p0 != '\\t' && *p0 != '\\n')\n"} {"commit":"205efaed9229020f463c6aa0c20048e194a4f41a","subject":"coap_dtls.c: bugfix: set correct error code for wrong credentials","message":"coap_dtls.c: bugfix: set correct error code for wrong credentials\n\nget_psk_info() now returns appropriate error codes.\n","repos":"authmillenon\/libcoap,authmillenon\/libcoap,authmillenon\/libcoap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/coap_dtls.c\n+++ src\/coap_dtls.c\n@@ -208,6 +208,7 @@\n coap_context_t *coap_context = dtls_get_app_data(dtls_context);\n coap_keystore_item_t *psk;\n ssize_t length;\n+ int fatal_error = DTLS_ALERT_INTERNAL_ERROR;\n \n if(!coap_context || !coap_context->keystore) {\n goto error;\n@@ -223,6 +224,7 @@\n NULL, 0, (coap_address_t *)session);\n if (!psk) {\n coap_log(LOG_WARNING, \"no PSK identity for given realm\\n\");\n+ fatal_error = DTLS_ALERT_CLOSE_NOTIFY;\n goto error;\n }\n \n@@ -238,6 +240,7 @@\n id, id_len, (coap_address_t *)session);\n if (!psk) {\n coap_log(LOG_WARNING, \"PSK for unknown id requested, exiting\\n\");\n+ fatal_error = DTLS_ALERT_HANDSHAKE_FAILURE;\n goto error;\n }\n \n@@ -246,15 +249,18 @@\n coap_log(LOG_WARNING, \"cannot set psk -- buffer too small\\n\");\n goto error;\n }\n+\n return length;\n case DTLS_PSK_HINT:\n- break;\n+ \/* There is no point in sending a psk_identity_hint hence it is\n+ * set to zero length. *\/\n+ return 0;\n default:\n coap_log(LOG_WARNING, \"unsupported request type: %d\\n\", type);\n }\n \n error:\n- return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);\n+ return dtls_alert_fatal_create(fatal_error);\n }\n \n static dtls_handler_t cb = {\n@@ -446,20 +452,30 @@\n const coap_address_t *dst,\n const unsigned char *data, size_t data_len) {\n coap_dtls_session_t *session;\n-\n- \/* session = coap_dtls_new_session(local_interface, dst); *\/\n+ int new_session = 0;\n+\n session = coap_dtls_find_session(coap_context->dtls_context,\n local_interface, dst);\n+\n+ if (!session) {\n+ if ((session = coap_dtls_new_session(coap_context->dtls_context,\n+ local_interface, dst)) != NULL) {\n+ new_session = 1;\n+ }\n+ }\n \n if (!session) {\n coap_log(LOG_WARNING, \"cannot allocate session, drop packet\\n\");\n return -1;\n }\n \n- dtls_handle_message(coap_context->dtls_context->dtls_context,\n- &session->dtls_session, (uint8 *)data, data_len);\n-\n- \/* coap_dtls_free_session(session); *\/\n+ int res =\n+ dtls_handle_message(coap_context->dtls_context->dtls_context,\n+ &session->dtls_session, (uint8 *)data, data_len);\n+\n+ if ((res < 0) && new_session) {\n+ coap_dtls_free_session(coap_context->dtls_context, session);\n+ }\n \n return -1;\n }\n"} {"commit":"af89402bae2e54e4b7257ccb60ae628240d128b7","subject":"added needed .h files","message":"added needed .h files\n","repos":"lab11\/nrf5x-base,lab11\/nrf5x-base,lab11\/nrf5x-base,lab11\/nrf5x-base","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/simple_logger\/chanfs\/mmc_nrf.c\n+++ lib\/simple_logger\/chanfs\/mmc_nrf.c\n@@ -1,5 +1,7 @@\n \/\/SPI control module for chan_FS modified for the NRF58122\r\n \r\n+#include \"nrf51_bitfields.h\"\r\n+#include \"nrf_gpio.h\"\r\n \r\n #define NRF_SPI NRF_SPI1\r\n \r\n@@ -566,4 +568,3 @@\n \t\ts |= (STA_NODISK | STA_NOINIT);\r\n \tStat = s;\r\n }\r\n-\r\n"} {"commit":"7268566584e2cfbb645132a1efb0d72edbc57cf9","subject":"TODO suggestion for improving memory consumption of GraphColoring","message":"TODO suggestion for improving memory consumption of GraphColoring\n","repos":"OndrejSlamecka\/mincuts","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphcoloring.h\n+++ src\/graphcoloring.h\n@@ -13,6 +13,7 @@\n \n class GraphColoring\n {\n+ \/\/ TODO: Check whether map wouldn't be a better choice. (As these arrays might consume a lot of memory for uncolored vertices\/edges)\n NodeArray<Color> vertices;\n EdgeArray<Color> edges;\n \n"} {"commit":"38b91b27461bde4f7619d53c211e445313edb531","subject":"GSSAPI: Fixed memory leak on error conditions.","message":"GSSAPI: Fixed memory leak on error conditions.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/mech-gssapi.c\n+++ src\/auth\/mech-gssapi.c\n@@ -235,9 +235,10 @@\n {\n \tstruct auth_request *auth_request = &request->auth_request;\n \tOM_uint32 major_status, minor_status;\n-\tgss_buffer_desc outbuf;\n+\tgss_buffer_desc output_token;\n \tgss_OID name_type;\n \tconst char *username, *error;\n+\tint ret = 0;\n \n \tmajor_status = gss_accept_sec_context (\n \t\t&minor_status,\n@@ -247,7 +248,7 @@\n \t\tGSS_C_NO_CHANNEL_BINDINGS,\n \t\t&request->authn_name, \n \t\tNULL, \/* mech_type *\/\n-\t\t&outbuf,\n+\t\t&output_token,\n \t\tNULL, \/* ret_flags *\/\n \t\tNULL, \/* time_rec *\/\n \t\tNULL \/* delegated_cred_handle *\/\n@@ -267,16 +268,17 @@\n \tcase GSS_S_COMPLETE:\n \t\tif (!get_display_name(auth_request, request->authn_name,\n \t\t\t\t &name_type, &username) < 0)\n-\t\t\treturn -1;\n-\t\tif (!auth_request_set_username(auth_request, username,\n-\t\t\t\t\t &error)) {\n+\t\t\tret = -1;\n+\t\telse if (!auth_request_set_username(auth_request, username,\n+\t\t\t\t\t\t &error)) {\n \t\t\tauth_request_log_info(auth_request, \"gssapi\",\n \t\t\t\t\t \"authn_name: %s\", error);\n-\t\t\treturn -1;\n+\t\t\tret = -1;\n+\t\t} else {\n+\t\t\trequest->sasl_gssapi_state = GSS_STATE_WRAP;\n+\t\t\tauth_request_log_debug(auth_request, \"gssapi\",\n+\t\t\t\t\"security context state completed.\");\n \t\t}\n-\t\trequest->sasl_gssapi_state = GSS_STATE_WRAP;\n-\t\tauth_request_log_debug(auth_request, \"gssapi\",\n-\t\t\t\t \"security context state completed.\");\n \t\tbreak;\n \tcase GSS_S_CONTINUE_NEEDED:\n \t\tauth_request_log_debug(auth_request, \"gssapi\",\n@@ -289,10 +291,13 @@\n \t\tbreak;\n \t}\n \n-\tauth_request->callback(auth_request, AUTH_CLIENT_RESULT_CONTINUE,\n-\t\t\t outbuf.value, outbuf.length);\n-\t(void)gss_release_buffer(&minor_status, &outbuf);\n-\treturn 0;\n+\tif (ret == 0) {\n+\t\tauth_request->callback(auth_request,\n+\t\t\t\t AUTH_CLIENT_RESULT_CONTINUE,\n+\t\t\t\t output_token.value, output_token.length);\n+\t}\n+\t(void)gss_release_buffer(&minor_status, &output_token);\n+\treturn ret;\n }\n \n static int\n"} {"commit":"0e7b296e7f019099636805d14843de9583c2f355","subject":"ldap: Fixed auth_bind=yes.","message":"ldap: Fixed auth_bind=yes.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/passdb-ldap.c\n+++ src\/auth\/passdb-ldap.c\n@@ -28,6 +28,7 @@\n \t\tstruct ldap_request_search search;\n \t\tstruct ldap_request_bind bind;\n \t} request;\n+\tconst char *dn;\n \n \tunion {\n \t\tverify_plain_callback_t *verify_plain;\n@@ -221,36 +222,36 @@\n {\n \tstruct passdb_ldap_request *passdb_ldap_request =\n \t\t(struct passdb_ldap_request *)ldap_request;\n+\tstruct auth_request *auth_request = ldap_request->auth_request;\n \tstruct ldap_request_bind *brequest;\n-\tstruct auth_request *auth_request = ldap_request->auth_request;\n-\tLDAPMessage *entry;\n \tchar *dn;\n \n-\tif (res != NULL && ldap_msgtype(res) != LDAP_RES_SEARCH_RESULT) {\n-\t\tif (passdb_ldap_request->entries++ == 0) {\n-\t\t\t\/* first entry *\/\n-\t\t\tldap_query_save_result(conn, res, auth_request);\n+\tif (res != NULL && ldap_msgtype(res) == LDAP_RES_SEARCH_ENTRY) {\n+\t\tif (passdb_ldap_request->entries++ > 0) {\n+\t\t\t\/* too many replies *\/\n+\t\t\treturn;\n \t\t}\n-\t\treturn;\n-\t}\n-\n-\tif (res == NULL || passdb_ldap_request->entries != 0) {\n+\n+\t\t\/* first entry *\/\n+\t\tldap_query_save_result(conn, res, auth_request);\n+\n+\t\t\/* save dn *\/\n+\t\tdn = ldap_get_dn(conn->ld, res);\n+\t\tpassdb_ldap_request->dn = p_strdup(auth_request->pool, dn);\n+\t\tldap_memfree(dn);\n+\t} else if (res == NULL || passdb_ldap_request->entries != 1) {\n+\t\t\/* failure *\/\n \t\tldap_bind_lookup_dn_fail(auth_request, passdb_ldap_request, res);\n-\t\treturn;\n-\t}\n-\n-\t\/* convert search request to bind request *\/\n-\tbrequest = &passdb_ldap_request->request.bind;\n-\tmemset(brequest, 0, sizeof(*brequest));\n-\tbrequest->request.type = LDAP_REQUEST_TYPE_BIND;\n-\tbrequest->request.auth_request = auth_request;\n-\n-\t\/* switch the handler to the authenticated bind handler *\/\n-\tdn = ldap_get_dn(conn->ld, entry);\n-\tbrequest->dn = p_strdup(auth_request->pool, dn);\n-\tldap_memfree(dn);\n-\n-\tldap_auth_bind(conn, brequest);\n+\t} else {\n+\t\t\/* convert search request to bind request *\/\n+\t\tbrequest = &passdb_ldap_request->request.bind;\n+\t\tmemset(brequest, 0, sizeof(*brequest));\n+\t\tbrequest->request.type = LDAP_REQUEST_TYPE_BIND;\n+\t\tbrequest->request.auth_request = auth_request;\n+\t\tbrequest->dn = passdb_ldap_request->dn;\n+\n+\t\tldap_auth_bind(conn, brequest);\n+\t}\n }\n \n static void ldap_lookup_pass(struct auth_request *auth_request,\n"} {"commit":"4d041624703bcc2b67165f9a7e67cc7873524c95","subject":"don't set deskmirror scale for non-mb objects","message":"don't set deskmirror scale for non-mb objects\n","repos":"rvandegrift\/e,rvandegrift\/e,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_deskmirror.c\n+++ src\/bin\/e_deskmirror.c\n@@ -102,6 +102,7 @@\n \n if (!m->mirror) return;\n mb = evas_object_smart_data_get(m->mirror);\n+ if (!mb) return;\n msg.val = sc;\n edje_object_message_send(mb->frame, EDJE_MESSAGE_FLOAT, 0, &msg);\n }\n"} {"commit":"64a08ff652eaa5a9256de2c48d7ae25bcf7a5a59","subject":"I beleive these wires were crossed.","message":"I beleive these wires were crossed.\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@34287 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_eap_editor.c\n+++ src\/bin\/e_eap_editor.c\n@@ -582,7 +582,7 @@\n }\n else\n {\n-\to = e_widget_fsel_add(dia->win->evas, \"\/\", \"~\/\", NULL, NULL,\n+\to = e_widget_fsel_add(dia->win->evas, \"~\/\", \"\/\", NULL, NULL,\n \t\t\t _e_desktop_edit_select_cb, cfdata,\n \t\t\t NULL, cfdata, 1);\n }\n@@ -646,7 +646,7 @@\n }\n else\n {\n-\to = e_widget_fsel_add(dia->win->evas, \"\/\", \"~\/\", NULL, NULL,\n+\to = e_widget_fsel_add(dia->win->evas, \"~\/\", \"\/\", NULL, NULL,\n \t\t\t _e_desktop_edit_select_cb, cfdata,\n \t\t\t NULL, cfdata, 1);\n }\n"} {"commit":"483bfd6a5d166172eb50ce3fa3d004b5b51a6abf","subject":"This should be fixed.","message":"This should be fixed.\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_eap_editor.c\n+++ src\/bin\/e_eap_editor.c\n@@ -51,11 +51,6 @@\n static void _e_eap_edit_hilite_cb(Evas_Object *obj, char *file, void *data);\n \n #define IFDUP(src, dst) if (src) dst = strdup(src); else dst = NULL\n-\n-\/* FIXME: this eap editor is half-done. first advanced mode needs to ALSO\n- * cover basic config - image saving is broken, makign new icons is broken\n- * along with e_apps.c etc. all in all - this is not usable.\n- *\/\n \n \/* externally accessible functions *\/\n \n"} {"commit":"de88b1c6fc3a7d438ccbdf25f2f5b091d8522cd2","subject":"update ecore_config app to match","message":"update ecore_config app to match\n\n\ngit-svn-id: 70cf712206e5b8426a8d7451e052914a94f8fa22@16754 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bin\/ecore_config.c\n+++ src\/bin\/ecore_config.c\n@@ -15,19 +15,19 @@\n \tfloat f;\n \t\n \tswitch (ec_type) {\n-\tcase PT_INT:\n-\tcase PT_BLN:\n+\tcase ECORE_CONFIG_INT:\n+\tcase ECORE_CONFIG_BLN:\n \t\ti = atoi(value);\n \t\tif (ecore_config_typed_set(key, &i, ec_type) != ECORE_CONFIG_ERR_SUCC) return -1;\n \t\tbreak;\n-\tcase PT_FLT:\n+\tcase ECORE_CONFIG_FLT:\n \t\tf = atof(value);\n \t\tif (ecore_config_typed_set(key, &f, ec_type) != ECORE_CONFIG_ERR_SUCC) return -1;\n \t\tbreak;\n-\tcase PT_STR:\n-\tcase PT_RGB:\n-\tcase PT_THM:\n-\tcase PT_NIL:\n+\tcase ECORE_CONFIG_STR:\n+\tcase ECORE_CONFIG_RGB:\n+\tcase ECORE_CONFIG_THM:\n+\tcase ECORE_CONFIG_NIL:\n \t\tif (ecore_config_typed_set(key, value, ec_type) != ECORE_CONFIG_ERR_SUCC) return -1;\n \t\tbreak;\n \t}\n@@ -45,25 +45,25 @@\n \t}\n \t\t\n \tswitch (e->type) {\n-\tcase PT_NIL:\n+\tcase ECORE_CONFIG_NIL:\n \t\tprintf(\"\\n\");\n \t\tbreak;\n-\tcase PT_INT:\n+\tcase ECORE_CONFIG_INT:\n \t\tprintf(\"%ld\\n\", ecore_config_int_get(key));\n \t\tbreak;\n-\tcase PT_BLN:\n+\tcase ECORE_CONFIG_BLN:\n \t\tprintf(\"%d\\n\", ecore_config_boolean_get(key));\n \t\tbreak;\n-\tcase PT_FLT:\n+\tcase ECORE_CONFIG_FLT:\n \t\tprintf(\"%lf\\n\", ecore_config_float_get(key));\n \t\tbreak;\n-\tcase PT_STR:\n+\tcase ECORE_CONFIG_STR:\n \t\tprintf(\"%s\\n\", ecore_config_string_get(key));\n \t\tbreak;\n-\tcase PT_RGB:\n+\tcase ECORE_CONFIG_RGB:\n \t\tprintf(\"%s\\n\", ecore_config_argbstr_get(key));\n \t\tbreak;\n-\tcase PT_THM:\n+\tcase ECORE_CONFIG_THM:\n \t\tprintf(\"%s\\n\", ecore_config_theme_get(key));\n \t\tbreak;\n \tdefault:\n@@ -90,25 +90,25 @@\n \t}\n \t\t\n \tswitch (e->type) {\n-\tcase PT_NIL:\n+\tcase ECORE_CONFIG_NIL:\n \t\tprintf(\"nil\\n\");\n \t\tbreak;\n-\tcase PT_INT:\n+\tcase ECORE_CONFIG_INT:\n \t\tprintf(\"int\\n\");\n \t\tbreak;\n-\tcase PT_BLN:\n+\tcase ECORE_CONFIG_BLN:\n \t\tprintf(\"bool\\n\");\n \t\tbreak;\n-\tcase PT_FLT:\n+\tcase ECORE_CONFIG_FLT:\n \t\tprintf(\"float\\n\");\n \t\tbreak;\n-\tcase PT_STR:\n+\tcase ECORE_CONFIG_STR:\n \t\tprintf(\"string\\n\");\n \t\tbreak;\n-\tcase PT_RGB:\n+\tcase ECORE_CONFIG_RGB:\n \t\tprintf(\"rgb\\n\");\n \t\tbreak;\n-\tcase PT_THM:\n+\tcase ECORE_CONFIG_THM:\n \t\tprintf(\"theme\\n\");\n \t\tbreak;\n \tdefault:\n@@ -122,19 +122,19 @@\n parse_type(const char *type)\n {\n \tif (!strcmp(\"nil\", type)) {\n-\t\treturn PT_NIL;\n+\t\treturn ECORE_CONFIG_NIL;\n \t} else if (!strcmp(\"int\", type)) {\n-\t\treturn PT_INT;\n+\t\treturn ECORE_CONFIG_INT;\n \t} else if (!strcmp(\"float\", type)) {\n-\t\treturn PT_FLT;\n+\t\treturn ECORE_CONFIG_FLT;\n \t} else if (!strcmp(\"bool\", type)) {\n-\t\treturn PT_BLN;\n+\t\treturn ECORE_CONFIG_BLN;\n \t} else if (!strcmp(\"str\", type)) {\n-\t\treturn PT_STR;\n+\t\treturn ECORE_CONFIG_STR;\n \t} else if (!strcmp(\"rgb\", type)) {\n-\t\treturn PT_RGB;\n+\t\treturn ECORE_CONFIG_RGB;\n \t} else if (!strcmp(\"theme\", type)) {\n-\t\treturn PT_THM;\n+\t\treturn ECORE_CONFIG_THM;\n \t}\n \treturn -1;\n }\n"} {"commit":"d0a1bc88b4a125b206d939f7a977ae06a506ed4e","subject":"Refactored CLI monomeserial.","message":"Refactored CLI monomeserial.\n\nThis version, using getopt(), allows for more of the libmonome\nparameters to be exposed to runtime configuration. In particular, now\nthe protocol and the remote (application) host can be specified as\ncommand-line arguments.\n","repos":"monome\/libmonome,monome\/libmonome,monome\/libmonome","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/bin\/monomeserial.c\n+++ src\/bin\/monomeserial.c\n@@ -14,118 +14,22 @@\n #include <string.h>\n #include <stdlib.h>\n \n+#include <getopt.h>\n #include <lo\/lo.h>\n \n #include \"monome.h\"\n \n #define DEFAULT_MONOME_DEVICE \t\"\/dev\/ttyUSB0\"\n+#define DEFAULT_MONOME_PROTOCOL \"series\"\n+\n #define DEFAULT_OSC_PREFIX\t\t\"monome\"\n-#define DEFAULT_OSC_HOST_PORT\t\"8000\"\n-#define DEFAULT_OSC_LISTEN_PORT\t\"8080\"\n+#define DEFAULT_OSC_SERVER_PORT\t\"8080\"\n+#define DEFAULT_OSC_APP_PORT\t\"8000\"\n+#define DEFAULT_OSC_APP_HOST NULL\t\/* liblo takes this to mean 'localhost' *\/\n \n char *lo_prefix;\n lo_address *outgoing;\n lo_server_thread *st;\n-\n-void add_osc_methods(char *, monome_t *);\n-void lo_error(int, const char*, const char *);\n-void handle_press(const monome_event_t *, void *);\n-int clear_handler(const char *, const char *, lo_arg **, int, lo_message, void *);\n-int led_handler(const char *, const char *, lo_arg **, int, lo_message, void *);\n-int led_col_row_handler(const char *, const char *, lo_arg **, int, lo_message, void *);\n-int frame_handler(const char *, const char *, lo_arg **, int, lo_message, void *);\n-\n-int main(int argc, char *argv[]) {\n-\tmonome_t *monome;\n-\t\n-\tif( argc > 1 )\n-\t\tlo_prefix = strdup(argv[1]);\n-\telse {\n-\t\tlo_prefix = calloc(sizeof(char), strlen(DEFAULT_OSC_PREFIX) + 1);\n-\t\tstrcpy(lo_prefix, DEFAULT_OSC_PREFIX);\n-\t}\n-\t\n-\tif( !(monome = monome_open(\"series\", (argc == 3 ) ? argv[2] : DEFAULT_MONOME_DEVICE)) )\n-\t\treturn -1;\n-\t\n-\tif( !(st = lo_server_thread_new(DEFAULT_OSC_LISTEN_PORT, lo_error)) )\n-\t\treturn -1;\n-\t\n-\toutgoing = lo_address_new(NULL, DEFAULT_OSC_HOST_PORT);\n-\t\n-\tmonome_register_handler(monome, MONOME_BUTTON_DOWN, handle_press, lo_prefix);\n-\tmonome_register_handler(monome, MONOME_BUTTON_UP, handle_press, lo_prefix);\n-\t\n-\tadd_osc_methods(lo_prefix, monome);\n-\t\n-\tmonome_clear(monome, MONOME_CLEAR_OFF);\n-\t\n-\tlo_server_thread_start(st);\n-\tmonome_main_loop(monome);\n-\t\n-\tmonome_close(monome);\n-\tfree(lo_prefix);\n-\t\n-\treturn 0;\n-}\n-\n-void add_osc_methods(char *prefix, monome_t *monome) {\n-\tchar *cmd_buf;\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/clear\", prefix);\n-\tlo_server_thread_add_method(st, cmd_buf, \"\", clear_handler, monome);\n-\tlo_server_thread_add_method(st, cmd_buf, \"i\", clear_handler, monome);\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/led\", prefix);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_handler, monome);\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/led_row\", prefix);\n-\tlo_server_thread_add_method(st, cmd_buf, \"ii\", led_col_row_handler, monome);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_col_row_handler, monome);\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/led_col\", prefix);\n-\tlo_server_thread_add_method(st, cmd_buf, \"ii\", led_col_row_handler, monome);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_col_row_handler, monome);\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/frame\", prefix);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiii\", frame_handler, monome);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiiii\", frame_handler, monome);\n-\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiiiii\", frame_handler, monome);\n-\tfree(cmd_buf);\n-}\n-\n-void del_osc_methods(char *prefix) {\n-\tchar *cmd_buf;\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/clear\", prefix);\n-\tlo_server_thread_del_method(st, cmd_buf, \"\");\n-\tlo_server_thread_del_method(st, cmd_buf, \"i\");\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/led\", prefix);\n-\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n-\tfree(cmd_buf);\n-\t\n-\tasprintf(&cmd_buf, \"\/%s\/led_row\", prefix);\n-\tlo_server_thread_del_method(st, cmd_buf, \"ii\");\n-\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n-\tfree(cmd_buf);\n-\n-\tasprintf(&cmd_buf, \"\/%s\/led_col\", prefix);\n-\tlo_server_thread_del_method(st, cmd_buf, \"ii\");\n-\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n-\tfree(cmd_buf);\n-\n-\tasprintf(&cmd_buf, \"\/%s\/frame\", prefix);\n-\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiii\");\n-\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiiii\");\n-\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiiiii\");\n-\tfree(cmd_buf);\n-}\n \n void lo_error(int num, const char *error_msg, const char *path) {\n \tprintf(\"monomeserial: lo server error %d in %s: %s\\n\", num, path, error_msg);\n@@ -233,3 +137,171 @@\n \tlo_send_from(outgoing, lo_server_thread_get_server(st), LO_TT_IMMEDIATE, cmd, \"iii\", e->x, e->y, e->event_type);\n \tfree(cmd);\n }\n+\n+void add_osc_methods(char *prefix, monome_t *monome) {\n+\tchar *cmd_buf;\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/clear\", prefix);\n+\tlo_server_thread_add_method(st, cmd_buf, \"\", clear_handler, monome);\n+\tlo_server_thread_add_method(st, cmd_buf, \"i\", clear_handler, monome);\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/led\", prefix);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_handler, monome);\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/led_row\", prefix);\n+\tlo_server_thread_add_method(st, cmd_buf, \"ii\", led_col_row_handler, monome);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_col_row_handler, monome);\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/led_col\", prefix);\n+\tlo_server_thread_add_method(st, cmd_buf, \"ii\", led_col_row_handler, monome);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iii\", led_col_row_handler, monome);\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/frame\", prefix);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiii\", frame_handler, monome);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiiii\", frame_handler, monome);\n+\tlo_server_thread_add_method(st, cmd_buf, \"iiiiiiiiii\", frame_handler, monome);\n+\tfree(cmd_buf);\n+}\n+\n+void del_osc_methods(char *prefix) {\n+\tchar *cmd_buf;\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/clear\", prefix);\n+\tlo_server_thread_del_method(st, cmd_buf, \"\");\n+\tlo_server_thread_del_method(st, cmd_buf, \"i\");\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/led\", prefix);\n+\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n+\tfree(cmd_buf);\n+\t\n+\tasprintf(&cmd_buf, \"\/%s\/led_row\", prefix);\n+\tlo_server_thread_del_method(st, cmd_buf, \"ii\");\n+\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n+\tfree(cmd_buf);\n+\n+\tasprintf(&cmd_buf, \"\/%s\/led_col\", prefix);\n+\tlo_server_thread_del_method(st, cmd_buf, \"ii\");\n+\tlo_server_thread_del_method(st, cmd_buf, \"iii\");\n+\tfree(cmd_buf);\n+\n+\tasprintf(&cmd_buf, \"\/%s\/frame\", prefix);\n+\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiii\");\n+\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiiii\");\n+\tlo_server_thread_del_method(st, cmd_buf, \"iiiiiiiiii\");\n+\tfree(cmd_buf);\n+}\n+\n+void usage(const char *app) {\n+\tprintf(\"usage: %s [options...] [prefix]\\n\"\n+\t\t \"\\n\"\n+\t\t \" -h, --help\t\t\tdisplay this information\\n\"\n+\t\t \"\\n\"\n+\t\t \" -d, --device <device>\t\tthe monome serial device\\n\"\n+\t\t \" -p, --protocol <protocol>\twhich protocol to use (\\\"40h\\\" or \\\"series\\\")\\n\"\n+\t\t \"\\n\"\n+\t\t \" -s, --server-port <port>\twhat port to listen on\\n\"\n+\t\t \" -a, --application-port <port>\twhat port to talk to\\n\"\n+\t\t \" -o, --application-host <host> the host your application is on\\n\"\n+\t\t \"\\n\", app);\n+}\n+\n+int is_numstr(const char *s) {\n+\twhile((48 <= *s) && (*s++ <= 57)); \/* 48 is ASCII '0', 57 is '9' *\/\n+\n+\tif( *--s ) \/* if the character we stopped on isn't a null, we didn't make it through the string *\/\n+\t\treturn 0; \/* oh well :( *\/\n+\treturn 1;\n+}\n+\n+int main(int argc, char *argv[]) {\n+\tmonome_t *monome;\n+\tchar c, *device, *sport, *aport, *ahost, *proto;\n+\tint i;\n+\n+\tstruct option arguments[] = {\n+\t\t{\"help\", no_argument, 0, 'h'},\n+\n+\t\t{\"device\", required_argument, 0, 'd'},\n+\t\t{\"protocol\", required_argument, 0, 'p'},\n+\n+\t\t{\"server-port\", required_argument, 0, 's'},\n+\t\t{\"application-port\", required_argument, 0, 'a'},\n+\t\t{\"application-host\", required_argument, 0, 'o'}\n+\t};\n+\n+\tdevice = DEFAULT_MONOME_DEVICE;\n+\tproto = DEFAULT_MONOME_PROTOCOL;\n+\tsport = DEFAULT_OSC_SERVER_PORT;\n+\taport = DEFAULT_OSC_APP_PORT;\n+\tahost = DEFAULT_OSC_APP_HOST;\n+\n+\twhile( (c = getopt_long(argc, argv, \"hd:p:s:a:o:\", arguments, &i)) > 0 ) {\n+\t\tswitch( c ) {\n+\t\tcase 'h':\n+\t\t\tusage(argv[0]);\n+\t\t\treturn 1;\n+\t\t\t\n+\t\tcase 'd':\n+\t\t\tdevice = optarg;\n+\t\t\tbreak;\n+\n+\t\tcase 'p':\n+\t\t\tproto = optarg;\n+\t\t\tbreak;\n+\n+\t\tcase 's':\n+\t\t\tif( is_numstr(optarg) )\n+\t\t\t\tsport = optarg;\n+\t\t\telse\n+\t\t\t\tprintf(\"warning: \\\"%s\\\" is not a valid server port.\\n\", optarg);\n+\n+\t\t\tbreak;\n+\n+\t\tcase 'a':\n+\t\t\tif( is_numstr(optarg) )\n+\t\t\t\taport = optarg;\n+\t\t\telse\n+\t\t\t\tprintf(\"warning: \\\"%s\\\" is not a valid application port.\\n\", optarg);\n+\n+\t\t\tbreak;\n+\n+\t\tcase 'o':\n+\t\t\tahost = optarg;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif( optind == argc ) {\n+\t\tlo_prefix = calloc(sizeof(char), strlen(DEFAULT_OSC_PREFIX) + 1);\n+\t\tstrcpy(lo_prefix, DEFAULT_OSC_PREFIX);\n+\t} else\n+\t\tlo_prefix = strdup(argv[optind]);\n+\n+\tif( !(monome = monome_open(proto, device)) )\n+\t\treturn 1;\n+\n+\tif( !(st = lo_server_thread_new(sport, lo_error)) )\n+\t\treturn -1;\n+\t\n+\toutgoing = lo_address_new(ahost, aport);\n+\t\n+\tmonome_register_handler(monome, MONOME_BUTTON_DOWN, handle_press, lo_prefix);\n+\tmonome_register_handler(monome, MONOME_BUTTON_UP, handle_press, lo_prefix);\n+\t\n+\tadd_osc_methods(lo_prefix, monome);\n+\t\n+\tmonome_clear(monome, MONOME_CLEAR_OFF);\n+\t\n+\tlo_server_thread_start(st);\n+\tmonome_main_loop(monome);\n+\t\n+\tmonome_close(monome);\n+\tfree(lo_prefix);\n+\t\n+\treturn 0;\n+}\n"} {"commit":"b3fda027024406306333146de0c5a196b92800cc","subject":"genlist test: fix invalid free on window close","message":"genlist test: fix invalid free on window close\n","repos":"tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bin\/test_genlist.c\n+++ src\/bin\/test_genlist.c\n@@ -3808,6 +3808,12 @@\n \"Springfield\", \"Tallahassee\",\n \"Topeka\", \"Trenton\" };\n \n+static void\n+_gl20_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)\n+{\n+ free(data);\n+}\n+\n static char *\n _gl20_text_get(void *data, Evas_Object *obj EINA_UNUSED,\n const char *part EINA_UNUSED)\n@@ -3994,7 +4000,7 @@\n evas_object_event_callback_add(en, EVAS_CALLBACK_KEY_DOWN,\n _gl20_on_keydown, (void*)event_data);\n evas_object_event_callback_add(gl, EVAS_CALLBACK_FREE,\n- _cleanup_cb, (void*)event_data);\n+ _gl20_del_cb, (void*)event_data);\n evas_object_smart_callback_add(en, \"changed,user\",\n _gl20_search_settings_changed_cb, (void*)event_data);\n evas_object_smart_callback_add(tg, \"changed\",\n"} {"commit":"fa701b45bcacbb6f96855bc82fbb77a9b2df8b94","subject":"set transparent style for tooltip tests","message":"set transparent style for tooltip tests\n\n\nSVN revision: 61790\n","repos":"tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bin\/test_tooltip.c\n+++ src\/bin\/test_tooltip.c\n@@ -465,9 +465,11 @@\n elm_list_item_tooltip_content_cb_set(li, _tt_item_icon, NULL, NULL);\n li = elm_list_item_append(lst, \"Big Icon Tooltip\", NULL, NULL, NULL, NULL);\n elm_list_item_tooltip_content_cb_set(li, _tt_item_icon2, NULL, NULL);\n+ elm_list_item_tooltip_style_set(li, \"transparent\");\n elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);\n li = elm_list_item_append(lst, \"Insanely Big Icon Tooltip\", NULL, NULL, NULL, NULL);\n elm_list_item_tooltip_content_cb_set(li, _tt_item_icon3, NULL, NULL);\n+ elm_list_item_tooltip_style_set(li, \"transparent\");\n elm_list_item_tooltip_size_restrict_disable(li, EINA_TRUE);\n evas_object_size_hint_weight_set(lst, EVAS_HINT_EXPAND,\n EVAS_HINT_EXPAND);\n"} {"commit":"9f57775ac01eab845142012af01822d2e3bbf202","subject":"Fixed incomplete implementation warning","message":"Fixed incomplete implementation warning\n","repos":"nabeelarif100\/CJPAdController,nabeelarif100\/CJPAdController,chrisjp\/CJPAdController,chrisjp\/CJPAdController","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Demo\/CJPAdControllerDemo\/RootViewController.h\n+++ Demo\/CJPAdControllerDemo\/RootViewController.h\n@@ -13,6 +13,8 @@\n @property (nonatomic, retain) UIScrollView *scrollView;\n \n - (void)anotherExample;\n-- (void)removeAds:(BOOL)permanently;\n+- (void)removeAdsPermanently;\n+- (void)removeAdsTemporarily;\n+- (void)restoreAds;\n \n @end\n"} {"commit":"be480024f913628ac7e62efe58cb352d5f890f85","subject":"Increase the MCLK frequency to 25MHz in the IAR MSP430X demo.","message":"Increase the MCLK frequency to 25MHz in the IAR MSP430X demo.\n\ngit-svn-id: 43aea61533866f88f23079d48f4f5dc2d5288937@1243 1d2547de-c912-0410-9cb9-b8ca96c0e9e2\n","repos":"Psykar\/kubos,Psykar\/kubos,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Demo\/MSP430X_MSP430F5438_IAR\/FreeRTOSConfig.h\n+++ Demo\/MSP430X_MSP430F5438_IAR\/FreeRTOSConfig.h\n@@ -69,7 +69,7 @@\n #define configUSE_PREEMPTION\t\t\t1\r\n #define configUSE_IDLE_HOOK\t\t\t\t1\r\n #define configUSE_TICK_HOOK\t\t\t\t1\r\n-#define configCPU_CLOCK_HZ\t\t\t\t( 16000000UL )\t\r\n+#define configCPU_CLOCK_HZ\t\t\t\t( 25000000UL )\t\r\n #define configTICK_RATE_HZ\t\t\t\t( ( portTickType ) 1000 )\r\n #define configMAX_PRIORITIES\t\t\t( ( unsigned portBASE_TYPE ) 5 )\r\n #define configTOTAL_HEAP_SIZE\t\t\t( ( size_t ) ( 10 * 1024 ) )\r\n"} {"commit":"33577e2525a26ac22f86cac6bcf6eb56088f36f1","subject":"Update ViewPagerController.h","message":"Update ViewPagerController.h","repos":"GannettDigital\/ICViewPager","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ICViewPager\/ICViewPager\/ViewPagerController.h\n+++ ICViewPager\/ICViewPager\/ViewPagerController.h\n@@ -49,6 +49,9 @@\n \n @interface ViewPagerController : UIViewController\n \n+@property (nonatomic) NSUInteger activeTabIndex;\n+@property (nonatomic) NSUInteger activeContentIndex;\n+\n \/**\n * The object that acts as the data source of the receiving viewPager\n * @discussion The data source must adopt the ViewPagerDataSource protocol. The data source is not retained.\n"} {"commit":"357825db51f5537d7e89058deef2b95d264bf33b","subject":"Incluido a possibilidade de leitura de Strings","message":"Incluido a possibilidade de leitura de Strings\n\n# Modificado a forma como s\u00e3o armazenadas as strings.\r\n* Agora \u00e9 poss\u00edvel ler Strings em hashs de 32 bits do formato DBJ2 o que possibilita a utliza\u00e7\u00e3o de simbolos com muitos caracteres e retira a limita\u00e7\u00e3o anterior de 5 caracteres, al\u00e9m de diminuir o tamanho do objeto.\r\n\/\/ Tamanho final do objeto : 6 Bytes.","repos":"WiserUFBA\/TATU","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MODULOS\/TPI_INTERPRETER_MOD\/TATUInterpreter.h\n+++ MODULOS\/TPI_INTERPRETER_MOD\/TATUInterpreter.h\n@@ -37,7 +37,7 @@\n bool ERROR;\n public:\n Command cmd;\n- char str_val[6];\n+ uint32_t str_hash;\n TATUInterpreter(){ ERROR = true; }\n bool parse(unsigned char *, unsigned int);\n bool getERROR();\n"} {"commit":"2846067469f44f1b9dc085c82267616e8193d86b","subject":"Update comment for 'isEnforced' property.","message":"Update comment for 'isEnforced' property.\n","repos":"opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OpenSim\/Simulation\/SimbodyEngine\/Constraint.h\n+++ OpenSim\/Simulation\/SimbodyEngine\/Constraint.h\n@@ -47,17 +47,14 @@\n \/\/ PROPERTY\n \/\/=============================================================================\n public:\n- \/** Constraint is active (enabled) by default. \n- NOTE: Prior to OpenSim 4.0, this property was named **isDisabled**.\n- If **isDisabled** is **true**, **isEnforced** is **false**.\n- If **isDisabled** is **false**, **isEnforced** is **true**.*\/\n- OpenSim_DECLARE_PROPERTY(isEnforced, bool, \n+ \/* Note: 'isEnforced' replaced 'isDisabled' as of OpenSim 4.0 *\/\n+ OpenSim_DECLARE_PROPERTY(isEnforced, bool,\n \"Flag indicating whether the constraint is enforced or not.\"\n \"Enforced means that the constraint is active in subsequent \"\n- \"dynamics realizations. NOTE: Prior to OpenSim 4.0, this property was\"\n- \" named **isDisabled**. If **isDisabled** is **true**, **isEnforced**\"\n- \" is **false**. If **isDisabled** is **false**, **isEnforced** is\"\n- \" **true**.\");\n+ \"dynamics realizations. NOTE: Prior to OpenSim 4.0, this behavior \"\n+ \"was controlled by the 'isDisabled' property, where 'true' meant \"\n+ \"the constraint was not being enforced. Thus, if 'isDisabled' is\"\n+ \"'true', then 'isEnforced' is false.\" );\n \n \/\/=============================================================================\n \/\/ METHODS\n@@ -79,17 +76,16 @@\n SimTK::Vector& mobilityForces) const;\n \n \/** \n- * Methods to query a Constraint forces (defaults to the Lagrange \n- * multipliers) applied The names of the quantities (column labels) is \n- * returned by this first function getRecordLabels()\n- *\/\n+ * Methods to query the Constraint forces (defaults to the Lagrange \n+ * multipliers) applied to the MultibodySystem. The names of the quantities\n+ * (column labels) are returned by this first method, getRecordLabels() *\/\n virtual Array<std::string> getRecordLabels() const;\n \/**\n- * Given SimTK::State object extract all the values necessary to report \n- * constraint forces (multipliers) Subclasses can override to report force,\n- * application location frame, etc. used in conjunction with \n- * getRecordLabels and should return same size Array\n- *\/\n+ * Given a SimTK::State, extract all the values necessary to report \n+ * constraint forces (e.g. multipliers). Subclasses can override to report\n+ * the location, frame, etc.. of force application. This method is used in\n+ * conjunction with getRecordLabels() and must return an Array of equal\n+ * size. *\/\n virtual Array<double> getRecordValues(const SimTK::State& state) const;\n \n virtual void scale(const ScaleSet& aScaleSet) {};\n"} {"commit":"c2405283b722e6333c7b783774fa371d08252d37","subject":"Minor fix for par","message":"Minor fix for par\n\n","repos":"mazimm\/AliPhysics,jgronefe\/AliPhysics,yowatana\/AliPhysics,pchrista\/AliPhysics,ALICEHLT\/AliPhysics,fbellini\/AliPhysics,dlodato\/AliPhysics,dmuhlhei\/AliPhysics,ppribeli\/AliPhysics,fbellini\/AliPhysics,preghenella\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,fcolamar\/AliPhysics,jgronefe\/AliPhysics,lfeldkam\/AliPhysics,pbatzing\/AliPhysics,mkrzewic\/AliPhysics,preghenella\/AliPhysics,mazimm\/AliPhysics,rderradi\/AliPhysics,rbailhac\/AliPhysics,carstooon\/AliPhysics,ALICEHLT\/AliPhysics,ALICEHLT\/AliPhysics,dstocco\/AliPhysics,lcunquei\/AliPhysics,amaringarcia\/AliPhysics,SHornung1\/AliPhysics,adriansev\/AliPhysics,sebaleh\/AliPhysics,AudreyFrancisco\/AliPhysics,hcab14\/AliPhysics,victor-gonzalez\/AliPhysics,adriansev\/AliPhysics,mvala\/AliPhysics,aaniin\/AliPhysics,SHornung1\/AliPhysics,pbuehler\/AliPhysics,ALICEHLT\/AliPhysics,pchrista\/AliPhysics,carstooon\/AliPhysics,SHornung1\/AliPhysics,SHornung1\/AliPhysics,yowatana\/AliPhysics,amatyja\/AliPhysics,victor-gonzalez\/AliPhysics,sebaleh\/AliPhysics,pbatzing\/AliPhysics,adriansev\/AliPhysics,amatyja\/AliPhysics,preghenella\/AliPhysics,SHornung1\/AliPhysics,btrzecia\/AliPhysics,AudreyFrancisco\/AliPhysics,lcunquei\/AliPhysics,rderradi\/AliPhysics,ppribeli\/AliPhysics,dstocco\/AliPhysics,mvala\/AliPhysics,hzanoli\/AliPhysics,victor-gonzalez\/AliPhysics,dstocco\/AliPhysics,lfeldkam\/AliPhysics,pchrista\/AliPhysics,rderradi\/AliPhysics,btrzecia\/AliPhysics,fcolamar\/AliPhysics,btrzecia\/AliPhysics,pbatzing\/AliPhysics,mazimm\/AliPhysics,AMechler\/AliPhysics,kreisl\/AliPhysics,adriansev\/AliPhysics,amaringarcia\/AliPhysics,lcunquei\/AliPhysics,hcab14\/AliPhysics,aaniin\/AliPhysics,lfeldkam\/AliPhysics,ppribeli\/AliPhysics,jmargutt\/AliPhysics,nschmidtALICE\/AliPhysics,mkrzewic\/AliPhysics,preghenella\/AliPhysics,lfeldkam\/AliPhysics,dstocco\/AliPhysics,mkrzewic\/AliPhysics,rihanphys\/AliPhysics,pchrista\/AliPhysics,rderradi\/AliPhysics,fcolamar\/AliPhysics,hzanoli\/AliPhysics,adriansev\/AliPhysics,amaringarcia\/AliPhysics,mpuccio\/AliPhysics,mvala\/AliPhysics,dlodato\/AliPhysics,akubera\/AliPhysics,rihanphys\/AliPhysics,nschmidtALICE\/AliPhysics,hcab14\/AliPhysics,akubera\/AliPhysics,kreisl\/AliPhysics,rbailhac\/AliPhysics,mbjadhav\/AliPhysics,jmargutt\/AliPhysics,dlodato\/AliPhysics,dstocco\/AliPhysics,hcab14\/AliPhysics,mpuccio\/AliPhysics,jmargutt\/AliPhysics,aaniin\/AliPhysics,rihanphys\/AliPhysics,kreisl\/AliPhysics,akubera\/AliPhysics,victor-gonzalez\/AliPhysics,dmuhlhei\/AliPhysics,hzanoli\/AliPhysics,hzanoli\/AliPhysics,jmargutt\/AliPhysics,carstooon\/AliPhysics,lcunquei\/AliPhysics,amatyja\/AliPhysics,preghenella\/AliPhysics,jgronefe\/AliPhysics,dlodato\/AliPhysics,lfeldkam\/AliPhysics,alisw\/AliPhysics,kreisl\/AliPhysics,amatyja\/AliPhysics,btrzecia\/AliPhysics,mazimm\/AliPhysics,mvala\/AliPhysics,mkrzewic\/AliPhysics,fbellini\/AliPhysics,mpuccio\/AliPhysics,jmargutt\/AliPhysics,AMechler\/AliPhysics,akubera\/AliPhysics,yowatana\/AliPhysics,kreisl\/AliPhysics,dmuhlhei\/AliPhysics,mbjadhav\/AliPhysics,alisw\/AliPhysics,mvala\/AliPhysics,mbjadhav\/AliPhysics,ppribeli\/AliPhysics,lcunquei\/AliPhysics,btrzecia\/AliPhysics,rderradi\/AliPhysics,rihanphys\/AliPhysics,AMechler\/AliPhysics,carstooon\/AliPhysics,mvala\/AliPhysics,mvala\/AliPhysics,alisw\/AliPhysics,victor-gonzalez\/AliPhysics,rbailhac\/AliPhysics,lfeldkam\/AliPhysics,lcunquei\/AliPhysics,rbailhac\/AliPhysics,amaringarcia\/AliPhysics,mbjadhav\/AliPhysics,btrzecia\/AliPhysics,mpuccio\/AliPhysics,pbatzing\/AliPhysics,yowatana\/AliPhysics,carstooon\/AliPhysics,pbuehler\/AliPhysics,akubera\/AliPhysics,sebaleh\/AliPhysics,mpuccio\/AliPhysics,btrzecia\/AliPhysics,mkrzewic\/AliPhysics,mpuccio\/AliPhysics,hcab14\/AliPhysics,akubera\/AliPhysics,rbailhac\/AliPhysics,dmuhlhei\/AliPhysics,victor-gonzalez\/AliPhysics,pbatzing\/AliPhysics,fcolamar\/AliPhysics,lfeldkam\/AliPhysics,amatyja\/AliPhysics,fcolamar\/AliPhysics,rihanphys\/AliPhysics,mbjadhav\/AliPhysics,SHornung1\/AliPhysics,carstooon\/AliPhysics,preghenella\/AliPhysics,mazimm\/AliPhysics,nschmidtALICE\/AliPhysics,fbellini\/AliPhysics,pchrista\/AliPhysics,victor-gonzalez\/AliPhysics,aaniin\/AliPhysics,kreisl\/AliPhysics,aaniin\/AliPhysics,mazimm\/AliPhysics,pbuehler\/AliPhysics,AMechler\/AliPhysics,alisw\/AliPhysics,sebaleh\/AliPhysics,jgronefe\/AliPhysics,pbuehler\/AliPhysics,mbjadhav\/AliPhysics,pbuehler\/AliPhysics,jgronefe\/AliPhysics,sebaleh\/AliPhysics,adriansev\/AliPhysics,AMechler\/AliPhysics,aaniin\/AliPhysics,sebaleh\/AliPhysics,lcunquei\/AliPhysics,ppribeli\/AliPhysics,mpuccio\/AliPhysics,ALICEHLT\/AliPhysics,ppribeli\/AliPhysics,alisw\/AliPhysics,yowatana\/AliPhysics,dlodato\/AliPhysics,dstocco\/AliPhysics,AudreyFrancisco\/AliPhysics,ppribeli\/AliPhysics,amaringarcia\/AliPhysics,AMechler\/AliPhysics,amaringarcia\/AliPhysics,pbatzing\/AliPhysics,pchrista\/AliPhysics,dlodato\/AliPhysics,amatyja\/AliPhysics,AudreyFrancisco\/AliPhysics,dmuhlhei\/AliPhysics,yowatana\/AliPhysics,fbellini\/AliPhysics,rderradi\/AliPhysics,AudreyFrancisco\/AliPhysics,nschmidtALICE\/AliPhysics,mkrzewic\/AliPhysics,alisw\/AliPhysics,AudreyFrancisco\/AliPhysics,dmuhlhei\/AliPhysics,kreisl\/AliPhysics,SHornung1\/AliPhysics,fcolamar\/AliPhysics,hzanoli\/AliPhysics,fcolamar\/AliPhysics,jmargutt\/AliPhysics,pbatzing\/AliPhysics,preghenella\/AliPhysics,nschmidtALICE\/AliPhysics,mazimm\/AliPhysics,pbuehler\/AliPhysics,rbailhac\/AliPhysics,dlodato\/AliPhysics,jgronefe\/AliPhysics,rihanphys\/AliPhysics,fbellini\/AliPhysics,carstooon\/AliPhysics,pchrista\/AliPhysics,rbailhac\/AliPhysics,ALICEHLT\/AliPhysics,akubera\/AliPhysics,fbellini\/AliPhysics,nschmidtALICE\/AliPhysics,hzanoli\/AliPhysics,pbuehler\/AliPhysics,jmargutt\/AliPhysics,alisw\/AliPhysics,adriansev\/AliPhysics,yowatana\/AliPhysics,mbjadhav\/AliPhysics,hcab14\/AliPhysics,AMechler\/AliPhysics,amatyja\/AliPhysics,rihanphys\/AliPhysics,dstocco\/AliPhysics,dmuhlhei\/AliPhysics,ALICEHLT\/AliPhysics,jgronefe\/AliPhysics,mkrzewic\/AliPhysics,amaringarcia\/AliPhysics,AudreyFrancisco\/AliPhysics,sebaleh\/AliPhysics,aaniin\/AliPhysics,hcab14\/AliPhysics,rderradi\/AliPhysics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- PWG2\/FORWARD\/analysis2\/AliForwarddNdetaTask.h\n+++ PWG2\/FORWARD\/analysis2\/AliForwarddNdetaTask.h\n@@ -3,7 +3,7 @@\n \/\/\n #ifndef ALIFORWARDDNDETATASK_H\n #define ALIFORWARDDNDETATASK_H\n-#include <AliBasedNdetaTask.h>\n+#include \"AliBasedNdetaTask.h\"\n class TList;\n class TH2D;\n class TH1D;\n"} {"commit":"9692760f74a0722697dcfaf3481b80b3abe8569b","subject":"+ RotarySpeaker: added acceleration\/decceleration for \"Off\" speed + RotarySpeaker: fixed(?) panning bug, by changing filter characteristics","message":"+ RotarySpeaker: added acceleration\/decceleration for \"Off\" speed\n+ RotarySpeaker: fixed(?) panning bug, by changing filter characteristics\n\n\n\ngit-svn-id: 57278f1e1a1e24dc80487329b15e533cf82905b2@85 78b06b96-2940-0410-b7fc-879d825d01d8\n","repos":"zamaudio\/calf-LR4,adiknoth\/calf,zamaudio\/calf-LR4,jnetterf\/calf,adiknoth\/calf,adiknoth\/calf,jnetterf\/calf,jnetterf\/calf,jnetterf\/calf,jnetterf\/calf,adiknoth\/calf,adiknoth\/calf,zamaudio\/calf-LR4,zamaudio\/calf-LR4,zamaudio\/calf-LR4","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/calf\/modules_dev.h\n+++ src\/calf\/modules_dev.h\n@@ -128,19 +128,21 @@\n {\n vibrato_mode = fastf2i_drm(*params[par_speed]);\n if (!vibrato_mode)\n- return;\n- float speed = vibrato_mode - 1;\n- if (vibrato_mode == 3)\n- speed = hold_value;\n- if (vibrato_mode == 4)\n- speed = mwhl_value;\n- dspeed = (speed < 0.5f) ? 0 : 1;\n+ dspeed = -1;\n+ else {\n+ float speed = vibrato_mode - 1;\n+ if (vibrato_mode == 3)\n+ speed = hold_value;\n+ if (vibrato_mode == 4)\n+ speed = mwhl_value;\n+ dspeed = (speed < 0.5f) ? 0 : 1;\n+ }\n update_speed();\n }\n void update_speed()\n {\n- float speed_h = 48 + (400-48) * aspeed_h;\n- float speed_l = 40 + (342-40) * aspeed_l;\n+ float speed_h = aspeed_h >= 0 ? (48 + (400-48) * aspeed_h) : (48 * (1 + aspeed_h));\n+ float speed_l = aspeed_l >= 0 ? 40 + (342-40) * aspeed_l : (40 * (1 + aspeed_l));\n dphase_h = speed_h \/ (60 * srate);\n dphase_l = speed_l \/ (60 * srate);\n cos_h = (int)(16384*16384*cos(dphase_h * 2 * PI));\n@@ -158,74 +160,67 @@\n inline bool update_speed(float &aspeed, float delta_decc, float delta_acc)\n {\n if (aspeed < dspeed) {\n- aspeed = min(1.f, aspeed + delta_acc);\n+ aspeed = min(dspeed, aspeed + delta_acc);\n return true;\n }\n else if (aspeed > dspeed) \n {\n- aspeed = max(0.f, aspeed - delta_decc);\n+ aspeed = max(dspeed, aspeed - delta_decc);\n return true;\n } \n return false;\n }\n uint32_t process(uint32_t offset, uint32_t nsamples, uint32_t inputs_mask, uint32_t outputs_mask)\n {\n- if (vibrato_mode)\n- {\n- long long int xl0 = (int)(10000*16384*cos(phase_l * 2 * PI));\n- long long int yl0 = (int)(10000*16384*sin(phase_l * 2 * PI));\n- long long int xh0 = (int)(10000*16384*cos(phase_h * 2 * PI));\n- long long int yh0 = (int)(10000*16384*sin(phase_h * 2 * PI));\n- \/\/ printf(\"xl=%d yl=%d dx=%d dy=%d\\n\", (int)(xl0>>14), (int)(yl0 >> 14), cos_l, sin_l);\n- for (unsigned int i = 0; i < nsamples; i++) {\n- float in_l = ins[0][i + offset], in_r = ins[1][i + offset];\n- float in_mono = 0.5f * (in_l + in_r);\n- \n- \/\/ int xl = (int)(10000 * cos(phase_l)), yl = (int)(10000 * sin(phase_l));\n- \/\/int xh = (int)(10000 * cos(phase_h)), yh = (int)(10000 * sin(phase_h));\n- update_euler(xl0, yl0, cos_l, sin_l);\n- int xl = xl0 >> 14, yl = yl0 >> 14;\n- int xh = xh0 >> 14, yh = yh0 >> 14;\n- \/\/ printf(\"xl=%d yl=%d xl'=%f yl'=%f\\n\", xl, yl, 16384*cos((phase_l + dphase_l * i) * 2 * PI), 16384*sin((phase_l + dphase_l * i) * 2 * PI));\n- update_euler(xh0, yh0, cos_h, sin_h);\n- \n- float out_hi_l = delay.get_interp_1616(500000 + 40 * xh) + 0.0001 * xh * delay.get_interp_1616(500000 - 40 * yh) - delay.get_interp_1616(800000 - 60 * xh);\n- float out_hi_r = delay.get_interp_1616(550000 - 48 * yh) - 0.0001 * yh * delay.get_interp_1616(700000 + 46 * xh) - delay.get_interp_1616(1000000 + 76 * yh);\n-\n- float out_lo_l = 0.5f * in_mono + delay.get_interp_1616(400000 + 34 * xl) + delay.get_interp_1616(650000 - 18 * yl);\n- float out_lo_r = 0.5f * in_mono + delay.get_interp_1616(600000 - 50 * xl) - delay.get_interp_1616(900000 + 15 * yl);\n- \n- out_hi_l = crossover2l.process_d2(out_hi_l); \/\/ sanitize(out_hi_l);\n- out_hi_r = crossover2r.process_d2(out_hi_r); \/\/ sanitize(out_hi_r);\n- out_lo_l = crossover1l.process_d2(out_lo_l); \/\/ sanitize(out_lo_l);\n- out_lo_r = crossover1r.process_d2(out_lo_r); \/\/ sanitize(out_lo_r);\n- \n- float out_l = out_hi_l + out_lo_l;\n- float out_r = out_hi_r + out_lo_r;\n- \n- in_mono += 0.06f * (out_l + out_r);\n- sanitize(in_mono);\n- \n- outs[0][i + offset] = out_l;\n- outs[1][i + offset] = out_r;\n- delay.put(in_mono);\n- }\n- crossover1l.sanitize_d2();\n- crossover1r.sanitize_d2();\n- crossover2l.sanitize_d2();\n- crossover2r.sanitize_d2();\n- phase_l = fmod(phase_l + nsamples * dphase_l, 1.0);\n- phase_h = fmod(phase_h + nsamples * dphase_h, 1.0);\n- float delta = nsamples * 1.0 \/ srate;\n- bool u1 = update_speed(aspeed_l, delta * 0.2, delta * 0.14);\n- bool u2 = update_speed(aspeed_h, delta, delta * 0.5);\n- if (u1 || u2)\n- set_vibrato();\n- } else\n- {\n- memcpy(outs[0] + offset, ins[0] + offset, sizeof(float) * nsamples);\n- memcpy(outs[1] + offset, ins[1] + offset, sizeof(float) * nsamples);\n- }\n+ long long int xl0 = (int)(10000*16384*cos(phase_l * 2 * PI));\n+ long long int yl0 = (int)(10000*16384*sin(phase_l * 2 * PI));\n+ long long int xh0 = (int)(10000*16384*cos(phase_h * 2 * PI));\n+ long long int yh0 = (int)(10000*16384*sin(phase_h * 2 * PI));\n+ \/\/ printf(\"xl=%d yl=%d dx=%d dy=%d\\n\", (int)(xl0>>14), (int)(yl0 >> 14), cos_l, sin_l);\n+ for (unsigned int i = 0; i < nsamples; i++) {\n+ float in_l = ins[0][i + offset], in_r = ins[1][i + offset];\n+ float in_mono = 0.5f * (in_l + in_r);\n+ \n+ \/\/ int xl = (int)(10000 * cos(phase_l)), yl = (int)(10000 * sin(phase_l));\n+ \/\/int xh = (int)(10000 * cos(phase_h)), yh = (int)(10000 * sin(phase_h));\n+ int xl = xl0 >> 14, yl = yl0 >> 14;\n+ int xh = xh0 >> 14, yh = yh0 >> 14;\n+ update_euler(xl0, yl0, cos_l, sin_l);\n+ \/\/ printf(\"xl=%d yl=%d xl'=%f yl'=%f\\n\", xl, yl, 16384*cos((phase_l + dphase_l * i) * 2 * PI), 16384*sin((phase_l + dphase_l * i) * 2 * PI));\n+ update_euler(xh0, yh0, cos_h, sin_h);\n+ \n+ float out_hi_l = delay.get_interp_1616(500000 + 40 * xh) + 0.0001 * xh * delay.get_interp_1616(650000 - 40 * yh) - delay.get_interp_1616(800000 - 60 * xh);\n+ float out_hi_r = delay.get_interp_1616(550000 - 48 * yh) - 0.0001 * yh * delay.get_interp_1616(700000 + 46 * xh) + delay.get_interp_1616(1000000 + 76 * yh);\n+\n+ float out_lo_l = 0.5f * in_mono - delay.get_interp_1616(400000 + 34 * xl) + delay.get_interp_1616(650000 - 18 * yl);\n+ float out_lo_r = 0.5f * in_mono + delay.get_interp_1616(600000 - 50 * xl) - delay.get_interp_1616(900000 + 15 * yl);\n+ \n+ out_hi_l = crossover2l.process_d2(out_hi_l); \/\/ sanitize(out_hi_l);\n+ out_hi_r = crossover2r.process_d2(out_hi_r); \/\/ sanitize(out_hi_r);\n+ out_lo_l = crossover1l.process_d2(out_lo_l); \/\/ sanitize(out_lo_l);\n+ out_lo_r = crossover1r.process_d2(out_lo_r); \/\/ sanitize(out_lo_r);\n+ \n+ float out_l = out_hi_l + out_lo_l;\n+ float out_r = out_hi_r + out_lo_r;\n+ \n+ in_mono += 0.06f * (out_l + out_r);\n+ sanitize(in_mono);\n+ \n+ outs[0][i + offset] = out_l * 0.5f;\n+ outs[1][i + offset] = out_r * 0.5f;\n+ delay.put(in_mono);\n+ }\n+ crossover1l.sanitize_d2();\n+ crossover1r.sanitize_d2();\n+ crossover2l.sanitize_d2();\n+ crossover2r.sanitize_d2();\n+ phase_l = fmod(phase_l + nsamples * dphase_l, 1.0);\n+ phase_h = fmod(phase_h + nsamples * dphase_h, 1.0);\n+ float delta = nsamples * 1.0 \/ srate;\n+ bool u1 = update_speed(aspeed_l, delta * 0.2, delta * 0.14);\n+ bool u2 = update_speed(aspeed_h, delta, delta * 0.5);\n+ if (u1 || u2)\n+ set_vibrato();\n return outputs_mask;\n }\n virtual void control_change(int ctl, int val)\n"} {"commit":"e8989375327add27a1bfcbad61c538afb58f8b96","subject":"Added public methods for setting internal fields from an external source.","message":"Added public methods for setting internal fields from an external source.\n","repos":"OGRECave\/ogre,paroj\/ogre,paroj\/ogre,OGRECave\/ogre,RealityFactory\/ogre,RealityFactory\/ogre,OGRECave\/ogre,paroj\/ogre,OGRECave\/ogre,OGRECave\/ogre,RealityFactory\/ogre,paroj\/ogre,RealityFactory\/ogre,paroj\/ogre,RealityFactory\/ogre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Samples\/Browser\/include\/FileSystemLayerImpl.h\n+++ Samples\/Browser\/include\/FileSystemLayerImpl.h\n@@ -82,6 +82,14 @@\n \t\t{\n \t\t\treturn mHomePath + filename;\n \t\t}\n+\t\t\n+\t\tvoid setConfigPaths(const Ogre::StringVector &paths){\n+\t\t\tmConfigPaths = paths;\n+\t\t}\n+\t\t\n+\t\tvoid setHomePath(const Ogre::String &path){\n+\t\t\tmHomePath = path;\n+\t\t}\n \n \tprivate:\n \t\tOgre::StringVector mConfigPaths;\n"} {"commit":"1966e504e4f2de9f6e980811d9a8a38b35687631","subject":"[SofaKernel]\u00a0ADD new constructor to Colors.","message":"[SofaKernel]\u00a0ADD new constructor to Colors.\n\nIt is possible to write stuff like that:\nRGBAColor::white() == RGBAColor(1,1,1,1);\n","repos":"Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa,FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,hdeling\/sofa,hdeling\/sofa,hdeling\/sofa,FabienPean\/sofa,FabienPean\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,FabienPean\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,hdeling\/sofa,hdeling\/sofa,FabienPean\/sofa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- SofaKernel\/framework\/sofa\/defaulttype\/Color.h\n+++ SofaKernel\/framework\/sofa\/defaulttype\/Color.h\n@@ -48,6 +48,16 @@\n static RGBAColor fromVec4(const Vec4d color) ;\n static bool read(const std::string& str, RGBAColor& color) ;\n \n+ static RGBAColor white() { return RGBAColor(1.0,1.0,1.0,1.0); }\n+ static RGBAColor black() { return RGBAColor(0.0,0.0,0.0,1.0); }\n+ static RGBAColor red() { return RGBAColor(1.0,0.0,0.0,1.0); }\n+ static RGBAColor green() { return RGBAColor(0.0,1.0,0.0,1.0); }\n+ static RGBAColor blue() { return RGBAColor(0.0,0.0,1.0,1.0); }\n+ static RGBAColor cyan() { return RGBAColor(0.0,1.0,1.0,1.0); }\n+ static RGBAColor magenta() { return RGBAColor(1.0,0.0,1.0,1.0); }\n+ static RGBAColor yellow() { return RGBAColor(1.0,1.0,0.0,1.0); }\n+ static RGBAColor gray() { return RGBAColor(0.5,0.5,0.5,1.0); }\n+\n double& r(){ return x() ; }\n double& g(){ return y() ; }\n double& b(){ return z() ; }\n"} {"commit":"19deaeb4b6ad957812e806c86565c53438bbc016","subject":"x Buffer_Offset is now int64u for handling repositioning with big atoms","message":"x Buffer_Offset is now int64u for handling repositioning with big atoms\n\ngit-svn-id: 294f12855175db510999321cff72188496f07bec@704 45c5ae6f-87cc-4fd0-92ee-e4f023fd80da\n","repos":"JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,tribouille\/MediaInfoLib,tribouille\/MediaInfoLib,tribouille\/MediaInfoLib,tribouille\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,tribouille\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,tribouille\/MediaInfoLib,MediaArea\/MediaInfoLib,MediaArea\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,JeromeMartinez\/MediaInfoLib,MediaArea\/MediaInfoLib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Source\/MediaInfo\/File__Analyze_MinimizeSize.h\n+++ Source\/MediaInfo\/File__Analyze_MinimizeSize.h\n@@ -483,7 +483,7 @@\n \/\/ Unknown\r\n \/\/***************************************************************************\r\n \r\n- inline void Skip_XX(int64u Bytes, const char*) {Element_Offset+=(size_t)Bytes;}\r\n+ inline void Skip_XX(int64u Bytes, const char*) {Element_Offset+=Bytes;}\r\n \r\n \/\/***************************************************************************\r\n \/\/ Flags\r\n"} {"commit":"546d87288fe60e7689e6f317e248e054e7f20470","subject":"deprecate unused OgreAtomicObject","message":"deprecate unused OgreAtomicObject","repos":"paroj\/ogre,paroj\/ogre,OGRECave\/ogre,OGRECave\/ogre,paroj\/ogre,paroj\/ogre,OGRECave\/ogre,paroj\/ogre,OGRECave\/ogre,OGRECave\/ogre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- OgreMain\/include\/OgreAtomicObject.h\n+++ OgreMain\/include\/OgreAtomicObject.h\n@@ -40,7 +40,8 @@\n \/** \\addtogroup General\n * @{\n *\/\n- template <class T> class AtomicObject {\n+ \/\/\/ @deprecated do not use\n+ template <class T> class OGRE_DEPRECATED AtomicObject {\n \n public:\n \n"} {"commit":"e36705d215464478f4abdae4e66700357f88cf98","subject":"Avoid advertising private activities in PEP","message":"Avoid advertising private activities in PEP\n\n\n20070821163001-53eee-d7a74883964fc757f72b88e89f2758b3ed1503e4.gz\n","repos":"jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conn-olpc.c\n+++ src\/conn-olpc.c\n@@ -178,6 +178,9 @@\n return TRUE;\n }\n \n+typedef void (*ActivityInfoChangeCallback) (ActivityInfo *info,\n+ gpointer user_data, GError *error);\n+\n static void\n decrement_contacts_activities_list_foreach (TpHandleSet *set,\n TpHandle handle,\n@@ -571,7 +574,6 @@\n TpHandleRepoIface *room_repo = tp_base_connection_get_handles (\n (TpBaseConnection *) conn, TP_HANDLE_TYPE_ROOM);\n TpHandle from_handle;\n- TpIntSetIter iter = { NULL, 0 };\n \n activities_node = lm_message_node_find_child (msg->node, \"activities\");\n activities = g_ptr_array_new ();\n@@ -694,8 +696,9 @@\n \n if (invited_activities != NULL)\n {\n- g_assert (tp_handle_set_peek (invited_activities) != NULL);\n- tp_intset_iter_init (&iter, tp_handle_set_peek (invited_activities));\n+ TpIntSetIter iter = TP_INTSET_ITER_INIT (tp_handle_set_peek\n+ (invited_activities));\n+\n while (tp_intset_iter_next (&iter))\n {\n if (tp_handle_set_is_member (activities_list, iter.element))\n@@ -847,6 +850,60 @@\n }\n }\n \n+\/* FIXME: API could be improved *\/\n+static gboolean\n+upload_activities_pep (GabbleConnection *conn,\n+ GabbleConnectionMsgReplyFunc callback,\n+ gpointer user_data,\n+ GError **error)\n+{\n+ TpBaseConnection *base = (TpBaseConnection *) conn;\n+ LmMessageNode *publish;\n+ LmMessage *msg = pubsub_make_publish_msg (NULL, NS_OLPC_ACTIVITIES,\n+ NS_OLPC_ACTIVITIES, \"activities\", &publish);\n+ TpHandleSet *my_activities = g_hash_table_lookup\n+ (conn->olpc_pep_activities, GUINT_TO_POINTER (base->self_handle));\n+ GError *e = NULL;\n+ gboolean ret;\n+\n+ if (my_activities != NULL)\n+ {\n+ TpIntSetIter iter = TP_INTSET_ITER_INIT (tp_handle_set_peek\n+ (my_activities));\n+\n+ while (tp_intset_iter_next (&iter))\n+ {\n+ ActivityInfo *info = g_hash_table_lookup (conn->olpc_activities_info,\n+ GUINT_TO_POINTER (iter.element));\n+ LmMessageNode *activity_node;\n+\n+ g_assert (info != NULL);\n+ if (!activity_info_is_visible (info))\n+ continue;\n+\n+ activity_node = lm_message_node_add_child (publish,\n+ \"activity\", \"\");\n+ lm_message_node_set_attributes (activity_node,\n+ \"type\", info->id,\n+ \"room\", activity_info_get_room (info),\n+ NULL);\n+ }\n+ }\n+\n+ ret = _gabble_connection_send_with_reply (conn, msg, callback, NULL,\n+ user_data, &e);\n+\n+ if (!ret)\n+ {\n+ g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR,\n+ \"Failed to send property change request to server: %s\", e->message);\n+ g_error_free (e);\n+ }\n+\n+ lm_message_unref (msg);\n+ return ret;\n+}\n+\n static LmHandlerResult\n set_activities_reply_cb (GabbleConnection *conn,\n LmMessage *sent_msg,\n@@ -858,6 +915,8 @@\n \n if (!check_publish_reply_msg (reply_msg, context))\n return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n+\n+ \/* FIXME: emit ActivitiesChanged? *\/\n \n gabble_svc_olpc_buddy_info_return_from_set_activities (context);\n return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n@@ -999,6 +1058,9 @@\n }\n \n lm_message_unref (msg);\n+\n+ \/* FIXME: what if we were advertising properties for things that\n+ * we've declared are no longer in our activities list? *\/\n }\n \n gboolean\n@@ -1308,6 +1370,63 @@\n activity_info_contribute_properties (info, node, TRUE);\n }\n \n+\/* FIXME: API could be improved *\/\n+static gboolean\n+upload_activity_properties_pep (GabbleConnection *conn,\n+ GabbleConnectionMsgReplyFunc callback,\n+ gpointer user_data,\n+ GError **error)\n+{\n+ LmMessageNode *publish;\n+ LmMessage *msg = pubsub_make_publish_msg (NULL, NS_OLPC_ACTIVITY_PROPS,\n+ NS_OLPC_ACTIVITY_PROPS, \"activities\", &publish);\n+ GError *e = NULL;\n+ gboolean ret;\n+\n+ g_hash_table_foreach (conn->olpc_activities_info, set_activity_properties,\n+ publish);\n+\n+ ret = _gabble_connection_send_with_reply (conn, msg, callback, NULL,\n+ user_data, &e);\n+\n+ if (!ret)\n+ {\n+ g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR,\n+ \"Failed to send property change request to server: %s\", e->message);\n+ g_error_free (e);\n+ }\n+\n+ lm_message_unref (msg);\n+ return ret;\n+}\n+\n+static LmHandlerResult\n+set_activity_properties_activities_reply_cb (GabbleConnection *conn,\n+ LmMessage *sent_msg,\n+ LmMessage *reply_msg,\n+ GObject *object,\n+ gpointer user_data)\n+{\n+ DBusGMethodInvocation *context = user_data;\n+\n+ \/* if the SetProperties() call was skipped, both messages are NULL *\/\n+ g_assert ((sent_msg == NULL) == (reply_msg == NULL));\n+\n+ if (reply_msg != NULL && !check_publish_reply_msg (reply_msg, context))\n+ return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n+\n+ \/* FIXME: emit ActivityPropertiesChanged? *\/\n+\n+ gabble_svc_olpc_activity_properties_return_from_set_properties (context);\n+\n+ return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n+}\n+\n+typedef struct {\n+ DBusGMethodInvocation *context;\n+ gboolean visibility_changed;\n+} set_properties_ctx;\n+\n static LmHandlerResult\n set_activity_properties_reply_cb (GabbleConnection *conn,\n LmMessage *sent_msg,\n@@ -1315,13 +1434,36 @@\n GObject *object,\n gpointer user_data)\n {\n- DBusGMethodInvocation *context = user_data;\n-\n- if (!check_publish_reply_msg (reply_msg, context))\n- return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n-\n- gabble_svc_olpc_activity_properties_return_from_set_properties (context);\n-\n+ set_properties_ctx *context = user_data;\n+\n+ \/* if the SetProperties() call was skipped, both messages are NULL *\/\n+ g_assert ((sent_msg == NULL) == (reply_msg == NULL));\n+\n+ if (reply_msg == NULL ||\n+ check_publish_reply_msg (reply_msg, context->context))\n+ {\n+ \/* FIXME: set the activities list if needed *\/\n+ if (context->visibility_changed)\n+ {\n+ GError *err = NULL;\n+\n+ if (!upload_activities_pep (conn,\n+ set_activity_properties_activities_reply_cb,\n+ context->context, &err))\n+ {\n+ dbus_g_method_return_error (context->context, err);\n+ g_error_free (err);\n+ }\n+ }\n+ else\n+ {\n+ \/* nothing to do, so just \"succeed\" *\/\n+ set_activity_properties_activities_reply_cb (conn, NULL, NULL, NULL,\n+ context->context);\n+ }\n+ }\n+\n+ g_slice_free (set_properties_ctx, context);\n return LM_HANDLER_RESULT_REMOVE_MESSAGE;\n }\n \n@@ -1334,12 +1476,13 @@\n GabbleConnection *conn = GABBLE_CONNECTION (iface);\n TpBaseConnection *base = (TpBaseConnection *) conn;\n LmMessage *msg;\n- LmMessageNode *publish;\n const gchar *jid;\n GHashTable *properties_copied;\n ActivityInfo *info;\n GabbleMucChannel *muc_channel;\n guint state;\n+ gboolean was_visible, is_visible;\n+ set_properties_ctx *ctx;\n \n DEBUG (\"called\");\n \n@@ -1383,7 +1526,12 @@\n \n info = g_hash_table_lookup (conn->olpc_activities_info,\n GUINT_TO_POINTER (room));\n+\n+ was_visible = activity_info_is_visible (info);\n+\n activity_info_set_properties (info, properties_copied);\n+\n+ is_visible = activity_info_is_visible (info);\n \n msg = lm_message_new (jid, LM_MESSAGE_TYPE_MESSAGE);\n activity_info_contribute_properties (info, msg->node, FALSE);\n@@ -1398,26 +1546,31 @@\n }\n lm_message_unref (msg);\n \n- msg = pubsub_make_publish_msg (NULL,\n- NS_OLPC_ACTIVITY_PROPS,\n- NS_OLPC_ACTIVITY_PROPS,\n- \"activities\",\n- &publish);\n-\n- g_hash_table_foreach (conn->olpc_activities_info, set_activity_properties,\n- publish);\n-\n- if (!_gabble_connection_send_with_reply (conn, msg,\n- set_activity_properties_reply_cb, NULL, context, NULL))\n- {\n- GError error = { TP_ERRORS, TP_ERROR_NETWORK_ERROR,\n- \"Failed to send property change request to server\" };\n-\n- lm_message_unref (msg);\n- dbus_g_method_return_error (context, &error);\n- }\n-\n- lm_message_unref (msg);\n+ \/* FIXME: send update to people we previously invited too *\/\n+\n+ ctx = g_slice_new (set_properties_ctx);\n+ ctx->context = context;\n+ ctx->visibility_changed = (was_visible != is_visible);\n+\n+ if (was_visible || is_visible)\n+ {\n+ GError *err = NULL;\n+\n+ if (!upload_activity_properties_pep (conn,\n+ set_activity_properties_reply_cb, ctx, &err))\n+ {\n+ g_slice_free (set_properties_ctx, ctx);\n+ dbus_g_method_return_error (context, err);\n+ g_error_free (err);\n+ return;\n+ }\n+ }\n+ else\n+ {\n+ \/* chain straight to the reply callback, which changes our Activities\n+ * list *\/\n+ set_activity_properties_reply_cb (conn, NULL, NULL, NULL, ctx);\n+ }\n }\n \n static void\n@@ -1857,6 +2010,7 @@\n }\n }\n \/* FIXME: do the same for our activities PEP node *\/\n+ \/* FIXME: re-invite people we invited *\/\n \n return TRUE;\n }\n@@ -1916,6 +2070,9 @@\n }\n }\n lm_message_unref (msg);\n+\n+ \/* FIXME: remember we invited them, so we can ping them again if it\n+ * changes *\/\n }\n \n static void\n"} {"commit":"f66b76f49472668d982c10fa48c71493466ad4d7","subject":"update","message":"update\n","repos":"ke-sun\/velodyne_puck","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/constants.h\n+++ src\/constants.h\n@@ -41,6 +41,11 @@\n return (id % 2 == 0) ? id \/ 2 : id \/ 2 + kFiringsPerFiringSequence \/ 2;\n }\n \n+inline int Index2LaserId(int index) {\n+ const auto half = kFiringsPerFiringSequence \/ 2;\n+ return (index < half) ? index * 2 : (index - half) * 2 + 1;\n+}\n+\n static constexpr uint16_t kMaxRawAzimuth = 35999;\n static constexpr float kAzimuthResolution = 0.01;\n \n"} {"commit":"5a2e5e4b0bffe09e999a33c8a8e910a6929ebeab","subject":"fix bug","message":"fix bug\n","repos":"JamisHoo\/OurSQL-DBMS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/db_fields.h\n+++ src\/db_fields.h\n@@ -173,7 +173,7 @@\n }\n case TYPE_CHAR: \n case TYPE_UCHAR:\n- if (str.length() > length) return 2;\n+ if (str.length() > length + 2) return 2;\n memcpy(buff, str.data(), str.length());\n return 0;\n case TYPE_FLOAT: {\n"} {"commit":"6f751afc56f8edb0acffa9f42ce1dc50b26edfbb","subject":"Add a PLATFORM(WIN) check for NO_ERROR, attempted build fix","message":"Add a PLATFORM(WIN) check for NO_ERROR, attempted build fix\n\ngit-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@54664 bbb929c8-8fbe-4397-9dbb-9b2b20218538","repos":"primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs,primiano\/blink-gitcs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- WebCore\/platform\/graphics\/GraphicsContext3D.h\n+++ WebCore\/platform\/graphics\/GraphicsContext3D.h\n@@ -33,7 +33,7 @@\n #include <wtf\/PassOwnPtr.h>\n \n \/\/ FIXME: Find a better way to avoid the name confliction for NO_ERROR.\n-#if PLATFORM(CHROMIUM) && OS(WINDOWS)\n+#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN))\n #undef NO_ERROR\n #endif\n \n"} {"commit":"d48ee42020a15b4f9e5b3743ef579d59dc785a6f","subject":"adding AliESDtrackCuts which provides the possibility to cut in quality parameters, track-to-vertex and kinematic parameters.","message":"adding AliESDtrackCuts which provides the possibility to cut in quality parameters,\ntrack-to-vertex and kinematic parameters.\n\n","repos":"pbuehler\/AliPhysics,mbjadhav\/AliPhysics,carstooon\/AliPhysics,ALICEHLT\/AliPhysics,fbellini\/AliPhysics,fcolamar\/AliPhysics,fcolamar\/AliPhysics,lfeldkam\/AliPhysics,jgronefe\/AliPhysics,amaringarcia\/AliPhysics,dlodato\/AliPhysics,pchrista\/AliPhysics,fbellini\/AliPhysics,mvala\/AliPhysics,SHornung1\/AliPhysics,ppribeli\/AliPhysics,rderradi\/AliPhysics,lcunquei\/AliPhysics,rderradi\/AliPhysics,AMechler\/AliPhysics,mpuccio\/AliPhysics,amatyja\/AliPhysics,pbatzing\/AliPhysics,lcunquei\/AliPhysics,fcolamar\/AliPhysics,nschmidtALICE\/AliPhysics,SHornung1\/AliPhysics,dstocco\/AliPhysics,rihanphys\/AliPhysics,lcunquei\/AliPhysics,carstooon\/AliPhysics,lfeldkam\/AliPhysics,victor-gonzalez\/AliPhysics,akubera\/AliPhysics,preghenella\/AliPhysics,pbatzing\/AliPhysics,mkrzewic\/AliPhysics,dmuhlhei\/AliPhysics,akubera\/AliPhysics,hzanoli\/AliPhysics,fcolamar\/AliPhysics,amatyja\/AliPhysics,mbjadhav\/AliPhysics,AMechler\/AliPhysics,mkrzewic\/AliPhysics,rderradi\/AliPhysics,carstooon\/AliPhysics,kreisl\/AliPhysics,victor-gonzalez\/AliPhysics,rbailhac\/AliPhysics,dstocco\/AliPhysics,hzanoli\/AliPhysics,alisw\/AliPhysics,ppribeli\/AliPhysics,ppribeli\/AliPhysics,mazimm\/AliPhysics,amatyja\/AliPhysics,mbjadhav\/AliPhysics,victor-gonzalez\/AliPhysics,pchrista\/AliPhysics,pbuehler\/AliPhysics,victor-gonzalez\/AliPhysics,hcab14\/AliPhysics,rihanphys\/AliPhysics,alisw\/AliPhysics,btrzecia\/AliPhysics,amaringarcia\/AliPhysics,aaniin\/AliPhysics,hcab14\/AliPhysics,mazimm\/AliPhysics,hzanoli\/AliPhysics,SHornung1\/AliPhysics,preghenella\/AliPhysics,pbuehler\/AliPhysics,alisw\/AliPhysics,preghenella\/AliPhysics,nschmidtALICE\/AliPhysics,mkrzewic\/AliPhysics,kreisl\/AliPhysics,ppribeli\/AliPhysics,akubera\/AliPhysics,dstocco\/AliPhysics,akubera\/AliPhysics,aaniin\/AliPhysics,jmargutt\/AliPhysics,mazimm\/AliPhysics,jmargutt\/AliPhysics,nschmidtALICE\/AliPhysics,rihanphys\/AliPhysics,AudreyFrancisco\/AliPhysics,dstocco\/AliPhysics,dmuhlhei\/AliPhysics,dmuhlhei\/AliPhysics,carstooon\/AliPhysics,rbailhac\/AliPhysics,carstooon\/AliPhysics,dlodato\/AliPhysics,AMechler\/AliPhysics,ALICEHLT\/AliPhysics,fbellini\/AliPhysics,sebaleh\/AliPhysics,mbjadhav\/AliPhysics,hzanoli\/AliPhysics,dmuhlhei\/AliPhysics,adriansev\/AliPhysics,jgronefe\/AliPhysics,dlodato\/AliPhysics,mvala\/AliPhysics,jgronefe\/AliPhysics,alisw\/AliPhysics,yowatana\/AliPhysics,sebaleh\/AliPhysics,mbjadhav\/AliPhysics,fcolamar\/AliPhysics,pbuehler\/AliPhysics,aaniin\/AliPhysics,kreisl\/AliPhysics,kreisl\/AliPhysics,lcunquei\/AliPhysics,SHornung1\/AliPhysics,lfeldkam\/AliPhysics,ppribeli\/AliPhysics,AMechler\/AliPhysics,rihanphys\/AliPhysics,pbatzing\/AliPhysics,lfeldkam\/AliPhysics,sebaleh\/AliPhysics,dmuhlhei\/AliPhysics,pchrista\/AliPhysics,ALICEHLT\/AliPhysics,pbuehler\/AliPhysics,lcunquei\/AliPhysics,pbatzing\/AliPhysics,ppribeli\/AliPhysics,mazimm\/AliPhysics,carstooon\/AliPhysics,mkrzewic\/AliPhysics,btrzecia\/AliPhysics,dstocco\/AliPhysics,dmuhlhei\/AliPhysics,carstooon\/AliPhysics,SHornung1\/AliPhysics,aaniin\/AliPhysics,pbatzing\/AliPhysics,dlodato\/AliPhysics,mvala\/AliPhysics,dmuhlhei\/AliPhysics,hcab14\/AliPhysics,mazimm\/AliPhysics,sebaleh\/AliPhysics,aaniin\/AliPhysics,mbjadhav\/AliPhysics,fcolamar\/AliPhysics,adriansev\/AliPhysics,adriansev\/AliPhysics,AudreyFrancisco\/AliPhysics,preghenella\/AliPhysics,sebaleh\/AliPhysics,pbuehler\/AliPhysics,dlodato\/AliPhysics,btrzecia\/AliPhysics,alisw\/AliPhysics,mpuccio\/AliPhysics,adriansev\/AliPhysics,mbjadhav\/AliPhysics,nschmidtALICE\/AliPhysics,alisw\/AliPhysics,AMechler\/AliPhysics,pbuehler\/AliPhysics,mazimm\/AliPhysics,alisw\/AliPhysics,jmargutt\/AliPhysics,amaringarcia\/AliPhysics,kreisl\/AliPhysics,AMechler\/AliPhysics,fbellini\/AliPhysics,nschmidtALICE\/AliPhysics,yowatana\/AliPhysics,pchrista\/AliPhysics,jgronefe\/AliPhysics,ALICEHLT\/AliPhysics,adriansev\/AliPhysics,dstocco\/AliPhysics,aaniin\/AliPhysics,pchrista\/AliPhysics,adriansev\/AliPhysics,ALICEHLT\/AliPhysics,rderradi\/AliPhysics,ppribeli\/AliPhysics,yowatana\/AliPhysics,mvala\/AliPhysics,amaringarcia\/AliPhysics,jgronefe\/AliPhysics,mvala\/AliPhysics,yowatana\/AliPhysics,dlodato\/AliPhysics,lfeldkam\/AliPhysics,rbailhac\/AliPhysics,hcab14\/AliPhysics,hzanoli\/AliPhysics,lcunquei\/AliPhysics,rbailhac\/AliPhysics,preghenella\/AliPhysics,fbellini\/AliPhysics,fbellini\/AliPhysics,sebaleh\/AliPhysics,rbailhac\/AliPhysics,btrzecia\/AliPhysics,akubera\/AliPhysics,yowatana\/AliPhysics,btrzecia\/AliPhysics,rbailhac\/AliPhysics,jmargutt\/AliPhysics,jmargutt\/AliPhysics,AMechler\/AliPhysics,mpuccio\/AliPhysics,lcunquei\/AliPhysics,rbailhac\/AliPhysics,SHornung1\/AliPhysics,mpuccio\/AliPhysics,jmargutt\/AliPhysics,rihanphys\/AliPhysics,amaringarcia\/AliPhysics,hcab14\/AliPhysics,rihanphys\/AliPhysics,mkrzewic\/AliPhysics,victor-gonzalez\/AliPhysics,sebaleh\/AliPhysics,rderradi\/AliPhysics,amaringarcia\/AliPhysics,rderradi\/AliPhysics,amatyja\/AliPhysics,rihanphys\/AliPhysics,rderradi\/AliPhysics,fbellini\/AliPhysics,AudreyFrancisco\/AliPhysics,SHornung1\/AliPhysics,preghenella\/AliPhysics,mkrzewic\/AliPhysics,nschmidtALICE\/AliPhysics,preghenella\/AliPhysics,pbatzing\/AliPhysics,AudreyFrancisco\/AliPhysics,lfeldkam\/AliPhysics,mpuccio\/AliPhysics,kreisl\/AliPhysics,mpuccio\/AliPhysics,mkrzewic\/AliPhysics,AudreyFrancisco\/AliPhysics,fcolamar\/AliPhysics,yowatana\/AliPhysics,ALICEHLT\/AliPhysics,jgronefe\/AliPhysics,mazimm\/AliPhysics,victor-gonzalez\/AliPhysics,amatyja\/AliPhysics,mvala\/AliPhysics,amatyja\/AliPhysics,amatyja\/AliPhysics,nschmidtALICE\/AliPhysics,adriansev\/AliPhysics,pchrista\/AliPhysics,dlodato\/AliPhysics,hcab14\/AliPhysics,dstocco\/AliPhysics,AudreyFrancisco\/AliPhysics,mvala\/AliPhysics,hzanoli\/AliPhysics,btrzecia\/AliPhysics,mpuccio\/AliPhysics,akubera\/AliPhysics,pbatzing\/AliPhysics,kreisl\/AliPhysics,jmargutt\/AliPhysics,yowatana\/AliPhysics,amaringarcia\/AliPhysics,victor-gonzalez\/AliPhysics,ALICEHLT\/AliPhysics,lfeldkam\/AliPhysics,AudreyFrancisco\/AliPhysics,akubera\/AliPhysics,hzanoli\/AliPhysics,aaniin\/AliPhysics,btrzecia\/AliPhysics,pchrista\/AliPhysics,hcab14\/AliPhysics,jgronefe\/AliPhysics","returncode":1,"stderr":"error: pathspec 'PWG0\/esdTrackCuts\/AliESDtrackCuts.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- PWG0\/esdTrackCuts\/AliESDtrackCuts.h\n+++ PWG0\/esdTrackCuts\/AliESDtrackCuts.h\n@@ -0,0 +1,157 @@\n+#ifndef ALIESDTRACKCUTS_H\n+#define ALIESDTRACKCUTS_H\n+\n+\/\/**************************************************************** \n+\/\/\n+\/\/ Class for handling of ESD track cuts\n+\/\/\n+\/\/ TODO: \n+\/\/ - add functionality to save and load cuts\n+\/\/ - fix the n sigma cut so it is really a n sigma cut\n+\/\/ - add different ways to make track to vertex cut\n+\/\/ - add histograms for kinematic cut variables?\n+\/\/ - upper and lower cuts for all (non-boolean) cuts\n+\/\/ - update print method\n+\/\/ - is there a smarter way to manage the cuts?\n+\/\/\n+\n+#ifndef ROOT_TObject\n+#include \"TObject.h\"\n+#endif\n+#ifndef ROOT_TTree\n+#include \"TTree.h\"\n+#endif\n+#ifndef ROOT_TH2\n+#include \"TH2.h\"\n+#endif\n+\n+#include \"AliESD.h\"\n+#include \"AliESDtrack.h\"\n+#include \"AliLog.h\"\n+\n+class AliESDtrackCuts : public TObject \n+{\n+protected:\n+\n+ \/\/######################################################\n+ \/\/ esd track quality cuts\n+ static const Int_t fNCuts = 21;\n+ Char_t* fCutNames[21];\n+\n+ Int_t fCut_MinNClusterTPC; \/\/ min number of tpc clusters\n+ Int_t fCut_MinNClusterITS; \/\/ min number of its clusters \n+\n+ Float_t fCut_MaxChi2PerClusterTPC; \/\/ max tpc fit chi2 per tpc cluster\n+ Float_t fCut_MaxChi2PerClusterITS; \/\/ max its fit chi2 per its cluster\n+\n+ Float_t fCut_MaxC11; \/\/ max resolutions of covariance matrix diag. elements\n+ Float_t fCut_MaxC22;\n+ Float_t fCut_MaxC33;\n+ Float_t fCut_MaxC44;\n+ Float_t fCut_MaxC55;\n+ \n+ Bool_t fCut_AcceptKinkDaughters; \/\/ accepting kink daughters?\n+ Bool_t fCut_RequireTPCRefit; \/\/ require TPC refit\n+ Bool_t fCut_RequireITSRefit; \/\/ require ITS refit\n+ \n+ \/\/ track to vertex cut\n+ Float_t fCut_NsigmaToVertex; \/\/ max number of estimated sigma from track-to-vertex\n+ Bool_t fCut_SigmaToVertexRequired; \/\/ cut track if sigma from track-to-vertex could not be calculated\n+\n+ \/\/ esd kinematics cuts\n+ Float_t fPMin, fPMax; \/\/ definition of the range of the P\n+ Float_t fPtMin, fPtMax; \/\/ definition of the range of the Pt\n+ Float_t fPxMin, fPxMax; \/\/ definition of the range of the Px\n+ Float_t fPyMin, fPyMax; \/\/ definition of the range of the Py\n+ Float_t fPzMin, fPzMax; \/\/ definition of the range of the Pz\n+ Float_t fEtaMin, fEtaMax; \/\/ definition of the range of the eta\n+ Float_t fRapMin, fRapMax; \/\/ definition of the range of the y\n+\n+ \/\/######################################################\n+ \/\/ array of accepted ESD tracks\n+\n+ TObjArray* fAcceptedTracks; \/\/ List of accepted esd tracks after cuts\n+\n+\n+ \/\/######################################################\n+ \/\/ diagnostics histograms\n+ Bool_t fHistogramsOn;\n+\n+ TH1F** hNClustersITS;\n+ TH1F** hNClustersTPC;\n+ \n+ TH1F** hChi2PerClusterITS;\n+ TH1F** hChi2PerClusterTPC;\n+\n+ TH1F** hC11;\n+ TH1F** hC22;\n+ TH1F** hC33;\n+ TH1F** hC44;\n+ TH1F** hC55;\n+\n+ TH1F** hDXY;\n+ TH1F** hDZ;\n+ TH2F** hDXYvsDZ;\n+\n+ TH1F** hDXYNormalized;\n+ TH1F** hDZNormalized;\n+ TH2F** hDXYvsDZNormalized;\n+\n+ TH1F* hCutStatistics;\n+ TH2F* hCutCorrelation;\n+ \n+\n+ \/\/ dummy array\n+ Int_t fIdxInt[200];\n+\n+public:\n+ AliESDtrackCuts();\n+ \n+ Bool_t AcceptTrack(AliESDtrack* esdTrack);\n+ Bool_t AcceptTrack(AliESDtrack* esdTrack, AliESDVertex* esdVtx, Double_t field);\n+ Bool_t AcceptTrack(AliESDtrack* esdTrack, Double_t* vtx, Double_t* vtx_res, Double_t field);\n+ Bool_t AcceptTrack(AliESDtrack* esdTrack, AliESDVertex* esdVtx, Float_t field)\n+ {return AcceptTrack(esdTrack,esdVtx, Double_t(field));}\n+\n+ TObjArray* GetAcceptedTracks(AliESD* esd);\n+\n+ \/\/######################################################\n+ \/\/ track quality cut setters \n+ void SetMinNClustersTPC(Int_t min=-1) {fCut_MinNClusterTPC=min;}\n+ void SetMinNClustersITS(Int_t min=-1) {fCut_MinNClusterITS=min;}\n+ void SetMaxChi2PerClusterTPC(Float_t max=1e99) {fCut_MaxChi2PerClusterTPC=max;}\n+ void SetMaxChi2PerClusterITS(Float_t max=1e99) {fCut_MaxChi2PerClusterITS=max;}\n+ void SetRequireTPCRefit(Bool_t b=kFALSE) {fCut_RequireTPCRefit=b;}\n+ void SetRequireITSRefit(Bool_t b=kFALSE) {fCut_RequireITSRefit=b;}\n+ void SetAcceptKingDaughters(Bool_t b=kFALSE) {fCut_AcceptKinkDaughters=b;}\n+ void SetMaxCovDiagonalElements(Float_t c1=1e99, Float_t c2=1e99, Float_t c3=1e99, Float_t c4=1e99, Float_t c5=1e99) \n+ {fCut_MaxC11=c1; fCut_MaxC22=c2; fCut_MaxC33=c3; fCut_MaxC44=c4; fCut_MaxC55=c5;}\n+ \n+ \/\/ track to vertex cut setters\n+ void SetMinNsigmaToVertex(Float_t sigma=1e99) {fCut_NsigmaToVertex = sigma;}\n+ void SetRequireSigmaToVertex(Bool_t b=kTRUE ) {fCut_SigmaToVertexRequired = b;}\n+ \n+ \/\/ track kinmatic cut setters \n+ void SetPRange(Float_t r1=0, Float_t r2=1e99) {fPMin=r1; fPMax=r2;}\n+ void SetPtRange(Float_t r1=0, Float_t r2=1e99) {fPtMin=r1; fPtMax=r2;}\n+ void SetPxRange(Float_t r1=-1e99, Float_t r2=1e99) {fPxMin=r1; fPxMax=r2;}\n+ void SetPyRange(Float_t r1=-1e99, Float_t r2=1e99) {fPyMin=r1; fPyMax=r2;}\n+ void SetPzRange(Float_t r1=-1e99, Float_t r2=1e99) {fPzMin=r1; fPzMax=r2;}\n+ void SetEtaRange(Float_t r1=-1e99, Float_t r2=1e99) {fEtaMin=r1; fEtaMax=r2;}\n+ void SetRapRange(Float_t r1=-1e99, Float_t r2=1e99) {fRapMin=r1; fRapMax=r2;}\n+\n+ \/\/######################################################\n+ void SetHistogramsOn(Bool_t b=kFALSE) {fHistogramsOn = b;}\n+ void DefineHistograms(Int_t color=1);\n+ void SaveHistograms(Char_t* dir=\"track_selection\");\n+ \n+ void Print();\n+\n+ \/\/ void SaveQualityCuts(Char_t* file)\n+ \/\/ void LoadQualityCuts(Char_t* file)\n+\n+ ClassDef(AliESDtrackCuts,0)\n+};\n+\n+\n+#endif\n"} {"commit":"e17ae97991ecbbb21a56e0b76416d3540f156cd7","subject":"added getFieldOrDefault()","message":"added getFieldOrDefault()","repos":"richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart,richardeakin\/Cinder-Dart","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/cidart\/DartTypes.h\n+++ src\/cidart\/DartTypes.h\n@@ -66,6 +66,16 @@\n \treturn result;\n }\n \n+template <typename T>\n+T getFieldOrDefault( Dart_Handle container, const std::string &name, const T &defaultValue )\n+{\n+\tDart_Handle fieldHandle = cidart::getField( container, name );\n+\tif( Dart_IsNull( fieldHandle ) )\n+\t\treturn defaultValue;\n+\telse\n+\t\treturn cidart::getValue<T>( fieldHandle );\n+}\n+\n bool hasFunction( Dart_Handle handle, const std::string &name );\n Dart_Handle callFunction( Dart_Handle target, const std::string &name, int numArgs = 0, Dart_Handle *args = nullptr );\n \n"} {"commit":"b21a62502a2e40ddbadcb3af6e06ff935dade061","subject":"Make the WindowType enum work in C programs.","message":"Make the WindowType enum work in C programs.","repos":"abainbridge\/deadfrog-lib,abainbridge\/deadfrog-lib,abainbridge\/deadfrog-lib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/df_window.h\n+++ src\/df_window.h\n@@ -75,11 +75,11 @@\n } DfWindow;\r\n \r\n \r\n-enum WindowType\r\n+typedef enum\r\n {\r\n WT_FULLSCREEN = 0,\r\n WT_WINDOWED = 1\r\n-};\r\n+} WindowType;\r\n \r\n \r\n DLL_API DfWindow *g_window;\r\n"} {"commit":"c54f0cc6de1b07cf182779e2e036fa9d7bd08a8a","subject":"dict: Show number of clients in process title","message":"dict: Show number of clients in process title\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/dict\/main.c\n+++ src\/dict\/main.c\n@@ -83,13 +83,16 @@\n \n int main(int argc, char *argv[])\n {\n+\tconst enum master_service_flags service_flags =\n+\t\tMASTER_SERVICE_FLAG_UPDATE_PROCTITLE;\n \tconst struct setting_parser_info *set_roots[] = {\n \t\t&dict_setting_parser_info,\n \t\tNULL\n \t};\n \tconst char *error;\n \n-\tmaster_service = master_service_init(\"dict\", 0, &argc, &argv, \"\");\n+\tmaster_service = master_service_init(\"dict\", service_flags,\n+\t\t\t\t\t &argc, &argv, \"\");\n \tif (master_getopt(master_service) > 0)\n \t\treturn FATAL_DEFAULT;\n \n"} {"commit":"d66ed6f324072140948380fadb5559697d8bc810","subject":"cmd\/dist: fix build","message":"cmd\/dist: fix build\n\nThe Unix and Plan 9 readfile call breset(b) but Windows was not,\nleaving dregs in the buffer.\n\nTBR=golang-dev\nCC=golang-dev\nhttps:\/\/codereview.appspot.com\/7229069","repos":"abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/dist\/windows.c\n+++ src\/cmd\/dist\/windows.c\n@@ -530,6 +530,7 @@\n \tHANDLE h;\n \tRune *r;\n \n+\tbreset(b);\n \tif(vflag > 2)\n \t\terrprintf(\"read %s\\n\", file);\n \ttorune(&r, file);\n"} {"commit":"9488646f2c44af85f7fe11f6fdb6ba82363cf5db","subject":"cmd\/dist: Make windows.c's fatal() print to stderr","message":"cmd\/dist: Make windows.c's fatal() print to stderr\n\nGenerating env.bat using dist env -wp > env.bat failed silently\nif case of an error, because the message was redirected to env.bat.\nVerbose messages still go to stdout, causing problems, but that's\na seperate change.\nMade errprintf() identical to xprintf(), except for the output handle.\nYes, it's duplicate code, but most of the function is unpacking\nthe argument list and preparing it for WriteFile(), which has to be\ndone anyway.\n\nR=golang-dev, alex.brainman\nCC=golang-dev\nhttp:\/\/codereview.appspot.com\/6343047\n\nCommitter: Alex Brainman <54ba58c8441b5eff861de6b4e5ee46baf086b142@gmail.com>\n","repos":"Triskite\/willstone-goclone,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,bryanxu\/go-zh,rflanagan\/reginaldflanagan-project1,bryanxu\/go-zh,bryanxu\/go-zh,mhennings\/marcohennings-go,d0f\/go-zh,mhennings\/marcohennings-go,webfd\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,webfd\/go-zh,d0f\/go-zh,rdp\/rogerpack2005-golang,scirelli\/scirelli-go,scirelli\/scirelli-go,bryanxu\/go-zh,rflanagan\/reginaldflanagan-project1,scirelli\/scirelli-go,webfd\/go-zh,rdp\/rogerpack2005-golang,webfd\/go-zh,d0f\/go-zh,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,webfd\/go-zh,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,rdp\/rogerpack2005-golang,webfd\/go-zh,rdp\/rogerpack2005-golang,bryanxu\/go-zh,scirelli\/scirelli-go,rflanagan\/reginaldflanagan-project1,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,d0f\/go-zh,d0f\/go-zh,bryanxu\/go-zh,d0f\/go-zh,rflanagan\/reginaldflanagan-project1,rflanagan\/reginaldflanagan-project1,rdp\/rogerpack2005-golang,Triskite\/willstone-goclone,sanjosh\/sanjos100-tipc,d0f\/go-zh,rflanagan\/reginaldflanagan-project1,Triskite\/willstone-goclone,mhennings\/marcohennings-go,Triskite\/willstone-goclone,Triskite\/willstone-goclone,Triskite\/willstone-goclone,scirelli\/scirelli-go,bryanxu\/go-zh,webfd\/go-zh,rflanagan\/reginaldflanagan-project1,rdp\/rogerpack2005-golang,scirelli\/scirelli-go,glycerine\/jeaten-go-arrayof-structof,scirelli\/scirelli-go,Triskite\/willstone-goclone,Triskite\/willstone-goclone,mhennings\/marcohennings-go,rflanagan\/reginaldflanagan-project1,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,scirelli\/scirelli-go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/dist\/windows.c\n+++ src\/cmd\/dist\/windows.c\n@@ -119,6 +119,22 @@\n \t\tnil, code, 0, (Rune*)&r, 0, nil);\n \ttoutf(&b, r);\n \treturn bstr(&b); \/\/ leak but we're dying anyway\n+}\n+\n+static void\n+errprintf(char *fmt, ...) {\n+\tva_list arg;\n+\tchar *p;\n+\tDWORD n, w;\n+\n+\tva_start(arg, fmt);\n+\tn = vsnprintf(NULL, 0, fmt, arg);\n+\tp = xmalloc(n+1);\n+\tvsnprintf(p, n+1, fmt, arg);\n+\tva_end(arg);\n+\tw = 0;\n+\tWriteFile(GetStdHandle(STD_ERROR_HANDLE), p, n, &w, 0);\n+\txfree(p);\n }\n \n void\n@@ -709,7 +725,7 @@\n \tvsnprintf(buf1, sizeof buf1, msg, arg);\n \tva_end(arg);\n \n-\txprintf(\"go tool dist: %s\\n\", buf1);\n+\terrprintf(\"go tool dist: %s\\n\", buf1);\n \t\n \tbgwait();\n \tExitProcess(1);\n"} {"commit":"d0ce8deb4775dc061c519bfc9042c6850a847f05","subject":"Update documentation.","message":"Update documentation.\n","repos":"tarbrain\/ActorKit,jkrumow\/ActorKit,jkrumow\/ActorKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Pod\/Supervision\/TBActorSupervisor.h\n+++ Pod\/Supervision\/TBActorSupervisor.h\n@@ -15,7 +15,7 @@\n \/**\n * This block helps to create an actor.\n *\n- * @param actor A pointer to the actor to create.\n+ * @return The created actor.\n *\/\n typedef NSObject * _Nonnull (^TBActorCreationBlock)(void);\n \n"} {"commit":"916783d776f8853c3c513c96f3b8bf673b0fa89f","subject":"win32 header ordering","message":"win32 header ordering\n","repos":"wtfbbqhax\/libdnet,wtfbbqhax\/libdnet,kbandla\/libdnet,jncornett\/libdnet,kbandla\/libdnet,wtfbbqhax\/libdnet,jncornett\/libdnet,jncornett\/libdnet,kbandla\/libdnet","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/eth-win32.c\n+++ src\/eth-win32.c\n@@ -8,6 +8,8 @@\n \n #include \"config.h\"\n \n+#include \"dnet.h\"\n+\n \/* XXX - VC++ 6.0 bogosity *\/\n #define sockaddr_storage sockaddr\n #include <Packet32.h>\n@@ -16,8 +18,6 @@\n \n #include <errno.h>\n #include <stdlib.h>\n-\n-#include \"dnet.h\"\n \n struct eth_handle {\n \tLPADAPTER\t lpa;\n"} {"commit":"d24ed2abd040b0572150dadd565b3b3da674cacd","subject":"Workaround for subprocess select\/pipe hang on OSX.","message":"Workaround for subprocess select\/pipe hang on OSX.\n\nSet pipe fds to non-blocking and wake up every 500 ms. Try to make\nprogress but also check non-blockingly for process exit via\nwaitpid(..., WNOHANG).\n\nCloses GH-53\n","repos":"bmharper\/tundra,bmharper\/tundra,bmharper\/tundra,bmharper\/tundra,deplinenoise\/tundra,deplinenoise\/tundra,deplinenoise\/tundra","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/exec_unix.c\n+++ src\/exec_unix.c\n@@ -21,6 +21,7 @@\n \n #include \"portable.h\"\n #include \"config.h\"\n+#include \"util.h\"\n \n #if defined(TUNDRA_UNIX)\n \n@@ -28,6 +29,7 @@\n #include <stdio.h>\n #include <stdlib.h>\n #include <string.h>\n+#include <fcntl.h>\n \n #include <unistd.h>\n #include <sys\/stat.h>\n@@ -147,6 +149,16 @@\n \/* Data block for text kept on the side rather than inside the line_buffer\n * structure; otherwise every line_buffer access would be a cache miss. *\/\n static char buffer_data[LINEBUF_COUNT][LINEBUF_SIZE];\n+\n+static void set_fd_nonblocking(int fd)\n+{\n+\tint flags;\n+\t\n+\tflags = fcntl(fd, F_GETFL);\n+\tflags |= O_NONBLOCK;\n+\tif (-1 == fcntl(fd, F_SETFL, flags))\n+\t\ttd_croak(\"couldn't unblock fd %d\", fd);\n+}\n \n int\n td_init_exec(void)\n@@ -255,6 +267,8 @@\n \t}\n \n \tif (1 == count)\n+\t\tpthread_cond_signal(&can_print);\n+\telse if (count > 1)\n \t\tpthread_cond_broadcast(&can_print);\n \n #if LINEBUF_DEBUG\n@@ -276,7 +290,12 @@\n \tcount = read(fd, text, LINEBUF_SIZE);\n \n \tif (count <= 0)\n-\t\treturn -1;\n+\t{\n+\t\tif (EAGAIN == errno)\n+\t\t\treturn 0;\n+\t\telse\n+\t\t\treturn -1;\n+\t}\n \n \ttd_mutex_lock_or_die(&linelock);\n \n@@ -476,6 +495,9 @@\n \t\trfds[0] = stdout_pipe[pipe_read];\n \t\trfds[1] = stderr_pipe[pipe_read];\n \n+\t\tset_fd_nonblocking(rfds[0]);\n+\t\tset_fd_nonblocking(rfds[1]);\n+\n \t\t\/* Close write end of the pipe, we're just going to be reading *\/\n \t\tclose(stdout_pipe[pipe_write]);\n \t\tclose(stderr_pipe[pipe_write]);\n@@ -486,6 +508,7 @@\n \t\t\tint fd;\n \t\t\tint count;\n \t\t\tint max_fd = 0;\n+\t\t\tstruct timeval timeout;\n \n \t\t\tFD_ZERO(&read_fds);\n \n@@ -500,35 +523,47 @@\n \t\t\t}\n \n \t\t\t++max_fd;\n-\n-\t\t\tcount = select(max_fd, &read_fds, NULL, NULL, NULL);\n+\t\t\t\n+\t\t\ttimeout.tv_sec = 0;\n+\t\t\ttimeout.tv_usec = 500000;\n+\n+\t\t\tcount = select(max_fd, &read_fds, NULL, NULL, &timeout);\n \n \t\t\tif (-1 == count) \/\/ happens in gdb due to syscall interruption\n \t\t\t\tcontinue;\n \n \t\t\tfor (fd = 0; fd < 2; ++fd)\n \t\t\t{\n-\t\t\t\tif (!FD_ISSET(rfds[fd], &read_fds))\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tif (0 == emit_data(job_id, \/*is_stderr:*\/ 1 == fd, sort_key++, rfds[fd]))\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\t\/* Done with this FD. *\/\n-\t\t\t\trfds[fd] = 0;\n-\t\t\t\t--rfd_count;\n+\t\t\t\tif (0 != rfds[fd] && FD_ISSET(rfds[fd], &read_fds))\n+\t\t\t\t{\n+\t\t\t\t\tif (0 != emit_data(job_id, \/*is_stderr:*\/ 1 == fd, sort_key++, rfds[fd]))\n+\t\t\t\t\t{\n+\t\t\t\t\t\t\/* Done with this FD. *\/\n+\t\t\t\t\t\trfds[fd] = 0;\n+\t\t\t\t\t\t--rfd_count;\n+\t\t\t\t\t}\n+\t\t\t\t}\n \t\t\t}\n+\n+\t\t\tp = waitpid(child, &return_code, WNOHANG);\n+\n+\t\t\tif (0 == p)\n+\t\t\t{\n+\t\t\t\t\/* child still running *\/\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\telse if (p != child)\n+\t\t\t{\n+\t\t\t\treturn_code = 1;\n+\t\t\t\tperror(\"waitpid failed\");\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t\tbreak;\n \t\t}\n \n \t\tclose(stdout_pipe[pipe_read]);\n \t\tclose(stderr_pipe[pipe_read]);\n-\n-\t\tp = waitpid(child, &return_code, 0);\n-\t\tif (p != child)\n-\t\t{\n-\t\t\tperror(\"waitpid failed\");\n-\t\t\treturn 1;\n-\t\t}\n \n \t\ton_job_exit(job_id);\n \t\n"} {"commit":"a4a8cf6256a1ba5840327813f425f1d257832503","subject":"minor error message change","message":"minor error message change\n","repos":"jeeb\/flac,jeeb\/flac,jeeb\/flac,jeeb\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/flac\/main.c\n+++ src\/flac\/main.c\n@@ -639,7 +639,7 @@\n \t\t\t\t\treturn usage_error(\"ERROR: --%s must be a number\\n\", long_option);\n \t\t\t\toption_values.format_input_size = (off_t)i;\n \t\t\t\tif(option_values.format_input_size != i) \/* check if off_t is smaller than long long *\/\n-\t\t\t\t\treturn usage_error(\"ERROR: --%s too large; this flac does not support filesizes over 2GB\\n\", long_option);\n+\t\t\t\t\treturn usage_error(\"ERROR: --%s too large; this build of flac does not support filesizes over 2GB\\n\", long_option);\n \t\t\t\tif(option_values.format_input_size <= 0)\n \t\t\t\t\treturn usage_error(\"ERROR: --%s must be > 0\\n\", long_option);\n \t\t\t}\n"} {"commit":"4a4aafc1bfcd7394680a185a8dcefed6f9990fb7","subject":"slist: validate separator position to avoid buffer overflow","message":"slist: validate separator position to avoid buffer overflow\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@treasure-data.com>\n","repos":"fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/flb_slist.c\n+++ src\/flb_slist.c\n@@ -95,6 +95,10 @@\n if (end < 0) {\n end = len - i;\n }\n+ else if (end == i) {\n+ i++;\n+ continue;\n+ }\n \n p_init = (char *) str + i;\n p_end = p_init + end - 1;\n@@ -103,6 +107,7 @@\n while (*p_init == ' ') {\n p_init++;\n }\n+\n while (*p_end == ' ' && p_end >= p_init) {\n p_end--;\n }\n"} {"commit":"06d21e99fffeb1d3faaba93ef7c1d34d132ab7c4","subject":"Added core location kit file.","message":"Added core location kit file.\n","repos":"idapgroup\/CoreLocationKit,idapgroup\/CoreLocationKit,idapgroup\/CoreLocationKit,idapgroup\/CoreLocationKit","returncode":1,"stderr":"error: pathspec 'src\/IDPCoreLocationKit.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- src\/IDPCoreLocationKit.h\n+++ src\/IDPCoreLocationKit.h\n@@ -0,0 +1 @@\n+#import \"IDPLocationManager.h\""} {"commit":"13d077353bbc461447272f79057d3fa60eb033d1","subject":"Revert \"fu-engine: Set a device when checking requirements for fu_engine_get_result_from_component\"","message":"Revert \"fu-engine: Set a device when checking requirements for fu_engine_get_result_from_component\"\n\nThis reverts commit e4d52866d1c0d935edf1c7fc859b8a5685fdf0ff.\n","repos":"hughsie\/fwupd,fwupd\/fwupd,fwupd\/fwupd,hughsie\/fwupd,hughsie\/fwupd,fwupd\/fwupd,fwupd\/fwupd,hughsie\/fwupd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fu-engine.c\n+++ src\/fu-engine.c\n@@ -3726,7 +3726,7 @@\n \t}\n \n \t\/* check we can install it *\/\n-\ttask = fu_install_task_new (dev, component);\n+\ttask = fu_install_task_new (NULL, component);\n \tif (!fu_engine_check_requirements (self, request, task,\n \t\t\t\t\t FWUPD_INSTALL_FLAG_NONE,\n \t\t\t\t\t error))\n"} {"commit":"1bf7ff9966c76945bf9257cdd1e98c3c48fbe7b9","subject":"trivial: Fix a debugging typo","message":"trivial: Fix a debugging typo\n","repos":"hughsie\/fwupd,vathpela\/fwupd,vathpela\/fwupd,vathpela\/fwupd,fwupd\/fwupd,vathpela\/fwupd,fwupd\/fwupd,hughsie\/fwupd,hughsie\/fwupd,hughsie\/fwupd,fwupd\/fwupd,fwupd\/fwupd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fu-plugin.c\n+++ src\/fu-plugin.c\n@@ -1252,7 +1252,7 @@\n \t\/* optional *\/\n \tg_module_symbol (priv->module, \"fu_plugin_device_registered\", (gpointer *) &func);\n \tif (func != NULL) {\n-\t\tg_debug (\"performing device_added() on %s\", priv->name);\n+\t\tg_debug (\"performing fu_plugin_device_registered() on %s\", priv->name);\n \t\tfunc (plugin, device);\n \t}\n }\n"} {"commit":"51c11b07943a6bbe9bde2141f9731f53b0eecb81","subject":"[gc] Actually fix errors, and avoid build errors. Whiteknight--","message":"[gc] Actually fix errors, and avoid build errors. Whiteknight--\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@40024 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"gitster\/parrot,fernandobrito\/parrot,tewk\/parrot-select,gagern\/parrot,tkob\/parrot,FROGGS\/parrot,tewk\/parrot-select,youprofit\/parrot,gitster\/parrot,gitster\/parrot,fernandobrito\/parrot,fernandobrito\/parrot,FROGGS\/parrot,tewk\/parrot-select,parrot\/parrot,tkob\/parrot,gagern\/parrot,fernandobrito\/parrot,youprofit\/parrot,gagern\/parrot,FROGGS\/parrot,youprofit\/parrot,youprofit\/parrot,fernandobrito\/parrot,gitster\/parrot,tkob\/parrot,gagern\/parrot,tkob\/parrot,parrot\/parrot,gitster\/parrot,gitster\/parrot,tkob\/parrot,tkob\/parrot,fernandobrito\/parrot,FROGGS\/parrot,FROGGS\/parrot,gagern\/parrot,FROGGS\/parrot,parrot\/parrot,tkob\/parrot,tewk\/parrot-select,fernandobrito\/parrot,youprofit\/parrot,youprofit\/parrot,gagern\/parrot,FROGGS\/parrot,gagern\/parrot,youprofit\/parrot,tkob\/parrot,youprofit\/parrot,parrot\/parrot,tewk\/parrot-select,FROGGS\/parrot,tewk\/parrot-select,parrot\/parrot,gitster\/parrot,tewk\/parrot-select","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/gc\/gc_inf.c\n+++ src\/gc\/gc_inf.c\n@@ -163,7 +163,7 @@\n static void *\n gc_inf_get_free_object(SHIM_INTERP, ARGMOD(Small_Object_Pool *pool))\n {\n- ASSERTARGS(gc_inf_get_free_object)\n+ ASSERT_ARGS(gc_inf_get_free_object)\n return calloc(pool->object_size, 1);\n }\n \n"} {"commit":"9b7d6e8a855c432130b358d80eaeebd363f35f9b","subject":"added Haswell support for Intel_GetSpeed()","message":"added Haswell support for Intel_GetSpeed()\n","repos":"Volkanite\/Push,Volkanite\/Push","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/push[exe]\/Hardware\/CPU\/intel.c\n+++ source\/push[exe]\/Hardware\/CPU\/intel.c\n@@ -166,6 +166,7 @@\n busSpeed = 266.0f;\n break;\n case 0x2A: \/\/ Intel Core i5, i7 2xxx LGA1155 (32nm) - SandyBridge\n+ case 0x3C: \/\/ Intel Core i5, i7 4xxx LGA1150 (22nm) - Haswell\n default:\n CPU_ReadMsr(FSB_CLOCK_VCC, &eax, &edx);\n multiplier = (eax >> 8) & 0xff;\n"} {"commit":"186cc8804cd02273db1f334e56e0f4ff6725920e","subject":"Fix `heap_cap` case for new cap growth strageory","message":"Fix `heap_cap` case for new cap growth strageory\n","repos":"hit9\/C-Snip,hit9\/C-Snip","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/heap_test.c\n+++ src\/heap_test.c\n@@ -50,7 +50,7 @@\n assert(heap_push(heap, (void *)&b) == HEAP_OK);\n assert(heap_cap(heap) == 2);\n assert(heap_push(heap, (void *)&c) == HEAP_OK);\n- assert(heap_cap(heap) == 3);\n+ assert(heap_cap(heap) == 4);\n heap_free(heap);\n }\n \n"} {"commit":"e8cc3fd205295e47e71dace989e7db685461ac6d","subject":"Test the GLX version define before trying to compile GLX 1.3 stuff.","message":"Test the GLX version define before trying to compile GLX 1.3 stuff.\n\n","repos":"cmiss\/cmgui,cmiss\/cmgui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/three_d_drawing\/dm_interface.c\n+++ source\/three_d_drawing\/dm_interface.c\n@@ -7,10 +7,11 @@\n This provides a Cmgui interface to the Digital Media libraries on the SGI\n ******************************************************************************\/\n \/* These calls should be available in every system with GLX 1.3 or greater.\n-\tThe code should still run on an older GLX even if it is compiled on a GLX 1.3.\n-\tUndefine if you need to compile on an older GLX. *\/\n+\tThe code should still run on an older GLX even if it is compiled on a GLX 1.3. *\/\n+#if defined (GLX_VERSION_1_3)\n #define GLX_pbuffer 1\n #define GLX_fbconfig 1\n+#endif \/* defined (GLX_VERSION_1_3) *\/\n \n #if defined (SGI_DIGITAL_MEDIA)\n \/*???SAB. This is defined here because needed in a header file *\/\n"} {"commit":"d26a810ebf9e419556a60bdc0a4190883c38f4c4","subject":"Use an unsigned char for bool if we don't use the native bool.","message":"Use an unsigned char for bool if we don't use the native bool.\n\nOn (rare) platforms where sizeof(bool) > 1, we need to use our own\nbool, but imported c99 code (such as Ryu) may want to use bool values\nas array subscripts, which elicits warnings if bool is defined as\nchar. Using unsigned char instead should work just as well for our\npurposes, and avoid such warnings.\n\nPer buildfarm members prariedog and locust.\n","repos":"lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,50wu\/gpdb,lisakowen\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,50wu\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,lisakowen\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/include\/c.h\n+++ src\/include\/c.h\n@@ -305,7 +305,7 @@\n #else\n \n #ifndef bool\n-typedef char bool;\n+typedef unsigned char bool;\n #endif\n \n #ifndef true\n"} {"commit":"317e18abd2aa69390dcc6a0d6760ba954597863e","subject":"Remove Data Sharing between input and output in scatter_op (#12672)","message":"Remove Data Sharing between input and output in scatter_op (#12672)\n\n* Remove Data Sharing between input and output in scatter_op\r\n\r\n* Removed data sharing in backward op\r\n","repos":"chengduoZH\/Paddle,reyoung\/Paddle,luotao1\/Paddle,QiJune\/Paddle,tensor-tang\/Paddle,PaddlePaddle\/Paddle,reyoung\/Paddle,tensor-tang\/Paddle,QiJune\/Paddle,chengduoZH\/Paddle,baidu\/Paddle,QiJune\/Paddle,luotao1\/Paddle,baidu\/Paddle,reyoung\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,reyoung\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,QiJune\/Paddle,chengduoZH\/Paddle,PaddlePaddle\/Paddle,baidu\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,QiJune\/Paddle,luotao1\/Paddle,chengduoZH\/Paddle,chengduoZH\/Paddle,reyoung\/Paddle,tensor-tang\/Paddle,baidu\/Paddle,QiJune\/Paddle,reyoung\/Paddle,PaddlePaddle\/Paddle,tensor-tang\/Paddle,luotao1\/Paddle,tensor-tang\/Paddle,baidu\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/fluid\/operators\/scatter_op.h\n+++ paddle\/fluid\/operators\/scatter_op.h\n@@ -35,7 +35,7 @@\n auto *Out = ctx.Output<Tensor>(\"Out\");\n \n \/\/ In place output: Out = X, Out[Ids] += Updates\n- Out->ShareDataWith(*X);\n+ framework::TensorCopySync(*X, ctx.GetPlace(), Out);\n \/\/ Apply ScatterUpdate: Out[index] += Updates[:]\n ScatterAssign<T>(ctx.device_context(), *Updates, *Ids, Out);\n }\n@@ -53,7 +53,7 @@\n auto *dOut = ctx.Input<Tensor>(framework::GradVarName(\"Out\"));\n \n \/\/ In place gradient: dX = dO\n- dX->ShareDataWith(*dOut);\n+ framework::TensorCopySync(*dOut, ctx.GetPlace(), dX);\n dUpdates->mutable_data<T>(ctx.GetPlace());\n \/\/ Gradient by Gather: dUpdates += dO[Ids]\n CPUGather<T>(ctx.device_context(), *dOut, *Ids, dUpdates);\n"} {"commit":"1fcf7e2d6df16f3f2f02a509e4b6ba205d0971d0","subject":"Fix comment","message":"Fix comment\n","repos":"bitcraze\/libdw1000,bitcraze\/libdw1000,bitcraze\/libdw1000","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/libdw1000.c\n+++ src\/libdw1000.c\n@@ -1272,7 +1272,7 @@\n \t}\n \tif(dwIsReceiveFailed(dev)) {\n \t\tdwClearReceiveStatus(dev);\n-\t\tdwRxSoftReset(dev); \/\/ Needed due to error in the RX auto-re-enable functionnality. See page 35 of DW1000 manual, v2.13.\n+\t\tdwRxSoftReset(dev); \/\/ Needed due to error in the RX auto-re-enable functionality. See page 35 of DW1000 manual, v2.13.\n \t\tif(dev->handleReceiveFailed != 0) {\n \t\t\tdev->handleReceiveFailed(dev);\n \t\t\tif(dev->permanentReceive) {\n@@ -1282,7 +1282,7 @@\n \t\t}\n \t} else if(dwIsReceiveTimeout(dev)) {\n \t\tdwClearReceiveStatus(dev);\n-\t\tdwRxSoftReset(dev); \/\/ Needed due to error in the RX auto-re-enable functionnality. See page 35 of DW1000 manual, v2.13.\n+\t\tdwRxSoftReset(dev); \/\/ Needed due to error in the RX auto-re-enable functionality. See page 35 of DW1000 manual, v2.13.\n \t\tif(dev->handleReceiveTimeout != 0) {\n \t\t\t(*dev->handleReceiveTimeout)(dev);\n \t\t\tif(dev->permanentReceive) {\n"} {"commit":"d841eb901c210cdb95a12f91d81af5582895be94","subject":"PR #7403 from Avishag: Fix for RS5-8921 pyrelsense crash after stopping sensors","message":"PR #7403 from Avishag: Fix for RS5-8921 pyrelsense crash after stopping sensors\n\n","repos":"IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/mf\/mf-uvc.h\n+++ src\/mf\/mf-uvc.h\n@@ -134,7 +134,7 @@\n CComPtr<IAMVideoProcAmp> _video_proc = nullptr;\n std::unordered_map<int, CComPtr<IKsControl>> _ks_controls;\n \n- manual_reset_event _is_flushed;\n+ auto_reset_event _is_flushed;\n manual_reset_event _has_started;\n HRESULT _readsample_result = S_OK;\n \n"} {"commit":"3965be54621d653c2bcfd602085d6902c15eaf9b","subject":"NA-OFI: ignore EIO of fi_cq_readerr","message":"NA-OFI: ignore EIO of fi_cq_readerr\n\nIn race condition of msg sending and target failure, fi_cq_readerr() returns\nFI_EIO, do not return error in that case but log a debug message instead\n","repos":"mercury-hpc\/mercury,mercury-hpc\/mercury,mercury-hpc\/mercury,mercury-hpc\/mercury","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/na\/na_ofi.c\n+++ src\/na\/na_ofi.c\n@@ -3367,6 +3367,13 @@\n cq_event[0].tag = cq_err.tag;\n src_addr[0] = tmp_addr;\n event_num = 1;\n+ } else if (cq_err.err == FI_EIO) {\n+ NA_LOG_DEBUG(\"fi_cq_readerr got err: %d(%s), \"\n+ \"prov_errno: %d(%s).\",\n+ cq_err.err, fi_strerror(cq_err.err),\n+ cq_err.prov_errno,\n+ fi_strerror(-cq_err.prov_errno));\n+ continue;\n } else {\n NA_LOG_ERROR(\"fi_cq_readerr got err: %d(%s), \"\n \"prov_errno: %d(%s).\",\n"} {"commit":"67ffb17982cb4de1b8502583a0830a6ab1c57bdc","subject":"Insert some spaces in the comments of openslide.c","message":"Insert some spaces in the comments of openslide.c\n","repos":"openslide\/openslide,openslide\/openslide,openslide\/openslide,openslide\/openslide","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/openslide.h\n+++ src\/openslide.h\n@@ -44,6 +44,7 @@\n * Opening, reading, and closing.\n *\/\n \/\/@{\n+\n \/**\n * Do a quick check to see if a whole slide image is valid.\n *\n@@ -208,6 +209,7 @@\n * Some predefined properties.\n *\/\n \/\/@{\n+\n \/**\n * The name of the property containing a slide's comment, if any.\n *\/\n@@ -229,6 +231,7 @@\n * Querying properties.\n *\/\n \/\/@{\n+\n \/**\n * Get the NULL-terminated array of property names.\n *\n"} {"commit":"a45cf96a881b623ace8a1958a05d7e68ad356fea","subject":"Added some additional commands","message":"Added some additional commands","repos":"cbsd\/cbsd,cbsd\/cbsd,cbsd\/cbsd,cbsd\/cbsd","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/cbsdsh\/cbsdredis.c\n+++ bin\/cbsdsh\/cbsdredis.c\n@@ -38,6 +38,7 @@\n #include \"var.h\"\n #include \"cbsdredis.h\"\n \n+#define DEBUG_REDIS\n #ifdef DEBUG_REDIS\n #define DEBUG_PRINTF(...) printf(__VA_ARGS__);\n #else\n@@ -60,6 +61,14 @@\n \t\t\t}\n \t\t\treturn(-1); \/\/ retry\n \n+\t\tcase CREDIS_ERR_PROTOCOL:\n+\t\t\tif(strncmp(\"WRONGTYPE\", credis_errorreply(res), 8) == 0){\n+\t\t\t\tprintf(\"Invalid data type!\\n\");\n+\t\t\t}else if(strncmp(\"ERR \", credis_errorreply(res), 4) == 0){\n+\t\t\t\tprintf(\"Error with command, check you parameters!\\n\");\n+\t\t\t}else{\n+\t\t\t\tDEBUG_PRINTF(\"REDIS: error %d!\\n%s\\n\", num, credis_errorreply(res));\n+\t\t\t}\n \t\tcase -1: return(1); \/\/ Empty\n \n \t\tdefault:\n@@ -118,10 +127,10 @@\n \n \tfor(rc=-1; rc==-1;){\n \t\tif((res=redis_connect(true))==NULL) return(2);\n+\n \t\tcr_buffer *buf = &(redis->res->buf);\n-\n-\n \t\tbuf->len = 0;\n+\n \t\tif ((rc = credis_raw_append(buf, \"*%zu\\r\\n$%zu\\r\\n%s\\r\\n\", argc-skip, strlen(cmd), cmd)) != 0) return(rc);\n \t\tfor (i = skip+1; i < argc; i++) {\n \t\t\tif ((rc = credis_raw_append(buf, \"$%zu\\r\\n%s\\r\\n\", strlen(argv[i]), argv[i])) != 0) return(rc);\n@@ -131,25 +140,32 @@\n \t\tif((rc=redis_error(redis->res, rc)) == 0){\n \t\t\tswitch(ret_type){\n \t\t\t\tcase CR_BULK:\n-\t\t\t\t\tif(NULL != redis->res->reply.bulk) printf(\"%s\\n\",redis->res->reply.bulk);\n+\t\t\t\t\tif(NULL == redis->res->reply.bulk) return(1);\n+\n+\t\t\t\t\tprintf(\"%s\\n\",redis->res->reply.bulk);\n \t\t\t\t\treturn(0);\n \n \t\t\t\tcase CR_MULTIBULK:\n \t\t\t\t\tif(0 != redis->res->reply.multibulk.len){\n \t\t\t\t\t\tfor(i=0; i<redis->res->reply.multibulk.len; i++){\n \t\t\t\t\t\t\tif(1 & flags) setvarsafe(argv[2+i+skip], redis->res->reply.multibulk.bulks[i], 0);\n-\n \t\t\t\t\t\t\tif(4 & flags) printf(\"%s=%s\\n\",argv[2+i+skip], redis->res->reply.multibulk.bulks[i]);\n \t\t\t\t\t\t\telse if(2 & flags) printf(\"%s\\n\",redis->res->reply.multibulk.bulks[i]);\n \t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t\treturn(0);\n+\t\t\t\t\t\treturn(0);\n+\t\t\t\t\t}else return(1);\n \n \t\t\t\tcase CR_INT:\n-\t\t\t\t\treturn(redis->res->reply.integer);\n+\t\t\t\t\tif(16 & flags) printf(\"%i\\n\",redis->res->reply.integer);\n+\t\t\t\t\tif(32 & flags){\n+\t\t\t\t\t\tif(redis->res->reply.integer == 0) return(1); else return(0);\n+\t\t\t\t\t}else return(redis->res->reply.integer);\n+\t\t\t\n+\t\t\t\tcase CR_INLINE: return(0); \n+\t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\tprintf(\"-- %d\\n\", redis->res->reply.multibulk.len);\n+\t\t\t\t\tprintf(\"REDIS RESPONSE ERROR: %d\/%i\\n\", redis->res->reply.multibulk.len, redis->res->reply.integer);\n \t\t\t\t\tbreak;\n \n \t\t\t}\n@@ -157,14 +173,6 @@\n \t\t}\n \t}\n \treturn rc;\n-}\n-\n-int redis_hset(int argc, char **argv) {\n-\tif (argc < 3) {\n-\t\tprintf(\"format: hset hash key value [key2 value2]\\n\");\n-\t\treturn(1);\n-\t}\n-\treturn(redis_do(\"HSET\", CR_INT, 0, 0, argc, argv));\n }\n \n int redis_hget(int argc, char **argv) {\n@@ -187,53 +195,46 @@\n \n }\n \n-int redis_hdel(int argc, char **argv) {\n-\tif (argc < 3) {\n-\t\tprintf(\"format: hdel hash key\\n\");\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"HDEL\", CR_INT, 0, 0, argc, argv));\n-}\n-\n-int redis_kdel(int argc, char **argv) {\n-\tif (argc < 2) {\n-\t\tprintf(\"format: kdel hash\\n\");\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"DEL\", CR_INT, 0, 0, argc, argv));\n-}\n-\n-int redis_lpush(int argc, char **argv) {\n-\tif (argc < 3) {\n-\t\tprintf(\"format: %s list item\\n\", argv[0]);\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"LPUSH\", CR_INT, 0, 0, argc, argv));\n-}\n-\n-int redis_lpop(int argc, char **argv) {\n-\tif (argc < 2) {\n-\t\tprintf(\"format: %s list\\n\", argv[0]);\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"LPOP\", CR_BULK, 0, 0, argc, argv));\n-}\n-\n-int redis_rpush(int argc, char **argv) {\n-\tif (argc < 3) {\n-\t\tprintf(\"format: %s list item\\n\", argv[0]);\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"RPUSH\", CR_INT, 0, 0, argc, argv));\n-}\n-\n-int redis_rpop(int argc, char **argv) {\n-\tif (argc < 2) {\n-\t\tprintf(\"format: %s list\\n\", argv[0]);\n-\t\treturn 1;\n-\t}\n-\treturn(redis_do(\"RPOP\", CR_BULK, 0, 0, argc, argv));\n-}\n+int redis_hset(int argc, char **argv) {\n+\tif (argc < 4) {\n+\t\tprintf(\"format: hset hash key value [key value] [key value]\\n\");\n+\t\treturn(1);\n+\t}\n+\n+\tif (argc > 4) return(redis_do(\"HMSET\", CR_INLINE, 0, 0, argc, argv));\n+\treturn(redis_do(\"HSET\", CR_INT, 0, 0, argc, argv));\n+\n+}\n+\n+#define REDIS_SIMPLE(f_name,o_name,rettype,flags,params,msg) \\\n+int redis_##f_name(int argc, char **argv) { \\\n+\tif(argc < params){ printf(\"format: %s %s\\n\", argv[0], #msg); return(1); } \\\n+\treturn(redis_do(o_name, rettype, 0, flags, argc, argv)); \\\n+}\n+\n+REDIS_SIMPLE(hdel, \"HDEL\", CR_INT, 0, 3, \"hash key\");\n+REDIS_SIMPLE(kdel, \"DEL\", CR_INT, 0, 2, \"item\");\n+REDIS_SIMPLE(lpush, \"LPUSH\", CR_INT, 0, 3, \"list item\");\n+REDIS_SIMPLE(rpush, \"RPUSH\", CR_INT, 0, 3, \"list item\");\n+REDIS_SIMPLE(lpop, \"LPOP\", CR_BULK, 0, 2, \"list\");\n+REDIS_SIMPLE(rpop, \"RPOP\", CR_BULK, 0, 2, \"list\");\n+REDIS_SIMPLE(exists, \"EXISTS\", CR_INT, 32, 2, \"item\");\n+REDIS_SIMPLE(hexists,\"HEXISTS\", CR_INT, 32, 3, \"hash key\");\n+REDIS_SIMPLE(ttl, \"TTL\", CR_INT, 48, 2, \"item\");\n+REDIS_SIMPLE(expire, \"EXPIRE\", CR_INT, 32, 3, \"item timeout\");\n+REDIS_SIMPLE(publish,\"PUBLISH\", CR_INT, 48, 3, \"channel data\");\n+REDIS_SIMPLE(ltrim, \"LTRIM\", CR_INLINE, 0, 4, \"list from to\");\n+REDIS_SIMPLE(lindex, \"LINDEX\", CR_BULK, 0, 3, \"list index\");\n+REDIS_SIMPLE(llen, \"LLEN\", CR_INT, 48, 2, \"list\");\n+REDIS_SIMPLE(sadd, \"SADD\", CR_INT, 32, 3, \"set item\");\n+REDIS_SIMPLE(srem, \"SREM\", CR_INT, 32, 3, \"set item\");\n+REDIS_SIMPLE(sexists,\"SISMEMBER\",CR_INT, 32, 3, \"set item\");\n+REDIS_SIMPLE(slen, \"SCARD\", CR_INT, 48, 2, \"set\");\n+REDIS_SIMPLE(smove, \"SMOVE\", CR_INT, 32, 4, \"from-set to-set item\");\n+\n+\n+#undef REDIS_SIMPLE\n+\n \n int redis_blpop(int argc, char **argv) {\n \tREDIS\tres;\n"} {"commit":"907c28c7bf797f8720345cfdaa5d0c465f1e119b","subject":"Handle unset iconservers","message":"Handle unset iconservers\n","repos":"ThomasBollmeier\/libsocialweb-flickr-oauth,GNOME\/libsocialweb,lcp\/mojito,GNOME\/libsocialweb,ThomasBollmeier\/libsocialweb-flickr-oauth,ThomasBollmeier\/libsocialweb-flickr-oauth,GNOME\/libsocialweb,lcp\/libsocialweb,lcp\/libsocialweb,lcp\/mojito,lcp\/libsocialweb,lcp\/mojito","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sources\/flickr\/mojito-source-flickr.c\n+++ sources\/flickr\/mojito-source-flickr.c\n@@ -56,6 +56,9 @@\n construct_buddy_icon_url (RestXmlNode *node)\n {\n if (!check_attrs (node, \"iconfarm\", \"iconserver\", \"owner\", NULL))\n+ return g_strdup (\"http:\/\/www.flickr.com\/images\/buddyicon.jpg\");\n+\n+ if (atoi (rest_xml_node_get_attr (node, \"iconserver\")) == 0)\n return g_strdup (\"http:\/\/www.flickr.com\/images\/buddyicon.jpg\");\n \n return g_strdup_printf (\"http:\/\/farm{icon-farm}.static.flickr.com\/{icon-server}\/buddyicons\/{nsid}.jpg\",\n"} {"commit":"cd9e45745e41c79be0194dd91ab26761b122c002","subject":"Remove unused mojito_source_flickr_new prototype","message":"Remove unused mojito_source_flickr_new prototype\n","repos":"GNOME\/libsocialweb,lcp\/libsocialweb,GNOME\/libsocialweb,lcp\/mojito,lcp\/libsocialweb,ThomasBollmeier\/libsocialweb-flickr-oauth,lcp\/mojito,ThomasBollmeier\/libsocialweb-flickr-oauth,lcp\/mojito,lcp\/libsocialweb,ThomasBollmeier\/libsocialweb-flickr-oauth,GNOME\/libsocialweb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sources\/flickr\/mojito-source-flickr.h\n+++ sources\/flickr\/mojito-source-flickr.h\n@@ -36,8 +36,6 @@\n \n GType mojito_source_flickr_get_type (void);\n \n-MojitoSource * mojito_source_flickr_new (MojitoCore *core);\n-\n G_END_DECLS\n \n #endif \/* _MOJITO_SOURCE_FLICKR *\/\n"} {"commit":"4334da370e0efb0942c467472074798f5717c627","subject":"Recursing available on bogus answer too","message":"Recursing available on bogus answer too\n\nprovided the resolution mode is RECURSING\n","repos":"huitema\/getdns,huitema\/getdns,huitema\/getdns,huitema\/getdns","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/test\/getdns_query.c\n+++ src\/test\/getdns_query.c\n@@ -2221,6 +2221,8 @@\n \t (r = getdns_dict_set_dict(response, \"\/replies_tree\/0\/question\", dict)) ||\n \t (r = getdns_dict_set_int(response, \"\/replies_tree\/0\/header\/rcode\", GETDNS_RCODE_SERVFAIL)) ||\n \t (r = getdns_dict_set_int(response, \"\/replies_tree\/0\/header\/qr\", 1)) ||\n+\t (r = getdns_dict_set_int(response, \"\/replies_tree\/0\/header\/ra\",\n+\t msg->rt == GETDNS_RESOLUTION_RECURSING ? 1 : 0)) ||\n \t (r = getdns_dict_set_int(response, \"\/replies_tree\/0\/header\/ad\", 0))\n \t ))\n \t\tfprintf(stderr, \"Could not set answer rcode: %s\\n\",\n"} {"commit":"bf5e8e7c33d5b87b196b30db73575ac8788ff010","subject":"Fix for second add test.","message":"Fix for second add test.\n","repos":"FreeON\/spammpack,FreeON\/spammpack,FreeON\/spammpack,FreeON\/spammpack,FreeON\/spammpack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- spammpack-C\/spammpack\/src\/spamm_add.c\n+++ spammpack-C\/spammpack\/src\/spamm_add.c\n@@ -108,8 +108,8 @@\n i++;\n \n \/* Update block norms. *\/\n- for (i_block = 0; i < SPAMM_N_KERNEL_BLOCKED; i++) {\n- for (j_block = 0; j < SPAMM_N_KERNEL_BLOCKED; j++)\n+ for (i_block = 0; i_block < SPAMM_N_KERNEL_BLOCKED; i_block++) {\n+ for (j_block = 0; j_block < SPAMM_N_KERNEL_BLOCKED; j_block++)\n {\n A_data->norm2[spamm_index_norm(i_block, j_block)] = 0;\n for (k = 0; k < SPAMM_N_BLOCK*SPAMM_N_BLOCK; k++)\n@@ -140,8 +140,8 @@\n j++;\n \n \/* Update block norms. *\/\n- for (i_block = 0; i < SPAMM_N_KERNEL_BLOCKED; i++) {\n- for (j_block = 0; j < SPAMM_N_KERNEL_BLOCKED; j++)\n+ for (i_block = 0; i_block < SPAMM_N_KERNEL_BLOCKED; i_block++) {\n+ for (j_block = 0; j_block < SPAMM_N_KERNEL_BLOCKED; j_block++)\n {\n A_data->norm2[spamm_index_norm(i_block, j_block)] = 0;\n for (k = 0; k < SPAMM_N_BLOCK*SPAMM_N_BLOCK; k++)\n@@ -155,7 +155,7 @@\n }\n \n \/* Create new block in A and store it. *\/\n- spamm_hashtable_insert(A->tier_hashtable[A->kernel_tier], B_index, B_data);\n+ spamm_hashtable_insert(A->tier_hashtable[A->kernel_tier], B_index, A_data);\n }\n \n else if (A_index == B_index)\n@@ -172,9 +172,12 @@\n }\n A_data->node_norm = sqrt(A_data->node_norm2);\n \n+ i++;\n+ j++;\n+\n \/* Update block norms. *\/\n- for (i_block = 0; i < SPAMM_N_KERNEL_BLOCKED; i++) {\n- for (j_block = 0; j < SPAMM_N_KERNEL_BLOCKED; j++)\n+ for (i_block = 0; i_block < SPAMM_N_KERNEL_BLOCKED; i_block++) {\n+ for (j_block = 0; j_block < SPAMM_N_KERNEL_BLOCKED; j_block++)\n {\n A_data->norm2[spamm_index_norm(i_block, j_block)] = 0;\n for (k = 0; k < SPAMM_N_BLOCK*SPAMM_N_BLOCK; k++)\n@@ -186,9 +189,6 @@\n A_data->norm[spamm_index_norm(i_block, j_block)] = sqrt(A_data->norm[spamm_index_norm(i_block, j_block)]);\n }\n }\n-\n- i++;\n- j++;\n }\n \n else\n"} {"commit":"4a03a4a61f5127beb3b280c1980652bcd35d0105","subject":"git fails to merge","message":"git fails to merge\n","repos":"csound\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- H\/csound.h\n+++ H\/csound.h\n@@ -1148,6 +1148,7 @@\n * Notes: the caller is responsible for freeing the list returned in *lst\n * with csoundDeleteChannelList(). The name pointers may become invalid\n * after calling csoundReset().\n+<<<<<<< HEAD\n *\/\n PUBLIC int csoundListChannels(CSOUND *, CsoundChannelListEntry **lst);\n \n"} {"commit":"d7f57da0e92b758824527e47ad14cc0eec5a6d39","subject":"added definition of CS_PRINTF2 and CS_PRINTF3 if SWIG is defined as it won't pick it up from sysdep.h when SWIG goes to process","message":"added definition of CS_PRINTF2 and CS_PRINTF3 if SWIG is defined as it won't pick it up from sysdep.h when SWIG goes to process\n","repos":"ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- H\/csound.h\n+++ H\/csound.h\n@@ -124,6 +124,11 @@\n \/* Enables Python interface. *\/\n \n #ifdef SWIG\n+\/* printf-style function with second argument as format string *\/\n+# define CS_PRINTF2 __attribute__ ((__format__ (__printf__, 2, 3)))\n+\/* printf-style function with third argument as format string *\/\n+# define CS_PRINTF3 __attribute__ ((__format__ (__printf__, 3, 4)))\n+\n %module csound\n %{\n #include \"sysdep.h\"\n"} {"commit":"539dd1c0cdb92a443b8963f7e8a28c84e1b4878c","subject":"xbps-bin: when replacing pkgs only purge for pkgs that aren't going to be updated.","message":"xbps-bin: when replacing pkgs only purge for pkgs that aren't going to be updated.\n","repos":"datenwolf\/xbps,stpx\/xbps,ebfe\/xbps,ebfe\/xbps,datenwolf\/xbps,stpx\/xbps,datenwolf\/xbps,ebfe\/xbps,stpx\/xbps","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/xbps-bin\/install.c\n+++ bin\/xbps-bin\/install.c\n@@ -447,6 +447,8 @@\n \t\t\t\t \"remove `%s': %s\\n\", pkgver, strerror(rv));\n \t\t\t\treturn rv;\n \t\t\t}\n+\t\t\tif (!update)\n+\t\t\t\tcontinue;\n \t\t\tprintf(\"Purging `%s' package...\\n\", pkgver);\n \t\t\tif ((rv = xbps_purge_pkg(pkgname, false)) != 0) {\n \t\t\t\txbps_error_printf(\"xbps-bin: failed to \"\n"} {"commit":"f9a76b46efed11688cc717a8411bef33d253de5b","subject":"better randomness on MSVC","message":"better randomness on MSVC\n","repos":"toofishes\/flac,toofishes\/flac,toofishes\/flac,toofishes\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/test_seeking\/main.c\n+++ src\/test_seeking\/main.c\n@@ -228,10 +228,12 @@\n \t\treturn die_f_(\"FLAC__file_decoder_process_until_end_of_metadata() FAILED\", decoder);\n \n \tprintf(\"file's total_samples is %llu\\n\", decoder_client_data.total_samples);\n+#if !defined _MSC_VER && !defined __MINGW32__\n \tif (decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {\n \t\tprintf(\"ERROR: must be total_samples < %u\\n\", (unsigned)RAND_MAX);\n \t\treturn false;\n \t}\n+#endif\n \tn = (long int)decoder_client_data.total_samples;\n \n \t\/* if we don't have a total samples count, just guess based on the file size *\/\n@@ -239,8 +241,10 @@\n \tif(n == 0) {\n \t\t\/* 8 would imply no compression, 9 guarantees that we will get some samples off the end of the stream to test that case *\/\n \t\tn = 9 * filesize \/ (decoder_client_data.channels * decoder_client_data.bits_per_sample);\n+#if !defined _MSC_VER && !defined __MINGW32__\n \t\tif(n > RAND_MAX)\n \t\t\tn = RAND_MAX;\n+#endif\n \t}\n \n \tprintf(\"Begin seek barrage, count=%u\\n\", count);\n@@ -262,9 +266,10 @@\n \t\t}\n \t\telse {\n #if !defined _MSC_VER && !defined __MINGW32__\n-\t\t\tpos = (FLAC__uint64)(random() % n);\n+\t\t\tpos = (FLAC__uint64)(rand() % n);\n #else\n-\t\t\tpos = (FLAC__uint64)(rand() % n);\n+\t\t\t\/* RAND_MAX is only 32767 in my MSVC *\/\n+\t\t\tpos = (FLAC__uint64)((random()<<15|random()) % n);\n #endif\n \t\t}\n \n@@ -371,18 +376,22 @@\n \t\treturn die_of_(\"OggFLAC__file_decoder_process_until_end_of_metadata() FAILED\", decoder);\n \n \tprintf(\"file's total_samples is %llu\\n\", decoder_client_data.total_samples);\n+#if !defined _MSC_VER && !defined __MINGW32__\n \tif (decoder_client_data.total_samples > (FLAC__uint64)RAND_MAX) {\n \t\tprintf(\"ERROR: must be total_samples < %u\\n\", (unsigned)RAND_MAX);\n \t\treturn false;\n \t}\n+#endif\n \tn = (long int)decoder_client_data.total_samples;\n \n \t\/* if we don't have a total samples count, just guess based on the file size *\/\n \tif(n == 0) {\n \t\t\/* 8 would imply no compression, 9 guarantees that we will get some samples off the end of the stream to test that case *\/\n \t\tn = 9 * filesize \/ (decoder_client_data.channels * decoder_client_data.bits_per_sample);\n+#if !defined _MSC_VER && !defined __MINGW32__\n \t\tif(n > RAND_MAX)\n \t\t\tn = RAND_MAX;\n+#endif\n \t}\n \n \tprintf(\"Begin seek barrage, count=%u\\n\", count);\n@@ -404,9 +413,10 @@\n \t\t}\n \t\telse {\n #if !defined _MSC_VER && !defined __MINGW32__\n-\t\t\tpos = (FLAC__uint64)(random() % n);\n+\t\t\tpos = (FLAC__uint64)(rand() % n);\n #else\n-\t\t\tpos = (FLAC__uint64)(rand() % n);\n+\t\t\t\/* RAND_MAX is only 32767 in my MSVC *\/\n+\t\t\tpos = (FLAC__uint64)((random()<<15|random()) % n);\n #endif\n \t\t}\n \n"} {"commit":"fd58ff598689f6c99a6e7ecf1dfb37f86dc8bbae","subject":"Simplify BitVectorLattice.","message":"Simplify BitVectorLattice.\n\nSummary:\nCurrently, when BitVectorLattice uses the opposite lattice sometimes it implicitly converts the encoding back to the lower lattice and sometimes it does not. This is a leaky abstraction where opposite lattice has to understand how it's used to work.\n\nThis diff makes BitVectorSemiLattice completely uniform, and BitVectorLattice only uses semi-lattice opaquely. This is required before BitVectorSemiLattice can dictate its own encoding and operation.\n\nReviewed By: yuxuanchen1997\n\nDifferential Revision: D37775180\n\nfbshipit-source-id: 4640c7621bcadd6891cfbf90495d7ca54ba0ac9f\n","repos":"facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex,facebook\/redex","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sparta\/include\/FiniteAbstractDomain.h\n+++ sparta\/include\/FiniteAbstractDomain.h\n@@ -23,11 +23,7 @@\n \n namespace fad_impl {\n \n-template <typename Element,\n- size_t cardinality,\n- bool construct_opposite_lattice,\n- typename Hash,\n- typename Equal>\n+template <typename Element, size_t cardinality, typename Hash, typename Equal>\n class BitVectorSemiLattice;\n \n } \/\/ namespace fad_impl\n@@ -180,18 +176,24 @@\n namespace sparta {\n \n \/*\n- * A lattice maintains two semi-lattices internally, always use opposite\n+ * A lattice with elements encoded as bit vectors.\n+ *\n+ * This maintains two semi-lattices internally; always use the opposite\n * semi-lattice representation and calculate corresponding lower semi-lattice\n- * when needed\n+ * encoding when needed.\n *\/\n template <typename Element,\n size_t cardinality,\n typename Hash = std::hash<Element>,\n typename Equal = std::equal_to<Element>>\n class BitVectorLattice final\n- : public LatticeEncoding<Element, std::bitset<cardinality>> {\n+ : public fad_impl::BitVectorSemiLattice<Element, cardinality, Hash, Equal>::\n+ LatticeEncoding {\n+ using SemiLattice =\n+ fad_impl::BitVectorSemiLattice<Element, cardinality, Hash, Equal>;\n+\n public:\n- using Encoding = std::bitset<cardinality>;\n+ using Encoding = typename SemiLattice::Encoding;\n \n ~BitVectorLattice() {\n \/\/ The destructor is the only method that is guaranteed to be created when a\n@@ -205,44 +207,52 @@\n \"Element is not copy assignable\");\n }\n \n+ \/*\n+ * In a standard fixpoint computation the Join is by far the dominant\n+ * operation. Hence, we favor the opposite semi-lattice encoding whenever we\n+ * construct a domain element.\n+ *\n+ * However, we give the impression of operating in the given (lower) lattice\n+ * so everything below is opposite: top is bottom, join is meet, leq is geq,\n+ * etc.\n+ *\/\n+\n BitVectorLattice() = delete;\n \n BitVectorLattice(\n std::initializer_list<Element> elements,\n std::initializer_list<std::pair<Element, Element>> hasse_diagram)\n- : m_lower_semi_lattice(elements, hasse_diagram),\n- m_opposite_semi_lattice(elements, hasse_diagram) {}\n+ : m_lower_semi_lattice(\n+ elements, hasse_diagram, \/* construct_opposite_lattice *\/ false),\n+ m_opposite_semi_lattice(\n+ elements, hasse_diagram, \/* construct_opposite_lattice *\/ true) {}\n \n Encoding encode(const Element& element) const override {\n- \/\/ In a standard fixpoint computation the Join is by far the dominant\n- \/\/ operation. Hence, we favor the opposite semi-lattice encoding whenever we\n- \/\/ construct a domain element.\n return m_opposite_semi_lattice.encode(element);\n }\n \n- \/\/ Default use opposite semi-lattice for decoding.\n Element decode(const Encoding& encoding) const override {\n return m_opposite_semi_lattice.decode(encoding);\n }\n \n- Element decode_lower(const Encoding& encoding) const {\n- return m_lower_semi_lattice.decode(encoding);\n- }\n-\n- bool is_bottom(const Encoding& x) const override { return x.all(); }\n-\n- bool is_top(const Encoding& x) const override { return x.count() == 1; }\n+ bool is_bottom(const Encoding& x) const override {\n+ return m_opposite_semi_lattice.is_top(x);\n+ }\n+\n+ bool is_top(const Encoding& x) const override {\n+ return m_opposite_semi_lattice.is_bottom(x);\n+ }\n \n bool equals(const Encoding& x, const Encoding& y) const override {\n- return x == y;\n+ return m_opposite_semi_lattice.equals(x, y);\n }\n \n bool leq(const Encoding& x, const Encoding& y) const override {\n- return (x & y) == y;\n+ return m_opposite_semi_lattice.geq(x, y);\n }\n \n Encoding join(const Encoding& x, const Encoding& y) const override {\n- return x & y;\n+ return m_opposite_semi_lattice.meet(x, y);\n }\n \n Encoding meet(const Encoding& x, const Encoding& y) const override {\n@@ -251,15 +261,19 @@\n \/\/ before returning.\n auto x_lower = get_lower_encoding(x);\n auto y_lower = get_lower_encoding(y);\n- Encoding lower_encoding = x_lower & y_lower;\n+ Encoding lower_encoding = m_lower_semi_lattice.meet(x_lower, y_lower);\n return get_opposite_encoding(lower_encoding);\n }\n \n- Encoding bottom() const override { return m_opposite_semi_lattice.bottom(); }\n-\n- Encoding top() const override { return m_opposite_semi_lattice.top(); }\n+ Encoding bottom() const override { return m_opposite_semi_lattice.top(); }\n+\n+ Encoding top() const override { return m_opposite_semi_lattice.bottom(); }\n \n private:\n+ Element decode_lower(const Encoding& encoding) const {\n+ return m_lower_semi_lattice.decode(encoding);\n+ }\n+\n Encoding get_lower_encoding(const Encoding& x) const {\n const Element& element = decode(x);\n return m_lower_semi_lattice.encode(element);\n@@ -270,18 +284,8 @@\n return m_opposite_semi_lattice.encode(element);\n }\n \n- fad_impl::BitVectorSemiLattice<Element,\n- cardinality,\n- \/* construct_opposite_lattice *\/ false,\n- Hash,\n- Equal>\n- m_lower_semi_lattice;\n- fad_impl::BitVectorSemiLattice<Element,\n- cardinality,\n- \/* construct_opposite_lattice *\/ true,\n- Hash,\n- Equal>\n- m_opposite_semi_lattice;\n+ SemiLattice m_lower_semi_lattice;\n+ SemiLattice m_opposite_semi_lattice;\n };\n \n namespace fad_impl {\n@@ -341,8 +345,8 @@\n * c 0 0 1 1 = b Join c in the original\n * d 0 0 0 1 lattice\n *\n- * The template parameter 'construct_opposite_lattice' specifies the lattice to\n- * consider for the encoding.\n+ * The constructor parameter 'construct_opposite_lattice' specifies the lattice\n+ * to consider for the encoding.\n *\n * Note that constructing this representation has cubic time complexity in the\n * number of elements of the lattice. Since the construction is done only once\n@@ -350,16 +354,15 @@\n * should not be a problem in practice.\n *\n *\/\n-template <typename Element,\n- size_t cardinality,\n- bool construct_opposite_lattice,\n- typename Hash,\n- typename Equal>\n+template <typename Element, size_t cardinality, typename Hash, typename Equal>\n class BitVectorSemiLattice final {\n public:\n \/\/ The size of a bitset structure is a compile-time constant, hence the need\n \/\/ for the 'cardinality' parameter.\n using Encoding = std::bitset<cardinality>;\n+\n+ \/\/ The lattice encoding we're used to implement.\n+ using LatticeEncoding = ::sparta::LatticeEncoding<Element, Encoding>;\n \n BitVectorSemiLattice() = delete;\n \n@@ -370,7 +373,8 @@\n *\/\n BitVectorSemiLattice(\n std::initializer_list<Element> elements,\n- std::initializer_list<std::pair<Element, Element>> hasse_diagram) {\n+ std::initializer_list<std::pair<Element, Element>> hasse_diagram,\n+ bool construct_opposite_lattice) {\n RUNTIME_CHECK(elements.size() == cardinality,\n invalid_argument()\n << argument_name(\"elements\")\n@@ -457,16 +461,24 @@\n }\n \n bool is_bottom(const Encoding& x) const {\n- \/\/ In the lower semi-lattice representation the Bottom element is the unique\n- \/\/ bit vector that has only one bit set to 1, whereas in the opposite\n- \/\/ semi-lattice it has all its bits set to 1.\n- return construct_opposite_lattice ? x.all() : (x.count() == 1);\n+ \/\/ In the semi-lattice, the Bottom element is the\n+ \/\/ unique bit vector that has only one bit set to 1.\n+ return x.count() == 1;\n }\n \n bool is_top(const Encoding& x) const {\n- \/\/ The Top element is defined as the the dual of Bottom.\n- return construct_opposite_lattice ? (x.count() == 1) : x.all();\n- }\n+ \/\/ In the semi-lattice, the Top element is the\n+ \/\/ unique bit vector that has all bits set to 1.\n+ return x.all();\n+ }\n+\n+ bool equals(const Encoding& x, const Encoding& y) const { return x == y; }\n+\n+ bool geq(const Encoding& x, const Encoding& y) const {\n+ return equals(meet(x, y), y);\n+ }\n+\n+ Encoding meet(const Encoding& x, const Encoding& y) const { return x & y; }\n \n Encoding bottom() const { return m_bottom; }\n \n"} {"commit":"c37bd295f853f4e77ab0785e7dca34f031d206f5","subject":"silenced a warning","message":"silenced a warning\n","repos":"tempbottle\/primesieve,ZahidDev\/primesieve,ZahidDev\/primesieve,anatoliyrazin\/primesieve,anatoliyrazin\/primesieve,fredwang00\/primesieve,ZahidDev\/primesieve,anatoliyrazin\/primesieve,kimwalisch\/primesieve,tempbottle\/primesieve,kimwalisch\/primesieve,tempbottle\/primesieve,fredwang00\/primesieve,fredwang00\/primesieve,kimwalisch\/primesieve","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/WheelFactorization.h\n+++ src\/WheelFactorization.h\n@@ -223,7 +223,8 @@\n if (multiple == lowerBound + 1) {\n multiple += *primeNumber;\n }\n- uint32_t index = (multiple \/ *primeNumber) % WHEEL_MODULO;\n+ uint32_t index = static_cast<uint32_t> (\n+ (multiple \/ *primeNumber) % WHEEL_MODULO);\n \/\/ get the next multiple that is not divisible by one of the\n \/\/ wheel's primes (i.e. 2, 3 and 5 for a modulo 30 wheel)\n multiple += static_cast<uint64_t> (*primeNumber)\n"} {"commit":"4ad07e22331b65bd853d5924c4eea28880f0a474","subject":"Adding pragma once to header","message":"Adding pragma once to header","repos":"Torivon\/MiniAdventure,foxfields\/MiniAdventure,Torivon\/MiniAdventure,Torivon\/MiniDungeon,foxfields\/MiniAdventure,Torivon\/MiniAdventure,foxfields\/MiniAdventure,Torivon\/MiniDungeon,Torivon\/MiniDungeon","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Worker_Persistence.h\n+++ src\/Worker_Persistence.h\n@@ -1,3 +1,4 @@\n+#pragma once\n #include <pebble_worker.h>\n \n bool LoadWorkerData(void);\n"} {"commit":"8128f1bf03ea73f3c3d08936f4556b12ef0c5d72","subject":"Cluster Manager: 'call' command.","message":"Cluster Manager: 'call' command.\n","repos":"oranagra\/redis,pmem\/redis,pmem\/redis,soveran\/redis,antirez\/redis,soloestoy\/redis,antirez\/redis,soloestoy\/redis,ofirluzon\/redis,charsyam\/redis,PKRoma\/redis,spinlock\/redis,nnog\/redis,GitHubMota\/redis,yossigo\/redis,soveran\/redis,nnog\/redis,yossigo\/redis,nnog\/redis,ofirluzon\/redis,oranagra\/redis,ctripcorp\/redis,yossigo\/redis,ofirluzon\/redis,GitHubMota\/redis,antirez\/redis,ctripcorp\/redis,charsyam\/redis,spinlock\/redis,soloestoy\/redis,GitHubMota\/redis,yossigo\/redis,neomantra\/redis,GitHubMota\/redis,pmem\/redis,charsyam\/redis,ctripcorp\/redis,charsyam\/redis,oranagra\/redis,oranagra\/redis,oranagra\/redis,PKRoma\/redis,charsyam\/redis,ofirluzon\/redis,yossigo\/redis,neomantra\/redis,ofirluzon\/redis,pmem\/redis,neomantra\/redis,PKRoma\/redis,ctripcorp\/redis,soloestoy\/redis,PKRoma\/redis,soveran\/redis,neomantra\/redis,PKRoma\/redis,spinlock\/redis,soveran\/redis,soloestoy\/redis,spinlock\/redis,neomantra\/redis,nnog\/redis,antirez\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/redis-cli.c\n+++ src\/redis-cli.c\n@@ -286,6 +286,7 @@\n static int clusterManagerCommandCreate(int argc, char **argv);\n static int clusterManagerCommandInfo(int argc, char **argv);\n static int clusterManagerCommandCheck(int argc, char **argv);\n+static int clusterManagerCommandCall(int argc, char **argv);\n static int clusterManagerCommandHelp(int argc, char **argv);\n \n \/* User preferences. *\/\n@@ -1802,6 +1803,8 @@\n \"cluster-replicas\"},\n {\"info\", clusterManagerCommandInfo, -1, \"host:port\", NULL},\n {\"check\", clusterManagerCommandCheck, -1, \"host:port\", NULL},\n+ {\"call\", clusterManagerCommandCall, -2, \n+ \"host:port command arg arg .. arg\", NULL},\n {\"help\", clusterManagerCommandHelp, 0, NULL, NULL}\n };\n \n@@ -2449,6 +2452,11 @@\n return 0;\n }\n \n+\/* Retrieves info about the cluster using argument 'node' as the starting \n+ * point. All nodes will be loaded inside the cluster_manager.nodes list.\n+ * Warning: if something goes wrong, it will free the starting node before \n+ * returning 0. *\/\n+\n static int clusterManagerLoadInfoFromNode(clusterManagerNode *node, int opts) {\n if (node->context == NULL) \n CLUSTER_MANAGER_NODE_CONNECT(node);\n@@ -3113,6 +3121,56 @@\n \"address (ie. 120.0.0.1:7000) or space separated IP \"\n \"and port (ie. 120.0.0.1 7000)\\n\");\n return 0;\n+}\n+\n+static int clusterManagerCommandCall(int argc, char **argv) {\n+ int port = 0;\n+ char *ip = NULL;\n+ char *addr = argv[0];\n+ char *c = strrchr(addr, '@');\n+ int i;\n+ if (c != NULL) *c = '\\0';\n+ c = strrchr(addr, ':');\n+ if (c != NULL) {\n+ *c = '\\0';\n+ ip = addr;\n+ port = atoi(++c);\n+ } else {\n+ fprintf(stderr, \n+ \"Invalid arguments: first agrumnt must be host:port.\\n\");\n+ return 0;\n+ }\n+ clusterManagerNode *refnode = clusterManagerNewNode(ip, port);\n+ if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;\n+ argc--;\n+ argv++;\n+ size_t *argvlen = zmalloc(argc*sizeof(size_t));\n+ printf(\">>> Calling\");\n+ for (i = 0; i < argc; i++) {\n+ argvlen[i] = strlen(argv[i]);\n+ printf(\" %s\", argv[i]);\n+ }\n+ printf(\"\\n\");\n+ listIter li;\n+ listNode *ln;\n+ listRewind(cluster_manager.nodes, &li);\n+ while ((ln = listNext(&li)) != NULL) {\n+ clusterManagerNode *n = ln->value; \n+ if (!n->context) CLUSTER_MANAGER_NODE_CONNECT(n);\n+ redisReply *reply = NULL;\n+ redisAppendCommandArgv(n->context, argc, (const char **) argv, argvlen);\n+ int status = redisGetReply(n->context, (void **)(&reply));\n+ if (status != REDIS_OK || reply == NULL ) \n+ printf(\"%s:%d: Failed!\\n\", n->ip, n->port); \/\/TODO: better message?\n+ else {\n+ sds formatted_reply = cliFormatReplyTTY(reply, \"\");\n+ printf(\"%s:%d: %s\\n\", n->ip, n->port, (char *) formatted_reply);\n+ sdsfree(formatted_reply);\n+ }\n+ if (reply != NULL) freeReplyObject(reply);\n+ }\n+ zfree(argvlen);\n+ return 1;\n }\n \n static int clusterManagerCommandHelp(int argc, char **argv) {\n"} {"commit":"f239f2b5f949dc0c8942746ae705cca2d620d2da","subject":"Fix some minor bugs in redis-cli (#8982)","message":"Fix some minor bugs in redis-cli (#8982)\n\n* clusterManagerAddSlots check argv_idx error.\r\n\r\n* clusterManagerLoadInfoFromNode remove unused param opts.\r\n\r\n* redis-cli node->ip may be an sds or a c string. Using %s to format\r\nis always right, %S may be wrong.\r\n\r\n* In clusterManagerFixOpenSlot clusterManagerBumpEpoch call is redundant,\r\nbecause it is already called in clusterManagerSetSlotOwner.\r\n\r\n* redis-cli cluster help add more commands in help messages.","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/redis-cli.c\n+++ src\/redis-cli.c\n@@ -2498,7 +2498,7 @@\n char *err);\n static int clusterManagerNodeLoadInfo(clusterManagerNode *node, int opts,\n char **err);\n-static int clusterManagerLoadInfoFromNode(clusterManagerNode *node, int opts);\n+static int clusterManagerLoadInfoFromNode(clusterManagerNode *node);\n static int clusterManagerNodeIsEmpty(clusterManagerNode *node, char **err);\n static int clusterManagerGetAntiAffinityScore(clusterManagerNodeArray *ipnodes,\n int ip_count, clusterManagerNode ***offending, int *offending_len);\n@@ -3424,7 +3424,7 @@\n argv_idx++;\n }\n }\n- if (!argv_idx) {\n+ if (argv_idx == 2) {\n success = 0;\n goto cleanup;\n }\n@@ -4260,12 +4260,11 @@\n * point. All nodes will be loaded inside the cluster_manager.nodes list.\n * Warning: if something goes wrong, it will free the starting node before\n * returning 0. *\/\n-static int clusterManagerLoadInfoFromNode(clusterManagerNode *node, int opts) {\n+static int clusterManagerLoadInfoFromNode(clusterManagerNode *node) {\n if (node->context == NULL && !clusterManagerNodeConnect(node)) {\n freeClusterManagerNode(node);\n return 0;\n }\n- opts |= CLUSTER_MANAGER_OPT_GETFRIENDS;\n char *e = NULL;\n if (!clusterManagerNodeIsCluster(node, &e)) {\n clusterManagerPrintNotClusterNodeError(node, e);\n@@ -4274,7 +4273,7 @@\n return 0;\n }\n e = NULL;\n- if (!clusterManagerNodeLoadInfo(node, opts, &e)) {\n+ if (!clusterManagerNodeLoadInfo(node, CLUSTER_MANAGER_OPT_GETFRIENDS, &e)) {\n if (e) {\n CLUSTER_MANAGER_PRINT_REPLY_ERROR(node, e);\n zfree(e);\n@@ -4990,7 +4989,7 @@\n \"in node %s:%d!\\n\", slot, n->ip,\n n->port);\n char *sep = (listLength(importing) == 0 ? \"\" : \",\");\n- importing_str = sdscatfmt(importing_str, \"%s%S:%u\",\n+ importing_str = sdscatfmt(importing_str, \"%s%s:%u\",\n sep, n->ip, n->port);\n listAddNodeTail(importing, n);\n }\n@@ -5028,11 +5027,6 @@\n \/* Since CLUSTER ADDSLOTS succeeded, we also update the slot\n * info into the node struct, in order to keep it synced *\/\n owner->slots[slot] = 1;\n- \/* Make sure this information will propagate. Not strictly needed\n- * since there is no past owner, so all the other nodes will accept\n- * whatever epoch this node will claim the slot with. *\/\n- success = clusterManagerBumpEpoch(owner);\n- if (!success) goto cleanup;\n \/* Remove the owner from the list of migrating\/importing\n * nodes. *\/\n clusterManagerRemoveNodeFromList(migrating, owner);\n@@ -5872,7 +5866,7 @@\n else freeClusterManagerNode(node);\n }\n listEmpty(cluster_manager.nodes);\n- if (!clusterManagerLoadInfoFromNode(first_node, 0)) {\n+ if (!clusterManagerLoadInfoFromNode(first_node)) {\n success = 0;\n goto cleanup;\n }\n@@ -5903,7 +5897,7 @@\n ref_ip, ref_port);\n \/\/ Check the existing cluster\n clusterManagerNode *refnode = clusterManagerNewNode(ref_ip, ref_port);\n- if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(refnode)) return 0;\n if (!clusterManagerCheckCluster(0)) return 0;\n \n \/* If --cluster-master-id was specified, try to resolve it now so that we\n@@ -6000,7 +5994,7 @@\n clusterManagerNode *node = NULL;\n \n \/\/ Load cluster information\n- if (!clusterManagerLoadInfoFromNode(ref_node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(ref_node)) return 0;\n \n \/\/ Check if the node exists and is not empty\n node = clusterManagerNodeByName(node_id);\n@@ -6059,7 +6053,7 @@\n char *ip = NULL;\n if (!getClusterHostFromCmdArgs(argc, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *node = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(node)) return 0;\n clusterManagerShowClusterInfo();\n return 1;\n invalid_args:\n@@ -6072,7 +6066,7 @@\n char *ip = NULL;\n if (!getClusterHostFromCmdArgs(argc, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *node = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(node)) return 0;\n clusterManagerShowClusterInfo();\n return clusterManagerCheckCluster(0);\n invalid_args:\n@@ -6090,7 +6084,7 @@\n char *ip = NULL;\n if (!getClusterHostFromCmdArgs(argc, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *node = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(node)) return 0;\n clusterManagerCheckCluster(0);\n if (cluster_manager.errors && listLength(cluster_manager.errors) > 0) {\n fflush(stdout);\n@@ -6279,7 +6273,7 @@\n list *involved = NULL;\n if (!getClusterHostFromCmdArgs(argc, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *node = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(node)) return 0;\n int result = 1, i;\n if (config.cluster_manager_command.weight != NULL) {\n for (i = 0; i < config.cluster_manager_command.weight_argc; i++) {\n@@ -6474,7 +6468,7 @@\n }\n \/\/ Load cluster information\n clusterManagerNode *node = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(node, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(node)) return 0;\n int ok_count = 0, err_count = 0;\n \n clusterManagerLogInfo(\">>> Reconfiguring node timeout in every \"\n@@ -6544,7 +6538,7 @@\n src_ip, src_port, ip, port);\n \n clusterManagerNode *refnode = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(refnode)) return 0;\n if (!clusterManagerCheckCluster(0)) return 0;\n char *reply_err = NULL;\n redisReply *src_reply = NULL;\n@@ -6679,7 +6673,7 @@\n char *ip = NULL;\n if (!getClusterHostFromCmdArgs(1, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *refnode = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(refnode)) return 0;\n argc--;\n argv++;\n size_t *argvlen = zmalloc(argc*sizeof(size_t));\n@@ -6724,7 +6718,7 @@\n char *ip = NULL;\n if (!getClusterHostFromCmdArgs(1, argv, &ip, &port)) goto invalid_args;\n clusterManagerNode *refnode = clusterManagerNewNode(ip, port);\n- if (!clusterManagerLoadInfoFromNode(refnode, 0)) return 0;\n+ if (!clusterManagerLoadInfoFromNode(refnode)) return 0;\n int no_issues = clusterManagerCheckCluster(0);\n int cluster_errors_count = (no_issues ? 0 :\n listLength(cluster_manager.errors));\n@@ -6816,7 +6810,8 @@\n }\n }\n }\n- fprintf(stderr, \"\\nFor check, fix, reshard, del-node, set-timeout you \"\n+ fprintf(stderr, \"\\nFor check, fix, reshard, del-node, set-timeout, \"\n+ \"info, rebalance, call, import, backup you \"\n \"can specify the host and port of any working node in \"\n \"the cluster.\\n\");\n \n"} {"commit":"1b72f4b74951d6abff055e0667f18e9833fd0c72","subject":"add askpass mode","message":"add askpass mode\n\nSigned-off-by: lifubang <f7995024452b918841bf5c3fd35e341b9f47c30c@acmcoder.com>\n","repos":"oranagra\/redis,ofirluzon\/redis,soloestoy\/redis,neomantra\/redis,charsyam\/redis,oranagra\/redis,PKRoma\/redis,yossigo\/redis,soloestoy\/redis,yossigo\/redis,yossigo\/redis,charsyam\/redis,ctripcorp\/redis,neomantra\/redis,ofirluzon\/redis,oranagra\/redis,soloestoy\/redis,neomantra\/redis,soloestoy\/redis,antirez\/redis,charsyam\/redis,yossigo\/redis,antirez\/redis,neomantra\/redis,antirez\/redis,soloestoy\/redis,oranagra\/redis,ctripcorp\/redis,PKRoma\/redis,oranagra\/redis,ofirluzon\/redis,neomantra\/redis,charsyam\/redis,charsyam\/redis,ctripcorp\/redis,PKRoma\/redis,PKRoma\/redis,yossigo\/redis,PKRoma\/redis,ofirluzon\/redis,antirez\/redis,ofirluzon\/redis,ctripcorp\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/redis-cli.c\n+++ src\/redis-cli.c\n@@ -229,6 +229,7 @@\n int hotkeys;\n int stdinarg; \/* get last arg from stdin. (-x option) *\/\n char *auth;\n+ int askpass;\n char *user;\n int output; \/* output mode, see OUTPUT_* defines *\/\n sds mb_delim;\n@@ -1450,6 +1451,8 @@\n config.dbnum = atoi(argv[++i]);\n } else if (!strcmp(argv[i], \"--no-auth-warning\")) {\n config.no_auth_warning = 1;\n+ } else if (!strcmp(argv[i], \"--askpass\")) {\n+ config.askpass = 1;\n } else if ((!strcmp(argv[i],\"-a\") || !strcmp(argv[i],\"--pass\"))\n && !lastarg)\n {\n@@ -1690,6 +1693,9 @@\n \" (if both are used, this argument takes predecence).\\n\"\n \" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\\n\"\n \" --pass <password> Alias of -a for consistency with the new --user option.\\n\"\n+\" --askpass Force user to input password with mask from STDIN.\\n\"\n+\" If this argument is used, '-a' and \" REDIS_CLI_AUTH_ENV \"\\n\"\n+\" environment variable will be ignored.\\n\"\n \" -u <uri> Server URI.\\n\"\n \" -r <repeat> Execute specified command N times.\\n\"\n \" -i <interval> When -r is used, waits <interval> seconds per command.\\n\"\n@@ -7858,6 +7864,13 @@\n }\n }\n \n+static sds askPassword() {\n+ linenoiseMaskModeEnable();\n+ sds auth = linenoise(\"Please input password: \");\n+ linenoiseMaskModeDisable();\n+ return auth;\n+}\n+\n \/*------------------------------------------------------------------------------\n * Program main()\n *--------------------------------------------------------------------------- *\/\n@@ -7894,6 +7907,7 @@\n config.hotkeys = 0;\n config.stdinarg = 0;\n config.auth = NULL;\n+ config.askpass = 0;\n config.user = NULL;\n config.eval = NULL;\n config.eval_ldb = 0;\n@@ -7935,6 +7949,10 @@\n \n parseEnv();\n \n+ if (config.askpass) {\n+ config.auth = askPassword();\n+ }\n+\n #ifdef USE_OPENSSL\n if (config.tls) {\n ERR_load_crypto_strings();\n@@ -8044,4 +8062,4 @@\n } else {\n return noninteractive(argc,convertToSds(argc,argv));\n }\n-}\n+}"} {"commit":"1037d90e9f87b986acfcf1a852afce92bb39e068","subject":"crypto-plugin: add test-case to detect segfault","message":"crypto-plugin: add test-case to detect segfault\n\nIf the value does not fit into a single AES cipher block, a segfault occurs in gcrypt and OpenSSL variant\n","repos":"mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,petermax2\/libelektra,mpranj\/libelektra,e1528532\/libelektra,petermax2\/libelektra,mpranj\/libelektra,petermax2\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,petermax2\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,petermax2\/libelektra,e1528532\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,e1528532\/libelektra,mpranj\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/crypto\/test_internals.h\n+++ src\/plugins\/crypto\/test_internals.h\n@@ -28,6 +28,7 @@\n typedef int (*checkConfPtr) (Key *, KeySet *);\n \n static const char strVal[] = \"abcde\";\n+static const char strValLong[] = \"Oh loooooooooooooooooooong Johnson\";\n static const kdb_octet_t binVal[] = { 0x01, 0x02, 0x03, 0x04 };\n \n static int isMarkedForEncryption (const Key * k)\n@@ -49,6 +50,7 @@\n \tKey * kUnchanged2 = keyNew (\"user\/crypto\/test\/nochange2\", KEY_END);\n \tKey * kNull = keyNew (\"user\/crypto\/test\/mynull\", KEY_END);\n \tKey * kString = keyNew (\"user\/crypto\/test\/mystring\", KEY_END);\n+\tKey * kStringLong = keyNew (\"user\/crypto\/test\/myextralongstring\", KEY_END);\n \tKey * kBin = keyNew (\"user\/crypto\/test\/mybin\", KEY_END);\n \n \tkeySetString (kUnchanged1, strVal);\n@@ -62,10 +64,13 @@\n \tkeySetString (kString, strVal);\n \tkeySetMeta (kString, ELEKTRA_CRYPTO_META_ENCRYPT, \"1\");\n \n+\tkeySetString (kStringLong, strValLong);\n+\tkeySetMeta (kStringLong, ELEKTRA_CRYPTO_META_ENCRYPT, \"1\");\n+\n \tkeySetBinary (kBin, binVal, sizeof (binVal));\n \tkeySetMeta (kBin, ELEKTRA_CRYPTO_META_ENCRYPT, \"1\");\n \n-\treturn ksNew (5, kUnchanged1, kUnchanged2, kNull, kString, kBin, KS_END);\n+\treturn ksNew (6, kUnchanged1, kUnchanged2, kNull, kString, kStringLong, kBin, KS_END);\n }\n \n static inline void setPluginShutdown (KeySet * config)\n@@ -200,6 +205,8 @@\n \t\t\t\t\t \"encryption failed\");\n \t\t\t\tsucceed_if (memcmp (keyValue (k), strVal, MIN (keyGetValueSize (k), (ssize_t)sizeof (strVal))),\n \t\t\t\t\t \"encryption failed\");\n+\t\t\t\tsucceed_if (memcmp (keyValue (k), strValLong, MIN (keyGetValueSize (k), (ssize_t)sizeof (strValLong))),\n+\t\t\t\t\t \"encryption failed\");\n \t\t\t}\n \t\t\telse\n \t\t\t{\n"} {"commit":"9342606a43239cda9420bc1c0090988006f50404","subject":"main: Don't crash if the plugins weren't loaded","message":"main: Don't crash if the plugins weren't loaded\n\nIf we exit before the plugins engine was setup, please don't crash.\n","repos":"mediaserver2-plugins\/totem-mediaserver2,mediaserver2-plugins\/totem-mediaserver2","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"7d6e576aa455407f9ba0a9b91472e83ea70d02c4","subject":"T196 - cleanup of reductions","message":"T196 - cleanup of reductions\n\nSigned-off-by: Reto Achermann <66f6ea3e040423755b3cf26edfe6c7fb1f9adc27@inf.ethz.ch>\n","repos":"libsmelt\/libsmelt,libsmelt\/libsmelt,libsmelt\/libsmelt,libsmelt\/libsmelt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/reduction.c\n+++ src\/reduction.c\n@@ -43,23 +43,25 @@\n * does not matter. If a client would send several messages, we\n * would have circles in the tree.\n *\/\n+\n+\n+ operation(result, input);\n+ uint32_t count;\n+ struct smlt_node **nl = smlt_node_get_children(&count);\n+\n+ \/\/ Receive (this will be from several children)\n+ \/\/ --------------------------------------------------\n+ for (uint32_t i = 0; i < count; ++i) {\n+ err = smlt_node_recv(nl[i], result);\n+ \/\/ TODO: error handling\n+ result = operation(input, result);\n+ }\n+\n+ \/\/ Receive (this will be from several children)\n+ \/\/ --------------------------------------------------\n struct smlt_node *p = smlt_node_get_parent();\n- if (smlt_node_is_leaf()) { \n- smlt_node_send(p, input);\n- } else {\n- uint32_t count;\n- struct smlt_node **nl = smlt_node_get_children(&count);\n-\n- result = operation(input, NULL);\n- for (uint32_t i = 0; i < count; ++i) {\n- err = smlt_node_recv(nl[i], result);\n- \/\/ TODO: error handling\n- result = operation(input, result);\n- }\n-\n- if (!smlt_node_is_root()) {\n- smlt_node_send(p, result);\n- }\n+ if (p) { \n+ smlt_node_send(p, result);\n }\n \n return SMLT_SUCCESS;\n@@ -97,22 +99,23 @@\n * would have circles in the tree.\n *\/\n \n+\n+ \/\/ Receive (this will be from several children)\n+ \/\/ --------------------------------------------------\n+ uint32_t count;\n+ struct smlt_node **nl = smlt_node_get_children(&count);\n+\n+ for (uint32_t i = 0; i < count; ++i) {\n+ err = smlt_node_recv(nl[i], NULL);\n+ \/\/ TODO: error handling\n+ }\n+\n+ \/\/ Send (this should only be sending one message)\n+ \/\/ --------------------------------------------------\n struct smlt_node *p = smlt_node_get_parent();\n- if (smlt_node_is_leaf()) { \n+ if (p) {\n smlt_node_notify(p);\n- } else {\n- uint32_t count;\n- struct smlt_node **nl = smlt_node_get_children(&count);\n-\n- for (uint32_t i = 0; i < count; ++i) {\n- err = smlt_node_recv(nl[i], NULL);\n- \/\/ TODO: error handling\n- }\n-\n- if (!smlt_node_is_root()) {\n- smlt_node_notify(p);\n- }\n- }\n+ } \n }\n \n \n@@ -138,75 +141,3 @@\n \n return smlt_broadcast(result);\n }\n-\n-\n-\/**\n- * \\brief Implement reductions\n- *\n- * \\param val The value to be reduce by this node.\n- *\n- * \\return The result of the reduction, which is only meaningful for\n- * the root of the reduction, as given by the tree.\n- *\/\n-uintptr_t mp_reduce(uintptr_t val)\n-{\n-#ifdef HYB\n- if (!topo_does_mp(get_thread_id()))\n- return val;\n-#endif\n-\n- uintptr_t current_aggregate = val;\n-\n- \/\/ Receive (this will be from several children)\n- \/\/ --------------------------------------------------\n-\n- \/\/ Determine child bindings\n- struct binding_lst *blst = _mp_get_children_raw(get_thread_id());\n- int numbindings = blst->num;\n-\n-#ifdef QRM_DBG_ENABLED\n- coreid_t my_core_id = get_thread_id();\n- assert ((numbindings==0 && !topo_does_mp_send(my_core_id, false)) ||\n- (numbindings>0 && topo_does_mp_send(my_core_id, false)));\n-\n- if (numbindings!=0) {\n- debug_printfff(DBG__REDUCE, \"Receiving on core %d\\n\", my_core_id);\n- }\n-#endif\n-\n- \/\/ Decide to parents\n- for (int i=0; i<numbindings; i++) {\n-\n- uintptr_t v = mp_receive_raw(blst->b_reverse[i]);\n- current_aggregate += v;\n- debug_printfff(DBG__REDUCE, \"Receiving %\" PRIu64 \" from %d\\n\", v, i);\n-\n- }\n-\n- debug_printfff(DBG__REDUCE, \"Receiving done, value is now %\" PRIu64 \"\\n\",\n- current_aggregate);\n-\n- \/\/ Send (this should only be sending one message)\n- \/\/ --------------------------------------------------\n-\n- binding_lst *blst_parent = _mp_get_parent_raw(get_thread_id());\n- int pidx = blst_parent->idx[0];\n-\n-#ifdef QRM_DBG_ENABLED\n- assert ((pidx!=-1 && topo_does_mp_receive(my_core_id, false)) ||\n- (pidx==-1 && !topo_does_mp_receive(my_core_id, false)));\n-\n- assert (pidx!=-1 || my_core_id == get_sequentializer());\n-#endif\n-\n- if (pidx!=-1) {\n-\n- mp_binding *b_parent = blst_parent->b_reverse[0];\n- debug_printfff(DBG__REDUCE, \"sending %\" PRIu64 \" to parent %d\\n\",\n- current_aggregate, pidx);\n-\n- mp_send_raw(b_parent, current_aggregate);\n- }\n-\n- return current_aggregate;\n-}"} {"commit":"bc50a665148a8d326157723cbc1933920b5604b1","subject":"crypto-native: replace aesni with aes","message":"crypto-native: replace aesni with aes\n\nThis code also works on ARM so let's not use intel term....\n\nType: refactor\n\nChange-Id: Ie51d4359a83f2bf7a61c4861d486b7d009fc8057\nSigned-off-by: Damjan Marion <9141bba8b2efed526e55cf796d48631af330ad98@cisco.com>\n","repos":"chrisy\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/plugins\/crypto_native\/aes_gcm.c\n+++ src\/plugins\/crypto_native\/aes_gcm.c\n@@ -35,7 +35,7 @@\n } aes_gcm_key_data_t;\n \n static_always_inline void\n-aesni_gcm_load (u8x16 * d, u8x16u * inv, int n, int n_bytes)\n+aes_gcm_load (u8x16 * d, u8x16u * inv, int n, int n_bytes)\n {\n for (int i = 0; i < n - 1; i++)\n d[i] = inv[i];\n@@ -43,7 +43,7 @@\n }\n \n static_always_inline void\n-aesni_gcm_store (u8x16 * d, u8x16u * outv, int n, int n_bytes)\n+aes_gcm_store (u8x16 * d, u8x16u * outv, int n, int n_bytes)\n {\n for (int i = 0; i < n - 1; i++)\n outv[i] = d[i];\n@@ -54,8 +54,8 @@\n }\n \n static_always_inline void\n-aesni_gcm_enc_first_round (u8x16 * r, u32x4 * Y, u32 * ctr, u8x16 k,\n-\t\t\t int n_blocks)\n+aes_gcm_enc_first_round (u8x16 * r, u32x4 * Y, u32 * ctr, u8x16 k,\n+\t\t\t int n_blocks)\n {\n static const u32x4 last_byte_one = { 0, 0, 0, 1 << 24 };\n \n@@ -79,28 +79,28 @@\n }\n \n static_always_inline void\n-aesni_gcm_enc_round (u8x16 * r, u8x16 k, int n_blocks)\n+aes_gcm_enc_round (u8x16 * r, u8x16 k, int n_blocks)\n {\n for (int i = 0; i < n_blocks; i++)\n r[i] = aes_enc_round (r[i], k);\n }\n \n static_always_inline void\n-aesni_gcm_enc_last_round (u8x16 * r, u8x16 * d, u8x16 const *k,\n-\t\t\t int rounds, int n_blocks)\n+aes_gcm_enc_last_round (u8x16 * r, u8x16 * d, u8x16 const *k,\n+\t\t\tint rounds, int n_blocks)\n {\n \n \/* additional ronuds for AES-192 and AES-256 *\/\n for (int i = 10; i < rounds; i++)\n- aesni_gcm_enc_round (r, k[i], n_blocks);\n+ aes_gcm_enc_round (r, k[i], n_blocks);\n \n for (int i = 0; i < n_blocks; i++)\n d[i] ^= aes_enc_last_round (r[i], k[rounds]);\n }\n \n static_always_inline u8x16\n-aesni_gcm_ghash_blocks (u8x16 T, aes_gcm_key_data_t * kd,\n-\t\t\tu8x16u * in, int n_blocks)\n+aes_gcm_ghash_blocks (u8x16 T, aes_gcm_key_data_t * kd,\n+\t\t u8x16u * in, int n_blocks)\n {\n ghash_data_t _gd, *gd = &_gd;\n const u8x16 *Hi = kd->Hi + n_blocks - 1;\n@@ -113,33 +113,33 @@\n }\n \n static_always_inline u8x16\n-aesni_gcm_ghash (u8x16 T, aes_gcm_key_data_t * kd, u8x16u * in, u32 n_left)\n+aes_gcm_ghash (u8x16 T, aes_gcm_key_data_t * kd, u8x16u * in, u32 n_left)\n {\n \n while (n_left >= 128)\n {\n- T = aesni_gcm_ghash_blocks (T, kd, in, 8);\n+ T = aes_gcm_ghash_blocks (T, kd, in, 8);\n n_left -= 128;\n in += 8;\n }\n \n if (n_left >= 64)\n {\n- T = aesni_gcm_ghash_blocks (T, kd, in, 4);\n+ T = aes_gcm_ghash_blocks (T, kd, in, 4);\n n_left -= 64;\n in += 4;\n }\n \n if (n_left >= 32)\n {\n- T = aesni_gcm_ghash_blocks (T, kd, in, 2);\n+ T = aes_gcm_ghash_blocks (T, kd, in, 2);\n n_left -= 32;\n in += 2;\n }\n \n if (n_left >= 16)\n {\n- T = aesni_gcm_ghash_blocks (T, kd, in, 1);\n+ T = aes_gcm_ghash_blocks (T, kd, in, 1);\n n_left -= 16;\n in += 1;\n }\n@@ -153,10 +153,10 @@\n }\n \n static_always_inline u8x16\n-aesni_gcm_calc (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n-\t\tu32x4 * Y, u32 * ctr, u8x16u * inv, u8x16u * outv,\n-\t\tint rounds, int n, int last_block_bytes, int with_ghash,\n-\t\tint is_encrypt)\n+aes_gcm_calc (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n+\t u32x4 * Y, u32 * ctr, u8x16u * inv, u8x16u * outv,\n+\t int rounds, int n, int last_block_bytes, int with_ghash,\n+\t int is_encrypt)\n {\n u8x16 r[n];\n ghash_data_t _gd = { }, *gd = &_gd;\n@@ -166,44 +166,44 @@\n clib_prefetch_load (inv + 4);\n \n \/* AES rounds 0 and 1 *\/\n- aesni_gcm_enc_first_round (r, Y, ctr, rk[0], n);\n- aesni_gcm_enc_round (r, rk[1], n);\n+ aes_gcm_enc_first_round (r, Y, ctr, rk[0], n);\n+ aes_gcm_enc_round (r, rk[1], n);\n \n \/* load data - decrypt round *\/\n if (is_encrypt == 0)\n- aesni_gcm_load (d, inv, n, last_block_bytes);\n+ aes_gcm_load (d, inv, n, last_block_bytes);\n \n \/* GHASH multiply block 1 *\/\n if (with_ghash)\n ghash_mul_first (gd, u8x16_reflect (d[didx++]) ^ T, kd->Hi[--hidx]);\n \n \/* AES rounds 2 and 3 *\/\n- aesni_gcm_enc_round (r, rk[2], n);\n- aesni_gcm_enc_round (r, rk[3], n);\n+ aes_gcm_enc_round (r, rk[2], n);\n+ aes_gcm_enc_round (r, rk[3], n);\n \n \/* GHASH multiply block 2 *\/\n if (with_ghash && hidx)\n ghash_mul_next (gd, u8x16_reflect (d[didx++]), kd->Hi[--hidx]);\n \n \/* AES rounds 4 and 5 *\/\n- aesni_gcm_enc_round (r, rk[4], n);\n- aesni_gcm_enc_round (r, rk[5], n);\n+ aes_gcm_enc_round (r, rk[4], n);\n+ aes_gcm_enc_round (r, rk[5], n);\n \n \/* GHASH multiply block 3 *\/\n if (with_ghash && hidx)\n ghash_mul_next (gd, u8x16_reflect (d[didx++]), kd->Hi[--hidx]);\n \n \/* AES rounds 6 and 7 *\/\n- aesni_gcm_enc_round (r, rk[6], n);\n- aesni_gcm_enc_round (r, rk[7], n);\n+ aes_gcm_enc_round (r, rk[6], n);\n+ aes_gcm_enc_round (r, rk[7], n);\n \n \/* GHASH multiply block 4 *\/\n if (with_ghash && hidx)\n ghash_mul_next (gd, u8x16_reflect (d[didx++]), kd->Hi[--hidx]);\n \n \/* AES rounds 8 and 9 *\/\n- aesni_gcm_enc_round (r, rk[8], n);\n- aesni_gcm_enc_round (r, rk[9], n);\n+ aes_gcm_enc_round (r, rk[8], n);\n+ aes_gcm_enc_round (r, rk[9], n);\n \n \/* GHASH reduce 1st step *\/\n if (with_ghash)\n@@ -211,17 +211,17 @@\n \n \/* load data - encrypt round *\/\n if (is_encrypt)\n- aesni_gcm_load (d, inv, n, last_block_bytes);\n+ aes_gcm_load (d, inv, n, last_block_bytes);\n \n \/* GHASH reduce 2nd step *\/\n if (with_ghash)\n ghash_reduce2 (gd);\n \n \/* AES last round(s) *\/\n- aesni_gcm_enc_last_round (r, d, rk, rounds, n);\n+ aes_gcm_enc_last_round (r, d, rk, rounds, n);\n \n \/* store data *\/\n- aesni_gcm_store (d, outv, n, last_block_bytes);\n+ aes_gcm_store (d, outv, n, last_block_bytes);\n \n \/* GHASH final step *\/\n if (with_ghash)\n@@ -231,119 +231,119 @@\n }\n \n static_always_inline u8x16\n-aesni_gcm_calc_double (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n-\t\t u32x4 * Y, u32 * ctr, u8x16u * inv, u8x16u * outv,\n-\t\t int rounds, int is_encrypt)\n+aes_gcm_calc_double (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n+\t\t u32x4 * Y, u32 * ctr, u8x16u * inv, u8x16u * outv,\n+\t\t int rounds, int is_encrypt)\n {\n u8x16 r[4];\n ghash_data_t _gd, *gd = &_gd;\n const u8x16 *rk = (u8x16 *) kd->Ke;\n \n \/* AES rounds 0 and 1 *\/\n- aesni_gcm_enc_first_round (r, Y, ctr, rk[0], 4);\n- aesni_gcm_enc_round (r, rk[1], 4);\n+ aes_gcm_enc_first_round (r, Y, ctr, rk[0], 4);\n+ aes_gcm_enc_round (r, rk[1], 4);\n \n \/* load 4 blocks of data - decrypt round *\/\n if (is_encrypt == 0)\n- aesni_gcm_load (d, inv, 4, 0);\n+ aes_gcm_load (d, inv, 4, 0);\n \n \/* GHASH multiply block 0 *\/\n ghash_mul_first (gd, u8x16_reflect (d[0]) ^ T, kd->Hi[7]);\n \n \/* AES rounds 2 and 3 *\/\n- aesni_gcm_enc_round (r, rk[2], 4);\n- aesni_gcm_enc_round (r, rk[3], 4);\n+ aes_gcm_enc_round (r, rk[2], 4);\n+ aes_gcm_enc_round (r, rk[3], 4);\n \n \/* GHASH multiply block 1 *\/\n ghash_mul_next (gd, u8x16_reflect (d[1]), kd->Hi[6]);\n \n \/* AES rounds 4 and 5 *\/\n- aesni_gcm_enc_round (r, rk[4], 4);\n- aesni_gcm_enc_round (r, rk[5], 4);\n+ aes_gcm_enc_round (r, rk[4], 4);\n+ aes_gcm_enc_round (r, rk[5], 4);\n \n \/* GHASH multiply block 2 *\/\n ghash_mul_next (gd, u8x16_reflect (d[2]), kd->Hi[5]);\n \n \/* AES rounds 6 and 7 *\/\n- aesni_gcm_enc_round (r, rk[6], 4);\n- aesni_gcm_enc_round (r, rk[7], 4);\n+ aes_gcm_enc_round (r, rk[6], 4);\n+ aes_gcm_enc_round (r, rk[7], 4);\n \n \/* GHASH multiply block 3 *\/\n ghash_mul_next (gd, u8x16_reflect (d[3]), kd->Hi[4]);\n \n \/* AES rounds 8 and 9 *\/\n- aesni_gcm_enc_round (r, rk[8], 4);\n- aesni_gcm_enc_round (r, rk[9], 4);\n+ aes_gcm_enc_round (r, rk[8], 4);\n+ aes_gcm_enc_round (r, rk[9], 4);\n \n \/* load 4 blocks of data - encrypt round *\/\n if (is_encrypt)\n- aesni_gcm_load (d, inv, 4, 0);\n+ aes_gcm_load (d, inv, 4, 0);\n \n \/* AES last round(s) *\/\n- aesni_gcm_enc_last_round (r, d, rk, rounds, 4);\n+ aes_gcm_enc_last_round (r, d, rk, rounds, 4);\n \n \/* store 4 blocks of data *\/\n- aesni_gcm_store (d, outv, 4, 0);\n+ aes_gcm_store (d, outv, 4, 0);\n \n \/* load next 4 blocks of data data - decrypt round *\/\n if (is_encrypt == 0)\n- aesni_gcm_load (d, inv + 4, 4, 0);\n+ aes_gcm_load (d, inv + 4, 4, 0);\n \n \/* GHASH multiply block 4 *\/\n ghash_mul_next (gd, u8x16_reflect (d[0]), kd->Hi[3]);\n \n \/* AES rounds 0, 1 and 2 *\/\n- aesni_gcm_enc_first_round (r, Y, ctr, rk[0], 4);\n- aesni_gcm_enc_round (r, rk[1], 4);\n- aesni_gcm_enc_round (r, rk[2], 4);\n+ aes_gcm_enc_first_round (r, Y, ctr, rk[0], 4);\n+ aes_gcm_enc_round (r, rk[1], 4);\n+ aes_gcm_enc_round (r, rk[2], 4);\n \n \/* GHASH multiply block 5 *\/\n ghash_mul_next (gd, u8x16_reflect (d[1]), kd->Hi[2]);\n \n \/* AES rounds 3 and 4 *\/\n- aesni_gcm_enc_round (r, rk[3], 4);\n- aesni_gcm_enc_round (r, rk[4], 4);\n+ aes_gcm_enc_round (r, rk[3], 4);\n+ aes_gcm_enc_round (r, rk[4], 4);\n \n \/* GHASH multiply block 6 *\/\n ghash_mul_next (gd, u8x16_reflect (d[2]), kd->Hi[1]);\n \n \/* AES rounds 5 and 6 *\/\n- aesni_gcm_enc_round (r, rk[5], 4);\n- aesni_gcm_enc_round (r, rk[6], 4);\n+ aes_gcm_enc_round (r, rk[5], 4);\n+ aes_gcm_enc_round (r, rk[6], 4);\n \n \/* GHASH multiply block 7 *\/\n ghash_mul_next (gd, u8x16_reflect (d[3]), kd->Hi[0]);\n \n \/* AES rounds 7 and 8 *\/\n- aesni_gcm_enc_round (r, rk[7], 4);\n- aesni_gcm_enc_round (r, rk[8], 4);\n+ aes_gcm_enc_round (r, rk[7], 4);\n+ aes_gcm_enc_round (r, rk[8], 4);\n \n \/* GHASH reduce 1st step *\/\n ghash_reduce (gd);\n \n \/* AES round 9 *\/\n- aesni_gcm_enc_round (r, rk[9], 4);\n+ aes_gcm_enc_round (r, rk[9], 4);\n \n \/* load data - encrypt round *\/\n if (is_encrypt)\n- aesni_gcm_load (d, inv + 4, 4, 0);\n+ aes_gcm_load (d, inv + 4, 4, 0);\n \n \/* GHASH reduce 2nd step *\/\n ghash_reduce2 (gd);\n \n \/* AES last round(s) *\/\n- aesni_gcm_enc_last_round (r, d, rk, rounds, 4);\n+ aes_gcm_enc_last_round (r, d, rk, rounds, 4);\n \n \/* store data *\/\n- aesni_gcm_store (d, outv + 4, 4, 0);\n+ aes_gcm_store (d, outv + 4, 4, 0);\n \n \/* GHASH final step *\/\n return ghash_final (gd);\n }\n \n static_always_inline u8x16\n-aesni_gcm_ghash_last (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n-\t\t int n_blocks, int n_bytes)\n+aes_gcm_ghash_last (u8x16 T, aes_gcm_key_data_t * kd, u8x16 * d,\n+\t\t int n_blocks, int n_bytes)\n {\n ghash_data_t _gd, *gd = &_gd;\n \n@@ -364,8 +364,8 @@\n \n \n static_always_inline u8x16\n-aesni_gcm_enc (u8x16 T, aes_gcm_key_data_t * kd, u32x4 Y, u8x16u * inv,\n-\t u8x16u * outv, u32 n_left, int rounds)\n+aes_gcm_enc (u8x16 T, aes_gcm_key_data_t * kd, u32x4 Y, u8x16u * inv,\n+\t u8x16u * outv, u32 n_left, int rounds)\n {\n u8x16 d[4];\n u32 ctr = 1;\n@@ -378,35 +378,35 @@\n if (n_left > 48)\n \t{\n \t n_left &= 0x0f;\n-\t aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, n_left,\n-\t\t\t \/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n-\t return aesni_gcm_ghash_last (T, kd, d, 4, n_left);\n+\t aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, n_left,\n+\t\t\t\/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n+\t return aes_gcm_ghash_last (T, kd, d, 4, n_left);\n \t}\n else if (n_left > 32)\n \t{\n \t n_left &= 0x0f;\n-\t aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3, n_left,\n-\t\t\t \/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n-\t return aesni_gcm_ghash_last (T, kd, d, 3, n_left);\n+\t aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3, n_left,\n+\t\t\t\/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n+\t return aes_gcm_ghash_last (T, kd, d, 3, n_left);\n \t}\n else if (n_left > 16)\n \t{\n \t n_left &= 0x0f;\n-\t aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2, n_left,\n-\t\t\t \/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n-\t return aesni_gcm_ghash_last (T, kd, d, 2, n_left);\n+\t aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2, n_left,\n+\t\t\t\/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n+\t return aes_gcm_ghash_last (T, kd, d, 2, n_left);\n \t}\n else\n \t{\n \t n_left &= 0x0f;\n-\t aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n-\t\t\t \/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n-\t return aesni_gcm_ghash_last (T, kd, d, 1, n_left);\n+\t aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n+\t\t\t\/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n+\t return aes_gcm_ghash_last (T, kd, d, 1, n_left);\n \t}\n }\n \n- aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0,\n-\t\t \/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n+ aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0,\n+\t\t\/* with_ghash *\/ 0, \/* is_encrypt *\/ 1);\n \n \/* next *\/\n n_left -= 64;\n@@ -415,8 +415,8 @@\n \n while (n_left >= 128)\n {\n- T = aesni_gcm_calc_double (T, kd, d, &Y, &ctr, inv, outv, rounds,\n-\t\t\t\t \/* is_encrypt *\/ 1);\n+ T = aes_gcm_calc_double (T, kd, d, &Y, &ctr, inv, outv, rounds,\n+\t\t\t \/* is_encrypt *\/ 1);\n \n \/* next *\/\n n_left -= 128;\n@@ -426,8 +426,8 @@\n \n if (n_left >= 64)\n {\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0,\n+\t\t\t\/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n \n \/* next *\/\n n_left -= 64;\n@@ -436,49 +436,49 @@\n }\n \n if (n_left == 0)\n- return aesni_gcm_ghash_last (T, kd, d, 4, 0);\n+ return aes_gcm_ghash_last (T, kd, d, 4, 0);\n \n if (n_left > 48)\n {\n n_left &= 0x0f;\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, n_left,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n- return aesni_gcm_ghash_last (T, kd, d, 4, n_left);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, n_left,\n+\t\t\t\/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n+ return aes_gcm_ghash_last (T, kd, d, 4, n_left);\n }\n \n if (n_left > 32)\n {\n n_left &= 0x0f;\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3, n_left,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n- return aesni_gcm_ghash_last (T, kd, d, 3, n_left);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3, n_left,\n+\t\t\t\/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n+ return aes_gcm_ghash_last (T, kd, d, 3, n_left);\n }\n \n if (n_left > 16)\n {\n n_left &= 0x0f;\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2, n_left,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n- return aesni_gcm_ghash_last (T, kd, d, 2, n_left);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2, n_left,\n+\t\t\t\/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n+ return aes_gcm_ghash_last (T, kd, d, 2, n_left);\n }\n \n n_left &= 0x0f;\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n-\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n- return aesni_gcm_ghash_last (T, kd, d, 1, n_left);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n+\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 1);\n+ return aes_gcm_ghash_last (T, kd, d, 1, n_left);\n }\n \n static_always_inline u8x16\n-aesni_gcm_dec (u8x16 T, aes_gcm_key_data_t * kd, u32x4 Y, u8x16u * inv,\n-\t u8x16u * outv, u32 n_left, int rounds)\n+aes_gcm_dec (u8x16 T, aes_gcm_key_data_t * kd, u32x4 Y, u8x16u * inv,\n+\t u8x16u * outv, u32 n_left, int rounds)\n {\n u8x16 d[8];\n u32 ctr = 1;\n \n while (n_left >= 128)\n {\n- T = aesni_gcm_calc_double (T, kd, d, &Y, &ctr, inv, outv, rounds,\n-\t\t\t\t \/* is_encrypt *\/ 0);\n+ T = aes_gcm_calc_double (T, kd, d, &Y, &ctr, inv, outv, rounds,\n+\t\t\t \/* is_encrypt *\/ 0);\n \n \/* next *\/\n n_left -= 128;\n@@ -488,7 +488,7 @@\n \n if (n_left >= 64)\n {\n- T = aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0, 1, 0);\n+ T = aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4, 0, 1, 0);\n \n \/* next *\/\n n_left -= 64;\n@@ -500,22 +500,19 @@\n return T;\n \n if (n_left > 48)\n- return aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4,\n-\t\t\t n_left - 48,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n+ return aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 4,\n+\t\t\t n_left - 48, \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n \n if (n_left > 32)\n- return aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3,\n-\t\t\t n_left - 32,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n+ return aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 3,\n+\t\t\t n_left - 32, \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n \n if (n_left > 16)\n- return aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2,\n-\t\t\t n_left - 16,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n-\n- return aesni_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n-\t\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n+ return aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 2,\n+\t\t\t n_left - 16, \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n+\n+ return aes_gcm_calc (T, kd, d, &Y, &ctr, inv, outv, rounds, 1, n_left,\n+\t\t \/* with_ghash *\/ 1, \/* is_encrypt *\/ 0);\n }\n \n static_always_inline int\n@@ -534,11 +531,11 @@\n \n \/* calculate ghash for AAD - optimized for ipsec common cases *\/\n if (aad_bytes == 8)\n- T = aesni_gcm_ghash (T, kd, addt, 8);\n+ T = aes_gcm_ghash (T, kd, addt, 8);\n else if (aad_bytes == 12)\n- T = aesni_gcm_ghash (T, kd, addt, 12);\n+ T = aes_gcm_ghash (T, kd, addt, 12);\n else\n- T = aesni_gcm_ghash (T, kd, addt, aad_bytes);\n+ T = aes_gcm_ghash (T, kd, addt, aad_bytes);\n \n \/* initalize counter *\/\n Y0 = (u32x4) aes_load_partial (iv, 12);\n@@ -546,9 +543,9 @@\n \n \/* ghash and encrypt\/edcrypt *\/\n if (is_encrypt)\n- T = aesni_gcm_enc (T, kd, Y0, in, out, data_bytes, aes_rounds);\n+ T = aes_gcm_enc (T, kd, Y0, in, out, data_bytes, aes_rounds);\n else\n- T = aesni_gcm_dec (T, kd, Y0, in, out, data_bytes, aes_rounds);\n+ T = aes_gcm_dec (T, kd, Y0, in, out, data_bytes, aes_rounds);\n \n clib_prefetch_load (tag);\n \n@@ -594,8 +591,8 @@\n }\n \n static_always_inline u32\n-aesni_ops_enc_aes_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[],\n-\t\t u32 n_ops, aes_key_size_t ks)\n+aes_ops_enc_aes_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[],\n+\t\t u32 n_ops, aes_key_size_t ks)\n {\n crypto_native_main_t *cm = &crypto_native_main;\n vnet_crypto_op_t *op = ops[0];\n@@ -620,8 +617,8 @@\n }\n \n static_always_inline u32\n-aesni_ops_dec_aes_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[],\n-\t\t u32 n_ops, aes_key_size_t ks)\n+aes_ops_dec_aes_gcm (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops,\n+\t\t aes_key_size_t ks)\n {\n crypto_native_main_t *cm = &crypto_native_main;\n vnet_crypto_op_t *op = ops[0];\n@@ -656,7 +653,7 @@\n }\n \n static_always_inline void *\n-aesni_gcm_key_exp (vnet_crypto_key_t * key, aes_key_size_t ks)\n+aes_gcm_key_exp (vnet_crypto_key_t * key, aes_key_size_t ks)\n {\n aes_gcm_key_data_t *kd;\n u8x16 H;\n@@ -673,19 +670,19 @@\n return kd;\n }\n \n-#define foreach_aesni_gcm_handler_type _(128) _(192) _(256)\n+#define foreach_aes_gcm_handler_type _(128) _(192) _(256)\n \n #define _(x) \\\n-static u32 aesni_ops_dec_aes_gcm_##x \\\n+static u32 aes_ops_dec_aes_gcm_##x \\\n (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops) \\\n-{ return aesni_ops_dec_aes_gcm (vm, ops, n_ops, AES_KEY_##x); } \\\n-static u32 aesni_ops_enc_aes_gcm_##x \\\n+{ return aes_ops_dec_aes_gcm (vm, ops, n_ops, AES_KEY_##x); } \\\n+static u32 aes_ops_enc_aes_gcm_##x \\\n (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 n_ops) \\\n-{ return aesni_ops_enc_aes_gcm (vm, ops, n_ops, AES_KEY_##x); } \\\n-static void * aesni_gcm_key_exp_##x (vnet_crypto_key_t *key) \\\n-{ return aesni_gcm_key_exp (key, AES_KEY_##x); }\n-\n-foreach_aesni_gcm_handler_type;\n+{ return aes_ops_enc_aes_gcm (vm, ops, n_ops, AES_KEY_##x); } \\\n+static void * aes_gcm_key_exp_##x (vnet_crypto_key_t *key) \\\n+{ return aes_gcm_key_exp (key, AES_KEY_##x); }\n+\n+foreach_aes_gcm_handler_type;\n #undef _\n \n clib_error_t *\n@@ -706,12 +703,12 @@\n #define _(x) \\\n vnet_crypto_register_ops_handler (vm, cm->crypto_engine_index, \\\n \t\t\t\t VNET_CRYPTO_OP_AES_##x##_GCM_ENC, \\\n-\t\t\t\t aesni_ops_enc_aes_gcm_##x); \\\n+\t\t\t\t aes_ops_enc_aes_gcm_##x); \\\n vnet_crypto_register_ops_handler (vm, cm->crypto_engine_index, \\\n \t\t\t\t VNET_CRYPTO_OP_AES_##x##_GCM_DEC, \\\n-\t\t\t\t aesni_ops_dec_aes_gcm_##x); \\\n- cm->key_fn[VNET_CRYPTO_ALG_AES_##x##_GCM] = aesni_gcm_key_exp_##x;\n- foreach_aesni_gcm_handler_type;\n+\t\t\t\t aes_ops_dec_aes_gcm_##x); \\\n+ cm->key_fn[VNET_CRYPTO_ALG_AES_##x##_GCM] = aes_gcm_key_exp_##x;\n+ foreach_aes_gcm_handler_type;\n #undef _\n return 0;\n }\n"} {"commit":"6d42d79e640fd1cd8fd97d11c8693f8907fc4eac","subject":"drivers: base: dma-mapping: Erase blank space after pointer","message":"drivers: base: dma-mapping: Erase blank space after pointer\n\nThis patch fixes the following checkpatch.pl error:\nERROR: \"foo * bar\" should be \"foo *bar\"\n\nSigned-off-by: Marius Cristian Eseanu <80492c4791aab08ee5470e47750f3e585dee9efd@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/base\/dma-mapping.c\n+++ drivers\/base\/dma-mapping.c\n@@ -62,7 +62,7 @@\n * RETURNS:\n * Pointer to allocated memory on success, NULL on failure.\n *\/\n-void * dmam_alloc_coherent(struct device *dev, size_t size,\n+void *dmam_alloc_coherent(struct device *dev, size_t size,\n \t\t\t dma_addr_t *dma_handle, gfp_t gfp)\n {\n \tstruct dma_devres *dr;\n"} {"commit":"cbce467a1d7003ba1366aaf6a23f9f2bf2cb0fbc","subject":"Batched reads for word characters too","message":"Batched reads for word characters too\n","repos":"timarmstrong\/CHocoParse,timarmstrong\/CHocoParse,timarmstrong\/CHocoParse","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/tsconfig_lex.c\n+++ src\/tsconfig_lex.c\n@@ -531,26 +531,65 @@\n char *str = malloc(512);\n TSCFG_CHECK_MALLOC(str);\n \n+\n+ bool end_of_tok = false;\n size_t len = 0;\n- while (true) {\n+ do {\n size_t got;\n char *pos = &str[len];\n \n- rc = lex_peek(lex, pos, 2, &got);\n- TSCFG_CHECK(rc);\n-\n- if (got == 0 || !is_hocon_unquoted_char(pos[0]) ||\n- is_hocon_whitespace(pos[0]) || is_comment_start(pos, got)) {\n- \/\/ Cases where unquoted text terminates\n- break;\n- } else {\n+ assert(LEX_PEEK_BATCH_SIZE >= 2); \/\/ Need lookahead of at least two chars\n+ rc = lex_peek(lex, pos, LEX_PEEK_BATCH_SIZE, &got);\n+ TSCFG_CHECK(rc);\n+\n+ size_t to_append = 0;\n+\n+ \/\/ Cannot append last character b\/c need to check not a comment\n+ while (to_append < got) {\n+ if (!is_hocon_unquoted_char(pos[to_append]) &&\n+ is_hocon_whitespace(pos[to_append])) {\n+ \/\/ Cases where unquoted text definitely terminates\n+ end_of_tok = true;\n+ break;\n+ }\n+\n+ if (to_append < got - 1) {\n+ \/\/ Can check for comment with lookahead two\n+ if (is_comment_start(&pos[to_append], 2)) {\n+ end_of_tok = true;\n+ break;\n+ }\n+ } else {\n+ \/* Last character, may not be able to decide whether to append yet *\/\n+ if (got < LEX_PEEK_BATCH_SIZE) {\n+ \/\/ End of file, only check one char comments\n+ if (is_comment_start(&pos[to_append], 1)) {\n+ end_of_tok = true;\n+ break;\n+ }\n+ } else {\n+ \/\/ Need to read more before deciding\n+ end_of_tok = false;\n+ break;\n+ }\n+ }\n+ \n \/\/ Next character is part of unquoted text\n- rc = lex_eat(lex, 1);\n+ to_append++;\n+ }\n+ \n+ if (to_append > 0) {\n+ rc = lex_eat(lex, to_append);\n TSCFG_CHECK(rc);\n \n- len++;\n- }\n- }\n+ len += to_append;\n+ }\n+\n+ if (got == 0) {\n+ \/\/ End of input\n+ end_of_tok = true;\n+ } \n+ } while (!end_of_tok);\n \n tok->tag = TSCFG_TOK_UNQUOTED;\n tok->length = len;\n"} {"commit":"10935d052eef9441a551571ff5853f84a00b2fd4","subject":"aoe: initialize sysminor to avoid compiler warning","message":"aoe: initialize sysminor to avoid compiler warning\n\nBecause the minor_get and related functions use the return values for\nerrors, the compiler doesn't know that sysminor will always either 1) be\ninitialized in aoedev_by_aoeaddr by the call to minor_get, or 2) be\nunused as the \"goto out\" is executed.\n\nThis patch avoids the compiler warning.\n\nSigned-off-by: Ed Cashin <a5847c07920d7541d8e1bc46cb039fb7ad61c4b4@coraid.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/aoe\/aoedev.c\n+++ drivers\/block\/aoe\/aoedev.c\n@@ -383,7 +383,7 @@\n \tstruct aoedev *d;\n \tint i;\n \tulong flags;\n-\tulong sysminor;\n+\tulong sysminor = 0;\n \n \tspin_lock_irqsave(&devlist_lock, flags);\n \n"} {"commit":"ae1b18f01e5ebda4bb812689cd08dc13920fc49f","subject":"- add some parens to fix the segfault","message":"- add some parens to fix the segfault\n\n","repos":"JacksonIsaac\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/repo_solv.c\n+++ src\/repo_solv.c\n@@ -1044,7 +1044,7 @@\n if (keydepth <= 2)\n \t{\n \t if (keydepth == 0)\n-\t data.mainschemaoffsets[keyp - 1 - schemadata + schemata[data.mainschema]] = data.incoredatalen;\n+\t data.mainschemaoffsets[keyp - 1 - (schemadata + schemata[data.mainschema])] = data.incoredatalen;\n \t \/* read data chunk to dp *\/\n \t if (data.error)\n \t break;\n"} {"commit":"1b13fe6a6e9986dbc079cbb05090be75edbffa5d","subject":"AGP: Warn when GATT memory cannot be set to UC","message":"AGP: Warn when GATT memory cannot be set to UC\n\nThis is one of those paranoid checks which should at least tell\nus that something is about to go haywire after we've disabled\nGART table walk probes which is done by default now on AMD.\n\nSigned-off-by: Borislav Petkov <2b4cb5acba6b5321acd37371d9b73a646c388783@amd.com>\nCc: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\nCc: FUJITA Tomonori <93dac1fe9c4b2a3957982200319981492ad4976e@lab.ntt.co.jp>\nLKML-Reference: <b1619d9587efdf6cee2a5bf8603c36d470dd9953@amd64.org>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/agp\/generic.c\n+++ drivers\/char\/agp\/generic.c\n@@ -984,7 +984,9 @@\n \n \tbridge->driver->cache_flush();\n #ifdef CONFIG_X86\n-\tset_memory_uc((unsigned long)table, 1 << page_order);\n+\tif (set_memory_uc((unsigned long)table, 1 << page_order))\n+\t\tprintk(KERN_WARNING \"Could not set GATT table memory to UC!\");\n+\n \tbridge->gatt_table = (void *)table;\n #else\n \tbridge->gatt_table = ioremap_nocache(virt_to_phys(table),\n"} {"commit":"668558e10e9608d10ea9f43bc2cee2ffe123a658","subject":"Compilation fix","message":"Compilation fix\n","repos":"GNOME\/unique,Distrotech\/libunique,GNOME\/unique,Distrotech\/libunique,GNOME\/unique,Distrotech\/libunique","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- unique\/bacon\/uniquemessage-bacon.c\n+++ unique\/bacon\/uniquemessage-bacon.c\n@@ -100,7 +100,7 @@\n gchar *buf;\n GdkDisplay *display;\n gint screen_n;\n- UniqueMessageData *message_data;\n+ UniqueMessageData *message_data = NULL;\n \n blocks = g_strsplit (data, \"\\t\", 6);\n if (g_strv_length (blocks) != 6)\n"} {"commit":"2c3cae71a88bb72fbdb0e5b53428041f16f6054e","subject":"tom ADC HW","message":"tom ADC HW\n","repos":"mathiasbredholt\/reflexball,mathiasbredholt\/reflexball","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/uni\/hw_input.c\n+++ src\/uni\/hw_input.c\n@@ -176,7 +176,11 @@\n \treturn hw_read_key();\n }\n \n+void hw_ADC_init() {\n+}\n \n-\n+char hw_read_analog() {\n+\treturn 0;\n+}\n \n #endif"} {"commit":"c3dc8071eedaac8c8a05c30fe20b78452a818dd9","subject":"[PATCH] chardev: GPIO for SCx200 & PC-8736x: dispatch via vtable","message":"[PATCH] chardev: GPIO for SCx200 & PC-8736x: dispatch via vtable\n\nNow actually call the gpio operations thru the vtable.\n\nSigned-off-by: Jim Cromie <ad2f2d00caa0a51cbc8e4980f7c1a44e594c74aa@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/char\/scx200_gpio.c\n+++ drivers\/char\/scx200_gpio.c\n@@ -53,6 +53,7 @@\n \t\t\t\t size_t len, loff_t *ppos)\n {\n \tunsigned m = iminor(file->f_dentry->d_inode);\n+\tstruct nsc_gpio_ops *amp = file->private_data;\n \tsize_t i;\n \tint err = 0;\n \n@@ -62,39 +63,39 @@\n \t\t\treturn -EFAULT;\n \t\tswitch (c) {\n \t\tcase '0':\n-\t\t\tscx200_gpio_set(m, 0);\n+\t\t\tamp->gpio_set(m, 0);\n \t\t\tbreak;\n \t\tcase '1':\n-\t\t\tscx200_gpio_set(m, 1);\n+\t\t\tamp->gpio_set(m, 1);\n \t\t\tbreak;\n \t\tcase 'O':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d output enabled\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~1, 1);\n+\t\t\tamp->gpio_config(m, ~1, 1);\n \t\t\tbreak;\n \t\tcase 'o':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d output disabled\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~1, 0);\n+\t\t\tamp->gpio_config(m, ~1, 0);\n \t\t\tbreak;\n \t\tcase 'T':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d output is push pull\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~2, 2);\n+\t\t\tamp->gpio_config(m, ~2, 2);\n \t\t\tbreak;\n \t\tcase 't':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d output is open drain\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~2, 0);\n+\t\t\tamp->gpio_config(m, ~2, 0);\n \t\t\tbreak;\n \t\tcase 'P':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d pull up enabled\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~4, 4);\n+\t\t\tamp->gpio_config(m, ~4, 4);\n \t\t\tbreak;\n \t\tcase 'p':\n \t\t\tprintk(KERN_INFO NAME \": GPIO%d pull up disabled\\n\", m);\n-\t\t\tscx200_gpio_configure(m, ~4, 0);\n+\t\t\tamp->gpio_config(m, ~4, 0);\n \t\t\tbreak;\n \n \t\tcase 'v':\n \t\t\t\/* View Current pin settings *\/\n-\t\t\tscx200_gpio_dump(m);\n+\t\t\tamp->gpio_dump(m);\n \t\t\tbreak;\n \t\tcase '\\n':\n \t\t\t\/* end of settings string, do nothing *\/\n@@ -117,8 +118,9 @@\n {\n \tunsigned m = iminor(file->f_dentry->d_inode);\n \tint value;\n-\n-\tvalue = scx200_gpio_get(m);\n+\tstruct nsc_gpio_ops *amp = file->private_data;\n+\n+\tvalue = amp->gpio_get(m);\n \tif (put_user(value ? '1' : '0', buf))\n \t\treturn -EFAULT;\n \n@@ -128,6 +130,8 @@\n static int scx200_gpio_open(struct inode *inode, struct file *file)\n {\n \tunsigned m = iminor(inode);\n+\tfile->private_data = &scx200_access;\n+\n \tif (m > 63)\n \t\treturn -EINVAL;\n \treturn nonseekable_open(inode, file);\n"} {"commit":"321ece4dda32f52d4a28d6eb11f2ca2a5c93c191","subject":"i7core_edac: Fix ringbuffer maxsize","message":"i7core_edac: Fix ringbuffer maxsize\n\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/edac\/i7core_edac.c\n+++ drivers\/edac\/i7core_edac.c\n@@ -1631,14 +1631,14 @@\n \t * loosing an error.\n \t *\/\n \tsmp_rmb();\n-\tcount = (pvt->mce_out + sizeof(mce_entry) - pvt->mce_in)\n-\t\t% sizeof(mce_entry);\n+\tcount = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)\n+\t\t% MCE_LOG_LEN;\n \tif (!count)\n \t\treturn;\n \n \tm = pvt->mce_outentry;\n-\tif (pvt->mce_in + count > sizeof(mce_entry)) {\n-\t\tunsigned l = sizeof(mce_entry) - pvt->mce_in;\n+\tif (pvt->mce_in + count > MCE_LOG_LEN) {\n+\t\tunsigned l = MCE_LOG_LEN - pvt->mce_in;\n \n \t\tmemcpy(m, &pvt->mce_entry[pvt->mce_in], sizeof(*m) * l);\n \t\tsmp_wmb();\n@@ -1702,7 +1702,7 @@\n \t\treturn 0;\n \n \tsmp_rmb();\n-\tif ((pvt->mce_out + 1) % sizeof(mce_entry) == pvt->mce_in) {\n+\tif ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {\n \t\tsmp_wmb();\n \t\tpvt->mce_overrun++;\n \t\treturn 0;\n@@ -1711,7 +1711,7 @@\n \t\/* Copy memory error at the ringbuffer *\/\n \tmemcpy(&pvt->mce_entry[pvt->mce_out], mce, sizeof(*mce));\n \tsmp_wmb();\n-\tpvt->mce_out = (pvt->mce_out + 1) % sizeof(mce_entry);\n+\tpvt->mce_out = (pvt->mce_out + 1) % MCE_LOG_LEN;\n \n \t\/* Handle fatal errors immediately *\/\n \tif (mce->mcgstatus & 1)\n"} {"commit":"031bb27c4bf77c2f60b3f3dea8cce63ef0d1fba9","subject":"firewire: fw-sbp2: another iPod mini quirk entry","message":"firewire: fw-sbp2: another iPod mini quirk entry\n\nAdd another model ID of a broken firmware to prevent early I\/O errors\nby acesses at the end of the disk. Reported at linux1394-user,\nhttp:\/\/marc.info\/?t=122670842900002\n\nSigned-off-by: Stefan Richter <fbd796546fc801b34e01e453c6fd30283e012038@s5r6.in-berlin.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/firewire\/fw-sbp2.c\n+++ drivers\/firewire\/fw-sbp2.c\n@@ -372,6 +372,11 @@\n \t},\n \t\/* iPod mini *\/ {\n \t\t.firmware_revision\t= 0x0a2700,\n+\t\t.model\t\t\t= 0x000022,\n+\t\t.workarounds\t\t= SBP2_WORKAROUND_FIX_CAPACITY,\n+\t},\n+\t\/* iPod mini *\/ {\n+\t\t.firmware_revision\t= 0x0a2700,\n \t\t.model\t\t\t= 0x000023,\n \t\t.workarounds\t\t= SBP2_WORKAROUND_FIX_CAPACITY,\n \t},\n"} {"commit":"da27a24383b2b10bf6ebd0db29b325548aafecb4","subject":"efivarfs: guid part of filenames are case-insensitive","message":"efivarfs: guid part of filenames are case-insensitive\n\nIt makes no sense to treat the following filenames as unique,\n\n\tVarName-abcdefab-abcd-abcd-abcd-abcdefabcdef\n\tVarName-ABCDEFAB-ABCD-ABCD-ABCD-ABCDEFABCDEF\n\tVarName-ABcDEfAB-ABcD-ABcD-ABcD-ABcDEfABcDEf\n\tVarName-aBcDEfAB-aBcD-aBcD-aBcD-aBcDEfaBcDEf\n\t... etc ...\n\nsince the guid will be converted into a binary representation, which\nhas no case.\n\nRoll our own dentry operations so that we can treat the variable name\npart of filenames (\"VarName\" in the above example) as case-sensitive,\nbut the guid portion as case-insensitive. That way, efivarfs will\nrefuse to create the above files if any one already exists.\n\nReported-by: Lingzhu Xiang <f7c9ddf28749ee6f0f41e3a77f8a3a9785261b94@redhat.com>\nCc: Matthew Garrett <10ea1ff373631291cadf45b163e9fbaf27d1200e@srcf.ucam.org>\nCc: Jeremy Kerr <ed2ecf6f990cdec851e11d5bf34a3b771a0783cf@canonical.com>\nCc: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\nSigned-off-by: Matt Fleming <b02f0790d66a0f0a6b369873bf6df37420fbe5dd@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/firmware\/efivars.c\n+++ drivers\/firmware\/efivars.c\n@@ -1043,6 +1043,84 @@\n \treturn -EINVAL;\n };\n \n+\/*\n+ * Compare two efivarfs file names.\n+ *\n+ * An efivarfs filename is composed of two parts,\n+ *\n+ *\t1. A case-sensitive variable name\n+ *\t2. A case-insensitive GUID\n+ *\n+ * So we need to perform a case-sensitive match on part 1 and a\n+ * case-insensitive match on part 2.\n+ *\/\n+static int efivarfs_d_compare(const struct dentry *parent, const struct inode *pinode,\n+\t\t\t const struct dentry *dentry, const struct inode *inode,\n+\t\t\t unsigned int len, const char *str,\n+\t\t\t const struct qstr *name)\n+{\n+\tint guid = len - GUID_LEN;\n+\n+\tif (name->len != len)\n+\t\treturn 1;\n+\n+\t\/* Case-sensitive compare for the variable name *\/\n+\tif (memcmp(str, name->name, guid))\n+\t\treturn 1;\n+\n+\t\/* Case-insensitive compare for the GUID *\/\n+\treturn strncasecmp(name->name + guid, str + guid, GUID_LEN);\n+}\n+\n+static int efivarfs_d_hash(const struct dentry *dentry,\n+\t\t\t const struct inode *inode, struct qstr *qstr)\n+{\n+\tunsigned long hash = init_name_hash();\n+\tconst unsigned char *s = qstr->name;\n+\tunsigned int len = qstr->len;\n+\n+\tif (!efivarfs_valid_name(s, len))\n+\t\treturn -EINVAL;\n+\n+\twhile (len-- > GUID_LEN)\n+\t\thash = partial_name_hash(*s++, hash);\n+\n+\t\/* GUID is case-insensitive. *\/\n+\twhile (len--)\n+\t\thash = partial_name_hash(tolower(*s++), hash);\n+\n+\tqstr->hash = end_name_hash(hash);\n+\treturn 0;\n+}\n+\n+\/*\n+ * Retaining negative dentries for an in-memory filesystem just wastes\n+ * memory and lookup time: arrange for them to be deleted immediately.\n+ *\/\n+static int efivarfs_delete_dentry(const struct dentry *dentry)\n+{\n+\treturn 1;\n+}\n+\n+static struct dentry_operations efivarfs_d_ops = {\n+\t.d_compare = efivarfs_d_compare,\n+\t.d_hash = efivarfs_d_hash,\n+\t.d_delete = efivarfs_delete_dentry,\n+};\n+\n+static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name)\n+{\n+\tstruct qstr q;\n+\n+\tq.name = name;\n+\tq.len = strlen(name);\n+\n+\tif (efivarfs_d_hash(NULL, NULL, &q))\n+\t\treturn NULL;\n+\n+\treturn d_alloc(parent, &q);\n+}\n+\n static int efivarfs_fill_super(struct super_block *sb, void *data, int silent)\n {\n \tstruct inode *inode = NULL;\n@@ -1058,6 +1136,7 @@\n \tsb->s_blocksize_bits = PAGE_CACHE_SHIFT;\n \tsb->s_magic = EFIVARFS_MAGIC;\n \tsb->s_op = &efivarfs_ops;\n+\tsb->s_d_op\t\t= &efivarfs_d_ops;\n \tsb->s_time_gran = 1;\n \n \tinode = efivarfs_get_inode(sb, NULL, S_IFDIR | 0755, 0);\n@@ -1098,7 +1177,7 @@\n \t\tif (!inode)\n \t\t\tgoto fail_name;\n \n-\t\tdentry = d_alloc_name(root, name);\n+\t\tdentry = efivarfs_alloc_dentry(root, name);\n \t\tif (!dentry)\n \t\t\tgoto fail_inode;\n \n@@ -1148,8 +1227,20 @@\n \t.kill_sb = efivarfs_kill_sb,\n };\n \n+\/*\n+ * Handle negative dentry.\n+ *\/\n+static struct dentry *efivarfs_lookup(struct inode *dir, struct dentry *dentry,\n+\t\t\t\t unsigned int flags)\n+{\n+\tif (dentry->d_name.len > NAME_MAX)\n+\t\treturn ERR_PTR(-ENAMETOOLONG);\n+\td_add(dentry, NULL);\n+\treturn NULL;\n+}\n+\n static const struct inode_operations efivarfs_dir_inode_operations = {\n-\t.lookup = simple_lookup,\n+\t.lookup = efivarfs_lookup,\n \t.unlink = efivarfs_unlink,\n \t.create = efivarfs_create,\n };\n"} {"commit":"da9da5857d067cc0e444d0c592b9733cc1574e45","subject":"gpio: msm-v3: Fix the INTR_POL_CTL bit configuration","message":"gpio: msm-v3: Fix the INTR_POL_CTL bit configuration\n\nAccording to the TLMM_v3 hardware spec the INTR_POL_CTL bit\nis to be set:\nLow for level low interrupts;\nHigh for level high interrupts;\nHigh for all edge interrupts.\nMake sure the software configures it as desired.\n\nChange-Id: I3369def7bd00e427c7dfe109bcdd4b6e207ad239\nSigned-off-by: Rohit Vaswani <178828d847a7966bf01ab61d225f258b7a82df35@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpio\/gpio-msm-v3.c\n+++ drivers\/gpio\/gpio-msm-v3.c\n@@ -183,10 +183,10 @@\n \telse\n \t\tcfg |= INTR_DECT_CTL_LEVEL;\n \n-\tif (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_LEVEL_HIGH))\n+\tif (type & IRQ_TYPE_LEVEL_LOW)\n+\t\tcfg &= ~INTR_POL_CTL_HI;\n+\telse\n \t\tcfg |= INTR_POL_CTL_HI;\n-\telse\n-\t\tcfg &= ~INTR_POL_CTL_HI;\n \n \t__raw_writel(cfg, GPIO_INTR_CFG(gpio));\n \t\/* Sometimes it might take a little while to update\n"} {"commit":"e655d122a71332d0d26b5c0909eb395da31af0c0","subject":"drm\/crtc: Fix potential NULL pointer dereference","message":"drm\/crtc: Fix potential NULL pointer dereference\n\ndrm_property_create_blob() could return NULL in which case NULL pointer\ndereference error (on connector->edid_blob_ptr) is possible. Return if\nconnector->edid_blob_ptr is NULL.\n\nFixes the following smatch error:\ndrivers\/gpu\/drm\/drm_crtc.c:3186 drm_mode_connector_update_edid_property()\nerror: potential null dereference 'connector->edid_blob_ptr'.\n(drm_property_create_blob returns null)\n\nSigned-off-by: Sachin Kamat <1c3b1584a6008857f36c03c58f657c0fc16fc09e@linaro.org>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/drm\/drm_crtc.c\n+++ drivers\/gpu\/drm\/drm_crtc.c\n@@ -3191,6 +3191,8 @@\n \tsize = EDID_LENGTH * (1 + edid->extensions);\n \tconnector->edid_blob_ptr = drm_property_create_blob(connector->dev,\n \t\t\t\t\t\t\t size, edid);\n+\tif (!connector->edid_blob_ptr)\n+\t\treturn -EINVAL;\n \n \tret = drm_connector_property_set_value(connector,\n \t\t\t\t\t dev->mode_config.edid_property,\n"} {"commit":"148f026a4de4a74eaa4ebf0423416cf367b27be2","subject":"imap: IDLE now sends \"Still here\" notifications to same user's connections at the same time. Perhaps this will save some battery power with mobile clients that open multiple connections.","message":"imap: IDLE now sends \"Still here\" notifications to same user's connections at the same time.\nPerhaps this will save some battery power with mobile clients that open\nmultiple connections.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-idle.c\n+++ src\/imap\/cmd-idle.c\n@@ -4,6 +4,7 @@\n #include \"ioloop.h\"\n #include \"istream.h\"\n #include \"ostream.h\"\n+#include \"crc32.h\"\n #include \"mail-storage-settings.h\"\n #include \"imap-commands.h\"\n #include \"imap-sync.h\"\n@@ -21,6 +22,7 @@\n \tunsigned int sync_pending:1;\n };\n \n+static void idle_add_keepalive_timeout(struct cmd_idle_context *ctx);\n static bool cmd_idle_continue(struct client_command_context *cmd);\n \n static void\n@@ -108,6 +110,8 @@\n \t several clients that really want to IDLE forever and there's not\n \t much harm in letting them do so. *\/\n \ttimeout_reset(ctx->client->to_idle);\n+\t\/* recalculate time for the next keepalive timeout *\/\n+\tidle_add_keepalive_timeout(ctx);\n }\n \n static void idle_sync_now(struct mailbox *box, struct cmd_idle_context *ctx)\n@@ -127,6 +131,22 @@\n \t\tctx->manual_cork = TRUE;\n \t\tidle_sync_now(box, ctx);\n \t}\n+}\n+\n+static void idle_add_keepalive_timeout(struct cmd_idle_context *ctx)\n+{\n+\tunsigned int interval = ctx->client->set->imap_idle_notify_interval;\n+\n+\tif (interval == 0)\n+\t\treturn;\n+\n+\tinterval -= (time(NULL) +\n+\t\t crc32_str(ctx->client->user->username)) % interval;\n+\n+\tif (ctx->keepalive_to != NULL)\n+\t\ttimeout_remove(&ctx->keepalive_to);\n+\tctx->keepalive_to = timeout_add(interval * 1000,\n+\t\t\t\t\tkeepalive_timeout, ctx);\n }\n \n static bool cmd_idle_continue(struct client_command_context *cmd)\n@@ -166,7 +186,7 @@\n \t}\n \tif (client->output->offset != orig_offset &&\n \t ctx->keepalive_to != NULL)\n-\t\ttimeout_reset(ctx->keepalive_to);\n+\t\tidle_add_keepalive_timeout(ctx);\n \n \tif (ctx->sync_pending) {\n \t\t\/* more changes occurred while we were sending changes to\n@@ -204,10 +224,7 @@\n \tctx = p_new(cmd->pool, struct cmd_idle_context, 1);\n \tctx->cmd = cmd;\n \tctx->client = client;\n-\n-\tctx->keepalive_to = client->set->imap_idle_notify_interval == 0 ? NULL :\n-\t\ttimeout_add(client->set->imap_idle_notify_interval * 1000,\n-\t\t\t keepalive_timeout, ctx);\n+\tidle_add_keepalive_timeout(ctx);\n \n \tif (client->mailbox != NULL) {\n \t\tconst struct mail_storage_settings *set;\n"} {"commit":"b2e6221241a4c22de69bd1e4e220dd24d59b40ca","subject":"locale: Fix polish keyboard layouts on MacOS (#8139)","message":"locale: Fix polish keyboard layouts on MacOS (#8139)\n\n","repos":"DavBfr\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/locale\/keyboard_apple.c\n+++ libfreerdp\/locale\/keyboard_apple.c\n@@ -140,8 +140,8 @@\n \t{ \"com.apple.keylayout.Oriya\", ORIYA },\n \t{ \"com.apple.keylayout.Persian\", KBD_PERSIAN },\n \t{ \"com.apple.keylayout.Persian-ISIRI2901\", KBD_PERSIAN },\n-\t{ \"com.apple.keylayout.Polish\", KBD_POLISH_PROGRAMMERS },\n-\t{ \"com.apple.keylayout.PolishPro\", KBD_UNITED_STATES_INTERNATIONAL },\n+\t{ \"com.apple.keylayout.Polish\", KBD_POLISH_214 },\n+\t{ \"com.apple.keylayout.PolishPro\", KBD_POLISH_PROGRAMMERS },\n \t{ \"com.apple.keylayout.Portuguese\", PORTUGUESE_STANDARD },\n \t{ \"com.apple.keylayout.Romanian\", KBD_ROMANIAN },\n \t{ \"com.apple.keylayout.Romanian-Standard\", KBD_ROMANIAN_STANDARD },\n"} {"commit":"c867df7043b738da4f4d358d7039c243a29b4272","subject":"drm\/edid: Reshuffle mode list construction to closer match the spec","message":"drm\/edid: Reshuffle mode list construction to closer match the spec\n\nAlso, document what the spec says to do.\n\nSigned-off-by: Adam Jackson <4482611cc290c2ce1399431891dcb9221c95f994@redhat.com>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/drm_edid.c\n+++ drivers\/gpu\/drm\/drm_edid.c\n@@ -1377,10 +1377,24 @@\n \n \tquirks = edid_get_quirks(edid);\n \n-\tnum_modes += add_established_modes(connector, edid);\n-\tnum_modes += add_standard_modes(connector, edid);\n+\t\/*\n+\t * EDID spec says modes should be preferred in this order:\n+\t * - preferred detailed mode\n+\t * - other detailed modes from base block\n+\t * - detailed modes from extension blocks\n+\t * - CVT 3-byte code modes\n+\t * - standard timing codes\n+\t * - established timing codes\n+\t * - modes inferred from GTF or CVT range information\n+\t *\n+\t * We don't quite implement this yet, but we're close.\n+\t *\n+\t * XXX order for additional mode types in extension blocks?\n+\t *\/\n \tnum_modes += add_detailed_info(connector, edid, quirks);\n \tnum_modes += add_detailed_info_eedid(connector, edid, quirks);\n+\tnum_modes += add_standard_modes(connector, edid);\n+\tnum_modes += add_established_modes(connector, edid);\n \n \tif (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))\n \t\tedid_fixup_preferred(connector, quirks);\n"} {"commit":"afcdbc867460b7ee4119bf4904e60f0e171c6dfb","subject":"drm: rename drm_unplug\/get_minor() to drm_minor_register\/unregister()","message":"drm: rename drm_unplug\/get_minor() to drm_minor_register\/unregister()\n\ndrm_get_minor() no longer allocates objects, and drm_unplug_minor() is now\nthe exact reverse of it. Rename it to _register\/unregister() so their\nname actually says what they do.\n\nFurthermore, remove the direct minor-ptr and instead pass the minor-type.\nThis way we know the actual slot of the minor and can reset it if\nrequired.\n\nSigned-off-by: David Herrmann <fb53b2ddb8d141e0cb39d7c67c2f81b6bc2eb0f7@gmail.com>\nReviewed-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/drm_stub.c\n+++ drivers\/gpu\/drm\/drm_stub.c\n@@ -302,18 +302,7 @@\n \t}\n }\n \n-\/**\n- * drm_get_minor - Register DRM minor\n- * @dev: DRM device\n- * @type: Type of minor\n- *\n- * Register minor of given type.\n- * Caller must hold the global DRM mutex.\n- *\n- * RETURNS:\n- * 0 on success, negative error code on failure.\n- *\/\n-static int drm_get_minor(struct drm_device *dev, unsigned int type)\n+static int drm_minor_register(struct drm_device *dev, unsigned int type)\n {\n \tstruct drm_minor *new_minor;\n \tint ret;\n@@ -362,18 +351,11 @@\n \treturn ret;\n }\n \n-\/**\n- * drm_unplug_minor - Unplug DRM minor\n- * @minor: Minor to unplug\n- *\n- * Unplugs the given DRM minor but keeps the object. So after this returns,\n- * minor->dev is still valid so existing open-files can still access it to get\n- * device information from their drm_file ojects.\n- * If the minor is already unplugged or if @minor is NULL, nothing is done.\n- * The global DRM mutex must be held by the caller.\n- *\/\n-static void drm_unplug_minor(struct drm_minor *minor)\n-{\n+static void drm_minor_unregister(struct drm_device *dev, unsigned int type)\n+{\n+\tstruct drm_minor *minor;\n+\n+\tminor = *drm_minor_get_slot(dev, type);\n \tif (!minor || !minor->kdev)\n \t\treturn;\n \n@@ -448,11 +430,9 @@\n void drm_unplug_dev(struct drm_device *dev)\n {\n \t\/* for a USB device *\/\n-\tif (drm_core_check_feature(dev, DRIVER_MODESET))\n-\t\tdrm_unplug_minor(dev->control);\n-\tif (dev->render)\n-\t\tdrm_unplug_minor(dev->render);\n-\tdrm_unplug_minor(dev->primary);\n+\tdrm_minor_unregister(dev, DRM_MINOR_LEGACY);\n+\tdrm_minor_unregister(dev, DRM_MINOR_RENDER);\n+\tdrm_minor_unregister(dev, DRM_MINOR_CONTROL);\n \n \tmutex_lock(&drm_global_mutex);\n \n@@ -623,15 +603,15 @@\n \n \tmutex_lock(&drm_global_mutex);\n \n-\tret = drm_get_minor(dev, DRM_MINOR_CONTROL);\n+\tret = drm_minor_register(dev, DRM_MINOR_CONTROL);\n \tif (ret)\n \t\tgoto err_minors;\n \n-\tret = drm_get_minor(dev, DRM_MINOR_RENDER);\n+\tret = drm_minor_register(dev, DRM_MINOR_RENDER);\n \tif (ret)\n \t\tgoto err_minors;\n \n-\tret = drm_get_minor(dev, DRM_MINOR_LEGACY);\n+\tret = drm_minor_register(dev, DRM_MINOR_LEGACY);\n \tif (ret)\n \t\tgoto err_minors;\n \n@@ -656,9 +636,9 @@\n \tif (dev->driver->unload)\n \t\tdev->driver->unload(dev);\n err_minors:\n-\tdrm_unplug_minor(dev->control);\n-\tdrm_unplug_minor(dev->render);\n-\tdrm_unplug_minor(dev->primary);\n+\tdrm_minor_unregister(dev, DRM_MINOR_LEGACY);\n+\tdrm_minor_unregister(dev, DRM_MINOR_RENDER);\n+\tdrm_minor_unregister(dev, DRM_MINOR_CONTROL);\n out_unlock:\n \tmutex_unlock(&drm_global_mutex);\n \treturn ret;\n@@ -690,8 +670,8 @@\n \tlist_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)\n \t\tdrm_rmmap(dev, r_list->map);\n \n-\tdrm_unplug_minor(dev->control);\n-\tdrm_unplug_minor(dev->render);\n-\tdrm_unplug_minor(dev->primary);\n+\tdrm_minor_unregister(dev, DRM_MINOR_LEGACY);\n+\tdrm_minor_unregister(dev, DRM_MINOR_RENDER);\n+\tdrm_minor_unregister(dev, DRM_MINOR_CONTROL);\n }\n EXPORT_SYMBOL(drm_dev_unregister);\n"} {"commit":"67e05c6f979ea4267265103b6b4ddad5d319991b","subject":"msm: kgsl: Turn on clock gating for A330 devices","message":"msm: kgsl: Turn on clock gating for A330 devices\n\nTurn on HW clock gating for A330 by writing the most aggressive\ngating values to A330_CLK_CTL and A330_GPR0_CTL registers.\n\nChange-Id: Ife5d1d900b1f952b8497e9e8fff622c1aa66cd5a\nSigned-off-by: Harsh Vardhan Dwivedi <a7e43e45e04e37f02ace46acd908f2c0386d09c8@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/msm\/a3xx_reg.h\n+++ drivers\/gpu\/msm\/a3xx_reg.h\n@@ -539,9 +539,9 @@\n \/* RBBM_CLOCK_CTL default value *\/\n #define A305_RBBM_CLOCK_CTL_DEFAULT 0xAAAAAAAA\n #define A320_RBBM_CLOCK_CTL_DEFAULT 0xBFFFFFFF\n-#define A330_RBBM_CLOCK_CTL_DEFAULT 0xBFFCFFFF\n-\n-#define A330_RBBM_GPR0_CTL_DEFAULT 0x00000000\n+#define A330_RBBM_CLOCK_CTL_DEFAULT 0xAAAAAAAE\n+\n+#define A330_RBBM_GPR0_CTL_DEFAULT 0x0AE2B8AE\n \n \/* COUNTABLE FOR SP PERFCOUNTER *\/\n #define SP_FS_FULL_ALU_INSTRUCTIONS 0x0E\n"} {"commit":"1c7a9719723a5a0762f2c810cbb6e2bb3510808b","subject":"drivers\/i2s_ll_stm32.c: Fix dma_callback() signature","message":"drivers\/i2s_ll_stm32.c: Fix dma_callback() signature\n\nAlign the dma_callback() signature to the new one in order\nto avoid warnings during compilation.\n\nSigned-off-by: Armando Visconti <d93ca24ded08d03c3aa60af6d2fd0eb7ce54da11@st.com>\n","repos":"nashif\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,nashif\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,explora26\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,explora26\/zephyr,punitvara\/zephyr,ldts\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,ldts\/zephyr,finikorg\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,nashif\/zephyr,explora26\/zephyr,nashif\/zephyr,nashif\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,galak\/zephyr,explora26\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/i2s\/i2s_ll_stm32.c\n+++ drivers\/i2s\/i2s_ll_stm32.c\n@@ -447,7 +447,7 @@\n static void tx_stream_disable(struct stream *stream, struct device *dev);\n \n \/* This function is executed in the interrupt context *\/\n-static void dma_rx_callback(struct device *dev_dma, u32_t channel, int status)\n+static void dma_rx_callback(void *arg, u32_t channel, int status)\n {\n \tstruct device *dev = get_dev_from_rx_dma_channel(channel);\n \tconst struct i2s_stm32_cfg *cfg = DEV_CFG(dev);\n@@ -513,7 +513,7 @@\n \trx_stream_disable(stream, dev);\n }\n \n-static void dma_tx_callback(struct device *dev_dma, u32_t channel, int status)\n+static void dma_tx_callback(void *arg, u32_t channel, int status)\n {\n \tstruct device *dev = get_dev_from_tx_dma_channel(channel);\n \tconst struct i2s_stm32_cfg *cfg = DEV_CFG(dev);\n"} {"commit":"ffddf1717b0d388879c646eaf6261a2b393c06ad","subject":"pdc202xx_old: kill resetproc() method","message":"pdc202xx_old: kill resetproc() method\n\nThe driver's resetproc() method resets both channels at once -- most probably\nby driving RESET- on them. Not only such reset can severely disturb concurrent\noperations on another channel, it also ensues 2-second delay, while there's no\napparent reason why SRST reset being performed prior to resetproc() call needs\nto be followed up by another reset.\n\nSigned-off-by: Sergei Shtylyov <38a867ea26f35d3eeb42270f1bc7b9d1d135e6a2@ru.mvista.com>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/pdc202xx_old.c\n+++ drivers\/ide\/pdc202xx_old.c\n@@ -203,22 +203,6 @@\n \treturn ide_dma_end(drive);\n }\n \n-static void pdc202xx_reset(ide_drive_t *drive)\n-{\n-\tide_hwif_t *hwif\t= drive->hwif;\n-\tunsigned long high_16\t= hwif->extra_base - 16;\n-\tu8 udma_speed_flag\t= inb(high_16 | 0x001f);\n-\n-\tprintk(KERN_WARNING \"PDC202xx: software reset...\\n\");\n-\n-\toutb(udma_speed_flag | 0x10, high_16 | 0x001f);\n-\tmdelay(100);\n-\toutb(udma_speed_flag & ~0x10, high_16 | 0x001f);\n-\tmdelay(2000);\t\/* 2 seconds ?! *\/\n-\n-\tide_set_max_pio(drive);\n-}\n-\n static int init_chipset_pdc202xx(struct pci_dev *dev)\n {\n \tunsigned long dmabase = pci_resource_start(dev, 4);\n@@ -279,7 +263,6 @@\n \t.set_pio_mode\t\t= pdc202xx_set_pio_mode,\n \t.set_dma_mode\t\t= pdc202xx_set_mode,\n \t.quirkproc\t\t= pdc202xx_quirkproc,\n-\t.resetproc\t\t= pdc202xx_reset,\n \t.cable_detect\t\t= pdc2026x_cable_detect,\n };\n \n"} {"commit":"4fd9fcf7c1ee6c339504525b43ad5e77334ff1b5","subject":"Input: kxtj9 - fix bug in probe()","message":"Input: kxtj9 - fix bug in probe()\n\nWe are testing the wrong variable here. I believe tj9->input_dev\nis always NULL at this point, so probe() will fail.\n\nSigned-off-by: Dan Carpenter <72501f147b2753e6660fdce744d9ac3084854f5e@gmail.com>\nSigned-off-by: Dmitry Torokhov <10a8c465cefc9bdd6c925e26964d23c90f1141cc@mail.ru>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/input\/misc\/kxtj9.c\n+++ drivers\/input\/misc\/kxtj9.c\n@@ -301,7 +301,7 @@\n \tint err;\n \n \tinput_dev = input_allocate_device();\n-\tif (!tj9->input_dev) {\n+\tif (!input_dev) {\n \t\tdev_err(&tj9->client->dev, \"input device allocate failed\\n\");\n \t\treturn -ENOMEM;\n \t}\n"} {"commit":"9419045f842e7b763928636f9c61dfa134b2052d","subject":"V4L\/DVB (3616a): cpia cleanups","message":"V4L\/DVB (3616a): cpia cleanups\n\none printk needs a newline at end;\nbetter MODULE_PARM_DESC text formatting;\ndon't need to init static data to 0;\n\nSigned-off-by: Randy Dunlap <6f29df8e90a57f1ba61ffd63b0468c86bb6d3a99@xenotime.net>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/cpia.c\n+++ drivers\/media\/video\/cpia.c\n@@ -64,14 +64,13 @@\n MODULE_SUPPORTED_DEVICE(\"video\");\n #endif\n \n-static unsigned short colorspace_conv = 0;\n+static unsigned short colorspace_conv;\n module_param(colorspace_conv, ushort, 0444);\n MODULE_PARM_DESC(colorspace_conv,\n-\t\t \"\\n<n> Colorspace conversion:\"\n-\t\t \"\\n0 = disable\"\n-\t\t \"\\n1 = enable\"\n-\t\t \"\\nDefault value is 0\"\n-\t\t \"\\n\");\n+ \" Colorspace conversion:\"\n+ \"\\n 0 = disable, 1 = enable\"\n+ \"\\n Default value is 0\"\n+ );\n \n #define ABOUT \"V4L-Driver for Vision CPiA based cameras\"\n \n@@ -4042,7 +4041,7 @@\n \t \"allowed, it is disabled by default now. Users should fix the \"\n \t \"applications in case they don't work without conversion \"\n \t \"reenabled by setting the 'colorspace_conv' module \"\n-\t \"parameter to 1\");\n+\t \"parameter to 1\\n\");\n \n #ifdef CONFIG_PROC_FS\n \tproc_cpia_create();\n"} {"commit":"a88d79bbca04330d87e2d8e976bb1149814a442f","subject":"getting sloppy","message":"getting sloppy\n","repos":"ggranito\/pagerank,ggranito\/pagerank","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- blocking_v1\/pagerank.c\n+++ blocking_v1\/pagerank.c\n@@ -31,7 +31,7 @@\n \/\/find edges pointing toward i\n if (g(j,i+start)) { \n if (j==0 || j==1){\n- printf(\"j: %d, wnew[0] %g, wlocal[0]\\n\", j, wnew[0], wlocal[0]);\n+ printf(\"i: %d, j: %d, wnew[0] %g, wlocal[0] %g\\n\", i, j, wnew[0], wlocal[0]);\n }\n \/\/count out degree of j\n sum += wnew[j]\/(double)degree[j];\n"} {"commit":"425ef5d75de25c53b6dc79008fe3678d2fe7e8ed","subject":"sony-laptop: bump version to 0.6","message":"sony-laptop: bump version to 0.6\n\nSigned-off-by: Mattia Dongili <564ea3fba55f6e029e83434fb6b3f3b9c7ed334e@linux.it>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/misc\/sony-laptop.c\n+++ drivers\/misc\/sony-laptop.c\n@@ -73,7 +73,7 @@\n \tif (debug) printk(KERN_WARNING DRV_PFX msg);\t\\\n } while (0)\n \n-#define SONY_LAPTOP_DRIVER_VERSION\t\"0.5\"\n+#define SONY_LAPTOP_DRIVER_VERSION\t\"0.6\"\n \n #define SONY_NC_CLASS\t\t\"sony-nc\"\n #define SONY_NC_HID\t\t\"SNY5001\"\n"} {"commit":"ce4a37f7c93e9b12ac1452bedd823d73c43c0e63","subject":"mtd: remove unnecessary casts of void ptr returning alloc function return values","message":"mtd: remove unnecessary casts of void ptr returning alloc function return values\n\nThe [vk][cmz]alloc(_node) family of functions return void pointers which\nit's completely unnecessary\/pointless to cast to other pointer types since\nthat happens implicitly.\n\nThis patch removes such casts from drivers\/mtd\/\n\nSigned-off-by: Jesper Juhl <7323a5431d1c31072983a6a5bf23745b655ddf59@chaosbits.net>\nSigned-off-by: Artem Bityutskiy <19b5733dcea388885746d36043d3568bba5b4df7@nokia.com>\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mtd\/maps\/tqm8xxl.c\n+++ drivers\/mtd\/maps\/tqm8xxl.c\n@@ -139,7 +139,7 @@\n \t\t\tgoto error_mem;\n \t\t}\n \n-\t\tmap_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);\n+\t\tmap_banks[idx]->name = kmalloc(16, GFP_KERNEL);\n \n \t\tif (!map_banks[idx]->name) {\n \t\t\tret = -ENOMEM;\n"} {"commit":"fa4a7ef36ec834fee1719636b30d2f28f4cb0166","subject":"igb: allow tx of pre-formatted vlan tagged packets","message":"igb: allow tx of pre-formatted vlan tagged packets\n\nWhen the 82575 is fed 802.1q packets, it chokes with\nan error of the form:\n\nigb 0000:08:00.1 partial checksum but proto=81!\n\nAs the logic there was not smart enough to look into\nthe vlan header to pick out the encapsulated protocol.\n\nThere are times when we'd like to send these packets\nout without having to configure a vlan on the interface.\nHere we check for the vlan tag and allow the packet to\ngo out with the correct hardware checksum.\n\nThanks to Kand Ly <kand@riverbed.com> for discovering the\nissue and the coming up with a solution. This patch is\nbased upon his work.\n\nSigned-off-by: Arthur Jones <e0a4167e24b3738088c566c3997a0d4144e49f78@riverbed.com>\nSigned-off-by: Jeff Kirsher <87e35f5be20bb3e67f4ba6b86f5f6be3085b1b3a@intel.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/igb\/igb_main.c\n+++ drivers\/net\/igb\/igb_main.c\n@@ -3008,7 +3008,18 @@\n \t\ttu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);\n \n \t\tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n-\t\t\tswitch (skb->protocol) {\n+\t\t\t__be16 protocol;\n+\n+\t\t\tif (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {\n+\t\t\t\tconst struct vlan_ethhdr *vhdr =\n+\t\t\t\t (const struct vlan_ethhdr*)skb->data;\n+\n+\t\t\t\tprotocol = vhdr->h_vlan_encapsulated_proto;\n+\t\t\t} else {\n+\t\t\t\tprotocol = skb->protocol;\n+\t\t\t}\n+\n+\t\t\tswitch (protocol) {\n \t\t\tcase cpu_to_be16(ETH_P_IP):\n \t\t\t\ttu_cmd |= E1000_ADVTXD_TUCMD_IPV4;\n \t\t\t\tif (ip_hdr(skb)->protocol == IPPROTO_TCP)\n"} {"commit":"f7c8539801480bf39f1792daf562c664ee6ad37b","subject":"net\/sfc\/base: fix field order in filter spec struct","message":"net\/sfc\/base: fix field order in filter spec struct\n\nFields in the struct efx_filter_spec_t starting from efs_outer_vid\nare hashed for software filter lookup. efs_mark is not a matching\ncriteria. Exclude efs_mark from hash.\n\nFixes: 5f78af523912 (\"net\/sfc: support MARK and FLAG actions in flow API\")\nCc: stable@dpdk.org\n\nSigned-off-by: Igor Romanov <945ea196dab32ad63762a1b623439a95515e898a@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <ac94ab2a8fe9a9a087f6e24dcbc16626b52c07e8@solarflare.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/sfc\/base\/efx.h\n+++ drivers\/net\/sfc\/base\/efx.h\n@@ -2878,6 +2878,8 @@\n \tefx_filter_flags_t\t\tefs_flags;\n \tuint16_t\t\t\tefs_dmaq_id;\n \tuint32_t\t\t\tefs_rss_context;\n+\tuint32_t\t\t\tefs_mark;\n+\t\/* Fields below here are hashed for software filter lookup *\/\n \tuint16_t\t\t\tefs_outer_vid;\n \tuint16_t\t\t\tefs_inner_vid;\n \tuint8_t\t\t\t\tefs_loc_mac[EFX_MAC_ADDR_LEN];\n@@ -2891,7 +2893,6 @@\n \tefx_oword_t\t\t\tefs_loc_host;\n \tuint8_t\t\t\t\tefs_vni_or_vsid[EFX_VNI_OR_VSID_LEN];\n \tuint8_t\t\t\t\tefs_ifrm_loc_mac[EFX_MAC_ADDR_LEN];\n-\tuint32_t\t\t\tefs_mark;\n } efx_filter_spec_t;\n \n \n"} {"commit":"bcd218be5aebed94951a750b1d477aea86fb68ea","subject":"smsc95xx: remove EEPROM loaded check","message":"smsc95xx: remove EEPROM loaded check\n\nThe eeprom read & write commands currently check the E2P_CMD_LOADED_ bit is\nset before allowing any operations. This prevents any reading or writing\nunless a correctly programmed EEPROM is installed.\n\nThis patch removes the check, so it is possible to program blank EEPROMS\nvia ethtool.\n\nSigned-off-by: Steve Glendinning <99263d2cb5601ab4c3ecc128cb043592cdad6c65@smsc.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/usb\/smsc95xx.c\n+++ drivers\/net\/usb\/smsc95xx.c\n@@ -220,11 +220,6 @@\n \tdo {\n \t\tsmsc95xx_read_reg(dev, E2P_CMD, &val);\n \n-\t\tif (!(val & E2P_CMD_LOADED_)) {\n-\t\t\tdevwarn(dev, \"No EEPROM present\");\n-\t\t\treturn -EIO;\n-\t\t}\n-\n \t\tif (!(val & E2P_CMD_BUSY_))\n \t\t\treturn 0;\n \n"} {"commit":"bb55dc2ae4367b8f711d43a2f8668a6ed42c4fd3","subject":"NFC: nfcmrvl: Fix possible memory leak issue","message":"NFC: nfcmrvl: Fix possible memory leak issue\n\nThis patch fixes memory leaks in the error paths of\nnfcmrvl_nci_register_dev() routine.\n\nReported-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Amitkumar Karwar <7343c7ffb424bf4c3ebd1cd0c94117b3c12118ff@marvell.com>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"55c1d7c60d9b269551cd7cc31e6be8323e1d94ec","subject":"regulator: fix voltage range in da9034 ldo12","message":"regulator: fix voltage range in da9034 ldo12\n\nSigned-off-by: Roel Kluin <aa9c6213291cec1ff07688554fb7b904b9ffe4e3@gmail.com>\nSigned-off-by: Haojian Zhuang <979139d45d262f0480136b0da512e0afa0fe79d3@marvell.com>\nAcked-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\nSigned-off-by: Liam Girdwood <a57ef363056e61beffa2efa59c68550d40db03b0@slimlogic.co.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/regulator\/da903x.c\n+++ drivers\/regulator\/da903x.c\n@@ -301,7 +301,7 @@\n \t}\n \n \tval = (min_uV - info->min_uV + info->step_uV - 1) \/ info->step_uV;\n-\tval = (val > 7 && val < 20) ? 8 : val - 12;\n+\tval = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);\n \tval <<= info->vol_shift;\n \tmask = ((1 << info->vol_nbits) - 1) << info->vol_shift;\n \n"} {"commit":"5d062d6ea8d5aa4a39b7024c10b2cef22695989f","subject":"board\/gimble\/charger.c: Format with clang-format","message":"board\/gimble\/charger.c: Format with clang-format\n\nBUG=b:236386294\nBRANCH=none\nTEST=none\n\nChange-Id: I38861c8c35833d8fade2ee1bcce5f9c04d638d39\nSigned-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3728411\nReviewed-by: Jeremy Bettis <4df7b5147fee087dca33c181f288ee7dbf56e022@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- board\/gimble\/charger.c\n+++ board\/gimble\/charger.c\n@@ -0,0 +1,90 @@\n+\/* Copyright 2021 The Chromium OS Authors. All rights reserved.\n+ * Use of this source code is governed by a BSD-style license that can be\n+ * found in the LICENSE file.\n+ *\/\n+\n+#include \"common.h\"\n+\n+#include \"charge_manager.h\"\n+#include \"charge_state_v2.h\"\n+#include \"charger.h\"\n+#include \"compile_time_macros.h\"\n+#include \"console.h\"\n+#include \"driver\/charger\/bq25710.h\"\n+#include \"usbc_ppc.h\"\n+#include \"usb_pd.h\"\n+#include \"util.h\"\n+\n+#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)\n+#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)\n+\n+#ifndef CONFIG_ZEPHYR\n+\/* Charger Chip Configuration *\/\n+const struct charger_config_t chg_chips[] = {\n+\t{\n+\t\t.i2c_port = I2C_PORT_CHARGER,\n+\t\t.i2c_addr_flags = BQ25710_SMBUS_ADDR1_FLAGS,\n+\t\t.drv = &bq25710_drv,\n+\t},\n+};\n+BUILD_ASSERT(ARRAY_SIZE(chg_chips) == CHARGER_NUM);\n+#endif\n+\n+int board_set_active_charge_port(int port)\n+{\n+\tint is_valid_port = board_is_usb_pd_port_present(port);\n+\tint i;\n+\n+\tif (port == CHARGE_PORT_NONE) {\n+\t\tCPRINTSUSB(\"Disabling all charger ports\");\n+\n+\t\t\/* Disable all ports. *\/\n+\t\tfor (i = 0; i < ppc_cnt; i++) {\n+\t\t\t\/*\n+\t\t\t * Do not return early if one fails otherwise we can\n+\t\t\t * get into a boot loop assertion failure.\n+\t\t\t *\/\n+\t\t\tif (ppc_vbus_sink_enable(i, 0))\n+\t\t\t\tCPRINTSUSB(\"Disabling C%d as sink failed.\", i);\n+\t\t}\n+\n+\t\treturn EC_SUCCESS;\n+\t} else if (!is_valid_port) {\n+\t\treturn EC_ERROR_INVAL;\n+\t}\n+\n+\t\/* Check if the port is sourcing VBUS. *\/\n+\tif (ppc_is_sourcing_vbus(port)) {\n+\t\tCPRINTFUSB(\"Skip enable C%d\", port);\n+\t\treturn EC_ERROR_INVAL;\n+\t}\n+\n+\tCPRINTSUSB(\"New charge port: C%d\", port);\n+\n+\t\/*\n+\t * Turn off the other ports' sink path FETs, before enabling the\n+\t * requested charge port.\n+\t *\/\n+\tfor (i = 0; i < ppc_cnt; i++) {\n+\t\tif (i == port)\n+\t\t\tcontinue;\n+\n+\t\tif (ppc_vbus_sink_enable(i, 0))\n+\t\t\tCPRINTSUSB(\"C%d: sink path disable failed.\", i);\n+\t}\n+\n+\t\/* Enable requested charge port. *\/\n+\tif (ppc_vbus_sink_enable(port, 1)) {\n+\t\tCPRINTSUSB(\"C%d: sink path enable failed.\", port);\n+\t\treturn EC_ERROR_UNKNOWN;\n+\t}\n+\n+\treturn EC_SUCCESS;\n+}\n+\n+__overridable void board_set_charge_limit(int port, int supplier, int charge_ma,\n+\t\t\t\t\t int max_ma, int charge_mv)\n+{\n+\tcharge_set_input_current_limit(\n+\t\tMAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), charge_mv);\n+}\n"} {"commit":"65f767a363c31c9213031aaee61d23c594153ea3","subject":"[broadway] NULL out ref_surface on resize too","message":"[broadway] NULL out ref_surface on resize too\n","repos":"jessevdk\/gtk,msteinert\/gtk,grubersjoe\/adwaita,ebassi\/gtk,Adamovskiy\/gtk,jadahl\/gtk,davidgumberg\/gtk,chergert\/gtk,simokivimaki\/gtk,ahodesuka\/gtk,Lyude\/gtk-,jadahl\/gtk,jigpu\/gtk,Lyude\/gtk-,jigpu\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,jigpu\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,davidgumberg\/gtk,msteinert\/gtk,ahodesuka\/gtk,msteinert\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,davidgumberg\/gtk,jadahl\/gtk,jadahl\/gtk,grubersjoe\/adwaita,chergert\/gtk,jadahl\/gtk,chergert\/gtk,ahodesuka\/gtk,Lyude\/gtk-,jigpu\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,jessevdk\/gtk,Lyude\/gtk-,alexlarsson\/gtk,jigpu\/gtk,ebassi\/gtk,ebassi\/gtk,davidt\/gtk,msteinert\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,davidt\/gtk,Adamovskiy\/gtk,chergert\/gtk,bratsche\/gtk-,chergert\/gtk,Distrotech\/gtk2,jessevdk\/gtk,simokivimaki\/gtk,jigpu\/gtk,chergert\/gtk,Adamovskiy\/gtk,Distrotech\/gtk2,Distrotech\/gtk2,bratsche\/gtk-,Distrotech\/gtk2,msteinert\/gtk,jessevdk\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,jessevdk\/gtk,Distrotech\/gtk2,alexlarsson\/gtk,alexlarsson\/gtk,ebassi\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,msteinert\/gtk,jigpu\/gtk,chergert\/gtk,alexlarsson\/gtk,jadahl\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,jigpu\/gtk,Lyude\/gtk-,jadahl\/gtk,ahodesuka\/gtk,davidt\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,davidt\/gtk,bratsche\/gtk-,grubersjoe\/adwaita,Distrotech\/gtk2,Adamovskiy\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,ahodesuka\/gtk,bratsche\/gtk-,simokivimaki\/gtk,Sidnioulz\/SandboxGtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,davidt\/gtk,davidt\/gtk,chergert\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,jadahl\/gtk,grubersjoe\/adwaita,ebassi\/gtk,simokivimaki\/gtk,Lyude\/gtk-,simokivimaki\/gtk,simokivimaki\/gtk,Sidnioulz\/SandboxGtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk\/broadway\/gdkdrawable-broadway.c\n+++ gdk\/broadway\/gdkdrawable-broadway.c\n@@ -113,6 +113,13 @@\n cairo_surface_destroy (old);\n cairo_surface_destroy (last_old);\n }\n+\n+ if (impl->ref_surface)\n+ {\n+ cairo_surface_set_user_data (impl->ref_surface, &gdk_broadway_cairo_key,\n+\t\t\t\t NULL, NULL);\n+ impl->ref_surface = NULL;\n+ }\n }\n \n \/*****************************************************\n"} {"commit":"03de4eb5246739681ddf87beb46b3431d76f125a","subject":"remove unused broken copy constructor","message":"remove unused broken copy constructor\n\nBUG: 286738\n","repos":"KDE\/kremotecontrol,KDE\/kremotecontrol,KDE\/kremotecontrol","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libkremotecontrol\/keypressaction.h\n+++ libkremotecontrol\/keypressaction.h\n@@ -29,7 +29,6 @@\n public:\n KeypressAction(const QString &button);\n KeypressAction();\n- KeypressAction(const KeypressAction &action);\n virtual ~KeypressAction(){};\n \n virtual QString name() const;\n"} {"commit":"8114d1b65048180a6518f72f673826a82c0041cc","subject":"Fix a typo","message":"Fix a typo\n\n","repos":"BueVest\/liblouis,hammera\/liblouis,hammera\/liblouis,IndexBraille\/liblouis,BueVest\/liblouis,BueVest\/liblouis,BueVest\/liblouis,hammera\/liblouis,IndexBraille\/liblouis,hammera\/liblouis,liblouis\/liblouis,liblouis\/liblouis,vsmontalvao\/liblouis,hammera\/liblouis,BueVest\/liblouis,liblouis\/liblouis,liblouis\/liblouis,BueVest\/liblouis,IndexBraille\/liblouis,hammera\/liblouis,vsmontalvao\/liblouis,vsmontalvao\/liblouis,IndexBraille\/liblouis,liblouis\/liblouis,vsmontalvao\/liblouis,IndexBraille\/liblouis,vsmontalvao\/liblouis,liblouis\/liblouis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- liblouis\/compileTranslationTable.c\n+++ liblouis\/compileTranslationTable.c\n@@ -698,7 +698,7 @@\n tableUsed = sizeof (*table) + OFFSETSIZE;\t\/*So no offset is ever zero *\/\n if (!(table = malloc (startSize)))\n {\n- compileError (nested, \"Not enough merory\");\n+ compileError (nested, \"Not enough memory\");\n if (table != NULL)\n \tfree (table);\n table = NULL;\n"} {"commit":"2dc9d65b1c37240e55f1cd09a479ccf9cb01b876","subject":"Improve array bounds checking when parsing chars","message":"Improve array bounds checking when parsing chars\n\nFixes #728\n","repos":"hammera\/liblouis,BueVest\/liblouis,BueVest\/liblouis,liblouis\/liblouis,liblouis\/liblouis,hammera\/liblouis,liblouis\/liblouis,hammera\/liblouis,liblouis\/liblouis,BueVest\/liblouis,hammera\/liblouis,liblouis\/liblouis,liblouis\/liblouis,BueVest\/liblouis,BueVest\/liblouis,hammera\/liblouis,BueVest\/liblouis,hammera\/liblouis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- liblouis\/compileTranslationTable.c\n+++ liblouis\/compileTranslationTable.c\n@@ -1132,8 +1132,9 @@\n \t\t\t\t}\n \t\t\t\tin++;\n \t\t\t}\n-\t\t\tif (out >= MAXSTRING) {\n-\t\t\t\tresult->length = out;\n+\t\t\tif (out >= MAXSTRING - 1) {\n+\t\t\t\tcompileError(nested, \"Token too long\");\n+\t\t\t\tresult->length = MAXSTRING - 1;\n \t\t\t\treturn 1;\n \t\t\t}\n \t\t\tresult->chars[out++] = (widechar)ch;\n@@ -1145,8 +1146,9 @@\n \t\t\tif (ch >= first0Bit[numBytes]) break;\n \t\tutf32 = ch & (0XFF - first0Bit[numBytes]);\n \t\tfor (k = 0; k < numBytes; k++) {\n-\t\t\tif (in >= MAXSTRING) break;\n-\t\t\tif (out >= MAXSTRING) {\n+\t\t\tif (in >= MAXSTRING - 1) break;\n+\t\t\tif (out >= MAXSTRING - 1) {\n+\t\t\t\tcompileError(nested, \"Token too long\");\n \t\t\t\tresult->length = lastOutSize;\n \t\t\t\treturn 1;\n \t\t\t}\n@@ -1158,7 +1160,8 @@\n \t\t\t}\n \t\t\tutf32 = (utf32 << 6) + (token->chars[in++] & 0x3f);\n \t\t}\n-\t\tif (out >= MAXSTRING) {\n+\t\tif (out >= MAXSTRING - 1) {\n+\t\t\tcompileError(nested, \"Token too long\");\n \t\t\tresult->length = lastOutSize;\n \t\t\treturn 1;\n \t\t}\n"} {"commit":"e7f7fc73693e0a9de693f261d63aa681f7979c33","subject":"rtc: max77686: Allow the max77686 rtc to wakeup the system","message":"rtc: max77686: Allow the max77686 rtc to wakeup the system\n\nThis series add support for the Real Time clock present in the Maxim 77802\nPower Managment IC. The version number is quite high because it\npreviously was part of a bigger series [0] that aimed to add support for\nall the devices in the max77802 PMIC. But now that the max77802\ndependencies were already merged for 3.17, the series were split but I\nkept the version numbering.\n\nWhile working on the max77802 rtc support a lot of feedback was given and\nthe issues pointed out also apply to a driver for a similar PMIC RTC\n(max77686). So patches 01\/06 to 05\/06 in the series are cleanups for the\nmax77686 driver and patch 06\/06 adds the support for the max77802 RTC.\n\nThe series were tested on an Exynos5250 Snow (max77686) and\nExynos5420 Peach Pit (max77802) machines.\n\nThis patch (of 6):\n\nThe max77686 includes an RTC that keeps power during suspend. It's\nconvenient to be able to use it as a wakeup source.\n\nSigned-off-by: Doug Anderson <49983c4a76b998672954ed5edf4a62db4a336502@chromium.org>\nSigned-off-by: Javier Martinez Canillas <039000e09e601bba70626bd0fbe59654c9cf8cac@collabora.co.uk>\nReviewed-by: Krzysztof Kozlowski <1a8531307367602b8284517edb33d53d54e5ce8e@samsung.com>\nCc: Alessandro Zummo <f0b9bd96bf07bfecc189c62159960134588fafe5@towertech.it>\nCc: Olof Johansson <8c69ee23f3f44f8162a64d579c1fa25c2f55298a@lixom.net>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/rtc\/rtc-max77686.c\n+++ drivers\/rtc\/rtc-max77686.c\n@@ -583,6 +583,33 @@\n #endif \/* MAX77686_RTC_WTSR_SMPL *\/\n }\n \n+#ifdef CONFIG_PM_SLEEP\n+static int max77686_rtc_suspend(struct device *dev)\n+{\n+\tif (device_may_wakeup(dev)) {\n+\t\tstruct max77686_rtc_info *info = dev_get_drvdata(dev);\n+\n+\t\treturn enable_irq_wake(info->virq);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int max77686_rtc_resume(struct device *dev)\n+{\n+\tif (device_may_wakeup(dev)) {\n+\t\tstruct max77686_rtc_info *info = dev_get_drvdata(dev);\n+\n+\t\treturn disable_irq_wake(info->virq);\n+\t}\n+\n+\treturn 0;\n+}\n+#endif\n+\n+static SIMPLE_DEV_PM_OPS(max77686_rtc_pm_ops,\n+\t\t\t max77686_rtc_suspend, max77686_rtc_resume);\n+\n static const struct platform_device_id rtc_id[] = {\n \t{ \"max77686-rtc\", 0 },\n \t{},\n@@ -592,6 +619,7 @@\n \t.driver\t\t= {\n \t\t.name\t= \"max77686-rtc\",\n \t\t.owner\t= THIS_MODULE,\n+\t\t.pm\t= &max77686_rtc_pm_ops,\n \t},\n \t.probe\t\t= max77686_rtc_probe,\n \t.shutdown\t= max77686_rtc_shutdown,\n"} {"commit":"1ac0fec2c683c2ecbf569d9b2b96c1334a821d20","subject":"Proper default handling in switch statement","message":"Proper default handling in switch statement\n","repos":"monsta\/libmateweather,monsta\/libmateweather,monsta\/libmateweather,mate-desktop\/libmateweather,mate-desktop\/libmateweather,mate-desktop\/libmateweather,monsta\/libmateweather","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmateweather\/mateweather-prefs.c\n+++ libmateweather\/mateweather-prefs.c\n@@ -95,8 +95,9 @@\n case TEMP_UNIT_FAHRENHEIT:\n \/* translators: Fahrenheit *\/\n return N_(\"F\");\n+\tdefault:\n+ \t return N_(\"Invalid\");\n }\n- return N_(\"Invalid\");\n }\n \n const char *\n@@ -120,8 +121,9 @@\n case SPEED_UNIT_BFT:\n \/* translators: wind speed *\/\n return N_(\"Beaufort scale\");\n+\tdefault:\n+ \t return N_(\"Invalid\");\n }\n- return N_(\"Invalid\");\n }\n \n const char *\n@@ -148,8 +150,9 @@\n case PRESSURE_UNIT_ATM:\n \/* translators: atmosphere *\/\n return N_(\"atm\");\n+\tdefault:\n+ \t return N_(\"Invalid\");\n }\n- return N_(\"Invalid\");\n }\n \n const char *\n@@ -167,6 +170,7 @@\n case DISTANCE_UNIT_MILES:\n \/* translators: miles *\/\n return N_(\"mi\");\n+\tdefault:\n+ \t return N_(\"Invalid\");\n }\n- return N_(\"Invalid\");\n }\n"} {"commit":"305974fe011d9c2061b8da668c7da63ef0a4346d","subject":"aacraid: aac_src_intr_message() can be static","message":"aacraid: aac_src_intr_message() can be static\n\nSigned-off-by: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nAcked-by: Mahesh Rajashekhara <62fead69ee4ecd25e13f469237fb8a47d490c0cc@pmcs.com>\nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Odin.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/aacraid\/src.c\n+++ drivers\/scsi\/aacraid\/src.c\n@@ -46,7 +46,7 @@\n \n static int aac_src_get_sync_status(struct aac_dev *dev);\n \n-irqreturn_t aac_src_intr_message(int irq, void *dev_id)\n+static irqreturn_t aac_src_intr_message(int irq, void *dev_id)\n {\n \tstruct aac_msix_ctx *ctx;\n \tstruct aac_dev *dev;\n"} {"commit":"2133284f01a29e3dd05d507ea5691f053d2359c2","subject":"gpu_ctx_gl: disable the scissor test before executing a blit operation","message":"gpu_ctx_gl: disable the scissor test before executing a blit operation\n\nAccording to the GL specification:\n\n> The only fragment operations which affect a blit are the pixel\nownership test, the scissor test, and sRGB conversion (see section\n17.3.7). Color, depth, and stencil masks (see section 17.4.2) are\nignored.\n","repos":"gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libnodegl\/backends\/gl\/gpu_ctx_gl.c\n+++ libnodegl\/backends\/gl\/gpu_ctx_gl.c\n@@ -846,8 +846,14 @@\n static void gl_end_render_pass(struct gpu_ctx *s)\n {\n struct gpu_ctx_gl *s_priv = (struct gpu_ctx_gl *)s;\n+ struct glcontext *gl = s_priv->glcontext;\n+ struct glstate *glstate = &s_priv->glstate;\n \n if (s_priv->rendertarget) {\n+ if (glstate->scissor_test) {\n+ ngli_glDisable(gl, GL_SCISSOR_TEST);\n+ glstate->scissor_test = 0;\n+ }\n ngli_rendertarget_gl_resolve(s_priv->rendertarget);\n ngli_rendertarget_gl_invalidate(s_priv->rendertarget);\n }\n"} {"commit":"99ba9e093d058f6dff54f475136018e2e281d50f","subject":"[PATCH] libata: Add ata_scsi_dev_disabled","message":"[PATCH] libata: Add ata_scsi_dev_disabled\n\nSeparate out parts of ata_scsi_find_dev to be reused in\nfuture SAS\/SATA patches.\n\nAcked-by: Jeff Garzik <jgarzik@pobox.com>\n\nSigned-off-by: Brian King <bf668d4b220231d97fe248d4ae0ba63a1d887e4c@us.ibm.com>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/libata-scsi.c\n+++ drivers\/scsi\/libata-scsi.c\n@@ -2374,6 +2374,36 @@\n }\n \n \/**\n+ *\tata_scsi_dev_enabled - determine if device is enabled\n+ *\t@dev: ATA device\n+ *\n+ *\tDetermine if commands should be sent to the specified device.\n+ *\n+ *\tLOCKING:\n+ *\tspin_lock_irqsave(host_set lock)\n+ *\n+ *\tRETURNS:\n+ *\t0 if commands are not allowed \/ 1 if commands are allowed\n+ *\/\n+\n+static int ata_scsi_dev_enabled(struct ata_device *dev)\n+{\n+\tif (unlikely(!ata_dev_enabled(dev)))\n+\t\treturn 0;\n+\n+\tif (!atapi_enabled || (dev->ap->flags & ATA_FLAG_NO_ATAPI)) {\n+\t\tif (unlikely(dev->class == ATA_DEV_ATAPI)) {\n+\t\t\tata_dev_printk(dev, KERN_WARNING,\n+\t\t\t\t \"WARNING: ATAPI is %s, device ignored.\\n\",\n+\t\t\t\t atapi_enabled ? \"not supported with this driver\" : \"disabled\");\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\treturn 1;\n+}\n+\n+\/**\n *\tata_scsi_find_dev - lookup ata_device from scsi_cmnd\n *\t@ap: ATA port to which the device is attached\n *\t@scsidev: SCSI device from which we derive the ATA device\n@@ -2394,17 +2424,8 @@\n {\n \tstruct ata_device *dev = __ata_scsi_find_dev(ap, scsidev);\n \n-\tif (unlikely(!dev || !ata_dev_enabled(dev)))\n+\tif (unlikely(!dev || !ata_scsi_dev_enabled(dev)))\n \t\treturn NULL;\n-\n-\tif (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {\n-\t\tif (unlikely(dev->class == ATA_DEV_ATAPI)) {\n-\t\t\tata_dev_printk(dev, KERN_WARNING,\n-\t\t\t\t\"WARNING: ATAPI is %s, device ignored.\\n\",\n-\t\t\t\tatapi_enabled ? \"not supported with this driver\" : \"disabled\");\n-\t\t\treturn NULL;\n-\t\t}\n-\t}\n \n \treturn dev;\n }\n"} {"commit":"c28be31b11f56b3bb62490dfe5304eaa2724afc2","subject":"spi\/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode","message":"spi\/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode\n\nIn rx mode, dma must be prepared before spi is enabled.\nBut in tx and tr mode, spi must be enabled first.\n\nSigned-off-by: Addy Ke <81a9605123faf4846bcfd543cbde5fac4c7f55b9@rock-chips.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2df08e7890231c44c3b57ece8b95a5797cd82388","subject":"spi\/rockchip: call wait_for_idle() for the transfer to complete","message":"spi\/rockchip: call wait_for_idle() for the transfer to complete\n\nSuggested-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\nSigned-off-by: Addy Ke <81a9605123faf4846bcfd543cbde5fac4c7f55b9@rockchip.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/spi\/spi-rockchip.c\n+++ drivers\/spi\/spi-rockchip.c\n@@ -214,6 +214,18 @@\n \t\treadl_relaxed(rs->regs + ROCKCHIP_SPI_RXDR);\n }\n \n+static inline void wait_for_idle(struct rockchip_spi *rs)\n+{\n+\tunsigned long timeout = jiffies + msecs_to_jiffies(5);\n+\n+\tdo {\n+\t\tif (!(readl_relaxed(rs->regs + ROCKCHIP_SPI_SR) & SR_BUSY))\n+\t\t\treturn;\n+\t} while (time_before(jiffies, timeout));\n+\n+\tdev_warn(rs->dev, \"spi controller is in busy state!\\n\");\n+}\n+\n static u32 get_fifo_len(struct rockchip_spi *rs)\n {\n \tu32 fifo;\n@@ -371,6 +383,10 @@\n \t\tcpu_relax();\n \t} while (remain);\n \n+\t\/* If tx, wait until the FIFO data completely. *\/\n+\tif (rs->tx)\n+\t\twait_for_idle(rs);\n+\n \treturn 0;\n }\n \n@@ -392,6 +408,9 @@\n {\n \tunsigned long flags;\n \tstruct rockchip_spi *rs = data;\n+\n+\t\/* Wait until the FIFO data completely. *\/\n+\twait_for_idle(rs);\n \n \tspin_lock_irqsave(&rs->lock, flags);\n \n@@ -535,11 +554,6 @@\n \n \trs->tx_sg = xfer->tx_sg;\n \trs->rx_sg = xfer->rx_sg;\n-\n-\t\/* Delay until the FIFO data completely *\/\n-\tif (xfer->tx_buf)\n-\t\txfer->delay_usecs\n-\t\t\t= rs->fifo_len * rs->bpw * 1000000 \/ rs->speed;\n \n \tif (rs->tx && rs->rx)\n \t\trs->tmode = CR0_XFM_TR;\n"} {"commit":"9ff87d7326d9e4666721070040474f60a68ab467","subject":"[PATCH] USB: mdc800.c to kzalloc","message":"[PATCH] USB: mdc800.c to kzalloc\n\none more conversion to kzalloc.\n\nSigned-off-by: Oliver Neukum <c539153ba1f947bd4b6f910263b967c4a0a62357@neukum.name>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/image\/mdc800.c\n+++ drivers\/usb\/image\/mdc800.c\n@@ -978,13 +978,11 @@\n {\n \tint retval = -ENODEV;\n \t\/* Allocate Memory *\/\n-\tmdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL);\n+\tmdc800=kzalloc (sizeof (struct mdc800_data), GFP_KERNEL);\n \tif (!mdc800)\n \t\tgoto cleanup_on_fail;\n \n-\tmemset(mdc800, 0, sizeof(struct mdc800_data));\n \tmdc800->dev = NULL;\n-\tmdc800->open=0;\n \tmdc800->state=NOT_CONNECTED;\n \tinit_MUTEX (&mdc800->io_lock);\n \n"} {"commit":"4244f72436ab77c3c29a6447af81734ab3925d85","subject":"[PATCH] USB: upgrade of the idmouse driver","message":"[PATCH] USB: upgrade of the idmouse driver\n\nSigned-off-by: Florian Echtler <adacd80eced65963ddf9c41812e0b2c443b5a5bd@fs.tum.de>\nSigned-off-by: Andreas Deresch <74675f47202ab37c20e016832a9369d958161539@fs.tum.de>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/misc\/idmouse.c\n+++ drivers\/usb\/misc\/idmouse.c\n@@ -1,4 +1,4 @@\n-\/* Siemens ID Mouse driver v0.5\n+\/* Siemens ID Mouse driver v0.6\n \n This program is free software; you can redistribute it and\/or\n modify it under the terms of the GNU General Public License as\n@@ -10,6 +10,9 @@\n \n Derived from the USB Skeleton driver 1.1,\n Copyright (C) 2003 Greg Kroah-Hartman (greg@kroah.com)\n+\n+ Additional information provided by Martin Reising\n+ <Martin.Reising@natural-computing.de>\n \n *\/\n \n@@ -25,28 +28,43 @@\n #include <asm\/uaccess.h>\n #include <linux\/usb.h>\n \n+\/* image constants *\/\n #define WIDTH 225\n-#define HEIGHT 288\n-#define HEADER \"P5 225 288 255 \"\n+#define HEIGHT 289\n+#define HEADER \"P5 225 289 255 \"\n #define IMGSIZE ((WIDTH * HEIGHT) + sizeof(HEADER)-1)\n \n-\/* Version Information *\/\n-#define DRIVER_VERSION \"0.5\"\n+\/* version information *\/\n+#define DRIVER_VERSION \"0.6\"\n #define DRIVER_SHORT \"idmouse\"\n #define DRIVER_AUTHOR \"Florian 'Floe' Echtler <echtler@fs.tum.de>\"\n #define DRIVER_DESC \"Siemens ID Mouse FingerTIP Sensor Driver\"\n \n-\/* Siemens ID Mouse *\/\n-#define USB_IDMOUSE_VENDOR_ID 0x0681\n-#define USB_IDMOUSE_PRODUCT_ID 0x0005\n-\n-\/* we still need a minor number *\/\n+\/* minor number for misc USB devices *\/\n #define USB_IDMOUSE_MINOR_BASE 132\n \n+\/* vendor and device IDs *\/\n+#define ID_SIEMENS 0x0681\n+#define ID_IDMOUSE 0x0005\n+#define ID_CHERRY 0x0010\n+\n+\/* device ID table *\/\n static struct usb_device_id idmouse_table[] = {\n-\t{USB_DEVICE(USB_IDMOUSE_VENDOR_ID, USB_IDMOUSE_PRODUCT_ID)},\n-\t{} \/* null entry at the end *\/\n+\t{USB_DEVICE(ID_SIEMENS, ID_IDMOUSE)}, \/* Siemens ID Mouse (Professional) *\/\n+\t{USB_DEVICE(ID_SIEMENS, ID_CHERRY )}, \/* Cherry FingerTIP ID Board *\/\n+\t{} \/* terminating null entry *\/\n };\n+\n+\/* sensor commands *\/\n+#define FTIP_RESET 0x20\n+#define FTIP_ACQUIRE 0x21\n+#define FTIP_RELEASE 0x22\n+#define FTIP_BLINK 0x23 \/* LSB of value = blink pulse width *\/\n+#define FTIP_SCROLL 0x24\n+\n+#define ftip_command(dev, command, value, index) \\\n+\tusb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0), command, \\\n+\tUSB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT, value, index, NULL, 0, 1000)\n \n MODULE_DEVICE_TABLE(usb, idmouse_table);\n \n@@ -57,7 +75,8 @@\n \tstruct usb_interface *interface; \/* the interface for this device *\/\n \n \tunsigned char *bulk_in_buffer; \/* the buffer to receive data *\/\n-\tsize_t bulk_in_size; \/* the size of the receive buffer *\/\n+\tsize_t bulk_in_size; \/* the maximum bulk packet size *\/\n+\tsize_t orig_bi_size; \/* same as above, but reported by the device *\/\n \t__u8 bulk_in_endpointAddr; \/* the address of the bulk in endpoint *\/\n \n \tint open; \/* if the port is open or not *\/\n@@ -103,7 +122,7 @@\n \t.id_table = idmouse_table,\n };\n \n-\/\/ prevent races between open() and disconnect()\n+\/* prevent races between open() and disconnect() *\/\n static DECLARE_MUTEX(disconnect_sem);\n \n static int idmouse_create_image(struct usb_idmouse *dev)\n@@ -112,42 +131,34 @@\n \tint bulk_read = 0;\n \tint result = 0;\n \n-\tif (dev->bulk_in_size < sizeof(HEADER))\n-\t\treturn -ENOMEM;\n-\n-\tmemcpy(dev->bulk_in_buffer,HEADER,sizeof(HEADER)-1);\n+\tmemcpy(dev->bulk_in_buffer, HEADER, sizeof(HEADER)-1);\n \tbytes_read += sizeof(HEADER)-1;\n \n-\t\/* Dump the setup packets. Yes, they are uncommented, simply \n-\t because they were sniffed under Windows using SnoopyPro.\n-\t I _guess_ that 0x22 is a kind of reset command and 0x21 \n-\t means init..\n-\t*\/\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x21, 0x42, 0x0001, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x20, 0x42, 0x0001, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x22, 0x42, 0x0000, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x21, 0x42, 0x0001, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x20, 0x42, 0x0001, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x20, 0x42, 0x0000, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n+\t\/* reset the device and set a fast blink rate *\/\n+\tresult = ftip_command(dev, FTIP_RELEASE, 0, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n+\tresult = ftip_command(dev, FTIP_BLINK, 1, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n+\n+\t\/* initialize the sensor - sending this command twice *\/\n+\t\/* significantly reduces the rate of failed reads *\/\n+\tresult = ftip_command(dev, FTIP_ACQUIRE, 0, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n+\tresult = ftip_command(dev, FTIP_ACQUIRE, 0, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n+\n+\t\/* start the readout - sending this command twice *\/\n+\t\/* presumably enables the high dynamic range mode *\/\n+\tresult = ftip_command(dev, FTIP_RESET, 0, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n+\tresult = ftip_command(dev, FTIP_RESET, 0, 0);\n+\tif (result < 0)\n+\t\tgoto reset;\n \n \t\/* loop over a blocking bulk read to get data from the device *\/\n \twhile (bytes_read < IMGSIZE) {\n@@ -155,22 +166,40 @@\n \t\t\t\tusb_rcvbulkpipe (dev->udev, dev->bulk_in_endpointAddr),\n \t\t\t\tdev->bulk_in_buffer + bytes_read,\n \t\t\t\tdev->bulk_in_size, &bulk_read, 5000);\n-\t\tif (result < 0)\n-\t\t\treturn result;\n-\t\tif (signal_pending(current))\n-\t\t\treturn -EINTR;\n+\t\tif (result < 0) {\n+\t\t\t\/* Maybe this error was caused by the increased packet size? *\/\n+\t\t\t\/* Reset to the original value and tell userspace to retry. *\/\n+\t\t\tif (dev->bulk_in_size != dev->orig_bi_size) {\n+\t\t\t\tdev->bulk_in_size = dev->orig_bi_size;\n+\t\t\t\tresult = -EAGAIN;\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (signal_pending(current)) {\n+\t\t\tresult = -EINTR;\n+\t\t\tbreak;\n+\t\t}\n \t\tbytes_read += bulk_read;\n \t}\n \n \t\/* reset the device *\/\n-\tresult = usb_control_msg (dev->udev, usb_sndctrlpipe (dev->udev, 0),\n-\t\t\t\t0x22, 0x42, 0x0000, 0x0002, NULL, 0, 1000);\n-\tif (result < 0)\n-\t\treturn result;\n-\n-\t\/* should be IMGSIZE == 64815 *\/\n+reset:\n+\tftip_command(dev, FTIP_RELEASE, 0, 0);\n+\n+\t\/* check for valid image *\/\n+\t\/* right border should be black (0x00) *\/\n+\tfor (bytes_read = sizeof(HEADER)-1 + WIDTH-1; bytes_read < IMGSIZE; bytes_read += WIDTH)\n+\t\tif (dev->bulk_in_buffer[bytes_read] != 0x00)\n+\t\t\treturn -EAGAIN;\n+\n+\t\/* lower border should be white (0xFF) *\/\n+\tfor (bytes_read = IMGSIZE-WIDTH; bytes_read < IMGSIZE-1; bytes_read++)\n+\t\tif (dev->bulk_in_buffer[bytes_read] != 0xFF)\n+\t\t\treturn -EAGAIN;\n+\n+\t\/* should be IMGSIZE == 65040 *\/\n \tdbg(\"read %d bytes fingerprint data\", bytes_read);\n-\treturn 0;\n+\treturn result;\n }\n \n static inline void idmouse_delete(struct usb_idmouse *dev)\n@@ -282,10 +311,10 @@\n \n \tdev = (struct usb_idmouse *) file->private_data;\n \n-\t\/\/ lock this object\n+\t\/* lock this object *\/\n \tdown (&dev->sem);\n \n-\t\/\/ verify that the device wasn't unplugged\n+\t\/* verify that the device wasn't unplugged *\/\n \tif (!dev->present) {\n \t\tup (&dev->sem);\n \t\treturn -ENODEV;\n@@ -296,8 +325,7 @@\n \t\treturn 0;\n \t}\n \n-\tif (count > IMGSIZE - *ppos)\n-\t\tcount = IMGSIZE - *ppos;\n+\tcount = min ((loff_t)count, IMGSIZE - (*ppos));\n \n \tif (copy_to_user (buffer, dev->bulk_in_buffer + *ppos, count)) {\n \t\tresult = -EFAULT;\n@@ -306,7 +334,7 @@\n \t\t*ppos += count;\n \t}\n \n-\t\/\/ unlock the device \n+\t\/* unlock the device *\/\n \tup(&dev->sem);\n \treturn result;\n }\n@@ -318,7 +346,6 @@\n \tstruct usb_idmouse *dev = NULL;\n \tstruct usb_host_interface *iface_desc;\n \tstruct usb_endpoint_descriptor *endpoint;\n-\tsize_t buffer_size;\n \tint result;\n \n \t\/* check if we have gotten the data or the hid interface *\/\n@@ -344,11 +371,11 @@\n \t\tUSB_ENDPOINT_XFER_BULK)) {\n \n \t\t\/* we found a bulk in endpoint *\/\n-\t\tbuffer_size = le16_to_cpu(endpoint->wMaxPacketSize);\n-\t\tdev->bulk_in_size = buffer_size;\n+\t\tdev->orig_bi_size = le16_to_cpu(endpoint->wMaxPacketSize);\n+\t\tdev->bulk_in_size = 0x200; \/* works _much_ faster *\/\n \t\tdev->bulk_in_endpointAddr = endpoint->bEndpointAddress;\n \t\tdev->bulk_in_buffer =\n-\t\t\tkmalloc(IMGSIZE + buffer_size, GFP_KERNEL);\n+\t\t\tkmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL);\n \n \t\tif (!dev->bulk_in_buffer) {\n \t\t\terr(\"Unable to allocate input buffer.\");\n"} {"commit":"2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92","subject":"USB: serial: ch341: remove reset_resume callback","message":"USB: serial: ch341: remove reset_resume callback\n\nThis really just is the resume callback for the device, so use that,\nespecially as the usb-serial core just overrode this callback so it\nwasn't being made anyway.\n\nCc: Johan Hovold <6a430eed381e126d51a8cce8db662f765ce314bc@gmail.com>\nCc: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nCc: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\nCc: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/serial\/ch341.c\n+++ drivers\/usb\/serial\/ch341.c\n@@ -577,27 +577,20 @@\n \treturn result;\n }\n \n-\n-static int ch341_reset_resume(struct usb_interface *intf)\n-{\n-\tstruct usb_device *dev = interface_to_usbdev(intf);\n-\tstruct usb_serial *serial = NULL;\n+static int ch341_resume(struct usb_serial *serial)\n+{\n \tstruct ch341_private *priv;\n \n-\tserial = usb_get_intfdata(intf);\n \tpriv = usb_get_serial_port_data(serial->port[0]);\n \n-\t\/*reconfigure ch341 serial port after bus-reset*\/\n-\tch341_configure(dev, priv);\n-\n-\tusb_serial_resume(intf);\n+\t\/* reconfigure ch341 serial port after bus-reset *\/\n+\tch341_configure(serial->dev, priv);\n \n \treturn 0;\n }\n \n static struct usb_driver ch341_driver = {\n \t.name\t\t= \"ch341\",\n-\t.reset_resume\t= ch341_reset_resume,\n \t.id_table\t= id_table,\n };\n \n@@ -619,6 +612,7 @@\n \t.tiocmset = ch341_tiocmset,\n \t.read_int_callback = ch341_read_int_callback,\n \t.attach = ch341_attach,\n+\t.resume = ch341_resume,\n };\n \n static struct usb_serial_driver * const serial_drivers[] = {\n"} {"commit":"1ee0a224bc9aad1de496c795f96bc6ba2c394811","subject":"USB: io_ti: Fix NULL dereference in chase_port()","message":"USB: io_ti: Fix NULL dereference in chase_port()\n\nThe tty is NULL when the port is hanging up.\nchase_port() needs to check for this.\n\nThis patch is intended for stable series.\nThe behavior was observed and tested in Linux 3.2 and 3.7.1.\n\nJohan Hovold submitted a more elaborate patch for the mainline kernel.\n\n[ 56.277883] usb 1-1: edge_bulk_in_callback - nonzero read bulk status received: -84\n[ 56.278811] usb 1-1: USB disconnect, device number 3\n[ 56.278856] usb 1-1: edge_bulk_in_callback - stopping read!\n[ 56.279562] BUG: unable to handle kernel NULL pointer dereference at 00000000000001c8\n[ 56.280536] IP: [<ffffffff8144e62a>] _raw_spin_lock_irqsave+0x19\/0x35\n[ 56.281212] PGD 1dc1b067 PUD 1e0f7067 PMD 0\n[ 56.282085] Oops: 0002 [#1] SMP\n[ 56.282744] Modules linked in:\n[ 56.283512] CPU 1\n[ 56.283512] Pid: 25, comm: khubd Not tainted 3.7.1 #1 innotek GmbH VirtualBox\/VirtualBox\n[ 56.283512] RIP: 0010:[<ffffffff8144e62a>] [<ffffffff8144e62a>] _raw_spin_lock_irqsave+0x19\/0x35\n[ 56.283512] RSP: 0018:ffff88001fa99ab0 EFLAGS: 00010046\n[ 56.283512] RAX: 0000000000000046 RBX: 00000000000001c8 RCX: 0000000000640064\n[ 56.283512] RDX: 0000000000010000 RSI: ffff88001fa99b20 RDI: 00000000000001c8\n[ 56.283512] RBP: ffff88001fa99b20 R08: 0000000000000000 R09: 0000000000000000\n[ 56.283512] R10: 0000000000000000 R11: ffffffff812fcb4c R12: ffff88001ddf53c0\n[ 56.283512] R13: 0000000000000000 R14: 00000000000001c8 R15: ffff88001e19b9f4\n[ 56.283512] FS: 0000000000000000(0000) GS:ffff88001fd00000(0000) knlGS:0000000000000000\n[ 56.283512] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[ 56.283512] CR2: 00000000000001c8 CR3: 000000001dc51000 CR4: 00000000000006e0\n[ 56.283512] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 56.283512] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 56.283512] Process khubd (pid: 25, threadinfo ffff88001fa98000, task ffff88001fa94f80)\n[ 56.283512] Stack:\n[ 56.283512] 0000000000000046 00000000000001c8 ffffffff810578ec ffffffff812fcb4c\n[ 56.283512] ffff88001e19b980 0000000000002710 ffffffff812ffe81 0000000000000001\n[ 56.283512] ffff88001fa94f80 0000000000000202 ffffffff00000001 0000000000000296\n[ 56.283512] Call Trace:\n[ 56.283512] [<ffffffff810578ec>] ? add_wait_queue+0x12\/0x3c\n[ 56.283512] [<ffffffff812fcb4c>] ? usb_serial_port_work+0x28\/0x28\n[ 56.283512] [<ffffffff812ffe81>] ? chase_port+0x84\/0x2d6\n[ 56.283512] [<ffffffff81063f27>] ? try_to_wake_up+0x199\/0x199\n[ 56.283512] [<ffffffff81263a5c>] ? tty_ldisc_hangup+0x222\/0x298\n[ 56.283512] [<ffffffff81300171>] ? edge_close+0x64\/0x129\n[ 56.283512] [<ffffffff810612f7>] ? __wake_up+0x35\/0x46\n[ 56.283512] [<ffffffff8106135b>] ? should_resched+0x5\/0x23\n[ 56.283512] [<ffffffff81264916>] ? tty_port_shutdown+0x39\/0x44\n[ 56.283512] [<ffffffff812fcb4c>] ? usb_serial_port_work+0x28\/0x28\n[ 56.283512] [<ffffffff8125d38c>] ? __tty_hangup+0x307\/0x351\n[ 56.283512] [<ffffffff812e6ddc>] ? usb_hcd_flush_endpoint+0xde\/0xed\n[ 56.283512] [<ffffffff8144e625>] ? _raw_spin_lock_irqsave+0x14\/0x35\n[ 56.283512] [<ffffffff812fd361>] ? usb_serial_disconnect+0x57\/0xc2\n[ 56.283512] [<ffffffff812ea99b>] ? usb_unbind_interface+0x5c\/0x131\n[ 56.283512] [<ffffffff8128d738>] ? __device_release_driver+0x7f\/0xd5\n[ 56.283512] [<ffffffff8128d9cd>] ? device_release_driver+0x1a\/0x25\n[ 56.283512] [<ffffffff8128d393>] ? bus_remove_device+0xd2\/0xe7\n[ 56.283512] [<ffffffff8128b7a3>] ? device_del+0x119\/0x167\n[ 56.283512] [<ffffffff812e8d9d>] ? usb_disable_device+0x6a\/0x180\n[ 56.283512] [<ffffffff812e2ae0>] ? usb_disconnect+0x81\/0xe6\n[ 56.283512] [<ffffffff812e4435>] ? hub_thread+0x577\/0xe82\n[ 56.283512] [<ffffffff8144daa7>] ? __schedule+0x490\/0x4be\n[ 56.283512] [<ffffffff8105798f>] ? abort_exclusive_wait+0x79\/0x79\n[ 56.283512] [<ffffffff812e3ebe>] ? usb_remote_wakeup+0x2f\/0x2f\n[ 56.283512] [<ffffffff812e3ebe>] ? usb_remote_wakeup+0x2f\/0x2f\n[ 56.283512] [<ffffffff810570b4>] ? kthread+0x81\/0x89\n[ 56.283512] [<ffffffff81057033>] ? __kthread_parkme+0x5c\/0x5c\n[ 56.283512] [<ffffffff8145387c>] ? ret_from_fork+0x7c\/0xb0\n[ 56.283512] [<ffffffff81057033>] ? __kthread_parkme+0x5c\/0x5c\n[ 56.283512] Code: 8b 7c 24 08 e8 17 0b c3 ff 48 8b 04 24 48 83 c4 10 c3 53 48 89 fb 41 50 e8 e0 0a c3 ff 48 89 04 24 e8 e7 0a c3 ff ba 00 00 01 00\n<f0> 0f c1 13 48 8b 04 24 89 d1 c1 ea 10 66 39 d1 74 07 f3 90 66\n[ 56.283512] RIP [<ffffffff8144e62a>] _raw_spin_lock_irqsave+0x19\/0x35\n[ 56.283512] RSP <ffff88001fa99ab0>\n[ 56.283512] CR2: 00000000000001c8\n[ 56.283512] ---[ end trace 49714df27e1679ce ]---\n\nSigned-off-by: Wolfgang Frisch <7ffe672f9502755036a30f4bf272f93c5907365f@roembden.net>\nCc: Johan Hovold <6a430eed381e126d51a8cce8db662f765ce314bc@gmail.com>\nCc: stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/serial\/io_ti.c\n+++ drivers\/usb\/serial\/io_ti.c\n@@ -530,6 +530,9 @@\n \twait_queue_t wait;\n \tunsigned long flags;\n \n+\tif (!tty)\n+\t\treturn;\n+\n \tif (!timeout)\n \t\ttimeout = (HZ * EDGE_CLOSING_WAIT)\/100;\n \n"} {"commit":"afa65fb246f141180402ef8f758578013a084902","subject":"Update WatchSessionModule.h","message":"Update WatchSessionModule.h","repos":"mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile,mano-mykingdom\/titanium_mobile","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- iphone\/Classes\/WatchSessionModule.h\n+++ iphone\/Classes\/WatchSessionModule.h\n@@ -1,11 +1,11 @@\n \/**\n * Appcelerator Titanium Mobile\n- * Copyright (c) 2015 by Appcelerator, Inc. All Rights Reserved.\n+ * Copyright (c) 2015-2017 by Appcelerator, Inc. All Rights Reserved.\n * Licensed under the terms of the Apache Public License\n * Please see the LICENSE included with this distribution for details.\n *\/\n #import \"TiModule.h\"\n-#import <WatchConnectivity\/watchConnectivity.h>\n+#import <WatchConnectivity\/WatchConnectivity.h>\n \n @interface WatchSessionModule : TiModule <WCSessionDelegate> {\n @private\n@@ -16,4 +16,4 @@\n @property (nonatomic, readonly) NSNumber *ACTIVATION_STATE_INACTIVE;\n @property (nonatomic, readonly) NSNumber *ACTIVATION_STATE_ACTIVATED;\n \n-@end+@end\n"} {"commit":"14f4baef9f988c66638654342cb002bd36702124","subject":"Update to next step, start working on evolution","message":"Update to next step, start working on evolution\n","repos":"mihaimaruseac\/blog-demos,mihaimaruseac\/blog-demos,mihaimaruseac\/blog-demos,mihaimaruseac\/blog-demos,mihaimaruseac\/blog-demos","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- azpcs\/1.c\n+++ azpcs\/1.c\n@@ -3,9 +3,9 @@\n #include <string.h>\n #include <sys\/time.h>\n \n-#define N 2 \/\/5\n+#define N 3 \/\/5\n #define N2 (N * N)\n-#define MIN_BOUND 10 \/\/3800\n+#define MIN_BOUND 72 \/\/3800\n #define POPSZ 4 \/\/100\n #define FAMSZ 3\n \n@@ -126,11 +126,25 @@\n \t\t\tbest_ix = i;\n \t\t}\n \n+\tif (best_score > best_now) {\n+\t\tbest_score = best_now;\n+\t\tif (epoch % 2 == 0)\n+\t\t\tfor (int i = 0; i < N2; i++)\n+\t\t\t\tbest[i] = pop1[best_ix][i];\n+\t\telse\n+\t\t\tfor (int i = 0; i < N2; i++)\n+\t\t\t\tbest[i] = pop2[best_ix][i];\n+\t}\n+\n \t\/\/ debug\n \tprintf(\"Scores: \");\n \tfor (int i = 0; i < POPSZ; i++)\n \t\tprintf(\"%lu \", scores[i]);\n \tprintf(\"\\nBest: %lu (%d)\\n\", best_now, best_ix);\n+\tprintf(\"At generation %d best score is %lu for: \", epoch, best_score);\n+\tfor (int i = 0; i < N2; i++)\n+\t\tprintf(\"%d \", best[i]);\n+\tprintf(\"\\n\");\n }\n \n int main()\n@@ -138,8 +152,8 @@\n \tinit_rng();\n \tcompute_initial_distances();\n \tinitialize_population();\n+\n \tcompute_scores();\n-\n \n \treturn 0;\n }\n"} {"commit":"4a54e61cc76e8741833c36f9b2966ec908088946","subject":"Removed very restrictive code which forces DIRECTINPUT_VERSION to 0x0300 and replaced it with test statement block which uses WINVER to set DIRECTINPUT_VERSION.","message":"Removed very restrictive code which forces DIRECTINPUT_VERSION\nto 0x0300 and replaced it with test statement block which uses\nWINVER to set DIRECTINPUT_VERSION.\n\n- For Win 98\/SE\/ME\/2000 or above DIRECTINPUT_VERSION is set to\n 0x0800. Don't worry if your using a lower DX SDK as any DX SDK 5 or\n above in <dinput.h> uses the '#if DIRECTINPUT_VERSION >=' thus\n makes this method totally backward compatible.\n\n- For Win95 and NT4. DIRECTINPUT_VERSION is set to 0x0300 as it's the\n highest NT4 supports and you cannot seperate NT4 and 95 by version so\n have to be set to the same value.\n\nHave tested on most flavors of Windows and both VC and MingW...\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@5891 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/cssys\/win32\/directdetection.h\n+++ libs\/cssys\/win32\/directdetection.h\n@@ -1,17 +1,32 @@\n-\/\/ DirectDetection.h: interface for the DirectDetection class.\n-\/\/\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/*\n+ Copyright (C) 1998 by Jorrit Tyberghein\n \n-#if !defined(AFX_DIRECTDETECTION_H__E850B940_FD15_11D1_933A_0000B43D8331__INCLUDED_)\n-#define AFX_DIRECTDETECTION_H__E850B940_FD15_11D1_933A_0000B43D8331__INCLUDED_\n+ This library is free software; you can redistribute it and\/or\n+ modify it under the terms of the GNU Library General Public\n+ License as published by the Free Software Foundation; either\n+ version 2 of the License, or (at your option) any later version.\n \n-#if _MSC_VER >= 1000\n-#pragma once\n-#endif \/\/ _MSC_VER >= 1000\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Library General Public License for more details.\n \n-\/\/ define directInput to be backwards compatible with dx3 input\n-#define DIRECTINPUT_VERSION 0x0300\n+ You should have received a copy of the GNU Library General Public\n+ License along with this library; if not, write to the Free\n+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n+*\/\n+\n+#ifndef __DIRECTDETECTION_H__\n+#define __DIRECTDETECTION_H__\n+\n+#if WINVER >= 0x0500\n+ #define DIRECTINPUT_VERSION 0x0800\n+#else\n+ #define DIRECTINPUT_VERSION 0x0300\n+#endif\n+\n #include <windowsx.h>\n+#include <dinput.h>\n #include <ddraw.h>\n #include <d3d.h>\n #include <d3dcaps.h>\n@@ -127,4 +142,4 @@\n DirectDetectionDevice * Devices; \/\/ list of devices\n };\n \n-#endif \/\/ !defined(AFX_DIRECTDETECTION_H__E850B940_FD15_11D1_933A_0000B43D8331__INCLUDED_)\n+#endif \/\/ End of __DIRECTDETECTION_H__"} {"commit":"fa6ed3562f2b28d8bd5daeab4ec613032e3a05f0","subject":"nua_notifier.c: allow notifier handle to be shut down if SUBSCRIBE has been accpeted but no NOTIFY has been sent","message":"nua_notifier.c: allow notifier handle to be shut down if SUBSCRIBE has been accpeted but no NOTIFY has been sent\n\ndarcs-hash:20080104215408-65a35-bf192d185dd72a4429218cb3a8b5638d26c7636c.gz\n","repos":"jart\/sofia-sip,BelledonneCommunications\/sofia-sip,xhook\/sofia-sip,unispeech\/sofia-sip,BelledonneCommunications\/sofia-sip,xhook\/sofia-sip,xhook\/sofia-sip,jart\/sofia-sip,erdincay\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,BelledonneCommunications\/sofia-sip,erdincay\/sofia-sip,xhook\/sofia-sip,unispeech\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,jart\/sofia-sip,BelledonneCommunications\/sofia-sip,xhook\/sofia-sip","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsofia-sip-ua\/nua\/nua_notifier.c\n+++ libsofia-sip-ua\/nua\/nua_notifier.c\n@@ -802,8 +802,11 @@\n return 0;\n }\n else {\n- if (nua_client_create(nh, nua_r_notify, \n-\t\t\t &nua_notify_client_methods, NULL) >= 0)\n+ if (nua_client_tcreate(nh, nua_r_notify, \n+\t\t\t &nua_notify_client_methods, \n+\t\t\t SIPTAG_EVENT(du->du_event),\n+\t\t\t NUTAG_SUBSTATE(nua_substate_terminated),\n+\t\t\t TAG_END()) >= 0)\n return 0;\n }\n \n"} {"commit":"adf868c64ba7a86b64f45218cf4ca29c3f29f9d1","subject":"libstb: Fix memcpy overread in fakenv_readpublic()","message":"libstb: Fix memcpy overread in fakenv_readpublic()\n\nCaught by `make check` on fedora-rawhide (GCC 12):\n\n libstb\/secvar\/test\/..\/storage\/fakenv_ops.c: In function 'fakenv_readpublic':\n libstb\/secvar\/test\/..\/storage\/fakenv_ops.c:155:17: error: 'memcpy' reading 134 bytes from a region of size 34 [-Werror=stringop-overread]\n 155 | memcpy(&nv_name->t.name, tpmnv_vars_name, sizeof(TPM2B_NAME));\n | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n In file included from libstb\/secvar\/test\/secvar-test-secboot-tpm.c:5:\n libstb\/secvar\/test\/..\/storage\/secboot_tpm.c:35:15: note: source object 'tpmnv_vars_name' of size 34\n 35 | const uint8_t tpmnv_vars_name[] = {\n | ^~~~~~~~~~~~~~~\n libstb\/secvar\/test\/..\/storage\/fakenv_ops.c:158:17: error: 'memcpy' reading 134 bytes from a region of size 34 [-Werror=stringop-overread]\n 158 | memcpy(&nv_name->t.name, tpmnv_control_name, sizeof(TPM2B_NAME));\n | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n libstb\/secvar\/test\/..\/storage\/secboot_tpm.c:41:15: note: source object 'tpmnv_control_name' of size 34\n 41 | const uint8_t tpmnv_control_name[] = {\n | ^~~~~~~~~~~~~~~~~~\n\nThe source and destination of each memcpy have known sizes, and we are\ncopying the smaller buffer into the larger one, so change the memcpy\nsize to that of the smaller buffer.\n\nSigned-off-by: Reza Arbab <4c896a97e6b998365c2d50a267b0f1ca5f7995de@linux.ibm.com>\n","repos":"open-power\/skiboot,qemu\/skiboot,open-power\/skiboot,open-power\/skiboot,open-power\/skiboot,qemu\/skiboot,open-power\/skiboot,qemu\/skiboot,qemu\/skiboot,qemu\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libstb\/secvar\/storage\/fakenv_ops.c\n+++ libstb\/secvar\/storage\/fakenv_ops.c\n@@ -152,10 +152,10 @@\n \n \tswitch (index) {\n \tcase SECBOOT_TPMNV_VARS_INDEX:\n-\t\tmemcpy(&nv_name->t.name, tpmnv_vars_name, sizeof(TPM2B_NAME));\n+\t\tmemcpy(&nv_name->t.name, tpmnv_vars_name, sizeof(tpmnv_vars_name));\n \t\tbreak;\n \tcase SECBOOT_TPMNV_CONTROL_INDEX:\n-\t\tmemcpy(&nv_name->t.name, tpmnv_control_name, sizeof(TPM2B_NAME));\n+\t\tmemcpy(&nv_name->t.name, tpmnv_control_name, sizeof(tpmnv_control_name));\n \t\tbreak;\n \tdefault:\n \t\treturn OPAL_INTERNAL_ERROR;\n"} {"commit":"623d827317bb6a7735304987357957748cccaeca","subject":"update the movie before requesting bounds","message":"update the movie before requesting bounds\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libswfdec\/swfdec_sprite_movie_as.c\n+++ libswfdec\/swfdec_sprite_movie_as.c\n@@ -404,6 +404,7 @@\n if (object == NULL)\n return;\n \n+ swfdec_movie_update (movie);\n if (swfdec_rect_is_empty (&movie->extents)) {\n x0 = x1 = y0 = y1 = 0x7FFFFFF;\n } else {\n"} {"commit":"ee039ba261d535c30a78cd3a78a31e7733549a66","subject":"Corrected function and simplified \"for\" statements.","message":"Corrected function and simplified \"for\" statements.\n\n","repos":"rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- roa-lib\/roa_general.c\n+++ roa-lib\/roa_general.c\n@@ -492,7 +492,7 @@\n }\n sprintf(c, \"\/%d\", lth); \n long li;\n- if (size_casn(roaIPaddressp))\n+ if (size_casn(&roaIPaddressp->self))\n {\n read_casn_num(&roaIPaddressp->maxLength, &li);\n sprintf(c, \"\/%ld\", li);\n@@ -508,18 +508,17 @@\n encapContentInfo.eContent.roa.ipAddrBlocks;\n char *replyp;\n int replysiz = 0;\n- int fam, fams = num_items(&addrBlocksp->self);\n- for (fam = 0; fam < fams; fam++)\n- {\n- struct ROAIPAddressFamily *famp = (struct ROAIPAddressFamily *)\n- member_casn(&addrBlocksp->self, fam);;\n+ struct ROAIPAddressFamily *famp;\n+\n+ for (famp = (struct ROAIPAddressFamily *)member_casn(&addrBlocksp->self, 0);\n+ famp; famp = (struct ROAIPAddressFamily *)next_of(&famp->self))\n+ {\n uchar famtyp[4];\n- if (read_casn(famp, famtyp) < 0) return -1;\n- int numaddr, numaddrs = num_items(&famp->addresses.self);\n- for (numaddr = 0; numaddr < numaddrs; numaddr++)\n+ if (read_casn(&famp->addressFamily, famtyp) < 0) return -1;\n+ struct ROAIPAddress *ipaddressp; \n+ for (ipaddressp = (struct ROAIPAddress *)member_casn(&famp->addresses.self, 0);\n+ ipaddressp; ipaddressp = (struct ROAIPAddress *)next_of(&ipaddressp->self))\n {\n- struct ROAIPAddress *ipaddressp = (struct ROAIPAddress *)\n- member_casn(&famp->addresses.self, numaddr);\n char *tmpbuf = convertAddr(famtyp[1], ipaddressp);\n int lth = strlen(tmpbuf);\n if (!replysiz) \n"} {"commit":"d432066557a21a1a37c6251b5bf419a2120b4c91","subject":"Move function for clarity.","message":"Move function for clarity.\n","repos":"mattd\/rest-time,mattd\/rest-time","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/rest-time.c\n+++ src\/rest-time.c\n@@ -182,22 +182,6 @@\n text_layer_set_text(s_clock_layer, buffer);\n }\n \n-static void update_countdown_time() {\n- static char countdown_str[COUNTDOWN_STR_LENGTH];\n-\n- if (!s_countdown_paused) {\n- text_layer_set_text(\n- s_countdown_layer,\n- format_countdown_time(s_countdown_seconds, countdown_str)\n- );\n- --s_countdown_seconds;\n- }\n-\n- if (s_countdown_seconds == WARNING_VIBRATION_TIME && !s_in_rest_mode) {\n- vibes_double_pulse();\n- }\n-}\n-\n static void update_rest_mode(bool force) {\n if (s_countdown_seconds == 0 || force == true) {\n if (s_in_rest_mode == false) {\n@@ -213,6 +197,22 @@\n }\n }\n \n+static void update_countdown_time() {\n+ static char countdown_str[COUNTDOWN_STR_LENGTH];\n+\n+ if (!s_countdown_paused) {\n+ text_layer_set_text(\n+ s_countdown_layer,\n+ format_countdown_time(s_countdown_seconds, countdown_str)\n+ );\n+ --s_countdown_seconds;\n+ }\n+\n+ if (s_countdown_seconds == WARNING_VIBRATION_TIME && !s_in_rest_mode) {\n+ vibes_double_pulse();\n+ }\n+}\n+\n static void time_tick_handler(struct tm *tick_time, TimeUnits units_changed) {\n update_rest_mode(false);\n \n"} {"commit":"a0ba7b3f00b91eec3a8a6ec3587166e29015a4b3","subject":"Panic on recursive calls to luaRedisGenericCommand().","message":"Panic on recursive calls to luaRedisGenericCommand().\n\nRelated to issue #2302.\n","repos":"quangnguyen90\/redis,damy\/redis,Jonavin\/redis,alpha8\/redis,Cybermaxs\/redis,hanmichael\/redis,laurencee\/redis,jacklee0810\/redis,upsoft\/redis,kolonse\/redis,enginekit\/redis,LittlePeng\/redis,LittlePeng\/redis,liqiang199105\/redis,kts12345\/redis,ideaar\/redis,jacklee0810\/redis,Jonavin\/redis,damy\/redis,alpha8\/redis,jaambee\/redis,ScottKaiGu\/redis,janeasystems\/redis,adamweixuan\/redis,enginekit\/redis,damy\/redis,ScottKaiGu\/redis,janeasystems\/redis,LittlePeng\/redis,alpha8\/redis,quangnguyen90\/redis,upsoft\/redis,jaambee\/redis,Cybermaxs\/redis,quangnguyen90\/redis,ideaar\/redis,jqk6\/redis,laurencee\/redis,kolonse\/redis,kolonse\/redis,jqk6\/redis,jqk6\/redis,janeasystems\/redis,quangnguyen90\/redis,adamweixuan\/redis,enginekit\/redis,hanmichael\/redis,adamweixuan\/redis,kts12345\/redis,adamweixuan\/redis,enginekit\/redis,upsoft\/redis,jaambee\/redis,alpha8\/redis,kolonse\/redis,ideaar\/redis,kts12345\/redis,laurencee\/redis,ScottKaiGu\/redis,Cybermaxs\/redis,ideaar\/redis,jaambee\/redis,jacklee0810\/redis,kts12345\/redis,Cybermaxs\/redis,laurencee\/redis,quangnguyen90\/redis,janeasystems\/redis,damy\/redis,kolonse\/redis,Jonavin\/redis,upsoft\/redis,laurencee\/redis,miminus\/redis,hanmichael\/redis,jqk6\/redis,ScottKaiGu\/redis,jacklee0810\/redis,ideaar\/redis,miminus\/redis,liqiang199105\/redis,Jonavin\/redis,Cybermaxs\/redis,janeasystems\/redis,miminus\/redis,miminus\/redis,jacklee0810\/redis,liqiang199105\/redis,miminus\/redis,jaambee\/redis,damy\/redis,upsoft\/redis,liqiang199105\/redis,hanmichael\/redis,adamweixuan\/redis,hanmichael\/redis,ScottKaiGu\/redis,enginekit\/redis,liqiang199105\/redis,jqk6\/redis,kts12345\/redis,alpha8\/redis,Jonavin\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/scripting.c\n+++ src\/scripting.c\n@@ -213,11 +213,22 @@\n static int argv_size = 0;\n static robj *cached_objects[LUA_CMD_OBJCACHE_SIZE];\n static size_t cached_objects_len[LUA_CMD_OBJCACHE_SIZE];\n+ static int inuse = 0; \/* Recursive calls detection. *\/\n+\n+ \/* By using Lua debug hooks it is possible to trigger a recursive call\n+ * to luaRedisGenericCommand(), which normally should never happen.\n+ * To make this function reentrant is futile and makes it slower, but\n+ * we should at least detect such a misuse, and abort. *\/\n+ if (inuse) {\n+ redisPanic(\"luaRedisGenericCommand() recursive call detected. Are you doing funny stuff with Lua debug hooks?\");\n+ }\n+ inuse++;\n \n \/* Require at least one argument *\/\n if (argc == 0) {\n luaPushError(lua,\n \"Please specify at least one argument for redis.call()\");\n+ inuse--;\n return 1;\n }\n \n@@ -272,6 +283,7 @@\n }\n luaPushError(lua,\n \"Lua redis() command arguments must be strings or integers\");\n+ inuse--;\n return 1;\n }\n \n@@ -408,8 +420,10 @@\n * return the plain error. *\/\n lua_pushstring(lua,\"err\");\n lua_gettable(lua,-2);\n+ inuse--;\n return lua_error(lua);\n }\n+ inuse--;\n return 1;\n }\n \n"} {"commit":"b790e1d7e51bd08af8f24b37ed85b3bf5a862f71","subject":"Store the length of the static argv when first allocated.","message":"Store the length of the static argv when first allocated.\n","repos":"ramonsnir\/redis,spearhead-ea\/redis,ksarch-saas\/redis,HunanTV\/redis,louisliangjun\/redis,himoca\/redis,jxwr\/redis,splitice\/redis,xuzhezhaozhao\/redis_reading,xuzhezhaozhao\/redis_reading,splitice\/redis,himoca\/redis,darksideofthemoo\/redis-histogram,xuzhezhaozhao\/redis_reading,ksarch-saas\/redis,ttuna\/msot-redis,maodeyi\/redis_lua,ttuna\/msot-redis,himoca\/redis,spearhead-ea\/redis,ttuna\/msot-redis,louisliangjun\/redis,darksideofthemoo\/redis-histogram,MSOpenTech\/redis,louisliangjun\/redis,ksarch-saas\/redis,splitice\/redis,jxwr\/redis,ksarch-saas\/redis,spearhead-ea\/redis,maodeyi\/redis_lua,MSOpenTech\/redis,ramonsnir\/redis,louisliangjun\/redis,slfs007\/mk-redis,ttuna\/msot-redis,ramonsnir\/redis,darksideofthemoo\/redis-histogram,slfs007\/mk-redis,MSOpenTech\/redis,splitice\/redis,MSOpenTech\/redis,ttuna\/msot-redis,HunanTV\/redis,darksideofthemoo\/redis-histogram,MSOpenTech\/redis,HunanTV\/redis,HunanTV\/redis,xuzhezhaozhao\/redis_reading,jxwr\/redis,slfs007\/mk-redis,maodeyi\/redis_lua","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/scripting.c\n+++ src\/scripting.c\n@@ -224,6 +224,7 @@\n \/* Build the arguments vector *\/\n if (!argv) {\n argv = zmalloc(sizeof(robj*)*argc);\n+ argv_size = argc;\n } else if (argv_size < argc) {\n argv = zrealloc(argv,sizeof(robj*)*argc);\n argv_size = argc;\n"} {"commit":"7f2e56c17ddf1e3524657c2a3e0397f2f842157e","subject":"MFC r273143: Remove setting BIO_DONE flag for BIOs that have done() method.","message":"MFC r273143: Remove setting BIO_DONE flag for BIOs that have done() method.\n\nThis fixes use-after-free, caused by geom_disk, completing same BIO twice\nto save extra allocation, and getting BIO_DONE set after the first.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"77e5d0b3fb6075e98eb6f71e56f238054652f4b7","subject":"MFC 1.49: do not hardcode if_mtu values in here, except for IFT_{ARC,FDDI} - they need special handling. makes it possible to take advantage of 9k ether frames.","message":"MFC 1.49: do not hardcode if_mtu values in here, except for IFT_{ARC,FDDI} -\nthey need special handling. makes it possible to take advantage of 9k ether\nframes.\n\nApproved by: re (scottl)\nCommitted at: CBUG Meeting meets XCAST6 Festival\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"2b08c7da524e551c622a9e6f0984ec77a584fed0","subject":"Add comments to StructuredTransform and DomainTransform.","message":"Add comments to StructuredTransform and DomainTransform.\n","repos":"StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion,StanfordLegion\/legion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- runtime\/realm\/indexspace.h\n+++ runtime\/realm\/indexspace.h\n@@ -122,40 +122,40 @@\n Point<M, T> offset;\n };\n \n+ \/\/ Represents a generic structured transform.\n template <int N, typename T, int N2, typename T2>\n class REALM_PUBLIC_API StructuredTransform {\n- public:\n- StructuredTransform() = default;\n- StructuredTransform(const AffineTransform<N, N2, T2>& _transform);\n- StructuredTransform(const TranslationTransform<N, T2>& _transform);\n-\n- Point<N, T> operator[](const Point<N2, T>& point) const;\n-\n- enum StructuredTransformType {\n- NONE = 0,\n- AFFINE = 1,\n- TRANSLATION = 2,\n- };\n-\n- \/\/ protected:\n- Realm::Matrix<N, N2, T2> transform_matrix;\n- Point<N, T2> offset;\n- StructuredTransformType type;\n- };\n-\n+ public:\n+ StructuredTransform() = default;\n+ StructuredTransform(const AffineTransform<N, N2, T2>& _transform);\n+ StructuredTransform(const TranslationTransform<N, T2>& _transform);\n+\n+ enum StructuredTransformType {\n+ NONE = 0,\n+ AFFINE = 1,\n+ TRANSLATION = 2,\n+ };\n+\n+ Point<N, T> operator[](const Point<N2, T>& point) const;\n+\n+ \/\/ protected:\n+ Realm::Matrix<N, N2, T2> transform_matrix;\n+ Point<N, T2> offset;\n+ StructuredTransformType type;\n+ };\n+\n+ \/\/ Represents a generic domain transform.\n template <int N, typename T, int N2, typename T2>\n class REALM_PUBLIC_API DomainTransform {\n public:\n DomainTransform() = default;\n DomainTransform(const StructuredTransform<N, T, N2, T2>& _transform);\n-\n DomainTransform(\n const std::vector<FieldDataDescriptor<IndexSpace<N2, T2>, Point<N, T>>>&\n _field_data);\n-\n DomainTransform(\n- const std::vector<FieldDataDescriptor<IndexSpace<N2, T2>, Rect<N, T>>>\n- &_field_data);\n+ const std::vector<FieldDataDescriptor<IndexSpace<N2, T2>, Rect<N, T>>>&\n+ _field_data);\n \n enum DomainTransformType {\n NONE = 0,\n"} {"commit":"e62b57a8e9fce54fc356a8379b22a065e510450b","subject":"Fix multiple def errors for strcasecmp && strncasecmp.","message":"Fix multiple def errors for strcasecmp && strncasecmp.\n","repos":"DiamondLovesYou\/rust-ppapi,DiamondLovesYou\/rust-ppapi,DiamondLovesYou\/rust-ppapi,DiamondLovesYou\/rust-ppapi","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- deps\/libressl-2.0.0\/include\/string.h\n+++ deps\/libressl-2.0.0\/include\/string.h\n@@ -22,20 +22,4 @@\n \n int timingsafe_memcmp(const void *b1, const void *b2, size_t len);\n \n-#ifdef __pnacl__\n-inline int strncasecmp(const char *str1, const char *str2, size_t n) {\n- size_t i = 0;\n- for(; str1[i] == str2[i] &&\n- str1[i] != '\\0' && str2[i] != '\\0' &&\n- i < n; ++i) { }\n- return (int)(str1[i] - str2[i]);\n-}\n-inline int strcasecmp(const char *str1, const char *str2) {\n- size_t i = 0;\n- for(; str1[i] == str2[i] &&\n- str1[i] != '\\0' && str2[i] != '\\0'; ++i) { }\n- return (int)(str1[i] - str2[i]);\n-}\n-#endif \/* __pnacl__ *\/\n-\n #endif\n"} {"commit":"a49fa76fa8651aafd11dc0c6bb6130220fc1bed9","subject":"android\/haltest: Fix bug when building for Android 4.2.2","message":"android\/haltest: Fix bug when building for Android 4.2.2\n\nSince I started to use system Android headers instead of local this\nbug was found.\n","repos":"silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,mapfau\/bluez,mapfau\/bluez,mapfau\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- android\/client\/if-bt.c\n+++ android\/client\/if-bt.c\n@@ -789,10 +789,10 @@\n \t\tBT_PROFILE_SOCKETS_ID,\n \t\tBT_PROFILE_HIDHOST_ID,\n \t\tBT_PROFILE_PAN_ID,\n-#if PLATFORM_SDK_VERSION >= 18\n+#if PLATFORM_SDK_VERSION > 17\n \t\tBT_PROFILE_GATT_ID,\n+\t\tBT_PROFILE_AV_RC_ID,\n #endif\n-\t\tBT_PROFILE_AV_RC_ID,\n \t\tNULL\n \t};\n \n"} {"commit":"5bfaf660bd32e11683bde7c96270dcd094dbea74","subject":"Fix return value","message":"Fix return value\n","repos":"shyamalschandra\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/input\/control.c\n+++ src\/input\/control.c\n@@ -506,9 +506,8 @@\n if( asprintf( &str, \"%s=%s\", psz_option, psz_value ) == -1 )\n return VLC_ENOMEM;\n \n- input_ItemAddOpt( p_input->p->input.p_item, str,\n- VLC_INPUT_OPTION_UNIQUE );\n- i = VLC_SUCCESS;\n+ i = input_ItemAddOpt( p_input->p->input.p_item, str,\n+ VLC_INPUT_OPTION_UNIQUE );\n free( str );\n return i;\n }\n"} {"commit":"d98d72c18155eb999fc87c6c3d0e57c46afc1efb","subject":"decoder: abort packetizer loop in case of error","message":"decoder: abort packetizer loop in case of error\n\nIf a decoder module set an error, pf_decode shouldn't be called again.\n","repos":"xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/input\/decoder.c\n+++ src\/input\/decoder.c\n@@ -1025,6 +1025,11 @@\n p_packetized_block->p_next = NULL;\n \n DecoderDecodeVideo( p_dec, p_packetized_block );\n+ if( p_dec->b_error )\n+ {\n+ block_ChainRelease( p_next );\n+ return;\n+ }\n \n p_packetized_block = p_next;\n }\n@@ -1200,6 +1205,11 @@\n p_packetized_block->p_next = NULL;\n \n DecoderDecodeAudio( p_dec, p_packetized_block );\n+ if( p_dec->b_error )\n+ {\n+ block_ChainRelease( p_next );\n+ return;\n+ }\n \n p_packetized_block = p_next;\n }\n"} {"commit":"d12d90d0d72d58f2a71374c4fc6640609010390a","subject":"decoder: merge two functions","message":"decoder: merge two functions\n","repos":"xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/input\/decoder.c\n+++ src\/input\/decoder.c\n@@ -827,18 +827,43 @@\n block_Release( p_cc );\n }\n \n-static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,\n- int *pi_played_sum, int *pi_lost_sum )\n+static int DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,\n+ int *pi_played_sum, int *pi_lost_sum )\n {\n decoder_owner_sys_t *p_owner = p_dec->p_owner;\n vout_thread_t *p_vout = p_owner->p_vout;\n+ bool prerolled;\n+\n+ vlc_mutex_lock( &p_owner->lock );\n+ if( p_owner->i_preroll_end > p_picture->date )\n+ {\n+ vlc_mutex_unlock( &p_owner->lock );\n+ picture_Release( p_picture );\n+ return -1;\n+ }\n+\n+ prerolled = p_owner->i_preroll_end > INT64_MIN;\n+ p_owner->i_preroll_end = INT64_MIN;\n+ vlc_mutex_unlock( &p_owner->lock );\n+\n+ if( unlikely(prerolled) )\n+ {\n+ msg_Dbg( p_dec, \"end of video preroll\" );\n+\n+ if( p_vout )\n+ vout_Flush( p_vout, VLC_TS_INVALID+1 );\n+ }\n+\n+ if( p_dec->pf_get_cc &&\n+ ( !p_owner->p_packetizer || !p_owner->p_packetizer->pf_get_cc ) )\n+ DecoderGetCc( p_dec, p_dec );\n \n if( p_picture->date <= VLC_TS_INVALID )\n {\n msg_Warn( p_dec, \"non-dated video buffer received\" );\n *pi_lost_sum += 1;\n picture_Release( p_picture );\n- return;\n+ return 0;\n }\n \n \/* *\/\n@@ -903,38 +928,6 @@\n \n *pi_played_sum += i_tmp_display;\n *pi_lost_sum += i_tmp_lost;\n-}\n-\n-static int DecoderPreparePlayVideo( decoder_t *p_dec, picture_t *p_pic )\n-{\n- decoder_owner_sys_t *p_owner = p_dec->p_owner;\n- vout_thread_t *p_vout = p_owner->p_vout;\n- bool prerolled;\n-\n- vlc_mutex_lock( &p_owner->lock );\n- if( p_owner->i_preroll_end > p_pic->date )\n- {\n- vlc_mutex_unlock( &p_owner->lock );\n- picture_Release( p_pic );\n- return -1;\n- }\n-\n- prerolled = p_owner->i_preroll_end > INT64_MIN;\n- p_owner->i_preroll_end = INT64_MIN;\n- vlc_mutex_unlock( &p_owner->lock );\n-\n- if( unlikely(prerolled) )\n- {\n- msg_Dbg( p_dec, \"end of video preroll\" );\n-\n- if( p_vout )\n- vout_Flush( p_vout, VLC_TS_INVALID+1 );\n- }\n-\n- if( p_dec->pf_get_cc &&\n- ( !p_owner->p_packetizer || !p_owner->p_packetizer->pf_get_cc ) )\n- DecoderGetCc( p_dec, p_dec );\n-\n return 0;\n }\n \n@@ -961,13 +954,11 @@\n assert( p_pic );\n int i_lost = 0;\n int i_displayed = 0;\n- int i_ret;\n-\n- if( ( i_ret = DecoderPreparePlayVideo( p_dec, p_pic ) ) == 0 )\n- DecoderPlayVideo( p_dec, p_pic, &i_displayed, &i_lost );\n+\n+ int ret = DecoderPlayVideo( p_dec, p_pic, &i_displayed, &i_lost );\n \n DecoderUpdateStatVideo( p_dec, 1, i_lost, i_displayed );\n- return i_ret;\n+ return ret;\n }\n \n static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )\n@@ -981,9 +972,6 @@\n while( (p_pic = p_dec->pf_decode_video( p_dec, pp_block ) ) )\n {\n i_decoded++;\n-\n- if( DecoderPreparePlayVideo( p_dec, p_pic ) != 0 )\n- continue;\n \n DecoderPlayVideo( p_dec, p_pic, &i_displayed, &i_lost );\n }\n"} {"commit":"154d8505e83cbd436cc232fe9ac7cad055d88781","subject":"BUG(485):When initializing the replaygain plugin, evaluate its config properties.","message":"BUG(485):When initializing the replaygain plugin, evaluate its config properties.\n","repos":"dreamerc\/xmms2,six600110\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,xmms2\/xmms2-stable,theefer\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,chrippa\/xmms2,xmms2\/xmms2-stable,theefer\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,dreamerc\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,dreamerc\/xmms2,dreamerc\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,six600110\/xmms2,chrippa\/xmms2,six600110\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,dreamerc\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,theeternalsw0rd\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,theefer\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman-old,theefer\/xmms2,krad-radio\/xmms2-krad","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/replaygain\/replaygain.c\n+++ src\/plugins\/replaygain\/replaygain.c\n@@ -54,6 +54,7 @@\n static void xmms_replaygain_destroy (xmms_effect_t *effect);\n static void xmms_replaygain_config_changed (xmms_object_t *obj, gconstpointer value, gpointer udata);\n static void compute_replaygain (xmms_replaygain_data_t *data);\n+static xmms_replaygain_mode_t parse_mode (const char *s);\n \n xmms_plugin_t *\n xmms_plugin_get (void)\n@@ -113,10 +114,14 @@\n \t xmms_replaygain_config_changed,\n \t effect);\n \n+\tdata->mode = parse_mode (xmms_config_property_get_string (cfgv));\n+\n \tcfgv = xmms_plugin_config_lookup (plugin, \"use_anticlip\");\n \txmms_config_property_callback_set (cfgv,\n \t xmms_replaygain_config_changed,\n \t effect);\n+\n+\tdata->use_anticlip = !!xmms_config_property_get_int (cfgv);\n }\n \n static void\n@@ -279,11 +284,7 @@\n \tname = xmms_config_property_get_name ((xmms_config_property_t *) obj);\n \n \tif (!g_ascii_strcasecmp (name, \"effect.replaygain.mode\")) {\n-\t\tif (!g_ascii_strcasecmp (value, \"album\")) {\n-\t\t\tdata->mode = XMMS_REPLAYGAIN_MODE_ALBUM;\n-\t\t} else {\n-\t\t\tdata->mode = XMMS_REPLAYGAIN_MODE_TRACK;\n-\t\t}\n+\t\tdata->mode = parse_mode (value);\n \t} else if (!g_ascii_strcasecmp (name,\n \t \"effect.replaygain.use_anticlip\")) {\n \t\tdata->use_anticlip = !!atoi (value);\n@@ -340,3 +341,13 @@\n \t *\/\n \tdata->has_replaygain = (fabs (data->gain - 1.0) > 0.001);\n }\n+\n+static xmms_replaygain_mode_t\n+parse_mode (const char *s)\n+{\n+\tif (s && !g_ascii_strcasecmp (s, \"album\")) {\n+\t\treturn XMMS_REPLAYGAIN_MODE_ALBUM;\n+\t} else {\n+\t\treturn XMMS_REPLAYGAIN_MODE_TRACK;\n+\t}\n+}\n"} {"commit":"57dfca01b137768d49b0c27cb13752201e377e7b","subject":"Chorus: cleanup and quality fixes","message":"Chorus: cleanup and quality fixes\n\nSigned-off-by: Jean-Baptiste Kempf <7b85a41a628204b76aba4326273a3ccc74bd009a@videolan.org>\n","repos":"shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/audio_filter\/chorus_flanger.c\n+++ modules\/audio_filter\/chorus_flanger.c\n@@ -1,10 +1,11 @@\n \/*****************************************************************************\n- * chorus_flanger.c\n+ * chorus_flanger: Basic chorus\/flanger\/delay audio filter\n *****************************************************************************\n- * Copyright (C) 2009 the VideoLAN team\n+ * Copyright (C) 2009-12 the VideoLAN team\n * $Id$\n *\n- * Author: Srikanth Raju < srikiraju at gmail dot com >\n+ * Authors: Srikanth Raju < srikiraju at gmail dot com >\n+ * Sukrit Sangwan < sukritsangwan at gmail dot com >\n *\n * This program is free software; you can redistribute it and\/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -21,13 +22,6 @@\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.\n *****************************************************************************\/\n \n-\/**\n- * Basic chorus\/flanger\/delay audio filter\n- * This implements a variable delay filter for VLC. It has some issues with\n- * interpolation and sounding 'correct'.\n- *\/\n-\n-\n #ifdef HAVE_CONFIG_H\n # include \"config.h\"\n #endif\n@@ -47,6 +41,9 @@\n static int Open ( vlc_object_t * );\n static void Close ( vlc_object_t * );\n static block_t *DoWork( filter_t *, block_t * );\n+static int paramCallback( vlc_object_t *, char const *, vlc_value_t ,\n+ vlc_value_t , void * );\n+static int reallocate_buffer( filter_t *, filter_sys_t * );\n \n struct filter_sys_t\n {\n@@ -57,15 +54,15 @@\n float f_wetLevel, f_dryLevel;\n float f_sweepDepth, f_sweepRate;\n \n- float f_step,f_offset;\n- int i_step,i_offset;\n+ float f_offset;\n+ int i_step;\n float f_temp;\n float f_sinMultiplier;\n \n \/* This data is for the the circular queue which stores the samples. *\/\n int i_bufferLength;\n- float * pf_delayLineStart, * pf_delayLineEnd;\n- float * pf_write;\n+ float * p_delayLineStart, * p_delayLineEnd;\n+ float * p_write;\n };\n \n \/*****************************************************************************\n@@ -80,7 +77,7 @@\n set_category( CAT_AUDIO )\n set_subcategory( SUBCAT_AUDIO_AFILTER )\n add_shortcut( \"delay\" )\n- add_float( \"delay-time\", 40, N_(\"Delay time\"),\n+ add_float( \"delay-time\", 20, N_(\"Delay time\"),\n N_(\"Time in milliseconds of the average delay. Note average\"), true )\n add_float( \"sweep-depth\", 6, N_(\"Sweep Depth\"),\n N_(\"Time in milliseconds of the maximum sweep depth. Thus, the sweep \"\n@@ -144,6 +141,12 @@\n p_sys->f_feedbackGain = var_CreateGetFloat( p_this, \"feedback-gain\" );\n p_sys->f_dryLevel = var_CreateGetFloat( p_this, \"dry-mix\" );\n p_sys->f_wetLevel = var_CreateGetFloat( p_this, \"wet-mix\" );\n+ var_AddCallback( p_this, \"delay-time\", paramCallback, p_sys );\n+ var_AddCallback( p_this, \"sweep-depth\", paramCallback, p_sys );\n+ var_AddCallback( p_this, \"sweep-rate\", paramCallback, p_sys );\n+ var_AddCallback( p_this, \"feedback-gain\", paramCallback, p_sys );\n+ var_AddCallback( p_this, \"dry-mix\", paramCallback, p_sys );\n+ var_AddCallback( p_this, \"wet-mix\", paramCallback, p_sys );\n \n if( p_sys->f_delayTime < 0.0)\n {\n@@ -176,27 +179,25 @@\n p_sys->f_sweepRate, p_filter->fmt_in.audio.i_rate );\n if( p_sys->i_bufferLength <= 0 )\n {\n- msg_Err( p_filter, \"Delay-time, Sampl rate or Channels was incorrect\" );\n+ msg_Err( p_filter, \"Delay-time, Sample rate or Channels was incorrect\" );\n free(p_sys);\n return VLC_EGENERIC;\n }\n \n- p_sys->pf_delayLineStart = calloc( p_sys->i_bufferLength, sizeof( float ) );\n- if( !p_sys->pf_delayLineStart )\n+ p_sys->p_delayLineStart = calloc( p_sys->i_bufferLength, sizeof( float ) );\n+ if( !p_sys->p_delayLineStart )\n {\n free( p_sys );\n return VLC_ENOMEM;\n }\n \n p_sys->i_cumulative = 0;\n- p_sys->f_step = p_sys->f_sweepRate \/ 1000.0;\n p_sys->i_step = p_sys->f_sweepRate > 0 ? 1 : 0;\n p_sys->f_offset = 0;\n- p_sys->i_offset = 0;\n p_sys->f_temp = 0;\n \n- p_sys->pf_delayLineEnd = p_sys->pf_delayLineStart + p_sys->i_bufferLength;\n- p_sys->pf_write = p_sys->pf_delayLineStart;\n+ p_sys->p_delayLineEnd = p_sys->p_delayLineStart + p_sys->i_bufferLength;\n+ p_sys->p_write = p_sys->p_delayLineStart;\n \n if( p_sys->f_sweepDepth < small_value() ||\n p_filter->fmt_in.audio.i_rate < small_value() ) {\n@@ -210,7 +211,6 @@\n \n return VLC_SUCCESS;\n }\n-\n \n \/**\n * sanitize: Helper function to eliminate small amplitudes\n@@ -239,28 +239,24 @@\n float *p_out = (float*)p_in_buf->p_buffer;\n float *p_in = (float*)p_in_buf->p_buffer;\n \n- float *pf_ptr, f_diff = 0, f_frac = 0, f_temp = 0 ;\n+ float *p_ptr, f_temp = 0;\/* f_diff = 0, f_frac = 0;*\/\n \n \/* Process each sample *\/\n for( unsigned i = 0; i < i_samples ; i++ )\n {\n- \/* Use a sine function as a oscillator wave. TODO *\/\n- \/* f_offset = sinf( ( p_sys->i_cumulative ) * p_sys->f_sinMultiplier ) *\n- * (int)floor(p_sys->f_sweepDepth * p_sys->i_sampleRate \/ 1000);\n- *\/\n-\n- \/* Triangle oscillator. Step using ints, because floats give rounding *\/\n- p_sys->i_offset+=p_sys->i_step;\n- p_sys->f_offset = p_sys->i_offset * p_sys->f_step;\n+ \/* Sine function as a oscillator wave to calculate sweep *\/\n+ p_sys->i_cumulative += p_sys->i_step;\n+ p_sys->f_offset = sinf( (p_sys->i_cumulative) * p_sys->f_sinMultiplier )\n+ * floorf(p_sys->f_sweepDepth * p_sys->i_sampleRate \/ 1000);\n if( abs( p_sys->i_step ) > 0 )\n {\n- if( p_sys->i_offset >= floor( p_sys->f_sweepDepth *\n+ if( p_sys->i_cumulative >= floor( p_sys->f_sweepDepth *\n p_sys->i_sampleRate \/ p_sys->f_sweepRate ))\n {\n p_sys->f_offset = i_maxOffset;\n p_sys->i_step = -1 * ( p_sys->i_step );\n }\n- if( p_sys->i_offset <= floor( -1 * p_sys->f_sweepDepth *\n+ if( p_sys->i_cumulative <= floor( -1 * p_sys->f_sweepDepth *\n p_sys->i_sampleRate \/ p_sys->f_sweepRate ) )\n {\n p_sys->f_offset = -i_maxOffset;\n@@ -269,43 +265,45 @@\n }\n \/* Calculate position in delay *\/\n int offset = floor( p_sys->f_offset );\n- pf_ptr = p_sys->pf_write + i_maxOffset * p_sys->i_channels +\n- offset * p_sys->i_channels;\n+ p_ptr = p_sys->p_write + ( i_maxOffset - offset ) * p_sys->i_channels;\n \n \/* Handle Overflow *\/\n- if( pf_ptr < p_sys->pf_delayLineStart )\n- {\n- pf_ptr += p_sys->i_bufferLength - p_sys->i_channels;\n- }\n- if( pf_ptr > p_sys->pf_delayLineEnd - 2*p_sys->i_channels )\n- {\n- pf_ptr -= p_sys->i_bufferLength - p_sys->i_channels;\n+ if( p_ptr < p_sys->p_delayLineStart )\n+ {\n+ p_ptr += p_sys->i_bufferLength - p_sys->i_channels;\n+ }\n+ if( p_ptr > p_sys->p_delayLineEnd - 2*p_sys->i_channels )\n+ {\n+ p_ptr -= p_sys->i_bufferLength - p_sys->i_channels;\n }\n \/* For interpolation *\/\n- f_frac = ( p_sys->f_offset - (int)p_sys->f_offset );\n+\/* f_frac = ( p_sys->f_offset - (int)p_sys->f_offset );*\/\n for( i_chan = 0; i_chan < p_sys->i_channels; i_chan++ )\n {\n- f_diff = *( pf_ptr + p_sys->i_channels + i_chan )\n- - *( pf_ptr + i_chan );\n- f_temp = ( *( pf_ptr + i_chan ) );\/\/+ f_diff * f_frac);\n+\/* if( p_ptr <= p_sys->p_delayLineStart + p_sys->i_channels )\n+ f_diff = *(p_sys->p_delayLineEnd + i_chan) - p_ptr[i_chan];\n+ else\n+ f_diff = *( p_ptr - p_sys->i_channels + i_chan )\n+ - p_ptr[i_chan];*\/\n+ f_temp = ( *( p_ptr + i_chan ) );\/\/+ f_diff * f_frac;\n \/*Linear Interpolation. FIXME. This creates LOTS of noise *\/\n sanitize(&f_temp);\n p_out[i_chan] = p_sys->f_dryLevel * p_in[i_chan] +\n p_sys->f_wetLevel * f_temp;\n- *( p_sys->pf_write + i_chan ) = p_in[i_chan] +\n+ *( p_sys->p_write + i_chan ) = p_in[i_chan] +\n p_sys->f_feedbackGain * f_temp;\n }\n- if( p_sys->pf_write == p_sys->pf_delayLineStart )\n+ if( p_sys->p_write == p_sys->p_delayLineStart )\n for( i_chan = 0; i_chan < p_sys->i_channels; i_chan++ )\n- *( p_sys->pf_delayLineEnd - p_sys->i_channels + i_chan )\n- = *( p_sys->pf_delayLineStart + i_chan );\n+ *( p_sys->p_delayLineEnd - p_sys->i_channels + i_chan )\n+ = *( p_sys->p_delayLineStart + i_chan );\n \n p_in += p_sys->i_channels;\n p_out += p_sys->i_channels;\n- p_sys->pf_write += p_sys->i_channels;\n- if( p_sys->pf_write == p_sys->pf_delayLineEnd - p_sys->i_channels )\n- {\n- p_sys->pf_write = p_sys->pf_delayLineStart;\n+ p_sys->p_write += p_sys->i_channels;\n+ if( p_sys->p_write == p_sys->p_delayLineEnd - p_sys->i_channels )\n+ {\n+ p_sys->p_write = p_sys->p_delayLineStart;\n }\n \n }\n@@ -321,6 +319,98 @@\n filter_t *p_filter = ( filter_t* )p_this;\n filter_sys_t *p_sys = p_filter->p_sys;\n \n- free( p_sys->pf_delayLineStart );\n+ var_DelCallback( p_this, \"delay-time\", paramCallback, p_sys );\n+ var_DelCallback( p_this, \"sweep-depth\", paramCallback, p_sys );\n+ var_DelCallback( p_this, \"sweep-rate\", paramCallback, p_sys );\n+ var_DelCallback( p_this, \"feedback-gain\", paramCallback, p_sys );\n+ var_DelCallback( p_this, \"wet-mix\", paramCallback, p_sys );\n+ var_DelCallback( p_this, \"dry-mix\", paramCallback, p_sys );\n+ var_Destroy( p_this, \"delay-time\" );\n+ var_Destroy( p_this, \"sweep-depth\" );\n+ var_Destroy( p_this, \"sweep-rate\" );\n+ var_Destroy( p_this, \"feedback-gain\" );\n+ var_Destroy( p_this, \"wet-mix\" );\n+ var_Destroy( p_this, \"dry-mix\" );\n+\n+ free( p_sys->p_delayLineStart );\n free( p_sys );\n }\n+\n+\/******************************************************************************\n+ * Callback to update parameters on the fly\n+ ******************************************************************************\/\n+static int paramCallback( vlc_object_t *p_this, char const *psz_var,\n+ vlc_value_t oldval, vlc_value_t newval, void *p_data )\n+{\n+ filter_t *p_filter = (filter_t *)p_this;\n+ filter_sys_t *p_sys = (filter_sys_t *) p_data;\n+\n+ if( !strncmp( psz_var, \"delay-time\", 10 ) )\n+ {\n+ \/* if invalid value pretend everything is OK without updating value *\/\n+ if( newval.f_float < 0 )\n+ return VLC_SUCCESS;\n+ p_sys->f_delayTime = newval.f_float;\n+ if( !reallocate_buffer( p_filter, p_sys ) )\n+ {\n+ p_sys->f_delayTime = oldval.f_float;\n+ p_sys->i_bufferLength = p_sys->i_channels * ( (int)\n+ ( ( p_sys->f_delayTime + p_sys->f_sweepDepth ) * \n+ p_filter->fmt_in.audio.i_rate\/1000 ) + 1 );\n+ }\n+ }\n+ else if( !strncmp( psz_var, \"sweep-depth\", 11 ) )\n+ {\n+ if( newval.f_float < 0 || newval.f_float > p_sys->f_delayTime)\n+ return VLC_SUCCESS;\n+ p_sys->f_sweepDepth = newval.f_float;\n+ if( !reallocate_buffer( p_filter, p_sys ) )\n+ {\n+ p_sys->f_sweepDepth = oldval.f_float;\n+ p_sys->i_bufferLength = p_sys->i_channels * ( (int)\n+ ( ( p_sys->f_delayTime + p_sys->f_sweepDepth ) * \n+ p_filter->fmt_in.audio.i_rate\/1000 ) + 1 );\n+ }\n+ }\n+ else if( !strncmp( psz_var, \"sweep-rate\", 10 ) )\n+ {\n+ if( newval.f_float > p_sys->f_sweepDepth )\n+ return VLC_SUCCESS;\n+ p_sys->f_sweepRate = newval.f_float;\n+ \/* Calculate new f_sinMultiplier *\/\n+ if( p_sys->f_sweepDepth < small_value() ||\n+ p_filter->fmt_in.audio.i_rate < small_value() ) {\n+ p_sys->f_sinMultiplier = 0.0;\n+ }\n+ else {\n+ p_sys->f_sinMultiplier = 11 * p_sys->f_sweepRate \/\n+ ( 7 * p_sys->f_sweepDepth * p_filter->fmt_in.audio.i_rate ) ;\n+ }\n+ }\n+ else if( !strncmp( psz_var, \"feedback-gain\", 13 ) )\n+ p_sys->f_feedbackGain = newval.f_float;\n+ else if( !strncmp( psz_var, \"wet-mix\", 7 ) )\n+ p_sys->f_wetLevel = newval.f_float;\n+ else if( !strncmp( psz_var, \"dry-mix\", 7 ) )\n+ p_sys->f_dryLevel = newval.f_float;\n+\n+ return VLC_SUCCESS;\n+}\n+\n+static int reallocate_buffer( filter_t *p_filter, filter_sys_t *p_sys )\n+{\n+ p_sys->i_bufferLength = p_sys->i_channels * ( (int)( ( p_sys->f_delayTime\n+ + p_sys->f_sweepDepth ) * p_filter->fmt_in.audio.i_rate\/1000 ) + 1 );\n+\n+ float *temp = realloc( p_sys->p_delayLineStart, p_sys->i_bufferLength );\n+ if( unlikely( !temp ) )\n+ {\n+ msg_Err( p_filter, \"Couldnt reallocate buffer for new delay.\" );\n+ return 0;\n+ }\n+ free( p_sys->p_delayLineStart );\n+ p_sys->p_delayLineStart = temp;\n+ p_sys->p_delayLineEnd = p_sys->p_delayLineStart + p_sys->i_bufferLength;\n+ free( temp );\n+ return 1;\n+}\n"} {"commit":"65ee6f8a70a4cdb5e0d677c55bde96fdccd6e270","subject":"Break out FFT function in ns_core","message":"Break out FFT function in ns_core\n\nThis is done in order to make the code more readible and maintainable.\nThis introduces an error of only +1 and -1.\n\nBUG=webrtc:3811\nR=bjornv@webrtc.org, kwiberg@webrtc.org\n\nReview URL: https:\/\/webrtc-codereview.appspot.com\/27749004\n\nCr-Mirrored-From: https:\/\/chromium.googlesource.com\/external\/webrtc\nCr-Mirrored-Commit: 799e88ae190dd7e857d108c5e3fb99c9d2d2bf7e\n","repos":"sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/audio_processing\/ns\/ns_core.c\n+++ modules\/audio_processing\/ns\/ns_core.c\n@@ -810,6 +810,44 @@\n }\n }\n \n+\/\/ Transforms the signal from time to frequency domain.\n+\/\/ Inputs:\n+\/\/ * |time_data| is the signal in the time domain.\n+\/\/ * |time_data_length| is the length of the analysis buffer.\n+\/\/ * |magnitude_length| is the length of the spectrum magnitude, which equals\n+\/\/ the length of both |real| and |imag| (time_data_length \/ 2 + 1).\n+\/\/ Outputs:\n+\/\/ * |time_data| is the signal in the frequency domain.\n+\/\/ * |real| is the real part of the frequency domain.\n+\/\/ * |imag| is the imaginary part of the frequency domain.\n+\/\/ * |magn| is the calculated signal magnitude in the frequency domain.\n+static void FFT(NSinst_t* const self,\n+ float* time_data,\n+ int time_data_length,\n+ int magnitude_length,\n+ float* real,\n+ float* imag,\n+ float* magn) {\n+ int i;\n+\n+ assert(magnitude_length == time_data_length \/ 2 + 1);\n+\n+ WebRtc_rdft(time_data_length, 1, time_data, self->ip, self->wfft);\n+\n+ imag[0] = 0;\n+ real[0] = time_data[0];\n+ magn[0] = fabs(real[0]) + 1.f;\n+ imag[magnitude_length - 1] = 0;\n+ real[magnitude_length - 1] = time_data[1];\n+ magn[magnitude_length - 1] = fabs(real[magnitude_length - 1]) + 1.f;\n+ for (i = 1; i < magnitude_length - 1; ++i) {\n+ real[i] = time_data[2 * i];\n+ imag[i] = time_data[2 * i + 1];\n+ \/\/ Magnitude spectrum.\n+ magn[i] = sqrtf(real[i] * real[i] + imag[i] * imag[i]) + 1.f;\n+ }\n+}\n+\n \/\/ Transforms the signal from frequency to time domain.\n \/\/ Inputs:\n \/\/ * |real| is the real part of the frequency domain.\n@@ -882,10 +920,11 @@\n const int kStartBand = 5; \/\/ Skip first frequency bins during estimation.\n int updateParsFlag;\n float energy;\n- float signalEnergy, sumMagn;\n+ float signalEnergy = 0.f;\n+ float sumMagn = 0.f;\n float tmpFloat1, tmpFloat2, tmpFloat3, probSpeech, probNonSpeech;\n float gammaNoiseTmp, gammaNoiseOld;\n- float noiseUpdateTmp, fTmp;\n+ float noiseUpdateTmp;\n float winData[ANAL_BLOCKL_MAX];\n float magn[HALF_ANAL_BLOCKL], noise[HALF_ANAL_BLOCKL];\n float snrLocPost[HALF_ANAL_BLOCKL], snrLocPrior[HALF_ANAL_BLOCKL];\n@@ -927,33 +966,10 @@\n \/\/\n inst->blockInd++; \/\/ Update the block index only when we process a block.\n \/\/ FFT\n- WebRtc_rdft(inst->anaLen, 1, winData, inst->ip, inst->wfft);\n-\n- imag[0] = 0;\n- real[0] = winData[0];\n- magn[0] = fabs(real[0]) + 1.f;\n- imag[inst->magnLen - 1] = 0;\n- real[inst->magnLen - 1] = winData[1];\n- magn[inst->magnLen - 1] = fabs(real[inst->magnLen - 1]) + 1.f;\n- signalEnergy = (float)(real[0] * real[0]) +\n- (float)(real[inst->magnLen - 1] * real[inst->magnLen - 1]);\n- sumMagn = magn[0] + magn[inst->magnLen - 1];\n- if (inst->blockInd < END_STARTUP_SHORT) {\n- tmpFloat2 = log((float)(inst->magnLen - 1));\n- sum_log_i = tmpFloat2;\n- sum_log_i_square = tmpFloat2 * tmpFloat2;\n- tmpFloat1 = log(magn[inst->magnLen - 1]);\n- sum_log_magn = tmpFloat1;\n- sum_log_i_log_magn = tmpFloat2 * tmpFloat1;\n- }\n- for (i = 1; i < inst->magnLen - 1; i++) {\n- real[i] = winData[2 * i];\n- imag[i] = winData[2 * i + 1];\n- \/\/ magnitude spectrum\n- fTmp = real[i] * real[i];\n- fTmp += imag[i] * imag[i];\n- signalEnergy += fTmp;\n- magn[i] = ((float)sqrt(fTmp)) + 1.f;\n+ FFT(inst, winData, inst->anaLen, inst->magnLen, real, imag, magn);\n+\n+ for (i = 0; i < inst->magnLen; i++) {\n+ signalEnergy += real[i] * real[i] + imag[i] * imag[i];\n sumMagn += magn[i];\n if (inst->blockInd < END_STARTUP_SHORT) {\n if (i >= kStartBand) {\n@@ -1133,7 +1149,6 @@\n float energy1, energy2, gain, factor, factor1, factor2;\n float snrPrior, previousEstimateStsa, currentEstimateStsa;\n float tmpFloat1, tmpFloat2;\n- float fTmp;\n float fout[BLOCKL_MAX];\n float winData[ANAL_BLOCKL_MAX];\n float magn[HALF_ANAL_BLOCKL];\n@@ -1197,26 +1212,10 @@\n return 0;\n }\n \/\/ FFT\n- WebRtc_rdft(inst->anaLen, 1, winData, inst->ip, inst->wfft);\n-\n- imag[0] = 0;\n- real[0] = winData[0];\n- magn[0] = fabs(real[0]) + 1.f;\n- imag[inst->magnLen - 1] = 0;\n- real[inst->magnLen - 1] = winData[1];\n- magn[inst->magnLen - 1] = fabs(real[inst->magnLen - 1]) + 1.f;\n+ FFT(inst, winData, inst->anaLen, inst->magnLen, real, imag, magn);\n+\n if (inst->blockInd < END_STARTUP_SHORT) {\n- inst->initMagnEst[0] += magn[0];\n- inst->initMagnEst[inst->magnLen - 1] += magn[inst->magnLen - 1];\n- }\n- for (i = 1; i < inst->magnLen - 1; i++) {\n- real[i] = winData[2 * i];\n- imag[i] = winData[2 * i + 1];\n- \/\/ magnitude spectrum\n- fTmp = real[i] * real[i];\n- fTmp += imag[i] * imag[i];\n- magn[i] = ((float)sqrt(fTmp)) + 1.f;\n- if (inst->blockInd < END_STARTUP_SHORT) {\n+ for (i = 0; i < inst->magnLen; i++) {\n inst->initMagnEst[i] += magn[i];\n }\n }\n"} {"commit":"85927b65053867e0e207af4099bb911d0d811cdb","subject":"Inlined spi routines + redid loop to reduce RX interrupt time.","message":"Inlined spi routines + redid loop to reduce RX interrupt time.","repos":"Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- content\/OTRadioLink\/utility\/OTRFM23BLink_OTRFM23BLink.h\n+++ content\/OTRadioLink\/utility\/OTRFM23BLink_OTRFM23BLink.h\n@@ -215,12 +215,15 @@\n \/\/ TODO: convert from busy-wait to sleep, at least in a standby mode, if likely longer than 10s of uS.\n \/\/ At lowest SPI clock prescale (x2) this is likely to spin for ~16 CPU cycles (8 bits each taking 2 cycles).\n \/\/ Treat as if this does not alter state, though in some cases it will.\n- inline uint8_t _io(const uint8_t data) const { SPDR = data; while (!(SPSR & _BV(SPIF))) { } return(SPDR); }\n+ inline uint8_t _io(const uint8_t data) const __attribute__((always_inline)) { SPDR = data; while (!(SPSR & _BV(SPIF))) { } return(SPDR); }\n+ \/\/ Read one byte, sending a 0.\n+ \/\/ SPI must already be configured and running.\n+ \/\/ At lowest SPI clock prescale (x2) this is likely to spin for ~16 CPU cycles (8 bits each taking 2 cycles).\n+ inline uint8_t _rd() const __attribute__((always_inline)) { SPDR = 0U; while (!(SPSR & _BV(SPIF))) { } return(SPDR); } \/\/ XXX\n \/\/ Write one byte over SPI (ignoring the value read back).\n- \/\/ SPI must already be configured and running.\n \/\/ TODO: convert from busy-wait to sleep, at least in a standby mode, if likely longer than 10s of uS.\n \/\/ At lowest SPI clock prescale (x2) this is likely to spin for ~16 CPU cycles (8 bits each taking 2 cycles).\n- inline void _wr(const uint8_t data) { SPDR = data; while (!(SPSR & _BV(SPIF))) { } }\n+ inline void _wr(const uint8_t data) __attribute__((always_inline)) { SPDR = data; while (!(SPSR & _BV(SPIF))) { } }\n \n \/\/ Internal routines to enable\/disable RFM23B on the the SPI bus.\n \/\/ Versions accessible to the base class...\n@@ -378,8 +381,8 @@\n static constexpr bool runSPISlow = ::OTV0P2BASE::DEFAULT_RUN_SPI_SLOW;\n inline void _nSSWait() const { OTV0P2BASE_busy_spin_delay(runSPISlow?4:0); }\n \/\/ Wait from SPI select to op, and after op to deselect, and after deselect.\n- inline void _SELECT() const { fastDigitalWrite(SPI_nSS_DigitalPin, LOW); _nSSWait(); } \/\/ Select\/enable RFM23B.\n- inline void _DESELECT() const { _nSSWait(); fastDigitalWrite(SPI_nSS_DigitalPin, HIGH); _nSSWait(); } \/\/ Deselect\/disable RFM23B.\n+ inline void _SELECT() const __attribute__((always_inline)) { fastDigitalWrite(SPI_nSS_DigitalPin, LOW); _nSSWait(); } \/\/ Select\/enable RFM23B.\n+ inline void _DESELECT() const __attribute__((always_inline)) { _nSSWait(); fastDigitalWrite(SPI_nSS_DigitalPin, HIGH); _nSSWait(); } \/\/ Deselect\/disable RFM23B.\n \/\/ Versions accessible to the base class...\n virtual void _SELECT_() const override { _SELECT(); }\n virtual void _DESELECT_() const override { _DESELECT(); }\n@@ -395,7 +398,7 @@\n \n \/\/ Write to 8-bit register on RFM23B.\n \/\/ SPI must already be configured and running.\n- inline void _writeReg8Bit(const uint8_t addr, const uint8_t val)\n+ inline void _writeReg8Bit (const uint8_t addr, const uint8_t val) __attribute__((always_inline))\n {\n _SELECT();\n _wr(addr | 0x80); \/\/ Force to write.\n@@ -419,11 +422,11 @@\n \/\/ Read from 8-bit register on RFM23B.\n \/\/ SPI must already be configured and running.\n \/\/ Treat as if this does not alter state, though in some cases it will.\n- inline uint8_t _readReg8Bit(const uint8_t addr) const\n+ inline uint8_t _readReg8Bit(const uint8_t addr) const __attribute__((always_inline))\n {\n _SELECT();\n _io(addr & 0x7f); \/\/ Force to read.\n- const uint8_t result = _io(0); \/\/ Dummy value...\n+ const uint8_t result = _rd(); \/\/ Dummy value...\n _DESELECT();\n return(result);\n }\n@@ -437,8 +440,8 @@\n {\n _SELECT();\n _io(addr & 0x7f); \/\/ Force to read.\n- uint16_t result = ((uint16_t)_io(0)) << 8;\n- result |= ((uint16_t)_io(0));\n+ uint16_t result = ((uint16_t)_rd()) << 8;\n+ result |= ((uint16_t)_rd());\n _DESELECT();\n return(result);\n }\n@@ -487,8 +490,8 @@\n {\n _SELECT();\n _io(REG_INT_STATUS1 & 0x7f); \/\/ Force to read.\n- _io(0);\n- _io(0);\n+ _rd();\n+ _rd();\n _DESELECT();\n }\n \/\/ Version accessible to the base class...\n@@ -646,7 +649,8 @@\n \/\/ Do burst read from RX FIFO.\n _SELECT();\n _io(REG_FIFO & 0x7F);\n- for(int i = 0; i < bufSize; ++i) { *buf++ = _io(0); }\n+\/\/ for(int i = 0; i < bufSize; ++i) { *buf++ = _io(0); }\n+ for (uint8_t j = bufSize; j-- != 0; ) { *buf++ = _rd(); }\n _DESELECT();\n \/\/ Clear RX and TX FIFOs simultaneously.\n _writeReg8Bit(REG_OP_CTRL2, 3); \/\/ FFCLRRX | FFCLRTX\n"} {"commit":"6dd3df507e6bdb96bc6eb48e03a5746f9bec6f1a","subject":"GridLoop: add rollback mechanism","message":"GridLoop: add rollback mechanism\n","repos":"semiexp\/penciloid2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/common\/grid_loop.h\n+++ src\/common\/grid_loop.h\n@@ -9,6 +9,8 @@\n #include \"mini_vector.h\"\r\n #include \"grid_loop_method.h\"\r\n #include \"auto_array.h\"\r\n+\r\n+#include<cassert>\r\n \r\n namespace penciloid\r\n {\r\n@@ -55,7 +57,12 @@\n \tbool IsInconsistent() const { return inconsistent_; }\r\n \tbool IsFullySolved() const { return fully_solved_; }\r\n \tbool IsInAbnormalCondition() const { return abnormal_; }\r\n-\tvoid SetInconsistent() { inconsistent_ = true; }\r\n+\tvoid SetInconsistent() { \r\n+\t\tif (!history_.empty() && !inconsistent_) {\r\n+\t\t\thistory_.push_back({ kHistorySetInconsistent, FieldComponent() });\r\n+\t\t}\r\n+\t\tinconsistent_ = true;\r\n+\t}\r\n \r\n \tGridLoopMethod GetMethod() const { return method_; }\r\n \tvoid SetMethod(const GridLoopMethod &m) { method_ = m; }\r\n@@ -102,6 +109,12 @@\n \tvoid CheckAllVertex();\r\n \tvoid CheckAllCell();\r\n \tvoid CheckAllEdge();\r\n+\r\n+\t\/\/ Add a restore point\r\n+\tvoid AddRestorePoint();\r\n+\r\n+\t\/\/ Roll back this field to the last restore point\r\n+\tvoid Rollback();\r\n \r\n \t\/\/\r\n \t\/\/ Public methods below are intended to be \"overridden\" by the subclass.\r\n@@ -130,6 +143,7 @@\n \t\t\tQueueEnd();\r\n \t\t}\r\n \t}\r\n+\r\n private:\r\n \tstruct FieldComponent\r\n \t{\r\n@@ -151,6 +165,10 @@\n \t\t};\r\n \t};\r\n \r\n+\tconst int kHistoryRestorePoint = -1;\r\n+\tconst int kHistorySetInconsistent = -2;\r\n+\tconst int kHistorySetSolved = -3;\r\n+\r\n \tbool IsVertex(LoopPosition pos) const { return pos.y % 2 == 0 && pos.x % 2 == 0; }\r\n \tbool IsEdge(LoopPosition pos) const { return static_cast<int>(pos.y % 2) != static_cast<int>(pos.x % 2); }\r\n \r\n@@ -194,6 +212,7 @@\n \tAutoArray<FieldComponent> field_;\r\n \tAutoArray<int> queue_;\r\n \tAutoArray<bool> queue_stored_;\r\n+\tstd::vector<std::pair<int, FieldComponent> > history_;\r\n \r\n \tY height_;\r\n \tX width_;\r\n@@ -208,6 +227,7 @@\n \t: field_(),\r\n \t queue_(),\r\n \t queue_stored_(),\r\n+\t history_(),\r\n \t height_(0),\r\n \t width_(0),\r\n \t decided_edges_(0),\r\n@@ -226,6 +246,7 @@\n \t: field_((static_cast<int>(height) * 2 + 1) * (static_cast<int>(width) * 2 + 1)),\r\n \t queue_((static_cast<int>(height) * 2 + 1) * (static_cast<int>(width) * 2 + 1) + 1),\r\n \t queue_stored_((static_cast<int>(height) * 2 + 1) * (static_cast<int>(width) * 2 + 1)),\r\n+\t history_(),\r\n \t height_(height),\r\n \t width_(width),\r\n \t decided_edges_(0),\r\n@@ -273,6 +294,7 @@\n \t: field_(other.field_),\r\n \t queue_((static_cast<int>(other.height()) * 2 + 1) * (static_cast<int>(other.width()) * 2 + 1) + 1),\r\n \t queue_stored_((static_cast<int>(other.height()) * 2 + 1) * (static_cast<int>(other.width()) * 2 + 1)),\r\n+\t history_(other.history_),\r\n \t height_(other.height_),\r\n \t width_(other.width_),\r\n \t decided_edges_(other.decided_edges_),\r\n@@ -292,6 +314,7 @@\n \t: field_(std::move(other.field_)),\r\n \t queue_(std::move(other.queue_)),\r\n \t queue_stored_(std::move(other.queue_stored_)),\r\n+\t history_(std::move(other.history_)),\r\n \t height_(other.height_),\r\n \t width_(other.width_),\r\n \t decided_edges_(other.decided_edges_),\r\n@@ -321,6 +344,7 @@\n \tqueue_ = other.queue_;\r\n \tqueue_stored_ = other.queue_stored_;\r\n \tqueue_size_ = other.queue_size_;\r\n+\thistory_ = other.history_;\r\n \r\n \treturn *this;\r\n }\r\n@@ -340,6 +364,7 @@\n \tqueue_ = std::move(other.queue_);\r\n \tqueue_stored_ = std::move(other.queue_stored_);\r\n \tqueue_size_ = other.queue_size_;\r\n+\thistory_ = std::move(other.history_);\r\n \r\n \treturn *this;\r\n }\r\n@@ -347,7 +372,7 @@\n GridLoop<T>::~GridLoop()\r\n {\r\n }\r\n-template<class T> \r\n+template<class T>\r\n typename GridLoop<T>::EdgeState GridLoop<T>::GetEdge(LoopPosition edge) const\r\n {\r\n \treturn field_[Id(edge)].edge_status;\r\n@@ -483,10 +508,39 @@\n \t});\r\n }\r\n template <class T>\r\n+void GridLoop<T>::AddRestorePoint()\r\n+{\r\n+\thistory_.push_back({ -1, FieldComponent() });\r\n+}\r\n+template <class T>\r\n+void GridLoop<T>::Rollback()\r\n+{\r\n+\twhile (!history_.empty()) {\r\n+\t\tauto last = history_.back();\r\n+\t\thistory_.pop_back();\r\n+\r\n+\t\tif (last.first == kHistoryRestorePoint) break;\r\n+\t\tif (last.first == kHistorySetInconsistent) {\r\n+\t\t\tinconsistent_ = false;\r\n+\t\t} else if (last.first == kHistorySetSolved) {\r\n+\t\t\tfully_solved_ = false;\r\n+\t\t} else {\r\n+\t\t\tif (field_[last.first].edge_status != kEdgeUndecided && last.second.edge_status == kEdgeUndecided) {\r\n+\t\t\t\t--decided_edges_;\r\n+\t\t\t\tif (field_[last.first].edge_status == kEdgeLine) --decided_lines_;\r\n+\t\t\t}\r\n+\t\t\tfield_[last.first] = last.second;\r\n+\t\t}\r\n+\t}\r\n+}\r\n+template <class T>\r\n void GridLoop<T>::DecideChain(unsigned int id, EdgeState status)\r\n {\r\n \tunsigned int id_start = id;\r\n \tdo {\r\n+\t\tif (!history_.empty()) {\r\n+\t\t\thistory_.push_back({ id, field_[id] });\r\n+\t\t}\r\n \t\tfield_[id].edge_status = status;\r\n \t\t++decided_edges_;\r\n \t\tif (status == kEdgeLine) ++decided_lines_;\r\n@@ -557,14 +611,22 @@\n \t\t\t\tSetInconsistent();\r\n \t\t\t} else {\r\n \t\t\t\tfully_solved_ = true;\r\n+\t\t\t\tif (!history_.empty()) {\r\n+\t\t\t\t\thistory_.push_back({ kHistorySetSolved, FieldComponent() });\r\n+\t\t\t\t}\r\n \t\t\t\tHasFullySolved();\r\n \t\t\t}\r\n \t\t}\r\n \t}\r\n \r\n+\tif (!history_.empty()) {\r\n+\t\thistory_.push_back({ end1_edge, field_[end1_edge] });\r\n+\t\thistory_.push_back({ end2_edge, field_[end2_edge] });\r\n+\t}\r\n+\r\n \t\/\/ concatinate 2 lists\r\n-\tstd::swap(field_[edge1_id].list_next_edge, field_[edge2_id].list_next_edge);\r\n-\r\n+\tstd::swap(field_[end1_edge].list_next_edge, field_[end2_edge].list_next_edge);\r\n+\t\r\n \t\/\/ update chain_size\r\n \tfield_[end1_edge].chain_size = field_[end2_edge].chain_size =\r\n \t\tfield_[edge1_id].chain_size + field_[edge2_id].chain_size;\r\n"} {"commit":"3cd297a8c745d7c24d72ffc4cbd10b178e05b25c","subject":"Moved _downSPI to reduce cost of 2x _upSPI and _downSPI","message":"Moved _downSPI to reduce cost of 2x _upSPI and _downSPI\n\nAvoiding changing _RXFIFO and _dolistenNonVirtual to ensure FS20 branch\nis not broken.","repos":"DamonHD\/OTRadioLink,opentrv\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- content\/OTRadioLink\/utility\/OTRFM23BLink_OTRFM23BLink.h\n+++ content\/OTRadioLink\/utility\/OTRFM23BLink_OTRFM23BLink.h\n@@ -41,6 +41,7 @@\n #include <OTRadioLink.h>\n #include \"OTRadioLink_ISRRXQueue.h\"\n \n+#define ARDUINO_ARCH_AVR\n \n namespace OTRFM23BLink\n {\n@@ -735,7 +736,6 @@\n lengthRX = _readReg8Bit(REG_3E_PACKET_LENGTH);\n else\n lengthRX = _readReg8Bit(REG_4B_RECEIVED_PACKET_LENGTH);\n- if(neededEnable) { _downSPI(); }\n \/\/ Received frame.\n \/\/ If there is space in the queue then read in the frame, else discard it.\n volatile uint8_t *const bufferRX = (lengthRX > MaxRXMsgLen) ? NULL :\n@@ -766,6 +766,12 @@\n }\n \/\/ Clear up and force back to listening...\n _dolistenNonVirtual();\n+ \/\/ XXX Moved to reduce cost of 2 _SPI() and _downSPI()\n+ \/\/ _downSPI is expensive and called conditionally and all\n+ \/\/ so should not be called anywhere else in this block.\n+ \/\/ Not altering semantics of _RXFIFO() and\n+ \/\/ _doListenNonVirtual() to avoid changing other branches.\n+ if(neededEnable) { _downSPI(); }\n \/\/return;\n }\n #if 0 && defined(MILENKO_DEBUG)\n"} {"commit":"d8a3918610b0ca574d21cfbaa6c33f58dd1d0502","subject":"got rid of const on constexpr variables","message":"got rid of const on constexpr variables","repos":"opentrv\/OTRadioLink,Denzo77\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- content\/OTRadioLink\/utility\/OTSIM900Link_OTSIM900Link.h\n+++ content\/OTRadioLink\/utility\/OTSIM900Link_OTSIM900Link.h\n@@ -550,8 +550,8 @@\n #endif \/\/ OTSIM900LINK_DEBUG\n \n \/***************** AT Commands and Private Constants and variables ******************\/\n- static const constexpr uint8_t duration = 10; \/\/ DE20160703:Increased duration due to startup issues.\n- static const constexpr uint8_t flushTimeOut = 10;\n+ static constexpr uint8_t duration = 10; \/\/ DE20160703:Increased duration due to startup issues.\n+ static constexpr uint8_t flushTimeOut = 10;\n \n \/\/ Standard Responses\n \n@@ -574,7 +574,7 @@\n \/\/ - CHECK_PIN\n \/\/ -SET_APN\n uint8_t retryCounter;\n- static const constexpr uint8_t maxRetries = 10;\n+ static constexpr uint8_t maxRetries = 10;\n volatile uint8_t txMessageQueue; \/\/ Number of frames currently queued for TX.\n const OTSIM900LinkConfig_t *config;\n \/************************* Private Methods *******************************\/\n"} {"commit":"eb97908cb74e4ad6501f55030258ea26fd61f3e3","subject":"Paranoia: use mkstemp instead of mktemp. PR:\t\tbin\/3211 Reported by:\tMark Pritchard <mpp@FreeBSD.ORG>","message":"Paranoia: use mkstemp instead of mktemp.\nPR:\t\tbin\/3211\nReported by:\tMark Pritchard <mpp@FreeBSD.ORG>\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/ctm\/ctm_rmail\/ctm_rmail.c\n+++ usr.sbin\/ctm\/ctm_rmail\/ctm_rmail.c\n@@ -254,6 +254,7 @@\n {\n int status = 0;\n FILE *ifp, *ofp = 0;\n+ int ofd;\n int decoding = 0;\n int got_one = 0;\n int line_no = 0;\n@@ -303,13 +304,13 @@\n \t got_one++;\n \t strcpy(tname, piece_dir);\n \t strcat(tname, \"\/p.XXXXXX\");\n-\t if (mktemp(tname) == NULL)\n+\t if ((ofd = mkstemp(tname)) < 0)\n \t\t{\n-\t\terr(\"*mktemp: '%s'\", tname);\n+\t\terr(\"*mkstemp: '%s'\", tname);\n \t\tstatus++;\n \t\tcontinue;\n \t\t}\n-\t if ((ofp = fopen(tname, \"w\")) == NULL)\n+\t if ((ofp = fdopen(ofd, \"w\")) == NULL)\n \t\t{\n \t\terr(\"cannot open '%s' for writing\", tname);\n \t\tstatus++;\n@@ -492,17 +493,18 @@\n combine(char *delta, int npieces, char *dname, char *pname, char *tname)\n {\n FILE *dfp, *pfp;\n+ int dfd;\n int i, n, e;\n char buf[BUFSIZ];\n \n strcpy(tname, delta_dir);\n strcat(tname, \"\/d.XXXXXX\");\n- if (mktemp(tname) == NULL)\n-\t{\n-\terr(\"*mktemp: '%s'\", tname);\n+ if ((dfd = mkstemp(tname)) < 0)\n+\t{\n+\terr(\"*mkstemp: '%s'\", tname);\n \treturn 0;\n \t}\n- if ((dfp = fopen(tname, \"w\")) == NULL)\n+ if ((dfp = fdopen(dfd, \"w\")) == NULL)\n \t{\n \terr(\"cannot open '%s' for writing\", tname);\n \treturn 0;\n"} {"commit":"e345d1b359f0709005fc205252a0a3cd882b8c9e","subject":"Redirect stdout from mtree to \/dev\/null; we don't really need to know the list of directories being created when we install a package.","message":"Redirect stdout from mtree to \/dev\/null; we don't really need to know\nthe list of directories being created when we install a package.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/pkg_install\/add\/perform.c\n+++ usr.sbin\/pkg_install\/add\/perform.c\n@@ -363,9 +363,9 @@\n \t printf(\"Running mtree for %s..\\n\", PkgName);\n \tp = find_plist(&Plist, PLIST_CWD);\n \tif (Verbose)\n-\t printf(\"mtree -U -f %s -d -e -p %s\\n\", MTREE_FNAME, p ? p->name : \"\/\");\n+\t printf(\"mtree -U -f %s -d -e -p %s >\/dev\/null\\n\", MTREE_FNAME, p ? p->name : \"\/\");\n \tif (!Fake) {\n-\t if (vsystem(\"\/usr\/sbin\/mtree -U -f %s -d -e -p %s\", MTREE_FNAME, p ? p->name : \"\/\"))\n+\t if (vsystem(\"\/usr\/sbin\/mtree -U -f %s -d -e -p %s >\/dev\/null\", MTREE_FNAME, p ? p->name : \"\/\"))\n \t\twarnx(\"mtree returned a non-zero status - continuing\");\n \t}\n \tunlink(MTREE_FNAME);\n"} {"commit":"38c1241397d4842137e208a9bb1e3c901e533dd6","subject":"Check for FD_SET overrun.","message":"Check for FD_SET overrun.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/traceroute6\/traceroute6.c\n+++ usr.sbin\/traceroute6\/traceroute6.c\n@@ -934,6 +934,8 @@\n \tfdsn = howmany(sock + 1, NFDBITS) * sizeof(fd_mask);\n \tif ((fdsp = (fd_set *)malloc(fdsn)) == NULL)\n \t\terr(1, \"malloc\");\n+\tif (sock >= FD_SETSIZE)\n+\t\terrx(1, \"descriptor too big\");\n \tmemset(fdsp, 0, fdsn);\n \tFD_SET(sock, fdsp);\n \twait.tv_sec = waittime; wait.tv_usec = 0;\n"} {"commit":"09203ac3dd5fe8a43a26aab589334ed7907afbf8","subject":"KillTheDoctor: Fix VS2008 build.","message":"KillTheDoctor: Fix VS2008 build.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@116330 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- utils\/KillTheDoctor\/system_error.h\n+++ utils\/KillTheDoctor\/system_error.h\n@@ -223,6 +223,11 @@\n #include \"llvm\/Support\/type_traits.h\"\n #include <cerrno>\n #include <string>\n+\n+#ifdef LLVM_ON_WIN32\n+ \/\/ VS 2008 needs this for some of the defines below.\n+# include <WinSock2.h>\n+#endif\n \n namespace llvm {\n \n"} {"commit":"b5dbac6f2c36b991ef56ca384c0acb96133788cb","subject":"debug","message":"debug\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compass.c\n+++ compass.c\n@@ -166,7 +166,7 @@\n \treturn 0;\n }\n \/\/lock\u7528\u3001\u6307\u5b9a\u3057\u305f\u5024\u306block\u3055\u308c\u3066\u305f\u3089return1\u3059\u308b\n-static int checkLockList(short* values,const int lock)\n+static int checkLock(short* values,const int lock)\n {\n \tint len = sizeof(values)\/sizeof(values[0]); \/\/\u914d\u5217\u306e\u8981\u7d20\u6570\u3092\u53d6\u5f97\n \tint lock_count = 0;\n@@ -184,7 +184,7 @@\n \tRaw rawdata;\n \tcompassReadRaw(&rawdata);\n \tint LockCounter = 0;\n-\twhile((checkLockList(rawdata.xList,-1) || checkLockList(rawdata.yList,-1))\n+\twhile((checkLock(rawdata.xList,-1) || checkLock(rawdata.yList,-1))\n \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t&& LockCounter<4)\n \t{\n \t\tprintf(\"WARNING compass -1 lock\\n\");\n"} {"commit":"708331b8c4900482e11de8581336978b576dbe63","subject":"Updated, Read Description...","message":"Updated, Read Description...\n\nAdded support for ADG608 multiplexer found on Ocean Controls' shield.\r\nAdjusted formatting.","repos":"coryjfowler\/MAX31855_lib","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- MAX31855.h\n+++ MAX31855.h\n@@ -3,22 +3,39 @@\n Written by Cory J. Fowler\n BSD license, all text above must be included in any redistribution.\n ***************************************************************************\/\n+#ifndef _MAX31855_H_\n+#define _MAX31855_H_\n \n #include \"Arduino.h\"\n-#define TIME 50\n+\n #define DEBUG 0\n+\n+\/\/ Set to 1 if input is multiplexed (Ocean Controls Shield)\n+#define MUX 1\n+\/\/ Pins for multiplexor control (Ignore if not needed.)\n+#define AD0 4\n+#define AD1 5\n+#define AD2 6\n+#define MX_EN 7\n+\n+\/\/ Timeout before intTemp(), extTemp(), or tempErr() read from the MAX31855 again this is to keep data paired.\n+#define TIME 50\n \n class MAX31855 {\n public:\n MAX31855(int _CS);\n- \n+ void begin(void);\n+ \n \/* Reads chip at interval derrived from TIME constant above in this file.\n Use these functons where you want a value returned, the timing aids in\n keeping the values matched verses reading the chip again for each value. *\/\n- \/\/ Supports 0 for Celcius and 2 for Fahrenheit\n+\/\/ Supports 0 for Celcius and 2 for Fahrenheit\n double intTemp(int _SCALE); \n double extTemp(int _SCALE);\n- int tempErr();\n+ byte tempErr();\n+ \n+\/\/ Used for the Ocean Controls Shield that features the ADG608 analog multiplexer.\n+ void setMUX(byte _MUX);\n \n \/\/ Reads chip as the function is called. My testing on an ATmega328p @ 16MHz shows it executes in about 80 microseconds.\n \/\/ Supports 0 for Celcius, 1 For Kelvin, 2 for Fahrenheit, and 2 for Rankine\n@@ -26,8 +43,12 @@\n \n private:\n byte CS;\n- byte initRead;\n+ boolean initRead;\n long data;\n unsigned long previous;\n void ReadSPI(void);\n };\n+#endif\n+\/***************************************************************************\n+ END FILE\n+ ***************************************************************************\/\n"} {"commit":"6006dae4033c39870b3fd0e6595cd82dfe7dd025","subject":"Update","message":"Update\n","repos":"wedusk101\/C","returncode":1,"stderr":"error: pathspec 'recNumRvrs.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- recNumRvrs.c\n+++ recNumRvrs.c\n@@ -0,0 +1,33 @@\n+#include <stdio.h>\n+#include <math.h>\n+\n+int recNumRvrs(int, int);\n+int countDigits(int);\n+\n+int main()\n+{\n+\tint input = 0, digits = 0;\n+\tprintf(\"Please enter a positive integer.\\n\");\n+\tscanf(\"%d\", &input);\n+\tdigits = countDigits(input);\n+\tprintf(\"The reverse of %d is %d.\\n\", input, recNumRvrs(input, digits));\n+\treturn 0;\n+}\n+\n+int countDigits(int num)\n+{\n+\tint count = 0;\n+\tfor(;num != 0; num \/= 10)\n+\t\tcount++;\n+\treturn count;\n+}\n+\n+int recNumRvrs(int num, int digits)\n+{\n+\tint d = num % 10;\n+\tnum = num \/ 10;\n+\tif(digits > 1)\n+\t\treturn (int)(d * pow(10, digits - 1) + recNumRvrs(num, digits - 1));\n+\telse\n+\t\treturn d; \n+}"} {"commit":"b025362a7a1acf27991c4729d4a730ff8722b165","subject":"at86rf2xx: Always set channel on device","message":"at86rf2xx: Always set channel on device\n\nThis removes the check if the current configured channel equals the new\nchannel. This check prevents the at86rf2xx channel to be configured\nafter a reset which causes the radio to be non-functional after a\nNETOPT_STATE_RESET.\n","repos":"avmelnikoff\/RIOT,jasonatran\/RIOT,josephnoir\/RIOT,basilfx\/RIOT,mtausig\/RIOT,OlegHahm\/RIOT,BytesGalore\/RIOT,toonst\/RIOT,BytesGalore\/RIOT,x3ro\/RIOT,mfrey\/RIOT,RIOT-OS\/RIOT,smlng\/RIOT,rfuentess\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,cladmi\/RIOT,gebart\/RIOT,OlegHahm\/RIOT,toonst\/RIOT,BytesGalore\/RIOT,ant9000\/RIOT,biboc\/RIOT,RIOT-OS\/RIOT,yogo1212\/RIOT,lazytech-org\/RIOT,kbumsik\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,kaspar030\/RIOT,A-Paul\/RIOT,kbumsik\/RIOT,OlegHahm\/RIOT,authmillenon\/RIOT,mtausig\/RIOT,gebart\/RIOT,rfuentess\/RIOT,avmelnikoff\/RIOT,aeneby\/RIOT,kbumsik\/RIOT,smlng\/RIOT,kbumsik\/RIOT,biboc\/RIOT,aeneby\/RIOT,aeneby\/RIOT,kYc0o\/RIOT,toonst\/RIOT,yogo1212\/RIOT,cladmi\/RIOT,toonst\/RIOT,mtausig\/RIOT,yogo1212\/RIOT,josephnoir\/RIOT,A-Paul\/RIOT,kbumsik\/RIOT,kaspar030\/RIOT,mfrey\/RIOT,josephnoir\/RIOT,miri64\/RIOT,kaspar030\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,kaspar030\/RIOT,smlng\/RIOT,gebart\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,gebart\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,mtausig\/RIOT,A-Paul\/RIOT,toonst\/RIOT,ant9000\/RIOT,BytesGalore\/RIOT,biboc\/RIOT,cladmi\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,avmelnikoff\/RIOT,josephnoir\/RIOT,mfrey\/RIOT,lazytech-org\/RIOT,x3ro\/RIOT,basilfx\/RIOT,authmillenon\/RIOT,jasonatran\/RIOT,basilfx\/RIOT,smlng\/RIOT,RIOT-OS\/RIOT,mfrey\/RIOT,biboc\/RIOT,avmelnikoff\/RIOT,x3ro\/RIOT,cladmi\/RIOT,yogo1212\/RIOT,gebart\/RIOT,A-Paul\/RIOT,OTAkeys\/RIOT,rfuentess\/RIOT,mfrey\/RIOT,miri64\/RIOT,avmelnikoff\/RIOT,rfuentess\/RIOT,rfuentess\/RIOT,BytesGalore\/RIOT,mtausig\/RIOT,kYc0o\/RIOT,OTAkeys\/RIOT,x3ro\/RIOT,basilfx\/RIOT,jasonatran\/RIOT,cladmi\/RIOT,jasonatran\/RIOT,lazytech-org\/RIOT,x3ro\/RIOT,kYc0o\/RIOT,biboc\/RIOT,lazytech-org\/RIOT,authmillenon\/RIOT,aeneby\/RIOT,kYc0o\/RIOT,jasonatran\/RIOT,yogo1212\/RIOT,ant9000\/RIOT,yogo1212\/RIOT,miri64\/RIOT,aeneby\/RIOT,lazytech-org\/RIOT,OTAkeys\/RIOT,A-Paul\/RIOT,basilfx\/RIOT,smlng\/RIOT,kYc0o\/RIOT,josephnoir\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/at86rf2xx\/at86rf2xx_getset.c\n+++ drivers\/at86rf2xx\/at86rf2xx_getset.c\n@@ -140,11 +140,11 @@\n \n void at86rf2xx_set_chan(at86rf2xx_t *dev, uint8_t channel)\n {\n- if ((channel > AT86RF2XX_MAX_CHANNEL) ||\n+ if ((channel > AT86RF2XX_MAX_CHANNEL)\n #if AT86RF2XX_MIN_CHANNEL \/* is zero for sub-GHz *\/\n- (channel < AT86RF2XX_MIN_CHANNEL) ||\n-#endif\n- (dev->netdev.chan == channel)) {\n+ || (channel < AT86RF2XX_MIN_CHANNEL)\n+#endif\n+ ) {\n return;\n }\n \n"} {"commit":"973f9763e6a33d2f122631bd58b2921b5f999cc6","subject":"bcma: remove fix for 4329b0 bad LPOM is detection","message":"bcma: remove fix for 4329b0 bad LPOM is detection\n\nThere is not core id with 0x4329, but at the same place in the open\nsource part of the Broadcom SDK is a check for some device with the\nchip id of 0x4329. The device with a chip id of 0x4329 is a full mac\ndevice, so it will never be supported by bcma, this part is running in\nthe firmware of the device and not on the host CPU.\nThis code is wrong and will never be used, so just remove it.\n\nSigned-off-by: Hauke Mehrtens <435ddd46dc66c007a1fa20144c823d37e0d23436@hauke-m.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/bcma\/driver_chipcommon_pmu.c\n+++ drivers\/bcma\/driver_chipcommon_pmu.c\n@@ -179,9 +179,6 @@\n \telse\n \t\tbcma_cc_set32(cc, BCMA_CC_PMU_CTL,\n \t\t\t BCMA_CC_PMU_CTL_NOILPONW);\n-\n-\tif (cc->core->id.id == 0x4329 && cc->core->id.rev == 2)\n-\t\tpr_err(\"Fix for 4329b0 bad LPOM state not implemented!\\n\");\n \n \tbcma_pmu_pll_init(cc);\n \tbcma_pmu_resources_init(cc);\n"} {"commit":"c913e1b32b0a237fbf21b12fa7c2912f274e3495","subject":"clk: samsung: exynos3250: Use samsung_cmu_register_one() to simplify code","message":"clk: samsung: exynos3250: Use samsung_cmu_register_one() to simplify code\n\nThis patch uses the samsung_cmu_register_one() to simplify code\nfor Exynos3250.\n\nSigned-off-by: Chanwoo Choi <42eed19c0f56a8d487deac90c6d19d6364b7ba73@samsung.com>\nAcked-by: Kyungmin Park <504c23c4986a3760712724894be3105092c27331@samsung.com>\nSigned-off-by: Sylwester Nawrocki <1ca386fdc5066df13f7236f0837f22126191d06b@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"bdd3f7fa77257a818746caf9fbe0ea0e7bb7dde4","subject":"crypto: crypto4xx - move up err_request_irq label","message":"crypto: crypto4xx - move up err_request_irq label\n\nMove the err_request_irq error label up to reflect that tasklet_init and\nirq_of_parse_and_map have taken place.\n\nSigned-off-by: Julia Lawall <3d4a3affaf9163789962e9770780389962bda29d@lip6.fr>\nSigned-off-by: Herbert Xu <ef65de1c7be0aa837fe7b25ba9a7739905af6a55@gondor.apana.org.au>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/crypto\/amcc\/crypto4xx_core.c\n+++ drivers\/crypto\/amcc\/crypto4xx_core.c\n@@ -1244,9 +1244,9 @@\n \tiounmap(core_dev->dev->ce_base);\n err_iomap:\n \tfree_irq(core_dev->irq, dev);\n+err_request_irq:\n \tirq_dispose_mapping(core_dev->irq);\n \ttasklet_kill(&core_dev->tasklet);\n-err_request_irq:\n \tcrypto4xx_destroy_sdr(core_dev->dev);\n err_build_sdr:\n \tcrypto4xx_destroy_gdr(core_dev->dev);\n"} {"commit":"b64a83822cd0a5219b0d77d87579c21cbc4439e9","subject":"drivers: eth_smsc911x_priv: Remove obsolete macros","message":"drivers: eth_smsc911x_priv: Remove obsolete macros\n\nBack with commit a1b77fd589 huge chunk of code was automatically\nrefactored using a script, which in turn left some macros meaningless\n\nSigned-off-by: Hristo Mitrev <acb0e75baff311fdd4d915f4ccdeb5c34ddae8ea@gmail.com>\n","repos":"zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ethernet\/eth_smsc911x_priv.h\n+++ drivers\/ethernet\/eth_smsc911x_priv.h\n@@ -39,10 +39,6 @@\n #ifndef __IO\n #define __IO\n #endif\n-\n-#define uint32_t uint32_t\n-#define uint16_t uint16_t\n-#define uint8_t uint8_t\n \n #define GET_BITFIELD(val, lsb, msb) \\\n \t(((val) >> (lsb)) & ((1 << ((msb) - (lsb) + 1)) - 1))\n"} {"commit":"b03cda5145f39b19aef1152350c04f4e3412cd20","subject":"drm\/cma: Replace PTR_RET with PTR_ERR_OR_ZERO","message":"drm\/cma: Replace PTR_RET with PTR_ERR_OR_ZERO\n\nPTR_RET is now deprecated. Use PTR_ERR_OR_ZERO instead.\n\nSigned-off-by: Sachin Kamat <1c3b1584a6008857f36c03c58f657c0fc16fc09e@linaro.org>\nSigned-off-by: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"273e27ca8081095a1bdf65276d4b645215ad1c57","subject":"drm\/i915: Fold the DPLL limit defines into the structs that use them.","message":"drm\/i915: Fold the DPLL limit defines into the structs that use them.\n\nThey're used in one place, and not providing any descriptive value,\nwith their names just being approximately the conjunction of the\nstruct name and the struct field.\n\nThis diff was produced with gcc -E, copying the new struct definitions\nout, moving a couple of the old comments into place in the new\nstructs, and reindenting.\n\nSigned-off-by: Eric Anholt <96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@anholt.net>\nSigned-off-by: Chris Wilson <711c73f64afdce07b7e38039a96d2224209e9a6c@chris-wilson.co.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -76,255 +76,6 @@\n \t\t int, int, intel_clock_t *);\n };\n \n-#define I8XX_DOT_MIN\t\t 25000\n-#define I8XX_DOT_MAX\t\t 350000\n-#define I8XX_VCO_MIN\t\t 930000\n-#define I8XX_VCO_MAX\t\t1400000\n-#define I8XX_N_MIN\t\t 3\n-#define I8XX_N_MAX\t\t 16\n-#define I8XX_M_MIN\t\t 96\n-#define I8XX_M_MAX\t\t 140\n-#define I8XX_M1_MIN\t\t 18\n-#define I8XX_M1_MAX\t\t 26\n-#define I8XX_M2_MIN\t\t 6\n-#define I8XX_M2_MAX\t\t 16\n-#define I8XX_P_MIN\t\t 4\n-#define I8XX_P_MAX\t\t 128\n-#define I8XX_P1_MIN\t\t 2\n-#define I8XX_P1_MAX\t\t 33\n-#define I8XX_P1_LVDS_MIN\t 1\n-#define I8XX_P1_LVDS_MAX\t 6\n-#define I8XX_P2_SLOW\t\t 4\n-#define I8XX_P2_FAST\t\t 2\n-#define I8XX_P2_LVDS_SLOW\t 14\n-#define I8XX_P2_LVDS_FAST\t 7\n-#define I8XX_P2_SLOW_LIMIT\t 165000\n-\n-#define I9XX_DOT_MIN\t\t 20000\n-#define I9XX_DOT_MAX\t\t 400000\n-#define I9XX_VCO_MIN\t\t1400000\n-#define I9XX_VCO_MAX\t\t2800000\n-#define PINEVIEW_VCO_MIN\t\t1700000\n-#define PINEVIEW_VCO_MAX\t\t3500000\n-#define I9XX_N_MIN\t\t 1\n-#define I9XX_N_MAX\t\t 6\n-\/* Pineview's Ncounter is a ring counter *\/\n-#define PINEVIEW_N_MIN\t\t 3\n-#define PINEVIEW_N_MAX\t\t 6\n-#define I9XX_M_MIN\t\t 70\n-#define I9XX_M_MAX\t\t 120\n-#define PINEVIEW_M_MIN\t\t 2\n-#define PINEVIEW_M_MAX\t\t 256\n-#define I9XX_M1_MIN\t\t 10\n-#define I9XX_M1_MAX\t\t 22\n-#define I9XX_M2_MIN\t\t 5\n-#define I9XX_M2_MAX\t\t 9\n-\/* Pineview M1 is reserved, and must be 0 *\/\n-#define PINEVIEW_M1_MIN\t\t 0\n-#define PINEVIEW_M1_MAX\t\t 0\n-#define PINEVIEW_M2_MIN\t\t 0\n-#define PINEVIEW_M2_MAX\t\t 254\n-#define I9XX_P_SDVO_DAC_MIN\t 5\n-#define I9XX_P_SDVO_DAC_MAX\t 80\n-#define I9XX_P_LVDS_MIN\t\t 7\n-#define I9XX_P_LVDS_MAX\t\t 98\n-#define PINEVIEW_P_LVDS_MIN\t\t 7\n-#define PINEVIEW_P_LVDS_MAX\t\t 112\n-#define I9XX_P1_MIN\t\t 1\n-#define I9XX_P1_MAX\t\t 8\n-#define I9XX_P2_SDVO_DAC_SLOW\t\t 10\n-#define I9XX_P2_SDVO_DAC_FAST\t\t 5\n-#define I9XX_P2_SDVO_DAC_SLOW_LIMIT\t 200000\n-#define I9XX_P2_LVDS_SLOW\t\t 14\n-#define I9XX_P2_LVDS_FAST\t\t 7\n-#define I9XX_P2_LVDS_SLOW_LIMIT\t\t 112000\n-\n-\/*The parameter is for SDVO on G4x platform*\/\n-#define G4X_DOT_SDVO_MIN 25000\n-#define G4X_DOT_SDVO_MAX 270000\n-#define G4X_VCO_MIN 1750000\n-#define G4X_VCO_MAX 3500000\n-#define G4X_N_SDVO_MIN 1\n-#define G4X_N_SDVO_MAX 4\n-#define G4X_M_SDVO_MIN 104\n-#define G4X_M_SDVO_MAX 138\n-#define G4X_M1_SDVO_MIN 17\n-#define G4X_M1_SDVO_MAX 23\n-#define G4X_M2_SDVO_MIN 5\n-#define G4X_M2_SDVO_MAX 11\n-#define G4X_P_SDVO_MIN 10\n-#define G4X_P_SDVO_MAX 30\n-#define G4X_P1_SDVO_MIN 1\n-#define G4X_P1_SDVO_MAX 3\n-#define G4X_P2_SDVO_SLOW 10\n-#define G4X_P2_SDVO_FAST 10\n-#define G4X_P2_SDVO_LIMIT 270000\n-\n-\/*The parameter is for HDMI_DAC on G4x platform*\/\n-#define G4X_DOT_HDMI_DAC_MIN 22000\n-#define G4X_DOT_HDMI_DAC_MAX 400000\n-#define G4X_N_HDMI_DAC_MIN 1\n-#define G4X_N_HDMI_DAC_MAX 4\n-#define G4X_M_HDMI_DAC_MIN 104\n-#define G4X_M_HDMI_DAC_MAX 138\n-#define G4X_M1_HDMI_DAC_MIN 16\n-#define G4X_M1_HDMI_DAC_MAX 23\n-#define G4X_M2_HDMI_DAC_MIN 5\n-#define G4X_M2_HDMI_DAC_MAX 11\n-#define G4X_P_HDMI_DAC_MIN 5\n-#define G4X_P_HDMI_DAC_MAX 80\n-#define G4X_P1_HDMI_DAC_MIN 1\n-#define G4X_P1_HDMI_DAC_MAX 8\n-#define G4X_P2_HDMI_DAC_SLOW 10\n-#define G4X_P2_HDMI_DAC_FAST 5\n-#define G4X_P2_HDMI_DAC_LIMIT 165000\n-\n-\/*The parameter is for SINGLE_CHANNEL_LVDS on G4x platform*\/\n-#define G4X_DOT_SINGLE_CHANNEL_LVDS_MIN 20000\n-#define G4X_DOT_SINGLE_CHANNEL_LVDS_MAX 115000\n-#define G4X_N_SINGLE_CHANNEL_LVDS_MIN 1\n-#define G4X_N_SINGLE_CHANNEL_LVDS_MAX 3\n-#define G4X_M_SINGLE_CHANNEL_LVDS_MIN 104\n-#define G4X_M_SINGLE_CHANNEL_LVDS_MAX 138\n-#define G4X_M1_SINGLE_CHANNEL_LVDS_MIN 17\n-#define G4X_M1_SINGLE_CHANNEL_LVDS_MAX 23\n-#define G4X_M2_SINGLE_CHANNEL_LVDS_MIN 5\n-#define G4X_M2_SINGLE_CHANNEL_LVDS_MAX 11\n-#define G4X_P_SINGLE_CHANNEL_LVDS_MIN 28\n-#define G4X_P_SINGLE_CHANNEL_LVDS_MAX 112\n-#define G4X_P1_SINGLE_CHANNEL_LVDS_MIN 2\n-#define G4X_P1_SINGLE_CHANNEL_LVDS_MAX 8\n-#define G4X_P2_SINGLE_CHANNEL_LVDS_SLOW 14\n-#define G4X_P2_SINGLE_CHANNEL_LVDS_FAST 14\n-#define G4X_P2_SINGLE_CHANNEL_LVDS_LIMIT 0\n-\n-\/*The parameter is for DUAL_CHANNEL_LVDS on G4x platform*\/\n-#define G4X_DOT_DUAL_CHANNEL_LVDS_MIN 80000\n-#define G4X_DOT_DUAL_CHANNEL_LVDS_MAX 224000\n-#define G4X_N_DUAL_CHANNEL_LVDS_MIN 1\n-#define G4X_N_DUAL_CHANNEL_LVDS_MAX 3\n-#define G4X_M_DUAL_CHANNEL_LVDS_MIN 104\n-#define G4X_M_DUAL_CHANNEL_LVDS_MAX 138\n-#define G4X_M1_DUAL_CHANNEL_LVDS_MIN 17\n-#define G4X_M1_DUAL_CHANNEL_LVDS_MAX 23\n-#define G4X_M2_DUAL_CHANNEL_LVDS_MIN 5\n-#define G4X_M2_DUAL_CHANNEL_LVDS_MAX 11\n-#define G4X_P_DUAL_CHANNEL_LVDS_MIN 14\n-#define G4X_P_DUAL_CHANNEL_LVDS_MAX 42\n-#define G4X_P1_DUAL_CHANNEL_LVDS_MIN 2\n-#define G4X_P1_DUAL_CHANNEL_LVDS_MAX 6\n-#define G4X_P2_DUAL_CHANNEL_LVDS_SLOW 7\n-#define G4X_P2_DUAL_CHANNEL_LVDS_FAST 7\n-#define G4X_P2_DUAL_CHANNEL_LVDS_LIMIT 0\n-\n-\/*The parameter is for DISPLAY PORT on G4x platform*\/\n-#define G4X_DOT_DISPLAY_PORT_MIN 161670\n-#define G4X_DOT_DISPLAY_PORT_MAX 227000\n-#define G4X_N_DISPLAY_PORT_MIN 1\n-#define G4X_N_DISPLAY_PORT_MAX 2\n-#define G4X_M_DISPLAY_PORT_MIN 97\n-#define G4X_M_DISPLAY_PORT_MAX 108\n-#define G4X_M1_DISPLAY_PORT_MIN 0x10\n-#define G4X_M1_DISPLAY_PORT_MAX 0x12\n-#define G4X_M2_DISPLAY_PORT_MIN 0x05\n-#define G4X_M2_DISPLAY_PORT_MAX 0x06\n-#define G4X_P_DISPLAY_PORT_MIN 10\n-#define G4X_P_DISPLAY_PORT_MAX 20\n-#define G4X_P1_DISPLAY_PORT_MIN 1\n-#define G4X_P1_DISPLAY_PORT_MAX 2\n-#define G4X_P2_DISPLAY_PORT_SLOW 10\n-#define G4X_P2_DISPLAY_PORT_FAST 10\n-#define G4X_P2_DISPLAY_PORT_LIMIT 0\n-\n-\/* Ironlake \/ Sandybridge *\/\n-\/* as we calculate clock using (register_value + 2) for\n- N\/M1\/M2, so here the range value for them is (actual_value-2).\n- *\/\n-#define IRONLAKE_DOT_MIN 25000\n-#define IRONLAKE_DOT_MAX 350000\n-#define IRONLAKE_VCO_MIN 1760000\n-#define IRONLAKE_VCO_MAX 3510000\n-#define IRONLAKE_M1_MIN 12\n-#define IRONLAKE_M1_MAX 22\n-#define IRONLAKE_M2_MIN 5\n-#define IRONLAKE_M2_MAX 9\n-#define IRONLAKE_P2_DOT_LIMIT 225000 \/* 225Mhz *\/\n-\n-\/* We have parameter ranges for different type of outputs. *\/\n-\n-\/* DAC & HDMI Refclk 120Mhz *\/\n-#define IRONLAKE_DAC_N_MIN\t1\n-#define IRONLAKE_DAC_N_MAX\t5\n-#define IRONLAKE_DAC_M_MIN\t79\n-#define IRONLAKE_DAC_M_MAX\t127\n-#define IRONLAKE_DAC_P_MIN\t5\n-#define IRONLAKE_DAC_P_MAX\t80\n-#define IRONLAKE_DAC_P1_MIN\t1\n-#define IRONLAKE_DAC_P1_MAX\t8\n-#define IRONLAKE_DAC_P2_SLOW\t10\n-#define IRONLAKE_DAC_P2_FAST\t5\n-\n-\/* LVDS single-channel 120Mhz refclk *\/\n-#define IRONLAKE_LVDS_S_N_MIN\t1\n-#define IRONLAKE_LVDS_S_N_MAX\t3\n-#define IRONLAKE_LVDS_S_M_MIN\t79\n-#define IRONLAKE_LVDS_S_M_MAX\t118\n-#define IRONLAKE_LVDS_S_P_MIN\t28\n-#define IRONLAKE_LVDS_S_P_MAX\t112\n-#define IRONLAKE_LVDS_S_P1_MIN\t2\n-#define IRONLAKE_LVDS_S_P1_MAX\t8\n-#define IRONLAKE_LVDS_S_P2_SLOW\t14\n-#define IRONLAKE_LVDS_S_P2_FAST\t14\n-\n-\/* LVDS dual-channel 120Mhz refclk *\/\n-#define IRONLAKE_LVDS_D_N_MIN\t1\n-#define IRONLAKE_LVDS_D_N_MAX\t3\n-#define IRONLAKE_LVDS_D_M_MIN\t79\n-#define IRONLAKE_LVDS_D_M_MAX\t127\n-#define IRONLAKE_LVDS_D_P_MIN\t14\n-#define IRONLAKE_LVDS_D_P_MAX\t56\n-#define IRONLAKE_LVDS_D_P1_MIN\t2\n-#define IRONLAKE_LVDS_D_P1_MAX\t8\n-#define IRONLAKE_LVDS_D_P2_SLOW\t7\n-#define IRONLAKE_LVDS_D_P2_FAST\t7\n-\n-\/* LVDS single-channel 100Mhz refclk *\/\n-#define IRONLAKE_LVDS_S_SSC_N_MIN\t1\n-#define IRONLAKE_LVDS_S_SSC_N_MAX\t2\n-#define IRONLAKE_LVDS_S_SSC_M_MIN\t79\n-#define IRONLAKE_LVDS_S_SSC_M_MAX\t126\n-#define IRONLAKE_LVDS_S_SSC_P_MIN\t28\n-#define IRONLAKE_LVDS_S_SSC_P_MAX\t112\n-#define IRONLAKE_LVDS_S_SSC_P1_MIN\t2\n-#define IRONLAKE_LVDS_S_SSC_P1_MAX\t8\n-#define IRONLAKE_LVDS_S_SSC_P2_SLOW\t14\n-#define IRONLAKE_LVDS_S_SSC_P2_FAST\t14\n-\n-\/* LVDS dual-channel 100Mhz refclk *\/\n-#define IRONLAKE_LVDS_D_SSC_N_MIN\t1\n-#define IRONLAKE_LVDS_D_SSC_N_MAX\t3\n-#define IRONLAKE_LVDS_D_SSC_M_MIN\t79\n-#define IRONLAKE_LVDS_D_SSC_M_MAX\t126\n-#define IRONLAKE_LVDS_D_SSC_P_MIN\t14\n-#define IRONLAKE_LVDS_D_SSC_P_MAX\t42\n-#define IRONLAKE_LVDS_D_SSC_P1_MIN\t2\n-#define IRONLAKE_LVDS_D_SSC_P1_MAX\t6\n-#define IRONLAKE_LVDS_D_SSC_P2_SLOW\t7\n-#define IRONLAKE_LVDS_D_SSC_P2_FAST\t7\n-\n-\/* DisplayPort *\/\n-#define IRONLAKE_DP_N_MIN\t\t1\n-#define IRONLAKE_DP_N_MAX\t\t2\n-#define IRONLAKE_DP_M_MIN\t\t81\n-#define IRONLAKE_DP_M_MAX\t\t90\n-#define IRONLAKE_DP_P_MIN\t\t10\n-#define IRONLAKE_DP_P_MAX\t\t20\n-#define IRONLAKE_DP_P2_FAST\t\t10\n-#define IRONLAKE_DP_P2_SLOW\t\t10\n-#define IRONLAKE_DP_P2_LIMIT\t\t0\n-#define IRONLAKE_DP_P1_MIN\t\t1\n-#define IRONLAKE_DP_P1_MAX\t\t2\n-\n \/* FDI *\/\n #define IRONLAKE_FDI_FREQ\t\t2700000 \/* in kHz for mode->clock *\/\n \n@@ -353,292 +104,253 @@\n }\n \n static const intel_limit_t intel_limits_i8xx_dvo = {\n- .dot = { .min = I8XX_DOT_MIN,\t\t.max = I8XX_DOT_MAX },\n- .vco = { .min = I8XX_VCO_MIN,\t\t.max = I8XX_VCO_MAX },\n- .n = { .min = I8XX_N_MIN,\t\t.max = I8XX_N_MAX },\n- .m = { .min = I8XX_M_MIN,\t\t.max = I8XX_M_MAX },\n- .m1 = { .min = I8XX_M1_MIN,\t\t.max = I8XX_M1_MAX },\n- .m2 = { .min = I8XX_M2_MIN,\t\t.max = I8XX_M2_MAX },\n- .p = { .min = I8XX_P_MIN,\t\t.max = I8XX_P_MAX },\n- .p1 = { .min = I8XX_P1_MIN,\t\t.max = I8XX_P1_MAX },\n-\t.p2 = { .dot_limit = I8XX_P2_SLOW_LIMIT,\n-\t\t .p2_slow = I8XX_P2_SLOW,\t.p2_fast = I8XX_P2_FAST },\n+ .dot = { .min = 25000, .max = 350000 },\n+ .vco = { .min = 930000, .max = 1400000 },\n+ .n = { .min = 3, .max = 16 },\n+ .m = { .min = 96, .max = 140 },\n+ .m1 = { .min = 18, .max = 26 },\n+ .m2 = { .min = 6, .max = 16 },\n+ .p = { .min = 4, .max = 128 },\n+ .p1 = { .min = 2, .max = 33 },\n+\t.p2 = { .dot_limit = 165000,\n+\t\t.p2_slow = 4, .p2_fast = 2 },\n \t.find_pll = intel_find_best_PLL,\n };\n \n static const intel_limit_t intel_limits_i8xx_lvds = {\n- .dot = { .min = I8XX_DOT_MIN,\t\t.max = I8XX_DOT_MAX },\n- .vco = { .min = I8XX_VCO_MIN,\t\t.max = I8XX_VCO_MAX },\n- .n = { .min = I8XX_N_MIN,\t\t.max = I8XX_N_MAX },\n- .m = { .min = I8XX_M_MIN,\t\t.max = I8XX_M_MAX },\n- .m1 = { .min = I8XX_M1_MIN,\t\t.max = I8XX_M1_MAX },\n- .m2 = { .min = I8XX_M2_MIN,\t\t.max = I8XX_M2_MAX },\n- .p = { .min = I8XX_P_MIN,\t\t.max = I8XX_P_MAX },\n- .p1 = { .min = I8XX_P1_LVDS_MIN,\t.max = I8XX_P1_LVDS_MAX },\n-\t.p2 = { .dot_limit = I8XX_P2_SLOW_LIMIT,\n-\t\t .p2_slow = I8XX_P2_LVDS_SLOW,\t.p2_fast = I8XX_P2_LVDS_FAST },\n+ .dot = { .min = 25000, .max = 350000 },\n+ .vco = { .min = 930000, .max = 1400000 },\n+ .n = { .min = 3, .max = 16 },\n+ .m = { .min = 96, .max = 140 },\n+ .m1 = { .min = 18, .max = 26 },\n+ .m2 = { .min = 6, .max = 16 },\n+ .p = { .min = 4, .max = 128 },\n+ .p1 = { .min = 1, .max = 6 },\n+\t.p2 = { .dot_limit = 165000,\n+\t\t.p2_slow = 14, .p2_fast = 7 },\n \t.find_pll = intel_find_best_PLL,\n };\n-\t\n+\n static const intel_limit_t intel_limits_i9xx_sdvo = {\n- .dot = { .min = I9XX_DOT_MIN,\t\t.max = I9XX_DOT_MAX },\n- .vco = { .min = I9XX_VCO_MIN,\t\t.max = I9XX_VCO_MAX },\n- .n = { .min = I9XX_N_MIN,\t\t.max = I9XX_N_MAX },\n- .m = { .min = I9XX_M_MIN,\t\t.max = I9XX_M_MAX },\n- .m1 = { .min = I9XX_M1_MIN,\t\t.max = I9XX_M1_MAX },\n- .m2 = { .min = I9XX_M2_MIN,\t\t.max = I9XX_M2_MAX },\n- .p = { .min = I9XX_P_SDVO_DAC_MIN,\t.max = I9XX_P_SDVO_DAC_MAX },\n- .p1 = { .min = I9XX_P1_MIN,\t\t.max = I9XX_P1_MAX },\n-\t.p2 = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,\n-\t\t .p2_slow = I9XX_P2_SDVO_DAC_SLOW,\t.p2_fast = I9XX_P2_SDVO_DAC_FAST },\n+ .dot = { .min = 20000, .max = 400000 },\n+ .vco = { .min = 1400000, .max = 2800000 },\n+ .n = { .min = 1, .max = 6 },\n+ .m = { .min = 70, .max = 120 },\n+ .m1 = { .min = 10, .max = 22 },\n+ .m2 = { .min = 5, .max = 9 },\n+ .p = { .min = 5, .max = 80 },\n+ .p1 = { .min = 1, .max = 8 },\n+\t.p2 = { .dot_limit = 200000,\n+\t\t.p2_slow = 10, .p2_fast = 5 },\n \t.find_pll = intel_find_best_PLL,\n };\n \n static const intel_limit_t intel_limits_i9xx_lvds = {\n- .dot = { .min = I9XX_DOT_MIN,\t\t.max = I9XX_DOT_MAX },\n- .vco = { .min = I9XX_VCO_MIN,\t\t.max = I9XX_VCO_MAX },\n- .n = { .min = I9XX_N_MIN,\t\t.max = I9XX_N_MAX },\n- .m = { .min = I9XX_M_MIN,\t\t.max = I9XX_M_MAX },\n- .m1 = { .min = I9XX_M1_MIN,\t\t.max = I9XX_M1_MAX },\n- .m2 = { .min = I9XX_M2_MIN,\t\t.max = I9XX_M2_MAX },\n- .p = { .min = I9XX_P_LVDS_MIN,\t.max = I9XX_P_LVDS_MAX },\n- .p1 = { .min = I9XX_P1_MIN,\t\t.max = I9XX_P1_MAX },\n-\t\/* The single-channel range is 25-112Mhz, and dual-channel\n-\t * is 80-224Mhz. Prefer single channel as much as possible.\n-\t *\/\n-\t.p2 = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,\n-\t\t .p2_slow = I9XX_P2_LVDS_SLOW,\t.p2_fast = I9XX_P2_LVDS_FAST },\n+ .dot = { .min = 20000, .max = 400000 },\n+ .vco = { .min = 1400000, .max = 2800000 },\n+ .n = { .min = 1, .max = 6 },\n+ .m = { .min = 70, .max = 120 },\n+ .m1 = { .min = 10, .max = 22 },\n+ .m2 = { .min = 5, .max = 9 },\n+ .p = { .min = 7, .max = 98 },\n+ .p1 = { .min = 1, .max = 8 },\n+\t.p2 = { .dot_limit = 112000,\n+\t\t.p2_slow = 14, .p2_fast = 7 },\n \t.find_pll = intel_find_best_PLL,\n };\n \n- \/* below parameter and function is for G4X Chipset Family*\/\n+\n static const intel_limit_t intel_limits_g4x_sdvo = {\n-\t.dot = { .min = G4X_DOT_SDVO_MIN,\t.max = G4X_DOT_SDVO_MAX },\n-\t.vco = { .min = G4X_VCO_MIN,\t .max = G4X_VCO_MAX},\n-\t.n = { .min = G4X_N_SDVO_MIN,\t .max = G4X_N_SDVO_MAX },\n-\t.m = { .min = G4X_M_SDVO_MIN, .max = G4X_M_SDVO_MAX },\n-\t.m1 = { .min = G4X_M1_SDVO_MIN,\t.max = G4X_M1_SDVO_MAX },\n-\t.m2 = { .min = G4X_M2_SDVO_MIN,\t.max = G4X_M2_SDVO_MAX },\n-\t.p = { .min = G4X_P_SDVO_MIN, .max = G4X_P_SDVO_MAX },\n-\t.p1 = { .min = G4X_P1_SDVO_MIN,\t.max = G4X_P1_SDVO_MAX},\n-\t.p2 = { .dot_limit = G4X_P2_SDVO_LIMIT,\n-\t\t .p2_slow = G4X_P2_SDVO_SLOW,\n-\t\t .p2_fast = G4X_P2_SDVO_FAST\n+\t.dot = { .min = 25000, .max = 270000 },\n+\t.vco = { .min = 1750000, .max = 3500000},\n+\t.n = { .min = 1, .max = 4 },\n+\t.m = { .min = 104, .max = 138 },\n+\t.m1 = { .min = 17, .max = 23 },\n+\t.m2 = { .min = 5, .max = 11 },\n+\t.p = { .min = 10, .max = 30 },\n+\t.p1 = { .min = 1, .max = 3},\n+\t.p2 = { .dot_limit = 270000,\n+\t\t.p2_slow = 10,\n+\t\t.p2_fast = 10\n \t},\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n static const intel_limit_t intel_limits_g4x_hdmi = {\n-\t.dot = { .min = G4X_DOT_HDMI_DAC_MIN,\t.max = G4X_DOT_HDMI_DAC_MAX },\n-\t.vco = { .min = G4X_VCO_MIN,\t .max = G4X_VCO_MAX},\n-\t.n = { .min = G4X_N_HDMI_DAC_MIN,\t.max = G4X_N_HDMI_DAC_MAX },\n-\t.m = { .min = G4X_M_HDMI_DAC_MIN,\t.max = G4X_M_HDMI_DAC_MAX },\n-\t.m1 = { .min = G4X_M1_HDMI_DAC_MIN,\t.max = G4X_M1_HDMI_DAC_MAX },\n-\t.m2 = { .min = G4X_M2_HDMI_DAC_MIN,\t.max = G4X_M2_HDMI_DAC_MAX },\n-\t.p = { .min = G4X_P_HDMI_DAC_MIN,\t.max = G4X_P_HDMI_DAC_MAX },\n-\t.p1 = { .min = G4X_P1_HDMI_DAC_MIN,\t.max = G4X_P1_HDMI_DAC_MAX},\n-\t.p2 = { .dot_limit = G4X_P2_HDMI_DAC_LIMIT,\n-\t\t .p2_slow = G4X_P2_HDMI_DAC_SLOW,\n-\t\t .p2_fast = G4X_P2_HDMI_DAC_FAST\n+\t.dot = { .min = 22000, .max = 400000 },\n+\t.vco = { .min = 1750000, .max = 3500000},\n+\t.n = { .min = 1, .max = 4 },\n+\t.m = { .min = 104, .max = 138 },\n+\t.m1 = { .min = 16, .max = 23 },\n+\t.m2 = { .min = 5, .max = 11 },\n+\t.p = { .min = 5, .max = 80 },\n+\t.p1 = { .min = 1, .max = 8},\n+\t.p2 = { .dot_limit = 165000,\n+\t\t.p2_slow = 10, .p2_fast = 5 },\n+\t.find_pll = intel_g4x_find_best_PLL,\n+};\n+\n+static const intel_limit_t intel_limits_g4x_single_channel_lvds = {\n+\t.dot = { .min = 20000, .max = 115000 },\n+\t.vco = { .min = 1750000, .max = 3500000 },\n+\t.n = { .min = 1, .max = 3 },\n+\t.m = { .min = 104, .max = 138 },\n+\t.m1 = { .min = 17, .max = 23 },\n+\t.m2 = { .min = 5, .max = 11 },\n+\t.p = { .min = 28, .max = 112 },\n+\t.p1 = { .min = 2, .max = 8 },\n+\t.p2 = { .dot_limit = 0,\n+\t\t.p2_slow = 14, .p2_fast = 14\n \t},\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_g4x_single_channel_lvds = {\n-\t.dot = { .min = G4X_DOT_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_DOT_SINGLE_CHANNEL_LVDS_MAX },\n-\t.vco = { .min = G4X_VCO_MIN,\n-\t\t .max = G4X_VCO_MAX },\n-\t.n = { .min = G4X_N_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_N_SINGLE_CHANNEL_LVDS_MAX },\n-\t.m = { .min = G4X_M_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M_SINGLE_CHANNEL_LVDS_MAX },\n-\t.m1 = { .min = G4X_M1_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M1_SINGLE_CHANNEL_LVDS_MAX },\n-\t.m2 = { .min = G4X_M2_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M2_SINGLE_CHANNEL_LVDS_MAX },\n-\t.p = { .min = G4X_P_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_P_SINGLE_CHANNEL_LVDS_MAX },\n-\t.p1 = { .min = G4X_P1_SINGLE_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_P1_SINGLE_CHANNEL_LVDS_MAX },\n-\t.p2 = { .dot_limit = G4X_P2_SINGLE_CHANNEL_LVDS_LIMIT,\n-\t\t .p2_slow = G4X_P2_SINGLE_CHANNEL_LVDS_SLOW,\n-\t\t .p2_fast = G4X_P2_SINGLE_CHANNEL_LVDS_FAST\n+static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {\n+\t.dot = { .min = 80000, .max = 224000 },\n+\t.vco = { .min = 1750000, .max = 3500000 },\n+\t.n = { .min = 1, .max = 3 },\n+\t.m = { .min = 104, .max = 138 },\n+\t.m1 = { .min = 17, .max = 23 },\n+\t.m2 = { .min = 5, .max = 11 },\n+\t.p = { .min = 14, .max = 42 },\n+\t.p1 = { .min = 2, .max = 6 },\n+\t.p2 = { .dot_limit = 0,\n+\t\t.p2_slow = 7, .p2_fast = 7\n \t},\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_g4x_dual_channel_lvds = {\n-\t.dot = { .min = G4X_DOT_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_DOT_DUAL_CHANNEL_LVDS_MAX },\n-\t.vco = { .min = G4X_VCO_MIN,\n-\t\t .max = G4X_VCO_MAX },\n-\t.n = { .min = G4X_N_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_N_DUAL_CHANNEL_LVDS_MAX },\n-\t.m = { .min = G4X_M_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M_DUAL_CHANNEL_LVDS_MAX },\n-\t.m1 = { .min = G4X_M1_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M1_DUAL_CHANNEL_LVDS_MAX },\n-\t.m2 = { .min = G4X_M2_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_M2_DUAL_CHANNEL_LVDS_MAX },\n-\t.p = { .min = G4X_P_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_P_DUAL_CHANNEL_LVDS_MAX },\n-\t.p1 = { .min = G4X_P1_DUAL_CHANNEL_LVDS_MIN,\n-\t\t .max = G4X_P1_DUAL_CHANNEL_LVDS_MAX },\n-\t.p2 = { .dot_limit = G4X_P2_DUAL_CHANNEL_LVDS_LIMIT,\n-\t\t .p2_slow = G4X_P2_DUAL_CHANNEL_LVDS_SLOW,\n-\t\t .p2_fast = G4X_P2_DUAL_CHANNEL_LVDS_FAST\n-\t},\n+static const intel_limit_t intel_limits_g4x_display_port = {\n+ .dot = { .min = 161670, .max = 227000 },\n+ .vco = { .min = 1750000, .max = 3500000},\n+ .n = { .min = 1, .max = 2 },\n+ .m = { .min = 97, .max = 108 },\n+ .m1 = { .min = 0x10, .max = 0x12 },\n+ .m2 = { .min = 0x05, .max = 0x06 },\n+ .p = { .min = 10, .max = 20 },\n+ .p1 = { .min = 1, .max = 2},\n+ .p2 = { .dot_limit = 0,\n+\t\t.p2_slow = 10, .p2_fast = 10 },\n+ .find_pll = intel_find_pll_g4x_dp,\n+};\n+\n+static const intel_limit_t intel_limits_pineview_sdvo = {\n+ .dot = { .min = 20000, .max = 400000},\n+ .vco = { .min = 1700000, .max = 3500000 },\n+\t\/* Pineview's Ncounter is a ring counter *\/\n+ .n = { .min = 3, .max = 6 },\n+ .m = { .min = 2, .max = 256 },\n+\t\/* Pineview only has one combined m divider, which we treat as m2. *\/\n+ .m1 = { .min = 0, .max = 0 },\n+ .m2 = { .min = 0, .max = 254 },\n+ .p = { .min = 5, .max = 80 },\n+ .p1 = { .min = 1, .max = 8 },\n+\t.p2 = { .dot_limit = 200000,\n+\t\t.p2_slow = 10, .p2_fast = 5 },\n+\t.find_pll = intel_find_best_PLL,\n+};\n+\n+static const intel_limit_t intel_limits_pineview_lvds = {\n+ .dot = { .min = 20000, .max = 400000 },\n+ .vco = { .min = 1700000, .max = 3500000 },\n+ .n = { .min = 3, .max = 6 },\n+ .m = { .min = 2, .max = 256 },\n+ .m1 = { .min = 0, .max = 0 },\n+ .m2 = { .min = 0, .max = 254 },\n+ .p = { .min = 7, .max = 112 },\n+ .p1 = { .min = 1, .max = 8 },\n+\t.p2 = { .dot_limit = 112000,\n+\t\t.p2_slow = 14, .p2_fast = 14 },\n+\t.find_pll = intel_find_best_PLL,\n+};\n+\n+\/* Ironlake \/ Sandybridge\n+ *\n+ * We calculate clock using (register_value + 2) for N\/M1\/M2, so here\n+ * the range value for them is (actual_value - 2).\n+ *\/\n+static const intel_limit_t intel_limits_ironlake_dac = {\n+\t.dot = { .min = 25000, .max = 350000 },\n+\t.vco = { .min = 1760000, .max = 3510000 },\n+\t.n = { .min = 1, .max = 5 },\n+\t.m = { .min = 79, .max = 127 },\n+\t.m1 = { .min = 12, .max = 22 },\n+\t.m2 = { .min = 5, .max = 9 },\n+\t.p = { .min = 5, .max = 80 },\n+\t.p1 = { .min = 1, .max = 8 },\n+\t.p2 = { .dot_limit = 225000,\n+\t\t.p2_slow = 10, .p2_fast = 5 },\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_g4x_display_port = {\n- .dot = { .min = G4X_DOT_DISPLAY_PORT_MIN,\n- .max = G4X_DOT_DISPLAY_PORT_MAX },\n- .vco = { .min = G4X_VCO_MIN,\n- .max = G4X_VCO_MAX},\n- .n = { .min = G4X_N_DISPLAY_PORT_MIN,\n- .max = G4X_N_DISPLAY_PORT_MAX },\n- .m = { .min = G4X_M_DISPLAY_PORT_MIN,\n- .max = G4X_M_DISPLAY_PORT_MAX },\n- .m1 = { .min = G4X_M1_DISPLAY_PORT_MIN,\n- .max = G4X_M1_DISPLAY_PORT_MAX },\n- .m2 = { .min = G4X_M2_DISPLAY_PORT_MIN,\n- .max = G4X_M2_DISPLAY_PORT_MAX },\n- .p = { .min = G4X_P_DISPLAY_PORT_MIN,\n- .max = G4X_P_DISPLAY_PORT_MAX },\n- .p1 = { .min = G4X_P1_DISPLAY_PORT_MIN,\n- .max = G4X_P1_DISPLAY_PORT_MAX},\n- .p2 = { .dot_limit = G4X_P2_DISPLAY_PORT_LIMIT,\n- .p2_slow = G4X_P2_DISPLAY_PORT_SLOW,\n- .p2_fast = G4X_P2_DISPLAY_PORT_FAST },\n- .find_pll = intel_find_pll_g4x_dp,\n-};\n-\n-static const intel_limit_t intel_limits_pineview_sdvo = {\n- .dot = { .min = I9XX_DOT_MIN,\t\t.max = I9XX_DOT_MAX},\n- .vco = { .min = PINEVIEW_VCO_MIN,\t\t.max = PINEVIEW_VCO_MAX },\n- .n = { .min = PINEVIEW_N_MIN,\t\t.max = PINEVIEW_N_MAX },\n- .m = { .min = PINEVIEW_M_MIN,\t\t.max = PINEVIEW_M_MAX },\n- .m1 = { .min = PINEVIEW_M1_MIN,\t\t.max = PINEVIEW_M1_MAX },\n- .m2 = { .min = PINEVIEW_M2_MIN,\t\t.max = PINEVIEW_M2_MAX },\n- .p = { .min = I9XX_P_SDVO_DAC_MIN, .max = I9XX_P_SDVO_DAC_MAX },\n- .p1 = { .min = I9XX_P1_MIN,\t\t.max = I9XX_P1_MAX },\n-\t.p2 = { .dot_limit = I9XX_P2_SDVO_DAC_SLOW_LIMIT,\n-\t\t .p2_slow = I9XX_P2_SDVO_DAC_SLOW,\t.p2_fast = I9XX_P2_SDVO_DAC_FAST },\n-\t.find_pll = intel_find_best_PLL,\n-};\n-\n-static const intel_limit_t intel_limits_pineview_lvds = {\n- .dot = { .min = I9XX_DOT_MIN,\t\t.max = I9XX_DOT_MAX },\n- .vco = { .min = PINEVIEW_VCO_MIN,\t\t.max = PINEVIEW_VCO_MAX },\n- .n = { .min = PINEVIEW_N_MIN,\t\t.max = PINEVIEW_N_MAX },\n- .m = { .min = PINEVIEW_M_MIN,\t\t.max = PINEVIEW_M_MAX },\n- .m1 = { .min = PINEVIEW_M1_MIN,\t\t.max = PINEVIEW_M1_MAX },\n- .m2 = { .min = PINEVIEW_M2_MIN,\t\t.max = PINEVIEW_M2_MAX },\n- .p = { .min = PINEVIEW_P_LVDS_MIN,\t.max = PINEVIEW_P_LVDS_MAX },\n- .p1 = { .min = I9XX_P1_MIN,\t\t.max = I9XX_P1_MAX },\n-\t\/* Pineview only supports single-channel mode. *\/\n-\t.p2 = { .dot_limit = I9XX_P2_LVDS_SLOW_LIMIT,\n-\t\t .p2_slow = I9XX_P2_LVDS_SLOW,\t.p2_fast = I9XX_P2_LVDS_SLOW },\n-\t.find_pll = intel_find_best_PLL,\n-};\n-\n-static const intel_limit_t intel_limits_ironlake_dac = {\n-\t.dot = { .min = IRONLAKE_DOT_MIN, .max = IRONLAKE_DOT_MAX },\n-\t.vco = { .min = IRONLAKE_VCO_MIN, .max = IRONLAKE_VCO_MAX },\n-\t.n = { .min = IRONLAKE_DAC_N_MIN, .max = IRONLAKE_DAC_N_MAX },\n-\t.m = { .min = IRONLAKE_DAC_M_MIN, .max = IRONLAKE_DAC_M_MAX },\n-\t.m1 = { .min = IRONLAKE_M1_MIN, .max = IRONLAKE_M1_MAX },\n-\t.m2 = { .min = IRONLAKE_M2_MIN, .max = IRONLAKE_M2_MAX },\n-\t.p = { .min = IRONLAKE_DAC_P_MIN,\t .max = IRONLAKE_DAC_P_MAX },\n-\t.p1 = { .min = IRONLAKE_DAC_P1_MIN, .max = IRONLAKE_DAC_P1_MAX },\n-\t.p2 = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,\n-\t\t .p2_slow = IRONLAKE_DAC_P2_SLOW,\n-\t\t .p2_fast = IRONLAKE_DAC_P2_FAST },\n+static const intel_limit_t intel_limits_ironlake_single_lvds = {\n+\t.dot = { .min = 25000, .max = 350000 },\n+\t.vco = { .min = 1760000, .max = 3510000 },\n+\t.n = { .min = 1, .max = 3 },\n+\t.m = { .min = 79, .max = 118 },\n+\t.m1 = { .min = 12, .max = 22 },\n+\t.m2 = { .min = 5, .max = 9 },\n+\t.p = { .min = 28, .max = 112 },\n+\t.p1 = { .min = 2, .max = 8 },\n+\t.p2 = { .dot_limit = 225000,\n+\t\t.p2_slow = 14, .p2_fast = 14 },\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_ironlake_single_lvds = {\n-\t.dot = { .min = IRONLAKE_DOT_MIN, .max = IRONLAKE_DOT_MAX },\n-\t.vco = { .min = IRONLAKE_VCO_MIN, .max = IRONLAKE_VCO_MAX },\n-\t.n = { .min = IRONLAKE_LVDS_S_N_MIN, .max = IRONLAKE_LVDS_S_N_MAX },\n-\t.m = { .min = IRONLAKE_LVDS_S_M_MIN, .max = IRONLAKE_LVDS_S_M_MAX },\n-\t.m1 = { .min = IRONLAKE_M1_MIN, .max = IRONLAKE_M1_MAX },\n-\t.m2 = { .min = IRONLAKE_M2_MIN, .max = IRONLAKE_M2_MAX },\n-\t.p = { .min = IRONLAKE_LVDS_S_P_MIN, .max = IRONLAKE_LVDS_S_P_MAX },\n-\t.p1 = { .min = IRONLAKE_LVDS_S_P1_MIN, .max = IRONLAKE_LVDS_S_P1_MAX },\n-\t.p2 = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,\n-\t\t .p2_slow = IRONLAKE_LVDS_S_P2_SLOW,\n-\t\t .p2_fast = IRONLAKE_LVDS_S_P2_FAST },\n+static const intel_limit_t intel_limits_ironlake_dual_lvds = {\n+\t.dot = { .min = 25000, .max = 350000 },\n+\t.vco = { .min = 1760000, .max = 3510000 },\n+\t.n = { .min = 1, .max = 3 },\n+\t.m = { .min = 79, .max = 127 },\n+\t.m1 = { .min = 12, .max = 22 },\n+\t.m2 = { .min = 5, .max = 9 },\n+\t.p = { .min = 14, .max = 56 },\n+\t.p1 = { .min = 2, .max = 8 },\n+\t.p2 = { .dot_limit = 225000,\n+\t\t.p2_slow = 7, .p2_fast = 7 },\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_ironlake_dual_lvds = {\n-\t.dot = { .min = IRONLAKE_DOT_MIN, .max = IRONLAKE_DOT_MAX },\n-\t.vco = { .min = IRONLAKE_VCO_MIN, .max = IRONLAKE_VCO_MAX },\n-\t.n = { .min = IRONLAKE_LVDS_D_N_MIN, .max = IRONLAKE_LVDS_D_N_MAX },\n-\t.m = { .min = IRONLAKE_LVDS_D_M_MIN, .max = IRONLAKE_LVDS_D_M_MAX },\n-\t.m1 = { .min = IRONLAKE_M1_MIN, .max = IRONLAKE_M1_MAX },\n-\t.m2 = { .min = IRONLAKE_M2_MIN, .max = IRONLAKE_M2_MAX },\n-\t.p = { .min = IRONLAKE_LVDS_D_P_MIN, .max = IRONLAKE_LVDS_D_P_MAX },\n-\t.p1 = { .min = IRONLAKE_LVDS_D_P1_MIN, .max = IRONLAKE_LVDS_D_P1_MAX },\n-\t.p2 = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,\n-\t\t .p2_slow = IRONLAKE_LVDS_D_P2_SLOW,\n-\t\t .p2_fast = IRONLAKE_LVDS_D_P2_FAST },\n+\/* LVDS 100mhz refclk limits. *\/\n+static const intel_limit_t intel_limits_ironlake_single_lvds_100m = {\n+\t.dot = { .min = 25000, .max = 350000 },\n+\t.vco = { .min = 1760000, .max = 3510000 },\n+\t.n = { .min = 1, .max = 2 },\n+\t.m = { .min = 79, .max = 126 },\n+\t.m1 = { .min = 12, .max = 22 },\n+\t.m2 = { .min = 5, .max = 9 },\n+\t.p = { .min = 28, .max = 112 },\n+\t.p1 = { .min = 2,.max = 8 },\n+\t.p2 = { .dot_limit = 225000,\n+\t\t.p2_slow = 14, .p2_fast = 14 },\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_ironlake_single_lvds_100m = {\n-\t.dot = { .min = IRONLAKE_DOT_MIN, .max = IRONLAKE_DOT_MAX },\n-\t.vco = { .min = IRONLAKE_VCO_MIN, .max = IRONLAKE_VCO_MAX },\n-\t.n = { .min = IRONLAKE_LVDS_S_SSC_N_MIN, .max = IRONLAKE_LVDS_S_SSC_N_MAX },\n-\t.m = { .min = IRONLAKE_LVDS_S_SSC_M_MIN, .max = IRONLAKE_LVDS_S_SSC_M_MAX },\n-\t.m1 = { .min = IRONLAKE_M1_MIN, .max = IRONLAKE_M1_MAX },\n-\t.m2 = { .min = IRONLAKE_M2_MIN, .max = IRONLAKE_M2_MAX },\n-\t.p = { .min = IRONLAKE_LVDS_S_SSC_P_MIN, .max = IRONLAKE_LVDS_S_SSC_P_MAX },\n-\t.p1 = { .min = IRONLAKE_LVDS_S_SSC_P1_MIN,.max = IRONLAKE_LVDS_S_SSC_P1_MAX },\n-\t.p2 = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,\n-\t\t .p2_slow = IRONLAKE_LVDS_S_SSC_P2_SLOW,\n-\t\t .p2_fast = IRONLAKE_LVDS_S_SSC_P2_FAST },\n+static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = {\n+\t.dot = { .min = 25000, .max = 350000 },\n+\t.vco = { .min = 1760000, .max = 3510000 },\n+\t.n = { .min = 1, .max = 3 },\n+\t.m = { .min = 79, .max = 126 },\n+\t.m1 = { .min = 12, .max = 22 },\n+\t.m2 = { .min = 5, .max = 9 },\n+\t.p = { .min = 14, .max = 42 },\n+\t.p1 = { .min = 2,.max = 6 },\n+\t.p2 = { .dot_limit = 225000,\n+\t\t.p2_slow = 7, .p2_fast = 7 },\n \t.find_pll = intel_g4x_find_best_PLL,\n };\n \n-static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = {\n-\t.dot = { .min = IRONLAKE_DOT_MIN, .max = IRONLAKE_DOT_MAX },\n-\t.vco = { .min = IRONLAKE_VCO_MIN, .max = IRONLAKE_VCO_MAX },\n-\t.n = { .min = IRONLAKE_LVDS_D_SSC_N_MIN, .max = IRONLAKE_LVDS_D_SSC_N_MAX },\n-\t.m = { .min = IRONLAKE_LVDS_D_SSC_M_MIN, .max = IRONLAKE_LVDS_D_SSC_M_MAX },\n-\t.m1 = { .min = IRONLAKE_M1_MIN, .max = IRONLAKE_M1_MAX },\n-\t.m2 = { .min = IRONLAKE_M2_MIN, .max = IRONLAKE_M2_MAX },\n-\t.p = { .min = IRONLAKE_LVDS_D_SSC_P_MIN, .max = IRONLAKE_LVDS_D_SSC_P_MAX },\n-\t.p1 = { .min = IRONLAKE_LVDS_D_SSC_P1_MIN,.max = IRONLAKE_LVDS_D_SSC_P1_MAX },\n-\t.p2 = { .dot_limit = IRONLAKE_P2_DOT_LIMIT,\n-\t\t .p2_slow = IRONLAKE_LVDS_D_SSC_P2_SLOW,\n-\t\t .p2_fast = IRONLAKE_LVDS_D_SSC_P2_FAST },\n-\t.find_pll = intel_g4x_find_best_PLL,\n-};\n-\n static const intel_limit_t intel_limits_ironlake_display_port = {\n- .dot = { .min = IRONLAKE_DOT_MIN,\n- .max = IRONLAKE_DOT_MAX },\n- .vco = { .min = IRONLAKE_VCO_MIN,\n- .max = IRONLAKE_VCO_MAX},\n- .n = { .min = IRONLAKE_DP_N_MIN,\n- .max = IRONLAKE_DP_N_MAX },\n- .m = { .min = IRONLAKE_DP_M_MIN,\n- .max = IRONLAKE_DP_M_MAX },\n- .m1 = { .min = IRONLAKE_M1_MIN,\n- .max = IRONLAKE_M1_MAX },\n- .m2 = { .min = IRONLAKE_M2_MIN,\n- .max = IRONLAKE_M2_MAX },\n- .p = { .min = IRONLAKE_DP_P_MIN,\n- .max = IRONLAKE_DP_P_MAX },\n- .p1 = { .min = IRONLAKE_DP_P1_MIN,\n- .max = IRONLAKE_DP_P1_MAX},\n- .p2 = { .dot_limit = IRONLAKE_DP_P2_LIMIT,\n- .p2_slow = IRONLAKE_DP_P2_SLOW,\n- .p2_fast = IRONLAKE_DP_P2_FAST },\n+ .dot = { .min = 25000, .max = 350000 },\n+ .vco = { .min = 1760000, .max = 3510000},\n+ .n = { .min = 1, .max = 2 },\n+ .m = { .min = 81, .max = 90 },\n+ .m1 = { .min = 12, .max = 22 },\n+ .m2 = { .min = 5, .max = 9 },\n+ .p = { .min = 10, .max = 20 },\n+ .p1 = { .min = 1, .max = 2},\n+ .p2 = { .dot_limit = 0,\n+\t\t.p2_slow = 10, .p2_fast = 10 },\n .find_pll = intel_find_pll_ironlake_dp,\n };\n \n"} {"commit":"63cbb0747622d923665294519e9a24bc9c654c19","subject":"drm\/i915: Always load the display palette before enabling the pipe","message":"drm\/i915: Always load the display palette before enabling the pipe\n\nLoading the palette after the planes are enabled can risk showing\nincorrect colors. ILK+ already load the palette before even the pipe\nis enabled. Just follow the same order for gen2-4 and VLV.\n\nAccording to BSpec the requirements for palette access are\ndisplay core clock and display PLL running. In certain platforms\njust the core clock may be enough. But we definitely should have both\nrunning when this gets called during the modeset.\n\nv2: Amend the commit message with some display PLL\/core clock info\n\nSigned-off-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nReviewed-by: Rodrigo Vivi <f714145d6ee82178e54021e0c168f56d17b53c9c@gmail.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b1c560d13d1aab194b467ca33d0be6ca6e829ee5","subject":"drm\/i915: Extract p2 divider correctly for gen2 LVDS dual channel","message":"drm\/i915: Extract p2 divider correctly for gen2 LVDS dual channel\n\nIn order to determine the correct p2 divider for LVDS on gen2,\nwe need to check the CLKB mode from the LVDS port register to\ndetermine if we're dealing with single or dual channel LVDS.\n\nCc: Bruno Pr\u00e9mont <07d37993a092409e6c5d6be7073d31d94250624b@linux-vserver.org>\nSigned-off-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nTested-by: Bruno Pr\u00e9mont <07d37993a092409e6c5d6be7073d31d94250624b@linux-vserver.org>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -7951,12 +7951,17 @@\n \t\telse\n \t\t\ti9xx_clock(refclk, &clock);\n \t} else {\n-\t\tbool is_lvds = (pipe == 1) && (I915_READ(LVDS) & LVDS_PORT_EN);\n+\t\tu32 lvds = I915_READ(LVDS);\n+\t\tbool is_lvds = (pipe == 1) && (lvds & LVDS_PORT_EN);\n \n \t\tif (is_lvds) {\n \t\t\tclock.p1 = ffs((dpll & DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>\n \t\t\t\t DPLL_FPA01_P1_POST_DIV_SHIFT);\n-\t\t\tclock.p2 = 14;\n+\n+\t\t\tif (lvds & LVDS_CLKB_POWER_UP)\n+\t\t\t\tclock.p2 = 7;\n+\t\t\telse\n+\t\t\t\tclock.p2 = 14;\n \t\t} else {\n \t\t\tif (dpll & PLL_P1_DIVIDE_BY_TWO)\n \t\t\t\tclock.p1 = 2;\n"} {"commit":"bedd4dba75dc583fd3c458f6af2d53c60912a3cb","subject":"drm\/i915: improve assert_panel_unlocked","message":"drm\/i915: improve assert_panel_unlocked\n\nFix assert_panel_unlocked for vlv\/chv, and improve it a bit for\nnon-LVDS. Also don't pretend it works for DDI. There's still work to do\nto get this right for eDP on PCH platforms, but this is a start.\n\nv2: WARN_ON(HAS_DDI)\n\nReviewed-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nSigned-off-by: Jani Nikula <ba783f3beccaedfda693f41a15407d612a629408@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -1195,26 +1195,39 @@\n static void assert_panel_unlocked(struct drm_i915_private *dev_priv,\n \t\t\t\t enum pipe pipe)\n {\n-\tint pp_reg, lvds_reg;\n+\tstruct drm_device *dev = dev_priv->dev;\n+\tint pp_reg;\n \tu32 val;\n \tenum pipe panel_pipe = PIPE_A;\n \tbool locked = true;\n \n-\tif (HAS_PCH_SPLIT(dev_priv->dev)) {\n+\tif (WARN_ON(HAS_DDI(dev)))\n+\t\treturn;\n+\n+\tif (HAS_PCH_SPLIT(dev)) {\n+\t\tu32 port_sel;\n+\n \t\tpp_reg = PCH_PP_CONTROL;\n-\t\tlvds_reg = PCH_LVDS;\n+\t\tport_sel = I915_READ(PCH_PP_ON_DELAYS) & PANEL_PORT_SELECT_MASK;\n+\n+\t\tif (port_sel == PANEL_PORT_SELECT_LVDS &&\n+\t\t I915_READ(PCH_LVDS) & LVDS_PIPEB_SELECT)\n+\t\t\tpanel_pipe = PIPE_B;\n+\t\t\/* XXX: else fix for eDP *\/\n+\t} else if (IS_VALLEYVIEW(dev)) {\n+\t\t\/* presumably write lock depends on pipe, not port select *\/\n+\t\tpp_reg = VLV_PIPE_PP_CONTROL(pipe);\n+\t\tpanel_pipe = pipe;\n \t} else {\n \t\tpp_reg = PP_CONTROL;\n-\t\tlvds_reg = LVDS;\n+\t\tif (I915_READ(LVDS) & LVDS_PIPEB_SELECT)\n+\t\t\tpanel_pipe = PIPE_B;\n \t}\n \n \tval = I915_READ(pp_reg);\n \tif (!(val & PANEL_POWER_ON) ||\n \t ((val & PANEL_UNLOCK_MASK) == PANEL_UNLOCK_REGS))\n \t\tlocked = false;\n-\n-\tif (I915_READ(lvds_reg) & LVDS_PIPEB_SELECT)\n-\t\tpanel_pipe = PIPE_B;\n \n \tWARN(panel_pipe == pipe && locked,\n \t \"panel assertion failure, pipe %c regs locked\\n\",\n"} {"commit":"5a41254eac1137d0335c0aed7b00f1f3138ee9ca","subject":"drm\/i915: ILK, SNB and IVB don't have linetime watermarks","message":"drm\/i915: ILK, SNB and IVB don't have linetime watermarks\n\nSo don't call intel_update_linetime_watermarks from\nironlake_crtc_mode_set. Only Haswell has these watermarks.\n\nSigned-off-by: Paulo Zanoni <cc0e04a2103c45cd195651d976f79813d0f66bdf@intel.com>\nReviewed-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -5841,8 +5841,6 @@\n \n \tintel_update_watermarks(dev);\n \n-\tintel_update_linetime_watermarks(dev, pipe, adjusted_mode);\n-\n \treturn ret;\n }\n \n"} {"commit":"165e901caa4c9d768dd572aab6b95f89a2e9e204","subject":"drm\/i915: Mask out hardware status bits from VLV DPLL register","message":"drm\/i915: Mask out hardware status bits from VLV DPLL register\n\nThe DPLL lock bit, and the DPIO phy status bits are read-only and\ncontrolled by the hardware, so they will never be set by the driver.\nMask them out when reading the hw state, so that the state\ncomparison won't fail.\n\nSigned-off-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com>\nReviewed-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuosugeek.org>\n[danvet: Jesse asked for a code comment and I wholeheartly agree, so\nadded one.]\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -4958,6 +4958,11 @@\n \tif (!IS_VALLEYVIEW(dev)) {\n \t\tpipe_config->dpll_hw_state.fp0 = I915_READ(FP0(crtc->pipe));\n \t\tpipe_config->dpll_hw_state.fp1 = I915_READ(FP1(crtc->pipe));\n+\t} else {\n+\t\t\/* Mask out read-only status bits. *\/\n+\t\tpipe_config->dpll_hw_state.dpll &= ~(DPLL_LOCK_VLV |\n+\t\t\t\t\t\t DPLL_PORTC_READY_MASK |\n+\t\t\t\t\t\t DPLL_PORTB_READY_MASK);\n \t}\n \n \treturn true;\n"} {"commit":"b7fad04e10e9266e901fefe0385cfced08d89eee","subject":"pkcs11-tool.c: Simplifies interface to show_key() and avoids more compiler warnings.","message":"pkcs11-tool.c: Simplifies interface to show_key() and avoids more compiler warnings.\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@4967 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"frankmorgner\/OpenSC,frankmorgner\/OpenSC,0x7678\/OpenSC,CardContact\/OpenSC,viktorTarasov\/OpenSC-SM,carlhoerberg\/OpenSC,hongquan\/OpenSC-main,adminmt\/OpenSC,jpki\/OpenSC,l1k\/OpenSC,kasparsd\/opensc-latvia-id,dirkx\/OpenSC.tokend,mouse07410\/OpenSC,nmav\/OpenSC,kasparsd\/opensc-latvia-id,financeX\/OpenSC,fabled\/OpenSC,mouse07410\/OpenSC,dirkx\/OpenSC,fabled\/OpenSC,viktorTarasov\/OpenSC-SM,gentoo\/OpenSC,dirkx\/OpenSC.tokend,0x7678\/OpenSC,dirkx\/OpenSC,martinpaljak\/OpenSC,CardContact\/OpenSC,martinpaljak\/OpenSC,0x7678\/OpenSC,frankmorgner\/OpenSC,aobaid\/OpenSC,CardContact\/OpenSC,Jakuje\/OpenSC,jpki\/OpenSC,carlhoerberg\/OpenSC,UIKit0\/OpenSC,kasparsd\/opensc-latvia-id,LudovicRousseau\/OpenSC,0x7678\/myOpenSC,tidatida\/OpenSC,ieugen\/OpenSC,tidatida\/OpenSC,UIKit0\/OpenSC,dirkx\/OpenSC,philipWendland\/OpenSC,0x7678\/myOpenSC,dengert\/OpenSC,philipWendland\/OpenSC,financeX\/OpenSC,gentoo\/OpenSC,aobaid\/OpenSC,hongquan\/OpenSC-main,tidatida\/OpenSC,financeX\/OpenSC,carlhoerberg\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,velter\/OpenSC,viktorTarasov\/OpenSC-SM,rickyepoderi\/OpenSC,adminmt\/OpenSC,dirkx\/OpenSC,UIKit0\/OpenSC,hhonkanen\/OpenSC,LudovicRousseau\/OpenSC,LudovicRousseau\/OpenSC,gemini\/OpenSC,OpenSC\/OpenSC,OpenSC\/OpenSC,germanblanco\/OpenSC,fabled\/OpenSC,mtrojnar\/OpenSC,gentoo\/OpenSC,carlhoerberg\/OpenSC,dirkx\/OpenSC.tokend,aobaid\/OpenSC,adminmt\/OpenSC,AktivCo\/OpenSC,kasparsd\/opensc-latvia-id,marschap\/pkg-opensc,metsma\/OpenSC,dengert\/OpenSC,Jakuje\/OpenSC,philipWendland\/OpenSC,velter\/OpenSC,dirkx\/OpenSC.tokend,Jakuje\/OpenSC,financeX\/OpenSC,metsma\/OpenSC,velter\/OpenSC,mouse07410\/OpenSC,dengert\/OpenSC,metsma\/OpenSC,Jakuje\/OpenSC,dirkx\/OpenSC.tokend,rickyepoderi\/OpenSC,AktivCo\/OpenSC,0x7678\/myOpenSC,0x7678\/myOpenSC,fabled\/OpenSC,l1k\/OpenSC,dirkx\/OpenSC,ieugen\/OpenSC,rickyepoderi\/OpenSC,gemini\/OpenSC,adminmt\/OpenSC,mtrojnar\/OpenSC,jpki\/OpenSC,aobaid\/OpenSC,frankmorgner\/OpenSC,0x7678\/OpenSC,martinpaljak\/OpenSC,ieugen\/OpenSC,marschap\/pkg-opensc,marschap\/pkg-opensc,l1k\/OpenSC,OpenSC\/OpenSC,germanblanco\/OpenSC,carlhoerberg\/OpenSC,AktivCo\/OpenSC,dirkx\/OpenSC.tokend,velter\/OpenSC,hhonkanen\/OpenSC,mtrojnar\/OpenSC,nmav\/OpenSC,nmav\/OpenSC,financeX\/OpenSC,marschap\/pkg-opensc,gemini\/OpenSC,ieugen\/OpenSC,hongquan\/OpenSC-main,tidatida\/OpenSC,hhonkanen\/OpenSC,germanblanco\/OpenSC,gentoo\/OpenSC,UIKit0\/OpenSC,0x7678\/myOpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs11-tool.c\n+++ src\/tools\/pkcs11-tool.c\n@@ -241,7 +241,7 @@\n static int\t\tchange_pin(CK_SLOT_ID, CK_SESSION_HANDLE);\n static int \t\tunlock_pin(CK_SLOT_ID slot, CK_SESSION_HANDLE sess, int login_type);\n static void\t\tshow_object(CK_SESSION_HANDLE, CK_OBJECT_HANDLE);\n-static void\t\tshow_key(CK_SESSION_HANDLE, CK_OBJECT_HANDLE, int);\n+static void\t\tshow_key(CK_SESSION_HANDLE, CK_OBJECT_HANDLE);\n static void\t\tshow_cert(CK_SESSION_HANDLE, CK_OBJECT_HANDLE);\n static void\t\tshow_dobj(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj);\n static void\t\tsign_data(CK_SLOT_ID,\n@@ -2008,10 +2008,8 @@\n \n \tswitch (cls) {\n \tcase CKO_PUBLIC_KEY:\n-\t\tshow_key(sess, obj, 1);\n-\t\tbreak;\n \tcase CKO_PRIVATE_KEY:\n-\t\tshow_key(sess, obj, 0);\n+\t\tshow_key(sess, obj);\n \t\tbreak;\n \tcase CKO_CERTIFICATE:\n \t\tshow_cert(sess, obj);\n@@ -2026,15 +2024,28 @@\n \t}\n }\n \n-static void show_key(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj, int pub)\n+static void show_key(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj)\n {\n \tCK_KEY_TYPE\tkey_type = getKEY_TYPE(sess, obj);\n-\tCK_ULONG\tsize;\n+\tCK_ULONG\tsize = 0;\n \tunsigned char\t*id, *oid;\n+\tconst char *sepa;\n \tchar\t\t*label;\n-\tconst char *sepa;\n-\n-\tprintf(\"%s Key Object\", pub? \"Public\" : \"Private\");\n+\tint\t\tpub;\n+\n+\tswitch(getCLASS(sess, obj)) {\n+\t\tcase CKO_PRIVATE_KEY:\n+\t\t\tprintf(\"Private Key Object\");\n+\t\t\tpub = 0;\n+\t\t\tbreak;\n+\t\tcase CKO_PUBLIC_KEY:\n+\t\t\tprintf(\"Public Key Object\");\n+\t\t\tpub = 1;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn;\n+\t}\n+\n \tswitch (key_type) {\n \tcase CKK_RSA:\n \t\tif (pub)\n@@ -2059,8 +2070,8 @@\n \t\tprintf(\"; EC\");\n \t\tif (pub) { \n \t\t\tunsigned char *bytes = NULL;\n+\t\t\tunsigned int n;\n \t\t\tint ksize;\n-\t\t\tint n;\n \t\t\tbytes = getEC_POINT(sess, obj, &size);\n \t\t\t\/* \n \t\t\t * (We only support uncompressed for now) \n@@ -2078,7 +2089,7 @@\n \t\t\t\n \t\t\tprintf(\" EC_POINT %d bits\\n\", ksize);\n \t\t\tif (bytes) {\n-\t\t\t\tif (size > 0) { \/* Will print the point here *\/\n+\t\t\t\tif ((CK_LONG)size > 0) { \/* Will print the point here *\/\n \t\t\t\t\tprintf(\" EC_POINT: \");\n \t\t\t\t\tfor (n = 0; n < size; n++)\n \t\t\t\t\t\tprintf(\"%02x\", bytes[n]);\n@@ -2089,7 +2100,7 @@\n \t\t\tbytes = NULL;\n \t\t\tbytes = getEC_PARAMS(sess, obj, &size);\n \t\t\tif (bytes){ \n-\t\t\t\tif (size > 0) {\n+\t\t\t\tif ((CK_LONG)size > 0) {\n \t\t\t\t\tprintf(\" EC_PARAMS: \");\n \t\t\t\t\tfor (n = 0; n < size; n++)\n \t\t\t\t\t\tprintf(\"%02x\", bytes[n]);\n@@ -2302,7 +2313,7 @@\n \tCK_OBJECT_HANDLE obj = CK_INVALID_HANDLE;\n \tint nn_attrs = 0;\n \tunsigned char *value = NULL;\n-\tCK_ULONG len;\n+\tCK_ULONG len = 0;\n \tFILE *out;\n \tstruct sc_object_id oid;\n \t\n"} {"commit":"c930262fd89730e6fd921419dbd734b57634cb53","subject":"drivers: ieee802154: nrf5: refactor storing mac keys","message":"drivers: ieee802154: nrf5: refactor storing mac keys\n\nThis commit makes nrf5_config_mac_keys function more generic.\nIs uses lookup table for storing keys to override. It removes old keys\nbefore storing new ones.\n\nSigned-off-by: Lukasz Maciejonczyk <12a52743b42a5ad3dc4d3a6e4f8a76d0ad7c6806@nordicsemi.no>\n","repos":"galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ieee802154\/ieee802154_nrf5.c\n+++ drivers\/ieee802154\/ieee802154_nrf5.c\n@@ -702,36 +702,36 @@\n #if defined(CONFIG_NRF_802154_ENCRYPTION)\n static void nrf5_config_mac_keys(struct ieee802154_key *mac_keys)\n {\n-\tnrf_802154_security_error_t err;\n-\tnrf_802154_key_t key;\n-\tuint8_t key_id_to_remove;\n-\n-\t__ASSERT(mac_keys, \"Invalid argument.\");\n-\n-\t\/* Remove old invalid key assuming that its index is first_valid_key_id - 1.\n-\t * TODO: This is Thread specific assumption, need to be changed when RD will provided\n-\t * API for removing all keys or handling this internally.\n-\t *\/\n-\tkey_id_to_remove = mac_keys->key_index == 1 ? 0x80 : mac_keys->key_index - 1;\n-\n-\tkey.id.mode = mac_keys->key_id_mode;\n-\tkey.id.p_key_id = &key_id_to_remove;\n-\n-\tnrf_802154_security_key_remove(&key.id);\n-\n+\tstatic nrf_802154_key_id_t stored_key_ids[NRF_802154_SECURITY_KEY_STORAGE_SIZE];\n+\tstatic uint8_t stored_ids[NRF_802154_SECURITY_KEY_STORAGE_SIZE];\n+\tuint8_t i;\n+\n+\tfor (i = 0; i < NRF_802154_SECURITY_KEY_STORAGE_SIZE && stored_key_ids[i].p_key_id; i++) {\n+\t\tnrf_802154_security_key_remove(&stored_key_ids[i]);\n+\t\tstored_key_ids[i].p_key_id = NULL;\n+\t}\n+\n+\ti = 0;\n \tfor (struct ieee802154_key *keys = mac_keys; keys->key_value; keys++) {\n-\t\tkey.value.p_cleartext_key = keys->key_value;\n-\t\tkey.id.mode = keys->key_id_mode;\n-\t\tkey.id.p_key_id = &(keys->key_index);\n-\t\tkey.type = NRF_802154_KEY_CLEARTEXT;\n-\t\tkey.frame_counter = 0;\n-\t\tkey.use_global_frame_counter = !(keys->frame_counter_per_key);\n-\n-\t\tnrf_802154_security_key_remove(&key.id);\n-\t\terr = nrf_802154_security_key_store(&key);\n+\t\tnrf_802154_key_t key = {\n+\t\t\t.value.p_cleartext_key = keys->key_value,\n+\t\t\t.id.mode = keys->key_id_mode,\n+\t\t\t.id.p_key_id = &(keys->key_index),\n+\t\t\t.type = NRF_802154_KEY_CLEARTEXT,\n+\t\t\t.frame_counter = 0,\n+\t\t\t.use_global_frame_counter = !(keys->frame_counter_per_key),\n+\t\t};\n+\n+\t\tnrf_802154_security_error_t err = nrf_802154_security_key_store(&key);\n \t\t__ASSERT(err == NRF_802154_SECURITY_ERROR_NONE ||\n \t\t\t\t err == NRF_802154_SECURITY_ERROR_ALREADY_PRESENT,\n \t\t\t \"Storing key failed, err: %d\", err);\n+\n+\t\t__ASSERT(i < NRF_802154_SECURITY_KEY_STORAGE_SIZE, \"Store buffer is full\");\n+\t\tstored_ids[i] = *key.id.p_key_id;\n+\t\tstored_key_ids[i].mode = key.id.mode;\n+\t\tstored_key_ids[i].p_key_id = &stored_ids[i];\n+\t\ti++;\n \t};\n }\n #endif \/* CONFIG_NRF_802154_ENCRYPTION *\/\n"} {"commit":"e0c1b6e8f12a69fc90900c4c9bbe6beb69b17908","subject":"remove unreachable code, make some functions static and fix parameter type","message":"remove unreachable code, make some functions static and fix parameter type\n\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@2136 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"rickyepoderi\/OpenSC,dirkx\/OpenSC,0x7678\/myOpenSC,dirkx\/OpenSC,Jakuje\/OpenSC,LudovicRousseau\/OpenSC,Jakuje\/OpenSC,martinpaljak\/OpenSC,kasparsd\/opensc-latvia-id,metsma\/OpenSC,AktivCo\/OpenSC,kasparsd\/opensc-latvia-id,viktorTarasov\/OpenSC-SM,germanblanco\/OpenSC,aobaid\/OpenSC,OpenSC\/OpenSC,CardContact\/OpenSC,marschap\/pkg-opensc,jpki\/OpenSC,dengert\/OpenSC,ieugen\/OpenSC,AktivCo\/OpenSC,UIKit0\/OpenSC,OpenSC\/OpenSC,rickyepoderi\/OpenSC,metsma\/OpenSC,marschap\/pkg-opensc,dirkx\/OpenSC.tokend,fabled\/OpenSC,dirkx\/OpenSC,hhonkanen\/OpenSC,jpki\/OpenSC,hhonkanen\/OpenSC,mtrojnar\/OpenSC,mtrojnar\/OpenSC,ieugen\/OpenSC,0x7678\/myOpenSC,carlhoerberg\/OpenSC,gemini\/OpenSC,financeX\/OpenSC,fabled\/OpenSC,0x7678\/OpenSC,hongquan\/OpenSC-main,financeX\/OpenSC,philipWendland\/OpenSC,adminmt\/OpenSC,philipWendland\/OpenSC,nmav\/OpenSC,l1k\/OpenSC,fabled\/OpenSC,dirkx\/OpenSC.tokend,frankmorgner\/OpenSC,philipWendland\/OpenSC,LudovicRousseau\/OpenSC,Jakuje\/OpenSC,frankmorgner\/OpenSC,OpenSC\/OpenSC,dirkx\/OpenSC.tokend,frankmorgner\/OpenSC,adminmt\/OpenSC,UIKit0\/OpenSC,CardContact\/OpenSC,velter\/OpenSC,AktivCo\/OpenSC,frankmorgner\/OpenSC,l1k\/OpenSC,mouse07410\/OpenSC,fabled\/OpenSC,dengert\/OpenSC,mouse07410\/OpenSC,carlhoerberg\/OpenSC,financeX\/OpenSC,hongquan\/OpenSC-main,rickyepoderi\/OpenSC,dirkx\/OpenSC,metsma\/OpenSC,0x7678\/OpenSC,viktorTarasov\/OpenSC-SM,0x7678\/OpenSC,adminmt\/OpenSC,l1k\/OpenSC,kasparsd\/opensc-latvia-id,ieugen\/OpenSC,jpki\/OpenSC,hhonkanen\/OpenSC,germanblanco\/OpenSC,dirkx\/OpenSC.tokend,carlhoerberg\/OpenSC,UIKit0\/OpenSC,gentoo\/OpenSC,velter\/OpenSC,hongquan\/OpenSC-main,viktorTarasov\/OpenSC-SM,kasparsd\/opensc-latvia-id,financeX\/OpenSC,marschap\/pkg-opensc,ieugen\/OpenSC,gemini\/OpenSC,gemini\/OpenSC,aobaid\/OpenSC,dirkx\/OpenSC,0x7678\/myOpenSC,gentoo\/OpenSC,mtrojnar\/OpenSC,LudovicRousseau\/OpenSC,gentoo\/OpenSC,CardContact\/OpenSC,financeX\/OpenSC,marschap\/pkg-opensc,dirkx\/OpenSC.tokend,gentoo\/OpenSC,carlhoerberg\/OpenSC,tidatida\/OpenSC,germanblanco\/OpenSC,ieugen\/OpenSC,mouse07410\/OpenSC,gentoo\/OpenSC,aobaid\/OpenSC,velter\/OpenSC,tidatida\/OpenSC,dengert\/OpenSC,martinpaljak\/OpenSC,Jakuje\/OpenSC,nmav\/OpenSC,martinpaljak\/OpenSC,velter\/OpenSC,aobaid\/OpenSC,UIKit0\/OpenSC,dirkx\/OpenSC.tokend,0x7678\/myOpenSC,0x7678\/myOpenSC,carlhoerberg\/OpenSC,tidatida\/OpenSC,adminmt\/OpenSC,0x7678\/OpenSC,nmav\/OpenSC,tidatida\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs11-tool.c\n+++ src\/tools\/pkcs11-tool.c\n@@ -762,9 +762,6 @@\n \t\tif (rv != CKR_OK)\n \t\t\tp11_fatal(\"C_SignUpdate\", rv);\n \t}\n-\tif (rv < 0)\n-\t\tfatal(\"failed to read from %s: %m\",\n-\t\t\t\topt_input? opt_input : \"<stdin>\");\n \tif (fd != 0)\n \t\tclose(fd);\n \n@@ -824,9 +821,7 @@\n \t\tif (rv != CKR_OK)\n \t\t\tp11_fatal(\"C_DigestUpdate\", rv);\n \t}\n-\tif (rv < 0)\n-\t\tfatal(\"failed to read from %s: %m\",\n-\t\t\t\topt_input? opt_input : \"<stdin>\");\n+\n \tif (fd != 0)\n \t\tclose(fd);\n \n@@ -1134,7 +1129,7 @@\n \n \n #define ATTR_METHOD(ATTR, TYPE) \\\n-TYPE \\\n+static TYPE \\\n get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj) \\\n { \\\n \tTYPE\t\ttype; \\\n@@ -1148,7 +1143,7 @@\n }\n \n #define VARATTR_METHOD(ATTR, TYPE) \\\n-TYPE * \\\n+static TYPE * \\\n get##ATTR(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj, CK_ULONG_PTR pulCount) \\\n { \\\n \tCK_ATTRIBUTE\tattr = { CKA_##ATTR, NULL, 0 }; \\\n@@ -1683,7 +1678,7 @@\n }\n \n #ifdef HAVE_OPENSSL\n-EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObject)\n+static EVP_PKEY *get_public_key(CK_SESSION_HANDLE session, CK_OBJECT_HANDLE privKeyObject)\n {\n \tunsigned char *id;\n \tCK_ULONG idLen;\n@@ -1726,11 +1721,11 @@\n }\n #endif\n \n-int sign_verify_openssl(CK_SLOT_ID slot, CK_SESSION_HANDLE session,\n+static int sign_verify_openssl(CK_SLOT_ID slot, CK_SESSION_HANDLE session,\n \t\tCK_MECHANISM *ck_mech, CK_OBJECT_HANDLE privKeyObject,\n \t\tunsigned char *data, CK_ULONG dataLen,\n \t\tunsigned char *verifyData, CK_ULONG verifyDataLen,\n-\t\tint modLenBytes, int evp_md_index)\n+\t\tCK_ULONG modLenBytes, int evp_md_index)\n {\n \tint \t\terrors = 0;\n \tCK_RV rv;\n"} {"commit":"3160977a6e66ea4c4b4f33010f5d04f0004b938c","subject":"RDMA\/cxgb4: Use simple_read_from_buffer() for debugfs handlers","message":"RDMA\/cxgb4: Use simple_read_from_buffer() for debugfs handlers\n\nWe can replace our equivalent open-coded version.\n\nSigned-off-by: Steve Wise <6f43c86433b33e5fe92b209bedebd0f6dba5b49c@opengridcomputing.com>\nSigned-off-by: Roland Dreier <91e9b5f7ca0bb6300133ed378670d64af90dde66@cisco.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/infiniband\/hw\/cxgb4\/device.c\n+++ drivers\/infiniband\/hw\/cxgb4\/device.c\n@@ -68,32 +68,8 @@\n \t\t\t loff_t *ppos)\n {\n \tstruct c4iw_debugfs_data *d = file->private_data;\n-\tloff_t pos = *ppos;\n-\tloff_t avail = d->pos;\n-\n-\tif (pos < 0)\n-\t\treturn -EINVAL;\n-\tif (pos >= avail)\n-\t\treturn 0;\n-\tif (count > avail - pos)\n-\t\tcount = avail - pos;\n-\n-\twhile (count) {\n-\t\tsize_t len = 0;\n-\n-\t\tlen = min((int)count, (int)d->pos - (int)pos);\n-\t\tif (copy_to_user(buf, d->buf + pos, len))\n-\t\t\treturn -EFAULT;\n-\t\tif (len == 0)\n-\t\t\treturn -EINVAL;\n-\n-\t\tbuf += len;\n-\t\tpos += len;\n-\t\tcount -= len;\n-\t}\n-\tcount = pos - *ppos;\n-\t*ppos = pos;\n-\treturn count;\n+\n+\treturn simple_read_from_buffer(buf, count, ppos, d->buf, d->pos);\n }\n \n static int dump_qp(int id, void *p, void *data)\n"} {"commit":"0e5ab7a60684fd7aae9674f15169dea68aec1bc7","subject":"pkcs11-tool: Deprecated EC param getters in parse_ec_pkey()","message":"pkcs11-tool: Deprecated EC param getters in parse_ec_pkey()\n","repos":"dengert\/OpenSC,OpenSC\/OpenSC,OpenSC\/OpenSC,philipWendland\/OpenSC,philipWendland\/OpenSC,metsma\/OpenSC,mouse07410\/OpenSC,OpenSC\/OpenSC,mouse07410\/OpenSC,fabled\/OpenSC,philipWendland\/OpenSC,metsma\/OpenSC,fabled\/OpenSC,metsma\/OpenSC,dengert\/OpenSC,fabled\/OpenSC,LudovicRousseau\/OpenSC,LudovicRousseau\/OpenSC,LudovicRousseau\/OpenSC,dengert\/OpenSC,fabled\/OpenSC,mouse07410\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs11-tool.c\n+++ src\/tools\/pkcs11-tool.c\n@@ -3764,34 +3764,54 @@\n static int\n parse_ec_pkey(EVP_PKEY *pkey, int private, struct gostkey_info *gost)\n {\n+#if OPENSSL_VERSION_NUMBER < 0x30000000L\n \tconst EC_KEY *src = EVP_PKEY_get0_EC_KEY(pkey);\n \tconst BIGNUM *bignum;\n-\n \tif (!src)\n \t\treturn -1;\n-\n \tgost->param_oid.len = i2d_ECParameters((EC_KEY *)src, &gost->param_oid.value);\n-\tif (gost->param_oid.len <= 0)\n+#else\n+\tBIGNUM *bignum = NULL;\n+\tgost->param_oid.len = i2d_KeyParams(pkey, &gost->param_oid.value);\n+#endif\n+\tif (gost->param_oid.len <= 0) {\n \t\treturn -1;\n+\t}\n \n \tif (private) {\n+#if OPENSSL_VERSION_NUMBER < 0x30000000L\n \t\tbignum = EC_KEY_get0_private_key(src);\n-\n+#else\n+\t\tif (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &bignum) != 1) {\n+\t\t\treturn -1;\n+\t\t}\n+#endif\n \t\tgost->private.len = BN_num_bytes(bignum);\n \t\tgost->private.value = malloc(gost->private.len);\n-\t\tif (!gost->private.value)\n+\t\tif (!gost->private.value) {\n+#if OPENSSL_VERSION_NUMBER >= 0x30000000L\n+\t\t\tBN_free(bignum);\n+#endif\n \t\t\treturn -1;\n+\t\t}\n \t\tBN_bn2bin(bignum, gost->private.value);\n+#if OPENSSL_VERSION_NUMBER >= 0x30000000L\n+\t\tBN_free(bignum);\n+#endif\n \t}\n \telse {\n \t\tunsigned char buf[512], *point;\n-\t\tint point_len, header_len;\n+\t\tsize_t point_len, header_len;\n \t\tconst int MAX_HEADER_LEN = 3;\n+#if OPENSSL_VERSION_NUMBER < 0x30000000L\n \t\tconst EC_GROUP *ecgroup = EC_KEY_get0_group(src);\n \t\tconst EC_POINT *ecpoint = EC_KEY_get0_public_key(src);\n \t\tif (!ecgroup || !ecpoint)\n \t\t\treturn -1;\n \t\tpoint_len = EC_POINT_point2oct(ecgroup, ecpoint, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof(buf), NULL);\n+#else\n+\t\tEVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, buf, sizeof(buf), &point_len);\n+#endif\n \t\tgost->public.value = malloc(MAX_HEADER_LEN+point_len);\n \t\tif (!gost->public.value)\n \t\t\treturn -1;\n"} {"commit":"12a5a8fdfbab14427df0eb6e6c05559444ee2c73","subject":"Input: pm8xxx-vibrator - switch to using managed resources","message":"Input: pm8xxx-vibrator - switch to using managed resources\n\nSimplify the error paths and reduce the lines of code in this\ndriver by using the devm_* APIs.\n\nSigned-off-by: Stephen Boyd <010521127f513270fe503d86ab8316ac5147f4b7@codeaurora.org>\nSigned-off-by: Dmitry Torokhov <6b8646d310837fed93a129ed3c979b90c7f2674f@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"92fd59fe6af1e60a19d54ebfb034c2b81580e63a","subject":"EFX: Add 3D processing for autowah","message":"EFX: Add 3D processing for autowah\n\nAdd 3D processing code. It can be activated at compilation time.","repos":"aaronmjacobs\/openal-soft,aaronmjacobs\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Alc\/effects\/autowah.c\n+++ Alc\/effects\/autowah.c\n@@ -33,6 +33,13 @@\n #define MAX_FREQ 2500.0f\n #define Q_FACTOR 5.0f\n \n+\/*#define EFFECTS*\/\n+\n+#ifndef EFFECTS\n+#define CHANNELS 1\n+#else\n+#define CHANNELS MAX_EFFECT_CHANNELS\n+#endif\n \n typedef struct ALautowahState {\n DERIVE_FROM_TYPE(ALeffectState);\n@@ -44,16 +51,19 @@\n ALfloat PeakGain;\n ALfloat FreqMinNorm;\n ALfloat BandwidthNorm;\n- ALfloat env_delay;\n-\n- BiquadFilter Filter;\n+ ALfloat env_delay[MAX_EFFECT_CHANNELS];\n+\n+ struct {\n+ \/* Effect gains for each output channel *\/\n+ ALfloat CurrentGains[MAX_OUTPUT_CHANNELS];\n+ ALfloat TargetGains[MAX_OUTPUT_CHANNELS];\n+\n+ \/* Effect filters *\/\n+ BiquadFilter Filter;\n+ } Chans[MAX_EFFECT_CHANNELS];\n \n \/*Effects buffers*\/ \n- alignas(16) ALfloat BufferOut[BUFFERSIZE];\n-\n- \/* Effect gains for each output channel *\/\n- ALfloat CurrentGains[MAX_OUTPUT_CHANNELS];\n- ALfloat TargetGains[MAX_OUTPUT_CHANNELS];\n+ alignas(16) ALfloat BufferOut[MAX_EFFECT_CHANNELS][BUFFERSIZE];\n } ALautowahState;\n \n static ALvoid ALautowahState_Destruct(ALautowahState *state);\n@@ -65,15 +75,15 @@\n DEFINE_ALEFFECTSTATE_VTABLE(ALautowahState);\n \n \/*Envelope follewer described on the book: Audio Effects, Theory, Implementation and Application*\/\n-static inline ALfloat envelope_follower(ALautowahState *state, ALfloat SampleIn)\n+static inline ALfloat envelope_follower(ALautowahState *state, ALfloat SampleIn, ALsizei Index)\n {\n ALfloat alpha, Sample;\n \n Sample = state->PeakGain*fabsf(SampleIn);\n- alpha = (Sample > state->env_delay) ? state->AttackRate : state->ReleaseRate;\n- state->env_delay = alpha*state->env_delay + (1.0f-alpha)*Sample;\n-\n- return state->env_delay;\n+ alpha = (Sample > state->env_delay[Index]) ? state->AttackRate : state->ReleaseRate;\n+ state->env_delay[Index] = alpha*state->env_delay[Index] + (1.0f-alpha)*Sample;\n+\n+ return state->env_delay[Index];\n }\n \n static void ALautowahState_Construct(ALautowahState *state)\n@@ -90,18 +100,22 @@\n static ALboolean ALautowahState_deviceUpdate(ALautowahState *state, ALCdevice *UNUSED(device))\n {\n \/* (Re-)initializing parameters and clear the buffers. *\/\n+ ALsizei i, j;\n+\n state->AttackRate = 1.0f;\n state->ReleaseRate = 1.0f;\n state->ResonanceGain = 10.0f;\n state->PeakGain = 4.5f;\n state->FreqMinNorm = 4.5e-4f;\n state->BandwidthNorm = 0.05f;\n- state->env_delay = 0.0f;\n-\n- BiquadFilter_clear(&state->Filter);\n-\n- memset(state->CurrentGains, 0, sizeof(state->CurrentGains));\n- memset(state->TargetGains, 0, sizeof(state->TargetGains));\n+\n+ for(i = 0;i < MAX_EFFECT_CHANNELS;i++)\n+ {\n+ state->env_delay[i] = 0.0f;\n+ BiquadFilter_clear(&state->Chans[i].Filter);\n+ for(j = 0;j < MAX_OUTPUT_CHANNELS;j++)\n+ state->Chans[i].CurrentGains[j] = 0.0f;\n+ }\n \n return AL_TRUE;\n }\n@@ -109,8 +123,8 @@\n static ALvoid ALautowahState_update(ALautowahState *state, const ALCcontext *context, const ALeffectslot *slot, const ALeffectProps *props)\n {\n const ALCdevice *device = context->Device;\n- ALfloat coeffs[MAX_AMBI_COEFFS];\n ALfloat ReleaseTime;\n+ ALuint i;\n \n ReleaseTime = clampf(props->Autowah.ReleaseTime,0.001f,1.0f);\n \n@@ -121,32 +135,37 @@\n state->FreqMinNorm = MIN_FREQ\/device->Frequency;\n state->BandwidthNorm = (MAX_FREQ - MIN_FREQ)\/device->Frequency;\n \n- CalcAngleCoeffs(0.0f, 0.0f, 0.0f, coeffs);\n- ComputeDryPanGains(&device->Dry, coeffs, slot->Params.Gain, state->TargetGains);\n+ STATIC_CAST(ALeffectState,state)->OutBuffer = device->FOAOut.Buffer;\n+ STATIC_CAST(ALeffectState,state)->OutChannels = device->FOAOut.NumChannels;\n+ for(i = 0;i < MAX_EFFECT_CHANNELS;i++)\n+ ComputeFirstOrderGains(&device->FOAOut, IdentityMatrixf.m[i],\n+ slot->Params.Gain, state->Chans[i].TargetGains);\n }\n \n static ALvoid ALautowahState_process(ALautowahState *state, ALsizei SamplesToDo, const ALfloat (*restrict SamplesIn)[BUFFERSIZE], ALfloat (*restrict SamplesOut)[BUFFERSIZE], ALsizei NumChannels)\n {\n- ALfloat *restrict BufferOut = state->BufferOut;\n- ALsizei i;\n-\n- for(i = 0;i < SamplesToDo;i++)\n- {\n- ALfloat env_out, f0norm, temp;\n-\n- env_out = envelope_follower(state, SamplesIn[0][i]);\n- f0norm = state->BandwidthNorm*env_out + state->FreqMinNorm;\n-\n- BiquadFilter_setParams(&state->Filter, BiquadType_Peaking, state->ResonanceGain,\n- f0norm, 1.0f\/Q_FACTOR);\n- BiquadFilter_process(&state->Filter, &temp, &SamplesIn[0][i], 1);\n-\n- BufferOut[i] = temp;\n- }\n- \/* Now, mix the processed sound data to the output. *\/\n- MixSamples(BufferOut, NumChannels, SamplesOut, state->CurrentGains, state->TargetGains,\n- SamplesToDo, 0, SamplesToDo);\n-\n+ ALfloat (*restrict BufferOut)[BUFFERSIZE] = state->BufferOut;\n+ ALsizei c, i;\n+\n+ for(c = 0;c < CHANNELS; c++)\n+ {\n+ for(i = 0;i < SamplesToDo;i++)\n+ {\n+ ALfloat env_out, f0norm, temp;\n+\n+ env_out = envelope_follower(state, SamplesIn[c][i], c);\n+ f0norm = state->BandwidthNorm*env_out + state->FreqMinNorm;\n+\n+ BiquadFilter_setParams(&state->Chans[c].Filter, BiquadType_Peaking,\n+ state->ResonanceGain, f0norm, 1.0f\/Q_FACTOR);\n+ BiquadFilter_process(&state->Chans[c].Filter, &temp, &SamplesIn[c][i], 1);\n+\n+ BufferOut[c][i] = temp;\n+ }\n+ \/* Now, mix the processed sound data to the output. *\/\n+ MixSamples(BufferOut[c], NumChannels, SamplesOut, state->Chans[c].CurrentGains,\n+ state->Chans[c].TargetGains, SamplesToDo, 0, SamplesToDo);\n+ }\n }\n \n typedef struct AutowahStateFactory {\n"} {"commit":"138f082938a7f506c126e56176e46c2bff5de378","subject":"luasd: Fix a leak.","message":"luasd: Fix a leak.\n","repos":"jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/misc\/lua\/services_discovery.c\n+++ modules\/misc\/lua\/services_discovery.c\n@@ -57,7 +57,7 @@\n services_discovery_t *p_sd = ( services_discovery_t * )p_this;\n services_discovery_sys_t *p_sys;\n lua_State *L = NULL;\n- char *psz_name = strdup(p_sd->psz_name);\n+ char *psz_name = NULL;\n \n if( !strcmp(p_sd->psz_name, \"lua\"))\n {\n"} {"commit":"a6dff51c6bd1d5eb6528dff7f6e7b86f29430839","subject":"add dkek share hex print","message":"add dkek share hex print\n","repos":"jpki\/OpenSC,metsma\/OpenSC,mouse07410\/OpenSC,viktorTarasov\/OpenSC-SM,OpenSC\/OpenSC,CardContact\/OpenSC,mtrojnar\/OpenSC,philipWendland\/OpenSC,dengert\/OpenSC,OpenSC\/OpenSC,martinpaljak\/OpenSC,mtrojnar\/OpenSC,CardContact\/OpenSC,hhonkanen\/OpenSC,fabled\/OpenSC,martinpaljak\/OpenSC,Jakuje\/OpenSC,fabled\/OpenSC,philipWendland\/OpenSC,CardContact\/OpenSC,metsma\/OpenSC,mtrojnar\/OpenSC,hhonkanen\/OpenSC,hongquan\/OpenSC-main,viktorTarasov\/OpenSC-SM,philipWendland\/OpenSC,jpki\/OpenSC,frankmorgner\/OpenSC,frankmorgner\/OpenSC,hongquan\/OpenSC-main,dengert\/OpenSC,frankmorgner\/OpenSC,mouse07410\/OpenSC,fabled\/OpenSC,metsma\/OpenSC,OpenSC\/OpenSC,viktorTarasov\/OpenSC-SM,dengert\/OpenSC,rickyepoderi\/OpenSC,LudovicRousseau\/OpenSC,hhonkanen\/OpenSC,Jakuje\/OpenSC,AktivCo\/OpenSC,jpki\/OpenSC,Jakuje\/OpenSC,hongquan\/OpenSC-main,nmav\/OpenSC,mouse07410\/OpenSC,LudovicRousseau\/OpenSC,martinpaljak\/OpenSC,AktivCo\/OpenSC,nmav\/OpenSC,rickyepoderi\/OpenSC,nmav\/OpenSC,LudovicRousseau\/OpenSC,AktivCo\/OpenSC,frankmorgner\/OpenSC,Jakuje\/OpenSC,fabled\/OpenSC,rickyepoderi\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/sc-hsm-tool.c\n+++ src\/tools\/sc-hsm-tool.c\n@@ -77,6 +77,7 @@\n \t{ \"initialize\",\t\t\t\t0, NULL,\t\t'X' },\n \t{ \"create-dkek-share\",\t\t1, NULL,\t\t'C' },\n \t{ \"import-dkek-share\",\t\t1, NULL,\t\t'I' },\n+\t{ \"print-dkek-share\",\t\t1, NULL,\t\t'P' },\n \t{ \"wrap-key\",\t\t\t\t1, NULL,\t\t'W' },\n \t{ \"unwrap-key\",\t\t\t\t1, NULL,\t\t'U' },\n \t{ \"dkek-shares\",\t\t\t1, NULL,\t\t's' },\n@@ -99,6 +100,7 @@\n \t\"Initialize token\",\n \t\"Create DKEK key share and save to <filename>\",\n \t\"Import DKEK key share <filename>\",\n+\t\"Print HEX of DKEK key share <filename>\",\n \t\"Wrap key and save to <filename>\",\n \t\"Unwrap key read from <filename>\",\n \t\"Number of DKEK shares [No DKEK]\",\n@@ -834,7 +836,112 @@\n \treturn 0;\n }\n \n-\n+static int print_dkek_share(sc_card_t *card, const char *inf, int iter, const char *password, int num_of_password_shares)\n+{\n+\t\/\/ hex output can be used in the SCSH shell with the \n+\t\/\/ decrypt_keyblob.js file\n+\tsc_cardctl_sc_hsm_dkek_t dkekinfo;\n+\tEVP_CIPHER_CTX ctx;\n+\tFILE *in = NULL;\n+\tu8 filebuff[64],key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH],outbuff[64];\n+\tchar *pwd = NULL;\n+\tint r, outlen, pwdlen;\n+\tu8 i;\n+\n+\tif (inf == NULL) {\n+\t\tfprintf(stderr, \"No file name specified for DKEK share\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tin = fopen(inf, \"rb\");\n+\n+\tif (in == NULL) {\n+\t\tperror(inf);\n+\t\treturn -1;\n+\t}\n+\n+\tif (fread(filebuff, 1, sizeof(filebuff), in) != sizeof(filebuff)) {\n+\t\tperror(inf);\n+\t\tfclose(in);\n+\t\treturn -1;\n+\t}\n+\n+\tfclose(in);\n+\n+\tif (memcmp(filebuff, magic, sizeof(magic) - 1)) {\n+\t\tfprintf(stderr, \"File %s is not a DKEK share\\n\", inf);\n+\t\treturn -1;\n+\t}\n+\n+\tif (password == NULL) {\n+\n+\t\tif (num_of_password_shares == -1) {\n+\t\t\tprintf(\"Enter password to decrypt DKEK share : \");\n+\t\t\tutil_getpass(&pwd, NULL, stdin);\n+\t\t\tpwdlen = strlen(pwd);\n+\t\t\tprintf(\"\\n\");\n+\t\t} else {\n+\t\t\tr = recreate_password_from_shares(&pwd, &pwdlen, num_of_password_shares);\n+\t\t\tif (r < 0) {\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\n+\t} else {\n+\t\tpwd = (char *) password;\n+\t\tpwdlen = strlen(password);\n+\t}\n+\n+\tprintf(\"Deciphering DKEK share, please wait...\\n\");\n+\tEVP_BytesToKey(EVP_aes_256_cbc(), EVP_md5(), filebuff + 8, (u8 *)pwd, pwdlen, iter, key, iv);\n+\tOPENSSL_cleanse(pwd, strlen(pwd));\n+\n+\tif (password == NULL) {\n+\t\tfree(pwd);\n+\t}\n+\n+\tEVP_CIPHER_CTX_init(&ctx);\n+\tEVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, key, iv);\n+\tif (!EVP_DecryptUpdate(&ctx, outbuff, &outlen, filebuff + 16, sizeof(filebuff) - 16)) {\n+\t\tfprintf(stderr, \"Error decrypting DKEK share. Password correct ?\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (!EVP_DecryptFinal_ex(&ctx, outbuff + outlen, &r)) {\n+\t\tfprintf(stderr, \"Error decrypting DKEK share. Password correct ?\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tmemset(&dkekinfo, 0, sizeof(dkekinfo));\n+\tmemcpy(dkekinfo.dkek_share, outbuff, sizeof(dkekinfo.dkek_share));\n+\tdkekinfo.importShare = 1;\n+\n+\tOPENSSL_cleanse(outbuff, sizeof(outbuff));\n+\n+\tprintf(\"DKEK Share HEX: \\n\\n\");\n+\n+\tfor (i = 0; i < sizeof(dkekinfo.dkek_share); i++)\n+\t{\n+\t printf(\"%02X\", dkekinfo.dkek_share[i]);\n+\t}\n+\tprintf(\"\\n\\n\");\n+\n+\tOPENSSL_cleanse(&dkekinfo.dkek_share, sizeof(dkekinfo.dkek_share));\n+\tEVP_CIPHER_CTX_cleanup(&ctx);\n+\n+\tif (r == SC_ERROR_INS_NOT_SUPPORTED) {\t\t\t\/\/ Not supported or not initialized for key shares\n+\t\tfprintf(stderr, \"Not supported by card or card not initialized for key share usage\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (r < 0) {\n+\t\tfprintf(stderr, \"sc_card_ctl(*, SC_CARDCTL_SC_HSM_IMPORT_DKEK_SHARE, *) failed with %s\\n\", sc_strerror(r));\n+\t\treturn -1;\n+\t}\n+\t\/\/printf(\"DKEK share imported\\n\");\n+\t\/\/print_dkek_info(&dkekinfo);\n+\treturn 0;\n+}\n \n static void ask_for_password(char **pwd, int *pwdlen)\n {\n@@ -1533,6 +1640,7 @@\n \tint action_count = 0;\n \tint do_initialize = 0;\n \tint do_import_dkek_share = 0;\n+\tint do_print_dkek_share = 0;\n \tint do_create_dkek_share = 0;\n \tint do_wrap_key = 0;\n \tint do_unwrap_key = 0;\n@@ -1555,7 +1663,7 @@\n \tsetbuf(stdout, NULL);\n \n \twhile (1) {\n-\t\tc = getopt_long(argc, argv, \"XC:I:W:U:s:i:fr:wv\", options, &long_optind);\n+\t\tc = getopt_long(argc, argv, \"XC:I:P:W:U:s:i:fr:wv\", options, &long_optind);\n \t\tif (c == -1)\n \t\t\tbreak;\n \t\tif (c == '?')\n@@ -1575,6 +1683,11 @@\n \t\t\topt_filename = optarg;\n \t\t\taction_count++;\n \t\t\tbreak;\n+\t\tcase 'P':\n+\t\t\tdo_print_dkek_share = 1;\n+\t\t\topt_filename = optarg;\n+\t\t\taction_count++;\n+\t\t\tbreak;\n \t\tcase 'W':\n \t\t\tdo_wrap_key = 1;\n \t\t\topt_filename = optarg;\n@@ -1669,6 +1782,9 @@\n \t\tgoto fail;\n \n \tif (do_import_dkek_share && import_dkek_share(card, opt_filename, opt_iter, opt_password, opt_password_shares_total))\n+\t\tgoto fail;\n+\n+\tif (do_print_dkek_share && print_dkek_share(card, opt_filename, opt_iter, opt_password, opt_password_shares_total))\n \t\tgoto fail;\n \n \tif (do_wrap_key && wrap_key(card, opt_key_reference, opt_filename, opt_pin))\n"} {"commit":"e5dd1100c7d3493a8a3c6ac79468978009204104","subject":"[media] si2168: change stream id debug log formatter","message":"[media] si2168: change stream id debug log formatter\n\nChange formatter from signed to unsigned as stream_id is 32bit\nunsigned variable.\n\nSigned-off-by: Antti Palosaari <293134fe763ce2d9d8609280ea107c73cbd2eb86@iki.fi>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@osg.samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"23441be474d2e6c272913432ae25fbf509b551b8","subject":"Make the DYNLOAD LoadFSynth function non-inline","message":"Make the DYNLOAD LoadFSynth function non-inline\n","repos":"Wemersive\/openal-soft,aaronmjacobs\/openal-soft,alexxvk\/openal-soft,arkana-fts\/openal-soft,irungentoo\/openal-soft-tox,aaronmjacobs\/openal-soft,irungentoo\/openal-soft-tox,BeamNG\/openal-soft,arkana-fts\/openal-soft,Wemersive\/openal-soft,BeamNG\/openal-soft,alexxvk\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Alc\/midi\/fluidsynth.c\n+++ Alc\/midi\/fluidsynth.c\n@@ -91,7 +91,7 @@\n #define fluid_mod_set_amount pfluid_mod_set_amount\n #define fluid_mod_set_dest pfluid_mod_set_dest\n \n-static inline ALboolean LoadFSynth(void)\n+static ALboolean LoadFSynth(void)\n {\n ALboolean ret = AL_TRUE;\n if(!fsynth_handle)\n"} {"commit":"7a1372dd3cf6eb66c030482a45c90906f40e4905","subject":"Simplified a lot karaoke rendering in freetype.","message":"Simplified a lot karaoke rendering in freetype.\n\nIt is not as full featured as before, but it is much simpler and it will make\nit easier to improved the module.\n","repos":"krichter722\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/misc\/text_renderer\/freetype.c\n+++ modules\/misc\/text_renderer\/freetype.c\n@@ -204,9 +204,7 @@\n \/** list of relative positions for the glyphs *\/\n FT_Vector *p_glyph_pos;\n \/** list of RGB information for styled text *\/\n- uint32_t *p_fg_rgb;\n- uint32_t *p_bg_rgb;\n- uint8_t *p_fg_bg_ratio; \/* 0x00=100% FG --> 0x7F=100% BG *\/\n+ uint32_t *pi_color;\n \/** underline information -- only supplied if text should be underlined *\/\n int *pi_underline_offset;\n uint16_t *pi_underline_thickness;\n@@ -602,7 +600,7 @@\n \n \/* Calculate text color components\n * Only use the first color *\/\n- YUVFromRGB( p_line->p_fg_rgb[ 0 ], &i_y, &i_u, &i_v );\n+ YUVFromRGB( p_line->pi_color[ 0 ], &i_y, &i_u, &i_v );\n \n \/* Build palette *\/\n fmt.p_palette->i_entries = 16;\n@@ -945,28 +943,12 @@\n \n \/* Every glyph can (and in fact must) have its own color *\/\n uint8_t i_y, i_u, i_v;\n- YUVFromRGB( p_line->p_fg_rgb[ i ], &i_y, &i_u, &i_v );\n+ YUVFromRGB( p_line->pi_color[ i ], &i_y, &i_u, &i_v );\n \n for( y = 0, i_bitmap_offset = 0; y < p_glyph->bitmap.rows; y++ )\n {\n for( int x = 0; x < p_glyph->bitmap.width; x++, i_bitmap_offset++ )\n {\n- uint8_t i_y_local = i_y;\n- uint8_t i_u_local = i_u;\n- uint8_t i_v_local = i_v;\n-\n- if( p_line->p_fg_bg_ratio != 0x00 )\n- {\n- int i_split = p_glyph->bitmap.width *\n- p_line->p_fg_bg_ratio[ i ] \/ 0x7f;\n-\n- if( x > i_split )\n- {\n- YUVFromRGB( p_line->p_bg_rgb[ i ],\n- &i_y_local, &i_u_local, &i_v_local );\n- }\n- }\n-\n if( p_glyph->bitmap.buffer[i_bitmap_offset] )\n {\n p_dst_y[i_offset+x] = ((p_dst_y[i_offset+x] *(255-(int)p_glyph->bitmap.buffer[i_bitmap_offset])) +\n@@ -1602,9 +1584,7 @@\n \n free( p_line->pp_glyphs );\n free( p_line->p_glyph_pos );\n- free( p_line->p_fg_rgb );\n- free( p_line->p_bg_rgb );\n- free( p_line->p_fg_bg_ratio );\n+ free( p_line->pi_color );\n free( p_line->pi_underline_offset );\n free( p_line->pi_underline_thickness );\n free( p_line );\n@@ -1635,14 +1615,12 @@\n \n p_line->pp_glyphs = calloc( i_count + 1, sizeof(*p_line->pp_glyphs) );\n p_line->p_glyph_pos = calloc( i_count + 1, sizeof(*p_line->p_glyph_pos) );\n- p_line->p_fg_rgb = calloc( i_count + 1, sizeof(*p_line->p_fg_rgb) );\n- p_line->p_bg_rgb = calloc( i_count + 1, sizeof(*p_line->p_bg_rgb) );\n- p_line->p_fg_bg_ratio = calloc( i_count + 1, sizeof(*p_line->p_fg_bg_ratio) );\n+ p_line->pi_color = calloc( i_count + 1, sizeof(*p_line->pi_color) );\n p_line->pi_underline_offset = calloc( i_count + 1, sizeof(*p_line->pi_underline_offset) );\n p_line->pi_underline_thickness = calloc( i_count + 1, sizeof(*p_line->pi_underline_thickness) );\n \n if( !p_line->pp_glyphs || !p_line->p_glyph_pos ||\n- !p_line->p_fg_rgb || !p_line->p_bg_rgb || !p_line->p_fg_bg_ratio ||\n+ !p_line->pi_color ||\n !p_line->pi_underline_offset || !p_line->pi_underline_thickness )\n {\n FreeLine( p_line );\n@@ -1654,7 +1632,8 @@\n \n static int RenderTag( filter_t *p_filter, FT_Face p_face,\n const text_style_t *p_style,\n- line_desc_t *p_line, uint32_t *psz_unicode,\n+ line_desc_t *p_line,\n+ uint32_t *psz_unicode, uint8_t *pi_karaoke_bar,\n int *pi_pen_x, int i_pen_y, int *pi_start,\n FT_Vector *p_result )\n {\n@@ -1667,6 +1646,7 @@\n int i_pen_x_start = *pi_pen_x;\n \n uint32_t *psz_unicode_start = psz_unicode;\n+ uint8_t *pi_karaoke_bar_start = pi_karaoke_bar;\n \n line.xMin = line.xMax = line.yMin = line.yMax = 0;\n \n@@ -1696,6 +1676,8 @@\n int i_error;\n \n int i_glyph_index = FT_Get_Char_Index( p_face, *psz_unicode++ );\n+ int i_karaoke_bar = pi_karaoke_bar ? *pi_karaoke_bar++ : 0;\n+\n if( FT_HAS_KERNING( p_face ) && i_glyph_index\n && i_previous )\n {\n@@ -1769,9 +1751,8 @@\n }\n \n p_line->pp_glyphs[ i ] = (FT_BitmapGlyph)tmp_glyph;\n- p_line->p_fg_rgb[ i ] = p_style->i_font_color;\n- p_line->p_bg_rgb[ i ] = p_style->i_karaoke_background_color;\n- p_line->p_fg_bg_ratio[ i ] = 0x00;\n+ p_line->pi_color[ i ] = i_karaoke_bar == 0 ? p_style->i_font_color\n+ : p_style->i_karaoke_background_color;\n \n line.xMax = p_line->p_glyph_pos[i].x + glyph_size.xMax -\n glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left;\n@@ -1784,6 +1765,8 @@\n while( psz_unicode > psz_unicode_start && *psz_unicode != ' ' )\n {\n psz_unicode--;\n+ if( pi_karaoke_bar )\n+ pi_karaoke_bar--;\n }\n if( psz_unicode == psz_unicode_start )\n {\n@@ -1810,6 +1793,7 @@\n *psz_unicode = '\\n';\n }\n psz_unicode = psz_unicode_start;\n+ pi_karaoke_bar = pi_karaoke_bar_start;\n *pi_pen_x = i_pen_x_start;\n i_previous = 0;\n \n@@ -1960,22 +1944,11 @@\n uint32_t *p_fribidi_string = NULL;\n text_style_t **pp_fribidi_styles = NULL;\n int *p_new_positions = NULL;\n- uint8_t *pi_karaoke_bar = NULL;\n int i_prev;\n \n- if( pi_k_dates )\n- {\n- pi_karaoke_bar = malloc( i_len * sizeof(*pi_karaoke_bar));\n- \/* If we can't allocate sufficient memory for karaoke, continue anyway -\n- * we just won't be able to display the progress bar; at least we'll\n- * get the text.\n- *\/\n- }\n-\n #if defined(HAVE_FRIBIDI)\n {\n int *p_old_positions;\n- int8_t *p_levels;\n int start_pos, pos = 0;\n \n pp_fribidi_styles = calloc( i_len, sizeof(*pp_fribidi_styles) );\n@@ -1983,20 +1956,16 @@\n p_fribidi_string = malloc( (i_len + 1) * sizeof(*p_fribidi_string) );\n p_old_positions = malloc( (i_len + 1) * sizeof(*p_old_positions) );\n p_new_positions = malloc( (i_len + 1) * sizeof(*p_new_positions) );\n- p_levels = malloc( (i_len + 1) * sizeof(*p_levels) );\n \n if( ! pp_fribidi_styles ||\n ! p_fribidi_string ||\n ! p_old_positions ||\n- ! p_new_positions ||\n- ! p_levels )\n- {\n- free( p_levels );\n+ ! p_new_positions )\n+ {\n free( p_old_positions );\n free( p_new_positions );\n free( p_fribidi_string );\n free( pp_fribidi_styles );\n- free( pi_karaoke_bar );\n return VLC_ENOMEM;\n }\n \n@@ -2009,7 +1978,6 @@\n p_fribidi_string[pos] = psz_text[pos];\n pp_fribidi_styles[pos] = pp_styles[pos];\n p_new_positions[pos] = pos;\n- p_levels[pos] = 0;\n ++pos;\n }\n start_pos = pos;\n@@ -2030,7 +1998,7 @@\n (FriBidiChar*)p_fribidi_string + start_pos,\n p_new_positions + start_pos,\n p_old_positions,\n- p_levels + start_pos );\n+ NULL );\n for( int j = start_pos; j < pos; j++ )\n {\n pp_fribidi_styles[ j ] = pp_styles[ start_pos + p_old_positions[j - start_pos] ];\n@@ -2040,23 +2008,24 @@\n }\n p_fribidi_string[ i_len ] = 0;\n free( p_old_positions );\n- free( p_levels );\n \n pp_styles = pp_fribidi_styles;\n psz_text = p_fribidi_string;\n }\n #endif\n \/* Work out the karaoke *\/\n- if( pi_karaoke_bar )\n- {\n- int64_t i_elapsed = var_GetTime( p_filter, \"spu-elapsed\" ) \/ 1000;\n- for( int i = 0; i < i_len; i++ )\n- {\n- unsigned i_bar = p_new_positions ? p_new_positions[i] : i;\n- if( pi_k_dates[i] < i_elapsed )\n- pi_karaoke_bar[i_bar] = 0x7f;\n- else\n- pi_karaoke_bar[i_bar] = 0x00;\n+ uint8_t *pi_karaoke_bar = NULL;\n+ if( pi_k_dates )\n+ {\n+ pi_karaoke_bar = malloc( i_len * sizeof(*pi_karaoke_bar));\n+ if( pi_karaoke_bar )\n+ {\n+ int64_t i_elapsed = var_GetTime( p_filter, \"spu-elapsed\" ) \/ 1000;\n+ for( int i = 0; i < i_len; i++ )\n+ {\n+ unsigned i_bar = p_new_positions ? p_new_positions[i] : i;\n+ pi_karaoke_bar[i_bar] = pi_k_dates[i] >= i_elapsed;\n+ }\n }\n }\n free( p_new_positions );\n@@ -2131,7 +2100,8 @@\n \n if( RenderTag( p_filter, p_face ? p_face : p_sys->p_face,\n p_style,\n- p_line, psz_unicode, &i_pen_x, i_pen_y, &i_posn,\n+ p_line, psz_unicode, pi_karaoke_bar ? &pi_karaoke_bar[i_prev] : NULL,\n+ &i_pen_x, i_pen_y, &i_posn,\n &tmp_result ) != VLC_SUCCESS )\n {\n if( p_face ) FT_Done_Face( p_face );\n@@ -2168,51 +2138,12 @@\n }\n free( pp_fribidi_styles );\n free( p_fribidi_string );\n+ free( pi_karaoke_bar );\n \n if( p_line )\n {\n p_result->x = __MAX( p_result->x, tmp_result.x );\n p_result->y += tmp_result.y;\n- }\n-\n- if( pi_karaoke_bar )\n- {\n- int i = 0;\n- for( p_line = *pp_lines; p_line; p_line=p_line->p_next )\n- {\n- for( uint32_t k = 0; p_line->pp_glyphs[ k ]; k++, i++ )\n- {\n- if( (pi_karaoke_bar[ i ] & 0x7f) == 0x7f)\n- {\n- \/* do nothing *\/\n- }\n- else if( (pi_karaoke_bar[ i ] & 0x7f) == 0x00)\n- {\n- \/* 100% BG colour will render faster if we\n- * instead make it 100% FG colour, so leave\n- * the ratio alone and copy the value across\n- *\/\n- p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];\n- }\n- else\n- {\n- if( pi_karaoke_bar[ i ] & 0x80 )\n- {\n- \/* Swap Left and Right sides over for Right aligned\n- * language text (eg. Arabic, Hebrew)\n- *\/\n- uint32_t i_tmp = p_line->p_fg_rgb[ k ];\n-\n- p_line->p_fg_rgb[ k ] = p_line->p_bg_rgb[ k ];\n- p_line->p_bg_rgb[ k ] = i_tmp;\n- }\n- p_line->p_fg_bg_ratio[ k ] = (pi_karaoke_bar[ i ] & 0x7f);\n- }\n- }\n- \/* Jump over the '\\n' at the line-end *\/\n- i++;\n- }\n- free( pi_karaoke_bar );\n }\n \n return VLC_SUCCESS;\n"} {"commit":"3f51451b516eeb19d3c1ea311ee8845fc80b5135","subject":"V4L\/DVB (6894): xc5000: fix build warning","message":"V4L\/DVB (6894): xc5000: fix build warning\n\nFix the following build warning:\n\nxc5000.c:560: warning: format '%d' expects type 'int',\n\t but argument 2 has type 'size_t'\n\nOn many architectrues size_t is unsigned long, and may not be printed with %d.\nUse %Zu instead.\n\n\nSigned-off-by: Michael Krufky <00524723a60798c74a43fcc620c25dd7b9ece078@linuxtv.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/frontends\/xc5000.c\n+++ drivers\/media\/dvb\/frontends\/xc5000.c\n@@ -533,7 +533,8 @@\n \t\tprintk(KERN_ERR \"xc5000: Upload failed. (file not found?)\\n\");\n \t\tret = XC_RESULT_RESET_FAILURE;\n \t} else {\n-\t\tprintk(KERN_INFO \"xc5000: firmware read %d bytes.\\n\", fw->size);\n+\t\tprintk(KERN_INFO \"xc5000: firmware read %Zu bytes.\\n\",\n+\t\t fw->size);\n \t\tret = XC_RESULT_SUCCESS;\n \t}\n \n"} {"commit":"2a8f96085449f3aa6fe99b27d7ee506e808059b9","subject":"V4L\/DVB: configurable IRQ from CAM","message":"V4L\/DVB: configurable IRQ from CAM\n\nIRQ from CAM disabled by default. In some environment enabled IRQ can cause of\nmachine freeze.\n\nSigned-off-by: Abylay Ospan <be07f729d89a57ac75a50cd497cd1728d1aa5301@netup.ru>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/cx23885\/cimax2.c\n+++ drivers\/media\/video\/cx23885\/cimax2.c\n@@ -60,11 +60,17 @@\n module_param(ci_dbg, int, 0644);\n MODULE_PARM_DESC(ci_dbg, \"Enable CI debugging\");\n \n+static unsigned int ci_irq_enable;\n+module_param(ci_irq_enable, int, 0644);\n+MODULE_PARM_DESC(ci_irq_enable, \"Enable IRQ from CAM\");\n+\n #define ci_dbg_print(args...) \\\n \tdo { \\\n \t\tif (ci_dbg) \\\n \t\t\tprintk(KERN_DEBUG args); \\\n \t} while (0)\n+\n+#define ci_irq_flags() (ci_irq_enable ? NETUP_IRQ_IRQAM : 0)\n \n \/* stores all private variables for communication with CI *\/\n struct netup_ci_state {\n@@ -392,7 +398,7 @@\n \tif (0 != slot)\n \t\treturn -EINVAL;\n \n-\tnetup_ci_set_irq(en50221, open ? (NETUP_IRQ_DETAM | NETUP_IRQ_IRQAM)\n+\tnetup_ci_set_irq(en50221, open ? (NETUP_IRQ_DETAM | ci_irq_flags())\n \t\t\t: NETUP_IRQ_DETAM);\n \n \treturn state->status;\n@@ -429,7 +435,7 @@\n \t\t0x01, \/* power on (use it like store place) *\/\n \t\t0x00, \/* RFU *\/\n \t\t0x00, \/* int status read only *\/\n-\t\tNETUP_IRQ_IRQAM | NETUP_IRQ_DETAM, \/* DETAM, IRQAM unmasked *\/\n+\t\tci_irq_flags() | NETUP_IRQ_DETAM, \/* DETAM, IRQAM unmasked *\/\n \t\t0x05, \/* EXTINT=active-high, INT=push-pull *\/\n \t\t0x00, \/* USCG1 *\/\n \t\t0x04, \/* ack active low *\/\n@@ -470,7 +476,7 @@\n \tstate->ca.poll_slot_status = netup_poll_ci_slot_status;\n \tstate->ca.data = state;\n \tstate->priv = port;\n-\tstate->current_irq_mode = NETUP_IRQ_IRQAM | NETUP_IRQ_DETAM;\n+\tstate->current_irq_mode = ci_irq_flags() | NETUP_IRQ_DETAM;\n \n \tret = netup_write_i2c(state->i2c_adap, state->ci_i2c_addr,\n \t\t\t\t\t\t0, &cimax_init[0], 34);\n"} {"commit":"f6210c9160dff82ceaaf5e59cf5f8fcd6bdefa38","subject":"V4L\/DVB (6085): cx88-alsa: Fix mmap support","message":"V4L\/DVB (6085): cx88-alsa: Fix mmap support\n\nThe driver has long claimed to support mmap, but it didn't work at all. Some\nof the dma buffer parameters weren't set, and since video_buf uses vmalloc to\nallocate the buffer, a page callback is needed too.\n\nSigned-off-by: Trent Piepho <ab69db8315af7de6e673a6ddf128d415157a7c3f@speakeasy.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/cx88\/cx88-alsa.c\n+++ drivers\/media\/video\/cx88\/cx88-alsa.c\n@@ -28,6 +28,7 @@\n #include <linux\/init.h>\n #include <linux\/device.h>\n #include <linux\/interrupt.h>\n+#include <linux\/vmalloc.h>\n #include <linux\/dma-mapping.h>\n #include <linux\/pci.h>\n \n@@ -423,6 +424,8 @@\n \tchip->dma_risc = buf->vb.dma;\n \n \tsubstream->runtime->dma_area = chip->dma_risc.vmalloc;\n+\tsubstream->runtime->dma_bytes = chip->dma_size;\n+\tsubstream->runtime->dma_addr = 0;\n \treturn 0;\n \n error:\n@@ -500,6 +503,16 @@\n }\n \n \/*\n+ * page callback (needed for mmap)\n+ *\/\n+static struct page *snd_cx88_page(struct snd_pcm_substream *substream,\n+\t\t\t\tunsigned long offset)\n+{\n+\tvoid *pageptr = substream->runtime->dma_area + offset;\n+\treturn vmalloc_to_page(pageptr);\n+}\n+\n+\/*\n * operators\n *\/\n static struct snd_pcm_ops snd_cx88_pcm_ops = {\n@@ -511,6 +524,7 @@\n \t.prepare = snd_cx88_prepare,\n \t.trigger = snd_cx88_card_trigger,\n \t.pointer = snd_cx88_pointer,\n+\t.page = snd_cx88_page,\n };\n \n \/*\n"} {"commit":"89f0863c4225aaed2763f526815c54a9e1b0f788","subject":"V4L\/DVB (12618): gspca: mr97310a add support for CIF and more VGA camera's","message":"V4L\/DVB (12618): gspca: mr97310a add support for CIF and more VGA camera's\n\nThis patch adds supports for mr97310a camera's with CIF sensors (2 different\ntypes) and for VGA mr97310a camera with a different sensor then supported\nuntil now.\n\nThis patch also add support for controls for one of the 2 CIF sensors, this\nwas written by Thomas Kaiser <5f50a84c1fa3bcff146405017f36aec1a10a9e38@kaiser-linux.li>\n\nSigned-off-by: Theodore Kilgore <c9104a9f29bcc89215472387b083146c6cabb056@auburn.edu>\nSigned-off-by: Thomas Kaiser <5f50a84c1fa3bcff146405017f36aec1a10a9e38@kaiser-linux.li>\nSigned-off-by: Hans de Goede <ba4800e08c8c6fd6aae83ee6311e250b81d17120@redhat.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/gspca\/mr97310a.c\n+++ drivers\/media\/video\/gspca\/mr97310a.c\n@@ -2,6 +2,21 @@\n * Mars MR97310A library\n *\n * Copyright (C) 2009 Kyle Guinn <elyk03@gmail.com>\n+ *\n+ * Support for the MR97310A cameras in addition to the Aiptek Pencam VGA+\n+ * and for the routines for detecting and classifying these various cameras,\n+ *\n+ * Copyright (C) 2009 Theodore Kilgore <kilgota@auburn.edu>\n+ *\n+ * Acknowledgements:\n+ *\n+ * The MR97311A support in gspca\/mars.c has been helpful in understanding some\n+ * of the registers in these cameras.\n+ *\n+ * Hans de Goede <hdgoede@redhat.com> and\n+ * Thomas Kaiser <thomas@kaiser-linux.li>\n+ * have assisted with their experience. Each of them has also helped by\n+ * testing a previously unsupported camera.\n *\n * This program is free software; you can redistribute it and\/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -22,7 +37,23 @@\n \n #include \"gspca.h\"\n \n-MODULE_AUTHOR(\"Kyle Guinn <elyk03@gmail.com>\");\n+#define CAM_TYPE_CIF\t\t\t0\n+#define CAM_TYPE_VGA\t\t\t1\n+\n+#define MR97310A_BRIGHTNESS_MIN\t\t-254\n+#define MR97310A_BRIGHTNESS_MAX\t\t255\n+#define MR97310A_BRIGHTNESS_DEFAULT\t0\n+\n+#define MR97310A_EXPOSURE_MIN\t\t300\n+#define MR97310A_EXPOSURE_MAX\t\t4095\n+#define MR97310A_EXPOSURE_DEFAULT\t1000\n+\n+#define MR97310A_GAIN_MIN\t\t0\n+#define MR97310A_GAIN_MAX\t\t31\n+#define MR97310A_GAIN_DEFAULT\t\t25\n+\n+MODULE_AUTHOR(\"Kyle Guinn <elyk03@gmail.com>,\"\n+\t \"Theodore Kilgore <kilgota@auburn.edu>\");\n MODULE_DESCRIPTION(\"GSPCA\/Mars-Semi MR97310A USB Camera Driver\");\n MODULE_LICENSE(\"GPL\");\n \n@@ -30,10 +61,75 @@\n struct sd {\n \tstruct gspca_dev gspca_dev; \/* !! must be the first item *\/\n \tu8 sof_read;\n+\tu8 cam_type;\t\/* 0 is CIF and 1 is VGA *\/\n+\tu8 sensor_type;\t\/* We use 0 and 1 here, too. *\/\n+\tu8 do_lcd_stop;\n+\tu8 regs[15];\n+\n+\tint brightness;\n+\tu16 exposure;\n+\tu8 autogain;\n+\tu8 gain;\n };\n+\n+struct sensor_w_data {\n+\tu8 reg;\n+\tu8 flags;\n+\tu8 data[16];\n+\tint len;\n+};\n+\n+static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);\n+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);\n+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val);\n+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val);\n+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val);\n+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val);\n \n \/* V4L2 controls supported by the driver *\/\n static struct ctrl sd_ctrls[] = {\n+\t{\n+\t\t{\n+\t\t\t.id = V4L2_CID_BRIGHTNESS,\n+\t\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n+\t\t\t.name = \"Brightness\",\n+\t\t\t.minimum = MR97310A_BRIGHTNESS_MIN,\n+\t\t\t.maximum = MR97310A_BRIGHTNESS_MAX,\n+\t\t\t.step = 1,\n+\t\t\t.default_value = MR97310A_BRIGHTNESS_DEFAULT,\n+\t\t\t.flags = 0,\n+\t\t},\n+\t\t.set = sd_setbrightness,\n+\t\t.get = sd_getbrightness,\n+\t},\n+\t{\n+\t\t{\n+\t\t\t.id = V4L2_CID_EXPOSURE,\n+\t\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n+\t\t\t.name = \"Exposure\",\n+\t\t\t.minimum = MR97310A_EXPOSURE_MIN,\n+\t\t\t.maximum = MR97310A_EXPOSURE_MAX,\n+\t\t\t.step = 1,\n+\t\t\t.default_value = MR97310A_EXPOSURE_DEFAULT,\n+\t\t\t.flags = 0,\n+\t\t},\n+\t\t.set = sd_setexposure,\n+\t\t.get = sd_getexposure,\n+\t},\n+\t{\n+\t\t{\n+\t\t\t.id = V4L2_CID_GAIN,\n+\t\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n+\t\t\t.name = \"Gain\",\n+\t\t\t.minimum = MR97310A_GAIN_MIN,\n+\t\t\t.maximum = MR97310A_GAIN_MAX,\n+\t\t\t.step = 1,\n+\t\t\t.default_value = MR97310A_GAIN_DEFAULT,\n+\t\t\t.flags = 0,\n+\t\t},\n+\t\t.set = sd_setgain,\n+\t\t.get = sd_getgain,\n+\t},\n };\n \n static const struct v4l2_pix_format vga_mode[] = {\n@@ -65,7 +161,7 @@\n };\n \n \/* the bytes to write are in gspca_dev->usb_buf *\/\n-static int reg_w(struct gspca_dev *gspca_dev, int len)\n+static int mr_write(struct gspca_dev *gspca_dev, int len)\n {\n \tint rc;\n \n@@ -78,15 +174,200 @@\n \treturn rc;\n }\n \n+\/* the bytes are read into gspca_dev->usb_buf *\/\n+static int mr_read(struct gspca_dev *gspca_dev, int len)\n+{\n+\tint rc;\n+\n+\trc = usb_bulk_msg(gspca_dev->dev,\n+\t\t\t usb_rcvbulkpipe(gspca_dev->dev, 3),\n+\t\t\t gspca_dev->usb_buf, len, NULL, 500);\n+\tif (rc < 0)\n+\t\tPDEBUG(D_ERR, \"reg read [%02x] error %d\",\n+\t\t gspca_dev->usb_buf[0], rc);\n+\treturn rc;\n+}\n+\n+static int sensor_write_reg(struct gspca_dev *gspca_dev, u8 reg, u8 flags,\n+\tconst u8 *data, int len)\n+{\n+\tgspca_dev->usb_buf[0] = 0x1f;\n+\tgspca_dev->usb_buf[1] = flags;\n+\tgspca_dev->usb_buf[2] = reg;\n+\tmemcpy(gspca_dev->usb_buf + 3, data, len);\n+\n+\treturn mr_write(gspca_dev, len + 3);\n+}\n+\n+static int sensor_write_regs(struct gspca_dev *gspca_dev,\n+\tconst struct sensor_w_data *data, int len)\n+{\n+\tint i, rc;\n+\n+\tfor (i = 0; i < len; i++) {\n+\t\trc = sensor_write_reg(gspca_dev, data[i].reg, data[i].flags,\n+\t\t\t\t\t data[i].data, data[i].len);\n+\t\tif (rc < 0)\n+\t\t\treturn rc;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int sensor_write1(struct gspca_dev *gspca_dev, u8 reg, u8 data)\n+{\n+\tu8 buf;\n+\tint rc;\n+\n+\tbuf = data;\n+\trc = sensor_write_reg(gspca_dev, reg, 0x01, &buf, 1);\n+\tif (rc < 0)\n+\t\treturn rc;\n+\n+\tbuf = 0x01;\n+\trc = sensor_write_reg(gspca_dev, 0x13, 0x00, &buf, 1);\n+\tif (rc < 0)\n+\t\treturn rc;\n+\n+\treturn 0;\n+}\n+\n+static int cam_get_response16(struct gspca_dev *gspca_dev)\n+{\n+\t__u8 *data = gspca_dev->usb_buf;\n+\tint err_code;\n+\n+\tdata[0] = 0x21;\n+\terr_code = mr_write(gspca_dev, 1);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = mr_read(gspca_dev, 16);\n+\treturn err_code;\n+}\n+\n+static int zero_the_pointer(struct gspca_dev *gspca_dev)\n+{\n+\t__u8 *data = gspca_dev->usb_buf;\n+\tint err_code;\n+\tu8 status = 0;\n+\tint tries = 0;\n+\n+\terr_code = cam_get_response16(gspca_dev);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = mr_write(gspca_dev, 1);\n+\tdata[0] = 0x19;\n+\tdata[1] = 0x51;\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = cam_get_response16(gspca_dev);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tdata[0] = 0x19;\n+\tdata[1] = 0xba;\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = cam_get_response16(gspca_dev);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tdata[0] = 0x19;\n+\tdata[1] = 0x00;\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = cam_get_response16(gspca_dev);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tdata[0] = 0x19;\n+\tdata[1] = 0x00;\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\twhile (status != 0x0a && tries < 256) {\n+\t\terr_code = cam_get_response16(gspca_dev);\n+\t\tstatus = data[0];\n+\t\ttries++;\n+\t\tif (err_code < 0)\n+\t\t\treturn err_code;\n+\t}\n+\tPDEBUG(D_ERR, \"status is %02x\", status);\n+\n+\ttries = 0;\n+\twhile (tries < 4) {\n+\t\tdata[0] = 0x19;\n+\t\tdata[1] = 0x00;\n+\t\terr_code = mr_write(gspca_dev, 2);\n+\t\tif (err_code < 0)\n+\t\t\treturn err_code;\n+\n+\t\terr_code = cam_get_response16(gspca_dev);\n+\t\tstatus = data[0];\n+\t\ttries++;\n+\t\tif (err_code < 0)\n+\t\t\treturn err_code;\n+\t}\n+\tPDEBUG(D_ERR, \"Read 16 bytes from camera\");\n+\n+\tdata[0] = 0x19;\n+\terr_code = mr_write(gspca_dev, 1);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = mr_read(gspca_dev, 16);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\treturn 0;\n+}\n+\n+static u8 get_sensor_id(struct gspca_dev *gspca_dev)\n+{\n+\tint err_code;\n+\n+\tgspca_dev->usb_buf[0] = 0x1e;\n+\terr_code = mr_write(gspca_dev, 1);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = mr_read(gspca_dev, 16);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tPDEBUG(D_ERR, \"Read 16 bytes from camera\");\n+\tPDEBUG(D_ERR, \"Byte zero reported is %01x\", gspca_dev->usb_buf[0]);\n+\n+\treturn gspca_dev->usb_buf[0];\n+}\n+\n \/* this function is called at probe time *\/\n static int sd_config(struct gspca_dev *gspca_dev,\n \t\t const struct usb_device_id *id)\n {\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n \tstruct cam *cam;\n \n \tcam = &gspca_dev->cam;\n \tcam->cam_mode = vga_mode;\n \tcam->nmodes = ARRAY_SIZE(vga_mode);\n+\tsd->cam_type = CAM_TYPE_VGA;\n+\tPDEBUG(D_PROBE,\n+\t\t\"MR97310A camera detected\"\n+\t\t\" (vid\/pid 0x%04X:0x%04X)\", id->idVendor, id->idProduct);\n+\tif (id->idProduct == 0x010e) {\n+\t\tcam->nmodes--;\n+\t\tsd->cam_type = CAM_TYPE_CIF;\n+\t}\n \treturn 0;\n }\n \n@@ -96,29 +377,259 @@\n \treturn 0;\n }\n \n-static int sd_start(struct gspca_dev *gspca_dev)\n+static int adjust_cif_sensor(struct gspca_dev *gspca_dev)\n+{\n+\t\/*\n+\t * FIXME: The following sequence resets brightness, contrast, and\n+\t * related settings. Some of the values are adjustable, presumably\n+\t * based upon what is detected in the frames. Here, only some\n+\t * vaules are used which are compromises. When more is known about\n+\t * what is done here, this needs to be moved out to presently\n+\t * nonexistent functions which do controls. The same control messages\n+\t * do work for all of the CIF cameras.\n+\t *\/\n+\n+\tconst struct sensor_w_data cif_sensor1_adjust_data[] = {\n+\t\t{0x02, 0x01, {0x10, 0x12, 0x0a}, 3},\n+\t\t\/* Last or possibly two last bytes adjustable, above. *\/\n+\t\t{0x13, 0x04, {0x01}, 1}, \/* seems to mean \"write\" *\/\n+\t\t{0x05, 0x01, {0x22, 0x00, 0x81, 0x06}, 4},\n+\t\t\/* Last or possibly two last bytes adjustable, above. *\/\n+\t\t{0x13, 0x04, {0x01}, 1},\n+\t\t{0x09, 0x02, {0x05, 0x00, 0x00, 0x05, 0x07, 0x16}, 6},\n+\t\t\/* Last or possibly two last bytes adjustable, above. *\/\n+\t\t{0x13, 0x04, {0x01}, 1},\n+\t\t{0, 0, {0}, 0}\n+\t};\n+\n+\treturn sensor_write_regs(gspca_dev, cif_sensor1_adjust_data,\n+\t\t\t\t ARRAY_SIZE(cif_sensor1_adjust_data));\n+}\n+\n+static int start_cif_cam(struct gspca_dev *gspca_dev)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \t__u8 *data = gspca_dev->usb_buf;\n \tint err_code;\n-\n-\tsd->sof_read = 0;\n-\n-\t\/* Note: register descriptions guessed from MR97113A driver *\/\n-\n+\tconst __u8 startup_string[] = {\n+\t\t0x00,\n+\t\t0x0d,\n+\t\t0x01,\n+\t\t0x00, \/* Hsize\/8 for 352 or 320 *\/\n+\t\t0x00, \/* Vsize\/4 for 288 or 240 *\/\n+\t\t0x13, \/* or 0xbb, depends on sensor *\/\n+\t\t0x00, \/* Hstart, depends on res. *\/\n+\t\t0x00, \/* reserved ? *\/\n+\t\t0x00, \/* Vstart, depends on res. and sensor *\/\n+\t\t0x50, \/* 0x54 to get 176 or 160 *\/\n+\t\t0xc0\n+\t};\n+\n+\t\/* Note: Some of the above descriptions guessed from MR97113A driver *\/\n+\tsd->sensor_type = 0;\n \tdata[0] = 0x01;\n \tdata[1] = 0x01;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tmsleep(200);\n+\tdata[0] = get_sensor_id(gspca_dev);\n+\t\/*\n+\t * Known CIF cameras. If you have another to report, please do\n+\t *\n+\t * Name\t\t\tbyte just read\t\tsd->sensor_type\n+\t *\t\t\t\t\treported by\n+\t * Sakar Spy-shot\t0x28\t\tT. Kilgore\t0\n+\t * Innovage\t\t0xf5 (unstable)\tT. Kilgore\t0\n+\t * Vivitar Mini\t\t0x53\t\tH. De Goede\t0\n+\t * Vivitar Mini\t\t0x08\t\tT. Kilgore\t1\n+\t * Elta-Media 8212dc\t0x23\t\tT. Kaiser\t1\n+\t * Philips dig. keych.\t0x37\t\tT. Kilgore\t1\n+\t *\/\n+\tif ((data[0] & 0x78) == 8 || (data[0] & 0x2) == 0x2)\n+\t\tsd->sensor_type = 1;\n+\n+\tPDEBUG(D_ERR, \"Sensor type is %01x\", sd->sensor_type);\n+\tmemcpy(data, startup_string, 11);\n+\tif (sd->sensor_type)\n+\t\tdata[5] = 0xbb;\n+\n+\tswitch (gspca_dev->width) {\n+\tcase 160:\n+\t\tdata[9] |= 0x04; \/* reg 8, 2:1 scale down from 320 *\/\n+\t\t\/* fall thru *\/\n+\tcase 320:\n+\tdefault:\n+\t\tdata[3] = 0x28;\t\t\t \/* reg 2, H size\/8 *\/\n+\t\tdata[4] = 0x3c;\t\t\t \/* reg 3, V size\/4 *\/\n+\t\tdata[6] = 0x14;\t\t\t \/* reg 5, H start *\/\n+\t\tdata[8] = 0x1a + sd->sensor_type; \/* reg 7, V start *\/\n+\t\tbreak;\n+\tcase 176:\n+\t\tdata[9] |= 0x04; \/* reg 8, 2:1 scale down from 352 *\/\n+\t\t\/* fall thru *\/\n+\tcase 352:\n+\t\tdata[3] = 0x2c;\t\t\t \/* reg 2, H size\/8 *\/\n+\t\tdata[4] = 0x48;\t\t\t \/* reg 3, V size\/4 *\/\n+\t\tdata[6] = 0x06;\t\t\t \/* reg 5, H start *\/\n+\t\tdata[8] = 0x06 + sd->sensor_type; \/* reg 7, V start *\/\n+\t\tbreak;\n+\t}\n+\terr_code = mr_write(gspca_dev, 11);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tif (!sd->sensor_type) {\n+\t\tconst struct sensor_w_data cif_sensor0_init_data[] = {\n+\t\t\t{0x02, 0x00, {0x03, 0x5a, 0xb5, 0x01,\n+\t\t\t\t 0x0f, 0x14, 0x0f, 0x10}, 8},\n+\t\t\t{0x0c, 0x00, {0x04, 0x01, 0x01, 0x00, 0x1f}, 5},\n+\t\t\t{0x12, 0x00, {0x07}, 1},\n+\t\t\t{0x1f, 0x00, {0x06}, 1},\n+\t\t\t{0x27, 0x00, {0x04}, 1},\n+\t\t\t{0x29, 0x00, {0x0c}, 1},\n+\t\t\t{0x40, 0x00, {0x40, 0x00, 0x04}, 3},\n+\t\t\t{0x50, 0x00, {0x60}, 1},\n+\t\t\t{0x60, 0x00, {0x06}, 1},\n+\t\t\t{0x6b, 0x00, {0x85, 0x85, 0xc8, 0xc8, 0xc8, 0xc8}, 6},\n+\t\t\t{0x72, 0x00, {0x1e, 0x56}, 2},\n+\t\t\t{0x75, 0x00, {0x58, 0x40, 0xa2, 0x02, 0x31, 0x02,\n+\t\t\t\t 0x31, 0x80, 0x00}, 9},\n+\t\t\t{0x11, 0x00, {0x01}, 1},\n+\t\t\t{0, 0, {0}, 0}\n+\t\t};\n+\t\terr_code = sensor_write_regs(gspca_dev, cif_sensor0_init_data,\n+\t\t\t\t\t ARRAY_SIZE(cif_sensor0_init_data));\n+\t} else {\t\/* sd->sensor_type = 1 *\/\n+\t\tconst struct sensor_w_data cif_sensor1_init_data[] = {\n+\t\t\t{0x02, 0x00, {0x10}, 1},\n+\t\t\t{0x03, 0x01, {0x12}, 1},\n+\t\t\t{0x04, 0x01, {0x05}, 1},\n+\t\t\t{0x05, 0x01, {0x65}, 1},\n+\t\t\t{0x06, 0x01, {0x32}, 1},\n+\t\t\t{0x07, 0x01, {0x00}, 1},\n+\t\t\t{0x08, 0x02, {0x06}, 1},\n+\t\t\t{0x09, 0x02, {0x0e}, 1},\n+\t\t\t{0x0a, 0x02, {0x05}, 1},\n+\t\t\t{0x0b, 0x02, {0x05}, 1},\n+\t\t\t{0x0c, 0x02, {0x0f}, 1},\n+\t\t\t{0x0d, 0x02, {0x00}, 1},\n+\t\t\t{0x0e, 0x02, {0x0c}, 1},\n+\t\t\t{0x0f, 0x00, {0x00}, 1},\n+\t\t\t{0x10, 0x00, {0x06}, 1},\n+\t\t\t{0x11, 0x00, {0x07}, 1},\n+\t\t\t{0x12, 0x00, {0x00}, 1},\n+\t\t\t{0x13, 0x00, {0x01}, 1},\n+\t\t\t{0, 0, {0}, 0}\n+\t\t};\n+\t\terr_code = sensor_write_regs(gspca_dev, cif_sensor1_init_data,\n+\t\t\t\t\t ARRAY_SIZE(cif_sensor1_init_data));\n+\t}\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tmsleep(200);\n \tdata[0] = 0x00;\n-\tdata[1] = 0x0d;\n-\tdata[2] = 0x01;\n-\tdata[5] = 0x2b;\n-\tdata[7] = 0x00;\n-\tdata[9] = 0x50; \/* reg 8, no scale down *\/\n-\tdata[10] = 0xc0;\n+\tdata[1] = 0x4d; \/* ISOC transfering enable... *\/\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tmsleep(200);\n+\terr_code = adjust_cif_sensor(gspca_dev);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tmsleep(200);\n+\treturn 0;\n+}\n+\n+static int start_vga_cam(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\t__u8 *data = gspca_dev->usb_buf;\n+\tint err_code;\n+\tconst __u8 startup_string[] = {0x00, 0x0d, 0x01, 0x00, 0x00, 0x2b,\n+\t\t\t\t 0x00, 0x00, 0x00, 0x50, 0xc0};\n+\n+\t\/* What some of these mean is explained in start_cif_cam(), above *\/\n+\tsd->sof_read = 0;\n+\n+\t\/*\n+\t * We have to know which camera we have, because the register writes\n+\t * depend upon the camera. This test, run before we actually enter\n+\t * the initialization routine, distinguishes most of the cameras, If\n+\t * needed, another routine is done later, too.\n+\t *\/\n+\tmemset(data, 0, 16);\n+\tdata[0] = 0x20;\n+\terr_code = mr_write(gspca_dev, 1);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\terr_code = mr_read(gspca_dev, 16);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tPDEBUG(D_ERR, \"Read 16 bytes from camera\");\n+\tPDEBUG(D_ERR, \"Byte reported is %02x\", data[0]);\n+\n+\tmsleep(200);\n+\t\/*\n+\t * Known VGA cameras. If you have another to report, please do\n+\t *\n+\t * Name\t\t\tbyte just read\t\tsd->sensor_type\n+\t *\t\t\t\tsd->do_lcd_stop\n+\t * Aiptek Pencam VGA+\t0x31\t\t0\t1\n+\t * ION digital\t\t0x31\t\t0\t1\n+\t * Argus DC-1620\t0x30\t\t1\t0\n+\t * Argus QuickClix\t0x30\t\t1\t1 (not caught here)\n+\t *\/\n+\tsd->sensor_type = data[0] & 1;\n+\tsd->do_lcd_stop = (~data[0]) & 1;\n+\n+\n+\n+\t\/* Streaming setup begins here. *\/\n+\n+\n+\tdata[0] = 0x01;\n+\tdata[1] = 0x01;\n+\terr_code = mr_write(gspca_dev, 2);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\t\/*\n+\t * A second test can now resolve any remaining ambiguity in the\n+\t * identification of the camera type,\n+\t *\/\n+\tif (!sd->sensor_type) {\n+\t\tdata[0] = get_sensor_id(gspca_dev);\n+\t\tif (data[0] == 0x7f) {\n+\t\t\tsd->sensor_type = 1;\n+\t\t\tPDEBUG(D_ERR, \"sensor_type corrected to 1\");\n+\t\t}\n+\t\tmsleep(200);\n+\t}\n+\n+\t\/*\n+\t * Known VGA cameras.\n+\t * This test is only run if the previous test returned 0x30, but\n+\t * here is the information for all others, too, just for reference.\n+\t *\n+\t * Name\t\t\tbyte just read\t\tsd->sensor_type\n+\t *\n+\t * Aiptek Pencam VGA+\t0xfb\t(this test not run)\t1\n+\t * ION digital\t\t0xbd\t(this test not run)\t1\n+\t * Argus DC-1620\t0xe5\t(no change)\t\t0\n+\t * Argus QuickClix\t0x7f\t(reclassified)\t\t1\n+\t *\/\n+\tmemcpy(data, startup_string, 11);\n+\tif (!sd->sensor_type) {\n+\t\tdata[5] = 0x00;\n+\t\tdata[10] = 0x91;\n+\t}\n \n \tswitch (gspca_dev->width) {\n \tcase 160:\n@@ -129,10 +640,12 @@\n \t\t\/* fall thru *\/\n \tcase 640:\n \tdefault:\n-\t\tdata[3] = 0x50; \/* reg 2, H size *\/\n-\t\tdata[4] = 0x78; \/* reg 3, V size *\/\n+\t\tdata[3] = 0x50; \/* reg 2, H size\/8 *\/\n+\t\tdata[4] = 0x78; \/* reg 3, V size\/4 *\/\n \t\tdata[6] = 0x04; \/* reg 5, H start *\/\n \t\tdata[8] = 0x03; \/* reg 7, V start *\/\n+\t\tif (sd->do_lcd_stop)\n+\t\t\tdata[8] = 0x04; \/* Bayer tile shifted *\/\n \t\tbreak;\n \n \tcase 176:\n@@ -143,136 +656,189 @@\n \t\tdata[4] = 0x48; \/* reg 3, V size *\/\n \t\tdata[6] = 0x94; \/* reg 5, H start *\/\n \t\tdata[8] = 0x63; \/* reg 7, V start *\/\n+\t\tif (sd->do_lcd_stop)\n+\t\t\tdata[8] = 0x64; \/* Bayer tile shifted *\/\n \t\tbreak;\n \t}\n \n-\terr_code = reg_w(gspca_dev, 11);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x0a;\n-\tdata[1] = 0x80;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x14;\n-\tdata[1] = 0x0a;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1b;\n-\tdata[1] = 0x00;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x15;\n-\tdata[1] = 0x16;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x16;\n-\tdata[1] = 0x10;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x17;\n-\tdata[1] = 0x3a;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x18;\n-\tdata[1] = 0x68;\n-\terr_code = reg_w(gspca_dev, 2);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x00;\n-\tdata[2] = 0x02;\n-\tdata[3] = 0x06;\n-\tdata[4] = 0x59;\n-\tdata[5] = 0x0c;\n-\tdata[6] = 0x16;\n-\tdata[7] = 0x00;\n-\tdata[8] = 0x07;\n-\tdata[9] = 0x00;\n-\tdata[10] = 0x01;\n-\terr_code = reg_w(gspca_dev, 11);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x04;\n-\tdata[2] = 0x11;\n-\tdata[3] = 0x01;\n-\terr_code = reg_w(gspca_dev, 4);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x00;\n-\tdata[2] = 0x0a;\n-\tdata[3] = 0x00;\n-\tdata[4] = 0x01;\n-\tdata[5] = 0x00;\n-\tdata[6] = 0x00;\n-\tdata[7] = 0x01;\n-\tdata[8] = 0x00;\n-\tdata[9] = 0x0a;\n-\terr_code = reg_w(gspca_dev, 10);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x04;\n-\tdata[2] = 0x11;\n-\tdata[3] = 0x01;\n-\terr_code = reg_w(gspca_dev, 4);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x00;\n-\tdata[2] = 0x12;\n-\tdata[3] = 0x00;\n-\tdata[4] = 0x63;\n-\tdata[5] = 0x00;\n-\tdata[6] = 0x70;\n-\tdata[7] = 0x00;\n-\tdata[8] = 0x00;\n-\terr_code = reg_w(gspca_dev, 9);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n-\tdata[0] = 0x1f;\n-\tdata[1] = 0x04;\n-\tdata[2] = 0x11;\n-\tdata[3] = 0x01;\n-\terr_code = reg_w(gspca_dev, 4);\n-\tif (err_code < 0)\n-\t\treturn err_code;\n-\n+\terr_code = mr_write(gspca_dev, 11);\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tif (!sd->sensor_type) {\n+\t\t\/* The only known sensor_type 0 cam is the Argus DC-1620 *\/\n+\t\tconst struct sensor_w_data vga_sensor0_init_data[] = {\n+\t\t\t{0x01, 0x00, {0x0c, 0x00, 0x04}, 3},\n+\t\t\t{0x14, 0x00, {0x01, 0xe4, 0x02, 0x84}, 4},\n+\t\t\t{0x20, 0x00, {0x00, 0x80, 0x00, 0x08}, 4},\n+\t\t\t{0x25, 0x00, {0x03, 0xa9, 0x80}, 3},\n+\t\t\t{0x30, 0x00, {0x30, 0x18, 0x10, 0x18}, 4},\n+\t\t\t{0, 0, {0}, 0}\n+\t\t};\n+\t\terr_code = sensor_write_regs(gspca_dev, vga_sensor0_init_data,\n+\t\t\t\t\t ARRAY_SIZE(vga_sensor0_init_data));\n+\t} else {\t\/* sd->sensor_type = 1 *\/\n+\t\tconst struct sensor_w_data vga_sensor1_init_data[] = {\n+\t\t\t{0x02, 0x00, {0x06, 0x59, 0x0c, 0x16, 0x00,\n+\t\t\t\t0x07, 0x00, 0x01}, 8},\n+\t\t\t{0x11, 0x04, {0x01}, 1},\n+\t\t\t\/*{0x0a, 0x00, {0x00, 0x01, 0x00, 0x00, 0x01, *\/\n+\t\t\t{0x0a, 0x00, {0x01, 0x06, 0x00, 0x00, 0x01,\n+\t\t\t\t0x00, 0x0a}, 7},\n+\t\t\t{0x11, 0x04, {0x01}, 1},\n+\t\t\t{0x12, 0x00, {0x00, 0x63, 0x00, 0x70, 0x00, 0x00}, 6},\n+\t\t\t{0x11, 0x04, {0x01}, 1},\n+\t\t\t{0, 0, {0}, 0}\n+\t\t};\n+\t\terr_code = sensor_write_regs(gspca_dev, vga_sensor1_init_data,\n+\t\t\t\t\t ARRAY_SIZE(vga_sensor1_init_data));\n+\t}\n+\tif (err_code < 0)\n+\t\treturn err_code;\n+\n+\tmsleep(200);\n \tdata[0] = 0x00;\n \tdata[1] = 0x4d; \/* ISOC transfering enable... *\/\n-\terr_code = reg_w(gspca_dev, 2);\n+\terr_code = mr_write(gspca_dev, 2);\n+\n \treturn err_code;\n }\n \n+static int sd_start(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\tint err_code;\n+\tstruct cam *cam;\n+\n+\t\/* TEST TEST *\/\n+\tint i;\n+\tfor (i = 2; i <= 14; i++)\n+\t\tsd->regs[i] = sd_ctrls[i - 2].qctrl.default_value;\n+\n+\tcam = &gspca_dev->cam;\n+\tsd->sof_read = 0;\n+\t\/*\n+\t * Some of the supported cameras require the memory pointer to be\n+\t * set to 0, or else they will not stream.\n+\t *\/\n+\tzero_the_pointer(gspca_dev);\n+\tmsleep(200);\n+\tif (sd->cam_type == CAM_TYPE_CIF) {\n+\t\tPDEBUG(D_ERR, \"CIF camera\");\n+\t\terr_code = start_cif_cam(gspca_dev);\n+\t} else {\n+\t\tPDEBUG(D_ERR, \"VGA camera\");\n+\t\terr_code = start_vga_cam(gspca_dev);\n+\t}\n+\treturn err_code;\n+}\n+\n static void sd_stopN(struct gspca_dev *gspca_dev)\n {\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n \tint result;\n \n \tgspca_dev->usb_buf[0] = 1;\n \tgspca_dev->usb_buf[1] = 0;\n-\tresult = reg_w(gspca_dev, 2);\n+\tresult = mr_write(gspca_dev, 2);\n \tif (result < 0)\n \t\tPDEBUG(D_ERR, \"Camera Stop failed\");\n+\n+\t\/* Not all the cams need this, but even if not, probably a good idea *\/\n+\tzero_the_pointer(gspca_dev);\n+\tif (sd->do_lcd_stop) {\n+\t\tgspca_dev->usb_buf[0] = 0x19;\n+\t\tgspca_dev->usb_buf[1] = 0x54;\n+\t\tresult = mr_write(gspca_dev, 2);\n+\t\tif (result < 0)\n+\t\t\tPDEBUG(D_ERR, \"Camera Stop failed\");\n+\t}\n+}\n+\n+static void setbrightness(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\tu8 val;\n+\tif (sd->brightness > 0) {\n+\t\tsensor_write1(gspca_dev, 7, 0);\n+\t\tval = sd->brightness;\n+\t} else {\n+\t\tsensor_write1(gspca_dev, 7, 1);\n+\t\tval = 257 - sd->brightness;\n+\t}\n+\tsensor_write1(gspca_dev, 8, val);\n+}\n+\n+static void setexposure(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\tu8 val;\n+\n+\tval = sd->exposure >> 4;\n+\tsensor_write1(gspca_dev, 3, val);\n+\tval = sd->exposure & 0xf;\n+\tsensor_write1(gspca_dev, 4, val);\n+}\n+\n+static void setgain(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\tsensor_write1(gspca_dev, 3, sd->gain);\n+}\n+\n+static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\tsd->brightness = val;\n+\tif (gspca_dev->streaming)\n+\t\tsetbrightness(gspca_dev);\n+\treturn 0;\n+}\n+\n+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\t*val = sd->brightness;\n+\treturn 0;\n+}\n+\n+static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\tsd->exposure = val;\n+\tif (gspca_dev->streaming)\n+\t\tsetexposure(gspca_dev);\n+\treturn 0;\n+}\n+\n+static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\t*val = sd->exposure;\n+\treturn 0;\n+}\n+\n+static int sd_setgain(struct gspca_dev *gspca_dev, __s32 val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\tsd->gain = val;\n+\tif (gspca_dev->streaming)\n+\t\tsetgain(gspca_dev);\n+\treturn 0;\n+}\n+\n+static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n+\t*val = sd->gain;\n+\treturn 0;\n }\n \n \/* Include pac common sof detection functions *\/\n@@ -320,8 +886,9 @@\n \n \/* -- module initialisation -- *\/\n static const __devinitdata struct usb_device_id device_table[] = {\n-\t{USB_DEVICE(0x08ca, 0x0111)},\n-\t{USB_DEVICE(0x093a, 0x010f)},\n+\t{USB_DEVICE(0x08ca, 0x0111)},\t\/* Aiptek Pencam VGA+ *\/\n+\t{USB_DEVICE(0x093a, 0x010f)},\t\/* All other known MR97310A VGA cams *\/\n+\t{USB_DEVICE(0x093a, 0x010e)},\t\/* All known MR97310A CIF cams *\/\n \t{}\n };\n MODULE_DEVICE_TABLE(usb, device_table);\n"} {"commit":"25bfb1dd4ba3b2d9a49ce9d9b0cd7be1840e15ed","subject":"bnx2: Add pci shutdown handler.","message":"bnx2: Add pci shutdown handler.\n\nWoL and power state changes will now be done in the shutdown handler.\nopen\/close\/ethtool will no longer change the power state. NVRAM\noperations can now be permitted whether the device is up or down.\n\nSigned-off-by: Michael Chan <6b52f9d672b6134057900fe608467612b789a84e@broadcom.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"0541743b4b35f2ddc9e490b4e354930168b60d23","subject":"ethernet\/broadcom: ip6_route_output() never returns NULL.","message":"ethernet\/broadcom: ip6_route_output() never returns NULL.\n\nip6_route_output() never returns NULL, so it is wrong to\ncheck if the return value is NULL.\n\nSigned-off-by: RongQing.Li <81c2f95e9d1350da984a3ef03e964ca9a6cbc5c2@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/broadcom\/cnic.c\n+++ drivers\/net\/ethernet\/broadcom\/cnic.c\n@@ -3584,7 +3584,11 @@\n \t\tfl6.flowi6_oif = dst_addr->sin6_scope_id;\n \n \t*dst = ip6_route_output(&init_net, NULL, &fl6);\n-\tif (*dst)\n+\tif ((*dst)->error) {\n+\t\tdst_release(*dst);\n+\t\t*dst = NULL;\n+\t\treturn -ENETUNREACH;\n+\t} else\n \t\treturn 0;\n #endif\n \n"} {"commit":"c26066f8dbaa4717e55921ab50febb28a7d9061c","subject":"Join Multicast group","message":"Join Multicast group\n","repos":"maxeler\/NetworkingCodeExamples,maxeler\/NetworkingCodeExamples,maxeler\/NetworkingCodeExamples,maxeler\/NetworkingCodeExamples","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Udp\/UdpLogging\/runtime\/udplogging.c\n+++ Udp\/UdpLogging\/runtime\/udplogging.c\n@@ -85,5 +85,6 @@\n \tmax_ip_config(engine, MAX_NET_CONNECTION_QSFP_TOP_10G_PORT1, &dfe_top_ip, &netmask);\n \tmax_udp_socket_t *dfe_socket = max_udp_create_socket(engine, \"UdpMulticastFeed\");\n \tmax_udp_bind_ip(dfe_socket, &multicast_ip, MULTICAST_PORT);\n+\tmax_ip_multicast_join_group(engine, MAX_NET_CONNECTION_QSFP_TOP_10G_PORT1, &multicast_ip);\n }\n \n"} {"commit":"30c28925fad041bb5d787c5a40e56a6f01f91cf8","subject":"Bluetooth: Add new attribute with signed write permission","message":"Bluetooth: Add new attribute with signed write permission\n\nChange-Id: I731b4d3f3a31cff9c4be89dd1f911f4365b5e783\nSigned-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>\n","repos":"explora26\/zephyr,GiulianoFranchetto\/zephyr,pklazy\/zephyr,fbsder\/zephyr,holtmann\/zephyr,32bitmicro\/zephyr,nashif\/zephyr,fractalclone\/zephyr-riscv,aceofall\/zephyr-iotos,runchip\/zephyr-cc3220,pklazy\/zephyr,mirzak\/zephyr-os,runchip\/zephyr-cc3200,fbsder\/zephyr,finikorg\/zephyr,32bitmicro\/zephyr,ldts\/zephyr,punitvara\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3200,tidyjiang8\/zephyr-doc,finikorg\/zephyr,zephyriot\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,bigdinotech\/zephyr,GiulianoFranchetto\/zephyr,runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,jamesonwilliams\/zephyr-kernel,explora26\/zephyr,fbsder\/zephyr,zephyriot\/zephyr,aceofall\/zephyr-iotos,fractalclone\/zephyr-riscv,GiulianoFranchetto\/zephyr,tidyjiang8\/zephyr-doc,nashif\/zephyr,kraj\/zephyr,zephyrproject-rtos\/zephyr,erwango\/zephyr,erwango\/zephyr,Vudentz\/zephyr,tidyjiang8\/zephyr-doc,zephyriot\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,kraj\/zephyr,holtmann\/zephyr,mirzak\/zephyr-os,finikorg\/zephyr,zephyriot\/zephyr,holtmann\/zephyr,mbolivar\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,nashif\/zephyr,galak\/zephyr,sharronliu\/zephyr,32bitmicro\/zephyr,jamesonwilliams\/zephyr-kernel,jamesonwilliams\/zephyr-kernel,ldts\/zephyr,bigdinotech\/zephyr,sharronliu\/zephyr,erwango\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,mbolivar\/zephyr,pklazy\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,erwango\/zephyr,explora26\/zephyr,galak\/zephyr,runchip\/zephyr-cc3220,finikorg\/zephyr,tidyjiang8\/zephyr-doc,explora26\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,explora26\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3200,bboozzoo\/zephyr,bigdinotech\/zephyr,rsalveti\/zephyr,bigdinotech\/zephyr,ldts\/zephyr,sharronliu\/zephyr,zephyriot\/zephyr,sharronliu\/zephyr,coldnew\/zephyr-project-fork,rsalveti\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200,Vudentz\/zephyr,kraj\/zephyr,Vudentz\/zephyr,ldts\/zephyr,holtmann\/zephyr,fbsder\/zephyr,zephyrproject-rtos\/zephyr,erwango\/zephyr,punitvara\/zephyr,fbsder\/zephyr,coldnew\/zephyr-project-fork,kraj\/zephyr,nashif\/zephyr,bigdinotech\/zephyr,nashif\/zephyr,coldnew\/zephyr-project-fork,punitvara\/zephyr,runchip\/zephyr-cc3200,mirzak\/zephyr-os,bboozzoo\/zephyr,mbolivar\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,bboozzoo\/zephyr,rsalveti\/zephyr,galak\/zephyr,bboozzoo\/zephyr,32bitmicro\/zephyr,holtmann\/zephyr,zephyrproject-rtos\/zephyr,rsalveti\/zephyr,finikorg\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3220,jamesonwilliams\/zephyr-kernel,mirzak\/zephyr-os,aceofall\/zephyr-iotos,jamesonwilliams\/zephyr-kernel,galak\/zephyr,32bitmicro\/zephyr,sharronliu\/zephyr,aceofall\/zephyr-iotos,coldnew\/zephyr-project-fork,coldnew\/zephyr-project-fork,pklazy\/zephyr,fractalclone\/zephyr-riscv,punitvara\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- samples\/bluetooth\/peripheral\/src\/main.c\n+++ samples\/bluetooth\/peripheral\/src\/main.c\n@@ -433,6 +433,44 @@\n \n static struct bt_gatt_cep vnd_long_cep = {\n \t.properties = BT_GATT_CEP_RELIABLE_WRITE,\n+};\n+\n+int signed_value;\n+\n+static int read_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr,\n+\t\t void *buf, uint16_t len, uint16_t offset)\n+{\n+\tconst char *value = attr->user_data;\n+\n+\treturn bt_gatt_attr_read(conn, attr, buf, len, offset, value,\n+\t\t\t\t sizeof(signed_value));\n+}\n+\n+static int write_signed(struct bt_conn *conn, const struct bt_gatt_attr *attr,\n+\t\t\tconst void *buf, uint16_t len, uint16_t offset)\n+{\n+\tuint8_t *value = attr->user_data;\n+\n+\tif (offset + len > sizeof(signed_value)) {\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tmemcpy(value + offset, buf, len);\n+\n+\treturn len;\n+}\n+\n+static const struct bt_uuid vnd_signed_uuid = {\n+\t.type = BT_UUID_128,\n+\t.u128 = { 0xf3, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x13,\n+\t\t 0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x13 },\n+};\n+\n+static struct bt_gatt_chrc vnd_signed_chrc = {\n+\t.properties = BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE |\n+\t\t BT_GATT_CHRC_AUTH,\n+\t.value_handle = 0x0024,\n+\t.uuid = &vnd_signed_uuid,\n };\n \n static const struct bt_gatt_attr attrs[] = {\n@@ -495,6 +533,10 @@\n \t\t\t read_long_vnd, write_long_vnd, flush_long_vnd,\n \t\t\t &vnd_long_value),\n \tBT_GATT_CEP(0x0022, &vnd_long_cep),\n+\tBT_GATT_CHARACTERISTIC(0x0023, &vnd_signed_chrc),\n+\tBT_GATT_DESCRIPTOR(0x0024, &vnd_signed_uuid,\n+\t\t\t BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,\n+\t\t\t read_signed, write_signed, &signed_value),\n };\n \n static const struct bt_eir ad[] = {\n"} {"commit":"c183d5f4525aaade0a5890ecd51f172d464e2aa4","subject":"src\/signature: print signers after signature verification","message":"src\/signature: print signers after signature verification\n\nSigned-off-by: Jan Luebbe <3a82f1ac4ad59607a20f180f1c67ac8ba31ad0d5@pengutronix.de>\n","repos":"jluebbe\/rauc,jluebbe\/rauc,ejoerns\/rauc,jluebbe\/rauc,rauc\/rauc,ejoerns\/rauc,ejoerns\/rauc,rauc\/rauc,rauc\/rauc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/signature.c\n+++ src\/signature.c\n@@ -780,6 +780,40 @@\n \treturn bio_mem_unwrap(text);\n }\n \n+static gchar *cms_get_signers(CMS_ContentInfo *cms, GError **error)\n+{\n+\tSTACK_OF(X509) *signers = NULL;\n+\tBIO *text = NULL;\n+\n+\tg_return_val_if_fail(cms != NULL, NULL);\n+\tg_return_val_if_fail(error == NULL || *error == NULL, NULL);\n+\n+\tsigners = CMS_get0_signers(cms);\n+\tif (signers == NULL) {\n+\t\tg_set_error_literal(\n+\t\t\t\terror,\n+\t\t\t\tR_SIGNATURE_ERROR,\n+\t\t\t\tR_SIGNATURE_ERROR_GET_SIGNER,\n+\t\t\t\t\"Failed to obtain signer info\");\n+\t\tgoto out;\n+\t}\n+\n+\ttext = BIO_new(BIO_s_mem());\n+\tfor (int i = 0; i < sk_X509_num(signers); i++) {\n+\t\tif (i)\n+\t\t\tBIO_printf(text, \", \");\n+\t\tX509_NAME_print_ex(text, X509_get_subject_name(sk_X509_value(signers, i)), 0, XN_FLAG_ONELINE);\n+\t}\n+\n+out:\n+\tif (signers)\n+\t\tsk_X509_free(signers);\n+\tif (text)\n+\t\treturn bio_mem_unwrap(text);\n+\telse\n+\t\treturn NULL;\n+}\n+\n gboolean cms_get_cert_chain(CMS_ContentInfo *cms, X509_STORE *store, STACK_OF(X509) **verified_chain, GError **error)\n {\n \tSTACK_OF(X509) *signers = NULL;\n@@ -894,11 +928,13 @@\n \n gboolean cms_verify(GBytes *content, GBytes *sig, X509_STORE *store, CMS_ContentInfo **cms, GError **error)\n {\n+\tGError *ierror = NULL;\n \tCMS_ContentInfo *icms = NULL;\n \tBIO *incontent = BIO_new_mem_buf((void *)g_bytes_get_data(content, NULL),\n \t\t\tg_bytes_get_size(content));\n \tBIO *insig = BIO_new_mem_buf((void *)g_bytes_get_data(sig, NULL),\n \t\t\tg_bytes_get_size(sig));\n+\tg_autofree gchar *signers = NULL;\n \tgboolean res = FALSE;\n \n \tg_return_val_if_fail(content != NULL, FALSE);\n@@ -964,6 +1000,13 @@\n \t\tgoto out;\n \t}\n \n+\tsigners = cms_get_signers(icms, &ierror);\n+\tif (!signers) {\n+\t\tg_propagate_error(error, ierror);\n+\t\tgoto out;\n+\t}\n+\tg_message(\"Verified signature by %s\", signers);\n+\n \tif (cms)\n \t\t*cms = icms;\n \n"} {"commit":"349ca6e612a2bf52140fa1345f20729d4761c404","subject":"Fixed bug #292","message":"Fixed bug #292\n\nI might be on crack here.\n\nIt looks like SDL_ConvertMono() in src\/audio\/SDL_audiocvt.c adds the left and\nright channels of a stereo stream together, and clamps the new mono channel if\nit would overflow.\n\nShouldn't it be dividing by 2 to average the two sample points instead of\nclamping? Otherwise the mono sample point's volume doubles in the conversion.\nThis would also make the conversion faster, as it replaces two branches per\nsample frame with a bitwise shift.\n\n--ryan.\n\n\ngit-svn-id: 75429ccc2030f235ccf16e6b9b7f8e83d5edd22e@2796 c70aab31-4412-0410-b14c-859654838e24\n","repos":"albertz\/sdl,albertz\/sdl,albertz\/sdl,albertz\/sdl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/audio\/SDL_audiocvt.c\n+++ src\/audio\/SDL_audiocvt.c\n@@ -45,11 +45,7 @@\n dst = cvt->buf;\n for (i = cvt->len_cvt \/ 2; i; --i) {\n sample = src[0] + src[1];\n- if (sample > 255) {\n- *dst = 255;\n- } else {\n- *dst = (Uint8) sample;\n- }\n+ *dst = (Uint8) (sample \/ 2);\n src += 2;\n dst += 1;\n }\n@@ -64,13 +60,7 @@\n dst = (Sint8 *) cvt->buf;\n for (i = cvt->len_cvt \/ 2; i; --i) {\n sample = src[0] + src[1];\n- if (sample > 127) {\n- *dst = 127;\n- } else if (sample < -128) {\n- *dst = -128;\n- } else {\n- *dst = (Sint8) sample;\n- }\n+ *dst = (Sint8) (sample \/ 2);\n src += 2;\n dst += 1;\n }\n@@ -87,14 +77,10 @@\n for (i = cvt->len_cvt \/ 4; i; --i) {\n sample = (Uint16) ((src[0] << 8) | src[1]) +\n (Uint16) ((src[2] << 8) | src[3]);\n- if (sample > 65535) {\n- dst[0] = 0xFF;\n- dst[1] = 0xFF;\n- } else {\n- dst[1] = (sample & 0xFF);\n- sample >>= 8;\n- dst[0] = (sample & 0xFF);\n- }\n+ sample \/= 2;\n+ dst[1] = (sample & 0xFF);\n+ sample >>= 8;\n+ dst[0] = (sample & 0xFF);\n src += 4;\n dst += 2;\n }\n@@ -102,14 +88,10 @@\n for (i = cvt->len_cvt \/ 4; i; --i) {\n sample = (Uint16) ((src[1] << 8) | src[0]) +\n (Uint16) ((src[3] << 8) | src[2]);\n- if (sample > 65535) {\n- dst[0] = 0xFF;\n- dst[1] = 0xFF;\n- } else {\n- dst[0] = (sample & 0xFF);\n- sample >>= 8;\n- dst[1] = (sample & 0xFF);\n- }\n+ sample \/= 2;\n+ dst[0] = (sample & 0xFF);\n+ sample >>= 8;\n+ dst[1] = (sample & 0xFF);\n src += 4;\n dst += 2;\n }\n@@ -127,17 +109,10 @@\n for (i = cvt->len_cvt \/ 4; i; --i) {\n sample = (Sint16) ((src[0] << 8) | src[1]) +\n (Sint16) ((src[2] << 8) | src[3]);\n- if (sample > 32767) {\n- dst[0] = 0x7F;\n- dst[1] = 0xFF;\n- } else if (sample < -32768) {\n- dst[0] = 0x80;\n- dst[1] = 0x00;\n- } else {\n- dst[1] = (sample & 0xFF);\n- sample >>= 8;\n- dst[0] = (sample & 0xFF);\n- }\n+ sample \/= 2;\n+ dst[1] = (sample & 0xFF);\n+ sample >>= 8;\n+ dst[0] = (sample & 0xFF);\n src += 4;\n dst += 2;\n }\n@@ -145,17 +120,10 @@\n for (i = cvt->len_cvt \/ 4; i; --i) {\n sample = (Sint16) ((src[1] << 8) | src[0]) +\n (Sint16) ((src[3] << 8) | src[2]);\n- if (sample > 32767) {\n- dst[1] = 0x7F;\n- dst[0] = 0xFF;\n- } else if (sample < -32768) {\n- dst[1] = 0x80;\n- dst[0] = 0x00;\n- } else {\n- dst[0] = (sample & 0xFF);\n- sample >>= 8;\n- dst[1] = (sample & 0xFF);\n- }\n+ sample \/= 2;\n+ dst[0] = (sample & 0xFF);\n+ sample >>= 8;\n+ dst[1] = (sample & 0xFF);\n src += 4;\n dst += 2;\n }\n"} {"commit":"88c6f5f8eefc4bb203d59b4a14bc8b4b9b954637","subject":"XCB\/apps: probe if the X server is present","message":"XCB\/apps: probe if the X server is present\n","repos":"jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/services_discovery\/xcb_apps.c\n+++ modules\/services_discovery\/xcb_apps.c\n@@ -37,6 +37,7 @@\n \n static int Open (vlc_object_t *);\n static void Close (vlc_object_t *);\n+static int vlc_sd_probe_Open (vlc_object_t *);\n \n \/*\n * Module descriptor\n@@ -50,6 +51,8 @@\n set_callbacks (Open, Close)\n \n add_shortcut (\"apps\")\n+\n+ VLC_SD_PROBE_SUBMODULE\n vlc_module_end ()\n \n struct services_discovery_sys_t\n@@ -65,6 +68,19 @@\n static void *Run (void *);\n static void Update (services_discovery_t *);\n static void DelItem (void *);\n+\n+static int vlc_sd_probe_Open (vlc_object_t *obj)\n+{\n+ vlc_probe_t *probe = (vlc_probe_t *)obj;\n+\n+ char *display = var_CreateGetNonEmptyString (obj, \"x11-display\");\n+ xcb_connection_t *conn = xcb_connect (display, NULL);\n+ free (display);\n+ if (xcb_connection_has_error (conn))\n+ return VLC_EGENERIC;\n+ xcb_disconnect (conn);\n+ return vlc_sd_probe_Add (probe, \"xcb_apps\", N_(\"Screen capture\"));\n+}\n \n \/**\n * Probes and initializes.\n"} {"commit":"fc3e0f8aec05dd812cba2c1e31c3d1f5fc85e55c","subject":"via-rhine: per device debug level.","message":"via-rhine: per device debug level.\n\nSigned-off-by: Francois Romieu <b6456b24ae82a7595be3173ae585c7a827f25f37@fr.zoreil.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/via\/via-rhine.c\n+++ drivers\/net\/ethernet\/via\/via-rhine.c\n@@ -39,9 +39,9 @@\n \n \/* A few user-configurable values.\n These may be modified when a driver module is loaded. *\/\n-\n-#define DEBUG\n-static int debug = 1;\t\/* 1 normal messages, 0 quiet .. 7 verbose. *\/\n+static int debug = 0;\n+#define RHINE_MSG_DEFAULT \\\n+ (0x0000)\n \n \/* Set the copy breakpoint for the copy-only-tiny-frames scheme.\n Setting to > 1518 effectively disables this feature. *\/\n@@ -130,7 +130,7 @@\n module_param(debug, int, 0);\n module_param(rx_copybreak, int, 0);\n module_param(avoid_D3, bool, 0);\n-MODULE_PARM_DESC(debug, \"VIA Rhine debug level (0-7)\");\n+MODULE_PARM_DESC(debug, \"VIA Rhine debug message flags\");\n MODULE_PARM_DESC(rx_copybreak, \"VIA Rhine copy breakpoint for copy-only-tiny-frames\");\n MODULE_PARM_DESC(avoid_D3, \"Avoid power state D3 (work-around for broken BIOSes)\");\n \n@@ -450,6 +450,8 @@\n \tstruct work_struct slow_event_task;\n \tstruct work_struct reset_task;\n \n+\tu32 msg_enable;\n+\n \t\/* Frequently used values: keep some adjacent for cache effect. *\/\n \tu32 quirks;\n \tstruct rx_desc *rx_head_desc;\n@@ -512,8 +514,8 @@\n \t\tudelay(10);\n \t}\n \tif (i > 64) {\n-\t\tnetdev_dbg(rp->dev, \"%s bit wait (%02x\/%02x) cycle \"\n-\t\t\t \"count: %04d\\n\", high ? \"high\" : \"low\", reg, mask, i);\n+\t\tnetif_dbg(rp, hw, rp->dev, \"%s bit wait (%02x\/%02x) cycle \"\n+\t\t\t \"count: %04d\\n\", high ? \"high\" : \"low\", reg, mask, i);\n \t}\n }\n \n@@ -613,6 +615,7 @@\n {\n \tstruct rhine_private *rp = netdev_priv(dev);\n \tvoid __iomem *ioaddr = rp->base;\n+\tu8 cmd1;\n \n \tiowrite8(Cmd1Reset, ioaddr + ChipCmd1);\n \tIOSYNC;\n@@ -628,10 +631,9 @@\n \t\trhine_wait_bit_low(rp, ChipCmd1, Cmd1Reset);\n \t}\n \n-\tif (debug > 1)\n-\t\tnetdev_info(dev, \"Reset %s\\n\",\n-\t\t\t (ioread8(ioaddr + ChipCmd1) & Cmd1Reset) ?\n-\t\t\t \"failed\" : \"succeeded\");\n+\tcmd1 = ioread8(ioaddr + ChipCmd1);\n+\tnetif_info(rp, hw, dev, \"Reset %s\\n\", (cmd1 & Cmd1Reset) ?\n+\t\t \"failed\" : \"succeeded\");\n }\n \n #ifdef USE_MMIO\n@@ -706,28 +708,24 @@\n \tstruct net_device *dev = rp->dev;\n \n \tif (status & IntrTxAborted) {\n-\t\tif (debug > 1)\n-\t\t\tnetdev_info(dev, \"Abort %08x, frame dropped\\n\", status);\n+\t\tnetif_info(rp, tx_err, dev,\n+\t\t\t \"Abort %08x, frame dropped\\n\", status);\n \t}\n \n \tif (status & IntrTxUnderrun) {\n \t\trhine_kick_tx_threshold(rp);\n-\t\tif (debug > 1)\n-\t\t\tnetdev_info(dev, \"Transmitter underrun, Tx threshold now %02x\\n\",\n-\t\t\t\t rp->tx_thresh);\n-\t}\n-\n-\tif (status & IntrTxDescRace) {\n-\t\tif (debug > 2)\n-\t\t\tnetdev_info(dev, \"Tx descriptor write-back race\\n\");\n-\t}\n+\t\tnetif_info(rp, tx_err ,dev, \"Transmitter underrun, \"\n+\t\t\t \"Tx threshold now %02x\\n\", rp->tx_thresh);\n+\t}\n+\n+\tif (status & IntrTxDescRace)\n+\t\tnetif_info(rp, tx_err, dev, \"Tx descriptor write-back race\\n\");\n \n \tif ((status & IntrTxError) &&\n \t (status & (IntrTxAborted | IntrTxUnderrun | IntrTxDescRace)) == 0) {\n \t\trhine_kick_tx_threshold(rp);\n-\t\tif (debug > 1)\n-\t\t\tnetdev_info(dev, \"Unspecified error. Tx threshold now %02x\\n\",\n-\t\t\t\t rp->tx_thresh);\n+\t\tnetif_info(rp, tx_err, dev, \"Unspecified error. \"\n+\t\t\t \"Tx threshold now %02x\\n\", rp->tx_thresh);\n \t}\n \n \trhine_restart_tx(dev);\n@@ -789,16 +787,12 @@\n \n \tif (status & RHINE_EVENT_NAPI_TX) {\n \t\tif (status & RHINE_EVENT_NAPI_TX_ERR) {\n-\t\t\tu8 cmd;\n-\n \t\t\t\/* Avoid scavenging before Tx engine turned off *\/\n \t\t\trhine_wait_bit_low(rp, ChipCmd, CmdTxOn);\n-\t\t\tcmd = ioread8(ioaddr + ChipCmd);\n-\t\t\tif ((cmd & CmdTxOn) && (debug > 2)) {\n-\t\t\t\tnetdev_warn(dev, \"%s: Tx engine still on\\n\",\n-\t\t\t\t\t __func__);\n-\t\t\t}\n+\t\t\tif (ioread8(ioaddr + ChipCmd) & CmdTxOn)\n+\t\t\t\tnetif_warn(rp, tx_err, dev, \"Tx still on\\n\");\n \t\t}\n+\n \t\trhine_tx(dev);\n \n \t\tif (status & RHINE_EVENT_NAPI_TX_ERR)\n@@ -943,6 +937,7 @@\n \trp->quirks = quirks;\n \trp->pioaddr = pioaddr;\n \trp->pdev = pdev;\n+\trp->msg_enable = netif_msg_init(debug, RHINE_MSG_DEFAULT);\n \n \trc = pci_request_regions(pdev, DRV_NAME);\n \tif (rc)\n@@ -1064,8 +1059,8 @@\n \t\t}\n \t}\n \trp->mii_if.phy_id = phy_id;\n-\tif (debug > 1 && avoid_D3)\n-\t\tnetdev_info(dev, \"No D3 power state at shutdown\\n\");\n+\tif (avoid_D3)\n+\t\tnetif_info(rp, probe, dev, \"No D3 power state at shutdown\\n\");\n \n \treturn 0;\n \n@@ -1241,7 +1236,7 @@\n \tstruct rhine_private *rp = netdev_priv(dev);\n \tvoid __iomem *ioaddr = rp->base;\n \n-\tmii_check_media(&rp->mii_if, debug, init_media);\n+\tmii_check_media(&rp->mii_if, netif_msg_link(rp), init_media);\n \n \tif (rp->mii_if.full_duplex)\n \t iowrite8(ioread8(ioaddr + ChipCmd1) | Cmd1FDuplex,\n@@ -1249,24 +1244,26 @@\n \telse\n \t iowrite8(ioread8(ioaddr + ChipCmd1) & ~Cmd1FDuplex,\n \t\t ioaddr + ChipCmd1);\n-\tif (debug > 1)\n-\t\tnetdev_info(dev, \"force_media %d, carrier %d\\n\",\n-\t\t\t rp->mii_if.force_media, netif_carrier_ok(dev));\n+\n+\tnetif_info(rp, link, dev, \"force_media %d, carrier %d\\n\",\n+\t\t rp->mii_if.force_media, netif_carrier_ok(dev));\n }\n \n \/* Called after status of force_media possibly changed *\/\n static void rhine_set_carrier(struct mii_if_info *mii)\n {\n+\tstruct net_device *dev = mii->dev;\n+\tstruct rhine_private *rp = netdev_priv(dev);\n+\n \tif (mii->force_media) {\n \t\t\/* autoneg is off: Link is always assumed to be up *\/\n-\t\tif (!netif_carrier_ok(mii->dev))\n-\t\t\tnetif_carrier_on(mii->dev);\n-\t}\n-\telse\t\/* Let MMI library update carrier status *\/\n-\t\trhine_check_media(mii->dev, 0);\n-\tif (debug > 1)\n-\t\tnetdev_info(mii->dev, \"force_media %d, carrier %d\\n\",\n-\t\t\t mii->force_media, netif_carrier_ok(mii->dev));\n+\t\tif (!netif_carrier_ok(dev))\n+\t\t\tnetif_carrier_on(dev);\n+\t} else\t\/* Let MMI library update carrier status *\/\n+\t\trhine_check_media(dev, 0);\n+\n+\tnetif_info(rp, link, dev, \"force_media %d, carrier %d\\n\",\n+\t\t mii->force_media, netif_carrier_ok(dev));\n }\n \n \/**\n@@ -1570,8 +1567,7 @@\n \tif (rc)\n \t\treturn rc;\n \n-\tif (debug > 1)\n-\t\tnetdev_dbg(dev, \"%s() irq %d\\n\", __func__, rp->pdev->irq);\n+\tnetif_dbg(rp, ifup, dev, \"%s() irq %d\\n\", __func__, rp->pdev->irq);\n \n \trc = alloc_ring(dev);\n \tif (rc) {\n@@ -1583,10 +1579,10 @@\n \trhine_chip_reset(dev);\n \trhine_task_enable(rp);\n \tinit_registers(dev);\n-\tif (debug > 2)\n-\t\tnetdev_dbg(dev, \"%s() Done - status %04x MII status: %04x\\n\",\n-\t\t\t __func__, ioread16(ioaddr + ChipCmd),\n-\t\t\t mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));\n+\n+\tnetif_dbg(rp, ifup, dev, \"%s() Done - status %04x MII status: %04x\\n\",\n+\t\t __func__, ioread16(ioaddr + ChipCmd),\n+\t\t mdio_read(dev, rp->mii_if.phy_id, MII_BMSR));\n \n \tnetif_start_queue(dev);\n \n@@ -1716,10 +1712,9 @@\n \tif (rp->cur_tx == rp->dirty_tx + TX_QUEUE_LEN)\n \t\tnetif_stop_queue(dev);\n \n-\tif (debug > 4) {\n-\t\tnetdev_dbg(dev, \"Transmit frame #%d queued in slot %d\\n\",\n-\t\t\t rp->cur_tx-1, entry);\n-\t}\n+\tnetif_dbg(rp, tx_queued, dev, \"Transmit frame #%d queued in slot %d\\n\",\n+\t\t rp->cur_tx - 1, entry);\n+\n \treturn NETDEV_TX_OK;\n }\n \n@@ -1740,8 +1735,7 @@\n \n \tstatus = rhine_get_events(rp);\n \n-\tif (debug > 4)\n-\t\tnetdev_dbg(dev, \"Interrupt, status %08x\\n\", status);\n+\tnetif_dbg(rp, intr, dev, \"Interrupt, status %08x\\n\", status);\n \n \tif (status & RHINE_EVENT) {\n \t\thandled = 1;\n@@ -1751,9 +1745,8 @@\n \t}\n \n \tif (status & ~(IntrLinkChange | IntrStatsMax | RHINE_EVENT_NAPI)) {\n-\t\tif (debug > 1)\n-\t\t\tnetdev_err(dev, \"Something Wicked happened! %08x\\n\",\n-\t\t\t\t status);\n+\t\tnetif_err(rp, intr, dev, \"Something Wicked happened! %08x\\n\",\n+\t\t\t status);\n \t}\n \n \treturn IRQ_RETVAL(handled);\n@@ -1769,15 +1762,13 @@\n \t\/* find and cleanup dirty tx descriptors *\/\n \twhile (rp->dirty_tx != rp->cur_tx) {\n \t\ttxstatus = le32_to_cpu(rp->tx_ring[entry].tx_status);\n-\t\tif (debug > 6)\n-\t\t\tnetdev_dbg(dev, \"Tx scavenge %d status %08x\\n\",\n-\t\t\t\t entry, txstatus);\n+\t\tnetif_dbg(rp, tx_done, dev, \"Tx scavenge %d status %08x\\n\",\n+\t\t\t entry, txstatus);\n \t\tif (txstatus & DescOwn)\n \t\t\tbreak;\n \t\tif (txstatus & 0x8000) {\n-\t\t\tif (debug > 1)\n-\t\t\t\tnetdev_dbg(dev, \"Transmit error, Tx status %08x\\n\",\n-\t\t\t\t\t txstatus);\n+\t\t\tnetif_dbg(rp, tx_done, dev,\n+\t\t\t\t \"Transmit error, Tx status %08x\\n\", txstatus);\n \t\t\tdev->stats.tx_errors++;\n \t\t\tif (txstatus & 0x0400)\n \t\t\t\tdev->stats.tx_carrier_errors++;\n@@ -1799,10 +1790,8 @@\n \t\t\t\tdev->stats.collisions += (txstatus >> 3) & 0x0F;\n \t\t\telse\n \t\t\t\tdev->stats.collisions += txstatus & 0x0F;\n-\t\t\tif (debug > 6)\n-\t\t\t\tnetdev_dbg(dev, \"collisions: %1.1x:%1.1x\\n\",\n-\t\t\t\t\t (txstatus >> 3) & 0xF,\n-\t\t\t\t\t txstatus & 0xF);\n+\t\t\tnetif_dbg(rp, tx_done, dev, \"collisions: %1.1x:%1.1x\\n\",\n+\t\t\t\t (txstatus >> 3) & 0xF, txstatus & 0xF);\n \t\t\tdev->stats.tx_bytes += rp->tx_skbuff[entry]->len;\n \t\t\tdev->stats.tx_packets++;\n \t\t}\n@@ -1843,11 +1832,8 @@\n \tint count;\n \tint entry = rp->cur_rx % RX_RING_SIZE;\n \n-\tif (debug > 4) {\n-\t\tnetdev_dbg(dev, \"%s(), entry %d status %08x\\n\",\n-\t\t\t __func__, entry,\n-\t\t\t le32_to_cpu(rp->rx_head_desc->rx_status));\n-\t}\n+\tnetif_dbg(rp, rx_status, dev, \"%s(), entry %d status %08x\\n\", __func__,\n+\t\t entry, le32_to_cpu(rp->rx_head_desc->rx_status));\n \n \t\/* If EOP is set on the next entry, it's a new packet. Send it up. *\/\n \tfor (count = 0; count < limit; ++count) {\n@@ -1859,9 +1845,8 @@\n \t\tif (desc_status & DescOwn)\n \t\t\tbreak;\n \n-\t\tif (debug > 4)\n-\t\t\tnetdev_dbg(dev, \"%s() status is %08x\\n\",\n-\t\t\t\t __func__, desc_status);\n+\t\tnetif_dbg(rp, rx_status, dev, \"%s() status %08x\\n\", __func__,\n+\t\t\t desc_status);\n \n \t\tif ((desc_status & (RxWholePkt | RxErr)) != RxWholePkt) {\n \t\t\tif ((desc_status & RxWholePkt) != RxWholePkt) {\n@@ -1877,9 +1862,9 @@\n \t\t\t\tdev->stats.rx_length_errors++;\n \t\t\t} else if (desc_status & RxErr) {\n \t\t\t\t\/* There was a error. *\/\n-\t\t\t\tif (debug > 2)\n-\t\t\t\t\tnetdev_dbg(dev, \"%s() Rx error was %08x\\n\",\n-\t\t\t\t\t\t __func__, desc_status);\n+\t\t\t\tnetif_dbg(rp, rx_err, dev,\n+\t\t\t\t\t \"%s() Rx error %08x\\n\", __func__,\n+\t\t\t\t\t desc_status);\n \t\t\t\tdev->stats.rx_errors++;\n \t\t\t\tif (desc_status & 0x0030)\n \t\t\t\t\tdev->stats.rx_length_errors++;\n@@ -2000,9 +1985,8 @@\n \t}\n \telse {\n \t\t\/* This should never happen *\/\n-\t\tif (debug > 1)\n-\t\t\tnetdev_warn(dev, \"%s() Another error occurred %08x\\n\",\n-\t\t\t\t __func__, intr_status);\n+\t\tnetif_warn(rp, tx_err, dev, \"another error occurred %08x\\n\",\n+\t\t\t intr_status);\n \t}\n \n }\n@@ -2024,6 +2008,9 @@\n \n \tif (intr_status & IntrLinkChange)\n \t\trhine_check_media(dev, 0);\n+\n+\tif (intr_status & IntrPCIErr)\n+\t\tnetif_warn(rp, hw, dev, \"PCI error\\n\");\n \n \tnapi_disable(&rp->napi);\n \trhine_irq_disable(rp);\n@@ -2144,12 +2131,16 @@\n \n static u32 netdev_get_msglevel(struct net_device *dev)\n {\n-\treturn debug;\n+\tstruct rhine_private *rp = netdev_priv(dev);\n+\n+\treturn rp->msg_enable;\n }\n \n static void netdev_set_msglevel(struct net_device *dev, u32 value)\n {\n-\tdebug = value;\n+\tstruct rhine_private *rp = netdev_priv(dev);\n+\n+\trp->msg_enable = value;\n }\n \n static void rhine_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)\n@@ -2222,9 +2213,8 @@\n \tnapi_disable(&rp->napi);\n \tnetif_stop_queue(dev);\n \n-\tif (debug > 1)\n-\t\tnetdev_dbg(dev, \"Shutting down ethercard, status was %04x\\n\",\n-\t\t\t ioread16(ioaddr + ChipCmd));\n+\tnetif_dbg(rp, ifdown, dev, \"Shutting down ethercard, status was %04x\\n\",\n+\t\t ioread16(ioaddr + ChipCmd));\n \n \t\/* Switch to loopback mode to avoid hardware races. *\/\n \tiowrite8(rp->tx_thresh | 0x02, ioaddr + TxConfig);\n@@ -2340,9 +2330,8 @@\n \t\treturn 0;\n \n \tret = pci_set_power_state(pdev, PCI_D0);\n-\tif (debug > 1)\n-\t\tnetdev_info(dev, \"Entering power state D0 %s (%d)\\n\",\n-\t\t\t ret ? \"failed\" : \"succeeded\", ret);\n+\tnetif_info(rp, drv, dev, \"Entering power state D0 %s (%d)\\n\",\n+\t\t ret ? \"failed\" : \"succeeded\", ret);\n \n \tpci_restore_state(pdev);\n \n"} {"commit":"ae996154f72fdd116291f69ec6c856be9c77042a","subject":"via-rhine: Disable device in error path","message":"via-rhine: Disable device in error path\n\nCurrently, via-rhine fails to call pci_disable_device() for errors\nin rhine_init_one().\n\nReported-by: Huqiu Liu <fa477d801e734a7e8516a36afc8298138ab79674@mails.tsinghua.edu.cn>\nSigned-off-by: Roger Luethi <58e412cbe2ec7e4e08150df17744131fb4aabe84@hellgate.ch>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2cfd68ec407609becd75661787043e7cae35f15c","subject":"net\/hinic: increase protection of the VLAN","message":"net\/hinic: increase protection of the VLAN\n\nIf the VLAN id 0 is deleted for hinic, all packets without\nVLAN will be discarded when the VLAN filter is turned on.\n\nFixes: 50ce3e7aec8f (\"ethdev: fix VLAN offloads set if no relative capabilities\")\nCc: stable@dpdk.org\n\nSigned-off-by: Guoyang Zhou <6b63adeefee2663691c7aa9f70cb39344574b4c5@huawei.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/hinic\/hinic_pmd_ethdev.c\n+++ drivers\/net\/hinic\/hinic_pmd_ethdev.c\n@@ -1617,6 +1617,9 @@\n \tif (vlan_id > RTE_ETHER_MAX_VLAN_ID)\n \t\treturn -EINVAL;\n \n+\tif (vlan_id == 0)\n+\t\treturn 0;\n+\n \tfunc_id = hinic_global_func_id(nic_dev->hwdev);\n \n \tif (enable) {\n"} {"commit":"011f4ea09768fdf6f95e3781cba2ed681a2ac710","subject":"netxen: fix tx ring memory leak","message":"netxen: fix tx ring memory leak\n\no While unloading driver or resetting the context, tx ring was not\n getting free.\n\nSigned-off-by: Amit Kumar Salecha <b95978a93e8c5cd598a905aeb6b4a5c23933265e@qlogic.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_init.c\n+++ drivers\/net\/netxen\/netxen_nic_init.c\n@@ -184,6 +184,8 @@\n \n \ttx_ring = adapter->tx_ring;\n \tvfree(tx_ring->cmd_buf_arr);\n+\tkfree(tx_ring);\n+\tadapter->tx_ring = NULL;\n }\n \n int netxen_alloc_sw_resources(struct netxen_adapter *adapter)\n"} {"commit":"a598ae177a11ebae065e20059d9bc63a5da4ccc3","subject":"netxen: fix minor tx timeout bug","message":"netxen: fix minor tx timeout bug\n\nFix minor bug in netdev tx timeout handling which could\nalways lead to firmware reset instead of pci function reset.\n\nnetxen_nic_reset_context() requires __NX_RESETTING bit\ncleared.\n\nSigned-off-by: Dhananjay Phadke <4fd8366feef70cc1c32b7a8089fd6d8a97ab8728@netxen.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_main.c\n+++ drivers\/net\/netxen\/netxen_nic_main.c\n@@ -1903,12 +1903,13 @@\n \n \t\tnetif_wake_queue(adapter->netdev);\n \n-\t\tgoto done;\n+\t\tclear_bit(__NX_RESETTING, &adapter->state);\n \n \t} else {\n+\t\tclear_bit(__NX_RESETTING, &adapter->state);\n \t\tif (!netxen_nic_reset_context(adapter)) {\n \t\t\tadapter->netdev->trans_start = jiffies;\n-\t\t\tgoto done;\n+\t\t\treturn;\n \t\t}\n \n \t\t\/* context reset failed, fall through for fw reset *\/\n@@ -1916,8 +1917,6 @@\n \n request_reset:\n \tadapter->need_fw_reset = 1;\n-done:\n-\tclear_bit(__NX_RESETTING, &adapter->state);\n }\n \n struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)\n"} {"commit":"0beecac8abb3af890d470df541142d55343382d6","subject":"libertas: harden-up exit paths","message":"libertas: harden-up exit paths\n\nThese simple sanity check avoids extra complexity in error paths when\nmoving to asynchronous firmware loading (which means the device may fail to\ninit some time after its creation).\n\nSigned-off-by: Daniel Drake <83b0c3d63e8a11eb6e40077030b59e95bfe31ffa@laptop.org>\nAcked-by: Dan Williams <aeade43d0f8ae14e7c44fa81fe17c1635ae376fe@redhat.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/libertas\/main.c\n+++ drivers\/net\/wireless\/libertas\/main.c\n@@ -1033,7 +1033,9 @@\n \tlbs_deb_enter(LBS_DEB_MAIN);\n \n \tlbs_remove_mesh(priv);\n-\tlbs_scan_deinit(priv);\n+\n+\tif (priv->wiphy_registered)\n+\t\tlbs_scan_deinit(priv);\n \n \t\/* worker thread destruction blocks on the in-flight command which\n \t * should have been cleared already in lbs_stop_card().\n@@ -1127,6 +1129,11 @@\n \tif (!priv)\n \t\tgoto out;\n \tdev = priv->dev;\n+\n+\t\/* If the netdev isn't registered, it means that lbs_start_card() was\n+\t * never called so we have nothing to do here. *\/\n+\tif (dev->reg_state != NETREG_REGISTERED)\n+\t\tgoto out;\n \n \tnetif_stop_queue(dev);\n \tnetif_carrier_off(dev);\n"} {"commit":"ed3e26049e238d066841f858509b764df37c3776","subject":"sh-pfc: r8a7790: Don't use GPIO enum entries","message":"sh-pfc: r8a7790: Don't use GPIO enum entries\n\nRefactor the GPIO macro magic to use GPIO numbers directly instead of\nthe GPIO_GP_x_y enum entries. This will allow removing the GPIO enum\nentries from the mach\/r8a7790.h header.\n\nSigned-off-by: Laurent Pinchart <ae960578cc5eca7b9b1dbc37d9caa6cb634f35e0@ideasonboard.com>\nSigned-off-by: Simon Horman <9662bddcc379be37df16f02a449c344b4718c1a1@verge.net.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"202909cdf117743bdbf8abc0f817950c8955c8cf","subject":"pinctrl: sh-pfc: r8a7790: Add QSPI pin groups","message":"pinctrl: sh-pfc: r8a7790: Add QSPI pin groups\n\nA QSPI function set consists of 3 groups:\n - qspi_ctrl (2 control wires)\n - qspi_data2 (2 data wires, for Single\/Dual SPI)\n - qspi_data4 (4 data wires, for Quad SPI)\n\nSigned-off-by: Geert Uytterhoeven <a1ff81395f7e6bf5b509fe9aab06bf3419493e1d@linux-m68k.org>\nAcked-by: Laurent Pinchart <3ded2f39a78f0d7044839546f95841842b4d7c96@ideasonboard.com>\nSigned-off-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"76cda6ec39d30a9d40ae2a82a6015381438a87eb","subject":"drivers: pinctrl: vt8500: use devm_ioremap_resource()","message":"drivers: pinctrl: vt8500: use devm_ioremap_resource()\n\nReplace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.\n\nFound with coccicheck and this semantic patch:\n scripts\/coccinelle\/api\/devm_ioremap_resource.cocci\n\nSigned-off-by: Laurent Navet <049659cdfcbbaec8e29d19668ed7e4a1a04d7a9f@gmail.com>\nAcked-by: Tony Prisk <ba324ca7b1c77fc20bb970d5aff6eea9377918a5@prisktech.co.nz>\nSigned-off-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"38e11cdec90f1dd7355db4aed8a1857258e99485","subject":"thinkpad-acpi: disclose usertask for ALSA callbacks","message":"thinkpad-acpi: disclose usertask for ALSA callbacks\n\nDisclose the user task doing ALSA access when requested by\nthe debug bitmask.\n\nSigned-off-by: Henrique de Moraes Holschuh <1416ae054606eb9be8fa0d7696a4ddff667a3601@hmh.eng.br>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/platform\/x86\/thinkpad_acpi.c\n+++ drivers\/platform\/x86\/thinkpad_acpi.c\n@@ -6740,6 +6740,8 @@\n static int volume_alsa_vol_put(struct snd_kcontrol *kcontrol,\n \t\t\t\tstruct snd_ctl_elem_value *ucontrol)\n {\n+\ttpacpi_disclose_usertask(\"ALSA\", \"set volume to %ld\\n\",\n+\t\t\t\t ucontrol->value.integer.value[0]);\n \treturn volume_alsa_set_volume(ucontrol->value.integer.value[0]);\n }\n \n@@ -6763,6 +6765,9 @@\n static int volume_alsa_mute_put(struct snd_kcontrol *kcontrol,\n \t\t\t\tstruct snd_ctl_elem_value *ucontrol)\n {\n+\ttpacpi_disclose_usertask(\"ALSA\", \"%smute\\n\",\n+\t\t\t\t ucontrol->value.integer.value[0] ?\n+\t\t\t\t\t\"un\" : \"\");\n \treturn volume_alsa_set_mute(!ucontrol->value.integer.value[0]);\n }\n \n"} {"commit":"f4b79637f33a33716924c543b0f0a1bffa407b8e","subject":"TaskCenterLine.h: correct line endings","message":"TaskCenterLine.h: correct line endings\n","repos":"Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Mod\/TechDraw\/Gui\/TaskCenterLine.h\n+++ src\/Mod\/TechDraw\/Gui\/TaskCenterLine.h\n@@ -1,180 +1,180 @@\n-\/***************************************************************************\r\n- * Copyright (c) 2019 WandererFan <wandererfan@gmail.com> *\r\n- * *\r\n- * This file is part of the FreeCAD CAx development system. *\r\n- * *\r\n- * This library is free software; you can redistribute it and\/or *\r\n- * modify it under the terms of the GNU Library General Public *\r\n- * License as published by the Free Software Foundation; either *\r\n- * version 2 of the License, or (at your option) any later version. *\r\n- * *\r\n- * This library is distributed in the hope that it will be useful, *\r\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of *\r\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *\r\n- * GNU Library General Public License for more details. *\r\n- * *\r\n- * You should have received a copy of the GNU Library General Public *\r\n- * License along with this library; see the file COPYING.LIB. If not, *\r\n- * write to the Free Software Foundation, Inc., 59 Temple Place, *\r\n- * Suite 330, Boston, MA 02111-1307, USA *\r\n- * *\r\n- ***************************************************************************\/\r\n-\r\n-#ifndef TECHDRAWGUI_TASKCENTERLINE_H\r\n-#define TECHDRAWGUI_TASKCENTERLINE_H\r\n-\r\n-#include <App\/DocumentObject.h>\r\n-#include <Base\/Vector3D.h>\r\n-#include <Gui\/TaskView\/TaskView.h>\r\n-#include <Gui\/TaskView\/TaskDialog.h>\r\n-\r\n-#include <Mod\/TechDraw\/Gui\/ui_TaskCenterLine.h>\r\n-\r\n-\/*#include \"QGTracker.h\"*\/\r\n-\r\n-\/\/TODO: make this a proper enum\r\n-#define TRACKERPICK 0\r\n-#define TRACKEREDIT 1\r\n-#define TRACKERCANCEL 2\r\n-#define TRACKERCANCELEDIT 3\r\n-#define TRACKERFINISHED 4\r\n-#define TRACKERSAVE 5\r\n-\r\n-class Ui_TaskCenterLine;\r\n-\r\n-namespace App {\r\n-class DocumentObject;\r\n-}\r\n-\r\n-namespace TechDraw\r\n-{\r\n-class DrawPage;\r\n-class DrawView;\r\n-class DrawViewPart;\r\n-class CosmeticEdge;\r\n-class LineFormat;\r\n-}\r\n-\r\n-namespace TechDraw\r\n-{\r\n-class Face;\r\n-}\r\n-\r\n-namespace TechDrawGui\r\n-{\r\n-class QGVPage;\r\n-class QGIView;\r\n-class QGIPrimPath;\r\n-class MDIViewPage;\r\n-class ViewProviderViewPart;\r\n-\r\n-class TaskCenterLine : public QWidget\r\n-{\r\n- Q_OBJECT\r\n-\r\n-public:\r\n- TaskCenterLine(TechDraw::DrawViewPart* baseFeat,\r\n- TechDraw::DrawPage* page,\r\n- std::vector<std::string> subNames);\r\n- TaskCenterLine(TechDraw::DrawViewPart* baseFeat,\r\n- TechDraw::DrawPage* page,\r\n- std::string edgeName);\r\n- ~TaskCenterLine();\r\n-\r\n-public Q_SLOTS:\r\n-\r\n-public:\r\n- virtual bool accept();\r\n- virtual bool reject();\r\n- virtual void setCreateMode(bool b) { m_createMode = b; }\r\n- virtual bool getCreateMode(void) { return m_createMode; }\r\n- void updateTask();\r\n- void saveButtons(QPushButton* btnOK,\r\n- QPushButton* btnCancel);\r\n- void enableTaskButtons(bool b);\r\n- void setFlipped(bool b);\r\n-\r\n-\r\n-protected Q_SLOTS:\r\n-\r\n-protected:\r\n- void changeEvent(QEvent *e);\r\n-\r\n- void blockButtons(bool b);\r\n- void setUiPrimary(void);\r\n- void setUiEdit(void);\r\n-\r\n- void createCenterLine(void);\r\n- void create2Lines(void);\r\n- void create2Points(void);\r\n-\r\n- void updateCenterLine(void);\r\n- void update2Lines(void);\r\n- void update2Points(void);\r\n-\r\n- double getCenterWidth();\r\n- QColor getCenterColor();\r\n- Qt::PenStyle getCenterStyle();\r\n- double getExtendBy();\r\n-\r\n-private:\r\n- Ui_TaskCenterLine * ui;\r\n-\r\n- TechDraw::DrawViewPart* m_partFeat;\r\n- TechDraw::DrawPage* m_basePage;\r\n- bool m_createMode;\r\n-\r\n- QPushButton* m_btnOK;\r\n- QPushButton* m_btnCancel;\r\n-\r\n- std::vector<std::string> m_subNames;\r\n- std::string m_edgeName;\r\n- double m_extendBy;\r\n- int m_geomIndex;\r\n- TechDraw::CenterLine* m_cl;\r\n- int m_clIdx;\r\n- int m_type;\r\n- int m_mode;\r\n-};\r\n-\r\n-class TaskDlgCenterLine : public Gui::TaskView::TaskDialog\r\n-{\r\n- Q_OBJECT\r\n-\r\n-public:\r\n- TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat,\r\n- TechDraw::DrawPage* page,\r\n- std::vector<std::string> subNames);\r\n- TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat,\r\n- TechDraw::DrawPage* page,\r\n- std::string edgeName);\r\n- ~TaskDlgCenterLine();\r\n-\r\n-public:\r\n- \/\/\/ is called the TaskView when the dialog is opened\r\n- virtual void open();\r\n- \/\/\/ is called by the framework if an button is clicked which has no accept or reject role\r\n- virtual void clicked(int);\r\n- \/\/\/ is called by the framework if the dialog is accepted (Ok)\r\n- virtual bool accept();\r\n- \/\/\/ is called by the framework if the dialog is rejected (Cancel)\r\n- virtual bool reject();\r\n- \/\/\/ is called by the framework if the user presses the help button\r\n- virtual void helpRequested() { return;}\r\n- virtual bool isAllowedAlterDocument(void) const\r\n- { return false; }\r\n- void update();\r\n-\r\n- void modifyStandardButtons(QDialogButtonBox* box);\r\n-\r\n-protected:\r\n-\r\n-private:\r\n- TaskCenterLine* widget;\r\n- Gui::TaskView::TaskBox* taskbox;\r\n-\r\n-};\r\n-\r\n-} \/\/namespace TechDrawGui\r\n-\r\n-#endif \/\/ #ifndef TECHDRAWGUI_TASKCENTERLINE_H\r\n+\/***************************************************************************\n+ * Copyright (c) 2019 WandererFan <wandererfan@gmail.com> *\n+ * *\n+ * This file is part of the FreeCAD CAx development system. *\n+ * *\n+ * This library is free software; you can redistribute it and\/or *\n+ * modify it under the terms of the GNU Library General Public *\n+ * License as published by the Free Software Foundation; either *\n+ * version 2 of the License, or (at your option) any later version. *\n+ * *\n+ * This library is distributed in the hope that it will be useful, *\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *\n+ * GNU Library General Public License for more details. *\n+ * *\n+ * You should have received a copy of the GNU Library General Public *\n+ * License along with this library; see the file COPYING.LIB. If not, *\n+ * write to the Free Software Foundation, Inc., 59 Temple Place, *\n+ * Suite 330, Boston, MA 02111-1307, USA *\n+ * *\n+ ***************************************************************************\/\n+\n+#ifndef TECHDRAWGUI_TASKCENTERLINE_H\n+#define TECHDRAWGUI_TASKCENTERLINE_H\n+\n+#include <App\/DocumentObject.h>\n+#include <Base\/Vector3D.h>\n+#include <Gui\/TaskView\/TaskView.h>\n+#include <Gui\/TaskView\/TaskDialog.h>\n+\n+#include <Mod\/TechDraw\/Gui\/ui_TaskCenterLine.h>\n+\n+\/*#include \"QGTracker.h\"*\/\n+\n+\/\/TODO: make this a proper enum\n+#define TRACKERPICK 0\n+#define TRACKEREDIT 1\n+#define TRACKERCANCEL 2\n+#define TRACKERCANCELEDIT 3\n+#define TRACKERFINISHED 4\n+#define TRACKERSAVE 5\n+\n+class Ui_TaskCenterLine;\n+\n+namespace App {\n+class DocumentObject;\n+}\n+\n+namespace TechDraw\n+{\n+class DrawPage;\n+class DrawView;\n+class DrawViewPart;\n+class CosmeticEdge;\n+class LineFormat;\n+}\n+\n+namespace TechDraw\n+{\n+class Face;\n+}\n+\n+namespace TechDrawGui\n+{\n+class QGVPage;\n+class QGIView;\n+class QGIPrimPath;\n+class MDIViewPage;\n+class ViewProviderViewPart;\n+\n+class TaskCenterLine : public QWidget\n+{\n+ Q_OBJECT\n+\n+public:\n+ TaskCenterLine(TechDraw::DrawViewPart* baseFeat,\n+ TechDraw::DrawPage* page,\n+ std::vector<std::string> subNames);\n+ TaskCenterLine(TechDraw::DrawViewPart* baseFeat,\n+ TechDraw::DrawPage* page,\n+ std::string edgeName);\n+ ~TaskCenterLine();\n+\n+public Q_SLOTS:\n+\n+public:\n+ virtual bool accept();\n+ virtual bool reject();\n+ virtual void setCreateMode(bool b) { m_createMode = b; }\n+ virtual bool getCreateMode(void) { return m_createMode; }\n+ void updateTask();\n+ void saveButtons(QPushButton* btnOK,\n+ QPushButton* btnCancel);\n+ void enableTaskButtons(bool b);\n+ void setFlipped(bool b);\n+\n+\n+protected Q_SLOTS:\n+\n+protected:\n+ void changeEvent(QEvent *e);\n+\n+ void blockButtons(bool b);\n+ void setUiPrimary(void);\n+ void setUiEdit(void);\n+\n+ void createCenterLine(void);\n+ void create2Lines(void);\n+ void create2Points(void);\n+\n+ void updateCenterLine(void);\n+ void update2Lines(void);\n+ void update2Points(void);\n+\n+ double getCenterWidth();\n+ QColor getCenterColor();\n+ Qt::PenStyle getCenterStyle();\n+ double getExtendBy();\n+\n+private:\n+ Ui_TaskCenterLine * ui;\n+\n+ TechDraw::DrawViewPart* m_partFeat;\n+ TechDraw::DrawPage* m_basePage;\n+ bool m_createMode;\n+\n+ QPushButton* m_btnOK;\n+ QPushButton* m_btnCancel;\n+\n+ std::vector<std::string> m_subNames;\n+ std::string m_edgeName;\n+ double m_extendBy;\n+ int m_geomIndex;\n+ TechDraw::CenterLine* m_cl;\n+ int m_clIdx;\n+ int m_type;\n+ int m_mode;\n+};\n+\n+class TaskDlgCenterLine : public Gui::TaskView::TaskDialog\n+{\n+ Q_OBJECT\n+\n+public:\n+ TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat,\n+ TechDraw::DrawPage* page,\n+ std::vector<std::string> subNames);\n+ TaskDlgCenterLine(TechDraw::DrawViewPart* baseFeat,\n+ TechDraw::DrawPage* page,\n+ std::string edgeName);\n+ ~TaskDlgCenterLine();\n+\n+public:\n+ \/\/\/ is called the TaskView when the dialog is opened\n+ virtual void open();\n+ \/\/\/ is called by the framework if an button is clicked which has no accept or reject role\n+ virtual void clicked(int);\n+ \/\/\/ is called by the framework if the dialog is accepted (Ok)\n+ virtual bool accept();\n+ \/\/\/ is called by the framework if the dialog is rejected (Cancel)\n+ virtual bool reject();\n+ \/\/\/ is called by the framework if the user presses the help button\n+ virtual void helpRequested() { return;}\n+ virtual bool isAllowedAlterDocument(void) const\n+ { return false; }\n+ void update();\n+\n+ void modifyStandardButtons(QDialogButtonBox* box);\n+\n+protected:\n+\n+private:\n+ TaskCenterLine* widget;\n+ Gui::TaskView::TaskBox* taskbox;\n+\n+};\n+\n+} \/\/namespace TechDrawGui\n+\n+#endif \/\/ #ifndef TECHDRAWGUI_TASKCENTERLINE_H\n"} {"commit":"d01c3a1e1b1e4e417202adf1e9dec0730eb00e2b","subject":"regulator: anatop: Convert to set_voltage_sel and regulator_map_voltage_linear","message":"regulator: anatop: Convert to set_voltage_sel and regulator_map_voltage_linear\n\nSigned-off-by: Axel Lin <b6ffd6973e972cb999e8e535ab74da7fee0c035f@gmail.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/regulator\/anatop-regulator.c\n+++ drivers\/regulator\/anatop-regulator.c\n@@ -43,33 +43,15 @@\n \tstruct regulator_init_data *initdata;\n };\n \n-static int anatop_set_voltage(struct regulator_dev *reg, int min_uV,\n-\t\t\t\t int max_uV, unsigned *selector)\n+static int anatop_set_voltage_sel(struct regulator_dev *reg, unsigned selector)\n {\n \tstruct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);\n-\tu32 val, sel, mask;\n-\tint uv;\n-\n-\tuv = min_uV;\n-\tdev_dbg(®->dev, \"%s: uv %d, min %d, max %d\\n\", __func__,\n-\t\tuv, anatop_reg->min_voltage,\n-\t\tanatop_reg->max_voltage);\n-\n-\tif (uv < anatop_reg->min_voltage) {\n-\t\tif (max_uV > anatop_reg->min_voltage)\n-\t\t\tuv = anatop_reg->min_voltage;\n-\t\telse\n-\t\t\treturn -EINVAL;\n-\t}\n+\tu32 val, mask;\n \n \tif (!anatop_reg->control_reg)\n \t\treturn -ENOTSUPP;\n \n-\tsel = DIV_ROUND_UP(uv - anatop_reg->min_voltage, 25000);\n-\tif (sel * 25000 + anatop_reg->min_voltage > anatop_reg->max_voltage)\n-\t\treturn -EINVAL;\n-\tval = anatop_reg->min_bit_val + sel;\n-\t*selector = sel;\n+\tval = anatop_reg->min_bit_val + selector;\n \tdev_dbg(®->dev, \"%s: calculated val %d\\n\", __func__, val);\n \tmask = ((1 << anatop_reg->vol_bit_width) - 1) <<\n \t\tanatop_reg->vol_bit_shift;\n@@ -95,9 +77,10 @@\n }\n \n static struct regulator_ops anatop_rops = {\n-\t.set_voltage = anatop_set_voltage,\n+\t.set_voltage_sel = anatop_set_voltage_sel,\n \t.get_voltage_sel = anatop_get_voltage_sel,\n-\t.list_voltage = regulator_list_voltage_linear,\n+\t.list_voltage = regulator_list_voltage_linear,\n+\t.map_voltage = regulator_map_voltage_linear,\n };\n \n static int __devinit anatop_regulator_probe(struct platform_device *pdev)\n"} {"commit":"88c84c14cca44d9409f1733dfdecc1f473463f20","subject":"regulator: da9052: add device tree support","message":"regulator: da9052: add device tree support\n\nThis patch adds device tree support for dialog regulators\n\nSigned-off-by: Ying-Chun Liu (PaulLiu) <b2208d5e3abe8ebd68b9a2a6b6e7f25949a99af3@linaro.org>\nCc: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\nCc: Liam Girdwood <a57ef363056e61beffa2efa59c68550d40db03b0@ti.com>\nCc: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\nCc: Shawn Guo <912cf7eb7d8018e2943586ae6657d21fd4e38239@linaro.org>\nCc: Ashish Jangam <caa503e97cd799f8fce84458c94b46db0d04d212@kpitcummins.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/regulator\/da9052-regulator.c\n+++ drivers\/regulator\/da9052-regulator.c\n@@ -19,6 +19,9 @@\n #include <linux\/platform_device.h>\n #include <linux\/regulator\/driver.h>\n #include <linux\/regulator\/machine.h>\n+#ifdef CONFIG_OF\n+#include <linux\/regulator\/of_regulator.h>\n+#endif\n \n #include <linux\/mfd\/da9052\/da9052.h>\n #include <linux\/mfd\/da9052\/reg.h>\n@@ -425,8 +428,32 @@\n \t}\n \n \tconfig.dev = &pdev->dev;\n-\tconfig.init_data = pdata->regulators[pdev->id];\n \tconfig.driver_data = regulator;\n+\tif (pdata && pdata->regulators) {\n+\t\tconfig.init_data = pdata->regulators[pdev->id];\n+\t} else {\n+#ifdef CONFIG_OF\n+\t\tstruct device_node *nproot = da9052->dev->of_node;\n+\t\tstruct device_node *np;\n+\n+\t\tif (!nproot)\n+\t\t\treturn -ENODEV;\n+\n+\t\tnproot = of_find_node_by_name(nproot, \"regulators\");\n+\t\tif (!nproot)\n+\t\t\treturn -ENODEV;\n+\n+\t\tfor (np = of_get_next_child(nproot, NULL); !np;\n+\t\t np = of_get_next_child(nproot, np)) {\n+\t\t\tif (!of_node_cmp(np->name,\n+\t\t\t\t\t regulator->info->reg_desc.name)) {\n+\t\t\t\tconfig.init_data = of_get_regulator_init_data(\n+\t\t\t\t\t&pdev->dev, np);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+#endif\n+\t}\n \n \tregulator->rdev = regulator_register(®ulator->info->reg_desc,\n \t\t\t\t\t &config);\n"} {"commit":"f17083c3affccfe955b0a419056784096c18fea8","subject":"regulator: da9055: Remove use of regmap_irq_get_virq()","message":"regulator: da9055: Remove use of regmap_irq_get_virq()\n\nSigned-off-by: Adam Thomson <313e0c15281ce7d11de2ea6827bd342763ae0515@diasemi.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"f377ed107b031fb0e67fa4a1d1096ab1c7818a84","subject":"regulator: da9063: fix assignment of da9063_reg_matches to NULL","message":"regulator: da9063: fix assignment of da9063_reg_matches to NULL\n\ncppcheck detected an incorrect assignment:\n\n drivers\/regulator\/da9063-regulator.c:711]: (warning) Assignment\n of function parameter has no effect outside the function\n\nthe original code didn't do anything, instead, *da9063_reg_matches\nneeds to be set to NULL.\n\nSigned-off-by: Colin Ian King <d100aa70785e45ee8deab668147d941941915c21@canonical.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"0565021655dd0e4dd0f26ab4c0273e88a6ddc666","subject":"regulator: wm8994: Convert to module_platform_driver()","message":"regulator: wm8994: Convert to module_platform_driver()\n\nThe regulators can only be used to supply the CODEC so we don't need to\nworry about users that still need fudges for init ordering issues.\n\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/regulator\/wm8994-regulator.c\n+++ drivers\/regulator\/wm8994-regulator.c\n@@ -162,23 +162,7 @@\n \t},\n };\n \n-static int __init wm8994_ldo_init(void)\n-{\n-\tint ret;\n-\n-\tret = platform_driver_register(&wm8994_ldo_driver);\n-\tif (ret != 0)\n-\t\tpr_err(\"Failed to register Wm8994 GP LDO driver: %d\\n\", ret);\n-\n-\treturn ret;\n-}\n-subsys_initcall(wm8994_ldo_init);\n-\n-static void __exit wm8994_ldo_exit(void)\n-{\n-\tplatform_driver_unregister(&wm8994_ldo_driver);\n-}\n-module_exit(wm8994_ldo_exit);\n+module_platform_driver(wm8994_ldo_driver);\n \n \/* Module information *\/\n MODULE_AUTHOR(\"Mark Brown <broonie@opensource.wolfsonmicro.com>\");\n"} {"commit":"95cee62cb4776a65229a6b6d5969be56589d95c1","subject":"remoteproc: Cocci spatch \"memdup.spatch\"","message":"remoteproc: Cocci spatch \"memdup.spatch\"\n\nUse kmemdup instead of kmalloc + memcpy.\n\nSigned-off-by: Thomas Meyer <5f50a84c1fa3bcff146405017f36aec1a10a9e38@m3y3r.de>\nSigned-off-by: Ohad Ben-Cohen <f42ebdd520afb7505b40286b1d13fbb7281e5b96@wizery.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"0128d5cf8f85c93b3c70ff03299c2839f3e6d21e","subject":"megaraid_sas: driver version update","message":"megaraid_sas: driver version update\n\nUpdate megaraid_sas driver version.\n\nSigned-off-by: Sumit Saxena <45fdae0e80c55fee257113fbd3e01357c37bfd12@avagotech.com>\nReviewed-by: Martin K. Petersen <0384aaef27f06874adbdb09a807bb339f4aff9fd@oracle.com>\nSigned-off-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@lst.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ac1e92677659feb7ee4f74cb82cfcb34e23bc954","subject":"drivers\/sm_pwm_01c: fix undefined saul attribute","message":"drivers\/sm_pwm_01c: fix undefined saul attribute\n","repos":"miri64\/RIOT,miri64\/RIOT,kaspar030\/RIOT,kaspar030\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,ant9000\/RIOT,ant9000\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,jasonatran\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,miri64\/RIOT,ant9000\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,ant9000\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/sm_pwm_01c\/sm_pwm_01c_saul.c\n+++ drivers\/sm_pwm_01c\/sm_pwm_01c_saul.c\n@@ -55,12 +55,10 @@\n .read = read_mc_pm_10,\n .write = saul_notsup,\n .type = SAUL_SENSE_PM,\n- .subtype = SAUL_SENSE_PM_10,\n };\n \n const saul_driver_t sm_pwm_01c_saul_driver_mc_pm_2p5 = {\n .read = read_mc_pm_2p5,\n .write = saul_notsup,\n .type = SAUL_SENSE_PM,\n- .subtype = SAUL_SENSE_PM_2p5,\n };\n"} {"commit":"754ab5c0e55dd118273ca2c217c4d95e9fbc8259","subject":"staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors","message":"staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors\n\nComedi has two sorts of minor devices:\n(a) normal board minor devices in the range 0 to\nCOMEDI_NUM_BOARD_MINORS-1 inclusive; and\n(b) special subdevice minor devices in the range COMEDI_NUM_BOARD_MINORS\nupwards that are used to open the same underlying comedi device as the\nnormal board minor devices, but with non-default read and write\nsubdevices for asynchronous commands.\n\nThe special subdevice minor devices get created when a board supporting\nasynchronous commands is attached to a normal board minor device, and\ndestroyed when the board is detached from the normal board minor device.\nOne way to attach or detach a board is by using the COMEDI_DEVCONFIG\nioctl. This should only be used on normal board minors as the special\nsubdevice minors are too ephemeral. In particular, the change\nintroduced in commit 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c (\"staging:\ncomedi: prevent auto-unconfig of manually configured devices\") breaks\nhorribly for special subdevice minor devices.\n\nSince there's no legitimate use for the COMEDI_DEVCONFIG ioctl on a\nspecial subdevice minor device node, disallow it and return -ENOTTY.\n\nSigned-off-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nCc: stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/comedi_fops.c\n+++ drivers\/staging\/comedi\/comedi_fops.c\n@@ -1633,6 +1633,11 @@\n \t\/* Device config is special, because it must work on\n \t * an unconfigured device. *\/\n \tif (cmd == COMEDI_DEVCONFIG) {\n+\t\tif (minor >= COMEDI_NUM_BOARD_MINORS) {\n+\t\t\t\/* Device config not appropriate on non-board minors. *\/\n+\t\t\trc = -ENOTTY;\n+\t\t\tgoto done;\n+\t\t}\n \t\trc = do_devconfig_ioctl(dev,\n \t\t\t\t\t(struct comedi_devconfig __user *)arg);\n \t\tif (rc == 0)\n"} {"commit":"db210da268ec537f8944ea5bc490184a6707c8a2","subject":"staging: comedi: add comedi_clear_board_dev()","message":"staging: comedi: add comedi_clear_board_dev()\n\nAdd local function `comedi_clear_board_dev()` as a safer alternative to\n`comedi_clear_board_minor()` when we already have a pointer to a `struct\ncomedi_device`. It uses the board minor device number stored in the\n`struct comedi_device` (which must have already been initialized) and\nonly clears the entry in `comedi_board_minor_table[]` if it points to\nthe specified `struct comedi_device`. Rather than returning the old\ntable entry, it returns `true` if the entry matched (and so has just\nbeen cleared) and returns `false` otherwise.\n\nCall `comedi_clear_board_dev()` instead of `comedi_clear_board_minor()`\nin `comedi_unlocked_ioctl()` (in the code that frees a dynamically\nallocated comedi device detached by the `COMEDI_DEVCONFIG` ioctl). That\nought to return `true` but check it just in case before freeing the\ndevice. There is still a race condition here which needs to be dealt\nwith once we've implemented reference counting for `struct\ncomedi_device`s.\n\nSigned-off-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nReviewed-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/comedi_fops.c\n+++ drivers\/staging\/comedi\/comedi_fops.c\n@@ -118,6 +118,20 @@\n \t}\n \tmutex_unlock(&dev->mutex);\n \tmutex_destroy(&dev->mutex);\n+}\n+\n+static bool comedi_clear_board_dev(struct comedi_device *dev)\n+{\n+\tunsigned int i = dev->minor;\n+\tbool cleared = false;\n+\n+\tmutex_lock(&comedi_board_minor_table_lock);\n+\tif (dev == comedi_board_minor_table[i]) {\n+\t\tcomedi_board_minor_table[i] = NULL;\n+\t\tcleared = true;\n+\t}\n+\tmutex_unlock(&comedi_board_minor_table_lock);\n+\treturn cleared;\n }\n \n static struct comedi_device *comedi_clear_board_minor(unsigned minor)\n@@ -1766,9 +1780,7 @@\n \t\t\t dev->minor >= comedi_num_legacy_minors) {\n \t\t\t\t\/* Successfully unconfigured a dynamically\n \t\t\t\t * allocated device. Try and remove it. *\/\n-\t\t\t\tstruct comedi_device *devr;\n-\t\t\t\tdevr = comedi_clear_board_minor(dev->minor);\n-\t\t\t\tif (dev == devr) {\n+\t\t\t\tif (comedi_clear_board_dev(dev)) {\n \t\t\t\t\tmutex_unlock(&dev->mutex);\n \t\t\t\t\tcomedi_free_board_dev(dev);\n \t\t\t\t\treturn rc;\n"} {"commit":"54160729c58408fedd762cde4579691731c2ae97","subject":"Staging: rtl8192u: Replace printk() with netdev_dbg()","message":"Staging: rtl8192u: Replace printk() with netdev_dbg()\n\nFor dynamic debugging netdev_dbg (if there is a ponterto a device\nnet structure) is preferred over printk(), which is the raw way\nto print something. Issue found by checkpatch.pl.\n\nSigned-off-by: Ksenija Stanojevic <037c60d3d1861fb0d1f9bea3b5241247f9c34e8d@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"960cf81187833ed3f19850551d46377323043876","subject":"staging: vt6655: vt6655_init_info function must be void type","message":"staging: vt6655: vt6655_init_info function must be void type\n\nthis is because it doesn't fail anywhere and returning a value\nfrom it will be completely unnecesary.\n\nSigned-off-by: Devendra Naga <97fdf9fb34d40445b99f4e064a18057cd6e2bccb@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/staging\/vt6655\/device_main.c\n+++ drivers\/staging\/vt6655\/device_main.c\n@@ -290,7 +290,7 @@\n \n \n static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent);\n-static bool vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO);\n+static void vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice, PCHIP_INFO);\n static void device_free_info(PSDevice pDevice);\n static bool device_get_pci_info(PSDevice, struct pci_dev* pcid);\n static void device_print_info(PSDevice pDevice);\n@@ -935,9 +935,7 @@\n bFirst=false;\n }\n \n- if (!vt6655_init_info(pcid, &pDevice, pChip_info)) {\n- return -ENOMEM;\n- }\n+ vt6655_init_info(pcid, &pDevice, pChip_info);\n pDevice->dev = dev;\n pDevice->next_module = root_device_dev;\n root_device_dev = dev;\n@@ -1101,7 +1099,7 @@\n \n }\n \n-static bool __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice,\n+static void __devinit vt6655_init_info(struct pci_dev* pcid, PSDevice* ppDevice,\n PCHIP_INFO pChip_info) {\n \n PSDevice p;\n@@ -1125,8 +1123,6 @@\n (*ppDevice)->multicast_limit =32;\n \n spin_lock_init(&((*ppDevice)->lock));\n-\n- return true;\n }\n \n static bool device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) {\n"} {"commit":"84c00afef41a2172b7290f3d75e082e6dd609a58","subject":"staging: vt6655: fix sparse warnings: incorrect argument type","message":"staging: vt6655: fix sparse warnings: incorrect argument type\n\nthis patch fixes following sparse warnings:\n\ndrivers\/staging\/vt6655\/device_main.c:1503:25: warning: incorrect type in argument 1 (different address spaces)\ndrivers\/staging\/vt6655\/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>\ndrivers\/staging\/vt6655\/device_main.c:1503:25: got struct vnt_private *\ndrivers\/staging\/vt6655\/device_main.c:1503:25: warning: incorrect type in argument 2 (different address spaces)\ndrivers\/staging\/vt6655\/device_main.c:1503:25: expected void [noderef] <asn:2>*<noident>\ndrivers\/staging\/vt6655\/device_main.c:1503:25: got struct vnt_private *\ndrivers\/staging\/vt6655\/device_main.c:1505:25: warning: incorrect type in argument 1 (different address spaces)\ndrivers\/staging\/vt6655\/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>\ndrivers\/staging\/vt6655\/device_main.c:1505:25: got struct vnt_private *\ndrivers\/staging\/vt6655\/device_main.c:1505:25: warning: incorrect type in argument 2 (different address spaces)\ndrivers\/staging\/vt6655\/device_main.c:1505:25: expected void [noderef] <asn:2>*<noident>\ndrivers\/staging\/vt6655\/device_main.c:1505:25: got struct vnt_private *\n\nSigned-off-by: Mike Krinkin <9a024e2544da0dd1d651d8a76b83357108d77e55@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a31a942a148e0083ce560ffeb54fb60e06ab7201","subject":"usb: phy: am335x-control: wait 1ms after power-up transitions","message":"usb: phy: am335x-control: wait 1ms after power-up transitions\n\nTests have shown that when a power-up transition is followed by other\nPHY operations too quickly, the USB port appears dead. Waiting 1ms fixes\nthis problem.\n\nSigned-off-by: Daniel Mack <70806a71956ed8873ecff8522779dae1401a1b4a@gmail.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org [3.14]\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"012fbe038283b5194e11139920bc629d696c74b6","subject":"msm: 8974: add MHL device discovery flag","message":"msm: 8974: add MHL device discovery flag\n\nThis change stores a static flag for keeping MHL device\ndiscovery and makes the driver flexible to function in either\none of the modes. It would be very simple to make this dynamically\nconfigurable through boot param or module param.\n\nChange-Id: If3915c5861e61bc572a9b4e239a6133e5e9a138b\nSigned-off-by: Manoj Rao <8e3d629b389a351bc9ec544515e25783a6118870@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/msm\/mdss\/mhl_sii8334.c\n+++ drivers\/video\/msm\/mdss\/mhl_sii8334.c\n@@ -62,6 +62,7 @@\n \tstruct completion rgnd_done;\n \tvoid (*notify_usb_online)(int online);\n \tstruct usb_ext_notification *mhl_info;\n+\tbool disc_enabled;\n };\n \n \n@@ -203,11 +204,29 @@\n \treturn 0;\n }\n \n+\n+static int mhl_sii_wait_for_rgnd(struct mhl_tx_ctrl *mhl_ctrl)\n+{\n+\tint timeout;\n+\t\/* let isr handle RGND interrupt *\/\n+\tpr_debug(\"%s:%u\\n\", __func__, __LINE__);\n+\tINIT_COMPLETION(mhl_ctrl->rgnd_done);\n+\ttimeout = wait_for_completion_interruptible_timeout\n+\t\t(&mhl_ctrl->rgnd_done, HZ\/2);\n+\tif (!timeout) {\n+\t\t\/* most likely nothing plugged in USB *\/\n+\t\t\/* USB HOST connected or already in USB mode *\/\n+\t\tpr_warn(\"%s:%u timedout\\n\", __func__, __LINE__);\n+\t\treturn -ENODEV;\n+\t}\n+\treturn mhl_ctrl->mhl_mode ? 0 : 1;\n+}\n+\n \/* USB_HANDSHAKING FUNCTIONS *\/\n static int mhl_sii_device_discovery(void *data, int id,\n \t\t\t void (*usb_notify_cb)(int online))\n {\n-\tint timeout, rc;\n+\tint rc;\n \tstruct mhl_tx_ctrl *mhl_ctrl = data;\n \n \tif (id) {\n@@ -227,30 +246,24 @@\n \tif (!mhl_ctrl->notify_usb_online)\n \t\tmhl_ctrl->notify_usb_online = usb_notify_cb;\n \n-\tmhl_sii_reset_pin(mhl_ctrl, 0);\n-\tmsleep(50);\n-\tmhl_sii_reset_pin(mhl_ctrl, 1);\n-\t\/* TX PR-guide requires a 100 ms wait here *\/\n-\n-\tmsleep(100);\n-\tmhl_init_reg_settings(mhl_ctrl, true);\n-\n-\tif (mhl_ctrl->cur_state == POWER_STATE_D3) {\n-\t\t\/* give MHL driver chance to handle RGND interrupt *\/\n-\t\tINIT_COMPLETION(mhl_ctrl->rgnd_done);\n-\t\ttimeout = wait_for_completion_interruptible_timeout\n-\t\t\t(&mhl_ctrl->rgnd_done, HZ\/2);\n-\t\tif (!timeout) {\n-\t\t\t\/* most likely nothing plugged in USB *\/\n-\t\t\t\/* USB HOST connected or already in USB mode *\/\n-\t\t\tpr_debug(\"Timedout Returning from discovery mode\\n\");\n-\t\t\treturn 0;\n-\t\t}\n-\t\trc = mhl_ctrl->mhl_mode ? 0 : 1;\n+\tif (!mhl_ctrl->disc_enabled) {\n+\t\tmhl_sii_reset_pin(mhl_ctrl, 0);\n+\t\tmsleep(50);\n+\t\tmhl_sii_reset_pin(mhl_ctrl, 1);\n+\t\t\/* TX PR-guide requires a 100 ms wait here *\/\n+\t\tmsleep(100);\n+\t\tmhl_init_reg_settings(mhl_ctrl, true);\n+\t\trc = mhl_sii_wait_for_rgnd(mhl_ctrl);\n \t} else {\n-\t\t\/* not in D3. already in MHL mode *\/\n-\t\trc = 0;\n-\t}\n+\t\tif (mhl_ctrl->cur_state == POWER_STATE_D3) {\n+\t\t\trc = mhl_sii_wait_for_rgnd(mhl_ctrl);\n+\t\t} else {\n+\t\t\t\/* in MHL mode *\/\n+\t\t\tpr_debug(\"%s:%u\\n\", __func__, __LINE__);\n+\t\t\trc = 0;\n+\t\t}\n+\t}\n+\tpr_debug(\"%s: ret result: %s\\n\", __func__, rc ? \"usb\" : \" mhl\");\n \treturn rc;\n }\n \n@@ -506,7 +519,8 @@\n \t\t *\/\n \t\tMHL_SII_REG_NAME_WR(REG_MHLTX_CTL1, 0xD0);\n \t\tmsleep(50);\n-\t\tMHL_SII_REG_NAME_MOD(REG_DISC_CTRL1, BIT1 | BIT0, 0x00);\n+\t\tif (!mhl_ctrl->disc_enabled)\n+\t\t\tMHL_SII_REG_NAME_MOD(REG_DISC_CTRL1, BIT1 | BIT0, 0x00);\n \t\tMHL_SII_PAGE3_MOD(0x003D, BIT0, 0x00);\n \t\tmhl_ctrl->cur_state = POWER_STATE_D3;\n \t\tbreak;\n@@ -1216,6 +1230,7 @@\n \t * Other initializations\n \t * such tx specific\n \t *\/\n+\tmhl_ctrl->disc_enabled = false;\n \trc = mhl_tx_chip_init(mhl_ctrl);\n \tif (rc) {\n \t\tpr_err(\"%s: tx chip init failed [%d]\\n\",\n@@ -1257,6 +1272,8 @@\n \tmhl_ctrl->mhl_info = mhl_info;\n \treturn 0;\n failed_probe:\n+\tmhl_gpio_config(mhl_ctrl, 0);\n+\tmhl_vreg_config(mhl_ctrl, 0);\n \t\/* do not deep-free *\/\n \tif (mhl_info)\n \t\tdevm_kfree(&client->dev, mhl_info);\n"} {"commit":"f47cd849d93189ae292ac2dbdbad315dd296fc7c","subject":"passdb static: Don't crash if password\/nopassword isn't set.","message":"passdb static: Don't crash if password\/nopassword isn't set.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/passdb-static.c\n+++ src\/auth\/passdb-static.c\n@@ -25,7 +25,7 @@\n \tpassdb_template_export(module->tmpl, request);\n \n \tif (module->static_password_tmpl == NULL)\n-\t\t*password_r = NULL;\n+\t\t*password_r = \"\";\n \telse {\n \t\ttable = auth_request_get_var_expand_table(request, NULL);\n \t\tvar_expand(str, module->static_password_tmpl, table);\n"} {"commit":"2ff85e99078663b7585b80400eca161ba596ec7e","subject":"auth: userdb passwd iteration no longer skips shells. Some systems are using passwd for mail users with shell set to nologin. Maybe first_valid_uid check is good enough alone?","message":"auth: userdb passwd iteration no longer skips shells.\nSome systems are using passwd for mail users with shell set to nologin.\nMaybe first_valid_uid check is good enough alone?\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/userdb-passwd.c\n+++ src\/auth\/userdb-passwd.c\n@@ -146,13 +146,6 @@\n \t\treturn FALSE;\n \tif (pw->pw_uid > (uid_t)set->last_valid_uid && set->last_valid_uid != 0)\n \t\treturn FALSE;\n-\n-\t\/* skip entries that don't have a valid shell.\n-\t they're again probably not real users. *\/\n-\tif (strcmp(pw->pw_shell, \"\/bin\/false\") == 0 ||\n-\t strcmp(pw->pw_shell, \"\/sbin\/nologin\") == 0 ||\n-\t strcmp(pw->pw_shell, \"\/usr\/sbin\/nologin\") == 0)\n-\t\treturn FALSE;\n \treturn TRUE;\n }\n \n"} {"commit":"d9017085432f2aa677ba8d6eb4de45e1d1c7982d","subject":"[board msba2-common tools]","message":"[board msba2-common tools]\n\n* fixed lpc2k_pgm\n","repos":"altairpearl\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,thomaseichinger\/RIOT,stevenj\/RIOT,TobiasFredersdorf\/RIOT,jfischer-phytec-iot\/RIOT,kbumsik\/RIOT,roberthartung\/RIOT,ThanhVic\/RIOT,DipSwitch\/RIOT,x3ro\/RIOT,zhuoshuguo\/RIOT,spium\/IoT-RIOT,chris-wood\/RIOT,stevenj\/RIOT,DipSwitch\/RIOT,watr-li\/RIOT,mfrey\/RIOT,lazytech-org\/RIOT,rfswarm2\/RIOT,l3nko\/RIOT,neumodisch\/RIOT,adjih\/RIOT,dailab\/RIOT,miri64\/RIOT,neiljay\/RIOT,sgso\/RIOT,benoit-canet\/RIOT,Lexandro92\/RIOT-CoAP,RubikonAlpha\/RIOT,LudwigKnuepfer\/RIOT,biboc\/RIOT,kerneltask\/RIOT,Lexandro92\/RIOT-CoAP,adjih\/RIOT,lebrush\/RIOT,Darredevil\/RIOT,bartfaizoltan\/RIOT,TobiasFredersdorf\/RIOT,attdona\/RIOT,herrfz\/RIOT,robixnai\/RIOT,basilfx\/RIOT,aeneby\/RIOT,BytesGalore\/PetersRIOT,1blankz7\/RIOT,kYc0o\/RIOT,backenklee\/RIOT,x3ro\/RIOT,aeneby\/RIOT,stevenj\/RIOT,OTAkeys\/RIOT,EmuxEvans\/RIOT,fnack\/RIOT,Yonezawa-T2\/RIOT,Osblouf\/RIOT,basilfx\/RIOT,kaspar030\/RIOT,adjih\/RIOT,jremmert-phytec-iot\/RIOT,OlegHahm\/RIOT,abkam07\/RIOT,arvindpdmn\/RIOT,herrfz\/RIOT-old,MonsterCode8000\/RIOT,dhruvvyas90\/RIOT,haoyangyu\/RIOT,RBartz\/RIOT,koenning\/RIOT,Osblouf\/RIOT,OTAkeys\/RIOT,toonst\/RIOT,binarylemon\/RIOT,ntrtrung\/RIOT,ant9000\/RIOT,koenning\/RIOT,avmelnikoff\/RIOT,herrfz\/RIOT-old,ros2\/ros2_embedded_riot,phiros\/RIOT,dhruvvyas90\/RIOT,toonst\/RIOT,biboc\/RIOT,AnonMall\/RIOT,kerneltask\/RIOT,msolters\/RIOT,jremmert-phytec-iot\/RIOT,malosek\/RIOT,RBartz\/RIOT,toonst\/RIOT,robixnai\/RIOT,binarylemon\/RIOT,automote\/RIOT,smlng\/RIOT,syin2\/RIOT,spium\/IoT-RIOT,Hyungsin\/RIOT-OS,kushalsingh007\/RIOT,gebart\/RIOT,sumanpanchal\/RIOT,LudwigKnuepfer\/RIOT,gebart\/RIOT,patkan\/RIOT,dkm\/RIOT,MarkXYang\/RIOT,watr-li\/RIOT,A-Paul\/RIOT,kerneltask\/RIOT,dkm\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,shady33\/RIOT,centurysys\/RIOT,ant9000\/RIOT,josephnoir\/RIOT,khhhh\/RIOT,altairpearl\/RIOT,asanka-code\/RIOT,asanka-code\/RIOT,lebrush\/RIOT,mziegert\/RIOT,gautric\/RIOT,ntrtrung\/RIOT,josephnoir\/RIOT,neiljay\/RIOT,immesys\/RiSyn,dailab\/RIOT,authmillenon\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,sumanpanchal\/RIOT,centurysys\/RIOT,changbiao\/RIOT,toonst\/RIOT,chris-wood\/RIOT,wentaoshang\/RIOT,ks156\/RIOT,gautric\/RIOT,rfswarm\/RIOT,robixnai\/RIOT,yogo1212\/RIOT,marcosalm\/RIOT,kushalsingh007\/RIOT,attdona\/RIOT,spium\/IoT-RIOT,gautric\/RIOT,MonsterCode8000\/RIOT,abp719\/RIOT,plushvoxel\/RIOT,emmanuelsearch\/RIOT,roberthartung\/RIOT,basilfx\/RIOT,latsku\/RIOT,altairpearl\/RIOT,shady33\/RIOT,l3nko\/RIOT,openkosmosorg\/RIOT,authmillenon\/RIOT,luciotorre\/RIOT,LudwigOrtmann\/RIOT,rfswarm\/RIOT,TobiasFredersdorf\/RIOT,jhollister\/RIOT,mtausig\/RIOT,luciotorre\/RIOT,chris-wood\/RIOT,Josar\/RIOT,syin2\/RIOT,locicontrols\/RIOT,herrfz\/RIOT-old,A-Paul\/RIOT,phiros\/RIOT,mziegert\/RIOT,marcosalm\/RIOT,JensErdmann\/RIOT,bartfaizoltan\/RIOT,binarylemon\/RIOT,wentaoshang\/RIOT,marcosalm\/RIOT,kaleb-himes\/RIOT,RubikonAlpha\/RIOT,msolters\/RIOT,daniel-k\/RIOT,adrianghc\/RIOT,lebrush\/RIOT,gbarnett\/RIOT,EmuxEvans\/RIOT,d00616\/RIOT,ntrtrung\/RIOT,kushalsingh007\/RIOT,syin2\/RIOT,openkosmosorg\/RIOT,PSHIVANI\/Riot-Code,Lotterleben\/RIOT,kaspar030\/RIOT,bartfaizoltan\/RIOT,rfuentess\/RIOT,1blankz7\/RIOT,rfswarm\/RIOT,brettswann\/RIOT,zhuoshuguo\/RIOT,JensErdmann\/RIOT,tdautc19841202\/RIOT,tfar\/RIOT,plushvoxel\/RIOT,Lexandro92\/RIOT-CoAP,TobiasFredersdorf\/RIOT,emmanuelsearch\/RIOT,lazytech-org\/RIOT,rousselk\/RIOT,ant9000\/RIOT,bartfaizoltan\/RIOT,sgso\/RIOT,ks156\/RIOT,zhuoshuguo\/RIOT,DipSwitch\/RIOT,daniel-k\/RIOT,kaleb-himes\/RIOT,Lotterleben\/RIOT,ThanhVic\/RIOT,emmanuelsearch\/RIOT,OTAkeys\/RIOT,centurysys\/RIOT,patkan\/RIOT,benoit-canet\/RIOT,mfrey\/RIOT,herrfz\/RIOT,attdona\/RIOT,RIOT-OS\/RIOT,luciotorre\/RIOT,automote\/RIOT,backenklee\/RIOT,Josar\/RIOT,jbeyerstedt\/RIOT-OTA-update,kushalsingh007\/RIOT,mtausig\/RIOT,jremmert-phytec-iot\/RIOT,jhollister\/RIOT,rousselk\/RIOT,koenning\/RIOT,FrancescoErmini\/RIOT,FrancescoErmini\/RIOT,rfswarm\/RIOT,herrfz\/RIOT,marcosalm\/RIOT,A-Paul\/RIOT,ant9000\/RIOT,DipSwitch\/RIOT,nsol-nmsu\/RIOT,asanka-code\/RIOT,x3ro\/RIOT,beurdouche\/RIOT,kaspar030\/RIOT,neumodisch\/RIOT,rfuentess\/RIOT,toonst\/RIOT,kbumsik\/RIOT,cladmi\/RIOT,LudwigOrtmann\/RIOT,haoyangyu\/RIOT,Ell-i\/RIOT,josephnoir\/RIOT,gbarnett\/RIOT,kb2ma\/RIOT,AnonMall\/RIOT,jfischer-phytec-iot\/RIOT,mtausig\/RIOT,fnack\/RIOT,AnonMall\/RIOT,bartfaizoltan\/RIOT,x3ro\/RIOT,ximus\/RIOT,jferreir\/RIOT,hamilton-mote\/RIOT-OS,d00616\/RIOT,asanka-code\/RIOT,stevenj\/RIOT,khhhh\/RIOT,alex1818\/RIOT,jasonatran\/RIOT,jfischer-phytec-iot\/RIOT,brettswann\/RIOT,daniel-k\/RIOT,jasonatran\/RIOT,hamilton-mote\/RIOT-OS,benoit-canet\/RIOT,jbeyerstedt\/RIOT-OTA-update,binarylemon\/RIOT,yogo1212\/RIOT,katezilla\/RIOT,MarkXYang\/RIOT,gbarnett\/RIOT,ximus\/RIOT,openkosmosorg\/RIOT,Lotterleben\/RIOT,abp719\/RIOT,A-Paul\/RIOT,RIOT-OS\/RIOT,Ell-i\/RIOT,d00616\/RIOT,malosek\/RIOT,roberthartung\/RIOT,arvindpdmn\/RIOT,dhruvvyas90\/RIOT,RubikonAlpha\/RIOT,FrancescoErmini\/RIOT,LudwigKnuepfer\/RIOT,katezilla\/RIOT,OlegHahm\/RIOT,centurysys\/RIOT,sgso\/RIOT,avmelnikoff\/RIOT,BytesGalore\/RIOT,BytesGalore\/RIOT,kYc0o\/RIOT,arvindpdmn\/RIOT,changbiao\/RIOT,asanka-code\/RIOT,altairpearl\/RIOT,malosek\/RIOT,thomaseichinger\/RIOT,Lotterleben\/RIOT,Yonezawa-T2\/RIOT,shady33\/RIOT,Hyungsin\/RIOT-OS,malosek\/RIOT,alex1818\/RIOT,gbarnett\/RIOT,brettswann\/RIOT,sumanpanchal\/RIOT,biboc\/RIOT,kaspar030\/RIOT,roberthartung\/RIOT,kb2ma\/RIOT,gebart\/RIOT,rfswarm2\/RIOT,syin2\/RIOT,attdona\/RIOT,syin2\/RIOT,thiagohd\/RIOT,x3ro\/RIOT,BytesGalore\/RIOT,binarylemon\/RIOT,shady33\/RIOT,ks156\/RIOT,dhruvvyas90\/RIOT,hamilton-mote\/RIOT-OS,Josar\/RIOT,Yonezawa-T2\/RIOT,BytesGalore\/PetersRIOT,A-Paul\/RIOT,patkan\/RIOT,ros2\/ros2_embedded_riot,OlegHahm\/RIOT,dkm\/RIOT,PSHIVANI\/Riot-Code,jfischer-phytec-iot\/RIOT,OlegHahm\/RIOT,jremmert-phytec-iot\/RIOT,latsku\/RIOT,ThanhVic\/RIOT,Yonezawa-T2\/RIOT,BytesGalore\/PetersRIOT,Hyungsin\/RIOT-OS,abkam07\/RIOT,koenning\/RIOT,hamilton-mote\/RIOT-OS,abkam07\/RIOT,shady33\/RIOT,haoyangyu\/RIOT,jasonatran\/RIOT,phiros\/RIOT,rfswarm\/RIOT,haoyangyu\/RIOT,Darredevil\/RIOT,MarkXYang\/RIOT,Lotterleben\/RIOT,backenklee\/RIOT,thiagohd\/RIOT,malosek\/RIOT,tdautc19841202\/RIOT,ros2\/ros2_embedded_riot,MohmadAyman\/RIOT,dailab\/RIOT,backenklee\/RIOT,kbumsik\/RIOT,josephnoir\/RIOT,josephnoir\/RIOT,gebart\/RIOT,hamilton-mote\/RIOT-OS,ntrtrung\/RIOT,emmanuelsearch\/RIOT,mziegert\/RIOT,centurysys\/RIOT,BytesGalore\/PetersRIOT,thomaseichinger\/RIOT,spium\/IoT-RIOT,Ell-i\/RIOT,BytesGalore\/PetersRIOT,alex1818\/RIOT,malosek\/RIOT,benoit-canet\/RIOT,latsku\/RIOT,herrfz\/RIOT-old,Darredevil\/RIOT,daniel-k\/RIOT,MonsterCode8000\/RIOT,thomaseichinger\/RIOT,biboc\/RIOT,mfrey\/RIOT,AnonMall\/RIOT,bartfaizoltan\/RIOT,zhuoshuguo\/RIOT,aeneby\/RIOT,RBartz\/RIOT,PSHIVANI\/Riot-Code,attdona\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,Lotterleben\/RIOT,binarylemon\/RIOT,kaleb-himes\/RIOT,RIOT-OS\/RIOT,luciotorre\/RIOT,neiljay\/RIOT,plushvoxel\/RIOT,kaleb-himes\/RIOT,immesys\/RiSyn,rfswarm\/RIOT,cladmi\/RIOT,robixnai\/RIOT,authmillenon\/RIOT,jferreir\/RIOT,alignan\/RIOT,authmillenon\/RIOT,Ell-i\/RIOT,plushvoxel\/RIOT,centurysys\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,miri64\/RIOT,rfuentess\/RIOT,LudwigKnuepfer\/RIOT,locicontrols\/RIOT,l3nko\/RIOT,jhollister\/RIOT,openkosmosorg\/RIOT,openkosmosorg\/RIOT,MohmadAyman\/RIOT,MonsterCode8000\/RIOT,kerneltask\/RIOT,jremmert-phytec-iot\/RIOT,beurdouche\/RIOT,changbiao\/RIOT,rajma996\/RIOT,spium\/IoT-RIOT,Osblouf\/RIOT,rfswarm2\/RIOT,wentaoshang\/RIOT,Lotterleben\/RIOT,locicontrols\/RIOT,ximus\/RIOT,backenklee\/RIOT,ntrtrung\/RIOT,attdona\/RIOT,abp719\/RIOT,arvindpdmn\/RIOT,jhollister\/RIOT,Yonezawa-T2\/RIOT,jferreir\/RIOT,gebart\/RIOT,thiagohd\/RIOT,rfswarm2\/RIOT,tdautc19841202\/RIOT,rfuentess\/RIOT,kerneltask\/RIOT,msolters\/RIOT,rakendrathapa\/RIOT,EmuxEvans\/RIOT,latsku\/RIOT,dailab\/RIOT,lebrush\/RIOT,kYc0o\/RIOT,ros2\/ros2_embedded_riot,watr-li\/RIOT,katezilla\/RIOT,MohmadAyman\/RIOT,phiros\/RIOT,RIOT-OS\/RIOT,kbumsik\/RIOT,nsol-nmsu\/RIOT,JensErdmann\/RIOT,kbumsik\/RIOT,Lexandro92\/RIOT-CoAP,sumanpanchal\/RIOT,thiagohd\/RIOT,kushalsingh007\/RIOT,neiljay\/RIOT,LudwigKnuepfer\/RIOT,rajma996\/RIOT,arvindpdmn\/RIOT,EmuxEvans\/RIOT,yogo1212\/RIOT,haoyangyu\/RIOT,tfar\/RIOT,ros2\/ros2_embedded_riot,wentaoshang\/RIOT,biboc\/RIOT,herrfz\/RIOT-old,miri64\/RIOT,ThanhVic\/RIOT,fnack\/RIOT,MonsterCode8000\/RIOT,MarkXYang\/RIOT,nsol-nmsu\/RIOT,ant9000\/RIOT,kb2ma\/RIOT,adrianghc\/RIOT,rajma996\/RIOT,smlng\/RIOT,changbiao\/RIOT,smlng\/RIOT,Hyungsin\/RIOT-OS,immesys\/RiSyn,d00616\/RIOT,rakendrathapa\/RIOT,Osblouf\/RIOT,kb2ma\/RIOT,abp719\/RIOT,PSHIVANI\/Riot-Code,l3nko\/RIOT,cladmi\/RIOT,MarkXYang\/RIOT,l3nko\/RIOT,jferreir\/RIOT,patkan\/RIOT,BytesGalore\/RIOT,automote\/RIOT,lebrush\/RIOT,abp719\/RIOT,adrianghc\/RIOT,msolters\/RIOT,fnack\/RIOT,Hyungsin\/RIOT-OS,altairpearl\/RIOT,fnack\/RIOT,OlegHahm\/RIOT,luciotorre\/RIOT,locicontrols\/RIOT,dkm\/RIOT,roberthartung\/RIOT,abkam07\/RIOT,ximus\/RIOT,ThanhVic\/RIOT,jhollister\/RIOT,tdautc19841202\/RIOT,jbeyerstedt\/RIOT-OTA-update,marcosalm\/RIOT,locicontrols\/RIOT,DipSwitch\/RIOT,neumodisch\/RIOT,daniel-k\/RIOT,alignan\/RIOT,LudwigOrtmann\/RIOT,PSHIVANI\/Riot-Code,altairpearl\/RIOT,lebrush\/RIOT,l3nko\/RIOT,shady33\/RIOT,neumodisch\/RIOT,beurdouche\/RIOT,gbarnett\/RIOT,nsol-nmsu\/RIOT,kYc0o\/RIOT,koenning\/RIOT,haoyangyu\/RIOT,plushvoxel\/RIOT,d00616\/RIOT,kaleb-himes\/RIOT,robixnai\/RIOT,1blankz7\/RIOT,Darredevil\/RIOT,RBartz\/RIOT,mziegert\/RIOT,rajma996\/RIOT,Lexandro92\/RIOT-CoAP,neumodisch\/RIOT,mtausig\/RIOT,OTAkeys\/RIOT,FrancescoErmini\/RIOT,khhhh\/RIOT,msolters\/RIOT,locicontrols\/RIOT,ntrtrung\/RIOT,wentaoshang\/RIOT,ximus\/RIOT,RubikonAlpha\/RIOT,Josar\/RIOT,brettswann\/RIOT,immesys\/RiSyn,patkan\/RIOT,JensErdmann\/RIOT,jbeyerstedt\/RIOT-OTA-update,RBartz\/RIOT,automote\/RIOT,1blankz7\/RIOT,chris-wood\/RIOT,herrfz\/RIOT,smlng\/RIOT,arvindpdmn\/RIOT,tfar\/RIOT,benoit-canet\/RIOT,mfrey\/RIOT,jasonatran\/RIOT,cladmi\/RIOT,aeneby\/RIOT,smlng\/RIOT,basilfx\/RIOT,latsku\/RIOT,lazytech-org\/RIOT,latsku\/RIOT,watr-li\/RIOT,ximus\/RIOT,msolters\/RIOT,zhuoshuguo\/RIOT,locicontrols\/RIOT,abp719\/RIOT,AnonMall\/RIOT,phiros\/RIOT,yogo1212\/RIOT,Ell-i\/RIOT,immesys\/RiSyn,kaspar030\/RIOT,BytesGalore\/PetersRIOT,watr-li\/RIOT,MohmadAyman\/RIOT,Darredevil\/RIOT,herrfz\/RIOT,koenning\/RIOT,changbiao\/RIOT,avmelnikoff\/RIOT,jbeyerstedt\/RIOT-OTA-update,PSHIVANI\/Riot-Code,herrfz\/RIOT,ks156\/RIOT,dailab\/RIOT,Osblouf\/RIOT,neiljay\/RIOT,tdautc19841202\/RIOT,kb2ma\/RIOT,tfar\/RIOT,stevenj\/RIOT,MohmadAyman\/RIOT,katezilla\/RIOT,FrancescoErmini\/RIOT,rakendrathapa\/RIOT,mziegert\/RIOT,miri64\/RIOT,jremmert-phytec-iot\/RIOT,beurdouche\/RIOT,asanka-code\/RIOT,thomaseichinger\/RIOT,miri64\/RIOT,Josar\/RIOT,alignan\/RIOT,sgso\/RIOT,marcosalm\/RIOT,yogo1212\/RIOT,adjih\/RIOT,spium\/IoT-RIOT,OTAkeys\/RIOT,rousselk\/RIOT,ks156\/RIOT,phiros\/RIOT,katezilla\/RIOT,rousselk\/RIOT,jferreir\/RIOT,sumanpanchal\/RIOT,mfrey\/RIOT,alex1818\/RIOT,d00616\/RIOT,authmillenon\/RIOT,rakendrathapa\/RIOT,rajma996\/RIOT,rfswarm2\/RIOT,TobiasFredersdorf\/RIOT,LudwigOrtmann\/RIOT,adjih\/RIOT,openkosmosorg\/RIOT,stevenj\/RIOT,rakendrathapa\/RIOT,yogo1212\/RIOT,tfar\/RIOT,gautric\/RIOT,adrianghc\/RIOT,1blankz7\/RIOT,neumodisch\/RIOT,kushalsingh007\/RIOT,BytesGalore\/RIOT,MonsterCode8000\/RIOT,Darredevil\/RIOT,alignan\/RIOT,JensErdmann\/RIOT,FrancescoErmini\/RIOT,sgso\/RIOT,nsol-nmsu\/RIOT,cladmi\/RIOT,patkan\/RIOT,Osblouf\/RIOT,MohmadAyman\/RIOT,tdautc19841202\/RIOT,rfuentess\/RIOT,sgso\/RIOT,authmillenon\/RIOT,daniel-k\/RIOT,avmelnikoff\/RIOT,alex1818\/RIOT,brettswann\/RIOT,alignan\/RIOT,ros2\/ros2_embedded_riot,wentaoshang\/RIOT,LudwigOrtmann\/RIOT,chris-wood\/RIOT,BytesGalore\/PetersRIOT,rousselk\/RIOT,dhruvvyas90\/RIOT,rakendrathapa\/RIOT,watr-li\/RIOT,gbarnett\/RIOT,lazytech-org\/RIOT,jferreir\/RIOT,rousselk\/RIOT,khhhh\/RIOT,beurdouche\/RIOT,MarkXYang\/RIOT,EmuxEvans\/RIOT,emmanuelsearch\/RIOT,dhruvvyas90\/RIOT,alex1818\/RIOT,abkam07\/RIOT,mziegert\/RIOT,RubikonAlpha\/RIOT,kYc0o\/RIOT,EmuxEvans\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,immesys\/RiSyn,emmanuelsearch\/RIOT,automote\/RIOT,jhollister\/RIOT,lazytech-org\/RIOT,thiagohd\/RIOT,ThanhVic\/RIOT,JensErdmann\/RIOT,LudwigOrtmann\/RIOT,Yonezawa-T2\/RIOT,AnonMall\/RIOT,1blankz7\/RIOT,avmelnikoff\/RIOT,basilfx\/RIOT,fnack\/RIOT,automote\/RIOT,gautric\/RIOT,benoit-canet\/RIOT,DipSwitch\/RIOT,dkm\/RIOT,changbiao\/RIOT,thiagohd\/RIOT,khhhh\/RIOT,Lexandro92\/RIOT-CoAP,mtausig\/RIOT,RBartz\/RIOT,abkam07\/RIOT,rajma996\/RIOT,luciotorre\/RIOT,sumanpanchal\/RIOT,robixnai\/RIOT,khhhh\/RIOT,zhuoshuguo\/RIOT,rfswarm2\/RIOT,adrianghc\/RIOT,RubikonAlpha\/RIOT,brettswann\/RIOT,ros2\/ros2_embedded_riot,jfischer-phytec-iot\/RIOT,aeneby\/RIOT,chris-wood\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- msba2-common\/tools\/src\/control_2xxx.c\n+++ msba2-common\/tools\/src\/control_2xxx.c\n@@ -8,28 +8,30 @@\n \n void hard_reset_to_bootloader(void)\n {\n-\/*\tUse this lines for flashing a node with interrupted DTR line\n- *\tprintf(\"Press Reset - confirm with anykey\\n\");\n+\/*\tUse this lines for flashing a node with interrupted DTR line *\/\n+ \/*\tprintf(\"Press Reset - confirm with anykey\\n\");\n getchar();\n *\/\n printf(\"Reset CPU (into bootloader)\\r\\n\");\n-\tset_rts(1);\t\t\/\/ RTS (ttl level) connects to P0.14\n+\tset_rts(0);\t\t\/\/ RTS (ttl level) connects to P0.14\n \/* the next two lines should be commented for the prepared node *\/\n \tset_dtr(1);\t\t\/\/ DTR (ttl level) connects to RST\n \tsend_break_signal();\t\/\/ or break detect circuit to RST\n \tusleep(75000);\n- printf(\"Release Reset - confirm with anykey\\n\");\n+ \/*\tUse this lines for flashing a node with interrupted DTR line *\/\n+ \/* printf(\"Release Reset - confirm with anykey\\n\");\n getchar();\n+ *\/\n \tset_dtr(0);\t\t\/\/ allow the CPU to run:\n \tset_baud(baud_rate);\n-\tset_rts(1);\t\t\/\/ set RTS again (as it has been reset by set_baudrate) \n+\tset_rts(0);\t\t\/\/ set RTS again (as it has been reset by set_baudrate) \n \tusleep(40000);\n }\n \n void hard_reset_to_user_code(void)\n {\n \tprintf(\"Reset CPU (into user code)\\r\\n\");\n-\tset_rts(0);\t\t\/\/ RTS (ttl level) connects to P0.14\n+\tset_rts(1);\t\t\/\/ RTS (ttl level) connects to P0.14\n \tset_dtr(1);\t\t\/\/ DTR (ttl level) connects to RST\n \tsend_break_signal();\t\/\/ or break detect circuit to RST\n \tusleep(75000);\n"} {"commit":"6794d078f445d9192c06101048d37c14b5bee50c","subject":"pushed the timeslot end margin to 2ms, to be safe","message":"pushed the timeslot end margin to 2ms, to be safe\n","repos":"mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- nRF51\/rbc_mesh\/src\/timeslot_handler.c\n+++ nRF51\/rbc_mesh\/src\/timeslot_handler.c\n@@ -53,7 +53,7 @@\n #include <string.h>\n #include <stdio.h>\n \n-#define TIMESLOT_END_SAFETY_MARGIN_US (100)\n+#define TIMESLOT_END_SAFETY_MARGIN_US (2000)\n #define TIMESLOT_SLOT_LENGTH (10000)\n #define TIMESLOT_SLOT_EXTEND_LENGTH (50000)\n #define TIMESLOT_SLOT_EMERGENCY_LENGTH (3000) \/* will fit between two conn events *\/\n"} {"commit":"fc2bbf52f96a09bdf640f152cd25a569ce7f77de","subject":"remove deprecated macros","message":"remove deprecated macros\n","repos":"usakhelo\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,Fat-Zer\/FreeCAD_sf_master,usakhelo\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,usakhelo\/FreeCAD,usakhelo\/FreeCAD,Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,usakhelo\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,bblacey\/FreeCAD-MacOS-CI,bblacey\/FreeCAD-MacOS-CI,usakhelo\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,bblacey\/FreeCAD-MacOS-CI,usakhelo\/FreeCAD,Fat-Zer\/FreeCAD_sf_master","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Base\/PyObjectBase.h\n+++ src\/Base\/PyObjectBase.h\n@@ -134,32 +134,12 @@\n #define Py_Assert(A,E,M) {if (!(A)) {PyErr_SetString(E, M); return NULL;}}\r\n \r\n \r\n-\/\/\/ Define the PyParent Object\r\n-typedef PyTypeObject * PyParentObject;\r\n-\r\n-\r\n \/\/\/ This must be the first line of each PyC++ class\r\n #define Py_Header \\\r\n public: \\\r\n static PyTypeObject Type; \\\r\n static PyMethodDef Methods[]; \\\r\n virtual PyTypeObject *GetType(void) {return &Type;}\r\n-\r\n-\/** This defines the _getattr_up macro\r\n- * which allows attribute and method calls\r\n- * to be properly passed up the hierarchy.\r\n- *\/\r\n-#define _getattr_up(Parent) \\\r\n-{ \\\r\n- PyObject *rvalue = Py_FindMethod(Methods, this, attr); \\\r\n- if (rvalue == NULL) \\\r\n- { \\\r\n- PyErr_Clear(); \\\r\n- return Parent::_getattr(attr); \\\r\n- } \\\r\n- else \\\r\n- return rvalue; \\\r\n-} \r\n \r\n \/*------------------------------\r\n * PyObjectBase\r\n"} {"commit":"d0ff61193e8ddb99be528104dc03d4be1953811f","subject":"Add contig order check to bg2bw","message":"Add contig order check to bg2bw\n","repos":"cancerit\/cgpBigWig,cancerit\/cgpBigWig","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- c\/bg2bw.c\n+++ c\/bg2bw.c\n@@ -33,6 +33,7 @@\n #include <getopt.h>\n #include <stdlib.h>\n #include <stdio.h>\n+#include <string.h>\n #include \"bigWig.h\"\n #include \"utils.h\"\n #include \"dbg.h\"\n@@ -116,6 +117,40 @@\n }\n \n return;\n+}\n+\n+int contig_order(char* ctg, char **prev_ctg, int64_t *prev_ctg_idx, chromList_t *chrlist){\n+ \/\/If prev_ctg_idx is as yet unset\n+ int64_t i = 0;\n+ if (*prev_ctg == NULL){\n+ for (i=0; i<chrlist->nKeys; i++){\n+ if(strcmp(ctg,chrlist->chrom[i])==0){\n+ *prev_ctg_idx = i;\n+ *prev_ctg = malloc((strlen(ctg)+1) * sizeof(char));\n+ strcpy(*prev_ctg, ctg);\n+ return 0;\n+ }\n+ }\n+ }\/\/ end of if the prev_ctg_idx is as yet unset\n+\n+ \/\/contigs match, we don't worry\n+ if(strcmp(ctg,*prev_ctg)==0) return 0;\n+\n+ \/\/contigs don't match, so ensure we're at a new contig further 'down' the list.\n+ i = 0;\n+ for (i=0; i<chrlist->nKeys; i++){\n+ if(strcmp(ctg,chrlist->chrom[i])==0){\n+ if(i > *prev_ctg_idx){\n+ *prev_ctg_idx = i;\n+ *prev_ctg = malloc((strlen(ctg)+1) * sizeof(char));\n+ strcpy(*prev_ctg, ctg);\n+ return 0;\n+ }else{\n+ return -1;\n+ }\n+ };\n+ }\n+ return -1;\n }\n \n chromList_t *parse_chrom_list(char *chrom_list_file){\n@@ -185,10 +220,13 @@\n ctg = malloc(sizeof(char) * 2048);\n uint32_t start;\n uint32_t stop;\n+ char *prev_ctg = NULL;\n+ int64_t prev_ctg_idx = fp->cl->nKeys + 1;\n float res;\n while(fgets(line,sizeof(line),in)){\n num = sscanf(line,\"%[^\\t]\\t%\"SCNu32\"\\t%\"SCNu32\"\\t%f\\n\",ctg,&start,&stop,&res);\n check(num==4,\"Error parsing bed line '%s' to bw format.\",line);\n+ check(contig_order(ctg, &prev_ctg, &prev_ctg_idx, fp->cl)==0, \"Error in contig order at '%s'. chrom list should be the same order as the input bed file.\",ctg);\n chk = bwAddIntervals(fp, &ctg, &start, &stop, &res, 1);\n check(chk==0,\"Error encountered adding bed line '%s' to bw file: %d.\",line,chk);\n }\n"} {"commit":"0189f6d775df15a9771e420fbbdd93ce3488c67b","subject":"[FMT] More markdown in doxygen documentation","message":"[FMT] More markdown in doxygen documentation\n","repos":"morinim\/vita,morinim\/vita,morinim\/vita","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/kernel\/symbol.h\n+++ src\/kernel\/symbol.h\n@@ -116,7 +116,7 @@\n }\n \n \/\/\/\n-\/\/\/ \\return \\c 0.\n+\/\/\/ \\return `0`.\n \/\/\/\n \/\/\/ This function is used to initialize the symbol's internal parameter.\n \/\/\/ Derived classes should redefine the init member function in a\n@@ -144,8 +144,8 @@\n }\n \n \/\/\/\n-\/\/\/ \\return \\c true if the \\a symbol has been automatically defined (e.g.\n-\/\/\/ ADF \/ ADT), \\c false otherwise (this is the default value).\n+\/\/\/ \\return `true` if the symbol has been automatically defined (e.g.\n+\/\/\/ ADF \/ ADT), `false` otherwise (this is the default value).\n \/\/\/\n inline bool symbol::auto_defined() const\n {\n@@ -153,7 +153,7 @@\n }\n \n \/\/\/\n-\/\/\/ \\return the category of the \\a symbol.\n+\/\/\/ \\return the category of the symbol.\n \/\/\/\n \/\/\/ In strongly typed GP, every terminal has a type (i.e. category) and every\n \/\/\/ function has types for each of its arguments and a type for its return\n@@ -165,7 +165,7 @@\n }\n \n \/\/\/\n-\/\/\/ \\return \\c true if the symbol is an input variable.\n+\/\/\/ \\return `true` if the symbol is an input variable.\n \/\/\/\n \/\/\/ An input variable is a feature from the learning domain. Only terminal\n \/\/\/ can be input variable.\n@@ -206,7 +206,7 @@\n }\n \n \/\/\/\n-\/\/\/ \\return \\c true if this symbol is a \\c terminal.\n+\/\/\/ \\return `true` if this symbol is a `terminal`.\n \/\/\/\n inline bool symbol::terminal() const\n {\n"} {"commit":"14538ddf874e1a146487dad02709929c4b63baf5","subject":"Fix license file in compute\/skc\/main.c","message":"Fix license file in compute\/skc\/main.c\n\nNoTry: true\nBug: skia:8084\nChange-Id: I19a6347b200c19ab333d7a97a8c55d41ccd17927\nReviewed-on: https:\/\/skia-review.googlesource.com\/136061\nCommit-Queue: Ravi Mistry <9fa2e7438b8cb730f96b74865492597170561628@google.com>\nReviewed-by: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@google.com>\n","repos":"HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,rubenvb\/skia,google\/skia,rubenvb\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,HalCanary\/skia-hc,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,rubenvb\/skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,rubenvb\/skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,google\/skia,HalCanary\/skia-hc,google\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,google\/skia,rubenvb\/skia,google\/skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,google\/skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/compute\/skc\/main.c\n+++ src\/compute\/skc\/main.c\n@@ -1,7 +1,7 @@\n \/*\n * Copyright 2017 Google Inc.\n *\n- * Use of this source code is governed by a BSVG_DOC-style license that can\n+ * Use of this source code is governed by a BSD-style license that can\n * be found in the LICENSE file.\n *\n *\/\n@@ -49,7 +49,7 @@\n \/\/\n \/\/\n \n-static \n+static\n void\n is_render_complete(skc_surface_t surface,\n skc_styling_t styling,\n@@ -67,9 +67,9 @@\n main(int argc, char** argv)\n {\n \/\/\n- \/\/ \n- \/\/\n- if (argc <= 1) \n+ \/\/\n+ \/\/\n+ if (argc <= 1)\n {\n fprintf(stderr,\"-- missing filename\\n\");\n return EXIT_FAILURE; \/\/ no filename\n@@ -110,7 +110,7 @@\n CL_WGL_HDC_KHR, (cl_context_properties)hDC,\n 0\n };\n- \n+\n \/\/\n \/\/ create context\n \/\/\n@@ -136,14 +136,14 @@\n skc_raster_builder_t raster_builder;\n \n err = skc_raster_builder_create(context,&raster_builder);\n- \n+\n \/\/\n \/\/ create a composition\n \/\/\n skc_composition_t composition;\n \n err = skc_composition_create(context,&composition);\n- \n+\n \/\/\n \/\/ create a styling instance\n \/\/\n@@ -154,7 +154,7 @@\n svg_doc_layer_count(svg_doc),\n 1000,\n 2 * 1024 * 1024);\n- \n+\n \/\/\n \/\/ create a surface\n \/\/\n@@ -191,7 +191,7 @@\n skc_transform_stack_restore(ts,ts_save);\n \n \/\/ decode layers -- places rasters\n- svg_doc_layers_decode(svg_doc,rasters,composition,styling,true\/*is_srgb*\/); \n+ svg_doc_layers_decode(svg_doc,rasters,composition,styling,true\/*is_srgb*\/);\n \n \/\/ seal the composition\n skc_composition_seal(composition);\n@@ -244,7 +244,7 @@\n \/\/ unseal the composition\n skc_composition_unseal(composition,true);\n }\n- \n+\n \/\/\n \/\/ dispose of mundane resources\n \/\/\n"} {"commit":"b71946af5c7ed4c078d239e5313182b309f87c14","subject":"conf: use virXMLPropString and virXMLNodeContentString for vcpu parsing","message":"conf: use virXMLPropString and virXMLNodeContentString for vcpu parsing\n\nXPath is good for random search of elements, not for accessing\nattributes of one node.\n\nSigned-off-by: Pavel Hrdina <d4772d05997b8abf035041e3b4f4996380ea7e7a@redhat.com>\n","repos":"eskultety\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,libvirt\/libvirt,zippy2\/libvirt,eskultety\/libvirt,eskultety\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_conf.c\n+++ src\/conf\/domain_conf.c\n@@ -16914,65 +16914,69 @@\n {\n int n;\n xmlNodePtr *nodes = NULL;\n+ xmlNodePtr vcpuNode;\n size_t i;\n char *tmp = NULL;\n unsigned int maxvcpus;\n unsigned int vcpus;\n int ret = -1;\n \n- if ((n = virXPathUInt(\"string(.\/vcpu[1])\", ctxt, &maxvcpus)) < 0) {\n- if (n == -2) {\n- virReportError(VIR_ERR_XML_ERROR, \"%s\",\n- _(\"maximum vcpus count must be an integer\"));\n- goto cleanup;\n- }\n-\n- maxvcpus = 1;\n+ vcpus = maxvcpus = 1;\n+\n+ if ((vcpuNode = virXPathNode(\".\/vcpu[1]\", ctxt))) {\n+ if ((tmp = virXMLNodeContentString(vcpuNode))) {\n+ if (virStrToLong_ui(tmp, NULL, 10, &maxvcpus) < 0) {\n+ virReportError(VIR_ERR_XML_ERROR, \"%s\",\n+ _(\"maximum vcpus count must be an integer\"));\n+ goto cleanup;\n+ }\n+ VIR_FREE(tmp);\n+ }\n+\n+ if ((tmp = virXMLPropString(vcpuNode, \"current\"))) {\n+ if (virStrToLong_ui(tmp, NULL, 10, &vcpus) < 0) {\n+ virReportError(VIR_ERR_XML_ERROR, \"%s\",\n+ _(\"current vcpus count must be an integer\"));\n+ goto cleanup;\n+ }\n+ VIR_FREE(tmp);\n+ } else {\n+ vcpus = maxvcpus;\n+ }\n+\n+ tmp = virXMLPropString(vcpuNode, \"placement\");\n+ if (tmp) {\n+ if ((def->placement_mode =\n+ virDomainCpuPlacementModeTypeFromString(tmp)) < 0) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n+ _(\"Unsupported CPU placement mode '%s'\"),\n+ tmp);\n+ goto cleanup;\n+ }\n+ VIR_FREE(tmp);\n+ } else {\n+ def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC;\n+ }\n+\n+ if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {\n+ tmp = virXMLPropString(vcpuNode, \"cpuset\");\n+ if (tmp) {\n+ if (virBitmapParse(tmp, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)\n+ goto cleanup;\n+\n+ if (virBitmapIsAllClear(def->cpumask)) {\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n+ _(\"Invalid value of 'cpuset': %s\"), tmp);\n+ goto cleanup;\n+ }\n+\n+ VIR_FREE(tmp);\n+ }\n+ }\n }\n \n if (virDomainDefSetVcpusMax(def, maxvcpus, xmlopt) < 0)\n goto cleanup;\n-\n- if ((n = virXPathUInt(\"string(.\/vcpu[1]\/@current)\", ctxt, &vcpus)) < 0) {\n- if (n == -2) {\n- virReportError(VIR_ERR_XML_ERROR, \"%s\",\n- _(\"current vcpus count must be an integer\"));\n- goto cleanup;\n- }\n-\n- vcpus = maxvcpus;\n- }\n-\n-\n- tmp = virXPathString(\"string(.\/vcpu[1]\/@placement)\", ctxt);\n- if (tmp) {\n- if ((def->placement_mode =\n- virDomainCpuPlacementModeTypeFromString(tmp)) < 0) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n- _(\"Unsupported CPU placement mode '%s'\"),\n- tmp);\n- goto cleanup;\n- }\n- VIR_FREE(tmp);\n- } else {\n- def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC;\n- }\n-\n- if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {\n- tmp = virXPathString(\"string(.\/vcpu[1]\/@cpuset)\", ctxt);\n- if (tmp) {\n- if (virBitmapParse(tmp, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)\n- goto cleanup;\n-\n- if (virBitmapIsAllClear(def->cpumask)) {\n- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n- _(\"Invalid value of 'cpuset': %s\"), tmp);\n- goto cleanup;\n- }\n-\n- VIR_FREE(tmp);\n- }\n- }\n \n if ((n = virXPathNodeSet(\".\/vcpus\/vcpu\", ctxt, &nodes)) < 0)\n goto cleanup;\n"} {"commit":"f8d7720715be2e65dc13e53373a657c165025464","subject":"Expose template RASDs that can be used for defining new storage volumes","message":"Expose template RASDs that can be used for defining new storage volumes\n\nAlso:\n -Change volume_template() to avail_volume_template() to distinguish\n from template RASDs that represent existing storage volumes in a pool vs\n the template RASDs that are used for creating a new storage volume within\n a given pool\n -Change disk_dev_or_pool_template() to disk_res_template() since it now\n handles more than existing storage volumes and disk pool templates.\n\nSigned-off-by: Kaitlin Rupert <5d963ff58691ce861c80ea2b0deed9b0b88171bc@us.ibm.com>\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Virt_SettingsDefineCapabilities.c\n+++ src\/Virt_SettingsDefineCapabilities.c\n@@ -71,6 +71,7 @@\n \n #define DEVICE_RASD 0 \n #define POOL_RASD 1 \n+#define NEW_VOL_RASD 2\n \n static bool system_has_vt(virConnectPtr conn)\n {\n@@ -280,6 +281,10 @@\n ret = rasd_classname_from_type(resource_type, &base);\n else if (rasd_type == POOL_RASD)\n ret = pool_rasd_classname_from_type(resource_type, &base);\n+ else if (rasd_type == NEW_VOL_RASD) {\n+ base = \"StorageVolumeResourceAllocationSettingData\";\n+ ret = 0;\n+ }\n \n if (ret != CMPI_RC_OK) {\n cu_statusf(_BROKER, s,\n@@ -1023,10 +1028,76 @@\n }\n \n #if VIR_USE_LIBVIRT_STORAGE\n-static CMPIStatus volume_template(const CMPIObjectPath *ref,\n- int template_type,\n- virStorageVolPtr volume_ptr,\n- struct inst_list *list)\n+static CMPIStatus new_volume_template(const CMPIObjectPath *ref,\n+ int template_type,\n+ virStoragePoolPtr poolptr,\n+ struct inst_list *list)\n+{\n+ const char *id;\n+ CMPIStatus s = {CMPI_RC_OK, NULL};\n+ int ret = 0;\n+ struct virt_pool *pool = NULL;\n+ CMPIInstance *inst = NULL;\n+ int type = 0;\n+ const char *path;\n+\n+ switch(template_type) {\n+ case SDC_RASD_MIN:\n+ id = \"New Storage Volume Minimum\";\n+ break;\n+ case SDC_RASD_MAX:\n+ id = \"New Storage Volume Maximum\";\n+ break;\n+ case SDC_RASD_INC:\n+ id = \"New Storage Volume Increment\";\n+ break;\n+ case SDC_RASD_DEF:\n+ id = \"New Storage Volume Default\";\n+ break;\n+ default:\n+ cu_statusf(_BROKER, &s,\n+ CMPI_RC_ERR_FAILED,\n+ \"Unsupported sdc_rasd type\");\n+ goto out;\n+ }\n+\n+ ret = get_disk_pool(poolptr, &pool);\n+ if (ret == 1) {\n+ virt_set_status(_BROKER, &s,\n+ CMPI_RC_ERR_FAILED,\n+ virStoragePoolGetConnect(poolptr),\n+ \"Error getting referenced configuration\");\n+ goto out;\n+ }\n+\n+ type = pool->pool_info.disk.pool_type;\n+ if (type != DISK_POOL_DIR) {\n+ CU_DEBUG(\"Image creation for this pool type is not supported\");\n+ goto out;\n+ }\n+\n+ inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_IMAGE, NEW_VOL_RASD);\n+ if ((inst == NULL) || (s.rc != CMPI_RC_OK))\n+ goto out;\n+\n+ CMSetProperty(inst, \"InstanceID\", (CMPIValue *)id, CMPI_chars);\n+ CMSetProperty(inst, \"Type\", (CMPIValue *)&type, CMPI_uint16);\n+\n+ path = \"\/var\/lib\/libvirt\/images\/\";\n+ CMSetProperty(inst, \"Path\", (CMPIValue *)path, CMPI_chars);\n+\n+ inst_list_add(list, inst);\n+\n+ out:\n+ cleanup_virt_pool(&pool);\n+\n+ return s;\n+}\n+\n+static CMPIStatus avail_volume_template(const CMPIObjectPath *ref,\n+ int template_type,\n+ virStorageVolPtr volume_ptr,\n+ struct inst_list *list)\n {\n char *pfx = NULL;\n const char *id;\n@@ -1163,6 +1234,10 @@\n goto out;\n }\n \n+ s = new_volume_template(ref, template_type, poolptr, list);\n+ if (s.rc != CMPI_RC_OK)\n+ goto out; \n+\n if ((numvols = virStoragePoolNumOfVolumes(poolptr)) == -1) {\n virt_set_status(_BROKER, &s,\n CMPI_RC_ERR_FAILED,\n@@ -1206,7 +1281,7 @@\n goto out;\n } \n \n- s = volume_template(ref, template_type, volptr, list);\n+ s = avail_volume_template(ref, template_type, volptr, list);\n \n virStorageVolFree(volptr);\n \n@@ -1388,9 +1463,9 @@\n return s;\n }\n \n-static CMPIStatus disk_dev_or_pool_template(const CMPIObjectPath *ref,\n- int template_type,\n- struct inst_list *list)\n+static CMPIStatus disk_res_template(const CMPIObjectPath *ref,\n+ int template_type,\n+ struct inst_list *list)\n {\n CMPIStatus s = {CMPI_RC_OK, NULL};\n CMPIInstance *inst;\n@@ -1421,7 +1496,7 @@\n \n if (val)\n s = disk_pool_template(ref, template_type, list);\n- else\n+ else \n s = disk_template(ref, template_type, list);\n \n out:\n@@ -1648,7 +1723,7 @@\n else if (type == CIM_RES_TYPE_NET)\n s = net_dev_or_pool_template(ref, i, list);\n else if (type == CIM_RES_TYPE_DISK)\n- s = disk_dev_or_pool_template(ref, i, list);\n+ s = disk_res_template(ref, i, list);\n else if (type == CIM_RES_TYPE_GRAPHICS)\n s = graphics_template(ref, i, list);\n else if (type == CIM_RES_TYPE_INPUT)\n"} {"commit":"a8034d39421311994509c712e50677af83b02c13","subject":"Update GenModelInterface.h","message":"Update GenModelInterface.h","repos":"mathbouchard\/GenModel,mathbouchard\/GenModel,mathbouchard\/GenModel,mathbouchard\/GenModel,mathbouchard\/GenModel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/GenModelInterface.h\n+++ src\/GenModelInterface.h\n@@ -1,4 +1,4 @@\n-\/\/ GenModelDLL.h : main header file for the GenModelDLL DLL\r\n+\/\/ GenModelInterface.h : main header file for the GenModelDLL DLL\r\n \/\/\r\n \r\n #pragma once\r\n"} {"commit":"0e37372291125f8253eedf06be6d56263180436a","subject":"conf: fix logic error for scsi units","message":"conf: fix logic error for scsi units\n\nIntroduced in c8007fdc5d2, it should use 'greater than max' instead of\n'equal or greater than max' for the condition of checking invalid scsi\nunit.\n\nSigned-off-by: Han Han <2f3eec96101b6aa65baff01c5b79fa5c74aa8195@redhat.com>\nReviewed-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\n","repos":"jardasgit\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,zippy2\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,libvirt\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_conf.c\n+++ src\/conf\/domain_conf.c\n@@ -4850,7 +4850,7 @@\n break;\n }\n \n- if (max != -1 && addr->unit >= max)\n+ if (max != -1 && addr->unit > max)\n return true;\n if (reserved != -1 && addr->unit == reserved)\n return true;\n"} {"commit":"487b4b0d9caf0f4f5e862c3a8051a2bdf96c4b8a","subject":"ngx_http_core_module.c","message":"ngx_http_core_module.c\n","repos":"chronolaw\/annotated_nginx,chronolaw\/annotated_nginx,chronolaw\/annotated_nginx,chronolaw\/annotated_nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- nginx\/src\/http\/ngx_http_core_module.c\n+++ nginx\/src\/http\/ngx_http_core_module.c\n@@ -1160,6 +1160,9 @@\n \n clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);\n \n+ \/\/ \u8fd9\u91cc\u68c0\u67e5location\u7684internal\u6807\u5fd7\n+ \/\/ \u5982\u679c\u8bbe\u7f6e\u4e86internal\u4f46\u8bf7\u6c42\u4e0d\u662finternal\n+ \/\/ \u90a3\u4e48\u76f4\u63a5\u8c03\u7528ngx_http_finalize_request\u8fd4\u56de404\n if (!r->internal && clcf->internal) {\n ngx_http_finalize_request(r, NGX_HTTP_NOT_FOUND);\n return NGX_OK;\n@@ -1648,6 +1651,7 @@\n if (r->content_handler) {\n \/\/ \u8bbe\u7f6e\u5199\u4e8b\u4ef6\u4e3angx_http_request_empty_handler\n \/\/ \u5373\u6682\u65f6\u4e0d\u518d\u8fdb\u5165ngx_http_core_run_phases\n+ \/\/ \u8fd9\u662f\u56e0\u4e3a\u5185\u5bb9\u4ea7\u751f\u9636\u6bb5\u5df2\u7ecf\u662f\u201c\u6700\u540e\u201d\u4e00\u4e2a\u9636\u6bb5\u4e86\uff0c\u4e0d\u9700\u8981\u518d\u8d70\u5176\u4ed6\u9636\u6bb5\n \/\/ \u4e4b\u540e\u53d1\u9001\u6570\u636e\u65f6\u4f1a\u6539\u4e3angx_http_set_write_handler\n \/\/ \u4f46\u6211\u4eec\u4e5f\u53ef\u4ee5\u4fee\u6539\uff0c\u8ba9\u5199\u4e8b\u4ef6\u89e6\u53d1\u6211\u4eec\u81ea\u5df1\u7684\u56de\u8c03\n r->write_event_handler = ngx_http_request_empty_handler;\n@@ -1798,6 +1802,7 @@\n r->limit_rate = clcf->limit_rate;\n }\n \n+ \/\/ \u6ce8\u610f\u8fd9\u91cc\uff0c\u8bbe\u7f6e\u4e86\u8bf7\u6c42\u5728location\u91cc\u7684\u4e13\u7528\u5904\u7406handler\n if (clcf->handler) {\n r->content_handler = clcf->handler;\n }\n@@ -2067,6 +2072,8 @@\n }\n \n \n+\/\/ \u4eceuri\u91cc\u89e3\u6790\u51fa\u6269\u5c55\u540d\uff08extern\uff09\n+\/\/ \u8bbe\u7f6er->exten\u6210\u5458\n void\n ngx_http_set_exten(ngx_http_request_t *r)\n {\n@@ -2074,9 +2081,11 @@\n \n ngx_str_null(&r->exten);\n \n+ \/\/ \u4eceuri\u672b\u5c3e\u5012\u7740\u67e5\u627e\n for (i = r->uri.len - 1; i > 1; i--) {\n if (r->uri.data[i] == '.' && r->uri.data[i - 1] != '\/') {\n \n+ \/\/ \u8bbe\u7f6er->exten\u6210\u5458\n r->exten.len = r->uri.len - i - 1;\n r->exten.data = &r->uri.data[i + 1];\n \n@@ -2168,6 +2177,7 @@\n }\n \n \n+\/\/ \u6307\u5b9acontent type\u53d1\u9001\u67d0\u4e2a\u53d8\u91cf\u503c\u4f5c\u4e3a\u54cd\u5e94\u6570\u636e\n ngx_int_t\n ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status,\n ngx_str_t *ct, ngx_http_complex_value_t *cv)\n@@ -2177,16 +2187,20 @@\n ngx_buf_t *b;\n ngx_chain_t out;\n \n+ \/\/ \u8fd9\u65f6\u5df2\u7ecf\u4e0d\u9700\u8981body\u4e86\uff0c\u6240\u4ee5\u4e22\u5f03\n if (ngx_http_discard_request_body(r) != NGX_OK) {\n return NGX_HTTP_INTERNAL_SERVER_ERROR;\n }\n \n+ \/\/ \u8bbe\u7f6e\u54cd\u5e94\u5934\u91cc\u7684\u72b6\u6001\u7801\n r->headers_out.status = status;\n \n+ \/\/ \u8ba1\u7b97\u5f97\u5230\u53d8\u91cf\uff08\u811a\u672c\uff09\u503c\n if (ngx_http_complex_value(r, cv, &val) != NGX_OK) {\n return NGX_HTTP_INTERNAL_SERVER_ERROR;\n }\n \n+ \/\/ \u5982\u679c\u72b6\u6001\u7801\u662f\u7279\u6b8a\u76844\u4e2a\u5c31\u4e0d\u53d1\u9001\u6570\u636e\uff0c\u76f4\u63a5\u8fd4\u56de\u5934\n if (status == NGX_HTTP_MOVED_PERMANENTLY\n || status == NGX_HTTP_MOVED_TEMPORARILY\n || status == NGX_HTTP_SEE_OTHER\n@@ -2206,8 +2220,10 @@\n return status;\n }\n \n+ \/\/ \u8bbe\u7f6e\u8f93\u51fa\u6570\u636e\u7684\u957f\u5ea6\uff0c\u5728\u5934\u91cc\n r->headers_out.content_length_n = val.len;\n \n+ \/\/ content type\uff0c\u5728\u51fd\u6570\u53c2\u6570\u91cc\u4f20\u9012\n if (ct) {\n r->headers_out.content_type_len = ct->len;\n r->headers_out.content_type = *ct;\n@@ -2218,10 +2234,12 @@\n }\n }\n \n+ \/\/ \u5982\u679c\u662fHEAD\u8bf7\u6c42\uff0c\u90a3\u4e48\u4e0d\u53d1\u9001body\uff0c\u53ea\u53d1\u9001\u5934\n if (r->method == NGX_HTTP_HEAD || (r != r->main && val.len == 0)) {\n return ngx_http_send_header(r);\n }\n \n+ \/\/ \u5206\u914dbuffer\u4f9b\u53d1\u9001\u7528\n b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));\n if (b == NULL) {\n return NGX_HTTP_INTERNAL_SERVER_ERROR;\n@@ -2233,15 +2251,18 @@\n b->last_buf = (r == r->main) ? 1 : 0;\n b->last_in_chain = 1;\n \n+ \/\/ buffer\u653e\u8fdbchain\u91cc\n out.buf = b;\n out.next = NULL;\n \n+ \/\/ \u5148\u53d1\u9001\u5934\n rc = ngx_http_send_header(r);\n \n if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {\n return rc;\n }\n \n+ \/\/ \u53d1\u9001body\u6570\u636e\uff0c\u8d70\u8fc7\u6ee4\u94fe\u8868\n return ngx_http_output_filter(r, &out);\n }\n \n"} {"commit":"1ab2785c81f8ad7eb664e9fd6e2844c5bf6197ba","subject":"FIX: variable shadowing","message":"FIX: variable shadowing\n","repos":"orpiske\/msg-perf-tool,orpiske\/msg-perf-tool,orpiske\/msg-perf-tool","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/api\/qpid-proton\/proton-handlers.c\n+++ src\/api\/qpid-proton\/proton-handlers.c\n@@ -92,7 +92,7 @@\n }\n \n void proton_set_properties(void *ctxt, void *msg, void *payload) {\n-\tgru_list_t *properties = (gru_list_t *) payload;\n+\tgru_list_t *pl_properties = (gru_list_t *) payload;\n \tpn_message_t *message = (pn_message_t*) msg;\n \n \tpn_data_t *msg_properties = pn_message_properties(message);\n@@ -100,7 +100,7 @@\n \tpn_data_put_map(msg_properties);\n \tpn_data_enter(msg_properties);\n \n-\tgru_node_t *node = properties->root;\n+\tgru_node_t *node = pl_properties->root;\n \n \twhile (node) {\n \t\tgru_keypair_t *property = (gru_keypair_t *) node->data;\n"} {"commit":"f9da823afec9abdde353190a51740c8b08376757","subject":"virDomainControllerDefFormatPCI: Refactor formatting of '<target>' subelement","message":"virDomainControllerDefFormatPCI: Refactor formatting of '<target>' subelement\n\nRewrite the code to use virXMLFormat element so that we can avoid a\nbunch of unnecessary checks.\n\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"zippy2\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,libvirt\/libvirt,olafhering\/libvirt,zippy2\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_conf.c\n+++ src\/conf\/domain_conf.c\n@@ -22676,6 +22676,8 @@\n virDomainControllerDef *def,\n unsigned int flags)\n {\n+ g_auto(virBuffer) targetAttrBuf = VIR_BUFFER_INITIALIZER;\n+ g_auto(virBuffer) targetChildBuf = VIR_BUFFER_INIT_CHILD(buf);\n bool formatModelName = true;\n \n if (def->opts.pciopts.modelName == VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE)\n@@ -22710,45 +22712,25 @@\n virBufferAsprintf(buf, \"<model name='%s'\/>\\n\", modelName);\n }\n \n- if (def->opts.pciopts.chassisNr != -1 ||\n- def->opts.pciopts.chassis != -1 ||\n- def->opts.pciopts.port != -1 ||\n- def->opts.pciopts.busNr != -1 ||\n- def->opts.pciopts.targetIndex != -1 ||\n- def->opts.pciopts.numaNode != -1 ||\n- def->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_ABSENT) {\n- virBufferAddLit(buf, \"<target\");\n- if (def->opts.pciopts.chassisNr != -1)\n- virBufferAsprintf(buf, \" chassisNr='%d'\",\n- def->opts.pciopts.chassisNr);\n- if (def->opts.pciopts.chassis != -1)\n- virBufferAsprintf(buf, \" chassis='%d'\",\n- def->opts.pciopts.chassis);\n- if (def->opts.pciopts.port != -1)\n- virBufferAsprintf(buf, \" port='0x%x'\",\n- def->opts.pciopts.port);\n- if (def->opts.pciopts.busNr != -1)\n- virBufferAsprintf(buf, \" busNr='%d'\",\n- def->opts.pciopts.busNr);\n- if (def->opts.pciopts.targetIndex != -1)\n- virBufferAsprintf(buf, \" index='%d'\",\n- def->opts.pciopts.targetIndex);\n- if (def->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_ABSENT) {\n- virBufferAsprintf(buf, \" hotplug='%s'\",\n- virTristateSwitchTypeToString(def->opts.pciopts.hotplug));\n- }\n- if (def->opts.pciopts.numaNode == -1) {\n- virBufferAddLit(buf, \"\/>\\n\");\n- } else {\n- virBufferAddLit(buf, \">\\n\");\n- virBufferAdjustIndent(buf, 2);\n- virBufferAsprintf(buf, \"<node>%d<\/node>\\n\",\n- def->opts.pciopts.numaNode);\n- virBufferAdjustIndent(buf, -2);\n- virBufferAddLit(buf, \"<\/target>\\n\");\n- }\n- }\n-\n+ if (def->opts.pciopts.chassisNr != -1)\n+ virBufferAsprintf(&targetAttrBuf, \" chassisNr='%d'\", def->opts.pciopts.chassisNr);\n+ if (def->opts.pciopts.chassis != -1)\n+ virBufferAsprintf(&targetAttrBuf, \" chassis='%d'\", def->opts.pciopts.chassis);\n+ if (def->opts.pciopts.port != -1)\n+ virBufferAsprintf(&targetAttrBuf, \" port='0x%x'\", def->opts.pciopts.port);\n+ if (def->opts.pciopts.busNr != -1)\n+ virBufferAsprintf(&targetAttrBuf, \" busNr='%d'\", def->opts.pciopts.busNr);\n+ if (def->opts.pciopts.targetIndex != -1)\n+ virBufferAsprintf(&targetAttrBuf, \" index='%d'\", def->opts.pciopts.targetIndex);\n+ if (def->opts.pciopts.hotplug != VIR_TRISTATE_SWITCH_ABSENT) {\n+ virBufferAsprintf(&targetAttrBuf, \" hotplug='%s'\",\n+ virTristateSwitchTypeToString(def->opts.pciopts.hotplug));\n+ }\n+\n+ if (def->opts.pciopts.numaNode != -1)\n+ virBufferAsprintf(&targetChildBuf, \"<node>%d<\/node>\\n\", def->opts.pciopts.numaNode);\n+\n+ virXMLFormatElement(buf, \"target\", &targetAttrBuf, &targetChildBuf);\n return 0;\n }\n \n"} {"commit":"881f07ec7688c8244b2c5e272e954018d460af0f","subject":"Added Object2D::move() to manage 2D stacking order.","message":"Added Object2D::move() to manage 2D stacking order.\n","repos":"DerThorsten\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,DerThorsten\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,DerThorsten\/magnum,DerThorsten\/magnum,MiUishadow\/magnum,DerThorsten\/magnum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/SceneGraph\/Object.h\n+++ src\/SceneGraph\/Object.h\n@@ -299,6 +299,16 @@\n multiplyTransformation(Matrix3::rotation(angle), type);\n return this;\n }\n+\n+ \/**\n+ * @brief Move object in stacking order\n+ * @param under Sibling object under which to move or `nullptr`,\n+ * if you want to move it above all.\n+ *\/\n+ inline Object2D* move(Object2D* under) {\n+ list()->Corrade::Containers::DoubleLinkedList<Object2D>::move(this, under);\n+ return this;\n+ }\n };\n \n \/** @brief Three-dimensional object *\/\n"} {"commit":"cedc3cce0d36f2737266a01c21137c25ab4b43e2","subject":"[r528]add jtag init support","message":"[r528]add jtag init support\n","repos":"xboot\/xboot,xboot\/xboot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/arch\/arm32\/mach-r528s2\/sys-jtag.c\n+++ src\/arch\/arm32\/mach-r528s2\/sys-jtag.c\n@@ -30,4 +30,28 @@\n \n void sys_jtag_init(void)\n {\n+\tvirtual_addr_t addr;\n+\tu32_t val;\n+\n+\t\/* Config GPIOF0, GPIOF1, GPIOF3 and GPIOF5 to JTAG mode *\/\n+\taddr = 0x020000f0 + 0x00;\n+\tval = read32(addr);\n+\tval &= ~(0xf << ((0 & 0x7) << 2));\n+\tval |= ((0x3 & 0xf) << ((0 & 0x7) << 2));\n+\twrite32(addr, val);\n+\n+\tval = read32(addr);\n+\tval &= ~(0xf << ((1 & 0x7) << 2));\n+\tval |= ((0x3 & 0xf) << ((1 & 0x7) << 2));\n+\twrite32(addr, val);\n+\n+\tval = read32(addr);\n+\tval &= ~(0xf << ((3 & 0x7) << 2));\n+\tval |= ((0x3 & 0xf) << ((3 & 0x7) << 2));\n+\twrite32(addr, val);\n+\n+\tval = read32(addr);\n+\tval &= ~(0xf << ((5 & 0x7) << 2));\n+\tval |= ((0x3 & 0xf) << ((5 & 0x7) << 2));\n+\twrite32(addr, val);\n }\n"} {"commit":"5378effd57591f9215fb5fc27efc6c32dae2b634","subject":"conf: Ignore emulatorpin if vcpu placement is auto","message":"conf: Ignore emulatorpin if vcpu placement is auto\n\nWhen vcpu placement is \"auto\", the domain process will be pinned\nto advisory nodeset from querying numad, While emulatorpin will\noverride the pinning. That means both of them are to set the\npinning policy for domain process, but conflicts with each other.\n\nThis patch ingore emulatorpin if vcpu placement is \"auto\", because\n<vcpu> placement can't be simply ignored for <numatune> placement\ncould default to it.\n","repos":"siboulet\/libvirt-openvz,eskultety\/libvirt,jeckersb\/libvirt,shugaoye\/libvirt,VenkatDatta\/libvirt,crobinso\/libvirt,jeckersb\/libvirt,VenkatDatta\/libvirt,jeckersb\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,elmarco\/libvirt,jeckersb\/libvirt,andreabolognani\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,datto\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,jeckersb\/libvirt,bjzhang\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jardasgit\/libvirt,novel\/fbsd-libvirt,agx\/libvirt,siboulet\/libvirt-openvz,cbosdo\/libvirt,VenkatDatta\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,zippy2\/libvirt,novel\/fbsd-libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,novel\/fbsd-libvirt,novel\/fbsd-libvirt,crobinso\/libvirt,andreabolognani\/libvirt,emaste\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,emaste\/libvirt,taget\/libvirt,libvirt\/libvirt,shugaoye\/libvirt,datto\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,fabianfreyer\/libvirt,iam-TJ\/libvirt,eskultety\/libvirt,novel\/fbsd-libvirt,taget\/libvirt,trainstack\/libvirt,trainstack\/libvirt,bjzhang\/libvirt,siboulet\/libvirt-openvz,cbosdo\/libvirt,elmarco\/libvirt,olafhering\/libvirt,libvirt\/libvirt,eskultety\/libvirt,trainstack\/libvirt,shugaoye\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,rlaager\/libvirt,iam-TJ\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,iam-TJ\/libvirt,elmarco\/libvirt,shugaoye\/libvirt,olafhering\/libvirt,emaste\/libvirt,emaste\/libvirt,novel\/fbsd-libvirt,datto\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,iam-TJ\/libvirt,nertpinx\/libvirt,jeckersb\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,emaste\/libvirt,rlaager\/libvirt,iam-TJ\/libvirt,datto\/libvirt,shugaoye\/libvirt,novel\/fbsd-libvirt,olafhering\/libvirt,libvirt\/libvirt,cbosdo\/libvirt,elmarco\/libvirt,siboulet\/libvirt-openvz,iam-TJ\/libvirt,bjzhang\/libvirt,VenkatDatta\/libvirt,trainstack\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,taget\/libvirt,rlaager\/libvirt,rlaager\/libvirt,jfehlig\/libvirt,datto\/libvirt,siboulet\/libvirt-openvz,fabianfreyer\/libvirt,iam-TJ\/libvirt,bjzhang\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,novel\/fbsd-libvirt,jfehlig\/libvirt,jeckersb\/libvirt,agx\/libvirt,fabianfreyer\/libvirt,cbosdo\/libvirt,fabianfreyer\/libvirt,emaste\/libvirt,crobinso\/libvirt,novel\/fbsd-libvirt,trainstack\/libvirt,elmarco\/libvirt,bjzhang\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,taget\/libvirt,trainstack\/libvirt,taget\/libvirt,emaste\/libvirt,agx\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_conf.c\n+++ src\/conf\/domain_conf.c\n@@ -8880,19 +8880,27 @@\n goto error;\n }\n \n+ \/* Ignore emulatorpin if <vcpu> placement is \"auto\", they\n+ * conflicts with each other, and <vcpu> placement can't be\n+ * simply ignored, as <numatune>'s placement defaults to it.\n+ *\/\n if (n) {\n- if (n > 1) {\n- virReportError(VIR_ERR_XML_ERROR, \"%s\",\n- _(\"only one emulatorpin is supported\"));\n- VIR_FREE(nodes);\n- goto error;\n- }\n-\n- def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0], ctxt,\n- def->maxvcpus, 1);\n-\n- if (!def->cputune.emulatorpin)\n- goto error;\n+ if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {\n+ if (n > 1) {\n+ virReportError(VIR_ERR_XML_ERROR, \"%s\",\n+ _(\"only one emulatorpin is supported\"));\n+ VIR_FREE(nodes);\n+ goto error;\n+ }\n+\n+ def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0], ctxt,\n+ def->maxvcpus, 1);\n+\n+ if (!def->cputune.emulatorpin)\n+ goto error;\n+ } else {\n+ VIR_WARN(\"Ignore emulatorpin for <vcpu> placement is 'auto'\");\n+ }\n }\n VIR_FREE(nodes);\n \n"} {"commit":"8005f55953b4d54265b377ebed525bd2770e3b61","subject":"Implement slot pool shared by all resource groups. ","message":"Implement slot pool shared by all resource groups. \n\nPreviously every resource group has its own slot pool, each with size of 'MaxConnection'.\r\nIn order to reduce memory usage, implement a slot pool shared by all resource groups.\r\n\r\nIn addition, free slots in the slot pool are organized as a free list to optimize alloc\/free\r\noperations.\r\n","repos":"yuanzhao\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,50wu\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,50wu\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,50wu\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,Chibin\/gpdb,edespino\/gpdb,50wu\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,xinzweb\/gpdb,Chibin\/gpdb,edespino\/gpdb,Chibin\/gpdb,Chibin\/gpdb,edespino\/gpdb,50wu\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/resgroup\/resgroup.c\n+++ src\/backend\/utils\/resgroup\/resgroup.c\n@@ -46,7 +46,7 @@\n #include \"utils\/vmem_tracker.h\"\n \n #define InvalidSlotId\t(-1)\n-#define RESGROUP_MAX_SLOTS\t300\n+#define RESGROUP_MAX_SLOTS\t(MaxConnections)\n \n \/*\n * GUC variables.\n@@ -104,13 +104,14 @@\n struct ResGroupSlotData\n {\n \tint\t\t\t\tsessionId;\n+\tOid\t\t\t\tgroupId;\n \n \tResGroupCaps\tcaps;\n \n \tint32\t\t\tmemQuota;\t\/* memory quota of current slot *\/\n \tint32\t\t\tmemUsage;\t\/* total memory usage of procs belongs to this slot *\/\n \tint\t\t\t\tnProcs;\t\t\/* number of procs in this slot *\/\n-\tbool\t\t\tinUse;\n+\tint\t\t\t\tnext;\t\t\/* next free slot in free list *\/\n };\n \n \/*\n@@ -141,8 +142,6 @@\n \t *\/\n \tint32\t\tmemUsage;\n \tint32\t\tmemSharedUsage;\n-\n-\tResGroupSlotData slots[RESGROUP_MAX_SLOTS];\n };\n \n struct ResGroupControl\n@@ -158,6 +157,9 @@\n \n \tint32\t\t\ttotalChunks;\t\/* total memory chunks on this segment *\/\n \tint32\t\t\tfreeChunks;\t\t\/* memory chunks not allocated to any group *\/\n+\n+\tResGroupSlotData *slots;\t\t\/* slot pool shared by all resource groups *\/\n+\tint\t\t\t\tfreeSlot;\t\t\/* header of free list for slot pool *\/\n \n \tint\t\t\t\tnGroups;\n \tResGroupData\tgroups[1];\n@@ -211,10 +213,13 @@\n static void groupDecMemUsage(ResGroupData *group,\n \t\t\t\t\t\t\t ResGroupSlotData *slot,\n \t\t\t\t\t\t\t int32 chunks);\n-static void initSlot(ResGroupSlotData *slot, ResGroupCaps *caps, int sessionId);\n+static void initSlot(ResGroupSlotData *slot, ResGroupCaps *caps,\n+\t\t\t\t\tOid groupId, int sessionId);\n static void selfAttachToSlot(ResGroupData *group, ResGroupSlotData *slot);\n static void selfDetachSlot(ResGroupData *group, ResGroupSlotData *slot);\n-static int getFreeSlot(ResGroupData *group);\n+static int slotPoolAlloc(void);\n+static void slotPoolFree(int slotId);\n+static void slotPoolInitSlot(int slotId, int next);\n static int getSlot(ResGroupData *group);\n static void putSlot(void);\n static void ResGroupSlotAcquire(void);\n@@ -237,6 +242,8 @@\n static void selfSetSlot(int slotId);\n static void selfUnsetSlot(void);\n static bool procIsInWaitQueue(const PGPROC *proc);\n+static bool slotIsInUse(const ResGroupSlotData *slot);\n+static bool slotIdIsValid(int slotId);\n #ifdef USE_ASSERT_CHECKING\n static bool groupIsNotDropped(const ResGroupData *group);\n #endif\/\/USE_ASSERT_CHECKING\n@@ -264,6 +271,9 @@\n \t\/* The control structure. *\/\n \tsize = add_size(size, mul_size(MaxResourceGroups, sizeof(ResGroupData)));\n \n+\t\/* The slot pool. *\/\n+\tsize = add_size(size, mul_size(RESGROUP_MAX_SLOTS, sizeof(ResGroupSlotData)));\n+\n \t\/* Add a safety margin *\/\n \tsize = add_size(size, size \/ 10);\n \n@@ -281,6 +291,7 @@\n HASHCTL info;\n int hash_flags;\n \tint\t\t\tsize;\n+\tSize\t\tslots_size;\n \n \tsize = sizeof(*pResGroupControl) - sizeof(ResGroupData);\n \tsize += mul_size(MaxResourceGroups, sizeof(ResGroupData));\n@@ -321,6 +332,22 @@\n \n \tfor (i = 0; i < MaxResourceGroups; i++)\n \t\tpResGroupControl->groups[i].groupId = InvalidOid;\n+\n+\tslots_size = mul_size(RESGROUP_MAX_SLOTS, sizeof(ResGroupSlotData));\n+\n+\t\/*\n+\t * Alloc and initialize slot pool\n+\t *\/\n+\tpResGroupControl->slots = ShmemAlloc(slots_size);\n+\tif (!pResGroupControl->slots)\n+\t\tgoto error_out;\n+\n+\tMemSet(pResGroupControl->slots, 0, slots_size);\n+\tfor (i = 0; i < RESGROUP_MAX_SLOTS - 1; i++)\n+\t\tslotPoolInitSlot(i, i + 1);\n+\tslotPoolInitSlot(RESGROUP_MAX_SLOTS - 1, InvalidSlotId);\n+\n+\tpResGroupControl->freeSlot = 0;\n \n return;\n \n@@ -1046,7 +1073,6 @@\n \tgroup->memQuotaUsed = 0;\n \tmemset(&group->totalQueuedTime, 0, sizeof(group->totalQueuedTime));\n \tgroup->lockedForDrop = false;\n-\tmemset(group->slots, 0, sizeof(group->slots));\n \n \tgroup->memQuotaGranted = 0;\n \tgroup->memSharedGranted = 0;\n@@ -1158,38 +1184,72 @@\n * Initialize the members of a slot\n *\/\n static void\n-initSlot(ResGroupSlotData *slot, ResGroupCaps *caps, int sessionId)\n-{\n-\tAssert(slot->inUse);\n-\n+initSlot(ResGroupSlotData *slot, ResGroupCaps *caps, Oid groupId, int sessionId)\n+{\n+\tAssert(!slotIsInUse(slot));\n+\n+\tslot->groupId = groupId;\n \tslot->sessionId = sessionId;\n \tslot->caps = *caps;\n \tslot->memQuota = slotGetMemQuotaExpected(caps);\n \tslot->memUsage = 0;\n }\n-\/*\n- * Get a free resource group slot.\n- *\n- * A free resource group slot has inUse == false, no other information is checked.\n+\n+\/*\n+ * Alloc a slot from shared slot pool\n *\/\n static int\n-getFreeSlot(ResGroupData *group)\n-{\n-\tint i;\n+slotPoolAlloc(void)\n+{\n+\tint ret;\n+\tResGroupSlotData *slot;\n \n \tAssert(LWLockHeldExclusiveByMe(ResGroupLock));\n \n-\tfor (i = 0; i < RESGROUP_MAX_SLOTS; i++)\n-\t{\n-\t\tif (group->slots[i].inUse)\n-\t\t\tcontinue;\n-\n-\t\tgroup->slots[i].inUse = true;\n-\t\treturn i;\n-\t}\n-\n-\tAssert(false && \"No free slot available\");\n-\treturn InvalidSlotId;\n+\tret = pResGroupControl->freeSlot;\n+\tif (ret == InvalidSlotId)\n+\t\treturn InvalidSlotId;\n+\n+\tAssert(slotIdIsValid(ret));\n+\n+\tslot = &pResGroupControl->slots[ret];\n+\tAssert(!slotIsInUse(slot));\n+\tpResGroupControl->freeSlot = slot->next;\n+\n+\tslot->next = InvalidSlotId;\n+\n+\treturn ret;\n+}\n+\n+\/*\n+ * Free a slot back to shared slot pool\n+ *\/\n+static void\n+slotPoolFree(int slotId)\n+{\n+\tResGroupSlotData *slot;\n+\n+\tAssert(LWLockHeldExclusiveByMe(ResGroupLock));\n+\n+\tslot = &pResGroupControl->slots[slotId];\n+\tAssert(slotIsInUse(slot));\n+\n+\tslot->groupId = InvalidOid;\n+\tslot->next = pResGroupControl->freeSlot;\n+\tpResGroupControl->freeSlot = slotId;\n+}\n+\n+\/*\n+ * Initialize slot when initializing slot pool\n+ *\/\n+static void\n+slotPoolInitSlot(int slotId, int next)\n+{\n+\tResGroupSlotData *slot;\n+\n+\tslot = &pResGroupControl->slots[slotId];\n+\tslot->next = next;\n+\tslot->groupId = InvalidOid;\n }\n \n \/*\n@@ -1199,7 +1259,7 @@\n * available and the concurrency limit is not reached.\n *\n * On success the memory quota is marked as granted, nRunning is increased\n- * and the slot's inUse flag is also set, the slot id is returned.\n+ * and the slot's groupId is also set accordingly, the slot id is returned.\n *\n * On failure nothing is changed and InvalidSlotId is returned.\n *\/\n@@ -1245,7 +1305,7 @@\n \t}\n \n \t\/* Now actually get a free slot *\/\n-\tslotId = getFreeSlot(group);\n+\tslotId = slotPoolAlloc();\n \tAssert(slotId != InvalidSlotId);\n \n \tgroup->nRunning++;\n@@ -1262,6 +1322,7 @@\n static void\n putSlot(void)\n {\n+\tint\t\t\t\t\tslotId = self->slotId;\n \tResGroupSlotData\t*slot = self->slot;\n \tResGroupData\t\t*group = self->group;\n \tbool\t\t\t\tshouldWakeUp;\n@@ -1277,7 +1338,7 @@\n \n \tselfUnsetSlot();\n \n-\tAssert(slot->inUse);\n+\tAssert(slotIsInUse(slot));\n \n \t\/* Return the memory quota granted to this slot *\/\n #ifdef USE_ASSERT_CHECKING\n@@ -1291,8 +1352,8 @@\n \tif (shouldWakeUp)\n \t\twakeupGroups(group->groupId);\n \n-\t\/* Mark the slot as free *\/\n-\tslot->inUse = false;\n+\t\/* Return the slot back to free list *\/\n+\tslotPoolFree(slotId);\n \n \t\/* And finally decrease nRunning *\/\n \tgroup->nRunning--;\n@@ -1351,7 +1412,8 @@\n \t\tif (slotId != InvalidSlotId)\n \t\t{\n \t\t\t\/* got one, lucky *\/\n-\t\t\tinitSlot(&group->slots[slotId], &group->caps, gp_session_id);\n+\t\t\tinitSlot(&pResGroupControl->slots[slotId], &group->caps,\n+\t\t\t\t\tgroup->groupId, gp_session_id);\n \t\t\tselfSetSlot(slotId);\n \n \t\t\tgroup->totalExecuted++;\n@@ -1674,7 +1736,8 @@\n \t\tAssert(waitProc->resWaiting != false);\n \t\tAssert(waitProc->resSlotId == InvalidSlotId);\n \n-\t\tinitSlot(&group->slots[slotId], &group->caps, waitProc->mppSessionId);\n+\t\tinitSlot(&pResGroupControl->slots[slotId], &group->caps,\n+\t\t\t\tgroup->groupId, waitProc->mppSessionId);\n \t\twaitProc->resWaiting = false;\n \t\twaitProc->resSlotId = slotId;\n \t\tSetLatch(&waitProc->procLatch);\n@@ -1843,7 +1906,8 @@\n \t\tAssert(waitProc->resWaiting != false);\n \t\tAssert(waitProc->resSlotId == InvalidSlotId);\n \n-\t\tinitSlot(&group->slots[slotId], &group->caps, waitProc->mppSessionId);\n+\t\tinitSlot(&pResGroupControl->slots[slotId], &group->caps,\n+\t\t\t\tgroup->groupId, waitProc->mppSessionId);\n \t\twaitProc->resSlotId = slotId;\t\/* pass the slot to new query *\/\n \t\twaitProc->resWaiting = false;\n \t\tSetLatch(&waitProc->procLatch);\n@@ -2047,8 +2111,8 @@\n \t\t\t\/* Release the slot memory *\/\n \t\t\tgroupReleaseMemQuota(group, slot);\n \n-\t\t\t\/* Mark the slot as free *\/\n-\t\t\tslot->inUse = false;\n+\t\t\t\/* Mark the group id in slot as invalid *\/\n+\t\t\tslot->groupId = InvalidOid;\n \n \t\t\t\/* And finally decrease nRunning *\/\n \t\t\tgroup->nRunning--;\n@@ -2089,6 +2153,11 @@\n \t\tAssert(selfIsUnassigned());\n \t\treturn;\n \t}\n+\n+\tif (!slotIdIsValid(newSlotId))\n+\t\tereport(ERROR,\n+\t\t\t\t(errcode(ERRCODE_INTERNAL_ERROR),\n+\t\t\t\t errmsg(\"Slot id %d is beyond the boundary [0, %d].\", newSlotId, RESGROUP_MAX_SLOTS - 1)));\n \n \tif (self->groupId != InvalidOid)\n \t{\n@@ -2121,9 +2190,7 @@\n \t}\n \telse\n \t{\n-\t\tAssert(!slot->inUse);\n-\t\tslot->inUse = true;\n-\t\tinitSlot(slot, &caps, gp_session_id);\n+\t\tinitSlot(slot, &caps, newGroupId, gp_session_id);\n \t\tgroup->nRunning++;\n \t}\n \tselfAttachToSlot(group, slot);\n@@ -2629,7 +2696,7 @@\n \tMyProc->resSlotId = InvalidSlotId;\n \n \tself->slotId = slotId;\n-\tself->slot = &self->group->slots[slotId];\n+\tself->slot = &pResGroupControl->slots[slotId];\n }\n \n \/*\n@@ -2661,6 +2728,24 @@\n \t\/* TODO: verify that proc is really in the queue in debug mode *\/\n \n \treturn proc->links.next != INVALID_OFFSET;\n+}\n+\n+\/*\n+ * Check whether slot is in use.\n+ *\/\n+static bool\n+slotIsInUse(const ResGroupSlotData *slot)\n+{\n+\treturn slot->groupId != InvalidOid;\n+}\n+\n+\/*\n+ * Check a slot id is valid.\n+ *\/\n+static bool\n+slotIdIsValid(int slotId)\n+{\n+\treturn (slotId >= 0 && slotId < RESGROUP_MAX_SLOTS);\n }\n \n #ifdef USE_ASSERT_CHECKING\n"} {"commit":"ad8fa356a6c444b616d85bf44635c2c275526fac","subject":"conf: Plug memory leak on virDomainDefParseXML() error path","message":"conf: Plug memory leak on virDomainDefParseXML() error path\n\nDetected by Coverity. Leak introduced in commit 0873b68.\n\nSigned-off-by: Alex Jia <e236faec8cb8371bfb245ba3769a84afc9a11438@redhat.com>\n","repos":"agx\/libvirt,rlaager\/libvirt,novel\/fbsd-libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,rmarwaha\/libvirt1,elmarco\/libvirt,novel\/fbsd-libvirt,agx\/libvirt,warewolf\/libvirt,trainstack\/libvirt,danwent\/libvirt-ovs,elmarco\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,iam-TJ\/libvirt,siboulet\/libvirt-openvz,foomango\/libvirt,VenkatDatta\/libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt1,zhlcindy\/libvirt-1.1.4-maintain,trainstack\/libvirt,rmarwaha\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,wiedi\/libvirt,dumbbell\/libvirt,agx\/libvirt,siboulet\/libvirt-openvz,VenkatDatta\/libvirt,datto\/libvirt,iam-TJ\/libvirt,andreabolognani\/libvirt,novel\/fbsd-libvirt,jardasgit\/libvirt,jeckersb\/libvirt,taget\/libvirt,datto\/libvirt,shugaoye\/libvirt,danwent\/libvirt-ovs,iam-TJ\/libvirt,foomango\/libvirt,nertpinx\/libvirt,jeckersb\/libvirt,foomango\/libvirt,jeckersb\/libvirt,warewolf\/libvirt,wiedi\/libvirt,cbosdo\/libvirt,rmarwaha\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,foomango\/libvirt,rmarwaha\/libvirt,eskultety\/libvirt,emaste\/libvirt,cbosdo\/libvirt,jardasgit\/libvirt,elmarco\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,datto\/libvirt,iam-TJ\/libvirt,VenkatDatta\/libvirt,rmarwaha\/libvirt1,jeckersb\/libvirt,olafhering\/libvirt,datto\/libvirt,bjzhang\/libvirt,emaste\/libvirt,shugaoye\/libvirt,olafhering\/libvirt,cbosdo\/libvirt,bjzhang\/libvirt,trainstack\/libvirt,agx\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,rlaager\/libvirt,eskultety\/libvirt,dumbbell\/libvirt,shugaoye\/libvirt,novel\/fbsd-libvirt,wiedi\/libvirt,bjzhang\/libvirt,zippy2\/libvirt,iam-TJ\/libvirt,fabianfreyer\/libvirt,trainstack\/libvirt,warewolf\/libvirt,emaste\/libvirt,emaste\/libvirt,dumbbell\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,crobinso\/libvirt,emaste\/libvirt,warewolf\/libvirt,iam-TJ\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,dumbbell\/libvirt,rmarwaha\/libvirt1,trainstack\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,novel\/fbsd-libvirt,warewolf\/libvirt,VenkatDatta\/libvirt,novel\/fbsd-libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,wiedi\/libvirt,warewolf\/libvirt,andreabolognani\/libvirt,bjzhang\/libvirt,rlaager\/libvirt,jfehlig\/libvirt,danwent\/libvirt-ovs,emaste\/libvirt,nertpinx\/libvirt,wiedi\/libvirt,cbosdo\/libvirt,elmarco\/libvirt,emaste\/libvirt,rmarwaha\/libvirt,siboulet\/libvirt-openvz,dumbbell\/libvirt,taget\/libvirt,zippy2\/libvirt,warewolf\/libvirt,wiedi\/libvirt,jeckersb\/libvirt,rmarwaha\/libvirt,shugaoye\/libvirt,eskultety\/libvirt,jeckersb\/libvirt,rmarwaha\/libvirt,fabianfreyer\/libvirt,taget\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,crobinso\/libvirt,rlaager\/libvirt,iam-TJ\/libvirt,shugaoye\/libvirt,taget\/libvirt,cbosdo\/libvirt,agx\/libvirt,danwent\/libvirt-ovs,trainstack\/libvirt,rmarwaha\/libvirt1,bjzhang\/libvirt,siboulet\/libvirt-openvz,jardasgit\/libvirt,elmarco\/libvirt,eskultety\/libvirt,novel\/fbsd-libvirt,libvirt\/libvirt,andreabolognani\/libvirt,datto\/libvirt,zippy2\/libvirt,jeckersb\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,danwent\/libvirt-ovs,crobinso\/libvirt,nertpinx\/libvirt,foomango\/libvirt,novel\/fbsd-libvirt,wiedi\/libvirt,rmarwaha\/libvirt1,siboulet\/libvirt-openvz,taget\/libvirt,libvirt\/libvirt,rlaager\/libvirt,dumbbell\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_conf.c\n+++ src\/conf\/domain_conf.c\n@@ -7540,6 +7540,7 @@\n if (i != 0) {\n virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n _(\"Only the first console can be a serial port\"));\n+ virDomainChrDefFree(chr);\n goto error;\n }\n \n"} {"commit":"6b9aac7437eb60aee7bea141c4c15e65e2732e9b","subject":"fixed before gcc5","message":"fixed before gcc5\n","repos":"xiongziliang\/ZLToolKit,xiongziliang\/ZLToolKit,xiongziliang\/ZLToolKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Util\/ResourcePool.h\n+++ src\/Util\/ResourcePool.h\n@@ -47,6 +47,7 @@\n \t\t\t\treturn new C();\n \t\t\t};\n \t\t}\n+#if !defined(__GUNC__) || (__GUNC__ >= 5)\n \t\ttemplate<typename ...ArgTypes>\n \t\t_ResourcePool(ArgTypes &&...args) {\n \t\t\tpoolsize = poolSize;\n@@ -54,6 +55,7 @@\n \t\t\t\treturn new C(args...);\n \t\t\t};\n \t\t}\n+#endif \/\/!defined(__GUNC__) || (__GUNC__ >= 5)\n \t\tvirtual ~_ResourcePool(){\n \t\t\tstd::lock_guard<mutex> lck(_mutex);\n \t\t\tfor(auto &ptr : objs){\n"} {"commit":"9f42fcc5b2a31e074bebed0f0f906c1e54b51b95","subject":"flush","message":"flush\n","repos":"m6w6\/ext-psi,m6w6\/ext-psi,m6w6\/ext-psi","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/context_validate.c\n+++ src\/context_validate.c\n@@ -171,14 +171,28 @@\n }\n static inline int validate_decl_typedef(PSI_Data *data, decl_arg *def) {\n \tif (!validate_decl_type(data, def->type)) {\n+\t\tconst char *pre;\n+\n+\t\tswitch (def->type->type) {\n+\t\tcase PSI_T_STRUCT:\tpre = \"struct \";\tbreak;\n+\t\tcase PSI_T_UNION:\tpre = \"union \";\t\tbreak;\n+\t\tcase PSI_T_ENUM:\tpre = \"enum \";\t\tbreak;\n+\t\tdefault:\t\t\tpre = \"\";\t\t\tbreak;\n+\t\t}\n \t\tdata->error(data, def->token, PSI_WARNING,\n \t\t\t\"Type '%s' cannot be aliased to %s'%s'\",\n-\t\t\tdef->type->name, def->type->type == PSI_T_STRUCT?\"struct \":\"\",\n-\t\t\tdef->var->name);\n-\t\treturn 0;\n-\t}\n-\tif (def->type->type == PSI_T_VOID && def->var->pointer_level) {\n-\t\tdef->type->type = PSI_T_POINTER;\n+\t\t\tdef->type->name, pre, def->var->name);\n+\t\treturn 0;\n+\t}\n+\tif (def->type->type == PSI_T_VOID) {\n+\t\tif (def->var->pointer_level) {\n+\t\t\tdef->type->type = PSI_T_POINTER;\n+\t\t} else {\n+\t\t\tdata->error(data, def->token, PSI_WARNING,\n+\t\t\t\t\"Type '%s' cannot be aliased to 'void'\",\n+\t\t\t\tdef->type->name);\n+\t\t\treturn 0;\n+\t\t}\n \t}\n \treturn 1;\n }\n@@ -194,6 +208,11 @@\n \t\t\t\"Cannot use '%s' as type for '%s'\",\n \t\t\targ->type->name, arg->var->name);\n \t\treturn 0;\n+\t} else {\n+\t\tdecl_type *real = real_decl_type(arg->type);\n+\n+\t\tif (real->type == PSI_T_FUNCTION) {\n+\t\t}\n \t}\n \treturn 1;\n }\n"} {"commit":"5e19824cea88f49825a82f5c743408a58b3f092c","subject":"del useless dbg info","message":"del useless dbg info\n","repos":"a1an1in\/libobject,a1an1in\/libobject,a1an1in\/libobject","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/core\/Linked_List.c\n+++ src\/core\/Linked_List.c\n@@ -41,8 +41,6 @@\n allocator_t *allocator = ((Obj *)list)->allocator;\n int lock_type = 0;\n \n- dbg_str(OBJ_DETAIL, \"llist list construct, list addr:%p\", list);\n-\n llist = llist_alloc(allocator);\n llist_set(llist, \"lock_type\", &lock_type);\n llist_init(llist);\n@@ -57,8 +55,6 @@\n \n static int __deconstrcut(List *list)\n {\n- dbg_str(OBJ_DETAIL, \"llist list deconstruct, list addr:%p\", list);\n-\n object_destroy(list->b);\n object_destroy(list->e);\n llist_destroy(((Linked_List *)list)->llist);\n@@ -70,16 +66,12 @@\n {\n Linked_List *l = (Linked_List *)list;\n \n- dbg_str(OBJ_DETAIL, \"Link list add\");\n-\n return llist_add_back(l->llist, value);\n }\n \n static int __add_back(List *list, void *value)\n {\n Linked_List *l = (Linked_List *)list;\n-\n- dbg_str(OBJ_DETAIL, \"Link list push back\");\n \n return llist_add_back(l->llist, value);\n }\n@@ -88,16 +80,12 @@\n {\n Linked_List *l = (Linked_List *)list;\n \n- dbg_str(OBJ_DETAIL, \"Link list push back\");\n-\n return llist_add_front(l->llist, value);\n }\n \n static int __delete(List *list)\n {\n Linked_List *l = (Linked_List *)list;\n-\n- dbg_str(OBJ_DETAIL, \"Link list delete\");\n \n return llist_delete(l->llist, &l->llist->begin);\n }\n@@ -106,16 +94,12 @@\n {\n Linked_List *l = (Linked_List *)list;\n \n- dbg_str(OBJ_DETAIL, \"Link list remove\");\n-\n return llist_remove_front(l->llist, data);\n }\n \n static int __remove_front(List *list, void **data)\n {\n Linked_List *l = (Linked_List *)list;\n-\n- dbg_str(OBJ_DETAIL, \"Link list remove front\");\n \n return llist_remove_front(l->llist, data);\n }\n@@ -124,16 +108,12 @@\n {\n Linked_List *l = (Linked_List *)list;\n \n- dbg_str(OBJ_DETAIL, \"Link list remove\");\n-\n return llist_remove_back(l->llist, data);\n }\n \n static int __remove_element(List *list, void *data)\n {\n Linked_List *l = (Linked_List *)list;\n-\n- dbg_str(OBJ_DETAIL, \"List remove element\");\n \n return llist_remove_element(l->llist, data);\n }\n@@ -179,8 +159,6 @@\n allocator_t *allocator = list->obj.allocator;\n LList_Iterator *iter = (LList_Iterator *)list->b;\n \n- dbg_str(OBJ_DETAIL, \"Linked List begin\");\n-\n llist_begin(l->llist, &(iter->list_pos));\n \n return (Iterator *)iter;\n@@ -191,8 +169,6 @@\n Linked_List *l = (Linked_List *)list;\n allocator_t *allocator = list->obj.allocator;\n LList_Iterator *iter = (LList_Iterator *)list->e;\n-\n- dbg_str(OBJ_DETAIL, \"Linked List end\");\n \n llist_end(l->llist, &(iter->list_pos));\n \n"} {"commit":"68c50c1c747131c41ad50aac40b5e5fc90ef994c","subject":"add disk_status in usb_msc_init to make sure SD card always init","message":"add disk_status in usb_msc_init to make sure SD card always init\n","repos":"tummychow\/arm-alarm,wcalvert\/LPC11U_LPC13U_CodeBase,tummychow\/arm-alarm,tummychow\/arm-alarm,tummychow\/arm-alarm,wcalvert\/LPC11U_LPC13U_CodeBase,wcalvert\/LPC11U_LPC13U_CodeBase,wcalvert\/LPC11U_LPC13U_CodeBase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/core\/usb\/usb_msc.c\n+++ src\/core\/usb\/usb_msc.c\n@@ -85,7 +85,6 @@\n \n if ( cache_count == CACHE_SIZE) \/\/ not enough to write, continue caching\n {\n-\/\/ _PRINTF(\"writing sector %d\\n\", cache_count, cache_sector);\n ASSERT( disk_write(0, cache_data, cache_sector, 1) == RES_OK, (void) 0 );\n cache_count = 0;\n }\n@@ -107,9 +106,7 @@\n if ( cache_sector != (offset \/ CACHE_SIZE) ) \/\/ new block\n {\n cache_sector = (offset \/ CACHE_SIZE);\n-\/\/ _PRINTF(\"reading sector %d\\n\", cache_sector);\n ASSERT( disk_read(0, cache_data, cache_sector, 1) == RES_OK, (void) 0 );\n-\/\/ print_cache(cache_data);\n }\n \n memcpy(*dst, cache_data + (offset%CACHE_SIZE), length);\n@@ -148,7 +145,11 @@\n \n ASSERT( pInterface, ERR_FAILED);\n \n-\/\/ ASSERT( !(disk_initialize(0) & (STA_NOINIT | STA_NODISK) ), ERR_FAILED);\n+ if (disk_status(0) & STA_NOINIT)\n+ {\n+ ASSERT( !(disk_initialize(0) & (STA_NOINIT | STA_NODISK) ), ERR_FAILED);\n+ }\n+\n ASSERT ( disk_ioctl(0, GET_SECTOR_SIZE , §or_size) == RES_OK, ERR_FAILED);\n ASSERT ( disk_ioctl(0, GET_SECTOR_COUNT, §or_count) == RES_OK, ERR_FAILED);\n \n"} {"commit":"d3935264526e18a389b425fc1bf7c8c0ce959486","subject":"auth: Fixed a memory leak when looking up penalty value from anvil.","message":"auth: Fixed a memory leak when looking up penalty value from anvil.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/auth-penalty.c\n+++ src\/auth\/auth-penalty.c\n@@ -88,6 +88,7 @@\n \t}\n \n \trequest->callback(penalty, request->auth_request);\n+\ti_free(request);\n }\n \n static const char *\n"} {"commit":"387efd364817f4890552b0687041930370239621","subject":"Make pg_hba parsing report all errors in the file before aborting the load, instead of just reporting the first one.","message":"Make pg_hba parsing report all errors in the file before aborting the load,\ninstead of just reporting the first one.\n\nSelena Deckelmann\n","repos":"yazun\/postgres-xl,jmcatamney\/gpdb,yuanzhao\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,yuanzhao\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,postmind-net\/postgres-xl,Chibin\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,pavanvd\/postgres-xl,greenplum-db\/gpdb,snaga\/postgres-xl,kmjungersen\/PostgresXL,techdragon\/Postgres-XL,Chibin\/gpdb,oberstet\/postgres-xl,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,arcivanov\/postgres-xl,xinzweb\/gpdb,oberstet\/postgres-xl,jmcatamney\/gpdb,zeroae\/postgres-xl,adam8157\/gpdb,tpostgres-projects\/tPostgres,techdragon\/Postgres-XL,pavanvd\/postgres-xl,yuanzhao\/gpdb,edespino\/gpdb,kmjungersen\/PostgresXL,greenplum-db\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,jmcatamney\/gpdb,50wu\/gpdb,yazun\/postgres-xl,ovr\/postgres-xl,yuanzhao\/gpdb,jmcatamney\/gpdb,Chibin\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,tpostgres-projects\/tPostgres,50wu\/gpdb,oberstet\/postgres-xl,postmind-net\/postgres-xl,arcivanov\/postgres-xl,zeroae\/postgres-xl,lisakowen\/gpdb,oberstet\/postgres-xl,greenplum-db\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,lisakowen\/gpdb,ovr\/postgres-xl,greenplum-db\/gpdb,50wu\/gpdb,tpostgres-projects\/tPostgres,techdragon\/Postgres-XL,ashwinstar\/gpdb,50wu\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,Postgres-XL\/Postgres-XL,Chibin\/gpdb,Chibin\/gpdb,postmind-net\/postgres-xl,Postgres-XL\/Postgres-XL,edespino\/gpdb,edespino\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,postmind-net\/postgres-xl,Postgres-XL\/Postgres-XL,50wu\/gpdb,arcivanov\/postgres-xl,yuanzhao\/gpdb,pavanvd\/postgres-xl,adam8157\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,arcivanov\/postgres-xl,xinzweb\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,arcivanov\/postgres-xl,xinzweb\/gpdb,yuanzhao\/gpdb,snaga\/postgres-xl,edespino\/gpdb,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,adam8157\/gpdb,ovr\/postgres-xl,yuanzhao\/gpdb,snaga\/postgres-xl,edespino\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,oberstet\/postgres-xl,greenplum-db\/gpdb,snaga\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl,Postgres-XL\/Postgres-XL,yazun\/postgres-xl,techdragon\/Postgres-XL,yazun\/postgres-xl,snaga\/postgres-xl,xinzweb\/gpdb,tpostgres-projects\/tPostgres,yazun\/postgres-xl,arcivanov\/postgres-xl,edespino\/gpdb,adam8157\/gpdb,Chibin\/gpdb,jmcatamney\/gpdb,kmjungersen\/PostgresXL,lisakowen\/gpdb,kmjungersen\/PostgresXL,50wu\/gpdb,adam8157\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,postmind-net\/postgres-xl,ashwinstar\/gpdb,kmjungersen\/PostgresXL,edespino\/gpdb,jmcatamney\/gpdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/backend\/libpq\/hba.c\n+++ src\/backend\/libpq\/hba.c\n@@ -10,7 +10,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $PostgreSQL: pgsql\/src\/backend\/libpq\/hba.c,v 1.182 2009\/03\/04 18:43:38 mha Exp $\n+ *\t $PostgreSQL: pgsql\/src\/backend\/libpq\/hba.c,v 1.183 2009\/03\/07 21:28:00 mha Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -1304,6 +1304,7 @@\n \tList *hba_line_nums = NIL;\n \tListCell *line, *line_num;\n \tList *new_parsed_lines = NIL;\n+\tbool ok = true;\n \n \tfile = AllocateFile(HbaFileName, \"r\");\n \tif (file == NULL)\n@@ -1332,15 +1333,27 @@\n \n \t\tif (!parse_hba_line(lfirst(line), lfirst_int(line_num), newline))\n \t\t{\n-\t\t\t\/* Parse error in the file, so bail out *\/\n+\t\t\t\/* Parse error in the file, so indicate there's a problem *\/\n \t\t\tfree_hba_record(newline);\n \t\t\tpfree(newline);\n-\t\t\tclean_hba_list(new_parsed_lines);\n-\t\t\t\/* Error has already been reported in the parsing function *\/\n-\t\t\treturn false;\n+\n+\t\t\t\/*\n+\t\t\t * Keep parsing the rest of the file so we can report errors\n+\t\t\t * on more than the first row. Error has already been reported\n+\t\t\t * in the parsing function, so no need to log it here.\n+\t\t\t *\/\n+\t\t\tok = false;\n+\t\t\tcontinue;\n \t\t}\n \n \t\tnew_parsed_lines = lappend(new_parsed_lines, newline);\n+\t}\n+\n+\tif (!ok)\n+\t{\n+\t\t\/* Parsing failed at one or more rows, so bail out *\/\n+\t\tclean_hba_list(new_parsed_lines);\n+\t\treturn false;\n \t}\n \n \t\/* Loaded new file successfully, replace the one we use *\/\n"} {"commit":"7a161ac3b727dbf0beb39fefedde5d62240003b5","subject":"Clean up comments, organize code snippets added at different times into a slightly less random order.","message":"Clean up comments, organize code snippets added at different times into\na slightly less random order.\n","repos":"randomtask1155\/gpdb,pavanvd\/postgres-xl,rubikloud\/gpdb,xuegang\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,oberstet\/postgres-xl,xuegang\/gpdb,rvs\/gpdb,snaga\/postgres-xl,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,Postgres-XL\/Postgres-XL,ovr\/postgres-xl,chrishajas\/gpdb,xuegang\/gpdb,50wu\/gpdb,lpetrov-pivotal\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,pavanvd\/postgres-xl,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,kaknikhil\/gpdb,oberstet\/postgres-xl,royc1\/gpdb,tangp3\/gpdb,adam8157\/gpdb,Quikling\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,yazun\/postgres-xl,greenplum-db\/gpdb,zaksoup\/gpdb,tangp3\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,randomtask1155\/gpdb,ovr\/postgres-xl,CraigHarris\/gpdb,rubikloud\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,royc1\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,foyzur\/gpdb,janebeckman\/gpdb,xuegang\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,royc1\/gpdb,zaksoup\/gpdb,ahachete\/gpdb,xinzweb\/gpdb,lpetrov-pivotal\/gpdb,atris\/gpdb,snaga\/postgres-xl,yuanzhao\/gpdb,tangp3\/gpdb,kmjungersen\/PostgresXL,lisakowen\/gpdb,cjcjameson\/gpdb,ovr\/postgres-xl,techdragon\/Postgres-XL,jmcatamney\/gpdb,Quikling\/gpdb,lisakowen\/gpdb,techdragon\/Postgres-XL,ahachete\/gpdb,xinzweb\/gpdb,zeroae\/postgres-xl,atris\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,rvs\/gpdb,adam8157\/gpdb,Quikling\/gpdb,pavanvd\/postgres-xl,postmind-net\/postgres-xl,lisakowen\/gpdb,Chibin\/gpdb,royc1\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,tangp3\/gpdb,janebeckman\/gpdb,atris\/gpdb,CraigHarris\/gpdb,lintzc\/gpdb,xuegang\/gpdb,rvs\/gpdb,snaga\/postgres-xl,rvs\/gpdb,0x0FFF\/gpdb,zaksoup\/gpdb,randomtask1155\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,tangp3\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,zaksoup\/gpdb,chrishajas\/gpdb,arcivanov\/postgres-xl,lpetrov-pivotal\/gpdb,edespino\/gpdb,kaknikhil\/gpdb,postmind-net\/postgres-xl,chrishajas\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,Quikling\/gpdb,rvs\/gpdb,edespino\/gpdb,zaksoup\/gpdb,kmjungersen\/PostgresXL,xinzweb\/gpdb,rubikloud\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,randomtask1155\/gpdb,zaksoup\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,Chibin\/gpdb,atris\/gpdb,kaknikhil\/gpdb,foyzur\/gpdb,techdragon\/Postgres-XL,royc1\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,rvs\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,kaknikhil\/gpdb,tpostgres-projects\/tPostgres,adam8157\/gpdb,edespino\/gpdb,adam8157\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,50wu\/gpdb,tpostgres-projects\/tPostgres,zeroae\/postgres-xl,edespino\/gpdb,edespino\/gpdb,xuegang\/gpdb,chrishajas\/gpdb,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,zaksoup\/gpdb,zeroae\/postgres-xl,0x0FFF\/gpdb,xinzweb\/gpdb,ahachete\/gpdb,yuanzhao\/gpdb,lpetrov-pivotal\/gpdb,Quikling\/gpdb,tangp3\/gpdb,janebeckman\/gpdb,tangp3\/gpdb,lpetrov-pivotal\/gpdb,Quikling\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,chrishajas\/gpdb,edespino\/gpdb,janebeckman\/gpdb,randomtask1155\/gpdb,cjcjameson\/gpdb,CraigHarris\/gpdb,greenplum-db\/gpdb,snaga\/postgres-xl,50wu\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,foyzur\/gpdb,pavanvd\/postgres-xl,janebeckman\/gpdb,Chibin\/gpdb,rubikloud\/gpdb,ahachete\/gpdb,ahachete\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,lintzc\/gpdb,oberstet\/postgres-xl,edespino\/gpdb,Quikling\/gpdb,kaknikhil\/gpdb,0x0FFF\/gpdb,postmind-net\/postgres-xl,Postgres-XL\/Postgres-XL,janebeckman\/gpdb,zaksoup\/gpdb,rubikloud\/gpdb,foyzur\/gpdb,lintzc\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,Postgres-XL\/Postgres-XL,ahachete\/gpdb,lpetrov-pivotal\/gpdb,lpetrov-pivotal\/gpdb,kmjungersen\/PostgresXL,randomtask1155\/gpdb,rvs\/gpdb,arcivanov\/postgres-xl,cjcjameson\/gpdb,CraigHarris\/gpdb,techdragon\/Postgres-XL,Chibin\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,rubikloud\/gpdb,chrishajas\/gpdb,pavanvd\/postgres-xl,adam8157\/gpdb,xinzweb\/gpdb,foyzur\/gpdb,janebeckman\/gpdb,ovr\/postgres-xl,lintzc\/gpdb,foyzur\/gpdb,CraigHarris\/gpdb,foyzur\/gpdb,royc1\/gpdb,lintzc\/gpdb,Chibin\/gpdb,lintzc\/gpdb,tangp3\/gpdb,kaknikhil\/gpdb,xinzweb\/gpdb,Chibin\/gpdb,kaknikhil\/gpdb,chrishajas\/gpdb,royc1\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,lintzc\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,ahachete\/gpdb,greenplum-db\/gpdb,rubikloud\/gpdb,ashwinstar\/gpdb,Quikling\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,oberstet\/postgres-xl,oberstet\/postgres-xl,greenplum-db\/gpdb,0x0FFF\/gpdb,techdragon\/Postgres-XL,yazun\/postgres-xl,atris\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,atris\/gpdb,rubikloud\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,randomtask1155\/gpdb,arcivanov\/postgres-xl,jmcatamney\/gpdb,janebeckman\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,atris\/gpdb,greenplum-db\/gpdb,yazun\/postgres-xl,foyzur\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,0x0FFF\/gpdb,xuegang\/gpdb,postmind-net\/postgres-xl,janebeckman\/gpdb,CraigHarris\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,arcivanov\/postgres-xl,tpostgres-projects\/tPostgres,atris\/gpdb,tpostgres-projects\/tPostgres,snaga\/postgres-xl,edespino\/gpdb,lintzc\/gpdb,Quikling\/gpdb,yazun\/postgres-xl,adam8157\/gpdb,yazun\/postgres-xl,lisakowen\/gpdb,arcivanov\/postgres-xl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/main\/main.c\n+++ src\/backend\/main\/main.c\n@@ -1,14 +1,19 @@\n \/*-------------------------------------------------------------------------\n *\n * main.c\n- *\t Stub main() routine for the postgres backend.\n+ *\t Stub main() routine for the postgres executable.\n+ *\n+ * This does some essential startup tasks for any incarnation of postgres\n+ * (postmaster, standalone backend, or standalone bootstrap mode) and then\n+ * dispatches to the proper FooMain() routine for the incarnation.\n+ *\n *\n * Portions Copyright (c) 1996-2000, PostgreSQL, Inc\n * Portions Copyright (c) 1994, Regents of the University of California\n *\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/main\/main.c,v 1.34 2000\/11\/16 05:51:00 momjian Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/main\/main.c,v 1.35 2000\/11\/25 03:45:47 tgl Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -16,6 +21,9 @@\n \n #include <pwd.h>\n #include <unistd.h>\n+#ifdef USE_LOCALE\n+#include <locale.h>\n+#endif\n \n #if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__)\n #include <sys\/sysinfo.h>\n@@ -25,23 +33,35 @@\n #undef ASSEMBLER\n #endif\n \n-#ifdef USE_LOCALE\n-#include <locale.h>\n-#endif\n #include \"miscadmin.h\"\n #include \"bootstrap\/bootstrap.h\"\n #include \"tcop\/tcopprot.h\"\n \n+\n #define NOROOTEXEC \"\\\n-\\n\\\"root\\\" execution of the PostgreSQL backend is not permitted.\\n\\n\\\n-The backend must be started under its own userid to prevent\\n\\\n+\\n\\\"root\\\" execution of the PostgreSQL server is not permitted.\\n\\n\\\n+The server must be started under an unprivileged userid to prevent\\n\\\n a possible system security compromise. See the INSTALL file for\\n\\\n-more information on how to properly start the postmaster.\\n\\n\"\n+more information on how to properly start the server.\\n\\n\"\n+\n \n int\n main(int argc, char *argv[])\n {\n \tint\t\t\tlen;\n+\tstruct passwd *pw;\n+\n+\t\/*\n+\t * Place platform-specific startup hacks here. This is the right\n+\t * place to put code that must be executed early in launch of either\n+\t * a postmaster, a standalone backend, or a standalone bootstrap run.\n+\t * Note that this code will NOT be executed when a backend or\n+\t * sub-bootstrap run is forked by the postmaster.\n+\t *\n+\t * XXX The need for code here is proof that the platform in question\n+\t * is too brain-dead to provide a standard C execution environment\n+\t * without help. Avoid adding more here, if you can.\n+\t *\/\n \n #if defined(__alpha)\n #ifdef NOFIXADE\n@@ -52,20 +72,9 @@\n \tint\t\t\tbuffer[] = {SSIN_UACPROC, UAC_NOPRINT};\n \n #endif\t \/* NOPRINTADE *\/\n-#endif\n+#endif \/* __alpha *\/\n \n-#ifdef USE_LOCALE\n-\tsetlocale(LC_CTYPE, \"\");\t\/* take locale information from an\n-\t\t\t\t\t\t\t\t * environment *\/\n-\tsetlocale(LC_COLLATE, \"\");\n-\tsetlocale(LC_MONETARY, \"\");\n-#endif\n #if defined(NOFIXADE) || defined(NOPRINTADE)\n-\n-\t\/*\n-\t * Must be first so that the bootstrap code calls it, too. (Only\n-\t * needed on some RISC architectures.)\n-\t *\/\n \n #if defined(ultrix4)\n \tsyscall(SYS_sysmips, MIPS_FIXADE, 0, NULL, NULL, NULL);\n@@ -74,56 +83,78 @@\n #if defined(__alpha)\n \tif (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL,\n \t\t\t\t (unsigned long) NULL) < 0)\n-\t\telog(NOTICE, \"setsysinfo failed: %d\\n\", errno);\n+\t\tfprintf(stderr, \"setsysinfo failed: %d\\n\", errno);\n #endif\n \n #endif\t \/* NOFIXADE || NOPRINTADE *\/\n \n+#ifdef __BEOS__\n+ \t\/* BeOS-specific actions on startup *\/\n+ \tbeos_startup(argc,argv);\n+#endif\n+\n \t\/*\n-\t * use one executable for both postgres and postmaster, invoke one or\n-\t * the other depending on the name of the executable\n+\t * Not-quite-so-platform-specific startup environment checks.\n+\t * Still best to minimize these.\n \t *\/\n-\tlen = strlen(argv[0]);\n \n-\/* OK this is going to seem weird, but BeOS is presently basically\n- * a single user system. There is work going on, but at present it'll\n- * say that every user is uid 0, i.e. root. We'll inhibit this check\n- * until Be get the system working with multiple users!!\n- *\/\n+\t\/*\n+\t * Make sure we are not running as root.\n+\t *\n+\t * BeOS currently runs everything as root :-(, so this check must\n+\t * be temporarily disabled there...\n+\t*\/\n #ifndef __BEOS__\n-if (!geteuid())\n+\tif (geteuid() == 0)\n \t{\n \t\tfprintf(stderr, \"%s\", NOROOTEXEC);\n \t\texit(1);\n \t}\n #endif \/* __BEOS__ *\/\n \n-#ifdef __BEOS__\n- \t\/* Specific beos actions on startup *\/\n- \tbeos_startup(argc,argv);\n+\t\/*\n+\t * Set up locale information from environment, in only the categories\n+\t * needed by Postgres; leave other categories set to default \"C\".\n+\t * (Note that CTYPE and COLLATE will be overridden later from pg_control\n+\t * if we are in an already-initialized database. We set them here so\n+\t * that they will be available to fill pg_control during initdb.)\n+\t *\/\n+#ifdef USE_LOCALE\n+\tsetlocale(LC_CTYPE, \"\");\n+\tsetlocale(LC_COLLATE, \"\");\n+\tsetlocale(LC_MONETARY, \"\");\n #endif\n \n+\t\/*\n+\t * Now dispatch to one of PostmasterMain, PostgresMain, or BootstrapMain\n+\t * depending on the program name (and possibly first argument) we\n+\t * were called with. The lack of consistency here is historical.\n+\t *\/\n+\tlen = strlen(argv[0]);\n \n-\tif (len >= 10 && !strcmp(argv[0] + len - 10, \"postmaster\"))\n+\tif (len >= 10 && strcmp(argv[0] + len - 10, \"postmaster\") == 0)\n+\t{\n+\t\t\/* Called as \"postmaster\" *\/\n \t\texit(PostmasterMain(argc, argv));\n+\t}\n \n \t\/*\n-\t * if the first argument is \"-boot\", then invoke the backend in\n-\t * bootstrap mode\n+\t * If the first argument is \"-boot\", then invoke bootstrap mode.\n+\t * Note we remove \"-boot\" from the arguments passed on to BootstrapMain.\n \t *\/\n \tif (argc > 1 && strcmp(argv[1], \"-boot\") == 0)\n-\t\texit(BootstrapMain(argc - 1, argv + 1));\t\t\/* remove the -boot arg\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\t * from the command line *\/\n-\telse\n+\t\texit(BootstrapMain(argc - 1, argv + 1));\n+\n+\t\/*\n+\t * Otherwise we're a standalone backend. Invoke PostgresMain,\n+\t * specifying current userid as the \"authenticated\" Postgres user name.\n+\t *\/\n+\tpw = getpwuid(geteuid());\n+\tif (pw == NULL)\n \t{\n-\t\tstruct passwd *pw;\n+\t\tfprintf(stderr, \"%s: invalid current euid\", argv[0]);\n+\t\texit(1);\n+\t}\n \n-\t\tpw = getpwuid(geteuid());\n-\t\tif (!pw)\n-\t\t{\n-\t\t\tfprintf(stderr, \"%s: invalid current euid\", argv[0]);\n-\t\t\texit(1);\n-\t\t}\n-\t\texit(PostgresMain(argc, argv, argc, argv, pw->pw_name));\n-\t}\n+\texit(PostgresMain(argc, argv, argc, argv, pw->pw_name));\n }\n"} {"commit":"6732398856156161d9442b60bd56f8aaec9518c8","subject":"use client window coords for resize-moving without a frame_object","message":"use client window coords for resize-moving without a frame_object\n\nimproves placement of csd windows\n\nref T2750\n","repos":"rvandegrift\/e,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,rvandegrift\/e,tasn\/enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_object.c\n+++ src\/bin\/e_comp_object.c\n@@ -978,7 +978,7 @@\n _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h)\n {\n E_Comp_Object *cw = data;\n- int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h;\n+ int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h, x, y;\n \n \/* if frame_object does not exist, client_inset indicates CSD.\n * this means that ec->client matches cw->w\/h, the opposite\n@@ -1121,18 +1121,22 @@\n * which also changes the client's position\n *\/\n cw->force_move = 1;\n+ if (cw->frame_object)\n+ x = cw->x, y = cw->y;\n+ else\n+ x = cw->ec->x, y = cw->ec->y;\n switch (cw->ec->resize_mode)\n {\n case E_POINTER_RESIZE_BL:\n case E_POINTER_RESIZE_L:\n- evas_object_move(obj, cw->x + prev_w - cw->w, cw->y);\n+ evas_object_move(obj, x + prev_w - cw->w, y);\n break;\n case E_POINTER_RESIZE_TL:\n- evas_object_move(obj, cw->x + prev_w - cw->w, cw->y + prev_h - cw->h);\n+ evas_object_move(obj, x + prev_w - cw->w, y + prev_h - cw->h);\n break;\n case E_POINTER_RESIZE_T:\n case E_POINTER_RESIZE_TR:\n- evas_object_move(obj, cw->x, cw->y + prev_h - cw->h);\n+ evas_object_move(obj, x, y + prev_h - cw->h);\n break;\n default:\n break;\n"} {"commit":"a49cede7905bf2fac6aba29ffe5686fad27ce211","subject":"add class type check where client layer marker is taken","message":"add class type check where client layer marker is taken\n\nSummary:\nit fixes crash when running wl client apps on e wayland server.\ninvalid comp object pointer value is returned by using eo_data_scope_get.\nthus eo_isa should be added before eo_data_scope_get.\n\nTest Plan:\n1. run e wl server\n2. run wl client terminlogy\n3. run second wl client elementary_test\n\nReviewers: raster, devilhorns, zmike, stefan_schmidt\n\nCC: cedric\n\nDifferential Revision: https:\/\/phab.enlightenment.org\/D919\n","repos":"FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,rvandegrift\/e,FlorentRevest\/Enlightenment,tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_object.c\n+++ src\/bin\/e_comp_object.c\n@@ -166,7 +166,10 @@\n * will return NULL for fake layers (eg. wayland)\n *\/\n if (cw->comp->layers[cw->layer].obj)\n- layer_cw = eo_data_scope_get(cw->comp->layers[cw->layer].obj, MY_CLASS);\n+ {\n+ if (eo_isa(cw->comp->layers[cw->layer].obj, MY_CLASS))\n+ layer_cw = eo_data_scope_get(cw->comp->layers[cw->layer].obj, MY_CLASS);\n+ }\n if (layer_cw == cw) layer_cw = NULL;\n \/*\n if (above)\n"} {"commit":"8e13017728c584217f0c6b1e3426dcb2fb62a001","subject":"e_comp_object: use correct macro","message":"e_comp_object: use correct macro\n\nChange-Id: I7e9aebf323ab1eb91dba2392747dc0bc5889ed48\nSigned-off-by: MinJeong Kim <24556705797ea9c691c6aa52e5846988e670d796@samsung.com>\n","repos":"tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_object.c\n+++ src\/bin\/e_comp_object.c\n@@ -3968,7 +3968,7 @@\n EAPI void\n e_comp_object_size_update(Evas_Object *obj, int w, int h)\n {\n- SOFT_ENTRY();\n+ API_ENTRY;\n \n evas_object_image_size_set(cw->obj, w, h);\n }\n"} {"commit":"5e5e9c48b1a61e3844e9fbe26292305ab4c06d04","subject":"fixed #1977","message":"fixed #1977\n","repos":"gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/laser\/lsr_dec.c\n+++ src\/laser\/lsr_dec.c\n@@ -737,7 +737,9 @@\n \tcount = gf_list_count(lsr->deferred_hrefs);\n \tfor (i=0; i<count; i++) {\n \t\tXMLRI *href = (XMLRI *)gf_list_get(lsr->deferred_hrefs, i);\n-\t\tchar *str_id = href->string;\n+\t\tchar *str_id = href ? href->string : NULL;\n+\t\tif (!str_id) return;\n+\t\t\n \t\tif (str_id[0] == '#') str_id++;\n \t\t\/*skip 'N'*\/\n \t\tstr_id++;\n@@ -1585,8 +1587,7 @@\n \t\t\tlsr_read_matrix(lsr, info.far_ptr);\n \t\t\tbreak;\n \t\tcase TAG_SVG_ATT_text_decoration:\n-\t\t\t\/*FIXME ASAP*\/\n-\t\t\tassert(0);\n+\t\t\tlsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, \"textDecoration\", GF_FALSE, GF_FALSE);\n \t\t\tbreak;\n \n \t\tcase TAG_SVG_ATT_font_variant:\n"} {"commit":"3210023c94ad6469415c92adf923e68f95a6d7fd","subject":"droid-sink: Update state setting to PulseAudio 12.2 style.","message":"droid-sink: Update state setting to PulseAudio 12.2 style.\n","repos":"mer-hybris\/pulseaudio-modules-droid,jusa\/pulseaudio-modules-droid,mer-hybris\/pulseaudio-modules-droid,jusa\/pulseaudio-modules-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/droid\/droid-sink.c\n+++ src\/droid\/droid-sink.c\n@@ -442,6 +442,7 @@\n return ret;\n }\n \n+\/* Called from IO context *\/\n static int unsuspend(struct userdata *u) {\n uint32_t i;\n \n@@ -466,56 +467,67 @@\n }\n \n \/* Called from IO context *\/\n+static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state, pa_suspend_cause_t new_suspend_cause) {\n+ struct userdata *u;\n+ int r;\n+\n+ pa_assert(s);\n+ pa_assert_se(u = s->userdata);\n+\n+ \/* It may be that only the suspend cause is changing, in which case there's\n+ * nothing more to do. *\/\n+ if (new_state == s->thread_info.state)\n+ return 0;\n+\n+ switch (new_state) {\n+ case PA_SINK_SUSPENDED:\n+ pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));\n+\n+ if ((r = suspend(u)) < 0)\n+ return r;\n+\n+ break;\n+\n+ case PA_SINK_IDLE:\n+ \/* Fall through *\/\n+ case PA_SINK_RUNNING:\n+ if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {\n+ if ((r = unsuspend(u)) < 0)\n+ return r;\n+ }\n+\n+ pa_rtpoll_set_timer_absolute(u->rtpoll, pa_rtclock_now());\n+ break;\n+\n+ case PA_SINK_UNLINKED:\n+ \/* Suspending since some implementations do not want to free running stream. *\/\n+ suspend(u);\n+ break;\n+\n+ \/* not needed *\/\n+ case PA_SINK_INIT:\n+ case PA_SINK_INVALID_STATE:\n+ break;\n+ }\n+\n+ return 0;\n+}\n+\n+\/* Called from IO context *\/\n static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {\n struct userdata *u = PA_SINK(o)->userdata;\n \n switch (code) {\n-\n case PA_SINK_MESSAGE_GET_LATENCY: {\n *((pa_usec_t*) data) = pa_droid_stream_get_latency(u->stream);\n return 0;\n }\n \n+#if PULSEAUDIO_VERSION < 12\n case PA_SINK_MESSAGE_SET_STATE: {\n- switch ((pa_sink_state_t) PA_PTR_TO_UINT(data)) {\n- case PA_SINK_SUSPENDED: {\n- int r;\n-\n- pa_assert(PA_SINK_IS_OPENED(u->sink->thread_info.state));\n-\n- if ((r = suspend(u)) < 0)\n- return r;\n-\n- break;\n- }\n-\n- case PA_SINK_IDLE:\n- \/* Fall through *\/\n- case PA_SINK_RUNNING: {\n- int r;\n-\n- if (u->sink->thread_info.state == PA_SINK_SUSPENDED) {\n- if ((r = unsuspend(u)) < 0)\n- return r;\n- }\n-\n- pa_rtpoll_set_timer_absolute(u->rtpoll, pa_rtclock_now());\n- break;\n- }\n-\n- case PA_SINK_UNLINKED: {\n- \/* Suspending since some implementations do not want to free running stream. *\/\n- suspend(u);\n- break;\n- }\n-\n- \/* not needed *\/\n- case PA_SINK_INIT:\n- case PA_SINK_INVALID_STATE:\n- ;\n- }\n- break;\n- }\n+ return sink_set_state_in_io_thread_cb(u->sink, PA_PTR_TO_UINT(data), 0);\n+ }\n+#endif\n }\n \n return pa_sink_process_msg(o, code, data, offset, chunk);\n@@ -1258,6 +1270,9 @@\n u->sink->userdata = u;\n \n u->sink->parent.process_msg = sink_process_msg;\n+#if PULSEAUDIO_VERSION >= 12\n+ u->sink->set_state_in_io_thread = sink_set_state_in_io_thread_cb;\n+#endif\n \n u->sink->set_port = sink_set_port_cb;\n \n"} {"commit":"1a87463083fa9e343aa38b4c8824db0c92645b8e","subject":"force a software render in all cases when finalizing x11 client iconify","message":"force a software render in all cases when finalizing x11 client iconify\n\nsince ICCCM requires that clients be unmapped while iconified, it's necessary\nfor the compositor to perform one last render prior to the unmap in order to\nensure that mirror objects will still appear as expected. this render must use\nthe pixmap buffer data in order to avoid timing issues due to async\/deferred\nrendering, and it is only necessary for the case of clients rendering with a\nnative surface\n\nfix T2788\n","repos":"rvandegrift\/e,tasn\/enlightenment,rvandegrift\/e,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_comp_object.c\n+++ src\/bin\/e_comp_object.c\n@@ -2169,6 +2169,11 @@\n evas_object_focus_set(cw->ec->frame, 0);\n e_comp_render_queue(); \/\/force nocomp recheck\n e_comp_shape_queue();\n+ if ((!cw->ec->iconic) || (!e_pixmap_is_x(cw->ec->pixmap)) || (!cw->native)) return;\n+ e_comp_object_native_surface_set(obj, 0);\n+ e_comp_object_damage(obj, 0, 0, cw->w, cw->h);\n+ e_comp_object_dirty(obj);\n+ e_comp_object_render(obj);\n }\n \n static void\n"} {"commit":"773f8f9ab7863fb1a7ec5c410c012da9bc980c47","subject":"fs-sis: Memory leak fix.","message":"fs-sis: Memory leak fix.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-fs\/fs-sis.c\n+++ src\/lib-fs\/fs-sis.c\n@@ -129,6 +129,7 @@\n \t}\n \tfs_close(&file->super);\n \ti_free(file->hash);\n+\ti_free(file->hash_path);\n \ti_free(file->file.path);\n \ti_free(file);\n }\n"} {"commit":"28fd97dbdc0a0f42be4f6625f357a25cec8e9dd9","subject":"Normalization for halving coordinates is now simpler.","message":"Normalization for halving coordinates is now simpler.","repos":"rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,tectronics\/relic-toolkit,rajeevakarv\/relic-toolkit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/eb\/relic_eb_norm.c\n+++ src\/eb\/relic_eb_norm.c\n@@ -102,24 +102,9 @@\n * @param[in] p\t\t\t- the point to normalize.\n *\/\n static void eb_norm_halve(eb_t r, eb_t p) {\n-\tfb_t t0;\n-\n-\tfb_null(t0);\n-\n-\tTRY {\n-\t\tfb_new(t0);\n-\n-\t\tfb_sqr(t0, p->x);\n-\t\tfb_mul(r->y, p->x, p->y);\n-\t\tfb_add(r->y, r->y, t0);\n-\t\tfb_copy(r->x, p->x);\n-\t} CATCH_ANY {\n-\t\tTHROW(ERR_CAUGHT);\n-\t}\n-\tFINALLY {\n-\t\tfb_free(t0);\n-\t}\n-\n+\tfb_add(r->y, p->x, p->y);\n+\tfb_mul(r->y, r->y, p->x);\n+\tfb_copy(r->x, p->x);\n \tr->norm = 1;\n }\n \n"} {"commit":"bc0c7e9876601ffa1be7407c6a9572650de334f2","subject":"Fix initdb to reject a relative path for -X (--xlogdir) argument. This doesn't work, and the real reason why not is it's unclear where the path is relative to (initdb's CWD, or the data directory?). We could make an arbitrary decision, but it seems best to make the user be unambiguous. Per gripe from Devrim.","message":"Fix initdb to reject a relative path for -X (--xlogdir) argument. This\ndoesn't work, and the real reason why not is it's unclear where the path\nis relative to (initdb's CWD, or the data directory?). We could make an\narbitrary decision, but it seems best to make the user be unambiguous.\nPer gripe from Devrim.\n","repos":"Quikling\/gpdb,xinzweb\/gpdb,xuegang\/gpdb,edespino\/gpdb,ahachete\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,chrishajas\/gpdb,greenplum-db\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,Quikling\/gpdb,lisakowen\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,royc1\/gpdb,zaksoup\/gpdb,xuegang\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,ahachete\/gpdb,zaksoup\/gpdb,rvs\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,zaksoup\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,CraigHarris\/gpdb,Quikling\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,janebeckman\/gpdb,rvs\/gpdb,royc1\/gpdb,ahachete\/gpdb,ahachete\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,50wu\/gpdb,xinzweb\/gpdb,50wu\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,kaknikhil\/gpdb,rvs\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,edespino\/gpdb,janebeckman\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,chrishajas\/gpdb,CraigHarris\/gpdb,xuegang\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,lintzc\/gpdb,lintzc\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,royc1\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,janebeckman\/gpdb,ahachete\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,janebeckman\/gpdb,chrishajas\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,xuegang\/gpdb,royc1\/gpdb,xuegang\/gpdb,zaksoup\/gpdb,lintzc\/gpdb,ahachete\/gpdb,Quikling\/gpdb,lisakowen\/gpdb,CraigHarris\/gpdb,royc1\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,edespino\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,cjcjameson\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,janebeckman\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,chrishajas\/gpdb,xuegang\/gpdb,Chibin\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,rvs\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,50wu\/gpdb,janebeckman\/gpdb,edespino\/gpdb,ahachete\/gpdb,adam8157\/gpdb,adam8157\/gpdb,Quikling\/gpdb,Quikling\/gpdb,greenplum-db\/gpdb,zaksoup\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,yuanzhao\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,0x0FFF\/gpdb,lisakowen\/gpdb,chrishajas\/gpdb,chrishajas\/gpdb,lisakowen\/gpdb,royc1\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,Quikling\/gpdb,edespino\/gpdb,rvs\/gpdb,Chibin\/gpdb,greenplum-db\/gpdb,0x0FFF\/gpdb,royc1\/gpdb,chrishajas\/gpdb,edespino\/gpdb,kaknikhil\/gpdb,CraigHarris\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,xinzweb\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,ahachete\/gpdb,xuegang\/gpdb,rvs\/gpdb,0x0FFF\/gpdb,rvs\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,lintzc\/gpdb,zaksoup\/gpdb,0x0FFF\/gpdb,0x0FFF\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,Quikling\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bin\/initdb\/initdb.c\n+++ src\/bin\/initdb\/initdb.c\n@@ -42,7 +42,7 @@\n * Portions Copyright (c) 1994, Regents of the University of California\n * Portions taken from FreeBSD.\n *\n- * $PostgreSQL: pgsql\/src\/bin\/initdb\/initdb.c,v 1.152.2.2 2008\/02\/29 23:31:42 adunstan Exp $\n+ * $PostgreSQL: pgsql\/src\/bin\/initdb\/initdb.c,v 1.152.2.3 2008\/06\/02 03:48:07 tgl Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -3005,8 +3005,13 @@\n \t{\n \t\tchar\t *linkloc;\n \n-\t\tlinkloc = (char *) pg_malloc(strlen(pg_data) + 8 + 2);\n-\t\tsprintf(linkloc, \"%s\/pg_xlog\", pg_data);\n+\t\t\/* clean up xlog directory name, check it's absolute *\/\n+\t\tcanonicalize_path(xlog_dir);\n+\t\tif (!is_absolute_path(xlog_dir))\n+\t\t{\n+\t\t\tfprintf(stderr, _(\"%s: xlog directory location must be an absolute path\\n\"), progname);\n+\t\t\texit_nicely();\n+\t\t}\n \n \t\t\/* check if the specified xlog directory is empty *\/\n \t\tswitch (check_data_dir(xlog_dir))\n@@ -3024,9 +3029,7 @@\n \t\t\t\t\texit_nicely();\n \t\t\t\t}\n \t\t\t\telse\n-\t\t\t\t{\n \t\t\t\t\tcheck_ok();\n-\t\t\t\t}\n \n \t\t\t\tmade_new_xlogdir = true;\n \t\t\t\tbreak;\n@@ -3056,7 +3059,7 @@\n \t\t\t\t\t\t_(\"If you want to store the transaction log there, either\\n\"\n \t\t\t\t\t\t \"remove or empty the directory \\\"%s\\\".\\n\"),\n \t\t\t\t\t\txlog_dir);\n-\t\t\t\texit(1);\t\t\/* no further message needed *\/\n+\t\t\t\texit_nicely();\n \n \t\t\tdefault:\n \t\t\t\t\/* Trouble accessing directory *\/\n@@ -3064,6 +3067,10 @@\n \t\t\t\t\t\tprogname, xlog_dir, strerror(errno));\n \t\t\t\texit_nicely();\n \t\t}\n+\n+\t\t\/* form name of the place where the symlink must go *\/\n+\t\tlinkloc = (char *) pg_malloc(strlen(pg_data) + 8 + 1);\n+\t\tsprintf(linkloc, \"%s\/pg_xlog\", pg_data);\n \n #ifdef HAVE_SYMLINK\n \t\tif (symlink(xlog_dir, linkloc) != 0)\n"} {"commit":"5be730370adfe4e7f8b6ab42aa59e4851bfd92e5","subject":"move getters from public slots to public methods","message":"move getters from public slots to public methods\n","repos":"adraghici\/marble,oberluz\/marble,oberluz\/marble,tzapzoor\/marble,rku\/marble,David-Gil\/marble-dev,probonopd\/marble,oberluz\/marble,quannt24\/marble,probonopd\/marble,tucnak\/marble,quannt24\/marble,adraghici\/marble,quannt24\/marble,probonopd\/marble,tzapzoor\/marble,tzapzoor\/marble,probonopd\/marble,Earthwings\/marble,tzapzoor\/marble,tucnak\/marble,oberluz\/marble,AndreiDuma\/marble,tzapzoor\/marble,tzapzoor\/marble,adraghici\/marble,AndreiDuma\/marble,David-Gil\/marble-dev,AndreiDuma\/marble,rku\/marble,quannt24\/marble,tzapzoor\/marble,rku\/marble,Earthwings\/marble,adraghici\/marble,tucnak\/marble,tucnak\/marble,utkuaydin\/marble,oberluz\/marble,Earthwings\/marble,David-Gil\/marble-dev,rku\/marble,tucnak\/marble,probonopd\/marble,Earthwings\/marble,Earthwings\/marble,utkuaydin\/marble,tucnak\/marble,rku\/marble,rku\/marble,utkuaydin\/marble,AndreiDuma\/marble,adraghici\/marble,quannt24\/marble,David-Gil\/marble-dev,AndreiDuma\/marble,probonopd\/marble,AndreiDuma\/marble,David-Gil\/marble-dev,tzapzoor\/marble,Earthwings\/marble,quannt24\/marble,probonopd\/marble,tucnak\/marble,utkuaydin\/marble,adraghici\/marble,utkuaydin\/marble,utkuaydin\/marble,David-Gil\/marble-dev,quannt24\/marble,oberluz\/marble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/MarbleMap.h\n+++ src\/lib\/MarbleMap.h\n@@ -126,6 +126,25 @@\n ViewportParams *viewport();\n const ViewportParams *viewport() const;\n \n+ \/**\n+ * @brief Get the Projection used for the map\n+ * @return @c Spherical a Globe\n+ * @return @c Equirectangular a flat map\n+ * @return @c Mercator another flat map\n+ *\/\n+ Projection projection() const;\n+\n+ \/**\n+ * @brief Get the ID of the current map theme\n+ * To ensure that a unique identifier is being used the theme does NOT\n+ * get represented by its name but the by relative location of the file\n+ * that specifies the theme:\n+ *\n+ * Example:\n+ * maptheme = \"earth\/bluemarble\/bluemarble.dgml\"\n+ *\/\n+ QString mapThemeId() const;\n+\n void setMapQualityForViewContext( MapQuality qualityForViewContext, ViewContext viewContext );\n MapQuality mapQuality( ViewContext viewContext ) const;\n \n@@ -359,6 +378,12 @@\n * @brief Returns all widgets of dataPlugins on the position curpos\n *\/\n QList<AbstractDataPluginItem *> whichItemAt( const QPoint& curpos ) const;\n+\n+ AngleUnit defaultAngleUnit() const;\n+\n+ QFont defaultFont() const;\n+\n+ const TextureLayer *textureLayer() const;\n \n \/**\n * @brief Add a layer to be included in rendering.\n@@ -420,29 +445,11 @@\n void setCenterLongitude( qreal lon );\n \n \/**\n- * @brief Get the Projection used for the map\n- * @return @c Spherical a Globe\n- * @return @c Equirectangular a flat map\n- * @return @c Mercator another flat map\n- *\/\n- Projection projection() const;\n-\n- \/**\n * @brief Set the Projection used for the map\n * @param projection projection type (e.g. Spherical, Equirectangular, Mercator)\n *\/\n void setProjection( Projection projection );\n \n- \/**\n- * @brief Get the ID of the current map theme\n- * To ensure that a unique identifier is being used the theme does NOT \n- * get represented by its name but the by relative location of the file \n- * that specifies the theme:\n- *\n- * Example: \n- * maptheme = \"earth\/bluemarble\/bluemarble.dgml\"\n- *\/\n- QString mapThemeId() const;\n \/**\n * @brief Set a new map theme\n * @param maptheme The ID of the new maptheme. To ensure that a unique \n@@ -605,13 +612,9 @@\n *\/\n void setVolatileTileCacheLimit( quint64 kiloBytes );\n \n- AngleUnit defaultAngleUnit() const;\n void setDefaultAngleUnit( AngleUnit angleUnit );\n \n- QFont defaultFont() const;\n void setDefaultFont( const QFont& font );\n-\n- const TextureLayer *textureLayer() const;\n \n \/**\n * @brief Reload the currently displayed map by reloading texture tiles\n"} {"commit":"24379a45c5ecbc35fde93952346be67112a96fe0","subject":"Don't connect() to a wildcard address in test_postmaster_connection().","message":"Don't connect() to a wildcard address in test_postmaster_connection().\n\nAt least OpenBSD, NetBSD, and Windows don't support it. This repairs\npg_ctl for listen_addresses='0.0.0.0' and listen_addresses='::'. Since\npg_ctl prefers to test a Unix-domain socket, Windows users are most\nlikely to need this change. Back-patch to 9.1 (all supported versions).\nThis could change pg_ctl interaction with loopback-interface firewall\nrules. Therefore, in 9.4 and earlier (released branches), activate the\nchange only on known-affected platforms.\n\nReported (bug #13611) and designed by Kondo Yuta.\n","repos":"ashwinstar\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,50wu\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,50wu\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,ashwinstar\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bin\/pg_ctl\/pg_ctl.c\n+++ src\/bin\/pg_ctl\/pg_ctl.c\n@@ -647,9 +647,22 @@\n \t\t\t\t\t\t\treturn PQPING_NO_ATTEMPT;\n \t\t\t\t\t\t}\n \n-\t\t\t\t\t\t\/* If postmaster is listening on \"*\", use localhost *\/\n+\t\t\t\t\t\t\/*\n+\t\t\t\t\t\t * Map listen-only addresses to counterparts usable\n+\t\t\t\t\t\t * for establishing a connection. connect() to \"::\"\n+\t\t\t\t\t\t * or \"0.0.0.0\" is not portable to OpenBSD 5.0 or to\n+\t\t\t\t\t\t * Windows Server 2008, and connect() to \"::\" is\n+\t\t\t\t\t\t * additionally not portable to NetBSD 6.0. (Cygwin\n+\t\t\t\t\t\t * does handle both addresses, though.)\n+\t\t\t\t\t\t *\/\n \t\t\t\t\t\tif (strcmp(host_str, \"*\") == 0)\n \t\t\t\t\t\t\tstrcpy(host_str, \"localhost\");\n+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(WIN32)\n+\t\t\t\t\t\telse if (strcmp(host_str, \"0.0.0.0\") == 0)\n+\t\t\t\t\t\t\tstrcpy(host_str, \"127.0.0.1\");\n+\t\t\t\t\t\telse if (strcmp(host_str, \"::\") == 0)\n+\t\t\t\t\t\t\tstrcpy(host_str, \"::1\");\n+#endif\n \n \t\t\t\t\t\t\/*\n \t\t\t\t\t\t * We need to set connect_timeout otherwise on Windows\n"} {"commit":"17f407c1d5bd627ac0d67e0f07a55114bccf72e5","subject":"Increased number of user functions to 60","message":"Increased number of user functions to 60\n","repos":"raumzeitlabor\/bitlash,raumzeitlabor\/bitlash,raumzeitlabor\/bitlash,raumzeitlabor\/bitlash","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bitlash-functions.c\n+++ src\/bitlash-functions.c\n@@ -391,7 +391,7 @@\n #endif\n \n #ifdef USER_FUNCTIONS\n-#define MAX_USER_FUNCTIONS 20\t\t\/\/ increase this if needed, but keep free() > 200 ish\n+#define MAX_USER_FUNCTIONS 60\t\t\/\/ increase this if needed, but keep free() > 200 ish\n #define USER_FUNCTION_FLAG 0x80\n \n typedef struct {\n"} {"commit":"4e5cc7a04b26bc8a16dd35a318cbe6221a126924","subject":"and use new util calls from entry too and remove old code.","message":"and use new util calls from entry too and remove old code.\n\n\n\nSVN revision: 55650\n","repos":"FlorentRevest\/Elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_entry.c\n+++ src\/lib\/elm_entry.c\n@@ -940,196 +940,6 @@\n return \"base\";\n }\n \n-static char *\n-_str_append(char *str, const char *txt, int *len, int *alloc)\n-{\n- int txt_len = strlen(txt);\n-\n- if (txt_len <= 0) return str;\n- if ((*len + txt_len) >= *alloc)\n- {\n-\tchar *str2;\n-\tint alloc2;\n-\n-\talloc2 = *alloc + txt_len + 128;\n-\tstr2 = realloc(str, alloc2);\n-\tif (!str2) return str;\n-\t*alloc = alloc2;\n-\tstr = str2;\n- }\n- strcpy(str + *len, txt);\n- *len += txt_len;\n- return str;\n-}\n-\n-\/*FIXME: Sholud be implemented somewhere else, it really depends on the context\n- * because some markups can be implemented otherwise according to style.\n- * probably doing it in textblock and making it translate according to it's\n- * style is correct. *\/\n-static char *\n-_mkup_to_text(const char *mkup)\n-{\n- char *str = NULL;\n- int str_len = 0, str_alloc = 0;\n- char *s, *p;\n- char *tag_start, *tag_end, *esc_start, *esc_end, *ts;\n-\n- if (!mkup) return NULL;\n- tag_start = tag_end = esc_start = esc_end = NULL;\n- p = (char *)mkup;\n- s = p;\n- for (;;)\n- {\n-\tif ((!*p) ||\n-\t (tag_end) || (esc_end) ||\n-\t (tag_start) || (esc_start))\n-\t {\n-\t if (tag_end)\n-\t {\n-\t\t char *ttag;\n-\n-\t\t ttag = malloc(tag_end - tag_start);\n-\t\t if (ttag)\n-\t\t {\n-\t\t strncpy(ttag, tag_start + 1, tag_end - tag_start - 1);\n-\t\t ttag[tag_end - tag_start - 1] = 0;\n-\t\t if (!strcmp(ttag, \"br\"))\n-\t\t\t str = _str_append(str, \"\\n\", &str_len, &str_alloc);\n-\t\t else if (!strcmp(ttag, \"\\n\"))\n-\t\t\t str = _str_append(str, \"\\n\", &str_len, &str_alloc);\n-\t\t else if (!strcmp(ttag, \"\\\\n\"))\n-\t\t\t str = _str_append(str, \"\\n\", &str_len, &str_alloc);\n-\t\t else if (!strcmp(ttag, \"\\t\"))\n-\t\t\t str = _str_append(str, \"\\t\", &str_len, &str_alloc);\n-\t\t else if (!strcmp(ttag, \"\\\\t\"))\n-\t\t\t str = _str_append(str, \"\\t\", &str_len, &str_alloc);\n-\t\t else if (!strcmp(ttag, \"ps\")) \/* Unicode paragraph separator *\/\n-\t\t\t str = _str_append(str, \"\\xE2\\x80\\xA9\", &str_len, &str_alloc);\n-\t\t free(ttag);\n-\t\t }\n-\t\t tag_start = tag_end = NULL;\n-\t }\n-\t else if (esc_end)\n-\t {\n-\t\t ts = malloc(esc_end - esc_start + 1);\n-\t\t if (ts)\n-\t\t {\n-\t\t const char *esc;\n-\t\t strncpy(ts, esc_start, esc_end - esc_start);\n-\t\t ts[esc_end - esc_start] = 0;\n-\t\t esc = evas_textblock_escape_string_get(ts);\n-\t\t if (esc)\n-\t\t\t str = _str_append(str, esc, &str_len, &str_alloc);\n-\t\t free(ts);\n-\t\t }\n-\t\t esc_start = esc_end = NULL;\n-\t }\n-\t else if ((!*p) && (s))\n-\t {\n-\t\t ts = malloc(p - s + 1);\n-\t\t if (ts)\n-\t\t {\n-\t\t strncpy(ts, s, p - s);\n-\t\t ts[p - s] = 0;\n-\t\t str = _str_append(str, ts, &str_len, &str_alloc);\n-\t\t free(ts);\n-\t\t }\n- break;\n-\t }\n-\t }\n-\tif (*p == '<')\n-\t {\n-\t if ((s) && (!esc_start))\n-\t {\n-\t\t tag_start = p;\n-\t\t tag_end = NULL;\n-\t\t ts = malloc(p - s + 1);\n-\t\t if (ts)\n-\t\t {\n-\t\t strncpy(ts, s, p - s);\n-\t\t ts[p - s] = 0;\n-\t\t str = _str_append(str, ts, &str_len, &str_alloc);\n-\t\t free(ts);\n-\t\t }\n-\t\t s = NULL;\n-\t }\n-\t }\n-\telse if (*p == '>')\n-\t {\n-\t if (tag_start)\n-\t {\n-\t\t tag_end = p;\n-\t\t s = p + 1;\n-\t }\n-\t }\n-\telse if (*p == '&')\n-\t {\n-\t if ((s) && (!tag_start))\n-\t {\n-\t\t esc_start = p;\n-\t\t esc_end = NULL;\n-\t\t ts = malloc(p - s + 1);\n-\t\t if (ts)\n-\t\t {\n-\t\t strncpy(ts, s, p - s);\n-\t\t ts[p - s] = 0;\n-\t\t str = _str_append(str, ts, &str_len, &str_alloc);\n-\t\t free(ts);\n-\t\t }\n-\t\t s = NULL;\n-\t }\n-\t }\n-\telse if (*p == ';')\n-\t {\n-\t if (esc_start)\n-\t {\n-\t\t esc_end = p;\n-\t\t s = p + 1;\n-\t }\n-\t }\n-\tp++;\n- }\n- return str;\n-}\n-\n-\n-static char *\n-_text_to_mkup(const char *text)\n-{\n- char *str = NULL;\n- int str_len = 0, str_alloc = 0;\n- int ch, pos = 0, pos2 = 0;\n-\n- if (!text) return NULL;\n- for (;;)\n- {\n-\tpos = pos2;\n- pos2 = evas_string_char_next_get((char *)(text), pos2, &ch);\n- if ((ch <= 0) || (pos2 <= 0)) break;\n-\tif (ch == '\\n')\n- str = _str_append(str, \"<br>\", &str_len, &str_alloc);\n-\telse if (ch == '\\t')\n- str = _str_append(str, \"<\\t>\", &str_len, &str_alloc);\n-\telse if (ch == '<')\n- str = _str_append(str, \"<\", &str_len, &str_alloc);\n-\telse if (ch == '>')\n- str = _str_append(str, \">\", &str_len, &str_alloc);\n-\telse if (ch == '&')\n- str = _str_append(str, \"&\", &str_len, &str_alloc);\n- else if (ch == 0x2029) \/* PS *\/\n- str = _str_append(str, \"<ps>\", &str_len, &str_alloc);\n-\telse\n-\t {\n-\t char tstr[16];\n-\n-\t strncpy(tstr, text + pos, pos2 - pos);\n-\t tstr[pos2 - pos] = 0;\n-\t str = _str_append(str, tstr, &str_len, &str_alloc);\n-\t }\n- }\n- return str;\n-}\n-\n static void\n _signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)\n {\n@@ -1422,7 +1232,7 @@\n \t {\n \t if (text_data->text)\n \t {\n-\t\t char *txt = _text_to_mkup(text_data->text);\n+\t\t char *txt = _elm_util_text_to_mkup(text_data->text);\n \n \t\t if (txt)\n \t\t {\n@@ -1442,7 +1252,7 @@\n \t {\n \t if (text_data->text)\n \t {\n-\t\t char *txt = _text_to_mkup(text_data->text);\n+\t\t char *txt = _elm_util_text_to_mkup(text_data->text);\n \n \t\t if (txt)\n \t\t {\n@@ -2578,7 +2388,7 @@\n EAPI char *\n elm_entry_markup_to_utf8(const char *s)\n {\n- char *ss = _mkup_to_text(s);\n+ char *ss = _elm_util_mkup_to_text(s);\n if (!ss) ss = strdup(\"\");\n return ss;\n }\n@@ -2594,7 +2404,7 @@\n EAPI char *\n elm_entry_utf8_to_markup(const char *s)\n {\n- char *ss = _text_to_mkup(s);\n+ char *ss = _elm_util_text_to_mkup(s);\n if (!ss) ss = strdup(\"\");\n return ss;\n }\n"} {"commit":"e75fc88b279db73fcad905625adba451a7f5a87d","subject":"comment why locks removed.","message":"comment why locks removed.\n\n\n\nSVN revision: 68886\n","repos":"tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_store.c\n+++ src\/lib\/elm_store.c\n@@ -97,6 +97,7 @@\n eina_lock_take(&sti->lock);\n }\n sti->fetched = EINA_FALSE;\n+\/\/\/\/ let fetch\/unfetch do the locking \n \/\/ eina_lock_release(&sti->lock);\n if (st->cb.unfetch.func)\n st->cb.unfetch.func(st->cb.unfetch.data, sti);\n@@ -158,6 +159,7 @@\n }\n if (!sti->fetched)\n {\n+\/\/\/\/ let fetch\/unfetch do the locking \n \/\/ eina_lock_release(&sti->lock);\n if (sti->store->cb.fetch.func)\n sti->store->cb.fetch.func(sti->store->cb.fetch.data, sti);\n@@ -695,6 +697,7 @@\n elm_store_item_data_set(Elm_Store_Item *sti, void *data)\n {\n if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return;\n+\/\/\/\/ let fetch\/unfetch do the locking \n \/\/ eina_lock_take(&sti->lock);\n sti->data = data;\n \/\/ eina_lock_release(&sti->lock);\n@@ -705,6 +708,7 @@\n {\n if (!EINA_MAGIC_CHECK(sti, ELM_STORE_ITEM_MAGIC)) return NULL;\n void *d;\n+\/\/\/\/ let fetch\/unfetch do the locking \n \/\/ eina_lock_take(&sti->lock);\n d = sti->data;\n \/\/ eina_lock_release(&sti->lock);\n"} {"commit":"ff1af0c90843a09ae41604a26e958c11e2c6461b","subject":"Cleaning up a bit","message":"Cleaning up a bit\n","repos":"mcanthony\/bloomd,armon\/bloomd,jedisct1\/bloomd,jedisct1\/bloomd,armon\/bloomd,armon\/bloomd,jedisct1\/bloomd,jedisct1\/bloomd,mcanthony\/bloomd,mcanthony\/bloomd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/bloomd\/networking.c\n+++ src\/bloomd\/networking.c\n@@ -149,7 +149,7 @@\n ev_io udp_client;\n \n ev_async loop_async; \/\/ Allows async interrupts\n- async_event *events; \/\/ List of pending events\n+ volatile async_event *events; \/\/ List of pending events\n bloom_spinlock event_lock; \/\/ Protects the events\n \n volatile int num_threads; \/\/ Number of threads in the threads list\n@@ -339,7 +339,7 @@\n ASYNC_EVENT_TYPE event_type,\n ev_io *watcher) {\n \/\/ Make a new async event\n- async_event *event = calloc(1, sizeof(async_event));\n+ async_event *event = malloc(sizeof(async_event));\n \n \/\/ Initialize\n event->event_type = event_type;\n@@ -395,7 +395,7 @@\n \n async_event *event = data->netconf->events;\n async_event *next;\n- while (event != NULL) {\n+ while (event) {\n \/\/ Handle based on the event\n switch (event->event_type) {\n case EXIT:\n@@ -416,7 +416,7 @@\n free(event);\n event = next;\n }\n- data->netconf->events = NULL;\n+ data->netconf->events = event;\n \n \/\/ Release the lock\n UNLOCK_BLOOM_SPIN(&data->netconf->event_lock);\n@@ -563,7 +563,7 @@\n if (conn->output.read_cursor == conn->output.write_cursor) {\n conn->use_write_buf = 0;\n } else if (reschedule) {\n- schedule_async(data->netconf, SCHEDULE_WATCHER, watch);\n+ schedule_async(data->netconf, SCHEDULE_WATCHER, &conn->write_client);\n }\n \n \/\/ Unlock\n@@ -714,11 +714,7 @@\n if (conn == NULL) continue;\n \n \/\/ Stop listening in libev and close the socket\n- if (conn->should_schedule) {\n- ev_io_stop(&conn->client);\n- ev_io_stop(&conn->write_client);\n- close(conn->client.fd);\n- }\n+ close_client_connection(conn);\n \n \/\/ Free all the buffers\n circbuf_free(&conn->input);\n@@ -772,9 +768,6 @@\n * @return 0 on success.\n *\/\n int send_client_response(conn_info *conn, char **response_buffers, int *buf_sizes, int num_bufs) {\n- \/\/ Bail if there are no buffers\n- if (num_bufs <= 0) return 0;\n-\n \/\/ Check if we are doing buffered writes\n if (conn->use_write_buf) {\n return send_client_response_buffered(conn, response_buffers, buf_sizes, num_bufs);\n@@ -824,11 +817,13 @@\n if (sent == total_bytes) return 0;\n \n \/\/ Check for a fatal error\n- if (sent == -1 && (errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK)) {\n- syslog(LOG_ERR, \"Failed to send() to connection [%d]! %s.\",\n- conn->client.fd, strerror(errno));\n- close_client_connection(conn);\n- return 1;\n+ if (sent == -1) {\n+ if (errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK) {\n+ syslog(LOG_ERR, \"Failed to send() to connection [%d]! %s.\",\n+ conn->client.fd, strerror(errno));\n+ close_client_connection(conn);\n+ return 1;\n+ }\n }\n \n \/\/ Figure out which buffer we left off on\n"} {"commit":"13e0744206a3ccc16b88e7719784950540bd0632","subject":"Changed ep_map to be more secure.","message":"Changed ep_map to be more secure.","repos":"tectronics\/relic-toolkit,rajeevakarv\/relic-toolkit,rajeevakarv\/relic-toolkit,rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,tectronics\/relic-toolkit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/ep\/relic_ep_util.c\n+++ src\/ep\/relic_ep_util.c\n@@ -34,6 +34,7 @@\n #include \"relic_ep.h\"\n #include \"relic_error.h\"\n #include \"relic_conf.h\"\n+#include \"relic_fp_low.h\"\n \n \/*============================================================================*\/\n \/* Public definitions *\/\n@@ -103,30 +104,71 @@\n }\n \n void ep_map(ep_t p, unsigned char *msg, int len) {\n-\tbn_t n, k;\n+\tfp_t t0, t1;\n+\tint bits, digits;\n \tunsigned char digest[MD_LEN];\n \n-\tbn_null(n);\n-\tbn_null(k);\n+\tfp_null(t0);\n+\tfp_null(t1);\n \n \tTRY {\n-\t\tbn_new(n);\n-\t\tbn_new(k);\n-\n-\t\tep_curve_get_ord(n);\n+\t\tfp_new(t0);\n+\t\tfp_new(t1);\n \n \t\tmd_map(digest, msg, len);\n-\t\tbn_read_bin(k, digest, MD_LEN, BN_POS);\n-\t\tbn_mod(k, k, n);\n+\t\tfp_set_dig(p->z, 1);\n+\t\tmemcpy(p->x, digest, MIN(FP_BYTES, MD_LEN));\n \n-\t\tep_curve_get_ord(n);\n+\t\tSPLIT(bits, digits, FP_BITS, FP_DIG_LOG);\n+\t\tif (bits > 0) {\n+\t\t\tdig_t mask = ((dig_t)1 << (dig_t)bits) - 1;\n+\t\t\tp->x[FP_DIGS - 1] &= mask;\n+\t\t}\n \n-\t\tep_mul_gen(p, k);\n-\t} CATCH_ANY {\n+\t\twhile (fp_cmp(p->x, fp_prime_get()) != CMP_LT) {\n+\t\t\tfp_subn_low(p->x, p->x, fp_prime_get());\n+\t\t}\n+\n+\t\twhile (1) {\n+\t\t\t\/* t0 = x1^2. *\/\n+\t\t\tfp_sqr(t0, p->x);\n+\t\t\t\/* t1 = x1^3. *\/\n+\t\t\tfp_mul(t1, t0, p->x);\n+\n+\t\t\t\/* t1 = x1^3 + a * x1 + b. *\/\n+\t\t\tswitch (ep_curve_opt_a()) {\n+\t\t\t\tcase OPT_ZERO:\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase OPT_ONE:\n+\t\t\t\t\tfp_add(t1, t1, p->x);\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase OPT_DIGIT:\n+\t\t\t\t\tfp_mul_dig(t0, p->x, ep_curve_get_a()[0]);\n+\t\t\t\t\tfp_add(t1, t1, t0);\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n+\t\t\t\t\tfp_mul(t0, p->x, ep_curve_get_a());\n+\t\t\t\t\tfp_add(t1, t1, t0);\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\tfp_add(t1, t1, ep_curve_get_b());\n+\n+\t\t\tif (fp_srt(p->y, t1)) {\n+\t\t\t\tp->norm = 1;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tfp_add_dig(p->x, p->x, 1);\n+\t\t}\n+\t\t\/* Assuming cofactor is 1 *\/\n+\t\t\/* TODO: generalize? *\/\n+\t}\n+\tCATCH_ANY {\n \t\tTHROW(ERR_CAUGHT);\n-\t} FINALLY {\n-\t\tbn_free(n);\n-\t\tbn_free(k);\n+\t}\n+\tFINALLY {\n+\t\tfp_free(t0);\n+\t\tfp_free(t1);\n \t}\n }\n \n"} {"commit":"53cf8ee89b75f5eb10792f4dcf460b5cf8f9fd6d","subject":"fixed potential crash in svg loader","message":"fixed potential crash in svg loader\n","repos":"gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/filters\/load_svg.c\n+++ src\/filters\/load_svg.c\n@@ -361,6 +361,7 @@\n \t\tbreak;\n \tcase GF_FEVT_RESET_SCENE:\n \t\tgf_sm_load_done(&svgin->loader);\n+\t\tsvgin->scene = NULL;\n \t\treturn GF_FALSE;\n \tdefault:\n \t\treturn GF_FALSE;\n"} {"commit":"e0339cf784d790d8ecf7f48092dfbbd1acd0ab4d","subject":"align frag generation in dash with old arch","message":"align frag generation in dash with old arch\n","repos":"gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/filters\/mux_isom.c\n+++ src\/filters\/mux_isom.c\n@@ -2443,7 +2443,9 @@\n \t\t\tif (ctx->strun) {\n \t\t\t\te = gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_RANDOM_ACCESS, 0);\n \n-\t\t\t} else if (ctx->fsap && (tkw->stream_type == GF_STREAM_VISUAL)) {\n+\t\t\t}\n+\t\t\t\/\/fragment at sap boundaries for video, but not in dash mode (compatibility with old arch)\n+\t\t\telse if (ctx->fsap && (tkw->stream_type == GF_STREAM_VISUAL) && !ctx->dash_mode) {\n \t\t\t\te = gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_RANDOM_ACCESS, 1);\n \t\t\t\tif (e) {\n \t\t\t\t\tGF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, (\"[MP4Mux] Unable set fragment options: %s\\n\", gf_error_to_string(e) ));\n"} {"commit":"7f112db77554ffb3fecec1e1eada46c5612c1513","subject":"fixed bug with dash brands","message":"fixed bug with dash brands\n","repos":"RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/filters\/mux_isom.c\n+++ src\/filters\/mux_isom.c\n@@ -219,7 +219,7 @@\n \tu32 nb_seg_sizes, alloc_seg_sizes;\n \tBool config_timing;\n \n-\tBool major_brand_set;\n+\tu32 major_brand_set;\n \tBool def_brand_patched;\n \n \tBool force_play;\n@@ -661,7 +661,7 @@\n \t\tgf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_QT, 512);\n \t\tgf_isom_reset_alt_brands(ctx->file);\n \t\ttkw->has_brands = GF_TRUE;\n-\t\tctx->major_brand_set = GF_TRUE;\n+\t\tctx->major_brand_set = GF_ISOM_BRAND_QT;\n \t\tctx->btrt = GF_FALSE;\n \n \t\tif (is_prores && !ctx->prores_track) {\n@@ -868,7 +868,7 @@\n \t\tif (p) {\n \t\t\tif (!ctx->major_brand_set) {\n \t\t\t\tgf_isom_set_brand_info(ctx->file, p->value.uint, 1);\n-\t\t\t\tctx->major_brand_set = GF_TRUE;\n+\t\t\t\tctx->major_brand_set = p->value.uint;\n \t\t\t} else {\n \t\t\t\tgf_isom_modify_alternate_brand(ctx->file, p->value.uint, GF_TRUE);\n \t\t\t}\n@@ -878,7 +878,7 @@\n \t\tif (p && p->value.uint_list.nb_items) {\n \t\t\ttkw->has_brands = GF_TRUE;\n \t\t\tif (!ctx->major_brand_set) {\n-\t\t\t\tctx->major_brand_set = GF_TRUE;\n+\t\t\t\tctx->major_brand_set = p->value.uint_list.vals[0];\n \t\t\t\tgf_isom_set_brand_info(ctx->file, p->value.uint_list.vals[0], 1);\n \t\t\t}\n \n@@ -1480,7 +1480,12 @@\n \t\t\t}\n \t\t\t\/\/pacth for old arch\n \t\t\telse if (ctx->dash_mode) {\n-\t\t\t\tif (ctx->major_brand_set) {\n+\t\t\t\tBool force_brand=GF_FALSE;\n+\t\t\t\tif (((ctx->major_brand_set>>24)=='i') && (((ctx->major_brand_set>>16)&0xFF)=='s') && (((ctx->major_brand_set>>8)&0xFF)=='o')) {\n+\t\t\t\t\tif ( (ctx->major_brand_set&0xFF) <'6') force_brand=GF_TRUE;\n+\t\t\t\t}\n+\n+\t\t\t\tif (!force_brand && ctx->major_brand_set) {\n \t\t\t\t\tgf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, 1);\n \t\t\t\t} else {\n \t\t\t\t\tgf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_ISO6, 1);\n"} {"commit":"d3bd1855c805263420b023cb128b60e738ed465f","subject":"Fix dynamic arrays usage in SPF module.","message":"Fix dynamic arrays usage in SPF module.\n","repos":"awhitesong\/rspamd,AlexeySa\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,dark-al\/rspamd,amohanta\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,minaevmike\/rspamd,dark-al\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,amohanta\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,awhitesong\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,dark-al\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,andrejzverev\/rspamd,dark-al\/rspamd,dark-al\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,andrejzverev\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,AlexeySa\/rspamd,minaevmike\/rspamd","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/libserver\/spf.c\n+++ src\/libserver\/spf.c\n@@ -61,7 +61,7 @@\n \tgint requests_inflight;\n \n \tguint ttl;\n-\tGArray *resolved; \/* Array of struct spf_resolved_element *\/\n+\tGPtrArray *resolved; \/* Array of struct spf_resolved_element *\/\n \tconst gchar *sender;\n \tconst gchar *sender_domain;\n \tgchar *local_part;\n@@ -175,23 +175,16 @@\n static struct spf_resolved_element *\n rspamd_spf_new_addr_list (struct spf_record *rec, const gchar *domain)\n {\n-\tstruct spf_resolved_element resolved;\n-\n-\tresolved.redirected = FALSE;\n-\tresolved.cur_domain = g_strdup (domain);\n-\tresolved.elts = g_ptr_array_new_full (8, rspamd_spf_free_addr);\n-\n-\tg_array_append_val (rec->resolved, resolved);\n-\n-\treturn &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n-}\n-\n-\/* Debugging function that dumps spf record in log *\/\n-static void\n-dump_spf_record (GList *addrs)\n-{\n-\n+\tstruct spf_resolved_element *resolved;\n+\n+\tresolved = g_slice_alloc (sizeof (*resolved));\n+\tresolved->redirected = FALSE;\n+\tresolved->cur_domain = g_strdup (domain);\n+\tresolved->elts = g_ptr_array_new_full (8, rspamd_spf_free_addr);\n+\n+\tg_ptr_array_add (rec->resolved, resolved);\n+\n+\treturn g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n }\n \n \/*\n@@ -206,13 +199,13 @@\n \n \tif (rec) {\n \t\tfor (i = 0; i < rec->resolved->len; i ++) {\n-\t\t\telt = &g_array_index (rec->resolved, struct spf_resolved_element, i);\n-\n-\t\t\t\/* Elts are destructed automatically here *\/\n+\t\t\telt = g_ptr_array_index (rec->resolved, i);\n \t\t\tg_ptr_array_free (elt->elts, TRUE);\n \t\t\tg_free (elt->cur_domain);\n-\t\t}\n-\t\tg_array_free (rec->resolved, TRUE);\n+\t\t\tg_slice_free1 (sizeof (*elt), elt);\n+\t\t}\n+\n+\t\tg_ptr_array_free (rec->resolved, TRUE);\n \t}\n }\n \n@@ -243,11 +236,10 @@\n \tif (addr) {\n \t\tg_assert (addr->m.idx < rec->resolved->len);\n \n-\t\telt = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\t\taddr->m.idx);\n+\t\telt = g_ptr_array_index (rec->resolved, addr->m.idx);\n \t}\n \telse {\n-\t\telt = &g_array_index (rec->resolved, struct spf_resolved_element, 0);\n+\t\telt = g_ptr_array_index (rec->resolved, 0);\n \t}\n \n \twhile (elt->redirected) {\n@@ -268,8 +260,7 @@\n \n \t\tg_assert (cur->flags & RSPAMD_SPF_FLAG_REFRENCE);\n \t\tg_assert (cur->m.idx < rec->resolved->len);\n-\t\telt = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\t\tcur->m.idx);\n+\t\telt = g_ptr_array_index (rec->resolved, cur->m.idx);\n \t}\n \n \tfor (i = 0; i < elt->elts->len; i ++) {\n@@ -314,7 +305,7 @@\n \tres->ttl = rec->ttl;\n \tREF_INIT_RETAIN (res, rspamd_flatten_record_dtor);\n \n-\tif (res->elts->len > 0) {\n+\tif (rec->resolved->len > 0) {\n \t\trspamd_spf_process_reference (res, NULL, rec, TRUE);\n \t}\n \n@@ -637,8 +628,7 @@\n \tgchar t;\n \tguint16 cur_mask = 0;\n \n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \thost = resolved->cur_domain;\n \n \twhile (*p) {\n@@ -750,8 +740,7 @@\n \tstruct rspamd_task *task = rec->task;\n \tstruct spf_resolved_element *resolved;\n \n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \tCHECK_REC (rec);\n \n \thost = parse_spf_domain_mask (rec, addr, TRUE);\n@@ -788,8 +777,7 @@\n \tstruct rspamd_task *task = rec->task;\n \tstruct spf_resolved_element *resolved;\n \n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \tCHECK_REC (rec);\n \n \thost = parse_spf_domain_mask (rec, addr, FALSE);\n@@ -830,8 +818,7 @@\n \tstruct rspamd_task *task = rec->task;\n \tstruct spf_resolved_element *resolved;\n \n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \n \tCHECK_REC (rec);\n \n@@ -1083,8 +1070,7 @@\n \tstruct rspamd_task *task = rec->task;\n \tstruct spf_resolved_element *resolved;\n \n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \tCHECK_REC (rec);\n \n \thost = strchr (addr->spf_string, ':');\n@@ -1161,8 +1147,7 @@\n \tg_assert (begin != NULL);\n \n \ttask = rec->task;\n-\tresolved = &g_array_index (rec->resolved, struct spf_resolved_element,\n-\t\t\trec->resolved->len - 1);\n+\tresolved = g_ptr_array_index (rec->resolved, rec->resolved->len - 1);\n \tp = begin;\n \t\/* Calculate length *\/\n \twhile (*p) {\n@@ -1681,8 +1666,7 @@\n \trec->task = task;\n \trec->callback = callback;\n \n-\trec->resolved = g_array_sized_new (FALSE, FALSE,\n-\t\t\tsizeof (struct spf_resolved_element), 8);\n+\trec->resolved = g_ptr_array_sized_new (8);\n \n \t\/* Add destructor *\/\n \trspamd_mempool_add_destructor (task->task_pool,\n"} {"commit":"99940eabf27c141b49d10945e8d8f8c336ae2dc8","subject":"don't offer SOCKS5 relay when trying to establish a bytestream with a muc contact","message":"don't offer SOCKS5 relay when trying to establish a bytestream with a muc contact\n","repos":"mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bytestream-socks5.c\n+++ src\/bytestream-socks5.c\n@@ -165,6 +165,8 @@\n gchar *peer_jid;\n gchar *self_full_jid;\n gchar *proxy_jid;\n+ \/* TRUE if the peer of this bytestream is a muc contact *\/\n+ gboolean muc_contact;\n \n \/* List of Streamhost *\/\n GSList *streamhosts;\n@@ -381,7 +383,7 @@\n GObject *obj;\n GabbleBytestreamSocks5Private *priv;\n TpBaseConnection *base_conn;\n- TpHandleRepoIface *contact_repo;\n+ TpHandleRepoIface *contact_repo, *room_repo;\n const gchar *jid;\n \n obj = G_OBJECT_CLASS (gabble_bytestream_socks5_parent_class)->\n@@ -397,6 +399,8 @@\n base_conn = TP_BASE_CONNECTION (priv->conn);\n contact_repo = tp_base_connection_get_handles (base_conn,\n TP_HANDLE_TYPE_CONTACT);\n+ room_repo = tp_base_connection_get_handles (base_conn,\n+ TP_HANDLE_TYPE_ROOM);\n \n tp_handle_ref (contact_repo, priv->peer_handle);\n \n@@ -408,6 +412,9 @@\n priv->peer_jid = g_strdup (jid);\n \n g_assert (priv->self_full_jid != NULL);\n+\n+ priv->muc_contact = (gabble_get_room_handle_from_jid (room_repo,\n+ priv->peer_jid) != 0);\n \n return obj;\n }\n@@ -1784,8 +1791,6 @@\n LmMessage *msg;\n GList *ips;\n GList *ip;\n- const GSList *proxies;\n- GSList *l;\n \n if (priv->bytestream_state != GABBLE_BYTESTREAM_STATE_INITIATING)\n {\n@@ -1837,22 +1842,33 @@\n g_list_free (ips);\n g_free (port);\n \n- proxies = gabble_bytestream_factory_get_socks_proxies(\n- priv->conn->bytestream_factory);\n-\n- for (l = (GSList *) proxies; l != NULL; l = g_slist_next (l))\n- {\n- LmMessageNode *node;\n- GabbleSocks5Proxy *proxy = (GabbleSocks5Proxy *) l->data;\n-\n- node = lm_message_node_add_child (msg->node->children,\n- \"streamhost\", \"\");\n-\n- lm_message_node_set_attributes (node,\n- \"jid\", proxy->jid,\n- \"host\", proxy->host,\n- \"port\", proxy->port,\n- NULL);\n+ if (!priv->muc_contact)\n+ {\n+ const GSList *proxies;\n+ GSList *l;\n+\n+ proxies = gabble_bytestream_factory_get_socks_proxies(\n+ priv->conn->bytestream_factory);\n+\n+ for (l = (GSList *) proxies; l != NULL; l = g_slist_next (l))\n+ {\n+ LmMessageNode *node;\n+ GabbleSocks5Proxy *proxy = (GabbleSocks5Proxy *) l->data;\n+\n+ node = lm_message_node_add_child (msg->node->children,\n+ \"streamhost\", \"\");\n+\n+ lm_message_node_set_attributes (node,\n+ \"jid\", proxy->jid,\n+ \"host\", proxy->host,\n+ \"port\", proxy->port,\n+ NULL);\n+ }\n+ }\n+ else\n+ {\n+ DEBUG (\"don't propose to use SOCKS5 relays as we are offering bytestream \"\n+ \"to a muc contact\");\n }\n \n priv->socks5_state = SOCKS5_STATE_INITIATOR_OFFER_SENT;\n"} {"commit":"9148975b1fa1566110e4315699c964063156cc98","subject":"Disable escape analysis.","message":"Disable escape analysis.\n\nBUG=\nR=mstarzinger@chromium.org\n\nReview URL: https:\/\/codereview.chromium.org\/101903002\n\ngit-svn-id: b158db1e4b4ab85d4c9e510fdef4b1e8c614b15b@18234 ce2b1a6d-e550-0410-aec6-3dcde31c8c00\n","repos":"UniversalFuture\/moosh,UniversalFuture\/moosh,UniversalFuture\/moosh,UniversalFuture\/moosh","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/flag-definitions.h\n+++ src\/flag-definitions.h\n@@ -242,7 +242,7 @@\n DEFINE_bool(use_gvn, true, \"use hydrogen global value numbering\")\n DEFINE_bool(use_canonicalizing, true, \"use hydrogen instruction canonicalizing\")\n DEFINE_bool(use_inlining, true, \"use function inlining\")\n-DEFINE_bool(use_escape_analysis, true, \"use hydrogen escape analysis\")\n+DEFINE_bool(use_escape_analysis, false, \"use hydrogen escape analysis\")\n DEFINE_bool(use_allocation_folding, true, \"use allocation folding\")\n DEFINE_int(max_inlining_levels, 5, \"maximum number of inlining levels\")\n DEFINE_int(max_inlined_source_size, 600,\n"} {"commit":"dbee263c903b691ef625256f33ecdda55a2fd6f5","subject":"Qfs c bindings: fix printf format cast.","message":"Qfs c bindings: fix printf format cast.\n","repos":"quantcast\/qfs,qnu\/qfs,thebigbrain\/qfs,chanwit\/qfs,thebigbrain\/qfs,fengshao0907\/qfs,chanwit\/qfs,qnu\/qfs,chanwit\/qfs,fengshao0907\/qfs,fengshao0907\/qfs,thebigbrain\/qfs,fengshao0907\/qfs,chanwit\/qfs,quantcast\/qfs,qnu\/qfs,qnu\/qfs,fengshao0907\/qfs,thebigbrain\/qfs,quantcast\/qfs,quantcast\/qfs,thebigbrain\/qfs,chanwit\/qfs,quantcast\/qfs,chanwit\/qfs,qnu\/qfs,chanwit\/qfs,quantcast\/qfs,fengshao0907\/qfs,quantcast\/qfs,fengshao0907\/qfs,thebigbrain\/qfs,qnu\/qfs,thebigbrain\/qfs,chanwit\/qfs,fengshao0907\/qfs,qnu\/qfs,quantcast\/qfs,qnu\/qfs,thebigbrain\/qfs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/cc\/qfsc\/test-qfsc.c\n+++ src\/cc\/qfsc\/test-qfsc.c\n@@ -259,7 +259,7 @@\n \"filename should be correct: %s != %s\", attr.filename, \"file\");\n check(attr.size == len*2,\n \"file size should be correct: %li != %li\",\n- (long long)attr.size, (long long)len);\n+ (long)attr.size, (long)len);\n \n return 0;\n }\n"} {"commit":"1252b7def39c70c88164c65a4aba016db83329a3","subject":"Handle offset-labels and label addressing","message":"Handle offset-labels and label addressing\n","repos":"8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/ops\/expr_cast.c\n+++ src\/cc1\/ops\/expr_cast.c\n@@ -284,10 +284,12 @@\n \t\t\tintegral_t memaddr;\n \n \t\t\t\/* can't do (int)&x *\/\n-\t\t\tassert(!k->bits.addr.is_lbl);\n-\t\t\tassert(!k->offset);\n-\n-\t\t\tmemaddr = k->bits.addr.bits.memaddr;\n+\t\t\tif(k->bits.addr.is_lbl){\n+\t\t\t\tk->type = CONST_NO;\n+\t\t\t\treturn;\n+\t\t\t}\n+\n+\t\t\tmemaddr = k->bits.addr.bits.memaddr + k->offset;\n \n \t\t\tCONST_FOLD_LEAF(k);\n \n@@ -349,7 +351,8 @@\n \t&& !type_is_ptr(e->tree_type))\n \t{\n \t\t\/* casting from pointer to int *\/\n-\t\tconst_intify(k);\n+\t\tif(type_size(e->tree_type, &e->where) < platform_word_size())\n+\t\t\tconst_intify(k); \/* smaller than word size, force to int *\/\n \n \t\t\/* not a constant but we treat it as such, as an extension *\/\n \t\tif(!k->nonstandard_const)\n"} {"commit":"cb5ef42d6ef39212e0b817da6fe8c77c63097f5a","subject":"Fixed a typo.","message":"Fixed a typo.\n","repos":"egeor\/libxsmm,hfp\/libxsmm,egeor\/libxsmm,egeor\/libxsmm,egeor\/libxsmm,hfp\/libxsmm,hfp\/libxsmm,hfp\/libxsmm,egeor\/libxsmm,egeor\/libxsmm,hfp\/libxsmm,hfp\/libxsmm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libxsmm_spmdm.c\n+++ src\/libxsmm_spmdm.c\n@@ -287,7 +287,7 @@\n int block_id,\n int tid, int nthreads)\n {\n-#if !defined(LIBXSMM_SPMDM_AVX2)\n+#if defined(LIBXSMM_SPMDM_AVX2)\n # include \"libxsmm_spmdm_begin_avx2.h\"\n # include \"template\/libxsmm_spmdm_createSparseSlice_bfloat16_thread.tpl.c\"\n # include \"libxsmm_spmdm_end.h\"\n"} {"commit":"565e01e56a9c6507e528fbb59e69e51dcc36ec7d","subject":"File.readline now returns the newline in the ByteString.","message":"File.readline now returns the newline in the ByteString.\n","repos":"crasm\/lily,crasm\/lily,boardwalk\/lily,boardwalk\/lily,crasm\/lily","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lily_cls_file.c\n+++ src\/lily_cls_file.c\n@@ -138,11 +138,6 @@\n \n buffer[pos] = (char)ch;\n \n- \/* \\r is intentionally not checked for, because it's been a very, very\n- long time since any os used \\r alone for newlines. *\/\n- if (ch == '\\n')\n- break;\n-\n if (pos == buffer_size) {\n lily_msgbuf_grow(vm_buffer);\n buffer = vm_buffer->message;\n@@ -150,6 +145,11 @@\n }\n \n pos++;\n+\n+ \/* \\r is intentionally not checked for, because it's been a very, very\n+ long time since any os used \\r alone for newlines. *\/\n+ if (ch == '\\n')\n+ break;\n }\n \n lily_move_string(result_reg, lily_new_raw_string_sized(buffer, pos));\n"} {"commit":"371ba25906e710df1d1b4c02d54471af1a37a81d","subject":"Fix: WA the AVC B frame issue with high profile","message":"Fix: WA the AVC B frame issue with high profile\n\nthis is WA to disable the transform_8x8_mode_flag in the driver.\n\nFixes #97\n\nSigned-off-by: Pengfei Qu <3770d20c463a9a2048391f18839a717424bdb1b3@intel.com>\n(cherry picked from commit 228e4fc197e2a180dcbfcaba4df2a0717f6ec853)\n","repos":"01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gen9_avc_encoder.c\n+++ src\/gen9_avc_encoder.c\n@@ -1962,10 +1962,9 @@\n int i = 0;\n \n struct object_surface *obj_surface;\n- VAEncPictureParameterBufferH264 *pic_param = avc_state->pic_param;\n VAEncSliceParameterBufferH264 * slice_param = avc_state->slice_param[0];\n VASurfaceID surface_id;\n- unsigned int transform_8x8_mode_flag = pic_param->pic_fields.bits.transform_8x8_mode_flag;\n+ unsigned int transform_8x8_mode_flag = avc_state->transform_8x8_mode_enable;\n \n gpe_resource = &(avc_ctx->res_brc_const_data_buffer);\n assert(gpe_resource);\n@@ -2129,9 +2128,8 @@\n unsigned int * data_tmp = NULL;\n unsigned int size = 0;\n unsigned int table_idx = 0;\n- VAEncPictureParameterBufferH264 *pic_param = avc_state->pic_param;\n unsigned int block_based_skip_enable = avc_state->block_based_skip_enable;\n- unsigned int transform_8x8_mode_flag = pic_param->pic_fields.bits.transform_8x8_mode_flag;\n+ unsigned int transform_8x8_mode_flag = avc_state->transform_8x8_mode_enable;\n int i = 0;\n \n gpe_resource = &(avc_ctx->res_brc_const_data_buffer);\n@@ -3074,7 +3072,6 @@\n struct i965_avc_encoder_context * avc_ctx = (struct i965_avc_encoder_context * )vme_context->private_enc_ctx;\n struct generic_enc_codec_state * generic_state = (struct generic_enc_codec_state * )vme_context->generic_enc_state;\n struct avc_enc_state * avc_state = (struct avc_enc_state * )vme_context->private_enc_state;\n- VAEncPictureParameterBufferH264 *pic_param = avc_state->pic_param;\n \n struct i965_gpe_resource *gpe_resource = NULL;\n unsigned int * data =NULL;\n@@ -3082,7 +3079,7 @@\n unsigned int size = 16 * 52;\n unsigned int table_idx = 0;\n unsigned int block_based_skip_enable = avc_state->block_based_skip_enable;\n- unsigned int transform_8x8_mode_flag = pic_param->pic_fields.bits.transform_8x8_mode_flag;\n+ unsigned int transform_8x8_mode_flag = avc_state->transform_8x8_mode_enable;\n int i = 0;\n \n gpe_resource = &(avc_ctx->res_mbbrc_const_data_buffer);\n@@ -3267,8 +3264,8 @@\n \n cmd.g9->dw0.adaptive_enable = gen9_avc_enable_adaptive_search[preset];\n cmd.g9->dw37.adaptive_enable = gen9_avc_enable_adaptive_search[preset];\n- cmd.g9->dw0.t8x8_flag_for_inter_enable = pic_param->pic_fields.bits.transform_8x8_mode_flag;\n- cmd.g9->dw37.t8x8_flag_for_inter_enable = pic_param->pic_fields.bits.transform_8x8_mode_flag;\n+ cmd.g9->dw0.t8x8_flag_for_inter_enable = avc_state->transform_8x8_mode_enable;\n+ cmd.g9->dw37.t8x8_flag_for_inter_enable = avc_state->transform_8x8_mode_enable;\n \n cmd.g9->dw2.max_len_sp = gen9_avc_max_len_sp[preset];\n cmd.g9->dw38.max_len_sp = 0;\n@@ -3347,7 +3344,7 @@\n cmd.g9->dw4.use_actual_ref_qp_value = generic_state->hme_enabled && (gen9_avc_mr_disable_qp_check[preset] == 0);\n \n \n- cmd.g9->dw7.intra_part_mask = pic_param->pic_fields.bits.transform_8x8_mode_flag?0:0x02;\n+ cmd.g9->dw7.intra_part_mask = avc_state->transform_8x8_mode_enable?0:0x02;\n cmd.g9->dw7.src_field_polarity = 0;\/\/field related\n \n \/*ftq_skip_threshold_lut set,dw14 \/15*\/\n@@ -3355,11 +3352,11 @@\n \/*r5 disable NonFTQSkipThresholdLUT*\/\n if(generic_state->frame_type == SLICE_TYPE_P)\n {\n- cmd.g9->dw32.skip_val = gen9_avc_skip_value_p[avc_state->block_based_skip_enable][pic_param->pic_fields.bits.transform_8x8_mode_flag][qp];\n+ cmd.g9->dw32.skip_val = gen9_avc_skip_value_p[avc_state->block_based_skip_enable][avc_state->transform_8x8_mode_enable][qp];\n \n }else if(generic_state->frame_type == SLICE_TYPE_B)\n {\n- cmd.g9->dw32.skip_val = gen9_avc_skip_value_b[avc_state->block_based_skip_enable][pic_param->pic_fields.bits.transform_8x8_mode_flag][qp];\n+ cmd.g9->dw32.skip_val = gen9_avc_skip_value_b[avc_state->block_based_skip_enable][avc_state->transform_8x8_mode_enable][qp];\n \n }\n \n@@ -5357,7 +5354,6 @@\n struct generic_enc_codec_state * generic_state = (struct generic_enc_codec_state * )vme_context->generic_enc_state;\n struct avc_enc_state * avc_state = (struct avc_enc_state * )vme_context->private_enc_state;\n VAEncSequenceParameterBufferH264 *seq_param;\n- VAEncPictureParameterBufferH264 *pic_param ;\n VAEncSliceParameterBufferH264 * slice_param;\n int i,j;\n unsigned int preset = generic_state->preset;\n@@ -5395,7 +5391,6 @@\n \n \/* how many slices support by now? 1 slice or multi slices, but row slice.not slice group. *\/\n seq_param = avc_state->seq_param;\n- pic_param = avc_state->pic_param;\n slice_param = avc_state->slice_param[0];\n \n generic_state->frame_type = avc_state->slice_param[0]->slice_type;\n@@ -5408,7 +5403,7 @@\n else if(slice_param->slice_type == SLICE_TYPE_B)\n generic_state->frame_type = SLICE_TYPE_B;\n if (profile == VAProfileH264High)\n- avc_state->transform_8x8_mode_enable = !!pic_param->pic_fields.bits.transform_8x8_mode_flag;\n+ avc_state->transform_8x8_mode_enable = 0;\/\/work around for high profile to disabel pic_param->pic_fields.bits.transform_8x8_mode_flag\n else\n avc_state->transform_8x8_mode_enable = 0;\n \n"} {"commit":"2a4aedbb5d756685b7d1ed4d02688f62b438aa3f","subject":"Added inosleep_nolck() and ISLEEP_NOLCK.","message":"Added inosleep_nolck() and ISLEEP_NOLCK.\n","repos":"georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/gnu\/ext2fs\/inode.h\n+++ src\/gnu\/ext2fs\/inode.h\n@@ -340,22 +340,22 @@\n }\n #define ISLEEP(ip, field, ts) inosleep((ip), &(ip)->i_ ## field, __FUNCTION__, (ts))\n \n+static __inline__\n+int inosleep_nolck(struct inode *ip, void *chan, const char *wmsg, struct timespec *ts)\n+{\n+\tassert(ip->i_lockowner != current_thread());\n+\treturn (msleep(chan, NULL, PINOD, wmsg, ts));\n+}\n+#define ISLEEP_NOLCK(ip, field, ts) inosleep_nolck((ip), &(ip)->i_ ## field, __FUNCTION__, (ts))\n+\n \/* chan is the sleep\/wake field, wakefield is the bitfield to test\/clear *\/\n-#define IWAKEI(ip, chan, wakefield, wakebit) do { \\\n+#define IWAKE(ip, chan, wakefield, wakebit) do { \\\n+\tIASSERTLOCK(ip); \\\n \tif ((ip)->i_ ## wakefield & (wakebit)) { \\\n \t\t(ip)->i_ ## wakefield &= ~(wakebit); \\\n \t\twakeup(&(ip)->i_ ## chan); \\\n \t} \\\n } while(0)\n-\n-#ifndef DIAGNOSTIC\n-#define IWAKE IWAKEI\n-#else\n-#define IWAKE(ip, chan, wakefield, wakebit) do { \\\n-\tassert((ip)->i_lockowner == current_thread()); \\\n-\tIWAKEI(ip, chan, wakefield, wakebit); \\\n-} while(0)\n-#endif\n \n \/* This overlays the fid structure (see mount.h). *\/\n struct ufid {\n"} {"commit":"589b09361d6ad85389caa44896e1fc9db8d3a4c5","subject":"Remove more debug printf's","message":"Remove more debug printf's\n","repos":"leecrest\/luv,mkschreder\/luv,RomeroMalaquias\/luv,joerg-krause\/luv,daurnimator\/luv,kidaa\/luv,xpol\/luv,brimworks\/luv,zhaozg\/luv,luvit\/luv,NanXiao\/luv,NanXiao\/luv,mkschreder\/luv,daurnimator\/luv,DBarney\/luv,leecrest\/luv,DBarney\/luv,zhaozg\/luv,RomeroMalaquias\/luv,kidaa\/luv,brimworks\/luv,daurnimator\/luv,luvit\/luv,xpol\/luv,joerg-krause\/luv,RomeroMalaquias\/luv","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/luv_functions.c\n+++ src\/luv_functions.c\n@@ -456,7 +456,7 @@\n req = malloc(sizeof(*req));\n req->data = (void*)callback;\n \n- printf(\"node=%p service=%p hints=%p\\n\", node, service, hints);\n+ \/\/ printf(\"node=%p service=%p hints=%p\\n\", node, service, hints);\n \/\/ Make the call\n if (uv_getaddrinfo(uv_default_loop(), req, on_addrinfo, node, service, hints)) {\n uv_err_t err = uv_last_error(uv_default_loop());\n"} {"commit":"3f89a91d9cba20a8e9d71461ddaaa43258da33de","subject":"Changed LV_KB_MODE_TEXT_UC to LV_KB_MODE_TEXT_UPPER as suggested to make it more intuitive.","message":"Changed LV_KB_MODE_TEXT_UC to LV_KB_MODE_TEXT_UPPER as suggested to make\nit more intuitive.\n","repos":"littlevgl\/lvgl,littlevgl\/lvgl,littlevgl\/lvgl,littlevgl\/lvgl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lv_objx\/lv_kb.h\n+++ src\/lv_objx\/lv_kb.h\n@@ -45,7 +45,7 @@\n enum {\n LV_KB_MODE_TEXT,\n LV_KB_MODE_NUM,\n- LV_KB_MODE_TEXT_UC,\n+ LV_KB_MODE_TEXT_UPPER,\n };\n typedef uint8_t lv_kb_mode_t;\n \n"} {"commit":"3730419f88a68617188164cc498db094699f2897","subject":"Reset dialect cache belonging to a different dictionary","message":"Reset dialect cache belonging to a different dictionary\n\nFor the problem report see issue #1088.\nA unique open-dictionary ID is still needed to be totally safe.\n","repos":"linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/dict-common\/dialect.c\n+++ link-grammar\/dict-common\/dialect.c\n@@ -241,15 +241,19 @@\n \t\t\t\/* XXX In principle this may still be another dictionary if it got\n \t\t\t * the same address. Can be fixed by adding dictionary_create()\n \t\t\t * ordinal number. *\/\n-\t\t\tprt_error(\"Error: Dialect setup belongs to a different dictionary.\\n\");\n-\t\t\treturn false;\n-\t\t}\n-\t\tlgdebug(D_DIALECT, \"Debug: Cached cost table found\\n\");\n-\n-\t\tif (verbosity_level(+D_DIALECT+1))\n-\t\t\tprint_cost_table(dict, di, dinfo);\n-\n-\t\treturn true;\n+\t\t\tlgdebug(+D_DIALECT,\n+\t\t\t \"Debug: Resetting dialect cache of a different dictionary.\\n\");\n+\t\t\tfree_cost_table(opts);\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\tlgdebug(+D_DIALECT, \"Debug: Cached cost table found\\n\");\n+\n+\t\t\tif (verbosity_level(+D_DIALECT+1))\n+\t\t\t\tprint_cost_table(dict, di, dinfo);\n+\n+\t\t\treturn true;\n+\t\t}\n \t}\n \n \tdinfo->dict = dict;\n"} {"commit":"7a193d8267c2d21a9236c8950a8f5e896535d5cf","subject":"Word_file_struct: Add a comment that \"changed\" is unused.","message":"Word_file_struct: Add a comment that \"changed\" is unused.\n","repos":"linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/dict-file\/word-file.h\n+++ link-grammar\/dict-file\/word-file.h\n@@ -19,7 +19,7 @@\n {\n \tWord_file * next;\n \tconst char *file; \/* the file name *\/\n-\tbool changed; \/* TRUE if this file has been changed *\/\n+\tbool changed; \/* TRUE if this file has been changed (XXX unused) *\/\n };\n \n void free_Word_file(Word_file * wf);\n"} {"commit":"54b4dad4547d2d74cb57c059301decf45d402e6f","subject":"fix volume control for alsa and add GET_SAMPLE_RATE method","message":"fix volume control for alsa and add GET_SAMPLE_RATE method\n\ngit-svn-id: 8f60b0cb95795e7f2da4f2192af0e1f6ffac8291@450 3f6dc0c8-ddfe-455d-9043-3cd528dc4637\n","repos":"wugh7125\/ortp,dmonakhov\/ortp,dozeo\/ortp,samueljero\/linphone-oRTP,Linphone-sync\/oRTP,Distrotech\/oRTP,wugh7125\/ortp,dmonakhov\/ortp,caizw\/ortp,Distrotech\/oRTP,jiangjianping\/ortp,jiangjianping\/ortp,wugh7125\/ortp,carpikes\/ortp,samueljero\/linphone-oRTP,caizw\/ortp,Linphone-sync\/oRTP,Linphone-sync\/oRTP,dozeo\/ortp,VTCSecureLLC\/ortp,VTCSecureLLC\/ortp,videomedicine\/oRTP,videomedicine\/oRTP,carpikes\/ortp,caizw\/ortp,dozeo\/ortp,avis\/ortp,jiangjianping\/ortp,avis\/ortp,videomedicine\/oRTP,Distrotech\/oRTP,samueljero\/linphone-oRTP,VTCSecureLLC\/ortp,avis\/ortp,dmonakhov\/ortp,carpikes\/ortp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- linphone\/mediastreamer2\/src\/alsa.c\n+++ linphone\/mediastreamer2\/src\/alsa.c\n@@ -667,6 +667,16 @@\n \t\tobj->name=pos1;\n \t\tad->pcmdev=ms_strdup_printf(\"default:%i\",id);\n \t\tad->mixdev=ms_strdup_printf(\"default:%i\",id);\n+\t\t{\n+\t\t\tsnd_mixer_t *mixer;\n+\t\t\tmixer = alsa_mixer_open(ad->mixdev);\n+\t\t\tif (mixer==NULL) {\n+\t\t\t\tms_free(ad->mixdev);\n+\t\t\t\tad->mixdev=ms_strdup_printf(\"hw:%i\",id);\n+\t\t\t} else {\n+\t\t\t\talsa_mixer_close(mixer);\n+\t\t\t}\n+\t\t}\n \t}\n \t\/*check card capabilities: *\/\n \tobj->capabilities=get_card_capabilities(ad->pcmdev);\n@@ -880,6 +890,12 @@\n }\n #endif\n \n+static int alsa_read_get_sample_rate(MSFilter *obj, void *param){\n+\tAlsaReadData *ad=(AlsaReadData*)obj->data;\n+\t*((int*)param)=ad->rate;\n+\treturn 0;\n+}\n+\n static int alsa_read_set_sample_rate(MSFilter *obj, void *param){\n \tAlsaReadData *ad=(AlsaReadData*)obj->data;\n \tad->rate=*((int*)param);\n@@ -893,8 +909,9 @@\n }\n \n MSFilterMethod alsa_read_methods[]={\n+\t{MS_FILTER_GET_SAMPLE_RATE,\talsa_read_get_sample_rate},\n \t{MS_FILTER_SET_SAMPLE_RATE, alsa_read_set_sample_rate},\n-\t{MS_FILTER_SET_SAMPLE_RATE, alsa_read_set_nchannels},\n+\t{MS_FILTER_SET_NCHANNELS, alsa_read_set_nchannels},\n \t{0,NULL}\n };\n \n@@ -946,6 +963,12 @@\n \tms_free(ad);\n }\n \n+static int alsa_write_get_sample_rate(MSFilter *obj, void *data){\n+\tAlsaWriteData *ad=(AlsaWriteData*)obj->data;\n+\t*((int*)data)=ad->rate;\n+\treturn 0;\n+}\n+\n int alsa_write_set_sample_rate(MSFilter *obj, void *data){\n \tint *rate=(int*)data;\n \tAlsaWriteData *ad=(AlsaWriteData*)obj->data;\n@@ -990,6 +1013,7 @@\n }\n \n MSFilterMethod alsa_write_methods[]={\n+\t{MS_FILTER_GET_SAMPLE_RATE,\talsa_write_get_sample_rate},\n \t{MS_FILTER_SET_SAMPLE_RATE, alsa_write_set_sample_rate},\n \t{MS_FILTER_SET_NCHANNELS, alsa_write_set_nchannels},\n \t{0,NULL}\n"} {"commit":"e2bf0a89bbe220af8eadda254a2daeb55e3ac9b3","subject":"mt7697q: use to_spi_device instead of container_of","message":"mt7697q: use to_spi_device instead of container_of\n","repos":"mangOH\/mangOH,mangOH\/mangOH,mangOH\/mangOH,mangOH\/mangOH","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- linux_kernel_modules\/mt7697q\/spi.c\n+++ linux_kernel_modules\/mt7697q\/spi.c\n@@ -116,7 +116,7 @@\n \t\tgoto cleanup;\n \t}\n \n-\tspi = container_of(dev, struct spi_device, dev);\n+\tspi = to_spi_device(dev);\n \tif (!spi) {\n \t\tdev_err(&master->dev, \"%s(): get SPI device failed\\n\",\n \t\t\t__func__);\n@@ -229,7 +229,7 @@\n \t\tgoto cleanup;\n \t}\n \n-\tspi = container_of(dev, struct spi_device, dev);\n+\tspi = to_spi_device(dev);\n \tif (!spi) {\n \t\tdev_err(dev, \"%s(): get SPI device failed\\n\",\n \t\t\t__func__);\n"} {"commit":"369d79097303c224dd930f24b74e6867f1a0721e","subject":"Correct EDP register. This has fixed some device timeout problems. Patch by belu@hak.feldkirch.com; checked against linux.","message":"Correct EDP register. This has fixed some device timeout problems.\nPatch by belu@hak.feldkirch.com; checked against linux.\n\nI'd be nice if ppl having problems with these cards test this.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pcmcia\/if_xereg.h\n+++ dev\/pcmcia\/if_xereg.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: if_xereg.h,v 1.1 1999\/05\/18 19:18:21 niklas Exp $\t*\/\n+\/*\t$OpenBSD: if_xereg.h,v 1.2 2000\/09\/04 07:36:32 fgsch Exp $\t*\/\n \n \/*\n * Copyright (c) 1999 Niklas Hallqvist, C Stone, Job de Haas\n@@ -78,7 +78,7 @@\n #define CR\t0x0\t\/* W - Command register *\/\n #define ESR\t0x0\t\/* R - Ethernet status register *\/\n #define PR\t0x1\t\/* RW - Page register select *\/\n-#define EDP\t0x2\t\/* RW - Ethernet data port, 4 registers *\/\n+#define EDP\t0x4\t\/* RW - Ethernet data port, 4 registers *\/\n #define ISR0\t0x6\t\/* R - Etherenet interrupt status register *\/\n #define GIR\t0x7\t\/* RW - Global interrupt register *\/\n #define PTR\t0xd\t\/* R - Packets Transmitted register *\/\n"} {"commit":"49090ff9628fbf71419eeabc267b75f2784acfdb","subject":"Init error to 0 for sdmmc_mem_single_{read,write}_block otherwise the value would be uninitialised in the unlikely case of being called with length 0.","message":"Init error to 0 for sdmmc_mem_single_{read,write}_block\notherwise the value would be uninitialised in the unlikely\ncase of being called with length 0.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/sdmmc\/sdmmc_mem.c\n+++ dev\/sdmmc\/sdmmc_mem.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: sdmmc_mem.c,v 1.20 2014\/09\/23 12:08:13 rapha Exp $\t*\/\n+\/*\t$OpenBSD: sdmmc_mem.c,v 1.21 2015\/04\/22 04:02:06 jsg Exp $\t*\/\n \n \/*\n * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>\n@@ -621,7 +621,7 @@\n sdmmc_mem_single_read_block(struct sdmmc_function *sf, int blkno, u_char *data,\n size_t datalen)\n {\n-\tint error;\n+\tint error = 0;\n \tint i;\n \n \tfor (i = 0; i < datalen \/ sf->csd.sector_size; i++) {\n@@ -709,7 +709,7 @@\n sdmmc_mem_single_write_block(struct sdmmc_function *sf, int blkno, u_char *data,\n size_t datalen)\n {\n-\tint error;\n+\tint error = 0;\n \tint i;\n \n \tfor (i = 0; i < datalen \/ sf->csd.sector_size; i++) {\n"} {"commit":"6430b38c4f600c5fb04f1ed62b8e6debe9463699","subject":"cleanup: Make comment future proof. (#2927)","message":"cleanup: Make comment future proof. (#2927)\n\nRemove a comment referring to a soon-to-be-fixed bug.","repos":"googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp,googleapis\/google-cloud-cpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- google\/cloud\/bigtable\/internal\/common_client.h\n+++ google\/cloud\/bigtable\/internal\/common_client.h\n@@ -115,8 +115,7 @@\n } else {\n \/\/ Some other thread created the pool and saved it in `stubs_`. The work\n \/\/ in this thread was superfluous. We release the lock while clearing the\n- \/\/ channels to minimize contention. This seems to workaround other bugs\n- \/\/ inside Google.\n+ \/\/ channels to minimize contention.\n lk.unlock();\n tmp.clear();\n channels.clear();\n"} {"commit":"54174db300ee1bac632d62e4ac37fe02e47d1f18","subject":"[libata] ata_piix: add HP compaq laptop to short cable list","message":"[libata] ata_piix: add HP compaq laptop to short cable list\n\nReported by Andreas Messer.\n\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/ata_piix.c\n+++ drivers\/ata\/ata_piix.c\n@@ -598,6 +598,7 @@\n \t{ 0x27DF, 0x0005, 0x0280 },\t\/* ICH7 on Acer 5602WLMi *\/\n \t{ 0x27DF, 0x1025, 0x0110 },\t\/* ICH7 on Acer 3682WLMi *\/\n \t{ 0x27DF, 0x1043, 0x1267 },\t\/* ICH7 on Asus W5F *\/\n+\t{ 0x27DF, 0x103C, 0x30A1 },\t\/* ICH7 on HP Compaq nc2400 *\/\n \t{ 0x24CA, 0x1025, 0x0061 },\t\/* ICH4 on ACER Aspire 2023WLMi *\/\n \t\/* end marker *\/\n \t{ 0, }\n"} {"commit":"1ba5f4172f0bf8b5001ffcfc69118b62bf0fb78a","subject":"config.def.h: typo in comment.","message":"config.def.h: typo in comment.\n","repos":"google\/mt,google\/mt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- config.def.h\n+++ config.def.h\n@@ -1,7 +1,7 @@\n \n #define FONT \"-*-*-medium-r-*-*-*-120-75-75-*-70-*-*\"\n #define BOLDFONT \"-*-*-bold-r-*-*-*-120-75-75-*-70-*-*\"\n-\/* If italic is not availbel, fall back to bold. *\/\n+\/* If italic is not available, fall back to bold. *\/\n #define ITALICFONT \"-*-*-medium-o-*-*-*-120-75-75-*-70-*-*,\" BOLDFONT\n #define ITALICBOLDFONT \"-*-*-bold-o-*-*-*-120-75-75-*-70-*-*,\" BOLDFONT\n \n"} {"commit":"c611bed780a51222ece8eaf303c779ef82d9d253","subject":"ata_piix: ICH7 does not support correct MWDMA timings","message":"ata_piix: ICH7 does not support correct MWDMA timings\n\nSee Errata documentation. The recommended workaround is to use PIO4 instead\nwhich will we automatically do by flagging this mode not available.\n\nSigned-off-by: Alan Cox <0ac41fb6628926cf99699ec9ae2d310e0487b2a4@linux.intel.com>\nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/ata_piix.c\n+++ drivers\/ata\/ata_piix.c\n@@ -72,6 +72,7 @@\n *\tICH2 spec c #20\t- IDE PRD must not cross a 64K boundary\n *\t\t\t\t and must be dword aligned\n *\tICH2 spec c #24\t- UDMA mode 4,5 t85\/86 should be 6ns not 3.3\n+ *\tICH7\terrata #16\t- MWDMA1 timings are incorrect\n *\n * Should have been BIOS fixed:\n *\t450NX:\terrata #19\t- DMA hangs on old 450NX\n@@ -94,7 +95,7 @@\n #include <linux\/dmi.h>\n \n #define DRV_NAME\t\"ata_piix\"\n-#define DRV_VERSION\t\"2.12\"\n+#define DRV_VERSION\t\"2.13\"\n \n enum {\n \tPIIX_IOCFG\t\t= 0x54, \/* IDE I\/O configuration register *\/\n@@ -136,6 +137,7 @@\n \tich_pata_33,\t\t\/* ICH up to UDMA 33 only *\/\n \tich_pata_66,\t\t\/* ICH up to 66 Mhz *\/\n \tich_pata_100,\t\t\/* ICH up to UDMA 100 *\/\n+\tich_pata_100_nomwdma1,\t\/* ICH up to UDMA 100 but with no MWDMA1*\/\n \tich5_sata,\n \tich6_sata,\n \tich6m_sata,\n@@ -216,8 +218,8 @@\n \t\/* ICH6 (and 6) (i915) UDMA 100 *\/\n \t{ 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },\n \t\/* ICH7\/7-R (i945, i975) UDMA 100*\/\n-\t{ 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },\n-\t{ 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },\n+\t{ 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },\n+\t{ 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },\n \t\/* ICH8 Mobile PATA Controller *\/\n \t{ 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },\n \n@@ -487,6 +489,15 @@\n \t\t.port_ops\t= &ich_pata_ops,\n \t},\n \n+\t[ich_pata_100_nomwdma1] =\n+\t{\n+\t\t.flags\t\t= PIIX_PATA_FLAGS | PIIX_FLAG_CHECKINTR,\n+\t\t.pio_mask\t= ATA_PIO4,\n+\t\t.mwdma_mask\t= ATA_MWDMA2_ONLY,\n+\t\t.udma_mask\t= ATA_UDMA5,\n+\t\t.port_ops\t= &ich_pata_ops,\n+\t},\n+\n \t[ich5_sata] =\n \t{\n \t\t.flags\t\t= PIIX_SATA_FLAGS,\n"} {"commit":"da1171dc6e484d5ba04ff041b14d781e57a5f140","subject":"pfor_c for old C++ compilers, pfor_backward for backward iteration","message":"pfor_c for old C++ compilers, pfor_backward for backward iteration\n","repos":"massivethreads\/massivethreads,massivethreads\/massivethreads,massivethreads\/massivethreads,massivethreads\/massivethreads,massivethreads\/massivethreads","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/tpswitch\/tpswitch.h\n+++ src\/tpswitch\/tpswitch.h\n@@ -340,6 +340,8 @@\n \n *\/\n \n+#ifndef PFOR2_EXPERIMENTAL\n+\n #if PFOR_TO_ORIGINAL || PFOR_TO_BISECTION || PFOR_TO_ALLATONCE || PFOR_TO_ALLATONCE_2\n \n #if __cplusplus >= 201103L \n@@ -450,16 +452,16 @@\n \n #define pfor_allatonce_2(T, first, last, step, grainsize, S) \\\n do { \\\n- T eval_first = (first); \\\n- T eval_last = (last); \\\n mk_task_group; \\\n- T FIRST_ = eval_first; \\\n- T LAST_ = eval_first; \\\n- while (LAST_ < eval_last) { \\\n- LAST_ += (step) * (grainsize); \\\n- if (LAST_ > eval_last) LAST_ = eval_last; \\\n+ T _first = first; \\\n+ T _last = last; \\\n+ T last = first; \\\n+ while (last < _last) { \\\n+ last += step * grainsize; \\\n+ if (last > _last) last = _last; \\\n+ T FIRST_ = first, LAST_ = last; \\\n create_task0(spawn S); \\\n- FIRST_ = LAST_; \\\n+ first = last; \\\n } \\\n wait_tasks; \\\n } while (0)\n@@ -495,6 +497,320 @@\n #endif \/\/__cplusplus\n \n #endif \/\/ defined any PFOR_TO_XXX \n+#endif\/\/PFOR2_EXPERIMENTAL\n+\n+#ifdef PFOR2_EXPERIMENTAL\n+\n+\/*\n+ tpswitch parallel for (pfor)\n+ -->\n+ omp parallel for (OpenMP)\n+ cilk_for (Cilk Plus)\n+ mtbb::parallel_for (TBB-like)\n+\n+ pfor<IntTy, StepIntTy, LeafFuncTy>(IntTy FIRST, IntTy LAST, StepIntTy STEP, IntTy GRAINSIZE, LeafFuncTy LEAF(IntTy first, IntTy last))\n+ (STEP > 0, GRAINSIZE > 0)\n+\n+ pfor_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRSTVARIABLE, LASTVARIABLE, LEAF)\n+\n+ pfor_backward<IntTy, StepIntTy, LeafFuncTy>(IntTy FIRST, IntTy LAST, StepIntTy STEP, IntTy GRAINSIZE, LeafFuncTy LEAF(IntTy first, IntTy last))\n+ (STEP > 0, GRAINSIZE > 0)\n+\n+ pfor_backward_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRSTVARIABLE, LASTVARIABLE, LEAF)\n+\n+ Example:\n+\n+ \/\/original for version:\n+\n+ #include <stdio.h>\n+\n+ int main() {\n+ int first = 0;\n+ int last = 10;\n+ int step = 1;\n+ for(int i = first; i < last; i += step) {\n+ char s[100];\n+ for (int i = innerFirst; i < innerLast; i += step)\n+ printf(\"processing %d\\n\", i);\n+ }\n+ }\n+\n+ \/\/pfor version.\n+\n+ #include <stdio.h>\n+\n+ \/\/original for-loop parallelization if available (e.g., #omp parallel for)\n+ #define PFOR_TO_ORIGINAL\n+ \/\/iteration space is divided by two until it becomes less than a certain size.\n+ \/\/#define PFOR_TO_BISECTION\n+ \/\/all tasks are created by the parent\n+ \/\/#define PFOR_TO_ALLATONCE\n+\n+ #include \"tpswitch.h\"\n+\n+ int main() {\n+ int first = 0;\n+ int last = 10;\n+ int step = 1;\n+ int grainsize = 2;\n+ pfor(first, last, step, grainsize,\n+ [step] (int innerFirst, int innerLast) {\n+ char s[100];\n+ for (int i = innerFirst; i < innerLast; i += step)\n+ printf(\"processing %d\\n\", i);\n+ });\n+ }\n+\n+ \/\/pfor-c version.\n+\n+ #define PFOR_TO_ORIGINAL\n+ #include \"tpswitch.h\"\n+\n+ int main() {\n+ int first = 0;\n+ int last = 10;\n+ int step = 1;\n+ int grainsize = 2;\n+ pfor_c(int, first, last, step, grainsize, innerFirst, innerLast, {\n+ char s[100];\n+ for (int i = innerFirst; i < innerLast; i += step)\n+ printf(\"processing %d\\n\", i);\n+ });\n+ }\n+ \n+ \/\/pfor-backward version.\n+\n+ #include <stdio.h>\n+ #include \"tpswitch.h\"\n+\n+ int main() {\n+ int first = 10 - 1;\n+ int last = 0;\n+ int step = -1;\n+ int grainsize = 2;\n+ pfor_backward(first, last, step, grainsize,\n+ [step] (int innerFirst, int innerLast) {\n+ char s[100];\n+ for (int i = innerFirst; i >= innerLast; i += step)\n+ printf(\"processing %d\\n\", i);\n+ });\n+ }\n+\n+ \/\/pfor-backward-c version.\n+\n+ #include <stdio.h>\n+ #include \"tpswitch.h\"\n+\n+ int main() {\n+ int first = 10 - 1;\n+ int last = 0;\n+ int step = -1;\n+ int grainsize = 2;\n+ pfor_backward_c(int, first, last, step, grainsize, innerFirst, innerLast, {\n+ char s[100];\n+ for (int i = innerFirst; i >= innerLast; i += step)\n+ printf(\"processing %d\\n\", i);\n+ });\n+ }\n+*\/\n+\n+#if __cplusplus >= 201103L\n+ #if PFOR_TO_ORIGINAL\n+ #define PFOR_IMPL pfor_original\n+ #if TO_SERIAL\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_original(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ leaffunc(first,last);\n+ }\n+ #elif TO_OMP\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_original(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ const IntTy elementnum = (last - first) \/ step;\n+ const IntTy tasknum = elementnum \/ grainsize;\n+ pragma_omp(parallel for)\n+ for(IntTy i = 0; i < tasknum; i++) {\n+ IntTy leaf_first = first + i * step * grainsize;\n+ IntTy leaf_last = first + (i + 1) * step * grainsize;\n+ if (leaf_last > last)\n+ leaf_last = last;\n+ leaffunc(leaf_first,leaf_last);\n+ }\n+ }\n+ #elif TO_CILKPLUS\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_original(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ const IntTy elementnum = (last - first) \/ step;\n+ const IntTy tasknum = elementnum \/ grainsize;\n+ cilk_for (IntTy i = 0; i < tasknum; i++) {\n+ IntTy leaf_first = first + i * step * grainsize;\n+ IntTy leaf_last = first + (i + 1) * step * grainsize;\n+ if (leaf_last > last)\n+ leaf_last = last;\n+ leaffunc(leaf_first,leaf_last);\n+ }\n+ }\n+ #elif TO_TBB || TO_MTHREAD || TO_MTHREAD_NATIVE || TO_QTHREAD || TO_NANOX\n+ #include <mtbb\/parallel_for.h>\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_original(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ mtbb::parallel_for(first, last, step, grainsize, leaffunc);\n+ }\n+ #endif\n+ #elif PFOR_TO_BISECTION\n+ #define PFOR_IMPL pfor_bisection\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> void pfor_bisection_aux(IntTy first, IntTy a, IntTy b, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ cilk_begin;\n+ if (b - a <= grainsize) {\n+ leaffunc(first + a * step, first + b * step);\n+ } else {\n+ mk_task_group;\n+ const IntTy c = a + (b - a) \/ 2;\n+ create_task0_(spawn pfor_bisection_aux(first, a, c, step, grainsize, leaffunc, file, line), file, line);\n+ call_task (spawn pfor_bisection_aux(first, c, b, step, grainsize, leaffunc, file, line));\n+ wait_tasks_(file, line);\n+ }\n+ cilk_void_return;\n+ }\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_bisection(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ IntTy a = 0;\n+ IntTy b = (last - first + step - 1) \/ step;\n+ pfor_bisection_aux(first, a, b, step, grainsize, leaffunc, file, line);\n+ }\n+ #elif PFOR_TO_ALLATONCE\n+ #define PFOR_IMPL pfor_allatonce\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_allatonce_aux(IntTy first, IntTy a, IntTy b, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ cilk_begin;\n+ mk_task_group;\n+ IntTy ia = a;\n+ IntTy ib = a;\n+ while (ib < b) {\n+ ib += grainsize;\n+ if (ib > b)\n+ ib = b;\n+ create_task0_(spawn leaffunc(first + ia * step, first + ib * step), file, line);\n+ ia = ib;\n+ }\n+ wait_tasks;\n+ cilk_void_return;\n+ }\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void pfor_allatonce(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ IntTy a = 0;\n+ IntTy b = (last - first + step - 1) \/ step;\n+ pfor_allatonce_aux(first, a, b, step, grainsize, leaffunc, file, line);\n+ }\n+ #endif\n+ #ifdef PFOR_IMPL\n+ #include <type_traits>\n+ \/\/__VA_ARGS__ is to avoid the well-known comma-in-macro problem.\n+ \/\/std::decay is to get base type (i.e., remove const)\n+ #define pfor(FIRST, ...) PFOR_IMPL <std::decay<decltype(FIRST)>::type>(FIRST, __VA_ARGS__, __FILE__, __LINE__)\n+ #define pfor_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) PFOR_IMPL <INTTYPE>(FIRST, LAST, STEP, GRAINSIZE, [=](INTTYPE FIRST_VAR, INTTYPE LAST_VAR) {__VA_ARGS__}, __FILE__, __LINE__)\n+\n+ template<typename IntTy, typename StepIntTy, typename LeafFuncTy> static void PFOR_BACKWARD_IMPL(IntTy first, IntTy last, StepIntTy step, IntTy grainsize, LeafFuncTy leaffunc, const char * file, int line) {\n+ IntTy newfirst = 0;\n+ IntTy newlast = first - last + 1;\n+ IntTy newStep = -step;\n+ auto PFOR_BACKWARD_FUNC = [first, leaffunc] (IntTy _first, IntTy _last) -> void { \n+ leaffunc(first - _first, first - _last + 1);\n+ };\n+ PFOR_IMPL(newfirst, newlast, step, grainsize, PFOR_BACKWARD_FUNC, file, line);\n+ }\n+ #define pfor_backward(FIRST, ...) PFOR_BACKWARD_IMPL <std::decay<decltype(FIRST)>::type>(FIRST, __VA_ARGS__, __FILE__, __LINE__)\n+ #define pfor_backward_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) PFOR_BACKWARD_IMPL <INTTYPE>(FIRST, LAST, STEP, GRAINSIZE, [=](INTTYPE FIRST_VAR, INTTYPE LAST_VAR) {__VA_ARGS__}, __FILE__, __LINE__)\n+ #endif\n+#else\n+ \/\/old __cplusplus, so avoid to use lambda\n+ #if PFOR_TO_ORIGINAL\n+ #if TO_SERIAL\n+ #define pfor_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE FIRST_VAR=(FIRST);\\\n+ INTTYPE LAST_VAR =(LAST);\\\n+ {__VA_ARGS__};\\\n+ } while(0)\n+ #define pfor_backward_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE FIRST_VAR=(FIRST);\\\n+ INTTYPE LAST_VAR =(LAST);\\\n+ {__VA_ARGS__};\\\n+ } while(0)\n+ #elif TO_OMP\n+ #define pfor_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE eval_first = (FIRST);\\\n+ INTTYPE eval_last = (LAST);\\\n+ int eval_step = (STEP);\\\n+ INTTYPE eval_grainsize = (GRAINSIZE);\\\n+ const INTTYPE MACRO_elementnum = (eval_last - eval_first) \/ eval_step;\\\n+ const INTTYPE MACRO_tasknum = MACRO_elementnum \/ eval_grainsize;\\\n+ pragma_omp(parallel for)\\\n+ for(INTTYPE MACRO_i = 0; MACRO_i < MACRO_tasknum; MACRO_i++) {\\\n+ INTTYPE FIRST_VAR = eval_first + MACRO_i * eval_step * eval_grainsize;\\\n+ INTTYPE LAST_VAR = eval_first + (MACRO_i + 1) * eval_step * eval_grainsize;\\\n+ if (LAST_VAR > eval_last)\\\n+ LAST_VAR = eval_last;\\\n+ {__VA_ARGS__};\\\n+ }\\\n+ } while(0)\n+ #define pfor_backward_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE eval_first = (FIRST);\\\n+ INTTYPE eval_last = (LAST);\\\n+ int eval_step = (STEP);\\\n+ INTTYPE eval_grainsize = (GRAINSIZE);\\\n+ const INTTYPE MACRO_elementnum = (eval_last - eval_first) \/ eval_step;\\\n+ const INTTYPE MACRO_tasknum = MACRO_elementnum \/ eval_grainsize;\\\n+ pragma_omp(parallel for)\\\n+ for(INTTYPE MACRO_i = 0; MACRO_i < MACRO_tasknum; MACRO_i++) {\\\n+ INTTYPE FIRST_VAR = eval_first + MACRO_i * eval_step * eval_grainsize;\\\n+ INTTYPE LAST_VAR = eval_first + (MACRO_i + 1) * eval_step * eval_grainsize;\\\n+ if (LAST_VAR < eval_last)\\\n+ LAST_VAR = eval_last;\\\n+ {__VA_ARGS__};\\\n+ }\\\n+ } while(0)\n+ #elif TO_CILKPLUS\n+ #define pfor_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE eval_first = (FIRST);\\\n+ INTTYPE eval_last = (LAST);\\\n+ int eval_step = (STEP);\\\n+ INTTYPE eval_grainsize = (GRAINSIZE);\\\n+ const INTTYPE MACRO_elementnum = (eval_last - eval_first) \/ eval_step;\\\n+ const INTTYPE MACRO_tasknum = MACRO_elementnum \/ eval_grainsize;\\\n+ cilk_for(INTTYPE MACRO_i = 0; MACRO_i < MACRO_tasknum; MACRO_i++) {\\\n+ INTTYPE FIRST_VAR = eval_first + MACRO_i * eval_step * eval_grainsize;\\\n+ INTTYPE LAST_VAR = eval_first + (MACRO_i + 1) * eval_step * eval_grainsize;\\\n+ if (LAST_VAR > eval_last)\\\n+ LAST_VAR = eval_last;\\\n+ {__VA_ARGS__};\\\n+ }\\\n+ } while(0)\n+ #define pfor_backward_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) \\\n+ do {\\\n+ INTTYPE eval_first = (FIRST);\\\n+ INTTYPE eval_last = (LAST);\\\n+ int eval_step = (STEP);\\\n+ INTTYPE eval_grainsize = (GRAINSIZE);\\\n+ const INTTYPE MACRO_elementnum = (eval_last - eval_first) \/ eval_step;\\\n+ const INTTYPE MACRO_tasknum = MACRO_elementnum \/ eval_grainsize;\\\n+ cilk_for(INTTYPE MACRO_i = 0; MACRO_i < MACRO_tasknum; MACRO_i++) {\\\n+ INTTYPE FIRST_VAR = eval_first + MACRO_i * eval_step * eval_grainsize;\\\n+ INTTYPE LAST_VAR = eval_first + (MACRO_i + 1) * eval_step * eval_grainsize;\\\n+ if (LAST_VAR < eval_last)\\\n+ LAST_VAR = eval_last;\\\n+ {__VA_ARGS__};\\\n+ }\\\n+ } while(0)\n+ #elif TO_TBB || TO_MTHREAD || TO_MTHREAD_NATIVE || TO_QTHREAD || TO_NANOX\n+ #error \"error: pfor (parallel for) for tbb\/mth\/qth\/nanox needs C++11; add a flag -std=c++11\"\n+ #endif\n+ #define pfor_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) pfor_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, __VA_ARGS__)\n+ #define pfor_backward_c(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, ...) pfor_backward_original_no_cpp11(INTTYPE, FIRST, LAST, STEP, GRAINSIZE, FIRST_VAR, LAST_VAR, __VA_ARGS__)\n+ #elif PFOR_TO_BISECTION\n+ #error \"error: pfor_bisecion (parallel for) needs C++11; add a flag -std=c++11\"\n+ #elif PFOR_TO_ALLATONCE\n+ #error \"error: pfor_allatonce (parallel for) needs C++11; add a flag -std=c++11\"\n+ #endif\n+#endif\n+\n+#endif\/\/PFOR2_EXPERIMENTAL\n \n #if TO_TBB\n \/\/It is necessary in tp_init()\n"} {"commit":"285203c8ff541a775f27148c06c58b96822d8b68","subject":"floppy: initialize debug jiffies offset","message":"floppy: initialize debug jiffies offset\n\nSet debug jiffies offset at initialization. Avoids wierd values showing\nup if debugging enabled.\n\nSigned-off-by: Stephen Hemminger <a072e933f45880fe04500ea083d5c7f6e81a06f0@vyatta.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Jens Axboe <08e836a620179c237f631ad0545a7ebdf54201f3@fusionio.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/block\/floppy.c\n+++ drivers\/block\/floppy.c\n@@ -4175,6 +4175,9 @@\n \tint i, unit, drive;\n \tint err, dr;\n \n+\tset_debugt();\n+\tinterruptjiffies = resultjiffies = jiffies;\n+\n #if defined(CONFIG_PPC)\n \tif (check_legacy_ioport(FDC1))\n \t\treturn -ENODEV;\n"} {"commit":"50d536db48403f9f8eb8f1a50adbb20350bae133","subject":"made the output of example.c more useful","message":"made the output of example.c more useful\n","repos":"deoxxa\/libmcnet,deoxxa\/libmcnet","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -112,8 +112,9 @@\n break;\n }\n \n- printf(\"parsed %d bytes\\n\", nparsed);\n offset += nparsed;\n+\n+ printf(\"parsed %d bytes and %d total\\n\", nparsed, offset);\n }\n \n return 0;\n"} {"commit":"5bb46a898e6565e5bc1ee861999384f806f83831","subject":"Rename cleanup","message":"Rename cleanup\n","repos":"Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd,Cyan4973\/zstd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/randomDictBuilder\/main.c\n+++ contrib\/randomDictBuilder\/main.c\n@@ -114,7 +114,7 @@\n if (ZDICT_isError(dictSize)) {\n DISPLAYLEVEL(1, \"dictionary training failed : %s \\n\", ZDICT_getErrorName(dictSize)); \/* should not happen *\/\n result = 1;\n- goto _cleanup;\n+ goto _done;\n }\n \/* save dict *\/\n DISPLAYLEVEL(2, \"Save dictionary of size %u into file %s \\n\", (U32)dictSize, dictFileName);\n@@ -122,7 +122,7 @@\n }\n \n \/* clean up *\/\n-_cleanup:\n+_done:\n free(dictBuffer);\n return result;\n }\n"} {"commit":"69506e19e020e0b8ab1621062bd64e2296deca33","subject":"drivers: can: rcar: drop DEV_DATA\/DEV_CFG usage","message":"drivers: can: rcar: drop DEV_DATA\/DEV_CFG usage\n\nStop using redundant DEV_DATA\/DEV_CFG macros and use dev->data and\ndev->config instead.\nFollows #41918.\n\nSigned-off-by: Aymeric Aillet <50ecb97e8539231bfe69207a233bb1580c5def34@iot.bzh>\n","repos":"zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/can\/can_rcar.c\n+++ drivers\/can\/can_rcar.c\n@@ -205,11 +205,6 @@\n \tenum can_state state;\n };\n \n-#define DEV_CAN_CFG(dev) \\\n-\t((const struct can_rcar_cfg *)(dev)->config)\n-\n-#define DEV_CAN_DATA(dev) ((struct can_rcar_data *const)(dev)->data)\n-\n static inline uint16_t can_rcar_read16(const struct can_rcar_cfg *config,\n \t\t\t\t uint32_t offs)\n {\n@@ -224,7 +219,7 @@\n \n static void can_rcar_tx_done(const struct device *dev)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tstruct can_rcar_data *data = dev->data;\n \tstruct can_rcar_tx_cb *tx_cb;\n \n \ttx_cb =\t&data->tx_cb[data->tx_tail];\n@@ -251,8 +246,8 @@\n \n static void can_rcar_state_change(const struct device *dev, uint32_t newstate)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tconst can_state_change_callback_t cb = data->state_change_cb;\n \tvoid *state_change_cb_data = data->state_change_cb_data;\n \tstruct can_bus_err_cnt err_cnt;\n@@ -274,7 +269,7 @@\n \n static void can_rcar_error(const struct device *dev)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n \tuint8_t eifr, ecsr;\n \n \teifr = sys_read8(config->reg_addr + RCAR_CAN_EIFR);\n@@ -394,8 +389,8 @@\n \n static void can_rcar_rx_isr(const struct device *dev)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tstruct zcan_frame frame;\n \tuint32_t val;\n \tint i;\n@@ -445,8 +440,8 @@\n \n static void can_rcar_isr(const struct device *dev)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tuint8_t isr, unsent;\n \n \tisr = sys_read8(config->reg_addr + RCAR_CAN_ISR);\n@@ -570,8 +565,8 @@\n \n int can_rcar_set_mode(const struct device *dev, enum can_mode mode)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tuint8_t tcr = 0;\n \tint ret = 0;\n \n@@ -637,8 +632,8 @@\n \t\t\tconst struct can_timing *timing,\n \t\t\tconst struct can_timing *timing_data)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tint ret = 0;\n \n \tARG_UNUSED(timing_data);\n@@ -665,7 +660,7 @@\n \t\t\t\t\t can_state_change_callback_t cb,\n \t\t\t\t\t void *user_data)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tstruct can_rcar_data *data = dev->data;\n \n \tdata->state_change_cb = cb;\n \tdata->state_change_cb_data = user_data;\n@@ -674,8 +669,8 @@\n static int can_rcar_get_state(const struct device *dev, enum can_state *state,\n \t\t\t struct can_bus_err_cnt *err_cnt)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \n \tif (state != NULL) {\n \t\t*state = data->state;\n@@ -691,8 +686,8 @@\n #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY\n int can_rcar_recover(const struct device *dev, k_timeout_t timeout)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tint64_t start_time;\n \tint ret;\n \n@@ -728,8 +723,8 @@\n \t\t k_timeout_t timeout, can_tx_callback_t callback,\n \t\t void *user_data)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tstruct can_rcar_tx_cb *tx_cb;\n \tuint32_t identifier;\n \tint i;\n@@ -809,7 +804,7 @@\n \t\t\t\t\t\t void *cb_arg,\n \t\t\t\t\t\t const struct zcan_filter *filter)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tstruct can_rcar_data *data = dev->data;\n \tint i;\n \n \tfor (i = 0; i < CONFIG_CAN_RCAR_MAX_FILTER; i++) {\n@@ -828,7 +823,7 @@\n int can_rcar_add_rx_filter(const struct device *dev, can_rx_callback_t cb,\n \t\t\t void *cb_arg, const struct zcan_filter *filter)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tstruct can_rcar_data *data = dev->data;\n \tint filter_id;\n \n \tk_mutex_lock(&data->rx_mutex, K_FOREVER);\n@@ -839,7 +834,7 @@\n \n void can_rcar_remove_rx_filter(const struct device *dev, int filter_id)\n {\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tstruct can_rcar_data *data = dev->data;\n \n \tif (filter_id >= CONFIG_CAN_RCAR_MAX_FILTER) {\n \t\treturn;\n@@ -853,8 +848,8 @@\n \n static int can_rcar_init(const struct device *dev)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n-\tstruct can_rcar_data *data = DEV_CAN_DATA(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n+\tstruct can_rcar_data *data = dev->data;\n \tstruct can_timing timing;\n \tint ret;\n \tuint16_t ctlr;\n@@ -994,7 +989,7 @@\n \n static int can_rcar_get_core_clock(const struct device *dev, uint32_t *rate)\n {\n-\tconst struct can_rcar_cfg *config = DEV_CAN_CFG(dev);\n+\tconst struct can_rcar_cfg *config = dev->config;\n \n \t*rate = config->bus_clk.rate;\n \treturn 0;\n"} {"commit":"17b223116ab9bc9f5648651875abd61601dabbd8","subject":"compiling","message":"compiling\n","repos":"adamrenner\/mqtt-sn-tools-contiki,adamrenner\/mqtt-sn-tools-contiki,adamrenner\/mqtt-sn-tools-contiki","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -43,8 +43,8 @@\n \n #define UDP_PORT 1884\n \n+#define REQUEST_RETRIES 4\n #define DEFAULT_SEND_INTERVAL\t\t(10 * CLOCK_SECOND)\n-#define SEND_TIME\t\t(random_rand() % (SEND_INTERVAL))\n #define REPLY_TIMEOUT (3 * CLOCK_SECOND)\n \n static struct mqtt_sn_connection mqtt_sn_c;\n@@ -63,30 +63,10 @@\n static uint8_t send_interval = DEFAULT_SEND_INTERVAL;\n \/\/uint8_t debug = FALSE;\n \n-enum ctrl_subscription_status\n-{\n- CTRL_UNSUBSCRIBED = 0,\n- CTRL_WAITING_SUBACK,\n- CTRL_SUBSCRIBE_FAILED,\n- CTRL_SUBSCRIBED\n-};\n-\n-enum mqtt_sn_registration_status\n-{\n- MQTTSN_UNREGISTERED=0,\n- MQTTSN_WAITING_REGACK,\n- MQTTSN_REGISTER_FAILED,\n- MQTTSN_REGISTERED\n-};\n-\n static enum mqttsn_connection_status connection_state = MQTTSN_DISCONNECTED;\n-static enum mqtt_sn_registration_status registration_state = MQTTSN_UNREGISTERED;\n-static enum ctrl_subscription_status ctrl_subscription_state = CTRL_UNSUBSCRIBED;\n \n \/*A few events for managing device state*\/\n static process_event_t mqttsn_connack_event;\n-static process_event_t mqttsn_regack_event;\n-static process_event_t ctrl_suback_event;\n \n PROCESS(example_mqttsn_process, \"Configure Connection and Topic Registration\");\n PROCESS(publish_process, \"register topic and publish data\");\n@@ -124,7 +104,6 @@\n if (incoming_regack.message_id == reg_topic_msg_id) {\n if (incoming_regack.return_code == ACCEPTED) {\n publisher_topic_id = uip_htons(incoming_regack.topic_id);\n- process_post(&publish_process,mqttsn_regack_event, NULL);\n } else {\n printf(\"Regack error: %s\\n\", mqtt_sn_return_code_string(incoming_regack.return_code));\n }\n@@ -140,7 +119,6 @@\n if (incoming_suback.message_id == ctrl_topic_msg_id) {\n if (incoming_suback.return_code == ACCEPTED) {\n ctrl_topic_id = uip_htons(incoming_suback.topic_id);\n- process_post(&ctrl_subscription_process,ctrl_suback_event, NULL);\n } else {\n printf(\"Suback error: %s\\n\", mqtt_sn_return_code_string(incoming_suback.return_code));\n }\n@@ -177,14 +155,6 @@\n \n \/*---------------------------------------------------------------------------*\/\n \/*this process will publish data at regular intervals*\/\n-static struct ctimer registration_timer;\n-static process_event_t registration_timeout_event;\n-\n-static void registration_timer_callback(void *mqc)\n-{\n- process_post(&publish_process, registration_timeout_event, NULL);\n-}\n-\n PROCESS_THREAD(publish_process, ev, data)\n {\n static uint8_t registration_tries;\n@@ -192,41 +162,28 @@\n static uint8_t buf_len;\n static uint8_t message_number;\n static char buf[20];\n+ static mqtt_sn_register_request *rreq;\n \n PROCESS_BEGIN();\n memcpy(pub_topic,device_id,16);\n- mqttsn_regack_event = process_alloc_event();\n printf(\"registering topic\\n\");\n registration_tries =0;\n- registration_timeout_event = process_alloc_event();\n- ctimer_set( ®istration_timer, REPLY_TIMEOUT, registration_timer_callback, NULL);\n- reg_topic_msg_id = mqtt_sn_send_register(&mqtt_sn_c, pub_topic);\n- registration_state = MQTTSN_WAITING_REGACK;\n- while (registration_tries < 4)\n+ while (registration_tries < REQUEST_RETRIES)\n {\n- PROCESS_WAIT_EVENT();\n- if (ev == registration_timeout_event)\n- {\n- registration_state = MQTTSN_REGISTER_FAILED;\n+ reg_topic_msg_id = mqtt_sn_register_try(rreq,&mqtt_sn_c,pub_topic,REPLY_TIMEOUT);\n+ PROCESS_WAIT_EVENT_UNTIL(mqtt_sn_request_returned(rreq));\n+ if (mqtt_sn_request_success(rreq)) {\n+ registration_tries = 4;\n+ printf(\"registration acked\\n\");\n+ }\n+ else {\n registration_tries++;\n- printf(\"registration timeout\\n\");\n- ctimer_restart(®istration_timer);\n- if (registration_tries < 4) {\n- reg_topic_msg_id = mqtt_sn_send_register(&mqtt_sn_c, pub_topic);\n- registration_state = MQTTSN_WAITING_REGACK;\n+ if (rreq->state == MQTTSN_REQUEST_FAILED) {\n+ printf(\"Regack error: %s\\n\", mqtt_sn_return_code_string(rreq->return_code));\n }\n }\n- else if (ev == mqttsn_regack_event)\n- {\n- \/\/if success\n- printf(\"registration acked\\n\");\n- ctimer_stop(®istration_timer);\n- registration_state = MQTTSN_REGISTERED;\n- registration_tries = 4;\/\/using break here may mess up switch statement of process\n- }\n- }\n- ctimer_stop(®istration_timer);\n- if (registration_state == MQTTSN_REGISTERED){\n+ }\n+ if (mqtt_sn_request_success(rreq)){\n \/\/start topic publishing to topic at regular intervals\n etimer_set(&send_timer, send_interval);\n while(1)\n@@ -242,59 +199,32 @@\n } else {\n printf(\"unable to register topic\\n\");\n }\n-\n PROCESS_END();\n }\n \n \/*---------------------------------------------------------------------------*\/\n \/*this process will create a subscription and monitor for incoming traffic*\/\n-static struct ctimer subscription_timer;\n-static process_event_t subscription_timeout_event;\n-\n-static void subscription_timer_callback(void *mqc)\n-{\n- process_post(&ctrl_subscription_process, subscription_timeout_event, NULL);\n-}\n-\n PROCESS_THREAD(ctrl_subscription_process, ev, data)\n {\n static uint8_t subscription_tries;\n+ static mqtt_sn_register_request *sreq;\n PROCESS_BEGIN();\n- ctrl_suback_event = process_alloc_event();\n subscription_tries = 0;\n memcpy(ctrl_topic,device_id,16);\n- subscription_timeout_event = process_alloc_event();\n- ctimer_set( &subscription_timer, REPLY_TIMEOUT, subscription_timer_callback, NULL);\n- \/\/request subscription\n- ctrl_topic_msg_id = mqtt_sn_send_subscribe(&mqtt_sn_c,ctrl_topic,0);\/\/QOS 1 currently unsupported on client\n- ctrl_subscription_state = CTRL_WAITING_SUBACK;\n- while(subscription_tries < 10) {\n- PROCESS_WAIT_EVENT();\n- if (ev == subscription_timeout_event)\n- {\n- ctrl_subscription_state = CTRL_SUBSCRIBE_FAILED;\n+ while(subscription_tries < REQUEST_RETRIES) {\n+ ctrl_topic_msg_id = mqtt_sn_subscribe_try(sreq,&mqtt_sn_c,pub_topic,0,REPLY_TIMEOUT);\n+ PROCESS_WAIT_EVENT_UNTIL(mqtt_sn_request_returned(sreq));\n+ if (mqtt_sn_request_success(sreq)) {\n+ subscription_tries = 4;\n+ printf(\"subscription acked\\n\");\n+ }\n+ else {\n subscription_tries++;\n- printf(\"subscription timeout\\n\");\n- ctimer_restart(&subscription_timer);\n- if (subscription_tries < 10) {\n- ctrl_topic_msg_id = mqtt_sn_send_subscribe(&mqtt_sn_c,ctrl_topic,0);\/\/QOS 1 currently unsupported on client\n- ctrl_subscription_state = CTRL_WAITING_SUBACK;\n+ if (sreq->state == MQTTSN_REQUEST_FAILED) {\n+ printf(\"Suback error: %s\\n\", mqtt_sn_return_code_string(sreq->return_code));\n }\n }\n- else if (ev == ctrl_suback_event)\n- {\n- \/\/if success\n- printf(\"subscription to control topic acked\\n\");\n- ctimer_stop(&subscription_timer);\n- ctrl_subscription_state = CTRL_SUBSCRIBED;\n- subscription_tries = 10;\/\/using break here may mess up switch statement of process\n- }\n- }\n- if (ctrl_subscription_state != CTRL_SUBSCRIBED) {\n- printf(\"subscription to control topic failed\\n\");\n- }\n- ctimer_stop(&subscription_timer);\n-\n+ }\n PROCESS_END();\n }\n \n"} {"commit":"6a05bd38860f9e5da9cd4abcb61fda2ced081344","subject":"egl: silence dmabuf error when extension is not present","message":"egl: silence dmabuf error when extension is not present\n\nThis makes it match 4bf936360d42fb5b96a44fd17028ae66fc462362.\n","repos":"ascent12\/wlroots,swaywm\/wlroots,swaywm\/wlroots,SirCmpwn\/wlroots,ascent12\/wlroots","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- render\/egl.c\n+++ render\/egl.c\n@@ -474,7 +474,7 @@\n \t\tint format, uint64_t **modifiers) {\n \tif (!egl->egl_exts.dmabuf_import ||\n \t\t!egl->egl_exts.dmabuf_import_modifiers) {\n-\t\twlr_log(L_ERROR, \"dmabuf extension not present\");\n+\t\twlr_log(L_DEBUG, \"dmabuf extension not present\");\n \t\treturn -1;\n \t}\n \n"} {"commit":"77b90349ad4c49346397d256772f508ebeaa70f5","subject":"+PCL_EXPORTS","message":"+PCL_EXPORTS\n\n\ngit-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@3737 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"mikhail-matrosov\/pcl,mschoeler\/pcl,zavataafnan\/pcl-truck,3dtof\/pcl,Nerei\/pcl_old_repo,pkuhto\/pcl,the-glu\/pcl,wgapl\/pcl,msalvato\/pcl_kinfu_highres,lydhr\/pcl,drmateo\/pcl,stefanbuettner\/pcl,damienjadeduff\/pcl,mikhail-matrosov\/pcl,wgapl\/pcl,wgapl\/pcl,pkuhto\/pcl,kanster\/pcl,locnx1984\/pcl,fskuka\/pcl,kanster\/pcl,ResByte\/pcl,zavataafnan\/pcl-truck,KevenRing\/vlp,soulsheng\/pcl,fanxiaochen\/mypcltest,mschoeler\/pcl,shyamalschandra\/pcl,shyamalschandra\/pcl,chatchavan\/pcl,mikhail-matrosov\/pcl,KevenRing\/vlp,DaikiMaekawa\/pcl,fskuka\/pcl,mschoeler\/pcl,raydtang\/pcl,mikhail-matrosov\/pcl,shivmalhotra\/pcl,jeppewalther\/kinfu_segmentation,DaikiMaekawa\/pcl,nikste\/pcl,lebronzhang\/pcl,shangwuhencc\/pcl,Nerei\/pcl_old_repo,Tabjones\/pcl,v4hn\/pcl,damienjadeduff\/pcl,jakobwilm\/pcl,chatchavan\/pcl,shivmalhotra\/pcl,closerbibi\/pcl,LZRS\/pcl,simonleonard\/pcl,closerbibi\/pcl,wgapl\/pcl,fanxiaochen\/mypcltest,shangwuhencc\/pcl,MMiknis\/pcl,KevenRing\/vlp,msalvato\/pcl_kinfu_highres,sbec\/pcl,kanster\/pcl,cascheberg\/pcl,nikste\/pcl,jeppewalther\/kinfu_segmentation,damienjadeduff\/pcl,zhangxaochen\/pcl,cascheberg\/pcl,DaikiMaekawa\/pcl,nh2\/pcl,drmateo\/pcl,pkuhto\/pcl,the-glu\/pcl,ipa-rmb\/pcl,sbec\/pcl,sbec\/pcl,closerbibi\/pcl,stfuchs\/pcl,lebronzhang\/pcl,ipa-rmb\/pcl,mschoeler\/pcl,Tabjones\/pcl,lydhr\/pcl,closerbibi\/pcl,nh2\/pcl,shivmalhotra\/pcl,RufaelDev\/pcc-mp3dg,pkuhto\/pcl,Tabjones\/pcl,lebronzhang\/pcl,srbhprajapati\/pcl,stefanbuettner\/pcl,simonleonard\/pcl,jeppewalther\/kinfu_segmentation,chatchavan\/pcl,krips89\/pcl_newfeatures,3dtof\/pcl,raydtang\/pcl,zavataafnan\/pcl-truck,jeppewalther\/kinfu_segmentation,DaikiMaekawa\/pcl,RufaelDev\/pcc-mp3dg,starius\/pcl,starius\/pcl,lydhr\/pcl,chatchavan\/pcl,stefanbuettner\/pcl,chenxingzhe\/pcl,shyamalschandra\/pcl,KevenRing\/vlp,mikhail-matrosov\/pcl,nikste\/pcl,DaikiMaekawa\/pcl,cascheberg\/pcl,wgapl\/pcl,Nerei\/pcl_old_repo,simonleonard\/pcl,soulsheng\/pcl,the-glu\/pcl,RufaelDev\/pcc-mp3dg,lydhr\/pcl,lebronzhang\/pcl,MMiknis\/pcl,nikste\/pcl,locnx1984\/pcl,shyamalschandra\/pcl,msalvato\/pcl_kinfu_highres,LZRS\/pcl,KevenRing\/pcl,krips89\/pcl_newfeatures,3dtof\/pcl,v4hn\/pcl,Tabjones\/pcl,Tabjones\/pcl,chenxingzhe\/pcl,lydhr\/pcl,MMiknis\/pcl,stfuchs\/pcl,fanxiaochen\/mypcltest,zhangxaochen\/pcl,lebronzhang\/pcl,locnx1984\/pcl,MMiknis\/pcl,KevenRing\/pcl,ResByte\/pcl,simonleonard\/pcl,RufaelDev\/pcc-mp3dg,3dtof\/pcl,srbhprajapati\/pcl,mschoeler\/pcl,LZRS\/pcl,KevenRing\/pcl,shivmalhotra\/pcl,jakobwilm\/pcl,cascheberg\/pcl,jakobwilm\/pcl,msalvato\/pcl_kinfu_highres,shivmalhotra\/pcl,nh2\/pcl,cascheberg\/pcl,simonleonard\/pcl,locnx1984\/pcl,ipa-rmb\/pcl,zavataafnan\/pcl-truck,sbec\/pcl,KevenRing\/pcl,raydtang\/pcl,KevenRing\/vlp,zhangxaochen\/pcl,zhangxaochen\/pcl,jakobwilm\/pcl,soulsheng\/pcl,fskuka\/pcl,fskuka\/pcl,RufaelDev\/pcc-mp3dg,raydtang\/pcl,v4hn\/pcl,starius\/pcl,nikste\/pcl,stfuchs\/pcl,nh2\/pcl,shyamalschandra\/pcl,shangwuhencc\/pcl,sbec\/pcl,KevenRing\/pcl,zavataafnan\/pcl-truck,locnx1984\/pcl,zhangxaochen\/pcl,ResByte\/pcl,stfuchs\/pcl,raydtang\/pcl,krips89\/pcl_newfeatures,starius\/pcl,jeppewalther\/kinfu_segmentation,kanster\/pcl,Nerei\/pcl_old_repo,srbhprajapati\/pcl,drmateo\/pcl,LZRS\/pcl,ipa-rmb\/pcl,srbhprajapati\/pcl,krips89\/pcl_newfeatures,MMiknis\/pcl,kanster\/pcl,shangwuhencc\/pcl,LZRS\/pcl,shangwuhencc\/pcl,soulsheng\/pcl,the-glu\/pcl,damienjadeduff\/pcl,chenxingzhe\/pcl,stefanbuettner\/pcl,ipa-rmb\/pcl,msalvato\/pcl_kinfu_highres,chenxingzhe\/pcl,pkuhto\/pcl,fanxiaochen\/mypcltest,krips89\/pcl_newfeatures,stfuchs\/pcl,stefanbuettner\/pcl,drmateo\/pcl,ResByte\/pcl,soulsheng\/pcl,damienjadeduff\/pcl,drmateo\/pcl,v4hn\/pcl,closerbibi\/pcl,3dtof\/pcl,fskuka\/pcl,fanxiaochen\/mypcltest,chenxingzhe\/pcl,srbhprajapati\/pcl,starius\/pcl,the-glu\/pcl,jakobwilm\/pcl,ResByte\/pcl,v4hn\/pcl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- visualization\/include\/pcl\/visualization\/common\/actor_map.h\n+++ visualization\/include\/pcl\/visualization\/common\/actor_map.h\n@@ -48,7 +48,7 @@\n {\n namespace visualization\n {\n- class CloudActor\n+ class PCL_EXPORTS CloudActor\n {\n typedef PointCloudGeometryHandler<sensor_msgs::PointCloud2> GeometryHandler;\n typedef GeometryHandler::Ptr GeometryHandlerPtr;\n"} {"commit":"0d22e6038b4af3cf41647d32fdb6a3ac20b94eb4","subject":"Do some tracepath test validation","message":"Do some tracepath test validation\n","repos":"perfsonar\/bwctl,perfsonar\/bwctl,perfsonar\/bwctl,perfsonar\/bwctl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bwlib\/tracepath.c\n+++ bwlib\/tracepath.c\n@@ -109,6 +109,47 @@\n \n return (tracepath_available || tracepath6_available);\n }\n+\n+static BWLBoolean\n+TracepathValidateTest(\n+ BWLContext ctx,\n+ BWLToolDefinition tool,\n+ BWLTestSpec test_spec\n+ )\n+{\n+ if(test_spec.traceroute_first_ttl){\n+ BWLError(ctx,BWLErrFATAL,EINVAL,\n+ \"TracepathValidateTest(): Tracepath does not support setting the TTL\");\n+ return False;\n+ }\n+\n+ if(test_spec.traceroute_last_ttl){\n+ BWLError(ctx,BWLErrFATAL,EINVAL,\n+ \"TracepathValidateTest(): Tracepath does not support setting the TTL\");\n+ return False;\n+ }\n+\n+ if(test_spec.traceroute_packet_size){\n+ BWLError(ctx,BWLErrFATAL,EINVAL,\n+ \"TracepathValidateTest(): Tracepath does not support setting the packet size\");\n+ return False;\n+ }\n+\n+ if(test_spec.outformat){\n+ switch((char)test_spec.outformat){\n+ case 'a':\n+ break;\n+ default:\n+ BWLError(ctx,BWLErrFATAL,EINVAL,\n+ \"TracepathValidateTest(): Invalid out format (-y) specification %c\",\n+ (char)test_spec.outformat);\n+ return False;\n+ }\n+ }\n+\n+ return _BWLToolGenericValidateTest(ctx, tool, test_spec);\n+}\n+\n \n \/*\n * Function: TracepathPreRunTest\n@@ -200,19 +241,14 @@\n *\/\n TracepathArgs[a++] = cmd;\n \n- if(tsess->test_spec.traceroute_first_ttl){\n- BWLError(tsess->cntrl->ctx,BWLErrFATAL,EINVAL,\n- \"TracepathPreRunTest(): Tracepath does not support setting the TTL\");\n- }\n-\n- if(tsess->test_spec.traceroute_last_ttl){\n- BWLError(tsess->cntrl->ctx,BWLErrFATAL,EINVAL,\n- \"TracepathPreRunTest(): Tracepath does not support setting the TTL\");\n- }\n-\n- if(tsess->test_spec.traceroute_packet_size){\n- BWLError(tsess->cntrl->ctx,BWLErrFATAL,EINVAL,\n- \"TracepathPreRunTest(): Tracepath does not support setting the packet size\");\n+ if(tsess->test_spec.outformat){\n+ switch((char)tsess->test_spec.outformat){\n+ case 'a':\n+ TracepathArgs[a++] = \"-n\";\n+ break;\n+ default:\n+ break;\n+ }\n }\n \n getnameinfo((struct sockaddr *)rsaddr, rsaddrlen, rsaddr_str, sizeof(rsaddr_str), 0, 0, NI_NUMERICHOST);\n@@ -328,7 +364,7 @@\n BWLGenericParseTracerouteParameters, \/* parse_request *\/\n BWLGenericUnparseTracerouteParameters, \/* unparse_request *\/\n TracepathAvailable, \/* tool_avail *\/\n- _BWLToolGenericValidateTest, \/* validate_test *\/\n+ TracepathValidateTest, \/* validate_test *\/\n TracepathInitTest, \/* init_test *\/\n TracepathPreRunTest, \/* pre_run *\/\n TracepathRunTest, \/* run *\/\n"} {"commit":"48820cf601a9bdf4e304f063c37c5a4e46904c11","subject":"char: dcc_tty: Update for spinlock changes","message":"char: dcc_tty: Update for spinlock changes\n\nThere is no longer a SPIN_LOCK_UNLOCKED macro; replace it with\n__SPIN_LOCK_UNLOCKED so that lockdep can give the lock a name.\nAlso include spinlock.h so that this compiles.\n\nSigned-off-by: Stephen Boyd <010521127f513270fe503d86ab8316ac5147f4b7@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/char\/dcc_tty.c\n+++ drivers\/char\/dcc_tty.c\n@@ -21,12 +21,13 @@\n #include <linux\/tty.h>\n #include <linux\/tty_driver.h>\n #include <linux\/tty_flip.h>\n+#include <linux\/spinlock.h>\n \n MODULE_DESCRIPTION(\"DCC TTY Driver\");\n MODULE_LICENSE(\"GPL\");\n MODULE_VERSION(\"1.0\");\n \n-static spinlock_t g_dcc_tty_lock = SPIN_LOCK_UNLOCKED;\n+static spinlock_t g_dcc_tty_lock = __SPIN_LOCK_UNLOCKED(g_dcc_tty_lock);\n static struct hrtimer g_dcc_timer;\n static char g_dcc_buffer[16];\n static int g_dcc_buffer_head;\n"} {"commit":"61943aa468abb95df30cdfd2c91d82faccab9c4a","subject":"Delete example.c","message":"Delete example.c","repos":"zserge\/tray","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -1,93 +0,0 @@\n-#include <stdio.h>\n-#include <string.h>\n-\n-#include \"tray.h\"\n-\n-#if TRAY_APPINDICATOR\n-#define TRAY_ICON1 \"indicator-messages\"\n-#define TRAY_ICON2 \"indicator-messages-new\"\n-#elif TRAY_APPKIT\n-#define TRAY_ICON1 \"icon.png\"\n-#define TRAY_ICON2 \"icon.png\"\n-#elif TRAY_WINAPI\n-#define TRAY_ICON1 \"icon.ico\"\n-#define TRAY_ICON2 \"icon.ico\"\n-#endif\n-\n-static struct tray tray;\n-\n-static void toggle_cb(struct tray_menu *item) {\n- printf(\"toggle cb\\n\");\n- item->checked = !item->checked;\n- tray_update(&tray);\n-}\n-\n-static void hello_cb(struct tray_menu *item) {\n- (void)item;\n- printf(\"hello cb\\n\");\n- if (strcmp(tray.icon, TRAY_ICON1) == 0) {\n- tray.icon = TRAY_ICON2;\n- } else {\n- tray.icon = TRAY_ICON1;\n- }\n- tray_update(&tray);\n-}\n-\n-static void quit_cb(struct tray_menu *item) {\n- (void)item;\n- printf(\"quit cb\\n\");\n- tray_exit();\n-}\n-\n-static void submenu_cb(struct tray_menu *item) {\n- (void)item;\n- printf(\"submenu: clicked on %s\\n\", item->text);\n- tray_update(&tray);\n-}\n-\n-\/\/ Test tray init\n-static struct tray tray = {\n- .icon = TRAY_ICON1,\n- .menu =\n- (struct tray_menu[]){\n- {.text = \"Hello\", .cb = hello_cb},\n- {.text = \"Checked\", .checked = 1, .cb = toggle_cb},\n- {.text = \"Disabled\", .disabled = 1},\n- {.text = \"-\"},\n- {.text = \"SubMenu\",\n- .submenu =\n- (struct tray_menu[]){\n- {.text = \"FIRST\", .checked = 1, .cb = submenu_cb},\n- {.text = \"SECOND\",\n- .submenu =\n- (struct tray_menu[]){\n- {.text = \"THIRD\",\n- .submenu =\n- (struct tray_menu[]){\n- {.text = \"7\", .cb = submenu_cb},\n- {.text = \"-\"},\n- {.text = \"8\", .cb = submenu_cb},\n- {.text = NULL}}},\n- {.text = \"FOUR\",\n- .submenu =\n- (struct tray_menu[]){\n- {.text = \"5\", .cb = submenu_cb},\n- {.text = \"6\", .cb = submenu_cb},\n- {.text = NULL}}},\n- {.text = NULL}}},\n- {.text = NULL}}},\n- {.text = \"-\"},\n- {.text = \"Quit\", .cb = quit_cb},\n- {.text = NULL}},\n-};\n-\n-int main() {\n- if (tray_init(&tray) < 0) {\n- printf(\"failed to create tray\\n\");\n- return 1;\n- }\n- while (tray_loop(1) == 0) {\n- printf(\"iteration\\n\");\n- }\n- return 0;\n-}\n"} {"commit":"2565811d4d4304f2dfc950ad6d6e0eae74465381","subject":"Suppression de code #if 0 inutile","message":"Suppression de code #if 0 inutile\n\n\ngit-svn-id: e7e61699ce1738538ffebb75374fbea0924bc775@3415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02\n","repos":"eliberis\/ocaml,msprotz\/ocaml,yunxing\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,yallop\/camlp4,gerdstolpmann\/ocaml,yunxing\/ocaml,msprotz\/ocaml,eliberis\/ocaml,yunxing\/ocaml,yunxing\/ocaml,eliberis\/ocaml,msprotz\/ocaml,eliberis\/ocaml,chambart\/camlp4,hhugo\/camlp4,eliberis\/ocaml,msprotz\/ocaml,yunxing\/ocaml,msprotz\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- byterun\/compare.c\n+++ byterun\/compare.c\n@@ -44,15 +44,11 @@\n }\n }\n \n-\/* Same, then raise Stack_overflow *\/\n+\/* Same, then raise Out_of_memory *\/\n static void compare_stack_overflow(void)\n {\n compare_free_stack();\n-#if 0\n- raise_stack_overflow();\n-#else\n raise_out_of_memory();\n-#endif\n }\n \n \/* Grow the compare stack *\/\n"} {"commit":"f6266e34713dc286b52623d8a4ff846973c0bcce","subject":"edd: fix incorrect return of 1 from module_init","message":"edd: fix incorrect return of 1 from module_init\n\nSigned-off-by: Alexey Dobriyan <b99bff5923d24d2fb8e844db9dac7cd59203da1d@gmail.com>\nCc: Matt Domsch <04e96a82b027a3325dae0e2e6c77a776e282ec67@dell.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/firmware\/edd.c\n+++ drivers\/firmware\/edd.c\n@@ -753,7 +753,7 @@\n \n \tif (!edd_num_devices()) {\n \t\tprintk(KERN_INFO \"EDD information not available.\\n\");\n-\t\treturn 1;\n+\t\treturn -ENODEV;\n \t}\n \n \tedd_kset = kset_create_and_add(\"edd\", NULL, firmware_kobj);\n"} {"commit":"3f3ee29a2c7740b76f47d6ae319d20ba5cdd7291","subject":":construction: chore(json): updated the json parser about parsing string","message":":construction: chore(json): updated the json parser about parsing string\n","repos":"ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study,ASMlover\/study","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- c\/json\/tyr_json.c\n+++ c\/json\/tyr_json.c\n@@ -28,17 +28,28 @@\n *\/\n #include <assert.h>\n #include <ctype.h>\n+#include <errno.h>\n+#include <math.h>\n #include <stdlib.h>\n #include <string.h>\n #include \"tyr_json.h\"\n \n+#define TYR_PARSE_INIT_STACKSZ 256\n+\n+#define ISDIGIT1TO9(ch) ((ch) >= '1' && (ch) <= '9')\n #define EXPECT(c, ch) do {\\\n assert(*c->json == (ch));\\\n c->json++;\\\n } while (0)\n+#define PUTC(c, ch) do {\\\n+ *(char*)tyr_context_push(c, sizeof(char)) = (ch);\\\n+} while (0)\n \n typedef struct tyr_context {\n const char* json;\n+ char* stack;\n+ size_t size;\n+ size_t top;\n } tyr_context;\n \n #define TYR_PARSE_IDENTITY(c, id, n)\\\n@@ -47,6 +58,39 @@\n return TYR_PARSE_INVALID_VALUE;\\\n c->json += (n) - 1\n \n+#define tyr_context_init(c, json) do {\\\n+ c.json = json;\\\n+ c.stack = NULL;\\\n+ c.size = 0;\\\n+ c.top = 0;\\\n+} while (0)\n+#define tyr_context_destroy(c) do {\\\n+ if (NULL != c.stack)\\\n+ free(c.stack);\\\n+} while (0)\n+\n+static void* tyr_context_push(tyr_context* c, size_t size) {\n+ void* ret;\n+\n+ assert(size > 0);\n+ if (c->top + size >= c->size) {\n+ if (0 == c->size)\n+ c->size = TYR_PARSE_INIT_STACKSZ;\n+ while (c->top + size >= c->size)\n+ c->size += c->size >> 1;\n+ c->stack = (char*)realloc(c->stack, c->size);\n+ }\n+ ret = c->stack + c->top;\n+ c->top += size;\n+\n+ return ret;\n+}\n+\n+static void* tyr_context_pop(tyr_context* c, size_t size) {\n+ assert(c->top >= size);\n+ return c->stack + (c->top -= size);\n+}\n+\n static void tyr_parse_whitespace(tyr_context* c) {\n const char* p = c->json;\n while (isspace(*p))\n@@ -73,27 +117,97 @@\n }\n \n static int tyr_parse_number(tyr_context* c, tyr_value* value) {\n- char* end;\n- value->u.number = strtod(c->json, &end);\n- if (c->json == end)\n- return TYR_PARSE_INVALID_VALUE;\n- c->json = end;\n+ const char* p = c->json;\n+\n+ if ('-' == *p)\n+ ++p;\n+\n+ if ('0' == *p) {\n+ ++p;\n+ }\n+ else {\n+ if (!isdigit(*p))\n+ return TYR_PARSE_INVALID_VALUE;\n+ for (p++; isdigit(*p); ++p) {}\n+ }\n+\n+ if ('.' == *p) {\n+ ++p;\n+ if (!isdigit(*p))\n+ return TYR_PARSE_INVALID_VALUE;\n+ for (p++; isdigit(*p); ++p) {}\n+ }\n+\n+ if ('e' == *p || 'E' == *p) {\n+ ++p;\n+ if ('+' == *p || '-' == *p)\n+ ++p;\n+ if (!isdigit(*p))\n+ return TYR_PARSE_INVALID_VALUE;\n+ for (p++; isdigit(*p); ++p) {}\n+ }\n+\n+ errno = 0;\n+ value->u.number = strtod(c->json, NULL);\n+ if (ERANGE == errno\n+ && (HUGE_VAL == value->u.number || -HUGE_VAL == value->u.number))\n+ return TYR_PARSE_NUMBER_TO_BIG;\n value->type = TYR_NUMBER;\n- return TYR_PARSE_OK;\n+ c->json = p;\n+ return TYR_PARSE_OK;\n+}\n+\n+static int tyr_parse_string(tyr_context* c, tyr_value* value) {\n+ size_t head = c->top;\n+ size_t len;\n+ const char* p;\n+\n+ EXPECT(c, '\\\"');\n+ p = c->json;\n+ for (;;) {\n+ char ch = *p++;\n+ switch (ch) {\n+ case '\\\"':\n+ len = c->top - head;\n+ tyr_set_string(value, (const char*)tyr_context_pop(c, len), len);\n+ c->json = p;\n+ return TYR_PARSE_OK;\n+ case '\\\\':\n+ switch (*p++) {\n+ case '\\\"': PUTC(c, '\\\"'); break;\n+ case '\\\\': PUTC(c, '\\\\'); break;\n+ case '\/': PUTC(c, '\/'); break;\n+ case 'b': PUTC(c, '\\b'); break;\n+ case 'f': PUTC(c, '\\f'); break;\n+ case 'r': PUTC(c, '\\r'); break;\n+ case 'n': PUTC(c, '\\n'); break;\n+ case 't': PUTC(c, '\\t'); break;\n+ default:\n+ c->top = head;\n+ return TYR_PARSE_INVALID_STRING_ESCAPE;\n+ }\n+ break;\n+ case '\\0':\n+ c->top = head;\n+ return TYR_PARSE_MISS_QUOTATION_MARK;\n+ default:\n+ if ((unsigned char)ch < 0x20) {\n+ c->top = head;\n+ return TYR_PARSE_INVALID_STRING_CHAR;\n+ }\n+ PUTC(c, ch);\n+ }\n+ }\n }\n \n static int tyr_parse_value(tyr_context* c, tyr_value* value) {\n switch (*c->json) {\n- case 'n':\n- return tyr_parse_null(c, value);\n- case 't':\n- return tyr_parse_true(c, value);\n- case 'f':\n- return tyr_parse_false(c, value);\n- case '\\0':\n- return TYR_PARSE_EXPECT_VALUE;\n- default:\n- return tyr_parse_number(c, value);\n+ case 'n': return tyr_parse_null(c, value);\n+ case 't': return tyr_parse_true(c, value);\n+ case 'f': return tyr_parse_false(c, value);\n+ case '\"': return tyr_parse_string(c, value);\n+ case '\\0': return TYR_PARSE_EXPECT_VALUE;\n+ default: return tyr_parse_number(c, value);\n }\n }\n \n@@ -102,8 +216,8 @@\n int r;\n assert(NULL != value);\n \n- c.json = json;\n- value->type = TYR_NULL;\n+ tyr_context_init(c, json);\n+ tyr_init(value);\n tyr_parse_whitespace(&c);\n if (TYR_PARSE_OK == (r = tyr_parse_value(&c, value))) {\n tyr_parse_whitespace(&c);\n@@ -112,6 +226,9 @@\n r = TYR_PARSE_ROOT_NOT_SINGULAR;\n }\n }\n+\n+ assert(0 == c.top);\n+ tyr_context_destroy(c);\n return r;\n }\n \n@@ -128,14 +245,15 @@\n }\n \n int tyr_get_boolean(const tyr_value* value) {\n- assert(NULL != value);\n- \/* TODO: *\/\n- return 0;\n+ assert(NULL != value\n+ && (TYR_TRUE == value->type || TYR_FALSE == value->type));\n+ return value->type == TYR_TRUE;\n }\n \n void tyr_set_boolean(tyr_value* value, int b) {\n assert(NULL != value);\n- \/* TODO: *\/\n+ tyr_free(value);\n+ value->type = b ? TYR_TRUE : TYR_FALSE;\n }\n \n double tyr_get_number(const tyr_value* value) {\n@@ -145,7 +263,9 @@\n \n void tyr_set_number(tyr_value* value, double n) {\n assert(NULL != value);\n- \/* TODO: *\/\n+ tyr_free(value);\n+ value->u.number = n;\n+ value->type = TYR_NUMBER;\n }\n \n const char* tyr_get_string(const tyr_value* value) {\n"} {"commit":"41c15e1c6eed4d1edfe461926b8bf0e75b672730","subject":"NO-JIRA: [C] Remove long unused code","message":"NO-JIRA: [C] Remove long unused code\n\nThis reverts commit 7efe42d9eaa00073d98827ca792f2fcffb64885f.\n","repos":"kgiusti\/qpid-proton,astitcher\/qpid-proton,kgiusti\/qpid-proton,gemmellr\/qpid-proton,kgiusti\/qpid-proton,apache\/qpid-proton,apache\/qpid-proton,ChugR\/qpid-proton,astitcher\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,ssorj\/qpid-proton,kgiusti\/qpid-proton,astitcher\/qpid-proton,gemmellr\/qpid-proton,gemmellr\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,ssorj\/qpid-proton,ChugR\/qpid-proton,kgiusti\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,ChugR\/qpid-proton,ChugR\/qpid-proton,gemmellr\/qpid-proton,gemmellr\/qpid-proton,ssorj\/qpid-proton,ChugR\/qpid-proton,ChugR\/qpid-proton,ssorj\/qpid-proton,kgiusti\/qpid-proton,ssorj\/qpid-proton,ssorj\/qpid-proton,apache\/qpid-proton,gemmellr\/qpid-proton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c\/src\/core\/util.h\n+++ c\/src\/core\/util.h\n@@ -117,18 +117,4 @@\n #define pn_min(X,Y) ((X) > (Y) ? (Y) : (X))\n #define pn_max(X,Y) ((X) < (Y) ? (Y) : (X))\n \n-#define PN_ENSURE(ARRAY, CAPACITY, COUNT, TYPE) \\\n- while ((CAPACITY) < (COUNT)) { \\\n- (CAPACITY) = (CAPACITY) ? 2 * (CAPACITY) : 16; \\\n- (ARRAY) = (TYPE *) realloc((ARRAY), (CAPACITY) * sizeof (TYPE)); \\\n- } \\\n-\n-#define PN_ENSUREZ(ARRAY, CAPACITY, COUNT, TYPE) \\\n- { \\\n- size_t _old_capacity = (CAPACITY); \\\n- PN_ENSURE(ARRAY, CAPACITY, COUNT, TYPE); \\\n- memset((ARRAY) + _old_capacity, 0, \\\n- sizeof(TYPE)*((CAPACITY) - _old_capacity)); \\\n- }\n-\n #endif \/* util.h *\/\n"} {"commit":"086cfb3913f70f071ecf211ad0303be2b8dd1658","subject":"drivers: i2s: nrfx: fix incorrect direction check","message":"drivers: i2s: nrfx: fix incorrect direction check\n\nI2S direction was not checked correctly in the i2s_nrfx_configure\nfunction.\n\nThis patch also fixes coverity issue 238365.\n\nSigned-off-by: Gerard Marull-Paretas <bedb45f43a286e49f4dcda039a436b216ae61ef3@nordicsemi.no>\n","repos":"finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/i2s\/i2s_nrfx.c\n+++ drivers\/i2s\/i2s_nrfx.c\n@@ -399,11 +399,11 @@\n \n \tif (i2s_cfg->frame_clk_freq == 0) { \/* -> reset state *\/\n \t\tpurge_queue(dev, dir);\n-\t\tif (dir == I2S_DIR_TX || I2S_DIR_BOTH) {\n+\t\tif (dir == I2S_DIR_TX || dir == I2S_DIR_BOTH) {\n \t\t\tdrv_data->tx_configured = false;\n \t\t\tmemset(&drv_data->tx, 0, sizeof(drv_data->tx));\n \t\t}\n-\t\tif (dir == I2S_DIR_RX || I2S_DIR_BOTH) {\n+\t\tif (dir == I2S_DIR_RX || dir == I2S_DIR_BOTH) {\n \t\t\tdrv_data->rx_configured = false;\n \t\t\tmemset(&drv_data->rx, 0, sizeof(drv_data->rx));\n \t\t}\n"} {"commit":"d3c2fddc0a2bad261e63f5dcf45369c3591161b0","subject":"Return 0 instead of NULL because the behavior of 0 is more certain","message":"Return 0 instead of NULL because the behavior of 0 is more certain\n","repos":"jdh8\/metallic,jdh8\/metallic,jdh8\/metallic,jdh8\/metallic,jdh8\/metallic","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/string\/memchr.c\n+++ c\/string\/memchr.c\n@@ -36,5 +36,5 @@\n if (*src == c)\n return (unsigned char*)src;\n \n- return NULL;\n+ return 0;\n }\n"} {"commit":"86d29a3381e80c1ac1545e6aeaf72067c16eb7f5","subject":"OTHER: Silence a harmless constness warning in launcher.","message":"OTHER: Silence a harmless constness warning in launcher.\n","repos":"six600110\/xmms2,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,xmms2\/xmms2-stable,theefer\/xmms2,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,chrippa\/xmms2,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,six600110\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2,theeternalsw0rd\/xmms2,chrippa\/xmms2,six600110\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,chrippa\/xmms2,theefer\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,chrippa\/xmms2,theefer\/xmms2,six600110\/xmms2,chrippa\/xmms2,krad-radio\/xmms2-krad,six600110\/xmms2,theefer\/xmms2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/launcher\/xmms2-launcher.c\n+++ src\/clients\/launcher\/xmms2-launcher.c\n@@ -192,7 +192,7 @@\n \t\tchar buf[32];\n \t\tint i, j = 0;\n \n-\t\targs[j++] = BINDIR \"\/xmms2d\";\n+\t\targs[j++] = (char *) BINDIR \"\/xmms2d\";\n \n \t\tsnprintf (buf, 32, \"--status-fd=%d\", pipefd[1]);\n \t\targs[j++] = buf;\n"} {"commit":"cde727be967a86aee01042f35c8a861728272cf1","subject":"alim15x3: fix handling of address setup timings","message":"alim15x3: fix handling of address setup timings\n\nAccount for the requirements of the other device on the port.\n\nBased on libata pata_ali host driver.\n\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/alim15x3.c\n+++ drivers\/ide\/alim15x3.c\n@@ -72,6 +72,7 @@\n static void ali_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)\n {\n \tstruct pci_dev *dev = to_pci_dev(hwif->dev);\n+\tide_drive_t *pair = ide_get_pair_dev(drive);\n \tint bus_speed = ide_pci_clk ? ide_pci_clk : 33;\n \tunsigned long T = 1000000 \/ bus_speed; \/* PCI clock based *\/\n \tint port = hwif->channel ? 0x5c : 0x58;\n@@ -79,6 +80,16 @@\n \tstruct ide_timing t;\n \n \tide_timing_compute(drive, drive->pio_mode, &t, T, 1);\n+\tif (pair) {\n+\t\tstruct ide_timing p;\n+\n+\t\tide_timing_compute(pair, pair->pio_mode, &p, T, 1);\n+\t\tide_timing_merge(&p, &t, &t, IDE_TIMING_SETUP);\n+\t\tif (pair->dma_mode) {\n+\t\t\tide_timing_compute(pair, pair->dma_mode, &p, T, 1);\n+\t\t\tide_timing_merge(&p, &t, &t, IDE_TIMING_SETUP);\n+\t\t}\n+\t}\n \n \tt.setup = clamp_val(t.setup, 1, 8) & 7;\n \tt.active = clamp_val(t.active, 1, 8) & 7;\n"} {"commit":"1f9e4ce9a5de4a0c04d8d08a10ddc0586f705a05","subject":"OTHER: Fix so that xmmsc_playback_status runs the correct commando.","message":"OTHER: Fix so that xmmsc_playback_status runs the correct commando.\n","repos":"six600110\/xmms2,xmms2\/xmms2-stable,chrippa\/xmms2,chrippa\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman,dreamerc\/xmms2,oneman\/xmms2-oneman,dreamerc\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman-old,dreamerc\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,dreamerc\/xmms2,dreamerc\/xmms2,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,chrippa\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,chrippa\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman,six600110\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,six600110\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/lib\/xmmsclient\/playback.c\n+++ src\/clients\/lib\/xmmsclient\/playback.c\n@@ -138,7 +138,8 @@\n xmmsc_result_t *\n xmmsc_playback_status (xmmsc_connection_t *c)\n {\n-\treturn xmmsc_send_msg_no_arg (c, XMMS_IPC_OBJECT_OUTPUT, XMMS_IPC_CMD_STATUS);\n+\treturn xmmsc_send_msg_no_arg (c, XMMS_IPC_OBJECT_OUTPUT,\n+\t\t\t\t\t\t\t\t XMMS_IPC_CMD_OUTPUT_STATUS);\n }\n \n \/**\n"} {"commit":"1a1276e7b6cba549553285f74e87f702bfff6fac","subject":"[PATCH] Old IDE, fix SATA detection for cabling","message":"[PATCH] Old IDE, fix SATA detection for cabling\n\nThis is based on the proposed patches flying around but also checks that\nthe device in question is new enough to have word 93 rather thanb blindly\nassuming word 93 == 0 means SATA (see ATA-5, ATA-7)\n\nSigned-off-by: Alan Cox <91e38e63b890fbb214c8914809fde03c73e7f24d@redhat.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ide\/ide-iops.c\n+++ drivers\/ide\/ide-iops.c\n@@ -597,6 +597,10 @@\n {\n \tif(HWIF(drive)->udma_four == 0)\n \t\treturn 0;\n+\n+\t\/* Check for SATA but only if we are ATA5 or higher *\/\n+\tif (drive->id->hw_config == 0 && (drive->id->major_rev_num & 0x7FE0))\n+\t\treturn 1;\n \tif (!(drive->id->hw_config & 0x6000))\n \t\treturn 0;\n #ifndef CONFIG_IDEDMA_IVB\n"} {"commit":"3887c0ad2e7d80a8bcaf1534c69416ded62096f8","subject":"BUG(976): Use encoded url in xmmsc_playlist_insert_args","message":"BUG(976): Use encoded url in xmmsc_playlist_insert_args\n","repos":"oneman\/xmms2-oneman,krad-radio\/xmms2-krad,six600110\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman-old,dreamerc\/xmms2,oneman\/xmms2-oneman-old,dreamerc\/xmms2,six600110\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,chrippa\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,xmms2\/xmms2-stable,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,dreamerc\/xmms2,theeternalsw0rd\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,chrippa\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,theefer\/xmms2,chrippa\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,dreamerc\/xmms2,six600110\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,chrippa\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,dreamerc\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/lib\/xmmsclient\/playlist.c\n+++ src\/clients\/lib\/xmmsclient\/playlist.c\n@@ -156,7 +156,7 @@\n \t\n \tmsg = xmms_ipc_msg_new (XMMS_IPC_OBJECT_PLAYLIST, XMMS_IPC_CMD_INSERT);\n \txmms_ipc_msg_put_uint32 (msg, pos);\n-\txmms_ipc_msg_put_string (msg, url);\n+\txmms_ipc_msg_put_string (msg, enc_url);\n \n \treturn xmmsc_send_msg (c, msg);\n }\n"} {"commit":"42d5468921e9e9c0a2d13048a2dab09f844e18bc","subject":"ide-tape: remove pipelined mode tape control flags","message":"ide-tape: remove pipelined mode tape control flags\n\n[bart: sync patch with current code and fix idetape_init_read()]\n\nSigned-off-by: Borislav Petkov <05cf5215df467c93a630616da7c46dd16a0a5f70@gmail.com>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/ide-tape.c\n+++ drivers\/ide\/ide-tape.c\n@@ -221,19 +221,15 @@\n \t\/* 0 When the tape position is unknown *\/\n \tIDETAPE_FLAG_ADDRESS_VALID\t= (1 <<\t1),\n \t\/* Device already opened *\/\n-\tIDETAPE_FLAG_BUSY\t\t\t= (1 << 2),\n-\t\/* Error detected in a pipeline stage *\/\n-\tIDETAPE_FLAG_PIPELINE_ERR\t= (1 <<\t3),\n+\tIDETAPE_FLAG_BUSY\t\t= (1 << 2),\n \t\/* Attempt to auto-detect the current user block size *\/\n-\tIDETAPE_FLAG_DETECT_BS\t\t= (1 << 4),\n+\tIDETAPE_FLAG_DETECT_BS\t\t= (1 << 3),\n \t\/* Currently on a filemark *\/\n-\tIDETAPE_FLAG_FILEMARK\t\t= (1 << 5),\n+\tIDETAPE_FLAG_FILEMARK\t\t= (1 << 4),\n \t\/* DRQ interrupt device *\/\n-\tIDETAPE_FLAG_DRQ_INTERRUPT\t= (1 << 6),\n-\t\/* pipeline active *\/\n-\tIDETAPE_FLAG_PIPELINE_ACTIVE\t= (1 << 7),\n+\tIDETAPE_FLAG_DRQ_INTERRUPT\t= (1 << 5),\n \t\/* 0 = no tape is loaded, so we don't rewind after ejecting *\/\n-\tIDETAPE_FLAG_MEDIUM_PRESENT\t= (1 << 8),\n+\tIDETAPE_FLAG_MEDIUM_PRESENT\t= (1 << 6),\n };\n \n \/* A pipeline stage. *\/\n@@ -695,7 +691,6 @@\n \n \tide_end_drive_cmd(drive, 0, 0);\n \n-\tclear_bit(IDETAPE_FLAG_PIPELINE_ACTIVE, &tape->flags);\n \tspin_unlock_irqrestore(&tape->lock, flags);\n \treturn 0;\n }\n@@ -1728,8 +1723,6 @@\n \t\ttape->merge_stage = NULL;\n \t}\n \n-\t\/* Clear pipeline flags. *\/\n-\tclear_bit(IDETAPE_FLAG_PIPELINE_ERR, &tape->flags);\n \ttape->chrdev_dir = IDETAPE_DIR_NONE;\n \n \t\/* Remove pipeline stages. *\/\n@@ -1807,12 +1800,6 @@\n \tstruct request rq;\n \n \tdebug_log(DBG_SENSE, \"%s: cmd=%d\\n\", __func__, cmd);\n-\n-\tif (test_bit(IDETAPE_FLAG_PIPELINE_ACTIVE, &tape->flags)) {\n-\t\tprintk(KERN_ERR \"ide-tape: bug: the pipeline is active in %s\\n\",\n-\t\t\t\t__func__);\n-\t\treturn (0);\n-\t}\n \n \tidetape_init_rq(&rq, cmd);\n \trq.rq_disk = tape->disk;\n@@ -1931,7 +1918,6 @@\n \t\t__idetape_kfree_stage(tape->merge_stage);\n \t\ttape->merge_stage = NULL;\n \t}\n-\tclear_bit(IDETAPE_FLAG_PIPELINE_ERR, &tape->flags);\n \ttape->chrdev_dir = IDETAPE_DIR_NONE;\n \n \t\/*\n@@ -1993,14 +1979,13 @@\n \t\t}\n \t}\n \n-\tif (!test_bit(IDETAPE_FLAG_PIPELINE_ACTIVE, &tape->flags)) {\n-\t\tif (tape->nr_pending_stages >= 3 * max_stages \/ 4) {\n-\t\t\ttape->measure_insert_time = 1;\n-\t\t\ttape->insert_time = jiffies;\n-\t\t\ttape->insert_size = 0;\n-\t\t\ttape->insert_speed = 0;\n-\t\t}\n-\t}\n+\tif (tape->nr_pending_stages >= 3 * max_stages \/ 4) {\n+\t\ttape->measure_insert_time = 1;\n+\t\ttape->insert_time = jiffies;\n+\t\ttape->insert_size = 0;\n+\t\ttape->insert_speed = 0;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -2019,9 +2004,6 @@\n \t\treturn 0;\n \n \tidetape_init_read(drive, tape->max_stages);\n-\n-\tif (test_bit(IDETAPE_FLAG_PIPELINE_ERR, &tape->flags))\n-\t\treturn 0;\n \n \treturn idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, blocks,\n \t\t\t\t tape->merge_stage->bh);\n@@ -2604,9 +2586,6 @@\n \tif (!test_bit(IDETAPE_FLAG_ADDRESS_VALID, &tape->flags))\n \t\t(void)idetape_rewind_tape(drive);\n \n-\tif (tape->chrdev_dir != IDETAPE_DIR_READ)\n-\t\tclear_bit(IDETAPE_FLAG_PIPELINE_ERR, &tape->flags);\n-\n \t\/* Read block size and write protect status from drive. *\/\n \tide_tape_get_bsize_from_bdesc(drive);\n \n"} {"commit":"f77cfe7ca8b3758b5bbe032c05e01e8a424b9f5f","subject":"[core] con->uri.scheme is maintained lowercase","message":"[core] con->uri.scheme is maintained lowercase\n\ncon->uri.scheme is maintained lowercase \"http\" or \"https\"\nso scheme string comparisons need not be case-insensitive\n","repos":"lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/http-header-glue.c\n+++ src\/http-header-glue.c\n@@ -78,7 +78,7 @@\n \t\t{\n \t\t\tunsigned short listen_port = sock_addr_get_port(&our_addr);\n \t\t\tunsigned short default_port = 80;\n-\t\t\tif (buffer_is_equal_caseless_string(con->uri.scheme, CONST_STR_LEN(\"https\"))) {\n+\t\t\tif (buffer_is_equal_string(con->uri.scheme, CONST_STR_LEN(\"https\"))) {\n \t\t\t\tdefault_port = 443;\n \t\t\t}\n \t\t\tif (0 == listen_port) listen_port = srv->srvconf.port;\n@@ -1440,8 +1440,7 @@\n rc |= cb(vdata, CONST_STR_LEN(\"REQUEST_SCHEME\"),\n CONST_BUF_LEN(con->uri.scheme));\n \n- if (buffer_is_equal_caseless_string(con->uri.scheme,\n- CONST_STR_LEN(\"https\"))) {\n+ if (buffer_is_equal_string(con->uri.scheme, CONST_STR_LEN(\"https\"))) {\n rc |= cb(vdata, CONST_STR_LEN(\"HTTPS\"), CONST_STR_LEN(\"on\"));\n }\n \n"} {"commit":"10d11681078b8f325c39d8282af52884aa1a0dd6","subject":"[FIX] nightly bugs 2","message":"[FIX] nightly bugs 2\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13411 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"ktrappe\/seqan,xp3i4\/seqan,xenigmax\/seqan,hannespetur\/SeqAnHTS,PF2-pasteur-fr\/seqan,JohnReid\/seqan,ktrappe\/seqan,xp3i4\/seqan,bayolau\/seqan,bestrauc\/seqan,PF2-pasteur-fr\/seqan,weese\/seqan,catkira\/seqan,bestrauc\/seqan,holtgrewe\/seqan,bayolau\/seqan,hannespetur\/SeqAnHTS,catkira\/seqan,bestrauc\/seqan,h-2\/seqan,h-2\/seqan,xp3i4\/seqan,catkira\/seqan,bestrauc\/seqan,holtgrewe\/seqan,bestrauc\/seqan,weese\/seqan,bayolau\/seqan,xp3i4\/seqan,PF2-pasteur-fr\/seqan,bestrauc\/seqan,hannespetur\/SeqAnHTS,xp3i4\/seqan,catkira\/seqan,ktrappe\/seqan,h-2\/seqan,catkira\/seqan,budach\/seqan,weese\/seqan,JohnReid\/seqan,JohnReid\/seqan,hannespetur\/SeqAnHTS,bayolau\/seqan,limeng12\/seqan,h-2\/seqan,weese\/seqan,JohnReid\/seqan,xp3i4\/seqan,budach\/seqan,weese\/seqan,hannespetur\/SeqAnHTS,limeng12\/seqan,ktrappe\/seqan,ktrappe\/seqan,xenigmax\/seqan,PF2-pasteur-fr\/seqan,holtgrewe\/seqan,xp3i4\/seqan,ktrappe\/seqan,ktrappe\/seqan,holtgrewe\/seqan,h-2\/seqan,bayolau\/seqan,budach\/seqan,catkira\/seqan,catkira\/seqan,catkira\/seqan,hannespetur\/SeqAnHTS,budach\/seqan,xp3i4\/seqan,holtgrewe\/seqan,holtgrewe\/seqan,JohnReid\/seqan,JohnReid\/seqan,hannespetur\/SeqAnHTS,weese\/seqan,h-2\/seqan,h-2\/seqan,PF2-pasteur-fr\/seqan,xp3i4\/seqan,JohnReid\/seqan,PF2-pasteur-fr\/seqan,h-2\/seqan,catkira\/seqan,budach\/seqan,ktrappe\/seqan,PF2-pasteur-fr\/seqan,hannespetur\/SeqAnHTS,budach\/seqan,limeng12\/seqan,weese\/seqan,bestrauc\/seqan,xenigmax\/seqan,limeng12\/seqan,budach\/seqan,bestrauc\/seqan,hannespetur\/SeqAnHTS,budach\/seqan,JohnReid\/seqan,limeng12\/seqan,PF2-pasteur-fr\/seqan,bayolau\/seqan,bayolau\/seqan,xenigmax\/seqan,holtgrewe\/seqan,JohnReid\/seqan,xenigmax\/seqan,holtgrewe\/seqan,bayolau\/seqan,xenigmax\/seqan,xenigmax\/seqan,limeng12\/seqan,weese\/seqan,limeng12\/seqan,limeng12\/seqan,bayolau\/seqan,ktrappe\/seqan,h-2\/seqan,xenigmax\/seqan,budach\/seqan,limeng12\/seqan,PF2-pasteur-fr\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/include\/seqan\/file\/file_page.h\n+++ core\/include\/seqan\/file\/file_page.h\n@@ -389,11 +389,11 @@\n \t\tbool\t\t\tdirty;\t\t\/\/ data needs to be written to disk before freeing\n \n \t\tBuffer():\n- dirty(false),\n- pageNo(-1),\n \t\t\tstatus(READY),\n \t\t\tdataStatus(UNINITIALIZED),\n- priority(NORMAL_LEVEL) {}\n+ priority(NORMAL_LEVEL),\n+ pageNo(-1),\n+ dirty(false) {}\n \n template <typename TPos>\n \t\tinline TValue &\n@@ -842,8 +842,8 @@\n return false;\n \t}\n \n-\ttemplate <typename TValue, typename TFile> inline\n-\tbool writeBucket(Buffer<TValue, PageFrame<TFile, Dynamic> > &pf, size_t &pageOfs, TFile &file) \n+\ttemplate <typename TValue, typename TPageOfs, typename TFile> inline\n+\tbool writeBucket(Buffer<TValue, PageFrame<TFile, Dynamic> > &pf, TPageOfs &pageOfs, TFile &file)\n \t{\n \/\/IOREV _nodoc_\n \t\ttypedef typename Position<TFile>::Type TPos;\n"} {"commit":"e09d0e79ca2417a9095c19b1bc82b88aff147ef6","subject":"minor mc fix for gcc4.9","message":"minor mc fix for gcc4.9\n\nSummary: Fix a compile error with gcc 4.9. Thanks Alex for the fix\n\nTest Plan: unit tests\n\nReviewed By: @\u200bhas\n\nDifferential Revision: D2066038","repos":"leitao\/mcrouter,synecdoche\/mcrouter,yqzhang\/mcrouter,yqzhang\/mcrouter,zhlong73\/mcrouter,reddit\/mcrouter,evertrue\/mcrouter,facebook\/mcrouter,yqzhang\/mcrouter,nvaller\/mcrouter,glensc\/mcrouter,tempbottle\/mcrouter,zhlong73\/mcrouter,synecdoche\/mcrouter,easyfmxu\/mcrouter,leitao\/mcrouter,synecdoche\/mcrouter,is00hcw\/mcrouter,yqzhang\/mcrouter,facebook\/mcrouter,zhlong73\/mcrouter,nvaller\/mcrouter,nvaller\/mcrouter,evertrue\/mcrouter,reddit\/mcrouter,synecdoche\/mcrouter,easyfmxu\/mcrouter,leitao\/mcrouter,reddit\/mcrouter,tempbottle\/mcrouter,reddit\/mcrouter,easyfmxu\/mcrouter,glensc\/mcrouter,is00hcw\/mcrouter,leitao\/mcrouter,tempbottle\/mcrouter,glensc\/mcrouter,easyfmxu\/mcrouter,tempbottle\/mcrouter,glensc\/mcrouter,nvaller\/mcrouter,facebook\/mcrouter,evertrue\/mcrouter,is00hcw\/mcrouter,is00hcw\/mcrouter,evertrue\/mcrouter,facebook\/mcrouter,zhlong73\/mcrouter","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- mcrouter\/lib\/routes\/AllSyncRoute.h\n+++ mcrouter\/lib\/routes\/AllSyncRoute.h\n@@ -73,7 +73,8 @@\n #pragma clang diagnostic push \/\/ ignore generalized lambda capture warning\n #pragma clang diagnostic ignored \"-Wc++1y-extensions\"\n #endif\n- auto fs = makeFuncGenerator([&req, &children = children_](size_t id) {\n+ const auto& children = children_;\n+ auto fs = makeFuncGenerator([&req, &children](size_t id) {\n return children[id]->route(req, Operation());\n }, children_.size());\n #ifdef __clang__\n"} {"commit":"5517367e978b29dedb1ca0e84a0285b8f9446fde","subject":"Fix unsafe usage of strerror(errno) within ereport().","message":"Fix unsafe usage of strerror(errno) within ereport().\n\nThis is the converse of the unsafe-usage-of-%m problem: the reason\nereport\/elog provide that format code is mainly to dodge the hazard\nof errno getting changed before control reaches functions within the\narguments of the macro. I only found one instance of this hazard,\nbut it's been there since 9.4 :-(.\n","repos":"50wu\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,50wu\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,50wu\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,50wu\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/libpq\/auth.c\n+++ src\/backend\/libpq\/auth.c\n@@ -1615,10 +1615,12 @@\n \tpw = getpwuid(uid);\n \tif (!pw)\n \t{\n+\t\tint\t\t\tsave_errno = errno;\n+\n \t\tereport(LOG,\n \t\t\t\t(errmsg(\"could not look up local user ID %ld: %s\",\n \t\t\t\t\t\t(long) uid,\n-\t\t\t\t\t\terrno ? strerror(errno) : _(\"user does not exist\"))));\n+\t\t\t\t\t\tsave_errno ? strerror(save_errno) : _(\"user does not exist\"))));\n \t\treturn STATUS_ERROR;\n \t}\n \n"} {"commit":"860a2cc628fe775a74b88d71b6df631b0ad3dc42","subject":"tcti: quiet tcti ldr noise","message":"tcti: quiet tcti ldr noise\n\nFixes: #2009\nSigned-off-by: Tadeusz Struk <ac7da5bc34fbda078ba4af5ef710d2a59a2316f5@intel.com>\n","repos":"01org\/TPM2.0-TSS,01org\/TPM2.0-TSS,01org\/TPM2.0-TSS,01org\/tpm2-tss,01org\/TPM2.0-TSS,01org\/tpm2-tss,01org\/tpm2-tss,tpm2-software\/tpm2-tss,tpm2-software\/tpm2-tss,tpm2-software\/tpm2-tss","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/tss2-tcti\/tctildr.c\n+++ src\/tss2-tcti\/tctildr.c\n@@ -74,9 +74,22 @@\n return TSS2_ESYS_RC_MEMORY;\n }\n \n+ \/* Unless tcti loglevel is log_debug or higher\n+ * (i.e. TSS2_LOG=tcti+debug) turn the logging\n+ * from loaded tctis off completely, including warnings\n+ * and error logs. It makes too much noise when tcti\n+ * loader tries them all one by one and what we want\n+ * use is the last one.\n+ *\/\n+ log_level old_loglevel = LOGMODULE_status;\n+ if (LOGMODULE_status < LOGLEVEL_INFO)\n+ LOGMODULE_status = LOGLEVEL_NONE;\n+\n r = init(*tcti, &size, conf);\n+ LOGMODULE_status = old_loglevel;\n+\n if (r != TSS2_RC_SUCCESS) {\n- LOG_WARNING(\"TCTI init for function %p failed with %\" PRIx32, init, r);\n+ LOG_DEBUG(\"TCTI init for function %p failed with %\" PRIx32, init, r);\n free(*tcti);\n *tcti=NULL;\n return r;\n@@ -106,11 +119,10 @@\n \n r = tcti_from_init(info->init, conf, tcti);\n if (r != TSS2_RC_SUCCESS) {\n- LOG_WARNING(\"Could not initialize TCTI named: %s\", info->name);\n+ LOG_DEBUG(\"Could not initialize TCTI named: %s\", info->name);\n return r;\n }\n-\n- LOG_DEBUG(\"Initialized TCTI named: %s\", info->name);\n+ LOG_INFO(\"Initialized TCTI named: %s\", info->name);\n \n return TSS2_RC_SUCCESS;\n }\n"} {"commit":"01e8524cc45d67b842a1a221c504db0e1c2d3b7e","subject":"Update gpio_port.c","message":"Update gpio_port.c","repos":"ethrbh\/erlang_ale,esl\/erlang_ale,emfa\/erlhw","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c_src\/gpio_port.c\n+++ c_src\/gpio_port.c\n@@ -253,7 +253,7 @@\n if (port_gpio_release(my_pin))\n {\n \/\/ syslog(LOG_NOTICE, \"gpio_relase went well for pin %d\",\n- my_pin);\n+ \/\/ my_pin);\n }\n else\n {\n"} {"commit":"1b2c3491491a2bdeec513e8b4ae7e94e9648f8b0","subject":"Fix a couple of glaring errors in vca_pollspace().","message":"Fix a couple of glaring errors in vca_pollspace().\n\nNoticed by:\tJyri J. Virkki <jyri@virkki.com>\n\n\ngit-svn-id: 2c9807fa3ff65b17195bd55dc8a6c4261e10127b@2592 d4fa192b-c00b-0410-8231-f00ffab90ce4\n","repos":"wikimedia\/operations-debs-varnish,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,1HLtd\/Varnish-Cache,wikimedia\/operations-debs-varnish,mrhmouse\/Varnish-Cache,1HLtd\/Varnish-Cache,mrhmouse\/Varnish-Cache,1HLtd\/Varnish-Cache,1HLtd\/Varnish-Cache,gquintard\/Varnish-Cache,drwilco\/varnish-cache-old,ambernetas\/varnish-cache,alarky\/varnish-cache-doc-ja,varnish\/Varnish-Cache,ssm\/pkg-varnish,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,drwilco\/varnish-cache-old,drwilco\/varnish-cache-drwilco,feld\/Varnish-Cache,chrismoulton\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gquintard\/Varnish-Cache,franciscovg\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,gquintard\/Varnish-Cache,franciscovg\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,drwilco\/varnish-cache-drwilco,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,varnish\/Varnish-Cache,alarky\/varnish-cache-doc-ja,chrismoulton\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,zhoualbeart\/Varnish-Cache,alarky\/varnish-cache-doc-ja,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,wikimedia\/operations-debs-varnish,ssm\/pkg-varnish,wikimedia\/operations-debs-varnish,alarky\/varnish-cache-doc-ja,feld\/Varnish-Cache,alarky\/varnish-cache-doc-ja,wikimedia\/operations-debs-varnish,gquintard\/Varnish-Cache,zhoualbeart\/Varnish-Cache,franciscovg\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,varnish\/Varnish-Cache,ssm\/pkg-varnish,drwilco\/varnish-cache-drwilco,ssm\/pkg-varnish,drwilco\/varnish-cache-old,ambernetas\/varnish-cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,mrhmouse\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,ambernetas\/varnish-cache,varnish\/Varnish-Cache,ssm\/pkg-varnish,chrismoulton\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/varnishd\/cache_acceptor_poll.c\n+++ bin\/varnishd\/cache_acceptor_poll.c\n@@ -56,23 +56,21 @@\n static void\n vca_pollspace(unsigned fd)\n {\n-\tstruct pollfd *p;\n-\tunsigned u, v;\n+\tstruct pollfd *newpollfd;\n+\tunsigned newnpoll;\n \n \tif (fd < npoll)\n \t\treturn;\n-\tif (npoll == 0)\n-\t\tnpoll = 16;\n-\tfor (u = npoll; fd >= u; )\n-\t\tu += u;\n-\tVSL(SLT_Debug, 0, \"Acceptor Pollspace %u\", u);\n-\tp = realloc(pollfd, u * sizeof *p);\n-\tXXXAN(p);\t\/* close offending fd *\/\n-\tmemset(p + npoll, 0, (u - npoll) * sizeof *p);\n-\tfor (v = npoll ; v <= u; v++)\n-\t\tp->fd = -1;\n-\tpollfd = p;\n-\tnpoll = u;\n+\tnewnpoll = npoll;\n+\twhile (fd >= newnpoll)\n+\t\tnewnpoll = newnpoll * 2 + 1;\n+\tVSL(SLT_Debug, 0, \"Acceptor poll space increased to %u\", newnpoll);\n+\tnewpollfd = realloc(pollfd, newnpoll * sizeof *pollfd);\n+\tXXXAN(newpollfd);\t\/* close offending fd *\/\n+\tpollfd = newpollfd;\n+\tmemset(pollfd + npoll, 0, (newnpoll - npoll) * sizeof *pollfd);\n+\twhile (npoll < newnpoll)\n+\t\tpollfd[npoll++].fd = -1;\n }\n \n \/*--------------------------------------------------------------------*\/\n"} {"commit":"35ab8d3251833e4052aa64b09b08195e949518c7","subject":"ide-tape: use single continuous buffer","message":"ide-tape: use single continuous buffer\n\nImpact: simpler buffer allocation and handling, kills OOM, fix DMA transfers\n\nide-tape has its own multiple buffer mechanism using struct\nidetape_bh. It allocates buffer with decreasing order-of-two\nallocations so that it results in minimum number of segments.\nHowever, the implementation is quite complex and works in a way that\nno other block or ide driver works necessitating a lot of special case\nhandling.\n\nThe benefit this complex allocation scheme brings is questionable as\nPIO or DMA the number of segments (16 maximum) doesn't make any\nnoticeable difference and it also doesn't negate the need for multiple\norder allocation which can fail under memory pressure or high\nfragmentation although it does lower the highest order necessary by\none when the buffer size isn't power of two.\n\nAs the first step to remove the custom buffer management, this patch\nmakes ide-tape allocate single continous buffer. The maximum order is\nfour. I doubt the change would cause any trouble but if it ever\nmatters, it should be converted to regular sg mechanism like everyone\nelse and even in that case dropping custom buffer handling and moving\nto standard mechanism first make sense as an intermediate step.\n\nThis patch makes the first bh to contain the whole buffer and drops\nmulti bh handling code. Following patches will make further changes.\n\nThis patch has the side effect of killing OOM triggered by allocation\npath and fixing DMA transfers. Previously, bug in alloc path\ntriggered OOM on command issue and commands were passed to DMA engine\nwithout DMA-mapping all the segments.\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/ide-tape.c\n+++ drivers\/ide\/ide-tape.c\n@@ -134,7 +134,6 @@\n struct idetape_bh {\n \tu32 b_size;\n \tatomic_t b_count;\n-\tstruct idetape_bh *b_reqnext;\n \tchar *b_data;\n };\n \n@@ -228,10 +227,6 @@\n \tchar *b_data;\n \tint b_count;\n \n-\tint pages_per_buffer;\n-\t\/* Wasted space in each stage *\/\n-\tint excess_bh_size;\n-\n \t\/* Measures average tape speed *\/\n \tunsigned long avg_time;\n \tint avg_size;\n@@ -303,9 +298,7 @@\n \tstruct idetape_bh *bh = pc->bh;\n \tint count;\n \n-\twhile (bcount) {\n-\t\tif (bh == NULL)\n-\t\t\tbreak;\n+\tif (bcount && bh) {\n \t\tcount = min(\n \t\t\t(unsigned int)(bh->b_size - atomic_read(&bh->b_count)),\n \t\t\tbcount);\n@@ -313,14 +306,9 @@\n \t\t\t\t\tatomic_read(&bh->b_count), count);\n \t\tbcount -= count;\n \t\tatomic_add(count, &bh->b_count);\n-\t\tif (atomic_read(&bh->b_count) == bh->b_size) {\n-\t\t\tbh = bh->b_reqnext;\n-\t\t\tif (bh)\n-\t\t\t\tatomic_set(&bh->b_count, 0);\n-\t\t}\n-\t}\n-\n-\tpc->bh = bh;\n+\t\tif (atomic_read(&bh->b_count) == bh->b_size)\n+\t\t\tpc->bh = NULL;\n+\t}\n \n \treturn bcount;\n }\n@@ -331,22 +319,14 @@\n \tstruct idetape_bh *bh = pc->bh;\n \tint count;\n \n-\twhile (bcount) {\n-\t\tif (bh == NULL)\n-\t\t\tbreak;\n+\tif (bcount && bh) {\n \t\tcount = min((unsigned int)pc->b_count, (unsigned int)bcount);\n \t\tdrive->hwif->tp_ops->output_data(drive, NULL, pc->b_data, count);\n \t\tbcount -= count;\n \t\tpc->b_data += count;\n \t\tpc->b_count -= count;\n-\t\tif (!pc->b_count) {\n-\t\t\tbh = bh->b_reqnext;\n-\t\t\tpc->bh = bh;\n-\t\t\tif (bh) {\n-\t\t\t\tpc->b_data = bh->b_data;\n-\t\t\t\tpc->b_count = atomic_read(&bh->b_count);\n-\t\t\t}\n-\t\t}\n+\t\tif (!pc->b_count)\n+\t\t\tpc->bh = NULL;\n \t}\n \n \treturn bcount;\n@@ -355,24 +335,20 @@\n static void idetape_update_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc)\n {\n \tstruct idetape_bh *bh = pc->bh;\n-\tint count;\n \tunsigned int bcount = pc->xferred;\n \n \tif (pc->flags & PC_FLAG_WRITING)\n \t\treturn;\n-\twhile (bcount) {\n-\t\tif (bh == NULL) {\n+\tif (bcount) {\n+\t\tif (bh == NULL || bcount > bh->b_size) {\n \t\t\tprintk(KERN_ERR \"ide-tape: bh == NULL in %s\\n\",\n \t\t\t\t\t__func__);\n \t\t\treturn;\n \t\t}\n-\t\tcount = min((unsigned int)bh->b_size, (unsigned int)bcount);\n-\t\tatomic_set(&bh->b_count, count);\n+\t\tatomic_set(&bh->b_count, bcount);\n \t\tif (atomic_read(&bh->b_count) == bh->b_size)\n-\t\t\tbh = bh->b_reqnext;\n-\t\tbcount -= count;\n-\t}\n-\tpc->bh = bh;\n+\t\t\tpc->bh = NULL;\n+\t}\n }\n \n \/*\n@@ -439,24 +415,10 @@\n \/* Free data buffers completely. *\/\n static void ide_tape_kfree_buffer(idetape_tape_t *tape)\n {\n-\tstruct idetape_bh *prev_bh, *bh = tape->merge_bh;\n-\n-\twhile (bh) {\n-\t\tu32 size = bh->b_size;\n-\n-\t\twhile (size) {\n-\t\t\tunsigned int order = fls(size >> PAGE_SHIFT)-1;\n-\n-\t\t\tif (bh->b_data)\n-\t\t\t\tfree_pages((unsigned long)bh->b_data, order);\n-\n-\t\t\tsize &= (order-1);\n-\t\t\tbh->b_data += (1 << order) * PAGE_SIZE;\n-\t\t}\n-\t\tprev_bh = bh;\n-\t\tbh = bh->b_reqnext;\n-\t\tkfree(prev_bh);\n-\t}\n+\tstruct idetape_bh *bh = tape->merge_bh;\n+\n+\tkfree(bh->b_data);\n+\tkfree(bh);\n }\n \n static void ide_tape_handle_dsc(ide_drive_t *);\n@@ -861,117 +823,50 @@\n }\n \n \/*\n- * The function below uses __get_free_pages to allocate a data buffer of size\n- * tape->buffer_size (or a bit more). We attempt to combine sequential pages as\n- * much as possible.\n- *\n- * It returns a pointer to the newly allocated buffer, or NULL in case of\n- * failure.\n+ * It returns a pointer to the newly allocated buffer, or NULL in case\n+ * of failure.\n *\/\n static struct idetape_bh *ide_tape_kmalloc_buffer(idetape_tape_t *tape,\n-\t\t\t\t\t\t int full, int clear)\n-{\n-\tstruct idetape_bh *prev_bh, *bh, *merge_bh;\n-\tint pages = tape->pages_per_buffer;\n-\tunsigned int order, b_allocd;\n-\tchar *b_data = NULL;\n-\n-\tmerge_bh = kmalloc(sizeof(struct idetape_bh), GFP_KERNEL);\n-\tbh = merge_bh;\n-\tif (bh == NULL)\n-\t\tgoto abort;\n-\n-\torder = fls(pages) - 1;\n-\tbh->b_data = (char *) __get_free_pages(GFP_KERNEL, order);\n-\tif (!bh->b_data)\n-\t\tgoto abort;\n-\tb_allocd = (1 << order) * PAGE_SIZE;\n-\tpages &= (order-1);\n-\n-\tif (clear)\n-\t\tmemset(bh->b_data, 0, b_allocd);\n-\tbh->b_reqnext = NULL;\n-\tbh->b_size = b_allocd;\n+\t\t\t\t\t\t int full)\n+{\n+\tstruct idetape_bh *bh;\n+\n+\tbh = kmalloc(sizeof(struct idetape_bh), GFP_KERNEL);\n+\tif (!bh)\n+\t\treturn NULL;\n+\n+\tbh->b_data = kmalloc(tape->buffer_size, GFP_KERNEL);\n+\tif (!bh->b_data) {\n+\t\tkfree(bh);\n+\t\treturn NULL;\n+\t}\n+\n+\tbh->b_size = tape->buffer_size;\n \tatomic_set(&bh->b_count, full ? bh->b_size : 0);\n \n-\twhile (pages) {\n-\t\torder = fls(pages) - 1;\n-\t\tb_data = (char *) __get_free_pages(GFP_KERNEL, order);\n-\t\tif (!b_data)\n-\t\t\tgoto abort;\n-\t\tb_allocd = (1 << order) * PAGE_SIZE;\n-\n-\t\tif (clear)\n-\t\t\tmemset(b_data, 0, b_allocd);\n-\n-\t\t\/* newly allocated page frames below buffer header or ...*\/\n-\t\tif (bh->b_data == b_data + b_allocd) {\n-\t\t\tbh->b_size += b_allocd;\n-\t\t\tbh->b_data -= b_allocd;\n-\t\t\tif (full)\n-\t\t\t\tatomic_add(b_allocd, &bh->b_count);\n-\t\t\tcontinue;\n-\t\t}\n-\t\t\/* they are above the header *\/\n-\t\tif (b_data == bh->b_data + bh->b_size) {\n-\t\t\tbh->b_size += b_allocd;\n-\t\t\tif (full)\n-\t\t\t\tatomic_add(b_allocd, &bh->b_count);\n-\t\t\tcontinue;\n-\t\t}\n-\t\tprev_bh = bh;\n-\t\tbh = kmalloc(sizeof(struct idetape_bh), GFP_KERNEL);\n-\t\tif (!bh) {\n-\t\t\tfree_pages((unsigned long) b_data, order);\n-\t\t\tgoto abort;\n-\t\t}\n-\t\tbh->b_reqnext = NULL;\n-\t\tbh->b_data = b_data;\n-\t\tbh->b_size = b_allocd;\n-\t\tatomic_set(&bh->b_count, full ? bh->b_size : 0);\n-\t\tprev_bh->b_reqnext = bh;\n-\n-\t\tpages &= (order-1);\n-\t}\n-\n-\tbh->b_size -= tape->excess_bh_size;\n-\tif (full)\n-\t\tatomic_sub(tape->excess_bh_size, &bh->b_count);\n-\treturn merge_bh;\n-abort:\n-\tide_tape_kfree_buffer(tape);\n-\treturn NULL;\n+\treturn bh;\n }\n \n static int idetape_copy_stage_from_user(idetape_tape_t *tape,\n \t\t\t\t\tconst char __user *buf, int n)\n {\n \tstruct idetape_bh *bh = tape->bh;\n-\tint count;\n \tint ret = 0;\n \n-\twhile (n) {\n-\t\tif (bh == NULL) {\n+\tif (n) {\n+\t\tif (bh == NULL || n > bh->b_size - atomic_read(&bh->b_count)) {\n \t\t\tprintk(KERN_ERR \"ide-tape: bh == NULL in %s\\n\",\n \t\t\t\t\t__func__);\n \t\t\treturn 1;\n \t\t}\n-\t\tcount = min((unsigned int)\n-\t\t\t\t(bh->b_size - atomic_read(&bh->b_count)),\n-\t\t\t\t(unsigned int)n);\n \t\tif (copy_from_user(bh->b_data + atomic_read(&bh->b_count), buf,\n-\t\t\t\tcount))\n+\t\t\t\t n))\n \t\t\tret = 1;\n-\t\tn -= count;\n-\t\tatomic_add(count, &bh->b_count);\n-\t\tbuf += count;\n-\t\tif (atomic_read(&bh->b_count) == bh->b_size) {\n-\t\t\tbh = bh->b_reqnext;\n-\t\t\tif (bh)\n-\t\t\t\tatomic_set(&bh->b_count, 0);\n-\t\t}\n-\t}\n-\ttape->bh = bh;\n+\t\tatomic_add(n, &bh->b_count);\n+\t\tif (atomic_read(&bh->b_count) == bh->b_size)\n+\t\t\ttape->bh = NULL;\n+\t}\n+\n \treturn ret;\n }\n \n@@ -979,30 +874,20 @@\n \t\t\t\t int n)\n {\n \tstruct idetape_bh *bh = tape->bh;\n-\tint count;\n \tint ret = 0;\n \n-\twhile (n) {\n-\t\tif (bh == NULL) {\n+\tif (n) {\n+\t\tif (bh == NULL || n > tape->b_count) {\n \t\t\tprintk(KERN_ERR \"ide-tape: bh == NULL in %s\\n\",\n \t\t\t\t\t__func__);\n \t\t\treturn 1;\n \t\t}\n-\t\tcount = min(tape->b_count, n);\n-\t\tif (copy_to_user(buf, tape->b_data, count))\n+\t\tif (copy_to_user(buf, tape->b_data, n))\n \t\t\tret = 1;\n-\t\tn -= count;\n-\t\ttape->b_data += count;\n-\t\ttape->b_count -= count;\n-\t\tbuf += count;\n-\t\tif (!tape->b_count) {\n-\t\t\tbh = bh->b_reqnext;\n-\t\t\ttape->bh = bh;\n-\t\t\tif (bh) {\n-\t\t\t\ttape->b_data = bh->b_data;\n-\t\t\t\ttape->b_count = atomic_read(&bh->b_count);\n-\t\t\t}\n-\t\t}\n+\t\ttape->b_data += n;\n+\t\ttape->b_count -= n;\n+\t\tif (!tape->b_count)\n+\t\t\ttape->bh = NULL;\n \t}\n \treturn ret;\n }\n@@ -1254,7 +1139,7 @@\n static void ide_tape_flush_merge_buffer(ide_drive_t *drive)\n {\n \tidetape_tape_t *tape = drive->driver_data;\n-\tint blocks, min;\n+\tint blocks;\n \tstruct idetape_bh *bh;\n \n \tif (tape->chrdev_dir != IDETAPE_DIR_WRITE) {\n@@ -1269,31 +1154,16 @@\n \tif (tape->merge_bh_size) {\n \t\tblocks = tape->merge_bh_size \/ tape->blk_size;\n \t\tif (tape->merge_bh_size % tape->blk_size) {\n-\t\t\tunsigned int i;\n-\n+\t\t\tunsigned int i = tape->blk_size -\n+\t\t\t\ttape->merge_bh_size % tape->blk_size;\n \t\t\tblocks++;\n-\t\t\ti = tape->blk_size - tape->merge_bh_size %\n-\t\t\t\ttape->blk_size;\n-\t\t\tbh = tape->bh->b_reqnext;\n-\t\t\twhile (bh) {\n-\t\t\t\tatomic_set(&bh->b_count, 0);\n-\t\t\t\tbh = bh->b_reqnext;\n-\t\t\t}\n \t\t\tbh = tape->bh;\n-\t\t\twhile (i) {\n-\t\t\t\tif (bh == NULL) {\n-\t\t\t\t\tprintk(KERN_INFO \"ide-tape: bug,\"\n-\t\t\t\t\t\t\t \" bh NULL\\n\");\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n-\t\t\t\tmin = min(i, (unsigned int)(bh->b_size -\n-\t\t\t\t\t\tatomic_read(&bh->b_count)));\n+\t\t\tif (bh) {\n \t\t\t\tmemset(bh->b_data + atomic_read(&bh->b_count),\n-\t\t\t\t\t\t0, min);\n-\t\t\t\tatomic_add(min, &bh->b_count);\n-\t\t\t\ti -= min;\n-\t\t\t\tbh = bh->b_reqnext;\n-\t\t\t}\n+\t\t\t\t 0, i);\n+\t\t\t\tatomic_add(i, &bh->b_count);\n+\t\t\t} else\n+\t\t\t\tprintk(KERN_INFO \"ide-tape: bug, bh NULL\\n\");\n \t\t}\n \t\t(void) idetape_add_chrdev_write_request(drive, blocks);\n \t\ttape->merge_bh_size = 0;\n@@ -1321,7 +1191,7 @@\n \t\t\t\t\t \" 0 now\\n\");\n \t\t\ttape->merge_bh_size = 0;\n \t\t}\n-\t\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 0, 0);\n+\t\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 0);\n \t\tif (!tape->merge_bh)\n \t\t\treturn -ENOMEM;\n \t\ttape->chrdev_dir = IDETAPE_DIR_READ;\n@@ -1368,23 +1238,18 @@\n static void idetape_pad_zeros(ide_drive_t *drive, int bcount)\n {\n \tidetape_tape_t *tape = drive->driver_data;\n-\tstruct idetape_bh *bh;\n+\tstruct idetape_bh *bh = tape->merge_bh;\n \tint blocks;\n \n \twhile (bcount) {\n \t\tunsigned int count;\n \n-\t\tbh = tape->merge_bh;\n \t\tcount = min(tape->buffer_size, bcount);\n \t\tbcount -= count;\n \t\tblocks = count \/ tape->blk_size;\n-\t\twhile (count) {\n-\t\t\tatomic_set(&bh->b_count,\n-\t\t\t\t min(count, (unsigned int)bh->b_size));\n-\t\t\tmemset(bh->b_data, 0, atomic_read(&bh->b_count));\n-\t\t\tcount -= atomic_read(&bh->b_count);\n-\t\t\tbh = bh->b_reqnext;\n-\t\t}\n+\t\tatomic_set(&bh->b_count, count);\n+\t\tmemset(bh->b_data, 0, atomic_read(&bh->b_count));\n+\n \t\tidetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, blocks,\n \t\t\t\t tape->merge_bh);\n \t}\n@@ -1596,7 +1461,7 @@\n \t\t\t\t\"should be 0 now\\n\");\n \t\t\ttape->merge_bh_size = 0;\n \t\t}\n-\t\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 0, 0);\n+\t\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 0);\n \t\tif (!tape->merge_bh)\n \t\t\treturn -ENOMEM;\n \t\ttape->chrdev_dir = IDETAPE_DIR_WRITE;\n@@ -1970,7 +1835,7 @@\n \tidetape_tape_t *tape = drive->driver_data;\n \n \tide_tape_flush_merge_buffer(drive);\n-\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 1, 0);\n+\ttape->merge_bh = ide_tape_kmalloc_buffer(tape, 1);\n \tif (tape->merge_bh != NULL) {\n \t\tidetape_pad_zeros(drive, tape->blk_size *\n \t\t\t\t(tape->user_bs_factor - 1));\n@@ -2201,11 +2066,6 @@\n \t\ttape->buffer_size = *ctl * tape->blk_size;\n \t}\n \tbuffer_size = tape->buffer_size;\n-\ttape->pages_per_buffer = buffer_size \/ PAGE_SIZE;\n-\tif (buffer_size % PAGE_SIZE) {\n-\t\ttape->pages_per_buffer++;\n-\t\ttape->excess_bh_size = PAGE_SIZE - buffer_size % PAGE_SIZE;\n-\t}\n \n \t\/* select the \"best\" DSC read\/write polling freq *\/\n \tspeed = max(*(u16 *)&tape->caps[14], *(u16 *)&tape->caps[8]);\n"} {"commit":"0c5f11bfdd79802e2b7e21f7d6907dccad02a6c2","subject":"Revert \"Fix a (I think) off-by-one error in iconv:close, triggered on 10.6\"","message":"Revert \"Fix a (I think) off-by-one error in iconv:close, triggered on 10.6\"\n\nTurns out this wasn't the fix, it only masks whatever the underlying\nissue is.\n","repos":"edubkendo\/erlang-iconv,edubkendo\/erlang-iconv,Vagabond\/erlang-iconv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c_src\/iconv_drv.c\n+++ c_src\/iconv_drv.c\n@@ -301,7 +301,7 @@\n \t *\/\n \ti = get_int16(bp);\n \tbp += 2;\n-\tmemcpy(&cd, bp, i-1);\n+\tmemcpy(&cd, bp, i);\n \n \tiv_close(iv, cd);\n \tbreak;\n"} {"commit":"42596ec5edc8efb9e24397ef656df7ebb2c4f8d5","subject":"[PATCH] ppc: Fix PowerBook HD led on ARCH=powerpc","message":"[PATCH] ppc: Fix PowerBook HD led on ARCH=powerpc\n\nThe PowerBook HD led code uses obsoletes device-tree accessors which do\nnot work anymore for getting the root of the tree.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\nSigned-off-by: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/ppc\/pmac.c\n+++ drivers\/ide\/ppc\/pmac.c\n@@ -497,16 +497,19 @@\n \tif (pmu_get_model() != PMU_KEYLARGO_BASED)\n \t\treturn 0;\n \t\n-\tdt = find_devices(\"device-tree\");\n+\tdt = of_find_node_by_path(\"\/\");\n \tif (dt == NULL)\n \t\treturn 0;\n \tmodel = (const char *)get_property(dt, \"model\", NULL);\n \tif (model == NULL)\n \t\treturn 0;\n \tif (strncmp(model, \"PowerBook\", strlen(\"PowerBook\")) != 0 &&\n-\t strncmp(model, \"iBook\", strlen(\"iBook\")) != 0)\n+\t strncmp(model, \"iBook\", strlen(\"iBook\")) != 0) {\n+\t\tof_node_put(dt);\n \t \treturn 0;\n-\t\n+\t}\n+\tof_node_put(dt);\n+\n \tpmu_blink_on.complete = 1;\n \tpmu_blink_off.complete = 1;\n \tspin_lock_init(&pmu_blink_lock);\n"} {"commit":"aca38a5157dec0090ad800d52c138fb83674481f","subject":"drivers\/ide: Add missing \"space\"","message":"drivers\/ide: Add missing \"space\"\n\nSigned-off-by: Joe Perches <16a9a54ddf4259952e3c118c763138e83693d7fd@perches.com>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/ppc\/pmac.c\n+++ drivers\/ide\/ppc\/pmac.c\n@@ -1513,7 +1513,7 @@\n \n \t\tif (pmif->broken_dma && cur_addr & (L1_CACHE_BYTES - 1)) {\n \t\t\tif (pmif->broken_dma_warn == 0) {\n-\t\t\t\tprintk(KERN_WARNING \"%s: DMA on non aligned address,\"\n+\t\t\t\tprintk(KERN_WARNING \"%s: DMA on non aligned address, \"\n \t\t\t\t \"switching to PIO on Ohare chipset\\n\", drive->name);\n \t\t\t\tpmif->broken_dma_warn = 1;\n \t\t\t}\n"} {"commit":"79603dec29c71ae2c254dbe4defe0efc957e9e00","subject":"CMA: Adding static assert","message":"CMA: Adding static assert\n","repos":"shssf\/ucx,abouteiller\/ucx,manjugv\/ucx,manjugv\/ucx,sergsagal1\/ucx_rocm,sergsagal1\/ucx_rocm,shssf\/ucx,shssf\/ucx,abouteiller\/ucx,abouteiller\/ucx,sergsagal1\/ucx_rocm,manjugv\/ucx,abouteiller\/ucx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/uct\/sm\/cma\/cma_pd.c\n+++ src\/uct\/sm\/cma\/cma_pd.c\n@@ -45,6 +45,7 @@\n \/* For testing we have to make sure that\n * memh_h != UCT_INVALID_MEM_HANDLE\n * otherwise gtest is not happy *\/\n+ UCS_STATIC_ASSERT((uint64_t)0xdeadbeef != (uint64_t)UCT_INVALID_MEM_HANDLE);\n *memh_p = (void *) 0xdeadbeef;\n return UCS_OK;\n }\n"} {"commit":"29e5b0ead01909dad5150fa9e43424637501e3cf","subject":"implemented key press event","message":"implemented key press event\n","repos":"slyrz\/klingklang","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ui\/window\/wayland.c\n+++ src\/ui\/window\/wayland.c\n@@ -67,6 +67,18 @@\n }\n \n static void\n+_kk_window_event_key_press (kk_window_t *window, int modifier, int key)\n+{\n+ kk_window_event_key_press_t event;\n+\n+ memset (&event, 0, sizeof (kk_window_event_key_press_t));\n+ event.type = KK_WINDOW_KEY_PRESS;\n+ event.key = key;\n+ event.mod = modifier;\n+ kk_event_queue_write (window->events, (void *) &event, sizeof (kk_window_event_key_press_t));\n+}\n+\n+static void\n keyboard_handle_enter (void *data, struct wl_keyboard *keyboard,\n uint32_t serial, struct wl_surface *surface, struct wl_array *keys)\n {\n@@ -82,13 +94,19 @@\n keyboard_handle_key (void *data, struct wl_keyboard *keyboard, uint32_t serial,\n uint32_t time, uint32_t key, uint32_t state)\n {\n- (void) data;\n (void) keyboard;\n (void) serial;\n (void) time;\n- (void) key;\n- (void) state;\n- return;\n+\n+ kk_window_t *window = (kk_window_t *) data;\n+\n+ if (state != WL_KEYBOARD_KEY_STATE_RELEASED)\n+ return;\n+\n+ int sym = kk_keys_get_symbol (window->keys, key + 8);\n+ int mod = kk_keys_get_modifiers (window->keys);\n+\n+ _kk_window_event_key_press (window, mod, sym);\n }\n \n static void\n@@ -119,13 +137,12 @@\n uint32_t serial, uint32_t mods_depressed, uint32_t mods_latched,\n uint32_t mods_locked, uint32_t group)\n {\n- (void) data;\n (void) keyboard;\n (void) serial;\n- (void) mods_depressed;\n- (void) mods_latched;\n- (void) mods_locked;\n- (void) group;\n+\n+ kk_window_t *window = (kk_window_t *) data;\n+\n+ kk_keys_set_modifiers (window->keys, mods_depressed, mods_latched, mods_locked, group);\n return;\n }\n \n"} {"commit":"e091188d7c04c1735bcabaa8f090af22f2cfaf39","subject":"changed path in example code","message":"changed path in example code\n","repos":"Dasug\/TaylorTrack","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/utils\/wave_parser.h\n+++ src\/utils\/wave_parser.h\n@@ -46,7 +46,7 @@\n * @code\n * \/\/ Example usage:\n * \/\/ Simply create a class instance with a string that contains the path to the wav file which should be parsed\n- * taylortrack::utils::WaveParser parser = taylortrack::utils::WaveParser(\"..\/Testdata\/Test.wav\");\n+ * taylortrack::utils::WaveParser parser = taylortrack::utils::WaveParser(\"example.wav\");\n *\n * \/\/ afterwards you can read the data with the function get_samples like this\n * std::string samples = parser.get_samples(2);\n"} {"commit":"5390c4980352263828b56b5509e3231ce8340544","subject":"bugfix: Fix e_notification file having missing initializers for Eldbus Messages & Signals","message":"bugfix: Fix e_notification file having missing initializers for Eldbus\nMessages & Signals\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"rvandegrift\/e,rvandegrift\/e,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_notification.c\n+++ src\/bin\/e_notification.c\n@@ -152,14 +152,14 @@\n static const Eldbus_Method methods[] = {\n { \"Notify\",\n ELDBUS_ARGS({\"s\", \"app_name\"}, {\"u\", \"replaces_id\"}, {\"s\", \"app_icon\"}, {\"s\", \"summary\"}, {\"s\", \"body\"}, {\"as\", \"actions\"}, {\"a{sv}\", \"hints\"}, {\"i\", \"expire_timeout\"}),\n- ELDBUS_ARGS({\"u\", \"id\"}), notify_cb },\n- { \"CloseNotification\", ELDBUS_ARGS({\"u\", \"id\"}), NULL, close_notification_cb },\n+ ELDBUS_ARGS({\"u\", \"id\"}), notify_cb, 0 },\n+ { \"CloseNotification\", ELDBUS_ARGS({\"u\", \"id\"}), NULL, close_notification_cb, 0 },\n { \"GetCapabilities\", NULL, ELDBUS_ARGS({\"as\", \"capabilities\"}),\n- capabilities_cb },\n+ capabilities_cb, 0 },\n { \"GetServerInformation\", NULL,\n ELDBUS_ARGS({\"s\", \"name\"}, {\"s\", \"vendor\"}, {\"s\", \"version\"}, {\"s\", \"spec_version\"}),\n- server_info_cb },\n- { }\n+ server_info_cb, 0 },\n+ { NULL, NULL, NULL, NULL, 0 }\n };\n \n enum\n@@ -170,10 +170,10 @@\n \n static const Eldbus_Signal signals[] = {\n [SIGNAL_NOTIFICATION_CLOSED] =\n- { \"NotificationClosed\", ELDBUS_ARGS({\"u\", \"id\"}, {\"u\", \"reason\"}) },\n+ { \"NotificationClosed\", ELDBUS_ARGS({\"u\", \"id\"}, {\"u\", \"reason\"}), 0 },\n [SIGNAL_ACTION_INVOKED] =\n- { \"ActionInvoked\", ELDBUS_ARGS({\"u\", \"id\"}, {\"s\", \"action_key\"}) },\n- { }\n+ { \"ActionInvoked\", ELDBUS_ARGS({\"u\", \"id\"}, {\"s\", \"action_key\"}), 0 },\n+ { NULL, NULL, 0}\n };\n \n #define PATH \"\/org\/freedesktop\/Notifications\"\n"} {"commit":"a8a6709da393b4d61203f0811be35cc8455d48a5","subject":"Fix coding style","message":"Fix coding style\n","repos":"Keruspe\/ibus,phuang\/ibus,ibus\/ibus,ibus\/ibus,ibus\/ibus-cros,Keruspe\/ibus,ibus\/ibus,phuang\/ibus,j717273419\/ibus,phuang\/ibus,ueno\/ibus,fujiwarat\/ibus,ibus\/ibus-cros,ueno\/ibus,Keruspe\/ibus,j717273419\/ibus,j717273419\/ibus,ibus\/ibus-cros,fujiwarat\/ibus,j717273419\/ibus,fujiwarat\/ibus,ueno\/ibus,ibus\/ibus,phuang\/ibus,ibus\/ibus-cros,ueno\/ibus,ueno\/ibus,Keruspe\/ibus,fujiwarat\/ibus","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/ibusinputcontext.h\n+++ src\/ibusinputcontext.h\n@@ -264,7 +264,7 @@\n * Invoked when the IME engine is changed.\n *\/\n void ibus_input_context_set_engine (IBusInputContext *context,\n- const gchar *name);\n+ const gchar *name);\n \n \n G_END_DECLS\n"} {"commit":"27d63542b40b6d7cf4256d7586bc985b55f774bf","subject":"randr: Also compare screen width & height in same_monitor_configs()","message":"randr: Also compare screen width & height in same_monitor_configs()\n\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\n","repos":"elmarco\/vdagent-gtk,elmarco\/vdagent-gtk,elmarco\/vdagent-gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/vdagent-x11-randr.c\n+++ src\/vdagent-x11-randr.c\n@@ -573,7 +573,9 @@\n *height = max_y;\n }\n \n-static int same_monitor_configs(struct vdagent_x11 *x11, VDAgentMonitorsConfig *mon)\n+static int same_monitor_configs(struct vdagent_x11 *x11,\n+ VDAgentMonitorsConfig *mon,\n+ uint32_t primary_w, uint32_t primary_h)\n {\n int i;\n XRRModeInfo *mode;\n@@ -600,6 +602,9 @@\n }\n mon->num_of_monitors = res->noutput;\n }\n+\n+ if (x11->width != primary_w || x11->height != primary_h)\n+ return 0;\n \n for (i = 0 ; i < mon->num_of_monitors; ++i) {\n if (x11->randr.outputs[i]->ncrtc == 0) {\n@@ -683,7 +688,7 @@\n \n constrain_to_screen(x11, &primary_w, &primary_h);\n \n- if (same_monitor_configs(x11, mon_config)) {\n+ if (same_monitor_configs(x11, mon_config, primary_w, primary_h)) {\n goto exit;\n }\n \n"} {"commit":"29f7b2314b7c465bfe421b74f82e770c54351dd6","subject":"Fixed compile problem in SDL_stretch.c with gcc 3.3","message":"Fixed compile problem in SDL_stretch.c with gcc 3.3\n\n--HG--\nextra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24\/trunk%40628\n","repos":"aduros\/SDL,cebash\/SDL_PSL1GHT,cebash\/SDL_PSL1GHT,cebash\/SDL_PSL1GHT,cebash\/SDL_PSL1GHT,cebash\/SDL_PSL1GHT,aduros\/SDL,aduros\/SDL,aduros\/SDL,aduros\/SDL","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/video\/SDL_stretch.c\n+++ src\/video\/SDL_stretch.c\n@@ -261,9 +261,8 @@\n \t\t\tbreak;\n \t\t default:\n #ifdef __GNUC__\n-\t\t\t__asm__ __volatile__ (\"\n-\t\t\t\tcall _copy_row\n-\t\t\t\"\n+\t\t\t__asm__ __volatile__ (\n+\t\t\t\"call _copy_row\"\n \t\t\t: \"=&D\" (u1), \"=&S\" (u2)\n \t\t\t: \"0\" (dstp), \"1\" (srcp)\n \t\t\t: \"memory\" );\n"} {"commit":"301cb88c140a51cb229d1ba5fa94dc17074f1776","subject":"imap: Removed accidentally commited debug code.","message":"imap: Removed accidentally commited debug code.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-client.c\n+++ src\/imap\/imap-client.c\n@@ -424,8 +424,6 @@\n \n \tcmd = new_cmd->client->command_queue;\n \tfor (; cmd != NULL; cmd = cmd->next) {\n-\t\ti_warning(\"cmd=%s state=%d<=%d flags=%x & %x\",\n-\t\t\t cmd->name, cmd->state, max_state, cmd->cmd_flags, flags);\n \t\tif (cmd->state <= max_state &&\n \t\t cmd != new_cmd && (cmd->cmd_flags & flags) != 0)\n \t\t\treturn cmd;\n"} {"commit":"36c6489694d976897c5bfefaa7b4491b8b8a5983","subject":"imap: When logging command disconnection info, log the oldest command's info (not newest)","message":"imap: When logging command disconnection info, log the oldest command's info (not newest)\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-client.c\n+++ src\/imap\/imap-client.c\n@@ -265,7 +265,7 @@\n \n static const char *client_get_commands_status(struct client *client)\n {\n-\tstruct client_command_context *cmd;\n+\tstruct client_command_context *cmd, *last_cmd = NULL;\n \tunsigned int msecs_in_ioloop;\n \tuint64_t running_usecs = 0, ioloop_wait_usecs;\n \tunsigned long long bytes_in = 0, bytes_out = 0;\n@@ -285,6 +285,7 @@\n \t\trunning_usecs += cmd->running_usecs;\n \t\tbytes_in += cmd->bytes_in;\n \t\tbytes_out += cmd->bytes_out;\n+\t\tlast_cmd = cmd;\n \t}\n \n \tcond = io_loop_find_fd_conditions(current_ioloop, client->fd_out);\n@@ -299,7 +300,7 @@\n \n \tioloop_wait_usecs = io_loop_get_wait_usecs(current_ioloop);\n \tmsecs_in_ioloop = (ioloop_wait_usecs -\n-\t\tclient->command_queue->start_ioloop_wait_usecs + 999) \/ 1000;\n+\t\tlast_cmd->start_ioloop_wait_usecs + 999) \/ 1000;\n \tstr_printfa(str, \" running for %d.%03d + waiting %s for %d.%03d secs\",\n \t\t (int)((running_usecs+999)\/1000 \/ 1000),\n \t\t (int)((running_usecs+999)\/1000 % 1000), cond_str,\n@@ -307,7 +308,7 @@\n \tstr_printfa(str, \", %llu B in + %llu+%\"PRIuSIZE_T\" B out, state=%s)\",\n \t\t bytes_in, bytes_out,\n \t\t o_stream_get_buffer_used_size(client->output),\n-\t\t client_command_state_names[client->command_queue->state]);\n+\t\t client_command_state_names[last_cmd->state]);\n \treturn str_c(str);\n }\n \n"} {"commit":"0525195abc08a40171e99b2dd002e547a00d927d","subject":"imap: CONTEXT search return option wasn't handled at all.","message":"imap: CONTEXT search return option wasn't handled at all.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-search.c\n+++ src\/imap\/imap-search.c\n@@ -67,7 +67,9 @@\n \t\t\tctx->return_options |= SEARCH_RETURN_COUNT;\n \t\telse if (strcmp(name, \"SAVE\") == 0)\n \t\t\tctx->return_options |= SEARCH_RETURN_SAVE;\n-\t\telse if (strcmp(name, \"UPDATE\") == 0)\n+\t\telse if (strcmp(name, \"CONTEXT\") == 0) {\n+\t\t\t\/* no-op *\/\n+\t\t} else if (strcmp(name, \"UPDATE\") == 0)\n \t\t\tctx->return_options |= SEARCH_RETURN_UPDATE;\n \t\telse if (strcmp(name, \"RELEVANCY\") == 0)\n \t\t\tctx->return_options |= SEARCH_RETURN_RELEVANCY;\n"} {"commit":"128013b5bd1c6626e767ee7a60881ef04dd74f18","subject":"Compile fix: Include sys\/time.h for struct timeval.","message":"Compile fix: Include sys\/time.h for struct timeval.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-search.h\n+++ src\/imap\/imap-search.h\n@@ -1,5 +1,7 @@\n #ifndef IMAP_SEARCH_H\n #define IMAP_SEARCH_H\n+\n+#include <sys\/time.h>\n \n enum search_return_options {\n \tSEARCH_RETURN_ESEARCH\t\t= 0x0001,\n"} {"commit":"c84890d29096cde6b4817d3766b7cd31a06f0c16","subject":"Crashfixes","message":"Crashfixes\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-thread.c\n+++ src\/imap\/imap-thread.c\n@@ -1350,11 +1350,11 @@\n }\n \n static int mrec_add_sorted(struct thread_context *ctx,\n-\t\t\t struct mail_thread_moved_rec *parent_mrec,\n+\t\t\t unsigned int parent_mrec_idx,\n \t\t\t struct mail_thread_moved_rec *child_mrec,\n \t\t\t uint32_t child_mrec_idx)\n {\n-\tstruct mail_thread_moved_rec *mrec;\n+\tstruct mail_thread_moved_rec *mrec, *parent_mrec;\n \tconst struct mail_thread_rec *rec, *cmp_rec, *rec_nondummy;\n \tuint32_t idx, prev_idx = 0;\n \tbool children_moved;\n@@ -1362,6 +1362,7 @@\n \tif (mail_thread_rec_get_nondummy(ctx, &child_mrec->rec, &cmp_rec) < 0)\n \t\treturn -1;\n \n+\tparent_mrec = array_idx_modifiable(&ctx->moved_recs, parent_mrec_idx);\n \tfor (idx = parent_mrec->rec.first_child_idx; idx != 0; ) {\n \t\tchildren_moved = TRUE;\n \t\tif (mail_thread_rec_idx_moved(ctx, idx, &children_moved,\n@@ -1390,7 +1391,7 @@\n }\n \n static int mrec_add_root(struct thread_context *ctx,\n-\t\t\t struct mail_thread_moved_rec *parent_mrec,\n+\t\t\t unsigned int parent_mrec_idx,\n \t\t\t const struct mail_thread_root_rec *parent_rrec)\n {\n \tconst struct mail_thread_rec *rec;\n@@ -1407,11 +1408,11 @@\n \tmrec->rec = *rec;\n \tmrec->moved_children = children_moved;\n \n-\treturn mrec_add_sorted(ctx, parent_mrec, mrec, mrec_idx);\n+\treturn mrec_add_sorted(ctx, parent_mrec_idx, mrec, mrec_idx);\n }\n \n static int mrec_add_children(struct thread_context *ctx,\n-\t\t\t struct mail_thread_moved_rec *parent_mrec,\n+\t\t\t unsigned int parent_mrec_idx,\n \t\t\t const struct mail_thread_rec *parent_rec)\n {\n \tconst struct mail_thread_rec *rec;\n@@ -1426,7 +1427,7 @@\n \t\tmrec = array_append_space(&ctx->moved_recs);\n \t\tmrec->rec = *rec;\n \n-\t\tif (mrec_add_sorted(ctx, parent_mrec, mrec, mrec_idx) < 0)\n+\t\tif (mrec_add_sorted(ctx, parent_mrec_idx, mrec, mrec_idx) < 0)\n \t\t\treturn -1;\n \t}\n \treturn 0;\n@@ -1459,11 +1460,11 @@\n \t\t\trrec->moved = TRUE;\n \t\t\trrec->idx = mrec_idx;\n \n-\t\t\tif (mrec_add_children(ctx, mrec, rec) < 0)\n+\t\t\tif (mrec_add_children(ctx, mrec_idx, rec) < 0)\n \t\t\t\treturn -1;\n \n \t\t\twhile (next != NULL && next->reply) {\n-\t\t\t\tmrec_add_root(ctx, mrec, next);\n+\t\t\t\tmrec_add_root(ctx, mrec_idx, next);\n \t\t\t\tnext = next->next;\n \t\t\t}\n \t\t}\n@@ -1473,14 +1474,14 @@\n \t\t\t\/* create dummy *\/\n \t\t\tmrec_idx = array_count(&ctx->moved_recs);\n \t\t\tmrec = array_append_space(&ctx->moved_recs);\n-\t\t\tmrec_add_root(ctx, mrec, rrec);\n+\t\t\tmrec_add_root(ctx, mrec_idx, rrec);\n \n \t\t\tmrec->moved_children = TRUE;\n \t\t\trrec->moved = TRUE;\n \t\t\trrec->idx = mrec_idx;\n \n \t\t\twhile (next != NULL) {\n-\t\t\t\tmrec_add_root(ctx, mrec, next);\n+\t\t\t\tmrec_add_root(ctx, mrec_idx, next);\n \t\t\t\tnext = next->next;\n \t\t\t}\n \t\t}\n@@ -1497,13 +1498,13 @@\n \n \t\tfor (next = rrec->next; next != NULL; next = next->next) {\n \t\t\tif (!ROOT_REC_IS_DUMMY(next))\n-\t\t\t\tmrec_add_root(ctx, mrec, next);\n+\t\t\t\tmrec_add_root(ctx, mrec_idx, next);\n \t\t\telse {\n \t\t\t\tif (mail_thread_rec_idx(ctx, next->idx,\n \t\t\t\t\t\t\t&rec) < 0)\n \t\t\t\t\treturn -1;\n \n-\t\t\t\tif (mrec_add_children(ctx, mrec, rec) < 0)\n+\t\t\t\tif (mrec_add_children(ctx, mrec_idx, rec) < 0)\n \t\t\t\t\treturn -1;\n \t\t\t}\n \t\t}\n"} {"commit":"16ab067c75da6aa4daecd62afc0a95568a22a941","subject":"librados: update librados to define CEPH_OSD_TMAP_SET","message":"librados: update librados to define CEPH_OSD_TMAP_SET\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/include\/librados.h\n+++ src\/include\/librados.h\n@@ -8,6 +8,10 @@\n #include <netinet\/in.h>\n #include <linux\/types.h>\n #include <string.h>\n+\n+#ifndef CEPH_OSD_TMAP_SET\n+#define CEPH_OSD_TMAP_SET 's'\n+#endif\n \n \/* initialization *\/\n int rados_initialize(int argc, const char **argv); \/* arguments are optional *\/\n"} {"commit":"83645b2d2d87a39fa8103b6ee89e0c037a7210f4","subject":"liburing.h: make all file\/IO offset __u64","message":"liburing.h: make all file\/IO offset __u64\n\noff_t may depend on various settings, it's safer to not truncate this\n(temporarily) to an off_t as we use 64-bit types otherwise.\n\nFixes: https:\/\/github.com\/axboe\/liburing\/issues\/403\nSigned-off-by: Jens Axboe <cd8c6775e60d6f67a6984377324e5290df3d5358@kernel.dk>\n","repos":"axboe\/liburing,axboe\/liburing,axboe\/liburing","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/include\/liburing.h\n+++ src\/include\/liburing.h\n@@ -271,14 +271,14 @@\n \n static inline void io_uring_prep_readv(struct io_uring_sqe *sqe, int fd,\n \t\t\t\t const struct iovec *iovecs,\n-\t\t\t\t unsigned nr_vecs, off_t offset)\n+\t\t\t\t unsigned nr_vecs, __u64 offset)\n {\n \tio_uring_prep_rw(IORING_OP_READV, sqe, fd, iovecs, nr_vecs, offset);\n }\n \n static inline void io_uring_prep_read_fixed(struct io_uring_sqe *sqe, int fd,\n \t\t\t\t\t void *buf, unsigned nbytes,\n-\t\t\t\t\t off_t offset, int buf_index)\n+\t\t\t\t\t __u64 offset, int buf_index)\n {\n \tio_uring_prep_rw(IORING_OP_READ_FIXED, sqe, fd, buf, nbytes, offset);\n \tsqe->buf_index = buf_index;\n@@ -286,14 +286,14 @@\n \n static inline void io_uring_prep_writev(struct io_uring_sqe *sqe, int fd,\n \t\t\t\t\tconst struct iovec *iovecs,\n-\t\t\t\t\tunsigned nr_vecs, off_t offset)\n+\t\t\t\t\tunsigned nr_vecs, __u64 offset)\n {\n \tio_uring_prep_rw(IORING_OP_WRITEV, sqe, fd, iovecs, nr_vecs, offset);\n }\n \n static inline void io_uring_prep_write_fixed(struct io_uring_sqe *sqe, int fd,\n \t\t\t\t\t const void *buf, unsigned nbytes,\n-\t\t\t\t\t off_t offset, int buf_index)\n+\t\t\t\t\t __u64 offset, int buf_index)\n {\n \tio_uring_prep_rw(IORING_OP_WRITE_FIXED, sqe, fd, buf, nbytes, offset);\n \tsqe->buf_index = buf_index;\n@@ -439,13 +439,13 @@\n }\n \n static inline void io_uring_prep_read(struct io_uring_sqe *sqe, int fd,\n-\t\t\t\t void *buf, unsigned nbytes, off_t offset)\n+\t\t\t\t void *buf, unsigned nbytes, __u64 offset)\n {\n \tio_uring_prep_rw(IORING_OP_READ, sqe, fd, buf, nbytes, offset);\n }\n \n static inline void io_uring_prep_write(struct io_uring_sqe *sqe, int fd,\n-\t\t\t\t const void *buf, unsigned nbytes, off_t offset)\n+\t\t\t\t const void *buf, unsigned nbytes, __u64 offset)\n {\n \tio_uring_prep_rw(IORING_OP_WRITE, sqe, fd, buf, nbytes, offset);\n }\n@@ -461,7 +461,7 @@\n }\n \n static inline void io_uring_prep_fadvise(struct io_uring_sqe *sqe, int fd,\n-\t\t\t\t\t off_t offset, off_t len, int advice)\n+\t\t\t\t\t __u64 offset, off_t len, int advice)\n {\n \tio_uring_prep_rw(IORING_OP_FADVISE, sqe, fd, NULL, len, offset);\n \tsqe->fadvise_advice = advice;\n@@ -542,7 +542,7 @@\n \n static inline void io_uring_prep_sync_file_range(struct io_uring_sqe *sqe,\n \t\t\t\t\t\t int fd, unsigned len,\n-\t\t\t\t\t\t off_t offset, int flags)\n+\t\t\t\t\t\t __u64 offset, int flags)\n {\n \tio_uring_prep_rw(IORING_OP_SYNC_FILE_RANGE, sqe, fd, NULL, len, offset);\n \tsqe->sync_range_flags = flags;\n"} {"commit":"d67dbd95b7564a596feaf40c0d246265cd630d2d","subject":"net: Revert namespace in src\/include\/net\/sock.h","message":"net: Revert namespace in src\/include\/net\/sock.h\n","repos":"embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/include\/net\/sock.h\n+++ src\/include\/net\/sock.h\n@@ -92,7 +92,9 @@\n \tstruct timeval last_packet_tstamp;\n \tsize_t addr_len;\n \tint err;\n+#if defined(NET_NAMESPACE_ENABLED) && (NET_NAMESPACE_ENABLED == 1)\n \tnet_namespace_p net_ns;\n+#endif\n };\n \n static inline int sock_err(struct sock *sk) {\n"} {"commit":"7fde959ddb68c90029df118e7de64cfabfd1cdf5","subject":"Add implementation of insertion function for the DAG","message":"Add implementation of insertion function for the DAG\n","repos":"waysome\/waysome,waysome\/waysome","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/input\/hotkey_dag.c\n+++ src\/input\/hotkey_dag.c\n@@ -30,10 +30,49 @@\n #include <string.h>\n \n #include \"input\/hotkey_dag.h\"\n+#include \"input\/hotkey_event.h\"\n \n \n #define DAG_TAB_CHILD_NUM_EXP (4)\n #define DAG_TAB_CHILD_NUM (1 << DAG_TAB_CHILD_NUM_EXP)\n+\n+\n+\/*\n+ *\n+ * Forward declarations\n+ *\n+ *\/\n+\n+\/**\n+ * Get the next DAG node, creating it if it does not exist\n+ *\/\n+static struct ws_hotkey_dag_node*\n+hotkey_dag_get(\n+ struct ws_hotkey_dag_node* node, \/\/!< node from which to get the next one\n+ uint16_t code \/\/!< code of the new next node\n+)\n+__ws_nonnull__(1)\n+;\n+\n+\/**\n+ * Make sure a root may have a child suitable for a code\n+ *\n+ * @return 0 if the root is suitable for storing the code is initialized,\n+ * a negative error number otherwise\n+ *\/\n+static int\n+add_roots_for(\n+ struct ws_hotkey_dag_tab* tab, \/\/!< tab which must be extended\n+ uint16_t code \/\/!< code which must be storable under the root\n+)\n+__ws_nonnull__(1)\n+;\n+\n+\/**\n+ * Create new tab node\n+ *\/\n+static void**\n+create_tab_node(void);\n \n \n \/*\n@@ -96,8 +135,23 @@\n struct ws_hotkey_dag_node* node,\n struct ws_hotkey_event* event\n ) {\n- \/\/!< @todo iterate over all the permutations possible, inserting\n- return -1;\n+ uint16_t* code = event->codes;\n+ uint16_t num = event->code_num;\n+\n+ \/\/ traverse the tree, creating nodes where neccessary\n+ while (num--) {\n+ node = hotkey_dag_get(node, *code);\n+ ++code;\n+ }\n+\n+ if (node->event) {\n+ \/\/ the node already exists\n+ return -EEXIST;\n+ }\n+\n+ \/\/ finally, insert the event\n+ node->event = getref(event);\n+ return 0;\n }\n \n int\n@@ -110,3 +164,105 @@\n }\n \n \n+\/*\n+ *\n+ * Internal implementation\n+ *\n+ *\/\n+\n+static struct ws_hotkey_dag_node*\n+hotkey_dag_get(\n+ struct ws_hotkey_dag_node* node,\n+ uint16_t code\n+) {\n+ \/\/ make sure the root is sane for the code we want to insert\n+ if (add_roots_for(&node->table, code) < 0) {\n+ return NULL;\n+ }\n+\n+ struct ws_hotkey_dag_tab cur = node->table;\n+\n+ \/\/ step on which the node is based.\n+ int step = DAG_TAB_CHILD_NUM_EXP * cur.depth;\n+\n+ \/\/ move towards the bottom\n+ while (cur.depth) {\n+ \/\/ determine where to go next...\n+ void** tab = cur.nodes.tab + ((code - cur.start) >> step);\n+\n+ \/\/ initializing the node if neccessary\n+ if (!*tab) {\n+ *tab = create_tab_node();\n+ if (!*tab) {\n+ return NULL;\n+ }\n+ }\n+\n+ \/\/ regenerage all the variables\n+ cur.nodes.tab = *tab;\n+ cur.start = code & ~((1 << step) - 1);\n+ step -= DAG_TAB_CHILD_NUM_EXP;\n+ --cur.depth;\n+ }\n+\n+ struct ws_hotkey_dag_node** retp = cur.nodes.dag + (code - cur.start);\n+ if (!*retp) {\n+ *retp = malloc(sizeof(*retp));\n+ if (ws_hotkey_dag_init(*retp) < 0) {\n+ free(*retp);\n+ *retp = NULL;\n+ }\n+ }\n+\n+ return *retp;\n+}\n+\n+static int\n+add_roots_for(\n+ struct ws_hotkey_dag_tab* tab,\n+ uint16_t code\n+) {\n+\n+ \/\/ the table _might_ be completely empty\n+ if (!tab->nodes.tab) {\n+ tab->nodes.tab = create_tab_node();\n+ if (!tab->nodes.tab) {\n+ return -ENOMEM;\n+ }\n+ if (tab->depth == 0) {\n+ tab->start = code & ~(DAG_TAB_CHILD_NUM - 1);\n+ }\n+ }\n+\n+ \/\/ step on which the node is based.\n+ int step = DAG_TAB_CHILD_NUM_EXP * tab->depth;\n+\n+ \/\/ position within the node\n+ size_t pos = (code - tab->start) >> step;\n+\n+ \/\/ extend the table \"upwards\", if necessary\n+ while ((code < tab->start) || (pos > DAG_TAB_CHILD_NUM)) {\n+ \/\/ we have to create a new node\n+ void** tab_node = create_tab_node();\n+\n+ size_t old_root_pos = (tab->start >> step);\n+\n+ \/\/ put in the new root\n+ tab_node[old_root_pos & (DAG_TAB_CHILD_NUM - 1)] = tab->nodes.tab;\n+ tab->nodes.tab = tab_node;\n+ ++tab->depth;\n+\n+ \/\/ regen step, pos and start\n+ step += DAG_TAB_CHILD_NUM_EXP;\n+ tab->start = old_root_pos << step;\n+ pos >>= DAG_TAB_CHILD_NUM_EXP;\n+ }\n+\n+ return 0;\n+}\n+\n+static void**\n+create_tab_node(void) {\n+ return calloc(DAG_TAB_CHILD_NUM, sizeof(void*));\n+}\n+\n"} {"commit":"e4b202a4148e534927e7f6662f1de3be9d1a5583","subject":"geneve: fix variable initial value","message":"geneve: fix variable initial value\n\nIt is not good enough to initialize sw_if_index0 = 0,\nsw_if_index1 = 0, as it maybe causes the first two\nincoming packets to miss necessary computation.\n\nChange-Id: Ifcab408d9514820e0daa280f4c73956db13b59be\nSigned-off-by: Zhiyong Yang <fbdb847fac8e5e50b588eb93d9ff9fd811b7568c@intel.com>\n","repos":"vpp-dev\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,FDio\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,vpp-dev\/vpp,chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vnet\/geneve\/encap.c\n+++ src\/vnet\/geneve\/encap.c\n@@ -81,7 +81,7 @@\n u16 old_l0 = 0, old_l1 = 0;\n u32 thread_index = vm->thread_index;\n u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;\n- u32 sw_if_index0 = 0, sw_if_index1 = 0;\n+ u32 sw_if_index0 = ~0, sw_if_index1 = ~0;\n u32 next0 = 0, next1 = 0;\n vnet_hw_interface_t *hi0, *hi1;\n geneve_tunnel_t *t0 = NULL, *t1 = NULL;\n"} {"commit":"79c38af0fded49e65fd09fbd9bfa1dda8af475ec","subject":"Fix assert issue in ip_csum_add_even()","message":"Fix assert issue in ip_csum_add_even()\n\nASSERT (ip_csum_with_carry (d, x) == c) will raise assert\nif d equals to zero while x not equals to zero.\n\nChange-Id: Ia9ccdbf801ae565eaadd49f04569d13bfc31cba8\nSigned-off-by: Hongjun Ni <e6547d24d7149371d2bb4b8f7cc3ef66745c46d6@intel.com>\n","repos":"FDio\/vpp,FDio\/vpp,vpp-dev\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,vpp-dev\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vnet\/ip\/ip_packet.h\n+++ src\/vnet\/ip\/ip_packet.h\n@@ -107,7 +107,8 @@\n \/* Fold in carry from high bit. *\/\n d -= d > c;\n \n- ASSERT (ip_csum_with_carry (d, x) == c);\n+ ip_csum_t t = ip_csum_with_carry (d, x);\n+ ASSERT ((t - c == 0) || (t - c == ~0));\n \n return d;\n }\n"} {"commit":"0ab926dfbf56ad6482b875d980ae95c533b765f9","subject":"anv: Don't teardown uninitialized anv_physical_device","message":"anv: Don't teardown uninitialized anv_physical_device\n\nIf the user called vkDestroyDevice but never called\nvkEnumeratePhysicalDevices, then the driver tried to ralloc_free() an\nunitialized anv_physical_device.\n\nFixes test 'dEQP-VK.api.device_init.create_instance_name_version'.\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/vulkan\/anv_device.c\n+++ src\/vulkan\/anv_device.c\n@@ -224,7 +224,12 @@\n {\n ANV_FROM_HANDLE(anv_instance, instance, _instance);\n \n- anv_physical_device_finish(&instance->physicalDevice);\n+ if (instance->physicalDeviceCount > 0) {\n+ \/* We support at most one physical device. *\/\n+ assert(instance->physicalDeviceCount == 1);\n+ anv_physical_device_finish(&instance->physicalDevice);\n+ }\n+\n anv_finish_wsi(instance);\n \n VG(VALGRIND_DESTROY_MEMPOOL(instance));\n"} {"commit":"e40bdcef1fb6127545999a0b671b49fa393652b4","subject":"vk\/device: Add anv_instance_alloc\/free helpers","message":"vk\/device: Add anv_instance_alloc\/free helpers\n\nThis way we can more consistently alloc\/free the device and it will provide\nus a better place to put valgrind hooks in the next patch\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/vulkan\/anv_device.c\n+++ src\/vulkan\/anv_device.c\n@@ -159,6 +159,25 @@\n instance->pfnFree(instance->pAllocUserData, instance);\n \n return VK_SUCCESS;\n+}\n+\n+static void *\n+anv_instance_alloc(struct anv_instance *instance, size_t size,\n+ size_t alignment, VkSystemAllocType allocType)\n+{\n+ void *mem = instance->pfnAlloc(instance->pAllocUserData,\n+ size, alignment, allocType);\n+ VG(VALGRIND_MAKE_MEM_UNDEFINED(mem, size));\n+ return mem;\n+}\n+\n+static void\n+anv_instance_free(struct anv_instance *instance, void *mem)\n+{\n+ if (mem == NULL)\n+ return;\n+\n+ instance->pfnFree(instance->pAllocUserData, mem);\n }\n \n VkResult anv_EnumeratePhysicalDevices(\n@@ -546,8 +565,7 @@\n \n assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO);\n \n- device = instance->pfnAlloc(instance->pAllocUserData,\n- sizeof(*device), 8,\n+ device = anv_instance_alloc(instance, sizeof(*device), 8,\n VK_SYSTEM_ALLOC_TYPE_API_OBJECT);\n if (!device)\n return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);\n@@ -635,7 +653,7 @@\n if (device->aub_writer)\n anv_aub_writer_destroy(device->aub_writer);\n \n- anv_device_free(device, device);\n+ anv_instance_free(device->instance, device);\n \n return VK_SUCCESS;\n }\n@@ -844,21 +862,14 @@\n size_t alignment,\n VkSystemAllocType allocType)\n {\n- void *mem = device->instance->pfnAlloc(device->instance->pAllocUserData,\n- size, alignment, allocType);\n- VG(VALGRIND_MAKE_MEM_UNDEFINED(mem, size));\n- return mem;\n+ return anv_instance_alloc(device->instance, size, alignment, allocType);\n }\n \n void\n anv_device_free(struct anv_device * device,\n void * mem)\n {\n- if (mem == NULL)\n- return;\n-\n- return device->instance->pfnFree(device->instance->pAllocUserData,\n- mem);\n+ anv_instance_free(device->instance, mem);\n }\n \n VkResult\n"} {"commit":"e7fd8fc6816604cc50d2085d178f240ced0d534e","subject":"Use CFE_AUTOCOLOR if the text colour is black, fixes bug #35","message":"Use CFE_AUTOCOLOR if the text colour is black, fixes bug #35","repos":"FranklinChen\/Hugs,FranklinChen\/Hugs,FranklinChen\/Hugs,FranklinChen\/Hugs,FranklinChen\/Hugs,FranklinChen\/Hugs,FranklinChen\/Hugs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/winhugs\/RtfWindow.c\n+++ src\/winhugs\/RtfWindow.c\n@@ -318,6 +318,14 @@\n IsTimer = FALSE;\n }\n \n+void FixCharFormat(CHARFORMAT2* cf)\n+{\n+\tif (cf->crTextColor == BLACK)\n+\t\tcf->dwEffects |= CFE_AUTOCOLOR;\n+\tif (cf->crBackColor == WHITE)\n+\t\tcf->dwEffects |= CFE_AUTOBACKCOLOR;\n+}\n+\n void WriteBuffer(LPCTSTR s, int Len)\n {\n CHARRANGE cr;\n@@ -336,6 +344,7 @@\n cf.dwEffects = (BufFormat.Bold ? CFE_BOLD : 0) |\n \t\t (BufFormat.Italic ? CFE_ITALIC : 0) |\n \t\t (BufFormat.Underline ? CFE_UNDERLINE : 0);\n+\tFixCharFormat(&cf);\n SendMessage(hRTF, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf);\n \/\/ setcharformat seems to screw up the current selection!\n \n"} {"commit":"6af3dbdedafde56f1be4110e5a488c819a33af29","subject":"Initial commit for n-Queens Solver written in C","message":"Initial commit for n-Queens Solver written in C\n\nThe program is uses dynamical allocation and accepts a single integer\nargument, representing n. via the command line when executed.\n","repos":"JDSWalker\/n-Queens_Problem,JDSWalker\/n-Queens_Problem,JDSWalker\/n-Queens_Problem,JDSWalker\/n-Queens_Problem,JDSWalker\/n-Queens_Problem","returncode":1,"stderr":"error: pathspec 'src_C\/n_queens_solver.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src_C\/n_queens_solver.c\n+++ src_C\/n_queens_solver.c\n@@ -0,0 +1,171 @@\n+\/\/ n-Queens Solver\n+\/\/ Author: James Walker\n+\/\/ Copyrighted 2017 under the MIT license:\n+\/\/ http:\/\/www.opensource.org\/licenses\/mit-license.php\n+\/\/\n+\/\/ Purpose: \n+\/\/ The n-Queens Solver finds solutions for the n-Queens problem. That is, how\n+\/\/ many ways are there to place n chess queens on an n x n chess board such\n+\/\/ that none of the queens can attack each other.\n+\/\/ Compilation, Execution and Partial Output:\n+\/\/ $ gcc -std=c99 n_queens_solver.c -o n_queens_solver\n+\/\/ $ .\/n_queens_solver.exe 8\n+\/\/ 1 5 8 6 3 7 2 4\n+\/\/ 1 6 8 3 7 4 2 5\n+\/\/ ...\n+\/\/ 8 3 1 6 2 5 7 4\n+\/\/ 8 4 1 3 6 2 7 5\n+\/\/\n+\/\/ This implementation is based off the algorithm provided at the bottom of this\n+\/\/ webpage: www.cs.utexas.edu\/users\/EWD\/transcriptions\/EWD03xx\/EWD316.9.html\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+struct chess_board {\n+ \/\/ Chess board variables\n+ int n_size; \/\/ Number of queens on the n x n chess board\n+ int *queens; \/\/ Store queen positions on the board\n+ int *column; \/\/ Store available column moves\/attacks\n+ int *diagonal_up; \/\/ Store available diagonal moves\/attacks\n+ int *diagonal_down;\n+ int col_i; \/\/ Store current column to examine on the board\n+};\n+\n+void allocation_error(const int error_code) {\n+ switch (error_code) {\n+ case 0:\n+ fprintf(stderr, \"The number of queens must be greater than 0.\\n\");\n+ case 1:\n+ fprintf(stderr, \"Failed to allocate memory for chess board.\\n\");\n+ break;\n+ case 2:\n+ fprintf(stderr, \"Failed to allocate memory for chess queens.\\n\");\n+ break;\n+ case 3:\n+ fprintf(stderr, \"Failed to allocate memory for column attacks.\\n\");\n+ break;\n+ case 4:\n+ fprintf(stderr, \"Failed to allocate memory for diagonal up attacks.\\n\");\n+ break;\n+ case 5:\n+ fprintf(stderr, \"Failed to allocate memory for diagonal down attacks.\\n\");\n+ break;\n+ }\n+ exit(EXIT_FAILURE);\n+}\n+\n+struct chess_board *initialize_board(const int n_queens) {\n+ if (n_queens < 1) {\n+ allocation_error(0);\n+ }\n+ \/\/ Dynamically allocate memory for chessboard\n+ struct chess_board *board = malloc(sizeof(struct chess_board));\n+ if (board == NULL) {\n+ allocation_error(1);\n+ }\n+ \/\/ Dynamically allocate memory for chessboard variables\n+ board->queens = (int *)malloc(sizeof(int) * n_queens);\n+ if(board->queens == NULL) {\n+ allocation_error(2);\n+ }\n+ board->column = (int *)malloc(sizeof(int) * n_queens);\n+ if(board->column == NULL) {\n+ allocation_error(3);\n+ }\n+ board->diagonal_up = (int *)malloc(sizeof(int) * (2*n_queens - 1));\n+ if(board->diagonal_up == NULL) {\n+ allocation_error(4);\n+ }\n+ board->diagonal_down = (int *)malloc(sizeof(int) * (2*n_queens - 1));\n+ if(board->diagonal_down == NULL) {\n+ allocation_error(5);\n+ }\n+ \/\/ Initialize the chess board variables\n+ board->n_size = n_queens;\n+ board->col_i = 0;\n+ for(int i = 0; i < n_queens; ++i) {\n+ board->queens[i] = 0;\n+ board->column[i] = 1;\n+ board->diagonal_up[i] = 1;\n+ board->diagonal_down[i] = 1;\n+ }\n+ \/\/ Initialize remaining array indices\n+ for(int i = n_queens; i < (2*n_queens - 1); ++i) {\n+ board->diagonal_up[i] = 1;\n+ board->diagonal_down[i] = 1;\n+ }\n+ return board;\n+}\n+\n+void smash_board(struct chess_board *board) {\n+ free(board->queens);\n+ free(board->column);\n+ free(board->diagonal_up);\n+ free(board->diagonal_down);\n+ free(board);\n+}\n+\n+\/\/ Check if a queen can be placed in column 'i', at row 'j'\n+int square_is_free(const struct chess_board *board, const int row_j) {\n+ return board->column[row_j] &\n+ board->diagonal_up[(board->n_size - 1) + (board->col_i - row_j)] &\n+ board->diagonal_down[(board->col_i + row_j)];\n+}\n+\n+\/\/ Place a queen on the chess board\n+void set_queen(struct chess_board *board, const int row_j) {\n+ board->queens[board->col_i] = row_j;\n+ board->column[row_j] = 0;\n+ board->diagonal_up[(board->n_size - 1) + (board->col_i - row_j)] = 0;\n+ board->diagonal_down[(board->col_i + row_j)] = 0;\n+ board->col_i += 1;\n+}\n+\n+void remove_queen(struct chess_board *board, const int row_j) {\n+ board->col_i -= 1;\n+ board->diagonal_down[(board->col_i + row_j)] = 1;\n+ board->diagonal_up[(board->n_size - 1) + (board->col_i - row_j)] = 1;\n+ board->column[row_j] = 1;\n+}\n+\n+void print_solution(const struct chess_board *board) {\n+ for (int col = 0; col < board->n_size; ++col) {\n+ fprintf(stdout, \"%d \", board->queens[col] + 1);\n+ }\n+ fputc('\\n', stdout);\n+}\n+\n+void place_next_queen(struct chess_board *board) {\n+ for (int row_j = 0; row_j < board->n_size; ++row_j) {\n+ if (square_is_free(board, row_j)) {\n+ set_queen(board, row_j);\n+ if (board->col_i == board->n_size) {\n+ \/\/ Chess board is full\n+ print_solution(board);\n+ } else {\n+ \/\/ Recursive call to find next queen placement on the chess board\n+ place_next_queen(board);\n+ }\n+ \/\/ Removes the queen from the chess board at column 'i', at row 'j' to\n+ \/\/ backtrack for the next loop\n+ remove_queen(board, row_j);\n+ }\n+ }\n+}\n+\n+int main(int argc, char *argv[]) {\n+ struct chess_board *board;\n+\tif (argc == 1) {\n+\t \/\/ Defaults to the 4-queens problem if no input is provided\n+ board = initialize_board(4L);\n+\t} else {\n+ board = initialize_board(atoi(argv[1]));\n+ }\n+ \/\/ Start solver algorithm\n+ place_next_queen(board);\n+ \/\/ Free dynamically allocated memory\n+ smash_board(board);\n+ return EXIT_SUCCESS;\n+}\n"} {"commit":"f32f89484c4e817663b3de41c5f7b8d324827742","subject":"explicit fallthroughs","message":"explicit fallthroughs\n","repos":"openss7\/openss7,openss7\/openss7,openss7\/openss7,openss7\/openss7,openss7\/openss7,openss7\/openss7,openss7\/openss7,openss7\/openss7","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/kernel\/aixcompat.c\n+++ src\/kernel\/aixcompat.c\n@@ -193,6 +193,7 @@\n \t\t\t\tbreak;\n \t\t\tcase SQLVL_DEFAULT:\n \t\t\t\tcdev->d_sqlvl = SQLVL_MODULE;\n+\t\t\t\t__attribute__((fallthrough));\n \t\t\tcase SQLVL_MODULE:\n \t\t\t\tcdev->d_flag |= D_MTPERMOD;\n \t\t\t\tbreak;\n@@ -274,6 +275,7 @@\n \t\t\t\tbreak;\n \t\t\tcase SQLVL_DEFAULT:\n \t\t\t\tfmod->f_sqlvl = SQLVL_MODULE;\n+\t\t\t\t__attribute__((fallthrough));\n \t\t\tcase SQLVL_MODULE:\n \t\t\t\tfmod->f_flag |= D_MTPERMOD;\n \t\t\t\tbreak;\n"} {"commit":"cdc4570f90db23ccb14ba6103dc4b242f97048db","subject":"kclient: avoid get_random_int(), it's new","message":"kclient: avoid get_random_int(), it's new\n\nJust use get_random_bytes instead.\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/kernel\/messenger.c\n+++ src\/kernel\/messenger.c\n@@ -1559,7 +1559,8 @@\n \t\tdout(\"create ip not specified, initially INADDR_ANY\\n\");\n \t\tmsgr->inst.addr.ipaddr.sin_addr.s_addr = htonl(INADDR_ANY);\n \t\tmsgr->inst.addr.ipaddr.sin_port = htons(0); \/* any port *\/\n-\t\tmsgr->inst.addr.nonce = get_random_int();\n+\t\tget_random_bytes(&msgr->inst.addr.nonce,\n+\t\t\t\t sizeof(msgr->inst.addr.nonce));\n \t}\n \tmsgr->inst.addr.ipaddr.sin_family = AF_INET;\n \n"} {"commit":"74a8f6217747cca229d50bdacd631ce8354dc07e","subject":"Fix potential misalignment issue in sgemm kernel","message":"Fix potential misalignment issue in sgemm kernel\n","repos":"jnbraun\/bcnn,jnbraun\/bcnn","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/kernels\/bcnn_mat.c\n+++ src\/kernels\/bcnn_mat.c\n@@ -2307,7 +2307,7 @@\n static void sgemm_ukernel(int kc, float alpha, const float *A, const float *B,\n float beta, float *C, int inc_row_C, int inc_col_C,\n int mr, int nr, float *AB0) {\n- float AB[MR * NR];\n+ float AB[MR * NR] __attribute__((aligned(32)));\n #if (defined(BCNN_USE_AVX))\n __m256 abv0 = _mm256_setzero_ps();\n __m256 abv1 = _mm256_setzero_ps();\n"} {"commit":"b7d02fc5b958d58f978eaa63e4b0f1214b657753","subject":"Updated PhraseType","message":"Updated PhraseType\n\nNow it has modifier and article.\n","repos":"Naftoreiclag\/Libirid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/language\/Grammar.h\n+++ src\/language\/Grammar.h\n@@ -13,7 +13,9 @@\n enum PhraseType\n {\n noun,\n- adjunct\n+ adjunct,\n+ modifier,\n+ article\n };\n \n \/\/ Articles\n"} {"commit":"2296d6898ea5f2ad354410ea419f049bcb575118","subject":"bencode.c: Cleanup returning value [CLEANUP]","message":"bencode.c: Cleanup returning value [CLEANUP]\n","repos":"japeq\/bencode-tools,japeq\/bencode-tools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bencode.c\n+++ bencode.c\n@@ -127,9 +127,7 @@\n \n const char *ben_current_buf(const struct ben_decode_ctx *ctx, size_t n)\n {\n-\tif (ben_need_bytes(ctx, n))\n-\t\treturn NULL;\n-\treturn ctx->data + ctx->off;\n+\treturn ben_need_bytes(ctx, n) ? NULL : ctx->data + ctx->off;\n }\n \n void ben_skip(struct ben_decode_ctx *ctx, size_t n)\n"} {"commit":"969335b05ab27811a9ae3c3047372f95eee9157c","subject":"bencode.c: Optimize bencode_dict serialization from O(n^2) to O(n*log(n)) [PERFECTIVE]","message":"bencode.c: Optimize bencode_dict serialization from O(n^2) to O(n*log(n)) [PERFECTIVE]\n\nThe worst case behaviour is still O(n^2) due to qsort().\n","repos":"japeq\/bencode-tools,japeq\/bencode-tools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bencode.c\n+++ bencode.c\n@@ -6,6 +6,11 @@\n #include <assert.h>\n #include <errno.h>\n #include <ctype.h>\n+\n+struct bencode_keyvalue {\n+\tstruct bencode *key;\n+\tstruct bencode *value;\n+};\n \n static struct bencode *decode(const char *data, size_t len, size_t *off,\n \t\t\t int level);\n@@ -134,7 +139,9 @@\n \n static int bencmpqsort(const void *a, const void *b)\n {\n-\treturn bencmp(a, b);\n+\tconst struct bencode *akey = ((const struct bencode_keyvalue *) a)->key;\n+\tconst struct bencode *bkey = ((const struct bencode_keyvalue *) b)->key;\n+\treturn bencmp(akey, bkey);\n }\n \n static struct bencode *decode_dict(const char *data, size_t len, size_t *off,\n@@ -442,9 +449,9 @@\n \tconst struct bencode_int *integer;\n \tconst struct bencode_list *list;\n \tconst struct bencode_str *s;\n-\tstruct bencode **keys;\n \tsize_t i;\n \tint len;\n+\tstruct bencode_keyvalue *pairs;\n \n \tswitch (b->type) {\n \tcase BENCODE_BOOL:\n@@ -461,25 +468,25 @@\n \n \t\tdict = ben_dict_const_cast(b);\n \n-\t\tkeys = malloc(dict->n * sizeof(keys[0]));\n-\t\tif (keys == NULL) {\n+\t\tpairs = malloc(dict->n * sizeof(pairs[0]));\n+\t\tif (pairs == NULL) {\n \t\t\tfprintf(stderr, \"bencode: No memory for dict serialization\\n\");\n \t\t\treturn -1;\n \t\t}\n-\t\tfor (i = 0; i < dict->n; i++)\n-\t\t\tkeys[i] = dict->keys[i];\n-\t\tqsort(keys, dict->n, sizeof(keys[0]), bencmpqsort);\n-\n \t\tfor (i = 0; i < dict->n; i++) {\n-\t\t\tstruct bencode *value;\n-\t\t\tif (serialize(data, size, pos, keys[i]))\n+\t\t\tpairs[i].key = dict->keys[i];\n+\t\t\tpairs[i].value = dict->values[i];\n+\t\t}\n+\t\tqsort(pairs, dict->n, sizeof(pairs[0]), bencmpqsort);\n+\n+\t\tfor (i = 0; i < dict->n; i++) {\n+\t\t\tif (serialize(data, size, pos, pairs[i].key))\n \t\t\t\tbreak;\n-\t\t\tvalue = ben_dict_get(b, keys[i]);\n-\t\t\tif (serialize(data, size, pos, value))\n+\t\t\tif (serialize(data, size, pos, pairs[i].value))\n \t\t\t\tbreak;\n \t\t}\n-\t\tfree(keys);\n-\t\tkeys = NULL;\n+\t\tfree(pairs);\n+\t\tpairs = NULL;\n \t\tif (i < dict->n)\n \t\t\treturn -1;\n \n"} {"commit":"df03feca468093cb15473e2e8854ea641a628332","subject":"adding brightness to the mix","message":"adding brightness to the mix\n","repos":"mpinner\/Active,kidaa\/Active,kidaa\/Active,mpinner\/Active,mpinner\/Active,mpinner\/Active,kidaa\/Active,mpinner\/Active,mpinner\/Active,kidaa\/Active,kidaa\/Active,kidaa\/Active","returncode":1,"stderr":"error: pathspec 'src\/lib\/effect_mixer.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src\/lib\/effect_mixer.h\n+++ src\/lib\/effect_mixer.h\n@@ -0,0 +1,395 @@\n+\/*\n+ * LED Effect mixing board: Runs any number of effects concurrently,\n+ * and mix the results together.\n+ *\n+ * This is an optional layer. You can connect an Effect directly to\n+ * the EffectRunner, and this skips a lot of complexity and memory\n+ * usage. But if you add an EffectMixer, we use multiple threads and\n+ * we keep a separate RGB buffer for each effect. This allows single\n+ * effects or multiple effects to be sliced over multiple CPU cores.\n+ *\n+ * Copyright (c) 2014 Micah Elizabeth Scott <micah@scanlime.org>\n+ *\n+ * Permission is hereby granted, free of charge, to any person\n+ * obtaining a copy of this software and associated documentation\n+ * files (the \"Software\"), to deal in the Software without\n+ * restriction, including without limitation the rights to use,\n+ * copy, modify, merge, publish, distribute, sublicense, and\/or sell\n+ * copies of the Software, and to permit persons to whom the\n+ * Software is furnished to do so, subject to the following\n+ * conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be\n+ * included in all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n+ * OTHER DEALINGS IN THE SOFTWARE.\n+ *\/\n+\n+#pragma once\n+\n+#include <queue>\n+#include <vector>\n+\n+#include \"effect.h\"\n+#include \"tinythread.h\"\n+\n+#include \"BlackLib.h\"\n+#include \"BlackDef.h\"\n+\n+\n+\n+class EffectMixer : public Effect {\n+public:\n+ EffectMixer();\n+ ~EffectMixer();\n+\n+ \/\/ Managing channels\n+ int numChannels();\n+ void clear();\n+ void set(Effect *effect);\n+ int add(Effect *effect, float fader = 1.0);\n+ int find(Effect *effect);\n+ void remove(int index);\n+ void remove(Effect *effect);\n+ void setFader(int channel, float fader);\n+ void setFader(Effect *effect, float fader);\n+\n+ \/\/ Set number of threads. By default, we auto-detect\n+ void setConcurrency(unsigned numThreads);\n+\n+ virtual void shader(Vec3& rgb, const PixelInfo& p) const;\n+ virtual void postProcess(const Vec3& rgb, const PixelInfo& p);\n+ virtual void beginFrame(const FrameInfo& f);\n+ virtual void endFrame(const FrameInfo& f);\n+ virtual void debug(const DebugInfo& d);\n+\n+private:\n+ struct Channel {\n+ Effect *effect;\n+ float fader;\n+ std::vector<Vec3> colors;\n+ };\n+\n+ struct Task {\n+ Channel *channel;\n+ const Effect::PixelInfo *pixelInfo;\n+ unsigned begin;\n+ unsigned end;\n+ };\n+\n+ struct ThreadContext {\n+ EffectMixer *mixer;\n+ tthread::thread *thread;\n+ bool runFlag;\n+ };\n+\n+ \/\/ Channels only to be modified when threads are idle\n+ std::vector<Channel> channels;\n+\n+ \/\/ Running threads\n+ std::vector<ThreadContext*> threads;\n+ unsigned numThreadsConfigured;\n+\n+ \/\/ Lock rank: Acquire taskLock prior to completeLock.\n+\n+ \/\/ Task queue\n+ tthread::mutex taskLock;\n+ tthread::condition_variable taskCond;\n+ std::queue<Task> tasks;\n+\n+ \/\/ Completion status\n+ tthread::mutex completeLock;\n+ tthread::condition_variable completeCond;\n+ unsigned pendingTasks;\n+\n+ void changeNumberOfThreads(unsigned count);\n+ static void threadFunc(void *context);\n+ void worker(ThreadContext &context);\n+\n+ BlackADC *analog;\n+ float readBrightness;\n+\n+\n+};\n+\n+\n+\/*****************************************************************************************\n+ * Implementation\n+ *****************************************************************************************\/\n+\n+\n+inline EffectMixer::EffectMixer()\n+ : numThreadsConfigured(0) \/\/ Auto-detect\n+{ \n+ analog = new BlackADC(AIN1); \n+}\n+\n+inline EffectMixer::~EffectMixer()\n+{\n+ changeNumberOfThreads(0);\n+}\n+\n+inline void EffectMixer::setConcurrency(unsigned numThreads)\n+{\n+ \/\/ Threads created\/destroyed lazily\n+ numThreadsConfigured = numThreads;\n+}\n+\n+inline int EffectMixer::numChannels()\n+{\n+ return channels.size();\n+}\n+\n+inline int EffectMixer::add(Effect *effect, float fader)\n+{\n+ Channel c;\n+\n+ c.effect = effect;\n+ c.fader = fader;\n+\n+ int index = channels.size();\n+ channels.push_back(c);\n+ return index;\n+}\n+\n+inline void EffectMixer::clear()\n+{\n+ channels.clear();\n+}\n+\n+inline void EffectMixer::set(Effect *effect)\n+{\n+ clear();\n+ add(effect);\n+}\n+\n+inline int EffectMixer::find(Effect *effect)\n+{\n+ for (unsigned i = 0; i < channels.size(); i++) {\n+ if (channels[i].effect == effect) {\n+ return i;\n+ }\n+ }\n+ return -1;\n+}\n+\n+inline void EffectMixer::remove(int index)\n+{\n+ if (index >= 0 && index < (int)channels.size()) {\n+ channels.erase(channels.begin() + index);\n+ }\n+}\n+\n+inline void EffectMixer::remove(Effect *effect)\n+{\n+ remove(find(effect));\n+}\n+\n+inline void EffectMixer::setFader(int channel, float fader)\n+{\n+ if (channel >= 0 && channel < (int)channels.size()) {\n+ channels[channel].fader = fader;\n+ }\n+}\n+\n+inline void EffectMixer::setFader(Effect *effect, float fader)\n+{\n+ setFader(find(effect), fader);\n+}\n+\n+inline void EffectMixer::shader(Vec3& rgb, const PixelInfo& p) const\n+{\n+ \/\/ Mix together results from channel buffers.\n+ \/\/ Assumes the channel's color buffer has already been set up and sized by beginFrame().\n+\n+ Vec3 total(0,0,0);\n+\n+ for (std::vector<Channel>::const_iterator i = channels.begin(), e = channels.end(); i != e; ++i) {\n+ float f = i->fader;\n+ if (f) {\n+ total += i->colors[p.index] * f;\n+ }\n+ }\n+\n+ rgb = total \/ readBrightness;\n+}\n+\n+inline void EffectMixer::postProcess(const Vec3& rgb, const PixelInfo& p)\n+{\n+ \/\/ Allow all channels to post-process their result, without parallelism.\n+\n+ for (std::vector<Channel>::iterator i = channels.begin(), e = channels.end(); i != e; ++i) {\n+ Channel &c = *i;\n+ float f = c.fader;\n+ if (f) {\n+ c.effect->postProcess(c.colors[p.index], p);\n+ }\n+ }\n+}\n+\n+inline void EffectMixer::endFrame(const FrameInfo& f)\n+{\n+ for (unsigned i = 0; i < channels.size(); ++i) {\n+ channels[i].effect->endFrame(f);\n+ }\n+}\n+\n+inline void EffectMixer::debug(const DebugInfo& d)\n+{\n+ for (unsigned i = 0; i < channels.size(); ++i) {\n+ channels[i].effect->debug(d);\n+ }\n+ fprintf(stderr, \"\\t[mixer] readBrightness = %f\\n\", readBrightness);\n+ return;\n+}\n+\n+inline void EffectMixer::changeNumberOfThreads(unsigned count)\n+{\n+ while (threads.size() < numThreadsConfigured) {\n+ \/\/ Create thread\n+ ThreadContext *tc = new ThreadContext;\n+ tc->mixer = this;\n+ tc->runFlag = true;\n+ tc->thread = new tthread::thread(threadFunc, tc);\n+ threads.push_back(tc);\n+ }\n+\n+ while (threads.size() > numThreadsConfigured) {\n+ \/\/ Signal a thread to stop\n+ ThreadContext *tc = threads.back();\n+ threads.pop_back();\n+\n+ tc->runFlag = false;\n+ taskCond.notify_all();\n+\n+ tc->thread->join();\n+ delete tc->thread;\n+ delete tc;\n+ }\n+}\n+\n+inline void EffectMixer::beginFrame(const FrameInfo& f)\n+{\n+\n+ readBrightness = 1.9 \/ (1.8 - analog->getParsedValue(dap2) + 0.005);\n+\n+ \/\/ Auto-detect thread count\n+ if (numThreadsConfigured == 0) {\n+ numThreadsConfigured = tthread::thread::hardware_concurrency();\n+ }\n+\n+ \/\/ Create\/destroy threads, to reach the requested pool size\n+ changeNumberOfThreads(numThreadsConfigured);\n+\n+ \/*\n+ * Setup for each effect:\n+ * - Send a beginFrame() message\n+ * - Keep track of the total pixel count, for sizing our batches\n+ * - Size our channel's color buffer\n+ *\/\n+\n+ unsigned totalPixels = 0;\n+ unsigned modelPixels = f.pixels.size();\n+\n+ for (unsigned i = 0; i < channels.size(); ++i) {\n+ Channel &c = channels[i];\n+\n+ c.effect->beginFrame(f);\n+ c.colors.resize(modelPixels);\n+ if (c.fader) {\n+ totalPixels += modelPixels;\n+ }\n+ }\n+\n+ \/\/ Try to size the batches so we give each CPU a few tasks, so that if our\n+ \/\/ workload is asymmetric we'll end up with room to rebalance.\n+\n+ unsigned batchSize = 1 + totalPixels \/ (numThreadsConfigured * 3);\n+\n+ \/\/ Create tasks for each active effect, and wait for our thread pool to process them.\n+ \/\/ Note our lock ranking requirements: taskLock acquired before completeLock.\n+\n+ taskLock.lock();\n+ unsigned numTasks = 0;\n+\n+ for (unsigned i = 0; i < channels.size(); ++i) {\n+ Channel &c = channels[i];\n+ if (c.fader) {\n+ Task t;\n+ t.channel = &c;\n+ t.pixelInfo = &f.pixels[0];\n+ t.begin = 0;\n+\n+ while (t.begin < modelPixels) {\n+ t.end = std::min<unsigned>(modelPixels, t.begin + batchSize);\n+ tasks.push(t);\n+ t.begin = t.end;\n+ numTasks++;\n+ }\n+ }\n+ }\n+\n+ completeLock.lock();\n+ pendingTasks = numTasks;\n+ taskCond.notify_all();\n+ taskLock.unlock();\n+\n+ while (pendingTasks) {\n+ completeCond.wait(completeLock);\n+ }\n+\n+ completeLock.unlock();\n+}\n+\n+inline void EffectMixer::threadFunc(void *context)\n+{\n+ ThreadContext* c = (ThreadContext*) context;\n+ c->mixer->worker(*c);\n+}\n+\n+inline void EffectMixer::worker(ThreadContext &context)\n+{\n+ while (true) {\n+ Task currentTask;\n+\n+ \/\/ Dequeue a task\n+ taskLock.lock();\n+ while (tasks.empty()) {\n+ if (!context.runFlag) {\n+ \/\/ Thread exiting\n+ return;\n+ }\n+ taskCond.wait(taskLock);\n+ }\n+ currentTask = tasks.front();\n+ tasks.pop();\n+ taskLock.unlock();\n+\n+ \/\/ Process a block of pixels\n+\n+ Channel &c = *currentTask.channel;\n+ Effect *effect = c.effect;\n+\n+ for (unsigned i = currentTask.begin; i != currentTask.end; ++i) {\n+ const Effect::PixelInfo &p = currentTask.pixelInfo[i];\n+ if (p.isMapped()) {\n+ Vec3 color(0, 0, 0);\n+ effect->shader(color, p);\n+ c.colors[i] = color;\n+ }\n+ }\n+\n+ \/\/ Completion notification\n+ completeLock.lock();\n+ pendingTasks--;\n+ completeCond.notify_all();\n+ completeLock.unlock();\n+ }\n+}\n"} {"commit":"be7165c14e3d8c0cc432af9f0bf5b048376d5080","subject":"port eina_counter code to Windows.","message":"port eina_counter code to Windows.\n\n\nSVN revision: 35730\n","repos":"turran\/eina,gfriloux\/eina,turran\/eina,turran\/eina,gfriloux\/eina,gfriloux\/eina","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/eina_counter.c\n+++ src\/lib\/eina_counter.c\n@@ -22,7 +22,17 @@\n \n #include <stdlib.h>\n #include <string.h>\n-#include <time.h>\n+#ifndef _WIN32\n+# include <time.h>\n+#else\n+# define WIN32_LEAN_AND_MEAN\n+# include <windows.h>\n+# undef WIN32_LEAN_AND_MEAN\n+struct timespec\n+{\n+ LARGE_INTEGER pc;\n+};\n+#endif \/* ! _WIN2 *\/\n \n #include \"eina_counter.h\"\n #include \"eina_inlist.h\"\n@@ -57,6 +67,23 @@\n static int _eina_counter_init_count = 0;\n static int EINA_COUNTER_ERROR_OUT_OF_MEMORY = 0;\n \n+#ifndef _WIN32\n+static inline int\n+_eina_counter_time_get(struct timespec *tp)\n+{\n+ return clock_gettime(CLOCK_PROCESS_CPUTIME_ID, tp);\n+}\n+#else\n+static int EINA_COUNTER_ERROR_WINDOWS = 0;\n+static LARGE_INTEGER _eina_counter_frequency;\n+\n+static inline int\n+_eina_counter_time_get(struct timespec *tp)\n+{\n+ return QueryPerformanceCounter(&tp->pc);\n+}\n+#endif \/* _WIN2 *\/\n+\n \/*============================================================================*\n * Global *\n *============================================================================*\/\n@@ -74,6 +101,14 @@\n {\n \teina_error_init();\n \tEINA_COUNTER_ERROR_OUT_OF_MEMORY = eina_error_register(\"Eina_Counter out of memory\");\n+#ifdef _WIN32\n+ if (!QueryPerformanceFrequency(&_eina_counter_frequency))\n+ {\n+ EINA_COUNTER_ERROR_WINDOWS = eina_error_register(\"Change your OS, you moron !\");\n+ _eina_counter_init_count--;\n+ return 0;\n+ }\n+#endif \/* _WIN2 *\/\n }\n \n return _eina_counter_init_count;\n@@ -135,7 +170,7 @@\n struct timespec tp;\n \n if (!counter) return ;\n- if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp) != 0) return ;\n+ if (!_eina_counter_time_get(&tp)) return;\n \n clk = calloc(1, sizeof (Eina_Clock));\n if (!clk)\n@@ -157,7 +192,7 @@\n struct timespec tp;\n \n if (!counter) return ;\n- if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &tp) != 0) return ;\n+ if (!_eina_counter_time_get(&tp)) return;\n \n clk = (Eina_Clock *) counter->clocks;\n \n@@ -177,12 +212,26 @@\n \n EINA_INLIST_ITER_LAST(counter->clocks, clk)\n {\n+ long int start;\n+ long int end;\n+ long int diff;\n+\n+#ifndef _WIN32\n+ start = clk->start.tv_sec * 1000000000 + clk->start.tv_nsec;\n+ end = clk->end.tv_sec * 1000000000 + clk->end.tv_nsec;\n+ diff = (clk->end.tv_sec - clk->start.tv_sec) * 1000000000 + clk->end.tv_nsec - clk->start.tv_nsec;\n+#else\n+ start = (long int)(((long long int)clk->start.pc.QuadPart * 1000000000ll) \/ (long long int)_eina_counter_frequency.QuadPart);\n+ end = (long int)(((long long int)clk->end.pc.QuadPart * 1000000000LL) \/ (long long int)_eina_counter_frequency.QuadPart);\n+ diff = (long int)(((long long int)(clk->end.pc.QuadPart - clk->start.pc.QuadPart) * 1000000000LL) \/ (long long int)_eina_counter_frequency.QuadPart);\n+#endif \/* _WIN2 *\/\n+\n \tif (clk->valid == EINA_TRUE)\n \t fprintf(out, \"%i\\t%li\\t%li\\t%li\\n\",\n \t\t clk->specimen,\n-\t\t (clk->end.tv_sec * 1000000000 + clk->end.tv_nsec) - (clk->start.tv_sec * 1000000000 + clk->start.tv_nsec),\n-\t\t clk->start.tv_sec * 1000000000 + clk->start.tv_nsec,\n-\t\t clk->end.tv_sec * 1000000000 + clk->end.tv_nsec);\n- }\n-}\n-\n+\t\t diff,\n+\t\t start,\n+\t\t end);\n+ }\n+}\n+\n"} {"commit":"50ef1492823eec67c69c887315269e77536199af","subject":"elementary: fix typo","message":"elementary: fix typo\n\nSVN revision: 64411\n","repos":"rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_photocam.c\n+++ src\/lib\/elm_photocam.c\n@@ -1487,7 +1487,7 @@\n rx = (x * wd->size.w) \/ wd->size.imw;\n ry = (y * wd->size.h) \/ wd->size.imh;\n rw = (w * wd->size.w) \/ wd->size.imw;\n- rh = (w * wd->size.h) \/ wd->size.imh;\n+ rh = (h * wd->size.h) \/ wd->size.imh;\n if (rw < 1) rw = 1;\n if (rh < 1) rh = 1;\n if ((rx + rw) > wd->size.w) rx = wd->size.w - rw;\n@@ -1514,7 +1514,7 @@\n rx = (x * wd->size.w) \/ wd->size.imw;\n ry = (y * wd->size.h) \/ wd->size.imh;\n rw = (w * wd->size.w) \/ wd->size.imw;\n- rh = (w * wd->size.h) \/ wd->size.imh;\n+ rh = (h * wd->size.h) \/ wd->size.imh;\n if (rw < 1) rw = 1;\n if (rh < 1) rh = 1;\n if ((rx + rw) > wd->size.w) rx = wd->size.w - rw;\n"} {"commit":"e0e7d85a9f6c7e981bbc4dde0aca34c8d151dc1f","subject":"scroller: fix the focus move bug in scroller.","message":"scroller: fix the focus move bug in scroller.\n\nWhen the focused object is out of the viewport and the key direction\nis only the direction focus is out, it should find the next focus.\n\n@fix\n","repos":"rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_scroller.c\n+++ src\/lib\/elm_scroller.c\n@@ -87,6 +87,8 @@\n Evas_Coord y = 0;\n Evas_Coord c_x = 0;\n Evas_Coord c_y = 0;\n+ Evas_Coord v_x = 0;\n+ Evas_Coord v_y = 0;\n Evas_Coord v_w = 0;\n Evas_Coord v_h = 0;\n Evas_Coord max_x = 0;\n@@ -108,7 +110,7 @@\n elm_interface_scrollable_step_size_get(&step_x, &step_y),\n elm_interface_scrollable_page_size_get(&page_x, &page_y),\n elm_interface_scrollable_content_viewport_geometry_get\n- (NULL, NULL, &v_w, &v_h));\n+ (&v_x, &v_y, &v_w, &v_h));\n evas_object_geometry_get(sd->content, &c_x, &c_y, &max_x, &max_y);\n \n current_focus = elm_widget_focused_object_get(obj);\n@@ -116,8 +118,12 @@\n can_focus_list = elm_widget_can_focus_child_list_get(obj);\n \n if ((current_focus == obj) ||\n- (!ELM_RECTS_INTERSECT\n- (x, y, v_w, v_h, (f_x - c_x), (f_y - c_y), f_w, f_h)))\n+ ((!ELM_RECTS_INTERSECT\n+ (x, y, v_w, v_h, (f_x - c_x), (f_y - c_y), f_w, f_h)) &&\n+ (!strcmp(dir, \"left\") && (f_x > v_x)) &&\n+ (!strcmp(dir, \"right\") && (f_x + f_w < v_x + v_w)) &&\n+ (!strcmp(dir, \"up\") && (f_y > v_y)) &&\n+ (!strcmp(dir, \"down\") && (f_y + f_h < v_y + v_h))))\n {\n Eina_List *l;\n Evas_Object *cur;\n"} {"commit":"2e4f8e3ac74fd27fafb8fb16c300e68849d5c46e","subject":"file_dotlock: And fix to previous change..","message":"file_dotlock: And fix to previous change..\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/file-dotlock.c\n+++ src\/lib\/file-dotlock.c\n@@ -713,7 +713,7 @@\n \t\/* with NFS t1 may have been looked up from local cache.\n \t allow it to be a little bit different. *\/\n \tdiff = t1 > t2 ? t1-t2 : t2-t1;\n-\treturn diff <= FILE_DOTLOCK_MAX_STAT_MTIME_DIFF;\n+\treturn diff > FILE_DOTLOCK_MAX_STAT_MTIME_DIFF;\n }\n \n int file_dotlock_delete(struct dotlock **dotlock_p)\n"} {"commit":"d05f58d1a60652fc0c53edae49d116befd60b625","subject":"If we use notify I\/O to watch for dotlock deletion, make sure we still sleep a while after overriding a dotlock. Otherwise multiple processes might try to do that at the same time and unlink each others' newly created dotlocks.","message":"If we use notify I\/O to watch for dotlock deletion, make sure we still sleep\na while after overriding a dotlock. Otherwise multiple processes might try\nto do that at the same time and unlink each others' newly created dotlocks.\n\n--HG--\nbranch : HEAD\n","repos":"jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/file-dotlock.c\n+++ src\/lib\/file-dotlock.c\n@@ -175,6 +175,22 @@\n \t*changed_r = update_change_info(&st, &lock_info->lock_info,\n \t\t\t\t\t&lock_info->last_change, now,\n \t\t\t\t\t!lock_info->set->nfs_flush);\n+\treturn 0;\n+}\n+\n+static int dotlock_override(struct lock_info *lock_info)\n+{\n+\tif (unlink(lock_info->lock_path) < 0 && errno != ENOENT) {\n+\t\ti_error(\"unlink(%s) failed: %m\",\n+\t\t\tlock_info->lock_path);\n+\t\treturn -1;\n+\t}\n+\n+\t\/* make sure we sleep for a while after overriding the lock file.\n+\t otherwise another process might try to override it at the same time\n+\t and unlink our newly created dotlock. *\/\n+\tif (lock_info->use_io_notify)\n+\t\tusleep(LOCK_RANDOM_USLEEP_TIME);\n \treturn 0;\n }\n \n@@ -230,12 +246,7 @@\n \n \t\tif (!changed) {\n \t\t\t\/* still there, go ahead and override it *\/\n-\t\t\tif (unlink(lock_info->lock_path) < 0 &&\n-\t\t\t errno != ENOENT) {\n-\t\t\t\ti_error(\"unlink(%s) failed: %m\",\n-\t\t\t\t\tlock_info->lock_path);\n-\t\t\t\treturn -1;\n-\t\t\t}\n+\t\t\treturn dotlock_override(lock_info);\n \t\t}\n \t\treturn 1;\n \t}\n@@ -271,11 +282,7 @@\n \n \tif (now > lock_info->last_change + stale_timeout) {\n \t\t\/* no changes for a while, assume stale lock *\/\n-\t\tif (unlink(lock_info->lock_path) < 0 && errno != ENOENT) {\n-\t\t\ti_error(\"unlink(%s) failed: %m\", lock_info->lock_path);\n-\t\t\treturn -1;\n-\t\t}\n-\t\treturn 1;\n+\t\treturn dotlock_override(lock_info);\n \t}\n \n \treturn 0;\n"} {"commit":"14155d0c307cad4d0aa43f65bf56ba98f3176b0c","subject":"+ Correct typo in error message","message":"+ Correct typo in error message\n","repos":"ashon-ikon\/file-inspector-c,ashon-ikon\/file-inspector-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/file-manager.c\n+++ src\/lib\/file-manager.c\n@@ -59,7 +59,7 @@\n \n if (! (dir = opendir(path))) {\n fi_log_message(FI_DEBUG_LEVEL_WARN,\n- \"Count not read the specified path %s\", path);\n+ \"Could not read the specified path %s\", path);\n return false;\n }\n \n@@ -80,7 +80,6 @@\n fi_file_manager_read_dir(full_filename, con, recursive);\n free(full_filename);\n }\n- printf(\"Current file count %d\\n\", file.ref_count.count);\n fi_file_destroy(&file);\n }\n }\n"} {"commit":"26e6eef6518b1c912f7a6f287fbf5952e6fd003e","subject":"Use the largest output buffer size when growing corked buffer.","message":"Use the largest output buffer size when growing corked buffer.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,dscho\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/obuffer-file.c\n+++ src\/lib\/obuffer-file.c\n@@ -401,8 +401,15 @@\n \tsize_t size, head_size;\n \n \tsize = nearest_power(fbuf->buffer_size + bytes);\n-\tif (fbuf->max_buffer_size > 0 && size > fbuf->max_buffer_size)\n-\t\tsize = fbuf->max_buffer_size;\n+\tif (fbuf->max_buffer_size != 0) {\n+\t\tif (size > fbuf->max_buffer_size) {\n+\t\t\t\/* limit the size *\/\n+\t\t\tsize = fbuf->max_buffer_size;\n+\t\t} else if (fbuf->corked) {\n+\t\t\t\/* use the largest possible buffer with corking *\/\n+\t\t\tsize = fbuf->max_buffer_size;\n+\t\t}\n+\t}\n \n \tif (size == fbuf->buffer_size)\n \t\treturn;\n"} {"commit":"1c9e86a80a4e4c45c0fcd54fd2c061039cd34b61","subject":"Set output I\/O handler after output callback if needed.","message":"Set output I\/O handler after output callback if needed.\n","repos":"damoxc\/dovecot,LTD-Beget\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/ostream-file.c\n+++ src\/lib\/ostream-file.c\n@@ -364,11 +364,17 @@\n \tif (ret == 0)\n \t\tfstream->flush_pending = TRUE;\n \n-\tif (!fstream->flush_pending &&\n-\t IS_STREAM_EMPTY(fstream) && fstream->io != NULL) {\n-\t\t\/* all sent *\/\n-\t\tio_remove(fstream->io);\n-\t\tfstream->io = NULL;\n+\tif (!fstream->flush_pending && IS_STREAM_EMPTY(fstream)) {\n+\t\tif (fstream->io != NULL) {\n+\t\t\t\/* all sent *\/\n+\t\t\tio_remove(fstream->io);\n+\t\t\tfstream->io = NULL;\n+\t\t}\n+\t} else {\n+\t\tif (fstream->io == NULL) {\n+\t\t\tfstream->io = io_add(fstream->fd, IO_WRITE,\n+\t\t\t\t\t stream_send_io, fstream);\n+\t\t}\n \t}\n \n \to_stream_unref(&fstream->ostream.ostream);\n"} {"commit":"c8826ba8c77b25ab9bd59027e0b87fadb49f5a3b","subject":"mir: clear screen data","message":"mir: clear screen data","repos":"davidgumberg\/gtk,Lyude\/gtk-,ahodesuka\/gtk,alexlarsson\/gtk,jadahl\/gtk,chergert\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,chergert\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,jigpu\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,jadahl\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,jigpu\/gtk,chergert\/gtk,alexlarsson\/gtk,jadahl\/gtk,Lyude\/gtk-,ahodesuka\/gtk,chergert\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,jadahl\/gtk,jigpu\/gtk,grubersjoe\/adwaita,jigpu\/gtk,jadahl\/gtk,Lyude\/gtk-,chergert\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,grubersjoe\/adwaita,chergert\/gtk,davidgumberg\/gtk,chergert\/gtk,jadahl\/gtk,jigpu\/gtk,davidgumberg\/gtk,chergert\/gtk,jigpu\/gtk,jigpu\/gtk,jigpu\/gtk,alexlarsson\/gtk,jadahl\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jadahl\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,Lyude\/gtk-,grubersjoe\/adwaita,Adamovskiy\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk\/mir\/gdkmirscreen.c\n+++ gdk\/mir\/gdkmirscreen.c\n@@ -163,7 +163,12 @@\n gdk_mir_screen_finalize (GObject *object)\n {\n GdkMirScreen *screen = GDK_MIR_SCREEN (object);\n+\n mir_connection_set_display_config_change_callback (get_connection (screen), NULL, NULL);\n+ mir_display_config_destroy (screen->display_config);\n+ g_clear_pointer (&screen->visual);\n+ g_clear_pointer (&screen->root_window);\n+\n G_OBJECT_CLASS (gdk_mir_screen_parent_class)->finalize (object);\n }\n \n@@ -280,7 +285,7 @@\n \n for (i = 0; i < config->num_outputs; i++)\n if (config->outputs[i].used)\n- count++;\n+ ++count;\n \n return count;\n }\n"} {"commit":"6fd897bb100995333ca2ec73667a8d9d21c83862","subject":"Add available marker to gdk_x11_window_set_utf8_property","message":"Add available marker to gdk_x11_window_set_utf8_property\n","repos":"davidgumberg\/gtk,Lyude\/gtk-,jigpu\/gtk,bratsche\/gtk-,bratsche\/gtk-,Lyude\/gtk-,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,alexlarsson\/gtk,bratsche\/gtk-,chergert\/gtk,Distrotech\/gtk2,ahodesuka\/gtk,jessevdk\/gtk,Distrotech\/gtk2,msteinert\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,jessevdk\/gtk,jadahl\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,jadahl\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,ebassi\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,davidgumberg\/gtk,msteinert\/gtk,msteinert\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,ebassi\/gtk,Distrotech\/gtk2,jessevdk\/gtk,jadahl\/gtk,jadahl\/gtk,ahodesuka\/gtk,davidt\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,davidt\/gtk,jigpu\/gtk,jadahl\/gtk,Adamovskiy\/gtk,chergert\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,davidt\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,davidgumberg\/gtk,bratsche\/gtk-,jessevdk\/gtk,jigpu\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,Lyude\/gtk-,jadahl\/gtk,Lyude\/gtk-,chergert\/gtk,Adamovskiy\/gtk,jigpu\/gtk,Lyude\/gtk-,alexlarsson\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,alexlarsson\/gtk,Lyude\/gtk-,chergert\/gtk,jigpu\/gtk,davidt\/gtk,jigpu\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,jigpu\/gtk,jadahl\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,msteinert\/gtk,msteinert\/gtk,chergert\/gtk,ebassi\/gtk,ahodesuka\/gtk,davidt\/gtk,msteinert\/gtk,chergert\/gtk,davidgumberg\/gtk,ebassi\/gtk,ahodesuka\/gtk,davidt\/gtk,chergert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,bratsche\/gtk-,Adamovskiy\/gtk,grubersjoe\/adwaita,jadahl\/gtk,ebassi\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,alexlarsson\/gtk,ebassi\/gtk,chergert\/gtk,grubersjoe\/adwaita","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk\/x11\/gdkx11window.h\n+++ gdk\/x11\/gdkx11window.h\n@@ -55,6 +55,7 @@\n Window gdk_x11_window_get_xid (GdkWindow *window);\n void gdk_x11_window_set_user_time (GdkWindow *window,\n guint32 timestamp);\n+GDK_AVAILABLE_IN_3_4\n void gdk_x11_window_set_utf8_property (GdkWindow *window,\n \t\t\t\t\t const gchar *name,\n \t\t\t\t\t const gchar *value);\n"} {"commit":"c5a74a299f470145d3eb31c1c141c7ca29536688","subject":"Added a few extra commands","message":"Added a few extra commands\n","repos":"aaaaaa123456789\/bsp,aaaaaa123456789\/bsp,aaaaaa123456789\/bsp","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- bspcomp.c\n+++ bspcomp.c\n@@ -90,6 +90,7 @@\n void one_variable_command(int, char **);\n void one_variable_one_argument_command(int, char **);\n void one_variable_two_arguments_command(int, char **);\n+void two_variables_command(int, char **);\n void one_byte_argument_command(int, char **);\n void one_halfword_argument_command(int, char **);\n void calculation_command(int, char **);\n@@ -121,6 +122,7 @@\n {\"callz\", 0x5c, &one_variable_one_argument_command},\n {\"checksha1\", 0x16, &one_variable_one_argument_command},\n {\"db\", 1, &data_command},\n+ {\"decrement\", 0x9f, &one_variable_command},\n {\"define\", 0, &define_command},\n {\"dh\", 2, &data_command},\n {\"divide\", 0x2c, &calculation_command},\n@@ -130,8 +132,14 @@\n {\"fillhalfword\", 0x74, &one_argument_one_halfword_argument},\n {\"fillword\", 0x78, &two_arguments_command},\n {\"getbyte\", 0x10, &one_variable_one_argument_command},\n+ {\"getbytedec\", 0x9c, &two_variables_command},\n+ {\"getbyteinc\", 0x98, &two_variables_command},\n {\"gethalfword\", 0x12, &one_variable_one_argument_command},\n+ {\"gethalfworddec\", 0x9d, &two_variables_command},\n+ {\"gethalfwordinc\", 0x99, &two_variables_command},\n {\"getword\", 0x14, &one_variable_one_argument_command},\n+ {\"getworddec\", 0x9e, &two_variables_command},\n+ {\"getwordinc\", 0x9a, &two_variables_command},\n {\"hexdata\", 0, &hexdata_command},\n {\"ifeq\", 0x50, &one_variable_two_arguments_command},\n {\"ifge\", 0x4c, &one_variable_two_arguments_command},\n@@ -141,6 +149,7 @@\n {\"ifne\", 0x54, &one_variable_two_arguments_command},\n {\"incbin\", 1, &include_command},\n {\"include\", 0, &include_command},\n+ {\"increment\", 0x9b, &one_variable_command},\n {\"ipspatch\", 0x86, &one_argument_command},\n {\"jump\", 0x02, &one_argument_command},\n {\"jumpnz\", 0x5a, &one_variable_one_argument_command},\n@@ -638,6 +647,10 @@\n standard_command(opcode_byte, 1, 2, arguments);\n }\n \n+void two_variables_command (int opcode_byte, char ** arguments) {\n+ standard_command(opcode_byte, 2, 0, arguments);\n+}\n+\n void one_byte_argument_command (int opcode_byte, char ** arguments) {\n if (count_parameters(arguments) != 1) error_exit(1, \"command expects 1 argument(s), got %u\", count_parameters(arguments));\n struct argument * argument = get_argument(*arguments);\n"} {"commit":"ce82d8f8b65ff9c8b51e81ec59368f5dc3ab310f","subject":"Fix stack smash in clickpad_guess_clickfingers()","message":"Fix stack smash in clickpad_guess_clickfingers()\n\nApple Magic Trackpad can report 16 slots. In clickpad_guess_clickfingers()\nthe array allocated on the stack contains only 10 slots.\nAs (.num_mt_mask == .num_slots), the function writes out of the bounds\nof close_point.\n\nUse a size 32 bitmask instead and warn if we ever get past 32 touchpoints.\n\nThis fixes:\nhttps:\/\/bugzilla.redhat.com\/show_bug.cgi?id=952221\n\nSigned-off-by: Peter Hutterer <b9c50af7afa7642f6f854434cda9ffe54ece8b85@who-t.net>\nReported-by: Benjamin Tissoires <7a0e50e3f6a0939db82b6a8a423c08a163896f41@redhat.com>\n","repos":"mad-s\/xf86-input-synaptics-absolute,mad-s\/xf86-input-synaptics-absolute","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/synaptics.c\n+++ src\/synaptics.c\n@@ -2453,9 +2453,10 @@\n struct SynapticsHwState *hw)\n {\n int nfingers = 0;\n- char close_point[SYNAPTICS_MAX_TOUCHES] = { 0 }; \/* 1 for each point close\n- to another one *\/\n+ uint32_t close_point = 0; \/* 1 bit for each point close to another one *\/\n int i, j;\n+\n+ BUG_RETURN_VAL(hw->num_mt_mask > sizeof(close_point) * 8, 0);\n \n for (i = 0; i < hw->num_mt_mask - 1; i++) {\n ValuatorMask *f1;\n@@ -2488,14 +2489,16 @@\n * size. Good luck. *\/\n if (abs(x1 - x2) < (priv->maxx - priv->minx) * .3 &&\n abs(y1 - y2) < (priv->maxy - priv->miny) * .3) {\n- close_point[j] = 1;\n- close_point[i] = 1;\n- }\n- }\n- }\n-\n- for (i = 0; i < SYNAPTICS_MAX_TOUCHES; i++)\n- nfingers += close_point[i];\n+ close_point |= (1 << j);\n+ close_point |= (1 << i);\n+ }\n+ }\n+ }\n+\n+ while (close_point > 0) {\n+ nfingers += close_point & 0x1;\n+ close_point >>= 1;\n+ }\n \n return nfingers;\n }\n"} {"commit":"57193777374dd10a920171670a06b7e79d389703","subject":"Input API 12 requires a valuator mode for each axis.","message":"Input API 12 requires a valuator mode for each axis.\n\nSigned-off-by: Peter Hutterer <b9c50af7afa7642f6f854434cda9ffe54ece8b85@who-t.net>\nReviewed-by: Chase Douglas <69e02ec421aa70a149511825d897f2549ceee9a2@canonical.com>\n","repos":"felipejfc\/xserver-xorg-input-synaptics,gdestuynder\/xf86-input-synaptics,felipejfc\/xserver-xorg-input-synaptics,RsrchBoy\/xserver-xorg-input-synaptics,jiixyj\/xf86-input-synaptics,ssaavedra\/xf86-input-synaptics,ssaavedra\/xf86-input-synaptics,philipn\/xserver-xorg-input-synaptics,eyko\/xf86-input-synaptics,kelnos\/xf86-input-synaptics,mortehu\/xf86-input-synaptics,quadpixels\/three-finger-dragging,felipejfc\/xserver-xorg-input-synaptics,quadpixels\/three-finger-dragging,eyko\/xf86-input-synaptics,RsrchBoy\/xserver-xorg-input-synaptics,philipn\/xserver-xorg-input-synaptics,kelnos\/xf86-input-synaptics,corcoran\/xserver-xorg-input-synaptics,jiixyj\/xf86-input-synaptics,mmonaco\/xf86-input-synaptics,philipn\/xserver-xorg-input-synaptics,Lyude\/xf86-input-synaptics,sencer\/synaptics,nanderson94\/xf86-input-synaptics,mmonaco\/xf86-input-synaptics,sencer\/synaptics,corcoran\/xserver-xorg-input-synaptics,mortehu\/xf86-input-synaptics,Lyude\/xf86-input-synaptics,nanderson94\/xf86-input-synaptics,gdestuynder\/xf86-input-synaptics","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/synaptics.c\n+++ src\/synaptics.c\n@@ -1051,7 +1051,11 @@\n #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7\n axes_labels[0],\n #endif\n- min, max, priv->resx * 1000, 0, priv->resx * 1000);\n+ min, max, priv->resx * 1000, 0, priv->resx * 1000\n+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12\n+ , Relative\n+#endif\n+ );\n xf86InitValuatorDefaults(dev, 0);\n \n \/* Y valuator *\/\n@@ -1069,7 +1073,11 @@\n #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7\n axes_labels[1],\n #endif\n- min, max, priv->resy * 1000, 0, priv->resy * 1000);\n+ min, max, priv->resy * 1000, 0, priv->resy * 1000\n+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12\n+ , Relative\n+#endif\n+ );\n xf86InitValuatorDefaults(dev, 1);\n \n if (!alloc_param_data(pInfo))\n"} {"commit":"39764f60e4eed0dcd9e9642720981d0806b3ba6e","subject":"Squash signed\/unsigned complaint.","message":"Squash signed\/unsigned complaint.","repos":"solidrails\/mongrel2,solidrails\/mongrel2,solidrails\/mongrel2,solidrails\/mongrel2","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/task\/task.c\n+++ src\/task\/task.c\n@@ -74,7 +74,7 @@\n \n \/* call makecontext to do the real work. *\/\n \/* leave a few words open on both ends *\/\n- t->context.uc.uc_stack.ss_sp = t->stk+8;\n+ t->context.uc.uc_stack.ss_sp = (char *)t->stk+8;\n t->context.uc.uc_stack.ss_size = t->stksize-64;\n #if defined(__sun__) && !defined(__MAKECONTEXT_V2_SOURCE) \/* sigh *\/\n #warning \"doing sun thing\"\n"} {"commit":"912a107c3c8eb6d031b964ab2341ce4eb08d07bf","subject":"tasklists: comparsion typo","message":"tasklists: comparsion typo\n\nStrange, how did it work before??\n","repos":"MarSoft\/PebbleNotes,MarSoft\/PebbleNotes,MarSoft\/PebbleNotes,MarSoft\/PebbleNotes,MarSoft\/PebbleNotes,MarSoft\/PebbleNotes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/tasklists.c\n+++ src\/tasklists.c\n@@ -35,7 +35,7 @@\n \t\treturn tl_count;\n }\n static void tl_select_click_cb(MenuLayer *ml, MenuIndex *idx, void *context) {\n-\tassert(idx->row > tl_count, \"Invalid index!\"); \/\/ this will fire when there are no any lists loaded\n+\tassert(idx->row < tl_count, \"Invalid index!\"); \/\/ this will fire when there are no any lists loaded\n \tTL_Item sel = tl_items[idx->row];\n \tif(comm_is_busy() && sel.id != ts_current_listId()) { \/\/ if comm is busy and selected list is not already loaded\n \t\tsb_show(\"Oops, connection is busy, try again later\");\n"} {"commit":"b7346885ec3f6bf82c537c79fb18a0a610ba1312","subject":"Removed Alt+* key commands in favor of using gtkrc files; src\/textadept.c","message":"Removed Alt+* key commands in favor of using gtkrc files; src\/textadept.c\n","repos":"rgieseke\/textadept,rgieseke\/textadept","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/textadept.c\n+++ src\/textadept.c\n@@ -223,20 +223,9 @@\n command_toggle_focus();\n }\n \n-void c_insert(const char *t) {\n- int pos = gtk_editable_get_position(GTK_EDITABLE(command_entry));\n- gtk_editable_insert_text(GTK_EDITABLE(command_entry), t, strlen(t), &pos);\n- gtk_editable_set_position(GTK_EDITABLE(command_entry), pos);\n-}\n-\n \/** Command entry key events.\n * Escape - Hide the completion buffer if it's open.\n * Tab - Show completion buffer.\n- * Alt+B - Insert 'buffer'.\n- * Alt+F - Insert 'find'.\n- * Alt+P - Insert 'pm'.\n- * Alt+T - Insert 'textadept'.\n- * Alt+V - Insert 'view'.\n *\/\n static bool c_keypress(GtkWidget *widget, GdkEventKey *event, gpointer) {\n if (event->state == 0)\n@@ -250,14 +239,6 @@\n gtk_entry_get_text(GTK_ENTRY(widget)));\n return true;\n }\n- else if (event->state == GDK_MOD1_MASK)\n- switch (event->keyval) {\n- case 0x062: c_insert(\"buffer\"); return true;\n- case 0x066: c_insert(\"find\"); return true;\n- case 0x070: c_insert(\"pm\"); return true;\n- case 0x074: c_insert(\"textadept\"); return true;\n- case 0x076: c_insert(\"view\"); return true;\n- }\n return false;\n }\n \n"} {"commit":"6e229067aa1a4887040af99725917db52331584d","subject":"Code cleanup.","message":"Code cleanup.\n","repos":"rgieseke\/textadept,rgieseke\/textadept","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/textadept.c\n+++ src\/textadept.c\n@@ -134,7 +134,7 @@\n #define set_option_label(o, _, l) gtk_button_set_label(GTK_BUTTON(o), l)\n #define find_active(w) gtk_widget_get_visible(w)\n \/\/ GTK command entry.\n-#define command_entry_focused gtk_widget_has_focus(command_entry)\n+#define command_entry_active gtk_widget_has_focus(command_entry)\n #elif CURSES\n \/\/ curses window.\n typedef struct Pane {\n@@ -180,7 +180,7 @@\n } while (false)\n #define find_active(w) (w != NULL)\n \/\/ Curses command entry and statusbar.\n-static bool command_entry_focused;\n+static bool command_entry_active;\n int statusbar_length[2];\n #endif\n \n@@ -360,7 +360,7 @@\n \/** Refreshes the entire screen. *\/\n static void refresh_all() {\n refresh_pane(pane);\n- if (command_entry_focused) scintilla_noutrefresh(command_entry);\n+ if (command_entry_active) scintilla_noutrefresh(command_entry);\n refresh();\n }\n \n@@ -548,9 +548,9 @@\n else\n gtk_widget_hide(command_entry), gtk_widget_grab_focus(focused_view);\n #elif CURSES\n- command_entry_focused = !command_entry_focused;\n- if (!command_entry_focused) SS(command_entry, SCI_SETFOCUS, 0, 0);\n- focus_view(command_entry_focused ? command_entry : focused_view);\n+ command_entry_active = !command_entry_active;\n+ if (!command_entry_active) SS(command_entry, SCI_SETFOCUS, 0, 0);\n+ focus_view(command_entry_active ? command_entry : focused_view);\n #endif\n return 0;\n }\n@@ -1324,7 +1324,7 @@\n #endif\n } else if (strcmp(lua_tostring(L, 2), \"active\") == 0 &&\n lua_todoc(L, 1) == SS(command_entry, SCI_GETDOCPOINTER, 0, 0))\n- lua_pushboolean(L, command_entry_focused);\n+ lua_pushboolean(L, command_entry_active);\n else if (strcmp(lua_tostring(L, 2), \"height\") == 0 &&\n lua_todoc(L, 1) == SS(command_entry, SCI_GETDOCPOINTER, 0, 0)) {\n \/\/ Return the command entry's pixel height.\n@@ -1643,7 +1643,7 @@\n #if GTK\n \/** Signal for a Textadept window focus change. *\/\n static bool window_focused(GtkWidget *_, GdkEventFocus *__, void *L) {\n- if (!command_entry_focused) emit(L, \"focus\", -1);\n+ if (!command_entry_active) emit(L, \"focus\", -1);\n return false;\n }\n \n@@ -2282,7 +2282,7 @@\n * losing focus or the application is quitting.\n *\/\n static bool focus_lost(GtkWidget *widget, GdkEvent *_, void *L) {\n- if (widget == window && command_entry_focused) return true; \/\/ halt\n+ if (widget == window && command_entry_active) return true; \/\/ halt\n if (widget != command_entry || closing) return false;\n return (emit(L, \"keypress\", LUA_TNUMBER, GDK_KEY_Escape, -1), false);\n }\n@@ -2470,7 +2470,7 @@\n }\n #else\n \/\/ TODO: ideally computation of view would not be done twice.\n- Scintilla *view = !command_entry_focused ? focused_view : command_entry;\n+ Scintilla *view = !command_entry_active ? focused_view : command_entry;\n termkey_set_fd(ta_tk, scintilla_get_window(view));\n mouse_set(ALL_MOUSE_EVENTS); \/\/ _popen() and system() change console mode\n return termkey_getkey(tk, key);\n@@ -2650,7 +2650,7 @@\n break;\n }\n refresh_all();\n- view = !command_entry_focused ? focused_view : command_entry;\n+ view = !command_entry_active ? focused_view : command_entry;\n }\n endwin();\n termkey_destroy(ta_tk);\n"} {"commit":"b960a5fbbd571189c882eecfc83b36a7eb450ff7","subject":"clean up","message":"clean up\n","repos":"bloomen\/transwarp,bloomen\/transwarp,bloomen\/transwarp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/transwarp.h\n+++ src\/transwarp.h\n@@ -77,7 +77,7 @@\n }\n }\n \n- void operator()() const noexcept {\n+ void operator()() const {\n callback_();\n }\n \n@@ -407,12 +407,10 @@\n void schedule() {\n check_is_finalized();\n transwarp::pass_visitor pass;\n-\n std::priority_queue<transwarp::detail::priority_functor> queue;\n transwarp::detail::callback_visitor post_visitor(queue);\n visit(pass, post_visitor);\n unvisit();\n-\n if (pool_) {\n while (!queue.empty()) {\n pool_->push(queue.top());\n"} {"commit":"d5305f18e0c5e163d6afc4da38ef499c69049801","subject":"update protocol","message":"update protocol\n","repos":"mattmacy\/uvxbridge,mattmacy\/uvxbridge","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/uvxbridge.h\n+++ src\/uvxbridge.h\n@@ -36,77 +36,91 @@\n \n \/* \n * VERB command set\n- * \n+ *\n+ * update VM MAC -> vlanid|vxlanid mapping\n+ * - UPDATE_VM_VNI:<seqno> mac: 6-bytes vlanid: 2-bytes vxlanid: 3-bytes \n+ * ((result <seqno>) (error <errorstr>) ((gen 4 byte)))\n+ *\n+ * get VM MAC -> vlanid|vxlanid mapping\n+ * - GET_VM_VNI:<seqno> mac: 6-bytes\n+ * ((result <seqno>) (error <errorstr>) ((vlanid 2-bytes)\n+ * (vxlanid 3-bytes)\n+ * (gen 4 byte)))\n+ *\n+ * remove VM MAC -> vlanid|vxlanid mapping\n+ * - REMOVE_VM_VNI:<seqno> mac: big-endian 6 bytes\n+ * ((result <seqno>) (error <errorstr>))\n+ *\n+ * get all VM MAC -> vlanid|vxlanid mappings\n+ * - GET_ALL_VM_VNI:<seqno>\n+ * ((result <seqno>) (error <errstr>) ((mac 6 bytes)\n+ * (vlanid 2-bytes)\n+ * (vxlanid 3-bytes)\n+ * (gen 4 byte))*)\n+ *\n+ *\n * Add per-VNI forwarding table entry map destination host mac to remote ip\n+ *\n+ * Update destination MAC | VXLAN id -> remote ip address (mandatory for v0 only)\n * - UPDATE_FTE:<seqno> mac: 6 bytes\n * vxlanid: 3 byte value\n- * vlanid: 2 byte value\n- * raddr: <4-tuple| v6addr w\/ no symbolic>\n- * expire: 8 bytes - useconds\n+ * raddr: <4-tuple| v6addr w\/ no symbolic>\n+ * expire: 8 bytes - useconds\n * ((result seqno) (error <errstr>) ((gen 4 byte))?)\n *\n- * Get forwarding entry details\n+ * Get destination MAC | VXLAN id -> remote ip address\n * - GET_FTE:<seqno> mac: 6 bytes\n * vxlanid: 3 byte value\n- * vlanid: 2 byte value\n * ((result <seqno>) (error <errstr>) ((raddr <4-tuple| v6addr w\/ no symbolic>)\n * (expire 8 bytes) # useconds\n * (gen 4 byte))?)\n * \n+ * Remove destination MAC | VXLAN id from table\n * - REMOVE_FTE:<seqno> mac: 6 bytes\n * vxlanid: 3 byte value\n * ((result <seqno>) (error <errstr>))\n *\n+ * Get all forwarding table entries\n * - GET_ALL_FTE:<seqno>\n- * (result: error:<errstr>\n+ * ((result <seqno>) (error <errstr>)\n * ((mac 6 bytes)\n- * (vxlanid 3 byte value)\n- * (vlanid 2 byte value)\n- * (raddr <4-tuple| v6addr w\/ no symbolic>)\n- * (expire 8 bytes) # useconds\n+ * (vxlanid 3 byte value)\n+ * (raddr <4-tuple| v6addr w\/ no symbolic>)\n+ * (expire 8 bytes) # useconds\n * (gen 4 bytes))*)\n *\n *\n- * manage physical L2 table entries for remote IP\n+ * Manage physical L2 table entries for remote IP\n+ * Install a IP -> MAC mapping (necessary for v0 only)\n * - SET_PHYS_ND:<seqno> mac: big-endian 6 bytes raddr: <4-tuple| v6addr w\/ no symbolic>\n * ((result <seqno>) (error <errstr>))\n *\n+ * Delete a IP -> MAC mapping\n * - DEL_PHYS_ND:<seqno> mac: big-endian 6 bytes | raddr: <4-tuple| v6addr w\/ no symbolic>\n * ((result <seqno>) (error <errstr>))\n *\n+ * Get a IP -> MAC mapping\n * - GET_PHYS_ND:<seqno> raddr: <4-tuple| v6addr w\/ no symbolic>\n * ((result <seqno>) (error <errstr>) ((mac big-endian 6 bytes))?)\n *\n+ * Get all IP -> MAC mappings\n * - GET_ALL_PHYS_ND:<seqno>\n * ((result <seqno>) (error <errstr>) ((mac big-endian 6 bytes)\n * (raddr <4-tuple| v6addr w\/ no symbolic>))*)\n *\n *\n- * manage vxlan L2 table entries for remote IP\n- * - SET_VX_ND:<seqno> mac: big-endian 6 bytes raddr: <4-tuple| v6addr w\/ no symbolic>\n- * ((result <seqno>) (error <errstr>))\n- *\n- * - DEL_VX_ND:<seqno> mac: big-endian 6 bytes |\n- * raddr: <4-tuple| v6addr w\/ no symbolic>\n- * ((result <seqno>) (error <errstr>))\n- *\n- * - GET_VX_ND:<seqno> raddr: <4-tuple| v6addr w\/ no symbolic>\n- * ((result <seqno>) (error <errstr>) ((mac 6 bytes))?)\n- *\n- * - GET_ALL_VX_ND:<seqno>\n- * ((result <seqno>) (error <errstr>) ((mac 6 bytes)\n- * (raddr <4-tuple| v6addr w\/ no symbolic>))*)\n- *\n- *\n+ * Add router address for local address with prefixlen netmask - default or not\n * - UPDATE_ROUTE:<seqno> raddr: <4-tuple| v6addr w\/ no symbolic>\n * laddr: <4-tuple| v6addr w\/ no symbolic>\n * prefixlen: 2 byte value\n * [default:<true|false>]?\n * ((result <seqno>) (error <errstr>) ((gen 4 bytes))?)\n *\n+ * Remove router address\n * - REMOVE_ROUTE:<seqno> raddr: <4-tuple| v6addr w\/ no symbolic>\n * ((result <seqno>) (error <errstr>))\n *\n+ * Get all routes address\n * - GET_ALL_ROUTE:<seqno>\n * ((result <seqno>) (error <errstr>)\n * ((raddr <4-tuple| v6addr w\/ no symbolic>)\n"} {"commit":"d63a89512176f320e7534b0cf6179df72708123b","subject":"Correct assert","message":"Correct assert\n","repos":"fgsch\/libvmod-utf8,fgsch\/libvmod-utf8","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/vmod_utf8.c\n+++ src\/vmod_utf8.c\n@@ -75,7 +75,7 @@\n \t\tWS_Release(ctx->ws, 0);\n \t\treturn (NULL);\n \t}\n-\tassert(len * sizeof(utf8proc_int32_t) + 1 < u);\n+\tassert(len * sizeof(utf8proc_int32_t) + 1 <= u);\n \n \tlen = utf8proc_reencode((utf8proc_int32_t *)p, len, options);\n \tassert(len > 0);\n"} {"commit":"7c422c98358667f7c6cf107cdbb03bafe0fc485e","subject":"fix comment","message":"fix comment","repos":"Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/websocket.c\n+++ src\/websocket.c\n@@ -114,7 +114,7 @@\n return *state;\n }\n \n-\/* Allocate memory for a websocket client *\/\n+\/* Allocate memory for a websocket server *\/\n static WSServer *\n new_wsserver (void)\n {\n"} {"commit":"c9acc61da272ada2ab1c55a3f33372479660360d","subject":"move code","message":"move code\n","repos":"Qihoo360\/pink,Qihoo360\/pink,Qihoo360\/pink","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pink\/include\/server_thread.h\n+++ pink\/include\/server_thread.h\n@@ -49,6 +49,12 @@\n \n class ServerThread : public Thread {\n public:\n+ ServerThread(int port, int cron_interval, const ServerHandle *handle);\n+ ServerThread(const std::string& bind_ip, int port, int cron_interval,\n+ const ServerHandle *handle);\n+ ServerThread(const std::set<std::string>& bind_ips, int port,\n+ int cron_interval, const ServerHandle *handle);\n+\n #ifdef __ENABLE_SSL\n \/*\n * Enable TLS, set before StartThread, default: false\n@@ -74,12 +80,6 @@\n virtual ~ServerThread();\n \n protected:\n- ServerThread(int port, int cron_interval, const ServerHandle *handle);\n- ServerThread(const std::string& bind_ip, int port, int cron_interval,\n- const ServerHandle *handle);\n- ServerThread(const std::set<std::string>& bind_ips, int port,\n- int cron_interval, const ServerHandle *handle);\n-\n \/*\n * The Epoll event handler\n *\/\n"} {"commit":"fd9e99faed217ec4901cd9b5344e86a0d314412d","subject":"Nits to scripts","message":"Nits to scripts\n","repos":"columbia\/xtern,hemingcui\/xtern_with_paxos,columbia\/xtern,hemingcui\/xtern_with_paxos,columbia\/xtern,hemingcui\/xtern_with_paxos,hemingcui\/xtern_with_paxos,columbia\/xtern,columbia\/xtern,columbia\/xtern,hemingcui\/xtern_with_paxos","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- eval\/rand-intercept\/rand-intercept.c\n+++ eval\/rand-intercept\/rand-intercept.c\n@@ -26,8 +26,7 @@\n \n #define PROJECT_TAG \"XTERN\"\n #define RESOLVE(x)\tif (!fp_##x && !(fp_##x = dlsym(RTLD_NEXT, #x))) { fprintf(stderr, #x\"() not found!\\n\"); exit(-1); }\n-\n-\/\/#define DEBUGF(a...)\tif (debug) { fprintf(stderr, \"%s: %s(): \", PROJECT_TAG, __FUNCTION__); fprintf(stderr, ##a); }\n+#define DO_LOGGING 1 \/\/ If it is 1, enable logging (logging sync ops, and updating times).\n \n \/\/ Per thread variables.\n static int num_threads = 0;\n@@ -39,23 +38,27 @@\n static __thread FILE *log = NULL;\n static pthread_mutex_t lock;\n \n+\n #define OPERATION_START initTid(); \\\n- updateTurn(); \\\n void *eip; \\\n struct timespec app_time; \\\n- update_time(&app_time);\/\/ \\\n- \/\/fprintf(stderr, \"START: %s: %s(): tid %d\\n\", PROJECT_TAG, __FUNCTION__, self());\n+ if (DO_LOGGING) { \\\n+ updateTurn(); \\\n+ update_time(&app_time); \\\n+ }\n+ \/\/fprintf(stderr, \"START: %s: %s(): tid %d\\n\", PROJECT_TAG, __FUNCTION__, self()); \\\n+\n \n #define OPERATION_END \\\n struct timespec syscall_time; \\\n- update_time(&syscall_time); \\\n- if (!entered_sys) { \\\n+ if (DO_LOGGING && !entered_sys) { \\\n entered_sys = 1; \\\n+ update_time(&syscall_time); \\\n eip = get_eip(); \\\n logOp(__FUNCTION__, eip, self_tid, self_turn, &app_time, &syscall_time); \\\n entered_sys = 0; \\\n- }\/\/ \\\n- \/\/fprintf(stderr, \"END: %s: %s(): tid %d\\n\", PROJECT_TAG, __FUNCTION__, self());\n+ }\n+\n \n void update_time(struct timespec *ret);\n int internal_mutex_lock(pthread_mutex_t *mutex);\n"} {"commit":"a971ee0c22346f1472ca62a18a09b406fc6c733d","subject":"reverted sdcard.c to version without DMA (doesn't work correctly)","message":"reverted sdcard.c to version without DMA (doesn't work correctly)\n","repos":"ruffy91\/micropython,ruffy91\/micropython,ruffy91\/micropython,ruffy91\/micropython,ruffy91\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- stmhal\/sdcard.c\n+++ stmhal\/sdcard.c\n@@ -24,6 +24,8 @@\n * THE SOFTWARE.\n *\/\n \n+\/\/ TODO make it work with DMA\n+\n #include STM32_HAL_H\n \n #include \"py\/nlr.h\"\n@@ -32,8 +34,6 @@\n #include \"pin.h\"\n #include \"genhdr\/pins.h\"\n #include \"bufhelper.h\"\n-#include \"dma.h\"\n-#include \"irq.h\"\n \n #if MICROPY_HW_HAS_SDCARD\n \n@@ -65,34 +65,7 @@\n #endif\n \n \n-\/\/ TODO: Since SDIO is fundamentally half-duplex, we really only need to\n-\/\/ tie up one DMA channel. However, the HAL DMA API doesn't\n-\/\/ seem to provide a convenient way to change the direction. I believe that\n-\/\/ its as simple as changing the CR register and the Init.Direction field\n-\/\/ and make DMA_SetConfig public.\n-\n-\/\/ TODO: I think that as an optimization, we can allocate these dynamically\n-\/\/ if an sd card is detected. This will save approx 260 bytes of RAM\n-\/\/ when no sdcard was being used.\n-\n static SD_HandleTypeDef sd_handle;\n-static DMA_HandleTypeDef sd_rx_dma, sd_tx_dma;\n-\n-\/\/ Parameters to dma_init() for SDIO tx and rx.\n-static const DMA_InitTypeDef dma_init_struct_sdio = {\n- .Channel = 0,\n- .Direction = 0,\n- .PeriphInc = DMA_PINC_DISABLE,\n- .MemInc = DMA_MINC_ENABLE,\n- .PeriphDataAlignment = DMA_PDATAALIGN_WORD,\n- .MemDataAlignment = DMA_MDATAALIGN_WORD,\n- .Mode = DMA_PFCTRL,\n- .Priority = DMA_PRIORITY_VERY_HIGH,\n- .FIFOMode = DMA_FIFOMODE_ENABLE,\n- .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,\n- .MemBurst = DMA_MBURST_INC4,\n- .PeriphBurst = DMA_PBURST_INC4,\n-};\n \n void sdcard_init(void) {\n GPIO_InitTypeDef GPIO_Init_Structure;\n@@ -125,15 +98,13 @@\n \/\/ enable SDIO clock\n __SDIO_CLK_ENABLE();\n \n- \/\/ NVIC configuration for SDIO interrupts\n- HAL_NVIC_SetPriority(SDIO_IRQn, IRQ_PRI_SDIO, IRQ_SUBPRI_SDIO);\n- HAL_NVIC_EnableIRQ(SDIO_IRQn);\n-\n \/\/ GPIO have already been initialised by sdcard_init\n+\n+ \/\/ interrupts are not used at the moment\n+ \/\/ they are needed only for DMA transfer (I think...)\n }\n \n void HAL_SD_MspDeInit(SD_HandleTypeDef *hsd) {\n- HAL_NVIC_DisableIRQ(SDIO_IRQn);\n __SDIO_CLK_DISABLE();\n }\n \n@@ -197,10 +168,6 @@\n return cardinfo.CardCapacity;\n }\n \n-void SDIO_IRQHandler(void) {\n- HAL_SD_IRQHandler(&sd_handle);\n-}\n-\n mp_uint_t sdcard_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {\n \/\/ check that dest pointer is aligned on a 4-byte boundary\n if (((uint32_t)dest & 3) != 0) {\n@@ -212,24 +179,12 @@\n return SD_ERROR;\n }\n \n- HAL_SD_ErrorTypedef err = SD_OK;\n-\n- if (query_irq() == IRQ_STATE_ENABLED) {\n- dma_init(&sd_rx_dma, DMA_STREAM_SDIO_RX, &dma_init_struct_sdio,\n- DMA_CHANNEL_SDIO_RX, DMA_PERIPH_TO_MEMORY, &sd_handle);\n- sd_handle.hdmarx = &sd_rx_dma;\n-\n- err = HAL_SD_ReadBlocks_BlockNumber_DMA(&sd_handle, (uint32_t*)dest, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n- if (err == SD_OK) {\n- \/\/ wait for DMA transfer to finish, with a large timeout\n- err = HAL_SD_CheckReadOperation(&sd_handle, 100000000);\n- }\n-\n- dma_deinit(sd_handle.hdmarx);\n- sd_handle.hdmarx = NULL;\n- } else {\n- err = HAL_SD_ReadBlocks_BlockNumber(&sd_handle, (uint32_t*)dest, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n- }\n+ \/\/ We must disable IRQs because the SDIO peripheral has a small FIFO\n+ \/\/ buffer and we can't let it fill up in the middle of a read.\n+ \/\/ This will not be needed when SD uses DMA for transfer.\n+ mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();\n+ HAL_SD_ErrorTypedef err = HAL_SD_ReadBlocks_BlockNumber(&sd_handle, (uint32_t*)dest, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n+ MICROPY_END_ATOMIC_SECTION(atomic_state);\n \n return err;\n }\n@@ -245,26 +200,59 @@\n return SD_ERROR;\n }\n \n- HAL_SD_ErrorTypedef err = SD_OK;\n-\n- if (query_irq() == IRQ_STATE_ENABLED) {\n- dma_init(&sd_tx_dma, DMA_STREAM_SDIO_TX, &dma_init_struct_sdio,\n- DMA_CHANNEL_SDIO_TX, DMA_MEMORY_TO_PERIPH, &sd_handle);\n- sd_handle.hdmatx = &sd_tx_dma;\n-\n- err = HAL_SD_WriteBlocks_BlockNumber_DMA(&sd_handle, (uint32_t*)src, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n- if (err == SD_OK) {\n- \/\/ wait for DMA transfer to finish, with a large timeout\n- err = HAL_SD_CheckWriteOperation(&sd_handle, 100000000);\n- }\n- dma_deinit(sd_handle.hdmatx);\n- sd_handle.hdmatx = NULL;\n- } else {\n- err = HAL_SD_WriteBlocks_BlockNumber(&sd_handle, (uint32_t*)src, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n- }\n+ \/\/ We must disable IRQs because the SDIO peripheral has a small FIFO\n+ \/\/ buffer and we can't let it drain to empty in the middle of a write.\n+ \/\/ This will not be needed when SD uses DMA for transfer.\n+ mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();\n+ HAL_SD_ErrorTypedef err = HAL_SD_WriteBlocks_BlockNumber(&sd_handle, (uint32_t*)src, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n+ MICROPY_END_ATOMIC_SECTION(atomic_state);\n \n return err;\n }\n+\n+#if 0\n+DMA not implemented\n+bool sdcard_read_blocks_dma(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {\n+ \/\/ check that dest pointer is aligned on a 4-byte boundary\n+ if (((uint32_t)dest & 3) != 0) {\n+ return false;\n+ }\n+ \/\/ check that SD card is initialised\n+ if (sd_handle.Instance == NULL) {\n+ return false;\n+ }\n+ \/\/ do the read\n+ if (HAL_SD_ReadBlocks_BlockNumber_DMA(&sd_handle, (uint32_t*)dest, block_num, SDCARD_BLOCK_SIZE) != SD_OK) {\n+ return false;\n+ }\n+ \/\/ wait for DMA transfer to finish, with a large timeout\n+ if (HAL_SD_CheckReadOperation(&sd_handle, 100000000) != SD_OK) {\n+ return false;\n+ }\n+ return true;\n+}\n+bool sdcard_write_blocks_dma(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {\n+ \/\/ check that src pointer is aligned on a 4-byte boundary\n+ if (((uint32_t)src & 3) != 0) {\n+ return false;\n+ }\n+ \/\/ check that SD card is initialised\n+ if (sd_handle.Instance == NULL) {\n+ return false;\n+ }\n+ SD_Error status;\n+ status = HAL_SD_WriteBlocks_BlockNumber_DMA(&sd_handle, (uint32_t*)src, block_num, SDCARD_BLOCK_SIZE, num_blocks);\n+ if (status != SD_OK) {\n+ return false;\n+ }\n+ \/\/ wait for DMA transfer to finish, with a large timeout\n+ status = HAL_SD_CheckWriteOperation(&sd_handle, 100000000);\n+ if (status != SD_OK) {\n+ return false;\n+ }\n+ return true;\n+}\n+#endif\n \n \/******************************************************************************\/\n \/\/ Micro Python bindings\n"} {"commit":"3b5a4f482090f51280e92003835cd4ed625a3aba","subject":"avidmxfinfo: add pc label and rename ec label prop in output","message":"avidmxfinfo: add pc label and rename ec label prop in output\n","repos":"ebu\/ebu-libmxf,Limecraft\/ebu-libmxf,ebu\/ebu-libmxf,Limecraft\/ebu-libmxf,stuarthicks\/libmxf,stuarthicks\/libmxf,stuarthicks\/libmxf,Limecraft\/ebu-libmxf,ebu\/ebu-libmxf,ebu\/ebu-libmxf,stuarthicks\/libmxf","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/avidmxfinfo\/avid_mxf_info.c\n+++ examples\/avidmxfinfo\/avid_mxf_info.c\n@@ -1413,8 +1413,11 @@\n printf(\"Clip track string = %s\\n\", (info->tracksString == NULL) ? \"\" : info->tracksString);\n printf(\"%s essence\\n\", info->isVideo ? \"Video\": \"Audio\");\n printf(\"Essence type = %s\\n\", get_essence_type_string(info->essenceType, info->projectEditRate));\n- printf(\"Essence label = \");\n+ printf(\"Essence container label = \");\n print_label(&info->essenceContainerLabel);\n+ printf(\"\\n\");\n+ printf(\"Picture coding label = \");\n+ print_label(&info->pictureCodingLabel);\n printf(\"\\n\");\n printf(\"Track number = %d\\n\", info->trackNumber);\n printf(\"Edit rate = %d\/%d\\n\", info->editRate.numerator, info->editRate.denominator);\n"} {"commit":"e73dd0b30ed33977b85c502c8e023433f26ce523","subject":"Add function for getting minimum AF sti","message":"Add function for getting minimum AF sti\n","repos":"AmeBel\/atomspace,rTreutlein\/atomspace,rTreutlein\/atomspace,rTreutlein\/atomspace,rTreutlein\/atomspace,rTreutlein\/atomspace,AmeBel\/atomspace,AmeBel\/atomspace,AmeBel\/atomspace,AmeBel\/atomspace","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/attentionbank\/AttentionBank.h\n+++ opencog\/attentionbank\/AttentionBank.h\n@@ -132,6 +132,14 @@\n return 0;\n }\n \n+ AttentionValue::sti_t get_af_min_sti(void) const\n+ {\n+ if (attentionalFocus.rbegin() != attentionalFocus.rend())\n+ return ((attentionalFocus.rend()-1)->second)->getSTI();\n+ else\n+ return 0;\n+ }\n+\n void set_af_size(int size) {\n maxAFSize = size;\n }\n"} {"commit":"2da99e78dd3e63aad31425dc77dde070853dfc12","subject":"Remove duplicated variable definition","message":"Remove duplicated variable definition\n","repos":"tieto\/farstream,kakaroto\/farstream,tieto\/farstream,pexip\/farstream,kakaroto\/farstream,shadeslayer\/farstream,kakaroto\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,tieto\/farstream,ahmedammar\/skype_farsight2,kakaroto\/farstream,shadeslayer\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,pexip\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-codec-negotiation.c\n+++ gst\/fsrtpconference\/fs-rtp-codec-negotiation.c\n@@ -602,7 +602,6 @@\n }\n \n if (!nego_codec) {\n- GList *item = NULL;\n \n for (item = current_codec_associations;\n item;\n"} {"commit":"68d1a3afd4edfd4a105054920be51778e7a7dc29","subject":"mesa\/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs","message":"mesa\/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs\n\ninstead of just for GL and ES1.\n\nSigned-off-by: Tomeu Vizoso <8b6d03f77639b596ee6a2bb7aebb412be798513b@collabora.com>\nReviewed-by: Kenneth Graunke <bd2562f754ec92342f93f61c25d731e290a2ffa8@whitecape.org>\n","repos":"bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/get.c\n+++ src\/mesa\/main\/get.c\n@@ -535,6 +535,11 @@\n \n \/* GL_{APPLE,ARB,OES}_vertex_array_object *\/\n { GL_VERTEX_ARRAY_BINDING_APPLE, ARRAY_INT(Name), NO_EXTRA },\n+\n+ \/* GL_EXT_texture_filter_anisotropic *\/\n+ { GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,\n+ CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy),\n+ extra_EXT_texture_filter_anisotropic },\n \n #if FEATURE_GL || FEATURE_ES1\n \/* Enums in OpenGL and GLES1 *\/\n@@ -685,11 +690,6 @@\n \/* GL_EXT_texture_lod_bias *\/\n { GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias),\n NO_EXTRA },\n-\n- \/* GL_EXT_texture_filter_anisotropic *\/\n- { GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,\n- CONTEXT_FLOAT(Const.MaxTextureMaxAnisotropy),\n- extra_EXT_texture_filter_anisotropic },\n #endif \/* FEATURE_GL || FEATURE_ES1 *\/\n \n #if FEATURE_ES1\n"} {"commit":"334d95aa503ee8f23bb605c4d822c92712141d91","subject":"fix bug in MD5 sum printing","message":"fix bug in MD5 sum printing\n","repos":"jeeb\/flac,jeeb\/flac,jeeb\/flac,jeeb\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/metaflac\/main.c\n+++ src\/metaflac\/main.c\n@@ -1484,9 +1484,9 @@\n \t\t\tPPR; printf(\" total samples: %llu\\n\", block->data.stream_info.total_samples);\n \t\t\tPPR; printf(\" MD5 signature: \");\n \t\t\tfor(i = 0; i < 16; i++) {\n-\t\t\t\tPPR; printf(\"%02x\", block->data.stream_info.md5sum[i]);\n+\t\t\t\tprintf(\"%02x\", (unsigned)block->data.stream_info.md5sum[i]);\n \t\t\t}\n-\t\t\tPPR; printf(\"\\n\");\n+\t\t\tprintf(\"\\n\");\n \t\t\tbreak;\n \t\tcase FLAC__METADATA_TYPE_PADDING:\n \t\t\t\/* nothing to print *\/\n@@ -1508,7 +1508,12 @@\n \t\tcase FLAC__METADATA_TYPE_SEEKTABLE:\n \t\t\tPPR; printf(\" seek points: %u\\n\", block->data.seek_table.num_points);\n \t\t\tfor(i = 0; i < block->data.seek_table.num_points; i++) {\n-\t\t\t\tPPR; printf(\" point %d: sample_number=%llu, stream_offset=%llu, frame_samples=%u\\n\", i, block->data.seek_table.points[i].sample_number, block->data.seek_table.points[i].stream_offset, block->data.seek_table.points[i].frame_samples);\n+\t\t\t\tif(block->data.seek_table.points[i].sample_number != FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER) {\n+\t\t\t\t\tPPR; printf(\" point %d: sample_number=%llu, stream_offset=%llu, frame_samples=%u\\n\", i, block->data.seek_table.points[i].sample_number, block->data.seek_table.points[i].stream_offset, block->data.seek_table.points[i].frame_samples);\n+\t\t\t\t}\n+\t\t\t\telse {\n+\t\t\t\t\tPPR; printf(\" point %d: PLACEHOLDER\\n\", i);\n+\t\t\t\t}\n \t\t\t}\n \t\t\tbreak;\n \t\tcase FLAC__METADATA_TYPE_VORBIS_COMMENT:\n"} {"commit":"02be71092acba9fc1bcabd76c968cdc36e080442","subject":"mb now uses the LMOPT_TARGET_FUNCTION","message":"mb now uses the LMOPT_TARGET_FUNCTION\n","repos":"Bithack\/methabot,Bithack\/methabot,Bithack\/methabot,Bithack\/methabot","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/methabot\/main.c\n+++ src\/methabot\/main.c\n@@ -135,6 +135,7 @@\n static void mb_warning_cb(metha_t *m, const char *s, ...);\n static void mb_error_cb(metha_t *m, const char *s, ...);\n static void mb_status_cb(metha_t *m, struct worker *w, url_t *url);\n+static void mb_target_cb(metha_t *m, struct worker *w, url_t *url, filetype_t *ft);\n static void mb_status_silent_cb(metha_t *m, struct worker *w, url_t *url);\n \n extern char *optarg;\n@@ -250,6 +251,7 @@\n else\n lmetha_setopt(m, LMOPT_STATUS_FUNCTION, &mb_status_cb);\n lmetha_setopt(m, LMOPT_ERROR_FUNCTION, &mb_error_cb);\n+ lmetha_setopt(m, LMOPT_TARGET_FUNCTION, &mb_target_cb);\n lmetha_setopt(m, LMOPT_WARNING_FUNCTION, &mb_warning_cb);\n \n \n@@ -701,6 +703,12 @@\n }\n \n static void\n+mb_target_cb(metha_t *m, struct worker *w, url_t *url, filetype_t *ft)\n+{\n+ printf(\"[-] %s\\n\", url->str);\n+}\n+\n+static void\n mb_status_cb(metha_t *m, struct worker *w, url_t *url)\n {\n printf(\"[I] URL: %s\\n\", url->str);\n"} {"commit":"d42b1b50e58cbc9f71da3efd2f387742c6ef94de","subject":"Allow the caller to access the entire content of CMDSTA","message":"Allow the caller to access the entire content of CMDSTA\n\nWhen sending a command to the CC13xx\/CC25xx RF core, we wait for command completion by checking the LSB of CMDSTA (correctly so). However, in doing so we also zero out the 3 CMDSTA return bytes. For some commands, those bytes contain useful information (e.g. an RSSI value) and are required by the caller.\n\nThis problem manifests itself e.g. in PROP mode `channel_clear()`, whereby the caller will always see an RSSI value of 0.\n\nThis pull therefore fixes the logic in `rf_core_send_cmd()` to check for command completion by blocking on the CMDSTA result byte without zeroing out the 3 return bytes.\n\nFixes #1465\n","repos":"arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cpu\/cc26xx-cc13xx\/rf-core\/rf-core.c\n+++ cpu\/cc26xx-cc13xx\/rf-core\/rf-core.c\n@@ -160,7 +160,7 @@\n \n HWREG(RFC_DBELL_BASE + RFC_DBELL_O_CMDR) = cmd;\n do {\n- *status = HWREG(RFC_DBELL_BASE + RFC_DBELL_O_CMDSTA) & 0xFF;\n+ *status = HWREG(RFC_DBELL_BASE + RFC_DBELL_O_CMDSTA);\n if(++timeout_count > 50000) {\n PRINTF(\"rf_core_send_cmd: 0x%08lx Timeout\\n\", cmd);\n if(!interrupts_disabled) {\n@@ -168,7 +168,7 @@\n }\n return RF_CORE_CMD_ERROR;\n }\n- } while(*status == RF_CORE_CMDSTA_PENDING);\n+ } while((*status & RF_CORE_CMDSTA_RESULT_MASK) == RF_CORE_CMDSTA_PENDING);\n \n if(!interrupts_disabled) {\n ti_lib_int_master_enable();\n"} {"commit":"c5395342dca927cfab744caced5ebe3f9eda5e0d","subject":"doc: use @false instead of 0","message":"doc: use @false instead of 0\n","repos":"avmelnikoff\/RIOT,Osblouf\/RIOT,brettswann\/RIOT,AnonMall\/RIOT,A-Paul\/RIOT,koenning\/RIOT,1blankz7\/RIOT,mtausig\/RIOT,1blankz7\/RIOT,phiros\/RIOT,MonsterCode8000\/RIOT,adjih\/RIOT,DipSwitch\/RIOT,jasonatran\/RIOT,ntrtrung\/RIOT,automote\/RIOT,wentaoshang\/RIOT,jhollister\/RIOT,gautric\/RIOT,herrfz\/RIOT,Darredevil\/RIOT,arvindpdmn\/RIOT,marcosalm\/RIOT,patkan\/RIOT,wentaoshang\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,A-Paul\/RIOT,Ell-i\/RIOT,dhruvvyas90\/RIOT,abkam07\/RIOT,yogo1212\/RIOT,d00616\/RIOT,miri64\/RIOT,MarkXYang\/RIOT,ks156\/RIOT,centurysys\/RIOT,dailab\/RIOT,koenning\/RIOT,benoit-canet\/RIOT,benoit-canet\/RIOT,RubikonAlpha\/RIOT,MohmadAyman\/RIOT,sgso\/RIOT,jhollister\/RIOT,neiljay\/RIOT,jfischer-phytec-iot\/RIOT,MonsterCode8000\/RIOT,daniel-k\/RIOT,OTAkeys\/RIOT,phiros\/RIOT,ks156\/RIOT,ximus\/RIOT,abkam07\/RIOT,Darredevil\/RIOT,asanka-code\/RIOT,roberthartung\/RIOT,fnack\/RIOT,dkm\/RIOT,Josar\/RIOT,lazytech-org\/RIOT,katezilla\/RIOT,abp719\/RIOT,rfswarm2\/RIOT,wentaoshang\/RIOT,plushvoxel\/RIOT,lebrush\/RIOT,A-Paul\/RIOT,thomaseichinger\/RIOT,AnonMall\/RIOT,neumodisch\/RIOT,kushalsingh007\/RIOT,ant9000\/RIOT,FrancescoErmini\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,sumanpanchal\/RIOT,dhruvvyas90\/RIOT,biboc\/RIOT,EmuxEvans\/RIOT,katezilla\/RIOT,immesys\/RiSyn,zhuoshuguo\/RIOT,kaleb-himes\/RIOT,d00616\/RIOT,FrancescoErmini\/RIOT,Osblouf\/RIOT,chris-wood\/RIOT,ximus\/RIOT,LudwigOrtmann\/RIOT,changbiao\/RIOT,jbeyerstedt\/RIOT-OTA-update,abp719\/RIOT,immesys\/RiSyn,DipSwitch\/RIOT,dailab\/RIOT,OlegHahm\/RIOT,x3ro\/RIOT,rfuentess\/RIOT,marcosalm\/RIOT,ThanhVic\/RIOT,fnack\/RIOT,kbumsik\/RIOT,rfswarm2\/RIOT,rakendrathapa\/RIOT,LudwigKnuepfer\/RIOT,mtausig\/RIOT,RIOT-OS\/RIOT,cladmi\/RIOT,herrfz\/RIOT,kYc0o\/RIOT,chris-wood\/RIOT,toonst\/RIOT,haoyangyu\/RIOT,automote\/RIOT,l3nko\/RIOT,rfswarm2\/RIOT,jhollister\/RIOT,kaleb-himes\/RIOT,automote\/RIOT,BytesGalore\/RIOT,kYc0o\/RIOT,basilfx\/RIOT,rfuentess\/RIOT,jhollister\/RIOT,rfuentess\/RIOT,alex1818\/RIOT,MarkXYang\/RIOT,tfar\/RIOT,1blankz7\/RIOT,haoyangyu\/RIOT,kb2ma\/RIOT,biboc\/RIOT,herrfz\/RIOT-old,nsol-nmsu\/RIOT,LudwigKnuepfer\/RIOT,malosek\/RIOT,jhollister\/RIOT,attdona\/RIOT,malosek\/RIOT,PSHIVANI\/Riot-Code,backenklee\/RIOT,sgso\/RIOT,RubikonAlpha\/RIOT,phiros\/RIOT,brettswann\/RIOT,immesys\/RiSyn,shady33\/RIOT,miri64\/RIOT,khhhh\/RIOT,ThanhVic\/RIOT,OTAkeys\/RIOT,A-Paul\/RIOT,BytesGalore\/RIOT,alignan\/RIOT,khhhh\/RIOT,Ell-i\/RIOT,binarylemon\/RIOT,gebart\/RIOT,rajma996\/RIOT,biboc\/RIOT,biboc\/RIOT,OlegHahm\/RIOT,kushalsingh007\/RIOT,Josar\/RIOT,toonst\/RIOT,tfar\/RIOT,LudwigOrtmann\/RIOT,Hyungsin\/RIOT-OS,authmillenon\/RIOT,AnonMall\/RIOT,Darredevil\/RIOT,Yonezawa-T2\/RIOT,jremmert-phytec-iot\/RIOT,patkan\/RIOT,aeneby\/RIOT,TobiasFredersdorf\/RIOT,openkosmosorg\/RIOT,kaspar030\/RIOT,rakendrathapa\/RIOT,shady33\/RIOT,plushvoxel\/RIOT,kaleb-himes\/RIOT,thomaseichinger\/RIOT,haoyangyu\/RIOT,x3ro\/RIOT,EmuxEvans\/RIOT,RubikonAlpha\/RIOT,herrfz\/RIOT-old,binarylemon\/RIOT,arvindpdmn\/RIOT,JensErdmann\/RIOT,koenning\/RIOT,fnack\/RIOT,ant9000\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,mziegert\/RIOT,Lexandro92\/RIOT-CoAP,jremmert-phytec-iot\/RIOT,x3ro\/RIOT,Yonezawa-T2\/RIOT,marcosalm\/RIOT,mziegert\/RIOT,kbumsik\/RIOT,yogo1212\/RIOT,neiljay\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,LudwigOrtmann\/RIOT,mtausig\/RIOT,neiljay\/RIOT,daniel-k\/RIOT,sgso\/RIOT,1blankz7\/RIOT,koenning\/RIOT,lazytech-org\/RIOT,BytesGalore\/RIOT,Lexandro92\/RIOT-CoAP,gbarnett\/RIOT,RBartz\/RIOT,JensErdmann\/RIOT,fnack\/RIOT,gbarnett\/RIOT,aeneby\/RIOT,jhollister\/RIOT,hamilton-mote\/RIOT-OS,Lexandro92\/RIOT-CoAP,rakendrathapa\/RIOT,daniel-k\/RIOT,tdautc19841202\/RIOT,jremmert-phytec-iot\/RIOT,lebrush\/RIOT,biboc\/RIOT,neumodisch\/RIOT,zhuoshuguo\/RIOT,ant9000\/RIOT,tfar\/RIOT,ximus\/RIOT,luciotorre\/RIOT,basilfx\/RIOT,zhuoshuguo\/RIOT,altairpearl\/RIOT,luciotorre\/RIOT,avmelnikoff\/RIOT,binarylemon\/RIOT,AnonMall\/RIOT,RIOT-OS\/RIOT,LudwigKnuepfer\/RIOT,openkosmosorg\/RIOT,alex1818\/RIOT,zhuoshuguo\/RIOT,kb2ma\/RIOT,immesys\/RiSyn,sumanpanchal\/RIOT,kaspar030\/RIOT,shady33\/RIOT,mtausig\/RIOT,msolters\/RIOT,mziegert\/RIOT,khhhh\/RIOT,automote\/RIOT,jferreir\/RIOT,attdona\/RIOT,thiagohd\/RIOT,arvindpdmn\/RIOT,PSHIVANI\/Riot-Code,centurysys\/RIOT,roberthartung\/RIOT,JensErdmann\/RIOT,OTAkeys\/RIOT,josephnoir\/RIOT,kushalsingh007\/RIOT,dhruvvyas90\/RIOT,kerneltask\/RIOT,adjih\/RIOT,shady33\/RIOT,kaspar030\/RIOT,daniel-k\/RIOT,thiagohd\/RIOT,backenklee\/RIOT,rfswarm\/RIOT,dailab\/RIOT,Yonezawa-T2\/RIOT,rousselk\/RIOT,MonsterCode8000\/RIOT,chris-wood\/RIOT,PSHIVANI\/Riot-Code,robixnai\/RIOT,tfar\/RIOT,rfswarm\/RIOT,marcosalm\/RIOT,rfswarm\/RIOT,adjih\/RIOT,malosek\/RIOT,rakendrathapa\/RIOT,rousselk\/RIOT,FrancescoErmini\/RIOT,centurysys\/RIOT,yogo1212\/RIOT,luciotorre\/RIOT,binarylemon\/RIOT,herrfz\/RIOT-old,gebart\/RIOT,Darredevil\/RIOT,nsol-nmsu\/RIOT,mziegert\/RIOT,syin2\/RIOT,MarkXYang\/RIOT,gautric\/RIOT,ThanhVic\/RIOT,jfischer-phytec-iot\/RIOT,bartfaizoltan\/RIOT,mfrey\/RIOT,rajma996\/RIOT,d00616\/RIOT,JensErdmann\/RIOT,kbumsik\/RIOT,mfrey\/RIOT,beurdouche\/RIOT,altairpearl\/RIOT,centurysys\/RIOT,1blankz7\/RIOT,openkosmosorg\/RIOT,kerneltask\/RIOT,beurdouche\/RIOT,ThanhVic\/RIOT,koenning\/RIOT,DipSwitch\/RIOT,TobiasFredersdorf\/RIOT,aeneby\/RIOT,alignan\/RIOT,attdona\/RIOT,binarylemon\/RIOT,shady33\/RIOT,herrfz\/RIOT,sgso\/RIOT,LudwigOrtmann\/RIOT,DipSwitch\/RIOT,chris-wood\/RIOT,koenning\/RIOT,tdautc19841202\/RIOT,robixnai\/RIOT,gebart\/RIOT,benoit-canet\/RIOT,herrfz\/RIOT-old,bartfaizoltan\/RIOT,fnack\/RIOT,lazytech-org\/RIOT,immesys\/RiSyn,rajma996\/RIOT,abkam07\/RIOT,jremmert-phytec-iot\/RIOT,backenklee\/RIOT,dkm\/RIOT,watr-li\/RIOT,AnonMall\/RIOT,JensErdmann\/RIOT,automote\/RIOT,centurysys\/RIOT,lebrush\/RIOT,zhuoshuguo\/RIOT,gbarnett\/RIOT,benoit-canet\/RIOT,gautric\/RIOT,nsol-nmsu\/RIOT,alex1818\/RIOT,cladmi\/RIOT,syin2\/RIOT,thomaseichinger\/RIOT,ks156\/RIOT,MarkXYang\/RIOT,smlng\/RIOT,tfar\/RIOT,sumanpanchal\/RIOT,msolters\/RIOT,rfuentess\/RIOT,Hyungsin\/RIOT-OS,sgso\/RIOT,asanka-code\/RIOT,mfrey\/RIOT,backenklee\/RIOT,syin2\/RIOT,yogo1212\/RIOT,BytesGalore\/RIOT,jasonatran\/RIOT,kaleb-himes\/RIOT,rakendrathapa\/RIOT,robixnai\/RIOT,kaleb-himes\/RIOT,msolters\/RIOT,Darredevil\/RIOT,EmuxEvans\/RIOT,jremmert-phytec-iot\/RIOT,marcosalm\/RIOT,openkosmosorg\/RIOT,herrfz\/RIOT,jbeyerstedt\/RIOT-OTA-update,stevenj\/RIOT,rfswarm\/RIOT,syin2\/RIOT,miri64\/RIOT,asanka-code\/RIOT,l3nko\/RIOT,ks156\/RIOT,watr-li\/RIOT,jasonatran\/RIOT,brettswann\/RIOT,daniel-k\/RIOT,mfrey\/RIOT,miri64\/RIOT,alignan\/RIOT,Lexandro92\/RIOT-CoAP,OlegHahm\/RIOT,MohmadAyman\/RIOT,changbiao\/RIOT,plushvoxel\/RIOT,cladmi\/RIOT,toonst\/RIOT,jremmert-phytec-iot\/RIOT,rfswarm2\/RIOT,EmuxEvans\/RIOT,thomaseichinger\/RIOT,backenklee\/RIOT,l3nko\/RIOT,Josar\/RIOT,altairpearl\/RIOT,kb2ma\/RIOT,binarylemon\/RIOT,beurdouche\/RIOT,arvindpdmn\/RIOT,JensErdmann\/RIOT,nsol-nmsu\/RIOT,luciotorre\/RIOT,phiros\/RIOT,wentaoshang\/RIOT,cladmi\/RIOT,LudwigKnuepfer\/RIOT,tdautc19841202\/RIOT,chris-wood\/RIOT,msolters\/RIOT,RBartz\/RIOT,asanka-code\/RIOT,basilfx\/RIOT,Darredevil\/RIOT,yogo1212\/RIOT,Josar\/RIOT,patkan\/RIOT,rousselk\/RIOT,dhruvvyas90\/RIOT,changbiao\/RIOT,ant9000\/RIOT,kbumsik\/RIOT,Ell-i\/RIOT,lebrush\/RIOT,ximus\/RIOT,PSHIVANI\/Riot-Code,latsku\/RIOT,jasonatran\/RIOT,bartfaizoltan\/RIOT,MarkXYang\/RIOT,Osblouf\/RIOT,thomaseichinger\/RIOT,ntrtrung\/RIOT,TobiasFredersdorf\/RIOT,latsku\/RIOT,PSHIVANI\/Riot-Code,d00616\/RIOT,lazytech-org\/RIOT,rousselk\/RIOT,katezilla\/RIOT,kerneltask\/RIOT,stevenj\/RIOT,MonsterCode8000\/RIOT,LudwigOrtmann\/RIOT,brettswann\/RIOT,beurdouche\/RIOT,d00616\/RIOT,mtausig\/RIOT,kushalsingh007\/RIOT,wentaoshang\/RIOT,khhhh\/RIOT,jferreir\/RIOT,changbiao\/RIOT,smlng\/RIOT,PSHIVANI\/Riot-Code,gautric\/RIOT,bartfaizoltan\/RIOT,latsku\/RIOT,robixnai\/RIOT,rajma996\/RIOT,avmelnikoff\/RIOT,Hyungsin\/RIOT-OS,daniel-k\/RIOT,rajma996\/RIOT,RBartz\/RIOT,sumanpanchal\/RIOT,jferreir\/RIOT,latsku\/RIOT,openkosmosorg\/RIOT,benoit-canet\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,FrancescoErmini\/RIOT,patkan\/RIOT,jferreir\/RIOT,sgso\/RIOT,RubikonAlpha\/RIOT,latsku\/RIOT,hamilton-mote\/RIOT-OS,robixnai\/RIOT,OlegHahm\/RIOT,dkm\/RIOT,robixnai\/RIOT,FrancescoErmini\/RIOT,neumodisch\/RIOT,watr-li\/RIOT,roberthartung\/RIOT,Yonezawa-T2\/RIOT,TobiasFredersdorf\/RIOT,altairpearl\/RIOT,Hyungsin\/RIOT-OS,herrfz\/RIOT-old,rfuentess\/RIOT,Osblouf\/RIOT,stevenj\/RIOT,watr-li\/RIOT,gebart\/RIOT,watr-li\/RIOT,MohmadAyman\/RIOT,RubikonAlpha\/RIOT,alex1818\/RIOT,rfswarm\/RIOT,ntrtrung\/RIOT,smlng\/RIOT,stevenj\/RIOT,phiros\/RIOT,jbeyerstedt\/RIOT-OTA-update,msolters\/RIOT,ximus\/RIOT,marcosalm\/RIOT,RIOT-OS\/RIOT,asanka-code\/RIOT,jbeyerstedt\/RIOT-OTA-update,basilfx\/RIOT,patkan\/RIOT,beurdouche\/RIOT,Lexandro92\/RIOT-CoAP,toonst\/RIOT,Osblouf\/RIOT,malosek\/RIOT,haoyangyu\/RIOT,automote\/RIOT,DipSwitch\/RIOT,authmillenon\/RIOT,roberthartung\/RIOT,avmelnikoff\/RIOT,aeneby\/RIOT,adrianghc\/RIOT,gautric\/RIOT,rfswarm2\/RIOT,MohmadAyman\/RIOT,cladmi\/RIOT,kaspar030\/RIOT,thiagohd\/RIOT,dkm\/RIOT,tdautc19841202\/RIOT,smlng\/RIOT,josephnoir\/RIOT,ThanhVic\/RIOT,tdautc19841202\/RIOT,miri64\/RIOT,malosek\/RIOT,abkam07\/RIOT,jbeyerstedt\/RIOT-OTA-update,ntrtrung\/RIOT,authmillenon\/RIOT,thiagohd\/RIOT,luciotorre\/RIOT,adjih\/RIOT,latsku\/RIOT,BytesGalore\/RIOT,rajma996\/RIOT,alignan\/RIOT,khhhh\/RIOT,alignan\/RIOT,immesys\/RiSyn,malosek\/RIOT,MohmadAyman\/RIOT,plushvoxel\/RIOT,thiagohd\/RIOT,tdautc19841202\/RIOT,A-Paul\/RIOT,rfswarm2\/RIOT,MarkXYang\/RIOT,dhruvvyas90\/RIOT,FrancescoErmini\/RIOT,mziegert\/RIOT,Hyungsin\/RIOT-OS,syin2\/RIOT,adrianghc\/RIOT,attdona\/RIOT,jfischer-phytec-iot\/RIOT,RIOT-OS\/RIOT,Ell-i\/RIOT,abkam07\/RIOT,neiljay\/RIOT,abp719\/RIOT,bartfaizoltan\/RIOT,haoyangyu\/RIOT,herrfz\/RIOT,changbiao\/RIOT,gebart\/RIOT,x3ro\/RIOT,abp719\/RIOT,MonsterCode8000\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,ks156\/RIOT,kushalsingh007\/RIOT,haoyangyu\/RIOT,adrianghc\/RIOT,RBartz\/RIOT,d00616\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,AnonMall\/RIOT,arvindpdmn\/RIOT,fnack\/RIOT,hamilton-mote\/RIOT-OS,TobiasFredersdorf\/RIOT,ntrtrung\/RIOT,kerneltask\/RIOT,kerneltask\/RIOT,wentaoshang\/RIOT,RubikonAlpha\/RIOT,openkosmosorg\/RIOT,kbumsik\/RIOT,kb2ma\/RIOT,gbarnett\/RIOT,toonst\/RIOT,phiros\/RIOT,thiagohd\/RIOT,abkam07\/RIOT,mziegert\/RIOT,basilfx\/RIOT,zhuoshuguo\/RIOT,adjih\/RIOT,OlegHahm\/RIOT,rfswarm\/RIOT,alex1818\/RIOT,dkm\/RIOT,bartfaizoltan\/RIOT,kb2ma\/RIOT,LudwigOrtmann\/RIOT,MohmadAyman\/RIOT,aeneby\/RIOT,jfischer-phytec-iot\/RIOT,avmelnikoff\/RIOT,josephnoir\/RIOT,attdona\/RIOT,rousselk\/RIOT,1blankz7\/RIOT,mfrey\/RIOT,hamilton-mote\/RIOT-OS,yogo1212\/RIOT,altairpearl\/RIOT,abp719\/RIOT,ximus\/RIOT,lazytech-org\/RIOT,neiljay\/RIOT,kYc0o\/RIOT,msolters\/RIOT,RBartz\/RIOT,kYc0o\/RIOT,watr-li\/RIOT,RIOT-OS\/RIOT,katezilla\/RIOT,shady33\/RIOT,centurysys\/RIOT,Ell-i\/RIOT,asanka-code\/RIOT,dailab\/RIOT,brettswann\/RIOT,authmillenon\/RIOT,neumodisch\/RIOT,attdona\/RIOT,luciotorre\/RIOT,Josar\/RIOT,Yonezawa-T2\/RIOT,jfischer-phytec-iot\/RIOT,kYc0o\/RIOT,kushalsingh007\/RIOT,lebrush\/RIOT,khhhh\/RIOT,stevenj\/RIOT,stevenj\/RIOT,DipSwitch\/RIOT,jferreir\/RIOT,lebrush\/RIOT,gbarnett\/RIOT,jferreir\/RIOT,josephnoir\/RIOT,dhruvvyas90\/RIOT,sumanpanchal\/RIOT,LudwigKnuepfer\/RIOT,MonsterCode8000\/RIOT,nsol-nmsu\/RIOT,OTAkeys\/RIOT,dailab\/RIOT,Yonezawa-T2\/RIOT,chris-wood\/RIOT,herrfz\/RIOT,RBartz\/RIOT,gbarnett\/RIOT,arvindpdmn\/RIOT,rousselk\/RIOT,Osblouf\/RIOT,changbiao\/RIOT,x3ro\/RIOT,l3nko\/RIOT,altairpearl\/RIOT,adrianghc\/RIOT,adrianghc\/RIOT,EmuxEvans\/RIOT,katezilla\/RIOT,josephnoir\/RIOT,neumodisch\/RIOT,rakendrathapa\/RIOT,l3nko\/RIOT,neumodisch\/RIOT,jasonatran\/RIOT,EmuxEvans\/RIOT,Lexandro92\/RIOT-CoAP,plushvoxel\/RIOT,brettswann\/RIOT,hamilton-mote\/RIOT-OS,alex1818\/RIOT,OTAkeys\/RIOT,benoit-canet\/RIOT,patkan\/RIOT,abp719\/RIOT,ntrtrung\/RIOT,roberthartung\/RIOT,l3nko\/RIOT,ThanhVic\/RIOT,smlng\/RIOT,sumanpanchal\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/sam3x8e\/include\/system_sam3xa.h\n+++ cpu\/sam3x8e\/include\/system_sam3xa.h\n@@ -40,7 +40,7 @@\n #ifndef SYSTEM_SAM3X_H_INCLUDED\n #define SYSTEM_SAM3X_H_INCLUDED\n \n-\/* @cond 0 *\/\n+\/* @cond @false *\/\n \/**INDENT-OFF**\/\n \/**INDENT-ON**\/\n \/* @endcond *\/\n@@ -70,7 +70,7 @@\n *\/\n void system_init_flash(uint32_t dw_clk);\n \n-\/* @cond 0 *\/\n+\/* @cond @false *\/\n \/**INDENT-OFF**\/\n #ifdef __cplusplus\n }\n"} {"commit":"2f20c0d8bb54b6c3708014d8a746a37d16720baf","subject":"select\u51fd\u6570\u7684\u7b80\u5355\u7528\u6cd5","message":"select\u51fd\u6570\u7684\u7b80\u5355\u7528\u6cd5\n","repos":"kiwi-yan\/programming-demo","returncode":1,"stderr":"error: pathspec 'api-demo\/select.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- api-demo\/select.c\n+++ api-demo\/select.c\n@@ -0,0 +1,150 @@\n+#include <sys\/socket.h>\n+#include <arpa\/inet.h>\n+#include <sys\/select.h>\n+#include <sys\/time.h>\n+#include <unistd.h>\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+#define MAXLINE 512\n+#define SERV_PORT 1234 \/* \u670d\u52a1\u5668\u76d1\u542c\u7aef\u53e3 *\/\n+#define BACKLOG 12 \/* \u79ef\u538b\u503c *\/\n+\n+\/** \u5efa\u7acbtcp\u5957\u63a5\u5b57\u5e76\u76d1\u542c\u6307\u5b9a\u7684\u7aef\u53e3\uff08\u670d\u52a1\u7aef\uff09 **\/\n+int tcp_server_socket(int port);\n+\/** TCP\u670d\u52a1\u5668\u4e3b\u51fd\u6570 **\/\n+int tcp_main(int client_fd);\n+\n+int main(int argc, char *argv[])\n+{\n+ int listen_fd, client_fd;\n+ int client[FD_SETSIZE], max_fd, max_i; \/* \u5ba2\u6237\u8fde\u63a5\u63cf\u8ff0\u7b26 *\/\n+ fd_set allset, rset; \/* \u6240\u6709\u63cf\u8ff0\u7b26\u96c6\u5408\u4e0e\u53ef\u8bfb\u63cf\u8ff0\u7b26\u96c6\u5408 *\/\n+ int i, nready;\n+ \n+ listen_fd = tcp_server_socket(SERV_PORT);\n+\n+ \/** \u521d\u59cb\u5316\u63cf\u8ff0\u7b26\u96c6\u5408 **\/\n+ max_fd = listen_fd;\n+ max_i = -1;\n+ for (i = 0; i < FD_SETSIZE; i++) {\n+ client[i] = -1;\n+ }\n+ FD_ZERO(&allset);\n+ FD_SET(listen_fd, &allset);\n+ \n+ \/** \u7b80\u5355\u7684\u5355\u8fdb\u7a0bselect\u591a\u8def\u590d\u7528\u5e76\u53d1\u670d\u52a1 **\/\n+ for ( ; ; ) {\n+ rset = allset; \/* select\u4f1a\u4fee\u6539\u4f20\u5165\u7684\u63cf\u8ff0\u7b26\u96c6\u5408\uff0c\u6ce8\u610f\u5907\u4efd *\/\n+ \/** \u83b7\u53d6\u53ef\u8bfb\u7684\u63cf\u8ff0\u7b26 **\/\n+ if ((nready = select(max_fd+1, &rset, NULL, NULL, NULL)) < 0) {\n+ perror(\"select error\");\n+ exit(EXIT_FAILURE);\n+ }\n+\n+ if (FD_ISSET(listen_fd, &rset)) { \/* \u6709\u65b0\u8fde\u63a5 *\/\n+ \/** \u63a5\u53d7\u6765\u81ea\u5ba2\u6237\u7aef\u7684\u8fde\u63a5 **\/\n+ if ((client_fd = accept(listen_fd, NULL, NULL)) < 0) {\n+ perror(\"accept error\");\n+ exit(EXIT_FAILURE);\n+ }\n+\n+ \/** \u5c06\u65b0\u8fde\u63a5\u52a0\u5165\u5ba2\u6237\u8868 **\/\n+ for (i = 0; i < FD_SETSIZE; i++) {\n+ if (client[i] < 0) {\n+ client[i] = client_fd;\n+ break;\n+ }\n+ }\n+ if (i == FD_SETSIZE) { \/* \u8fde\u63a5\u6570\u592a\u591a\uff0c\u670d\u52a1\u5668\u5ba3\u544a\u5d29\u6e83 *\/\n+ fprintf(stderr, \"too many clients\\n\");\n+ exit(EXIT_FAILURE);\n+ }\n+\n+ FD_SET(client_fd, &allset);\n+ if (client_fd > max_fd)\n+ max_fd = client_fd;\n+ if (i > max_i)\n+ max_i = i;\n+\n+ if (--nready <= 0) \/* \u6ca1\u6709\u53ef\u8bfb\u63cf\u8ff0\u7b26 *\/\n+ continue;\n+ }\n+\n+ for (i = 0; i <= max_i; i++) { \/* \u68c0\u67e5\u6240\u6709\u5ba2\u6237\u63cf\u8ff0\u7b26 *\/\n+ if (client[i] < 0)\n+ continue;\n+ if (FD_ISSET(client[i], &rset)) { \/* OK *\/\n+ \/** \u4f9d\u636e\u670d\u52a1\u5668\u6240\u63d0\u4f9b\u670d\u52a1\u7075\u6d3b\u6539\u53d8\u7ed3\u6784 **\/\n+ if (tcp_main(client[i]) == 0) {\n+ \/** \u4e00\u4e2a\u5ba2\u6237\u670d\u52a1\u7ed3\u675f\u5e94\u91c7\u53d6\u7684\u64cd\u4f5c **\/\n+ close(client[i]);\n+ FD_CLR(client[i], &allset);\n+ if (client[i] == max_fd)\n+ --max_fd;\n+ if (max_i == i)\n+ --max_i;\n+ client[i] = -1;\n+ }\n+ if (--nready <= 0) \/* \u6ca1\u6709\u53ef\u8bfb\u63cf\u8ff0\u7b26 *\/\n+ break;\n+ }\n+ }\n+ }\n+ exit(EXIT_SUCCESS);\n+}\n+\n+\/** \u5efa\u7acbtcp\u5957\u63a5\u5b57\u5e76\u76d1\u542c\u6307\u5b9a\u7684\u7aef\u53e3\uff08\u670d\u52a1\u7aef\uff09 **\/\n+\/** #!! \u6b64\u51fd\u6570\u4f1a\u88ab\u5176\u4ed6\u51fd\u6570\u91cd\u7528 !!# **\/\n+int tcp_server_socket(int port)\n+{\n+ int sock_fd, opt;\n+ struct sockaddr_in serv_addr;\n+\n+ if ((sock_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {\n+ perror(\"socket error\");\n+ exit(EXIT_FAILURE);\n+ }\n+\n+ \/** \u8bbe\u7f6eSO_REUSEADDR\u9009\u9879 **\/\n+ opt = 1;\n+ if (setsockopt(sock_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt) < 0) {\n+ perror(\"socket option SO_REUSEADDR error\");\n+ exit(EXIT_FAILURE);\n+ }\n+ \n+ bzero(&serv_addr, sizeof(serv_addr));\n+ serv_addr.sin_family = AF_INET;\n+ serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);\n+ serv_addr.sin_port = htons(port);\n+ \n+ if (bind(sock_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {\n+ perror(\"bind error\");\n+ exit(EXIT_FAILURE);\n+ }\n+ \n+ if (listen(sock_fd, BACKLOG) < 0) {\n+ perror(\"listen error\");\n+ exit(EXIT_FAILURE);\n+ }\n+ \n+ return sock_fd;\n+}\n+\n+\/** TCP\u670d\u52a1\u5668\u4e3b\u51fd\u6570: \u8fd4\u56de\u503c\u5927\u4e8e0\u8868\u793a\u670d\u52a1\u672a\u7ed3\u675f **\/\n+int tcp_main(int client_fd)\n+{\n+ char buf[MAXLINE];\n+ int n = read(client_fd, buf, MAXLINE);\n+ \n+ if (n < 0) {\n+ perror(\"read error\");\n+ exit(EXIT_FAILURE);\n+ }\n+ if (n == 0)\n+ return 0;\n+ buf[n] = '\\0';\n+ printf(\"%s\", buf);\n+ return 1;\n+}\n"} {"commit":"7c005bd211c01da2b15dbe16195d972264412dd2","subject":"fixed includes","message":"fixed includes\n\n\ngit-svn-id: 40192aece4a9e6664bc9a93aa558322db432a344@499 15ae5fad-cc11-0410-8fac-bce609e504b0\n","repos":"OlafRadicke\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools,maekitalo\/cxxtools,maekitalo\/cxxtools,OlafRadicke\/cxxtools","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cxxtools\/include\/cxxtools\/convert.h\n+++ cxxtools\/include\/cxxtools\/convert.h\n@@ -20,13 +20,11 @@\n #ifndef CXXTOOLS_CONVERT_H\n #define CXXTOOLS_CONVERT_H\n \n-#include <cxxtools\/Api.h>\n-#include <cxxtools\/SourceInfo.h>\n+#include <cxxtools\/api.h>\n+#include <cxxtools\/sourceinfo.h>\n #include <sstream>\n #include <string>\n #include <stdexcept>\n-#include <iomanip>\n-#include <limits>\n \n #define CXXTOOLS_CONVERSIONERROR(to, from) \\\n \"conversion to \" #to \" from \" #from \" failed\", CXXTOOLS_SOURCEINFO\n"} {"commit":"0da543e0409987d662ff147bc08a59ff3ab8dc61","subject":"Elaborated on some of the TouchData documenation","message":"Elaborated on some of the TouchData documenation\n\nChange-Id: I2dc4dd464b4d0567f15d4ecbacac768de0ff2474\n","repos":"dalihub\/dali-core,dalihub\/dali-core,dalihub\/dali-core,dalihub\/dali-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- dali\/public-api\/events\/touch-data.h\n+++ dali\/public-api\/events\/touch-data.h\n@@ -51,7 +51,11 @@\n *\n * The first point is the primary point that's used for hit-testing.\n * @SINCE_1_1.37\n- * @note Should not use this in a TouchData container as it is just a handle and the internal object can change.\n+ * @note As this is a handle to an internal object, it should not be copied (or used in a container) as all that will do is copy the handle to the same object.\n+ * The internal object can change which may not be what an application writer expects.\n+ * If data does need to be stored in the application, then only the required data should be saved (retrieved using the methods of this class).\n+ *\n+ * Should not use this in a TouchData container as it is just a handle and the internal object can change.\n *\/\n class DALI_IMPORT_API TouchData : public BaseHandle\n {\n"} {"commit":"d23589fcb02a317c2d9d368649a53253f3120f80","subject":"There are no overloads of this virtual function, nor are there any callers of it. NFC.","message":"There are no overloads of this virtual function, nor are there any callers of it. NFC.\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@215705 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/clang\/Analysis\/Analyses\/ThreadSafety.h\n+++ include\/clang\/Analysis\/Analyses\/ThreadSafety.h\n@@ -188,9 +188,6 @@\n \/\/\/ Called by the analysis when finishing analysis of a function.\n virtual void leaveFunction(const FunctionDecl *FD) {}\n \n- \/\/\/ Return the number of errors found within this function so far.\n- virtual int numErrors() { return 0; }\n-\n bool issueBetaWarnings() { return IssueBetaWarnings; }\n void setIssueBetaWarnings(bool b) { IssueBetaWarnings = b; }\n \n"} {"commit":"52cf679ff1257a9552c8407e9510a923cd7fd45a","subject":"style(compression): remove whitespace","message":"style(compression): remove whitespace\n","repos":"nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- includes\/acl\/compression\/stream\/track_stream.h\n+++ includes\/acl\/compression\/stream\/track_stream.h\n@@ -303,8 +303,6 @@\n \t\t\t, m_extent(vector_zero_32())\n \t\t{}\n \n-\n-\n \t\tVector4_32 ACL_SIMD_CALL get_min() const { return m_min; }\n \t\tVector4_32 ACL_SIMD_CALL get_max() const { return vector_add(m_min, m_extent); }\n \n"} {"commit":"32c175ac5595207b710411892a563b3bf73b39fc","subject":"Workaround fix for Visual Studio","message":"Workaround fix for Visual Studio\n\nSummary:\n- Problem: Build error in Visual Studio since an array cannot have zero size.\n - https:\/\/github.com\/facebook\/css-layout\/commit\/e6702e1168f7878a30a056548bc754ce1d61074f#commitcomment-19839659\n- Solution: Add 1 until we'll have actual CSSExperimentalFeature value.\n\nReviewed By: emilsjolander\n\nDifferential Revision: D4191268\n\nfbshipit-source-id: 53fdcc388292e76c2b97ad071f0d7c27d0613ecf\n","repos":"facebook\/css-layout,facebook\/css-layout,yihuang\/css-layout,yihuang\/css-layout,facebook\/css-layout,facebook\/css-layout,rmarinho\/yoga,facebook\/css-layout,yihuang\/css-layout,yihuang\/css-layout,facebook\/yoga,rmarinho\/yoga,yihuang\/css-layout,rmarinho\/yoga,rmarinho\/yoga,facebook\/yoga,facebook\/yoga,yihuang\/css-layout,rmarinho\/yoga,rmarinho\/yoga,rmarinho\/yoga,yihuang\/css-layout,facebook\/yoga,facebook\/yoga,facebook\/css-layout,facebook\/yoga,facebook\/yoga,facebook\/css-layout,facebook\/yoga,yihuang\/css-layout,rmarinho\/yoga,facebook\/yoga,yihuang\/css-layout,rmarinho\/yoga,facebook\/css-layout,facebook\/css-layout,facebook\/yoga,rmarinho\/yoga,yihuang\/css-layout","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- CSSLayout\/CSSLayout.c\n+++ CSSLayout\/CSSLayout.c\n@@ -2519,7 +2519,7 @@\n va_end(args);\n }\n \n-static bool experimentalFeatures[CSSExperimentalFeatureCount];\n+static bool experimentalFeatures[CSSExperimentalFeatureCount + 1];\n \n void CSSLayoutSetExperimentalFeatureEnabled(CSSExperimentalFeature feature, bool enabled) {\n experimentalFeatures[feature] = enabled;\n"} {"commit":"8ea36b0881597f94a8a808202cf0b1f29e08cf4b","subject":"Clarified comment.","message":"Clarified comment.\n","repos":"billhoffman\/drake,billhoffman\/drake,sheim\/drake,sheim\/drake,sheim\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- drake\/examples\/Cars\/car_simulation.h\n+++ drake\/examples\/Cars\/car_simulation.h\n@@ -72,9 +72,9 @@\n \/**\n * Adds a box-shaped terrain to the specified rigid body tree.\n *\n- * The length and width of the terrain lies in the X-Y plane of the world\n- * coordinate frame abd has lengths of \\p box_width. The depth of the terrain is\n- * specified by \\p box_depth. The top surface of the terrain is at Z = 0.\n+ * The Z-axis of the box matches the Z-axis of the world, i.e., positive Z\n+ * points up. The length and width of the terrain is \\p box_size. The depth of\n+ * the terrain is \\p box_depth. The top surface of the box is at Z = 0.\n *\n * @param[in] rigid_body_tree The rigid body tree to which to add the terrain.\n * @param[in] box_size The length and width of the terrain.\n"} {"commit":"28d1acb4f5cf3bd508561620668d22e8f4e2f549","subject":"Mark all doKinematics overloads as const.","message":"Mark all doKinematics overloads as const.\n","repos":"sheim\/drake,sheim\/drake,sheim\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,sheim\/drake,billhoffman\/drake,billhoffman\/drake,sheim\/drake","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- drake\/systems\/plants\/RigidBodyTree.h\n+++ drake\/systems\/plants\/RigidBodyTree.h\n@@ -139,7 +139,7 @@\n \n template <typename DerivedQ>\n KinematicsCache<typename DerivedQ::Scalar> doKinematics(\n- const Eigen::MatrixBase<DerivedQ>& q) {\n+ const Eigen::MatrixBase<DerivedQ>& q) const {\n KinematicsCache<typename DerivedQ::Scalar> ret(bodies);\n ret.initialize(q);\n doKinematics(ret);\n"} {"commit":"b4cf5d710fdf297692d5c0f36cddbbeaa690e323","subject":"clockevents\/drivers\/bcm_kona: Migrate to new 'set-state' interface","message":"clockevents\/drivers\/bcm_kona: Migrate to new 'set-state' interface\n\nMigrate bcm_kona driver to the new 'set-state' interface provided by\nthe clockevents core, the earlier 'set-mode' interface is marked\nobsolete now.\n\nThis also enables us to implement callbacks for new states of clockevent\ndevices, for example: ONESHOT_STOPPED.\n\nOneshot callback isn't required as it was empty.\n\nAcked-by: Ray Jui <16d3e9966b27c799b428e2cfa6c1218c3b78fa9c@broadcom.com>\nCc: Florian Fainelli <59190c1867e3222b932a0de3c668eb2d980d69a2@gmail.com>\nCc: Ray Jui <16d3e9966b27c799b428e2cfa6c1218c3b78fa9c@broadcom.com>\nCc: Scott Branden <48d073636e1f493abad20c1186acd226fa8d5b1d@broadcom.com>\nCc: 6666c341d8c988aba87090ea539f3c04be03651c@broadcom.com\nSigned-off-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\nSigned-off-by: Daniel Lezcano <e9fa45941f2ebe89c1b9d6c5f339ab42eadb8567@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/clocksource\/bcm_kona_timer.c\n+++ drivers\/clocksource\/bcm_kona_timer.c\n@@ -127,25 +127,18 @@\n \treturn 0;\n }\n \n-static void kona_timer_set_mode(enum clock_event_mode mode,\n-\t\t\t struct clock_event_device *unused)\n-{\n-\tswitch (mode) {\n-\tcase CLOCK_EVT_MODE_ONESHOT:\n-\t\t\/* by default mode is one shot don't do any thing *\/\n-\t\tbreak;\n-\tcase CLOCK_EVT_MODE_UNUSED:\n-\tcase CLOCK_EVT_MODE_SHUTDOWN:\n-\tdefault:\n-\t\tkona_timer_disable_and_clear(timers.tmr_regs);\n-\t}\n+static int kona_timer_shutdown(struct clock_event_device *evt)\n+{\n+\tkona_timer_disable_and_clear(timers.tmr_regs);\n+\treturn 0;\n }\n \n static struct clock_event_device kona_clockevent_timer = {\n \t.name = \"timer 1\",\n \t.features = CLOCK_EVT_FEAT_ONESHOT,\n \t.set_next_event = kona_timer_set_next_event,\n-\t.set_mode = kona_timer_set_mode\n+\t.set_state_shutdown = kona_timer_shutdown,\n+\t.tick_resume = kona_timer_shutdown,\n };\n \n static void __init kona_timer_clockevents_init(void)\n"} {"commit":"245f98f269714c08dc6d66d021d166cf36059bc4","subject":"drm\/exynos: hdmi: fix power order issue","message":"drm\/exynos: hdmi: fix power order issue\n\nThis patch resolves page fault issue of Mixer when disabled.\n\nThe SFRs of VP and Mixer are updated by Vertical Sync of Timing\ngenerator which is a part of HDMI so the sequence to disable TV\nSubsystem should be as following:\n\tVP -> Mixer -> HDMI\n\nFor this, this patch disables Mixer and VP (if used) prior to\ndisabling HDMI.\n\nSigned-off-by: Inki Dae <bae4a7a27bbc965064e97edd6e179ac4979db440@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c3add4b63438555d5e88c5893d238ab80d1f5959","subject":"Revert \"drm\/i915: Warn if we run out of FIFO space for a mode\"","message":"Revert \"drm\/i915: Warn if we run out of FIFO space for a mode\"\n\nThis reverts commit b9421ae8f30958deea98d71477b4a77a066856b4.\n\nThis warning was so prelevant, even for apparently working machines,\nthat it was just causing fear, anxiety and panic.\n\nThe root cause still remains, so we will add some better debugging when\nwe focus on fixing it.\n\nBugzilla: https:\/\/bugzilla.kernel.org\/show_bug.cgi?id=17021\nReported-by: Maciej Rutecki <b9fc5ee32e9bcd79c24fe827a77b4d80fdc0a8e2@gmail.com>\nSigned-off-by: Chris Wilson <711c73f64afdce07b7e38039a96d2224209e9a6c@chris-wilson.co.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -2767,14 +2767,8 @@\n \t\/* Don't promote wm_size to unsigned... *\/\n \tif (wm_size > (long)wm->max_wm)\n \t\twm_size = wm->max_wm;\n-\tif (wm_size <= 0) {\n+\tif (wm_size <= 0)\n \t\twm_size = wm->default_wm;\n-\t\tDRM_ERROR(\"Insufficient FIFO for plane, expect flickering:\"\n-\t\t\t \" entries required = %ld, available = %lu.\\n\",\n-\t\t\t entries_required + wm->guard_size,\n-\t\t\t wm->fifo_size);\n-\t}\n-\n \treturn wm_size;\n }\n \n"} {"commit":"cd13f5ab42a63d267f452ac5fd641136c7b8f17c","subject":"drm\/i915: fill in more mode members","message":"drm\/i915: fill in more mode members\n\nFill in driver type, hsync, vrefresh and name.\nThose members are not read out but can be calculated from the mode.\n\nSigned-off-by: Maarten Lankhorst <743c2818a341d71b99ed2b566f9f80c2fc288f93@linux.intel.com>\nReviewed-by: Daniel Stone <62e7e355d5d8400fa8384448796af0bf6be4ffae@collabora.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"8e636784b6f76653d358d521af9c2a8c246df38b","subject":"drm\/i915: fixup assert_pipe to take the pipe A quirk into account","message":"drm\/i915: fixup assert_pipe to take the pipe A quirk into account\n\nThis was completely spamming dmesg on my i855gm. This issue was just\nshortly introduced with:\n\ncommit 931872fceabacf2d4f8b6fbd51611c167e83164c\nAuthor: Chris Wilson <chris@chris-wilson.co.uk>\nDate: Mon Jan 16 23:01:13 2012 +0000\n\n drm\/i915: Check that plane\/pipe is disabled before removing the fb\n\nReviewed-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\nSigned-Off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_display.c\n+++ drivers\/gpu\/drm\/i915\/intel_display.c\n@@ -935,6 +935,10 @@\n \tint reg;\n \tu32 val;\n \tbool cur_state;\n+\n+\t\/* if we need the pipe A quirk it must be always on *\/\n+\tif (pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)\n+\t\tstate = true;\n \n \treg = PIPECONF(pipe);\n \tval = I915_READ(reg);\n"} {"commit":"ed36d84abf49b038f96d7fce225d98017a01cd9a","subject":"worker context build fix for win32","message":"worker context build fix for win32\n","repos":"appcelerator\/titanium_desktop,jvkops\/titanium_desktop,wyrover\/titanium_desktop,wyrover\/titanium_desktop,appcelerator\/titanium_desktop,appcelerator\/titanium_desktop,wyrover\/titanium_desktop,wyrover\/titanium_desktop,wyrover\/titanium_desktop,jvkops\/titanium_desktop,jvkops\/titanium_desktop,jvkops\/titanium_desktop,appcelerator\/titanium_desktop,jvkops\/titanium_desktop,jvkops\/titanium_desktop,appcelerator\/titanium_desktop,wyrover\/titanium_desktop","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/ti.Worker\/worker_context.h\n+++ modules\/ti.Worker\/worker_context.h\n@@ -7,9 +7,15 @@\n #ifndef _WORKER_CONTEXT_H_\n #define _WORKER_CONTEXT_H_\n \n-#include <kroll\/kroll.h>\n+#include <kroll\/base.h>\n #include <Poco\/Mutex.h>\n #include <Poco\/ScopedLock.h>\n+#include <kroll\/kroll.h>\n+\n+#ifdef OS_WIN32\n+# undef Yield\t\n+#endif\n+\n #include \"worker.h\"\n \n namespace ti\n"} {"commit":"887cd78804fb4179211d221c023455c33f13206a","subject":"drm\/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION","message":"drm\/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION\n\nCurrent name is misleading, because this error can be triggered by other\nconditions, like changing STRMOUT parameter without disabling STRMOUT first.\n\nSigned-off-by: Marcin Slusarz <bc4bbf83189bf2aa3b4ae434673d425054bbfadd@gmail.com>\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/nv50_graph.c\n+++ drivers\/gpu\/drm\/nouveau\/nv50_graph.c\n@@ -299,7 +299,7 @@\n \n \/* There must be a *lot* of these. Will take some time to gather them up. *\/\n struct nouveau_enum nv50_data_error_names[] = {\n-\t{ 0x00000003, \"INVALID_QUERY_OR_TEXTURE\", NULL },\n+\t{ 0x00000003, \"INVALID_OPERATION\", NULL },\n \t{ 0x00000004, \"INVALID_VALUE\", NULL },\n \t{ 0x00000005, \"INVALID_ENUM\", NULL },\n \t{ 0x00000008, \"INVALID_OBJECT\", NULL },\n"} {"commit":"e69b4418825c2e4c6563ae1d69bd75377826e263","subject":"drm\/nv50: demagic grctx, and add NVAF support","message":"drm\/nv50: demagic grctx, and add NVAF support\n\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\nSigned-off-by: Marcin Ko\u015bcielnicki <745187515eb483e9471d9177f0aa2ef6797ac3c9@0x04.net>\nSigned-off-by: Ben Skeggs <d9f27fb07c1e9f131223ad827fa5179f3846c30b@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/nouveau\/nv50_grctx.c\n+++ drivers\/gpu\/drm\/nouveau\/nv50_grctx.c\n@@ -103,6 +103,9 @@\n #include \"nouveau_drv.h\"\n #include \"nouveau_grctx.h\"\n \n+#define IS_NVA3F(x) (((x) > 0xa0 && (x) < 0xaa) || (x) == 0xaf)\n+#define IS_NVAAF(x) ((x) >= 0xaa && (x) <= 0xac)\n+\n \/*\n * This code deals with PGRAPH contexts on NV50 family cards. Like NV40, it's\n * the GPU itself that does context-switching, but it needs a special\n@@ -182,6 +185,7 @@\n \tcase 0xa8:\n \tcase 0xaa:\n \tcase 0xac:\n+\tcase 0xaf:\n \t\tbreak;\n \tdefault:\n \t\tNV_ERROR(ctx->dev, \"I don't know how to make a ctxprog for \"\n@@ -268,6 +272,9 @@\n *\/\n \n static void\n+nv50_graph_construct_mmio_ddata(struct nouveau_grctx *ctx);\n+\n+static void\n nv50_graph_construct_mmio(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n@@ -286,7 +293,7 @@\n \t\tgr_def(ctx, 0x400840, 0xffe806a8);\n \t}\n \tgr_def(ctx, 0x400844, 0x00000002);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n+\tif (IS_NVA3F(dev_priv->chipset))\n \t\tgr_def(ctx, 0x400894, 0x00001000);\n \tgr_def(ctx, 0x4008e8, 0x00000003);\n \tgr_def(ctx, 0x4008ec, 0x00001000);\n@@ -299,13 +306,15 @@\n \n \tif (dev_priv->chipset >= 0xa0)\n \t\tcp_ctx(ctx, 0x400b00, 0x1);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n \t\tcp_ctx(ctx, 0x400b10, 0x1);\n \t\tgr_def(ctx, 0x400b10, 0x0001629d);\n \t\tcp_ctx(ctx, 0x400b20, 0x1);\n \t\tgr_def(ctx, 0x400b20, 0x0001629d);\n \t}\n \n+\tnv50_graph_construct_mmio_ddata(ctx);\n+\n \t\/* 0C00: VFETCH *\/\n \tcp_ctx(ctx, 0x400c08, 0x2);\n \tgr_def(ctx, 0x400c08, 0x0000fe0c);\n@@ -314,7 +323,7 @@\n \tif (dev_priv->chipset < 0xa0) {\n \t\tcp_ctx(ctx, 0x401008, 0x4);\n \t\tgr_def(ctx, 0x401014, 0x00001000);\n-\t} else if (dev_priv->chipset == 0xa0 || dev_priv->chipset >= 0xaa) {\n+\t} else if (!IS_NVA3F(dev_priv->chipset)) {\n \t\tcp_ctx(ctx, 0x401008, 0x5);\n \t\tgr_def(ctx, 0x401018, 0x00001000);\n \t} else {\n@@ -368,9 +377,12 @@\n \tcase 0xa3:\n \tcase 0xa5:\n \tcase 0xa8:\n+\tcase 0xaf:\n \t\tgr_def(ctx, 0x401c00, 0x142500df);\n \t\tbreak;\n \t}\n+\n+\t\/* 2000 *\/\n \n \t\/* 2400 *\/\n \tcp_ctx(ctx, 0x402400, 0x1);\n@@ -380,12 +392,12 @@\n \t\tcp_ctx(ctx, 0x402408, 0x2);\n \tgr_def(ctx, 0x402408, 0x00000600);\n \n-\t\/* 2800 *\/\n+\t\/* 2800: CSCHED *\/\n \tcp_ctx(ctx, 0x402800, 0x1);\n \tif (dev_priv->chipset == 0x50)\n \t\tgr_def(ctx, 0x402800, 0x00000006);\n \n-\t\/* 2C00 *\/\n+\t\/* 2C00: ZCULL *\/\n \tcp_ctx(ctx, 0x402c08, 0x6);\n \tif (dev_priv->chipset != 0x50)\n \t\tgr_def(ctx, 0x402c14, 0x01000000);\n@@ -396,23 +408,23 @@\n \t\tcp_ctx(ctx, 0x402ca0, 0x2);\n \tif (dev_priv->chipset < 0xa0)\n \t\tgr_def(ctx, 0x402ca0, 0x00000400);\n-\telse if (dev_priv->chipset == 0xa0 || dev_priv->chipset >= 0xaa)\n+\telse if (!IS_NVA3F(dev_priv->chipset))\n \t\tgr_def(ctx, 0x402ca0, 0x00000800);\n \telse\n \t\tgr_def(ctx, 0x402ca0, 0x00000400);\n \tcp_ctx(ctx, 0x402cac, 0x4);\n \n-\t\/* 3000 *\/\n+\t\/* 3000: ENG2D *\/\n \tcp_ctx(ctx, 0x403004, 0x1);\n \tgr_def(ctx, 0x403004, 0x00000001);\n \n-\t\/* 3404 *\/\n+\t\/* 3400 *\/\n \tif (dev_priv->chipset >= 0xa0) {\n \t\tcp_ctx(ctx, 0x403404, 0x1);\n \t\tgr_def(ctx, 0x403404, 0x00000001);\n \t}\n \n-\t\/* 5000 *\/\n+\t\/* 5000: CCACHE *\/\n \tcp_ctx(ctx, 0x405000, 0x1);\n \tswitch (dev_priv->chipset) {\n \tcase 0x50:\n@@ -425,6 +437,7 @@\n \tcase 0xa8:\n \tcase 0xaa:\n \tcase 0xac:\n+\tcase 0xaf:\n \t\tgr_def(ctx, 0x405000, 0x000e0080);\n \t\tbreak;\n \tcase 0x86:\n@@ -440,210 +453,6 @@\n \tcp_ctx(ctx, 0x40501c, 0x1);\n \tcp_ctx(ctx, 0x405024, 0x1);\n \tcp_ctx(ctx, 0x40502c, 0x1);\n-\n-\t\/* 5400 or maybe 4800 *\/\n-\tif (dev_priv->chipset == 0x50) {\n-\t\toffset = 0x405400;\n-\t\tcp_ctx(ctx, 0x405400, 0xea);\n-\t} else if (dev_priv->chipset < 0x94) {\n-\t\toffset = 0x405400;\n-\t\tcp_ctx(ctx, 0x405400, 0xcb);\n-\t} else if (dev_priv->chipset < 0xa0) {\n-\t\toffset = 0x405400;\n-\t\tcp_ctx(ctx, 0x405400, 0xcc);\n-\t} else if (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\toffset = 0x404800;\n-\t\tcp_ctx(ctx, 0x404800, 0xda);\n-\t} else {\n-\t\toffset = 0x405400;\n-\t\tcp_ctx(ctx, 0x405400, 0xd4);\n-\t}\n-\tgr_def(ctx, offset + 0x0c, 0x00000002);\n-\tgr_def(ctx, offset + 0x10, 0x00000001);\n-\tif (dev_priv->chipset >= 0x94)\n-\t\toffset += 4;\n-\tgr_def(ctx, offset + 0x1c, 0x00000001);\n-\tgr_def(ctx, offset + 0x20, 0x00000100);\n-\tgr_def(ctx, offset + 0x38, 0x00000002);\n-\tgr_def(ctx, offset + 0x3c, 0x00000001);\n-\tgr_def(ctx, offset + 0x40, 0x00000001);\n-\tgr_def(ctx, offset + 0x50, 0x00000001);\n-\tgr_def(ctx, offset + 0x54, 0x003fffff);\n-\tgr_def(ctx, offset + 0x58, 0x00001fff);\n-\tgr_def(ctx, offset + 0x60, 0x00000001);\n-\tgr_def(ctx, offset + 0x64, 0x00000001);\n-\tgr_def(ctx, offset + 0x6c, 0x00000001);\n-\tgr_def(ctx, offset + 0x70, 0x00000001);\n-\tgr_def(ctx, offset + 0x74, 0x00000001);\n-\tgr_def(ctx, offset + 0x78, 0x00000004);\n-\tgr_def(ctx, offset + 0x7c, 0x00000001);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\toffset += 4;\n-\tgr_def(ctx, offset + 0x80, 0x00000001);\n-\tgr_def(ctx, offset + 0x84, 0x00000001);\n-\tgr_def(ctx, offset + 0x88, 0x00000007);\n-\tgr_def(ctx, offset + 0x8c, 0x00000001);\n-\tgr_def(ctx, offset + 0x90, 0x00000007);\n-\tgr_def(ctx, offset + 0x94, 0x00000001);\n-\tgr_def(ctx, offset + 0x98, 0x00000001);\n-\tgr_def(ctx, offset + 0x9c, 0x00000001);\n-\tif (dev_priv->chipset == 0x50) {\n-\t\t gr_def(ctx, offset + 0xb0, 0x00000001);\n-\t\t gr_def(ctx, offset + 0xb4, 0x00000001);\n-\t\t gr_def(ctx, offset + 0xbc, 0x00000001);\n-\t\t gr_def(ctx, offset + 0xc0, 0x0000000a);\n-\t\t gr_def(ctx, offset + 0xd0, 0x00000040);\n-\t\t gr_def(ctx, offset + 0xd8, 0x00000002);\n-\t\t gr_def(ctx, offset + 0xdc, 0x00000100);\n-\t\t gr_def(ctx, offset + 0xe0, 0x00000001);\n-\t\t gr_def(ctx, offset + 0xe4, 0x00000100);\n-\t\t gr_def(ctx, offset + 0x100, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x124, 0x00000004);\n-\t\t gr_def(ctx, offset + 0x13c, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x140, 0x00000100);\n-\t\t gr_def(ctx, offset + 0x148, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x154, 0x00000100);\n-\t\t gr_def(ctx, offset + 0x158, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x15c, 0x00000100);\n-\t\t gr_def(ctx, offset + 0x164, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x170, 0x00000100);\n-\t\t gr_def(ctx, offset + 0x174, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x17c, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x188, 0x00000002);\n-\t\t gr_def(ctx, offset + 0x190, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x198, 0x00000001);\n-\t\t gr_def(ctx, offset + 0x1ac, 0x00000003);\n-\t\t offset += 0xd0;\n-\t} else {\n-\t\tgr_def(ctx, offset + 0xb0, 0x00000001);\n-\t\tgr_def(ctx, offset + 0xb4, 0x00000100);\n-\t\tgr_def(ctx, offset + 0xbc, 0x00000001);\n-\t\tgr_def(ctx, offset + 0xc8, 0x00000100);\n-\t\tgr_def(ctx, offset + 0xcc, 0x00000001);\n-\t\tgr_def(ctx, offset + 0xd0, 0x00000100);\n-\t\tgr_def(ctx, offset + 0xd8, 0x00000001);\n-\t\tgr_def(ctx, offset + 0xe4, 0x00000100);\n-\t}\n-\tgr_def(ctx, offset + 0xf8, 0x00000004);\n-\tgr_def(ctx, offset + 0xfc, 0x00000070);\n-\tgr_def(ctx, offset + 0x100, 0x00000080);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\toffset += 4;\n-\tgr_def(ctx, offset + 0x114, 0x0000000c);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 4;\n-\tgr_def(ctx, offset + 0x11c, 0x00000008);\n-\tgr_def(ctx, offset + 0x120, 0x00000014);\n-\tif (dev_priv->chipset == 0x50) {\n-\t\tgr_def(ctx, offset + 0x124, 0x00000026);\n-\t\toffset -= 0x18;\n-\t} else {\n-\t\tgr_def(ctx, offset + 0x128, 0x00000029);\n-\t\tgr_def(ctx, offset + 0x12c, 0x00000027);\n-\t\tgr_def(ctx, offset + 0x130, 0x00000026);\n-\t\tgr_def(ctx, offset + 0x134, 0x00000008);\n-\t\tgr_def(ctx, offset + 0x138, 0x00000004);\n-\t\tgr_def(ctx, offset + 0x13c, 0x00000027);\n-\t}\n-\tgr_def(ctx, offset + 0x148, 0x00000001);\n-\tgr_def(ctx, offset + 0x14c, 0x00000002);\n-\tgr_def(ctx, offset + 0x150, 0x00000003);\n-\tgr_def(ctx, offset + 0x154, 0x00000004);\n-\tgr_def(ctx, offset + 0x158, 0x00000005);\n-\tgr_def(ctx, offset + 0x15c, 0x00000006);\n-\tgr_def(ctx, offset + 0x160, 0x00000007);\n-\tgr_def(ctx, offset + 0x164, 0x00000001);\n-\tgr_def(ctx, offset + 0x1a8, 0x000000cf);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 4;\n-\tgr_def(ctx, offset + 0x1d8, 0x00000080);\n-\tgr_def(ctx, offset + 0x1dc, 0x00000004);\n-\tgr_def(ctx, offset + 0x1e0, 0x00000004);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 4;\n-\telse\n-\t\tgr_def(ctx, offset + 0x1e4, 0x00000003);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\tgr_def(ctx, offset + 0x1ec, 0x00000003);\n-\t\toffset += 8;\n-\t}\n-\tgr_def(ctx, offset + 0x1e8, 0x00000001);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 4;\n-\tgr_def(ctx, offset + 0x1f4, 0x00000012);\n-\tgr_def(ctx, offset + 0x1f8, 0x00000010);\n-\tgr_def(ctx, offset + 0x1fc, 0x0000000c);\n-\tgr_def(ctx, offset + 0x200, 0x00000001);\n-\tgr_def(ctx, offset + 0x210, 0x00000004);\n-\tgr_def(ctx, offset + 0x214, 0x00000002);\n-\tgr_def(ctx, offset + 0x218, 0x00000004);\n-\tif (dev_priv->chipset >= 0xa0)\n-\t\toffset += 4;\n-\tgr_def(ctx, offset + 0x224, 0x003fffff);\n-\tgr_def(ctx, offset + 0x228, 0x00001fff);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 0x20;\n-\telse if (dev_priv->chipset >= 0xa0) {\n-\t\tgr_def(ctx, offset + 0x250, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x254, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x258, 0x00000002);\n-\t\toffset += 0x10;\n-\t}\n-\tgr_def(ctx, offset + 0x250, 0x00000004);\n-\tgr_def(ctx, offset + 0x254, 0x00000014);\n-\tgr_def(ctx, offset + 0x258, 0x00000001);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\toffset += 4;\n-\tgr_def(ctx, offset + 0x264, 0x00000002);\n-\tif (dev_priv->chipset >= 0xa0)\n-\t\toffset += 8;\n-\tgr_def(ctx, offset + 0x270, 0x00000001);\n-\tgr_def(ctx, offset + 0x278, 0x00000002);\n-\tgr_def(ctx, offset + 0x27c, 0x00001000);\n-\tif (dev_priv->chipset == 0x50)\n-\t\toffset -= 0xc;\n-\telse {\n-\t\tgr_def(ctx, offset + 0x280, 0x00000e00);\n-\t\tgr_def(ctx, offset + 0x284, 0x00001000);\n-\t\tgr_def(ctx, offset + 0x288, 0x00001e00);\n-\t}\n-\tgr_def(ctx, offset + 0x290, 0x00000001);\n-\tgr_def(ctx, offset + 0x294, 0x00000001);\n-\tgr_def(ctx, offset + 0x298, 0x00000001);\n-\tgr_def(ctx, offset + 0x29c, 0x00000001);\n-\tgr_def(ctx, offset + 0x2a0, 0x00000001);\n-\tgr_def(ctx, offset + 0x2b0, 0x00000200);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\tgr_def(ctx, offset + 0x2b4, 0x00000200);\n-\t\toffset += 4;\n-\t}\n-\tif (dev_priv->chipset < 0xa0) {\n-\t\tgr_def(ctx, offset + 0x2b8, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x2bc, 0x00000070);\n-\t\tgr_def(ctx, offset + 0x2c0, 0x00000080);\n-\t\tgr_def(ctx, offset + 0x2cc, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x2d0, 0x00000070);\n-\t\tgr_def(ctx, offset + 0x2d4, 0x00000080);\n-\t} else {\n-\t\tgr_def(ctx, offset + 0x2b8, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x2bc, 0x000000f0);\n-\t\tgr_def(ctx, offset + 0x2c0, 0x000000ff);\n-\t\tgr_def(ctx, offset + 0x2cc, 0x00000001);\n-\t\tgr_def(ctx, offset + 0x2d0, 0x000000f0);\n-\t\tgr_def(ctx, offset + 0x2d4, 0x000000ff);\n-\t\tgr_def(ctx, offset + 0x2dc, 0x00000009);\n-\t\toffset += 4;\n-\t}\n-\tgr_def(ctx, offset + 0x2e4, 0x00000001);\n-\tgr_def(ctx, offset + 0x2e8, 0x000000cf);\n-\tgr_def(ctx, offset + 0x2f0, 0x00000001);\n-\tgr_def(ctx, offset + 0x300, 0x000000cf);\n-\tgr_def(ctx, offset + 0x308, 0x00000002);\n-\tgr_def(ctx, offset + 0x310, 0x00000001);\n-\tgr_def(ctx, offset + 0x318, 0x00000001);\n-\tgr_def(ctx, offset + 0x320, 0x000000cf);\n-\tgr_def(ctx, offset + 0x324, 0x000000cf);\n-\tgr_def(ctx, offset + 0x328, 0x00000001);\n \n \t\/* 6000? *\/\n \tif (dev_priv->chipset == 0x50)\n@@ -661,7 +470,7 @@\n \t\t\tgr_def(ctx, 0x406818, 0x00000f80);\n \t\telse\n \t\t\tgr_def(ctx, 0x406818, 0x00001f80);\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n+\t\tif (IS_NVA3F(dev_priv->chipset))\n \t\t\tgr_def(ctx, 0x40681c, 0x00000030);\n \t\tcp_ctx(ctx, 0x406830, 0x3);\n \t}\n@@ -706,7 +515,7 @@\n \n \t\t\tif (dev_priv->chipset < 0xa0)\n \t\t\t\tcp_ctx(ctx, 0x407094 + (i<<8), 1);\n-\t\t\telse if (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa)\n+\t\t\telse if (!IS_NVA3F(dev_priv->chipset))\n \t\t\t\tcp_ctx(ctx, 0x407094 + (i<<8), 3);\n \t\t\telse {\n \t\t\t\tcp_ctx(ctx, 0x407094 + (i<<8), 4);\n@@ -799,6 +608,7 @@\n \t\t\t\tcase 0xa8:\n \t\t\t\tcase 0xaa:\n \t\t\t\tcase 0xac:\n+\t\t\t\tcase 0xaf:\n \t\t\t\t\tgr_def(ctx, offset + 0x1c, 0x300c0000);\n \t\t\t\t\tbreak;\n \t\t\t\t}\n@@ -825,7 +635,7 @@\n \t\t\t\tgr_def(ctx, base + 0x304, 0x00007070);\n \t\t\telse if (dev_priv->chipset < 0xa0)\n \t\t\t\tgr_def(ctx, base + 0x304, 0x00027070);\n-\t\t\telse if (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa)\n+\t\t\telse if (!IS_NVA3F(dev_priv->chipset))\n \t\t\t\tgr_def(ctx, base + 0x304, 0x01127070);\n \t\t\telse\n \t\t\t\tgr_def(ctx, base + 0x304, 0x05127070);\n@@ -849,7 +659,7 @@\n \t\t\tif (dev_priv->chipset < 0xa0) {\n \t\t\t\tcp_ctx(ctx, base + 0x340, 9);\n \t\t\t\toffset = base + 0x340;\n-\t\t\t} else if (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa) {\n+\t\t\t} else if (!IS_NVA3F(dev_priv->chipset)) {\n \t\t\t\tcp_ctx(ctx, base + 0x33c, 0xb);\n \t\t\t\toffset = base + 0x344;\n \t\t\t} else {\n@@ -880,7 +690,7 @@\n \t\t\tgr_def(ctx, offset + 0x0, 0x000001f0);\n \t\t\tgr_def(ctx, offset + 0x4, 0x00000001);\n \t\t\tgr_def(ctx, offset + 0x8, 0x00000003);\n-\t\t\tif (dev_priv->chipset == 0x50 || dev_priv->chipset >= 0xaa)\n+\t\t\tif (dev_priv->chipset == 0x50 || IS_NVAAF(dev_priv->chipset))\n \t\t\t\tgr_def(ctx, offset + 0xc, 0x00008000);\n \t\t\tgr_def(ctx, offset + 0x14, 0x00039e00);\n \t\t\tcp_ctx(ctx, offset + 0x1c, 2);\n@@ -892,7 +702,7 @@\n \n \t\t\tif (dev_priv->chipset >= 0xa0) {\n \t\t\t\tcp_ctx(ctx, base + 0x54c, 2);\n-\t\t\t\tif (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa)\n+\t\t\t\tif (!IS_NVA3F(dev_priv->chipset))\n \t\t\t\t\tgr_def(ctx, base + 0x54c, 0x003fe006);\n \t\t\t\telse\n \t\t\t\t\tgr_def(ctx, base + 0x54c, 0x003fe007);\n@@ -946,6 +756,336 @@\n \t\t\t}\n \t\t}\n \t}\n+}\n+\n+static void\n+dd_emit(struct nouveau_grctx *ctx, int num, uint32_t val) {\n+\tint i;\n+\tif (val && ctx->mode == NOUVEAU_GRCTX_VALS)\n+\t\tfor (i = 0; i < num; i++)\n+\t\t\tnv_wo32(ctx->data, 4 * (ctx->ctxvals_pos + i), val);\n+\tctx->ctxvals_pos += num;\n+}\n+\n+static void\n+nv50_graph_construct_mmio_ddata(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\tint base, num;\n+\tbase = ctx->ctxvals_pos;\n+\n+\t\/* tesla state *\/\n+\tdd_emit(ctx, 1, 0);\t\/* 00000001 UNK0F90 *\/\n+\tdd_emit(ctx, 1, 0);\t\/* 00000001 UNK135C *\/\n+\n+\t\/* SRC_TIC state *\/\n+\tdd_emit(ctx, 1, 0);\t\/* 00000007 SRC_TILE_MODE_Z *\/\n+\tdd_emit(ctx, 1, 2);\t\/* 00000007 SRC_TILE_MODE_Y *\/\n+\tdd_emit(ctx, 1, 1);\t\/* 00000001 SRC_LINEAR #1 *\/\n+\tdd_emit(ctx, 1, 0);\t\/* 000000ff SRC_ADDRESS_HIGH *\/\n+\tdd_emit(ctx, 1, 0);\t\/* 00000001 SRC_SRGB *\/\n+\tif (dev_priv->chipset >= 0x94)\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000003 eng2d UNK0258 *\/\n+\tdd_emit(ctx, 1, 1);\t\/* 00000fff SRC_DEPTH *\/\n+\tdd_emit(ctx, 1, 0x100);\t\/* 0000ffff SRC_HEIGHT *\/\n+\n+\t\/* turing state *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f TEXTURES_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f SAMPLERS_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff CB_DEF_ADDRESS_HIGH *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff CB_DEF_ADDRESS_LOW *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff SHARED_SIZE *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* ffffffff REG_MODE *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 0000ffff BLOCK_ALLOC_THREADS *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 LANES32 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff UNK370 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff USER_PARAM_UNK *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff USER_PARAM_COUNT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000000ff UNK384 bits 8-15 *\/\n+\tdd_emit(ctx, 1, 0x3fffff);\t\/* 003fffff TIC_LIMIT *\/\n+\tdd_emit(ctx, 1, 0x1fff);\t\/* 000fffff TSC_LIMIT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff CB_ADDR_INDEX *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000007ff BLOCKDIM_X *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000007ff BLOCKDIM_XMY *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 BLOCKDIM_XMY_OVERFLOW *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 0003ffff BLOCKDIM_XMYMZ *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000007ff BLOCKDIM_Y *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 0000007f BLOCKDIM_Z *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff CP_REG_ALLOC_TEMP *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 BLOCKDIM_DIRTY *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000003 UNK03E8 *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 0000007f BLOCK_ALLOC_HALFWARPS *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000007 LOCAL_WARPS_NO_CLAMP *\/\n+\tdd_emit(ctx, 1, 7);\t\t\/* 00000007 LOCAL_WARPS_LOG_ALLOC *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000007 STACK_WARPS_NO_CLAMP *\/\n+\tdd_emit(ctx, 1, 7);\t\t\/* 00000007 STACK_WARPS_LOG_ALLOC *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00001fff BLOCK_ALLOC_REGSLOTS_PACKED *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00001fff BLOCK_ALLOC_REGSLOTS_STRIDED *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000007ff BLOCK_ALLOC_THREADS *\/\n+\n+\t\/* compat 2d state *\/\n+\tif (dev_priv->chipset == 0x50) {\n+\t\tdd_emit(ctx, 4, 0);\t\t\/* 0000ffff clip X, Y, W, H *\/\n+\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff chroma COLOR_FORMAT *\/\n+\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff pattern COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff pattern SHAPE *\/\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff pattern PATTERN_SELECT *\/\n+\n+\t\tdd_emit(ctx, 1, 0xa);\t\t\/* ffffffff surf2d SRC_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff surf2d DMA_SRC *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff surf2d SRC_ADDRESS_HIGH *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff surf2d SRC_ADDRESS_LOW *\/\n+\t\tdd_emit(ctx, 1, 0x40);\t\t\/* 0000ffff surf2d SRC_PITCH *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f surf2d SRC_TILE_MODE_Z *\/\n+\t\tdd_emit(ctx, 1, 2);\t\t\/* 0000000f surf2d SRC_TILE_MODE_Y *\/\n+\t\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff surf2d SRC_HEIGHT *\/\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 surf2d SRC_LINEAR *\/\n+\t\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff surf2d SRC_WIDTH *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_B_X *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_B_Y *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_C_X *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_C_Y *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_D_X *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect CLIP_D_Y *\/\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff gdirect COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff gdirect OPERATION *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect POINT_X *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff gdirect POINT_Y *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff blit SRC_Y *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff blit OPERATION *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff ifc OPERATION *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff iifc INDEX_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff iifc LUT_OFFSET *\/\n+\t\tdd_emit(ctx, 1, 4);\t\t\/* ffffffff iifc COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff iifc OPERATION *\/\n+\t}\n+\n+\t\/* m2mf state *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff m2mf LINE_COUNT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff m2mf LINE_LENGTH_IN *\/\n+\tdd_emit(ctx, 2, 0);\t\t\/* ffffffff m2mf OFFSET_IN, OFFSET_OUT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff m2mf TILING_DEPTH_OUT *\/\n+\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff m2mf TILING_HEIGHT_OUT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff m2mf TILING_POSITION_OUT_Z *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 m2mf LINEAR_OUT *\/\n+\tdd_emit(ctx, 2, 0);\t\t\/* 0000ffff m2mf TILING_POSITION_OUT_X, Y *\/\n+\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff m2mf TILING_PITCH_OUT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff m2mf TILING_DEPTH_IN *\/\n+\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff m2mf TILING_HEIGHT_IN *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff m2mf TILING_POSITION_IN_Z *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 m2mf LINEAR_IN *\/\n+\tdd_emit(ctx, 2, 0);\t\t\/* 0000ffff m2mf TILING_POSITION_IN_X, Y *\/\n+\tdd_emit(ctx, 1, 0x100);\t\t\/* ffffffff m2mf TILING_PITCH_IN *\/\n+\n+\t\/* more compat 2d state *\/\n+\tif (dev_priv->chipset == 0x50) {\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff line COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff line OPERATION *\/\n+\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff triangle COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff triangle OPERATION *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f sifm TILE_MODE_Z *\/\n+\t\tdd_emit(ctx, 1, 2);\t\t\/* 0000000f sifm TILE_MODE_Y *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff sifm FORMAT_FILTER *\/\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* 000000ff sifm FORMAT_ORIGIN *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff sifm SRC_PITCH *\/\n+\t\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 sifm SRC_LINEAR *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff sifm SRC_OFFSET_HIGH *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff sifm SRC_OFFSET *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff sifm SRC_HEIGHT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff sifm SRC_WIDTH *\/\n+\t\tdd_emit(ctx, 1, 3);\t\t\/* ffffffff sifm COLOR_FORMAT *\/\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff sifm OPERATION *\/\n+\n+\t\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff sifc OPERATION *\/\n+\t}\n+\n+\t\/* tesla state *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f GP_TEXTURES_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f GP_SAMPLERS_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff UNK12B0_0 *\/\n+\tdd_emit(ctx, 1, 0x70);\t\t\/* 000000ff UNK12B0_1 *\/\n+\tdd_emit(ctx, 1, 0x80);\t\t\/* 000000ff UNK12B0_3 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 000000ff UNK12B0_2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f FP_TEXTURES_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f FP_SAMPLERS_LOG2 *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\tdd_emit(ctx, 1, 0);\t\/* ffffffff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 0000007f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\t} else {\n+\t\tdd_emit(ctx, 1, 0);\t\/* 0000000f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\t} \n+\tdd_emit(ctx, 1, 0xc);\t\t\/* 000000ff SEMANTIC_COLOR.BFC0_ID *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 SEMANTIC_COLOR.CLMP_EN *\/\n+\tdd_emit(ctx, 1, 8);\t\t\/* 000000ff SEMANTIC_COLOR.COLR_NR *\/\n+\tdd_emit(ctx, 1, 0x14);\t\t\/* 000000ff SEMANTIC_COLOR.FFC0_ID *\/\n+\tif (dev_priv->chipset == 0x50) {\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff SEMANTIC_LAYER *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\t} else {\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 SEMANTIC_PTSZ.ENABLE *\/\n+\t\tdd_emit(ctx, 1, 0x29);\t\/* 000000ff SEMANTIC_PTSZ.PTSZ_ID *\/\n+\t\tdd_emit(ctx, 1, 0x27);\t\/* 000000ff SEMANTIC_PRIM *\/\n+\t\tdd_emit(ctx, 1, 0x26);\t\/* 000000ff SEMANTIC_LAYER *\/\n+\t\tdd_emit(ctx, 1, 8);\t\/* 0000000f SMENATIC_CLIP.CLIP_HIGH *\/\n+\t\tdd_emit(ctx, 1, 4);\t\/* 000000ff SEMANTIC_CLIP.CLIP_LO *\/\n+\t\tdd_emit(ctx, 1, 0x27);\t\/* 000000ff UNK0FD4 *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 UNK1900 *\/\n+\t}\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000007 RT_CONTROL_MAP0 *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000007 RT_CONTROL_MAP1 *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* 00000007 RT_CONTROL_MAP2 *\/\n+\tdd_emit(ctx, 1, 3);\t\t\/* 00000007 RT_CONTROL_MAP3 *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 00000007 RT_CONTROL_MAP4 *\/\n+\tdd_emit(ctx, 1, 5);\t\t\/* 00000007 RT_CONTROL_MAP5 *\/\n+\tdd_emit(ctx, 1, 6);\t\t\/* 00000007 RT_CONTROL_MAP6 *\/\n+\tdd_emit(ctx, 1, 7);\t\t\/* 00000007 RT_CONTROL_MAP7 *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 0000000f RT_CONTROL_COUNT *\/\n+\tdd_emit(ctx, 8, 0);\t\t\/* 00000001 RT_HORIZ_UNK *\/\n+\tdd_emit(ctx, 8, 0);\t\t\/* ffffffff RT_ADDRESS_LOW *\/\n+\tdd_emit(ctx, 1, 0xcf);\t\t\/* 000000ff RT_FORMAT *\/\n+\tdd_emit(ctx, 7, 0);\t\t\/* 000000ff RT_FORMAT *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\tdd_emit(ctx, 3, 0);\t\/* 1, 1, 1 *\/\n+\telse\n+\t\tdd_emit(ctx, 2, 0);\t\/* 1, 1 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff GP_ENABLE *\/\n+\tdd_emit(ctx, 1, 0x80);\t\t\/* 0000ffff GP_VERTEX_OUTPUT_COUNT*\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff GP_REG_ALLOC_RESULT *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\tdd_emit(ctx, 1, 3);\t\/* 00000003 *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 UNK1418. Alone. *\/\n+\t}\n+\tif (dev_priv->chipset != 0x50)\n+\t\tdd_emit(ctx, 1, 3);\t\/* 00000003 UNK15AC *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff RASTERIZE_ENABLE *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 FP_CONTROL.EXPORTS_Z *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 FP_CONTROL.MULTIPLE_RESULTS *\/\n+\tdd_emit(ctx, 1, 0x12);\t\t\/* 000000ff FP_INTERPOLANT_CTRL.COUNT *\/\n+\tdd_emit(ctx, 1, 0x10);\t\t\/* 000000ff FP_INTERPOLANT_CTRL.COUNT_NONFLAT *\/\n+\tdd_emit(ctx, 1, 0xc);\t\t\/* 000000ff FP_INTERPOLANT_CTRL.OFFSET *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 FP_INTERPOLANT_CTRL.UMASK.W *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 FP_INTERPOLANT_CTRL.UMASK.X *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 FP_INTERPOLANT_CTRL.UMASK.Y *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 FP_INTERPOLANT_CTRL.UMASK.Z *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff FP_RESULT_COUNT *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* ffffffff REG_MODE *\/\n+\tdd_emit(ctx, 1, 4);\t\t\/* 000000ff FP_REG_ALLOC_TEMP *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\tdd_emit(ctx, 1, 0);\t\/* ffffffff *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 GP_BUILTIN_RESULT_EN.LAYER_IDX *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff STRMOUT_ENABLE *\/\n+\tdd_emit(ctx, 1, 0x3fffff);\t\/* 003fffff TIC_LIMIT *\/\n+\tdd_emit(ctx, 1, 0x1fff);\t\/* 000fffff TSC_LIMIT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE*\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\tdd_emit(ctx, 8, 0);\t\/* 00000001 *\/\n+\tif (dev_priv->chipset >= 0xa0) {\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000007 VTX_ATTR_DEFINE.COMP *\/\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000007 VTX_ATTR_DEFINE.SIZE *\/\n+\t\tdd_emit(ctx, 1, 2);\t\/* 00000007 VTX_ATTR_DEFINE.TYPE *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff VTX_ATTR_DEFINE.ATTR *\/\n+\t}\n+\tdd_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\tdd_emit(ctx, 1, 0x14);\t\t\/* 0000001f ZETA_FORMAT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f VP_TEXTURES_LOG2 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000000f VP_SAMPLERS_LOG2 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* 00000003 POLYGON_MODE_BACK *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000003 VTX_ATTR_DEFINE.SIZE - 1 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 0000ffff CB_ADDR_INDEX *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 CULL_FACE_ENABLE *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000003 CULL_FACE *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 FRONT_FACE *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* 00000003 POLYGON_MODE_FRONT *\/\n+\tdd_emit(ctx, 1, 0x1000);\t\/* 00007fff UNK141C *\/\n+\tif (dev_priv->chipset != 0x50) {\n+\t\tdd_emit(ctx, 1, 0xe00);\t\t\/* 7fff *\/\n+\t\tdd_emit(ctx, 1, 0x1000);\t\/* 7fff *\/\n+\t\tdd_emit(ctx, 1, 0x1e00);\t\/* 7fff *\/\n+\t}\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 BEGIN_END_ACTIVE *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 POLYGON_MODE_??? *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000000ff GP_REG_ALLOC_TEMP \/ 4 rounded up *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000000ff FP_REG_ALLOC_TEMP... without \/4? *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 000000ff VP_REG_ALLOC_TEMP \/ 4 rounded up *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 VTX_ATTR_MASK_UNK0 nonempty *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 VTX_ATTR_MASK_UNK1 nonempty *\/\n+\tdd_emit(ctx, 1, 0x200);\t\t\/* 0003ffff GP_VERTEX_OUTPUT_COUNT*GP_REG_ALLOC_RESULT *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\tdd_emit(ctx, 1, 0x200);\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\tif (dev_priv->chipset < 0xa0) {\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 0x70);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0x80);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 0x70);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0x80);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff *\/\n+\t} else {\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 0xf0);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0xff);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 1);\t\/* 00000001 *\/\n+\t\tdd_emit(ctx, 1, 0xf0);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0xff);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 0);\t\/* 000000ff *\/\n+\t\tdd_emit(ctx, 1, 9);\t\/* 0000003f UNK114C.COMP,SIZE *\/\n+\t}\n+\n+\t\/* eng2d state *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 eng2d COLOR_KEY_ENABLE *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000007 eng2d COLOR_KEY_FORMAT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff eng2d DST_DEPTH *\/\n+\tdd_emit(ctx, 1, 0xcf);\t\t\/* 000000ff eng2d DST_FORMAT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff eng2d DST_LAYER *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 eng2d DST_LINEAR *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000007 eng2d PATTERN_COLOR_FORMAT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000007 eng2d OPERATION *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000003 eng2d PATTERN_SELECT *\/\n+\tdd_emit(ctx, 1, 0xcf);\t\t\/* 000000ff eng2d SIFC_FORMAT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 eng2d SIFC_BITMAP_ENABLE *\/\n+\tdd_emit(ctx, 1, 2);\t\t\/* 00000003 eng2d SIFC_BITMAP_UNK808 *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff eng2d BLIT_DU_DX_FRACT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff eng2d BLIT_DU_DX_INT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* ffffffff eng2d BLIT_DV_DY_FRACT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* ffffffff eng2d BLIT_DV_DY_INT *\/\n+\tdd_emit(ctx, 1, 0);\t\t\/* 00000001 eng2d BLIT_CONTROL_FILTER *\/\n+\tdd_emit(ctx, 1, 0xcf);\t\t\/* 000000ff eng2d DRAW_COLOR_FORMAT *\/\n+\tdd_emit(ctx, 1, 0xcf);\t\t\/* 000000ff eng2d SRC_FORMAT *\/\n+\tdd_emit(ctx, 1, 1);\t\t\/* 00000001 eng2d SRC_LINEAR #2 *\/\n+\n+\tnum = ctx->ctxvals_pos - base;\n+\tctx->ctxvals_pos = base;\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\tcp_ctx(ctx, 0x404800, num);\n+\telse\n+\t\tcp_ctx(ctx, 0x405400, num);\n }\n \n \/*\n@@ -990,28 +1130,33 @@\n * without the help of ctxprog.\n *\/\n \n-static inline void\n+static void\n xf_emit(struct nouveau_grctx *ctx, int num, uint32_t val) {\n \tint i;\n \tif (val && ctx->mode == NOUVEAU_GRCTX_VALS)\n \t\tfor (i = 0; i < num; i++)\n-\t\t\tnv_wo32(ctx->data, (ctx->ctxvals_pos + (i << 3))*4, val);\n+\t\t\tnv_wo32(ctx->data, 4 * (ctx->ctxvals_pos + (i << 3)), val);\n \tctx->ctxvals_pos += num << 3;\n }\n \n \/* Gene declarations... *\/\n \n+static void nv50_graph_construct_gene_dispatch(struct nouveau_grctx *ctx);\n static void nv50_graph_construct_gene_m2mf(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk1(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk2(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk3(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk4(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk5(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk6(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk7(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk8(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk9(struct nouveau_grctx *ctx);\n-static void nv50_graph_construct_gene_unk10(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_ccache(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_unk10xx(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_unk14xx(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_zcull(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_clipid(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_unk24xx(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_vfetch(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_eng2d(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_csched(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_unk1cxx(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_strmout(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_unk34xx(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_ropm1(struct nouveau_grctx *ctx);\n+static void nv50_graph_construct_gene_ropm2(struct nouveau_grctx *ctx);\n static void nv50_graph_construct_gene_ropc(struct nouveau_grctx *ctx);\n static void nv50_graph_construct_xfer_tp(struct nouveau_grctx *ctx);\n \n@@ -1030,102 +1175,32 @@\n \tif (dev_priv->chipset < 0xa0) {\n \t\t\/* Strand 0 *\/\n \t\tctx->ctxvals_pos = offset;\n-\t\tswitch (dev_priv->chipset) {\n-\t\tcase 0x50:\n-\t\t\txf_emit(ctx, 0x99, 0);\n-\t\t\tbreak;\n-\t\tcase 0x84:\n-\t\tcase 0x86:\n-\t\t\txf_emit(ctx, 0x384, 0);\n-\t\t\tbreak;\n-\t\tcase 0x92:\n-\t\tcase 0x94:\n-\t\tcase 0x96:\n-\t\tcase 0x98:\n-\t\t\txf_emit(ctx, 0x380, 0);\n-\t\t\tbreak;\n-\t\t}\n-\t\tnv50_graph_construct_gene_m2mf (ctx);\n-\t\tswitch (dev_priv->chipset) {\n-\t\tcase 0x50:\n-\t\tcase 0x84:\n-\t\tcase 0x86:\n-\t\tcase 0x98:\n-\t\t\txf_emit(ctx, 0x4c4, 0);\n-\t\t\tbreak;\n-\t\tcase 0x92:\n-\t\tcase 0x94:\n-\t\tcase 0x96:\n-\t\t\txf_emit(ctx, 0x984, 0);\n-\t\t\tbreak;\n-\t\t}\n-\t\tnv50_graph_construct_gene_unk5(ctx);\n-\t\tif (dev_priv->chipset == 0x50)\n-\t\t\txf_emit(ctx, 0xa, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0xb, 0);\n-\t\tnv50_graph_construct_gene_unk4(ctx);\n-\t\tnv50_graph_construct_gene_unk3(ctx);\n+\t\tnv50_graph_construct_gene_dispatch(ctx);\n+\t\tnv50_graph_construct_gene_m2mf(ctx);\n+\t\tnv50_graph_construct_gene_unk24xx(ctx);\n+\t\tnv50_graph_construct_gene_clipid(ctx);\n+\t\tnv50_graph_construct_gene_zcull(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 1 *\/\n \t\tctx->ctxvals_pos = offset + 0x1;\n-\t\tnv50_graph_construct_gene_unk6(ctx);\n-\t\tnv50_graph_construct_gene_unk7(ctx);\n-\t\tnv50_graph_construct_gene_unk8(ctx);\n-\t\tswitch (dev_priv->chipset) {\n-\t\tcase 0x50:\n-\t\tcase 0x92:\n-\t\t\txf_emit(ctx, 0xfb, 0);\n-\t\t\tbreak;\n-\t\tcase 0x84:\n-\t\t\txf_emit(ctx, 0xd3, 0);\n-\t\t\tbreak;\n-\t\tcase 0x94:\n-\t\tcase 0x96:\n-\t\t\txf_emit(ctx, 0xab, 0);\n-\t\t\tbreak;\n-\t\tcase 0x86:\n-\t\tcase 0x98:\n-\t\t\txf_emit(ctx, 0x6b, 0);\n-\t\t\tbreak;\n-\t\t}\n-\t\txf_emit(ctx, 2, 0x4e3bfdf);\n-\t\txf_emit(ctx, 4, 0);\n-\t\txf_emit(ctx, 1, 0x0fac6881);\n-\t\txf_emit(ctx, 0xb, 0);\n-\t\txf_emit(ctx, 2, 0x4e3bfdf);\n+\t\tnv50_graph_construct_gene_vfetch(ctx);\n+\t\tnv50_graph_construct_gene_eng2d(ctx);\n+\t\tnv50_graph_construct_gene_csched(ctx);\n+\t\tnv50_graph_construct_gene_ropm1(ctx);\n+\t\tnv50_graph_construct_gene_ropm2(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 2 *\/\n \t\tctx->ctxvals_pos = offset + 0x2;\n-\t\tswitch (dev_priv->chipset) {\n-\t\tcase 0x50:\n-\t\tcase 0x92:\n-\t\t\txf_emit(ctx, 0xa80, 0);\n-\t\t\tbreak;\n-\t\tcase 0x84:\n-\t\t\txf_emit(ctx, 0xa7e, 0);\n-\t\t\tbreak;\n-\t\tcase 0x94:\n-\t\tcase 0x96:\n-\t\t\txf_emit(ctx, 0xa7c, 0);\n-\t\t\tbreak;\n-\t\tcase 0x86:\n-\t\tcase 0x98:\n-\t\t\txf_emit(ctx, 0xa7a, 0);\n-\t\t\tbreak;\n-\t\t}\n-\t\txf_emit(ctx, 1, 0x3fffff);\n-\t\txf_emit(ctx, 2, 0);\n-\t\txf_emit(ctx, 1, 0x1fff);\n-\t\txf_emit(ctx, 0xe, 0);\n-\t\tnv50_graph_construct_gene_unk9(ctx);\n-\t\tnv50_graph_construct_gene_unk2(ctx);\n-\t\tnv50_graph_construct_gene_unk1(ctx);\n-\t\tnv50_graph_construct_gene_unk10(ctx);\n+\t\tnv50_graph_construct_gene_ccache(ctx);\n+\t\tnv50_graph_construct_gene_unk1cxx(ctx);\n+\t\tnv50_graph_construct_gene_strmout(ctx);\n+\t\tnv50_graph_construct_gene_unk14xx(ctx);\n+\t\tnv50_graph_construct_gene_unk10xx(ctx);\n+\t\tnv50_graph_construct_gene_unk34xx(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n@@ -1150,86 +1225,46 @@\n \t} else {\n \t\t\/* Strand 0 *\/\n \t\tctx->ctxvals_pos = offset;\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\t\txf_emit(ctx, 0x385, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0x384, 0);\n+\t\tnv50_graph_construct_gene_dispatch(ctx);\n \t\tnv50_graph_construct_gene_m2mf(ctx);\n-\t\txf_emit(ctx, 0x950, 0);\n-\t\tnv50_graph_construct_gene_unk10(ctx);\n-\t\txf_emit(ctx, 1, 0x0fac6881);\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\t\txf_emit(ctx, 1, 1);\n-\t\t\txf_emit(ctx, 3, 0);\n-\t\t}\n-\t\tnv50_graph_construct_gene_unk8(ctx);\n-\t\tif (dev_priv->chipset == 0xa0)\n-\t\t\txf_emit(ctx, 0x189, 0);\n-\t\telse if (dev_priv->chipset == 0xa3)\n-\t\t\txf_emit(ctx, 0xd5, 0);\n-\t\telse if (dev_priv->chipset == 0xa5)\n-\t\t\txf_emit(ctx, 0x99, 0);\n-\t\telse if (dev_priv->chipset == 0xaa)\n-\t\t\txf_emit(ctx, 0x65, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0x6d, 0);\n-\t\tnv50_graph_construct_gene_unk9(ctx);\n+\t\tnv50_graph_construct_gene_unk34xx(ctx);\n+\t\tnv50_graph_construct_gene_csched(ctx);\n+\t\tnv50_graph_construct_gene_unk1cxx(ctx);\n+\t\tnv50_graph_construct_gene_strmout(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 1 *\/\n \t\tctx->ctxvals_pos = offset + 1;\n-\t\tnv50_graph_construct_gene_unk1(ctx);\n+\t\tnv50_graph_construct_gene_unk10xx(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 2 *\/\n \t\tctx->ctxvals_pos = offset + 2;\n-\t\tif (dev_priv->chipset == 0xa0) {\n-\t\t\tnv50_graph_construct_gene_unk2(ctx);\n-\t\t}\n-\t\txf_emit(ctx, 0x36, 0);\n-\t\tnv50_graph_construct_gene_unk5(ctx);\n+\t\tif (dev_priv->chipset == 0xa0)\n+\t\t\tnv50_graph_construct_gene_unk14xx(ctx);\n+\t\tnv50_graph_construct_gene_unk24xx(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 3 *\/\n \t\tctx->ctxvals_pos = offset + 3;\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\tnv50_graph_construct_gene_unk6(ctx);\n+\t\tnv50_graph_construct_gene_vfetch(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 4 *\/\n \t\tctx->ctxvals_pos = offset + 4;\n-\t\tif (dev_priv->chipset == 0xa0)\n-\t\t\txf_emit(ctx, 0xa80, 0);\n-\t\telse if (dev_priv->chipset == 0xa3)\n-\t\t\txf_emit(ctx, 0xa7c, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0xa7a, 0);\n-\t\txf_emit(ctx, 1, 0x3fffff);\n-\t\txf_emit(ctx, 2, 0);\n-\t\txf_emit(ctx, 1, 0x1fff);\n+\t\tnv50_graph_construct_gene_ccache(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n \t\t\/* Strand 5 *\/\n \t\tctx->ctxvals_pos = offset + 5;\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 1, 0x0fac6881);\n-\t\txf_emit(ctx, 0xb, 0);\n-\t\txf_emit(ctx, 2, 0x4e3bfdf);\n-\t\txf_emit(ctx, 3, 0);\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\t\txf_emit(ctx, 1, 0x11);\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 2, 0x4e3bfdf);\n-\t\txf_emit(ctx, 2, 0);\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\t\txf_emit(ctx, 1, 0x11);\n-\t\txf_emit(ctx, 1, 0);\n+\t\tnv50_graph_construct_gene_ropm2(ctx);\n+\t\tnv50_graph_construct_gene_ropm1(ctx);\n+\t\t\/* per-ROP context *\/\n \t\tfor (i = 0; i < 8; i++)\n \t\t\tif (units & (1<<(i+16)))\n \t\t\t\tnv50_graph_construct_gene_ropc(ctx);\n@@ -1238,10 +1273,9 @@\n \n \t\t\/* Strand 6 *\/\n \t\tctx->ctxvals_pos = offset + 6;\n-\t\tnv50_graph_construct_gene_unk3(ctx);\n-\t\txf_emit(ctx, 0xb, 0);\n-\t\tnv50_graph_construct_gene_unk4(ctx);\n-\t\tnv50_graph_construct_gene_unk7(ctx);\n+\t\tnv50_graph_construct_gene_zcull(ctx);\n+\t\tnv50_graph_construct_gene_clipid(ctx);\n+\t\tnv50_graph_construct_gene_eng2d(ctx);\n \t\tif (units & (1 << 0))\n \t\t\tnv50_graph_construct_xfer_tp(ctx);\n \t\tif (units & (1 << 1))\n@@ -1269,7 +1303,7 @@\n \t\t\tif (units & (1 << 9))\n \t\t\t\tnv50_graph_construct_xfer_tp(ctx);\n \t\t} else {\n-\t\t\tnv50_graph_construct_gene_unk2(ctx);\n+\t\t\tnv50_graph_construct_gene_unk14xx(ctx);\n \t\t}\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n@@ -1290,9 +1324,70 @@\n *\/\n \n static void\n+nv50_graph_construct_gene_dispatch(struct nouveau_grctx *ctx)\n+{\n+\t\/* start of strand 0 *\/\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\t\/* SEEK *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 5, 0);\n+\telse if (!IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 6, 0);\n+\telse\n+\t\txf_emit(ctx, 4, 0);\n+\t\/* SEEK *\/\n+\t\/* the PGRAPH's internal FIFO *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 8*3, 0);\n+\telse\n+\t\txf_emit(ctx, 0x100*3, 0);\n+\t\/* and another bonus slot?!? *\/\n+\txf_emit(ctx, 3, 0);\n+\t\/* and YET ANOTHER bonus slot? *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 3, 0);\n+\t\/* SEEK *\/\n+\t\/* CTX_SWITCH: caches of gr objects bound to subchannels. 8 values, last used index *\/\n+\txf_emit(ctx, 9, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 9, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 9, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 9, 0);\n+\t\/* SEEK *\/\n+\tif (dev_priv->chipset < 0x90)\n+\t\txf_emit(ctx, 4, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 2, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 6*2, 0);\n+\txf_emit(ctx, 2, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 2, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 6*2, 0);\n+\txf_emit(ctx, 2, 0);\n+\t\/* SEEK *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 0x1c, 0);\n+\telse if (dev_priv->chipset < 0xa0)\n+\t\txf_emit(ctx, 0x1e, 0);\n+\telse\n+\t\txf_emit(ctx, 0x22, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x15, 0);\n+}\n+\n+static void\n nv50_graph_construct_gene_m2mf(struct nouveau_grctx *ctx)\n {\n-\t\/* m2mf state *\/\n+\t\/* Strand 0, right after dispatch *\/\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\tint smallm2mf = 0;\n+\tif (dev_priv->chipset < 0x92 || dev_priv->chipset == 0x98)\n+\t\tsmallm2mf = 1;\n+\t\/* SEEK *\/\n \txf_emit (ctx, 1, 0);\t\t\/* DMA_NOTIFY instance >> 4 *\/\n \txf_emit (ctx, 1, 0);\t\t\/* DMA_BUFFER_IN instance >> 4 *\/\n \txf_emit (ctx, 1, 0);\t\t\/* DMA_BUFFER_OUT instance >> 4 *\/\n@@ -1319,427 +1414,975 @@\n \txf_emit (ctx, 1, 0);\t\t\/* TILING_POSITION_OUT *\/\n \txf_emit (ctx, 1, 0);\t\t\/* OFFSET_IN_HIGH *\/\n \txf_emit (ctx, 1, 0);\t\t\/* OFFSET_OUT_HIGH *\/\n+\t\/* SEEK *\/\n+\tif (smallm2mf)\n+\t\txf_emit(ctx, 0x40, 0);\t\/* 20 * ffffffff, 3ffff *\/\n+\telse\n+\t\txf_emit(ctx, 0x100, 0);\t\/* 80 * ffffffff, 3ffff *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* 1f\/7f, 0, 1f\/7f, 0 [1f for smallm2mf, 7f otherwise] *\/\n+\t\/* SEEK *\/\n+\tif (smallm2mf)\n+\t\txf_emit(ctx, 0x400, 0);\t\/* ffffffff *\/\n+\telse\n+\t\txf_emit(ctx, 0x800, 0);\t\/* ffffffff *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ff\/1ff, 0, 0, 0 [ff for smallm2mf, 1ff otherwise] *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x40, 0);\t\t\/* 20 * bits ffffffff, 3ffff *\/\n+\txf_emit(ctx, 0x6, 0);\t\t\/* 1f, 0, 1f, 0, 1f, 0 *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk1(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_ccache(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\txf_emit(ctx, 2, 0);\t\t\/* RO *\/\n+\txf_emit(ctx, 0x800, 0);\t\t\/* ffffffff *\/\n+\tswitch (dev_priv->chipset) {\n+\tcase 0x50:\n+\tcase 0x92:\n+\tcase 0xa0:\n+\t\txf_emit(ctx, 0x2b, 0);\n+\t\tbreak;\n+\tcase 0x84:\n+\t\txf_emit(ctx, 0x29, 0);\n+\t\tbreak;\n+\tcase 0x94:\n+\tcase 0x96:\n+\tcase 0xa3:\n+\t\txf_emit(ctx, 0x27, 0);\n+\t\tbreak;\n+\tcase 0x86:\n+\tcase 0x98:\n+\tcase 0xa5:\n+\tcase 0xa8:\n+\tcase 0xaa:\n+\tcase 0xac:\n+\tcase 0xaf:\n+\t\txf_emit(ctx, 0x25, 0);\n+\t\tbreak;\n+\t}\n+\t\/* CB bindings, 0x80 of them. first word is address >> 8, second is\n+\t * size >> 4 | valid << 24 *\/\n+\txf_emit(ctx, 0x100, 0);\t\t\/* ffffffff CB_DEF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000007f CB_ADDR_BUFFER *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0 *\/\n+\txf_emit(ctx, 0x30, 0);\t\t\/* ff SET_PROGRAM_CB *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 3f last SET_PROGRAM_CB *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* RO *\/\n+\txf_emit(ctx, 0x100, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 1f, 0, 0, ... *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 3 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_CODE_CB *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_TIC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_TSC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINKED_TSC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff TIC_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff TIC_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0x3fffff);\t\/* 003fffff TIC_LIMIT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff TSC_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff TSC_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0x1fff);\t\/* 000fffff TSC_LIMIT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff VP_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff VP_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00ffffff VP_START_ID *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff CB_DEF_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff CB_DEF_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff GP_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff GP_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00ffffff GP_START_ID *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff FP_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff FP_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00ffffff FP_START_ID *\/\n+}\n+\n+static void\n+nv50_graph_construct_gene_unk10xx(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\tint i;\n+\t\/* end of area 2 on pre-NVA0, area 1 on NVAx *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 0000ffff GP_VERTEX_OUTPUT_COUNT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 0x80c14);\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 1, 0x3ff);\n+\telse\n+\t\txf_emit(ctx, 1, 0x7ff);\t\/* 000007ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 111\/113 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\tfor (i = 0; i < 8; i++) {\n+\t\tswitch (dev_priv->chipset) {\n+\t\tcase 0x50:\n+\t\tcase 0x86:\n+\t\tcase 0x98:\n+\t\tcase 0xaa:\n+\t\tcase 0xac:\n+\t\t\txf_emit(ctx, 0xa0, 0);\t\/* ffffffff *\/\n+\t\t\tbreak;\n+\t\tcase 0x84:\n+\t\tcase 0x92:\n+\t\tcase 0x94:\n+\t\tcase 0x96:\n+\t\t\txf_emit(ctx, 0x120, 0);\n+\t\t\tbreak;\n+\t\tcase 0xa5:\n+\t\tcase 0xa8:\n+\t\t\txf_emit(ctx, 0x100, 0);\t\/* ffffffff *\/\n+\t\t\tbreak;\n+\t\tcase 0xa0:\n+\t\tcase 0xa3:\n+\t\tcase 0xaf:\n+\t\t\txf_emit(ctx, 0x400, 0);\t\/* ffffffff *\/\n+\t\t\tbreak;\n+\t\t}\n+\t\txf_emit(ctx, 4, 0);\t\/* 3f, 0, 0, 0 *\/\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff *\/\n+\t}\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 0000ffff GP_VERTEX_OUTPUT_COUNT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_REG_ALLOC_TEMP *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 RASTERIZE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0x27);\t\t\/* 000000ff UNK0FD4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0x26);\t\t\/* 000000ff SEMANTIC_LAYER *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+}\n+\n+static void\n+nv50_graph_construct_gene_unk34xx(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n \t\/* end of area 2 on pre-NVA0, area 1 on NVAx *\/\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x80);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0x80c14);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0x3ff);\n-\telse\n-\t\txf_emit(ctx, 1, 0x7ff);\n-\tswitch (dev_priv->chipset) {\n-\tcase 0x50:\n-\tcase 0x86:\n-\tcase 0x98:\n-\tcase 0xaa:\n-\tcase 0xac:\n-\t\txf_emit(ctx, 0x542, 0);\n-\t\tbreak;\n-\tcase 0x84:\n-\tcase 0x92:\n-\tcase 0x94:\n-\tcase 0x96:\n-\t\txf_emit(ctx, 0x942, 0);\n-\t\tbreak;\n-\tcase 0xa0:\n-\tcase 0xa3:\n-\t\txf_emit(ctx, 0x2042, 0);\n-\t\tbreak;\n-\tcase 0xa5:\n-\tcase 0xa8:\n-\t\txf_emit(ctx, 0x842, 0);\n-\t\tbreak;\n-\t}\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x80);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x27);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x26);\n-\txf_emit(ctx, 3, 0);\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VIEWPORT_CLIP_RECTS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 VIEWPORT_CLIP_MODE *\/\n+\txf_emit(ctx, 0x10, 0x04000000);\t\/* 07ffffff VIEWPORT_CLIP_HORIZ*8, VIEWPORT_CLIP_VERT*8 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POLYGON_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 0x20, 0);\t\t\/* ffffffff POLYGON_STIPPLE *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 00007fff WINDOW_OFFSET_XY *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0x04e3bfdf);\t\/* ffffffff UNK0D64 *\/\n+\txf_emit(ctx, 1, 0x04e3bfdf);\t\/* ffffffff UNK0DF4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0x1fe21);\t\/* 0001ffff tesla UNK0FAC *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 1, 0x0fac6881);\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 1);\n+\t\txf_emit(ctx, 3, 0);\n+\t}\n }\n \n static void\n-nv50_graph_construct_gene_unk10(struct nouveau_grctx *ctx)\n-{\n-\t\/* end of area 2 on pre-NVA0, area 1 on NVAx *\/\n-\txf_emit(ctx, 0x10, 0x04000000);\n-\txf_emit(ctx, 0x24, 0);\n-\txf_emit(ctx, 2, 0x04e3bfdf);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x1fe21);\n-}\n-\n-static void\n-nv50_graph_construct_gene_unk2(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_unk14xx(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n \t\/* middle of area 2 on pre-NVA0, beginning of area 2 on NVA0, area 7 on >NVA0 *\/\n \tif (dev_priv->chipset != 0x50) {\n-\t\txf_emit(ctx, 5, 0);\n-\t\txf_emit(ctx, 1, 0x80c14);\n-\t\txf_emit(ctx, 2, 0);\n-\t\txf_emit(ctx, 1, 0x804);\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 2, 4);\n-\t\txf_emit(ctx, 1, 0x8100c12);\n-\t}\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x10);\n+\t\txf_emit(ctx, 5, 0);\t\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 1, 0x80c14);\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 000003ff *\/\n+\t\txf_emit(ctx, 1, 0x804);\t\t\/* 00000fff SEMANTIC_CLIP *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 2, 4);\t\t\/* 7f, ff *\/\n+\t\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\t\/* 7f\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 000000ff VP_CLIP_DISTANCE_ENABLE *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 000000ff tesla UNK1940 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK0D7C *\/\n+\txf_emit(ctx, 1, 0x804);\t\t\t\/* 00000fff SEMANTIC_CLIP *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 VIEWPORT_TRANSFORM_EN *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\t\/* 0000001f POLYGON_MODE *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0x7f);\t\t\/* 000000ff tesla UNK0FFC *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 SHADE_MODEL *\/\n+\txf_emit(ctx, 1, 0x80c14);\t\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\t\/* 7f\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK0D7C *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK0F8C *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 VIEWPORT_TRANSFORM_EN *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 4, 0);\t\t\t\/* ffffffff NOPERSPECTIVE_BITMAP *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0000000f *\/\n \tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 3, 0);\n+\t\txf_emit(ctx, 1, 0x3ff);\t\t\/* 000003ff tesla UNK0D68 *\/\n \telse\n-\t\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x804);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x1a);\n-\tif (dev_priv->chipset != 0x50)\n-\t\txf_emit(ctx, 1, 0x7f);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x80c14);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 6, 0);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0x3ff);\n-\telse\n-\t\txf_emit(ctx, 1, 0x7ff);\n-\txf_emit(ctx, 1, 0x80c14);\n-\txf_emit(ctx, 0x38, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 0x38, 0);\n-\txf_emit(ctx, 2, 0x88);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 0x16, 0);\n-\txf_emit(ctx, 1, 0x26);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x3f800000);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 4, 0);\n-\telse\n-\t\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x1a);\n-\txf_emit(ctx, 1, 0x10);\n-\tif (dev_priv->chipset != 0x50)\n-\t\txf_emit(ctx, 0x28, 0);\n-\telse\n-\t\txf_emit(ctx, 0x25, 0);\n-\txf_emit(ctx, 1, 0x52);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x26);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x1a);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x00ffff00);\n-\txf_emit(ctx, 1, 0);\n+\t\txf_emit(ctx, 1, 0x7ff);\t\t\/* 000007ff tesla UNK0D68 *\/\n+\txf_emit(ctx, 1, 0x80c14);\t\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE *\/\n+\txf_emit(ctx, 0x30, 0);\t\t\t\/* ffffffff VIEWPORT_SCALE: X0, Y0, Z0, X1, Y1, ... *\/\n+\txf_emit(ctx, 3, 0);\t\t\t\/* f, 0, 0 *\/\n+\txf_emit(ctx, 3, 0);\t\t\t\/* ffffffff last VIEWPORT_SCALE? *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 VIEWPORT_TRANSFORM_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1924 *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\t\/* 000000ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 0x30, 0);\t\t\t\/* ffffffff VIEWPORT_TRANSLATE *\/\n+\txf_emit(ctx, 3, 0);\t\t\t\/* f, 0, 0 *\/\n+\txf_emit(ctx, 3, 0);\t\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 2, 0x88);\t\t\t\/* 000001ff tesla UNK19D8 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1924 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 0000000f CULL_MODE *\/\n+\txf_emit(ctx, 2, 0);\t\t\t\/* 07ffffff SCREEN_SCISSOR *\/\n+\txf_emit(ctx, 2, 0);\t\t\t\/* 00007fff WINDOW_OFFSET_XY *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\t\/* 00000001 SCISSOR_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0x26);\t\t\t\/* 000000ff SEMANTIC_LAYER *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0000000f *\/\n+\txf_emit(ctx, 1, 0x3f800000);\t\t\/* ffffffff LINE_WIDTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 LINE_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\t\/* 0000001f POLYGON_MODE *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\t\/* 000000ff VIEW_VOLUME_CLIP_CTRL *\/\n+\tif (dev_priv->chipset != 0x50) {\n+\t\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 000003ff *\/\n+\t}\n+\txf_emit(ctx, 0x20, 0);\t\t\t\/* 10xbits ffffffff, 3fffff. SCISSOR_* *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* f *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0? *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 003fffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0x52);\t\t\t\/* 000001ff SEMANTIC_PTSZ *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0x26);\t\t\t\/* 000000ff SEMANTIC_LAYER *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\t\/* 0000001f POLYGON_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 LINE_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x00ffff00);\t\t\/* 00ffffff LINE_STIPPLE_PATTERN *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 0000000f *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk3(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_zcull(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\t\/* end of area 0 on pre-NVA0, beginning of area 6 on NVAx *\/\n-\txf_emit(ctx, 1, 0x3f);\n-\txf_emit(ctx, 0xa, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 0x04000000);\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 4);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 0x10, 0);\n-\telse\n-\t\txf_emit(ctx, 0x11, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x1001);\n-\txf_emit(ctx, 4, 0xffff);\n-\txf_emit(ctx, 0x20, 0);\n-\txf_emit(ctx, 0x10, 0x3f800000);\n-\txf_emit(ctx, 1, 0x10);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0);\n-\telse\n-\t\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 2, 0);\n+\t\/* end of strand 0 on pre-NVA0, beginning of strand 6 on NVAx *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0x3f);\t\t\/* 0000003f UNK1590 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 ALPHA_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_BACK_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_BACK_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 tesla UNK143C *\/\n+\txf_emit(ctx, 2, 0x04000000);\t\/* 07ffffff tesla UNK0D6C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 CLIPID_ENABLE *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff DEPTH_BOUNDS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 DEPTH_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000000f CULL_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK0FB0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POLYGON_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff CLEAR_STENCIL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_FRONT_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_FRONT_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff CLEAR_DEPTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 tesla UNK1108 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0x1001);\t\/* 00001fff ZETA_ARRAY_MODE *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 4, 0xffff);\t\/* 0000ffff MSAA_MASK *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* 00000001 SCISSOR_ENABLE *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* ffffffff DEPTH_RANGE_NEAR *\/\n+\txf_emit(ctx, 0x10, 0x3f800000);\t\/* ffffffff DEPTH_RANGE_FAR *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 7f\/ff\/3ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VIEWPORT_CLIP_RECTS_EN *\/\n+\txf_emit(ctx, 1, 3);\t\t\/* 00000003 FP_CTRL_UNK196C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK1968 *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\/* 0fffffff tesla UNK1104 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK151C *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk4(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_clipid(struct nouveau_grctx *ctx)\n {\n-\t\/* middle of area 0 on pre-NVA0, middle of area 6 on NVAx *\/\n-\txf_emit(ctx, 2, 0x04000000);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x80);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x80);\n-\txf_emit(ctx, 1, 0);\n+\t\/* middle of strand 0 on pre-NVA0 [after 24xx], middle of area 6 on NVAx *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 UNK0FB4 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* 07ffffff CLIPID_REGION_HORIZ *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* 07ffffff CLIPID_REGION_VERT *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 07ffffff SCREEN_SCISSOR *\/\n+\txf_emit(ctx, 2, 0x04000000);\t\/* 07ffffff UNK1508 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 CLIPID_ENABLE *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 00003fff CLIPID_WIDTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff CLIPID_ID *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff CLIPID_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff CLIPID_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 00003fff CLIPID_HEIGHT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_CLIPID *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk5(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_unk24xx(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\t\/* middle of area 0 on pre-NVA0 [after m2mf], end of area 2 on NVAx *\/\n-\txf_emit(ctx, 2, 4);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0x1c4d, 0);\n+\tint i;\n+\t\/* middle of strand 0 on pre-NVA0 [after m2mf], end of strand 2 on NVAx *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x33, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 2, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 4, 0);\t\/* RO *\/\n+\t\txf_emit(ctx, 0xe10, 0); \/* 190 * 9: 8*ffffffff, 7ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 1ff *\/\n+\t\txf_emit(ctx, 8, 0);\t\/* 0? *\/\n+\t\txf_emit(ctx, 9, 0);\t\/* ffffffff, 7ff *\/\n+\n+\t\txf_emit(ctx, 4, 0);\t\/* RO *\/\n+\t\txf_emit(ctx, 0xe10, 0); \/* 190 * 9: 8*ffffffff, 7ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 1ff *\/\n+\t\txf_emit(ctx, 8, 0);\t\/* 0? *\/\n+\t\txf_emit(ctx, 9, 0);\t\/* ffffffff, 7ff *\/\n+\t}\n \telse\n-\t\txf_emit(ctx, 0x1c4b, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0x8100c12);\n+\t{\n+\t\txf_emit(ctx, 0xc, 0);\t\/* RO *\/\n+\t\t\/* SEEK *\/\n+\t\txf_emit(ctx, 0xe10, 0); \/* 190 * 9: 8*ffffffff, 7ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 1ff *\/\n+\t\txf_emit(ctx, 8, 0);\t\/* 0? *\/\n+\n+\t\t\/* SEEK *\/\n+\t\txf_emit(ctx, 0xc, 0);\t\/* RO *\/\n+\t\t\/* SEEK *\/\n+\t\txf_emit(ctx, 0xe10, 0); \/* 190 * 9: 8*ffffffff, 7ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 1ff *\/\n+\t\txf_emit(ctx, 8, 0);\t\/* 0? *\/\n+\t}\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n \tif (dev_priv->chipset != 0x50)\n-\t\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x80c14);\n-\txf_emit(ctx, 1, 1);\n+\t\txf_emit(ctx, 1, 3);\t\/* 00000003 tesla UNK1100 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f VP_GP_BUILTIN_ATTR_EN *\/\n+\txf_emit(ctx, 1, 0x80c14);\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 *\/\n+\t\/* SEEK *\/\n \tif (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0x80c14);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 1, 0x27);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x3c1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x16, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 1, 0);\n+\t\txf_emit(ctx, 2, 4);\t\/* 000000ff *\/\n+\txf_emit(ctx, 1, 0x80c14);\t\/* 01ffffff SEMANTIC_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POINT_SPRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 0x27);\t\t\/* 000000ff SEMANTIC_PRIM_ID *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 *\/\n+\tfor (i = 0; i < 10; i++) {\n+\t\t\/* SEEK *\/\n+\t\txf_emit(ctx, 0x40, 0);\t\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 0x10, 0);\t\t\/* 3, 0, 0.... *\/\n+\t\txf_emit(ctx, 0x10, 0);\t\t\/* ffffffff *\/\n+\t}\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POINT_SPRITE_CTRL *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff NOPERSPECTIVE_BITMAP *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* 00ffffff POINT_COORD_REPLACE_MAP *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\/* 000003ff *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk6(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_vfetch(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\t\/* beginning of area 1 on pre-NVA0 [after m2mf], area 3 on NVAx *\/\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 8, 0);\n+\tint acnt = 0x10, rep, i;\n+\t\/* beginning of strand 1 on pre-NVA0, strand 3 on NVAx *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\tacnt = 0x20;\n+\t\/* SEEK *\/\n+\tif (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff tesla UNK13A4 *\/\n+\t\txf_emit(ctx, 1, 1);\t\/* 00000fff tesla UNK1318 *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff VERTEX_BUFFER_FIRST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PRIMITIVE_RESTART_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK0DE8 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff PRIMITIVE_RESTART_INDEX *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, (acnt\/8)-1, 0);\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, acnt\/8, 0);\t\/* ffffffff VTX_ATR_MASK_UNK0DD0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f VP_GP_BUILTIN_ATTR_EN *\/\n+\txf_emit(ctx, 1, 0x20);\t\t\/* 0000ffff tesla UNK129C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff turing UNK370??? *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff turing USER_PARAM_COUNT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0xb, 0);\t\/* RO *\/\n+\telse if (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 0x9, 0);\t\/* RO *\/\n \telse\n-\t\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x20);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0x11, 0);\n-\telse if (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 0xf, 0);\n+\t\txf_emit(ctx, 0x8, 0);\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 EDGE_FLAG *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PROVOKING_VERTEX_LAST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\/* 0000001f POLYGON_MODE *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0xc, 0);\t\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7f\/ff *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f VP_GP_BUILTIN_ATTR_EN *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000001ff UNK1A28 *\/\n+\txf_emit(ctx, 1, 8);\t\t\/* 000001ff UNK0DF0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 1, 0x3ff);\t\/* 3ff tesla UNK0D68 *\/\n \telse\n-\t\txf_emit(ctx, 0xe, 0);\n-\txf_emit(ctx, 1, 0x1a);\n-\txf_emit(ctx, 0xd, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 8);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0x3ff);\n+\t\txf_emit(ctx, 1, 0x7ff);\t\/* 7ff tesla UNK0D68 *\/\n+\tif (dev_priv->chipset == 0xa8)\n+\t\txf_emit(ctx, 1, 0x1e00);\t\/* 7fff *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0xc, 0);\t\t\/* RO or close *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, (acnt\/8)-1, 0);\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f VP_GP_BUILTIN_ATTR_EN *\/\n+\tif (dev_priv->chipset > 0x50 && dev_priv->chipset < 0xa0)\n+\t\txf_emit(ctx, 2, 0);\t\/* ffffffff *\/\n \telse\n-\t\txf_emit(ctx, 1, 0x7ff);\n-\tif (dev_priv->chipset == 0xa8)\n-\t\txf_emit(ctx, 1, 0x1e00);\n-\txf_emit(ctx, 0xc, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 0x125, 0);\n-\telse if (dev_priv->chipset < 0xa0)\n-\t\txf_emit(ctx, 0x126, 0);\n-\telse if (dev_priv->chipset == 0xa0 || dev_priv->chipset >= 0xaa)\n-\t\txf_emit(ctx, 0x124, 0);\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK0FD8 *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 0x10, 0);\t\/* 0? *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* weird... *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* RO *\/\n+\t} else {\n+\t\txf_emit(ctx, 8, 0);\t\/* 0? *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* weird... *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* RO *\/\n+\t}\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff VB_ELEMENT_BASE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff UNK1438 *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* 1 tesla UNK1000 *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff tesla UNK1118? *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* ffffffff VERTEX_ARRAY_UNK90C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* ffffffff VERTEX_ARRAY_UNK90C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* RO *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK111C? *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff UNK15F4_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff UNK15F4_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff UNK0F84_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff UNK0F84_ADDRESS_LOW *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* 00003fff VERTEX_ARRAY_ATTRIB_OFFSET *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* 00000fff VERTEX_ARRAY_STRIDE *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* ffffffff VERTEX_ARRAY_LOW *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* 000000ff VERTEX_ARRAY_HIGH *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* ffffffff VERTEX_LIMIT_LOW *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt, 0);\t\t\/* 000000ff VERTEX_LIMIT_HIGH *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, acnt, 0);\t\t\/* f *\/\n+\t\txf_emit(ctx, 3, 0);\t\t\/* f\/1f *\/\n+\t}\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 2, 0);\t\/* RO *\/\n \telse\n-\t\txf_emit(ctx, 0x1f7, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 3, 0);\n+\t\txf_emit(ctx, 5, 0);\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff DMA_VTXBUF *\/\n+\t\/* SEEK *\/\n+\tif (dev_priv->chipset < 0xa0) {\n+\t\txf_emit(ctx, 0x41, 0);\t\/* RO *\/\n+\t\t\/* SEEK *\/\n+\t\txf_emit(ctx, 0x11, 0);\t\/* RO *\/\n+\t} else if (!IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0x50, 0);\t\/* RO *\/\n \telse\n-\t\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0xa1, 0);\n+\t\txf_emit(ctx, 0x58, 0);\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, (acnt\/8)-1, 0);\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 1 UNK0DEC *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, acnt*4, 0);\t\/* ffffffff VTX_ATTR *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* f\/1f, 0, 0, 0 *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0x1d, 0);\t\/* RO *\/\n \telse\n-\t\txf_emit(ctx, 0x5a, 0);\n-\txf_emit(ctx, 1, 0xf);\n+\t\txf_emit(ctx, 0x16, 0);\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, (acnt\/8)-1, 0);\t\/* ffffffff VP_ATTR_EN *\/\n+\t\/* SEEK *\/\n \tif (dev_priv->chipset < 0xa0)\n-\t\txf_emit(ctx, 0x834, 0);\n-\telse if (dev_priv->chipset == 0xa0)\n-\t\txf_emit(ctx, 0x1873, 0);\n-\telse if (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0x8ba, 0);\n+\t\txf_emit(ctx, 8, 0);\t\/* RO *\/\n+\telse if (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0xc, 0);\t\/* RO *\/\n \telse\n-\t\txf_emit(ctx, 0x833, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 0xf, 0);\n+\t\txf_emit(ctx, 7, 0);\t\/* RO *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0xa, 0);\t\t\/* RO *\/\n+\tif (dev_priv->chipset == 0xa0)\n+\t\trep = 0xc;\n+\telse\n+\t\trep = 4;\n+\tfor (i = 0; i < rep; i++) {\n+\t\t\/* SEEK *\/\n+\t\tif (IS_NVA3F(dev_priv->chipset))\n+\t\t\txf_emit(ctx, 0x20, 0);\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 0x200, 0);\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 4, 0);\t\/* 7f\/ff, 0, 0, 0 *\/\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff *\/\n+\t}\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 113\/111 *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, (acnt\/8)-1, 0);\t\/* ffffffff VP_ATTR_EN *\/\n+\txf_emit(ctx, acnt\/8, 0);\t\/* ffffffff VTX_ATTR_MASK_UNK0DD0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f VP_GP_BUILTIN_ATTR_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\t\/* SEEK *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 7, 0);\t\/* weird... *\/\n+\telse\n+\t\txf_emit(ctx, 5, 0);\t\/* weird... *\/\n }\n \n static void\n-nv50_graph_construct_gene_unk7(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_eng2d(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\t\/* middle of area 1 on pre-NVA0 [after m2mf], middle of area 6 on NVAx *\/\n-\txf_emit(ctx, 2, 0);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 2, 1);\n-\telse\n-\t\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0x100);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 8);\n-\txf_emit(ctx, 5, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 3, 1);\n-\txf_emit(ctx, 1, 0xcf);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 6, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 3, 1);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x15);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x4444480);\n-\txf_emit(ctx, 0x37, 0);\n+\t\/* middle of strand 1 on pre-NVA0 [after vfetch], middle of strand 6 on NVAx *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 0001ffff CLIP_X, CLIP_Y *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 0000ffff CLIP_W, CLIP_H *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 CLIP_ENABLE *\/\n+\tif (dev_priv->chipset < 0xa0) {\n+\t\t\/* this is useless on everything but the original NV50,\n+\t\t * guess they forgot to nuke it. Or just didn't bother. *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* 0000ffff IFC_CLIP_X, Y *\/\n+\t\txf_emit(ctx, 2, 1);\t\/* 0000ffff IFC_CLIP_W, H *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 IFC_CLIP_ENABLE *\/\n+\t}\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* 0001ffff DST_WIDTH *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* 0001ffff DST_HEIGHT *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f[NV50]\/7f[NV84+] DST_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff DRAW_POINT_X *\/\n+\txf_emit(ctx, 1, 8);\t\t\/* 0000000f DRAW_UNK58C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff SIFC_DST_X_FRACT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff SIFC_DST_X_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff SIFC_DST_Y_FRACT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff SIFC_DST_Y_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff SIFC_DX_DU_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff SIFC_DX_DU_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff SIFC_DY_DV_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff SIFC_DY_DV_INT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000ffff SIFC_WIDTH *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000ffff SIFC_HEIGHT *\/\n+\txf_emit(ctx, 1, 0xcf);\t\t\/* 000000ff SIFC_FORMAT *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 SIFC_BITMAP_UNK808 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 SIFC_BITMAP_LINE_PACK_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SIFC_BITMAP_LSB_FIRST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SIFC_BITMAP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff BLIT_DST_X *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff BLIT_DST_Y *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_DU_DX_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff BLIT_DU_DX_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_DV_DY_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff BLIT_DV_DY_INT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000ffff BLIT_DST_W *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000ffff BLIT_DST_H *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_SRC_X_FRACT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff BLIT_SRC_X_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_SRC_Y_FRACT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK888 *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000003f UNK884 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 UNK880 *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f tesla UNK0FB8 *\/\n+\txf_emit(ctx, 1, 0x15);\t\t\/* 000000ff tesla UNK128C *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 00000007, ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK260 *\/\n+\txf_emit(ctx, 1, 0x4444480);\t\/* 1fffffff UNK870 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x10, 0);\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x27, 0);\n }\n \n static void\n-nv50_graph_construct_gene_unk8(struct nouveau_grctx *ctx)\n-{\n-\t\/* middle of area 1 on pre-NVA0 [after m2mf], middle of area 0 on NVAx *\/\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x100);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x10001);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x10001);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x10001);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 2);\n-}\n-\n-static void\n-nv50_graph_construct_gene_unk9(struct nouveau_grctx *ctx)\n+nv50_graph_construct_gene_csched(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\t\/* middle of area 2 on pre-NVA0 [after m2mf], end of area 0 on NVAx *\/\n-\txf_emit(ctx, 1, 0x3f800000);\n-\txf_emit(ctx, 6, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0x1a);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x12, 0);\n-\txf_emit(ctx, 1, 0x00ffff00);\n-\txf_emit(ctx, 6, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 0xf, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 2, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 3);\n+\t\/* middle of strand 1 on pre-NVA0 [after eng2d], middle of strand 0 on NVAx *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 00007fff WINDOW_OFFSET_XY... what is it doing here??? *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1924 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000003ff *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff turing UNK364 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f turing UNK36C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff USER_PARAM_COUNT *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* 00ffffff turing UNK384 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f turing UNK2A0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff GRIDID *\/\n+\txf_emit(ctx, 1, 0x10001);\t\/* ffffffff GRIDDIM_XY *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0x10001);\t\/* ffffffff BLOCKDIM_XY *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000ffff BLOCKDIM_Z *\/\n+\txf_emit(ctx, 1, 0x10001);\t\/* 00ffffff BLOCK_ALLOC *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 LANES32 *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff FP_REG_ALLOC_TEMP *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 REG_MODE *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x40, 0);\t\t\/* ffffffff USER_PARAM *\/\n+\tswitch (dev_priv->chipset) {\n+\tcase 0x50:\n+\tcase 0x92:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0x80, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 0x10*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0x84:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0x60, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 0xc*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0x94:\n+\tcase 0x96:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0x40, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 8*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0x86:\n+\tcase 0x98:\n+\t\txf_emit(ctx, 4, 0);\t\/* f, 0, 0, 0 *\/\n+\t\txf_emit(ctx, 0x10, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 2*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0xa0:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0xf0, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 0x1e*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0xa3:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0x60, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 0xc*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0xa5:\n+\tcase 0xaf:\n+\t\txf_emit(ctx, 8, 0);\t\/* 7, 0, 0, 0, ... *\/\n+\t\txf_emit(ctx, 0x30, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 6*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\tcase 0xaa:\n+\t\txf_emit(ctx, 0x12, 0);\n+\t\tbreak;\n+\tcase 0xa8:\n+\tcase 0xac:\n+\t\txf_emit(ctx, 4, 0);\t\/* f, 0, 0, 0 *\/\n+\t\txf_emit(ctx, 0x10, 0);\t\/* fff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* ff, fff *\/\n+\t\txf_emit(ctx, 2*2, 0);\t\/* ffffffff, 1f *\/\n+\t\tbreak;\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000000 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000001f *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 turing UNK35C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 turing UNK35C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff *\/\n+}\n+\n+static void\n+nv50_graph_construct_gene_unk1cxx(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\txf_emit(ctx, 2, 0);\t\t\/* 00007fff WINDOW_OFFSET_XY *\/\n+\txf_emit(ctx, 1, 0x3f800000);\t\/* ffffffff LINE_WIDTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1658 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POLYGON_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000001 POLYGON_OFFSET_*_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000000f CULL_MODE *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\/* 0000001f POLYGON_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POINT_SPRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK165C *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* 00000001 SCISSOR_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x00ffff00);\t\/* 00ffffff LINE_STIPPLE_PATTERN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff POLYGON_OFFSET_UNITS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff POLYGON_OFFSET_FACTOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK1668 *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 07ffffff SCREEN_SCISSOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 0000007f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000007f RT_FORMAT *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 00000001 RT_HORIZ_LINEAR *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 ALPHA_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 ALPHA_TEST_FUNC *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 3);\t\/* 00000003 UNK16B4 *\/\n \telse if (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 0x04000000);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 5);\n-\txf_emit(ctx, 1, 0x52);\n-\tif (dev_priv->chipset == 0x50) {\n-\t\txf_emit(ctx, 0x13, 0);\n-\t} else {\n-\t\txf_emit(ctx, 4, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\t\txf_emit(ctx, 0x11, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0x10, 0);\n-\t}\n-\txf_emit(ctx, 0x10, 0x3f800000);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 0x26, 0);\n-\txf_emit(ctx, 1, 0x8100c12);\n-\txf_emit(ctx, 1, 5);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 4, 0xffff);\n+\t\txf_emit(ctx, 1, 1);\t\/* 00000001 UNK16B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 MULTISAMPLE_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK0F90 *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 tesla UNK143C *\/\n+\txf_emit(ctx, 2, 0x04000000);\t\/* 07ffffff tesla UNK0D6C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 5);\t\t\/* 0000000f UNK1408 *\/\n+\txf_emit(ctx, 1, 0x52);\t\t\/* 000001ff SEMANTIC_PTSZ *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff POINT_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 tesla UNK0FB4 *\/\n+\tif (dev_priv->chipset != 0x50) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 3ff *\/\n+\t\txf_emit(ctx, 1, 1);\t\/* 00000001 tesla UNK1110 *\/\n+\t}\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 tesla UNK1928 *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* ffffffff DEPTH_RANGE_NEAR *\/\n+\txf_emit(ctx, 0x10, 0x3f800000);\t\/* ffffffff DEPTH_RANGE_FAR *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 000000ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 0x20, 0);\t\t\/* 07ffffff VIEWPORT_HORIZ, then VIEWPORT_VERT. (W&0x3fff)<<13 | (X&0x1fff). *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK187C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_MASK *\/\n+\txf_emit(ctx, 1, 0x8100c12);\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 5);\t\t\/* 0000000f tesla UNK1220 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff tesla UNK1A20 *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE *\/\n+\txf_emit(ctx, 4, 0xffff);\t\/* 0000ffff MSAA_MASK *\/\n \tif (dev_priv->chipset != 0x50)\n-\t\txf_emit(ctx, 1, 3);\n+\t\txf_emit(ctx, 1, 3);\t\/* 00000003 tesla UNK1100 *\/\n \tif (dev_priv->chipset < 0xa0)\n-\t\txf_emit(ctx, 0x1f, 0);\n-\telse if (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0xc, 0);\n+\t\txf_emit(ctx, 0x1c, 0);\t\/* RO *\/\n+\telse if (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0x9, 0);\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x00ffff00);\t\/* 00ffffff LINE_STIPPLE_PATTERN *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\/* 0000001f POLYGON_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 WINDOW_ORIGIN *\/\n+\tif (dev_priv->chipset != 0x50) {\n+\t\txf_emit(ctx, 1, 3);\t\/* 00000003 tesla UNK1100 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 3ff *\/\n+\t}\n+\t\/* XXX: the following block could belong either to unk1cxx, or\n+\t * to STRMOUT. Rather hard to tell. *\/\n+\tif (dev_priv->chipset < 0xa0)\n+\t\txf_emit(ctx, 0x25, 0);\n \telse\n-\t\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x00ffff00);\n-\txf_emit(ctx, 1, 0x1a);\n-\tif (dev_priv->chipset != 0x50) {\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 1, 3);\n-\t}\n-\tif (dev_priv->chipset < 0xa0)\n-\t\txf_emit(ctx, 0x26, 0);\n+\t\txf_emit(ctx, 0x3b, 0);\n+}\n+\n+static void\n+nv50_graph_construct_gene_strmout(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\txf_emit(ctx, 1, 0x102);\t\t\/* 0000ffff STRMOUT_BUFFER_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff STRMOUT_PRIMITIVE_COUNT *\/\n+\txf_emit(ctx, 4, 4);\t\t\/* 000000ff STRMOUT_NUM_ATTRIBS *\/\n+\tif (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff UNK1A8C *\/\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff UNK1780 *\/\n+\t}\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 0000007f VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\tif (dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 1, 0x3ff);\t\/* 000003ff tesla UNK0D68 *\/\n \telse\n-\t\txf_emit(ctx, 0x3c, 0);\n-\txf_emit(ctx, 1, 0x102);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 4, 4);\n-\tif (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0x3ff);\n-\telse\n-\t\txf_emit(ctx, 1, 0x7ff);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x102);\n-\txf_emit(ctx, 9, 0);\n-\txf_emit(ctx, 4, 4);\n-\txf_emit(ctx, 0x2c, 0);\n+\t\txf_emit(ctx, 1, 0x7ff);\t\/* 000007ff tesla UNK0D68 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0x102);\t\t\/* 0000ffff STRMOUT_BUFFER_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff STRMOUT_PRIMITIVE_COUNT *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* 000000ff STRMOUT_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff STRMOUT_ADDRESS_LOW *\/\n+\txf_emit(ctx, 4, 4);\t\t\/* 000000ff STRMOUT_NUM_ATTRIBS *\/\n+\tif (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff UNK1A8C *\/\n+\t\txf_emit(ctx, 4, 0);\t\/* ffffffff UNK1780 *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_STRMOUT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_QUERY *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff QUERY_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff QUERY_ADDRESS_LOW QUERY_COUNTER *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 0x20, 0);\t\t\/* ffffffff STRMOUT_MAP *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000000? *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff *\/\n+}\n+\n+static void\n+nv50_graph_construct_gene_ropm1(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\txf_emit(ctx, 1, 0x4e3bfdf);\t\/* ffffffff UNK0D64 *\/\n+\txf_emit(ctx, 1, 0x4e3bfdf);\t\/* ffffffff UNK0DF4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000003ff *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0x11);\t\/* 000000ff tesla UNK1968 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+}\n+\n+static void\n+nv50_graph_construct_gene_ropm2(struct nouveau_grctx *ctx)\n+{\n+\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_QUERY *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff QUERY_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff QUERY_ADDRESS_LOW, COUNTER *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7 *\/\n+\t\/* SEEK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_QUERY *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff QUERY_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff QUERY_ADDRESS_LOW, COUNTER *\/\n+\txf_emit(ctx, 1, 0x4e3bfdf);\t\/* ffffffff UNK0D64 *\/\n+\txf_emit(ctx, 1, 0x4e3bfdf);\t\/* ffffffff UNK0DF4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 eng2d UNK260 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0x11);\t\/* 000000ff tesla UNK1968 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n }\n \n static void\n@@ -1749,443 +2392,709 @@\n \tint magic2;\n \tif (dev_priv->chipset == 0x50) {\n \t\tmagic2 = 0x00003e60;\n-\t} else if (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa) {\n+\t} else if (!IS_NVA3F(dev_priv->chipset)) {\n \t\tmagic2 = 0x001ffe67;\n \t} else {\n \t\tmagic2 = 0x00087e67;\n \t}\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, magic2);\n-\txf_emit(ctx, 4, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 7, 0);\n-\tif (dev_priv->chipset >= 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 0x15);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 4, 0);\n+\txf_emit(ctx, 1, 0);\t\t\/* f\/7 MUTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_BACK_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_BACK_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 tesla UNK143C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, magic2);\t\/* 001fffff tesla UNK0F78 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 DEPTH_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_FRONT_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_FRONT_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\tif (dev_priv->chipset >= 0xa0 && !IS_NVAAF(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0x15);\t\/* 000000ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 3ff\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff CLEAR_DEPTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n \tif (dev_priv->chipset == 0x86 || dev_priv->chipset == 0x92 || dev_priv->chipset == 0x98 || dev_priv->chipset >= 0xa0) {\n-\t\txf_emit(ctx, 1, 4);\n-\t\txf_emit(ctx, 1, 0x400);\n-\t\txf_emit(ctx, 1, 0x300);\n-\t\txf_emit(ctx, 1, 0x1001);\n+\t\txf_emit(ctx, 3, 0);\t\/* ff, ffffffff, ffffffff *\/\n+\t\txf_emit(ctx, 1, 4);\t\/* 7 *\/\n+\t\txf_emit(ctx, 1, 0x400);\t\/* fffffff *\/\n+\t\txf_emit(ctx, 1, 0x300);\t\/* ffff *\/\n+\t\txf_emit(ctx, 1, 0x1001);\t\/* 1fff *\/\n \t\tif (dev_priv->chipset != 0xa0) {\n-\t\t\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\t\t\txf_emit(ctx, 1, 0);\n+\t\t\tif (IS_NVA3F(dev_priv->chipset))\n+\t\t\t\txf_emit(ctx, 1, 0);\t\/* 0000000f UNK15C8 *\/\n \t\t\telse\n-\t\t\t\txf_emit(ctx, 1, 0x15);\n+\t\t\t\txf_emit(ctx, 1, 0x15);\t\/* ff *\/\n \t\t}\n-\t\txf_emit(ctx, 3, 0);\n-\t}\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x13, 0);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 0x10, 0);\n-\txf_emit(ctx, 0x10, 0x3f800000);\n-\txf_emit(ctx, 0x19, 0);\n-\txf_emit(ctx, 1, 0x10);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x3f);\n-\txf_emit(ctx, 6, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_BACK_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 tesla UNK143C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 DEPTH_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_FRONT_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 7f\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1900 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_BACK_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_REF *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff DEPTH_BOUNDS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 DEPTH_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK0FB0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_FRONT_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 7f\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 0x10, 0);\t\t\/* ffffffff DEPTH_RANGE_NEAR *\/\n+\txf_emit(ctx, 0x10, 0x3f800000);\t\/* ffffffff DEPTH_RANGE_FAR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_BACK_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_FUNC_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_BACK_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff DEPTH_BOUNDS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 DEPTH_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff CLEAR_STENCIL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 STENCIL_FRONT_FUNC_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_FUNC_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_FRONT_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 1, 0x10);\t\t\/* 7f\/ff VIEW_VOLUME_CLIP_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 0x3f);\t\t\/* 0000003f UNK1590 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffff0ff3, ffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK0FB0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff CLEAR_DEPTH *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK19CC *\/\n \tif (dev_priv->chipset >= 0xa0) {\n \t\txf_emit(ctx, 2, 0);\n \t\txf_emit(ctx, 1, 0x1001);\n \t\txf_emit(ctx, 0xb, 0);\n \t} else {\n-\t\txf_emit(ctx, 0xc, 0);\n-\t}\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 4, 0);\n-\telse\n-\t\txf_emit(ctx, 6, 0);\n-\txf_emit(ctx, 3, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, magic2);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 0x18, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 8, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 8, 1);\n-\t\txf_emit(ctx, 3, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 5, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 0x16, 0);\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000007 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 tesla UNK1534 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\t\txf_emit(ctx, 8, 0);\t\/* 00000001 BLEND_ENABLE *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* ffff0ff3 *\/\n+\t}\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\tif (dev_priv->chipset != 0x50) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 0000000f LOGIC_OP *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 000000ff *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 OPERATION *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 UNK0F90 *\/\n+\txf_emit(ctx, 2, 1);\t\t\/* 00000007 BLEND_EQUATION_RGB, ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK133C *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_RGB *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_ALPHA *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, magic2);\t\/* 001fffff tesla UNK0F78 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 tesla UNK12E4 *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000001 IBLEND_UNK00 *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_FUNC_SRC_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_FUNC_DST_RGB *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_FUNC_SRC_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_FUNC_DST_ALPHA *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 tesla UNK1140 *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 0000000f *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 000003ff *\/\n+\t} else if (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 2, 0);\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000007 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff *\/\n+\t\txf_emit(ctx, 2, 0);\t\/* 00000001 *\/\n \t} else {\n-\t\tif (dev_priv->chipset >= 0xa0)\n-\t\t\txf_emit(ctx, 0x1b, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0x15, 0);\n-\t}\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 1);\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000007 MULTISAMPLE_SAMPLES_LOG2 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 tesla UNK1430 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff tesla UNK1A3C *\/\n+\t}\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff CLEAR_COLOR *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff BLEND_COLOR A R G B *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000fff eng2d UNK2B0 *\/\n \tif (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 4, 0);\n-\telse\n-\t\txf_emit(ctx, 3, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 0x10, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 0x10, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 8, 1);\n-\t\txf_emit(ctx, 3, 0);\n-\t}\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x5b, 0);\n+\t\txf_emit(ctx, 2, 0);\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000003ff *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 00000001 BLEND_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK133C *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_RGB *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_ALPHA *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK19C0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f LOGIC_OP *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 UNK12E4? NVA3+ only? *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000001 IBLEND_UNK00 *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_RGB *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_FUNC_SRC_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_FUNC_DST_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_ALPHA *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_FUNC_SRC_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_FUNC_DST_ALPHA *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 tesla UNK15C4 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 tesla UNK1140 *\/\n+\t}\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 PATTERN_COLOR_FORMAT *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff PATTERN_MONO_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PATTERN_MONO_FORMAT *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff PATTERN_MONO_BITMAP *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 PATTERN_SELECT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff ROP *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff BETA1 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff BETA4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 OPERATION *\/\n+\txf_emit(ctx, 0x50, 0);\t\t\/* 10x ffffff, ffffff, ffffff, ffffff, 3 PATTERN *\/\n }\n \n static void\n-nv50_graph_construct_xfer_tp_x1(struct nouveau_grctx *ctx)\n+nv50_graph_construct_xfer_unk84xx(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n \tint magic3;\n-\tif (dev_priv->chipset == 0x50)\n+\tswitch (dev_priv->chipset) {\n+\tcase 0x50:\n \t\tmagic3 = 0x1000;\n-\telse if (dev_priv->chipset == 0x86 || dev_priv->chipset == 0x98 || dev_priv->chipset >= 0xa8)\n+\t\tbreak;\n+\tcase 0x86:\n+\tcase 0x98:\n+\tcase 0xa8:\n+\tcase 0xaa:\n+\tcase 0xac:\n+\tcase 0xaf:\n \t\tmagic3 = 0x1e00;\n+\t\tbreak;\n+\tdefault:\n+\t\tmagic3 = 0;\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff[NVA0+] VP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 111\/113[NVA0+] *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0x1f, 0);\t\/* ffffffff *\/\n+\telse if (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 0x0f, 0);\t\/* ffffffff *\/\n \telse\n-\t\tmagic3 = 0;\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 4);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0x24, 0);\n-\telse if (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 0x14, 0);\n+\t\txf_emit(ctx, 0x10, 0);\t\/* fffffff VP_RESULT_MAP_1 up *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* f\/1f[NVA3], fffffff\/ffffffff[NVA0+] *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_RESULT_MAP_SIZE *\/\n+\tif (dev_priv->chipset >= 0xa0)\n+\t\txf_emit(ctx, 1, 0x03020100);\t\/* ffffffff *\/\n \telse\n-\t\txf_emit(ctx, 0x15, 0);\n-\txf_emit(ctx, 2, 4);\n-\tif (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 1, 0x03020100);\n+\t\txf_emit(ctx, 1, 0x00608080);\t\/* fffffff VP_RESULT_MAP_0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 111\/113, 7f\/ff *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 0000ffff GP_VERTEX_OUTPUT_COUNT *\/\n+\tif (magic3)\n+\t\txf_emit(ctx, 1, magic3);\t\/* 00007fff tesla UNK141C *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 111\/113 *\/\n+\txf_emit(ctx, 0x1f, 0);\t\t\/* ffffffff GP_RESULT_MAP_1 up *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000001f *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 0x80);\t\t\/* 0000ffff GP_VERTEX_OUTPUT_COUNT *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0x03020100);\t\/* ffffffff GP_RESULT_MAP_0 *\/\n+\txf_emit(ctx, 1, 3);\t\t\/* 00000003 GP_OUTPUT_PRIMITIVE_TYPE *\/\n+\tif (magic3)\n+\t\txf_emit(ctx, 1, magic3);\t\/* 7fff tesla UNK141C *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PROVOKING_VERTEX_LAST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 111\/113 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 3);\t\t\/* 00000003 GP_OUTPUT_PRIMITIVE_TYPE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PROVOKING_VERTEX_LAST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK13A0 *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 7f\/ff VP_REG_ALLOC_RESULT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 111\/113 *\/\n+\tif (dev_priv->chipset == 0x94 || dev_priv->chipset == 0x96)\n+\t\txf_emit(ctx, 0x1020, 0);\t\/* 4 x (0x400 x 0xffffffff, ff, 0, 0, 0, 4 x ffffffff) *\/\n+\telse if (dev_priv->chipset < 0xa0)\n+\t\txf_emit(ctx, 0xa20, 0);\t\/* 4 x (0x280 x 0xffffffff, ff, 0, 0, 0, 4 x ffffffff) *\/\n+\telse if (!IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 0x210, 0);\t\/* ffffffff *\/\n \telse\n-\t\txf_emit(ctx, 1, 0x00608080);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 2, 4);\n-\txf_emit(ctx, 1, 0x80);\n-\tif (magic3)\n-\t\txf_emit(ctx, 1, magic3);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 0x24, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0x80);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0x03020100);\n-\txf_emit(ctx, 1, 3);\n-\tif (magic3)\n-\t\txf_emit(ctx, 1, magic3);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 4);\n-\tif (dev_priv->chipset == 0x94 || dev_priv->chipset == 0x96)\n-\t\txf_emit(ctx, 0x1024, 0);\n-\telse if (dev_priv->chipset < 0xa0)\n-\t\txf_emit(ctx, 0xa24, 0);\n-\telse if (dev_priv->chipset == 0xa0 || dev_priv->chipset >= 0xaa)\n-\t\txf_emit(ctx, 0x214, 0);\n-\telse\n-\t\txf_emit(ctx, 0x414, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 2, 0);\n+\t\txf_emit(ctx, 0x410, 0);\t\/* ffffffff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 000000ff GP_RESULT_MAP_SIZE *\/\n+\txf_emit(ctx, 1, 3);\t\t\/* 00000003 GP_OUTPUT_PRIMITIVE_TYPE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 PROVOKING_VERTEX_LAST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n }\n \n static void\n-nv50_graph_construct_xfer_tp_x2(struct nouveau_grctx *ctx)\n+nv50_graph_construct_xfer_tprop(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n \tint magic1, magic2;\n \tif (dev_priv->chipset == 0x50) {\n \t\tmagic1 = 0x3ff;\n \t\tmagic2 = 0x00003e60;\n-\t} else if (dev_priv->chipset <= 0xa0 || dev_priv->chipset >= 0xaa) {\n+\t} else if (!IS_NVA3F(dev_priv->chipset)) {\n \t\tmagic1 = 0x7ff;\n \t\tmagic2 = 0x001ffe67;\n \t} else {\n \t\tmagic1 = 0x7ff;\n \t\tmagic2 = 0x00087e67;\n \t}\n-\txf_emit(ctx, 3, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0xc, 0);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 0xb, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 4, 0xffff);\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 5, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 1, 3);\n-\t\txf_emit(ctx, 1, 0);\n-\t} else if (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0xa, 0);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 0x18, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 8, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 8, 1);\n-\t\txf_emit(ctx, 1, 0);\n-\t}\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 3, 0xcf);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0xa, 0);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 8, 1);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, magic2);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 2, 1);\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 ALPHA_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff ALPHA_TEST_REF *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 ALPHA_TEST_ENABLE *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000000f UNK16A0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_BACK_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_BACK_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 4, 0);\t\t\/* ffffffff BLEND_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK19C0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK0FDC *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff[NV50]\/3ff[NV84+] *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 4, 0xffff);\t\/* 0000ffff MSAA_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 3, 0);\t\t\/* 00000007 STENCIL_FRONT_OP_FAIL, ZFAIL, ZPASS *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_BACK_ENABLE *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 00007fff WINDOW_OFFSET_XY *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK19CC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff COLOR_KEY *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 COLOR_KEY_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 COLOR_KEY_FORMAT *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffffffff SIFC_BITMAP_COLOR *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 SIFC_BITMAP_WRITE_BIT0_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 ALPHA_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 ALPHA_TEST_ENABLE *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 3);\t\/* 00000003 tesla UNK16B4 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 tesla UNK1298 *\/\n+\t} else if (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 1, 1);\t\/* 00000001 tesla UNK16B4 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t} else {\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 MULTISAMPLE_CTRL *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 00000001 BLEND_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_ALPHA *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_RGB *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_RGB *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 UNK12E4 *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000007 IBLEND_EQUATION_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 00000001 IBLEND_UNK00 *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_SRC_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_DST_RGB *\/\n+\t\txf_emit(ctx, 8, 2);\t\/* 0000001f IBLEND_SRC_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\/* 0000001f IBLEND_DST_ALPHA *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 UNK1140 *\/\n+\t}\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK133C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 UNK0F90 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 FRAMEBUFFER_SRGB *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7 *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 OPERATION *\/\n+\txf_emit(ctx, 1, 0xcf);\t\t\/* 000000ff SIFC_FORMAT *\/\n+\txf_emit(ctx, 1, 0xcf);\t\t\/* 000000ff DRAW_COLOR_FORMAT *\/\n+\txf_emit(ctx, 1, 0xcf);\t\t\/* 000000ff SRC_FORMAT *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f[NVA3] MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 00000001 BLEND_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_ALPHA *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0000001f BLEND_FUNC_DST_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000007 BLEND_EQUATION_RGB *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 0000001f BLEND_FUNC_SRC_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK133C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 8, 1);\t\t\/* 00000001 UNK19E0 *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, magic2);\t\/* 001fffff tesla UNK0F78 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\tif(dev_priv->chipset == 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\/* ff *\/\n \telse\n-\t\txf_emit(ctx, 1, 1);\n-\tif(dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 1, 0);\n-\telse\n-\t\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 5, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, magic1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 0x28, 0);\n-\txf_emit(ctx, 8, 8);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 8, 0x400);\n-\txf_emit(ctx, 8, 0x300);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x20);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 0x100);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x40);\n-\txf_emit(ctx, 1, 0x100);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 4, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, magic2);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 9, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x400);\n-\txf_emit(ctx, 1, 0x300);\n-\txf_emit(ctx, 1, 0x1001);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 4, 0);\n-\telse\n-\t\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 1, 0xf);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 0x15, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 3, 0);\n-\t} else\n-\t\txf_emit(ctx, 0x17, 0);\n+\t\txf_emit(ctx, 3, 0);\t\/* 1, 7, 3ff *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 UNK0F90 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_DU_DX_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff BLIT_DU_DX_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000fffff BLIT_DV_DY_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 0001ffff BLIT_DV_DY_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, magic1);\t\/* 3ff\/7ff tesla UNK0D68 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 0000ffff DMA_COLOR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_GLOBAL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_LOCAL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_STACK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_DST *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 000000ff RT_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* ffffffff RT_LAYER_STRIDE *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* ffffffff RT_ADDRESS_LOW *\/\n+\txf_emit(ctx, 8, 8);\t\t\/* 0000007f RT_TILE_MODE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 8, 0x400);\t\t\/* 0fffffff RT_HORIZ *\/\n+\txf_emit(ctx, 8, 0x300);\t\t\/* 0000ffff RT_VERT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00001fff RT_ARRAY_MODE *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, 0x20);\t\t\/* 00000fff DST_TILE_MODE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* 0001ffff DST_HEIGHT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000007ff DST_LAYER *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 DST_LINEAR *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff DST_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff DST_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0x40);\t\t\/* 0007ffff DST_PITCH *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* 0001ffff DST_WIDTH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff *\/\n+\txf_emit(ctx, 1, 3);\t\t\/* 00000003 tesla UNK15AC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 UNK0F90 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 1, magic2);\t\/* 001fffff tesla UNK0F78 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 2);\t\t\/* 00000003 tesla UNK143C *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_ZETA *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* ffff, ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0001ffff GP_BUILTIN_RESULT_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff STENCIL_FRONT_MASK *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff ZETA_LAYER_STRIDE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 000000ff ZETA_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff ZETA_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 ZETA_TILE_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\txf_emit(ctx, 1, 0x400);\t\t\/* 0fffffff ZETA_HORIZ *\/\n+\txf_emit(ctx, 1, 0x300);\t\t\/* 0000ffff ZETA_VERT *\/\n+\txf_emit(ctx, 1, 0x1001);\t\/* 00001fff ZETA_ARRAY_MODE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 3f\/7f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0x0fac6881);\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0xf);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 7, 0);\t\t\/* 0000000f COLOR_MASK *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 8, 0);\t\t\/* 00000001 BLEND_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 UNK0F90 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 FRAMEBUFFER_SRGB *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 UNK1140 *\/\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n \tif (dev_priv->chipset >= 0xa0)\n-\t\txf_emit(ctx, 1, 0x0fac6881);\n-\txf_emit(ctx, 1, magic2);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 3, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 2, 1);\n-\telse\n-\t\txf_emit(ctx, 1, 1);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 2, 0);\n-\telse if (dev_priv->chipset != 0x50)\n-\t\txf_emit(ctx, 1, 0);\n+\t\txf_emit(ctx, 1, 0x0fac6881);\t\/* fffffff *\/\n+\txf_emit(ctx, 1, magic2);\t\/* 001fffff tesla UNK0F78 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_BOUNDS_EN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK0FB0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 4);\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 STENCIL_FRONT_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK15B4 *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK19CC *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 SAMPLECNT_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000000f ZETA_FORMAT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 ZETA_ENABLE *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 0000000f tesla UNK15C8 *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A3C *\/\n+\tif (dev_priv->chipset >= 0xa0) {\n+\t\txf_emit(ctx, 3, 0);\t\t\/* 7\/f, 1, ffff0ff3 *\/\n+\t\txf_emit(ctx, 1, 0xfac6881);\t\/* fffffff *\/\n+\t\txf_emit(ctx, 4, 0);\t\t\/* 1, 1, 1, 3ff *\/\n+\t\txf_emit(ctx, 1, 4);\t\t\/* 7 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 1 *\/\n+\t\txf_emit(ctx, 2, 1);\t\t\/* 1 *\/\n+\t\txf_emit(ctx, 2, 0);\t\t\/* 7, f *\/\n+\t\txf_emit(ctx, 1, 1);\t\t\/* 1 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 7\/f *\/\n+\t\tif (IS_NVA3F(dev_priv->chipset))\n+\t\t\txf_emit(ctx, 0x9, 0);\t\/* 1 *\/\n+\t\telse\n+\t\t\txf_emit(ctx, 0x8, 0);\t\/* 1 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 1 *\/\n+\t\txf_emit(ctx, 1, 0x11);\t\t\/* 7f *\/\n+\t\txf_emit(ctx, 7, 0);\t\t\/* 7f *\/\n+\t\txf_emit(ctx, 1, 0xfac6881);\t\/* fffffff *\/\n+\t\txf_emit(ctx, 1, 0xf);\t\t\/* f *\/\n+\t\txf_emit(ctx, 7, 0);\t\t\/* f *\/\n+\t\txf_emit(ctx, 1, 0x11);\t\t\/* 7f *\/\n+\t\txf_emit(ctx, 1, 1);\t\t\/* 1 *\/\n+\t\txf_emit(ctx, 5, 0);\t\t\/* 1, 7, 3ff, 3, 7 *\/\n+\t\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\t\txf_emit(ctx, 1, 0);\t\/* 00000001 UNK1140 *\/\n+\t\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\t\t}\n+\t}\n }\n \n static void\n-nv50_graph_construct_xfer_tp_x3(struct nouveau_grctx *ctx)\n+nv50_graph_construct_xfer_tex(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n+\txf_emit(ctx, 2, 0);\t\t\/* 1 LINKED_TSC. yes, 2. *\/\n+\tif (dev_priv->chipset != 0x50)\n+\t\txf_emit(ctx, 1, 0);\t\/* 3 *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 1ffff BLIT_DU_DX_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* fffff BLIT_DU_DX_FRACT *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 1ffff BLIT_DV_DY_INT *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* fffff BLIT_DV_DY_FRACT *\/\n \tif (dev_priv->chipset == 0x50)\n-\t\txf_emit(ctx, 2, 0);\n+\t\txf_emit(ctx, 1, 0);\t\/* 3 BLIT_CONTROL *\/\n \telse\n-\t\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0x2a712488);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x4085c000);\n-\txf_emit(ctx, 1, 0x40);\n-\txf_emit(ctx, 1, 0x100);\n-\txf_emit(ctx, 1, 0x10100);\n-\txf_emit(ctx, 1, 0x02800000);\n+\t\txf_emit(ctx, 2, 0);\t\/* 3ff, 1 *\/\n+\txf_emit(ctx, 1, 0x2a712488);\t\/* ffffffff SRC_TIC_0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff SRC_TIC_1 *\/\n+\txf_emit(ctx, 1, 0x4085c000);\t\/* ffffffff SRC_TIC_2 *\/\n+\txf_emit(ctx, 1, 0x40);\t\t\/* ffffffff SRC_TIC_3 *\/\n+\txf_emit(ctx, 1, 0x100);\t\t\/* ffffffff SRC_TIC_4 *\/\n+\txf_emit(ctx, 1, 0x10100);\t\/* ffffffff SRC_TIC_5 *\/\n+\txf_emit(ctx, 1, 0x02800000);\t\/* ffffffff SRC_TIC_6 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff SRC_TIC_7 *\/\n+\tif (dev_priv->chipset == 0x50) {\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 turing UNK358 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff tesla UNK1A34? *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 turing UNK37C tesla UNK1690 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 BLIT_CONTROL *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000001 turing UNK32C tesla UNK0F94 *\/\n+\t} else if (!IS_NVAAF(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 0);\t\/* ffffffff tesla UNK1A34? *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 000003ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 000003ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 tesla UNK1664 \/ turing UNK03E8 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 00000003 *\/\n+\t\txf_emit(ctx, 1, 0);\t\/* 000003ff *\/\n+\t} else {\n+\t\txf_emit(ctx, 0x6, 0);\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A34 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_TEXTURE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 0000ffff DMA_SRC *\/\n }\n \n static void\n-nv50_graph_construct_xfer_tp_x4(struct nouveau_grctx *ctx)\n+nv50_graph_construct_xfer_unk8cxx(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\txf_emit(ctx, 2, 0x04e3bfdf);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x00ffff00);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 2, 1);\n-\telse\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 0x00ffff00);\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0x30201000);\n-\txf_emit(ctx, 1, 0x70605040);\n-\txf_emit(ctx, 1, 0xb8a89888);\n-\txf_emit(ctx, 1, 0xf8e8d8c8);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x1a);\n-}\n-\n-static void\n-nv50_graph_construct_xfer_tp_x5(struct nouveau_grctx *ctx)\n-{\n-\tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 0xfac6881);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 2, 0);\n-\txf_emit(ctx, 1, 1);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 0xb, 0);\n-\telse\n-\t\txf_emit(ctx, 0xa, 0);\n-\txf_emit(ctx, 8, 1);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0xfac6881);\n-\txf_emit(ctx, 1, 0xf);\n-\txf_emit(ctx, 7, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 1);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 6, 0);\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 6, 0);\n-\t} else {\n-\t\txf_emit(ctx, 0xb, 0);\n-\t}\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 2, 0);\t\t\/* 7, ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE *\/\n+\txf_emit(ctx, 1, 0x04e3bfdf);\t\/* ffffffff UNK0D64 *\/\n+\txf_emit(ctx, 1, 0x04e3bfdf);\t\/* ffffffff UNK0DF4 *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK15B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x00ffff00);\t\/* 00ffffff LINE_STIPPLE_PATTERN *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK0F98 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK1668 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_STIPPLE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x00ffff00);\t\/* 00ffffff LINE_STIPPLE_PATTERN *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POLYGON_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 tesla UNK1658 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINE_SMOOTH_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* ffff0ff3 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 DEPTH_WRITE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 UNK15B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 POINT_SPRITE_ENABLE *\/\n+\txf_emit(ctx, 1, 1);\t\t\/* 00000001 tesla UNK165C *\/\n+\txf_emit(ctx, 1, 0x30201000);\t\/* ffffffff tesla UNK1670 *\/\n+\txf_emit(ctx, 1, 0x70605040);\t\/* ffffffff tesla UNK1670 *\/\n+\txf_emit(ctx, 1, 0xb8a89888);\t\/* ffffffff tesla UNK1670 *\/\n+\txf_emit(ctx, 1, 0xf8e8d8c8);\t\/* ffffffff tesla UNK1670 *\/\n+\txf_emit(ctx, 1, 0);\t\t\/* 00000001 VERTEX_TWO_SIDE_ENABLE *\/\n+\txf_emit(ctx, 1, 0x1a);\t\t\/* 0000001f POLYGON_MODE *\/\n }\n \n static void\n@@ -2193,108 +3102,136 @@\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n \tif (dev_priv->chipset < 0xa0) {\n-\t\tnv50_graph_construct_xfer_tp_x1(ctx);\n-\t\tnv50_graph_construct_xfer_tp_x2(ctx);\n-\t\tnv50_graph_construct_xfer_tp_x3(ctx);\n-\t\tif (dev_priv->chipset == 0x50)\n-\t\t\txf_emit(ctx, 0xf, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0x12, 0);\n-\t\tnv50_graph_construct_xfer_tp_x4(ctx);\n+\t\tnv50_graph_construct_xfer_unk84xx(ctx);\n+\t\tnv50_graph_construct_xfer_tprop(ctx);\n+\t\tnv50_graph_construct_xfer_tex(ctx);\n+\t\tnv50_graph_construct_xfer_unk8cxx(ctx);\n \t} else {\n-\t\tnv50_graph_construct_xfer_tp_x3(ctx);\n-\t\tif (dev_priv->chipset < 0xaa)\n-\t\t\txf_emit(ctx, 0xc, 0);\n-\t\telse\n-\t\t\txf_emit(ctx, 0xa, 0);\n-\t\tnv50_graph_construct_xfer_tp_x2(ctx);\n-\t\tnv50_graph_construct_xfer_tp_x5(ctx);\n-\t\tnv50_graph_construct_xfer_tp_x4(ctx);\n-\t\tnv50_graph_construct_xfer_tp_x1(ctx);\n+\t\tnv50_graph_construct_xfer_tex(ctx);\n+\t\tnv50_graph_construct_xfer_tprop(ctx);\n+\t\tnv50_graph_construct_xfer_unk8cxx(ctx);\n+\t\tnv50_graph_construct_xfer_unk84xx(ctx);\n \t}\n }\n \n static void\n-nv50_graph_construct_xfer_tp2(struct nouveau_grctx *ctx)\n+nv50_graph_construct_xfer_mpc(struct nouveau_grctx *ctx)\n {\n \tstruct drm_nouveau_private *dev_priv = ctx->dev->dev_private;\n-\tint i, mpcnt;\n-\tif (dev_priv->chipset == 0x98 || dev_priv->chipset == 0xaa)\n-\t\tmpcnt = 1;\n-\telse if (dev_priv->chipset < 0xa0 || dev_priv->chipset >= 0xa8)\n-\t\tmpcnt = 2;\n-\telse\n-\t\tmpcnt = 3;\n+\tint i, mpcnt = 2;\n+\tswitch (dev_priv->chipset) {\n+\t\tcase 0x98:\n+\t\tcase 0xaa:\n+\t\t\tmpcnt = 1;\n+\t\t\tbreak;\n+\t\tcase 0x50:\n+\t\tcase 0x84:\n+\t\tcase 0x86:\n+\t\tcase 0x92:\n+\t\tcase 0x94:\n+\t\tcase 0x96:\n+\t\tcase 0xa8:\n+\t\tcase 0xac:\n+\t\t\tmpcnt = 2;\n+\t\t\tbreak;\n+\t\tcase 0xa0:\n+\t\tcase 0xa3:\n+\t\tcase 0xa5:\n+\t\tcase 0xaf:\n+\t\t\tmpcnt = 3;\n+\t\t\tbreak;\n+\t}\n \tfor (i = 0; i < mpcnt; i++) {\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 1, 0x80);\n-\t\txf_emit(ctx, 1, 0x80007004);\n-\t\txf_emit(ctx, 1, 0x04000400);\n+\t\txf_emit(ctx, 1, 0);\t\t\/* ff *\/\n+\t\txf_emit(ctx, 1, 0x80);\t\t\/* ffffffff tesla UNK1404 *\/\n+\t\txf_emit(ctx, 1, 0x80007004);\t\/* ffffffff tesla UNK12B0 *\/\n+\t\txf_emit(ctx, 1, 0x04000400);\t\/* ffffffff *\/\n \t\tif (dev_priv->chipset >= 0xa0)\n-\t\t\txf_emit(ctx, 1, 0xc0);\n-\t\txf_emit(ctx, 1, 0x1000);\n-\t\txf_emit(ctx, 2, 0);\n-\t\tif (dev_priv->chipset == 0x86 || dev_priv->chipset == 0x98 || dev_priv->chipset >= 0xa8) {\n-\t\t\txf_emit(ctx, 1, 0xe00);\n-\t\t\txf_emit(ctx, 1, 0x1e00);\n+\t\t\txf_emit(ctx, 1, 0xc0);\t\/* 00007fff tesla UNK152C *\/\n+\t\txf_emit(ctx, 1, 0x1000);\t\/* 0000ffff tesla UNK0D60 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* ff\/3ff *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* ffffffff tesla UNK1A30 *\/\n+\t\tif (dev_priv->chipset == 0x86 || dev_priv->chipset == 0x98 || dev_priv->chipset == 0xa8 || IS_NVAAF(dev_priv->chipset)) {\n+\t\t\txf_emit(ctx, 1, 0xe00);\t\t\/* 7fff *\/\n+\t\t\txf_emit(ctx, 1, 0x1e00);\t\/* 7fff *\/\n \t\t}\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 2, 0);\n+\t\txf_emit(ctx, 1, 1);\t\t\/* 000000ff VP_REG_ALLOC_TEMP *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 LINKED_TSC *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n \t\tif (dev_priv->chipset == 0x50)\n-\t\t\txf_emit(ctx, 2, 0x1000);\n-\t\txf_emit(ctx, 1, 1);\n-\t\txf_emit(ctx, 1, 0);\n-\t\txf_emit(ctx, 1, 4);\n-\t\txf_emit(ctx, 1, 2);\n-\t\tif (dev_priv->chipset >= 0xaa)\n-\t\t\txf_emit(ctx, 0xb, 0);\n+\t\t\txf_emit(ctx, 2, 0x1000);\t\/* 7fff tesla UNK141C *\/\n+\t\txf_emit(ctx, 1, 1);\t\t\/* 000000ff GP_REG_ALLOC_TEMP *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 GP_ENABLE *\/\n+\t\txf_emit(ctx, 1, 4);\t\t\/* 000000ff FP_REG_ALLOC_TEMP *\/\n+\t\txf_emit(ctx, 1, 2);\t\t\/* 00000003 REG_MODE *\/\n+\t\tif (IS_NVAAF(dev_priv->chipset))\n+\t\t\txf_emit(ctx, 0xb, 0);\t\/* RO *\/\n \t\telse if (dev_priv->chipset >= 0xa0)\n-\t\t\txf_emit(ctx, 0xc, 0);\n+\t\t\txf_emit(ctx, 0xc, 0);\t\/* RO *\/\n \t\telse\n-\t\t\txf_emit(ctx, 0xa, 0);\n-\t}\n-\txf_emit(ctx, 1, 0x08100c12);\n-\txf_emit(ctx, 1, 0);\n+\t\t\txf_emit(ctx, 0xa, 0);\t\/* RO *\/\n+\t}\n+\txf_emit(ctx, 1, 0x08100c12);\t\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ff\/3ff *\/\n \tif (dev_priv->chipset >= 0xa0) {\n-\t\txf_emit(ctx, 1, 0x1fe21);\n-\t}\n-\txf_emit(ctx, 5, 0);\n-\txf_emit(ctx, 4, 0xffff);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 2, 0x10001);\n-\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 0x1fe21);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 1);\n-\txf_emit(ctx, 4, 0);\n-\txf_emit(ctx, 1, 0x08100c12);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 8, 0);\n-\txf_emit(ctx, 1, 0xfac6881);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa)\n-\t\txf_emit(ctx, 1, 3);\n-\txf_emit(ctx, 3, 0);\n-\txf_emit(ctx, 1, 4);\n-\txf_emit(ctx, 9, 0);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 2, 1);\n-\txf_emit(ctx, 1, 2);\n-\txf_emit(ctx, 3, 1);\n-\txf_emit(ctx, 1, 0);\n-\tif (dev_priv->chipset > 0xa0 && dev_priv->chipset < 0xaa) {\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 0x10, 1);\n-\t\txf_emit(ctx, 8, 2);\n-\t\txf_emit(ctx, 0x18, 1);\n-\t\txf_emit(ctx, 3, 0);\n-\t}\n-\txf_emit(ctx, 1, 4);\n+\t\txf_emit(ctx, 1, 0x1fe21);\t\/* 0003ffff tesla UNK0FAC *\/\n+\t}\n+\txf_emit(ctx, 3, 0);\t\t\t\/* 7fff, 0, 0 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 tesla UNK1534 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 7\/f MULTISAMPLE_SAMPLES_LOG2 *\/\n+\txf_emit(ctx, 4, 0xffff);\t\t\/* 0000ffff MSAA_MASK *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 LANES32 *\/\n+\txf_emit(ctx, 1, 0x10001);\t\t\/* 00ffffff BLOCK_ALLOC *\/\n+\txf_emit(ctx, 1, 0x10001);\t\t\/* ffffffff BLOCKDIM_XY *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 0000ffff BLOCKDIM_Z *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff SHARED_SIZE *\/\n+\txf_emit(ctx, 1, 0x1fe21);\t\t\/* 1ffff\/3ffff[NVA0+] tesla UNk0FAC *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff tesla UNK1A34 *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 1);\t\t\/* 0000001f tesla UNK169C *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ff\/3ff *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 1 LINKED_TSC *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ff FP_ADDRESS_HIGH *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* ffffffff FP_ADDRESS_LOW *\/\n+\txf_emit(ctx, 1, 0x08100c12);\t\t\/* 1fffffff FP_INTERPOLANT_CTRL *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 00000007 FP_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 000000ff FRAG_COLOR_CLAMP_EN *\/\n+\txf_emit(ctx, 1, 2);\t\t\t\/* 00000003 REG_MODE *\/\n+\txf_emit(ctx, 1, 0x11);\t\t\t\/* 0000007f RT_FORMAT *\/\n+\txf_emit(ctx, 7, 0);\t\t\t\/* 0000007f RT_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000007 *\/\n+\txf_emit(ctx, 1, 0xfac6881);\t\t\/* 0fffffff RT_CONTROL *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000003 MULTISAMPLE_CTRL *\/\n+\tif (IS_NVA3F(dev_priv->chipset))\n+\t\txf_emit(ctx, 1, 3);\t\t\/* 00000003 tesla UNK16B4 *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 ALPHA_TEST_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000007 ALPHA_TEST_FUNC *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 FRAMEBUFFER_SRGB *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* ffffffff tesla UNK1400 *\/\n+\txf_emit(ctx, 8, 0);\t\t\t\/* 00000001 BLEND_ENABLE *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000001 LOGIC_OP_ENABLE *\/\n+\txf_emit(ctx, 1, 2);\t\t\t\/* 0000001f BLEND_FUNC_SRC_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 0000001f BLEND_FUNC_DST_RGB *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000007 BLEND_EQUATION_RGB *\/\n+\txf_emit(ctx, 1, 2);\t\t\t\/* 0000001f BLEND_FUNC_SRC_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 0000001f BLEND_FUNC_DST_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000007 BLEND_EQUATION_ALPHA *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 00000001 UNK133C *\/\n+\tif (IS_NVA3F(dev_priv->chipset)) {\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK12E4 *\/\n+\t\txf_emit(ctx, 8, 2);\t\t\/* 0000001f IBLEND_FUNC_SRC_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 0000001f IBLEND_FUNC_DST_RGB *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 00000007 IBLEND_EQUATION_RGB *\/\n+\t\txf_emit(ctx, 8, 2);\t\t\/* 0000001f IBLEND_FUNC_SRC_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 0000001f IBLEND_FUNC_DST_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 00000007 IBLEND_EQUATION_ALPHA *\/\n+\t\txf_emit(ctx, 8, 1);\t\t\/* 00000001 IBLEND_UNK00 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000003 tesla UNK1928 *\/\n+\t\txf_emit(ctx, 1, 0);\t\t\/* 00000001 UNK1140 *\/\n+\t}\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 00000003 tesla UNK0F90 *\/\n+\txf_emit(ctx, 1, 4);\t\t\t\/* 000000ff FP_RESULT_COUNT *\/\n+\t\/* XXX: demagic this part some day *\/\n \tif (dev_priv->chipset == 0x50)\n \t\txf_emit(ctx, 0x3a0, 0);\n \telse if (dev_priv->chipset < 0x94)\n@@ -2303,9 +3240,9 @@\n \t\txf_emit(ctx, 0x39f, 0);\n \telse\n \t\txf_emit(ctx, 0x3a3, 0);\n-\txf_emit(ctx, 1, 0x11);\n-\txf_emit(ctx, 1, 0);\n-\txf_emit(ctx, 1, 1);\n+\txf_emit(ctx, 1, 0x11);\t\t\t\/* 3f\/7f DST_FORMAT *\/\n+\txf_emit(ctx, 1, 0);\t\t\t\/* 7 OPERATION *\/\n+\txf_emit(ctx, 1, 1);\t\t\t\/* 1 DST_LINEAR *\/\n \txf_emit(ctx, 0x2d, 0);\n }\n \n@@ -2323,52 +3260,56 @@\n \tif (dev_priv->chipset < 0xa0) {\n \t\tfor (i = 0; i < 8; i++) {\n \t\t\tctx->ctxvals_pos = offset + i;\n+\t\t\t\/* that little bugger belongs to csched. No idea\n+\t\t\t * what it's doing here. *\/\n \t\t\tif (i == 0)\n-\t\t\t\txf_emit(ctx, 1, 0x08100c12);\n+\t\t\t\txf_emit(ctx, 1, 0x08100c12); \/* FP_INTERPOLANT_CTRL *\/\n \t\t\tif (units & (1 << i))\n-\t\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \t\t}\n \t} else {\n \t\t\/* Strand 0: TPs 0, 1 *\/\n \t\tctx->ctxvals_pos = offset;\n-\t\txf_emit(ctx, 1, 0x08100c12);\n+\t\t\/* that little bugger belongs to csched. No idea\n+\t\t * what it's doing here. *\/\n+\t\txf_emit(ctx, 1, 0x08100c12); \/* FP_INTERPOLANT_CTRL *\/\n \t\tif (units & (1 << 0))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 1))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n-\t\t\/* Strand 0: TPs 2, 3 *\/\n+\t\t\/* Strand 1: TPs 2, 3 *\/\n \t\tctx->ctxvals_pos = offset + 1;\n \t\tif (units & (1 << 2))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 3))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n-\t\t\/* Strand 0: TPs 4, 5, 6 *\/\n+\t\t\/* Strand 2: TPs 4, 5, 6 *\/\n \t\tctx->ctxvals_pos = offset + 2;\n \t\tif (units & (1 << 4))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 5))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 6))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \n-\t\t\/* Strand 0: TPs 7, 8, 9 *\/\n+\t\t\/* Strand 3: TPs 7, 8, 9 *\/\n \t\tctx->ctxvals_pos = offset + 3;\n \t\tif (units & (1 << 7))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 8))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif (units & (1 << 9))\n-\t\t\tnv50_graph_construct_xfer_tp2(ctx);\n+\t\t\tnv50_graph_construct_xfer_mpc(ctx);\n \t\tif ((ctx->ctxvals_pos-offset)\/8 > size)\n \t\t\tsize = (ctx->ctxvals_pos-offset)\/8;\n \t}\n"} {"commit":"97bfd0acd32e9639c9136e03955d574655d5cc2b","subject":"drm\/radeon\/kms: add wait idle ioctl for eg->cayman","message":"drm\/radeon\/kms: add wait idle ioctl for eg->cayman\n\nNone of the latest GPUs had this hooked up, this is necessary for\ncorrect operation in a lot of cases, however we should test this on a few\nGPUs in these families as we've had problems in this area before.\n\nReviewed-by: Alex Deucher <bf84f557a1e54fd62cd73c6847f7d9df60e9fbef@gmail.com>\ncc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/radeon_asic.c\n+++ drivers\/gpu\/drm\/radeon\/radeon_asic.c\n@@ -782,6 +782,7 @@\n \t.hpd_fini = &evergreen_hpd_fini,\n \t.hpd_sense = &evergreen_hpd_sense,\n \t.hpd_set_polarity = &evergreen_hpd_set_polarity,\n+\t.ioctl_wait_idle = r600_ioctl_wait_idle,\n \t.gui_idle = &r600_gui_idle,\n \t.pm_misc = &evergreen_pm_misc,\n \t.pm_prepare = &evergreen_pm_prepare,\n@@ -828,6 +829,7 @@\n \t.hpd_fini = &evergreen_hpd_fini,\n \t.hpd_sense = &evergreen_hpd_sense,\n \t.hpd_set_polarity = &evergreen_hpd_set_polarity,\n+\t.ioctl_wait_idle = r600_ioctl_wait_idle,\n \t.gui_idle = &r600_gui_idle,\n \t.pm_misc = &evergreen_pm_misc,\n \t.pm_prepare = &evergreen_pm_prepare,\n@@ -874,6 +876,7 @@\n \t.hpd_fini = &evergreen_hpd_fini,\n \t.hpd_sense = &evergreen_hpd_sense,\n \t.hpd_set_polarity = &evergreen_hpd_set_polarity,\n+\t.ioctl_wait_idle = r600_ioctl_wait_idle,\n \t.gui_idle = &r600_gui_idle,\n \t.pm_misc = &evergreen_pm_misc,\n \t.pm_prepare = &evergreen_pm_prepare,\n@@ -920,6 +923,7 @@\n \t.hpd_fini = &evergreen_hpd_fini,\n \t.hpd_sense = &evergreen_hpd_sense,\n \t.hpd_set_polarity = &evergreen_hpd_set_polarity,\n+\t.ioctl_wait_idle = r600_ioctl_wait_idle,\n \t.gui_idle = &r600_gui_idle,\n \t.pm_misc = &evergreen_pm_misc,\n \t.pm_prepare = &evergreen_pm_prepare,\n"} {"commit":"d54fbd49efe5c75bc7cf963bf065aef3fd22417a","subject":"drm\/radeon: silence out possible lock dependency warning","message":"drm\/radeon: silence out possible lock dependency warning\n\nSilence out the lock dependency warning by moving bo allocation out\nof ib mutex protected section. Might lead to useless temporary\nallocation but it's not harmful as such things only happen at\ninitialization.\n\nSigned-off-by: Jerome Glisse <0620d428a1bd3756b1319066bf466b3b8be0b2b2@redhat.com>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/radeon_ring.c\n+++ drivers\/gpu\/drm\/radeon\/radeon_ring.c\n@@ -204,22 +204,25 @@\n \n int radeon_ib_pool_init(struct radeon_device *rdev)\n {\n+\tstruct radeon_sa_manager tmp;\n \tint i, r;\n+\n+\tr = radeon_sa_bo_manager_init(rdev, &tmp,\n+\t\t\t\t RADEON_IB_POOL_SIZE*64*1024,\n+\t\t\t\t RADEON_GEM_DOMAIN_GTT);\n+\tif (r) {\n+\t\treturn r;\n+\t}\n \n \tmutex_lock(&rdev->ib_pool.mutex);\n \tif (rdev->ib_pool.ready) {\n \t\tmutex_unlock(&rdev->ib_pool.mutex);\n+\t\tradeon_sa_bo_manager_fini(rdev, &tmp);\n \t\treturn 0;\n \t}\n \n-\tr = radeon_sa_bo_manager_init(rdev, &rdev->ib_pool.sa_manager,\n-\t\t\t\t RADEON_IB_POOL_SIZE*64*1024,\n-\t\t\t\t RADEON_GEM_DOMAIN_GTT);\n-\tif (r) {\n-\t\tmutex_unlock(&rdev->ib_pool.mutex);\n-\t\treturn r;\n-\t}\n-\n+\trdev->ib_pool.sa_manager = tmp;\n+\tINIT_LIST_HEAD(&rdev->ib_pool.sa_manager.sa_bo);\n \tfor (i = 0; i < RADEON_IB_POOL_SIZE; i++) {\n \t\trdev->ib_pool.ibs[i].fence = NULL;\n \t\trdev->ib_pool.ibs[i].idx = i;\n"} {"commit":"819677073734b8c42b31b860b6585639c291213d","subject":"drivers: ieee802154: propagate frame counter to upper layer","message":"drivers: ieee802154: propagate frame counter to upper layer\n\nWhen frame counter is managed by the radio driver the upper layer\nneeds to be informed about the frame counter changed. The upper layer\nlooks for the most recent frame counter in the transmitted frame,\nthis is why the tx_payload need to be updated after processed by\nthe radio driver.\n\nSigned-off-by: Lukasz Maciejonczyk <12a52743b42a5ad3dc4d3a6e4f8a76d0ad7c6806@nordicsemi.no>\n","repos":"galak\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ieee802154\/ieee802154_nrf5.c\n+++ drivers\/ieee802154\/ieee802154_nrf5.c\n@@ -520,6 +520,20 @@\n \tk_sem_take(&nrf5_radio->tx_wait, K_FOREVER);\n \n \tLOG_DBG(\"Result: %d\", nrf5_data.tx_result);\n+\n+#if NRF_802154_ENCRYPTION_ENABLED\n+\t\/*\n+\t * When frame encryption by the radio driver is enabled, the frame stored in\n+\t * the tx_psdu buffer is:\n+\t * 1) authenticated and encrypted in place which causes that after an unsuccessful\n+\t * TX attempt, this frame must be propagated back to the upper layer for retransmission.\n+\t * The upper layer must ensure that the exact same secured frame is used for\n+\t * retransmission\n+\t * 2) frame counters are updated in place and for keeping the link frame counter up to date,\n+\t * this information must be propagated back to the upper layer\n+\t *\/\n+\tmemcpy(payload, nrf5_radio->tx_psdu + 1, payload_len);\n+#endif\n \n \tswitch (nrf5_radio->tx_result) {\n \tcase NRF_802154_TX_ERROR_NONE:\n@@ -543,18 +557,6 @@\n \t\tresult = -EIO;\n \t}\n \n-#if NRF_802154_ENCRYPTION_ENABLED\n-\t\/*\n-\t * When frame encryption by the radio driver is enabled,\n-\t * the frame stored in the tx_psdu buffer is authenticated\n-\t * and encrypted in place. After an unsuccessful TX attempt,\n-\t * this frame must be propagated back to the upper layer\n-\t * for retransmission. The upper layer must ensure that the\n-\t * excact same secured frame is used for retransmission.\n-\t *\/\n-\tmemcpy(payload, nrf5_radio->tx_psdu + 1, payload_len);\n-#endif\n-\n \treturn result;\n }\n \n"} {"commit":"27d56300647f6e76847bc2407d7abc782fe87495","subject":"IB\/uverbs: Fix query QP return of sq_sig_all","message":"IB\/uverbs: Fix query QP return of sq_sig_all\n\nThe old code didn't convert from the kernel's enum correctly.\n\nSigned-off-by: Dotan Barak <b3b47477f528a5bde0a5a6bab57b60b3c423571a@mellanox.co.il>\nSigned-off-by: Roland Dreier <91e9b5f7ca0bb6300133ed378670d64af90dde66@cisco.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/infiniband\/core\/uverbs_cmd.c\n+++ drivers\/infiniband\/core\/uverbs_cmd.c\n@@ -1084,7 +1084,7 @@\n \tresp.max_send_sge = init_attr->cap.max_send_sge;\n \tresp.max_recv_sge = init_attr->cap.max_recv_sge;\n \tresp.max_inline_data = init_attr->cap.max_inline_data;\n-\tresp.sq_sig_all = !!init_attr->sq_sig_type;\n+\tresp.sq_sig_all = init_attr->sq_sig_type == IB_SIGNAL_ALL_WR;\n \n \tif (copy_to_user((void __user *) (unsigned long) cmd.response,\n \t\t\t &resp, sizeof resp))\n"} {"commit":"77b071e7931dd762563ac74e3e448b2aef23ad2f","subject":"Input: smtpe-ts - wait 50mS until polling for pen-up","message":"Input: smtpe-ts - wait 50mS until polling for pen-up\n\nWait a little bit longer, 50mS instead of 20mS, until the driver starts\npolling for pen-up. The problematic behavior before this patch is applied\nis as follows. The behavior was observed on the STMPE610QTR controller.\n\nUpon a physical pen-down event, the touchscreen reports one set of x-y-p\ncoordinates and a pen-down event. After that, the pen-up polling is\ntriggered and since the controller is not ready yet, the polling mistakenly\ndetects a pen-up event while the physical state is still such that the pen\nis down on the touch surface.\n\nThe pen-up handling flushes the controller FIFO, so after that, all the\nsamples in the controller are discarded. The controller becomes ready\nshortly after this bogus pen-up handling and does generate again a pen-down\ninterrupt. This time, the controller contains x-y-p samples which all read\nas zero. Since pressure value is zero, this set of samples is effectively\nignored by userland.\n\nIn the end, the driver just bounces between pen-down and bogus pen-up\nhandling, generating no useful results. Fix this by giving the controller a\nbit more time before polling it for pen-up.\n\nSigned-off-by: Marek Vasut <f40600653b33f5282fa4c5daf377dfc444fb4625@denx.de>\nReviewed-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\nSigned-off-by: Dmitry Torokhov <6b8646d310837fed93a129ed3c979b90c7f2674f@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"9525a08b30b1c8e39578938fc3420ac0b56f3a3d","subject":"powerpc\/windfarm: Fix crash on SMU based machine after i2c conversion","message":"powerpc\/windfarm: Fix crash on SMU based machine after i2c conversion\n\nWe no longer get the device node in platform_data but instead\nwhere it belongs in struct device, so get it from there instead\nof blowing up.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/macintosh\/windfarm_smu_sat.c\n+++ drivers\/macintosh\/windfarm_smu_sat.c\n@@ -204,7 +204,7 @@\n static int wf_sat_probe(struct i2c_client *client,\n \t\t\tconst struct i2c_device_id *id)\n {\n-\tstruct device_node *dev = client->dev.platform_data;\n+\tstruct device_node *dev = client->dev.of_node;\n \tstruct wf_sat *sat;\n \tstruct wf_sat_sensor *sens;\n \tconst u32 *reg;\n"} {"commit":"b5c2e0abe1d0ffc367d0c1a42e45c91c079838d3","subject":"[media] snd_tea575x: precedence bug in fmr2_tea575x_get_pins()","message":"[media] snd_tea575x: precedence bug in fmr2_tea575x_get_pins()\n\nThe \"|\" operation has higher precedence that \"?:\" so this couldn't\nreturn both flags set at once as intended.\n\nSigned-off-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nSigned-off-by: Mauro Carvalho Chehab <0cae1d1e981e84d16b82ca3d17be8a7f826608d3@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"7963fa48dafd07a8c6b6007fb038095553ad6a0f","subject":"V4L\/DVB (5989): V4L: Add additional ioctls to compat_ioctl32","message":"V4L\/DVB (5989): V4L: Add additional ioctls to compat_ioctl32\n\nWith the addition of these ioctls, I'm able to watch TV with a 32-bit version\nof tvtime on x86_64.\n\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/compat_ioctl32.c\n+++ drivers\/media\/video\/compat_ioctl32.c\n@@ -848,6 +848,8 @@\n \tcase VIDIOCSFREQ32:\n \tcase VIDIOCGAUDIO:\n \tcase VIDIOCSAUDIO:\n+\tcase VIDIOCGVBIFMT:\n+\tcase VIDIOCSVBIFMT:\n #endif\n \tcase VIDIOC_QUERYCAP:\n \tcase VIDIOC_ENUM_FMT:\n@@ -874,7 +876,10 @@\n \tcase VIDIOC_ENUMINPUT:\n \tcase VIDIOC_ENUMINPUT32:\n \tcase VIDIOC_G_CTRL:\n+\tcase VIDIOC_S_CTRL:\n \tcase VIDIOC_S_CTRL32:\n+\tcase VIDIOC_S_FREQUENCY:\n+\tcase VIDIOC_G_FREQUENCY:\n \tcase VIDIOC_QUERYCTRL:\n \tcase VIDIOC_G_INPUT32:\n \tcase VIDIOC_S_INPUT32:\n"} {"commit":"a926592f5e4e900f3fa903298c4619a131e60963","subject":"net,via-rhine: Fix tx_timeout handling","message":"net,via-rhine: Fix tx_timeout handling\n\nrhine_reset_task() misses to disable the tx scheduler upon reset,\nthis can lead to a crash if work is still scheduled while we're resetting\nthe tx queue.\n\nFixes:\n[ 93.591707] BUG: unable to handle kernel NULL pointer dereference at 0000004c\n[ 93.595514] IP: [<c119d10d>] rhine_napipoll+0x491\/0x6\n\nSigned-off-by: Richard Weinberger <320bca71fc381a4a025636043ca86e734e31cf8b@nod.at>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"f2251f668e9527b87c9ba7256e7497cb49abbc20","subject":"netxen:fix napi intr enable check","message":"netxen:fix napi intr enable check\n\no netif_running() check for enabling interrupt at end of napi poll is\n not enough to cover firmwar recovery. Instead test __NX_DEV_UP bit.\no Avoid re-entry into to netxen_nic_down() with __NX_DEV_UP bit check.\n\nAcked-by: Dhananjay Phadke <b77df2cd3c824cc8220351a100dce935b79df1e8@qlogic.com>\nSigned-off-by: Amit Kumar Salecha <b95978a93e8c5cd598a905aeb6b4a5c23933265e@qlogic.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_main.c\n+++ drivers\/net\/netxen\/netxen_nic_main.c\n@@ -1011,8 +1011,10 @@\n \tif (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)\n \t\treturn;\n \n-\tclear_bit(__NX_DEV_UP, &adapter->state);\n-\n+\tif (!test_and_clear_bit(__NX_DEV_UP, &adapter->state))\n+\t\treturn;\n+\n+\tsmp_mb();\n \tspin_lock(&adapter->tx_clean_lock);\n \tnetif_carrier_off(netdev);\n \tnetif_tx_disable(netdev);\n@@ -2053,7 +2055,7 @@\n \n \tif ((work_done < budget) && tx_complete) {\n \t\tnapi_complete(&sds_ring->napi);\n-\t\tif (netif_running(adapter->netdev))\n+\t\tif (test_bit(__NX_DEV_UP, &adapter->state))\n \t\t\tnetxen_nic_enable_int(sds_ring);\n \t}\n \n"} {"commit":"01542cd1bbf995f951e2c2383d7911e96b12bec6","subject":"netxen: fix build with without CONFIG_PM","message":"netxen: fix build with without CONFIG_PM\n\nwrap pci suspend() and resume() with CONFIG_PM check.\n\nSigned-off-by: Dhananjay Phadke <4fd8366feef70cc1c32b7a8089fd6d8a97ab8728@netxen.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_main.c\n+++ drivers\/net\/netxen\/netxen_nic_main.c\n@@ -1178,6 +1178,7 @@\n \tfree_netdev(netdev);\n }\n \n+#ifdef CONFIG_PM\n static int\n netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)\n {\n@@ -1242,6 +1243,7 @@\n \n \treturn 0;\n }\n+#endif\n \n static int netxen_nic_open(struct net_device *netdev)\n {\n@@ -1771,8 +1773,10 @@\n \t.id_table = netxen_pci_tbl,\n \t.probe = netxen_nic_probe,\n \t.remove = __devexit_p(netxen_nic_remove),\n+#ifdef CONFIG_PM\n \t.suspend = netxen_nic_suspend,\n \t.resume = netxen_nic_resume\n+#endif\n };\n \n \/* Driver Registration on NetXen card *\/\n"} {"commit":"083ba279d52bcad20f1dfa3cefd4255cbe82d521","subject":"netxen: fix interrupt for NX2031","message":"netxen: fix interrupt for NX2031\n\nSigned-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>\n\nFor NX2031, msix is supported from fw version > 3.4.336.\nThis fw version check should take flash fw in consider instead of\nrunning fw or fw from file.\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_main.c\n+++ drivers\/net\/netxen\/netxen_nic_main.c\n@@ -772,15 +772,22 @@\n \tif (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {\n \t\tadapter->msix_supported = !!use_msi_x;\n \t\tadapter->rss_supported = !!use_msi_x;\n-\t} else if (adapter->fw_version >= NETXEN_VERSION_CODE(3, 4, 336)) {\n-\t\tswitch (adapter->ahw.board_type) {\n-\t\tcase NETXEN_BRDTYPE_P2_SB31_10G:\n-\t\tcase NETXEN_BRDTYPE_P2_SB31_10G_CX4:\n-\t\t\tadapter->msix_supported = !!use_msi_x;\n-\t\t\tadapter->rss_supported = !!use_msi_x;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n+\t} else {\n+\t\tu32 flashed_ver = 0;\n+\t\tnetxen_rom_fast_read(adapter,\n+\t\t\t\tNX_FW_VERSION_OFFSET, (int *)&flashed_ver);\n+\t\tflashed_ver = NETXEN_DECODE_VERSION(flashed_ver);\n+\n+\t\tif (flashed_ver >= NETXEN_VERSION_CODE(3, 4, 336)) {\n+\t\t\tswitch (adapter->ahw.board_type) {\n+\t\t\tcase NETXEN_BRDTYPE_P2_SB31_10G:\n+\t\t\tcase NETXEN_BRDTYPE_P2_SB31_10G_CX4:\n+\t\t\t\tadapter->msix_supported = !!use_msi_x;\n+\t\t\t\tadapter->rss_supported = !!use_msi_x;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t}\n \t}\n \n"} {"commit":"77c8258ff7e6788d3889e7062607e891618d811f","subject":"ath5k: add LED support for Acer Aspire One AO751h\/AO531h","message":"ath5k: add LED support for Acer Aspire One AO751h\/AO531h\n\nAdd LED support for a Foxconn AR242X module, found on\nthe Acer Aspire One models AO751h\/AO531h\n\nSigned-off-by: Keng-Yu Lin <caf9661a2da8d44cf721e4275496ac53a30f071a@canonical.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath5k\/led.c\n+++ drivers\/net\/wireless\/ath\/ath5k\/led.c\n@@ -59,6 +59,8 @@\n \t{ ATH_SDEVICE(PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID), ATH_LED(1, 1) },\n \t\/* Acer Aspire One A150 (maximlevitsky@gmail.com) *\/\n \t{ ATH_SDEVICE(PCI_VENDOR_ID_FOXCONN, 0xe008), ATH_LED(3, 0) },\n+\t\/* Acer Aspire One AO531h AO751h (keng-yu.lin@canonical.com) *\/\n+\t{ ATH_SDEVICE(PCI_VENDOR_ID_FOXCONN, 0xe00d), ATH_LED(3, 0) },\n \t\/* Acer Ferrari 5000 (russ.dill@gmail.com) *\/\n \t{ ATH_SDEVICE(PCI_VENDOR_ID_AMBIT, 0x0422), ATH_LED(1, 1) },\n \t\/* E-machines E510 (tuliom@gmail.com) *\/\n"} {"commit":"cdbbe3d1f53086ece706674d3bf4f6d148083694","subject":"b43legacy: Fix usage of struct device used for DMAing","message":"b43legacy: Fix usage of struct device used for DMAing\n\nThis fixes b43legacy for the SSB DMA API change.\n\nSigned-off-by: Michael Buesch <77666125932addc6fc525b281b518fd8fd2203d8@bu3sch.de>\nCc: Stefano Brivio <e30a422ff97e35f06c4e49bfd3e5bfb0c71f922b@polimi.it>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/b43legacy\/dma.c\n+++ drivers\/net\/wireless\/b43legacy\/dma.c\n@@ -393,11 +393,11 @@\n \tdma_addr_t dmaaddr;\n \n \tif (tx)\n-\t\tdmaaddr = dma_map_single(ring->dev->dev->dev,\n+\t\tdmaaddr = dma_map_single(ring->dev->dev->dma_dev,\n \t\t\t\t\t buf, len,\n \t\t\t\t\t DMA_TO_DEVICE);\n \telse\n-\t\tdmaaddr = dma_map_single(ring->dev->dev->dev,\n+\t\tdmaaddr = dma_map_single(ring->dev->dev->dma_dev,\n \t\t\t\t\t buf, len,\n \t\t\t\t\t DMA_FROM_DEVICE);\n \n@@ -411,11 +411,11 @@\n \t\t int tx)\n {\n \tif (tx)\n-\t\tdma_unmap_single(ring->dev->dev->dev,\n+\t\tdma_unmap_single(ring->dev->dev->dma_dev,\n \t\t\t\t addr, len,\n \t\t\t\t DMA_TO_DEVICE);\n \telse\n-\t\tdma_unmap_single(ring->dev->dev->dev,\n+\t\tdma_unmap_single(ring->dev->dev->dma_dev,\n \t\t\t\t addr, len,\n \t\t\t\t DMA_FROM_DEVICE);\n }\n@@ -427,7 +427,7 @@\n {\n \tB43legacy_WARN_ON(ring->tx);\n \n-\tdma_sync_single_for_cpu(ring->dev->dev->dev,\n+\tdma_sync_single_for_cpu(ring->dev->dev->dma_dev,\n \t\t\t\taddr, len, DMA_FROM_DEVICE);\n }\n \n@@ -438,7 +438,7 @@\n {\n \tB43legacy_WARN_ON(ring->tx);\n \n-\tdma_sync_single_for_device(ring->dev->dev->dev,\n+\tdma_sync_single_for_device(ring->dev->dev->dma_dev,\n \t\t\t\t addr, len, DMA_FROM_DEVICE);\n }\n \n@@ -458,9 +458,9 @@\n \n static int alloc_ringmemory(struct b43legacy_dmaring *ring)\n {\n-\tstruct device *dev = ring->dev->dev->dev;\n-\n-\tring->descbase = dma_alloc_coherent(dev, B43legacy_DMA_RINGMEMSIZE,\n+\tstruct device *dma_dev = ring->dev->dev->dma_dev;\n+\n+\tring->descbase = dma_alloc_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,\n \t\t\t\t\t &(ring->dmabase), GFP_KERNEL);\n \tif (!ring->descbase) {\n \t\tb43legacyerr(ring->dev->wl, \"DMA ringmemory allocation\"\n@@ -474,9 +474,9 @@\n \n static void free_ringmemory(struct b43legacy_dmaring *ring)\n {\n-\tstruct device *dev = ring->dev->dev->dev;\n-\n-\tdma_free_coherent(dev, B43legacy_DMA_RINGMEMSIZE,\n+\tstruct device *dma_dev = ring->dev->dev->dma_dev;\n+\n+\tdma_free_coherent(dma_dev, B43legacy_DMA_RINGMEMSIZE,\n \t\t\t ring->descbase, ring->dmabase);\n }\n \n@@ -886,7 +886,7 @@\n \t\t\tgoto err_kfree_meta;\n \n \t\t\/* test for ability to dma to txhdr_cache *\/\n-\t\tdma_test = dma_map_single(dev->dev->dev, ring->txhdr_cache,\n+\t\tdma_test = dma_map_single(dev->dev->dma_dev, ring->txhdr_cache,\n \t\t\t\t\t sizeof(struct b43legacy_txhdr_fw3),\n \t\t\t\t\t DMA_TO_DEVICE);\n \n@@ -900,7 +900,7 @@\n \t\t\tif (!ring->txhdr_cache)\n \t\t\t\tgoto err_kfree_meta;\n \n-\t\t\tdma_test = dma_map_single(dev->dev->dev,\n+\t\t\tdma_test = dma_map_single(dev->dev->dma_dev,\n \t\t\t\t\tring->txhdr_cache,\n \t\t\t\t\tsizeof(struct b43legacy_txhdr_fw3),\n \t\t\t\t\tDMA_TO_DEVICE);\n@@ -910,7 +910,7 @@\n \t\t\t\tgoto err_kfree_txhdr_cache;\n \t\t}\n \n-\t\tdma_unmap_single(dev->dev->dev,\n+\t\tdma_unmap_single(dev->dev->dma_dev,\n \t\t\t\t dma_test, sizeof(struct b43legacy_txhdr_fw3),\n \t\t\t\t DMA_TO_DEVICE);\n \t}\n"} {"commit":"69bbc7dc9f59fedb6067c7f9f9f9bc1da27407ad","subject":"p54: move p54_vdcf_init to the right place.","message":"p54: move p54_vdcf_init to the right place.\n\npriv->tx_hdr_len is set by the driver _after_ it called p54_init_common.\nWhile this isn't much a problem for any PCI or ISL3887 cards\/sticks,\nbecause they don't need any extra header and therefore tx_hdr_len is\nzero for them...\n\nSigned-off-by: Christian Lamparter <2b86d4915b352c348b09e5d907edf5d041a1585c@web.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/p54\/p54common.c\n+++ drivers\/net\/wireless\/p54\/p54common.c\n@@ -837,9 +837,20 @@\n \tstruct p54_common *priv = dev->priv;\n \tint err;\n \n+\tif (!priv->cached_vdcf) {\n+\t\tpriv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf)+\n+\t\t\tpriv->tx_hdr_len + sizeof(struct p54_control_hdr),\n+\t\t\tGFP_KERNEL);\n+\n+\t\tif (!priv->cached_vdcf)\n+\t\t\treturn -ENOMEM;\n+\t}\n+\n \terr = priv->open(dev);\n \tif (!err)\n \t\tpriv->mode = IEEE80211_IF_TYPE_MNTR;\n+\n+\tp54_init_vdcf(dev);\n \n \treturn err;\n }\n@@ -1020,15 +1031,6 @@\n \tdev->extra_tx_headroom = sizeof(struct p54_control_hdr) + 4 +\n \t\t\t\t sizeof(struct p54_tx_control_allocdata);\n \n- priv->cached_vdcf = kzalloc(sizeof(struct p54_tx_control_vdcf) +\n- priv->tx_hdr_len + sizeof(struct p54_control_hdr), GFP_KERNEL);\n-\n-\tif (!priv->cached_vdcf) {\n-\t\tieee80211_free_hw(dev);\n-\t\treturn NULL;\n-\t}\n-\n-\tp54_init_vdcf(dev);\n \tmutex_init(&priv->conf_mutex);\n \n \treturn dev;\n"} {"commit":"728d53f4a4a880d8961fb15e1b19c541c5fa1b0f","subject":"sh-pfc: r8a7790: Remove function GPIOs","message":"sh-pfc: r8a7790: Remove function GPIOs\n\nNo r8a7770 platform use the function GPIOs API. Remove it.\n\nSigned-off-by: Laurent Pinchart <ae960578cc5eca7b9b1dbc37d9caa6cb634f35e0@ideasonboard.com>\n[9662bddcc379be37df16f02a449c344b4718c1a1@verge.net.au: fixed typo in changelog: r8a7779 -> r8a7770]\nSigned-off-by: Simon Horman <9662bddcc379be37df16f02a449c344b4718c1a1@verge.net.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c54a155d4d20e35d41bb2922ed4a6c615d177c4f","subject":"regulator: wm8400: Modernise driver","message":"regulator: wm8400: Modernise driver\n\nUpdate the driver to use all the regmap based helpers, saving a nice chunk\nof code (especially for the DCDCs).\n\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/regulator\/wm8400-regulator.c\n+++ drivers\/regulator\/wm8400-regulator.c\n@@ -19,31 +19,6 @@\n #include <linux\/regulator\/driver.h>\n #include <linux\/mfd\/wm8400-private.h>\n \n-static int wm8400_ldo_is_enabled(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tu16 val;\n-\n-\tval = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));\n-\treturn (val & WM8400_LDO1_ENA) != 0;\n-}\n-\n-static int wm8400_ldo_enable(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),\n-\t\t\t WM8400_LDO1_ENA, WM8400_LDO1_ENA);\n-}\n-\n-static int wm8400_ldo_disable(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),\n-\t\t\t WM8400_LDO1_ENA, 0);\n-}\n-\n static int wm8400_ldo_list_voltage(struct regulator_dev *dev,\n \t\t\t\t unsigned selector)\n {\n@@ -56,21 +31,9 @@\n \t\treturn 1600000 + ((selector - 14) * 100000);\n }\n \n-static int wm8400_ldo_get_voltage_sel(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tu16 val;\n-\n-\tval = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));\n-\tval &= WM8400_LDO1_VSEL_MASK;\n-\n-\treturn val;\n-}\n-\n-static int wm8400_ldo_set_voltage(struct regulator_dev *dev,\n-\t\t\t\t int min_uV, int max_uV, unsigned *selector)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n+static int wm8400_ldo_map_voltage(struct regulator_dev *dev,\n+\t\t\t\t int min_uV, int max_uV)\n+{\n \tu16 val;\n \n \tif (min_uV < 900000 || min_uV > 3300000)\n@@ -94,91 +57,18 @@\n \t\tval += 0xf;\n \t}\n \n-\t*selector = val;\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev),\n-\t\t\t WM8400_LDO1_VSEL_MASK, val);\n+\treturn val;\n }\n \n static struct regulator_ops wm8400_ldo_ops = {\n-\t.is_enabled = wm8400_ldo_is_enabled,\n-\t.enable = wm8400_ldo_enable,\n-\t.disable = wm8400_ldo_disable,\n+\t.is_enabled = regulator_is_enabled_regmap,\n+\t.enable = regulator_enable_regmap,\n+\t.disable = regulator_disable_regmap,\n \t.list_voltage = wm8400_ldo_list_voltage,\n-\t.get_voltage_sel = wm8400_ldo_get_voltage_sel,\n-\t.set_voltage = wm8400_ldo_set_voltage,\n+\t.get_voltage_sel = regulator_get_voltage_sel_regmap,\n+\t.set_voltage_sel = regulator_set_voltage_sel_regmap,\n+\t.map_voltage = wm8400_ldo_map_voltage,\n };\n-\n-static int wm8400_dcdc_is_enabled(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tint offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;\n-\tu16 val;\n-\n-\tval = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);\n-\treturn (val & WM8400_DC1_ENA) != 0;\n-}\n-\n-static int wm8400_dcdc_enable(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tint offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,\n-\t\t\t WM8400_DC1_ENA, WM8400_DC1_ENA);\n-}\n-\n-static int wm8400_dcdc_disable(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tint offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,\n-\t\t\t WM8400_DC1_ENA, 0);\n-}\n-\n-static int wm8400_dcdc_list_voltage(struct regulator_dev *dev,\n-\t\t\t\t unsigned selector)\n-{\n-\tif (selector > WM8400_DC1_VSEL_MASK)\n-\t\treturn -EINVAL;\n-\n-\treturn 850000 + (selector * 25000);\n-}\n-\n-static int wm8400_dcdc_get_voltage_sel(struct regulator_dev *dev)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tu16 val;\n-\tint offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;\n-\n-\tval = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);\n-\tval &= WM8400_DC1_VSEL_MASK;\n-\n-\treturn val;\n-}\n-\n-static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,\n-\t\t\t\t int min_uV, int max_uV, unsigned *selector)\n-{\n-\tstruct wm8400 *wm8400 = rdev_get_drvdata(dev);\n-\tu16 val;\n-\tint offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2;\n-\n-\tif (min_uV < 850000)\n-\t\treturn -EINVAL;\n-\n-\tval = DIV_ROUND_UP(min_uV - 850000, 25000);\n-\n-\tif (850000 + (25000 * val) > max_uV)\n-\t\treturn -EINVAL;\n-\tBUG_ON(850000 + (25000 * val) < min_uV);\n-\n-\t*selector = val;\n-\n-\treturn wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset,\n-\t\t\t WM8400_DC1_VSEL_MASK, val);\n-}\n \n static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev)\n {\n@@ -258,12 +148,12 @@\n }\n \n static struct regulator_ops wm8400_dcdc_ops = {\n-\t.is_enabled = wm8400_dcdc_is_enabled,\n-\t.enable = wm8400_dcdc_enable,\n-\t.disable = wm8400_dcdc_disable,\n-\t.list_voltage = wm8400_dcdc_list_voltage,\n-\t.get_voltage_sel = wm8400_dcdc_get_voltage_sel,\n-\t.set_voltage = wm8400_dcdc_set_voltage,\n+\t.is_enabled = regulator_is_enabled_regmap,\n+\t.enable = regulator_enable_regmap,\n+\t.disable = regulator_disable_regmap,\n+\t.list_voltage = regulator_list_voltage_linear,\n+\t.get_voltage_sel = regulator_get_voltage_sel_regmap,\n+\t.set_voltage_sel = regulator_set_voltage_sel_regmap,\n \t.get_mode = wm8400_dcdc_get_mode,\n \t.set_mode = wm8400_dcdc_set_mode,\n \t.get_optimum_mode = wm8400_dcdc_get_optimum_mode,\n@@ -274,7 +164,11 @@\n \t\t.name = \"LDO1\",\n \t\t.id = WM8400_LDO1,\n \t\t.ops = &wm8400_ldo_ops,\n+\t\t.enable_reg = WM8400_LDO1_CONTROL,\n+\t\t.enable_mask = WM8400_LDO1_ENA,\n \t\t.n_voltages = WM8400_LDO1_VSEL_MASK + 1,\n+\t\t.vsel_reg = WM8400_LDO1_CONTROL,\n+\t\t.vsel_mask = WM8400_LDO1_VSEL_MASK,\n \t\t.type = REGULATOR_VOLTAGE,\n \t\t.owner = THIS_MODULE,\n \t},\n@@ -282,15 +176,23 @@\n \t\t.name = \"LDO2\",\n \t\t.id = WM8400_LDO2,\n \t\t.ops = &wm8400_ldo_ops,\n+\t\t.enable_reg = WM8400_LDO2_CONTROL,\n+\t\t.enable_mask = WM8400_LDO2_ENA,\n \t\t.n_voltages = WM8400_LDO2_VSEL_MASK + 1,\n \t\t.type = REGULATOR_VOLTAGE,\n+\t\t.vsel_reg = WM8400_LDO2_CONTROL,\n+\t\t.vsel_mask = WM8400_LDO2_VSEL_MASK,\n \t\t.owner = THIS_MODULE,\n \t},\n \t{\n \t\t.name = \"LDO3\",\n \t\t.id = WM8400_LDO3,\n \t\t.ops = &wm8400_ldo_ops,\n+\t\t.enable_reg = WM8400_LDO3_CONTROL,\n+\t\t.enable_mask = WM8400_LDO3_ENA,\n \t\t.n_voltages = WM8400_LDO3_VSEL_MASK + 1,\n+\t\t.vsel_reg = WM8400_LDO3_CONTROL,\n+\t\t.vsel_mask = WM8400_LDO3_VSEL_MASK,\n \t\t.type = REGULATOR_VOLTAGE,\n \t\t.owner = THIS_MODULE,\n \t},\n@@ -298,7 +200,11 @@\n \t\t.name = \"LDO4\",\n \t\t.id = WM8400_LDO4,\n \t\t.ops = &wm8400_ldo_ops,\n+\t\t.enable_reg = WM8400_LDO4_CONTROL,\n+\t\t.enable_mask = WM8400_LDO4_ENA,\n \t\t.n_voltages = WM8400_LDO4_VSEL_MASK + 1,\n+\t\t.vsel_reg = WM8400_LDO4_CONTROL,\n+\t\t.vsel_mask = WM8400_LDO4_VSEL_MASK,\n \t\t.type = REGULATOR_VOLTAGE,\n \t\t.owner = THIS_MODULE,\n \t},\n@@ -306,7 +212,13 @@\n \t\t.name = \"DCDC1\",\n \t\t.id = WM8400_DCDC1,\n \t\t.ops = &wm8400_dcdc_ops,\n+\t\t.enable_reg = WM8400_DCDC1_CONTROL_1,\n+\t\t.enable_mask = WM8400_DC1_ENA_MASK,\n \t\t.n_voltages = WM8400_DC1_VSEL_MASK + 1,\n+\t\t.vsel_reg = WM8400_DCDC1_CONTROL_1,\n+\t\t.vsel_mask = WM8400_DC1_VSEL_MASK,\n+\t\t.min_uV = 850000,\n+\t\t.uV_step = 25000,\n \t\t.type = REGULATOR_VOLTAGE,\n \t\t.owner = THIS_MODULE,\n \t},\n@@ -314,7 +226,13 @@\n \t\t.name = \"DCDC2\",\n \t\t.id = WM8400_DCDC2,\n \t\t.ops = &wm8400_dcdc_ops,\n+\t\t.enable_reg = WM8400_DCDC2_CONTROL_1,\n+\t\t.enable_mask = WM8400_DC1_ENA_MASK,\n \t\t.n_voltages = WM8400_DC2_VSEL_MASK + 1,\n+\t\t.vsel_reg = WM8400_DCDC2_CONTROL_1,\n+\t\t.vsel_mask = WM8400_DC2_VSEL_MASK,\n+\t\t.min_uV = 850000,\n+\t\t.uV_step = 25000,\n \t\t.type = REGULATOR_VOLTAGE,\n \t\t.owner = THIS_MODULE,\n \t},\n@@ -329,6 +247,7 @@\n \tconfig.dev = &pdev->dev;\n \tconfig.init_data = pdev->dev.platform_data;\n \tconfig.driver_data = wm8400;\n+\tconfig.regmap = wm8400->regmap;\n \n \trdev = regulator_register(®ulators[pdev->id], &config);\n \tif (IS_ERR(rdev))\n"} {"commit":"c4425fd816da997ccf359208f817f17242d6d050","subject":"sensor: fix typo resulting in compile error","message":"sensor: fix typo resulting in compile error\n\nFix a compile error when trying to set I2C address of LSM9DS0 Gyro to\nVCC (0x6B) caused by a typo.\n\nChange-Id: I27850ecd70e715a10b96572aedea0d237dd55cd5\nSigned-off-by: Murtaza Alexandru <0c5e09f296fdecf6f8c8c9e13175422dc2024bef@intel.com>\n","repos":"zephyrproject-rtos\/zephyr,Vudentz\/zephyr,fbsder\/zephyr,fractalclone\/zephyr-riscv,sharronliu\/zephyr,Vudentz\/zephyr,tidyjiang8\/zephyr-doc,mbolivar\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3220,rsalveti\/zephyr,Vudentz\/zephyr,sharronliu\/zephyr,nashif\/zephyr,holtmann\/zephyr,nashif\/zephyr,tidyjiang8\/zephyr-doc,mbolivar\/zephyr,kraj\/zephyr,zephyriot\/zephyr,erwango\/zephyr,zephyrproject-rtos\/zephyr,rsalveti\/zephyr,bigdinotech\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3200,zephyriot\/zephyr,mbolivar\/zephyr,punitvara\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220,bboozzoo\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,ldts\/zephyr,fbsder\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,bigdinotech\/zephyr,pklazy\/zephyr,bigdinotech\/zephyr,mirzak\/zephyr-os,runchip\/zephyr-cc3200,runchip\/zephyr-cc3220,galak\/zephyr,kraj\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,tidyjiang8\/zephyr-doc,GiulianoFranchetto\/zephyr,erwango\/zephyr,aceofall\/zephyr-iotos,mirzak\/zephyr-os,finikorg\/zephyr,GiulianoFranchetto\/zephyr,fractalclone\/zephyr-riscv,fbsder\/zephyr,explora26\/zephyr,explora26\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,galak\/zephyr,pklazy\/zephyr,punitvara\/zephyr,nashif\/zephyr,holtmann\/zephyr,punitvara\/zephyr,aceofall\/zephyr-iotos,bboozzoo\/zephyr,ldts\/zephyr,runchip\/zephyr-cc3220,explora26\/zephyr,pklazy\/zephyr,ldts\/zephyr,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,fractalclone\/zephyr-riscv,holtmann\/zephyr,sharronliu\/zephyr,rsalveti\/zephyr,mirzak\/zephyr-os,fbsder\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,runchip\/zephyr-cc3200,zephyriot\/zephyr,kraj\/zephyr,punitvara\/zephyr,finikorg\/zephyr,bigdinotech\/zephyr,kraj\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,erwango\/zephyr,erwango\/zephyr,punitvara\/zephyr,fbsder\/zephyr,aceofall\/zephyr-iotos,bboozzoo\/zephyr,finikorg\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,galak\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,erwango\/zephyr,aceofall\/zephyr-iotos,ldts\/zephyr,holtmann\/zephyr,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,holtmann\/zephyr,bboozzoo\/zephyr,tidyjiang8\/zephyr-doc,nashif\/zephyr,kraj\/zephyr,tidyjiang8\/zephyr-doc,ldts\/zephyr,explora26\/zephyr,rsalveti\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyriot\/zephyr,bboozzoo\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/sensor\/sensor_lsm9ds0_gyro.h\n+++ drivers\/sensor\/sensor_lsm9ds0_gyro.h\n@@ -198,7 +198,7 @@\n \n #if defined(CONFIG_LSM9DS0_GYRO_I2C_ADDR_6A)\n \t#define LSM9DS0_GYRO_I2C_ADDR 0x6A\n-#elif defined(CONFIG_LSM9DS0_GYRO_I2c_ADDR_6B)\n+#elif defined(CONFIG_LSM9DS0_GYRO_I2C_ADDR_6B)\n \t#define LSM9DS0_GYRO_I2C_ADDR 0x6B\n #endif\n \n"} {"commit":"878c68c6c2a28e3c3a62f723e0eaa2fd02297594","subject":"dgrp procfs fixes, part 2","message":"dgrp procfs fixes, part 2\n\nAll table entries either have non-NULL ->proc_file_fops or\nnon-NULL child.\n\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/dgrp\/dgrp_specproc.c\n+++ drivers\/staging\/dgrp\/dgrp_specproc.c\n@@ -269,10 +269,7 @@\n \t\t\tde->data = (void *) table;\n \t\t\tif (!table->child) {\n \t\t\t\tde->proc_iops = &proc_inode_ops;\n-\t\t\t\tif (table->proc_file_ops)\n-\t\t\t\t\tde->proc_fops = table->proc_file_ops;\n-\t\t\t\telse\n-\t\t\t\t\tde->proc_fops = &dgrp_proc_file_ops;\n+\t\t\t\tde->proc_fops = table->proc_file_ops;\n \t\t\t}\n \t\t}\n \t\ttable->de = de;\n"} {"commit":"669022a21662b9c8182a00c22c27afc8757f3481","subject":"V4L\/DVB (13022): go7007: Fix mpeg controls","message":"V4L\/DVB (13022): go7007: Fix mpeg controls\n\nMPEG controls were disabled by Mauro's ioctl conversion patch. They are now\nre-enabled and cleaned up.\n\nSigned-off-by: Pete Eberlein <e3b6cda228242c30b711ac17cb264f1dbadfd0b6@sensoray.com>\nSigned-off-by: Douglas Schilling Landgraf <cb5f9630225b7afa1e13760d30868c8ce876fc60@redhat.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/go7007\/go7007-v4l2.c\n+++ drivers\/staging\/go7007\/go7007-v4l2.c\n@@ -383,13 +383,10 @@\n \t}\n \treturn 0;\n }\n-\n-static int mpeg_queryctrl(u32 id, struct v4l2_queryctrl *ctrl)\n-{\n-\tstatic const u32 user_ctrls[] = {\n-\t\tV4L2_CID_USER_CLASS,\n-\t\t0\n-\t};\n+#endif\n+\n+static int mpeg_queryctrl(struct v4l2_queryctrl *ctrl)\n+{\n \tstatic const u32 mpeg_ctrls[] = {\n \t\tV4L2_CID_MPEG_CLASS,\n \t\tV4L2_CID_MPEG_STREAM_TYPE,\n@@ -401,26 +398,15 @@\n \t\t0\n \t};\n \tstatic const u32 *ctrl_classes[] = {\n-\t\tuser_ctrls,\n \t\tmpeg_ctrls,\n \t\tNULL\n \t};\n \n-\t\/* The ctrl may already contain the queried i2c controls,\n-\t * query the mpeg controls if the existing ctrl id is\n-\t * greater than the next mpeg ctrl id.\n-\t *\/\n-\tid = v4l2_ctrl_next(ctrl_classes, id);\n-\tif (id >= ctrl->id && ctrl->name[0])\n-\t\treturn 0;\n-\n-\tmemset(ctrl, 0, sizeof(*ctrl));\n-\tctrl->id = id;\n+\tctrl->id = v4l2_ctrl_next(ctrl_classes, ctrl->id);\n \n \tswitch (ctrl->id) {\n-\tcase V4L2_CID_USER_CLASS:\n \tcase V4L2_CID_MPEG_CLASS:\n-\t\treturn v4l2_ctrl_query_fill_std(ctrl);\n+\t\treturn v4l2_ctrl_query_fill(ctrl, 0, 0, 0, 0);\n \tcase V4L2_CID_MPEG_STREAM_TYPE:\n \t\treturn v4l2_ctrl_query_fill(ctrl,\n \t\t\t\tV4L2_MPEG_STREAM_TYPE_MPEG2_DVD,\n@@ -437,20 +423,21 @@\n \t\t\t\tV4L2_MPEG_VIDEO_ASPECT_16x9, 1,\n \t\t\t\tV4L2_MPEG_VIDEO_ASPECT_1x1);\n \tcase V4L2_CID_MPEG_VIDEO_GOP_SIZE:\n+\t\treturn v4l2_ctrl_query_fill(ctrl, 0, 34, 1, 15);\n \tcase V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:\n-\t\treturn v4l2_ctrl_query_fill_std(ctrl);\n+\t\treturn v4l2_ctrl_query_fill(ctrl, 0, 1, 1, 0);\n \tcase V4L2_CID_MPEG_VIDEO_BITRATE:\n \t\treturn v4l2_ctrl_query_fill(ctrl,\n \t\t\t\t64000,\n \t\t\t\t10000000, 1,\n-\t\t\t\t9800000);\n+\t\t\t\t1500000);\n \tdefault:\n-\t\tbreak;\n-\t}\n-\treturn -EINVAL;\n-}\n-\n-static int mpeg_s_control(struct v4l2_control *ctrl, struct go7007 *go)\n+\t\treturn -EINVAL;\n+\t}\n+\treturn 0;\n+}\n+\n+static int mpeg_s_ctrl(struct v4l2_control *ctrl, struct go7007 *go)\n {\n \t\/* pretty sure we can't change any of these while streaming *\/\n \tif (go->streaming)\n@@ -528,6 +515,8 @@\n \t\t}\n \t\tbreak;\n \tcase V4L2_CID_MPEG_VIDEO_GOP_SIZE:\n+\t\tif (ctrl->value < 0 || ctrl->value > 34)\n+\t\t\treturn -EINVAL;\n \t\tgo->gop_size = ctrl->value;\n \t\tbreak;\n \tcase V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:\n@@ -547,7 +536,7 @@\n \treturn 0;\n }\n \n-static int mpeg_g_control(struct v4l2_control *ctrl, struct go7007 *go)\n+static int mpeg_g_ctrl(struct v4l2_control *ctrl, struct go7007 *go)\n {\n \tswitch (ctrl->id) {\n \tcase V4L2_CID_MPEG_STREAM_TYPE:\n@@ -600,7 +589,6 @@\n \t}\n \treturn 0;\n }\n-#endif\n \n static int vidioc_querycap(struct file *file, void *priv,\n \t\t\t\t\tstruct v4l2_capability *cap)\n@@ -996,7 +984,7 @@\n \n \ti2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, query);\n \n-\treturn (!query->name[0]) ? -EINVAL : 0;\n+\treturn (!query->name[0]) ? mpeg_queryctrl(query) : 0;\n }\n \n static int vidioc_g_ctrl(struct file *file, void *priv,\n@@ -1013,7 +1001,7 @@\n \tquery.id = ctrl->id;\n \ti2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, &query);\n \tif (query.name[0] == 0)\n-\t\treturn -EINVAL;\n+\t\treturn mpeg_g_ctrl(ctrl, go);\n \ti2c_clients_command(&go->i2c_adapter, VIDIOC_G_CTRL, ctrl);\n \n \treturn 0;\n@@ -1033,7 +1021,7 @@\n \tquery.id = ctrl->id;\n \ti2c_clients_command(&go->i2c_adapter, VIDIOC_QUERYCTRL, &query);\n \tif (query.name[0] == 0)\n-\t\treturn -EINVAL;\n+\t\treturn mpeg_s_ctrl(ctrl, go);\n \ti2c_clients_command(&go->i2c_adapter, VIDIOC_S_CTRL, ctrl);\n \n \treturn 0;\n"} {"commit":"61e15f010e4a3647043e55e41f60197ba4aa9b4f","subject":"staging: octeon: Combined seperate strings.","message":"staging: octeon: Combined seperate strings.\n\nThis patch fixes \"quoted string split across lines\" checkpatch.pl\nwarning in ethernet-rx.c\n\nSigned-off-by: Gulsah Kose <453fdd9f7ffa9029cc670d1bc8bfe1bc9d533f9a@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/octeon\/ethernet-rx.c\n+++ drivers\/staging\/octeon\/ethernet-rx.c\n@@ -203,8 +203,7 @@\n \t\t\t\t\tptr++;\n \t\t\t\t}\n \t\t\t} else {\n-\t\t\t\tprintk_ratelimited(\"Port %d unknown preamble, packet \"\n-\t\t\t\t\t\t \"dropped\\n\",\n+\t\t\t\tprintk_ratelimited(\"Port %d unknown preamble, packet dropped\\n\",\n \t\t\t\t\t\t work->ipprt);\n \t\t\t\t\/*\n \t\t\t\t cvmx_helper_dump_packet(work);\n"} {"commit":"8b6da5fb96e316848d6af6201925f765608b76cd","subject":"staging\/octeon-ethernet: Call dev_kfree\/consume_skb_any instead of dev_kfree_skb.","message":"staging\/octeon-ethernet: Call dev_kfree\/consume_skb_any instead of dev_kfree_skb.\n\nReplace dev_kfree_skb with dev_kfree_skb_any in cvm_oct_xmit_pow which\ncan be called in hard irq and other contexts, on the code paths that\ndrop packets.\n\nReplace dev_kfree_skb with dev_consume_skb_any in cvm_oct_xmit_pow which\ncan be called in hard irq and other contexts, on the code path where\nthe packet is transmitted successfully.\n\nSigned-off-by: \"Eric W. Biederman\" <8a741aa8cbd77ebc4a56ddb528ce9fd15d42f034@xmission.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"4804133efab607b5348278d8e5caecbe2e18de84","subject":"Add FreeBSD","message":"Add FreeBSD\n","repos":"brakhane\/panda3d,chandler14362\/panda3d,brakhane\/panda3d,jjkoletar\/panda3d,jjkoletar\/panda3d,matthiascy\/panda3d,Wilee999\/panda3d,matthiascy\/panda3d,chandler14362\/panda3d,tobspr\/panda3d,chandler14362\/panda3d,hj3938\/panda3d,grimfang\/panda3d,cc272309126\/panda3d,hj3938\/panda3d,tobspr\/panda3d,cc272309126\/panda3d,chandler14362\/panda3d,hj3938\/panda3d,ee08b397\/panda3d,Wilee999\/panda3d,tobspr\/panda3d,grimfang\/panda3d,cc272309126\/panda3d,cc272309126\/panda3d,Wilee999\/panda3d,hj3938\/panda3d,Wilee999\/panda3d,mgracer48\/panda3d,Wilee999\/panda3d,tobspr\/panda3d,tobspr\/panda3d,ee08b397\/panda3d,ee08b397\/panda3d,mgracer48\/panda3d,jjkoletar\/panda3d,chandler14362\/panda3d,mgracer48\/panda3d,cc272309126\/panda3d,mgracer48\/panda3d,matthiascy\/panda3d,hj3938\/panda3d,hj3938\/panda3d,chandler14362\/panda3d,grimfang\/panda3d,Wilee999\/panda3d,brakhane\/panda3d,ee08b397\/panda3d,mgracer48\/panda3d,brakhane\/panda3d,chandler14362\/panda3d,mgracer48\/panda3d,matthiascy\/panda3d,cc272309126\/panda3d,jjkoletar\/panda3d,grimfang\/panda3d,tobspr\/panda3d,matthiascy\/panda3d,mgracer48\/panda3d,brakhane\/panda3d,tobspr\/panda3d,cc272309126\/panda3d,grimfang\/panda3d,grimfang\/panda3d,ee08b397\/panda3d,jjkoletar\/panda3d,ee08b397\/panda3d,matthiascy\/panda3d,ee08b397\/panda3d,tobspr\/panda3d,cc272309126\/panda3d,brakhane\/panda3d,grimfang\/panda3d,hj3938\/panda3d,chandler14362\/panda3d,jjkoletar\/panda3d,matthiascy\/panda3d,matthiascy\/panda3d,jjkoletar\/panda3d,mgracer48\/panda3d,jjkoletar\/panda3d,hj3938\/panda3d,hj3938\/panda3d,chandler14362\/panda3d,grimfang\/panda3d,ee08b397\/panda3d,Wilee999\/panda3d,brakhane\/panda3d,chandler14362\/panda3d,mgracer48\/panda3d,grimfang\/panda3d,tobspr\/panda3d,ee08b397\/panda3d,Wilee999\/panda3d,tobspr\/panda3d,brakhane\/panda3d,Wilee999\/panda3d,cc272309126\/panda3d,matthiascy\/panda3d,jjkoletar\/panda3d,brakhane\/panda3d,grimfang\/panda3d","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- dtool\/src\/dtoolbase\/dtool_platform.h\n+++ dtool\/src\/dtoolbase\/dtool_platform.h\n@@ -40,6 +40,13 @@\n #define DTOOL_PLATFORM \"osx.i386\"\n #endif\n \n+#elif defined(__FreeBSD__)\n+#if defined(__x86_64)\n+#define DTOOL_PLATFORM \"freebsd.amd64\"\n+#else\n+#define DTOOL_PLATFORM \"freebsd.i386\"\n+#endif\n+\n #elif defined(__x86_64)\n #define DTOOL_PLATFORM \"linux.amd64\"\n \n"} {"commit":"f8c414b516e17328bb1ab359b273c76a2e665b68","subject":"ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX","message":"ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX\n\nThe adc blocks of S3C2443 and S3C2416 contain quirks not present\nin the stock S3C24xx adc. Therefore allow them to alter the\ndevice name via s3c_adc_setname.\n\nSigned-off-by: Heiko Stuebner <9ab5f52a1ca0bcf4f70d6d9008e02f6134b5b8f2@sntech.de>\nSigned-off-by: Kukjin Kim <3fc711f4e08bc570a586748633ff7c76d0e1e253@samsung.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/plat-samsung\/include\/plat\/adc-core.h\n+++ arch\/arm\/plat-samsung\/include\/plat\/adc-core.h\n@@ -20,7 +20,7 @@\n \/* re-define device name depending on support. *\/\n static inline void s3c_adc_setname(char *name)\n {\n-#ifdef CONFIG_SAMSUNG_DEV_ADC\n+#if defined(CONFIG_SAMSUNG_DEV_ADC) || defined(CONFIG_PLAT_S3C24XX)\n \ts3c_device_adc.name = name;\n #endif\n }\n"} {"commit":"22cc4ccf63e10e361531bf61e6e6c96c53a2f665","subject":"perf\/x86: Avoid kfree() in CPU_{STARTING,DYING}","message":"perf\/x86: Avoid kfree() in CPU_{STARTING,DYING}\n\nOn -rt kfree() can schedule, but CPU_{STARTING,DYING} should be\natomic. So use a list to defer kfree until CPU_{ONLINE,DEAD}.\n\nSigned-off-by: Yan, Zheng <45e2ee8c8b09e76a9d512320d4eb53c0cd9925c0@intel.com>\nAcked-by: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nCc: 3fddac958924aef220f202ca567388ddab3f14a8@infradead.org\nCc: f199ae9781930a5b94b284ca2f471140752002a7@google.com\nCc: 0474aee45985f5ae829f53849df476200e876990@linux.intel.com\nLink: http:\/\/lkml.kernel.org\/r\/1366113067-3262-2-git-send-email-45e2ee8c8b09e76a9d512320d4eb53c0cd9925c0@intel.com\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@kernel.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/kernel\/cpu\/perf_event_intel_uncore.c\n+++ arch\/x86\/kernel\/cpu\/perf_event_intel_uncore.c\n@@ -2622,6 +2622,21 @@\n \t}\n }\n \n+\/* CPU hot plug\/unplug are serialized by cpu_add_remove_lock mutex *\/\n+static LIST_HEAD(boxes_to_free);\n+\n+static void __cpuinit uncore_kfree_boxes(void)\n+{\n+\tstruct intel_uncore_box *box;\n+\n+\twhile (!list_empty(&boxes_to_free)) {\n+\t\tbox = list_entry(boxes_to_free.next,\n+\t\t\t\t struct intel_uncore_box, list);\n+\t\tlist_del(&box->list);\n+\t\tkfree(box);\n+\t}\n+}\n+\n static void __cpuinit uncore_cpu_dying(int cpu)\n {\n \tstruct intel_uncore_type *type;\n@@ -2636,7 +2651,7 @@\n \t\t\tbox = *per_cpu_ptr(pmu->box, cpu);\n \t\t\t*per_cpu_ptr(pmu->box, cpu) = NULL;\n \t\t\tif (box && atomic_dec_and_test(&box->refcnt))\n-\t\t\t\tkfree(box);\n+\t\t\t\tlist_add(&box->list, &boxes_to_free);\n \t\t}\n \t}\n }\n@@ -2666,8 +2681,11 @@\n \t\t\t\tif (exist && exist->phys_id == phys_id) {\n \t\t\t\t\tatomic_inc(&exist->refcnt);\n \t\t\t\t\t*per_cpu_ptr(pmu->box, cpu) = exist;\n-\t\t\t\t\tkfree(box);\n-\t\t\t\t\tbox = NULL;\n+\t\t\t\t\tif (box) {\n+\t\t\t\t\t\tlist_add(&box->list,\n+\t\t\t\t\t\t\t &boxes_to_free);\n+\t\t\t\t\t\tbox = NULL;\n+\t\t\t\t\t}\n \t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n@@ -2805,6 +2823,10 @@\n \tcase CPU_UP_CANCELED:\n \tcase CPU_DYING:\n \t\tuncore_cpu_dying(cpu);\n+\t\tbreak;\n+\tcase CPU_ONLINE:\n+\tcase CPU_DEAD:\n+\t\tuncore_kfree_boxes();\n \t\tbreak;\n \tdefault:\n \t\tbreak;\n"} {"commit":"b0e2796029d26f4541e9cb1e9f54e1a7020618c6","subject":"Staging: unisys: verify that a control channel exists","message":"Staging: unisys: verify that a control channel exists\n\nThe code didn't verify that a control channel exists before trying to\nuse it. It caused NULL ptr derefs which were easy to trigger by an\nunpriviliged user simply by reading the proc file, causing:\n\n[ 68.161404] BUG: unable to handle kernel NULL pointer dereference at (null)\n[ 68.162442] IP: visorchannel_read (drivers\/staging\/unisys\/visorchannel\/visorchannel_funcs.c:225)\n[ 68.163165] PGD 5ca21067 PUD 5ca20067 PMD 0\n[ 68.163712] Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC\n[ 68.164390] Dumping ftrace buffer:\n[ 68.164793] (ftrace buffer empty)\n[ 68.165220] Modules linked in:\n[ 68.165601] CPU: 0 PID: 7915 Comm: cat Tainted: G W 3.14.0-next-20140403-sasha-00012-gef5fa7d-dirty #373\n[ 68.166821] task: ffff88006e8c3000 ti: ffff88005ca30000 task.ti: ffff88005ca30000\n[ 68.167689] RIP: visorchannel_read (drivers\/staging\/unisys\/visorchannel\/visorchannel_funcs.c:225)\n[ 68.168683] RSP: 0018:ffff88005ca31e58 EFLAGS: 00010282\n[ 68.169302] RAX: ffff88005ca10000 RBX: ffff88005ca31e97 RCX: 0000000000000001\n[ 68.170019] RDX: ffff88005ca31e97 RSI: 0000000000000bd6 RDI: 0000000000000000\n[ 68.170019] RBP: ffff88005ca31e78 R08: 0000000000000000 R09: 0000000000000000\n[ 68.170019] R10: ffff880000000000 R11: 0000000000000001 R12: 0000000000000001\n[ 68.170019] R13: 0000000000000bd6 R14: 0000000000000000 R15: 0000000000008000\n[ 68.170019] FS: 00007f0e8c041700(0000) GS:ffff88007be00000(0000) knlGS:0000000000000000\n[ 68.170019] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n[ 68.170019] CR2: 0000000000000000 CR3: 000000006efe9000 CR4: 00000000000006b0\n[ 68.170019] Stack:\n[ 68.170019] ffff88005ca31f50 ffff88005ca10000 000000000060e000 ffff88005ca31f50\n[ 68.170019] ffff88005ca31ec8 ffffffff83e6f983 ffff8800780db810 0000000000008000\n[ 68.170019] ffff88005ca31ec8 ffff88006da5f908 ffff8800780db800 000000000060e000\n[ 68.170019] Call Trace:\n[ 68.170019] proc_read_toolaction (drivers\/staging\/unisys\/visorchipset\/visorchipset_main.c:2541)\n[ 68.170019] proc_reg_read (fs\/proc\/inode.c:211)\n[ 68.170019] vfs_read (fs\/read_write.c:408)\n[ 68.170019] SyS_read (fs\/read_write.c:519 fs\/read_write.c:511)\n[ 68.170019] tracesys (arch\/x86\/kernel\/entry_64.S:749)\n[ 68.170019] Code: 00 00 66 66 66 66 90 55 48 89 e5 48 83 ec 20 48 89 5d e0 48 89 d3 4c 89 65 e8 49 89 cc 4c 89 6d f0 49 89 f5 4c 89 75 f8 49 89 fe <48> 8b 3f e8 4f f9 ff ff 85 c0 0f 88 97 00 00 00 4d 85 ed 0f 85\n[ 68.170019] RIP visorchannel_read (drivers\/staging\/unisys\/visorchannel\/visorchannel_funcs.c:225)\n[ 68.170019] RSP <ffff88005ca31e58>\n[ 68.170019] CR2: 0000000000000000\n\nSigned-off-by: Sasha Levin <e642b69ed2fc111e09ffdc37feb733a52253340d@oracle.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/unisys\/visorchipset\/visorchipset_main.c\n+++ drivers\/staging\/unisys\/visorchipset\/visorchipset_main.c\n@@ -2414,6 +2414,9 @@\n \tchar *vbuf;\n \tloff_t pos = *offset;\n \n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n+\n \tif (pos < 0)\n \t\treturn -EINVAL;\n \n@@ -2463,6 +2466,9 @@\n \tU16 remainingSteps;\n \tU32 error, textId;\n \n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n+\n \t\/* Check to make sure there is no buffer overflow *\/\n \tif (count > (sizeof(buf) - 1))\n \t\treturn -EINVAL;\n@@ -2524,6 +2530,9 @@\n \tchar *vbuf;\n \tloff_t pos = *offset;\n \n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n+\n \tif (pos < 0)\n \t\treturn -EINVAL;\n \n@@ -2561,6 +2570,9 @@\n {\n \tchar buf[3];\n \tU8 toolAction;\n+\n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n \n \t\/* Check to make sure there is no buffer overflow *\/\n \tif (count > (sizeof(buf) - 1))\n@@ -2601,6 +2613,9 @@\n \tchar *vbuf;\n \tloff_t pos = *offset;\n \n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n+\n \tif (pos < 0)\n \t\treturn -EINVAL;\n \n@@ -2638,6 +2653,9 @@\n \tchar buf[3];\n \tint inputVal;\n \tULTRA_EFI_SPAR_INDICATION efiSparIndication;\n+\n+\tif (!ControlVm_channel)\n+\t\treturn -ENODEV;\n \n \t\/* Check to make sure there is no buffer overflow *\/\n \tif (count > (sizeof(buf) - 1))\n"} {"commit":"a33addeb8eb828a8e3c56d078d5489e49ce0b69c","subject":"DOC: Updated documentation for ThresholdMaximumConnectedComponents","message":"DOC: Updated documentation for ThresholdMaximumConnectedComponents\n\nChange-Id: I7c1ceca414037038f562ad9d87cce9eb037bfd25\n","repos":"BRAINSia\/ITK,Kitware\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,hendradarwin\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,malaterre\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,jmerkow\/ITK,LucasGandel\/ITK,jmerkow\/ITK,blowekamp\/ITK,biotrump\/ITK,GEHC-Surgery\/ITK,jcfr\/ITK,stnava\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,atsnyder\/ITK,vfonov\/ITK,hjmjohnson\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,biotrump\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,blowekamp\/ITK,eile\/ITK,jmerkow\/ITK,hinerm\/ITK,spinicist\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,hendradarwin\/ITK,blowekamp\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,blowekamp\/ITK,malaterre\/ITK,fedral\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,fedral\/ITK,spinicist\/ITK,vfonov\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,hinerm\/ITK,paulnovo\/ITK,vfonov\/ITK,fbudin69500\/ITK,biotrump\/ITK,paulnovo\/ITK,msmolens\/ITK,BRAINSia\/ITK,msmolens\/ITK,malaterre\/ITK,LucasGandel\/ITK,eile\/ITK,hendradarwin\/ITK,msmolens\/ITK,Kitware\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,thewtex\/ITK,BlueBrain\/ITK,stnava\/ITK,vfonov\/ITK,spinicist\/ITK,stnava\/ITK,heimdali\/ITK,ajjl\/ITK,hendradarwin\/ITK,vfonov\/ITK,msmolens\/ITK,Kitware\/ITK,stnava\/ITK,zachary-williamson\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,jcfr\/ITK,BRAINSia\/ITK,spinicist\/ITK,LucHermitte\/ITK,PlutoniumHeart\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,vfonov\/ITK,richardbeare\/ITK,eile\/ITK,hendradarwin\/ITK,hinerm\/ITK,stnava\/ITK,fbudin69500\/ITK,InsightSoftwareConsortium\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,paulnovo\/ITK,heimdali\/ITK,malaterre\/ITK,msmolens\/ITK,fedral\/ITK,jcfr\/ITK,msmolens\/ITK,vfonov\/ITK,zachary-williamson\/ITK,spinicist\/ITK,blowekamp\/ITK,stnava\/ITK,hendradarwin\/ITK,zachary-williamson\/ITK,malaterre\/ITK,jmerkow\/ITK,fbudin69500\/ITK,jcfr\/ITK,thewtex\/ITK,richardbeare\/ITK,hinerm\/ITK,Kitware\/ITK,biotrump\/ITK,fbudin69500\/ITK,richardbeare\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,fedral\/ITK,heimdali\/ITK,biotrump\/ITK,fedral\/ITK,ajjl\/ITK,malaterre\/ITK,BlueBrain\/ITK,biotrump\/ITK,zachary-williamson\/ITK,ajjl\/ITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,spinicist\/ITK,atsnyder\/ITK,hendradarwin\/ITK,hinerm\/ITK,Kitware\/ITK,eile\/ITK,LucHermitte\/ITK,thewtex\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,eile\/ITK,atsnyder\/ITK,GEHC-Surgery\/ITK,paulnovo\/ITK,BlueBrain\/ITK,eile\/ITK,eile\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,ajjl\/ITK,hjmjohnson\/ITK,jcfr\/ITK,paulnovo\/ITK,spinicist\/ITK,fedral\/ITK,jmerkow\/ITK,BlueBrain\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,rhgong\/itk-with-dom,heimdali\/ITK,jmerkow\/ITK,jcfr\/ITK,paulnovo\/ITK,fbudin69500\/ITK,LucHermitte\/ITK,eile\/ITK,ajjl\/ITK,hjmjohnson\/ITK,stnava\/ITK,eile\/ITK,fbudin69500\/ITK,hinerm\/ITK,jmerkow\/ITK,malaterre\/ITK,zachary-williamson\/ITK,blowekamp\/ITK,PlutoniumHeart\/ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,blowekamp\/ITK,richardbeare\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,hinerm\/ITK,ajjl\/ITK,thewtex\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,spinicist\/ITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,thewtex\/ITK,GEHC-Surgery\/ITK,ajjl\/ITK,LucasGandel\/ITK,paulnovo\/ITK,jcfr\/ITK,atsnyder\/ITK,atsnyder\/ITK,LucasGandel\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,Kitware\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,hjmjohnson\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,BlueBrain\/ITK,vfonov\/ITK,richardbeare\/ITK,msmolens\/ITK,richardbeare\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,heimdali\/ITK,malaterre\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,thewtex\/ITK,fedral\/ITK,heimdali\/ITK,ajjl\/ITK,Kitware\/ITK,thewtex\/ITK,msmolens\/ITK,jmerkow\/ITK,richardbeare\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/Segmentation\/ConnectedComponents\/include\/itkThresholdMaximumConnectedComponentsImageFilter.h\n+++ Modules\/Segmentation\/ConnectedComponents\/include\/itkThresholdMaximumConnectedComponentsImageFilter.h\n@@ -35,14 +35,14 @@\n * This method is based on Topological Stable State Thresholding to\n * calculate the threshold set point. This method is particularly\n * effective when there are a large number of objects in a microscopy\n- * image. Uncomment the output statements in the GenerateData section\n- * to see how the filter focuses in on a threshold value.\n- * Please see the Insight Journal's MICCAI 2005 workshop for a complete\n- * description. References are below.\n+ * image. Compiling in Debug mode and enable the debug flag for this\n+ * filter to print debug information to see how the filter focuses in\n+ * on a threshold value. Please see the Insight Journal's MICCAI 2005\n+ * workshop for a complete description. References are below.\n *\n * \\par Parameters\n- * The MinimumPixelArea parameter is controlled through the class\n- * Get\/SetMinimumPixelArea() method. Similar to the standard\n+ * The MinimumObjectSizeInPixels parameter is controlled through the class\n+ * Get\/SetMinimumObjectSizeInPixels() method. Similar to the standard\n * itk::BinaryThresholdImageFilter the Get\/SetInside and Get\/SetOutside values\n * of the threshold can be set. The GetNumberOfObjects() and\n * GetThresholdValue() methods return the number of objects above the\n@@ -50,10 +50,11 @@\n *\n * \\par Automatic Thresholding in ITK\n * There are multiple methods to automatically calculate the threshold\n- * intensity value of an image. As of version 2.6, ITK implements two of these.\n- * Otsu thresholding (see itk::OtsuThresholdImageFilter) is a common method for\n- * segmenting CT radiographs. Topological Stable State Thresholding works well\n- * on images with a large number of objects to be counted.\n+ * intensity value of an image. As of version 4.0, ITK has a\n+ * Thresholding ( ITKThresholding ) module which contains numerous\n+ * automatic thresholding methods.implements two of these. Topological\n+ * Stable State Thresholding works well on images with a large number\n+ * of objects to be counted.\n *\n * \\par References:\n * 1) Urish KL, August J, Huard J. \"Unsupervised segmentation for myofiber\n"} {"commit":"6c7d1e179f7efdbb51e9199dd126baedacd9999f","subject":"fixed renaming","message":"fixed renaming\n","repos":"joekickass\/esp8266-arduino-aws-iot-ws,joekickass\/esp8266-arduino-aws-iot-ws","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/common\/AWSClient4.h\n+++ src\/common\/AWSClient4.h\n@@ -36,15 +36,15 @@\n \/* The user's AWS Access Key ID for accessing the AWS Resource. *\/\n char* awsKeyID;\n \/* GMT date in yyyyMMdd format. *\/\n- char awsDate[AWS_DATE_LEN2 + 1];\n+ char awsDate[AWS_DATE_LEN4 + 1];\n \/* GMT time in HHmmss format. *\/\n- char awsTime[AWS_TIME_LEN2 + 1];\n+ char awsTime[AWS_TIME_LEN4 + 1];\n \/* Number of headers created. *\/\n int headersCreated;\n \/* Array of the created http headers. *\/\n- char* headers[HEADER_COUNT2];\n+ char* headers[HEADER_COUNT4];\n \/* Array of string lengths of the headers in the \"headers\" array. *\/\n- int headerLens[HEADER_COUNT2];\n+ int headerLens[HEADER_COUNT4];\n \/* The payload of the httprequest to be created *\/\n MinimalString payload;\n \n@@ -89,7 +89,7 @@\n \/* Sends http data. Returns http response, or null on error. *\/\n char* sendData(const char* data);\n \/* Empty constructor. Must also be initialized with init. *\/\n- AWSClient2();\n+ AWSClient4();\n \n public:\n \/* Setters for values used by createRequest and createCurlRequest. Must\n@@ -104,7 +104,7 @@\n void setAWSKeyID(const char * awsKeyID);\n void setHttpClient(IHttpClient* httpClient);\n void setDateTimeProvider(IDateTimeProvider* dateTimeProvider);\n- ~AWSClient2(void);\n+ ~AWSClient4(void);\n };\n \n #endif \/* AWSCLIENT4_H_ *\/\n"} {"commit":"f886c31fecb1862e4a060e9a30fb3620544d0a88","subject":"pkcs11_pass_login(): do not clean a zero length PIN","message":"pkcs11_pass_login(): do not clean a zero length PIN\n\nThanks to Andre Zepezauer for the patch\nhttp:\/\/www.opensc-project.org\/pipermail\/opensc-devel\/2010-September\/014964.html\n\n","repos":"milgner\/pam_pkcs11,milgner\/pam_pkcs11,OpenSC\/pam_pkcs11,milgner\/pam_pkcs11,OpenSC\/pam_pkcs11","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/common\/pkcs11_lib.c\n+++ src\/common\/pkcs11_lib.c\n@@ -51,7 +51,6 @@\n \n \/* check password length *\/\n if (!nullok && strlen(pin) == 0) {\n- memset(pin, 0, strlen(pin));\n free(pin);\n set_error(\"Empty passwords not allowed\");\n return -1;\n"} {"commit":"e17d6f62db66567aaf4b57991b7697fb029b5dcc","subject":"'main_clean'","message":"'main_clean'\n","repos":"shomagan\/projek,shomagan\/projek,shomagan\/projek,shomagan\/projek","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Src\/main.c\n+++ Src\/main.c\n@@ -3,41 +3,7 @@\n * File Name : main.c\n * Description : Main program body\n ******************************************************************************\n- *\n- * Copyright (c) 2016 STMicroelectronics International N.V. \n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without \n- * modification, are permitted, provided that the following conditions are met:\n- *\n- * 1. Redistribution of source code must retain the above copyright notice, \n- * this list of conditions and the following disclaimer.\n- * 2. Redistributions in binary form must reproduce the above copyright notice,\n- * this list of conditions and the following disclaimer in the documentation\n- * and\/or other materials provided with the distribution.\n- * 3. Neither the name of STMicroelectronics nor the names of other \n- * contributors to this software may be used to endorse or promote products \n- * derived from this software without specific written permission.\n- * 4. This software, including modifications and\/or derivative works of this \n- * software, must execute solely and exclusively on microcontroller or\n- * microprocessor devices manufactured by or for STMicroelectronics.\n- * 5. Redistribution and use of this software other than as permitted under \n- * this license is void and will automatically terminate your rights under \n- * this license. \n- *\n- * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS \"AS IS\" \n- * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT \n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A \n- * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY\n- * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT \n- * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, \n- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF \n- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \n- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- *\n+ \n ******************************************************************************\n *\/\n \/* Includes ------------------------------------------------------------------*\/\n"} {"commit":"d98b29aef686070015400223b7366409592cf29a","subject":"Different buffering for stdout.","message":"Different buffering for stdout.\n","repos":"csound\/csound,ketchupok\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,csound\/csound,csound\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,ketchupok\/csound,csound\/csound,csound\/csound,csound\/csound,csound\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Top\/main.c\n+++ Top\/main.c\n@@ -477,7 +477,7 @@\n err_printf(Str(X_1386,\"xfilename: %s\\n\"), xfilename);\n #if defined(SYS5) || defined(WIN32) || defined(__EMX__)\n {\n- if (O.odebug) setvbuf(stdout,0,_IONBF,80);\n+ if (O.odebug) setvbuf(stdout,0,_IOLBF,0xff);\n }\n #else\n #if !defined(SYMANTEC) && !defined(mac_classic) && !defined(LATTICE)\n"} {"commit":"6d19042843ecf5f45c93497d28d3caf4399421f8","subject":"Added Index parameter to IndexOfTypeListItem","message":"Added Index parameter to IndexOfTypeListItem\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- TypeList.h\n+++ TypeList.h\n@@ -179,11 +179,11 @@\n \tstruct TryGetTypeListItem<TypeList, -1>\n \t{ CompileTimeAssert<sizeof(TypeList) < 0>\tERROR_invalid_index; };\n \n-\ttemplate < typename TypeList, typename T >\n+\ttemplate < typename TypeList, typename T, size_t Index_ = 0>\n \tstruct IndexOfTypeListItem\n \t{\n \tprivate:\n-\t\tstatic const int NextResult = IndexOfTypeListItem<typename TypeList::Next, T>::Value;\n+\t\tstatic const int NextResult = IndexOfTypeListItem<typename TypeList::Next, T, Index_>::Value;\n \tpublic:\n \t\tstatic const int Value = (NextResult == -1) ? -1 : (NextResult + 1);\n \t};\n@@ -194,11 +194,20 @@\n \t\tstatic const int Value = IndexOfTypeListItem<TypeList, T>::Value != -1;\n \t};\n \n-\ttemplate < typename T >\n-\tstruct IndexOfTypeListItem<TypeListEndNode, T> { static const int Value = -1; };\n-\n-\ttemplate < typename TypeList >\n-\tstruct IndexOfTypeListItem<TypeList, typename TypeList::ValueT> { static const int Value = 0; };\n+\ttemplate < typename T, size_t Index_ >\n+\tstruct IndexOfTypeListItem<TypeListEndNode, T, Index_> { static const int Value = -1; };\n+\n+\ttemplate < typename TypeList, size_t Index_ >\n+\tstruct IndexOfTypeListItem<TypeList, typename TypeList::ValueT, Index_>\n+\t{\n+\tprivate:\n+\t\tstatic const int NextResult = IndexOfTypeListItem<typename TypeList::Next, typename TypeList::ValueT, Index_ - 1>::Value;\n+\tpublic:\n+\t\tstatic const int Value = (NextResult == -1) ? -1 : (NextResult + 1);\n+\t};\n+\n+\ttemplate < typename TypeList >\n+\tstruct IndexOfTypeListItem<TypeList, typename TypeList::ValueT, 0> { static const int Value = 0; };\n \n \t\/\/ TODO: Add invalid index error to GetTypeListItem\n \n"} {"commit":"63f57b3ae2d4959f343b0a30f38d75b733024c2a","subject":"Verify that the variable returned can support the fetch.","message":"Verify that the variable returned can support the fetch.\n\n\ngit-svn-id: b746c3c07d6b14fe725b72f068c7252a81557b48@131 0cf6dada-cf32-0410-b4fe-d86b42e8394d\n","repos":"Bluehorn\/cx_Oracle,Bluehorn\/cx_Oracle,Bluehorn\/cx_Oracle","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Variable.c\n+++ Variable.c\n@@ -698,6 +698,7 @@\n ub4 maxLength, \/\/ maximum length of variable\n unsigned numElements) \/\/ number of elements\n {\n+ udt_Variable *var;\n PyObject *result;\n ub4 nameLength;\n sb2 precision;\n@@ -740,14 +741,24 @@\n return Variable_New(cursor, numElements, varType, maxLength);\n }\n \n- \/\/ otherwise, return the result, ensuring it is a variable first\n+ \/\/ otherwise, verify that the result is an actual variable\n if (!Variable_Check(result)) {\n Py_DECREF(result);\n PyErr_SetString(PyExc_TypeError,\n \"expecting variable from output type handler\");\n return NULL;\n }\n- return (udt_Variable*) result;\n+\n+ \/\/ verify that the array size is sufficient to handle the fetch\n+ var = (udt_Variable*) result;\n+ if (var->allocatedElements < cursor->fetchArraySize) {\n+ Py_DECREF(result);\n+ PyErr_SetString(PyExc_TypeError,\n+ \"expecting variable with array size large enough for fetch\");\n+ return NULL;\n+ }\n+\n+ return var;\n }\n \n \n"} {"commit":"5cd43a794aee859171cff7b2e3556758518c9047","subject":"BUG: initialization of the weight series needed","message":"BUG: initialization of the weight series needed\n","repos":"orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/MultiTemporal\/otbTimeSeriesLeastSquareFittingFunctor.h\n+++ Code\/MultiTemporal\/otbTimeSeriesLeastSquareFittingFunctor.h\n@@ -57,6 +57,8 @@\n \/\/\/ Constructor\n TimeSeriesLeastSquareFittingFunctor()\n {\n+ for(unsigned int i=0; i<m_WeightSeries.Size(); ++i)\n+ m_WeightSeries[i] = 1.0;\n }\n \/\/\/ Destructor\n virtual ~TimeSeriesLeastSquareFittingFunctor() {}\n"} {"commit":"28f61fd58d1c6d0e768a05e4f2a36f2443b28550","subject":"another attempt at fix qCompilerAndStdLib_stdfilesystemAppearsPresentButDoesntWork_Buggy for macos","message":"another attempt at fix qCompilerAndStdLib_stdfilesystemAppearsPresentButDoesntWork_Buggy for macos\n","repos":"SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika,SophistSolutions\/Stroika","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Library\/Sources\/Stroika\/Foundation\/IO\/FileSystem\/Common.h\n+++ Library\/Sources\/Stroika\/Foundation\/IO\/FileSystem\/Common.h\n@@ -28,7 +28,7 @@\n \/*\n * If forced to use boost filesystem or experimental filesystem, make it look like std::filesystem.\n *\/\n-#if !(__cpp_lib_filesystem >= 201603)\n+#if !(__cpp_lib_filesystem >= 201603) || qCompilerAndStdLib_stdfilesystemAppearsPresentButDoesntWork_Buggy\n #if (__cpp_lib_experimental_filesystem >= 201406 || __has_include(<experimental\/filesystem>)) && !qCompilerAndStdLib_stdfilesystemAppearsPresentButDoesntWork_Buggy\n namespace std::filesystem {\n using namespace std::experimental::filesystem;\n"} {"commit":"94b999aa099a645bd8609667d808eec4da138596","subject":"COMP: TransformFileReaderTemplate: Remove undefined method \"CreateTransform()\"","message":"COMP: TransformFileReaderTemplate: Remove undefined method \"CreateTransform()\"\n\nThis commit removes method declaration without definition that was\noriginally introduced in f85e0be (COMP: Fixed up some KWStyle violations\nENH: Instituted the ImageIO class pattern for Transform I\/O)\n\nIt fixes windows the following warning happening when experimenting with\nexplicit instantiation:\n\nwarning C4661: 'void itk::TransformFileReaderTemplate<TParametersValueType>::CreateTransform(itk::SmartPointer<TObjectType> &,const std::string &)' : no suitable definition provided for explicit template instantiation request\tC:\\path\/to\\Modules\\IO\\TransformBase\\include\\itkTransformFileReader.hxx\n\nSee #3393\n\nChange-Id: Ie2940431bf998b3fb1dec15fbb32c434d926ca4e\n","repos":"BRAINSia\/ITK,blowekamp\/ITK,thewtex\/ITK,malaterre\/ITK,malaterre\/ITK,spinicist\/ITK,spinicist\/ITK,blowekamp\/ITK,vfonov\/ITK,malaterre\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,Kitware\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,richardbeare\/ITK,vfonov\/ITK,vfonov\/ITK,jcfr\/ITK,Kitware\/ITK,fbudin69500\/ITK,zachary-williamson\/ITK,spinicist\/ITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,jcfr\/ITK,stnava\/ITK,vfonov\/ITK,spinicist\/ITK,richardbeare\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,richardbeare\/ITK,LucasGandel\/ITK,thewtex\/ITK,stnava\/ITK,richardbeare\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,spinicist\/ITK,fbudin69500\/ITK,malaterre\/ITK,stnava\/ITK,LucasGandel\/ITK,thewtex\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,thewtex\/ITK,spinicist\/ITK,Kitware\/ITK,blowekamp\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,blowekamp\/ITK,vfonov\/ITK,zachary-williamson\/ITK,zachary-williamson\/ITK,fbudin69500\/ITK,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,LucasGandel\/ITK,stnava\/ITK,richardbeare\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,jcfr\/ITK,fbudin69500\/ITK,spinicist\/ITK,stnava\/ITK,PlutoniumHeart\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,BRAINSia\/ITK,thewtex\/ITK,Kitware\/ITK,stnava\/ITK,LucasGandel\/ITK,thewtex\/ITK,jcfr\/ITK,vfonov\/ITK,thewtex\/ITK,hjmjohnson\/ITK,hjmjohnson\/ITK,malaterre\/ITK,jcfr\/ITK,zachary-williamson\/ITK,vfonov\/ITK,stnava\/ITK,spinicist\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,jcfr\/ITK,spinicist\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,Kitware\/ITK,stnava\/ITK,hjmjohnson\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,blowekamp\/ITK,Kitware\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,fbudin69500\/ITK,vfonov\/ITK,BRAINSia\/ITK,malaterre\/ITK,vfonov\/ITK,BRAINSia\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/IO\/TransformBase\/include\/itkTransformFileReader.h\n+++ Modules\/IO\/TransformBase\/include\/itkTransformFileReader.h\n@@ -85,7 +85,6 @@\n \n TransformFileReaderTemplate();\n virtual ~TransformFileReaderTemplate();\n- void CreateTransform(TransformPointer & ptr, const std::string & ClassName);\n \n TransformListType m_TransformList;\n typename TransformIOType::Pointer m_TransformIO;\n"} {"commit":"e204f992a7928c35a9218b3924e87aa8fe56c568","subject":"COMP: Conditional assert check warning unused var.","message":"COMP: Conditional assert check warning unused var.\n\nITKv4\/Modules\/ThirdParty\/VNL\/src\/vxl\/core\/vnl\/vnl_diag_matrix.h:82:47: warning:\n unused parameter 'j' [-Wunused-parameter]\ninline T& operator () (unsigned i, unsigned j) {\n\nChange-Id: I8ca952cdbea58ab42879bfe362ed7a1ef505db1c\n","repos":"spinicist\/ITK,spinicist\/ITK,BRAINSia\/ITK,jmerkow\/ITK,fedral\/ITK,BlueBrain\/ITK,eile\/ITK,blowekamp\/ITK,LucasGandel\/ITK,stnava\/ITK,jcfr\/ITK,eile\/ITK,biotrump\/ITK,msmolens\/ITK,stnava\/ITK,atsnyder\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,spinicist\/ITK,eile\/ITK,blowekamp\/ITK,fedral\/ITK,ajjl\/ITK,eile\/ITK,biotrump\/ITK,biotrump\/ITK,fedral\/ITK,InsightSoftwareConsortium\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,vfonov\/ITK,richardbeare\/ITK,LucHermitte\/ITK,malaterre\/ITK,malaterre\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,atsnyder\/ITK,malaterre\/ITK,fbudin69500\/ITK,jcfr\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,msmolens\/ITK,BRAINSia\/ITK,hjmjohnson\/ITK,jcfr\/ITK,Kitware\/ITK,vfonov\/ITK,blowekamp\/ITK,hjmjohnson\/ITK,fedral\/ITK,vfonov\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,jmerkow\/ITK,atsnyder\/ITK,heimdali\/ITK,fbudin69500\/ITK,malaterre\/ITK,blowekamp\/ITK,jmerkow\/ITK,richardbeare\/ITK,malaterre\/ITK,richardbeare\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,Kitware\/ITK,heimdali\/ITK,ajjl\/ITK,BlueBrain\/ITK,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,vfonov\/ITK,atsnyder\/ITK,atsnyder\/ITK,hendradarwin\/ITK,ajjl\/ITK,stnava\/ITK,hjmjohnson\/ITK,zachary-williamson\/ITK,msmolens\/ITK,stnava\/ITK,fedral\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,eile\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,msmolens\/ITK,jcfr\/ITK,msmolens\/ITK,zachary-williamson\/ITK,spinicist\/ITK,heimdali\/ITK,LucHermitte\/ITK,blowekamp\/ITK,LucHermitte\/ITK,BRAINSia\/ITK,eile\/ITK,vfonov\/ITK,spinicist\/ITK,jcfr\/ITK,fedral\/ITK,zachary-williamson\/ITK,richardbeare\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,heimdali\/ITK,zachary-williamson\/ITK,vfonov\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,thewtex\/ITK,vfonov\/ITK,LucasGandel\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,ajjl\/ITK,msmolens\/ITK,zachary-williamson\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,biotrump\/ITK,fedral\/ITK,hendradarwin\/ITK,eile\/ITK,spinicist\/ITK,Kitware\/ITK,Kitware\/ITK,atsnyder\/ITK,vfonov\/ITK,zachary-williamson\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,richardbeare\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,thewtex\/ITK,fbudin69500\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,ajjl\/ITK,LucHermitte\/ITK,spinicist\/ITK,spinicist\/ITK,hendradarwin\/ITK,thewtex\/ITK,richardbeare\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,jcfr\/ITK,zachary-williamson\/ITK,thewtex\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,thewtex\/ITK,ajjl\/ITK,Kitware\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,fedral\/ITK,ajjl\/ITK,BRAINSia\/ITK,jmerkow\/ITK,jmerkow\/ITK,malaterre\/ITK,stnava\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,eile\/ITK,msmolens\/ITK,spinicist\/ITK,biotrump\/ITK,LucasGandel\/ITK,heimdali\/ITK,jcfr\/ITK,Kitware\/ITK,LucHermitte\/ITK,hendradarwin\/ITK,malaterre\/ITK,heimdali\/ITK,stnava\/ITK,thewtex\/ITK,BlueBrain\/ITK,Kitware\/ITK,eile\/ITK,BRAINSia\/ITK,stnava\/ITK,atsnyder\/ITK,jmerkow\/ITK,jmerkow\/ITK,heimdali\/ITK,heimdali\/ITK,biotrump\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,jmerkow\/ITK,vfonov\/ITK,LucHermitte\/ITK,thewtex\/ITK,LucasGandel\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Modules\/ThirdParty\/VNL\/src\/vxl\/core\/vnl\/vnl_diag_matrix.h\n+++ Modules\/ThirdParty\/VNL\/src\/vxl\/core\/vnl\/vnl_diag_matrix.h\n@@ -80,7 +80,7 @@\n }\n \n inline T& operator () (unsigned i, unsigned j) {\n- assert(i == j);\n+ assert(i == j); (void)j;\n return diagonal_[i];\n }\n inline T& operator() (unsigned i) { return diagonal_[i]; }\n"} {"commit":"a703c295c00135561a101c330fee28fbe2ee1bc0","subject":"STYLE: Fixing the version number in which several methods are being deprecated. It is 3.8 instead of 3.6.","message":"STYLE: Fixing the version number in which several methods are being deprecated.\n It is 3.8 instead of 3.6.\n","repos":"GEHC-Surgery\/ITK,richardbeare\/ITK,atsnyder\/ITK,msmolens\/ITK,zachary-williamson\/ITK,vfonov\/ITK,hjmjohnson\/ITK,ajjl\/ITK,CapeDrew\/DITK,wkjeong\/ITK,jcfr\/ITK,vfonov\/ITK,fbudin69500\/ITK,Kitware\/ITK,rhgong\/itk-with-dom,LucasGandel\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,eile\/ITK,paulnovo\/ITK,hinerm\/ITK,fedral\/ITK,fedral\/ITK,LucasGandel\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,jmerkow\/ITK,jcfr\/ITK,CapeDrew\/DCMTK-ITK,BRAINSia\/ITK,biotrump\/ITK,Kitware\/ITK,stnava\/ITK,wkjeong\/ITK,biotrump\/ITK,malaterre\/ITK,GEHC-Surgery\/ITK,eile\/ITK,fbudin69500\/ITK,hinerm\/ITK,BlueBrain\/ITK,CapeDrew\/DCMTK-ITK,fedral\/ITK,thewtex\/ITK,biotrump\/ITK,InsightSoftwareConsortium\/ITK,hinerm\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,stnava\/ITK,msmolens\/ITK,GEHC-Surgery\/ITK,fbudin69500\/ITK,rhgong\/itk-with-dom,blowekamp\/ITK,cpatrick\/ITK-RemoteIO,jcfr\/ITK,BlueBrain\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,jmerkow\/ITK,LucHermitte\/ITK,thewtex\/ITK,heimdali\/ITK,CapeDrew\/DITK,paulnovo\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,paulnovo\/ITK,thewtex\/ITK,stnava\/ITK,BRAINSia\/ITK,cpatrick\/ITK-RemoteIO,Kitware\/ITK,CapeDrew\/DCMTK-ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,eile\/ITK,BlueBrain\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,CapeDrew\/DITK,hjmjohnson\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,wkjeong\/ITK,vfonov\/ITK,ajjl\/ITK,msmolens\/ITK,blowekamp\/ITK,vfonov\/ITK,wkjeong\/ITK,hjmjohnson\/ITK,heimdali\/ITK,cpatrick\/ITK-RemoteIO,richardbeare\/ITK,hjmjohnson\/ITK,itkvideo\/ITK,stnava\/ITK,jcfr\/ITK,heimdali\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,blowekamp\/ITK,jmerkow\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,blowekamp\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,LucasGandel\/ITK,paulnovo\/ITK,thewtex\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,hendradarwin\/ITK,heimdali\/ITK,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,atsnyder\/ITK,itkvideo\/ITK,LucasGandel\/ITK,paulnovo\/ITK,BRAINSia\/ITK,heimdali\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,BlueBrain\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,wkjeong\/ITK,LucHermitte\/ITK,vfonov\/ITK,spinicist\/ITK,malaterre\/ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,eile\/ITK,GEHC-Surgery\/ITK,ajjl\/ITK,thewtex\/ITK,ajjl\/ITK,msmolens\/ITK,heimdali\/ITK,blowekamp\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,vfonov\/ITK,blowekamp\/ITK,BlueBrain\/ITK,malaterre\/ITK,spinicist\/ITK,spinicist\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,spinicist\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,richardbeare\/ITK,BRAINSia\/ITK,jcfr\/ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,spinicist\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,wkjeong\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,eile\/ITK,GEHC-Surgery\/ITK,thewtex\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,jmerkow\/ITK,atsnyder\/ITK,biotrump\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,msmolens\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,jcfr\/ITK,ajjl\/ITK,eile\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,hinerm\/ITK,hendradarwin\/ITK,vfonov\/ITK,itkvideo\/ITK,heimdali\/ITK,biotrump\/ITK,heimdali\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,blowekamp\/ITK,hinerm\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,fedral\/ITK,Kitware\/ITK,ajjl\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,malaterre\/ITK,daviddoria\/itkHoughTransform,stnava\/ITK,zachary-williamson\/ITK,fedral\/ITK,itkvideo\/ITK,stnava\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,stnava\/ITK,hinerm\/ITK,zachary-williamson\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,fedral\/ITK,stnava\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,PlutoniumHeart\/ITK,jmerkow\/ITK,BRAINSia\/ITK,hendradarwin\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,itkvideo\/ITK,eile\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,vfonov\/ITK,msmolens\/ITK,itkvideo\/ITK,blowekamp\/ITK,LucHermitte\/ITK,vfonov\/ITK,richardbeare\/ITK,LucasGandel\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,itkvideo\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,hinerm\/ITK,biotrump\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,InsightSoftwareConsortium\/ITK,wkjeong\/ITK,msmolens\/ITK,Kitware\/ITK,thewtex\/ITK,malaterre\/ITK,stnava\/ITK,hendradarwin\/ITK,hjmjohnson\/ITK,cpatrick\/ITK-RemoteIO,fuentesdt\/InsightToolkit-dev","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/IO\/itkIOCommon.h\n+++ Code\/IO\/itkIOCommon.h\n@@ -67,14 +67,14 @@\n \n \/** Given a full filename, extracts just the pathname. \n *\n- * \\deprecated in ITK 3.6, please use\n+ * \\deprecated in ITK 3.8, please use\n * itksys::SystemTools::GetFilenamePath(fileName) instead.\n *\/\n itkLegacyMacro( static char* ExtractFilePath (const char* fileName) );\n \n \/** Given a full filename, extracts just the file extension.\n *\n- * \\deprecated in ITK 3.6, please use\n+ * \\deprecated in ITK 3.8, please use\n * itksys::SystemTools::GetFilenameExtension(fileName) or\n * itksys::SystemTools::GetFilenameLastExtension(fileName) instead.\n *\/\n@@ -82,7 +82,7 @@\n \n \/** Given a full filename, extracts just the filename.\n *\n- * \\deprecated in ITK 3.6, please use\n+ * \\deprecated in ITK 3.8, please use\n * itksys::SystemTools::GetFilenameName(fileName) instead.\n *\/\n itkLegacyMacro( static char* ExtractFileName (const char* fileName) );\n@@ -90,7 +90,7 @@\n \/** Given a filename determine whether it exists and return true if\n * it does.\n *\n- * \\deprecated in ITK 3.6, please use\n+ * \\deprecated in ITK 3.8, please use\n * itksys::SystemTools::FileExists(fileName) instead.\n *\/\n itkLegacyMacro( static bool FileExists(const char* filename) );\n"} {"commit":"dc60a9cc187315b2c2ae9e7516649dbf3542b466","subject":"rearrange code","message":"rearrange code\n","repos":"kevin-dong-nai-jia\/OpenGC3,kevin-dong-nai-jia\/C-Container-Collection","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/dllst-test.c\n+++ tests\/dllst-test.c\n@@ -13,14 +13,13 @@\n \n {\n cc_dllst(msg, char*);\n+ cc_dllst_iter(msg_iter, msg);\n \n cc_dllst_push_back(msg, \"Hello everyone:\\n\");\n cc_dllst_push_back(msg, \"Welcome to C Container Collection Project!\\n\");\n \n- {\n- cc_dllst_iter(msg_iter, msg);\n- cc_dllst_trav(msg_iter, msg) printf(\"%s\", **msg_iter);\n- }\n+ cc_dllst_trav(msg_iter, msg)\n+ printf(\"%s\", ***msg_iter);\n \n cc_dllst_dealloc(msg);\n }\n@@ -42,10 +41,9 @@\n while (puts(\"\") && cnt <= 10)\n {\n cc_dllst_iter(test1_iter, test1);\n- test1_iter = cc_dllst_iter_begin(test1);\n \n cc_dllst_trav(test1_iter, test1)\n- printf(\"%s \", **test1_iter);\n+ printf(\"%s \", ***test1_iter);\n \n cc_dllst_push_front(test1, num_str[cnt++]);\n cc_dllst_push_back (test1, num_str[cnt++]);\n@@ -97,8 +95,8 @@\n cc_dllst_push_back(test3, test3_2);\n \n cc_dllst_trav(test3_iter, test3)\n- printf(\"%s \", (**test3_iter).msg[0]),\n- printf(\"%s \", (**test3_iter).msg[1]);\n+ printf(\"%s \", (***test3_iter).msg[0]),\n+ printf(\"%s \", (***test3_iter).msg[1]);\n \n cc_dllst_dealloc(test3);\n }\n"} {"commit":"f7d1da953edaa3f892bacc35571e8ceab4f5202e","subject":"Use lockf on XLC.","message":"Use lockf on XLC.\n","repos":"stalkerg\/pg_arman,stalkerg\/pg_arman","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- catalog.c\n+++ catalog.c\n@@ -43,7 +43,11 @@\n \t\telog(errno == ENOENT ? ERROR : ERROR,\n \t\t\t\"cannot open file \\\"%s\\\": %s\", id_path, strerror(errno));\n \n+#ifdef __IBMC__\n+\tret = lockf(lock_fd, LOCK_EX | LOCK_NB, 0);\t\/* non-blocking *\/\n+#else\n \tret = flock(lock_fd, LOCK_EX | LOCK_NB);\t\/* non-blocking *\/\n+#endif\n \tif (ret == -1)\n \t{\n \t\tif (errno == EWOULDBLOCK)\n"} {"commit":"1ba895e0487810ee44eb08585e6810ad66159988","subject":"mfd: ezx-pcap: Use devm_*() functions","message":"mfd: ezx-pcap: Use devm_*() functions\n\nUse devm_*() functions to make cleanup paths more simple.\n\nSigned-off-by: Jingoo Han <fc379137a64feb86ce38ec5811a14280acc1ccfc@samsung.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mfd\/ezx-pcap.c\n+++ drivers\/mfd\/ezx-pcap.c\n@@ -403,7 +403,7 @@\n \t\/* cleanup ADC *\/\n \tadc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?\n \t\t\t\tPCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);\n-\tfree_irq(adc_irq, pcap);\n+\tdevm_free_irq(&spi->dev, adc_irq, pcap);\n \tmutex_lock(&pcap->adc_mutex);\n \tfor (i = 0; i < PCAP_ADC_MAXQ; i++)\n \t\tkfree(pcap->adc_queue[i]);\n@@ -415,8 +415,6 @@\n \n \tdestroy_workqueue(pcap->workqueue);\n \n-\tkfree(pcap);\n-\n \treturn 0;\n }\n \n@@ -431,7 +429,7 @@\n \tif (!pdata)\n \t\tgoto ret;\n \n-\tpcap = kzalloc(sizeof(*pcap), GFP_KERNEL);\n+\tpcap = devm_kzalloc(&spi->dev, sizeof(*pcap), GFP_KERNEL);\n \tif (!pcap) {\n \t\tret = -ENOMEM;\n \t\tgoto ret;\n@@ -448,7 +446,7 @@\n \tspi->mode = SPI_MODE_0 | (pdata->config & PCAP_CS_AH ? SPI_CS_HIGH : 0);\n \tret = spi_setup(spi);\n \tif (ret)\n-\t\tgoto free_pcap;\n+\t\tgoto ret;\n \n \tpcap->spi = spi;\n \n@@ -458,7 +456,7 @@\n \tif (!pcap->workqueue) {\n \t\tret = -ENOMEM;\n \t\tdev_err(&spi->dev, \"can't create pcap thread\\n\");\n-\t\tgoto free_pcap;\n+\t\tgoto ret;\n \t}\n \n \t\/* redirect interrupts to AP, except adcdone2 *\/\n@@ -491,7 +489,8 @@\n \tadc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?\n \t\t\t\t\tPCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);\n \n-\tret = request_irq(adc_irq, pcap_adc_irq, 0, \"ADC\", pcap);\n+\tret = devm_request_irq(&spi->dev, adc_irq, pcap_adc_irq, 0, \"ADC\",\n+\t\t\t\tpcap);\n \tif (ret)\n \t\tgoto free_irqchip;\n \n@@ -511,14 +510,12 @@\n remove_subdevs:\n \tdevice_for_each_child(&spi->dev, NULL, pcap_remove_subdev);\n \/* free_adc: *\/\n-\tfree_irq(adc_irq, pcap);\n+\tdevm_free_irq(&spi->dev, adc_irq, pcap);\n free_irqchip:\n \tfor (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)\n \t\tirq_set_chip_and_handler(i, NULL, NULL);\n \/* destroy_workqueue: *\/\n \tdestroy_workqueue(pcap->workqueue);\n-free_pcap:\n-\tkfree(pcap);\n ret:\n \treturn ret;\n }\n"} {"commit":"65aba1e04916d72b30c028730a1e31860c225412","subject":"mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error","message":"mfd: sec-core: Fix possible NULL pointer dereference when i2c_new_dummy error\n\nDuring probe the sec-core driver allocates dummy I2C device for RTC with\ni2c_new_dummy() but return value is not checked. In case of error\n(i2c_new_device(): memory allocation failure or I2C address cannot be\nused) this function returns NULL which is later used by\ndevm_regmap_init_i2c() or i2c_unregister_device().\n\nIf i2c_new_dummy() fails for RTC device, fail also the probe for main\nMFD driver.\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\nSigned-off-by: Krzysztof Kozlowski <1a8531307367602b8284517edb33d53d54e5ce8e@samsung.com>\nSigned-off-by: Lee Jones <630e34333487a351a857f6b705e04d30b37c1629@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mfd\/sec-core.c\n+++ drivers\/mfd\/sec-core.c\n@@ -298,6 +298,10 @@\n \t}\n \n \tsec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);\n+\tif (!sec_pmic->rtc) {\n+\t\tdev_err(&i2c->dev, \"Failed to allocate I2C for RTC\\n\");\n+\t\treturn -ENODEV;\n+\t}\n \ti2c_set_clientdata(sec_pmic->rtc, sec_pmic);\n \n \tsec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, regmap_rtc);\n"} {"commit":"4b57018dcd6418e18c08088c89f123da8a7bfc45","subject":"mfd: Avoid tps6586x burst writes","message":"mfd: Avoid tps6586x burst writes\n\ntps6586 does not support burst writes. i2c writes have to be\n1 byte at a time.\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org\nSigned-off-by: Varun Wadekar <517ae08f01cae398dbba5bef5ba1750f384c6daf@nvidia.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mfd\/tps6586x.c\n+++ drivers\/mfd\/tps6586x.c\n@@ -150,12 +150,12 @@\n static inline int __tps6586x_writes(struct i2c_client *client, int reg,\n \t\t\t\t int len, uint8_t *val)\n {\n-\tint ret;\n-\n-\tret = i2c_smbus_write_i2c_block_data(client, reg, len, val);\n-\tif (ret < 0) {\n-\t\tdev_err(&client->dev, \"failed writings to 0x%02x\\n\", reg);\n-\t\treturn ret;\n+\tint ret, i;\n+\n+\tfor (i = 0; i < len; i++) {\n+\t\tret = __tps6586x_write(client, reg + i, *(val + i));\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n \t}\n \n \treturn 0;\n"} {"commit":"57ed804790202655d6ab2ee8f2dd3a6aac75b9b5","subject":"Remove redundant returns in cpp.c","message":"Remove redundant returns in cpp.c\n\nThese returns were there because in the past these functions\nwere bool functions, but it is a non sense now.\n","repos":"8l\/scc,k0gaMSX\/kcc,8l\/scc,k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/kcc,8l\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cc1\/cpp.c\n+++ cc1\/cpp.c\n@@ -377,7 +377,6 @@\n \tfor (t = s + strlen(s) + 1; isspace(*--t); *t = '\\0')\n \t\t\/* nothing *\/;\n \tsym->u.s = mkdefine(s);\n-\treturn;\n }\n \n static void\n@@ -459,7 +458,6 @@\n {\n \tif (cppoff)\n \t\treturn;\n-\treturn;\n }\n \n static void\n@@ -486,8 +484,6 @@\n \tsym = lookup(NS_CPP);\n \tif (!(ifstatus[n] = (sym->flags & ISDEFINED) != 0 == isdef))\n \t\t++cppoff;\n-\n-\treturn;\n }\n \n static void\n@@ -510,7 +506,6 @@\n \tcleanup(s);\n \tif (!ifstatus[--numif])\n \t\t--cppoff;\n-\treturn;\n }\n \n static void\n"} {"commit":"6691ccd0565954f2275fb10cb5e4f0cef4a9ff64","subject":"mfd: twl-core: re-group the twl_mapping table for easier reading","message":"mfd: twl-core: re-group the twl_mapping table for easier reading\n\nGroup the twl_mapping table in 5 lines chunks so it is more easier to find\nthe row we are looking for (if we need to).\n\nAcked-by: Tero Kristo <060a12f1fbc7e2e5d830b72f402ff04fdae8d312@ti.com>\nSigned-off-by: Peter Ujfalusi <e5c0b4cdf99ae1d408b9c497159e74b54e02e008@ti.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mfd\/twl-core.c\n+++ drivers\/mfd\/twl-core.c\n@@ -189,28 +189,29 @@\n \t *\/\n \n \t{ 0, TWL4030_BASEADD_USB },\n-\n \t{ 1, TWL4030_BASEADD_AUDIO_VOICE },\n \t{ 1, TWL4030_BASEADD_GPIO },\n \t{ 1, TWL4030_BASEADD_INTBR },\n \t{ 1, TWL4030_BASEADD_PIH },\n+\n \t{ 1, TWL4030_BASEADD_TEST },\n-\n \t{ 2, TWL4030_BASEADD_KEYPAD },\n \t{ 2, TWL4030_BASEADD_MADC },\n \t{ 2, TWL4030_BASEADD_INTERRUPTS },\n \t{ 2, TWL4030_BASEADD_LED },\n+\n \t{ 2, TWL4030_BASEADD_MAIN_CHARGE },\n \t{ 2, TWL4030_BASEADD_PRECHARGE },\n \t{ 2, TWL4030_BASEADD_PWM0 },\n \t{ 2, TWL4030_BASEADD_PWM1 },\n \t{ 2, TWL4030_BASEADD_PWMA },\n+\n \t{ 2, TWL4030_BASEADD_PWMB },\n \t{ 2, TWL5031_BASEADD_ACCESSORY },\n \t{ 2, TWL5031_BASEADD_INTERRUPTS },\n-\n \t{ 3, TWL4030_BASEADD_BACKUP },\n \t{ 3, TWL4030_BASEADD_INT },\n+\n \t{ 3, TWL4030_BASEADD_PM_MASTER },\n \t{ 3, TWL4030_BASEADD_PM_RECEIVER },\n \t{ 3, TWL4030_BASEADD_RTC },\n@@ -273,9 +274,9 @@\n \t{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },\n \t{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },\n \t{ SUB_CHIP_ID2, TWL6030_BASEADD_RSV },\n+\n \t{ SUB_CHIP_ID0, TWL6030_BASEADD_PM_MASTER },\n \t{ SUB_CHIP_ID0, TWL6030_BASEADD_PM_SLAVE_MISC },\n-\n \t{ SUB_CHIP_ID0, TWL6030_BASEADD_RTC },\n \t{ SUB_CHIP_ID0, TWL6030_BASEADD_MEM },\n \t{ SUB_CHIP_ID1, TWL6025_BASEADD_CHARGER },\n"} {"commit":"eacf15e76635f64b016131e4c77917b52b8edea9","subject":"implemented call to jitted adder too","message":"implemented call to jitted adder too\n","repos":"eliben\/libjit-samples","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- call_c_from_jit.c\n+++ call_c_from_jit.c\n@@ -9,21 +9,50 @@\n #include <jit\/jit.h>\n \n \n-int my_multiplier(int a, int b) {\n+int native_multiplier(int a, int b) {\n return a * b;\n }\n \n+\/\/ Builds this function, and returns an uncompiled jit_function_t:\n+\/\/\n+\/\/ int jit_adder(int x, y) {\n+\/\/ return x + y;\n+\/\/ }\n+jit_function_t build_jit_adder(jit_context_t context) {\n+ jit_context_build_start(context);\n+\n+ \/\/ Create function signature and object. int (*)(int, int)\n+ jit_type_t params[2] = {jit_type_int, jit_type_int};\n+ jit_type_t signature = jit_type_create_signature(\n+ jit_abi_cdecl, jit_type_int, params, 2, 1);\n+ jit_function_t F = jit_function_create(context, signature);\n+\n+ \/\/ x, y are the parameters; sum is a temporary\n+ jit_value_t x = jit_value_get_param(F, 0);\n+ jit_value_t y = jit_value_get_param(F, 1);\n+ jit_value_t sum = jit_value_create(F, jit_type_int);\n+\n+ \/\/ sumt = x + y\n+ jit_value_t temp_sum = jit_insn_add(F, x, y);\n+ jit_insn_store(F, sum, temp_sum);\n+\n+ \/\/ return sum\n+ jit_insn_return(F, sum);\n+ jit_context_build_end(context);\n+ return F;\n+}\n \n \/\/ Builds this function:\n \/\/\n \/\/ int foo(int x, int y) {\n-\/\/ int t = x + y;\n-\/\/ x = my_multiplier(t, y);\n+\/\/ int t = jit_adder(x, y);\n+\/\/ x = native_multiplier(t, y);\n \/\/ return x;\n \/\/ }\n \/\/\n \/\/ Returns an uncompiled jit_function_t\n-jit_function_t build_foo(jit_context_t context) {\n+\/\/ Note that jit_adder is a jit_function_t that's passed in\n+jit_function_t build_foo(jit_context_t context, jit_function_t jit_adder) {\n jit_context_build_start(context);\n \n \/\/ Create function signature and object. int (*)(int, int)\n@@ -37,19 +66,22 @@\n jit_value_t y = jit_value_get_param(F, 1);\n jit_value_t t = jit_value_create(F, jit_type_int);\n \n- \/\/ t = x + y\n- jit_value_t sum = jit_insn_add(F, x, y);\n- jit_insn_store(F, t, sum);\n+ \/\/ t = jit_adder(x, y)\n+ jit_value_t adder_args[] = {x, y};\n+ jit_value_t call_temp = jit_insn_call(\n+ F, \"jit_adder\", jit_adder, 0, adder_args, 2, 0);\n \n- \/\/ Prepare calling my_multiplier: create its signature\n- jit_type_t mult_params[2] = {jit_type_int, jit_type_int};\n+ jit_insn_store(F, t, call_temp);\n+\n+ \/\/ Prepare calling native_multiplier: create its signature\n+ jit_type_t mult_params[] = {jit_type_int, jit_type_int};\n jit_type_t mult_signature = jit_type_create_signature(\n jit_abi_cdecl, jit_type_int, params, 2, 1);\n \n- \/\/ x = my_multiplier(t, y)\n+ \/\/ x = native_multiplier(t, y)\n jit_value_t mult_args[] = {t, y};\n jit_value_t res = jit_insn_call_native(\n- F, \"my_multiplier\", my_multiplier, mult_signature,\n+ F, \"native_multiplier\", native_multiplier, mult_signature,\n mult_args, sizeof(mult_args) \/ sizeof(jit_value_t), JIT_CALL_NOTHROW);\n jit_insn_store(F, x, res);\n \n@@ -64,17 +96,21 @@\n int main(int argc, char** argv) {\n jit_init();\n jit_context_t context = jit_context_create();\n- jit_function_t foo = build_foo(context);\n+ jit_function_t jit_adder = build_jit_adder(context);\n+ jit_function_t foo = build_foo(context, jit_adder);\n \n \/\/ This will dump the uncompiled function, showing libjit opcodes\n+ jit_dump_function(stdout, jit_adder, \"jit_adder [uncompiled]\");\n jit_dump_function(stdout, foo, \"foo [uncompiled]\");\n \n- \/\/ Compile (JIT) the function to machine code\n+ \/\/ Compile (JIT) the functions to machine code\n jit_context_build_start(context);\n+ jit_function_compile(jit_adder);\n jit_function_compile(foo);\n jit_context_build_end(context);\n \n \/\/ This will dump the disassembly of the machine code for the function\n+ jit_dump_function(stdout, jit_adder, \"jit_adder [compiled]\");\n jit_dump_function(stdout, foo, \"foo [compiled]\");\n \n \/\/ Run the function on argv input\n"} {"commit":"498691b820c704fc111b532a0b43d04b9b29d8eb","subject":"don't js quote 8bit characters (screws up utf-8)","message":"don't js quote 8bit characters (screws up utf-8)","repos":"apfeltee\/clearsilver,hljyunxi\/clearsilver,hczhang\/clearsilver,WillYee\/clearsilver,hongruiqi\/clearsilver,hobby\/clearsilver,alisonjoe\/clearsilver,hongruiqi\/clearsilver,manuelluis\/clearsilver,manuelluis\/clearsilver,apfeltee\/clearsilver,WillYee\/clearsilver,hczhang\/clearsilver,hongruiqi\/clearsilver,manuelluis\/clearsilver,manuelluis\/clearsilver,manuelluis\/clearsilver,alisonjoe\/clearsilver,hljyunxi\/clearsilver,hljyunxi\/clearsilver,manuelluis\/clearsilver,apfeltee\/clearsilver,hczhang\/clearsilver,apfeltee\/clearsilver,hczhang\/clearsilver,hczhang\/clearsilver,manuelluis\/clearsilver,alisonjoe\/clearsilver,WillYee\/clearsilver,hobby\/clearsilver,WillYee\/clearsilver,manuelluis\/clearsilver,alisonjoe\/clearsilver,apfeltee\/clearsilver,WillYee\/clearsilver,hczhang\/clearsilver,hongruiqi\/clearsilver,apfeltee\/clearsilver,hongruiqi\/clearsilver,WillYee\/clearsilver,hobby\/clearsilver,hobby\/clearsilver,hongruiqi\/clearsilver,hobby\/clearsilver,hobby\/clearsilver,hobby\/clearsilver,hongruiqi\/clearsilver,alisonjoe\/clearsilver,WillYee\/clearsilver,hljyunxi\/clearsilver,alisonjoe\/clearsilver,WillYee\/clearsilver,apfeltee\/clearsilver,hczhang\/clearsilver,hobby\/clearsilver,hljyunxi\/clearsilver,alisonjoe\/clearsilver,alisonjoe\/clearsilver,WillYee\/clearsilver,hczhang\/clearsilver,hczhang\/clearsilver,manuelluis\/clearsilver,hljyunxi\/clearsilver,apfeltee\/clearsilver,hongruiqi\/clearsilver,hljyunxi\/clearsilver,hljyunxi\/clearsilver,hongruiqi\/clearsilver,apfeltee\/clearsilver,hljyunxi\/clearsilver,hobby\/clearsilver,alisonjoe\/clearsilver","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- cgi\/cgi.c\n+++ cgi\/cgi.c\n@@ -270,8 +270,7 @@\n while (buf[l])\n {\n if (buf[l] == '\/' || buf[l] == '&' || buf[l] == '\"' || buf[l] == '\\'' ||\n-\tbuf[l] == '\\\\' || buf[l] == '>' || buf[l] == '<' || buf[l] == '\\'' || \n-\tbuf[l] < 32 || buf[l] > 122)\n+\tbuf[l] == '\\\\' || buf[l] == '>' || buf[l] == '<' || buf[l] < 32)\n {\n nl += 3;\n } \n@@ -288,8 +287,7 @@\n while (buf[l])\n {\n if (buf[l] == '\/' || buf[l] == '&' || buf[l] == '\"' || buf[l] == '\\'' ||\n-\tbuf[l] == '\\\\' || buf[l] == '>' || buf[l] == '<' ||\n-\tbuf[l] < 32 || buf[l] > 122)\n+\tbuf[l] == '\\\\' || buf[l] == '>' || buf[l] == '<' || buf[l] < 32)\n {\n s[nl++] = '\\\\';\n s[nl++] = 'x';\n"} {"commit":"db3e9ac587a5750c61c903444ebb4ccc0f9ea2da","subject":"improved elf program a bit","message":"improved elf program a bit\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bin\/elf.c\n+++ bin\/elf.c\n@@ -69,7 +69,7 @@\n {\n \n file_write_string(FILE_STDOUT, \"Name: \");\n-\/\/ file_write_string(FILE_STDOUT, (char *)header->name);\n+ file_write_dec(FILE_STDOUT, header->name);\n file_write_string(FILE_STDOUT, \"\\nType: \");\n file_write_dec(FILE_STDOUT, header->type);\n file_write_string(FILE_STDOUT, \"\\nFlags: \");\n@@ -95,7 +95,7 @@\n void main(int argc, char *argv[])\n {\n \n- if (argc != 2)\n+ if (argc < 2)\n return;\n \n char path[256];\n@@ -106,43 +106,69 @@\n \n string_concat(path, argv[1]);\n \n+ char *content = 0x00360000;\n+\n int file = file_open(path);\n \n if (file == -1)\n return;\n \n- struct elf_header header;\n- file_read(file, sizeof (struct elf_header), &header);\n+ file_read(file, 0x4000, content);\n+ file_close(file);\n \n- if (header.identify[0] != ELF_IDENTITY_MAGIC0)\n+ struct elf_header *header = (struct elf_header *)content;\n+\n+ if (header->identify[0] != ELF_IDENTITY_MAGIC0)\n return;\n \n- file_write_string(FILE_STDOUT, \"*** ELF header ***\\n\");\n- write_header(&header);\n-\n- if (header.programHeaderOffset)\n+ if (argc == 2)\n {\n \n- struct elf_program_header pHeader;\n- file_read(file, sizeof (struct elf_program_header), &pHeader);\n+ file_write_string(FILE_STDOUT, \"*** ELF header ***\\n\");\n+ write_header(header);\n \n- file_write_string(FILE_STDOUT, \"*** ELF program header ***\\n\");\n- write_program_header(&pHeader);\n+ return;\n \n }\n \n- if (header.sectionHeaderOffset)\n+ if (!string_compare(argv[2], \"program\"))\n {\n \n- struct elf_section_header sHeader;\n- file_read(file, sizeof (struct elf_section_header), &sHeader);\n+ if (header->programHeaderOffset)\n+ {\n \n- file_write_string(FILE_STDOUT, \"*** ELF section header ***\\n\");\n- write_section_header(&sHeader);\n+ struct elf_program_header *pHeader = (struct elf_program_header *)(content + header->programHeaderOffset);\n+\n+ file_write_string(FILE_STDOUT, \"*** ELF program header ***\\n\");\n+ write_program_header(pHeader);\n+\n+ }\n+\n+ else\n+ {\n+\n+ file_write_string(FILE_STDOUT, \"No program header\\n\");\n+\n+ }\n \n }\n \n- file_close(file);\n+ if (!string_compare(argv[2], \"section\"))\n+ {\n+\n+ unsigned int offset = (argc == 4) ? (argv[3][0] - '0') : 0;\n+\n+ if (header->sectionHeaderOffset && (offset < header->sectionHeaderCount))\n+ {\n+\n+ struct elf_section_header *sHeader = (struct elf_section_header *)(content + header->sectionHeaderOffset + offset * sizeof (struct elf_section_header));\n+\n+ file_write_string(FILE_STDOUT, \"*** ELF section header ***\\n\");\n+ write_section_header(sHeader);\n+\n+ }\n+\n+ }\n \n }\n \n"} {"commit":"4cb19bb584b5485ff833d13290c05ac6c066b914","subject":"sel: fix sign conversions warnings","message":"sel: fix sign conversions warnings\n","repos":"war2\/war2edit,jeanguyomarch\/war2edit,war2\/war2edit,war2\/war2edit,jeanguyomarch\/war2edit,jeanguyomarch\/war2edit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bin\/sel.c\n+++ bin\/sel.c\n@@ -47,7 +47,7 @@\n int y = ed->sel.y;\n int sx, sy, cell_w, cell_h, rx, ry, relx, rely;\n unsigned int i, j;\n- unsigned cx1, cy1, cx2, cy2;\n+ int cx1, cy1, cx2, cy2;\n Cell **cells = ed->cells;\n Cell *anchor, *c;\n \n@@ -82,20 +82,32 @@\n cy2 = (rely + h) \/ cell_h;\n \n \/* Bounds checking safety *\/\n- if (EINA_UNLIKELY(cx1 >= map_w)) cx1 = map_w - 1;\n- if (EINA_UNLIKELY(cx2 >= map_w)) cx2 = map_w - 1;\n- if (EINA_UNLIKELY(cy1 >= map_h)) cy1 = map_h - 1;\n- if (EINA_UNLIKELY(cy2 >= map_h)) cy2 = map_h - 1;\n+ if (EINA_UNLIKELY(cx1 >= (int)map_w))\n+ cx1 = (int)map_w - 1;\n+ else if (EINA_UNLIKELY(cx1 < 0))\n+ cx1 = 0;\n+ if (EINA_UNLIKELY(cx2 >= (int)map_w))\n+ cx2 = (int)map_w - 1;\n+ else if (EINA_UNLIKELY(cx2 < 0))\n+ cx2 = 0;\n+ if (EINA_UNLIKELY(cy1 >= (int)map_h))\n+ cy1 = (int)map_h - 1;\n+ else if (EINA_UNLIKELY(cy1 < 0))\n+ cy1 = 0;\n+ if (EINA_UNLIKELY(cy2 >= (int)map_h))\n+ cy2 = (int)map_h - 1;\n+ else if (EINA_UNLIKELY(cy2 < 0))\n+ cy2 = 0;\n \n \/* Cache selection *\/\n- ed->sel.rel1.x = cx1;\n- ed->sel.rel1.y = cy1;\n- ed->sel.rel2.x = cx2;\n- ed->sel.rel2.y = cy2;\n+ ed->sel.rel1.x = (unsigned int)cx1;\n+ ed->sel.rel1.y = (unsigned int)cy1;\n+ ed->sel.rel2.x = (unsigned int)cx2;\n+ ed->sel.rel2.y = (unsigned int)cy2;\n \n- for (j = cy1; j < cy2; ++j)\n+ for (j = (unsigned int) cy1; j < (unsigned int) cy2; ++j)\n {\n- for (i = cx1; i < cx2; ++i)\n+ for (i = (unsigned int) cx1; i < (unsigned int) cx2; ++i)\n {\n c = &(cells[j][i]);\n \n"} {"commit":"4058a165cf36134e7f717a6a79903e3080da3fb0","subject":"small cleanups to syntax and changing bsd\/string.h to string.h, yay portability!","message":"small cleanups to syntax and changing bsd\/string.h to string.h, yay portability!\n","repos":"dami0\/public,dami0\/public,dami0\/public","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- bin_con.c\n+++ bin_con.c\n@@ -5,13 +5,9 @@\n *\/\n \n #include <stdio.h>\n-#include <bsd\/string.h>\n+#include <string.h>\n #include <stdlib.h>\n #include <math.h>\n-\n-\/\/int b2to10(char *, size_t);\n-\/\/int b8to10(char *, size_t);\n-\/\/int b10to2(int);\n \n int b2to10(char *bin, size_t siz) {\n \tint i, j;\n@@ -24,7 +20,7 @@\n \treturn sum;\n }\n \n-int b8to10(char * oct, size_t siz) {\n+int b8to10(char *oct, size_t siz) {\n \tint i, j;\n \tint sum = 0;\n \n@@ -46,7 +42,7 @@\n \tfor (j = 1, d = 0; d <= n; j++) d = pow(2, j);\n \tsiz = j - 1;\n \tchar tmp[siz]; tmp[0] = '1';\n-\tfor (i = 1; i < siz; i++) { tmp[i] = '0'; }\n+\tfor (i = 1; i < siz; i++) tmp[i] = '0';\n \n \t\/* dirtier *\/\n \tfor (i = 1; n > 1; i++) {\n"} {"commit":"196b8c7351a47b5136b1d649233ad8070ee400f8","subject":"Updated stret todo","message":"Updated stret todo\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- todos\/1st_class_structs\/stret.c\n+++ todos\/1st_class_structs\/stret.c\n@@ -1,24 +1,25 @@\n-#if 0\n struct A { int i, j; void *p; } f()\n {\n \treturn (struct A){ 1, 2, 0 };\n+\t\/\/ rdx <-- i in bits 63-32 and j in bits 31-0\n+\t\/\/ rax <-- p\n }\n-\n-\/\/rdx <-- i in bits 63-32 and j in bits 31-0\n-\/\/rax <-- p\n \n struct B { int i, j, k; void *p; } g()\n {\n \treturn (struct B){ 1, 2, 3, 0 };\n+\t\/\/ stret\n }\n \n struct C { int i, j; double d; } h()\n {\n \treturn (struct C){ 1, 2, 3 };\n+\t\/\/ rdx <-- i in bits 63-32 and j in bits 31-0\n+\t\/\/ xmm0 <--- d\n }\n-#endif\n \n struct D { int i, j; \/*float f, g, h, q;*\/float f, g, h; } i()\n {\n \treturn (struct D){ 1, 2, 3 };\n+\t\/\/ stret\n }\n"} {"commit":"243301d565221bda7725c57037f631f8a86c3c6c","subject":"compile fail","message":"compile fail","repos":"cutecube\/swoole-src,coooold\/swoole-src,tutanhamon\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,Aylchen\/swoole-src,AJSoft\/swoole-src,LinkedDestiny\/swoole-src,redoufu\/swoole,swoole\/swoole-src,yangchaogit\/swoole-src,yangchaogit\/swoole-src,zyunfeng\/swoole-src,AJSoft\/swoole-src,aaasayok\/swoole-src,swoole\/swoole-src,tutanhamon\/swoole-src,swoole\/swoole-src,zjsxwc\/swoole-src,LinkedDestiny\/swoole-src,cutecube\/swoole-src,zyunfeng\/swoole-src,Aylchen\/swoole-src,redoufu\/swoole,AJSoft\/swoole-src,swoole\/swoole-src,yangchaogit\/swoole-src,AJSoft\/swoole-src,tangwaikei\/swoole-src,coooold\/swoole-src,AJSoft\/swoole-src,zjsxwc\/swoole-src,flybird119\/swoole-src,guoyu07\/swoole-src,tangwaikei\/swoole-src,flybird119\/swoole-src,LinkedDestiny\/swoole-src,redoufu\/swoole,zjsxwc\/swoole-src,zyunfeng\/swoole-src,coooold\/swoole-src,coooold\/swoole-src,LinkedDestiny\/swoole-src,cutecube\/swoole-src,AJSoft\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,flybird119\/swoole-src,zhaoyan158567\/swoole-src,tutanhamon\/swoole-src,tutanhamon\/swoole-src,zhaoyan158567\/swoole-src,AJSoft\/swoole-src,Aylchen\/swoole-src,guoyu07\/swoole-src,tutanhamon\/swoole-src,aaasayok\/swoole-src,tangwaikei\/swoole-src,swoole\/swoole-src,zhaoyan158567\/swoole-src,tutanhamon\/swoole-src,aaasayok\/swoole-src,guoyu07\/swoole-src,tutanhamon\/swoole-src,LinkedDestiny\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- swoole_server.c\n+++ swoole_server.c\n@@ -2205,15 +2205,16 @@\n RETURN_FALSE;\r\n }\r\n \r\n-\r\n swServer *serv = swoole_get_object(zobject);\r\n \r\n+#ifdef SW_USE_OPENSSL\r\n swConnection *conn = swServer_connection_verify(serv, (int) conn_fd);\r\n if (conn && conn->ssl)\r\n {\r\n swoole_php_error(E_WARNING, \"SSL client#%d cannot use sendfile().\", (int) conn_fd);\r\n RETURN_FALSE;\r\n }\r\n+#endif\r\n \r\n send_data.info.len = len;\r\n \/\/file name size\r\n"} {"commit":"56d03f29032fd84d01a9acb6ecdd09daae98faa7","subject":"Renamed variable","message":"Renamed variable\n","repos":"mwgoldsmith\/bluray,koying\/libbluray,vlc-mirror\/libbluray,tourettes\/libbluray,koying\/libbluray,ace20022\/libbluray,vlc-mirror\/libbluray,Distrotech\/libbluray,koying\/libbluray,vlc-mirror\/libbluray,Distrotech\/libbluray,ShiftMediaProject\/libbluray,tourettes\/libbluray,vlc-mirror\/libbluray,EdwardNewK\/libbluray,mwgoldsmith\/bluray,Azzuro\/libbluray,ShiftMediaProject\/libbluray,mwgoldsmith\/bluray,ShiftMediaProject\/libbluray,tourettes\/libbluray,koying\/libbluray,EdwardNewK\/libbluray,Distrotech\/libbluray,ace20022\/libbluray,ace20022\/libbluray,EdwardNewK\/libbluray,Azzuro\/libbluray,Distrotech\/libbluray,ace20022\/libbluray,EdwardNewK\/libbluray,Azzuro\/libbluray,ShiftMediaProject\/libbluray,tourettes\/libbluray,mwgoldsmith\/bluray,Azzuro\/libbluray","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libbluray\/bluray.c\n+++ src\/libbluray\/bluray.c\n@@ -146,6 +146,11 @@\n BD_REGISTERS *regs; \/\/ player registers\n BD_EVENT_QUEUE *event_queue; \/\/ navigation mode event queue\n BD_TITLE_TYPE title_type; \/\/ type of current title (in navigation mode)\n+ \/* Pending action after playlist end\n+ * BD-J: delayed sending of BDJ_EVENT_END_OF_PLAYLIST\n+ * 1 - message pending. 3 - message sent.\n+ *\/\n+ uint8_t end_of_playlist; \/* 1 - reached. 3 - processed . *\/\n \n HDMV_VM *hdmv_vm;\n uint8_t hdmv_suspended;\n@@ -153,9 +158,6 @@\n BDJAVA *bdjava;\n BDJ_STORAGE bdjstorage;\n #endif\n- \/* delayed sending of BDJ_EVENT_END_OF_PLAYLIST:\n- * 1 - message pending. 3 - message sent. *\/\n- uint8_t bdj_end_of_playlist;\n uint8_t bdj_wait_start; \/* BD-J has selected playlist (prefetch) but not yet started playback *\/\n \n \/* HDMV graphics *\/\n@@ -1797,7 +1799,7 @@\n \/\/ We previously reached the last clip. Nothing\n \/\/ else to read.\n _queue_event(bd, BD_EVENT_END_OF_TITLE, 0);\n- bd->bdj_end_of_playlist |= 1;\n+ bd->end_of_playlist |= 1;\n return 0;\n }\n if (st->int_buf_off == 6144 || clip_pkt >= st->clip->end_pkt) {\n@@ -1829,7 +1831,7 @@\n if (st->clip == NULL) {\n BD_DEBUG(DBG_BLURAY | DBG_STREAM, \"End of title\\n\");\n _queue_event(bd, BD_EVENT_END_OF_TITLE, 0);\n- bd->bdj_end_of_playlist |= 1;\n+ bd->end_of_playlist |= 1;\n return 0;\n }\n if (!_open_m2ts(bd, st)) {\n@@ -2141,7 +2143,7 @@\n \n bd->seamless_angle_change = 0;\n bd->s_pos = 0;\n- bd->bdj_end_of_playlist = 0;\n+ bd->end_of_playlist = 0;\n \n bd_psr_write(bd->regs, PSR_PLAYLIST, atoi(bd->title->name));\n bd_psr_write(bd->regs, PSR_ANGLE_NUMBER, bd->title->angle + 1);\n@@ -3252,9 +3254,9 @@\n }\n \n if (bd->title_type == title_bdj) {\n- if (bd->bdj_end_of_playlist == 1) {\n+ if (bd->end_of_playlist == 1) {\n _bdj_event(bd, BDJ_EVENT_END_OF_PLAYLIST, bd_psr_read(bd->regs, PSR_PLAYLIST));\n- bd->bdj_end_of_playlist |= 2;\n+ bd->end_of_playlist |= 2;\n }\n \n if (!bd->title) {\n"} {"commit":"9f02df2d3973be12cc832c7a3d1e27bba13ef1f4","subject":"[mod_accesslog] %{canonical,local,remote}p (fixes #2840)","message":"[mod_accesslog] %{canonical,local,remote}p (fixes #2840)\n\nx-ref:\n \"accesslog.format remote_port\"\n https:\/\/redmine.lighttpd.net\/issues\/2840\n","repos":"gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/mod_accesslog.c\n+++ src\/mod_accesslog.c\n@@ -4,6 +4,7 @@\n #include \"fdevent.h\"\n #include \"log.h\"\n #include \"buffer.h\"\n+#include \"sock_addr.h\"\n \n #include \"plugin.h\"\n \n@@ -121,6 +122,11 @@\n \tFORMAT_FLAG_TIME_NSEC_FRAC = 0x80 \/* request time nsec fraction *\/\n };\n \n+enum e_optflags_port {\n+\tFORMAT_FLAG_PORT_LOCAL = 0x01,\/* (default) *\/\n+\tFORMAT_FLAG_PORT_REMOTE = 0x02\n+};\n+\n \n typedef struct {\n \tenum { FIELD_UNSET, FIELD_STRING, FIELD_FORMAT } type;\n@@ -334,7 +340,7 @@\n \t\t\t\t}\n \n \t\t\t\tif (k == i + 2) {\n-\t\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\", \"%{...} has to be contain a string\");\n+\t\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\", \"%{...} has to contain a string\");\n \t\t\t\t\treturn -1;\n \t\t\t\t}\n \n@@ -602,6 +608,21 @@\n \t\t\t\t\tif (f->opt & ~(FORMAT_FLAG_TIME_SEC)) srv->srvconf.high_precision_timestamps = 1;\n \t\t\t\t} else if (FORMAT_COOKIE == f->field) {\n \t\t\t\t\tif (buffer_string_is_empty(f->string)) f->type = FIELD_STRING; \/*(blank)*\/\n+\t\t\t\t} else if (FORMAT_SERVER_PORT == f->field) {\n+\t\t\t\t\tif (buffer_string_is_empty(f->string))\n+\t\t\t\t\t\tf->opt |= FORMAT_FLAG_PORT_LOCAL;\n+\t\t\t\t\telse if (buffer_is_equal_string(f->string, CONST_STR_LEN(\"canonical\")))\n+\t\t\t\t\t\tf->opt |= FORMAT_FLAG_PORT_LOCAL;\n+\t\t\t\t\telse if (buffer_is_equal_string(f->string, CONST_STR_LEN(\"local\")))\n+\t\t\t\t\t\tf->opt |= FORMAT_FLAG_PORT_LOCAL;\n+\t\t\t\t\telse if (buffer_is_equal_string(f->string, CONST_STR_LEN(\"remote\")))\n+\t\t\t\t\t\tf->opt |= FORMAT_FLAG_PORT_REMOTE;\n+\t\t\t\t\telse {\n+\t\t\t\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"sb\",\n+\t\t\t\t\t\t\t\t\"invalid format %{canonical,local,remote}p:\", s->format);\n+\n+\t\t\t\t\t\treturn HANDLER_ERROR;\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n \n@@ -1030,7 +1051,9 @@\n \t\t\t\t}\n \t\t\t\tbreak;\n \t\t\tcase FORMAT_SERVER_PORT:\n-\t\t\t\t{\n+\t\t\t\tif (f->opt & FORMAT_FLAG_PORT_REMOTE) {\n+\t\t\t\t\tbuffer_append_int(b, sock_addr_get_port(&con->dst_addr));\n+\t\t\t\t} else { \/* if (f->opt & FORMAT_FLAG_PORT_LOCAL) *\/\/*(default)*\/\n \t\t\t\t\tconst char *colon;\n \t\t\t\t\tbuffer *srvtoken = ((server_socket*)(con->srv_socket))->srv_token;\n \t\t\t\t\tif (srvtoken->ptr[0] == '[') {\n"} {"commit":"80a9a64e9b591d168fac871a55f337a7005f0773","subject":"fixed #523","message":"fixed #523","repos":"AJSoft\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,tutanhamon\/swoole-src,swoole\/swoole-src,AJSoft\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,tutanhamon\/swoole-src,coooold\/swoole-src,LinkedDestiny\/swoole-src,coooold\/swoole-src,tutanhamon\/swoole-src,tutanhamon\/swoole-src,tutanhamon\/swoole-src,swoole\/swoole-src,coooold\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,AJSoft\/swoole-src,AJSoft\/swoole-src,tutanhamon\/swoole-src,coooold\/swoole-src,tutanhamon\/swoole-src,AJSoft\/swoole-src,AJSoft\/swoole-src,swoole\/swoole-src,AJSoft\/swoole-src,LinkedDestiny\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- swoole_server.c\n+++ swoole_server.c\n@@ -626,13 +626,7 @@\n \r\n add_assoc_long(zaddr, \"server_socket\", req->info.from_fd);\r\n \r\n- swListenPort *port = serv->connection_list[req->info.from_fd].object;\r\n- swoole_server_port_property *callbacks = port->ptr;\r\n- zval *callback = callbacks->callbacks[SW_SERVER_CB_onPacket];\r\n- if (!callback)\r\n- {\r\n- callback = php_sw_callback[SW_SERVER_CB_onPacket];\r\n- }\r\n+ zval *callback = php_swoole_server_get_callback(serv, req->info.from_fd, SW_SERVER_CB_onPacket);\r\n \r\n \/\/udp ipv4\r\n if (req->info.type == SW_EVENT_UDP)\r\n"} {"commit":"83a2eb0cdc19142fcffc331e1621e04f2504acbe","subject":"Add CommandLine for easier command line parsing","message":"Add CommandLine for easier command line parsing\n","repos":"dbartolini\/crown,mikymod\/crown,dbartolini\/crown,mikymod\/crown,dbartolini\/crown,galek\/crown,taylor001\/crown,taylor001\/crown,taylor001\/crown,galek\/crown,taylor001\/crown,galek\/crown,dbartolini\/crown,mikymod\/crown,mikymod\/crown,galek\/crown","returncode":1,"stderr":"error: pathspec 'engine\/core\/command_line.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- engine\/core\/command_line.h\n+++ engine\/core\/command_line.h\n@@ -0,0 +1,74 @@\n+\/*\n+Copyright (c) 2013 Daniele Bartolini, Michele Rossi\n+Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto\n+\n+Permission is hereby granted, free of charge, to any person\n+obtaining a copy of this software and associated documentation\n+files (the \"Software\"), to deal in the Software without\n+restriction, including without limitation the rights to use,\n+copy, modify, merge, publish, distribute, sublicense, and\/or sell\n+copies of the Software, and to permit persons to whom the\n+Software is furnished to do so, subject to the following\n+conditions:\n+\n+The above copyright notice and this permission notice shall be\n+included in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n+OTHER DEALINGS IN THE SOFTWARE.\n+*\/\n+\n+#pragma once\n+\n+#include \"string_utils.h\"\n+\n+namespace crown\n+{\n+\n+\/\/\/ Helper for parsing command line.\n+struct CommandLine\n+{\n+\tCommandLine(int argc, char** argv)\n+\t\t: _argc(argc)\n+\t\t, _argv(argv)\n+\t{\n+\t}\n+\n+\tint find_argument(const char* longopt, char shortopt)\n+\t{\n+\t\tfor (int i = 0; i < _argc; i++)\n+\t\t{\n+\t\t\tif ((shortopt != '\\0' && string::strlen(_argv[i]) > 1 && _argv[i][0] == '-' && _argv[i][1] == shortopt) ||\n+\t\t\t\t(string::strlen(_argv[i]) > 2 && _argv[i][0] == '-' && _argv[i][1] == '-' && string::strcmp(&_argv[i][2], longopt) == 0))\n+\t\t\t{\n+\t\t\t\treturn i;\n+\t\t\t}\n+\t\t}\n+\n+\t\treturn _argc;\n+\t}\n+\n+\tconst char* get_parameter(const char* longopt, char shortopt = '\\0')\n+\t{\n+\t\tint argc = find_argument(longopt, shortopt);\n+\t\treturn argc < _argc ? _argv[argc + 1] : NULL;\n+\t}\n+\n+\tbool has_argument(const char* longopt, char shortopt = '\\0')\n+\t{\n+\t\treturn find_argument(longopt, shortopt) < _argc;\n+\t}\n+\n+private:\n+\n+\tint _argc;\n+\tchar** _argv;\n+};\n+\n+} \/\/ namespace crown\n"} {"commit":"35fd3c10c12d4ba6fe5355e482e77c04faf7bc79","subject":"pkcs15.c: Use size_t as type of vector-index.","message":"pkcs15.c: Use size_t as type of vector-index.\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@4937 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"0x7678\/myOpenSC,UIKit0\/OpenSC,OpenSC\/OpenSC,dirkx\/OpenSC.tokend,ieugen\/OpenSC,frankmorgner\/OpenSC,martinpaljak\/OpenSC,germanblanco\/OpenSC,mouse07410\/OpenSC,fabled\/OpenSC,gentoo\/OpenSC,financeX\/OpenSC,tidatida\/OpenSC,kasparsd\/opensc-latvia-id,ieugen\/OpenSC,frankmorgner\/OpenSC,gemini\/OpenSC,rickyepoderi\/OpenSC,dirkx\/OpenSC,0x7678\/myOpenSC,jpki\/OpenSC,marschap\/pkg-opensc,Jakuje\/OpenSC,Jakuje\/OpenSC,gentoo\/OpenSC,rickyepoderi\/OpenSC,dirkx\/OpenSC,dirkx\/OpenSC,mouse07410\/OpenSC,gemini\/OpenSC,velter\/OpenSC,carlhoerberg\/OpenSC,dengert\/OpenSC,velter\/OpenSC,financeX\/OpenSC,Jakuje\/OpenSC,financeX\/OpenSC,viktorTarasov\/OpenSC-SM,dengert\/OpenSC,frankmorgner\/OpenSC,mtrojnar\/OpenSC,dengert\/OpenSC,adminmt\/OpenSC,hongquan\/OpenSC-main,gentoo\/OpenSC,velter\/OpenSC,LudovicRousseau\/OpenSC,metsma\/OpenSC,dirkx\/OpenSC,mouse07410\/OpenSC,UIKit0\/OpenSC,dirkx\/OpenSC.tokend,viktorTarasov\/OpenSC-SM,CardContact\/OpenSC,martinpaljak\/OpenSC,germanblanco\/OpenSC,l1k\/OpenSC,CardContact\/OpenSC,0x7678\/myOpenSC,LudovicRousseau\/OpenSC,0x7678\/OpenSC,dirkx\/OpenSC.tokend,marschap\/pkg-opensc,ieugen\/OpenSC,aobaid\/OpenSC,hhonkanen\/OpenSC,martinpaljak\/OpenSC,LudovicRousseau\/OpenSC,kasparsd\/opensc-latvia-id,hongquan\/OpenSC-main,aobaid\/OpenSC,0x7678\/OpenSC,carlhoerberg\/OpenSC,hongquan\/OpenSC-main,philipWendland\/OpenSC,ieugen\/OpenSC,AktivCo\/OpenSC,carlhoerberg\/OpenSC,carlhoerberg\/OpenSC,aobaid\/OpenSC,jpki\/OpenSC,dirkx\/OpenSC.tokend,financeX\/OpenSC,hhonkanen\/OpenSC,tidatida\/OpenSC,Jakuje\/OpenSC,metsma\/OpenSC,financeX\/OpenSC,mtrojnar\/OpenSC,philipWendland\/OpenSC,fabled\/OpenSC,AktivCo\/OpenSC,0x7678\/OpenSC,fabled\/OpenSC,tidatida\/OpenSC,0x7678\/myOpenSC,hhonkanen\/OpenSC,OpenSC\/OpenSC,kasparsd\/opensc-latvia-id,velter\/OpenSC,tidatida\/OpenSC,adminmt\/OpenSC,CardContact\/OpenSC,mtrojnar\/OpenSC,aobaid\/OpenSC,marschap\/pkg-opensc,adminmt\/OpenSC,carlhoerberg\/OpenSC,germanblanco\/OpenSC,nmav\/OpenSC,0x7678\/OpenSC,adminmt\/OpenSC,kasparsd\/opensc-latvia-id,AktivCo\/OpenSC,viktorTarasov\/OpenSC-SM,frankmorgner\/OpenSC,fabled\/OpenSC,gemini\/OpenSC,nmav\/OpenSC,nmav\/OpenSC,rickyepoderi\/OpenSC,UIKit0\/OpenSC,l1k\/OpenSC,0x7678\/myOpenSC,dirkx\/OpenSC,jpki\/OpenSC,metsma\/OpenSC,philipWendland\/OpenSC,dirkx\/OpenSC.tokend,gentoo\/OpenSC,OpenSC\/OpenSC,gentoo\/OpenSC,dirkx\/OpenSC.tokend,l1k\/OpenSC,UIKit0\/OpenSC,marschap\/pkg-opensc,ieugen\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libopensc\/pkcs15.c\n+++ src\/libopensc\/pkcs15.c\n@@ -86,7 +86,8 @@\n int sc_pkcs15_parse_tokeninfo(sc_context_t *ctx,\n \tsc_pkcs15_tokeninfo_t *ti, const u8 *buf, size_t blen)\n {\n-\tint r, ii;\n+\tint r;\n+\tsize_t ii;\n \tu8 serial[128];\n \tsize_t serial_len = sizeof(serial);\n \tu8 mnfid[SC_PKCS15_MAX_LABEL_SIZE];\n@@ -1222,7 +1223,8 @@\n {\n \tstruct sc_context *ctx = p15card->card->ctx;\n \tstruct sc_pkcs15_object *auth_objs[0x10];\n-\tint r, nn_objs, ii;\n+\tsize_t nn_objs, ii;\n+\tint r;\n \n \t\/* Get all existing pkcs15 AUTH objects *\/\n \tr = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_AUTH_PIN, auth_objs, 0x10);\n"} {"commit":"3c343560e9b9ad1504fd77d9fffa3e30cad0aa22","subject":"* fix auto init","message":"* fix auto init\n","repos":"robixnai\/RIOT,josephnoir\/RIOT,Darredevil\/RIOT,rakendrathapa\/RIOT,haoyangyu\/RIOT,LudwigOrtmann\/RIOT,RIOT-OS\/RIOT,rakendrathapa\/RIOT,arvindpdmn\/RIOT,kaleb-himes\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,abp719\/RIOT,shady33\/RIOT,attdona\/RIOT,malosek\/RIOT,authmillenon\/RIOT,dkm\/RIOT,rfswarm2\/RIOT,mtausig\/RIOT,herrfz\/RIOT,jbeyerstedt\/RIOT-OTA-update,stevenj\/RIOT,mtausig\/RIOT,A-Paul\/RIOT,kushalsingh007\/RIOT,phiros\/RIOT,ximus\/RIOT,kYc0o\/RIOT,1blankz7\/RIOT,Darredevil\/RIOT,neumodisch\/RIOT,sumanpanchal\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,automote\/RIOT,daniel-k\/RIOT,AnonMall\/RIOT,hamilton-mote\/RIOT-OS,tdautc19841202\/RIOT,sgso\/RIOT,jhollister\/RIOT,avmelnikoff\/RIOT,gautric\/RIOT,lebrush\/RIOT,Hyungsin\/RIOT-OS,kaspar030\/RIOT,beurdouche\/RIOT,thiagohd\/RIOT,benoit-canet\/RIOT,backenklee\/RIOT,JensErdmann\/RIOT,robixnai\/RIOT,gbarnett\/RIOT,josephnoir\/RIOT,attdona\/RIOT,latsku\/RIOT,haoyangyu\/RIOT,abp719\/RIOT,gebart\/RIOT,wentaoshang\/RIOT,kaleb-himes\/RIOT,shady33\/RIOT,OTAkeys\/RIOT,plushvoxel\/RIOT,rfuentess\/RIOT,PSHIVANI\/Riot-Code,Yonezawa-T2\/RIOT,yogo1212\/RIOT,abp719\/RIOT,Lexandro92\/RIOT-CoAP,nsol-nmsu\/RIOT,adrianghc\/RIOT,brettswann\/RIOT,jasonatran\/RIOT,daniel-k\/RIOT,patkan\/RIOT,jhollister\/RIOT,lazytech-org\/RIOT,rfswarm2\/RIOT,jasonatran\/RIOT,alex1818\/RIOT,gbarnett\/RIOT,plushvoxel\/RIOT,brettswann\/RIOT,d00616\/RIOT,smlng\/RIOT,neumodisch\/RIOT,spium\/IoT-RIOT,MarkXYang\/RIOT,benoit-canet\/RIOT,LudwigOrtmann\/RIOT,gbarnett\/RIOT,tdautc19841202\/RIOT,MohmadAyman\/RIOT,rfswarm\/RIOT,changbiao\/RIOT,kerneltask\/RIOT,FrancescoErmini\/RIOT,roberthartung\/RIOT,jasonatran\/RIOT,BytesGalore\/PetersRIOT,emmanuelsearch\/RIOT,automote\/RIOT,phiros\/RIOT,sumanpanchal\/RIOT,katezilla\/RIOT,Osblouf\/RIOT,backenklee\/RIOT,fnack\/RIOT,arvindpdmn\/RIOT,wentaoshang\/RIOT,mtausig\/RIOT,LudwigOrtmann\/RIOT,phiros\/RIOT,thiagohd\/RIOT,sgso\/RIOT,rousselk\/RIOT,patkan\/RIOT,adjih\/RIOT,bartfaizoltan\/RIOT,jfischer-phytec-iot\/RIOT,kbumsik\/RIOT,Josar\/RIOT,Josar\/RIOT,plushvoxel\/RIOT,TobiasFredersdorf\/RIOT,rousselk\/RIOT,altairpearl\/RIOT,aeneby\/RIOT,RIOT-OS\/RIOT,locicontrols\/RIOT,koenning\/RIOT,basilfx\/RIOT,ThanhVic\/RIOT,ntrtrung\/RIOT,AnonMall\/RIOT,patkan\/RIOT,mziegert\/RIOT,bartfaizoltan\/RIOT,neumodisch\/RIOT,A-Paul\/RIOT,marcosalm\/RIOT,kb2ma\/RIOT,thomaseichinger\/RIOT,biboc\/RIOT,emmanuelsearch\/RIOT,DipSwitch\/RIOT,latsku\/RIOT,basilfx\/RIOT,x3ro\/RIOT,dailab\/RIOT,Lexandro92\/RIOT-CoAP,mfrey\/RIOT,malosek\/RIOT,changbiao\/RIOT,josephnoir\/RIOT,zhuoshuguo\/RIOT,jremmert-phytec-iot\/RIOT,benoit-canet\/RIOT,phiros\/RIOT,patkan\/RIOT,EmuxEvans\/RIOT,kaleb-himes\/RIOT,brettswann\/RIOT,kerneltask\/RIOT,LudwigOrtmann\/RIOT,MohmadAyman\/RIOT,authmillenon\/RIOT,changbiao\/RIOT,x3ro\/RIOT,mfrey\/RIOT,AnonMall\/RIOT,khhhh\/RIOT,watr-li\/RIOT,neiljay\/RIOT,thomaseichinger\/RIOT,rfswarm\/RIOT,cladmi\/RIOT,herrfz\/RIOT,Darredevil\/RIOT,Ell-i\/RIOT,Josar\/RIOT,FrancescoErmini\/RIOT,luciotorre\/RIOT,lebrush\/RIOT,alex1818\/RIOT,neiljay\/RIOT,LudwigKnuepfer\/RIOT,luciotorre\/RIOT,rousselk\/RIOT,cladmi\/RIOT,adjih\/RIOT,alex1818\/RIOT,rfswarm2\/RIOT,tfar\/RIOT,ntrtrung\/RIOT,jremmert-phytec-iot\/RIOT,khhhh\/RIOT,dkm\/RIOT,Yonezawa-T2\/RIOT,spium\/IoT-RIOT,chris-wood\/RIOT,hamilton-mote\/RIOT-OS,ant9000\/RIOT,basilfx\/RIOT,AnonMall\/RIOT,attdona\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,AnonMall\/RIOT,Yonezawa-T2\/RIOT,lebrush\/RIOT,l3nko\/RIOT,ThanhVic\/RIOT,asanka-code\/RIOT,jremmert-phytec-iot\/RIOT,dhruvvyas90\/RIOT,spium\/IoT-RIOT,Lexandro92\/RIOT-CoAP,dhruvvyas90\/RIOT,khhhh\/RIOT,gebart\/RIOT,marcosalm\/RIOT,ntrtrung\/RIOT,BytesGalore\/PetersRIOT,nsol-nmsu\/RIOT,beurdouche\/RIOT,d00616\/RIOT,OTAkeys\/RIOT,rfswarm2\/RIOT,shady33\/RIOT,rajma996\/RIOT,tdautc19841202\/RIOT,abp719\/RIOT,southernbear\/RIOT,immesys\/RiSyn,MohmadAyman\/RIOT,jhollister\/RIOT,zhuoshuguo\/RIOT,automote\/RIOT,thiagohd\/RIOT,Osblouf\/RIOT,roberthartung\/RIOT,ThanhVic\/RIOT,ThanhVic\/RIOT,mfrey\/RIOT,stevenj\/RIOT,latsku\/RIOT,sgso\/RIOT,1blankz7\/RIOT,rajma996\/RIOT,miri64\/RIOT,l3nko\/RIOT,wentaoshang\/RIOT,alex1818\/RIOT,adrianghc\/RIOT,dkm\/RIOT,herrfz\/RIOT,immesys\/RiSyn,kYc0o\/RIOT,jhollister\/RIOT,abkam07\/RIOT,kushalsingh007\/RIOT,rakendrathapa\/RIOT,RubikonAlpha\/RIOT,hamilton-mote\/RIOT-OS,dhruvvyas90\/RIOT,MohmadAyman\/RIOT,RubikonAlpha\/RIOT,beurdouche\/RIOT,mziegert\/RIOT,RubikonAlpha\/RIOT,shady33\/RIOT,fnack\/RIOT,ros2\/ros2_embedded_riot,binarylemon\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,watr-li\/RIOT,LudwigKnuepfer\/RIOT,BytesGalore\/RIOT,aeneby\/RIOT,haoyangyu\/RIOT,centurysys\/RIOT,x3ro\/RIOT,EmuxEvans\/RIOT,msolters\/RIOT,biboc\/RIOT,mtausig\/RIOT,EmuxEvans\/RIOT,syin2\/RIOT,herrfz\/RIOT,centurysys\/RIOT,arvindpdmn\/RIOT,daniel-k\/RIOT,herrfz\/RIOT-old,Ell-i\/RIOT,herrfz\/RIOT-old,katezilla\/RIOT,altairpearl\/RIOT,changbiao\/RIOT,binarylemon\/RIOT,l3nko\/RIOT,Lotterleben\/RIOT,attdona\/RIOT,plushvoxel\/RIOT,nsol-nmsu\/RIOT,chris-wood\/RIOT,nsol-nmsu\/RIOT,msolters\/RIOT,bartfaizoltan\/RIOT,centurysys\/RIOT,kaspar030\/RIOT,lebrush\/RIOT,jferreir\/RIOT,gautric\/RIOT,automote\/RIOT,BytesGalore\/PetersRIOT,nsol-nmsu\/RIOT,ntrtrung\/RIOT,automote\/RIOT,jbeyerstedt\/RIOT-OTA-update,EmuxEvans\/RIOT,ant9000\/RIOT,yogo1212\/RIOT,stevenj\/RIOT,dailab\/RIOT,luciotorre\/RIOT,kYc0o\/RIOT,alignan\/RIOT,d00616\/RIOT,hamilton-mote\/RIOT-OS,locicontrols\/RIOT,haoyangyu\/RIOT,rfuentess\/RIOT,MonsterCode8000\/RIOT,shady33\/RIOT,watr-li\/RIOT,dhruvvyas90\/RIOT,msolters\/RIOT,smlng\/RIOT,koenning\/RIOT,kerneltask\/RIOT,tdautc19841202\/RIOT,kaleb-himes\/RIOT,luciotorre\/RIOT,FrancescoErmini\/RIOT,rfuentess\/RIOT,kbumsik\/RIOT,watr-li\/RIOT,mtausig\/RIOT,binarylemon\/RIOT,patkan\/RIOT,hamilton-mote\/RIOT-OS,koenning\/RIOT,kaspar030\/RIOT,khhhh\/RIOT,koenning\/RIOT,fnack\/RIOT,openkosmosorg\/RIOT,neiljay\/RIOT,jbeyerstedt\/RIOT-OTA-update,BytesGalore\/PetersRIOT,RBartz\/RIOT,MarkXYang\/RIOT,x3ro\/RIOT,attdona\/RIOT,stevenj\/RIOT,basilfx\/RIOT,RIOT-OS\/RIOT,gautric\/RIOT,dkm\/RIOT,locicontrols\/RIOT,malosek\/RIOT,jbeyerstedt\/RIOT-OTA-update,sumanpanchal\/RIOT,attdona\/RIOT,mfrey\/RIOT,benoit-canet\/RIOT,herrfz\/RIOT,ant9000\/RIOT,authmillenon\/RIOT,ThanhVic\/RIOT,abkam07\/RIOT,yogo1212\/RIOT,marcosalm\/RIOT,ant9000\/RIOT,sumanpanchal\/RIOT,gebart\/RIOT,katezilla\/RIOT,stevenj\/RIOT,openkosmosorg\/RIOT,thiagohd\/RIOT,haoyangyu\/RIOT,x3ro\/RIOT,immesys\/RiSyn,adrianghc\/RIOT,PSHIVANI\/Riot-Code,Osblouf\/RIOT,adjih\/RIOT,RubikonAlpha\/RIOT,PSHIVANI\/Riot-Code,ks156\/RIOT,miri64\/RIOT,alignan\/RIOT,benoit-canet\/RIOT,latsku\/RIOT,Darredevil\/RIOT,dailab\/RIOT,rajma996\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,lazytech-org\/RIOT,aeneby\/RIOT,authmillenon\/RIOT,kbumsik\/RIOT,smlng\/RIOT,BytesGalore\/PetersRIOT,toonst\/RIOT,Lotterleben\/RIOT,Yonezawa-T2\/RIOT,mziegert\/RIOT,kaspar030\/RIOT,Lexandro92\/RIOT-CoAP,beurdouche\/RIOT,jfischer-phytec-iot\/RIOT,avmelnikoff\/RIOT,LudwigKnuepfer\/RIOT,ximus\/RIOT,jfischer-phytec-iot\/RIOT,MonsterCode8000\/RIOT,alex1818\/RIOT,herrfz\/RIOT,altairpearl\/RIOT,backenklee\/RIOT,PSHIVANI\/Riot-Code,authmillenon\/RIOT,kerneltask\/RIOT,immesys\/RiSyn,avmelnikoff\/RIOT,A-Paul\/RIOT,sgso\/RIOT,plushvoxel\/RIOT,roberthartung\/RIOT,neumodisch\/RIOT,tfar\/RIOT,OTAkeys\/RIOT,jfischer-phytec-iot\/RIOT,openkosmosorg\/RIOT,stevenj\/RIOT,zhuoshuguo\/RIOT,Hyungsin\/RIOT-OS,ks156\/RIOT,tfar\/RIOT,locicontrols\/RIOT,yogo1212\/RIOT,FrancescoErmini\/RIOT,josephnoir\/RIOT,Hyungsin\/RIOT-OS,PSHIVANI\/Riot-Code,jremmert-phytec-iot\/RIOT,toonst\/RIOT,jremmert-phytec-iot\/RIOT,gbarnett\/RIOT,adrianghc\/RIOT,robixnai\/RIOT,A-Paul\/RIOT,BytesGalore\/RIOT,abkam07\/RIOT,asanka-code\/RIOT,latsku\/RIOT,brettswann\/RIOT,kb2ma\/RIOT,JensErdmann\/RIOT,tfar\/RIOT,MohmadAyman\/RIOT,1blankz7\/RIOT,tdautc19841202\/RIOT,jhollister\/RIOT,1blankz7\/RIOT,backenklee\/RIOT,biboc\/RIOT,herrfz\/RIOT-old,binarylemon\/RIOT,katezilla\/RIOT,MarkXYang\/RIOT,malosek\/RIOT,ximus\/RIOT,automote\/RIOT,OlegHahm\/RIOT,kbumsik\/RIOT,biboc\/RIOT,RIOT-OS\/RIOT,LudwigOrtmann\/RIOT,wentaoshang\/RIOT,jferreir\/RIOT,arvindpdmn\/RIOT,watr-li\/RIOT,shady33\/RIOT,smlng\/RIOT,MonsterCode8000\/RIOT,MohmadAyman\/RIOT,FrancescoErmini\/RIOT,gautric\/RIOT,jasonatran\/RIOT,changbiao\/RIOT,marcosalm\/RIOT,abkam07\/RIOT,rousselk\/RIOT,sgso\/RIOT,alignan\/RIOT,zhuoshuguo\/RIOT,Ell-i\/RIOT,wentaoshang\/RIOT,alignan\/RIOT,rfswarm\/RIOT,emmanuelsearch\/RIOT,centurysys\/RIOT,locicontrols\/RIOT,neumodisch\/RIOT,rakendrathapa\/RIOT,dailab\/RIOT,jhollister\/RIOT,LudwigKnuepfer\/RIOT,RBartz\/RIOT,rfuentess\/RIOT,Yonezawa-T2\/RIOT,ros2\/ros2_embedded_riot,d00616\/RIOT,JensErdmann\/RIOT,avmelnikoff\/RIOT,abkam07\/RIOT,jasonatran\/RIOT,jfischer-phytec-iot\/RIOT,bartfaizoltan\/RIOT,toonst\/RIOT,kushalsingh007\/RIOT,asanka-code\/RIOT,Lotterleben\/RIOT,EmuxEvans\/RIOT,watr-li\/RIOT,kYc0o\/RIOT,koenning\/RIOT,kbumsik\/RIOT,emmanuelsearch\/RIOT,TobiasFredersdorf\/RIOT,l3nko\/RIOT,adjih\/RIOT,ntrtrung\/RIOT,emmanuelsearch\/RIOT,MonsterCode8000\/RIOT,kushalsingh007\/RIOT,rakendrathapa\/RIOT,ks156\/RIOT,openkosmosorg\/RIOT,rfuentess\/RIOT,kaspar030\/RIOT,d00616\/RIOT,arvindpdmn\/RIOT,jbeyerstedt\/RIOT-OTA-update,A-Paul\/RIOT,BytesGalore\/RIOT,adrianghc\/RIOT,latsku\/RIOT,locicontrols\/RIOT,kb2ma\/RIOT,daniel-k\/RIOT,BytesGalore\/PetersRIOT,yogo1212\/RIOT,dkm\/RIOT,rfswarm2\/RIOT,toonst\/RIOT,asanka-code\/RIOT,altairpearl\/RIOT,MarkXYang\/RIOT,thiagohd\/RIOT,rajma996\/RIOT,miri64\/RIOT,LudwigKnuepfer\/RIOT,zhuoshuguo\/RIOT,benoit-canet\/RIOT,yogo1212\/RIOT,jferreir\/RIOT,daniel-k\/RIOT,dailab\/RIOT,Osblouf\/RIOT,cladmi\/RIOT,alignan\/RIOT,spium\/IoT-RIOT,ntrtrung\/RIOT,neiljay\/RIOT,mziegert\/RIOT,malosek\/RIOT,rajma996\/RIOT,Lotterleben\/RIOT,l3nko\/RIOT,chris-wood\/RIOT,cladmi\/RIOT,sumanpanchal\/RIOT,JensErdmann\/RIOT,neumodisch\/RIOT,koenning\/RIOT,ThanhVic\/RIOT,beurdouche\/RIOT,RBartz\/RIOT,Ell-i\/RIOT,tfar\/RIOT,gbarnett\/RIOT,kb2ma\/RIOT,basilfx\/RIOT,DipSwitch\/RIOT,thomaseichinger\/RIOT,luciotorre\/RIOT,msolters\/RIOT,katezilla\/RIOT,thomaseichinger\/RIOT,altairpearl\/RIOT,Lotterleben\/RIOT,avmelnikoff\/RIOT,alex1818\/RIOT,OTAkeys\/RIOT,ros2\/ros2_embedded_riot,MarkXYang\/RIOT,kaleb-himes\/RIOT,changbiao\/RIOT,thomaseichinger\/RIOT,TobiasFredersdorf\/RIOT,RBartz\/RIOT,DipSwitch\/RIOT,spium\/IoT-RIOT,rakendrathapa\/RIOT,chris-wood\/RIOT,syin2\/RIOT,BytesGalore\/PetersRIOT,ros2\/ros2_embedded_riot,Osblouf\/RIOT,fnack\/RIOT,Lotterleben\/RIOT,southernbear\/RIOT,haoyangyu\/RIOT,Hyungsin\/RIOT-OS,Josar\/RIOT,robixnai\/RIOT,immesys\/RiSyn,rfswarm\/RIOT,mziegert\/RIOT,dhruvvyas90\/RIOT,herrfz\/RIOT-old,authmillenon\/RIOT,malosek\/RIOT,1blankz7\/RIOT,chris-wood\/RIOT,Osblouf\/RIOT,aeneby\/RIOT,syin2\/RIOT,kushalsingh007\/RIOT,rousselk\/RIOT,JensErdmann\/RIOT,binarylemon\/RIOT,phiros\/RIOT,centurysys\/RIOT,jremmert-phytec-iot\/RIOT,DipSwitch\/RIOT,jferreir\/RIOT,robixnai\/RIOT,RubikonAlpha\/RIOT,PSHIVANI\/Riot-Code,lazytech-org\/RIOT,ros2\/ros2_embedded_riot,rfswarm\/RIOT,kYc0o\/RIOT,lebrush\/RIOT,syin2\/RIOT,msolters\/RIOT,wentaoshang\/RIOT,gbarnett\/RIOT,emmanuelsearch\/RIOT,rfswarm2\/RIOT,abkam07\/RIOT,arvindpdmn\/RIOT,khhhh\/RIOT,MonsterCode8000\/RIOT,brettswann\/RIOT,roberthartung\/RIOT,rfswarm\/RIOT,fnack\/RIOT,neiljay\/RIOT,rousselk\/RIOT,JensErdmann\/RIOT,asanka-code\/RIOT,backenklee\/RIOT,OlegHahm\/RIOT,FrancescoErmini\/RIOT,1blankz7\/RIOT,jferreir\/RIOT,cladmi\/RIOT,thiagohd\/RIOT,Lexandro92\/RIOT-CoAP,AnonMall\/RIOT,d00616\/RIOT,Hyungsin\/RIOT-OS,miri64\/RIOT,kerneltask\/RIOT,binarylemon\/RIOT,Lexandro92\/RIOT-CoAP,BytesGalore\/RIOT,marcosalm\/RIOT,ximus\/RIOT,ros2\/ros2_embedded_riot,ks156\/RIOT,BytesGalore\/RIOT,khhhh\/RIOT,kb2ma\/RIOT,ros2\/ros2_embedded_riot,bartfaizoltan\/RIOT,LudwigOrtmann\/RIOT,lebrush\/RIOT,altairpearl\/RIOT,abp719\/RIOT,jferreir\/RIOT,Darredevil\/RIOT,msolters\/RIOT,gebart\/RIOT,robixnai\/RIOT,kushalsingh007\/RIOT,daniel-k\/RIOT,sumanpanchal\/RIOT,centurysys\/RIOT,brettswann\/RIOT,RIOT-OS\/RIOT,lazytech-org\/RIOT,openkosmosorg\/RIOT,sgso\/RIOT,ximus\/RIOT,rajma996\/RIOT,Josar\/RIOT,l3nko\/RIOT,immesys\/RiSyn,RBartz\/RIOT,openkosmosorg\/RIOT,syin2\/RIOT,aeneby\/RIOT,OlegHahm\/RIOT,DipSwitch\/RIOT,TobiasFredersdorf\/RIOT,dhruvvyas90\/RIOT,fnack\/RIOT,Yonezawa-T2\/RIOT,phiros\/RIOT,MarkXYang\/RIOT,ks156\/RIOT,biboc\/RIOT,EmuxEvans\/RIOT,ximus\/RIOT,bartfaizoltan\/RIOT,patkan\/RIOT,asanka-code\/RIOT,mziegert\/RIOT,toonst\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,tdautc19841202\/RIOT,spium\/IoT-RIOT,roberthartung\/RIOT,RubikonAlpha\/RIOT,DipSwitch\/RIOT,adjih\/RIOT,gautric\/RIOT,Darredevil\/RIOT,TobiasFredersdorf\/RIOT,josephnoir\/RIOT,gebart\/RIOT,locicontrols\/RIOT,mfrey\/RIOT,OTAkeys\/RIOT,abp719\/RIOT,ant9000\/RIOT,Ell-i\/RIOT,chris-wood\/RIOT,southernbear\/RIOT,lazytech-org\/RIOT,MonsterCode8000\/RIOT,OlegHahm\/RIOT,herrfz\/RIOT-old,luciotorre\/RIOT,zhuoshuguo\/RIOT,Lotterleben\/RIOT,marcosalm\/RIOT,smlng\/RIOT,southernbear\/RIOT,RBartz\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sys\/auto_init.c\n+++ sys\/auto_init.c\n@@ -2,8 +2,6 @@\n #include <stdio.h>\n #include <board_uart0.h>\n #include <rtc.h>\n-#include <display.h>\n-#include <display_putchar.h>\n #include <auto_init.h>\n \n #define ENABLE_DEBUG\n@@ -13,10 +11,12 @@\n \n void auto_init(void) {\n #ifdef MODULE_BOARD_DISPLAY\n+ extern void lcd_init();\n lcd_init();\n DEBUG(\"DISP OK\");\n #endif\n #ifdef MODULE_DISPLAY_PUTCHAR\n+ extern void init_display_putchar();\n init_display_putchar();\n DEBUG(\"DISP OK\");\n #endif\n"} {"commit":"8c357b20fe4caebf743cc0eba04fccbf8bacccad","subject":" deinterlace.c: added AltiVec optims for 16-bytes unaligned lines","message":" deinterlace.c: added AltiVec optims for 16-bytes unaligned lines\n\n","repos":"krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/video_filter\/deinterlace.c\n+++ modules\/video_filter\/deinterlace.c\n@@ -928,29 +928,64 @@\n static void MergeAltivec( void *_p_dest, const void *_p_s1,\n const void *_p_s2, size_t i_bytes )\n {\n- uint8_t *p_dest = (uint8_t*)_p_dest;\n- const uint8_t *p_s1 = (const uint8_t *)_p_s1;\n- const uint8_t *p_s2 = (const uint8_t *)_p_s2;\n- uint8_t *p_end = p_dest + i_bytes - 16;\n-\n- if( ( (int)p_s1 & 0xF ) | ( (int)p_s2 & 0xF ) |\n- ( (int)p_dest & 0xF ) )\n- {\n- \/* TODO Handle non 16-bytes aligned planes *\/\n- MergeGeneric( _p_dest, _p_s1, _p_s2, i_bytes );\n- return;\n- }\n-\n- while( p_dest < p_end )\n- {\n- vec_st( vec_avg( vec_ld( 0, p_s1 ), vec_ld( 0, p_s2 ) ),\n- 0, p_dest );\n- p_s1 += 16;\n- p_s2 += 16;\n- p_dest += 16;\n- }\n-\n- p_end += 16;\n+ uint8_t *p_dest = (uint8_t *)_p_dest;\n+ uint8_t *p_s1 = (uint8_t *)_p_s1;\n+ uint8_t *p_s2 = (uint8_t *)_p_s2;\n+ uint8_t *p_end = p_dest + i_bytes - 15;\n+\n+ \/* Use C until the first 16-bytes aligned destination pixel *\/\n+ while( (int)p_dest & 0xF )\n+ {\n+ *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1;\n+ }\n+\n+ if( ( (int)p_s1 & 0xF ) | ( (int)p_s2 & 0xF ) )\n+ {\n+ \/* Unaligned source *\/\n+ vector unsigned char s1v, s2v, destv;\n+ vector unsigned char s1oldv, s2oldv, s1newv, s2newv;\n+ vector unsigned char perm1v, perm2v;\n+\n+ perm1v = vec_lvsl( 0, p_s1 );\n+ perm2v = vec_lvsl( 0, p_s2 );\n+ s1oldv = vec_ld( 0, p_s1 );\n+ s2oldv = vec_ld( 0, p_s2 );\n+\n+ while( p_dest < p_end )\n+ {\n+ s1newv = vec_ld( 16, p_s1 );\n+ s2newv = vec_ld( 16, p_s2 );\n+ s1v = vec_perm( s1oldv, s1newv, perm1v );\n+ s2v = vec_perm( s2oldv, s2newv, perm2v );\n+ s1oldv = s1newv;\n+ s2oldv = s2newv;\n+ destv = vec_avg( s1v, s2v );\n+ vec_st( destv, 0, p_dest );\n+\n+ p_s1 += 16;\n+ p_s2 += 16;\n+ p_dest += 16;\n+ }\n+ }\n+ else\n+ {\n+ \/* Aligned source *\/\n+ vector unsigned char s1v, s2v, destv;\n+\n+ while( p_dest < p_end )\n+ {\n+ s1v = vec_ld( 0, p_s1 );\n+ s2v = vec_ld( 0, p_s2 );\n+ destv = vec_avg( s1v, s2v );\n+ vec_st( destv, 0, p_dest );\n+\n+ p_s1 += 16;\n+ p_s2 += 16;\n+ p_dest += 16;\n+ }\n+ }\n+\n+ p_end += 15;\n \n while( p_dest < p_end )\n {\n"} {"commit":"41ae8e8d677cd85ddd15ad5be723bafcd88a9d62","subject":"Add threading and OpenMP information to output","message":"Add threading and OpenMP information to output\n\nFor #1416 and #1529, more information about the options OpenBLAS was built with is needed. Additionally we may want to add this data to the openblas.pc file (but not all projects use pkgconfig, and as far as I am aware the cmake module for accessing it does not make such \"private\" declarations available)","repos":"xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS,xianyi\/OpenBLAS","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- driver\/others\/openblas_get_config.c\n+++ driver\/others\/openblas_get_config.c\n@@ -54,6 +54,9 @@\n #ifdef NO_AFFINITY\n \"NO_AFFINITY \"\n #endif\n+#ifdef USE_OPENMP\n+ \"USE_OPENMP \"\n+#endif\n #ifndef DYNAMIC_ARCH\n CHAR_CORENAME\n #endif\n@@ -61,18 +64,23 @@\n \n #ifdef DYNAMIC_ARCH\n char *gotoblas_corename();\n-static char tmp_config_str[256];\n #endif\n \n+static char tmp_config_str[256];\n+int openblas_get_parallel();\n \n char* CNAME() {\n-#ifndef DYNAMIC_ARCH\n- return openblas_config_str;\n-#else\n+char tmpstr[20];\n strcpy(tmp_config_str, openblas_config_str);\n+#ifdef DYNAMIC_ARCH\n strcat(tmp_config_str, gotoblas_corename());\n+#endif\n+if (openblas_get_parallel() == 0)\n+ sprintf(tmpstr, \" SINGLE_THREADED\");\n+else \n+ snprintf(tmpstr,19,\" MAX_THREADS=%d\",MAX_CPU_NUMBER);\n+ strcat(tmp_config_str, tmpstr);\n return tmp_config_str;\n-#endif\n }\n \n \n@@ -83,3 +91,4 @@\n return gotoblas_corename();\n #endif\n }\n+\n"} {"commit":"ca30214aefacfaced7ff86dc8653cd2ae937bd7a","subject":"add_slab: pg->slab is an union member (#1108)","message":"add_slab: pg->slab is an union member (#1108)\n\n","repos":"cahirwpz\/mimiker,cahirwpz\/mimiker,cahirwpz\/mimiker,cahirwpz\/mimiker","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/pool.c\n+++ sys\/kern\/pool.c\n@@ -108,7 +108,6 @@\n for (size_t i = 0; i < slabsize; i += PAGESIZE) {\n vm_page_t *pg = kva_find_page((vaddr_t)slab + i);\n assert(pg != NULL);\n- assert(pg->slab == NULL);\n pg->slab = slab;\n }\n }\n"} {"commit":"9ba94e34a669269b923799cfba6cd12363d78be0","subject":"Remove a duplicate definition of __pmServerPresence","message":"Remove a duplicate definition of __pmServerPresence\n","repos":"mbaldessari\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,prasincs\/pcp,mbaldessari\/pcp,adfernandes\/pcp,adfernandes\/pcp,wuliming\/pcp,andyvand\/cygpcpfans,adfernandes\/pcp,tjanez\/pcp,edwardt\/pcp,edwardt\/pcp,wuliming\/pcp,wuliming\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,mbaldessari\/pcp,edwardt\/pcp,mbaldessari\/pcp,edwardt\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,wuliming\/pcp,andyvand\/cygpcpfans,prasincs\/pcp,prasincs\/pcp,edwardt\/pcp,edwardt\/pcp,aeg-aeg\/pcpfans,wuliming\/pcp,tjanez\/pcp,andyvand\/cygpcpfans,mbaldessari\/pcp,tjanez\/pcp,prasincs\/pcp,edwardt\/pcp,prasincs\/pcp,edwardt\/pcp,adfernandes\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,mbaldessari\/pcp,tjanez\/pcp,andyvand\/cygpcpfans,aeg-aeg\/pcpfans,prasincs\/pcp,andyvand\/cygpcpfans,prasincs\/pcp,tjanez\/pcp,wuliming\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,prasincs\/pcp,wuliming\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,tjanez\/pcp,tjanez\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libpcp\/src\/avahi.h\n+++ src\/libpcp\/src\/avahi.h\n@@ -14,8 +14,6 @@\n #ifndef AVAHI_H\n #define AVAHI_H\n \n-typedef struct __pmServerPresence __pmServerPresence;\n-\n void __pmServerAvahiAdvertisePresence(__pmServerPresence *) _PCP_HIDDEN;\n void __pmServerAvahiUnadvertisePresence(__pmServerPresence *) _PCP_HIDDEN;\n \n"} {"commit":"d0ee033c46a45f367269e659165cd7ac7e19eda2","subject":"Fix crash when vout window is resized to 0 width","message":"Fix crash when vout window is resized to 0 width\n\n","repos":"vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/video_output\/x11\/xcommon.c\n+++ modules\/video_output\/x11\/xcommon.c\n@@ -901,6 +901,10 @@\n p_win->wm_delete_window =\n XInternAtom( p_vout->p_sys->p_display, \"WM_DELETE_WINDOW\", True );\n \n+ \/* Never have a 0-pixel-wide window *\/\n+ xsize_hints.min_width = 2;\n+ xsize_hints.min_height = 1;\n+\n \/* Prepare window attributes *\/\n xwindow_attributes.backing_store = Always; \/* save the hidden part *\/\n xwindow_attributes.background_pixel = BlackPixel(p_vout->p_sys->p_display,\n@@ -915,7 +919,7 @@\n \n xsize_hints.base_width = xsize_hints.width = p_win->i_width;\n xsize_hints.base_height = xsize_hints.height = p_win->i_height;\n- xsize_hints.flags = PSize;\n+ xsize_hints.flags = PSize | PMinSize;\n \n if( p_win->i_x >=0 || p_win->i_y >= 0 )\n {\n"} {"commit":"53af9cfb37af5e03ee2b24c5d5c4963c34e5b765","subject":"ACPI: get_throttling_state() cannot be larger than state_count","message":"ACPI: get_throttling_state() cannot be larger than state_count\n\nReported-by: Roel Kluin <aa9c6213291cec1ff07688554fb7b904b9ffe4e3@gmail.com>\nAcked-by: Zhao Yakui <21bae65ecea50a19bd9d0fef489914760189fd5b@intel.com>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/acpi\/processor_throttling.c\n+++ drivers\/acpi\/processor_throttling.c\n@@ -783,11 +783,9 @@\n \t\t (struct acpi_processor_tx_tss *)&(pr->throttling.\n \t\t\t\t\t\t states_tss[i]);\n \t\tif (tx->control == value)\n-\t\t\tbreak;\n-\t}\n-\tif (i > pr->throttling.state_count)\n-\t\ti = -1;\n-\treturn i;\n+\t\t\treturn i;\n+\t}\n+\treturn -1;\n }\n \n static int acpi_get_throttling_value(struct acpi_processor *pr,\n"} {"commit":"bf5ea124d48283d62d84d7171d473d005128293b","subject":"Remove redundant redefinition of vtophys(). This is already in if_pnreg.h","message":"Remove redundant redefinition of vtophys(). This is already in if_pnreg.h\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/pci\/if_pn.c\n+++ sys\/pci\/if_pn.c\n@@ -29,7 +29,7 @@\n * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\n * THE POSSIBILITY OF SUCH DAMAGE.\n *\n- *\t$Id: if_pn.c,v 1.18 1999\/04\/24 20:14:00 peter Exp $\n+ *\t$Id: if_pn.c,v 1.19 1999\/05\/09 17:06:57 peter Exp $\n *\/\n \n \/*\n@@ -97,14 +97,9 @@\n \n #ifndef lint\n static const char rcsid[] =\n-\t\"$Id: if_pn.c,v 1.18 1999\/04\/24 20:14:00 peter Exp $\";\n+\t\"$Id: if_pn.c,v 1.19 1999\/05\/09 17:06:57 peter Exp $\";\n #endif\n \n-#ifdef __alpha__\n-#undef vtophys\n-#define\tvtophys(va)\t(pmap_kextract(((vm_offset_t) (va))) \\\n-\t\t\t + 1*1024*1024*1024)\n-#endif\n \n \/*\n * Various supported device vendors\/types and their names.\n"} {"commit":"b601bf51c6f7b56f9703a21092ec19c6560afd84","subject":"Update method documentation of kdbGet().","message":"Update method documentation of kdbGet().\n","repos":"mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libs\/elektra\/kdb.c\n+++ src\/libs\/elektra\/kdb.c\n@@ -1190,8 +1190,8 @@\n * @param ks the (pre-initialized) KeySet returned with all keys found\n * \twill not be changed on error or if no update is required\n *\n- * @retval 1 if the Keys were retrieved successfully\n- * @retval 0 if there was no update - no changes are made to the KeySet then\n+ * @retval 1 if the Keys were retrieved successfully. There might be warnings attached to the parentKey! Depending on your use case, you might need to treat them as errors!\n+ * @retval 0 if there was no update - no changes are made to the KeySet then. There might be warnings attached to the parentKey! Depending on your use case, you might need to treat them as erorrs!\n * @retval -1 on failure - no changes are made to the KeySet then\n *\n * @since 1.0.0\n"} {"commit":"afd4e73c23ebdc8b379a75a88ee9e4b176ede0b9","subject":"* modules\/video_output\/x11\/xcommon.c: added support for on-the-fly cropping to xvideo.","message":"* modules\/video_output\/x11\/xcommon.c: added support for on-the-fly cropping to xvideo.\n","repos":"shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/video_output\/x11\/xcommon.c\n+++ modules\/video_output\/x11\/xcommon.c\n@@ -847,6 +847,20 @@\n p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;\n }\n \n+#ifdef MODULE_NAME_IS_xvideo\n+ if( p_vout->fmt_out.i_x_offset != p_vout->fmt_in.i_x_offset ||\n+ p_vout->fmt_out.i_y_offset != p_vout->fmt_in.i_y_offset ||\n+ p_vout->fmt_out.i_visible_width != p_vout->fmt_in.i_visible_width ||\n+ p_vout->fmt_out.i_visible_height != p_vout->fmt_in.i_visible_height )\n+ {\n+ p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset;\n+ p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset;\n+ p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width;\n+ p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height;\n+ p_vout->i_changes |= VOUT_SIZE_CHANGE;\n+ }\n+#endif\n+\n \/*\n * Size change\n *\n"} {"commit":"8f43f84f13a49fe5f0f7d1595082b6d7ec6daa85","subject":"[PATCH] ipmi: timer shutdown cleanup","message":"[PATCH] ipmi: timer shutdown cleanup\n\nClean up the timer shutdown handling in the IPMI driver.\n\nSigned-off-by: Corey Minyard <f2a05cc3f63c42acc07a3bbae0d4082a7c4f5388@acm.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_msghandler.c\n+++ drivers\/char\/ipmi\/ipmi_msghandler.c\n@@ -2747,16 +2747,13 @@\n the queue and this silliness can go away. *\/\n #define IPMI_REQUEST_EV_TIME\t(1000 \/ (IPMI_TIMEOUT_TIME))\n \n-static volatile int stop_operation = 0;\n-static volatile int timer_stopped = 0;\n+static atomic_t stop_operation;\n static unsigned int ticks_to_req_ev = IPMI_REQUEST_EV_TIME;\n \n static void ipmi_timeout(unsigned long data)\n {\n-\tif (stop_operation) {\n-\t\ttimer_stopped = 1;\n+\tif (atomic_read(&stop_operation))\n \t\treturn;\n-\t}\n \n \tticks_to_req_ev--;\n \tif (ticks_to_req_ev == 0) {\n@@ -2766,8 +2763,7 @@\n \n \tipmi_timeout_handler(IPMI_TIMEOUT_TIME);\n \n-\tipmi_timer.expires += IPMI_TIMEOUT_JIFFIES;\n-\tadd_timer(&ipmi_timer);\n+\tmod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);\n }\n \n \n@@ -3130,11 +3126,8 @@\n \n \t\/* Tell the timer to stop, then wait for it to stop. This avoids\n \t problems with race conditions removing the timer here. *\/\n-\tstop_operation = 1;\n-\twhile (!timer_stopped) {\n-\t\tset_current_state(TASK_UNINTERRUPTIBLE);\n-\t\tschedule_timeout(1);\n-\t}\n+\tatomic_inc(&stop_operation);\n+\tdel_timer_sync(&ipmi_timer);\n \n \tremove_proc_entry(proc_ipmi_root->name, &proc_root);\n \n"} {"commit":"64203195edf44601d9825284101dcaf7ad54ece8","subject":"UBI: add sanity check","message":"UBI: add sanity check\n\nSigned-off-by: Artem Bityutskiy <19b5733dcea388885746d36043d3568bba5b4df7@nokia.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/ubi\/scan.c\n+++ drivers\/mtd\/ubi\/scan.c\n@@ -286,8 +286,13 @@\n \t\t * FIXME: but this is anyway obsolete and will be removed at\n \t\t * some point.\n \t\t *\/\n-\n \t\tdbg_bld(\"using old crappy leb_ver stuff\");\n+\n+\t\tif (v1 == v2) {\n+\t\t\tubi_err(\"PEB %d and PEB %d have the same version %lld\",\n+\t\t\t\tseb->pnum, pnum, v1);\n+\t\t\treturn -EINVAL;\n+\t\t}\n \n \t\tabs = v1 - v2;\n \t\tif (abs < 0)\n"} {"commit":"c38e60c109612801df139c4a801e94c1ac3d6fce","subject":"MFC r277883:","message":"MFC r277883:\n\nEnsure that lint does not pick up C11 keywords (e.g. _Noreturn), even\nif C11 mode is used. It does not support any C11 constructs.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/sys\/cdefs.h\n+++ sys\/sys\/cdefs.h\n@@ -250,7 +250,7 @@\n * Keywords added in C11.\n *\/\n \n-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L\n+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || defined(lint)\n \n #if !__has_extension(c_alignas)\n #if (defined(__cplusplus) && __cplusplus >= 201103L) || \\\n"} {"commit":"cfc6140607c2b782755f05278003463b9dcd9494","subject":"rpc: ensure that TA fits in allocated memory","message":"rpc: ensure that TA fits in allocated memory\n\nWhen the TEE is about to load a TA it first asks the REE for the size of\nthe TA in question. Next it allocates memory for this based on the size\nin the previous query. However, there is no guarantee that the REE\nactually allocates the requested size. A compromised REE could for\nexample modify the RPC request. This means that even though an\nallocation is successful, we still need to check that the size of the\nallocated buffer has room to fit the entire TA we are about to load.\n\nFixes: \"REE provided size not checked when loading TAs\" as reported by\nRiscure.\n\nSigned-off-by: Joakim Bech <741f90e2a7f4d9afbad8bd50be20560f4cf38962@linaro.org>\nTested-by: Joakim Bech <741f90e2a7f4d9afbad8bd50be20560f4cf38962@linaro.org> (QEMU v7, v8)\nReviewed-by: Jens Wiklander <7706914404370d7502c27a0eff493dcf491feb51@linaro.org>\nReported-by: Riscure <b5f9fc9e60751b217b3b089dcbd74cd514b67618@riscure.com>\nReported-by: Alyssa Milburn <a5c5029f43bc9836f7af03c99377ded51f71ff9b@vu.nl>\nAcked-by: Etienne Carriere <f21bc5b8f3ea1962eb45af359f1abea6578cab94@linaro.org>\n","repos":"pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- core\/arch\/arm\/kernel\/ree_fs_ta.c\n+++ core\/arch\/arm\/kernel\/ree_fs_ta.c\n@@ -54,6 +54,11 @@\n \tif (!*mobj)\n \t\treturn TEE_ERROR_OUT_OF_MEMORY;\n \n+\tif ((*mobj)->size < params[1].u.memref.size) {\n+\t\tres = TEE_ERROR_SHORT_BUFFER;\n+\t\tgoto exit;\n+\t}\n+\n \t*ta = mobj_get_va(*mobj, 0);\n \t\/* We don't expect NULL as thread_rpc_alloc_payload() was successful *\/\n \tassert(*ta);\n@@ -66,8 +71,10 @@\n \tparams[1].u.memref.mobj = *mobj;\n \n \tres = thread_rpc_cmd(OPTEE_RPC_CMD_LOAD_TA, 2, params);\n+exit:\n \tif (res != TEE_SUCCESS)\n \t\tthread_rpc_free_payload(*mobj);\n+\n \treturn res;\n }\n \n"} {"commit":"0428bd83762602a56b0eeba1eb7f8f4dec3abb8d","subject":"Update src\/libs\/elektra\/kdb.c","message":"Update src\/libs\/elektra\/kdb.c\n\nCo-authored-by: Maximilian Irlinger <1f0e2460eb4143dba1e9cf24ad2e2c53ce3172f4@gmail.com>","repos":"ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libs\/elektra\/kdb.c\n+++ src\/libs\/elektra\/kdb.c\n@@ -638,7 +638,7 @@\n \t\t\tgoto error;\n \t\t}\n \n-\t\t\/\/ adDupMounptoints duplicates everything, including reopening the plugins\n+\t\t\/\/ addDupMounptoint duplicates everything, including reopening the plugins\n \t\t\/\/ so we have to close the originals\n \t\tfor (elektraCursor it = 0; it < ksGetSize (plugins); it++)\n \t\t{\n"} {"commit":"e66a93605e8f00017861a349171a0676e6e49965","subject":"* modules\/video_output\/x11\/xcommon.c: fixed bug with uninitialized variable.","message":"* modules\/video_output\/x11\/xcommon.c: fixed bug with uninitialized variable.\n","repos":"vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/video_output\/x11\/xcommon.c\n+++ modules\/video_output\/x11\/xcommon.c\n@@ -700,7 +700,7 @@\n FIND_ANYWHERE );\n if( p_playlist != NULL )\n {\n- vlc_value_t val;\n+ vlc_value_t val; val.b_bool = VLC_TRUE;\n var_Set( p_playlist, \"intf-popupmenu\", val );\n vlc_object_release( p_playlist );\n }\n"} {"commit":"f7caa1b51fa526586c9d9a4582b5f8af440909d7","subject":"ipmi: update driver version","message":"ipmi: update driver version\n\nEnough bug fixes and changes that we need a new driver version.\n\nSigned-off-by: Corey Minyard <97c9634d4bed2779ee3e53c0495565ccc28c2363@mvista.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_msghandler.c\n+++ drivers\/char\/ipmi\/ipmi_msghandler.c\n@@ -47,7 +47,7 @@\n \n #define PFX \"IPMI message handler: \"\n \n-#define IPMI_DRIVER_VERSION \"39.1\"\n+#define IPMI_DRIVER_VERSION \"39.2\"\n \n static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void);\n static int ipmi_init_msghandler(void);\n"} {"commit":"4f83ec19bbd0c78a2158c7a5d28f70d8b4417803","subject":"bnx2: Update TPAT firmware","message":"bnx2: Update TPAT firmware\n\nThis change allows the first TX ring (CID 16) and the first TSS TX ring\n(CID 32) to be used concurrently. Before this change, we could get TSO\nerrors when both TX rings were used concurrently.\n\nSigned-off-by: Benjamin Li <78c2d7d7350b7e1c7e7791cb75926b84a41fb7dc@broadcom.com>\nSigned-off-by: Michael Chan <6b52f9d672b6134057900fe608467612b789a84e@broadcom.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/bnx2_fw2.h\n+++ drivers\/net\/bnx2_fw2.h\n@@ -3448,242 +3448,242 @@\n \n static u8 bnx2_TPAT_b09FwText[] = {\n \t0xbd, 0x58, 0x5d, 0x6c, 0x1c, 0x57, 0x15, 0x3e, 0x73, 0xe7, 0xee, 0x7a,\n-\t0x6d, 0x39, 0xf1, 0xb8, 0x99, 0xb6, 0x1b, 0x6a, 0xd4, 0x99, 0x78, 0xfc,\n-\t0x43, 0x6d, 0x95, 0x69, 0xbb, 0x2a, 0x2e, 0xac, 0xd0, 0x74, 0x77, 0xe3,\n-\t0x5a, 0x55, 0x55, 0xb9, 0x52, 0x10, 0x95, 0x1a, 0x21, 0xb3, 0x6e, 0xda,\n-\t0xf2, 0x96, 0x22, 0x1e, 0x90, 0x8a, 0x94, 0x65, 0xed, 0xa4, 0x16, 0x5a,\n-\t0xb2, 0xad, 0x0b, 0x89, 0x84, 0x78, 0x88, 0x9c, 0x3a, 0xee, 0xc3, 0xca,\n-\t0xdb, 0x8a, 0x07, 0x24, 0xa4, 0xa8, 0x55, 0x80, 0xc0, 0x1b, 0x7d, 0xa8,\n+\t0x6d, 0x39, 0xf1, 0xb8, 0x99, 0x96, 0x4d, 0x63, 0xd4, 0x99, 0x78, 0xfc,\n+\t0x43, 0x6d, 0x95, 0x69, 0x59, 0x15, 0x17, 0x56, 0x68, 0xba, 0xbb, 0x71,\n+\t0xad, 0xaa, 0xaa, 0x5c, 0x29, 0x88, 0x4a, 0x8d, 0x90, 0x59, 0x37, 0x6d,\n+\t0x79, 0x4b, 0x11, 0x0f, 0x48, 0x45, 0xca, 0xb2, 0x76, 0xd2, 0x08, 0x2d,\n+\t0x99, 0xd6, 0x85, 0x44, 0x42, 0x7d, 0x88, 0x9c, 0x3a, 0xee, 0xc3, 0xca,\n+\t0x9b, 0x8a, 0x07, 0x24, 0xa4, 0xa8, 0x55, 0x80, 0xc0, 0x1b, 0x7d, 0xa8,\n \t0xf8, 0x79, 0x22, 0x12, 0x0f, 0x54, 0x08, 0x90, 0x85, 0x04, 0x2a, 0xa5,\n-\t0xe4, 0xf2, 0x7d, 0x77, 0x66, 0x92, 0xc5, 0x4d, 0x41, 0xe5, 0x81, 0x95,\n+\t0xe4, 0xf2, 0x7d, 0x77, 0x67, 0x92, 0xc5, 0x4d, 0x41, 0xe5, 0x81, 0x95,\n \t0x56, 0x77, 0xe6, 0xde, 0x73, 0xce, 0x3d, 0xf7, 0xfc, 0x7c, 0xe7, 0xdc,\n-\t0x39, 0xe2, 0xc8, 0x88, 0x64, 0xbf, 0x03, 0xf8, 0x57, 0xbe, 0x7c, 0xf2,\n-\t0x6b, 0xf7, 0xdf, 0x5b, 0xb9, 0x17, 0x8f, 0x0f, 0x38, 0x77, 0x6a, 0x2d,\n+\t0x39, 0xec, 0xc8, 0x88, 0x64, 0xbf, 0x7d, 0xf8, 0x57, 0xbe, 0x72, 0xe2,\n+\t0xeb, 0x0f, 0xdc, 0x57, 0xb9, 0x0f, 0x8f, 0x0f, 0x3a, 0x77, 0x6b, 0x2d,\n \t0xff, 0xc7, 0x9f, 0x2b, 0xe2, 0xe5, 0x7a, 0xf0, 0x2f, 0x25, 0x55, 0x4d,\n-\t0x0e, 0xd7, 0x22, 0x29, 0xb9, 0xd5, 0xd9, 0x7b, 0x56, 0x23, 0x91, 0xa4,\n-\t0x37, 0x17, 0xd4, 0xe5, 0x9f, 0xa6, 0xe5, 0x6b, 0xe1, 0xfc, 0x27, 0xab,\n-\t0x1f, 0x7c, 0xfa, 0xf2, 0x67, 0xc2, 0xbd, 0x0b, 0xae, 0x94, 0xbc, 0xea,\n-\t0x86, 0xf6, 0xa6, 0xa5, 0x34, 0x01, 0x9e, 0xef, 0xcf, 0x7c, 0xab, 0x20,\n-\t0x07, 0x73, 0x59, 0x2d, 0xa3, 0xa2, 0x6b, 0xe6, 0xf2, 0x4c, 0xe4, 0xb5,\n-\t0xb1, 0xc1, 0xeb, 0xfd, 0x40, 0x6a, 0xfd, 0xb2, 0xbc, 0xd9, 0xf7, 0xe5,\n-\t0x8d, 0xbe, 0x96, 0x13, 0xaf, 0x9c, 0x92, 0xf5, 0x38, 0x2c, 0x37, 0xdc,\n-\t0x92, 0xa8, 0x6a, 0x58, 0x6e, 0x4a, 0x20, 0xdb, 0x71, 0xd8, 0x5a, 0x71,\n-\t0xc7, 0x9d, 0x52, 0xb5, 0x24, 0x2f, 0xcc, 0x28, 0xb9, 0xe0, 0x1f, 0x97,\n-\t0x67, 0xa2, 0x27, 0xf1, 0xd7, 0xa2, 0x36, 0xb5, 0x53, 0x3f, 0xaf, 0x45,\n-\t0x6f, 0x8e, 0xc9, 0x23, 0xb1, 0x31, 0xab, 0x71, 0x02, 0xfe, 0xc9, 0xd9,\n-\t0x67, 0x65, 0x58, 0x5a, 0x5e, 0xb8, 0x24, 0x52, 0x20, 0x8d, 0xd4, 0xe2,\n-\t0x82, 0x24, 0x5e, 0x7a, 0xae, 0x0b, 0x76, 0xfc, 0xc0, 0x6c, 0x83, 0x7f,\n-\t0x38, 0xca, 0xd7, 0x6f, 0xcb, 0xd6, 0xbd, 0x6c, 0x5d, 0x89, 0x3a, 0x17,\n-\t0x06, 0x3b, 0x32, 0x95, 0x68, 0xe7, 0xba, 0xa9, 0x45, 0x77, 0x78, 0xb5,\n-\t0x1d, 0x2d, 0xee, 0x26, 0xf5, 0x8f, 0xbc, 0xba, 0x18, 0xf0, 0xb8, 0xe4,\n-\t0xd1, 0xaa, 0xfa, 0x55, 0xf8, 0x6d, 0x2a, 0x51, 0x8e, 0xc8, 0x95, 0x4e,\n-\t0xd9, 0xab, 0xf5, 0xbf, 0xee, 0xd4, 0xba, 0xd7, 0x4d, 0xa2, 0x47, 0x44,\n-\t0x45, 0x89, 0x53, 0xdb, 0xa1, 0xac, 0x61, 0xd1, 0xd1, 0x10, 0x78, 0x26,\n-\t0x3d, 0x25, 0x1c, 0x6b, 0xd9, 0x3c, 0x65, 0x37, 0xf0, 0xbc, 0xe8, 0x24,\n-\t0x3b, 0xda, 0xa9, 0x9d, 0x5f, 0xc2, 0x73, 0x09, 0xfc, 0xb0, 0x4b, 0xec,\n-\t0x48, 0xb2, 0xec, 0x80, 0x8f, 0xe7, 0xf4, 0xf0, 0xae, 0x24, 0xf1, 0x3d,\n-\t0x59, 0xab, 0x84, 0xe5, 0x96, 0x3c, 0xea, 0xd4, 0x77, 0x3e, 0xe4, 0x34,\n-\t0x6f, 0xa9, 0xff, 0xe1, 0x39, 0xea, 0xf2, 0xb0, 0x36, 0x46, 0xdd, 0x37,\n-\t0x94, 0x9d, 0x91, 0xf2, 0x92, 0x54, 0x7f, 0x9f, 0xef, 0xd0, 0xb9, 0x0b,\n-\t0xdd, 0x7b, 0x45, 0xe8, 0x63, 0x0c, 0xf7, 0xa9, 0x45, 0x75, 0xe8, 0x99,\n-\t0xe0, 0x1f, 0x6e, 0x34, 0x11, 0x0a, 0x47, 0xce, 0x1d, 0x90, 0x60, 0xdc,\n-\t0x98, 0x46, 0x1c, 0x7a, 0x3b, 0x32, 0x21, 0x6b, 0xdd, 0x09, 0xef, 0x68,\n-\t0xb7, 0x8d, 0xf5, 0x16, 0x69, 0x60, 0x0f, 0x91, 0xa3, 0x3d, 0x63, 0x2e,\n-\t0xc5, 0x87, 0x8a, 0x72, 0x50, 0xcd, 0x17, 0x24, 0x0c, 0x12, 0xcc, 0x1d,\n-\t0xb9, 0xb4, 0xdf, 0x66, 0x77, 0x67, 0x3a, 0xd0, 0xee, 0xd8, 0x27, 0xbe,\n-\t0x2b, 0x7b, 0x1f, 0xf5, 0x6a, 0xe7, 0x73, 0x3b, 0x5b, 0xbd, 0x61, 0xd7,\n-\t0x58, 0x6a, 0x15, 0xe8, 0xff, 0x91, 0x67, 0xca, 0xf9, 0xa8, 0x0b, 0xf5,\n-\t0x06, 0x7d, 0x74, 0x53, 0xa7, 0xa7, 0x3e, 0xa4, 0x13, 0xf5, 0x51, 0xa2,\n-\t0xcf, 0x95, 0x64, 0x3d, 0x7a, 0x5c, 0xc9, 0x41, 0x63, 0xd6, 0x63, 0xed,\n-\t0x34, 0xce, 0x1f, 0xcf, 0x9e, 0x11, 0x87, 0x5d, 0xc4, 0x61, 0x17, 0x71,\n-\t0xd9, 0x15, 0x4f, 0x55, 0x03, 0xb9, 0x3c, 0x53, 0x92, 0x6b, 0x2e, 0xfc,\n-\t0xd9, 0x9f, 0xf3, 0x5e, 0x45, 0x4c, 0x25, 0x9e, 0x23, 0x6e, 0x94, 0xcc,\n-\t0x16, 0x84, 0xef, 0x88, 0x25, 0x9d, 0x94, 0x5d, 0xc4, 0x52, 0x72, 0x8c,\n-\t0x73, 0x43, 0xb2, 0x62, 0xcf, 0x32, 0xe7, 0x9d, 0x16, 0xfa, 0xaa, 0x86,\n-\t0xb5, 0xc9, 0xe0, 0xb4, 0xec, 0x21, 0x3e, 0x6a, 0x58, 0xa7, 0xac, 0xd0,\n-\t0x6b, 0x81, 0xa2, 0xdd, 0x7d, 0x17, 0x39, 0xe0, 0x23, 0xee, 0x67, 0xca,\n-\t0x4a, 0x1c, 0x59, 0x9d, 0x87, 0x2d, 0xe6, 0xa7, 0x60, 0x23, 0xe6, 0x04,\n-\t0xe3, 0xea, 0xaf, 0xd3, 0x3a, 0x3a, 0x85, 0xf8, 0x01, 0x2d, 0xce, 0x7f,\n-\t0xba, 0x3b, 0x03, 0xfe, 0xa8, 0x48, 0x3d, 0xb7, 0x63, 0x2d, 0xeb, 0xdd,\n-\t0xcb, 0xaa, 0x10, 0xfd, 0xde, 0x91, 0x83, 0x61, 0x2b, 0x91, 0xb0, 0xa5,\n-\t0x94, 0xf2, 0xb9, 0xf5, 0x4b, 0xc8, 0xa3, 0x37, 0xad, 0xfe, 0x1a, 0x7c,\n-\t0xe5, 0x4c, 0x7f, 0xda, 0x5d, 0x64, 0xab, 0x13, 0xc6, 0x8b, 0xd0, 0xed,\n-\t0x0a, 0xfc, 0x4f, 0x9b, 0x5f, 0xea, 0x41, 0x76, 0xc7, 0x61, 0xee, 0x4a,\n-\t0xbb, 0x47, 0x3a, 0x9b, 0xe6, 0x2b, 0xba, 0x2a, 0xcb, 0xed, 0xce, 0x29,\n-\t0xe3, 0x46, 0xb2, 0x52, 0xa8, 0xd2, 0x6f, 0xa3, 0x0b, 0xf0, 0xc3, 0x72,\n-\t0xbb, 0x37, 0xf1, 0xd8, 0x56, 0x47, 0x5a, 0x9f, 0xa8, 0x4a, 0xcb, 0xad,\n-\t0xa8, 0x3b, 0x94, 0x8c, 0x41, 0x6e, 0x15, 0xfb, 0x30, 0xae, 0xc2, 0xa0,\n-\t0xee, 0x4e, 0x3c, 0x76, 0xb1, 0x73, 0x37, 0xf2, 0x56, 0x3e, 0xa8, 0x55,\n-\t0x22, 0xe4, 0xee, 0x95, 0xc3, 0xae, 0x44, 0xb2, 0xd6, 0x2f, 0x49, 0xad,\n-\t0x3b, 0x21, 0xeb, 0x7d, 0x49, 0x9e, 0x9a, 0xc1, 0x7e, 0x15, 0xbc, 0xf7,\n-\t0xe7, 0xa5, 0xd5, 0x9f, 0x58, 0x51, 0xd5, 0x96, 0x24, 0xfd, 0x75, 0xfc,\n-\t0x4b, 0xd2, 0xe8, 0x94, 0x4a, 0x17, 0x3b, 0x2d, 0xf2, 0x97, 0x9c, 0x6a,\n-\t0xa0, 0x8f, 0xf4, 0xf6, 0x18, 0x37, 0x90, 0x33, 0xfc, 0x45, 0x55, 0xd5,\n-\t0xd2, 0xf4, 0x7d, 0xc8, 0x70, 0x60, 0x13, 0xea, 0x3a, 0x8b, 0x7d, 0xd3,\n-\t0xb1, 0xd5, 0xa7, 0xef, 0x86, 0xa4, 0x1d, 0xcf, 0xc3, 0x4e, 0x8c, 0xda,\n-\t0x21, 0x59, 0x8b, 0xde, 0x33, 0x4f, 0x23, 0x56, 0x5f, 0x15, 0x73, 0x77,\n-\t0x0d, 0x78, 0x52, 0x83, 0x49, 0x5f, 0x88, 0xca, 0x72, 0x1a, 0xfb, 0xa6,\n-\t0x7c, 0xeb, 0xd0, 0x81, 0x7c, 0x63, 0xe0, 0x6b, 0x80, 0xcf, 0x97, 0x33,\n-\t0x96, 0x77, 0x0c, 0xbc, 0x7b, 0x19, 0xef, 0x5c, 0x79, 0x51, 0x62, 0xf0,\n-\t0x4c, 0x06, 0x8b, 0xf0, 0xe7, 0x8a, 0xdf, 0x00, 0x6f, 0x03, 0x3a, 0x60,\n-\t0xec, 0x4a, 0x4b, 0x57, 0x28, 0x37, 0x2c, 0x3f, 0xcd, 0x7c, 0xb0, 0x32,\n-\t0x5b, 0x90, 0x09, 0xbd, 0xba, 0x25, 0xc8, 0x59, 0xc0, 0xf8, 0x8e, 0x69,\n-\t0x77, 0x81, 0x3b, 0x3e, 0x9f, 0xdf, 0x34, 0xaa, 0x8a, 0x18, 0xad, 0x44,\n-\t0x41, 0x5b, 0xf8, 0x5e, 0x94, 0x3a, 0xf2, 0x4c, 0x45, 0x63, 0xd2, 0xf4,\n-\t0x1c, 0x47, 0x55, 0x5d, 0x69, 0x22, 0x42, 0x93, 0x65, 0x6d, 0xe7, 0x56,\n-\t0x10, 0x67, 0xaa, 0xfa, 0x5d, 0x95, 0xd6, 0x83, 0x02, 0x68, 0x90, 0x9b,\n-\t0xd1, 0x28, 0x6c, 0x30, 0x0e, 0xda, 0xb3, 0x98, 0x9f, 0x02, 0x7e, 0x8e,\n-\t0x83, 0x86, 0x23, 0x73, 0x84, 0x76, 0x21, 0x7d, 0x05, 0x3a, 0xe6, 0x73,\n-\t0x15, 0xd8, 0x66, 0x30, 0x6d, 0x72, 0x1f, 0x83, 0xa6, 0xab, 0xb3, 0xbc,\n-\t0x1b, 0xcc, 0xa5, 0x7c, 0x3d, 0xc0, 0xfa, 0x95, 0x4f, 0x29, 0xd9, 0x33,\n-\t0x17, 0x23, 0xc6, 0xb0, 0xbc, 0xd7, 0x88, 0x92, 0x71, 0xd7, 0xe6, 0x79,\n-\t0x9e, 0xef, 0x1c, 0x59, 0x0b, 0x36, 0x0e, 0xaf, 0x46, 0x8e, 0xbb, 0x3e,\n-\t0x7f, 0x48, 0x5a, 0x7e, 0x18, 0xd7, 0xe1, 0xef, 0xf5, 0x2e, 0x73, 0x63,\n-\t0x0c, 0xe7, 0x0e, 0x11, 0x75, 0x93, 0x78, 0x4e, 0x0e, 0x83, 0x07, 0x7e,\n-\t0x6c, 0x41, 0x16, 0x47, 0xc4, 0x4c, 0x37, 0x84, 0x8e, 0xb0, 0x47, 0x34,\n-\t0xe7, 0x1d, 0x65, 0x3c, 0xfa, 0x5c, 0x63, 0x8d, 0xd9, 0x40, 0x8d, 0x09,\n-\t0xe3, 0x66, 0x96, 0x2b, 0x6f, 0xc1, 0xb6, 0xed, 0x2e, 0xeb, 0x45, 0x5e,\n-\t0x23, 0x98, 0x1f, 0x8c, 0x95, 0x1c, 0x63, 0xc1, 0x13, 0x31, 0x3f, 0x4b,\n-\t0x19, 0xd6, 0xd6, 0x32, 0x1c, 0x5d, 0x80, 0x1e, 0xc6, 0x3c, 0x01, 0x0c,\n-\t0x6d, 0xc7, 0x36, 0x3e, 0x5b, 0x81, 0xba, 0x6e, 0x26, 0xa7, 0x69, 0x73,\n-\t0x63, 0x4e, 0xc6, 0x8b, 0xa0, 0xfd, 0x2d, 0xec, 0xb5, 0x04, 0x1c, 0x25,\n-\t0xf6, 0x72, 0xef, 0xaa, 0xae, 0x75, 0x0e, 0x40, 0x97, 0x00, 0xf8, 0x06,\n-\t0x1b, 0x58, 0xbc, 0x1d, 0x46, 0xbe, 0x33, 0xe7, 0xc3, 0x60, 0x45, 0x38,\n-\t0x2f, 0xc3, 0x0a, 0xef, 0x4d, 0xf8, 0x69, 0xbd, 0xf2, 0xa8, 0xd3, 0xd8,\n-\t0x79, 0x3f, 0xf3, 0x91, 0x8c, 0x29, 0xd4, 0x92, 0xa6, 0x4f, 0xbe, 0x22,\n-\t0xf8, 0x0e, 0x80, 0xe7, 0xef, 0x58, 0x2b, 0x60, 0x1c, 0x94, 0x63, 0x71,\n-\t0x1b, 0x7b, 0x05, 0xd8, 0x6b, 0x49, 0x74, 0xf5, 0x79, 0x60, 0xcf, 0x54,\n-\t0xd0, 0x90, 0xef, 0xa9, 0xb4, 0x46, 0xd2, 0x37, 0x9f, 0x1f, 0xf0, 0x4d,\n-\t0x20, 0xae, 0xcd, 0xc1, 0x87, 0xb2, 0x98, 0x22, 0x66, 0x3e, 0x98, 0xad,\n-\t0xfb, 0xc0, 0xbe, 0x07, 0x32, 0x0c, 0x2f, 0x11, 0x07, 0x65, 0xc3, 0xe2,\n-\t0x60, 0x91, 0x38, 0x08, 0x5c, 0x69, 0x2d, 0xc0, 0xde, 0xf1, 0xbb, 0xc0,\n-\t0x97, 0x3a, 0x3c, 0xf1, 0x93, 0x8e, 0x46, 0x5c, 0xb9, 0xe0, 0x67, 0x1d,\n-\t0xfe, 0x9c, 0x2b, 0x23, 0xa1, 0xf7, 0x2e, 0xf0, 0x26, 0x39, 0xc6, 0x3c,\n-\t0x30, 0x06, 0xb9, 0x0e, 0xac, 0x9a, 0x2e, 0x9f, 0x46, 0xdc, 0xbb, 0xc0,\n-\t0x09, 0x2d, 0xdc, 0x37, 0xaf, 0x9b, 0x79, 0xfd, 0xe6, 0xef, 0x6d, 0x07,\n-\t0x6e, 0x46, 0xad, 0xfb, 0x2c, 0x64, 0x4c, 0x05, 0x47, 0xe1, 0xc7, 0xb5,\n-\t0x85, 0xff, 0xc6, 0xf3, 0x9b, 0x8c, 0x07, 0x35, 0xa4, 0xc2, 0x7d, 0x45,\n-\t0x1a, 0x3d, 0xda, 0x21, 0x86, 0x1d, 0x2c, 0x06, 0x21, 0xe7, 0x63, 0xe4,\n-\t0xbc, 0x48, 0x93, 0x58, 0x01, 0x0c, 0x23, 0xee, 0xad, 0x81, 0x5e, 0x55,\n-\t0x86, 0x60, 0x57, 0xc4, 0x92, 0x92, 0x92, 0xae, 0x1e, 0xd3, 0xeb, 0xa0,\n-\t0x2d, 0x54, 0x97, 0xf5, 0x76, 0x74, 0xdc, 0xcd, 0xfb, 0xa5, 0x76, 0x47,\n-\t0x9c, 0x5a, 0xea, 0xe7, 0x8c, 0xee, 0xb1, 0x8c, 0x6e, 0x69, 0x90, 0x0e,\n-\t0xf3, 0x8d, 0x6c, 0x3e, 0xc1, 0xfc, 0x9d, 0x99, 0xcd, 0x59, 0x0b, 0x4a,\n-\t0xa8, 0xb3, 0xac, 0x03, 0x61, 0x10, 0xa8, 0xff, 0x54, 0x07, 0x16, 0x06,\n-\t0xb0, 0x5b, 0x94, 0xed, 0x2b, 0x7c, 0xc6, 0xe4, 0xe0, 0x59, 0x87, 0x95,\n-\t0x44, 0x37, 0xe2, 0x13, 0xbf, 0xad, 0x6c, 0x1f, 0xd2, 0x12, 0xaf, 0x07,\n-\t0x69, 0x91, 0x46, 0xb0, 0x8b, 0x3a, 0x7b, 0x2b, 0x9b, 0x1d, 0xc2, 0x1a,\n-\t0x72, 0xbe, 0xeb, 0xca, 0xc3, 0x9a, 0xf9, 0x7d, 0x8f, 0xb6, 0xe7, 0xd8,\n-\t0x05, 0xfd, 0xee, 0x84, 0xc5, 0x99, 0xa5, 0xce, 0x10, 0xc4, 0x8f, 0xca,\n-\t0x09, 0xe4, 0xf3, 0xd3, 0xf0, 0xfd, 0xc5, 0x58, 0xa1, 0x5b, 0x60, 0xcd,\n-\t0x31, 0x88, 0xc3, 0xd0, 0xfa, 0xa2, 0x16, 0xad, 0x21, 0x92, 0xbf, 0x29,\n-\t0x57, 0xe6, 0x47, 0xa4, 0x70, 0x89, 0x3a, 0xa0, 0x5f, 0xda, 0x1a, 0xdc,\n-\t0x67, 0x0e, 0xfb, 0x4c, 0x00, 0x03, 0xef, 0x43, 0x7d, 0xf1, 0x45, 0x4f,\n-\t0x03, 0x6b, 0xbb, 0x25, 0xa7, 0x0e, 0xf9, 0xea, 0x12, 0xcf, 0x4f, 0x0c,\n-\t0x2e, 0x65, 0xb5, 0x8d, 0xb9, 0x35, 0x84, 0x9a, 0xfe, 0x47, 0xe4, 0xae,\n-\t0x92, 0xd5, 0x8a, 0x31, 0x47, 0xe3, 0x1f, 0xc0, 0xbe, 0x98, 0xdb, 0xe2,\n-\t0xda, 0x1e, 0xe6, 0x39, 0x47, 0x19, 0x8c, 0xc5, 0x43, 0xa8, 0x6b, 0xd8,\n-\t0xf3, 0x18, 0x79, 0x86, 0x50, 0xf3, 0x89, 0xff, 0x18, 0xb7, 0xf8, 0xce,\n-\t0x33, 0x11, 0xdb, 0x5c, 0x8c, 0x23, 0x18, 0x79, 0xa6, 0x5f, 0x64, 0xbe,\n-\t0xe2, 0xb3, 0x31, 0xba, 0x3a, 0x2a, 0xf5, 0x4e, 0x04, 0x8c, 0x9d, 0x2a,\n-\t0x9f, 0x10, 0xae, 0xe1, 0xbd, 0xc7, 0x79, 0x6f, 0x60, 0x1e, 0xcf, 0x3d,\n-\t0xab, 0x33, 0x6a, 0x7b, 0xde, 0xbf, 0xac, 0xc1, 0xb0, 0xe8, 0x31, 0xb6,\n-\t0xd8, 0xab, 0xb0, 0xfe, 0x59, 0xdc, 0x9a, 0x65, 0x9f, 0xf2, 0x5a, 0x87,\n-\t0xb5, 0x50, 0x33, 0x2f, 0x11, 0x00, 0x77, 0x49, 0xdd, 0xcf, 0xcf, 0x85,\n-\t0x38, 0x8e, 0x29, 0x9b, 0x32, 0x26, 0x61, 0x3b, 0xf6, 0x23, 0x51, 0x59,\n-\t0x3b, 0x53, 0x49, 0x93, 0x7c, 0xbd, 0x82, 0x14, 0x36, 0xe7, 0xc5, 0x3d,\n-\t0x6b, 0x64, 0x2b, 0x95, 0xe7, 0x2d, 0x8b, 0x2f, 0xb5, 0x97, 0xa8, 0x07,\n-\t0xe6, 0x77, 0x59, 0x0f, 0x43, 0xe0, 0x59, 0x31, 0xdb, 0xb7, 0x2c, 0xcd,\n-\t0x4e, 0xe4, 0x35, 0x04, 0x63, 0xef, 0x36, 0xf8, 0xae, 0x88, 0x33, 0x6b,\n-\t0xb9, 0xd8, 0x49, 0xf7, 0x62, 0xce, 0x3d, 0x17, 0xa7, 0x7b, 0x35, 0xe4,\n-\t0x97, 0xd8, 0x4b, 0x7c, 0x25, 0xec, 0x23, 0xd1, 0x37, 0x9e, 0xd3, 0xd8,\n-\t0x8f, 0x36, 0x2a, 0xa0, 0xb7, 0x9d, 0xcd, 0xce, 0x13, 0x82, 0x4e, 0xc3,\n-\t0xe6, 0xb4, 0x35, 0xf7, 0x60, 0x2c, 0xfe, 0xc3, 0x10, 0x5f, 0x50, 0x57,\n-\t0xa0, 0x2f, 0xde, 0xfb, 0xdc, 0x63, 0x42, 0x5e, 0xec, 0x5a, 0xac, 0xf5,\n-\t0x4e, 0x02, 0xb3, 0x1a, 0x9d, 0xbf, 0xe5, 0xb5, 0x27, 0x69, 0x03, 0x7f,\n-\t0x9f, 0x95, 0x51, 0xd1, 0xbb, 0xa3, 0xf2, 0x1c, 0xfa, 0xbd, 0xc2, 0x26,\n-\t0xea, 0x3c, 0x6c, 0xac, 0xce, 0xb6, 0x66, 0xd9, 0xb3, 0xbd, 0x8e, 0x5c,\n-\t0x5e, 0xad, 0x44, 0xb1, 0xeb, 0x4c, 0xcb, 0xc6, 0x77, 0xc2, 0xd9, 0x1d,\n-\t0x9b, 0xcf, 0x58, 0xdf, 0x0d, 0xe4, 0x4c, 0x2f, 0x92, 0x8d, 0x9e, 0x07,\n-\t0xbd, 0xbc, 0x9b, 0x7d, 0x6d, 0x44, 0xbc, 0x6d, 0xe0, 0x4f, 0x3c, 0xe5,\n-\t0xb9, 0xe0, 0x83, 0x2a, 0xed, 0xc6, 0x3e, 0x96, 0xfe, 0x25, 0xbe, 0x3d,\n-\t0x8a, 0xe7, 0x11, 0x71, 0xcf, 0xb1, 0xef, 0x64, 0x4c, 0xd2, 0x3f, 0x83,\n-\t0xbd, 0x30, 0xb1, 0x0f, 0x32, 0x77, 0x99, 0xfb, 0x79, 0x6e, 0xe6, 0xb9,\n-\t0x4a, 0x1c, 0xd0, 0xce, 0x22, 0xec, 0x75, 0x35, 0x66, 0xbe, 0x5e, 0x37,\n-\t0x57, 0x6d, 0xef, 0xe6, 0xb1, 0x2f, 0x1e, 0xe8, 0xdd, 0xf2, 0xbe, 0x87,\n-\t0xf1, 0x5a, 0x1e, 0xc8, 0xd7, 0x6b, 0x36, 0x57, 0xdf, 0x40, 0xde, 0xbe,\n-\t0xdc, 0x2d, 0xdb, 0x9c, 0x3d, 0x72, 0xff, 0xad, 0x72, 0xf6, 0xf5, 0x8f,\n-\t0x91, 0xb3, 0x3f, 0xcc, 0x72, 0xb6, 0x68, 0xe3, 0x5a, 0x6d, 0x0e, 0xae,\n-\t0xfd, 0x08, 0x6b, 0x43, 0xd9, 0x9d, 0x42, 0xdb, 0x0e, 0xfa, 0xc8, 0x83,\n-\t0xf4, 0x51, 0xee, 0x9f, 0x34, 0x4e, 0xeb, 0x9a, 0x34, 0xf0, 0xe1, 0xe6,\n-\t0x28, 0xe2, 0x89, 0x39, 0x9d, 0xc7, 0x53, 0x80, 0x58, 0xce, 0xf9, 0xd1,\n-\t0x6f, 0x1e, 0x63, 0x2c, 0x14, 0x6c, 0xde, 0xb8, 0xd5, 0x9c, 0xa6, 0x2c,\n-\t0x8b, 0xe8, 0xe5, 0x7e, 0xcc, 0xb1, 0x97, 0xc6, 0x4a, 0x71, 0xb3, 0x24,\n-\t0xcf, 0xcf, 0x10, 0xbb, 0xc2, 0xf8, 0x0a, 0x74, 0xbe, 0x1a, 0xf9, 0x52,\n-\t0x98, 0x66, 0x3e, 0xb3, 0x1a, 0x15, 0x11, 0x43, 0xb8, 0x5b, 0x75, 0xcd,\n-\t0x29, 0xf4, 0x5b, 0x81, 0x86, 0x9f, 0x5f, 0x46, 0x1c, 0x11, 0x5b, 0x11,\n-\t0x13, 0xb3, 0x5b, 0x88, 0x89, 0x13, 0x7c, 0xb7, 0xfb, 0x16, 0x2c, 0xad,\n-\t0x6b, 0xf7, 0xf7, 0xa1, 0x7f, 0x49, 0x86, 0xce, 0x19, 0xdc, 0xa9, 0x6e,\n-\t0xf2, 0x9d, 0xb1, 0xf1, 0x0b, 0x2c, 0xc1, 0xfc, 0xaa, 0x8d, 0x5f, 0xfa,\n-\t0x94, 0x71, 0x6f, 0xcc, 0xef, 0x6c, 0xde, 0xfc, 0xda, 0x62, 0xc0, 0xd5,\n-\t0xd8, 0xc6, 0x73, 0xcc, 0x7e, 0xf3, 0x4c, 0xef, 0xe7, 0xda, 0x62, 0xc4,\n-\t0xa6, 0x91, 0xd3, 0xb1, 0x8d, 0xb5, 0xd9, 0x37, 0x70, 0xec, 0x57, 0xd3,\n-\t0x5c, 0x18, 0x90, 0x33, 0xe9, 0x3d, 0x02, 0x39, 0xa8, 0x79, 0xc1, 0x1a,\n-\t0xfb, 0x83, 0x78, 0x0a, 0xfd, 0x12, 0xe8, 0x7a, 0xfb, 0xf1, 0x62, 0x1c,\n-\t0x23, 0xed, 0xfd, 0x07, 0xc8, 0xf5, 0x60, 0x43, 0xca, 0xa1, 0xde, 0xd4,\n-\t0x6b, 0x54, 0xa2, 0xb3, 0xb9, 0x4e, 0x7f, 0xb1, 0xba, 0xfc, 0xbb, 0x3c,\n-\t0xac, 0xef, 0xde, 0x8a, 0xcf, 0x1b, 0xe0, 0xfb, 0xf3, 0x2d, 0xf8, 0xb0,\n-\t0xbe, 0x4b, 0x9e, 0x91, 0x1b, 0xbd, 0x46, 0xfd, 0x46, 0x5c, 0x27, 0x88,\n-\t0x7b, 0xf2, 0xee, 0xbf, 0xcb, 0x0d, 0xe6, 0x40, 0x5e, 0xe3, 0x19, 0xe7,\n-\t0xdc, 0x33, 0x8f, 0xf5, 0x3c, 0xc6, 0xf3, 0x98, 0xcf, 0x63, 0x3d, 0x8c,\n-\t0x9f, 0x91, 0xd4, 0xbf, 0x7a, 0x33, 0xc4, 0xfe, 0x23, 0xff, 0xc3, 0xbd,\n-\t0x85, 0x18, 0x21, 0xc9, 0xcd, 0xbb, 0xde, 0x4f, 0xb3, 0x7e, 0xa5, 0xc4,\n-\t0x5c, 0xc3, 0x9f, 0x7d, 0xfc, 0x1e, 0xfa, 0x83, 0x38, 0xb3, 0x6d, 0x92,\n-\t0x8d, 0x29, 0x4d, 0xda, 0x0f, 0x7e, 0x25, 0xc3, 0xe4, 0x2f, 0xa4, 0xf5,\n+\t0x0e, 0xd6, 0x22, 0x29, 0xb9, 0xd5, 0xea, 0xfc, 0x6a, 0x24, 0x92, 0x74,\n+\t0xe7, 0x82, 0xba, 0xfc, 0xd3, 0xb4, 0x7c, 0x2d, 0x9c, 0xff, 0x64, 0xf5,\n+\t0x83, 0x4f, 0x5f, 0xf9, 0x6c, 0xb8, 0x7b, 0xc1, 0x95, 0x92, 0x57, 0x3d,\n+\t0xa3, 0xbd, 0x69, 0x29, 0x4d, 0x80, 0xe7, 0xd5, 0x99, 0x6f, 0x17, 0x64,\n+\t0x7f, 0x2e, 0xab, 0x65, 0x54, 0x74, 0xdd, 0x5c, 0x99, 0x89, 0xbc, 0x36,\n+\t0x36, 0xb8, 0xdc, 0x0b, 0xa4, 0xd6, 0x2b, 0xcb, 0x9b, 0x3d, 0x5f, 0xde,\n+\t0xe8, 0x69, 0x39, 0xfe, 0xca, 0x49, 0x59, 0x8f, 0xc3, 0x72, 0xc3, 0x2d,\n+\t0x89, 0xaa, 0x86, 0xe5, 0xa6, 0x04, 0xb2, 0x15, 0x87, 0xad, 0x15, 0x77,\n+\t0xdc, 0x29, 0x55, 0x4b, 0xf2, 0xc2, 0x8c, 0x92, 0x0b, 0xfe, 0x31, 0x79,\n+\t0x26, 0x7a, 0x12, 0x7f, 0x2d, 0x6a, 0x43, 0x3b, 0xf5, 0xf3, 0x5a, 0xf4,\n+\t0xc6, 0x98, 0x3c, 0x12, 0x1b, 0xb3, 0x1a, 0x27, 0xe0, 0x9f, 0x9c, 0x7d,\n+\t0x56, 0x86, 0xa5, 0xe5, 0x85, 0x4b, 0x22, 0x05, 0xd2, 0x48, 0x2d, 0x2e,\n+\t0x48, 0xe2, 0xf5, 0xcf, 0x75, 0xc1, 0x8e, 0x1f, 0x98, 0x2d, 0xf0, 0x0f,\n+\t0x47, 0xf9, 0xfa, 0x1d, 0xd9, 0xba, 0x97, 0xad, 0x2b, 0x51, 0xe7, 0xc2,\n+\t0x60, 0x5b, 0xa6, 0x12, 0xed, 0xdc, 0x30, 0xb5, 0xe8, 0x2e, 0xaf, 0xb6,\n+\t0xad, 0xc5, 0xdd, 0xa0, 0xfe, 0x91, 0x57, 0x17, 0x03, 0x1e, 0x97, 0x3c,\n+\t0x5a, 0x55, 0xbf, 0x06, 0xbf, 0x4d, 0x25, 0xca, 0x11, 0xb9, 0xda, 0x29,\n+\t0x7b, 0xb5, 0xde, 0x37, 0x9c, 0x5a, 0x7a, 0xc3, 0x24, 0x7a, 0x44, 0x54,\n+\t0x94, 0x38, 0xb5, 0x6d, 0xca, 0x1a, 0x16, 0x1d, 0x0d, 0x81, 0x67, 0xd2,\n+\t0x53, 0xc2, 0xb1, 0x96, 0xcd, 0x53, 0x76, 0x03, 0xcf, 0x8b, 0x4e, 0xb2,\n+\t0xad, 0x9d, 0xda, 0xf9, 0x25, 0x3c, 0x97, 0xc0, 0x0f, 0xbb, 0xc4, 0x8e,\n+\t0x24, 0xcb, 0x0e, 0xf8, 0x78, 0x4e, 0x0f, 0xef, 0x4a, 0x12, 0xdf, 0x93,\n+\t0xb5, 0x4a, 0x58, 0x6e, 0xc9, 0xa3, 0x4e, 0x7d, 0xfb, 0x43, 0x4e, 0xf3,\n+\t0x96, 0x7a, 0x1f, 0x9e, 0xa3, 0x2e, 0x0f, 0x6b, 0x63, 0xd4, 0xfd, 0x43,\n+\t0xd9, 0x19, 0x29, 0x2f, 0xe9, 0xeb, 0xef, 0xf3, 0x1d, 0x3a, 0xa7, 0xd0,\n+\t0xbd, 0x5b, 0x84, 0x3e, 0xc6, 0x70, 0x9f, 0x5a, 0x54, 0x87, 0x9e, 0x09,\n+\t0xfe, 0xe1, 0x99, 0x26, 0x42, 0xe1, 0xf0, 0xb9, 0x7d, 0x12, 0x8c, 0x1b,\n+\t0xd3, 0x88, 0x43, 0x6f, 0x5b, 0x26, 0x64, 0x2d, 0x9d, 0xf0, 0x8e, 0xa4,\n+\t0x6d, 0xac, 0xb7, 0x48, 0x03, 0x7b, 0x88, 0x1c, 0xe9, 0x1a, 0x73, 0x29,\n+\t0x3e, 0x50, 0x94, 0xfd, 0x6a, 0xbe, 0x20, 0x61, 0x90, 0x60, 0xee, 0xf0,\n+\t0xa5, 0xbd, 0x36, 0xbb, 0x27, 0xd3, 0x81, 0x76, 0xc7, 0x3e, 0xf1, 0xa1,\n+\t0xec, 0x7d, 0xd4, 0xab, 0x9d, 0xcf, 0xed, 0x6c, 0xf5, 0x86, 0x5d, 0x63,\n+\t0xa9, 0x55, 0xa0, 0xff, 0x47, 0x9e, 0x29, 0xe7, 0xa3, 0x2e, 0xd4, 0x1b,\n+\t0xf4, 0xd1, 0x2d, 0x9d, 0x9e, 0xfa, 0x90, 0x4e, 0xd4, 0x47, 0x89, 0x3e,\n+\t0x57, 0x92, 0xf5, 0xe8, 0x71, 0x25, 0xfb, 0x8d, 0x59, 0x8f, 0xb5, 0xd3,\n+\t0x38, 0x7f, 0x2c, 0x7b, 0x46, 0x1c, 0xa6, 0x88, 0xc3, 0x14, 0x71, 0x99,\n+\t0x8a, 0xa7, 0xaa, 0x81, 0x5c, 0x99, 0x29, 0xc9, 0x75, 0x17, 0xfe, 0xec,\n+\t0xcd, 0x79, 0xaf, 0x21, 0xa6, 0x12, 0xcf, 0x11, 0x37, 0x4a, 0x66, 0x0b,\n+\t0xc2, 0x77, 0xc4, 0x92, 0x4e, 0xca, 0x2e, 0x62, 0x29, 0x39, 0xca, 0xb9,\n+\t0x21, 0x59, 0xb1, 0x67, 0x99, 0xf3, 0x4e, 0x09, 0x7d, 0x55, 0xc3, 0xda,\n+\t0x64, 0x70, 0x4a, 0x76, 0x11, 0x1f, 0x35, 0xac, 0x53, 0x56, 0xe8, 0xb5,\n+\t0x40, 0xd1, 0x4e, 0xdf, 0x45, 0x0e, 0xf8, 0x88, 0xfb, 0x99, 0xb2, 0x12,\n+\t0x47, 0x56, 0xe7, 0x61, 0x8b, 0xf9, 0x29, 0xd8, 0x88, 0x39, 0xc1, 0xb8,\n+\t0xfa, 0xeb, 0xb4, 0x8e, 0x4e, 0x22, 0x7e, 0x40, 0x8b, 0xf3, 0x9f, 0x4a,\n+\t0x67, 0xc0, 0x1f, 0x15, 0xa9, 0xe7, 0x56, 0xac, 0x65, 0x3d, 0xbd, 0xa2,\n+\t0x0a, 0xd1, 0xef, 0x1d, 0xd9, 0x1f, 0xb6, 0x12, 0x09, 0x5b, 0x4a, 0x29,\n+\t0x9f, 0x5b, 0xbf, 0x84, 0x3c, 0x7a, 0xd3, 0xea, 0xaf, 0xc1, 0x57, 0xce,\n+\t0xf4, 0xa7, 0xdd, 0x45, 0x36, 0x3b, 0x61, 0xbc, 0x08, 0xdd, 0xae, 0xc2,\n+\t0xff, 0xb4, 0xf9, 0xa5, 0x2e, 0x64, 0x77, 0x1c, 0xe6, 0xae, 0xb4, 0xbb,\n+\t0xa4, 0xb3, 0x69, 0xbe, 0xa2, 0xab, 0xb2, 0xdc, 0xee, 0x9c, 0x34, 0x6e,\n+\t0x24, 0x2b, 0x85, 0x2a, 0xfd, 0x36, 0xba, 0x00, 0x3f, 0x2c, 0xb7, 0xbb,\n+\t0x13, 0x8f, 0x6d, 0x76, 0xa4, 0x75, 0x77, 0x55, 0x5a, 0x6e, 0x45, 0xdd,\n+\t0xa5, 0x64, 0x0c, 0x72, 0xab, 0xd8, 0x87, 0x71, 0x15, 0x06, 0x75, 0x77,\n+\t0xe2, 0xb1, 0x8b, 0x9d, 0x7b, 0x90, 0xb7, 0xf2, 0x41, 0xad, 0x12, 0x21,\n+\t0x77, 0xaf, 0x1e, 0x74, 0x25, 0x92, 0xb5, 0x5e, 0x49, 0x6a, 0xe9, 0x84,\n+\t0xac, 0xf7, 0x24, 0x79, 0x6a, 0x06, 0xfb, 0x55, 0xf0, 0xde, 0x9b, 0x97,\n+\t0x56, 0x6f, 0x62, 0x45, 0x55, 0x5b, 0x92, 0xf4, 0xd6, 0xf1, 0x2f, 0x49,\n+\t0xa3, 0x53, 0x2a, 0x5d, 0xec, 0xb4, 0xc8, 0x5f, 0x72, 0xaa, 0x81, 0x3e,\n+\t0xdc, 0xdd, 0x65, 0xdc, 0x40, 0xce, 0xf0, 0x97, 0x54, 0x55, 0x4b, 0xd3,\n+\t0xf7, 0x21, 0xc3, 0x81, 0x4d, 0xa8, 0xeb, 0x2c, 0xf6, 0xed, 0x8f, 0xad,\n+\t0x1e, 0x7d, 0x37, 0x24, 0xed, 0x78, 0x1e, 0x76, 0x62, 0xd4, 0x0e, 0xc9,\n+\t0x5a, 0xf4, 0x9e, 0x79, 0x1a, 0xb1, 0xfa, 0x9a, 0x98, 0x7b, 0x6a, 0xc0,\n+\t0x93, 0x1a, 0x4c, 0xfa, 0x42, 0x54, 0x96, 0x53, 0xd8, 0xb7, 0xcf, 0xb7,\n+\t0x0e, 0x1d, 0xc8, 0x37, 0x06, 0xbe, 0x06, 0xf8, 0x7c, 0x39, 0x6d, 0x79,\n+\t0xc7, 0xc0, 0xbb, 0x9b, 0xf1, 0xce, 0x95, 0x17, 0x25, 0x06, 0xcf, 0x64,\n+\t0xb0, 0x08, 0x7f, 0xae, 0xf8, 0x0d, 0xf0, 0x36, 0xa0, 0x03, 0xc6, 0x54,\n+\t0x5a, 0xba, 0x42, 0xb9, 0x61, 0xf9, 0x69, 0xe6, 0x83, 0x95, 0xd9, 0x82,\n+\t0x4c, 0xe8, 0x95, 0x96, 0x20, 0x67, 0x01, 0xe3, 0x3b, 0xa6, 0x9d, 0x02,\n+\t0x77, 0x7c, 0x3e, 0xbf, 0x69, 0x54, 0x15, 0x31, 0x5a, 0x89, 0x82, 0xb6,\n+\t0xf0, 0xbd, 0x28, 0x75, 0xe4, 0x99, 0x8a, 0xc6, 0xa4, 0xe9, 0x39, 0x8e,\n+\t0xaa, 0xba, 0xd2, 0x44, 0x84, 0x26, 0xcb, 0xda, 0xce, 0xad, 0x20, 0xce,\n+\t0x54, 0xf5, 0x7b, 0xaa, 0x5f, 0x0f, 0x0a, 0xa0, 0x41, 0x6e, 0x46, 0xa3,\n+\t0xb0, 0xc1, 0x38, 0x68, 0xcf, 0x62, 0x7e, 0x0a, 0xf8, 0x39, 0x0e, 0x1a,\n+\t0x8e, 0xcc, 0x11, 0xda, 0x85, 0xf4, 0x15, 0xe8, 0x98, 0xcf, 0x55, 0x60,\n+\t0x9b, 0xc1, 0xb4, 0xc9, 0x7d, 0x0c, 0x9a, 0x54, 0x67, 0x79, 0x37, 0x98,\n+\t0x4b, 0xf9, 0x7a, 0x80, 0xf5, 0xab, 0x9f, 0x52, 0xb2, 0x6b, 0x2e, 0x46,\n+\t0x8c, 0x61, 0x79, 0xaf, 0x11, 0x25, 0xe3, 0xae, 0xcd, 0xf3, 0x3c, 0xdf,\n+\t0x39, 0xb2, 0x16, 0x9c, 0x39, 0xb8, 0x1a, 0x39, 0xee, 0xfa, 0xfc, 0x01,\n+\t0x69, 0xf9, 0x61, 0x5c, 0x87, 0xbf, 0xd7, 0x53, 0xe6, 0xc6, 0x18, 0xce,\n+\t0x1d, 0x22, 0xea, 0x26, 0xf1, 0x9c, 0x1c, 0x04, 0x0f, 0xfc, 0xd8, 0x82,\n+\t0x2c, 0x8e, 0x88, 0x99, 0x34, 0x84, 0x8e, 0xb0, 0x47, 0x34, 0xe7, 0x1d,\n+\t0x61, 0x3c, 0xfa, 0x5c, 0x63, 0x8d, 0x79, 0xf5, 0x50, 0x2d, 0x0a, 0xe3,\n+\t0x66, 0x96, 0x2b, 0x6f, 0xc1, 0xb6, 0xed, 0x94, 0xf5, 0x22, 0xaf, 0x11,\n+\t0xcc, 0x0f, 0xc6, 0x4a, 0x8e, 0xb1, 0xe0, 0x89, 0x98, 0x9f, 0xa5, 0x0c,\n+\t0x6b, 0x6b, 0x19, 0x8e, 0x2e, 0x40, 0x0f, 0x63, 0x9e, 0x00, 0x86, 0xb6,\n+\t0x63, 0x1b, 0x9f, 0xad, 0x40, 0xdd, 0x30, 0x93, 0xd3, 0xb4, 0xb9, 0x31,\n+\t0x27, 0xe2, 0x45, 0xd0, 0xfe, 0x16, 0xf6, 0x5a, 0x02, 0x8e, 0x12, 0x7b,\n+\t0xb9, 0x77, 0x55, 0xd7, 0x3a, 0xfb, 0xa0, 0x4b, 0x00, 0x7c, 0x83, 0x0d,\n+\t0x2c, 0xde, 0x0e, 0x23, 0xdf, 0x99, 0xf3, 0x61, 0xb0, 0x22, 0x9c, 0x97,\n+\t0x61, 0x85, 0xf7, 0x26, 0xfc, 0xb4, 0x5e, 0x79, 0xd4, 0x69, 0x6c, 0xbf,\n+\t0x9f, 0xf9, 0x48, 0xc6, 0x14, 0x6a, 0x49, 0xd3, 0x27, 0x5f, 0x11, 0x7c,\n+\t0xfb, 0xc0, 0xf3, 0x77, 0xac, 0x15, 0x30, 0x0e, 0xca, 0xb1, 0xb8, 0x8d,\n+\t0xbd, 0x02, 0xec, 0xb5, 0x24, 0xba, 0xfa, 0x3c, 0xb0, 0x67, 0x2a, 0x68,\n+\t0xc8, 0xf7, 0x55, 0xbf, 0x46, 0xd2, 0x37, 0x5f, 0x18, 0xf0, 0x4d, 0x20,\n+\t0xae, 0xcd, 0xc1, 0x87, 0xb2, 0x98, 0x22, 0x66, 0x3e, 0x98, 0xad, 0xfb,\n+\t0xc0, 0xbe, 0xcf, 0x64, 0x18, 0x5e, 0x22, 0x0e, 0xca, 0x19, 0x8b, 0x83,\n+\t0x45, 0xe2, 0x20, 0x70, 0xa5, 0xb5, 0x00, 0x7b, 0xc7, 0xef, 0x02, 0x5f,\n+\t0xea, 0xf0, 0xc4, 0x4f, 0x3a, 0x1a, 0x71, 0xe5, 0x82, 0x9f, 0x75, 0xf8,\n+\t0xf3, 0xae, 0x8c, 0x84, 0xde, 0xbb, 0xc0, 0x9b, 0xe4, 0x28, 0xf3, 0xc0,\n+\t0x18, 0xe4, 0x3a, 0xb0, 0x6a, 0xba, 0x7c, 0x0a, 0x71, 0xef, 0x02, 0x27,\n+\t0xb4, 0x70, 0xdf, 0xbc, 0x6e, 0xe6, 0xf5, 0x9b, 0xbf, 0xb7, 0x1d, 0xb8,\n+\t0x19, 0xb5, 0xee, 0x73, 0x90, 0x31, 0x15, 0x1c, 0x81, 0x1f, 0xd7, 0x16,\n+\t0xfe, 0x1b, 0xcf, 0x6f, 0x32, 0x1e, 0xd4, 0x90, 0x0a, 0xf7, 0x15, 0x69,\n+\t0x74, 0x69, 0x87, 0x18, 0x76, 0xb0, 0x18, 0x84, 0x9c, 0x8f, 0x91, 0xf3,\n+\t0x22, 0x4d, 0x62, 0x05, 0x30, 0x8c, 0xb8, 0xb7, 0x06, 0x7a, 0x55, 0x19,\n+\t0x82, 0x5d, 0x11, 0x4b, 0x4a, 0x4a, 0xba, 0x7a, 0x54, 0xaf, 0x83, 0xb6,\n+\t0x50, 0x5d, 0xd6, 0x5b, 0xd1, 0x31, 0x37, 0xef, 0x97, 0xda, 0x1d, 0x71,\n+\t0x6a, 0x7d, 0x3f, 0x67, 0x74, 0x8f, 0x65, 0x74, 0x4b, 0x83, 0x74, 0x98,\n+\t0x6f, 0x64, 0xf3, 0x09, 0xe6, 0x3f, 0x91, 0xd9, 0x9c, 0xb5, 0xa0, 0x84,\n+\t0x3a, 0xcb, 0x3a, 0x10, 0x06, 0x81, 0xfa, 0x4f, 0x75, 0x60, 0x61, 0x00,\n+\t0xbb, 0x45, 0xd9, 0xbe, 0xc2, 0x67, 0x4c, 0x0e, 0x9e, 0x75, 0x58, 0x49,\n+\t0x74, 0x33, 0x3e, 0xf1, 0xdb, 0xcc, 0xf6, 0x21, 0x2d, 0xf1, 0x7a, 0x90,\n+\t0x16, 0x69, 0x04, 0xbb, 0xa8, 0xb3, 0xb7, 0xb3, 0xd9, 0x01, 0xac, 0x21,\n+\t0xe7, 0x53, 0x57, 0x1e, 0xd6, 0xcc, 0xef, 0x7b, 0xb5, 0x3d, 0xc7, 0x0e,\n+\t0xe8, 0x77, 0x26, 0x2c, 0xce, 0x2c, 0x75, 0x86, 0x20, 0x7e, 0x54, 0x8e,\n+\t0x23, 0x9f, 0x9f, 0x86, 0xef, 0x2f, 0xc6, 0x0a, 0xdd, 0x02, 0x6b, 0x8e,\n+\t0x41, 0x1c, 0x86, 0xd6, 0x17, 0xb5, 0x68, 0x0d, 0x91, 0xfc, 0x2d, 0xb9,\n+\t0x3a, 0x3f, 0x22, 0x85, 0x4b, 0xd4, 0x01, 0xfd, 0xd2, 0xe6, 0xe0, 0x3e,\n+\t0x73, 0xd8, 0x67, 0x02, 0x18, 0x78, 0x3f, 0xea, 0x8b, 0x2f, 0x7a, 0x1a,\n+\t0x58, 0x9b, 0x96, 0x9c, 0x3a, 0xe4, 0xab, 0x4b, 0x3c, 0x3f, 0x31, 0xb8,\n+\t0x94, 0xd5, 0x36, 0xe6, 0xd6, 0x10, 0x6a, 0xfa, 0x1f, 0x91, 0xbb, 0x4a,\n+\t0x56, 0x2b, 0xc6, 0x1c, 0x89, 0x7f, 0x00, 0xfb, 0x62, 0x6e, 0x93, 0x6b,\n+\t0xbb, 0x98, 0xe7, 0x1c, 0x65, 0x30, 0x16, 0x0f, 0xa0, 0xae, 0x61, 0xcf,\n+\t0xa3, 0xe4, 0x19, 0x42, 0xcd, 0x27, 0xfe, 0x63, 0xdc, 0xe4, 0x3b, 0xcf,\n+\t0x44, 0x6c, 0x73, 0x31, 0x8e, 0x60, 0xe4, 0x99, 0x7e, 0x91, 0xf9, 0x8a,\n+\t0xcf, 0xc6, 0xe8, 0xea, 0xa8, 0xd4, 0x3b, 0x11, 0x30, 0x76, 0xaa, 0x7c,\n+\t0x5c, 0xb8, 0x86, 0xf7, 0x2e, 0xe7, 0xbd, 0x81, 0x79, 0x3c, 0x77, 0xad,\n+\t0xce, 0xa8, 0xed, 0x79, 0xff, 0xb2, 0x06, 0xc3, 0xa2, 0xc7, 0xd8, 0x64,\n+\t0xaf, 0xc2, 0xfa, 0x67, 0x71, 0x6b, 0x96, 0x7d, 0xca, 0xeb, 0x1d, 0xd6,\n+\t0x42, 0xcd, 0xbc, 0x44, 0x00, 0x1c, 0x92, 0xba, 0x9f, 0x9f, 0x0b, 0x71,\n+\t0x1c, 0x53, 0x36, 0x65, 0x4c, 0xc2, 0x76, 0xec, 0x47, 0xa2, 0xb2, 0x76,\n+\t0xa6, 0x92, 0x26, 0xf9, 0xba, 0x05, 0x29, 0x6c, 0xcc, 0x8b, 0x7b, 0xd6,\n+\t0xc8, 0x66, 0x5f, 0x9e, 0xb7, 0x2c, 0xbe, 0xd4, 0x5e, 0xa2, 0x1e, 0x98,\n+\t0xdf, 0x61, 0x3d, 0x0c, 0x81, 0x67, 0xc5, 0x6c, 0xdf, 0xb2, 0x34, 0x3b,\n+\t0x91, 0xd7, 0x10, 0x8c, 0xdd, 0x3b, 0xe0, 0xbb, 0x22, 0xce, 0xac, 0xe5,\n+\t0x62, 0xa7, 0xbf, 0x17, 0x73, 0xee, 0xb9, 0xb8, 0xbf, 0x57, 0x43, 0x7e,\n+\t0x89, 0xbd, 0xc4, 0x57, 0xc2, 0x3e, 0x12, 0x7d, 0xe3, 0x39, 0x8d, 0xfd,\n+\t0x68, 0xa3, 0x02, 0x7a, 0xdb, 0xd9, 0xec, 0x3c, 0x21, 0xe8, 0x34, 0x6c,\n+\t0x4e, 0x5b, 0x73, 0x0f, 0xc6, 0xe2, 0x3f, 0x0c, 0xf1, 0x05, 0x75, 0x05,\n+\t0xfa, 0xe2, 0xbd, 0xc7, 0x3d, 0x26, 0xe4, 0xc5, 0xd4, 0x62, 0xad, 0x77,\n+\t0x02, 0x98, 0xd5, 0xe8, 0xfc, 0x2d, 0xaf, 0x3d, 0x49, 0x1b, 0xf8, 0xfb,\n+\t0xac, 0x8c, 0x8a, 0xde, 0x19, 0x95, 0xe7, 0xd0, 0xef, 0x15, 0x36, 0x50,\n+\t0xe7, 0x61, 0x63, 0x75, 0xb6, 0x35, 0xcb, 0x9e, 0xed, 0x32, 0x72, 0x79,\n+\t0xb5, 0x12, 0xc5, 0xae, 0x33, 0x2d, 0x67, 0xbe, 0x1b, 0xce, 0x6e, 0xdb,\n+\t0x7c, 0xc6, 0xfa, 0x4e, 0x20, 0xa7, 0xbb, 0x91, 0x9c, 0xe9, 0x7a, 0xd0,\n+\t0xcb, 0xbb, 0xd5, 0xd7, 0x46, 0xc4, 0xdb, 0x06, 0xfe, 0xc4, 0x53, 0x9e,\n+\t0x0b, 0x3e, 0xa8, 0xd2, 0x6e, 0xec, 0x63, 0xe9, 0x5f, 0xe2, 0xdb, 0xa3,\n+\t0x78, 0x1e, 0x11, 0xf7, 0x1c, 0xfb, 0x4e, 0xc6, 0x24, 0xfd, 0x33, 0xd8,\n+\t0x0b, 0x13, 0xfb, 0x20, 0x73, 0x87, 0xb9, 0x9f, 0xe7, 0x66, 0x9e, 0xab,\n+\t0xc4, 0x01, 0xed, 0x2c, 0xc2, 0x5e, 0xd7, 0x62, 0xe6, 0xeb, 0x0d, 0x73,\n+\t0xcd, 0xf6, 0x6e, 0x1e, 0xfb, 0xe2, 0x81, 0xde, 0x2d, 0xef, 0x7b, 0x18,\n+\t0xaf, 0xe5, 0x81, 0x7c, 0xbd, 0x6e, 0x73, 0xf5, 0x0d, 0xe4, 0xed, 0xcb,\n+\t0x69, 0xd9, 0xe6, 0xec, 0xe1, 0x07, 0x6e, 0x97, 0xb3, 0x97, 0x3f, 0x46,\n+\t0xce, 0xfe, 0x30, 0xcb, 0xd9, 0xa2, 0x8d, 0x6b, 0xb5, 0x31, 0xb8, 0xf6,\n+\t0x23, 0xac, 0x0d, 0x65, 0x77, 0x0a, 0x6d, 0x3b, 0xe8, 0xc3, 0x0f, 0xd2,\n+\t0x47, 0xb9, 0x7f, 0xfa, 0x71, 0x5a, 0xd7, 0xa4, 0x81, 0x0f, 0x37, 0x46,\n+\t0x11, 0x4f, 0xcc, 0xe9, 0x3c, 0x9e, 0x02, 0xc4, 0x72, 0xce, 0x8f, 0x7e,\n+\t0xf3, 0x28, 0x63, 0xa1, 0x60, 0xf3, 0xc6, 0xad, 0xe6, 0x34, 0x65, 0x59,\n+\t0x44, 0x2f, 0xf7, 0x63, 0x8e, 0xdd, 0x7e, 0xac, 0x14, 0x37, 0x4a, 0xf2,\n+\t0xfc, 0x0c, 0xb1, 0x2b, 0x8c, 0xaf, 0x42, 0xe7, 0x6b, 0x91, 0x2f, 0x85,\n+\t0x69, 0xe6, 0x33, 0xab, 0x51, 0x11, 0x31, 0x84, 0xbb, 0x55, 0x6a, 0x4e,\n+\t0xa2, 0xdf, 0x0a, 0x34, 0xfc, 0xfc, 0x32, 0xe2, 0x88, 0xd8, 0x8a, 0x98,\n+\t0x98, 0xdd, 0x44, 0x4c, 0x1c, 0xe7, 0xbb, 0xdd, 0xb7, 0x60, 0x69, 0x5d,\n+\t0xbb, 0xbf, 0x0f, 0xfd, 0x4b, 0x32, 0x74, 0xce, 0xe0, 0x4e, 0x75, 0x8b,\n+\t0xef, 0xb4, 0x8d, 0x5f, 0x60, 0x09, 0xe6, 0x57, 0x6d, 0xfc, 0xd2, 0xa7,\n+\t0x8c, 0x7b, 0x63, 0x7e, 0x67, 0xf3, 0xe6, 0xd7, 0x16, 0x03, 0xae, 0xc5,\n+\t0x36, 0x9e, 0x63, 0xf6, 0x9b, 0xa7, 0xbb, 0x3f, 0xd7, 0x16, 0x23, 0x36,\n+\t0x8c, 0x9c, 0x8a, 0x6d, 0xac, 0xcd, 0xbe, 0x81, 0x63, 0xbf, 0xd6, 0xcf,\n+\t0x85, 0x01, 0x39, 0x93, 0xde, 0x23, 0x90, 0x83, 0x9a, 0x17, 0xac, 0xb1,\n+\t0x3f, 0x88, 0xa7, 0xd0, 0x2f, 0x81, 0xae, 0xbb, 0x17, 0x2f, 0xc6, 0x31,\n+\t0xd2, 0xde, 0x7f, 0x80, 0x5c, 0x0f, 0x36, 0xa4, 0x1c, 0xea, 0x4d, 0xbd,\n+\t0x46, 0x25, 0x3a, 0x9b, 0xeb, 0xf4, 0x17, 0xab, 0xcb, 0xbf, 0xcb, 0xc3,\n+\t0xfa, 0xce, 0xed, 0xf8, 0xbc, 0x01, 0xbe, 0x3f, 0xdf, 0x86, 0x0f, 0xeb,\n+\t0x3b, 0xe4, 0x19, 0xb9, 0xd9, 0x6b, 0xd4, 0x6f, 0xc6, 0x75, 0x82, 0xb8,\n+\t0x27, 0xef, 0xde, 0xbb, 0xdc, 0x60, 0x0e, 0xe4, 0x35, 0x9e, 0x71, 0xce,\n+\t0x3d, 0xf3, 0x58, 0xcf, 0x63, 0x3c, 0x8f, 0xf9, 0x3c, 0xd6, 0xc3, 0xf8,\n+\t0x19, 0xe9, 0xfb, 0x57, 0x6f, 0x84, 0xd8, 0x7f, 0xe4, 0x7f, 0xb8, 0xb7,\n+\t0x10, 0x23, 0x24, 0xb9, 0x75, 0xd7, 0xfb, 0x69, 0xd6, 0xaf, 0x94, 0x98,\n+\t0x6b, 0xf8, 0xb3, 0x8f, 0xdf, 0x45, 0x7f, 0x10, 0x67, 0xb6, 0x4d, 0xb2,\n+\t0xb1, 0x4f, 0xd3, 0xef, 0x07, 0xbf, 0x9a, 0x61, 0xf2, 0x17, 0xfb, 0xf5,\n \t0x47, 0xf2, 0x9c, 0x62, 0x0e, 0xd9, 0x9c, 0xe2, 0x79, 0x70, 0x0f, 0x37,\n-\t0x66, 0x19, 0x7e, 0x7c, 0x3e, 0xce, 0xf3, 0x08, 0xf1, 0x74, 0x7f, 0x9e,\n-\t0xe3, 0xb0, 0x53, 0x74, 0xdd, 0xe8, 0xe9, 0x04, 0x36, 0xe3, 0xdd, 0xb7,\n-\t0x81, 0xde, 0x89, 0x76, 0x5a, 0x72, 0x9e, 0xb8, 0x71, 0xdf, 0xdd, 0xdf,\n+\t0x66, 0x19, 0x7e, 0x7c, 0x3e, 0xce, 0xf3, 0x08, 0xf1, 0xf4, 0x40, 0x9e,\n+\t0xe3, 0xb0, 0x53, 0x74, 0xc3, 0xe8, 0xe9, 0x04, 0x36, 0xe3, 0xdd, 0xb7,\n+\t0x81, 0xde, 0x89, 0x76, 0x5a, 0x72, 0x9e, 0xb8, 0x79, 0xdf, 0xdd, 0xdb,\n \t0x27, 0xd1, 0x6e, 0xb4, 0xeb, 0xa0, 0xdd, 0xc2, 0x78, 0x5c, 0x11, 0x03,\n-\t0x6e, 0x85, 0x13, 0x79, 0x3d, 0x07, 0x06, 0x4d, 0xe7, 0x76, 0xfa, 0xd8,\n-\t0x35, 0x3d, 0x49, 0xbf, 0x15, 0xec, 0xc7, 0x87, 0x1d, 0x77, 0x00, 0x1f,\n-\t0x6e, 0xd1, 0x73, 0x52, 0x06, 0x6d, 0x80, 0xfa, 0x66, 0xfb, 0x10, 0xf6,\n-\t0x98, 0xd7, 0x8d, 0x6b, 0xfb, 0x4d, 0x62, 0x23, 0xfb, 0xcc, 0x6f, 0x14,\n-\t0x64, 0xe4, 0x80, 0x7d, 0x4f, 0x76, 0x38, 0x32, 0x26, 0x24, 0xad, 0x5b,\n-\t0x56, 0xff, 0xc7, 0x33, 0xfd, 0x53, 0x9d, 0x45, 0x7d, 0x14, 0xa6, 0x51,\n-\t0x57, 0x0f, 0xba, 0x86, 0xb9, 0x5d, 0x5a, 0xaa, 0x7a, 0x52, 0x1a, 0x15,\n-\t0xf6, 0x4b, 0x82, 0xbb, 0x16, 0x74, 0x58, 0xa0, 0x1e, 0x65, 0xe8, 0x31,\n-\t0x8a, 0xbb, 0x49, 0xb8, 0xd4, 0x92, 0x30, 0x59, 0x01, 0xe1, 0xcc, 0xb7,\n-\t0x69, 0xb7, 0xe3, 0x7a, 0xbb, 0x43, 0xbb, 0x3d, 0xa9, 0xd7, 0x3b, 0x93,\n-\t0xe8, 0x0f, 0x43, 0x78, 0x3b, 0x9c, 0xbd, 0x24, 0x8c, 0xb1, 0xb9, 0x98,\n-\t0xe3, 0x19, 0x61, 0x3f, 0x76, 0x5c, 0x4f, 0xf5, 0x38, 0x3e, 0xa9, 0xa3,\n-\t0xde, 0xa0, 0xdc, 0x3f, 0x19, 0x60, 0x62, 0x72, 0x0d, 0x79, 0xf4, 0x62,\n-\t0x3f, 0xdd, 0x1b, 0xf7, 0xc3, 0x4c, 0x2e, 0xe6, 0xba, 0xb9, 0x6c, 0x21,\n-\t0x4e, 0x51, 0x36, 0xe4, 0x4e, 0xc6, 0x3f, 0xb3, 0x7b, 0xf0, 0x7e, 0xf4,\n-\t0x51, 0x7b, 0xdc, 0x91, 0x7f, 0x9f, 0x40, 0xee, 0x14, 0x2c, 0xf6, 0xac,\n-\t0x75, 0x71, 0xa7, 0xf6, 0x8d, 0x69, 0x46, 0x6f, 0xc3, 0x76, 0xe8, 0x11,\n-\t0xe6, 0x3d, 0xfc, 0x81, 0xab, 0xcb, 0x5c, 0x43, 0x1f, 0x8e, 0xbb, 0x20,\n-\t0xef, 0x73, 0x6b, 0x5d, 0xae, 0x31, 0xc6, 0xd1, 0x2b, 0xce, 0xff, 0x0a,\n-\t0xb4, 0xef, 0x98, 0x56, 0x5f, 0xd9, 0xfb, 0xba, 0x8a, 0x70, 0x0f, 0xeb,\n-\t0xb3, 0x9f, 0x11, 0xa7, 0xd1, 0x95, 0xa0, 0x19, 0x2f, 0xd8, 0xfb, 0x5a,\n+\t0x6e, 0x87, 0x13, 0x79, 0x3d, 0x07, 0x06, 0x4d, 0xe7, 0x76, 0xfa, 0xd8,\n+\t0x35, 0x3d, 0xe9, 0x7f, 0x2b, 0xd8, 0x8b, 0x0f, 0xdb, 0xee, 0x00, 0x3e,\n+\t0xdc, 0xa6, 0xe7, 0xa4, 0x0c, 0xda, 0x00, 0xf5, 0xcd, 0xf6, 0x21, 0xec,\n+\t0x31, 0x6f, 0x18, 0xd7, 0xf6, 0x9b, 0xc4, 0x46, 0xf6, 0x99, 0xdf, 0x2c,\n+\t0xc8, 0xc8, 0x3e, 0xfb, 0x9e, 0x6c, 0x73, 0x64, 0x4c, 0x48, 0xbf, 0x6e,\n+\t0x59, 0xfd, 0x1f, 0xcf, 0xf4, 0xef, 0xeb, 0x2c, 0xea, 0xa3, 0x30, 0x8d,\n+\t0xba, 0x7a, 0xd0, 0x35, 0xcc, 0xed, 0xd2, 0x52, 0xd5, 0x13, 0xd2, 0xa8,\n+\t0xb0, 0x5f, 0x12, 0xdc, 0xb5, 0xa0, 0xc3, 0x02, 0xf5, 0x28, 0x43, 0x8f,\n+\t0x51, 0xdc, 0x4d, 0xc2, 0xa5, 0x96, 0x84, 0xc9, 0x0a, 0x08, 0x67, 0xbe,\n+\t0x43, 0xbb, 0x1d, 0xd3, 0x5b, 0x1d, 0xda, 0xed, 0x49, 0xbd, 0xde, 0x99,\n+\t0x44, 0x7f, 0x18, 0xc2, 0xdb, 0xe1, 0xec, 0x25, 0x61, 0x8c, 0xcd, 0xc5,\n+\t0x1c, 0x4f, 0x0b, 0xfb, 0xb1, 0x63, 0x7a, 0xaa, 0xcb, 0xf1, 0x49, 0x1d,\n+\t0x75, 0x07, 0xe5, 0xfe, 0xc9, 0x00, 0x13, 0x93, 0xeb, 0xc8, 0xa3, 0x17,\n+\t0x7b, 0xfd, 0xbd, 0x71, 0x3f, 0xcc, 0xe4, 0x62, 0x2e, 0xcd, 0x65, 0x0b,\n+\t0x71, 0x8a, 0xb2, 0x21, 0x77, 0x32, 0xfe, 0x99, 0xdd, 0x83, 0xf7, 0xa3,\n+\t0x8f, 0xda, 0xe3, 0xae, 0xfc, 0xfb, 0x04, 0x72, 0xa7, 0x60, 0xb1, 0x67,\n+\t0x2d, 0xc5, 0x9d, 0xda, 0x37, 0xa6, 0x19, 0xbd, 0x0d, 0xdb, 0xa1, 0x47,\n+\t0x98, 0xf7, 0xf0, 0x07, 0xae, 0x2e, 0x73, 0x0d, 0x7d, 0x38, 0xee, 0x82,\n+\t0xbc, 0xcf, 0xad, 0xa5, 0x5c, 0x63, 0x8c, 0xa3, 0x57, 0x9c, 0xff, 0x15,\n+\t0x68, 0xdf, 0x31, 0xad, 0x9e, 0xb2, 0xf7, 0x75, 0x15, 0xe1, 0x1e, 0xd6,\n+\t0x63, 0x3f, 0x23, 0x4e, 0x23, 0x95, 0xa0, 0x19, 0x2f, 0xd8, 0xfb, 0x5a,\n \t0xe2, 0x05, 0xbc, 0x93, 0xa2, 0x07, 0x9d, 0x1f, 0xe8, 0x41, 0xe7, 0xd1,\n-\t0x83, 0x8e, 0x15, 0x11, 0xe7, 0x09, 0xee, 0xa1, 0xaa, 0x99, 0xe6, 0xcd,\n-\t0x18, 0xef, 0x9c, 0x6d, 0x5f, 0x0e, 0xa0, 0xbb, 0x82, 0x6e, 0x11, 0xf6,\n-\t0xe7, 0xfa, 0xed, 0xd9, 0x77, 0xad, 0x51, 0xd0, 0x27, 0xb6, 0x1f, 0x6b,\n-\t0xfb, 0x45, 0x69, 0xc6, 0xa4, 0xb9, 0x2b, 0xa3, 0xf9, 0xd2, 0x3e, 0x9a,\n-\t0xdb, 0x79, 0x46, 0xca, 0x96, 0xe6, 0x2b, 0xcc, 0x3b, 0xd6, 0xd2, 0x62,\n-\t0x96, 0x6f, 0x27, 0xf1, 0x3c, 0x94, 0x3d, 0xe7, 0xf4, 0xf7, 0xec, 0xe3,\n-\t0x7f, 0xc8, 0x49, 0xdf, 0xf9, 0x4c, 0x9d, 0x13, 0xf6, 0xc9, 0x90, 0xb7,\n-\t0xe0, 0xa4, 0xdf, 0x49, 0x70, 0xe1, 0x1c, 0xa1, 0x4f, 0xd2, 0xfe, 0x02,\n-\t0x18, 0x8c, 0xee, 0x6b, 0x0a, 0x76, 0x37, 0xa6, 0xbd, 0x40, 0x5c, 0x9b,\n-\t0x9b, 0x3d, 0x6a, 0xf1, 0x4d, 0x4d, 0x28, 0xc9, 0x31, 0x77, 0xf0, 0x19,\n-\t0xe3, 0x82, 0xfd, 0x66, 0x80, 0xf7, 0x54, 0xc6, 0x36, 0xee, 0xcf, 0x82,\n-\t0x1c, 0x6e, 0x59, 0xbd, 0x9c, 0xf4, 0x5e, 0xe4, 0xd5, 0x58, 0x0f, 0x50,\n-\t0x37, 0x66, 0xa8, 0xd7, 0x8d, 0x6f, 0x1b, 0x2b, 0xa8, 0x35, 0x6f, 0x21,\n-\t0xf6, 0x91, 0x9f, 0xb6, 0xc7, 0xda, 0xb6, 0xdf, 0x16, 0x50, 0x87, 0x46,\n-\t0x70, 0x5f, 0x8a, 0x6e, 0x7c, 0x63, 0x90, 0x0b, 0xa0, 0xb9, 0x88, 0xb5,\n-\t0x33, 0xbd, 0xbc, 0xe7, 0x45, 0x9f, 0x0f, 0xdc, 0x5b, 0x8d, 0xde, 0x37,\n-\t0x4d, 0x7f, 0x90, 0x96, 0xbf, 0x7f, 0x01, 0x25, 0x9f, 0xa5, 0x8e, 0x18,\n+\t0x83, 0x8e, 0x15, 0x11, 0xe7, 0x09, 0xee, 0xa1, 0xaa, 0xd9, 0xcf, 0x9b,\n+\t0x31, 0xde, 0x39, 0xdb, 0xbe, 0xec, 0x43, 0x77, 0x05, 0xdd, 0x22, 0xec,\n+\t0xcf, 0xf5, 0x3b, 0xb3, 0xef, 0x5a, 0xa3, 0xa0, 0x4f, 0x6c, 0x3f, 0xd6,\n+\t0xf6, 0x8b, 0xd2, 0x8c, 0x49, 0x73, 0x28, 0xa3, 0xf9, 0xf2, 0x1e, 0x9a,\n+\t0x3b, 0x79, 0x46, 0xca, 0x96, 0xe6, 0x2b, 0xcc, 0x3b, 0xd6, 0xd2, 0x62,\n+\t0x96, 0x6f, 0x27, 0xf0, 0x3c, 0x94, 0x3d, 0xe7, 0xf4, 0xf7, 0xee, 0xe1,\n+\t0x7f, 0xc8, 0xe9, 0xbf, 0xf3, 0x99, 0x3a, 0x27, 0xec, 0x93, 0x21, 0x6f,\n+\t0xc1, 0xe9, 0x7f, 0x27, 0xc1, 0x85, 0x73, 0x84, 0x3e, 0xe9, 0xf7, 0x17,\n+\t0xc0, 0x60, 0x74, 0x5f, 0x53, 0xb0, 0xbb, 0x31, 0xed, 0x05, 0xe2, 0xda,\n+\t0xdc, 0xec, 0x11, 0x8b, 0x6f, 0x6a, 0x42, 0x49, 0x8e, 0xb9, 0x83, 0xcf,\n+\t0x18, 0x17, 0xec, 0x37, 0x03, 0xbc, 0xf7, 0x65, 0x6c, 0xe1, 0xfe, 0x2c,\n+\t0xc8, 0xe1, 0x96, 0xd5, 0xcb, 0xe9, 0xdf, 0x8b, 0xbc, 0x1a, 0xeb, 0x01,\n+\t0xea, 0xc6, 0x0c, 0xf5, 0xba, 0xf9, 0x6d, 0x63, 0x05, 0xb5, 0xe6, 0x2d,\n+\t0xc4, 0x3e, 0xf2, 0xd3, 0xf6, 0x58, 0x5b, 0xf6, 0xdb, 0x02, 0xea, 0xd0,\n+\t0x08, 0xee, 0x4b, 0xd1, 0xcd, 0x6f, 0x0c, 0x72, 0x01, 0x34, 0x17, 0xb1,\n+\t0x76, 0xba, 0x9b, 0xf7, 0xbc, 0xe8, 0xf3, 0x81, 0x7b, 0xab, 0xd1, 0xfb,\n+\t0xa6, 0xe9, 0x0f, 0xd2, 0xf2, 0xf7, 0x2f, 0x97, 0xa2, 0x15, 0x3a, 0x18,\n \t0x15, 0x00, 0x00, 0x00 };\n \n static const u32 bnx2_TPAT_b09FwData[(0x0\/4) + 1] = { 0x0 };\n@@ -3691,10 +3691,10 @@\n \t0x00000001, 0x00000000 };\n \n static struct fw_info bnx2_tpat_fw_09 = {\n-\t\/* Firmware version: 4.4.23 *\/\n+\t\/* Firmware version: 4.4.26 *\/\n \t.ver_major\t\t\t= 0x4,\n \t.ver_minor\t\t\t= 0x4,\n-\t.ver_fix\t\t\t= 0x17,\n+\t.ver_fix\t\t\t= 0x1a,\n \n \t.start_addr\t\t\t= 0x08000488,\n \n@@ -3714,7 +3714,7 @@\n \t.sbss_index\t\t\t= 0x0,\n \n \t.bss_addr\t\t\t= 0x08001988,\n-\t.bss_len\t\t\t= 0x10a0,\n+\t.bss_len\t\t\t= 0x12b4,\n \t.bss_index\t\t\t= 0x0,\n \n \t.rodata_addr\t\t\t= 0x08001914,\n"} {"commit":"6e48ae3269e3b89d8014d0eb2e35678b0d242b3d","subject":"drm\/atomic-helper: Pimp docs with recommendations for rpm drivers","message":"drm\/atomic-helper: Pimp docs with recommendations for rpm drivers\n\nRequested by Laurent.\n\nNote that this uses the new markdown support which will only land in\nkernel 4.4 (for the code snippet).\n\nv2: A few spelling fixes I spotted myself.\n\nv3: Big reword for commit_planes() kerneldoc based on a text from\nLaurent.\n\nCc: Laurent Pinchart <3ded2f39a78f0d7044839546f95841842b4d7c96@ideasonboard.com>\nReviewed-by: Thierry Reding <3055038c414aef68bf32c33b8118623e7554e0f2@nvidia.com> (v1 on irc)\nAcked-by: Laurent Pinchart <3ded2f39a78f0d7044839546f95841842b4d7c96@ideasonboard.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ad07cae6a44be9ab6fafa7c194cd88da7b28c218","subject":"SimonStewart: Although this file is rebuilt on demand, adding to source tree so it is parallel in concept to the atoms.h file","message":"SimonStewart: Although this file is rebuilt on demand, adding to source tree so it is parallel in concept to the atoms.h file\n\ngit-svn-id: 4179480af2c2519a5eb5e1e9b541cbdf5cf27696@9689 07704840-8298-11de-bf8c-fd130f914ac9\n","repos":"akiellor\/selenium,winhamwr\/selenium,virajs\/selenium-1,winhamwr\/selenium,akiellor\/selenium,winhamwr\/selenium,akiellor\/selenium,virajs\/selenium-1,winhamwr\/selenium,virajs\/selenium-1,winhamwr\/selenium,akiellor\/selenium,akiellor\/selenium,akiellor\/selenium,virajs\/selenium-1,winhamwr\/selenium,virajs\/selenium-1,virajs\/selenium-1,akiellor\/selenium,winhamwr\/selenium,virajs\/selenium-1,winhamwr\/selenium,akiellor\/selenium,virajs\/selenium-1,virajs\/selenium-1","returncode":1,"stderr":"error: pathspec 'jobbie\/src\/cpp\/InternetExplorerDriver\/sizzle.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- jobbie\/src\/cpp\/InternetExplorerDriver\/sizzle.h\n+++ jobbie\/src\/cpp\/InternetExplorerDriver\/sizzle.h\n@@ -0,0 +1,1113 @@\n+\/* AUTO GENERATED - Do not edit by hand. *\/\n+\/* See rake-tasts\/crazy_fun\/mappings\/javascript.rb for generator. *\/\n+\n+#ifndef SIZZLE_H\n+#define SIZZLE_H\n+\n+const wchar_t* SIZZLE[] = {\n+L\"\/*!\",\n+L\" * Sizzle CSS Selector Engine - v1.0\",\n+L\" * Copyright 2009, The Dojo Foundation\",\n+L\" * Released under the MIT, BSD, and GPL Licenses.\",\n+L\" * More information: http:\/\/sizzlejs.com\/\",\n+L\" *\/\",\n+L\"(function(){\",\n+L\"\",\n+L\"var chunker = \/((?:\\\\((?:\\\\([^()]+\\\\)|[^()]+)+\\\\)|\\\\[(?:\\\\[[^\\\\[\\\\]]*\\\\]|['\\\"][^'\\\"]*['\\\"]|[^\\\\[\\\\]'\\\"]+)+\\\\]|\\\\\\\\.|[^ >+~,(\\\\[\\\\\\\\]+)+|[>+~])(\\\\s*,\\\\s*)?((?:.|\\\\r|\\\\n)*)\/g,\",\n+L\"\tdone = 0,\",\n+L\"\ttoString = Object.prototype.toString,\",\n+L\"\thasDuplicate = false,\",\n+L\"\tbaseHasDuplicate = true;\",\n+L\"\",\n+L\"\/\/ Here we check if the JavaScript engine is using some sort of\",\n+L\"\/\/ optimization where it does not always call our comparision\",\n+L\"\/\/ function. If that is the case, discard the hasDuplicate value.\",\n+L\"\/\/ Thus far that includes Google Chrome.\",\n+L\"[0, 0].sort(function(){\",\n+L\"\tbaseHasDuplicate = false;\",\n+L\"\treturn 0;\",\n+L\"});\",\n+L\"\",\n+L\"var Sizzle = function(selector, context, results, seed) {\",\n+L\"\tresults = results || [];\",\n+L\"\tcontext = context || document;\",\n+L\"\",\n+L\"\tvar origContext = context;\",\n+L\"\",\n+L\"\tif ( context.nodeType !== 1 && context.nodeType !== 9 ) {\",\n+L\"\t\treturn [];\",\n+L\"\t}\",\n+L\"\t\",\n+L\"\tif ( !selector || typeof selector !== \\\"string\\\" ) {\",\n+L\"\t\treturn results;\",\n+L\"\t}\",\n+L\"\",\n+L\"\tvar parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),\",\n+L\"\t\tsoFar = selector, ret, cur, pop, i;\",\n+L\"\t\",\n+L\"\t\/\/ Reset the position of the chunker regexp (start from head)\",\n+L\"\tdo {\",\n+L\"\t\tchunker.exec(\\\"\\\");\",\n+L\"\t\tm = chunker.exec(soFar);\",\n+L\"\",\n+L\"\t\tif ( m ) {\",\n+L\"\t\t\tsoFar = m[3];\",\n+L\"\t\t\",\n+L\"\t\t\tparts.push( m[1] );\",\n+L\"\t\t\",\n+L\"\t\t\tif ( m[2] ) {\",\n+L\"\t\t\t\textra = m[3];\",\n+L\"\t\t\t\tbreak;\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t} while ( m );\",\n+L\"\",\n+L\"\tif ( parts.length > 1 && origPOS.exec( selector ) ) {\",\n+L\"\t\tif ( parts.length === 2 && Expr.relative[ parts[0] ] ) {\",\n+L\"\t\t\tset = posProcess( parts[0] + parts[1], context );\",\n+L\"\t\t} else {\",\n+L\"\t\t\tset = Expr.relative[ parts[0] ] ?\",\n+L\"\t\t\t\t[ context ] :\",\n+L\"\t\t\t\tSizzle( parts.shift(), context );\",\n+L\"\",\n+L\"\t\t\twhile ( parts.length ) {\",\n+L\"\t\t\t\tselector = parts.shift();\",\n+L\"\",\n+L\"\t\t\t\tif ( Expr.relative[ selector ] ) {\",\n+L\"\t\t\t\t\tselector += parts.shift();\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t\t\",\n+L\"\t\t\t\tset = posProcess( selector, set );\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t} else {\",\n+L\"\t\t\/\/ Take a shortcut and set the context if the root selector is an ID\",\n+L\"\t\t\/\/ (but not if it'll be faster if the inner selector is an ID)\",\n+L\"\t\tif ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&\",\n+L\"\t\t\t\tExpr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {\",\n+L\"\t\t\tret = Sizzle.find( parts.shift(), context, contextXML );\",\n+L\"\t\t\tcontext = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tif ( context ) {\",\n+L\"\t\t\tret = seed ?\",\n+L\"\t\t\t\t{ expr: parts.pop(), set: makeArray(seed) } :\",\n+L\"\t\t\t\tSizzle.find( parts.pop(), parts.length === 1 && (parts[0] === \\\"~\\\" || parts[0] === \\\"+\\\") && context.parentNode ? context.parentNode : context, contextXML );\",\n+L\"\t\t\tset = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;\",\n+L\"\",\n+L\"\t\t\tif ( parts.length > 0 ) {\",\n+L\"\t\t\t\tcheckSet = makeArray(set);\",\n+L\"\t\t\t} else {\",\n+L\"\t\t\t\tprune = false;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\twhile ( parts.length ) {\",\n+L\"\t\t\t\tcur = parts.pop();\",\n+L\"\t\t\t\tpop = cur;\",\n+L\"\",\n+L\"\t\t\t\tif ( !Expr.relative[ cur ] ) {\",\n+L\"\t\t\t\t\tcur = \\\"\\\";\",\n+L\"\t\t\t\t} else {\",\n+L\"\t\t\t\t\tpop = parts.pop();\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( pop == null ) {\",\n+L\"\t\t\t\t\tpop = context;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tExpr.relative[ cur ]( checkSet, pop, contextXML );\",\n+L\"\t\t\t}\",\n+L\"\t\t} else {\",\n+L\"\t\t\tcheckSet = parts = [];\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"\",\n+L\"\tif ( !checkSet ) {\",\n+L\"\t\tcheckSet = set;\",\n+L\"\t}\",\n+L\"\",\n+L\"\tif ( !checkSet ) {\",\n+L\"\t\tSizzle.error( cur || selector );\",\n+L\"\t}\",\n+L\"\",\n+L\"\tif ( toString.call(checkSet) === \\\"[object Array]\\\" ) {\",\n+L\"\t\tif ( !prune ) {\",\n+L\"\t\t\tresults.push.apply( results, checkSet );\",\n+L\"\t\t} else if ( context && context.nodeType === 1 ) {\",\n+L\"\t\t\tfor ( i = 0; checkSet[i] != null; i++ ) {\",\n+L\"\t\t\t\tif ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {\",\n+L\"\t\t\t\t\tresults.push( set[i] );\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t} else {\",\n+L\"\t\t\tfor ( i = 0; checkSet[i] != null; i++ ) {\",\n+L\"\t\t\t\tif ( checkSet[i] && checkSet[i].nodeType === 1 ) {\",\n+L\"\t\t\t\t\tresults.push( set[i] );\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t} else {\",\n+L\"\t\tmakeArray( checkSet, results );\",\n+L\"\t}\",\n+L\"\",\n+L\"\tif ( extra ) {\",\n+L\"\t\tSizzle( extra, origContext, results, seed );\",\n+L\"\t\tSizzle.uniqueSort( results );\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn results;\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.uniqueSort = function(results){\",\n+L\"\tif ( sortOrder ) {\",\n+L\"\t\thasDuplicate = baseHasDuplicate;\",\n+L\"\t\tresults.sort(sortOrder);\",\n+L\"\",\n+L\"\t\tif ( hasDuplicate ) {\",\n+L\"\t\t\tfor ( var i = 1; i < results.length; i++ ) {\",\n+L\"\t\t\t\tif ( results[i] === results[i-1] ) {\",\n+L\"\t\t\t\t\tresults.splice(i--, 1);\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn results;\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.matches = function(expr, set){\",\n+L\"\treturn Sizzle(expr, null, null, set);\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.find = function(expr, context, isXML){\",\n+L\"\tvar set;\",\n+L\"\",\n+L\"\tif ( !expr ) {\",\n+L\"\t\treturn [];\",\n+L\"\t}\",\n+L\"\",\n+L\"\tfor ( var i = 0, l = Expr.order.length; i < l; i++ ) {\",\n+L\"\t\tvar type = Expr.order[i], match;\",\n+L\"\t\t\",\n+L\"\t\tif ( (match = Expr.leftMatch[ type ].exec( expr )) ) {\",\n+L\"\t\t\tvar left = match[1];\",\n+L\"\t\t\tmatch.splice(1,1);\",\n+L\"\",\n+L\"\t\t\tif ( left.substr( left.length - 1 ) !== \\\"\\\\\\\\\\\" ) {\",\n+L\"\t\t\t\tmatch[1] = (match[1] || \\\"\\\").replace(\/\\\\\\\\\/g, \\\"\\\");\",\n+L\"\t\t\t\tset = Expr.find[ type ]( match, context, isXML );\",\n+L\"\t\t\t\tif ( set != null ) {\",\n+L\"\t\t\t\t\texpr = expr.replace( Expr.match[ type ], \\\"\\\" );\",\n+L\"\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"\",\n+L\"\tif ( !set ) {\",\n+L\"\t\tset = context.getElementsByTagName(\\\"*\\\");\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn {set: set, expr: expr};\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.filter = function(expr, set, inplace, not){\",\n+L\"\tvar old = expr, result = [], curLoop = set, match, anyFound,\",\n+L\"\t\tisXMLFilter = set && set[0] && Sizzle.isXML(set[0]);\",\n+L\"\",\n+L\"\twhile ( expr && set.length ) {\",\n+L\"\t\tfor ( var type in Expr.filter ) {\",\n+L\"\t\t\tif ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {\",\n+L\"\t\t\t\tvar filter = Expr.filter[ type ], found, item, left = match[1];\",\n+L\"\t\t\t\tanyFound = false;\",\n+L\"\",\n+L\"\t\t\t\tmatch.splice(1,1);\",\n+L\"\",\n+L\"\t\t\t\tif ( left.substr( left.length - 1 ) === \\\"\\\\\\\\\\\" ) {\",\n+L\"\t\t\t\t\tcontinue;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( curLoop === result ) {\",\n+L\"\t\t\t\t\tresult = [];\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( Expr.preFilter[ type ] ) {\",\n+L\"\t\t\t\t\tmatch = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );\",\n+L\"\",\n+L\"\t\t\t\t\tif ( !match ) {\",\n+L\"\t\t\t\t\t\tanyFound = found = true;\",\n+L\"\t\t\t\t\t} else if ( match === true ) {\",\n+L\"\t\t\t\t\t\tcontinue;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( match ) {\",\n+L\"\t\t\t\t\tfor ( var i = 0; (item = curLoop[i]) != null; i++ ) {\",\n+L\"\t\t\t\t\t\tif ( item ) {\",\n+L\"\t\t\t\t\t\t\tfound = filter( item, match, i, curLoop );\",\n+L\"\t\t\t\t\t\t\tvar pass = not ^ !!found;\",\n+L\"\",\n+L\"\t\t\t\t\t\t\tif ( inplace && found != null ) {\",\n+L\"\t\t\t\t\t\t\t\tif ( pass ) {\",\n+L\"\t\t\t\t\t\t\t\t\tanyFound = true;\",\n+L\"\t\t\t\t\t\t\t\t} else {\",\n+L\"\t\t\t\t\t\t\t\t\tcurLoop[i] = false;\",\n+L\"\t\t\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t\t\t} else if ( pass ) {\",\n+L\"\t\t\t\t\t\t\t\tresult.push( item );\",\n+L\"\t\t\t\t\t\t\t\tanyFound = true;\",\n+L\"\t\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( found !== undefined ) {\",\n+L\"\t\t\t\t\tif ( !inplace ) {\",\n+L\"\t\t\t\t\t\tcurLoop = result;\",\n+L\"\t\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\t\texpr = expr.replace( Expr.match[ type ], \\\"\\\" );\",\n+L\"\",\n+L\"\t\t\t\t\tif ( !anyFound ) {\",\n+L\"\t\t\t\t\t\treturn [];\",\n+L\"\t\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\t\/\/ Improper expression\",\n+L\"\t\tif ( expr === old ) {\",\n+L\"\t\t\tif ( anyFound == null ) {\",\n+L\"\t\t\t\tSizzle.error( expr );\",\n+L\"\t\t\t} else {\",\n+L\"\t\t\t\tbreak;\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\told = expr;\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn curLoop;\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.error = function( msg ) {\",\n+L\"\tthrow \\\"Syntax error, unrecognized expression: \\\" + msg;\",\n+L\"};\",\n+L\"\",\n+L\"var Expr = Sizzle.selectors = {\",\n+L\"\torder: [ \\\"ID\\\", \\\"NAME\\\", \\\"TAG\\\" ],\",\n+L\"\tmatch: {\",\n+L\"\t\tID: \/#((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\-]|\\\\\\\\.)+)\/,\",\n+L\"\t\tCLASS: \/\\\\.((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\-]|\\\\\\\\.)+)\/,\",\n+L\"\t\tNAME: \/\\\\[name=['\\\"]*((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\-]|\\\\\\\\.)+)['\\\"]*\\\\]\/,\",\n+L\"\t\tATTR: \/\\\\[\\\\s*((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\-]|\\\\\\\\.)+)\\\\s*(?:(\\\\S?=)\\\\s*(['\\\"]*)(.*?)\\\\3|)\\\\s*\\\\]\/,\",\n+L\"\t\tTAG: \/^((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\*\\\\-]|\\\\\\\\.)+)\/,\",\n+L\"\t\tCHILD: \/:(only|nth|last|first)-child(?:\\\\((even|odd|[\\\\dn+\\\\-]*)\\\\))?\/,\",\n+L\"\t\tPOS: \/:(nth|eq|gt|lt|first|last|even|odd)(?:\\\\((\\\\d*)\\\\))?(?=[^\\\\-]|$)\/,\",\n+L\"\t\tPSEUDO: \/:((?:[\\\\w\\\\u00c0-\\\\uFFFF\\\\-]|\\\\\\\\.)+)(?:\\\\((['\\\"]?)((?:\\\\([^\\\\)]+\\\\)|[^\\\\(\\\\)]*)+)\\\\2\\\\))?\/\",\n+L\"\t},\",\n+L\"\tleftMatch: {},\",\n+L\"\tattrMap: {\",\n+L\"\t\t\\\"class\\\": \\\"className\\\",\",\n+L\"\t\t\\\"for\\\": \\\"htmlFor\\\"\",\n+L\"\t},\",\n+L\"\tattrHandle: {\",\n+L\"\t\thref: function(elem){\",\n+L\"\t\t\treturn elem.getAttribute(\\\"href\\\");\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\trelative: {\",\n+L\"\t\t\\\"+\\\": function(checkSet, part){\",\n+L\"\t\t\tvar isPartStr = typeof part === \\\"string\\\",\",\n+L\"\t\t\t\tisTag = isPartStr && !\/\\\\W\/.test(part),\",\n+L\"\t\t\t\tisPartStrNotTag = isPartStr && !isTag;\",\n+L\"\",\n+L\"\t\t\tif ( isTag ) {\",\n+L\"\t\t\t\tpart = part.toLowerCase();\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tfor ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {\",\n+L\"\t\t\t\tif ( (elem = checkSet[i]) ) {\",\n+L\"\t\t\t\t\twhile ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}\",\n+L\"\",\n+L\"\t\t\t\t\tcheckSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?\",\n+L\"\t\t\t\t\t\telem || false :\",\n+L\"\t\t\t\t\t\telem === part;\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tif ( isPartStrNotTag ) {\",\n+L\"\t\t\t\tSizzle.filter( part, checkSet, true );\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\t\\\">\\\": function(checkSet, part){\",\n+L\"\t\t\tvar isPartStr = typeof part === \\\"string\\\",\",\n+L\"\t\t\t\telem, i = 0, l = checkSet.length;\",\n+L\"\",\n+L\"\t\t\tif ( isPartStr && !\/\\\\W\/.test(part) ) {\",\n+L\"\t\t\t\tpart = part.toLowerCase();\",\n+L\"\",\n+L\"\t\t\t\tfor ( ; i < l; i++ ) {\",\n+L\"\t\t\t\t\telem = checkSet[i];\",\n+L\"\t\t\t\t\tif ( elem ) {\",\n+L\"\t\t\t\t\t\tvar parent = elem.parentNode;\",\n+L\"\t\t\t\t\t\tcheckSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t} else {\",\n+L\"\t\t\t\tfor ( ; i < l; i++ ) {\",\n+L\"\t\t\t\t\telem = checkSet[i];\",\n+L\"\t\t\t\t\tif ( elem ) {\",\n+L\"\t\t\t\t\t\tcheckSet[i] = isPartStr ?\",\n+L\"\t\t\t\t\t\t\telem.parentNode :\",\n+L\"\t\t\t\t\t\t\telem.parentNode === part;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( isPartStr ) {\",\n+L\"\t\t\t\t\tSizzle.filter( part, checkSet, true );\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\t\\\"\\\": function(checkSet, part, isXML){\",\n+L\"\t\t\tvar doneName = done++, checkFn = dirCheck, nodeCheck;\",\n+L\"\",\n+L\"\t\t\tif ( typeof part === \\\"string\\\" && !\/\\\\W\/.test(part) ) {\",\n+L\"\t\t\t\tpart = part.toLowerCase();\",\n+L\"\t\t\t\tnodeCheck = part;\",\n+L\"\t\t\t\tcheckFn = dirNodeCheck;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tcheckFn(\\\"parentNode\\\", part, doneName, checkSet, nodeCheck, isXML);\",\n+L\"\t\t},\",\n+L\"\t\t\\\"~\\\": function(checkSet, part, isXML){\",\n+L\"\t\t\tvar doneName = done++, checkFn = dirCheck, nodeCheck;\",\n+L\"\",\n+L\"\t\t\tif ( typeof part === \\\"string\\\" && !\/\\\\W\/.test(part) ) {\",\n+L\"\t\t\t\tpart = part.toLowerCase();\",\n+L\"\t\t\t\tnodeCheck = part;\",\n+L\"\t\t\t\tcheckFn = dirNodeCheck;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tcheckFn(\\\"previousSibling\\\", part, doneName, checkSet, nodeCheck, isXML);\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\tfind: {\",\n+L\"\t\tID: function(match, context, isXML){\",\n+L\"\t\t\tif ( typeof context.getElementById !== \\\"undefined\\\" && !isXML ) {\",\n+L\"\t\t\t\tvar m = context.getElementById(match[1]);\",\n+L\"\t\t\t\t\/\/ Check parentNode to catch when Blackberry 4.6 returns\",\n+L\"\t\t\t\t\/\/ nodes that are no longer in the document #6963\",\n+L\"\t\t\t\treturn m && m.parentNode ? [m] : [];\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\tNAME: function(match, context){\",\n+L\"\t\t\tif ( typeof context.getElementsByName !== \\\"undefined\\\" ) {\",\n+L\"\t\t\t\tvar ret = [], results = context.getElementsByName(match[1]);\",\n+L\"\",\n+L\"\t\t\t\tfor ( var i = 0, l = results.length; i < l; i++ ) {\",\n+L\"\t\t\t\t\tif ( results[i].getAttribute(\\\"name\\\") === match[1] ) {\",\n+L\"\t\t\t\t\t\tret.push( results[i] );\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\treturn ret.length === 0 ? null : ret;\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\tTAG: function(match, context){\",\n+L\"\t\t\treturn context.getElementsByTagName(match[1]);\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\tpreFilter: {\",\n+L\"\t\tCLASS: function(match, curLoop, inplace, result, not, isXML){\",\n+L\"\t\t\tmatch = \\\" \\\" + match[1].replace(\/\\\\\\\\\/g, \\\"\\\") + \\\" \\\";\",\n+L\"\",\n+L\"\t\t\tif ( isXML ) {\",\n+L\"\t\t\t\treturn match;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tfor ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {\",\n+L\"\t\t\t\tif ( elem ) {\",\n+L\"\t\t\t\t\tif ( not ^ (elem.className && (\\\" \\\" + elem.className + \\\" \\\").replace(\/[\\\\t\\\\n]\/g, \\\" \\\").indexOf(match) >= 0) ) {\",\n+L\"\t\t\t\t\t\tif ( !inplace ) {\",\n+L\"\t\t\t\t\t\t\tresult.push( elem );\",\n+L\"\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t} else if ( inplace ) {\",\n+L\"\t\t\t\t\t\tcurLoop[i] = false;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\treturn false;\",\n+L\"\t\t},\",\n+L\"\t\tID: function(match){\",\n+L\"\t\t\treturn match[1].replace(\/\\\\\\\\\/g, \\\"\\\");\",\n+L\"\t\t},\",\n+L\"\t\tTAG: function(match, curLoop){\",\n+L\"\t\t\treturn match[1].toLowerCase();\",\n+L\"\t\t},\",\n+L\"\t\tCHILD: function(match){\",\n+L\"\t\t\tif ( match[1] === \\\"nth\\\" ) {\",\n+L\"\t\t\t\t\/\/ parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'\",\n+L\"\t\t\t\tvar test = \/(-?)(\\\\d*)n((?:\\\\+|-)?\\\\d*)\/.exec(\",\n+L\"\t\t\t\t\tmatch[2] === \\\"even\\\" && \\\"2n\\\" || match[2] === \\\"odd\\\" && \\\"2n+1\\\" ||\",\n+L\"\t\t\t\t\t!\/\\\\D\/.test( match[2] ) && \\\"0n+\\\" + match[2] || match[2]);\",\n+L\"\",\n+L\"\t\t\t\t\/\/ calculate the numbers (first)n+(last) including if they are negative\",\n+L\"\t\t\t\tmatch[2] = (test[1] + (test[2] || 1)) - 0;\",\n+L\"\t\t\t\tmatch[3] = test[3] - 0;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\/\/ TODO: Move to normal caching system\",\n+L\"\t\t\tmatch[0] = done++;\",\n+L\"\",\n+L\"\t\t\treturn match;\",\n+L\"\t\t},\",\n+L\"\t\tATTR: function(match, curLoop, inplace, result, not, isXML){\",\n+L\"\t\t\tvar name = match[1].replace(\/\\\\\\\\\/g, \\\"\\\");\",\n+L\"\t\t\t\",\n+L\"\t\t\tif ( !isXML && Expr.attrMap[name] ) {\",\n+L\"\t\t\t\tmatch[1] = Expr.attrMap[name];\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tif ( match[2] === \\\"~=\\\" ) {\",\n+L\"\t\t\t\tmatch[4] = \\\" \\\" + match[4] + \\\" \\\";\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\treturn match;\",\n+L\"\t\t},\",\n+L\"\t\tPSEUDO: function(match, curLoop, inplace, result, not){\",\n+L\"\t\t\tif ( match[1] === \\\"not\\\" ) {\",\n+L\"\t\t\t\t\/\/ If we're dealing with a complex expression, or a simple one\",\n+L\"\t\t\t\tif ( ( chunker.exec(match[3]) || \\\"\\\" ).length > 1 || \/^\\\\w\/.test(match[3]) ) {\",\n+L\"\t\t\t\t\tmatch[3] = Sizzle(match[3], null, null, curLoop);\",\n+L\"\t\t\t\t} else {\",\n+L\"\t\t\t\t\tvar ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);\",\n+L\"\t\t\t\t\tif ( !inplace ) {\",\n+L\"\t\t\t\t\t\tresult.push.apply( result, ret );\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\treturn false;\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {\",\n+L\"\t\t\t\treturn true;\",\n+L\"\t\t\t}\",\n+L\"\t\t\t\",\n+L\"\t\t\treturn match;\",\n+L\"\t\t},\",\n+L\"\t\tPOS: function(match){\",\n+L\"\t\t\tmatch.unshift( true );\",\n+L\"\t\t\treturn match;\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\tfilters: {\",\n+L\"\t\tenabled: function(elem){\",\n+L\"\t\t\treturn elem.disabled === false && elem.type !== \\\"hidden\\\";\",\n+L\"\t\t},\",\n+L\"\t\tdisabled: function(elem){\",\n+L\"\t\t\treturn elem.disabled === true;\",\n+L\"\t\t},\",\n+L\"\t\tchecked: function(elem){\",\n+L\"\t\t\treturn elem.checked === true;\",\n+L\"\t\t},\",\n+L\"\t\tselected: function(elem){\",\n+L\"\t\t\t\/\/ Accessing this property makes selected-by-default\",\n+L\"\t\t\t\/\/ options in Safari work properly\",\n+L\"\t\t\telem.parentNode.selectedIndex;\",\n+L\"\t\t\treturn elem.selected === true;\",\n+L\"\t\t},\",\n+L\"\t\tparent: function(elem){\",\n+L\"\t\t\treturn !!elem.firstChild;\",\n+L\"\t\t},\",\n+L\"\t\tempty: function(elem){\",\n+L\"\t\t\treturn !elem.firstChild;\",\n+L\"\t\t},\",\n+L\"\t\thas: function(elem, i, match){\",\n+L\"\t\t\treturn !!Sizzle( match[3], elem ).length;\",\n+L\"\t\t},\",\n+L\"\t\theader: function(elem){\",\n+L\"\t\t\treturn (\/h\\\\d\/i).test( elem.nodeName );\",\n+L\"\t\t},\",\n+L\"\t\ttext: function(elem){\",\n+L\"\t\t\treturn \\\"text\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tradio: function(elem){\",\n+L\"\t\t\treturn \\\"radio\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tcheckbox: function(elem){\",\n+L\"\t\t\treturn \\\"checkbox\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tfile: function(elem){\",\n+L\"\t\t\treturn \\\"file\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tpassword: function(elem){\",\n+L\"\t\t\treturn \\\"password\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tsubmit: function(elem){\",\n+L\"\t\t\treturn \\\"submit\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\timage: function(elem){\",\n+L\"\t\t\treturn \\\"image\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\treset: function(elem){\",\n+L\"\t\t\treturn \\\"reset\\\" === elem.type;\",\n+L\"\t\t},\",\n+L\"\t\tbutton: function(elem){\",\n+L\"\t\t\treturn \\\"button\\\" === elem.type || elem.nodeName.toLowerCase() === \\\"button\\\";\",\n+L\"\t\t},\",\n+L\"\t\tinput: function(elem){\",\n+L\"\t\t\treturn (\/input|select|textarea|button\/i).test(elem.nodeName);\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\tsetFilters: {\",\n+L\"\t\tfirst: function(elem, i){\",\n+L\"\t\t\treturn i === 0;\",\n+L\"\t\t},\",\n+L\"\t\tlast: function(elem, i, match, array){\",\n+L\"\t\t\treturn i === array.length - 1;\",\n+L\"\t\t},\",\n+L\"\t\teven: function(elem, i){\",\n+L\"\t\t\treturn i % 2 === 0;\",\n+L\"\t\t},\",\n+L\"\t\todd: function(elem, i){\",\n+L\"\t\t\treturn i % 2 === 1;\",\n+L\"\t\t},\",\n+L\"\t\tlt: function(elem, i, match){\",\n+L\"\t\t\treturn i < match[3] - 0;\",\n+L\"\t\t},\",\n+L\"\t\tgt: function(elem, i, match){\",\n+L\"\t\t\treturn i > match[3] - 0;\",\n+L\"\t\t},\",\n+L\"\t\tnth: function(elem, i, match){\",\n+L\"\t\t\treturn match[3] - 0 === i;\",\n+L\"\t\t},\",\n+L\"\t\teq: function(elem, i, match){\",\n+L\"\t\t\treturn match[3] - 0 === i;\",\n+L\"\t\t}\",\n+L\"\t},\",\n+L\"\tfilter: {\",\n+L\"\t\tPSEUDO: function(elem, match, i, array){\",\n+L\"\t\t\tvar name = match[1], filter = Expr.filters[ name ];\",\n+L\"\",\n+L\"\t\t\tif ( filter ) {\",\n+L\"\t\t\t\treturn filter( elem, i, match, array );\",\n+L\"\t\t\t} else if ( name === \\\"contains\\\" ) {\",\n+L\"\t\t\t\treturn (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || \\\"\\\").indexOf(match[3]) >= 0;\",\n+L\"\t\t\t} else if ( name === \\\"not\\\" ) {\",\n+L\"\t\t\t\tvar not = match[3];\",\n+L\"\",\n+L\"\t\t\t\tfor ( var j = 0, l = not.length; j < l; j++ ) {\",\n+L\"\t\t\t\t\tif ( not[j] === elem ) {\",\n+L\"\t\t\t\t\t\treturn false;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\treturn true;\",\n+L\"\t\t\t} else {\",\n+L\"\t\t\t\tSizzle.error( \\\"Syntax error, unrecognized expression: \\\" + name );\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\tCHILD: function(elem, match){\",\n+L\"\t\t\tvar type = match[1], node = elem;\",\n+L\"\t\t\tswitch (type) {\",\n+L\"\t\t\t\tcase 'only':\",\n+L\"\t\t\t\tcase 'first':\",\n+L\"\t\t\t\t\twhile ( (node = node.previousSibling) )\t {\",\n+L\"\t\t\t\t\t\tif ( node.nodeType === 1 ) { \",\n+L\"\t\t\t\t\t\t\treturn false; \",\n+L\"\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\tif ( type === \\\"first\\\" ) { \",\n+L\"\t\t\t\t\t\treturn true; \",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\tnode = elem;\",\n+L\"\t\t\t\tcase 'last':\",\n+L\"\t\t\t\t\twhile ( (node = node.nextSibling) )\t {\",\n+L\"\t\t\t\t\t\tif ( node.nodeType === 1 ) { \",\n+L\"\t\t\t\t\t\t\treturn false; \",\n+L\"\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\treturn true;\",\n+L\"\t\t\t\tcase 'nth':\",\n+L\"\t\t\t\t\tvar first = match[2], last = match[3];\",\n+L\"\",\n+L\"\t\t\t\t\tif ( first === 1 && last === 0 ) {\",\n+L\"\t\t\t\t\t\treturn true;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\t\",\n+L\"\t\t\t\t\tvar doneName = match[0],\",\n+L\"\t\t\t\t\t\tparent = elem.parentNode;\",\n+L\"\t\",\n+L\"\t\t\t\t\tif ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {\",\n+L\"\t\t\t\t\t\tvar count = 0;\",\n+L\"\t\t\t\t\t\tfor ( node = parent.firstChild; node; node = node.nextSibling ) {\",\n+L\"\t\t\t\t\t\t\tif ( node.nodeType === 1 ) {\",\n+L\"\t\t\t\t\t\t\t\tnode.nodeIndex = ++count;\",\n+L\"\t\t\t\t\t\t\t}\",\n+L\"\t\t\t\t\t\t} \",\n+L\"\t\t\t\t\t\tparent.sizcache = doneName;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\t\",\n+L\"\t\t\t\t\tvar diff = elem.nodeIndex - last;\",\n+L\"\t\t\t\t\tif ( first === 0 ) {\",\n+L\"\t\t\t\t\t\treturn diff === 0;\",\n+L\"\t\t\t\t\t} else {\",\n+L\"\t\t\t\t\t\treturn ( diff % first === 0 && diff \/ first >= 0 );\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t},\",\n+L\"\t\tID: function(elem, match){\",\n+L\"\t\t\treturn elem.nodeType === 1 && elem.getAttribute(\\\"id\\\") === match;\",\n+L\"\t\t},\",\n+L\"\t\tTAG: function(elem, match){\",\n+L\"\t\t\treturn (match === \\\"*\\\" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;\",\n+L\"\t\t},\",\n+L\"\t\tCLASS: function(elem, match){\",\n+L\"\t\t\treturn (\\\" \\\" + (elem.className || elem.getAttribute(\\\"class\\\")) + \\\" \\\")\",\n+L\"\t\t\t\t.indexOf( match ) > -1;\",\n+L\"\t\t},\",\n+L\"\t\tATTR: function(elem, match){\",\n+L\"\t\t\tvar name = match[1],\",\n+L\"\t\t\t\tresult = Expr.attrHandle[ name ] ?\",\n+L\"\t\t\t\t\tExpr.attrHandle[ name ]( elem ) :\",\n+L\"\t\t\t\t\telem[ name ] != null ?\",\n+L\"\t\t\t\t\t\telem[ name ] :\",\n+L\"\t\t\t\t\t\telem.getAttribute( name ),\",\n+L\"\t\t\t\tvalue = result + \\\"\\\",\",\n+L\"\t\t\t\ttype = match[2],\",\n+L\"\t\t\t\tcheck = match[4];\",\n+L\"\",\n+L\"\t\t\treturn result == null ?\",\n+L\"\t\t\t\ttype === \\\"!=\\\" :\",\n+L\"\t\t\t\ttype === \\\"=\\\" ?\",\n+L\"\t\t\t\tvalue === check :\",\n+L\"\t\t\t\ttype === \\\"*=\\\" ?\",\n+L\"\t\t\t\tvalue.indexOf(check) >= 0 :\",\n+L\"\t\t\t\ttype === \\\"~=\\\" ?\",\n+L\"\t\t\t\t(\\\" \\\" + value + \\\" \\\").indexOf(check) >= 0 :\",\n+L\"\t\t\t\t!check ?\",\n+L\"\t\t\t\tvalue && result !== false :\",\n+L\"\t\t\t\ttype === \\\"!=\\\" ?\",\n+L\"\t\t\t\tvalue !== check :\",\n+L\"\t\t\t\ttype === \\\"^=\\\" ?\",\n+L\"\t\t\t\tvalue.indexOf(check) === 0 :\",\n+L\"\t\t\t\ttype === \\\"$=\\\" ?\",\n+L\"\t\t\t\tvalue.substr(value.length - check.length) === check :\",\n+L\"\t\t\t\ttype === \\\"|=\\\" ?\",\n+L\"\t\t\t\tvalue === check || value.substr(0, check.length + 1) === check + \\\"-\\\" :\",\n+L\"\t\t\t\tfalse;\",\n+L\"\t\t},\",\n+L\"\t\tPOS: function(elem, match, i, array){\",\n+L\"\t\t\tvar name = match[2], filter = Expr.setFilters[ name ];\",\n+L\"\",\n+L\"\t\t\tif ( filter ) {\",\n+L\"\t\t\t\treturn filter( elem, i, match, array );\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"};\",\n+L\"\",\n+L\"var origPOS = Expr.match.POS,\",\n+L\"\tfescape = function(all, num){\",\n+L\"\t\treturn \\\"\\\\\\\\\\\" + (num - 0 + 1);\",\n+L\"\t};\",\n+L\"\",\n+L\"for ( var type in Expr.match ) {\",\n+L\"\tExpr.match[ type ] = new RegExp( Expr.match[ type ].source + (\/(?![^\\\\[]*\\\\])(?![^\\\\(]*\\\\))\/.source) );\",\n+L\"\tExpr.leftMatch[ type ] = new RegExp( \/(^(?:.|\\\\r|\\\\n)*?)\/.source + Expr.match[ type ].source.replace(\/\\\\\\\\(\\\\d+)\/g, fescape) );\",\n+L\"}\",\n+L\"\",\n+L\"var makeArray = function(array, results) {\",\n+L\"\tarray = Array.prototype.slice.call( array, 0 );\",\n+L\"\",\n+L\"\tif ( results ) {\",\n+L\"\t\tresults.push.apply( results, array );\",\n+L\"\t\treturn results;\",\n+L\"\t}\",\n+L\"\t\",\n+L\"\treturn array;\",\n+L\"};\",\n+L\"\",\n+L\"\/\/ Perform a simple check to determine if the browser is capable of\",\n+L\"\/\/ converting a NodeList to an array using builtin methods.\",\n+L\"\/\/ Also verifies that the returned array holds DOM nodes\",\n+L\"\/\/ (which is not the case in the Blackberry browser)\",\n+L\"try {\",\n+L\"\tArray.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;\",\n+L\"\",\n+L\"\/\/ Provide a fallback method if it does not work\",\n+L\"} catch(e){\",\n+L\"\tmakeArray = function(array, results) {\",\n+L\"\t\tvar ret = results || [], i = 0;\",\n+L\"\",\n+L\"\t\tif ( toString.call(array) === \\\"[object Array]\\\" ) {\",\n+L\"\t\t\tArray.prototype.push.apply( ret, array );\",\n+L\"\t\t} else {\",\n+L\"\t\t\tif ( typeof array.length === \\\"number\\\" ) {\",\n+L\"\t\t\t\tfor ( var l = array.length; i < l; i++ ) {\",\n+L\"\t\t\t\t\tret.push( array[i] );\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t} else {\",\n+L\"\t\t\t\tfor ( ; array[i]; i++ ) {\",\n+L\"\t\t\t\t\tret.push( array[i] );\",\n+L\"\t\t\t\t}\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\treturn ret;\",\n+L\"\t};\",\n+L\"}\",\n+L\"\",\n+L\"var sortOrder, siblingCheck;\",\n+L\"\",\n+L\"if ( document.documentElement.compareDocumentPosition ) {\",\n+L\"\tsortOrder = function( a, b ) {\",\n+L\"\t\tif ( a === b ) {\",\n+L\"\t\t\thasDuplicate = true;\",\n+L\"\t\t\treturn 0;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tif ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {\",\n+L\"\t\t\treturn a.compareDocumentPosition ? -1 : 1;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\treturn a.compareDocumentPosition(b) & 4 ? -1 : 1;\",\n+L\"\t};\",\n+L\"} else {\",\n+L\"\tsortOrder = function( a, b ) {\",\n+L\"\t\tvar ap = [], bp = [], aup = a.parentNode, bup = b.parentNode,\",\n+L\"\t\t\tcur = aup, al, bl;\",\n+L\"\",\n+L\"\t\t\/\/ The nodes are identical, we can exit early\",\n+L\"\t\tif ( a === b ) {\",\n+L\"\t\t\thasDuplicate = true;\",\n+L\"\t\t\treturn 0;\",\n+L\"\",\n+L\"\t\t\/\/ If the nodes are siblings (or identical) we can do a quick check\",\n+L\"\t\t} else if ( aup === bup ) {\",\n+L\"\t\t\treturn siblingCheck( a, b );\",\n+L\"\",\n+L\"\t\t\/\/ If no parents were found then the nodes are disconnected\",\n+L\"\t\t} else if ( !aup ) {\",\n+L\"\t\t\treturn -1;\",\n+L\"\",\n+L\"\t\t} else if ( !bup ) {\",\n+L\"\t\t\treturn 1;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\t\/\/ Otherwise they're somewhere else in the tree so we need\",\n+L\"\t\t\/\/ to build up a full list of the parentNodes for comparison\",\n+L\"\t\twhile ( cur ) {\",\n+L\"\t\t\tap.unshift( cur );\",\n+L\"\t\t\tcur = cur.parentNode;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tcur = bup;\",\n+L\"\",\n+L\"\t\twhile ( cur ) {\",\n+L\"\t\t\tbp.unshift( cur );\",\n+L\"\t\t\tcur = cur.parentNode;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tal = ap.length;\",\n+L\"\t\tbl = bp.length;\",\n+L\"\",\n+L\"\t\t\/\/ Start walking down the tree looking for a discrepancy\",\n+L\"\t\tfor ( var i = 0; i < al && i < bl; i++ ) {\",\n+L\"\t\t\tif ( ap[i] !== bp[i] ) {\",\n+L\"\t\t\t\treturn siblingCheck( ap[i], bp[i] );\",\n+L\"\t\t\t}\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\t\/\/ We ended someplace up the tree so do a sibling check\",\n+L\"\t\treturn i === al ?\",\n+L\"\t\t\tsiblingCheck( a, bp[i], -1 ) :\",\n+L\"\t\t\tsiblingCheck( ap[i], b, 1 );\",\n+L\"\t};\",\n+L\"\",\n+L\"\tsiblingCheck = function( a, b, ret ) {\",\n+L\"\t\tif ( a === b ) {\",\n+L\"\t\t\treturn ret;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tvar cur = a.nextSibling;\",\n+L\"\",\n+L\"\t\twhile ( cur ) {\",\n+L\"\t\t\tif ( cur === b ) {\",\n+L\"\t\t\t\treturn -1;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tcur = cur.nextSibling;\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\treturn 1;\",\n+L\"\t};\",\n+L\"}\",\n+L\"\",\n+L\"\/\/ Utility function for retreiving the text value of an array of DOM nodes\",\n+L\"Sizzle.getText = function( elems ) {\",\n+L\"\tvar ret = \\\"\\\", elem;\",\n+L\"\",\n+L\"\tfor ( var i = 0; elems[i]; i++ ) {\",\n+L\"\t\telem = elems[i];\",\n+L\"\",\n+L\"\t\t\/\/ Get the text from text nodes and CDATA nodes\",\n+L\"\t\tif ( elem.nodeType === 3 || elem.nodeType === 4 ) {\",\n+L\"\t\t\tret += elem.nodeValue;\",\n+L\"\",\n+L\"\t\t\/\/ Traverse everything else, except comment nodes\",\n+L\"\t\t} else if ( elem.nodeType !== 8 ) {\",\n+L\"\t\t\tret += Sizzle.getText( elem.childNodes );\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn ret;\",\n+L\"};\",\n+L\"\",\n+L\"\/\/ Check to see if the browser returns elements by name when\",\n+L\"\/\/ querying by getElementById (and provide a workaround)\",\n+L\"(function(){\",\n+L\"\t\/\/ We're going to inject a fake input element with a specified name\",\n+L\"\tvar form = document.createElement(\\\"div\\\"),\",\n+L\"\t\tid = \\\"script\\\" + (new Date()).getTime();\",\n+L\"\tform.innerHTML = \\\"<a name='\\\" + id + \\\"'\/>\\\";\",\n+L\"\",\n+L\"\t\/\/ Inject it into the root element, check its status, and remove it quickly\",\n+L\"\tvar root = document.documentElement;\",\n+L\"\troot.insertBefore( form, root.firstChild );\",\n+L\"\",\n+L\"\t\/\/ The workaround has to do additional checks after a getElementById\",\n+L\"\t\/\/ Which slows things down for other browsers (hence the branching)\",\n+L\"\tif ( document.getElementById( id ) ) {\",\n+L\"\t\tExpr.find.ID = function(match, context, isXML){\",\n+L\"\t\t\tif ( typeof context.getElementById !== \\\"undefined\\\" && !isXML ) {\",\n+L\"\t\t\t\tvar m = context.getElementById(match[1]);\",\n+L\"\t\t\t\treturn m ? m.id === match[1] || typeof m.getAttributeNode !== \\\"undefined\\\" && m.getAttributeNode(\\\"id\\\").nodeValue === match[1] ? [m] : undefined : [];\",\n+L\"\t\t\t}\",\n+L\"\t\t};\",\n+L\"\",\n+L\"\t\tExpr.filter.ID = function(elem, match){\",\n+L\"\t\t\tvar node = typeof elem.getAttributeNode !== \\\"undefined\\\" && elem.getAttributeNode(\\\"id\\\");\",\n+L\"\t\t\treturn elem.nodeType === 1 && node && node.nodeValue === match;\",\n+L\"\t\t};\",\n+L\"\t}\",\n+L\"\",\n+L\"\troot.removeChild( form );\",\n+L\"\troot = form = null; \/\/ release memory in IE\",\n+L\"})();\",\n+L\"\",\n+L\"(function(){\",\n+L\"\t\/\/ Check to see if the browser returns only elements\",\n+L\"\t\/\/ when doing getElementsByTagName(\\\"*\\\")\",\n+L\"\",\n+L\"\t\/\/ Create a fake element\",\n+L\"\tvar div = document.createElement(\\\"div\\\");\",\n+L\"\tdiv.appendChild( document.createComment(\\\"\\\") );\",\n+L\"\",\n+L\"\t\/\/ Make sure no comments are found\",\n+L\"\tif ( div.getElementsByTagName(\\\"*\\\").length > 0 ) {\",\n+L\"\t\tExpr.find.TAG = function(match, context){\",\n+L\"\t\t\tvar results = context.getElementsByTagName(match[1]);\",\n+L\"\",\n+L\"\t\t\t\/\/ Filter out possible comments\",\n+L\"\t\t\tif ( match[1] === \\\"*\\\" ) {\",\n+L\"\t\t\t\tvar tmp = [];\",\n+L\"\",\n+L\"\t\t\t\tfor ( var i = 0; results[i]; i++ ) {\",\n+L\"\t\t\t\t\tif ( results[i].nodeType === 1 ) {\",\n+L\"\t\t\t\t\t\ttmp.push( results[i] );\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tresults = tmp;\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\treturn results;\",\n+L\"\t\t};\",\n+L\"\t}\",\n+L\"\",\n+L\"\t\/\/ Check to see if an attribute returns normalized href attributes\",\n+L\"\tdiv.innerHTML = \\\"<a href='#'><\/a>\\\";\",\n+L\"\tif ( div.firstChild && typeof div.firstChild.getAttribute !== \\\"undefined\\\" &&\",\n+L\"\t\t\tdiv.firstChild.getAttribute(\\\"href\\\") !== \\\"#\\\" ) {\",\n+L\"\t\tExpr.attrHandle.href = function(elem){\",\n+L\"\t\t\treturn elem.getAttribute(\\\"href\\\", 2);\",\n+L\"\t\t};\",\n+L\"\t}\",\n+L\"\",\n+L\"\tdiv = null; \/\/ release memory in IE\",\n+L\"})();\",\n+L\"\",\n+L\"if ( document.querySelectorAll ) {\",\n+L\"\t(function(){\",\n+L\"\t\tvar oldSizzle = Sizzle, div = document.createElement(\\\"div\\\");\",\n+L\"\t\tdiv.innerHTML = \\\"<p class='TEST'><\/p>\\\";\",\n+L\"\",\n+L\"\t\t\/\/ Safari can't handle uppercase or unicode characters when\",\n+L\"\t\t\/\/ in quirks mode.\",\n+L\"\t\tif ( div.querySelectorAll && div.querySelectorAll(\\\".TEST\\\").length === 0 ) {\",\n+L\"\t\t\treturn;\",\n+L\"\t\t}\",\n+L\"\t\",\n+L\"\t\tSizzle = function(query, context, extra, seed){\",\n+L\"\t\t\tcontext = context || document;\",\n+L\"\",\n+L\"\t\t\t\/\/ Only use querySelectorAll on non-XML documents\",\n+L\"\t\t\t\/\/ (ID selectors don't work in non-HTML documents)\",\n+L\"\t\t\tif ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {\",\n+L\"\t\t\t\ttry {\",\n+L\"\t\t\t\t\treturn makeArray( context.querySelectorAll(query), extra );\",\n+L\"\t\t\t\t} catch(e){}\",\n+L\"\t\t\t}\",\n+L\"\t\t\",\n+L\"\t\t\treturn oldSizzle(query, context, extra, seed);\",\n+L\"\t\t};\",\n+L\"\",\n+L\"\t\tfor ( var prop in oldSizzle ) {\",\n+L\"\t\t\tSizzle[ prop ] = oldSizzle[ prop ];\",\n+L\"\t\t}\",\n+L\"\",\n+L\"\t\tdiv = null; \/\/ release memory in IE\",\n+L\"\t})();\",\n+L\"}\",\n+L\"\",\n+L\"(function(){\",\n+L\"\tvar div = document.createElement(\\\"div\\\");\",\n+L\"\",\n+L\"\tdiv.innerHTML = \\\"<div class='test e'><\/div><div class='test'><\/div>\\\";\",\n+L\"\",\n+L\"\t\/\/ Opera can't find a second classname (in 9.6)\",\n+L\"\t\/\/ Also, make sure that getElementsByClassName actually exists\",\n+L\"\tif ( !div.getElementsByClassName || div.getElementsByClassName(\\\"e\\\").length === 0 ) {\",\n+L\"\t\treturn;\",\n+L\"\t}\",\n+L\"\",\n+L\"\t\/\/ Safari caches class attributes, doesn't catch changes (in 3.2)\",\n+L\"\tdiv.lastChild.className = \\\"e\\\";\",\n+L\"\",\n+L\"\tif ( div.getElementsByClassName(\\\"e\\\").length === 1 ) {\",\n+L\"\t\treturn;\",\n+L\"\t}\",\n+L\"\t\",\n+L\"\tExpr.order.splice(1, 0, \\\"CLASS\\\");\",\n+L\"\tExpr.find.CLASS = function(match, context, isXML) {\",\n+L\"\t\tif ( typeof context.getElementsByClassName !== \\\"undefined\\\" && !isXML ) {\",\n+L\"\t\t\treturn context.getElementsByClassName(match[1]);\",\n+L\"\t\t}\",\n+L\"\t};\",\n+L\"\",\n+L\"\tdiv = null; \/\/ release memory in IE\",\n+L\"})();\",\n+L\"\",\n+L\"function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\",\n+L\"\tfor ( var i = 0, l = checkSet.length; i < l; i++ ) {\",\n+L\"\t\tvar elem = checkSet[i];\",\n+L\"\t\tif ( elem ) {\",\n+L\"\t\t\telem = elem[dir];\",\n+L\"\t\t\tvar match = false;\",\n+L\"\",\n+L\"\t\t\twhile ( elem ) {\",\n+L\"\t\t\t\tif ( elem.sizcache === doneName ) {\",\n+L\"\t\t\t\t\tmatch = checkSet[elem.sizset];\",\n+L\"\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( elem.nodeType === 1 && !isXML ){\",\n+L\"\t\t\t\t\telem.sizcache = doneName;\",\n+L\"\t\t\t\t\telem.sizset = i;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( elem.nodeName.toLowerCase() === cur ) {\",\n+L\"\t\t\t\t\tmatch = elem;\",\n+L\"\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\telem = elem[dir];\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tcheckSet[i] = match;\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"}\",\n+L\"\",\n+L\"function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {\",\n+L\"\tfor ( var i = 0, l = checkSet.length; i < l; i++ ) {\",\n+L\"\t\tvar elem = checkSet[i];\",\n+L\"\t\tif ( elem ) {\",\n+L\"\t\t\telem = elem[dir];\",\n+L\"\t\t\tvar match = false;\",\n+L\"\",\n+L\"\t\t\twhile ( elem ) {\",\n+L\"\t\t\t\tif ( elem.sizcache === doneName ) {\",\n+L\"\t\t\t\t\tmatch = checkSet[elem.sizset];\",\n+L\"\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\tif ( elem.nodeType === 1 ) {\",\n+L\"\t\t\t\t\tif ( !isXML ) {\",\n+L\"\t\t\t\t\t\telem.sizcache = doneName;\",\n+L\"\t\t\t\t\t\telem.sizset = i;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t\tif ( typeof cur !== \\\"string\\\" ) {\",\n+L\"\t\t\t\t\t\tif ( elem === cur ) {\",\n+L\"\t\t\t\t\t\t\tmatch = true;\",\n+L\"\t\t\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\t\t} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {\",\n+L\"\t\t\t\t\t\tmatch = elem;\",\n+L\"\t\t\t\t\t\tbreak;\",\n+L\"\t\t\t\t\t}\",\n+L\"\t\t\t\t}\",\n+L\"\",\n+L\"\t\t\t\telem = elem[dir];\",\n+L\"\t\t\t}\",\n+L\"\",\n+L\"\t\t\tcheckSet[i] = match;\",\n+L\"\t\t}\",\n+L\"\t}\",\n+L\"}\",\n+L\"\",\n+L\"Sizzle.contains = document.compareDocumentPosition ? function(a, b){\",\n+L\"\treturn !!(a.compareDocumentPosition(b) & 16);\",\n+L\"} : function(a, b){\",\n+L\"\treturn a !== b && (a.contains ? a.contains(b) : true);\",\n+L\"};\",\n+L\"\",\n+L\"Sizzle.isXML = function(elem){\",\n+L\"\t\/\/ documentElement is verified for cases where it doesn't yet exist\",\n+L\"\t\/\/ (such as loading iframes in IE - #4833) \",\n+L\"\tvar documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;\",\n+L\"\treturn documentElement ? documentElement.nodeName !== \\\"HTML\\\" : false;\",\n+L\"};\",\n+L\"\",\n+L\"var posProcess = function(selector, context){\",\n+L\"\tvar tmpSet = [], later = \\\"\\\", match,\",\n+L\"\t\troot = context.nodeType ? [context] : context;\",\n+L\"\",\n+L\"\t\/\/ Position selectors must be done after the filter\",\n+L\"\t\/\/ And so must :not(positional) so we move all PSEUDOs to the end\",\n+L\"\twhile ( (match = Expr.match.PSEUDO.exec( selector )) ) {\",\n+L\"\t\tlater += match[0];\",\n+L\"\t\tselector = selector.replace( Expr.match.PSEUDO, \\\"\\\" );\",\n+L\"\t}\",\n+L\"\",\n+L\"\tselector = Expr.relative[selector] ? selector + \\\"*\\\" : selector;\",\n+L\"\",\n+L\"\tfor ( var i = 0, l = root.length; i < l; i++ ) {\",\n+L\"\t\tSizzle( selector, root[i], tmpSet );\",\n+L\"\t}\",\n+L\"\",\n+L\"\treturn Sizzle.filter( later, tmpSet );\",\n+L\"};\",\n+L\"\",\n+L\"\/\/ EXPOSE\",\n+L\"\",\n+L\"window.Sizzle = Sizzle;\",\n+L\"\",\n+L\"})();\",\n+NULL\n+};\n+\n+#endif\n"} {"commit":"bf05f29740bc68de8cd4f47210a8ae6fca09d4d2","subject":"Added test for allocating ll_element with data","message":"Added test for allocating ll_element with data\n","repos":"waysome\/libreset,waysome\/libreset","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/ll\/ll_test.c\n+++ tests\/ll\/ll_test.c\n@@ -60,6 +60,19 @@\n }\n END_TEST\n \n+START_TEST (test_ll_element_alloc_new) {\n+ int data = 3;\n+ struct ll_element* el = ll_element_alloc_new(&data);\n+\n+ ck_assert_ptr_ne(el, NULL);\n+ ck_assert_ptr_eq(el->data, &data);\n+ ck_assert_int_eq(*((int*) el->data), data);\n+ ck_assert_ptr_eq(el->next, NULL);\n+\n+ free(el);\n+}\n+END_TEST\n+\n Suite*\n suite_ll_create(void) {\n Suite* s;\n@@ -74,6 +87,7 @@\n tcase_add_test(case_insert, test_ll_insert_multiple);\n \n tcase_add_test(case_insert, test_ll_element_alloc);\n+ tcase_add_test(case_insert, test_ll_element_alloc_new);\n \n \/* Adding test cases to suite *\/\n suite_add_tcase(s, case_insert);\n"} {"commit":"21009686662fd21412ca35def7cb3cc8346e1c3d","subject":"net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function","message":"net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function\n\nOn the one hand, phy_device.c provides a generic reset function if the phy\ndriver does not provide a soft_reset pointer. This generic reset does not take\ninto account the state of the phy, with a potential failure if the phy is in\npowerdown mode. On the other hand, smsc driver provides a function with both\ncorrect reset behaviour and configuration.\n\nThis patch moves the reset part into a new smsc_phy_reset function and provides\nthe soft_reset pointer to have a correct reset behaviour by default.\n\nSigned-off-by: Gwenhael Goavec-Merou <795f300ad10bb99fa929ce5b21a5b6eba1d65a5b@armadeus.com>\nReviewed-by: Florian Fainelli <59190c1867e3222b932a0de3c668eb2d980d69a2@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/phy\/smsc.c\n+++ drivers\/net\/phy\/smsc.c\n@@ -42,6 +42,22 @@\n }\n \n static int smsc_phy_config_init(struct phy_device *phydev)\n+{\n+\tint rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);\n+\n+\tif (rc < 0)\n+\t\treturn rc;\n+\n+\t\/* Enable energy detect mode for this SMSC Transceivers *\/\n+\trc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,\n+\t\t rc | MII_LAN83C185_EDPWRDOWN);\n+\tif (rc < 0)\n+\t\treturn rc;\n+\n+\treturn smsc_phy_ack_interrupt(phydev);\n+}\n+\n+static int smsc_phy_reset(struct phy_device *phydev)\n {\n \tint rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES);\n \tif (rc < 0)\n@@ -66,18 +82,7 @@\n \t\t\trc = phy_read(phydev, MII_BMCR);\n \t\t} while (rc & BMCR_RESET);\n \t}\n-\n-\trc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);\n-\tif (rc < 0)\n-\t\treturn rc;\n-\n-\t\/* Enable energy detect mode for this SMSC Transceivers *\/\n-\trc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,\n-\t\t rc | MII_LAN83C185_EDPWRDOWN);\n-\tif (rc < 0)\n-\t\treturn rc;\n-\n-\treturn smsc_phy_ack_interrupt (phydev);\n+\treturn 0;\n }\n \n static int lan911x_config_init(struct phy_device *phydev)\n@@ -142,6 +147,7 @@\n \t.config_aneg\t= genphy_config_aneg,\n \t.read_status\t= genphy_read_status,\n \t.config_init\t= smsc_phy_config_init,\n+\t.soft_reset\t= smsc_phy_reset,\n \n \t\/* IRQ related *\/\n \t.ack_interrupt\t= smsc_phy_ack_interrupt,\n@@ -164,6 +170,7 @@\n \t.config_aneg\t= genphy_config_aneg,\n \t.read_status\t= genphy_read_status,\n \t.config_init\t= smsc_phy_config_init,\n+\t.soft_reset\t= smsc_phy_reset,\n \n \t\/* IRQ related *\/\n \t.ack_interrupt\t= smsc_phy_ack_interrupt,\n@@ -186,6 +193,7 @@\n \t.config_aneg\t= genphy_config_aneg,\n \t.read_status\t= genphy_read_status,\n \t.config_init\t= smsc_phy_config_init,\n+\t.soft_reset\t= smsc_phy_reset,\n \n \t\/* IRQ related *\/\n \t.ack_interrupt\t= smsc_phy_ack_interrupt,\n@@ -230,6 +238,7 @@\n \t.config_aneg\t= genphy_config_aneg,\n \t.read_status\t= lan87xx_read_status,\n \t.config_init\t= smsc_phy_config_init,\n+\t.soft_reset\t= smsc_phy_reset,\n \n \t\/* IRQ related *\/\n \t.ack_interrupt\t= smsc_phy_ack_interrupt,\n"} {"commit":"9f25d0074236dfe2a56be7caf42fba8df91dcee4","subject":"drm\/i915: Don't cast void* pointers","message":"drm\/i915: Don't cast void* pointers\n\nThat's not necessary and makes the code not as neat as it could be.\n\nSigned-off-by: Damien Lespiau <64bd3cb94f359c1a3ce68dae5e26b40578526277@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b46773221547cf8a75c12e6c2c507885d8622d87","subject":"Wrong number of arguments","message":"Wrong number of arguments\n","repos":"mafintosh\/sodium-native,mafintosh\/sodium-native,sodium-friends\/sodium-native,sodium-friends\/sodium-native,mafintosh\/sodium-native,sodium-friends\/sodium-native,mafintosh\/sodium-native","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- binding.c\n+++ binding.c\n@@ -730,7 +730,7 @@\n }\n \n napi_value sn_crypto_stream_chacha20_xor_ic(napi_env env, napi_callback_info info) {\n- SN_ARGV(4, crypto_stream_chacha20_xor_ic)\n+ SN_ARGV(5, crypto_stream_chacha20_xor_ic)\n \n SN_ARGV_TYPEDARRAY(c, 0)\n SN_ARGV_TYPEDARRAY(m, 1)\n@@ -774,7 +774,7 @@\n }\n \n napi_value sn_crypto_stream_chacha20_ietf_xor_ic(napi_env env, napi_callback_info info) {\n- SN_ARGV(4, crypto_stream_chacha20_ietf_xor)\n+ SN_ARGV(5, crypto_stream_chacha20_ietf_xor)\n \n SN_ARGV_TYPEDARRAY(c, 0)\n SN_ARGV_TYPEDARRAY(m, 1)\n"} {"commit":"99427747fbd0b29f2bebc74c697acfd435fecc3f","subject":"ppp: use for_each_set_bit_from","message":"ppp: use for_each_set_bit_from\n\nUse for_each_set_bit_from to iterate over all the set bit in a memory\nregion.\n\nSigned-off-by: Akinobu Mita <3807cf899f217da549814bf6c330d3b6e6819ccf@gmail.com>\nCc: Dmitry Kozlov <0dce0eab5aff285c8403d2fcf7f4b2c05116df28@mail.ru>\nCc: 1099b3bee480025a15c1b622ecdea77a1d6d7166@vger.kernel.org\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ppp\/pptp.c\n+++ drivers\/net\/ppp\/pptp.c\n@@ -116,8 +116,8 @@\n \tint i;\n \n \trcu_read_lock();\n-\tfor (i = find_next_bit(callid_bitmap, MAX_CALLID, 1); i < MAX_CALLID;\n-\t i = find_next_bit(callid_bitmap, MAX_CALLID, i + 1)) {\n+\ti = 1;\n+\tfor_each_set_bit_from(i, callid_bitmap, MAX_CALLID) {\n \t\tsock = rcu_dereference(callid_sock[i]);\n \t\tif (!sock)\n \t\t\tcontinue;\n"} {"commit":"5db6c735ead5e6d22caf95ad52f801d23c4d0199","subject":"drm\/i915: dmesg output for VT-d testing","message":"drm\/i915: dmesg output for VT-d testing\n\nOur validation guys want to have a positive proof that the gfx driver\nis indeed using VT-d, since setting up a gfx stack, especially in\nearly bring-up and by people not versed in linux gfx is a bit tricky.\nSo provide just that.\n\nCc: David Woodhouse <97b3379caa91f4ee97e44013ae4dc6350540fa9d@infradead.org>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"615c14b6f8f7ac30c36377f7646551f009a07fed","subject":"SignedCapsulePkg\/Include: Add PlatformFlashAccessLib header.","message":"SignedCapsulePkg\/Include: Add PlatformFlashAccessLib header.\n\nThis library is used to abstract platform flash access.\nThis library is consumed by a capsule update module.\nIt may cover SystemFirmware region and\/or non-SystemFirmware region.\n\nCc: Feng Tian <e66bb7e9f36c82a029035c5885acf75500d07e68@intel.com>\nCc: Star Zeng <5c6bb72efe464613af94e84c05522a361b23844a@intel.com>\nCc: Michael D Kinney <fd20bc543a9f65bb633fac7d08a403c1f1c8eb6c@intel.com>\nCc: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>\nCc: Chao Zhang <fed49a7a524fbe970930fd44cd2de5a9d4952d81@intel.com>\nContributed-under: TianoCore Contribution Agreement 1.0\nSigned-off-by: Jiewen Yao <364a90bfebd1f362ebb7b48e4bf8ec010adef203@intel.com>\nReviewed-by: Liming Gao <6480311aeeb4b006862f6d13ebabddc03f51e507@intel.com>\nReviewed-by: Michael Kinney <fd20bc543a9f65bb633fac7d08a403c1f1c8eb6c@intel.com>\nTested-by: Michael Kinney <fd20bc543a9f65bb633fac7d08a403c1f1c8eb6c@intel.com>\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":1,"stderr":"error: pathspec 'SignedCapsulePkg\/Include\/Library\/PlatformFlashAccessLib.h' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- SignedCapsulePkg\/Include\/Library\/PlatformFlashAccessLib.h\n+++ SignedCapsulePkg\/Include\/Library\/PlatformFlashAccessLib.h\n@@ -0,0 +1,57 @@\n+\/** @file\r\n+ Platform flash device access library.\r\n+\r\n+ Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r\n+ This program and the accompanying materials\r\n+ are licensed and made available under the terms and conditions of the BSD License\r\n+ which accompanies this distribution. The full text of the license may be found at\r\n+ http:\/\/opensource.org\/licenses\/bsd-license.php\r\n+\r\n+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS,\r\n+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r\n+\r\n+**\/\r\n+\r\n+\r\n+#ifndef __PLATFORM_FLASH_ACCESS_LIB_H__\r\n+#define __PLATFORM_FLASH_ACCESS_LIB_H__\r\n+\r\n+typedef enum {\r\n+ FlashAddressTypeRelativeAddress,\r\n+ FlashAddressTypeAbsoluteAddress,\r\n+} FLASH_ADDRESS_TYPE;\r\n+\r\n+\/\/\r\n+\/\/ Type 0 ~ 0x7FFFFFFF is defined in this library.\r\n+\/\/ Type 0x80000000 ~ 0xFFFFFFFF is reserved for OEM.\r\n+\/\/\r\n+typedef enum {\r\n+ PlatformFirmwareTypeSystemFirmware,\r\n+ PlatformFirmwareTypeNvRam,\r\n+} PLATFORM_FIRMWARE_TYPE;\r\n+\r\n+\/**\r\n+ Perform flash write opreation.\r\n+\r\n+ @param[in] FirmwareType The type of firmware.\r\n+ @param[in] FlashAddress The address of flash device to be accessed.\r\n+ @param[in] FlashAddressType The type of flash device address.\r\n+ @param[in] Buffer The pointer to the data buffer.\r\n+ @param[in] Length The length of data buffer in bytes.\r\n+\r\n+ @retval EFI_SUCCESS The operation returns successfully.\r\n+ @retval EFI_WRITE_PROTECTED The flash device is read only.\r\n+ @retval EFI_UNSUPPORTED The flash device access is unsupported.\r\n+ @retval EFI_INVALID_PARAMETER The input parameter is not valid.\r\n+**\/\r\n+EFI_STATUS\r\n+EFIAPI\r\n+PerformFlashWrite (\r\n+ IN PLATFORM_FIRMWARE_TYPE FirmwareType,\r\n+ IN EFI_PHYSICAL_ADDRESS FlashAddress,\r\n+ IN FLASH_ADDRESS_TYPE FlashAddressType,\r\n+ IN VOID *Buffer,\r\n+ IN UINTN Length\r\n+ );\r\n+\r\n+#endif\r\n"} {"commit":"e038e8bbcf6e55cfcc34dab706d371e23d955832","subject":"Add declaration of GC Internal Collect to header.","message":"Add declaration of GC Internal Collect to header.\n","repos":"gabordemooij\/citrine,gabordemooij\/citrine,takano32\/citrine,takano32\/citrine,takano32\/citrine,gabordemooij\/citrine","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- citrine.h\n+++ citrine.h\n@@ -598,7 +598,7 @@\n ctr_object* ctr_build_bool(int truth);\n ctr_object* ctr_build_nil();\n ctr_object* ctr_build_string_from_cstring( char* str );\n-\n+void ctr_gc_internal_collect();\n \n \/**\n * Citrine Macros\n"} {"commit":"e6358135147807351db3b7782d3e198a1bba8b62","subject":"pppol2tp: Add missing sock_put() in pppol2tp_release()","message":"pppol2tp: Add missing sock_put() in pppol2tp_release()\n\npppol2tp_sock_to_session() do sock_hold() if the session to release is\nnot NULL.\n\nSigned-off-by: Fr\u00e9d\u00e9ric Moulins <02c6a4c5d68c4ee421258b352f5e09edf309b49d@alsatis.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/pppol2tp.c\n+++ drivers\/net\/pppol2tp.c\n@@ -1353,6 +1353,7 @@\n \t\t\tkfree_skb(skb);\n \t\t\tsock_put(sk);\n \t\t}\n+\t\tsock_put(sk);\n \t}\n \n \trelease_sock(sk);\n"} {"commit":"94ec8f6130ef4fdce1c80ca6bdeeef103a239a7c","subject":"drm\/i915\/bdw: Add GTT functions","message":"drm\/i915\/bdw: Add GTT functions\n\nWith the PTE clarifications, the bind and clear functions can now be\nadded for gen8.\n\nv2: Use for_each_sg_pages in gen8_ggtt_insert_entries.\n\nv3: Drop dev argument to pte encode functions, upstream lost it. Also\nrebase on top of the scratch page movement.\n\nv4: Rebase on top of the new address space vfuncs.\n\nv5: Add the bool use_scratch argument to clear_range and the bool valid argument\nto the PTE encode function to follow upstream changes.\n\nv6: Add a FIXME(BDW) about the size mismatch of the readback check\nthat Jon Bloomfield spotted.\n\nv7: Squash in fixup patch from Ben for the posting read to match the\n64bit ptes and so shut up the WARN.\n\nSigned-off-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net> (v1)\nReviewed-by: Imre Deak <fbd5edba1988036c8923f0cca0cce6ac4811db29@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2f7826c02447480c7c1b5500b34fc783f1ed8145","subject":"[WAN] cosa.c: Build fix.","message":"[WAN] cosa.c: Build fix.\n\nCaused by skb_reset_mac_header() changes, missing semicolon.\n\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wan\/cosa.c\n+++ drivers\/net\/wan\/cosa.c\n@@ -776,7 +776,7 @@\n \t}\n \tchan->rx_skb->protocol = htons(ETH_P_WAN_PPP);\n \tchan->rx_skb->dev = chan->pppdev.dev;\n-\tskb_reset_mac_header(chan->rx_skb)\n+\tskb_reset_mac_header(chan->rx_skb);\n \tchan->stats.rx_packets++;\n \tchan->stats.rx_bytes += chan->cosa->rxsize;\n \tnetif_rx(chan->rx_skb);\n"} {"commit":"b42218c19f3c57d2272241e3b4944a6af0d5f14a","subject":"drm\/i915\/bdw: Don't muck with gtt_size on Gen8 when PPGTT setup fails","message":"drm\/i915\/bdw: Don't muck with gtt_size on Gen8 when PPGTT setup fails\n\nv2: Resolve rebase conflicts and switch to gen < 8 color for GenX\nchecking.\n\nv3: Rebase on top of the address space refactoring.\n\nReviewed-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\nSigned-off-by: Ville Syrj\u00e4l\u00e4 <cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com> (v1)\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"307e5caf6fb1dac1b9cfa1d78138d77e46517b56","subject":"NFC: trf7970a: Add '_in_' to initiator routines","message":"NFC: trf7970a: Add '_in_' to initiator routines\n\nRename trf7970a_config_rf_tech() and trf7970a_config_framing()\nto trf7970a_in_config_rf_tech() and trf7970a_in_config_framing(),\nrespectively to avoid confusion when target support is added.\n\nSigned-off-by: Mark A. Greer <2540a8c57225c2058d000de41debc8b502ea4a38@animalcreek.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/nfc\/trf7970a.c\n+++ drivers\/nfc\/trf7970a.c\n@@ -941,7 +941,7 @@\n \treturn ret;\n }\n \n-static int trf7970a_config_rf_tech(struct trf7970a *trf, int tech)\n+static int trf7970a_in_config_rf_tech(struct trf7970a *trf, int tech)\n {\n \tint ret = 0;\n \n@@ -983,7 +983,7 @@\n \treturn ret;\n }\n \n-static int trf7970a_config_framing(struct trf7970a *trf, int framing)\n+static int trf7970a_in_config_framing(struct trf7970a *trf, int framing)\n {\n \tu8 iso_ctrl = trf->iso_ctrl_tech;\n \tint ret;\n@@ -1065,10 +1065,10 @@\n \n \tswitch (type) {\n \tcase NFC_DIGITAL_CONFIG_RF_TECH:\n-\t\tret = trf7970a_config_rf_tech(trf, param);\n+\t\tret = trf7970a_in_config_rf_tech(trf, param);\n \t\tbreak;\n \tcase NFC_DIGITAL_CONFIG_FRAMING:\n-\t\tret = trf7970a_config_framing(trf, param);\n+\t\tret = trf7970a_in_config_framing(trf, param);\n \t\tbreak;\n \tdefault:\n \t\tdev_dbg(trf->dev, \"Unknown type: %d\\n\", type);\n"} {"commit":"5135d64b7f0c91c69af3147e5c93eec05f80b820","subject":"drm\/i915\/vlv: Update Wait for FIFO and wait for 20 free entries. v3","message":"drm\/i915\/vlv: Update Wait for FIFO and wait for 20 free entries. v3\n\nOn VLV, FIFO will be shared by both SW and HW. So, we read the\nfree entries through register and update dev_priv variable\nand wait for only 20 entries to be free\n\nFrom Deepak's follow-up mail explaining why vlv is special:\n\n\"On SB, Out of 64 FIFO Entries, 20 Entries will be used by HW and\nremaining 44 will be used by the SW,. I think due to this reason, we\nhave a threshold of 20 Entries.\"\n\n\"On VLV, HW and SW can access all 64 fifo entries, I don't think\nhaving a threshold of 20 Entries is mandatory on VLV. Also, since both\nSW and HW can access all 64 Entries. I think on VLV, we need to update\nthe fifo_count before waiting for the FIFO.\"\n\nv2: Apply mask when we read the number of free FIFO entries (Ville).\n\nv3: Mask applied after reading the register (Deepak).\n\nSigned-off-by: Deepak S <b64e3b722d60644e9e2f2e15d0b99e87ffd5f23c@intel.com>\n[danvet: Add further explanation from Deepak to commit message.]\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a2ee967f74a74e45ffaa599b5b0ee012aa0007a4","subject":"Fix gas read \/ write in Windows","message":"Fix gas read \/ write in Windows\n\ngas read \/ write commands fail in Windows either silently or with error messages. This is because \"CFG_SIZE_SUFFIX\" is used as the argument type for address \/ count arguments, which parses them as 64-bit ssize_t types, but the variables are declared as 32-bit longs. The argument values are then parsed incorrectly.\n\nThe fix is to change the \"count\" variables to size_t types, and change address argument types back to CFG_LONG_SUFFIX as GAS addresses are always 32 bits.\n","repos":"Microsemi\/switchtec-user,Microsemi\/switchtec-user","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cli\/gas.c\n+++ cli\/gas.c\n@@ -282,7 +282,7 @@\n \n \tstatic struct {\n \t\tstruct switchtec_dev *dev;\n-\t\tint count;\n+\t\tsize_t count;\n \t\tint text;\n \t} cfg = {};\n \tconst struct argconfig_options opts[] = {\n@@ -404,7 +404,7 @@\n \tstatic struct {\n \t\tstruct switchtec_dev *dev;\n \t\tunsigned long addr;\n-\t\tunsigned long count;\n+\t\tsize_t count;\n \t\tunsigned bytes;\n \t\tunsigned print_style;\n \t} cfg = {\n@@ -414,7 +414,7 @@\n \t};\n \tconst struct argconfig_options opts[] = {\n \t\tDEVICE_OPTION,\n-\t\t{\"addr\", 'a', \"ADDR\", CFG_SIZE_SUFFIX, &cfg.addr, required_argument,\n+\t\t{\"addr\", 'a', \"ADDR\", CFG_LONG_SUFFIX, &cfg.addr, required_argument,\n \t\t \"address to read\"},\n \t\t{\"bytes\", 'b', \"NUM\", CFG_POSITIVE, &cfg.bytes, required_argument,\n \t\t \"number of bytes to read per access (default 4)\"},\n@@ -468,7 +468,7 @@\n \t};\n \tconst struct argconfig_options opts[] = {\n \t\tDEVICE_OPTION,\n-\t\t{\"addr\", 'a', \"ADDR\", CFG_SIZE_SUFFIX, &cfg.addr, required_argument,\n+\t\t{\"addr\", 'a', \"ADDR\", CFG_LONG_SUFFIX, &cfg.addr, required_argument,\n \t\t \"address to write\"},\n \t\t{\"bytes\", 'b', \"NUM\", CFG_POSITIVE, &cfg.bytes, required_argument,\n \t\t \"number of bytes to write (default 4)\"},\n"} {"commit":"ab20440c376ff0454cb93904a888212d874fbb6b","subject":"ACPI\/PCI: Fix return value of acpi_cuery_osc()","message":"ACPI\/PCI: Fix return value of acpi_cuery_osc()\n\nIf acpi_query_osc() returns other than AE_OK, __pci_osc_support_set()\nstops scanning ACPI objects to evaluate _OSC. This prevents subsequent\n_OSCs from being evaluated if some of root bridge doesn't have _OSC, for\nexample. So acpi_query_osc() should return always AE_OK to evaluate all\n_OSC.\n\nSigned-off-by: Kenji Kaneshige <06fb390d28d4d3a1c65b19c7f623121e2bb09dfc@jp.fujitsu.com>\nSigned-off-by: Taku Izumi <23ca3fc138fbd3784aec73bbc7a412bdd1fcadfc@jp.fujitsu.com>\nSigned-off-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/pci\/pci-acpi.c\n+++ drivers\/pci\/pci-acpi.c\n@@ -149,20 +149,19 @@\n \n \tstatus = acpi_get_handle(handle, \"_OSC\", &tmp);\n \tif (ACPI_FAILURE(status))\n-\t\treturn status;\n+\t\treturn AE_OK;\n \n \tmutex_lock(&pci_acpi_lock);\n \tosc_data = acpi_get_osc_data(handle);\n \tif (!osc_data) {\n \t\tprintk(KERN_ERR \"acpi osc data array is full\\n\");\n-\t\tstatus = AE_ERROR;\n \t\tgoto out;\n \t}\n \n-\tstatus = __acpi_query_osc(flags, osc_data, &dummy);\n+\t__acpi_query_osc(flags, osc_data, &dummy);\n out:\n \tmutex_unlock(&pci_acpi_lock);\n-\treturn status;\n+\treturn AE_OK;\n }\n \n \/**\n"} {"commit":"af24663bc8204695181cf3b92b7129efadd8d455","subject":"IB\/srp: Fix kernel-doc warnings","message":"IB\/srp: Fix kernel-doc warnings\n\nAvoid that the kernel-doc tool warns about missing argument\ndescriptions for the ib_srp.[ch] source files.\n\nSigned-off-by: Bart Van Assche <89ed62d80e76c0eb24ee0d6433b48a91c2273b5e@acm.org>\nReviewed-by: Sagi Grimberg <380ce2a82d3d08e67ab163b51dc6d30288ad3f13@mellanox.com>\nSigned-off-by: Roland Dreier <0d270388f2f92757a5de0f4bd891d3b392c44c4f@purestorage.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/infiniband\/ulp\/srp\/ib_srp.c\n+++ drivers\/infiniband\/ulp\/srp\/ib_srp.c\n@@ -813,6 +813,10 @@\n \n \/**\n * srp_free_req() - Unmap data and add request to the free request list.\n+ * @target: SRP target port.\n+ * @req: Request to be freed.\n+ * @scmnd: SCSI command associated with @req.\n+ * @req_lim_delta: Amount to be added to @target->req_lim.\n *\/\n static void srp_free_req(struct srp_target_port *target,\n \t\t\t struct srp_request *req, struct scsi_cmnd *scmnd,\n@@ -1455,6 +1459,7 @@\n \n \/**\n * srp_tl_err_work() - handle a transport layer error\n+ * @work: Work structure embedded in an SRP target port.\n *\n * Note: This function may get invoked before the rport has been created,\n * hence the target->rport test.\n@@ -2316,6 +2321,8 @@\n \n \/**\n * srp_conn_unique() - check whether the connection to a target is unique\n+ * @host: SRP host.\n+ * @target: SRP target port.\n *\/\n static bool srp_conn_unique(struct srp_host *host,\n \t\t\t struct srp_target_port *target)\n"} {"commit":"be81b4a4838ce329b9f3978c7fc007b047c23722","subject":"PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table","message":"PNP: convert resource checks to use pnp_get_resource(), not pnp_resource_table\n\nThis removes more direct references to pnp_resource_table.\n\nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nAcked-By: Rene Herman <dcd54769cf064dac10622aa4d4168ce7b07989b9@gmail.com>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pnp\/resource.c\n+++ drivers\/pnp\/resource.c\n@@ -270,8 +270,8 @@\n \n \t\/* check for internal conflicts *\/\n \tfor (i = 0; i < PNP_MAX_PORT; i++) {\n-\t\ttres = &dev->res.port_resource[i];\n-\t\tif (tres != res && tres->flags & IORESOURCE_IO) {\n+\t\ttres = pnp_get_resource(dev, IORESOURCE_IO, i);\n+\t\tif (tres && tres != res && tres->flags & IORESOURCE_IO) {\n \t\t\ttport = &tres->start;\n \t\t\ttend = &tres->end;\n \t\t\tif (ranged_conflict(port, end, tport, tend))\n@@ -284,8 +284,8 @@\n \t\tif (tdev == dev)\n \t\t\tcontinue;\n \t\tfor (i = 0; i < PNP_MAX_PORT; i++) {\n-\t\t\ttres = &tdev->res.port_resource[i];\n-\t\t\tif (tres->flags & IORESOURCE_IO) {\n+\t\t\ttres = pnp_get_resource(tdev, IORESOURCE_IO, i);\n+\t\t\tif (tres && tres->flags & IORESOURCE_IO) {\n \t\t\t\tif (cannot_compare(tres->flags))\n \t\t\t\t\tcontinue;\n \t\t\t\ttport = &tres->start;\n@@ -330,8 +330,8 @@\n \n \t\/* check for internal conflicts *\/\n \tfor (i = 0; i < PNP_MAX_MEM; i++) {\n-\t\ttres = &dev->res.mem_resource[i];\n-\t\tif (tres != res && tres->flags & IORESOURCE_MEM) {\n+\t\ttres = pnp_get_resource(dev, IORESOURCE_MEM, i);\n+\t\tif (tres && tres != res && tres->flags & IORESOURCE_MEM) {\n \t\t\ttaddr = &tres->start;\n \t\t\ttend = &tres->end;\n \t\t\tif (ranged_conflict(addr, end, taddr, tend))\n@@ -344,8 +344,8 @@\n \t\tif (tdev == dev)\n \t\t\tcontinue;\n \t\tfor (i = 0; i < PNP_MAX_MEM; i++) {\n-\t\t\ttres = &tdev->res.mem_resource[i];\n-\t\t\tif (tres->flags & IORESOURCE_MEM) {\n+\t\t\ttres = pnp_get_resource(tdev, IORESOURCE_MEM, i);\n+\t\t\tif (tres && tres->flags & IORESOURCE_MEM) {\n \t\t\t\tif (cannot_compare(tres->flags))\n \t\t\t\t\tcontinue;\n \t\t\t\ttaddr = &tres->start;\n@@ -389,8 +389,8 @@\n \n \t\/* check for internal conflicts *\/\n \tfor (i = 0; i < PNP_MAX_IRQ; i++) {\n-\t\ttres = &dev->res.irq_resource[i];\n-\t\tif (tres != res && tres->flags & IORESOURCE_IRQ) {\n+\t\ttres = pnp_get_resource(dev, IORESOURCE_IRQ, i);\n+\t\tif (tres && tres != res && tres->flags & IORESOURCE_IRQ) {\n \t\t\tif (tres->start == *irq)\n \t\t\t\treturn 0;\n \t\t}\n@@ -423,8 +423,8 @@\n \t\tif (tdev == dev)\n \t\t\tcontinue;\n \t\tfor (i = 0; i < PNP_MAX_IRQ; i++) {\n-\t\t\ttres = &tdev->res.irq_resource[i];\n-\t\t\tif (tres->flags & IORESOURCE_IRQ) {\n+\t\t\ttres = pnp_get_resource(tdev, IORESOURCE_IRQ, i);\n+\t\t\tif (tres && tres->flags & IORESOURCE_IRQ) {\n \t\t\t\tif (cannot_compare(tres->flags))\n \t\t\t\t\tcontinue;\n \t\t\t\tif (tres->start == *irq)\n@@ -462,8 +462,8 @@\n \n \t\/* check for internal conflicts *\/\n \tfor (i = 0; i < PNP_MAX_DMA; i++) {\n-\t\ttres = &dev->res.dma_resource[i];\n-\t\tif (tres != res && tres->flags & IORESOURCE_DMA) {\n+\t\ttres = pnp_get_resource(dev, IORESOURCE_DMA, i);\n+\t\tif (tres && tres != res && tres->flags & IORESOURCE_DMA) {\n \t\t\tif (tres->start == *dma)\n \t\t\t\treturn 0;\n \t\t}\n@@ -482,8 +482,8 @@\n \t\tif (tdev == dev)\n \t\t\tcontinue;\n \t\tfor (i = 0; i < PNP_MAX_DMA; i++) {\n-\t\t\ttres = &tdev->res.dma_resource[i];\n-\t\t\tif (tres->flags & IORESOURCE_DMA) {\n+\t\t\ttres = pnp_get_resource(tdev, IORESOURCE_DMA, i);\n+\t\t\tif (tres && tres->flags & IORESOURCE_DMA) {\n \t\t\t\tif (cannot_compare(tres->flags))\n \t\t\t\t\tcontinue;\n \t\t\t\tif (tres->start == *dma)\n"} {"commit":"3b9408870757bd9e07fd03ac6318258f22b8dfa3","subject":"V4L\/DVB (8042): DVB-USB UMT-010 channel scan oops","message":"V4L\/DVB (8042): DVB-USB UMT-010 channel scan oops\n\nIn the umt-010 driver the struct umt_properties sets the number of URBs for\ntransfer to 20. But in dvb-usb.h MAX_NO_URBS_FOR_DATA_STREAM is set to 10.\n\nNot surprisingly this causes an oops for all devices which use the umt-010\nchipset when they are inserted.\n\nfix on Kaffeine channel scan for\n\nInitialize stream count using MAX_NO_URBS_FOR_DATA_STREAM.\n\nSigned-off-by: Tim Gardner <c65a040f7f664378353fb65fc3553df208a14f68@canonical.com>\nSigned-off-by: maximilian attems <0706025b2bbcec1ed8d64822f4eccd96314938d0@stro.at>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/umt-010.c\n+++ drivers\/media\/dvb\/dvb-usb\/umt-010.c\n@@ -107,7 +107,7 @@\n \t\t\t\/* parameter for the MPEG2-data transfer *\/\n \t\t\t.stream = {\n \t\t\t\t.type = USB_BULK,\n-\t\t\t\t.count = 20,\n+\t\t\t\t.count = MAX_NO_URBS_FOR_DATA_STREAM,\n \t\t\t\t.endpoint = 0x06,\n \t\t\t\t.u = {\n \t\t\t\t\t.bulk = {\n"} {"commit":"b375a612ad931264b71cf162d692b4420f2578a9","subject":"aha1532: remove ISA_DMA_THRESHOLD usage","message":"aha1532: remove ISA_DMA_THRESHOLD usage\n\nWe can safely remove ISA_DMA_THRESHOLD usage in aha1542. aha1542 uses\nISA_DMA_THRESHOLD to see if:\n\n- the buffers in scatter\/list are below 16MB.\n- scsi_host is below 16MB.\n\nBoth checkings were added in the ancient times but aren't necessary\nnowadays since we properly bounce the buffers and allocate scsi_host\nbelow 16MB with non-zero unchecked_isa_dma.\n\nSigned-off-by: FUJITA Tomonori <93dac1fe9c4b2a3957982200319981492ad4976e@lab.ntt.co.jp>\nAcked-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@suse.de>\nSigned-off-by: Jens Axboe <08e836a620179c237f631ad0545a7ebdf54201f3@fusionio.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/aha1542.c\n+++ drivers\/scsi\/aha1542.c\n@@ -52,22 +52,6 @@\n #define SCSI_BUF_PA(address)\tisa_virt_to_bus(address)\n #define SCSI_SG_PA(sgent)\t(isa_page_to_bus(sg_page((sgent))) + (sgent)->offset)\n \n-static void BAD_SG_DMA(Scsi_Cmnd * SCpnt,\n-\t\t struct scatterlist *sgp,\n-\t\t int nseg,\n-\t\t int badseg)\n-{\n-\tprintk(KERN_CRIT \"sgpnt[%d:%d] page %p\/0x%llx length %u\\n\",\n-\t badseg, nseg, sg_virt(sgp),\n-\t (unsigned long long)SCSI_SG_PA(sgp),\n-\t sgp->length);\n-\n-\t\/*\n-\t * Not safe to continue.\n-\t *\/\n-\tpanic(\"Buffer at physical address > 16Mb used for aha1542\");\n-}\n-\n #include<linux\/stat.h>\n \n #ifdef DEBUG\n@@ -691,8 +675,6 @@\n \t\t}\n \t\tscsi_for_each_sg(SCpnt, sg, sg_count, i) {\n \t\t\tany2scsi(cptr[i].dataptr, SCSI_SG_PA(sg));\n-\t\t\tif (SCSI_SG_PA(sg) + sg->length - 1 > ISA_DMA_THRESHOLD)\n-\t\t\t\tBAD_SG_DMA(SCpnt, scsi_sglist(SCpnt), sg_count, i);\n \t\t\tany2scsi(cptr[i].datalen, sg->length);\n \t\t};\n \t\tany2scsi(ccb[mbo].datalen, sg_count * sizeof(struct chain));\n@@ -1133,15 +1115,8 @@\n \t\t\t\trelease_region(bases[indx], 4);\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\t\/* For now we do this - until kmalloc is more intelligent\n-\t\t\t we are resigned to stupid hacks like this *\/\n-\t\t\tif (SCSI_BUF_PA(shpnt) >= ISA_DMA_THRESHOLD) {\n-\t\t\t\tprintk(KERN_ERR \"Invalid address for shpnt with 1542.\\n\");\n-\t\t\t\tgoto unregister;\n-\t\t\t}\n \t\t\tif (!aha1542_test_port(bases[indx], shpnt))\n \t\t\t\tgoto unregister;\n-\n \n \t\t\tbase_io = bases[indx];\n \n"} {"commit":"a55bc848559d229025f5b2468fbed1070ae377e7","subject":"V4L\/DVB (9399): some cleanups at budget-ci","message":"V4L\/DVB (9399): some cleanups at budget-ci\n\nStill messing up:\n* Cleanup\n* Use KNC1's default settings to startup with\n* Add in tuner wrapper calls\n\nSigned-off-by: Manu Abraham <158873d90a7ef40f3637a222b7329c09d0222554@linuxtv.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/ttpci\/budget-ci.c\n+++ drivers\/media\/dvb\/ttpci\/budget-ci.c\n@@ -1074,7 +1074,7 @@\n \t.deltaf = 0xa511,\n };\n \n-\/*\tTT S2-3200 DVB-S (STB0899) Inittab\t*\/\n+\/* TT S2-3200 DVB-S (STB0899) Inittab *\/\n static const struct stb0899_s1_reg tt3200_stb0899_s1_init_1[] = {\n \n \/\/\t 0x0000000b ,\t\/* SYSREG *\/\n@@ -1136,9 +1136,9 @@\n \t{ STB0899_GPIO20CFG \t, 0x82 },\n \t{ STB0899_SDATCFG \t, 0xb8 },\n \t{ STB0899_SCLTCFG \t, 0xba },\n-\t{ STB0899_AGCRFCFG \t, 0x1c },\t\/\/ 0x11\n-\t{ STB0899_GPIO22 \t, 0x82 },\t\/\/ AGCBB2CFG\n-\t{ STB0899_GPIO21 \t, 0x91 },\t\/\/ AGCBB1CFG\n+\t{ STB0899_AGCRFCFG \t, 0x1c }, \/* 0x11 *\/\n+\t{ STB0899_GPIO22 \t, 0x82 }, \/* AGCBB2CFG *\/\n+\t{ STB0899_GPIO21 \t, 0x91 }, \/* AGCBB1CFG *\/\n \t{ STB0899_DIRCLKCFG \t, 0x82 },\n \t{ STB0899_CLKOUT27CFG \t, 0x7e },\n \t{ STB0899_STDBYCFG \t, 0x82 },\n@@ -1153,8 +1153,8 @@\n \t{ STB0899_GPIO37CFG\t\t, 0x82 },\n \t{ STB0899_GPIO38CFG\t\t, 0x82 },\n \t{ STB0899_GPIO39CFG\t\t, 0x82 },\n-\t{ STB0899_NCOARSE \t, 0x15 }, \/\/ 0x15 = 27 Mhz Clock, F\/3 = 198MHz, F\/6 = 99MHz\n-\t{ STB0899_SYNTCTRL \t, 0x02 }, \/\/ 0x00 = CLK from CLKI, 0x02 = CLK from XTALI\n+\t{ STB0899_NCOARSE \t, 0x15 }, \/* 0x15 = 27 Mhz Clock, F\/3 = 198MHz, F\/6 = 99MHz *\/\n+\t{ STB0899_SYNTCTRL \t, 0x02 }, \/* 0x00 = CLK from CLKI, 0x02 = CLK from XTALI *\/\n \t{ STB0899_FILTCTRL \t, 0x00 },\n \t{ STB0899_SYSCTRL \t, 0x00 },\n \t{ STB0899_STOPCLK1 \t, 0x20 },\n@@ -1419,7 +1419,7 @@\n \t{ STB0899_VTH78 \t, 0x38 },\n \t{ STB0899_PRVIT \t, 0xff },\n \t{ STB0899_VITSYNC \t, 0x19 },\n-\t{ STB0899_RSULC \t, 0xb1 }, \/\/ DVB = 0xb1, DSS = 0xa1\n+\t{ STB0899_RSULC \t, 0xb1 }, \/* DVB = 0xb1, DSS = 0xa1 *\/\n \t{ STB0899_TSULC \t, 0x42 },\n \t{ STB0899_RSLLC \t, 0x40 },\n \t{ STB0899_TSLPL\t \t, 0x12 },\n@@ -1545,17 +1545,141 @@\n \t{ 0xffff\t\t, 0xff },\n };\n \n+#define TT3200_DVBS2_ESNO_AVE\t\t\t3\n+#define TT3200_DVBS2_ESNO_QUANT\t\t\t32\n+#define TT3200_DVBS2_AVFRAMES_COARSE\t\t10\n+#define TT3200_DVBS2_AVFRAMES_FINE\t\t20\n+#define TT3200_DVBS2_MISS_THRESHOLD\t\t6\n+#define TT3200_DVBS2_UWP_THRESHOLD_ACQ\t\t1125\n+#define TT3200_DVBS2_UWP_THRESHOLD_TRACK\t758\n+#define TT3200_DVBS2_UWP_THRESHOLD_SOF\t\t1350\n+#define TT3200_DVBS2_SOF_SEARCH_TIMEOUT\t\t1664100\n+\n+#define TT3200_DVBS2_BTR_NCO_BITS\t\t28\n+#define TT3200_DVBS2_BTR_GAIN_SHIFT_OFFSET\t15\n+#define TT3200_DVBS2_CRL_NCO_BITS\t\t30\n+#define TT3200_DVBS2_LDPC_MAX_ITER\t\t70\n+\n+static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)\n+{\n+\tstruct dvb_frontend_ops\t*frontend_ops = NULL;\n+\tstruct dvb_tuner_ops\t*tuner_ops = NULL;\n+\tstruct tuner_state\tt_state;\n+\tint err = 0;\n+\n+\tif (&fe->ops)\n+\t\tfrontend_ops = &fe->ops;\n+\tif (&frontend_ops->tuner_ops)\n+\t\ttuner_ops = &frontend_ops->tuner_ops;\n+\tif (tuner_ops->get_state) {\n+\t\tif ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {\n+\t\t\tprintk(\"%s: Invalid parameter\\n\", __func__);\n+\t\t\treturn err;\n+\t\t}\n+\t\t*frequency = t_state.frequency;\n+\t\tprintk(\"%s: Frequency=%d\\n\", __func__, t_state.frequency);\n+\t}\n+\treturn 0;\n+}\n+\n+static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)\n+{\n+\tstruct dvb_frontend_ops\t*frontend_ops = NULL;\n+\tstruct dvb_tuner_ops\t*tuner_ops = NULL;\n+\tstruct tuner_state\tt_state;\n+\tint err = 0;\n+\n+\tt_state.frequency = frequency;\n+\tif (&fe->ops)\n+\t\tfrontend_ops = &fe->ops;\n+\tif (&frontend_ops->tuner_ops)\n+\t\ttuner_ops = &frontend_ops->tuner_ops;\n+\tif (tuner_ops->set_state) {\n+\t\tif ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY, &t_state)) < 0) {\n+\t\t\tprintk(\"%s: Invalid parameter\\n\", __func__);\n+\t\t\treturn err;\n+\t\t}\n+\t}\n+\tprintk(\"%s: Frequency=%d\\n\", __func__, t_state.frequency);\n+\treturn 0;\n+}\n+\n+static int stb6100_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)\n+{\n+\tstruct dvb_frontend_ops\t*frontend_ops = &fe->ops;\n+\tstruct dvb_tuner_ops\t*tuner_ops = &frontend_ops->tuner_ops;\n+\tstruct tuner_state\tt_state;\n+\tint err = 0;\n+\n+\tif (&fe->ops)\n+\t\tfrontend_ops = &fe->ops;\n+\tif (&frontend_ops->tuner_ops)\n+\t\ttuner_ops = &frontend_ops->tuner_ops;\n+\tif (tuner_ops->get_state) {\n+\t\tif ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {\n+\t\t\tprintk(\"%s: Invalid parameter\\n\", __func__);\n+\t\t\treturn err;\n+\t\t}\n+\t\t*bandwidth = t_state.bandwidth;\n+\t}\n+\tprintk(\"%s: Bandwidth=%d\\n\", __func__, t_state.bandwidth);\n+\treturn 0;\n+}\n+\n+static int stb6100_set_bandwidth(struct dvb_frontend *fe, u32 bandwidth)\n+{\n+\tstruct dvb_frontend_ops\t*frontend_ops = NULL;\n+\tstruct dvb_tuner_ops\t*tuner_ops = NULL;\n+\tstruct tuner_state\tt_state;\n+\tint err = 0;\n+\n+\tt_state.frequency = bandwidth;\n+\tif (&fe->ops)\n+\t\tfrontend_ops = &fe->ops;\n+\tif (&frontend_ops->tuner_ops)\n+\t\ttuner_ops = &frontend_ops->tuner_ops;\n+\tif (tuner_ops->set_state) {\n+\t\tif ((err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH, &t_state)) < 0) {\n+\t\t\tprintk(\"%s: Invalid parameter\\n\", __func__);\n+\t\t\treturn err;\n+\t\t}\n+\t}\n+\tprintk(\"%s: Bandwidth=%d\\n\", __func__, t_state.frequency);\n+\treturn 0;\n+}\n+\n static struct stb0899_config tt3200_config = {\n \t.init_dev\t\t= tt3200_stb0899_s1_init_1,\n-\t.init_s2_demod\t= tt3200_stb0899_s2_init_2,\n-\t.init_s1_demod\t= tt3200_stb0899_s1_init_3,\n-\t.init_s2_fec\t= tt3200_stb0899_s2_init_4,\n+\t.init_s2_demod\t\t= tt3200_stb0899_s2_init_2,\n+\t.init_s1_demod\t\t= tt3200_stb0899_s1_init_3,\n+\t.init_s2_fec\t\t= tt3200_stb0899_s2_init_4,\n \t.init_tst\t\t= tt3200_stb0899_s1_init_5,\n \n-\t.demod_address = 0x68,\n+\t.demod_address \t\t= 0x68,\n \n \t.xtal_freq\t\t= 27000000,\n \t.inversion\t\t= 1,\n+\n+\t.esno_ave\t\t= TT3200_DVBS2_ESNO_AVE,\n+\t.esno_quant\t\t= TT3200_DVBS2_ESNO_QUANT,\n+\t.avframes_coarse\t= TT3200_DVBS2_AVFRAMES_COARSE,\n+\t.avframes_fine\t\t= TT3200_DVBS2_AVFRAMES_FINE,\n+\t.miss_threshold\t\t= TT3200_DVBS2_MISS_THRESHOLD,\n+\t.uwp_threshold_acq\t= TT3200_DVBS2_UWP_THRESHOLD_ACQ,\n+\t.uwp_threshold_track\t= TT3200_DVBS2_UWP_THRESHOLD_TRACK,\n+\t.uwp_threshold_sof\t= TT3200_DVBS2_UWP_THRESHOLD_SOF,\n+\t.sof_search_timeout\t= TT3200_DVBS2_SOF_SEARCH_TIMEOUT,\n+\n+\t.btr_nco_bits\t\t= TT3200_DVBS2_BTR_NCO_BITS,\n+\t.btr_gain_shift_offset\t= TT3200_DVBS2_BTR_GAIN_SHIFT_OFFSET,\n+\t.crl_nco_bits\t\t= TT3200_DVBS2_CRL_NCO_BITS,\n+\t.ldpc_max_iter\t\t= TT3200_DVBS2_LDPC_MAX_ITER,\n+\n+\t.tuner_get_frequency\t= stb6100_get_frequency,\n+\t.tuner_set_frequency\t= stb6100_set_frequency,\n+\t.tuner_set_bandwidth\t= stb6100_set_bandwidth,\n+\t.tuner_get_bandwidth\t= stb6100_get_bandwidth,\n+\t.tuner_set_rfsiggain\t= NULL,\n };\n \n struct stb6100_config tt3200_stb6100_config = {\n"} {"commit":"f3d6e1dcd291fd0da3accb0d60fbd0d26d2189ed","subject":"[SCSI] pmcraid: redundant check in pmcraid_check_ioctl_buffer()","message":"[SCSI] pmcraid: redundant check in pmcraid_check_ioctl_buffer()\n\nstruct pmcraid_ioctl_header member buffer_length is unsigned, so this\ncheck appears redundant.\n\nSigned-off-by: Roel Kluin <aa9c6213291cec1ff07688554fb7b904b9ffe4e3@gmail.com>\nAcked-by: Anil Ravindranath <10038636d2690f99953fd983ac4f9adf0feccc19@pmc-sierra.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/pmcraid.c\n+++ drivers\/scsi\/pmcraid.c\n@@ -3751,12 +3751,6 @@\n \t\treturn -EINVAL;\n \t}\n \n-\t\/* buffer length can't be negetive *\/\n-\tif (hdr->buffer_length < 0) {\n-\t\tpmcraid_err(\"ioctl: invalid buffer length specified\\n\");\n-\t\treturn -EINVAL;\n-\t}\n-\n \t\/* check for appropriate buffer access *\/\n \tif ((_IOC_DIR(cmd) & _IOC_READ) == _IOC_READ)\n \t\taccess = VERIFY_WRITE;\n"} {"commit":"ed5cd6bbde5569538f328ce931943cdce4a6db86","subject":"[media] sunplus: convert to the control framework","message":"[media] sunplus: convert to the control framework\n\nSigned-off-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sunplus.c\n+++ drivers\/media\/video\/gspca\/sunplus.c\n@@ -34,14 +34,12 @@\n struct sd {\n \tstruct gspca_dev gspca_dev;\t\/* !! must be the first item *\/\n \n-\ts8 brightness;\n-\tu8 contrast;\n-\tu8 colors;\n-\tu8 autogain;\n-\tu8 quality;\n+\tstruct v4l2_ctrl *jpegqual;\n #define QUALITY_MIN 70\n #define QUALITY_MAX 95\n #define QUALITY_DEF 85\n+\n+\tbool autogain;\n \n \tu8 bridge;\n #define BRIDGE_SPCA504 0\n@@ -57,75 +55,6 @@\n #define MegaImageVI 5\n \n \tu8 jpeg_hdr[JPEG_HDR_SZ];\n-};\n-\n-\/* V4L2 controls supported by the driver *\/\n-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);\n-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);\n-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);\n-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);\n-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);\n-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val);\n-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);\n-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);\n-\n-static const struct ctrl sd_ctrls[] = {\n-\t{\n-\t {\n-\t\t.id = V4L2_CID_BRIGHTNESS,\n-\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n-\t\t.name = \"Brightness\",\n-\t\t.minimum = -128,\n-\t\t.maximum = 127,\n-\t\t.step = 1,\n-#define BRIGHTNESS_DEF 0\n-\t\t.default_value = BRIGHTNESS_DEF,\n-\t },\n-\t .set = sd_setbrightness,\n-\t .get = sd_getbrightness,\n-\t},\n-\t{\n-\t {\n-\t\t.id = V4L2_CID_CONTRAST,\n-\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n-\t\t.name = \"Contrast\",\n-\t\t.minimum = 0,\n-\t\t.maximum = 0xff,\n-\t\t.step = 1,\n-#define CONTRAST_DEF 0x20\n-\t\t.default_value = CONTRAST_DEF,\n-\t },\n-\t .set = sd_setcontrast,\n-\t .get = sd_getcontrast,\n-\t},\n-\t{\n-\t {\n-\t\t.id = V4L2_CID_SATURATION,\n-\t\t.type = V4L2_CTRL_TYPE_INTEGER,\n-\t\t.name = \"Color\",\n-\t\t.minimum = 0,\n-\t\t.maximum = 0xff,\n-\t\t.step = 1,\n-#define COLOR_DEF 0x1a\n-\t\t.default_value = COLOR_DEF,\n-\t },\n-\t .set = sd_setcolors,\n-\t .get = sd_getcolors,\n-\t},\n-\t{\n-\t {\n-\t\t.id = V4L2_CID_AUTOGAIN,\n-\t\t.type = V4L2_CTRL_TYPE_BOOLEAN,\n-\t\t.name = \"Auto Gain\",\n-\t\t.minimum = 0,\n-\t\t.maximum = 1,\n-\t\t.step = 1,\n-#define AUTOGAIN_DEF 1\n-\t\t.default_value = AUTOGAIN_DEF,\n-\t },\n-\t .set = sd_setautogain,\n-\t .get = sd_getautogain,\n-\t},\n };\n \n static const struct v4l2_pix_format vga_mode[] = {\n@@ -597,31 +526,31 @@\n \tspca504B_PollingDataReady(gspca_dev);\n }\n \n-static void setbrightness(struct gspca_dev *gspca_dev)\n+static void setbrightness(struct gspca_dev *gspca_dev, s32 val)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tu16 reg;\n \n \treg = sd->bridge == BRIDGE_SPCA536 ? 0x20f0 : 0x21a7;\n-\treg_w_riv(gspca_dev, 0x00, reg, sd->brightness);\n-}\n-\n-static void setcontrast(struct gspca_dev *gspca_dev)\n+\treg_w_riv(gspca_dev, 0x00, reg, val);\n+}\n+\n+static void setcontrast(struct gspca_dev *gspca_dev, s32 val)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tu16 reg;\n \n \treg = sd->bridge == BRIDGE_SPCA536 ? 0x20f1 : 0x21a8;\n-\treg_w_riv(gspca_dev, 0x00, reg, sd->contrast);\n-}\n-\n-static void setcolors(struct gspca_dev *gspca_dev)\n+\treg_w_riv(gspca_dev, 0x00, reg, val);\n+}\n+\n+static void setcolors(struct gspca_dev *gspca_dev, s32 val)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tu16 reg;\n \n \treg = sd->bridge == BRIDGE_SPCA536 ? 0x20f6 : 0x21ae;\n-\treg_w_riv(gspca_dev, 0x00, reg, sd->colors);\n+\treg_w_riv(gspca_dev, 0x00, reg, val);\n }\n \n static void init_ctl_reg(struct gspca_dev *gspca_dev)\n@@ -629,9 +558,7 @@\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tint pollreg = 1;\n \n-\tsetbrightness(gspca_dev);\n-\tsetcontrast(gspca_dev);\n-\tsetcolors(gspca_dev);\n+\tv4l2_ctrl_handler_setup(&gspca_dev->ctrl_handler);\n \n \tswitch (sd->bridge) {\n \tcase BRIDGE_SPCA504:\n@@ -704,11 +631,6 @@\n \t\tcam->nmodes = ARRAY_SIZE(vga_mode2);\n \t\tbreak;\n \t}\n-\tsd->brightness = BRIGHTNESS_DEF;\n-\tsd->contrast = CONTRAST_DEF;\n-\tsd->colors = COLOR_DEF;\n-\tsd->autogain = AUTOGAIN_DEF;\n-\tsd->quality = QUALITY_DEF;\n \treturn 0;\n }\n \n@@ -807,7 +729,7 @@\n \t\/* create the JPEG header *\/\n \tjpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,\n \t\t\t0x22);\t\t\/* JPEG 411 *\/\n-\tjpeg_set_qual(sd->jpeg_hdr, sd->quality);\n+\tjpeg_set_qual(sd->jpeg_hdr, v4l2_ctrl_g_ctrl(sd->jpegqual));\n \n \tif (sd->bridge == BRIDGE_SPCA504B)\n \t\tspca504B_setQtable(gspca_dev);\n@@ -1012,90 +934,13 @@\n \tgspca_frame_add(gspca_dev, INTER_PACKET, data, len);\n }\n \n-static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\tsd->brightness = val;\n-\tif (gspca_dev->streaming)\n-\t\tsetbrightness(gspca_dev);\n-\treturn gspca_dev->usb_err;\n-}\n-\n-static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\t*val = sd->brightness;\n-\treturn 0;\n-}\n-\n-static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\tsd->contrast = val;\n-\tif (gspca_dev->streaming)\n-\t\tsetcontrast(gspca_dev);\n-\treturn gspca_dev->usb_err;\n-}\n-\n-static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\t*val = sd->contrast;\n-\treturn 0;\n-}\n-\n-static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\tsd->colors = val;\n-\tif (gspca_dev->streaming)\n-\t\tsetcolors(gspca_dev);\n-\treturn gspca_dev->usb_err;\n-}\n-\n-static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\t*val = sd->colors;\n-\treturn 0;\n-}\n-\n-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\tsd->autogain = val;\n-\treturn 0;\n-}\n-\n-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n-\t*val = sd->autogain;\n-\treturn 0;\n-}\n-\n static int sd_set_jcomp(struct gspca_dev *gspca_dev,\n \t\t\tstruct v4l2_jpegcompression *jcomp)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \n-\tif (jcomp->quality < QUALITY_MIN)\n-\t\tsd->quality = QUALITY_MIN;\n-\telse if (jcomp->quality > QUALITY_MAX)\n-\t\tsd->quality = QUALITY_MAX;\n-\telse\n-\t\tsd->quality = jcomp->quality;\n-\tif (gspca_dev->streaming)\n-\t\tjpeg_set_qual(sd->jpeg_hdr, sd->quality);\n-\treturn gspca_dev->usb_err;\n+\tv4l2_ctrl_s_ctrl(sd->jpegqual, jcomp->quality);\n+\treturn 0;\n }\n \n static int sd_get_jcomp(struct gspca_dev *gspca_dev,\n@@ -1104,19 +949,79 @@\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \n \tmemset(jcomp, 0, sizeof *jcomp);\n-\tjcomp->quality = sd->quality;\n+\tjcomp->quality = v4l2_ctrl_g_ctrl(sd->jpegqual);\n \tjcomp->jpeg_markers = V4L2_JPEG_MARKER_DHT\n \t\t\t| V4L2_JPEG_MARKER_DQT;\n \treturn 0;\n }\n \n+static int sd_s_ctrl(struct v4l2_ctrl *ctrl)\n+{\n+\tstruct gspca_dev *gspca_dev =\n+\t\tcontainer_of(ctrl->handler, struct gspca_dev, ctrl_handler);\n+\tstruct sd *sd = (struct sd *)gspca_dev;\n+\n+\tgspca_dev->usb_err = 0;\n+\n+\tif (!gspca_dev->streaming)\n+\t\treturn 0;\n+\n+\tswitch (ctrl->id) {\n+\tcase V4L2_CID_BRIGHTNESS:\n+\t\tsetbrightness(gspca_dev, ctrl->val);\n+\t\tbreak;\n+\tcase V4L2_CID_CONTRAST:\n+\t\tsetcontrast(gspca_dev, ctrl->val);\n+\t\tbreak;\n+\tcase V4L2_CID_SATURATION:\n+\t\tsetcolors(gspca_dev, ctrl->val);\n+\t\tbreak;\n+\tcase V4L2_CID_AUTOGAIN:\n+\t\tsd->autogain = ctrl->val;\n+\t\tbreak;\n+\tcase V4L2_CID_JPEG_COMPRESSION_QUALITY:\n+\t\tjpeg_set_qual(sd->jpeg_hdr, ctrl->val);\n+\t\tbreak;\n+\t}\n+\treturn gspca_dev->usb_err;\n+}\n+\n+static const struct v4l2_ctrl_ops sd_ctrl_ops = {\n+\t.s_ctrl = sd_s_ctrl,\n+};\n+\n+static int sd_init_controls(struct gspca_dev *gspca_dev)\n+{\n+\tstruct sd *sd = (struct sd *)gspca_dev;\n+\tstruct v4l2_ctrl_handler *hdl = &gspca_dev->ctrl_handler;\n+\n+\tgspca_dev->vdev.ctrl_handler = hdl;\n+\tv4l2_ctrl_handler_init(hdl, 5);\n+\tv4l2_ctrl_new_std(hdl, &sd_ctrl_ops,\n+\t\t\tV4L2_CID_BRIGHTNESS, -128, 127, 1, 0);\n+\tv4l2_ctrl_new_std(hdl, &sd_ctrl_ops,\n+\t\t\tV4L2_CID_CONTRAST, 0, 255, 1, 0x20);\n+\tv4l2_ctrl_new_std(hdl, &sd_ctrl_ops,\n+\t\t\tV4L2_CID_SATURATION, 0, 255, 1, 0x1a);\n+\tv4l2_ctrl_new_std(hdl, &sd_ctrl_ops,\n+\t\t\tV4L2_CID_AUTOGAIN, 0, 1, 1, 1);\n+\tsd->jpegqual = v4l2_ctrl_new_std(hdl, &sd_ctrl_ops,\n+\t\t\tV4L2_CID_JPEG_COMPRESSION_QUALITY,\n+\t\t\tQUALITY_MIN, QUALITY_MAX, 1, QUALITY_DEF);\n+\n+\tif (hdl->error) {\n+\t\tpr_err(\"Could not initialize controls\\n\");\n+\t\treturn hdl->error;\n+\t}\n+\treturn 0;\n+}\n+\n \/* sub-driver description *\/\n static const struct sd_desc sd_desc = {\n \t.name = MODULE_NAME,\n-\t.ctrls = sd_ctrls,\n-\t.nctrls = ARRAY_SIZE(sd_ctrls),\n \t.config = sd_config,\n \t.init = sd_init,\n+\t.init_controls = sd_init_controls,\n \t.start = sd_start,\n \t.stopN = sd_stopN,\n \t.pkt_scan = sd_pkt_scan,\n"} {"commit":"1219d9e3d742bf710006bf9b19a2321662068eff","subject":"fixed unlink","message":"fixed unlink\n","repos":"zarcen\/toy_afs,zarcen\/toy_afs,zarcen\/toy_afs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tafs\/fusetafs.c\n+++ tafs\/fusetafs.c\n@@ -32,6 +32,8 @@\n #include <sys\/time.h>\n #include <cassert>\n #include <unordered_map>\n+#include <iostream>\n+#include <chrono>\n \n #include \"tafs.h\"\n #include \"cache_util.h\"\n@@ -42,6 +44,25 @@\n static std::unordered_map<std::string, std::string> stat_hash; \n \/\/ flag for release() to decide to contact server or not \n static int writeback_flag = -1;\n+\n+\n+class Timer {\n+ std::chrono::system_clock::time_point start;\n+ std::chrono::system_clock::time_point end;\n+ std::string str_;\n+public:\n+ Timer(std::string str) {\n+ str_ = str;\n+ start = std::chrono::system_clock::now();\n+ }\n+ ~Timer() {\n+ end = std::chrono::system_clock::now();\n+ auto elapsed =\n+ std::chrono::duration_cast<std::chrono::milliseconds>(end - start);\n+ std::cout<<str_<<\":\"<<elapsed.count()<<\"\\n\";\n+ }\n+};\n+\n \n void InitRPC(const char* serverhost) {\n if (greeter == NULL) {\n@@ -63,6 +84,9 @@\n \n static int xmp_getattr(const char *path, struct stat *stbuf) {\n printf(\"= = = = START = = = = xmp_getattr\\n\");\n+\n+ Timer timer(\"-!- Timer GetAttr\");\n+\n int res;\n std::string rpcbuf;\n std::string cpp_path = path;\n@@ -328,6 +352,7 @@\n \n static int xmp_open(const char *path, struct fuse_file_info *fi) {\n printf(\"= = = = START = = = = xmp_open\\n\");\n+\n CacheUtil cu;\n \n std::string cpp_path = path;\n@@ -383,6 +408,7 @@\n close(dummy);\n printf(\"== Read from server and save ==\\n\");\n }\n+\n return 0;\n }\n \n@@ -469,6 +495,9 @@\n \n static int xmp_release(const char *path, struct fuse_file_info *fi) {\n printf(\"= = = = START = = = = xmp_release\\n\");\n+\n+ Timer timer(\"-!- Timer Release\");\n+\n std::string cpp_path = path;\n #ifdef CRASH_TEST\n if (IsCrash(\"crash_config.txt\")) {\n@@ -503,13 +532,17 @@\n strerror(errno)); \n return res; \n }\n+ }\n \n #ifndef NO_CONSIST_PROT\n- if (cu.Unlink(cu.ToCacheReleName(path))){ \n- printf(\"--!--!-- Fail to unlink file: %s \\n\", path);\n- }\n-#endif\n+ if (cu.Unlink(cu.ToCacheReleName(path))){ \n+ printf(\"--!--!-- Fail to unlink file: %s \\n\", path);\n }\n+ else {\n+ printf(\"--!--!-- Success to unlink file: %s \\n\", path);\n+ }\n+#endif\n+\n writeback_flag = -1;\n res = close(fi->fh);\n }\n"} {"commit":"96bf40194fdda941ce579be199a9427feee5dffa","subject":"spi: sirf: request and free cs gpio in setup and cleanup callbacks","message":"spi: sirf: request and free cs gpio in setup and cleanup callbacks\n\nmove spi controller's gpio request work out from probe() to spi device\nregister stage, so after spi device register spi controller can deactive\ndevice's gpio chipselect. old code can't do it because gpio request has\nnot be done until device register is finised in spi_bitbang_start.\nand add cleanup function to free CS gpio.\n\nSigned-off-by: Qipan Li <7edc63b2168f7aeebdbedbd3916b18244ee96ac4@csr.com>\nSigned-off-by: Barry Song <a856445693a373abed3e477bd705f7011cbd8a1d@csr.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/spi\/spi-sirf.c\n+++ drivers\/spi\/spi-sirf.c\n@@ -631,14 +631,47 @@\n static int spi_sirfsoc_setup(struct spi_device *spi)\n {\n \tstruct sirfsoc_spi *sspi;\n+\tint ret = 0;\n \n \tsspi = spi_master_get_devdata(spi->master);\n \n \tif (spi->cs_gpio == -ENOENT)\n \t\tsspi->hw_cs = true;\n-\telse\n+\telse {\n \t\tsspi->hw_cs = false;\n-\treturn spi_sirfsoc_setup_transfer(spi, NULL);\n+\t\tif (!spi_get_ctldata(spi)) {\n+\t\t\tvoid *cs = kmalloc(sizeof(int), GFP_KERNEL);\n+\t\t\tif (!cs) {\n+\t\t\t\tret = -ENOMEM;\n+\t\t\t\tgoto exit;\n+\t\t\t}\n+\t\t\tret = gpio_is_valid(spi->cs_gpio);\n+\t\t\tif (!ret) {\n+\t\t\t\tdev_err(&spi->dev, \"no valid gpio\\n\");\n+\t\t\t\tret = -ENOENT;\n+\t\t\t\tgoto exit;\n+\t\t\t}\n+\t\t\tret = gpio_request(spi->cs_gpio, DRIVER_NAME);\n+\t\t\tif (ret) {\n+\t\t\t\tdev_err(&spi->dev, \"failed to request gpio\\n\");\n+\t\t\t\tgoto exit;\n+\t\t\t}\n+\t\t\tspi_set_ctldata(spi, cs);\n+\t\t}\n+\t}\n+\twritel(readl(sspi->base + SIRFSOC_SPI_CTRL) | SIRFSOC_SPI_CS_IO_MODE,\n+\t\t\tsspi->base + SIRFSOC_SPI_CTRL);\n+\tspi_sirfsoc_chipselect(spi, BITBANG_CS_INACTIVE);\n+exit:\n+\treturn ret;\n+}\n+\n+static void spi_sirfsoc_cleanup(struct spi_device *spi)\n+{\n+\tif (spi_get_ctldata(spi)) {\n+\t\tgpio_free(spi->cs_gpio);\n+\t\tkfree(spi_get_ctldata(spi));\n+\t}\n }\n \n static int spi_sirfsoc_probe(struct platform_device *pdev)\n@@ -647,7 +680,7 @@\n \tstruct spi_master *master;\n \tstruct resource *mem_res;\n \tint irq;\n-\tint i, ret;\n+\tint ret;\n \n \tret = device_reset(&pdev->dev);\n \tif (ret) {\n@@ -685,6 +718,7 @@\n \tsspi->bitbang.setup_transfer = spi_sirfsoc_setup_transfer;\n \tsspi->bitbang.txrx_bufs = spi_sirfsoc_transfer;\n \tsspi->bitbang.master->setup = spi_sirfsoc_setup;\n+\tsspi->bitbang.master->cleanup = spi_sirfsoc_cleanup;\n \tmaster->bus_num = pdev->id;\n \tmaster->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST | SPI_CS_HIGH;\n \tmaster->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) |\n@@ -733,21 +767,6 @@\n \tret = spi_bitbang_start(&sspi->bitbang);\n \tif (ret)\n \t\tgoto free_dummypage;\n-\tfor (i = 0; master->cs_gpios && i < master->num_chipselect; i++) {\n-\t\tif (master->cs_gpios[i] == -ENOENT)\n-\t\t\tcontinue;\n-\t\tif (!gpio_is_valid(master->cs_gpios[i])) {\n-\t\t\tdev_err(&pdev->dev, \"no valid gpio\\n\");\n-\t\t\tret = -EINVAL;\n-\t\t\tgoto free_dummypage;\n-\t\t}\n-\t\tret = devm_gpio_request(&pdev->dev,\n-\t\t\t\tmaster->cs_gpios[i], DRIVER_NAME);\n-\t\tif (ret) {\n-\t\t\tdev_err(&pdev->dev, \"failed to request gpio\\n\");\n-\t\t\tgoto free_dummypage;\n-\t\t}\n-\t}\n \tdev_info(&pdev->dev, \"registerred, bus number = %d\\n\", master->bus_num);\n \n \treturn 0;\n"} {"commit":"49ebf14e249734a5f64d5bdd9aaa2ddf4bcedc51","subject":"V4L\/DVB (6113): ivtv: udelay for the i2c bus was set too high","message":"V4L\/DVB (6113): ivtv: udelay for the i2c bus was set too high\n\nAn udelay of 5 is sufficient for standard speed i2c busses, 10 make it\ntoo slow.\n\nSigned-off-by: Hans Verkuil <f625be9dbdcbbd12a043857af148e8fb895d9a1d@xs4all.nl>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/ivtv\/ivtv-i2c.c\n+++ drivers\/media\/video\/ivtv\/ivtv-i2c.c\n@@ -541,7 +541,7 @@\n \t.setscl\t\t= ivtv_setscl_old,\n \t.getsda\t\t= ivtv_getsda_old,\n \t.getscl\t\t= ivtv_getscl_old,\n-\t.udelay\t\t= 10,\n+\t.udelay\t\t= 5,\n \t.timeout\t= 200,\n };\n \n"} {"commit":"419a608f61faf0448e0ab5c627338b57cf9c5124","subject":"tty: smux_ctl: Remove unused ports","message":"tty: smux_ctl: Remove unused ports\n\nOnly SMUX_DATA_CTL_0 is currently used from userspace.\n\nChange-Id: Iab9e4fa9b096d34a67fb6662418aec0be1381adb\nSigned-off-by: Eric Holmberg <5000aa55685d659e1f7f26ece526f9c7021ab484@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/tty\/smux_ctl.c\n+++ drivers\/tty\/smux_ctl.c\n@@ -49,15 +49,6 @@\n \n static uint32_t smux_ctl_ch_id[] = {\n \tSMUX_DATA_CTL_0,\n-\tSMUX_DATA_CTL_1,\n-\tSMUX_DATA_CTL_2,\n-\tSMUX_DATA_CTL_3,\n-\tSMUX_DATA_CTL_4,\n-\tSMUX_DATA_CTL_5,\n-\tSMUX_DATA_CTL_6,\n-\tSMUX_DATA_CTL_7,\n-\tSMUX_USB_RMNET_CTL_0,\n-\tSMUX_CSVT_CTL_0\n };\n \n #define SMUX_CTL_NUM_CHANNELS ARRAY_SIZE(smux_ctl_ch_id)\n"} {"commit":"46c73ecc6168586c7628b87ac1d0436eca9574dd","subject":"ethernet: amd: fix 'foo* bar'","message":"ethernet: amd: fix 'foo* bar'\n\nThis patch fix the 'foo*' bar with 'foo *bar' and (foo*) with (foo *).\n\nSigned-off-by: Varka Bhadram <2af78e27b8c15f3929acd171eee40b9b9bcbd73c@cdac.in>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d48bd977e0dd8c17081d12242bfc09d743ea0d26","subject":"USB: fix locking loop by avoiding flush_scheduled_work","message":"USB: fix locking loop by avoiding flush_scheduled_work\n\nThis patch (as1027) replaces a call to flush_scheduled_work() -- a\ndangerous routine to invoke, especially while holding any sort of lock\n-- with calls to cancel_work_sync() and cancel_delayed_work_sync().\n\nThis fixes Bugzilla #9532.\n\nSigned-off-by: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nCC: David Brownell <e543181633fc0fc2787945ef377537d9112d0c96@pacbell.net>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/core\/hub.c\n+++ drivers\/usb\/core\/hub.c\n@@ -522,9 +522,9 @@\n \t\/* (blocking) stop khubd and related activity *\/\n \tusb_kill_urb(hub->urb);\n \tif (hub->has_indicators)\n-\t\tcancel_delayed_work(&hub->leds);\n-\tif (hub->has_indicators || hub->tt.hub)\n-\t\tflush_scheduled_work();\n+\t\tcancel_delayed_work_sync(&hub->leds);\n+\tif (hub->tt.hub)\n+\t\tcancel_work_sync(&hub->tt.kevent);\n }\n \n static void hub_activate(struct usb_hub *hub)\n"} {"commit":"f3791cdf33e7d21515de25f5ead0eca38f85ca11","subject":"tg3: Make 1000Base-X FC resolution look like 1000T","message":"tg3: Make 1000Base-X FC resolution look like 1000T\n\nThis patch changes tg3's 1000Base-X flow control resolution to look like\nthe 1000Base-T flow control resolution code.\n\nSigned-off-by: Matt Carlson <f02aa487e913502cb3659242fb6d2d373cc87177@broadcom.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/broadcom\/tg3.c\n+++ drivers\/net\/ethernet\/broadcom\/tg3.c\n@@ -1706,18 +1706,12 @@\n {\n \tu8 cap = 0;\n \n-\tif (lcladv & ADVERTISE_1000XPAUSE) {\n-\t\tif (lcladv & ADVERTISE_1000XPSE_ASYM) {\n-\t\t\tif (rmtadv & LPA_1000XPAUSE)\n-\t\t\t\tcap = FLOW_CTRL_TX | FLOW_CTRL_RX;\n-\t\t\telse if (rmtadv & LPA_1000XPAUSE_ASYM)\n-\t\t\t\tcap = FLOW_CTRL_RX;\n-\t\t} else {\n-\t\t\tif (rmtadv & LPA_1000XPAUSE)\n-\t\t\t\tcap = FLOW_CTRL_TX | FLOW_CTRL_RX;\n-\t\t}\n-\t} else if (lcladv & ADVERTISE_1000XPSE_ASYM) {\n-\t\tif ((rmtadv & LPA_1000XPAUSE) && (rmtadv & LPA_1000XPAUSE_ASYM))\n+\tif (lcladv & rmtadv & ADVERTISE_1000XPAUSE) {\n+\t\tcap = FLOW_CTRL_TX | FLOW_CTRL_RX;\n+\t} else if (lcladv & rmtadv & ADVERTISE_1000XPSE_ASYM) {\n+\t\tif (lcladv & ADVERTISE_1000XPAUSE)\n+\t\t\tcap = FLOW_CTRL_RX;\n+\t\tif (rmtadv & ADVERTISE_1000XPAUSE)\n \t\t\tcap = FLOW_CTRL_TX;\n \t}\n \n"} {"commit":"db063507b40664de33a61161c90358fe6fc9565a","subject":"USB core: fix compiler warning about usb_autosuspend_work","message":"USB core: fix compiler warning about usb_autosuspend_work\n\nThis patch (as821) fixes a compiler warning when CONFIG_PM isn't on\n(\"usb_autosuspend_work\" defined but not used).\n\nSigned-off-by: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/core\/usb.c\n+++ drivers\/usb\/core\/usb.c\n@@ -200,13 +200,6 @@\n \tdestroy_workqueue(ksuspend_usb_wq);\n }\n \n-#else\n-\n-#define ksuspend_usb_init()\t0\n-#define ksuspend_usb_cleanup()\tdo {} while (0)\n-\n-#endif\n-\n #ifdef\tCONFIG_USB_SUSPEND\n \n \/* usb_autosuspend_work - callback routine to autosuspend a USB device *\/\n@@ -225,7 +218,14 @@\n static void usb_autosuspend_work(void *_udev)\n {}\n \n-#endif\n+#endif\t\/* CONFIG_USB_SUSPEND *\/\n+\n+#else\n+\n+#define ksuspend_usb_init()\t0\n+#define ksuspend_usb_cleanup()\tdo {} while (0)\n+\n+#endif\t\/* CONFIG_PM *\/\n \n \/**\n * usb_alloc_dev - usb device constructor (usbcore-internal)\n"} {"commit":"92029c07e83c4e94d5ec919b3666dde4a0c43d0f","subject":"templatematch: implement getter for the property debugDirectory","message":"templatematch: implement getter for the property debugDirectory\n\nThis was causing a warning to appear in gst-inspect.\n","repos":"wmanley\/stb-tester,martynjarvis\/stb-tester,martynjarvis\/stb-tester,martynjarvis\/stb-tester,martynjarvis\/stb-tester,LewisHaley\/stb-tester,LewisHaley\/stb-tester,LewisHaley\/stb-tester,wmanley\/stb-tester,stb-tester\/stb-tester,stb-tester\/stb-tester,wmanley\/stb-tester,martynjarvis\/stb-tester,wmanley\/stb-tester,LewisHaley\/stb-tester,martynjarvis\/stb-tester,martynjarvis\/stb-tester,LewisHaley\/stb-tester,LewisHaley\/stb-tester,stb-tester\/stb-tester,wmanley\/stb-tester,stb-tester\/stb-tester,LewisHaley\/stb-tester","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/gsttemplatematch.c\n+++ gst\/gsttemplatematch.c\n@@ -270,6 +270,9 @@\n case PROP_TEMPLATE:\n g_value_set_string (value, filter->template);\n break;\n+ case PROP_DEBUG_DIRECTORY:\n+ g_value_set_string (value, filter->debugDirectory);\n+ break;\n case PROP_DISPLAY:\n g_value_set_boolean (value, filter->display);\n break;\n"} {"commit":"de91c0c40f92d7eee00455847db412a39c2eea70","subject":"Fix Sparkle header.","message":"Fix Sparkle header.\n","repos":"jfroy\/rivenx,jfroy\/rivenx,jfroy\/rivenx,jfroy\/rivenx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Frameworks\/Sparkle.framework\/Versions\/A\/Headers\/SUUpdater.h\n+++ Frameworks\/Sparkle.framework\/Versions\/A\/Headers\/SUUpdater.h\n@@ -27,12 +27,12 @@\n \n + (SUUpdater *)sharedUpdater;\n + (SUUpdater *)updaterForBundle:(NSBundle *)bundle;\n-- initForBundle:(NSBundle *)bundle;\n+- (id)initForBundle:(NSBundle *)bundle;\n \n - (NSBundle *)hostBundle;\n \n - (void)setDelegate:(id)delegate;\n-- delegate;\n+- (id)delegate;\n \n - (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks;\n - (BOOL)automaticallyChecksForUpdates;\n"} {"commit":"a19228b7f4fc6fcb49713455b3caedbc24fb0b01","subject":"apps\/apps.c: include sys\/socket.h to declare recv()","message":"apps\/apps.c: include sys\/socket.h to declare recv()\n\nReviewed-by: Tim Hudson <eb0be8e447f673b41b10eda09d63cd72526b0a42@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/apps.c\n+++ apps\/apps.c\n@@ -2340,6 +2340,8 @@\n return (-1);\n }\n #elif defined(__VMS)\n+#include <sys\/socket.h>\n+\n int raw_read_stdin(void *buf, int siz)\n {\n return recv(fileno_stdin(), buf, siz, 0);\n"} {"commit":"191d1ac435c01e2a7acfb93fb9da8378da90214c","subject":"git branch: avoid unnecessary object lookups","message":"git branch: avoid unnecessary object lookups\n\nThey can be expensive in the cold-cache case, so don't bother looking up\nthe commits for all branches unless we really need them for some reason.\n\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\nSigned-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- builtin-branch.c\n+++ builtin-branch.c\n@@ -191,7 +191,7 @@\n \n struct ref_list {\n \tstruct rev_info revs;\n-\tint index, alloc, maxwidth;\n+\tint index, alloc, maxwidth, verbose;\n \tstruct ref_item *list;\n \tstruct commit_list *with_commit;\n \tint kinds;\n@@ -244,17 +244,20 @@\n \tif ((kind & ref_list->kinds) == 0)\n \t\treturn 0;\n \n-\tcommit = lookup_commit_reference_gently(sha1, 1);\n-\tif (!commit)\n-\t\treturn error(\"branch '%s' does not point at a commit\", refname);\n-\n-\t\/* Filter with with_commit if specified *\/\n-\tif (!is_descendant_of(commit, ref_list->with_commit))\n-\t\treturn 0;\n-\n-\tif (merge_filter != NO_FILTER)\n-\t\tadd_pending_object(&ref_list->revs,\n-\t\t\t\t (struct object *)commit, refname);\n+\tcommit = NULL;\n+\tif (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {\n+\t\tcommit = lookup_commit_reference_gently(sha1, 1);\n+\t\tif (!commit)\n+\t\t\treturn error(\"branch '%s' does not point at a commit\", refname);\n+\n+\t\t\/* Filter with with_commit if specified *\/\n+\t\tif (!is_descendant_of(commit, ref_list->with_commit))\n+\t\t\treturn 0;\n+\n+\t\tif (merge_filter != NO_FILTER)\n+\t\t\tadd_pending_object(&ref_list->revs,\n+\t\t\t\t\t (struct object *)commit, refname);\n+\t}\n \n \t\/* Resize buffer *\/\n \tif (ref_list->index >= ref_list->alloc) {\n@@ -423,6 +426,7 @@\n \n \tmemset(&ref_list, 0, sizeof(ref_list));\n \tref_list.kinds = kinds;\n+\tref_list.verbose = verbose;\n \tref_list.with_commit = with_commit;\n \tif (merge_filter != NO_FILTER)\n \t\tinit_revisions(&ref_list.revs, NULL);\n"} {"commit":"83fdf34ddebc23dd2cea882daa995e11d02204e4","subject":"sync with 3.0.0 tag","message":"sync with 3.0.0 tag\n","repos":"p0pr0ck5\/ModSecurity,irtnog\/ModSecurity,p0pr0ck5\/ModSecurity,bjh7242\/ModSecurity,sdgdsffdsfff\/ModSecurity,daniilyar\/ModSecurity,marcstern\/ModSecurity,defanator\/ModSecurity,defanator\/ModSecurity,sdgdsffdsfff\/ModSecurity,csanders-git\/ModSecurity,hbopuri\/ModSecurity,marcstern\/ModSecurity,p0pr0ck5\/ModSecurity,marcstern\/ModSecurity,rosmo\/ModSecurity,hbopuri\/ModSecurity,SpiderLabs\/ModSecurity,swebru\/ModSecurity,csanders-git\/ModSecurity,wafbuild\/ModSecurity,swebru\/ModSecurity,sdgdsffdsfff\/ModSecurity,daniilyar\/ModSecurity,beikezcs\/ModSecurity,p0pr0ck5\/ModSecurity,beikezcs\/ModSecurity,swebru\/ModSecurity,bjh7242\/ModSecurity,defanator\/ModSecurity,csanders-git\/ModSecurity,phpModSecurity\/ModSecurity,beikezcs\/ModSecurity,swebru\/ModSecurity,irtnog\/ModSecurity,p0pr0ck5\/ModSecurity,daniilyar\/ModSecurity,irtnog\/ModSecurity,sdgdsffdsfff\/ModSecurity,hbopuri\/ModSecurity,rosmo\/ModSecurity,sdgdsffdsfff\/ModSecurity,sdgdsffdsfff\/ModSecurity,csanders-git\/ModSecurity,beikezcs\/ModSecurity,marcstern\/ModSecurity,daniilyar\/ModSecurity,beikezcs\/ModSecurity,rosmo\/ModSecurity,bjh7242\/ModSecurity,swebru\/ModSecurity,SpiderLabs\/ModSecurity,bjh7242\/ModSecurity,irtnog\/ModSecurity,rosmo\/ModSecurity,bjh7242\/ModSecurity,beikezcs\/ModSecurity,irtnog\/ModSecurity,bjh7242\/ModSecurity,irtnog\/ModSecurity,csanders-git\/ModSecurity,hbopuri\/ModSecurity,swebru\/ModSecurity,hbopuri\/ModSecurity,SpiderLabs\/ModSecurity,csanders-git\/ModSecurity,daniilyar\/ModSecurity,wafbuild\/ModSecurity,wafbuild\/ModSecurity,p0pr0ck5\/ModSecurity,hbopuri\/ModSecurity,daniilyar\/ModSecurity,marcstern\/ModSecurity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apache2\/libinjection\/libinjection.h\n+++ apache2\/libinjection\/libinjection.h\n@@ -19,7 +19,7 @@\n * See python's normalized version\n * http:\/\/www.python.org\/dev\/peps\/pep-0386\/#normalizedversion\n *\/\n-#define LIBINJECTION_VERSION \"3.0.0-pre21\"\n+#define LIBINJECTION_VERSION \"3.0.0\"\n \n \/**\n * Libinjection's sqli module makes a \"normalized\"\n"} {"commit":"b07a754613447bfdd3c33e21ff2db3deb18b4ba7","subject":"MOD: Improving docu","message":"MOD: Improving docu\n","repos":"cbeck88\/cegui-mirror-two,cbeck88\/cegui-mirror-two,cbeck88\/cegui-mirror-two,cbeck88\/cegui-mirror-two,cbeck88\/cegui-mirror-two","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cegui\/include\/CEGUI\/RenderTarget.h\n+++ cegui\/include\/CEGUI\/RenderTarget.h\n@@ -140,7 +140,7 @@\n Activate the render target and put it in a state ready to be drawn to.\n \n \\note\n- You MUST call this before doing any rendering - if you do not call this,\n+ This must be called before doing any rendering - if it is not called,\n in the unlikely event that your application actually works, it will\n likely stop working in some future version.\n *\/\n@@ -151,9 +151,9 @@\n Deactivate the render target after having completed rendering.\n \n \\note\n- You MUST call this after you finish rendering to the target - if you do\n- not call this, in the unlikely event that your application actually\n- works, it will likely stop working in some future version.\n+ This must be called before doing any rendering - if it is not called,\n+ in the unlikely event that your application actually works, it will\n+ likely stop working in some future version.\n *\/\n virtual void deactivate() = 0;\n \n"} {"commit":"2681a076d5b72942cc8883fef4a9a974b838fe87","subject":"Removed includion of <iostream> from logging.h.","message":"Removed includion of <iostream> from logging.h.\n\nSo that it does not introduce static initializers into including files.\n\nTEST=try\nBUG=54904\n\nReview URL: http:\/\/codereview.chromium.org\/3354018\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@59119 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"yitian134\/chromium,gavinp\/chromium,Crystalnix\/house-of-life-chromium,yitian134\/chromium,yitian134\/chromium,Crystalnix\/house-of-life-chromium,yitian134\/chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,adobe\/chromium,adobe\/chromium,Crystalnix\/house-of-life-chromium,gavinp\/chromium,ropik\/chromium,ropik\/chromium,gavinp\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,ropik\/chromium,gavinp\/chromium,ropik\/chromium,adobe\/chromium,yitian134\/chromium,gavinp\/chromium,yitian134\/chromium,gavinp\/chromium,adobe\/chromium,adobe\/chromium,Crystalnix\/house-of-life-chromium,gavinp\/chromium,adobe\/chromium,ropik\/chromium,gavinp\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,ropik\/chromium,ropik\/chromium,adobe\/chromium,ropik\/chromium,yitian134\/chromium,ropik\/chromium,gavinp\/chromium,yitian134\/chromium,adobe\/chromium,yitian134\/chromium,yitian134\/chromium,gavinp\/chromium,adobe\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gpu\/command_buffer\/common\/logging.h\n+++ gpu\/command_buffer\/common\/logging.h\n@@ -1,4 +1,4 @@\n-\/\/ Copyright (c) 2009 The Chromium Authors. All rights reserved.\n+\/\/ Copyright (c) 2010 The Chromium Authors. All rights reserved.\n \/\/ Use of this source code is governed by a BSD-style license that can be\n \/\/ found in the LICENSE file.\n \n@@ -6,8 +6,10 @@\n #define GPU_COMMAND_BUFFER_COMMON_LOGGING_H_\n \n #include <assert.h>\n-\n-#include <iostream>\n+#include <stdio.h>\n+\n+#include <sstream>\n+#include <string>\n \n \/\/ Windows defines an ERROR macro.\n #ifdef ERROR\n@@ -26,8 +28,8 @@\n };\n \n \/\/ This is a very simple logger for use in command buffer code. Common and\n-\/\/ command buffer code cannot be dependent on base. It just outputs the message\n-\/\/ to stderr.\n+\/\/ client side command buffer code cannot be dependent on base. It just outputs\n+\/\/ the message to stderr, flushes and asserts if the error was fatal.\n class Logger {\n public:\n Logger(bool condition, LogLevel level)\n@@ -113,8 +115,9 @@\n \n ~Logger() {\n if (!condition_) {\n- std::cerr << std::endl;\n- std::cerr.flush();\n+ message_stream_ << std::endl;\n+ fputs(message_stream_.str().c_str(), stderr);\n+ fflush(stderr);\n if (level_ == FATAL)\n assert(false);\n }\n@@ -123,7 +126,7 @@\n template <typename T>\n Logger& operator<<(const T& value) {\n if (!condition_)\n- std::cerr << value;\n+ message_stream_ << value;\n return *this;\n }\n \n@@ -131,6 +134,7 @@\n Logger(const Logger& logger): condition_(logger.condition_) {\n }\n \n+ std::stringstream message_stream_;\n bool condition_;\n LogLevel level_;\n };\n"} {"commit":"f7b7a365331deb4553944a0b695dd6371614053a","subject":"skge: fix build on 32 bit","message":"skge: fix build on 32 bit\n\nThe following is needed as well to fix warning\/error about shifting a 32 bit\nvalue 32 bits which occurs if building on 32 bit platform caused by conversion\nto using dma_addr_t\n\nSigned-off-by: Stephen Hemminger <06fa905d7f2aaced6dc72e9511c71a2a51e8aead@networkplumber.org>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"7dbeb2fc51b89e110a81e623538da2118eb5619a","subject":"Rejigger a typedef.","message":"Rejigger a typedef.\n","repos":"phs\/sauce,phs\/sauce,phs\/sauce,phs\/sauce","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sauce\/internal\/new_binding.h\n+++ sauce\/internal\/new_binding.h\n@@ -18,20 +18,20 @@\n template<typename Dependency, typename Scope, typename Constructor, typename Allocator>\n class NewBinding: public Binding<Dependency, Scope> {\n \n- typedef NewBinding<Dependency, Scope, Constructor, Allocator> New;\n+ typedef NewBinding<Dependency, Scope, Constructor, Allocator> NewBinding_;\n \n \/**\n * A mixin for ApplyVariadic parameter concept types.\n *\/\n struct NewBindingFriend {\n template<typename T>\n- void validateAcyclicHelper(New const & binding, InjectorPtr injector, TypeIds & ids, std::string dependencyName) {\n- binding.template validateAcyclicHelper<T>(injector, ids, dependencyName);\n+ void validateAcyclicHelper(NewBinding_ const & binding, InjectorPtr injector, TypeIds & ids, std::string name) {\n+ binding.template validateAcyclicHelper<T>(injector, ids, name);\n }\n \n template<typename T>\n- typename Key<T>::Ptr getHelper(New const & binding, InjectorPtr injector, std::string dependencyName) {\n- return binding.template getHelper<typename i::Key<T>::Normalized>(injector, dependencyName);\n+ typename Key<T>::Ptr getHelper(NewBinding_ const & binding, InjectorPtr injector, std::string name) {\n+ return binding.template getHelper<typename i::Key<T>::Normalized>(injector, name);\n }\n };\n \n@@ -39,10 +39,10 @@\n \n struct InjectParameters {\n struct Passed {\n- New const & binding;\n+ NewBinding_ const & binding;\n InjectorPtr & injector;\n \n- Passed(New const & binding, InjectorPtr & injector):\n+ Passed(NewBinding_ const & binding, InjectorPtr & injector):\n binding(binding), injector(injector) {}\n };\n \n@@ -51,7 +51,7 @@\n typedef typename Key<T>::Ptr Ptr;\n \n Ptr yield(Passed passed) {\n- New const & binding = passed.binding;\n+ NewBinding_ const & binding = passed.binding;\n InjectorPtr & injector = passed.injector;\n std::string dependencyName = binding.dynamicDependencyNames[i];\n \n@@ -65,24 +65,24 @@\n typedef typename Key<Dependency>::Iface Iface;\n typedef typename Key<Dependency>::Ptr IfacePtr;\n typedef sauce::shared_ptr<Impl> ImplPtr;\n- typedef DisposalDeleter<Iface, New> Deleter;\n+ typedef DisposalDeleter<Iface, NewBinding_> Deleter;\n \n std::vector<std::string> dynamicDependencyNames;\n \n struct ValidateAcyclicParameters {\n struct Passed {\n- New const & binding;\n+ NewBinding_ const & binding;\n InjectorPtr & injector;\n TypeIds & ids;\n \n- Passed(New const & binding, InjectorPtr & injector, TypeIds & ids):\n+ Passed(NewBinding_ const & binding, InjectorPtr & injector, TypeIds & ids):\n binding(binding), injector(injector), ids(ids) {}\n };\n \n template<typename T, int i, typename Passed>\n struct Parameter: public NewBindingFriend {\n void observe(Passed passed) {\n- New const & binding = passed.binding;\n+ NewBinding_ const & binding = passed.binding;\n InjectorPtr & injector = passed.injector;\n TypeIds & ids = passed.ids;\n std::string dependencyName = binding.dynamicDependencyNames[i];\n@@ -118,7 +118,7 @@\n *\/\n void inject(IfacePtr & injected, BindingPtr binding, InjectorPtr injector) const {\n typename InjectParameters::Passed passed(*this, injector);\n- Deleter deleter(sauce::static_pointer_cast<New>(binding));\n+ Deleter deleter(sauce::static_pointer_cast<NewBinding_>(binding));\n ImplPtr impl(applyConstructor<InjectParameters, Constructor, Allocator>(passed), deleter);\n SelfInjector<Impl> selfInjector;\n selfInjector.setSelf(impl);\n"} {"commit":"3163eaba34943967aebb1eefa0d4bdc4e5dc197c","subject":"video: s3c_fb.c: fix build with CONFIG_HOTPLUG=n","message":"video: s3c_fb.c: fix build with CONFIG_HOTPLUG=n\n\nFixes `s3c_fb_remove' referenced in section `.data' of\ndrivers\/built-in.o: defined in discarded section `.devexit.text' of\ndrivers\/built-in.o\n\nWith CONFIG_HOTPLUG=n, functions marked with __devexit gets removed,\nso make sure we use __devexit_p when referencing pointers to them.\n\nSigned-off-by: Peter Korsgaard <109eb201e07c93b5f5b6b8c6537366649a85e9a2@sunsite.dk>\nAcked-by: Ben Dooks <1177f64998f284a7348354b8e91cbbe575d9858a@fluff.org>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/s3c-fb.c\n+++ drivers\/video\/s3c-fb.c\n@@ -1036,7 +1036,7 @@\n \n static struct platform_driver s3c_fb_driver = {\n \t.probe\t\t= s3c_fb_probe,\n-\t.remove\t\t= s3c_fb_remove,\n+\t.remove\t\t= __devexit_p(s3c_fb_remove),\n \t.suspend\t= s3c_fb_suspend,\n \t.resume\t\t= s3c_fb_resume,\n \t.driver\t\t= {\n"} {"commit":"1ca65c8a03b3021b80592b6d7da82ede527ce088","subject":"client_http_get : free stat","message":"client_http_get : free stat\n","repos":"NEAT-project\/neat,NEAT-project\/neat,NEAT-project\/neat,NEAT-project\/neat,NEAT-project\/neat","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/client_http_get.c\n+++ examples\/client_http_get.c\n@@ -240,6 +240,8 @@\n opCB->on_error = NULL;\n neat_set_operations(opCB->ctx, opCB->flow, opCB);\n \n+ free(opCB->userData);\n+\n \/\/ stop event loop if all flows are closed\n flows_active--;\n if (config_log_level >= 1) {\n"} {"commit":"90c1946e7a3aaabaed630474304485b7c850cfa6","subject":"Don't core dump when using CMAC with dgst.","message":"Don't core dump when using CMAC with dgst.\n\nWe can't unfortunately print the CMAC cipher used without extending the API.\n\nPR#2579\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/dgst.c\n+++ apps\/dgst.c\n@@ -529,7 +529,8 @@\n \t\t\t\t\tEVP_PKEY_asn1_get0_info(NULL, NULL,\n \t\t\t\t\t\tNULL, NULL, &sig_name, ameth);\n \t\t\t\t}\n-\t\t\tmd_name = EVP_MD_name(md);\n+\t\t\tif (md)\n+\t\t\t\tmd_name = EVP_MD_name(md);\n \t\t\t}\n \t\terr = 0;\n \t\tfor (i=0; i<argc; i++)\n@@ -641,7 +642,12 @@\n \telse \n \t\t{\n \t\tif (sig_name)\n-\t\t\tBIO_printf(out, \"%s-%s(%s)= \", sig_name, md_name, file);\n+\t\t\t{\n+\t\t\tBIO_puts(out, sig_name);\n+\t\t\tif (md_name)\n+\t\t\t\tBIO_printf(out, \"-%s\", md_name);\n+\t\t\tBIO_printf(out, \"(%s)= \", file);\n+\t\t\t}\n \t\telse if (md_name)\n \t\t\tBIO_printf(out, \"%s(%s)= \", md_name, file);\n \t\telse\n"} {"commit":"4d58e3d008092b8f094d0876352e89fca243d3cc","subject":"net\/i40e\/base: fix PHY config param when enabling EEE","message":"net\/i40e\/base: fix PHY config param when enabling EEE\n\nThe i40e_enable_eee function did not copy phy_type_ext field\nfrom current PHY configuration retrieved with Get PHY Abilities AQ.\nIt caused a misconfiguration of the PHY on devices supporting 2.5\nand 5G speeds and prevented establishing link when only those\nspeeds were selected for advertisement.\n\nFixes: c61bcb0fe1b0 (\"net\/i40e\/base: support Energy Efficient Ethernet\")\nCc: stable@dpdk.org\n\nSigned-off-by: Galazka Krzysztof <fc41448041fc4d7ffde6cd07674100ddab93438f@intel.com>\nSigned-off-by: Guinan Sun <2859c668e0b5b1e71d3c9d7ddf700c8e237b77a7@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/i40e\/base\/i40e_common.c\n+++ drivers\/net\/i40e\/base\/i40e_common.c\n@@ -6449,6 +6449,7 @@\n \n \t\/* Cache current configuration *\/\n \tconfig.phy_type = abilities.phy_type;\n+\tconfig.phy_type_ext = abilities.phy_type_ext;\n \tconfig.link_speed = abilities.link_speed;\n \tconfig.abilities = abilities.abilities |\n \t\t\t I40E_AQ_PHY_ENABLE_ATOMIC_LINK;\n"} {"commit":"32571f05c0680c26d648e7d88cf05fe3e0ea5cf5","subject":"r214781 caused the timer value to be rounded down, so that if the user asked for 59 minutes 30 was sent to the drive. The timer value is now always rounded up.","message":"r214781 caused the timer value to be rounded down, so that if the user asked\nfor 59 minutes 30 was sent to the drive. The timer value is now always\nrounded up.\n\nReported by: mav\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sbin\/camcontrol\/camcontrol.c\n+++ sbin\/camcontrol\/camcontrol.c\n@@ -4312,18 +4312,16 @@\n \t\tcmd = ATA_SLEEP;\n \t\tt = -1;\n \t}\n+\n \tif (t < 0)\n \t\tsc = 0;\n \telse if (t <= (240 * 5))\n-\t\tsc = t \/ 5;\n-\telse if (t == (252 * 5))\n+\t\tsc = (t + 4) \/ 5;\n+\telse if (t <= (252 * 5))\n \t\t\/* special encoding for 21 minutes *\/\n \t\tsc = 252;\n-\telse if (t < (30 * 60))\n-\t\t\/* no encoding exists for 22-29 minutes, so set to 30 mins *\/\n-\t\tsc = 241;\n \telse if (t <= (11 * 30 * 60))\n-\t\tsc = t \/ (30 * 60) + 240;\n+\t\tsc = (t - 1) \/ (30 * 60) + 241;\n \telse\n \t\tsc = 253;\n \n"} {"commit":"8552943f41373583b5185a9686102251c544c07e","subject":"prune_remote(): iterate using for_each_string_list_item()","message":"prune_remote(): iterate using for_each_string_list_item()\n\nIterate over refs_to_prune using for_each_string_list_item() rather\nthan writing out the loop in longhand.\n\nSigned-off-by: Michael Haggerty <c24c152f145c57791e809b126db9e61bd1c1782d@alum.mit.edu>\nReviewed-by: Jonathan Nieder <b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com>\nSigned-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- builtin\/remote.c\n+++ builtin\/remote.c\n@@ -1309,9 +1309,10 @@\n \n static int prune_remote(const char *remote, int dry_run)\n {\n-\tint result = 0, i;\n+\tint result = 0;\n \tstruct ref_states states;\n \tstruct string_list refs_to_prune = STRING_LIST_INIT_NODUP;\n+\tstruct string_list_item *item;\n \tconst char *dangling_msg = dry_run\n \t\t? _(\" %s will become dangling!\")\n \t\t: _(\" %s has become dangling!\");\n@@ -1330,11 +1331,8 @@\n \t\t ? states.remote->url[0]\n \t\t : _(\"(no URL)\"));\n \n-\tfor (i = 0; i < states.stale.nr; i++) {\n-\t\tconst char *refname = states.stale.items[i].util;\n-\n-\t\tstring_list_append(&refs_to_prune, refname);\n-\t}\n+\tfor_each_string_list_item(item, &states.stale)\n+\t\tstring_list_append(&refs_to_prune, item->util);\n \tsort_string_list(&refs_to_prune);\n \n \tif (!dry_run) {\n@@ -1344,8 +1342,8 @@\n \t\tstrbuf_release(&err);\n \t}\n \n-\tfor (i = 0; i < states.stale.nr; i++) {\n-\t\tconst char *refname = states.stale.items[i].util;\n+\tfor_each_string_list_item(item, &states.stale) {\n+\t\tconst char *refname = item->util;\n \n \t\tif (!dry_run)\n \t\t\tresult |= delete_ref(refname, NULL, 0);\n"} {"commit":"b01d08e0bdda41c4c94db4f1c221fc805dc95bd6","subject":"[examples] Correcting indentation of preprocessor directives (part 3)","message":"[examples] Correcting indentation of preprocessor directives (part 3)\n\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@16293 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- examples\/compilers\/japhc.c\n+++ examples\/compilers\/japhc.c\n@@ -14,7 +14,7 @@\n #define C_DEBUG 0\n \n #if C_DEBUG\n-#include <stdio.h>\n+# include <stdio.h>\n # define cdebug(x) fprintf x\n #else\n # define cdebug(x)\n"} {"commit":"39fc4c17c49d248e0757bac9aa8863d205c7ad12","subject":"Coverity fix in apps\/oscp","message":"Coverity fix in apps\/oscp\n\nCID 1440002 (#1 of 1): Use after free (USE_AFTER_FREE)\nNot a deadly error, because error was just before app exit.\n\nReviewed-by: Richard Levitte <5fb523282dd7956571c80524edc2dccfa0bd8234@openssl.org>\nReviewed-by: Matt Caswell <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/7359)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/ocsp.c\n+++ apps\/ocsp.c\n@@ -863,6 +863,7 @@\n for (i = 0; i < multi; ++i)\n if (kidpids[i] != 0)\n (void)kill(kidpids[i], SIGTERM);\n+ OPENSSL_free(kidpids);\n sleep(1);\n exit(ret);\n }\n@@ -977,7 +978,6 @@\n }\n \n \/* The loop above can only break on termsig *\/\n- OPENSSL_free(kidpids);\n syslog(LOG_INFO, \"terminating on signal: %d\", termsig);\n killall(0, kidpids);\n }\n"} {"commit":"77dcf5728e0b4f08738cc92acbf35e208a38695b","subject":"Don't use currentNode_ when added entity declarations","message":"Don't use currentNode_ when added entity declarations\n","repos":"draekko\/arabica,draekko\/arabica,draekko\/arabica,draekko\/arabica,draekko\/arabica","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- DOM\/SAX2DOM\/SAX2DOM.h\n+++ DOM\/SAX2DOM\/SAX2DOM.h\n@@ -299,20 +299,15 @@\n EntityT* entity = new EntityT(0, name, SA_.makeStringT(\"\"), SA_.makeStringT(\"\"), SA_.makeStringT(\"\"));\n declaredEntities_.insert(std::make_pair(name, entity));\n documentType_->addEntity(entity);\n- currentNode_ = entity;\n- currentNode_.appendChild(document_.createTextNode(value));\n- currentNode_ = document_;\n+ DOM::Node<stringT> n = entity;\n+ n.appendChild(document_.createTextNode(value));\n } \/\/ internalEntityDecl\n \n virtual void externalEntityDecl(const stringT& name, const stringT& publicId, const stringT& systemId)\n {\n EntityT* entity = new EntityT(0, name, publicId, systemId, SA_.makeStringT(\"\"));\n- currentNode_ = entity;\n-\n declaredEntities_.insert(std::make_pair(name, entity)); \/\/ we'll populate it later\n-\n documentType_->addEntity(entity);\n- currentNode_ = document_;\n } \/\/ externalEntityDecl\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n"} {"commit":"999566af0a6cf91f92c1ba7498282e5be599ba05","subject":"net\/ixgbe\/base: support MAC X550em\/X557 LED on\/off","message":"net\/ixgbe\/base: support MAC X550em\/X557 LED on\/off\n\nThis patch updates ixgbe_led_[on|off]_t_X550em for MAC or PHY connected\nLEDs. To support both MAC or PHY connected LEDs, both MAC and PHY led\ncontrol registers are configured.\n\nSigned-off-by: Wei Dai <17e09bedab62904a2ae618ef4468b0b1372334a2@intel.com>\nTested-by: Yuan Peng <8f7613f20c127e29e1ae4d11e8d64be87217a51b@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ixgbe\/base\/ixgbe_x550.c\n+++ drivers\/net\/ixgbe\/base\/ixgbe_x550.c\n@@ -4610,7 +4610,8 @@\n \tixgbe_write_phy_reg(hw, IXGBE_X557_LED_PROVISIONING + led_idx,\n \t\t\t IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE, phy_data);\n \n-\treturn IXGBE_SUCCESS;\n+\t\/* Some designs have the LEDs wired to the MAC *\/\n+\treturn ixgbe_led_on_generic(hw, led_idx);\n }\n \n \/**\n@@ -4634,7 +4635,8 @@\n \tixgbe_write_phy_reg(hw, IXGBE_X557_LED_PROVISIONING + led_idx,\n \t\t\t IXGBE_MDIO_VENDOR_SPECIFIC_1_DEV_TYPE, phy_data);\n \n-\treturn IXGBE_SUCCESS;\n+\t\/* Some designs have the LEDs wired to the MAC *\/\n+\treturn ixgbe_led_off_generic(hw, led_idx);\n }\n \n \/**\n"} {"commit":"53a049d006a18dfc8086dc640ee158dccf326480","subject":"Fix an ignored fread() warning.","message":"Fix an ignored fread() warning.\n\nGCC now warns if the return code for fread() and similar functions is \nignored, but it can be pacified just by assigning it to a variable. \nClang isn't pursuaded by this and still warns that nothing is done\nto check the result.\n\nThis combines the dummy read of the 4 byte chunk size (which we ignore)\nwith the subsequent read for the 'WAVE' chunk id so that the length\ncheck covers both.\n\n\ngit-svn-id: 8dbf393e6e9ab8d4979d29f9a341a98016792aa6@16517 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"KTXSoftware\/theora,KTXSoftware\/theora,Distrotech\/libtheora,KTXSoftware\/theora,KTXSoftware\/theora,Distrotech\/libtheora,KTXSoftware\/theora,Distrotech\/libtheora,Distrotech\/libtheora,Distrotech\/libtheora","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/encoder_example.c\n+++ examples\/encoder_example.c\n@@ -731,10 +731,9 @@\n \n \/* Parse the rest of the header *\/\n \n- ret=fread(buffer,1,4,test);\n- ret=fread(buffer,1,4,test);\n- if(ret<4)goto riff_err;\n- if(!memcmp(buffer,\"WAVE\",4)){\n+ ret=fread(buffer,1,8,test);\n+ if(ret<8)goto riff_err;\n+ if(!memcmp(buffer+4,\"WAVE\",4)){\n \n while(!feof(test)){\n ret=fread(buffer,1,4,test);\n"} {"commit":"5fe499cb75469fbda08d96facd13d14a402a6d44","subject":"Actually silently ignore GET \/ OCSP requests","message":"Actually silently ignore GET \/ OCSP requests\n\nReviewed-by: Matt Caswell <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/ocsp.c\n+++ apps\/ocsp.c\n@@ -1436,9 +1436,11 @@\n *q = '\\0';\n \n \/*\n- * Skip \"GET \/ HTTP...\" requests often used by load-balancers\n+ * Skip \"GET \/ HTTP...\" requests often used by load-balancers. Note:\n+ * 'p' was incremented above to point to the first byte *after* the\n+ * leading slash, so with 'GET \/ ' it is now an empty string.\n *\/\n- if (p[1] == '\\0')\n+ if (p[0] == '\\0')\n goto out;\n \n len = urldecode(p);\n"} {"commit":"aa668e1e19fba528cf157af5e67d77d4c5a7c5dd","subject":"Update LEX\/YACC precompiled files for internal debugger","message":"Update LEX\/YACC precompiled files for internal debugger\n","repos":"dbrashear\/bochs,dariaphoebe\/bochs,dariaphoebe\/bochs,dbrashear\/bochs,dbrashear\/bochs,dariaphoebe\/bochs,dbrashear\/bochs,dbrashear\/bochs,dariaphoebe\/bochs,dariaphoebe\/bochs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bx_debug\/lexer.c\n+++ bx_debug\/lexer.c\n@@ -19,7 +19,7 @@\n \/* A lexical scanner generated by flex *\/\n \n \/* Scanner skeleton version:\n- * $Header: \/tmp\/tmp\/cvs\/bochs\/bx_debug\/lexer.c,v 1.32 2008\/04\/19 20:01:09 sshwarts Exp $\n+ * $Header: \/tmp\/tmp\/cvs\/bochs\/bx_debug\/lexer.c,v 1.33 2008\/04\/19 20:21:29 sshwarts Exp $\n *\/\n \n #define FLEX_SCANNER\n@@ -1101,7 +1101,7 @@\n #define INITIAL 0\n #line 2 \"lexer.l\"\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\/\/ $Id: lexer.c,v 1.32 2008\/04\/19 20:01:09 sshwarts Exp $\n+\/\/ $Id: lexer.c,v 1.33 2008\/04\/19 20:21:29 sshwarts Exp $\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n #include <stdlib.h>\n"} {"commit":"5740294ca3a9b113fe146f2826effb69ca50008d","subject":"eeepc-laptop: Implement rfkill hotplugging in eeepc-laptop","message":"eeepc-laptop: Implement rfkill hotplugging in eeepc-laptop\n\nThe Eee implements rfkill by logically unplugging the wireless card from the\nPCI bus. Despite sending ACPI notifications, this does not appear to be\nimplemented using standard ACPI hotplug - nor does the firmware provide the\n_OSC method required to support native PCIe hotplug. The only sensible choice\nappears to be to handle the hotplugging directly in the eeepc-laptop driver.\nTested successfully on a 700, 900 and 901.\n\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\nSigned-off-by: Corentin Chary <298d22bb5b8e08c296f77ec9e7162462cf47b8a1@iksaif.net>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/platform\/x86\/eeepc-laptop.c\n+++ drivers\/platform\/x86\/eeepc-laptop.c\n@@ -30,6 +30,7 @@\n #include <linux\/uaccess.h>\n #include <linux\/input.h>\n #include <linux\/rfkill.h>\n+#include <linux\/pci.h>\n \n #define EEEPC_LAPTOP_VERSION\t\"0.1\"\n \n@@ -517,6 +518,41 @@\n \tbd->props.brightness = read_brightness(bd);\n }\n \n+static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)\n+{\n+\tstruct pci_dev *dev;\n+\tstruct pci_bus *bus = pci_find_bus(0, 1);\n+\n+\tif (event != ACPI_NOTIFY_BUS_CHECK)\n+\t\treturn;\n+\n+\tif (!bus) {\n+\t\tprintk(EEEPC_WARNING \"Unable to find PCI bus 1?\\n\");\n+\t\treturn;\n+\t}\n+\n+\tif (get_acpi(CM_ASL_WLAN) == 1) {\n+\t\tdev = pci_get_slot(bus, 0);\n+\t\tif (dev) {\n+\t\t\t\/* Device already present *\/\n+\t\t\tpci_dev_put(dev);\n+\t\t\treturn;\n+\t\t}\n+\t\tdev = pci_scan_single_device(bus, 0);\n+\t\tif (dev) {\n+\t\t\tpci_bus_assign_resources(bus);\n+\t\t\tif (pci_bus_add_device(dev))\n+\t\t\t\tprintk(EEEPC_ERR \"Unable to hotplug wifi\\n\");\n+\t\t}\n+\t} else {\n+\t\tdev = pci_get_slot(bus, 0);\n+\t\tif (dev) {\n+\t\t\tpci_remove_bus_device(dev);\n+\t\t\tpci_dev_put(dev);\n+\t\t}\n+\t}\n+}\n+\n static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)\n {\n \tstatic struct key_entry *key;\n@@ -543,6 +579,45 @@\n \t}\n }\n \n+static int eeepc_register_rfkill_notifier(char *node)\n+{\n+\tacpi_status status = AE_OK;\n+\tacpi_handle handle;\n+\n+\tstatus = acpi_get_handle(NULL, node, &handle);\n+\n+\tif (ACPI_SUCCESS(status)) {\n+\t\tstatus = acpi_install_notify_handler(handle,\n+\t\t\t\t\t\t ACPI_SYSTEM_NOTIFY,\n+\t\t\t\t\t\t eeepc_rfkill_notify,\n+\t\t\t\t\t\t NULL);\n+\t\tif (ACPI_FAILURE(status))\n+\t\t\tprintk(EEEPC_WARNING\n+\t\t\t \"Failed to register notify on %s\\n\", node);\n+\t} else\n+\t\treturn -ENODEV;\n+\n+\treturn 0;\n+}\n+\n+static void eeepc_unregister_rfkill_notifier(char *node)\n+{\n+\tacpi_status status = AE_OK;\n+\tacpi_handle handle;\n+\n+\tstatus = acpi_get_handle(NULL, node, &handle);\n+\n+\tif (ACPI_SUCCESS(status)) {\n+\t\tstatus = acpi_remove_notify_handler(handle,\n+\t\t\t\t\t\t ACPI_SYSTEM_NOTIFY,\n+\t\t\t\t\t\t eeepc_rfkill_notify);\n+\t\tif (ACPI_FAILURE(status))\n+\t\t\tprintk(EEEPC_ERR\n+\t\t\t \"Error removing rfkill notify handler %s\\n\",\n+\t\t\t\tnode);\n+\t}\n+}\n+\n static int eeepc_hotk_add(struct acpi_device *device)\n {\n \tacpi_status status = AE_OK;\n@@ -622,6 +697,10 @@\n \t\tif (result)\n \t\t\tgoto bluetooth_fail;\n \t}\n+\n+\teeepc_register_rfkill_notifier(\"\\\\_SB.PCI0.P0P6\");\n+\teeepc_register_rfkill_notifier(\"\\\\_SB.PCI0.P0P7\");\n+\n \treturn 0;\n \n bluetooth_fail:\n@@ -649,6 +728,10 @@\n \t\t\t\t\t eeepc_hotk_notify);\n \tif (ACPI_FAILURE(status))\n \t\tprintk(EEEPC_ERR \"Error removing notify handler\\n\");\n+\n+\teeepc_unregister_rfkill_notifier(\"\\\\_SB.PCI0.P0P6\");\n+\teeepc_unregister_rfkill_notifier(\"\\\\_SB.PCI0.P0P7\");\n+\n \tkfree(ehotk);\n \treturn 0;\n }\n"} {"commit":"89492e3fdd7edbfab4a616dcb1bc18085b1e05d1","subject":"Nada","message":"Nada\n\n","repos":"Agadoul\/DevIL,Agadoul\/DevIL,bcampbell\/DevIL,Agadoul\/DevIL,Agadoul\/DevIL,Agadoul\/DevIL,DentonW\/DevIL,DentonW\/DevIL,bcampbell\/DevIL,bcampbell\/DevIL,DentonW\/DevIL,DentonW\/DevIL,bcampbell\/DevIL,bcampbell\/DevIL,DentonW\/DevIL,bcampbell\/DevIL,Agadoul\/DevIL,DentonW\/DevIL","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- DevIL\/include\/IL\/il.h\n+++ DevIL\/include\/IL\/il.h\n@@ -51,7 +51,9 @@\n \/\/#define IL_DEBUG\n \/\/#define IL_STATIC_LIB\n \/\/#define IL_NO_LCMS\n-#define IL_USE_JPEGLIB_UNMODIFIED\n+#ifdef _WIN32\n+\t#define IL_USE_JPEGLIB_UNMODIFIED\n+#endif\n \n #ifdef _WIN32_WCE\n \t#define IL_NO_GIF\n"} {"commit":"e19a3c97242825d7426758bad9e293068adf16ec","subject":"staging: comedi: comedi_buf: absorb comedi_write_array_to_buffer()","message":"staging: comedi: comedi_buf: absorb comedi_write_array_to_buffer()\n\nThis function is only called by comedi_buf_write_samples(). Absorb it.\n\nThe buffer overflow was already checked so the overflow check of\ncomedi_buf_write_alloc() can be removed.\n\nSigned-off-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nReviewed-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e37f08e3e03b314af002f647782b1c972e242fe4","subject":"Fixed StandardTokenizer bug","message":"Fixed StandardTokenizer bug\n\n\ngit-svn-id: 26a6d2a58b162bc133329b2f36847a121ee54040@784 06fd6eb0-0002-0410-a719-e5602cce40bc\n","repos":"dbalmain\/ferret,Bira\/ferret,dbalmain\/ferret,Bira\/ferret,dbalmain\/ferret,jkraemer\/ferret,dustin\/ferret,jkraemer\/ferret,jkraemer\/ferret,dbalmain\/ferret,dimelo\/ferret-dimelo,jkraemer\/ferret,dustin\/ferret,dustin\/ferret,dimelo\/ferret-dimelo,Bira\/ferret,Bira\/ferret,jkraemer\/ferret,dbalmain\/ferret,dustin\/ferret,dimelo\/ferret-dimelo,dimelo\/ferret-dimelo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/src\/analysis.c\n+++ c\/src\/analysis.c\n@@ -950,12 +950,12 @@\n }\n t++;\n }\n- while (isurlxatpunc(t[-1])) {\n+ while (isurlxatpunc(t[-1]) && t > ts->t) {\n t--; \/* strip trailing punctuation *\/\n }\n \n- if (t <= ts->t || (num_end != NULL && num_end <= ts->t)) {\n- fprintf(stderr, \"Warning encoding error. Please check that you are using the correct locale for your input\");\n+ if (t < ts->t || (num_end != NULL && num_end < ts->t)) {\n+ fprintf(stderr, \"Warning: encoding error. Please check that you are using the correct locale for your input\");\n return NULL;\n } else if (num_end == NULL || t > num_end) {\n ts->t = t;\n"} {"commit":"ddf837ea95017a658d2a4bac6b89fc0989f2e5e6","subject":"staging: comedi: comedi_usb.c: improve function documentation","message":"staging: comedi: comedi_usb.c: improve function documentation\n\nExpand the descriptions of the functions and document the return values.\n\nSigned-off-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nReviewed-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"96b8fd92360eb2ef64a842e0173e9c9d23b651c5","subject":"GEN: interpolate: regenerate interpnd.c","message":"GEN: interpolate: regenerate interpnd.c\n\ngit-svn-id: 003f22d385e25de9cff933a5ea4efd77cb5e7b28@6697 d6536bca-fef9-0310-8506-e4c0a848fbcf\n","repos":"lesserwhirls\/scipy-cwt,lesserwhirls\/scipy-cwt,scipy\/scipy-svn,jasonmccampbell\/scipy-refactor,scipy\/scipy-svn,scipy\/scipy-svn,jasonmccampbell\/scipy-refactor,scipy\/scipy-svn,lesserwhirls\/scipy-cwt,lesserwhirls\/scipy-cwt,jasonmccampbell\/scipy-refactor,jasonmccampbell\/scipy-refactor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- scipy\/interpolate\/interpnd.c\n+++ scipy\/interpolate\/interpnd.c\n@@ -2,17 +2,38 @@\n \n #define PY_SSIZE_T_CLEAN\n #include \"Python.h\"\n-#include \"structmember.h\"\n #ifndef Py_PYTHON_H\n #error Python headers needed to compile C extensions, please install development version of Python.\n #else\n \n-#ifndef PY_LONG_LONG\n- #define PY_LONG_LONG LONG_LONG\n+#include <stddef.h> \n+#ifndef offsetof\n+#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )\n+#endif\n+\n+#if !defined(WIN32) && !defined(MS_WINDOWS)\n+ #ifndef __stdcall\n+ #define __stdcall\n+ #endif\n+ #ifndef __cdecl\n+ #define __cdecl\n+ #endif\n+ #ifndef __fastcall\n+ #define __fastcall\n+ #endif\n+#endif\n+\n+#ifndef DL_IMPORT\n+ #define DL_IMPORT(t) t\n #endif\n #ifndef DL_EXPORT\n #define DL_EXPORT(t) t\n #endif\n+\n+#ifndef PY_LONG_LONG\n+ #define PY_LONG_LONG LONG_LONG\n+#endif\n+\n #if PY_VERSION_HEX < 0x02040000\n #define METH_COEXIST 0\n #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)\n@@ -82,11 +103,35 @@\n \n #if PY_MAJOR_VERSION >= 3\n #define PyBaseString_Type PyUnicode_Type\n+ #define PyStringObject PyUnicodeObject\n #define PyString_Type PyUnicode_Type\n+ #define PyString_Check PyUnicode_Check\n #define PyString_CheckExact PyUnicode_CheckExact\n-#else\n+#endif\n+\n+#if PY_VERSION_HEX < 0x02060000\n+ #define PyBytesObject PyStringObject\n #define PyBytes_Type PyString_Type\n+ #define PyBytes_Check PyString_Check\n #define PyBytes_CheckExact PyString_CheckExact\n+ #define PyBytes_FromString PyString_FromString\n+ #define PyBytes_FromStringAndSize PyString_FromStringAndSize\n+ #define PyBytes_FromFormat PyString_FromFormat\n+ #define PyBytes_DecodeEscape PyString_DecodeEscape\n+ #define PyBytes_AsString PyString_AsString\n+ #define PyBytes_AsStringAndSize PyString_AsStringAndSize\n+ #define PyBytes_Size PyString_Size\n+ #define PyBytes_AS_STRING PyString_AS_STRING\n+ #define PyBytes_GET_SIZE PyString_GET_SIZE\n+ #define PyBytes_Repr PyString_Repr\n+ #define PyBytes_Concat PyString_Concat\n+ #define PyBytes_ConcatAndDel PyString_ConcatAndDel\n+ #define PySet_Check(obj) PyObject_TypeCheck(obj, &PySet_Type)\n+ #define PyFrozenSet_Check(obj) PyObject_TypeCheck(obj, &PyFrozenSet_Type)\n+#endif\n+\n+#ifndef PySet_CheckExact\n+# define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type)\n #endif\n \n #if PY_MAJOR_VERSION >= 3\n@@ -103,30 +148,23 @@\n #define PyInt_AsSsize_t PyLong_AsSsize_t\n #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask\n #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask\n+#endif\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define PyBoolObject PyLongObject\n+#endif\n+\n+\n+#if PY_MAJOR_VERSION >= 3\n #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n #else\n #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)\n #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)\n-\n #endif\n \n #if PY_MAJOR_VERSION >= 3\n- #define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)\n-#endif\n-\n-#if !defined(WIN32) && !defined(MS_WINDOWS)\n- #ifndef __stdcall\n- #define __stdcall\n- #endif\n- #ifndef __cdecl\n- #define __cdecl\n- #endif\n- #ifndef __fastcall\n- #define __fastcall\n- #endif\n-#else\n- #define _USE_MATH_DEFINES\n+ #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))\n #endif\n \n #if PY_VERSION_HEX < 0x02050000\n@@ -146,114 +184,65 @@\n #define __Pyx_NAMESTR(n) (n)\n #define __Pyx_DOCSTR(n) (n)\n #endif\n+\n #ifdef __cplusplus\n #define __PYX_EXTERN_C extern \"C\"\n #else\n #define __PYX_EXTERN_C extern\n #endif\n+\n+#if defined(WIN32) || defined(MS_WINDOWS)\n+#define _USE_MATH_DEFINES\n+#endif\n #include <math.h>\n #define __PYX_HAVE_API__interpnd\n+#include \"stdio.h\"\n #include \"stdlib.h\"\n-#include \"stdio.h\"\n #include \"numpy\/arrayobject.h\"\n #include \"numpy\/ufuncobject.h\"\n #include \"numpy\/ndarrayobject.h\"\n #include \"math.h\"\n+\n \n #ifndef CYTHON_INLINE\n #if defined(__GNUC__)\n #define CYTHON_INLINE __inline__\n #elif defined(_MSC_VER)\n #define CYTHON_INLINE __inline\n+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n+ #define CYTHON_INLINE inline\n #else\n #define CYTHON_INLINE \n #endif\n #endif\n \n+\n+#ifndef CYTHON_UNUSED\n+# if defined(__GNUC__)\n+# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))\n+# define CYTHON_UNUSED __attribute__ ((__unused__)) \n+# else\n+# define CYTHON_UNUSED\n+# endif\n+# elif defined(__ICC) || defined(__INTEL_COMPILER)\n+# define CYTHON_UNUSED __attribute__ ((__unused__)) \n+# else\n+# define CYTHON_UNUSED \n+# endif\n+#endif\n+\n typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; \n \n \n \n \n-#if PY_MAJOR_VERSION < 3\n-#define __Pyx_PyBytes_FromString PyString_FromString\n-#define __Pyx_PyBytes_FromStringAndSize PyString_FromStringAndSize\n-#define __Pyx_PyBytes_AsString PyString_AsString\n-#else\n-#define __Pyx_PyBytes_FromString PyBytes_FromString\n-#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize\n-#define __Pyx_PyBytes_AsString PyBytes_AsString\n-#endif\n-\n-#define __Pyx_PyBytes_FromUString(s) __Pyx_PyBytes_FromString((char*)s)\n-#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))\n+#define __Pyx_PyBytes_FromUString(s) PyBytes_FromString((char*)s)\n+#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) PyBytes_AsString(s))\n \n #define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))\n static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);\n static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);\n \n-#if !defined(T_PYSSIZET)\n-#if PY_VERSION_HEX < 0x02050000\n-#define T_PYSSIZET T_INT\n-#elif !defined(T_LONGLONG)\n-#define T_PYSSIZET \\\n- ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \\\n- ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : -1))\n-#else\n-#define T_PYSSIZET \\\n- ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \\\n- ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : \\\n- ((sizeof(Py_ssize_t) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))\n-#endif\n-#endif\n-\n-\n-#if !defined(T_ULONGLONG)\n-#define __Pyx_T_UNSIGNED_INT(x) \\\n- ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \\\n- ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \\\n- ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \\\n- ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : -1))))\n-#else\n-#define __Pyx_T_UNSIGNED_INT(x) \\\n- ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \\\n- ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \\\n- ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \\\n- ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : \\\n- ((sizeof(x) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))))\n-#endif\n-#if !defined(T_LONGLONG)\n-#define __Pyx_T_SIGNED_INT(x) \\\n- ((sizeof(x) == sizeof(char)) ? T_BYTE : \\\n- ((sizeof(x) == sizeof(short)) ? T_SHORT : \\\n- ((sizeof(x) == sizeof(int)) ? T_INT : \\\n- ((sizeof(x) == sizeof(long)) ? T_LONG : -1))))\n-#else\n-#define __Pyx_T_SIGNED_INT(x) \\\n- ((sizeof(x) == sizeof(char)) ? T_BYTE : \\\n- ((sizeof(x) == sizeof(short)) ? T_SHORT : \\\n- ((sizeof(x) == sizeof(int)) ? T_INT : \\\n- ((sizeof(x) == sizeof(long)) ? T_LONG : \\\n- ((sizeof(x) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))))\n-#endif\n-\n-#define __Pyx_T_FLOATING(x) \\\n- ((sizeof(x) == sizeof(float)) ? T_FLOAT : \\\n- ((sizeof(x) == sizeof(double)) ? T_DOUBLE : -1))\n-\n-#if !defined(T_SIZET)\n-#if !defined(T_ULONGLONG)\n-#define T_SIZET \\\n- ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \\\n- ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : -1))\n-#else\n-#define T_SIZET \\\n- ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \\\n- ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : \\\n- ((sizeof(size_t) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))\n-#endif\n-#endif\n-\n static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);\n static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);\n static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);\n@@ -263,7 +252,7 @@\n \n #ifdef __GNUC__\n \n-#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)) \n+#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)) \n #define likely(x) __builtin_expect(!!(x), 1)\n #define unlikely(x) __builtin_expect(!!(x), 0)\n #else \n@@ -283,7 +272,6 @@\n static int __pyx_clineno = 0;\n static const char * __pyx_cfilenm= __FILE__;\n static const char *__pyx_filename;\n-static const char **__pyx_f;\n \n \n #if !defined(CYTHON_CCOMPLEX)\n@@ -308,6 +296,11 @@\n #undef _Complex_I\n #define _Complex_I 1.0fj\n #endif\n+\n+static const char *__pyx_f[] = {\n+ \"interpnd.pyx\",\n+ \"numpy.pxd\",\n+};\n \n typedef npy_int8 __pyx_t_5numpy_int8_t;\n \n@@ -454,6 +447,8 @@\n #define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);} } while(0)\n #define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r);} } while(0)\n \n+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); \n+\n static void __Pyx_RaiseDoubleKeywordsError(\n const char* func_name, PyObject* kw_name); \n \n@@ -472,11 +467,11 @@\n }\n \n \n-#define __Pyx_GetItemInt_List(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n- __Pyx_GetItemInt_List_Fast(o, i, size <= sizeof(long)) : \\\n+#define __Pyx_GetItemInt_List(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_List_Fast(o, i) : \\\n __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n \n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i) {\n if (likely(o != Py_None)) {\n if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {\n PyObject *r = PyList_GET_ITEM(o, i);\n@@ -489,14 +484,14 @@\n return r;\n }\n }\n- return __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+ return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n }\n \n-#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n- __Pyx_GetItemInt_Tuple_Fast(o, i, size <= sizeof(long)) : \\\n+#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_Tuple_Fast(o, i) : \\\n __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n \n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i) {\n if (likely(o != Py_None)) {\n if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {\n PyObject *r = PyTuple_GET_ITEM(o, i);\n@@ -509,15 +504,15 @@\n return r;\n }\n }\n- return __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+ return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n }\n \n \n-#define __Pyx_GetItemInt(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n- __Pyx_GetItemInt_Fast(o, i, size <= sizeof(long)) : \\\n+#define __Pyx_GetItemInt(o, i, size, to_py_func) (((size) <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_Fast(o, i) : \\\n __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n \n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i) {\n PyObject *r;\n if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {\n r = PyList_GET_ITEM(o, i);\n@@ -531,7 +526,7 @@\n r = PySequence_GetItem(o, i);\n }\n else {\n- r = __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+ r = __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n }\n return r;\n }\n@@ -541,6 +536,9 @@\n #define __Pyx_PyObject_AsDouble(obj) \\\n ((likely(PyFloat_CheckExact(obj))) ? \\\n PyFloat_AS_DOUBLE(obj) : __Pyx__PyObject_AsDouble(obj))\n+\n+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact); \n \n \n struct __Pyx_StructField_;\n@@ -564,8 +562,8 @@\n } __Pyx_BufFmt_StackElem;\n \n \n+static CYTHON_INLINE int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack);\n static CYTHON_INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info);\n-static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack);\n \n static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); \n \n@@ -576,19 +574,13 @@\n static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); \n #define __Pyx_BufPtrStrided3d(type, buf, i0, s0, i1, s1, i2, s2) (type)((char*)buf + i0 * s0 + i1 * s1 + i2 * s2)\n \n+static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);\n+\n static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);\n \n-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void);\n-\n-static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); \n-static int __Pyx_EndUnpack(PyObject *); \n-\n-static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);\n+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected);\n \n static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index); \n-\n-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n- const char *name, int exact); \n \n #if CYTHON_CCOMPLEX\n #ifdef __cplusplus\n@@ -653,13 +645,11 @@\n \n static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); \n \n-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); \n-\n static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, const char *modname); \n \n static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); \n \n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp);\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_Py_intptr_t(Py_intptr_t);\n \n #ifndef __PYX_FORCE_INIT_THREADS\n #if PY_VERSION_HEX < 0x02040200\n@@ -719,6 +709,8 @@\n \n static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);\n \n+static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject *);\n+\n static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);\n \n static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);\n@@ -740,6 +732,8 @@\n static void __Pyx_AddTraceback(const char *funcname); \n \n static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); \n+\n+\n \n \n \n@@ -786,15 +780,15 @@\n static int __pyx_f_8interpnd__estimate_gradients_2d_global(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, int, double, double *); \n static double __pyx_f_8interpnd__clough_tocher_2d_single_double(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int, double *, double *, double *); \n static __pyx_t_double_complex __pyx_f_8interpnd__clough_tocher_2d_single_complex(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int, double *, __pyx_t_double_complex *, __pyx_t_double_complex *); \n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_double_t = { \"numpy.double_t\", NULL, sizeof(__pyx_t_5numpy_double_t), 'R' };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn_npy_int = { \"numpy.npy_int\", NULL, sizeof(npy_int), 'I' };\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_double_t = { \"double_t\", NULL, sizeof(__pyx_t_5numpy_double_t), 'R' };\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn_npy_int = { \"npy_int\", NULL, sizeof(npy_int), 'I' };\n static __Pyx_TypeInfo __Pyx_TypeInfo_double = { \"double\", NULL, sizeof(double), 'R' };\n static __Pyx_StructField __Pyx_StructFields_nn___pyx_t_5numpy_complex_t[] = {\n {&__Pyx_TypeInfo_double, \"real\", offsetof(__pyx_t_5numpy_complex_t, real)},\n {&__Pyx_TypeInfo_double, \"imag\", offsetof(__pyx_t_5numpy_complex_t, imag)},\n {NULL, NULL, 0}\n };\n-static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_complex_t = { \"numpy.complex_t\", __Pyx_StructFields_nn___pyx_t_5numpy_complex_t, sizeof(__pyx_t_5numpy_complex_t), 'C' };\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_complex_t = { \"complex_t\", __Pyx_StructFields_nn___pyx_t_5numpy_complex_t, sizeof(__pyx_t_5numpy_complex_t), 'C' };\n #define __Pyx_MODULE_NAME \"interpnd\"\n int __pyx_module_is_main_interpnd = 0;\n \n@@ -802,7 +796,6 @@\n static PyObject *__pyx_builtin_object;\n static PyObject *__pyx_builtin_Warning;\n static PyObject *__pyx_builtin_ValueError;\n-static PyObject *__pyx_builtin_map;\n static PyObject *__pyx_builtin_xrange;\n static PyObject *__pyx_builtin_enumerate;\n static PyObject *__pyx_builtin_range;\n@@ -859,7 +852,6 @@\n static char __pyx_k__xi[] = \"xi\";\n static char __pyx_k__buf[] = \"buf\";\n static char __pyx_k__eps[] = \"eps\";\n-static char __pyx_k__map[] = \"map\";\n static char __pyx_k__nan[] = \"nan\";\n static char __pyx_k__obj[] = \"obj\";\n static char __pyx_k__tol[] = \"tol\";\n@@ -925,6 +917,7 @@\n static char __pyx_k__values_shape[] = \"values_shape\";\n static char __pyx_k__complexfloating[] = \"complexfloating\";\n static char __pyx_k___evaluate_double[] = \"_evaluate_double\";\n+static char __pyx_k__broadcast_arrays[] = \"broadcast_arrays\";\n static char __pyx_k___check_call_shape[] = \"_check_call_shape\";\n static char __pyx_k___check_init_shape[] = \"_check_init_shape\";\n static char __pyx_k___evaluate_complex[] = \"_evaluate_complex\";\n@@ -976,6 +969,7 @@\n static PyObject *__pyx_n_s__ascontiguousarray;\n static PyObject *__pyx_n_s__astype;\n static PyObject *__pyx_n_s__base;\n+static PyObject *__pyx_n_s__broadcast_arrays;\n static PyObject *__pyx_n_s__buf;\n static PyObject *__pyx_n_s__byteorder;\n static PyObject *__pyx_n_s__complex;\n@@ -997,7 +991,6 @@\n static PyObject *__pyx_n_s__is_complex;\n static PyObject *__pyx_n_s__issubdtype;\n static PyObject *__pyx_n_s__itemsize;\n-static PyObject *__pyx_n_s__map;\n static PyObject *__pyx_n_s__maxiter;\n static PyObject *__pyx_n_s__names;\n static PyObject *__pyx_n_s__nan;\n@@ -1104,12 +1097,12 @@\n case 3:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__fill_value);\n- if (unlikely(value)) { values[3] = value; kw_args--; }\n+ if (value) { values[3] = value; kw_args--; }\n }\n case 4:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__ndim);\n- if (unlikely(value)) { values[4] = value; kw_args--; }\n+ if (value) { values[4] = value; kw_args--; }\n }\n }\n if (unlikely(kw_args > 0)) {\n@@ -1141,13 +1134,11 @@\n __Pyx_RaiseArgtupleInvalid(\"__init__\", 0, 3, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase.__init__\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n __Pyx_INCREF(__pyx_v_points);\n __Pyx_INCREF(__pyx_v_values);\n- __Pyx_INCREF(__pyx_v_fill_value);\n- __Pyx_INCREF(__pyx_v_ndim);\n \n \n __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -1464,11 +1455,8 @@\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase.__init__\");\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_DECREF(__pyx_v_self);\n __Pyx_DECREF(__pyx_v_points);\n __Pyx_DECREF(__pyx_v_values);\n- __Pyx_DECREF(__pyx_v_fill_value);\n- __Pyx_DECREF(__pyx_v_ndim);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -1526,7 +1514,7 @@\n case 3:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__ndim);\n- if (unlikely(value)) { values[3] = value; kw_args--; }\n+ if (value) { values[3] = value; kw_args--; }\n }\n }\n if (unlikely(kw_args > 0)) {\n@@ -1554,12 +1542,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_check_init_shape\", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase._check_init_shape\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n- __Pyx_INCREF(__pyx_v_points);\n- __Pyx_INCREF(__pyx_v_values);\n- __Pyx_INCREF(__pyx_v_ndim);\n \n \n __pyx_t_1 = PyObject_GetAttr(__pyx_v_values, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -1672,11 +1657,11 @@\n \n \n __pyx_t_1 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_6), __pyx_v_ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_1));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_1));\n __pyx_t_1 = 0;\n __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n@@ -1697,10 +1682,6 @@\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase._check_init_shape\");\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_DECREF(__pyx_v_self);\n- __Pyx_DECREF(__pyx_v_points);\n- __Pyx_DECREF(__pyx_v_values);\n- __Pyx_DECREF(__pyx_v_ndim);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -1758,9 +1739,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_check_call_shape\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase._check_call_shape\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n __Pyx_INCREF(__pyx_v_xi);\n \n \n@@ -1835,7 +1816,6 @@\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase._check_call_shape\");\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_DECREF(__pyx_v_self);\n __Pyx_DECREF(__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n@@ -1898,9 +1878,9 @@\n __Pyx_RaiseArgtupleInvalid(\"__call__\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.NDInterpolatorBase.__call__\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n __Pyx_INCREF(__pyx_v_xi);\n __pyx_v_shape = Py_None; __Pyx_INCREF(Py_None);\n __pyx_v_r = Py_None; __Pyx_INCREF(Py_None);\n@@ -2097,7 +2077,6 @@\n __pyx_L0:;\n __Pyx_DECREF(__pyx_v_shape);\n __Pyx_DECREF(__pyx_v_r);\n- __Pyx_DECREF(__pyx_v_self);\n __Pyx_DECREF(__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n@@ -2119,9 +2098,9 @@\n PyObject *__pyx_t_4 = NULL;\n int __pyx_t_5;\n PyObject *__pyx_t_6 = NULL;\n- Py_ssize_t __pyx_t_7;\n+ PyObject *__pyx_t_7 = NULL;\n Py_ssize_t __pyx_t_8;\n- PyObject *__pyx_t_9 = NULL;\n+ Py_ssize_t __pyx_t_9;\n PyObject *__pyx_t_10 = NULL;\n __Pyx_RefNannySetupContext(\"_ndim_coords_from_arrays\");\n __pyx_self = __pyx_self;\n@@ -2131,9 +2110,9 @@\n __pyx_v_item = Py_None; __Pyx_INCREF(Py_None);\n \n \n- __pyx_t_1 = PyObject_TypeCheck(__pyx_v_points, ((PyTypeObject *)((PyObject*)&PyTuple_Type))); \n+ __pyx_t_1 = PyTuple_Check(__pyx_v_points); \n if (!__pyx_t_1) {\n- __pyx_t_2 = PyObject_TypeCheck(__pyx_v_points, ((PyTypeObject *)((PyObject*)&PyList_Type))); \n+ __pyx_t_2 = PyList_Check(__pyx_v_points); \n __pyx_t_3 = __pyx_t_2;\n } else {\n __pyx_t_3 = __pyx_t_1;\n@@ -2158,93 +2137,88 @@\n \n __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__asanyarray); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__broadcast_arrays); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_6);\n- __Pyx_GIVEREF(__pyx_t_6);\n- __Pyx_INCREF(__pyx_v_points);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_v_points);\n- __Pyx_GIVEREF(__pyx_v_points);\n- __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_Call(__pyx_builtin_map, __pyx_t_4, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PySequence_Tuple(__pyx_v_points); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n+ __pyx_t_7 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_v_p);\n- __pyx_v_p = __pyx_t_6;\n- __pyx_t_6 = 0;\n-\n- \n- __pyx_t_8 = PyObject_Length(__pyx_v_p); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_8); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_v_p = __pyx_t_7;\n+ __pyx_t_7 = 0;\n+\n+ \n+ __pyx_t_9 = PyObject_Length(__pyx_v_p); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyInt_FromSsize_t(__pyx_t_9); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_INCREF(__pyx_int_1);\n PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_int_1);\n __Pyx_GIVEREF(__pyx_int_1);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_6);\n- __Pyx_GIVEREF(__pyx_t_6);\n- __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_Call(__pyx_builtin_xrange, __pyx_t_4, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_7);\n+ __pyx_t_7 = 0;\n+ __pyx_t_7 = PyObject_Call(__pyx_builtin_xrange, __pyx_t_4, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (PyList_CheckExact(__pyx_t_6) || PyTuple_CheckExact(__pyx_t_6)) {\n- __pyx_t_7 = 0; __pyx_t_4 = __pyx_t_6; __Pyx_INCREF(__pyx_t_4);\n+ if (PyList_CheckExact(__pyx_t_7) || PyTuple_CheckExact(__pyx_t_7)) {\n+ __pyx_t_8 = 0; __pyx_t_4 = __pyx_t_7; __Pyx_INCREF(__pyx_t_4);\n } else {\n- __pyx_t_7 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_8 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_t_7); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n }\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n for (;;) {\n if (likely(PyList_CheckExact(__pyx_t_4))) {\n- if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++;\n+ if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_4)) break;\n+ __pyx_t_7 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_8); __Pyx_INCREF(__pyx_t_7); __pyx_t_8++;\n } else if (likely(PyTuple_CheckExact(__pyx_t_4))) {\n- if (__pyx_t_7 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_7); __Pyx_INCREF(__pyx_t_6); __pyx_t_7++;\n+ if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n+ __pyx_t_7 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_8); __Pyx_INCREF(__pyx_t_7); __pyx_t_8++;\n } else {\n- __pyx_t_6 = PyIter_Next(__pyx_t_4);\n- if (!__pyx_t_6) {\n+ __pyx_t_7 = PyIter_Next(__pyx_t_4);\n+ if (!__pyx_t_7) {\n if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n break;\n }\n- __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_GOTREF(__pyx_t_7);\n }\n __Pyx_DECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_6;\n- __pyx_t_6 = 0;\n+ __pyx_v_j = __pyx_t_7;\n+ __pyx_t_7 = 0;\n \n \n- __pyx_t_6 = PyObject_GetItem(__pyx_v_p, __pyx_v_j); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyObject_GetItem(__pyx_v_p, __pyx_v_j); if (!__pyx_t_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_7, __pyx_n_s__shape); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_9 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_v_p, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_10 = PyObject_GetAttr(__pyx_t_7, __pyx_n_s__shape); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_10);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_t_7 = PyObject_RichCompare(__pyx_t_6, __pyx_t_10, Py_NE); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetItemInt(__pyx_v_p, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_10 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__shape); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyObject_RichCompare(__pyx_t_9, __pyx_t_10, Py_NE); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n if (__pyx_t_1) {\n \n \n- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n __Pyx_INCREF(((PyObject *)__pyx_kp_s_8));\n- PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_kp_s_8));\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)__pyx_kp_s_8));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_8));\n- __pyx_t_10 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_6, NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_10 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_7, NULL); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_Raise(__pyx_t_10, 0, 0);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n {__pyx_filename = __pyx_f[0]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -2262,110 +2236,110 @@\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_p, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__shape); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__shape); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_8 = PyObject_Length(__pyx_v_points); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyInt_FromSsize_t(__pyx_t_8); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_7 = PyObject_Length(__pyx_v_points); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_4 = PyInt_FromSsize_t(__pyx_t_7); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_4);\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_6, __pyx_t_9); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_7, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_4);\n+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_4);\n __pyx_t_4 = 0;\n __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), ((PyObject *)((PyObject*)&PyFloat_Type))) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_t_6 = PyEval_CallObjectWithKeywords(__pyx_t_10, __pyx_t_9, ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = PyEval_CallObjectWithKeywords(__pyx_t_10, __pyx_t_6, ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_v_points);\n+ __pyx_v_points = __pyx_t_7;\n+ __pyx_t_7 = 0;\n+\n+ \n+ __Pyx_INCREF(__pyx_int_0);\n+ __pyx_t_7 = __pyx_int_0;\n+ if (PyList_CheckExact(__pyx_v_p) || PyTuple_CheckExact(__pyx_v_p)) {\n+ __pyx_t_8 = 0; __pyx_t_4 = __pyx_v_p; __Pyx_INCREF(__pyx_t_4);\n+ } else {\n+ __pyx_t_8 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_p); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ }\n+ for (;;) {\n+ if (likely(PyList_CheckExact(__pyx_t_4))) {\n+ if (__pyx_t_8 >= PyList_GET_SIZE(__pyx_t_4)) break;\n+ __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_8); __Pyx_INCREF(__pyx_t_6); __pyx_t_8++;\n+ } else if (likely(PyTuple_CheckExact(__pyx_t_4))) {\n+ if (__pyx_t_8 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n+ __pyx_t_6 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_8); __Pyx_INCREF(__pyx_t_6); __pyx_t_8++;\n+ } else {\n+ __pyx_t_6 = PyIter_Next(__pyx_t_4);\n+ if (!__pyx_t_6) {\n+ if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ break;\n+ }\n+ __Pyx_GOTREF(__pyx_t_6);\n+ }\n+ __Pyx_DECREF(__pyx_v_item);\n+ __pyx_v_item = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+ __Pyx_INCREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_v_j);\n+ __pyx_v_j = __pyx_t_7;\n+ __pyx_t_6 = PyNumber_Add(__pyx_t_7, __pyx_int_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_7);\n+ __pyx_t_7 = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+\n+ \n+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_INCREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, Py_Ellipsis);\n+ __Pyx_GIVEREF(Py_Ellipsis);\n+ __Pyx_INCREF(__pyx_v_j);\n+ PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_j);\n+ __Pyx_GIVEREF(__pyx_v_j);\n+ if (PyObject_SetItem(__pyx_v_points, __pyx_t_6, __pyx_v_item) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ }\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ goto __pyx_L5;\n+ }\n+ {\n+\n+ \n+ __pyx_t_7 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_7, __pyx_n_s__asanyarray); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_INCREF(__pyx_v_points);\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_points);\n+ __Pyx_GIVEREF(__pyx_v_points);\n+ __pyx_t_6 = PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_DECREF(__pyx_v_points);\n __pyx_v_points = __pyx_t_6;\n __pyx_t_6 = 0;\n-\n- \n- __Pyx_INCREF(__pyx_int_0);\n- __pyx_t_6 = __pyx_int_0;\n- if (PyList_CheckExact(__pyx_v_p) || PyTuple_CheckExact(__pyx_v_p)) {\n- __pyx_t_7 = 0; __pyx_t_4 = __pyx_v_p; __Pyx_INCREF(__pyx_t_4);\n- } else {\n- __pyx_t_7 = -1; __pyx_t_4 = PyObject_GetIter(__pyx_v_p); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- }\n- for (;;) {\n- if (likely(PyList_CheckExact(__pyx_t_4))) {\n- if (__pyx_t_7 >= PyList_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_9 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_7); __Pyx_INCREF(__pyx_t_9); __pyx_t_7++;\n- } else if (likely(PyTuple_CheckExact(__pyx_t_4))) {\n- if (__pyx_t_7 >= PyTuple_GET_SIZE(__pyx_t_4)) break;\n- __pyx_t_9 = PyTuple_GET_ITEM(__pyx_t_4, __pyx_t_7); __Pyx_INCREF(__pyx_t_9); __pyx_t_7++;\n- } else {\n- __pyx_t_9 = PyIter_Next(__pyx_t_4);\n- if (!__pyx_t_9) {\n- if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_9);\n- }\n- __Pyx_DECREF(__pyx_v_item);\n- __pyx_v_item = __pyx_t_9;\n- __pyx_t_9 = 0;\n- __Pyx_INCREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_v_j);\n- __pyx_v_j = __pyx_t_6;\n- __pyx_t_9 = PyNumber_Add(__pyx_t_6, __pyx_int_1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_6);\n- __pyx_t_6 = __pyx_t_9;\n- __pyx_t_9 = 0;\n-\n- \n- __pyx_t_9 = PyTuple_New(2); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_INCREF(Py_Ellipsis);\n- PyTuple_SET_ITEM(__pyx_t_9, 0, Py_Ellipsis);\n- __Pyx_GIVEREF(Py_Ellipsis);\n- __Pyx_INCREF(__pyx_v_j);\n- PyTuple_SET_ITEM(__pyx_t_9, 1, __pyx_v_j);\n- __Pyx_GIVEREF(__pyx_v_j);\n- if (PyObject_SetItem(__pyx_v_points, __pyx_t_9, __pyx_v_item) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- goto __pyx_L5;\n- }\n- {\n-\n- \n- __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_4 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__asanyarray); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_INCREF(__pyx_v_points);\n- PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_points);\n- __Pyx_GIVEREF(__pyx_v_points);\n- __pyx_t_9 = PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_DECREF(__pyx_v_points);\n- __pyx_v_points = __pyx_t_9;\n- __pyx_t_9 = 0;\n }\n __pyx_L5:;\n \n@@ -2380,7 +2354,7 @@\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_4);\n __Pyx_XDECREF(__pyx_t_6);\n- __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_XDECREF(__pyx_t_7);\n __Pyx_XDECREF(__pyx_t_10);\n __Pyx_AddTraceback(\"interpnd._ndim_coords_from_arrays\");\n __pyx_r = NULL;\n@@ -2443,7 +2417,7 @@\n case 3:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__fill_value);\n- if (unlikely(value)) { values[3] = value; kw_args--; }\n+ if (value) { values[3] = value; kw_args--; }\n }\n }\n if (unlikely(kw_args > 0)) {\n@@ -2471,6 +2445,7 @@\n __Pyx_RaiseArgtupleInvalid(\"__init__\", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.LinearNDInterpolator.__init__\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n \n@@ -2653,10 +2628,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_evaluate_double\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.LinearNDInterpolator._evaluate_double\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n- __Pyx_INCREF((PyObject *)__pyx_v_xi);\n __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_eps = Py_None; __Pyx_INCREF(Py_None);\n __pyx_bstruct_values.buf = NULL;\n@@ -2754,7 +2728,7 @@\n __pyx_t_1 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_intp((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_7 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__values); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n@@ -2895,7 +2869,7 @@\n __pyx_t_22 = __pyx_v_k;\n if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_out;\n if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_out;\n- *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_out.buf, __pyx_t_21, __pyx_bstride_0_out, __pyx_t_22, __pyx_bstride_1_out) = 0;\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_out.buf, __pyx_t_21, __pyx_bstride_0_out, __pyx_t_22, __pyx_bstride_1_out) = 0.0;\n }\n \n \n@@ -2930,13 +2904,13 @@\n __pyx_L9_continue:;\n }\n }\n+\n+ \n {\n int __pyx_why;\n __pyx_why = 0; goto __pyx_L8;\n __pyx_L7: __pyx_why = 4; goto __pyx_L8;\n __pyx_L8:;\n-\n- \n Py_BLOCK_THREADS\n switch (__pyx_why) {\n case 4: goto __pyx_L1_error;\n@@ -2984,8 +2958,6 @@\n __Pyx_XDECREF((PyObject *)__pyx_v_points);\n __Pyx_XDECREF((PyObject *)__pyx_v_vertices);\n __Pyx_DECREF(__pyx_v_eps);\n- __Pyx_DECREF(__pyx_v_self);\n- __Pyx_DECREF((PyObject *)__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -3119,10 +3091,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_evaluate_complex\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.LinearNDInterpolator._evaluate_complex\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n- __Pyx_INCREF((PyObject *)__pyx_v_xi);\n __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_eps = Py_None; __Pyx_INCREF(Py_None);\n __pyx_bstruct_values.buf = NULL;\n@@ -3220,7 +3191,7 @@\n __pyx_t_1 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = __Pyx_PyInt_to_py_npy_intp((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_7 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__values); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_7);\n@@ -3368,14 +3339,14 @@\n __pyx_t_25 = __pyx_v_k;\n if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_out;\n if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_1_out;\n- (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_complex_t *, __pyx_bstruct_out.buf, __pyx_t_24, __pyx_bstride_0_out, __pyx_t_25, __pyx_bstride_1_out)).real = 0;\n+ (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_complex_t *, __pyx_bstruct_out.buf, __pyx_t_24, __pyx_bstride_0_out, __pyx_t_25, __pyx_bstride_1_out)).real = 0.0;\n \n \n __pyx_t_26 = __pyx_v_i;\n __pyx_t_27 = __pyx_v_k;\n if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_0_out;\n if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_1_out;\n- (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_complex_t *, __pyx_bstruct_out.buf, __pyx_t_26, __pyx_bstride_0_out, __pyx_t_27, __pyx_bstride_1_out)).imag = 0;\n+ (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_complex_t *, __pyx_bstruct_out.buf, __pyx_t_26, __pyx_bstride_0_out, __pyx_t_27, __pyx_bstride_1_out)).imag = 0.0;\n }\n \n \n@@ -3421,13 +3392,13 @@\n __pyx_L9_continue:;\n }\n }\n+\n+ \n {\n int __pyx_why;\n __pyx_why = 0; goto __pyx_L8;\n __pyx_L7: __pyx_why = 4; goto __pyx_L8;\n __pyx_L8:;\n-\n- \n Py_BLOCK_THREADS\n switch (__pyx_why) {\n case 4: goto __pyx_L1_error;\n@@ -3475,8 +3446,6 @@\n __Pyx_XDECREF((PyObject *)__pyx_v_points);\n __Pyx_XDECREF((PyObject *)__pyx_v_vertices);\n __Pyx_DECREF(__pyx_v_eps);\n- __Pyx_DECREF(__pyx_v_self);\n- __Pyx_DECREF((PyObject *)__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -3517,7 +3486,7 @@\n __pyx_v_ipoint = __pyx_t_2;\n \n \n- (__pyx_v_y[__pyx_v_ipoint]) = 0;\n+ (__pyx_v_y[__pyx_v_ipoint]) = 0.0;\n }\n \n \n@@ -3526,7 +3495,7 @@\n __pyx_v_iiter = __pyx_t_3;\n \n \n- __pyx_v_err = 0;\n+ __pyx_v_err = 0.0;\n \n \n __pyx_t_4 = __pyx_v_d->npoints;\n@@ -3538,7 +3507,7 @@\n __pyx_v_k = __pyx_t_6;\n \n \n- (__pyx_v_Q[__pyx_v_k]) = 0;\n+ (__pyx_v_Q[__pyx_v_k]) = 0.0;\n }\n \n \n@@ -3546,7 +3515,7 @@\n __pyx_v_k = __pyx_t_6;\n \n \n- (__pyx_v_s[__pyx_v_k]) = 0;\n+ (__pyx_v_s[__pyx_v_k]) = 0.0;\n }\n \n \n@@ -3564,7 +3533,7 @@\n __pyx_v_ey = ((__pyx_v_d->points[((2 * __pyx_v_it.vertex2) + 1)]) - (__pyx_v_d->points[((2 * __pyx_v_it.vertex) + 1)]));\n \n \n- __pyx_v_L = sqrt((pow(__pyx_v_ex, 2) + pow(__pyx_v_ey, 2)));\n+ __pyx_v_L = sqrt((pow(__pyx_v_ex, 2.0) + pow(__pyx_v_ey, 2.0)));\n \n \n __pyx_v_L3 = ((__pyx_v_L * __pyx_v_L) * __pyx_v_L);\n@@ -3579,19 +3548,19 @@\n __pyx_v_df2 = (((-__pyx_v_ex) * (__pyx_v_y[((__pyx_v_it.vertex2 * 2) + 0)])) - (__pyx_v_ey * (__pyx_v_y[((__pyx_v_it.vertex2 * 2) + 1)])));\n \n \n- (__pyx_v_Q[0]) += (((4 * __pyx_v_ex) * __pyx_v_ex) \/ __pyx_v_L3);\n+ (__pyx_v_Q[0]) += (((4.0 * __pyx_v_ex) * __pyx_v_ex) \/ __pyx_v_L3);\n \n \n- (__pyx_v_Q[1]) += (((4 * __pyx_v_ex) * __pyx_v_ey) \/ __pyx_v_L3);\n+ (__pyx_v_Q[1]) += (((4.0 * __pyx_v_ex) * __pyx_v_ey) \/ __pyx_v_L3);\n \n \n- (__pyx_v_Q[3]) += (((4 * __pyx_v_ey) * __pyx_v_ey) \/ __pyx_v_L3);\n+ (__pyx_v_Q[3]) += (((4.0 * __pyx_v_ey) * __pyx_v_ey) \/ __pyx_v_L3);\n \n \n- (__pyx_v_s[0]) += ((((6 * (__pyx_v_f1 - __pyx_v_f2)) - (2 * __pyx_v_df2)) * __pyx_v_ex) \/ __pyx_v_L3);\n+ (__pyx_v_s[0]) += ((((6.0 * (__pyx_v_f1 - __pyx_v_f2)) - (2.0 * __pyx_v_df2)) * __pyx_v_ex) \/ __pyx_v_L3);\n \n \n- (__pyx_v_s[1]) += ((((6 * (__pyx_v_f1 - __pyx_v_f2)) - (2 * __pyx_v_df2)) * __pyx_v_ey) \/ __pyx_v_L3);\n+ (__pyx_v_s[1]) += ((((6.0 * (__pyx_v_f1 - __pyx_v_f2)) - (2.0 * __pyx_v_df2)) * __pyx_v_ey) \/ __pyx_v_L3);\n \n \n __pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_next((&__pyx_v_it));\n@@ -3722,12 +3691,12 @@\n case 2:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__maxiter);\n- if (unlikely(value)) { values[2] = value; kw_args--; }\n+ if (value) { values[2] = value; kw_args--; }\n }\n case 3:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__tol);\n- if (unlikely(value)) { values[3] = value; kw_args--; }\n+ if (value) { values[3] = value; kw_args--; }\n }\n }\n if (unlikely(kw_args > 0)) {\n@@ -3757,12 +3726,10 @@\n __Pyx_RaiseArgtupleInvalid(\"estimate_gradients_2d_global\", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.estimate_gradients_2d_global\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_tri);\n __Pyx_INCREF(__pyx_v_y);\n- __Pyx_INCREF(__pyx_v_maxiter);\n- __Pyx_INCREF(__pyx_v_tol);\n __pyx_v_data = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_grad = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_rg = Py_None; __Pyx_INCREF(Py_None);\n@@ -4158,13 +4125,13 @@\n \n __pyx_v_ret = __pyx_f_8interpnd__estimate_gradients_2d_global(__pyx_v_info, (((double *)__pyx_v_data->data) + (__pyx_v_info->npoints * __pyx_v_k)), __pyx_t_13, __pyx_t_14, (((double *)__pyx_v_grad->data) + ((2 * __pyx_v_info->npoints) * __pyx_v_k)));\n }\n+\n+ \n {\n int __pyx_why;\n __pyx_why = 0; goto __pyx_L15;\n __pyx_L14: __pyx_why = 4; goto __pyx_L15;\n __pyx_L15:;\n-\n- \n Py_BLOCK_THREADS\n switch (__pyx_why) {\n case 4: goto __pyx_L1_error;\n@@ -4276,10 +4243,7 @@\n __Pyx_DECREF(__pyx_v_r);\n __Pyx_DECREF(__pyx_v_y_shape);\n __Pyx_DECREF(__pyx_v_yi);\n- __Pyx_DECREF(__pyx_v_tri);\n __Pyx_DECREF(__pyx_v_y);\n- __Pyx_DECREF(__pyx_v_maxiter);\n- __Pyx_DECREF(__pyx_v_tol);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -4364,22 +4328,22 @@\n __pyx_v_e31y = ((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_isimplex) + 0)])))]) - (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_isimplex) + 2)])))]));\n \n \n- __pyx_v_e14x = ((__pyx_v_e12x - __pyx_v_e31x) \/ 3);\n-\n- \n- __pyx_v_e14y = ((__pyx_v_e12y - __pyx_v_e31y) \/ 3);\n-\n- \n- __pyx_v_e24x = (((-__pyx_v_e12x) + __pyx_v_e23x) \/ 3);\n-\n- \n- __pyx_v_e24y = (((-__pyx_v_e12y) + __pyx_v_e23y) \/ 3);\n-\n- \n- __pyx_v_e34x = ((__pyx_v_e31x - __pyx_v_e23x) \/ 3);\n-\n- \n- __pyx_v_e34y = ((__pyx_v_e31y - __pyx_v_e23y) \/ 3);\n+ __pyx_v_e14x = ((__pyx_v_e12x - __pyx_v_e31x) \/ 3.0);\n+\n+ \n+ __pyx_v_e14y = ((__pyx_v_e12y - __pyx_v_e31y) \/ 3.0);\n+\n+ \n+ __pyx_v_e24x = (((-__pyx_v_e12x) + __pyx_v_e23x) \/ 3.0);\n+\n+ \n+ __pyx_v_e24y = (((-__pyx_v_e12y) + __pyx_v_e23y) \/ 3.0);\n+\n+ \n+ __pyx_v_e34x = ((__pyx_v_e31x - __pyx_v_e23x) \/ 3.0);\n+\n+ \n+ __pyx_v_e34y = ((__pyx_v_e31y - __pyx_v_e23y) \/ 3.0);\n \n \n __pyx_v_f1 = (__pyx_v_f[0]);\n@@ -4412,37 +4376,37 @@\n __pyx_v_c3000 = __pyx_v_f1;\n \n \n- __pyx_v_c2100 = ((__pyx_v_df12 + (3 * __pyx_v_c3000)) \/ 3);\n-\n- \n- __pyx_v_c2010 = ((__pyx_v_df13 + (3 * __pyx_v_c3000)) \/ 3);\n+ __pyx_v_c2100 = ((__pyx_v_df12 + (3.0 * __pyx_v_c3000)) \/ 3.0);\n+\n+ \n+ __pyx_v_c2010 = ((__pyx_v_df13 + (3.0 * __pyx_v_c3000)) \/ 3.0);\n \n \n __pyx_v_c0300 = __pyx_v_f2;\n \n \n- __pyx_v_c1200 = ((__pyx_v_df21 + (3 * __pyx_v_c0300)) \/ 3);\n-\n- \n- __pyx_v_c0210 = ((__pyx_v_df23 + (3 * __pyx_v_c0300)) \/ 3);\n+ __pyx_v_c1200 = ((__pyx_v_df21 + (3.0 * __pyx_v_c0300)) \/ 3.0);\n+\n+ \n+ __pyx_v_c0210 = ((__pyx_v_df23 + (3.0 * __pyx_v_c0300)) \/ 3.0);\n \n \n __pyx_v_c0030 = __pyx_v_f3;\n \n \n- __pyx_v_c1020 = ((__pyx_v_df31 + (3 * __pyx_v_c0030)) \/ 3);\n-\n- \n- __pyx_v_c0120 = ((__pyx_v_df32 + (3 * __pyx_v_c0030)) \/ 3);\n-\n- \n- __pyx_v_c2001 = (((__pyx_v_c2100 + __pyx_v_c2010) + __pyx_v_c3000) \/ 3);\n-\n- \n- __pyx_v_c0201 = (((__pyx_v_c1200 + __pyx_v_c0300) + __pyx_v_c0210) \/ 3);\n-\n- \n- __pyx_v_c0021 = (((__pyx_v_c1020 + __pyx_v_c0120) + __pyx_v_c0030) \/ 3);\n+ __pyx_v_c1020 = ((__pyx_v_df31 + (3.0 * __pyx_v_c0030)) \/ 3.0);\n+\n+ \n+ __pyx_v_c0120 = ((__pyx_v_df32 + (3.0 * __pyx_v_c0030)) \/ 3.0);\n+\n+ \n+ __pyx_v_c2001 = (((__pyx_v_c2100 + __pyx_v_c2010) + __pyx_v_c3000) \/ 3.0);\n+\n+ \n+ __pyx_v_c0201 = (((__pyx_v_c1200 + __pyx_v_c0300) + __pyx_v_c0210) \/ 3.0);\n+\n+ \n+ __pyx_v_c0021 = (((__pyx_v_c1020 + __pyx_v_c0120) + __pyx_v_c0030) \/ 3.0);\n \n \n for (__pyx_t_1 = 0; __pyx_t_1 < 3; __pyx_t_1+=1) {\n@@ -4460,21 +4424,21 @@\n case 0:\n \n \n- __pyx_v_g1 = ((-2.0) \/ 3);\n+ __pyx_v_g1 = ((-2.) \/ 3.0);\n break;\n \n \n case 1:\n \n \n- __pyx_v_g2 = ((-2.0) \/ 3);\n+ __pyx_v_g2 = ((-2.) \/ 3.0);\n break;\n \n \n case 2:\n \n \n- __pyx_v_g3 = ((-2.0) \/ 3);\n+ __pyx_v_g3 = ((-2.) \/ 3.0);\n break;\n }\n \n@@ -4485,10 +4449,10 @@\n __pyx_L5:;\n \n \n- (__pyx_v_y[0]) = ((((__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3);\n-\n- \n- (__pyx_v_y[1]) = ((((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3);\n+ (__pyx_v_y[0]) = ((((__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3.0);\n+\n+ \n+ (__pyx_v_y[1]) = ((((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3.0);\n \n \n __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinates(2, (__pyx_v_d->transform + ((__pyx_v_isimplex * 2) * 3)), __pyx_v_y, __pyx_v_c);\n@@ -4498,46 +4462,46 @@\n case 0:\n \n \n- __pyx_v_g1 = ((((2 * (__pyx_v_c[2])) + (__pyx_v_c[1])) - 1) \/ ((2 - (3 * (__pyx_v_c[2]))) - (3 * (__pyx_v_c[1]))));\n+ __pyx_v_g1 = ((((2.0 * (__pyx_v_c[2])) + (__pyx_v_c[1])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[2]))) - (3.0 * (__pyx_v_c[1]))));\n break;\n \n \n case 1:\n \n \n- __pyx_v_g2 = ((((2 * (__pyx_v_c[0])) + (__pyx_v_c[2])) - 1) \/ ((2 - (3 * (__pyx_v_c[0]))) - (3 * (__pyx_v_c[2]))));\n+ __pyx_v_g2 = ((((2.0 * (__pyx_v_c[0])) + (__pyx_v_c[2])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[0]))) - (3.0 * (__pyx_v_c[2]))));\n break;\n \n \n case 2:\n \n \n- __pyx_v_g3 = ((((2 * (__pyx_v_c[1])) + (__pyx_v_c[0])) - 1) \/ ((2 - (3 * (__pyx_v_c[1]))) - (3 * (__pyx_v_c[0]))));\n+ __pyx_v_g3 = ((((2.0 * (__pyx_v_c[1])) + (__pyx_v_c[0])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[1]))) - (3.0 * (__pyx_v_c[0]))));\n break;\n }\n __pyx_L3_continue:;\n }\n \n \n- __pyx_v_c0111 = (((__pyx_v_g1 * ((((-__pyx_v_c0300) + (3 * __pyx_v_c0210)) - (3 * __pyx_v_c0120)) + __pyx_v_c0030)) + (((((-__pyx_v_c0300) + (2 * __pyx_v_c0210)) - __pyx_v_c0120) + __pyx_v_c0021) + __pyx_v_c0201)) \/ 2);\n-\n- \n- __pyx_v_c1011 = (((__pyx_v_g2 * ((((-__pyx_v_c0030) + (3 * __pyx_v_c1020)) - (3 * __pyx_v_c2010)) + __pyx_v_c3000)) + (((((-__pyx_v_c0030) + (2 * __pyx_v_c1020)) - __pyx_v_c2010) + __pyx_v_c2001) + __pyx_v_c0021)) \/ 2);\n-\n- \n- __pyx_v_c1101 = (((__pyx_v_g3 * ((((-__pyx_v_c3000) + (3 * __pyx_v_c2100)) - (3 * __pyx_v_c1200)) + __pyx_v_c0300)) + (((((-__pyx_v_c3000) + (2 * __pyx_v_c2100)) - __pyx_v_c1200) + __pyx_v_c2001) + __pyx_v_c0201)) \/ 2);\n-\n- \n- __pyx_v_c1002 = (((__pyx_v_c1101 + __pyx_v_c1011) + __pyx_v_c2001) \/ 3);\n-\n- \n- __pyx_v_c0102 = (((__pyx_v_c1101 + __pyx_v_c0111) + __pyx_v_c0201) \/ 3);\n-\n- \n- __pyx_v_c0012 = (((__pyx_v_c1011 + __pyx_v_c0111) + __pyx_v_c0021) \/ 3);\n-\n- \n- __pyx_v_c0003 = (((__pyx_v_c1002 + __pyx_v_c0102) + __pyx_v_c0012) \/ 3);\n+ __pyx_v_c0111 = (((__pyx_v_g1 * ((((-__pyx_v_c0300) + (3.0 * __pyx_v_c0210)) - (3.0 * __pyx_v_c0120)) + __pyx_v_c0030)) + (((((-__pyx_v_c0300) + (2.0 * __pyx_v_c0210)) - __pyx_v_c0120) + __pyx_v_c0021) + __pyx_v_c0201)) \/ 2.0);\n+\n+ \n+ __pyx_v_c1011 = (((__pyx_v_g2 * ((((-__pyx_v_c0030) + (3.0 * __pyx_v_c1020)) - (3.0 * __pyx_v_c2010)) + __pyx_v_c3000)) + (((((-__pyx_v_c0030) + (2.0 * __pyx_v_c1020)) - __pyx_v_c2010) + __pyx_v_c2001) + __pyx_v_c0021)) \/ 2.0);\n+\n+ \n+ __pyx_v_c1101 = (((__pyx_v_g3 * ((((-__pyx_v_c3000) + (3.0 * __pyx_v_c2100)) - (3.0 * __pyx_v_c1200)) + __pyx_v_c0300)) + (((((-__pyx_v_c3000) + (2.0 * __pyx_v_c2100)) - __pyx_v_c1200) + __pyx_v_c2001) + __pyx_v_c0201)) \/ 2.0);\n+\n+ \n+ __pyx_v_c1002 = (((__pyx_v_c1101 + __pyx_v_c1011) + __pyx_v_c2001) \/ 3.0);\n+\n+ \n+ __pyx_v_c0102 = (((__pyx_v_c1101 + __pyx_v_c0111) + __pyx_v_c0201) \/ 3.0);\n+\n+ \n+ __pyx_v_c0012 = (((__pyx_v_c1011 + __pyx_v_c0111) + __pyx_v_c0021) \/ 3.0);\n+\n+ \n+ __pyx_v_c0003 = (((__pyx_v_c1002 + __pyx_v_c0102) + __pyx_v_c0012) \/ 3.0);\n \n \n __pyx_v_minval = (__pyx_v_b[0]);\n@@ -4567,10 +4531,10 @@\n __pyx_v_b3 = ((__pyx_v_b[2]) - __pyx_v_minval);\n \n \n- __pyx_v_b4 = (3 * __pyx_v_minval);\n-\n- \n- __pyx_v_w = (((((((((((((((((((pow(__pyx_v_b1, 3) * __pyx_v_c3000) + (((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b2) * __pyx_v_c2100)) + (((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b3) * __pyx_v_c2010)) + (((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b4) * __pyx_v_c2001)) + (((3 * __pyx_v_b1) * pow(__pyx_v_b2, 2)) * __pyx_v_c1200)) + ((((6 * __pyx_v_b1) * __pyx_v_b2) * __pyx_v_b4) * __pyx_v_c1101)) + (((3 * __pyx_v_b1) * pow(__pyx_v_b3, 2)) * __pyx_v_c1020)) + ((((6 * __pyx_v_b1) * __pyx_v_b3) * __pyx_v_b4) * __pyx_v_c1011)) + (((3 * __pyx_v_b1) * pow(__pyx_v_b4, 2)) * __pyx_v_c1002)) + (pow(__pyx_v_b2, 3) * __pyx_v_c0300)) + (((3 * pow(__pyx_v_b2, 2)) * __pyx_v_b3) * __pyx_v_c0210)) + (((3 * pow(__pyx_v_b2, 2)) * __pyx_v_b4) * __pyx_v_c0201)) + (((3 * __pyx_v_b2) * pow(__pyx_v_b3, 2)) * __pyx_v_c0120)) + ((((6 * __pyx_v_b2) * __pyx_v_b3) * __pyx_v_b4) * __pyx_v_c0111)) + (((3 * __pyx_v_b2) * pow(__pyx_v_b4, 2)) * __pyx_v_c0102)) + (pow(__pyx_v_b3, 3) * __pyx_v_c0030)) + (((3 * pow(__pyx_v_b3, 2)) * __pyx_v_b4) * __pyx_v_c0021)) + (((3 * __pyx_v_b3) * pow(__pyx_v_b4, 2)) * __pyx_v_c0012)) + (pow(__pyx_v_b4, 3) * __pyx_v_c0003));\n+ __pyx_v_b4 = (3.0 * __pyx_v_minval);\n+\n+ \n+ __pyx_v_w = (((((((((((((((((((pow(__pyx_v_b1, 3.0) * __pyx_v_c3000) + (((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b2) * __pyx_v_c2100)) + (((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b3) * __pyx_v_c2010)) + (((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b4) * __pyx_v_c2001)) + (((3.0 * __pyx_v_b1) * pow(__pyx_v_b2, 2.0)) * __pyx_v_c1200)) + ((((6.0 * __pyx_v_b1) * __pyx_v_b2) * __pyx_v_b4) * __pyx_v_c1101)) + (((3.0 * __pyx_v_b1) * pow(__pyx_v_b3, 2.0)) * __pyx_v_c1020)) + ((((6.0 * __pyx_v_b1) * __pyx_v_b3) * __pyx_v_b4) * __pyx_v_c1011)) + (((3.0 * __pyx_v_b1) * pow(__pyx_v_b4, 2.0)) * __pyx_v_c1002)) + (pow(__pyx_v_b2, 3.0) * __pyx_v_c0300)) + (((3.0 * pow(__pyx_v_b2, 2.0)) * __pyx_v_b3) * __pyx_v_c0210)) + (((3.0 * pow(__pyx_v_b2, 2.0)) * __pyx_v_b4) * __pyx_v_c0201)) + (((3.0 * __pyx_v_b2) * pow(__pyx_v_b3, 2.0)) * __pyx_v_c0120)) + ((((6.0 * __pyx_v_b2) * __pyx_v_b3) * __pyx_v_b4) * __pyx_v_c0111)) + (((3.0 * __pyx_v_b2) * pow(__pyx_v_b4, 2.0)) * __pyx_v_c0102)) + (pow(__pyx_v_b3, 3.0) * __pyx_v_c0030)) + (((3.0 * pow(__pyx_v_b3, 2.0)) * __pyx_v_b4) * __pyx_v_c0021)) + (((3.0 * __pyx_v_b3) * pow(__pyx_v_b4, 2.0)) * __pyx_v_c0012)) + (pow(__pyx_v_b4, 3.0) * __pyx_v_c0003));\n \n \n __pyx_r = __pyx_v_w;\n@@ -4660,22 +4624,22 @@\n __pyx_v_e31y = ((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_isimplex) + 0)])))]) - (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_isimplex) + 2)])))]));\n \n \n- __pyx_v_e14x = ((__pyx_v_e12x - __pyx_v_e31x) \/ 3);\n-\n- \n- __pyx_v_e14y = ((__pyx_v_e12y - __pyx_v_e31y) \/ 3);\n-\n- \n- __pyx_v_e24x = (((-__pyx_v_e12x) + __pyx_v_e23x) \/ 3);\n-\n- \n- __pyx_v_e24y = (((-__pyx_v_e12y) + __pyx_v_e23y) \/ 3);\n-\n- \n- __pyx_v_e34x = ((__pyx_v_e31x - __pyx_v_e23x) \/ 3);\n-\n- \n- __pyx_v_e34y = ((__pyx_v_e31y - __pyx_v_e23y) \/ 3);\n+ __pyx_v_e14x = ((__pyx_v_e12x - __pyx_v_e31x) \/ 3.0);\n+\n+ \n+ __pyx_v_e14y = ((__pyx_v_e12y - __pyx_v_e31y) \/ 3.0);\n+\n+ \n+ __pyx_v_e24x = (((-__pyx_v_e12x) + __pyx_v_e23x) \/ 3.0);\n+\n+ \n+ __pyx_v_e24y = (((-__pyx_v_e12y) + __pyx_v_e23y) \/ 3.0);\n+\n+ \n+ __pyx_v_e34x = ((__pyx_v_e31x - __pyx_v_e23x) \/ 3.0);\n+\n+ \n+ __pyx_v_e34y = ((__pyx_v_e31y - __pyx_v_e23y) \/ 3.0);\n \n \n __pyx_v_f1 = (__pyx_v_f[0]);\n@@ -4756,21 +4720,21 @@\n case 0:\n \n \n- __pyx_v_g1 = ((-2.0) \/ 3);\n+ __pyx_v_g1 = ((-2.) \/ 3.0);\n break;\n \n \n case 1:\n \n \n- __pyx_v_g2 = ((-2.0) \/ 3);\n+ __pyx_v_g2 = ((-2.) \/ 3.0);\n break;\n \n \n case 2:\n \n \n- __pyx_v_g3 = ((-2.0) \/ 3);\n+ __pyx_v_g3 = ((-2.) \/ 3.0);\n break;\n }\n \n@@ -4781,10 +4745,10 @@\n __pyx_L5:;\n \n \n- (__pyx_v_y[0]) = ((((__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3);\n-\n- \n- (__pyx_v_y[1]) = ((((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3);\n+ (__pyx_v_y[0]) = ((((__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(0 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3.0);\n+\n+ \n+ (__pyx_v_y[1]) = ((((__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 0)])))]) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 1)])))])) + (__pyx_v_d->points[(1 + (2 * (__pyx_v_d->vertices[((3 * __pyx_v_itri) + 2)])))])) \/ 3.0);\n \n \n __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinates(2, (__pyx_v_d->transform + ((__pyx_v_isimplex * 2) * 3)), __pyx_v_y, __pyx_v_c);\n@@ -4794,21 +4758,21 @@\n case 0:\n \n \n- __pyx_v_g1 = ((((2 * (__pyx_v_c[2])) + (__pyx_v_c[1])) - 1) \/ ((2 - (3 * (__pyx_v_c[2]))) - (3 * (__pyx_v_c[1]))));\n+ __pyx_v_g1 = ((((2.0 * (__pyx_v_c[2])) + (__pyx_v_c[1])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[2]))) - (3.0 * (__pyx_v_c[1]))));\n break;\n \n \n case 1:\n \n \n- __pyx_v_g2 = ((((2 * (__pyx_v_c[0])) + (__pyx_v_c[2])) - 1) \/ ((2 - (3 * (__pyx_v_c[0]))) - (3 * (__pyx_v_c[2]))));\n+ __pyx_v_g2 = ((((2.0 * (__pyx_v_c[0])) + (__pyx_v_c[2])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[0]))) - (3.0 * (__pyx_v_c[2]))));\n break;\n \n \n case 2:\n \n \n- __pyx_v_g3 = ((((2 * (__pyx_v_c[1])) + (__pyx_v_c[0])) - 1) \/ ((2 - (3 * (__pyx_v_c[1]))) - (3 * (__pyx_v_c[0]))));\n+ __pyx_v_g3 = ((((2.0 * (__pyx_v_c[1])) + (__pyx_v_c[0])) - 1.0) \/ ((2.0 - (3.0 * (__pyx_v_c[1]))) - (3.0 * (__pyx_v_c[0]))));\n break;\n }\n __pyx_L3_continue:;\n@@ -4863,10 +4827,10 @@\n __pyx_v_b3 = ((__pyx_v_b[2]) - __pyx_v_minval);\n \n \n- __pyx_v_b4 = (3 * __pyx_v_minval);\n-\n- \n- __pyx_v_w = __Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b1, 3), 0), __pyx_v_c3000), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b2), 0), __pyx_v_c2100)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b3), 0), __pyx_v_c2010)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b1, 2)) * __pyx_v_b4), 0), __pyx_v_c2001)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b1) * pow(__pyx_v_b2, 2)), 0), __pyx_v_c1200)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6 * __pyx_v_b1) * __pyx_v_b2) * __pyx_v_b4), 0), __pyx_v_c1101)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b1) * pow(__pyx_v_b3, 2)), 0), __pyx_v_c1020)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6 * __pyx_v_b1) * __pyx_v_b3) * __pyx_v_b4), 0), __pyx_v_c1011)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b1) * pow(__pyx_v_b4, 2)), 0), __pyx_v_c1002)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b2, 3), 0), __pyx_v_c0300)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b2, 2)) * __pyx_v_b3), 0), __pyx_v_c0210)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b2, 2)) * __pyx_v_b4), 0), __pyx_v_c0201)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b2) * pow(__pyx_v_b3, 2)), 0), __pyx_v_c0120)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6 * __pyx_v_b2) * __pyx_v_b3) * __pyx_v_b4), 0), __pyx_v_c0111)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b2) * pow(__pyx_v_b4, 2)), 0), __pyx_v_c0102)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b3, 3), 0), __pyx_v_c0030)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * pow(__pyx_v_b3, 2)) * __pyx_v_b4), 0), __pyx_v_c0021)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3 * __pyx_v_b3) * pow(__pyx_v_b4, 2)), 0), __pyx_v_c0012)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b4, 3), 0), __pyx_v_c0003));\n+ __pyx_v_b4 = (3.0 * __pyx_v_minval);\n+\n+ \n+ __pyx_v_w = __Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_sum(__Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b1, 3.0), 0), __pyx_v_c3000), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b2), 0), __pyx_v_c2100)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b3), 0), __pyx_v_c2010)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b1, 2.0)) * __pyx_v_b4), 0), __pyx_v_c2001)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b1) * pow(__pyx_v_b2, 2.0)), 0), __pyx_v_c1200)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6.0 * __pyx_v_b1) * __pyx_v_b2) * __pyx_v_b4), 0), __pyx_v_c1101)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b1) * pow(__pyx_v_b3, 2.0)), 0), __pyx_v_c1020)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6.0 * __pyx_v_b1) * __pyx_v_b3) * __pyx_v_b4), 0), __pyx_v_c1011)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b1) * pow(__pyx_v_b4, 2.0)), 0), __pyx_v_c1002)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b2, 3.0), 0), __pyx_v_c0300)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b2, 2.0)) * __pyx_v_b3), 0), __pyx_v_c0210)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b2, 2.0)) * __pyx_v_b4), 0), __pyx_v_c0201)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b2) * pow(__pyx_v_b3, 2.0)), 0), __pyx_v_c0120)), __Pyx_c_prod(__pyx_t_double_complex_from_parts((((6.0 * __pyx_v_b2) * __pyx_v_b3) * __pyx_v_b4), 0), __pyx_v_c0111)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b2) * pow(__pyx_v_b4, 2.0)), 0), __pyx_v_c0102)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b3, 3.0), 0), __pyx_v_c0030)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * pow(__pyx_v_b3, 2.0)) * __pyx_v_b4), 0), __pyx_v_c0021)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(((3.0 * __pyx_v_b3) * pow(__pyx_v_b4, 2.0)), 0), __pyx_v_c0012)), __Pyx_c_prod(__pyx_t_double_complex_from_parts(pow(__pyx_v_b4, 3.0), 0), __pyx_v_c0003));\n \n \n __pyx_r = __pyx_v_w;\n@@ -4932,17 +4896,17 @@\n case 3:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__fill_value);\n- if (unlikely(value)) { values[3] = value; kw_args--; }\n+ if (value) { values[3] = value; kw_args--; }\n }\n case 4:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__tol);\n- if (unlikely(value)) { values[4] = value; kw_args--; }\n+ if (value) { values[4] = value; kw_args--; }\n }\n case 5:\n if (kw_args > 0) {\n PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__maxiter);\n- if (unlikely(value)) { values[5] = value; kw_args--; }\n+ if (value) { values[5] = value; kw_args--; }\n }\n }\n if (unlikely(kw_args > 0)) {\n@@ -4978,6 +4942,7 @@\n __Pyx_RaiseArgtupleInvalid(\"__init__\", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.CloughTocher2DInterpolator.__init__\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n \n@@ -5212,10 +5177,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_evaluate_double\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.CloughTocher2DInterpolator._evaluate_double\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n- __Pyx_INCREF((PyObject *)__pyx_v_xi);\n __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_eps = Py_None; __Pyx_INCREF(Py_None);\n __pyx_bstruct_values.buf = NULL;\n@@ -5332,7 +5296,7 @@\n __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_PyInt_to_py_npy_intp((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_8 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__values); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_8);\n@@ -5524,13 +5488,13 @@\n __pyx_L9_continue:;\n }\n }\n+\n+ \n {\n int __pyx_why;\n __pyx_why = 0; goto __pyx_L8;\n __pyx_L7: __pyx_why = 4; goto __pyx_L8;\n __pyx_L8:;\n-\n- \n Py_BLOCK_THREADS\n switch (__pyx_why) {\n case 4: goto __pyx_L1_error;\n@@ -5581,8 +5545,6 @@\n __Pyx_XDECREF((PyObject *)__pyx_v_points);\n __Pyx_XDECREF((PyObject *)__pyx_v_vertices);\n __Pyx_DECREF(__pyx_v_eps);\n- __Pyx_DECREF(__pyx_v_self);\n- __Pyx_DECREF((PyObject *)__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -5744,10 +5706,9 @@\n __Pyx_RaiseArgtupleInvalid(\"_evaluate_complex\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"interpnd.CloughTocher2DInterpolator._evaluate_complex\");\n+ __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n- __Pyx_INCREF(__pyx_v_self);\n- __Pyx_INCREF((PyObject *)__pyx_v_xi);\n __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_eps = Py_None; __Pyx_INCREF(Py_None);\n __pyx_bstruct_values.buf = NULL;\n@@ -5864,7 +5825,7 @@\n __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_PyInt_to_py_npy_intp((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = __Pyx_PyInt_to_py_Py_intptr_t((__pyx_v_xi->dimensions[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_8 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__values); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_8);\n@@ -6107,13 +6068,13 @@\n __pyx_L9_continue:;\n }\n }\n+\n+ \n {\n int __pyx_why;\n __pyx_why = 0; goto __pyx_L8;\n __pyx_L7: __pyx_why = 4; goto __pyx_L8;\n __pyx_L8:;\n-\n- \n Py_BLOCK_THREADS\n switch (__pyx_why) {\n case 4: goto __pyx_L1_error;\n@@ -6164,8 +6125,6 @@\n __Pyx_XDECREF((PyObject *)__pyx_v_points);\n __Pyx_XDECREF((PyObject *)__pyx_v_vertices);\n __Pyx_DECREF(__pyx_v_eps);\n- __Pyx_DECREF(__pyx_v_self);\n- __Pyx_DECREF((PyObject *)__pyx_v_xi);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n@@ -6173,8 +6132,8 @@\n \n \n \n-static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); \n-static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags) {\n+static CYTHON_UNUSED int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); \n+static CYTHON_UNUSED int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags) {\n int __pyx_v_copy_shape;\n int __pyx_v_i;\n int __pyx_v_ndim;\n@@ -6199,7 +6158,6 @@\n if (__pyx_v_info == NULL) return 0;\n __pyx_v_info->obj = Py_None; __Pyx_INCREF(Py_None);\n __Pyx_GIVEREF(__pyx_v_info->obj);\n- __Pyx_INCREF((PyObject *)__pyx_v_self);\n \n \n __pyx_v_endian_detector = 1;\n@@ -6238,17 +6196,17 @@\n if (__pyx_t_3) {\n \n \n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_17));\n PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_u_17));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_17));\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_Raise(__pyx_t_5, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L6;\n }\n __pyx_L6:;\n@@ -6266,17 +6224,17 @@\n if (__pyx_t_2) {\n \n \n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_18));\n PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_kp_u_18));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_18));\n- __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_Raise(__pyx_t_4, 0, 0);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L7;\n }\n __pyx_L7:;\n@@ -6288,8 +6246,7 @@\n __pyx_v_info->ndim = __pyx_v_ndim;\n \n \n- __pyx_t_6 = __pyx_v_copy_shape;\n- if (__pyx_t_6) {\n+ if (__pyx_v_copy_shape) {\n \n \n __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2)));\n@@ -6399,17 +6356,17 @@\n if (__pyx_t_1) {\n \n \n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_19));\n PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_u_19));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_19));\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_Raise(__pyx_t_5, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L13;\n }\n __pyx_L13:;\n@@ -6535,22 +6492,22 @@\n {\n \n \n- __pyx_t_5 = PyInt_FromLong(__pyx_v_t); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(__pyx_v_t); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_20), __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_20), __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_4));\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_Raise(__pyx_t_4, 0, 0);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L14:;\n \n@@ -6574,7 +6531,7 @@\n __pyx_v_offset = 0;\n \n \n- __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_v_f = __pyx_t_9;\n \n \n@@ -6599,18 +6556,16 @@\n }\n __pyx_L2:;\n __Pyx_XDECREF((PyObject *)__pyx_v_descr);\n- __Pyx_DECREF((PyObject *)__pyx_v_self);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n \n \n-static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info); \n-static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info) {\n+static CYTHON_UNUSED void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info); \n+static CYTHON_UNUSED void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info) {\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"__releasebuffer__\");\n- __Pyx_INCREF((PyObject *)__pyx_v_self);\n \n \n __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self));\n@@ -6632,7 +6587,6 @@\n }\n __pyx_L6:;\n \n- __Pyx_DECREF((PyObject *)__pyx_v_self);\n __Pyx_RefNannyFinishContext();\n }\n \n@@ -6645,7 +6599,7 @@\n \n \n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 756; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 757; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -6672,7 +6626,7 @@\n \n \n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 759; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 760; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -6699,7 +6653,7 @@\n \n \n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 763; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -6726,7 +6680,7 @@\n \n \n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 765; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -6753,7 +6707,7 @@\n \n \n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 769; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_r = __pyx_t_1;\n __pyx_t_1 = 0;\n@@ -6793,7 +6747,6 @@\n int __pyx_t_9;\n char *__pyx_t_10;\n __Pyx_RefNannySetupContext(\"_util_dtypestring\");\n- __Pyx_INCREF((PyObject *)__pyx_v_descr);\n __pyx_v_child = ((PyArray_Descr *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_fields = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);\n __pyx_v_childname = Py_None; __Pyx_INCREF(Py_None);\n@@ -6810,7 +6763,7 @@\n if (likely(((PyObject *)__pyx_v_descr->names) != Py_None)) {\n __pyx_t_1 = 0; __pyx_t_2 = ((PyObject *)__pyx_v_descr->names); __Pyx_INCREF(__pyx_t_2);\n } else {\n- PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 781; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n for (;;) {\n if (__pyx_t_1 >= PyTuple_GET_SIZE(__pyx_t_2)) break;\n@@ -6820,9 +6773,9 @@\n __pyx_t_3 = 0;\n \n \n- __pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected tuple, got %.200s\", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected tuple, got %.200s\", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(((PyObject *)__pyx_v_fields));\n __pyx_v_fields = ((PyObject *)__pyx_t_3);\n __pyx_t_3 = 0;\n@@ -6831,7 +6784,7 @@\n if (likely(((PyObject *)__pyx_v_fields) != Py_None) && likely(PyTuple_GET_SIZE(((PyObject *)__pyx_v_fields)) == 2)) {\n PyObject* tuple = ((PyObject *)__pyx_v_fields);\n __pyx_t_3 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_3);\n- if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 784; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_t_4 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_4);\n __Pyx_DECREF(((PyObject *)__pyx_v_child));\n __pyx_v_child = ((PyArray_Descr *)__pyx_t_3);\n@@ -6841,40 +6794,40 @@\n __pyx_t_4 = 0;\n } else {\n __Pyx_UnpackTupleError(((PyObject *)__pyx_v_fields), 2);\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- }\n-\n- \n- __pyx_t_4 = PyInt_FromLong((__pyx_v_end - __pyx_v_f)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 784; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+\n+ \n+ __pyx_t_4 = PyInt_FromLong((__pyx_v_end - __pyx_v_f)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyNumber_Subtract(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyNumber_Subtract(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyObject_RichCompare(__pyx_t_3, __pyx_int_15, Py_LT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_t_3, __pyx_int_15, Py_LT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n \n \n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_21));\n PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_kp_u_21));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_21));\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_Raise(__pyx_t_3, 0, 0);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L5;\n }\n __pyx_L5:;\n@@ -6903,29 +6856,29 @@\n if (__pyx_t_6) {\n \n \n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_19));\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_u_19));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_19));\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_Raise(__pyx_t_5, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 791; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L6;\n }\n __pyx_L6:;\n \n \n while (1) {\n- __pyx_t_5 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_t_5, __pyx_v_new_offset, Py_LT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_5, __pyx_v_new_offset, Py_LT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 801; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (!__pyx_t_6) break;\n \n@@ -6947,7 +6900,7 @@\n if (__pyx_t_6) {\n \n \n- __pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 808; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_v_t);\n __pyx_v_t = __pyx_t_3;\n@@ -6958,28 +6911,28 @@\n if (__pyx_t_6) {\n \n \n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_INCREF(((PyObject *)__pyx_kp_u_22));\n PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_u_22));\n __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_22));\n- __pyx_t_5 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_Raise(__pyx_t_5, 0, 0);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n goto __pyx_L10;\n }\n __pyx_L10:;\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 98;\n@@ -6987,12 +6940,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 66;\n@@ -7000,12 +6953,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 104;\n@@ -7013,12 +6966,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 72;\n@@ -7026,12 +6979,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 105;\n@@ -7039,12 +6992,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 73;\n@@ -7052,12 +7005,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 108;\n@@ -7065,12 +7018,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 76;\n@@ -7078,12 +7031,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 113;\n@@ -7091,12 +7044,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 81;\n@@ -7104,12 +7057,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 102;\n@@ -7117,12 +7070,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 100;\n@@ -7130,12 +7083,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 103;\n@@ -7143,12 +7096,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 90;\n@@ -7158,12 +7111,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 90;\n@@ -7173,12 +7126,12 @@\n }\n \n \n- __pyx_t_3 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 90;\n@@ -7188,12 +7141,12 @@\n }\n \n \n- __pyx_t_5 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 830; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (__pyx_t_6) {\n (__pyx_v_f[0]) = 79;\n@@ -7202,19 +7155,19 @@\n {\n \n \n- __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_20), __pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_20), __pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_3));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_t_3));\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_Raise(__pyx_t_3, 0, 0);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n }\n __pyx_L11:;\n \n@@ -7225,7 +7178,7 @@\n {\n \n \n- __pyx_t_10 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_10 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_v_f = __pyx_t_10;\n }\n __pyx_L9:;\n@@ -7251,7 +7204,6 @@\n __Pyx_DECREF(__pyx_v_childname);\n __Pyx_DECREF(__pyx_v_new_offset);\n __Pyx_DECREF(__pyx_v_t);\n- __Pyx_DECREF((PyObject *)__pyx_v_descr);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n@@ -7262,8 +7214,6 @@\n PyObject *__pyx_v_baseptr;\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"set_array_base\");\n- __Pyx_INCREF((PyObject *)__pyx_v_arr);\n- __Pyx_INCREF(__pyx_v_base);\n \n \n __pyx_t_1 = (__pyx_v_base == Py_None);\n@@ -7289,8 +7239,6 @@\n \n __pyx_v_arr->base = __pyx_v_baseptr;\n \n- __Pyx_DECREF((PyObject *)__pyx_v_arr);\n- __Pyx_DECREF(__pyx_v_base);\n __Pyx_RefNannyFinishContext();\n }\n \n@@ -7300,7 +7248,6 @@\n PyObject *__pyx_r = NULL;\n int __pyx_t_1;\n __Pyx_RefNannySetupContext(\"get_array_base\");\n- __Pyx_INCREF((PyObject *)__pyx_v_arr);\n \n \n __pyx_t_1 = (__pyx_v_arr->base == NULL);\n@@ -7325,19 +7272,16 @@\n \n __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n __pyx_L0:;\n- __Pyx_DECREF((PyObject *)__pyx_v_arr);\n __Pyx_XGIVEREF(__pyx_r);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static struct PyMethodDef __pyx_methods[] = {\n+static PyMethodDef __pyx_methods[] = {\n {__Pyx_NAMESTR(\"_ndim_coords_from_arrays\"), (PyCFunction)__pyx_pf_8interpnd__ndim_coords_from_arrays, METH_O, __Pyx_DOCSTR(__pyx_doc_8interpnd__ndim_coords_from_arrays)},\n {__Pyx_NAMESTR(\"estimate_gradients_2d_global\"), (PyCFunction)__pyx_pf_8interpnd_estimate_gradients_2d_global, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},\n {0, 0, 0, 0}\n };\n-\n-static void __pyx_init_filenames(void); \n \n #if PY_MAJOR_VERSION >= 3\n static struct PyModuleDef __pyx_moduledef = {\n@@ -7400,6 +7344,7 @@\n {&__pyx_n_s__ascontiguousarray, __pyx_k__ascontiguousarray, sizeof(__pyx_k__ascontiguousarray), 0, 0, 1, 1},\n {&__pyx_n_s__astype, __pyx_k__astype, sizeof(__pyx_k__astype), 0, 0, 1, 1},\n {&__pyx_n_s__base, __pyx_k__base, sizeof(__pyx_k__base), 0, 0, 1, 1},\n+ {&__pyx_n_s__broadcast_arrays, __pyx_k__broadcast_arrays, sizeof(__pyx_k__broadcast_arrays), 0, 0, 1, 1},\n {&__pyx_n_s__buf, __pyx_k__buf, sizeof(__pyx_k__buf), 0, 0, 1, 1},\n {&__pyx_n_s__byteorder, __pyx_k__byteorder, sizeof(__pyx_k__byteorder), 0, 0, 1, 1},\n {&__pyx_n_s__complex, __pyx_k__complex, sizeof(__pyx_k__complex), 0, 0, 1, 1},\n@@ -7421,7 +7366,6 @@\n {&__pyx_n_s__is_complex, __pyx_k__is_complex, sizeof(__pyx_k__is_complex), 0, 0, 1, 1},\n {&__pyx_n_s__issubdtype, __pyx_k__issubdtype, sizeof(__pyx_k__issubdtype), 0, 0, 1, 1},\n {&__pyx_n_s__itemsize, __pyx_k__itemsize, sizeof(__pyx_k__itemsize), 0, 0, 1, 1},\n- {&__pyx_n_s__map, __pyx_k__map, sizeof(__pyx_k__map), 0, 0, 1, 1},\n {&__pyx_n_s__maxiter, __pyx_k__maxiter, sizeof(__pyx_k__maxiter), 0, 0, 1, 1},\n {&__pyx_n_s__names, __pyx_k__names, sizeof(__pyx_k__names), 0, 0, 1, 1},\n {&__pyx_n_s__nan, __pyx_k__nan, sizeof(__pyx_k__nan), 0, 0, 1, 1},\n@@ -7465,15 +7409,14 @@\n __pyx_builtin_object = __Pyx_GetName(__pyx_b, __pyx_n_s__object); if (!__pyx_builtin_object) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_builtin_Warning = __Pyx_GetName(__pyx_b, __pyx_n_s__Warning); if (!__pyx_builtin_Warning) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_builtin_map = __Pyx_GetName(__pyx_b, __pyx_n_s__map); if (!__pyx_builtin_map) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n #if PY_MAJOR_VERSION >= 3\n __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n #else\n __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__xrange); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n #endif\n __pyx_builtin_enumerate = __Pyx_GetName(__pyx_b, __pyx_n_s__enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_n_s__RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_n_s__RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n return 0;\n __pyx_L1_error:;\n return -1;\n@@ -7517,12 +7460,10 @@\n }\n __pyx_refnanny = __Pyx_RefNanny->SetupContext(\"PyMODINIT_FUNC PyInit_interpnd(void)\", __LINE__, __FILE__);\n #endif\n- __pyx_init_filenames();\n __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- #if PY_MAJOR_VERSION < 3\n- __pyx_empty_bytes = PyString_FromStringAndSize(\"\", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- #else\n __pyx_empty_bytes = PyBytes_FromStringAndSize(\"\", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #ifdef __pyx_binding_PyCFunctionType_USED\n+ if (__pyx_binding_PyCFunctionType_init() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n #endif\n \n \n@@ -7555,11 +7496,11 @@\n \n \n \n- __pyx_ptype_5numpy_dtype = __Pyx_ImportType(\"numpy\", \"dtype\", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_ptype_5numpy_flatiter = __Pyx_ImportType(\"numpy\", \"flatiter\", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_ptype_5numpy_broadcast = __Pyx_ImportType(\"numpy\", \"broadcast\", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_ptype_5numpy_ndarray = __Pyx_ImportType(\"numpy\", \"ndarray\", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n- __pyx_ptype_5numpy_ufunc = __Pyx_ImportType(\"numpy\", \"ufunc\", sizeof(PyUFuncObject), 0); if (unlikely(!__pyx_ptype_5numpy_ufunc)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_dtype = __Pyx_ImportType(\"numpy\", \"dtype\", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_flatiter = __Pyx_ImportType(\"numpy\", \"flatiter\", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_broadcast = __Pyx_ImportType(\"numpy\", \"broadcast\", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_ndarray = __Pyx_ImportType(\"numpy\", \"ndarray\", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_ufunc = __Pyx_ImportType(\"numpy\", \"ufunc\", sizeof(PyUFuncObject), 0); if (unlikely(!__pyx_ptype_5numpy_ufunc)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n \n __pyx_t_1 = __Pyx_ImportModule(\"scipy.spatial.qhull\"); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n if (__Pyx_ImportFunction(__pyx_t_1, \"_get_delaunay_info\", (void (**)(void))&__pyx_f_5scipy_7spatial_5qhull__get_delaunay_info, \"__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *(PyObject *, int, int)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -7623,7 +7564,7 @@\n __pyx_k_1 = __pyx_t_5;\n __Pyx_GIVEREF(__pyx_t_5);\n __pyx_t_5 = 0;\n- __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase___init__, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase___init__, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_2 = PyMethod_New(__pyx_t_5, 0, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n@@ -7632,7 +7573,7 @@\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase__check_init_shape, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase__check_init_shape, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_5 = PyMethod_New(__pyx_t_2, 0, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n@@ -7641,7 +7582,7 @@\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n \n- __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase__check_call_shape, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase__check_call_shape, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_2 = PyMethod_New(__pyx_t_5, 0, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n@@ -7650,7 +7591,7 @@\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase___call__, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_18NDInterpolatorBase___call__, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_5 = PyMethod_New(__pyx_t_2, 0, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n@@ -7685,7 +7626,7 @@\n __pyx_k_9 = __pyx_t_2;\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator___init__, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator___init__, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_5 = PyMethod_New(__pyx_t_2, 0, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n@@ -7694,7 +7635,7 @@\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n \n- __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator__evaluate_double, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator__evaluate_double, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_2 = PyMethod_New(__pyx_t_5, 0, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n@@ -7703,7 +7644,7 @@\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator__evaluate_complex, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_20LinearNDInterpolator__evaluate_complex, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_5 = PyMethod_New(__pyx_t_2, 0, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n@@ -7730,7 +7671,7 @@\n __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n \n \n- __pyx_t_3 = PyFloat_FromDouble(9.9999999999999995e-07); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyFloat_FromDouble(1e-6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 480; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_3);\n __pyx_k_10 = __pyx_t_3;\n __Pyx_GIVEREF(__pyx_t_3);\n@@ -7762,14 +7703,14 @@\n __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyFloat_FromDouble(9.9999999999999995e-07); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyFloat_FromDouble(1e-6); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_k_16 = __pyx_t_2;\n __Pyx_GIVEREF(__pyx_t_2);\n __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator___init__, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator___init__, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n@@ -7778,7 +7719,7 @@\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n \n- __pyx_t_4 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator__evaluate_double, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator__evaluate_double, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_2 = PyMethod_New(__pyx_t_4, 0, __pyx_t_5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n@@ -7787,7 +7728,7 @@\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n \n- __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator__evaluate_complex, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_8interpnd_26CloughTocher2DInterpolator__evaluate_complex, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n@@ -7806,7 +7747,7 @@\n __pyx_t_4 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s____init__); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\");\n+ __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\"); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_kp_u_31), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -7816,7 +7757,7 @@\n __pyx_t_4 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s___check_init_shape); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\");\n+ __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\"); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_kp_u_32), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -7826,14 +7767,14 @@\n __pyx_t_4 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s____call__); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\");\n+ __pyx_t_5 = __Pyx_GetAttrString(__pyx_t_4, \"__doc__\"); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_kp_u_33), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_t_5 = PyObject_GetAttr(__pyx_m, __pyx_n_s_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = __Pyx_GetAttrString(__pyx_t_5, \"__doc__\");\n+ __pyx_t_4 = __Pyx_GetAttrString(__pyx_t_5, \"__doc__\"); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_kp_u_34), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n@@ -7864,15 +7805,14 @@\n #endif\n }\n \n-static const char *__pyx_filenames[] = {\n- \"interpnd.pyx\",\n- \"numpy.pxd\",\n-};\n-\n-\n-\n-static void __pyx_init_filenames(void) {\n- __pyx_f = __pyx_filenames;\n+\n+\n+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {\n+ PyObject *result;\n+ result = PyObject_GetAttr(dict, name);\n+ if (!result)\n+ PyErr_SetObject(PyExc_NameError, name);\n+ return result;\n }\n \n static void __Pyx_RaiseDoubleKeywordsError(\n@@ -8023,6 +7963,26 @@\n }\n bad:\n return (double)-1;\n+}\n+\n+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact)\n+{\n+ if (!type) {\n+ PyErr_Format(PyExc_SystemError, \"Missing type object\");\n+ return 0;\n+ }\n+ if (none_allowed && obj == Py_None) return 1;\n+ else if (exact) {\n+ if (Py_TYPE(obj) == type) return 1;\n+ }\n+ else {\n+ if (PyObject_TypeCheck(obj, type)) return 1;\n+ }\n+ PyErr_Format(PyExc_TypeError,\n+ \"Argument '%s' has incorrect type (expected %s, got %s)\",\n+ name, type->tp_name, Py_TYPE(obj)->tp_name);\n+ return 0;\n }\n \n static CYTHON_INLINE int __Pyx_IsLittleEndian(void) {\n@@ -8430,7 +8390,7 @@\n buf->suboffsets = __Pyx_minusones;\n }\n \n-static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack) {\n+static CYTHON_INLINE int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack) {\n if (obj == Py_None) {\n __Pyx_ZeroBuffer(buf);\n return 0;\n@@ -8514,6 +8474,10 @@\n }\n \n \n+static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void) {\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n+}\n+\n static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {\n PyErr_Format(PyExc_ValueError,\n #if PY_VERSION_HEX < 0x02050000\n@@ -8524,35 +8488,13 @@\n (index == 1) ? \"\" : \"s\");\n }\n \n-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void) {\n- PyErr_SetString(PyExc_ValueError, \"too many values to unpack\");\n-}\n-\n-static PyObject *__Pyx_UnpackItem(PyObject *iter, Py_ssize_t index) {\n- PyObject *item;\n- if (!(item = PyIter_Next(iter))) {\n- if (!PyErr_Occurred()) {\n- __Pyx_RaiseNeedMoreValuesError(index);\n- }\n- }\n- return item;\n-}\n-\n-static int __Pyx_EndUnpack(PyObject *iter) {\n- PyObject *item;\n- if ((item = PyIter_Next(iter))) {\n- Py_DECREF(item);\n- __Pyx_RaiseTooManyValuesError();\n- return -1;\n- }\n- else if (!PyErr_Occurred())\n- return 0;\n- else\n- return -1;\n-}\n-\n-static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void) {\n- PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {\n+ PyErr_Format(PyExc_ValueError,\n+ #if PY_VERSION_HEX < 0x02050000\n+ \"too many values to unpack (expected %d)\", (int)expected);\n+ #else\n+ \"too many values to unpack (expected %zd)\", expected);\n+ #endif\n }\n \n static void __Pyx_UnpackTupleError(PyObject *t, Py_ssize_t index) {\n@@ -8561,28 +8503,8 @@\n } else if (PyTuple_GET_SIZE(t) < index) {\n __Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(t));\n } else {\n- __Pyx_RaiseTooManyValuesError();\n- }\n-}\n-\n-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n- const char *name, int exact)\n-{\n- if (!type) {\n- PyErr_Format(PyExc_SystemError, \"Missing type object\");\n- return 0;\n- }\n- if (none_allowed && obj == Py_None) return 1;\n- else if (exact) {\n- if (Py_TYPE(obj) == type) return 1;\n- }\n- else {\n- if (PyObject_TypeCheck(obj, type)) return 1;\n- }\n- PyErr_Format(PyExc_TypeError,\n- \"Argument '%s' has incorrect type (expected %s, got %s)\",\n- name, type->tp_name, Py_TYPE(obj)->tp_name);\n- return 0;\n+ __Pyx_RaiseTooManyValuesError(index);\n+ }\n }\n \n #if CYTHON_CCOMPLEX\n@@ -8677,14 +8599,14 @@\n #endif\n \n static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {\n- PyObject *__import__ = 0;\n+ PyObject *py_import = 0;\n PyObject *empty_list = 0;\n PyObject *module = 0;\n PyObject *global_dict = 0;\n PyObject *empty_dict = 0;\n PyObject *list;\n- __import__ = __Pyx_GetAttrString(__pyx_b, \"__import__\");\n- if (!__import__)\n+ py_import = __Pyx_GetAttrString(__pyx_b, \"__import__\");\n+ if (!py_import)\n goto bad;\n if (from_list)\n list = from_list;\n@@ -8700,21 +8622,13 @@\n empty_dict = PyDict_New();\n if (!empty_dict)\n goto bad;\n- module = PyObject_CallFunctionObjArgs(__import__,\n+ module = PyObject_CallFunctionObjArgs(py_import,\n name, global_dict, empty_dict, list, NULL);\n bad:\n Py_XDECREF(empty_list);\n- Py_XDECREF(__import__);\n+ Py_XDECREF(py_import);\n Py_XDECREF(empty_dict);\n return module;\n-}\n-\n-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {\n- PyObject *result;\n- result = PyObject_GetAttr(dict, name);\n- if (!result)\n- PyErr_SetObject(PyExc_NameError, name);\n- return result;\n }\n \n static PyObject *__Pyx_CreateClass(\n@@ -8852,21 +8766,28 @@\n }\n #endif\n \n-static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp val) {\n- const npy_intp neg_one = (npy_intp)-1, const_zero = 0;\n- const int is_unsigned = neg_one > const_zero;\n- if (sizeof(npy_intp) < sizeof(long)) {\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_Py_intptr_t(Py_intptr_t val) {\n+ const Py_intptr_t neg_one = (Py_intptr_t)-1, const_zero = (Py_intptr_t)0;\n+ const int is_unsigned = const_zero < neg_one;\n+ if ((sizeof(Py_intptr_t) == sizeof(char)) ||\n+ (sizeof(Py_intptr_t) == sizeof(short))) {\n return PyInt_FromLong((long)val);\n- } else if (sizeof(npy_intp) == sizeof(long)) {\n+ } else if ((sizeof(Py_intptr_t) == sizeof(int)) ||\n+ (sizeof(Py_intptr_t) == sizeof(long))) {\n if (is_unsigned)\n return PyLong_FromUnsignedLong((unsigned long)val);\n else\n return PyInt_FromLong((long)val);\n- } else { \n+ } else if (sizeof(Py_intptr_t) == sizeof(PY_LONG_LONG)) {\n if (is_unsigned)\n return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val);\n else\n return PyLong_FromLongLong((PY_LONG_LONG)val);\n+ } else {\n+ int one = 1; int little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ return _PyLong_FromByteArray(bytes, sizeof(Py_intptr_t), \n+ little, !is_unsigned);\n }\n }\n \n@@ -9117,6 +9038,25 @@\n return (signed int)val;\n }\n return (signed int)__Pyx_PyInt_AsSignedLong(x);\n+}\n+\n+static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject* x) {\n+ const int neg_one = (int)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(int) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(int)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to int\" :\n+ \"value too large to convert to int\");\n+ }\n+ return (int)-1;\n+ }\n+ return (int)val;\n+ }\n+ return (int)__Pyx_PyInt_AsLong(x);\n }\n \n static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {\n@@ -9366,7 +9306,11 @@\n PyOS_snprintf(warning, sizeof(warning), \n \"%s.%s size changed, may indicate binary incompatibility\",\n module_name, class_name);\n+ #if PY_VERSION_HEX < 0x02050000\n+ PyErr_Warn(NULL, warning);\n+ #else\n PyErr_WarnEx(NULL, warning, 0);\n+ #endif\n }\n else if (((PyTypeObject *)result)->tp_basicsize != size) {\n PyErr_Format(PyExc_ValueError, \n@@ -9413,9 +9357,6 @@\n void (*fp)(void);\n void *p;\n } tmp;\n-#if PY_VERSION_HEX < 0x03010000\n- const char *desc, *s1, *s2;\n-#endif\n \n d = PyObject_GetAttrString(module, (char *)\"__pyx_capi__\");\n if (!d)\n@@ -9427,7 +9368,16 @@\n PyModule_GetName(module), funcname);\n goto bad;\n }\n-#if PY_VERSION_HEX < 0x03010000\n+#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)\n+ if (!PyCapsule_IsValid(cobj, sig)) {\n+ PyErr_Format(PyExc_TypeError,\n+ \"C function %s.%s has wrong signature (expected %s, got %s)\",\n+ PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));\n+ goto bad;\n+ }\n+ tmp.p = PyCapsule_GetPointer(cobj, sig);\n+#else\n+ {const char *desc, *s1, *s2;\n desc = (const char *)PyCObject_GetDesc(cobj);\n if (!desc)\n goto bad;\n@@ -9439,15 +9389,7 @@\n PyModule_GetName(module), funcname, sig, desc);\n goto bad;\n }\n- tmp.p = PyCObject_AsVoidPtr(cobj);\n-#else\n- if (!PyCapsule_IsValid(cobj, sig)) {\n- PyErr_Format(PyExc_TypeError,\n- \"C function %s.%s has wrong signature (expected %s, got %s)\",\n- PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));\n- goto bad;\n- }\n- tmp.p = PyCapsule_GetPointer(cobj, sig);\n+ tmp.p = PyCObject_AsVoidPtr(cobj);}\n #endif\n *f = tmp.fp;\n if (!(*f))\n@@ -9563,8 +9505,8 @@\n \n \n static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {\n- if (x == Py_True) return 1;\n- else if ((x == Py_False) | (x == Py_None)) return 0;\n+ int is_true = x == Py_True;\n+ if (is_true | (x == Py_False) | (x == Py_None)) return is_true;\n else return PyObject_IsTrue(x);\n }\n \n"} {"commit":"f57cee11374a0e3056313e0818e3ff2ebd0f496d","subject":"staging\/gdm72xx: Use netdev_ or pr_ printks in gdm_wimax.c","message":"staging\/gdm72xx: Use netdev_ or pr_ printks in gdm_wimax.c\n\nfixed below checkpatch warnings.\n- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...\n- WARNING: Prefer netdev_emerg(netdev, ... then dev_emerg(dev, ... then pr_emerg(... to printk(KERN_EMERG ...\n- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...\n\nand add pr_fmt.\n\nSigned-off-by: YAMANE Toshiaki <314e010f9a6bb116c4db2299964ddca238f57440@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/gdm72xx\/gdm_wimax.c\n+++ drivers\/staging\/gdm72xx\/gdm_wimax.c\n@@ -10,6 +10,8 @@\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n * GNU General Public License for more details.\n *\/\n+\n+#define pr_fmt(fmt) KBUILD_MODNAME \": \" fmt\n \n #include <linux\/etherdevice.h>\n #include <asm\/byteorder.h>\n@@ -274,7 +276,7 @@\n \t\treturn 0;\n \t}\n \n-\tprintk(KERN_ERR \"Creating WiMax Event netlink is failed\\n\");\n+\tpr_err(\"Creating WiMax Event netlink is failed\\n\");\n \treturn -1;\n }\n \n@@ -370,7 +372,7 @@\n \n \te = get_event_entry();\n \tif (!e) {\n-\t\tprintk(KERN_ERR \"%s: No memory for event\\n\", __func__);\n+\t\tnetdev_err(dev, \"%s: No memory for event\\n\", __func__);\n \t\tspin_unlock_irqrestore(&wm_event.evt_lock, flags);\n \t\treturn -ENOMEM;\n \t}\n@@ -436,10 +438,10 @@\n \n \t#if !defined(LOOPBACK_TEST)\n \tif (!fsm)\n-\t\tprintk(KERN_ERR \"ASSERTION ERROR: fsm is NULL!!\\n\");\n+\t\tnetdev_err(dev, \"ASSERTION ERROR: fsm is NULL!!\\n\");\n \telse if (fsm->m_status != M_CONNECTED) {\n-\t\tprintk(KERN_EMERG \"ASSERTION ERROR: Device is NOT ready. status=%d\\n\",\n-\t\t\tfsm->m_status);\n+\t\tnetdev_emerg(dev, \"ASSERTION ERROR: Device is NOT ready. status=%d\\n\",\n+\t\t\t fsm->m_status);\n \t\tkfree_skb(skb);\n \t\treturn 0;\n \t}\n@@ -625,9 +627,8 @@\n \tcase SIOCG_DATA:\n \tcase SIOCS_DATA:\n \t\tif (req->data_id >= SIOC_DATA_MAX) {\n-\t\t\tprintk(KERN_ERR\n-\t\t\t\t\"%s error: data-index(%d) is invalid!!\\n\",\n-\t\t\t\t__func__, req->data_id);\n+\t\t\tnetdev_err(dev, \"%s error: data-index(%d) is invalid!!\\n\",\n+\t\t\t\t __func__, req->data_id);\n \t\t\treturn -EOPNOTSUPP;\n \t\t}\n \t\tif (req->cmd == SIOCG_DATA) {\n@@ -649,7 +650,7 @@\n \t\t}\n \t\tbreak;\n \tdefault:\n-\t\tprintk(KERN_ERR \"%s: %x unknown ioctl\\n\", __func__, cmd);\n+\t\tnetdev_err(dev, \"%s: %x unknown ioctl\\n\", __func__, cmd);\n \t\treturn -EOPNOTSUPP;\n \t}\n \n@@ -695,7 +696,7 @@\n \thci->length = H2B(len);\n \tgdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len);\n \n-\tprintk(KERN_INFO \"GDM WiMax Set CAPABILITY: 0x%08X\\n\", DB2H(val));\n+\tnetdev_info(dev, \"GDM WiMax Set CAPABILITY: 0x%08X\\n\", DB2H(val));\n }\n \n static int gdm_wimax_hci_get_tlv(u8 *buf, u8 *T, u16 *L, u8 **V)\n@@ -729,28 +730,28 @@\n \tcmd_len = B2H(*(u16 *)&buf[2]);\n \n \tif (len < cmd_len + HCI_HEADER_SIZE) {\n-\t\tprintk(KERN_ERR \"%s: invalid length [%d\/%d]\\n\", __func__,\n-\t\t\tcmd_len + HCI_HEADER_SIZE, len);\n+\t\tnetdev_err(dev, \"%s: invalid length [%d\/%d]\\n\", __func__,\n+\t\t\t cmd_len + HCI_HEADER_SIZE, len);\n \t\treturn -1;\n \t}\n \n \tif (cmd_evt == WIMAX_GET_INFO_RESULT) {\n \t\tif (cmd_len < 2) {\n-\t\t\tprintk(KERN_ERR \"%s: len is too short [%x\/%d]\\n\",\n-\t\t\t\t__func__, cmd_evt, len);\n+\t\t\tnetdev_err(dev, \"%s: len is too short [%x\/%d]\\n\",\n+\t\t\t\t __func__, cmd_evt, len);\n \t\t\treturn -1;\n \t\t}\n \n \t\tpos += gdm_wimax_hci_get_tlv(&buf[pos], &T, &L, &V);\n \t\tif (T == TLV_T(T_MAC_ADDRESS)) {\n \t\t\tif (L != dev->addr_len) {\n-\t\t\t\tprintk(KERN_ERR\n-\t\t\t\t\t\"%s Invalid inofrmation result T\/L \"\n-\t\t\t\t\t\"[%x\/%d]\\n\", __func__, T, L);\n+\t\t\t\tnetdev_err(dev,\n+\t\t\t\t\t \"%s Invalid inofrmation result T\/L [%x\/%d]\\n\",\n+\t\t\t\t\t __func__, T, L);\n \t\t\t\treturn -1;\n \t\t\t}\n-\t\t\tprintk(KERN_INFO \"MAC change [%pM]->[%pM]\\n\",\n-\t\t\t\tdev->dev_addr, V);\n+\t\t\tnetdev_info(dev, \"MAC change [%pM]->[%pM]\\n\",\n+\t\t\t\t dev->dev_addr, V);\n \t\t\tmemcpy(dev->dev_addr, V, dev->addr_len);\n \t\t\treturn 1;\n \t\t}\n@@ -772,7 +773,7 @@\n \n \tskb = dev_alloc_skb(len + 2);\n \tif (!skb) {\n-\t\tprintk(KERN_ERR \"%s: dev_alloc_skb failed!\\n\", __func__);\n+\t\tnetdev_err(dev, \"%s: dev_alloc_skb failed!\\n\", __func__);\n \t\treturn;\n \t}\n \tskb_reserve(skb, 2);\n@@ -787,7 +788,7 @@\n \n \tret = in_interrupt() ? netif_rx(skb) : netif_rx_ni(skb);\n \tif (ret == NET_RX_DROP)\n-\t\tprintk(KERN_ERR \"%s skb dropped\\n\", __func__);\n+\t\tnetdev_err(dev, \"%s skb dropped\\n\", __func__);\n }\n \n static void gdm_wimax_transmit_aggr_pkt(struct net_device *dev, char *buf,\n@@ -802,8 +803,8 @@\n \t\thci = (struct hci_s *) buf;\n \n \t\tif (B2H(hci->cmd_evt) != WIMAX_RX_SDU) {\n-\t\t\tprintk(KERN_ERR \"Wrong cmd_evt(0x%04X)\\n\",\n-\t\t\t\tB2H(hci->cmd_evt));\n+\t\t\tnetdev_err(dev, \"Wrong cmd_evt(0x%04X)\\n\",\n+\t\t\t\t B2H(hci->cmd_evt));\n \t\t\tbreak;\n \t\t}\n \n@@ -837,8 +838,8 @@\n \n \tif (len < cmd_len + HCI_HEADER_SIZE) {\n \t\tif (len)\n-\t\t\tprintk(KERN_ERR \"%s: invalid length [%d\/%d]\\n\",\n-\t\t\t\t__func__, cmd_len + HCI_HEADER_SIZE, len);\n+\t\t\tnetdev_err(dev, \"%s: invalid length [%d\/%d]\\n\",\n+\t\t\t\t __func__, cmd_len + HCI_HEADER_SIZE, len);\n \t\treturn;\n \t}\n \n@@ -918,7 +919,8 @@\n \t\tgdm_wimax_rcv_with_cb(nic, rx_complete, nic);\n \telse {\n \t\tif (ret < 0)\n-\t\t\tprintk(KERN_ERR \"get_prepared_info failed(%d)\\n\", ret);\n+\t\t\tnetdev_err(nic->netdev,\n+\t\t\t\t \"get_prepared_info failed(%d)\\n\", ret);\n \t\tgdm_wimax_rcv_with_cb(nic, prepare_rx_complete, nic);\n \t\t#if 0\n \t\t\/* Re-prepare WiMax device *\/\n@@ -952,7 +954,7 @@\n \t\t\t\t\t\t\"wm%d\", ether_setup);\n \n \tif (dev == NULL) {\n-\t\tprintk(KERN_ERR \"alloc_etherdev failed\\n\");\n+\t\tpr_err(\"alloc_etherdev failed\\n\");\n \t\treturn -ENOMEM;\n \t}\n \n@@ -972,7 +974,7 @@\n \t\/* event socket init *\/\n \tret = gdm_wimax_event_init();\n \tif (ret < 0) {\n-\t\tprintk(KERN_ERR \"Cannot create event.\\n\");\n+\t\tpr_err(\"Cannot create event.\\n\");\n \t\tgoto cleanup;\n \t}\n \n@@ -999,7 +1001,7 @@\n \treturn 0;\n \n cleanup:\n-\tprintk(KERN_ERR \"register_netdev failed\\n\");\n+\tpr_err(\"register_netdev failed\\n\");\n \tfree_netdev(dev);\n \treturn ret;\n }\n"} {"commit":"fb0303f3ce713d1aad72b6711cc96a6cb5120d82","subject":"RT3136: Remove space after issuer\/subject","message":"RT3136: Remove space after issuer\/subject\n\nReviewed-by: Richard Levitte <5fb523282dd7956571c80524edc2dccfa0bd8234@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/x509.c\n+++ apps\/x509.c\n@@ -606,9 +606,9 @@\n if (num) {\n for (i = 1; i <= num; i++) {\n if (issuer == i) {\n- print_name(out, \"issuer= \", X509_get_issuer_name(x), nmflag);\n+ print_name(out, \"issuer=\", X509_get_issuer_name(x), nmflag);\n } else if (subject == i) {\n- print_name(out, \"subject= \",\n+ print_name(out, \"subject=\",\n X509_get_subject_name(x), nmflag);\n } else if (serial == i) {\n BIO_printf(out, \"serial=\");\n"} {"commit":"8690517cf5e949c42b37e1f67b415fee7c2e92f4","subject":"Add define for when the __GNUC__ predefined macro is not present","message":"Add define for when the __GNUC__ predefined macro is not present\n","repos":"jcomellas\/ehl7,openhealthcare\/ehl7","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c_src\/ehl7_nif.c\n+++ c_src\/ehl7_nif.c\n@@ -4,7 +4,7 @@\n * Erlang NIFs for the HL7 parser library.\n *\n * \\internal\n-* Copyright (c) 2003-2011 \\b Erlar (http:\/\/erlar.com)\n+* Copyright (c) 2003-2011 Juan Jose Comellas <juanjo@comellas.org>\n *\/\n \n \/* ------------------------------------------------------------------------\n@@ -32,6 +32,8 @@\n \n #ifdef __GNUC__\n #define UNUSED __attribute__ ((__unused__))\n+#else\n+#define UNUSED\n #endif\n #ifndef NDEBUG\n #define DEBUG(fmt) fprintf(state->log, fmt)\n"} {"commit":"ee73bfbaf2285563f5efe6bdb03a55ea8e6a67c5","subject":"Fix large constants in json printer","message":"Fix large constants in json printer\n","repos":"dvidelabs\/flatcc,dvidelabs\/flatcc,dvidelabs\/flatcc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/compiler\/codegen_c_json_printer.c\n+++ src\/compiler\/codegen_c_json_printer.c\n@@ -38,30 +38,31 @@\n const char *tp, *tn, *ns;\n int bit_flags;\n uint64_t mask = 0;\n- char *suffix = \"\";\n+ char *constwrap = \"\";\n char *ut = \"\";\n+ fb_scalar_type_t st = ct->type.st;\n \n fb_clear(snt);\n fb_clear(snref);\n fb_compound_name(ct, &snt);\n- tp = scalar_type_prefix(ct->type.st);\n- tn = scalar_type_name(ct->type.st);\n- ns = scalar_type_ns(ct->type.st, out->nsc);\n+ tp = scalar_type_prefix(st);\n+ tn = scalar_type_name(st);\n+ ns = scalar_type_ns(st, out->nsc);\n \n bit_flags = !!(ct->metadata_flags & fb_f_bit_flags);\n if (bit_flags) {\n switch (ct->size) {\n case 1:\n- mask = 0xff, suffix = \"U\", ut = \"uint8_t\";\n+ mask = UINT8_MAX, constwrap = \"UINT8_C\", ut = \"uint8_t\";\n break;\n case 2:\n- mask = 0xffff, suffix = \"U\", ut = \"uint16_t\";\n+ mask = UINT16_MAX, constwrap = \"UINT16_C\", ut = \"uint16_t\";\n break;\n case 4:\n- mask = 0xffffffffL, suffix = \"UL\", ut = \"uint32_t\";\n+ mask = UINT32_MAX, constwrap = \"UINT32_C\", ut = \"uint32_t\";\n break;\n default:\n- mask = 0xffffffffffffffffULL, suffix = \"ULL\", ut = \"uint64_t\";\n+ mask = UINT64_MAX, constwrap = \"UINT64_C\", ut = \"uint64_t\";\n break;\n }\n for (sym = ct->members; sym; sym = sym->link) {\n@@ -100,11 +101,11 @@\n *\/\n if (mask) {\n fprintf(out->fp,\n- \" if ((x & 0x%\"PRIx64\") || x == 0) {\\n\"\n+ \" if ((x & %s(0x%\"PRIx64\")) || x == 0) {\\n\"\n \" flatcc_json_printer_%s(ctx, v);\\n\"\n \" return;\\n\"\n \" }\\n\",\n- mask, tp);\n+ constwrap, mask, tp);\n }\n \/*\n * Test if multiple bits set. We may have a configuration option\n@@ -119,16 +120,16 @@\n member = (fb_member_t *)sym;\n switch (member->value.type) {\n case vt_uint:\n- fprintf(out->fp, \" if (x & 0x%\"PRIx64\"%s) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n- member->value.u, suffix, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" if (x & %s(0x%\"PRIx64\")) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n+ constwrap, member->value.u, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n case vt_int:\n- fprintf(out->fp, \" if (x & 0x%\"PRIx64\"%s) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n- (uint64_t)member->value.i, suffix, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" if (x & %s(0x%\"PRIx64\")) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n+ constwrap, (uint64_t)member->value.i, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n case vt_bool:\n- fprintf(out->fp, \" if (x & 0x%\"PRIx64\"%s) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n- (uint64_t)member->value.b, suffix, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" if (x & %s(0x%\"PRIx64\")) flatcc_json_printer_enum_flag(ctx, i++, \\\"%.*s\\\", %ld);\\n\",\n+ constwrap, (uint64_t)member->value.b, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n default:\n gen_panic(out, \"internal error: unexpected value type for enum json_print\");\n@@ -142,16 +143,16 @@\n member = (fb_member_t *)sym;\n switch (member->value.type) {\n case vt_uint:\n- fprintf(out->fp, \" case %\"PRIu64\": flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n- member->value.u, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" case %s(%\"PRIu64\"): flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n+ constwrap, member->value.u, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n case vt_int:\n- fprintf(out->fp, \" case %\"PRId64\": flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n- member->value.i, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" case %s(%\"PRId64\"): flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n+ constwrap, member->value.i, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n case vt_bool:\n- fprintf(out->fp, \" case %u: flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n- member->value.b, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ fprintf(out->fp, \" case %s(%u): flatcc_json_printer_enum(ctx, \\\"%.*s\\\", %ld); break;\\n\",\n+ constwrap, member->value.b, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n break;\n default:\n gen_panic(out, \"internal error: unexpected value type for enum json_print\");\n@@ -393,44 +394,16 @@\n switch (member->type.type) {\n case vt_scalar_type:\n tp = scalar_type_prefix(member->type.st);\n- switch(member->value.type) {\n- case vt_bool:\n- case vt_uint:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRIu64\");\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.u);\n- }\n- break;\n- case vt_int:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRId64\");\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.i);\n- }\n- break;\n- case vt_float:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %lf);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.f);\n- }\n- break;\n- default:\n- gen_panic(out, \"internal error: unexpected default value type\\n\");\n- goto fail;\n+ if (is_optional) {\n+ fprintf( out->fp,\n+ \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ } else {\n+ fb_literal_t literal;\n+ if (!print_literal(member->type.st, &member->value, literal)) return -1;\n+ fprintf( out->fp,\n+ \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, literal);\n }\n break;\n case vt_vector_type:\n@@ -480,59 +453,31 @@\n switch (member->type.ct->symbol.kind) {\n case fb_is_enum:\n tp = scalar_type_prefix(member->type.ct->type.st);\n- switch(member->value.type) {\n- case vt_bool:\n #if FLATCC_JSON_PRINT_MAP_ENUMS\n- case vt_uint:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_enum_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s_print_json_enum);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, snref.text);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_enum_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRIu64\", %s_print_json_enum);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.u, snref.text);\n- }\n- break;\n- case vt_int:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_enum_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s_print_json_enum);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, snref.text);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_enum_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRId64\", %s_print_json_enum);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.i, snref.text);\n- }\n- break;\n+ if (is_optional) {\n+ fprintf(out->fp,\n+ \"flatcc_json_printer_%s_enum_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s_print_json_enum);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, snref.text);\n+ } else {\n+ fb_literal_t literal;\n+ if (!print_literal(member->type.ct->type.st, &member->value, literal)) return -1;\n+ fprintf(out->fp,\n+ \"flatcc_json_printer_%s_enum_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s, %s_print_json_enum);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, literal, snref.text);\n+ }\n #else\n- case vt_uint:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRIu64\");\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.u);\n- }\n- break;\n- case vt_int:\n- if (is_optional) {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_optinal_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n- } else {\n- fprintf( out->fp,\n- \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %\"PRId64\");\",\n- tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, member->value.i);\n- }\n- break;\n+ if (is_optional) {\n+ fprintf( out->fp,\n+ \"flatcc_json_printer_%s_optional_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len);\n+ } else {\n+ fb_literal_t literal;\n+ if (!print_literal(member->type.ct->type.st, &member->value, literal)) return -1;\n+ fprintf( out->fp,\n+ \"flatcc_json_printer_%s_field(ctx, td, %\"PRIu64\", \\\"%.*s\\\", %ld, %s);\",\n+ tp, member->id, (int)sym->ident->len, sym->ident->text, sym->ident->len, literal);\n+ }\n #endif\n- default:\n- gen_panic(out, \"internal error: unexpected default value type for enum\\n\");\n- goto fail;\n- }\n break;\n case fb_is_struct:\n fprintf(out->fp,\n"} {"commit":"1fa6a5b84de2091cad252ece2cb8298586ebdcf7","subject":"fix missing error checking for type in builtin_join, replace some LASSERT by LASSERT_TYPE","message":"fix missing error checking for type in builtin_join, replace some LASSERT by LASSERT_TYPE\n","repos":"alvaroabascar\/caballa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- caballa.c\n+++ caballa.c\n@@ -712,12 +712,10 @@\n lval* builtin_tail(lenv *e, lval *a)\n {\n \/* Check error conditions. *\/\n- LASSERT(a, a->count == 1,\n- \"Function 'head' passed too many arguments.\");\n- LASSERT(a, a->cell[0]->type == LVAL_QEXPR,\n- \"Function 'head' passed incorrect type.\");\n+ LASSERT_NARGS(a, a->count, 1, \"tail\");\n+ LASSERT_TYPE(a, a->cell[0], LVAL_QEXPR, 0, \"tail\");\n LASSERT(a, a->cell[0]->count != 0,\n- \"Function 'head' passed {}.\");\n+ \"Function 'tail' expected a non-emtpy Q-Expr, but was passed '{}'.\");\n \n \/* Take first argument. *\/\n lval *v = lval_take(a, 0);\n@@ -739,8 +737,7 @@\n {\n int i;\n for (i = 0; i < a->count; i++) {\n- LASSERT(a, a->cell[i]->type == LVAL_QEXPR,\n- \"Function 'join' passedincorrect type.\");\n+ LASSERT_TYPE(a, a->cell[i], LVAL_QEXPR, i, \"join\");\n }\n \n lval *x = lval_pop(a, 0);\n"} {"commit":"f75ec65886ec3309e296d4368ce633e9d6e627ff","subject":"Fixed ptp_getobjectinfo parameters order","message":"Fixed ptp_getobjectinfo parameters order\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@3070 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp\/ptp.h\n+++ camlibs\/ptp\/ptp.h\n@@ -202,7 +202,7 @@\n \n short ptp_getobjecthandles (PTPParams *params, PTPObjectHandles* objecthandles);\n short ptp_getobjectinfo (PTPParams *params, PTPObjectHandles* objecthandles,\n-\t\t\t PTPObjectInfo** objectinfoarray, int n);\n+\t\t\t int n, PTPObjectInfo** objectinfoarray);\n short ptp_getobject (PTPParams *params, PTPObjectHandles* objecthandles,\n \t\t\t PTPObjectInfo* objectinfoarray, int n,\n \t\t\t char* object);\n"} {"commit":"00d34ba41191d4b9eb4d8a7b3a3ac7918cc6f09e","subject":"Forgot to use the define I added.","message":"Forgot to use the define I added.\n","repos":"ice799\/memprof,ice799\/memprof","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/elf.c\n+++ ext\/elf.c\n@@ -185,7 +185,7 @@\n static inline GElf_Addr\n get_plt_addr(struct elf_info *info, size_t ndx) {\n assert(info != NULL);\n- return info->base_addr + info->plt_addr + (ndx + 1) * 16;\n+ return info->base_addr + info->plt_addr + (ndx + 1) * PLT_ENTRY_SZ;\n }\n \n \/*\n"} {"commit":"b9225ca71a70ecb3984d3f9e4f65ea9989f4cd6f","subject":"staging:gdm72xx: Fix unnecessary brace errors","message":"staging:gdm72xx: Fix unnecessary brace errors\n\nThis patch fixes the following warning for gdm_wimax.c\nWARNING: braces {} are not necessary for any arm of this statement\n\nSigned-off-by: Himangi Saraogi <23256c5b125c18bd580b7fa252de87dcf0c3a427@gmail.com>\nAcked-by: Paul E. McKenney <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"3ed9656ec1314df7130f14e5cd1e9d323ac9c9b1","subject":"Mutex locks for IO operations","message":"Mutex locks for IO operations\n","repos":"MIEMHSE\/erlangio,MIEMHSE\/erlangio","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c_src\/erlangio.c\n+++ c_src\/erlangio.c\n@@ -7,6 +7,7 @@\n #include <linux\/miscdevice.h>\n #include <linux\/fs.h>\n #include <linux\/proc_fs.h>\n+#include <linux\/mutex.h>\n #include <asm\/uaccess.h>\n #include <asm\/errno.h>\n \n@@ -53,6 +54,9 @@\n .release = device_release\n };\n \n+static DEFINE_MUTEX(device_open_lock);\n+static DEFINE_MUTEX(device_rw_lock);\n+\n \/* Functions *\/\n \n static int __init md_init( void )\n@@ -91,19 +95,25 @@\n \n static int device_open( struct inode *inode, struct file *file )\n {\n+ mutex_lock( &device_open_lock );\n+\n if ( device_opened )\n {\n+ mutex_unlock( &device_open_lock );\n return -EBUSY;\n }\n \n device_opened++;\n+ mutex_unlock( &device_open_lock );\n \n return SUCCESS;\n }\n \n static int device_release(struct inode *inode, struct file *file)\n {\n- device_opened --;\n+ mutex_lock( &device_open_lock );\n+ device_opened--;\n+ mutex_unlock( &device_open_lock );\n \n return 0;\n }\n@@ -112,8 +122,11 @@\n {\n int bytes_read = 0;\n \n+ mutex_lock( &device_rw_lock );\n+\n if ( *msg_ptr == 0 )\n {\n+ mutex_unlock( &device_rw_lock );\n return 0;\n }\n \n@@ -125,6 +138,8 @@\n bytes_read++;\n }\n \n+ mutex_unlock( &device_rw_lock );\n+\n return bytes_read;\n }\n \n@@ -133,11 +148,15 @@\n {\n \tint bytes_read = 0;\n \n+\tmutex_lock( &device_rw_lock );\n+\n \tfor ( bytes_read = 0; bytes_read < length && bytes_read < BUF_LEN; bytes_read++ )\n \t\tget_user( msg[bytes_read], buffer + bytes_read );\n \n- msg[bytes_read] = '\\0';\n+ memset( msg + bytes_read, 0, 1 );\n msg_ptr = msg;\n+\n+ mutex_unlock( &device_rw_lock );\n \n \treturn bytes_read;\n }\n"} {"commit":"daa656b2245d9755f28dfdaf78904088d7b6d3b9","subject":"staging: rtl8723au: Variable bbtchange is always false","message":"staging: rtl8723au: Variable bbtchange is always false\n\nSigned-off-by: Jes Sorensen <0e1e349bdba396f044a06b01fef702e072aa66d3@redhat.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2b970b2d308c61983609a789785d32d01a2dec26","subject":"staging:wlan-ng: remove all the return statements at the end of functions","message":"staging:wlan-ng: remove all the return statements at the end of functions\n\nthis file is having all unnecessary return statements at the end of functions\nwhich return void, remove all of them.\n\nsome of the functions still uses the return for having the goto end,\nwhich the label end defined at the end of the function which returns\nvoid, this will be cleaned up in next change\n\nSigned-off-by: Devendra Naga <97fdf9fb34d40445b99f4e064a18057cd6e2bccb@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"5b74fb4f235aa06acae4ca2e02db05326b5b8570","subject":"usb: usb_dc_kinetis: Fix endpoint index check","message":"usb: usb_dc_kinetis: Fix endpoint index check\n\nFix check for maximum endpoint index.\n\nSigned-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>\n","repos":"zephyrproject-rtos\/zephyr,nashif\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,finikorg\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,nashif\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/device\/usb_dc_kinetis.c\n+++ drivers\/usb\/device\/usb_dc_kinetis.c\n@@ -281,7 +281,7 @@\n \t\treturn -1;\n \t}\n \n-\tif (ep_idx > NUM_OF_EP_MAX) {\n+\tif (ep_idx > (NUM_OF_EP_MAX - 1)) {\n \t\tLOG_ERR(\"endpoint index\/address out of range\");\n \t\treturn -1;\n \t}\n"} {"commit":"45f620e757a950ee3736746a8e6bb7da94130e78","subject":"WPI: implement branch & bound search space narrow approach","message":"WPI: implement branch & bound search space narrow approach\n","repos":"bs-eagle\/bs-eagle,bs-eagle\/bs-eagle,bs-eagle\/bs-eagle","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bs_mesh\/src\/wpi_algo.h\n+++ bs_mesh\/src\/wpi_algo.h\n@@ -69,10 +69,108 @@\n \ttypedef typename wpi_xaction::intersect_action intersect_action;\n \n \t\/*-----------------------------------------------------------------\n-\t * branch & bound algorithm for finding intersections\n+\t * branch & bound algorithm for finding cells that really intersect with well\n \t *----------------------------------------------------------------*\/\n-\tstruct branch_bound_intersect {\n-\t\t\n+\tstruct branch_bound {\n+\t\ttypedef typename wpi_xaction::mesh_box_handle mesh_box_handle;\n+\t\ttypedef typename strat_t::xpoints_list xpoints_list;\n+\n+\t\ttypedef std::list< mesh_part > search_space;\n+\t\ttypedef typename search_space::iterator ss_iterator;\n+\t\ttypedef typename search_space::const_iterator css_iterator;\n+\n+\t\ttypedef std::list< trim_iterator > result_t;\n+\n+\t\tbranch_bound(std::vector< Box >& well_boxes, trimesh& M,\n+\t\t\tconst vertex_pos_i& mesh_size, const std::vector< ulong > hit_idx)\n+\t\t\t: wb_(well_boxes)\n+\t\t{\n+\t\t\tinit(M, mesh_size, hit_idx);\n+\t\t}\n+\n+\t\tvoid init(trimesh& M, const vertex_pos_i& mesh_size, const std::vector< ulong > hit_idx) {\n+\t\t\t\/\/ create list of mesh parts for each well segment\n+\t\t\tfor(ulong i = 0; i < hit_idx.size() - 1; ++i) {\n+\t\t\t\tmesh_part seg_m(M, mesh_size);\n+\t\t\t\tseg_m.init(hit_idx[i], hit_idx[i + 1]);\n+\t\t\t\tspace_.push_back(seg_m);\n+\t\t\t}\n+\t\t}\n+\n+\t\tresult_t& go() {\n+\t\t\ttypedef typename mesh_part::container_t meshp_container;\n+\n+\t\t\tres_.clear();\n+\t\t\twhile(space_.size()) {\n+\t\t\t\t\/\/ split each mesh part and intersect splitting with well path\n+\t\t\t\tsearch_space div_space;\n+\t\t\t\tfor(css_iterator pp = space_.begin(), end = space_.end(); pp != end; ++pp) {\n+\t\t\t\t\tmeshp_container kids = pp->divide();\n+\t\t\t\t\tdiv_space.insert(div_space.begin(), kids.begin(), kids.end());\n+\t\t\t\t}\n+\n+\t\t\t\t\/\/ make boxes around div space\n+\t\t\t\tstd::vector< Box > div_boxes(div_space.size());\n+\t\t\t\tfor(ss_iterator pp = div_space.begin(), end = div_space.end(); pp != end; ++pp)\n+\t\t\t\t\tdiv_boxes.push_back(\n+\t\t\t\t\t\tBox(pp->bbox().bbox(), new mesh_box_handle(&(*pp)))\n+\t\t\t\t\t);\n+\n+\t\t\t\t\/\/ find intersections with well\n+\t\t\t\tsurv_.clear();\n+\t\t\t\tCGAL::box_intersection_d(\n+\t\t\t\t\tdiv_boxes.begin(), div_boxes.end(),\n+\t\t\t\t\twb_.begin(), wb_.end(),\n+\t\t\t\t\t*this\n+\t\t\t\t);\n+\n+\t\t\t\t\/\/ clear mesh_parts that don't survive\n+\t\t\t\t\/\/ TODO: make it better\n+\t\t\t\tfor(ss_iterator pp = div_space.begin(), end = div_space.end(); pp != end; ) {\n+\t\t\t\t\tif(surv_.find(&*pp) == surv_.end())\n+\t\t\t\t\t\tdiv_space.erase(pp++);\n+\t\t\t\t\telse if(pp->size() == 1) {\n+\t\t\t\t\t\t\/\/ mesh parts of only 1 cell goes to result\n+\t\t\t\t\t\tres_.push_back(pp->ss_iter(0));\n+\t\t\t\t\t\tdiv_space.erase(pp++);\n+\t\t\t\t\t}\n+\t\t\t\t\telse\n+\t\t\t\t\t\t++pp;\n+\t\t\t\t}\n+\n+\t\t\t\t\/\/ update search space\n+\t\t\t\tspace_.clear();\n+\t\t\t\tspace_.insert(space_.begin(), div_space.begin(), div_space.end());\n+\t\t\t\t\/\/space_ = div_space;\n+\t\t\t}\n+\n+\t\t\treturn res_;\n+\t\t}\n+\n+\t\tvoid operator()(const Box& bm, const Box& bw) {\n+\t\t\tmesh_box_handle* mesh_h = static_cast< mesh_box_handle* >(bm.handle().get());\n+\t\t\t\/\/well_box_handle* well_h = static_cast< well_box_handle* >(bw.handle().get());\n+\n+\t\t\t\/\/ just remember mesh_part that really intersect with well\n+\t\t\tsurv_.insert(mesh_h->data());\n+\t\t}\n+\n+\t\t\/\/ access result\n+\t\tresult_t& res() {\n+\t\t\treturn res_;\n+\t\t}\n+\t\tconst result_t& res() const {\n+\t\t\treturn res_;\n+\t\t}\n+\n+\t\t\/\/ bounding boxes ariund well segments\n+\t\tstd::vector< Box >& wb_;\n+\t\t\/\/ live mesh parts\n+\t\tsearch_space space_;\n+\t\t\/\/ who will survive in next iteration?\n+\t\tstd::set< mesh_part* > surv_;\n+\t\t\/\/ resulting cells contained here\n+\t\tresult_t res_;\n \t};\n \n \t\/\/ helper to create initial cell_data for each cell\n@@ -154,29 +252,24 @@\n \t\tintersect_action A(M, W, X, mesh_size);\n \t\tconst std::vector< ulong >& hit_idx = wpi_meshp::where_is_point(M, mesh_size, wnodes);\n \n-\t\t\/\/ create list of mesh parts for each well segment\n-\t\t\/\/std::list< mesh_part > search_space;\n-\t\t\/\/for(ulong i = 0; i < hit_idx.size() - 1; ++i) {\n-\t\t\/\/\tmesh_part seg_m(M, mesh_size);\n-\t\t\/\/\tseg_m.init(hit_idx[i], hit_idx[i + 1]);\n-\t\t\/\/\tsearch_space.push_back(seg_m);\n-\t\t\/\/}\n-\n-\t\t\/\/ split current mesh parts and find intersections on each split\n-\n+\t\t\/\/ narrow search space via branch & bound algo\n+\t\tbranch_bound bb(well_boxes, M, mesh_size, hit_idx);\n+\t\ttypedef typename branch_bound::result_t search_space;\n+\t\tsearch_space& s_space = bb.go();\n \n \t\t\/\/ create part of mesh to process based on these cells\n-\t\tmesh_part hot_mesh(M, mesh_size);\n-\t\thot_mesh.init(hit_idx);\n+\t\t\/\/mesh_part hot_mesh(M, mesh_size);\n+\t\t\/\/hot_mesh.init(hit_idx);\n \n \t\t\/\/ create bounding box for each cell in given mesh\n-\t\tstd::vector< Box > mesh_boxes(hot_mesh.size());\n+\t\tstd::vector< Box > mesh_boxes(s_space.size());\n \t\tulong cnt = 0;\n-\t\ttrim_iterator pm;\n-\t\tfor(ulong i = 0; i < hot_mesh.size(); ++i) {\n-\t\t\tpm = hot_mesh.ss_iter(i);\n-\t\t\tconst cell_data& d = pm->second;\n-\t\t\tmesh_boxes[cnt++] = Box(d.bbox(), new cell_box_handle(pm));\n+\t\t\/\/trim_iterator pm;\n+\t\tfor(typename search_space::iterator ps = s_space.begin(), end = s_space.end(); ps != end; ++ps) {\n+\t\t\tconst cell_data& d = (*ps)->second;\n+\t\t\t\/\/pm = hot_mesh.ss_iter(i);\n+\t\t\t\/\/const cell_data& d = pm->second;\n+\t\t\tmesh_boxes[cnt++] = Box(d.bbox(), new cell_box_handle(*ps));\n \t\t}\n \n \n"} {"commit":"7abb913c6a7a471d4b3fbb8e37dd9e1fbfcef718","subject":"extractor::num: add generic numeric getter","message":"extractor::num: add generic numeric getter\n","repos":"mpsonntag\/nix-mx,mpsonntag\/nix-mx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- arguments.h\n+++ arguments.h\n@@ -75,14 +75,19 @@\n return the_string;\n }\n \n+\ttemplate<typename T>\n+\tT num(int pos) const {\n+\t\tnix::DataType dtype = nix::to_data_type<T>::value;\n+\t\tcheck_arg_type(pos, dtype);\n+\n+\t\tconst void *data = mxGetData(array[pos]);\n+\t\tT res;\n+\t\tmemcpy(&res, data, sizeof(T));\n+\t\treturn res;\n+\t}\n \n uint64_t uint64(int pos) const {\n-\t\tcheck_arg_type(pos, nix::DataType::UInt64);\n-\n- const void *data = mxGetData(array[pos]);\n- uint64_t res;\n- memcpy(&res, data, sizeof(uint64_t));\n- return res;\n+\t\treturn num<uint64_t>(pos);\n }\n \n template<typename T>\n"} {"commit":"6e3b12a5f8cd5d067f1843eba27d3f9156948e9b","subject":"minor item","message":"minor item\n\nsvn path=\/trunk\/; revision=230\n","repos":"swesterfeld\/beast,GNOME\/beast,swesterfeld\/beast,tim-janik\/beast,swesterfeld\/beast,GNOME\/beast,GNOME\/beast,swesterfeld\/beast,GNOME\/beast,tim-janik\/beast,GNOME\/beast,GNOME\/beast,tim-janik\/beast,swesterfeld\/beast,tim-janik\/beast,swesterfeld\/beast,tim-janik\/beast,tim-janik\/beast,swesterfeld\/beast,tim-janik\/beast,GNOME\/beast","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bse\/bsesongsequencer.c\n+++ bse\/bsesongsequencer.c\n@@ -131,7 +131,7 @@\n \n for (channel = 0; channel < song->n_channels; channel++)\n \t{\n-\t static const BsePatternNote empty_note = { NULL, BSE_NOTE_VOID, 0, NULL };\n+\t static const BsePatternNote empty_note = { NULL, BSE_NOTE_VOID, 0, 0, NULL };\n \t BsePatternNote *note;\n \t \n \t note = (!pattern ? &empty_note :\n"} {"commit":"6ea94d7915e7e0c873e4a71db13204738afe5f42","subject":"! Checking driver return value for 'Invalid parameter' correctly","message":"! Checking driver return value for 'Invalid parameter' correctly\n","repos":"scs\/oscar,scs\/oscar,scs\/oscar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cam\/cam_target.c\n+++ cam\/cam_target.c\n@@ -206,7 +206,7 @@\n \t\t\t\t__func__, errno);\n \t\t\n \t\t\/* An error has occured *\/\n-\t\tif(errno == -EINVAL) \/* Invalid parameter *\/\n+\t\tif(errno == EINVAL) \/* Invalid parameter *\/\n \t\t{\n \t\t\tOscLog(ERROR, \"%s(%u, %u, %u, %u): Invalid parameter!\\n\",\n \t\t\t\t\t__func__, lowX, lowY, width, height);\n"} {"commit":"167fc5d48f3e70960ccb95a49cf9d0960cadde91","subject":"#FDF-330 Disable stale assert","message":"#FDF-330 Disable stale assert\n\nTESTS_RAN: Automated developer test suite\n\ngit-svn-id: a362ee60a3ddea42f4fbb5bcd8cd5c98900f475d@2737 01a69087-22d5-4a29-8152-8a1d5e10e5e9\n","repos":"SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale,SanDisk-Open-Source\/zetascale","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- btree\/btree_recovery.c\n+++ btree\/btree_recovery.c\n@@ -326,6 +326,7 @@\n \n \t\tswitch (cur_obj->rcvry_op) {\n \t\tcase RCVR_OP_DELETE:\n+#if 0\n #ifndef _OPTIMIZE\n \t\t\tif (next_obj) {\n \t \t\tx = bt->cmp_cb(bt->cmp_cb_data, \n@@ -337,6 +338,7 @@\n \t\t\t\t * there can be only one set undo operation *\/\n \t\t\t\tassert(x != 0);\n \t\t\t}\n+#endif\n #endif\n \t\t\t\/* Delete the cur obj.\n \t\t\t * TODO: Handle its return status *\/\n"} {"commit":"cdf62d387871b72aad396947d16dad7620eea76d","subject":"Small tweak to userd","message":"Small tweak to userd\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/userd.c\n+++ mudlib\/mud\/home\/System\/sys\/userd.c\n@@ -112,12 +112,10 @@\n \n \tstatus = status();\n \n-\ttelnet_port_count = sizeof(status[ST_TELNETPORTS]);\n-\tbinary_port_count = sizeof(status[ST_BINARYPORTS]);\n-\n-\tUSERD->set_telnet_manager(0, this);\n-\n-\tfor (index = 1; index < telnet_port_count; index++) {\n+\ttelnet_port_count = sizeof(status(ST_TELNETPORTS));\n+\tbinary_port_count = sizeof(status(ST_BINARYPORTS));\n+\n+\tfor (index = 0; index < telnet_port_count; index++) {\n \t\tUSERD->set_telnet_manager(index, this);\n \t}\n \n"} {"commit":"b4a74615a4729ca4e6903bd3027339c4e6e7ae03","subject":"drivers\/video\/backlight\/lm3533_bl.c: use devm_ functions","message":"drivers\/video\/backlight\/lm3533_bl.c: use devm_ functions\n\nThe devm_ functions allocate memory that is released when a driver\ndetaches. This patch uses devm_kzalloc of these functions.\n\nSigned-off-by: Jingoo Han <fc379137a64feb86ce38ec5811a14280acc1ccfc@samsung.com>\nAcked-by: Johan Hovold <6a430eed381e126d51a8cce8db662f765ce314bc@gmail.com>\nCc: Richard Purdie <a03894c799ea916bd571ce8f12ed88f6fb3400f7@rpsys.net>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"21cd72e7cb424f1686855602ec0fdc6e5830f249","subject":"savagefb: Set up I2C based on chip family instead of card id","message":"savagefb: Set up I2C based on chip family instead of card id\n\nIn practice this means enabling I2C (for DDC2) on all prosavage cards,\nlike the xorg ddx does. The savage4 and savage2000 families have only\none member each, so there is no change for those.\n\nTested on TwisterK.\n\nSigned-off-by: Tormod Volden <f999a1fdb278982f64e704d14360cbbcecbf6247@gmail.com>\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/savage\/savagefb-i2c.c\n+++ drivers\/video\/savage\/savagefb-i2c.c\n@@ -170,9 +170,8 @@\n \tstruct savagefb_par *par = info->par;\n \tpar->chan.par\t= par;\n \n-\tswitch(info->fix.accel) {\n-\tcase FB_ACCEL_PROSAVAGE_DDRK:\n-\tcase FB_ACCEL_PROSAVAGE_PM:\n+\tswitch (par->chip) {\n+\tcase S3_PROSAVAGE:\n \t\tpar->chan.reg = CR_SERIAL2;\n \t\tpar->chan.ioaddr = par->mmio.vbase;\n \t\tpar->chan.algo.setsda = prosavage_gpio_setsda;\n@@ -180,7 +179,7 @@\n \t\tpar->chan.algo.getsda = prosavage_gpio_getsda;\n \t\tpar->chan.algo.getscl = prosavage_gpio_getscl;\n \t\tbreak;\n-\tcase FB_ACCEL_SAVAGE4:\n+\tcase S3_SAVAGE4:\n \t\tpar->chan.reg = CR_SERIAL1;\n \t\tif (par->pcidev->revision > 1 && !(VGArCR(0xa6, par) & 0x40))\n \t\t\tpar->chan.reg = CR_SERIAL2;\n@@ -190,7 +189,7 @@\n \t\tpar->chan.algo.getsda = prosavage_gpio_getsda;\n \t\tpar->chan.algo.getscl = prosavage_gpio_getscl;\n \t\tbreak;\n-\tcase FB_ACCEL_SAVAGE2000:\n+\tcase S3_SAVAGE2000:\n \t\tpar->chan.reg = MM_SERIAL1;\n \t\tpar->chan.ioaddr = par->mmio.vbase;\n \t\tpar->chan.algo.setsda = savage4_gpio_setsda;\n"} {"commit":"d7f6e79409368ee70d36e4251476f402865b4c31","subject":"u3: refactors u3u_uniq, prints memory measurements","message":"u3: refactors u3u_uniq, prints memory measurements\n","repos":"ngzax\/urbit,ngzax\/urbit,urbit\/urbit,ngzax\/urbit,ngzax\/urbit,ngzax\/urbit,urbit\/urbit,ngzax\/urbit,ngzax\/urbit,urbit\/urbit,urbit\/urbit,urbit\/urbit,urbit\/urbit,urbit\/urbit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pkg\/urbit\/noun\/urth.c\n+++ pkg\/urbit\/noun\/urth.c\n@@ -323,34 +323,34 @@\n c3_assert(0);\n }\n \n- fprintf(stderr, \"hc: cells fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->cells.fill, r->cells.size);\n- fprintf(stderr, \"hc: atoms fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->atoms.fill, r->atoms.size);\n-\n+ \/\/ reallocate kernel\n+ \/\/\n ur_nref ken = _cu_from_loom(r, u3A->roc);\n \n- fprintf(stderr, \"hc: cells fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->cells.fill, r->cells.size);\n- fprintf(stderr, \"hc: atoms fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->atoms.fill, r->atoms.size);\n-\n-\n- c3_w cod_w = u3h_wyt(u3R->jed.cod_p);\n- ur_nvec_t v;\n-\n- fprintf(stderr, \"hc: cold count %u\\r\\n\", cod_w);\n-\n+ \/\/ reallocate cold jet state\n+ \/\/\n+ ur_nvec_t cod_u;\n {\n- _cu_vec dat_u = { .vec_u = &v, .rot_u = r };\n- ur_nvec_init(&v, cod_w);\n+ c3_w cod_w = u3h_wyt(u3R->jed.cod_p);\n+ _cu_vec dat_u = { .vec_u = &cod_u, .rot_u = r };\n+ ur_nvec_init(&cod_u, cod_w);\n u3h_walk_with(u3R->jed.cod_p, _cu_hamt_walk, &dat_u);\n }\n \n- fprintf(stderr, \"hc: cells fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->cells.fill, r->cells.size);\n- fprintf(stderr, \"hc: atoms fill %\" PRIu64 \" size %\" PRIu64 \"\\r\\n\", r->atoms.fill, r->atoms.size);\n-\n- \/\/ NB: hot jet state is not yet re-established\n+ \/\/ print [rot_u] measurements\n+ \/\/\n+ ur_hcon_info(stderr, r);\n+ fprintf(stderr, \"\\r\\n\");\n+\n+ \/\/ reinitialize looom\n+ \/\/\n+ \/\/ NB: hot jet state is not yet re-established\n \/\/\n u3m_pave(c3y, c3n);\n \n {\n+ \/\/ reallocate all nouns on the loom\n+ \/\/\n _cu_loom lom_u;\n _cu_atoms_to_loom(r, &lom_u);\n _cu_cells_to_loom(r, &lom_u);\n@@ -362,12 +362,13 @@\n \/\/ restore cold jet state (always cells)\n \/\/\n {\n- c3_w i_w;\n+ c3_d max_d = cod_u.fill;\n+ c3_d i_d;\n ur_nref ref;\n u3_noun kev;\n \n- for ( i_w = 0; i_w < cod_w; i_w++) {\n- ref = v.refs[i_w];\n+ for ( i_d = 0; i_d < max_d; i_d++) {\n+ ref = cod_u.refs[i_d];\n kev = lom_u.cel[ur_nref_idx(ref)];\n u3h_put(u3R->jed.cod_p, u3h(kev), u3k(u3t(kev)));\n u3z(kev);\n"} {"commit":"d9f15add20a3a79748a5af49c1943aaee2bddecb","subject":"[AnalogData] Return times as well","message":"[AnalogData] Return times as well\n\nAnalogEntity.get_data () will now return a tuple that looks like this:\n(data, times, cont_count) - where data is the actual analog signal,\ntimes are the corresponding time values and cont_count is a number\ntelling how many values are continuous before the first gap (refer\nto the neuroshare documentation for more information).\n","repos":"G-Node\/python-neuroshare,abhay447\/python-neuroshare,abhay447\/python-neuroshare,G-Node\/python-neuroshare","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- capi\/nspy_glue.c\n+++ capi\/nspy_glue.c\n@@ -710,6 +710,52 @@\n return ns_OK;\n }\n \n+static PyObject *\n+get_times_for_entity (NsLibrary *lib,\n+ uint32 file_id,\n+ uint32 entity_id,\n+ uint32 index,\n+ uint32 length)\n+{\n+ PyObject *array;\n+ ns_RESULT res;\n+ npy_intp dims[1];\n+ double *data;\n+ int i;\n+\n+ dims[0] = length;\n+\n+ array = PyArray_New (&PyArray_Type,\n+\t\t 1,\n+\t\t dims,\n+\t\t NPY_DOUBLE,\n+\t\t NULL,\n+\t\t NULL \/* data *\/,\n+\t\t 0 \/* itemsize *\/,\n+\t\t NPY_CARRAY,\n+\t\t NULL);\n+\n+ data = (double *) PyArray_DATA (array);\n+\n+ for (i = 0; i < length; i++)\n+ {\n+ res = lib->GetTimeByIndex (file_id,\n+ entity_id,\n+ index + i,\n+ (data + i));\n+ if (res != ns_OK)\n+ break;\n+ }\n+\n+ if (check_result_is_error (res, lib))\n+ {\n+ Py_DECREF (array);\n+ return NULL;\n+ }\n+\n+ return array;\n+}\n+\n \/* ************************************************************************** *\/\n \/* \"public\" API *\/\n \n@@ -875,6 +921,7 @@\n PyObject *iobj, *id_obj, *idx_obj, *sz_obj;\n PyObject *res_obj;\n PyObject *array;\n+ PyObject *times;\n uint32 file_id;\n uint32 entity_id;\n uint32 index;\n@@ -932,9 +979,22 @@\n return NULL;\n }\n \n- res_obj = PyTuple_New (2);\n+ times = get_times_for_entity (lib,\n+ file_id,\n+ entity_id,\n+ index,\n+ count);\n+\n+ if (times == NULL)\n+ {\n+ Py_DECREF (array);\n+ return NULL;\n+ }\n+\n+ res_obj = PyTuple_New (3);\n PyTuple_SetItem (res_obj, 0, array);\n- PyTuple_SetItem (res_obj, 1, PyInt_FromLong (cont_count));\n+ PyTuple_SetItem (res_obj, 1, times);\n+ PyTuple_SetItem (res_obj, 2, PyInt_FromLong (cont_count));\n \n return res_obj;\n }\n"} {"commit":"892908ccfe95fc1a83e15585d5f20ac5dae32a31","subject":"nco\/pll_example: cleaning up output plots","message":"nco\/pll_example: cleaning up output plots\n","repos":"jgaeddert\/liquid-dsp,cjcliffe\/liquid-dsp,cjcliffe\/liquid-dsp,wangning223\/liquid-dsp,cjcliffe\/liquid-dsp,cjcliffe\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,biotrump\/liquid-dsp,cjcliffe\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,andrepuschmann\/liquid-dsp,JayKickliter\/liquid-dsp,wangning223\/liquid-dsp,biotrump\/liquid-dsp,JayKickliter\/liquid-dsp,manuts\/liquid-dsp,JayKickliter\/liquid-dsp,jgaeddert\/liquid-dsp,manuts\/liquid-dsp,biotrump\/liquid-dsp,wangning223\/liquid-dsp,wangning223\/liquid-dsp,andrepuschmann\/liquid-dsp,andrepuschmann\/liquid-dsp,jgaeddert\/liquid-dsp,wangning223\/liquid-dsp,JayKickliter\/liquid-dsp,biotrump\/liquid-dsp,jgaeddert\/liquid-dsp,manuts\/liquid-dsp,manuts\/liquid-dsp,manuts\/liquid-dsp,andrepuschmann\/liquid-dsp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/nco_pll_example.c\n+++ examples\/nco_pll_example.c\n@@ -52,7 +52,6 @@\n exit(1);\n }\n }\n- unsigned int d=n\/32; \/\/ print every \"d\" lines\n \n \/\/ objects\n nco_crcf nco_tx = nco_crcf_create(LIQUID_VCO);\n@@ -97,8 +96,8 @@\n nco_crcf_step(nco_rx);\n \n \/\/ print phase error\n- if ((i)%d == 0 || i==n-1 || i==0)\n- printf(\"%4u : phase error = %12.8f\\n\", i, phase_error[i]);\n+ if ( (i+1)%50 == 0 || i==n-1 || i==0)\n+ printf(\"%4u : phase error = %12.8f\\n\", i+1, phase_error[i]);\n }\n nco_crcf_destroy(nco_tx);\n nco_crcf_destroy(nco_rx);\n@@ -118,20 +117,24 @@\n }\n fprintf(fid,\"t=0:(n-1);\\n\");\n fprintf(fid,\"figure;\\n\");\n- fprintf(fid,\"subplot(2,1,1);\\n\");\n+ fprintf(fid,\"subplot(3,1,1);\\n\");\n fprintf(fid,\" plot(t,real(x),t,real(y));\\n\");\n fprintf(fid,\" xlabel('time');\\n\");\n fprintf(fid,\" ylabel('real');\\n\");\n- fprintf(fid,\"subplot(2,1,2);\\n\");\n+ fprintf(fid,\" axis([0 n -1.2 1.2]);\\n\");\n+ fprintf(fid,\" grid on;\\n\");\n+ fprintf(fid,\"subplot(3,1,2);\\n\");\n fprintf(fid,\" plot(t,imag(x),t,imag(y));\\n\");\n fprintf(fid,\" xlabel('time');\\n\");\n fprintf(fid,\" ylabel('imag');\\n\");\n-\n- fprintf(fid,\"figure;\\n\");\n- fprintf(fid,\"plot(t,e);\\n\");\n- fprintf(fid,\"xlabel('time');\\n\");\n- fprintf(fid,\"ylabel('phase error');\\n\");\n- fprintf(fid,\"grid on;\\n\");\n+ fprintf(fid,\" axis([0 n -1.2 1.2]);\\n\");\n+ fprintf(fid,\" grid on;\\n\");\n+ fprintf(fid,\"subplot(3,1,3);\\n\");\n+ fprintf(fid,\" plot(t,e);\\n\");\n+ fprintf(fid,\" xlabel('time');\\n\");\n+ fprintf(fid,\" ylabel('phase error');\\n\");\n+ fprintf(fid,\" axis([0 n -pi pi]);\\n\");\n+ fprintf(fid,\" grid on;\\n\");\n \n fclose(fid);\n printf(\"results written to %s.\\n\",OUTPUT_FILENAME);\n"} {"commit":"34d71eda6bfa7c43144f25da4dd549a892f1eda8","subject":"gl: Keep fz_page around for later use with annotations.","message":"gl: Keep fz_page around for later use with annotations.\n","repos":"hackqiang\/mupdf,lustersir\/MuPDF,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,tribals\/mupdf,knielsen\/mupdf,FabriceSalvaire\/mupdf-cmake,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,MokiMobility\/muPDF,ArtifexSoftware\/mupdf,lustersir\/MuPDF,zeniko\/mupdf,muennich\/mupdf,hxx0215\/MuPDFMirror,hxx0215\/MuPDFMirror,ccxvii\/mupdf,TamirEvan\/mupdf,tribals\/mupdf,asbloomf\/mupdf,TamirEvan\/mupdf,hackqiang\/mupdf,tribals\/mupdf,hackqiang\/mupdf,tribals\/mupdf,FabriceSalvaire\/mupdf-cmake,ccxvii\/mupdf,tribals\/mupdf,hxx0215\/MuPDFMirror,FabriceSalvaire\/mupdf-cmake,sebras\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,TamirEvan\/mupdf,MokiMobility\/muPDF,hxx0215\/MuPDFMirror,ArtifexSoftware\/mupdf,ccxvii\/mupdf,zeniko\/mupdf,github201407\/MuPDF,asbloomf\/mupdf,muennich\/mupdf,muennich\/mupdf,poor-grad-student\/mupdf,FabriceSalvaire\/mupdf-cmake,knielsen\/mupdf,FabriceSalvaire\/mupdf-cmake,knielsen\/mupdf,hackqiang\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,knielsen\/mupdf,hxx0215\/MuPDFMirror,MokiMobility\/muPDF,TamirEvan\/mupdf,github201407\/MuPDF,lustersir\/MuPDF,lustersir\/MuPDF,TamirEvan\/mupdf,poor-grad-student\/mupdf,fluks\/mupdf-x11-bookmarks,github201407\/MuPDF,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,lustersir\/MuPDF,zeniko\/mupdf,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,MokiMobility\/muPDF,asbloomf\/mupdf,github201407\/MuPDF,MokiMobility\/muPDF,hxx0215\/MuPDFMirror,tribals\/mupdf,muennich\/mupdf,github201407\/MuPDF,sebras\/mupdf,poor-grad-student\/mupdf,asbloomf\/mupdf,sebras\/mupdf,ccxvii\/mupdf,lustersir\/MuPDF,zeniko\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,github201407\/MuPDF,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,muennich\/mupdf,muennich\/mupdf,MokiMobility\/muPDF,FabriceSalvaire\/mupdf-cmake,hackqiang\/mupdf,asbloomf\/mupdf,zeniko\/mupdf,poor-grad-student\/mupdf,asbloomf\/mupdf,zeniko\/mupdf,knielsen\/mupdf,ArtifexSoftware\/mupdf,hackqiang\/mupdf,TamirEvan\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- platform\/gl\/gl-main.c\n+++ platform\/gl\/gl-main.c\n@@ -122,6 +122,7 @@\n \n static const char *title = \"MuPDF\/GL\";\n static fz_document *doc = NULL;\n+static fz_page *page = NULL;\n static fz_outline *outline = NULL;\n static fz_link *links = NULL;\n \n@@ -220,7 +221,6 @@\n \n void render_page(void)\n {\n-\tfz_page *page;\n \tfz_annot *annot;\n \tfz_pixmap *pix;\n \n@@ -228,6 +228,8 @@\n \tfz_pre_rotate(&page_ctm, -currentrotate);\n \tfz_invert_matrix(&page_inv_ctm, &page_ctm);\n \n+\tfz_drop_page(ctx, page);\n+\n \tpage = fz_load_page(ctx, doc, currentpage);\n \n \tfz_drop_link(ctx, links);\n@@ -246,7 +248,6 @@\n \t\tfz_drop_pixmap(ctx, pix);\n \t}\n \n-\tfz_drop_page(ctx, page);\n }\n \n static void push_history(void)\n@@ -311,12 +312,6 @@\n \tfz_buffer *buf;\n \tfz_rect page_sel;\n \n-#ifdef _WIN32\n-\tint newline = '\\r';\n-#else\n-\tint newline = '\\n';\n-#endif\n-\n \txofs -= page_tex.x;\n \tyofs -= page_tex.y;\n \n@@ -327,7 +322,11 @@\n \n \tfz_transform_rect(&page_sel, &page_inv_ctm);\n \n-\tbuf = fz_new_buffer_from_page_number(ctx, doc, currentpage, &page_sel, newline);\n+#ifdef _WIN32\n+\tbuf = fz_new_buffer_from_page(ctx, page, &page_sel, 1);\n+#else\n+\tbuf = fz_new_buffer_from_page(ctx, page, &page_sel, 0);\n+#endif\n \tfz_write_buffer_rune(ctx, buf, 0);\n \tglfwSetClipboardString(window, (char*)buf->data);\n \tfz_drop_buffer(ctx, buf);\n@@ -341,17 +340,17 @@\n \tui_draw_string(ctx, x0 + 2, y0 + 2 + ui.baseline, text);\n }\n \n-static void ui_scrollbar(int x0, int y0, int x1, int y1, int *value, int page, int max)\n+static void ui_scrollbar(int x0, int y0, int x1, int y1, int *value, int page_size, int max)\n {\n \tstatic float saved_top = 0;\n \tstatic int saved_ui_y = 0;\n \tfloat top;\n \n \tint total_h = y1 - y0;\n-\tint thumb_h = fz_maxi(x1 - x0, total_h * page \/ max);\n+\tint thumb_h = fz_maxi(x1 - x0, total_h * page_size \/ max);\n \tint avail_h = total_h - thumb_h;\n \n-\tmax -= page;\n+\tmax -= page_size;\n \n \tif (max <= 0)\n \t{\n@@ -369,12 +368,12 @@\n \t\t\tif (ui.y < top)\n \t\t\t{\n \t\t\t\tui.active = \"pgdn\";\n-\t\t\t\t*value -= page;\n+\t\t\t\t*value -= page_size;\n \t\t\t}\n \t\t\telse if (ui.y >= top + thumb_h)\n \t\t\t{\n \t\t\t\tui.active = \"pgup\";\n-\t\t\t\t*value += page;\n+\t\t\t\t*value += page_size;\n \t\t\t}\n \t\t\telse\n \t\t\t{\n@@ -1216,6 +1215,7 @@\n \tui_finish_fonts(ctx);\n \n \tfz_drop_link(ctx, links);\n+\tfz_drop_page(ctx, page);\n \tfz_drop_document(ctx, doc);\n \tfz_drop_context(ctx);\n \n"} {"commit":"b96353eb2fff263401dfbb81614c0ade3ff7847a","subject":"tsmf: properly flush the video when stopped.","message":"tsmf: properly flush the video when stopped.\n","repos":"FreeRDP\/FreeRDP-old,FreeRDP\/FreeRDP-old,FreeRDP\/FreeRDP-old","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- channels\/drdynvc\/tsmf\/tsmf_media.c\n+++ channels\/drdynvc\/tsmf\/tsmf_media.c\n@@ -618,6 +618,8 @@\n {\n \tTSMF_STREAM * stream;\n \n+\ttsmf_presentation_flush(presentation);\n+\n \tfor (stream = presentation->stream_list_head; stream; stream = stream->next)\n \t\ttsmf_stream_stop(stream);\n \n@@ -678,6 +680,7 @@\n \n \tstream->eos = 0;\n \tstream->last_end_time = 0;\n+\tstream->next_start_time = 0;\n \tif (stream->major_type == TSMF_MAJOR_TYPE_AUDIO)\n \t{\n \t\tstream->presentation->audio_start_time = 0;\n@@ -694,6 +697,8 @@\n \t\ttsmf_stream_flush(stream);\n \n \tpresentation->eos = 0;\n+\tpresentation->audio_start_time = 0;\n+\tpresentation->audio_end_time = 0;\n }\n \n void\n"} {"commit":"3586f8502cbc5e68f4e7772d59fce414920dd8d4","subject":"Fixed missing unicode conversion for mac drive redirection.","message":"Fixed missing unicode conversion for mac drive redirection.\n","repos":"erbth\/FreeRDP,akallabeth\/FreeRDP,chipitsine\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,rjcorrig\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,ondrejholy\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,nfedera\/FreeRDP,yurashek\/FreeRDP,RangeeGmbH\/FreeRDP,ilammy\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,eledoux\/FreeRDP,chipitsine\/FreeRDP,nfedera\/FreeRDP,akallabeth\/FreeRDP,bmiklautz\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,chipitsine\/FreeRDP,eledoux\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,chipitsine\/FreeRDP,bjcollins\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,RangeeGmbH\/FreeRDP,eledoux\/FreeRDP,mfleisz\/FreeRDP,rjcorrig\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,ivan-83\/FreeRDP,erbth\/FreeRDP,bmiklautz\/FreeRDP,yurashek\/FreeRDP,mfleisz\/FreeRDP,ilammy\/FreeRDP,cedrozor\/FreeRDP,ivan-83\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,eledoux\/FreeRDP,oshogbo\/FreeRDP,cloudbase\/FreeRDP-dev,yurashek\/FreeRDP,mfleisz\/FreeRDP,ivan-83\/FreeRDP,akallabeth\/FreeRDP,ondrejholy\/FreeRDP,bjcollins\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,eledoux\/FreeRDP,ondrejholy\/FreeRDP,cedrozor\/FreeRDP,RangeeGmbH\/FreeRDP,ilammy\/FreeRDP,Devolutions\/FreeRDP,oshogbo\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,mfleisz\/FreeRDP,akallabeth\/FreeRDP,akallabeth\/FreeRDP,bjcollins\/FreeRDP,bjcollins\/FreeRDP,rjcorrig\/FreeRDP,erbth\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,rjcorrig\/FreeRDP,oshogbo\/FreeRDP,cedrozor\/FreeRDP,ilammy\/FreeRDP,oshogbo\/FreeRDP,ilammy\/FreeRDP,erbth\/FreeRDP,chipitsine\/FreeRDP,RangeeGmbH\/FreeRDP,eledoux\/FreeRDP,awakecoding\/FreeRDP,cloudbase\/FreeRDP-dev,oshogbo\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,yurashek\/FreeRDP,ondrejholy\/FreeRDP,Devolutions\/FreeRDP,nfedera\/FreeRDP,ilammy\/FreeRDP,DavBfr\/FreeRDP,bmiklautz\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,DavBfr\/FreeRDP,ondrejholy\/FreeRDP,rjcorrig\/FreeRDP,ivan-83\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,rjcorrig\/FreeRDP,bmiklautz\/FreeRDP,nfedera\/FreeRDP,RangeeGmbH\/FreeRDP,ondrejholy\/FreeRDP,eledoux\/FreeRDP,bmiklautz\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,ivan-83\/FreeRDP,ilammy\/FreeRDP,rjcorrig\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,yurashek\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,eledoux\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,rjcorrig\/FreeRDP,ondrejholy\/FreeRDP,RangeeGmbH\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,mfleisz\/FreeRDP,yurashek\/FreeRDP,akallabeth\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,Devolutions\/FreeRDP,yurashek\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,bjcollins\/FreeRDP,bjcollins\/FreeRDP,ilammy\/FreeRDP,bmiklautz\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- channels\/rdpdr\/client\/rdpdr_main.c\n+++ channels\/rdpdr\/client\/rdpdr_main.c\n@@ -420,6 +420,7 @@\n \n \tfor (j = 0; j < count; j++)\n \t{\n+\t\tchar *path = NULL;\n \t\tBOOL dev_found = FALSE;\n \t\tdevice_ext = (DEVICE_DRIVE_EXT*)ListDictionary_GetItemValue(\n \t\t rdpdr->devman->devices, (void*)keys[j]);\n@@ -430,19 +431,25 @@\n \t\tif (device_ext->path == NULL)\n \t\t\tcontinue;\n \n+\t\tConvertFromUnicode(CP_UTF8, 0, device_ext->path, 0, &path, 0, NULL, FALSE);\n+\n \t\t\/* not plugable device *\/\n-\t\tif (strstr(device_ext->path, \"\/Volumes\/\") == NULL)\n+\t\tif (strstr(path, \"\/Volumes\/\") == NULL)\n+\t\t{\n+\t\t\tfree(path);\n \t\t\tcontinue;\n+\t\t}\n \n \t\tfor (i = 0; i < size; i++)\n \t\t{\n-\t\t\tif (strstr(device_ext->path, dev_array[i].path) != NULL)\n+\t\t\tif (strstr(path, dev_array[i].path) != NULL)\n \t\t\t{\n \t\t\t\tdev_found = TRUE;\n \t\t\t\tdev_array[i].to_add = FALSE;\n \t\t\t\tbreak;\n \t\t\t}\n \t\t}\n+\t\tfree(path);\n \n \t\tif (!dev_found)\n \t\t{\n"} {"commit":"606fcf8383943d7f986d6706f1cb67fbdab0e224","subject":"Bug 701402: x11: Allow smart scroll to advance to last page of document.","message":"Bug 701402: x11: Allow smart scroll to advance to last page of document.\n","repos":"fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,sebras\/mupdf,TamirEvan\/mupdf,sebras\/mupdf,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,sebras\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,ArtifexSoftware\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- platform\/x11\/pdfapp.c\n+++ platform\/x11\/pdfapp.c\n@@ -1503,7 +1503,7 @@\n \t\t{\n \t\t\tif (app->imgw + app->panx <= app->winw)\n \t\t\t{\n-\t\t\t\tif (app->pageno + 1 < app->pagecount)\n+\t\t\t\tif (app->pageno + 1 <= app->pagecount)\n \t\t\t\t{\n \t\t\t\t\tapp->panx = 0;\n \t\t\t\t\tapp->pany = 0;\n"} {"commit":"bafdf0d60be21de5046aac16dafb465b4d43ddd1","subject":"Fix fbtrace stack usage","message":"Fix fbtrace stack usage\n\nTest Plan: unit tests\n\nReviewed By: @spalamarchuk\n\nDifferential Revision: D1907262","repos":"is00hcw\/mcrouter,evertrue\/mcrouter,evertrue\/mcrouter,evertrue\/mcrouter,seem-sky\/mcrouter,zhlong73\/mcrouter,is00hcw\/mcrouter,seem-sky\/mcrouter,is00hcw\/mcrouter,nvaller\/mcrouter,evertrue\/mcrouter,synecdoche\/mcrouter,reddit\/mcrouter,easyfmxu\/mcrouter,easyfmxu\/mcrouter,tempbottle\/mcrouter,facebook\/mcrouter,zhlong73\/mcrouter,yqzhang\/mcrouter,yqzhang\/mcrouter,glensc\/mcrouter,glensc\/mcrouter,leitao\/mcrouter,facebook\/mcrouter,seem-sky\/mcrouter,leitao\/mcrouter,leitao\/mcrouter,yqzhang\/mcrouter,facebook\/mcrouter,apinski-cavium\/mcrouter,synecdoche\/mcrouter,apinski-cavium\/mcrouter,nvaller\/mcrouter,seem-sky\/mcrouter,apinski-cavium\/mcrouter,tempbottle\/mcrouter,glensc\/mcrouter,zhlong73\/mcrouter,reddit\/mcrouter,easyfmxu\/mcrouter,yqzhang\/mcrouter,synecdoche\/mcrouter,nvaller\/mcrouter,reddit\/mcrouter,tempbottle\/mcrouter,zhlong73\/mcrouter,apinski-cavium\/mcrouter,leitao\/mcrouter,is00hcw\/mcrouter,easyfmxu\/mcrouter,facebook\/mcrouter,glensc\/mcrouter,reddit\/mcrouter,synecdoche\/mcrouter,nvaller\/mcrouter,tempbottle\/mcrouter","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- mcrouter\/lib\/network\/FBTrace-inl.h\n+++ mcrouter\/lib\/network\/FBTrace-inl.h\n@@ -10,6 +10,7 @@\n #ifndef LIBMC_FBTRACE_DISABLE\n #include \"fbtrace\/libfbtrace\/c\/fbtrace.h\"\n #include \"mcrouter\/lib\/fbi\/cpp\/LogFailure.h\"\n+#include \"mcrouter\/lib\/fibers\/FiberManager.h\"\n #include \"mcrouter\/lib\/mc\/mc_fbtrace_info.h\"\n #endif\n \n@@ -79,14 +80,20 @@\n const char *op = mc_op_to_string((mc_op_t)McOp);\n const char *remote_service =\n request.routingKey().startsWith(\"tao\") ? FBTRACE_TAO : FBTRACE_MC;\n- if (fbtrace_request_send(&fbtraceInfo->fbtrace->node,\n- &fbtraceInfo->child_node, fbtraceInfo->metadata,\n- FBTRACE_METADATA_SZ, op, remote_service,\n- info) != 0) {\n- VLOG(1) << \"Error in fbtrace_request_send: \" << fbtrace_error();\n- return false;\n- }\n- return true;\n+\n+ \/* fbtrace talks to scribe via thrift,\n+ which can use up too much stack space *\/\n+ return fiber::runInMainContext(\n+ [fbtraceInfo, op, remote_service, &info] {\n+ if (fbtrace_request_send(&fbtraceInfo->fbtrace->node,\n+ &fbtraceInfo->child_node, fbtraceInfo->metadata,\n+ FBTRACE_METADATA_SZ, op, remote_service,\n+ info) != 0) {\n+ VLOG(1) << \"Error in fbtrace_request_send: \" << fbtrace_error();\n+ return false;\n+ }\n+ return true;\n+ });\n }\n \n template<int McOp, class Reply>\n@@ -103,9 +110,15 @@\n \n fbtrace_add_item(info, &idx, \"result\", mc_res_to_string(reply.result()));\n fbtrace_add_item(info, &idx, nullptr, nullptr);\n- if (fbtrace_reply_receive(&fbtraceInfo->child_node, info) != 0) {\n- VLOG(1) << \"Error in fbtrace_reply_receive: \" << fbtrace_error();\n- }\n+\n+ \/* fbtrace talks to scribe via thrift,\n+ which can use up too much stack space *\/\n+ fiber::runInMainContext(\n+ [fbtraceInfo, &info] {\n+ if (fbtrace_reply_receive(&fbtraceInfo->child_node, info) != 0) {\n+ VLOG(1) << \"Error in fbtrace_reply_receive: \" << fbtrace_error();\n+ }\n+ });\n }\n \n #endif\n"} {"commit":"3c421e7e48027f54b288608b8bafc512d79b68c9","subject":"rtpjitterbuffer: add option to reset retransmission timers","message":"rtpjitterbuffer: add option to reset retransmission timers\n","repos":"jhodapp\/gst-plugins-good,vatavuserban\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,rawoul\/gst-plugins-good,vatavuserban\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,reynaldo-samsung\/gst-plugins-good,jcaden\/gst-plugins-good,surround-io\/gst-plugins-good,pexip\/gst-plugins-good,lovebug356\/gst-plugins-good,chamois94\/gst-plugins-good,BigBrother-International\/gst-plugins-good,sh0\/gst-plugins-good,sebras\/gst-plugins-good,loshca\/gst-plugins-good,ndufresne\/gst-plugins-good,Lachann\/gst-plugins-good,hizukiayaka\/gst-plugins-good,Kurento\/gst-plugins-good,BigBrother-International\/gst-plugins-good,pexip\/gst-plugins-good,ariscop\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,Lachann\/gst-plugins-good,Kurento\/gst-plugins-good,cablelabs\/gst-plugins-good,pexip\/gst-plugins-good,shelsonjava\/gst-plugins-good,froggatt\/gst-plugins-good-m,surround-io\/gst-plugins-good,sh0\/gst-plugins-good,StreamUtils\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,wkatsak\/gst-plugins-good,chamois94\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,davibe\/gst-plugins-good-1.0,hizukiayaka\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,StreamUtils\/gst-plugins-good,rawoul\/gst-plugins-good,hizukiayaka\/gst-plugins-good,strukturag\/gst-plugins-good,Lachann\/gst-plugins-good,wkatsak\/gst-plugins-good,sh0\/gst-plugins-good,sebras\/gst-plugins-good,rawoul\/gst-plugins-good,ariscop\/gst-plugins-good,veo-labs\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,stfl\/gst-plugins-good,ndufresne\/gst-plugins-good,cfoch\/gst-plugins-good,jhodapp\/gst-plugins-good,stfl\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,strukturag\/gst-plugins-good,wkatsak\/gst-plugins-good,kittee\/gst-plugins-good,Kurento\/gst-plugins-good,greg80303\/gst-plugins-good,davibe\/gst-plugins-good-1.0,loshca\/gst-plugins-good,cablelabs\/gst-plugins-good,ikonst\/gst-plugins-good,kittee\/gst-plugins-good,jcaden\/gst-plugins-good,surround-io\/gst-plugins-good,greg80303\/gst-plugins-good,Lachann\/gst-plugins-good,Kurento\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,veo-labs\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,greg80303\/gst-plugins-good,pexip\/gst-plugins-good,BigBrother-International\/gst-plugins-good,pexip\/gst-plugins-good,chamois94\/gst-plugins-good,BigBrother-International\/gst-plugins-good,strukturag\/gst-plugins-good,ndufresne\/gst-plugins-good,krieger-od\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,shelsonjava\/gst-plugins-good,kittee\/gst-plugins-good,shelsonjava\/gst-plugins-good,ikonst\/gst-plugins-good,ikonst\/gst-plugins-good,strukturag\/gst-plugins-good,kittee\/gst-plugins-good,ariscop\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,cablelabs\/gst-plugins-good,cfoch\/gst-plugins-good,GStreamer\/gst-plugins-good,davibe\/gst-plugins-good-1.0,vatavuserban\/gst-plugins-good,loshca\/gst-plugins-good,jcaden\/gst-plugins-good,jhodapp\/gst-plugins-good,sh0\/gst-plugins-good,StreamUtils\/gst-plugins-good,jhodapp\/gst-plugins-good,krieger-od\/gst-plugins-good,stfl\/gst-plugins-good,StreamUtils\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,shelsonjava\/gst-plugins-good,cablelabs\/gst-plugins-good,chamois94\/gst-plugins-good,krieger-od\/gst-plugins-good,cfoch\/gst-plugins-good,veo-labs\/gst-plugins-good,loshca\/gst-plugins-good,greg80303\/gst-plugins-good,rawoul\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,hizukiayaka\/gst-plugins-good,GStreamer\/gst-plugins-good,jcaden\/gst-plugins-good,ariscop\/gst-plugins-good,lovebug356\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,davibe\/gst-plugins-good-1.0,cfoch\/gst-plugins-good,lovebug356\/gst-plugins-good,ndufresne\/gst-plugins-good,krieger-od\/gst-plugins-good,GStreamer\/gst-plugins-good,lovebug356\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,vatavuserban\/gst-plugins-good,sebras\/gst-plugins-good,surround-io\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,ikonst\/gst-plugins-good,GStreamer\/gst-plugins-good,Kurento\/gst-plugins-good,veo-labs\/gst-plugins-good,froggatt\/gst-plugins-good-m,sebras\/gst-plugins-good,froggatt\/gst-plugins-good-m,wkatsak\/gst-plugins-good,froggatt\/gst-plugins-good-m,stfl\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -1520,7 +1520,7 @@\n \n static void\n reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,\n- guint16 seqnum, GstClockTime timeout, GstClockTime delay)\n+ guint16 seqnum, GstClockTime timeout, GstClockTime delay, gboolean reset)\n {\n GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n gboolean seqchange, timechange;\n@@ -1540,7 +1540,7 @@\n \n timer->timeout = timeout + delay;\n timer->seqnum = seqnum;\n- if (seqchange && timer->type == TIMER_TYPE_EXPECTED) {\n+ if (reset) {\n timer->rtx_base = timeout;\n timer->rtx_delay = delay;\n timer->rtx_retry = 0;\n@@ -1569,7 +1569,7 @@\n if (timer == NULL) {\n timer = add_timer (jitterbuffer, type, seqnum, 0, timeout, 0, -1);\n } else {\n- reschedule_timer (jitterbuffer, timer, seqnum, timeout, 0);\n+ reschedule_timer (jitterbuffer, timer, seqnum, timeout, 0, FALSE);\n }\n return timer;\n }\n@@ -1636,7 +1636,7 @@\n \/* max gap, we exceeded the max reorder distance and we don't expect the\n * missing packet to be this reordered *\/\n if (test->rtx_retry == 0 && test->type == TIMER_TYPE_EXPECTED)\n- reschedule_timer (jitterbuffer, test, test->seqnum, -1, 0);\n+ reschedule_timer (jitterbuffer, test, test->seqnum, -1, 0, FALSE);\n }\n }\n \n@@ -1650,7 +1650,7 @@\n \/* and update\/install timer for next seqnum *\/\n if (timer)\n reschedule_timer (jitterbuffer, timer, priv->next_in_seqnum, expected,\n- delay);\n+ delay, TRUE);\n else\n add_timer (jitterbuffer, TIMER_TYPE_EXPECTED, priv->next_in_seqnum, 0,\n expected, delay, priv->packet_spacing);\n@@ -2342,7 +2342,7 @@\n timer->rtx_retry = 0;\n }\n reschedule_timer (jitterbuffer, timer, timer->seqnum,\n- timer->rtx_base + timer->rtx_retry, timer->rtx_delay);\n+ timer->rtx_base + timer->rtx_retry, timer->rtx_delay, FALSE);\n \n return FALSE;\n }\n"} {"commit":"615b8f99f755f8e2701f08cef9c56bd3033891a5","subject":"perf tests: Add numeric identifier to evlist_test","message":"perf tests: Add numeric identifier to evlist_test\n\nIn tests\/parse-events.c test cases are declared in evlist_test[]\narrays. Elements of arrays are initialized in following pattern:\n\t[i] = {\n \t\t.name = ...,\n \t\t.check = ...,\n \t},\n\nWhen perf-test is running with '-v' option, 'i' variable will be\nprinted for every existing test.\n\nHowever, we can't add any arch specific tests inside #ifdefs, because it\nwill create collision between the element number inside #ifdef and the\nnext one outside.\n\nThis patch adds 'id' field in evlist_test, uses it as a test\nidentifier and removes explicit numbering of array elements. This helps\nto number tests with gaps.\n\nSigned-off-by: Alexander Yarygin <9ca6bb7262616b7ce87466603a4e88c0d04eafde@linux.vnet.ibm.com>\nLink: http:\/\/lkml.kernel.org\/r\/1398440047-6641-3-git-send-email-9ca6bb7262616b7ce87466603a4e88c0d04eafde@linux.vnet.ibm.com\nSigned-off-by: Jiri Olsa <2c6594f608aa3d41e98d48846a6328831f7084ad@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/perf\/tests\/parse-events.c\n+++ tools\/perf\/tests\/parse-events.c\n@@ -1174,188 +1174,233 @@\n struct evlist_test {\n \tconst char *name;\n \t__u32 type;\n+\tconst int id;\n \tint (*check)(struct perf_evlist *evlist);\n };\n \n static struct evlist_test test__events[] = {\n-\t[0] = {\n+\t{\n \t\t.name = \"syscalls:sys_enter_open\",\n \t\t.check = test__checkevent_tracepoint,\n-\t},\n-\t[1] = {\n+\t\t.id = 0,\n+\t},\n+\t{\n \t\t.name = \"syscalls:*\",\n \t\t.check = test__checkevent_tracepoint_multi,\n-\t},\n-\t[2] = {\n+\t\t.id = 1,\n+\t},\n+\t{\n \t\t.name = \"r1a\",\n \t\t.check = test__checkevent_raw,\n-\t},\n-\t[3] = {\n+\t\t.id = 2,\n+\t},\n+\t{\n \t\t.name = \"1:1\",\n \t\t.check = test__checkevent_numeric,\n-\t},\n-\t[4] = {\n+\t\t.id = 3,\n+\t},\n+\t{\n \t\t.name = \"instructions\",\n \t\t.check = test__checkevent_symbolic_name,\n-\t},\n-\t[5] = {\n+\t\t.id = 4,\n+\t},\n+\t{\n \t\t.name = \"cycles\/period=100000,config2\/\",\n \t\t.check = test__checkevent_symbolic_name_config,\n-\t},\n-\t[6] = {\n+\t\t.id = 5,\n+\t},\n+\t{\n \t\t.name = \"faults\",\n \t\t.check = test__checkevent_symbolic_alias,\n-\t},\n-\t[7] = {\n+\t\t.id = 6,\n+\t},\n+\t{\n \t\t.name = \"L1-dcache-load-miss\",\n \t\t.check = test__checkevent_genhw,\n-\t},\n-\t[8] = {\n+\t\t.id = 7,\n+\t},\n+\t{\n \t\t.name = \"mem:0\",\n \t\t.check = test__checkevent_breakpoint,\n-\t},\n-\t[9] = {\n+\t\t.id = 8,\n+\t},\n+\t{\n \t\t.name = \"mem:0:x\",\n \t\t.check = test__checkevent_breakpoint_x,\n-\t},\n-\t[10] = {\n+\t\t.id = 9,\n+\t},\n+\t{\n \t\t.name = \"mem:0:r\",\n \t\t.check = test__checkevent_breakpoint_r,\n-\t},\n-\t[11] = {\n+\t\t.id = 10,\n+\t},\n+\t{\n \t\t.name = \"mem:0:w\",\n \t\t.check = test__checkevent_breakpoint_w,\n-\t},\n-\t[12] = {\n+\t\t.id = 11,\n+\t},\n+\t{\n \t\t.name = \"syscalls:sys_enter_open:k\",\n \t\t.check = test__checkevent_tracepoint_modifier,\n-\t},\n-\t[13] = {\n+\t\t.id = 12,\n+\t},\n+\t{\n \t\t.name = \"syscalls:*:u\",\n \t\t.check = test__checkevent_tracepoint_multi_modifier,\n-\t},\n-\t[14] = {\n+\t\t.id = 13,\n+\t},\n+\t{\n \t\t.name = \"r1a:kp\",\n \t\t.check = test__checkevent_raw_modifier,\n-\t},\n-\t[15] = {\n+\t\t.id = 14,\n+\t},\n+\t{\n \t\t.name = \"1:1:hp\",\n \t\t.check = test__checkevent_numeric_modifier,\n-\t},\n-\t[16] = {\n+\t\t.id = 15,\n+\t},\n+\t{\n \t\t.name = \"instructions:h\",\n \t\t.check = test__checkevent_symbolic_name_modifier,\n-\t},\n-\t[17] = {\n+\t\t.id = 16,\n+\t},\n+\t{\n \t\t.name = \"faults:u\",\n \t\t.check = test__checkevent_symbolic_alias_modifier,\n-\t},\n-\t[18] = {\n+\t\t.id = 17,\n+\t},\n+\t{\n \t\t.name = \"L1-dcache-load-miss:kp\",\n \t\t.check = test__checkevent_genhw_modifier,\n-\t},\n-\t[19] = {\n+\t\t.id = 18,\n+\t},\n+\t{\n \t\t.name = \"mem:0:u\",\n \t\t.check = test__checkevent_breakpoint_modifier,\n-\t},\n-\t[20] = {\n+\t\t.id = 19,\n+\t},\n+\t{\n \t\t.name = \"mem:0:x:k\",\n \t\t.check = test__checkevent_breakpoint_x_modifier,\n-\t},\n-\t[21] = {\n+\t\t.id = 20,\n+\t},\n+\t{\n \t\t.name = \"mem:0:r:hp\",\n \t\t.check = test__checkevent_breakpoint_r_modifier,\n-\t},\n-\t[22] = {\n+\t\t.id = 21,\n+\t},\n+\t{\n \t\t.name = \"mem:0:w:up\",\n \t\t.check = test__checkevent_breakpoint_w_modifier,\n-\t},\n-\t[23] = {\n+\t\t.id = 22,\n+\t},\n+\t{\n \t\t.name = \"r1,syscalls:sys_enter_open:k,1:1:hp\",\n \t\t.check = test__checkevent_list,\n-\t},\n-\t[24] = {\n+\t\t.id = 23,\n+\t},\n+\t{\n \t\t.name = \"instructions:G\",\n \t\t.check = test__checkevent_exclude_host_modifier,\n-\t},\n-\t[25] = {\n+\t\t.id = 24,\n+\t},\n+\t{\n \t\t.name = \"instructions:H\",\n \t\t.check = test__checkevent_exclude_guest_modifier,\n-\t},\n-\t[26] = {\n+\t\t.id = 25,\n+\t},\n+\t{\n \t\t.name = \"mem:0:rw\",\n \t\t.check = test__checkevent_breakpoint_rw,\n-\t},\n-\t[27] = {\n+\t\t.id = 26,\n+\t},\n+\t{\n \t\t.name = \"mem:0:rw:kp\",\n \t\t.check = test__checkevent_breakpoint_rw_modifier,\n-\t},\n-\t[28] = {\n+\t\t.id = 27,\n+\t},\n+\t{\n \t\t.name = \"{instructions:k,cycles:upp}\",\n \t\t.check = test__group1,\n-\t},\n-\t[29] = {\n+\t\t.id = 28,\n+\t},\n+\t{\n \t\t.name = \"{faults:k,cache-references}:u,cycles:k\",\n \t\t.check = test__group2,\n-\t},\n-\t[30] = {\n+\t\t.id = 29,\n+\t},\n+\t{\n \t\t.name = \"group1{syscalls:sys_enter_open:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u\",\n \t\t.check = test__group3,\n-\t},\n-\t[31] = {\n+\t\t.id = 30,\n+\t},\n+\t{\n \t\t.name = \"{cycles:u,instructions:kp}:p\",\n \t\t.check = test__group4,\n-\t},\n-\t[32] = {\n+\t\t.id = 31,\n+\t},\n+\t{\n \t\t.name = \"{cycles,instructions}:G,{cycles:G,instructions:G},cycles\",\n \t\t.check = test__group5,\n-\t},\n-\t[33] = {\n+\t\t.id = 32,\n+\t},\n+\t{\n \t\t.name = \"*:*\",\n \t\t.check = test__all_tracepoints,\n-\t},\n-\t[34] = {\n+\t\t.id = 33,\n+\t},\n+\t{\n \t\t.name = \"{cycles,cache-misses:G}:H\",\n \t\t.check = test__group_gh1,\n-\t},\n-\t[35] = {\n+\t\t.id = 34,\n+\t},\n+\t{\n \t\t.name = \"{cycles,cache-misses:H}:G\",\n \t\t.check = test__group_gh2,\n-\t},\n-\t[36] = {\n+\t\t.id = 35,\n+\t},\n+\t{\n \t\t.name = \"{cycles:G,cache-misses:H}:u\",\n \t\t.check = test__group_gh3,\n-\t},\n-\t[37] = {\n+\t\t.id = 36,\n+\t},\n+\t{\n \t\t.name = \"{cycles:G,cache-misses:H}:uG\",\n \t\t.check = test__group_gh4,\n-\t},\n-\t[38] = {\n+\t\t.id = 37,\n+\t},\n+\t{\n \t\t.name = \"{cycles,cache-misses,branch-misses}:S\",\n \t\t.check = test__leader_sample1,\n-\t},\n-\t[39] = {\n+\t\t.id = 38,\n+\t},\n+\t{\n \t\t.name = \"{instructions,branch-misses}:Su\",\n \t\t.check = test__leader_sample2,\n-\t},\n-\t[40] = {\n+\t\t.id = 39,\n+\t},\n+\t{\n \t\t.name = \"instructions:uDp\",\n \t\t.check = test__checkevent_pinned_modifier,\n-\t},\n-\t[41] = {\n+\t\t.id = 40,\n+\t},\n+\t{\n \t\t.name = \"{cycles,cache-misses,branch-misses}:D\",\n \t\t.check = test__pinned_group,\n+\t\t.id = 41,\n \t},\n };\n \n static struct evlist_test test__events_pmu[] = {\n-\t[0] = {\n+\t{\n \t\t.name = \"cpu\/config=10,config1,config2=3,period=1000\/u\",\n \t\t.check = test__checkevent_pmu,\n-\t},\n-\t[1] = {\n+\t\t.id = 0,\n+\t},\n+\t{\n \t\t.name = \"cpu\/config=1,name=krava\/u,cpu\/config=2\/u\",\n \t\t.check = test__checkevent_pmu_name,\n+\t\t.id = 1,\n \t},\n };\n \n@@ -1402,7 +1447,7 @@\n \tfor (i = 0; i < cnt; i++) {\n \t\tstruct evlist_test *e = &events[i];\n \n-\t\tpr_debug(\"running test %d '%s'\\n\", i, e->name);\n+\t\tpr_debug(\"running test %d '%s'\\n\", e->id, e->name);\n \t\tret1 = test_event(e);\n \t\tif (ret1)\n \t\t\tret2 = ret1;\n"} {"commit":"94ee4abe5b943b43d65a0da35fc46a6d08aba449","subject":"Completion: rearrange the code of get_selected_proposal()","message":"Completion: rearrange the code of get_selected_proposal()\n","repos":"GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcecompletion.c\n+++ gtksourceview\/gtksourcecompletion.c\n@@ -244,43 +244,40 @@\n \t\t GtkSourceCompletionProposal **proposal)\n {\n \tGtkTreeIter piter;\n-\tGtkTreeModel *model;\n \tGtkTreeSelection *selection;\n \n \tselection = gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->tree_view_proposals));\n \n-\tif (gtk_tree_selection_get_selected (selection, NULL, &piter))\n-\t{\n-\t\tif (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, &piter))\n-\t\t{\n-\t\t\treturn FALSE;\n-\t\t}\n-\n-\t\tmodel = GTK_TREE_MODEL (completion->priv->model_proposals);\n-\n-\t\tif (proposal)\n-\t\t{\n-\t\t\tgtk_tree_model_get (model, &piter,\n-\t\t\t\t\t GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROPOSAL,\n-\t\t\t\t\t proposal, -1);\n-\t\t}\n-\n-\t\tif (provider)\n-\t\t{\n-\t\t\tgtk_tree_model_get (model, &piter,\n-\t\t\t\t\t GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROVIDER,\n-\t\t\t\t\t provider, -1);\n-\t\t}\n-\n-\t\tif (iter != NULL)\n-\t\t{\n-\t\t\t*iter = piter;\n-\t\t}\n-\n-\t\treturn TRUE;\n-\t}\n-\n-\treturn FALSE;\n+\tif (!gtk_tree_selection_get_selected (selection, NULL, &piter))\n+\t{\n+\t\treturn FALSE;\n+\t}\n+\n+\tif (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, &piter))\n+\t{\n+\t\treturn FALSE;\n+\t}\n+\n+\tif (iter != NULL)\n+\t{\n+\t\t*iter = piter;\n+\t}\n+\n+\tif (provider != NULL)\n+\t{\n+\t\tgtk_tree_model_get (GTK_TREE_MODEL (completion->priv->model_proposals), &piter,\n+\t\t\t\t GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROVIDER, provider,\n+\t\t\t\t -1);\n+\t}\n+\n+\tif (proposal != NULL)\n+\t{\n+\t\tgtk_tree_model_get (GTK_TREE_MODEL (completion->priv->model_proposals), &piter,\n+\t\t\t\t GTK_SOURCE_COMPLETION_MODEL_COLUMN_PROPOSAL, proposal,\n+\t\t\t\t -1);\n+\t}\n+\n+\treturn TRUE;\n }\n \n static void\n"} {"commit":"206ef7b776a2fbdedd36b97ecb5e021443d1ee80","subject":"Remove manage-keys property","message":"Remove manage-keys property\n\nThe property is not very useful since it is all or nothing. We probably want\nto have proper bindings for the keys so that they can be easily overriden","repos":"uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcecompletion.c\n+++ gtksourceview\/gtksourcecompletion.c\n@@ -60,7 +60,6 @@\n {\n \tPROP_0,\n \tPROP_VIEW,\n-\tPROP_MANAGE_KEYS,\n \tPROP_REMEMBER_INFO_VISIBILITY,\n \tPROP_SELECT_ON_SHOW,\n \tPROP_SHOW_HEADERS,\n@@ -1338,9 +1337,6 @@\n \t{\n \t\tcase PROP_VIEW:\n \t\t\tg_value_set_object (value, completion->priv->view);\n-\t\t\tbreak;\n-\t\tcase PROP_MANAGE_KEYS:\n-\t\t\tg_value_set_boolean (value, completion->priv->manage_keys);\n \t\t\tbreak;\n \t\tcase PROP_REMEMBER_INFO_VISIBILITY:\n \t\t\tg_value_set_boolean (value, completion->priv->remember_info_visibility);\n@@ -1378,9 +1374,6 @@\n \t\t\t\/* On construction only *\/\n \t\t\tcompletion->priv->view = g_value_dup_object (value);\n \t\t\tconnect_view (completion);\n-\t\t\tbreak;\n-\t\tcase PROP_MANAGE_KEYS:\n-\t\t\tcompletion->priv->manage_keys = g_value_get_boolean (value);\n \t\t\tbreak;\n \t\tcase PROP_REMEMBER_INFO_VISIBILITY:\n \t\t\tcompletion->priv->remember_info_visibility = g_value_get_boolean (value);\n@@ -1478,21 +1471,7 @@\n \t\t\t\t\t\t\t _(\"The GtkSourceView bound to the completion\"),\n \t\t\t\t\t\t\t GTK_TYPE_SOURCE_VIEW,\n \t\t\t\t\t\t\t G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));\n-\t\n-\t\/**\n-\t * GtkSourceCompletion:manage-completion-keys:\n-\t *\n-\t * Determines whether the completion object should manage key presses\n-\t * for navigating and activating proposals.\n-\t *\n-\t *\/\n-\tg_object_class_install_property (object_class,\n-\t\t\t\t\t PROP_MANAGE_KEYS,\n-\t\t\t\t\t g_param_spec_boolean (\"manage-completion-keys\",\n-\t\t\t\t\t\t\t _(\"Manage Completion Keys\"),\n-\t\t\t\t\t\t\t _(\"Manage keys to navigate proposal selection\"),\n-\t\t\t\t\t\t\t TRUE,\n-\t\t\t\t\t\t\t G_PARAM_READWRITE | G_PARAM_CONSTRUCT));\n+\n \t\/**\n \t * GtkSourceCompletion:remember-info-visibility:\n \t *\n"} {"commit":"34c3be9fb47e7bfe531a746ace330aa4f07a05e7","subject":"execute x threads with same priority, only one of them capture latency results","message":"execute x threads with same priority, only one of them capture latency results\n","repos":"herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/multi_thread_latency\/main.c\n+++ examples\/multi_thread_latency\/main.c\n@@ -25,225 +25,200 @@\n #include \"gpio.h\"\n #include \"thread.h\"\n #include \"msg.h\"\n+#include \"ps.h\"\n+\n+#define THREADS\t\t\t(15)\n+#define THREAD_LATENCY (3) \/\/Define the pid number to measure latency.\n+\n+char stack[THREADS][KERNEL_CONF_STACKSIZE_MAIN];\n+\n \n #define MSEC (1000)\n #define SEC (1000 * MSEC)\n-char stack[15][KERNEL_CONF_STACKSIZE_MAIN];\n-\/\/char stack_1[KERNEL_CONF_STACKSIZE_MAIN];\n-char latency_vector_stack[KERNEL_CONF_STACKSIZE_MAIN];\n-\n-\n-\/*Global variables*\/\n-int index=100;\n-int latency[1000]={0}; \/*define vector for latency*\/\n-int count[1000]={0};\n-\n-\/*Define multiple threads*\/\n-int threads=5;\n-int th=1;\n-\n-\n-\/\/for(th=1 ; th < threads +1; th++)\n- \/\/\t{\n- \/\/char sprintf(buffer, \"t%d_stack\", th)[KERNEL_CONF_STACKSIZE_MAIN];\n- \/\/\t}\n-\n-\n-timex_t now_thread;\n-int flag[5]={1};\n-\n-\n+#define MAX_LATENCY 1000\n+\n+\/*Define vectors to print histogram*\/\n+int latency[MAX_LATENCY] = {0}; \/* define vector for latency *\/\n+int count[MAX_LATENCY] = {0};\n+int overflow = 0;\n+\n+int thread[THREADS] = {0}; \/\/save the repetitions to execute each thread\n+\n+\/*inizialize parameters*\/\n+int iteration = 0;\n+int test_repeats = 1000;\n \n void *second_thread(void *arg)\n {\n- (void) arg;\n-\n- while (1) {\n- \tvtimer_now(&now_thread);\n- \tflag[1] = 1;\n+(void) arg;\n+\/*Define variables control threads*\/\n+int pid;\n+\n+\n+\/*define time variables*\/\n+timex_t now;\n+timex_t next = timex_set(0, 0);\n+timex_t diff;\n+\n+\/*define sleep variables*\/\n+timex_t interval = timex_set(0, 1000); \/\/ set sleep interval to 1000 us = 1 ms\n+\n+vtimer_now(&now);\n+next = timex_add(now, interval);\n+\n+while(1){\n+\n+\tpid = thread_getpid();\n+\tthread[pid]++;\n+\t\/\/printf(\"pid thread is: %i\\n\", pid);\n+\n+\n+\tif (pid == THREAD_LATENCY){\n+\t\t\/\/printf(\"thread latency is: %i\\n\", pid);\n+\t\tif(iteration < test_repeats) {\n+\t\tvtimer_usleep(interval.microseconds); \/\/ sleep\n+\t\tvtimer_now(&now); \/\/ get actual time after sleep (:=now)\n+\t\tdiff = timex_sub(now, next); \/\/ compute difference between theoretical time after sleep (:=next)\n+ \/\/ and actual time after sleep (:=now)\n+\t\titeration++;\n+\n+\t\tif (diff.microseconds > MAX_LATENCY - 1) \/\/ guard for overflow\n+\t\t\toverflow++;\n+\t\telse\n+\t\t\tcount[diff.microseconds] += 1; \/\/ store diff result for statistics\n+\t\t\t\/\/printf(\"the latency result is: %\"PRIu32\" \\n\", diff.microseconds);\n+\n+\t\tvtimer_now(&now); \/\/ get actual time for next iteration (:=now)\n+\t\tnext = timex_add(interval, now); \/\/ update theoretical time for next iteration\n+\t\t}\n+\t}\n+\tthread_yield();\n+\tif(test_repeats == iteration) { \/\/if the test finish send to sleep all threads\n \t\tthread_sleep();\n- }\n-\n- return NULL;\n+\t}\n }\n-\n-\n-\n-void *vector_latency(void *arg)\n-{\n- (void) arg;\n-\n- \/*Init latency vector*\/\n- int j=0;\n- int c=0;\n-\n- for(j=0 ; j < index; j++)\n- \t{\n- \tlatency[j] = c;\n- \tc= c + 1;\n- \t}\n- printf(\"vector init\\n\");\n-\n-\n- return NULL;\n+\treturn NULL;\n }\n \n int main(void)\n {\n \n-\tflag[1]=1;\n- \/*define time variables*\/\n-\ttimex_t now;\n-\ttimex_t next;\n-\ttimex_t next_old;\n-\ttimex_t diff;\n-\tnow_thread.seconds=0;\n-\tnow_thread.microseconds=0;\n-\tnext.seconds=0;\n-\tnext.microseconds=0;\n-\tnext_old.seconds=0;\n-\tnext_old.microseconds=0;\n-\n-\n-\t\/*define sleep variables*\/\n-\tvtimer_t vtimer;\n-\t\/\/timex_t interval=timex_set(1, 0);\n-\ttimex_t interval;\n-\tinterval.seconds=1;\n-\tinterval.microseconds=0;\n-\n-\t\/*inizialize parameters*\/\n-\tint i=0;\n-\tint time=10;\n+\n+\t\/*vector variable*\/\n+\tint j = 0;\n+\tint c = 0;\n+\n+\n \n \t\/*print values*\/\n-\tint n=0;\n+\tint n = 0;\n+\tint d = 0;\n \n \t\/*Maximum and minimum values*\/\n-\tint max_c=count[0];\n-\tint max_l=latency[0];\n-\tint min_c=1;\n-\tint min_l=latency[0];\n-\n-\n-\n-\n+\tint max_c = count[0];\n+\tint max_l = latency[0];\n+\tint max_time_c = count[0];\n+\tint max_time_l = latency[0];\n+\tint min_time_c = 0;\n+\tint min_time_l = 0;\n+\tint min_time_flag = 1;\n+\n+\n+\n+\t\/*Init program*\/\n+\tprintf(\"# ********************************************* \\n\");\n+\tprintf(\"# ************* Latency RIOT test ************* \\n\");\n+\tprintf(\"# ********************************************* \\n\");\n+\tprintf(\"# config parameters:\\n\");\n+\t\/\/printf(\"# Interval sleep: %\"PRIu32\" sec and %\"PRIu32\" micro\\n\", interval.seconds, interval.microseconds);\n+\tprintf(\"# Samples: %i\\n\", MAX_LATENCY);\n+\tprintf(\"# Repetitions: %i\\n\", test_repeats);\n+\tprintf(\"# ********************************************* \\n\");\n+\n+\t\/*Init latency vector*\/\n+\n+\tfor(j = 0 ; j < MAX_LATENCY; j++) {\n+\t\tlatency[j] = c;\n+\t\tc += 1;\n+\t}\n+\tprintf(\"# vector init\\n\");\n+\tvtimer_usleep(SEC);\n+\n+\t\/*Define multiple threads*\/\n+\tint th=1;\n \t\/*define multi sleeping thread*\/\n-\tkernel_pid_t pid[threads];\n-\tconst char buffer[9];\n-\n-for(th=1 ; th < threads +1; th++)\n-\t \t{\n-\t sprintf(buffer, \"thread_%d\", th);\n-\t printf(\"buffer is:%s\\n\", buffer);\n-\t\tprintf(\"threads:%i\\n\", th);\n- pid[th] = thread_create(stack[th],\n- \t\t KERNEL_CONF_STACKSIZE_MAIN,\n- PRIORITY_MAIN - th,\n- CREATE_WOUT_YIELD | CREATE_STACKTEST | CREATE_SLEEPING,\n- second_thread,\n- NULL,\n- buffer);\n- printf(\"pid thread is:%i\\n\", pid[th]);\n-\t \t}\n-\n- printf(\"threads init\\n\");\n-\n-\t\/*define latency vector thread*\/\n- thread_create(latency_vector_stack,\n- KERNEL_CONF_STACKSIZE_MAIN,\n- PRIORITY_MAIN - 2,\n- CREATE_WOUT_YIELD | CREATE_STACKTEST,\n- vector_latency,\n- NULL,\n- \"vector_latency\");\n-\n-\n-\n- \/*Init program*\/\n- printf(\"********************************************* \\n\");\n- printf(\"************* Latency RIOT test ************* \\n\");\n- printf(\"********************************************* \\n\");\n- printf(\"config parameters:\\n\\n\");\n- printf(\"Interval sleep: %i sec\\n\", interval.seconds);\n- printf(\"Samples:%i\\n\", index);\n- printf(\"time process: %i\\n\", time);\n- printf(\"********************************************** \\n\");\n- printf(\"\\n \\n\");\n- thread_print_all();\n- vtimer_usleep(SEC);\n-\n-\n-while(1){\n-\n-\tif(flag[1] && (i<time))\n-\t\t{\n-\n-\t\t\/*get time now and program next thread wake up*\/\n-\t\tvtimer_now(&now);\n-\t\tvtimer_set_wakeup(&vtimer, interval, pid[1]);\n-\t\tnext_old.microseconds = next.microseconds;\n-\t\tnext.microseconds = now.microseconds + interval.microseconds;\n-\t\tflag[1]=0;\n-\t\ti = i +1;\n-\n-\t\t\/*Capture and print out latency values*\/\n-\t\t\t\/\/diff.seconds = now_thread.seconds - next.seconds; \/\/always is 0\n-\t\t\tdiff.microseconds = now_thread.microseconds - next_old.microseconds;\n-\t\t\tif (diff.microseconds > 99999)\n-\t\t\tdiff.microseconds = 0x100000000 - diff.microseconds;\n-\n-\t\t\tcount[diff.microseconds] += 1 ;\n-\n-\n-\n-\t\t\t\/\/x+=1;\n-\t\t\t\/\/printf(\"%i\\n\", x);\n-\t\/\/\t\tprintf(\"next is microsec: %\"PRIu32\"\\n\", next.microseconds);\n-\t\t \/\/ printf(\"now_thread is microsec: %\"PRIu32\"\\n\", now_thread.microseconds);\n-\t\t\t\/\/printf(\"diff is microsec: %\"PRIu32\"\\n\", diff.microseconds);\n-\n-\n-\t\t}\n-\n-\tif(time == i)\n-\t\t{\n-\t \/\/thread_print_all();\n-\t\ttime=0;\n-\t\tprintf(\"Test finish\\n\");\n-\t\tprintf(\"print histogram\\n\");\n-\t\tvtimer_usleep(SEC);\n-\t\t\/*print out values*\/\n-\t\tfor(n=0; n < index ; n++)\n-\t\t\t{\n-\t\t\tif(n<10)\n-\t\t\tprintf(\"00%i %\"PRIu32\"\\n\",latency[n], count[n]);\n-\t\t\telse if(n<100 && n>=10)\n-\t\t\tprintf(\"0%i %\"PRIu32\"\\n\",latency[n], count[n]);\n-\t\t\telse\n-\t\t\tprintf(\"%i %\"PRIu32\"\\n\",latency[n], count[n]);\n-\n-\t\t\t\/*Get the maximum values*\/\n-\t\t\tif (max_c < count[n])\n-\t\t\t\t{\n-\t\t\t\tmax_c = count[n];\n-\t\t\t\tmax_l = latency[n];\n-\n+\tkernel_pid_t pid[THREADS];\n+\tchar buffer[THREADS][11];\n+\n+for(th=1 ; th < THREADS; th++)\n+\t{\n+\tsprintf(buffer[th], \"th_back_%d\", th);\n+\/\/\tprintf(\"buffer is:%s\\n\", buffer[th]);\n+\tpid[th] = thread_create(stack[th],\n+\t\t\tKERNEL_CONF_STACKSIZE_MAIN,\n+\t\t\tPRIORITY_MAIN -1,\n+\t\t\tCREATE_WOUT_YIELD | CREATE_STACKTEST,\n+\t\t\tsecond_thread,\n+\t\t\tNULL,\n+\t\t\tbuffer[th]);\n+\t}\n+thread_yield();\n+\n+\twhile(1) {\n+\t\tif(test_repeats == iteration) {\n+\t\t\tthread_yield(); \/\/force to execute the rest of threads in order to send all threads in sleep before print results\n+\t\t\ttest_repeats = 0;\n+\t\t\tprintf(\"# Test finish\\n\");\n+\t\t\tprintf(\"# print histogram\\n\");\n+\t\t\tvtimer_usleep(SEC);\n+\n+\t\t\t\/*print out values*\/\n+\t\t\tfor(n = 0; n < MAX_LATENCY ; n++) {\n+\t\t\t\tif(n < 10)\n+\t\t\t\t\tprintf(\"00%i %i\\n\", latency[n], count[n]);\n+\t\t\t\telse if(n<100 && n>=10)\n+\t\t\t\t\tprintf(\"0%i %i\\n\", latency[n], count[n]);\n+\t\t\t\telse\n+\t\t\t\t\tprintf(\"%i %i\\n\", latency[n], count[n]);\n+\n+\t\t\t\t\/*Get the maximum repetitions*\/\n+\t\t\t\tif (max_c < count[n]) {\n+\t\t\t\t\tmax_c = count[n];\n+\t\t\t\t\tmax_l = latency[n];\n \t\t\t\t}\n \n-\t\t\t\/*Get the minimum values*\/\n-\t\t\tif (min_c > count[n])\n-\t\t\t\t{\n-\t\t\t\tmin_c = count[n];\n-\t\t\t\tmin_l = latency[n];\n-\n+\t\t\t\t\/*Get time values*\/\n+\t\t\t\tif (count[n] >= 1){\n+\t\t\t\t\t\/*Get maximum time value*\/\n+\t\t\t\t\tif(max_time_l < latency[n]) {\n+\t\t\t\t\t\tmax_time_l = latency[n];\n+\t\t\t\t\t\tmax_time_c = count[n];\n+\t\t\t\t\t}\n+\t\t\t\t\t\/*Get minimum time value*\/\n+\t\t\t\t\tif(min_time_flag){\n+\t\t\t\t\t\tmin_time_flag = 0;\n+\t\t\t\t\t\tmin_time_l = latency[n];\n+\t\t\t\t\t\tmin_time_c = count[n];\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\n-\t\tprintf(\"MIN: %i microsec in %i times ; MAX: %i microsec in %i times \\n\", min_l, min_c, max_l, max_c);\n+\t\t\tprintf(\"# MIN time is: %i microseconds in %i repetitions\\n\", min_time_l, min_time_c);\n+\t\t\tprintf(\"# MAX time is: %i microseconds in %i repetitions\\n\", max_time_l, max_time_c);\n+\t\t\tprintf(\"# overflow is: %i\\n\", overflow);\n+\t\t\tprintf(\"# MAX repetitions are: %i repetitions in %i microseconds\\n\", max_c, max_l);\n+\n+\n+\t\t\tprintf(\"\\n\\n\");\n+\t\t\tthread_print_all();\n+\n+\t\t\tfor (d=3; d < THREADS +2; d++){\n+\t\t\t\tprintf(\"#Thread pid %d is executed: %i times\\n\", d, thread[d]);\n+\t\t\t}\n+\t\t\tLED_GREEN_OFF; \/\/indicate test finish\n \t\t}\n-\n-\t}\n-\n- return 0;\n+\tthread_yield();\n+\t}\n+\n+\treturn 0;\n }\n+\n"} {"commit":"b025dc832fa10b3a0f2038c1866a6f106ea330d0","subject":"Roll external\/skia f22744971516..85755f46a881 (1 commits)","message":"Roll external\/skia f22744971516..85755f46a881 (1 commits)\n\nhttps:\/\/skia.googlesource.com\/skia.git\/+log\/f22744971516..85755f46a881\n\nIf this roll has caused a breakage, revert this CL and stop the roller\nusing the controls here:\nhttps:\/\/skia-autoroll.corp.goog\/r\/android-master-autoroll\nPlease CC scroggo@google.com on the revert to ensure that a human\nis aware of the problem.\n\nTo report a problem with the AutoRoller itself, please file a bug:\nhttps:\/\/bugs.chromium.org\/p\/skia\/issues\/entry?template=Autoroller+Bug\n\nDocumentation for the AutoRoller is here:\nhttps:\/\/skia.googlesource.com\/buildbot\/+\/master\/autoroll\/README.md\n\nTest: Presubmit checks will test this change.\nExempt-From-Owner-Approval: The autoroll bot does not require owner approval.\nChange-Id: Ic957239c3155ba95e52f5896dd520bba26fcf68d\n","repos":"aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/sksl\/ir\/SkSLVariableReference.h\n+++ src\/sksl\/ir\/SkSLVariableReference.h\n@@ -34,6 +34,9 @@\n VariableReference(int offset, const Variable& variable, RefKind refKind = kRead_RefKind);\n \n ~VariableReference() override;\n+\n+ VariableReference(const VariableReference&) = delete;\n+ VariableReference& operator=(const VariableReference&) = delete;\n \n RefKind refKind() const {\n return fRefKind;\n"} {"commit":"6e84f57f6c921870c5e6d1bcfc7295a424fcc205","subject":"Added GNU disclaimers and a --credits option with our names.","message":"Added GNU disclaimers and a --credits option with our names.\n","repos":"nemomobile-packages\/libsdl-sound,nemomobile-packages\/libsdl-sound,nemomobile-packages\/libsdl-sound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- playsound\/playsound.c\n+++ playsound\/playsound.c\n@@ -49,7 +49,13 @@\n SDL_VERSION(&sdl_compiled);\n sdl_linked = SDL_Linked_Version();\n \n- printf(\"%s version %d.%d.%d.\\n\"\n+ printf(\"%s version %d.%d.%d\\n\"\n+ \"Copyright 2001 Ryan C. Gordon\\n\"\n+ \"This program is free software, covered by the GNU Lesser General\\n\"\n+ \"Public License, and you are welcome to change it and\/or\\n\"\n+ \"distribute copies of it under certain conditions. There is\\n\"\n+ \"absolutely NO WARRANTY for this program.\\n\"\n+ \"\\n\"\n \" Compiled against SDL_sound version %d.%d.%d,\\n\"\n \" and linked against %d.%d.%d.\\n\"\n \" Compiled against SDL version %d.%d.%d,\\n\"\n@@ -87,74 +93,6 @@\n } \/* output_decoders *\/\n \n \n-static volatile int done_flag = 0;\n-\n-\n-void sigint_catcher(int signum)\n-{\n- static Uint32 last_sigint = 0;\n- Uint32 ticks = SDL_GetTicks();\n-\n- assert(signum == SIGINT);\n-\n- if ((last_sigint != 0) && (ticks - last_sigint < 500))\n- {\n- SDL_PauseAudio(1);\n- SDL_CloseAudio();\n- Sound_Quit();\n- SDL_Quit();\n- exit(1);\n- } \/* if *\/\n-\n- else\n- {\n- last_sigint = ticks;\n- done_flag = 1;\n- } \/* else *\/\n-} \/* sigint_catcher *\/\n-\n-\n-static Uint8 *decoded_ptr = NULL;\n-static Uint32 decoded_bytes = 0;\n-\n-static void audio_callback(void *userdata, Uint8 *stream, int len)\n-{\n- Sound_Sample *sample = (Sound_Sample *) userdata;\n- int bw = 0; \/* bytes written to stream this time through the callback *\/\n-\n- while (bw < len)\n- {\n- int cpysize; \/* bytes to copy on this iteration of the loop. *\/\n-\n- if (!decoded_bytes) \/* need more data decoded from sample? *\/\n- {\n- if (sample->flags & (SOUND_SAMPLEFLAG_ERROR|SOUND_SAMPLEFLAG_EOF))\n- {\n- \/* ...but there isn't any more data to decode! *\/\n- memset(stream + bw, '\\0', len - bw);\n- done_flag = 1;\n- return;\n- } \/* if *\/\n-\n- decoded_bytes = Sound_Decode(sample);\n- decoded_ptr = sample->buffer;\n- } \/* if *\/\n-\n- cpysize = len - bw;\n- if (cpysize > decoded_bytes)\n- cpysize = decoded_bytes;\n-\n- if (cpysize > 0)\n- {\n- memcpy(stream + bw, decoded_ptr, cpysize);\n- bw += cpysize;\n- decoded_ptr += cpysize;\n- decoded_bytes -= cpysize;\n- } \/* if *\/\n- } \/* while *\/\n-} \/* audio_callback *\/\n-\n-\n static void output_usage(const char *argv0)\n {\n fprintf(stderr,\n@@ -167,6 +105,7 @@\n \" --version Display version information and exit.\\n\"\n \" --decoders List supported sound formats and exit.\\n\"\n \" --predecode Decode entire sample before playback.\\n\"\n+ \" --credits Shameless promotion.\\n\"\n \" --help Display this information and exit.\\n\"\n \"\\n\"\n \" Valid arguments to the --format option are:\\n\"\n@@ -179,6 +118,93 @@\n \"\\n\",\n argv0);\n } \/* output_usage *\/\n+\n+\n+static void output_credits(void)\n+{\n+ printf(\"playsound version %d.%d.%d\\n\"\n+ \"Copyright 2001 Ryan C. Gordon\\n\"\n+ \"playsound is free software, covered by the GNU Lesser General\\n\"\n+ \"Public License, and you are welcome to change it and\/or\\n\"\n+ \"distribute copies of it under certain conditions. There is\\n\"\n+ \"absolutely NO WARRANTY for playsound.\\n\"\n+ \"\\n\"\n+ \" Written by Ryan C. Gordon, Torbjrn Andersson, Max Horn,\\n\"\n+ \" Tsuyoshi Iguchi, Tyler Montbriand, and a cast of thousands.\\n\"\n+ \"\\n\"\n+ \" Website and source code: http:\/\/icculus.org\/SDL_sound\/\\n\"\n+ \"\\n\",\n+ PLAYSOUND_VER_MAJOR, PLAYSOUND_VER_MINOR, PLAYSOUND_VER_PATCH);\n+} \/* output_credits *\/\n+\n+\n+\n+static volatile int done_flag = 0;\n+\n+\n+void sigint_catcher(int signum)\n+{\n+ static Uint32 last_sigint = 0;\n+ Uint32 ticks = SDL_GetTicks();\n+\n+ assert(signum == SIGINT);\n+\n+ if ((last_sigint != 0) && (ticks - last_sigint < 500))\n+ {\n+ SDL_PauseAudio(1);\n+ SDL_CloseAudio();\n+ Sound_Quit();\n+ SDL_Quit();\n+ exit(1);\n+ } \/* if *\/\n+\n+ else\n+ {\n+ last_sigint = ticks;\n+ done_flag = 1;\n+ } \/* else *\/\n+} \/* sigint_catcher *\/\n+\n+\n+static Uint8 *decoded_ptr = NULL;\n+static Uint32 decoded_bytes = 0;\n+\n+static void audio_callback(void *userdata, Uint8 *stream, int len)\n+{\n+ Sound_Sample *sample = (Sound_Sample *) userdata;\n+ int bw = 0; \/* bytes written to stream this time through the callback *\/\n+\n+ while (bw < len)\n+ {\n+ int cpysize; \/* bytes to copy on this iteration of the loop. *\/\n+\n+ if (!decoded_bytes) \/* need more data decoded from sample? *\/\n+ {\n+ if (sample->flags & (SOUND_SAMPLEFLAG_ERROR|SOUND_SAMPLEFLAG_EOF))\n+ {\n+ \/* ...but there isn't any more data to decode! *\/\n+ memset(stream + bw, '\\0', len - bw);\n+ done_flag = 1;\n+ return;\n+ } \/* if *\/\n+\n+ decoded_bytes = Sound_Decode(sample);\n+ decoded_ptr = sample->buffer;\n+ } \/* if *\/\n+\n+ cpysize = len - bw;\n+ if (cpysize > decoded_bytes)\n+ cpysize = decoded_bytes;\n+\n+ if (cpysize > 0)\n+ {\n+ memcpy(stream + bw, decoded_ptr, cpysize);\n+ bw += cpysize;\n+ decoded_ptr += cpysize;\n+ decoded_bytes -= cpysize;\n+ } \/* if *\/\n+ } \/* while *\/\n+} \/* audio_callback *\/\n \n \n static int str_to_fmt(char *str)\n@@ -232,6 +258,12 @@\n return(42);\n } \/* if *\/\n \n+ if (strcmp(argv[i], \"--credits\") == 0)\n+ {\n+ output_credits();\n+ return(42);\n+ } \/* if *\/\n+\n else if (strcmp(argv[i], \"--help\") == 0)\n {\n output_usage(argv[0]);\n"} {"commit":"c9b960c9fad143594b5719d8955699d5370c4607","subject":"INTEGRATION: CWS rt11 (1.1.2); FILE ADDED 2005\/06\/15 13:03:43 rt 1.1.2.1: #i50767# Move from module sfx2.","message":"INTEGRATION: CWS rt11 (1.1.2); FILE ADDED\n2005\/06\/15 13:03:43 rt 1.1.2.1: #i50767# Move from module sfx2.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":1,"stderr":"error: pathspec 'setup_native\/inc\/setup_native\/qswin32.h' did not match any file(s) known to git\n","license":"mpl-2.0","lang":"C","diff":"--- setup_native\/inc\/setup_native\/qswin32.h\n+++ setup_native\/inc\/setup_native\/qswin32.h\n@@ -0,0 +1,83 @@\n+\/*************************************************************************\n+ *\n+ * $RCSfile: qswin32.h,v $\n+ *\n+ * $Revision: 1.2 $\n+ *\n+ * last change: $Author: rt $ $Date: 2005-06-21 09:46:53 $\n+ *\n+ * The Contents of this file are made available subject to the terms of\n+ * either of the following licenses\n+ *\n+ * - GNU Lesser General Public License Version 2.1\n+ * - Sun Industry Standards Source License Version 1.1\n+ *\n+ * Sun Microsystems Inc., October, 2000\n+ *\n+ * GNU Lesser General Public License Version 2.1\n+ * =============================================\n+ * Copyright 2000 by Sun Microsystems, Inc.\n+ * 901 San Antonio Road, Palo Alto, CA 94303, USA\n+ *\n+ * This library is free software; you can redistribute it and\/or\n+ * modify it under the terms of the GNU Lesser General Public\n+ * License version 2.1, as published by the Free Software Foundation.\n+ *\n+ * This library is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this library; if not, write to the Free Software\n+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n+ * MA 02111-1307 USA\n+ *\n+ *\n+ * Sun Industry Standards Source License Version 1.1\n+ * =================================================\n+ * The contents of this file are subject to the Sun Industry Standards\n+ * Source License Version 1.1 (the \"License\"); You may not use this file\n+ * except in compliance with the License. You may obtain a copy of the\n+ * License at http:\/\/www.openoffice.org\/license.html.\n+ *\n+ * Software provided under this License is provided on an \"AS IS\" basis,\n+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,\n+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,\n+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.\n+ * See the License for the specific provisions governing your rights and\n+ * obligations concerning the Software.\n+ *\n+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.\n+ *\n+ * Copyright: 2000 by Sun Microsystems, Inc.\n+ *\n+ * All Rights Reserved.\n+ *\n+ * Contributor(s): _______________________________________\n+ *\n+ *\n+ ************************************************************************\/\n+\n+#ifndef _QSWIN32_H\n+#define _QSWIN32_H\n+\n+#define QUICKSTART_CLASSNAMEA \"SO Listener Class\"\n+#define QUICKSTART_WINDOWNAMEA \"SO Listener Window\"\n+#define SHUTDOWN_QUICKSTART_MESSAGEA \"SO KillTray\"\n+\n+#define QUICKSTART_CLASSNAMEW L##QUICKSTART_CLASSNAMEA\n+#define QUICKSTART_WINDOWNAMEW L##QUICKSTART_WINDOWNAMEA\n+#define SHUTDOWN_QUICKSTART_MESSAGEW L##SHUTDOWN_QUICKSTART_MESSAGEA\n+\n+#ifdef UNICODE\n+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEW\n+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEW\n+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEW\n+#else\n+# define QUICKSTART_CLASSNAME QUICKSTART_CLASSNAMEA\n+# define QUICKSTART_WINDOWNAME QUICKSTART_WINDOWNAMEA\n+# define SHUTDOWN_QUICKSTART_MESSAGE SHUTDOWN_QUICKSTART_MESSAGEA\n+#endif\n+\n+#endif \/* _QSWIN32_H *\/\n"} {"commit":"f574f3b742a7ac2ab57672d1e6928ee6d983fadd","subject":"C: more API restructuring","message":"C: more API restructuring\n\n","repos":"Buzztrax\/bml,Buzztrax\/bml,Buzztrax\/bml,Buzztrax\/bml","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bml\/bml.h\n+++ bml\/bml.h\n@@ -32,8 +32,13 @@\n #endif\n \n extern int bml_init(void (*sighandler)(int,siginfo_t*,void*));\n-extern int bml_done(void);\n+extern void bml_done(void);\n \n-extern void bml_test1(const char *dllpath);\n+\/\/ dll passthrough API method pointer types\n+typedef void *(*BMInitPtr)(char *bm_file_name);\n+typedef void (*BMFreePtr)(void *bm);\n+\/\/ dll passthrough API method pointers\n+extern BMInitPtr bm_init;\n+extern BMFreePtr bm_free;\n \n #endif \/* __bml_bml_h__ *\/\n"} {"commit":"3cb2cfd7100bb84ced914a50aaabf5ba601e57cb","subject":"Function param mod for VC.","message":"Function param mod for VC.\n\nChris:\n\nThe only errors in AWS now are in the mouse\nand key fuctions in \"awswin.cpp\" which should\nhave boolean returns but are not yet finished.\n\nAs you said this could have been a cvs wobbler. :-)\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@7493 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plugins\/aws\/awscomp.h\n+++ plugins\/aws\/awscomp.h\n@@ -106,7 +106,7 @@\n * it will assume control of the child and not IncRef. The difference is that, if owner is false the\n * child component will NOT be destroyed on destruction of this component, or on call of RemoveChild().\n *\/\n- virtual void AddChild(awsComponent*, bool owner=true);\n+ virtual void AddChild(awsComponent* child, bool owner=true);\n \n \/** Removes a child from this component. Important!! The child will be destroyed automatically if owner\n * was true when you called AddChild().\n"} {"commit":"33bf01534c4b2fc3ef8c59c1fe0c7882b8ff2499","subject":"Rewrote code that used the old ->u16 field in rimeaddr_t to access Rime addresses to use rimeaddr_copy() and the ->u8 field instead","message":"Rewrote code that used the old ->u16 field in rimeaddr_t to access Rime addresses to use rimeaddr_copy() and the ->u8 field instead\n","repos":"arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/sky\/sky-collect.c\n+++ examples\/sky\/sky-collect.c\n@@ -28,7 +28,7 @@\n *\n * This file is part of the Contiki operating system.\n *\n- * $Id: sky-collect.c,v 1.6 2008\/07\/02 09:05:41 adamdunkels Exp $\n+ * $Id: sky-collect.c,v 1.7 2008\/11\/30 18:36:55 adamdunkels Exp $\n *\/\n \n \/**\n@@ -60,7 +60,7 @@\n uint16_t temperature;\n uint16_t humidity;\n uint16_t rssi;\n- uint16_t best_neighbor;\n+ rimeaddr_t best_neighbor;\n uint16_t best_neighbor_etx;\n uint16_t best_neighbor_rtmetric;\n uint32_t energy_lpm;\n@@ -166,11 +166,13 @@\n \n msg = rimebuf_dataptr();\n printf(\"%u %u %u %u %u %u %u %u %u %u %u %lu %lu %lu %lu %lu \",\n-\t originator->u16[0], seqno, hops,\n+\t (originator->u8[0] << 8) + originator->u8[1],\n+\t seqno, hops,\n \t msg->light1, msg->light2, msg->temperature, msg->humidity,\n \t msg->rssi,\n \n-\t msg->best_neighbor, msg->best_neighbor_etx, msg->best_neighbor_rtmetric,\n+\t (msg->best_neighbor.u8[0] << 8) + msg->best_neighbor.u8[1],\n+\t msg->best_neighbor_etx, msg->best_neighbor_rtmetric,\n \t msg->energy_lpm, msg->energy_cpu, msg->energy_rx, msg->energy_tx, msg->energy_rled\n \t );\n printf(\"%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u \",\n@@ -224,11 +226,12 @@\n msg->energy_rx = energest_type_time(ENERGEST_TYPE_LISTEN);\n msg->energy_tx = energest_type_time(ENERGEST_TYPE_TRANSMIT);\n msg->energy_rled = energest_type_time(ENERGEST_TYPE_LED_RED);\n- msg->best_neighbor = msg->best_neighbor_etx =\n+ rimeaddr_copy(&msg->best_neighbor, &rimeaddr_null);\n+ msg->best_neighbor_etx =\n \tmsg->best_neighbor_rtmetric = 0;\n n = neighbor_best();\n if(n != NULL) {\n-\tmsg->best_neighbor = n->addr.u16[0];\n+\trimeaddr_copy(&msg->best_neighbor, &n->addr);\n \tmsg->best_neighbor_etx = neighbor_etx(n);\n \tmsg->best_neighbor_rtmetric = n->rtmetric;\n }\n"} {"commit":"bc406009d111c274b8ed8495f2858e29a4b63d27","subject":"WaE: declaration of 'index' shadows a global declaration","message":"WaE: declaration of 'index' shadows a global declaration\n\nChange-Id: I83a0fb26b4d376a2b9e221179fdc55a6b7900649\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- shell\/source\/unix\/misc\/gnome-open-url.c\n+++ shell\/source\/unix\/misc\/gnome-open-url.c\n@@ -87,7 +87,7 @@\n {\n GError *error = NULL;\n char *fallback;\n- char *index;\n+ char *idx;\n int retcode = -1;\n \n if( argc != 2 )\n@@ -108,11 +108,11 @@\n *\/\n \n fallback = strdup(argv[0]);\n- index = strstr(fallback, \"gnome-open-url\");\n- if ( NULL != index )\n+ idx = strstr(fallback, \"gnome-open-url\");\n+ if ( NULL != idx )\n {\n char *args[3];\n- strncpy(index, \"open-url\", 9);\n+ strncpy(idx, \"open-url\", 9);\n args[0] = fallback;\n args[1] = argv[1];\n args[2] = NULL;\n"} {"commit":"a065003d5fe48a4402a3d44a52617834184699a8","subject":"examples\/sndfile-convert.c : Use copy_data_fp if input or output is vorbis.","message":"examples\/sndfile-convert.c : Use copy_data_fp if input or output is vorbis.","repos":"Icenowy\/libsndfile,libsndfile\/libsndfile,RonNovy\/libsndfile,audiokit\/libsndfile,audiokit\/libsndfile,Distrotech\/libsndfile,Distrotech\/libsndfile,libsndfile\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,greearb\/libsndfile-ct,Icenowy\/libsndfile,audiokit\/libsndfile,libsndfile\/libsndfile,syb0rg\/libsndfile,libsndfile\/libsndfile,audiokit\/libsndfile,greearb\/libsndfile-ct,erikd\/libsndfile,Distrotech\/libsndfile,evpobr\/libsndfile,greearb\/libsndfile-ct,syb0rg\/libsndfile,evpobr\/libsndfile,evpobr\/libsndfile,Icenowy\/libsndfile,RonNovy\/libsndfile,Distrotech\/libsndfile,greearb\/libsndfile-ct,Icenowy\/libsndfile,erikd\/libsndfile,greearb\/libsndfile-ct,Distrotech\/libsndfile,erikd\/libsndfile,RonNovy\/libsndfile,evpobr\/libsndfile,Icenowy\/libsndfile,libsndfile\/libsndfile,syb0rg\/libsndfile,erikd\/libsndfile,syb0rg\/libsndfile,RonNovy\/libsndfile","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/sndfile-convert.c\n+++ examples\/sndfile-convert.c\n@@ -316,8 +316,9 @@\n \t\/* Copy the metadata *\/\n \tcopy_metadata (outfile, infile) ;\n \n-\tif ((outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT) ||\n-\t\t\t\t(infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT))\n+\tif ((outfileminor == SF_FORMAT_DOUBLE) || (outfileminor == SF_FORMAT_FLOAT)\n+\t\t\t|| (infileminor == SF_FORMAT_DOUBLE) || (infileminor == SF_FORMAT_FLOAT)\n+\t\t\t|| (infileminor == SF_FORMAT_VORBIS)|| (outfileminor == SF_FORMAT_VORBIS))\n \t\tcopy_data_fp (outfile, infile, sfinfo.channels) ;\n \telse\n \t\tcopy_data_int (outfile, infile, sfinfo.channels) ;\n"} {"commit":"53aded208c50c1650ea4da721f2c3765b1488336","subject":"[Add] empty ConstString","message":"[Add] empty ConstString\n","repos":"tum-ei-rcs\/mart-common,tum-ei-rcs\/mart-common","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- experimental\/ConstString.h\n+++ experimental\/ConstString.h\n@@ -207,8 +207,14 @@\n \treturn ConstString::_concat_impl(StringView(std::forward<ARGS>(args))...);\n }\n \n+inline mart::ConstString& getEmptyConstString()\n+{\n+\tstatic mart::ConstString str(mart::EmptyStringView);\n+\treturn str;\n }\n \n+}\n+\n \n \n #endif \/* LIBS_MART_COMMON_EXPERIMENTAL_CONSTSTR_H_ *\/\n"} {"commit":"0fa75d404b3bc1f94e654c3d843637f204fa42f2","subject":"mpeg2dec: Use gst_pad_peer_query() instead of getting the peer pad manually","message":"mpeg2dec: Use gst_pad_peer_query() instead of getting the peer pad manually\n","repos":"sebras\/gst-plugins-ugly,ylatuya\/gst-plugins-ugly,sebras\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly,cablelabs\/gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,collects\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,cablelabs\/gst-plugins-ugly,fluendo\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,collects\/gst-plugins-ugly,knuesel\/gst-plugins-ugly,Lachann\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly,ylatuya\/gst-plugins-ugly,Kurento\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,Kurento\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,fluendo\/gst-plugins-ugly,knuesel\/gst-plugins-ugly,jpakkane\/gstreamer-plugins-ugly,Distrotech\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,jpakkane\/gstreamer-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,sebras\/gst-plugins-ugly,collects\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,collects\/gst-plugins-ugly,matsu\/gst-plugins-ugly,cablelabs\/gst-plugins-ugly,GrokImageCompression\/gst-plugins-ugly,alessandrod\/gst-plugins-ugly,jpakkane\/gstreamer-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,alessandrod\/gst-plugins-ugly,Kurento\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,Distrotech\/gst-plugins-ugly,fluendo\/gst-plugins-ugly,Lachann\/gst-plugins-ugly,alessandrod\/gst-plugins-ugly,knuesel\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,Lachann\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,matsu\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,GrokImageCompression\/gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,matsu\/gst-plugins-ugly,GrokImageCompression\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,krieger-od\/gst-plugins-ugly,ylatuya\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,matsu\/gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/mpeg2dec\/gstmpeg2dec.c\n+++ ext\/mpeg2dec\/gstmpeg2dec.c\n@@ -1525,17 +1525,12 @@\n case GST_QUERY_POSITION:\n {\n GstFormat format;\n- GstPad *peer;\n gint64 cur;\n \n \/* First, we try to ask upstream, which might know better, especially in\n * the case of DVDs, with multiple chapter *\/\n- if ((peer = gst_pad_get_peer (mpeg2dec->sinkpad)) != NULL) {\n- res = gst_pad_query (peer, query);\n- gst_object_unref (peer);\n- if (res)\n- break;\n- }\n+ if ((res = gst_pad_peer_query (mpeg2dec->sinkpad, query)))\n+ break;\n \n \/* save requested format *\/\n gst_query_parse_position (query, &format, NULL);\n"} {"commit":"d103913784027c03664c5f8346a650a06ec65459","subject":"Cleanup docs for Rugged::Branch.","message":"Cleanup docs for Rugged::Branch.\n","repos":"libgit2\/rugged,Acidburn0zzz\/rugged,Acidburn0zzz\/rugged,tpickett66\/rugged,tpickett66\/rugged,saraid\/rugged,libgit2\/rugged,Acidburn0zzz\/rugged,saraid\/rugged,tpickett66\/rugged,saraid\/rugged,libgit2\/rugged","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/rugged\/rugged_branch.c\n+++ ext\/rugged\/rugged_branch.c\n@@ -147,7 +147,7 @@\n \n \/*\n * call-seq:\n- * branch.delete!\n+ * branch.delete! -> nil\n *\n * Remove a branch from the repository. The branch object will become invalidated\n * and won't be able to be used for any other operations.\n@@ -224,13 +224,13 @@\n \/*\n * call-seq:\n * Branch.each_name(repository, filter = :all) { |branch_name| block }\n- * Branch.each_name(repository, filter = :all) -> Iterator\n+ * Branch.each_name(repository, filter = :all) -> enumerator\n *\n * Iterate through the names of the branches in +repository+. Iteration can be\n * optionally filtered to yield only +:local+ or +:remote+ branches.\n *\n * The given block will be called once with the name of each branch as a +String+.\n- * If no block is given, an iterator will be returned.\n+ * If no block is given, an enumerator will be returned.\n *\/\n static VALUE rb_git_branch_each_name(int argc, VALUE *argv, VALUE self)\n {\n@@ -241,13 +241,13 @@\n \/*\n * call-seq:\n * Branch.each(repository, filter = :all) { |branch| block }\n- * Branch.each(repository, filter = :all) -> Iterator\n+ * Branch.each(repository, filter = :all) -> enumerator\n *\n * Iterate through the branches in +repository+. Iteration can be\n * optionally filtered to yield only +:local+ or +:remote+ branches.\n *\n * The given block will be called once with a +Rugged::Branch+ object\n- * for each branch in the repository. If no block is given, an iterator\n+ * for each branch in the repository. If no block is given, an enumerator\n * will be returned.\n *\/\n static VALUE rb_git_branch_each(int argc, VALUE *argv, VALUE self)\n@@ -257,8 +257,8 @@\n \n \/*\n * call-seq:\n- * branch.move(new_name, force = false)\n- * branch.rename(new_name, force = false)\n+ * branch.move(new_name, force = false) -> new_branch\n+ * branch.rename(new_name, force = false) -> new_branch\n *\n * Rename a branch to +new_name+.\n *\n@@ -267,6 +267,8 @@\n *\n * If +force+ is +true+, the branch will be renamed even if a branch\n * with +new_name+ already exists.\n+ *\n+ * A new Rugged::Branch object for the renamed branch will be returned.\n *\/\n static VALUE rb_git_branch_move(int argc, VALUE *argv, VALUE self)\n {\n"} {"commit":"f1ff09728ecbb5afee8d75b952ded48599bf9577","subject":"remote: code style fixup","message":"remote: code style fixup\n","repos":"saraid\/rugged,Acidburn0zzz\/rugged,saraid\/rugged,tpickett66\/rugged,libgit2\/rugged,Acidburn0zzz\/rugged,libgit2\/rugged,libgit2\/rugged,saraid\/rugged,Acidburn0zzz\/rugged,tpickett66\/rugged,tpickett66\/rugged","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/rugged\/rugged_remote.c\n+++ ext\/rugged\/rugged_remote.c\n@@ -35,7 +35,9 @@\n \n VALUE rugged_remote_new(VALUE klass, VALUE owner, git_remote *remote)\n {\n-\tVALUE rb_remote = Data_Wrap_Struct(klass, NULL, &rb_git_remote__free, remote);\n+\tVALUE rb_remote;\n+\n+\trb_remote = Data_Wrap_Struct(klass, NULL, &rb_git_remote__free, remote);\n \trugged_set_owner(rb_remote, owner);\n \treturn rb_remote;\n }\n@@ -82,7 +84,6 @@\n \trugged_validate_remote_url(rb_url);\n \n \tData_Get_Struct(rb_repo, git_repository, repo);\n-\n \n \terror = git_remote_create_inmemory(\n \t\t\t&remote,\n@@ -329,7 +330,9 @@\n \trugged_validate_remote_url(rb_url);\n \tData_Get_Struct(self, git_remote, remote);\n \n-\trugged_exception_check(git_remote_set_url(remote, StringValueCStr(rb_url)));\n+\trugged_exception_check(\n+\t\tgit_remote_set_url(remote, StringValueCStr(rb_url))\n+\t);\n \treturn rb_url;\n }\n \n@@ -579,7 +582,9 @@\n \t\tif (exception)\n \t\t\trb_jump_tag(exception);\n \t} else {\n-\t\trugged_exception_check(git_remote_update_tips(remote));\n+\t\trugged_exception_check(\n+\t\t\tgit_remote_update_tips(remote)\n+\t\t);\n \t}\n \n \treturn Qnil;\n"} {"commit":"fc47d1489251e03221aac229107b5eab612d919e","subject":"vp9: Fix to the segment weight for cyclic refresh.","message":"vp9: Fix to the segment weight for cyclic refresh.\n\nFor screen-content mode with aq-mode=3: use the proper\nsegment weight (remove division by 2).\n\nChange-Id: I747575062c644df7ead3fa41525fb6d6bac04f4d\n","repos":"webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_aq_cyclicrefresh.c\n+++ vp9\/encoder\/vp9_aq_cyclicrefresh.c\n@@ -503,13 +503,12 @@\n num8x8bl;\n if (weight_segment_target < 7 * weight_segment \/ 8)\n weight_segment = weight_segment_target;\n- \/\/ For screen-content: don't include target for the weight segment, since\n- \/\/ all for all flat areas the segment is reset, so its more accurate to\n- \/\/ just use the previous actual number of seg blocks for the weight.\n+ \/\/ For screen-content: don't include target for the weight segment,\n+ \/\/ since for all flat areas the segment is reset, so its more accurate\n+ \/\/ to just use the previous actual number of seg blocks for the weight.\n if (cpi->oxcf.content == VP9E_CONTENT_SCREEN)\n weight_segment =\n- (double)((cr->actual_num_seg1_blocks + cr->actual_num_seg2_blocks) >>\n- 1) \/\n+ (double)(cr->actual_num_seg1_blocks + cr->actual_num_seg2_blocks) \/\n num8x8bl;\n cr->weight_segment = weight_segment;\n }\n"} {"commit":"360ac89885b9e21442f8e5e2f63206da4cc6f605","subject":"vp9: Adjust the weight factor for segment rate cost for aq-mode=3.","message":"vp9: Adjust the weight factor for segment rate cost for aq-mode=3.\n\nUse the segment weight factor based on the target (cr->percent_refresh)\nif it less than the current estimate (avergae of past usage and target).\nSmall improvement at low bitrates.\n\nChange-Id: Iba8fd909e203f94458901366d3a991f7ea854d49\n","repos":"ShiftMediaProject\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,mwgoldsmith\/vpx,ShiftMediaProject\/libvpx,mwgoldsmith\/vpx,mwgoldsmith\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,mwgoldsmith\/vpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,mwgoldsmith\/libvpx,webmproject\/libvpx,webmproject\/libvpx,mwgoldsmith\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_aq_cyclicrefresh.c\n+++ vp9\/encoder\/vp9_aq_cyclicrefresh.c\n@@ -128,16 +128,20 @@\n CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;\n int bits_per_mb;\n int num8x8bl = cm->MBs << 2;\n+ \/\/ Compute delta-q corresponding to qindex i.\n+ int deltaq = compute_deltaq(cpi, i, cr->rate_ratio_qdelta);\n \/\/ Weight for segment prior to encoding: take the average of the target\n \/\/ number for the frame to be encoded and the actual from the previous frame.\n+ \/\/ Use the target if its less.\n int target_refresh = cr->percent_refresh * cm->mi_rows * cm->mi_cols \/ 100;\n+ double weight_segment_target = (double)(target_refresh) \/ num8x8bl;\n double weight_segment =\n (double)((target_refresh + cr->actual_num_seg1_blocks +\n cr->actual_num_seg2_blocks) >>\n 1) \/\n num8x8bl;\n- \/\/ Compute delta-q corresponding to qindex i.\n- int deltaq = compute_deltaq(cpi, i, cr->rate_ratio_qdelta);\n+ if (weight_segment_target < 7 * weight_segment \/ 8)\n+ weight_segment = weight_segment_target;\n \/\/ Take segment weighted average for bits per mb.\n bits_per_mb = (int)((1.0 - weight_segment) *\n vp9_rc_bits_per_mb(cm->frame_type, i,\n"} {"commit":"993e3f715f8703f36a79e4c9743d312bc6d8d170","subject":"cssvalue: Remove useless call","message":"cssvalue: Remove useless call\n","repos":"ahodesuka\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,bratsche\/gtk-,ahodesuka\/gtk,msteinert\/gtk,Lyude\/gtk-,jessevdk\/gtk,Distrotech\/gtk2,msteinert\/gtk,Lyude\/gtk-,bratsche\/gtk-,Lyude\/gtk-,jigpu\/gtk,Distrotech\/gtk2,chergert\/gtk,ahodesuka\/gtk,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,davidgumberg\/gtk,Lyude\/gtk-,ahodesuka\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,alexlarsson\/gtk,bratsche\/gtk-,Adamovskiy\/gtk,jessevdk\/gtk,Lyude\/gtk-,jadahl\/gtk,davidgumberg\/gtk,jadahl\/gtk,davidgumberg\/gtk,jessevdk\/gtk,jadahl\/gtk,jigpu\/gtk,davidgumberg\/gtk,davidt\/gtk,ahodesuka\/gtk,chergert\/gtk,ebassi\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,msteinert\/gtk,chergert\/gtk,Lyude\/gtk-,jessevdk\/gtk,grubersjoe\/adwaita,jadahl\/gtk,chergert\/gtk,alexlarsson\/gtk,jigpu\/gtk,davidt\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,ahodesuka\/gtk,davidt\/gtk,alexlarsson\/gtk,jadahl\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,ebassi\/gtk,Distrotech\/gtk2,jigpu\/gtk,davidgumberg\/gtk,jigpu\/gtk,davidt\/gtk,chergert\/gtk,Distrotech\/gtk2,Lyude\/gtk-,jessevdk\/gtk,ahodesuka\/gtk,ebassi\/gtk,Adamovskiy\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,davidt\/gtk,ebassi\/gtk,chergert\/gtk,grubersjoe\/adwaita,chergert\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,jessevdk\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,bratsche\/gtk-,jadahl\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,jigpu\/gtk,chergert\/gtk,Distrotech\/gtk2,ebassi\/gtk,jigpu\/gtk,davidt\/gtk,Adamovskiy\/gtk,bratsche\/gtk-,jadahl\/gtk,msteinert\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,bratsche\/gtk-","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkcsscolorvalue.c\n+++ gtk\/gtkcsscolorvalue.c\n@@ -284,7 +284,6 @@\n \t}\n }\n \n- _gtk_css_rgba_value_get_rgba (value);\n return value;\n }\n \n"} {"commit":"a60deabec14935d20707b39e7ce65d83f3bcbb0b","subject":"JNI: Do not fail on using null as a value in a dictionary.","message":"JNI: Do not fail on using null as a value in a dictionary.\n\nThe underlying pdf_dict_put() converts into a null object.\n","repos":"ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,sebras\/mupdf,ccxvii\/mupdf,lustersir\/MuPDF,sebras\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,knielsen\/mupdf,sebras\/mupdf,lustersir\/MuPDF,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,muennich\/mupdf,poor-grad-student\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,poor-grad-student\/mupdf,knielsen\/mupdf,knielsen\/mupdf,fluks\/mupdf-x11-bookmarks,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,lustersir\/MuPDF,knielsen\/mupdf,ccxvii\/mupdf,poor-grad-student\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,poor-grad-student\/mupdf,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,fluks\/mupdf-x11-bookmarks,poor-grad-student\/mupdf,lustersir\/MuPDF,lustersir\/MuPDF,lustersir\/MuPDF,knielsen\/mupdf,sebras\/mupdf,fluks\/mupdf-x11-bookmarks,ccxvii\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,knielsen\/mupdf,ArtifexSoftware\/mupdf,sebras\/mupdf,muennich\/mupdf,TamirEvan\/mupdf,muennich\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- platform\/java\/mupdf_native.c\n+++ platform\/java\/mupdf_native.c\n@@ -6933,7 +6933,6 @@\n \tpdf_obj *val = NULL;\n \n \tif (!ctx) return;\n-\tif (!jstr) { jni_throw_arg(env, \"string must not be null\"); return; }\n \tif (jstr)\n \t{\n \t\tstr = (*env)->GetStringUTFChars(env, jstr, NULL);\n"} {"commit":"b6d7e9e6bb0a3648331b9c57ba3f328706ffc203","subject":"added memcmp","message":"added memcmp\n","repos":"Asmod4n\/mruby-libsodium,Asmod4n\/mruby-libsodium","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/mrb_libsodium.c\n+++ src\/mrb_libsodium.c\n@@ -9,8 +9,11 @@\n \n mrb_get_args(mrb, \"s\", &bin, &bin_len);\n \n- mrb_value hex = mrb_str_new(mrb, NULL, bin_len * 2);\n- sodium_bin2hex(RSTRING_PTR(hex), RSTRING_LEN(hex) + 1, (const unsigned char *) bin, (size_t) bin_len);\n+ mrb_value hex = mrb_str_new(mrb, NULL, (size_t) bin_len * 2);\n+\n+ sodium_bin2hex(RSTRING_PTR(hex), (size_t) RSTRING_LEN(hex) + 1,\n+ (const unsigned char *) bin, (size_t) bin_len);\n+\n return hex;\n }\n \n@@ -21,13 +24,18 @@\n mrb_int hex_len, bin_maxlen;\n \n mrb_get_args(mrb, \"si|z\", &hex, &hex_len, &bin_maxlen, &ignore);\n- if(bin_maxlen < 0)\n- mrb_raise(mrb, E_RANGE_ERROR, \"bin_maxlen is too small\");\n-\n- mrb_value bin = mrb_str_new(mrb, NULL, bin_maxlen);\n+\n+ if (bin_maxlen < 0||bin_maxlen > SIZE_MAX)\n+ mrb_raise(mrb, E_RANGE_ERROR, \"bin_maxlen is out of range\");\n+\n+ mrb_value bin = mrb_str_buf_new(mrb, (size_t) bin_maxlen);\n size_t bin_len;\n- int rc = sodium_hex2bin((unsigned char *) RSTRING_PTR(bin),\n- bin_maxlen, hex, hex_len, ignore, &bin_len, NULL);\n+\n+ int rc = sodium_hex2bin((unsigned char *) RSTRING_PTR(bin), (size_t) bin_maxlen,\n+ (const char *) hex, (size_t) hex_len,\n+ (const char *) ignore,\n+ &bin_len,\n+ NULL);\n \n switch(rc) {\n case -1:\n@@ -51,8 +59,12 @@\n \n mrb_str_modify(mrb, RSTRING(hex));\n size_t bin_len;\n- int rc = sodium_hex2bin((unsigned char *) RSTRING_PTR(hex), RSTRING_CAPA(hex),\n- RSTRING_PTR(hex), RSTRING_LEN(hex), ignore, &bin_len, NULL);\n+\n+ int rc = sodium_hex2bin((unsigned char *) RSTRING_PTR(hex), (size_t) RSTRING_CAPA(hex),\n+ (const char *) RSTRING_PTR(hex), (size_t) RSTRING_LEN(hex),\n+ (const char *) ignore,\n+ &bin_len,\n+ NULL);\n \n switch(rc) {\n case -1:\n@@ -63,6 +75,31 @@\n break;\n default:\n mrb_raisef(mrb, E_SODIUM_ERROR, \"sodium_hex2bin returned erroneous value %S\", mrb_fixnum_value(rc));\n+ }\n+}\n+\n+static mrb_value\n+mrb_sodium_memcmp(mrb_state *mrb, mrb_value self)\n+{\n+ char *b1_, *b2_;\n+ mrb_int b1_len, b2_len;\n+\n+ mrb_get_args(mrb, \"ss\", &b1_, &b1_len, &b2_, &b2_len);\n+\n+ if (b1_len != b2_len)\n+ mrb_raise(mrb, E_ARGUMENT_ERROR, \"b1 and b2 size differ\");\n+\n+ int rc = sodium_memcmp(b1_, b2_, b1_len);\n+\n+ switch(rc) {\n+ case -1:\n+ return mrb_false_value();\n+ break;\n+ case 0:\n+ return mrb_true_value();\n+ break;\n+ default:\n+ mrb_raisef(mrb, E_SODIUM_ERROR, \"sodium_memcmp returned erroneous value %S\", mrb_fixnum_value(rc));\n }\n }\n \n@@ -79,18 +116,13 @@\n static mrb_value\n mrb_secure_buffer_init(mrb_state *mrb, mrb_value self)\n {\n- void *buffer;\n+ void *buffer = NULL;\n mrb_int size;\n \n- buffer = DATA_PTR(self);\n- if(buffer)\n- mrb_free(mrb, buffer);\n-\n- mrb_data_init(self, NULL, &secure_buffer_type);\n-\n mrb_get_args(mrb, \"i\", &size);\n- if (size < 0)\n- mrb_raise(mrb, E_RANGE_ERROR, \"size mustn't be negative\");\n+\n+ if (size < 0||size > SIZE_MAX)\n+ mrb_raise(mrb, E_RANGE_ERROR, \"size is out of range\");\n \n else {\n buffer = sodium_malloc((size_t) size);\n@@ -110,8 +142,7 @@\n static mrb_value\n mrb_secure_buffer_size(mrb_state *mrb, mrb_value self)\n {\n- return mrb_iv_get(mrb, self,\n- mrb_intern_lit(mrb, \"size\"));\n+ return mrb_iv_get(mrb, self, mrb_intern_lit(mrb, \"size\"));\n }\n \n static mrb_value\n@@ -169,9 +200,11 @@\n mrb_randombytes_random(mrb_state *mrb, mrb_value self)\n {\n uint32_t ran = randombytes_random();\n+#if !defined(MRB_INT64)\n if (ran > MRB_INT_MAX)\n return mrb_float_value(mrb, ran);\n else\n+#endif\n return mrb_fixnum_value(ran);\n }\n \n@@ -181,11 +214,14 @@\n mrb_float upper_bound;\n \n mrb_get_args(mrb, \"f\", &upper_bound);\n+\n if (upper_bound >= 0 && upper_bound <= UINT32_MAX) {\n uint32_t ran = randombytes_uniform((uint32_t) upper_bound);\n+#if !defined(MRB_INT64)\n if (ran > MRB_INT_MAX)\n return mrb_float_value(mrb, ran);\n else\n+#endif\n return mrb_fixnum_value(ran);\n } else {\n mrb_raise(mrb, E_RANGE_ERROR, \"upper_bound is out of range\");\n@@ -202,12 +238,12 @@\n switch(mrb_type(buf_obj)) {\n case MRB_TT_STRING:\n mrb_str_modify(mrb, RSTRING(buf_obj));\n- randombytes_buf(RSTRING_PTR(buf_obj), RSTRING_LEN(buf_obj));\n+ randombytes_buf(RSTRING_PTR(buf_obj), (size_t) RSTRING_LEN(buf_obj));\n break;\n case MRB_TT_DATA: {\n mrb_int _size = mrb_int(mrb, mrb_funcall(mrb, buf_obj, \"size\", 0));\n- if(_size < 0)\n- mrb_raise(mrb, E_RANGE_ERROR, \"size mustn't be negative\");\n+ if (_size < 0||_size > SIZE_MAX)\n+ mrb_raise(mrb, E_RANGE_ERROR, \"size is out of range\");\n \n randombytes_buf(DATA_PTR(buf_obj), (size_t) _size);\n break;\n@@ -224,13 +260,13 @@\n {\n mrb_int obj_size;\n \n- if (mrb_respond_to(mrb, data_obj, mrb_intern_lit(mrb, \"bytesize\")) == TRUE)\n+ if (mrb_respond_to(mrb, data_obj, mrb_intern_lit(mrb, \"bytesize\")))\n obj_size = mrb_int(mrb, mrb_funcall(mrb, data_obj, \"bytesize\", 0));\n else\n obj_size = mrb_int(mrb, mrb_funcall(mrb, data_obj, \"size\", 0));\n \n- if(obj_size != sodium_const) {\n- mrb_raisef(mrb, E_SODIUM_ERROR, \"Expected a length == %S bytes %S, got %S bytes\",\n+ if (obj_size != sodium_const) {\n+ mrb_raisef(mrb, E_SODIUM_ERROR, \"expected a length == %S bytes %S, got %S bytes\",\n mrb_fixnum_value(sodium_const),\n mrb_str_new_static(mrb, reason, strlen(reason)),\n mrb_fixnum_value(obj_size));\n@@ -260,12 +296,13 @@\n mrb_value nonce, key_obj;\n \n mrb_get_args(mrb, \"sSo\", &message, &message_len, &nonce, &key_obj);\n+\n mrb_sodium_check_length(mrb, nonce, crypto_secretbox_NONCEBYTES, \"nonce\");\n mrb_sodium_check_length(mrb, key_obj, crypto_secretbox_KEYBYTES, \"key\");\n \n const unsigned char *key = mrb_sodium_get_ptr(mrb, key_obj, \"key\");\n- mrb_value ciphertext = mrb_str_new(mrb,\n- NULL, (size_t) message_len + crypto_secretbox_MACBYTES);\n+ mrb_value ciphertext = mrb_str_new(mrb, NULL,\n+ (size_t) message_len + crypto_secretbox_MACBYTES);\n \n crypto_secretbox_easy((unsigned char *) RSTRING_PTR(ciphertext),\n (const unsigned char *) message, (unsigned long long) message_len,\n@@ -283,11 +320,14 @@\n mrb_value nonce, key_obj;\n \n mrb_get_args(mrb, \"sSo\", &ciphertext, &ciphertext_len, &nonce, &key_obj);\n+\n mrb_sodium_check_length(mrb, nonce, crypto_secretbox_NONCEBYTES, \"nonce\");\n mrb_sodium_check_length(mrb, key_obj, crypto_secretbox_KEYBYTES, \"key\");\n \n const unsigned char *key = mrb_sodium_get_ptr(mrb, key_obj, \"key\");\n- mrb_value message = mrb_str_new(mrb, NULL, ciphertext_len - crypto_secretbox_MACBYTES);\n+ mrb_value message = mrb_str_new(mrb, NULL,\n+ (size_t) ciphertext_len - crypto_secretbox_MACBYTES);\n+\n int rc = crypto_secretbox_open_easy((unsigned char *) RSTRING_PTR(message),\n (const unsigned char *) ciphertext, (unsigned long long) ciphertext_len,\n (const unsigned char *) RSTRING_PTR(nonce),\n@@ -295,7 +335,7 @@\n \n switch(rc) {\n case -1:\n- mrb_raise(mrb, E_SODIUM_ERROR, \"Message forged!\");\n+ mrb_raise(mrb, E_SODIUM_ERROR, \"message forged!\");\n break;\n case 0:\n return message;\n@@ -340,13 +380,14 @@\n mrb_sodium_check_length(mrb, key_obj, crypto_auth_KEYBYTES, \"key\");\n \n const unsigned char *key = mrb_sodium_get_ptr(mrb, key_obj, \"key\");\n+\n int rc = crypto_auth_verify((const unsigned char *) RSTRING_PTR(mac),\n (const unsigned char *) message, (unsigned long long) message_len,\n key);\n \n switch(rc) {\n case -1:\n- mrb_raise(mrb, E_SODIUM_ERROR, \"Message forged!\");\n+ mrb_raise(mrb, E_SODIUM_ERROR, \"message forged!\");\n break;\n case 0:\n return self;\n@@ -371,7 +412,8 @@\n mrb_sodium_check_length(mrb, key_obj, crypto_aead_chacha20poly1305_KEYBYTES, \"key\");\n \n const unsigned char *key = mrb_sodium_get_ptr(mrb, key_obj, \"key\");\n- mrb_value ciphertext = mrb_str_new(mrb, NULL, (size_t) message_len + crypto_aead_chacha20poly1305_ABYTES);\n+ mrb_value ciphertext = mrb_str_buf_new(mrb,\n+ (size_t) message_len + crypto_aead_chacha20poly1305_ABYTES);\n unsigned long long ciphertext_len;\n \n crypto_aead_chacha20poly1305_encrypt((unsigned char *) RSTRING_PTR(ciphertext), &ciphertext_len,\n@@ -398,7 +440,8 @@\n mrb_sodium_check_length(mrb, key_obj, crypto_aead_chacha20poly1305_KEYBYTES, \"key\");\n \n const unsigned char *key = mrb_sodium_get_ptr(mrb, key_obj, \"key\");\n- mrb_value message = mrb_str_new(mrb, NULL, ciphertext_len - crypto_aead_chacha20poly1305_ABYTES);\n+ mrb_value message = mrb_str_buf_new(mrb,\n+ (size_t) ciphertext_len - crypto_aead_chacha20poly1305_ABYTES);\n unsigned long long message_len;\n \n int rc = crypto_aead_chacha20poly1305_decrypt((unsigned char *) RSTRING_PTR(message), &message_len, NULL,\n@@ -409,7 +452,7 @@\n \n switch(rc) {\n case -1:\n- mrb_raise(mrb, E_SODIUM_ERROR, \"Message forged!\");\n+ mrb_raise(mrb, E_SODIUM_ERROR, \"message forged!\");\n break;\n case 0:\n return mrb_str_resize(mrb, message, (mrb_int) message_len);\n@@ -431,7 +474,7 @@\n \n unsigned char *secret_key = mrb_sodium_get_ptr(mrb, secret_key_obj, \"secret_key\");\n mrb_str_modify(mrb, RSTRING(public_key));\n- if(mrb_type(secret_key_obj) == MRB_TT_STRING)\n+ if (mrb_string_p(secret_key_obj))\n mrb_str_modify(mrb, RSTRING(secret_key_obj));\n \n crypto_box_keypair((unsigned char *) RSTRING_PTR(public_key), secret_key);\n@@ -478,7 +521,8 @@\n mrb_sodium_check_length(mrb, secret_key_obj, crypto_box_SECRETKEYBYTES, \"secret_key\");\n \n const unsigned char *secret_key = mrb_sodium_get_ptr(mrb, secret_key_obj, \"secret_key\");\n- mrb_value message = mrb_str_new(mrb, NULL, ciphertext_len - crypto_box_MACBYTES);\n+ mrb_value message = mrb_str_new(mrb, NULL, (size_t) ciphertext_len - crypto_box_MACBYTES);\n+\n int rc = crypto_box_open_easy((unsigned char *) RSTRING_PTR(message),\n (const unsigned char *) ciphertext, (unsigned long long) ciphertext_len,\n (const unsigned char *) RSTRING_PTR(nonce),\n@@ -487,7 +531,7 @@\n \n switch(rc) {\n case -1:\n- mrb_raise(mrb, E_SODIUM_ERROR, \"Message forged!\");\n+ mrb_raise(mrb, E_SODIUM_ERROR, \"message forged!\");\n break;\n case 0:\n return message;\n@@ -505,9 +549,10 @@\n \n sodium_mod = mrb_define_module(mrb, \"Sodium\");\n mrb_define_class_under(mrb, sodium_mod, \"Error\", E_RUNTIME_ERROR);\n- mrb_define_module_function(mrb, sodium_mod, \"bin2hex\", mrb_sodium_bin2hex, MRB_ARGS_REQ(1));\n- mrb_define_module_function(mrb, sodium_mod, \"hex2bin\", mrb_sodium_hex2bin, MRB_ARGS_ARG(2, 1));\n- mrb_define_module_function(mrb, sodium_mod, \"hex2bin!\", mrb_sodium_hex2bin_dash, MRB_ARGS_ARG(1, 1));\n+ mrb_define_module_function(mrb, sodium_mod, \"bin2hex\", mrb_sodium_bin2hex, MRB_ARGS_REQ(1));\n+ mrb_define_module_function(mrb, sodium_mod, \"hex2bin\", mrb_sodium_hex2bin, MRB_ARGS_ARG(2, 1));\n+ mrb_define_module_function(mrb, sodium_mod, \"hex2bin!\", mrb_sodium_hex2bin_dash, MRB_ARGS_ARG(1, 1));\n+ mrb_define_module_function(mrb, sodium_mod, \"memcmp\", mrb_sodium_memcmp, MRB_ARGS_REQ(2));\n \n secure_buffer_cl = mrb_define_class_under(mrb, sodium_mod, \"SecureBuffer\", mrb->object_class);\n MRB_SET_INSTANCE_TT(secure_buffer_cl, MRB_TT_DATA);\n@@ -530,6 +575,7 @@\n mrb_define_const(mrb, crypto_secretbox_mod, \"PRIMITIVE\", mrb_str_new_static(mrb, crypto_secretbox_PRIMITIVE, strlen(crypto_secretbox_PRIMITIVE)));\n mrb_define_module_function(mrb, crypto_mod, \"secretbox\", mrb_crypto_secretbox_easy, MRB_ARGS_REQ(2));\n mrb_define_module_function(mrb, crypto_secretbox_mod, \"open\", mrb_crypto_secretbox_open_easy, MRB_ARGS_REQ(2));\n+\n crypto_auth_mod = mrb_define_module_under(mrb, crypto_mod, \"Auth\");\n mrb_define_const(mrb, crypto_auth_mod, \"BYTES\", mrb_fixnum_value(crypto_auth_BYTES));\n mrb_define_const(mrb, crypto_auth_mod, \"KEYBYTES\", mrb_fixnum_value(crypto_auth_KEYBYTES));\n@@ -557,7 +603,7 @@\n mrb_define_module_function(mrb, crypto_box_mod, \"open\", mrb_crypto_box_open_easy, MRB_ARGS_REQ(4));\n \n if (sodium_init() == -1)\n- mrb_raise(mrb, E_SODIUM_ERROR, \"Cannot initialize libsodium\");\n+ mrb_raise(mrb, E_SODIUM_ERROR, \"cannot initialize libsodium\");\n }\n \n void\n"} {"commit":"ca0c1739f1fa5ac0b63bad5a7526e348d6c3019c","subject":"Wrote a few macros to emulate multiple assignment when using EXTTuple","message":"Wrote a few macros to emulate multiple assignment when using EXTTuple\n","repos":"telly\/libextobjc,sunfei\/libextobjc,goodheart\/libextobjc,bboyesc\/libextobjc,kolyuchiy\/libextobjc,sandyway\/libextobjc,liuruxian\/libextobjc,sanojnambiar\/libextobjc,KBvsMJ\/libextobjc,WPDreamMelody\/libextobjc,jiakai-lian\/libextobjc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extobjc\/Modules\/EXTTuple.h\n+++ extobjc\/Modules\/EXTTuple.h\n@@ -15,6 +15,22 @@\n #define tuple(...) \\\n ((metamacro_concat(EXTTuple, metamacro_argcount(__VA_ARGS__))){ __VA_ARGS__ })\n \n+#define multivar(...) \\\n+ do { \\\n+ metamacro_foreach(multivar_, __VA_ARGS__) \\\n+ metamacro_concat(EXTTuple, metamacro_argcount(__VA_ARGS__)) t_, *tptr_ = &t_; \\\n+ \\\n+ void (^unpackToVariables)(void) = ^{ \\\n+ metamacro_foreach(unpack_, __VA_ARGS__) \\\n+ }; \\\n+ \\\n+ t_\n+\n+#define unpack(TUPLE) \\\n+ TUPLE; \\\n+ unpackToVariables(); \\\n+ } while (0)\n+\n \/*** implementation details follow ***\/\n #define EXTTuple_(...) \\\n struct { \\\n@@ -23,6 +39,12 @@\n \n #define EXTTupleIndex_(INDEX, ...) \\\n __unsafe_unretained id v ## INDEX;\n+\n+#define multivar_(INDEX, VAR) \\\n+ __typeof__(VAR) *VAR ## _ptr_ = &VAR;\n+\n+#define unpack_(INDEX, VAR) \\\n+ *VAR ## _ptr_ = tptr_->v ## INDEX;\n \n typedef EXTTuple_(0) EXTTuple1;\n typedef EXTTuple_(0, 1) EXTTuple2;\n"} {"commit":"5d598422426297708d687bb656106c5b6123e339","subject":"Tip side can get an ECONNRESET, which indicates tip side closed down.","message":"Tip side can get an ECONNRESET, which indicates tip side closed\ndown.\n","repos":"nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- capture\/capture.c\n+++ capture\/capture.c\n@@ -520,6 +520,10 @@\n \t\t\t\t\/* XXX commonly observed *\/\n \t\t\t\tif (errno == EIO || errno == EAGAIN)\n \t\t\t\t\tcontinue;\n+#ifdef\tUSESOCKETS\n+\t\t\t\tif (errno == ECONNRESET)\n+\t\t\t\t\tgoto disconnected;\n+#endif\n \t\t\t\tdie(\"%s: read: %s\", Ptyname, geterr(errno));\n \t\t\t}\n \t\t\tif (cc == 0) {\n"} {"commit":"b6ac57f968a8eefcc580c86f8b94ca1ba406a674","subject":"Move lxc-monitord.log out of \/var\/lib\/lxc\/","message":"Move lxc-monitord.log out of \/var\/lib\/lxc\/\n\nPlace log file into LOGPATH instead of LXCPATH (but still use the\ngiven lxcpath if the latter differs from LXCPATH).\n\nSigned-off-by: Robert Vogelgesang <845afb3527e226e2cc76d9ca3d6df034573ca3b9@users.sourceforge.net>\nAcked-by: St\u00e9phane Graber <089afc6d81f66f1168a9849e15660feae286e024@ubuntu.com>\n","repos":"ojkastl\/lxc_Patches,ojkastl\/lxc_Patches,ojkastl\/lxc_Patches,ojkastl\/lxc_Patches","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lxc\/lxc_monitord.c\n+++ src\/lxc\/lxc_monitord.c\n@@ -360,7 +360,7 @@\n \t}\n \n \tret = snprintf(logpath, sizeof(logpath), \"%s\/lxc-monitord.log\",\n-\t\t lxcpath);\n+\t\t (strcmp(LXCPATH, lxcpath) ? lxcpath : LOGPATH ) );\n \tif (ret < 0 || ret >= sizeof(logpath))\n \t\treturn EXIT_FAILURE;\n \n"} {"commit":"a4486a3c853725ada649335e3e70d8289ee65870","subject":"extra ;","message":"extra ;\n\nsvn path=\/trunk\/KDE\/kdelibs\/phonon\/; revision=799562\n","repos":"sandsmark\/phonon-visualization-gsoc,sandsmark\/phonon-visualization-gsoc,sandsmark\/phonon-visualization-gsoc,sandsmark\/phonon-visualization-gsoc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- platform_kde\/devicelisting.h\n+++ platform_kde\/devicelisting.h\n@@ -63,7 +63,7 @@\n void checkAudioOutputs();\n void checkAudioInputs();\n QMultiMap<int, int> m_sortedOutputIndexes;\n- QMultiMap<int, int> m_sortedInputIndexes;;\n+ QMultiMap<int, int> m_sortedInputIndexes;\n QMap<int, QHash<QByteArray, QVariant> > m_outputInfos;\n QMap<int, QHash<QByteArray, QVariant> > m_inputInfos;\n QBasicTimer m_signalTimer;\n"} {"commit":"f8cf8863f08a6a1cbab0fc15973a57959c1c359a","subject":"Replace ctime by strftime %c to use national representation","message":"Replace ctime by strftime %c to use national representation\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gnu\/usr.bin\/tar\/list.c\n+++ gnu\/usr.bin\/tar\/list.c\n@@ -558,11 +558,11 @@\n print_header ()\n {\n char modes[11];\n- char *timestamp;\n+ char timestamp[80];\n char uform[11], gform[11];\t\/* These hold formatted ints *\/\n char *user, *group;\n char size[24];\t\t\/* Holds a formatted long or maj, min *\/\n- time_t longie;\t\t\/* To make ctime() call portable *\/\n+ time_t longie;\n int pad;\n char *name;\n extern long baserec;\n@@ -641,7 +641,7 @@\n \n \/* Timestamp *\/\n longie = hstat.st_mtime;\n- timestamp = ctime (&longie);\n+ strftime(timestamp, sizeof(timestamp), \"%c\", localtime(&longie));\n timestamp[16] = '\\0';\n timestamp[24] = '\\0';\n \n"} {"commit":"87760b73cb9e6aee779be10132c47547112b39e6","subject":"https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1201\/","message":"https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1201\/\n\ncaterpillar cat s50\n","repos":"philipl\/libmtp,reverendhomer\/libmtp,jemc\/libmtp,philipl\/libmtp,jemc\/libmtp,jemc\/libmtp,reverendhomer\/libmtp,reverendhomer\/libmtp,jemc\/libmtp,philipl\/libmtp,reverendhomer\/libmtp,libmtp\/libmtp,libmtp\/libmtp,libmtp\/libmtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/music-players.h\n+++ src\/music-players.h\n@@ -2703,6 +2703,9 @@\n \/* https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1263\/ *\/\n { \"Meizu\", 0x2a45, \"MX Phone (MTP+ADB)\", 0x0c02, DEVICE_FLAGS_ANDROID_BUGS },\n \n+ \/* https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1201\/ *\/\n+ { \"Caterpillar\", 0x04b7, \"Cat S50\", 0x88a9, DEVICE_FLAGS_ANDROID_BUGS },\n+\n \/*\n * Other strange stuff.\n *\/\n"} {"commit":"16af238036a5464ae8f2420ed3af214f0de875f9","subject":"CVE-2017-5985: Ensure target netns is caller-owned","message":"CVE-2017-5985: Ensure target netns is caller-owned\n\nBefore this commit, lxc-user-nic could potentially have been tricked into\noperating on a network namespace over which the caller did not hold privilege.\n\nThis commit ensures that the caller is privileged over the network namespace by\ntemporarily dropping privilege.\n\nLaunchpad: https:\/\/bugs.launchpad.net\/ubuntu\/+source\/lxc\/+bug\/1654676\nReported-by: Jann Horn <0fcb39c6619aeb747ed6898bfde644ba26b24452@google.com>\nSigned-off-by: Christian Brauner <48455ab3070520a2d174545c7239d6d0fabd9a83@ubuntu.com>\n","repos":"LynxChaus\/lxc,federicobriata\/lxc,caglar10ur\/lxc,thmo\/lxc,thmo\/lxc,GreatFruitOmsk\/lxc,hallyn\/lxc,terceiro\/lxc,hallyn\/lxc,GreatFruitOmsk\/lxc,LynxChaus\/lxc,hallyn\/lxc,aeris\/lxc,thmo\/lxc,federicobriata\/lxc,ss1h2a3tw\/lxc,ss1h2a3tw\/lxc,aeris\/lxc,caglar10ur\/lxc,aeris\/lxc,terceiro\/lxc,federicobriata\/lxc,caglar10ur\/lxc,terceiro\/lxc,ss1h2a3tw\/lxc,GreatFruitOmsk\/lxc,LynxChaus\/lxc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lxc\/lxc_user_nic.c\n+++ src\/lxc\/lxc_user_nic.c\n@@ -50,6 +50,14 @@\n #include \"utils.h\"\n #include \"network.h\"\n \n+#define usernic_debug_stream(stream, format, ...) \\\n+\tdo { \\\n+\t\tfprintf(stream, \"%s: %d: %s: \" format, __FILE__, __LINE__, \\\n+\t\t\t__func__, __VA_ARGS__); \\\n+\t} while (false)\n+\n+#define usernic_error(format, ...) usernic_debug_stream(stderr, format, __VA_ARGS__)\n+\n static void usage(char *me, bool fail)\n {\n \tfprintf(stderr, \"Usage: %s lxcpath name pid type bridge nicname\\n\", me);\n@@ -670,68 +678,115 @@\n }\n \n #define VETH_DEF_NAME \"eth%d\"\n-\n static int rename_in_ns(int pid, char *oldname, char **newnamep)\n {\n-\tint fd = -1, ofd = -1, ret, ifindex = -1;\n+\tuid_t ruid, suid, euid;\n+\tint fret = -1;\n+\tint fd = -1, ifindex = -1, ofd = -1, ret;\n \tbool grab_newname = false;\n \n \tofd = lxc_preserve_ns(getpid(), \"net\");\n \tif (ofd < 0) {\n-\t\tfprintf(stderr, \"Failed opening network namespace path for '%d'.\", getpid());\n-\t\treturn -1;\n+\t\tusernic_error(\"Failed opening network namespace path for '%d'.\", getpid());\n+\t\treturn fret;\n \t}\n \n \tfd = lxc_preserve_ns(pid, \"net\");\n \tif (fd < 0) {\n-\t\tfprintf(stderr, \"Failed opening network namespace path for '%d'.\", pid);\n-\t\treturn -1;\n-\t}\n-\n-\tif (setns(fd, 0) < 0) {\n-\t\tfprintf(stderr, \"setns to container network namespace\\n\");\n-\t\tgoto out_err;\n-\t}\n-\tclose(fd); fd = -1;\n+\t\tusernic_error(\"Failed opening network namespace path for '%d'.\", pid);\n+\t\tgoto do_partial_cleanup;\n+\t}\n+\n+\tret = getresuid(&ruid, &euid, &suid);\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Failed to retrieve real, effective, and saved \"\n+\t\t\t \"user IDs: %s\\n\",\n+\t\t\t strerror(errno));\n+\t\tgoto do_partial_cleanup;\n+\t}\n+\n+\tret = setns(fd, CLONE_NEWNET);\n+\tclose(fd);\n+\tfd = -1;\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Failed to setns() to the network namespace of \"\n+\t\t\t \"the container with PID %d: %s.\\n\",\n+\t\t\t pid, strerror(errno));\n+\t\tgoto do_partial_cleanup;\n+\t}\n+\n+\tret = setresuid(ruid, ruid, 0);\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Failed to drop privilege by setting effective \"\n+\t\t\t \"user id and real user id to %d, and saved user \"\n+\t\t\t \"ID to 0: %s.\\n\",\n+\t\t\t ruid, strerror(errno));\n+\t\t\/\/ COMMENT(brauner): It's ok to jump to do_full_cleanup here\n+\t\t\/\/ since setresuid() will succeed when trying to set real,\n+\t\t\/\/ effective, and saved to values they currently have.\n+\t\tgoto do_full_cleanup;\n+\t}\n+\n \tif (!*newnamep) {\n \t\tgrab_newname = true;\n \t\t*newnamep = VETH_DEF_NAME;\n-\t\tif (!(ifindex = if_nametoindex(oldname))) {\n-\t\t\tfprintf(stderr, \"failed to get netdev index\\n\");\n-\t\t\tgoto out_err;\n-\t\t}\n-\t}\n-\tif ((ret = lxc_netdev_rename_by_name(oldname, *newnamep)) < 0) {\n-\t\tfprintf(stderr, \"Error %d renaming netdev %s to %s in container\\n\", ret, oldname, *newnamep);\n-\t\tgoto out_err;\n-\t}\n+\n+\t\tifindex = if_nametoindex(oldname);\n+\t\tif (!ifindex) {\n+\t\t\tusernic_error(\"Failed to get netdev index: %s.\\n\", strerror(errno));\n+\t\t\tgoto do_full_cleanup;\n+\t\t}\n+\t}\n+\n+\tret = lxc_netdev_rename_by_name(oldname, *newnamep);\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Error %d renaming netdev %s to %s in container.\\n\", ret, oldname, *newnamep);\n+\t\tgoto do_full_cleanup;\n+\t}\n+\n \tif (grab_newname) {\n-\t\tchar ifname[IFNAMSIZ], *namep = ifname;\n+\t\tchar ifname[IFNAMSIZ];\n+\t\tchar *namep = ifname;\n+\n \t\tif (!if_indextoname(ifindex, namep)) {\n-\t\t\tfprintf(stderr, \"Failed to get new netdev name\\n\");\n-\t\t\tgoto out_err;\n-\t\t}\n+\t\t\tusernic_error(\"Failed to get new netdev name: %s.\\n\", strerror(errno));\n+\t\t\tgoto do_full_cleanup;\n+\t\t}\n+\n \t\t*newnamep = strdup(namep);\n \t\tif (!*newnamep)\n-\t\t\tgoto out_err;\n-\t}\n-\tif (setns(ofd, 0) < 0) {\n-\t\tfprintf(stderr, \"Error returning to original netns\\n\");\n-\t\tclose(ofd);\n-\t\treturn -1;\n-\t}\n-\tclose(ofd);\n-\n-\treturn 0;\n-\n-out_err:\n-\tif (ofd >= 0)\n-\t\tclose(ofd);\n-\tif (setns(ofd, 0) < 0)\n-\t\tfprintf(stderr, \"Error returning to original network namespace\\n\");\n+\t\t\tgoto do_full_cleanup;\n+\t}\n+\n+\tfret = 0;\n+\n+do_full_cleanup:\n+\tret = setresuid(ruid, euid, suid);\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Failed to restore privilege by setting effective \"\n+\t\t\t \"user id to %d, real user id to %d, and saved user \"\n+\t\t\t \"ID to %d: %s.\\n\",\n+\t\t\t ruid, euid, suid, strerror(errno));\n+\t\tfret = -1;\n+\t\t\/\/ COMMENT(brauner): setns() should fail if setresuid() doesn't\n+\t\t\/\/ succeed but there's no harm in falling through; keeps the\n+\t\t\/\/ code cleaner.\n+\t}\n+\n+\tret = setns(ofd, CLONE_NEWNET);\n+\tif (ret < 0) {\n+\t\tusernic_error(\"Failed to setns() to original network namespace \"\n+\t\t\t \"of PID %d: %s.\\n\",\n+\t\t\t ofd, strerror(errno));\n+\t\tfret = -1;\n+\t}\n+\n+do_partial_cleanup:\n \tif (fd >= 0)\n \t\tclose(fd);\n-\treturn -1;\n+\tclose(ofd);\n+\n+\treturn fret;\n }\n \n \/*\n"} {"commit":"6b39eb32484b2549695af4863d97bae98d37ed9b","subject":"[vm] Remove the 'Profiler' timeline stream.","message":"[vm] Remove the 'Profiler' timeline stream.\n\nAccidentially renamed to 'Developer' in 4b6ab33cfa60897242cba384c969d77dd52f9b8e due to confusion between the library 'dart:profiler' and the Fuchsia trace category 'dart:profiler'.\n\nDead since the removal of _writeCpuProfileTimeline in 68dede011e81de04ffc826f42732b8ce620bc52d.\n\nChange-Id: I7ebd9c5e59d8075b424751e155ccd321985d3599\nReviewed-on: https:\/\/dart-review.googlesource.com\/c\/sdk\/+\/119086\nReviewed-by: Siva Annamalai <2e618a8cbd7bb6b3d4409061ae407d692a098546@google.com>\nCommit-Queue: Ryan Macnak <d738b7f001baf9789095d7dc549cff6de60b011d@google.com>\n","repos":"dart-lang\/sdk,dart-archive\/dart-sdk,dart-archive\/dart-sdk,dartino\/dart-sdk,dart-lang\/sdk,dart-archive\/dart-sdk,dart-lang\/sdk,dartino\/dart-sdk,dartino\/dart-sdk,dartino\/dart-sdk,dart-archive\/dart-sdk,dart-archive\/dart-sdk,dart-lang\/sdk,dartino\/dart-sdk,dartino\/dart-sdk,dart-lang\/sdk,dart-lang\/sdk,dart-lang\/sdk,dart-archive\/dart-sdk,dartino\/dart-sdk,dart-archive\/dart-sdk,dart-archive\/dart-sdk,dart-archive\/dart-sdk,dartino\/dart-sdk,dart-lang\/sdk,dartino\/dart-sdk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- runtime\/vm\/timeline.h\n+++ runtime\/vm\/timeline.h\n@@ -53,7 +53,6 @@\n V(Embedder, \"dart:embedder\") \\\n V(GC, \"dart:gc\") \\\n V(Isolate, \"dart:isolate\") \\\n- V(Developer, \"dart:developer\") \\\n V(VM, \"dart:vm\")\n \n \/\/ A stream of timeline events. A stream has a name and can be enabled or\n"} {"commit":"cbf4797af4e6de39207ccb7c439fe615ad98a64e","subject":"User-provided trimming function added.","message":"User-provided trimming function added.\n","repos":"googleprojectzero\/winafl,googleprojectzero\/winafl,googleprojectzero\/winafl,googleprojectzero\/winafl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- afl-fuzz.c\n+++ afl-fuzz.c\n@@ -2558,6 +2558,7 @@\n typedef u8 (APIENTRY* dll_run_target)(char**, u32, char*, u32);\n typedef void (APIENTRY *dll_write_to_testcase)(char*, s32, const void*, u32);\n typedef u8 (APIENTRY* dll_mutate_testcase)(char**, u8*, u32, u8 (*)(char **, u8*, u32));\n+typedef u8 (APIENTRY* dll_trim_testcase)(char**, struct queue_entry*, u8*, u8*, void (*)(void*, u32 ), u8 (*)(char**, u32), u32 (*)(const void*, u32, u32));\n \n \/\/ custom server functions\n dll_run dll_run_ptr = NULL;\n@@ -2565,6 +2566,7 @@\n dll_run_target dll_run_target_ptr = NULL;\n dll_write_to_testcase dll_write_to_testcase_ptr = NULL;\n dll_mutate_testcase dll_mutate_testcase_ptr = NULL;\n+dll_trim_testcase dll_trim_testcase_ptr = NULL;\n \n char *get_test_case(long *fsize)\n {\n@@ -4739,6 +4741,9 @@\n \n if (q->len < 5) return 0;\n \n+ if (dll_trim_testcase_ptr)\n+ return dll_trim_testcase_ptr(argv, q, in_buf, trace_bits, write_to_testcase, run_target, hash32);\n+\n stage_name = tmp;\n bytes_trim_in += q->len;\n \n@@ -7806,6 +7811,10 @@\n dll_mutate_testcase_ptr = (dll_mutate_testcase)GetProcAddress(hLib, \"dll_mutate_testcase\");\n SAYF(\"dll_mutate_testcase %s defined.\\n\", dll_mutate_testcase_ptr ? \"is\" : \"isn't\");\n \n+ \/\/ Get pointer to user-defined trim_testcase function using GetProcAddress:\n+ dll_trim_testcase_ptr = (dll_trim_testcase)GetProcAddress(hLib, \"dll_trim_testcase\");\n+ SAYF(\"dll_trim_testcase %s defined.\\n\", dll_mutate_testcase_ptr ? \"is\" : \"isn't\");\n+\n SAYF(\"Sucessfully loaded and initalized\\n\");\n }\n \n"} {"commit":"55d4b179dc69c11430373c7de0aebc9759901927","subject":"added A&K player SR15 https:\/\/sourceforge.net\/p\/libmtp\/support-requests\/292\/","message":"added A&K player SR15 https:\/\/sourceforge.net\/p\/libmtp\/support-requests\/292\/\n","repos":"libmtp\/libmtp,libmtp\/libmtp,libmtp\/libmtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/music-players.h\n+++ src\/music-players.h\n@@ -873,6 +873,10 @@\n { \"iRiver\", 0x4102, \"AK70\", 0x1200,\n DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS |\n DEVICE_FLAG_OGG_IS_UNKNOWN },\n+ \/* https:\/\/bugzilla.suse.com\/show_bug.cgi?id=1176588 ... *\/\n+ { \"A&K\", 0x4102, \"SR15\", 0x1213,\n+ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_ZERO_READS |\n+ DEVICE_FLAG_OGG_IS_UNKNOWN },\n \/\/ Reported by Scott Call\n \/\/ Assume this actually supports OGG though it reports it doesn't.\n { \"iRiver\", 0x4102, \"H10 20GB\", 0x2101,\n"} {"commit":"0590e82c10ea3b75f0c4d462de3f5bb344da37c5","subject":"api_create: undo unneeded chunk in previous commit","message":"api_create: undo unneeded chunk in previous commit\n\nlxc_conf exists after api_save_config\n\nSigned-off-by: Serge Hallyn <3df611b026e4639bee8aef7a4beb2e39fcebb313@ubuntu.com>\n","repos":"sapun\/lxc,akshaykarle\/lxc,regit\/lxc,yubo\/lxc,szaszg\/lxc,virajs\/lxc,rowhit\/lxc,glensc\/lxc,lazy404\/lxc,major\/lxc,glensc\/lxc,szaszg\/lxc,jirislaby\/lxc,ss1h2a3tw\/lxc,tych0\/lxc,ecarrara\/lxc,weizhenwei\/lxc,caglar10ur\/lxc,szaszg\/lxc,bostjan\/lxc,efiop\/lxc,terceiro\/lxc,fwilson42\/lxc,JohnPeacockMessageSystems\/lxc,ioops\/lxc,cjwatson\/lxc,bmoar\/lxc,rldleblanc\/lxc,ysbnim\/lxc,lazy404\/lxc,hallyn\/lxc,armcc\/lxc,lisongmin\/lxc,regit\/lxc,bostjan\/lxc,fwilson42\/lxc,federicobriata\/lxc,GreatFruitOmsk\/lxc,christiaan\/lxc,hfuCN\/lxc,hfuCN\/lxc,thmo\/lxc,regit\/lxc,Pelagicore\/lxc,hallyn\/lxc,ss1h2a3tw\/lxc,federicobriata\/lxc,ioops\/lxc,JohnPeacockMessageSystems\/lxc,QingweiPeterLan\/cs188-lxc,rldleblanc\/lxc,aeris\/lxc,aeris\/lxc,jirislaby\/lxc,christiaan\/lxc,ojkastl\/lxc_Patches,rowhit\/lxc,ioops\/lxc,tych0\/lxc,Ponce\/lxc,QingweiPeterLan\/cs188-lxc,rldleblanc\/lxc,thmo\/lxc,akshaykarle\/lxc,Distrotech\/lxc,virajs\/lxc,cjwatson\/lxc,terceiro\/lxc,ksperis\/lxc,caglar10ur\/lxc,QingweiPeterLan\/cs188-lxc,hfuCN\/lxc,weizhenwei\/lxc,ecarrara\/lxc,DarknessBeforeDawn\/lxc,codebauss\/lxc,glensc\/lxc,fwilson42\/lxc,aeris\/lxc,Pelagicore\/lxc,Ponce\/lxc,ojkastl\/lxc_Patches,armcc\/lxc,thmo\/lxc,ojkastl\/lxc_Patches,Distrotech\/lxc,ss1h2a3tw\/lxc,ysbnim\/lxc,weizhenwei\/lxc,bmoar\/lxc,lisongmin\/lxc,hkjolhede\/lxc,DarknessBeforeDawn\/lxc,DarknessBeforeDawn\/lxc,lisongmin\/lxc,virajs\/lxc,sapun\/lxc,JohnPeacockMessageSystems\/lxc,ysbnim\/lxc,LynxChaus\/lxc,bmoar\/lxc,ksperis\/lxc,bostjan\/lxc,armcc\/lxc,LynxChaus\/lxc,LynxChaus\/lxc,rowhit\/lxc,Pelagicore\/lxc,codebauss\/lxc,ojkastl\/lxc_Patches,GreatFruitOmsk\/lxc,federicobriata\/lxc,jirislaby\/lxc,akshaykarle\/lxc,GreatFruitOmsk\/lxc,hkjolhede\/lxc,lazy404\/lxc,raspberrypython\/lxc,Distrotech\/lxc,terceiro\/lxc,sapun\/lxc,raspberrypython\/lxc,ksperis\/lxc,major\/lxc,caglar10ur\/lxc,ecarrara\/lxc,hkjolhede\/lxc,raspberrypython\/lxc,codebauss\/lxc,major\/lxc,christiaan\/lxc,hallyn\/lxc,yubo\/lxc,cjwatson\/lxc,Ponce\/lxc,tych0\/lxc,yubo\/lxc,efiop\/lxc,efiop\/lxc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lxc\/lxccontainer.c\n+++ src\/lxc\/lxccontainer.c\n@@ -1128,24 +1128,22 @@\n \t\tgoto out;\n \t}\n \n-\tif (c->lxc_conf) {\n-\t\t\/*\n-\t\t * either template or rootfs.path should be set.\n-\t\t * if both template and rootfs.path are set, template is setup as rootfs.path.\n-\t\t * container is already created if we have a config and rootfs.path is accessible\n-\t\t *\/\n-\t\tif (!c->lxc_conf->rootfs.path && !tpath)\n-\t\t\t\/* no template passed in and rootfs does not exist: error *\/\n-\t\t\tgoto out;\n-\t\tif (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0)\n-\t\t\t\/* rootfs passed into configuration, but does not exist: error *\/\n-\t\t\tgoto out;\n-\t\tif (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {\n-\t\t\t\/* Rootfs already existed, user just wanted to save the\n-\t\t\t * loaded configuration *\/\n-\t\t\tret = true;\n-\t\t\tgoto out;\n-\t\t}\n+\t\/*\n+\t * either template or rootfs.path should be set.\n+\t * if both template and rootfs.path are set, template is setup as rootfs.path.\n+\t * container is already created if we have a config and rootfs.path is accessible\n+\t *\/\n+\tif (!c->lxc_conf->rootfs.path && !tpath)\n+\t\t\/* no template passed in and rootfs does not exist: error *\/\n+\t\tgoto out;\n+\tif (c->lxc_conf->rootfs.path && access(c->lxc_conf->rootfs.path, F_OK) != 0)\n+\t\t\/* rootfs passed into configuration, but does not exist: error *\/\n+\t\tgoto out;\n+\tif (lxcapi_is_defined(c) && c->lxc_conf->rootfs.path && !tpath) {\n+\t\t\/* Rootfs already existed, user just wanted to save the\n+\t\t * loaded configuration *\/\n+\t\tret = true;\n+\t\tgoto out;\n \t}\n \n \t\/* Mark that this container is being created *\/\n"} {"commit":"74cf33c41833b275a560fd4c0447fc2e2960c282","subject":"Update net-tcpserver","message":"Update net-tcpserver\n","repos":"chxuan\/easyrpc,chxuan\/easyrpc,chxuan\/easyrpc,chxuan\/easyrpc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net-tcpserver\/include\/TcpSession.h\n+++ net-tcpserver\/include\/TcpSession.h\n@@ -147,8 +147,10 @@\n return;\n }\n \n+ std::string messageData = archiveStream.str();\n+\n Header header;\n- header.m_dataSize = archiveStream.str().size();\n+ header.m_dataSize = messageData.size();\n header.m_messageType = t->m_messageType;\n \n char headerBuf[HeaderLength] = {'\\0'};\n@@ -156,7 +158,7 @@\n \n std::vector<boost::asio::const_buffer> buffers;\n buffers.push_back(boost::asio::buffer(headerBuf));\n- buffers.push_back(boost::asio::buffer(archiveStream.str()));\n+ buffers.push_back(boost::asio::buffer(messageData));\n \n boost::system::error_code error;\n boost::asio::write(m_socket, buffers, error);\n"} {"commit":"39d34fe45db0f3139b8eec0cd05b5b36cc6b2862","subject":"Signed-off-by: mrlitong <litongtongxue@gmail.com>","message":"Signed-off-by: mrlitong <litongtongxue@gmail.com>\n","repos":"mrlitong\/fpsgame,mrlitong\/fpsgame,mrlitong\/fpsgame,mrlitong\/Game-Engine-Development-Usage","returncode":1,"stderr":"error: pathspec 'fpsgame\/gui\/file\/archive\/disabled_tests\/test_fat_time.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- fpsgame\/gui\/file\/archive\/disabled_tests\/test_fat_time.h\n+++ fpsgame\/gui\/file\/archive\/disabled_tests\/test_fat_time.h\n@@ -0,0 +1,47 @@\n+\/* Copyright (c) 2010 Wildfire Games\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining\n+ * a copy of this software and associated documentation files (the\n+ * \"Software\"), to deal in the Software without restriction, including\n+ * without limitation the rights to use, copy, modify, merge, publish,\n+ * distribute, sublicense, and\/or sell copies of the Software, and to\n+ * permit persons to whom the Software is furnished to do so, subject to\n+ * the following conditions:\n+ * \n+ * The above copyright notice and this permission notice shall be included\n+ * in all copies or substantial portions of the Software.\n+ * \n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+ *\/\n+\n+#include \"lib\/self_test.h\"\n+\n+#include <ctime>\n+\n+#include \"lib\/res\/file\/archive\/fat_time.h\"\n+\n+class TestFatTime: public CxxTest::TestSuite \n+{\n+public:\n+\tvoid test_fat_timedate_conversion()\n+\t{\n+\t\t\/\/ note: FAT time stores second\/2, which means converting may\n+\t\t\/\/ end up off by 1 second.\n+\n+\t\ttime_t t, converted_t;\n+\n+\t\tt = time(0);\n+\t\tconverted_t = time_t_from_FAT(FAT_from_time_t(t));\n+\t\tTS_ASSERT_DELTA(t, converted_t, 2);\n+\n+\t\tt++;\n+\t\tconverted_t = time_t_from_FAT(FAT_from_time_t(t));\n+\t\tTS_ASSERT_DELTA(t, converted_t, 2);\n+\t}\n+};\n"} {"commit":"e2a4f07200d8d1eb6d7f801ed57ac14619a4f776","subject":"libmemif: memif_rx_burst fix","message":"libmemif: memif_rx_burst fix\n\nChange-Id: I2f488fef828df8915b57552567e1be79efe69700\nSigned-off-by: Jakub Grajciar <21f84c4696e9120b252673baf09d482ea3bea5b9@pantheon.tech>\n","repos":"FDio\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,FDio\/vpp,FDio\/vpp,vpp-dev\/vpp,FDio\/vpp,vpp-dev\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,vpp-dev\/vpp,FDio\/vpp,vpp-dev\/vpp,vpp-dev\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- extras\/libmemif\/src\/main.c\n+++ extras\/libmemif\/src\/main.c\n@@ -1843,8 +1843,8 @@\n \n \t b1->desc_index = mq->last_head;\n \t i = 0;\n-\t b0->data_len = 0;\n-\t b0->buffer_len = 0;\n+\t b1->data_len = 0;\n+\t b1->buffer_len = 0;\n \n \t b1->data = memif_get_buffer (conn, ring, mq->last_head);\n \t b1->data_len += ring->desc[mq->last_head].length;\n"} {"commit":"5b6f67746213d05c1bc926f030e68544534ad4d6","subject":"Allow deactivation of sensors process on Sky platform","message":"Allow deactivation of sensors process on Sky platform\n","repos":"bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/sky\/contiki-sky-platform.c\n+++ platform\/sky\/contiki-sky-platform.c\n@@ -34,10 +34,20 @@\n \n #include \"dev\/button-sensor.h\"\n \n+#ifdef SKY_CONF_SENSORS\n+#define SKY_SENSORS SKY_CONF_SENSORS\n+#else\n+#define SKY_SENSORS 1\n+#endif\n+\n+#if SKY_SENSORS\n SENSORS(&button_sensor);\n+#endif\n \n void\n init_platform(void)\n {\n+#if SKY_SENSORS\n process_start(&sensors_process, NULL);\n+#endif\n }\n"} {"commit":"ca41abdb6375d6ad531cd939be4f18653ac2736b","subject":"more atomic ringbuffer","message":"more atomic ringbuffer\n\nThis crashes in the pthread test later than the previous one.\n","repos":"dtaht\/twd,dtaht\/twd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ringbuffer.c\n+++ ringbuffer.c\n@@ -83,7 +83,6 @@\n unlink(path);\n \n buff->size = size;\n- buff->used = 0;\n buff->ridx = 0;\n buff->widx = 0;\n \n@@ -145,6 +144,14 @@\n \n \/************************************************************************\/ \n \n+size_t ringbuffer_used(\n+\t\t ringbuffer__s *const restrict rbuf)\n+{\n+ return(rbuf->widx - rbuf->ridx);\n+}\n+\n+\/************************************************************************\/ \n+\n size_t ringbuffer_write(\n \tringbuffer__s *const restrict rbuf,\n \tconst void *restrict src,\n@@ -157,11 +164,10 @@\n assert(src != NULL);\n assert(amount > 0);\n \n- len = min_size_t(rbuf->size - rbuf->used,amount);\n+ len = min_size_t(rbuf->size - ringbuffer_used(rbuf),amount);\n if (len > 0)\n {\n memcpy(&rbuf->address[rbuf->widx],src,len);\n- rbuf->used += len;\n atomic_add(&rbuf->widx,len);\n }\n \n@@ -179,18 +185,21 @@\n assert(rbuf != NULL);\n assert(dest != NULL);\n assert(amount > 0);\n- \n- if (rbuf->used > 0)\n- {\n- size_t len = min_size_t(rbuf->used,amount);\n+ size_t size = rbuf->size;\n+ size_t used = ringbuffer_used(rbuf);\n+ if (used > 0)\n+ {\n+ size_t len = min_size_t(used,amount);\n+ size_t temp; \n memcpy(dest,&rbuf->address[rbuf->ridx],len);\n- rbuf->used -= len;\n rbuf->ridx += len;\n \n- if (rbuf->ridx > rbuf->size)\n+ if (rbuf->ridx > size)\n {\n- rbuf->ridx -= rbuf->size;\n- atomic_sub(&rbuf->widx,rbuf->size);\n+ do\n+ temp = rbuf->widx - size;\n+ while(!atomic_compare_and_swap(&rbuf->widx,rbuf->widx,temp)) ;\n+ rbuf->ridx -= size;\n }\n return len;\n }\n@@ -205,7 +214,6 @@\n assert(buff != NULL);\n if(buff)\n { \n- buff->used = 0;\n buff->ridx = 0;\n buff->widx = 0;\n return(EXIT_SUCCESS);\n"} {"commit":"5b4d8e0c49815d042aa16af9077f5d87443ea656","subject":"Fixed another Nokia variant","message":"Fixed another Nokia variant\n","repos":"libmtp\/libmtp,jemc\/libmtp,reverendhomer\/libmtp,vmandela\/libmtp,kbhomes\/libmtp-zune,philipl\/libmtp,jemc\/libmtp,yifanlu\/libMTP,yifanlu\/libMTP,reverendhomer\/libmtp,Bluerise\/libmtp,mmalecki\/libmtp,vmandela\/libmtp,pierrezurek\/libmtp,olunx\/libmtp,mmalecki\/libmtp,mmalecki\/libmtp,philipl\/libmtp,philipl\/libmtp,libmtp\/libmtp,libmtp\/libmtp,olunx\/libmtp,Bluerise\/libmtp,olunx\/libmtp,Bluerise\/libmtp,kbhomes\/libmtp-zune,reverendhomer\/libmtp,jemc\/libmtp,jemc\/libmtp,reverendhomer\/libmtp,pierrezurek\/libmtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/music-players.h\n+++ src\/music-players.h\n@@ -515,6 +515,9 @@\n { \"Nokia\", 0x0421, \"E71\", 0x00e4, DEVICE_FLAG_NONE },\n \/\/ From: Laurent Bigonville <bigon@users.sourceforge.net>\n { \"Nokia\", 0x0421, \"E66\", 0x00e5, DEVICE_FLAG_NONE },\n+ \/\/ From an anonymous SourceForge user\n+ \/\/ Not verified to be MTP\n+ { \"Nokia\", 0x0421, \"E63\", 0x0179, DEVICE_FLAG_NONE },\n \/\/ From: http:\/\/nds2.nokia.com\/files\/support\/global\/phones\/software\/Nokia_3250_WMP10_driver.inf\n { \"Nokia\", 0x0421, \"3250 Mobile Phone\", 0x0462, DEVICE_FLAG_NONE },\n \/\/ From http:\/\/nds2.nokia.com\/files\/support\/global\/phones\/software\/Nokia_N93_WMP10_Driver.inf\n"} {"commit":"9b6b25e71338ac298d495d9bc5f046ef0d0b980e","subject":"WaE: -Wempty-body","message":"WaE: -Wempty-body\n\nChange-Id: I07e0b3b466a0fac4c8ddf279b546f807501bc2e7\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"unknown","license":"mpl-2.0","lang":"C","diff":""} {"commit":"8b8e4bc0391f8abbcdb9e1c54415bcc0f4f5a2a0","subject":"batman-adv: fix race condition in TT full-table replacement","message":"batman-adv: fix race condition in TT full-table replacement\n\nbug introduced with cea194d90b11aff7fc289149e4c7f305fad3535a\n\nIn the current TT code, when a TT_Response containing a full table is received\nfrom an originator, first the node purges all the clients for that originator in\nthe global translation-table and then merges the newly received table.\nDuring the purging phase each client deletion is done by means of a call_rcu()\ninvocation and at the end of this phase the global entry counter for that\noriginator is set to 0. However the invoked rcu function decreases the global\nentry counter for that originator by one too and since the rcu invocation is\nlikely to be postponed, the node will end up in first setting the counter to 0\nand then decreasing it one by one for each deleted client.\n\nThis bug leads to having a wrong global entry counter for the related node, say\nX. Then when the node with the broken counter will answer to a TT_REQUEST on\nbehalf of node X, it will create faulty TT_RESPONSE that will generate an\nunrecoverable situation on the node that asked for the full table recover.\n\nThe non-recoverability is given by the fact that the node with the broken\ncounter will keep answering on behalf of X because its knowledge about X's state\n(ttvn + tt_crc) is correct.\n\nTo solve this problem the counter is not explicitly set to 0 anymore and the\ncounter decrement is performed right before the invocation of call_rcu().\n\nSigned-off-by: Antonio Quartulli <ed91ce0fd2670d4a98b12fc9ec6b7a497c7ed53f@autistici.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/batman-adv\/translation-table.c\n+++ net\/batman-adv\/translation-table.c\n@@ -141,13 +141,14 @@\n \tstruct tt_orig_list_entry *orig_entry;\n \n \torig_entry = container_of(rcu, struct tt_orig_list_entry, rcu);\n-\tatomic_dec(&orig_entry->orig_node->tt_size);\n \torig_node_free_ref(orig_entry->orig_node);\n \tkfree(orig_entry);\n }\n \n static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry)\n {\n+\t\/* to avoid race conditions, immediately decrease the tt counter *\/\n+\tatomic_dec(&orig_entry->orig_node->tt_size);\n \tcall_rcu(&orig_entry->rcu, tt_orig_list_entry_free_rcu);\n }\n \n@@ -910,7 +911,6 @@\n \t\t}\n \t\tspin_unlock_bh(list_lock);\n \t}\n-\tatomic_set(&orig_node->tt_size, 0);\n \torig_node->tt_initialised = false;\n }\n \n"} {"commit":"8b38ad5f3b69d71aefe9dd6ed2852495b4a35694","subject":"Its working!","message":"Its working!","repos":"marceloboeira\/unisinos-microprocessors","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- exercises\/009-serial-communication.c\n+++ exercises\/009-serial-communication.c\n@@ -19,6 +19,8 @@\n #define LOW 0x00\n #define B_HIGH 'a'\n #define B_LOW 'b'\n+#define UART_BASE UART1_BASE\n+#define SYS_UART SYSCTL_PERIPH_UART1\n \n int btnA = 0,\n led = 0,\n@@ -44,11 +46,11 @@\n SysCtlClockSet(SYSCTL_SYSDIV_1 | SYSCTL_USE_OSC | SYSCTL_OSC_MAIN |\n SYSCTL_XTAL_8MHZ);\n \n- SysCtlPeripheralEnable(SYSCTL_PERIPH_UART1);\n- SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOA);\n- GPIOPinTypeUART(GPIO_PORTA_BASE, GPIO_PIN_0 | GPIO_PIN_1);\n+ SysCtlPeripheralEnable(SYS_UART);\n+ SysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOD);\n+ GPIOPinTypeUART(GPIO_PORTD_BASE, GPIO_PIN_2 | GPIO_PIN_3);\n \n- UARTConfigSetExpClk(UART1_BASE, SysCtlClockGet(), 115200,\n+ UARTConfigSetExpClk(UART_BASE, SysCtlClockGet(), 115200,\n \t\t (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE | UART_CONFIG_PAR_NONE));\n }\n \n@@ -62,11 +64,11 @@\n char buffer;\n char string[30];\n \n- UARTCharPut(UART1_BASE, '!');\n+ UARTCharPut(UART_BASE, '!');\n RIT128x96x4Init(1000000);\n \n while (1) {\n- buffer = UARTCharGetNonBlocking(UART1_BASE);\n+ buffer = UARTCharGetNonBlocking(UART_BASE);\n if (buffer != 255) {\n sprintf(string, \"Input: %c\", buffer);\n RIT128x96x4StringDraw(string, 12, 0, 15);\n@@ -85,12 +87,12 @@\n if (btnA) {\n \tif (lastOutputChar == B_LOW) {\n \t sprintf(string, \"Output: %c\", B_HIGH);\n- \t UARTCharPut(UART1_BASE, B_HIGH);\n+ \t UARTCharPut(UART_BASE, B_HIGH);\n \t lastOutputChar = 'a';\n \t}\n \telse {\n \t sprintf(string, \"Output: %c\", B_LOW);\n- \t UARTCharPut(UART1_BASE, B_LOW);\n+ \t UARTCharPut(UART_BASE, B_LOW);\n \t lastOutputChar = B_LOW;\n \t}\n \tRIT128x96x4StringDraw(string, 12, 10, 15);\n"} {"commit":"57a4edb6dbdeb22df168c85e3a163a2d8f220c0b","subject":"added acer liquid Z6E, via email report","message":"added acer liquid Z6E, via email report\n","repos":"libmtp\/libmtp,philipl\/libmtp,libmtp\/libmtp,philipl\/libmtp,philipl\/libmtp,libmtp\/libmtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/music-players.h\n+++ src\/music-players.h\n@@ -631,6 +631,9 @@\n \/* Mia *\/\n { \"Acer\", 0x0502, \"Liquid Zest Plus\", 0x38bb,\n DEVICE_FLAGS_ANDROID_BUGS },\n+ \/* Richard Waterbeek <richard@fotobakje.nl> on libmtp-discuss *\/\n+ { \"Acer\", 0x0502, \"Liquid Liquid Z6E\", 0x3938,\n+ DEVICE_FLAGS_ANDROID_BUGS },\n \n \/*\n * SanDisk\n"} {"commit":"3f490e80cfe654757f5b9001cee0236cd43d47ac","subject":"Fixed a potential null-dereferencing error in osl_closeProfile","message":"Fixed a potential null-dereferencing error in osl_closeProfile\n\nStore the new profile in a temporary variable and assign\nit to the old profile after we have checked if it is null.\nSeen with CLang++.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sal\/osl\/unx\/profile.c\n+++ sal\/osl\/unx\/profile.c\n@@ -274,6 +274,7 @@\n sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)\n {\n osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;\n+ osl_TProfileImpl* pTmpProfile;\n \n #ifdef TRACE_OSL_PROFILE\n OSL_TRACE(\"In osl_closeProfile\\n\");\n@@ -303,22 +304,22 @@\n \n if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) && ( pProfile->m_Flags & FLG_MODIFIED ) )\n {\n- pProfile = acquireProfile(Profile,sal_True);\n-\n- if ( pProfile != 0 )\n- {\n- sal_Bool bRet = storeProfile(pProfile, sal_True);\n+ pTmpProfile = acquireProfile(Profile,sal_True);\n+\n+ if ( pTmpProfile != 0 )\n+ {\n+ sal_Bool bRet = storeProfile(pTmpProfile, sal_True);\n OSL_ASSERT(bRet);\n (void)bRet;\n }\n }\n else\n {\n- pProfile = acquireProfile(Profile,sal_False);\n- }\n-\n-\n- if ( pProfile == 0 )\n+ pTmpProfile = acquireProfile(Profile,sal_False);\n+ }\n+\n+\n+ if ( pTmpProfile == 0 )\n {\n pthread_mutex_unlock(&(pProfile->m_AccessLock));\n #ifdef TRACE_OSL_PROFILE\n@@ -326,6 +327,8 @@\n #endif\n return sal_False;\n }\n+\n+ pProfile = pTmpProfile;\n \n if (pProfile->m_pFile != NULL)\n closeFileImpl(pProfile->m_pFile,pProfile->m_Flags);\n"} {"commit":"fe6092ea0019cbba5263a915c9ce9f2bf383209e","subject":"[NETFILTER]: nf_nat: use HW checksumming when possible","message":"[NETFILTER]: nf_nat: use HW checksumming when possible\n\nWhen mangling packets forwarded to a HW checksumming capable device,\noffload recalculation of the checksum instead of doing it in software.\n\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/ipv4\/netfilter\/nf_nat_helper.c\n+++ net\/ipv4\/netfilter\/nf_nat_helper.c\n@@ -153,6 +153,7 @@\n \t\t\t const char *rep_buffer,\n \t\t\t unsigned int rep_len)\n {\n+\tstruct rtable *rt = (struct rtable *)(*pskb)->dst;\n \tstruct iphdr *iph;\n \tstruct tcphdr *tcph;\n \tint oldlen, datalen;\n@@ -176,11 +177,22 @@\n \n \tdatalen = (*pskb)->len - iph->ihl*4;\n \tif ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {\n-\t\ttcph->check = 0;\n-\t\ttcph->check = tcp_v4_check(datalen,\n-\t\t\t\t\t iph->saddr, iph->daddr,\n-\t\t\t\t\t csum_partial((char *)tcph,\n-\t\t\t\t\t\t\tdatalen, 0));\n+\t\tif (!(rt->rt_flags & RTCF_LOCAL) &&\n+\t\t (*pskb)->dev->features & NETIF_F_ALL_CSUM) {\n+\t\t\t(*pskb)->ip_summed = CHECKSUM_PARTIAL;\n+\t\t\t(*pskb)->csum_start = skb_headroom(*pskb) +\n+\t\t\t\t\t skb_network_offset(*pskb) +\n+\t\t\t\t\t iph->ihl * 4;\n+\t\t\t(*pskb)->csum_offset = offsetof(struct tcphdr, check);\n+\t\t\ttcph->check = ~tcp_v4_check(datalen,\n+\t\t\t\t\t\t iph->saddr, iph->daddr, 0);\n+\t\t} else {\n+\t\t\ttcph->check = 0;\n+\t\t\ttcph->check = tcp_v4_check(datalen,\n+\t\t\t\t\t\t iph->saddr, iph->daddr,\n+\t\t\t\t\t\t csum_partial((char *)tcph,\n+\t\t\t\t\t\t\t\tdatalen, 0));\n+\t\t}\n \t} else\n \t\tnf_proto_csum_replace2(&tcph->check, *pskb,\n \t\t\t\t htons(oldlen), htons(datalen), 1);\n@@ -217,6 +229,7 @@\n \t\t\t const char *rep_buffer,\n \t\t\t unsigned int rep_len)\n {\n+\tstruct rtable *rt = (struct rtable *)(*pskb)->dst;\n \tstruct iphdr *iph;\n \tstruct udphdr *udph;\n \tint datalen, oldlen;\n@@ -251,13 +264,25 @@\n \t\treturn 1;\n \n \tif ((*pskb)->ip_summed != CHECKSUM_PARTIAL) {\n-\t\tudph->check = 0;\n-\t\tudph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,\n-\t\t\t\t\t\tdatalen, IPPROTO_UDP,\n-\t\t\t\t\t\tcsum_partial((char *)udph,\n-\t\t\t\t\t\t\t datalen, 0));\n-\t\tif (!udph->check)\n-\t\t\tudph->check = CSUM_MANGLED_0;\n+\t\tif (!(rt->rt_flags & RTCF_LOCAL) &&\n+\t\t (*pskb)->dev->features & NETIF_F_ALL_CSUM) {\n+\t\t\t(*pskb)->ip_summed = CHECKSUM_PARTIAL;\n+\t\t\t(*pskb)->csum_start = skb_headroom(*pskb) +\n+\t\t\t\t\t skb_network_offset(*pskb) +\n+\t\t\t\t\t iph->ihl * 4;\n+\t\t\t(*pskb)->csum_offset = offsetof(struct udphdr, check);\n+\t\t\tudph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,\n+\t\t\t\t\t\t\t datalen, IPPROTO_UDP,\n+\t\t\t\t\t\t\t 0);\n+\t\t} else {\n+\t\t\tudph->check = 0;\n+\t\t\tudph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,\n+\t\t\t\t\t\t\tdatalen, IPPROTO_UDP,\n+\t\t\t\t\t\t\tcsum_partial((char *)udph,\n+\t\t\t\t\t\t\t\t datalen, 0));\n+\t\t\tif (!udph->check)\n+\t\t\t\tudph->check = CSUM_MANGLED_0;\n+\t\t}\n \t} else\n \t\tnf_proto_csum_replace2(&udph->check, *pskb,\n \t\t\t\t htons(oldlen), htons(datalen), 1);\n"} {"commit":"c9e777fb54b3576100c663afad01a51bc6e11ee1","subject":"Fixed leaks in pubsub","message":"Fixed leaks in pubsub\n","repos":"apache\/celix,apache\/celix,apache\/celix,apache\/celix,apache\/celix,apache\/celix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bundles\/pubsub\/pubsub_spi\/src\/pubsub_endpoint.c\n+++ bundles\/pubsub\/pubsub_spi\/src\/pubsub_endpoint.c\n@@ -68,28 +68,28 @@\n \t\tproperties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_TOPIC_NAME, topic);\n \t}\n \n- char idBuf[32];\n-\n- if (bundleId >= 0) {\n- snprintf(idBuf, sizeof(idBuf), \"%li\", bundleId);\n- properties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_BUNDLE_ID, idBuf);\n- }\n-\n- if (serviceId >= 0) {\n- snprintf(idBuf, sizeof(idBuf), \"%li\", bundleId);\n- properties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_SERVICE_ID, idBuf);\n- }\n+\tchar idBuf[32];\n+\n+\tif (bundleId >= 0) {\n+\t\tsnprintf(idBuf, sizeof(idBuf), \"%li\", bundleId);\n+\t\tproperties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_BUNDLE_ID, idBuf);\n+\t}\n+\n+\tif (serviceId >= 0) {\n+\t\tsnprintf(idBuf, sizeof(idBuf), \"%li\", bundleId);\n+\t\tproperties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_SERVICE_ID, idBuf);\n+\t}\n \n \tif(endpoint != NULL) {\n \t\tproperties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_URL, endpoint);\n \t}\n \n- if (pubsubType != NULL) {\n- properties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_TYPE, pubsubType);\n- }\n+\tif (pubsubType != NULL) {\n+\t\tproperties_set(psEp->endpoint_props, PUBSUB_ENDPOINT_TYPE, pubsubType);\n+\t}\n \n \tif(topic_props != NULL) {\n- properties_copy(topic_props, &(psEp->topic_props));\n+\t\tproperties_copy(topic_props, &(psEp->topic_props));\n \t}\n }\n \n@@ -143,19 +143,19 @@\n celix_status_t pubsubEndpoint_create(const char* fwUUID, const char* scope, const char* topic, long bundleId, long serviceId, const char* endpoint, const char* pubsubType, properties_pt topic_props,pubsub_endpoint_pt* out){\n \tcelix_status_t status = CELIX_SUCCESS;\n \n- pubsub_endpoint_pt psEp = calloc(1, sizeof(*psEp));\n+\tpubsub_endpoint_pt psEp = calloc(1, sizeof(*psEp));\n \n \tpubsubEndpoint_setFields(psEp, fwUUID, scope, topic, bundleId, serviceId, endpoint, pubsubType, topic_props);\n \n- if (!pubsubEndpoint_isEndpointValid(psEp)) {\n- status = CELIX_ILLEGAL_STATE;\n- }\n-\n- if (status == CELIX_SUCCESS) {\n- *out = psEp;\n- } else {\n- pubsubEndpoint_destroy(psEp);\n- }\n+\tif (!pubsubEndpoint_isEndpointValid(psEp)) {\n+\t\tstatus = CELIX_ILLEGAL_STATE;\n+\t}\n+\n+\tif (status == CELIX_SUCCESS) {\n+\t\t*out = psEp;\n+\t} else {\n+\t\tpubsubEndpoint_destroy(psEp);\n+\t}\n \n \treturn status;\n \n@@ -164,19 +164,19 @@\n celix_status_t pubsubEndpoint_clone(pubsub_endpoint_pt in, pubsub_endpoint_pt *out){\n \tcelix_status_t status = CELIX_SUCCESS;\n \n- pubsub_endpoint_pt ep = calloc(1,sizeof(*ep));\n+\tpubsub_endpoint_pt ep = calloc(1,sizeof(*ep));\n \n \tstatus = properties_copy(in->endpoint_props, &(ep->endpoint_props));\n \n- if (in->topic_props != NULL) {\n- status += properties_copy(in->topic_props, &(ep->topic_props));\n- }\n-\n- if (status == CELIX_SUCCESS) {\n- *out = ep;\n- } else {\n- pubsubEndpoint_destroy(ep);\n- }\n+\tif (in->topic_props != NULL) {\n+\t\tstatus += properties_copy(in->topic_props, &(ep->topic_props));\n+\t}\n+\n+\tif (status == CELIX_SUCCESS) {\n+\t\t*out = ep;\n+\t} else {\n+\t\tpubsubEndpoint_destroy(ep);\n+\t}\n \n \treturn status;\n }\n@@ -199,56 +199,59 @@\n \tserviceReference_getProperty(reference,(char*)OSGI_FRAMEWORK_SERVICE_ID,&serviceId);\n \n \n- long bundleId = -1;\n- bundle_pt bundle = NULL;\n- serviceReference_getBundle(reference, &bundle);\n- if (bundle != NULL) {\n- bundle_getBundleId(bundle, &bundleId);\n- }\n+\tlong bundleId = -1;\n+\tbundle_pt bundle = NULL;\n+\tserviceReference_getBundle(reference, &bundle);\n+\tif (bundle != NULL) {\n+\t\tbundle_getBundleId(bundle, &bundleId);\n+\t}\n \n \t\/* TODO: is topic_props==NULL a fatal error such that EP cannot be created? *\/\n \tproperties_pt topic_props = pubsubEndpoint_getTopicProperties(bundle, topic, isPublisher);\n \n- const char *pubsubType = isPublisher ? PUBSUB_PUBLISHER_ENDPOINT_TYPE : PUBSUB_SUBSCRIBER_ENDPOINT_TYPE;\n+\tconst char *pubsubType = isPublisher ? PUBSUB_PUBLISHER_ENDPOINT_TYPE : PUBSUB_SUBSCRIBER_ENDPOINT_TYPE;\n \n \tpubsubEndpoint_setFields(ep, fwUUID, scope, topic, bundleId, strtol(serviceId,NULL,10), NULL, pubsubType, topic_props);\n-\n- if (!pubsubEndpoint_isEndpointValid(ep)) {\n- status = CELIX_ILLEGAL_STATE;\n- }\n-\n- if (status == CELIX_SUCCESS) {\n- *out = ep;\n- } else {\n- pubsubEndpoint_destroy(ep);\n- }\n+\tif(topic_props != NULL){\n+\t\tcelix_properties_destroy(topic_props); \/\/Can be deleted since setFields invokes properties_copy\n+\t}\n+\n+\tif (!pubsubEndpoint_isEndpointValid(ep)) {\n+\t\tstatus = CELIX_ILLEGAL_STATE;\n+\t}\n+\n+\tif (status == CELIX_SUCCESS) {\n+\t\t*out = ep;\n+\t} else {\n+\t\tpubsubEndpoint_destroy(ep);\n+\t}\n \n \treturn status;\n \n }\n \n celix_status_t pubsubEndpoint_createFromDiscoveredProperties(properties_t *discoveredProperties, pubsub_endpoint_pt* out) {\n- celix_status_t status = CELIX_SUCCESS;\n- \n- pubsub_endpoint_pt psEp = calloc(1, sizeof(*psEp));\n- \n- if (psEp == NULL) {\n- return CELIX_ENOMEM;\n- }\n-\n- psEp->endpoint_props = discoveredProperties;\n-\n- if (!pubsubEndpoint_isEndpointValid(psEp)) {\n- status = CELIX_ILLEGAL_STATE;\n- }\n-\n- if (status == CELIX_SUCCESS) {\n- *out = psEp;\n- } else {\n- pubsubEndpoint_destroy(psEp);\n- }\n-\n- return status;\n+\tcelix_status_t status = CELIX_SUCCESS;\n+\n+\tpubsub_endpoint_pt psEp = calloc(1, sizeof(*psEp));\n+\n+\tif (psEp == NULL) {\n+\t\treturn CELIX_ENOMEM;\n+\t}\n+\n+\tpsEp->endpoint_props = discoveredProperties;\n+\n+\tif (!pubsubEndpoint_isEndpointValid(psEp)) {\n+\t\tstatus = CELIX_ILLEGAL_STATE;\n+\t}\n+\n+\tif (status == CELIX_SUCCESS) {\n+\t\t*out = psEp;\n+\t} else {\n+\t\tpubsubEndpoint_destroy(psEp);\n+\t}\n+\n+\treturn status;\n }\n \n celix_status_t pubsubEndpoint_createFromListenerHookInfo(bundle_context_t *ctx, listener_hook_info_pt info, bool isPublisher, pubsub_endpoint_pt* out){\n@@ -273,7 +276,7 @@\n \t\tscope = strdup(PUBSUB_PUBLISHER_SCOPE_DEFAULT);\n \t}\n \n- pubsub_endpoint_pt psEp = calloc(1, sizeof(**out));\n+\tpubsub_endpoint_pt psEp = calloc(1, sizeof(**out));\n \n \tbundle_pt bundle = NULL;\n \tlong bundleId = -1;\n@@ -286,22 +289,25 @@\n \tpubsubEndpoint_setFields(psEp, fwUUID, scope, topic, bundleId, -1, NULL, PUBSUB_PUBLISHER_ENDPOINT_TYPE, topic_props);\n \tfree(scope);\n \tfree(topic);\n-\n- if (!pubsubEndpoint_isEndpointValid(psEp)) {\n- status = CELIX_ILLEGAL_STATE;\n- }\n-\n- if (status == CELIX_SUCCESS) {\n- *out = psEp;\n- } else {\n- pubsubEndpoint_destroy(psEp);\n- }\n+\tif(topic_props != NULL){\n+\t\tcelix_properties_destroy(topic_props); \/\/Can be deleted since setFields invokes properties_copy\n+\t}\n+\n+\tif (!pubsubEndpoint_isEndpointValid(psEp)) {\n+\t\tstatus = CELIX_ILLEGAL_STATE;\n+\t}\n+\n+\tif (status == CELIX_SUCCESS) {\n+\t\t*out = psEp;\n+\t} else {\n+\t\tpubsubEndpoint_destroy(psEp);\n+\t}\n \n \treturn status;\n }\n \n void pubsubEndpoint_destroy(pubsub_endpoint_pt psEp){\n- if (psEp == NULL) return;\n+\tif (psEp == NULL) return;\n \n \tif(psEp->topic_props != NULL){\n \t\tproperties_destroy(psEp->topic_props);\n@@ -309,7 +315,7 @@\n \n \tif (psEp->endpoint_props != NULL) {\n \t\tproperties_destroy(psEp->endpoint_props);\n- }\n+\t}\n \n \tfree(psEp);\n \n@@ -321,7 +327,7 @@\n \n \tif (psEp1->endpoint_props && psEp2->endpoint_props) {\n \t\treturn !strcmp(properties_get(psEp1->endpoint_props, PUBSUB_ENDPOINT_UUID),\n-\t\t\t\t\t properties_get(psEp2->endpoint_props, PUBSUB_ENDPOINT_UUID));\n+\t\t\t\tproperties_get(psEp2->endpoint_props, PUBSUB_ENDPOINT_UUID));\n \t}else {\n \t\treturn false;\n \t}\n@@ -336,35 +342,35 @@\n \n \n static bool pubsubEndpoint_isEndpointValid(pubsub_endpoint_pt psEp) {\n- \/\/required properties\n- bool valid = true;\n- static const char* keys[] = {\n- PUBSUB_ENDPOINT_UUID,\n- PUBSUB_ENDPOINT_FRAMEWORK_UUID,\n- PUBSUB_ENDPOINT_TYPE,\n- PUBSUB_ENDPOINT_TOPIC_NAME,\n- PUBSUB_ENDPOINT_TOPIC_SCOPE,\n- NULL };\n- int i;\n- for (i = 0; keys[i] != NULL; ++i) {\n- const char *val = properties_get(psEp->endpoint_props, keys[i]);\n- if (val == NULL) { \/\/missing required key\n- fprintf(stderr, \"[ERROR] PubSubEndpoint: Invalid endpoint missing key: '%s'\\n\", keys[i]);\n- valid = false;\n- }\n- }\n- if (!valid) {\n- const char *key = NULL;\n- fprintf(stderr, \"PubSubEndpoint entries:\\n\");\n- PROPERTIES_FOR_EACH(psEp->endpoint_props, key) {\n- fprintf(stderr, \"\\t'%s' : '%s'\\n\", key, properties_get(psEp->endpoint_props, key));\n- }\n- if (psEp->topic_props != NULL) {\n- fprintf(stderr, \"PubSubEndpoint topic properties entries:\\n\");\n- PROPERTIES_FOR_EACH(psEp->topic_props, key) {\n- fprintf(stderr, \"\\t'%s' : '%s'\\n\", key, properties_get(psEp->topic_props, key));\n- }\n- }\n- }\n- return valid;\n-}\n+\t\/\/required properties\n+\tbool valid = true;\n+\tstatic const char* keys[] = {\n+\t\t\tPUBSUB_ENDPOINT_UUID,\n+\t\t\tPUBSUB_ENDPOINT_FRAMEWORK_UUID,\n+\t\t\tPUBSUB_ENDPOINT_TYPE,\n+\t\t\tPUBSUB_ENDPOINT_TOPIC_NAME,\n+\t\t\tPUBSUB_ENDPOINT_TOPIC_SCOPE,\n+\t\t\tNULL };\n+\tint i;\n+\tfor (i = 0; keys[i] != NULL; ++i) {\n+\t\tconst char *val = properties_get(psEp->endpoint_props, keys[i]);\n+\t\tif (val == NULL) { \/\/missing required key\n+\t\t\tfprintf(stderr, \"[ERROR] PubSubEndpoint: Invalid endpoint missing key: '%s'\\n\", keys[i]);\n+\t\t\tvalid = false;\n+\t\t}\n+\t}\n+\tif (!valid) {\n+\t\tconst char *key = NULL;\n+\t\tfprintf(stderr, \"PubSubEndpoint entries:\\n\");\n+\t\tPROPERTIES_FOR_EACH(psEp->endpoint_props, key) {\n+\t\t\tfprintf(stderr, \"\\t'%s' : '%s'\\n\", key, properties_get(psEp->endpoint_props, key));\n+\t\t}\n+\t\tif (psEp->topic_props != NULL) {\n+\t\t\tfprintf(stderr, \"PubSubEndpoint topic properties entries:\\n\");\n+\t\t\tPROPERTIES_FOR_EACH(psEp->topic_props, key) {\n+\t\t\t\tfprintf(stderr, \"\\t'%s' : '%s'\\n\", key, properties_get(psEp->topic_props, key));\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn valid;\n+}\n"} {"commit":"baa1010b2b3688853495ba9ceb3ebcc9f2303bcd","subject":"added Sony WALKMAN NWZ-E474 https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1540\/","message":"added Sony WALKMAN NWZ-E474\nhttps:\/\/sourceforge.net\/p\/libmtp\/bugs\/1540\/\n","repos":"libmtp\/libmtp,philipl\/libmtp,libmtp\/libmtp,philipl\/libmtp,libmtp\/libmtp,philipl\/libmtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/music-players.h\n+++ src\/music-players.h\n@@ -1563,6 +1563,9 @@\n DEVICE_FLAGS_ANDROID_BUGS },\n { \"Sony\", 0x054c, \"NWZ-B173F\", 0x0689,\n DEVICE_FLAGS_SONY_NWZ_BUGS },\n+ \/* https:\/\/sourceforge.net\/p\/libmtp\/bugs\/1540\/ *\/\n+ { \"Sony\", 0x054c, \"NWZ-E474\", 0x06a9,\n+ DEVICE_FLAGS_SONY_NWZ_BUGS },\n { \"Sony\", 0x054c, \"DCR-SR75\", 0x1294,\n DEVICE_FLAGS_SONY_NWZ_BUGS },\n \n"} {"commit":"2e1b9e44719618eb97b3850d05096753fd7d3617","subject":"httpd: gracefully handle too large request bodies","message":"httpd: gracefully handle too large request bodies\n\nReturn a 413 error instead of crashing\n","repos":"krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/network\/httpd.c\n+++ src\/network\/httpd.c\n@@ -1832,8 +1832,31 @@\n \/* TODO Mhh, handle the case where the client only\n * sends a request and closes the connection to\n * mark the end of the body (probably only RTSP) *\/\n- cl->query.p_body = xmalloc( cl->query.i_body );\n+ cl->query.p_body = malloc( cl->query.i_body );\n cl->i_buffer = 0;\n+ if ( cl->query.p_body == NULL )\n+ {\n+ switch (cl->query.i_proto)\n+ {\n+ case HTTPD_PROTO_HTTP:\n+ {\n+ const uint8_t sorry[] =\n+ \"HTTP\/1.1 413 Request Entity Too Large\\r\\n\\r\\n\";\n+ httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 );\n+ break;\n+ }\n+ case HTTPD_PROTO_RTSP:\n+ {\n+ const uint8_t sorry[] =\n+ \"RTSP\/1.0 413 Request Entity Too Large\\r\\n\\r\\n\";\n+ httpd_NetSend( cl, sorry, sizeof( sorry ) - 1 );\n+ break;\n+ }\n+ default:\n+ assert( 0 );\n+ }\n+ i_len = 0; \/* drop *\/\n+ }\n break;\n }\n else\n"} {"commit":"36f10c35d7f7075f7bb5cb791a060298eb873ae9","subject":"Fix assert programming certain nrf51 hex files","message":"Fix assert programming certain nrf51 hex files\n\nSome hex files built for the nrf51 program both the UICR anf FICR in\naddition to regular flash. This triggers an assert because this is\nnot in program flash, which target_flash_erase_sector_size checks for.\nThis patch fixes that assert by always returning a sector size, even\nif it is outside program flash.\n","repos":"google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port,sg-\/DAPLink,sg-\/DAPLink,google\/DAPLink-port,sg-\/DAPLink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/daplink\/interface\/target_flash.c\n+++ source\/daplink\/interface\/target_flash.c\n@@ -135,9 +135,5 @@\n \n static uint32_t target_flash_erase_sector_size(uint32_t addr)\n {\n- if ((addr >= target_device.flash_start) && (addr < target_device.flash_end)) {\n- return target_device.sector_size;\n- } else {\n- return 0;\n- }\n+ return target_device.sector_size;\n }\n"} {"commit":"b4645b33dca4bb7f783111cfc667fa0aa8362dc7","subject":"Added missing duplicated include sentinel","message":"Added missing duplicated include sentinel\n\n\ngit-svn-id: 6c2b1bd10c324c49ea9d9e6e31006a80e70507cb@1431 5242fede-7e19-0410-aef8-94bd7d2200fb\n","repos":"vmx\/geos,Uli1\/geos,vmx\/geos,Uli1\/geos,Uli1\/geos,vmx\/geos,vmx\/geos,Uli1\/geos,Uli1\/geos,Uli1\/geos,vmx\/geos,Uli1\/geos,vmx\/geos","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- source\/headers\/geos\/geom\/GeometryList.h\n+++ source\/headers\/geos\/geom\/GeometryList.h\n@@ -16,6 +16,9 @@\n * Last port: ORIGINAL WORK\n *\n **********************************************************************\/\n+\n+#ifndef GEOS_GEOM_GEOMETRYLIST_H\n+#define GEOS_GEOM_GEOMETRYLIST_H\n \n #include <geos\/geom\/Geometry.h> \/\/ for auto_ptr\n \n@@ -70,8 +73,13 @@\n } \/\/ namespace geos.geom\n } \/\/ namespace geos\n \n+#endif \/\/ GEOS_GEOM_GEOMETRYLIST_H\n+\n \/**********************************************************************\n * $Log$\n+ * Revision 1.2 2006\/04\/11 09:53:44 strk\n+ * Added missing duplicated include sentinel\n+ *\n * Revision 1.1 2006\/04\/11 09:41:26 strk\n * Initial implementation of a GeometryList class, to be used to manage\n * lists of Geometry pointers.\n"} {"commit":"489d15c3d26a565431e7328c4ab27552e5d585ee","subject":"remove redundant strrem","message":"remove redundant strrem\n","repos":"nelly-hateva\/fa,nelly-hateva\/fa,nelly-hateva\/fa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- automaton.c\n+++ automaton.c\n@@ -641,11 +641,9 @@\n {\n if(c != alpha[i] && delta(tau_prim[i], c) != -1)\n {\n- \/\/printf(\"%d %c \\n\", i, c);\n- dummy[0] = c; dummy[1] = 0;\n- \/\/printf(\"%s \\n\", output[i]);\n- add_output(tau_prim[i], c, strrem(output[i], strcat(output[i], dummy)));\n- \/\/printf(\"adding output %d %c with %s\", tau_prim[i], c, strrem(output[i], strcat(output[i], dummy)));\n+ dummy[0] = c; dummy[1] = '\\0';\n+ add_output(tau_prim[i], c, dummy);\n+ printf(\"adding output %d %s\", tau_prim[i], dummy);\n }\n }\n \n"} {"commit":"186e949c8d51480f310ab78cca2da1d833070d8d","subject":"Add: movement flag","message":"Add: movement flag","repos":"krosk\/airsim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/MoveSystem.h\n+++ include\/MoveSystem.h\n@@ -9,11 +9,11 @@\n class MovementNode\n {\n public:\n- MovementNode(int id, PositionComponent &p, const VelocityComponent &v, const PositionTargetComponent &t) :\n+ MovementNode(int id, PositionComponent &p, VelocityComponent &v, const PositionTargetComponent &t) :\n uid(id), position(p), velocity(v), target(t) {};\n const int uid;\n PositionComponent &position;\n- const VelocityComponent &velocity;\n+ VelocityComponent &velocity;\n const PositionTargetComponent ⌖\n };\n \n"} {"commit":"d82a31e543b86505380719f7dca478e20a66d294","subject":"Unused winstd::eap_packet methods removed","message":"Unused winstd::eap_packet methods removed\n","repos":"Amebis\/WinStd,Amebis\/WinStd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/WinStd\/EAP.h\n+++ include\/WinStd\/EAP.h\n@@ -270,84 +270,6 @@\n \r\n \r\n \/\/\/\r\n- \/\/\/ Create new EAP Request packet\r\n- \/\/\/\r\n- \/\/\/ \\param[in] id Packet ID\r\n- \/\/\/ \\param[in] type Protocol ID\r\n- \/\/\/ \\param[in] flags Request flags\r\n- \/\/\/ \\param[in] size Initial packet size. Must be at least 6.\r\n- \/\/\/\r\n- \/\/\/ \\note Packet data (beyond first 6B) is not initialized.\r\n- \/\/\/\r\n- \/\/\/ \\return\r\n- \/\/\/ - true when creation succeeds;\r\n- \/\/\/ - false when creation fails. For extended error information, call `GetLastError()`.\r\n- \/\/\/\r\n- inline bool create_request(_In_ BYTE id, _In_ eap_type_t type, _In_ BYTE flags, _In_opt_ WORD size = 6)\r\n- {\r\n- assert(size >= 6); \/\/ EAP Request packets must contain at least 6B.\r\n-\r\n- if (!create(EapCodeRequest, id, size))\r\n- return false;\r\n-\r\n- m_h->Data[0] = (BYTE)type;\r\n- m_h->Data[1] = flags;\r\n-\r\n- return true;\r\n- }\r\n-\r\n-\r\n- \/\/\/\r\n- \/\/\/ Create new EAP Response packet\r\n- \/\/\/\r\n- \/\/\/ \\param[in] id Packet ID\r\n- \/\/\/ \\param[in] type Protocol ID\r\n- \/\/\/ \\param[in] flags Response flags\r\n- \/\/\/ \\param[in] size Initial packet size. Must be at least 6.\r\n- \/\/\/\r\n- \/\/\/ \\note Packet data (beyond first 6B) is not initialized.\r\n- \/\/\/\r\n- \/\/\/ \\return\r\n- \/\/\/ - true when creation succeeds;\r\n- \/\/\/ - false when creation fails. For extended error information, call `GetLastError()`.\r\n- \/\/\/\r\n- inline bool create_response(_In_ BYTE id, _In_ eap_type_t type, _In_ BYTE flags, _In_opt_ WORD size = 6)\r\n- {\r\n- assert(size >= 6); \/\/ EAP Response packets must contain at least 6B.\r\n-\r\n- if (!create(EapCodeResponse, id, size))\r\n- return false;\r\n-\r\n- m_h->Data[0] = (BYTE)type;\r\n- m_h->Data[1] = flags;\r\n-\r\n- return true;\r\n- }\r\n-\r\n-\r\n- \/\/\/\r\n- \/\/\/ Create Accept EAP packet\r\n- \/\/\/\r\n- \/\/\/ \\param[in] id ID of EAP packet this packet is rejecting\r\n- \/\/\/\r\n- inline bool create_accept(_In_ BYTE id)\r\n- {\r\n- return create(EapCodeSuccess, id + 1, 4);\r\n- }\r\n-\r\n-\r\n- \/\/\/\r\n- \/\/\/ Create Reject EAP packet\r\n- \/\/\/\r\n- \/\/\/ \\param[in] id ID of EAP packet this packet is rejecting\r\n- \/\/\/\r\n- inline bool create_reject(_In_ BYTE id)\r\n- {\r\n- return create(EapCodeFailure, id + 1, 4);\r\n- }\r\n-\r\n-\r\n- \/\/\/\r\n \/\/\/ Returns total EAP packet size in bytes.\r\n \/\/\/\r\n inline WORD size() const\r\n"} {"commit":"48e909a4748d9bf85c094e8587ce3a9b6926bfa4","subject":"Added AF_ERR_NONFREE to defines.h","message":"Added AF_ERR_NONFREE to defines.h\n","repos":"pentschev\/arrayfire,marbre\/arrayfire,ghisvail\/arrayfire,merlin-ext\/arrayfire,marbre\/arrayfire,pentschev\/arrayfire,bkloppenborg\/arrayfire,9prady9\/arrayfire,9prady9\/arrayfire,ghisvail\/arrayfire,mrgloom\/arrayfire,ghisvail\/arrayfire,arrayfire\/arrayfire,shehzan10\/arrayfire,bkloppenborg\/arrayfire,pombredanne\/arrayfire,umar456\/arrayfire,bkloppenborg\/arrayfire,marbre\/arrayfire,jramapuram\/arrayfire,mrgloom\/arrayfire,arrayfire\/arrayfire,victorv\/arrayfire,ghisvail\/arrayfire,bkloppenborg\/arrayfire,arrayfire\/arrayfire,jramapuram\/arrayfire,hshindo\/arrayfire,jramapuram\/arrayfire,umar456\/arrayfire,pentschev\/arrayfire,munnybearz\/arrayfire,hshindo\/arrayfire,arrayfire\/arrayfire,marbre\/arrayfire,victorv\/arrayfire,merlin-ext\/arrayfire,pombredanne\/arrayfire,pombredanne\/arrayfire,munnybearz\/arrayfire,umar456\/arrayfire,mrgloom\/arrayfire,victorv\/arrayfire,merlin-ext\/arrayfire,shehzan10\/arrayfire,shehzan10\/arrayfire,pombredanne\/arrayfire,mrgloom\/arrayfire,pentschev\/arrayfire,victorv\/arrayfire,9prady9\/arrayfire,umar456\/arrayfire,hshindo\/arrayfire,shehzan10\/arrayfire,munnybearz\/arrayfire,merlin-ext\/arrayfire,hshindo\/arrayfire,9prady9\/arrayfire,jramapuram\/arrayfire","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/af\/defines.h\n+++ include\/af\/defines.h\n@@ -122,6 +122,12 @@\n \/\/\/ This build of ArrayFire does not support this feature\n \/\/\/\n AF_ERR_NOT_CONFIGURED = 302,\n+\n+ \/\/\/\n+ \/\/\/ This build of ArrayFire is not compiled with \"nonfree\" algorithms\n+ \/\/\/\n+ AFF_ERR_NONFREE = 303,\n+\n \/\/ 400-499 Errors for missing hardware features\n \n \/\/\/\n"} {"commit":"5ee05efe282dcccc90efadc5eb0eac4a16c3ad4e","subject":"Added more comments","message":"Added more comments\n","repos":"baszalmstra\/aifc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/ai_command.h\n+++ include\/ai_command.h\n@@ -8,15 +8,9 @@\n class AICommand {\n \n public:\n-\n+ \/\/\/ Default constructor\n AICommand() {};\n \n+ \/\/\/ Default destructor\n virtual ~AICommand(){};\n-\n- void set_thruster(ShipId ship_id, uint32_t thruster_id, float level) {};\n-\n-private:\n-\n- std::vector<float> thruster_levels_;\n-\n };\n"} {"commit":"5405fd80e278edb6032f8913e2d8b74c9122fee2","subject":"Split from cfg.h","message":"Split from cfg.h\n","repos":"xujun10110\/boomerang,TambourineReindeer\/boomerang,xujun10110\/boomerang,xujun10110\/boomerang,nemerle\/boomerang,nemerle\/boomerang,nemerle\/boomerang,xujun10110\/boomerang,nemerle\/boomerang,TambourineReindeer\/boomerang,xujun10110\/boomerang,TambourineReindeer\/boomerang,nemerle\/boomerang,nemerle\/boomerang,TambourineReindeer\/boomerang,TambourineReindeer\/boomerang,xujun10110\/boomerang,xujun10110\/boomerang,TambourineReindeer\/boomerang,TambourineReindeer\/boomerang,TambourineReindeer\/boomerang,xujun10110\/boomerang,nemerle\/boomerang,nemerle\/boomerang","returncode":1,"stderr":"error: pathspec 'include\/basicblock.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- include\/basicblock.h\n+++ include\/basicblock.h\n@@ -0,0 +1,516 @@\n+\/*\n+ * Copyright (C) 1997-2005, The University of Queensland\n+ * Copyright (C) 2001, Sun Microsystems, Inc\n+ * Copyright (C) 2002, Trent Waddington\n+ *\n+ * See the file \"LICENSE.TERMS\" for information on usage and\n+ * redistribution of this file, and for a DISCLAIMER OF ALL\n+ * WARRANTIES.\n+ *\n+ *\/\n+\n+\/*==============================================================================\n+ * FILE:\t basicblock.h\n+ * OVERVIEW: Interface for the basic block class, which form nodes of the control flow graph\n+ *============================================================================*\/\n+\n+\/*\n+ * $Revision$\n+ *\n+ * 28 Jun 05 - Mike: Split off from cfg.h\n+ *\/\n+\n+#include \"managed.h\"\t\t\t\/\/ For LocationSet etc\n+\n+class Location;\n+class HLLCode;\n+class SWITCH_INFO;\n+\n+\/*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\\\n+*\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t *\n+*\te n u m s u s e d i n C f g . h a n d h e r e\t *\n+*\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t *\n+\\*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\t*\/\n+\n+\/\/ Depth-first traversal constants.\n+enum travType {\n+\tUNTRAVERSED, \/\/ Initial value\n+\tDFS_TAG,\t \/\/ Remove redundant nodes pass\n+\tDFS_LNUM,\t \/\/ DFS loop stamping pass\n+\tDFS_RNUM,\t \/\/ DFS reverse loop stamping pass\n+\tDFS_CASE,\t \/\/ DFS case head tagging traversal\n+\tDFS_PDOM,\t \/\/ DFS post dominator ordering\n+\tDFS_CODEGEN\t \/\/ Code generating pass\n+};\n+\n+\/\/ an enumerated type for the class of stucture determined for a node\n+enum structType { \n+\tLoop,\t \/\/ Header of a loop only\n+\tCond,\t \/\/ Header of a conditional only (if-then-else or switch)\n+\tLoopCond, \/\/ Header of a loop and a conditional\n+\tSeq\t\t \/\/ sequential statement (default)\n+};\n+\n+\/\/ an type for the class of unstructured conditional jumps\n+enum unstructType {\n+\tStructured,\n+\tJumpInOutLoop,\n+\tJumpIntoCase\n+};\n+\n+\n+\/\/ an enumerated type for the type of conditional headers\n+enum condType {\n+\tIfThen,\t\t\/\/ conditional with only a then clause\n+\tIfThenElse, \/\/ conditional with a then and an else clause\n+\tIfElse,\t\t\/\/ conditional with only an else clause\n+\tCase\t\t\/\/ nway conditional header (case statement)\n+};\n+\n+\/\/ an enumerated type for the type of loop headers\n+enum loopType {\n+\tPreTested,\t \/\/ Header of a while loop\n+\tPostTested,\t \/\/ Header of a repeat loop\n+\tEndless\t\t \/\/ Header of an endless loop\n+};\n+\n+\/*\t*\t*\t*\t*\t*\t*\t*\t*\t*\\\n+*\t\t\t\t\t\t\t\t\t *\n+*\tB a s i c B l o c k e n u m s\t *\n+*\t\t\t\t\t\t\t\t\t *\n+\\*\t*\t*\t*\t*\t*\t*\t*\t*\t*\/\n+\n+\/\/ Kinds of basic block nodes\n+\/\/ reordering these will break the save files - trent\n+enum BBTYPE {\n+\tONEWAY,\t\t\t\t\t \/\/ unconditional branch\n+\tTWOWAY,\t\t\t\t\t \/\/ conditional branch\n+\tNWAY,\t\t\t\t\t \/\/ case branch\n+\tCALL,\t\t\t\t\t \/\/ procedure call\n+\tRET,\t\t\t\t\t \/\/ return\n+\tFALL,\t\t\t\t\t \/\/ fall-through node\n+\tCOMPJUMP,\t\t\t\t \/\/ computed jump\n+\tCOMPCALL,\t\t\t\t \/\/ computed call\n+\tINVALID\t\t\t\t\t \/\/ invalid instruction\n+};\n+\n+enum SBBTYPE {\n+\tNONE,\t\t\t\t\t \/\/ not structured\n+\tPRETESTLOOP,\t\t\t \/\/ header of a loop\n+\tPOSTTESTLOOP,\n+\tENDLESSLOOP,\n+\tJUMPINOUTLOOP,\t\t\t \/\/ an unstructured jump in or out of a loop\n+\tJUMPINTOCASE,\t\t\t \/\/ an unstructured jump into a case statement\n+\tIFGOTO,\t\t\t\t\t \/\/ unstructured conditional\n+\tIFTHEN,\t\t\t\t\t \/\/ conditional with then clause\n+\tIFTHENELSE,\t\t\t\t \/\/ conditional with then and else clauses\n+\tIFELSE,\t\t\t\t\t \/\/ conditional with else clause only\n+\tCASE\t\t\t\t\t \/\/ case statement (switch)\n+};\n+\n+typedef std::list<PBB>::iterator BB_IT;\n+\n+\/*==============================================================================\n+ * BasicBlock class. <more comments>\n+ *============================================================================*\/\n+class BasicBlock {\n+\t\t\/*\n+\t\t * Objects of class Cfg can access the internals of a BasicBlock object.\n+\t\t *\/\n+\t\tfriend class Cfg;\n+\n+public:\n+\t\t\/*\n+\t\t * Constructor.\n+\t\t *\/\n+\t\t\t\t\tBasicBlock();\n+\n+\t\t\/*\n+\t\t * Destructor.\n+\t\t *\/\n+\t\t\t\t\t~BasicBlock();\n+\n+\t\t\/*\n+\t\t * Copy constructor.\n+\t\t *\/\n+\t\t\t\t\tBasicBlock(const BasicBlock& bb);\n+\n+\t\t\/*\n+\t\t * Return the type of the basic block.\n+\t\t *\/\n+\t\tBBTYPE\t\tgetType();\n+\n+\t\t\/*\n+\t\t * Check if this BB has a label. If so, return the numeric value of the label (nonzero integer). If not, returns\n+\t\t * zero. See also Cfg::setLabel()\n+\t\t *\/\n+\t\tint\t\t\tgetLabel();\n+\n+\t\tstd::string &getLabelStr() { return m_labelStr; }\n+\t\tvoid\t\tsetLabelStr(std::string &s) { m_labelStr = s; }\n+\t\tbool\t\tisLabelNeeded() { return m_labelneeded; }\n+\t\tvoid\t\tsetLabelNeeded(bool b) { m_labelneeded = b; }\n+\n+\t\t\/*\n+\t\t * Return whether this BB has been traversed or not\n+\t\t *\/\n+\t\tbool\t\tisTraversed();\n+\n+\t\t\/*\n+\t\t * Set the traversed flag\n+\t\t *\/\n+\t\tvoid\t\tsetTraversed(bool bTraversed);\n+\n+\t\t\/*\n+\t\t * Print the BB. For -R and for debugging\n+\t\t * Don't use = std::cout, because gdb doesn't know about std::\n+\t\t *\/\n+\t\tvoid\t\tprint(std::ostream& os);\n+\t\tvoid\t\tprintToLog();\n+\t\tchar*\t\tprints();\t\t\t\t\t\t\/\/ For debugging\n+\t\tvoid\t\tdump();\n+\n+\t\t\/*\n+\t\t * Set the type of the basic block.\n+\t\t *\/\n+\t\tvoid\t\tupdateType(BBTYPE bbType, int iNumOutEdges);\n+\n+\t\t\/*\n+\t\t * Set the \"jump reqd\" bit. This means that this is an orphan BB (it is generated, not part of the original\n+\t\t * program), and that the \"fall through\" out edge (m_OutEdges[1]) has to be implemented as a jump. The back end\n+\t\t * needs to take heed of this bit\n+\t\t *\/\n+\t\tvoid\t\tsetJumpReqd();\n+\n+\t\t\/*\n+\t\t * Check if jump is required (see above).\n+\t\t *\/\n+\t\tbool\t\tisJumpReqd();\n+\n+\t\t\/*\n+\t\t * Get the address associated with the BB\n+\t\t * Note that this is not always the same as getting the address of the first RTL (e.g. if the first RTL is a\n+\t\t * delay instruction of a DCTI instruction; then the address of this RTL will be 0)\n+\t\t *\/\n+\t\tADDRESS\t\tgetLowAddr();\n+\t\tADDRESS\t\tgetHiAddr();\n+\n+\t\t\/*\n+\t\t * Get ptr to the list of RTLs.\n+\t\t *\/\n+\t\tstd::list<RTL*>* getRTLs();\n+\n+\t\t\/*\n+\t\t * Get the set of in edges.\n+\t\t *\/\n+\t\tstd::vector<PBB>& getInEdges();\n+\n+\t\tint\t\t\tgetNumInEdges() { return m_iNumInEdges; }\n+\n+\t\t\/*\n+\t\t * Get the set of out edges.\n+\t\t *\/\n+\t\tstd::vector<PBB>& getOutEdges();\n+\n+\t\t\/*\n+\t\t * Set an in edge to a new value; same number of in edges as before\n+\t\t *\/\n+\t\tvoid\t\tsetInEdge(int i, PBB newIn);\n+\n+\t\t\/*\n+\t\t * Set an out edge to a new value; same number of out edges as before\n+\t\t *\/\n+\t\tvoid\t\tsetOutEdge(int i, PBB newInEdge);\n+\n+\t\t\/*\n+\t\t * Get the n-th out edge or 0 if it does not exist\n+\t\t *\/\n+\t\tPBB\t\t\tgetOutEdge(unsigned int i);\n+\n+\t\tint\t\t\tgetNumOutEdges() { return m_iNumOutEdges; }\n+\n+\t\t\/*\n+\t\t * Get the index of my in-edges is BB pred\n+\t\t *\/\n+\t\tint\t\t\twhichPred(PBB pred);\n+\n+\t\t\/*\n+\t\t * Add an in-edge\n+\t\t *\/\n+\t\tvoid\t\taddInEdge(PBB newInEdge);\n+\t\tvoid\t\tdeleteEdge(PBB edge);\n+\n+\t\t\/*\n+\t\t * Delete an in-edge\n+\t\t *\/\n+\t\tvoid\t\tdeleteInEdge(std::vector<PBB>::iterator& it);\n+\t\tvoid\t\tdeleteInEdge(PBB edge);\n+\n+\t\t\/*\n+\t\t * If this is a call BB, find the fixed destination (if any). Returns -1 otherwise\n+\t\t *\/\n+\t\tADDRESS\t\tgetCallDest();\n+\t\tProc\t\t*getCallDestProc();\n+\n+\t\t\/*\n+\t\t * Traverse this node and recurse on its children in a depth first manner.\n+\t\t * Records the times at which this node was first visited and last visited.\n+\t\t * Returns the number of nodes traversed.\n+\t\t *\/\n+\t\tunsigned\tDFTOrder(int& first, int& last);\n+\n+\t\t\/*\n+\t\t * Traverse this node and recurse on its parents in a reverse depth first manner.\n+\t\t * Records the times at which this node was first visited and last visited.\n+\t\t * Returns the number of nodes traversed.\n+\t\t *\/\n+\t\tunsigned\tRevDFTOrder(int& first, int& last);\n+\n+\t\t\/*\n+\t\t * Static comparison function that returns true if the first BB has an address less than the second BB.\n+\t\t *\/\n+static bool\t\t\tlessAddress(PBB bb1, PBB bb2);\n+\n+\t\t\/*\n+\t\t * Static comparison function that returns true if the first BB has an DFT first number less than the second BB.\n+\t\t *\/\n+static bool\t\t\tlessFirstDFT(PBB bb1, PBB bb2);\n+\n+\t\t\/*\n+\t\t * Static comparison function that returns true if the first BB has an DFT last less than the second BB.\n+\t\t *\/\n+static bool\t\t\tlessLastDFT(PBB bb1, PBB bb2);\n+\n+\t\t\/*\n+\t\t * Resets the DFA sets of this BB.\n+\t\t *\/\n+\t\tvoid\t\tresetDFASets();\n+\n+\t\t\/* get the condition *\/\n+\t\tExp\t\t\t*getCond();\n+\n+\t\t\/* set the condition *\/\n+\t\tvoid\t\tsetCond(Exp *e);\n+\n+\t\t\/* Get the destination expression, if any *\/\n+\t\tExp*\t\tgetDest();\n+\n+\t\t\/* Check if there is a jump if equals relation *\/\n+\t\tbool\t\tisJmpZ(PBB dest);\n+\n+\t\t\/* get the loop body *\/\n+\t\tBasicBlock\t*getLoopBody();\n+\n+\t\t\/* Simplify all the expressions in this BB\n+\t\t *\/\n+\t\tvoid\t\tsimplify();\n+\n+\n+\t\t\/*\n+\t\t *\tgiven an address, returns the outedge which corresponds to that address or 0 if there was no such outedge\n+\t\t *\/\n+\n+\t\tPBB\t\t\tgetCorrectOutEdge(ADDRESS a);\n+\t\t\n+\t\t\/*\n+\t\t * Depth first traversal of all bbs, numbering as we go and as we come back, forward and reverse passes.\n+\t\t * Use Cfg::establishDFTOrder() and CFG::establishRevDFTOrder to create these values.\n+\t\t *\/\n+\t\tint\t\t\tm_DFTfirst;\t\t \/\/ depth-first traversal first visit\n+\t\tint\t\t\tm_DFTlast;\t\t \/\/ depth-first traversal last visit\n+\t\tint\t\t\tm_DFTrevfirst;\t \/\/ reverse depth-first traversal first visit\n+\t\tint\t\t\tm_DFTrevlast;\t \/\/ reverse depth-first traversal last visit\n+\n+private:\n+\t\t\/*\n+\t\t * Constructor. Called by Cfg::NewBB.\n+\t\t *\/\n+\t\t\t\t\tBasicBlock(std::list<RTL*>* pRtls, BBTYPE bbType, int iNumOutEdges);\n+\n+\t\t\/*\n+\t\t * Sets the RTLs for this BB. This is the only place that\n+\t\t * the RTLs for a block must be set as we need to add the back\n+\t\t * link for a call instruction to its enclosing BB.\n+\t\t *\/\n+\t\tvoid\t\tsetRTLs(std::list<RTL*>* rtls);\n+\n+public:\n+\n+\t\t\/\/ code generation\n+\t\tvoid\t\tgenerateBodyCode(HLLCode &hll, bool dup = false);\n+\n+\/* high level structuring *\/\n+\t\tSBBTYPE\t\tm_structType;\t\/\/ structured type of this node\n+\t\tSBBTYPE\t\tm_loopCondType; \/\/ type of conditional to treat this loop header as (if any)\n+\t\tPBB\t\t\tm_loopHead;\t\t\/\/ head of the most nested enclosing loop\n+\t\tPBB\t\t\tm_caseHead;\t\t\/\/ head of the most nested enclosing case\n+\t\tPBB\t\t\tm_condFollow;\t\/\/ follow of a conditional header\n+\t\tPBB\t\t\tm_loopFollow;\t\/\/ follow of a loop header\n+\t\tPBB\t\t\tm_latchNode;\t\/\/ latch node of a loop header\t\n+\n+protected:\n+\/* general basic block information *\/\n+\t\tBBTYPE\t\tm_nodeType;\t\t\/\/ type of basic block\n+\t\tstd::list<RTL*>* m_pRtls;\t\/\/ Ptr to list of RTLs\n+\t\tint\t\t\tm_iLabelNum;\t\/\/ Nonzero if start of BB needs label\n+\t\tstd::string\tm_labelStr;\t\t\/\/ string label of this bb.\n+\t\tbool\t\tm_labelneeded;\n+\t\tbool\t\tm_bIncomplete;\t\/\/ True if not yet complete\n+\t\tbool\t\tm_bJumpReqd;\t\/\/ True if jump required for \"fall through\"\n+\n+\/* in-edges and out-edges *\/\n+\t\tstd::vector<PBB> m_InEdges;\t\/\/ Vector of in-edges\n+\t\tstd::vector<PBB> m_OutEdges;\/\/ Vector of out-edges\n+\t\tint\t\t\tm_iNumInEdges;\t\/\/ We need these two because GCC doesn't\n+\t\tint\t\t\tm_iNumOutEdges;\t\/\/ support resize() of vectors!\n+\n+\/* for traversal *\/\n+\t\tbool\t\tm_iTraversed;\t\/\/ traversal marker\n+\n+\/* Liveness *\/\n+\t\tLocationSet\tliveIn;\t\t\t\/\/ Set of locations live at BB start\n+\n+public:\n+\n+\t\tbool\t\tisPostCall();\n+static void\t\t\tdoAvail(StatementSet& s, PBB inEdge);\n+\t\tProc*\t\tgetDestProc();\n+\n+\t\t\/**\n+\t\t * Get first\/next statement this BB\n+\t\t * Somewhat intricate because of the post call semantics; these funcs save a lot of duplicated, easily-bugged\n+\t\t * code\n+\t\t *\/\n+\t\ttypedef std::list<RTL*>::iterator rtlit;\n+\t\ttypedef std::list<RTL*>::reverse_iterator rtlrit;\n+\t\ttypedef std::list<Exp*>::iterator elit;\n+\t\tStatement*\tgetFirstStmt(rtlit& rit, StatementList::iterator& sit);\n+\t\tStatement*\tgetNextStmt(rtlit& rit, StatementList::iterator& sit);\n+\t\tStatement*\tgetLastStmt(rtlrit& rit, StatementList::reverse_iterator& sit);\n+\t\tStatement*\tgetPrevStmt(rtlrit& rit, StatementList::reverse_iterator& sit);\n+\t\tRTL*\t\tgetLastRtl() {return m_pRtls->back();}\n+\n+\t\t\/**\n+\t\t * Get the statement number for the first BB as a character array.\n+\t\t * If not possible (e.g. because the BB has no statements), return\n+\t\t * a unique string (e.g. bb8048c10)\n+\t\t *\/\n+\t\tchar*\t\tgetStmtNumber();\n+\n+protected:\n+\t\t\/* Control flow analysis stuff, lifted from Doug Simon's honours thesis.\n+\t\t *\/\n+\t\tint\t\t\tord;\t \/\/ node's position within the ordering structure\n+\t\tint\t\t\trevOrd;\t \/\/ position within ordering structure for the reverse graph\n+\t\tint\t\t\tinEdgesVisited; \/\/ counts the number of in edges visited during a DFS\n+\t\tint\t\t\tnumForwardInEdges; \/\/ inedges to this node that aren't back edges\n+\t\tint\t\t\tloopStamps[2], revLoopStamps[2]; \/\/ used for structuring analysis\n+\t\ttravType\ttraversed; \/\/ traversal flag for the numerous DFS's\n+\t\tbool\t\thllLabel; \/\/ emit a label for this node when generating HL code?\n+\t\tchar*\t\tlabelStr; \/\/ the high level label for this node (if needed)\n+\t\tint\t\t\tindentLevel; \/\/ the indentation level of this node in the final code\n+\n+\t\t\/\/ analysis information\n+\t\tPBB\t\t\timmPDom; \/\/ immediate post dominator\n+\t\tPBB\t\t\tloopHead; \/\/ head of the most nested enclosing loop\n+\t\tPBB\t\t\tcaseHead; \/\/ head of the most nested enclosing case\n+\t\tPBB\t\t\tcondFollow; \/\/ follow of a conditional header\n+\t\tPBB\t\t\tloopFollow; \/\/ follow of a loop header\n+\t\tPBB\t\t\tlatchNode; \/\/ latching node of a loop header\n+\n+\t\t\/\/ Structured type of the node\n+\t\tstructType\tsType; \/\/ the structuring class (Loop, Cond , etc)\n+\t\tunstructType usType; \/\/ the restructured type of a conditional header\n+\t\tloopType\tlType; \/\/ the loop type of a loop header\n+\t\tcondType\tcType; \/\/ the conditional type of a conditional header\n+\n+\t\tvoid\t\tsetLoopStamps(int &time, std::vector<PBB> &order);\n+\t\tvoid\t\tsetRevLoopStamps(int &time);\n+\t\tvoid\t\tsetRevOrder(std::vector<PBB> &order);\n+\n+\t\tvoid\t\tsetLoopHead(PBB head) { loopHead = head; }\n+\t\tPBB\t\t\tgetLoopHead() { return loopHead; }\n+\t\tvoid\t\tsetLatchNode(PBB latch) { latchNode = latch; }\n+\t\tbool\t\tisLatchNode() { return loopHead && loopHead->latchNode == this; }\n+\t\tPBB\t\t\tgetLatchNode() { return latchNode; }\n+\t\tPBB\t\t\tgetCaseHead() { return caseHead; }\n+\t\tvoid\t\tsetCaseHead(PBB head, PBB follow);\n+\n+\t\tstructType\tgetStructType() { return sType; }\n+\t\tvoid\t\tsetStructType(structType s);\n+\n+\t\tunstructType getUnstructType();\n+\t\tvoid\t\tsetUnstructType(unstructType us);\n+\n+\t\tloopType\tgetLoopType();\n+\t\tvoid\t\tsetLoopType(loopType l);\n+\n+\t\tcondType\tgetCondType();\n+\t\tvoid\t\tsetCondType(condType l);\n+\n+\t\tvoid\t\tsetLoopFollow(PBB other) { loopFollow = other; }\n+\t\tPBB\t\t\tgetLoopFollow() { return loopFollow; }\n+\n+\t\tvoid\t\tsetCondFollow(PBB other) { condFollow = other; }\n+\t\tPBB\t\t\tgetCondFollow() { return condFollow; }\n+\n+\t\t\/\/ establish if this bb has a back edge to the given destination\n+\t\tbool\t\thasBackEdgeTo(BasicBlock *dest);\n+\n+\t\t\/\/ establish if this bb has any back edges leading FROM it\n+\t\tbool \t\thasBackEdge() {\n+\t\t\t\t\t\tfor (unsigned int i = 0; i < m_OutEdges.size(); i++)\n+\t\t\t\t\t\t\tif (hasBackEdgeTo(m_OutEdges[i])) \n+\t\t\t\t\t\t\t\treturn true;\n+\t\t\t\t\t\treturn false;\n+\t\t\t\t\t}\n+\n+\t\t\/\/ establish if this bb is an ancestor of another BB\n+\t\tbool\t\tisAncestorOf(BasicBlock *other);\n+\n+\t\tbool\t\tinLoop(PBB header, PBB latch);\n+\n+\t\tbool\t\tisIn(std::list<PBB> &set, PBB bb) {\n+\t\t\t\t\t\tfor (std::list<PBB>::iterator it = set.begin(); it != set.end(); it++)\n+\t\t\t\t\t\t\tif (*it == bb) return true;\n+\t\t\t\t\t\treturn false;\n+\t\t\t\t\t}\n+\n+\t\tchar*\t\tindent(int indLevel, int extra = 0);\n+\t\tbool\t\tallParentsGenerated();\n+\t\tvoid\t\temitGotoAndLabel(HLLCode *hll, int indLevel, PBB dest);\n+\t\tvoid\t\tWriteBB(HLLCode *hll, int indLevel);\n+\n+public:\n+\t\tvoid\t\tgenerateCode(HLLCode *hll, int indLevel, PBB latch, std::list<PBB> &followSet,\n+\t\t\t\t\t\tstd::list<PBB> &gotoSet);\n+\t\t\/\/ For prepending phi functions\n+\t\tvoid\t\tprependStmt(Statement* s, UserProc* proc);\n+\n+\t\t\/\/ Liveness\n+\t\tbool\t\tcalcLiveness(igraph& ig, UserProc* proc);\n+\t\tvoid\t\tgetLiveOut(LocationSet& live, LocationSet& phiLocs);\n+\n+\t\t\/\/ Find indirect jumps and calls\n+\t\tbool\t\tdecodeIndirectJmp(UserProc* proc);\n+\t\tvoid\t\tprocessSwitch(UserProc* proc, SWITCH_INFO* swi);\n+\t\tint\t\t\tfindNumCases();\n+\n+\t\t\/*\n+\t\t * Change the BB enclosing stmt to be CALL, not COMPCALL\n+\t\t *\/\n+\t\tbool\t\tundoComputedBB(Statement* stmt);\n+\n+protected:\n+\t\tfriend class XMLProgParser;\n+\t\tvoid\t\taddOutEdge(PBB bb) { m_OutEdges.push_back(bb); }\n+\t\tvoid\t\taddRTL(RTL *rtl) {\n+\t\t\t\t\t\tif (m_pRtls == NULL) \n+\t\t\t\t\t\t\tm_pRtls = new std::list<RTL*>;\n+\t\t\t\t\t\tm_pRtls->push_back(rtl);\n+\t\t\t\t\t}\n+\t\tvoid\t\taddLiveIn(Location *e) { liveIn.insert(e); }\n+\n+};\t\t\/\/ class BasicBlock\n+\n+\n"} {"commit":"ad832154a1b88c72588a6937a4a8317b303bc859","subject":"Create filters.h","message":"Create filters.h","repos":"waps12b\/Implementation-of-fast-median-filter,waps12b\/Implementation-of-fast-median-filter","returncode":1,"stderr":"error: pathspec 'filters.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- filters.h\n+++ filters.h\n@@ -0,0 +1,76 @@\n+#include<algorithm>\n+#include<vector>\n+using namespace std;\n+\n+#ifndef __FILTERS_H__\n+#define __FILTERS_H__\n+typedef unsigned char byte;\n+class Image {\n+public:\n+\tint width;\n+\tint height;\n+\tvector<vector<byte> > bitmap;\n+\tImage(int height, int width) : height(height), width(width)\n+\t{\n+\t\tbitmap.resize(height, vector<byte>(width, 0));\n+\t}\n+\n+\tvoid addSaltAndPepperNoise();\n+\tvoid addGaussianNoise();\n+};\n+\n+class MedianFilter {\n+public:\n+\tint mKernelRadius;\n+\tMedianFilter(int kernelRadius) {\n+\t\tthis->mKernelRadius = kernelRadius;\n+\t}\n+\t\n+\n+public:\n+\tvirtual Image process(Image m) = 0;\n+};\n+\n+class BruteForceFilter : public MedianFilter {\n+public:\n+\tBruteForceFilter(int kernelRadius) : MedianFilter(kernelRadius)\n+\t{}\n+\tImage process(Image m);\n+};\n+\n+class BruteForceOptimizedFilter : public MedianFilter {\n+public:\n+\tBruteForceOptimizedFilter(int kernelRadius) : MedianFilter(kernelRadius)\n+\t{}\n+\tImage process(Image m);\n+};\n+\n+class HuangsFilter : public MedianFilter {\n+public:\n+\tHuangsFilter(int kernelRadius) : MedianFilter(kernelRadius)\n+\t{}\n+\tImage process(Image m);\n+};\n+\n+class ProposedFilter :public MedianFilter {\n+public:\n+\tProposedFilter(int kernelRadius) : MedianFilter(kernelRadius)\n+\t{}\n+\tImage process(Image m);\n+};\n+\n+\n+\n+class ProposedOptimizedV1Filter : public MedianFilter {\n+public:\n+\tProposedOptimizedV1Filter(int kernelRadius) : MedianFilter(kernelRadius)\n+\t{}\n+\tImage process(Image m);\n+};\n+\n+\n+\n+\n+\n+\n+#endif\n"} {"commit":"aa662903d48e098a56e5fd324b9b9b8017123d46","subject":"There was a variable declaration after a statement","message":"There was a variable declaration after a statement\n","repos":"mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/can_driver.h\n+++ include\/can_driver.h\n@@ -57,8 +57,9 @@\n static inline void print_message(Message *m)\n {\n int i;\n+ UNS8 fc;\n printf(\"id:%02x \", m->cob_id.w & 0x7F);\n- UNS8 fc = m->cob_id.w >> 7;\n+ fc = m->cob_id.w >> 7;\n switch(fc)\n {\n case SYNC: \n"} {"commit":"c06ab5f5e05c5a7f7e9c41504b5ae722eb572671","subject":"moving ctype.h and stdio.h includes after u.h include for plan9 (issue 47)","message":"moving ctype.h and stdio.h includes after u.h include for plan9 (issue 47)\n","repos":"spurious\/chibi-scheme-mirror,spurious\/chibi-scheme-mirror,spurious\/chibi-scheme-mirror","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/chibi\/sexp.h\n+++ include\/chibi\/sexp.h\n@@ -13,9 +13,6 @@\n \n #include \"chibi\/features.h\"\n #include \"chibi\/install.h\"\n-\n-#include <ctype.h>\n-#include <stdio.h>\n \n #if SEXP_USE_DL\n #ifndef __MINGW32__\n@@ -39,6 +36,9 @@\n #include <sys\/stat.h>\n #include <math.h>\n #endif\n+\n+#include <ctype.h>\n+#include <stdio.h>\n \n \/* tagging system\n * bits end in 00: pointer\n"} {"commit":"830b01627664351392cc38ce2bbd5be35b996698","subject":"removing declarations for sexp_display, now implemented in scheme","message":"removing declarations for sexp_display, now implemented in scheme\n\nFixes issue #275.\n","repos":"holmescn\/chibi-scheme,holmescn\/chibi-scheme,holmescn\/chibi-scheme,norton\/chibi-scheme,holmescn\/chibi-scheme,holmescn\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/chibi\/sexp.h\n+++ include\/chibi\/sexp.h\n@@ -1421,7 +1421,6 @@\n SEXP_API sexp sexp_make_cpointer (sexp ctx, sexp_uint_t type_id, void* value, sexp parent, int freep);\n SEXP_API int sexp_is_separator(int c);\n SEXP_API sexp sexp_write_op (sexp ctx, sexp self, sexp_sint_t n, sexp obj, sexp out);\n-SEXP_API sexp sexp_display_op (sexp ctx, sexp self, sexp_sint_t n, sexp obj, sexp out);\n SEXP_API sexp sexp_flush_output_op (sexp ctx, sexp self, sexp_sint_t n, sexp out);\n SEXP_API sexp sexp_read_string (sexp ctx, sexp in, int sentinel);\n SEXP_API sexp sexp_read_symbol (sexp ctx, sexp in, int init, int internp);\n@@ -1589,7 +1588,6 @@\n \n #define sexp_read(ctx, in) sexp_read_op(ctx, NULL, 1, in)\n #define sexp_write(ctx, obj, out) sexp_write_op(ctx, NULL, 2, obj, out)\n-#define sexp_display(ctx, obj, out) sexp_display_op(ctx, NULL, 2, obj, out)\n #define sexp_print_exception(ctx, e, out) sexp_print_exception_op(ctx, NULL, 2, e, out)\n #define sexp_flush_output(ctx, out) sexp_flush_output_op(ctx, NULL, 1, out)\n #define sexp_equalp(ctx, a, b) sexp_equalp_op(ctx, NULL, 2, a, b)\n"} {"commit":"ff6c429612b8a4250f9b6a28a4e5660f44a1480b","subject":"Bug#43397 mysql headers redefine pthread_mutex_init unnecessarily","message":"Bug#43397 mysql headers redefine pthread_mutex_init \nunnecessarily\n\nChanging an instance of the define that was missed\nin the original commit due to the fact that it was\nmisspelled.","repos":"flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,slanterns\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/config-win.h\n+++ include\/config-win.h\n@@ -160,7 +160,7 @@\n #define isnan(X) _isnan(X)\n #define finite(X) _finite(X)\n \n-#ifndef UNDEF_THREAD_HACK\n+#ifndef MYSQL_CLIENT_NO_THREADS\n #define THREAD\n #endif\n #define VOID_SIGHANDLER\n"} {"commit":"f8bc9bd1b6f74038338c841367b42ccaa68d760b","subject":"Fix for bug#15209: MySQL installation problem on Windows ME.","message":"Fix for bug#15209: MySQL installation problem on Windows ME.\n\n\ninclude\/config-win.h:\n Fix for bug#15209: MySQL installation problem on Windows ME.\n - set FILE_SHARE_DELETE to 0 as it's not implemented on Win98\/ME (my_sopen() fails)\n","repos":"davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,slanterns\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/config-win.h\n+++ include\/config-win.h\n@@ -325,6 +325,11 @@\n #define HAVE_SETFILEPOINTER\n #define HAVE_VIO_READ_BUFF\n \n+#ifndef __NT__\n+#undef FILE_SHARE_DELETE\n+#define FILE_SHARE_DELETE 0 \/* Not implemented on Win 98\/ME *\/\n+#endif\n+\n #ifdef NOT_USED\n #define HAVE_SNPRINTF\t\t\/* Gave link error *\/\n #define _snprintf snprintf\n"} {"commit":"d4cff8bb059f9cf74c8580444b3ca771de0500c7","subject":"No need to qualify ::create()","message":"No need to qualify ::create()\n","repos":"tm604\/cps-future,tm604\/cps-future","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cps\/future.h\n+++ include\/cps\/future.h\n@@ -210,11 +210,11 @@\n \tstatic\n \tfuture::ptr\n \trepeat(std::function<bool(future::ptr)> check, std::function<future::ptr(future::ptr)> each) {\n-\t\tauto f = future::create();\n+\t\tauto f = create();\n \t\t\/\/ Keep f around until it's finished\n \t\tf->on_ready([f](ptr in) { });\n \n-\t\tauto next = future::create();\n+\t\tauto next = create();\n \t\tnext->done();\n \t\tstd::shared_ptr<std::function<future::ptr(future::ptr)>> code = std::make_shared<std::function<future::ptr(future::ptr)>>([f, check, code, each] (future::ptr in) mutable -> future::ptr {\n #if FUTURE_TRACE\n@@ -262,12 +262,12 @@\n \t\tTRACE << \"Calling next\";\n #endif\n \t\tnext = (*code)(next);\n-\t\tf->on_ready([code](future::ptr) -> future::ptr { return future::create()->done(); });\n+\t\tf->on_ready([code](future::ptr) -> future::ptr { return create()->done(); });\n \t\treturn f;\n \t}\n \n \tstatic ptr needs_all(std::vector<ptr> pending) {\n-\t\tauto f = future::create();\n+\t\tauto f = create();\n \t\tauto count = std::make_shared<std::atomic<int>>();\n \t\tauto p = std::make_shared<std::vector<ptr>>(std::move(pending));\n \t\t*count = pending.size();\n@@ -353,7 +353,7 @@\n \t\t}\n \t}\n \n-\tstatic ptr complete_future() { auto f = future::create(); f->done(); return f; }\n+\tstatic ptr complete_future() { auto f = create(); f->done(); return f; }\n \n \tptr then(seq ok) {\n \t\tauto self = shared_from_this();\n"} {"commit":"49aa50f22affef71c1c5401fcff5d14b32d028b9","subject":"Key handling","message":"Key handling\n","repos":"jacereda\/libaw,jacereda\/libaw,jacereda\/libaw,jacereda\/libaw","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- awandroid.c\n+++ awandroid.c\n@@ -29,17 +29,152 @@\n static EGLDisplay g_dpy;\n static struct android_app* g_app;\n \n+\n+static int kc2aw(int kc) {\n+\tint ret;\n+\tswitch (kc) {\n+\/\/\tcase AKEYCODE_SOFT_LEFT: ret = ; break;\n+\/\/\tcase AKEYCODE_SOFT_RIGHT: ret = ; break;\n+\tcase AKEYCODE_HOME: ret = AW_KEY_HOME; break;\n+\/\/\tcase AKEYCODE_BACK: ret = ; break;\n+\/\/\tcase AKEYCODE_CALL: ret = ; break;\n+\/\/\tcase AKEYCODE_ENDCALL: ret = ; break;\n+\tcase AKEYCODE_0: ret = AW_KEY_0; break;\n+\tcase AKEYCODE_1: ret = AW_KEY_1; break;\n+\tcase AKEYCODE_2: ret = AW_KEY_2; break;\n+\tcase AKEYCODE_3: ret = AW_KEY_3; break;\n+\tcase AKEYCODE_4: ret = AW_KEY_4; break;\n+\tcase AKEYCODE_5: ret = AW_KEY_5; break;\n+\tcase AKEYCODE_6: ret = AW_KEY_6; break;\n+\tcase AKEYCODE_7: ret = AW_KEY_7; break;\n+\tcase AKEYCODE_8: ret = AW_KEY_8; break;\n+\tcase AKEYCODE_9: ret = AW_KEY_9; break;\n+\tcase AKEYCODE_STAR: ret = AW_KEY_KEYPADMULTIPLY; break;\n+\/\/\tcase AKEYCODE_POUND: ret = AW_KEY_; break;\n+\tcase AKEYCODE_DPAD_UP: ret = AW_KEY_UPARROW; break;\n+\tcase AKEYCODE_DPAD_DOWN: ret = AW_KEY_DOWNARROW; break;\n+\tcase AKEYCODE_DPAD_LEFT: ret = AW_KEY_LEFTARROW; break;\n+\tcase AKEYCODE_DPAD_RIGHT: ret = AW_KEY_RIGHTARROW; break;\n+\tcase AKEYCODE_DPAD_CENTER: ret = AW_KEY_CENTER; break;\n+\tcase AKEYCODE_VOLUME_UP: ret = AW_KEY_VOLUMEUP; break;\n+\tcase AKEYCODE_VOLUME_DOWN: ret = AW_KEY_VOLUMEDOWN; break;\n+\/\/\tcase AKEYCODE_POWER: ret = AW_KEY_; break;\n+\tcase AKEYCODE_CAMERA: ret = AW_KEY_CAMERA; break;\n+\tcase AKEYCODE_CLEAR: ret = AW_KEY_KEYPADCLEAR; break;\n+\tcase AKEYCODE_A: ret = AW_KEY_A; break;\n+\tcase AKEYCODE_B: ret = AW_KEY_B; break;\n+\tcase AKEYCODE_C: ret = AW_KEY_C; break;\n+\tcase AKEYCODE_D: ret = AW_KEY_D; break;\n+\tcase AKEYCODE_E: ret = AW_KEY_E; break;\n+\tcase AKEYCODE_F: ret = AW_KEY_F; break;\n+\tcase AKEYCODE_G: ret = AW_KEY_G; break;\n+\tcase AKEYCODE_H: ret = AW_KEY_H; break;\n+\tcase AKEYCODE_I: ret = AW_KEY_I; break;\n+\tcase AKEYCODE_J: ret = AW_KEY_J; break;\n+\tcase AKEYCODE_K: ret = AW_KEY_K; break;\n+\tcase AKEYCODE_L: ret = AW_KEY_L; break;\n+\tcase AKEYCODE_M: ret = AW_KEY_M; break;\n+\tcase AKEYCODE_N: ret = AW_KEY_N; break;\n+\tcase AKEYCODE_O: ret = AW_KEY_O; break;\n+\tcase AKEYCODE_P: ret = AW_KEY_P; break;\n+\tcase AKEYCODE_Q: ret = AW_KEY_Q; break;\n+\tcase AKEYCODE_R: ret = AW_KEY_R; break;\n+\tcase AKEYCODE_S: ret = AW_KEY_S; break;\n+\tcase AKEYCODE_T: ret = AW_KEY_T; break;\n+\tcase AKEYCODE_U: ret = AW_KEY_U; break;\n+\tcase AKEYCODE_V: ret = AW_KEY_V; break;\n+\tcase AKEYCODE_W: ret = AW_KEY_W; break;\n+\tcase AKEYCODE_X: ret = AW_KEY_X; break;\n+\tcase AKEYCODE_Y: ret = AW_KEY_Y; break;\n+\tcase AKEYCODE_Z: ret = AW_KEY_Z; break;\n+\tcase AKEYCODE_COMMA: ret = AW_KEY_COMMA; break;\n+\tcase AKEYCODE_PERIOD: ret = AW_KEY_PERIOD; break;\n+\tcase AKEYCODE_ALT_LEFT: ret = AW_KEY_OPTION; break;\n+\tcase AKEYCODE_ALT_RIGHT: ret = AW_KEY_RIGHTOPTION; break;\n+\tcase AKEYCODE_SHIFT_LEFT: ret = AW_KEY_SHIFT; break;\n+\tcase AKEYCODE_SHIFT_RIGHT: ret = AW_KEY_RIGHTSHIFT; break;\n+\tcase AKEYCODE_TAB: ret = AW_KEY_TAB; break;\n+\tcase AKEYCODE_SPACE: ret = AW_KEY_SPACE; break;\n+\tcase AKEYCODE_SYM: ret = AW_KEY_SYM; break;\n+\/\/\tcase AKEYCODE_EXPLORER: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_ENVELOPE: ret = AW_KEY_; break;\n+\tcase AKEYCODE_ENTER: ret = AW_KEY_RETURN; break;\n+\tcase AKEYCODE_DEL: ret = AW_KEY_DELETE; break;\n+\tcase AKEYCODE_GRAVE: ret = AW_KEY_GRAVE; break;\n+\tcase AKEYCODE_MINUS: ret = AW_KEY_MINUS; break;\n+\tcase AKEYCODE_EQUALS: ret = AW_KEY_EQUAL; break;\n+\tcase AKEYCODE_LEFT_BRACKET: ret = AW_KEY_LEFTBRACKET; break;\n+\tcase AKEYCODE_RIGHT_BRACKET: ret = AW_KEY_RIGHTBRACKET; break;\n+\tcase AKEYCODE_BACKSLASH: ret = AW_KEY_BACKSLASH; break;\n+\tcase AKEYCODE_SEMICOLON: ret = AW_KEY_SEMICOLON; break;\n+\tcase AKEYCODE_APOSTROPHE: ret = AW_KEY_QUOTE; break;\n+\tcase AKEYCODE_SLASH: ret = AW_KEY_SLASH; break;\n+\/\/\tcase AKEYCODE_AT: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_NUM: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_HEADSETHOOK: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_FOCUS: ret = AW_KEY_; break;\n+\tcase AKEYCODE_PLUS: ret = AW_KEY_KEYPADPLUS; break;\n+\/\/\tcase AKEYCODE_MENU: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_NOTIFICATION: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_SEARCH: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_PLAY_PAUSE: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_STOP: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_NEXT: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_PREVIOUS: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_REWIND: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_MEDIA_FAST_FORWARD: ret = AW_KEY_; break;\n+\tcase AKEYCODE_MUTE: ret = AW_KEY_MUTE; break;\n+\tcase AKEYCODE_PAGE_UP: ret = AW_KEY_PAGEUP; break;\n+\tcase AKEYCODE_PAGE_DOWN: ret = AW_KEY_PAGEDOWN; break;\n+\/\/\tcase AKEYCODE_PICTSYMBOLS: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_SWITCH_CHARSET: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_A: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_B: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_C: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_X: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_Y: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_Z: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_L1: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_R1: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_L2: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_R2: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_THUMBL: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_THUMBR: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_START: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_SELECT: ret = AW_KEY_; break;\n+\/\/\tcase AKEYCODE_BUTTON_MODE: ret = AW_KEY_; break;\n+\tdefault:\n+\t\tret = AW_KEY_NONE;\n+\t}\n+\treturn ret;\n+}\n+\n static int32_t input(struct android_app * app, AInputEvent * e) {\n \taw * w = (aw*)app->userData;\n \tint handled = 1;\n+\tint kc;\n+\tint awkc;\n+\tint action;\n \tif (w) switch (AInputEvent_getType(e)) {\n-\tcase AINPUT_EVENT_TYPE_MOTION:\n-\t\tgot(w, AW_EVENT_MOTION, \n-\t\t AMotionEvent_getX(e, 0), AMotionEvent_getY(e, 0));\n-\t\tbreak;\n-\tdefault:\n-\t\thandled = 0;\n-\t}\n+\t\tcase AINPUT_EVENT_TYPE_KEY:\n+\t\t\tkc = AKeyEvent_getKeyCode(e);\n+\t\t\taction = AKeyEvent_getAction(e);\n+\t\t\tawkc = kc2aw(kc);\n+\t\t\thandled = kc != AW_KEY_NONE;\n+\t\t\tif (handled) {\n+\t\t\t\tif (action == AKEY_EVENT_ACTION_DOWN)\n+\t\t\t\t\tgot(w, AW_EVENT_DOWN, awkc, 0);\n+\t\t\t\tif (action == AKEY_EVENT_ACTION_UP)\n+\t\t\t\t\tgot(w, AW_EVENT_UP, awkc, 0);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase AINPUT_EVENT_TYPE_MOTION:\n+\t\t\tgot(w, AW_EVENT_MOTION, \n+\t\t\t AMotionEvent_getX(e, 0), AMotionEvent_getY(e, 0));\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\thandled = 0;\n+\t\t}\n \treturn handled;\n }\n \n"} {"commit":"4b01aa766ce0d3b25ddfa5f9b2d5db88569c522b","subject":"Seems like we might want std::move here?","message":"Seems like we might want std::move here?\n","repos":"tm604\/cps-future,tm604\/cps-future","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cps\/future.h\n+++ include\/cps\/future.h\n@@ -78,10 +78,14 @@\n \n \t\/**\n \t * Move constructor with locking semantics.\n+\t * @param src source future to move from\n \t *\/\n \tfuture(\n \t\tfuture<T> &&src\n-\t):future(src, std::lock_guard<std::mutex>(src.mutex_))\n+\t):future(\n+\t\tstd::move(src),\n+\t\tstd::lock_guard<std::mutex>(src.mutex_)\n+\t )\n \t{\n \t}\n \n"} {"commit":"7712027a1c5dbee0978687e4d6cd10c8aaac11db","subject":"Made the empty constructor for csSet::GlobalIterator public.","message":"Made the empty constructor for csSet::GlobalIterator public.\n\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@37162 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/csutil\/set.h\n+++ include\/csutil\/set.h\n@@ -50,12 +50,12 @@\n {\n protected:\n ParentIter iter;\n- GlobalIterator () {}\n GlobalIterator (const csSet<T>* s) : iter(s->map.GetIterator()) {}\n \n public:\n friend class csSet<T>;\n \n+ GlobalIterator () : iter() {}\n GlobalIterator (const GlobalIterator& o) : iter(o.iter) {}\n GlobalIterator& operator=(const GlobalIterator& o)\n { iter = o.iter; return *this; }\n"} {"commit":"ca08aca9a333864c18b1b6108321d94243f5a84c","subject":"lib: Remove old FIXME","message":"lib: Remove old FIXME\n\nSeems to work correctly now, at least the test suite still\npasses correctly.\n","repos":"MathieuDuponchelle\/totem-pl-parser,MathieuDuponchelle\/totem-pl-parser,pwithnall\/totem-pl-parser,pwithnall\/totem-pl-parser,MathieuDuponchelle\/totem-pl-parser,MathieuDuponchelle\/totem-pl-parser","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plparse\/totem-pl-parser-wm.c\n+++ plparse\/totem-pl-parser-wm.c\n@@ -308,7 +308,6 @@\n \treturn retval;\n }\n \n-\/\/FIXME the retval is completely wrong\n static gboolean\n parse_asx_entries (TotemPlParser *parser, const char *uri, GFile *base_file, xml_node_t *parent, TotemPlParseData *parse_data)\n {\n"} {"commit":"17e93f4449fda3115b75896b156cbd6a49ac0026","subject":"Bump version number to 0.5.0","message":"Bump version number to 0.5.0\n","repos":"kyllingstad\/coral,kyllingstad\/coral,viproma\/coral","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/dsb\/config.h\n+++ include\/dsb\/config.h\n@@ -13,7 +13,7 @@\n \n \/\/ Version number\n #define DSB_VERSION_MAJOR 0\n-#define DSB_VERSION_MINOR 4\n+#define DSB_VERSION_MINOR 5\n #define DSB_VERSION_PATCH 0\n \n #define DSB_VERSION_STRINGIFY(a, b, c) #a \".\" #b \".\" #c\n"} {"commit":"22798e1454855b4219a2e7c9dc5f1e6071bebfd2","subject":"Fix duplicate function","message":"Fix duplicate function\n","repos":"ETLCPP\/etl,ETLCPP\/etl,ETLCPP\/etl,ETLCPP\/etl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/etl\/memory.h\n+++ include\/etl\/memory.h\n@@ -1351,13 +1351,6 @@\n {\n }\n #endif\n-\n- template <typename U, typename E>\n- unique_ptr(unique_ptr<U, E>&& u) ETL_NOEXCEPT\n- : p(u.release())\n- , deleter(etl::forward<E>(u.get_deleter()))\n- {\n- }\n \n \/\/*********************************\n ~unique_ptr()\n"} {"commit":"c3e27179e191c91867114d4739d7185030456856","subject":"Added 'yaml-cpp: ' to the exception messages","message":"Added 'yaml-cpp: ' to the exception messages\n","repos":"Astron\/yaml-cpp,Astron\/yaml-cpp,gradecam\/yaml-cpp,Astron\/yaml-cpp,bref\/yaml-cpp,oftc\/yaml-cpp,vadz\/yaml-cpp,oftc\/yaml-cpp,gradecam\/yaml-cpp,gradecam\/yaml-cpp,gradecam\/yaml-cpp,oftc\/yaml-cpp,nebirhos\/yaml-cpp,nebirhos\/yaml-cpp,bref\/yaml-cpp,vadz\/yaml-cpp,Astron\/yaml-cpp,vadz\/yaml-cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/exceptions.h\n+++ include\/exceptions.h\n@@ -68,7 +68,7 @@\n \t\tException(const Mark& mark_, const std::string& msg_)\n \t\t\t: mark(mark_), msg(msg_) {\n \t\t\t\tstd::stringstream output;\n-\t\t\t\toutput << \"Error at line \" << mark.line+1 << \", column \" << mark.column+1 << \": \" << msg;\n+\t\t\t\toutput << \"yaml-cpp: error at line \" << mark.line+1 << \", column \" << mark.column+1 << \": \" << msg;\n \t\t\t\twhat_ = output.str();\n \t\t\t}\n \t\tvirtual ~Exception() throw() {}\n"} {"commit":"8f719d6f8baee9ca35ea33a85883c464f3e70410","subject":"Fix in m3u8tompd conversion (when the last segment has a different size than the others, that last value was used).","message":"Fix in m3u8tompd conversion (when the last segment has a different size than the others, that last value was used).","repos":"DmitrySigaev\/gpac-sf,DmitrySigaev\/gpac-sf,DmitrySigaev\/gpac-sf,DmitrySigaev\/gpac-sf,DmitrySigaev\/gpac-sf,DmitrySigaev\/gpac-sf","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/m3u8.c\n+++ src\/media_tools\/m3u8.c\n@@ -695,8 +695,13 @@\n \t\t\t\t\tcurrentPlayList->element.playlist.target_duration = attribs.targetDurationInSeconds;\n \t\t\t\t\tcurrentPlayList->durationInfo = attribs.targetDurationInSeconds;\n \t\t\t\t}\n-\t\t\t\tif (attribs.durationInSeconds) {\n-\t\t\t\t\tcurrentPlayList->durationInfo = attribs.durationInSeconds;\n+\t\t\t\tif (attribs.durationInSeconds) {\t\t\t\t\t\n+\t\t\t\t\tif (currentPlayList->durationInfo == 0) {\n+\t\t\t\t\t\t\/* we set the playlist duration info as the duration of a segment, only if it's not set\n+\t\t\t\t\t\t There are cases of playlist with the last segment with a duration different from the others \n+\t\t\t\t\t\t (example: Apple bipbop test)*\/\t\t\t\t \n+\t\t\t\t\t\tcurrentPlayList->durationInfo = attribs.durationInSeconds;\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\tcurrentPlayList->element.playlist.mediaSequenceMin = attribs.minMediaSequence;\n \t\t\t\tcurrentPlayList->element.playlist.mediaSequenceMax = attribs.currentMediaSequence++;\n"} {"commit":"24924128e32fba8011037e21454426458f99d13b","subject":"Fix a link error in gcc8 (#1548)","message":"Fix a link error in gcc8 (#1548)\n","repos":"cppformat\/cppformat,cppformat\/cppformat,alabuzhev\/fmt,cppformat\/cppformat,alabuzhev\/fmt,alabuzhev\/fmt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/fmt\/format.h\n+++ include\/fmt\/format.h\n@@ -312,7 +312,7 @@\n using type = decltype(test<It>(typename iterator_category<It>::type{}));\n \n public:\n- static const bool value = !std::is_const<remove_reference_t<type>>::value;\n+ enum { value = !std::is_const<remove_reference_t<type>>::value };\n };\n \n \/\/ A workaround for std::string not having mutable data() until C++17.\n"} {"commit":"81f957a3c5810b660337c892ac417e865be0c326","subject":"memcached-client: use abort_response_header() in abort()","message":"memcached-client: use abort_response_header() in abort()\n\nInstead of memcached_connection_close(). Don't reset state to\nREAD_END.\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/memcached-client.c\n+++ src\/memcached-client.c\n@@ -608,12 +608,7 @@\n client->response.read_state == READ_EXTRAS ||\n client->response.read_state == READ_KEY);\n \n- \/* by setting the state to READ_END, we bar\n- memcached_client_request_close() from invoking the \"abort\"\n- callback *\/\n- client->response.read_state = READ_END;\n-\n- memcached_connection_close(client);\n+ memcached_connection_abort_response_header(client);\n }\n \n static const struct async_operation_class memcached_client_async_operation = {\n"} {"commit":"7ca89bf87a2dce05810471f1c7b1c0349ef9f432","subject":"Reduce template bloat in write_int","message":"Reduce template bloat in write_int\n","repos":"cppformat\/cppformat,cppformat\/cppformat,alabuzhev\/fmt,cppformat\/cppformat,alabuzhev\/fmt,alabuzhev\/fmt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/fmt\/format.h\n+++ include\/fmt\/format.h\n@@ -1413,6 +1413,33 @@\n return write_padded(out, specs, size, size, f);\n }\n \n+template <typename Char> struct write_int_params {\n+ std::size_t size;\n+ std::size_t padding;\n+ Char fill;\n+};\n+\n+template <typename Char>\n+write_int_params<Char> make_write_int_params(int num_digits, string_view prefix,\n+ basic_format_specs<Char>& specs) {\n+ std::size_t size = prefix.size() + to_unsigned(num_digits);\n+ Char fill = specs.fill[0];\n+ std::size_t padding = 0;\n+ if (specs.align == align::numeric) {\n+ auto width = to_unsigned(specs.width);\n+ if (width > size) {\n+ padding = width - size;\n+ size = width;\n+ }\n+ } else if (specs.precision > num_digits) {\n+ size = prefix.size() + to_unsigned(specs.precision);\n+ padding = to_unsigned(specs.precision - num_digits);\n+ fill = static_cast<Char>('0');\n+ }\n+ if (specs.align == align::none) specs.align = align::right;\n+ return {size, padding, fill};\n+}\n+\n \/\/ This template provides operations for formatting and writing data into a\n \/\/ character range.\n template <typename Range> class basic_writer {\n@@ -1436,25 +1463,11 @@\n \/\/ where <digits> are written by f(it).\n template <typename F>\n void write_int(int num_digits, string_view prefix, format_specs specs, F f) {\n- std::size_t size = prefix.size() + to_unsigned(num_digits);\n- char_type fill = specs.fill[0];\n- std::size_t padding = 0;\n- if (specs.align == align::numeric) {\n- auto unsiged_width = to_unsigned(specs.width);\n- if (unsiged_width > size) {\n- padding = unsiged_width - size;\n- size = unsiged_width;\n- }\n- } else if (specs.precision > num_digits) {\n- size = prefix.size() + to_unsigned(specs.precision);\n- padding = to_unsigned(specs.precision - num_digits);\n- fill = static_cast<char_type>('0');\n- }\n- if (specs.align == align::none) specs.align = align::right;\n- out_ = write_padded(out_, specs, size, [=](reserve_iterator it) {\n+ auto params = make_write_int_params(num_digits, prefix, specs);\n+ out_ = write_padded(out_, specs, params.size, [=](reserve_iterator it) {\n if (prefix.size() != 0)\n it = copy_str<char_type>(prefix.begin(), prefix.end(), it);\n- it = std::fill_n(it, padding, fill);\n+ it = std::fill_n(it, params.padding, params.fill);\n f(it);\n return it;\n });\n"} {"commit":"0e914372fb28d5defd3916e8c843455d1b31133b","subject":"Avoid conflict with the macro CHAR_WIDTH","message":"Avoid conflict with the macro CHAR_WIDTH\n\nIt looks like CHAR_WIDTH is a macro in glibc. See\nhttps:\/\/sourceware.org\/ml\/libc-alpha\/2016-09\/msg00225.html\n","repos":"cppformat\/cppformat,cppformat\/cppformat,alabuzhev\/fmt,alabuzhev\/fmt,alabuzhev\/fmt,cppformat\/cppformat","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/fmt\/format.h\n+++ include\/fmt\/format.h\n@@ -1983,21 +1983,21 @@\n using pointer_type = typename basic_writer<Char>::pointer_type;\n Char fill = internal::char_traits<Char>::cast(specs_.fill());\n pointer_type out = pointer_type();\n- const unsigned CHAR_WIDTH = 1;\n- if (specs_.width_ > CHAR_WIDTH) {\n+ const unsigned character_width = 1;\n+ if (specs_.width_ > character_width) {\n out = writer_.grow_buffer(specs_.width_);\n if (specs_.align_ == ALIGN_RIGHT) {\n- std::uninitialized_fill_n(out, specs_.width_ - CHAR_WIDTH, fill);\n- out += specs_.width_ - CHAR_WIDTH;\n+ std::uninitialized_fill_n(out, specs_.width_ - character_width, fill);\n+ out += specs_.width_ - character_width;\n } else if (specs_.align_ == ALIGN_CENTER) {\n out = writer_.fill_padding(out, specs_.width_,\n- internal::const_check(CHAR_WIDTH), fill);\n+ internal::const_check(character_width), fill);\n } else {\n- std::uninitialized_fill_n(out + CHAR_WIDTH,\n- specs_.width_ - CHAR_WIDTH, fill);\n+ std::uninitialized_fill_n(out + character_width,\n+ specs_.width_ - character_width, fill);\n }\n } else {\n- out = writer_.grow_buffer(CHAR_WIDTH);\n+ out = writer_.grow_buffer(character_width);\n }\n *out = internal::char_traits<Char>::cast(value);\n }\n"} {"commit":"77165fdf85ebb9fcf11c505e38ee9e8d0687bdb6","subject":"Use FMT_NOEXCEPT instead of noexcept directly","message":"Use FMT_NOEXCEPT instead of noexcept directly\n\nOtherwise breaks on compilers without noexcept support\n","repos":"cppformat\/cppformat,cppformat\/cppformat,alabuzhev\/fmt,alabuzhev\/fmt,cppformat\/cppformat,alabuzhev\/fmt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/fmt\/format.h\n+++ include\/fmt\/format.h\n@@ -878,11 +878,11 @@\n return end;\n }\n \n-template <typename Int> constexpr int digits10() noexcept {\n+template <typename Int> constexpr int digits10() FMT_NOEXCEPT {\n return std::numeric_limits<Int>::digits10;\n }\n-template <> constexpr int digits10<int128_t>() noexcept { return 38; }\n-template <> constexpr int digits10<uint128_t>() noexcept { return 38; }\n+template <> constexpr int digits10<int128_t>() FMT_NOEXCEPT { return 38; }\n+template <> constexpr int digits10<uint128_t>() FMT_NOEXCEPT { return 38; }\n \n template <typename Char, typename UInt, typename Iterator, typename F>\n inline Iterator format_decimal(Iterator out, UInt value, int num_digits,\n"} {"commit":"6f1538f8b4b253ba7aa92c98997719ce3ca59451","subject":"attrib: push\/pop FRAGMENT_PROGRAM_ARB state","message":"attrib: push\/pop FRAGMENT_PROGRAM_ARB state\n\nThis requirement was added by ARB_fragment_program\n\nWhen the Steam overlay is enabled, this fixes:\n* Menu corruption with the Puddle game\n* The screen going black on Rochard when\n the Steam overlay is accessed\n\nNOTE: This is a candidate for the 9.0 and 9.1 branches.\n\nSigned-off-by: Jordan Justen <a79006884ba9cf5f4f7fcbb92a15b208780d8c97@intel.com>\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\n","repos":"mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/attrib.c\n+++ src\/mesa\/main\/attrib.c\n@@ -129,6 +129,9 @@\n GLboolean VertexProgram;\n GLboolean VertexProgramPointSize;\n GLboolean VertexProgramTwoSide;\n+\n+ \/* GL_ARB_fragment_program *\/\n+ GLboolean FragmentProgram;\n \n \/* GL_ARB_point_sprite \/ GL_NV_point_sprite *\/\n GLboolean PointSprite;\n@@ -316,6 +319,10 @@\n attr->VertexProgram = ctx->VertexProgram.Enabled;\n attr->VertexProgramPointSize = ctx->VertexProgram.PointSizeEnabled;\n attr->VertexProgramTwoSide = ctx->VertexProgram.TwoSideEnabled;\n+\n+ \/* GL_ARB_fragment_program *\/\n+ attr->FragmentProgram = ctx->FragmentProgram.Enabled;\n+\n save_attrib_data(&head, GL_ENABLE_BIT, attr);\n \n \/* GL_ARB_framebuffer_sRGB \/ GL_EXT_framebuffer_sRGB *\/\n@@ -606,6 +613,11 @@\n TEST_AND_UPDATE(ctx->VertexProgram.TwoSideEnabled,\n enable->VertexProgramTwoSide,\n GL_VERTEX_PROGRAM_TWO_SIDE_ARB);\n+\n+ \/* GL_ARB_fragment_program *\/\n+ TEST_AND_UPDATE(ctx->FragmentProgram.Enabled,\n+ enable->FragmentProgram,\n+ GL_FRAGMENT_PROGRAM_ARB);\n \n \/* GL_ARB_framebuffer_sRGB \/ GL_EXT_framebuffer_sRGB *\/\n TEST_AND_UPDATE(ctx->Color.sRGBEnabled, enable->sRGBEnabled,\n"} {"commit":"26d41436bb9ac2e007b4d72549e603623b34b125","subject":"Xen_version hypercalls takes two args, not one.","message":"Xen_version hypercalls takes two args, not one.\n\nSigned-off-by: Ian Pratt <57a33a5496950fec8433e4dd83347673459dcdfc@xensource.com>\nSigned-off-by: Keir Fraser <69344103cc60b36d6e1fbdc31ce6504b2286c646@xensource.com>\n\n\n","repos":"rowhit\/xen-minios,rowhit\/xen-minios,rowhit\/xen-minios","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/hypervisor.h\n+++ include\/hypervisor.h\n@@ -414,15 +414,15 @@\n \n static inline int\n HYPERVISOR_xen_version(\n- int cmd)\n-{\n- int ret;\n- unsigned long ignore;\n-\n- __asm__ __volatile__ (\n- TRAP_INSTR\n- : \"=a\" (ret), \"=b\" (ignore)\n-\t: \"0\" (__HYPERVISOR_xen_version), \"1\" (cmd)\n+ int cmd, void *arg)\n+{\n+ int ret;\n+ unsigned long ignore, ign2;\n+\n+ __asm__ __volatile__ (\n+ TRAP_INSTR\n+ : \"=a\" (ret), \"=b\" (ignore), \"=c\" (ign2)\n+\t: \"0\" (__HYPERVISOR_xen_version), \"1\" (cmd), \"2\" (arg)\n \t: \"memory\" );\n \n return ret;\n"} {"commit":"9f2050365851c61f21f83ce60bc628a3e192e1dc","subject":"main\/cs: Add gl_context::ComputeProgram","message":"main\/cs: Add gl_context::ComputeProgram\n\nReviewed-by: Jordan Justen <a79006884ba9cf5f4f7fcbb92a15b208780d8c97@intel.com>\n","repos":"zz85\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/mtypes.h\n+++ src\/mesa\/main\/mtypes.h\n@@ -2344,6 +2344,20 @@\n \n \/** Cache of fixed-function programs *\/\n struct gl_program_cache *Cache;\n+};\n+\n+\n+\/**\n+ * Context state for compute programs.\n+ *\/\n+struct gl_compute_program_state\n+{\n+ struct gl_compute_program *Current; \/**< user-bound compute program *\/\n+\n+ \/** Currently enabled and valid program (including internal programs\n+ * and compiled shader programs).\n+ *\/\n+ struct gl_compute_program *_Current;\n };\n \n \n@@ -4153,6 +4167,7 @@\n struct gl_vertex_program_state VertexProgram;\n struct gl_fragment_program_state FragmentProgram;\n struct gl_geometry_program_state GeometryProgram;\n+ struct gl_compute_program_state ComputeProgram;\n struct gl_ati_fragment_shader_state ATIFragmentShader;\n \n struct gl_pipeline_shader_state Pipeline; \/**< GLSL pipeline shader object state *\/\n"} {"commit":"69f1b11b2f51b29c687b8331e3df00f4d55acc47","subject":"Added C99 and boost-aware fixed-width type implementations.","message":"Added C99 and boost-aware fixed-width type implementations.\n","repos":"juj\/kNet,nonconforme\/kNet,nonconforme\/kNet,juj\/kNet,juj\/kNet","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/kNet\/Types.h\n+++ include\/kNet\/Types.h\n@@ -16,12 +16,43 @@\n \/** @file Types.h\r\n \t@brief Provides platform-independent fixed size types. *\/\r\n \r\n-namespace kNet\r\n-{\r\n-\/\/\/\\todo C99.\r\n-typedef unsigned char byte;\r\n-typedef unsigned short word;\r\n-typedef unsigned long dword;\r\n+#ifndef KNET_NO_FIXEDWIDTH_TYPES\r\n+\r\n+\/\/ As a reminder: http:\/\/predef.sourceforge.net\/prestd.html\r\n+\r\n+\/\/ If we have C99, take the types from there.\r\n+#if (__STDC_VERSION__ >= 199901L) || (_MSC_VER >= 1600)\r\n+\r\n+#include <cstdint>\r\n+\r\n+typedef uint8_t u8; \/\/\/< a single byte: 0-255.\r\n+typedef uint16_t u16; \/\/\/< 2 bytes: 0 - 65535.\r\n+typedef uint32_t u32; \/\/\/< 4 bytes: 0 - 4,294,967,295 ~ 4000 million or 4e9.\r\n+typedef uint64_t u64; \/\/\/< 8 bytes: 18,446,744,073,709,551,615 ~1.8e19.\r\n+\r\n+typedef int8_t s8; \/\/\/< a single byte: -128 - 127.\r\n+typedef int16_t s16; \/\/\/< 2 bytes: -32768 - 32767.\r\n+typedef int32_t s32; \/\/\/< 4 bytes signed: max 2,147,483,647 ~ 2000 million or 2e9.\r\n+typedef int64_t s64; \/\/\/< 8 bytes signed. 9,223,372,036,854,775,807 ~ 9e18.\r\n+\r\n+\/\/ Otherwise, if we have boost, we can also pull the types from there.\r\n+#elif KNET_USE_BOOST\r\n+\r\n+#include <boost\/cstdint.hpp>\r\n+\r\n+typedef boost::uint8_t u8; \/\/\/< a single byte: 0-255.\r\n+typedef boost::uint16_t u16; \/\/\/< 2 bytes: 0 - 65535.\r\n+typedef boost::uint32_t u32; \/\/\/< 4 bytes: 0 - 4,294,967,295 ~ 4000 million or 4e9.\r\n+typedef boost::uint64_t u64; \/\/\/< 8 bytes: 18,446,744,073,709,551,615 ~1.8e19.\r\n+\r\n+typedef boost::int8_t s8; \/\/\/< a single byte: -128 - 127.\r\n+typedef boost::int16_t s16; \/\/\/< 2 bytes: -32768 - 32767.\r\n+typedef boost::int32_t s32; \/\/\/< 4 bytes signed: max 2,147,483,647 ~ 2000 million or 2e9.\r\n+typedef boost::int64_t s64; \/\/\/< 8 bytes signed. 9,223,372,036,854,775,807 ~ 9e18.\r\n+\r\n+#else \/\/ No boost or unknown if we have C99. Have to guess the following are correct.\r\n+\r\n+#warning \"Not using boost and C99 not defined. Guessing the built-ins for fixed-width types!\"\r\n \r\n typedef unsigned char u8; \/\/\/< a single byte: 0-255.\r\n typedef unsigned short u16; \/\/\/< 2 bytes: 0 - 65535.\r\n@@ -33,7 +64,6 @@\n typedef signed int s32; \/\/\/< 4 bytes signed: max 2,147,483,647 ~ 2000 million or 2e9.\r\n typedef signed long long s64; \/\/\/< 8 bytes signed. 9,223,372,036,854,775,807 ~ 9e18.\r\n \r\n-typedef unsigned long ulong;\r\n-typedef unsigned int uint;\r\n+#endif\r\n \r\n-} \/\/ ~kNet\r\n+#endif \/\/ ~KNET_NO_FIXEDWIDTH_TYPES\r\n"} {"commit":"b9f33c3eb27c05eaed4e13b59ce5ddee3e0f6532","subject":"Eliminated compilation warning.","message":"Eliminated compilation warning.\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@31595 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plugins\/documentsystem\/xmlread\/xr.h\n+++ plugins\/documentsystem\/xmlread\/xr.h\n@@ -709,7 +709,7 @@\n csString location;\n location.Format (\"line %d\", parse.linenum);\n if (errorPos != 0)\n- location.AppendFmt (\":%zu\", errorPos - parse.startOfLine + 1);\n+ location.AppendFmt (\":%tu\", errorPos - parse.startOfLine + 1);\n errorDesc += location.GetDataSafe();\n if (!errorPath.IsEmpty())\n {\n"} {"commit":"ad328fcf2bcb99b15c9d50afb3c81e3ecc9fa988","subject":"resolved merge conflicts","message":"resolved merge conflicts\n","repos":"etola\/kortex,etola\/kortex,etola\/kortex","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/kortex\/svd.h\n+++ include\/kortex\/svd.h\n@@ -49,7 +49,13 @@\n \n void print() const;\n \n- double condition_number() const { return Sd()[0]\/Sd()[m_d-1]; }\n+ double condition_number() const {\n+ static const double tolerance = 1e-10;\n+ double sd_max = m_Sd[ 0];\n+ double sd_min = m_Sd[m_d-1];\n+ double cond = ( sd_min<tolerance ) ? sd_max\/tolerance : sd_max\/sd_min;\n+ return cond;\n+ }\n \n private:\n void init();\n"} {"commit":"ad6e1e12cc2ed8b07cebc555b2ea0029037f7d93","subject":"mesa: update comment for UniformBufferSize to indicate size is in bytes","message":"mesa: update comment for UniformBufferSize to indicate size is in bytes\n\nReviewed-by: Roland Scheidegger <7d58aee419d6f9201d75517c885374dff5e7d848@vmware.com>\n","repos":"mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/mtypes.h\n+++ src\/mesa\/main\/mtypes.h\n@@ -2560,7 +2560,7 @@\n GLuint Binding;\n \n \/**\n- * Minimum size of a buffer object to back this uniform buffer\n+ * Minimum size (in bytes) of a buffer object to back this uniform buffer\n * (GL_UNIFORM_BLOCK_DATA_SIZE).\n *\/\n GLuint UniformBufferSize;\n"} {"commit":"d7acbf864424a6a795fc1984c78c66691906f7dc","subject":"lib\/macros.h: Stringy macros in __stringify","message":"lib\/macros.h: Stringy macros in __stringify\n\nThis allows __stringify() to be called with either a string literal or a\nmacro.\n","repos":"ChrisCummins\/euclid,ChrisCummins\/euclid,ChrisCummins\/euclid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/lib\/macros.h\n+++ include\/lib\/macros.h\n@@ -8,7 +8,8 @@\n #define _MACROS_H\n \n \/* Helper macros *\/\n-#define __stringify(x)\t#x\n+#define __stringify(x)\t___stringify(x)\n+#define ___stringify(x) #x\n #define __concat(x, y)\t__stringify(x ## y)\n \n \/*\n"} {"commit":"684c91401472a3bf60c219901dbc2727aab8c351","subject":"mesa: reorder gl_multisample_attrib","message":"mesa: reorder gl_multisample_attrib\n\ndrops size from 28 bytes to 20.\n\nAcked-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\nReviewed-by: 36a696918b39a8a1af1f9065ac243691cfbc626b@amd.com>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/mtypes.h\n+++ src\/mesa\/main\/mtypes.h\n@@ -900,13 +900,15 @@\n GLboolean SampleAlphaToCoverage;\n GLboolean SampleAlphaToOne;\n GLboolean SampleCoverage;\n- GLfloat SampleCoverageValue;\n GLboolean SampleCoverageInvert;\n GLboolean SampleShading;\n- GLfloat MinSampleShadingValue;\n \n \/* ARB_texture_multisample \/ GL3.2 additions *\/\n GLboolean SampleMask;\n+\n+ GLfloat SampleCoverageValue;\n+ GLfloat MinSampleShadingValue;\n+\n \/** The GL spec defines this as an array but >32x MSAA is madness *\/\n GLbitfield SampleMaskValue;\n };\n"} {"commit":"281d0fd3a9cd2b4e97cdb58eb7854f9f90220fc7","subject":"mesa: set numFaces=6 for cube maps in _mesa_test_texobj_completeness()","message":"mesa: set numFaces=6 for cube maps in _mesa_test_texobj_completeness()\n\nReviewed-by: Jos\u00e9 Fonseca <61b5a29db2c0650f7c8510f93eece059c1b09320@vmware.com>\n","repos":"bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/texobj.c\n+++ src\/mesa\/main\/texobj.c\n@@ -567,7 +567,8 @@\n GLint i;\n const GLint minLevel = baseLevel;\n const GLint maxLevel = t->_MaxLevel;\n- GLuint width, height, depth, face, numFaces = 1;\n+ const GLuint numFaces = t->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;\n+ GLuint width, height, depth, face;\n \n if (minLevel > maxLevel) {\n incomplete(t, BASE, \"minLevel > maxLevel\");\n"} {"commit":"099c5c310e9744bd0654881bb55c137051228e56","subject":"Preparing 8.3.8rc2","message":"Preparing 8.3.8rc2\n\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nSigned-off-by: Lars Ellenberg <31df9cacdc65c624cc60c2dcd22bbf92dc230e16@linbit.com>\nSigned-off-by: Jens Axboe <08e836a620179c237f631ad0545a7ebdf54201f3@fusionio.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/drbd.h\n+++ include\/linux\/drbd.h\n@@ -53,7 +53,7 @@\n \n \n extern const char *drbd_buildtag(void);\n-#define REL_VERSION \"8.3.8rc1\"\n+#define REL_VERSION \"8.3.8rc2\"\n #define API_VERSION 88\n #define PRO_VERSION_MIN 86\n #define PRO_VERSION_MAX 94\n"} {"commit":"dd67226122866aa52e85fad2671f71428f08b534","subject":"elang\/lir: Make |Target::kAllocatableFloatRegisters| to have right value.","message":"elang\/lir: Make |Target::kAllocatableFloatRegisters| to have right value.\n","repos":"eval1749\/elang,eval1749\/elang,eval1749\/elang,eval1749\/elang,eval1749\/elang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- elang\/lir\/target_x64.h\n+++ elang\/lir\/target_x64.h\n@@ -156,8 +156,8 @@\n const int kAllFloatRegisters = (1 << kNumberOfFloatRegisters) - 1;\n const int kAllGeneralRegisters = (1 << kNumberOfGeneralRegisters) - 1;\n \n-\/\/ All registers except for XMM0 are allocatable.\n-const int kAllocatableFloatRegisters = kAllocatableFloatRegisters;\n+\/\/ All float registers are allocatable.\n+const int kAllocatableFloatRegisters = kAllFloatRegisters;\n \n \/\/ All registers except for RBP and RSP are allocatable.\n const int kAllocatableGeneralRegisters =\n"} {"commit":"8b7ba92605c0f21cf6292a1bc2e16e379c0b3be8","subject":"mesa: Fix assertion failure when a cube face is not present.","message":"mesa: Fix assertion failure when a cube face is not present.\n\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\nReviewed-by: Kenneth Graunke <bd2562f754ec92342f93f61c25d731e290a2ffa8@whitecape.org>\nReviewed-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\n","repos":"bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/texobj.c\n+++ src\/mesa\/main\/texobj.c\n@@ -558,7 +558,8 @@\n GLuint face;\n assert(baseImage->Width2 == baseImage->Height);\n for (face = 1; face < 6; face++) {\n- assert(t->Image[face][baseLevel]->Width2 ==\n+ assert(t->Image[face][baseLevel] == NULL ||\n+ t->Image[face][baseLevel]->Width2 ==\n t->Image[face][baseLevel]->Height2);\n if (t->Image[face][baseLevel] == NULL ||\n t->Image[face][baseLevel]->Width2 != baseImage->Width2) {\n"} {"commit":"13c07b0286d340275f2d97adf085cecda37ede37","subject":"linux\/log2.h: Fix rounddown_pow_of_two(1)","message":"linux\/log2.h: Fix rounddown_pow_of_two(1)\n\nExactly like roundup_pow_of_two(1), the rounddown version was buggy for\nthe case of a compile-time constant '1' argument. Probably because it\noriginated from the same code, sharing history with the roundup version\nfrom before the bugfix (for that one, see commit 1a06a52ee1b0: \"Fix\nroundup_pow_of_two(1)\").\n\nHowever, unlike the roundup version, the fix for rounddown is to just\nremove the broken special case entirely. It's simply not needed - the\ngeneric code\n\n 1UL << ilog2(n)\n\ndoes the right thing for the constant '1' argment too. The only reason\nroundup needed that special case was because rounding up does so by\nsubtracting one from the argument (and then adding one to the result)\ncausing the obvious problems with \"ilog2(0)\".\n\nBut rounddown doesn't do any of that, since ilog2() naturally truncates\n(ie \"rounds down\") to the right rounded down value. And without the\nilog2(0) case, there's no reason for the special case that had the wrong\nvalue.\n\ntl;dr: rounddown_pow_of_two(1) should be 1, not 0.\n\nAcked-by: Dmitry Torokhov <10a8c465cefc9bdd6c925e26964d23c90f1141cc@vmware.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/log2.h\n+++ include\/linux\/log2.h\n@@ -185,7 +185,6 @@\n #define rounddown_pow_of_two(n)\t\t\t\\\n (\t\t\t\t\t\t\\\n \t__builtin_constant_p(n) ? (\t\t\\\n-\t\t(n == 1) ? 0 :\t\t\t\\\n \t\t(1UL << ilog2(n))) :\t\t\\\n \t__rounddown_pow_of_two(n)\t\t\\\n )\n"} {"commit":"069e2b351de67e7a837b15b3d26c65c19b790cc3","subject":"slob: Rework #ifdeffery in slab.h","message":"slob: Rework #ifdeffery in slab.h\n\nMake the SLOB specific stuff harmonize more with the way the other allocators\ndo it. Create the typical kmalloc constants for that purpose. SLOB does not\nsupport it but the constants help us avoid #ifdefs.\n\nSigned-off-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/slab.h\n+++ include\/linux\/slab.h\n@@ -169,11 +169,7 @@\n \tstruct list_head list;\t\/* List of all slab caches on the system *\/\n };\n \n-#define KMALLOC_MAX_SIZE (1UL << 30)\n-\n-#include <linux\/slob_def.h>\n-\n-#else \/* CONFIG_SLOB *\/\n+#endif \/* CONFIG_SLOB *\/\n \n \/*\n * Kmalloc array related definitions\n@@ -195,13 +191,28 @@\n #ifndef KMALLOC_SHIFT_LOW\n #define KMALLOC_SHIFT_LOW\t5\n #endif\n-#else\n+#endif\n+\n+#ifdef CONFIG_SLUB\n \/*\n * SLUB allocates up to order 2 pages directly and otherwise\n * passes the request to the page allocator.\n *\/\n #define KMALLOC_SHIFT_HIGH\t(PAGE_SHIFT + 1)\n #define KMALLOC_SHIFT_MAX\t(MAX_ORDER + PAGE_SHIFT)\n+#ifndef KMALLOC_SHIFT_LOW\n+#define KMALLOC_SHIFT_LOW\t3\n+#endif\n+#endif\n+\n+#ifdef CONFIG_SLOB\n+\/*\n+ * SLOB passes all page size and larger requests to the page allocator.\n+ * No kmalloc array is necessary since objects of different sizes can\n+ * be allocated from the same page.\n+ *\/\n+#define KMALLOC_SHIFT_MAX\t30\n+#define KMALLOC_SHIFT_HIGH\tPAGE_SHIFT\n #ifndef KMALLOC_SHIFT_LOW\n #define KMALLOC_SHIFT_LOW\t3\n #endif\n@@ -221,6 +232,7 @@\n #define KMALLOC_MIN_SIZE (1 << KMALLOC_SHIFT_LOW)\n #endif\n \n+#ifndef CONFIG_SLOB\n extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];\n #ifdef CONFIG_ZONE_DMA\n extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];\n@@ -275,13 +287,18 @@\n \t\/* Will never be reached. Needed because the compiler may complain *\/\n \treturn -1;\n }\n+#endif \/* !CONFIG_SLOB *\/\n \n #ifdef CONFIG_SLAB\n #include <linux\/slab_def.h>\n-#elif defined(CONFIG_SLUB)\n+#endif\n+\n+#ifdef CONFIG_SLUB\n #include <linux\/slub_def.h>\n-#else\n-#error \"Unknown slab allocator\"\n+#endif\n+\n+#ifdef CONFIG_SLOB\n+#include <linux\/slob_def.h>\n #endif\n \n \/*\n@@ -291,6 +308,7 @@\n *\/\n static __always_inline int kmalloc_size(int n)\n {\n+#ifndef CONFIG_SLOB\n \tif (n > 2)\n \t\treturn 1 << n;\n \n@@ -299,10 +317,9 @@\n \n \tif (n == 2 && KMALLOC_MIN_SIZE <= 64)\n \t\treturn 192;\n-\n+#endif\n \treturn 0;\n }\n-#endif \/* !CONFIG_SLOB *\/\n \n \/*\n * Setting ARCH_SLAB_MINALIGN in arch headers allows a different alignment.\n"} {"commit":"b13460b92093b29347e99d6c3242e350052b62cd","subject":"drivers\/vfio: Rework offsetofend()","message":"drivers\/vfio: Rework offsetofend()\n\nThe macro offsetofend() introduces unnecessary temporary variable\n\"tmp\". The patch avoids that and saves a bit memory in stack.\n\nSigned-off-by: Gavin Shan <0398910e4f4970259b451f0f9d0686cc5e961b81@linux.vnet.ibm.com>\nSigned-off-by: Alex Williamson <7469de9b95ba379e2656fa9677689657c47a7690@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/vfio.h\n+++ include\/linux\/vfio.h\n@@ -86,9 +86,8 @@\n * from user space. This allows us to easily determine if the provided\n * structure is sized to include various fields.\n *\/\n-#define offsetofend(TYPE, MEMBER) ({\t\t\t\t\\\n-\tTYPE tmp;\t\t\t\t\t\t\\\n-\toffsetof(TYPE, MEMBER) + sizeof(tmp.MEMBER); })\t\t\\\n+#define offsetofend(TYPE, MEMBER) \\\n+\t(offsetof(TYPE, MEMBER)\t+ sizeof(((TYPE *)0)->MEMBER))\n \n \/*\n * External user API\n"} {"commit":"7443f9da7e220b6cace1784be9df1d8cff121cdb","subject":"Fix typo.","message":"Fix typo.\n","repos":"mity\/mctrl,mity\/mctrl,mity\/mctrl,mity\/mctrl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/mCtrl\/defs.h\n+++ include\/mCtrl\/defs.h\n@@ -29,7 +29,7 @@\n \/** \n * @file\n * This is helper header included by all the other public mCtrl headers. \n- * You should don't need to include this header file directly.\n+ * You shouldn't need to include this header file directly.\n *\/\n \n \n"} {"commit":"05381a27e127887dcf170a6934b66b3e6011ed6d","subject":"Add keys const to types","message":"Add keys const to types\n","repos":"Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/types.h\n+++ include\/mega\/types.h\n@@ -203,6 +203,15 @@\n const int FILENODEKEYLENGTH = 32;\n const int FOLDERNODEKEYLENGTH = 16;\n \n+\/\/handle lengths\n+static const int USERHANDLE = 8;\n+\n+\/\/unified key length\n+static const int UNIFIEDKEY = 16;\n+\n+\/\/handle + unified key length\n+static const int HANDLEWITHUNIFIEDKEY = 24;\n+\n typedef list<class Sync*> sync_list;\n \n \/\/ persistent resource cache storage\n"} {"commit":"2eeb3381bebaab794f5e922d361ec79dd3d1a31d","subject":"Apply 1 suggestion(s) to 1 file(s)","message":"Apply 1 suggestion(s) to 1 file(s)","repos":"meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/types.h\n+++ include\/mega\/types.h\n@@ -1116,7 +1116,7 @@\n \n bool isCancelled() const\n {\n- return flag && *flag;\n+ return !!flag && *flag;\n }\n \n bool exists()\n"} {"commit":"acede8b87a505d3d5e0dd1244d624c8e1b598117","subject":"armv8: Remove Grub artefact from multiboot2 header","message":"armv8: Remove Grub artefact from multiboot2 header\n\nSigned-off-by: Daniel Schwyn <de4b19ed24091af8954820cdb161efb686dc5bdd@inf.ethz.ch>\n","repos":"BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,kishoredbn\/barrelfish","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/multiboot2.h\n+++ include\/multiboot2.h\n@@ -178,7 +178,7 @@\n #define MULTIBOOT_MEMORY_BADRAM 5\n multiboot_uint32_t type;\n multiboot_uint32_t zero;\n-} GRUB_PACKED;\n+};\n typedef struct multiboot_mmap_entry multiboot_memory_map_t;\n \n struct multiboot_tag\n"} {"commit":"c51a5ef1d98a0fffcf60372016f970e55acc86f6","subject":"Odd. This seems to be in the wrong spot...","message":"Odd. This seems to be in the wrong spot...\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":1,"stderr":"error: pathspec 'include\/netipx\/ipx.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- include\/netipx\/ipx.h\n+++ include\/netipx\/ipx.h\n@@ -0,0 +1,113 @@\n+\/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 Free Software Foundation, Inc.\n+ This file is part of the GNU C Library.\n+\n+ The GNU C Library is free software; you can redistribute it and\/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ The GNU C Library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with the GNU C Library; if not, write to the Free\n+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA\n+ 02111-1307 USA. *\/\n+\n+#ifndef __NETIPX_IPX_H\n+#define __NETIPX_IPX_H 1\n+\n+#include <features.h>\n+\n+#include <sys\/types.h>\n+#include <bits\/sockaddr.h>\n+\n+__BEGIN_DECLS\n+\n+#define SOL_IPX 256 \/* sockopt level *\/\n+\n+#define IPX_TYPE 1\n+#define IPX_NODE_LEN\t6\n+#define IPX_MTU\t\t576\n+\n+struct sockaddr_ipx\n+ {\n+ sa_family_t sipx_family;\n+ u_int16_t sipx_port;\n+ u_int32_t sipx_network;\n+ unsigned char sipx_node[IPX_NODE_LEN];\n+ u_int8_t sipx_type;\n+ unsigned char sipx_zero;\t\/* 16 byte fill *\/\n+ };\n+\n+\/*\n+ *\tSo we can fit the extra info for SIOCSIFADDR into the address nicely\n+ *\/\n+\n+#define sipx_special\tsipx_port\n+#define sipx_action\tsipx_zero\n+#define IPX_DLTITF\t0\n+#define IPX_CRTITF\t1\n+\n+typedef struct ipx_route_definition\n+ {\n+ unsigned long ipx_network;\n+ unsigned long ipx_router_network;\n+ unsigned char ipx_router_node[IPX_NODE_LEN];\n+ }\n+ipx_route_definition;\n+\n+typedef struct ipx_interface_definition\n+ {\n+ unsigned long ipx_network;\n+ unsigned char ipx_device[16];\n+ unsigned char ipx_dlink_type;\n+#define IPX_FRAME_NONE\t\t0\n+#define IPX_FRAME_SNAP\t\t1\n+#define IPX_FRAME_8022\t\t2\n+#define IPX_FRAME_ETHERII\t3\n+#define IPX_FRAME_8023\t\t4\n+#define IPX_FRAME_TR_8022\t5\n+ unsigned char ipx_special;\n+#define IPX_SPECIAL_NONE\t0\n+#define IPX_PRIMARY\t\t1\n+#define IPX_INTERNAL\t\t2\n+ unsigned char ipx_node[IPX_NODE_LEN];\n+ }\n+ipx_interface_definition;\n+\n+typedef struct ipx_config_data\n+ {\n+ unsigned char ipxcfg_auto_select_primary;\n+ unsigned char ipxcfg_auto_create_interfaces;\n+ }\n+ipx_config_data;\n+\n+\/*\n+ * OLD Route Definition for backward compatibility.\n+ *\/\n+\n+struct ipx_route_def\n+ {\n+ unsigned long ipx_network;\n+ unsigned long ipx_router_network;\n+#define IPX_ROUTE_NO_ROUTER\t0\n+ unsigned char ipx_router_node[IPX_NODE_LEN];\n+ unsigned char ipx_device[16];\n+ unsigned short ipx_flags;\n+#define IPX_RT_SNAP\t\t8\n+#define IPX_RT_8022\t\t4\n+#define IPX_RT_BLUEBOOK\t\t2\n+#define IPX_RT_ROUTED\t\t1\n+ };\n+\n+#define SIOCAIPXITFCRT\t\t(SIOCPROTOPRIVATE)\n+#define SIOCAIPXPRISLT\t\t(SIOCPROTOPRIVATE + 1)\n+#define SIOCIPXCFGDATA\t\t(SIOCPROTOPRIVATE + 2)\n+#define SIOCIPXNCPCONN\t\t(SIOCPROTOPRIVATE + 3)\n+\n+__END_DECLS\n+\n+#endif \/* netipx\/ipx.h *\/\n"} {"commit":"5d18cb53fbf7853f9391ab7d57207893fea2fab6","subject":"__USE_ISOC9X necessary to get HUGE_VALF on GNU systems?","message":"__USE_ISOC9X necessary to get HUGE_VALF on GNU systems?\n\n\ngit-svn-id: 051f6adb867ae8800663f9d761b7f383ac0911ea@300 685f7672-210f-0410-90b4-fe3ad19314fe\n","repos":"vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror,vancegroup-mirrors\/open-dynamics-engine-svnmirror","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/ode\/common.h\n+++ include\/ode\/common.h\n@@ -24,6 +24,8 @@\n #define _ODE_COMMON_H_\n \n #include \"ode\/error.h\"\n+\n+#define __USE_ISOC9X 1\t\/* necessary to get HUGE_VALF on GNU systems? *\/\n #include <math.h>\n \n #ifdef __cplusplus\n"} {"commit":"6484b2fda3b4fa0059526e81cd1e26cca46cb705","subject":"endian.h: avoid some Wconversion warnings","message":"endian.h: avoid some Wconversion warnings\n\nChange-Id: Ic77bd0dd6ac2355eaf3e11811fba7604c782d9d6\nReviewed-on: https:\/\/gerrit.libreoffice.org\/17307\nReviewed-by: Eike Rathke <ca97d066ec547ed7b5f176c01ed86da55dede03e@redhat.com>\nTested-by: Eike Rathke <ca97d066ec547ed7b5f176c01ed86da55dede03e@redhat.com>\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/osl\/endian.h\n+++ include\/osl\/endian.h\n@@ -161,7 +161,7 @@\n #endif\n \n #ifndef OSL_MAKEWORD\n-# define OSL_MAKEWORD(bl, bh) ((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8))\n+# define OSL_MAKEWORD(bl, bh) ((sal_uInt16)((sal_uInt16)((bl) & 0xFF) | (((sal_uInt16)(bh) & 0xFF) << 8)))\n #endif\n #ifndef OSL_LOBYTE\n # define OSL_LOBYTE(w) ((sal_uInt8)((sal_uInt16)(w) & 0xFF))\n"} {"commit":"4b24f4e261236bda7d9ff91e3a1147f20d6326f1","subject":"forgot to remove debug output","message":"forgot to remove debug output\n\ngit-svn-id: 9f3514be25e8c4f808c923faecc75db62e18396e@1518 ce7afbd9-0f25-0410-bca2-9054d3de1fdb\n","repos":"eINIT\/experimental,eINIT\/xml-sh,eINIT\/core,eINIT\/core,eINIT\/core,eINIT\/simple","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- einit\/src\/modules\/module-logic-v3.c\n+++ einit\/src\/modules\/module-logic-v3.c\n@@ -1307,8 +1307,6 @@\n char tmp[BUFFERSIZE];\n char *s = set2str (' ', (const char **)services);\n \n- notice (4, \"mod_defer_notice() called\");\n-\n struct einit_event ee = evstaticinit (einit_feedback_module_status);\n mod->status |= status_deferred;\n \n@@ -1324,8 +1322,6 @@\n evstaticdestroy (ee);\n \n if (s) free (s);\n-\n- notice (4, \"mod_defer_notice(): event emitted\");\n }\n \n void mod_defer_until (char *service, char *after) {\n"} {"commit":"f5232efd52535031ed43e2e7f50a7de6f5caaaae","subject":"Changed the DOD flags to be #defines instead of enums. We aren't using them as enums if we're doing bit logic with them.","message":"Changed the DOD flags to be #defines instead of enums. We aren't using them as enums if we're doing bit logic with them.\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@19547 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- include\/parrot\/dod.h\n+++ include\/parrot\/dod.h\n@@ -41,14 +41,12 @@\n #define Parrot_is_blocked_GC(interp) \\\n ((interp)->arena_base->GC_block_level)\n \n-enum {\n- DOD_trace_stack_FLAG = 1 << 0, \/* trace system areads and stack *\/\n- DOD_trace_normal = 1 << 0, \/* the same *\/\n- DOD_lazy_FLAG = 1 << 1, \/* timely destruction run *\/\n- DOD_finish_FLAG = 1 << 2, \/* run async past sweep *\/\n- DOD_no_trace_volatile_roots = 1 << 3 \/* trace all but volatile root\n- set, i.e. registers *\/\n-};\n+#define DOD_trace_stack_FLAG (UINTVAL)(1 << 0) \/* trace system areads and stack *\/\n+#define DOD_trace_normal (UINTVAL)(1 << 0) \/* the same *\/\n+#define DOD_lazy_FLAG (UINTVAL)(1 << 1) \/* timely destruction run *\/\n+#define DOD_finish_FLAG (UINTVAL)(1 << 2) \/* run async past sweep *\/\n+#define DOD_no_trace_volatile_roots (UINTVAL)(1 << 3)\n+ \/* trace all but volatile root set, i.e. registers *\/\n \n \/* HEADERIZER BEGIN: src\/gc\/dod.c *\/\n \n"} {"commit":"203491c65d143631688fd306ecaf81e5b27e16e1","subject":"Remove duplicated information in psa_open_key","message":"Remove duplicated information in psa_open_key\n\nThe information about implmementation keys is duplicated.\n","repos":"Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/psa\/crypto.h\n+++ include\/psa\/crypto.h\n@@ -358,17 +358,13 @@\n * with a lifetime other than #PSA_KEY_LIFETIME_VOLATILE. A persistent key\n * always has a nonzero key identifier, set with psa_set_key_id() when\n * creating the key. Implementations may provide additional pre-provisioned\n- * keys with identifiers in the range\n- * #PSA_KEY_ID_VENDOR_MIN–#PSA_KEY_ID_VENDOR_MAX.\n+ * keys that can be opened with psa_open_key(). Such keys have a key identifier\n+ * in the vendor range, as documented in the description of #psa_key_id_t.\n *\n * The application must eventually close the handle with psa_close_key()\n * to release associated resources. If the application dies without calling\n * psa_close_key(), the implementation should perform the equivalent of a\n * call to psa_close_key().\n- *\n- * Implementations may provide additional keys that can be opened with\n- * psa_open_key(). Such keys have a key identifier in the vendor range,\n- * as documented in the description of #psa_key_id_t.\n *\n * \\param id The persistent identifier of the key.\n * \\param[out] handle On success, a handle to the key.\n"} {"commit":"001920b21bf9fd77acbd01420397273965110432","subject":"ALSA: jack: update jack types","message":"ALSA: jack: update jack types\n\nChange updates the jack types that will be supported\nby the platform.\n\nSigned-off-by: Gopikrishnaiah Anandan <b3c147b7b1fea00c05d6b38573ec7cd70637c400@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/sound\/jack.h\n+++ include\/sound\/jack.h\n@@ -35,26 +35,28 @@\n * sound\/core\/jack.c.\n *\/\n enum snd_jack_types {\n-\tSND_JACK_HEADPHONE\t= 0x0001,\n-\tSND_JACK_MICROPHONE\t= 0x0002,\n+\tSND_JACK_HEADPHONE\t= 0x0000001,\n+\tSND_JACK_MICROPHONE\t= 0x0000002,\n \tSND_JACK_HEADSET\t= SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,\n-\tSND_JACK_LINEOUT\t= 0x0004,\n-\tSND_JACK_MECHANICAL\t= 0x0008, \/* If detected separately *\/\n-\tSND_JACK_VIDEOOUT\t= 0x0010,\n+\tSND_JACK_LINEOUT\t= 0x0000004,\n+\tSND_JACK_MECHANICAL\t= 0x0000008, \/* If detected separately *\/\n+\tSND_JACK_VIDEOOUT\t= 0x0000010,\n \tSND_JACK_AVOUT\t\t= SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,\n-\tSND_JACK_LINEIN\t\t= 0x0020,\n-\n+\t\/* *\/\n+\tSND_JACK_LINEIN\t\t= 0x0000020,\n+\tSND_JACK_OC_HPHL\t= 0x0000040,\n+\tSND_JACK_OC_HPHR\t= 0x0000080,\n+\tSND_JACK_UNSUPPORTED\t= 0x0000100,\n \t\/* Kept separate from switches to facilitate implementation *\/\n-\tSND_JACK_BTN_0\t\t= 0x4000,\n-\tSND_JACK_BTN_1\t\t= 0x2000,\n-\tSND_JACK_BTN_2\t\t= 0x1000,\n-\tSND_JACK_BTN_3\t\t= 0x0800,\n-\tSND_JACK_BTN_4\t\t= 0x0400,\n-\tSND_JACK_BTN_5\t\t= 0x0200,\n+\tSND_JACK_BTN_0\t\t= 0x4000000,\n+\tSND_JACK_BTN_1\t\t= 0x2000000,\n+\tSND_JACK_BTN_2\t\t= 0x1000000,\n+\tSND_JACK_BTN_3\t\t= 0x0800000,\n+\tSND_JACK_BTN_4\t\t= 0x0400000,\n+\tSND_JACK_BTN_5\t\t= 0x0200000,\n+\tSND_JACK_BTN_6\t\t= 0x0100000,\n+\tSND_JACK_BTN_7\t\t= 0x0080000,\n };\n-\n-\/* Keep in sync with definitions above *\/\n-#define SND_JACK_SWITCH_TYPES 6\n \n struct snd_jack {\n \tstruct input_dev *input_dev;\n"} {"commit":"400321dce331781f709217a86813845168f842a2","subject":"clang noreturn attribute","message":"clang noreturn attribute\n","repos":"uael\/mu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/u\/compiler.h\n+++ include\/u\/compiler.h\n@@ -299,7 +299,7 @@\n # define thread_local _Thread_local\n #endif\n \n-#if COMPILER_GCC && (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 70))\n+#if HAS_ATTRIBUTE(noreturn) || (COMPILER_GCC && (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 70)))\n # define NORETURN __attribute__((__noreturn__))\n #elif defined(__STDC__) && __STDC_VERSION__ >= 201112L\n # define NORETURN _Noreturn\n"} {"commit":"ef87a78b78824dbaa77da99cf683df2ddb19dbea","subject":"regen","message":"regen\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/microcode\/aic7xxx\/aic7xxx_seq.h\n+++ dev\/microcode\/aic7xxx\/aic7xxx_seq.h\n@@ -1,12 +1,12 @@\n-\/* $OpenBSD: aic7xxx_seq.h,v 1.10 2002\/07\/05 05:41:03 smurph Exp $ *\/\n+\/* $OpenBSD: aic7xxx_seq.h,v 1.11 2003\/08\/12 20:32:33 mickey Exp $ *\/\n \/*\n * DO NOT EDIT - This file is automatically generated\n *\t\t from the following source files:\n *\n- * $Id: aic7xxx_seq.h,v 1.10 2002\/07\/05 05:41:03 smurph Exp $\n- * $Id: aic7xxx_seq.h,v 1.10 2002\/07\/05 05:41:03 smurph Exp $\n+ * $Id: aic7xxx_seq.h,v 1.11 2003\/08\/12 20:32:33 mickey Exp $\n+ * $Id: aic7xxx_seq.h,v 1.11 2003\/08\/12 20:32:33 mickey Exp $\n *\/\n-static u_int8_t seqprog[] = {\n+static const u_int8_t seqprog[] = {\n \t0xb2, 0x00, 0x00, 0x08,\n \t0xf7, 0x11, 0x22, 0x08,\n \t0x00, 0x65, 0xe0, 0x59,\n@@ -1075,7 +1075,7 @@\n \tuint32_t\tbegin\t :10,\n \t\t\tskip_instr :10,\n \t\t\tskip_patch :12;\n-} patches[] = {\n+} const patches[] = {\n \t{ aic_patch1_func, 4, 1, 1 },\n \t{ aic_patch2_func, 6, 2, 1 },\n \t{ aic_patch2_func, 9, 1, 1 },\n@@ -1284,7 +1284,7 @@\n static struct cs {\n \tu_int16_t\tbegin;\n \tu_int16_t\tend;\n-} critical_sections[] = {\n+} const critical_sections[] = {\n \t{ 11, 18 },\n \t{ 21, 30 },\n \t{ 700, 716 },\n"} {"commit":"e29c2edf08220b634c671d1cef2d57d716a92ae3","subject":"Don't exclude line","message":"Don't exclude line\n","repos":"jobovy\/galpy,jobovy\/galpy,jobovy\/galpy,jobovy\/galpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- galpy\/potential\/potential_c_ext\/NonInertialFrameForce.c\n+++ galpy\/potential\/potential_c_ext\/NonInertialFrameForce.c\n@@ -96,10 +96,8 @@\n double Fx, Fy, Fz;\n if ( R != cached_R || phi != cached_phi || z != cached_z || t != cached_t \\\n || vR != cached_vR || vT != cached_vT || vz != cached_vz )\n- \/\/ LCOV_EXCL_START\n NonInertialFrameForcexyzforces_xyz(R,z,phi,t,vR,vT,vz,\n &Fx,&Fy,&Fz,potentialArgs);\n- \/\/ LCOV_EXCL_STOP\n else {\n \/\/ LCOV_EXCL_START\n Fx= *(args + 8);\n"} {"commit":"97b9f7517f59d4bbe3a772b5bc19e1cc5f53ae24","subject":"Check for existence of module before running script.","message":"Check for existence of module before running script.\n","repos":"ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gram\/jobmanager\/source\/globus_gram_job_manager_script.c\n+++ gram\/jobmanager\/source\/globus_gram_job_manager_script.c\n@@ -490,6 +490,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_poll()\\n\" );\n \n@@ -577,6 +582,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_script_cancel()\\n\" );\n \n@@ -645,6 +655,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_signal()\\n\" );\n \n@@ -704,6 +719,11 @@\n \n script_arg_file = tempnam(NULL, \"gram_make_scratchdir\");\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n if (!request)\n return(GLOBUS_FAILURE);\n \n@@ -766,6 +786,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n if (!request->scratchdir)\n \treturn(GLOBUS_FAILURE);\n \n@@ -831,6 +856,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_script_stage_in()\\n\" );\n \n@@ -891,6 +921,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_script_stage_out()\\n\" );\n \n@@ -951,6 +986,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n globus_gram_job_manager_request_log(request,\n \"JMI: in globus_gram_job_manager_script_file_cleanup()\\n\" );\n \n@@ -1011,6 +1051,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n if ((script_arg_fp = fopen(script_arg_file, \"w\")) == NULL)\n {\n \tglobus_gram_job_manager_request_log(request,\n@@ -1066,6 +1111,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n if ((script_arg_fp = fopen(script_arg_file, \"w\")) == NULL)\n {\n \tglobus_gram_job_manager_request_log(request,\n@@ -1124,6 +1174,11 @@\n if (!request)\n return(GLOBUS_FAILURE);\n \n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n+\n if ((script_arg_fp = fopen(script_arg_file, \"w\")) == NULL)\n {\n \tglobus_gram_job_manager_request_log(request,\n@@ -1182,6 +1237,11 @@\n \n if (!request)\n return(GLOBUS_FAILURE);\n+\n+ rc = globus_l_gram_request_validate(request);\n+\n+ if (rc != GLOBUS_SUCCESS)\n+ return rc;\n \n if ((script_arg_fp = fopen(script_arg_file, \"w\")) == NULL)\n {\n"} {"commit":"c69b12bf9550fe34ff5c3312c5ffe9bbbbb6e1b1","subject":"queue2: Post errors if we receive EOS after downstream reported an error","message":"queue2: Post errors if we receive EOS after downstream reported an error\n\nThere will be no further data flow that would allow us to propagate the\nerror upstream, causing nobody at all to post an error message.\n","repos":"jpakkane\/gstreamer,jpakkane\/gstreamer,surround-io\/gstreamer,surround-io\/gstreamer,surround-io\/gstreamer,jpakkane\/gstreamer,surround-io\/gstreamer,jpakkane\/gstreamer,surround-io\/gstreamer,jpakkane\/gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- plugins\/elements\/gstqueue2.c\n+++ plugins\/elements\/gstqueue2.c\n@@ -2286,6 +2286,25 @@\n if (GST_EVENT_IS_SERIALIZED (event)) {\n \/* serialized events go in the queue *\/\n GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->sinkresult, out_flushing);\n+ if (queue->srcresult != GST_FLOW_OK) {\n+ \/* Errors in sticky event pushing are no problem and ignored here\n+ * as they will cause more meaningful errors during data flow.\n+ * For EOS events, that are not followed by data flow, we still\n+ * return FALSE here though and report an error.\n+ *\/\n+ if (!GST_EVENT_IS_STICKY (event)) {\n+ goto out_flow_error;\n+ } else if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {\n+ if (queue->srcresult == GST_FLOW_NOT_LINKED\n+ || queue->srcresult < GST_FLOW_EOS) {\n+ GST_ELEMENT_ERROR (queue, STREAM, FAILED,\n+ (_(\"Internal data flow error.\")),\n+ (\"streaming task paused, reason %s (%d)\",\n+ gst_flow_get_name (queue->srcresult), queue->srcresult));\n+ }\n+ goto out_flow_error;\n+ }\n+ }\n \/* refuse more events on EOS *\/\n if (queue->is_eos)\n goto out_eos;\n@@ -2310,6 +2329,15 @@\n out_eos:\n {\n GST_DEBUG_OBJECT (queue, \"refusing event, we are EOS\");\n+ GST_QUEUE2_MUTEX_UNLOCK (queue);\n+ gst_event_unref (event);\n+ return FALSE;\n+ }\n+out_flow_error:\n+ {\n+ GST_LOG_OBJECT (queue,\n+ \"refusing event, we have a downstream flow error: %s\",\n+ gst_flow_get_name (queue->srcresult));\n GST_QUEUE2_MUTEX_UNLOCK (queue);\n gst_event_unref (event);\n return FALSE;\n"} {"commit":"b0c7e1e5db2a52dd88740a79db592daff3108b0e","subject":"helper: turn do-while into while.","message":"helper: turn do-while into while.\n","repos":"mumble-voip\/sbcelt,mkrautz\/sbcelt,mkrautz\/sbcelt,SuperTux88\/sbcelt,mkrautz\/sbcelt,mumble-voip\/sbcelt,mkrautz\/sbcelt,SuperTux88\/sbcelt,mumble-voip\/sbcelt,SuperTux88\/sbcelt,mumble-voip\/sbcelt,SuperTux88\/sbcelt","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- helper\/sbcelt-helper.c\n+++ helper\/sbcelt-helper.c\n@@ -84,12 +84,12 @@\n \t\tfloat *dst = &workpage->decbuf[0];\n \n \t\t\/\/ Wait for the lib to signal us.\n-\t\tdo {\n+\t\twhile (workpage->ready == 1) {\n \t\t\tint err = futex_wait(&workpage->ready, 1);\n \t\t\tif (err == 0 || err == EWOULDBLOCK) {\n \t\t\t\tbreak;\n \t\t\t}\n-\t\t} while (workpage->ready == 1);\n+\t\t}\n \n \t\tdebugf(\"waiting for work...\");\n \n"} {"commit":"68bc851677ac8d66362f6af2eaf88d5469ffc9bb","subject":"objstore: move loaded vdev information into a structure","message":"objstore: move loaded vdev information into a structure\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/nx01","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/objstore\/vdev.c\n+++ src\/objstore\/vdev.c\n@@ -27,8 +27,11 @@\n \n static struct mem_cache *vdev_cache;\n \n-static struct lock vdevs_lock;\n-static struct list vdevs;\n+static struct {\n+\tstruct lock lock;\n+\tstruct list list;\n+\tsize_t count;\n+} loaded_vdevs;\n \n int vdev_init(void)\n {\n@@ -36,9 +39,9 @@\n \tif (IS_ERR(vdev_cache))\n \t\treturn PTR_ERR(vdev_cache);\n \n-\tmxinit(&vdevs_lock);\n+\tmxinit(&loaded_vdevs.lock);\n \n-\tlist_create(&vdevs, sizeof(struct objstore_vdev),\n+\tlist_create(&loaded_vdevs.list, sizeof(struct objstore_vdev),\n \t\t offsetof(struct objstore_vdev, node));\n \n \treturn 0;\n@@ -46,9 +49,9 @@\n \n void vdev_fini(void)\n {\n-\tlist_destroy(&vdevs);\n+\tlist_destroy(&loaded_vdevs.list);\n \n-\tmxdestroy(&vdevs_lock);\n+\tmxdestroy(&loaded_vdevs.lock);\n \n \tmem_cache_destroy(vdev_cache);\n }\n@@ -118,9 +121,9 @@\n \tif (ret)\n \t\tgoto err;\n \n-\tmxlock(&vdevs_lock);\n-\tlist_insert_tail(&vdevs, vdev_getref(vdev));\n-\tmxunlock(&vdevs_lock);\n+\tmxlock(&loaded_vdevs.lock);\n+\tlist_insert_tail(&loaded_vdevs.list, vdev_getref(vdev));\n+\tmxunlock(&loaded_vdevs.lock);\n \n \treturn vdev;\n \n"} {"commit":"4d33b7de07f1d240dc531c612d3be96a05446929","subject":"comments tidyup","message":"comments tidyup\n","repos":"memo\/ofxMSATensorFlow,memo\/ofxMSATensorFlow,memo\/ofxMSATensorFlow,memo\/ofxMSATensorFlow","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/ofxMSATFUtils.h\n+++ src\/ofxMSATFUtils.h\n@@ -1,3 +1,7 @@\n+\/*\n+ * General helper functions\n+ *\/\n+\n #pragma once\n \n #include \"ofxMSATFIncludes.h\"\n@@ -17,68 +21,54 @@\n \n \/\/--------------------------------------------------------------\n \/\/ TENSOR DATA COPY FUNCTIONS\n-\/\/ src & dest must be of same TYPE otherwise will fail\/assert\/crash! (e.g. Tensor<float>, ofImage<float, vector<float>\n+\/\/ src & dest must be of same TYPE otherwise will fail\/assert\/crash! (e.g. Tensor<float>, ofImage<float>, vector<float>\n \/\/ src & dest can be different shapes but must be SAME NUMBER OF ELEMENTS, bounds checking is not done, will crash if src is larger than dest\n \/\/ do_memcpy is very fast, but could be dangerous due to alignment issues?\n-\/\/ (PS using explicit function names, because I find it more readable and less bug prone\n-\n-\/\/ flatten tensor and copy into std::vector. vector will be allocated if nessecary\n-template<typename T>\n-void tensorToVector(const tensorflow::Tensor &src, std::vector<T> &dst, bool do_memcpy=false);\n+\/\/ (PS using explicit function names, because I find it more readable and less bug prone)\n+\n+\/\/ flatten tensor and copy into 1D std::vector. vector will be allocated if nessecary\n+template<typename T> void tensorToVector(const tensorflow::Tensor &src, std::vector<T> &dst, bool do_memcpy=false);\n \n \/\/ copy into pixels. dst won't be reshaped if it's already allocated. otherwise it'll be allocated according to tensorPixelDims(, chmap)\n-template<typename T>\n-void tensorToPixels(const tensorflow::Tensor &src, ofPixels_<T> &dst, bool do_memcpy=false, string chmap = \"120\");\n+template<typename T> void tensorToPixels(const tensorflow::Tensor &src, ofPixels_<T> &dst, bool do_memcpy=false, string chmap = \"120\");\n \n \/\/ copy into image. dst won't be reshaped if it's already allocated. otherwise it'll be allocated according to tensorPixelDims(, chmap)\n-template<typename T>\n-void tensorToImage(const tensorflow::Tensor &src, ofImage_<T> &dst, bool do_memcpy=false, string chmap = \"120\");\n+template<typename T> void tensorToImage(const tensorflow::Tensor &src, ofImage_<T> &dst, bool do_memcpy=false, string chmap = \"120\");\n \n \/\/ flatten tensor and copy into array. array must already be allocated\n-template<typename T>\n-void tensorToArray(const tensorflow::Tensor &src, T *dst, bool do_memcpy=false);\n-\n-\n-\/\/ copy std::vector into flattened tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void vectorToTensor(const std::vector<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n+template<typename T> void tensorToArray(const tensorflow::Tensor &src, T *dst, bool do_memcpy=false);\n+\n+\n+\/\/ copy std::vector into tensor. tensor must already be allocated and will not be reshaped\n+template<typename T> void vectorToTensor(const std::vector<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n \n \/\/ copy pixels into tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void pixelsToTensor(const ofPixels_<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n+template<typename T> void pixelsToTensor(const ofPixels_<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n \n \/\/ copy image into tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void imageToTensor(const ofImage_<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n-\n-\/\/ copy array into flattened tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void arrayToTensor(const T *src, tensorflow::Tensor &dst, bool do_memcpy=false);\n+template<typename T> void imageToTensor(const ofImage_<T> &src, tensorflow::Tensor &dst, bool do_memcpy=false);\n+\n+\/\/ copy array into tensor. tensor must already be allocated and will not be reshaped\n+template<typename T> void arrayToTensor(const T *src, tensorflow::Tensor &dst, bool do_memcpy=false);\n \n \n \/\/--------------------------------------------------------------\n \/\/ convert grayscale float image into RGB float image where R -ve and B is +ve\n \/\/ dst image is allocated if nessecary\n-template<typename T>\n-void grayToColor(const ofPixels_<T> &src, ofPixels_<T> &dst, float scaler=1.0f);\n-\n-template<typename T>\n-void grayToColor(const ofImage_<T> &src, ofImage_<T> &dst, float scaler=1.0f);\n-\n+template<typename T> void grayToColor(const ofPixels_<T> &src, ofPixels_<T> &dst, float scaler=1.0f);\n+template<typename T> void grayToColor(const ofImage_<T> &src, ofImage_<T> &dst, float scaler=1.0f);\n \n \n \/\/--------------------------------------------------------------\n \/\/ pass in tensor (usually containing scores or probabilities of labels) and number of top items desired\n-\/\/ function returns topk scores and corresponding indices\n+\/\/ function returns top_k scores and corresponding indices\n inline void getTopScores(tensorflow::Tensor scores_tensor, int topk_count, vector<int> &out_indices, vector<float> &out_scores);\n \n \n \/\/ Takes a file name, and loads a list of labels from it, one per line, and\n \/\/ returns a vector of the strings. It pads with empty strings so the length\n \/\/ of the result is a multiple of 16, because our model expects that.\n-static bool readLabelsFile(string file_name, vector<string>& result);\n-\n-\n+bool readLabelsFile(string file_name, vector<string>& result);\n \n \n \/\/ IMPLEMENTATIONS\n@@ -100,7 +90,7 @@\n \/\/--------------------------------------------------------------\n \n \n-\/\/ return dimensions of an image to hold the Tensor: [x: width, y: height, z: depth (number of channels)]\n+\/\/--------------------------------------------------------------\n ofVec3f tensorToPixelDims(const tensorflow::Tensor &t, string chmap) {\n int rank = t.shape().dims();\n vector<int> tensor_dims(rank);\n@@ -134,18 +124,14 @@\n \n \n \/\/--------------------------------------------------------------\n-\/\/ flatten tensor and copy into std::vector. vector will be allocated if nessecary\n-template<typename T>\n-void tensorToVector(const tensorflow::Tensor &src, std::vector<T> &dst, bool do_memcpy) {\n+template<typename T> void tensorToVector(const tensorflow::Tensor &src, std::vector<T> &dst, bool do_memcpy) {\n if(dst.size() != src.NumElements()) dst.resize(src.NumElements());\n tensorToArray(src, dst.data(), do_memcpy);\n }\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy into pixels. dst won't be reshaped if it's already allocated. otherwise it'll be allocated according to tensorPixelDims(, chmap)\n-template<typename T>\n-void tensorToPixels(const tensorflow::Tensor &src, ofPixels_<T> &dst, bool do_memcpy, string chmap) {\n+template<typename T> void tensorToPixels(const tensorflow::Tensor &src, ofPixels_<T> &dst, bool do_memcpy, string chmap) {\n if(!dst.isAllocated()) {\n ofVec3f dims(tensorToPixelDims(src, chmap));\n dst.allocate((int)dims.x, (int)dims.y, (int)dims.z);\n@@ -156,9 +142,7 @@\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy into image. dst won't be reshaped if it's already allocated. otherwise it'll be allocated according to tensorPixelDims(, chmap)\n-template<typename T>\n-void tensorToImage(const tensorflow::Tensor &src, ofImage_<T> &dst, bool do_memcpy, string chmap) {\n+template<typename T> void tensorToImage(const tensorflow::Tensor &src, ofImage_<T> &dst, bool do_memcpy, string chmap) {\n if(!dst.isAllocated()) {\n ofVec3f dims(tensorToPixelDims(src, chmap));\n dst.allocate((int)dims.x, (int)dims.y, dims.z == 1 ? OF_IMAGE_GRAYSCALE : (dims.z == 3 ? OF_IMAGE_COLOR : OF_IMAGE_COLOR_ALPHA));\n@@ -169,9 +153,7 @@\n \n \n \/\/--------------------------------------------------------------\n-\/\/ flatten tensor and copy into array. array must already be allocated\n-template<typename T>\n-void tensorToArray(const tensorflow::Tensor &src, T *dst, bool do_memcpy) {\n+template<typename T> void tensorToArray(const tensorflow::Tensor &src, T *dst, bool do_memcpy) {\n auto src_data = src.flat<T>().data();\n int n = src.NumElements();\n if(do_memcpy) memcpy(dst, src_data, n * sizeof(T));\n@@ -180,33 +162,25 @@\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy std::vector into flattened tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void vectorToTensor(const std::vector<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n+template<typename T> void vectorToTensor(const std::vector<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n arrayToTensor(src.data(), dst, do_memcpy);\n }\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy pixels into tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void pixelsToTensor(const ofPixels_<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n+template<typename T> void pixelsToTensor(const ofPixels_<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n arrayToTensor(src.getData(), dst, do_memcpy);\n }\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy image into tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void imageToTensor(const ofImage_<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n+template<typename T> void imageToTensor(const ofImage_<T> &src, tensorflow::Tensor &dst, bool do_memcpy) {\n pixelsToTensor(src.getPixels(), dst, do_memcpy);\n }\n \n \n \/\/--------------------------------------------------------------\n-\/\/ copy array into flattened tensor. tensor must already be allocated and will not be reshaped\n-template<typename T>\n-void arrayToTensor(const T *in, tensorflow::Tensor &dst, bool do_memcpy) {\n+template<typename T> void arrayToTensor(const T *in, tensorflow::Tensor &dst, bool do_memcpy) {\n auto dst_data = dst.flat<T>().data();\n int n = dst.NumElements();\n if(do_memcpy) memcpy(dst_data, in, n * sizeof(T));\n@@ -215,10 +189,7 @@\n \n \n \/\/--------------------------------------------------------------\n-\/\/ convert grayscale float image into RGB float image where R -ve and B is +ve\n-\/\/ dst image is allocated if nessecary\n-template<typename T>\n-void grayToColor(const ofPixels_<T> &src, ofPixels_<T> &dst, float scaler) {\n+template<typename T> void grayToColor(const ofPixels_<T> &src, ofPixels_<T> &dst, float scaler) {\n dst.allocate(src.getWidth(), src.getHeight(), 3);\n const T *src_data = src.getData();\n T *dst_data = dst.getData();\n@@ -231,8 +202,7 @@\n }\n \n \/\/--------------------------------------------------------------\n-template<typename T>\n-void grayToColor(const ofImage_<T> &src, ofImage_<T> &dst, float scaler) {\n+template<typename T> void grayToColor(const ofImage_<T> &src, ofImage_<T> &dst, float scaler) {\n grayToColor(src.getPixels(), dst.getPixels(), scaler);\n dst.update();\n }\n@@ -261,7 +231,6 @@\n }\n \n \n-\n \/\/--------------------------------------------------------------\n bool readLabelsFile(string file_name, vector<string>& result) {\n std::ifstream file(file_name);\n@@ -283,6 +252,5 @@\n }\n \n \n-\n } \/\/ namespace tf\n } \/\/ namespace msa\n"} {"commit":"20c4e1218a7ec8d6db8ea5f0757e0213751eeaf1","subject":"unbreak 32-bit kernel builds by forcing ULL for the new macros; ok naddy@","message":"unbreak 32-bit kernel builds by forcing ULL for the new macros; ok naddy@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/if_bgereg.h\n+++ dev\/pci\/if_bgereg.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: if_bgereg.h,v 1.120 2014\/01\/28 00:39:22 brad Exp $\t*\/\n+\/*\t$OpenBSD: if_bgereg.h,v 1.121 2014\/01\/28 14:08:29 sthen Exp $\t*\/\n \n \/*\n * Copyright (c) 2001 Wind River Systems\n@@ -2844,39 +2844,39 @@\n \tu_int32_t\t\tbge_expmrq;\n \tu_int32_t\t\tbge_lasttag;\n \tu_int64_t\t\tbge_flags;\n-#define\tBGE_TXRING_VALID\t0x0000000000000001\n-#define\tBGE_RXRING_VALID\t0x0000000000000002\n-#define\tBGE_JUMBO_RXRING_VALID\t0x0000000000000004\n-#define\tBGE_RX_ALIGNBUG\t\t0x0000000000000008\n-#define\tBGE_NO_3LED\t\t0x0000000000000010\n-#define\tBGE_PCIX\t\t0x0000000000000020\n-#define\tBGE_PCIE\t\t0x0000000000000040\n-#define\tBGE_ASF_MODE\t\t0x0000000000000080\n-#define\tBGE_NO_EEPROM\t\t0x0000000000000100\n-#define\tBGE_JUMBO_CAPABLE\t0x0000000000000200\n-#define\tBGE_10_100_ONLY\t\t0x0000000000000400\n-#define\tBGE_PHY_FIBER_TBI\t0x0000000000000800\n-#define\tBGE_PHY_FIBER_MII\t0x0000000000001000\n-#define\tBGE_PHY_CRC_BUG\t\t0x0000000000002000\n-#define\tBGE_PHY_ADC_BUG\t\t0x0000000000004000\n-#define\tBGE_PHY_5704_A0_BUG\t0x0000000000008000\n-#define\tBGE_PHY_JITTER_BUG\t0x0000000000010000\n-#define\tBGE_PHY_BER_BUG\t\t0x0000000000020000\n-#define\tBGE_PHY_ADJUST_TRIM\t0x0000000000040000\n-#define\tBGE_NO_ETH_WIRE_SPEED\t0x0000000000080000\n-#define\tBGE_IS_5788\t\t0x0000000000100000\n-#define\tBGE_5705_PLUS\t\t0x0000000000200000\n-#define\tBGE_575X_PLUS\t\t0x0000000000400000\n-#define\tBGE_5755_PLUS\t\t0x0000000000800000\n-#define\tBGE_5714_FAMILY\t\t0x0000000001000000\n-#define\tBGE_5700_FAMILY\t\t0x0000000002000000\n-#define\tBGE_5717_PLUS\t\t0x0000000004000000\n-#define\tBGE_57765_PLUS\t\t0x0000000008000000\n-#define\tBGE_APE\t\t\t0x0000000010000000\n-#define\tBGE_CPMU_PRESENT\t0x0000000020000000\n-#define\tBGE_TAGGED_STATUS\t0x0000000040000000\n-#define\tBGE_MSI\t\t\t0x0000000080000000\n-#define\tBGE_RDMA_BUG\t\t0x0000000100000000\n+#define\tBGE_TXRING_VALID\t0x0000000000000001ULL\n+#define\tBGE_RXRING_VALID\t0x0000000000000002ULL\n+#define\tBGE_JUMBO_RXRING_VALID\t0x0000000000000004ULL\n+#define\tBGE_RX_ALIGNBUG\t\t0x0000000000000008ULL\n+#define\tBGE_NO_3LED\t\t0x0000000000000010ULL\n+#define\tBGE_PCIX\t\t0x0000000000000020ULL\n+#define\tBGE_PCIE\t\t0x0000000000000040ULL\n+#define\tBGE_ASF_MODE\t\t0x0000000000000080ULL\n+#define\tBGE_NO_EEPROM\t\t0x0000000000000100ULL\n+#define\tBGE_JUMBO_CAPABLE\t0x0000000000000200ULL\n+#define\tBGE_10_100_ONLY\t\t0x0000000000000400ULL\n+#define\tBGE_PHY_FIBER_TBI\t0x0000000000000800ULL\n+#define\tBGE_PHY_FIBER_MII\t0x0000000000001000ULL\n+#define\tBGE_PHY_CRC_BUG\t\t0x0000000000002000ULL\n+#define\tBGE_PHY_ADC_BUG\t\t0x0000000000004000ULL\n+#define\tBGE_PHY_5704_A0_BUG\t0x0000000000008000ULL\n+#define\tBGE_PHY_JITTER_BUG\t0x0000000000010000ULL\n+#define\tBGE_PHY_BER_BUG\t\t0x0000000000020000ULL\n+#define\tBGE_PHY_ADJUST_TRIM\t0x0000000000040000ULL\n+#define\tBGE_NO_ETH_WIRE_SPEED\t0x0000000000080000ULL\n+#define\tBGE_IS_5788\t\t0x0000000000100000ULL\n+#define\tBGE_5705_PLUS\t\t0x0000000000200000ULL\n+#define\tBGE_575X_PLUS\t\t0x0000000000400000ULL\n+#define\tBGE_5755_PLUS\t\t0x0000000000800000ULL\n+#define\tBGE_5714_FAMILY\t\t0x0000000001000000ULL\n+#define\tBGE_5700_FAMILY\t\t0x0000000002000000ULL\n+#define\tBGE_5717_PLUS\t\t0x0000000004000000ULL\n+#define\tBGE_57765_PLUS\t\t0x0000000008000000ULL\n+#define\tBGE_APE\t\t\t0x0000000010000000ULL\n+#define\tBGE_CPMU_PRESENT\t0x0000000020000000ULL\n+#define\tBGE_TAGGED_STATUS\t0x0000000040000000ULL\n+#define\tBGE_MSI\t\t\t0x0000000080000000ULL\n+#define\tBGE_RDMA_BUG\t\t0x0000000100000000ULL\n \n \tbus_dma_tag_t\t\tbge_dmatag;\n \tu_int32_t\t\tbge_mfw_flags; \/* Management F\/W flags *\/\n"} {"commit":"3c2c5c7f0fee34a2f3f5520bdd906a6e466edafe","subject":"out_http: use kv interface to query properties","message":"out_http: use kv interface to query properties\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@treasure-data.com>\n","repos":"fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/out_http\/http_conf.c\n+++ plugins\/out_http\/http_conf.c\n@@ -23,6 +23,7 @@\n #include <fluent-bit\/flb_utils.h>\n #include <fluent-bit\/flb_pack.h>\n #include <fluent-bit\/flb_sds.h>\n+#include <fluent-bit\/flb_kv.h>\n \n #include \"http.h\"\n #include \"http_conf.h\"\n@@ -42,7 +43,7 @@\n struct mk_list *head;\n struct mk_list *split = NULL;\n struct flb_split_entry *sentry;\n- struct flb_config_prop *prop;\n+ struct flb_kv *kv;\n struct out_http_header *header;\n \n \/* Allocate plugin context *\/\n@@ -280,14 +281,14 @@\n mk_list_init(&ctx->headers);\n \n mk_list_foreach(head, &ins->properties) {\n- prop = mk_list_entry(head, struct flb_config_prop, _head);\n- split = flb_utils_split(prop->val, ' ', 1);\n+ kv = mk_list_entry(head, struct flb_kv, _head);\n+ split = flb_utils_split(kv->val, ' ', 1);\n \n if (!split) {\n continue;\n }\n \n- if (strcasecmp(prop->key, \"header\") == 0) {\n+ if (strcasecmp(kv->key, \"header\") == 0) {\n header = flb_malloc(sizeof(struct out_http_header));\n if (!header) {\n flb_errno();\n@@ -299,7 +300,7 @@\n sentry = mk_list_entry_first(split, struct flb_split_entry,\n _head);\n \n- len = strlen(prop->val);\n+ len = flb_sds_len(kv->val);\n if (sentry->last_pos == len) {\n \/* Missing value *\/\n flb_error(\"[out_http] missing header value\");\n@@ -317,7 +318,7 @@\n * Header Value: compose using the offset value from\n * the first split entry.\n *\/\n- header->val = flb_strndup(prop->val + sentry->last_pos,\n+ header->val = flb_strndup(kv->val + sentry->last_pos,\n len - sentry->last_pos);\n header->val_len = strlen(header->val);\n mk_list_add(&header->_head, &ctx->headers);\n"} {"commit":"8ea971bfefb687a813f5b7cb62137b5d7b742dee","subject":"avoid immintrin.h in SkNx_sse.h","message":"avoid immintrin.h in SkNx_sse.h\n\nIncluding <immintrin.h> is an easy way to get all the supported\nIntel intrinsics for the current build flags, and for intrinsics\nsince AVX, the only supported way.\n\nBut, including immintrin.h can pull in more headers than needed,\nand for pieces of code like SkNx.h, that extra include cost is\nmeasurable. Here we'll include only the intrisnics we'll use.\n\n $ gn clean out && time ninja -C out\n\n Before: 131.57 real 4207.95 user 249.18 sys\n After: 125.60 real 3988.18 user 241.64 sys\n\nSeems like a win.\n\nChange-Id: I81543202d889be403ff0aa393c13c19ed89c5373\nReviewed-on: https:\/\/skia-review.googlesource.com\/134325\nReviewed-by: Hal Canary <fd9641b23487c8ee78406c27513624c460600766@google.com>\nCommit-Queue: Hal Canary <fd9641b23487c8ee78406c27513624c460600766@google.com>\nAuto-Submit: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@chromium.org>\n","repos":"Hikari-no-Tenshi\/android_external_skia,google\/skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,google\/skia,HalCanary\/skia-hc,rubenvb\/skia,google\/skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,rubenvb\/skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,rubenvb\/skia,HalCanary\/skia-hc,rubenvb\/skia,google\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,google\/skia,google\/skia,HalCanary\/skia-hc,rubenvb\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,google\/skia,HalCanary\/skia-hc,google\/skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/opts\/SkNx_sse.h\n+++ src\/opts\/SkNx_sse.h\n@@ -8,7 +8,15 @@\n #ifndef SkNx_sse_DEFINED\n #define SkNx_sse_DEFINED\n \n-#include <immintrin.h>\n+#include \"SkTypes.h\"\n+\n+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41\n+ #include <smmintrin.h>\n+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3\n+ #include <tmmintrin.h>\n+#else\n+ #include <emmintrin.h>\n+#endif\n \n \/\/ This file may assume <= SSE2, but must check SK_CPU_SSE_LEVEL for anything more recent.\n \/\/ If you do, make sure this is in a static inline function... anywhere else risks violating ODR.\n"} {"commit":"cd85c55c555bd75472848a610a6e53b79ae6d87e","subject":"ViewSonic Airsync Prism 2.5 USB wlan, id found in linux-wlan driver.","message":"ViewSonic Airsync Prism 2.5 USB wlan, id found in linux-wlan driver.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/usb\/if_wi_usb.c\n+++ dev\/usb\/if_wi_usb.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: if_wi_usb.c,v 1.23 2005\/10\/31 05:37:13 jsg Exp $ *\/\n+\/*\t$OpenBSD: if_wi_usb.c,v 1.24 2005\/11\/19 08:23:41 jsg Exp $ *\/\n \n \/*\n * Copyright (c) 2003 Dale Rahn. All rights reserved.\n@@ -257,6 +257,7 @@\n \t{{ USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_0193 }, 0 },\n \t{{ USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZYAIR_B200 }, 0 },\n \t{{ USB_VENDOR_USR, USB_PRODUCT_USR_USR1120 }, 0 },\n+\t{{ USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_AIRSYNC }, 0 },\n \t{{ USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_XI725 }, 0 },\n \t{{ USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_XI735 }, 0 }\n };\n"} {"commit":"cfbf0eb134efd1c5d9a589f6ae2139d7fad60581","subject":"Make the GHCi linker handle partially stripped object files (#5004)","message":"Make the GHCi linker handle partially stripped object files (#5004)\n\nWhen you use 'strip --strip-unneeded' on a ELF format .o or .a file, if\nthe object file has no global\/exported symbols then 'strip' ends up\nremoving the symbol table entirely. Previously the GHCi linker assumed\nthere would always be exactly one symbol table and exactly one string\ntable. In fact, in ELF object files there is no such limitation, instead\neach section points to the other sections it needs, in particular\nrelocation sections have a link to the symbol table section they use and\nsymbol table sections have a link to the corresponding string table.\nSo instead of assuming there will always be a global symbol and string\ntable, all we have to do is validate and follow these links. Then, when\nwe encounter an empty object file that has no symbols then we handle it\ncorrectly, because since it's empty we never process any relocations and\nso never have to follow any links to non-existant symbol tables.\n\nAlso, in the case where an object is fully stripped, we can now detect\nthis more reliably and emit a more helpful error message, e.g:\n\nlibHSghc-7.1.20110509.a(DsMeta.o): relocation section #2 has no symbol table\nThis object file has probably been fully striped. Such files cannot be linked.\n","repos":"christiaanb\/ghc,ekmett\/ghc,hferreiro\/replay,bitemyapp\/ghc,oldmanmike\/ghc,tjakway\/ghcjvm,da-x\/ghc,TomMD\/ghc,mfine\/ghc,ezyang\/ghc,holzensp\/ghc,urbanslug\/ghc,ezyang\/ghc,shlevy\/ghc,acowley\/ghc,oldmanmike\/ghc,elieux\/ghc,ml9951\/ghc,forked-upstream-packages-for-ghcjs\/ghc,siddhanathan\/ghc,nushio3\/ghc,wxwxwwxxx\/ghc,holzensp\/ghc,vikraman\/ghc,nomeata\/ghc,da-x\/ghc,holzensp\/ghc,forked-upstream-packages-for-ghcjs\/ghc,siddhanathan\/ghc,siddhanathan\/ghc,ryantm\/ghc,da-x\/ghc,anton-dessiatov\/ghc,lukexi\/ghc-7.8-arm64,ryantm\/ghc,nkaretnikov\/ghc,vTurbine\/ghc,nathyong\/microghc-ghc,acowley\/ghc,vikraman\/ghc,mcschroeder\/ghc,shlevy\/ghc,gridaphobe\/ghc,ekmett\/ghc,jstolarek\/ghc,nathyong\/microghc-ghc,gridaphobe\/ghc,GaloisInc\/halvm-ghc,ml9951\/ghc,AlexanderPankiv\/ghc,mcschroeder\/ghc,mfine\/ghc,wxwxwwxxx\/ghc,fmthoma\/ghc,mfine\/ghc,anton-dessiatov\/ghc,tibbe\/ghc,wxwxwwxxx\/ghc,elieux\/ghc,holzensp\/ghc,tjakway\/ghcjvm,fmthoma\/ghc,jstolarek\/ghc,AlexanderPankiv\/ghc,bitemyapp\/ghc,nomeata\/ghc,nomeata\/ghc,nathyong\/microghc-ghc,GaloisInc\/halvm-ghc,nathyong\/microghc-ghc,nathyong\/microghc-ghc,bitemyapp\/ghc,urbanslug\/ghc,ryantm\/ghc,christiaanb\/ghc,GaloisInc\/halvm-ghc,spacekitteh\/smcghc,christiaanb\/ghc,sdiehl\/ghc,ezyang\/ghc,tjakway\/ghcjvm,gridaphobe\/ghc,gridaphobe\/ghc,vikraman\/ghc,shlevy\/ghc,sgillespie\/ghc,mettekou\/ghc,gridaphobe\/ghc,ghc-android\/ghc,wxwxwwxxx\/ghc,green-haskell\/ghc,olsner\/ghc,lukexi\/ghc,nkaretnikov\/ghc,olsner\/ghc,snoyberg\/ghc,urbanslug\/ghc,sgillespie\/ghc,TomMD\/ghc,gcampax\/ghc,forked-upstream-packages-for-ghcjs\/ghc,mcmaniac\/ghc,acowley\/ghc,tjakway\/ghcjvm,green-haskell\/ghc,da-x\/ghc,mettekou\/ghc,ezyang\/ghc,siddhanathan\/ghc,mcschroeder\/ghc,da-x\/ghc,AlexanderPankiv\/ghc,mfine\/ghc,gcampax\/ghc,jstolarek\/ghc,tjakway\/ghcjvm,gcampax\/ghc,vTurbine\/ghc,TomMD\/ghc,lukexi\/ghc,AlexanderPankiv\/ghc,sdiehl\/ghc,mcschroeder\/ghc,vTurbine\/ghc,ilyasergey\/GHC-XAppFix,ml9951\/ghc,snoyberg\/ghc,frantisekfarka\/ghc-dsi,mcschroeder\/ghc,vikraman\/ghc,shlevy\/ghc,fmthoma\/ghc,oldmanmike\/ghc,sdiehl\/ghc,oldmanmike\/ghc,da-x\/ghc,bitemyapp\/ghc,ghc-android\/ghc,mettekou\/ghc,mcmaniac\/ghc,mcmaniac\/ghc,christiaanb\/ghc,mfine\/ghc,hferreiro\/replay,vTurbine\/ghc,vikraman\/ghc,ml9951\/ghc,GaloisInc\/halvm-ghc,forked-upstream-packages-for-ghcjs\/ghc,wxwxwwxxx\/ghc,oldmanmike\/ghc,jstolarek\/ghc,mfine\/ghc,hferreiro\/replay,ekmett\/ghc,green-haskell\/ghc,sgillespie\/ghc,sgillespie\/ghc,elieux\/ghc,GaloisInc\/halvm-ghc,sdiehl\/ghc,mcmaniac\/ghc,ilyasergey\/GHC-XAppFix,siddhanathan\/ghc,mcschroeder\/ghc,hferreiro\/replay,vTurbine\/ghc,mcmaniac\/ghc,nathyong\/microghc-ghc,jstolarek\/ghc,urbanslug\/ghc,frantisekfarka\/ghc-dsi,acowley\/ghc,christiaanb\/ghc,hferreiro\/replay,snoyberg\/ghc,vikraman\/ghc,wxwxwwxxx\/ghc,spacekitteh\/smcghc,mettekou\/ghc,bitemyapp\/ghc,gcampax\/ghc,sdiehl\/ghc,ml9951\/ghc,ekmett\/ghc,TomMD\/ghc,fmthoma\/ghc,lukexi\/ghc-7.8-arm64,ryantm\/ghc,nushio3\/ghc,ghc-android\/ghc,ezyang\/ghc,lukexi\/ghc,oldmanmike\/ghc,nkaretnikov\/ghc,gridaphobe\/ghc,olsner\/ghc,shlevy\/ghc,snoyberg\/ghc,mcschroeder\/ghc,tibbe\/ghc,nkaretnikov\/ghc,anton-dessiatov\/ghc,TomMD\/ghc,ghc-android\/ghc,sgillespie\/ghc,hferreiro\/replay,nkaretnikov\/ghc,anton-dessiatov\/ghc,vTurbine\/ghc,spacekitteh\/smcghc,AlexanderPankiv\/ghc,snoyberg\/ghc,fmthoma\/ghc,vTurbine\/ghc,nathyong\/microghc-ghc,fmthoma\/ghc,spacekitteh\/smcghc,ghc-android\/ghc,christiaanb\/ghc,ezyang\/ghc,green-haskell\/ghc,urbanslug\/ghc,GaloisInc\/halvm-ghc,mettekou\/ghc,anton-dessiatov\/ghc,ilyasergey\/GHC-XAppFix,gcampax\/ghc,nushio3\/ghc,oldmanmike\/ghc,gcampax\/ghc,anton-dessiatov\/ghc,urbanslug\/ghc,olsner\/ghc,ml9951\/ghc,elieux\/ghc,ilyasergey\/GHC-XAppFix,sgillespie\/ghc,GaloisInc\/halvm-ghc,hferreiro\/replay,shlevy\/ghc,ml9951\/ghc,nkaretnikov\/ghc,acowley\/ghc,AlexanderPankiv\/ghc,TomMD\/ghc,sdiehl\/ghc,urbanslug\/ghc,ekmett\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ezyang\/ghc,nomeata\/ghc,mettekou\/ghc,snoyberg\/ghc,frantisekfarka\/ghc-dsi,ghc-android\/ghc,sgillespie\/ghc,elieux\/ghc,lukexi\/ghc-7.8-arm64,nkaretnikov\/ghc,lukexi\/ghc-7.8-arm64,TomMD\/ghc,nushio3\/ghc,christiaanb\/ghc,shlevy\/ghc,frantisekfarka\/ghc-dsi,tjakway\/ghcjvm,fmthoma\/ghc,mettekou\/ghc,siddhanathan\/ghc,sdiehl\/ghc,nushio3\/ghc,lukexi\/ghc-7.8-arm64,nushio3\/ghc,gcampax\/ghc,lukexi\/ghc,ghc-android\/ghc,lukexi\/ghc,tibbe\/ghc,AlexanderPankiv\/ghc,da-x\/ghc,olsner\/ghc,elieux\/ghc,olsner\/ghc,olsner\/ghc,mfine\/ghc,vikraman\/ghc,tibbe\/ghc,holzensp\/ghc,siddhanathan\/ghc,spacekitteh\/smcghc,wxwxwwxxx\/ghc,ryantm\/ghc,nomeata\/ghc,tibbe\/ghc,frantisekfarka\/ghc-dsi,tjakway\/ghcjvm,gridaphobe\/ghc,snoyberg\/ghc,anton-dessiatov\/ghc,nushio3\/ghc,green-haskell\/ghc,forked-upstream-packages-for-ghcjs\/ghc,acowley\/ghc,ml9951\/ghc,forked-upstream-packages-for-ghcjs\/ghc,acowley\/ghc,elieux\/ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- rts\/Linker.c\n+++ rts\/Linker.c\n@@ -2335,6 +2335,7 @@\n \/\/ stgFree(oc->image);\n \/\/ #endif\n stgFree(oc->fileName);\n+ stgFree(oc->archiveMemberName);\n stgFree(oc->symbols);\n stgFree(oc->sections);\n stgFree(oc);\n@@ -3680,31 +3681,6 @@\n * Generic ELF functions\n *\/\n \n-static char *\n-findElfSection ( void* objImage, Elf_Word sh_type )\n-{\n- char* ehdrC = (char*)objImage;\n- Elf_Ehdr* ehdr = (Elf_Ehdr*)ehdrC;\n- Elf_Shdr* shdr = (Elf_Shdr*)(ehdrC + ehdr->e_shoff);\n- char* sh_strtab = ehdrC + shdr[ehdr->e_shstrndx].sh_offset;\n- char* ptr = NULL;\n- int i;\n-\n- for (i = 0; i < ehdr->e_shnum; i++) {\n- if (shdr[i].sh_type == sh_type\n- \/* Ignore the section header's string table. *\/\n- && i != ehdr->e_shstrndx\n- \/* Ignore string tables named .stabstr, as they contain\n- debugging info. *\/\n- && 0 != memcmp(\".stabstr\", sh_strtab + shdr[i].sh_name, 8)\n- ) {\n- ptr = ehdrC + shdr[i].sh_offset;\n- break;\n- }\n- }\n- return ptr;\n-}\n-\n static int\n ocVerifyImage_ELF ( ObjectCode* oc )\n {\n@@ -3712,7 +3688,6 @@\n Elf_Sym* stab;\n int i, j, nent, nstrtab, nsymtabs;\n char* sh_strtab;\n- char* strtab;\n \n char* ehdrC = (char*)(oc->image);\n Elf_Ehdr* ehdr = (Elf_Ehdr*)ehdrC;\n@@ -3794,20 +3769,64 @@\n ehdrC + shdr[i].sh_offset,\n ehdrC + shdr[i].sh_offset + shdr[i].sh_size - 1));\n \n- if (shdr[i].sh_type == SHT_REL) {\n- IF_DEBUG(linker,debugBelch(\"Rel \" ));\n- } else if (shdr[i].sh_type == SHT_RELA) {\n- IF_DEBUG(linker,debugBelch(\"RelA \" ));\n- } else {\n- IF_DEBUG(linker,debugBelch(\" \"));\n+#define SECTION_INDEX_VALID(ndx) (ndx > SHN_UNDEF && ndx < ehdr->e_shnum)\n+\n+ switch (shdr[i].sh_type) {\n+\n+ case SHT_REL:\n+ case SHT_RELA:\n+ IF_DEBUG(linker,debugBelch( shdr[i].sh_type == SHT_REL ? \"Rel \" : \"RelA \"));\n+\n+ if (!SECTION_INDEX_VALID(shdr[i].sh_link)) {\n+ if (shdr[i].sh_link == SHN_UNDEF)\n+ errorBelch(\"\\n%s: relocation section #%d has no symbol table\\n\"\n+ \"This object file has probably been fully striped. \"\n+ \"Such files cannot be linked.\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName, i);\n+ else\n+ errorBelch(\"\\n%s: relocation section #%d has an invalid link field (%d)\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName,\n+ i, shdr[i].sh_link);\n+ return 0;\n+ }\n+ if (shdr[shdr[i].sh_link].sh_type != SHT_SYMTAB) {\n+ errorBelch(\"\\n%s: relocation section #%d does not link to a symbol table\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName, i);\n+ return 0;\n+ }\n+ if (!SECTION_INDEX_VALID(shdr[i].sh_info)) {\n+ errorBelch(\"\\n%s: relocation section #%d has an invalid info field (%d)\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName,\n+ i, shdr[i].sh_info);\n+ return 0;\n+ }\n+\n+ break;\n+ case SHT_SYMTAB:\n+ IF_DEBUG(linker,debugBelch(\"Sym \"));\n+\n+ if (!SECTION_INDEX_VALID(shdr[i].sh_link)) {\n+ errorBelch(\"\\n%s: symbol table section #%d has an invalid link field (%d)\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName,\n+ i, shdr[i].sh_link);\n+ return 0;\n+ }\n+ if (shdr[shdr[i].sh_link].sh_type != SHT_STRTAB) {\n+ errorBelch(\"\\n%s: symbol table section #%d does not link to a string table\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName, i);\n+\n+ return 0;\n+ }\n+ break;\n+ case SHT_STRTAB: IF_DEBUG(linker,debugBelch(\"Str \")); break;\n+ default: IF_DEBUG(linker,debugBelch(\" \")); break;\n }\n if (sh_strtab) {\n IF_DEBUG(linker,debugBelch(\"sname=%s\\n\", sh_strtab + shdr[i].sh_name ));\n }\n }\n \n- IF_DEBUG(linker,debugBelch( \"\\nString tables\" ));\n- strtab = NULL;\n+ IF_DEBUG(linker,debugBelch( \"\\nString tables\\n\" ));\n nstrtab = 0;\n for (i = 0; i < ehdr->e_shnum; i++) {\n if (shdr[i].sh_type == SHT_STRTAB\n@@ -3817,18 +3836,16 @@\n debugging info. *\/\n && 0 != memcmp(\".stabstr\", sh_strtab + shdr[i].sh_name, 8)\n ) {\n- IF_DEBUG(linker,debugBelch(\" section %d is a normal string table\", i ));\n- strtab = ehdrC + shdr[i].sh_offset;\n+ IF_DEBUG(linker,debugBelch(\" section %d is a normal string table\\n\", i ));\n nstrtab++;\n }\n }\n- if (nstrtab != 1) {\n- errorBelch(\"%s: no string tables, or too many\", oc->fileName);\n- return 0;\n+ if (nstrtab == 0) {\n+ IF_DEBUG(linker,debugBelch(\" no normal string tables (potentially, but not necessarily a problem)\\n\"));\n }\n \n nsymtabs = 0;\n- IF_DEBUG(linker,debugBelch( \"\\nSymbol tables\" ));\n+ IF_DEBUG(linker,debugBelch( \"Symbol tables\\n\" ));\n for (i = 0; i < ehdr->e_shnum; i++) {\n if (shdr[i].sh_type != SHT_SYMTAB) continue;\n IF_DEBUG(linker,debugBelch( \"section %d is a symbol table\\n\", i ));\n@@ -3870,13 +3887,17 @@\n }\n IF_DEBUG(linker,debugBelch(\" \" ));\n \n- IF_DEBUG(linker,debugBelch(\"name=%s\\n\", strtab + stab[j].st_name ));\n+ IF_DEBUG(linker,debugBelch(\"name=%s\\n\",\n+ ehdrC + shdr[shdr[i].sh_link].sh_offset\n+ + stab[j].st_name ));\n }\n }\n \n if (nsymtabs == 0) {\n- errorBelch(\"%s: didn't find any symbol tables\", oc->fileName);\n- return 0;\n+ \/\/ Not having a symbol table is not in principle a problem.\n+ \/\/ When an object file has no symbols then the 'strip' program\n+ \/\/ typically will remove the symbol table entirely.\n+ IF_DEBUG(linker,debugBelch(\" no symbol tables (potentially, but not necessarily a problem)\\n\"));\n }\n \n return 1;\n@@ -3923,15 +3944,10 @@\n \n char* ehdrC = (char*)(oc->image);\n Elf_Ehdr* ehdr = (Elf_Ehdr*)ehdrC;\n- char* strtab = findElfSection ( ehdrC, SHT_STRTAB );\n+ char* strtab;\n Elf_Shdr* shdr = (Elf_Shdr*) (ehdrC + ehdr->e_shoff);\n \n ASSERT(symhash != NULL);\n-\n- if (!strtab) {\n- errorBelch(\"%s: no strtab\", oc->fileName);\n- return 0;\n- }\n \n k = 0;\n for (i = 0; i < ehdr->e_shnum; i++) {\n@@ -3965,12 +3981,16 @@\n \n \/* copy stuff into this module's object symbol table *\/\n stab = (Elf_Sym*) (ehdrC + shdr[i].sh_offset);\n+ strtab = ehdrC + shdr[shdr[i].sh_link].sh_offset;\n nent = shdr[i].sh_size \/ sizeof(Elf_Sym);\n \n oc->n_symbols = nent;\n oc->symbols = stgMallocBytes(oc->n_symbols * sizeof(char*),\n \"ocGetNames_ELF(oc->symbols)\");\n \n+ \/\/TODO: we ignore local symbols anyway right? So we can use the\n+ \/\/ shdr[i].sh_info to get the index of the first non-local symbol\n+ \/\/ ie we should use j = shdr[i].sh_info\n for (j = 0; j < nent; j++) {\n \n char isLocal = FALSE; \/* avoids uninit-var warning *\/\n@@ -4068,21 +4088,24 @@\n relocations appear to be of this form. *\/\n static int\n do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,\n- Elf_Shdr* shdr, int shnum,\n- Elf_Sym* stab, char* strtab )\n+ Elf_Shdr* shdr, int shnum )\n {\n int j;\n char *symbol;\n Elf_Word* targ;\n Elf_Rel* rtab = (Elf_Rel*) (ehdrC + shdr[shnum].sh_offset);\n+ Elf_Sym* stab;\n+ char* strtab;\n int nent = shdr[shnum].sh_size \/ sizeof(Elf_Rel);\n int target_shndx = shdr[shnum].sh_info;\n int symtab_shndx = shdr[shnum].sh_link;\n+ int strtab_shndx = shdr[symtab_shndx].sh_link;\n \n stab = (Elf_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset);\n+ strtab= (char*) (ehdrC + shdr[ strtab_shndx ].sh_offset);\n targ = (Elf_Word*)(ehdrC + shdr[ target_shndx ].sh_offset);\n- IF_DEBUG(linker,debugBelch( \"relocations for section %d using symtab %d\\n\",\n- target_shndx, symtab_shndx ));\n+ IF_DEBUG(linker,debugBelch( \"relocations for section %d using symtab %d and strtab %d\\n\",\n+ target_shndx, symtab_shndx, strtab_shndx ));\n \n \/* Skip sections that we're not interested in. *\/\n {\n@@ -4168,18 +4191,21 @@\n sparc-solaris relocations appear to be of this form. *\/\n static int\n do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,\n- Elf_Shdr* shdr, int shnum,\n- Elf_Sym* stab, char* strtab )\n+ Elf_Shdr* shdr, int shnum )\n {\n int j;\n char *symbol = NULL;\n Elf_Addr targ;\n Elf_Rela* rtab = (Elf_Rela*) (ehdrC + shdr[shnum].sh_offset);\n+ Elf_Sym* stab;\n+ char* strtab;\n int nent = shdr[shnum].sh_size \/ sizeof(Elf_Rela);\n int target_shndx = shdr[shnum].sh_info;\n int symtab_shndx = shdr[shnum].sh_link;\n+ int strtab_shndx = shdr[symtab_shndx].sh_link;\n \n stab = (Elf_Sym*) (ehdrC + shdr[ symtab_shndx ].sh_offset);\n+ strtab= (char*) (ehdrC + shdr[ strtab_shndx ].sh_offset);\n targ = (Elf_Addr) (ehdrC + shdr[ target_shndx ].sh_offset);\n IF_DEBUG(linker,debugBelch( \"relocations for section %d using symtab %d\\n\",\n target_shndx, symtab_shndx ));\n@@ -4448,35 +4474,20 @@\n static int\n ocResolve_ELF ( ObjectCode* oc )\n {\n- char *strtab;\n int shnum, ok;\n- Elf_Sym* stab = NULL;\n char* ehdrC = (char*)(oc->image);\n Elf_Ehdr* ehdr = (Elf_Ehdr*) ehdrC;\n Elf_Shdr* shdr = (Elf_Shdr*) (ehdrC + ehdr->e_shoff);\n \n- \/* first find \"the\" symbol table *\/\n- stab = (Elf_Sym*) findElfSection ( ehdrC, SHT_SYMTAB );\n-\n- \/* also go find the string table *\/\n- strtab = findElfSection ( ehdrC, SHT_STRTAB );\n-\n- if (stab == NULL || strtab == NULL) {\n- errorBelch(\"%s: can't find string or symbol table\", oc->fileName);\n- return 0;\n- }\n-\n \/* Process the relocation sections. *\/\n for (shnum = 0; shnum < ehdr->e_shnum; shnum++) {\n if (shdr[shnum].sh_type == SHT_REL) {\n- ok = do_Elf_Rel_relocations ( oc, ehdrC, shdr,\n- shnum, stab, strtab );\n+ ok = do_Elf_Rel_relocations ( oc, ehdrC, shdr, shnum );\n if (!ok) return ok;\n }\n else\n if (shdr[shnum].sh_type == SHT_RELA) {\n- ok = do_Elf_Rela_relocations ( oc, ehdrC, shdr,\n- shnum, stab, strtab );\n+ ok = do_Elf_Rela_relocations ( oc, ehdrC, shdr, shnum );\n if (!ok) return ok;\n }\n }\n@@ -4509,8 +4520,12 @@\n \n if( i == ehdr->e_shnum )\n {\n- errorBelch( \"This ELF file contains no symtab\" );\n- return 0;\n+ \/\/ Not having a symbol table is not in principle a problem.\n+ \/\/ When an object file has no symbols then the 'strip' program\n+ \/\/ typically will remove the symbol table entirely.\n+ IF_DEBUG(linker, debugBelch( \"The ELF file %s contains no symtab\\n\",\n+ oc->archiveMemberName ? oc->archiveMemberName : oc->fileName ));\n+ return 1;\n }\n \n if( shdr[i].sh_entsize != sizeof( Elf_Sym ) )\n"} {"commit":"ac129d7895bd0f4e9e3bf606144376be46f706d2","subject":"osd: pg_pool_t gets new functions for unmanaged (ie, client-managed) snaps","message":"osd: pg_pool_t gets new functions for unmanaged (ie, client-managed) snaps\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/osd\/osd_types.h\n+++ src\/osd\/osd_types.h\n@@ -646,15 +646,30 @@\n return 0;\n }\n void add_snap(const char *n, utime_t stamp) {\n+ assert(removed_snaps.empty());\n snapid_t s = get_snap_seq() + 1;\n v.snap_seq = s;\n snaps[s].snapid = s;\n snaps[s].name = n;\n snaps[s].stamp = stamp;\n }\n+ __u64 add_unmanaged_snap() {\n+ assert(snaps.empty());\n+ if (removed_snaps.empty()) {\n+ removed_snaps.insert(snapid_t(1));\n+ v.snap_seq = 1;\n+ }\n+ v.snap_seq = v.snap_seq + 1;\n+ return v.snap_seq;\n+ }\n void remove_snap(snapid_t s) {\n assert(snaps.count(s));\n snaps.erase(s);\n+ v.snap_seq = v.snap_seq + 1;\n+ }\n+ void remove_unmanaged_snap(snapid_t s) {\n+ assert(snaps.empty());\n+ removed_snaps.insert(s);\n v.snap_seq = v.snap_seq + 1;\n }\n \n"} {"commit":"4a0aa4630b849c7e90115222357b2eb4f7b7006f","subject":"new comment added","message":"new comment added\n","repos":"IITDBGroup\/gprom,IITDBGroup\/gprom,IITDBGroup\/gprom,mikebrachmann\/gprom,mikebrachmann\/gprom,mikebrachmann\/gprom,mikebrachmann\/gprom,mikebrachmann\/gprom,IITDBGroup\/gprom,mikebrachmann\/gprom,IITDBGroup\/gprom,IITDBGroup\/gprom,mikebrachmann\/gprom","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/sql_serializer\/sql_serializer.c\n+++ src\/sql_serializer\/sql_serializer.c\n@@ -18,3 +18,4 @@\n return NULL;\n }\n \/\/ sdfsdfsd \n+\/\/ sdfsdfsd \n"} {"commit":"bf21999aad97b96b0318013d16c846730a27f41b","subject":"Tell checkProddableBlock how many bytes we want to write","message":"Tell checkProddableBlock how many bytes we want to write\n\nIt doesn't suffice for checkProddableBlock to just check whether the\nlargest possible write could be made at the address we are writing,\nas if we are making a smaller write then checkProddableBlock may\nconservatively think we will write off the end of the block.\n\nThus we now tell checkProddableBlock how many bytes we will write.\n","repos":"nathyong\/microghc-ghc,acowley\/ghc,wxwxwwxxx\/ghc,acowley\/ghc,snoyberg\/ghc,sgillespie\/ghc,nathyong\/microghc-ghc,ryantm\/ghc,olsner\/ghc,oldmanmike\/ghc,olsner\/ghc,nushio3\/ghc,mcschroeder\/ghc,urbanslug\/ghc,olsner\/ghc,elieux\/ghc,elieux\/ghc,bitemyapp\/ghc,ezyang\/ghc,ekmett\/ghc,siddhanathan\/ghc,wxwxwwxxx\/ghc,anton-dessiatov\/ghc,elieux\/ghc,ezyang\/ghc,mcschroeder\/ghc,nkaretnikov\/ghc,snoyberg\/ghc,ryantm\/ghc,lukexi\/ghc-7.8-arm64,urbanslug\/ghc,wxwxwwxxx\/ghc,vikraman\/ghc,shlevy\/ghc,ezyang\/ghc,nathyong\/microghc-ghc,nathyong\/microghc-ghc,tjakway\/ghcjvm,ml9951\/ghc,frantisekfarka\/ghc-dsi,christiaanb\/ghc,nkaretnikov\/ghc,sdiehl\/ghc,gcampax\/ghc,vikraman\/ghc,sdiehl\/ghc,lukexi\/ghc,mettekou\/ghc,AlexanderPankiv\/ghc,wxwxwwxxx\/ghc,GaloisInc\/halvm-ghc,nkaretnikov\/ghc,snoyberg\/ghc,green-haskell\/ghc,elieux\/ghc,gridaphobe\/ghc,sgillespie\/ghc,ghc-android\/ghc,GaloisInc\/halvm-ghc,ml9951\/ghc,AlexanderPankiv\/ghc,vikraman\/ghc,spacekitteh\/smcghc,olsner\/ghc,forked-upstream-packages-for-ghcjs\/ghc,nkaretnikov\/ghc,ezyang\/ghc,oldmanmike\/ghc,forked-upstream-packages-for-ghcjs\/ghc,acowley\/ghc,lukexi\/ghc-7.8-arm64,hferreiro\/replay,ghc-android\/ghc,siddhanathan\/ghc,mettekou\/ghc,acowley\/ghc,GaloisInc\/halvm-ghc,nomeata\/ghc,nkaretnikov\/ghc,forked-upstream-packages-for-ghcjs\/ghc,hferreiro\/replay,frantisekfarka\/ghc-dsi,gridaphobe\/ghc,nushio3\/ghc,christiaanb\/ghc,vikraman\/ghc,sgillespie\/ghc,hferreiro\/replay,acowley\/ghc,jstolarek\/ghc,christiaanb\/ghc,anton-dessiatov\/ghc,christiaanb\/ghc,nathyong\/microghc-ghc,wxwxwwxxx\/ghc,gcampax\/ghc,forked-upstream-packages-for-ghcjs\/ghc,forked-upstream-packages-for-ghcjs\/ghc,vTurbine\/ghc,gridaphobe\/ghc,fmthoma\/ghc,GaloisInc\/halvm-ghc,nomeata\/ghc,TomMD\/ghc,fmthoma\/ghc,ml9951\/ghc,urbanslug\/ghc,christiaanb\/ghc,snoyberg\/ghc,da-x\/ghc,olsner\/ghc,sgillespie\/ghc,da-x\/ghc,anton-dessiatov\/ghc,vTurbine\/ghc,nkaretnikov\/ghc,tibbe\/ghc,tjakway\/ghcjvm,da-x\/ghc,nushio3\/ghc,spacekitteh\/smcghc,mfine\/ghc,AlexanderPankiv\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ghc-android\/ghc,holzensp\/ghc,gcampax\/ghc,green-haskell\/ghc,christiaanb\/ghc,ezyang\/ghc,gridaphobe\/ghc,ryantm\/ghc,ml9951\/ghc,hferreiro\/replay,frantisekfarka\/ghc-dsi,gcampax\/ghc,mfine\/ghc,lukexi\/ghc,mettekou\/ghc,mfine\/ghc,sgillespie\/ghc,holzensp\/ghc,TomMD\/ghc,GaloisInc\/halvm-ghc,da-x\/ghc,siddhanathan\/ghc,gcampax\/ghc,christiaanb\/ghc,oldmanmike\/ghc,ekmett\/ghc,hferreiro\/replay,AlexanderPankiv\/ghc,mettekou\/ghc,vTurbine\/ghc,acowley\/ghc,siddhanathan\/ghc,urbanslug\/ghc,fmthoma\/ghc,ezyang\/ghc,mcschroeder\/ghc,tibbe\/ghc,TomMD\/ghc,vTurbine\/ghc,lukexi\/ghc-7.8-arm64,ml9951\/ghc,mfine\/ghc,GaloisInc\/halvm-ghc,vTurbine\/ghc,anton-dessiatov\/ghc,mfine\/ghc,nkaretnikov\/ghc,acowley\/ghc,AlexanderPankiv\/ghc,ryantm\/ghc,ekmett\/ghc,nomeata\/ghc,green-haskell\/ghc,spacekitteh\/smcghc,green-haskell\/ghc,tjakway\/ghcjvm,ekmett\/ghc,bitemyapp\/ghc,mettekou\/ghc,tjakway\/ghcjvm,lukexi\/ghc,oldmanmike\/ghc,shlevy\/ghc,olsner\/ghc,da-x\/ghc,hferreiro\/replay,tjakway\/ghcjvm,spacekitteh\/smcghc,urbanslug\/ghc,vikraman\/ghc,vikraman\/ghc,anton-dessiatov\/ghc,forked-upstream-packages-for-ghcjs\/ghc,jstolarek\/ghc,anton-dessiatov\/ghc,mettekou\/ghc,shlevy\/ghc,bitemyapp\/ghc,mcschroeder\/ghc,holzensp\/ghc,vTurbine\/ghc,shlevy\/ghc,urbanslug\/ghc,holzensp\/ghc,mfine\/ghc,TomMD\/ghc,nomeata\/ghc,shlevy\/ghc,ryantm\/ghc,siddhanathan\/ghc,mcschroeder\/ghc,vTurbine\/ghc,elieux\/ghc,oldmanmike\/ghc,shlevy\/ghc,lukexi\/ghc-7.8-arm64,mcschroeder\/ghc,anton-dessiatov\/ghc,nushio3\/ghc,ghc-android\/ghc,sdiehl\/ghc,bitemyapp\/ghc,urbanslug\/ghc,snoyberg\/ghc,gcampax\/ghc,gcampax\/ghc,sdiehl\/ghc,frantisekfarka\/ghc-dsi,tibbe\/ghc,gridaphobe\/ghc,fmthoma\/ghc,nushio3\/ghc,lukexi\/ghc-7.8-arm64,ghc-android\/ghc,elieux\/ghc,sdiehl\/ghc,tibbe\/ghc,sdiehl\/ghc,ml9951\/ghc,mettekou\/ghc,TomMD\/ghc,mfine\/ghc,snoyberg\/ghc,tjakway\/ghcjvm,ghc-android\/ghc,shlevy\/ghc,tjakway\/ghcjvm,lukexi\/ghc,TomMD\/ghc,gridaphobe\/ghc,oldmanmike\/ghc,elieux\/ghc,wxwxwwxxx\/ghc,GaloisInc\/halvm-ghc,ml9951\/ghc,jstolarek\/ghc,sgillespie\/ghc,bitemyapp\/ghc,tibbe\/ghc,fmthoma\/ghc,snoyberg\/ghc,jstolarek\/ghc,nathyong\/microghc-ghc,nomeata\/ghc,AlexanderPankiv\/ghc,siddhanathan\/ghc,olsner\/ghc,AlexanderPankiv\/ghc,vikraman\/ghc,hferreiro\/replay,da-x\/ghc,da-x\/ghc,ezyang\/ghc,wxwxwwxxx\/ghc,oldmanmike\/ghc,ghc-android\/ghc,nushio3\/ghc,holzensp\/ghc,gridaphobe\/ghc,nathyong\/microghc-ghc,siddhanathan\/ghc,sgillespie\/ghc,fmthoma\/ghc,sdiehl\/ghc,green-haskell\/ghc,ekmett\/ghc,TomMD\/ghc,mcschroeder\/ghc,jstolarek\/ghc,fmthoma\/ghc,nushio3\/ghc,ml9951\/ghc,lukexi\/ghc,spacekitteh\/smcghc,frantisekfarka\/ghc-dsi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- rts\/Linker.c\n+++ rts\/Linker.c\n@@ -2493,23 +2493,15 @@\n }\n \n static void\n-checkProddableBlock (ObjectCode *oc, void *addr )\n+checkProddableBlock (ObjectCode *oc, void *addr, size_t size )\n {\n ProddableBlock* pb;\n \n for (pb = oc->proddables; pb != NULL; pb = pb->next) {\n char* s = (char*)(pb->start);\n- char* e = s + pb->size - 1;\n+ char* e = s + pb->size;\n char* a = (char*)addr;\n-#if WORD_SIZE_IN_BITS == 32\n- \/* Assumes that the biggest fixup involves a 4-byte write *\/\n- if (a >= s && (a+3) <= e) return;\n-#elif WORD_SIZE_IN_BITS == 64\n- \/* Assumes that the biggest fixup involves a 4-byte write *\/\n- if (a >= s && (a+7) <= e) return;\n-#else\n-#error\n-#endif\n+ if (a >= s && (a+size) <= e) return;\n }\n barf(\"checkProddableBlock: invalid fixup in runtime linker: %p\", addr);\n }\n@@ -3670,7 +3662,8 @@\n return 0;\n foundit:;\n }\n- checkProddableBlock(oc, pP);\n+ \/* All supported relocations write at least 4 bytes *\/\n+ checkProddableBlock(oc, pP, 4);\n switch (reltab_j->Type) {\n #if defined(i386_HOST_ARCH)\n case MYIMAGE_REL_I386_DIR32:\n@@ -3715,6 +3708,7 @@\n case 1: \/* R_X86_64_64 *\/\n {\n UInt64 A;\n+ checkProddableBlock(oc, pP, 8);\n A = *(UInt64*)pP;\n *(UInt64 *)pP = ((UInt64)S) + ((UInt64)A);\n break;\n@@ -4466,7 +4460,7 @@\n \n IF_DEBUG(linker,debugBelch( \"Reloc: P = %p S = %p A = %p\\n\",\n (void*)P, (void*)S, (void*)A ));\n- checkProddableBlock ( oc, pP );\n+ checkProddableBlock ( oc, pP, sizeof(Elf_Word) );\n \n #ifdef i386_HOST_ARCH\n value = S + A;\n@@ -5233,7 +5227,7 @@\n \n #if i386_HOST_ARCH\n if (isJumpTable) {\n- checkProddableBlock(oc,image + sect->offset + i*itemSize);\n+ checkProddableBlock(oc,image + sect->offset + i*itemSize, 5);\n \n *(image + sect->offset + i * itemSize) = 0xe9; \/\/ jmp opcode\n *(unsigned*)(image + sect->offset + i*itemSize + 1)\n@@ -5242,7 +5236,9 @@\n else\n #endif\n {\n- checkProddableBlock(oc,((void**)(image + sect->offset)) + i);\n+ checkProddableBlock(oc,\n+ ((void**)(image + sect->offset)) + i,\n+ sizeof(void *));\n ((void**)(image + sect->offset))[i] = addr;\n }\n }\n@@ -5323,22 +5319,25 @@\n \tIF_DEBUG(linker, debugBelch(\" : extern = %d\\n\", reloc->r_extern));\n \tIF_DEBUG(linker, debugBelch(\" : type = %d\\n\", reloc->r_type));\n \n- checkProddableBlock(oc,thingPtr);\n switch(reloc->r_length)\n {\n case 0:\n+ checkProddableBlock(oc,thingPtr,1);\n thing = *(uint8_t*)thingPtr;\n baseValue = (uint64_t)thingPtr + 1;\n break;\n case 1:\n+ checkProddableBlock(oc,thingPtr,2);\n thing = *(uint16_t*)thingPtr;\n baseValue = (uint64_t)thingPtr + 2;\n break;\n case 2:\n+ checkProddableBlock(oc,thingPtr,4);\n thing = *(uint32_t*)thingPtr;\n baseValue = (uint64_t)thingPtr + 4;\n break;\n case 3:\n+ checkProddableBlock(oc,thingPtr,8);\n thing = *(uint64_t*)thingPtr;\n baseValue = (uint64_t)thingPtr + 8;\n break;\n@@ -5506,7 +5505,10 @@\n {\n unsigned long word = 0;\n unsigned long* wordPtr = (unsigned long*) (image + sect->offset + scat->r_address);\n- checkProddableBlock(oc,wordPtr);\n+\n+ \/* In this check we assume that sizeof(unsigned long) = 2 * sizeof(unsigned short)\n+ on powerpc_HOST_ARCH *\/\n+ checkProddableBlock(oc,wordPtr,sizeof(unsigned long));\n \n \/\/ Note on relocation types:\n \/\/ i386 uses the GENERIC_RELOC_* types,\n@@ -5676,7 +5678,10 @@\n #endif\n \n unsigned long* wordPtr = (unsigned long*) (image + sect->offset + reloc->r_address);\n- checkProddableBlock(oc,wordPtr);\n+\n+ \/* In this check we assume that sizeof(unsigned long) = 2 * sizeof(unsigned short)\n+ on powerpc_HOST_ARCH *\/\n+ checkProddableBlock(oc,wordPtr, sizeof(unsigned long));\n \n if (reloc->r_type == GENERIC_RELOC_VANILLA) {\n word = *wordPtr;\n"} {"commit":"fba6ce0e7aaa094fec09ef8763e86b19dc815624","subject":"Fix build on FreeBSD","message":"Fix build on FreeBSD\n\nOn FreeBSD the following syntax is used:\r\nmr REGA,REGB","repos":"alk\/gperftools,alk\/gperftools,gperftools\/gperftools,romange\/gperftools,gperftools\/gperftools,gperftools\/gperftools,alk\/gperftools,romange\/gperftools,romange\/gperftools,romange\/gperftools,gperftools\/gperftools,alk\/gperftools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/stacktrace_powerpc-darwin-inl.h\n+++ src\/stacktrace_powerpc-darwin-inl.h\n@@ -97,7 +97,11 @@\n \/\/ different asm syntax. I don't know quite the best way to discriminate\n \/\/ systems using the old as from the new one; I've gone with __APPLE__.\n \/\/ TODO(csilvers): use autoconf instead, to look for 'as --version' == 1 or 2\n+#ifdef __FreeBSD__\n+ __asm__ volatile (\"mr %0,1\" : \"=r\" (sp));\n+#else\n __asm__ volatile (\"mr %0,r1\" : \"=r\" (sp));\n+#endif\n \n \/\/ On PowerPC, the \"Link Register\" or \"Link Record\" (LR), is a stack\n \/\/ entry that holds the return address of the subroutine call (what\n"} {"commit":"cd393e8a03aec81ac6d1be1065d4a1d5ef3481d2","subject":"Fix","message":"Fix\n\nbegin(), end()\u306e\u5834\u6240\u3092\u5909\u3048\u305f\n","repos":"U-MA\/cvrp,U-MA\/cvrp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cvrp\/fleet.h\n+++ cvrp\/fleet.h\n@@ -20,8 +20,15 @@\n typedef typename std::vector<vehicle_type>::iterator iterator;\n typedef typename std::vector<vehicle_type>::const_iterator const_iterator;\n \n+ \/\/ iterator support\n+ iterator begin()\n+ { return fleet_.begin(); }\n+\n const_iterator begin() const\n { return fleet_.begin(); }\n+\n+ iterator end()\n+ { return fleet_.end(); }\n \n const_iterator end() const\n { return fleet_.end(); }\n@@ -43,12 +50,6 @@\n \n vehicle_type& get(size_t i)\n { return fleet_[i]; }\n-\n- iterator begin()\n- { return fleet_.begin(); }\n-\n- iterator end()\n- { return fleet_.end(); }\n \n bool is_visit(size_t id) const\n { return is_visit_.test(id); }\n"} {"commit":"92bb7bec0ca3bdcb1a32afb7e460fe2af5afa37c","subject":"Add a missing newline to a GHCi linker debugBelch","message":"Add a missing newline to a GHCi linker debugBelch\n","repos":"oldmanmike\/ghc,nathyong\/microghc-ghc,nathyong\/microghc-ghc,green-haskell\/ghc,ezyang\/ghc,olsner\/ghc,vikraman\/ghc,vikraman\/ghc,mcschroeder\/ghc,tjakway\/ghcjvm,ml9951\/ghc,mettekou\/ghc,fmthoma\/ghc,green-haskell\/ghc,anton-dessiatov\/ghc,shlevy\/ghc,ezyang\/ghc,vTurbine\/ghc,vTurbine\/ghc,ml9951\/ghc,nkaretnikov\/ghc,gcampax\/ghc,ezyang\/ghc,gridaphobe\/ghc,mfine\/ghc,gridaphobe\/ghc,forked-upstream-packages-for-ghcjs\/ghc,anton-dessiatov\/ghc,forked-upstream-packages-for-ghcjs\/ghc,siddhanathan\/ghc,spacekitteh\/smcghc,bitemyapp\/ghc,wxwxwwxxx\/ghc,sgillespie\/ghc,vTurbine\/ghc,nathyong\/microghc-ghc,mettekou\/ghc,da-x\/ghc,christiaanb\/ghc,sdiehl\/ghc,forked-upstream-packages-for-ghcjs\/ghc,anton-dessiatov\/ghc,gcampax\/ghc,ezyang\/ghc,olsner\/ghc,nathyong\/microghc-ghc,nkaretnikov\/ghc,mettekou\/ghc,da-x\/ghc,nkaretnikov\/ghc,ml9951\/ghc,da-x\/ghc,shlevy\/ghc,fmthoma\/ghc,fmthoma\/ghc,urbanslug\/ghc,siddhanathan\/ghc,vTurbine\/ghc,nushio3\/ghc,elieux\/ghc,siddhanathan\/ghc,forked-upstream-packages-for-ghcjs\/ghc,acowley\/ghc,forked-upstream-packages-for-ghcjs\/ghc,anton-dessiatov\/ghc,GaloisInc\/halvm-ghc,oldmanmike\/ghc,AlexanderPankiv\/ghc,olsner\/ghc,TomMD\/ghc,da-x\/ghc,vikraman\/ghc,ghc-android\/ghc,fmthoma\/ghc,sdiehl\/ghc,sgillespie\/ghc,nathyong\/microghc-ghc,olsner\/ghc,nushio3\/ghc,sdiehl\/ghc,tjakway\/ghcjvm,anton-dessiatov\/ghc,GaloisInc\/halvm-ghc,ml9951\/ghc,gridaphobe\/ghc,spacekitteh\/smcghc,mcschroeder\/ghc,ml9951\/ghc,elieux\/ghc,TomMD\/ghc,wxwxwwxxx\/ghc,nushio3\/ghc,tjakway\/ghcjvm,bitemyapp\/ghc,mfine\/ghc,ml9951\/ghc,siddhanathan\/ghc,GaloisInc\/halvm-ghc,ezyang\/ghc,GaloisInc\/halvm-ghc,mcschroeder\/ghc,GaloisInc\/halvm-ghc,acowley\/ghc,siddhanathan\/ghc,elieux\/ghc,wxwxwwxxx\/ghc,ezyang\/ghc,mfine\/ghc,vikraman\/ghc,green-haskell\/ghc,spacekitteh\/smcghc,elieux\/ghc,gcampax\/ghc,snoyberg\/ghc,spacekitteh\/smcghc,vTurbine\/ghc,bitemyapp\/ghc,fmthoma\/ghc,mettekou\/ghc,gcampax\/ghc,TomMD\/ghc,oldmanmike\/ghc,gcampax\/ghc,ghc-android\/ghc,vTurbine\/ghc,olsner\/ghc,mfine\/ghc,snoyberg\/ghc,da-x\/ghc,fmthoma\/ghc,urbanslug\/ghc,snoyberg\/ghc,acowley\/ghc,nushio3\/ghc,siddhanathan\/ghc,ml9951\/ghc,mcschroeder\/ghc,AlexanderPankiv\/ghc,nkaretnikov\/ghc,urbanslug\/ghc,mettekou\/ghc,tjakway\/ghcjvm,oldmanmike\/ghc,wxwxwwxxx\/ghc,gridaphobe\/ghc,green-haskell\/ghc,olsner\/ghc,nushio3\/ghc,nushio3\/ghc,sdiehl\/ghc,nkaretnikov\/ghc,mcschroeder\/ghc,sdiehl\/ghc,AlexanderPankiv\/ghc,elieux\/ghc,GaloisInc\/halvm-ghc,mcschroeder\/ghc,sgillespie\/ghc,anton-dessiatov\/ghc,acowley\/ghc,snoyberg\/ghc,tjakway\/ghcjvm,jstolarek\/ghc,shlevy\/ghc,shlevy\/ghc,elieux\/ghc,sgillespie\/ghc,gridaphobe\/ghc,AlexanderPankiv\/ghc,christiaanb\/ghc,christiaanb\/ghc,TomMD\/ghc,nkaretnikov\/ghc,wxwxwwxxx\/ghc,TomMD\/ghc,anton-dessiatov\/ghc,sgillespie\/ghc,spacekitteh\/smcghc,ghc-android\/ghc,sdiehl\/ghc,siddhanathan\/ghc,tjakway\/ghcjvm,jstolarek\/ghc,nathyong\/microghc-ghc,wxwxwwxxx\/ghc,acowley\/ghc,ghc-android\/ghc,ml9951\/ghc,fmthoma\/ghc,snoyberg\/ghc,sgillespie\/ghc,mettekou\/ghc,da-x\/ghc,ezyang\/ghc,shlevy\/ghc,vikraman\/ghc,GaloisInc\/halvm-ghc,AlexanderPankiv\/ghc,christiaanb\/ghc,green-haskell\/ghc,vTurbine\/ghc,vikraman\/ghc,gridaphobe\/ghc,acowley\/ghc,urbanslug\/ghc,oldmanmike\/ghc,jstolarek\/ghc,gcampax\/ghc,TomMD\/ghc,mfine\/ghc,ghc-android\/ghc,mfine\/ghc,nkaretnikov\/ghc,snoyberg\/ghc,bitemyapp\/ghc,elieux\/ghc,urbanslug\/ghc,tjakway\/ghcjvm,nushio3\/ghc,ghc-android\/ghc,christiaanb\/ghc,gridaphobe\/ghc,sdiehl\/ghc,oldmanmike\/ghc,gcampax\/ghc,jstolarek\/ghc,forked-upstream-packages-for-ghcjs\/ghc,shlevy\/ghc,jstolarek\/ghc,christiaanb\/ghc,urbanslug\/ghc,AlexanderPankiv\/ghc,mfine\/ghc,acowley\/ghc,mcschroeder\/ghc,mettekou\/ghc,TomMD\/ghc,sgillespie\/ghc,christiaanb\/ghc,da-x\/ghc,snoyberg\/ghc,vikraman\/ghc,AlexanderPankiv\/ghc,ghc-android\/ghc,wxwxwwxxx\/ghc,olsner\/ghc,forked-upstream-packages-for-ghcjs\/ghc,bitemyapp\/ghc,shlevy\/ghc,oldmanmike\/ghc,urbanslug\/ghc,nathyong\/microghc-ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- rts\/Linker.c\n+++ rts\/Linker.c\n@@ -5643,7 +5643,7 @@\n errorBelch(\"%s: unknown symbol `%s'\", oc->fileName, symbol);\n return 0;\n }\n- IF_DEBUG(linker,debugBelch( \"`%s' resolves to %p\", symbol, (void*)S ));\n+ IF_DEBUG(linker,debugBelch( \"`%s' resolves to %p\\n\", symbol, (void*)S ));\n }\n \n IF_DEBUG(linker,debugBelch(\"Reloc: P = %p S = %p A = %p\\n\",\n"} {"commit":"8aa744c17b05fc5740e64ccd887fcd08cbf4e0d9","subject":"Bug fix. Data field should be volatile.","message":"Bug fix. Data field should be volatile.\n","repos":"chaoran\/hpc-queue,chaoran\/fast-wait-free-queue,chaoran\/fast-wait-free-queue,chaoran\/fast-wait-free-queue,chaoran\/hpc-queue,chaoran\/hpc-queue","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ccsynch.h\n+++ ccsynch.h\n@@ -7,7 +7,7 @@\n \n typedef struct _ccsynch_node_t {\n struct _ccsynch_node_t * volatile next CACHE_ALIGNED;\n- void * data;\n+ void * volatile data;\n int volatile status CACHE_ALIGNED;\n } ccsynch_node_t;\n \n@@ -47,6 +47,7 @@\n \n if (status != CCSYNCH_DONE) {\n apply(state, data);\n+\n curr = next;\n next = curr->next;\n acquire_fence();\n@@ -58,6 +59,7 @@\n apply(state, curr->data);\n release_fence();\n curr->status = CCSYNCH_DONE;\n+\n curr = next;\n next = curr->next;\n acquire_fence();\n"} {"commit":"ee35227b9b447fe9dc73ab5d676d6fc2cf4912ec","subject":"fix eran error message by reordering a couple of tests","message":"fix eran error message by reordering a couple of tests","repos":"gridaphobe\/ghc,ezyang\/ghc,tibbe\/ghc,mcmaniac\/ghc,nushio3\/ghc,vTurbine\/ghc,TomMD\/ghc,mfine\/ghc,ml9951\/ghc,oldmanmike\/ghc,hferreiro\/replay,oldmanmike\/ghc,ghc-android\/ghc,da-x\/ghc,spacekitteh\/smcghc,ekmett\/ghc,acowley\/ghc,christiaanb\/ghc,spacekitteh\/smcghc,mettekou\/ghc,christiaanb\/ghc,urbanslug\/ghc,mcmaniac\/ghc,fmthoma\/ghc,nathyong\/microghc-ghc,gcampax\/ghc,GaloisInc\/halvm-ghc,holzensp\/ghc,shlevy\/ghc,sgillespie\/ghc,hferreiro\/replay,frantisekfarka\/ghc-dsi,spacekitteh\/smcghc,sgillespie\/ghc,mettekou\/ghc,siddhanathan\/ghc,anton-dessiatov\/ghc,nkaretnikov\/ghc,nathyong\/microghc-ghc,olsner\/ghc,lukexi\/ghc-7.8-arm64,GaloisInc\/halvm-ghc,gridaphobe\/ghc,gridaphobe\/ghc,ezyang\/ghc,vikraman\/ghc,nomeata\/ghc,holzensp\/ghc,lukexi\/ghc-7.8-arm64,lukexi\/ghc-7.8-arm64,forked-upstream-packages-for-ghcjs\/ghc,spacekitteh\/smcghc,green-haskell\/ghc,vikraman\/ghc,sdiehl\/ghc,anton-dessiatov\/ghc,ezyang\/ghc,bitemyapp\/ghc,acowley\/ghc,da-x\/ghc,forked-upstream-packages-for-ghcjs\/ghc,tjakway\/ghcjvm,ghc-android\/ghc,tjakway\/ghcjvm,holzensp\/ghc,acowley\/ghc,lukexi\/ghc,ezyang\/ghc,sgillespie\/ghc,holzensp\/ghc,wxwxwwxxx\/ghc,wxwxwwxxx\/ghc,elieux\/ghc,anton-dessiatov\/ghc,mfine\/ghc,ml9951\/ghc,nathyong\/microghc-ghc,oldmanmike\/ghc,GaloisInc\/halvm-ghc,da-x\/ghc,tjakway\/ghcjvm,frantisekfarka\/ghc-dsi,siddhanathan\/ghc,vTurbine\/ghc,mcmaniac\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ilyasergey\/GHC-XAppFix,mfine\/ghc,nkaretnikov\/ghc,ilyasergey\/GHC-XAppFix,olsner\/ghc,AlexanderPankiv\/ghc,ezyang\/ghc,acowley\/ghc,fmthoma\/ghc,hferreiro\/replay,mfine\/ghc,elieux\/ghc,TomMD\/ghc,vTurbine\/ghc,lukexi\/ghc,TomMD\/ghc,da-x\/ghc,mcschroeder\/ghc,tjakway\/ghcjvm,wxwxwwxxx\/ghc,mcschroeder\/ghc,nushio3\/ghc,ryantm\/ghc,ghc-android\/ghc,ekmett\/ghc,oldmanmike\/ghc,urbanslug\/ghc,christiaanb\/ghc,elieux\/ghc,gridaphobe\/ghc,anton-dessiatov\/ghc,snoyberg\/ghc,hferreiro\/replay,green-haskell\/ghc,olsner\/ghc,TomMD\/ghc,siddhanathan\/ghc,ghc-android\/ghc,jstolarek\/ghc,nathyong\/microghc-ghc,fmthoma\/ghc,wxwxwwxxx\/ghc,snoyberg\/ghc,nomeata\/ghc,lukexi\/ghc-7.8-arm64,urbanslug\/ghc,siddhanathan\/ghc,frantisekfarka\/ghc-dsi,nkaretnikov\/ghc,GaloisInc\/halvm-ghc,sdiehl\/ghc,mettekou\/ghc,acowley\/ghc,mcmaniac\/ghc,snoyberg\/ghc,anton-dessiatov\/ghc,da-x\/ghc,jstolarek\/ghc,shlevy\/ghc,nkaretnikov\/ghc,green-haskell\/ghc,nushio3\/ghc,forked-upstream-packages-for-ghcjs\/ghc,lukexi\/ghc,nushio3\/ghc,ryantm\/ghc,lukexi\/ghc-7.8-arm64,tibbe\/ghc,bitemyapp\/ghc,frantisekfarka\/ghc-dsi,shlevy\/ghc,nkaretnikov\/ghc,tjakway\/ghcjvm,ml9951\/ghc,vTurbine\/ghc,wxwxwwxxx\/ghc,oldmanmike\/ghc,acowley\/ghc,nushio3\/ghc,tibbe\/ghc,sgillespie\/ghc,ezyang\/ghc,nushio3\/ghc,AlexanderPankiv\/ghc,gcampax\/ghc,sgillespie\/ghc,oldmanmike\/ghc,vikraman\/ghc,lukexi\/ghc,acowley\/ghc,GaloisInc\/halvm-ghc,forked-upstream-packages-for-ghcjs\/ghc,olsner\/ghc,sdiehl\/ghc,nathyong\/microghc-ghc,ryantm\/ghc,sdiehl\/ghc,tjakway\/ghcjvm,ekmett\/ghc,bitemyapp\/ghc,oldmanmike\/ghc,mfine\/ghc,shlevy\/ghc,christiaanb\/ghc,ml9951\/ghc,fmthoma\/ghc,vikraman\/ghc,siddhanathan\/ghc,ryantm\/ghc,nathyong\/microghc-ghc,urbanslug\/ghc,tibbe\/ghc,mettekou\/ghc,gcampax\/ghc,nathyong\/microghc-ghc,gridaphobe\/ghc,vTurbine\/ghc,frantisekfarka\/ghc-dsi,snoyberg\/ghc,green-haskell\/ghc,gcampax\/ghc,tjakway\/ghcjvm,TomMD\/ghc,christiaanb\/ghc,ekmett\/ghc,sdiehl\/ghc,bitemyapp\/ghc,urbanslug\/ghc,nomeata\/ghc,mfine\/ghc,ryantm\/ghc,mcmaniac\/ghc,ilyasergey\/GHC-XAppFix,vTurbine\/ghc,vikraman\/ghc,jstolarek\/ghc,ml9951\/ghc,da-x\/ghc,vikraman\/ghc,green-haskell\/ghc,mcschroeder\/ghc,snoyberg\/ghc,fmthoma\/ghc,mcschroeder\/ghc,GaloisInc\/halvm-ghc,anton-dessiatov\/ghc,mcschroeder\/ghc,gcampax\/ghc,AlexanderPankiv\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ekmett\/ghc,holzensp\/ghc,fmthoma\/ghc,sgillespie\/ghc,AlexanderPankiv\/ghc,gridaphobe\/ghc,fmthoma\/ghc,jstolarek\/ghc,ghc-android\/ghc,mettekou\/ghc,christiaanb\/ghc,urbanslug\/ghc,elieux\/ghc,mcschroeder\/ghc,elieux\/ghc,shlevy\/ghc,olsner\/ghc,gridaphobe\/ghc,ml9951\/ghc,nkaretnikov\/ghc,snoyberg\/ghc,jstolarek\/ghc,elieux\/ghc,anton-dessiatov\/ghc,christiaanb\/ghc,hferreiro\/replay,elieux\/ghc,wxwxwwxxx\/ghc,gcampax\/ghc,ezyang\/ghc,AlexanderPankiv\/ghc,olsner\/ghc,TomMD\/ghc,nushio3\/ghc,TomMD\/ghc,vTurbine\/ghc,ghc-android\/ghc,AlexanderPankiv\/ghc,bitemyapp\/ghc,gcampax\/ghc,shlevy\/ghc,forked-upstream-packages-for-ghcjs\/ghc,urbanslug\/ghc,lukexi\/ghc,snoyberg\/ghc,hferreiro\/replay,nomeata\/ghc,AlexanderPankiv\/ghc,sdiehl\/ghc,ml9951\/ghc,olsner\/ghc,mcschroeder\/ghc,ml9951\/ghc,nkaretnikov\/ghc,spacekitteh\/smcghc,ilyasergey\/GHC-XAppFix,sgillespie\/ghc,siddhanathan\/ghc,mfine\/ghc,tibbe\/ghc,da-x\/ghc,wxwxwwxxx\/ghc,mettekou\/ghc,GaloisInc\/halvm-ghc,hferreiro\/replay,nomeata\/ghc,mettekou\/ghc,sdiehl\/ghc,vikraman\/ghc,ghc-android\/ghc,shlevy\/ghc,siddhanathan\/ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- rts\/MBlock.c\n+++ rts\/MBlock.c\n@@ -395,12 +395,12 @@\n }\n }\n \n+ if (ret == (void*)-1) {\n+ barf(\"getMBlocks: unknown memory allocation failure on Win32.\");\n+ }\n+\n if (((W_)ret & MBLOCK_MASK) != 0) {\n barf(\"getMBlocks: misaligned block returned\");\n- }\n-\n- if (ret == (void*)-1) {\n- barf(\"getMBlocks: unknown memory allocation failure on Win32.\");\n }\n \n debugTrace(DEBUG_gc, \"allocated %d megablock(s) at 0x%x\",n,(nat)ret);\n"} {"commit":"01f5e404d789f59018ffce8d28a41d8dce750cfb","subject":"added mark operations","message":"added mark operations\n","repos":"mkfifo\/buffalo,mkfifo\/buffalo,mkfifo\/buffalo,mkfifo\/buffalo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- buffalo.c\n+++ buffalo.c\n@@ -115,7 +115,8 @@\n void \/* mark operations, determine which by arg->c g is goto mark, s is set mark, t(toggle) is set and goto *\/\n f_mark(const Arg *arg){\n \tif( arg->c == 'g' )\n-\t\tcur = mark;\n+\t\tif( mark.l )\n+\t\t\tcur = mark;\n \telse if( arg->c == 's' )\n \t\tmark = cur;\n \telse if( arg->c == 't' ){\n"} {"commit":"23a149b05bec2a429dc585ab341d76eeb0f40dbd","subject":"Remove debug","message":"Remove debug\n\n\ngit-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@1852 3c1deb5b-d424-0410-962d-aba41a686d42\n","repos":"hsorby\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc,hsorby\/zinc,hsorby\/zinc,OpenCMISS\/zinc,hsorby\/zinc,OpenCMISS\/zinc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/unemap\/utilities\/ratio_signals.c\n+++ source\/unemap\/utilities\/ratio_signals.c\n@@ -528,9 +528,9 @@\n \t\t\t\t\t\t\t\t\t\t\t\t\tdo\n \t\t\t\t\t\t\t\t\t\t\t\t\t{\n \t\/*???debug *\/\n-\tfloat alpha_aa_save,alpha_ab_save,alpha_ac_save,alpha_ba_save,alpha_bb_save,\n+\/*\tfloat alpha_aa_save,alpha_ab_save,alpha_ac_save,alpha_ba_save,alpha_bb_save,\n \t\talpha_bc_save,alpha_ca_save,alpha_cb_save,alpha_cc_save,beta_a_save,\n-\t\tbeta_b_save,beta_c_save;\n+\t\tbeta_b_save,beta_c_save;*\/\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tbeta_a=0;\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tbeta_b=0;\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tbeta_c=0;\n@@ -569,7 +569,7 @@\n \t\t\t\t\t\t\t\t\t\t\t\t\t\talpha_bb *= 1+lambda;\n \t\t\t\t\t\t\t\t\t\t\t\t\t\talpha_cc *= 1+lambda;\n \t\/*???debug *\/\n-\talpha_aa_save=alpha_aa;\n+\t\/*alpha_aa_save=alpha_aa;\n \talpha_ab_save=alpha_ab;\n \talpha_ac_save=alpha_ac;\n \talpha_ba_save=alpha_ba;\n@@ -580,7 +580,7 @@\n \talpha_cc_save=alpha_cc;\n \tbeta_a_save=beta_a;\n \tbeta_b_save=beta_b;\n-\tbeta_c_save=beta_c;\n+\tbeta_c_save=beta_c;*\/\n \t\t\t\t\t\t\t\t\t\t\t\t\t\t\/* solve the linear equations alpha*delta=beta for\n \t\t\t\t\t\t\t\t\t\t\t\t\t\t\tdelta *\/\n \t\t\t\t\t\t\t\t\t\t\t\t\t\ttemp_a=fabs(alpha_aa);\n"} {"commit":"b1533b4ca03e60835b4523fd2a11acdbebf7b6e7","subject":"Add time.h","message":"Add time.h\n","repos":"tijko\/Parrot,tijko\/Parrot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/parrot_notify.c\n+++ src\/parrot_notify.c\n@@ -1,5 +1,6 @@\n #define _GNU_SOURCE\n \n+#include <time.h>\n #include <errno.h>\n #include <fcntl.h>\n #include <unistd.h>\n"} {"commit":"c19664719436f31a0292c44a0ae3a28056c5c1bf","subject":"Removing the temporary change that added a Beta version number for tagging.","message":"Removing the temporary change that added a Beta version number for tagging.\n","repos":"nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/nss\/nss.h\n+++ security\/nss\/lib\/nss\/nss.h\n@@ -70,7 +70,7 @@\n * The format of the version string should be\n * \"<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]\"\n *\/\n-#define NSS_VERSION \"3.12\" _NSS_ECC_STRING \" Beta 3\" _NSS_CUSTOMIZED\n+#define NSS_VERSION \"3.12\" _NSS_ECC_STRING \" Beta\" _NSS_CUSTOMIZED\n #define NSS_VMAJOR 3\n #define NSS_VMINOR 12\n #define NSS_VPATCH 0\n"} {"commit":"6dfadcbaf4fe9cb58a182729ae92c7726c2f27b9","subject":"Configure sdp_test to detect smaller memory leaks","message":"Configure sdp_test to detect smaller memory leaks\n","repos":"todotobe1\/kurento-media-server,lulufei\/kurento-media-server,mparis\/kurento-media-server,TribeMedia\/kurento-media-server,lulufei\/kurento-media-server,todotobe1\/kurento-media-server,shelsonjava\/kurento-media-server,Kurento\/kurento-media-server,TribeMedia\/kurento-media-server,shelsonjava\/kurento-media-server,Kurento\/kurento-media-server,mparis\/kurento-media-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/test_sdp.c\n+++ test\/test_sdp.c\n@@ -3,7 +3,7 @@\n #include <glib-object.h>\n #include \"memory.h\"\n \n-#define N_PAYS 10\n+#define N_PAYS 5\n #define N_MEDIAS 4\n \n #define PAYLOAD(i) (i % 128)\n@@ -22,7 +22,7 @@\n #define SESSION_REMOTE_HANDLER \"kurento.com\"\n #define SESSION_USERNAME \"kms\"\n \n-#define TESTS 6000\n+#define TESTS 7000\n \n static GValueArray *names = NULL;\n \n"} {"commit":"fd3b57b69077c155cdf9cb567cf0ec21c80b4c76","subject":"Fix file descriptor leak","message":"Fix file descriptor leak\n\nThanks Cedric Buissart <cbuissar@redhat.com>!\n","repos":"latchset\/jose,npmccallum\/jose,npmccallum\/jose,rjpontefract\/jose,rjpontefract\/jose,npmccallum\/jose,latchset\/jose","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cmd\/fmt.c\n+++ cmd\/fmt.c\n@@ -79,7 +79,7 @@\n ret = true;\n \n egress:\n- if (strcmp(s, \"-\") == 0)\n+ if (strcmp(s, \"-\") != 0)\n fclose(file);\n return ret;\n }\n@@ -126,7 +126,7 @@\n ret = true;\n \n egress:\n- if (strcmp(s, \"-\") == 0)\n+ if (strcmp(s, \"-\") != 0)\n fclose(file);\n return ret;\n }\n"} {"commit":"fec7510c660a8ecb51494f75cb233cebb59c0d0b","subject":"I added cn_cbor_mapget_* in a previous checkin, this one adds cn_cbor_index","message":"I added cn_cbor_mapget_* in a previous checkin, this one adds cn_cbor_index\n","repos":"jimsch\/cn-cbor,obgm\/cn-cbor,cabo\/cn-cbor,hildjj\/cn-cbor,hildjj\/cn-cbor,jimsch\/cn-cbor,cabo\/cn-cbor,obgm\/cn-cbor,jimsch\/cn-cbor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cn-cbor.c\n+++ cn-cbor.c\n@@ -258,43 +258,67 @@\n }\n \n const cn_cbor* cn_cbor_mapget_int(const cn_cbor* cb, int key) {\n- cn_cbor* cp;\n- assert(cb);\n- for (cp = cb->first_child; cp && cp->next; cp = cp->next->next) {\n- switch(cp->type) {\n- case CN_CBOR_UINT:\n- if (cp->v.uint == (unsigned long)key) {\n- return cp->next;\n- }\n- case CN_CBOR_INT:\n- if (cp->v.sint == (long)key) {\n- return cp->next;\n- }\n- break;\n- default:\n- ; \/\/ skip non-integer keys\n- }\n- }\n- return NULL;\n+ cn_cbor* cp;\n+ assert(cb);\n+ for (cp = cb->first_child; cp && cp->next; cp = cp->next->next) {\n+ switch(cp->type) {\n+ case CN_CBOR_UINT:\n+ if (cp->v.uint == (unsigned long)key) {\n+ return cp->next;\n+ }\n+ case CN_CBOR_INT:\n+ if (cp->v.sint == (long)key) {\n+ return cp->next;\n+ }\n+ break;\n+ default:\n+ ; \/\/ skip non-integer keys\n+ }\n+ }\n+ return NULL;\n }\n \n const cn_cbor* cn_cbor_mapget_string(const cn_cbor* cb, const char* key) {\n- cn_cbor *cp;\n- assert(cb);\n- assert(key);\n- for (cp = cb->first_child; cp && cp->next; cp = cp->next->next) {\n- switch(cp->type) {\n- case CN_CBOR_TEXT:\n- case CN_CBOR_BYTES:\n- if (strncmp(key, cp->v.str, cp->length) == 0) {\n- return cp->next;\n- }\n- break;\n- default:\n- ; \/\/ skip non-string keys\n- }\n- }\n- return NULL;\n+ cn_cbor *cp;\n+ int keylen;\n+ assert(cb);\n+ assert(key);\n+ keylen = strlen(key);\n+ for (cp = cb->first_child; cp && cp->next; cp = cp->next->next) {\n+ switch(cp->type) {\n+ case CN_CBOR_TEXT:\n+ if (keylen != cp->length) {\n+ continue;\n+ }\n+ if (strncmp(key, cp->v.str, cp->length) == 0) {\n+ return cp->next;\n+ }\n+ break;\n+ case CN_CBOR_BYTES:\n+ if (keylen != cp->length) {\n+ continue;\n+ }\n+ if (memcmp(key, cp->v.str, keylen) == 0) {\n+ return cp->next;\n+ }\n+ default:\n+ ; \/\/ skip non-string keys\n+ }\n+ }\n+ return NULL;\n+}\n+\n+const cn_cbor* cn_cbor_index(const cn_cbor* cb, int idx) {\n+ cn_cbor *cp;\n+ int i = 0;\n+ assert(cb);\n+ for (cp = cb->first_child; cp; cp = cp->next) {\n+ if (i == idx) {\n+ return cp;\n+ }\n+ i++;\n+ }\n+ return NULL;\n }\n \n #ifdef __cplusplus\n"} {"commit":"b158ce0c9290f1ba557e731dae4f4bc37427aef7","subject":"LinkedList3: add documentation","message":"LinkedList3: add documentation\n\n","repos":"Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- structure\/LinkedList3.h\n+++ structure\/LinkedList3.h\n@@ -35,12 +35,18 @@\n \n struct _LinkedList3Iterator;\n \n+\/**\n+ * Linked list node.\n+ *\/\n typedef struct _LinkedList3Node {\n struct _LinkedList3Node *p;\n struct _LinkedList3Node *n;\n struct _LinkedList3Iterator *it;\n } LinkedList3Node;\n \n+\/**\n+ * Linked list iterator.\n+ *\/\n typedef struct _LinkedList3Iterator {\n int dir;\n struct _LinkedList3Node *e;\n@@ -48,20 +54,136 @@\n struct _LinkedList3Iterator *ni;\n } LinkedList3Iterator;\n \n+\/**\n+ * Initializes a list node to form a new list consisting of a\n+ * single node.\n+ * \n+ * @param node list node structure to initialize. The node must remain\n+ * available until it is freed with {@link LinkedList3Node_Free},\n+ * or the list is no longer required.\n+ *\/\n static void LinkedList3Node_InitLonely (LinkedList3Node *node);\n+\n+\/**\n+ * Initializes a list node to go after an existing node.\n+ * \n+ * @param node list node structure to initialize. The node must remain\n+ * available until it is freed with {@link LinkedList3Node_Free},\n+ * or the list is no longer required.\n+ * @param ref existing list node\n+ *\/\n static void LinkedList3Node_InitAfter (LinkedList3Node *node, LinkedList3Node *ref);\n+\n+\/**\n+ * Initializes a list node to go before an existing node.\n+ * \n+ * @param node list node structure to initialize. The node must remain\n+ * available until it is freed with {@link LinkedList3Node_Free},\n+ * or the list is no longer required.\n+ * @param ref existing list node\n+ *\/\n static void LinkedList3Node_InitBefore (LinkedList3Node *node, LinkedList3Node *ref);\n+\n+\/**\n+ * Frees a list node, removing it a list (if there were other nodes\n+ * in the list).\n+ * \n+ * @param node list node to free\n+ *\/\n static void LinkedList3Node_Free (LinkedList3Node *node);\n+\n+\/**\n+ * Determines if a list node is a single node in a list.\n+ * \n+ * @param node list node\n+ * @return 1 if the node ia a single node, 0 if not\n+ *\/\n static int LinkedList3Node_IsLonely (LinkedList3Node *node);\n+\n+\/**\n+ * Returnes the node preceding this node (if there is one),\n+ * the node following this node (if there is one), or NULL,\n+ * respectively.\n+ * \n+ * @param node list node\n+ * @return neighbour node or NULL if none\n+ *\/\n static LinkedList3Node * LinkedList3Node_PrevOrNext (LinkedList3Node *node);\n+\n+\/**\n+ * Returnes the node following this node (if there is one),\n+ * the node preceding this node (if there is one), or NULL,\n+ * respectively.\n+ * \n+ * @param node list node\n+ * @return neighbour node or NULL if none\n+ *\/\n static LinkedList3Node * LinkedList3Node_NextOrPrev (LinkedList3Node *node);\n+\n+\/**\n+ * Returns the node preceding this node, or NULL if there is none.\n+ * \n+ * @param node list node\n+ * @return left neighbour, or NULL if none\n+ *\/\n static LinkedList3Node * LinkedList3Node_Prev (LinkedList3Node *node);\n+\n+\/**\n+ * Returns the node following this node, or NULL if there is none.\n+ * \n+ * @param node list node\n+ * @return right neighbour, or NULL if none\n+ *\/\n static LinkedList3Node * LinkedList3Node_Next (LinkedList3Node *node);\n+\n+\/**\n+ * Returns the first node in the list which this node is part of.\n+ * It is found by iterating the list from this node to the beginning.\n+ * \n+ * @param node list node\n+ * @return first node in the list\n+ *\/\n static LinkedList3Node * LinkedList3Node_First (LinkedList3Node *node);\n+\n+\/**\n+ * Returns the last node in the list which this node is part of.\n+ * It is found by iterating the list from this node to the end.\n+ * \n+ * @param node list node\n+ * @return last node in the list\n+ *\/\n static LinkedList3Node * LinkedList3Node_Last (LinkedList3Node *node);\n \n+\/**\n+ * Initializes a linked list iterator.\n+ * The iterator structure must remain available until either of these occurs:\n+ * - the list is no longer needed, or\n+ * - the iterator is freed with {@link LinkedList3Iterator_Free}, or\n+ * - the iterator reaches the end of iteration.\n+ * \n+ * @param it uninitialized iterator to initialize\n+ * @param e initial position of the iterator. NULL for end of iteration.\n+ * @param dir direction of iteration. Must be 1 (forward) or -1 (backward).\n+ *\/\n static void LinkedList3Iterator_Init (LinkedList3Iterator *it, LinkedList3Node *e, int dir);\n+\n+\/**\n+ * Frees a linked list iterator.\n+ * \n+ * @param it iterator to free\n+ *\/\n static void LinkedList3Iterator_Free (LinkedList3Iterator *it);\n+\n+\/**\n+ * Moves the iterator one node forward or backward (depending on its direction), or,\n+ * if it's at the last or first node (depending on the direction), it reaches\n+ * the end of iteration, or, if it's at the end of iteration, it remains there.\n+ * Returns the the previous position.\n+ * \n+ * @param it the iterator\n+ * @return node on the position of iterator before it was (possibly) moved, or NULL\n+ * if it was at the end of iteration\n+ *\/\n static LinkedList3Node * LinkedList3Iterator_Next (LinkedList3Iterator *it);\n \n void LinkedList3Node_InitLonely (LinkedList3Node *node)\n"} {"commit":"f25fc15aeaa72847ddab42f8636437f7a4409569","subject":"Macro NUMBER_SET has been removed, because it has been used only once and bloated the code.","message":"Macro NUMBER_SET has been removed, because it has been used only once and bloated the code.\n","repos":"SvenMichaelKlose\/tre,SvenMichaelKlose\/tre,SvenMichaelKlose\/tre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- interpreter\/number.c\n+++ interpreter\/number.c\n@@ -17,10 +17,6 @@\n \n void * tre_numbers_free;\n struct tre_number tre_numbers[NUM_NUMBERS];\n-\n-#define NUMBER_SET(idx, val, typ) \\\n- tre_numbers[idx].value = val; \\\n- tre_numbers[idx].type = typ;\n \n #define TRENUMBER_INDEX(ptr) \t((size_t) TREATOM_DETAIL(ptr))\n \n@@ -55,8 +51,7 @@\n size_t\n trenumber_alloc (double value, int type)\n {\n-\tsize_t idx;\n- void * i = trealloc_item (&tre_numbers_free);\n+ struct tre_number * i = trealloc_item (&tre_numbers_free);\n \n if (!i) {\n tregc_force ();\n@@ -65,10 +60,10 @@\n \t \ttreerror_internal (treptr_nil, \"out of numbers\");\n }\n \n- idx = ((size_t) i - (size_t) tre_numbers) \/ sizeof (struct tre_number);\n- NUMBER_SET(idx, value, type);\n+ i->value = value;\n+ i->type = type;\n \n- return idx;\n+ return ((size_t) i - (size_t) tre_numbers) \/ sizeof (struct tre_number);\n }\n \n void\n"} {"commit":"8e098a3c6bc323c88fc3a743b68b1e325fb5e664","subject":"Removed unused properties","message":"Removed unused properties\n\nOriginal commit message from CVS:\nRemoved unused properties\n","repos":"rawoul\/gst-plugins-good,zaheerm\/gst-plugins-good,ted-n\/gst-plugins-good,stfl\/gst-plugins-good,ndufresne\/gst-plugins-good,krieger-od\/gst-plugins-good,ted-n\/gst-plugins-good,jcaden\/gst-plugins-good,kittee\/gst-plugins-good,stfl\/gst-plugins-good,an146\/gst-plugins-good,jhodapp\/gst-plugins-good,cablelabs\/gst-plugins-good,alessandrod\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,jahrome\/gst-plugins-good,froggatt\/gst-plugins-good-m,ikonst\/gst-plugins-good,cfoch\/gst-plugins-good,ted-n\/gst-plugins-good,prajnashi\/gst-plugins-good,vatavuserban\/gst-plugins-good,loshca\/gst-plugins-good,an146\/gst-plugins-good,pexip\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,davibe\/gst-plugins-good-1.0,krieger-od\/gst-plugins-good,chamois94\/gst-plugins-good,cfoch\/gst-plugins-good,rawoul\/gst-plugins-good,offlinehacker\/gst-plugins-good,strukturag\/gst-plugins-good,strukturag\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,greg80303\/gst-plugins-good,mrchapp\/gst-plugins-good,ylatuya\/gst-plugins-good,cablelabs\/gst-plugins-good,sh0\/gst-plugins-good,cfoch\/gst-plugins-good,rawoul\/gst-plugins-good,GStreamer\/gst-plugins-good,stfl\/gst-plugins-good,surround-io\/gst-plugins-good,roopar\/gst-plugins-good,dgerlach\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,ahmedammar\/platform_external_gst_plugins_good,strukturag\/gst-plugins-good,offlinehacker\/gst-plugins-good,an146\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,matsu\/gst-plugins-good,vatavuserban\/gst-plugins-good,ndufresne\/gst-plugins-good,shelsonjava\/gst-plugins-good,ikonst\/gst-plugins-good,loshca\/gst-plugins-good,Lachann\/gst-plugins-good,pexip\/gst-plugins-good,krieger-od\/gst-plugins-good,sebras\/gst-plugins-good,collects\/gst-plugins-good,jahrome\/gst-plugins-good,kittee\/gst-plugins-good,luisbg\/gst-plugins-good,knuesel\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,jcaden\/gst-plugins-good,hizukiayaka\/gst-plugins-good,krieger-od\/gst-plugins-good,alessandrod\/gst-plugins-good,kittee\/gst-plugins-good,Lachann\/gst-plugins-good,BigBrother-International\/gst-plugins-good,Kurento\/gst-plugins-good,ted-n\/gst-plugins-good,kittee\/gst-plugins-good,ariscop\/gst-plugins-good,greg80303\/gst-plugins-good,vatavuserban\/gst-plugins-good,lovebug356\/gst-plugins-good,knuesel\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,jcaden\/gst-plugins-good,sebras\/gst-plugins-good,pexip\/gst-plugins-good,cfoch\/gst-plugins-good,dgerlach\/gst-plugins-good,ndufresne\/gst-plugins-good,wkatsak\/gst-plugins-good,alessandrod\/gst-plugins-good,Kurento\/gst-plugins-good,Distrotech\/gst-plugins-good,dgerlach\/gst-plugins-good,luisbg\/gst-plugins-good,PPCDroid\/external-gst-plugins-good,davibe\/gst-plugins-good-1.0,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,wkatsak\/gst-plugins-good,GStreamer\/gst-plugins-good,strukturag\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,davibe\/gst-plugins-good,GStreamer\/gst-plugins-good,davibe\/gst-plugins-good-1.0,sh0\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,reynaldo-samsung\/gst-plugins-good,hizukiayaka\/gst-plugins-good,shelsonjava\/gst-plugins-good,surround-io\/gst-plugins-good,jahrome\/gst-plugins-good,zaheerm\/gst-plugins-good,Distrotech\/gst-plugins-good,ndufresne\/gst-plugins-good,cablelabs\/gst-plugins-good,ariscop\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,ariscop\/gst-plugins-good,BigBrother-International\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,veo-labs\/gst-plugins-good,ylatuya\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,sh0\/gst-plugins-good,StreamUtils\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,Kurento\/gst-plugins-good,shelsonjava\/gst-plugins-good,surround-io\/gst-plugins-good,chamois94\/gst-plugins-good,lovebug356\/gst-plugins-good,alessandrod\/gst-plugins-good,luisbg\/gst-plugins-good,loshca\/gst-plugins-good,chamois94\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,wkatsak\/gst-plugins-good,hizukiayaka\/gst-plugins-good,ariscop\/gst-plugins-good,an146\/gst-plugins-good,cablelabs\/gst-plugins-good,prajnashi\/gst-plugins-good,lovebug356\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,GStreamer\/gst-plugins-good,hizukiayaka\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,davibe\/gst-plugins-good,Kurento\/gst-plugins-good,offlinehacker\/gst-plugins-good,shelsonjava\/gst-plugins-good,jahrome\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,Lachann\/gst-plugins-good,Lachann\/gst-plugins-good,BigBrother-International\/gst-plugins-good,pexip\/gst-plugins-good,matsu\/gst-plugins-good,rawoul\/gst-plugins-good,prajnashi\/gst-plugins-good,roopar\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,froggatt\/gst-plugins-good-m,veo-labs\/gst-plugins-good,Distrotech\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,loshca\/gst-plugins-good,BigBrother-International\/gst-plugins-good,zaheerm\/gst-plugins-good,Distrotech\/gst-plugins-good,StreamUtils\/gst-plugins-good,knuesel\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,zaheerm\/gst-plugins-good,collects\/gst-plugins-good,mrchapp\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,mrchapp\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,jcaden\/gst-plugins-good,mrchapp\/gst-plugins-good,wkatsak\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,knuesel\/gst-plugins-good,stfl\/gst-plugins-good,collects\/gst-plugins-good,veo-labs\/gst-plugins-good,lovebug356\/gst-plugins-good,sh0\/gst-plugins-good,surround-io\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,PPCDroid\/external-gst-plugins-good,Distrotech\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,greg80303\/gst-plugins-good,chamois94\/gst-plugins-good,roopar\/gst-plugins-good,jhodapp\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,davibe\/gst-plugins-good,ylatuya\/gst-plugins-good,luisbg\/gst-plugins-good,StreamUtils\/gst-plugins-good,ikonst\/gst-plugins-good,sebras\/gst-plugins-good,matsu\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,froggatt\/gst-plugins-good-m,froggatt\/gst-plugins-good-m,pexip\/gst-plugins-good,matsu\/gst-plugins-good,mrchapp\/gst-plugins-good,davibe\/gst-plugins-good-1.0,jhodapp\/gst-plugins-good,veo-labs\/gst-plugins-good,offlinehacker\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,ylatuya\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,PPCDroid\/external-gst-plugins-good,sebras\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,jhodapp\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,greg80303\/gst-plugins-good,StreamUtils\/gst-plugins-good,ikonst\/gst-plugins-good,vatavuserban\/gst-plugins-good,collects\/gst-plugins-good,Kurento\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/avi\/gstcdxaparse.c\n+++ gst\/avi\/gstcdxaparse.c\n@@ -64,9 +64,6 @@\n \n enum {\n ARG_0,\n- ARG_BITRATE,\n- ARG_MEDIA_TIME,\n- ARG_CURRENT_TIME,\n \/* FILL ME *\/\n };\n \n@@ -136,16 +133,6 @@\n gobject_class = (GObjectClass*)klass;\n gstelement_class = (GstElementClass*)klass;\n \n- g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_BITRATE,\n- g_param_spec_long (\"bitrate\",\"bitrate\",\"bitrate\",\n- G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); \/* CHECKME *\/\n- g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_MEDIA_TIME,\n- g_param_spec_long (\"media_time\",\"media_time\",\"media_time\",\n- G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); \/* CHECKME *\/\n- g_object_class_install_property (G_OBJECT_CLASS(klass), ARG_CURRENT_TIME,\n- g_param_spec_long (\"current_time\",\"current_time\",\"current_time\",\n- G_MINLONG, G_MAXLONG, 0, G_PARAM_READABLE)); \/* CHECKME *\/\n-\n parent_class = g_type_class_ref (GST_TYPE_ELEMENT);\n \n gstelement_class->change_state = gst_cdxa_parse_change_state;\n"} {"commit":"a85883ba2b2dcd83d2c7456e547a8550c4e2c236","subject":"imagemenuitem: No need to query image size by default","message":"imagemenuitem: No need to query image size by default\n\nAlso makes the code look nicer, so woohoo\n","repos":"davidt\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,chergert\/gtk,ahodesuka\/gtk,jigpu\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,bratsche\/gtk-,jessevdk\/gtk,jadahl\/gtk,chergert\/gtk,jadahl\/gtk,Lyude\/gtk-,jessevdk\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,grubersjoe\/adwaita,jigpu\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,davidt\/gtk,ebassi\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,ahodesuka\/gtk,davidt\/gtk,Distrotech\/gtk2,ahodesuka\/gtk,Lyude\/gtk-,davidt\/gtk,jigpu\/gtk,ebassi\/gtk,jigpu\/gtk,Lyude\/gtk-,Distrotech\/gtk2,Adamovskiy\/gtk,jadahl\/gtk,Lyude\/gtk-,ahodesuka\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,davidgumberg\/gtk,bratsche\/gtk-,chergert\/gtk,davidt\/gtk,Distrotech\/gtk2,ebassi\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,Distrotech\/gtk2,msteinert\/gtk,chergert\/gtk,alexlarsson\/gtk,Lyude\/gtk-,Lyude\/gtk-,grubersjoe\/adwaita,davidgumberg\/gtk,davidgumberg\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,Lyude\/gtk-,chergert\/gtk,msteinert\/gtk,chergert\/gtk,jigpu\/gtk,alexlarsson\/gtk,jessevdk\/gtk,bratsche\/gtk-,chergert\/gtk,jadahl\/gtk,jigpu\/gtk,msteinert\/gtk,ebassi\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,ebassi\/gtk,jigpu\/gtk,jessevdk\/gtk,jadahl\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,jadahl\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,msteinert\/gtk,Sidnioulz\/SandboxGtk,davidt\/gtk,davidgumberg\/gtk,msteinert\/gtk,alexlarsson\/gtk,bratsche\/gtk-,jigpu\/gtk,jadahl\/gtk,bratsche\/gtk-,ahodesuka\/gtk,grubersjoe\/adwaita,chergert\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,ebassi\/gtk,jessevdk\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,Distrotech\/gtk2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkimagemenuitem.c\n+++ gtk\/gtkimagemenuitem.c\n@@ -439,7 +439,6 @@\n {\n GtkImageMenuItem *image_menu_item = GTK_IMAGE_MENU_ITEM (widget);\n GtkImageMenuItemPrivate *priv = image_menu_item->priv;\n- gint child_width = 0;\n GtkPackDirection pack_dir;\n GtkWidget *parent;\n \n@@ -450,21 +449,18 @@\n else\n pack_dir = GTK_PACK_DIRECTION_LTR;\n \n- if (priv->image && gtk_widget_get_visible (priv->image))\n- {\n- GtkRequisition child_requisition;\n-\n- gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL);\n-\n- child_width = child_requisition.width;\n- }\n-\n GTK_WIDGET_CLASS (gtk_image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural);\n \n- if (pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT)\n- {\n- *minimum = MAX (*minimum, child_width);\n- *natural = MAX (*natural, child_width);\n+ if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) &&\n+ priv->image &&\n+ gtk_widget_get_visible (priv->image))\n+ {\n+ gint child_minimum, child_natural;\n+\n+ gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural);\n+\n+ *minimum = MAX (*minimum, child_minimum);\n+ *natural = MAX (*natural, child_natural);\n }\n }\n \n"} {"commit":"1b839d4b72a2cedb2bb633b5acd57239860693f4","subject":"GtkPlacesSidebar: support open locations when dragging text","message":"GtkPlacesSidebar: support open locations when dragging text\n\nMake GtkPlacesSidebar also open locations when hovered by\ntext dnd targets.\n\nPart of bug 707679\n","repos":"jigpu\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,jessevdk\/gtk,jigpu\/gtk,chergert\/gtk,alexlarsson\/gtk,jessevdk\/gtk,chergert\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,jigpu\/gtk,davidgumberg\/gtk,jessevdk\/gtk,Lyude\/gtk-,davidgumberg\/gtk,davidgumberg\/gtk,msteinert\/gtk,chergert\/gtk,chergert\/gtk,alexlarsson\/gtk,msteinert\/gtk,chergert\/gtk,msteinert\/gtk,msteinert\/gtk,jadahl\/gtk,jadahl\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,jessevdk\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,Adamovskiy\/gtk,chergert\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,jadahl\/gtk,jadahl\/gtk,alexlarsson\/gtk,Lyude\/gtk-,davidgumberg\/gtk,chergert\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,jigpu\/gtk,ahodesuka\/gtk,jadahl\/gtk,jadahl\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,chergert\/gtk,ahodesuka\/gtk,Lyude\/gtk-,davidgumberg\/gtk,jadahl\/gtk,jigpu\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,grubersjoe\/adwaita,msteinert\/gtk,Lyude\/gtk-,alexlarsson\/gtk,ahodesuka\/gtk,msteinert\/gtk,jadahl\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,jigpu\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,jessevdk\/gtk,jessevdk\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,ahodesuka\/gtk,jessevdk\/gtk,jigpu\/gtk,Adamovskiy\/gtk,Lyude\/gtk-","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkplacessidebar.c\n+++ gtk\/gtkplacessidebar.c\n@@ -290,7 +290,8 @@\n enum {\n \tGTK_TREE_MODEL_ROW,\n \tTEXT_URI_LIST,\n-\tXDND_DIRECT_SAVE\n+\tXDND_DIRECT_SAVE,\n+\tTEXT\n };\n \n \/* Target types for dragging from the shortcuts list *\/\n@@ -1594,11 +1595,13 @@\n \tgboolean res;\n \tgboolean drop_as_bookmarks;\n \tgboolean valid_xds_drag;\n+\tgboolean valid_text_drag;\n \tchar *drop_target_uri = NULL;\n \n \taction = 0;\n \tdrop_as_bookmarks = FALSE;\n \tvalid_xds_drag = FALSE;\n+\tvalid_text_drag = FALSE;\n \tpath = NULL;\n \n \tif (!sidebar->drag_data_received) {\n@@ -1618,13 +1621,15 @@\n \t\t\/* Dragging bookmarks always moves them to another position in the bookmarks list *\/\n \t\taction = GDK_ACTION_MOVE;\n \t} else if (sidebar->drag_data_received &&\n-\t\t sidebar->drag_data_info == XDND_DIRECT_SAVE) {\n+\t\t (sidebar->drag_data_info == XDND_DIRECT_SAVE ||\n+\t\t sidebar->drag_data_info == TEXT)) {\n \t\tgtk_tree_model_get_iter (GTK_TREE_MODEL (sidebar->store), &iter, path);\n \t\tgtk_tree_model_get (GTK_TREE_MODEL (sidebar->store),\n \t\t\t\t &iter,\n \t\t\t\t PLACES_SIDEBAR_COLUMN_URI, &drop_target_uri,\n \t\t\t\t -1);\n-\t\tvalid_xds_drag = TRUE;\n+\t\tvalid_text_drag = sidebar->drag_data_info == TEXT;\n+\t\tvalid_xds_drag = !valid_text_drag;\n \t} else {\n \t\t\/* URIs are being dragged. See if the caller wants to handle a\n \t\t * file move\/copy operation itself, or if we should only try to\n@@ -1667,7 +1672,7 @@\n \t}\n \n out:\n-\tif (action != 0 || valid_xds_drag) {\n+\tif (action != 0 || valid_xds_drag || valid_text_drag) {\n \t\tcheck_switch_location_timer (sidebar, drop_target_uri);\n \t\tstart_drop_feedback (sidebar, path, pos, drop_as_bookmarks);\n \t} else {\n@@ -3652,6 +3657,7 @@\n \tGtkCellRenderer *cell;\n \tGtkTreeSelection *selection;\n \tGIcon *eject;\n+\tGtkTargetList *target_list;\n \n \tgtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (sidebar)), GTK_STYLE_CLASS_SIDEBAR);\n \n@@ -3815,8 +3821,13 @@\n \t\t\t\t\t\tGDK_ACTION_MOVE);\n \tgtk_drag_dest_set (GTK_WIDGET (tree_view),\n \t\t\t 0,\n-\t\t\t dnd_drop_targets, G_N_ELEMENTS (dnd_drop_targets),\n+\t\t\t NULL, 0,\n \t\t\t GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);\n+\n+\ttarget_list = gtk_target_list_new (dnd_drop_targets, G_N_ELEMENTS (dnd_drop_targets));\n+\tgtk_target_list_add_text_targets (target_list, TEXT);\n+\tgtk_drag_dest_set_target_list (GTK_WIDGET (tree_view), target_list);\n+\tgtk_target_list_unref (target_list);\n \n \tg_signal_connect (tree_view, \"key-press-event\",\n \t\t\t G_CALLBACK (bookmarks_key_press_event_cb), sidebar);\n"} {"commit":"0ed8724d01d0cd660665e51c45c0163119559552","subject":"Allow sendto() to take an optionally NULL destination address.","message":"Allow sendto() to take an optionally NULL destination address.\n","repos":"kaffe\/kaffe,kaffe\/kaffe,kaffe\/kaffe,kaffe\/kaffe,kaffe\/kaffe","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- kaffe\/kaffevm\/systems\/unix-pthreads\/syscalls.c\n+++ kaffe\/kaffevm\/systems\/unix-pthreads\/syscalls.c\n@@ -247,7 +247,8 @@\n {\n \tint rc = 0;\n \n-\tif ((*out = sendto(a, b, c, d, e, f)) == -1) {\n+\t*out = e ? sendto(a, b, c, d, e, f) : send(a, b, c, d);\n+\tif (*out == -1) {\n \t\trc = errno;\n \t}\n \treturn (rc);\n"} {"commit":"3e9ebc397591d7a6cde61fb0b70cdfd743514cf3","subject":"[numerics] transform a define in enum in SolverOptions.h","message":"[numerics] transform a define in enum in SolverOptions.h\n","repos":"siconos\/siconos,bremond\/siconos,bremond\/siconos,fperignon\/siconos,fperignon\/siconos,bremond\/siconos,fperignon\/siconos,siconos\/siconos,radarsat1\/siconos,siconos\/siconos,bremond\/siconos,radarsat1\/siconos,radarsat1\/siconos,fperignon\/siconos,fperignon\/siconos,bremond\/siconos,siconos\/siconos,radarsat1\/siconos,radarsat1\/siconos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- numerics\/src\/tools\/SolverOptions.h\n+++ numerics\/src\/tools\/SolverOptions.h\n@@ -85,9 +85,17 @@\n \n \n \/** Some value for iparam index *\/\n-#define SICONOS_IPARAM_MAX_ITER 0\n-#define SICONOS_IPARAM_ITER_DONE 1\n-#define SICONOS_IPARAM_PREALLOC 2\n+\/* #define SICONOS_IPARAM_MAX_ITER 0 *\/\n+\/* #define SICONOS_IPARAM_ITER_DONE 1 *\/\n+\/* #define SICONOS_IPARAM_PREALLOC 2 *\/\n+\n+\n+enum SICONOS_IPARAM\n+{\n+ SICONOS_IPARAM_MAX_ITER = 0,\n+ SICONOS_IPARAM_ITER_DONE = 1,\n+ SICONOS_IPARAM_PREALLOC = 2\n+};\n \n \/** for pivot based algorithm *\/\n #define SICONOS_IPARAM_PIVOT_RULE 3\n"} {"commit":"ade60c13488b0d167779ef8b66c35348fcb4f600","subject":"! getUClinuxVersion improved","message":"! getUClinuxVersion improved\n","repos":"scs\/oscar,scs\/oscar,scs\/oscar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cfg\/cfg.c\n+++ cfg\/cfg.c\n@@ -1186,25 +1186,35 @@\n OscFunctionEnd()\n \n OscFunction(static getUClinuxVersion, char ** res)\n-\tstatic char buffer[80];\n \tFILE * file = NULL;\n \t\n-\tchar * ferr, * newline;\n \tint err;\n \t\n-\tfile = popen(\"cat \/proc\/version | sed -rn 's,.*Git_(.*)-svn.*,\\\\1,p'\", \"r\");\n+\tfile=fopen(\"\/proc\/version\", \"r\");\n+\t\t\t\t\n \tOscAssert(file != NULL);\n \t\n-\tferr = fgets(buffer, sizeof buffer, file);\n-\tOscAssert(ferr != NULL || feof(file) != 0);\n-\t\n-\terr = pclose(file);\n+\tstatic char version[200];\n+\tfread(version, sizeof(char), 200, file);\n+\t\n+\tchar* occur=strstr(version, \"Git_\");\n+\tOscAssert(occur!=NULL);\n+\toccur+=4;\n+\t\n+\tchar* next=strstr(occur, \"-\");\n+\tOscAssert(next!=NULL);\n+\tif(next[1]=='p') {\n+\t\tnext=strstr(next+1, \"-\");\n+\t\tOscAssert(next!=NULL); \n+\t}\n+\tchar* end=strstr(next+1, \"-\");\n+\tif(end!=NULL) next=end;\n+\t\n+\t*next=0;\n+\t*res=occur;\n+\t\n+\terr = fclose(file);\n \tOscAssert(err == 0);\n-\t\n-\tnewline = strchr(buffer, '\\n');\n-\tOscAssert(newline != NULL);\n-\t*newline = 0;\n-\t*res = buffer;\n \t\n OscFunctionCatch()\n \/\/\tpclose(file); FIXME: Shit! file's not in scope anymore!\n"} {"commit":"29d76d4b05bc537ac59fd1e6f849ab3386c01502","subject":"Make \"checkout-cache\" silently skip up-to-date files.","message":"Make \"checkout-cache\" silently skip up-to-date files.\n\nIt used to always overwrite them if forced. Now it just\nrealizes that they are already ok, and don't need to be\ntouched.\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- checkout-cache.c\n+++ checkout-cache.c\n@@ -96,12 +96,14 @@\n \n static int checkout_entry(struct cache_entry *ce)\n {\n-\tif (!force) {\n-\t\tstruct stat st;\n+\tstruct stat st;\n \n-\t\tif (!stat(ce->name, &st)) {\n-\t\t\tunsigned changed = cache_match_stat(ce, &st);\n-\t\t\tif (changed && !quiet)\n+\tif (!stat(ce->name, &st)) {\n+\t\tunsigned changed = cache_match_stat(ce, &st);\n+\t\tif (!changed)\n+\t\t\treturn 0;\n+\t\tif (!force) {\n+\t\t\tif (!quiet)\n \t\t\t\tfprintf(stderr, \"checkout-cache: %s already exists\\n\", ce->name);\n \t\t\treturn 0;\n \t\t}\n"} {"commit":"61dab2c8672adaff1ca94abc04cd8a3080a7cf9a","subject":":lipstick: Add debug info","message":":lipstick: Add debug info\n","repos":"redBorder\/f2k,redBorder\/f2k,redBorder\/f2k","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- collect.c\n+++ collect.c\n@@ -1987,6 +1987,8 @@\n \/\/ traceEvent(TRACE_NORMAL,\"Creating consumer loop\");\n \n if (readOnlyGlobals.kafka_consumer.topic) {\n+ traceEvent(TRACE_NORMAL, \"Creating kafka consumer in topic %s\",\n+ readOnlyGlobals.kafka_consumer.topic);\n rk = init_kafka_consumer();\n }\n \n"} {"commit":"58b6e538c97afc7a21c430e8d8e6f4879a14b574","subject":"GtkThemingEngine: use background-image in render_background()","message":"GtkThemingEngine: use background-image in render_background()\n","repos":"Distrotech\/gtk2,msteinert\/gtk,Lyude\/gtk-,bratsche\/gtk-,jadahl\/gtk,jigpu\/gtk,jadahl\/gtk,jigpu\/gtk,simokivimaki\/gtk,jigpu\/gtk,chergert\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,Lyude\/gtk-,ahodesuka\/gtk,jessevdk\/gtk,bratsche\/gtk-,Distrotech\/gtk2,jessevdk\/gtk,jigpu\/gtk,chergert\/gtk,simokivimaki\/gtk,bratsche\/gtk-,Distrotech\/gtk2,alexlarsson\/gtk,jigpu\/gtk,Adamovskiy\/gtk,davidt\/gtk,jadahl\/gtk,msteinert\/gtk,jigpu\/gtk,davidgumberg\/gtk,jadahl\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,alexlarsson\/gtk,bratsche\/gtk-,ebassi\/gtk,chergert\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,ebassi\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,chergert\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,jessevdk\/gtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,grubersjoe\/adwaita,chergert\/gtk,Adamovskiy\/gtk,ebassi\/gtk,ebassi\/gtk,Adamovskiy\/gtk,jadahl\/gtk,Sidnioulz\/SandboxGtk,jigpu\/gtk,davidt\/gtk,alexlarsson\/gtk,Distrotech\/gtk2,msteinert\/gtk,davidt\/gtk,davidgumberg\/gtk,Lyude\/gtk-,msteinert\/gtk,jigpu\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,bratsche\/gtk-,chergert\/gtk,ahodesuka\/gtk,chergert\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,Distrotech\/gtk2,ahodesuka\/gtk,jessevdk\/gtk,bratsche\/gtk-,jadahl\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,jadahl\/gtk,alexlarsson\/gtk,simokivimaki\/gtk,davidt\/gtk,msteinert\/gtk,Adamovskiy\/gtk,davidt\/gtk,simokivimaki\/gtk,ahodesuka\/gtk,davidt\/gtk,jessevdk\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,Lyude\/gtk-,ahodesuka\/gtk,Lyude\/gtk-,msteinert\/gtk,jadahl\/gtk,ebassi\/gtk,alexlarsson\/gtk,chergert\/gtk,simokivimaki\/gtk,ebassi\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,ahodesuka\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,simokivimaki\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkthemingengine.c\n+++ gtk\/gtkthemingengine.c\n@@ -892,28 +892,47 @@\n gdouble width,\n gdouble height)\n {\n+ GdkColor *bg_color, *base_color;\n+ cairo_pattern_t *pattern;\n GtkStateFlags flags;\n- GdkColor *color;\n-\n+\n+ flags = gtk_theming_engine_get_state (engine);\n cairo_save (cr);\n- flags = gtk_theming_engine_get_state (engine);\n-\n- if (gtk_theming_engine_has_class (engine, \"entry\"))\n- gtk_theming_engine_get (engine, flags,\n- \"base-color\", &color,\n- NULL);\n- else\n- gtk_theming_engine_get (engine, flags,\n- \"background-color\", &color,\n- NULL);\n-\n- gdk_cairo_set_source_color (cr, color);\n \n if (gtk_theming_engine_has_class (engine, \"spinbutton\") &&\n gtk_theming_engine_has_class (engine, \"button\"))\n- cairo_rectangle (cr, x + 2, y + 2, width - 4, height - 4);\n+ {\n+ x += 2;\n+ y += 2;\n+ width -= 4;\n+ height -= 4;\n+ }\n+\n+ gtk_theming_engine_get (engine, flags,\n+ \"background-image\", &pattern,\n+ \"background-color\", &bg_color,\n+ \"base-color\", &base_color,\n+ NULL);\n+\n+ if (pattern)\n+ {\n+ cairo_translate (cr, x, y);\n+ cairo_scale (cr, width, height);\n+\n+ cairo_rectangle (cr, 0, 0, 1, 1);\n+ cairo_set_source (cr, pattern);\n+\n+ cairo_pattern_destroy (pattern);\n+ }\n else\n- cairo_rectangle (cr, x, y, width, height);\n+ {\n+ if (gtk_theming_engine_has_class (engine, \"entry\"))\n+ gdk_cairo_set_source_color (cr, base_color);\n+ else\n+ gdk_cairo_set_source_color (cr, bg_color);\n+\n+ cairo_rectangle (cr, x, y, width, height);\n+ }\n \n if (gtk_theming_engine_has_class (engine, \"tooltip\"))\n {\n@@ -927,7 +946,8 @@\n \n cairo_restore (cr);\n \n- gdk_color_free (color);\n+ gdk_color_free (base_color);\n+ gdk_color_free (bg_color);\n }\n \n static void\n"} {"commit":"df8b85d63a173117fd9a64e818ffe9ed15f2ef0d","subject":"MAINT: Add complete input validation for info","message":"MAINT: Add complete input validation for info\n\nThis is currently unnecessary, but does not hurt. Eventually,\nit should potentially move elsewhere.\n","repos":"pdebuyl\/numpy,charris\/numpy,mhvk\/numpy,mhvk\/numpy,pdebuyl\/numpy,seberg\/numpy,seberg\/numpy,seberg\/numpy,numpy\/numpy,anntzer\/numpy,endolith\/numpy,pdebuyl\/numpy,jakirkham\/numpy,numpy\/numpy,anntzer\/numpy,numpy\/numpy,jakirkham\/numpy,endolith\/numpy,simongibbons\/numpy,jakirkham\/numpy,simongibbons\/numpy,rgommers\/numpy,mhvk\/numpy,mattip\/numpy,rgommers\/numpy,simongibbons\/numpy,simongibbons\/numpy,mattip\/numpy,anntzer\/numpy,endolith\/numpy,anntzer\/numpy,mattip\/numpy,mhvk\/numpy,simongibbons\/numpy,jakirkham\/numpy,charris\/numpy,jakirkham\/numpy,charris\/numpy,mattip\/numpy,charris\/numpy,rgommers\/numpy,pdebuyl\/numpy,endolith\/numpy,mhvk\/numpy,rgommers\/numpy,seberg\/numpy,numpy\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/dispatching.c\n+++ numpy\/core\/src\/umath\/dispatching.c\n@@ -70,7 +70,37 @@\n static int\n add_ufunc_loop(PyUFuncObject *ufunc, PyObject *info, int ignore_duplicate)\n {\n- assert(PyTuple_CheckExact(info) && PyTuple_GET_SIZE(info) == 2);\n+ \/*\n+ * Validate the info object, this should likely move to to a different\n+ * entry-point in the future (and is mostly unnecessary currently).\n+ *\/\n+ if (!PyTuple_CheckExact(info) || PyTuple_GET_SIZE(info) != 2) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"Info must be a tuple: \"\n+ \"(tuple of DTypes or None, ArrayMethod or promoter)\");\n+ return -1;\n+ }\n+ PyObject *DType_tuple = PyTuple_GetItem(info, 0);\n+ if (PyTuple_GET_SIZE(DType_tuple) != ufunc->nargs) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"DType tuple length does not match ufunc number of operands\");\n+ return -1;\n+ }\n+ for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(DType_tuple); i++) {\n+ PyObject *item = PyTuple_GET_ITEM(DType_tuple, i);\n+ if (item != Py_None\n+ && !PyObject_TypeCheck(item, &PyArrayDTypeMeta_Type)) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"DType tuple may only contain None and DType classes\");\n+ return -1;\n+ }\n+ }\n+ if (!PyObject_TypeCheck(PyTuple_GET_ITEM(info, 1), &PyArrayMethod_Type)) {\n+ \/* Must also accept promoters in the future. *\/\n+ PyErr_SetString(PyExc_TypeError,\n+ \"Second argument to info must be an ArrayMethod or promoter\");\n+ return -1;\n+ }\n \n if (ufunc->_loops == NULL) {\n ufunc->_loops = PyList_New(0);\n@@ -78,8 +108,6 @@\n return -1;\n }\n }\n-\n- PyObject *DType_tuple = PyTuple_GetItem(info, 0);\n \n PyObject *loops = ufunc->_loops;\n Py_ssize_t length = PyList_Size(loops);\n"} {"commit":"b5defad792294c8882cee2ce488c584a696d5779","subject":"hopefully fixed a bug which caused too high register pressure when inserting remat2s","message":"hopefully fixed a bug which caused too high register pressure when inserting remat2s\n","repos":"killbug2004\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillremat.c\n+++ ir\/be\/bespillremat.c\n@@ -1379,6 +1379,8 @@\n \t\t\tpset_remove_ptr(live, irn);\n \t\t}\n \n+\t\tif(is_Proj(irn)) continue;\n+\n \t\t\/* init set of irn's arguments *\/\n \t\tfor (i = 0, n = get_irn_arity(irn); i < n; ++i) {\n \t\t\tir_node *irn_arg = get_irn_n(irn, i);\n@@ -3104,8 +3106,8 @@\n \n \t\/\/ move reloads upwards\n \tmove_reloads_upward(&si);\n-\tirg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);\n-\tdump_pressure_graph(&si, dump_suffix3);\n+\t\/\/irg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);\n+\t\/\/dump_pressure_graph(&si, dump_suffix3);\n \n \tbe_analyze_regpressure(chordal_env, \"-post\");\n \n@@ -3118,7 +3120,7 @@\n #endif\n \tfree_lpp(si.lpp);\n \tobstack_free(&obst, NULL);\n-\/\/\texit(0);\n+\tDBG((si.dbg, LEVEL_1, \"\\tdone.\\n\"));\n }\n \n #else\t\t\t\t\/* WITH_ILP *\/\n"} {"commit":"b6b8f2f48b8e40288a8c7874cb766332c5afb3a1","subject":"\u66f4\u65b0GetCodeAddr","message":"\u66f4\u65b0GetCodeAddr\n","repos":"LittleKu\/ThreadLib,LittleKu\/ThreadLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Include\/CodeAddress.h\n+++ Include\/CodeAddress.h\n@@ -1,13 +1,14 @@\n #ifndef __CODE_ADDRESS_H__\n #define __CODE_ADDRESS_H__\n \n-\/**\n- *\tSourcemod,\u02fd:https:\/\/github.com\/alliedmodders\/sourcemod\n- *\/\n+\n \n namespace ThreadLib\n {\n #ifdef WIN32\n+\t\/**\n+\t *\tNagistMetahook\n+\t *\/\n \tinline void *GetCodeAddr(...)\n \t{\n \t\tDWORD address;\n@@ -22,6 +23,9 @@\n \t\treturn (void *)address;\n \t}\n #else\n+\t\/**\n+\t *\tSourcemod,\u02fd:https:\/\/github.com\/alliedmodders\/sourcemod\n+\t *\/\n \tclass GenericClass {};\n \ttypedef void (GenericClass::*VoidFunc)();\n \n"} {"commit":"b27acf50d56b6f65fd9e4a55d1524b8df10169eb","subject":"BUG(1876): Use xmms_error_set instead of xmms_log_fatal in xmms_ao_write.","message":"BUG(1876): Use xmms_error_set instead of xmms_log_fatal in xmms_ao_write.\n","repos":"mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman-old,dreamerc\/xmms2,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,six600110\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,theefer\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,six600110\/xmms2,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,dreamerc\/xmms2,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,theefer\/xmms2,chrippa\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,chrippa\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,oneman\/xmms2-oneman,six600110\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,theefer\/xmms2,oneman\/xmms2-oneman-old,dreamerc\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,theefer\/xmms2,chrippa\/xmms2,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/ao\/ao.c\n+++ src\/plugins\/ao\/ao.c\n@@ -280,7 +280,8 @@\n \tif (!ao_play (data->device, buffer, len)) {\n \t\tao_close (data->device);\n \t\tdata->device = NULL;\n-\t\txmms_log_fatal (\"Error writing to libao, output closed\");\n+\t\txmms_error_set (err, XMMS_ERROR_NO_SAUSAGE,\n+\t\t \"Error writing to libao, output closed\");\n \t}\n }\n \n"} {"commit":"94a79f340dd86ce698f8f55c6c6111f21256b91f","subject":"esp8266\/mpconfigport.h: Add some weak links to common Python modules.","message":"esp8266\/mpconfigport.h: Add some weak links to common Python modules.\n\nTo make it easier\/simpler to write code that can run under both CPython and\non an ESP8266 board.\n","repos":"swegener\/micropython,tobbad\/micropython,tobbad\/micropython,dmazzella\/micropython,bvernoux\/micropython,selste\/micropython,pfalcon\/micropython,henriknelson\/micropython,adafruit\/micropython,tobbad\/micropython,pozetroninc\/micropython,pfalcon\/micropython,henriknelson\/micropython,adafruit\/circuitpython,adafruit\/micropython,pozetroninc\/micropython,pramasoul\/micropython,adafruit\/micropython,pozetroninc\/micropython,swegener\/micropython,MrSurly\/micropython,pramasoul\/micropython,pfalcon\/micropython,tralamazza\/micropython,pozetroninc\/micropython,dmazzella\/micropython,bvernoux\/micropython,trezor\/micropython,kerneltask\/micropython,pramasoul\/micropython,tobbad\/micropython,swegener\/micropython,selste\/micropython,trezor\/micropython,adafruit\/micropython,pramasoul\/micropython,MrSurly\/micropython,MrSurly\/micropython,bvernoux\/micropython,henriknelson\/micropython,adafruit\/micropython,henriknelson\/micropython,adafruit\/circuitpython,kerneltask\/micropython,trezor\/micropython,MrSurly\/micropython,pramasoul\/micropython,selste\/micropython,pfalcon\/micropython,kerneltask\/micropython,swegener\/micropython,dmazzella\/micropython,swegener\/micropython,bvernoux\/micropython,pozetroninc\/micropython,MrSurly\/micropython,bvernoux\/micropython,tralamazza\/micropython,selste\/micropython,adafruit\/circuitpython,trezor\/micropython,adafruit\/circuitpython,kerneltask\/micropython,pfalcon\/micropython,adafruit\/circuitpython,henriknelson\/micropython,kerneltask\/micropython,selste\/micropython,tralamazza\/micropython,trezor\/micropython,adafruit\/circuitpython,dmazzella\/micropython,tralamazza\/micropython,tobbad\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ports\/esp8266\/mpconfigport.h\n+++ ports\/esp8266\/mpconfigport.h\n@@ -171,12 +171,21 @@\n { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \\\n \n #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \\\n- { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&utime_module) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \\\n { MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&uos_module) }, \\\n- { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \\\n- { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mp_module_urandom) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \\\n { MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_module_uselect) }, \\\n { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_lwip) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_ssl), MP_ROM_PTR(&mp_module_ussl) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&utime_module) }, \\\n+ { MP_ROM_QSTR(MP_QSTR_zlib), MP_ROM_PTR(&mp_module_uzlib) }, \\\n \n #define MP_STATE_PORT MP_STATE_VM\n \n"} {"commit":"42e3222f4ca2ad8adeb321c32fcd590cbb6a97fb","subject":"add getCode test for sequence of numbers with code size change","message":"add getCode test for sequence of numbers with code size change\n","repos":"MichalChomo\/gif2bmp,MichalChomo\/gif2bmp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/gifTest.c\n+++ tests\/gifTest.c\n@@ -13,7 +13,7 @@\n memset(buffer, 0, 9 * sizeof(uint8_t));\n bufferStart = buffer;\n \n- getCode(&buffer, 255);\n+ getCode(NULL, 0xff);\n \n for (; codeSize <= LZW_MAX_CODE_SIZE; ++codeSize) {\n code = getCode(&buffer, codeSize);\n@@ -37,7 +37,7 @@\n memset(buffer, 0xff, 9 * sizeof(uint8_t));\n bufferStart = buffer;\n \n- getCode(&buffer, 255);\n+ getCode(NULL, 0xff);\n \n for (; codeSize <= LZW_MAX_CODE_SIZE; ++codeSize) {\n code = getCode(&buffer, codeSize);\n@@ -50,11 +50,51 @@\n CuAssertIntEquals(tc, expectedSum, codeSum);\n }\n \n+void testGetCodeSequence(CuTest *tc) {\n+ uint8_t *buffer = NULL;\n+ uint8_t *bufferStart = NULL;\n+ uint8_t codeSize = 4;\n+ uint16_t code = 0;\n+ uint16_t expectedCodes[6] = {1, 2, 3, 20, 18, 29};\n+ bool fail = false;\n+\n+ buffer = malloc(4 * sizeof(uint8_t));\n+ memset(buffer, 0xff, 4 * sizeof(uint8_t));\n+ bufferStart = buffer;\n+\n+ *buffer = 0x21;\n+ ++buffer;\n+ *buffer = 0x43;\n+ ++buffer;\n+ *buffer = 0x65;\n+ ++buffer;\n+ *buffer = 0x87;\n+\n+ buffer = bufferStart;\n+\n+ getCode(NULL, 0xff);\n+\n+ for (uint8_t i = 0; i < 6; ++i) {\n+ if (i == 3) {\n+ ++codeSize;\n+ }\n+ code = getCode(&buffer, codeSize);\n+ if (code != expectedCodes[i]) {\n+ fail = true;\n+ }\n+ }\n+\n+ free(bufferStart);\n+\n+ CuAssertTrue(tc, !fail);\n+}\n+\n CuSuite* GifGetSuite(void) {\n CuSuite* suite = CuSuiteNew();\n \n SUITE_ADD_TEST(suite, testGetCodeZeroes);\n SUITE_ADD_TEST(suite, testGetCodeOnes);\n+ SUITE_ADD_TEST(suite, testGetCodeSequence);\n \n return suite;\n }\n"} {"commit":"85dc99d2e4b5b7907c2eee7fdbf8ce656eb4f47d","subject":"goodwin gammlich","message":"goodwin gammlich\n","repos":"davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,8l\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillremat.c\n+++ ir\/be\/bespillremat.c\n@@ -799,7 +799,8 @@\n \t}\n }\n \n-static int get_block_n_succs(ir_node *block) {\n+static int\n+get_block_n_succs(const ir_node *block) {\n \tconst ir_edge_t *edge;\n \n \tassert(edges_activated(current_ir_graph));\n@@ -810,6 +811,26 @@\n \n \tedge = get_block_succ_next(block, edge);\n \treturn edge ? 2 : 1;\n+}\n+\n+static int\n+is_merge_edge(const ir_node * bb)\n+{\n+#ifdef GOODWIN_REDUCTION\n+\treturn get_block_n_succs(bb) == 1;\n+#else\n+\treturn 1;\n+#endif\n+}\n+\n+static int\n+is_diverge_edge(const ir_node * bb)\n+{\n+#ifdef GOODWIN_REDUCTION\n+\treturn get_Block_n_cfgpreds(bb) == 1;\n+#else\n+\treturn 1;\n+#endif\n }\n \n \/**\n@@ -978,10 +999,8 @@\n \tlive_foreach(bb, li) {\n \t\tir_node *value = (ir_node *) li->irn;\n \n-#ifdef GOODWIN_REDUCTION\n \t\t\/* add remats at end if successor has multiple predecessors *\/\n-\t\tif(get_block_n_succs(bb) == 1 && get_Block_n_cfgpreds(get_block_succ_first(bb)->src) > 1) {\n-#endif\n+\t\tif(is_merge_edge(bb)) {\n \t\t\t\/* add remats at end of block *\/\n \t\t\tif (live_is_end(li) && has_reg_class(si, value)) {\n \t\t\t\tremat_info_t *remat_info,\n@@ -1002,10 +1021,8 @@\n \t\t\t\t}\n \t\t\t}\n \n-#ifdef GOODWIN_REDUCTION\n-\t\t}\n-\t\tif(get_Block_n_cfgpreds(bb) == 1 && get_block_n_succs(get_Block_cfgpred_block(bb,0)) > 1) {\n-#endif\n+\t\t}\n+\t\tif(is_diverge_edge(bb) > 1) {\n \t\t\t\/* add remat2s at beginning of block *\/\n \t\t\tif ((live_is_in(li) || (is_Phi(value) && get_nodes_block(value)==bb)) && has_reg_class(si, value)) {\n \t\t\t\tremat_info_t *remat_info,\n@@ -1027,11 +1044,7 @@\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\n-#ifdef GOODWIN_REDUCTION\n-\t\t}\n-#endif\n-\n+\t\t}\n \t}\n }\n \n@@ -1104,17 +1117,12 @@\n \t\t\tir_snprintf(buf, sizeof(buf), \"mem_out_%N_%N\", irn, bb);\n \t\t\tspill->mem_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);\n \n-#ifdef GOODWIN_REDUCTION\n-\t\tif(get_Block_n_cfgpreds(bb) == 1 && get_block_n_succs(get_Block_cfgpred_block(bb,0)) > 1) {\n-\t\t\tir_snprintf(buf, sizeof(buf), \"spill_%N_%N\", irn, bb);\n-\t\t\tspill->spill = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE*execution_frequency(si, bb));\n-\t\t} else {\n-\t\t\tspill->spill = ILP_UNDEF;\n-\t\t}\n-#else\n-\t\tir_snprintf(buf, sizeof(buf), \"spill_%N_%N\", irn, bb);\n-\t\tspill->spill = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE*execution_frequency(si, bb));\n-#endif\n+\t\t\tif(is_diverge_edge(bb)) {\n+\t\t\t\tir_snprintf(buf, sizeof(buf), \"spill_%N_%N\", irn, bb);\n+\t\t\t\tspill->spill = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE*execution_frequency(si, bb));\n+\t\t\t} else {\n+\t\t\t\tspill->spill = ILP_UNDEF;\n+\t\t\t}\n \n \t\t\tspill->reg_in = ILP_UNDEF;\n \t\t\tspill->mem_in = ILP_UNDEF;\n@@ -1240,17 +1248,12 @@\n \t\tir_snprintf(buf, sizeof(buf), \"mem_out_%N_%N\", irn, bb);\n \t\tspill->mem_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);\n \n-#ifdef GOODWIN_REDUCTION\n-\t\tif(get_Block_n_cfgpreds(bb) == 1 && get_block_n_succs(get_Block_cfgpred_block(bb,0)) > 1) {\n+\t\tif(is_diverge_edge(bb)) {\n \t\t\tir_snprintf(buf, sizeof(buf), \"spill_%N_%N\", irn, bb);\n \t\t\tspill->spill = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE*execution_frequency(si, bb));\n \t\t} else {\n \t\t\tspill->spill = ILP_UNDEF;\n \t\t}\n-#else\n-\t\tir_snprintf(buf, sizeof(buf), \"spill_%N_%N\", irn, bb);\n-\t\tspill->spill = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE*execution_frequency(si, bb));\n-#endif\n \t}\n \n \treturn spill;\n@@ -1287,17 +1290,12 @@\n \t\t}\n \t}\n \n-#ifdef GOODWIN_REDUCTION\n-\tif(get_block_n_succs(bb) == 1 && get_Block_n_cfgpreds(get_block_succ_first(bb)->src) > 1) {\n+\tif(is_merge_edge(bb)) {\n \t\tspill_bb->reloads = obstack_alloc(si->obst, pset_count(live) * sizeof(*spill_bb->reloads));\n \t\tmemset(spill_bb->reloads, 0xFF, pset_count(live) * sizeof(*spill_bb->reloads));\n \t} else {\n \t\tspill_bb->reloads = NULL;\n \t}\n-#else\n-\tspill_bb->reloads = obstack_alloc(si->obst, pset_count(live) * sizeof(*spill_bb->reloads));\n-\tmemset(spill_bb->reloads, 0xFF, pset_count(live) * sizeof(*spill_bb->reloads));\n-#endif\n \n \ti=0;\n \tlive_foreach(bb, li) {\n@@ -1468,9 +1466,9 @@\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t}\n-#endif\n-\n fertig:\n+#endif\n+\n \t\t\t\tif(prev_lr != ILP_UNDEF) {\n \t\t\t\t\tvalue_op->attr.live_range.ilp = prev_lr;\n \t\t\t\t\tvalue_op->attr.live_range.op = irn;\n@@ -1915,9 +1913,7 @@\n \n \t\/* walk forward now and compute constraints for placing spills *\/\n \t\/* this must only be done for values that are not defined in this block *\/\n-#ifdef GOODWIN_REDUCTION\n-\tif(get_Block_n_cfgpreds(bb) == 1 && get_block_n_succs(get_Block_cfgpred_block(bb,0)) > 1) {\n-#endif\n+\tif(is_diverge_edge(bb)) {\n \t\tpset_foreach(live, irn) {\n \t\t\tir_snprintf(buf, sizeof(buf), \"req_spill_%N_%N\", irn, bb);\n \t\t\tcst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);\n@@ -1958,9 +1954,7 @@\n \t\t\t\tif(cst == ILP_UNDEF) break;\n \t\t\t}\n \t\t}\n-#ifdef GOODWIN_REDUCTION\n-\t}\n-#endif\n+\t}\n \n \n \t\/* if a value is used by a mem-phi, then mem_in of this value is 0 (has to be spilled again into a different slot)\n@@ -2606,7 +2600,7 @@\n \n \tset_foreach(si->values, defs) {\n \t\tconst ir_node *phi = defs->value;\n-\t\tconst ir_node *phi_m = defs->spills;\n+\t\tir_node *phi_m = defs->spills;\n \t\tint i,\n \t\t\t\t n;\n \n@@ -2791,32 +2785,29 @@\n \t\tir_node *next = defs->remats;\n \t\tint remats = 0;\n \n-\t\tif(next) {\n-\t\t\treloads = pset_new_ptr_default();\n-\n-\t\t\twhile(next) {\n-\t\t\t\tif(be_is_Reload(next)) {\n-\t\t\t\t\tpset_insert_ptr(reloads, next);\n-\t\t\t\t} else {\n-\t\t\t\t\t++remats;\n-\t\t\t\t}\n-\t\t\t\tnext = get_irn_link(next);\n-\t\t\t}\n-\n-\t\t\tspills = get_spills_for_value(si, defs->value);\n-\t\t\tDBG((si->dbg, LEVEL_2, \"\\t %d remats, %d reloads, and %d spills for value %+F\\n\", remats, pset_count(reloads), pset_count(spills), defs->value));\n-\t\t\tif(pset_count(spills) > 1) {\n-\t\t\t\tassert(pset_count(reloads) > 0);\n-\/\/\t\t\t\tprint_irn_pset(spills);\n-\/\/\t\t\t\tprint_irn_pset(reloads);\n-\n-\/\/\t\t\t\tbe_ssa_constr_set_uses(dfi, spills, reloads);\n-\t\t\t\tbe_ssa_constr_set(dfi, spills);\n-\t\t\t}\n-\n-\t\t\tdel_pset(reloads);\n-\t\t\tdel_pset(spills);\n-\t\t}\n+\t\treloads = pset_new_ptr_default();\n+\n+\t\twhile(next) {\n+\t\t\tif(be_is_Reload(next)) {\n+\t\t\t\tpset_insert_ptr(reloads, next);\n+\t\t\t} else {\n+\t\t\t\t++remats;\n+\t\t\t}\n+\t\t\tnext = get_irn_link(next);\n+\t\t}\n+\n+\t\tspills = get_spills_for_value(si, defs->value);\n+\t\tDBG((si->dbg, LEVEL_2, \"\\t %d remats, %d reloads, and %d spills for value %+F\\n\", remats, pset_count(reloads), pset_count(spills), defs->value));\n+\t\tif(pset_count(spills) > 1) {\n+\t\t\t\/\/assert(pset_count(reloads) > 0);\n+\t\t\t\/\/\t\t\t\tprint_irn_pset(spills);\n+\t\t\t\/\/\t\t\t\tprint_irn_pset(reloads);\n+\n+\t\t\tbe_ssa_constr_set(dfi, spills);\n+\t\t}\n+\n+\t\tdel_pset(reloads);\n+\t\tdel_pset(spills);\n \t}\n \n \t\/* first fix uses of remats and reloads *\/\n@@ -3054,7 +3045,9 @@\n \n \tkill_all_unused_values_in_schedule(&si);\n \n-\/\/\tbe_dump(chordal_env->irg, \"-bla\", dump_ir_block_graph);\n+#if defined(KEEPALIVE_SPILLS) || defined(KEEPALIVE_RELOADS)\n+\tbe_dump(chordal_env->irg, \"-spills-placed\", dump_ir_block_graph);\n+#endif\n \n \tbe_liveness(chordal_env->irg);\n \tirg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);\n"} {"commit":"a8991d621ec5f64659ec0eeaa2222311b4b99b7c","subject":"Make frames a PyVarObject instead of a PyObject.","message":"Make frames a PyVarObject instead of a PyObject.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Include\/frameobject.h\n+++ Include\/frameobject.h\n@@ -14,7 +14,7 @@\n } PyTryBlock;\n \n typedef struct _frame {\n- PyObject_HEAD\n+ PyObject_VAR_HEAD\n struct _frame *f_back;\t\/* previous frame, or NULL *\/\n PyCodeObject *f_code;\t\/* code segment *\/\n PyObject *f_builtins;\t\/* builtin symbol table (PyDictObject) *\/\n@@ -34,7 +34,6 @@\n \t\t\t\t in this scope *\/\n int f_iblock;\t\t\/* index in f_blockstack *\/\n PyTryBlock f_blockstack[CO_MAXBLOCKS]; \/* for try and loop blocks *\/\n- int f_size; \/* size of localsplus *\/\n int f_nlocals;\t\t\/* number of locals *\/\n int f_ncells;\n int f_nfreevars;\n"} {"commit":"6296288a81d945c57cbcc8b72c82996f2d6b426e","subject":"[fix] Stop timeout timer on successful start","message":"[fix] Stop timeout timer on successful start\n","repos":"cloudninja-io\/libinterposed,opsmezzo\/forza,opsmezzo\/forza,npm\/forza,mmalecki\/forza,mmalecki\/forza,opsmezzo\/forza,mmalecki\/forza","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/start.c\n+++ src\/plugins\/start.c\n@@ -60,6 +60,8 @@\n \n void start__success() {\n forza_metric_t* metric = forza_new_metric();\n+\n+ uv_timer_stop(&timeout_timer);\n \n started = 1;\n \n"} {"commit":"eee1338ad27f0490f1ea838a4495ca16a4e82fba","subject":"chip\/ish\/clock.c: Format with clang-format","message":"chip\/ish\/clock.c: Format with clang-format\n\nBUG=b:236386294\nBRANCH=none\nTEST=none\n\nChange-Id: I8a9ef1f349696b26cfb4c3027c5b69d383da3c6c\nSigned-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3729173\nReviewed-by: Jeremy Bettis <4df7b5147fee087dca33c181f288ee7dbf56e022@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chip\/ish\/clock.c\n+++ chip\/ish\/clock.c\n@@ -12,8 +12,7 @@\n \n \/* Console output macros *\/\n #define CPUTS(outstr) cputs(CC_CLOCK, outstr)\n-#define CPRINTS(format, args...) cprints(CC_CLOCK, format, ## args)\n-\n+#define CPRINTS(format, args...) cprints(CC_CLOCK, format, ##args)\n \n void clock_init(void)\n {\n"} {"commit":"c6e5c07af1e860d245a84c564329a057f3d7f53e","subject":"Use boost::string_ref to replace const char* and const std::string& whenever appropriate","message":"Use boost::string_ref to replace const char* and const std::string& whenever appropriate\n","repos":"cuavas\/mFAST,cuavas\/mFAST,cuavas\/mFAST,objectcomputing\/mFAST,objectcomputing\/mFAST","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/mfast\/string_ref.h\n+++ src\/mfast\/string_ref.h\n@@ -57,15 +57,15 @@\n return boost::string_ref(this->data(), this->size());\n }\n \n- bool operator == (const char* other) const\n+ bool operator == (const boost::string_ref& other) const\n {\n return compare(other) == 0;\n }\n \n- bool operator == (const std::string& other) const\n- {\n- return compare(other) == 0;\n- }\n+ \/\/ bool operator == (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) == 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator == (const string_cref_base<OtherIntruction>& other) const\n@@ -73,15 +73,15 @@\n return compare(other) == 0;\n }\n \n- bool operator != (const char* other) const\n+ bool operator != (const boost::string_ref& other) const\n {\n return compare(other) != 0;\n }\n \n- bool operator != (const std::string& other) const\n- {\n- return compare(other) != 0;\n- }\n+ \/\/ bool operator != (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) != 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator != (const string_cref_base<OtherIntruction>& other) const\n@@ -89,15 +89,15 @@\n return compare(other) != 0;\n }\n \n- bool operator > (const char* other) const\n+ bool operator > (const boost::string_ref& other) const\n {\n return compare(other) > 0;\n }\n \n- bool operator > (const std::string& other) const\n- {\n- return compare(other) > 0;\n- }\n+ \/\/ bool operator > (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) > 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator > (const string_cref_base<OtherIntruction>& other) const\n@@ -105,15 +105,15 @@\n return compare(other) >= 0;\n }\n \n- bool operator >= (const char* other) const\n+ bool operator >= (const boost::string_ref& other) const\n {\n return compare(other) >= 0;\n }\n \n- bool operator >= (const std::string& other) const\n- {\n- return compare(other) >= 0;\n- }\n+ \/\/ bool operator >= (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) >= 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator >=(const string_cref_base<OtherIntruction>& other) const\n@@ -121,15 +121,15 @@\n return compare(other) >= 0;\n }\n \n- bool operator < (const char* other) const\n+ bool operator < (const boost::string_ref& other) const\n {\n return compare(other) < 0;\n }\n-\n- bool operator < (const std::string& other) const\n- {\n- return compare(other) < 0;\n- }\n+ \/\/\n+ \/\/ bool operator < (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) < 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator < (const string_cref_base<OtherIntruction>& other) const\n@@ -137,15 +137,15 @@\n return compare(other) < 0;\n }\n \n- bool operator <= (const char* other) const\n+ bool operator <= (const boost::string_ref& other) const\n {\n return compare(other) <= 0;\n }\n \n- bool operator <= (const std::string& other) const\n- {\n- return compare(other) <= 0;\n- }\n+ \/\/ bool operator <= (const std::string& other) const\n+ \/\/ {\n+ \/\/ return compare(other) <= 0;\n+ \/\/ }\n \n template <typename OtherIntruction>\n bool operator <=(const string_cref_base<OtherIntruction>& other) const\n@@ -153,18 +153,15 @@\n return compare(other) <= 0;\n }\n \n- int compare(const char* other) const\n- {\n- int result = strncmp(this->data(), other, this->size());\n- if (result != 0 ) return result;\n- if (other[this->size()] == '\\0') return 0;\n- return -1;\n- }\n-\n- int compare(const std::string& other) const\n- {\n- return -other.compare(0, other.size(), this->data(), this->size());\n- }\n+ int compare(const boost::string_ref& other) const\n+ {\n+ return this->value().compare(other);\n+ }\n+\n+ \/\/ int compare(const std::string& other) const\n+ \/\/ {\n+ \/\/ return -other.compare(0, other.size(), this->data(), this->size());\n+ \/\/ }\n \n template <typename OtherIntruction>\n int compare(const string_cref_base<OtherIntruction>& other) const\n@@ -324,26 +321,26 @@\n this->assign(s.begin(), s.end());\n }\n \n- void as (const char* s) const\n- {\n- this->assign(s, s+strlen(s));\n- }\n-\n- void as (const std::string& s) const\n+ void as (const boost::string_ref& s) const\n {\n this->assign(s.begin(), s.end());\n }\n \n- void refers_to (const char* str) const\n+ \/\/ void as (const std::string& s) const\n+ \/\/ {\n+ \/\/ this->assign(s.begin(), s.end());\n+ \/\/ }\n+\n+ void refers_to (const boost::string_ref& s) const\n+ {\n+ base_type::refers_to(s.data(), s.size());\n+ }\n+\n+ void shallow_assign (const char* str) const\n {\n base_type::refers_to(str, std::strlen(str));\n }\n \n- void shallow_assign (const char* str) const\n- {\n- base_type::refers_to(str, std::strlen(str));\n- }\n-\n void swap(const string_mref_base<T>& other) const\n {\n base_type::swap(other);\n@@ -353,6 +350,8 @@\n {\n this->resize(this->size() -1);\n }\n+\n+ using base_type::operator==;\n \n };\n \n@@ -388,34 +387,34 @@\n {\n }\n \n- vector_mref& operator = (const char* s)\n- {\n- this->assign(s, s+strlen(s));\n- return *this;\n- }\n-\n- vector_mref& operator = (const std::string& s)\n+ vector_mref& operator = (const boost::string_ref& s)\n {\n this->assign(s.begin(), s.end());\n return *this;\n }\n \n- const vector_mref& append (const std::string& str) const\n+ \/\/ vector_mref& operator = (const std::string& s)\n+ \/\/ {\n+ \/\/ this->assign(s.begin(), s.end());\n+ \/\/ return *this;\n+ \/\/ }\n+\n+ const vector_mref& append (const boost::string_ref& str) const\n {\n this->insert(this->end(), str.begin(), str.end());\n return *this;\n }\n \n- const vector_mref& append (const std::string& str, size_t subpos, size_t sublen) const\n+ const vector_mref& append (const boost::string_ref& str, size_t subpos, size_t sublen) const\n {\n this->insert(this->end(), &str[subpos], &str[subpos+sublen]);\n return *this;\n }\n \n- const vector_mref& append (const char* s) const\n- {\n- return this->append(s, std::strlen(s));\n- }\n+ \/\/ const vector_mref& append (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s, std::strlen(s));\n+ \/\/ }\n \n const vector_mref& append (const char* s, size_t n) const\n {\n@@ -436,15 +435,15 @@\n return *this;\n }\n \n- const vector_mref& operator+= (const std::string& str) const\n+ const vector_mref& operator+= (const boost::string_ref& str) const\n {\n return this->append(str);\n }\n \n- const vector_mref& operator+= (const char* s) const\n- {\n- return this->append(s);\n- }\n+ \/\/ const vector_mref& operator+= (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s);\n+ \/\/ }\n \n const vector_mref& operator+= (char c) const\n {\n@@ -485,34 +484,34 @@\n {\n }\n \n- vector_mref& operator = (const char* s)\n- {\n- this->assign(s, s+strlen(s));\n- return *this;\n- }\n-\n- vector_mref& operator = (const std::string& s)\n+ \/\/ vector_mref& operator = (const char* s)\n+ \/\/ {\n+ \/\/ this->assign(s, s+strlen(s));\n+ \/\/ return *this;\n+ \/\/ }\n+\n+ vector_mref& operator = (const boost::string_ref& s)\n {\n this->assign(s.begin(), s.end());\n return *this;\n }\n \n- const vector_mref& append (const std::string& str) const\n+ const vector_mref& append (const boost::string_ref& str) const\n {\n this->insert(this->end(), str.begin(), str.end());\n return *this;\n }\n \n- const vector_mref& append (const std::string& str, size_t subpos, size_t sublen) const\n+ const vector_mref& append (const boost::string_ref& str, size_t subpos, size_t sublen) const\n {\n this->insert(this->end(), &str[subpos], &str[subpos+sublen]);\n return *this;\n }\n \n- const vector_mref& append (const char* s) const\n- {\n- return this->append(s, std::strlen(s));\n- }\n+ \/\/ const vector_mref& append (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s, std::strlen(s));\n+ \/\/ }\n \n const vector_mref& append (const char* s, size_t n) const\n {\n@@ -533,15 +532,15 @@\n return *this;\n }\n \n- const vector_mref& operator+= (const std::string& str) const\n+ const vector_mref& operator+= (const boost::string_ref& str) const\n {\n return this->append(str);\n }\n \n- const vector_mref& operator+= (const char* s) const\n- {\n- return this->append(s);\n- }\n+ \/\/ const vector_mref& operator+= (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s);\n+ \/\/ }\n \n const vector_mref& operator+= (char c) const\n {\n@@ -586,34 +585,34 @@\n return string_cref<T>(this->storage(), this->instruction());\n }\n \n- string_mref& operator = (const char* s)\n- {\n- this->assign(s, s+strlen(s));\n- return *this;\n- }\n-\n- string_mref& operator = (const std::string& s)\n+ \/\/ string_mref& operator = (const char* s)\n+ \/\/ {\n+ \/\/ this->assign(s, s+strlen(s));\n+ \/\/ return *this;\n+ \/\/ }\n+\n+ string_mref& operator = (const boost::string_ref& s)\n {\n this->assign(s.begin(), s.end());\n return *this;\n }\n \n- const string_mref& append (const std::string& str) const\n+ const string_mref& append (const boost::string_ref& str) const\n {\n this->insert(this->end(), str.begin(), str.end());\n return *this;\n }\n \n- const string_mref& append (const std::string& str, size_t subpos, size_t sublen) const\n+ const string_mref& append (const boost::string_ref& str, size_t subpos, size_t sublen) const\n {\n this->insert(this->end(), &str[subpos], &str[subpos+sublen]);\n return *this;\n }\n \n- const string_mref& append (const char* s) const\n- {\n- return this->append(s, std::strlen(s));\n- }\n+ \/\/ const string_mref& append (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s, std::strlen(s));\n+ \/\/ }\n \n const string_mref& append (const char* s, size_t n) const\n {\n@@ -634,15 +633,15 @@\n return *this;\n }\n \n- const string_mref& operator+= (const std::string& str) const\n+ const string_mref& operator+= (const boost::string_ref& str) const\n {\n return this->append(str);\n }\n \n- const string_mref& operator+= (const char* s) const\n- {\n- return this->append(s);\n- }\n+ \/\/ const string_mref& operator+= (const char* s) const\n+ \/\/ {\n+ \/\/ return this->append(s);\n+ \/\/ }\n \n const string_mref& operator+= (char c) const\n {\n"} {"commit":"7dce86f2946c491b207ab185d835e8e33d5afb2e","subject":"removed assertion (spill value can have another class than reload) added some spaces","message":"removed assertion (spill value can have another class than reload)\nadded some spaces\n","repos":"killbug2004\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,8l\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,8l\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillslots.c\n+++ ir\/be\/bespillslots.c\n@@ -187,27 +187,27 @@\n * and memphis attached to them.\n *\/\n static void collect_spills_walker(ir_node *node, void *data) {\n-\tss_env_t *env = data;\n+\tss_env_t *env = data;\n \tconst arch_env_t *arch_env = env->arch_env;\n \n-\t\/\/ classify returns classification of the irn the proj is attached to\n-\tif(is_Proj(node))\n+\t\/* classify returns classification of the irn the proj is attached to *\/\n+\tif (is_Proj(node))\n \t\treturn;\n \n-\tif(arch_irn_class_is(arch_env, node, reload)) {\n+\tif (arch_irn_class_is(arch_env, node, reload)) {\n \t\tir_node *spillnode = get_memory_edge(node);\n \t\tspill_t *spill;\n \n \t\tassert(spillnode != NULL);\n \n-\t\tif(is_Phi(spillnode)) {\n+\t\tif (is_Phi(spillnode)) {\n \t\t\tspill = collect_memphi(env, spillnode);\n-\t\t} else {\n+\t\t}\n+\t\telse {\n \t\t\tspill = collect_spill(env, spillnode);\n \t\t}\n \n-\t\tassert(!be_is_Reload(node) || spill->cls == arch_get_irn_reg_class(arch_env, node, -1));\n-\t\tARR_APP1(ir_node*, env->reloads, node);\n+\t\tARR_APP1(ir_node *, env->reloads, node);\n \t}\n }\n \n"} {"commit":"23eba7b232ab73279ac0080f72227e8529afa449","subject":"Ajout de 'pings' pour s'assurer que le serveur est tjrs disponible avec un timeout de 5s","message":"Ajout de 'pings' pour s'assurer que le serveur est tjrs disponible avec un timeout de 5s\n","repos":"coumbsek\/SexProject,coumbsek\/SexProject","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- annuaire.c\n+++ annuaire.c\n@@ -1,7 +1,7 @@\n #include \"pse.h\"\n-#include<pthread.h> \n+#include <pthread.h> \n #include \"InfoThread.h\"\n-\n+#include <sys\/time.h>\n #define NBCLIENTS 3\n #define NBSERVERS 2\n \n@@ -105,7 +105,7 @@\n \n void connexionHandlerServer(void *tDatas){\n \tfd_set rfds;\n-\tstruct timevals = {1,0};\n+\tstruct timeval tv = {5,0};\n \tint retval;\n \n \tInfoThread threadData = *(InfoThread *) tDatas;\n@@ -123,30 +123,33 @@\n \tif (retval == -1)\n perror(\"select()\");\n \telse if (retval){\n-\t\tprintf(\"Data is available now.\\n\");\n-\t\treadyySize = recv(sock, port, sizeof(short),0);\n+\t\treadSize = recv(sock, port, sizeof(short),0);\n \t}\n \telse\n \t\tprintf(\"No data within five seconds.\\n\");\n \n \twhile(1){\n-\t\treadyySize = recv(sock, &pingValue, sizeof(char),0);\n-\t\tif (readSize <=0 || readSize == LIGNE_MAX) {\n-\t\t\terreur_IO(\"lireLigne\");\n-\t\t}\n-\t\telse if (readSize==0)\n-\t\t\tcontinue;\n-\t\telse{\n-\t\t\tprintf(\"[Annuaire] : reception %d octets : \\\"%d\\\"\\n\", readSize, *port);\n-\t\t}\n+\t\tretval = select(sock+1, &rfds, NULL, NULL, &tv);\n+\t\tif (retval == -1)\n+\t\t perror(\"select()\");\n+\t\telse if (retval){\n+\t\t\ttv.tv_usec = 0;\n+\t\t\ttv.tv_sec = 5;\n+\t\t\treadSize = recv(sock, &pingValue, sizeof(char),0);\n+\t\t\tif (readSize <=0 || readSize == LIGNE_MAX)\n+\t\t\t\terreur_IO(\"lireLigne\");\n+\t\t\telse if (readSize==0)\n+\t\t\t\tcontinue;\n+\t\t\telse\n+\t\t\t\tprintf(\"[Annuaire] : reception %d octets : \\\"%d\\\"\\n\", readSize, pingValue);\n+\t\t}\n+\t\telse\n+\t\t\tprintf(\"No data within five seconds : Tiemout.\\n\");\n \t}\n }\n \n void connexionHandlerClient(void *tDatas)\n {\n-\t\/\/Get the socket descriptor\n-\t\/\/int sock = *(int*)ecoute;\n-\t\n \tInfoThread threadData = *(InfoThread *) tDatas;\n \tint log = threadData.InfoThreadC.logFile;\n \tint sock = threadData.InfoThreadC.sock;\n@@ -154,10 +157,9 @@\n \tint readSize, writeSize;\n \tchar *message , buff[LIGNE_MAX];\n \tchar *flagStop = malloc(sizeof(char));\n-\t\/\/Send some messages to the client\n+\t\/\/sending message to client\n \tmessage = \"[annuaire] : Hello! I'm your connection handler\\n\";\n \twrite(sock , message , strlen(message));\n-\t\/\/ecrireLigne(sock, message);\n \t\/\/Receive a message from client\n \twhile(1)\n \t{\n"} {"commit":"a62b10d5490b19bc49b002e71670d7f8a1c4b7a1","subject":"Getting to the callout.","message":"Getting to the callout.\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -84,6 +84,7 @@\n \t fti_type_indicies_len,\n \t fti_id_len,\n \t fti_id_covers;\n+ char *fti_new_flow_cmd;\n };\n \n #define\tFTI_USES_PORTS(p) ((p)->fti_id_covers > 20)\n@@ -357,235 +358,6 @@\n }\n \n \n-static void\n-packetin(Tcl_Interp *interp, const u_char *packet, int len)\n-{\n- u_char flow_id[MAX_FLOW_ID_BYTES];\n- int i, j, ft, pkthasports, bigenough;\n- hentry_p hent;\n- ftinfo_p ftip;\n- ftstats_p ftsp;\n-\n- \/* if no packet pending, then process this packet *\/\n- if (pending == 0) {\n-\tpkthasports = protohasports[packet[9]];\n-\tbigenough = 0;\n-\tfor (ft = 0; ft < NUM(ftinfo); ft++) {\n-\t if (len >= ftinfo[ft].fti_id_covers) {\n-\t\tbigenough = 1;\n-\t\tif (pkthasports || !FTI_USES_PORTS(&ftinfo[ft])) {\n-\t\t break;\n-\t\t}\n-\t }\n-\t}\n-\tif (ft >= NUM(ftinfo)) {\n-\t ftstats[0].fts_packets++;\n-\t if (bigenough) {\t\/* packet was big enough, but... *\/\n-\t\tftstats[0].fts_noports++;\n-\t } else {\n-\t\tftstats[0].fts_runts++;\n-\t }\n-\t return;\n-\t}\n-\tftip = &ftinfo[ft];\n-\tftsp = &ftstats[ftip->fti_stats_group_index];\n-\tif ((packet[6]&0x1fff) && FTI_USES_PORTS(ftip)) { \/* XXX *\/\n-\t ftsp->fts_packets++;\n-\t ftsp->fts_fragments++;\n-\t return;\n-\t}\n-\n-\t\/* create flow id for this packet *\/\n-\tfor (i = 0, j = 0; j < ftip->fti_bytes_and_mask_len; i++, j += 2) {\n-\t pending_flow_id[i] = packet[ftip->fti_bytes_and_mask[j]]\n-\t\t\t\t\t &ftip->fti_bytes_and_mask[j+1];\n-\t}\n- } else {\n-\tpending = 0;\n-\tif (len) {\t\/* shouldn't happen! *\/\n-\t interp->result = \"invalid condition in packetin\";\n-\t packet_error = TCL_ERROR;\n-\t return;\n-\t}\n-\tft = pending_flow_type;\n-\tftip = &ftinfo[ft];\n-\tftsp = &ftstats[ftip->fti_stats_group_index];\n-\tbinno = NOW_AS_BINNO();\n- }\n-\n- \/* XXX shouldn't count runts, fragments, etc., if time hasn't arrived *\/\n- if (binno != NOW_AS_BINNO()) {\n-\tpending = 1;\n-\tpending_flow_type = ft;\n-\treturn;\n- }\n-\n- hent = tbl_lookup(pending_flow_id, ftinfo[ft].fti_id_len);\n- if (hent == 0) {\n-\thent = tbl_add(pending_flow_id, ftinfo[ft].fti_id_len);\n-\tif (hent == 0) {\n-\t interp->result = \"no room for more flows\";\n-\t packet_error = TCL_ERROR;\n-\t return;\n-\t}\n-\thent->last_bin_active = 0xffffffff;\n-\thent->created_sec = curtime.tv_sec;\n-\thent->created_usec = curtime.tv_usec;\n-\thent->created_bin = binno;\n-\thent->flow_type_index = ft;\n-\thent->stats_group_index = ftip->fti_stats_group_index; \/* XXX *\/\n-\tftsp = &ftstats[hent->stats_group_index];\n-\tftsp->fts_created++;\n- }\n-\n- ftsp = &ftstats[hent->stats_group_index];\n- ftsp->fts_packets++;\n-\n- hent->packets++;\n- hent->last_pkt_sec = curtime.tv_sec;\n- hent->last_pkt_usec = curtime.tv_usec;\n- if (hent->last_bin_active != binno) {\n-\thent->last_bin_active = binno;\n-\tftsp->fts_active++;\n- }\n- if (hent->created_bin == binno) {\n-\tftsp->fts_packetsnewflows++;\n- }\n-}\n-\n-static void\n-newpacket(u_char *user, const struct pcap_pkthdr *h, const u_char *buffer)\n-{\n- u_short type;\n- u_long *longs;\n-\n-\tset_time(h->ts.tv_sec, h->ts.tv_usec);\n-\n- if (h->caplen < 14) {\n-\t\t\/* need to call packetin to set counters, etc. *\/\n-\t\tpacketin((Tcl_Interp *)user, buffer, 0);\n- return;\n- }\n-\n- type = buffer[12]<<8|buffer[13];\n-\n- if (type != IPtype) {\n- return; \/* only IP packets *\/\n- }\n-\n- packetin((Tcl_Interp *)user, buffer+14, h->caplen-14);\n-}\n-\n-\n-static void\n-receive_fix(Tcl_Interp *interp, struct fixpkt *pkt)\n-{\n- struct timeval cur;\n- static char pseudopkt[24] = {\n-\t0x45, 0, 0, 0, 0, 0, 0, 0,\n-\t0x22, 0, 0, 0, 0, 0, 0, 0,\n-\t0, 0, 0, 0, 0, 0, 0, 0};\n-\n- set_time(ntohl(pkt->secs), ntohl(pkt->usecs));\n-\n- *(u_short *)&pseudopkt[2] = pkt->len;\n- pseudopkt[9] = pkt->prot;\n- \/* src and dst are in ??? intel order ??? *\/\n- *(u_long *)&pseudopkt[12] = ntohl(pkt->src);\n- *(u_long *)&pseudopkt[16] = ntohl(pkt->dst);\n- *(u_short *)&pseudopkt[20] = pkt->sport;\n- *(u_short *)&pseudopkt[22] = pkt->dport;\n-\n- packetin(interp, pseudopkt, sizeof pseudopkt);\n-}\n-\n-\n-static int\n-process_one_packet(Tcl_Interp *interp)\n-{\n- packet_error = TCL_OK;\n-\n- if (pending) {\n-\tpacketin(interp, 0, 0);\n- } else {\n-\tif (filetype == TYPE_PCAP) {\n-\t if (pcap_dispatch(pcap_descriptor, 1,\n-\t\t\t\tnewpacket, (u_char *)interp) == 0) {\n-\t\tfileeof = 1;\n-\t\tfiletype = TYPE_UNKNOWN;\n-\t }\n-\t} else {\t\/* TYPE_FIX *\/\n-\t struct fixpkt fixpacket;\n-\t int count;\n-\n-\t count = fread(&fixpacket, sizeof fixpacket, 1, fix_descriptor);\n-\t if (count == 0) {\n-\t\tif (feof(fix_descriptor)) {\n-\t\t fileeof = 1;\n-\t\t filetype = TYPE_UNKNOWN;\n-\t\t} else {\n-\t\t interp->result = \"error on read\";\n-\t\t return TCL_ERROR;\n-\t\t}\n-\t } else {\n-\t\treceive_fix(interp, &fixpacket);\n-\t }\n-\t}\n- }\n- return packet_error;\n-}\n-\n-\/*\n- * Read packets for one bin interval.\n- *\n- * Returns the current bin number.\n- *\n- * Returns -1 if EOF reached on the input file.\n- *\/\n-\n-static int\n-teho_read_one_bin(ClientData clientData, Tcl_Interp *interp,\n-\t\tint argc, char *argv[])\n-{\n- int error;\n- char buf[20];\n-\n- if (argc > 2) {\n-\tinterp->result = \"Usage: teho_read_one_bin ?binsecs?\";\n-\treturn TCL_ERROR;\n- } else if (argc == 2) {\n-\terror = Tcl_GetInt(interp, argv[1], &binsecs);\n-\tif (error != TCL_OK) {\n-\t return error;\n-\t}\n- } else if (argc == 1) {\n-\t;\t\t\/* use old binsecs *\/\n- }\n- if (filetype == TYPE_UNKNOWN) {\n-\tinterp->result = \"need to call teho_set_{tcpd,fix}_file first\";\n-\treturn TCL_ERROR;\n- }\n- if (flow_types == 0) {\n-\tinterp->result = \"need to call teho_set_flow_type first\";\n-\treturn TCL_ERROR;\n- }\n-\n- binno = -1;\n-\n- if (!fileeof) {\n-\twhile (((binno == -1) || (binno == NOW_AS_BINNO())) && !fileeof) {\n-\t error = process_one_packet(interp);\n-\t if (error != TCL_OK) {\n-\t\treturn error;\n-\t }\n-\t}\n- }\n-\n- sprintf(buf, \"%d\", binno);\n- Tcl_SetResult(interp, buf, TCL_VOLATILE);\n- return TCL_OK;\n-}\n-\n static char *\n flow_id_to_string(int ft, u_char *id)\n {\n@@ -663,6 +435,7 @@\n return result;\n }\n \n+\n static char *\n flow_type_to_string(int ft)\n {\n@@ -680,8 +453,241 @@\n }\n \n \n+static void\n+packetin(Tcl_Interp *interp, const u_char *packet, int len)\n+{\n+ u_char flow_id[MAX_FLOW_ID_BYTES];\n+ int i, j, ft, pkthasports, bigenough;\n+ hentry_p hent;\n+ ftinfo_p ftip;\n+ ftstats_p ftsp;\n+\n+ \/* if no packet pending, then process this packet *\/\n+ if (pending == 0) {\n+\tpkthasports = protohasports[packet[9]];\n+\tbigenough = 0;\n+\tfor (ft = 0; ft < NUM(ftinfo); ft++) {\n+\t if (len >= ftinfo[ft].fti_id_covers) {\n+\t\tbigenough = 1;\n+\t\tif (pkthasports || !FTI_USES_PORTS(&ftinfo[ft])) {\n+\t\t break;\n+\t\t}\n+\t }\n+\t}\n+\tif (ft >= NUM(ftinfo)) {\n+\t ftstats[0].fts_packets++;\n+\t if (bigenough) {\t\/* packet was big enough, but... *\/\n+\t\tftstats[0].fts_noports++;\n+\t } else {\n+\t\tftstats[0].fts_runts++;\n+\t }\n+\t return;\n+\t}\n+\tftip = &ftinfo[ft];\n+\tftsp = &ftstats[ftip->fti_stats_group_index];\n+\tif ((packet[6]&0x1fff) && FTI_USES_PORTS(ftip)) { \/* XXX *\/\n+\t ftsp->fts_packets++;\n+\t ftsp->fts_fragments++;\n+\t return;\n+\t}\n+\n+\t\/* create flow id for this packet *\/\n+\tfor (i = 0, j = 0; j < ftip->fti_bytes_and_mask_len; i++, j += 2) {\n+\t pending_flow_id[i] = packet[ftip->fti_bytes_and_mask[j]]\n+\t\t\t\t\t &ftip->fti_bytes_and_mask[j+1];\n+\t}\n+ } else {\n+\tpending = 0;\n+\tif (len) {\t\/* shouldn't happen! *\/\n+\t interp->result = \"invalid condition in packetin\";\n+\t packet_error = TCL_ERROR;\n+\t return;\n+\t}\n+\tft = pending_flow_type;\n+\tftip = &ftinfo[ft];\n+\tftsp = &ftstats[ftip->fti_stats_group_index];\n+\tbinno = NOW_AS_BINNO();\n+ }\n+\n+ \/* XXX shouldn't count runts, fragments, etc., if time hasn't arrived *\/\n+ if (binno != NOW_AS_BINNO()) {\n+\tpending = 1;\n+\tpending_flow_type = ft;\n+\treturn;\n+ }\n+\n+ hent = tbl_lookup(pending_flow_id, ftip->fti_id_len);\n+ if (hent == 0) {\n+\thent = tbl_add(pending_flow_id, ftip->fti_id_len);\n+\tif (hent == 0) {\n+\t interp->result = \"no room for more flows\";\n+\t packet_error = TCL_ERROR;\n+\t return;\n+\t}\n+\thent->last_bin_active = 0xffffffff;\n+\thent->created_sec = curtime.tv_sec;\n+\thent->created_usec = curtime.tv_usec;\n+\thent->created_bin = binno;\n+\thent->flow_type_index = ft;\n+\tif (ftip->fti_new_flow_cmd) {\n+\t} else {\n+\t hent->stats_group_index = ftip->fti_stats_group_index; \/* XXX *\/\n+\t}\n+\tftsp = &ftstats[hent->stats_group_index];\n+\tftsp->fts_created++;\n+ }\n+\n+ ftsp = &ftstats[hent->stats_group_index];\n+ ftsp->fts_packets++;\n+\n+ hent->packets++;\n+ hent->last_pkt_sec = curtime.tv_sec;\n+ hent->last_pkt_usec = curtime.tv_usec;\n+ if (hent->last_bin_active != binno) {\n+\thent->last_bin_active = binno;\n+\tftsp->fts_active++;\n+ }\n+ if (hent->created_bin == binno) {\n+\tftsp->fts_packetsnewflows++;\n+ }\n+}\n+\n+static void\n+newpacket(u_char *user, const struct pcap_pkthdr *h, const u_char *buffer)\n+{\n+ u_short type;\n+ u_long *longs;\n+\n+\tset_time(h->ts.tv_sec, h->ts.tv_usec);\n+\n+ if (h->caplen < 14) {\n+\t\t\/* need to call packetin to set counters, etc. *\/\n+\t\tpacketin((Tcl_Interp *)user, buffer, 0);\n+ return;\n+ }\n+\n+ type = buffer[12]<<8|buffer[13];\n+\n+ if (type != IPtype) {\n+ return; \/* only IP packets *\/\n+ }\n+\n+ packetin((Tcl_Interp *)user, buffer+14, h->caplen-14);\n+}\n+\n+\n+static void\n+receive_fix(Tcl_Interp *interp, struct fixpkt *pkt)\n+{\n+ struct timeval cur;\n+ static char pseudopkt[24] = {\n+\t0x45, 0, 0, 0, 0, 0, 0, 0,\n+\t0x22, 0, 0, 0, 0, 0, 0, 0,\n+\t0, 0, 0, 0, 0, 0, 0, 0};\n+\n+ set_time(ntohl(pkt->secs), ntohl(pkt->usecs));\n+\n+ *(u_short *)&pseudopkt[2] = pkt->len;\n+ pseudopkt[9] = pkt->prot;\n+ \/* src and dst are in ??? intel order ??? *\/\n+ *(u_long *)&pseudopkt[12] = ntohl(pkt->src);\n+ *(u_long *)&pseudopkt[16] = ntohl(pkt->dst);\n+ *(u_short *)&pseudopkt[20] = pkt->sport;\n+ *(u_short *)&pseudopkt[22] = pkt->dport;\n+\n+ packetin(interp, pseudopkt, sizeof pseudopkt);\n+}\n+\n+\n static int\n-set_flow_type(Tcl_Interp *interp, int ft, char *name, int sgi)\n+process_one_packet(Tcl_Interp *interp)\n+{\n+ packet_error = TCL_OK;\n+\n+ if (pending) {\n+\tpacketin(interp, 0, 0);\n+ } else {\n+\tif (filetype == TYPE_PCAP) {\n+\t if (pcap_dispatch(pcap_descriptor, 1,\n+\t\t\t\tnewpacket, (u_char *)interp) == 0) {\n+\t\tfileeof = 1;\n+\t\tfiletype = TYPE_UNKNOWN;\n+\t }\n+\t} else {\t\/* TYPE_FIX *\/\n+\t struct fixpkt fixpacket;\n+\t int count;\n+\n+\t count = fread(&fixpacket, sizeof fixpacket, 1, fix_descriptor);\n+\t if (count == 0) {\n+\t\tif (feof(fix_descriptor)) {\n+\t\t fileeof = 1;\n+\t\t filetype = TYPE_UNKNOWN;\n+\t\t} else {\n+\t\t interp->result = \"error on read\";\n+\t\t return TCL_ERROR;\n+\t\t}\n+\t } else {\n+\t\treceive_fix(interp, &fixpacket);\n+\t }\n+\t}\n+ }\n+ return packet_error;\n+}\n+\n+\/*\n+ * Read packets for one bin interval.\n+ *\n+ * Returns the current bin number.\n+ *\n+ * Returns -1 if EOF reached on the input file.\n+ *\/\n+\n+static int\n+teho_read_one_bin(ClientData clientData, Tcl_Interp *interp,\n+\t\tint argc, char *argv[])\n+{\n+ int error;\n+ char buf[20];\n+\n+ if (argc > 2) {\n+\tinterp->result = \"Usage: teho_read_one_bin ?binsecs?\";\n+\treturn TCL_ERROR;\n+ } else if (argc == 2) {\n+\terror = Tcl_GetInt(interp, argv[1], &binsecs);\n+\tif (error != TCL_OK) {\n+\t return error;\n+\t}\n+ } else if (argc == 1) {\n+\t;\t\t\/* use old binsecs *\/\n+ }\n+ if (filetype == TYPE_UNKNOWN) {\n+\tinterp->result = \"need to call teho_set_{tcpd,fix}_file first\";\n+\treturn TCL_ERROR;\n+ }\n+ if (flow_types == 0) {\n+\tinterp->result = \"need to call teho_set_flow_type first\";\n+\treturn TCL_ERROR;\n+ }\n+\n+ binno = -1;\n+\n+ if (!fileeof) {\n+\twhile (((binno == -1) || (binno == NOW_AS_BINNO())) && !fileeof) {\n+\t error = process_one_packet(interp);\n+\t if (error != TCL_OK) {\n+\t\treturn error;\n+\t }\n+\t}\n+ }\n+\n+ sprintf(buf, \"%d\", binno);\n+ Tcl_SetResult(interp, buf, TCL_VOLATILE);\n+ return TCL_OK;\n+}\n+\n+static int\n+set_flow_type(Tcl_Interp *interp, int ft, char *name,\n+\t\t\t\t\tint sgi, char *new_flow_cmd)\n {\n char initial[MAX_FLOW_ID_BYTES*5], after[MAX_FLOW_ID_BYTES*5]; \/* 5 rndm *\/\n char *curdesc;\n@@ -751,6 +757,7 @@\n ftinfo[ft].fti_id_len = bandm\/2;\n ftinfo[ft].fti_type_indicies_len = indicies;\n ftinfo[ft].fti_stats_group_index = sgi;\n+ ftinfo[ft].fti_new_flow_cmd = new_flow_cmd;\n return TCL_OK;\n }\n \n@@ -770,11 +777,12 @@\n {\n int error;\n int ft, sgi;\n+ char *new_flow_cmd;\n static char result[20];\n \n- if ((argc < 3) || (argc > 4)) {\n+ if ((argc < 3) || (argc > 5)) {\n \tinterp->result =\n-\t\t\"Usage: teho_set_flow_type flow_type_index string ?statistics_group_index?\";\n+\t\t\"Usage: teho_set_flow_type flow_type_index string ?statistics_group_index? ?new_flow_command?\";\n \treturn TCL_ERROR;\n }\n \n@@ -785,18 +793,24 @@\n \treturn TCL_ERROR;\n }\n \n- if (argc == 4) {\n+ if (argc >= 4) {\n \tsgi = atoi(argv[3]);\n } else {\n \tsgi = 0;\n }\n \n+ if (argc >= 5) {\n+\tnew_flow_cmd = argv[4];\n+ } else {\n+\tnew_flow_cmd = 0;\n+ }\n+\n if (sgi >= NUM(ftstats)) {\n \tinterp->result = \"no room in ftinfo table\";\n \treturn TCL_ERROR;\n }\n \n- error = set_flow_type(interp, ft, argv[2], sgi);\n+ error = set_flow_type(interp, ft, argv[2], sgi, new_flow_cmd);\n if (error != TCL_OK) {\n \treturn error;\n }\n"} {"commit":"3dc176702165e8a201aad7ec1adefe28c3df7e07","subject":"reindenting source","message":"reindenting source\n","repos":"jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,libfirm\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/test\/fehler6.c\n+++ ir\/be\/test\/fehler6.c\n@@ -1,26 +1,26 @@\n #include <stdio.h>\n \n int main()\n- {\n- int i, n=3 , v, dig, set;\n+{\n+\tint i, n=3 , v, dig, set;\n \n- \/\/printf (\"Enter n: \");\n- \/\/scanf (\"%d\", &n);\n+\t\/\/printf (\"Enter n: \");\n+\t\/\/scanf (\"%d\", &n);\n \n- v = 1 << n;\n+\tv = 1 << n;\n \n- for (i=0; i < v; i++) {\n- set = i ^ (i>>1);\n+\tfor (i=0; i < v; i++) {\n+\t\tset = i ^ (i>>1);\n \n-\tprintf(\" i: %d set: %d \\n\",i,set);\n- for (dig=1 << (n-1); dig; dig >>= 1)\n-\t{\n-\t\tprintf(\"\\ni: %d v: %d dig: %d set:%d\\n\",i,v,dig, set);\n- \tprintf (\" %d\", ((set & dig) ? 1 : 0));\n-\t\tprintf(\"\\ni: %d v: %d dig: %d set:%d\\n\",i,v,dig, set);\n+\t\tprintf(\" i: %d set: %d \\n\",i,set);\n+\t\tfor (dig=1 << (n-1); dig; dig >>= 1)\n+\t\t{\n+\t\t\tprintf(\"\\ni: %d v: %d dig: %d set:%d\\n\",i,v,dig, set);\n+\t\t\tprintf (\" %d\", ((set & dig) ? 1 : 0));\n+\t\t\tprintf(\"\\ni: %d v: %d dig: %d set:%d\\n\",i,v,dig, set);\n+\t\t}\n+\t\tprintf (\"\\n\");\n \t}\n- printf (\"\\n\");\n- }\n \n-\t return 0;\n- }\n+\treturn 0;\n+}\n"} {"commit":"b3c0e51e1d49ad93bc599aaa73578162db384dc9","subject":"provide a minimal asprintf() in case missing from target","message":"provide a minimal asprintf() in case missing from target\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -55,9 +55,15 @@\n \t\"$Id: flstats.c,v 1.97 2014\/01\/25 15:29:48 minshall Exp $\";\n \n #include \"config.h\"\n+\n #if defined(HAVE_ERRNO_H)\n #include <errno.h>\n #endif \/* defined(HAVE_ERRNO_H) *\/\n+\n+#if !defined(HAVE_ASPRINTF)\n+#include <stdarg.h>\n+#endif \/* !defined(HAVE_ASPRINTF) *\/\n+\n #include <stdio.h>\n #include <stdlib.h>\n #include <string.h>\n@@ -632,6 +638,33 @@\n return new;\n }\n \n+#if !defined(HAVE_ASPRINTF)\n+\/*\n+ * slow, but simple (hopefully, almost *never* needed)\n+ *\/\n+static int\n+asprintf(char **where, const char *format, ...) {\n+ va_list ap;\n+ char foo[1]; \/* used in determining the correct size *\/\n+ char *place;\n+ int len; \/* *\/\n+\n+ va_start(ap, format);\n+ \/* this first call does no real printing, just determines size *\/\n+ len = vsnprintf(foo, 0, format, ap);\n+\n+ place = malloc(len);\n+ if (place == 0) {\n+ *where = 0;\n+ return -1; \/* see man page for asprintf(3) *\/\n+ }\n+\n+ vsnprintf(place, len, format, ap);\n+ *where = place;\n+ return len;\n+}\n+#endif \/* !defined(HAVE_ASPRINTF) *\/\n+\n \/*\n * delete a string returned from asprintf(3)\n * (in a way that makes Tcl_SetResult(3) happy, sigh)\n"} {"commit":"c2ab977c95a7c54cf57041362da33d995b08d955","subject":"Fix upcalls. Define FDDIPAD (if needed).","message":"Fix upcalls. Define FDDIPAD (if needed).\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -54,7 +54,7 @@\n *\/\n \n static char *rcsid =\n-\t\"$Id: flstats.c,v 1.75 1996\/05\/18 04:02:01 minshall Exp minshall $\";\n+\t\"$Id: flstats.c,v 1.3 1996\/07\/29 21:10:07 minshall Exp $\";\n \n #include <stdio.h>\n #include <stdlib.h>\n@@ -265,7 +265,7 @@\n char *fti_new_flow_upcall;\n \t \/*\n \t * routine:\tfti_new_flow_upcall\n-\t * call:\t\"fti_new_flow_upcall class flowtype flowid\"\n+\t * call:\t\"fti_new_flow_upcall class flowindex flowtype flowid\"\n \t * result:\t\"class upper_class upper_ftype recvsecs.usecs\"\n \t *\t\t\t\t\t\ttimersecs.usecs\" \n \t *\n@@ -291,8 +291,8 @@\n char *fti_timer_upcall;\t\/* timer command (if registered) *\/\n \t \/*\n \t * routine: timer_upcall\n-\t * call:\t\"timer_upcall class ftype flowid FLOW flowstats\"\n-\t * result: \"command timersecs.usecs\"\n+\t * call:\t\"timer_upcall timesecs.usecs FLOW flowstats\"\n+\t * result: \"command secs.usecs\"\n \t *\n \t * if \"command\" is \"DELETE\", the associated flow will be\n \t * deleted. if \"command\" starts with '-', it will be ignored.\n@@ -497,15 +497,7 @@\n pcap_t *pcap_descriptor;\n char pcap_errbuf[PCAP_ERRBUF_SIZE];\n \n-\n- \/* FDDI support *\/\n-#if defined(ultrix) || defined(__alpha)\n-#define FDDIPAD 3\n-#else\n-#define FDDIPAD 0\n-#endif\n-\n-int fddipad = FDDIPAD;\n+int fddipad = 0;\n \n FILE *fix24_descriptor;\n \n@@ -1070,8 +1062,8 @@\n \n \tsprintf(buf, \" %d %d \", fe->fe_class, ft-ftinfo);\n \tif (Tcl_VarEval(interp, ft->fti_new_flow_upcall,\n-\t\tbuf, \"type \", flow_type_to_string(ft),\n-\t\t\"id \", flow_id_to_string(ft, fe->fe_id), 0) != TCL_OK) {\n+\t\tbuf, flow_type_to_string(ft),\n+\t\t\" \", flow_id_to_string(ft, fe->fe_id), 0) != TCL_OK) {\n \t packet_error = TCL_ERROR;\n \t return 0;\n \t}\n"} {"commit":"0592bb514994544ed84f51e509b233cf8821e0cf","subject":"added base quality filtering","message":"added base quality filtering\n","repos":"AngieHinrichs\/samtabix,AngieHinrichs\/samtabix,AngieHinrichs\/samtabix,AngieHinrichs\/samtabix,lh3\/samtools,lh3\/samtools,lh3\/samtools,AngieHinrichs\/samtabix","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bam2depth.c\n+++ bam2depth.c\n@@ -32,7 +32,7 @@\n int main_depth(int argc, char *argv[])\n #endif\n {\n-\tint i, n, tid, beg, end, pos, *n_plp;\n+\tint i, n, tid, beg, end, pos, *n_plp, baseQ = 0;\n \tconst bam_pileup1_t **plp;\n \tchar *reg = 0; \/\/ specified region\n \tvoid *bed = 0; \/\/ BED data structure\n@@ -41,14 +41,15 @@\n \tbam_mplp_t mplp;\n \n \t\/\/ parse the command line\n-\twhile ((n = getopt(argc, argv, \"r:b:\")) >= 0) {\n+\twhile ((n = getopt(argc, argv, \"r:b:q:\")) >= 0) {\n \t\tswitch (n) {\n \t\t\tcase 'r': reg = strdup(optarg); break; \/\/ parsing a region requires a BAM header\n \t\t\tcase 'b': bed = bed_read(optarg); break; \/\/ BED or position list file can be parsed now\n+\t\t\tcase 'q': baseQ = atoi(optarg); break; \/\/ base quality threshold\n \t\t}\n \t}\n \tif (optind == argc) {\n-\t\tfprintf(stderr, \"Usage: bam2depth [-r reg] [-b in.bed] <in1.bam> [...]\\n\");\n+\t\tfprintf(stderr, \"Usage: bam2depth [-r reg] [-q baseQthres] [-b in.bed] <in1.bam> [...]\\n\");\n \t\treturn 1;\n \t}\n \n@@ -75,16 +76,18 @@\n \t\/\/ the core multi-pileup loop\n \tmplp = bam_mplp_init(n, read_bam, (void**)data); \/\/ initialization\n \tn_plp = calloc(n, sizeof(int)); \/\/ n_plp[i] is the number of covering reads from the i-th BAM\n-\tplp = calloc(n, sizeof(void*)); \/\/ plp[i] points to the array of covering reads internal in mplp\n+\tplp = calloc(n, sizeof(void*)); \/\/ plp[i] points to the array of covering reads (internal in mplp)\n \twhile (bam_mplp_auto(mplp, &tid, &pos, n_plp, plp) > 0) { \/\/ come to the next covered position\n \t\tif (pos < beg || pos >= end) continue; \/\/ out of range; skip\n \t\tif (bed && bed_overlap(bed, h->target_name[tid], pos, pos + 1) == 0) continue; \/\/ not in BED; skip\n \t\tprintf(\"%s\\t%d\", h->target_name[tid], pos+1);\n \t\tfor (i = 0; i < n; ++i) {\n \t\t\tint j, m = 0;\n-\t\t\tconst bam_pileup1_t *p = plp[i];\n-\t\t\tfor (j = 0; j < n_plp[i]; ++j) \/\/ this loop counts #reads having deletions or refskip at tid:pos\n-\t\t\t\tif (p->is_del || p->is_refskip) ++m;\n+\t\t\tfor (j = 0; j < n_plp[i]; ++j) {\n+\t\t\t\tconst bam_pileup1_t *p = plp[i] + j; \/\/ DON'T modfity plp[][] unless you really know\n+\t\t\t\tif (p->is_del || p->is_refskip) ++m; \/\/ having dels or refskips at tid:pos\n+\t\t\t\telse if (bam1_qual(p->b)[p->qpos] < baseQ) ++m; \/\/ low base quality\n+\t\t\t}\n \t\t\tprintf(\"\\t%d\", n_plp[i] - m);\n \t\t}\n \t\tputchar('\\n');\n"} {"commit":"a65df25e967d90801bd667041b3575742b7bcb71","subject":"- tests fix: prevent a timeout if the testdata dir do not exist","message":"- tests fix: prevent a timeout if the testdata dir do not exist\n\n\ngit-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@1839 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e\n","repos":"luizluca\/opensync-luizluca,luizluca\/opensync-luizluca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/support.c\n+++ tests\/support.c\n@@ -31,7 +31,13 @@\n \t\n \tchar *command = NULL;\n \tif (fkt_name) {\n-\t\tcommand = g_strdup_printf(\"cp -R \"OPENSYNC_TESTDATA\"\/%s\/* %s\", fkt_name, testbed);\n+\t\tchar * dirname;\n+\t\tdirname = g_strdup_printf(OPENSYNC_TESTDATA\"\/%s\", fkt_name);\n+\t\tif (!g_file_test(dirname, G_FILE_TEST_IS_DIR)) {\n+\t\t\tosync_trace(TRACE_INTERNAL, \"%s: Path %s not exist.\", __func__, dirname);\n+\t\t\tabort();\n+\t\t}\n+\t\tcommand = g_strdup_printf(\"cp -R %s\/* %s\", dirname, testbed);\n \t\tosync_trace(TRACE_INTERNAL, \"tb_cmd: %s\", command);\n \t\tif (system(command))\n \t\t\tabort();\n"} {"commit":"76c9c082e22448c73bdf5e2226e7639fccaf8c5a","subject":"correctly check return value from bionet_hab_add_node() as pointed out by Prevent.","message":"correctly check return value from bionet_hab_add_node() as pointed out by Prevent.\n\nensure the buffer read from the pal_fd ends with a NULL because is has to be passed to parse_line() which expects is according to Prevent.\n","repos":"ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hab\/pal-650\/pal-read.c\n+++ hab\/pal-650\/pal-read.c\n@@ -130,7 +130,11 @@\n }\n bionet_node_set_user_data(node, node_data);\n \n- bionet_hab_add_node(hab, node);\n+ if (bionet_hab_add_node(hab, node)) {\n+\t g_log(\"\", G_LOG_LEVEL_WARNING, \"get_node(): Failed to add node to hab.\");\n+\t bionet_node_free(node);\n+\t return NULL;\n+\t}\n \n hab_report_new_node(node);\n }\n@@ -309,6 +313,7 @@\n }\n \n index += r;\n+ buffer[index] = '\\0'; \/\/ensure the string ends with a NULL\n \n \/\/ Parse all data within the buffer.\n while (1) {\n"} {"commit":"0b26da98132eeb4a9bc0d4e76efcc84267b25191","subject":"DMA buffer offset was not added by own allocated memory","message":"DMA buffer offset was not added by own allocated memory\n\nBugfix to commit 3389d0f\r\nThe offset to the DMA address was not added if the memory was allocated by this driver.","repos":"bperez77\/xilinx_axidma","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- driver\/axidma_chrdev.c\n+++ driver\/axidma_chrdev.c\n@@ -88,7 +88,7 @@\n user_addr, size);\n if (valid) {\n offset = (dma_addr_t)(user_addr - dma_alloc->user_addr);\n- return dma_alloc->dma_addr;\n+ return dma_alloc->dma_addr + offset;\n }\n }\n \n"} {"commit":"13a3bcbcc2d25c6569225e6824e10a360508e76c","subject":"fix timer for Mac OS","message":"fix timer for Mac OS\n","repos":"patflick\/tsppi,patflick\/tsppi,patflick\/tsppi,patflick\/tsppi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ppi_networkit\/src\/cputimer.h\n+++ ppi_networkit\/src\/cputimer.h\n@@ -16,6 +16,11 @@\n \n #include <time.h>\n #include <stdint.h>\n+\/\/ enable time measurements on MAC OS\n+#ifdef __MACH__\n+#include <mach\/clock.h>\n+#include <mach\/mach.h>\n+#endif\n \n class CPUTimer {\n \n@@ -25,7 +30,17 @@\n \n inline long long microsecsonds_ts() {\n struct timespec ts;\n+#ifdef __MACH__ \/\/ OS X does not have clock_gettime, use clock_get_time\n+ clock_serv_t cclock;\n+ mach_timespec_t mts;\n+ host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);\n+ clock_get_time(cclock, &mts);\n+ mach_port_deallocate(mach_task_self(), cclock);\n+ ts->tv_sec = mts.tv_sec;\n+ ts->tv_nsec = mts.tv_nsec;\n+#else\n clock_gettime(CLOCK_MONOTONIC, &ts);\n+#endif\n return (uint64_t)ts.tv_sec * 1000000LL + (uint64_t)ts.tv_nsec \/ 1000LL;\n }\n public:\n"} {"commit":"d3594948705a8b491c0cb22bed188071289fbd7d","subject":"modifying includes to remove Arduino-related headers","message":"modifying includes to remove Arduino-related headers\n","repos":"starsimpson\/Adafruit_AM2315","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- firmware\/Adafruit_AM2315.h\n+++ firmware\/Adafruit_AM2315.h\n@@ -13,13 +13,6 @@\n Written by Limor Fried\/Ladyada for Adafruit Industries. \n BSD license, all text above must be included in any redistribution\n ****************************************************\/\n-\n-#if (ARDUINO >= 100)\n- #include \"Arduino.h\"\n-#else\n- #include \"WProgram.h\"\n-#endif\n-#include \"Wire.h\"\n \n #define AM2315_I2CADDR 0x5C\n #define AM2315_READREG 0x03\n"} {"commit":"2b9fb23f083fa21e29b1c3c7a5d789d4dcd198b2","subject":"Fix hwmon channel type set to unknown if !WITH_HWMON","message":"Fix hwmon channel type set to unknown if !WITH_HWMON\n\nLibiio being compiled without support for hwmon devices means that the\nlocal backend won't try to probe hwmon devices; but hwmon devices found\nby a remote libiio should still be usable across the network or USB,\neven if WITH_HWMON is disabled locally.\n\nUntil now if the host libiio was compiled without hwmon support, it\ncould see the target's hwmon devices but their type was wrong.\n\nSigned-off-by: Paul Cercueil <a027184a55211cd23e3f3094f1fdc728df5e0500@crapouillou.net>\nReported-by: Adrian Suciu <3c34ec1243786ab90427a944e16a4b958b5547c5@analog.com>\n","repos":"analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- channel.c\n+++ channel.c\n@@ -177,7 +177,7 @@\n \tchar *mod;\n \tint type;\n \n-\tif (WITH_HWMON && iio_device_is_hwmon(chn->dev)) {\n+\tif (iio_device_is_hwmon(chn->dev)) {\n \t\ttype = iio_channel_find_type(chn->id, hwmon_chan_type_name_spec,\n \t\t\t\t\tARRAY_SIZE(hwmon_chan_type_name_spec));\n \t} else {\n"} {"commit":"a3b47dcdc0dff9e0d88f7ccaa904ef01ace45ed7","subject":"comment: initialize post id and timestamp in case we're not given a post ID","message":"comment: initialize post id and timestamp in case we're not given a post ID\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/blahgd,jeffpc\/blahgd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- comment.c\n+++ comment.c\n@@ -364,6 +364,10 @@\n \tclock_gettime(CLOCK_REALTIME, &s);\n \n \tpost.out = stdout;\n+\tpost.id = 0;\n+\tpost.time.tm_year = 0;\n+\tpost.time.tm_mon = 0;\n+\tpost.time.tm_mday = 1;\n \n \tfprintf(post.out, \"Content-Type: text\/html\\n\\n\");\n \n"} {"commit":"5c96e97810152b1e89fb9818f44efeed8fe7e52e","subject":"comment: write out meta.yml","message":"comment: write out meta.yml\n\nInstead of writing out sqlite statements for audit reasons, write out yaml\nmetadata.\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/blahgd,jeffpc\/blahgd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- comment.c\n+++ comment.c\n@@ -31,11 +31,11 @@\n #include <sys\/file.h>\n #include <unistd.h>\n #include <fcntl.h>\n+#include <yaml.h>\n \n #include \"req.h\"\n #include \"sidebar.h\"\n #include \"render.h\"\n-#include \"db.h\"\n #include \"utils.h\"\n #include \"config.h\"\n #include \"comment.h\"\n@@ -84,6 +84,62 @@\n #define SC_EMPTY_EQ\t\t19\n #define SC_ERROR\t\t99\n \n+static void prep_meta_yaml_pair(yaml_document_t *doc, int where,\n+\t\t\t\tconst char *name, const char *val)\n+{\n+\tint k, v;\n+\n+\tk = yaml_document_add_scalar(doc, NULL, (unsigned char *) name,\n+\t\t\t\t strlen(name), YAML_PLAIN_SCALAR_STYLE);\n+\tv = yaml_document_add_scalar(doc, NULL, (unsigned char *) val,\n+\t\t\t\t strlen(val), YAML_PLAIN_SCALAR_STYLE);\n+\n+\tyaml_document_append_mapping_pair(doc, where, k, v);\n+}\n+\n+static char *prep_meta_yaml(const char *author, const char *email,\n+\t\t\t const char *curdate, const char *ip,\n+\t\t\t const char *url)\n+{\n+\tconst size_t outlen = 1024;\n+\tunsigned char output[outlen + 1];\n+\tsize_t writtenlen;\n+\tyaml_emitter_t y;\n+\tyaml_document_t d;\n+\tint map;\n+\n+\tmemset(&y, 0, sizeof(y));\n+\n+\tif (!yaml_emitter_initialize(&y))\n+\t\tgoto err_emit;\n+\n+\tyaml_emitter_set_output_string(&y, output, outlen, &writtenlen);\n+\tyaml_emitter_set_unicode(&y, YAML_UTF8_ENCODING);\n+\n+\tyaml_document_initialize(&d, NULL, NULL, NULL, 0, 0);\n+\tmap = yaml_document_add_mapping(&d, NULL, YAML_ANY_MAPPING_STYLE);\n+\n+\tprep_meta_yaml_pair(&d, map, \"author\", author);\n+\tprep_meta_yaml_pair(&d, map, \"email\", email);\n+\tprep_meta_yaml_pair(&d, map, \"time\", curdate);\n+\tprep_meta_yaml_pair(&d, map, \"ip\", ip);\n+\tprep_meta_yaml_pair(&d, map, \"url\", url);\n+\n+\tyaml_emitter_open(&y);\n+\tyaml_emitter_dump(&y, &d);\n+\tyaml_emitter_flush(&y);\n+\tyaml_emitter_close(&y);\n+\tyaml_emitter_delete(&y);\n+\tyaml_document_delete(&d);\n+\n+\toutput[writtenlen] = '\\0';\n+\n+\treturn xstrdup((char *) output);\n+\n+err_emit:\n+\treturn NULL;\n+}\n+\n const char *write_out_comment(struct req *req, int id, char *author,\n \t\t\t char *email, char *url, char *comment)\n {\n@@ -92,12 +148,12 @@\n \tchar basepath[FILENAME_MAX];\n \tchar dirpath[FILENAME_MAX];\n \tchar textpath[FILENAME_MAX];\n-\tchar sqlpath[FILENAME_MAX];\n+\tchar ymlpath[FILENAME_MAX];\n \n \tchar curdate[32];\n \tchar *remote_addr; \/* yes, this is a pointer *\/\n \tint ret;\n-\tchar *sql;\n+\tchar *yml;\n \n \tuint64_t now, now_nsec;\n \ttime_t now_sec;\n@@ -142,11 +198,11 @@\n \n \tsnprintf(dirpath, FILENAME_MAX, \"%sW\", basepath);\n \tsnprintf(textpath, FILENAME_MAX, \"%s\/text.txt\", dirpath);\n-\tsnprintf(sqlpath, FILENAME_MAX, \"%s\/meta.sql\", dirpath);\n+\tsnprintf(ymlpath, FILENAME_MAX, \"%s\/meta.yml\", dirpath);\n \n \tASSERT3U(strlen(dirpath), <, FILENAME_MAX - 1);\n \tASSERT3U(strlen(textpath), <, FILENAME_MAX - 1);\n-\tASSERT3U(strlen(sqlpath), <, FILENAME_MAX - 1);\n+\tASSERT3U(strlen(ymlpath), <, FILENAME_MAX - 1);\n \n \tif (mkdir(dirpath, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == -1) {\n \t\tLOG(\"Ow, could not create directory: %d (%s) '%s'\", errno, strerror(errno), dirpath);\n@@ -162,20 +218,19 @@\n \n \tremote_addr = nvl_lookup_str(req->request_headers, REMOTE_ADDR);\n \n-\tsql = sqlite3_mprintf(\"INSERT INTO comments \"\n-\t\t\t \"(post, id, author, email, time, \"\n-\t\t\t \"remote_addr, url, moderated) VALUES \"\n-\t\t\t \"(%d, %d, %Q, %Q, %Q, %Q, %Q, 0);\",\n-\t\t\t id, 0, author, email, curdate,\n-\t\t\t remote_addr, url);\n-\n-\tret = write_file(sqlpath, sql, strlen(sql));\n-\n-\tsqlite3_free(sql);\n+\tyml = prep_meta_yaml(author, email, curdate, remote_addr, url);\n+\tif (!yml) {\n+\t\tLOG(\"failed to prep yaml data\");\n+\t\treturn INTERNAL_ERR;\n+\t}\n+\n+\tret = write_file(ymlpath, yml, strlen(yml));\n+\n+\tfree(yml);\n \n \tif (ret) {\n \t\tLOG(\"Couldn't write file ... :( %d (%s) '%s'\",\n-\t\t errno, strerror(errno), textpath);\n+\t\t errno, strerror(errno), ymlpath);\n \t\treturn INTERNAL_ERR;\n \t}\n \n"} {"commit":"a702f99c0488fa9477c72a11a6bcb13226449b1b","subject":" Dump function type as string.","message":" Dump function type as string.\n","repos":"themperek\/iverilog,CastMi\/iverilog,themperek\/iverilog,themperek\/iverilog,CastMi\/iverilog,CastMi\/iverilog","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tgt-stub\/stub.c\n+++ tgt-stub\/stub.c\n@@ -17,7 +17,7 @@\n * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n *\/\n #ifdef HAVE_CVS_IDENT\n-#ident \"$Id: stub.c,v 1.136 2006\/01\/02 05:33:20 steve Exp $\"\n+#ident \"$Id: stub.c,v 1.137 2006\/04\/27 04:26:38 steve Exp $\"\n #endif\n \n # include \"config.h\"\n@@ -256,9 +256,8 @@\n \t break;\n \n \t case IVL_EX_SFUNC:\n-\t fprintf(out, \"%*s<function=\\\"%s\\\", width=%u, %s, vt=%d>\\n\",\n-\t\t ind, \"\", ivl_expr_name(net), ivl_expr_width(net),\n-\t\t sign, ivl_expr_value(net));\n+\t fprintf(out, \"%*s<function=\\\"%s\\\", width=%u, %s, type=%s>\\n\",\n+\t\t ind, \"\", ivl_expr_name(net), width, sign, vt);\n \t { unsigned cnt = ivl_expr_parms(net);\n \t unsigned idx;\n \t for (idx = 0 ; idx < cnt ; idx += 1)\n@@ -1580,6 +1579,9 @@\n \n \/*\n * $Log: stub.c,v $\n+ * Revision 1.137 2006\/04\/27 04:26:38 steve\n+ * Dump function type as string.\n+ *\n * Revision 1.136 2006\/01\/02 05:33:20 steve\n * Node delays can be more general expressions in structural contexts.\n *\n"} {"commit":"5cb7b202976446949cd74cc3f2f5383b7933ebfe","subject":"sensor: Minor code style fix","message":"sensor: Minor code style fix\n","repos":"mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/sensor\/src\/sensor.c\n+++ hw\/sensor\/src\/sensor.c\n@@ -1099,9 +1099,9 @@\n \/* Call data function *\/\n if (ctx->user_func != NULL) {\n return (ctx->user_func(sensor, ctx->user_arg, data, type));\n- } else {\n- return (0);\n- }\n+ }\n+\n+ return (0);\n }\n \n \/**\n"} {"commit":"b165bfcec7773d19b8bc13b8c12b77390f044f98","subject":"sanitizers: set ASAN's soft_rss_limit_mb if --rlimit_rss was used","message":"sanitizers: set ASAN's soft_rss_limit_mb if --rlimit_rss was used\n","repos":"google\/honggfuzz,google\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sanitizers.c\n+++ sanitizers.c\n@@ -96,8 +96,6 @@\n \"handle_sigill=0:handle_sigfpe=0:allocator_may_return_null=1:\" \\\n \"symbolize=1:detect_leaks=0:disable_coredump=0\"\n \n-#define kSAN_SOFT_RSS_LIMIT_MB 8192\n-\n \/*\n * If the program ends with a signal that ASan does not handle (or can not\n * handle at all, like SIGKILL), coverage data will be lost. This is a big\n@@ -121,8 +119,13 @@\n snprintf(buf, buflen, \"%s=%s:%s:%s%s\/%s\", env, kASAN_OPTS, abortFlag, kSANLOGDIR,\n hfuzz->io.workDir, kLOGPREFIX);\n }\n- if (!hfuzz->exe.netDriver) {\n- util_ssnprintf(buf, buflen, \":%s\", \"soft_rss_limit_mb=\" HF_XSTR(kSAN_SOFT_RSS_LIMIT_MB));\n+ \/*\n+ * It will make ASAN to start background thread to check RSS mem use, which\n+ * will prevent the NetDrvier from using unshare(CLONE_NEWNET), which cannot\n+ * be used in multi-threaded contexts\n+ *\/\n+ if (!hfuzz->exe.netDriver && hfuzz->exe.rssLimit) {\n+ util_ssnprintf(buf, buflen, \":soft_rss_limit_mb=%\" PRId64, hfuzz->exe.rssLimit);\n }\n if (hfuzz->extSanOpts) {\n util_ssnprintf(buf, buflen, \":%s\", hfuzz->extSanOpts);\n"} {"commit":"6b66fd17f1a07a8881040c621eceed0b87972eee","subject":"(M. Valin) ajout des macros off64_t et tell64 pour CYGWIN","message":"(M. Valin) ajout des macros off64_t et tell64 pour CYGWIN\n","repos":"mfvalin\/librmn,armnlib\/librmn,mfvalin\/librmn,armnlib\/librmn,mfvalin\/librmn,mfvalin\/librmn,armnlib\/librmn,armnlib\/librmn,mfvalin\/librmn,armnlib\/librmn","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- primitives\/c_baseio.c\n+++ primitives\/c_baseio.c\n@@ -76,7 +76,9 @@\n #ifdef __CYGWIN__\n #define lseek64 lseek\n #define open64 open\n+#define off64_t off_t\n #define tell(fd) lseek(fd,0,1)\n+#define tell64(fd) lseek(fd,0,1)\n #endif\n \n void static dump_file_entry(int i);\n"} {"commit":"51c0ed010c589724d28e7fc80334eec5065fc61f","subject":"Remove an unused file from service_runtime.","message":"Remove an unused file from service_runtime.\n\nReview URL: http:\/\/codereview.chromium.org\/5573009\n\ngit-svn-id: 721b910a23eff8a86f00c8fd261a7587cddf18f8@3908 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2\n","repos":"nacl-webkit\/native_client,nacl-webkit\/native_client,sbc100\/native_client,sbc100\/native_client,nacl-webkit\/native_client,sbc100\/native_client,sbc100\/native_client,nacl-webkit\/native_client,nacl-webkit\/native_client,sbc100\/native_client,sbc100\/native_client","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/trusted\/service_runtime\/main2.c\n+++ src\/trusted\/service_runtime\/main2.c\n@@ -1,16 +0,0 @@\n-\n-\/*\n- * Copyright 2008 The Native Client Authors. All rights reserved.\n- * Use of this source code is governed by a BSD-style license that can\n- * be found in the LICENSE file.\n- *\/\n- *\/\n-\n-\n-\/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] *\/\n-extern void NaClMain(void);\n-\n-int main(int argc, char **argv) {\n- NaClMain();\n- return 0;\n-}\n"} {"commit":"782ae8471ff00a7df052f521af64a0d0750976bd","subject":"CIL example: <linux\/fs.h> is now required for <linux\/ext3_fs.h>","message":"CIL example: <linux\/fs.h> is now required for <linux\/ext3_fs.h>\n\n","repos":"Tipoca\/bitstring,Tipoca\/bitstring,Tipoca\/bitstring","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cil-tools\/ext3.c\n+++ cil-tools\/ext3.c\n@@ -17,6 +17,7 @@\n \/* Include files necessary to get the structure(s) and constant(s) we're\n * interested in.\n *\/\n+#include <linux\/fs.h>\n #include <linux\/magic.h>\n #include <linux\/ext2_fs.h>\n \n"} {"commit":"8c48d4b875bdc31b693fea83ce96925c0579612c","subject":"Adjust benchmark.c for api changes.","message":"Adjust benchmark.c for api changes.\n","repos":"ilyak\/libxm,ilyak\/libxm","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- benchmark.c\n+++ benchmark.c\n@@ -38,9 +38,9 @@\n \tconst char *idxb;\n \tconst char *idxc;\n \txm_scalar_t alpha;\n-\tint (*init_a)(struct xm_tensor *, struct xm_allocator *, size_t, int);\n-\tint (*init_b)(struct xm_tensor *, struct xm_allocator *, size_t, int);\n-\tint (*init_c)(struct xm_tensor *, struct xm_allocator *, size_t, int);\n+\txm_tensor_t *(*init_a)(xm_allocator_t *, xm_dim_t, size_t, int);\n+\txm_tensor_t *(*init_b)(xm_allocator_t *, xm_dim_t, size_t, int);\n+\txm_tensor_t *(*init_c)(xm_allocator_t *, xm_dim_t, size_t, int);\n };\n \n static struct setup\n@@ -107,7 +107,13 @@\n \n \tsetup.dima = xm_dim_4(o, o, v, v);\n \tsetup.dimb = xm_dim_4(o, v, v, v);\n-\tsetup.dimc = xm_dim_6(o, o, o, v, v, v);\n+\tsetup.dimc.n = 6;\n+\tsetup.dimc.i[0] = o;\n+\tsetup.dimc.i[1] = o;\n+\tsetup.dimc.i[2] = o;\n+\tsetup.dimc.i[3] = v;\n+\tsetup.dimc.i[4] = v;\n+\tsetup.dimc.i[5] = v;\n \tsetup.idxa = \"ijda\";\n \tsetup.idxb = \"kdbc\";\n \tsetup.idxc = \"ijkabc\";\n@@ -218,8 +224,8 @@\n {\n \tstruct args args;\n \tstruct setup s;\n-\tstruct xm_allocator *allocator;\n-\tstruct xm_tensor *a, *b, *c;\n+\txm_allocator_t *allocator;\n+\txm_tensor_t *a, *b, *c;\n \tconst char *path;\n \n \targs = args_parse(argc, argv);\n@@ -231,19 +237,15 @@\n \tif ((allocator = xm_allocator_create(path)) == NULL)\n \t\tfatal(\"xm_allocator_create\");\n \n-\tif ((a = xm_tensor_create(allocator, &s.dima, \"a\")) == NULL)\n-\t\tfatal(\"xm_tensor_create(a)\");\n-\tif ((b = xm_tensor_create(allocator, &s.dimb, \"b\")) == NULL)\n-\t\tfatal(\"xm_tensor_create(b)\");\n-\tif ((c = xm_tensor_create(allocator, &s.dimc, \"c\")) == NULL)\n-\t\tfatal(\"xm_tensor_create(c)\");\n-\n-\tif (s.init_a(a, allocator, args.block_size, XM_INIT_RAND))\n-\t\tfatal(\"init(a)\");\n-\tif (s.init_b(b, allocator, args.block_size, XM_INIT_RAND))\n-\t\tfatal(\"init(b)\");\n-\tif (s.init_c(c, allocator, args.block_size, XM_INIT_ZERO))\n-\t\tfatal(\"init(c)\");\n+\tif ((a = s.init_a(allocator, s.dima, args.block_size,\n+\t XM_INIT_RAND)) == NULL)\n+\t\tfatal(\"failed to create tensor a\");\n+\tif ((b = s.init_b(allocator, s.dimb, args.block_size,\n+\t XM_INIT_RAND)) == NULL)\n+\t\tfatal(\"failed to create tensor b\");\n+\tif ((c = s.init_c(allocator, s.dimc, args.block_size,\n+\t XM_INIT_RAND)) == NULL)\n+\t\tfatal(\"failed to create tensor c\");\n \n \txm_contract(s.alpha, a, b, 0.0, c, s.idxa, s.idxb, s.idxc);\n \n"} {"commit":"3cb5d4bf86f96dd3a836db470c01ebce20d2afa4","subject":"adds proper support for .bss section","message":"adds proper support for .bss section\n","repos":"tangrs\/ndless-bflt-loader","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bflt\/bflt.c\n+++ bflt\/bflt.c\n@@ -57,8 +57,12 @@\n \/* that means we can copy them all at once *\/\n fseek(fp, header->entry, SEEK_SET);\n \n- size_t size_to_copy = header->bss_end - header->entry;\n- if (size_to_copy > max_size) error_return(\"Segment buffer not large enough\");\n+ size_t size_required = header->bss_end - header->entry;\n+ size_t size_to_copy = header->data_end - header->entry;\n+ if (size_required > max_size) error_return(\"Segment buffer not large enough\");\n+\n+ \/* zero out memory for bss *\/\n+ memset( (char*)mem + size_to_copy, 0, size_required - size_to_copy );\n \n if (fread(mem, 1, size_to_copy, fp) == size_to_copy) {\n return 0;\n"} {"commit":"95d45c7479db322028ab186f4f565c30cbdfba69","subject":"replicate: clear pre_op_done\/piggyback values after open fd self-heal","message":"replicate: clear pre_op_done\/piggyback values after open fd self-heal\n\nSigned-off-by: Anand V. Avati <avati@amp.gluster.com>\nSigned-off-by: Vijay Bellur <vijay@dev.gluster.com>\n\nBUG: 1235 (Bug for all pump\/migrate commits)\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=1235\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/cluster\/afr\/src\/afr-open.c\n+++ xlators\/cluster\/afr\/src\/afr-open.c\n@@ -314,8 +314,17 @@\n \n fd_ctx = (afr_fd_ctx_t *)(long) ctx;\n \n- call_count = __unopened_count (priv->child_count, fd_ctx->opened_on,\n- local->child_up);\n+ LOCK (&local->fd->lock);\n+ {\n+ call_count = __unopened_count (priv->child_count,\n+ fd_ctx->opened_on,\n+ local->child_up);\n+ for (i = 0; i < priv->child_count; i++) {\n+ fd_ctx->pre_op_done[i] = 0;\n+ fd_ctx->pre_op_piggyback[i] = 0;\n+ }\n+ }\n+ UNLOCK (&local->fd->lock);\n \n if (call_count == 0) {\n abandon = 1;\n"} {"commit":"1799b85e271d67cb1914105b84cd833cd2b864b6","subject":"INTEGRATION: CWS oasisbf1 (1.1.376); FILE MERGED 2004\/08\/16 11:57:27 mib 1.1.376.1: #i32677#: OASIS services","message":"INTEGRATION: CWS oasisbf1 (1.1.376); FILE MERGED\n2004\/08\/16 11:57:27 mib 1.1.376.1: #i32677#: OASIS services\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- xmloff\/inc\/XMLFilterServiceNames.h\n+++ xmloff\/inc\/XMLFilterServiceNames.h\n@@ -2,9 +2,9 @@\n *\n * $RCSfile: XMLFilterServiceNames.h,v $\n *\n- * $Revision: 1.1 $\n+ * $Revision: 1.2 $\n *\n- * last change: $Author: mib $ $Date: 2001-05-09 12:06:29 $\n+ * last change: $Author: hr $ $Date: 2004-11-09 12:12:16 $\n *\n * The Contents of this file are made available subject to the terms of\n * either of the following licenses\n@@ -63,18 +63,18 @@\n #define _XMLOFF_XMLFILTERSERVICENAMES_H\n \n \n-#define XML_IMPORT_FILTER_WRITER \"com.sun.star.comp.Writer.XMLImporter\"\n-#define XML_IMPORT_FILTER_CALC \"com.sun.star.comp.Calc.XMLImporter\"\n-#define XML_IMPORT_FILTER_DRAW \"com.sun.star.comp.Draw.XMLImporter\"\n-#define XML_IMPORT_FILTER_IMPRESS \"com.sun.star.comp.Impress.XMLImporter\"\n+#define XML_IMPORT_FILTER_WRITER \"com.sun.star.comp.Writer.XMLOasisImporter\"\n+#define XML_IMPORT_FILTER_CALC \"com.sun.star.comp.Calc.XMLOasisImporter\"\n+#define XML_IMPORT_FILTER_DRAW \"com.sun.star.comp.Draw.XMLOasisImporter\"\n+#define XML_IMPORT_FILTER_IMPRESS \"com.sun.star.comp.Impress.XMLOasisImporter\"\n #define XML_IMPORT_FILTER_MATH \"com.sun.star.comp.Math.XMLImporter\"\n-#define XML_IMPORT_FILTER_CHART \"com.sun.star.comp.Chart.XMLImporter\"\n+#define XML_IMPORT_FILTER_CHART \"com.sun.star.comp.Chart.XMLOasisImporter\"\n \n-#define XML_EXPORT_FILTER_WRITER \"com.sun.star.comp.Writer.XMLExporter\"\n-#define XML_EXPORT_FILTER_CALC \"com.sun.star.comp.Calc.XMLExporter\"\n-#define XML_EXPORT_FILTER_DRAW \"com.sun.star.comp.Draw.XMLExporter\"\n-#define XML_EXPORT_FILTER_IMPRESS \"com.sun.star.comp.Impress.XMLExporter\"\n+#define XML_EXPORT_FILTER_WRITER \"com.sun.star.comp.Writer.XMLOasisExporter\"\n+#define XML_EXPORT_FILTER_CALC \"com.sun.star.comp.Calc.XMLOasisExporter\"\n+#define XML_EXPORT_FILTER_DRAW \"com.sun.star.comp.Draw.XMLOasisExporter\"\n+#define XML_EXPORT_FILTER_IMPRESS \"com.sun.star.comp.Impress.XMLOasisExporter\"\n #define XML_EXPORT_FILTER_MATH \"com.sun.star.comp.Math.XMLExporter\"\n-#define XML_EXPORT_FILTER_CHART \"com.sun.star.comp.Chart.XMLExporter\"\n+#define XML_EXPORT_FILTER_CHART \"com.sun.star.comp.Chart.XMLOasisExporter\"\n \n #endif\n"} {"commit":"603c9719c7afa0b63ee3403eb236fe080a0ff862","subject":"display whether an iface is an ethernet device or not when attaching","message":"display whether an iface is an ethernet device or not when attaching\n\ngit-svn-id: 29c1264a5cf5e3532df57b06678e7347571c1a3c@397 f1ba3bf5-cb5c-402b-92a9-7c6bdc83a356\n","repos":"ananos\/open-mx,ananos\/xen2mx,ananos\/open-mx,ananos\/open-mx,ananos\/xen2mx,ananos\/xen2mx,ananos\/xen2mx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- driver\/linux\/omx_net.c\n+++ driver\/linux\/omx_net.c\n@@ -19,6 +19,7 @@\n #include <linux\/kernel.h>\n #include <linux\/module.h>\n #include <linux\/utsname.h>\n+#include <linux\/if_arp.h>\n \n #include \"omx_common.h\"\n #include \"omx_hal.h\"\n@@ -174,8 +175,8 @@\n \t\tgoto out_with_ifp_hold;\n \t}\n \n-\tprintk(KERN_INFO \"Open-MX: Attaching interface '%s' as #%i, MTU=%d\\n\",\n-\t ifp->name, i, mtu);\n+\tprintk(KERN_INFO \"Open-MX: Attaching %sEthernet device '%s' as #%i, MTU=%d\\n\",\n+\t (ifp->type == ARPHRD_ETHER ? \"\" : \"non-\"), ifp->name, i, mtu);\n \tif (mtu < OMX_MTU_MIN)\n \t\tprintk(KERN_WARNING \"Open-MX: WARNING: Interface '%s' MTU should be at least %d, current value %d might cause problems\\n\",\n \t\t ifp->name, OMX_MTU_MIN, mtu);\n"} {"commit":"f35a66d1b852d1d7dfe428ff2b03958686a4ef3a","subject":"Motors test created","message":"Motors test created\n","repos":"unball\/ieee-very-small,unball\/ieee-very-small,unball\/ieee-very-small,unball\/ieee-very-small","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- firmware\/headers\/control.h\n+++ firmware\/headers\/control.h\n@@ -16,7 +16,7 @@\n int sat_count = 0;\n unsigned long cicle_time=0;\n bool bateria_fraca;\n- int tensao=100;\n+ int tensao=0;\n \n int acc=0;\n \n@@ -57,7 +57,7 @@\n void control(int velocidadeA, int velocidadeB){\n if(velocidadeA || velocidadeB){\n Encoder::encoder();\n- \/\/TimeOfCicle();\n+ TimeOfCicle();\n Serial.print(\"motor0: \");Serial.print(Encoder::contadorA);Serial.print(\"\/\/\");Serial.print(Encoder::contadorA_media);\n Serial.print(\" motor1: \");Serial.print(Encoder::contadorB);Serial.print(\"\/\/\");Serial.print(Encoder::contadorB_media);\n long errorA=velocidadeA-Encoder::contadorA_media;\n@@ -72,7 +72,7 @@\n Serial.print(errorA);\n Serial.print(\"||\");\n Serial.print(errorB);\n- \n+\n long kp_a=2100;\n long ki_a=0;\n long kd_a=1800;\n@@ -95,7 +95,7 @@\n errorA_i = (-1000)*Saturacao_ki_erro\/ki_a;\n }\n intermediarioA=(ki_a*errorA_i)\/1000;\n- Serial.print(\" errorA_i: \");Serial.print(errorA_i);\n+ \/\/Serial.print(\" errorA_i: \");Serial.print(errorA_i);\n intermediarioA += (kp_a*errorA)\/1000;\n intermediarioA += (kd_a*errorA_d)\/1000;\n errorA_d_ant = errorA;\n@@ -113,7 +113,7 @@\n errorB_i = (-1000)*Saturacao_ki_erro\/ki_b;\n }\n intermediarioB=(ki_b*errorB_i)\/1000;\n- Serial.print(\" errorB_i: \");Serial.print(errorB_i);\n+ \/\/Serial.print(\" errorB_i: \");Serial.print(errorB_i);\n intermediarioB += (kp_b*errorB)\/1000;\n intermediarioB += (kd_b*errorB_d)\/1000;\n errorB_d_ant = errorB;\n@@ -135,24 +135,27 @@\n commandB = -255;\n }\n \n+\n+ \/\/Teste para verifica\u00e7\u00e3o dos motores\n \/*tensao++;\n- if(tensao>240){\n- tensao=240;\n- Serial.println(\"SATUROU\");\n+ if(tensao>220){\n+ tensao=220;\n+ Serial.println(\"#\");\n }\n- Serial.print(\"tensao: \");\n- Serial.println(tensao);*\/\n+ Serial.println(\"$\");\n+ Serial.println(tensao);\n+ Serial.println(Encoder::contadorA_media);\n+ Serial.println(Encoder::contadorB_media);*\/\n \n Motor::move(0, commandA);\n Motor::move(1, commandB);\n \n- \/\/delay(1000);\n- \n Serial.print(\" commands \");\n- Serial.print(commandA);Serial.print(\"\/\/\");Serial.print(commandA_media);\n- Serial.print(\" \");Serial.print(commandB);Serial.print(\"\/\/\");Serial.println(commandB_media);\n+ Serial.print(commandA);Serial.print(\"\/\/\");\n+ Serial.print(\" \");Serial.println(commandB);\n \n- \n+ \/\/delay(300);\n+\n \/\/verifica se o erro integrativo satura a velocidade baixa\n \/\/bateria_fraca = Bateria(ki_erro_A, ki_erro_B, Saturacao_ki_erro, velocidadeA, velocidadeB);\n \n@@ -176,8 +179,9 @@\n }\n else {\n \/\/procedimento para indicar que o robo nao recebe mensagens nas ultimas 20000 iteracoes\n- if(radioNotAvailableFor(20000))\n+ if(radioNotAvailableFor(40000)){\n control(600, 600);\n+ }\n else {\n \/\/control(500, 500);\n control(velocidades.motorA, velocidades.motorB);\n"} {"commit":"aa91c72566a5a6d52f11b2f8d98bcf1774eeccfd","subject":"ata\/sata_fsl: Remove ata_scsi_suspend\/resume callbacks","message":"ata\/sata_fsl: Remove ata_scsi_suspend\/resume callbacks\n\nSigned-off-by: ashish kalra <4896f6e1ada5935155d0aa3706e85646d2ea166d@freescale.com>\nSigned-off-by: Li Yang <ecc108c9e46a7124cf4a03d161d413e34ffc15a7@freescale.com>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/sata_fsl.c\n+++ drivers\/ata\/sata_fsl.c\n@@ -1223,10 +1223,6 @@\n \t.slave_configure = ata_scsi_slave_config,\n \t.slave_destroy = ata_scsi_slave_destroy,\n \t.bios_param = ata_std_bios_param,\n-#ifdef CONFIG_PM\n-\t.suspend = ata_scsi_device_suspend,\n-\t.resume = ata_scsi_device_resume,\n-#endif\n };\n \n static const struct ata_port_operations sata_fsl_ops = {\n"} {"commit":"86f5dd48b3c3d7710e729f163be4589fdc16d07c","subject":"test del display dentro del while de horno.c","message":"test del display dentro del while de horno.c\n","repos":"m4v\/Proyecto-final,m4v\/Proyecto-final,m4v\/Proyecto-final,bluemass87\/Proyecto-final,bluemass87\/Proyecto-final,gastonriera\/Proyecto-final,gastonriera\/Proyecto-final,bluemass87\/Proyecto-final,gastonriera\/Proyecto-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- firmware\/horno\/src\/horno.c\n+++ firmware\/horno\/src\/horno.c\n@@ -122,8 +122,8 @@\n \n DEBUGOUT(mensaje_inicio);\n \tDEBUGOUT(mensaje_menu);\n-\n- while(1) {\n+\twhile(1){\n+ Horno_Display_Test();\n \tcharUART = DEBUGIN();\n \tif (charUART == 'm') {\n \t\tadc_enabled = true;\n@@ -167,8 +167,6 @@\n \t}\n }\n \tBoard_LED_Set(0, true);\n-\twhile(1){\n- Horno_Display_Test();\n-\t}\n+\n return 0;\n }\n"} {"commit":"31f80112cc7e7ea4c220d6f62b0a7052754befb3","subject":"sata_sil: enable 32-bit PIO","message":"sata_sil: enable 32-bit PIO\n\n32-bit PIO seems to work fine on sata_sil hardware (tested on SiI3114) and is\nlisted as OK in the Silicon Image datasheets. Enable it.\n\nSigned-off-by: Robert Hancock <6cfcd53195f1aa0ac67c127c865c06914056063f@gmail.com>\nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ata\/sata_sil.c\n+++ drivers\/ata\/sata_sil.c\n@@ -183,7 +183,7 @@\n };\n \n static struct ata_port_operations sil_ops = {\n-\t.inherits\t\t= &ata_bmdma_port_ops,\n+\t.inherits\t\t= &ata_bmdma32_port_ops,\n \t.dev_config\t\t= sil_dev_config,\n \t.set_mode\t\t= sil_set_mode,\n \t.bmdma_setup = sil_bmdma_setup,\n"} {"commit":"db2cad2f55078e90f84960b84b721291efa83d36","subject":"firewire: net: remove unused variable in fwnet_receive_broadcast()","message":"firewire: net: remove unused variable in fwnet_receive_broadcast()\n\nThe variable card is initialized but never used\notherwise, so remove the unused variable.\n\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: Stefan Richter <fbd796546fc801b34e01e453c6fd30283e012038@s5r6.in-berlin.de>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/firewire\/net.c\n+++ drivers\/firewire\/net.c\n@@ -828,7 +828,6 @@\n {\n \tstruct fwnet_device *dev;\n \tstruct fw_iso_packet packet;\n-\tstruct fw_card *card;\n \t__be16 *hdr_ptr;\n \t__be32 *buf_ptr;\n \tint retval;\n@@ -840,7 +839,6 @@\n \tunsigned long flags;\n \n \tdev = data;\n-\tcard = dev->card;\n \thdr_ptr = header;\n \tlength = be16_to_cpup(hdr_ptr);\n \n"} {"commit":"55d3b664d43b66129671f30f3e790e824d1d0e0f","subject":"HID: sony: Use a struct for the Sixaxis output report.","message":"HID: sony: Use a struct for the Sixaxis output report.\n\nUse a struct for the Sixaxis output report that uses named members to set the\nreport fields.\n\nSigned-off-by: Frank Praznik <f15ca1017e972332ff061b480de666d55b1ccfa2@oh.rr.com>\nSigned-off-by: Jiri Kosina <ed58f755cc8caaf10c3e8c731a8b86fb8f13d6cb@suse.cz>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/hid\/hid-sony.c\n+++ drivers\/hid\/hid-sony.c\n@@ -717,6 +717,36 @@\n \tPOWER_SUPPLY_PROP_STATUS,\n };\n \n+struct sixaxis_led {\n+\t__u8 time_enabled; \/* the total time the led is active (0xff means forever) *\/\n+\t__u8 duty_length; \/* how long a cycle is in deciseconds (0 means \"really fast\") *\/\n+\t__u8 enabled;\n+\t__u8 duty_off; \/* % of duty_length the led is off (0xff means 100%) *\/\n+\t__u8 duty_on; \/* % of duty_length the led is on (0xff mean 100%) *\/\n+} __packed;\n+\n+struct sixaxis_rumble {\n+\t__u8 padding;\n+\t__u8 right_duration; \/* Right motor duration (0xff means forever) *\/\n+\t__u8 right_motor_on; \/* Right (small) motor on\/off, only supports values of 0 or 1 (off\/on) *\/\n+\t__u8 left_duration; \/* Left motor duration (0xff means forever) *\/\n+\t__u8 left_motor_force; \/* left (large) motor, supports force values from 0 to 255 *\/\n+} __packed;\n+\n+struct sixaxis_output_report {\n+\t__u8 report_id;\n+\tstruct sixaxis_rumble rumble;\n+\t__u8 padding[4];\n+\t__u8 leds_bitmap; \/* bitmap of enabled LEDs: LED_1 = 0x02, LED_2 = 0x04, ... *\/\n+\tstruct sixaxis_led led[4]; \/* LEDx at (4 - x) *\/\n+\tstruct sixaxis_led _reserved; \/* LED5, not actually soldered *\/\n+} __packed;\n+\n+union sixaxis_output_report_01 {\n+\tstruct sixaxis_output_report data;\n+\t__u8 buf[36];\n+};\n+\n static spinlock_t sony_dev_list_lock;\n static LIST_HEAD(sony_device_list);\n \n@@ -1244,29 +1274,31 @@\n static void sixaxis_state_worker(struct work_struct *work)\n {\n \tstruct sony_sc *sc = container_of(work, struct sony_sc, state_worker);\n-\tunsigned char buf[] = {\n-\t\t0x01,\n-\t\t0x00, 0xff, 0x00, 0xff, 0x00,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00,\n-\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n-\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n-\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n-\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n-\t\t0x00, 0x00, 0x00, 0x00, 0x00\n+\tunion sixaxis_output_report_01 report = {\n+\t\t.buf = {\n+\t\t\t0x01,\n+\t\t\t0x00, 0xff, 0x00, 0xff, 0x00,\n+\t\t\t0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n+\t\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n+\t\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n+\t\t\t0xff, 0x27, 0x10, 0x00, 0x32,\n+\t\t\t0x00, 0x00, 0x00, 0x00, 0x00\n+\t\t}\n \t};\n \n #ifdef CONFIG_SONY_FF\n-\tbuf[3] = sc->right ? 1 : 0;\n-\tbuf[5] = sc->left;\n+\treport.data.rumble.right_motor_on = sc->right ? 1 : 0;\n+\treport.data.rumble.left_motor_force = sc->left;\n #endif\n \n-\tbuf[10] |= sc->led_state[0] << 1;\n-\tbuf[10] |= sc->led_state[1] << 2;\n-\tbuf[10] |= sc->led_state[2] << 3;\n-\tbuf[10] |= sc->led_state[3] << 4;\n-\n-\thid_hw_raw_request(sc->hdev, 0x01, buf, sizeof(buf), HID_OUTPUT_REPORT,\n-\t\t\tHID_REQ_SET_REPORT);\n+\treport.data.leds_bitmap |= sc->led_state[0] << 1;\n+\treport.data.leds_bitmap |= sc->led_state[1] << 2;\n+\treport.data.leds_bitmap |= sc->led_state[2] << 3;\n+\treport.data.leds_bitmap |= sc->led_state[3] << 4;\n+\n+\thid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,\n+\t\t\tsizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);\n }\n \n static void dualshock4_state_worker(struct work_struct *work)\n"} {"commit":"4f001fd30145a6a8f72f9544c982cfd3dcb7c6df","subject":"i2c: Mark instantiated device nodes with OF_POPULATE","message":"i2c: Mark instantiated device nodes with OF_POPULATE\n\nMark (and unmark) device nodes with the POPULATE flag as appropriate.\nThis is required to avoid multi probing when using I2C and device\noverlays containing a mux.\nThis patch is also more careful with the release of the adapter device\nwhich caused a deadlock with muxes, and does not break the build\non !OF since the node flag accessors are not defined then.\n\nSigned-off-by: Pantelis Antoniou <4024101abe0c2bf4e288a39b760ad0c2158118b1@konsulko.com>\nSigned-off-by: Wolfram Sang <fd4ce474653598159cad06f3c83387a05cd53a44@the-dreams.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"4ae42b0ff0f9993c79d7282218b98d8a8a4263f5","subject":"i2c: convert to idr_alloc()","message":"i2c: convert to idr_alloc()\n\nConvert to the much saner new idr interface.\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nCc: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\nCc: Wolfram Sang <a84c43b7866a06a6dd4c9d90e813abbd084f752c@the-dreams.de>\nTested-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/i2c\/i2c-core.c\n+++ drivers\/i2c\/i2c-core.c\n@@ -935,25 +935,17 @@\n *\/\n int i2c_add_adapter(struct i2c_adapter *adapter)\n {\n-\tint\tid, res = 0;\n-\n-retry:\n-\tif (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)\n-\t\treturn -ENOMEM;\n+\tint id;\n \n \tmutex_lock(&core_lock);\n-\t\/* \"above\" here means \"above or equal to\", sigh *\/\n-\tres = idr_get_new_above(&i2c_adapter_idr, adapter,\n-\t\t\t\t__i2c_first_dynamic_bus_num, &id);\n+\tid = idr_alloc(&i2c_adapter_idr, adapter,\n+\t\t __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);\n \tmutex_unlock(&core_lock);\n-\n-\tif (res < 0) {\n-\t\tif (res == -EAGAIN)\n-\t\t\tgoto retry;\n-\t\treturn res;\n-\t}\n+\tif (id < 0)\n+\t\treturn id;\n \n \tadapter->nr = id;\n+\n \treturn i2c_register_adapter(adapter);\n }\n EXPORT_SYMBOL(i2c_add_adapter);\n@@ -984,33 +976,19 @@\n int i2c_add_numbered_adapter(struct i2c_adapter *adap)\n {\n \tint\tid;\n-\tint\tstatus;\n \n \tif (adap->nr == -1) \/* -1 means dynamically assign bus id *\/\n \t\treturn i2c_add_adapter(adap);\n \tif (adap->nr & ~MAX_IDR_MASK)\n \t\treturn -EINVAL;\n \n-retry:\n-\tif (idr_pre_get(&i2c_adapter_idr, GFP_KERNEL) == 0)\n-\t\treturn -ENOMEM;\n-\n \tmutex_lock(&core_lock);\n-\t\/* \"above\" here means \"above or equal to\", sigh;\n-\t * we need the \"equal to\" result to force the result\n-\t *\/\n-\tstatus = idr_get_new_above(&i2c_adapter_idr, adap, adap->nr, &id);\n-\tif (status == 0 && id != adap->nr) {\n-\t\tstatus = -EBUSY;\n-\t\tidr_remove(&i2c_adapter_idr, id);\n-\t}\n+\tid = idr_alloc(&i2c_adapter_idr, adap, adap->nr, adap->nr + 1,\n+\t\t GFP_KERNEL);\n \tmutex_unlock(&core_lock);\n-\tif (status == -EAGAIN)\n-\t\tgoto retry;\n-\n-\tif (status == 0)\n-\t\tstatus = i2c_register_adapter(adap);\n-\treturn status;\n+\tif (id < 0)\n+\t\treturn id == -ENOSPC ? -EBUSY : id;\n+\treturn i2c_register_adapter(adap);\n }\n EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);\n \n"} {"commit":"0302899e144296d6ce8cb3679a9a42d5c6436910","subject":"drivers\/ide\/cy82c693.c: Add missing pci_dev_put","message":"drivers\/ide\/cy82c693.c: Add missing pci_dev_put\n\nPci_get_slot calls pci_dev_get, so pci_dev_put is needed before leaving the\nfunction in the case where pci_get_slot is locally used.\n\nThe semantic match that finds this problem is as follows:\n(http:\/\/coccinelle.lip6.fr\/)\n\n\/\/ <smpl>\n@@\nlocal idexpression x;\nexpression e;\n@@\n\n*x = pci_get_slot(...)\n... when != true x == NULL\n when != pci_dev_put(x)\n when != e = x\n when != if (x != NULL) {<+... pci_dev_put(x); ...+>}\n*return ...;\n\/\/ <\/smpl>\n\nSigned-off-by: Julia Lawall <b43b0ad1e8108e7ab870d7a54feac93ae8b8600e@diku.dk>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ide\/cy82c693.c\n+++ drivers\/ide\/cy82c693.c\n@@ -141,6 +141,8 @@\n \t\tpci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, time_16);\n \t\tpci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, time_8);\n \t}\n+\tif (hwif->index > 0)\n+\t\tpci_dev_put(dev);\n }\n \n static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)\n"} {"commit":"64a0e08682fc9b7b32ebf1add5e6ade09960dfab","subject":"ide-tape: remove struct idetape_data_compression_page_t","message":"ide-tape: remove struct idetape_data_compression_page_t\n\nThere should be no functional changes resulting from this patch.\n\nSigned-off-by: Borislav Petkov <2a4d3586fbecbbc9717045e49ffdc69866bad03c@yahoo.de>\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/ide\/ide-tape.c\n+++ drivers\/ide\/ide-tape.c\n@@ -688,25 +688,6 @@\n \t__u8\t\treserved4;\t\t\/* Reserved *\/\n \t__u8\t\tlength[3];\t\t\/* Block Length *\/\n } idetape_parameter_block_descriptor_t;\n-\n-\/*\n- *\tThe Data Compression Page, as returned by the MODE SENSE packet command.\n- *\/\n-typedef struct {\n-\tunsigned\tpage_code\t:6;\t\/* Page Code - Should be 0xf *\/\n-\tunsigned\treserved0\t:1;\t\/* Reserved *\/\n-\tunsigned\tps\t\t:1;\n-\t__u8\t\tpage_length;\t\t\/* Page Length - Should be 14 *\/\n-\tunsigned\treserved2\t:6;\t\/* Reserved *\/\n-\tunsigned\tdcc\t\t:1;\t\/* Data Compression Capable *\/\n-\tunsigned\tdce\t\t:1;\t\/* Data Compression Enable *\/\n-\tunsigned\treserved3\t:5;\t\/* Reserved *\/\n-\tunsigned\tred\t\t:2;\t\/* Report Exception on Decompression *\/\n-\tunsigned\tdde\t\t:1;\t\/* Data Decompression Enable *\/\n-\t__u32\t\tca;\t\t\t\/* Compression Algorithm *\/\n-\t__u32\t\tda;\t\t\t\/* Decompression Algorithm *\/\n-\t__u8\t\treserved[4];\t\t\/* Reserved *\/\n-} idetape_data_compression_page_t;\n \n \/*\n *\tThe Medium Partition Page, as returned by the MODE SENSE packet command.\n"} {"commit":"212436c2ac11bce48d40fae04147dc025f2775ca","subject":"mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op","message":"mfd: remove IRQF_SAMPLE_RANDOM which is now a no-op\n\nWith the changes in the random tree, IRQF_SAMPLE_RANDOM is now a\nno-op; interrupt randomness is now collected unconditionally in a very\nlow-overhead fashion; see commit 775f4b297b. The IRQF_SAMPLE_RANDOM\nflag was scheduled to be removed in 2009 on the\nfeature-removal-schedule, so this patch is preparation for the final\nremoval of this flag.\n\nSigned-off-by: \"Theodore Ts'o\" <4ed386e0495d3e109932df055831d9ec2f824927@mit.edu>\nCc: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mfd\/tps65010.c\n+++ drivers\/mfd\/tps65010.c\n@@ -563,8 +563,7 @@\n \t *\/\n \tif (client->irq > 0) {\n \t\tstatus = request_irq(client->irq, tps65010_irq,\n-\t\t\tIRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING,\n-\t\t\tDRIVER_NAME, tps);\n+\t\t\t\t IRQF_TRIGGER_FALLING, DRIVER_NAME, tps);\n \t\tif (status < 0) {\n \t\t\tdev_dbg(&client->dev, \"can't get IRQ %d, err %d\\n\",\n \t\t\t\t\tclient->irq, status);\n"} {"commit":"3c3302794cc79b363779a762051ebe8670812791","subject":"mfd: twl-core: Use the lookup table to find the correct subchip for the modules","message":"mfd: twl-core: Use the lookup table to find the correct subchip for the modules\n\nInstead of using SUB_CHIP_ID* or magic numbers use the twl_mapping table to\nlook for the subchip ID.\n\nSigned-off-by: Peter Ujfalusi <e5c0b4cdf99ae1d408b9c497159e74b54e02e008@ti.com>\nSigned-off-by: Samuel Ortiz <0ba86cb3f08bbb861958e54bd3438887adb4263c@linux.intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mfd\/twl-core.c\n+++ drivers\/mfd\/twl-core.c\n@@ -67,11 +67,6 @@\n \/* Triton Core internal information (BEGIN) *\/\n \n #define TWL_NUM_SLAVES\t\t4\n-\n-#define SUB_CHIP_ID0 0\n-#define SUB_CHIP_ID1 1\n-#define SUB_CHIP_ID2 2\n-#define SUB_CHIP_ID3 3\n \n \/* Base Address defns for twl4030_map[] *\/\n \n@@ -493,13 +488,20 @@\n EXPORT_SYMBOL_GPL(twl_get_hfclk_rate);\n \n static struct device *\n-add_numbered_child(unsigned chip, const char *name, int num,\n+add_numbered_child(unsigned mod_no, const char *name, int num,\n \t\tvoid *pdata, unsigned pdata_len,\n \t\tbool can_wakeup, int irq0, int irq1)\n {\n \tstruct platform_device\t*pdev;\n-\tstruct twl_client\t*twl = &twl_modules[chip];\n-\tint\t\t\tstatus;\n+\tstruct twl_client\t*twl;\n+\tint\t\t\tstatus, sid;\n+\n+\tif (unlikely(mod_no >= twl_get_last_module())) {\n+\t\tpr_err(\"%s: invalid module number %d\\n\", DRIVER_NAME, mod_no);\n+\t\treturn ERR_PTR(-EPERM);\n+\t}\n+\tsid = twl_map[mod_no].sid;\n+\ttwl = &twl_modules[sid];\n \n \tpdev = platform_device_alloc(name, num);\n \tif (!pdev) {\n@@ -544,11 +546,11 @@\n \treturn &pdev->dev;\n }\n \n-static inline struct device *add_child(unsigned chip, const char *name,\n+static inline struct device *add_child(unsigned mod_no, const char *name,\n \t\tvoid *pdata, unsigned pdata_len,\n \t\tbool can_wakeup, int irq0, int irq1)\n {\n-\treturn add_numbered_child(chip, name, -1, pdata, pdata_len,\n+\treturn add_numbered_child(mod_no, name, -1, pdata, pdata_len,\n \t\tcan_wakeup, irq0, irq1);\n }\n \n@@ -557,7 +559,6 @@\n \t\tstruct regulator_consumer_supply *consumers,\n \t\tunsigned num_consumers, unsigned long features)\n {\n-\tunsigned sub_chip_id;\n \tstruct twl_regulator_driver_data drv_data;\n \n \t\/* regulator framework demands init_data ... *\/\n@@ -584,8 +585,7 @@\n \t}\n \n \t\/* NOTE: we currently ignore regulator IRQs, e.g. for short circuits *\/\n-\tsub_chip_id = twl_map[TWL_MODULE_PM_MASTER].sid;\n-\treturn add_numbered_child(sub_chip_id, \"twl_reg\", num,\n+\treturn add_numbered_child(TWL_MODULE_PM_MASTER, \"twl_reg\", num,\n \t\tpdata, sizeof(*pdata), false, 0, 0);\n }\n \n@@ -607,10 +607,9 @@\n \t\tunsigned long features)\n {\n \tstruct device\t*child;\n-\tunsigned sub_chip_id;\n \n \tif (IS_ENABLED(CONFIG_GPIO_TWL4030) && pdata->gpio) {\n-\t\tchild = add_child(SUB_CHIP_ID1, \"twl4030_gpio\",\n+\t\tchild = add_child(TWL4030_MODULE_GPIO, \"twl4030_gpio\",\n \t\t\t\tpdata->gpio, sizeof(*pdata->gpio),\n \t\t\t\tfalse, irq_base + GPIO_INTR_OFFSET, 0);\n \t\tif (IS_ERR(child))\n@@ -618,7 +617,7 @@\n \t}\n \n \tif (IS_ENABLED(CONFIG_KEYBOARD_TWL4030) && pdata->keypad) {\n-\t\tchild = add_child(SUB_CHIP_ID2, \"twl4030_keypad\",\n+\t\tchild = add_child(TWL4030_MODULE_KEYPAD, \"twl4030_keypad\",\n \t\t\t\tpdata->keypad, sizeof(*pdata->keypad),\n \t\t\t\ttrue, irq_base + KEYPAD_INTR_OFFSET, 0);\n \t\tif (IS_ERR(child))\n@@ -627,7 +626,7 @@\n \n \tif (IS_ENABLED(CONFIG_TWL4030_MADC) && pdata->madc &&\n \t twl_class_is_4030()) {\n-\t\tchild = add_child(SUB_CHIP_ID2, \"twl4030_madc\",\n+\t\tchild = add_child(TWL4030_MODULE_MADC, \"twl4030_madc\",\n \t\t\t\tpdata->madc, sizeof(*pdata->madc),\n \t\t\t\ttrue, irq_base + MADC_INTR_OFFSET, 0);\n \t\tif (IS_ERR(child))\n@@ -642,22 +641,21 @@\n \t\t * Eventually, Linux might become more aware of such\n \t\t * HW security concerns, and \"least privilege\".\n \t\t *\/\n-\t\tsub_chip_id = twl_map[TWL_MODULE_RTC].sid;\n-\t\tchild = add_child(sub_chip_id, \"twl_rtc\", NULL, 0,\n+\t\tchild = add_child(TWL_MODULE_RTC, \"twl_rtc\", NULL, 0,\n \t\t\t\ttrue, irq_base + RTC_INTR_OFFSET, 0);\n \t\tif (IS_ERR(child))\n \t\t\treturn PTR_ERR(child);\n \t}\n \n \tif (IS_ENABLED(CONFIG_PWM_TWL)) {\n-\t\tchild = add_child(SUB_CHIP_ID1, \"twl-pwm\", NULL, 0,\n+\t\tchild = add_child(TWL_MODULE_PWM, \"twl-pwm\", NULL, 0,\n \t\t\t\t false, 0, 0);\n \t\tif (IS_ERR(child))\n \t\t\treturn PTR_ERR(child);\n \t}\n \n \tif (IS_ENABLED(CONFIG_PWM_TWL_LED)) {\n-\t\tchild = add_child(SUB_CHIP_ID1, \"twl-pwmled\", NULL, 0,\n+\t\tchild = add_child(TWL_MODULE_LED, \"twl-pwmled\", NULL, 0,\n \t\t\t\t false, 0, 0);\n \t\tif (IS_ERR(child))\n \t\t\treturn PTR_ERR(child);\n@@ -709,7 +707,7 @@\n \n \t\t}\n \n-\t\tchild = add_child(SUB_CHIP_ID0, \"twl4030_usb\",\n+\t\tchild = add_child(TWL_MODULE_USB, \"twl4030_usb\",\n \t\t\t\tpdata->usb, sizeof(*pdata->usb), true,\n \t\t\t\t\/* irq0 = USB_PRES, irq1 = USB *\/\n \t\t\t\tirq_base + USB_PRES_INTR_OFFSET,\n@@ -758,7 +756,7 @@\n \n \t\tpdata->usb->features = features;\n \n-\t\tchild = add_child(SUB_CHIP_ID0, \"twl6030_usb\",\n+\t\tchild = add_child(TWL_MODULE_USB, \"twl6030_usb\",\n \t\t\tpdata->usb, sizeof(*pdata->usb), true,\n \t\t\t\/* irq1 = VBUS_PRES, irq0 = USB ID *\/\n \t\t\tirq_base + USBOTG_INTR_OFFSET,\n@@ -783,22 +781,22 @@\n \t}\n \n \tif (IS_ENABLED(CONFIG_TWL4030_WATCHDOG) && twl_class_is_4030()) {\n-\t\tchild = add_child(SUB_CHIP_ID3, \"twl4030_wdt\", NULL, 0,\n-\t\t\t\t false, 0, 0);\n+\t\tchild = add_child(TWL_MODULE_PM_RECEIVER, \"twl4030_wdt\", NULL,\n+\t\t\t\t 0, false, 0, 0);\n \t\tif (IS_ERR(child))\n \t\t\treturn PTR_ERR(child);\n \t}\n \n \tif (IS_ENABLED(CONFIG_INPUT_TWL4030_PWRBUTTON) && twl_class_is_4030()) {\n-\t\tchild = add_child(SUB_CHIP_ID3, \"twl4030_pwrbutton\", NULL, 0,\n-\t\t\t\t true, irq_base + 8 + 0, 0);\n+\t\tchild = add_child(TWL_MODULE_PM_MASTER, \"twl4030_pwrbutton\",\n+\t\t\t\t NULL, 0, true, irq_base + 8 + 0, 0);\n \t\tif (IS_ERR(child))\n \t\t\treturn PTR_ERR(child);\n \t}\n \n \tif (IS_ENABLED(CONFIG_MFD_TWL4030_AUDIO) && pdata->audio &&\n \t twl_class_is_4030()) {\n-\t\tchild = add_child(SUB_CHIP_ID1, \"twl4030-audio\",\n+\t\tchild = add_child(TWL4030_MODULE_AUDIO_VOICE, \"twl4030-audio\",\n \t\t\t\tpdata->audio, sizeof(*pdata->audio),\n \t\t\t\tfalse, 0, 0);\n \t\tif (IS_ERR(child))\n@@ -1038,7 +1036,7 @@\n \n \tif (IS_ENABLED(CONFIG_CHARGER_TWL4030) && pdata->bci &&\n \t\t\t!(features & (TPS_SUBSET | TWL5031))) {\n-\t\tchild = add_child(SUB_CHIP_ID3, \"twl4030_bci\",\n+\t\tchild = add_child(TWL_MODULE_MAIN_CHARGE, \"twl4030_bci\",\n \t\t\t\tpdata->bci, sizeof(*pdata->bci), false,\n \t\t\t\t\/* irq0 = CHG_PRES, irq1 = BCI *\/\n \t\t\t\tirq_base + BCI_PRES_INTR_OFFSET,\n"} {"commit":"5dc474d6b3ba19df7d491d4eabd9fb7a0c1c2423","subject":"pppol2tp: Remove null pointer dereference.","message":"pppol2tp: Remove null pointer dereference.\n\nIf session is NULL, it is not possible to access its name field. So I\nhave split apart the printing of the error message to drop the\nprinting of the name field in this case.\n\nThe macro PRINTK actually only evaluates its arguments starting with\nthe third one if the bitwise conjunction of the first two is non-zero.\nNormally, this conjunction would only be non-zero if debugging mode\nwere turned on, but when session is NULL, the first argument in both\nthe old and new code is -1, and thus the bitwise conjunction is true.\nPerhaps a different strategy is desired, such as using tunnel->debug,\nwhich session->debug is initialized to, but tunnel can also be NULL,\nso this does not completely solve the problem.\n\n\nThis problem was found using the following semantic match\n(http:\/\/www.emn.fr\/x-info\/coccinelle\/)\n\n\/\/ <smpl>\n@@\nexpression E, E1;\nidentifier f;\nstatement S1,S2,S3;\n@@\n\n* if (E == NULL)\n{\n ... when != if (E == NULL) S1 else S2\n when != E = E1\n* E->f\n ... when any\n return ...;\n}\nelse S3\n\/\/ <\/smpl>\n\nSigned-off-by: Julia Lawall <b43b0ad1e8108e7ab870d7a54feac93ae8b8600e@diku.dk>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/pppol2tp.c\n+++ drivers\/net\/pppol2tp.c\n@@ -1621,9 +1621,16 @@\n end:\n \trelease_sock(sk);\n \n-\tif (error != 0)\n-\t\tPRINTK(session ? session->debug : -1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,\n-\t\t \"%s: connect failed: %d\\n\", session->name, error);\n+\tif (error != 0) {\n+\t\tif (session)\n+\t\t\tPRINTK(session->debug,\n+\t\t\t\tPPPOL2TP_MSG_CONTROL, KERN_WARNING,\n+\t\t\t\t\"%s: connect failed: %d\\n\",\n+\t\t\t\tsession->name, error);\n+\t\telse\n+\t\t\tPRINTK(-1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,\n+\t\t\t\t\"connect failed: %d\\n\", error);\n+\t}\n \n \treturn error;\n }\n"} {"commit":"14c9d9b03bb8ec63c77aebddea9a6f730f1b62d5","subject":"sundance fixes","message":"sundance fixes\n\n* all places where we assign ->addr get cpu_to_le32(pci_map_single(....)), so\nwe ought to convert back to host-endian before doing pci_unmap_single() et.al.\n* poisoning addresses in netdev_close() should be done _after_ unmapping them,\nnot before it...\n\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/sundance.c\n+++ drivers\/net\/sundance.c\n@@ -340,9 +340,9 @@\n \/* Note that using only 32 bit fields simplifies conversion to big-endian\n architectures. *\/\n struct netdev_desc {\n-\tu32 next_desc;\n-\tu32 status;\n-\tstruct desc_frag { u32 addr, length; } frag[1];\n+\t__le32 next_desc;\n+\t__le32 status;\n+\tstruct desc_frag { __le32 addr, length; } frag[1];\n };\n \n \/* Bits in netdev_desc.status *\/\n@@ -495,8 +495,8 @@\n \t\tgoto err_out_res;\n \n \tfor (i = 0; i < 3; i++)\n-\t\t((u16 *)dev->dev_addr)[i] =\n-\t\t\tle16_to_cpu(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));\n+\t\t((__le16 *)dev->dev_addr)[i] =\n+\t\t\tcpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));\n \tmemcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);\n \n \tdev->base_addr = (unsigned long)ioaddr;\n@@ -1090,8 +1090,8 @@\n \t\tskb = np->tx_skbuff[i];\n \t\tif (skb) {\n \t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\tnp->tx_ring[i].frag[0].addr, skb->len,\n-\t\t\t\tPCI_DMA_TODEVICE);\n+\t\t\t\tle32_to_cpu(np->tx_ring[i].frag[0].addr),\n+\t\t\t\tskb->len, PCI_DMA_TODEVICE);\n \t\t\tif (irq)\n \t\t\t\tdev_kfree_skb_irq (skb);\n \t\t\telse\n@@ -1214,7 +1214,7 @@\n \t\t\t\tskb = np->tx_skbuff[entry];\n \t\t\t\t\/* Free the original skb. *\/\n \t\t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\t\tnp->tx_ring[entry].frag[0].addr,\n+\t\t\t\t\tle32_to_cpu(np->tx_ring[entry].frag[0].addr),\n \t\t\t\t\tskb->len, PCI_DMA_TODEVICE);\n \t\t\t\tdev_kfree_skb_irq (np->tx_skbuff[entry]);\n \t\t\t\tnp->tx_skbuff[entry] = NULL;\n@@ -1233,7 +1233,7 @@\n \t\t\t\tskb = np->tx_skbuff[entry];\n \t\t\t\t\/* Free the original skb. *\/\n \t\t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\t\tnp->tx_ring[entry].frag[0].addr,\n+\t\t\t\t\tle32_to_cpu(np->tx_ring[entry].frag[0].addr),\n \t\t\t\t\tskb->len, PCI_DMA_TODEVICE);\n \t\t\t\tdev_kfree_skb_irq (np->tx_skbuff[entry]);\n \t\t\t\tnp->tx_skbuff[entry] = NULL;\n@@ -1311,19 +1311,19 @@\n \t\t\t\t&& (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {\n \t\t\t\tskb_reserve(skb, 2);\t\/* 16 byte align the IP header *\/\n \t\t\t\tpci_dma_sync_single_for_cpu(np->pci_dev,\n-\t\t\t\t\t\t\t desc->frag[0].addr,\n+\t\t\t\t\t\t\t le32_to_cpu(desc->frag[0].addr),\n \t\t\t\t\t\t\t np->rx_buf_sz,\n \t\t\t\t\t\t\t PCI_DMA_FROMDEVICE);\n \n \t\t\t\tskb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len);\n \t\t\t\tpci_dma_sync_single_for_device(np->pci_dev,\n-\t\t\t\t\t\t\t desc->frag[0].addr,\n+\t\t\t\t\t\t\t le32_to_cpu(desc->frag[0].addr),\n \t\t\t\t\t\t\t np->rx_buf_sz,\n \t\t\t\t\t\t\t PCI_DMA_FROMDEVICE);\n \t\t\t\tskb_put(skb, pkt_len);\n \t\t\t} else {\n \t\t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\t\tdesc->frag[0].addr,\n+\t\t\t\t\tle32_to_cpu(desc->frag[0].addr),\n \t\t\t\t\tnp->rx_buf_sz,\n \t\t\t\t\tPCI_DMA_FROMDEVICE);\n \t\t\t\tskb_put(skb = np->rx_skbuff[entry], pkt_len);\n@@ -1709,23 +1709,23 @@\n \t\/* Free all the skbuffs in the Rx queue. *\/\n \tfor (i = 0; i < RX_RING_SIZE; i++) {\n \t\tnp->rx_ring[i].status = 0;\n-\t\tnp->rx_ring[i].frag[0].addr = 0xBADF00D0; \/* An invalid address. *\/\n \t\tskb = np->rx_skbuff[i];\n \t\tif (skb) {\n \t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\tnp->rx_ring[i].frag[0].addr, np->rx_buf_sz,\n-\t\t\t\tPCI_DMA_FROMDEVICE);\n+\t\t\t\tle32_to_cpu(np->rx_ring[i].frag[0].addr),\n+\t\t\t\tnp->rx_buf_sz, PCI_DMA_FROMDEVICE);\n \t\t\tdev_kfree_skb(skb);\n \t\t\tnp->rx_skbuff[i] = NULL;\n \t\t}\n+\t\tnp->rx_ring[i].frag[0].addr = cpu_to_le32(0xBADF00D0); \/* poison *\/\n \t}\n \tfor (i = 0; i < TX_RING_SIZE; i++) {\n \t\tnp->tx_ring[i].next_desc = 0;\n \t\tskb = np->tx_skbuff[i];\n \t\tif (skb) {\n \t\t\tpci_unmap_single(np->pci_dev,\n-\t\t\t\tnp->tx_ring[i].frag[0].addr, skb->len,\n-\t\t\t\tPCI_DMA_TODEVICE);\n+\t\t\t\tle32_to_cpu(np->tx_ring[i].frag[0].addr),\n+\t\t\t\tskb->len, PCI_DMA_TODEVICE);\n \t\t\tdev_kfree_skb(skb);\n \t\t\tnp->tx_skbuff[i] = NULL;\n \t\t}\n"} {"commit":"14d3b87c5357f5df85d167084ba8048a48f8df7e","subject":"Some more big endian fixes","message":"Some more big endian fixes\n","repos":"pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,mapfau\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/dfutool.c\n+++ tools\/dfutool.c\n@@ -211,9 +211,9 @@\n \n \tif (status.bState == DFU_STATE_DFU_IDLE) {\n \t\tif (suffix) {\n-\t\t\tsuffix->idVendor = 0x0000;\n-\t\t\tsuffix->idProduct = 0x0000;\n-\t\t\tsuffix->bcdDevice = 0x0000;\n+\t\t\tsuffix->idVendor = cpu_to_le16(0x0000);\n+\t\t\tsuffix->idProduct = cpu_to_le16(0x0000);\n+\t\t\tsuffix->bcdDevice = cpu_to_le16(0x0000);\n \t\t}\n \t\treturn udev;\n \t}\n@@ -262,7 +262,7 @@\n \t\t\tif (dev->descriptor.bDeviceClass != USB_CLASS_APPLICATION)\n \t\t\t\tcontinue;\n \n-\t\t\tif (suffix && dev->descriptor.idVendor != suffix->idVendor)\n+\t\t\tif (suffix && dev->descriptor.idVendor != le16_to_cpu(suffix->idVendor))\n \t\t\t\tcontinue;\n \n \t\t\tif (num > 9 || get_interface_number(dev) != 0)\n"} {"commit":"d13d6bffb418a660c06a5a12afcf7e7081489548","subject":"ucc_geth: enable transmit time stamping.","message":"ucc_geth: enable transmit time stamping.\n\nThis patch enables software (and phy device) transmit time stamping.\nCompile tested only.\n\nCc: Shlomi Gridish <a432c885eaa7d09b3d2fdcf6399955d91b2c5607@freescale.com>\nCc: Li Yang <ecc108c9e46a7124cf4a03d161d413e34ffc15a7@freescale.com>\nSigned-off-by: Richard Cochran <2eabbd0f89b6b46e7c9d3cb1c3b33a9d26b4d87d@omicron.at>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ucc_geth.c\n+++ drivers\/net\/ucc_geth.c\n@@ -3165,6 +3165,8 @@\n \n \tugeth->txBd[txQ] = bd;\n \n+\tskb_tx_timestamp(skb);\n+\n \tif (ugeth->p_scheduler) {\n \t\tugeth->cpucount[txQ]++;\n \t\t\/* Indicate to QE that there are more Tx bds ready for\n"} {"commit":"225ca66857cfd4186a2651b60886e5ffe04fd3c2","subject":"Add device ids for Logitech diNovo Laser keyboard and mouse","message":"Add device ids for Logitech diNovo Laser keyboard and mouse\n","repos":"silent-snowman\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/hid2hci.c\n+++ tools\/hid2hci.c\n@@ -224,6 +224,8 @@\n \t{ HCI, 0x046d, 0xc704, switch_logitech },\n \t{ HCI, 0x046d, 0xc705, switch_logitech },\n \t{ HCI, 0x046d, 0xc70a, switch_logitech },\t\/* Logitech diNovo mouse *\/\n+\t{ HCI, 0x046d, 0xc70b, switch_logitech },\t\/* Logitech diNovo Laser keyboard *\/\n+\t{ HCI, 0x046d, 0xc70c, switch_logitech },\t\/* Logitech diNovo Laser mouse *\/\n \t{ HCI, 0x046d, 0xc70e, switch_logitech },\t\/* logitech diNovo keyboard *\/\n \t{ -1 }\n };\n"} {"commit":"07b02d6db034f6d57cc3949659c9a671d1c6ef65","subject":"Name variable need not be that big.","message":"Name variable need not be that big.\n","repos":"vimol\/vimol,ilyak\/vimol,ilyak\/vimol","returncode":0,"stderr":"","license":"unknown","lang":"C","diff":"--- formats.c\n+++ formats.c\n@@ -24,7 +24,7 @@\n {\n \tvec_t xyz;\n \tint i, j, k = 0, natoms = 0;\n-\tchar *buf = NULL, name[128];\n+\tchar *buf = NULL, name[8];\n \n \twhile ((buf = util_next_line(buf, fp)) != NULL) {\n \t\tif (strncasecmp(buf, \"ATOM \", 6) == 0 ||\n@@ -107,7 +107,7 @@\n {\n \tvec_t xyz;\n \tint i, natoms;\n-\tchar *buf = NULL, name[128];\n+\tchar *buf = NULL, name[32];\n \n \tif ((buf = util_next_line(buf, fp)) == NULL)\n \t\treturn (0);\n@@ -122,7 +122,7 @@\n \t\t\treturn (0);\n \t\tmemset(name, 0, sizeof name);\n \t\txyz.x = 0, xyz.y = 0, xyz.z = 0;\n-\t\tif (sscanf(buf, \"%32s%lf%lf%lf\", name,\n+\t\tif (sscanf(buf, \"%31s%lf%lf%lf\", name,\n \t\t &xyz.x, &xyz.y, &xyz.z) != 4) {\n \t\t\tfree(buf);\n \t\t\treturn (0);\n@@ -140,7 +140,7 @@\n \t\t\t\treturn (0);\n \t\t\tmemset(name, 0, sizeof name);\n \t\t\txyz.x = 0, xyz.y = 0, xyz.z = 0;\n-\t\t\tif (sscanf(buf, \"%32s%lf%lf%lf\", name,\n+\t\t\tif (sscanf(buf, \"%31s%lf%lf%lf\", name,\n \t\t\t &xyz.x, &xyz.y, &xyz.z) != 4) {\n \t\t\t\tfree(buf);\n \t\t\t\treturn (0);\n"} {"commit":"2d5fa0198f4bc3b8eef3d8498d9c4200894efa12","subject":"Renaming _StackPop _stack_pop","message":"Renaming _StackPop _stack_pop\n\nUpdating nano kernel functions to follow a consistent naming convention.\nPart of that process is the removal of camelCase naming conventions for the\npreferred_underscore_method.\n\nChange accomplished with the following script:\n\n#!\/bin\/bash\necho \"Searching for ${1} to replace with ${2}\"\nfind . -type f \\( -iname \\*.c -o -iname \\*.h -o -iname \\*.s -o -iname \\*.kconf \\) \\\n -not \\( -path host\/src\/genIdt -prune \\) \\ \\\n -not \\( -path host\/src\/gen_tables -prune \\) \\\n -print | xargs sed -i \"s\/\"${1}\"\/\"${2}\"\/g\"\n\nSigned-off-by: Dan Kalowsky <53619d3d3576bbac1c2d05ecd99970e469cb3398@intel.com>\n","repos":"aceofall\/zephyr-iotos,explora26\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3200,zephyriot\/zephyr,32bitmicro\/zephyr,mirzak\/zephyr-os,bboozzoo\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,Vudentz\/zephyr,bigdinotech\/zephyr,Vudentz\/zephyr,pklazy\/zephyr,pklazy\/zephyr,mbolivar\/zephyr,galak\/zephyr,punitvara\/zephyr,bigdinotech\/zephyr,mirzak\/zephyr-os,ldts\/zephyr,tidyjiang8\/zephyr-doc,mbolivar\/zephyr,32bitmicro\/zephyr,fractalclone\/zephyr-riscv,tidyjiang8\/zephyr-doc,aceofall\/zephyr-iotos,tidyjiang8\/zephyr-doc,ldts\/zephyr,aceofall\/zephyr-iotos,rsalveti\/zephyr,pklazy\/zephyr,punitvara\/zephyr,explora26\/zephyr,kraj\/zephyr,bboozzoo\/zephyr,32bitmicro\/zephyr,zephyrproject-rtos\/zephyr,fractalclone\/zephyr-riscv,GiulianoFranchetto\/zephyr,nashif\/zephyr,pklazy\/zephyr,mbolivar\/zephyr,kraj\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,jamesonwilliams\/zephyr-kernel,holtmann\/zephyr,tidyjiang8\/zephyr-doc,coldnew\/zephyr-project-fork,aceofall\/zephyr-iotos,bigdinotech\/zephyr,bigdinotech\/zephyr,galak\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,runchip\/zephyr-cc3200,jamesonwilliams\/zephyr-kernel,fbsder\/zephyr,rsalveti\/zephyr,Vudentz\/zephyr,nashif\/zephyr,erwango\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,mirzak\/zephyr-os,erwango\/zephyr,mirzak\/zephyr-os,runchip\/zephyr-cc3220,Vudentz\/zephyr,jamesonwilliams\/zephyr-kernel,finikorg\/zephyr,fbsder\/zephyr,mbolivar\/zephyr,coldnew\/zephyr-project-fork,explora26\/zephyr,fbsder\/zephyr,galak\/zephyr,sharronliu\/zephyr,explora26\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,32bitmicro\/zephyr,bboozzoo\/zephyr,coldnew\/zephyr-project-fork,GiulianoFranchetto\/zephyr,ldts\/zephyr,holtmann\/zephyr,holtmann\/zephyr,kraj\/zephyr,bboozzoo\/zephyr,erwango\/zephyr,aceofall\/zephyr-iotos,zephyriot\/zephyr,explora26\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220,tidyjiang8\/zephyr-doc,fractalclone\/zephyr-riscv,holtmann\/zephyr,runchip\/zephyr-cc3220,fbsder\/zephyr,bboozzoo\/zephyr,32bitmicro\/zephyr,ldts\/zephyr,sharronliu\/zephyr,rsalveti\/zephyr,jamesonwilliams\/zephyr-kernel,jamesonwilliams\/zephyr-kernel,runchip\/zephyr-cc3200,finikorg\/zephyr,sharronliu\/zephyr,runchip\/zephyr-cc3220,punitvara\/zephyr,sharronliu\/zephyr,finikorg\/zephyr,fbsder\/zephyr,punitvara\/zephyr,fractalclone\/zephyr-riscv,rsalveti\/zephyr,GiulianoFranchetto\/zephyr,erwango\/zephyr,nashif\/zephyr,zephyriot\/zephyr,pklazy\/zephyr,galak\/zephyr,Vudentz\/zephyr,nashif\/zephyr,punitvara\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,runchip\/zephyr-cc3220,rsalveti\/zephyr,mirzak\/zephyr-os,holtmann\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,kraj\/zephyr,runchip\/zephyr-cc3200,coldnew\/zephyr-project-fork,erwango\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,coldnew\/zephyr-project-fork","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/nanokernel\/core\/nano_stack.c\n+++ kernel\/nanokernel\/core\/nano_stack.c\n@@ -173,13 +173,13 @@\n \tirq_unlock_inline(imask);\n }\n \n-FUNC_ALIAS(_StackPop, nano_isr_stack_pop, int);\n-FUNC_ALIAS(_StackPop, nano_fiber_stack_pop, int);\n-FUNC_ALIAS(_StackPop, nano_task_stack_pop, int);\n-\n-\/*******************************************************************************\n-*\n-* _StackPop - pop data from a nanokernel stack\n+FUNC_ALIAS(_stack_pop, nano_isr_stack_pop, int);\n+FUNC_ALIAS(_stack_pop, nano_fiber_stack_pop, int);\n+FUNC_ALIAS(_stack_pop, nano_task_stack_pop, int);\n+\n+\/*******************************************************************************\n+*\n+* _stack_pop - pop data from a nanokernel stack\n *\n * Pop the first data word from a nanokernel stack object; it may be called\n * from a fiber, task, or ISR context.\n@@ -198,7 +198,7 @@\n * migration issue.\n *\/\n \n-int _StackPop(struct nano_stack *chan, \/* channel on which to interact *\/\n+int _stack_pop(struct nano_stack *chan, \/* channel on which to interact *\/\n \t\t\t uint32_t *pData \/* container for data to pop *\/\n \t\t\t )\n {\n"} {"commit":"3fd70943902dc20861c4bae4f8d96caddf51805a","subject":"adds inheritance","message":"adds inheritance\n","repos":"califrench\/Scoreboard","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- scoreboard.h\n+++ scoreboard.h\n@@ -5,13 +5,14 @@\n *\/\n \n #include <vector>\n+#include \"IScoreboard.h\"\n \n using namespace std;\n \n #ifndef SCOREBOARD_H_\n #define SCOREBOARD_H_\n \n-class Scoreboard\n+class Scoreboard : public IScoreboard\n {\n public:\n \/*\n@@ -44,4 +45,4 @@\n private:\n vector<vector<int> >scores;\n };\n-#endif \/* SCOREBOARD_H_ *\/+#endif \/* SCOREBOARD_H_ *\/\n"} {"commit":"b3a0aa3ae1c0889ffe8abb2e326d5c74c7c9c097","subject":"rtc-puv3: solve section mismatch in rtc-puv3.c","message":"rtc-puv3: solve section mismatch in rtc-puv3.c\n\nThe patch renames puv3_rtcdrv to puv3_rtc_driver, so that modpost will know\nthat this is simply a list of pointers to driver functions, in which case\nthe section mismatch is OK. (Thanks Michal Marek)\n\nCc: Axel Lin <axel.lin@gmail.com>\nCc: Michal Marek <mmarek@suse.cz>\nCc: Arnd Bergmann <arnd@arndb.de>\nCc: Alessandro Zummo <a.zummo@towertech.it>\nCc: rtc-linux@googlegroups.com\nSigned-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>\n\n--\nSection mismatch warning information:\n\nWARNING: drivers\/rtc\/built-in.o(.data+0x90): Section mismatch in\nreference from the variable puv3_rtcdrv to the\nfunction .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux\/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers\/rtc\/built-in.o(.data+0x94): Section mismatch in\nreference from the variable puv3_rtcdrv to the\nfunction .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux\/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers\/built-in.o(.data+0x6c04): Section mismatch in reference\nfrom the variable puv3_rtcdrv to the\nfunction .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux\/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: drivers\/built-in.o(.data+0x6c08): Section mismatch in reference\nfrom the variable puv3_rtcdrv to the\nfunction .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux\/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: vmlinux.o(.data+0x1126c): Section mismatch in reference from\nthe variable puv3_rtcdrv to the function .devinit.text:puv3_rtc_probe()\nThe variable puv3_rtcdrv references\nthe function __devinit puv3_rtc_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux\/init.h) or name the\nvariable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n\nWARNING: vmlinux.o(.data+0x11270): Section mismatch in reference from\nthe variable puv3_rtcdrv to the function .devexit.text:puv3_rtc_remove()\nThe variable puv3_rtcdrv references\nthe function __devexit puv3_rtc_remove()\nIf the reference is valid then annotate the\nvariable with __exit* (see linux\/init.h) or name the variable:\n*driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one,\n*_console\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/rtc\/rtc-puv3.c\n+++ drivers\/rtc\/rtc-puv3.c\n@@ -326,7 +326,7 @@\n #define puv3_rtc_resume NULL\n #endif\n \n-static struct platform_driver puv3_rtcdrv = {\n+static struct platform_driver puv3_rtc_driver = {\n \t.probe\t\t= puv3_rtc_probe,\n \t.remove\t\t= __devexit_p(puv3_rtc_remove),\n \t.suspend\t= puv3_rtc_suspend,\n@@ -337,7 +337,7 @@\n \t}\n };\n \n-module_platform_driver(puv3_rtcdrv);\n+module_platform_driver(puv3_rtc_driver);\n \n MODULE_DESCRIPTION(\"RTC Driver for the PKUnity v3 chip\");\n MODULE_AUTHOR(\"Hu Dongliang\");\n"} {"commit":"a5e9ca573b5fe47aef30e9c33c31b5fe7b0dfb88","subject":"s390\/cio: fix memleak in channel measurement","message":"s390\/cio: fix memleak in channel measurement\n\nThe measurement block for the extended measurement data is not freed when\nswitching off per device measurement. Free the measurement block after HW\nstopped accessing it.\n\nSigned-off-by: Sebastian Ott <34be3ca399e9e73d80098c083a5b58614c3ca6da@linux.vnet.ibm.com>\nReviewed-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\nReviewed-by: Cornelia Huck <94980dd689360e06f79e918bf71ea5fed7a2bc63@de.ibm.com>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b74030f051bd5a4a9b48fd0d1f3d0c334cb5f8f7","subject":"fs: Mark alloc_fd with EXPORT_SYMBOL","message":"fs: Mark alloc_fd with EXPORT_SYMBOL\n\nmark alloc_fd with EXPORT_SYMBOL so it can be used by modules.\n\nChange-Id: Ic0dedbadecd2d0937cad8268aaa6eabbc52019ff\nSigned-off-by: Jordan Crouse <fec53db8c4887e6e95defbb5052bc6438029c1e6@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/file.c\n+++ fs\/file.c\n@@ -520,6 +520,7 @@\n {\n \treturn __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);\n }\n+EXPORT_SYMBOL(alloc_fd);\n \n int get_unused_fd_flags(unsigned flags)\n {\n"} {"commit":"9e669d327a873bbab51e7e95ee9f9c3c49755594","subject":"lcs: invalid return codes from hard_start_xmit.","message":"lcs: invalid return codes from hard_start_xmit.\n\nLcs hard_start_xmit routine issued return codes other than\ndefined for this interface. Now lcs returns only either\nNETDEV_TX_OK or NETDEV_TX_BUSY.\n\nSigned-off-by: Klaus-Dieter Wacker <918513dd2744cee2b80d5e68037ab762f2374248@de.ibm.com>\nSigned-off-by: Ursula Braun <3498481c3b1fee38251ffe7b781cda34b574142e@de.ibm.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/s390\/net\/lcs.c\n+++ drivers\/s390\/net\/lcs.c\n@@ -1562,7 +1562,7 @@\n \tif (skb == NULL) {\n \t\tcard->stats.tx_dropped++;\n \t\tcard->stats.tx_errors++;\n-\t\treturn -EIO;\n+\t\treturn 0;\n \t}\n \tif (card->state != DEV_STATE_UP) {\n \t\tdev_kfree_skb(skb);\n@@ -1587,7 +1587,7 @@\n \t\tcard->tx_buffer = lcs_get_buffer(&card->write);\n \t\tif (card->tx_buffer == NULL) {\n \t\t\tcard->stats.tx_dropped++;\n-\t\t\trc = -EBUSY;\n+\t\t\trc = NETDEV_TX_BUSY;\n \t\t\tgoto out;\n \t\t}\n \t\tcard->tx_buffer->callback = lcs_txbuffer_cb;\n"} {"commit":"e70d09f3bfec1aa404f3e8d411e9ad6041930aa1","subject":"git: refine diff fuzzer (#8728)","message":"git: refine diff fuzzer (#8728)\n\n- Enable more calls to diff\r\n- Add environment variable specifying git template dir","repos":"skia-dev\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz,skia-dev\/oss-fuzz,google\/oss-fuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- projects\/git\/fuzz-cmd-diff.c\n+++ projects\/git\/fuzz-cmd-diff.c\n@@ -65,6 +65,8 @@\n putenv(\"GIT_COMMITTER_NAME=FUZZ\");\n putenv(\"GIT_COMMITTER_EMAIL=FUZZ@LOCALHOST\");\n \n+ putenv(\"GIT_TEMPLATE_DIR=\/tmp\/\");\n+\n putenv(\"GIT_CONFIG_GLOBAL=\/tmp\/.my_gitconfig\");\n \tsystem(\"rm -rf .\/.git\");\n \tsystem(\"rm -rf .\/TEMP-*\");\n@@ -163,10 +165,12 @@\n \t\trepo_clear(the_repository);\n \t\treturn 0;\n \t}\n- \/*\n \targv[1] = \"HEAD\";\n \targv[2] = NULL;\n-\tcmd_diff(2, (const char **)argv, (const char *)\"\");\n+\tif (cmd_diff(2, (const char **)argv, (const char *)\"\")) {\n+ repo_clear(the_repository);\n+ return 0;\n+ }\n \targv[1] = \"--cached\";\n \targv[2] = NULL;\n \tcmd_diff(2, (const char **)argv, (const char *)\"\");\n@@ -185,12 +189,11 @@\n \targv[1] = \"master\";\n \targv[2] = \"new_branch\";\n \targv[3] = NULL;\n- \t cmd_diff(3, (const char **)argv, (const char *)\"\");\n- *\/\n-\t\/*\n+ \tcmd_diff(3, (const char **)argv, (const char *)\"\");\n+\n+ \/*\n * Calling git diff-files command\n *\/\n- \/*\n \targv[0] = \"diff-files\";\n \targv[1] = NULL;\n \tcmd_diff_files(1, (const char **)argv, (const char *)\"\");\n@@ -200,11 +203,10 @@\n \targv[2] = \"TEMP_2\";\n \targv[3] = NULL;\n \tcmd_diff_files(3, (const char **)argv, (const char *)\"\");\n- *\/\n+\n \/*\n * Calling git diff-tree command\n *\/\n- \/*\n \targv[0] = \"diff-tree\";\n \targv[1] = \"master\";\n \targv[2] = \"--\";\n@@ -216,11 +218,10 @@\n \targv[3] = \"--\";\n \targv[4] = NULL;\n \tcmd_diff_tree(4, (const char **)argv, (const char *)\"\");\n- *\/\n+\n \/*\n * Calling git diff-index command\n *\/\n- \/*\n \targv[0] = \"diff-index\";\n \targv[1] = \"master\";\n \targv[2] = \"--\";\n@@ -235,7 +236,7 @@\n \targv[4] = \"TEMP_4\";\n \targv[5] = NULL;\n \tcmd_diff_index(5, (const char **)argv, (const char *)\"\");\n- *\/\n+\n \trepo_clear(the_repository);\n \treturn 0;\n }\n"} {"commit":"9575635bba42998e833c6694a3effc3ca0f50cab","subject":"redraw animated rect","message":"redraw animated rect\n","repos":"gregoiresage\/pebble-gbitmap-lib,gregoiresage\/pebble-gbitmap-lib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/flip_clock\/src\/flip_layer.c\n+++ examples\/flip_clock\/src\/flip_layer.c\n@@ -33,7 +33,9 @@\n \n static void layer_update_callback(Layer *me, GContext* ctx) {\n \tgraphics_context_set_compositing_mode(ctx, GCompOpAssignInverted);\n-\t\n+\n+\tgraphics_context_set_stroke_color(ctx, GColorWhite);\n+\n \tFlipLayer* flip_layer = *(FlipLayer**)(layer_get_data(me));\n \tGRect layer_bounds = layer_get_bounds(me);\n \tif(flip_layer->up_image){\n@@ -58,7 +60,7 @@\n \t\tgraphics_draw_bitmap_in_rect(ctx, flip_layer->anim_resized_image, (GRect) { .origin = origin, .size = bounds.size });\n \t\tgraphics_draw_rect(ctx, (GRect) { .origin = { 0, flip_layer->anim_image_y }, .size = { layer_bounds.size.w, bounds.size.h } });\n \t}\n-\tgraphics_context_set_stroke_color(ctx, GColorWhite);\n+\t\n \tgraphics_draw_round_rect(ctx, GRect(0,0,layer_bounds.size.w,layer_bounds.size.h), 7);\n \tgraphics_context_set_stroke_color(ctx, GColorWhite);\n \tgraphics_draw_line(ctx, GPoint(1, layer_bounds.size.h\/2 - 1), GPoint(layer_bounds.size.w-1, layer_bounds.size.h\/2 - 1));\n"} {"commit":"5bbda4e4aca4591c85ee53dea157ca5fc9a23306","subject":"sh: intc: Prefer IRQCHIP_SKIP_SET_WAKE over a dummy set_wake callback.","message":"sh: intc: Prefer IRQCHIP_SKIP_SET_WAKE over a dummy set_wake callback.\n\nIt's possible to use IRQCHIP_SKIP_SET_WAKE to get the behaviour that\nwe're after, without having to bother with a dummy ->set_wake() callback\nfor the IRQ chip.\n\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"90a646c770c50cc206ceba0d7b50453c46c13c36","subject":"usb: Do not allow usb_alloc_streams on unconfigured devices","message":"usb: Do not allow usb_alloc_streams on unconfigured devices\n\nThis commit fixes the following oops:\n\n[10238.622067] scsi host3: uas_eh_bus_reset_handler start\n[10240.766164] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd\n[10245.779365] usb 3-4: device descriptor read\/8, error -110\n[10245.883331] usb 3-4: reset SuperSpeed USB device number 3 using xhci_hcd\n[10250.897603] usb 3-4: device descriptor read\/8, error -110\n[10251.058200] BUG: unable to handle kernel NULL pointer dereference at 0000000000000040\n[10251.058244] IP: [<ffffffff815ac6e1>] xhci_check_streams_endpoint+0x91\/0x140\n<snip>\n[10251.059473] Call Trace:\n[10251.059487] [<ffffffff815aca6c>] xhci_calculate_streams_and_bitmask+0xbc\/0x130\n[10251.059520] [<ffffffff815aeb5f>] xhci_alloc_streams+0x10f\/0x5a0\n[10251.059548] [<ffffffff810a4685>] ? check_preempt_curr+0x75\/0xa0\n[10251.059575] [<ffffffff810a46dc>] ? ttwu_do_wakeup+0x2c\/0x100\n[10251.059601] [<ffffffff810a49e6>] ? ttwu_do_activate.constprop.111+0x66\/0x70\n[10251.059635] [<ffffffff815779ab>] usb_alloc_streams+0xab\/0xf0\n[10251.059662] [<ffffffffc0616b48>] uas_configure_endpoints+0x128\/0x150 [uas]\n[10251.059694] [<ffffffffc0616bac>] uas_post_reset+0x3c\/0xb0 [uas]\n[10251.059722] [<ffffffff815727d9>] usb_reset_device+0x1b9\/0x2a0\n[10251.059749] [<ffffffffc0616f42>] uas_eh_bus_reset_handler+0xb2\/0x190 [uas]\n[10251.059781] [<ffffffff81514293>] scsi_try_bus_reset+0x53\/0x110\n[10251.059808] [<ffffffff815163b7>] scsi_eh_bus_reset+0xf7\/0x270\n<snip>\n\nThe problem is the following call sequence (simplified):\n\n1) usb_reset_device\n2) usb_reset_and_verify_device\n2) hub_port_init\n3) hub_port_finish_reset\n3) xhci_discover_or_reset_device\n This frees xhci->devs[slot_id]->eps[ep_index].ring for all eps but 0\n4) usb_get_device_descriptor\n This fails\n5) hub_port_init fails\n6) usb_reset_and_verify_device fails, does not restore device config\n7) uas_post_reset\n8) xhci_alloc_streams\n NULL deref on the free-ed ring\n\nThis commit fixes this by not allowing usb_alloc_streams to continue if\nthe device is not configured.\n\nNote that we do allow usb_free_streams to continue after a (logical)\ndisconnect, as it is necessary to explicitly free the streams at the xhci\ncontroller level.\n\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\nAcked-by: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"77571f05a483c0259e42ba2f482c82debc9a63af","subject":"USB: fix bug in usb_unlink_anchored_urbs()","message":"USB: fix bug in usb_unlink_anchored_urbs()\n\nIrqs must not accidentally be reenabled.\n\nSigned-off-by: Oliver Neukum <bfee72d94d376f4e00f72b756466867d7f9eb24e@suse.de>\nAcked-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/core\/urb.c\n+++ drivers\/usb\/core\/urb.c\n@@ -601,15 +601,20 @@\n void usb_unlink_anchored_urbs(struct usb_anchor *anchor)\n {\n \tstruct urb *victim;\n-\n-\tspin_lock_irq(&anchor->lock);\n+\tunsigned long flags;\n+\n+\tspin_lock_irqsave(&anchor->lock, flags);\n \twhile (!list_empty(&anchor->urb_list)) {\n \t\tvictim = list_entry(anchor->urb_list.prev, struct urb,\n \t\t\t\t anchor_list);\n+\t\tusb_get_urb(victim);\n+\t\tspin_unlock_irqrestore(&anchor->lock, flags);\n \t\t\/* this will unanchor the URB *\/\n \t\tusb_unlink_urb(victim);\n-\t}\n-\tspin_unlock_irq(&anchor->lock);\n+\t\tusb_put_urb(victim);\n+\t\tspin_lock_irqsave(&anchor->lock, flags);\n+\t}\n+\tspin_unlock_irqrestore(&anchor->lock, flags);\n }\n EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs);\n \n"} {"commit":"659179b28f15ab1b1db5f8767090f5e728f115a1","subject":"fbdev: export symbol fb_mode_option","message":"fbdev: export symbol fb_mode_option\n\nFrame buffer and mode setting drivers can be built as modules,\nso fb_mode_option needs to be exported to support these.\n\nPrevents this error:\n\n ERROR: \"fb_mode_option\" [drivers\/ps3\/ps3av_mod.ko] undefined!\n\nSigned-off-by: Geoff Levand <058b6ffe73540731b6df5cbcf27480d0bdbf7afb@am.sony.com>\nAcked-by: Geert Uytterhoeven <205f5bcb2ea42515c4425a82ddba45c7ca0f2905@sonycom.com>\nCc: Krzysztof Helt <e36322531041744f35a39a40f0faffcfb5b388ff@poczta.fm>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/modedb.c\n+++ drivers\/video\/modedb.c\n@@ -28,6 +28,7 @@\n #endif\n \n const char *fb_mode_option;\n+EXPORT_SYMBOL_GPL(fb_mode_option);\n \n \/*\n * Standard video mode definitions (taken from XFree86)\n"} {"commit":"384c3041aeaf77d299b0d4a62481850fed86e53b","subject":"viafb: replace inb\/outb","message":"viafb: replace inb\/outb\n\nviafb: replace inb\/outb\n\nThis patch replaces occurences of inb\/outb with via_write_reg and\nvia_write_reg_mask where this is possible to improve code\nreadability.\n\nSigned-off-by: Florian Tobias Schandinat <9843642cd7809d7c6d8c25ac9e4b0e2f1b5283bf@gmx.de>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/via\/hw.c\n+++ drivers\/video\/via\/hw.c\n@@ -1008,16 +1008,12 @@\n void viafb_write_regx(struct io_reg RegTable[], int ItemNum)\n {\n \tint i;\n-\tunsigned char RegTemp;\n \n \t\/*DEBUG_MSG(KERN_INFO \"Table Size : %x!!\\n\",ItemNum ); *\/\n \n-\tfor (i = 0; i < ItemNum; i++) {\n-\t\toutb(RegTable[i].index, RegTable[i].port);\n-\t\tRegTemp = inb(RegTable[i].port + 1);\n-\t\tRegTemp = (RegTemp & (~RegTable[i].mask)) | RegTable[i].value;\n-\t\toutb(RegTemp, RegTable[i].port + 1);\n-\t}\n+\tfor (i = 0; i < ItemNum; i++)\n+\t\tvia_write_reg_mask(RegTable[i].port, RegTable[i].index,\n+\t\t\tRegTable[i].value, RegTable[i].mask);\n }\n \n void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga)\n@@ -2130,10 +2126,8 @@\n \toutb(VPIT.Misc, VIAWMisc);\n \n \t\/* Write Sequencer *\/\n-\tfor (i = 1; i <= StdSR; i++) {\n-\t\toutb(i, VIASR);\n-\t\toutb(VPIT.SR[i - 1], VIASR + 1);\n-\t}\n+\tfor (i = 1; i <= StdSR; i++)\n+\t\tvia_write_reg(VIASR, i, VPIT.SR[i - 1]);\n \n \tviafb_write_reg_mask(0x15, VIASR, 0xA2, 0xA2);\n \tviafb_set_iga_path();\n@@ -2142,10 +2136,8 @@\n \tviafb_fill_crtc_timing(crt_timing, vmode_tbl, video_bpp \/ 8, IGA1);\n \n \t\/* Write Graphic Controller *\/\n-\tfor (i = 0; i < StdGR; i++) {\n-\t\toutb(i, VIAGR);\n-\t\toutb(VPIT.GR[i], VIAGR + 1);\n-\t}\n+\tfor (i = 0; i < StdGR; i++)\n+\t\tvia_write_reg(VIAGR, i, VPIT.GR[i]);\n \n \t\/* Write Attribute Controller *\/\n \tfor (i = 0; i < StdAR; i++) {\n"} {"commit":"91fe6534da765d6f32dd070f3617526596244429","subject":"drivers: wifi: esp: Fix wifi-reset-gpios handling","message":"drivers: wifi: esp: Fix wifi-reset-gpios handling\n\nwifi-reset-gpios is currently ignored after conversion to DT_INST\nmacros. Use wifi_reset_gpios instead of reset_gpios to fix the problem.\n\nFixes: a464ae7163a7 (\"drivers: wifi: esp: Convert to new DT_INST\n macros\")\nSigned-off-by: Marcin Niestroj <63506c06cfbc47ace147db1702f6e751f5ac2132@grinn-global.com>\n","repos":"Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,finikorg\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,Vudentz\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,galak\/zephyr,galak\/zephyr,nashif\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/wifi\/esp\/esp.c\n+++ drivers\/wifi\/esp\/esp.c\n@@ -28,16 +28,16 @@\n \n \/* pin settings *\/\n enum modem_control_pins {\n-#if DT_INST_NODE_HAS_PROP(0, reset_gpios)\n+#if DT_INST_NODE_HAS_PROP(0, wifi_reset_gpios)\n \tWIFI_RESET,\n #endif\n \tNUM_PINS,\n };\n \n static struct modem_pin modem_pins[] = {\n-#if DT_INST_NODE_HAS_PROP(0, reset_gpios)\n-\tMODEM_PIN(DT_INST_GPIO_LABEL(0, reset_gpios),\n-\t\t DT_INST_GPIO_PIN(0, reset_gpios),\n+#if DT_INST_NODE_HAS_PROP(0, wifi_reset_gpios)\n+\tMODEM_PIN(DT_INST_GPIO_LABEL(0, wifi_reset_gpios),\n+\t\t DT_INST_GPIO_PIN(0, wifi_reset_gpios),\n \t\t GPIO_OUTPUT),\n #endif\n };\n@@ -744,7 +744,7 @@\n \t\tnet_if_down(dev->net_iface);\n \t}\n \n-#if DT_INST_NODE_HAS_PROP(0, reset_gpios)\n+#if DT_INST_NODE_HAS_PROP(0, wifi_reset_gpios)\n \tmodem_pin_write(&dev->mctx, WIFI_RESET, 0);\n \tk_sleep(K_MSEC(100));\n \tmodem_pin_write(&dev->mctx, WIFI_RESET, 1);\n"} {"commit":"b8fe18136835de38b79ac491103c810f4a8741ce","subject":"Create gamelib.h","message":"Create gamelib.h","repos":"ftfetter\/The-1024-Game","returncode":1,"stderr":"error: pathspec 'gamelib.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- gamelib.h\n+++ gamelib.h\n@@ -0,0 +1,49 @@\n+#define TAM 45 \t\t\t\t\/\/tamanho da string 'name'\n+\n+typedef struct player_struct\n+{\n+\tchar name[TAM];\t\t\t\/\/nome do jogador\n+\tint score;\t\t\t\/\/pontua\u00e7\u00e3o do jogador\n+\tint win;\t\t\t\/\/booleano que indica se o player ganhou(!=0) ou n\u00e3o(==0)\n+} player;\t\n+\n+typedef struct block_struct\n+{\n+\tint color;\t\t\t\/\/valor da cor do bloco\n+\tint valor;\t\t\t\/\/valor contido no bloco para a soma\n+} block;\n+\n+typedef struct coordinate_struct\n+{\n+\tint x;\t\t\t\t\/\/coordenada x do console\n+\tint y;\t\t\t\t\/\/coordenada y do console\n+} coordinate;\n+\n+\/\/fun\u00e7\u00e3o para ler os atributos do jogador\n+\/\/readPlayer() -> player\n+player readPlayer();\n+\n+\/\/fun\u00e7\u00e3o para ler os atributos do bloco\n+\/\/readBlock() -> block\n+block readBlock();\n+\n+\/\/fun\u00e7\u00e3o para imprimir os atributos do jogador\n+\/\/printPlayer(player) -> \"Nome: <player.name> || Pontuacao: <player.score> || Ganhou? Sim\/Nao\" (dependendo do valor de <player.win>)\n+void printPlayer(player plyr);\n+\n+\/\/fun\u00e7\u00e3o para imprimir os atributos do bloco\n+\/\/printBlock(block) -> \"Cor: <block.color> || Valor: <block.valor>\"\n+void printBlock(block blck);\n+\n+\/\/fun\u00e7\u00e3o que soma a pontua\u00e7\u00e3o do jogador\n+\/\/addScore(player,integer) -> <player.score> = <player.score> + integer\n+void addScore(player plyr, int score);\n+\n+\/\/fun\u00e7\u00e3o que adiciona um bloco na tela\n+\/\/addBlock(coordinate,integer1,integer2,block) -> bloco de tamanho integer1xinteger2, cor <block.color> e valor <block.valor>\n+void addBlock(coordinate coord, int height, int width, block blck);\n+\n+\/\/fun\u00e7\u00e3o que mostra todos os jogadores que pontuaram mais que um determinado valor\n+\/\/showPlayers(player[],integer1,integer2) -> \"<player.name>\" de player[integer2] cuja pontuacao >= integer1\n+void showPlayers(player vecPlyr[], int score, int qntPlyr);\n+\n"} {"commit":"68017fbdfd41bc42e929c2ea4d717f58cd17309b","subject":"silence MSVC warnings","message":"silence MSVC warnings\n","repos":"mtwilliams\/libgamepad,mtwilliams\/libgamepad,elanthis\/gamepad","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gamepad.c\n+++ gamepad.c\n@@ -61,12 +61,16 @@\n \/* State of the four gamepads *\/\r\n static struct GamepadState STATE[4];\r\n \r\n+#if defined(WIN32)\r\n+void GamepadInit() {\r\n+\tmemset(STATE, 0, sizeof(STATE));\r\n+}\r\n+#else\r\n void GamepadInit() {\r\n \tint i;\r\n \r\n \tmemset(STATE, 0, sizeof(STATE));\r\n \r\n-#if !defined(WIN32)\r\n \tfor (i = 0; i != GAMEPAD_COUNT; ++i) {\r\n \t\tchar dev[128];\r\n \t\tsnprintf(dev, sizeof(dev), \"\/dev\/input\/js%d\", i);\r\n@@ -75,12 +79,12 @@\n \t\t\tSTATE[i].flags |= FLAG_CONNECTED;\r\n \t\t}\r\n \t}\r\n-#endif\r\n-}\r\n+}\r\n+#endif\r\n \r\n void GamepadShutdown() {\r\n+#if !defined(WIN32)\r\n \tint i;\r\n-#if !defined(WIN32)\r\n \tfor (i = 0; i != GAMEPAD_COUNT; ++i) {\r\n \t\tif (STATE[i].fd != -1) {\r\n \t\t\tclose(STATE[i].fd);\r\n@@ -92,7 +96,7 @@\n \/* Update stick info *\/\r\n static void GamepadUpdateStick(GAMEPAD_AXIS* axis, float deadzone) {\r\n \t\/\/ determine magnitude of stick\r\n-\taxis->length = sqrtf(axis->x*axis->x + axis->y*axis->y);\r\n+\taxis->length = sqrtf((float)(axis->x*axis->x) + (float)(axis->y*axis->y));\r\n \r\n \tif (axis->length > deadzone) {\r\n \t\t\/\/ clamp length to maximum value\r\n@@ -109,7 +113,7 @@\n \t\taxis->length \/= (32767.0f - deadzone);\r\n \r\n \t\t\/\/ find angle of stick in radians\r\n-\t\taxis->angle = atan2f(axis->y, axis->x);\r\n+\t\taxis->angle = atan2f((float)axis->y, (float)axis->x);\r\n \t} else {\r\n \t\taxis->x = axis->y = 0;\r\n \t\taxis->nx = axis->ny = 0.0f;\r\n"} {"commit":"0dc811ba2529815d1193e7c7119f74bb74eb7e73","subject":"minor header cleanup","message":"minor header cleanup\n","repos":"elanthis\/gamepad,mtwilliams\/libgamepad,mtwilliams\/libgamepad","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gamepad.h\n+++ gamepad.h\n@@ -67,9 +67,9 @@\n #define\tGAMEPAD_DEADZONE_RIGHT_STICK\t8689\t\r\n #define GAMEPAD_DEADZONE_TRIGGER\t\t30\r\n \r\n-extern void\t\tGamepadInit();\r\n-extern void\t\tGamepadShutdown();\r\n-extern void\t\tGamepadUpdate();\r\n+extern void\t\tGamepadInit\t\t\t\t(void);\r\n+extern void\t\tGamepadShutdown\t\t\t(void);\r\n+extern void\t\tGamepadUpdate\t\t\t(void);\r\n \r\n extern int\t\tGamepadIsConnected\t\t(GAMEPAD_DEVICE device);\r\n \r\n"} {"commit":"a507504c0ce8944b71db415b316d0664dd4786fe","subject":"reverting changeset 9d29280ca32e to make room for different (better?) solution","message":"reverting changeset 9d29280ca32e to make room for different (better?) solution\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- gdk\/gdk.h\n+++ gdk\/gdk.h\n@@ -2970,22 +2970,19 @@\n *\/\n #define HASHlooploc(bi, h, hb, v)\t\t\t\t\\\n \tfor (hb = HASHget(h, HASHprobe(h, v));\t\t\t\\\n-\t TRUE;\t\t\t\t\t\\\n+\t hb != HASHnil(h);\t\t\t\t\t\\\n \t hb = HASHgetlink(h,hb))\t\t\t\t\\\n-\t\tif ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \\\n \t\tif (ATOMcmp(h->type, v, BUNhloc(bi, hb)) == 0)\n #define HASHloopvar(bi, h, hb, v)\t\t\t\t\\\n \tfor (hb = HASHget(h,HASHprobe(h, v));\t\t\t\\\n-\t TRUE;\t\t\t\t\t\\\n+\t hb != HASHnil(h);\t\t\t\t\t\\\n \t hb = HASHgetlink(h,hb))\t\t\t\t\\\n-\t\tif ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \\\n \t\tif (ATOMcmp(h->type, v, BUNhvar(bi, hb)) == 0)\n \n #define HASHloop_TYPE(bi, h, hb, v, TYPE)\t\t\t\\\n \tfor (hb = HASHget(h, hash_##TYPE(h, v));\t\t\t\\\n-\t TRUE;\t\t\t\t\t\\\n+\t hb != HASHnil(h);\t\t\t\t\t\\\n \t hb = HASHgetlink(h,hb))\t\t\t\t\\\n-\t\tif ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \\\n \t\tif (simple_EQ(v, BUNhloc(bi, hb), TYPE))\n \n #define HASHloop_bit(bi, h, hb, v)\tHASHloop_TYPE(bi, h, hb, v, bte)\n@@ -3002,9 +2999,8 @@\n \n #define HASHloop_any(bi, h, hb, v)\t\t\t\t\\\n \tfor (hb = HASHget(h, hash_any(h, v));\t\t\t\\\n-\t TRUE;\t\t\t\t\t\\\n+\t hb != HASHnil(h);\t\t\t\t\t\\\n \t hb = HASHgetlink(h,hb))\t\t\t\t\\\n-\t\tif ( hb == HASHnil(h) ){ hb = BUN_NONE; break;} else \\\n \t\tif (atom_EQ(v, BUNhead(bi, hb), (bi).b->htype))\n \n \/*\n"} {"commit":"4533f8745d75c1c00bcc98fa48363665a2d1d910","subject":"extend unicode cclass functions to latin1 range","message":"extend unicode cclass functions to latin1 range\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@9750 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- charset\/unicode.c\n+++ charset\/unicode.c\n@@ -270,10 +270,10 @@\n }\n return 0;\n #else\n- if (codepoint >= 128)\n+ if (codepoint >= 256)\n real_exception(interpreter, NULL, E_LibraryNotLoadedError,\n \"no ICU lib loaded\");\n- return (Parrot_ascii_typetable[codepoint] & flags) ? 1 : 0;\n+ return (Parrot_iso_8859_1_typetable[codepoint] & flags) ? 1 : 0;\n #endif\n }\n \n@@ -299,10 +299,10 @@\n return pos;\n }\n #else\n- if (codepoint >= 128)\n+ if (codepoint >= 256)\n real_exception(interpreter, NULL, E_LibraryNotLoadedError,\n \"no ICU lib loaded\");\n- if ((Parrot_ascii_typetable[codepoint] & flags) != 0) {\n+ if ((Parrot_iso_8859_1_typetable[codepoint] & flags) != 0) {\n return pos;\n }\n #endif\n@@ -332,10 +332,10 @@\n return pos;\n }\n #else\n- if (codepoint >= 128)\n+ if (codepoint >= 256)\n real_exception(interpreter, NULL, E_LibraryNotLoadedError,\n \"no ICU lib loaded\");\n- if ((Parrot_ascii_typetable[codepoint] & flags) != 0) {\n+ if ((Parrot_iso_8859_1_typetable[codepoint] & flags) != 0) {\n return pos;\n }\n #endif\n"} {"commit":"bdd20954ba0149d85724414c09230040e32cee53","subject":"Added cache error msg default","message":"Added cache error msg default\n","repos":"endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- tpcachesv\/mgt.c\n+++ tpcachesv\/mgt.c\n@@ -590,6 +590,11 @@\n \n out:\n \n+ if (EXSUCCEED!=ret && !Bpres(p_ub, EX_TPERRNO, 0))\n+ {\n+ REJECT(p_ub, TPESYSTEM, \"Operation failed, see logs\");\n+ }\n+\n tpreturn( ret==EXSUCCEED?TPSUCCESS:TPFAIL,\n 0L,\n (char *)p_ub,\n@@ -597,4 +602,5 @@\n 0L);\n \n }\n+\n \/* vim: set ts=4 sw=4 et smartindent: *\/\n"} {"commit":"25696d67e3cdf49fcc45fd6123fb906327388db1","subject":"Add tests for dconf utilities","message":"Add tests for dconf utilities\n\nCloses: #2880\nApproved by: alexlarsson\n","repos":"flatpak\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,flatpak\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/testcommon.c\n+++ tests\/testcommon.c\n@@ -1089,6 +1089,52 @@\n g_assert_cmpint (flatpak_filters_allow_ref (allow_refs, deny_refs, filter_refs[i].ref), ==, filter_refs[i].expected_result);\n }\n \n+static void\n+test_dconf_app_id (void)\n+{\n+ struct {\n+ const char *app_id;\n+ const char *path;\n+ } tests[] = {\n+ { \"org.gnome.Builder\", \"\/org\/gnome\/Builder\/\" },\n+ { \"org.gnome.builder\", \"\/org\/gnome\/builder\/\" },\n+ { \"org.gnome.builder-2\", \"\/org\/gnome\/builder-2\/\" },\n+ };\n+ int i;\n+\n+ for (i = 0; i < G_N_ELEMENTS (tests); i++)\n+ {\n+ g_autofree char *path = NULL;\n+\n+ path = flatpak_dconf_path_for_app_id (tests[i].app_id);\n+ g_assert_cmpstr (path, ==, tests[i].path);\n+ }\n+}\n+\n+static void\n+test_dconf_paths (void)\n+{\n+ struct {\n+ const char *path1;\n+ const char *path2;\n+ gboolean result;\n+ } tests[] = {\n+ { \"\/org\/gnome\/Builder\/\", \"\/org\/gnome\/builder\/\", 1 },\n+ { \"\/org\/gnome\/Builder-2\/\", \"\/org\/gnome\/Builder_2\/\", 1 },\n+ { \"\/org\/gnome\/Builder\/\", \"\/org\/gnome\/Builder\", 0 },\n+ { \"\/org\/gnome\/Builder\/\", \"\/org\/gnome\/Buildex\/\", 0 },\n+ };\n+ int i;\n+\n+ for (i = 0; i < G_N_ELEMENTS (tests); i++)\n+ {\n+ gboolean result;\n+\n+ result = flatpak_dconf_path_is_similar (tests[i].path1, tests[i].path2);\n+ g_assert_cmpint (result, ==, tests[i].result);\n+ }\n+}\n+\n int\n main (int argc, char *argv[])\n {\n@@ -1114,6 +1160,8 @@\n g_test_add_func (\"\/common\/name-matching\", test_name_matching);\n g_test_add_func (\"\/common\/filter_parser\", test_filter_parser);\n g_test_add_func (\"\/common\/filter\", test_filter);\n+ g_test_add_func (\"\/common\/dconf-app-id\", test_dconf_app_id);\n+ g_test_add_func (\"\/common\/dconf-paths\", test_dconf_paths);\n \n g_test_add_func (\"\/app\/looks-like-branch\", test_looks_like_branch);\n g_test_add_func (\"\/app\/columns\", test_columns);\n"} {"commit":"d43aaed6725a20c641d36fbfe0ffb19912546295","subject":"ssl_pending","message":"ssl_pending\n","repos":"swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/protocol\/base.c\n+++ src\/protocol\/base.c\n@@ -221,15 +221,15 @@\n else\n {\n swString_clear(buffer);\n+ }\n+ }\n #ifdef SW_USE_OPENSSL\n- if (conn->ssl && SSL_pending(conn->ssl) > 0)\n- {\n- swDebug(\"ssl pending=%d\", SSL_pending(conn->ssl));\n- goto do_recv;\n- }\n-#endif\n- }\n- }\n+ if (conn->ssl && SSL_pending(conn->ssl) > 0)\n+ {\n+ swDebug(\"ssl pending=%d\", SSL_pending(conn->ssl));\n+ goto do_recv;\n+ }\n+#endif\n return SW_OK;\n }\n else\n"} {"commit":"74ac5ba272e26aeffb672412336761ab741b7ebe","subject":"fix bug in call-with-immediate-continuation-mark","message":"fix bug in call-with-immediate-continuation-mark\n\nsvn: r12389\n","repos":"mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/mzscheme\/src\/fun.c\n+++ src\/mzscheme\/src\/fun.c\n@@ -400,9 +400,10 @@\n \t\t\t\t\t\t 2, 4),\n \t\t\t env);\n scheme_add_global_constant(\"call-with-immediate-continuation-mark\",\n-\t\t\t scheme_make_prim_w_arity(call_with_immediate_cc_mark,\n-\t\t\t\t\t\t \"call-with-immediate-continuation-mark\",\n-\t\t\t\t\t\t 2, 3),\n+\t\t\t scheme_make_prim_w_arity2(call_with_immediate_cc_mark,\n+ \"call-with-immediate-continuation-mark\",\n+ 2, 3,\n+ 0, -1),\n \t\t\t env);\n scheme_add_global_constant(\"continuation-mark-set?\",\n \t\t\t scheme_make_prim_w_arity(cc_marks_p,\n@@ -3962,10 +3963,10 @@\n else\n a[0] = scheme_false;\n \n- findpos = (long)MZ_CONT_MARK_STACK;\n- bottom = (long)p->cont_mark_stack_bottom;\n- while (1) {\n- if (findpos-- > bottom) {\n+ if (p->cont_mark_stack_segments) {\n+ findpos = (long)MZ_CONT_MARK_STACK;\n+ bottom = (long)p->cont_mark_stack_bottom;\n+ while (findpos-- > bottom) {\n Scheme_Cont_Mark *seg = p->cont_mark_stack_segments[findpos >> SCHEME_LOG_MARK_SEGMENT_SIZE];\n long pos = findpos & SCHEME_MARK_SEGMENT_MASK;\n Scheme_Cont_Mark *find = seg + pos;\n"} {"commit":"d90de60716555ccb71bce9eb43ec440b0fc95283","subject":"Initial generics work","message":"Initial generics work\n","repos":"chainreactionmfg\/capnp_generic_gen,chainreactionmfg\/capnp_generic_gen","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- generic.h\n+++ generic.h\n@@ -73,7 +73,7 @@\n if (nodes.size() == 0) return false;\n PRE_VISIT(nested_decls, schema);\n for (auto decl : nodes) {\n- auto schema = schemaLoader.get(decl.getId());\n+ auto schema = schemaLoader.getUnbound(decl.getId());\n auto proto = schema.getProto();\n PRE_VISIT(decl, schema, decl);\n switch (proto.which()) {\n@@ -307,7 +307,7 @@\n }\n case schema::Field::GROUP: {\n auto group = proto.getGroup();\n- auto groupSchema = schemaLoader.get(group.getTypeId());\n+ auto groupSchema = schemaLoader.getUnbound(group.getTypeId());\n PRE_VISIT(struct_field_group, schema, field, group, groupSchema);\n TRAVERSE(struct_fields, groupSchema.asStruct());\n POST_VISIT(struct_field_group, schema, field, group, groupSchema);\n@@ -337,12 +337,15 @@\n auto interface = schema.asInterface();\n PRE_VISIT(method, interface, method);\n auto methodProto = method.getProto();\n- TRAVERSE(param_list, interface, kj::str(\"parameters\"), method.getParamType());\n- TRAVERSE(param_list, interface, kj::str(\"results\"), method.getResultType());\n if (methodProto.hasImplicitParameters()) {\n auto implicit = methodProto.getImplicitParameters();\n PRE_VISIT(method_implicit_params, interface, method, implicit);\n+ TRAVERSE(param_list, interface, kj::str(\"parameters\"), schemaLoader.getUnbound(methodProto.getParamStructType()).asStruct());\n+ TRAVERSE(param_list, interface, kj::str(\"results\"), schemaLoader.getUnbound(methodProto.getResultStructType()).asStruct());\n POST_VISIT(method_implicit_params, interface, method, implicit);\n+ } else {\n+ TRAVERSE(param_list, interface, kj::str(\"parameters\"), method.getParamType());\n+ TRAVERSE(param_list, interface, kj::str(\"results\"), method.getResultType());\n }\n TRAVERSE(annotations, schema, methodProto.getAnnotations());\n POST_VISIT(method, interface, method);\n"} {"commit":"9226a627ebd5b1390976aa822dfc023936f43066","subject":"qemu: tpm: use g_autoptr where applicable","message":"qemu: tpm: use g_autoptr where applicable\n\nThis requires stealing one cmd pointer before returning it.\n\nSigned-off-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\nReviewed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"zippy2\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,olafhering\/libvirt,libvirt\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,crobinso\/libvirt,zippy2\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_tpm.c\n+++ src\/qemu\/qemu_tpm.c\n@@ -425,7 +425,7 @@\n const unsigned char *secretuuid,\n bool incomingMigration)\n {\n- virCommandPtr cmd = NULL;\n+ g_autoptr(virCommand) cmd = NULL;\n int exitstatus;\n int ret = -1;\n char uuid[VIR_UUID_STRING_BUFLEN];\n@@ -512,8 +512,6 @@\n ret = 0;\n \n cleanup:\n- virCommandFree(cmd);\n-\n return ret;\n }\n \n@@ -547,7 +545,7 @@\n const char *shortName,\n bool incomingMigration)\n {\n- virCommandPtr cmd = NULL;\n+ g_autoptr(virCommand) cmd = NULL;\n bool created = false;\n g_autofree char *pidfile = NULL;\n g_autofree char *swtpm = virTPMGetSwtpm();\n@@ -639,13 +637,11 @@\n migpwdfile_fd = -1;\n }\n \n- return cmd;\n+ return g_steal_pointer(&cmd);\n \n error:\n if (created)\n qemuTPMDeleteEmulatorStorage(tpm);\n-\n- virCommandFree(cmd);\n \n return NULL;\n }\n@@ -703,7 +699,7 @@\n qemuExtTPMInitPaths(virQEMUDriverPtr driver,\n virDomainDefPtr def)\n {\n- virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);\n+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);\n int ret = 0;\n \n switch (def->tpm->type) {\n@@ -716,8 +712,6 @@\n break;\n }\n \n- virObjectUnref(cfg);\n-\n return ret;\n }\n \n@@ -726,7 +720,7 @@\n qemuExtTPMPrepareHost(virQEMUDriverPtr driver,\n virDomainDefPtr def)\n {\n- virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);\n+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);\n int ret = 0;\n g_autofree char *shortName = NULL;\n \n@@ -748,8 +742,6 @@\n }\n \n cleanup:\n- virObjectUnref(cfg);\n-\n return ret;\n }\n \n@@ -876,7 +868,7 @@\n qemuExtTPMStop(virQEMUDriverPtr driver,\n virDomainObjPtr vm)\n {\n- virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);\n+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);\n g_autofree char *shortName = NULL;\n \n switch (vm->def->tpm->type) {\n@@ -894,7 +886,7 @@\n }\n \n cleanup:\n- virObjectUnref(cfg);\n+ return;\n }\n \n \n@@ -903,7 +895,7 @@\n virDomainDefPtr def,\n virCgroupPtr cgroup)\n {\n- virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);\n+ g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);\n g_autofree char *shortName = NULL;\n int ret = -1, rc;\n pid_t pid;\n@@ -930,7 +922,5 @@\n ret = 0;\n \n cleanup:\n- virObjectUnref(cfg);\n-\n return ret;\n }\n"} {"commit":"47b2d893da658b8ab5b019ded2f42e70488c1d4a","subject":"fix obscure floating point bug","message":"fix obscure floating point bug\n","repos":"eklitzke\/geoquad,eklitzke\/geoquad","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- geoquad.c\n+++ geoquad.c\n@@ -12,7 +12,12 @@\n #define LONGITUDE_MAX 180.0\n #define LATITUDE_MIN -90.0\n #define LATITUDE_MAX 90.0\n+\n+\/* Unfortuntately, in C we have (1 \/ 0.05 ) != 20\n+ * This causes incompatibilites with the current Python code.\n+ *\/\n #define GEOQUAD_STEP 0.05\n+#define GEOQUAD_INV 20\n \n \/* Interleaved ones and zeroes, LSB = 1 *\/\n #define INTER16L 0x5555\n@@ -22,14 +27,6 @@\n #define INTER16M 0xAAAA\n #define INTER32M 0xAAAAAAAA\n \n-struct quad_s\n-{\n-\tfloat nw;\n-\tfloat ne;\n-\tfloat se;\n-\tfloat sw;\n-};\n-\n \/* A half interleave\/ *\/\n static const inline uint32_t interleave_half(uint16_t x)\n {\n@@ -55,24 +52,24 @@\n \t*y = deinterleave_half(z>>1);\n }\n \n-static inline float half_to_lng(uint16_t lng16)\n-{\n-\treturn (((float) lng16) * GEOQUAD_STEP) + LONGITUDE_MIN;\n-}\n-\n-static inline float half_to_lat(uint16_t lat16)\n-{\n-\treturn (((float) lat16) * GEOQUAD_STEP) + LATITUDE_MIN;\n-}\n-\n-static inline uint16_t lng_to_half(float lng)\n-{\n-\treturn (uint16_t) ((lng - LONGITUDE_MIN) \/ GEOQUAD_STEP);\n-}\n-\n-static inline uint16_t lat_to_half(float lat)\n-{\n-\treturn (uint16_t) ((lat - LATITUDE_MIN) \/ GEOQUAD_STEP);\n+static inline double half_to_lng(uint16_t lng16)\n+{\n+\treturn (((double) lng16) * GEOQUAD_STEP) + LONGITUDE_MIN;\n+}\n+\n+static inline double half_to_lat(uint16_t lat16)\n+{\n+\treturn (((double) lat16) * GEOQUAD_STEP) + LATITUDE_MIN;\n+}\n+\n+static inline uint16_t lng_to_half(double lng)\n+{\n+\treturn (uint16_t) ((lng - LONGITUDE_MIN) * GEOQUAD_INV);\n+}\n+\n+static inline uint16_t lat_to_half(double lat)\n+{\n+\treturn (uint16_t) ((lat - LATITUDE_MIN) * GEOQUAD_INV);\n }\n \n \/***************************\n@@ -113,8 +110,9 @@\n \tuint16_t normal_lat, normal_lng;\n \tuint32_t result;\n \tchar *err_msg;\n-\tfloat lng, lat;\n-\tif (!PyArg_ParseTuple(args, \"ff\", &lat, &lng))\n+\tdouble lng, lat;\n+\n+\tif (!PyArg_ParseTuple(args, \"dd\", &lat, &lng))\n \t\treturn NULL;\n \n \tif ((lat < LATITUDE_MIN) || (lat > LATITUDE_MAX)) {\n@@ -133,8 +131,8 @@\n \t\tPyMem_Free(err_msg);\n \t\treturn NULL;\n \t}\n-\tnormal_lat = (uint16_t) ((lat - LATITUDE_MIN) \/ GEOQUAD_STEP);\n-\tnormal_lng = (uint16_t) ((lng - LONGITUDE_MIN) \/ GEOQUAD_STEP);\n+\tnormal_lat = (uint16_t) ((lat - LATITUDE_MIN) * GEOQUAD_INV);\n+\tnormal_lng = (uint16_t) ((lng - LONGITUDE_MIN) * GEOQUAD_INV);\n \n \tresult = interleave_full(normal_lat, normal_lng);\n \treturn PyInt_FromLong((long) result);\n@@ -144,7 +142,7 @@\n geoquad_parse(PyObject *self, PyObject *args)\n {\n \tuint16_t i, j;\n-\tfloat lng, lat;\n+\tdouble lng, lat;\n \tlong geoquad;\n \tPyObject *ret;\n \n@@ -155,11 +153,34 @@\n \t\treturn NULL;\n \n \tdeinterleave_full((uint32_t) geoquad, &i, &j);\n-\tlat = (float) ((i * GEOQUAD_STEP) + LATITUDE_MIN);\n-\tlng = (float) ((j * GEOQUAD_STEP) + LONGITUDE_MIN);\n-\n-\tPyTuple_SetItem(ret, 0, PyFloat_FromDouble((double) lng));\n-\tPyTuple_SetItem(ret, 1, PyFloat_FromDouble((double) lat));\n+\tlat = ((i * GEOQUAD_STEP) + LATITUDE_MIN);\n+\tlng = ((j * GEOQUAD_STEP) + LONGITUDE_MIN);\n+\n+\tPyTuple_SetItem(ret, 0, PyFloat_FromDouble(lng));\n+\tPyTuple_SetItem(ret, 1, PyFloat_FromDouble(lat));\n+\treturn ret;\n+}\n+\n+static PyObject *\n+geoquad_center(PyObject *self, PyObject *args)\n+{\n+\tuint16_t half_lat, half_lng;\n+\tdouble lng, lat;\n+\tlong geoquad;\n+\tPyObject *ret;\n+\n+\tif (!PyArg_ParseTuple(args, \"l\", &geoquad))\n+\t\treturn NULL;\n+\n+\tif ((ret = PyTuple_New(2)) == NULL)\n+\t\treturn NULL;\n+\n+\tdeinterleave_full((uint32_t) geoquad, &half_lat, &half_lng);\n+\tlat = ((half_lat * GEOQUAD_STEP) + LATITUDE_MIN) + GEOQUAD_STEP \/ 2;\n+\tlng = ((half_lng * GEOQUAD_STEP) + LONGITUDE_MIN) + GEOQUAD_STEP \/ 2;\n+\n+\tPyTuple_SetItem(ret, 0, PyFloat_FromDouble(lng));\n+\tPyTuple_SetItem(ret, 1, PyFloat_FromDouble(lat));\n \treturn ret;\n }\n \n@@ -286,9 +307,9 @@\n \n \/* FIXME: too many arguments *\/\n static inline int\n-quad_within_radius(float lat, float lng, float lat_c, float lng_c, float radius_sq)\n-{\n-\tfloat delta_lat, delta_lng;\n+quad_within_radius(double lat, double lng, double lat_c, double lng_c, double radius_sq)\n+{\n+\tdouble delta_lat, delta_lng;\n \tdelta_lat = lat - lat_c;\n \tdelta_lng = lng - lng_c;\n \treturn (delta_lat * delta_lat + delta_lng * delta_lng) <= radius_sq;\n@@ -298,9 +319,9 @@\n geoquad_nearby(PyObject *self, PyObject *args)\n {\n \tlong geoquad;\n-\tconst float radius;\n-\tfloat radius_sq;\n-\tfloat f_lng_orig, f_lat_orig, f_lng, f_lat;\n+\tconst double radius;\n+\tdouble radius_sq;\n+\tdouble f_lng_orig, f_lat_orig, f_lng, f_lat;\n \tuint16_t lng_w, lng_e;\n \tuint16_t lng, lat, lng_orig, lat_orig;\n \tsize_t i, count;\n@@ -308,7 +329,7 @@\n \n \tuint16_t *halves;\n \n-\tif (!PyArg_ParseTuple(args, \"lf\", &geoquad, &radius))\n+\tif (!PyArg_ParseTuple(args, \"ld\", &geoquad, &radius))\n \t\treturn NULL;\n \tradius_sq = radius * radius;\n \t\n@@ -389,7 +410,8 @@\n \n static PyMethodDef geoquad_methods[] = {\n \t{ \"create\", (PyCFunction) geoquad_create, METH_VARARGS, \"create a geoquad from a (lat, lng)\" },\n-\t{ \"parse\", (PyCFunction) geoquad_parse, METH_VARARGS, \"parse a geoquad, returns a (lat, lng)\" },\n+\t{ \"parse\", (PyCFunction) geoquad_parse, METH_VARARGS, \"SW corner of a geoquad, returns a (lat, lng)\" },\n+\t{ \"center\", (PyCFunction) geoquad_center, METH_VARARGS, \"center of a geoquad, returns a (lat, lng)\" },\n \t{ \"northof\", (PyCFunction) geoquad_northof, METH_VARARGS, \"returns the geoquad directly north of a given geoquad\" },\n \t{ \"southof\", (PyCFunction) geoquad_southof, METH_VARARGS, \"returns the geoquad directly south of a given geoquad\" },\n \t{ \"eastof\", (PyCFunction) geoquad_eastof, METH_VARARGS, \"returns the geoquad directly east of a given geoquad\" },\n"} {"commit":"ac8f16a214b79042a77c1c9fc0d98e90004370bc","subject":"cplusplus around CGPointExtension","message":"cplusplus around CGPointExtension\n\n\nFormer-commit-id: a73a61d0b9de129cd998ed4f2c3d17716c05f7f2","repos":"knight2010\/cocos2d-objc,nader-eloshaiker\/cocos2d-objc,dnessorga\/cocos2d-objc,codepython\/cocos2d-objc,liduanw\/cocos2d-objc,cocos2d\/cocos2d-objc,savysoda\/cocos2d-objc,tambarskjelve\/cocos2d-objc,DNESS\/cocos2d-objc,yaoxiaoyong\/cocos2d-objc,zaneLou\/cocos2d-objc,seem-sky\/cocos2d-swift,lpeancovschi\/cocos2d-objc,DNESS\/cocos2d-objc,seem-sky\/cocos2d-swift,knight2010\/cocos2d-objc,lpeancovschi\/cocos2d-objc,finthamoussu\/cocos2d-objc,knight2010\/cocos2d-objc,knight2010\/cocos2d-objc,yaoxiaoyong\/cocos2d-objc,lpeancovschi\/cocos2d-objc,seem-sky\/cocos2d-swift,oxeron\/cocos2d-objc,tambarskjelve\/cocos2d-objc,jason-puck\/cocos2d-iphone,DNESS\/cocos2d-objc,savysoda\/cocos2d-objc,liduanw\/cocos2d-objc,tambarskjelve\/cocos2d-objc,zaneLou\/cocos2d-objc,oxeron\/cocos2d-objc,savysoda\/cocos2d-objc,nader-eloshaiker\/cocos2d-objc,dnessorga\/cocos2d-objc,cocos2d\/cocos2d-objc,DNESS\/cocos2d-objc,lpeancovschi\/cocos2d-objc,cogddo\/cocos2d-objc,seem-sky\/cocos2d-swift,yaoxiaoyong\/cocos2d-objc,liduanw\/cocos2d-objc,SuPair\/cocos2d-objc,cogddo\/cocos2d-objc,richardgroves\/cocos2d-iphone,DNESS\/cocos2d-objc,jason-puck\/cocos2d-iphone,savysoda\/cocos2d-objc,cogddo\/cocos2d-objc,TukekeSoft\/cocos2d-spritebuilder,finthamoussu\/cocos2d-objc,richardgroves\/cocos2d-iphone,yaoxiaoyong\/cocos2d-objc,nader-eloshaiker\/cocos2d-objc,codepython\/cocos2d-objc,codepython\/cocos2d-objc,dnessorga\/cocos2d-objc,finthamoussu\/cocos2d-objc,zaneLou\/cocos2d-objc,zaneLou\/cocos2d-objc,richardgroves\/cocos2d-iphone,TukekeSoft\/cocos2d-spritebuilder,yaoxiaoyong\/cocos2d-objc,cogddo\/cocos2d-objc,liduanw\/cocos2d-objc,TukekeSoft\/cocos2d-spritebuilder,dnessorga\/cocos2d-objc,codepython\/cocos2d-objc,SuPair\/cocos2d-objc,tambarskjelve\/cocos2d-objc,SuPair\/cocos2d-objc,jason-puck\/cocos2d-iphone,finthamoussu\/cocos2d-objc,tambarskjelve\/cocos2d-objc,SuPair\/cocos2d-objc,dnessorga\/cocos2d-objc,liduanw\/cocos2d-objc,SuPair\/cocos2d-objc,TukekeSoft\/cocos2d-spritebuilder,nader-eloshaiker\/cocos2d-objc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cocos2d\/Support\/CGPointExtension.h\n+++ cocos2d\/Support\/CGPointExtension.h\n@@ -46,6 +46,10 @@\n #import <CoreGraphics\/CGGeometry.h>\n #import <math.h>\n \n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\t\n+\n \/** Helper macro that creates a CGPoint\n @return CGPoint\n @since v0.7.2\n@@ -212,3 +216,7 @@\n @since v0.7.2\n *\/\n CGFloat ccpToAngle(const CGPoint v);\n+\n+#ifdef __cplusplus\n+}\n+#endif\n"} {"commit":"bee186ce512461740a745d755fa5f61cef673d5d","subject":"Refactor psrlw_r128","message":"Refactor psrlw_r128\n","repos":"copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/native\/sse_instr.c\n+++ src\/native\/sse_instr.c\n@@ -52,6 +52,31 @@\n task_switch_test_mmx();\n union reg128 data = read_xmm128s(r);\n safe_write64(addr, data.u64[1]);\n+}\n+\n+void psrlw_r128(int32_t r, uint32_t shift)\n+{\n+ \/\/ psrlw xmm, {shift}\n+ task_switch_test_mmx();\n+ union reg128 destination = read_xmm128s(r);\n+ int32_t dword0 = 0;\n+ int32_t dword1 = 0;\n+ int32_t dword2 = 0;\n+ int32_t dword3 = 0;\n+\n+ if(shift <= 15)\n+ {\n+ dword0 = (destination.u16[0] >> shift) |\n+ (destination.u16[1] >> shift) << 16;\n+ dword1 = (destination.u16[2] >> shift) |\n+ (destination.u16[3] >> shift) << 16;\n+ dword2 = (destination.u16[4] >> shift) |\n+ (destination.u16[5] >> shift) << 16;\n+ dword3 = (destination.u16[6] >> shift) |\n+ (destination.u16[7] >> shift) << 16;\n+ }\n+\n+ write_xmm128(r, dword0, dword1, dword2, dword3);\n }\n \n void psrlq_r128(int32_t r, uint32_t shift)\n@@ -184,38 +209,6 @@\n write_xmm128(r, dword0, dword1, dword2, dword3);\n }\n \n-void psrlw_r128(int32_t r, uint32_t shift)\n-{\n- \/\/ psrlw xmm, {shift}\n- task_switch_test_mmx();\n- union reg128 destination = read_xmm128s(r);\n-\n- int32_t dword0 = 0;\n- int32_t dword1 = 0;\n- int32_t dword2 = 0;\n- int32_t dword3 = 0;\n-\n- if(shift <= 15) {\n- int32_t word0 = ((uint32_t) destination.u16[0]) >> shift;\n- int32_t word1 = ((uint32_t) destination.u16[1]) >> shift;\n- dword0 = word0 | word1 << 16;\n-\n- int32_t word2 = ((uint32_t) destination.u16[2]) >> shift;\n- int32_t word3 = ((uint32_t) destination.u16[3]) >> shift;\n- dword1 = word2 | word3 << 16;\n-\n- int32_t word4 = ((uint32_t) destination.u16[4]) >> shift;\n- int32_t word5 = ((uint32_t) destination.u16[5]) >> shift;\n- dword2 = word4 | word5 << 16;\n-\n- int32_t word6 = ((uint32_t) destination.u16[6]) >> shift;\n- int32_t word7 = ((uint32_t) destination.u16[7]) >> shift;\n- dword3 = word6 | word7 << 16;\n- }\n-\n- write_xmm128(r, dword0, dword1, dword2, dword3);\n-}\n-\n void psrad_r128(int32_t r, uint32_t shift)\n {\n \/\/ psrad xmm, {shift}\n"} {"commit":"acaa80bc5ee63834c8267fb671dddec8f9c24423","subject":"fix for header file","message":"fix for header file\n","repos":"Lipotam\/PABS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/PABS\/BrainRingWithTimerMode.h\n+++ code\/PABS\/BrainRingWithTimerMode.h\n@@ -18,6 +18,7 @@\n private:\n \tint timer;\n \tvoid ResetState();\n+\tbool blockStartButton; \/\/ too allow to see fault start \n \n public:\n \tBrainRingWithTimerMode();\n"} {"commit":"8b951e6c2827386786cde4a124cd1846d25b9404","subject":"Checks for strdup() result. Use remountBindMount since we have it","message":"Checks for strdup() result. Use remountBindMount since we have it\n","repos":"google\/nsjail,nkhuyu\/nsjail,google\/nsjail,gdseller\/nsjail,COLABORATI\/nsjail","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- contain.c\n+++ contain.c\n@@ -201,6 +201,10 @@\n \tchar mount_pt[PATH_MAX];\n \tbool success = false;\n \tchar *source = strdup(spec);\n+\tif (source == NULL) {\n+\t\tPLOG_E(\"strdup('%s')\", spec);\n+\t\treturn false;\n+\t}\n \tchar *dest = findSpecDestination(source);\n \n \tsnprintf(mount_pt, sizeof(mount_pt), \"%s\/%s\", newrootdir, dest);\n@@ -224,9 +228,13 @@\n {\n \tbool success = false;\n \tchar *source = strdup(spec);\n+\tif (source == NULL) {\n+\t\tPLOG_E(\"strdup('%s')\", spec);\n+\t\treturn false;\n+\t}\n \tchar *dest = findSpecDestination(source);\n \n-\tLOG_D(\"Remounting (bind|%lu) '%s' on '%s'\", flags, dest, dest);\n+\tLOG_D(\"Remounting (bind(0x%lx)) '%s' on '%s'\", flags, dest, dest);\n \tif (mount(dest, dest, NULL, MS_BIND | MS_NOSUID | MS_REMOUNT | MS_PRIVATE | flags, NULL) == -1) {\n \t\tPLOG_E(\"mount('%s', '%s', MS_BIND|MS_NOSUID|MS_REMOUNT|MS_PRIVATE|%lu)\", dest, dest, flags);\n \t\tgoto cleanup;\n@@ -320,8 +328,7 @@\n \t}\n \n \tif (nsjconf->is_root_rw == false) {\n-\t\tif (mount(\"\/\", \"\/\", NULL, MS_BIND | MS_RDONLY | MS_NOSUID | MS_REMOUNT | MS_PRIVATE, NULL) == -1) {\n-\t\t\tPLOG_E(\"mount('\/', '\/', MS_BIND|MS_RDONLY|MS_NOSUID|MS_REMOUNT|MS_PRIVATE)\");\n+\t\tif (!remountBindMount(\"\/\", MS_RDONLY)) {\n \t\t\treturn false;\n \t\t}\n \t}\n"} {"commit":"dd252a4cd0782440c07604b128c22f14469b4e22","subject":"In case of an error during the processing of a response cleanup the request and move the pointer to the next request. This allows the caller to recover gracefully from an error when needed.","message":"In case of an error during the processing of a response cleanup the request\nand move the pointer to the next request. This allows the caller to recover\ngracefully from an error when needed.\n\n* context.c\n (read_from_connection): Rearrange order in error situation: cleanup first,\n only then raise error. \n\nPatch by: Lieven Govaerts <lieven.govaerts@gmail.com>\n","repos":"jandre\/serf,jandre\/serf,jandre\/serf,jandre\/serf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -776,40 +776,40 @@\n continue;\n }\n \n+ \/* The request has been fully-delivered, and the response has\n+ * been fully-read. Remove it from our queue and loop to read\n+ * another response.\n+ *\/\n+ conn->requests = request->next;\n+\n+ \/* The bucket is no longer needed, nor is the request's pool. *\/\n+ serf_bucket_destroy(request->resp_bkt);\n+ if (request->req_bkt) {\n+ serf_bucket_destroy(request->req_bkt);\n+ }\n+\n+ serf_debug__bucket_alloc_check(request->allocator);\n+ apr_pool_destroy(request->respool);\n+ serf_bucket_mem_free(conn->allocator, request);\n+\n+ request = conn->requests;\n+\n+ \/* If we're truly empty, update our tail. *\/\n+ if (request == NULL) {\n+ conn->requests_tail = NULL;\n+ }\n+\n+ \/* This means that we're being advised that the connection is done. *\/\n+ if (status == SERF_ERROR_CLOSING) {\n+ reset_connection(conn, 1);\n+ status = APR_SUCCESS;\n+ goto error;\n+ }\n+\n if (!APR_STATUS_IS_EOF(status) && status != SERF_ERROR_CLOSING) {\n \/* Whether success, or an error, there is no more to do unless\n * this request has been completed.\n *\/\n- goto error;\n- }\n-\n- \/* The request has been fully-delivered, and the response has\n- * been fully-read. Remove it from our queue and loop to read\n- * another response.\n- *\/\n- conn->requests = request->next;\n-\n- \/* The bucket is no longer needed, nor is the request's pool. *\/\n- serf_bucket_destroy(request->resp_bkt);\n- if (request->req_bkt) {\n- serf_bucket_destroy(request->req_bkt);\n- }\n-\n- serf_debug__bucket_alloc_check(request->allocator);\n- apr_pool_destroy(request->respool);\n- serf_bucket_mem_free(conn->allocator, request);\n-\n- request = conn->requests;\n-\n- \/* If we're truly empty, update our tail. *\/\n- if (request == NULL) {\n- conn->requests_tail = NULL;\n- }\n-\n- \/* This means that we're being advised that the connection is done. *\/\n- if (status == SERF_ERROR_CLOSING) {\n- reset_connection(conn, 1);\n- status = APR_SUCCESS;\n goto error;\n }\n \n"} {"commit":"3f10881ae69c06afc803ac2bbb7510eb7e3d916b","subject":"counters_0_ver index was not used, fix it so that it is","message":"counters_0_ver index was not used, fix it so that it is\n\nAccording to SQLite docs:\n\"If W is AND-connected terms and X is OR-connected terms and if any term of W\nappears as a term of X, then the partial index is usable\"\n\nSo if my query is \"used = 0 AND reserved = 0\", then for the index\nto be usable the index should be created with \"used = 0 OR reserved = 0\".\nHowever that condition is true for most entries, so its better\nto create an index based on just \"used = 0\", and store all the reserved values.\nThen we get:\n\t0|0|0|SEARCH TABLE counters USING COVERING INDEX counters_0_ver (used=? AND reserved=? AND ver<?)\n","repos":"gcsideal\/sx-debian,gcsideal\/sx-debian,gcsideal\/sx-debian,gcsideal\/sx-debian","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- server\/src\/common\/hashfs.c\n+++ server\/src\/common\/hashfs.c\n@@ -467,7 +467,7 @@\n if(qprep(db, &q, \"CREATE INDEX reserve_by_group ON reserved(groupid)\") || qstep_noret(q))\n \tgoto create_hashfs_fail;\n qnullify(q);\n- if(qprep(db, &q, \"CREATE INDEX counters_0_ver ON counters(used, ver) WHERE used=0 AND reserved=0\") || qstep_noret(q))\n+ if(qprep(db, &q, \"CREATE INDEX counters_0_ver ON counters(used, reserved, ver) WHERE used=0\") || qstep_noret(q))\n \tgoto create_hashfs_fail;\n qnullify(q);\n \/* GC: two tasks: merge tables, track token activity, and\n"} {"commit":"d7ad9b010ff8e0df2a6a98b7f559b36d4adf4ff4","subject":"Destroy the stream bucket.","message":"Destroy the stream bucket.\n\n* context.c\n (serf_connection_reset): Destroy our stream bucket instead of letting it\n dangle; add a blank line for readability.\n","repos":"jandre\/serf,jandre\/serf,jandre\/serf,jandre\/serf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -761,6 +761,7 @@\n }\n \n \/* We will let the request bucket destroy our stream. *\/\n+ serf_bucket_destroy(conn->stream);\n conn->stream = NULL;\n \n \/* Don't try to resume any writes *\/\n@@ -769,6 +770,7 @@\n \n conn->dirty_conn = 1;\n conn->ctx->dirty_pollset = 1;\n+\n \/* Found the connection. Closed it. All done. *\/\n return APR_SUCCESS;\n }\n"} {"commit":"a7f1394e1c007c8c3a7a44607f72a3c9329e4b10","subject":"debug:","message":"debug:\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compass.c\n+++ compass.c\n@@ -80,6 +80,30 @@\n \treturn 0;\n }\n \n+int compass_read_scatter(Cmps *compass_data)\n+{\n+\t\/\/WriteReg8\n+\tWPI2CWReg8 = wiringPiI2CWriteReg8(fd,mode_reg,mode_single);\n+\t\/*if(WPI2CWReg8 == -1)\n+\t {\n+\t printf(\"Compass write error register mode_reg\\n\");\n+\t printf(\"wiringPiI2CWriteReg8 = %d\\n\", WPI2CWReg8);\n+\t errno = -WPI2CWReg8;\n+\t printf(\"errno=%d: %s\\n\", errno, strerror(errno));\n+\t }\n+\t else\n+\t {\n+\t printf(\"Compass write register:mode_reg\\n\");\n+\t }*\/\n+\tshort x = 0;\n+\tshort y = 0;\n+\tshort z = 0;\n+\tcompass_data->compassx_value = read_out(fd, x_msb_reg, x_lsb_reg);\n+\tcompass_data->compassy_value = read_out(fd, y_msb_reg, y_lsb_reg);\n+\tcompass_data->compassz_value = read_out(fd, z_msb_reg, z_lsb_reg);\n+\treturn 0;\n+}\n+\n int print_compass(Cmps *compass_data)\n {\n \tcompass_read(compass_data);\n"} {"commit":"ea3a6d8ca17c1c0382cba80750d8370bd3371b90","subject":"cp, rename","message":"cp, rename\n","repos":"lishuwnc\/Xv6,lishuwnc\/Xv6,lishuwnc\/Xv6,lishuwnc\/Xv6","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- console.c\n+++ console.c\n@@ -187,6 +187,7 @@\n crt[pos++] = (buffer[i] & 0xff) | 0x0700;\n }\n \/\/printint(pos, 10, 1);\n+ crt[pos] = ' ' | 0x0700;\n return 0;\n }\n \/\/\n@@ -288,9 +289,11 @@\n switch(c){\n case C('P'): \/\/ Process listing.\n his.flag = 0;\/\/history flag\n+ bufferPos = 0;\n procdump();\n break;\n case '\\t':\n+ bufferPos = 0;\n his.flag = 0;\/\/history flag\n if (input.e != input.w) {\n i = input.e - 1;\n@@ -313,6 +316,7 @@\n break;\n case C('U'): \/\/ Kill line.\n his.flag = 0;\/\/history flag\n+ bufferPos = 0;\n while(input.e != input.w &&\n input.buf[(input.e-1) % INPUT_BUF] != '\\n'){\n input.e--;\n@@ -349,6 +353,7 @@\n his.pos = his.recordNum-1;\n \n }\n+\tbufferPos = 0;\n \t if(his.record == 1)\n \t {\n while(input.e != input.w &&\n@@ -392,6 +397,7 @@\n if (his.pos >= his.recordNum)\n his.pos = 0; \n }\n+\t bufferPos = 0;\n \t\t\tif(his.record == 1)\n \t\t\t{\n while(input.e != input.w &&\n@@ -449,6 +455,17 @@\n }\n break;\n *\/\n+ case 0xE5:\n+\tif (bufferPos > 0)\n+\t{\n+\t\tbufferPos --;\n+\t \tinput.buf[input.e++ % INPUT_BUF] = buffer[bufferPos];\n+\t\tstr[len++] = buffer[bufferPos];\/\/Preparation for building a history record\n+\t\tconsputc(buffer[bufferPos]);\n+\t\tconcatInput();\n+\t}\n+\tbreak;\n+\n default:\n if(c != 0 && input.e-input.r < INPUT_BUF){\n c = (c == '\\r') ? '\\n' : c;\n"} {"commit":"6c54078d2ee377a1c12ded8e031353ee5125ac2f","subject":"Set siblings for server clones properly.","message":"Set siblings for server clones properly.\n","repos":"LuminateWireless\/grpc,kumaralokgithub\/grpc,andrewpollock\/grpc,thunderboltsid\/grpc,Vizerai\/grpc,rjshade\/grpc,MakMukhi\/grpc,kumaralokgithub\/grpc,ctiller\/grpc,rjshade\/grpc,yang-g\/grpc,firebase\/grpc,Vizerai\/grpc,matt-kwong\/grpc,yugui\/grpc,simonkuang\/grpc,daniel-j-born\/grpc,pszemus\/grpc,Crevil\/grpc,quizlet\/grpc,ppietrasa\/grpc,fuchsia-mirror\/third_party-grpc,andrewpollock\/grpc,pmarks-net\/grpc,adelez\/grpc,deepaklukose\/grpc,grani\/grpc,kpayson64\/grpc,nicolasnoble\/grpc,rjshade\/grpc,ipylypiv\/grpc,mehrdada\/grpc,jcanizales\/grpc,Vizerai\/grpc,mehrdada\/grpc,a-veitch\/grpc,a11r\/grpc,murgatroid99\/grpc,ncteisen\/grpc,deepaklukose\/grpc,muxi\/grpc,dgquintas\/grpc,dgquintas\/grpc,greasypizza\/grpc,a-veitch\/grpc,yang-g\/grpc,kpayson64\/grpc,donnadionne\/grpc,Vizerai\/grpc,yongni\/grpc,dgquintas\/grpc,kumaralokgithub\/grpc,a-veitch\/grpc,ctiller\/grpc,y-zeng\/grpc,royalharsh\/grpc,perumaalgoog\/grpc,pmarks-net\/grpc,mehrdada\/grpc,kpayson64\/grpc,yongni\/grpc,stanley-cheung\/grpc,andrewpollock\/grpc,pmarks-net\/grpc,kskalski\/grpc,a11r\/grpc,chrisdunelm\/grpc,nicolasnoble\/grpc,deepaklukose\/grpc,donnadionne\/grpc,adelez\/grpc,pmarks-net\/grpc,daniel-j-born\/grpc,grpc\/grpc,zhimingxie\/grpc,matt-kwong\/grpc,nicolasnoble\/grpc,y-zeng\/grpc,wcevans\/grpc,PeterFaiman\/ruby-grpc-minimal,adelez\/grpc,murgatroid99\/grpc,ppietrasa\/grpc,apolcyn\/grpc,soltanmm-google\/grpc,thinkerou\/grpc,jboeuf\/grpc,LuminateWireless\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,dklempner\/grpc,kriswuollett\/grpc,infinit\/grpc,grani\/grpc,vjpai\/grpc,msmania\/grpc,baylabs\/grpc,yugui\/grpc,ppietrasa\/grpc,thunderboltsid\/grpc,makdharma\/grpc,Crevil\/grpc,jcanizales\/grpc,ctiller\/grpc,ctiller\/grpc,vjpai\/grpc,kskalski\/grpc,matt-kwong\/grpc,LuminateWireless\/grpc,dklempner\/grpc,grani\/grpc,msmania\/grpc,ctiller\/grpc,philcleveland\/grpc,deepaklukose\/grpc,grpc\/grpc,carl-mastrangelo\/grpc,y-zeng\/grpc,fuchsia-mirror\/third_party-grpc,Crevil\/grpc,jtattermusch\/grpc,sreecha\/grpc,ncteisen\/grpc,grpc\/grpc,jcanizales\/grpc,soltanmm\/grpc,stanley-cheung\/grpc,infinit\/grpc,ncteisen\/grpc,kskalski\/grpc,ppietrasa\/grpc,matt-kwong\/grpc,ctiller\/grpc,muxi\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,y-zeng\/grpc,thinkerou\/grpc,malexzx\/grpc,fuchsia-mirror\/third_party-grpc,rjshade\/grpc,chrisdunelm\/grpc,baylabs\/grpc,firebase\/grpc,dklempner\/grpc,sreecha\/grpc,thunderboltsid\/grpc,vjpai\/grpc,grpc\/grpc,ejona86\/grpc,daniel-j-born\/grpc,baylabs\/grpc,nicolasnoble\/grpc,stanley-cheung\/grpc,pszemus\/grpc,nicolasnoble\/grpc,grani\/grpc,dklempner\/grpc,thinkerou\/grpc,baylabs\/grpc,ppietrasa\/grpc,matt-kwong\/grpc,vjpai\/grpc,simonkuang\/grpc,soltanmm\/grpc,jboeuf\/grpc,jcanizales\/grpc,firebase\/grpc,kriswuollett\/grpc,firebase\/grpc,ejona86\/grpc,Vizerai\/grpc,7anner\/grpc,vjpai\/grpc,makdharma\/grpc,vjpai\/grpc,chrisdunelm\/grpc,pszemus\/grpc,andrewpollock\/grpc,soltanmm\/grpc,yongni\/grpc,andrewpollock\/grpc,greasypizza\/grpc,adelez\/grpc,chrisdunelm\/grpc,geffzhang\/grpc,jboeuf\/grpc,matt-kwong\/grpc,yugui\/grpc,wcevans\/grpc,ncteisen\/grpc,soltanmm\/grpc,vsco\/grpc,yang-g\/grpc,ppietrasa\/grpc,daniel-j-born\/grpc,chrisdunelm\/grpc,thunderboltsid\/grpc,MakMukhi\/grpc,firebase\/grpc,kpayson64\/grpc,greasypizza\/grpc,adelez\/grpc,philcleveland\/grpc,vsco\/grpc,soltanmm-google\/grpc,daniel-j-born\/grpc,greasypizza\/grpc,dgquintas\/grpc,pszemus\/grpc,ctiller\/grpc,muxi\/grpc,malexzx\/grpc,ppietrasa\/grpc,soltanmm-google\/grpc,mehrdada\/grpc,ejona86\/grpc,fuchsia-mirror\/third_party-grpc,carl-mastrangelo\/grpc,vjpai\/grpc,a11r\/grpc,quizlet\/grpc,dklempner\/grpc,ctiller\/grpc,kumaralokgithub\/grpc,Vizerai\/grpc,kriswuollett\/grpc,hstefan\/grpc,muxi\/grpc,stanley-cheung\/grpc,deepaklukose\/grpc,carl-mastrangelo\/grpc,hstefan\/grpc,philcleveland\/grpc,ejona86\/grpc,pszemus\/grpc,LuminateWireless\/grpc,kskalski\/grpc,wcevans\/grpc,firebase\/grpc,thunderboltsid\/grpc,mehrdada\/grpc,apolcyn\/grpc,andrewpollock\/grpc,jboeuf\/grpc,y-zeng\/grpc,pszemus\/grpc,carl-mastrangelo\/grpc,malexzx\/grpc,malexzx\/grpc,grpc\/grpc,kriswuollett\/grpc,greasypizza\/grpc,ejona86\/grpc,apolcyn\/grpc,thunderboltsid\/grpc,Crevil\/grpc,perumaalgoog\/grpc,stanley-cheung\/grpc,ejona86\/grpc,perumaalgoog\/grpc,ncteisen\/grpc,jtattermusch\/grpc,jboeuf\/grpc,geffzhang\/grpc,sreecha\/grpc,yugui\/grpc,thinkerou\/grpc,PeterFaiman\/ruby-grpc-minimal,soltanmm\/grpc,pmarks-net\/grpc,jboeuf\/grpc,geffzhang\/grpc,mehrdada\/grpc,murgatroid99\/grpc,carl-mastrangelo\/grpc,matt-kwong\/grpc,kskalski\/grpc,apolcyn\/grpc,stanley-cheung\/grpc,ncteisen\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,firebase\/grpc,rjshade\/grpc,yang-g\/grpc,malexzx\/grpc,7anner\/grpc,infinit\/grpc,carl-mastrangelo\/grpc,ipylypiv\/grpc,adelez\/grpc,zhimingxie\/grpc,PeterFaiman\/ruby-grpc-minimal,kriswuollett\/grpc,malexzx\/grpc,PeterFaiman\/ruby-grpc-minimal,royalharsh\/grpc,ctiller\/grpc,muxi\/grpc,baylabs\/grpc,infinit\/grpc,dklempner\/grpc,ncteisen\/grpc,hstefan\/grpc,Crevil\/grpc,dklempner\/grpc,grani\/grpc,jcanizales\/grpc,daniel-j-born\/grpc,ipylypiv\/grpc,nicolasnoble\/grpc,apolcyn\/grpc,yugui\/grpc,makdharma\/grpc,quizlet\/grpc,carl-mastrangelo\/grpc,grpc\/grpc,jboeuf\/grpc,ejona86\/grpc,a11r\/grpc,greasypizza\/grpc,vsco\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,ncteisen\/grpc,philcleveland\/grpc,dklempner\/grpc,deepaklukose\/grpc,muxi\/grpc,MakMukhi\/grpc,kumaralokgithub\/grpc,kriswuollett\/grpc,zhimingxie\/grpc,soltanmm\/grpc,wcevans\/grpc,geffzhang\/grpc,7anner\/grpc,jtattermusch\/grpc,grani\/grpc,donnadionne\/grpc,Vizerai\/grpc,carl-mastrangelo\/grpc,grpc\/grpc,jcanizales\/grpc,makdharma\/grpc,matt-kwong\/grpc,makdharma\/grpc,Crevil\/grpc,Crevil\/grpc,dgquintas\/grpc,sreecha\/grpc,ncteisen\/grpc,yugui\/grpc,fuchsia-mirror\/third_party-grpc,msmania\/grpc,rjshade\/grpc,yang-g\/grpc,murgatroid99\/grpc,perumaalgoog\/grpc,7anner\/grpc,ipylypiv\/grpc,ipylypiv\/grpc,sreecha\/grpc,jtattermusch\/grpc,zhimingxie\/grpc,adelez\/grpc,donnadionne\/grpc,royalharsh\/grpc,ctiller\/grpc,pmarks-net\/grpc,murgatroid99\/grpc,nicolasnoble\/grpc,a11r\/grpc,stanley-cheung\/grpc,msmania\/grpc,sreecha\/grpc,thunderboltsid\/grpc,dklempner\/grpc,Vizerai\/grpc,fuchsia-mirror\/third_party-grpc,thinkerou\/grpc,a11r\/grpc,wcevans\/grpc,andrewpollock\/grpc,yugui\/grpc,deepaklukose\/grpc,jtattermusch\/grpc,apolcyn\/grpc,simonkuang\/grpc,msmania\/grpc,kriswuollett\/grpc,kumaralokgithub\/grpc,dgquintas\/grpc,vsco\/grpc,murgatroid99\/grpc,philcleveland\/grpc,yongni\/grpc,jboeuf\/grpc,greasypizza\/grpc,jtattermusch\/grpc,wcevans\/grpc,carl-mastrangelo\/grpc,simonkuang\/grpc,kumaralokgithub\/grpc,LuminateWireless\/grpc,vsco\/grpc,mehrdada\/grpc,thinkerou\/grpc,donnadionne\/grpc,soltanmm-google\/grpc,royalharsh\/grpc,mehrdada\/grpc,nicolasnoble\/grpc,jboeuf\/grpc,vsco\/grpc,ejona86\/grpc,apolcyn\/grpc,Vizerai\/grpc,pmarks-net\/grpc,quizlet\/grpc,stanley-cheung\/grpc,a-veitch\/grpc,jtattermusch\/grpc,Vizerai\/grpc,jboeuf\/grpc,jtattermusch\/grpc,donnadionne\/grpc,firebase\/grpc,matt-kwong\/grpc,ejona86\/grpc,stanley-cheung\/grpc,grpc\/grpc,kskalski\/grpc,msmania\/grpc,y-zeng\/grpc,firebase\/grpc,royalharsh\/grpc,ejona86\/grpc,perumaalgoog\/grpc,PeterFaiman\/ruby-grpc-minimal,PeterFaiman\/ruby-grpc-minimal,nicolasnoble\/grpc,PeterFaiman\/ruby-grpc-minimal,royalharsh\/grpc,baylabs\/grpc,hstefan\/grpc,baylabs\/grpc,Crevil\/grpc,kskalski\/grpc,thinkerou\/grpc,apolcyn\/grpc,zhimingxie\/grpc,grpc\/grpc,firebase\/grpc,vsco\/grpc,soltanmm\/grpc,PeterFaiman\/ruby-grpc-minimal,yongni\/grpc,yongni\/grpc,kpayson64\/grpc,thinkerou\/grpc,yang-g\/grpc,stanley-cheung\/grpc,kpayson64\/grpc,firebase\/grpc,yugui\/grpc,ipylypiv\/grpc,msmania\/grpc,murgatroid99\/grpc,ctiller\/grpc,yang-g\/grpc,daniel-j-born\/grpc,nicolasnoble\/grpc,makdharma\/grpc,muxi\/grpc,dgquintas\/grpc,rjshade\/grpc,grpc\/grpc,yugui\/grpc,donnadionne\/grpc,mehrdada\/grpc,simonkuang\/grpc,perumaalgoog\/grpc,y-zeng\/grpc,simonkuang\/grpc,grani\/grpc,geffzhang\/grpc,perumaalgoog\/grpc,a-veitch\/grpc,ipylypiv\/grpc,andrewpollock\/grpc,vjpai\/grpc,msmania\/grpc,a11r\/grpc,kpayson64\/grpc,ncteisen\/grpc,mehrdada\/grpc,geffzhang\/grpc,sreecha\/grpc,donnadionne\/grpc,vsco\/grpc,yang-g\/grpc,murgatroid99\/grpc,yang-g\/grpc,donnadionne\/grpc,chrisdunelm\/grpc,MakMukhi\/grpc,hstefan\/grpc,murgatroid99\/grpc,PeterFaiman\/ruby-grpc-minimal,murgatroid99\/grpc,makdharma\/grpc,hstefan\/grpc,ppietrasa\/grpc,chrisdunelm\/grpc,infinit\/grpc,nicolasnoble\/grpc,LuminateWireless\/grpc,kskalski\/grpc,pszemus\/grpc,kpayson64\/grpc,y-zeng\/grpc,ejona86\/grpc,LuminateWireless\/grpc,ppietrasa\/grpc,vjpai\/grpc,jtattermusch\/grpc,jcanizales\/grpc,andrewpollock\/grpc,sreecha\/grpc,carl-mastrangelo\/grpc,LuminateWireless\/grpc,donnadionne\/grpc,pszemus\/grpc,geffzhang\/grpc,LuminateWireless\/grpc,infinit\/grpc,simonkuang\/grpc,a-veitch\/grpc,jboeuf\/grpc,quizlet\/grpc,quizlet\/grpc,MakMukhi\/grpc,rjshade\/grpc,grani\/grpc,infinit\/grpc,sreecha\/grpc,greasypizza\/grpc,mehrdada\/grpc,thunderboltsid\/grpc,quizlet\/grpc,yongni\/grpc,adelez\/grpc,yongni\/grpc,stanley-cheung\/grpc,MakMukhi\/grpc,jcanizales\/grpc,ejona86\/grpc,kpayson64\/grpc,quizlet\/grpc,thinkerou\/grpc,muxi\/grpc,muxi\/grpc,7anner\/grpc,perumaalgoog\/grpc,apolcyn\/grpc,Crevil\/grpc,soltanmm-google\/grpc,dgquintas\/grpc,soltanmm\/grpc,dgquintas\/grpc,fuchsia-mirror\/third_party-grpc,thinkerou\/grpc,philcleveland\/grpc,hstefan\/grpc,dgquintas\/grpc,royalharsh\/grpc,pszemus\/grpc,soltanmm-google\/grpc,msmania\/grpc,soltanmm-google\/grpc,a11r\/grpc,jtattermusch\/grpc,7anner\/grpc,a11r\/grpc,jcanizales\/grpc,zhimingxie\/grpc,malexzx\/grpc,kriswuollett\/grpc,carl-mastrangelo\/grpc,chrisdunelm\/grpc,ncteisen\/grpc,yongni\/grpc,simonkuang\/grpc,deepaklukose\/grpc,zhimingxie\/grpc,makdharma\/grpc,wcevans\/grpc,soltanmm-google\/grpc,donnadionne\/grpc,vjpai\/grpc,fuchsia-mirror\/third_party-grpc,7anner\/grpc,rjshade\/grpc,simonkuang\/grpc,grpc\/grpc,pmarks-net\/grpc,pszemus\/grpc,jboeuf\/grpc,philcleveland\/grpc,dgquintas\/grpc,kriswuollett\/grpc,fuchsia-mirror\/third_party-grpc,pmarks-net\/grpc,zhimingxie\/grpc,chrisdunelm\/grpc,deepaklukose\/grpc,malexzx\/grpc,hstefan\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,MakMukhi\/grpc,kpayson64\/grpc,thinkerou\/grpc,kumaralokgithub\/grpc,jtattermusch\/grpc,thunderboltsid\/grpc,ipylypiv\/grpc,geffzhang\/grpc,muxi\/grpc,soltanmm\/grpc,vsco\/grpc,firebase\/grpc,pszemus\/grpc,vjpai\/grpc,a-veitch\/grpc,daniel-j-born\/grpc,baylabs\/grpc,grani\/grpc,kskalski\/grpc,soltanmm-google\/grpc,makdharma\/grpc,chrisdunelm\/grpc,philcleveland\/grpc,sreecha\/grpc,7anner\/grpc,wcevans\/grpc,sreecha\/grpc,ctiller\/grpc,sreecha\/grpc,mehrdada\/grpc,quizlet\/grpc,royalharsh\/grpc,adelez\/grpc,MakMukhi\/grpc,kpayson64\/grpc,pszemus\/grpc,daniel-j-born\/grpc,muxi\/grpc,Vizerai\/grpc,geffzhang\/grpc,malexzx\/grpc,jtattermusch\/grpc,PeterFaiman\/ruby-grpc-minimal,baylabs\/grpc,y-zeng\/grpc,perumaalgoog\/grpc,royalharsh\/grpc,MakMukhi\/grpc,ncteisen\/grpc,grpc\/grpc,muxi\/grpc,7anner\/grpc,infinit\/grpc,greasypizza\/grpc,a-veitch\/grpc,philcleveland\/grpc,hstefan\/grpc,infinit\/grpc,stanley-cheung\/grpc,a-veitch\/grpc,wcevans\/grpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/core\/lib\/iomgr\/tcp_server_posix.c\n+++ src\/core\/lib\/iomgr\/tcp_server_posix.c\n@@ -512,8 +512,9 @@\n sp->port = port;\n sp->port_index = listener->port_index;\n sp->fd_index = listener->fd_index + count - i;\n+ listener->sibling = sp;\n sp->is_sibling = 1;\n- sp->sibling = listener->is_sibling ? listener->sibling : listener;\n+ sp->sibling = listener->sibling;\n GPR_ASSERT(sp->emfd);\n while (listener->server->tail->next != NULL) {\n listener->server->tail = listener->server->tail->next;\n"} {"commit":"090f616ac1b90be4f59dce7d6d9da19d09d29b8b","subject":"removed debugging messages","message":"removed debugging messages\n","repos":"gonzus\/http-nghttp2,gonzus\/http-nghttp2,gonzus\/http-nghttp2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -177,13 +177,11 @@\n memset(context, 0, sizeof(context_t));\n context->type = type;\n context->info = nghttp2_version(0);\n- printf(\"Created context object %p\\n\", context);\n return context;\n }\n \n void context_dtor(context_t* context)\n {\n- printf(\"Destroying context object %p\\n\", context);\n free(context);\n }\n \n@@ -224,13 +222,18 @@\n \n nghttp2_session_callbacks_del(callbacks);\n \n+ \/*\n printf(\"Opened session %p - %d (%s)\\n\",\n context->session, ret, nghttp2_strerror(ret));\n+ *\/\n \n nghttp2_submit_settings( context->session, NGHTTP2_FLAG_NONE, NULL, 0 );\n \n+ \/*\n printf(\"Submitted settings %p (%s)\\n\",\n context->session, nghttp2_strerror(ret));\n+ *\/\n+ (void)ret;\n }\n \n void context_session_close(context_t* context)\n@@ -240,7 +243,7 @@\n return;\n }\n \n- printf(\"Closing session %p\\n\", context->session);\n+ \/*printf(\"Closing session %p\\n\", context->session);*\/\n nghttp2_session_del(context->session);\n context->session = 0;\n }\n@@ -252,7 +255,7 @@\n return;\n }\n \n- printf(\"Terminating session %p, reason %d\\n\", context->session, reason);\n+ \/*printf(\"Terminating session %p, reason %d\\n\", context->session, reason);*\/\n nghttp2_session_terminate_session(context->session, reason);\n }\n \n@@ -263,7 +266,7 @@\n return 0;\n }\n \n- printf(\"want_read for session %p\\n\", context->session);\n+ \/*printf(\"want_read for session %p\\n\", context->session);*\/\n return nghttp2_session_want_read(context->session);\n }\n \n@@ -274,6 +277,6 @@\n return 0;\n }\n \n- printf(\"want_write for session %p\\n\", context->session);\n+ \/*printf(\"want_write for session %p\\n\", context->session);*\/\n return nghttp2_session_want_write(context->session);\n }\n"} {"commit":"e54d356746511ee1e21a9aa498b2ce818c91d07e","subject":"Fix hexadecimal integer parsing.","message":"Fix hexadecimal integer parsing.\n","repos":"libav\/c99-to-c89,rbultje\/c99-to-c89,rbultje\/c99-to-c89,mstorsjo\/c99-to-c89,mstorsjo\/c99-to-c89,libav\/c99-to-c89","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- convert.c\n+++ convert.c\n@@ -510,10 +510,14 @@\n }\n case CXCursor_IntegerLiteral: {\n CXString tsp;\n+ const char *str;\n+ char *end;\n \n assert(n_tokens == 2);\n tsp = clang_getTokenSpelling(TU, tokens[0]);\n- cache->n[++cache->n[0]] = atoi(clang_getCString(tsp));\n+ str = clang_getCString(tsp);\n+ cache->n[++cache->n[0]] = strtol(str, &end, 0);\n+ assert(end - str == strlen(str));\n clang_disposeString(tsp);\n break;\n }\n"} {"commit":"43f5d04980683cf4828c12c20998e4884bde2694","subject":"flush: use a pipe to unlock the sensor_poll func","message":"flush: use a pipe to unlock the sensor_poll func\n\nIf the framework calls the flush method while *sensor_poll*\nis waiting for events then the flush_complete event is delayed until\nthe sensor reports the first event.\nThe CTSVerifier Sensor test (testBatchAndFlush) is failing for SX9500\ndue to this delay. (No event is reported because SX9500's reporting mode\nis On-change).\nUse a pipe to generate an event when the flush method is executed so that\nthe flush_complete event can be reported to the framework.\n\nChange-Id: Ie24a32f546f71330bdd0205e7b6f398855c2146c\nTracked-On: https:\/\/jira01.devtools.intel.com\/browse\/GMINL-15425\nSigned-off-by: Constantin Musca <c18bac86dac31feebca9bb09ff094667b284e015@intel.com>\nReviewed-on: https:\/\/android.intel.com:443\/397566\n","repos":"01org\/android-iio-sensors-hal,01org\/android-iio-sensors-hal","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- control.c\n+++ control.c\n@@ -34,11 +34,14 @@\n \n static int active_poll_sensors;\t\t\t\t\/* Number of enabled poll-mode sensors\t\t*\/\n \n+static int flush_event_fd[2];\t\t\t\t\/* Pipe used for flush signaling *\/\n+\n \/* We use pthread condition variables to get worker threads out of sleep *\/\n static pthread_condattr_t thread_cond_attr\t[MAX_SENSORS];\n static pthread_cond_t thread_release_cond\t[MAX_SENSORS];\n static pthread_mutex_t thread_release_mutex\t[MAX_SENSORS];\n \n+#define FLUSH_REPORT_TAG\t\t\t900\n \/*\n * We associate tags to each of our poll set entries. These tags have the following values:\n * - a iio device number if the fd is a iio character device fd\n@@ -1635,6 +1638,12 @@\n \t\t\t\t\t\/* Get report from acquisition thread *\/\n \t\t\t\t\tintegrate_thread_report(ev[i].data.u32);\n \t\t\t\t\tbreak;\n+\t\t\t\tcase FLUSH_REPORT_TAG:\n+\t\t\t\t\t{\n+\t\t\t\t\t\tchar flush_event_content;\n+\t\t\t\t\t\tread(flush_event_fd[0], &flush_event_content, sizeof(flush_event_content));\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n \n \t\t\t\tdefault:\n \t\t\t\t\tALOGW(\"Unexpected event source!\\n\");\n@@ -1674,18 +1683,21 @@\n \n int sensor_flush (int s)\n {\n+\tchar flush_event_content = 0;\n \t\/* If one shot or not enabled return -EINVAL *\/\n \tif (sensor_desc[s].flags & SENSOR_FLAG_ONE_SHOT_MODE || !is_enabled(s))\n \t\treturn -EINVAL;\n \n \tsensor[s].meta_data_pending++;\n+\twrite(flush_event_fd[1], &flush_event_content, sizeof(flush_event_content));\n \treturn 0;\n }\n \n \n int allocate_control_data (void)\n {\n-\tint i;\n+\tint i, ret;\n+\tstruct epoll_event ev = {0};\n \n \tfor (i=0; i<MAX_DEVICES; i++) {\n \t\tdevice_fd[i] = -1;\n@@ -1699,6 +1711,21 @@\n \t\treturn -1;\n \t}\n \n+\tret = pipe(flush_event_fd);\n+\tif (ret) {\n+\t\tALOGE(\"Cannot create flush_event_fd\");\n+\t\treturn -1;\n+\t}\n+\n+\tev.events = EPOLLIN;\n+\tev.data.u32 = FLUSH_REPORT_TAG;\n+\tret = epoll_ctl(poll_fd, EPOLL_CTL_ADD, flush_event_fd[0] , &ev);\n+\tif (ret == -1) {\n+\t\tALOGE(\"Failed adding %d to poll set (%s)\\n\",\n+\t\t\tflush_event_fd[0], strerror(errno));\n+\t\treturn -1;\n+\t}\n+\n \treturn poll_fd;\n }\n \n"} {"commit":"c1df0d2160e051d6610b7355b8e6840ba1bafc2c","subject":"Removed modify callbacks","message":"Removed modify callbacks\n","repos":"iLCSoft\/LCIO,petricm\/LCIO,petricm\/LCIO,petricm\/LCIO,petricm\/LCIO,petricm\/LCIO,iLCSoft\/LCIO,petricm\/LCIO,iLCSoft\/LCIO,iLCSoft\/LCIO,iLCSoft\/LCIO,iLCSoft\/LCIO","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cpp\/include\/MT\/LCReaderListener.h\n+++ src\/cpp\/include\/MT\/LCReaderListener.h\n@@ -18,25 +18,11 @@\n virtual ~LCReaderListener() {}\n \n \/**\n- * @brief modify an event \n- * \n- * @param event the event to modify\n- *\/\n- virtual void modifyEvent( LCEventPtr event ) = 0 ;\n-\n- \/**\n * @brief process an event \n * \n * @param event the event to process\n *\/\n virtual void processEvent( LCEventPtr event ) = 0 ;\n-\n- \/**\n- * @brief modify a run header\n- * \n- * @param hdr the run header to modify\n- *\/\n- virtual void modifyRunHeader( LCRunHeaderPtr hdr ) = 0 ;\n \n \/**\n * @brief process a run header\n"} {"commit":"c211f16461b8ea00830a7bf6c2c0c192760424b8","subject":"Fix getpage.c","message":"Fix getpage.c\n","repos":"gostekk\/webrowser,gostekk\/webrowser","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- getpage.c\n+++ getpage.c\n@@ -1,29 +1,23 @@\n #include <stdio.h>\n #include <curl\/curl.h>\n \n-\n-int main(int argc, char* args[]) {\n-\n- char *url = args[1];\n+int main(int argc, char **argv)\n+{\n CURL *curl;\n+ FILE *fp;\n CURLcode res;\n- FILE *file;\n-\n+ char *url = argv[1];\n+ char outfilename[FILENAME_MAX] = \"page.html\";\n curl = curl_easy_init();\n- if(curl) {\n+ if (curl)\n+ {\n+ fp = fopen(outfilename,\"wb\");\n curl_easy_setopt(curl, CURLOPT_URL, url);\n-\n- char *output = args[1];\n- file = fopen(output, \"wb\");\n- curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);\n-\n+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL);\n+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);\n res = curl_easy_perform(curl);\n- if(res != CURLE_OK)\n- fprintf(stderr, \"Couldn't download file: %s\\n\",\n- curl_easy_strerror(res));\n-\n curl_easy_cleanup(curl);\n+ fclose(fp);\n }\n-\n return 0;\n }\n"} {"commit":"c7b87da15b8a444b549cb9d65634b0aef99c5948","subject":"Some more debug for compound literals.","message":"Some more debug for compound literals.\n","repos":"rbultje\/c99-to-c89,rbultje\/c99-to-c89,libav\/c99-to-c89,libav\/c99-to-c89,mstorsjo\/c99-to-c89,mstorsjo\/c99-to-c89","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- convert.c\n+++ convert.c\n@@ -763,6 +763,14 @@\n clang_getCString(str), parent.kind);\n clang_visitChildren(cursor, callback, 0);\n break;\n+ case CXCursor_ParenExpr:\n+ dprintf(\"Parenthesis - parent=%d\\n\", parent.kind);\n+ clang_visitChildren(cursor, callback, 0);\n+ break;\n+ case CXCursor_CallExpr:\n+ dprintf(\"Call - parent=%d\\n\", parent.kind);\n+ clang_visitChildren(cursor, callback, 0);\n+ break;\n case CXCursor_TypeRef:\n if (parent.kind == CXCursor_CompoundLiteralExpr) {\n \/\/ (type) { val }\n"} {"commit":"bad043d27b683dd869bea0b879544d94f9d27ea7","subject":"added test_localuser_tx, message_stat_update replaces create_sync for scene update","message":"added test_localuser_tx, message_stat_update replaces create_sync for scene update\n","repos":"lingfliu\/smart_tuwa,lingfliu\/smart_tuwa,lingfliu\/smart_tuwa,lingfliu\/smart_tuwa","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- twrt\/src\/twrt.c\n+++ twrt\/src\/twrt.c\n@@ -338,7 +338,8 @@\n \t\tpthread_exit(0);\n \t}\n \n-\tprintf(\"sending message type=%d\\n\",msg->data_type);\n+\tprintf(\"sending message type=%d, len = %d\\n\",msg->data_type, msg->data_len);\n+\n \tchar *bytes = calloc(len,sizeof(char)); \n \tmessage2bytes(msg, bytes);\n \tint ret; \n@@ -681,6 +682,64 @@\n \t}\n }\n \n+int test_localuser_tx(localbundle* bundle){\n+\tprintf(\"test localuser tx\\n\");\n+\tlocaluser *usr = bundle->usr;\n+\tmessage *msg = bundle->msg;\n+\tchar *local_status = &(usr->tx_status);\n+\n+\tint len = MSG_LEN_FIXED+msg->data_len;\n+\tif(len == 0) {\n+\t\t*local_status = LOCAL_STATUS_MSGINVALID;\n+\t\treturn *local_status;\n+\t}\n+\n+\tchar *bytes = calloc(len,sizeof(char)); \n+\tmessage2bytes(msg, bytes);\n+\tint ret; \n+\tint pos = 0;\n+\n+\twhile(pos < len) {\n+\t\tret = send( usr->skt, bytes+pos, len - pos, 0 );\n+\t\tif( ret == len - pos ) {\n+\t\t\tfree(bytes); \/\/don't forget to free the mem\n+\t\t\tif (msg->data_type == 70){\n+\t\t\t\tprintf(\"localuser tx, datatype = %d, send complete \\n\", msg->data_type);\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\tprintf(\"localuser tx, datatype = %d, send complete \\n\", msg->data_type);\n+\t\t\t}\n+\t\t\t*local_status = LOCAL_STATUS_SKTDISCONNECT;\n+\t\t\treturn *local_status;\n+\t\t}\n+\n+\t\tif(ret == -1) { \/\/send failed\n+\t\t\tif( errno == EAGAIN || errno == EINTR ) { \/\/buff is full or interrupted\n+\t\t\t\tusleep(1000);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tif(errno == ECONNRESET) { \/\/connection broke\n+\t\t\t\tprintf(\"localuser tx reset, close socket\\n\");\n+\t\t\t\tfree(bytes);\n+\t\t\t\t*local_status = LOCAL_STATUS_SKTDISCONNECT;\n+\t\t\t\treturn *local_status;\n+\t\t\t}\n+\t\t\tprintf(\"localuser tx broken, other reasons, close socket\\n\");\n+\t\t\tfree(bytes); \/\/don't forget to free the mem\n+\t\t\t*local_status = LOCAL_STATUS_SKTDISCONNECT;\n+\t\t\treturn *local_status;\n+\t\t}\n+\t\telse { \/\/send partial data\n+\t\t\tpos += ret;\n+\t\t}\n+\t}\n+\tfree(bytes); \/\/don't forget to free the mem\n+\t*local_status = LOCAL_STATUS_EXITNORMAL;\n+\treturn *local_status;\n+}\n+\n+\n+\n void* run_localuser_tx(void *arg){\n \tlocalbundle *bundle = (localbundle*) arg;\n \tlocaluser *usr = bundle->usr;\n@@ -703,7 +762,13 @@\n \t\tif( ret == len - pos ) {\n \t\t\tfree(bytes); \/\/don't forget to free the mem\n \t\t\t*local_status = LOCAL_STATUS_EXITNORMAL;\n-\t\t\tprintf(\"localuser tx, datatype = %d\\n\", msg->data_type);\n+\t\t\tif (msg->data_type == 70){\n+\t\t\t\tprintf(\"localuser tx, datatype = %d, send complete \\n\", msg->data_type);\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\tprintf(\"localuser tx, datatype = %d, send complete \\n\", msg->data_type);\n+\t\t\t}\n+\n \t\t\tpthread_exit((void*) local_status);\n \t\t}\n \n@@ -713,10 +778,12 @@\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif(errno == ECONNRESET) { \/\/connection broke\n+\t\t\t\tprintf(\"localuser tx reset, close socket\\n\");\n \t\t\t\tfree(bytes);\n \t\t\t\t*local_status = LOCAL_STATUS_SKTDISCONNECT;\n \t\t\t\tpthread_exit((void*) local_status);\n \t\t\t}\n+\t\t\tprintf(\"localuser tx broken, other reasons, close socket\\n\");\n \t\t\tfree(bytes); \/\/don't forget to free the mem\n \t\t\t*local_status = LOCAL_STATUS_SKTDISCONNECT;\n \t\t\tpthread_exit((void*) local_status);\n@@ -884,7 +951,8 @@\n \t\t\tif(idx >= 0) {\n \n \t\t\t\tprintf(\"received data stat from znet, dev index = %d, device type = %d\\n\", idx, sys.znode_list[idx].type);\n-\t\t\t\tmsg_tx = message_create_sync(sys.znode_list[idx].status_len, sys.znode_list[idx].status, sys.znode_list[idx].u_stamp, sys.id, sys.znode_list[idx].id, sys.znode_list[idx].type);\n+\t\t\t\t\/\/new code, send stat update\n+\t\t\t\tmsg_tx = message_create_stat_update(sys.znode_list[idx].status_len, sys.znode_list[idx].status, sys.znode_list[idx].u_stamp, sys.id, sys.znode_list[idx].id, sys.znode_list[idx].type);\n \t\t\t\tpthread_mutex_lock(&mut_msg_tx);\n \t\t\t\tmsg_q_tx = message_queue_put(msg_q_tx, msg_tx);\n \t\t\t\tpthread_mutex_unlock(&mut_msg_tx);\n@@ -989,6 +1057,7 @@\n \t\t\t\t\t\t\t\tsce->trigger_num = 0;\n \t\t\t\t\t\t\t\tsce->item_num = val;\n \t\t\t\t\t\t\t\tsce->item = calloc(val, sizeof(scene_item));\n+\t\t\t\t\t\t\t\tsce->scene_type = SCENE_TYPE_HARD;\n \t\t\t\t\t\t\t}\n \t\t\t\t\t\t\telse{\n \t\t\t\t\t\t\t\tisnew = -1;\n@@ -1001,6 +1070,8 @@\n \t\t\t\t\t\t\t\tsce->trigger_num = 0;\n \t\t\t\t\t\t\t\tsce->item_num = val;\n \t\t\t\t\t\t\t\tsce->item = calloc(val,sizeof(scene_item));\n+\n+\t\t\t\t\t\t\t\tsce->scene_type = SCENE_TYPE_HARD;\n \t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\n \t\t\t\t\t\t\tval = 0;\n@@ -1040,7 +1111,7 @@\n \t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t}\n \n-\t\t\t\t\t\t\tif (isnew >=0){\n+\t\t\t\t\t\t\tif (isnew >= 0){\n \t\t\t\t\t\t\t\tval = sys_edit_scene(&sys, sce); \/\/modify scene\n \t\t\t\t\t\t\t}\n \t\t\t\t\t\t\telse {\n@@ -1152,8 +1223,19 @@\n \t\t\t\t\/*new code*\/\n \t\t\t\tval = sys.znode_list[idx].type;\n \t\t\t\tif (val == 110 || val == 113 || val == 118 || val == 115){\n-\t\t\t\t\tprintf(\"alarm, type = %d, reset trigger at idx %d\\n\", val, idx);\n+\n+\t\t\t\t\tprintf(\"alarm, type = %d, reset trigger at idx %d, status before = \", val, idx);\n+\t\t\t\t\tfor (m = 0 ; m < sys.znode_list[idx].status_len; m ++){\n+\t\t\t\t\t\tprintf(\"%d \", sys.znode_list[idx].status[m] & 0x00ff);\n+\t\t\t\t\t}\n+\n \t\t\t\t\tmemset(sys.znode_list[idx].status, 0, sys.znode_list[idx].status_len);\n+\n+\t\t\t\t\tprintf(\" after = \");\n+\t\t\t\t\tfor (m = 0 ; m < sys.znode_list[idx].status_len; m ++){\n+\t\t\t\t\t\tprintf(\"%d \", sys.znode_list[idx].status[m] & 0x00ff);\n+\t\t\t\t\t}\n+\t\t\t\t\tprintf(\"\\n\");\n \t\t\t\t}\n \n \t\t\t\t\/*\n@@ -1260,10 +1342,10 @@\n \t\t\t}\n \n \t\tcase DATA_ACK_AUTH_GW:\n-\t\t\tprintf(\"received data auth\\n\");\n \t\t\tpthread_mutex_lock(&mut_msg_tx);\n \t\t\tval = message_queue_del_stamp(&msg_q_tx_req_h, msg->stamp);\n \t\t\tif(val > 0){\/\/if req still in the queue \n+\t\t\t\tprintf(\"received data auth\\n\");\n \t\t\t\tif(!memcmp(msg->data, sys.id, MSG_LEN_ID_GW)){\/\/if head equals to the gw id\n \t\t\t\t\tsys.lic_status = LIC_VALID;\n \t\t\t\t\tmemcpy(sys.auth_code, msg->data, SYS_LEN_AUTHCODE); \n@@ -1573,14 +1655,15 @@\n \t\t\tbreak;\n \n \t\tcase DATA_GET_SCENE:\n+\t\t\tprintf(\"get scene, id major = %s, id_minor = %s\\n\", id_major, id_minor);\n \t\t\tmemcpy(id_major, msg->data, 8*sizeof(char));\n \t\t\tmemcpy(id_minor, msg->data+8, 8*sizeof(char));\n \t\t\tsce = sys_find_scene(&sys, id_major, id_minor);\n \n-\t\t\tprintf(\"get scene, host_mac=%s, id_major=%s, id_minor=%s\\n\", sce->host_mac, sce->host_id_major, sce->host_id_minor);\n \n \t\t\tif (sce == NULL) {\n \t\t\t\t\/\/send all sces\n+\t\t\t\tprintf(\"send all scenes to server\\n\");\n \t\t\t\tpthread_mutex_lock(&mut_msg_tx);\n \t\t\t\tfor (m = 0; m < MAX_SCENE_NUM; m ++){\n \t\t\t\t\tif (sys.sces[m].scene_type <=0)\n@@ -1593,6 +1676,7 @@\n \t\t\t\tpthread_mutex_unlock(&mut_msg_tx);\n \t\t\t}\n \t\t\telse {\n+\t\t\t\tprintf(\"get scene, id major = %s, id_minor = %s\\n\", id_major, id_minor);\n \t\t\t\tpthread_mutex_lock(&mut_msg_tx);\n \t\t\t\tmsg_q_tx = message_queue_put(msg_q_tx, msg_tx);\n \t\t\t\tmsg_tx = message_create_scene(sys.id, sce);\n@@ -1951,8 +2035,19 @@\n \t\t\t\t\t\/*new code*\/\n \t\t\t\t\tval = sys.znode_list[idx].type;\n \t\t\t\t\tif (val == 110 || val == 113 || val == 118 || val == 115){\n-\t\t\t\t\t\tprintf(\"alarm, type = %d, reset trigger at idx %d\\n\", val, idx);\n+\n+\t\t\t\t\t\tprintf(\"alarm, type = %d, reset trigger at idx %d, status before = \", val, idx);\n+\t\t\t\t\t\tfor (m = 0 ; m < sys.znode_list[idx].status_len; m ++){\n+\t\t\t\t\t\t\tprintf(\"%d \", sys.znode_list[idx].status[m] & 0x00ff);\n+\t\t\t\t\t\t}\n+\n \t\t\t\t\t\tmemset(sys.znode_list[idx].status, 0, sys.znode_list[idx].status_len);\n+\n+\t\t\t\t\t\tprintf(\" after = \");\n+\t\t\t\t\t\tfor (m = 0 ; m < sys.znode_list[idx].status_len; m ++){\n+\t\t\t\t\t\t\tprintf(\"%d \", sys.znode_list[idx].status[m] & 0x00ff);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tprintf(\"\\n\");\n \t\t\t\t\t}\n \n \t\t\t\t\tupdate_num ++;\n@@ -2300,6 +2395,7 @@\n \t\t\t\t}\n \n \t\t\t\tprintf(\"set scene, host_mac = %s, id_major=%s, id_minor=%s\\n\", sce->host_mac, sce->host_id_major, sce->host_id_minor);\n+\n \t\t\t\t\/\/send operation result back\n \t\t\t\tmsg_tx = message_create_ack_scene_op(sys.id, sce->host_id_major, sce->host_id_minor, DATA_SET_SCENE, val);\n \t\t\t\tbundle.msg = msg_tx;\n@@ -2359,13 +2455,26 @@\n \t\t\t\tprintf(\"finish scene\\n\"); \n \t\t\t\tsys_update_scene(&sys, FILE_SCENE); \/\/store scenes into file\n \n-\t\t\t\tmsg_tx = message_create_ack_scene_op(sys.id, NULL_USER, NULL_USER, DATA_FINISH_SCENE, 1);\n+\t\t\t\t\/\/send operation result back\n+\t\t\t\tmsg_tx = message_create_ack_scene_op(sys.id, NULL_DEV, NULL_DEV, DATA_FINISH_SCENE, 1);\n+\n \n \t\t\t\tbundle.msg = msg_tx;\n+\n+\t\t\t\t\/*\n \t\t\t\tpthread_create( &(usr->thrd_tx), NULL, run_localuser_tx, &bundle);\n \t\t\t\t\/\/the thrd_tx should return a new \n \t\t\t\tpthread_join(usr->thrd_tx, NULL);\n \t\t\t\t\/\/don't forget to delete the message\n+\t\t\t\tmessage_destroy(msg_tx);\n+\t\t\t\t*\/\n+\n+\n+\t\t\t\tpthread_create( &(usr->thrd_tx), NULL, run_localuser_tx, &bundle);\n+\t\t\t\t\/\/the thrd_tx should return a new \n+\t\t\t\tpthread_join(usr->thrd_tx, NULL);\n+\t\t\t\t\/\/don't forget to delete the message\n+\t\t\t\t\/\/test_localuser_tx(&bundle);\n \t\t\t\tmessage_destroy(msg_tx);\n \t\n \t\t\t\tresult = 0;\n@@ -2480,8 +2589,8 @@\n \t\t\t\tfor (m = 0; m < ZNET_SIZE; m ++){\n \t\t\t\t\tif (!memcmp(sys.znode_list[m].id, msg->dev_id, 8)){\n \t\t\t\t\t\t\/\/found znode to-be-deleted\n+\t\t\t\t\t\tidx = m;\n \t\t\t\t\t\tprintf(\"found znode, idx = %d\\n\", idx);\n-\t\t\t\t\t\tidx = m;\n \t\t\t\t\t\tznode_delete(&(sys.znode_list[m]));\n \t\t\t\t\t\tbreak;\n \t\t\t\t\t}\n@@ -2489,6 +2598,7 @@\n \n \t\t\t\tif (idx >= 0){\n \t\t\t\t\t\/\/send znode_delete to server\n+\t\t\t\t\tprintf(\"znode deleted at idx %d\\n\", idx);\n \t\t\t\t\tmsg_tx = message_create_del_znode(sys.id, msg->dev_id);\n \t\t\t\t\tpthread_mutex_lock(&mut_msg_tx);\n \t\t\t\t\tmsg_q_tx = message_queue_put(msg_q_tx, msg_tx);\n@@ -2496,6 +2606,9 @@\n \t\t\t\t\tmessage_destroy(msg_tx);\n \t\t\t\t\tretval = 0;\n \t\t\t\t}\n+\t\t\t\telse {\n+\t\t\t\t\tprintf(\"znode not found\\n\");\n+\t\t\t\t}\n \t\t\t\tbreak;\n \n \t\t\tcase DATA_PULSE:\n"} {"commit":"8c926262264d808b31eb29beaf26c7a69b730dff","subject":"STPK-1429 Adjust sampling rate according to to available rates set","message":"STPK-1429 Adjust sampling rate according to to available rates set\n\nThe MPU-6500 driver allows sampling frequency to be set in a\ndiscrete set of ranges. Use this information if available, by\nusing the first available frequency that is equal or higher than\nthe desired rate.\n\nIssue: STPK-1429\n\nChange-Id: I8f8aeebbd057d8bebf06ede0eb2259afe6dfae42\nSigned-off-by: Patrick Porlan <6b7a5b9114e07d350ffba0c179039885a7e82794@intel.com>\n","repos":"01org\/android-iio-sensors-hal,01org\/android-iio-sensors-hal","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- control.c\n+++ control.c\n@@ -2,6 +2,8 @@\n * Copyright (C) 2014 Intel Corporation.\n *\/\n \n+#include <stdlib.h>\n+#include <ctype.h>\n #include <fcntl.h>\n #include <sys\/epoll.h>\n #include <sys\/socket.h>\n@@ -654,6 +656,7 @@\n \t\/* See Android sensors.h for indication on sensor trigger modes *\/\n \n \tchar sysfs_path[PATH_MAX];\n+\tchar avail_sysfs_path[PATH_MAX];\n \tint dev_num\t\t=\tsensor_info[s].dev_num;\n \tint i\t\t\t=\tsensor_info[s].catalog_index;\n \tconst char *prefix\t=\tsensor_catalog[i].tag;\n@@ -661,6 +664,8 @@\n \tint cur_sampling_rate;\n \tint per_sensor_sampling_rate;\n \tint per_device_sampling_rate;\n+\tchar freqs_buf[100];\n+\tchar* cursor;\n \tint n;\n \n \tif (!ns) {\n@@ -706,7 +711,52 @@\n \t\t\t sensor_info[n].sampling_rate > new_sampling_rate)\n \t\t\t\tnew_sampling_rate= sensor_info[n].sampling_rate;\n \n-\t\/* If the desired rate is already activen we're all set *\/\n+\t\/* Check if we have contraints on allowed sampling rates *\/\n+\n+\tsprintf(avail_sysfs_path, DEVICE_AVAIL_FREQ_PATH, dev_num);\n+\n+\tif (sysfs_read_str(avail_sysfs_path, freqs_buf, sizeof(freqs_buf)) > 0){\n+\t\tcursor = freqs_buf;\n+\n+\t\t\/* Decode allowed sampling rates string, ex: \"10 20 50 100\" *\/\n+\n+\t\t\/* While we're not at the end of the string *\/\n+\t\twhile (*cursor && cursor[0]) {\n+\n+\t\t\t\/* Decode a single integer value *\/\n+\t\t\tn = atoi(cursor);\n+\n+\t\t\t\/* If this matches the selected rate, we're happy *\/\n+\t\t\tif (new_sampling_rate == n)\n+\t\t\t\tbreak;\n+\n+\t\t\t\/*\n+\t\t\t * If we reached a higher value than the desired rate,\n+\t\t\t * adjust selected rate so it matches the first higher\n+\t\t\t * available one and stop parsing - this makes the\n+\t\t\t * assumption that rates are sorted by increasing value\n+\t\t\t * in the allowed frequencies string.\n+\t\t\t *\/\n+\t\t\tif (n > new_sampling_rate) {\n+\t\t\t\tALOGI(\n+\t\t\t\t\"Increasing sampling rate on sensor %d to %d\\n\",\n+\t\t\t\ts, n);\n+\n+\t\t\t\tnew_sampling_rate = n;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\t\/* Skip digits *\/\n+\t\t\twhile (cursor[0] && !isspace(cursor[0]))\n+\t\t\t\tcursor++;\n+\n+\t\t\t\/* Skip spaces *\/\n+\t\t\twhile (cursor[0] && isspace(cursor[0]))\n+\t\t\t\t\tcursor++;\n+\t\t}\n+\t}\n+\n+\t\/* If the desired rate is already active we're all set *\/\n \tif (new_sampling_rate == cur_sampling_rate)\n \t\treturn 0;\n \n@@ -725,6 +775,7 @@\n \n \treturn 0;\n }\n+\n \n \n int allocate_control_data (void)\n"} {"commit":"71f59eaf6cbb2fdb0eac20a1911664645d94dba3","subject":"add comments","message":"add comments","repos":"kjbracey-arm\/mbed,kjbracey-arm\/mbed,mbedmicro\/mbed,kjbracey-arm\/mbed,andcor02\/mbed-os,kjbracey-arm\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,andcor02\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- features\/FEATURE_BLE\/ble\/gap\/Types.h\n+++ features\/FEATURE_BLE\/ble\/gap\/Types.h\n@@ -152,6 +152,8 @@\n \/**\n * Device is connectable, scannable and doesn't expect connection from a\n * specific peer.\n+ * @note Cannot carry extended advertising payload, only legacy PDUs.\n+ * Use CONNECTABLE_NON_SCANNABLE_UNDIRECTED for non-legacy payload.\n *\n * @see Vol 3, Part C, Section 9.3.4 and Vol 6, Part B, Section 2.3.1.1.\n *\/\n@@ -185,6 +187,8 @@\n \n \/**\n * Device is connectable, but not scannable and doesn't expect connection from a specific peer.\n+ * @note Only for use with extended advertising payload, will not allow legacy PDUs\n+ * (use CONNECTABLE_UNDIRECTED for legacy PDU).\n *\/\n CONNECTABLE_NON_SCANNABLE_UNDIRECTED = 0x05,\n \n"} {"commit":"1e9c93efe742cc57dde456a42cf34508fa741c58","subject":"Add some more documentation.","message":"Add some more documentation.\n","repos":"mstorsjo\/c99-to-c89,libav\/c99-to-c89,libav\/c99-to-c89,rbultje\/c99-to-c89,rbultje\/c99-to-c89,mstorsjo\/c99-to-c89","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- convert.c\n+++ convert.c\n@@ -36,6 +36,45 @@\n * of the statements in the same context needs to be within the\n * brackets, otherwise the resulting code could contain mixed\n * variable declarations and statements, which c89 does not allow.\n+ *\n+ * Like for compound literals, c89 does not support designated\n+ * initializers, thus we attempt to replace them. The basic idea\n+ * is to parse the layout of structs and enums, and then to parse\n+ * expressions like:\n+ * {\n+ * [index1] = val1,\n+ * [index2] = val2,\n+ * }\n+ * or\n+ * {\n+ * .member1 = val1,\n+ * .member2 = val2,\n+ * }\n+ * and convert these to ordered struct\/array initializers without\n+ * designation, i.e.:\n+ * {\n+ * val1,\n+ * val2,\n+ * }\n+ * Note that in cases where the indexes or members are not ordered,\n+ * i.e. their order in the struct (for members) is different from\n+ * the order of initialization in the expression, or their numeric\n+ * values are not linearly ascending in the same way as they are\n+ * presented in the expression, then we have to reorder the expressions\n+ * and, in some cases, insert gap fillers. For example,\n+ * {\n+ * [index3] = val3,\n+ * [index1] = val1,\n+ * }\n+ * becomes\n+ * {\n+ * val1, 0,\n+ * val3,\n+ * }\n+ * (assuming val1 is the first value and val3 is the third value in\n+ * e.g. an enum, and in between these two is a value val2 which is\n+ * not used in this designated initializer expression. If the values\n+ * themselves are structs, we use {} instead of 0 as a gap filler.\n *\/\n \n typedef struct {\n"} {"commit":"78422f9035b88bee9d0c01fa2974e209e4a0e4f8","subject":"lm4: Add chip_read_reset_flags and chip_save_reset_flags","message":"lm4: Add chip_read_reset_flags and chip_save_reset_flags\n\nBattery backed up RAM is used to store the reset flags.\n\nThis patch wraps the code reading and writing the reset flags\nwith APIs for the consistency and make it available to external\ncallers like other chips.\n\nSigned-off-by: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\n\nBUG=chromium:1078470\nBRANCH=none\nTEST=buildall\n\nChange-Id: I39c8646e57755d661b239979946df2871275878b\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/2182561\nReviewed-by: Craig Hesling <383db090fd8ef907a606ac8a9eccd2962bc489cf@chromium.org>\nCommit-Queue: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\nTested-by: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\nAuto-Submit: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chip\/lm4\/system.c\n+++ chip\/lm4\/system.c\n@@ -101,6 +101,16 @@\n \n \t\/* Wait for write-complete *\/\n \treturn wait_for_hibctl_wc();\n+}\n+\n+uint32_t chip_read_reset_flags(void)\n+{\n+\treturn hibdata_read(HIBDATA_INDEX_SAVED_RESET_FLAGS);\n+}\n+\n+void chip_save_reset_flags(uint32_t flags)\n+{\n+\thibdata_write(HIBDATA_INDEX_SAVED_RESET_FLAGS, flags);\n }\n \n static void check_reset_cause(void)\n@@ -169,8 +179,8 @@\n \t\tflags |= EC_RESET_FLAG_LOW_BATTERY;\n \n \t\/* Restore then clear saved reset flags *\/\n-\tflags |= hibdata_read(HIBDATA_INDEX_SAVED_RESET_FLAGS);\n-\thibdata_write(HIBDATA_INDEX_SAVED_RESET_FLAGS, 0);\n+\tflags |= chip_read_reset_flags();\n+\tchip_save_reset_flags(0);\n \n \tsystem_set_reset_flags(flags);\n }\n@@ -529,7 +539,7 @@\n \tif (flags & SYSTEM_RESET_LEAVE_AP_OFF)\n \t\tsave_flags |= EC_RESET_FLAG_AP_OFF;\n \n-\thibdata_write(HIBDATA_INDEX_SAVED_RESET_FLAGS, save_flags);\n+\tchip_save_reset_flags(save_flags);\n \n \tif (flags & SYSTEM_RESET_HARD) {\n #ifdef CONFIG_SOFTWARE_PANIC\n"} {"commit":"7707c8b8b879ce5b08f8ba11056dd39f7d4fee59","subject":"bd: Added get_erase_value function to the block device API","message":"bd: Added get_erase_value function to the block device API\n\nDefault implementation returns -1 and is backwards compatible\n","repos":"kjbracey-arm\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,karsev\/mbed-os,karsev\/mbed-os,betzw\/mbed-os,karsev\/mbed-os,kjbracey-arm\/mbed,kjbracey-arm\/mbed,mbedmicro\/mbed,kjbracey-arm\/mbed,c1728p9\/mbed-os,betzw\/mbed-os,andcor02\/mbed-os,c1728p9\/mbed-os,andcor02\/mbed-os,karsev\/mbed-os,betzw\/mbed-os,c1728p9\/mbed-os,betzw\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,betzw\/mbed-os,mbedmicro\/mbed,c1728p9\/mbed-os,c1728p9\/mbed-os,andcor02\/mbed-os,betzw\/mbed-os,mbedmicro\/mbed,c1728p9\/mbed-os,karsev\/mbed-os,karsev\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- features\/filesystem\/bd\/BlockDevice.h\n+++ features\/filesystem\/bd\/BlockDevice.h\n@@ -85,7 +85,8 @@\n \n \/** Erase blocks on a block device\n *\n- * The state of an erased block is undefined until it has been programmed\n+ * The state of an erased block is undefined until it has been programmed,\n+ * unless get_erase_value returns a non-negative byte value\n *\n * @param addr Address of block to begin erasing\n * @param size Size to erase in bytes, must be a multiple of erase block size\n@@ -135,6 +136,20 @@\n return get_program_size();\n }\n \n+ \/** Get the value of storage when erased\n+ *\n+ * If get_erase_value returns a non-negative byte value, the underlying\n+ * storage will be set to that value when erased, and storage containing\n+ * that value can be programmed without another erase.\n+ *\n+ * @return The value of storage when erased, or -1 if the value of\n+ * erased storage can't be relied on\n+ *\/\n+ virtual int get_erase_value() const\n+ {\n+ return -1;\n+ }\n+\n \/** Get the total size of the underlying device\n *\n * @return Size of the underlying device in bytes\n"} {"commit":"6ea5645ca3bbb21f7fc5dab14c487ee264acccf4","subject":"[arch][riscv] stub out arch_enter_uspace for riscv","message":"[arch][riscv] stub out arch_enter_uspace for riscv\n\nCopied implementation from ARM and then stubbed it out.\n","repos":"hollanderic\/lkstuff,hollanderic\/lkstuff,littlekernel\/lk,hollanderic\/lkstuff,littlekernel\/lk,littlekernel\/lk,hollanderic\/lkstuff,littlekernel\/lk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/riscv\/arch.c\n+++ arch\/riscv\/arch.c\n@@ -9,6 +9,7 @@\n #include <lk\/trace.h>\n #include <lk\/debug.h>\n #include <stdint.h>\n+#include <stdlib.h>\n #include <arch\/riscv.h>\n #include <arch\/ops.h>\n #include <arch\/mp.h>\n@@ -108,6 +109,41 @@\n PANIC_UNIMPLEMENTED;\n }\n \n+#if RISCV_S_MODE\n+\/* switch to user mode, set the user stack pointer to user_stack_top, get into user space *\/\n+void arch_enter_uspace(vaddr_t entry_point, vaddr_t user_stack_top) {\n+ DEBUG_ASSERT(IS_ALIGNED(user_stack_top, 8));\n+\n+ thread_t *ct = get_current_thread();\n+\n+ vaddr_t kernel_stack_top = (uintptr_t)ct->stack + ct->stack_size;\n+ kernel_stack_top = ROUNDDOWN(kernel_stack_top, 8);\n+\n+ PANIC_UNIMPLEMENTED;\n+\n+#if 0\n+\n+ uint32_t spsr = CPSR_MODE_USR;\n+ spsr |= (entry_point & 1) ? CPSR_THUMB : 0;\n+\n+ arch_disable_ints();\n+\n+ asm volatile(\n+ \"ldmia %[ustack], { sp }^;\"\n+ \"msr\tspsr, %[spsr];\"\n+ \"mov\tsp, %[kstack];\"\n+ \"movs\tpc, %[entry];\"\n+ :\n+ : [ustack]\"r\"(&user_stack_top),\n+ [kstack]\"r\"(kernel_stack_top),\n+ [entry]\"r\"(entry_point),\n+ [spsr]\"r\"(spsr)\n+ : \"memory\");\n+#endif\n+ __UNREACHABLE;\n+}\n+#endif\n+\n \/* unimplemented cache operations *\/\n #if RISCV_NO_CACHE_OPS\n void arch_disable_cache(uint flags) { }\n"} {"commit":"541f44bd7196c2931cbd07e60c0b01affa5019db","subject":"Added GP_color.h and GP_palette.h into GP.h.","message":"Added GP_color.h and GP_palette.h into GP.h.\n","repos":"gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/GP.h\n+++ core\/GP.h\n@@ -41,6 +41,10 @@\n #include \"GP_fillcolumn.h\"\n #include \"GP_fillrow.h\"\n \n+\/* colors *\/\n+#include \"GP_color.h\"\n+#include \"GP_palette.h\"\n+\n \/* public drawing API *\/\n #include \"GP_getpixel.h\"\n #include \"GP_putpixel.h\"\n"} {"commit":"6ed56ba696f5def75068d7b78dce75d88ce09c88","subject":"correct a bug introduced in version 1.47 that occurs if a reader is muti-slot and no more sReadersContexts[] entries are available: RFRemoveReader() was called with a NULL lpcReader","message":"correct a bug introduced in version 1.47 that occurs if a reader is\nmuti-slot and no more sReadersContexts[] entries are available:\nRFRemoveReader() was called with a NULL lpcReader\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@952 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/readerfactory.c\n+++ src\/readerfactory.c\n@@ -320,7 +320,7 @@\n \t\t\t\/*\n \t\t\t * No more spots left return \n \t\t\t *\/\n-\t\t\trv = RFRemoveReader(tmpReader, dwPort);\n+\t\t\trv = RFRemoveReader(lpcReader, dwPort);\n \t\t\treturn SCARD_E_NO_MEMORY;\n \t\t}\n \n"} {"commit":"80a9755ecaa1954c3370b75db49fbcfd7daa1ceb","subject":"use return() instead of exit() if DYN_GetAddress() fails","message":"use return() instead of exit() if DYN_GetAddress() fails\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@4523 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/readerfactory.c\n+++ src\/readerfactory.c\n@@ -692,7 +692,7 @@\n \t\t\/* Neither version of the IFD Handler was found - exit *\/\n \t\tLog1(PCSC_LOG_CRITICAL, \"IFDHandler functions missing\");\n \n-\t\texit(1);\n+\t\treturn SCARD_F_UNKNOWN_ERROR;\n \t} else if (rv1 == SCARD_S_SUCCESS)\n \t{\n \t\t\/* Ifd Handler 1.0 found *\/\n@@ -716,7 +716,8 @@\n #define GET_ADDRESS_OPTIONALv1(field, function, code) \\\n { \\\n \tvoid *f1 = NULL; \\\n-\tif (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, \"IFD_\" #function)) \\\n+\tDWORD rv = DYN_GetAddress(rContext->vHandle, &f1, \"IFD_\" #function); \\\n+\tif (SCARD_S_SUCCESS != rv) \\\n \t{ \\\n \t\tcode \\\n \t} \\\n@@ -726,7 +727,7 @@\n #define GET_ADDRESSv1(field, function) \\\n \tGET_ADDRESS_OPTIONALv1(field, function, \\\n \t\tLog1(PCSC_LOG_CRITICAL, \"IFDHandler functions missing: \" #function ); \\\n-\t\texit(1); )\n+\t\treturn(rv); )\n \n \t\t(void)DYN_GetAddress(rContext->vHandle, &f, \"IO_Create_Channel\");\n \t\trContext->psFunctions.psFunctions_v1.pvfCreateChannel = f;\n@@ -735,7 +736,7 @@\n \t\t\t\"IO_Close_Channel\"))\n \t\t{\n \t\t\tLog1(PCSC_LOG_CRITICAL, \"IFDHandler functions missing\");\n-\t\t\texit(1);\n+\t\t\treturn SCARD_F_UNKNOWN_ERROR;\n \t\t}\n \t\trContext->psFunctions.psFunctions_v1.pvfCloseChannel = f;\n \n@@ -753,7 +754,8 @@\n #define GET_ADDRESS_OPTIONALv2(s, code) \\\n { \\\n \tvoid *f1 = NULL; \\\n-\tif (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, \"IFDH\" #s)) \\\n+\tDWORD rv = DYN_GetAddress(rContext->vHandle, &f1, \"IFDH\" #s); \\\n+\tif (SCARD_S_SUCCESS != rv) \\\n \t{ \\\n \t\tcode \\\n \t} \\\n@@ -763,7 +765,7 @@\n #define GET_ADDRESSv2(s) \\\n \tGET_ADDRESS_OPTIONALv2(s, \\\n \t\tLog1(PCSC_LOG_CRITICAL, \"IFDHandler functions missing: \" #s ); \\\n-\t\texit(1); )\n+\t\treturn(rv); )\n \n \t\tLog1(PCSC_LOG_INFO, \"Loading IFD Handler 2.0\");\n \n@@ -784,7 +786,8 @@\n #define GET_ADDRESS_OPTIONALv3(s, code) \\\n { \\\n \tvoid *f1 = NULL; \\\n-\tif (SCARD_S_SUCCESS != DYN_GetAddress(rContext->vHandle, &f1, \"IFDH\" #s)) \\\n+\tDWORD rv = DYN_GetAddress(rContext->vHandle, &f1, \"IFDH\" #s); \\\n+\tif (SCARD_S_SUCCESS != rv) \\\n \t{ \\\n \t\tcode \\\n \t} \\\n@@ -794,7 +797,7 @@\n #define GET_ADDRESSv3(s) \\\n \tGET_ADDRESS_OPTIONALv3(s, \\\n \t\tLog1(PCSC_LOG_CRITICAL, \"IFDHandler functions missing: \" #s ); \\\n-\t\texit(1); )\n+\t\treturn(rv); )\n \n \t\tLog1(PCSC_LOG_INFO, \"Loading IFD Handler 3.0\");\n \n@@ -814,7 +817,7 @@\n \t{\n \t\t\/* Who knows what could have happenned for it to get here. *\/\n \t\tLog1(PCSC_LOG_CRITICAL, \"IFD Handler not 1.0\/2.0 or 3.0\");\n-\t\texit(1);\n+\t\treturn SCARD_F_UNKNOWN_ERROR;\n \t}\n \n \treturn SCARD_S_SUCCESS;\n"} {"commit":"08e9ff76001e8b3972c894e0c7cbc94b0d1efb63","subject":"Fix CMP app TLS connection not respecting vpm options like -crl_check","message":"Fix CMP app TLS connection not respecting vpm options like -crl_check\n\nReviewed-by: Tomas Mraz <2bc6038c3dfca09b2da23c8b6da8ba884dc2dcc2@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/16225)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/cmp.c\n+++ apps\/cmp.c\n@@ -871,7 +871,7 @@\n if (X509_STORE_set1_param(ts, vpm \/* may be NULL *\/)\n && (for_new_cert || truststore_set_host_etc(ts, NULL)))\n return ts;\n- BIO_printf(bio_err, \"error setting verification parameters\\n\");\n+ BIO_printf(bio_err, \"error setting verification parameters for %s\\n\", desc);\n OSSL_CMP_CTX_print_errors(cmp_ctx);\n X509_STORE_free(ts);\n return NULL;\n@@ -1193,13 +1193,10 @@\n return NULL;\n \n if (opt_tls_trusted != NULL) {\n- trust_store = load_certstore(opt_tls_trusted, opt_otherpass,\n- \"trusted TLS certificates\", vpm);\n+ trust_store = load_trusted(opt_tls_trusted, 0, \"trusted TLS certs\");\n if (trust_store == NULL)\n goto err;\n SSL_CTX_set_cert_store(ssl_ctx, trust_store);\n- \/* for improved diagnostics on SSL_CTX_build_cert_chain() errors: *\/\n- X509_STORE_set_verify_cb(trust_store, X509_STORE_CTX_print_verify_cb);\n }\n \n if (opt_tls_cert != NULL && opt_tls_key != NULL) {\n"} {"commit":"341de5f1997d21b60cee69be656f1ae709bccdac","subject":"Let the output from 'openssl enc -ciphers' go to stdout","message":"Let the output from 'openssl enc -ciphers' go to stdout\n\nAlso, don't exit with an error code\n\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/2716)","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/enc.c\n+++ apps\/enc.c\n@@ -134,10 +134,11 @@\n ret = 0;\n goto end;\n case OPT_LIST:\n- BIO_printf(bio_err, \"Supported ciphers:\\n\");\n+ BIO_printf(bio_out, \"Supported ciphers:\\n\");\n OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,\n- show_ciphers, bio_err);\n- BIO_printf(bio_err, \"\\n\");\n+ show_ciphers, bio_out);\n+ BIO_printf(bio_out, \"\\n\");\n+ ret = 0;\n goto end;\n case OPT_E:\n enc = 1;\n"} {"commit":"bddd97c3ede9cb4bf1b9af7c0bb36910d0a1b090","subject":"Implemented the bh_nelements_nbcast()","message":"Implemented the bh_nelements_nbcast()\n","repos":"bh107\/bohrium,madsbk\/bohrium,bh107\/bohrium,madsbk\/bohrium,madsbk\/bohrium,bh107\/bohrium,bh107\/bohrium,madsbk\/bohrium","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/bh.c\n+++ core\/bh.c\n@@ -23,6 +23,22 @@\n #include <stdlib.h>\n #include <string.h>\n #include <errno.h>\n+\n+\/* Number of non-broadcasted elements in a given view\n+ *\n+ * @view The view in question.\n+ * @return Number of elements.\n+ *\/\n+bh_index bh_nelements_nbcast(const bh_view *view)\n+{\n+ bh_index res = 1;\n+ for (int i = 0; i < view->ndim; ++i)\n+ {\n+ if(view->stride[i] > 0)\n+ res *= view->shape[i];\n+ }\n+ return res;\n+}\n \n \/* Number of element in a given shape\n *\n"} {"commit":"21425195009e4daf6971453f8a0be08375ae9eec","subject":"Fix double BIO_free in req","message":"Fix double BIO_free in req\n\nReviewed-by: Tim Hudson <eb0be8e447f673b41b10eda09d63cd72526b0a42@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/req.c\n+++ apps\/req.c\n@@ -591,6 +591,7 @@\n goto end;\n }\n BIO_free(out);\n+ out = NULL;\n BIO_printf(bio_err, \"-----\\n\");\n }\n \n"} {"commit":"cfdeaf478633fc17dc4d192d8af72629bbc471c1","subject":"Fix comments","message":"Fix comments\n","repos":"111WARLOCK111\/gmqcc,ignatenkobrain\/gmqcc,111WARLOCK111\/gmqcc,ignatenkobrain\/gmqcc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- correct.c\n+++ correct.c\n@@ -429,7 +429,7 @@\n * cmpl %eax, %ebx ; ebx = &LHS[END_POS]\n *\n * jbe correct_cmp_eq\n- * movb (%edx), %cl ; micro-optimized on even atoms :-)\n+ * movb (%edx), %cl ; micro-optimized even on atoms :-)\n * cmpb %cl, (%eax) ; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n * jg correct_cmp_gt\n * jge correct_cmp_loop\n@@ -512,10 +512,7 @@\n \/*\n * This is the exposed interface:\n * takes a table for the dictonary a vector of sizes (used for internal\n- * probability calculation, and an identifier to \"correct\"\n- *\n- * the add function works the same. Except the identifier is used to\n- * add to the dictonary. \n+ * probability calculation), and an identifier to \"correct\".\n *\/\n char *correct_str(correct_trie_t* table, const char *ident) {\n char **e1 = NULL;\n"} {"commit":"71e1a9952348d03253466d04ec8b05783cd4f3fa","subject":"pre-dump: do not disconnect from page server before writing to it","message":"pre-dump: do not disconnect from page server before writing to it\n\nSigned-off-by: Jamie Liu <043a525321ed404d4cf9daddfaab16339cf2a4d2@google.com>\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\n","repos":"sdgdsffdsfff\/criu,AuthenticEshkinKot\/criu,sdgdsffdsfff\/criu,LK4D4\/criu,tych0\/criu,efiop\/criu,kawamuray\/criu,tych0\/criu,LK4D4\/criu,ldu4\/criu,svloyso\/criu,marcosnils\/criu,sdgdsffdsfff\/criu,biddyweb\/criu,gonkulator\/criu,gonkulator\/criu,LK4D4\/criu,efiop\/criu,gablg1\/criu,eabatalov\/criu,marcosnils\/criu,marcosnils\/criu,KKoukiou\/criu-remote,rentzsch\/criu,wtf42\/criu,kawamuray\/criu,fbocharov\/criu,KKoukiou\/criu-remote,kawamuray\/criu,eabatalov\/criu,kawamuray\/criu,biddyweb\/criu,tych0\/criu,AuthenticEshkinKot\/criu,gonkulator\/criu,gonkulator\/criu,kawamuray\/criu,tych0\/criu,eabatalov\/criu,marcosnils\/criu,sdgdsffdsfff\/criu,LK4D4\/criu,gablg1\/criu,wtf42\/criu,KKoukiou\/criu-remote,biddyweb\/criu,eabatalov\/criu,fbocharov\/criu,fbocharov\/criu,svloyso\/criu,svloyso\/criu,rentzsch\/criu,svloyso\/criu,AuthenticEshkinKot\/criu,rentzsch\/criu,biddyweb\/criu,KKoukiou\/criu-remote,ldu4\/criu,fbocharov\/criu,efiop\/criu,wtf42\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,svloyso\/criu,wtf42\/criu,fbocharov\/criu,gablg1\/criu,gablg1\/criu,kawamuray\/criu,sdgdsffdsfff\/criu,gablg1\/criu,KKoukiou\/criu-remote,LK4D4\/criu,gonkulator\/criu,efiop\/criu,AuthenticEshkinKot\/criu,rentzsch\/criu,LK4D4\/criu,tych0\/criu,gablg1\/criu,biddyweb\/criu,AuthenticEshkinKot\/criu,efiop\/criu,gonkulator\/criu,tych0\/criu,svloyso\/criu,eabatalov\/criu,ldu4\/criu,ldu4\/criu,wtf42\/criu,wtf42\/criu,biddyweb\/criu,KKoukiou\/criu-remote,efiop\/criu,ldu4\/criu,marcosnils\/criu,fbocharov\/criu,rentzsch\/criu,eabatalov\/criu,sdgdsffdsfff\/criu,ldu4\/criu,marcosnils\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cr-dump.c\n+++ cr-dump.c\n@@ -1613,9 +1613,6 @@\n \n \tret = 0;\n err:\n-\tif (disconnect_from_page_server())\n-\t\tret = -1;\n-\n \tpstree_switch_state(root_item,\n \t\t\tret ? TASK_ALIVE : opts.final_state);\n \tfree_pstree(root_item);\n@@ -1641,6 +1638,9 @@\n \t\tlist_del(&ctl->pre_list);\n \t\tparasite_cure_local(ctl);\n \t}\n+\n+\tif (disconnect_from_page_server())\n+\t\tret = -1;\n \n \tif (ret)\n \t\tpr_err(\"Pre-dumping FAILED.\\n\");\n"} {"commit":"43fc0ac57944fe79be4e21140f949188c7457c91","subject":"conn-contact-info: document more","message":"conn-contact-info: document more\n","repos":"mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conn-contact-info.c\n+++ src\/conn-contact-info.c\n@@ -135,9 +135,12 @@\n \n { NULL }\n };\n+\/* static XML element name => static VCardField *\/\n static GHashTable *known_fields_xmpp = NULL;\n+\/* g_strdup'd Telepathy pseudo-vCard element name => static VCardField *\/\n static GHashTable *known_fields_vcard = NULL;\n \n+\/* one-per-process GABBLE_ARRAY_TYPE_FIELD_SPECS *\/\n static GPtrArray *supported_fields = NULL;\n \n \/*\n"} {"commit":"01be069b2532252d0eb2b67f8e7baac746516538","subject":"Adding class ResourceId and new fields to class ResourceEntry","message":"Adding class ResourceId and new fields to class ResourceEntry\n","repos":"wangziqi2013\/Android-Dalvik-Analysis,wangziqi2013\/Android-Dalvik-Analysis,wangziqi2013\/Android-Dalvik-Analysis","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/res\/res_table.h\n+++ src\/res\/res_table.h\n@@ -1038,6 +1038,25 @@\n };\n \n \/*\n+ * class ResourceId - Resource identifier in 32-bit field\n+ *\/\n+ union ResourceId {\n+ public:\n+ struct {\n+ uint8_t package_id;\n+ uint8_t type_id;\n+ uint16_t entry_id;\n+ } BYTE_ALIGNED;\n+ \n+ \/\/ 32 bit identifier used as a whole\n+ uint32_t data;\n+ } BYTE_ALIGNED;\n+ \n+ \/\/ Make sure the size of the union is always correct\n+ static_assert(sizeof(ResourceId) == sizeof(uint32_t), \n+ \"Invalid size of resource ID\");\n+ \n+ \/*\n * class ResourceEntry - Represents resource entry in the body of type chunk\n *\/\n class ResourceEntry {\n@@ -1047,15 +1066,15 @@\n uint16_t entry_length;\n \n \/*\n- * enum class Flags\n+ * enum Flags\n *\/\n- enum class Flags : uint16_t {\n+ enum Flags : uint16_t {\n \/\/ This flag decides how the following data is organized\n \/\/ For a simple entry the following data is just a ResourceValue instance\n \/\/ Otherwise it is followed by a mapping descriptor and several maps\n \/\/ to form a composite value\n- FLAG_COMPLEX = 0x0001,\n- FLAG_PUBLIC = 0x0002,\n+ COMPLEX = 0x0001,\n+ PUBLIC = 0x0002,\n };\n \n \/\/ As defined above\n@@ -1064,6 +1083,29 @@\n \/\/ A string into key string table of the package denoting the name of the\n \/\/ resource entry\n uint32_t key;\n+ \n+ \/\/ THE FOLLOWING IS ONLY VALID IF THE ENTRY IS A COMPLEX ONE\n+ \n+ \/\/ The resource ID of its parent which refers to another resource\n+ \/\/ 0x00000000 if there is no parent\n+ ResourceId parent_id;\n+ \n+ \/\/ The number of key-value pairs after the body\n+ uint32_t entry_count;\n+ \n+ \/*\n+ * IsComplex() - Whether the resource entry is composite\n+ *\/\n+ inline bool IsComplex() const {\n+ return flags & Flags::COMPLEX;\n+ }\n+ \n+ \/*\n+ * IsPublic() - Returns true if the entry is in the public name space\n+ *\/\n+ inline bool IsPublic() const {\n+ return flags & Flags::PUBLIC; \n+ }\n } BYTE_ALIGNED;\n \n \/\/ Data members \n"} {"commit":"36013fdff6d40007813ab7d780d585b5c1d6c4f0","subject":"Removing comment.","message":"Removing comment.\n","repos":"lemire\/CRoaring,lemire\/CRoaring","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/roaring_array.c\n+++ src\/roaring_array.c\n@@ -686,7 +686,6 @@\n }\n buf += size * 2 * sizeof(uint16_t);\n \n- \/\/ printf(\"size = %d \\n\", size);\n bool is_ok = ra_init_with_capacity(answer, size);\n if (!is_ok) {\n fprintf(stderr, \"Failed to allocate memory for roaring array. Bailing out.\\n\");\n"} {"commit":"48e122244b05415204ef28107286d099f17da56b","subject":"nir: Add GLSL_TYPE_INT64 and GLSL_TYPE_UINT64 to glsl_get_bit_size","message":"nir: Add GLSL_TYPE_INT64 and GLSL_TYPE_UINT64 to glsl_get_bit_size\n\nSigned-off-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\nReviewed-by: Connor Abbott <71178acffcc112b21e5858656e5751f5e4aa9364@gmail.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/compiler\/nir_types.h\n+++ src\/compiler\/nir_types.h\n@@ -92,6 +92,8 @@\n return 32;\n \n case GLSL_TYPE_DOUBLE:\n+ case GLSL_TYPE_INT64:\n+ case GLSL_TYPE_UINT64:\n return 64;\n \n default:\n"} {"commit":"370c417e73e5d8811c9af852ad9edcc816683241","subject":"Restore the alignment code for the channels","message":"Restore the alignment code for the channels\n","repos":"DeforaOS\/Mixer,DeforaOS\/Mixer","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/controls\/channels.c\n+++ src\/controls\/channels.c\n@@ -93,6 +93,9 @@\n \t\tva_list properties)\n {\n \tMixerControlPlugin * channels;\n+#if !GTK_CHECK_VERSION(3, 14, 0)\n+\tGtkWidget * align;\n+#endif\n \t(void) type;\n \n \tif((channels = object_new(sizeof(*channels))) == NULL)\n@@ -101,8 +104,15 @@\n \tchannels->channels = NULL;\n \tchannels->channels_cnt = 0;\n \tchannels->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);\n+#if GTK_CHECK_VERSION(3, 14, 0)\n+\tgtk_widget_set_halign(channels->hbox, GTK_ALIGN_CENTER);\n \tgtk_box_pack_start(GTK_BOX(channels->widget), channels->hbox, TRUE,\n \t\t\tTRUE, 0);\n+#else\n+\talign = gtk_alignment_new(0.5, 0.5, 0.0, 1.0);\n+\tgtk_container_add(GTK_CONTAINER(align), channels->hbox);\n+\tgtk_box_pack_start(GTK_BOX(channels->widget), align, TRUE, TRUE, 0);\n+#endif\n \tif(_channels_set(channels, properties) != 0)\n \t{\n \t\t_channels_destroy(channels);\n"} {"commit":"4a8b71191b146340a7f562fe84f68b138736e41a","subject":"Update counter.c","message":"Update counter.c\n\nsome minor changes","repos":"nextgenerationgeek\/freqcntr,nextgenerationgeek\/freqcntr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- counter.c\n+++ counter.c\n@@ -33,7 +33,7 @@\n \/*** Timer Routinen ***\/\n ISR(TIMER0_COMPA_vect)\t\t\/\/ wird mit 125Hz aufgerufen (16MHz\/1024\/125, alle 8ms)\n \t{\n-\t\tuint8_t adcin_temp;\t\t\t\/\/ Var. f\u00fcr PINF\n+\t\tuint8_t adcin_temp;\t\t\/\/ Var. f\u00fcr PINF\n \t\tuint16_t counter_temp;\t\t\/\/ Var. zur zwischenspeicherung Z\u00e4hlerstand\n \n \t\tadcin_temp = PINF;\n@@ -48,7 +48,6 @@\n \t\t\t\tPORTB &= ~(1<<PB0);\t\t\/\/ 74HC393 auf Ursprung\n \t\t\t\tTCNT1 = 0;\t\t\t\t \/\/ Z\u00e4hlerwert r\u00fccksetzen\n \t\t\t\ttick1 = 0;\t\t\t \t\/\/ Tick r\u00fccksetzen\n-\n \t\t\t\t\/\/ Frequenzregister bilden, mit Korrekturwert\n \t\t\t\tfreq1 = ( (((uint32_t)count_overflows)<<24) | (((uint32_t)counter_temp)<<8) | (uint32_t)adcin_temp);\n \t\t\t\t\/\/freq_change=1;\n@@ -67,17 +66,17 @@\n \t{\t\n \t\t\/\/ Init ADC Eing\u00e4nge\n \t\tDDRF = 0b00000000;\t\t\/\/ Port F auf Eingang setzen (Prescaler auslesen)\n-\t\tuint8_t bPortF;\t\t\t \/\/ Variable f\u00fcr Port F\n-\t\tbPortF = PINF;\t\t\t \/\/ Wird in Variable geschrieben\n+\t\tuint8_t bPortF;\t\t\t\/\/ Variable f\u00fcr Port F\n+\t\tbPortF = PINF;\t\t\t\/\/ Wird in Variable geschrieben\n \t\t\/\/ Init Timer Ein-\/Ausg\u00e4nge\n \t\tDDRD = 0b01000000; \t\t\/\/ PD6 als Eingang (T1)\n-\t\tDDRD |= (1 << PD7); \t\/\/ PD7 als Ausgang (T0) f\u00fcr 74HC393\n+\t\tDDRD |= (1 << PD7); \t\t\/\/ PD7 als Ausgang (T0) f\u00fcr 74HC393\n \n \t\t\/*** Timer-Initialisierungen ***\/\n \t\t\/\/ Timer0: Fenster in dem gez\u00e4hlt wird\n- \t\tTCCR0B |= (1<<CS02) | (1<<CS00) | (1<<WGM01);\/\/ Timer0 Prescaler 1024 und CTC Modus (S.82)\n-\t\tOCR0A = 124;\t\t\t\t\/\/ Ab Z\u00e4hlschritt 125 INT ausl\u00f6sen (S.106)\n-\t\tTIMSK0 |= (1<<OCIE0A); \t\t\/\/ Erlaube Overflow INT, Timer0\n+ \t\tTCCR0B |= (1<<CS02) | (1<<CS00) | (1<<WGM01);\t\/\/ Timer0 Prescaler 1024 und CTC Modus (S.82)\n+\t\tOCR0A = 124;\t\t\t\t\t\/\/ Ab Z\u00e4hlschritt 125 INT ausl\u00f6sen (S.106)\n+\t\tTIMSK0 |= (1<<OCIE0A); \t\t\t\t\/\/ Erlaube Overflow INT, Timer0\n \t\t\/\/ Timer1: Flanken z\u00e4hlen\n \t\tTCCR1A |= (1<<ICES1) | (1<<CS11);\t\/\/ Prescale 8, Input Capture Edge Select (S.110)\n \t\tTIMSK1 |= (1<<TOIE1) | (1<<ICIE1); \t\/\/ OVF und CAPT Int erlauben, Timer1 (S.112)\n@@ -85,6 +84,6 @@\n \t\tsei();\t\t\t\t\t\/\/ Interrupts erlauben\n \n \t\twhile(1){\n-\t\t freq_ausgabe_high1 = (freq1 * korrekturwert);\t\/\/ Frequenz mit Korrektur berechnen\n+\t\t\tfreq_ausgabe_high1 = (freq1 * korrekturwert);\t\/\/ Frequenz mit Korrektur berechnen\n \t\t }\n \t}\n"} {"commit":"c83d355e880b370cc166726d1828246835b196ec","subject":"Don't allow people to move too fast","message":"Don't allow people to move too fast","repos":"Adam-\/bedrock,Adam-\/bedrock","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/server\/client.c\n+++ src\/server\/client.c\n@@ -732,6 +732,11 @@\n \t\/* Bursting clients try to move themselves during login for some reason. Don't allow it. *\/\n \telse if (client->authenticated == STATE_BURSTING)\n \t\treturn;\n+\telse if (abs(old_x - x) > 100 || abs(old_z - z) > 100)\n+\t{\n+\t\tpacket_send_disconnect(client, \"Moving too fast\");\n+\t\treturn;\n+\t}\n \n \tif (old_x != x)\n \t\tnbt_set(client->data, TAG_DOUBLE, &x, sizeof(x), 2, \"Pos\", 0);\n"} {"commit":"74d14b9db2d15db063e6722a8f6c21ec6fb141d7","subject":"Initialize variables. Make usage pretty.","message":"Initialize variables. Make usage pretty.\n","repos":"DanielAtSamraksh\/cppopts,DanielAtSamraksh\/cppopts,DanielAtSamraksh\/cppopts","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cppopts.h\n+++ cppopts.h\n@@ -213,8 +213,19 @@\n bool choices_should_be_freed;\n choices_t<T> choicesHelper;\n \n- parameter_t () {};\n- parameter_t ( string name, string help ) {\n+ void init () {\n+ \/\/ variables in C++ are generally not initialized by default. So\n+ \/\/ do it here and call this function from all the constructors.\n+ this->valuePtr = 0;\n+ this->choices = 0;\n+ choices_should_be_freed = 0;\n+ this->required = 0;\n+ this->is_set = 0;\n+ };\n+\n+ parameter_t () { this->init(); };\n+ parameter_t ( string name, string help ): valuePtr(0), choices(0) {\n+ this->init();\n this->name = name;\n this->help = help;\n };\n@@ -288,7 +299,7 @@\n stringstream s;\n \n \/\/ name\n- s << this->name << \"\\t\";\n+ s << this->name << \" (\" << this->typestr() << \") \";\n \n \/\/ options\n bool firstOption = true;\n@@ -303,21 +314,28 @@\n else s << \"|\";\n s << \"--\" << this->longs[k];\n }\n+ s << \"\\n\";\n \n \/\/ help\n- s << \"\\t\" << this->help;\n+ unsigned h0=0, h1;\n+ while ( h0 < this->help.size() ) {\n+ h1 = this->help.find ( '\\n', h0 );\n+ s << \" \" << this->help.substr ( h0, h1-h0 ) << \"\\n\";\n+ h0 = (h1 < h1+1)? h1+1: this->help.size();\n+ }\n+\n \n \/\/ default value\n- s << \" Default value = \" << ::str ( this->defaultValue ) << \".\";\n+ s << \" Default value = \" << ::str ( this->defaultValue ) << \"\\n\";\n \n \/\/ choices\n if ( this->choices && this->choices->size() > 0 ) {\n- s << \" Choices = \" << ::str ( this->choices->at(0) );\n+ s << \" Choices = \\n \" << ::str ( this->choices->at(0) ) << \"\\n\";\n for (unsigned i=1; i < this->choices->size(); i++) {\n- \ts << \", \" << ::str ( this->choices->at(i) );\n- }\n- s << \".\";\n- }\n+ \ts << \" \" << ::str ( this->choices->at(i) ) << \"\\n\";\n+ }\n+ }\n+ \/\/ s << \"\\n\";\n \n \/\/ save in class member so that string won't go out of scope.\n _usageString = s.str();\n@@ -515,7 +533,7 @@\n string usage() {\n stringstream s; \n for ( unsigned i = 0; i < options.size(); i++ ) {\n- s << options[i]->usage() << \"\\n\\n\";\n+ s << options[i]->usage() << \"\\n\";\n \/\/ printf(\"%s\\n\\n\", options[i]->usage());\n };\n _usage = s.str();\n"} {"commit":"f899d0407acfd1d50dc5c38009635376d4d4f005","subject":"files: Handle the absence of ID in proc fdinfo","message":"files: Handle the absence of ID in proc fdinfo\n\nThis makes crtools correctly abort when working on wrong kernel.\nOtherwise all the open files will have the same (garbage) ID and\nthe subsequent restore will result in broken app.\n\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\nSigned-off-by: Cyrill Gorcunov <7a1ea01eee6961eb1e372e3508c2670446d086f4@openvz.org>\n","repos":"fbocharov\/criu,tych0\/criu,AuthenticEshkinKot\/criu,fbocharov\/criu,KKoukiou\/criu-remote,rentzsch\/criu,svloyso\/criu,KKoukiou\/criu-remote,eabatalov\/criu,marcosnils\/criu,fbocharov\/criu,tych0\/criu,eabatalov\/criu,svloyso\/criu,KKoukiou\/criu-remote,marcosnils\/criu,rentzsch\/criu,KKoukiou\/criu-remote,kawamuray\/criu,wtf42\/criu,eabatalov\/criu,tych0\/criu,sdgdsffdsfff\/criu,marcosnils\/criu,svloyso\/criu,LK4D4\/criu,efiop\/criu,biddyweb\/criu,AuthenticEshkinKot\/criu,AuthenticEshkinKot\/criu,svloyso\/criu,kawamuray\/criu,gablg1\/criu,biddyweb\/criu,biddyweb\/criu,wtf42\/criu,gonkulator\/criu,marcosnils\/criu,gablg1\/criu,LK4D4\/criu,rentzsch\/criu,ldu4\/criu,efiop\/criu,LK4D4\/criu,wtf42\/criu,biddyweb\/criu,LK4D4\/criu,marcosnils\/criu,sdgdsffdsfff\/criu,ldu4\/criu,LK4D4\/criu,wtf42\/criu,biddyweb\/criu,ldu4\/criu,tych0\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,efiop\/criu,sdgdsffdsfff\/criu,gablg1\/criu,gonkulator\/criu,gonkulator\/criu,KKoukiou\/criu-remote,sdgdsffdsfff\/criu,gablg1\/criu,gonkulator\/criu,kawamuray\/criu,sdgdsffdsfff\/criu,gonkulator\/criu,tych0\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,efiop\/criu,efiop\/criu,sdgdsffdsfff\/criu,gablg1\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,eabatalov\/criu,fbocharov\/criu,kawamuray\/criu,wtf42\/criu,eabatalov\/criu,tych0\/criu,marcosnils\/criu,wtf42\/criu,efiop\/criu,gonkulator\/criu,ldu4\/criu,KKoukiou\/criu-remote,eabatalov\/criu,gablg1\/criu,ldu4\/criu,biddyweb\/criu,ldu4\/criu,rentzsch\/criu,svloyso\/criu,fbocharov\/criu,kawamuray\/criu,fbocharov\/criu,svloyso\/criu,kawamuray\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cr-dump.c\n+++ cr-dump.c\n@@ -307,7 +307,7 @@\n static int read_fd_params(pid_t pid, int pid_dir, char *fd, struct fd_parms *p)\n {\n \tFILE *file;\n-\tunsigned int f;\n+\tint ret;\n \n \tfile = fopen_proc(pid_dir, \"fdinfo\/%s\", fd);\n \tif (!file) {\n@@ -316,8 +316,13 @@\n \t}\n \n \tp->fd_name = atoi(fd);\n-\tfscanf(file, \"pos:\\t%li\\nflags:\\t%o\\nid:\\t%s\\n\", &p->pos, &p->flags, p->id);\n+\tret = fscanf(file, \"pos:\\t%li\\nflags:\\t%o\\nid:\\t%s\\n\", &p->pos, &p->flags, p->id);\n \tfclose(file);\n+\n+\tif (ret != 3) {\n+\t\tpr_err(\"Bad format of fdinfo file (%d items, want 3)\\n\", ret);\n+\t\treturn -1;\n+\t}\n \n \tpr_info(\"%d fdinfo %s: pos: %16lx flags: %16o id %s\\n\",\n \t\tpid, fd, p->pos, p->flags, p->id);\n"} {"commit":"c6ed65ce7c254f743184b730a95fa9cd7a930420","subject":"Resolver: style.","message":"Resolver: style.\n\nUse the original query name in error and debug messages when\nprocessing PTR responses.\n","repos":"hy0kl\/nginx,hy0kl\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/core\/ngx_resolver.c\n+++ src\/core\/ngx_resolver.c\n@@ -2396,7 +2396,6 @@\n {\n char *err;\n size_t len;\n- u_char text[NGX_SOCKADDR_STRLEN];\n in_addr_t addr;\n int32_t ttl;\n ngx_int_t octet;\n@@ -2413,13 +2412,15 @@\n struct in6_addr addr6;\n #endif\n \n- if (ngx_resolver_copy(r, NULL, buf,\n+ if (ngx_resolver_copy(r, &name, buf,\n buf + sizeof(ngx_resolver_hdr_t), buf + n)\n != NGX_OK)\n {\n return;\n }\n \n+ ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0, \"resolver qs:%V\", &name);\n+\n \/* AF_INET *\/\n \n addr = 0;\n@@ -2447,10 +2448,6 @@\n tree = &r->addr_rbtree;\n expire_queue = &r->addr_expire_queue;\n \n- addr = htonl(addr);\n- name.len = ngx_inet_ntop(AF_INET, &addr, text, NGX_SOCKADDR_STRLEN);\n- name.data = text;\n-\n goto valid;\n }\n \n@@ -2495,9 +2492,6 @@\n tree = &r->addr6_rbtree;\n expire_queue = &r->addr6_expire_queue;\n \n- name.len = ngx_inet6_ntop(addr6.s6_addr, text, NGX_SOCKADDR_STRLEN);\n- name.data = text;\n-\n goto valid;\n }\n \n@@ -2506,6 +2500,7 @@\n \n ngx_log_error(r->log_level, r->log, 0,\n \"invalid in-addr.arpa or ip6.arpa name in DNS response\");\n+ ngx_resolver_free(r, name.data);\n return;\n \n valid:\n@@ -2513,6 +2508,7 @@\n if (rn == NULL || rn->query == NULL) {\n ngx_log_error(r->log_level, r->log, 0,\n \"unexpected response for %V\", &name);\n+ ngx_resolver_free(r, name.data);\n goto failed;\n }\n \n@@ -2522,8 +2518,11 @@\n ngx_log_error(r->log_level, r->log, 0,\n \"wrong ident %ui response for %V, expect %ui\",\n ident, &name, qident);\n+ ngx_resolver_free(r, name.data);\n goto failed;\n }\n+\n+ ngx_resolver_free(r, name.data);\n \n if (code == 0 && nan == 0) {\n code = NGX_RESOLVE_NXDOMAIN;\n"} {"commit":"99f85c8c05c4802b641e5bfa6ae6f153f11cb9c0","subject":"shared\/crypto: Fix bt_crypto_s1 byte order handling","message":"shared\/crypto: Fix bt_crypto_s1 byte order handling\n\nThe assumption is that this function takes little endian data, i.e. the\nmost significant 64-bits to be discarded are found at the end of r1 and\nr2 instead of the beginning.\n","repos":"pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,mapfau\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,mapfau\/bluez,mapfau\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared\/crypto.c\n+++ src\/shared\/crypto.c\n@@ -463,8 +463,8 @@\n \t\t\tconst uint8_t r1[16], const uint8_t r2[16],\n \t\t\tuint8_t res[16])\n {\n-\tmemcpy(res, r1 + 8, 8);\n-\tmemcpy(res + 8, r2 + 8, 8);\n+\tmemcpy(res, r2, 8);\n+\tmemcpy(res + 8, r1, 8);\n \n \treturn bt_crypto_e(crypto, k, res, res);\n }\n"} {"commit":"4702994dc28364a2bfff7f44617febcfe9e948f7","subject":"direct: enforce groups for set_value","message":"direct: enforce groups for set_value\n\nAlso, enable the Smack check for client->group.\n","repos":"sofar\/buxton,sofar\/buxton","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared\/direct.c\n+++ src\/shared\/direct.c\n@@ -153,37 +153,60 @@\n \tBuxtonBackend *backend;\n \tBuxtonLayer *layer;\n \tBuxtonConfig *config;\n-\tBuxtonString data_label = (BuxtonString){ NULL, 0 };\n \tBuxtonString default_label = buxton_string_pack(\"_\");\n \tBuxtonString *l;\n-\tBuxtonData d;\n+\t_cleanup_buxton_data_ BuxtonData *d = NULL;\n+\t_cleanup_buxton_data_ BuxtonData *g = NULL;\n+\t_cleanup_buxton_key_ _BuxtonKey *group = NULL;\n+\t_cleanup_buxton_string_ BuxtonString *data_label = NULL;\n+\t_cleanup_buxton_string_ BuxtonString *group_label = NULL;\n \tbool r;\n \n \tassert(control);\n \tassert(key);\n \tassert(data);\n \n+\tgroup = malloc0(sizeof(_BuxtonKey));\n+\tif (!group)\n+\t\tgoto fail;\n+\tg = malloc0(sizeof(BuxtonData));\n+\tif (!g)\n+\t\tgoto fail;\n+\tgroup_label = malloc0(sizeof(BuxtonString));\n+\tif (!group_label)\n+\t\tgoto fail;\n+\n+\td = malloc0(sizeof(BuxtonData));\n+\tif (!d)\n+\t\tgoto fail;\n+\tdata_label = malloc0(sizeof(BuxtonString));\n+\tif (!data_label)\n+\t\tgoto fail;\n+\n+\t\/* Groups must be created first, so bail if this key's group doesn't exist *\/\n+\tif (!buxton_copy_key_group(key, group))\n+\t\tgoto fail;\n+\n+\tif (!buxton_direct_get_value_for_layer(control, group, g, group_label, NULL)) {\n+\t\tbuxton_debug(\"Group %s for key %s does not exist\\n\", key->group.value, key->name.value);\n+\t\tgoto fail;\n+\t}\n \n \t\/* Access checks are not needed for direct clients, where label is NULL *\/\n \tif (label) {\n-\t\t\/* FIXME: need to check client->group access here instead *\/\n-\t\tif (!buxton_check_smack_access(label, label, ACCESS_WRITE))\n-\t\t\treturn false;\n-\t\tif (buxton_direct_get_value_for_layer(control, key, &d, &data_label, NULL)) {\n-\t\t\tif (!buxton_check_smack_access(label, &data_label, ACCESS_WRITE)) {\n-\t\t\t\tif (d.type == STRING)\n-\t\t\t\t\tfree(d.store.d_string.value);\n-\t\t\t\treturn false;\n+\t\tif (!buxton_check_smack_access(label, group_label, ACCESS_WRITE))\n+\t\t\tgoto fail;\n+\t\tif (buxton_direct_get_value_for_layer(control, key, d, data_label, NULL)) {\n+\t\t\tif (!buxton_check_smack_access(label, data_label, ACCESS_WRITE)) {\n+\t\t\t\tgoto fail;\n \t\t\t}\n-\t\t\tl = &data_label;\n+\t\t\tl = data_label;\n \t\t} else {\n \t\t\tl = label;\n \t\t}\n \t} else {\n-\t\tif (buxton_direct_get_value_for_layer(control, key, &d, &data_label, NULL)) {\n-\t\t\tl = &data_label;\n-\t\t\tif (d.type == STRING)\n-\t\t\t\tfree(d.store.d_string.value);\n+\t\tif (buxton_direct_get_value_for_layer(control, key, d, data_label, NULL)) {\n+\t\t\tl = data_label;\n \t\t} else {\n \t\t\tl = &default_label;\n \t\t}\n@@ -201,10 +224,11 @@\n \n \tlayer->uid = control->client.uid;\n \tr = backend->set_value(layer, key, data, l);\n-\tif (l == &data_label)\n-\t\tfree(l->value);\n \n \treturn r;\n+\n+fail:\n+\treturn false;\n }\n \n bool buxton_direct_set_label(BuxtonControl *control,\n"} {"commit":"89b724e5a799a0d7d2f9e339a1e5e02955033a3b","subject":"Implement more methods in shell-surface interface","message":"Implement more methods in shell-surface interface\n","repos":"SirCmpwn\/wlc,gpyh\/wlc,Cloudef\/wlc,ammen99\/wlc,SirCmpwn\/wlc,vially\/wlc,ss1h2a3tw\/wlc,yohanesu75\/wlc,UIKit0\/wlc,lkundrak\/wlc,scarabeusiv\/wlc,ammen99\/wlc,UIKit0\/wlc,lkundrak\/wlc,vially\/wlc,Enerccio\/ewlc,gpyh\/wlc,Earnestly\/wlc,Cloudef\/wlc,Earnestly\/wlc,ss1h2a3tw\/wlc,Enerccio\/ewlc,yohanesu75\/wlc,scarabeusiv\/wlc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/shell\/surface.c\n+++ src\/shell\/surface.c\n@@ -5,6 +5,7 @@\n #include \"seat\/pointer.h\"\n \n #include \"compositor\/view.h\"\n+#include \"compositor\/surface.h\"\n #include \"compositor\/output.h\"\n \n #include <stdlib.h>\n@@ -47,16 +48,19 @@\n static void\n wl_cb_shell_surface_set_toplevel(struct wl_client *wl_client, struct wl_resource *resource)\n {\n- (void)wl_client, (void)resource;\n+ (void)wl_client;\n struct wlc_view *view = wl_resource_get_user_data(resource);\n wlc_view_request_state(view, WLC_BIT_FULLSCREEN, false);\n }\n \n static void\n-wl_cb_shell_surface_set_transient(struct wl_client *wl_client, struct wl_resource *resource, struct wl_resource *parent, int32_t x, int32_t y, uint32_t flags)\n+wl_cb_shell_surface_set_transient(struct wl_client *wl_client, struct wl_resource *resource, struct wl_resource *parent_resource, int32_t x, int32_t y, uint32_t flags)\n {\n- (void)wl_client, (void)resource, (void)parent, (void)x, (void)y, (void)flags;\n- STUBL(resource);\n+ (void)wl_client, (void)flags;\n+ struct wlc_view *view = wl_resource_get_user_data(resource);\n+ struct wlc_surface *surface = (parent_resource ? wl_resource_get_user_data(parent_resource) : NULL);\n+ wlc_view_set_parent(view, (surface ? surface->view : NULL));\n+ wlc_view_position(view, x, y);\n }\n \n static void\n@@ -67,7 +71,7 @@\n struct wlc_view *view = wl_resource_get_user_data(resource);\n struct wlc_output *output = (output_resource ? wl_resource_get_user_data(output_resource) : view->space->output);\n \n- \/\/ wlc_view_set_output(view, output);\n+ wlc_view_set_space(view, output->space);\n wlc_view_request_state(view, WLC_BIT_FULLSCREEN, true);\n }\n \n@@ -86,7 +90,7 @@\n struct wlc_view *view = wl_resource_get_user_data(resource);\n struct wlc_output *output = (output_resource ? wl_resource_get_user_data(output_resource) : view->space->output);\n \n- \/\/ wlc_view_set_output(view, output);\n+ wlc_view_set_space(view, output->space);\n wlc_view_request_state(view, WLC_BIT_MAXIMIZED, true);\n }\n \n"} {"commit":"538cdfa7ffc581393e019aba19f942105fe32674","subject":"Fixed a typo","message":"Fixed a typo\n","repos":"arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/solaris-ultra.c\n+++ src\/solaris-ultra.c\n@@ -363,7 +363,7 @@\n psinfo_t psi;\n int fd;\n int hz, version;\n- char cpuname[PAPI_MAX_STR_LEN], pname[PATH_HUGE_STR_LEN];\n+ char cpuname[PAPI_MAX_STR_LEN], pname[PAPI_HUGE_STR_LEN];\n \n \/* Check counter access *\/\n \n"} {"commit":"8e6a3558dca21d9018bcac794a7a6a683a4a5be3","subject":"cosmetics","message":"cosmetics\n","repos":"john-tornblom\/xtUML_Load,john-tornblom\/xtUML_Load,john-tornblom\/xtUML_Load","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sql_tokenizer.c\n+++ src\/sql_tokenizer.c\n@@ -353,7 +353,7 @@\n t.value_size = 64;\n t.la = ' ';\n \n- ASSERT(t.fp, \"out of memory\");\n+ ASSERT(t.fp, \"unable to open file\");\n ASSERT(t.value, \"out of memory\");\n \n do {\n"} {"commit":"8ab09906a6f0bf540f5217e4e390c8946cabf63d","subject":"Fix strtok","message":"Fix strtok\n","repos":"dextero\/evilibc,dextero\/evilibc,dextero\/evilibc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/string\/strtok.c\n+++ src\/string\/strtok.c\n@@ -1,6 +1,7 @@\n #include <evil-config.h>\n \n #include \"string.h\"\n+#include \"assert.h\"\n \n #include \"internal\/undefined_behavior.h\"\n \n@@ -63,7 +64,7 @@\n * > The separator string pointed to by s2 may be different from call\n * > to call.\n *\/\n- saveptr += strspn(saveptr, s2);;\n+ saveptr += strspn(saveptr, s2);\n if (!*saveptr) {\n return NULL;\n }\n@@ -82,9 +83,12 @@\n * > search for a token will start.\n *\/\n size_t token_len = strcspn(token_start, s2);\n+ assert(token_len > 0);\n+\n saveptr += token_len;\n if (*saveptr) {\n *saveptr++ = '\\0';\n }\n- return token_len > 0 ? token_start : NULL;;\n+\n+ return token_start;\n }\n"} {"commit":"a7b9d46bb8ed41383cbbc0f902148ee87b243668","subject":"xml entities filter some UTF8 accent text","message":"xml entities filter some UTF8 accent text\n","repos":"mapserver\/tinyows,mapserver\/tinyows,mapserver\/tinyows","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/struct\/buffer.c\n+++ src\/struct\/buffer.c\n@@ -507,8 +507,6 @@\n \n for( \/* empty *\/ ; *str ; str++) {\n \n- if ((int) *str < 32 && (*str != '\\n' && *str != '\\r' && *str != '\t')) break;\n-\n switch(*str) {\n case '&':\n buffer_add_str(buf, \"&\");\n"} {"commit":"9f8eccdbad5a414ea1d1b5b917cc19ba140bcc51","subject":"optimizations","message":"optimizations\n","repos":"jeremyhahn\/cwebsocket,jeremyhahn\/cwebsocket","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cwebsocket\/client.c\n+++ src\/cwebsocket\/client.c\n@@ -411,7 +411,6 @@\n \n \ttmplen = bytes_read - 3;\n \tchar buf[tmplen+1];\n-\tmemset(buf, 0, tmplen+1);\n \tmemcpy(buf, data, tmplen);\n \tbuf[tmplen+1] = '\\0';\n \n@@ -452,7 +451,7 @@\n \tcontrol_frame[3] = masking_key[1];\n \tcontrol_frame[4] = masking_key[2];\n \tcontrol_frame[5] = masking_key[3];\n-\tif(strcmp(frame_type, \"CLOSE\") == 0) {\n+\tif(code & CLOSE) {\n \t\tuint16_t close_code = 0;\n \t\tif(payload_len >= 2) {\n \t\t control_frame[6] = payload[0];\n"} {"commit":"5b4050a32687a9b5ed85b777fa82b4c59f19cdd9","subject":"removed unused headers; thread updates; use \"BIOS\" style for all event sources to match newest kernels","message":"removed unused headers; thread updates; use \"BIOS\" style for all event sources to match newest kernels\n","repos":"emilcondrea\/trousers,emilcondrea\/trousers,Distrotech\/trousers,Distrotech\/trousers,Distrotech\/trousers,emilcondrea\/trousers","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tcs\/tcs_evlog.c\n+++ src\/tcs\/tcs_evlog.c\n@@ -12,12 +12,10 @@\n #include <stdlib.h>\n #include <stdio.h>\n #include <string.h>\n-#include <pthread.h>\n #include <limits.h>\n \n #include \"trousers\/tss.h\"\n #include \"spi_internal_types.h\"\n-#include \"tcs_internal_types.h\"\n #include \"tcs_tsp.h\"\n #include \"tcs_utils.h\"\n #include \"tcs_int_literals.h\"\n@@ -42,7 +40,7 @@\n \t\treturn TCSERR(TSS_E_OUTOFMEMORY);\n \t}\n \n-\tpthread_mutex_init(&(tcs_event_log->lock), NULL);\n+\tMUTEX_INIT(tcs_event_log->lock);\n \n \t\/* allocate as many event lists as there are PCR's *\/\n \ttcs_event_log->lists = calloc(tpm_metrics.num_pcrs, sizeof(struct event_wrapper *));\n@@ -54,9 +52,9 @@\n \t}\n \n \t\/* assign external event log sources here *\/\n-\t\/\/tcs_event_log->firmware_source = EVLOG_BIOS_SOURCE;\n-\ttcs_event_log->firmware_source = EVLOG_IMA_SOURCE;\n-\ttcs_event_log->kernel_source = EVLOG_IMA_SOURCE;\n+\t\/\/tcs_event_log->firmware_source = EVLOG_IMA_SOURCE;\n+\ttcs_event_log->firmware_source = EVLOG_BIOS_SOURCE;\n+\ttcs_event_log->kernel_source = EVLOG_BIOS_SOURCE;\n \n \treturn TSS_SUCCESS;\n }\n@@ -67,7 +65,7 @@\n \tstruct event_wrapper *cur, *next;\n \tUINT32 i;\n \n-\tpthread_mutex_lock(&(tcs_event_log->lock));\n+\tMUTEX_LOCK(tcs_event_log->lock);\n \n \tfor (i = 0; i < tpm_metrics.num_pcrs; i++) {\n \t\tcur = tcs_event_log->lists[i];\n@@ -80,7 +78,7 @@\n \t\t}\n \t}\n \n-\tpthread_mutex_unlock(&(tcs_event_log->lock));\n+\tMUTEX_UNLOCK(tcs_event_log->lock);\n \n \tfree(tcs_event_log->lists);\n \tfree(tcs_event_log);\n@@ -102,18 +100,18 @@\n \tTSS_RESULT result;\n \tUINT32 i;\n \n-\tpthread_mutex_lock(&(tcs_event_log->lock));\n+\tMUTEX_LOCK(tcs_event_log->lock);\n \n \tnew = calloc(1, sizeof(struct event_wrapper));\n \tif (new == NULL) {\n \t\tLogError(\"malloc of %zd bytes failed.\", sizeof(struct event_wrapper));\n-\t\tpthread_mutex_unlock(&(tcs_event_log->lock));\n+\t\tMUTEX_UNLOCK(tcs_event_log->lock);\n \t\treturn TCSERR(TSS_E_OUTOFMEMORY);\n \t}\n \n \tif ((result = copy_pcr_event(&(new->event), event))) {\n \t\tfree(new);\n-\t\tpthread_mutex_unlock(&(tcs_event_log->lock));\n+\t\tMUTEX_UNLOCK(tcs_event_log->lock);\n \t\treturn result;\n \t}\n \n@@ -133,7 +131,7 @@\n \n \t*pNumber = ++i;\n \n-\tpthread_mutex_unlock(&(tcs_event_log->lock));\n+\tMUTEX_UNLOCK(tcs_event_log->lock);\n \n \treturn TSS_SUCCESS;\n }\n@@ -144,7 +142,7 @@\n \tstruct event_wrapper *tmp;\n \tUINT32 counter = 0;\n \n-\tpthread_mutex_lock(&(tcs_event_log->lock));\n+\tMUTEX_LOCK(tcs_event_log->lock);\n \n \ttmp = tcs_event_log->lists[pcrIndex];\n \tfor (; tmp; tmp = tmp->next) {\n@@ -154,7 +152,7 @@\n \t\tcounter++;\n \t}\n \n-\tpthread_mutex_unlock(&(tcs_event_log->lock));\n+\tMUTEX_UNLOCK(tcs_event_log->lock);\n \n \treturn (tmp ? &(tmp->event) : NULL);\n }\n"} {"commit":"ab8e1181c2cf6994caf04b6a26890aae54c1f1dd","subject":"(BlockLevelBox::hasAnonymousBox) : Add const.","message":"(BlockLevelBox::hasAnonymousBox) : Add const.\n\ngit-svn-id: 86dbb1b73ea755ce8c9767cb3be66408d68bb34f@2431 d15c3b8f-5b43-0410-be93-4d5a55ce2954\n","repos":"esrille\/escudo,esrille\/escudo,esrille\/escudo,esrille\/escudo,esrille\/escudo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- css\/Box.h\n+++ css\/Box.h\n@@ -673,8 +673,7 @@\n \/\/ Gets the last, anonymous child box. Creates one if there's none even\n \/\/ if there's no children; if so, the existing texts are moved to the\n \/\/ new anonymous box.\n- bool hasAnonymousBox()\n- {\n+ bool hasAnonymousBox() const {\n return lastChild && lastChild->isAnonymous();\n }\n BlockLevelBox* getAnonymousBox();\n"} {"commit":"76a77c887f0d8e96cb0b3d5c4ed51af6ea048b6e","subject":"added cvector_insert","message":"added cvector_insert\n","repos":"eteran\/c-vector","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cvector.h\n+++ cvector.h\n@@ -46,7 +46,7 @@\n const size_t cv_sz = cvector_size(vec); \\\n if ((i) < cv_sz) { \\\n __cvector_set_size((vec), cv_sz - 1); \\\n- memmove((vec) + i, (vec) + i + 1, cv_sz - 1); \\\n+ memmove((vec) + (i), (vec) + (i) + 1, sizeof(*(vec)) * (cv_sz - 1 - (i))); \\\n } \\\n } \\\n } while (0) \\\n@@ -93,12 +93,33 @@\n do { \\\n size_t cv_cap = cvector_capacity(vec); \\\n if (cv_cap <= cvector_size(vec)) { \\\n- __cvector_grow((vec), cv_cap ? cv_cap * 2 : cv_cap + 1); \\\n+ __cvector_grow((vec), cv_cap ? (cv_cap << 1) : 1); \\\n } \\\n vec[cvector_size(vec)] = (value); \\\n __cvector_set_size((vec), cvector_size(vec) + 1); \\\n } while (0) \\\n \n+\/**\n+ * @brief cvector_insert - insert element at position pos to the vector\n+ * @param vec - the vector\n+ * @param pos - position in the vector where the new elements are inserted.\n+ * @param val - value to be copied (or moved) to the inserted elements.\n+ * @return void\n+ *\/\n+#define cvector_insert(vec, pos, val) \\\n+ do { \\\n+ size_t cv_cap = cvector_capacity(vec); \\\n+ size_t cv_sz = cvector_size(vec); \\\n+ if (cv_cap <= cvector_size(vec)) { \\\n+ __cvector_grow((vec), cv_cap ? (cv_cap << 1) : 1); \\\n+ } \\\n+ if (pos < cv_sz) { \\\n+ memmove((vec) + (pos) + 1, (vec) + (pos), sizeof(*(vec)) * ((cv_sz + 1) - (pos))); \\\n+ } \\\n+ (vec)[(pos)] = (val); \\\n+ __cvector_set_size((vec), cv_sz + 1); \\\n+ } while (0) \\\n+\n #else\n \n \/**\n@@ -115,6 +136,27 @@\n } \\\n vec[cvector_size(vec)] = (value); \\\n __cvector_set_size((vec), cvector_size(vec) + 1); \\\n+ } while (0) \\\n+\n+\/**\n+ * @brief cvector_insert - insert element at position pos to the vector\n+ * @param vec - the vector\n+ * @param pos - position in the vector where the new elements are inserted.\n+ * @param val - value to be copied (or moved) to the inserted elements.\n+ * @return void\n+ *\/\n+#define cvector_insert(vec, pos, val) \\\n+ do { \\\n+ size_t cv_cap = cvector_capacity(vec); \\\n+ size_t cv_sz = cvector_size(vec); \\\n+ if (cv_cap <= cvector_size(vec)) { \\\n+ __cvector_grow((vec), cv_cap + 1); \\\n+ } \\\n+ if (pos < cv_sz) { \\\n+ memmove((vec) + (pos) + 1, (vec) + (pos), sizeof(*(vec)) * ((cv_sz + 1) - (pos))); \\\n+ } \\\n+ (vec)[(pos)] = (val); \\\n+ __cvector_set_size((vec), cv_sz + 1); \\\n } while (0) \\\n \n #endif \/* CVECTOR_LOGARITHMIC_GROWTH *\/\n"} {"commit":"c9cccc9c228ae622021d27aa79e4d74bc1f0d936","subject":"odp: remove parameters in pktio","message":"odp: remove parameters in pktio\n\nFollow odp api change.\n\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"muvarov\/daq-odp,muvarov\/daq-odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- daq_odp.c\n+++ daq_odp.c\n@@ -58,8 +58,6 @@\n \tint rval = DAQ_ERROR;\n \tint thr_id;\n \todp_buffer_pool_t pool;\n-\todp_pktio_params_t params;\n-\tsocket_params_t *sock_params = ¶ms.sock_params;\n \todp_queue_param_t qparam;\n \tchar inq_name[ODP_QUEUE_NAME_LEN];\n \tint ret;\n@@ -118,10 +116,7 @@\n \todp_buffer_pool_print(pool);\n \n \t\/* Open a packet IO instance for this thread *\/\n-\tsock_params->type = ODP_PKTIO_TYPE_SOCKET_MMAP;\n-\tsock_params->fanout = 0;\n-\n-\todpc->pktio = odp_pktio_open(odpc->device, pool, ¶ms);\n+\todpc->pktio = odp_pktio_open(odpc->device, pool);\n \tif (odpc->pktio == ODP_PKTIO_INVALID) {\n \t\tODP_ERR(\" [%02i] Error: pktio create failed\\n\", 1 \/*thr*\/);\n \t\trval = DAQ_ERROR_NODEV;\n"} {"commit":"883985def55f9adf63009cea372023753b3b0b54","subject":"nasm.c: better handling of errors without a file without ERR_NOFILE","message":"nasm.c: better handling of errors without a file without ERR_NOFILE\n\nWe have hardcoded ERR_NOFILE in a number of places which really should\nnot need them, and it represents loss of information. Instead, be\nrobust in the handling either of no filename or no line number.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@linux.intel.com>\n","repos":"techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- asm\/nasm.c\n+++ asm\/nasm.c\n@@ -1635,11 +1635,12 @@\n \tsrc_get(&lineno, ¤tfile);\n \n if (!skip_this_pass(severity)) {\n-\tif (currentfile) {\n-\t fprintf(error_file, \"%s:%\"PRId32\": \", currentfile, lineno);\n-\t} else {\n+\tif (!currentfile)\n \t fputs(\"nasm: \", error_file);\n-\t}\n+ else if (!lineno)\n+ fprintf(error_file, \"%s: \", currentfile);\n+ else\n+ fprintf(error_file, \"%s:%\"PRId32\": \", currentfile, lineno);\n }\n \n nasm_verror_common(severity, fmt, ap);\n"} {"commit":"2201ceb23803f7af9469bfe67985a7125b5ba9ed","subject":"nasm: avoid null pointer reference on VERY early memory allocation failure","message":"nasm: avoid null pointer reference on VERY early memory allocation failure\n\nIf we get a memory allocation failure before preproc is initialized,\nwe could end up taking a NULL pointer reference while trying to unwind\nmacros.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- asm\/nasm.c\n+++ asm\/nasm.c\n@@ -1927,7 +1927,8 @@\n \n \/* error_list_macros can for obvious reasons not work with ERR_HERE *\/\n if (!(severity & ERR_HERE))\n- preproc->error_list_macros(severity);\n+ if (preproc)\n+ preproc->error_list_macros(severity);\n \n switch (true_type) {\n case ERR_LISTMSG:\n"} {"commit":"ed3e84f9cdfac95d6cc7546878c52d63804894d3","subject":"assemble.c: quiet warning","message":"assemble.c: quiet warning\n\nClear an uninitialized variable warning. The case can't actually\nhappen, but the compiler doesn't know that.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"turingstudio\/nasm,turingstudio\/nasm,Distrotech\/nasm,projedi\/nasm,techkey\/nasm,projedi\/nasm,projedi\/nasm,Distrotech\/nasm,letolabs\/nasm,techkey\/nasm,letolabs\/nasm,techkey\/nasm,Distrotech\/nasm,projedi\/nasm,techkey\/nasm,projedi\/nasm,turingstudio\/nasm,turingstudio\/nasm,techkey\/nasm,letolabs\/nasm,Distrotech\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- assemble.c\n+++ assemble.c\n@@ -2107,6 +2107,9 @@\n \tcase 64:\n \t asize = BITS64;\n \t break;\n+\tdefault:\n+\t asize = 0;\n+\t break;\n \t}\n \tbreak;\n default:\n"} {"commit":"f283ff218d53e383a8c684ca5a1bbe91acecfa84","subject":"Rewrite parser.","message":"Rewrite parser.\n","repos":"trasz\/confctl,trasz\/confctl,trasz\/confctl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- confvar.c\n+++ confvar.c\n@@ -184,7 +184,59 @@\n }\n \n static struct buf *\n-cv_read_word(FILE *fp)\n+buf_read_junk(FILE *fp, bool middle)\n+{\n+\tint ch;\n+\tstruct buf *b;\n+\tbool comment = false;\n+\n+\tb = buf_new();\n+\n+\tfor (;;) {\n+\t\tch = getc(fp);\n+\t\tif (feof(fp) != 0)\n+\t\t\tbreak;\n+\t\tif (ferror(fp) != 0)\n+\t\t\terr(1, \"getc\");\n+\t\tif (comment) {\n+\t\t\tif (ch == '\\n' || ch == '\\r')\n+\t\t\t\tcomment = false;\n+\t\t\tbuf_append(b, ch);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (middle && (ch == '#' || ch == '\\n' || ch == '\\r' || ch == ';')) {\n+\t\t\tch = ungetc(ch, fp);\n+\t\t\tif (ch == EOF)\n+\t\t\t\terr(1, \"ungetc\");\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (ch == '#') {\n+\t\t\tcomment = true;\n+\t\t\tbuf_append(b, ch);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (isspace(ch) || ch == ';') {\n+\t\t\tbuf_append(b, ch);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tch = ungetc(ch, fp);\n+\t\tif (ch == EOF)\n+\t\t\terr(1, \"ungetc\");\n+\t\tbreak;\n+\t}\n+\n+\tif (b->b_len == 0) {\n+\t\tbuf_delete(b);\n+\t\tfprintf(stderr, \"null junk\\n\");\n+\t\treturn (NULL);\n+\t}\n+\tbuf_finish(b);\n+\tfprintf(stderr, \"junk '%s'\\n\", b->b_buf);\n+\treturn (b);\n+}\n+\n+static struct buf *\n+buf_read_name(FILE *fp)\n {\n \tint ch;\n \tstruct buf *b;\n@@ -193,11 +245,11 @@\n \tb = buf_new();\n \n \tfor (;;) {\n-\t\tch = fgetc(fp);\n+\t\tch = getc(fp);\n \t\tif (feof(fp) != 0)\n \t\t\tbreak;\n \t\tif (ferror(fp) != 0)\n-\t\t\terr(1, \"fgetc\");\n+\t\t\terr(1, \"getc\");\n \t\tif (escaped) {\n \t\t\tbuf_append(b, ch);\n \t\t\tescaped = false;\n@@ -209,9 +261,14 @@\n \t\t}\n \t\tif (ch == '\"')\n \t\t\tquoted = !quoted;\n-\t\tif (!quoted && isspace(ch)) {\n-\t\t\tif (b->b_len == 0)\n-\t\t\t\tcontinue;\n+\t\tif (quoted) {\n+\t\t\tbuf_append(b, ch);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (isspace(ch) || ch == '#' || ch == ';' || ch == '{' || ch == '}') {\n+\t\t\tch = ungetc(ch, fp);\n+\t\t\tif (ch == EOF)\n+\t\t\t\terr(1, \"ungetc\");\n \t\t\tbreak;\n \t\t}\n \t\tbuf_append(b, ch);\n@@ -219,37 +276,96 @@\n \n \tif (b->b_len == 0) {\n \t\tbuf_delete(b);\n+\t\tfprintf(stderr, \"null name\\n\");\n \t\treturn (NULL);\n \t}\n-\n \tbuf_finish(b);\n+\tfprintf(stderr, \"name '%s'\\n\", b->b_buf);\n+\treturn (b);\n+}\n+\n+static struct buf *\n+buf_read_value(FILE *fp)\n+{\n+\tint ch;\n+\tstruct buf *b;\n+\tbool quoted = false, escaped = false;\n+\n+\tb = buf_new();\n+\n+\tfor (;;) {\n+\t\tch = getc(fp);\n+\t\tif (feof(fp) != 0)\n+\t\t\tbreak;\n+\t\tif (ferror(fp) != 0)\n+\t\t\terr(1, \"getc\");\n+\t\tif (escaped) {\n+\t\t\tbuf_append(b, ch);\n+\t\t\tescaped = false;\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (ch == '\\\\') {\n+\t\t\tescaped = true;\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (ch == '\"')\n+\t\t\tquoted = !quoted;\n+\t\tif (quoted) {\n+\t\t\tbuf_append(b, ch);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif ((ch == '{' || ch == '}') && b->b_len == 0) {\n+\t\t\tbuf_append(b, ch);\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (ch == '\\n' || ch == '\\r' || ch == '#' || ch == ';' || ch == '{' || ch == '}') {\n+\t\t\tch = ungetc(ch, fp);\n+\t\t\tif (ch == EOF)\n+\t\t\t\terr(1, \"ungetc\");\n+\t\t\tbreak;\n+\t\t}\n+\t\tbuf_append(b, ch);\n+\t}\n+\n+\tif (b->b_len == 0) {\n+\t\tbuf_delete(b);\n+\t\tfprintf(stderr, \"null value\\n\");\n+\t\treturn (NULL);\n+\t}\n+\tbuf_finish(b);\n+\tfprintf(stderr, \"value '%s'\\n\", b->b_buf);\n \treturn (b);\n }\n \n static bool\n cv_load(struct confvar *parent, FILE *fp)\n {\n-\tstruct buf *name, *value;\n+\tstruct buf *before, *name, *middle, *value, *after;\n \tbool closing_bracket;\n \tstruct confvar *cv;\n \n-\tname = cv_read_word(fp);\n-\tif (name == NULL)\n-\t\treturn (true);\n-\tif (strcmp(name->b_buf, \"}\") == 0)\n-\t\treturn (true);\n-\tvalue = cv_read_word(fp);\n-\tif (value == NULL)\n-\t\terrx(1, \"name without value at EOF\");\n-\tif (strcmp(value->b_buf, \"{\") == 0) {\n-\t\tcv = cv_new(parent, name);\n-\t\tfor (;;) {\n-\t\t\tclosing_bracket = cv_load(cv, fp);\n-\t\t\tif (closing_bracket)\n-\t\t\t\tbreak;\n-\t\t}\n+\tbefore = buf_read_junk(fp, false);\n+\tname = buf_read_name(fp);\n+\tmiddle = buf_read_junk(fp, true);\n+\tvalue = buf_read_value(fp);\n+\tafter = buf_read_junk(fp, false);\n+\n+\tif (value != NULL) {\n+\t\tif (strcmp(value->b_buf, \"}\") == 0)\n+\t\t\treturn (true);\n+\n+\t\tif (strcmp(value->b_buf, \"{\") == 0) {\n+\t\t\tcv = cv_new(parent, name);\n+\t\t\tfor (;;) {\n+\t\t\t\tclosing_bracket = cv_load(cv, fp);\n+\t\t\t\tif (closing_bracket)\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t} else\n+\t\t\tcv_new_value(parent, name, value);\n \t} else\n-\t\tcv_new_value(parent, name, value);\n+\t\tcv_new_value(parent, name, buf_new_from_str(\"\"));\n+\n \treturn (false);\n }\n \n@@ -268,7 +384,7 @@\n \t\tif (feof(fp) != 0)\n \t\t\tbreak;\n \t\tif (ferror(fp) != 0)\n-\t\t\terr(1, \"fgetc\");\n+\t\t\terr(1, \"getc\");\n \t\tcv_load(cv, fp);\n \t}\n \n"} {"commit":"3eb8bb1a70f7f8e797ba64876b010012289ed207","subject":"Fixed getter for upstream_recursive_server, now uses getdns getter and returns whatever's in the list","message":"Fixed getter for upstream_recursive_server, now uses getdns getter and returns whatever's in the list\n","repos":"getdnsapi\/getdns-python-bindings,getdnsapi\/getdns-python-bindings","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -1207,12 +1207,12 @@\n getdns_list *upstream_list;\n getdns_return_t ret;\n \n- if ((ret = getdns_dict_get_list(all_context, \"upstream_recursive_servers\",\n- &upstream_list)) != GETDNS_RETURN_GOOD) {\n- PyErr_SetString(getdns_error, getdns_get_errorstr_by_id(ret));\n- return NULL;\n- }\n- if ((py_upstream_servers = pythonify_address_list(upstream_list)) == NULL) {\n+ if ((ret = getdns_context_get_upstream_recursive_servers(context,\n+ &upstream_list)) != GETDNS_RETURN_GOOD) {\n+ PyErr_SetString(getdns_error, getdns_get_errorstr_by_id(ret));\n+ return NULL;\n+ }\n+ if ((py_upstream_servers = glist_to_plist(upstream_list)) == NULL) {\n PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);\n return NULL;\n }\n"} {"commit":"57930e8b2bdb5f2805f074ae193eed511a502ca4","subject":"changed \"resolver_type\" to \"resolution_type\" in dict returned from context_get_api_information()","message":"changed \"resolver_type\" to \"resolution_type\" in dict returned from context_get_api_information()\n","repos":"Acidburn0zzz\/getdns-python-bindings,getdnsapi\/getdns-python-bindings,Acidburn0zzz\/getdns-python-bindings,getdnsapi\/getdns-python-bindings","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -635,7 +635,7 @@\n api_info = getdns_context_get_api_information(context);\n if (!strncmp(attrname, \"resolution_type\", strlen(\"resolution_type\"))) {\n uint32_t resolution_type;\n- if ((ret = getdns_dict_get_int(api_info, \"resolver_type\", &resolution_type)) != GETDNS_RETURN_GOOD) {\n+ if ((ret = getdns_dict_get_int(api_info, \"resolution_type\", &resolution_type)) != GETDNS_RETURN_GOOD) {\n char err_buf[256];\n getdns_strerror(ret, err_buf, sizeof err_buf);\n PyErr_SetString(getdns_error, err_buf);\n@@ -1088,7 +1088,7 @@\n PyObject *py_api;\n getdns_bindata *version_string;\n getdns_bindata *imp_string;\n- uint32_t resolver_type;\n+ uint32_t resolution_type;\n getdns_dict *all_context;\n PyObject *py_all_context;\n size_t ncontexts;\n@@ -1126,13 +1126,13 @@\n PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);\n return NULL;\n }\n- if ((ret = getdns_dict_get_int(api_info, \"resolver_type\", &resolver_type)) != GETDNS_RETURN_GOOD) {\n- char err_buf[256];\n- getdns_strerror(ret, err_buf, sizeof err_buf);\n- PyErr_SetString(getdns_error, err_buf);\n- return NULL;\n- }\n- if (PyDict_SetItemString(py_api, \"resolver_type\", PyInt_FromLong((long)resolver_type))) {\n+ if ((ret = getdns_dict_get_int(api_info, \"resolution_type\", &resolution_type)) != GETDNS_RETURN_GOOD) {\n+ char err_buf[256];\n+ getdns_strerror(ret, err_buf, sizeof err_buf);\n+ PyErr_SetString(getdns_error, err_buf);\n+ return NULL;\n+ }\n+ if (PyDict_SetItemString(py_api, \"resolution_type\", PyInt_FromLong((long)resolution_type))) {\n PyErr_SetString(getdns_error, GETDNS_RETURN_GENERIC_ERROR_TEXT);\n return NULL;\n }\n"} {"commit":"b277809573b58cec15726eda10505823641655be","subject":"* context.c (write_to_connection): Remove two unused vars and key off right \"did we read?\" variable.","message":"* context.c\n (write_to_connection): Remove two unused vars and key off right \"did we read?\"\n variable.\n\n\ngit-svn-id: 683495cb1553624b05a54e2ba9533425f69cf277@908 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845\n","repos":"coapp-packages\/serf,coapp-packages\/serf,coapp-packages\/serf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- context.c\n+++ context.c\n@@ -343,8 +343,6 @@\n int stop_reading = 0;\n apr_status_t status;\n apr_status_t read_status;\n- const char *data;\n- apr_size_t len;\n int i;\n \n \/* If we have unwritten data, then write what we can. *\/\n@@ -407,7 +405,7 @@\n \n \/* If we got some data, then deliver it. *\/\n \/* ### what to do if we got no data?? is that a problem? *\/\n- if (len > 0) {\n+ if (conn->vec_len > 0) {\n status = socket_writev(conn);\n \n \/* If we can't write any more, or an error occurred, then\n"} {"commit":"dea11886167fff9861634d4d8170e2d705ffc5fc","subject":"Added add\/subtract functions","message":"Added add\/subtract functions\n","repos":"guillean\/CS107E-GB-Emulator,guillean\/CS107E-GB-Emulator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpu\/CPU.c\n+++ cpu\/CPU.c\n@@ -599,7 +599,7 @@\n \t\tram_write8( HL(), L() );\n \t\tbreak;\n case 0x76:\n-\t\t\/\/halt\n+\t\t\/\/halt <- should probably have a halt flag that waits until the next interrupt\n \t\tbreak;\n case 0x77:\n \t\tram_write8( HL(), A() );\n"} {"commit":"ca3b8ca0517249485cfde29031e215bf7e0c5324","subject":"dump: Comment how we dump zombies in pid namespaces","message":"dump: Comment how we dump zombies in pid namespaces\n\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\n","repos":"eabatalov\/criu,LK4D4\/criu,biddyweb\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,eabatalov\/criu,svloyso\/criu,sdgdsffdsfff\/criu,eabatalov\/criu,ldu4\/criu,wtf42\/criu,tych0\/criu,ldu4\/criu,gonkulator\/criu,wtf42\/criu,biddyweb\/criu,gablg1\/criu,gablg1\/criu,AuthenticEshkinKot\/criu,gablg1\/criu,marcosnils\/criu,fbocharov\/criu,rentzsch\/criu,biddyweb\/criu,KKoukiou\/criu-remote,efiop\/criu,fbocharov\/criu,KKoukiou\/criu-remote,eabatalov\/criu,tych0\/criu,gonkulator\/criu,svloyso\/criu,LK4D4\/criu,gonkulator\/criu,ldu4\/criu,gablg1\/criu,KKoukiou\/criu-remote,marcosnils\/criu,tych0\/criu,efiop\/criu,LK4D4\/criu,gonkulator\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,sdgdsffdsfff\/criu,fbocharov\/criu,gablg1\/criu,KKoukiou\/criu-remote,biddyweb\/criu,tych0\/criu,rentzsch\/criu,efiop\/criu,sdgdsffdsfff\/criu,svloyso\/criu,marcosnils\/criu,efiop\/criu,biddyweb\/criu,KKoukiou\/criu-remote,marcosnils\/criu,wtf42\/criu,fbocharov\/criu,eabatalov\/criu,marcosnils\/criu,gonkulator\/criu,svloyso\/criu,wtf42\/criu,rentzsch\/criu,rentzsch\/criu,sdgdsffdsfff\/criu,fbocharov\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,eabatalov\/criu,wtf42\/criu,biddyweb\/criu,gonkulator\/criu,AuthenticEshkinKot\/criu,efiop\/criu,sdgdsffdsfff\/criu,sdgdsffdsfff\/criu,svloyso\/criu,gablg1\/criu,fbocharov\/criu,KKoukiou\/criu-remote,ldu4\/criu,marcosnils\/criu,LK4D4\/criu,ldu4\/criu,efiop\/criu,svloyso\/criu,wtf42\/criu,ldu4\/criu,tych0\/criu,tych0\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cr-dump.c\n+++ cr-dump.c\n@@ -1299,9 +1299,16 @@\n \tint i, nr;\n \tpid_t *ch;\n \n+\t\/*\n+\t * Pids read here are virtual -- caller has set up\n+\t * the proc of target pid namespace.\n+\t *\/\n \tif (parse_children(item->pid.virt, &ch, &nr) < 0)\n \t\treturn -1;\n \n+\t\/*\n+\t * Step 1 -- filter our ch's pid of alive tasks\n+\t *\/\n \tlist_for_each_entry(child, &item->children, sibling) {\n \t\tif (child->pid.virt < 0)\n \t\t\tcontinue;\n@@ -1313,6 +1320,12 @@\n \t\t}\n \t}\n \n+\t\/*\n+\t * Step 2 -- assign remaining pids from ch on\n+\t * children's items in arbitrary order. The caller\n+\t * will then re-read everything needed to dump\n+\t * zombies using newly obtained virtual pids.\n+\t *\/\n \ti = 0;\n \tlist_for_each_entry(child, &item->children, sibling) {\n \t\tif (child->pid.virt > 0)\n"} {"commit":"62293abdb0351df752adbfa1001f866e98ec0e0c","subject":"Allow header to be set using -H","message":"Allow header to be set using -H\n","repos":"cxfinnag\/cx-http-bench","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- cxbench.c\n+++ cxbench.c\n@@ -85,6 +85,7 @@\n static int random_mode = 0;\n static unsigned int num_parallell = 1;\n static const char *query_prefix = \"\";\n+static const char *header = \"Dummy: dummy\";\n static const char *output_filename = \"cxbench.out\";\n static const char *error_filename = \"cxbench.errors\";\n static FILE *querylog_file;\n@@ -198,6 +199,7 @@\n \t\t{ \"output\", required_argument, NULL, 'o' },\n \t\t{ \"parallell\", required_argument, NULL, 'p' },\n \t\t{ \"query-prefix\", required_argument, NULL, 'q' },\n+\t\t{ \"header\", required_argument, NULL, 'H' },\n \t\t{ \"qps\", required_argument, NULL, 's' },\n \t\t{ \"num-queries\", required_argument, NULL, 'n' },\n \t\t{ \"wait-mode\", required_argument, NULL, 'w' },\n@@ -205,7 +207,7 @@\n \t};\n \n \tint ch;\n-\twhile ((ch = getopt_long(argc, argv, \"hdlrp:q:e:o:s:n:w:\", opts, NULL)) != -1) {\n+\twhile ((ch = getopt_long(argc, argv, \"hdlrp:q:H:e:o:s:n:w:\", opts, NULL)) != -1) {\n \t\tswitch (ch) {\n \t\tcase 'h':\n \t\t\tusage(argv[0]);\n@@ -268,6 +270,9 @@\n \t\t\tbreak;\n \t\tcase 'q':\n \t\t\tquery_prefix = strdup(optarg);\n+\t\t\tbreak;\n+\t\tcase 'H':\n+\t\t\theader = strdup(optarg);\n \t\t\tbreak;\n \t\tcase 'w':\n \t\t\tif (strcasecmp(optarg, \"poisson\") == 0) {\n@@ -586,8 +591,8 @@\n generate_query(char *buf, size_t buf_len, const char *host, const char *query)\n {\n \tsize_t would_write = snprintf(buf, buf_len,\n-\t\t\t\t \"GET %s%s HTTP\/1.1\\r\\nHost: %s\\r\\nConnection: close\\r\\n\\r\\n\",\n-\t\t\t\t query_prefix, query, host);\n+\t\t\t\t \"GET %s%s HTTP\/1.1\\r\\nHost: %s\\r\\nConnection: close\\r\\n%s\\r\\n\\r\\n\",\n+\t\t\t\t query_prefix, query, host, header);\n \treturn MIN(buf_len - 1, would_write);\n }\n \n"} {"commit":"d4c89d8688a30275e6273c30b5368a2f9248a2b9","subject":"html: render tables for inclusion in support.php","message":"html: render tables for inclusion in support.php\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@14419 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- packaging\/generic\/print-camera-list.c\n+++ packaging\/generic\/print-camera-list.c\n@@ -1143,6 +1143,184 @@\n \treturn 0;\n }\n \n+\/* HTML output *\/\n+struct html_comment {\n+\tchar *name;\n+\tchar *comment;\n+};\n+struct html_data {\n+\tint nrofcomments;\n+\tstruct html_comment *comments;\n+};\n+\n+static int\n+html_begin_func (const func_params_t *params, void **data) {\n+\tFILE *f;\n+\tchar buf[512];\n+\tint n;\n+\tstruct html_data *hd;\n+\n+\tprintf(\"<!-- This part was generated by %s - - html -->\\n\",\n+\t \"libgphoto2 \" ARGV0);\n+\tprint_version_comment(stdout, \" | \", \"\\n\", \"<!--+\\n\", \" +-->\\n\");\n+\tprintf(\"<table border=1>\\n\");\n+\tprintf(\"<tr>\\n\");\n+\tprintf(\" <th>Camera Model<\/th>\\n\");\n+\tprintf(\" <th>Abilities<\/th>\\n\");\n+\tprintf(\" <th>Comments<\/th>\\n\");\n+\tprintf(\"<\/tr>\\n\");\n+\n+\thd = malloc(sizeof(*hd));\n+\thd->nrofcomments = 0;\n+\thd->comments = NULL;\n+\n+\tf = fopen(\"comments.txt\",\"r\");\n+\tif (!f)\n+\t\treturn 0;\n+\twhile (fgets(buf,sizeof(buf),f)) {\n+\t\tchar *s = strchr(buf,';');\n+\t\tif (!s)\n+\t\t\tcontinue;\n+\t\t*s = '\\0';\n+\t\tif (hd->nrofcomments) {\n+\t\t\thd->comments = realloc(hd->comments, (hd->nrofcomments+1)*sizeof(hd->comments[0]));\n+\t\t} else {\n+\t\t\thd->comments = malloc(sizeof(hd->comments[0]));\n+\t\t}\n+\t\thd->comments[hd->nrofcomments].name = strdup(buf);\n+\t\thd->comments[hd->nrofcomments].comment = strdup(s+1);\n+\t\thd->nrofcomments++;\n+\t}\n+\tfclose (f);\n+\treturn 0;\n+}\n+\n+static char*\n+escape_html(const char *str) {\n+\tchar *s, *newstr, *ns;\n+\tint inc = 0;\n+\n+\ts = str;\n+\tdo {\n+\t\ts = strchr(s,'&');\n+\t\tif (s) {\n+\t\t\tinc+=strlen(\"&\");\n+\t\t\ts++;\n+\t\t}\n+\t} while (s);\n+\t\/* FIXME: if we ever get a camera with <> or so, add escape code here *\/\n+\tnewstr = malloc(strlen(str)+1+inc);\n+\ts = str; ns = newstr;\n+\tdo {\n+\t\tchar *x;\n+\t\tx = strchr(s,'&');\n+\t\tif (x) {\n+\t\t\tmemcpy (ns, s, x-s);\n+\t\t\tns += x-s;\n+\t\t\tmemcpy (ns, \"&\", strlen(\"&\"));\n+\t\t\tns += strlen(\"&\");\n+\t\t\ts = x+1;\n+\t\t} else {\n+\t\t\tstrcpy (ns, s);\n+\t\t\tbreak;\n+\t\t}\n+\t} while (1);\n+\treturn newstr;\n+}\n+\n+static int\n+html_camera_func (\n+\tconst func_params_t *params, \n+\tconst int i,\n+\tconst int total,\n+\tconst CameraAbilities *a,\n+\tvoid *data\n+) {\n+\tchar *m;\n+\tCameraOperation op = a->operations;\n+\n+\tif (a->device_type != GP_DEVICE_STILL_CAMERA)\n+\t\treturn 0;\n+\n+\tprintf (\"<tr>\\n\");\n+\tm = escape_html (a->model);\n+\tprintf (\" <td>%s<\/td>\", m); free (m);\n+\tprintf (\" <td>\");\n+\tif (!op) printf (\" \");\n+\tif (op & GP_OPERATION_CAPTURE_IMAGE) {\n+\t\tprintf (\"Image Capture\");\n+\t\top &= ~GP_OPERATION_CAPTURE_IMAGE;\n+\t\tif (op) printf (\", \");\n+\t}\n+\tif (op & GP_OPERATION_CAPTURE_PREVIEW) {\n+\t\tprintf (\"Liveview\");\n+\t\top &= ~GP_OPERATION_CAPTURE_PREVIEW;\n+\t\tif (op) printf (\", \");\n+\t}\n+\tif (op & GP_OPERATION_CONFIG) {\n+\t\tprintf (\"Configuration\");\n+\t\top &= ~GP_OPERATION_CONFIG;\n+\t\tif (op) printf (\", \");\n+\t}\n+\tif (op) {\n+\t\tprintf (\"Other Ops %x\", op);\n+\t}\n+\tprintf(\" <\/td>\");\n+\tprintf(\" <td>\");\n+\tswitch (a->status) {\n+\tcase GP_DRIVER_STATUS_PRODUCTION: break;\n+\tcase GP_DRIVER_STATUS_TESTING: printf(\"Testing (Beta)\"); break;\n+\tcase GP_DRIVER_STATUS_EXPERIMENTAL: printf(\"Experimental\"); break;\n+\tcase GP_DRIVER_STATUS_DEPRECATED: printf(\"Deprecated\"); break;\n+\t}\n+\t\/* read comments *\/\n+\tprintf(\"  \");\n+\tprintf(\" <\/td>\");\n+\tprintf(\"<\/tr>\\n\");\n+\treturn 0;\n+}\n+\n+static int html_middle_func (\n+\tconst func_params_t *params,\n+\tvoid **data\n+) {\n+\tprintf(\"<\/table><p>\\n\");\n+\tprintf(\"Media Players that are supported by both libmtp and libgphoto2:<p\/>\\n\");\n+\tprintf(\"<table border=1>\\n\");\n+\tprintf(\"<tr>\\n\");\n+\tprintf(\" <th>Media Player Model<\/th>\\n\");\n+\tprintf(\"<\/tr>\\n\");\n+\treturn 0;\n+}\n+\n+static int\n+html_camera2_func (\n+\tconst func_params_t *params, \n+\tconst int i,\n+\tconst int total,\n+\tconst CameraAbilities *a,\n+\tvoid *data\n+) {\n+\tchar *m;\n+\n+\tif (a->device_type != GP_DEVICE_AUDIO_PLAYER)\n+\t\treturn 0;\n+\n+\tm = escape_html (a->model);\n+\tprintf (\"<tr>\\n\");\n+\tprintf (\" <td>%s<\/td>\", m); free (m);\n+\tprintf(\"<\/tr>\\n\");\n+\treturn 0;\n+}\n+\n+\n+static int html_end_func (\n+\tconst func_params_t *params,\n+\tvoid *data\n+) {\n+\tprintf(\"<\/table>\\n\");\n+\treturn 0;\n+}\n \n \/* time zero for debug log time stamps *\/\n struct timeval glob_tv_zero = { 0, 0 };\n@@ -1301,6 +1479,16 @@\n \t udev_camera_func2,\n \t udev_end_func\n \t},\n+\t{\"html\",\n+\t \"HTML table file for gphoto.org website\",\n+\t \"Paste it into \/proj\/libgphoto2\/support.php\",\n+\t NULL,\n+\t html_begin_func,\n+\t html_camera_func,\n+\t html_middle_func,\n+\t html_camera2_func,\n+\t html_end_func\n+\t},\n \t{\"idlist\",\n \t \"list of IDs and names\",\n \t \"grep for an ID to find the device name\",\n"} {"commit":"73d0d8c964a20d402686b7e1ab58652bc79a95f4","subject":"MySpace: Update status by OpenSocial 1.0 API","message":"MySpace: Update status by OpenSocial 1.0 API\n","repos":"lcp\/libsocialweb-extra-plugins,lcp\/libsocialweb-extra-plugins","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- services\/myspace\/myspace.c\n+++ services\/myspace\/myspace.c\n@@ -499,22 +499,18 @@\n SwServiceMySpace *myspace = (SwServiceMySpace *)self;\n SwServiceMySpacePrivate *priv = myspace->priv;\n RestProxyCall *call;\n- gchar *function;\n+ gchar *request_body;\n \n if (!priv->user_id)\n return;\n \n call = rest_proxy_new_call (priv->proxy);\n- \/* TODO use OpenSocial 1.0 API*\/\n rest_proxy_call_set_method (call, \"PUT\");\n- function = g_strdup_printf (\"v1\/users\/%s\/status\", priv->user_id);\n- rest_proxy_call_set_function (call, function);\n- g_free (function);\n-\n- rest_proxy_call_add_params (call,\n- \"userId\", priv->user_id,\n- \"status\", msg,\n- NULL);\n+ rest_proxy_call_set_function (call, \"1.0\/statusmood\/@me\/@self\");\n+\n+ request_body = g_strdup_printf (\"{ \\\"status\\\":\\\"%s\\\" }\", msg);\n+ rest_proxy_call_set_body (call, request_body);\n+\n rest_proxy_call_async (call, _update_status_cb, (GObject *)self, NULL, NULL);\n sw_status_update_iface_return_from_update_status (context);\n }\n"} {"commit":"7cc6a89e21124362987a137f50fcba81ac55e197","subject":"fix spare id random selection.","message":"fix spare id random selection.\n","repos":"NLnetLabs\/unbound,NLnetLabs\/unbound,NLnetLabs\/unbound,NLnetLabs\/unbound","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- services\/outside_network.c\n+++ services\/outside_network.c\n@@ -1589,17 +1589,19 @@\n \tint i;\n \tunsigned select, count, space;\n \trbnode_type* node;\n+\n+\t\/* make really sure the tree is not empty *\/\n+\tif(reuse->tree_by_id.count == 0) {\n+\t\tid = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;\n+\t\treturn id;\n+\t}\n+\n+\t\/* try to find random empty spots by picking them *\/\n \tfor(i = 0; i<try_random; i++) {\n \t\tid = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;\n \t\tif(!reuse_tcp_by_id_find(reuse, id)) {\n \t\t\treturn id;\n \t\t}\n-\t}\n-\n-\t\/* make really sure the tree is not empty *\/\n-\tif(reuse->tree_by_id.count == 0) {\n-\t\tid = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff;\n-\t\treturn id;\n \t}\n \n \t\/* equally pick a random unused element from the tree that is\n@@ -1627,8 +1629,7 @@\n \t\t\t\tspace = nextid - curid - 1;\n \t\t\t\tif(select < count + space) {\n \t\t\t\t\t\/* here it is *\/\n-\t\t\t\t\treturn curid + 1 + ub_random_max(\n-\t\t\t\t\t\toutnet->rnd, space);\n+\t\t\t\t\treturn curid + 1 + (select - count);\n \t\t\t\t}\n \t\t\t\tcount += space;\n \t\t\t}\n@@ -1642,9 +1643,7 @@\n \tnode = rbtree_last(&reuse->tree_by_id);\n \tlog_assert(node && node != RBTREE_NULL); \/* tree not empty *\/\n \tcurid = tree_by_id_get_id(node);\n-\tspace = 0xffff - curid;\n-\tlog_assert(select < count + space);\n-\treturn curid + 1 + ub_random_max(outnet->rnd, space);\n+\treturn curid + 1 + (select - count);\n }\n \n struct waiting_tcp*\n"} {"commit":"718a8f2945386e4c25f5d16dbdf769d887201c72","subject":"replace bmap instead of union","message":"replace bmap instead of union\n\nwith union, we were recording the history of the other node's bmap.\nWhat we want is a vision of the actual state.\n","repos":"cskiraly\/Streamers,cskiraly\/Streamers,davidek\/peerstreamer-Streamers,davidek\/peerstreamer-Streamers","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- chunk_signaling.c\n+++ chunk_signaling.c\n@@ -124,7 +124,8 @@\n void bmap_received(const struct nodeID *fromid, const struct nodeID *ownerid, struct chunkID_set *c_set, int cb_size, int trans_id) {\n struct peer *owner = nodeid_to_peer(ownerid,1);\n if (owner) {\t\/\/now we have it almost sure\n- chunkID_set_union(owner->bmap,c_set);\t\/\/don't send it back\n+ chunkID_set_clear(owner->bmap,cb_size+5);\t\/\/TODO: some better solution might be needed to keep info about chunks we sent in flight.\n+ chunkID_set_union(owner->bmap,c_set);\n owner->cb_size = cb_size;\n gettimeofday(&owner->bmap_timestamp, NULL);\n }\n"} {"commit":"f487cf3e7b6a94dcdb993f870500fecd3285c8c7","subject":"silence warning in serial_mpi.c","message":"silence warning in serial_mpi.c\n","repos":"ibaned\/tetknife,ibaned\/tetknife,ibaned\/tetknife","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- serial_mpi.c\n+++ serial_mpi.c\n@@ -128,5 +128,6 @@\n unsigned long mpi_exscan_ulong(mpi* m, unsigned long x)\n {\n (void)m;\n+ (void)x;\n return 0;\n }\n"} {"commit":"9e9cc85fbfc80ed74b80434073d617f82ad95933","subject":"Fix decode and generation of linkage descriptor with mobile handover","message":"Fix decode and generation of linkage descriptor with mobile handover\n\nLinkage descriptor's generation and decoding routines improperly calculated the\nbeginning of the private data region in cases where linkage_type = 8,\nhandover_info = 0, and origin_type = 1.\n\n(cherry picked from commit 979733f1b500a24d43165ed442d9167991a42452)\nSigned-off-by: Jean-Paul Saman <c35aa29dc4eb008b34a9adceca7414ea1db124ba@videolan.org>\n","repos":"mkrufky\/libdvbpsi,paraeco\/libdvbpsi,mkrufky\/libdvbpsi,paraeco\/libdvbpsi,paraeco\/libdvbpsi,mkrufky\/libdvbpsi,paraeco\/libdvbpsi,mwgoldsmith\/dvbpsi,mwgoldsmith\/dvbpsi,mwgoldsmith\/dvbpsi,mwgoldsmith\/dvbpsi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/descriptors\/dr_4a.c\n+++ src\/descriptors\/dr_4a.c\n@@ -98,6 +98,7 @@\n {\n p_decoded->i_handover_type = handover_type;\n p_decoded->i_origin_type = origin_type;\n+ i = 8;\n if (handover_type > 0 && handover_type < 4)\n {\n p_decoded->i_network_id = p_descriptor->p_data[8] << 8\n@@ -183,6 +184,7 @@\n {\n \tp_descriptor->p_data[7] = ( (p_decoded->i_handover_type & 0x0F) << 4 )\n \t\t\t| 0x0E | ( p_decoded->i_origin_type & 0x01 );\n+ last_pos = 7;\n if ((p_decoded->i_handover_type > 0) &&\n (p_decoded->i_handover_type < 3 ))\n {\n"} {"commit":"aeda65cbfa914e60d3c01a5ba42df25ef14bfd12","subject":"sinowealth: remove per-resolution led","message":"sinowealth: remove per-resolution led\n\nThe glorious mice uses a single profile. To differentiate between\nresolutions each one has customizable color. A led on the bottom\nof the mouse shows the active resolution color.\n\nLibratbag does not support a per-resolution color.\n\nTo allow adjusting these colors the sinowealth driver defines a led\nfor each resolution. This is a misuse of the model and will cause\nproblems when the mouse is added to Piper.\n\nThis patch removes the per-resolution leds and hardcodes the led\ncount to one.\n","repos":"whot\/libratbag,libratbag\/libratbag,libratbag\/libratbag,whot\/libratbag,libratbag\/libratbag,whot\/libratbag","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/driver-sinowealth.c\n+++ src\/driver-sinowealth.c\n@@ -309,14 +309,6 @@\n \t}\n \tratbag_led_unref(led);\n \n-\t\/* DPI indicator LED *\/\n-\tfor (int i = 1; i < SINOWEALTH_NUM_DPIS + 1; i++) {\n-\t\tled = ratbag_profile_get_led(profile, i);\n-\t\tled->mode = RATBAG_LED_ON;\n-\t\tled->color = sinowealth_raw_to_color(config->dpi_color[i - 1]);\n-\t\tratbag_led_unref(led);\n-\t}\n-\n \tprofile->is_active = true;\n \n \treturn 0;\n@@ -335,7 +327,7 @@\n \tunsigned int dpis[num_dpis];\n \n \t\/* TODO: Button remapping *\/\n-\tratbag_device_init_profiles(device, 1, SINOWEALTH_NUM_DPIS, 0, SINOWEALTH_NUM_DPIS + 1);\n+\tratbag_device_init_profiles(device, 1, SINOWEALTH_NUM_DPIS, 0, 1);\n \n \tprofile = ratbag_device_get_profile(device, 0);\n \n@@ -359,16 +351,6 @@\n \tratbag_led_set_mode_capability(led, RATBAG_LED_CYCLE);\n \tratbag_led_set_mode_capability(led, RATBAG_LED_BREATHING);\n \tratbag_led_unref(led);\n-\n-\t\/* Set up DPI indicator LEDs *\/\n-\tfor (int i = 1; i < SINOWEALTH_NUM_DPIS + 1; i++) {\n-\t\tled = ratbag_profile_get_led(profile, i);\n-\t\tled->type = RATBAG_LED_TYPE_DPI;\n-\t\tled->colordepth = RATBAG_LED_COLORDEPTH_RGB_888;\n-\t\tled->mode = RATBAG_LED_ON;\n-\t\tratbag_led_set_mode_capability(led, RATBAG_LED_ON);\n-\t\tratbag_led_unref(led);\n-\t}\n \n \tratbag_profile_unref(profile);\n }\n@@ -468,13 +450,6 @@\n \t}\n \tratbag_led_unref(led);\n \n-\t\/* DPI indicator LED *\/\n-\tfor (int i = 1; i < SINOWEALTH_NUM_DPIS + 1; i++) {\n-\t\tled = ratbag_profile_get_led(profile, i);\n-\t\tconfig->dpi_color[i - 1] = sinowealth_color_to_raw(led->color);\n-\t\tratbag_led_unref(led);\n-\t}\n-\n \tconfig->config_write = 0x7b; \/* magic *\/\n \n \trc = ratbag_hidraw_set_feature_report(device, SINOWEALTH_REPORT_ID_CONFIG,\n"} {"commit":"215e7a317a0f1c297dc2cb1b4d5363923b8abd2b","subject":"Fix indent","message":"Fix indent\n","repos":"laschuet\/gla","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gla\/gla.h\n+++ gla\/gla.h\n@@ -462,7 +462,7 @@\n buffer = NULL;\n \n if (fclose(file) == EOF) {\n-\t\tfree(out);\n+ free(out);\n out = NULL;\n fprintf(stderr, \"Error: File (\\\"%s\\\") handling: \"\n \"Unable to close file\\n\", filename);\n"} {"commit":"416e1cea9b7f7a626341005cced947add7da5c54","subject":"lossless_neon: enable subtract green for aarch64","message":"lossless_neon: enable subtract green for aarch64\n\nsimilar to:\n1ba61b0 enable NEON intrinsics in aarch64 builds\n\nvtbl1_u8 is available everywhere but Xcode-based iOS arm64 builds, use\nvtbl1q_u8 there.\n\nperformance varies based on the input, 1-3% on encode was observed\n\nChange-Id: Ifec35b37eb856acfcf69ed7f16fa078cd40b7034\n","repos":"kalli123\/webm.libwebp,ericmckean\/webm.libwebp,PKRoma\/libwebp,Acidburn0zzz\/webm.libwebp,PKRoma\/libwebp,jiehu5114\/libwebp,gshORTON\/webm.libwebp,Maria1099\/webm.libwebp,ya7lelkom\/libwebp,abwiz0086\/webm.libwebp,altogother\/webm.libwebp,ericmckean\/webm.libwebp,jiehu5114\/libwebp,webmproject\/libwebp,reimaginemedia\/webm.libwebp,ericmckean\/webm.libwebp,matanbs\/webm.libwebp,Aexyn\/libwebp,gshORTON\/webm.libwebp,jiehu5114\/libwebp,Maria1099\/webm.libwebp,ericmckean\/webm.libwebp,Suvarna1488\/webm.libwebp,iniwf\/webm.libwebp,matanbs\/webm.libwebp,iniwf\/webm.libwebp,jacklicn\/libwebp,ttyangf\/libwebp,yohunl\/libwebp,zofuthan\/libwebp,ttyangf\/libwebp,kim42083\/webm.libwebp,altogother\/webm.libwebp,ttyangf\/libwebp,iniwf\/webm.libwebp,ya7lelkom\/libwebp,gshORTON\/webm.libwebp,kim42083\/webm.libwebp,redengineer\/libwebp,rxl194\/libwebp,redengineer\/libwebp,Acidburn0zzz\/webm.libwebp,kalli123\/webm.libwebp,PKRoma\/libwebp,reimaginemedia\/webm.libwebp,gshORTON\/webm.libwebp,Suvarna1488\/webm.libwebp,Acidburn0zzz\/webm.libwebp,reimaginemedia\/webm.libwebp,jiehu5114\/libwebp,kalli123\/webm.libwebp,redengineer\/libwebp,PKRoma\/libwebp,altogother\/webm.libwebp,Maria1099\/webm.libwebp,iniwf\/webm.libwebp,Acidburn0zzz\/webm.libwebp,kim42083\/webm.libwebp,jacklicn\/libwebp,imazen\/libwebp,Acidburn0zzz\/webm.libwebp,rxl194\/libwebp,Aexyn\/libwebp,zofuthan\/libwebp,Aexyn\/libwebp,imazen\/libwebp,Suvarna1488\/webm.libwebp,imazen\/libwebp,jacklicn\/libwebp,ya7lelkom\/libwebp,ya7lelkom\/libwebp,Aexyn\/libwebp,jacklicn\/libwebp,yohunl\/libwebp,reimaginemedia\/webm.libwebp,abwiz0086\/webm.libwebp,abwiz0086\/webm.libwebp,yohunl\/libwebp,zofuthan\/libwebp,jiehu5114\/libwebp,yohunl\/libwebp,abwiz0086\/webm.libwebp,gshORTON\/webm.libwebp,ttyangf\/libwebp,Suvarna1488\/webm.libwebp,Aexyn\/libwebp,kleopatra999\/webm.libwebp,Maria1099\/webm.libwebp,iniwf\/webm.libwebp,kleopatra999\/webm.libwebp,matanbs\/webm.libwebp,zofuthan\/libwebp,redengineer\/libwebp,rxl194\/libwebp,kleopatra999\/webm.libwebp,yohunl\/libwebp,Maria1099\/webm.libwebp,PKRoma\/libwebp,webmproject\/libwebp,altogother\/webm.libwebp,ya7lelkom\/libwebp,matanbs\/webm.libwebp,kim42083\/webm.libwebp,kleopatra999\/webm.libwebp,zofuthan\/libwebp,ericmckean\/webm.libwebp,webmproject\/libwebp,rxl194\/libwebp,Suvarna1488\/webm.libwebp,jacklicn\/libwebp,kalli123\/webm.libwebp,abwiz0086\/webm.libwebp,kim42083\/webm.libwebp,redengineer\/libwebp,kalli123\/webm.libwebp,webmproject\/libwebp,reimaginemedia\/webm.libwebp,imazen\/libwebp,ttyangf\/libwebp,webmproject\/libwebp,rxl194\/libwebp,altogother\/webm.libwebp,kleopatra999\/webm.libwebp,PKRoma\/libwebp,imazen\/libwebp,matanbs\/webm.libwebp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/dsp\/lossless_neon.c\n+++ src\/dsp\/lossless_neon.c\n@@ -259,20 +259,44 @@\n \/\/------------------------------------------------------------------------------\n \/\/ Subtract-Green Transform\n \n-\/\/ vtbl? are unavailable in iOS\/arm64 builds.\n-#if !defined(__aarch64__)\n-\n-\/\/ 255 = byte will be zero'd\n+\/\/ vtbl?_u8 are marked unavailable for iOS arm64, use wider versions there.\n+#if defined(__APPLE__) && defined(__aarch64__) && \\\n+ defined(__apple_build_version__)\n+#define USE_VTBLQ\n+#endif\n+\n+#ifdef USE_VTBLQ\n+\/\/ 255 = byte will be zeroed\n+static const uint8_t kGreenShuffle[16] = {\n+ 1, 255, 1, 255, 5, 255, 5, 255, 9, 255, 9, 255, 13, 255, 13, 255\n+};\n+\n+static WEBP_INLINE uint8x16_t DoGreenShuffle(const uint8x16_t argb,\n+ const uint8x16_t shuffle) {\n+ return vcombine_u8(vtbl1q_u8(argb, vget_low_u8(shuffle)),\n+ vtbl1q_u8(argb, vget_high_u8(shuffle)));\n+}\n+#else \/\/ !USE_VTBLQ\n+\/\/ 255 = byte will be zeroed\n static const uint8_t kGreenShuffle[8] = { 1, 255, 1, 255, 5, 255, 5, 255 };\n+\n+static WEBP_INLINE uint8x16_t DoGreenShuffle(const uint8x16_t argb,\n+ const uint8x8_t shuffle) {\n+ return vcombine_u8(vtbl1_u8(vget_low_u8(argb), shuffle),\n+ vtbl1_u8(vget_high_u8(argb), shuffle));\n+}\n+#endif \/\/ USE_VTBLQ\n \n static void SubtractGreenFromBlueAndRed(uint32_t* argb_data, int num_pixels) {\n const uint32_t* const end = argb_data + (num_pixels & ~3);\n+#ifdef USE_VTBLQ\n+ const uint8x16_t shuffle = vld1q_u8(kGreenShuffle);\n+#else\n const uint8x8_t shuffle = vld1_u8(kGreenShuffle);\n+#endif\n for (; argb_data < end; argb_data += 4) {\n const uint8x16_t argb = vld1q_u8((uint8_t*)argb_data);\n- const uint8x16_t greens =\n- vcombine_u8(vtbl1_u8(vget_low_u8(argb), shuffle),\n- vtbl1_u8(vget_high_u8(argb), shuffle));\n+ const uint8x16_t greens = DoGreenShuffle(argb, shuffle);\n vst1q_u8((uint8_t*)argb_data, vsubq_u8(argb, greens));\n }\n \/\/ fallthrough and finish off with plain-C\n@@ -281,19 +305,21 @@\n \n static void AddGreenToBlueAndRed(uint32_t* argb_data, int num_pixels) {\n const uint32_t* const end = argb_data + (num_pixels & ~3);\n+#ifdef USE_VTBLQ\n+ const uint8x16_t shuffle = vld1q_u8(kGreenShuffle);\n+#else\n const uint8x8_t shuffle = vld1_u8(kGreenShuffle);\n+#endif\n for (; argb_data < end; argb_data += 4) {\n const uint8x16_t argb = vld1q_u8((uint8_t*)argb_data);\n- const uint8x16_t greens =\n- vcombine_u8(vtbl1_u8(vget_low_u8(argb), shuffle),\n- vtbl1_u8(vget_high_u8(argb), shuffle));\n+ const uint8x16_t greens = DoGreenShuffle(argb, shuffle);\n vst1q_u8((uint8_t*)argb_data, vaddq_u8(argb, greens));\n }\n \/\/ fallthrough and finish off with plain-C\n VP8LAddGreenToBlueAndRed_C(argb_data, num_pixels & 3);\n }\n \n-#endif \/\/ !__aarch64__\n+#undef USE_VTBLQ\n \n #endif \/\/ WEBP_USE_INTRINSICS\n \n@@ -320,11 +346,9 @@\n VP8LPredictors[12] = Predictor12;\n VP8LPredictors[13] = Predictor13;\n \n-#if !defined(__aarch64__)\n VP8LSubtractGreenFromBlueAndRed = SubtractGreenFromBlueAndRed;\n VP8LAddGreenToBlueAndRed = AddGreenToBlueAndRed;\n #endif\n-#endif\n \n #endif \/\/ WEBP_USE_NEON\n }\n"} {"commit":"38ed637e3dc66f123165c993f9bc363eb0d9e630","subject":"Fixed a memory leak in iflow_find_path_next.","message":"Fixed a memory leak in iflow_find_path_next.\n\n2003\/12\/18 19:58:44-00:00 !kmacmillan\nFix compile errors on gcc 2.96 in libapol.\n\n2003\/12\/18 14:27:41-00:00 !donp\nfix to compiler warning\n\n2003\/12\/12 21:41:13-00:00 !kmacmillan\nRemoved some more debugging output from information flow analysis.\n\n2003\/12\/12 15:37:58-00:00 !kmacmillan\nFixed transitive flow regression test and obj class query options in\ninformation flow.\n\n2003\/12\/11 21:07:11-00:00 !kmacmillan\nMinor fix to informatin flow analysis.\n\n2003\/12\/10 21:37:40-00:00 !kmacmillan\nUpdated iflow help and fixed obj class handling in transitive information flow.\n\n2003\/12\/10 17:29:56-00:00 !kmacmillan\nFixed bug with filtering end types for transitive flows.\n\n2003\/12\/09 22:09:54-00:00 !kmacmillan\nFixed iflow_find_paths to actually return paths.\n\n2003\/12\/09 21:43:42-00:00 !kmacmillan\nFixed errors in iflow_find_paths*.\n\n2003\/12\/09 18:52:58-00:00 !kmacmillan\nMinor fix to information flow.\n\n2003\/12\/09 17:32:33-00:00 !kmacmillan\nAdded path finding to information flow analysis.\n\n2003\/12\/08 22:21:53-00:00 !kmacmillan\nFixes to information flow.\n\n2003\/12\/08 19:30:04-00:00 !kmacmillan\nMore major fixes for information flow analysis.\n\n2003\/12\/08 15:22:01-00:00 !kmacmillan\nRemoved some compile warnings.\n\n2003\/12\/08 15:19:43-00:00 !kmacmillan\nMajor update to information flow.\n\n2003\/12\/05 21:31:22-00:00 !donp\nupdates to apol\/libapol for transitive flow analysis-buggy and not ready for testing\n\n2003\/12\/05 20:10:15-00:00 !kmacmillan\nMinor fixes to information flow.\n\n2003\/12\/03 14:59:37-00:00 !kmacmillan\nFixed some memory leaks in information flow.\n\n2003\/12\/02 22:28:12-00:00 !kmacmillan\nMajor update to information flow analysis.\n\n2003\/11\/18 13:48:48-00:00 !mayerf\nMinor addition to policy header file\n\n2003\/11\/05 14:55:44-00:00 !mayerf\nRestructured lipaol to move TE rules search into the Core C lib, and then reimplement the TCL support. Added new policy-query.* files.\n\n2003\/10\/16 19:48:24-00:00 !donp\nchange to apol_tcl.c to support new query parameters\n\n2003\/09\/22 18:34:45-00:00 !kmacmillan\nAdded special case for indirect flows from a type to itself.\n\n2003\/09\/22 15:46:03-00:00 !kmacmillan\nFix for self flows in transitive iflow analysis.\n\n2003\/09\/19 15:51:59-00:00 !kmacmillan\nChanged comments to iflow analysis.\n\n2003\/09\/17 17:59:02-00:00 !kmacmillan\nFixed minor compile warnings.\n\n2003\/09\/17 17:52:01-00:00 !kmacmillan\nUpdated the spec file and added some documentation to transitive information\nflow analysis.\n\n2003\/09\/12 19:35:54-00:00 !kmacmillan\nFixed analysis to correctly find the perms object classes.\n\n2003\/09\/11 18:04:26-00:00 !kmacmillan\nAssigned NULL to policy->iflow_graph after calls to iflow_graph_free\nwhen perm maps are loaded. This should fix the random crashing related\nto transitive information flow analysis (segfaults and double frees).\n\n2003\/09\/08 19:35:12-00:00 !kmacmillan\nRemoved dead code path.\n\n2003\/09\/08 16:07:51-00:00 !kmacmillan\nDisallow self in the results of iflow_transitive_flows.\n\n2003\/08\/27 12:53:48-00:00 !donp\nbug fix-transitive interface wasn't recognizing a change to zero object classes\n\n2003\/08\/25 15:24:14-00:00 !kmacmillan\nAdded test to determine whether transitive closure is needed and changed\nobject class filtering to happen in transitive closure rather than in\niflow_transitive_flows.\n\n2003\/08\/20 18:27:20-00:00 !donp\nupdates for displaying transitive iflow progress\n\n2003\/08\/20 15:25:05-00:00 !donp\nsomehow karls' last update was removed\n\n2003\/08\/20 15:21:12-00:00 !donp\nupdates for transitive iflow analysis\n\n2003\/08\/20 11:41:54-00:00 !donp\nInitial changes to iflow interfaces to support step-by-step transitive analysis\n\n2003\/08\/19 19:58:37-00:00 !kmacmillan\nMinor fix that allowed both queries to return IN only flows.\n\n2003\/08\/19 17:25:36-00:00 !kmacmillan\nMoved open_policy back to apol_tcl.c and export the prototype.\n\n2003\/08\/19 15:30:46-00:00 !kmacmillan\nFix so that out edges aren't returned for in queries.\n\n2003\/08\/07 17:40:39-00:00 !kmacmillan\nMore comments for information flow analysis. KWM\n\n2003\/08\/07 13:02:39-00:00 !kmacmillan\nCleanups to transitive information flow analysis and fixes for 2 memory leaks\nin test-apol.c. KWM\n\n2003\/08\/06 19:13:17-00:00 !kmacmillan\nAdded transitive information flow analysis to test-apol.c, added iflow_graph_t*\nto policy struct, and fixed transitive information flow bugs. KWM\n\n2003\/08\/06 17:53:13-00:00 !kmacmillan\nAdded working transitive information flow analysis and re-added patch moving open_policy\nto policy.c. KWM\n\n2003\/08\/04 19:03:01-00:00 !kmacmillan\nUpdated iflow analysis to correctly handle attributes and * in a policy. Also,\nminor bug fixes to extract_types_from_te_rule and the tcl interface. KWM\n\n2003\/08\/01 16:40:26-00:00 !kmacmillan\nAdded support AVFLAG_PERM_STAR to iflow analysis. KWM\n\n2003\/08\/01 12:59:09-00:00 !kmacmillan\nMinor updates to recursive all paths. KWM\n\n2003\/07\/31 15:34:08-00:00 !donp\nInitial implementation in the tcl gui interface for information flow analysis\n\n2003\/07\/31 12:43:15-00:00 !kmacmillan\nFixed a major bug in the building of the information flow graph. iflow_graph_create\nassumed that the perm_map perms were in the same order as in policy->perms so that\nav_rule->perms->perm_idx could directly index the perms in the perm map. This is not\nthe case and the correct perm must be searched for. KWM\n\n2003\/07\/30 16:30:22-00:00 !kmacmillan\nAdded more convenient query results and first version of full information\nflow analysis. KWM\n\n2003\/07\/28 18:44:10-00:00 !kmacmillan\nComplete overhaul of information flow analysis to use graphs. KWM\n\n2003\/07\/25 14:59:36-00:00 !kmacmillan\nMinor fixes\/updates to information flow analysis. KWM\n\n2003\/07\/24 16:08:49-00:00 !kmacmillan\nMinor updates and fixes to information flow analysis. KWM\n\n2003\/07\/24 15:32:25-00:00 !kmacmillan\nAdded information flow analysis. KWM\n\n2003\/06\/30 10:35:08-00:00 !mayerf\nAdded comments\n\n2003\/06\/19 18:58:23-00:00 !donp\nTicket #3-Changes to maintain backwards compatibility in Apol_DomainTransitionAnalysis tcl command.\n\n2003\/06\/19 18:01:09-00:00 !donp\nTicket #3-Changed dt analysis implementation to support reverse direction\n\n2003\/06\/17 15:37:07-00:00 !donp\nTicket #3-Changes to analysis.* files\n\n2003\/03\/12 21:27:44-00:00 !mayerf\nLarge interim check-in, primarily changes to libapol to support that new domain transition analysis.\n\n(Logical change 1.3)\n\n","repos":"TresysTechnology\/setools3,TresysTechnology\/setools3,TresysTechnology\/setools3,TresysTechnology\/setools3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- setools\/libapol\/analysis.c\n+++ setools\/libapol\/analysis.c\n@@ -0,0 +1,2340 @@\n+\/* Copyright (C) 2003 Tresys Technology, LLC\n+ * see file 'COPYING' for use and warranty information *\/\n+\n+\/* \n+ * Author: mayerf@tresys.com\n+ * Modified by: don.patterson@tresys.com (6-17-2003)\n+ * Modified by: kmacmillan@tresys.com (7-18-2003) - added\n+ * information flow analysis.\n+ *\/\n+\n+\/* analysis.c\n+ *\n+ * Analysis routines for libapol\n+ *\/\n+#include <stdlib.h>\n+#include <assert.h>\n+#include <limits.h>\n+#include <time.h>\n+\n+#include \"policy.h\"\n+#include \"util.h\"\n+#include \"analysis.h\"\n+#include \"policy-query.h\"\n+#include \"queue.h\"\n+\n+\/*************************************************************************\n+ * domain transition analysis\n+ *\/\n+ \n+\/* all the \"free\" fns below have a prototype just like free() so that\n+ * ll_free() in util.c can use them. This makes us have to cast the\n+ * pointer, which can also cause run-time errors since someone could\n+ * mistakenly pass the wrong data type! BE CAREFUL!.\n+ *\/\n+void free_entrypoint_type(void *t)\n+{\n+\tentrypoint_type_t *p = (entrypoint_type_t *)t;\n+\tif(p == NULL)\n+\t\treturn;\n+\tif(p->ep_rules != NULL) \n+\t\tfree(p->ep_rules);\n+\tif(p->ex_rules != NULL) \n+\t\tfree(p->ex_rules);\n+\tfree(p);\n+\treturn;\n+}\n+\n+void free_trans_domain(void *t)\n+{\n+\ttrans_domain_t *p = (trans_domain_t *)t;\n+\tif(p == NULL)\n+\t\treturn;\n+\tll_free(p->entry_types, free_entrypoint_type);\n+\tif(p->pt_rules != NULL) \n+\t\tfree(p->pt_rules);\n+\tfree(p);\n+\treturn;\n+}\n+\n+void free_domain_trans_analysis(domain_trans_analysis_t *p)\n+{\n+\tif(p == NULL)\n+\t\treturn;\n+\tll_free(p->trans_domains, free_trans_domain);\n+\tfree(p);\n+\treturn;\n+}\n+\n+entrypoint_type_t *new_entry_point_type(void)\n+{\n+\tentrypoint_type_t *t;\n+\tt = (entrypoint_type_t *)malloc(sizeof(entrypoint_type_t));\n+\tif(t == NULL) {\n+\t\tfprintf(stderr, \"out of memory\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(t, 0, sizeof(entrypoint_type_t));\n+\treturn t;\n+}\n+\n+trans_domain_t *new_trans_domain(void)\n+{\n+\ttrans_domain_t *t;\n+\tt = (trans_domain_t *)malloc(sizeof(trans_domain_t));\n+\tif(t == NULL) {\n+\t\tfprintf(stderr, \"out of memory\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(t, 0, sizeof(trans_domain_t));\n+\tt->entry_types = ll_new();\n+\treturn t;\n+}\n+\n+domain_trans_analysis_t *new_domain_trans_analysis(void)\n+{\n+\tdomain_trans_analysis_t *t;\n+\tt = (domain_trans_analysis_t *)malloc(sizeof(domain_trans_analysis_t));\n+\tif(t == NULL) {\n+\t\tfprintf(stderr, \"out of memory\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(t, 0, sizeof(domain_trans_analysis_t));\n+\tt->trans_domains = ll_new();\n+\n+\treturn t;\n+}\n+\n+\n+\/* INTERNAL *\/\n+static int dta_add_rule_to_trans_type(int start_idx, int trans_idx, int rule_idx, \n+\t\tdomain_trans_analysis_t *dta)\n+{\t\n+\tllist_node_t *t;\n+\ttrans_domain_t *t_data = NULL;\n+\t\/* 1. find the type in the dta->trans_domains list *\/\n+\t\/*TODO: Need to fix the list; right now unsorted so this will can become painful*\/\n+\tfor(t = dta->trans_domains->head; t != NULL; t = t->next) {\n+\t\tt_data = (trans_domain_t *) t->data;\n+\t\tassert(t_data->start_type == start_idx);\n+\t\tif(t_data->trans_type == trans_idx)\n+\t\t\tbreak;\n+\t}\n+\tif(t == NULL)\n+\t\treturn -1; \/* trans_idx doesn't currently exist in the dta! *\/\n+\tassert(t_data != NULL);\n+\t\n+\t\/* 2. add the rule to pt_rules list for that t_ptr type *\/\n+\treturn add_i_to_a(rule_idx ,&(t_data->num_pt_rules), &(t_data->pt_rules));\n+}\n+\n+\/* INTERNAL *\/\n+static int dta_add_trans_type(bool_t reverse, int start_idx, int trans_idx, int rule_idx, \n+\t\tdomain_trans_analysis_t *dta)\n+{\n+\ttrans_domain_t *t;\n+\t\n+\t\/* allocate and initialize new target type struct (we may undo this later) *\/\n+\tt = new_trans_domain();\n+\tif(t == NULL) \n+\t\treturn -1;\n+\tt->start_type = start_idx;\n+\tt->trans_type = trans_idx;\n+\tt->reverse= reverse;\n+\t\n+\t\/* add the rule to the new target type *\/\n+\tif(add_i_to_a(rule_idx ,&(t->num_pt_rules), &(t->pt_rules)) != 0) {\n+\t\tfree_trans_domain(t);\n+\t\treturn -1;\n+\t}\n+\t\/* and link the target into the dta struct *\/\n+\t\/* TODO: need to do an insertion sort *\/\n+\tif(ll_append_data(dta->trans_domains, t) != 0 ) {\n+\t\tfree_trans_domain(t);\n+\t\treturn -1;\n+\t}\n+\t\t\t\n+\treturn 0;\n+}\n+\n+\/* INTERNAL: add process trans allowed trans types to dta result *\/\n+static int dta_add_process_trans_rule(bool_t reverse, int start_idx, int rule_idx, bool_t *b_type, domain_trans_analysis_t *dta, \n+\t\tpolicy_t *policy)\n+{\n+\tint *types = NULL, num_types, rt, i, idx;\n+\tassert(b_type != NULL && dta != NULL && policy != NULL && is_valid_av_rule_idx(rule_idx, 1, policy));\n+\t\n+\t\/* Check to see if this is a reverse DT analysis and if so, then extract the type from the SOURCE field. *\/ \n+\t\/* Otherwise, extract the type from the TARGET field *\/\n+\tif(reverse) {\n+\t\trt = extract_types_from_te_rule(rule_idx, RULE_TE_ALLOW, SRC_LIST, &types, &num_types, policy);\n+\t} \n+\telse {\n+\t\trt = extract_types_from_te_rule(rule_idx, RULE_TE_ALLOW, TGT_LIST, &types, &num_types, policy);\n+\t}\n+\t\n+\tif(rt < 0)\n+\t\treturn -1;\n+\tif(rt == 2) {\n+\t\t\/* add all types \n+\t\t * NOTE: Start from i = 1 since we know that type index 0 is 'self' and\n+\t\t * \twe don't want to include the pdeudo type self\n+\t\t *\/\n+\t\tfor(i = 1; i < policy->num_types; i++) {\n+\t\t\tif(!b_type[i]) {\n+\t\t\t\t\/* add new trans type and record its rules *\/\n+\t\t\t\tif(dta_add_trans_type(reverse, start_idx, i, rule_idx, dta) != 0) \n+\t\t\t\t\treturn -1;\n+\t\t\t\tb_type[i] = TRUE;\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\t\/* type already added just added, include this pt rule *\/\n+\t\t\t\tif(dta_add_rule_to_trans_type(start_idx, i, rule_idx, dta) != 0)\n+\t\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t} \n+\telse {\n+\t\t\/* add types and rules returned in list to trans_domains list*\/\n+\t\tfor(i = 0; i < num_types; i++) {\n+\t\t\t\/* NOTE: We have a special case if types[i] == 0. This is the pseudo\n+\t\t\t *\ttype 'self'. In this case we really don't want to add self, but\n+\t\t\t *\trather the start_idx. So in that case we'll change the idx\n+\t\t\t * \tthe start_idx.\n+\t\t\t *\/\n+\t\t\tif(types[i] == 0)\n+\t\t\t\tidx = start_idx;\n+\t\t\telse\n+\t\t\t\tidx = types[i];\n+\n+\t\t\tif(!b_type[idx]) {\n+\t\t\t\t\/* add new trans type and record its rules *\/\n+\t\t\t\tif(dta_add_trans_type(reverse, start_idx, idx, rule_idx, dta) != 0) {\n+\t\t\t\t\tif(types != NULL) free(types);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t\tb_type[idx] = TRUE;\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\t\/* type already added just added, include this pt rule *\/\n+\t\t\t\tif(dta_add_rule_to_trans_type(start_idx, idx, rule_idx, dta) != 0) {\n+\t\t\t\t\tif(types != NULL) free(types);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tif(types != NULL) free(types);\n+\t}\n+\t\n+\treturn 0;\n+}\n+\n+\n+\n+\/* INTERNAL *\/\n+static int dta_add_rule_to_entry_point_type(bool_t reverse, int rule_idx, entrypoint_type_t *ep)\n+{\n+\tif(ep != NULL) {\n+\t\tif(reverse) {\n+\t\t\treturn add_i_to_a(rule_idx, &(ep->num_ep_rules), &(ep->ep_rules));\t\n+\t\t}\n+\t\telse {\n+\t\t\treturn add_i_to_a(rule_idx, &(ep->num_ex_rules), &(ep->ex_rules));\n+\t\t}\n+\t}\n+\telse \n+\t\treturn -1;\n+}\n+\n+\/* INTERNAL *\/\n+static int dta_add_rule_to_ep_file_type(bool_t reverse, int file_idx, int rule_idx, trans_domain_t *t_ptr)\n+{\t\n+\tllist_node_t *t;\n+\tentrypoint_type_t *t_data = NULL;\n+\t\/* 1. find the file type in the t_ptr *\/\n+\t\/*TODO: Need to fix the list; right now unsorted so this will can become painful*\/\n+\tfor(t = t_ptr->entry_types->head; t != NULL; t = t->next) {\n+\t\tt_data = (entrypoint_type_t *) t->data;\n+\t\tif(t_data->file_type == file_idx)\n+\t\t\tbreak;\n+\t}\n+\tif(t == NULL)\n+\t\treturn -1; \/* file_idx doesn't currently exist in the t_ptr! *\/\n+\tassert(t_data != NULL);\n+\t\n+\t\/* 2. add the rule *\/\n+\tif(reverse) {\n+\t\treturn add_i_to_a(rule_idx ,&(t_data->num_ex_rules), &(t_data->ex_rules));\n+\t}\n+\telse {\n+\t\treturn add_i_to_a(rule_idx ,&(t_data->num_ep_rules), &(t_data->ep_rules));\n+\t}\n+}\n+\n+\/* INTERNAL *\/\n+static int dta_add_ep_type(bool_t reverse, int file_idx, int rule_idx, trans_domain_t *t_ptr)\n+{\n+\tentrypoint_type_t *t;\n+\t\n+\t\/* allocate and initialize new target type struct (we may undo this later) *\/\n+\tt = new_entry_point_type();\n+\tif(t == NULL) \n+\t\treturn -1;\n+\tt->start_type = t_ptr->start_type;\n+\tt->trans_type = t_ptr->trans_type;\n+\tt->file_type = file_idx;\n+\n+\t\/* add the rule to the new trans type *\/\n+\tif(reverse) {\n+\t\tif(add_i_to_a(rule_idx, &(t->num_ex_rules), &(t->ex_rules)) != 0) {\n+\t\t\tfree_entrypoint_type(t);\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\telse {\n+\t\tif(add_i_to_a(rule_idx, &(t->num_ep_rules), &(t->ep_rules)) != 0) {\n+\t\t\tfree_entrypoint_type(t);\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\t\n+\t\/* link in new file type *\/\n+\t\/* TODO: need to do an insertion sort *\/\n+\tif(ll_append_data(t_ptr->entry_types, t) != 0 ) {\n+\t\tfree_entrypoint_type(t);\n+\t\treturn -1;\n+\t}\n+\t\t\t\n+\treturn 0;\n+}\n+\n+\n+\/* INTERNAL *\/ \n+\/* TODO: This is very similar to dta_add_process_trans_rule(); should consolidate *\/\n+static int dta_add_file_entrypoint_type(bool_t reverse, int rule_idx, bool_t *b_types, trans_domain_t *t_ptr, policy_t *policy)\n+{\n+\tint rt, i, idx, *types, num_types; \n+\tassert(policy != NULL &&is_valid_av_rule_idx(rule_idx,1,policy) && b_types != NULL && t_ptr != NULL);\n+\t\/* In either a reverse or forward DT analysis, the entry point type is extracted from the TARGET field of the rule *\/\n+\trt = extract_types_from_te_rule(rule_idx, RULE_TE_ALLOW, TGT_LIST, &types, &num_types, policy);\n+\n+\tif(rt < 0)\n+\t\treturn -1;\n+\tif(rt == 2) {\n+\t\t\/* add all types \n+\t\t * NOTE: Start from i = 1 since we know that type index 0 is 'self' and\n+\t\t * \twe don't want to include the pdeudo type self \n+\t\t *\/\n+\t\tfor(i = 1; i < policy->num_types; i++) {\n+\t\t\tif(!b_types[i]) {\n+\t\t\t\t\/* new *\/\n+\t\t\t\tif(dta_add_ep_type(reverse, i, rule_idx, t_ptr) != 0)\n+\t\t\t\t\treturn -1;\n+\t\t\t\tb_types[i] = TRUE;\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\t\/* existing; add rule to existing one *\/\n+\t\t\t\tif(dta_add_rule_to_ep_file_type(reverse, i, rule_idx, t_ptr) != 0)\n+\t\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\telse {\n+\t\t\/* adding new file type *\/\n+\t\t\/* add types and rules returned in list to target domains list *\/\n+\t\tfor(i = 0; i < num_types; i++) {\n+\t\t\t\/* NOTE: We have a special case if types[i] == 0. This is the pseudo\n+\t\t\t *\ttype 'self'. In this case we really don't want to add self, but\n+\t\t\t *\trather the target's index (which is the source for these rules).\n+\t\t\t *\tSo in that case we'll change the idx the t_ptr->trans_type.\n+\t\t\t *\/\n+\t\t\tif(types[i] == 0)\n+\t\t\t\tidx = t_ptr->trans_type;\n+\t\t\telse\n+\t\t\t\tidx = types[i];\t\n+\t\t\tif(!b_types[idx]) {\n+\t\t\t\t\/* new *\/\n+\t\t\t\tif(dta_add_ep_type(reverse, idx, rule_idx, t_ptr) != 0) {\n+\t\t\t\t\tif(types != NULL) free(types);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t\tb_types[idx] = TRUE;\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\t\/* existing; add rule to existing one *\/\n+\t\t\t\tif(dta_add_rule_to_ep_file_type(reverse, idx, rule_idx, t_ptr) != 0) {\n+\t\t\t\t\tif(types != NULL) free(types);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tif(types != NULL) free(types);\n+\t}\t\t\t\t\n+\t\t\t\t\n+\n+\treturn 0;\n+}\n+\n+\n+\/* main domain trans analysis function.\n+ * \tdta must be allocated and initialized\n+ *\n+ *\treturns:\t\n+ *\t\t-1 general error\n+ *\t\t-2 start_domain invalid type\n+ *\/\n+\n+int determine_domain_trans(bool_t reverse, char *start_domain, domain_trans_analysis_t **dta, policy_t *policy)\n+{\n+\tint start_idx, i, classes[1], perms[1], perms2[1], rt;\n+\trules_bool_t b_start, b_trans; \t\/* structures are used for passing TE rule match booleans *\/\n+\tbool_t *b_type;\t\t\t\/* scratch pad arrays to keep track of types that have already been added *\/\n+\ttrans_domain_t *t_ptr;\n+\tentrypoint_type_t *ep;\n+\tllist_node_t *ll_node, *ll_node2;\n+\n+\tif(policy == NULL || dta == NULL)\n+\t\treturn -1;\n+\t\/* Retrieve the index of the specified starting domain from our policy database. *\/\n+\tif((start_idx = get_type_idx(start_domain, policy)) < 0)\n+\t\treturn -2;\n+\t*dta = NULL;\n+\t\n+\t\/* initialize our bool rule structures...free before leaving function *\/\n+\tb_type = (bool_t *)malloc(sizeof(bool_t) * policy->num_types);\n+\tif(b_type == NULL) {\n+\t\tfprintf(stderr, \"out of memory\");\n+\t\treturn -1;\n+\t}\n+\tmemset(b_type, 0, policy->num_types * sizeof(bool_t));\n+\t\/* b_start (all rules that have start_type as SOURCE for a forward \n+\t * DT analysis or start_type as TARGET for a reverse DT analysis). \n+\t * This structure is set in step 1 below. \n+\t *\/\n+\tif(init_rules_bool(0, &b_start, policy) != 0) \n+\t\tgoto err_return;\n+\t\/* b_trans (similar but used by t_ptr as SOURCE) *\/\n+\tif(init_rules_bool(0, &b_trans, policy) != 0) \n+\t\tgoto err_return;\t\t\n+\t\n+\t\/* initialize the results structure (caller must free if successful) *\/\n+\t*dta = new_domain_trans_analysis();\n+\tif(*dta == NULL) {\n+\t\tfprintf(stderr, \"out of memory\");\n+\t\tgoto err_return;\n+\t}\n+\t(*dta)->start_type = start_idx;\n+\t(*dta)->reverse = reverse;\n+\tif((*dta)->trans_domains == NULL)\n+\t\tgoto err_return;\n+\t\t\n+\t\/* At this point, we begin our domain transition analysis. \n+\t * Based upon the type of DT analysis (forward or reverse), populate dta structure \n+\t * with candidate trans domains by collecting all allow rules that give process \n+\t * transition access and that:\n+\t * \t- forward DT analysis - contain start_type in the SOURCE field\n+\t * \t- reverse DT analysis - contain start_type in the TARGET field\n+\t * Then:\n+\t *\t- forward DT analysis - select all the target types from those rules.\n+\t * \t- reverse DT analysis - select all the source types from those rules. \n+\t *\/\n+ \n+\t\/* Step 1. select all rules that:\n+\t\t- forward DT analysis - contain start_type in the SOURCE field\n+\t \t- reverse DT analysis - contain start_type in the TARGET field\n+\t (keep this around; we use it later when down-selecting candidate entry point file types in step 3.c) *\/\n+\tif(reverse) {\n+\t\tif(match_te_rules(0, NULL, 0, start_idx, IDX_TYPE, 0, TGT_LIST, 1, &b_start, policy) != 0)\n+\t\t\tgoto err_return;\n+\t} \n+\telse {\n+\t\tif(match_te_rules(0, NULL, 0, start_idx, IDX_TYPE, 0, SRC_LIST, 1, &b_start, policy) != 0)\n+\t\t\tgoto err_return;\t\n+\t}\n+\t\n+\t\n+\t\/* 2. Extract the trans domain types for process transition perm, and add to our result \n+\t keeping track if type already added in to b_type (i.e. our types scratch pad array) *\/\n+\tclasses[0] = get_obj_class_idx(\"process\", policy);\n+\tassert(classes[0] >= 0);\n+\tperms[0] = get_perm_idx(\"transition\", policy);\n+\tassert(perms[0] >= 0);\n+\tfor(i = 0; i < policy->num_av_access; i++) {\n+\t\tif(b_start.access[i] && (policy->av_access)[i].type == RULE_TE_ALLOW && \n+\t\t\t\tdoes_av_rule_use_classes(i, 1, classes, 1, policy) &&\n+\t\t\t\tdoes_av_rule_use_perms(i, 1, perms, 1, policy)) {\n+\t\t\t\/* 2.a we have a rule that allows process tran access, add it for now *\/\n+\t\t\trt = dta_add_process_trans_rule(reverse, start_idx, i, b_type, *dta, policy);\n+\t\t\tif(rt != 0)\n+\t\t\t\tgoto err_return;\n+\t\t}\n+\t}\n+\t\n+\t\/* At this point, we have a list of all trans types (and associated list of rules) that\n+\t * allow process transition permission ...\n+\t * \t- reverse DT analysis - to the start_domain\n+\t *\t- forward DT analysis - from the start_domain\n+\t * Now we need to take each trans type, and look for file types that provide:\n+\t *\t- forward DT analysis - the start_domain file execute and the trans type file entrypoint access.\n+\t *\t- reverse DT analysis - the start_domain file entrypoint and the trans type file execute access.\n+\t *\/\n+\t \n+\t\/* 3. get all the file types for the candidate trans types *\/\n+\t\n+\t\/* set up some temporary structure for our search. *\/\n+\tclasses[0] = get_obj_class_idx(\"file\", policy);\n+\tassert(classes[0] >= 0);\n+\tif(reverse) {\n+\t\tperms[0] = get_perm_idx(\"execute\", policy);\n+\t\tperms2[0] = get_perm_idx(\"entrypoint\", policy);\n+\t} \n+\telse {\n+\t\tperms[0] = get_perm_idx(\"entrypoint\", policy);\n+\t\tperms2[0] = get_perm_idx(\"execute\", policy);\n+\t}\n+\tassert(perms[0] >= 0);\n+\tassert(perms2[0] >= 0);\n+\t\n+\t\/* Loop through each trans type and find all allow rules that provide:\n+\t *\t- forward DT analysis - the start_domain file execute and the trans type file entrypoint access.\n+\t *\t- reverse DT analysis - the start_domain file entrypoint and the trans type file execute access.\n+\t *\/\n+\tfor(ll_node = (*dta)->trans_domains->head; ll_node != NULL; ) {\n+\t\tt_ptr = (trans_domain_t *)ll_node->data;\n+\t\tassert(t_ptr != NULL);\n+\t\tall_false_rules_bool(&b_trans, policy);\n+\t\tmemset(b_type, 0, policy->num_types * sizeof(bool_t));\n+\t\t\n+\t\t\/* 3.a Retrieve all rules that provide trans_type access as SOURCE\n+\t\t * \t- forward DT analysis - then filter out rules that provide file execute access.\n+\t\t * \t- reverse DT analysis - then filter our rules that provide file entrypoint access.\n+\t\t *\/\n+\t\tif(match_te_rules(0, NULL, 0, t_ptr->trans_type, IDX_TYPE, 0, SRC_LIST, 1, &b_trans, policy) != 0)\n+\t\t\tgoto err_return;\n+\t\t\n+\t\t\/* 3.b Filter out rules that allow the current trans_type ...\n+\t\t * \t- forward DT analysis - file entrypoint access.\n+\t \t *\t- reverse DT analysis - file execute access. \n+\t\t * Then extract candidate entrypoint file types from those rules. \n+\t\t*\/\n+\t\tfor(i = 0; i < policy->num_av_access; i++) {\n+\t\t\tif(b_trans.access[i] && (policy->av_access)[i].type == RULE_TE_ALLOW && \n+\t\t\t\t\tdoes_av_rule_use_classes(i, 1, classes, 1, policy) &&\n+\t\t\t\t\tdoes_av_rule_use_perms(i, 1, perms, 1, policy)) {\n+\t\t\t\trt = dta_add_file_entrypoint_type(reverse, i, b_type, t_ptr, policy);\n+\t\t\t\tif(rt != 0)\n+\t\t\t\t\tgoto err_return;\n+\t\t\t}\n+\t\t}\n+\t\t\n+\t\t\/* If this is a reverse DT analysis, we need to re-run match_te_rules to \n+\t\t * retrieve all rules with start_idx in the SOURCE field. *\/\t\t\t\t\t\t\n+\t\tif(reverse) {\n+\t\t\tall_false_rules_bool(&b_start, policy);\n+\t\t\tif(match_te_rules(0, NULL, 0, start_idx, IDX_TYPE, 0, SRC_LIST, 1, &b_start, policy) != 0)\n+\t\t\t\tgoto err_return;\n+\t\t} \n+\t\t\t\t\n+\t\t\/* 3.c for each candidate entrypoint file type, now look for rules that provide:\n+\t\t * \t- forward DT analysis - the start_type with file execute access to the entrypoint file.\n+\t \t *\t- reverse DT analysis - the start_type with file entrypoint access to the entrypoint file.\n+\t \t *\/\n+\t\tfor(ll_node2 = t_ptr->entry_types->head; ll_node2 != NULL;) {\n+\t\t\tep = (entrypoint_type_t *) ll_node2->data;\n+\t\t\tassert(ep != NULL);\n+\t\t\tfor(i = 0; i < policy->num_av_access; i++) {\n+\t\t\t\t\/* To be of interest, rule must have SOURCE field as start_type (b_start), be an allow\n+\t\t\t\t * rule, provide file execute (forward DT) or file entrypoint (reverse DT) access \n+\t\t\t\t * to the current entrypoint file type, and relate to file class objects. *\/\t\t\t\n+\t\t\t\tif(b_start.access[i] && policy->av_access[i].type == RULE_TE_ALLOW &&\n+\t\t\t\t does_av_rule_idx_use_type(i, 0, ep->file_type, IDX_TYPE, TGT_LIST, TRUE, policy) &&\n+\t\t\t\t does_av_rule_use_classes(i, 1, classes, 1, policy) &&\n+\t\t\t\t does_av_rule_use_perms(i, 1, perms2, 1, policy)) {\t\n+\t\t\t\trt = dta_add_rule_to_entry_point_type(reverse, i, ep);\n+\t\t\t\tif(rt != 0)\n+\t\t\t\t\tgoto err_return;\n+\t\t\t\t}\t\t\n+\t\t\t}\n+\t\t\t\/* 3.d At this point if a candidate file type does not have any ...\n+\t\t\t * \t\t- forward DT analysis - file execute rules\n+\t\t\t *\t\t- reverse DT analysis - file entrypoint rules\n+\t\t\t * \tthen it fails all 3 criteria and we remove it from the trans_type. \n+\t\t\t *\tWe don't have to check for ...\n+\t\t\t * \t\t- forward DT analysis - file entrypoint rules\n+\t\t\t *\t\t- reverse DT analysis - file execute rules \n+\t\t\t *\tbecause the file type would not even be in the list if it didn't \n+\t\t\t *\talready have at least one ...\n+\t\t\t * \t\t- forward DT analysis - file entrypoint rule.\n+\t\t\t *\t\t- reverse DT analysis - file execute rule.\n+\t\t\t *\/\n+\t\t\tif(reverse) {\n+\t\t\t\tif(ep->num_ep_rules < 1) {\n+\t\t\t\t\tassert(ep->ep_rules == NULL);\n+\t\t\t\t\tif(ll_unlink_node(t_ptr->entry_types, ll_node2) != 0) \n+\t\t\t\t\t\tgoto err_return;\n+\t\t\t\t\tll_node2 = ll_node_free(ll_node2, free_entrypoint_type);\n+\t\t\t\t}\n+\t\t\t\telse {\n+\t\t\t\t\t\/* interate *\/\n+\t\t\t\t\tll_node2 = ll_node2->next;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\tif(ep->num_ex_rules < 1) {\n+\t\t\t\t\tassert(ep->ex_rules == NULL);\n+\t\t\t\t\tif(ll_unlink_node(t_ptr->entry_types, ll_node2) != 0) \n+\t\t\t\t\t\tgoto err_return;\n+\t\t\t\t\tll_node2 = ll_node_free(ll_node2, free_entrypoint_type);\n+\t\t\t\t}\n+\t\t\t\telse {\n+\t\t\t\t\t\/* interate *\/\n+\t\t\t\t\tll_node2 = ll_node2->next;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\t\/* 3.e at this point, if a candidate trans_types do not have any entrypoint file types,\n+\t\t *\tremove it since it fails the criteria *\/\n+\t\tif(t_ptr->entry_types->num < 1) {\n+\t\t\tif(ll_unlink_node((*dta)->trans_domains, ll_node) !=0)\n+\t\t\t\tgoto err_return;\n+\t\t\tll_node = ll_node_free(ll_node, free_trans_domain);\n+\t\t}\n+\t\telse {\n+\t\t\t\/* interate *\/\n+\t\t\tll_node = ll_node->next;\n+\t\t}\n+\t\t\n+\t}\n+\t\n+\tif(b_type != NULL) free(b_type);\n+\tfree_rules_bool(&b_trans);\t\n+\tfree_rules_bool(&b_start);\t\n+\treturn 0;\t\n+err_return:\t\n+\tfree_domain_trans_analysis(*dta);\n+\tif(b_type != NULL) free(b_type);\n+\tfree_rules_bool(&b_trans);\n+\tfree_rules_bool(&b_start);\n+\treturn -1;\n+}\n+\n+\n+\/* end domain transition analysis\n+*************************************************************************\/\n+\n+\/*************************************************************************\n+ * Information flow analysis *\/\n+\n+\/* iflow_query_t *\/\n+\n+iflow_query_t *iflow_query_create(void)\n+{\n+\tiflow_query_t* q = (iflow_query_t*)malloc(sizeof(iflow_query_t));\n+\tif (q == NULL) {\n+\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(q, 0, sizeof(iflow_query_t));\n+\tq->start_type = -1;\n+\tq->direction = IFLOW_IN;\n+\n+\treturn q;\n+}\n+\n+static int iflow_obj_options_copy(iflow_obj_options_t *dest, iflow_obj_options_t *src)\n+{\n+ dest->obj_class = src->obj_class;\n+ dest->num_perms = src->num_perms;\n+ if (src->num_perms) {\n+ assert(src->perms);\n+ if (copy_int_array(&dest->perms, src->perms, src->num_perms))\n+ return -1;\n+ }\n+ return 0;\n+}\n+\n+\/* perform a deep copy of an iflow_query_t - dest should be\n+ * a newly created iflow_query *\/\n+static int iflow_query_copy(iflow_query_t *dest, iflow_query_t *src)\n+{\n+ int i;\n+\n+ assert(dest && src);\n+ dest->start_type = src->start_type;\n+ dest->direction = src->direction;\n+ if (src->num_end_types) {\n+ assert(src->end_types);\n+ if (copy_int_array(&dest->end_types, src->end_types, src->num_end_types))\n+ return -1;\n+ dest->num_end_types = src->num_end_types;\n+ }\n+ \n+ if (src->num_types) {\n+ assert(src->types);\n+ if (copy_int_array(&dest->types, src->types, src->num_types))\n+ return -1;\n+ dest->num_types = src->num_types;\n+ }\n+\n+ if (src->num_obj_options) {\n+ assert(src->obj_options);\n+ dest->obj_options = (iflow_obj_options_t*)malloc(sizeof(iflow_obj_options_t) * \n+ src->num_obj_options);\n+ if (!dest->obj_options) {\n+ fprintf(stderr, \"Memory error\\n\");\n+ return -1;\n+ }\n+ memset(dest->obj_options, 0, sizeof(iflow_obj_options_t) * src->num_obj_options);\n+ for (i = 0; i < src->num_obj_options; i++) {\n+ if (iflow_obj_options_copy(dest->obj_options + i, src->obj_options + i))\n+ return -1;\n+ }\n+ dest->num_obj_options = src->num_obj_options;\n+ }\n+ return 0;\n+}\n+\n+void iflow_query_destroy(iflow_query_t *q)\n+{\n+\tint i;\n+\n+\tif (q->end_types)\n+\t\tfree(q->end_types);\n+\tif (q->types)\n+\t\tfree(q->types);\n+\n+\tfor (i = 0; i < q->num_obj_options; i++) {\n+\t\tif (q->obj_options[i].perms)\n+\t\t\tfree(q->obj_options[i].perms);\n+\t}\n+\tif (q->obj_options)\n+\t\tfree(q->obj_options);\n+\tfree(q);\n+}\n+\n+static int iflow_query_find_obj_class(iflow_query_t *q, int obj_class)\n+{\n+\tint i;\n+\n+\tassert(q);\n+\tassert(obj_class >= 0);\n+\n+\tfor (i = 0; i < q->num_obj_options; i++) {\n+\t\tif (q->obj_options[i].obj_class == obj_class) {\n+\t\t\treturn i;\n+\t\t}\n+\t}\n+\treturn -1;\n+}\n+\n+\/*\n+ * Add an object class to ignore to an iflow_query_t - returns the index of\n+ * the iflow_obj_options_t on success or -1 on failure. Checks to\n+ * prevent the addition of duplicate or contradictory object classes.\n+ *\/\n+int iflow_query_add_obj_class(iflow_query_t *q, int obj_class)\n+{\n+\tint obj_idx, cur;\n+\n+\tassert(q);\n+\tassert(obj_class >= 0);\n+\n+\t\/* find an existing entry for the object class *\/\n+\tobj_idx = iflow_query_find_obj_class(q, obj_class);\n+\tif (obj_idx != -1) {\n+\t\t\t\/* make certain that the entire object class is ignored *\/\n+\t\t\tif (q->obj_options[obj_idx].perms) {\n+\t\t\t\tfree(q->obj_options[obj_idx].perms);\t\n+\t\t\t\tq->obj_options[obj_idx].perms = NULL;\n+\t\t\t\tq->obj_options[obj_idx].num_perms = 0;\n+\t\t\t}\n+\t\t\treturn obj_idx;\n+\t}\n+\n+\t\/* add a new entry *\/\n+\tcur = q->num_obj_options;\n+\tq->num_obj_options++;\n+\tq->obj_options = (iflow_obj_options_t*)realloc(q->obj_options,\n+\t\t\t\t\t\t sizeof(iflow_obj_options_t)\n+\t\t\t\t\t\t * q->num_obj_options);\n+\tif (!q->obj_options) {\n+\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\treturn -1;\n+\t}\n+\tmemset(&q->obj_options[cur], 0, sizeof(iflow_obj_options_t));\n+\tq->obj_options[cur].obj_class = obj_class;\n+\n+\treturn cur;\n+}\n+\n+\/*\n+ * Add an object class and perm to ignore to an iflow_query_t - returns the index of\n+ * the iflow_obj_options_t on success or -1 on failure. Checks to\n+ * prevent the addition of duplicate or contradictory object classes.\n+ *\/\n+int iflow_query_add_obj_class_perm(iflow_query_t *q, int obj_class, int perm)\n+{\n+\tint cur;\n+\tbool_t add = FALSE;\n+\n+\t\/* find an existing entry for the object class *\/\n+\tcur = iflow_query_find_obj_class(q, obj_class);\n+\n+ \/* add a new entry *\/\n+\tif (cur == -1) {\n+\t\tcur = q->num_obj_options;\n+\t\tq->num_obj_options++;\n+\t\tq->obj_options = (iflow_obj_options_t*)realloc(q->obj_options,\n+\t\t\t\t\t\t\t sizeof(iflow_obj_options_t)\n+\t\t\t\t\t\t\t * q->num_obj_options);\n+\t\tif (!q->obj_options) {\n+\t\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tmemset(&q->obj_options[cur], 0, sizeof(iflow_obj_options_t));\n+\t\tq->obj_options[cur].obj_class = obj_class;\n+\t\t\n+\t}\n+\n+\tif (!q->obj_options[cur].perms) {\n+\t\tadd = TRUE;\n+\t} else {\n+\t\tif (find_int_in_array(perm, q->obj_options[cur].perms,\n+\t\t\t\t q->obj_options[cur].num_perms) == -1)\n+\t\t\tadd = TRUE;\n+\t}\n+\n+\tif (add) {\n+\t\tif (add_i_to_a(perm, &q->obj_options[cur].num_perms,\n+\t\t\t &q->obj_options[cur].perms) == -1)\n+\t\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n+int iflow_query_add_end_type(iflow_query_t *q, int end_type)\n+{\n+\tbool_t add = FALSE;\n+\n+\tassert(q);\n+\t\/* we can't do anymore checking without the policy *\/\n+\tif (end_type < 0) {\n+\t\tfprintf(stderr, \"end type must be 0 or greater\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (q->end_types) {\n+\t\tif (find_int_in_array(end_type, q->end_types,\n+\t\t\t\t q->num_end_types) < 0) {\n+\t\t\tadd = TRUE;\n+\t\t}\n+\t} else {\n+\t\tadd = TRUE;\n+\t}\n+\tif (add)\n+\t\tif (add_i_to_a(end_type, &q->num_end_types, &q->end_types) < 0)\n+\t\t\treturn -1;\n+\treturn 0;\n+}\n+\n+int iflow_query_add_type(iflow_query_t *q, int type)\n+{\n+\tbool_t add = FALSE;\n+\n+\tassert(q);\n+\t\/* we can't do anymore checking without the policy *\/\n+\tif (type < 0) {\n+\t\tfprintf(stderr, \"end type must be 0 or greater\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (q->types) {\n+\t\tif (find_int_in_array(type, q->types,\n+\t\t\t\t q->num_types) < 0) {\n+\t\t\tadd = TRUE;\n+\t\t}\n+\t} else {\n+\t\tadd = TRUE;\n+\t}\n+\tif (add)\n+\t\tif (add_i_to_a(type, &q->num_types, &q->types) < 0)\n+\t\t\treturn -1;\n+\treturn 0;\n+}\n+\n+\/*\n+ * Check that the iflow_obj_option_t is valid for the graph\/policy.\n+ *\/\n+bool_t iflow_obj_option_is_valid(iflow_obj_options_t *o, policy_t *policy)\n+{\n+\tint i;\n+\n+\tassert(o && policy);\n+\n+\tif (!is_valid_obj_class(policy, o->obj_class))\n+\t\treturn FALSE;\n+\n+\tif (o->num_perms) {\n+\t\tif (!o->perms) {\n+\t\t\tfprintf(stderr, \"query with num_perms %d and perms is NULL\\n\", o->num_perms);\n+\t\t\treturn FALSE;\n+\t\t}\n+\t\tfor (i = 0; i < o->num_perms; i++) {\n+\t\t\tif (!is_valid_perm_for_obj_class(policy, o->obj_class, o->perms[i])) {\n+\t\t\t\tfprintf(stderr, \"query with invalid perm %d for object class %d\\n\",\n+\t\t\t\t\to->perms[i], o->obj_class);\n+\t\t\t\treturn FALSE;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn TRUE;\n+}\n+\n+\/* check to make certain that a query is consistent and makes\n+ * sense with the graph\/policy *\/\n+bool_t iflow_query_is_valid(iflow_query_t *q, policy_t *policy)\n+{\n+\tint i;\n+\n+#ifdef DEBUG_QUERIES\n+\tprintf(\"start type: %s\\n\", policy->types[q->start_type].name);\n+\tprintf(\"types[%d]:\\n\", q->num_types);\n+\tfor (i = 0; i < q->num_types; i++)\n+\t\tprintf(\"\\t%s\\n\", policy->types[q->types[i]].name);\n+\tprintf(\"end types[%d]: \\n\", q->num_end_types);\n+\tfor (i = 0; i < q->num_end_types; i++)\n+\t\tprintf(\"\\t%s\\n\", policy->types[q->end_types[i]].name);\n+\tprintf(\"obj options[%d]: \\n\", q->num_obj_options);\n+\tfor (i = 0; i < q->num_obj_options; i++) {\n+\t\tint j;\n+\t\tprintf(\"\\tobj class [%d]%s perms [%d]:\\n\", q->obj_options[i].obj_class,\n+\t\t policy->obj_classes[q->obj_options[i].obj_class].name,\n+\t\t q->obj_options[i].num_perms);\n+\t\tfor (j = 0; j < q->obj_options[i].num_perms; j++)\n+\t\t\tprintf(\"\\t\\t%s\\n\", policy->perms[q->obj_options[i].perms[j]]);\n+\t}\n+#endif\n+\n+\t\/* check the start type - we don't allow self (which is always 0) *\/\n+\tif (!is_valid_type(policy, q->start_type, FALSE)) {\n+\t\tfprintf(stderr, \"invalid start type %d in query\\n\", q->start_type);\n+\t\treturn FALSE;\n+\t}\n+\t\n+\t\/* transitive analysis will have to do further checks *\/\n+\tif (!(q->direction == IFLOW_IN || q->direction == IFLOW_OUT\n+\t || q->direction == IFLOW_BOTH || q->direction == IFLOW_EITHER)) {\n+\t\tfprintf(stderr, \"invalid direction %d in query\\n\", q->direction);\n+\t\treturn FALSE;\t\t\n+\t}\n+\t\n+\tif (q->num_end_types) {\n+\t\tif (!q->end_types) {\n+\t\t\tfprintf(stderr, \"query num_end_types was %d but end_types was NULL\\n\",\n+\t\t\t\tq->num_end_types);\n+\t\t\treturn FALSE;\n+\t\t}\n+\t\tfor (i = 0; i < q->num_end_types; i++) {\n+\t\t\tif (!is_valid_type(policy, q->end_types[i], FALSE)) {\n+\t\t\t\tfprintf(stderr, \"Invalid end type %d in query\\n\", q->end_types[i]);\n+\t\t\t\treturn FALSE;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (q->num_types) {\n+\t\tif (!q->types) {\n+\t\t\tfprintf(stderr, \"query num_types was %d but types was NULL\\n\",\n+\t\t\t\tq->num_types);\n+\t\t\treturn FALSE;\n+\t\t}\n+\t\tfor (i = 0; i < q->num_types; i++) {\n+\t\t\tif (!is_valid_type(policy, q->types[i], FALSE)) {\n+\t\t\t\tfprintf(stderr, \"Invalid end type %d in query\\n\", q->types[i]);\n+\t\t\t\treturn FALSE;\n+\t\t\t}\n+\t\t}\n+\t}\n+\t\n+\tif (q->num_obj_options) {\n+\t\tif (!q->obj_options) {\n+\t\t\tfprintf(stderr, \"query num_obj_options was %d by obj_options was NULL\\n\",\n+\t\t\t\tq->num_obj_options);\n+\t\t\treturn FALSE;\n+\t\t}\n+\t\tfor (i = 0; i < q->num_obj_options; i++) {\n+\t\t\tif (!iflow_obj_option_is_valid(&q->obj_options[i], policy)) {\n+\t\t\t\treturn FALSE;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn TRUE;\n+}\n+\n+\/* iflow_t *\/\n+\n+int iflow_init(iflow_graph_t *g, iflow_t *flow)\n+{\n+\tmemset(flow, 0, sizeof(iflow_t));\n+\tflow->num_obj_classes = g->policy->num_obj_classes;\n+\tflow->obj_classes = (iflow_obj_class_t*)malloc(sizeof(iflow_obj_class_t) *\n+\t\t\t\t\t\t flow->num_obj_classes);\n+\tif (!flow->obj_classes) {\n+\t\tfprintf(stderr, \"Memory Error\\n\");\n+\t\treturn -1;\n+\t}\n+\tmemset(flow->obj_classes, 0, sizeof(iflow_obj_class_t) *\n+\t flow->num_obj_classes);\n+\treturn 0;\n+}\n+\n+static void iflow_destroy_data(iflow_t *flow)\n+{\n+\tint i;\n+\t\n+\tif (flow->obj_classes) {\n+\t\tfor (i = 0; i < flow->num_obj_classes; i++) {\n+\t\t\tif (flow->obj_classes[i].rules)\n+\t\t\t\tfree(flow->obj_classes[i].rules);\n+\t\t}\n+\t\tfree(flow->obj_classes);\n+\t}\n+}\n+\n+void iflow_destroy(iflow_t *flow)\n+{\n+\tif (!flow)\n+\t\treturn;\n+\t\n+\tiflow_destroy_data(flow);\n+\n+\tfree(flow);\n+}\n+\n+\/* iflow_transitive_t *\/\n+\n+static void iflow_path_destroy(iflow_path_t *path)\n+{\n+\tint i;\n+\n+\tif (!path)\n+\t\treturn;\n+\tfor (i = 0; i < path->num_iflows; i++) {\n+\t\tiflow_destroy_data(&path->iflows[i]);\n+\t}\n+\tif (path->iflows)\n+\t\tfree(path->iflows);\n+\tfree(path);\n+}\n+\n+static void iflow_path_destroy_list(iflow_path_t *path)\n+{\n+\tiflow_path_t *next;\n+\n+\twhile (path) {\n+\t\tnext = path->next;\n+\t\tiflow_path_destroy(path);\n+\t\tpath = next;\n+\t}\n+}\n+\n+void iflow_transitive_destroy(iflow_transitive_t *flow)\n+{\n+\tint i;\n+\n+\tif (!flow)\n+\t\treturn;\n+\n+\tif (flow->end_types)\n+\t\tfree(flow->end_types);\n+\tfor (i = 0; i < flow->num_end_types; i++) {\n+\t\tiflow_path_destroy_list(flow->paths[i]);\n+\t}\n+\tif (flow->paths)\n+\t\tfree(flow->paths);\n+\tif (flow->num_paths)\n+\t\tfree(flow->num_paths);\n+\tfree(flow);\n+}\n+\n+\/* iflow_node_t *\/\n+\n+static void iflow_node_destroy_data(iflow_node_t *node)\n+{\n+\tif (!node)\n+\t\treturn;\n+\tif (node->in_edges)\n+\t\tfree(node->in_edges);\n+\tif (node->out_edges)\n+\t\tfree(node->out_edges);\n+}\n+\n+\/* iflow_graph_t *\/\n+\n+#define get_src_index(type) type\n+#define get_tgt_index(g, type, obj_class) ((type * g->policy->num_obj_classes) + obj_class)\n+\n+static iflow_graph_t *iflow_graph_alloc(policy_t *policy)\n+{\n+\tiflow_graph_t *g;\n+\tint index_size;\n+\n+\tg = (iflow_graph_t*)malloc(sizeof(iflow_graph_t));\n+\tif (!g) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(g, 0, sizeof(iflow_graph_t));\n+\n+\tindex_size = policy->num_types;\n+\tg->src_index = (int*)malloc(sizeof(int) * index_size);\n+\tif (!g->src_index) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(g->src_index, -1, sizeof(int) * index_size);\n+\t\n+\tindex_size = policy->num_types * policy->num_obj_classes;\n+\tg->tgt_index = (int*)malloc(sizeof(int) * index_size);\n+\tif (!g->tgt_index) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(g->tgt_index, -1, sizeof(int) * index_size);\n+\t\n+\tg->policy = policy;\n+\treturn g;\n+}\n+\n+void iflow_graph_destroy(iflow_graph_t *g)\n+{\n+\tint i, j;\n+\n+\tif (!g)\n+\t\treturn;\n+\n+\tfor (i = 0; i < g->num_nodes; i++)\n+\t\tiflow_node_destroy_data(&g->nodes[i]);\n+\n+\tif (g->src_index)\n+\t\tfree(g->src_index);\n+\tif (g->tgt_index)\n+\t\tfree(g->tgt_index);\n+\n+\tif (g->nodes)\n+\t\tfree(g->nodes);\n+\tif (g->edges) {\n+\t\tfor (i = 0; i < g->num_edges; i++) {\n+\t\t\tfor (j = 0; j < g->edges[i].num_obj_classes; j++) {\n+\t\t\t\tif (g->edges[i].obj_classes[j].rules)\n+\t\t\t\t\tfree(g->edges[i].obj_classes[j].rules);\n+\t\t\t}\n+\t\t\tif (g->edges[i].obj_classes)\n+\t\t\t\tfree(g->edges[i].obj_classes);\n+\t\t}\n+\t\tfree(g->edges);\n+\t}\n+}\n+\n+static int iflow_graph_get_nodes_for_type(iflow_graph_t *g, int type, int *len, int **types)\n+{\n+\tint i;\n+\n+\t*len = 0;\n+\t*types = NULL;\n+\n+\tif (g->src_index[get_src_index(type)] >= 0)\n+\t\tif (add_i_to_a(g->src_index[get_src_index(type)], len, types) < 0)\n+\t\t\treturn -1;\n+\tfor (i = 0; i < g->policy->num_obj_classes; i++) {\n+\t\tif (g->tgt_index[get_tgt_index(g, type, i)] >= 0)\n+\t\t\tif (add_i_to_a(g->tgt_index[get_tgt_index(g, type, i)], len, types) < 0)\n+\t\t\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n+static int iflow_graph_connect(iflow_graph_t *g, int start_node, int end_node)\n+{\n+\n+\tiflow_node_t* start, *end;\n+\tint i;\n+\n+\tstart = &g->nodes[start_node];\n+\tend = &g->nodes[end_node];\n+\n+\tfor (i = 0; i < start->num_out_edges; i++) {\n+\t\tif (g->edges[start->out_edges[i]].end_node == end_node)\n+\t\t\treturn start->out_edges[i];\n+\t}\n+\n+\tg->edges = (iflow_edge_t*)realloc(g->edges, (g->num_edges + 1)\n+\t\t\t\t\t * sizeof(iflow_edge_t));\n+\tif (g->edges == NULL) {\n+\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tmemset(&g->edges[g->num_edges], 0, sizeof(iflow_edge_t));\n+\t\n+\tg->edges[g->num_edges].num_obj_classes = g->policy->num_obj_classes;\n+\tg->edges[g->num_edges].obj_classes = (iflow_obj_class_t*)malloc(sizeof(iflow_obj_class_t)\n+\t\t* g->policy->num_obj_classes);\n+\tif (!g->edges[g->num_edges].obj_classes) {\n+\t\tfprintf(stderr, \"Memory Error\\n\");\n+\t\treturn -1;\n+\t}\n+\tmemset(g->edges[g->num_edges].obj_classes, 0, sizeof(iflow_obj_class_t) * g->policy->num_obj_classes);\n+\tg->edges[g->num_edges].start_node = start_node;\n+\tg->edges[g->num_edges].end_node = end_node;\n+\t\n+\tif (add_i_to_a(g->num_edges, &start->num_out_edges, &start->out_edges) != 0) {\n+\t\treturn -1;\n+\t}\t\n+\n+\tif (add_i_to_a(g->num_edges, &end->num_in_edges, &end->in_edges) != 0) {\n+\t\treturn -1;\n+\t}\n+\n+\tg->num_edges++;\n+\treturn g->num_edges - 1;\n+}\n+\n+static int iflow_graph_add_node(iflow_graph_t *g, int type, int node_type, int obj_class)\n+{\n+\tassert(node_type == IFLOW_SOURCE_NODE || node_type == IFLOW_TARGET_NODE);\n+\n+\t\/* check for an existing node and update the indexes if not *\/\n+\tif (node_type == IFLOW_SOURCE_NODE) {\n+\t\tif (g->src_index[get_src_index(type)] >= 0)\n+\t\t\treturn g->src_index[get_src_index(type)];\n+\t\telse\n+\t\t\tg->src_index[type] = g->num_nodes;\n+\t} else {\n+\t\tif (g->tgt_index[get_tgt_index(g, type, obj_class)] >= 0) {\n+\t\t\treturn g->tgt_index[get_tgt_index(g, type, obj_class)];\n+\t\t} else {\n+\t\t\tg->tgt_index[get_tgt_index(g, type, obj_class)] = g->num_nodes;\n+\t\t}\n+\t}\n+\t\n+\t\/* create a new node *\/\n+\tg->nodes = (iflow_node_t*)realloc(g->nodes, sizeof(iflow_node_t) * (g->num_nodes + 1));\n+\tif (!g->nodes) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn -1;\n+\t}\n+\tmemset(&g->nodes[g->num_nodes], 0, sizeof(iflow_node_t));\n+\tg->nodes[g->num_nodes].node_type = node_type;\n+\tg->nodes[g->num_nodes].type = type;\n+\tg->nodes[g->num_nodes].obj_class = obj_class;\n+\t\n+\tg->num_nodes++;\n+\treturn g->num_nodes - 1;\n+}\n+\n+\/* helper for iflow_graph_create *\/\n+static int add_edges(iflow_graph_t* g, int obj_class, int rule_idx, bool_t found_read, bool_t found_write) {\n+\tint i, j, k, ret;\n+\tint src_node, tgt_node;\n+\n+\tbool_t all_src_types = FALSE;\n+\tint cur_src_type;\n+\tint num_src_types = 0;\n+\tint* src_types = NULL;\n+\n+\tbool_t all_tgt_types = FALSE;\n+\tint cur_tgt_type;\n+\tint num_tgt_types = 0;\n+\tint* tgt_types = NULL;\n+\n+\tav_item_t* rule;\n+\n+\t\/* extract all of the rules *\/\n+\trule = &g->policy->av_access[rule_idx];\n+\n+\tret = extract_types_from_te_rule(rule_idx, RULE_TE_ALLOW, SRC_LIST, &src_types, &num_src_types, g->policy);\n+\tif (ret == -1)\n+\t\treturn -1;\n+\tif (ret == 2)\n+\t\tall_src_types = TRUE;\n+\n+\tret = extract_types_from_te_rule(rule_idx, RULE_TE_ALLOW, TGT_LIST, &tgt_types, &num_tgt_types, g->policy);\n+\tif (ret == -1)\n+\t\treturn -1;\n+\tif (ret == 2)\n+\t\tall_tgt_types = TRUE;\n+\t\n+\tfor (i = 0; i < num_src_types; i++) {\n+\t\tif (all_src_types)\n+\t\t\tcur_src_type = i;\n+\t\telse\n+\t\t\tcur_src_type = src_types[i];\n+\n+\t\tif (g->query->num_types) {\n+\t\t\tbool_t filter_type = FALSE;\n+\t\t\tfor (k = 0; k < g->query->num_types; k++) {\n+\t\t\t\tif (g->query->types[k] == cur_src_type) {\n+\t\t\t\t\tfilter_type = TRUE;\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (filter_type) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t}\n+\n+\t\t\/* add the source type *\/\n+\t\tsrc_node = iflow_graph_add_node(g, cur_src_type, IFLOW_SOURCE_NODE, -1);\n+\t\tif (src_node < 0)\n+\t\t\treturn -1;\n+\t\t\n+\t\tfor (j = 0; j < num_tgt_types; j++) {\n+\t\t\tint edge;\n+\t\t\t\n+\t\t\tif (all_tgt_types)\n+\t\t\t\tcur_tgt_type = j;\n+\t\t\telse\n+\t\t\t\tcur_tgt_type = tgt_types[j];\n+\t\t\t\n+\t\t\tif (g->query->num_types) {\n+\t\t\t\tbool_t filter_type = FALSE;\n+\t\t\t\tfor (k = 0; k < g->query->num_types; k++) {\n+\t\t\t\t\tif (g->query->types[k] == cur_tgt_type) {\n+\t\t\t\t\t\tfilter_type = TRUE;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (filter_type) {\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\n+\t\t\t\/* add the target type *\/\n+\t\t\ttgt_node = iflow_graph_add_node(g, cur_tgt_type, IFLOW_TARGET_NODE, obj_class);\n+\t\t\tif (tgt_node < 0)\n+\t\t\t\treturn -1;\n+\t\t\t\n+\t\t\tif (found_read) {\n+\t\t\t\tedge = iflow_graph_connect(g, tgt_node, src_node);\n+\t\t\t\tif (edge < 0) {\n+\t\t\t\t\tfprintf(stderr, \"Could not add edge!\\n\");\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (add_i_to_a(rule_idx, &g->edges[edge].obj_classes[obj_class].num_rules,\n+\t\t\t\t\t &g->edges[edge].obj_classes[obj_class].rules) != 0) {\n+\t\t\t\t\tfprintf(stderr, \"Could not add rule!\\n\");\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (found_write) {\n+\t\t\t\tedge = iflow_graph_connect(g, src_node, tgt_node);\n+\t\t\t\tif (edge < 0) {\n+\t\t\t\t\tfprintf(stderr, \"Could not add edge!\\n\");\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t\tif (add_i_to_a(rule_idx, &g->edges[edge].obj_classes[obj_class].num_rules,\n+\t\t\t\t\t &g->edges[edge].obj_classes[obj_class].rules) != 0) {\n+\t\t\t\t\tfprintf(stderr, \"Could not add rule!\\n\");\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\n+\t\t}\n+\t}\n+\tif (!all_src_types) {\n+\t\tfree(src_types);\n+\t}\n+\tif (!all_tgt_types) {\n+\t\tfree(tgt_types);\n+\t}\n+\treturn 0;\n+}\n+\n+\/*\n+ * Create an information flow graph of a policy.\n+ *\/\n+iflow_graph_t *iflow_graph_create(policy_t* policy, iflow_query_t *q)\n+{\n+\tint i, j, k, l, ret;\n+\tunsigned char map;\n+\tiflow_graph_t* g;\n+\tbool_t perm_error = FALSE;\n+\n+\tassert(policy && q);\n+\n+\tif (policy->pmap == NULL) {\n+\t\tfprintf(stderr, \"Perm map must be loaded first.\\n\");\n+\t\treturn NULL;\n+\t}\n+\t\n+\tg = iflow_graph_alloc(policy);\n+\tif (g == NULL)\n+\t\treturn NULL;\n+\tg->query = q;\n+\n+\tfor (i = 0; i < policy->num_av_access; i++) {\n+\t\tav_item_t* rule;\n+\t\tint cur_obj_class, num_obj_classes = 0, *obj_classes = NULL;\n+\t\tbool_t all_obj_classes = FALSE, all_perms = FALSE;\n+\t\tint cur_perm, num_perms = 0, *perms = NULL;\n+\n+\t\trule = &policy->av_access[i];\n+\t\tif (rule->type != RULE_TE_ALLOW)\n+\t\t\tcontinue;\n+\t\t\n+\t\t\/* get the object classes for this rule *\/\n+\t\tret = extract_obj_classes_from_te_rule(i, RULE_TE_ALLOW, &obj_classes, &num_obj_classes, policy);\n+\t\tif (ret == -1) {\n+\t\t\tiflow_graph_destroy(g);\n+\t\t\treturn NULL;\n+\t\t} else if (ret == 2) {\n+\t\t\tall_obj_classes = TRUE;\n+\t\t}\n+\t\t\n+\t\tret = extract_perms_from_te_rule(i, RULE_TE_ALLOW, &perms, &num_perms, policy);\n+\t\tif (ret == -1) {\n+\t\t\tiflow_graph_destroy(g);\n+\t\t\tif (!all_obj_classes)\n+\t\t\t\tfree(obj_classes);\n+\t\t\treturn NULL;\n+\t\t} else if (ret == 2) {\n+\t\t\tall_perms = TRUE;\n+\t\t}\n+\n+\t\t\/* find read or write flows for each object class *\/\n+\t\tfor (j = 0; j < num_obj_classes; j++ ) {\n+\t\t\tclass_perm_map_t* cur_pmap;\n+\t\t\tbool_t found_read = FALSE, found_write = FALSE;\n+\t\t\tint cur_obj_options = -1;\n+\n+\t\t\tif (all_obj_classes)\n+\t\t\t\tcur_obj_class = j;\n+\t\t\telse\n+\t\t\t\tcur_obj_class = obj_classes[j];\n+\n+\t\t\t\/* Check to see if we should filter this object class. If we find\n+\t\t\t * the object class in the obj_options and it doesn't list specific\n+\t\t\t * perms then we filter. If we find the object class in the obj_options\n+\t\t\t * but it has specific perms we save the index into obj_options and\n+\t\t\t * check the perms below *\/\n+\t\t\tif (q->num_obj_options != 0) {\n+\t\t\t\tbool_t filter_obj_class = FALSE;\n+\t\t\t\tfor (k = 0; k < q->num_obj_options; k++) {\n+\t\t\t\t\tif (q->obj_options[k].obj_class == cur_obj_class) {\n+\t\t\t\t\t\tif (q->obj_options[k].num_perms == 0)\n+\t\t\t\t\t\t\tfilter_obj_class = TRUE;\n+\t\t\t\t\t\telse\n+\t\t\t\t\t\t\tcur_obj_options = k;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (filter_obj_class)\n+\t\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\tcur_pmap = &policy->pmap->maps[cur_obj_class];\n+\t\t\tif (all_perms) {\n+\t\t\t\tret = get_obj_class_perms(cur_obj_class, &num_perms, &perms, policy);\n+\t\t\t\tif (ret != 0) {\n+\t\t\t\t\tiflow_graph_destroy(g);\t\n+\t\t\t\t\tif (!all_obj_classes)\n+\t\t\t\t\t\tfree(obj_classes);\n+\t\t\t\t\treturn NULL;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tfor (k = 0; k < num_perms; k++) {\n+\t\t\t\tcur_perm = perms[k];\n+\n+\t\t\t\t\/* Check to see if we should ignore this permission *\/\n+\t\t\t\tif (cur_obj_options >= 0) {\n+\t\t\t\t\tbool_t filter_perm = FALSE;\n+\t\t\t\t\tfor (l = 0; l < q->obj_options[cur_obj_options].num_perms; l++) {\n+\t\t\t\t\t\tif (q->obj_options[cur_obj_options].perms[l] == cur_perm) {\n+\t\t\t\t\t\t\tfilter_perm = TRUE;\n+\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t\tif (filter_perm)\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\n+\t\t\t\t\/* get the mapping for the perm *\/\n+\t\t\t\tmap = 0;\n+\t\t\t\tfor (l = 0; l < cur_pmap->num_perms; l++) {\n+\t\t\t\t\tif (cur_pmap->perm_maps[l].perm_idx == cur_perm) {\n+\t\t\t\t\t\tmap = cur_pmap->perm_maps[l].map;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (map == 0) {\n+\t\t\t\t\tperm_error = TRUE;\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t\tif (map & PERMMAP_READ)\n+\t\t\t\t\tfound_read = TRUE;\n+\t\t\t\tif (map & PERMMAP_WRITE)\n+\t\t\t\t\tfound_write = TRUE;\n+\t\t\t\tif (found_read && found_write)\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tif (all_perms)\n+\t\t\t\tfree(perms);\n+\n+\t\t\tif (!found_read && !found_write) {\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\n+\t\t\t\/* if we have found any flows add the edge *\/\n+\t\t\tif (add_edges(g, cur_obj_class, i, found_read, found_write) != 0) {\n+\t\t\t\tiflow_graph_destroy(g);\n+\t\t\t\tif (!all_perms)\n+\t\t\t\t\tfree(perms);\n+\t\t\t\tif (!all_obj_classes)\n+\t\t\t\t\tfree(obj_classes);\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\n+\t\t\t\n+\t\t}\n+\t\tif (!all_perms)\n+\t\t\tfree(perms);\n+\t\tif (!all_obj_classes)\n+\t\t\tfree(obj_classes);\n+\t}\n+\n+\tif (perm_error)\n+\t\tfprintf(stderr, \"Not all of the permissions found had associated permission maps.\\n\");\n+\n+\treturn g;\n+}\n+\n+\/* direct information flow *\/\n+\n+\/* helper for iflow_direct_flows *\/\n+static bool_t edge_matches_query(iflow_graph_t* g, iflow_query_t* q, int edge)\n+{\n+\tint end_type, ending_node;\n+\t\n+\tif (g->nodes[g->edges[edge].start_node].type == q->start_type) {\n+\t\tending_node = g->edges[edge].end_node;\n+\t} else {\n+\t\tending_node = g->edges[edge].start_node;\n+\t}\n+\n+\tif (q->num_end_types != 0) {\n+\t\tend_type = g->nodes[ending_node].type;\n+\t\tif (find_int_in_array(end_type, q->end_types, q->num_end_types) == -1)\n+\t\t\treturn FALSE;\n+\t}\n+\n+\treturn TRUE;\n+}\n+\n+static int iflow_define_flow(iflow_graph_t *g, iflow_t *flow, int direction, int start_node, int edge)\n+{\n+\tint i, j, end_node;\n+\tiflow_edge_t *edge_ptr;\n+\t\n+\tedge_ptr = &g->edges[edge];\n+\n+\tif (edge_ptr->start_node == start_node) {\n+\t\tend_node = edge_ptr->end_node;\n+\t} else {\n+\t\tend_node = edge_ptr->start_node;\n+\t}\n+\n+\tflow->direction |= direction;\n+\tflow->start_type = g->nodes[start_node].type;\n+\tflow->end_type = g->nodes[end_node].type;\n+\n+\tfor (i = 0; i < edge_ptr->num_obj_classes; i++) {\n+\t\tfor (j = 0; j < edge_ptr->obj_classes[i].num_rules; j++) {\n+\t\t\tif (find_int_in_array(edge_ptr->obj_classes[i].rules[j], flow->obj_classes[i].rules,\n+\t\t\t\t\t flow->obj_classes[i].num_rules) == -1) {\n+\t\t\t\tif (add_i_to_a(edge_ptr->obj_classes[i].rules[j],\n+\t\t\t\t\t &flow->obj_classes[i].num_rules,\n+\t\t\t\t\t &flow->obj_classes[i].rules) < 0) {\n+\t\t\t\t\treturn \t-1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int direct_find_flow(iflow_graph_t *g, int start_node, int end_node, int *num_answers, iflow_t **answers)\n+{\n+\tiflow_t *cur;\n+\tint i;\n+\n+\tassert(num_answers);\n+\n+\t\/* see if a flow already exists *\/\n+\tif (*answers) {\n+\t\tfor (i = 0; i < *num_answers; i++) {\n+\t\t\tcur = &(*answers)[i];\n+\t\t\tif (cur->start_type == g->nodes[start_node].type &&\n+\t\t\t cur->end_type == g->nodes[end_node].type) {\n+\t\t\t\treturn i;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\t\/* if we didn't find a matching flow make space for a new one *\/\n+\t*answers = (iflow_t*)realloc(*answers, (*num_answers + 1)\n+\t\t\t\t * sizeof(iflow_t));\n+\tif (*answers == NULL) {\n+\t\tfprintf(stderr,\t\"Memory error!\\n\");\n+\t\treturn -1;\n+\t}\n+\tif (iflow_init(g, &(*answers)[*num_answers])) {\n+\t\treturn -1;\n+\t}\n+\n+\t(*num_answers)++;\n+\treturn *num_answers - 1;\n+}\n+\n+int iflow_direct_flows(policy_t *policy, iflow_query_t *q, int *num_answers,\n+\t\t iflow_t **answers)\n+{\n+\tint i, j, edge, ret = 0;\n+\tiflow_node_t* node;\n+\tbool_t edge_matches;\n+\tint num_nodes, *nodes;\n+\tint flow, end_node;\n+\tiflow_graph_t *g;\n+\n+\tif (!iflow_query_is_valid(q, policy))\n+\t\treturn -1;\n+\n+\tg = iflow_graph_create(policy, q);\n+\tif (!g) {\n+\t\tfprintf(stderr, \"Error creating graph\\n\");\n+\t\treturn -1;\n+\t}\n+\t\n+\t*num_answers = 0;\n+\t*answers = NULL;\n+\t\n+\tif (iflow_graph_get_nodes_for_type(g, q->start_type, &num_nodes, &nodes) < 0)\n+\t\treturn -1;\n+\t\/*\n+\t * Because the graph doesn't contain every type (i.e. it is possible that the query\n+\t * made a type not match), not finding a node means that there are no flows. This\n+\t * used to indicate an error.\n+\t *\/\n+\tif (num_nodes == 0) {\n+\t\treturn 0;\n+\t}\n+\t\n+\tif (q->direction == IFLOW_IN || q->direction == IFLOW_EITHER || q->direction == IFLOW_BOTH) {\n+\t\tfor (i = 0; i < num_nodes; i++) {\n+\t\t\tnode = &g->nodes[nodes[i]];\n+\t\t\tfor (j = 0; j < node->num_in_edges; j++) {\n+\t\t\t\tedge = node->in_edges[j];\n+\t\t\t\tedge_matches = edge_matches_query(g, q, edge);\n+\t\t\t\tif (!edge_matches)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (g->edges[edge].start_node == nodes[i])\n+\t\t\t\t\tend_node = g->edges[edge].end_node;\n+\t\t\t\telse\n+\t\t\t\t\tend_node = g->edges[edge].start_node;\n+\n+\t\t\t\tflow = direct_find_flow(g, nodes[i], end_node, num_answers, answers);\n+\t\t\t\tif (flow < 0) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t\tif (iflow_define_flow(g, &(*answers)[flow], IFLOW_IN, nodes[i], edge)) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\tif (q->direction == IFLOW_OUT || q->direction == IFLOW_EITHER || q->direction == IFLOW_BOTH) {\n+\t\tfor (i = 0; i < num_nodes; i++) {\n+\t\t\tnode = &g->nodes[nodes[i]];\n+\t\t\tfor (j = 0; j < node->num_out_edges; j++) {\n+\t\t\t\tedge = node->out_edges[j];\n+\t\t\t\tedge_matches = edge_matches_query(g, q, edge);\n+\t\t\t\tif (!edge_matches)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (g->edges[edge].start_node == nodes[i])\n+\t\t\t\t\tend_node = g->edges[edge].end_node;\n+\t\t\t\telse\n+\t\t\t\t\tend_node = g->edges[edge].start_node;\n+\n+\t\t\t\tflow = direct_find_flow(g, nodes[i], end_node, num_answers, answers);\n+\t\t\t\tif (flow < 0) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t\tif (iflow_define_flow(g, &(*answers)[flow], IFLOW_OUT, nodes[i], edge)) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (*num_answers == 0)\n+\t\tgoto out;\n+\n+\t\/* do some extra checks for both *\/\n+\tif (q->direction == IFLOW_BOTH) {\n+\t\tint tmp_num_answers = *num_answers;\n+\t\tiflow_t *tmp_answers = *answers;\n+\n+\t\t*num_answers = 0;\n+\t\t*answers = NULL;\n+\n+\t\tfor (i = 0; i < tmp_num_answers; i++) {\n+\t\t\tif (tmp_answers[i].direction != IFLOW_BOTH) {\n+\t\t\t\tiflow_destroy_data(&tmp_answers[i]);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\t*answers = (iflow_t*)realloc(*answers, (*num_answers + 1)\n+\t\t\t\t\t\t * sizeof(iflow_t));\n+\t\t\tif (*answers == NULL) {\n+\t\t\t\tfprintf(stderr,\t\"Memory error!\\n\");\n+\t\t\t\tgoto out;\n+\t\t\t}\n+\t\t\t(*answers)[*num_answers] = tmp_answers[i];\n+\t\t\t*num_answers += 1;\n+\t\t}\n+\t\tfree(tmp_answers);\n+\t}\n+\n+out:\n+\tif (nodes)\n+\t\tfree(nodes);\n+\tiflow_graph_destroy(g);\n+\treturn ret;\n+}\n+\n+\/* helper for iflow_transitive_flows *\/\n+static int transitive_answer_append(iflow_graph_t *g, iflow_query_t *q, iflow_transitive_t* a,\n+\t\t\t\t int end_node, int path_len, int* path)\n+{\n+\tint i, j, cur_type, cur;\n+\tiflow_path_t *p, *last_path = NULL;\n+\tbool_t found_dup, new_path = FALSE;\n+\n+\tp = (iflow_path_t*)malloc(sizeof(iflow_path_t));\n+\tif (!p) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn -1;\n+\t}\n+\tmemset(p, 0, sizeof(iflow_path_t));\n+\n+\t\/* build the path *\/\n+\tfor (i = 0; i < path_len - 1; i++) {\n+\t\tint edge = -1;\n+\t\t\/* find the edge *\/\n+\t\tif (q->direction == IFLOW_OUT) {\n+\t\t\tfor (j = 0; j < g->nodes[path[i]].num_out_edges; j++) {\n+\t\t\t\tedge = g->nodes[path[i]].out_edges[j];\n+\t\t\t\tif (g->edges[edge].start_node == path[i] &&\n+\t\t\t\t g->edges[edge].end_node == path[i + 1])\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tif (j == g->nodes[path[i]].num_out_edges) {\n+\t\t\t\tfprintf(stderr, \"Did not find an edge\\n\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tfor (j = 0; j < g->nodes[path[i]].num_in_edges; j++) {\n+\t\t\t\tedge = g->nodes[path[i]].in_edges[j];\n+\t\t\t\tif (g->edges[edge].end_node == path[i] &&\n+\t\t\t\t g->edges[edge].start_node == path[i + 1])\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tif (j == g->nodes[path[i]].num_in_edges) {\n+\t\t\t\tfprintf(stderr, \"Did not find an edge\\n\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n+\t\tassert(edge >= 0);\n+\t\tp->num_iflows++;\n+\t\t\/* TODO - we should preallocate this since we know the length ahead of time *\/\n+\t\tp->iflows = (iflow_t*)realloc(p->iflows, sizeof(iflow_t) * p->num_iflows);\n+\t\tif (!p->iflows) {\n+\t\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tif (iflow_init(g, &p->iflows[p->num_iflows - 1])) {\n+\t\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tif (q->direction == IFLOW_OUT) {\n+\t\t\tif (iflow_define_flow(g, &p->iflows[p->num_iflows - 1], IFLOW_OUT,\n+\t\t\t\t\t path[i], edge))\n+\t\t\t\treturn -1;\n+\t\t} else {\n+\t\t\tif (iflow_define_flow(g, &p->iflows[p->num_iflows - 1], IFLOW_IN,\n+\t\t\t\t\t path[i + 1], edge))\n+\t\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n+\t\/* see if we've already seen this type *\/\n+\tcur_type = g->nodes[end_node].type;\n+\tfor (i = 0; i < a->num_end_types; i++) {\n+\t\tif (a->end_types[i] == cur_type) {\n+\t\t\tlast_path = a->paths[i];\n+\t\t\t\/* find the last path while checking for duplicates *\/\n+\t\t\twhile (1) {\n+\t\t\t\tif (last_path->num_iflows == p->num_iflows) {\n+\t\t\t\t\tfound_dup = TRUE;\n+\t\t\t\t\tfor (j = 0; j < last_path->num_iflows; j++) {\n+\t\t\t\t\t\tif (last_path->iflows[j].start_type != p->iflows[j].start_type\n+\t\t\t\t\t\t || last_path->iflows[j].start_type != p->iflows[j].start_type\n+\t\t\t\t\t\t || last_path->iflows[j].direction != p->iflows[j].direction) {\n+\t\t\t\t\t\t\tfound_dup = FALSE;\n+\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t\t\/* found a dup TODO - make certain all of the object class \/ rules are kept *\/\n+\t\t\t\t\tif (found_dup) {\n+\t\t\t\t\t\tiflow_path_destroy(p);\n+\t\t\t\t\t\treturn 0;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (!last_path->next)\n+\t\t\t\t\tbreak;\n+\t\t\t\tlast_path = last_path->next;\n+\t\t\t}\n+\t\t\tnew_path = TRUE;\n+\t\t\ta->num_paths[i]++;\n+\t\t\tlast_path->next = p;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\t\/* this is a new type *\/\n+\tif (!last_path) {\n+\t\tnew_path = TRUE;\n+\t\tcur = a->num_end_types;\n+\t\tif (add_i_to_a(cur_type, &a->num_end_types, &a->end_types))\n+\t\t\treturn -1;\n+\t\ta->paths = (iflow_path_t**)realloc(a->paths, a->num_end_types\n+\t\t\t\t\t\t\t* sizeof(iflow_path_t*));\n+\t\tif (a->paths == NULL) {\n+\t\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\n+\t\ta->num_paths = (int*)realloc(a->num_paths, a->num_end_types\n+\t\t\t\t\t * sizeof(int));\n+\t\tif (a->num_paths == NULL) {\n+\t\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tnew_path = TRUE;\n+\t\ta->paths[cur] = p;\n+\t\ta->num_paths[cur] = 1;\n+\t}\n+\n+\tif (new_path)\n+\t\treturn 1;\n+\treturn 0;\n+}\n+\n+static int breadth_first_find_path(iflow_graph_t *g, int node, int *path)\n+{\n+\tint next_node = node;\n+\tint path_len = g->nodes[node].distance + 1;\n+\tint i = path_len - 1;\n+\t\n+\twhile (i >= 0) {\n+\t\tpath[i] = next_node;\n+\t\tnext_node = g->nodes[next_node].parent;\n+\t\ti--;\n+\t}\n+\n+\treturn path_len;\n+}\n+\n+static int do_breadth_first_search(iflow_graph_t *g, queue_t queue, iflow_query_t *q,\n+\t\t\t\t iflow_transitive_t *a)\n+{\n+\tint i, ret = 0, path_len, *path;\n+\tint num_edges;\n+\tbool_t skip_node;\n+\n+\tpath = (int*)malloc(g->num_nodes * sizeof(int));\n+\tif (!path) {\n+\t\tret = -1;\n+\t\tgoto out;\n+\t}\n+\n+\twhile (queue_head(queue)) {\n+\t\tvoid *cur_ptr;\n+\t\tint cur;\n+\t\tcur_ptr = queue_remove(queue);\n+\t\tif (cur_ptr == NULL) {\n+\t\t\tret = -1;\n+\t\t\tgoto out;\n+\t\t}\n+\t\tcur = ((int)cur_ptr) - 1;\n+\t\t\n+\t\tif (g->nodes[cur].color == IFLOW_COLOR_RED) {\n+\t\t\tskip_node = FALSE;\n+\t\t\tif (q->num_end_types) {\n+\t\t\t\tif (find_int_in_array(g->nodes[cur].type, q->end_types, q->num_end_types) == -1) {\n+\t\t\t\t\tskip_node = TRUE;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (!skip_node) {\n+\t\t\t\tpath_len = breadth_first_find_path(g, cur, path);\n+\t\t\t\tif (path_len == -1) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t\tif (transitive_answer_append(g, q, a, cur, path_len, path) == -1) {\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\t\t\n+\t\tg->nodes[cur].color = IFLOW_COLOR_BLACK;\n+\t\tif (q->direction == IFLOW_OUT)\n+\t\t\tnum_edges = g->nodes[cur].num_out_edges;\n+\t\telse\n+\t\t\tnum_edges = g->nodes[cur].num_in_edges;\n+\t\tfor (i = 0; i < num_edges; i++) {\n+\t\t\tint cur_edge, cur_node;\n+\t\t\tif (q->direction == IFLOW_OUT) {\n+\t\t\t\tcur_edge = g->nodes[cur].out_edges[i];\n+\t\t\t\tcur_node = g->edges[cur_edge].end_node;\n+\t\t\t} else {\n+\t\t\t\tcur_edge = g->nodes[cur].in_edges[i];\n+\t\t\t\tcur_node = g->edges[cur_edge].start_node;\n+\t\t\t}\n+\t\t\tif (g->nodes[cur_node].color == IFLOW_COLOR_WHITE) {\n+\t\t\t\tif (g->nodes[cur_node].distance == -1)\n+\t\t\t\t\tg->nodes[cur_node].color = IFLOW_COLOR_RED;\n+\t\t\t\telse\n+\t\t\t\t\tg->nodes[cur_node].color = IFLOW_COLOR_GREY;\n+\t\t\t\tg->nodes[cur_node].distance = g->nodes[cur].distance + 1;\n+\t\t\t\tg->nodes[cur_node].parent = cur;\n+\t\t\t\tif (queue_insert(queue, (void*)(cur_node + 1)) < 0) {\n+\t\t\t\t\tfprintf(stderr, \"Error inserting into queue\\n\");\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+out:\n+\tif (path)\n+\t\tfree(path);\n+\treturn ret;\n+}\n+\n+iflow_transitive_t *iflow_transitive_flows(policy_t *policy, iflow_query_t *q)\n+{\n+\tqueue_t queue = NULL;\n+\tint num_nodes, *nodes;\n+\tint i, j, start_node;\n+\tiflow_transitive_t *a;\n+\tiflow_graph_t *g;\n+\n+\tif (!iflow_query_is_valid(q, policy))\n+\t\treturn NULL;\n+\t\n+\tif (!((q->direction == IFLOW_OUT ) || (q->direction == IFLOW_IN))) {\n+\t\tfprintf(stderr, \"Direction must be IFLOW_IN or IFLOW_OUT\\n\");\n+\t\treturn NULL;\n+\t}\n+\n+\tg = iflow_graph_create(policy, q);\n+\tif (!g) {\n+\t\tfprintf(stderr, \"Error creating graph\\n\");\n+\t\treturn NULL;\n+\t}\n+\n+\ta = (iflow_transitive_t*)malloc(sizeof(iflow_transitive_t));\n+\tif (a == NULL) {\n+\t\tfprintf(stderr, \"Memory error!\\n\");\n+\t\tgoto err;\n+\t}\n+\tmemset(a, 0, sizeof(iflow_transitive_t));\n+\n+\tqueue = queue_create();\n+\tif (!queue) {\n+\t\tfprintf(stderr, \"Error creating queue\\n\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (iflow_graph_get_nodes_for_type(g, q->start_type, &num_nodes, &nodes) < 0)\n+\t\treturn NULL;\n+\n+\tif (num_nodes == 0) {\n+\t\tgoto out;\n+\t}\n+\n+\t\/* paint all nodes white *\/\n+\tfor (i = 0; i < g->num_nodes; i++) {\n+\t\tg->nodes[i].color = IFLOW_COLOR_WHITE;\n+\t\tg->nodes[i].parent = -1;\n+\t\tg->nodes[i].distance = -1;\n+\t}\n+\n+\tstart_node = nodes[0];\n+\n+\tg->nodes[start_node].color = IFLOW_COLOR_GREY;\n+\tg->nodes[start_node].distance = 0;\n+\tg->nodes[start_node].parent = -1;\n+\n+\tif (queue_insert(queue, (void*)(start_node + 1)) < 0) {\n+\t\tfprintf(stderr, \"Error inserting into queue\\n\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (do_breadth_first_search(g, queue, q, a) < 0)\n+\t\tgoto err;\n+\n+\tfor (i = 1; i < num_nodes; i++) {\n+\n+\t\t\/* paint all nodes white *\/\n+\t\tfor (j = 0; j < g->num_nodes; j++) {\n+\t\t\tg->nodes[j].color = IFLOW_COLOR_WHITE;\n+\t\t\tg->nodes[j].parent = -1;\n+\t\t}\n+\n+\t\tstart_node = nodes[i];\n+\n+\t\tg->nodes[start_node].color = IFLOW_COLOR_GREY;\n+\t\tg->nodes[start_node].distance = 0;\n+\t\tg->nodes[start_node].parent = -1;\n+\n+\t\tif (queue_insert(queue, (void*)(start_node + 1)) < 0) {\n+\t\t\tfprintf(stderr, \"Error inserting into queue\\n\");\n+\t\t\tgoto err;\n+\t\t}\n+\n+\t\tif (do_breadth_first_search(g, queue, q, a) < 0)\n+\t\t\tgoto err;\n+\t}\n+out:\n+\tiflow_graph_destroy(g);\n+\tfree(g);\n+\tif (nodes)\n+\t\tfree(nodes);\n+\tqueue_destroy(queue);\n+\treturn a;\n+err:\n+\tiflow_transitive_destroy(a);\n+\ta = NULL;\n+\tgoto out;\n+}\n+\n+\/* Random shuffle from Knuth Seminumerical Algorithms p. 139 *\/\n+static void shuffle_list(int len, int *list)\n+{\t\n+\tfloat U;\n+\tint j, k, tmp;\n+\n+\tsrand((int)time(NULL));\n+\n+\tfor (j = len - 1; j > 0; j--) {\n+\t\t\/* get a random number between 1 and j *\/\n+\t\tU = rand() \/ (float)RAND_MAX;\n+\t\tk = ((int)(j * U)) + 1;\n+\t\ttmp = list[k];\n+\t\tlist[k] = list[j];\n+\t\tlist[j] = tmp;\n+\t}\n+}\n+\n+static int get_random_edge_list(int edges_len, int **edge_list)\n+{\t\n+\n+\tint i;\n+\n+\t*edge_list = (int*)malloc(sizeof(int) * edges_len);\n+\tif (!*edge_list) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn -1;\n+\t}\n+\tfor (i = 0; i < edges_len; i++)\n+\t\t(*edge_list)[i] = i;\n+\n+\tshuffle_list(edges_len, *edge_list);\n+\n+\treturn 0;\n+}\n+\n+typedef struct bfs_random_state {\n+\tiflow_graph_t *g;\n+\tqueue_t queue;\n+\tiflow_query_t *q;\n+\tpolicy_t *policy;\n+\tiflow_transitive_t *a;\n+\tint *path;\n+\tint num_nodes;\n+\tint *nodes;\n+\tint num_enodes;\n+\tint *enodes;\n+\tint cur;\n+} bfs_random_state_t;\n+\n+void bfs_random_state_destroy(bfs_random_state_t *s)\n+{\n+\tif (s->g) {\n+\t\tiflow_graph_destroy(s->g);\n+\t\tfree(s->g);\n+\t}\n+\n+\tif (s->q)\n+\t\tiflow_query_destroy(s->q);\n+\t\n+\tif (s->queue) {\n+\t\tqueue_destroy(s->queue);\n+\t}\n+\n+\tif (s->path)\n+\t\tfree(s->path);\n+\tif (s->nodes)\n+\t\tfree(s->nodes);\n+\tif (s->enodes)\n+\t\tfree(s->enodes);\n+}\n+\n+int bfs_random_state_init(bfs_random_state_t *s, policy_t *p, iflow_query_t *q, iflow_transitive_t *a)\n+{\n+\tassert(s);\n+\tmemset(s, 0, sizeof(bfs_random_state_t));\n+\ts->policy = p;\n+\ts->a = a;\n+\n+\ts->q = iflow_query_create();\n+\tif (!s->q) {\n+\t\tfprintf(stderr, \"Error creating query\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (iflow_query_copy(s->q, q)) {\n+\t\tfprintf(stderr, \"Error copy query\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (!iflow_query_is_valid(q, p))\n+\t\treturn -1;\n+\n+\tif (q->num_end_types != 1) {\n+\t\tfprintf(stderr, \"You must provide exactly 1 end type\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\n+\ts->g = iflow_graph_create(p, q);\n+\tif (!s->g) {\n+\t\tfprintf(stderr, \"Error creating graph\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\ts->queue = queue_create();\n+\tif (!s->queue) {\n+\t\tfprintf(stderr, \"Error creating queue\\n\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (iflow_graph_get_nodes_for_type(s->g, q->start_type, &s->num_nodes, &s->nodes) < 0)\n+\t\tgoto err;\n+\tif (iflow_graph_get_nodes_for_type(s->g, q->end_types[0], &s->num_enodes, &s->enodes) <0)\n+\t\tgoto err;\n+\n+\ts->path = (int*)malloc(sizeof(int) * s->g->num_nodes);\n+\tif (!s->path) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\tgoto err;\n+\t}\n+\t\t \n+\treturn 0;\n+err:\n+\tbfs_random_state_destroy(s);\n+\treturn -1;\n+}\n+\n+\n+\n+static int do_breadth_first_search_random(bfs_random_state_t *s)\n+{\n+\tint i, ret = 0, path_len, *edge_list = NULL;\n+\tint num_edges, cur;\n+\tvoid *cur_ptr;\n+\tbool_t found_new_path = FALSE;\n+\n+\twhile (queue_head(s->queue)) {\n+\t\n+\t\tcur_ptr = queue_remove(s->queue);\n+\t\tif (cur_ptr == NULL) {\n+\t\t\tret = -1;\n+\t\t\tgoto out;\n+\t\t}\n+\t\tcur = ((int)cur_ptr) - 1;\n+\t\n+\t\tif (find_int_in_array(cur, s->enodes, s->num_enodes) != -1) {\n+\t\t\tpath_len = breadth_first_find_path(s->g, cur, s->path);\n+\t\t\tif (path_len == -1) {\n+\t\t\t\tret = -1;\n+\t\t\t\tgoto out;\n+\t\t\t}\n+\t\t\tret = transitive_answer_append(s->g, s->q, s->a, cur, path_len, s->path);\n+\t\t\tif (ret == -1) {\n+\t\t\t\tfprintf(stderr, \"Error in transitive answer append\\n\");\n+\t\t\t\tgoto out;\n+\t\t\t} else if (ret > 0) {\n+\t\t\t\tfound_new_path = TRUE;\n+\t\t\t}\n+\t\t}\n+\t\t\n+\t\ts->g->nodes[cur].color = IFLOW_COLOR_BLACK;\n+\t\tif (s->q->direction == IFLOW_OUT)\n+\t\t\tnum_edges = s->g->nodes[cur].num_out_edges;\n+\t\telse\n+\t\t\tnum_edges = s->g->nodes[cur].num_in_edges;\n+\t\tif (num_edges) {\n+\t\t\tif (get_random_edge_list(num_edges, &edge_list) < 0) {\n+\t\t\t\tret = -1;\n+\t\t\t\tgoto out;\n+\t\t\t}\n+\t\t}\n+\t\tfor (i = 0; i < num_edges; i++) {\n+\t\t\tint cur_edge, cur_node;\n+\t\t\tif (s->q->direction == IFLOW_OUT) {\n+\t\t\t\tcur_edge = s->g->nodes[cur].out_edges[edge_list[i]];\n+\t\t\t\tcur_node = s->g->edges[cur_edge].end_node;\n+\t\t\t} else {\n+\t\t\t\tcur_edge = s->g->nodes[cur].in_edges[edge_list[i]];\n+\t\t\t\tcur_node = s->g->edges[cur_edge].start_node;\n+\t\t\t}\n+\t\t\tif (s->g->nodes[cur_node].color == IFLOW_COLOR_WHITE) {\n+\t\t\t\ts->g->nodes[cur_node].color = IFLOW_COLOR_GREY;\n+\t\t\t\ts->g->nodes[cur_node].distance = s->g->nodes[cur].distance + 1;\n+\t\t\t\ts->g->nodes[cur_node].parent = cur;\n+\t\t\t\tif (queue_insert(s->queue, (void*)(cur_node + 1)) < 0) {\n+\t\t\t\t\tfprintf(stderr, \"Error inserting into queue\\n\");\n+\t\t\t\t\tret = -1;\n+\t\t\t\t\tgoto out;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\tif (edge_list) {\n+\t\t\tfree(edge_list);\n+\t\t\tedge_list = NULL;\n+\t\t}\n+\t}\n+\n+\tif (found_new_path)\n+\t\tret = 1;\n+out:\n+\tif (edge_list)\n+\t\tfree(edge_list);\n+\treturn ret;\n+}\n+\n+int iflow_find_paths_next(void *state)\n+{\n+\tint j, start_node;\n+\tbfs_random_state_t *s = (bfs_random_state_t*)state;\n+\tint num_paths;\n+\n+\t\/* paint all nodes white *\/\n+\tfor (j = 0; j < s->g->num_nodes; j++) {\n+\t\ts->g->nodes[j].color = IFLOW_COLOR_WHITE;\n+\t\ts->g->nodes[j].parent = -1;\n+\t\ts->g->nodes[j].distance = -1;\n+\t}\n+\n+\tstart_node = s->nodes[s->cur];\n+\t\n+\ts->g->nodes[start_node].color = IFLOW_COLOR_GREY;\n+\ts->g->nodes[start_node].distance = 0;\n+\ts->g->nodes[start_node].parent = -1;\n+\t\n+\tif (queue_insert(s->queue, (void*)(start_node + 1)) < 0) {\n+\t\tfprintf(stderr, \"Error inserting into queue\\n\");\n+\t\treturn -1;\n+\t}\n+\t\n+\tif (do_breadth_first_search_random(s) < 0)\n+\t\treturn -1;\n+\n+\ts->cur++;\n+\tif (s->cur >= s->num_nodes) {\n+\t\ts->cur = 0;\n+\t\tshuffle_list(s->num_nodes, s->nodes);\n+\t}\n+\n+\tif (s->a->num_paths)\n+\t\tnum_paths = s->a->num_paths[0];\n+\telse\n+\t\tnum_paths = 0;\n+\n+\treturn num_paths;\n+}\n+\n+\/* caller does not need to free the query *\/\n+void *iflow_find_paths_start(policy_t *policy, iflow_query_t *q)\n+{\n+\tbfs_random_state_t *s;\n+\tiflow_transitive_t *a;\n+\n+\ts = (bfs_random_state_t*)malloc(sizeof(bfs_random_state_t));\n+\tif (!s) {\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn NULL;\n+\t}\n+\n+\ta = (iflow_transitive_t*)malloc(sizeof(iflow_transitive_t));\n+\tif (!a) {\n+\t\tfree(s);\n+\t\tfprintf(stderr, \"Memory error\\n\");\n+\t\treturn NULL;\n+\t}\n+\tmemset(a, 0, sizeof(iflow_transitive_t));\n+\n+\tif (bfs_random_state_init(s, policy, q, a)) {\n+\t\tfprintf(stderr, \"Random state init error\\n\");\n+\t\tfree(s);\n+\t\tfree(a);\n+\t\treturn NULL;\n+\t}\n+\treturn (void*)s;\n+}\n+\n+iflow_transitive_t *iflow_find_paths_end(void *state)\n+{\n+\tbfs_random_state_t *s = (bfs_random_state_t*)state;\n+\tiflow_transitive_t *a;\n+\n+\ta = s->a;\n+\tbfs_random_state_destroy(s);\n+\tfree(s);\n+\treturn a;\n+}\n+\n+void iflow_find_paths_abort(void *state)\n+{\n+\tbfs_random_state_t *s = (bfs_random_state_t*)state;\n+\n+\tbfs_random_state_destroy(s);\n+\tfree(s);\n+\tiflow_transitive_destroy(s->a);\n+}\n+\n+\/* end information flow analysis \n+*************************************************************************\/\n"} {"commit":"be0dad0cd18f980aacdc6e2e0b7884304a5fb9f7","subject":"fix threading oscillation","message":"fix threading oscillation\n","repos":"ArcEye\/machinekit-testing,bobvanderlinden\/machinekit,kinsamanka\/machinekit,narogon\/linuxcnc,narogon\/linuxcnc,araisrobo\/linuxcnc,unseenlaser\/machinekit,ArcEye\/MK-Qt5,cdsteinkuehler\/MachineKit,bmwiedemann\/linuxcnc-mirror,unseenlaser\/linuxcnc,yishinli\/emc2,EqAfrica\/machinekit,RunningLight\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,EqAfrica\/machinekit,Cid427\/machinekit,cnc-club\/linuxcnc,Cid427\/machinekit,kinsamanka\/machinekit,ianmcmahon\/linuxcnc-mirror,cnc-club\/linuxcnc,Cid427\/machinekit,narogon\/linuxcnc,araisrobo\/machinekit,mhaberler\/machinekit,Cid427\/machinekit,EqAfrica\/machinekit,aschiffler\/linuxcnc,ikcalB\/linuxcnc-mirror,strahlex\/machinekit,unseenlaser\/machinekit,kinsamanka\/machinekit,ikcalB\/linuxcnc-mirror,araisrobo\/machinekit,RunningLight\/machinekit,araisrobo\/machinekit,unseenlaser\/linuxcnc,narogon\/linuxcnc,cdsteinkuehler\/linuxcnc,bobvanderlinden\/machinekit,ArcEye\/MK-Qt5,araisrobo\/linuxcnc,cnc-club\/linuxcnc,ianmcmahon\/linuxcnc-mirror,bobvanderlinden\/machinekit,bmwiedemann\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,yishinli\/emc2,cdsteinkuehler\/MachineKit,cdsteinkuehler\/linuxcnc,ArcEye\/MK-Qt5,kinsamanka\/machinekit,bobvanderlinden\/machinekit,araisrobo\/machinekit,unseenlaser\/machinekit,bmwiedemann\/linuxcnc-mirror,ArcEye\/MK-Qt5,unseenlaser\/machinekit,cdsteinkuehler\/linuxcnc,Cid427\/machinekit,unseenlaser\/linuxcnc,unseenlaser\/machinekit,unseenlaser\/machinekit,RunningLight\/machinekit,mhaberler\/machinekit,ArcEye\/machinekit-testing,bobvanderlinden\/machinekit,EqAfrica\/machinekit,RunningLight\/machinekit,strahlex\/machinekit,araisrobo\/machinekit,araisrobo\/machinekit,ArcEye\/machinekit-testing,jaguarcat79\/ILC-with-LinuxCNC,bmwiedemann\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,ikcalB\/linuxcnc-mirror,araisrobo\/linuxcnc,strahlex\/machinekit,ArcEye\/machinekit-testing,mhaberler\/machinekit,EqAfrica\/machinekit,ArcEye\/MK-Qt5,ikcalB\/linuxcnc-mirror,cdsteinkuehler\/linuxcnc,bobvanderlinden\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,ikcalB\/linuxcnc-mirror,cdsteinkuehler\/MachineKit,araisrobo\/machinekit,mhaberler\/machinekit,mhaberler\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,ArcEye\/MK-Qt5,narogon\/linuxcnc,Cid427\/machinekit,unseenlaser\/machinekit,mhaberler\/machinekit,aschiffler\/linuxcnc,EqAfrica\/machinekit,kinsamanka\/machinekit,RunningLight\/machinekit,cnc-club\/linuxcnc,araisrobo\/linuxcnc,kinsamanka\/machinekit,yishinli\/emc2,mhaberler\/machinekit,aschiffler\/linuxcnc,strahlex\/machinekit,ikcalB\/linuxcnc-mirror,cdsteinkuehler\/linuxcnc,cdsteinkuehler\/linuxcnc,Cid427\/machinekit,strahlex\/machinekit,ArcEye\/machinekit-testing,unseenlaser\/linuxcnc,strahlex\/machinekit,ArcEye\/MK-Qt5,aschiffler\/linuxcnc,yishinli\/emc2,araisrobo\/machinekit,ianmcmahon\/linuxcnc-mirror,jaguarcat79\/ILC-with-LinuxCNC,araisrobo\/machinekit,mhaberler\/machinekit,bmwiedemann\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,cnc-club\/linuxcnc,unseenlaser\/linuxcnc,ikcalB\/linuxcnc-mirror,RunningLight\/machinekit,kinsamanka\/machinekit,EqAfrica\/machinekit,Cid427\/machinekit,RunningLight\/machinekit,bmwiedemann\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,cnc-club\/linuxcnc,cdsteinkuehler\/MachineKit,cdsteinkuehler\/MachineKit,unseenlaser\/machinekit,ArcEye\/machinekit-testing,aschiffler\/linuxcnc,cnc-club\/linuxcnc,bobvanderlinden\/machinekit,RunningLight\/machinekit,cdsteinkuehler\/MachineKit,EqAfrica\/machinekit,strahlex\/machinekit,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,ArcEye\/machinekit-testing,araisrobo\/linuxcnc,kinsamanka\/machinekit,bobvanderlinden\/machinekit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/emc\/kinematics\/tp.c\n+++ src\/emc\/kinematics\/tp.c\n@@ -917,7 +917,6 @@\n pos_error = (revs - spindleoffset) * tc->uu_per_rev - tc->progress;\n if(nexttc) pos_error -= nexttc->progress;\n \n- tc->reqvel = pos_error\/tc->cycle_time;\n if(tc->sync_accel) {\n \/\/ detect when velocities match, and move the target accordingly.\n \/\/ acceleration will abruptly stop and we will be on our new target.\n@@ -925,16 +924,29 @@\n target_vel = spindle_vel * tc->uu_per_rev;\n if(tc->currentvel >= target_vel) {\n \/\/ move target so as to drive pos_error to 0 next cycle\n- spindleoffset = oldrevs - tc->progress\/tc->uu_per_rev;\n+ spindleoffset = revs - tc->progress\/tc->uu_per_rev;\n tc->sync_accel = 0;\n+ tc->reqvel = target_vel;\n+ } else {\n+ \/\/ beginning of move and we are behind: accel as fast as we can\n+ tc->reqvel = tc->maxvel;\n }\n+ } else {\n+ \/\/ we have synced the beginning of the move as best we can -\n+ \/\/ track position (minimize pos_error).\n+ double errorvel;\n+ spindle_vel = (revs - oldrevs) \/ tc->cycle_time;\n+ target_vel = spindle_vel * tc->uu_per_rev;\n+ errorvel = pmSqrt(fabs(pos_error) * tc->maxaccel);\n+ if(pos_error<0) errorvel = -errorvel;\n+ tc->reqvel = target_vel + errorvel;\n }\n tc->feed_override = 1.0;\n }\n if(tc->reqvel < 0.0) tc->reqvel = 0.0;\n if(nexttc) {\n \t if (nexttc->synchronized) {\n-\t\tnexttc->reqvel = pos_error\/nexttc->cycle_time;\n+\t\tnexttc->reqvel = tc->reqvel;\n \t\tnexttc->feed_override = 1.0;\n \t\tif(nexttc->reqvel < 0.0) nexttc->reqvel = 0.0;\n \t } else {\n"} {"commit":"5be4bf5111119f80c1ce0d13a4a07be08f707ccd","subject":"Add basic support for temporarily locked doors","message":"Add basic support for temporarily locked doors\n\nThis will fall apart when:\nThe door does not completely close the path\nThe door overlaps large navmesh polygons ( making large areas off limits )\n\nHowever, this is better than the current situation where bots will keep running into a door that will not open.\n","repos":"DaemonEngine\/Daemon,DaemonEngine\/Daemon,DaemonEngine\/Daemon,DaemonEngine\/Daemon","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/engine\/botlib\/nav.h\n+++ src\/engine\/botlib\/nav.h\n@@ -76,6 +76,7 @@\n \tPOLYFLAGS_POUNCE = 0x10, \/\/Ability to pounce\n \tPOLYFLAGS_WALLWALK = 0x20, \/\/Ability to wallwalk\n \tPOLYFLAGS_LADDER = 0x40, \/\/Ability to climb ladders\n+\tPOLYFLAGS_DISABLED = 0x80,\n \tPOLYFLAGS_ALL = 0xffff \/\/ All abilities.\n };\n #endif\n"} {"commit":"91b114a7870b62764f0a493c520c5fab1d89f6a7","subject":"change map to unordered_map","message":"change map to unordered_map\n","repos":"jacquesqiao\/Paddle,PaddlePaddle\/Paddle,baidu\/Paddle,chengduoZH\/Paddle,luotao1\/Paddle,reyoung\/Paddle,tensor-tang\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,chengduoZH\/Paddle,PaddlePaddle\/Paddle,chengduoZH\/Paddle,baidu\/Paddle,luotao1\/Paddle,reyoung\/Paddle,QiJune\/Paddle,tensor-tang\/Paddle,QiJune\/Paddle,luotao1\/Paddle,tensor-tang\/Paddle,baidu\/Paddle,reyoung\/Paddle,QiJune\/Paddle,baidu\/Paddle,QiJune\/Paddle,jacquesqiao\/Paddle,reyoung\/Paddle,QiJune\/Paddle,chengduoZH\/Paddle,PaddlePaddle\/Paddle,baidu\/Paddle,luotao1\/Paddle,jacquesqiao\/Paddle,reyoung\/Paddle,jacquesqiao\/Paddle,reyoung\/Paddle,jacquesqiao\/Paddle,tensor-tang\/Paddle,tensor-tang\/Paddle,PaddlePaddle\/Paddle,chengduoZH\/Paddle,jacquesqiao\/Paddle,luotao1\/Paddle,PaddlePaddle\/Paddle,QiJune\/Paddle,luotao1\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/fluid\/operators\/split_ids_op.h\n+++ paddle\/fluid\/operators\/split_ids_op.h\n@@ -14,7 +14,7 @@\n \n #pragma once\n \n-#include <map>\n+#include <unordered_map>\n #include <vector>\n #include \"paddle\/fluid\/framework\/op_registry.h\"\n #include \"paddle\/fluid\/operators\/math\/selected_rows_functor.h\"\n@@ -69,7 +69,7 @@\n auto outs = ctx.MultiOutput<framework::SelectedRows>(\"Out\");\n const size_t shard_num = outs.size();\n \/\/ get rows for outputs\n- std::map<int64_t, size_t> id_to_index;\n+ std::unordered_map<int64_t, size_t> id_to_index;\n for (size_t i = 0; i < ids_rows.size(); ++i) {\n id_to_index[ids_rows[i]] = i;\n size_t shard_id = static_cast<size_t>(ids_rows[i]) % shard_num;\n"} {"commit":"4f732c56652c4b5dcd593c01f63be71f7030f931","subject":"qmicli,wds: fix following network status until disconnected","message":"qmicli,wds: fix following network status until disconnected\n\nhttps:\/\/bugs.freedesktop.org\/show_bug.cgi?id=67987\n","repos":"roland-wilhelm\/libqmi,roland-wilhelm\/libqmi,roland-wilhelm\/libqmi,roland-wilhelm\/libqmi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cli\/qmicli-wds.c\n+++ cli\/qmicli-wds.c\n@@ -247,7 +247,6 @@\n g_printerr (\"error: operation failed: %s\\n\",\n error->message);\n g_error_free (error);\n- shutdown (FALSE);\n return;\n }\n \n@@ -255,7 +254,6 @@\n g_printerr (\"error: couldn't get packet service status: %s\\n\", error->message);\n g_error_free (error);\n qmi_message_wds_get_packet_service_status_output_unref (output);\n- shutdown (FALSE);\n return;\n }\n \n@@ -268,7 +266,13 @@\n qmi_device_get_path_display (ctx->device),\n qmi_wds_connection_status_get_string (status));\n qmi_message_wds_get_packet_service_status_output_unref (output);\n- shutdown (TRUE);\n+\n+ \/* If packet service checks detect disconnection, halt --wds-follow-network *\/\n+ if (status != QMI_WDS_CONNECTION_STATUS_CONNECTED) {\n+ g_print (\"[%s] Stopping after detecting disconnection\\n\",\n+ qmi_device_get_path_display (ctx->device));\n+ internal_stop_network (NULL, ctx->packet_data_handle);\n+ }\n }\n \n static gboolean\n"} {"commit":"b1fa387022f6a96c21ea83e0eb9f66d6761f1053","subject":"Add a 'status' command to appstream-util","message":"Add a 'status' command to appstream-util\n\nThis allows us to build a HTML status page to quickly view all the data.\n","repos":"ikeydoherty\/appstream-glib,hughsie\/appstream-glib,ximion\/appstream-glib,kalev\/appstream-glib,kalev\/appstream-glib,hughsie\/appstream-glib,ximion\/appstream-glib,ximion\/appstream-glib,superm1\/appstream-glib,ikeydoherty\/appstream-glib,mitya57\/appstream-glib,superm1\/appstream-glib,hughsie\/appstream-glib,mitya57\/appstream-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- client\/as-util.c\n+++ client\/as-util.c\n@@ -616,6 +616,325 @@\n \tg_free (path_xml);\n \tif (file_xml != NULL)\n \t\tg_object_unref (file_xml);\n+\treturn ret;\n+}\n+\n+\/**\n+ * as_util_status_join:\n+ *\/\n+static gchar *\n+as_util_status_join (GPtrArray *array)\n+{\n+\tconst gchar *tmp;\n+\tguint i;\n+\tGString *txt;\n+\n+\tif (array == NULL)\n+\t\treturn NULL;\n+\tif (array->len == 0)\n+\t\treturn NULL;\n+\n+\ttxt = g_string_new (\"\");\n+\tfor (i = 0; i < array->len; i++) {\n+\t\ttmp = g_ptr_array_index (array, i);\n+\t\tif (txt->len > 0)\n+\t\t\tg_string_append (txt, \", \");\n+\t\tg_string_append (txt, tmp);\n+\t}\n+\treturn g_string_free (txt, FALSE);\n+}\n+\n+\/**\n+ * as_util_status_write_app:\n+ *\/\n+static void\n+as_util_status_write_app (AsApp *app, GString *html)\n+{\n+\tGPtrArray *images;\n+\tGPtrArray *screenshots;\n+\tAsImage *im;\n+\tAsScreenshot *ss;\n+\tconst gchar *pkgname;\n+\tgchar *tmp;\n+\tguint i;\n+\tguint j;\n+\tconst gchar *kudos[] = {\n+\t\t\"X-Kudo-SearchProvider\",\n+\t\t\"X-Kudo-InstallsUserDocs\",\n+\t\t\"X-Kudo-UsesAppMenu\",\n+\t\t\"X-Kudo-GTK3\",\n+\t\t\"X-Kudo-RecentRelease\",\n+\t\t\"X-Kudo-UsesNotifications\",\n+\t\tNULL };\n+\n+\tg_string_append_printf (html, \"<a name=\\\"%s\\\"\/><h2>%s<\/h2>\\n\",\n+\t\t\t\tas_app_get_id (app), as_app_get_id (app));\n+\n+\t\/* print the screenshot thumbnails *\/\n+\tscreenshots = as_app_get_screenshots (app);\n+\tfor (i = 0; i < screenshots->len; i++) {\n+\t\tss = g_ptr_array_index (screenshots, i);\n+\t\timages = as_screenshot_get_images (ss);\n+\t\tfor (j = 0; j < images->len; j++) {\n+\t\t\tim = g_ptr_array_index (images, j);\n+\t\t\tif (as_image_get_width (im) != 624)\n+\t\t\t\tcontinue;\n+\t\t\tif (as_screenshot_get_caption (ss, \"C\") != NULL) {\n+\t\t\t\tg_string_append_printf (html, \"<a href=\\\"%s\\\">\"\n+\t\t\t\t\t\t\t\"<img src=\\\"%s\\\" alt=\\\"%s\\\"\/><\/a>\\n\",\n+\t\t\t\t\t\t\tas_image_get_url (im),\n+\t\t\t\t\t\t\tas_image_get_url (im),\n+\t\t\t\t\t\t\tas_screenshot_get_caption (ss, \"C\"));\n+\t\t\t} else {\n+\t\t\t\tg_string_append_printf (html, \"<a href=\\\"%s\\\">\"\n+\t\t\t\t\t\t\t\"<img src=\\\"%s\\\"\/><\/a>\\n\",\n+\t\t\t\t\t\t\tas_image_get_url (im),\n+\t\t\t\t\t\t\tas_image_get_url (im));\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tg_string_append (html, \"<table>\\n\");\n+\n+\t\/* summary *\/\n+\tg_string_append_printf (html, \"<tr><td>%s<\/td><td><code>%s<\/code><\/td><\/tr>\\n\",\n+\t\t\t\t\"Type\", as_id_kind_to_string (as_app_get_id_kind (app)));\n+\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\"Name\", as_app_get_name (app, \"C\"));\n+\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\"Comment\", as_app_get_comment (app, \"C\"));\n+\tif (as_app_get_description (app, \"C\") != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\"Description\", as_app_get_description (app, \"C\"));\n+\t}\n+\n+\t\/* packages *\/\n+\ttmp = as_util_status_join (as_app_get_pkgnames (app));\n+\tif (tmp != NULL) {\n+\t\tpkgname = g_ptr_array_index (as_app_get_pkgnames(app), 0);\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>\"\n+\t\t\t\t\t\"<a href=\\\"https:\/\/apps.fedoraproject.org\/packages\/%s\\\">\"\n+\t\t\t\t\t\"<code>%s<\/code><\/a><\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Package\", pkgname, tmp);\n+\t}\n+\tg_free (tmp);\n+\n+\t\/* categories *\/\n+\ttmp = as_util_status_join (as_app_get_categories (app));\n+\tif (tmp != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Categories\", tmp);\n+\t}\n+\tg_free (tmp);\n+\n+\t\/* keywords *\/\n+\ttmp = as_util_status_join (as_app_get_keywords (app));\n+\tif (tmp != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Keywords\", tmp);\n+\t}\n+\tg_free (tmp);\n+\n+\t\/* homepage *\/\n+\tpkgname = as_app_get_url_item (app, AS_URL_KIND_HOMEPAGE);\n+\tif (pkgname != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td><a href=\\\"%s\\\">\"\n+\t\t\t\t\t\"%s<\/a><\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Homepage\", pkgname, pkgname);\n+\t}\n+\n+\t\/* project *\/\n+\tif (as_app_get_project_group (app) != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Project\", as_app_get_project_group (app));\n+\t}\n+\n+\t\/* desktops *\/\n+\ttmp = as_util_status_join (as_app_get_compulsory_for_desktops (app));\n+\tif (tmp != NULL) {\n+\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\t\"Compulsory for\", tmp);\n+\t}\n+\tg_free (tmp);\n+\n+\t\/* add all possible Kudo's for desktop files *\/\n+\tif (as_app_get_id_kind (app) == AS_ID_KIND_DESKTOP) {\n+\t\tfor (i = 0; kudos[i] != NULL; i++) {\n+\t\t\tpkgname = as_app_get_metadata_item (app, kudos[i]) ?\n+\t\t\t\t\t\"Yes\" : \"No\";\n+\t\t\tg_string_append_printf (html, \"<tr><td>%s<\/td><td>%s<\/td><\/tr>\\n\",\n+\t\t\t\t\t\tkudos[i], pkgname);\n+\t\t}\n+\t}\n+\n+\tg_string_append (html, \"<\/table>\\n\");\n+\tg_string_append (html, \"<hr\/>\\n\");\n+}\n+\n+\/**\n+ * as_util_status_write_exec_summary:\n+ *\/\n+static void\n+as_util_status_write_exec_summary (GPtrArray *apps, GString *html)\n+{\n+\tAsApp *app;\n+\tconst gchar *project_groups[] = { \"GNOME\", \"KDE\", \"XFCE\", NULL };\n+\tguint cnt;\n+\tguint i;\n+\tguint j;\n+\tguint perc;\n+\tguint total;\n+\n+\tg_string_append (html, \"<h1>Executive summary<\/h1>\\n\");\n+\tg_string_append (html, \"<ul>\\n\");\n+\n+\t\/* long descriptions *\/\n+\tcnt = 0;\n+\tfor (i = 0; i < apps->len; i++) {\n+\t\tapp = g_ptr_array_index (apps, i);\n+\t\tif (as_app_get_description (app, \"C\") != NULL)\n+\t\t\tcnt++;\n+\t}\n+\tperc = 100 * cnt \/ apps->len;\n+\tg_string_append_printf (html, \"<li>Applications in Fedora with \"\n+\t\t\t\t\"long descriptions: %i (%i%%)<\/li>\\n\", cnt, perc);\n+\n+\t\/* keywords *\/\n+\tcnt = 0;\n+\tfor (i = 0; i < apps->len; i++) {\n+\t\tapp = g_ptr_array_index (apps, i);\n+\t\tif (as_app_get_keywords(app)->len > 0)\n+\t\t\tcnt++;\n+\t}\n+\tperc = 100 * cnt \/ apps->len;\n+\tg_string_append_printf (html, \"<li>Applications in Fedora with \"\n+\t\t\t\t\"keywords: %i (%i%%)<\/li>\\n\", cnt, perc);\n+\n+\t\/* categories *\/\n+\tcnt = 0;\n+\tfor (i = 0; i < apps->len; i++) {\n+\t\tapp = g_ptr_array_index (apps, i);\n+\t\tif (as_app_get_categories(app)->len > 0)\n+\t\t\tcnt++;\n+\t}\n+\tperc = 100 * cnt \/ apps->len;\n+\tg_string_append_printf (html, \"<li>Applications in Fedora with \"\n+\t\t\t\t\"categories: %i (%i%%)<\/li>\\n\", cnt, perc);\n+\n+\t\/* screenshots *\/\n+\tcnt = 0;\n+\tfor (i = 0; i < apps->len; i++) {\n+\t\tapp = g_ptr_array_index (apps, i);\n+\t\tif (as_app_get_screenshots(app)->len > 0)\n+\t\t\tcnt++;\n+\t}\n+\tperc = 100 * cnt \/ apps->len;\n+\tg_string_append_printf (html, \"<li>Applications in Fedora with \"\n+\t\t\t\t\"screenshots: %i (%i%%)<\/li>\\n\", cnt, perc);\n+\n+\t\/* project apps with appdata *\/\n+\tfor (j = 0; project_groups[j] != NULL; j++) {\n+\t\tcnt = 0;\n+\t\ttotal = 0;\n+\t\tfor (i = 0; i < apps->len; i++) {\n+\t\t\tapp = g_ptr_array_index (apps, i);\n+\t\t\tif (g_strcmp0 (as_app_get_project_group (app),\n+\t\t\t\t project_groups[j]) != 0)\n+\t\t\t\tcontinue;\n+\t\t\ttotal += 1;\n+\t\t\tif (as_app_get_screenshots(app)->len > 0 ||\n+\t\t\t as_app_get_description (app, \"C\") != NULL)\n+\t\t\t\tcnt++;\n+\t\t}\n+\t\tperc = 0;\n+\t\tif (total > 0)\n+\t\t\tperc = 100 * cnt \/ total;\n+\t\tg_string_append_printf (html, \"<li>Applications in %s \"\n+\t\t\t\t\t\"with AppData: %i (%i%%)<\/li>\\n\",\n+\t\t\t\t\tproject_groups[j], cnt, perc);\n+\t}\n+\tg_string_append (html, \"<\/ul>\\n\");\n+}\n+\n+\/**\n+ * as_util_status:\n+ **\/\n+static gboolean\n+as_util_status (AsUtilPrivate *priv, gchar **values, GError **error)\n+{\n+\tAsApp *app;\n+\tAsStore *store = NULL;\n+\tGFile *file = NULL;\n+\tGPtrArray *apps = NULL;\n+\tGString *html = NULL;\n+\tgboolean ret = TRUE;\n+\tguint i;\n+\n+\t\/* check args *\/\n+\tif (g_strv_length (values) != 1) {\n+\t\tret = FALSE;\n+\t\tg_set_error_literal (error,\n+\t\t\t\t AS_ERROR,\n+\t\t\t\t AS_ERROR_INVALID_ARGUMENTS,\n+\t\t\t\t \"Not enough arguments, \"\n+\t\t\t\t \"expected filename.xml.gz\");\n+\t\tgoto out;\n+\t}\n+\n+\t\/* load file *\/\n+\tstore = as_store_new ();\n+\tfile = g_file_new_for_path (values[0]);\n+\tret = as_store_from_file (store, file, NULL, NULL, error);\n+\tif (!ret)\n+\t\tgoto out;\n+\tapps = as_store_get_apps (store);\n+\n+\t\/* create header *\/\n+\thtml = g_string_new (\"\");\n+\tg_string_append (html, \"<!DOCTYPE html PUBLIC \\\"-\/\/W3C\/\/DTD XHTML 1.0 \"\n+\t\t\t \"Transitional\/\/EN\\\" \"\n+\t\t\t \"\\\"http:\/\/www.w3.org\/TR\/xhtml1\/DTD\/xhtml1-transitional.dtd\\\">\\n\");\n+\tg_string_append (html, \"<html xmlns=\\\"http:\/\/www.w3.org\/1999\/xhtml\\\">\\n\");\n+\tg_string_append (html, \"<head>\\n\");\n+\tg_string_append (html, \"<meta http-equiv=\\\"Content-Type\\\" content=\\\"text\/html; \"\n+\t\t\t \"charset=UTF-8\\\" \/>\\n\");\n+\tg_string_append (html, \"<title>Application Data Review<\/title>\\n\");\n+\tg_string_append (html, \"<\/head>\\n\");\n+\tg_string_append (html, \"<body>\\n\");\n+\n+\t\/* summary section *\/\n+\tif (apps->len > 0)\n+\t\tas_util_status_write_exec_summary (apps, html);\n+\n+\t\/* write applications *\/\n+\tg_string_append (html, \"<h1>Applications<\/h1>\\n\");\n+\tfor (i = 0; i < apps->len; i++) {\n+\t\tapp = g_ptr_array_index (apps, i);\n+\t\tif (as_app_get_id_kind (app) == AS_ID_KIND_FONT)\n+\t\t\tcontinue;\n+\t\tif (as_app_get_id_kind (app) == AS_ID_KIND_INPUT_METHOD)\n+\t\t\tcontinue;\n+\t\tif (as_app_get_id_kind (app) == AS_ID_KIND_CODEC)\n+\t\t\tcontinue;\n+\t\tif (as_app_get_id_kind (app) == AS_ID_KIND_SOURCE)\n+\t\t\tcontinue;\n+\t\tas_util_status_write_app (app, html);\n+\t}\n+\n+\tg_string_append (html, \"<\/body>\\n\");\n+\tg_string_append (html, \"<\/html>\\n\");\n+\n+\t\/* save file *\/\n+\tret = g_file_set_contents (\".\/status.html\", html->str, -1, error);\n+\tif (!ret)\n+\t\tgoto out;\n+out:\n+\tif (html != NULL)\n+\t\tg_string_free (html, TRUE);\n+\tif (store != NULL)\n+\t\tg_object_unref (store);\n+\tif (file != NULL)\n+\t\tg_object_unref (file);\n \treturn ret;\n }\n \n@@ -682,6 +1001,12 @@\n \t\t \/* TRANSLATORS: command description *\/\n \t\t _(\"Uninstalls AppStream metadata\"),\n \t\t as_util_uninstall);\n+\tas_util_add (priv->cmd_array,\n+\t\t \"status\",\n+\t\t NULL,\n+\t\t \/* TRANSLATORS: command description *\/\n+\t\t _(\"Create an HTML status page\"),\n+\t\t as_util_status);\n \n \t\/* sort by command name *\/\n \tg_ptr_array_sort (priv->cmd_array,\n"} {"commit":"1cc9640d6d607e464d1fb74e4d440cfb61213347","subject":"minor bugs","message":"minor bugs\n","repos":"seanpringle\/goomwwm,seanpringle\/goomwwm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- goomwwm.c\n+++ goomwwm.c\n@@ -1080,8 +1080,8 @@\n \t\t\t\tfor (j = inplay->len-1; j > i; j--)\n \t\t\t\t{\n \t\t\t\t\t\/\/ if the window intersects with any other window higher in the stack order, it must be at least partially obscured\n-\t\t\t\t\tif (allregions[i].w && INTERSECT(o->sx, o->sy, o->sw, o->sh,\n-\t\t\t\t\t\tallregions[i].x, allregions[i].y, allregions[i].w, allregions[i].h))\n+\t\t\t\t\tif (allregions[j].w && INTERSECT(o->sx, o->sy, o->sw, o->sh,\n+\t\t\t\t\t\tallregions[j].x, allregions[j].y, allregions[j].w, allregions[j].h))\n \t\t\t\t\t\t\t{ obscured = 1; break; }\n \t\t\t\t}\n \t\t\t\t\/\/ record a full visible window\n@@ -1089,6 +1089,8 @@\n \t\t\t\t{\n \t\t\t\t\tregions[relevant].x = o->sx; regions[relevant].y = o->sy;\n \t\t\t\t\tregions[relevant].w = o->sw; regions[relevant].h = o->sh;\n+\t\t\t\t\tclient_descriptive_data(o);\n+\t\t\t\t\tevent_note(\"%s\", o->title);\n \t\t\t\t\trelevant++;\n \t\t\t\t}\n \t\t\t\tallregions[i].x = o->sx; allregions[i].y = o->sy;\n@@ -1991,6 +1993,8 @@\n \t\t\tint wx = x + w\/2; int wy = y + h\/2;\n \t\t\tint cx = (screen_width - w) \/ 2;\n \t\t\tint cy = (screen_height - h) \/ 2;\n+\t\t\t\/\/ expire the toggle cache\n+\t\t\tc->cache->have_old = 0;\n \n \t\t\t\/\/ monitor switching if window is on an edge\n \t\t\tif (key == keymap[KEY_LEFT] && c->is_left)\n@@ -2190,7 +2194,11 @@\n {\n \tevent_log(\"ConfigureNotify\", ev->xconfigure.window);\n \tclient *c = window_client(ev->xconfigure.window);\n-\tif (c && c->manage) client_review_border(c);\n+\tif (c && c->manage)\n+\t{\n+\t\tclient_review_border(c);\n+\t\tclient_review_position(c);\n+\t}\n }\n \n \/\/ map requests are when we get nasty about co-ords and size\n"} {"commit":"b0d801ce297144af78eabf74de8e159bd559fcb6","subject":"Forgot to add VirtualMachine.h","message":"Forgot to add VirtualMachine.h\n","repos":"DaemonEngine\/Daemon,DaemonEngine\/Daemon,DaemonEngine\/Daemon,DaemonEngine\/Daemon","returncode":1,"stderr":"error: pathspec 'src\/engine\/framework\/VirtualMachine.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- src\/engine\/framework\/VirtualMachine.h\n+++ src\/engine\/framework\/VirtualMachine.h\n@@ -0,0 +1,84 @@\n+\/*\n+===========================================================================\n+\n+Daemon GPL Source Code\n+Copyright (C) 1999-2010 id Software LLC, a ZeniMax Media company.\n+\n+This file is part of the Daemon GPL Source Code (Daemon Source Code).\n+\n+Daemon Source Code is free software: you can redistribute it and\/or modify\n+it under the terms of the GNU General Public License as published by\n+the Free Software Foundation, either version 3 of the License, or\n+(at your option) any later version.\n+\n+Daemon Source Code is distributed in the hope that it will be useful,\n+but WITHOUT ANY WARRANTY; without even the implied warranty of\n+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+GNU General Public License for more details.\n+\n+You should have received a copy of the GNU General Public License\n+along with Daemon Source Code. If not, see <http:\/\/www.gnu.org\/licenses\/>.\n+\n+In addition, the Daemon Source Code is also subject to certain additional terms.\n+You should have received a copy of these additional terms immediately following the\n+terms and conditions of the GNU General Public License which accompanied the Daemon\n+Source Code. If not, please request a copy in writing from id Software at the address\n+below.\n+\n+If you have questions concerning this license or the applicable additional terms, you\n+may contact in writing id Software LLC, c\/o ZeniMax Media Inc., Suite 120, Rockville,\n+Maryland 20850 USA.\n+\n+===========================================================================\n+*\/\n+\n+#ifndef VIRTUALMACHINE_H_\n+#define VIRTUALMACHINE_H_\n+\n+#ifndef QVM_COMPAT\n+\n+#include \"..\/..\/libs\/nacl\/nacl.h\"\n+#include \"..\/..\/shared\/RPC.h\"\n+\n+namespace VM {\n+\n+enum Type {\n+ TYPE_NATIVE,\n+ TYPE_NACL\n+};\n+\n+\/\/ Base class for a virtual machine instance\n+class VMBase {\n+public:\n+ \/\/ Create the VM for the named module. Returns the ABI version reported\n+ \/\/ by the module.\n+ int Create(const char* name, Type type);\n+\n+ \/\/ Free the VM\n+ void Free()\n+ {\n+ module.Close();\n+ }\n+\n+ \/\/ Check if the VM is active\n+ bool IsActive() const\n+ {\n+ return bool(module);\n+ }\n+\n+protected:\n+ \/\/ Perform an RPC call with the given inputs, returns results in output\n+ RPC::Reader DoRPC(RPC::Writer& input, bool ignoreErrors = false);\n+\n+ \/\/ System call handler\n+ virtual void Syscall(int index, RPC::Reader& input, RPC::Writer& output) = 0;\n+\n+private:\n+ NaCl::Module module;\n+};\n+\n+} \/\/ namespace VM\n+\n+#endif \/\/ QVM_COMPAT\n+\n+#endif \/\/ VIRTUALMACHINE_H_\n"} {"commit":"104babb1e8d9b70b27fe4a3b9924d42984cb647f","subject":"modified createBanner iOS Api for Unity Plugin","message":"modified createBanner iOS Api for Unity Plugin\n","repos":"vineetsri23\/sdk-extensions,InMobi\/sdk-extensions,InMobi\/sdk-extensions,InMobi\/sdk-extensions,vineetsri23\/sdk-extensions,vineetsri23\/sdk-extensions,InMobi\/sdk-extensions,InMobi\/sdk-extensions,InMobi\/sdk-extensions,InMobi\/sdk-partners-code,vineetsri23\/sdk-extensions,vineetsri23\/sdk-extensions,vineetsri23\/sdk-extensions","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- partner-adapter-codes\/unity\/unity-sampleapp\/UnityInMobiPluginProject\/Assets\/Plugins\/iOS\/InMobiBanner.h\n+++ partner-adapter-codes\/unity\/unity-sampleapp\/UnityInMobiPluginProject\/Assets\/Plugins\/iOS\/InMobiBanner.h\n@@ -26,8 +26,8 @@\n \n -(id)initBannerAd:(InMobiBannerClientRef*) bannerClient\n placementId:(NSString*) placementId\n- width:(CGFloat) width\n- height:(CGFloat) height\n+ width:(int) width\n+ height:(int) height\n position:(int) position;\n \n \/\/\/\/ A reference to the Unity banner client.\n"} {"commit":"88b41e2a1f5a1c6ca8c525c652450b46dc4ca474","subject":"More stuff for the windows side","message":"More stuff for the windows side\n\n\ngit-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@1327 3c1deb5b-d424-0410-962d-aba41a686d42\n","repos":"hsorby\/zinc,hsorby\/zinc,hsorby\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc,hsorby\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- photoface_interface\/photoface_cmiss.c\n+++ photoface_interface\/photoface_cmiss.c\n@@ -2800,7 +2800,7 @@\n \t\t\t\t\t\t\t\t{\n \t\t\t\t\t\t\t\t\tfor (j = 0 ; j < number_of_markers ; j++)\n \t\t\t\t\t\t\t\t\t{\n-\t\t\t\t\t\t\t\t\t\tif (marker_indices[j] = -i)\n+\t\t\t\t\t\t\t\t\t\tif (marker_indices[j] == -i)\n \t\t\t\t\t\t\t\t\t\t{\n \t\t\t\t\t\t\t\t\t\t\tmarker_fitted_3d_positions[3 * j] = marker_x;\n \t\t\t\t\t\t\t\t\t\t\tmarker_fitted_3d_positions[3 * j + 1] = marker_y;\n@@ -3420,7 +3420,7 @@\n #if defined (BACKWARD_PROJECTION)\n \t\t\/* This is the original precise texture calculation *\/\n \t\tfprintf(texture_comfile, \"gfx modify texture face_mapped width 1 height 1 evaluate_image field mapped_texture spectrum rgba_spectrum width $width height $height texture_coord texture element_group objface format rgba\\n\");\n-\t\tfprintf(texture_comfile, \"gfx write texture face_mapped file %s\/standin.rgb rgb\\n\",\n+\t\tfprintf(texture_comfile, \"gfx write texture face_mapped file %s\/standinA.rgb rgb\\n\",\n \t\t\tpf_job->remote_working_path);\n #else \/* defined (BACKWARD_PROJECTION) *\/\n \t\t\/* This is the projection just involving drawing the image in texture space which is \n@@ -3448,13 +3448,13 @@\n \t\tfprintf(texture_comfile, \"gfx modify window texture_projection layout 2d ortho_axes z -y width $width height $height\\n\");\n \t\tfprintf(texture_comfile, \"gfx modify window texture_projection image scene texture_projection\\n\");\n \t\tfprintf(texture_comfile, \"gfx modify window texture_projection view parallel eye_point 0.5 0.5 3 interest_point 0.5 0.5 0 up_vector 0.0 1.0 0.0 view_angle 26.525435202 near_clipping_plane 0.0288485 far_clipping_plane 10.3095 relative_viewport ndc_placement -1 -1 2 2 viewport_coordinates -1 -1 400 400\\n\");\n-\t\tfprintf(texture_comfile, \"gfx print window texture_projection rgb file %s\/standin.rgb width $width height $height\\n\",\n-\t\t\tpf_job->remote_working_path);\n-\t\tfprintf(texture_comfile, \"gfx modify texture face_mapped image %s\/standinA.rgb\\n\",\n+\t\tfprintf(texture_comfile, \"gfx print window texture_projection rgb file %s\/standinA.rgb width $width height $height\\n\",\n \t\t\tpf_job->remote_working_path);\n #endif \/* defined (BACKWARD_PROJECTION) *\/\n \t\tfprintf(texture_comfile, \"open comfile %scmiss\/pf_make_standin_texture.com exec\\n\",\n \t\t\tphotoface_remote_path);\n+\t\tfprintf(texture_comfile, \"gfx modify texture face_mapped image %s\/standin.rgb\\n\",\n+\t\t\tpf_job->remote_working_path);\n \t\tfprintf(texture_comfile, \"gfx modify material skin texture face_mapped\\n\");\n \t\tfprintf(texture_comfile, \"gfx modify g_element objface surfaces select_on material skin texture_coord texture\\n\");\n \t\tfprintf(texture_comfile, \"gfx mod win 1 back texture none\\n\");\n"} {"commit":"a360580b002baccad44d77ecf04606e721eee352","subject":" Fix sig_catch() interface","message":" Fix sig_catch() interface\n\nSigned-off-by: Laurent Bercot <3aa9adbbb49a4d5ab9c798d5e366f54570870800@appnovation.com>\n","repos":"skarnet\/execline,skarnet\/execline","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/execline\/forstdin.c\n+++ src\/execline\/forstdin.c\n@@ -92,7 +92,7 @@\n \n if (pids.s)\n {\n- if (sig_catch(SIGCHLD, ¶llel_sigchld_handler) < 0)\n+ if (!sig_catch(SIGCHLD, ¶llel_sigchld_handler))\n strerr_diefu1sys(111, \"install SIGCHLD handler\") ;\n }\n for (;;)\n"} {"commit":"de99993a301e895273084d3df45cdf54d2f2ef91","subject":"[mips] Fix a memory leak bug report by NAKAMURA Takumi.","message":"[mips] Fix a memory leak bug report by NAKAMURA Takumi.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@170012 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Target\/Mips\/MipsTargetMachine.h\n+++ lib\/Target\/Mips\/MipsTargetMachine.h\n@@ -20,6 +20,7 @@\n #include \"MipsJITInfo.h\"\n #include \"MipsSelectionDAGInfo.h\"\n #include \"MipsSubtarget.h\"\n+#include \"llvm\/ADT\/OwningPtr.h\"\n #include \"llvm\/DataLayout.h\"\n #include \"llvm\/Target\/TargetFrameLowering.h\"\n #include \"llvm\/Target\/TargetMachine.h\"\n@@ -32,8 +33,8 @@\n class MipsTargetMachine : public LLVMTargetMachine {\n MipsSubtarget Subtarget;\n const DataLayout DL; \/\/ Calculates type size & alignment\n- const MipsInstrInfo *InstrInfo;\n- const MipsFrameLowering *FrameLowering;\n+ OwningPtr<const MipsInstrInfo> InstrInfo;\n+ OwningPtr<const MipsFrameLowering> FrameLowering;\n MipsTargetLowering TLInfo;\n MipsSelectionDAGInfo TSInfo;\n MipsJITInfo JITInfo;\n@@ -47,12 +48,12 @@\n CodeGenOpt::Level OL,\n bool isLittle);\n \n- virtual ~MipsTargetMachine() { delete InstrInfo; }\n+ virtual ~MipsTargetMachine() {}\n \n virtual const MipsInstrInfo *getInstrInfo() const\n- { return InstrInfo; }\n+ { return InstrInfo.get(); }\n virtual const TargetFrameLowering *getFrameLowering() const\n- { return FrameLowering; }\n+ { return FrameLowering.get(); }\n virtual const MipsSubtarget *getSubtargetImpl() const\n { return &Subtarget; }\n virtual const DataLayout *getDataLayout() const\n"} {"commit":"2ca1b256383d3500a4571485b8e1a86a824000d0","subject":"Undoing change. I am dumb, this doesn't help","message":"Undoing change. I am dumb, this doesn't help\n","repos":"samuelhavron\/obliv-c,samuelhavron\/obliv-c,samuelhavron\/obliv-c,samuelhavron\/obliv-c","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/ext\/oblivc\/dualex.c\n+++ src\/ext\/oblivc\/dualex.c\n@@ -120,7 +120,6 @@\n \n #define HASH_ALGO GCRY_MD_SHA256\n #define HASH_LEN 32\n-#include<obliv_psi.h>\n \n bool dualexEqualityCheck(ProtocolDesc* pd,gcry_md_hd_t h1,gcry_md_hd_t h2)\n {\n@@ -128,10 +127,9 @@\n gcry_md_open(&h,HASH_ALGO,0);\n gcry_md_write(h,gcry_md_read(h1,0),HASH_LEN);\n gcry_md_write(h,gcry_md_read(h2,0),HASH_LEN);\n- char *hash = (char*)gcry_md_read(h,0);\n- OcPsiResult* psi = execPsiProtocol_DH(pd,&hash,1,1,HASH_LEN);\n- bool res = psi->n;\n- ocPsiResultRelease(psi);\n+ BCipherRandomGen* gen = newBCipherRandomGen();\n+ bool res = ocEqualityCheck(pd,gen,gcry_md_read(h,0),HASH_LEN,3-pd->thisParty);\n+ releaseBCipherRandomGen(gen); char *hash = (char*)gcry_md_read(h,0);\n gcry_md_close(h);\n return res;\n }\n"} {"commit":"ce333f1a6481668e512db9fe844be5b45be05f25","subject":"fixed potential crash in ffmpeg bindings","message":"fixed potential crash in ffmpeg bindings\n","repos":"rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/filters\/ff_common.c\n+++ src\/filters\/ff_common.c\n@@ -1078,7 +1078,7 @@\n \n \t\tidx=0;\n \t\ti=0;\n-\t\twhile (av_class) {\n+\t\twhile (av_class && av_class->option) {\n \t\t\topt = &av_class->option[idx];\n \t\t\tif (!opt || !opt->name) break;\n \t\t\tif (!flags || (opt->flags & flags) ) {\n"} {"commit":"041e9e9b816a22dc0c3e1b3883b8fd50af206c5f","subject":"\u91cd\u5199\u89e3\u5305\u903b\u8f91","message":"\u91cd\u5199\u89e3\u5305\u903b\u8f91\n","repos":"imaben\/gstruct","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gstruct.c\n+++ gstruct.c\n@@ -168,57 +168,50 @@\n return 0;\n }\n \n-inline char *gstruct_parse_scalar(char *buffer)\n-{\n- return buffer + sizeof(gstruct);\n-}\n-\n-inline char *gstruct_parse_str(gstruct *gs, char *buffer)\n-{\n- char *cursor;\n- gstruct_str *s = (gstruct_str *)(buffer);\n- gs->via.str.size = s->size;\n-\n- cursor += sizeof(gstruct_str);\n- gs->via.str.ptr = cursor;\n- return cursor + s->size;\n-}\n-\n-inline char *gstruct_parse_array(char *buffer)\n-{\n+static inline int gstruct_parse(gstruct *gs, char *buffer, char **offset)\n+{\n+ gstruct *g = (gstruct *)buffer;\n+ gs->type = g->type;\n+ char *cursor = buffer + sizeof(gstruct);\n int i = 0;\n- gstruct_array *arr = (gstruct_array *)buffer;\n- char *cursor = buffer;\n- for (; i < arr->size; i++) {\n- cursor += sizeof(gstruct_array);\n- gstruct *g = (gstruct *)cursor;\n- switch (arr->ptr[i].type) {\n- case GSTRUCT_TYPE_NIL:\n- case GSTRUCT_TYPE_BOOLEAN:\n- case GSTRUCT_TYPE_INTEGER:\n- case GSTRUCT_TYPE_CHAR:\n- case GSTRUCT_TYPE_DOUBLE:\n- arr->ptr = (gstruct *)gstruct_parse_scalar(cursor);\n- break;\n- case GSTRUCT_TYPE_STR:\n- arr->ptr = (gstruct *)gstruct_parse_str(g, cursor);\n- break;\n- case GSTRUCT_TYPE_ARRAY:\n- arr->ptr = (gstruct *)gstruct_parse_array(cursor);\n- break;\n- case GSTRUCT_TYPE_MAP:\n- break;\n- case GSTRUCT_TYPE_BIN:\n- break;\n- case GSTRUCT_TYPE_EXT:\n- break;\n- default:\n- return buffer;\n-\n- }\n- arr->ptr++;\n+ gstruct_str *s = NULL;\n+ gstruct_array *a = NULL;\n+ switch (g->type) {\n+ case GSTRUCT_TYPE_NIL:\n+ case GSTRUCT_TYPE_BOOLEAN:\n+ case GSTRUCT_TYPE_INTEGER:\n+ case GSTRUCT_TYPE_CHAR:\n+ case GSTRUCT_TYPE_DOUBLE:\n+ gs->via = g->via;\n+ *offset = cursor;\n+ return GSTRUCT_SUCCESS;\n+ case GSTRUCT_TYPE_STR:\n+ s = (gstruct_str *)cursor;\n+ gs->via.str.size = s->size;\n+\n+ cursor += sizeof(gstruct_str);\n+ gs->via.str.ptr = cursor;\n+ *offset = cursor + s->size;\n+ return GSTRUCT_SUCCESS;\n+ case GSTRUCT_TYPE_ARRAY:\n+ a = (gstruct_array *)cursor;\n+ gs->via.array.size = a->size;\n+\n+ cursor += sizeof(gstruct_array);\n+ for (i = 0; i < a->size; i++) {\n+ gstruct_parse(gs->via.array.ptr++, cursor, &cursor);\n+ }\n+ return GSTRUCT_SUCCESS;\n+ case GSTRUCT_TYPE_MAP:\n+ \/\/ parse key\n+ case GSTRUCT_TYPE_BIN:\n+ break;\n+ case GSTRUCT_TYPE_EXT:\n+ break;\n+ default:\n+ return GSTRUCT_PARSE_ERROR;\n }\n- return cursor;\n+\n }\n \n gstruct_apply_return gstruct_apply_data(gstruct *gs)\n@@ -228,31 +221,6 @@\n }\n \n gstruct_buffer *buffer = gs->buffer;\n- char *cursor = buffer->data;\n- while (cursor < buffer->data + buffer->size) {\n- gstruct *g = (gstruct *)cursor;\n- switch (g->type) {\n- case GSTRUCT_TYPE_NIL:\n- case GSTRUCT_TYPE_BOOLEAN:\n- case GSTRUCT_TYPE_INTEGER:\n- case GSTRUCT_TYPE_CHAR:\n- case GSTRUCT_TYPE_DOUBLE:\n- cursor = gstruct_parse_scalar(cursor);\n- break;\n- case GSTRUCT_TYPE_STR:\n- cursor = gstruct_parse_str(g, cursor);\n- break;\n- case GSTRUCT_TYPE_ARRAY:\n- break;\n- case GSTRUCT_TYPE_MAP:\n- break;\n- case GSTRUCT_TYPE_BIN:\n- break;\n- case GSTRUCT_TYPE_EXT:\n- break;\n- default:\n- return GSTRUCT_PARSE_ERROR;\n- }\n- }\n- return GSTRUCT_SUCCESS;\n-}\n+ char *offset;\n+ return gstruct_parse(gs, gs->buffer->data, &offset);\n+}\n"} {"commit":"18a7ca08483888fdbbb345f9c3fbfbe5f73d0e10","subject":"Fix column ID for filesystem type containers for GTK3.","message":"Fix column ID for filesystem type containers for GTK3.\n\n","repos":"OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gtk3\/dw.c\n+++ gtk3\/dw.c\n@@ -5454,7 +5454,17 @@\n gtk_tree_view_column_add_attribute(col, rend, \"text\", z+1);\n gtk_tree_view_column_set_resizable(col, TRUE);\n }\n- g_object_set_data(G_OBJECT(col), \"_dw_column\", GINT_TO_POINTER(z));\n+ if(extra)\n+ {\n+ if(extra > 1 && z > 1)\n+ {\n+ g_object_set_data(G_OBJECT(col), \"_dw_column\", GINT_TO_POINTER(z-1));\n+ }\n+ }\n+ else\n+ {\n+ g_object_set_data(G_OBJECT(col), \"_dw_column\", GINT_TO_POINTER(z));\n+ }\n g_signal_connect(G_OBJECT(col), \"clicked\", G_CALLBACK(_column_click_event), (gpointer)tree);\n gtk_tree_view_column_set_title(col, titles[z]);\n gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);\n"} {"commit":"8fe5da89e33a2408c21dd536d0b2e2178aeaef1e","subject":"nv50: fix query assertion","message":"nv50: fix query assertion\n","repos":"zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/nv50\/nv50_query.c\n+++ src\/gallium\/drivers\/nv50\/nv50_query.c\n@@ -45,7 +45,7 @@\n \tstruct nv50_query *q = CALLOC_STRUCT(nv50_query);\n \tint ret;\n \n-\tassert (q->type == PIPE_QUERY_OCCLUSION_COUNTER);\n+\tassert (type == PIPE_QUERY_OCCLUSION_COUNTER);\n \tq->type = type;\n \n \tret = nouveau_bo_new(dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 256,\n"} {"commit":"57438adf3217955f16491ef8deeffafe05c2f7f8","subject":"r300g: handle polygon offset correctly","message":"r300g: handle polygon offset correctly\n\nhttps:\/\/bugs.freedesktop.org\/show_bug.cgi?id=29372\n","repos":"wolf96\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_state.c\n+++ src\/gallium\/drivers\/r300\/r300_state.c\n@@ -744,7 +744,7 @@\n r300_mark_fb_state_dirty(r300, R300_CHANGED_FB_STATE);\n \n \/* Polygon offset depends on the zbuffer bit depth. *\/\n- if (state->zsbuf && r300->polygon_offset_enabled) {\n+ if (state->zsbuf) {\n switch (util_format_get_blocksize(state->zsbuf->texture->format)) {\n case 2:\n zbuffer_bpp = 16;\n@@ -756,7 +756,9 @@\n \n if (r300->zbuffer_bpp != zbuffer_bpp) {\n r300->zbuffer_bpp = zbuffer_bpp;\n- r300->rs_state.dirty = TRUE;\n+\n+ if (r300->polygon_offset_enabled)\n+ r300->rs_state.dirty = TRUE;\n }\n }\n \n@@ -1095,9 +1097,7 @@\n }\n \n if (rs) {\n- r300->polygon_offset_enabled = (rs->rs.offset_point ||\n- rs->rs.offset_line ||\n- rs->rs.offset_tri);\n+ r300->polygon_offset_enabled = rs->polygon_offset_enable;\n r300->sprite_coord_enable = rs->rs.sprite_coord_enable;\n r300->two_sided_color = rs->rs.light_twoside;\n } else {\n"} {"commit":"a8f16054ca7bc9bbb5d9e7625be41507684923af","subject":"vc4: Use cl_f() instead of cl_u32(fui())","message":"vc4: Use cl_f() instead of cl_u32(fui())\n","repos":"zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/vc4\/vc4_program.c\n+++ src\/gallium\/drivers\/vc4\/vc4_program.c\n@@ -1304,19 +1304,19 @@\n gallium_uniforms[uinfo->data[i]]);\n break;\n case QUNIFORM_VIEWPORT_X_SCALE:\n- cl_u32(&vc4->uniforms, fui(vc4->framebuffer.width *\n- 16.0f \/ 2.0f));\n+ cl_f(&vc4->uniforms,\n+ vc4->framebuffer.width * 16.0f \/ 2.0f);\n break;\n case QUNIFORM_VIEWPORT_Y_SCALE:\n- cl_u32(&vc4->uniforms, fui(vc4->framebuffer.height *\n- -16.0f \/ 2.0f));\n+ cl_f(&vc4->uniforms,\n+ vc4->framebuffer.height * -16.0f \/ 2.0f);\n break;\n \n case QUNIFORM_VIEWPORT_Z_OFFSET:\n- cl_u32(&vc4->uniforms, fui(vc4->viewport.translate[2]));\n+ cl_f(&vc4->uniforms, vc4->viewport.translate[2]);\n break;\n case QUNIFORM_VIEWPORT_Z_SCALE:\n- cl_u32(&vc4->uniforms, fui(vc4->viewport.scale[2]));\n+ cl_f(&vc4->uniforms, vc4->viewport.scale[2]);\n break;\n \n case QUNIFORM_TEXTURE_CONFIG_P0:\n"} {"commit":"759c1c287caddac2f9d398de8c626ca435ecb42a","subject":"libgl-xlib: Use a simple GALLIUM_DRIVER env var to select the pipe driver.","message":"libgl-xlib: Use a simple GALLIUM_DRIVER env var to select the pipe driver.\n\nGALLIUM_DRIVER is being used in many other places, and it easier to\nmemorizing and understand than all the GALLIUM_NO_XXX.\n","repos":"zeux\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/targets\/libgl-xlib\/xlib.c\n+++ src\/gallium\/targets\/libgl-xlib\/xlib.c\n@@ -63,6 +63,8 @@\n static struct pipe_screen *\n swrast_xlib_create_screen( Display *display )\n {\n+ const char *default_driver;\n+ const char *driver;\n struct sw_winsys *winsys;\n struct pipe_screen *screen = NULL;\n \n@@ -73,17 +75,29 @@\n if (winsys == NULL)\n return NULL;\n \n+#if defined(GALLIUM_CELL)\n+ default_driver = \"cell\";\n+#elif defined(GALLIUM_LLVMPIPE)\n+ default_driver = \"llvmpipe\";\n+#elif defined(GALLIUM_SOFTPIPE)\n+ default_driver = \"softpipe\";\n+#else\n+ default_driver = \"\";\n+#endif\n+\n+ driver = debug_get_option(\"GALLIUM_DRIVER\", default_driver);\n+\n \/* Create a software rasterizer on top of that winsys:\n *\/\n #if defined(GALLIUM_CELL)\n if (screen == NULL &&\n- !debug_get_bool_option(\"GALLIUM_NO_CELL\", FALSE))\n+ strcmp(driver, \"cell\") == 0)\n screen = cell_create_screen( winsys );\n #endif\n \n #if defined(GALLIUM_LLVMPIPE)\n if (screen == NULL &&\n- !debug_get_bool_option(\"GALLIUM_NO_LLVM\", FALSE))\n+ strcmp(driver, \"llvmpipe\") == 0)\n screen = llvmpipe_create_screen( winsys );\n #endif\n \n"} {"commit":"d0515df23aab65aa730977416d7dfbe6ca895acd","subject":"Update version number.","message":"Update version number.\n","repos":"gabordemooij\/citrine,gabordemooij\/citrine,gabordemooij\/citrine","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- citrine.c\n+++ citrine.c\n@@ -23,10 +23,10 @@\n void ctr_cli_welcome() {\n \tprintf(\"\\n\");\n \t#ifdef langNL\n-\t\tprintf(\"Citrine Programmeertaal V 0.7.13\\n\");\n+\t\tprintf(\"Citrine Programmeertaal V 0.7.14\\n\");\n \t\tprintf(\"Geschreven door Gabor de Mooij \u00a9 alle rechten voorbehouden 2018, Licensie BSD.\\n\");\n \t#else\n-\t\tprintf(\"Citrine Programming Language V 0.7.13\\n\");\n+\t\tprintf(\"Citrine Programming Language V 0.7.14\\n\");\n \t\tprintf(\"Written by Gabor de Mooij \u00a9 copyright 2018, Licensed BSD.\\n\");\n \t#endif\n \tprintf(\"\\n\");\n"} {"commit":"3c4cd3778ecfb0eee4442c3fcfef73c2ea1538bd","subject":"Fix byte encoding macros.","message":"Fix byte encoding macros.\n\ngit-svn-id: 6df6fa3ddd728f578ea1442598151d5900a6ed44@352 630680e5-0e50-0410-840e-4b1c322b438d\n","repos":"patrickhartling\/protobuf,datacratic\/protobuf,chandlerc\/protobuf-llvm,da2ce7\/protobuf,mpapierski\/protobuf,GreatFruitOmsk\/protobuf-py3,Distrotech\/protobuf,datacratic\/protobuf,aidansteele\/protobuf-mirror,kastnerkyle\/protobuf-py3,lcy03406\/protobuf,machinalis\/protobuf-python3,svn2github\/google-protobuf,spilgames\/protobuf,datacratic\/protobuf,patrickhartling\/protobuf,GreatFruitOmsk\/protobuf-py3,lcy03406\/protobuf,machinalis\/protobuf-python3,datacratic\/protobuf,lcy03406\/protobuf,mpapierski\/protobuf,patrickhartling\/protobuf,svn2github\/protobuf-mirror,lcy03406\/protobuf,chandlerc\/protobuf-llvm,beyang\/protobuf,GreatFruitOmsk\/protobuf-py3,lcy03406\/protobuf,spilgames\/protobuf,aidansteele\/protobuf-mirror,datacratic\/protobuf,beyang\/protobuf,chandlerc\/protobuf-llvm,kastnerkyle\/protobuf-py3,Distrotech\/protobuf,mikelikespie\/protobuf,machinalis\/protobuf-python3,kastnerkyle\/protobuf-py3,mpapierski\/protobuf,patrickhartling\/protobuf,GreatFruitOmsk\/protobuf-py3,mkrautz\/external-protobuf,kastnerkyle\/protobuf-py3,chandlerc\/protobuf-llvm,mkrautz\/external-protobuf,mikelikespie\/protobuf,spilgames\/protobuf,da2ce7\/protobuf,spilgames\/protobuf,Distrotech\/protobuf,svn2github\/protobuf-mirror,aidansteele\/protobuf-mirror,mikelikespie\/protobuf,svn2github\/protobuf-mirror,svn2github\/google-protobuf,GreatFruitOmsk\/protobuf-py3,da2ce7\/protobuf,beyang\/protobuf,mkrautz\/external-protobuf,aidansteele\/protobuf-mirror,beyang\/protobuf,patrickhartling\/protobuf,svn2github\/protobuf-mirror,aidansteele\/protobuf-mirror,Distrotech\/protobuf,mikelikespie\/protobuf,svn2github\/google-protobuf,machinalis\/protobuf-python3,kastnerkyle\/protobuf-py3,beyang\/protobuf,mkrautz\/external-protobuf,Distrotech\/protobuf,svn2github\/google-protobuf,chandlerc\/protobuf-llvm,da2ce7\/protobuf,mkrautz\/external-protobuf,spilgames\/protobuf,mikelikespie\/protobuf,svn2github\/protobuf-mirror,da2ce7\/protobuf,mpapierski\/protobuf,mpapierski\/protobuf,svn2github\/google-protobuf","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/google\/protobuf\/io\/coded_stream.h\n+++ src\/google\/protobuf\/io\/coded_stream.h\n@@ -782,8 +782,7 @@\n }\n \n inline bool CodedInputStream::ReadLittleEndian32(uint32* value) {\n-#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) && \\\n- defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN\n+#if defined(PROTOBUF_LITTLE_ENDIAN)\n if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {\n memcpy(value, buffer_, sizeof(*value));\n Advance(sizeof(*value));\n@@ -797,8 +796,7 @@\n }\n \n inline bool CodedInputStream::ReadLittleEndian64(uint64* value) {\n-#if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) && \\\n- defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN\n+#if defined(PROTOBUF_LITTLE_ENDIAN)\n if (GOOGLE_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {\n memcpy(value, buffer_, sizeof(*value));\n Advance(sizeof(*value));\n"} {"commit":"8f7a22dde668c0801238138700f506f2196105bf","subject":"Fix issue 474","message":"Fix issue 474\n\n","repos":"malthe\/google-protobuf,malthe\/google-protobuf,malthe\/google-protobuf,malthe\/google-protobuf,malthe\/google-protobuf","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/google\/protobuf\/stubs\/atomicops.h\n+++ src\/google\/protobuf\/stubs\/atomicops.h\n@@ -66,7 +66,7 @@\n #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT\n \/\/ We need to be able to go between Atomic64 and AtomicWord implicitly. This\n \/\/ means Atomic64 and AtomicWord should be the same type on 64-bit.\n-#if defined(GOOGLE_PROTOBUF_OS_NACL)\n+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL)\n \/\/ NaCl's intptr_t is not actually 64-bits on 64-bit!\n \/\/ http:\/\/code.google.com\/p\/nativeclient\/issues\/detail?id=1162\n typedef int64 Atomic64;\n"} {"commit":"dd0f3b4f4755dd7dea8d0008cbf4407c50a164ca","subject":"Fixed compile error when WITH_PP=OFF.","message":"Fixed compile error when WITH_PP=OFF.","repos":"rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,rajeevakarv\/relic-toolkit,rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,tectronics\/relic-toolkit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fp\/relic_fp_param.c\n+++ src\/fp\/relic_fp_param.c\n@@ -618,12 +618,14 @@\n \t\tfp_param_set_any_dense();\n \t} while (fp_prime_get_mod8() == 1 || fp_prime_get_mod8() == 5);\n #endif\n+#ifdef WITH_PP\n \tif (fp_prime_get_qnr()) {\n \t\tfp2_const_calc();\n \t}\n \tif (fp_prime_get_cnr()) {\n \t\tfp3_const_calc();\n \t}\n+#endif\n \treturn STS_OK;\n }\n \n"} {"commit":"ab44b0c61e886b2d335e683ee73f5cb186bd6f63","subject":"toytoolkit: implement cursor-size config key","message":"toytoolkit: implement cursor-size config key\n","repos":"Fantu\/compositor-spice,jonnylamb\/weston,sir-murray\/weston,kwm81\/weston,Gnurou\/weston,Tarnyko\/weston-xdg_surface_present,Fantu\/compositor-spice,jonnylamb\/weston,mchalupa\/weston,eyolfson\/weston,Tarnyko\/weston-xdg_surface_present,xorgy\/weston,mchalupa\/weston,giucam\/weston,eyolfson\/weston,sir-murray\/weston,Fantu\/compositor-spice,udoprog\/weston,krezovic\/weston,giucam\/weston,xorgy\/weston,krezovic\/weston,udoprog\/weston,kwm81\/weston,Gnurou\/weston","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- clients\/window.c\n+++ clients\/window.c\n@@ -1097,10 +1097,12 @@\n {\n \tchar *config_file;\n \tchar *theme = NULL;\n+\tunsigned int size = 32;\n \tunsigned int i, j;\n \tstruct wl_cursor *cursor;\n \tstruct config_key shell_keys[] = {\n \t\t{ \"cursor-theme\", CONFIG_KEY_STRING, &theme },\n+\t\t{ \"cursor-size\", CONFIG_KEY_UNSIGNED_INTEGER, &size },\n \t};\n \tstruct config_section cs[] = {\n \t\t{ \"shell\", shell_keys, ARRAY_LENGTH(shell_keys), NULL },\n@@ -1110,7 +1112,7 @@\n \tparse_config_file(config_file, cs, ARRAY_LENGTH(cs), NULL);\n \tfree(config_file);\n \n-\tdisplay->cursor_theme = wl_cursor_theme_load(theme, 32, display->shm);\n+\tdisplay->cursor_theme = wl_cursor_theme_load(theme, size, display->shm);\n \tdisplay->cursors =\n \t\tmalloc(ARRAY_LENGTH(cursors) * sizeof display->cursors[0]);\n \n"} {"commit":"a6149ee22fd494149723abf95c173798fff44b4d","subject":"[general] bumped dev build to 9","message":"[general]\nbumped dev build to 9\n\n\ngit-svn-id: 9f6a531b1eccf48281891b884df4d15f0e1b68ac@1086 17a06da3-8c20-fa79-550f-e9588e724b77\n","repos":"twig\/dcxdll,twig\/dcxdll,twig\/dcxdll,twig\/dcxdll,twig\/dcxdll","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- defines.h\n+++ defines.h\n@@ -142,7 +142,7 @@\n #define DLL_VERSION 2\r\n #define DLL_SUBVERSION 0\r\n #define DLL_BUILD SVN_BUILD\r\n-#define DLL_DEV_BUILD 8\r\n+#define DLL_DEV_BUILD 9\r\n \r\n #ifdef NDEBUG\r\n #ifdef DCX_DEV_BUILD\r\n"} {"commit":"3146756adf749c8931f60d7272a590cc41fb8436","subject":"clients: Don't ask for EGL_PIXMAP_BIT when choosing configs","message":"clients: Don't ask for EGL_PIXMAP_BIT when choosing configs\n","repos":"udoprog\/weston,giucam\/weston,Tarnyko\/weston-xdg_surface_present,Gnurou\/weston,eyolfson\/weston,jonnylamb\/weston,kwm81\/weston,Fantu\/compositor-spice,giucam\/weston,jonnylamb\/weston,sir-murray\/weston,Tarnyko\/weston-xdg_surface_present,mchalupa\/weston,sir-murray\/weston,Fantu\/compositor-spice,udoprog\/weston,eyolfson\/weston,kwm81\/weston,xorgy\/weston,Fantu\/compositor-spice,mchalupa\/weston,Gnurou\/weston,xorgy\/weston,krezovic\/weston,krezovic\/weston","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- clients\/window.c\n+++ clients\/window.c\n@@ -3750,7 +3750,7 @@\n #endif\n \n \tstatic const EGLint argb_cfg_attribs[] = {\n-\t\tEGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PIXMAP_BIT,\n+\t\tEGL_SURFACE_TYPE, EGL_WINDOW_BIT,\n \t\tEGL_RED_SIZE, 1,\n \t\tEGL_GREEN_SIZE, 1,\n \t\tEGL_BLUE_SIZE, 1,\n"} {"commit":"f4a2d7c1fc40dcdec8d813027ba3b1d4be5955bd","subject":"Be consistent: file flags are unsigned bitmaps. Thanks to: Joerg Sonnenberger","message":"Be consistent: file flags are unsigned bitmaps.\nThanks to: Joerg Sonnenberger\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libarchive\/archive_write_disk.c\n+++ lib\/libarchive\/archive_write_disk.c\n@@ -1519,7 +1519,7 @@\n set_fflags(struct archive_write_disk *a)\n {\n \tstruct fixup_entry *le;\n-\tlong\t\tset, clear;\n+\tunsigned long\tset, clear;\n \tint\t\tr;\n \tint\t\tcritical_flags;\n \tmode_t\t\tmode = archive_entry_mode(a->entry);\n"} {"commit":"f070eb9a21d40eeb1648f1f42362b08bd99e8952","subject":"pci: rename device and driver lists for bsd","message":"pci: rename device and driver lists for bsd\n\nThe bsdapp part was missing in commit 5b1f4a67dd5bcfa8d5139c064ced6e37a9149419.\n\nTo avoid confusion with virtual devices, rename device_list as\npci_device_list and driver_list as pci_driver_list.\n\nSigned-off-by: Olivier Matz <dfcc1510895413197abb4336e39bb0a3906cba71@6wind.com>\nAcked-by: Neil Horman <3316dc2d77df57653443c0391a5296176d6ca9c3@tuxdriver.com>\n","repos":"john-mcnamara-intel\/dpdk,venkynv\/dpdk-mirror,msune\/dpdk,john-mcnamara-intel\/dpdk,tsphillips\/dpdk-fork,msune\/dpdk,mixja\/dpdk,msune\/dpdk,msune\/dpdk,john-mcnamara-intel\/dpdk,venkynv\/dpdk-mirror,venkynv\/dpdk-mirror,tsphillips\/dpdk-fork,tsphillips\/dpdk-fork,mixja\/dpdk,mixja\/dpdk,john-mcnamara-intel\/dpdk,mixja\/dpdk,tsphillips\/dpdk-fork,venkynv\/dpdk-mirror","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_eal\/bsdapp\/eal\/eal_pci.c\n+++ lib\/librte_eal\/bsdapp\/eal\/eal_pci.c\n@@ -362,13 +362,13 @@\n \t}\n \n \t\/* device is valid, add in list (sorted) *\/\n-\tif (TAILQ_EMPTY(&device_list)) {\n-\t\tTAILQ_INSERT_TAIL(&device_list, dev, next);\n+\tif (TAILQ_EMPTY(&pci_device_list)) {\n+\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n \t}\t\n \telse {\n \t\tstruct rte_pci_device *dev2 = NULL;\n \n-\t\tTAILQ_FOREACH(dev2, &device_list, next) {\n+\t\tTAILQ_FOREACH(dev2, &pci_device_list, next) {\n \t\t\tif (pci_addr_comparison(&dev->addr, &dev2->addr))\n \t\t\t\tcontinue;\n \t\t\telse {\n@@ -376,7 +376,7 @@\n \t\t\t\treturn 0;\n \t\t\t}\n \t\t}\n-\t\tTAILQ_INSERT_TAIL(&device_list, dev, next);\n+\t\tTAILQ_INSERT_TAIL(&pci_device_list, dev, next);\n \t}\n \t\t\t\t\n \treturn 0;\n@@ -503,8 +503,8 @@\n int\n rte_eal_pci_init(void)\n {\n-\tTAILQ_INIT(&driver_list);\n-\tTAILQ_INIT(&device_list);\n+\tTAILQ_INIT(&pci_driver_list);\n+\tTAILQ_INIT(&pci_device_list);\n \tuio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list);\n \n \t\/* for debug purposes, PCI can be disabled *\/\n"} {"commit":"9554dbb50a8a22942128a0e5bcb52243a4f723ab","subject":"malloc: do not skip pad on free","message":"malloc: do not skip pad on free\n\nPreviously, we were skipping erasing pad because we were\nexpecting it to be freed when we were merging adjacent\nsegments. However, if there were no adjacent segments to\nmerge, we would've skipped erasing the pad, leaving non-zero\nmemory in our free space.\n\nFix this by including pad in the erasing unconditionally.\n\nFixes: e43a9f52b7ff (\"malloc: fix pad erasing\")\nCc: stable@dpdk.org\n\nReported-by: Andrew Rybchenko <ac94ab2a8fe9a9a087f6e24dcbc16626b52c07e8@solarflare.com>\nSigned-off-by: Anatoly Burakov <814e00d8f6e4e81b7ccc7e3e5a0bfec0078f0203@intel.com>\nTested-by: Andrew Rybchenko <ac94ab2a8fe9a9a087f6e24dcbc16626b52c07e8@solarflare.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_eal\/common\/malloc_elem.c\n+++ lib\/librte_eal\/common\/malloc_elem.c\n@@ -519,8 +519,8 @@\n \tvoid *ptr;\n \tsize_t data_len;\n \n-\tptr = RTE_PTR_ADD(elem, MALLOC_ELEM_HEADER_LEN + elem->pad);\n-\tdata_len = elem->size - elem->pad - MALLOC_ELEM_OVERHEAD;\n+\tptr = RTE_PTR_ADD(elem, MALLOC_ELEM_HEADER_LEN);\n+\tdata_len = elem->size - MALLOC_ELEM_OVERHEAD;\n \n \telem = malloc_elem_join_adjacent_free(elem);\n \n"} {"commit":"a5e48f0e535cab325676455b917c1fdeda94d811","subject":"upload 4s code","message":"upload 4s code\n","repos":"ryanwli\/ryanwli.github.io,ryanwli\/ryanwli.github.io,ryanwli\/ryanwli.github.io,ryanwli\/ryanwli.github.io,ryanwli\/ryanwli.github.io","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/4s.c\n+++ code\/4s.c\n@@ -1,5 +1,6 @@\n #include <stdio.h>\n \n+\/\/answer a\n typedef struct {\n \t\n \tint id;\n@@ -9,7 +10,7 @@\n \tchar* addrs[];\n } account;\n \n-\/\/\n+\/\/answer b\n int listMatchAccounts(char* addr, account allAccounts[], int numOfAccounts)\n {\n \tint matchCount = 0;\n@@ -41,3 +42,12 @@\n \treturn 0;\n };\n \n+\/\/answer c, research in google to find answer...\n+\n+\/\/print out--------------------\n+\/**\n+name:ryan, address:chengdu\n+name:jack, address:chengdu\n+total records:2\n+**\/\n+\n"} {"commit":"c81b25f41383ee5c599d9f893b1c6307cfed2db2","subject":"updata","message":"updata\n","repos":"briskgreen\/smbot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -576,6 +576,13 @@\n \tbuf=string_add(\"https:\/\/www.googleapis.com\/customsearch\/v1?key=%s&cx=006431901905483214390:i3yxhoqkzo0&num=1&q=%s&searchType=image\",GOOGLE_KEY,data->arg);\n \tres=https_get_simple(buf,443);\n \tfree(buf);\n+\tif(res == NULL)\n+\t{\n+\t\tmsg_send(\"\u67e5\u8be2\u5931\u8d25!\",data);\n+\t\tsmbot_destory(data);\n+\t\tfree(data->arg);\n+\t\treturn;\n+\t}\n \n \turl=match_string(\"\\\"link\\\": \\\".[^\\\"]*\",res);\n \tdes=match_string(\"\\\"snippet\\\": \\\".[^\\\"]*\",res);\n@@ -824,14 +831,8 @@\n \t\t\tdata->arg[i]='+';\n \n \tbuf=string_add(\"http:\/\/xiaofengrobot.sinaapp.com\/web.php?callback=jQuery191041205509454157474_1376842442554¶=%s&_=1376842442555\",data->arg);\n-\tres=http_get_simple(buf,80);\n-\tfree(buf);\n-\tif(res == NULL)\n-\t{\n-\t\tsmbot_destory(data);\n-\t\tfree(data->arg);\n-\t\treturn;\n-\t}\n+\twhile((res=http_get_simple(buf,80)) != NULL);\n+\tfree(buf);\n \n \tif(strstr(res,\"504 Gateway Time-out\") && strstr(res,\"503 Service Unavailable\"))\n \t{\n"} {"commit":"8d9d163b55ae9e462795391d6bd8411aa945f702","subject":"Changed :[w[qe]x] code","message":"Changed :[w[qe]x] code\n","repos":"bobrippling\/uvi,bobrippling\/uvi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- command.c\n+++ command.c\n@@ -114,7 +114,7 @@\n \tint nw, nl;\n \tint x = 0;\n \n-\tif(rng->start != -1 || rng->end != -1){\n+\tif(rng->start != -1){\n \t\tif(rng->end == -1)\n \t\t\trng->start = rng->end;\n \n@@ -130,16 +130,9 @@\n \t\t\tshellout(bang, list_to_write);\n \n \t\t\tfree(cmd);\n-\t\t}else{\n-\t\t\tgoto write_list;\n-\t\t}\n-\n-\t\tlist_free(list_to_write, free);\n-\t\treturn;\n-\n-\t}else if(buffer_readonly(current_buffer)){\n-\t\tgui_status(GUI_ERR, \"buffer is read-only\");\n-\t\treturn;\n+\t\t\tlist_free(list_to_write, free);\n+\t\t\treturn;\n+\t\t}\n \t}\n \n \tif(!strcmp(argv[0], \"wq\")){\n@@ -147,56 +140,60 @@\n \t}else if(!strcmp(argv[0], \"x\")){\n \t\tafter = QUIT;\n \t\tx = 1;\n-\n \t}else if(!strcmp(argv[0], \"we\")){\n \t\tafter = EDIT;\n \t}else if(strcmp(argv[0], \"w\")){\n usage:\n \t\tgui_status(GUI_ERR, \"usage: w[qe][![!]] file|command\");\n-\t\treturn;\n+\t\tgoto fin;\n \t}\n \n \tif(argc > 1 && argv[1][0] == '!'){\n-\t\t\/* pipe *\/\n+\t\t\/* same as above pipe, except the whole file *\/\n \t\tchar *cmd = argv_to_str(argc - 1, argv + 1);\n \t\tchar *bang = strchr(cmd, '!') + 1;\n \n \t\tshellout(bang, buffer_gethead(current_buffer));\n \n \t\tfree(cmd);\n-\t\treturn;\n-\n-\t}else\n-write_list:\n-\t\tif(argc == 2 && after != EDIT){\n+\t\tgoto fin;\n+\t}\n+\n+\t\/* past the point of ! commands *\/\n+\tif(argc > 2)\n+\t\tgoto usage;\n+\n+\tif(argc == 2 && after != EDIT){\n \t\t\/* have a filename to save to *\/\n-\n \t\tif(!force){\n \t\t\tstruct stat st;\n \n \t\t\tif(stat(argv[1], &st) == 0){\n \t\t\t\tgui_status(GUI_ERR, \"not over-writing %s\", argv[1]);\n-\t\t\t\treturn;\n+\t\t\t\tgoto fin;\n \t\t\t}\n \t\t}\n \t\tbuffer_setfilename(current_buffer, argv[1]);\n-\n-\t}else if(argc != 1 && (after == EDIT ? argc != 2 : 0)){\n-\t\tgoto usage;\n-\n+\t\tbuffer_modified(current_buffer) = 1;\n+\t}\n+\n+\tif(!buffer_hasfilename(current_buffer)){\n+\t\tgui_status(GUI_ERR, \"buffer has no filename\");\n+\t\tgoto fin;\n \t}\n \n \tif(x && !buffer_modified(current_buffer))\n \t\tgoto after;\n \n-\tif(!buffer_hasfilename(current_buffer)){\n-\t\tgui_status(GUI_ERR, \"buffer has no filename\");\n-\t\treturn;\n-\t}\n-\n-\tif(!force && buffer_external_modified(current_buffer)){\n-\t\tgui_status(GUI_ERR, \"buffer changed externally since last read\");\n-\t\treturn;\n+\tif(!force){\n+\t\tif(buffer_readonly(current_buffer)){\n+\t\t\tgui_status(GUI_ERR, \"buffer is read-only\");\n+\t\t\tgoto fin;\n+\t\t}\n+\t\tif(buffer_external_modified(current_buffer)){\n+\t\t\tgui_status(GUI_ERR, \"buffer changed externally since last read\");\n+\t\t\tgoto fin;\n+\t\t}\n \t}\n \n \tif(list_to_write){\n@@ -210,10 +207,14 @@\n \n \tif(nw == -1){\n \t\tgui_status(GUI_ERR, \"couldn't write \\\"%s\\\": %s\", buffer_filename(current_buffer), strerror(errno));\n-\t\treturn;\n-\t}\n+\t\tgoto fin;\n+\t}\n+\n \tbuffer_modified(current_buffer) = 0;\n-\tgui_status(GUI_NONE, \"\\\"%s\\\" %dL, %dC written\", buffer_filename(current_buffer), nl, nw);\n+\tgui_status(GUI_NONE, \"\\\"%s\\\" %s%dL, %dC written\",\n+\t\t\tbuffer_filename(current_buffer),\n+\t\t\tlist_to_write ? \"[partial-range] \":\"\",\n+\t\t\tnl, nw);\n \n after:\n \tswitch(after){\n@@ -225,6 +226,10 @@\n \t\tcase NONE:\n \t\t\tbreak;\n \t}\n+\n+fin:\n+\tif(list_to_write)\n+\t\tlist_free(list_to_write, free);\n }\n \n \n"} {"commit":"7d5332fd0365e54dcc54ffaeb8bab1923118aa27","subject":"Make 2D arrays that are contiguous in memory","message":"Make 2D arrays that are contiguous in memory\n","repos":"mdpiper\/storm,csdms-contrib\/storm,mdpiper\/storm,csdms-contrib\/storm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bmi\/storm.c\n+++ bmi\/storm.c\n@@ -52,17 +52,23 @@\n if (self) {\n const int n_rows = self->shape[0];\n const int n_cols = self->shape[1];\n+ const int n_elements = n_rows * n_cols;\n \n- \/* Allocate memory *\/\n- self->wdir = (double **)malloc (sizeof (double *) * n_rows);\n- self->wspd = (double **)malloc (sizeof (double *) * n_rows);\n- for (i = 0; i < n_rows; i++) {\n- self->wdir[i] = (double *) malloc (sizeof (double) * n_cols);\n- self->wspd[i] = (double *) malloc (sizeof (double) * n_cols);\n+ self->wdir = (double **) malloc (sizeof (double *) * n_rows);\n+ self->wspd = (double **) malloc (sizeof (double *) * n_rows);\n+ if (!self->wdir || !self->wspd)\n+ return 1;\n+\n+ self->wdir[0] = (double *) malloc (sizeof (double) * n_elements);\n+ self->wspd[0] = (double *) malloc (sizeof (double) * n_elements);\n+ if (!self->wdir[0] || !self->wspd[0])\n+ return 1;\n+\n+ for (i = 1; i < n_rows; i++) {\n+ self->wdir[i] = self->wdir[i-1] + n_cols;\n+ self->wspd[i] = self->wspd[i-1] + n_cols;\n }\n \n- if (!self->wdir || !self->wspd)\n- return 1;\n }\n else\n return 1;\n"} {"commit":"2b5524edfa7c64d1f6a4dbea487b1ccb0e78707d","subject":"use g_strdiff for readability","message":"use g_strdiff for readability\n\n\n20060529161348-b59df-79ff279aef3f1a958b6c857a4c180f580740cdbc.gz\n","repos":"mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble,jku\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-connection.c\n+++ src\/gabble-connection.c\n@@ -2569,8 +2569,7 @@\n {\n Feature *feature = (Feature *) i->data;\n \n- if (suffix == NULL ||\n- (feature->bundle != NULL && 0 == strcmp (suffix, feature->bundle)))\n+ if (NULL == suffix || !g_strdiff (suffix, feature->bundle))\n {\n LmMessageNode *node = lm_message_node_add_child (result_query,\n \"feature\", NULL);\n"} {"commit":"674b2e6cbe1e77277691b09b07cff8d1d6578b0e","subject":"emit status changed correctly for failure in connection open","message":"emit status changed correctly for failure in connection open\n\n\n20060524200941-25e70-9ecc6f37d6b24e060d40c5449dbef59c3c6fbd2d.gz\n","repos":"Ziemin\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-connection.c\n+++ src\/gabble-connection.c\n@@ -1391,7 +1391,6 @@\n gpointer user_data)\n {\n GabbleConnection *conn = GABBLE_CONNECTION (user_data);\n- GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (conn);\n \n g_assert (conn->lmconn == lmconn);\n \n@@ -1409,18 +1408,9 @@\n else\n {\n g_debug (\"%s: unexpected; calling connection_status_change\", G_STRFUNC);\n- if (priv->ssl_error)\n- {\n- connection_status_change (conn,\n- TP_CONN_STATUS_DISCONNECTED,\n- priv->ssl_error);\n- }\n- else\n- {\n- connection_status_change (conn,\n- TP_CONN_STATUS_DISCONNECTED,\n- TP_CONN_STATUS_REASON_NETWORK_ERROR);\n- }\n+ connection_status_change (conn,\n+ TP_CONN_STATUS_DISCONNECTED,\n+ TP_CONN_STATUS_REASON_NETWORK_ERROR);\n }\n }\n \n@@ -2533,9 +2523,18 @@\n g_debug (\"%s failed\", G_STRFUNC);\n }\n \n- connection_status_change (conn,\n- TP_CONN_STATUS_DISCONNECTED,\n- TP_CONN_STATUS_REASON_NETWORK_ERROR);\n+ if (priv->ssl_error)\n+ {\n+ connection_status_change (conn,\n+ TP_CONN_STATUS_DISCONNECTED,\n+ priv->ssl_error);\n+ }\n+ else\n+ {\n+ connection_status_change (conn,\n+ TP_CONN_STATUS_DISCONNECTED,\n+ TP_CONN_STATUS_REASON_NETWORK_ERROR);\n+ }\n \n return;\n }\n"} {"commit":"bea9fd143afed870d60a33674e9cd7dae60d2f0c","subject":"use tp_strdiff for checking PEPability","message":"use tp_strdiff for checking PEPability\n\n\n20070320172331-c9803-a2f694b62c2e0979b33df15ff8e157d6af4854f7.gz\n","repos":"Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,jku\/telepathy-gabble,Ziemin\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-connection.c\n+++ src\/gabble-connection.c\n@@ -1979,11 +1979,8 @@\n \"category\");\n const gchar *type = lm_message_node_get_attribute (iter, \"type\");\n \n- if (type == NULL || category == NULL)\n- continue;\n-\n- if (0 == strcmp (category, \"pubsub\") &&\n- 0 == strcmp (type, \"pep\"))\n+ if (!tp_strdiff (category, \"pubsub\") &&\n+ !tp_strdiff (type, \"pep\"))\n \/* XXX: should we also check for specific PubSub <feature>s? *\/\n conn->features |= GABBLE_CONNECTION_FEATURES_PEP;\n }\n"} {"commit":"bb8bc78f601218f60a215dfd52ca773326bea241","subject":"80 columns","message":"80 columns\n\n\n20080513111118-a41c0-634c123cbd83aaa62b26066d89002b32b5ec3ed5.gz\n","repos":"community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-connection.c\n+++ src\/gabble-connection.c\n@@ -1537,8 +1537,8 @@\n \n caps_hash = caps_hash_compute_from_self_presence (self);\n DEBUG (\"caps_hash='%s'\", caps_hash);\n- if (NULL == node || bundle_found ||\n- g_str_equal (suffix, caps_hash))\n+\n+ if (NULL == node || bundle_found || g_str_equal (suffix, caps_hash))\n {\n if (NULL == node)\n DEBUG (\"No requested node. Send all features.\");\n"} {"commit":"b5a1f7afa600fc988f8bf95a1467fe37e5813a41","subject":"More patch for #211 - set air_attacked to 0 on arena reset","message":"More patch for #211 - set air_attacked to 0 on arena reset\n","repos":"gdeda\/openomf,omf2097\/openomf,omf2097\/openomf,pmjdebruijn\/openomf,gdeda\/openomf,pmjdebruijn\/openomf,pmjdebruijn\/openomf,gdeda\/openomf,omf2097\/openomf","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/game\/scenes\/arena.c\n+++ src\/game\/scenes\/arena.c\n@@ -267,6 +267,7 @@\n har_set_ani(har_obj, ANIM_IDLE, 1);\n h->health = h->health_max;\n h->endurance = h->endurance_max;\n+ h->air_attacked = 0;\n object_set_pos(har_obj, pos[i]);\n object_set_vel(har_obj, vec2f_create(0, 0));\n object_set_gravity(har_obj, 1);\n"} {"commit":"a12be9d78bf266202bb26527ff36d9ae5d8e300e","subject":"restyle: a more verbose but easy to edit method table","message":"restyle: a more verbose but easy to edit method table\n","repos":"fgimian\/easysnmp,normanuber\/ezsnmp,normanuber\/ezsnmp,fgimian\/easysnmp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pynetsnmp\/interface.c\n+++ pynetsnmp\/interface.c\n@@ -3130,26 +3130,105 @@\n }\n \n \n-static PyMethodDef ClientMethods[] = {\n- {\"session\", netsnmp_create_session, METH_VARARGS,\n- \"create a netsnmp session.\"},\n- {\"session_v3\", netsnmp_create_session_v3, METH_VARARGS,\n- \"create a netsnmp session.\"},\n- {\"session_tunneled\", netsnmp_create_session_tunneled, METH_VARARGS,\n- \"create a tunneled netsnmp session over tls, dtls or ssh.\"},\n- {\"delete_session\", netsnmp_delete_session, METH_VARARGS,\n- \"create a netsnmp session.\"},\n- {\"get\", netsnmp_get, METH_VARARGS,\n- \"perform an SNMP GET operation.\"},\n- {\"getnext\", netsnmp_getnext, METH_VARARGS,\n- \"perform an SNMP GETNEXT operation.\"},\n- {\"getbulk\", netsnmp_getbulk, METH_VARARGS,\n- \"perform an SNMP GETBULK operation.\"},\n- {\"set\", netsnmp_set, METH_VARARGS,\n- \"perform an SNMP SET operation.\"},\n- {\"walk\", netsnmp_walk, METH_VARARGS,\n- \"perform an SNMP WALK operation.\"},\n- {NULL, NULL, 0, NULL} \/* Sentinel *\/\n+\n+\/**\n+ * Get a logger object from the logging module.\n+ * Shamelessly stolen from:\n+ * http:\/\/proj.badc.rl.ac.uk\/svn\/ndg\/TI05-delivery\/trunk\/components\/server\/ext\/bbftpd.c\n+ *\/\n+static PyObject *py_init_logger(char *logger_name)\n+{\n+ PyObject *logging;\n+ PyObject *logger;\n+\n+ logging = PyImport_ImportModuleNoBlock(\"logging\");\n+\n+ if (logging == NULL)\n+ {\n+ PyErr_SetString(PyExc_ImportError,\n+ \"Could not import module 'logging'\");\n+ return NULL;\n+ }\n+\n+ logger = PyObject_CallMethod(logging, \"getLogger\", \"s\", logger_name);\n+\n+ return logger;\n+}\n+\n+\/*\n+ * Array of defined methods when initialising the module,\n+ * each entry must contain the following:\n+ *\n+ * (char *) ml_name: name of method\n+ * (PyCFunction) ml_meth: pointer to the C implementation\n+ * (int) ml_flags: flag bit indicating how call should be\n+ * (char *) ml_doc: points to contents of method docstring\n+ *\n+ * See: https:\/\/docs.python.org\/2\/c-api\/structures.html for more info.\n+ *\n+ *\/\n+static PyMethodDef ClientMethods[] =\n+{\n+ {\n+ \"session\",\n+ netsnmp_create_session,\n+ METH_VARARGS,\n+ \"create a netsnmp session.\"\n+ },\n+ {\n+ \"session_v3\",\n+ netsnmp_create_session_v3,\n+ METH_VARARGS,\n+ \"create a netsnmp session.\"\n+ },\n+ {\n+ \"session_tunneled\",\n+ netsnmp_create_session_tunneled,\n+ METH_VARARGS,\n+ \"create a tunneled netsnmp session over tls, dtls or ssh.\"\n+ },\n+ {\n+ \"delete_session\",\n+ netsnmp_delete_session,\n+ METH_VARARGS,\n+ \"create a netsnmp session.\"\n+ },\n+ {\n+ \"get\",\n+ netsnmp_get,\n+ METH_VARARGS,\n+ \"perform an SNMP GET operation.\"\n+ },\n+ {\n+ \"getnext\",\n+ netsnmp_getnext,\n+ METH_VARARGS,\n+ \"perform an SNMP GETNEXT operation.\"\n+ },\n+ {\n+ \"getbulk\",\n+ netsnmp_getbulk,\n+ METH_VARARGS,\n+ \"perform an SNMP GETBULK operation.\"\n+ },\n+ {\n+ \"set\",\n+ netsnmp_set,\n+ METH_VARARGS,\n+ \"perform an SNMP SET operation.\"\n+ },\n+ {\n+ \"walk\",\n+ netsnmp_walk,\n+ METH_VARARGS,\n+ \"perform an SNMP WALK operation.\"\n+ },\n+ {\n+ NULL,\n+ NULL,\n+ 0,\n+ NULL\n+ } \/* Sentinel *\/\n };\n \n PyMODINIT_FUNC initinterface(void)\n"} {"commit":"8f0ae3dc759ff984176e5eb621c6f30274005160","subject":"Added comment.","message":"Added comment.\n","repos":"leegoonz\/cmftStudio,leegoonz\/cmftStudio,leegoonz\/cmftStudio","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/geometry\/geometry.h\n+++ src\/geometry\/geometry.h\n@@ -35,7 +35,7 @@\n \n char m_name[NameLen];\n };\n-typedef dm::ObjArrayT<Primitive, MaxPrimitivesPerGroup> PrimitiveArray;\n+typedef dm::ObjArrayT<Primitive, MaxPrimitivesPerGroup> PrimitiveArray; \/\/TODO: implement and use a dynamic array structure instead.\n \n struct Group\n {\n@@ -64,7 +64,7 @@\n \n char m_materialName[MaterialNameLen];\n };\n-typedef dm::ObjArrayT<Group, MaxGroups> GroupArray;\n+typedef dm::ObjArrayT<Group, MaxGroups> GroupArray; \/\/TODO: implement and use a dynamic array structure instead.\n \n struct Geometry\n {\n"} {"commit":"e61dc455232af9e55a680e8050310d7d089d45ea","subject":"God, this is the never-ending patch. Another USB joystick detection fix for MacOSX\/Darwin. --ryan.","message":"God, this is the never-ending patch. Another USB joystick detection fix for\n MacOSX\/Darwin. --ryan.\n\n\ngit-svn-id: 75429ccc2030f235ccf16e6b9b7f8e83d5edd22e@989 c70aab31-4412-0410-b14c-859654838e24\n","repos":"albertz\/sdl,albertz\/sdl,albertz\/sdl,albertz\/sdl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/joystick\/darwin\/SDL_sysjoystick.c\n+++ src\/joystick\/darwin\/SDL_sysjoystick.c\n@@ -646,9 +646,9 @@\n \/\/\t\t\tHIDReportErrorNum (\"IOObjectRelease error with ioHIDDeviceObject.\", result);\n \n \t\t\/* Filter device list to non-keyboard\/mouse stuff *\/ \n-\t\tif ( device->usagePage == kHIDPage_GenericDesktop &&\n-\t\t (device->usage != kHIDUsage_GD_Joystick &&\n-\t\t device->usage != kHIDUsage_GD_GamePad)) {\n+\t\tif ( (device->usagePage != kHIDPage_GenericDesktop) ||\n+\t\t ((device->usage != kHIDUsage_GD_Joystick &&\n+\t\t device->usage != kHIDUsage_GD_GamePad)) ) {\n \n \t\t\t\/* release memory for the device *\/\n \t\t\tHIDDisposeDevice (&device);\n"} {"commit":"aa56640260a009b1fed520c1e05ed300b7a37571","subject":"Shuffle things around a bit. Looks a little cleaner. -Erik","message":"Shuffle things around a bit. Looks a little cleaner.\n -Erik\n","repos":"gittup\/uClibc,gittup\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,hjl-tools\/uClibc,hwoarang\/uClibc,ndmsystems\/uClibc,groundwater\/uClibc,ffainelli\/uClibc,wbx-github\/uclibc-ng,OpenInkpot-archive\/iplinux-uclibc,ddcc\/klee-uclibc-0.9.33.2,kraj\/uclibc-ng,kraj\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,skristiansson\/uClibc-or1k,majek\/uclibc-vx32,ffainelli\/uClibc,waweber\/uclibc-clang,hjl-tools\/uClibc,ysat0\/uClibc,ffainelli\/uClibc,foss-xtensa\/uClibc,atgreen\/uClibc-moxie,brgl\/uclibc-ng,foss-xtensa\/uClibc,groundwater\/uClibc,ndmsystems\/uClibc,ndmsystems\/uClibc,groundwater\/uClibc,gittup\/uClibc,m-labs\/uclibc-lm32,kraj\/uClibc,ddcc\/klee-uclibc-0.9.33.2,hjl-tools\/uClibc,m-labs\/uclibc-lm32,OpenInkpot-archive\/iplinux-uclibc,kraj\/uClibc,ChickenRunjyd\/klee-uclibc,czankel\/xtensa-uclibc,gittup\/uClibc,ysat0\/uClibc,czankel\/xtensa-uclibc,mephi42\/uClibc,groundwater\/uClibc,ysat0\/uClibc,waweber\/uclibc-clang,hjl-tools\/uClibc,wbx-github\/uclibc-ng,wbx-github\/uclibc-ng,foss-xtensa\/uClibc,ndmsystems\/uClibc,hjl-tools\/uClibc,OpenInkpot-archive\/iplinux-uclibc,mephi42\/uClibc,mephi42\/uClibc,skristiansson\/uClibc-or1k,brgl\/uclibc-ng,ysat0\/uClibc,hwoarang\/uClibc,groundwater\/uClibc,klee\/klee-uclibc,ffainelli\/uClibc,hwoarang\/uClibc,ffainelli\/uClibc,atgreen\/uClibc-moxie,klee\/klee-uclibc,OpenInkpot-archive\/iplinux-uclibc,klee\/klee-uclibc,skristiansson\/uClibc-or1k,ddcc\/klee-uclibc-0.9.33.2,mephi42\/uClibc,majek\/uclibc-vx32,skristiansson\/uClibc-or1k,hwoarang\/uClibc,klee\/klee-uclibc,majek\/uclibc-vx32,waweber\/uclibc-clang,majek\/uclibc-vx32,waweber\/uclibc-clang,foss-xtensa\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,ChickenRunjyd\/klee-uclibc,ChickenRunjyd\/klee-uclibc,kraj\/uClibc,kraj\/uclibc-ng,brgl\/uclibc-ng,m-labs\/uclibc-lm32,foss-for-synopsys-dwc-arc-processors\/uClibc,ddcc\/klee-uclibc-0.9.33.2,ChickenRunjyd\/klee-uclibc,czankel\/xtensa-uclibc,wbx-github\/uclibc-ng,kraj\/uclibc-ng,brgl\/uclibc-ng,kraj\/uclibc-ng,atgreen\/uClibc-moxie,atgreen\/uClibc-moxie,czankel\/xtensa-uclibc,m-labs\/uclibc-lm32","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/misc\/internals\/__uClibc_main.c\n+++ libc\/misc\/internals\/__uClibc_main.c\n@@ -13,62 +13,25 @@\n \n #define\t_ERRNO_H\n #include <unistd.h>\n+#include <stdlib.h>\n \n-#if !defined HAVE_ELF\n-\/* This is a theoretical attempt to support old a.out compilers.\n- * Dunno if this will work properly and I really don't much\n- * care... Elf is the One True Path(tm). You will be assimilated *\/\n-# define __USE_WEAK_ALIASES\n-#endif\n \n \/*\n * Prototypes.\n *\/\n-extern int main(int argc, char **argv, char **envp);\n-#ifndef __USE_WEAK_ALIASES\n-#include <stdlib.h>\n-extern int weak_function atexit(void (*function)(void));\n+extern int main(int argc, char **argv, char **envp);\n extern void weak_function _init(void);\n extern void weak_function _fini(void);\n extern void weak_function _stdio_init(void);\n-extern void weak_function _stdio_term(void);\n extern int *weak_const_function __errno_location(void);\n extern int *weak_const_function __h_errno_location(void);\n+extern int weak_function atexit(void (*function)(void));\n #ifdef __UCLIBC_HAS_LOCALE__\n extern void weak_function _locale_init(void);\n #endif\n-#else\n-\/*\n- * Define an empty function and use it as a weak alias for the stdio\n- * initialization routine. That way we don't pull in all the stdio\n- * code unless we need to. Similarly, do the same for _stdio_term\n- * so as not to include atexit unnecessarily.\n- *\n- * NOTE!!! This is only true for the _static_ case!!!\n- *\/\n \n-weak_alias(__environ, environ);\n-void __uClibc_empty_func(void)\n-{\n-}\n-extern void exit (int status) __attribute__ ((__noreturn__));\n-extern void _init(void);\n-extern void _fini(void);\n-extern void _stdio_init(void);\n-weak_alias(__uClibc_empty_func, _init);\n-weak_alias(__uClibc_empty_func, _fini);\n-\/\/weak_alias(__uClibc_empty_func, _stdio_init);\n-\/\/weak_alias(__uClibc_empty_func, _stdio_term);\n-\/\/weak_alias(__uClibc_empty_func, atexit);\n-extern int atexit(void (*function)(void));\n-\/\/weak_alias(__uClibc_empty_func, __errno_location);\n-extern int *__errno_location(void);\n-\/\/weak_alias(__uClibc_empty_func, __h_errno_location);\n-extern int *__h_errno_location(void);\n-#ifdef __UCLIBC_HAS_LOCALE__\n-extern void _locale_init(void);\n-#endif\n-#endif\n+\n+\n \n \/*\n * Declare the __environ global variable and create a weak alias environ.\n@@ -80,16 +43,18 @@\n weak_alias(__environ, environ);\n \n \n-\/*\n- * Now for our main routine.\n- *\/\n+\n+\n void __attribute__ ((__noreturn__)) \n __uClibc_main(int argc, char **argv, char **envp) \n {\n-\t\/* \n-\t * Initialize the global variable __environ.\n-\t *\/\n-\t__environ = envp;\n+\t\/* If we are dynamically linked the shared lib loader\n+\t * already did this for us. But if we are statically\n+\t * linked, we need to do this for ourselves. *\/\n+\tif (__environ==NULL) {\n+\t\t\/* Statically linked. *\/ \n+\t\t__environ = envp;\n+\t}\n \n #if 0\n \t\/* Some security at this point. Prevent starting a SUID binary\n@@ -97,7 +62,7 @@\n \t * to do this only for statically linked applications since\n \t * otherwise the dynamic loader did the work already. *\/\n \tif (unlikely (__libc_enable_secure!=NULL))\n-\t __libc_check_standard_fds ();\n+\t\t__libc_check_standard_fds ();\n #endif\n \n #ifdef __UCLIBC_HAS_LOCALE__\n@@ -110,15 +75,16 @@\n \t * be bypassed if not needed because of the weak alias above.\n \t *\/\n \tif (likely(_stdio_init != NULL))\n-\t _stdio_init();\n+\t\t_stdio_init();\n \n \t\/* Arrange for dtors to run at exit. *\/\n \tif (unlikely(_fini!=NULL && atexit)) {\n-\t atexit (&_fini);\n+\t\tatexit (&_fini);\n \t}\n+\n \t\/* Run all ctors now. *\/\n \tif (unlikely(_init!=NULL))\n-\t _init();\n+\t\t_init();\n \n \t\/*\n \t * Note: It is possible that any initialization done above could\n@@ -126,15 +92,14 @@\n \t * we call main.\n \t *\/\n \tif (likely(__errno_location!=NULL))\n-\t *(__errno_location()) = 0;\n+\t\t*(__errno_location()) = 0;\n \n \t\/* Set h_errno to 0 as well *\/\n \tif (likely(__h_errno_location!=NULL))\n-\t *(__h_errno_location()) = 0;\n+\t\t*(__h_errno_location()) = 0;\n \n \t\/*\n \t * Finally, invoke application's main and then exit.\n \t *\/\n \texit(main(argc, argv, envp));\n }\n-\n"} {"commit":"c55cb0c0bcf04c7ad1f6f48d914850f516bd106c","subject":"syscall: Make common implementation match unistd.h","message":"syscall: Make common implementation match unistd.h\n\nThe definition of syscall() in unistd.h is with varargs. Traditionally\nthe common implementation in uclibc has been with regular arguments.\nThis patch updates that by using varargs.\n\nThis has caused issues on architectures like or1k which have different\ncalling conventions for varargs and regular arg parameters.\n\nThe implementation here is based on an implementation from Joel Stanley\n<joel@jms.id.au>. There is a difference that I do not initialize the\nstack args with 0 as they are immediately overwritten by va_args.\n\nSigned-off-by: Stafford Horne <799c89d5f62c643afb21c1a3622a07adef444e16@gmail.com>\n","repos":"wbx-github\/uclibc-ng,kraj\/uclibc-ng,kraj\/uclibc-ng,wbx-github\/uclibc-ng,kraj\/uclibc-ng,wbx-github\/uclibc-ng,kraj\/uclibc-ng,wbx-github\/uclibc-ng","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/common\/syscall.c\n+++ libc\/sysdeps\/linux\/common\/syscall.c\n@@ -4,9 +4,25 @@\n * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.\n *\/\n \n+#include <stdarg.h>\n #include <sys\/syscall.h>\n+#include <unistd.h>\n \n-long syscall(long sysnum, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6)\n+long syscall(long sysnum, ...)\n {\n+\n+\tunsigned long arg1, arg2, arg3, arg4, arg5, arg6;\n+\tva_list arg;\n+\n+\tva_start (arg, sysnum);\n+\targ1 = va_arg (arg, unsigned long);\n+\targ2 = va_arg (arg, unsigned long);\n+\targ3 = va_arg (arg, unsigned long);\n+\targ4 = va_arg (arg, unsigned long);\n+\targ5 = va_arg (arg, unsigned long);\n+\targ6 = va_arg (arg, unsigned long);\n+\tva_end (arg);\n+\n+ __asm__ volatile ( \"\" ::: \"memory\" );\n \treturn INLINE_SYSCALL_NCS(sysnum, 6, arg1, arg2, arg3, arg4, arg5, arg6);\n }\n"} {"commit":"67880e3a512d2186e237d048a2ade3c2f4aa82a6","subject":"Add proper GLSL constructors to some vec types","message":"Add proper GLSL constructors to some vec types\n","repos":"rswinkle\/opengl_reference,rswinkle\/opengl_reference,rswinkle\/opengl_reference","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/glcommon\/rsw_math.h\n+++ src\/glcommon\/rsw_math.h\n@@ -740,7 +740,9 @@\n \t\tint pts[2];\n \t};\n \n-\tivec2(int x=0, int y=0) : x(x), y(y) {}\n+\tivec2() : x(), y() {}\n+\tivec2(int a) : x(a), y(a) {}\n+\tivec2(int x, int y) : x(x), y(y) {}\n \n \n \tivec2& operator+=(ivec2 a) { x += a.x; y += a.y; return *this; }\n@@ -772,7 +774,11 @@\n \t\tint pts[3];\n \t};\n \n-\tivec3(int x=0, int y=0, int z=0) : x(x), y(y), z(z) {}\n+\tivec3() : x(), y(), z() {}\n+\tivec3(int a) : x(a), y(a), z(a) {}\n+\tivec3(int x, int y, int z) : x(x), y(y), z(z) {}\n+\tivec3(ivec2 a, int z) : x(a.x), y(a.y), z(z) {}\n+\tivec3(int x, ivec2 a) : x(x), y(a.x), z(a.y) {}\n \n \n \tivec3& operator+=(ivec3 a) { x += a.x; y += a.y; z += a.z; return *this; }\n@@ -801,7 +807,13 @@\n \t\tint pts[4];\n \t};\n \n-\tivec4(int x=0, int y=0, int z=0, int w=1) : x(x), y(y), z(z), w(w) {}\n+\tivec4() : x(), y(), z(), w() {}\n+\tivec4(int a) : x(a), y(a), z(a), w(a) {}\n+\tivec4(int x, int y, int z, int w) : x(x), y(y), z(z), w(w) {}\n+\tivec4(ivec3 a, int w) : x(a.x), y(a.y), z(a.z), w(w) {}\n+\tivec4(ivec2 a, int z, int w) : x(a.x), y(a.y), z(z), w(w) {}\n+\tivec4(ivec2 a, ivec2 b) : x(a.x), y(a.y), z(b.x), w(b.y) {}\n+\tivec4(int x, int y, ivec2 b) : x(x), y(y), z(b.x), w(b.y) {}\n \n \n \tivec4& operator+=(ivec4 a) { x += a.x; y += a.y; z += a.z; w += a.w; return *this; }\n"} {"commit":"777e9d330ae950e5cc89f757317fde4e96762363","subject":"log-window: sort \"Who\" list store alphabetically","message":"log-window: sort \"Who\" list store alphabetically\n\nCurrently \"Who\"-list is sorted with \"g_strcmp0 (name)\" which\nis not what we want (e.g. \"Chris\" becomes before \"bob\" because of\nthe initial capital letter).\n\nStart sorting using g_utf8_collate_key().\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=658336\n","repos":"GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-log-window.c\n+++ libempathy-gtk\/empathy-log-window.c\n@@ -182,6 +182,7 @@\n COL_WHO_TYPE,\n COL_WHO_ICON,\n COL_WHO_NAME,\n+ COL_WHO_NAME_SORT_KEY,\n COL_WHO_ID,\n COL_WHO_ACCOUNT,\n COL_WHO_TARGET,\n@@ -1864,22 +1865,29 @@\n {\n TplEntityType type = tpl_entity_get_entity_type (hit->target);\n EmpathyContact *contact;\n+ const gchar *name;\n+ gchar *sort_key;\n gboolean room = type == TPL_ENTITY_ROOM;\n \n contact = empathy_contact_from_tpl_contact (hit->account,\n hit->target);\n+\n+ name = empathy_contact_get_alias (contact);\n+ sort_key = g_utf8_collate_key (name, -1);\n \n gtk_list_store_append (store, &iter);\n gtk_list_store_set (store, &iter,\n COL_WHO_TYPE, COL_TYPE_NORMAL,\n COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE\n : EMPATHY_IMAGE_AVATAR_DEFAULT,\n- COL_WHO_NAME, empathy_contact_get_alias (contact),\n+ COL_WHO_NAME, name,\n+ COL_WHO_NAME_SORT_KEY, sort_key,\n COL_WHO_ID, tpl_entity_get_identifier (hit->target),\n COL_WHO_ACCOUNT, hit->account,\n COL_WHO_TARGET, hit->target,\n -1);\n \n+ g_free (sort_key);\n g_object_unref (contact);\n }\n }\n@@ -2282,21 +2290,28 @@\n TplEntity *entity = TPL_ENTITY (l->data);\n TplEntityType type = tpl_entity_get_entity_type (entity);\n EmpathyContact *contact;\n+ const gchar *name;\n+ gchar *sort_key;\n gboolean room = type == TPL_ENTITY_ROOM;\n \n contact = empathy_contact_from_tpl_contact (ctx->account, entity);\n+\n+ name = empathy_contact_get_alias (contact);\n+ sort_key = g_utf8_collate_key (name, -1);\n \n gtk_list_store_append (store, &iter);\n gtk_list_store_set (store, &iter,\n COL_WHO_TYPE, COL_TYPE_NORMAL,\n COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE\n : EMPATHY_IMAGE_AVATAR_DEFAULT,\n- COL_WHO_NAME, empathy_contact_get_alias (contact),\n+ COL_WHO_NAME, name,\n+ COL_WHO_NAME_SORT_KEY, sort_key,\n COL_WHO_ID, tpl_entity_get_identifier (entity),\n COL_WHO_ACCOUNT, ctx->account,\n COL_WHO_TARGET, entity,\n -1);\n \n+ g_free (sort_key);\n g_object_unref (contact);\n \n if (ctx->self->priv->selected_account != NULL &&\n@@ -2448,23 +2463,23 @@\n }\n \n static gint\n-sort_by_name (GtkTreeModel *model,\n+sort_by_name_key (GtkTreeModel *model,\n GtkTreeIter *a,\n GtkTreeIter *b,\n gpointer user_data)\n {\n- gchar *name1, *name2;\n+ gchar *key1, *key2;\n gint type1, type2;\n gint ret;\n \n gtk_tree_model_get (model, a,\n COL_WHO_TYPE, &type1,\n- COL_WHO_NAME, &name1,\n+ COL_WHO_NAME_SORT_KEY, &key1,\n -1);\n \n gtk_tree_model_get (model, b,\n COL_WHO_TYPE, &type2,\n- COL_WHO_NAME, &name2,\n+ COL_WHO_NAME_SORT_KEY, &key2,\n -1);\n \n if (type1 == COL_TYPE_ANY)\n@@ -2476,10 +2491,10 @@\n else if (type2 == COL_TYPE_SEPARATOR)\n ret = 1;\n else\n- ret = g_strcmp0 (name1, name2);\n-\n- g_free (name1);\n- g_free (name2);\n+ ret = g_strcmp0 (key1, key2);\n+\n+ g_free (key1);\n+ g_free (key2);\n \n return ret;\n }\n@@ -2626,6 +2641,7 @@\n G_TYPE_INT, \/* type *\/\n G_TYPE_STRING, \/* icon *\/\n G_TYPE_STRING, \/* name *\/\n+ G_TYPE_STRING, \/* name sort key *\/\n G_TYPE_STRING, \/* id *\/\n TP_TYPE_ACCOUNT, \/* account *\/\n TPL_TYPE_ENTITY); \/* target *\/\n@@ -2660,10 +2676,10 @@\n NULL, NULL);\n \n gtk_tree_sortable_set_sort_column_id (sortable,\n- COL_WHO_NAME,\n+ COL_WHO_NAME_SORT_KEY,\n GTK_SORT_ASCENDING);\n gtk_tree_sortable_set_sort_func (sortable,\n- COL_WHO_NAME, sort_by_name,\n+ COL_WHO_NAME_SORT_KEY, sort_by_name_key,\n NULL, NULL);\n \n gtk_tree_view_set_search_column (view, COL_WHO_NAME);\n"} {"commit":"b18ebc2f84c6ef88733eaf538e00fe9200c1b2c3","subject":"mailbox_update() wasn't updating cache fields correctly.","message":"mailbox_update() wasn't updating cache fields correctly.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/index-storage.c\n+++ src\/lib-storage\/index\/index-storage.c\n@@ -562,7 +562,7 @@\n \t\t\t\tbreak;\n \t\t}\n \t\tif (j != old_count) {\n-\t\t\tfield = old_fields[i];\n+\t\t\tfield = old_fields[j];\n \t\t\tif (field.decision == MAIL_CACHE_DECISION_NO)\n \t\t\t\tfield.decision = MAIL_CACHE_DECISION_TEMP;\n \t\t\tarray_append(&new_fields, &field, 1);\n"} {"commit":"20941452d76810e181d91510168a7204c986edbd","subject":"added checkbox callback","message":"added checkbox callback\n","repos":"Distrotech\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-search-bar.c\n+++ libempathy-gtk\/empathy-search-bar.c\n@@ -215,6 +215,13 @@\n }\n \n static void\n+empathy_search_bar_match_case_toggled (GtkButton *button,\n+ gpointer user_data)\n+{\n+ empathy_search_bar_search (EMPATHY_SEARCH_BAR (user_data), TRUE, FALSE);\n+}\n+\n+static void\n empathy_search_bar_init (EmpathySearchBar * self)\n {\n gchar *filename;\n@@ -245,6 +252,7 @@\n \"search_entry\", \"changed\", empathy_search_bar_entry_changed,\n \"search_previous\", \"clicked\", empathy_search_bar_previous_cb,\n \"search_next\", \"clicked\", empathy_search_bar_next_cb,\n+ \"search_match_case\", \"toggled\", empathy_search_bar_match_case_toggled,\n NULL);\n \n gtk_container_add (GTK_CONTAINER (self), internal);\n"} {"commit":"7d98e9c6638d8cdafec86b73d6fd75b954a59736","subject":"Compiling fix.","message":"Compiling fix.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/index-storage.c\n+++ src\/lib-storage\/index\/index-storage.c\n@@ -4,6 +4,7 @@\n #include \"array.h\"\n #include \"istream.h\"\n #include \"ioloop.h\"\n+#include \"str.h\"\n #include \"imap-parser.h\"\n #include \"mkdir-parents.h\"\n #include \"mail-index-private.h\"\n"} {"commit":"c3eb5ce5e5c98bfbd6e190b2b1b7eac11d1d160d","subject":"libempathy-gtk: In TLS Dialog allow remembering of any exception.","message":"libempathy-gtk: In TLS Dialog allow remembering of any exception.\n\nPreviously we couldn't do this because we had nowhere to store these\nexceptions. But now this is possible because we're storing them as trust\nassertions.\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=639417\n","repos":"GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-tls-dialog.c\n+++ libempathy-gtk\/empathy-tls-dialog.c\n@@ -293,21 +293,12 @@\n \n content_area = gtk_dialog_get_content_area (dialog);\n \n- \/* FIXME: right now we do this only if the error is SelfSigned, as we can\n- * easily store the new CA cert in $XDG_CONFIG_DIR\/telepathy\/certs in that\n- * case. For the other errors, we probably need a smarter\/more powerful\n- * certificate storage.\n- *\/\n- if (priv->reason == EMP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED)\n- {\n- checkbox = gtk_check_button_new_with_label (\n- _(\"Remember this choice for future connections\"));\n- gtk_box_pack_end (GTK_BOX (content_area), checkbox, FALSE, FALSE, 0);\n- gtk_widget_show (checkbox);\n-\n- g_signal_connect (checkbox, \"toggled\",\n- G_CALLBACK (checkbox_toggled_cb), self);\n- }\n+ checkbox = gtk_check_button_new_with_label (\n+ _(\"Remember this choice for future connections\"));\n+ gtk_box_pack_end (GTK_BOX (content_area), checkbox, FALSE, FALSE, 0);\n+ gtk_widget_show (checkbox);\n+ g_signal_connect (checkbox, \"toggled\", G_CALLBACK (checkbox_toggled_cb),\n+ self);\n \n text = g_strdup_printf (\"<b>%s<\/b>\", _(\"Certificate Details\"));\n expander = gtk_expander_new (text);\n"} {"commit":"a842e5e9a9066c86b3d1ba9fcb43780b0fce4c1e","subject":"And removed accidentally committed nbsp.","message":"And removed accidentally committed nbsp.\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/mailbox-uidvalidity.c\n+++ src\/lib-storage\/mailbox-uidvalidity.c\n@@ -221,7 +221,7 @@\n \t}\n \n \t\/* we now have the current uidvalidity value that's hopefully correct *\/\n-\tif (mailbox_uidvalidity_rename(path, &cur_value, FALSE) < 0){\n+\tif (mailbox_uidvalidity_rename(path, &cur_value, FALSE) < 0) {\n \t\ti_close_fd(&fd);\n \t\treturn mailbox_uidvalidity_next_rescan(list, path);\n \t}\n"} {"commit":"d10ab98068fc26d283d01f716bf7317c881daffa","subject":"Added constructors","message":"Added constructors\n","repos":"joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libhoomd\/data_structures\/WallData.h\n+++ libhoomd\/data_structures\/WallData.h\n@@ -63,9 +63,45 @@\n #include <boost\/python.hpp>\n #include <string.h>\n \n+\n+struct Wall\n+ {\n+ \/\/! Constructor\n+ \/*! \\param ox Origin x-component\n+ \\param oy Origin y-component\n+ \\param oz Origin z-component\n+ \\param nx Origin x-component\n+ \\param ny Normal y-component\n+ \\param nz Normal z-component\n+ *\/\n+ Wall(Scalar ox=0.0, Scalar oy=0.0, Scalar oz=0.0, Scalar nx=1.0, Scalar ny=0.0, Scalar nz=0.0)\n+ : origin_x(ox), origin_y(oy), origin_z(oz)\n+ {\n+ \/\/ normalize nx,ny,nz\n+ Scalar len = sqrt(nx*nx + ny*ny + nz*nz);\n+ normal_x = nx \/ len;\n+ normal_y = ny \/ len;\n+ normal_z = nz \/ len;\n+ }\n+\n+ Scalar origin_x; \/\/!< x-component of the origin\n+ Scalar origin_y; \/\/!< y-component of the origin\n+ Scalar origin_z; \/\/!< z-component of the origin\n+\n+ Scalar normal_x; \/\/!< x-component of the normal\n+ Scalar normal_y; \/\/!< y-component of the normal\n+ Scalar normal_z; \/\/!< z-component of the normal\n+ };\n+\n+\n struct SphereWall\n {\n- SphereWall() {}\n+ SphereWall()\n+ {\n+ Scalar r = 0.0;\n+ vec3<Scalar> origin = vec3(0.0,0.0,0.0);\n+ bool inside = true;\n+ }\n SphereWall(Scalar r, vec3<Scalar> orig, bool ins = true) : inside(ins), origin(orig) {}\n Scalar r;\n bool inside;\n@@ -74,7 +110,14 @@\n \n struct CylinderWall\n {\n- CylinderWall() {}\n+ CylinderWall()\n+ {\n+ Scalar r = 0.0;\n+ vec3<Scalar> origin = vec3(0.0,0.0,0.0);\n+ vec3<Scalar> orientation = vec3(1.0,0.0,0.0);\n+ quat<Scalar> q_reorientation =quat(1.0,0.0,0.0,0.0);\n+ bool inside = true;\n+ }\n CylinderWall(Scalar r, vec3<Scalar> orig, vec3<Scalar> zorient, bool ins=true) : inside(ins), origin(orig), orientation(zorient)\n {\n vec3<Scalar> zvec;\n@@ -110,7 +153,12 @@\n \n struct PlaneWall\n {\n- PlaneWall() {}\n+ PlaneWall()\n+ {\n+ vec3<Scalar> origin = vec3(0.0,0.0,0.0);\n+ vec3<Scalar> normal = vec3(1.0,0.0,0.0);\n+ bool inside = true;\n+ }\n PlaneWall(vec3<Scalar> nvec, vec3<Scalar> pt) : normal(nvec), origin(pt), inside(true)\n {\n Scalar n_length;\n"} {"commit":"65c02c286a34c75112549566615d4484d4378590","subject":"Check sheet set for invalid accounts on set-acl before writing to disk","message":"Check sheet set for invalid accounts on set-acl before writing to disk\n","repos":"gobby\/libinfinity,gobby\/libinfinity,tyll\/libinfinity,tyll\/libinfinity,tyll\/libinfinity,gobby\/libinfinity","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libinfinity\/server\/infd-directory.c\n+++ libinfinity\/server\/infd-directory.c\n@@ -5053,6 +5053,77 @@\n *\/\n \n static gboolean\n+infd_directory_verify_sheet_set(InfdDirectory* directory,\n+ const InfAclSheetSet* sheet_set,\n+ GError** error)\n+{\n+ InfAclSheetSet* changed_sheets;\n+ InfAclSheetSet* copy;\n+\n+ \/* TODO: infd_directory_verify_acl() should be able to operate such that\n+ * it leaves the passed-in sheet set unmodified, and so that it just\n+ * returns TRUE or FALSE depending on whether changes are needed. *\/\n+ copy = inf_acl_sheet_set_copy(sheet_set);\n+\n+ changed_sheets = infd_directory_verify_acl(\n+ directory,\n+ copy,\n+ NULL,\n+ TRUE,\n+ TRUE\n+ );\n+\n+ inf_acl_sheet_set_free(copy);\n+\n+ if(changed_sheets != NULL)\n+ {\n+ g_assert(changed_sheets->n_sheets > 0);\n+\n+ g_set_error(\n+ error,\n+ inf_directory_error_quark(),\n+ INF_DIRECTORY_ERROR_NO_SUCH_ACCOUNT,\n+ \"There is no such account with ID \\\"%s\\\"\",\n+ inf_acl_account_id_to_string(changed_sheets->sheets[0].account)\n+ );\n+\n+ inf_acl_sheet_set_free(changed_sheets);\n+ return FALSE;\n+ }\n+\n+ return TRUE;\n+}\n+\n+static InfAclSheetSet*\n+infd_directory_sheet_set_from_xml(InfdDirectory* directory,\n+ xmlNodePtr xml,\n+ GError** error)\n+{\n+ InfAclSheetSet* sheet_set;\n+ GError* local_error;\n+\n+ local_error = NULL;\n+ sheet_set = inf_acl_sheet_set_from_xml(xml, &local_error);\n+\n+ if(local_error != NULL)\n+ {\n+ g_propagate_error(error, local_error);\n+ return NULL;\n+ }\n+\n+ if(sheet_set != NULL)\n+ {\n+ if(infd_directory_verify_sheet_set(directory, sheet_set, error) != TRUE)\n+ {\n+ inf_acl_sheet_set_free(sheet_set);\n+ return NULL;\n+ }\n+ }\n+\n+ return sheet_set;\n+}\n+\n+static gboolean\n infd_directory_check_auth(InfdDirectory* directory,\n InfdDirectoryNode* node,\n InfXmlConnection* connection,\n@@ -5609,7 +5680,7 @@\n return FALSE;\n \n local_error = NULL;\n- sheet_set = inf_acl_sheet_set_from_xml(xml, &local_error);\n+ sheet_set = infd_directory_sheet_set_from_xml(directory, xml, &local_error);\n \n if(local_error != NULL)\n {\n@@ -6913,7 +6984,7 @@\n \n \/* TODO: Introduce inf_acl_sheet_set_from_xml_required *\/\n local_error = NULL;\n- sheet_set = inf_acl_sheet_set_from_xml(xml, &local_error);\n+ sheet_set = infd_directory_sheet_set_from_xml(directory, xml, &local_error);\n \n if(local_error != NULL)\n {\n@@ -10293,6 +10364,15 @@\n \n inf_browser_begin_request(browser, iter, INF_REQUEST(request));\n \n+ error = NULL;\n+ if(infd_directory_verify_sheet_set(directory, sheet_set, &error) != TRUE)\n+ {\n+ inf_request_fail(INF_REQUEST(request), error);\n+ g_object_unref(request);\n+ g_error_free(error);\n+ return NULL;\n+ }\n+\n \/* Make sure the CAN_CREATE_ACCOUNT permission cannot be activated when\n * we cannot support it. *\/\n if(node == priv->root)\n@@ -10302,8 +10382,6 @@\n \n if(infd_directory_report_support_in_sheets(directory, copy_set) == FALSE)\n {\n- error = NULL;\n-\n g_set_error_literal(\n &error,\n inf_directory_error_quark(),\n"} {"commit":"8037572ec38de61d171a17961e0fa918ef777c0f","subject":"mainloop: Improve documentation","message":"mainloop: Improve documentation\n\nSigned-off-by: Murilo Belluzzo <cf5d1b369b78f9fdf81b356422467e1122a8244c@intel.com>\n","repos":"brunobottazzini\/soletta,ibriano\/soletta,otaviobp\/soletta,wzhen12\/soletta,zolkis\/soletta,bdilly\/soletta,ibriano\/soletta,wanghongjuan\/soletta,zolkis\/soletta,gabrielschulhof\/soletta,thiagomacieira\/soletta,cmarcelo\/soletta,cmarcelo\/soletta,cmarcelo\/soletta,brunobottazzini\/soletta,dorileo\/soletta,nagineni\/soletta,edersondisouza\/soletta,thiagomacieira\/soletta,bsmelo\/soletta,tripzero\/soletta,bdilly\/soletta,dorileo\/soletta,bdilly\/soletta,ibriano\/soletta,dorileo\/soletta,cmarcelo\/soletta,brunobottazzini\/soletta,ibriano\/soletta,zolkis\/soletta,wanghongjuan\/soletta,otaviobp\/soletta,otaviobp\/soletta,dorileo\/soletta,wanghongjuan\/soletta,lpereira\/soletta,brunobottazzini\/soletta,ibriano\/soletta,nagineni\/soletta,tripzero\/soletta,barbieri\/soletta,wzhen12\/soletta,zolkis\/soletta,otaviobp\/soletta,ibriano\/soletta,lpereira\/soletta,otaviobp\/soletta,gabrielschulhof\/soletta,bsmelo\/soletta,nagineni\/soletta,wzhen12\/soletta,bsmelo\/soletta,gabrielschulhof\/soletta,barbieri\/soletta,bsmelo\/soletta,tripzero\/soletta,edersondisouza\/soletta,bdilly\/soletta,edersondisouza\/soletta,otaviobp\/soletta,tripzero\/soletta,barbieri\/soletta,edersondisouza\/soletta,cabelitos\/soletta,barbieri\/soletta,brunobottazzini\/soletta,gabrielschulhof\/soletta,zolkis\/soletta,thiagomacieira\/soletta,wzhen12\/soletta,lpereira\/soletta,cabelitos\/soletta,edersondisouza\/soletta,thiagomacieira\/soletta,lpereira\/soletta,gabrielschulhof\/soletta,wanghongjuan\/soletta,tripzero\/soletta,bsmelo\/soletta,barbieri\/soletta,wzhen12\/soletta,cabelitos\/soletta,lpereira\/soletta,thiagomacieira\/soletta,cmarcelo\/soletta,wanghongjuan\/soletta,nagineni\/soletta,barbieri\/soletta,gabrielschulhof\/soletta,cabelitos\/soletta,dorileo\/soletta,edersondisouza\/soletta,bdilly\/soletta,wanghongjuan\/soletta,nagineni\/soletta,cabelitos\/soletta,wzhen12\/soletta,tripzero\/soletta,cmarcelo\/soletta,cabelitos\/soletta,bsmelo\/soletta,thiagomacieira\/soletta,brunobottazzini\/soletta,dorileo\/soletta","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lib\/common\/include\/sol-mainloop.h\n+++ src\/lib\/common\/include\/sol-mainloop.h\n@@ -120,71 +120,101 @@\n * @{\n *\/\n \n+\/**\n+ * @brief Initializes the Soletta library.\n+ *\n+ * This function setup all needed infrastructure. It should be called prior\n+ * the use of any Soletta API.\n+ *\n+ * @return @c 0 on success, error code (always negative) otherwise\n+ *\n+ * @see sol_shutdown()\n+ *\/\n int sol_init(void);\n \n \/**\n- * Runs the main loop.\n+ * @brief Runs the main loop.\n *\n * This function executes the main loop and it will return only after\n- * sol_quit() or sol_quit_with_code() is called. The return value is the\n- * return code passed to sol_quit_with_code().\n+ * sol_quit() or sol_quit_with_code() is called.\n *\n * @return The value passed to sol_quit_with_code(), or EXIT_SUCCESS if\n- * terminated by sol_quit().\n+ * terminated by sol_quit()\n *\/\n int sol_run(void);\n \n \/**\n- * Terminates the main loop.\n+ * @brief Terminates the main loop.\n *\n * Stops the main loop and sets the return value of sol_run() to EXIT_SUCCESS.\n *\/\n void sol_quit(void);\n \n \/**\n- * Terminates the main loop, setting a specific return code.\n+ * @brief Terminates the main loop, setting a specific return code.\n *\n * Stops the main loop and sets the return value of sol_run() to @a return_code.\n * Usually used to indicate that the application should end with an error.\n *\n- * @param return_code The exit code that sol_run() will return.\n+ * @param return_code The exit code that @ref sol_run() will return\n *\/\n void sol_quit_with_code(int return_code);\n+\n+\/**\n+ * @brief Shutdown Soletta library.\n+ *\n+ * This function shuts down Soletta and once it's called, no other Soletta\n+ * API should be used.\n+ *\n+ * @see sol_init()\n+ *\/\n void sol_shutdown(void);\n \n+\/**\n+ * @struct sol_timeout\n+ *\n+ * @brief Handle for timers tracking the timeouts.\n+ *\/\n struct sol_timeout;\n \n \/**\n- * Adds a function to be called periodically by the main loop.\n+ * @brief Adds a function to be called periodically by the main loop.\n *\n * Timeouts are called by the main loop every @a timeout_ms milliseconds for\n * as long as the given function @a cb returns true.\n *\n- * @param timeout_ms The period in milliseconds in which the function will be called.\n- * @param cb The function to call, it will be called every @p timeout_ms until it returns false.\n- * @param data The user data pointer to pass to the function.\n- *\n- * @return A handle that can be used to delete the timeout.\n+ * @param timeout_ms The period in milliseconds in which the function will be called\n+ * @param cb The function to call, it will be called every @p timeout_ms until it returns false\n+ * @param data The user data pointer to pass to the function\n+ *\n+ * @return A handle that can be used to delete the timeout\n *\/\n struct sol_timeout *sol_timeout_add(uint32_t timeout_ms, bool (*cb)(void *data), const void *data);\n \n \/**\n- * Deletes the given timeout.\n+ * @brief Deletes the given timeout.\n *\n * If it's necessary to keep a created timeout from being called, this function\n * can delete it.\n *\n- * @param handle The timeout to delete.\n+ * @param handle The timeout to delete\n *\n * @return True if the timeout was deleted, false if the handle is invalid or\n- * if it had been marked as removed already.\n+ * if it had been marked as removed already\n *\/\n bool sol_timeout_del(struct sol_timeout *handle);\n \n+\/**\n+ * @struct sol_idle\n+ *\n+ * @brief Handle for idlers.\n+ *\n+ * This structure is used to help setup and control Idlers.\n+ *\/\n struct sol_idle;\n \n \/**\n- * Adds a function to be called when the application goes idle.\n+ * @brief Adds a function to be called when the application goes idle.\n *\n * Idlers are called when the main loop reaches the idle state. That is, after\n * all pending events have been processed and no timeout has expired. This means\n@@ -193,26 +223,26 @@\n * removed, otherwise they will kept to be called until some other event becomes\n * available.\n *\n- * @param cb The function to call when the idle state is reached.\n- * @param data The user data pointer to pass to the function.\n- *\n- * @return A handle that can be used to delete the idler.\n+ * @param cb The function to call when the idle state is reached\n+ * @param data The user data pointer to pass to the function\n+ *\n+ * @return A handle that can be used to delete the idler\n *\/\n struct sol_idle *sol_idle_add(bool (*cb)(void *data), const void *data);\n \n \/**\n- * Deletes the given idler.\n- *\n- * @param handle The idler to delete.\n+ * @brief Deletes the given idler.\n+ *\n+ * @param handle The idler to delete\n *\n * @return True if the idler was deleted, false if the handle is invalid or\n- * if it had been marked as removed already.\n+ * if it had been marked as removed already\n *\/\n bool sol_idle_del(struct sol_idle *handle);\n \n #ifdef SOL_MAINLOOP_FD_ENABLED\n \/**\n- * Flags to be used with file descriptor watchers.\n+ * @brief Flags to be used with file descriptor watchers.\n *\n * When passed to sol_fd_add() or sol_fd_set_flags(), these are the events\n * the user is interested in.\n@@ -222,31 +252,31 @@\n enum sol_fd_flags {\n SOL_FD_FLAGS_NONE = 0,\n \/**\n- * Non-high priority data available to read from the file descriptor.\n+ * @brief Non-high priority data available to read from the file descriptor.\n *\/\n SOL_FD_FLAGS_IN = (1 << 0),\n \/**\n- * File descriptor available for writing.\n+ * @brief File descriptor available for writing.\n *\/\n SOL_FD_FLAGS_OUT = (1 << 1),\n \/**\n- * High priority data available to read from the file descriptor.\n+ * @brief High priority data available to read from the file descriptor.\n *\/\n SOL_FD_FLAGS_PRI = (1 << 2),\n \/**\n- * An error occurred on the file descriptor.\n+ * @brief An error occurred on the file descriptor.\n *\n * @note Only valid in the @c active_flags of the callback function.\n *\/\n SOL_FD_FLAGS_ERR = (1 << 3),\n \/**\n- * All the writing ends of the file descriptor were closed.\n+ * @brief All the writing ends of the file descriptor were closed.\n *\n * @note Only valid in the @c active_flags of the callback function.\n *\/\n SOL_FD_FLAGS_HUP = (1 << 4),\n \/**\n- * The file descriptor is invalid.\n+ * @brief The file descriptor is invalid.\n *\n * @note Only valid in the @c active_flags of the callback function.\n *\/\n@@ -256,100 +286,109 @@\n struct sol_fd;\n \n \/**\n- * Adds a function to be called when the requested events are triggered by the\n+ * @brief Adds a function to be called when the requested events are triggered by the\n * given file descriptor.\n *\n- * @param fd The file descriptor to watch events for.\n- * @param flags Bitwise ORed set of flags from #sol_fd_flags that are of interest.\n- * @param cb The function to call on events.\n- * @param data The user data pointer to pass to the function.\n- *\n- * @return A handle that can be used to delete the file descriptor watcher.\n+ * @param fd The file descriptor to watch events for\n+ * @param flags Bitwise ORed set of flags from #sol_fd_flags that are of interest\n+ * @param cb The function to call on events\n+ * @param data The user data pointer to pass to the function\n+ *\n+ * @return A handle that can be used to delete the file descriptor watcher\n *\/\n struct sol_fd *sol_fd_add(int fd, uint32_t flags, bool (*cb)(void *data, int fd, uint32_t active_flags), const void *data);\n \n \/**\n- * Deletes the given file descriptor watcher.\n- *\n- * @param handle The handle to delete.\n- *\n- * @return True if the handle was deleted, false it is invalid or already marked as removed.\n+ * @brief Deletes the given file descriptor watcher.\n+ *\n+ * @param handle The handle to delete\n+ *\n+ * @return True if the handle was deleted, false it is invalid or already marked as removed\n *\/\n bool sol_fd_del(struct sol_fd *handle);\n \n \/**\n- * Sets the flags to watch for on the given file descriptor.\n- *\n- * @param handle The handle to update.\n- * @param flags The new set of flags to watch for.\n- *\n- * @return True on success, false if the handle is invalid.\n+ * @brief Sets the flags to watch for on the given file descriptor.\n+ *\n+ * @param handle The handle to update\n+ * @param flags The new set of flags to watch for\n+ *\n+ * @return True on success, false if the handle is invalid\n *\/\n bool sol_fd_set_flags(struct sol_fd *handle, uint32_t flags);\n \n \/**\n- * Removes the given flags from those being watched.\n- *\n- * @param handle The handle to update.\n- * @param flags The flags to remove from the set the handle is watching.\n- *\n- * @return True on success, false if the handle is invalid.\n+ * @brief Removes the given flags from those being watched.\n+ *\n+ * @param handle The handle to update\n+ * @param flags The flags to remove from the set the handle is watching\n+ *\n+ * @return True on success, false if the handle is invalid\n *\/\n bool sol_fd_unset_flags(struct sol_fd *handle, uint32_t flags);\n \n \/**\n- * Gets the flags being watched for the given handle.\n- *\n- * @param handle The handle to get the flags for.\n- *\n- * @return The flags that are currently being watched for by the handle.\n+ * @brief Gets the flags being watched for the given handle.\n+ *\n+ * @param handle The handle to get the flags for\n+ *\n+ * @return The flags that are currently being watched for by the handle\n *\/\n uint32_t sol_fd_get_flags(const struct sol_fd *handle);\n #endif\n \n #ifdef SOL_MAINLOOP_FORK_WATCH_ENABLED\n+\n+\/**\n+ * @brief Handle for child process.\n+ *\n+ * This structure is used to setup and control children process.\n+ *\/\n struct sol_child_watch;\n \n \/**\n- * Watch for a child process' termination.\n+ * @brief Watch for a child process' termination.\n *\n * When launching children processes, applications can watch for their\n * termination and retrieve their exit status by adding watcher with this function.\n * The @a status parameter received by the callback function is the exit code\n * given by the child.\n *\n- * @param pid The pid of the process to watch for.\n- * @param cb The function that will be called.\n- * @param data The user data pointer to pass to the function.\n- *\n- * @return A handler that can be used to delete the watcher.\n+ * @param pid The pid of the process to watch for\n+ * @param cb The function that will be called\n+ * @param data The user data pointer to pass to the function\n+ *\n+ * @return A handler that can be used to delete the watcher\n *\/\n struct sol_child_watch *sol_child_watch_add(uint64_t pid, void (*cb)(void *data, uint64_t pid, int status), const void *data);\n \n \/**\n- * Delete the given child process watcher.\n+ * @brief Delete the given child process watcher.\n *\n * This function removes the watcher only, the child process will continue to\n * run normally, and no notification will be received by the parent when it\n * terminates unless a new watcher is put in place.\n *\n- * @param handle The handle to remove.\n- *\n- * @return True on success, false if the handle is invalid or it was already marked as removed.\n+ * @param handle The handle to remove\n+ *\n+ * @return True on success, false if the handle is invalid or it was already marked as removed\n *\/\n bool sol_child_watch_del(struct sol_child_watch *handle);\n #endif\n \n+\/**\n+ * @brief Structure representing the type of a source of mainloop events.\n+ *\/\n struct sol_mainloop_source_type {\n #ifndef SOL_NO_API_VERSION\n-#define SOL_MAINLOOP_SOURCE_TYPE_API_VERSION (1) \/**< compile time API version to be checked during runtime *\/\n- \/**\n- * must match #SOL_MAINLOOP_SOURCE_TYPE_API_VERSION at runtime.\n+#define SOL_MAINLOOP_SOURCE_TYPE_API_VERSION (1) \/**< @brief Compile time API version to be checked during runtime *\/\n+ \/**\n+ * @brief must match #SOL_MAINLOOP_SOURCE_TYPE_API_VERSION at runtime.\n *\/\n uint16_t api_version;\n #endif\n \/**\n- * Function to be called to prepare to check for events.\n+ * @brief Function to be called to prepare to check for events.\n *\n * This function will be called before Soletta's main loop query\n * for its own events. In Linux\/POSIX, it will be called before\n@@ -373,7 +412,7 @@\n bool (*prepare)(void *data);\n \n \/**\n- * Function to be called to query the next timeout for the next\n+ * @brief Function to be called to query the next timeout for the next\n * event in this source.\n *\n * If returns @c true, then @c timeout must be set to the next\n@@ -397,7 +436,7 @@\n bool (*get_next_timeout)(void *data, struct timespec *timeout);\n \n \/**\n- * Function to be called to check if there are events to be dispatched.\n+ * @brief Function to be called to check if there are events to be dispatched.\n *\n * If returns @c true, then there are events to be dispatched and\n * @c dispatch() should be called.\n@@ -412,7 +451,7 @@\n bool (*check)(void *data);\n \n \/**\n- * Function to be called during main loop iterations if @c\n+ * @brief Function to be called during main loop iterations if @c\n * prepare() or @c check() returns @c true.\n *\n * Must @b not be NULL.\n@@ -420,7 +459,7 @@\n void (*dispatch)(void *data);\n \n \/**\n- * Function to be called when the source is deleted.\n+ * @brief Function to be called when the source is deleted.\n *\n * It is called when the source is explicitly deleted using\n * sol_mainloop_source_del() or when sol_shutdown() is called.\n@@ -430,10 +469,13 @@\n void (*dispose)(void *data);\n };\n \n+\/**\n+ * @brief Structure of a Source of mainloop events.\n+ *\/\n struct sol_mainloop_source;\n \n \/**\n- * Create a new source of events to the main loop.\n+ * @brief Create a new source of events to the main loop.\n *\n * Some libraries will have their own internal main loop, in the case\n * we should integrate them with Soletta's we do so by adding a new\n@@ -473,54 +515,54 @@\n *\n * @param type the description of the source of main loop events. This\n * pointer is not modified and is @b not copied, thus it @b\n- * must exist during the lifetime of the source.\n- * @param data the user data (context) to give to callbacks in @a type.\n- *\n- * @return the new main loop source instance or @c NULL on failure.\n+ * must exist during the lifetime of the source\n+ * @param data the user data (context) to give to callbacks in @a type\n+ *\n+ * @return the new main loop source instance or @c NULL on failure\n *\n * @see sol_mainloop_source_del()\n *\/\n struct sol_mainloop_source *sol_mainloop_source_new(const struct sol_mainloop_source_type *type, const void *data);\n \n \/**\n- * Destroy a source of main loop events.\n+ * @brief Destroy a source of main loop events.\n *\n * @param handle a valid handle previously created with\n- * sol_mainloop_source_new().\n+ * sol_mainloop_source_new()\n *\n * @see sol_mainloop_source_new()\n *\/\n void sol_mainloop_source_del(struct sol_mainloop_source *handle);\n \n \/**\n- * Retrieve the user data (context) given to the source at creation time.\n+ * @brief Retrieve the user data (context) given to the source at creation time.\n *\n * @param handle a valid handle previously created with\n- * sol_mainloop_source_new().\n+ * sol_mainloop_source_new()\n *\n * @return whatever was given to sol_mainloop_source_new() as second\n- * parameter. NULL is a valid return.\n+ * parameter. NULL is a valid return\n *\n * @see sol_mainloop_source_new()\n *\/\n void *sol_mainloop_source_get_data(const struct sol_mainloop_source *handle);\n \n \/**\n- * Gets the argument count the application was launched with, if any.\n- *\n- * @return The @c argc value as set by sol_args_set() or #SOL_MAIN().\n+ * @brief Gets the argument count the application was launched with, if any.\n+ *\n+ * @return The @c argc value as set by sol_args_set() or #SOL_MAIN()\n *\/\n int sol_argc(void);\n \n \/**\n- * Gets the list of arguments the application was launched with, if any.\n- *\n- * @return The @c argv value as set by sol_args_set() or #SOL_MAIN().\n+ * @brief Gets the list of arguments the application was launched with, if any.\n+ *\n+ * @return The @c argv value as set by sol_args_set() or #SOL_MAIN()\n *\/\n char **sol_argv(void);\n \n \/**\n- * Sets a new list of arguments and its count.\n+ * @brief Sets a new list of arguments and its count.\n *\n * A reference to the @a argv pointer will be kept, so it must be valid at least\n * until sol_args_set() is called again to set different arguments.\n@@ -532,20 +574,37 @@\n * interpreter removes its own arguments and uses this function to set the\n * list of arguments that the flow should see.\n *\n- * @param argc The count of elements in @a argv.\n- * @param argv Array of nul terminated strings, each represents one argument.\n+ * @param argc The count of elements in @a argv\n+ * @param argv Array of nul terminated strings, each represents one argument\n *\/\n void sol_args_set(int argc, char *argv[]);\n \n+\/**\n+ * @brief Structure used to keep the application main callbacks.\n+ *\n+ * It's intended to be used through @ref SOL_MAIN_DEFAULT. Keeps\n+ * the @c startup and @c shutdown callbacks of the application that\n+ * will be called by @ref SOL_MAIN_DEFAULT when appropriated.\n+ *\/\n struct sol_main_callbacks {\n #ifndef SOL_NO_API_VERSION\n #define SOL_MAIN_CALLBACKS_API_VERSION (1)\n- uint16_t api_version;\n+ uint16_t api_version; \/**< @brief API version *\/\n #endif\n- uint16_t flags;\n- void (*startup)(void);\n- void (*shutdown)(void);\n+ uint16_t flags; \/**< @brief Application flags *\/\n+ void (*startup)(void); \/**< @brief Application @c startup function *\/\n+ void (*shutdown)(void); \/**< @brief Application @c shutdown function *\/\n };\n+\n+\/**\n+ * @def SOL_MAIN\n+ *\n+ * @brief Convenience macro to declare the @c main function and properly\n+ * initialize and execute a Soletta Application.\n+ *\n+ * @warning Prefer to use @ref SOL_MAIN_DEFAULT since it handles different\n+ * platforms.\n+ *\/\n \n \/**\n * @def SOL_MAIN_DEFAULT(startup, shutdown)\n@@ -609,7 +668,15 @@\n SOL_MAIN(sol_main_callbacks_instance)\n #endif \/* SOL_PLATFORM_CONTIKI *\/\n \n-\/* Internal. *\/\n+\/**\n+ * @brief Helper function called by @ref SOL_MAIN. Shouldn't be called directly.\n+ *\n+ * @param callbacks Application callback structure\n+ * @param argc The count of elements in @a argv\n+ * @param argv Array of NUL terminated strings, each represents one argument\n+ *\n+ * @return @c 0 on success, error code (always negative) otherwise\n+ *\/\n int sol_mainloop_default_main(const struct sol_main_callbacks *callbacks, int argc, char *argv[]);\n \n \/**\n"} {"commit":"df70b725ae3c7e8d0a5471330158b4aff42344b5","subject":"gstgoovideofilter: bit test, rather than check for equality, for the nFlags field","message":"gstgoovideofilter: bit test, rather than check for equality, for the nFlags field\n","repos":"mrchapp\/gst-goo,mrchapp\/gst-goo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gstgoovideofilter.c\n+++ src\/gstgoovideofilter.c\n@@ -166,7 +166,7 @@\n \t\t\tbuffer->nFlags |= OMX_BUFFERFLAG_EOS;\n \t\t\tgoo_component_release_buffer (self->component, buffer);\n \n-\t\t\tif (buffer->nFlags == OMX_BUFFERFLAG_EOS || goo_port_is_eos (port))\n+\t\t\tif ((buffer->nFlags & OMX_BUFFERFLAG_EOS) || goo_port_is_eos (port))\n \t\t\t{\n \t\t\t\tGST_INFO (\"EOS flag in output buffer (%d)\",\n \t\t\t \t\tbuffer->nFilledLen);\n@@ -177,9 +177,8 @@\n \t}\n \telse\n \t{\n-\n \t\tgst_pad_push (self->srcpad, gst_buffer);\n-\t\tif (buffer->nFlags == OMX_BUFFERFLAG_EOS || goo_port_is_eos (port))\n+\t\tif ((buffer->nFlags & OMX_BUFFERFLAG_EOS) || goo_port_is_eos (port))\n \t\t{\n \t\t\tGST_INFO (\"EOS flag found in output buffer (%d)\",\n \t\t\t \tbuffer->nFilledLen);\n"} {"commit":"5cbc6a7ae1b85577c1f99f6e1175e58a7b3af4d3","subject":"Use a funky version in a probably vein attempt at preventing gdb from dlopen()'ing glibc's libthread_db library...","message":"Use a funky version in a probably vein attempt at preventing gdb\nfrom dlopen()'ing glibc's libthread_db library...\n","repos":"czankel\/xtensa-uclibc,czankel\/xtensa-uclibc,kraj\/uClibc,klee\/klee-uclibc,foss-xtensa\/uClibc,brgl\/uclibc-ng,brgl\/uclibc-ng,ndmsystems\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,skristiansson\/uClibc-or1k,ddcc\/klee-uclibc-0.9.33.2,OpenInkpot-archive\/iplinux-uclibc,waweber\/uclibc-clang,klee\/klee-uclibc,skristiansson\/uClibc-or1k,brgl\/uclibc-ng,atgreen\/uClibc-moxie,m-labs\/uclibc-lm32,czankel\/xtensa-uclibc,hwoarang\/uClibc,ffainelli\/uClibc,OpenInkpot-archive\/iplinux-uclibc,m-labs\/uclibc-lm32,atgreen\/uClibc-moxie,foss-for-synopsys-dwc-arc-processors\/uClibc,hwoarang\/uClibc,ChickenRunjyd\/klee-uclibc,majek\/uclibc-vx32,ndmsystems\/uClibc,hjl-tools\/uClibc,ndmsystems\/uClibc,brgl\/uclibc-ng,mephi42\/uClibc,gittup\/uClibc,kraj\/uClibc,hjl-tools\/uClibc,hjl-tools\/uClibc,mephi42\/uClibc,ddcc\/klee-uclibc-0.9.33.2,atgreen\/uClibc-moxie,gittup\/uClibc,foss-xtensa\/uClibc,ddcc\/klee-uclibc-0.9.33.2,skristiansson\/uClibc-or1k,majek\/uclibc-vx32,ndmsystems\/uClibc,groundwater\/uClibc,groundwater\/uClibc,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,waweber\/uclibc-clang,atgreen\/uClibc-moxie,ysat0\/uClibc,ChickenRunjyd\/klee-uclibc,wbx-github\/uclibc-ng,czankel\/xtensa-uclibc,gittup\/uClibc,kraj\/uClibc,ysat0\/uClibc,OpenInkpot-archive\/iplinux-uclibc,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,mephi42\/uClibc,hwoarang\/uClibc,majek\/uclibc-vx32,waweber\/uclibc-clang,ChickenRunjyd\/klee-uclibc,ChickenRunjyd\/klee-uclibc,kraj\/uclibc-ng,kraj\/uclibc-ng,ffainelli\/uClibc,klee\/klee-uclibc,ysat0\/uClibc,ffainelli\/uClibc,gittup\/uClibc,kraj\/uClibc,wbx-github\/uclibc-ng,kraj\/uclibc-ng,ffainelli\/uClibc,m-labs\/uclibc-lm32,klee\/klee-uclibc,mephi42\/uClibc,ysat0\/uClibc,m-labs\/uclibc-lm32,hjl-tools\/uClibc,hjl-tools\/uClibc,ddcc\/klee-uclibc-0.9.33.2,ffainelli\/uClibc,kraj\/uclibc-ng,skristiansson\/uClibc-or1k,OpenInkpot-archive\/iplinux-uclibc,foss-xtensa\/uClibc,wbx-github\/uclibc-ng,groundwater\/uClibc,wbx-github\/uclibc-ng,majek\/uclibc-vx32,foss-xtensa\/uClibc,hwoarang\/uClibc,waweber\/uclibc-clang","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libpthread\/linuxthreads\/internals.h\n+++ libpthread\/linuxthreads\/internals.h\n@@ -29,8 +29,11 @@\n #include \"semaphore.h\"\n #include \"..\/linuxthreads_db\/thread_dbP.h\"\n \n-\/* Pretend to be glibc 2.3 as far as gdb is concerned *\/\n-#define VERSION \"2.3\"\n+\/* Use a funky version in a probably vein attempt at preventing gdb \n+ * from dlopen()'ing glibc's libthread_db library... *\/\n+#define STRINGIFY(s) STRINGIFY2 (s)\n+#define STRINGIFY2(s) #s\n+#define VERSION STRINGIFY(__UCLIBC_MAJOR__) \".\" STRINGIFY(__UCLIBC_MINOR__) \".\" STRINGIFY(__UCLIBC_SUBLEVEL__)\n \n #ifndef THREAD_GETMEM\n # define THREAD_GETMEM(descr, member) descr->member\n"} {"commit":"61c544df1bceeaa81e4ce98b587fad1e5198046d","subject":"lib\/deploy: Avoid shadowing variable","message":"lib\/deploy: Avoid shadowing variable\n\nThere's already a `boot_relpath` variable in the outside scope.\n","repos":"GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree,GNOME\/ostree","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libostree\/ostree-sysroot-deploy.c\n+++ src\/libostree\/ostree-sysroot-deploy.c\n@@ -1935,8 +1935,9 @@\n \n if (kernel_layout->initramfs_namever)\n {\n- g_autofree char * boot_relpath = g_strconcat (\"\/\", bootcsumdir, \"\/\", kernel_layout->initramfs_namever, NULL);\n- ostree_bootconfig_parser_set (bootconfig, \"initrd\", boot_relpath);\n+ g_autofree char * initrd_boot_relpath =\n+ g_strconcat (\"\/\", bootcsumdir, \"\/\", kernel_layout->initramfs_namever, NULL);\n+ ostree_bootconfig_parser_set (bootconfig, \"initrd\", initrd_boot_relpath);\n }\n else\n {\n"} {"commit":"056bc1e8949489e6bf612b989a25520f85badf95","subject":"","message":"\n\ngit-svn-id: https:\/\/gforge.sci.utah.edu\/svn\/nektar\/trunk@2592 305cdda6-5ce1-45b3-a98d-dfc68c8b3305\n","repos":"certik\/nektar,certik\/nektar,certik\/nektar","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- library\/StdRegions\/StdExpansion2D.h\n+++ library\/StdRegions\/StdExpansion2D.h\n@@ -47,7 +47,7 @@\n {\n \n class StdExpansion2D: public StdExpansion\n- {\n+ {\n public:\n StdExpansion2D();\n StdExpansion2D(int numcoeffs, const LibUtilities::BasisKey &Ba,\n@@ -148,7 +148,7 @@\n {\n return PhysEvaluate(coords);\n }\n- };\n+ };\n \n typedef boost::shared_ptr<StdExpansion2D> StdExpansion2DSharedPtr;\n \n"} {"commit":"ba76b6167a53aad83c5d28c4ca45261fed7dec40","subject":"Ideam: use Noto font","message":"Ideam: use Noto font\n","repos":"AmosCaster\/ideam,AmosCaster\/ideam","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/helpers\/TitleItem.h\n+++ src\/helpers\/TitleItem.h\n@@ -23,7 +23,7 @@\n \t{\n \t\tBFont font;\n \n-\t\tfont.SetFamilyAndStyle(\"DejaVu Sans\", \"Bold\");\n+\t\tfont.SetFamilyAndStyle(\"Noto Sans\", \"Bold\");\n \t\towner->SetFont(&font);\n \n \t\tBStringItem::DrawItem(owner, bounds, complete);\n"} {"commit":"24e37aa6a6b16b589564a7e8701d3ee86becb932","subject":"librfn\/benchmark: Add a few doxygen comments","message":"librfn\/benchmark: Add a few doxygen comments\n\nSigned-off-by: Daniel Thompson <3d0f3b9ddcacec30c4008c5e030e6c13a478cb4f@redfelineninja.org.uk>\n","repos":"daniel-thompson\/tintamp,daniel-thompson\/tintamp,daniel-thompson\/tintamp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/librfn\/include\/librfn\/benchmark.h\n+++ src\/librfn\/include\/librfn\/benchmark.h\n@@ -35,9 +35,23 @@\n *\/\n uint64_t rf_benchmark_time_now();\n \n+\/*!\n+ * Initialize a benchmark structure.\n+ *\n+ * \\arg runtime Minimum time (in microseconds) that the benchmark must run for.\n+ *\/\n void rf_benchmark_init(rf_benchmark_t *b, uint64_t runtime);\n+\n+\/*!\n+ * Test whether the benchmark has completed it's minimum runtime.\n+ *\/\n bool rf_benchmark_running(rf_benchmark_t *b);\n+\n+\/*!\n+ * Generate the benchmark results by comparing the actual runtime to the nominal runtime.\n+ *\/\n void rf_benchmark_finalize(rf_benchmark_t *b, uint64_t nominal, rf_benchmark_results_t *r);\n+\n void rf_benchmark_results_show(rf_benchmark_results_t *r, const char *tag);\n \n #endif \/\/ RF_BENCHMARK_H_\n"} {"commit":"38e1b305808abd035caee66e44e43dcbb6085b83","subject":"*-login: If auth failed with a specified reason, the reason wasn't actually shown to client.","message":"*-login: If auth failed with a specified reason, the reason wasn't actually shown to client.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/login-common\/client-common-auth.c\n+++ src\/login-common\/client-common-auth.c\n@@ -538,7 +538,7 @@\n \t\t} else {\n \t\t\tclient_auth_result(client,\n \t\t\t\tCLIENT_AUTH_RESULT_AUTHFAILED_REASON, NULL,\n-\t\t\t\tAUTH_FAILED_MSG);\n+\t\t\t\tdata);\n \t\t}\n \n \t\tif (!client->destroyed)\n"} {"commit":"86a9f54c7339d0f16eea0a0f6d92dd85abc6ae29","subject":"imap-login: Give a helpful error message if user tries to log in without giving command tag.","message":"imap-login: Give a helpful error message if user tries to log in without giving command tag.\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap-login\/client.c\n+++ src\/imap-login\/client.c\n@@ -186,7 +186,7 @@\n \tif (strcmp(cmd, \"ENABLE\") == 0)\n \t\treturn cmd_enable(client);\n \n-\treturn -1;\n+\treturn -2;\n }\n \n static bool client_handle_input(struct imap_client *client)\n@@ -258,7 +258,12 @@\n \t\tret = client_command_execute(client, client->cmd_name, args);\n \n \tclient->cmd_finished = TRUE;\n-\tif (ret < 0) {\n+\tif (ret == -2 && strcasecmp(client->cmd_tag, \"LOGIN\") == 0) {\n+\t\tclient_send_line(&client->common, CLIENT_CMD_REPLY_BAD,\n+\t\t\t\"First parameter in line is IMAP's command tag, \"\n+\t\t\t\"not the command name. Add that before the command, \"\n+\t\t\t\"like: a login user pass\");\n+\t} else if (ret < 0) {\n \t\tif (*client->cmd_tag == '\\0')\n \t\t\tclient->cmd_tag = \"*\";\n \t\tif (++client->common.bad_counter >= CLIENT_MAX_BAD_COMMANDS) {\n@@ -267,7 +272,7 @@\n \t\t\tclient_destroy(&client->common,\n \t\t\t\t\"Disconnected: Too many invalid commands\");\n \t\t\treturn FALSE;\n-\t\t} \n+\t\t}\n \t\tclient_send_line(&client->common, CLIENT_CMD_REPLY_BAD,\n \t\t\t\"Error in IMAP command received by server.\");\n \t}\n"} {"commit":"d037c76910d096f074d638085e0d7020fb9f1893","subject":"eina eina_list.h: Refined documentation.","message":"eina eina_list.h: Refined documentation.\n\ngit-svn-id: a6113611d365f0fc061992be0d1d0b451b434026@67041 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/eina,jordemort\/eina,jordemort\/eina","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/include\/eina_list.h\n+++ src\/include\/eina_list.h\n@@ -582,7 +582,7 @@\n \n \n \/**\n- * @brief Remove the specified data.\n+ * @brief Remove the specified list node.\n *\n * @param list The given linked list.\n * @param remove_list The list node which is to be removed.\n"} {"commit":"e82db3dffce1202ccda0d05f3baaea1d80a606fe","subject":"Alias PT_INT32 and PT_UINT32 as synonyms for PT_INT and PT_UINT","message":"Alias PT_INT32 and PT_UINT32 as synonyms for PT_INT and PT_UINT\n\n\ngit-svn-id: c3edda122e248ef33995da003806c930f62b9468@115 31904243-a364-42ac-a3db-9305396518ba\n","repos":"cwilling\/oiio,sambler\/oiio,OpenImageIO\/oiio,OpenImageIO\/oiio,jeremyselan\/oiio,sambler\/oiio,micler\/oiio,mcanthony\/oiio,bdeluca\/oiio,jeremyselan\/oiio,mcanthony\/oiio,scott-wilson\/oiio,scott-wilson\/oiio,scott-wilson\/oiio,cwilling\/oiio,micler\/oiio,OpenImageIO\/oiio,lgritz\/oiio,micler\/oiio,YangYangTL\/oiio,mcanthony\/oiio,cwilling\/oiio,YangYangTL\/oiio,bdeluca\/oiio,YangYangTL\/oiio,mcanthony\/oiio,lgritz\/oiio,cwilling\/oiio,jeremyselan\/oiio,sambler\/oiio,lgritz\/oiio,OpenImageIO\/oiio,YangYangTL\/oiio,scott-wilson\/oiio,micler\/oiio,lgritz\/oiio,sambler\/oiio,bdeluca\/oiio,bdeluca\/oiio","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/include\/paramtype.h\n+++ src\/include\/paramtype.h\n@@ -82,7 +82,10 @@\n PT_INT8, PT_UINT8, \/\/< 8 bit int, signed and unsigned\n PT_BYTE = PT_UINT8, \/\/< BYTE == synonym for UINT8\n PT_INT16, PT_UINT16, \/\/< 16 bit int, signed and unsigned\n- PT_INT, PT_UINT, \/\/< 32 bit int, signed and unsigned\n+ PT_INT, \/\/< 32-bit signed int\n+ PT_INT32 = PT_INT, \/\/< 32-bit signed int\n+ PT_UINT, \/\/< 32-bit unsigned int\n+ PT_UINT32 = PT_UINT, \/\/< 32-bit unsigned int\n PT_POINTER, \/\/< pointer, in system address width\n \/\/ For historical reasons, DO NOT change the order of the above!\n \/\/ Future expansion takes place here. Remember to modify the \n"} {"commit":"97b70cca751c6eace62094b54c9d6a702a219e05","subject":"BDW: Need not restore SLM setting in BDW.","message":"BDW: Need not restore SLM setting in BDW.\n\nRestore SLM setting may cause some test random fail, remove it.\n\nSigned-off-by: Yang Rong <78759e37dc7114caed18f74e7515c5cb519dbf6d@intel.com>\nReviewed-by: Zhigang Gong <e04a7b9b70b1e4c6318cf117dcd1a9056e14b97a@linux.intel.com>\nReviewed-by: Junyan He <8f73a735c668918c9613b750d3a88ebf2489599f@linux.intel.com>\n","repos":"wdv4758h\/beignet,freedesktop-unofficial-mirror\/beignet,freedesktop-unofficial-mirror\/beignet,wdv4758h\/beignet,wdv4758h\/beignet,freedesktop-unofficial-mirror\/beignet,zhenyw\/beignet,zhenyw\/beignet,zhenyw\/beignet,freedesktop-unofficial-mirror\/beignet,zhenyw\/beignet,wdv4758h\/beignet,wdv4758h\/beignet,zhenyw\/beignet","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/intel\/intel_gpgpu.c\n+++ src\/intel\/intel_gpgpu.c\n@@ -774,7 +774,7 @@\n size_aux += sizeof(surface_heap_t);\n \n \/\/curbe must be 32 bytes aligned\n- size_aux = ALIGN(size_aux, 32);\n+ size_aux = ALIGN(size_aux, 64);\n gpgpu->aux_offset.curbe_offset = size_aux;\n size_aux += gpgpu->curb.num_cs_entries * gpgpu->curb.size_cs_entry * 32;\n \n@@ -1681,8 +1681,8 @@\n intel_gpgpu_set_L3 = intel_gpgpu_set_L3_gen8;\n cl_gpgpu_get_cache_ctrl = (cl_gpgpu_get_cache_ctrl_cb *)intel_gpgpu_get_cache_ctrl_gen8;\n intel_gpgpu_get_scratch_index = intel_gpgpu_get_scratch_index_gen8;\n- intel_gpgpu_post_action = intel_gpgpu_post_action_gen75;\n- intel_gpgpu_read_ts_reg = intel_gpgpu_read_ts_reg_gen7; \/\/HSW same as ivb\n+ intel_gpgpu_post_action = intel_gpgpu_post_action_gen7; \/\/BDW need not restore SLM, same as gen7\n+ intel_gpgpu_read_ts_reg = intel_gpgpu_read_ts_reg_gen7;\n intel_gpgpu_set_base_address = intel_gpgpu_set_base_address_gen8;\n intel_gpgpu_setup_bti = intel_gpgpu_setup_bti_gen8;\n intel_gpgpu_load_vfe_state = intel_gpgpu_load_vfe_state_gen8;\n"} {"commit":"204b7a116fae1bfe3c6447ad177443f751923460","subject":"exclude rapidcsv.h from coverage - 3pty software","message":"exclude rapidcsv.h from coverage - 3pty software\n","repos":"ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/jalousie\/rapidcsv.h\n+++ src\/jalousie\/rapidcsv.h\n@@ -10,7 +10,7 @@\n * rapidcsv is distributed under the BSD 3-Clause license, see LICENSE for details.\n *\n *\/\n-\n+\/\/ GCOVR_EXCL_START\n #pragma once\n \n #include <algorithm>\n@@ -1166,3 +1166,4 @@\n #endif\n };\n }\n+\/\/ GCOVR_EXCL_STOP\n"} {"commit":"6d7379998842752fff30d3114a548a983fa7807b","subject":"kclient: small bug fix","message":"kclient: small bug fix\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/kernel\/mds_client.c\n+++ src\/kernel\/mds_client.c\n@@ -2056,7 +2056,7 @@\n \t\/* is dentry lease valid? *\/\n \tspin_lock(&dentry->d_lock);\n \tdi = ceph_dentry(dentry);\n-\tif (!di ||\n+\tif (!di || !di->lease_session ||\n \t di->lease_session->s_mds < 0 ||\n \t di->lease_gen != di->lease_session->s_cap_gen ||\n \t !time_before(jiffies, dentry->d_time)) {\n"} {"commit":"0247a403a204710869c6cd0562fc3dfa2f99b6d2","subject":"Remove unnecessary code in new_task()","message":"Remove unnecessary code in new_task()","repos":"gzoom13\/embox,gzoom13\/embox,gzoom13\/embox,embox\/embox,Kakadu\/embox,embox\/embox,gzoom13\/embox,embox\/embox,mike2390\/embox,vrxfile\/embox-trik,Kefir0192\/embox,abusalimov\/embox,abusalimov\/embox,vrxfile\/embox-trik,Kefir0192\/embox,abusalimov\/embox,Kefir0192\/embox,abusalimov\/embox,embox\/embox,mike2390\/embox,mike2390\/embox,vrxfile\/embox-trik,abusalimov\/embox,abusalimov\/embox,embox\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,Kefir0192\/embox,vrxfile\/embox-trik,mike2390\/embox,Kakadu\/embox,embox\/embox,Kefir0192\/embox,Kefir0192\/embox,mike2390\/embox,gzoom13\/embox,mike2390\/embox,vrxfile\/embox-trik,gzoom13\/embox,Kakadu\/embox,vrxfile\/embox-trik,gzoom13\/embox,mike2390\/embox,vrxfile\/embox-trik,Kefir0192\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/kernel\/task\/multi.c\n+++ src\/kernel\/task\/multi.c\n@@ -88,8 +88,6 @@\n \n \t\tthd->stack += task_sz;\n \t\tthd->stack_sz -= task_sz;\n-\n-\t\tcontext_set_stack(&thd->context, thd->stack + thd->stack_sz);\n \n \t\t\/* init new task *\/\n \n"} {"commit":"35663f3b721ec180a8a1442f4fa4bee0bd732eb1","subject":"compositemixer: Solve deadlock on element release","message":"compositemixer: Solve deadlock on element release\n\nChange-Id: I700887fa3dbaf9622f17d5d6ee42b4c9cb542745\n","repos":"ESTOS\/kms-core,shelsonjava\/kms-core,Kurento\/kms-core,shelsonjava\/kms-core,ESTOS\/kms-core,Kurento\/kms-core,TribeMedia\/kms-core,Kurento\/kms-core,TribeMedia\/kms-core,shelsonjava\/kms-core,KurentoLegacy\/gst-kurento-plugins,shelsonjava\/kms-core,TribeMedia\/kms-core,ESTOS\/kms-core,KurentoLegacy\/gst-kurento-plugins,TribeMedia\/kms-core,KurentoLegacy\/gst-kurento-plugins,ESTOS\/kms-core,KurentoLegacy\/gst-kurento-plugins,Kurento\/kms-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/kmscompositemixer.c\n+++ src\/kmscompositemixer.c\n@@ -611,8 +611,8 @@\n \n KMS_COMPOSITE_MIXER_LOCK (self);\n g_hash_table_remove_all (self->priv->ports);\n+ KMS_COMPOSITE_MIXER_UNLOCK (self);\n g_clear_object (&self->priv->loop);\n- KMS_COMPOSITE_MIXER_UNLOCK (self);\n \n G_OBJECT_CLASS (kms_composite_mixer_parent_class)->dispose (object);\n }\n"} {"commit":"2dbecb22f5107d36c0a0b90e33aca7ae7ab608b7","subject":"Minor fix in the atmost utility","message":"Minor fix in the atmost utility\n","repos":"matus-chochlik\/various,matus-chochlik\/various,matus-chochlik\/various,matus-chochlik\/various","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- clutils\/atmost.c\n+++ clutils\/atmost.c\n@@ -112,7 +112,7 @@\n \t\t\treturn 5;\n \t\t}\n \n-\t\treturn execv(executable, (char* const*)argv);\n+\t\treturn execv(argv[0], (char* const*)argv);\n \t}\n \tfprintf(stderr, \"atmost: could not find executable '%s'\\n\", argv[0]);\n \treturn 2;\n"} {"commit":"798d239c15c2b00859c4762671539de5845aee2f","subject":"vm\/qrexec: fix race between child cleanup and select call","message":"vm\/qrexec: fix race between child cleanup and select call\n\nreap_children() can close FD, which was already added to FD_SET for select.\nThis can lead to EBADF and agent termination.\n","repos":"woju\/qubes-core-admin,QubesOS\/qubes-core-admin,marmarek\/qubes-core-admin,woju\/qubes-core-admin,woju\/qubes-core-admin,QubesOS\/qubes-core-admin,marmarek\/qubes-core-admin,woju\/qubes-core-admin,QubesOS\/qubes-core-admin,marmarek\/qubes-core-admin","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- qrexec\/qrexec_agent.c\n+++ qrexec\/qrexec_agent.c\n@@ -554,14 +554,14 @@\n \n \n \tfor (;;) {\n+\t\tsigprocmask(SIG_BLOCK, &chld_set, NULL);\n+\t\tif (child_exited)\n+\t\t\treap_children();\n \t\tmax = fill_fds_for_select(&rdset, &wrset);\n \t\tif (buffer_space_vchan_ext() <=\n \t\t sizeof(struct server_header))\n \t\t\tFD_ZERO(&rdset);\n \n-\t\tsigprocmask(SIG_BLOCK, &chld_set, NULL);\n-\t\tif (child_exited)\n-\t\t\treap_children();\n \t\twait_for_vchan_or_argfd(max, &rdset, &wrset);\n \t\tsigprocmask(SIG_UNBLOCK, &chld_set, NULL);\n \n"} {"commit":"74f0fa1317923706c46d198922793654ea0a0087","subject":"elementary\/naviframe - fixed to prevent multiple clicked events for the backbutton ","message":"elementary\/naviframe - fixed to prevent multiple clicked events for the backbutton \n\n\n\nSVN revision: 64425\n","repos":"FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elc_naviframe.c\n+++ src\/lib\/elc_naviframe.c\n@@ -497,9 +497,13 @@\n \n static void\n _back_btn_clicked(void *data,\n- Evas_Object *obj __UNUSED__,\n+ Evas_Object *obj,\n void *event_info __UNUSED__)\n {\n+\/* Since edje has the event queue, clicked event could be happend multiple times\n+ on some heavy environment. This callback del will prevent those scenario and\n+ guarantee only one clicked for it's own page. *\/\n+ evas_object_smart_callback_del(obj, \"clicked\", _back_btn_clicked);\n elm_naviframe_item_pop(data);\n }\n \n@@ -880,11 +884,7 @@\n \n wd = elm_widget_data_get(WIDGET(navi_it));\n if (wd && wd->freeze_events)\n- {\n- evas_object_hide(wd->rect);\n- \/\/FIXME:\n- evas_object_pass_events_set(wd->base, EINA_FALSE);\n- }\n+ evas_object_hide(wd->rect);\n }\n \n EAPI Evas_Object *\n@@ -1040,12 +1040,12 @@\n {\n if (wd->freeze_events)\n evas_object_show(wd->rect);\n- edje_object_signal_emit(VIEW(it), \"elm,state,cur,popped\", \"elm\");\n evas_object_show(VIEW(prev_it));\n evas_object_raise(VIEW(prev_it));\n edje_object_signal_emit(VIEW(prev_it),\n \"elm,state,prev,popped\",\n \"elm\");\n+ edje_object_signal_emit(it->base.view, \"elm,state,cur,popped\", \"elm\");\n }\n else\n _item_del(it);\n@@ -1089,11 +1089,7 @@\n prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev,\n Elm_Naviframe_Item);\n if (wd->freeze_events)\n- {\n- evas_object_show(wd->rect);\n- \/\/FIXME:\n- evas_object_pass_events_set(wd->base, EINA_TRUE);\n- }\n+ evas_object_show(wd->rect);\n edje_object_signal_emit(prev_it->base.view,\n \"elm,state,cur,pushed\",\n \"elm\");\n"} {"commit":"2fa3458a7e6c99133957ef19cc312347771697b0","subject":"elementary\/elc_naviframe : The content, will be popped, doesn't need to control focus.","message":"elementary\/elc_naviframe : The content, will be popped, doesn't need\nto control focus.\n\n\nSVN revision: 64161\n","repos":"tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elc_naviframe.c\n+++ src\/lib\/elc_naviframe.c\n@@ -932,6 +932,7 @@\n \n it = (Elm_Naviframe_Item *) elm_naviframe_top_item_get(obj);\n if (!it) return NULL;\n+ elm_widget_tree_unfocusable_set(it->content, EINA_TRUE);\n if (wd->preserve)\n content = it->content;\n \n"} {"commit":"1634653bb3b56a6344660d6062ee8247a766f434","subject":"elc_naviframe: fix crash in strcmp, if text_set is NULL issue","message":"elc_naviframe: fix crash in strcmp, if text_set is NULL issue\n\nSummary:\nIssue: If text set is NULL to naviframe, crash happens in strcmp\nSoln: Check for text if NULL, before passing to strcmp\n\n@fix\n\nTest Plan:\n\/\/Pass the text as NULL\nelm_object_part_text_set(nf, \"title\", NULL);\n\nReviewers: Hermet, cedric\n\nReviewed By: cedric\n\nSubscribers: cedric\n\nDifferential Revision: https:\/\/phab.enlightenment.org\/D3052\n\nSigned-off-by: Cedric BAIL <240633aa59d25638de9800ef43a88ad2e208d24d@osg.samsung.com>\n","repos":"rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elc_naviframe.c\n+++ src\/lib\/elc_naviframe.c\n@@ -1018,12 +1018,16 @@\n _elm_naviframe_elm_layout_text_set(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const char *part, const char *label)\n {\n Elm_Object_Item *it;\n+ const char *text = NULL;\n \n it = elm_naviframe_top_item_get(obj);\n if (!it) return EINA_FALSE;\n \n elm_object_item_part_text_set(it, part, label);\n- return !strcmp(elm_object_item_part_text_get(it, part), label);\n+ text = elm_object_item_part_text_get(it, part);\n+ if ((text) && !strcmp(text, label))\n+ return EINA_TRUE;\n+ return EINA_FALSE;\n }\n \n EOLIAN static const char*\n"} {"commit":"3bbb1672b59085f317cecc82caef63a74add5dea","subject":"istream-limit: Allow seeking past limit without assert-crashing. The next read() will simply return EOF.","message":"istream-limit: Allow seeking past limit without assert-crashing.\nThe next read() will simply return EOF.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/istream-limit.c\n+++ src\/lib\/istream-limit.c\n@@ -74,10 +74,6 @@\n static void i_stream_limit_seek(struct istream_private *stream, uoff_t v_offset,\n \t\t\t\tbool mark ATTR_UNUSED)\n {\n-\tstruct limit_istream *lstream = (struct limit_istream *) stream;\n-\n-\ti_assert(v_offset <= lstream->v_size);\n-\n \tstream->istream.v_offset = v_offset;\n \tstream->skip = stream->pos = 0;\n }\n"} {"commit":"b2c300e8270f7b7cbbdf83607534db7c8061ff37","subject":"Compile fix for non-Linux.","message":"Compile fix for non-Linux.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/process-title.c\n+++ src\/lib\/process-title.c\n@@ -136,6 +136,8 @@\n \n void process_title_deinit(void)\n {\n+#ifdef PROCTITLE_HACK\n \tfree(argv_memblock);\n \tfree(environ_memblock);\n+#endif\n }\n"} {"commit":"05c371ead2aa6e25a9595800705b9b238225191b","subject":"Make static analyzer happier.","message":"Make static analyzer happier.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/test-strfuncs.c\n+++ src\/lib\/test-strfuncs.c\n@@ -37,10 +37,8 @@\n \n \t\ts1 = t_strsplit_tab(str);\n \t\ts2 = t_strsplit(str, \"\\t\");\n-\t\tfor (i = 0; s1[i] != NULL; i++) {\n-\t\t\ttest_assert(s2[i] != NULL);\n-\t\t\ttest_assert(strcmp(s1[i], s2[i]) == 0);\n-\t\t}\n+\t\tfor (i = 0; s1[i] != NULL; i++)\n+\t\t\ttest_assert(null_strcmp(s1[i], s2[i]) == 0);\n \t\ttest_assert(s2[i] == NULL);\n \t} T_END;\n }\n"} {"commit":"b209eb67b3d69da33eef53f1cd0d4cda84abde7c","subject":"prefix macro with BOTAN_","message":"prefix macro with BOTAN_\n\nSigned-off-by: Nuno Goncalves <54df356d35a1227da7b6a150655996586549b9d2@gmail.com>\n","repos":"randombit\/botan,randombit\/botan,randombit\/botan,randombit\/botan,randombit\/botan","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/utils\/mem_ops.h\n+++ src\/lib\/utils\/mem_ops.h\n@@ -118,9 +118,9 @@\n \n \/\/ is_trivially_copyable is missing in g++ < 5.0\n #if !__clang__ && __GNUG__ && __GNUC__ < 5\n-#define IS_TRIVIALLY_COPYABLE(T) true\n+#define BOTAN_IS_TRIVIALLY_COPYABLE(T) true\n #else\n-#define IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable<T>::value\n+#define BOTAN_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable<T>::value\n #endif\n \n \/**\n@@ -140,7 +140,7 @@\n \n template<typename T> inline void typecast_copy(uint8_t out[], T in[], size_t N)\n {\n- static_assert(IS_TRIVIALLY_COPYABLE(T), \"\");\n+ static_assert(BOTAN_IS_TRIVIALLY_COPYABLE(T), \"\");\n std::memcpy(out, in, sizeof(T)*N);\n }\n \n@@ -163,7 +163,7 @@\n \n template <class To, class From> inline To typecast_copy(const From *src) noexcept\n {\n- static_assert(IS_TRIVIALLY_COPYABLE(From) && std::is_trivial<To>::value, \"\");\n+ static_assert(BOTAN_IS_TRIVIALLY_COPYABLE(From) && std::is_trivial<To>::value, \"\");\n To dst;\n std::memcpy(&dst, src, sizeof(To));\n return dst;\n"} {"commit":"dc7daa550af74277b10e8025d836fd5da48513f6","subject":"lib9: handle empty TMPDIR more gracefully.","message":"lib9: handle empty TMPDIR more gracefully.\n\nBefore, an empty TMPDIR would lead to:\ncannot create <nil>\/go.o: No such file or directory\n\nR=golang-dev, iant, dave, bradfitz\nCC=golang-dev\nhttps:\/\/golang.org\/cl\/8355045\n","repos":"binarycrusader\/go,andrewchambers\/go,jefby\/go,minux\/goios,binarycrusader\/go,jonahglover\/go,nakedgc\/go,dgnorton\/go,Samurais\/go,gaurav36\/go,jdeng\/go,zouchao2010\/go,NichoZhang\/go,yeyuguo\/go,linux-on-ibm-z\/go,chinanjjohn2012\/go,linux-on-ibm-z\/go,cyberroadie\/go,zhangg\/go,lihuanghai\/go,joshsammut\/go,deft-code\/go,myPublicGit\/go,nakedgc\/go,willjunspecial\/go,xiaobodu\/go,waterlink\/go,CAFxX\/go,cyberroadie\/go,agaurav\/go,Stan-Lin-\/go,danielsoro\/go,jefby\/go,likesea\/go,momchil-velikov\/go,mdp\/go,arschles\/go-1,xiaobodu\/go,nawawi\/go,zouchao2010\/go,JioCloud\/go,Endika\/go,mwhudson\/go,jefby\/go,binarycrusader\/go,gorcz\/go,XuYunnan\/go,CodyGuo\/go,gomini\/go-mips32,suncycheng\/go,leeric92\/go,gaurav36\/go,Cofyc\/go,yuhengye\/go,g522342435\/go,rentongzhang\/go,agaurav\/go,weisd\/go,CarterTsai\/go,shines77\/go,xinhuang327\/go,likesea\/go,CAFxX\/go,klueska\/go-akaros,ImJasonH\/go,ifagnosticism\/go,CodyGuo\/go,NichoZhang\/go,beealone\/go,ganboing\/go-esx,jameskumar\/go,wangfakang\/go-1,NunoEdgarGub1\/go,mgyenik\/go,richo\/go,joshuaprunier\/go,Charlesdong\/go-1,JioCloud\/go,kevinc0825\/go,fjballest\/golang,gomini\/go-mips32,lihuanghai\/go,sagivo\/go,magastzheng\/go-1,rachtsingh\/gogojuice,skotti\/go,frobware\/go,sinuos\/go,josharian\/go.ssa,mikekap\/go,waterlink\/go,youprofit\/go,joshuaprunier\/go,zhangg\/go,ImJasonH\/go,xiuzhifu\/go,golang\/go,golang\/go,Ghands\/go,shawnl\/go,constantine001\/go,honsiorovskyi\/go,joshsammut\/go,waterlink\/go,dterei\/go,dkolbly\/go,goodlang\/good,Jordanzuo\/go,mdp\/go,danielsoro\/go,richo\/go,zhangg\/go-1,cnbin\/go,Cofyc\/go,gavinzhs\/go,xiaobodu\/go,xinhuang327\/go,arschles\/golang-go,frobware\/go,CarterTsai\/go,devpadawan\/go,skatsuta\/go,Samurais\/go,gavinzhs\/go,CAFxX\/go,royels\/go,odeke-em\/go,Cofyc\/go,jdhenke\/go,dterei\/go,ObjectiveJoe\/go,cyberroadie\/go,mwhudson\/go,GeorgiCodes\/go,jacobxk\/go,famorted\/go,pgmreddy\/go,PoohSunny\/go,fjballest\/golang,zhangg\/go-1,Ghands\/go,snowsnail\/go,mgyenik\/go,suncycheng\/go,albertjin\/golang-go,cyberroadie\/go,fjballest\/golang,jmptrader\/go,AALEKH\/go,RBEGamer\/go,likesea\/go,dkolbly\/go,snowsnail\/go,cookerzhu\/go,deft-code\/go,Young55555\/go,honsiorovskyi\/go,CAFxX\/go,kim-racktop\/go,jameskumar\/go,sagivo\/go,methane\/go,yuhengye\/go,suncycheng\/go,deft-code\/go,parkdy\/go,xujianhai\/go,joshsammut\/go,minux\/go-windows,ganboing\/go-esx,agaurav\/go,suncycheng\/go,arschles\/go-1,dpatel06\/go,cloudflare\/go,jonasi\/go,willjunspecial\/go,odeke-em\/go,akutz\/go,GeorgiCodes\/go,yasarkunduz\/go,nawawi\/go,minux\/go-windows,NichoZhang\/go,XuYunnan\/go,methane\/go,undergrowthlinear\/go,9618211\/go,devpadawan\/go,CiscoCloud\/go,famorted\/go,mwhudson\/go,Jordanzuo\/go,vsdutka\/go,zcwfeng\/go,donnel6809\/go,pgmreddy\/go,CiscoCloud\/go,springning\/go,danycoro\/go,likesea\/go,4ad\/go,skunkwerks\/clive,chinanjjohn2012\/go,vanloswang\/go,malvira\/go,jonathanmarvens\/go,fjballest\/golang,youprofit\/go,rentongzhang\/go,devpadawan\/go,mwhudson\/go,rentongzhang\/go,likesea\/go,springning\/go,xiuzhifu\/go,zhangg\/go-1,derekmarcotte\/go,sinuos\/go,Stan-Lin-\/go,AALEKH\/go,monetate\/go,cainiaocome\/go,ImJasonH\/go,dpatel06\/go,WIZARD-CXY\/go,famorted\/go,wangfakang\/go-1,ErikDubbelboer\/go,ifagnosticism\/go,jonasi\/go,richo\/go,cyberroadie\/go,fjballest\/golang,mikekap\/go,golang\/go,yunkai\/go,josharian\/go,GeorgiCodes\/go,andrewchambers\/go,undergrowthlinear\/go,ichu501\/go,binarycrusader\/go,WIZARD-CXY\/go,ichu501\/go,jameskumar\/go,XuYunnan\/go,jonathanmarvens\/go,pgmreddy\/go,polyverse-security\/go,mapix\/go,Jordanzuo\/go,royels\/go,goodlang\/good,sinuos\/go,mdp\/go,cyberroadie\/go,agaurav\/go,constantine001\/go,JioCloud\/go,nawawi\/go,springning\/go,sndnvaps\/go,CAFxX\/go,arschles\/golang-go,yunkai\/go,parkdy\/go,constantine001\/go,joshsammut\/go,beealone\/go,minux\/go-windows,donnel6809\/go,leeric92\/go,baiyunping333\/go,AALEKH\/go,momchil-velikov\/go,mbrukman\/go,waterlink\/go,roth1002\/go,dterei\/go,beealone\/go,youprofit\/go,CarterTsai\/go,xiuzhifu\/go,gomini\/go-mips32,gdey\/go,yasarkunduz\/go,klueska\/go-akaros,jameskumar\/go,cainiaocome\/go,stormltf\/go,minux\/go-backports,dpatel06\/go,9618211\/go,albertjin\/golang-go,andrewchambers\/go,Ghands\/go,sinuos\/go,cloudrain21\/go,mdp\/go,WIZARD-CXY\/go,arschles\/golang-go,jonasi\/go,jonasi\/go,dafyddcrosby\/go,jacobxk\/go,qskycolor\/go,vsekhar\/elastic-go,jonahglover\/go,sagivo\/go,cnbin\/go,kakuhiroshi\/go,josharian\/go,XuYunnan\/go,samanalysis\/go,snowsnail\/go,Badredapple\/go,pgmreddy\/go,Davidzhu001\/go-1,zcwfeng\/go,shines77\/go,undergrowthlinear\/go,gdey\/go,Jordanzuo\/go,zhangg\/go-1,uileyar\/go,qskycolor\/go,mdp\/go,golang\/go,theif519\/go,ifagnosticism\/go,zouchao2010\/go,Samurais\/go,kevinc0825\/go,shazow\/go,4ad\/go,jdhenke\/go,youprofit\/go,dkolbly\/go,gorcz\/go,odeke-em\/go,xiaobodu\/go,xujianhai\/go,alex-zhang\/go,rachtsingh\/gogojuice,dafyddcrosby\/go,Davidzhu001\/go-1,mikekap\/go,jonathanmarvens\/go,gdey\/go,mapix\/go,jacobsa\/go,ichu501\/go,minux\/go-backports,jdhenke\/go,danielsoro\/go,CAFxX\/go,yuhengye\/go,baiyunping333\/go,ErikDubbelboer\/go,minux\/go-windows,cloudrain21\/go,joshsammut\/go,xujianhai\/go,mk0x9\/go,jacobxk\/go,akutz\/go,ganboing\/go-esx,vectaport\/go,zhangg\/go,alex-zhang\/go,akutz\/go,jdhenke\/go,nakedgc\/go,codestation\/go,arschles\/go-1,CodyGuo\/go,xiuzhifu\/go,gomini\/go-mips32,albertjin\/golang-go,myPublicGit\/go,dafyddcrosby\/go,polyverse-security\/go,gohin\/go,jonasi\/go,cloudflare\/go,kakuhiroshi\/go,josharian\/go,binarycrusader\/go,vishsingh\/go,snowsnail\/go,NichoZhang\/go,XuYunnan\/go,xiaobodu\/go,gohin\/go,richo\/go,goodlang\/good,richo\/go,cookerzhu\/go,vsdutka\/go,CAFxX\/go,jacobxk\/go,nakedgc\/go,vectaport\/go,akutz\/go,waterlink\/go,jameskumar\/go,mwhudson\/go,jdhenke\/go,qskycolor\/go,odeke-em\/go,jefby\/go,mapix\/go,kevinc0825\/go,josharian\/go,sosop\/go,Cofyc\/go,Endika\/go,tcnksm\/go,jonathanmarvens\/go,yangzhongj\/go,b54898533\/go,b-deng\/go,undergrowthlinear\/go,danielsoro\/go,akutz\/go,shishkander\/go,AnuchitPrasertsang\/go,Cofyc\/go,vishsingh\/go,alex-zhang\/go,jdeng\/go,parkdy\/go,beealone\/go,Endika\/go,methane\/go,Samurais\/go,weisd\/go,Charlesdong\/go-1,mbrukman\/go,shishkander\/go,vsdutka\/go,Ghands\/go,jdhenke\/go,odeke-em\/go,odeke-em\/go,weisd\/go,Endika\/go,yangzhongj\/go,theif519\/go,undergrowthlinear\/go,shazow\/go,greyhwndz\/go,dafyddcrosby\/go,Badredapple\/go,g522342435\/go,b54898533\/go,snowsnail\/go,XuYunnan\/go,monetate\/go,JioCloud\/go,Pulgafree\/go,sndnvaps\/go,cainiaocome\/go,AnuchitPrasertsang\/go,gaurav36\/go,b54898533\/go,joshsammut\/go,rachtsingh\/gogojuice,jonathanmarvens\/go,parkdy\/go,agaurav\/go,skotti\/go,vsdutka\/go,leeric92\/go,linux-on-ibm-z\/go,slavau\/go,b54898533\/go,qskycolor\/go,jacobhaven\/go,tcnksm\/go,ichu501\/go,momchil-velikov\/go,skunkwerks\/clive,shazow\/go,mgyenik\/go,cainiaocome\/go,4ad\/go,RBEGamer\/go,WIZARD-CXY\/go,minux\/go-windows,theass\/go,jefby\/go,sndnvaps\/go,dkolbly\/go,weisd\/go,4ad\/go,ericsnowcurrently\/go,AALEKH\/go,methane\/go,miolini\/go,derekmarcotte\/go,ImJasonH\/go,myPublicGit\/go,vsekhar\/elastic-go,gdey\/go,wangfakang\/go-1,christopher-henderson\/Go,mbrukman\/go,cloudflare\/go,malvira\/go,jacobhaven\/go,kim-racktop\/go,shines77\/go,shawnl\/go,jacobsa\/go,vectaport\/go,Badredapple\/go,roth1002\/go,honsiorovskyi\/go,zcwfeng\/go,Stan-Lin-\/go,constantine001\/go,ImJasonH\/go,theass\/go,Young55555\/go,b-deng\/go,Young55555\/go,JioCloud\/go,mgyenik\/go,roth1002\/go,jasonxiong\/go,danielsoro\/go,fjballest\/golang,rentongzhang\/go,xiuzhifu\/go,xinhuang327\/go,skotti\/go,rachtsingh\/gogojuice,danielsoro\/go,odeke-em\/go,greyhwndz\/go,sndnvaps\/go,dpatel06\/go,vsdutka\/go,lihuanghai\/go,cloudflare\/go,mk0x9\/go,myPublicGit\/go,ichu501\/go,skatsuta\/go,miolini\/go,alex-zhang\/go,donnel6809\/go,stormltf\/go,greyhwndz\/go,PoohSunny\/go,g522342435\/go,josharian\/go.ssa,deft-code\/go,youprofit\/go,jameskumar\/go,rentongzhang\/go,mk0x9\/go,danycoro\/go,albertjin\/golang-go,springning\/go,josharian\/go.ssa,baiyunping333\/go,methane\/go,tcnksm\/go,weisd\/go,Badredapple\/go,shazow\/go,codestation\/go,linux-on-ibm-z\/go,gaurav36\/go,polyverse-security\/go,mapix\/go,sagivo\/go,arschles\/go-1,derekmarcotte\/go,springning\/go,shines77\/go,devpadawan\/go,vsdutka\/go,wangfakang\/go-1,jmptrader\/go,dgnorton\/go,ericsnowcurrently\/go,yangzhongj\/go,yangzhongj\/go,gdey\/go,yunkai\/go,xiuzhifu\/go,cloudflare\/go,minux\/go-backports,royels\/go,sndnvaps\/go,yeyuguo\/go,AnuchitPrasertsang\/go,JioCloud\/go,uileyar\/go,arschles\/golang-go,weisd\/go,slavau\/go,CAFxX\/go,derekmarcotte\/go,uileyar\/go,andrewchambers\/go,youprofit\/go,fjballest\/golang,gorcz\/go,sosop\/go,kim-racktop\/go,PoohSunny\/go,mgyenik\/go,yunkai\/go,xujianhai\/go,RBEGamer\/go,roth1002\/go,RBEGamer\/go,donnel6809\/go,snowsnail\/go,NunoEdgarGub1\/go,vishsingh\/go,dterei\/go,polyverse-security\/go,wangfakang\/go-1,mk0x9\/go,cloudrain21\/go,cyberroadie\/go,shishkander\/go,chinanjjohn2012\/go,yangzhongj\/go,stormltf\/go,ichu501\/go,samanalysis\/go,b-deng\/go,golang\/go,vishsingh\/go,myPublicGit\/go,Samurais\/go,cloudrain21\/go,constantine001\/go,andrewchambers\/go,springning\/go,jasonxiong\/go,Cofyc\/go,roth1002\/go,joshsammut\/go,nawawi\/go,vanloswang\/go,yangzhongj\/go,b54898533\/go,dgnorton\/go,dgnorton\/go,theass\/go,zcwfeng\/go,cloudflare\/go,cnbin\/go,frobware\/go,Cofyc\/go,shawnl\/go,kim-racktop\/go,sinuos\/go,b-deng\/go,dkolbly\/go,shawnl\/go,skunkwerks\/clive,ganboing\/go-esx,cloudrain21\/go,vanloswang\/go,golang\/go,mdp\/go,greyhwndz\/go,ErikDubbelboer\/go,deft-code\/go,slavau\/go,sndnvaps\/go,akutz\/go,gohin\/go,shishkander\/go,shishkander\/go,likesea\/go,ifagnosticism\/go,josharian\/go,uileyar\/go,undergrowthlinear\/go,ImJasonH\/go,RBEGamer\/go,mwhudson\/go,dafyddcrosby\/go,RBEGamer\/go,kakuhiroshi\/go,9618211\/go,CodyGuo\/go,linux-on-ibm-z\/go,ganboing\/go-esx,Stan-Lin-\/go,jacobsa\/go,samanalysis\/go,yuhengye\/go,RBEGamer\/go,CarterTsai\/go,jefby\/go,xinhuang327\/go,josharian\/go.ssa,vanloswang\/go,tcnksm\/go,zouchao2010\/go,skatsuta\/go,WIZARD-CXY\/go,miolini\/go,cnbin\/go,jacobxk\/go,codestation\/go,shazow\/go,andrewchambers\/go,springning\/go,Young55555\/go,nawawi\/go,suncycheng\/go,sosop\/go,jasonxiong\/go,youprofit\/go,polyverse-security\/go,ImJasonH\/go,xiaobodu\/go,gavinzhs\/go,alash3al\/go,Davidzhu001\/go-1,momchil-velikov\/go,joshsammut\/go,danycoro\/go,monetate\/go,richo\/go,Pulgafree\/go,danycoro\/go,yasarkunduz\/go,alash3al\/go,codestation\/go,Pulgafree\/go,gaurav36\/go,alash3al\/go,magastzheng\/go-1,yeyuguo\/go,ErikDubbelboer\/go,vectaport\/go,jacobsa\/go,CarterTsai\/go,g522342435\/go,skotti\/go,Charlesdong\/go-1,jacobhaven\/go,minux\/goios,danycoro\/go,NunoEdgarGub1\/go,zouchao2010\/go,alex-zhang\/go,stormltf\/go,kevinc0825\/go,goodlang\/good,joshuaprunier\/go,zhangg\/go,vsekhar\/elastic-go,Charlesdong\/go-1,ericsnowcurrently\/go,zhangg\/go,nakedgc\/go,jacobxk\/go,josharian\/go.ssa,vsekhar\/elastic-go,albertjin\/golang-go,kevinc0825\/go,ichu501\/go,magastzheng\/go-1,arschles\/golang-go,yangzhongj\/go,Young55555\/go,famorted\/go,theif519\/go,nawawi\/go,shawnl\/go,goodlang\/good,kim-racktop\/go,chinanjjohn2012\/go,gavinzhs\/go,XuYunnan\/go,albertjin\/golang-go,pgmreddy\/go,cloudflare\/go,mgyenik\/go,gohin\/go,theif519\/go,codestation\/go,willjunspecial\/go,yuhengye\/go,richo\/go,devpadawan\/go,AnuchitPrasertsang\/go,yunkai\/go,alex-zhang\/go,devpadawan\/go,Samurais\/go,honsiorovskyi\/go,tcnksm\/go,waterlink\/go,yunkai\/go,jasonxiong\/go,vishsingh\/go,zcwfeng\/go,qskycolor\/go,beealone\/go,danycoro\/go,xiaobodu\/go,ObjectiveJoe\/go,jameskumar\/go,theass\/go,miolini\/go,rachtsingh\/gogojuice,constantine001\/go,arschles\/go-1,theif519\/go,Stan-Lin-\/go,xinhuang327\/go,royels\/go,b-deng\/go,royels\/go,ErikDubbelboer\/go,jmptrader\/go,jonathanmarvens\/go,sosop\/go,yangzhongj\/go,ifagnosticism\/go,sndnvaps\/go,b54898533\/go,GeorgiCodes\/go,Charlesdong\/go-1,skunkwerks\/clive,mk0x9\/go,lihuanghai\/go,magastzheng\/go-1,pgmreddy\/go,famorted\/go,lihuanghai\/go,samanalysis\/go,monetate\/go,kakuhiroshi\/go,dgnorton\/go,mbrukman\/go,greyhwndz\/go,derekmarcotte\/go,jacobsa\/go,mk0x9\/go,jefby\/go,devpadawan\/go,yeyuguo\/go,NunoEdgarGub1\/go,chinanjjohn2012\/go,minux\/goios,sndnvaps\/go,slavau\/go,mbrukman\/go,leeric92\/go,undergrowthlinear\/go,yasarkunduz\/go,mdp\/go,shawnl\/go,yuhengye\/go,chinanjjohn2012\/go,NunoEdgarGub1\/go,jdeng\/go,parkdy\/go,klueska\/go-akaros,vsekhar\/elastic-go,vishsingh\/go,minux\/go-backports,ericsnowcurrently\/go,arschles\/go-1,yasarkunduz\/go,sinuos\/go,alash3al\/go,xinhuang327\/go,vanloswang\/go,momchil-velikov\/go,dafyddcrosby\/go,mgyenik\/go,magastzheng\/go-1,CiscoCloud\/go,mk0x9\/go,tcnksm\/go,chinanjjohn2012\/go,gohin\/go,yasarkunduz\/go,dafyddcrosby\/go,skatsuta\/go,dterei\/go,ObjectiveJoe\/go,Young55555\/go,Ghands\/go,mbrukman\/go,JioCloud\/go,Charlesdong\/go-1,ObjectiveJoe\/go,shawnl\/go,famorted\/go,gavinzhs\/go,g522342435\/go,greyhwndz\/go,dterei\/go,miolini\/go,wangfakang\/go-1,jmptrader\/go,vectaport\/go,WIZARD-CXY\/go,shazow\/go,xinhuang327\/go,baiyunping333\/go,CarterTsai\/go,AALEKH\/go,ImJasonH\/go,vsdutka\/go,arschles\/golang-go,skotti\/go,kim-racktop\/go,leeric92\/go,monetate\/go,baiyunping333\/go,binarycrusader\/go,jonasi\/go,dgnorton\/go,Stan-Lin-\/go,royels\/go,jacobxk\/go,PoohSunny\/go,Endika\/go,jacobsa\/go,minux\/go-backports,CiscoCloud\/go,agaurav\/go,klueska\/go-akaros,cookerzhu\/go,malvira\/go,dafyddcrosby\/go,b-deng\/go,cnbin\/go,mikekap\/go,minux\/go-windows,jacobhaven\/go,NichoZhang\/go,shazow\/go,greyhwndz\/go,skatsuta\/go,vectaport\/go,shines77\/go,mikekap\/go,codestation\/go,jonasi\/go,suncycheng\/go,roth1002\/go,jasonxiong\/go,dkolbly\/go,lihuanghai\/go,vishsingh\/go,josharian\/go,richo\/go,slavau\/go,theass\/go,skunkwerks\/clive,yeyuguo\/go,danielsoro\/go,monetate\/go,mapix\/go,yasarkunduz\/go,NunoEdgarGub1\/go,vectaport\/go,shines77\/go,myPublicGit\/go,gaurav36\/go,magastzheng\/go-1,ericsnowcurrently\/go,Ghands\/go,cnbin\/go,zhangg\/go-1,xiuzhifu\/go,derekmarcotte\/go,PoohSunny\/go,polyverse-security\/go,CiscoCloud\/go,gohin\/go,ErikDubbelboer\/go,baiyunping333\/go,andrewchambers\/go,Badredapple\/go,stormltf\/go,cookerzhu\/go,dpatel06\/go,uileyar\/go,shines77\/go,royels\/go,parkdy\/go,zhangg\/go,frobware\/go,linux-on-ibm-z\/go,frobware\/go,honsiorovskyi\/go,Endika\/go,jasonxiong\/go,gaurav36\/go,Pulgafree\/go,JioCloud\/go,rachtsingh\/gogojuice,mwhudson\/go,b54898533\/go,zouchao2010\/go,stormltf\/go,joshuaprunier\/go,albertjin\/golang-go,cnbin\/go,donnel6809\/go,cookerzhu\/go,uileyar\/go,jacobsa\/go,theass\/go,CodyGuo\/go,kakuhiroshi\/go,WIZARD-CXY\/go,nawawi\/go,famorted\/go,methane\/go,sinuos\/go,gohin\/go,Pulgafree\/go,waterlink\/go,GeorgiCodes\/go,kakuhiroshi\/go,rentongzhang\/go,vanloswang\/go,vsdutka\/go,jasonxiong\/go,nawawi\/go,pgmreddy\/go,mapix\/go,CodyGuo\/go,joshuaprunier\/go,minux\/go-windows,methane\/go,NunoEdgarGub1\/go,cainiaocome\/go,josharian\/go,xujianhai\/go,jonahglover\/go,AnuchitPrasertsang\/go,cnbin\/go,danielsoro\/go,momchil-velikov\/go,klueska\/go-akaros,cloudrain21\/go,odeke-em\/go,cookerzhu\/go,mdp\/go,vanloswang\/go,ErikDubbelboer\/go,klueska\/go-akaros,rentongzhang\/go,minux\/goios,myPublicGit\/go,stormltf\/go,ifagnosticism\/go,samanalysis\/go,Cofyc\/go,cloudrain21\/go,joshuaprunier\/go,theass\/go,Davidzhu001\/go-1,ErikDubbelboer\/go,roth1002\/go,theif519\/go,kakuhiroshi\/go,jonahglover\/go,Badredapple\/go,zhangg\/go-1,rachtsingh\/gogojuice,rachtsingh\/gogojuice,zhangg\/go-1,b-deng\/go,roth1002\/go,Charlesdong\/go-1,kevinc0825\/go,baiyunping333\/go,constantine001\/go,gdey\/go,zouchao2010\/go,alex-zhang\/go,skatsuta\/go,AnuchitPrasertsang\/go,weisd\/go,baiyunping333\/go,agaurav\/go,NichoZhang\/go,Young55555\/go,Samurais\/go,beealone\/go,uileyar\/go,minux\/go-windows,CiscoCloud\/go,suncycheng\/go,4ad\/go,PoohSunny\/go,dpatel06\/go,mbrukman\/go,cyberroadie\/go,gorcz\/go,golang\/go,gomini\/go-mips32,rentongzhang\/go,GeorgiCodes\/go,beealone\/go,lihuanghai\/go,minux\/goios,NichoZhang\/go,jacobsa\/go,willjunspecial\/go,tcnksm\/go,samanalysis\/go,gavinzhs\/go,AnuchitPrasertsang\/go,gorcz\/go,beealone\/go,Pulgafree\/go,9618211\/go,jonahglover\/go,skotti\/go,willjunspecial\/go,likesea\/go,leeric92\/go,polyverse-security\/go,slavau\/go,yeyuguo\/go,skunkwerks\/clive,jdeng\/go,Ghands\/go,samanalysis\/go,jmptrader\/go,myPublicGit\/go,goodlang\/good,skunkwerks\/clive,ifagnosticism\/go,gohin\/go,jacobhaven\/go,ericsnowcurrently\/go,GeorgiCodes\/go,binarycrusader\/go,miolini\/go,vishsingh\/go,polyverse-security\/go,yunkai\/go,minux\/goios,kim-racktop\/go,theif519\/go,Davidzhu001\/go-1,josharian\/go.ssa,linux-on-ibm-z\/go,magastzheng\/go-1,xinhuang327\/go,sosop\/go,likesea\/go,weisd\/go,jacobhaven\/go,gomini\/go-mips32,qskycolor\/go,yuhengye\/go,kevinc0825\/go,jonathanmarvens\/go,linux-on-ibm-z\/go,gavinzhs\/go,waterlink\/go,sagivo\/go,josharian\/go.ssa,9618211\/go,CodyGuo\/go,AnuchitPrasertsang\/go,frobware\/go,snowsnail\/go,miolini\/go,undergrowthlinear\/go,frobware\/go,danycoro\/go,jefby\/go,gorcz\/go,jdhenke\/go,gorcz\/go,honsiorovskyi\/go,alex-zhang\/go,parkdy\/go,dpatel06\/go,gdey\/go,theass\/go,Davidzhu001\/go-1,dgnorton\/go,andrewchambers\/go,derekmarcotte\/go,GeorgiCodes\/go,akutz\/go,youprofit\/go,alash3al\/go,Jordanzuo\/go,theif519\/go,danycoro\/go,willjunspecial\/go,mikekap\/go,ifagnosticism\/go,Jordanzuo\/go,fjballest\/golang,shishkander\/go,malvira\/go,akutz\/go,xujianhai\/go,4ad\/go,cloudflare\/go,dpatel06\/go,Endika\/go,momchil-velikov\/go,willjunspecial\/go,goodlang\/good,vanloswang\/go,Pulgafree\/go,zhangg\/go-1,jdeng\/go,wangfakang\/go-1,nakedgc\/go,Endika\/go,leeric92\/go,nakedgc\/go,malvira\/go,yeyuguo\/go,arschles\/golang-go,lihuanghai\/go,sagivo\/go,agaurav\/go,NichoZhang\/go,mgyenik\/go,albertjin\/golang-go,ganboing\/go-esx,shazow\/go,zouchao2010\/go,mbrukman\/go,sinuos\/go,jameskumar\/go,gdey\/go,binarycrusader\/go,cainiaocome\/go,minux\/go-backports,dkolbly\/go,minux\/goios,sosop\/go,momchil-velikov\/go,gaurav36\/go,arschles\/golang-go,malvira\/go,zcwfeng\/go,Pulgafree\/go,klueska\/go-akaros,samanalysis\/go,NunoEdgarGub1\/go,Young55555\/go,Badredapple\/go,4ad\/go,derekmarcotte\/go,devpadawan\/go,donnel6809\/go,zhangg\/go,CarterTsai\/go,deft-code\/go,vsekhar\/elastic-go,donnel6809\/go,AALEKH\/go,vsekhar\/elastic-go,CiscoCloud\/go,sosop\/go,9618211\/go,klueska\/go-akaros,gomini\/go-mips32,sosop\/go,CiscoCloud\/go,Badredapple\/go,Ghands\/go,g522342435\/go,josharian\/go,parkdy\/go,springning\/go,9618211\/go,jdeng\/go,gorcz\/go,Stan-Lin-\/go,cookerzhu\/go,ObjectiveJoe\/go,slavau\/go,arschles\/go-1,goodlang\/good,kim-racktop\/go,deft-code\/go,leeric92\/go,skatsuta\/go,yasarkunduz\/go,royels\/go,josharian\/go.ssa,uileyar\/go,vsekhar\/elastic-go,codestation\/go,cainiaocome\/go,shishkander\/go,ObjectiveJoe\/go,Jordanzuo\/go,malvira\/go,XuYunnan\/go,ericsnowcurrently\/go,qskycolor\/go,jdhenke\/go,CodyGuo\/go,miolini\/go,Stan-Lin-\/go,Davidzhu001\/go-1,jasonxiong\/go,ObjectiveJoe\/go,ganboing\/go-esx,chinanjjohn2012\/go,ganboing\/go-esx,xujianhai\/go,PoohSunny\/go,vectaport\/go,jonathanmarvens\/go,g522342435\/go,famorted\/go,codestation\/go,xiuzhifu\/go,jonasi\/go,jmptrader\/go,jonahglover\/go,shines77\/go,ichu501\/go,dkolbly\/go,dterei\/go,skotti\/go,willjunspecial\/go,deft-code\/go,sagivo\/go,skunkwerks\/clive,dterei\/go,zcwfeng\/go,gavinzhs\/go,dgnorton\/go,xiaobodu\/go,mapix\/go,b54898533\/go,jonahglover\/go,RBEGamer\/go,alash3al\/go,mwhudson\/go,AALEKH\/go,slavau\/go,ericsnowcurrently\/go,monetate\/go,golang\/go,4ad\/go,gomini\/go-mips32,xujianhai\/go,mapix\/go,jacobxk\/go,minux\/go-backports,methane\/go,ObjectiveJoe\/go,cainiaocome\/go,joshuaprunier\/go,mikekap\/go,shawnl\/go,mk0x9\/go,suncycheng\/go,arschles\/go-1,9618211\/go,yeyuguo\/go,jdeng\/go,skotti\/go,magastzheng\/go-1,alash3al\/go,cloudrain21\/go,g522342435\/go,b-deng\/go,kakuhiroshi\/go,kevinc0825\/go,donnel6809\/go,AALEKH\/go,jmptrader\/go,malvira\/go,pgmreddy\/go,CarterTsai\/go,yuhengye\/go,nakedgc\/go,alash3al\/go,monetate\/go,jacobhaven\/go,constantine001\/go,Charlesdong\/go-1,greyhwndz\/go,WIZARD-CXY\/go,Samurais\/go,qskycolor\/go,Davidzhu001\/go-1,honsiorovskyi\/go,snowsnail\/go,mikekap\/go,joshuaprunier\/go,cookerzhu\/go,jdeng\/go,jonahglover\/go,PoohSunny\/go,jacobhaven\/go,zcwfeng\/go,jmptrader\/go,honsiorovskyi\/go,zhangg\/go,shishkander\/go,Jordanzuo\/go,stormltf\/go,wangfakang\/go-1,skatsuta\/go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib9\/tempdir_unix.c\n+++ src\/lib9\/tempdir_unix.c\n@@ -16,7 +16,7 @@\n \tchar *tmp, *p;\n \t\n \ttmp = getenv(\"TMPDIR\");\n-\tif(tmp == nil)\n+\tif(tmp == nil || strlen(tmp) == 0)\n \t\ttmp = \"\/var\/tmp\";\n \tp = smprint(\"%s\/go-link-XXXXXX\", tmp);\n \tif(mkdtemp(p) == nil)\n"} {"commit":"7050033b8fb8da56776a332c28adceeba7281fe3","subject":"src\/libFLAC\/ia32\/nasm.h : Fix nasm warning on windows.","message":"src\/libFLAC\/ia32\/nasm.h : Fix nasm warning on windows.\n\nPatch from Ozkan Sezer <sezeroz@gmail.com>.\n","repos":"waitman\/flac,fredericgermain\/flac,fredericgermain\/flac,waitman\/flac,waitman\/flac,waitman\/flac,fredericgermain\/flac,waitman\/flac,fredericgermain\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libFLAC\/ia32\/nasm.h\n+++ src\/libFLAC\/ia32\/nasm.h\n@@ -79,7 +79,7 @@\n %1:\n %endmacro\n \n-%ifndef OBJ_FORMAT_aout\n+%ifdef OBJ_FORMAT_elf\n section .note.GNU-stack progbits noalloc noexec nowrite align=1\n %endif\n \n"} {"commit":"fd9ee58e13a57e69eb84b118f1e1ba24cf7b0174","subject":"Add api to compute aabb's volume, and compute volume ratio.","message":"Add api to compute aabb's volume, and compute volume ratio.\n","repos":"nakdai\/aten,nakdai\/aten","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/libaten\/math\/aabb.h\n+++ src\/libaten\/math\/aabb.h\n@@ -278,6 +278,23 @@\n \n \t\t\tm_min = _min;\n \t\t\tm_max = _max;\n+\t\t}\n+\n+\t\treal volume() const\n+\t\t{\n+\t\t\tauto dx = aten::abs(m_max.x - m_min.x);\n+\t\t\tauto dy = aten::abs(m_max.y - m_min.y);\n+\t\t\tauto dz = aten::abs(m_max.z - m_min.z);\n+\n+\t\t\treturn dx * dy * dz;\n+\t\t}\n+\n+\t\treal computeRatio(const aabb& box)\n+\t\t{\n+\t\t\tauto v0 = volume();\n+\t\t\tauto v1 = box.volume();\n+\n+\t\t\treturn v1 \/ (v0 + AT_MATH_EPSILON);\n \t\t}\n \n \t\tstatic aabb merge(const aabb& box0, const aabb& box1)\n"} {"commit":"8b01a22bd261aef0b5ff3d29980b774e0e742d20","subject":"libbuxton: Handle unset notification","message":"libbuxton: Handle unset notification\n","repos":"sofar\/buxton,sofar\/buxton","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libbuxton\/lbuxton.c\n+++ src\/libbuxton\/lbuxton.c\n@@ -502,7 +502,7 @@\n void *buxton_response_value(BuxtonResponse response)\n {\n \tvoid *p = NULL;\n-\tBuxtonData *d;\n+\tBuxtonData *d = NULL;\n \t_BuxtonResponse *r = (_BuxtonResponse *)response;\n \tBuxtonControlMessage type;\n \n@@ -510,12 +510,15 @@\n \t\treturn NULL;\n \n \ttype = buxton_response_type(response);\n-\tif (type == BUXTON_CONTROL_GET)\n+\tif (type == BUXTON_CONTROL_GET) {\n \t\td = buxton_array_get(r->data, 1);\n-\telse if (type == BUXTON_CONTROL_CHANGED)\n-\t\td = buxton_array_get(r->data, 0);\n-\telse\n+\t} else if (type == BUXTON_CONTROL_CHANGED) {\n+\t\tif (r->data->len) {\n+\t\t\td = buxton_array_get(r->data, 0);\n+\t\t}\n+\t} else {\n \t\tgoto out;\n+\t}\n \n \tif (!d)\n \t\tgoto out;\n"} {"commit":"d37ef02b1d70015cf78b0fb6f93a1304bc933048","subject":"hack to find first instruction for decoding the pc\/line table properly.","message":"hack to find first instruction for decoding the pc\/line table properly.\n\nSVN=122792","repos":"abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libmach_amd64\/sym.c\n+++ src\/libmach_amd64\/sym.c\n@@ -83,6 +83,7 @@\n static\tTxtsym\t*txt;\t\t\t\/* Base of text symbol table *\/\n static\tuvlong\ttxtstart;\t\t\/* start of text segment *\/\n static\tuvlong\ttxtend;\t\t\t\/* end of text segment *\/\n+static\tuvlong\tfirstinstr;\t\t\/* as found from symtab; needed for amd64 *\/\n \n static void\tcleansyms(void);\n static long\tdecodename(Biobuf*, Sym*);\n@@ -385,6 +386,7 @@\n \t\treturn 1;\n \tisbuilt = 1;\n \t\t\t\/* allocate the tables *\/\n+\tfirstinstr = 0;\n \tif(nglob) {\n \t\tglobals = malloc(nglob*sizeof(*globals));\n \t\tif(!globals) {\n@@ -428,6 +430,7 @@\n \thp = hist;\n \tap = autos;\n \tfor(p = symbols; i-- > 0; p++) {\n+\/\/print(\"sym %d type %c name %s value %llux\\n\", p-symbols, p->type, p->name, p->value);\n \t\tswitch(p->type) {\n \t\tcase 'D':\n \t\tcase 'd':\n@@ -474,6 +477,8 @@\n \t\t\ttp->locals = ap;\n \t\t\tif(debug)\n \t\t\t\tprint(\"TEXT: %s at %llux\\n\", p->name, p->value);\n+\t\t\tif (firstinstr == 0 || p->value < firstinstr)\n+\t\t\t\tfirstinstr = p->value;\n \t\t\tif(f && !f->sym) {\t\t\t\/* first *\/\n \t\t\t\tf->sym = p;\n \t\t\t\tf->addr = p->value;\n@@ -1045,6 +1050,7 @@\n \t\t\tbot = mid;\n \t\telse {\n \t\t\tline = pc2line(dot);\n+\t\t\tprint(\"line %d\\n\", line);\n \t\t\tif(line > 0 && fline(str, n, line, f->hist, 0) >= 0)\n \t\t\t\treturn 1;\n \t\t\tbreak;\n@@ -1269,7 +1275,10 @@\n \tif(pcline == 0)\n \t\treturn -1;\n \tcurrline = 0;\n-\tcurrpc = txtstart-mach->pcquant;\n+\tif (firstinstr != 0)\n+\t\tcurrpc = firstinstr-mach->pcquant;\n+\telse\n+\t\tcurrpc = txtstart-mach->pcquant;\n \tif(pc<currpc || pc>txtend)\n \t\treturn ~0;\n \n"} {"commit":"279d424fc0cd2545e59df4b81e7c3898f32eaf71","subject":"Set max_score of a group to 0 by default.","message":"Set max_score of a group to 0 by default.\n","repos":"amohanta\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,andrejzverev\/rspamd,amohanta\/rspamd,dark-al\/rspamd,AlexeySa\/rspamd,amohanta\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,dark-al\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,dark-al\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,dark-al\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,minaevmike\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,awhitesong\/rspamd,AlexeySa\/rspamd,dark-al\/rspamd,minaevmike\/rspamd","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/libserver\/cfg_rcl.c\n+++ src\/libserver\/cfg_rcl.c\n@@ -355,7 +355,7 @@\n \tif (sym_group == NULL) {\n \t\t\/* Create new group *\/\n \t\tsym_group =\n-\t\t\trspamd_mempool_alloc (cfg->cfg_pool,\n+\t\t\trspamd_mempool_alloc0 (cfg->cfg_pool,\n \t\t\t\tsizeof (struct rspamd_symbols_group));\n \t\tsym_group->name = rspamd_mempool_strdup (cfg->cfg_pool, group);\n \t\tsym_group->symbols = NULL;\n@@ -558,6 +558,7 @@\n \t\t\t}\n \t\t}\n \t}\n+\n \t\/* Handle symbols *\/\n \tif (!rspamd_rcl_symbols_handler (pool, obj, cfg, metric, NULL,\n \t\t\thave_symbols, err)) {\n"} {"commit":"067fcf98df70a641ee1e66418baacadcce30336c","subject":"Rename variable that it doesn't shadows a global name.","message":"Rename variable that it doesn't shadows a global name.\n","repos":"mloy\/cjet,mloy\/cjet,gatzka\/cjet,gatzka\/cjet,gatzka\/cjet,mloy\/cjet,gatzka\/cjet,mloy\/cjet,mloy\/cjet,gatzka\/cjet","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/linux\/timer_linux.c\n+++ src\/linux\/timer_linux.c\n@@ -92,21 +92,21 @@\n \ttimer->handler_context = handler_context;\n \n \n-\tstruct itimerspec time = convert_timeoutns_to_itimerspec(timeout_ns);\n-\treturn timerfd_settime(timer->ev.sock, 0, &time, NULL);\n+\tstruct itimerspec timeout = convert_timeoutns_to_itimerspec(timeout_ns);\n+\treturn timerfd_settime(timer->ev.sock, 0, &timeout, NULL);\n }\n \n static int timer_cancel(void *this_ptr)\n {\n \tstruct cjet_timer *timer = (struct cjet_timer *)this_ptr;\n-\tstatic const struct itimerspec time = {\n+\tstatic const struct itimerspec timeout = {\n \t\t.it_interval.tv_sec = 0,\n \t\t.it_interval.tv_nsec = 0,\n \t\t.it_value.tv_sec = 0,\n \t\t.it_value.tv_nsec = 0\n \t};\n \n-\tint ret = timerfd_settime(timer->ev.sock, 0, &time, NULL);\n+\tint ret = timerfd_settime(timer->ev.sock, 0, &timeout, NULL);\n \tif (likely(ret == 0)) {\n \t\ttimer->handler(timer->handler_context, true);\n \t} else {\n"} {"commit":"5ff12632facea5e4b0e1c5a19eca8213da6f8019","subject":"Make LFS use kernel defaults for fuse_conn options. Currently several options need to be specified in 2 locations: command line and on the fuse_conn itself. Keeping them in sync is problematic.","message":"Make LFS use kernel defaults for fuse_conn options.\nCurrently several options need to be specified in 2 locations:\ncommand line and on the fuse_conn itself. Keeping them in sync\nis problematic.\n","repos":"tacketar\/lstore,accre\/lstore,accre\/lstore,accre\/lstore,tacketar\/lstore,accre\/lstore,tacketar\/lstore,tacketar\/lstore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lio\/lio_fuse_core.c\n+++ src\/lio\/lio_fuse_core.c\n@@ -1572,6 +1572,7 @@\n {\n lio_fuse_t *lfs;\n char *section = \"lfs\";\n+ ex_off_t n;\n \n lio_fuse_init_args_t *init_args;\n lio_fuse_init_args_t real_args;\n@@ -1622,9 +1623,11 @@\n lfs->n_merge = tbx_inip_get_integer(lfs->lc->ifd, section, \"n_merge\", 128);\n conn->max_write = tbx_inip_get_integer(lfs->lc->ifd, section, \"max_write\", 10*1024*1024);\n #ifdef HAS_FUSE3\n- conn->max_read = tbx_inip_get_integer(lfs->lc->ifd, section, \"max_read\", 10*1024*1024);\n+ n = tbx_inip_get_integer(lfs->lc->ifd, section, \"max_read\", -1);\n+ if (n > -1) conn->max_read = n;\n #endif\n- conn->max_readahead = tbx_inip_get_integer(lfs->lc->ifd, section, \"max_readahead\", 1*1024*1024);\n+ n = tbx_inip_get_integer(lfs->lc->ifd, section, \"max_readahead\", -1);\n+ if (n > -1) conn->max_readahead = n;\n apr_pool_create(&(lfs->mpool), NULL);\n apr_thread_mutex_create(&(lfs->lock), APR_THREAD_MUTEX_DEFAULT, lfs->mpool);\n lfs->open_files = apr_hash_make(lfs->mpool);\n"} {"commit":"38ba12a866708c643ac9236492d62893517626ef","subject":"imgbtn fix","message":"imgbtn fix\n","repos":"littlevgl\/lvgl,littlevgl\/lvgl,littlevgl\/lvgl,littlevgl\/lvgl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lv_objx\/lv_imgbtn.c\n+++ src\/lv_objx\/lv_imgbtn.c\n@@ -309,18 +309,18 @@\n lv_draw_img(&imgbtn->coords, mask, src, style, opa_scale);\n }\n #else\n+ const void * src;\n+ src = ext->img_src_left[state];\n if(lv_img_src_get_type(src) == LV_IMG_SRC_SYMBOL) {\n LV_LOG_WARN(\"lv_imgbtn_design: SYMBOLS are not supported in tiled mode\")\n- return;\n- }\n-\n- const void * src;\n+ return true;\n+ }\n+\n lv_img_header_t header;\n lv_area_t coords;\n lv_coord_t left_w = 0;\n lv_coord_t right_w = 0;\n \n- src = ext->img_src_left[state];\n if(src) {\n lv_img_decoder_get_info(src, &header);\n left_w = header.w;\n"} {"commit":"02a2fbef902730bc57b680707fcbd45f4bf1a392","subject":"Fix natives.","message":"Fix natives.\n","repos":"oci-pronghorn\/PronghornIoT,oci-pronghorn\/PronghornIoT,oci-pronghorn\/FogLight,oci-pronghorn\/FogLight,oci-pronghorn\/FogLight","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/main\/c\/raspicam4j.c\n+++ src\/main\/c\/raspicam4j.c\n@@ -141,13 +141,13 @@\n }\n \n \/\/ Put the first buffer in the incoming queue.\n- if (v4l2_ioctl(fd, VIDIOC_QBUF, &buffers[0].info) < 0) {\n+ if (v4l2_ioctl(fd, VIDIOC_QBUF, &(buffers[0].info)) < 0) {\n fprintf(stderr, \"Could not queue buffer (during open).\\n\");\n return -1; \/\/ TODO: More descriptive error?\n }\n \n \/\/ Activate streaming\n- if (v4l2_ioctl(fd, VIDIOC_STREAMON, &buffers[0].info.type) < 0) {\n+ if (v4l2_ioctl(fd, VIDIOC_STREAMON, &(buffers[0].info.type)) < 0) {\n v4l2_close(fd);\n fprintf(stderr, \"Could not activate streaming.\\n\");\n return -1; \/\/ TODO: More descriptive error?\n@@ -182,9 +182,9 @@\n memset(&(buffers[nextBufferToDequeue].info), 0, sizeof(buffers[nextBufferToDequeue].info));\n buffers[nextBufferToDequeue].info.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;\n buffers[nextBufferToDequeue].info.memory = V4L2_MEMORY_USERPTR;\n- if (v4l2_ioctl(fd, VIDIOC_DQBUF, &buffers[nextBufferToDequeue].info) < 0) {\n+ if (v4l2_ioctl(fd, VIDIOC_DQBUF, &(buffers[nextBufferToDequeue].info)) < 0) {\n if (errno != EAGAIN) {\n- fprintf(stderr, \"Unknown error code %d when reading frame from camera.\");\n+ fprintf(stderr, \"Unknown error code %d when reading frame from camera.\", errno);\n }\n \n return -1;\n@@ -198,7 +198,7 @@\n nextBufferToDequeue = nextBufferToDequeue % BUFFERS_COUNT;\n \n \/\/ Put the buffer in the incoming queue.\n- if (v4l2_ioctl(fd, VIDIOC_QBUF, &buffers[nextBufferToDequeue].info) < 0) {\n+ if (v4l2_ioctl(fd, VIDIOC_QBUF, &(buffers[nextBufferToDequeue].info)) < 0) {\n fprintf(stderr, \"Could not queue buffer (during read).\\n\");\n }\n \n@@ -208,7 +208,7 @@\n JNIEXPORT jint JNICALL Java_com_ociweb_iot_camera_RaspiCam_close(JNIEnv *env, jobject object, jint fd) {\n \n \/\/ Deactivate streaming\n- if (v4l2_ioctl(fd, VIDIOC_STREAMOFF, &buffers[0].info.type) < 0){\n+ if (v4l2_ioctl(fd, VIDIOC_STREAMOFF, &(buffers[0].info.type)) < 0){\n return -1; \/\/ TODO: More descriptive error?\n } else {\n v4l2_close(fd);\n"} {"commit":"f7b0afe2509dda0b1a4b0bd804da2f36f9cbf445","subject":"Trying nginx model","message":"Trying nginx model\n","repos":"codepr\/memento,codepr\/memento","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/memento-benchmark.c\n+++ src\/memento-benchmark.c\n@@ -120,7 +120,7 @@\n \n char *host = \"127.0.0.1\";\n char *port = \"8082\";\n- int thread_nr = 50;\n+ int thread_nr = 150;\n pthread_t th[thread_nr];\n \n if (argc > 2) {\n@@ -218,7 +218,7 @@\n for (int i = 0; i < thread_nr; ++i) {\n if (pthread_create(&th[i], NULL, make_requests, &conn) < 0)\n perror(\"pthread\");\n- usleep(1000);\n+ usleep(10000);\n }\n \n for (int i = 0; i < thread_nr; ++i)\n"} {"commit":"c4b23af3dc673c4f648332176a92d24b80d93b2f","subject":"Change invalid retain count assert message","message":"Change invalid retain count assert message\n","repos":"averello\/memorymanagement","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/memory_management.c\n+++ src\/memory_management.c\n@@ -80,7 +80,7 @@\n \t}\n \t\n \tunsigned long long result = _MEMORY_MANAGEMENT_ATOMIC_RELEASE(object);\n-\tassert(result != _MEMORY_MANAGEMENT_INVALID_RETAIN_COUNT && \"Sent retain() to invalid pointer.\");\n+\tassert(result != _MEMORY_MANAGEMENT_INVALID_RETAIN_COUNT && \"Sent release() to invalid pointer.\");\n \tif ( result == 0) {\n \t\t_MEMORY_MANAGEMENT_CALL_DEALLOC(object);\n \t\t_MEMORY_MANAGEMENT_INVALIDATE(object);\n"} {"commit":"a63b90712aad81d544eb8931493a6c4a7805f7fb","subject":"mesa: also check for __NetBSD__","message":"mesa: also check for __NetBSD__\n","repos":"metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/execmem.c\n+++ src\/mesa\/main\/execmem.c\n@@ -36,7 +36,7 @@\n \n \n \n-#if defined(__linux__) || defined(__OpenBSD__)\n+#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__)\n \n \/*\n * Allocate a large block of memory which can hold code then dole it out\n"} {"commit":"7e4e79be6bba7cf68046bd77aa8d44fb52ca5186","subject":"mesa: Remove unnecessary header.","message":"mesa: Remove unnecessary header.\n","repos":"jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/formats.h\n+++ src\/mesa\/main\/formats.h\n@@ -33,7 +33,7 @@\n #define FORMATS_H\n \n \n-#include \"main\/mtypes.h\"\n+#include <GL\/gl.h>\n \n \n \n"} {"commit":"529b6d1f3d80f5651bdb477c20fdbb6f6a4d9746","subject":"mesa: Remove rounding bias in _mesa_float_to_half()","message":"mesa: Remove rounding bias in _mesa_float_to_half()\n\nNot all float32 values can be exactly represented as a float16.\n_mesa_float_to_half() rounded such intermediate float32 values to zero by\ntruncating unrepresentable bits in the mantissa.\n\nThis patch improves _mesa_float_to_half() by rounding intermediate float32\nvalues to the nearest float16; when the float32 is exactly between two\nfloat16 values we round to the one with an even mantissa. This behavior is\npreferred over the old behavior because:\n - It has reduced bias relative to the old behavior.\n\n - It reproduces the behavior of real hardware: opcode F32TO16 in\n Intel's GPU ISA.\n\n - By reproducing the behavior of the GPU (at least on Intel hardware),\n compile-time evaluation of constant packHalf2x16 GLSL expressions will\n result in the same value as if the expression were executed on the GPU.\n\nReviewed-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\nReviewed-by: Paul Berry <de21b9f22e6dd0bdf7890875d6e07ef4967c44ce@gmail.com>\nSigned-off-by: Chad Versace <a557f7f75bf28dc19ac99107f5cc7cd6b3fbdb1a@linux.intel.com>\n","repos":"mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/imports.c\n+++ src\/mesa\/main\/imports.c\n@@ -336,8 +336,21 @@\n \n \/**\n * Convert a 4-byte float to a 2-byte half float.\n- * Based on code from:\n- * http:\/\/www.opengl.org\/discussion_boards\/ubb\/Forum3\/HTML\/008786.html\n+ *\n+ * Not all float32 values can be represented exactly as a float16 value. We\n+ * round such intermediate float32 values to the nearest float16. When the\n+ * float32 lies exactly between to float16 values, we round to the one with\n+ * an even mantissa.\n+ *\n+ * This rounding behavior has several benefits:\n+ * - It has no sign bias.\n+ *\n+ * - It reproduces the behavior of real hardware: opcode F32TO16 in Intel's\n+ * GPU ISA.\n+ *\n+ * - By reproducing the behavior of the GPU (at least on Intel hardware),\n+ * compile-time evaluation of constant packHalf2x16 GLSL expressions will\n+ * result in the same value as if the expression were executed on the GPU.\n *\/\n GLhalfARB\n _mesa_float_to_half(float val)\n@@ -376,32 +389,13 @@\n else {\n \/* regular number *\/\n const int new_exp = flt_e - 127;\n- if (new_exp < -24) {\n- \/* this maps to 0 *\/\n- \/* m = 0; - already set *\/\n+ if (new_exp < -14) {\n+ \/* The float32 lies in the range (0.0, min_normal16) and is rounded\n+ * to a nearby float16 value. The result will be either zero, subnormal,\n+ * or normal.\n+ *\/\n e = 0;\n- }\n- else if (new_exp < -14) {\n- \/* this maps to a denorm *\/\n- unsigned int exp_val = (unsigned int) (-14 - new_exp); \/* 2^-exp_val*\/\n- e = 0;\n- switch (exp_val) {\n- case 0:\n- _mesa_warning(NULL,\n- \"float_to_half: logical error in denorm creation!\\n\");\n- \/* m = 0; - already set *\/\n- break;\n- case 1: m = 512 + (flt_m >> 14); break;\n- case 2: m = 256 + (flt_m >> 15); break;\n- case 3: m = 128 + (flt_m >> 16); break;\n- case 4: m = 64 + (flt_m >> 17); break;\n- case 5: m = 32 + (flt_m >> 18); break;\n- case 6: m = 16 + (flt_m >> 19); break;\n- case 7: m = 8 + (flt_m >> 20); break;\n- case 8: m = 4 + (flt_m >> 21); break;\n- case 9: m = 2 + (flt_m >> 22); break;\n- case 10: m = 1; break;\n- }\n+ m = _mesa_round_to_even((1 << 24) * fabsf(fi.f));\n }\n else if (new_exp > 15) {\n \/* map this value to infinity *\/\n@@ -409,10 +403,24 @@\n e = 31;\n }\n else {\n- \/* regular *\/\n+ \/* The float32 lies in the range\n+ * [min_normal16, max_normal16 + max_step16)\n+ * and is rounded to a nearby float16 value. The result will be\n+ * either normal or infinite.\n+ *\/\n e = new_exp + 15;\n- m = flt_m >> 13;\n- }\n+ m = _mesa_round_to_even(flt_m \/ (float) (1 << 13));\n+ }\n+ }\n+\n+ assert(0 <= m && m <= 1024);\n+ if (m == 1024) {\n+ \/* The float32 was rounded upwards into the range of the next exponent,\n+ * so bump the exponent. This correctly handles the case where f32\n+ * should be rounded up to float16 infinity.\n+ *\/\n+ ++e;\n+ m = 0;\n }\n \n result = (s << 15) | (e << 10) | m;\n"} {"commit":"ab564b516e258c965b55b3fa6f9323492ff19e15","subject":"mesa: Clean up header file inclusion in version.c.","message":"mesa: Clean up header file inclusion in version.c.\n\nInclude imports.h directly instead of indirectly through context.h.\nversion.c does use any symbols that are added by context.h.\n","repos":"zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/version.c\n+++ src\/mesa\/main\/version.c\n@@ -22,7 +22,7 @@\n *\/\n \n \n-#include \"context.h\"\n+#include \"imports.h\"\n #include \"mtypes.h\"\n #include \"version.h\"\n \n"} {"commit":"4315efd229a321fb9e076cdf03d113b5e4a89c90","subject":"-doxygen fix","message":"-doxygen fix\n\ngit-svn-id: d3d46767b8f15aa15dc28b4413db96165ce057f7@34384 140774ce-b5e7-0310-ab8b-a85725594a96\n","repos":"scottjg\/libmicrohttpd,svn2github\/libmicrohttpd,redBorder\/libmicrohttpd,svn2github\/libmicrohttpd,svn2github\/libmicrohttpd,redBorder\/libmicrohttpd,redBorder\/libmicrohttpd,scottjg\/libmicrohttpd,svn2github\/libmicrohttpd,scottjg\/libmicrohttpd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microhttpd\/daemon.c\n+++ src\/microhttpd\/daemon.c\n@@ -738,7 +738,7 @@\n * Main function of the thread that handles an individual\n * connection when #MHD_USE_THREAD_PER_CONNECTION is set.\n *\n- * @param data the 'struct MHD_Connection' this thread will handle\n+ * @param data the `struct MHD_Connection` this thread will handle\n * @return always 0\n *\/\n static MHD_THRD_RTRN_TYPE_ MHD_THRD_CALL_SPEC_\n"} {"commit":"fbf0fe177e8d18913fbeba14c9b8fad8afdbb02d","subject":"MIPS: Fix Win32 buildbreak (caused by overriden methods that have disappeared while having the patch out for code review).","message":"MIPS: Fix Win32 buildbreak (caused by overriden methods that have disappeared while having the patch out for code review).\n\nPort r18627 (c2ba7b25)\n\nBUG=\nR=plind44@gmail.com\n\nReview URL: https:\/\/codereview.chromium.org\/140203002\n\ngit-svn-id: b158db1e4b4ab85d4c9e510fdef4b1e8c614b15b@18631 ce2b1a6d-e550-0410-aec6-3dcde31c8c00\n","repos":"UniversalFuture\/moosh,UniversalFuture\/moosh,UniversalFuture\/moosh,UniversalFuture\/moosh","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mips\/lithium-mips.h\n+++ src\/mips\/lithium-mips.h\n@@ -1862,11 +1862,6 @@\n const CallInterfaceDescriptor* descriptor_;\n ZoneList<LOperand*> inputs_;\n \n- virtual void InternalSetOperandAt(int index,\n- LOperand* value) V8_FINAL V8_OVERRIDE {\n- inputs_[index] = value;\n- }\n-\n \/\/ Iterator support.\n virtual int InputCount() V8_FINAL V8_OVERRIDE { return inputs_.length(); }\n virtual LOperand* InputAt(int i) V8_FINAL V8_OVERRIDE { return inputs_[i]; }\n"} {"commit":"274fa978cf7f76dfb48f1243c30be8f7ae0e7de5","subject":"(if (not (not X)) Y Z) compiles as (if X Y Z), etc.","message":"(if (not (not X)) Y Z) compiles as (if X Y Z), etc.\n\nsvn: r1770\n","repos":"mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/mzscheme\/src\/eval.c\n+++ src\/mzscheme\/src\/eval.c\n@@ -1034,16 +1034,20 @@\n \/* Done here because `not' is easily recognized at this\n point, and we haven't yet resolved Scheme-stack locations\n so it's ok to remove an application. *\/\n- if (SAME_TYPE(SCHEME_TYPE(t), scheme_application2_type)) {\n- Scheme_App2_Rec *app;\n-\n- app = (Scheme_App2_Rec *)t;\n- if (SAME_PTR(scheme_not_prim, app->rator)) {\n- t = tb;\n- tb = fb;\n- fb = t;\n- t = app->rand;\n- }\n+ while (1) {\n+ if (SAME_TYPE(SCHEME_TYPE(t), scheme_application2_type)) {\n+ Scheme_App2_Rec *app;\n+ \n+ app = (Scheme_App2_Rec *)t;\n+ if (SAME_PTR(scheme_not_prim, app->rator)) {\n+\tt = tb;\n+\ttb = fb;\n+\tfb = t;\n+\tt = app->rand;\n+ } else\n+\tbreak;\n+ } else\n+ break;\n }\n \n t = scheme_resolve_expr(t, info);\n"} {"commit":"ed8b209ee3e0086e91d71ebda39846957df12a0b","subject":"Added NEDTRIE_EXACTFIND()","message":"Added NEDTRIE_EXACTFIND()\n","repos":"ned14\/tnfox,ned14\/tnfox,ned14\/tnfox,ned14\/tnfox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/nedmalloc\/nedtrie.h\n+++ src\/nedmalloc\/nedtrie.h\n@@ -179,7 +179,7 @@\n } \/* Anonymous namespace *\/\r\n #endif\r\n \r\n-\/*! \\def NEDNEDTRIE_INDEXBINS\r\n+\/*! \\def NEDTRIE_INDEXBINS\r\n \\brief Defines the number of top level bit bins to use. The default based on size_t is usually fine.\r\n *\/\r\n #define NEDTRIE_INDEXBINS (8*sizeof(void *))\r\n@@ -189,7 +189,7 @@\n #define NEDTRIE_HEAD(name, type) \\\r\n struct name { \\\r\n size_t count; \\\r\n- struct type *triebins[NEDTRIE_INDEXBINS]; \/* each containing (1<<x)<bitscanrev(x)<(1<<(x+1)) *\/ \\\r\n+ struct type *triebins[NEDTRIE_INDEXBINS]; \/* each containing (1<<x)<=bitscanrev(x)<(1<<(x+1)) *\/ \\\r\n int nobbledir; \\\r\n }\r\n \/*! \\def NEDTRIE_ENTRY\r\n@@ -621,6 +621,51 @@\n proto INLINE struct type * name##_NEDTRIE_FIND(struct name *RESTRICT head, struct type *RESTRICT r)\t\t\\\r\n { \\\r\n return nedtries::triefind<struct name, struct type, NEDTRIEFIELDOFFSET(type, field), keyfunct>(head, r); \\\r\n+}\r\n+#endif \/* NEDTRIEUSEMACROS *\/\r\n+\r\n+#ifdef __cplusplus\r\n+namespace nedtries {\r\n+ template<class trietype, class type, size_t fieldoffset, size_t (*keyfunct)(const type *RESTRICT)> DEBUGINLINE int trieexactfind(trietype *RESTRICT head, type *RESTRICT r)\r\n+ {\r\n+ type *RESTRICT node;\r\n+ TrieLink_t<type> *RESTRICT nodelink;\r\n+\r\n+ if(!head->count) return 0;\r\n+ if(!(node=triefind<trietype, type, fieldoffset, keyfunct>(head, r))) return 0;\r\n+ nodelink=(TrieLink_t<type> *RESTRICT)((size_t) node + fieldoffset);\r\n+ if(nodelink->trie_prev) node=nodelink->trie_prev;\r\n+ do\r\n+ {\r\n+ if(node==r) return 1;\r\n+ nodelink=(TrieLink_t<type> *RESTRICT)((size_t) node + fieldoffset);\r\n+ node=nodelink->trie_next;\r\n+ } while(node);\r\n+ return 0;\r\n+ }\r\n+}\r\n+#endif \/* __cplusplus *\/\r\n+#if NEDTRIEUSEMACROS\r\n+#define NEDTRIE_GENERATE_EXACTFIND(proto, name, type, field, keyfunct) \\\r\n+ proto INLINE int name##_NEDTRIE_EXACTFIND(struct name *RESTRICT head, struct type *RESTRICT r)\t\t\\\r\n+ { \\\r\n+ struct type *RESTRICT node; \\\r\n+\\\r\n+ if(!head->count) return 0; \\\r\n+ if(!(node=name##_NEDTRIE_FIND(head, r))) return 0; \\\r\n+ if(node->field.trie_prev) node=node->field.trie_prev; \\\r\n+ do \\\r\n+ { \\\r\n+ if(node==r) return 1; \\\r\n+ node=node->field.trie_next; \\\r\n+ } while(node); \\\r\n+ return 0; \\\r\n+ }\r\n+#else \/* NEDTRIEUSEMACROS *\/\r\n+#define NEDTRIE_GENERATE_EXACTFIND(proto, name, type, field, keyfunct) \\\r\n+ proto INLINE int name##_NEDTRIE_EXACTFIND(struct name *RESTRICT head, struct type *RESTRICT r)\t\t\\\r\n+{ \\\r\n+ return nedtries::trieexactfind<struct name, struct type, NEDTRIEFIELDOFFSET(type, field), keyfunct>(head, r); \\\r\n }\r\n #endif \/* NEDTRIEUSEMACROS *\/\r\n \r\n@@ -1007,14 +1052,15 @@\n \\brief Substitutes a set of nedtrie implementation function definitions specialised according to type.\r\n *\/\r\n #define NEDTRIE_GENERATE(proto, name, type, field, keyfunct, nobblefunct) \\\r\n- NEDTRIE_GENERATE_NOBBLES(proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_INSERT (proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_REMOVE (proto, name, type, field, keyfunct, nobblefunct) \\\r\n- NEDTRIE_GENERATE_FIND (proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_NFIND (proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_MINMAX (proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_PREV (proto, name, type, field, keyfunct) \\\r\n- NEDTRIE_GENERATE_NEXT (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_NOBBLES (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_INSERT (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_REMOVE (proto, name, type, field, keyfunct, nobblefunct) \\\r\n+ NEDTRIE_GENERATE_FIND (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_EXACTFIND(proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_NFIND (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_MINMAX (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_PREV (proto, name, type, field, keyfunct) \\\r\n+ NEDTRIE_GENERATE_NEXT (proto, name, type, field, keyfunct) \\\r\n proto INLINE struct type * name##_NEDTRIE_PREVLEAF(struct type *r) { return (r)->field.trie_prev; } \\\r\n proto INLINE struct type * name##_NEDTRIE_NEXTLEAF(struct type *r) { return (r)->field.trie_next; }\r\n \r\n@@ -1030,6 +1076,10 @@\n \\brief Finds the item with the same key as y in nedtrie x.\r\n *\/\r\n #define NEDTRIE_FIND(name, x, y) name##_NEDTRIE_FIND(x, y)\r\n+\/*! \\def NEDTRIE_EXACTFIND\r\n+\\brief Returns true if there is an item with the same key and address as y in nedtrie x.\r\n+*\/\r\n+#define NEDTRIE_EXACTFIND(name, x, y) name##_NEDTRIE_EXACTFIND(x, y)\r\n \/*! \\def NEDTRIE_NFIND\r\n \\brief Finds the item with the nearest key to y in nedtrie x.\r\n *\/\r\n"} {"commit":"a700c80e3fc5d4dcd28dde7d745bbd1a1d48119d","subject":"net: Properly initialize NetworkClient::m_is_sending; remove m_is_receiving (it is unused).","message":"net: Properly initialize NetworkClient::m_is_sending; remove m_is_receiving (it is unused).\n","repos":"blindsighttf2\/Astron,blindsighttf2\/Astron,blindsighttf2\/Astron,blindsighttf2\/Astron","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/net\/NetworkClient.h\n+++ src\/net\/NetworkClient.h\n@@ -75,8 +75,7 @@\n void handle_disconnect(const boost::system::error_code &ec);\n \n bool m_ssl_enabled;\n- bool m_is_sending;\n- bool m_is_receiving;\n+ bool m_is_sending = false;\n \n bool m_is_data = false;\n uint8_t m_size_buf[sizeof(dgsize_t)];\n"} {"commit":"0619ddac1d8c25f07f0b4bc78bf343a00e1ae809","subject":"[src] Fix","message":"[src] Fix\n","repos":"rryqszq4\/ngx_php7,rryqszq4\/ngx_php7,rryqszq4\/ngx_php7,rryqszq4\/ngx_php7,rryqszq4\/php7-nginx-module,rryqszq4\/ngx_php7","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ngx_http_php_core.c\n+++ src\/ngx_http_php_core.c\n@@ -175,7 +175,11 @@\n PG(last_error_file) = NULL;\n }\n if (!error_filename) {\n+#if PHP_MAJOR_VERSION >= 8 && PHP_MINOR_VERSION >= 1\n+ error_filename = ZSTR_KNOWN(ZEND_STR_UNKNOWN_CAPITALIZED);\n+#else\n error_filename = \"Unknown\";\n+#endif\n }\n PG(last_error_type) = type;\n #if PHP_MAJOR_VERSION >= 8\n"} {"commit":"f87fd956ac9b793098b9a01498da9102e7d7d8d7","subject":"*** empty log message ***","message":"*** empty log message ***\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":1,"stderr":"error: pathspec 'src\/nwpw\/paw\/makefile.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src\/nwpw\/paw\/makefile.h\n+++ src\/nwpw\/paw\/makefile.h\n@@ -0,0 +1,9 @@\n+FC=ifc\n+F90FLAGS=-w95\n+.SUFFIXES:\n+\n+.SUFFIXES: .o .f90\n+\n+.f90.o :\n+\t$(FC) $(F90FLAGS) $(LIB_INCLUDES) -c $<\n+\n"} {"commit":"8c3cc4b1daf5dd2ac11a646a8859c40f4c37db97","subject":"objstore: vols should be allocated from a umem cache","message":"objstore: vols should be allocated from a umem cache\n\nThis closes #34.\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/nx01","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/objstore\/objstore.c\n+++ src\/objstore\/objstore.c\n@@ -24,6 +24,7 @@\n #include <stdlib.h>\n #include <stdio.h>\n #include <string.h>\n+#include <umem.h>\n \n #include <nomad\/error.h>\n #include <nomad\/objstore.h>\n@@ -40,6 +41,8 @@\n *\/\n static struct backend mem_backend;\n static struct backend *backend;\n+\n+static umem_cache_t *vol_cache;\n \n static int load_backend(struct backend *backend, const char *name)\n {\n@@ -64,17 +67,27 @@\n {\n \tint ret;\n \n+\tvol_cache = umem_cache_create(\"vol\", sizeof(struct objstore_vol),\n+\t\t\t\t 0, NULL, NULL, NULL, NULL, NULL, 0);\n+\tif (!vol_cache)\n+\t\treturn ENOMEM;\n+\n \tret = vg_init();\n \tif (ret)\n-\t\treturn ret;\n+\t\tgoto err;\n \n \tret = load_backend(&mem_backend, \"mem\");\n \tif (ret)\n-\t\treturn ret;\n+\t\tgoto err;\n \n \tbackend = &mem_backend;\n \n \treturn 0;\n+\n+err:\n+\tumem_cache_destroy(vol_cache);\n+\n+\treturn ret;\n }\n \n struct objstore_vol *objstore_vol_create(struct objstore *vg, const char *path,\n@@ -86,7 +99,7 @@\n \tif (!backend->def->vol_ops->create)\n \t\treturn ERR_PTR(ENOTSUP);\n \n-\ts = malloc(sizeof(struct objstore_vol));\n+\ts = umem_cache_alloc(vol_cache, 0);\n \tif (!s)\n \t\treturn ERR_PTR(ENOMEM);\n \n@@ -110,7 +123,7 @@\n \tfree((char *) s->path);\n \n err:\n-\tfree(s);\n+\tumem_cache_free(vol_cache, s);\n \n \treturn ERR_PTR(ret);\n }\n"} {"commit":"3a310bf6ddb439f43221172463569103e239a8cd","subject":"py_tf: fix headers when module is disabled.","message":"py_tf: fix headers when module is disabled.\n","repos":"openmv\/openmv,iabdalkader\/openmv,openmv\/openmv,openmv\/openmv,iabdalkader\/openmv,openmv\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,kwagyeman\/openmv,kwagyeman\/openmv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/omv\/modules\/py_tf.c\n+++ src\/omv\/modules\/py_tf.c\n@@ -9,15 +9,15 @@\n #include \"py\/objlist.h\"\n #include \"py\/objtuple.h\"\n \n+#include \"imlib_config.h\"\n #include \"py_helper.h\"\n+#ifdef IMLIB_ENABLE_TF\n #include \"py_assert.h\"\n #include \"py_image.h\"\n #include \"ff_wrapper.h\"\n #include \"libtf.h\"\n #include \"libtf_person_detect_model_data.h\"\n #include \"py_tf.h\"\n-\n-#ifdef IMLIB_ENABLE_TF\n \n #define PY_TF_PUTCHAR_BUFFER_LEN 1023\n \n"} {"commit":"5724fcb56dfcdefbe78cc10b44c354727ef97e5e","subject":"pcp-atop: ensure acct gen string is null terminated (covscan)","message":"pcp-atop: ensure acct gen string is null terminated (covscan)\n","repos":"adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pcp\/atop\/acctproc.c\n+++ src\/pcp\/atop\/acctproc.c\n@@ -159,7 +159,8 @@\n \t\tapi->mem.majflt = extract_count_t_inst(result, descs, ACCT_MEM_MAJFLT, pid, i);\n \t\tapi->dsk.rio = extract_count_t_inst(result, descs, ACCT_DSK_RIO, pid, i);\n \n-\t\tstrcpy(api->gen.name, insts[i]);\n+\t\tstrncpy(api->gen.name, insts[i], sizeof(api->gen.name));\n+\t\tapi->gen.name[sizeof(api->gen.name)-1] = '\\0';\n \t}\n \n \tpmFreeResult(result);\n"} {"commit":"13b1e3ec3f2aa73ea2dc28e571e2a89e99d27a3b","subject":"fix protos","message":"fix protos\n\ngit-svn-id: 620571fa9b4bd0cbce9a0cf901e91ef896adbf27@53198 d073be05-634f-4543-b044-5fe20cf6d1d6\n","repos":"danchr\/macports-base,macports\/macports-base,neverpanic\/macports-base,macports\/macports-base,danchr\/macports-base,neverpanic\/macports-base","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pextlib1.0\/strsed.c\n+++ src\/pextlib1.0\/strsed.c\n@@ -215,13 +215,13 @@\n \/* ------------------------------------------------------------------------- **\n * Prototypes\n * ------------------------------------------------------------------------- *\/\n-static char *mem();\n-static void mem_init();\n-static void mem_free();\n-static char *build_map();\n-static char nextch();\n-static void mem_save();\n-static int mem_find();\n+static char *mem(int, int);\n+static void mem_init(void);\n+static void mem_free(char *);\n+static char *build_map(char *, char *);\n+static char nextch(char *, int);\n+static void mem_save(int);\n+static int mem_find(int);\n \n \/* ------------------------------------------------------------------------- **\n * strsed\n"} {"commit":"c5258236190c614ab3ddd35390244cbd8f5b5656","subject":"runtime: efence support for growable stacks 1. Fix the bug that shrinkstack returns memory to heap. This causes growslice to misbehave (it manually initialized blocks, and in efence mode shrinkstack's free leads to partially-initialized blocks coming out of growslice. Which in turn causes GC to crash while treating the garbage as Eface\/Iface. 2. Enable efence for stack segments.","message":"runtime: efence support for growable stacks\n1. Fix the bug that shrinkstack returns memory to heap.\n This causes growslice to misbehave (it manually initialized\n blocks, and in efence mode shrinkstack's free leads to\n partially-initialized blocks coming out of growslice.\n Which in turn causes GC to crash while treating the garbage\n as Eface\/Iface.\n2. Enable efence for stack segments.\n\nLGTM=rsc\nR=golang-codereviews, rsc\nCC=golang-codereviews, khr\nhttps:\/\/codereview.appspot.com\/74080043\n","repos":"bryanxu\/go-zh,bryanxu\/go-zh,bryanxu\/go-zh,webfd\/go-zh,d0f\/go-zh,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,rdp\/rogerpack2005-golang,d0f\/go-zh,bryanxu\/go-zh,d0f\/go-zh,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,d0f\/go-zh,rdp\/rogerpack2005-golang,bryanxu\/go-zh,d0f\/go-zh,webfd\/go-zh,sanjosh\/sanjos100-tipc,d0f\/go-zh,webfd\/go-zh,webfd\/go-zh,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,webfd\/go-zh,webfd\/go-zh,rdp\/rogerpack2005-golang,bryanxu\/go-zh,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,webfd\/go-zh,sanjosh\/sanjos100-tipc,webfd\/go-zh,d0f\/go-zh,bryanxu\/go-zh,rdp\/rogerpack2005-golang,d0f\/go-zh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/stack.c\n+++ src\/pkg\/runtime\/stack.c\n@@ -102,7 +102,7 @@\n \t\truntime\u00b7printf(\"stackalloc %d\\n\", n);\n \n \tgp->stacksize += n;\n-\tif(StackFromSystem)\n+\tif(runtime\u00b7debug.efence || StackFromSystem)\n \t\treturn runtime\u00b7SysAlloc(ROUND(n, PageSize), &mstats.stacks_sys);\n \n \t\/\/ Minimum-sized stacks are allocated with a fixed-size free-list allocator,\n@@ -143,8 +143,8 @@\n \tif(StackDebug >= 1)\n \t\truntime\u00b7printf(\"stackfree %p %d\\n\", v, (int32)n);\n \tgp->stacksize -= n;\n-\tif(StackFromSystem) {\n-\t\tif(StackFaultOnFree)\n+\tif(runtime\u00b7debug.efence || StackFromSystem) {\n+\t\tif(runtime\u00b7debug.efence || StackFaultOnFree)\n \t\t\truntime\u00b7SysFault(v, n);\n \t\telse\n \t\t\truntime\u00b7SysFree(v, n, &mstats.stacks_sys);\n@@ -819,7 +819,15 @@\n \t\tgp->stack0 = (uintptr)oldstk + newsize;\n \tgp->stacksize -= oldsize - newsize;\n \n-\t\/\/ Free bottom half of the stack. First, we trick malloc into thinking\n+\t\/\/ Free bottom half of the stack.\n+\tif(runtime\u00b7debug.efence || StackFromSystem) {\n+\t\tif(runtime\u00b7debug.efence || StackFaultOnFree)\n+\t\t\truntime\u00b7SysFault(oldstk, newsize);\n+\t\telse\n+\t\t\truntime\u00b7SysFree(oldstk, newsize, &mstats.stacks_sys);\n+\t\treturn;\n+\t}\n+\t\/\/ First, we trick malloc into thinking\n \t\/\/ we allocated the stack as two separate half-size allocs. Then the\n \t\/\/ free() call does the rest of the work for us.\n \tif(oldsize == PageSize) {\n"} {"commit":"8c1b0af129a41e4a40c59f55306a36f18c81e69a","subject":"remove unneeded cast","message":"remove unneeded cast\n","repos":"woodruffw\/screenfetch-c,woodruffw\/screenfetch-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plat\/linux\/detect.c\n+++ src\/plat\/linux\/detect.c\n@@ -438,7 +438,7 @@\n \t\t\t\tERR_REPORT(\"Failed to create OpenGL context.\");\n \t\t\t}\n \n-\t\t\tXFree((void *) visual_info);\n+\t\t\tXFree(visual_info);\n \t\t}\n \t\telse if (error)\n \t\t{\n"} {"commit":"6a4af381511e20c6cd8a462f1070c3292689c238","subject":"Wii: Add filtering and screen scaling options","message":"Wii: Add filtering and screen scaling options\n","repos":"Iniquitatis\/mgba,mgba-emu\/mgba,AdmiralCurtiss\/mgba,Iniquitatis\/mgba,mgba-emu\/mgba,Anty-Lemon\/mgba,fr500\/mgba,jeremyherbert\/mgba,mgba-emu\/mgba,Iniquitatis\/mgba,MerryMage\/mgba,Anty-Lemon\/mgba,sergiobenrocha2\/mgba,Iniquitatis\/mgba,jeremyherbert\/mgba,libretro\/mgba,libretro\/mgba,iracigt\/mgba,Anty-Lemon\/mgba,libretro\/mgba,sergiobenrocha2\/mgba,MerryMage\/mgba,fr500\/mgba,Touched\/mgba,Anty-Lemon\/mgba,jeremyherbert\/mgba,iracigt\/mgba,Touched\/mgba,AdmiralCurtiss\/mgba,iracigt\/mgba,sergiobenrocha2\/mgba,sergiobenrocha2\/mgba,libretro\/mgba,iracigt\/mgba,fr500\/mgba,Touched\/mgba,sergiobenrocha2\/mgba,MerryMage\/mgba,mgba-emu\/mgba,AdmiralCurtiss\/mgba,jeremyherbert\/mgba,fr500\/mgba,libretro\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/platform\/wii\/main.c\n+++ src\/platform\/wii\/main.c\n@@ -19,7 +19,20 @@\n #include \"util\/gui.h\"\n #include \"util\/gui\/file-select.h\"\n #include \"util\/gui\/font.h\"\n+#include \"util\/gui\/menu.h\"\n #include \"util\/vfs.h\"\n+\n+static enum ScreenMode {\n+\tSM_PA,\n+\tSM_SF,\n+\tSM_MAX\n+} screenMode = SM_PA;\n+\n+enum FilterMode {\n+\tFM_NEAREST,\n+\tFM_LINEAR,\n+\tFM_MAX\n+};\n \n #define SAMPLES 1024\n \n@@ -42,6 +55,7 @@\n static void _setup(struct GBAGUIRunner* runner);\n static void _gameLoaded(struct GBAGUIRunner* runner);\n static void _gameUnloaded(struct GBAGUIRunner* runner);\n+static void _unpaused(struct GBAGUIRunner* runner);\n static void _drawFrame(struct GBAGUIRunner* runner, bool faded);\n static uint16_t _pollGameInput(struct GBAGUIRunner* runner);\n \n@@ -60,6 +74,7 @@\n static int32_t gyroZ;\n static uint32_t retraceCount;\n static uint32_t referenceRetraceCount;\n+static int scaleFactor;\n \n static void* framebuffer[2] = { 0, 0 };\n static int whichFb = 0;\n@@ -95,6 +110,14 @@\n \tGX_SetDispCopyDst(vmode->fbWidth, xfbHeight);\n \tGX_SetCopyFilter(vmode->aa, vmode->sample_pattern, GX_TRUE, vmode->vfilter);\n \tGX_SetFieldMode(vmode->field_rendering, ((vmode->viHeight == 2 * vmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));\n+\n+\tint hfactor = vmode->fbWidth \/ VIDEO_HORIZONTAL_PIXELS;\n+\tint vfactor = vmode->efbHeight \/ VIDEO_VERTICAL_PIXELS;\n+\tif (hfactor > vfactor) {\n+\t\tscaleFactor = vfactor;\n+\t} else {\n+\t\tscaleFactor = hfactor;\n+\t}\n };\n \n int main() {\n@@ -173,7 +196,7 @@\n \n \tstruct GBAGUIRunner runner = {\n \t\t.params = {\n-\t\t\t352, 230,\n+\t\t\tvmode->fbWidth * 0.9, vmode->efbHeight * 0.9,\n \t\t\tfont, \"\/\",\n \t\t\t_drawStart, _drawEnd,\n \t\t\t_pollInput, _pollCursor,\n@@ -182,6 +205,31 @@\n \n \t\t\tGUI_PARAMS_TRAIL\n \t\t},\n+\t\t.configExtra = (struct GUIMenuItem[]) {\n+\t\t\t{\n+\t\t\t\t.title = \"Screen mode\",\n+\t\t\t\t.data = \"screenMode\",\n+\t\t\t\t.submenu = 0,\n+\t\t\t\t.state = 0,\n+\t\t\t\t.validStates = (const char*[]) {\n+\t\t\t\t\t\"Pixel-Accurate\",\n+\t\t\t\t\t\"Stretched\",\n+\t\t\t\t\t0\n+\t\t\t\t}\n+\t\t\t},\n+\t\t\t{\n+\t\t\t\t.title = \"Filtering\",\n+\t\t\t\t.data = \"filter\",\n+\t\t\t\t.submenu = 0,\n+\t\t\t\t.state = 0,\n+\t\t\t\t.validStates = (const char*[]) {\n+\t\t\t\t\t\"Pixelated\",\n+\t\t\t\t\t\"Resampled\",\n+\t\t\t\t\t0\n+\t\t\t\t}\n+\t\t\t}\n+\t\t},\n+\t\t.nConfigExtra = 2,\n \t\t.setup = _setup,\n \t\t.teardown = 0,\n \t\t.gameLoaded = _gameLoaded,\n@@ -189,7 +237,7 @@\n \t\t.prepareForFrame = 0,\n \t\t.drawFrame = _drawFrame,\n \t\t.paused = _gameUnloaded,\n-\t\t.unpaused = 0,\n+\t\t.unpaused = _unpaused,\n \t\t.pollGameInput = _pollGameInput\n \t};\n \tGBAGUIInit(&runner, \"wii\");\n@@ -319,18 +367,30 @@\n \treturn GUI_CURSOR_UP;\n }\n \n+void _reproj(int w, int h) {\n+\tMtx44 proj;\n+\tint top = (vmode->efbHeight - h) \/ 2;\n+\tint left = (vmode->fbWidth - w) \/ 2;\n+\tguOrtho(proj, -top, top + h, -left, left + w, 0, 300);\n+\tGX_LoadProjectionMtx(proj, GX_ORTHOGRAPHIC);\n+}\n+\n void _guiPrepare(void) {\n-\tMtx44 proj;\n-\tguOrtho(proj, -20, 240, 0, 352, 0, 300);\n-\tGX_LoadProjectionMtx(proj, GX_ORTHOGRAPHIC);\n+\tint w = vmode->fbWidth * 0.9;\n+\tint h = vmode->efbHeight * 0.9;\n+\t_reproj(w, h);\n }\n \n void _guiFinish(void) {\n-\tMtx44 proj;\n-\tshort top = (CONF_GetAspectRatio() == CONF_ASPECT_16_9) ? 10 : 20;\n-\tshort bottom = VIDEO_VERTICAL_PIXELS + top;\n-\tguOrtho(proj, -top, bottom, 0, VIDEO_HORIZONTAL_PIXELS, 0, 300);\n-\tGX_LoadProjectionMtx(proj, GX_ORTHOGRAPHIC);\n+\tif (screenMode == SM_PA) {\n+\t\t_reproj(VIDEO_HORIZONTAL_PIXELS * scaleFactor, VIDEO_VERTICAL_PIXELS * scaleFactor);\n+\t} else {\n+\t\tMtx44 proj;\n+\t\tshort top = (CONF_GetAspectRatio() == CONF_ASPECT_16_9) ? 10 : 20;\n+\t\tshort bottom = VIDEO_VERTICAL_PIXELS + top;\n+\t\tguOrtho(proj, -top, bottom, 0, VIDEO_HORIZONTAL_PIXELS, 0, 300);\n+\t\tGX_LoadProjectionMtx(proj, GX_ORTHOGRAPHIC);\n+\t}\n }\n \n void _setup(struct GBAGUIRunner* runner) {\n@@ -367,10 +427,31 @@\n \t\t\tsleep(1);\n \t\t}\n \t}\n+\t_unpaused(runner);\n+}\n+\n+void _unpaused(struct GBAGUIRunner* runner) {\n \tu32 level = 0;\n \t_CPU_ISR_Disable(level);\n \treferenceRetraceCount = retraceCount;\n \t_CPU_ISR_Restore(level);\n+\n+\tunsigned mode;\n+\tif (GBAConfigGetUIntValue(&runner->context.config, \"screenMode\", &mode) && mode < SM_MAX) {\n+\t\tscreenMode = mode;\n+\t}\n+\tif (GBAConfigGetUIntValue(&runner->context.config, \"filter\", &mode) && mode < FM_MAX) {\n+\t\tswitch (mode) {\n+\t\tcase FM_NEAREST:\n+\t\tdefault:\n+\t\t\tGX_InitTexObjFilterMode(&tex, GX_NEAR, GX_NEAR);\n+\t\t\tbreak;\n+\t\tcase FM_LINEAR:\n+\t\t\tGX_InitTexObjFilterMode(&tex, GX_LINEAR, GX_LINEAR);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\t_guiFinish();\n }\n \n void _drawFrame(struct GBAGUIRunner* runner, bool faded) {\n@@ -419,16 +500,21 @@\n \tGX_InvalidateTexAll();\n \tGX_LoadTexObj(&tex, GX_TEXMAP0);\n \n+\ts16 vertSize = 256;\n+\tif (screenMode == SM_PA) {\n+\t\tvertSize *= scaleFactor;\n+\t}\n+\n \tGX_Begin(GX_QUADS, GX_VTXFMT0, 4);\n-\tGX_Position2s16(0, 256);\n+\tGX_Position2s16(0, vertSize);\n \tGX_Color1u32(color);\n \tGX_TexCoord2s16(0, 1);\n \n-\tGX_Position2s16(256, 256);\n+\tGX_Position2s16(vertSize, vertSize);\n \tGX_Color1u32(color);\n \tGX_TexCoord2s16(1, 1);\n \n-\tGX_Position2s16(256, 0);\n+\tGX_Position2s16(vertSize, 0);\n \tGX_Color1u32(color);\n \tGX_TexCoord2s16(1, 0);\n \n"} {"commit":"6d97d60012740b5c956f8703372c30bdc5b6abe9","subject":"OTHER: Provide for ID3 version 2.4.0 TCON without brackets","message":"OTHER: Provide for ID3 version 2.4.0 TCON without brackets\n","repos":"chrippa\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2,chrippa\/xmms2,six600110\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,xmms2\/xmms2-stable,xmms2\/xmms2-stable,chrippa\/xmms2,theeternalsw0rd\/xmms2,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,theefer\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,theefer\/xmms2,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,six600110\/xmms2,six600110\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,chrippa\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/id3v2\/id3.c\n+++ src\/plugins\/id3v2\/id3.c\n@@ -262,7 +262,12 @@\n \tval = convert_id3_text (tmp, &buf[1], len - 1, NULL);\n \tif (!val)\n \t\treturn;\n-\tres = sscanf (val, \"(%u)\", &genre_id);\n+\n+\tif (head->ver >= 4) {\n+\t\tres = sscanf (val, \"%u\", &genre_id);\n+\t} else {\n+\t\tres = sscanf (val, \"(%u)\", &genre_id);\n+\t}\n \n \tif (res > 0 && genre_id < G_N_ELEMENTS (id3_genres)) {\n \t\tmetakey = XMMS_MEDIALIB_ENTRY_PROPERTY_GENRE;\n"} {"commit":"72524c4fe6785d432f1dab283f93a6b8a59f41d6","subject":"OTHER: jack plugin xmms2 style cleanup Coding style updates, documentation updates, rearranging order of functions, replace some calls and types with their glib ones.","message":"OTHER: jack plugin xmms2 style cleanup\nCoding style updates, documentation updates, rearranging order of\nfunctions, replace some calls and types with their glib ones.\n","repos":"chrippa\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,chrippa\/xmms2,chrippa\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,dreamerc\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,theefer\/xmms2,dreamerc\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,six600110\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,theefer\/xmms2,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,theefer\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,xmms2\/xmms2-stable,dreamerc\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,six600110\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,dreamerc\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,theefer\/xmms2,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,theefer\/xmms2,chrippa\/xmms2,chrippa\/xmms2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/jack\/jack.c\n+++ src\/plugins\/jack\/jack.c\n@@ -1,5 +1,5 @@\n-\/* xmms2 - jack output plugin\n- * Copyright (C) 2004 Chris Morgan <cmorgan@alum.wpi.edu>\n+\/* XMMS2 - Jack Output Plugin\n+ * Copyright (C) 2004-2006 Chris Morgan <cmorgan@alum.wpi.edu>\n *\n * This library is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU Lesser General Public\n@@ -10,7 +10,6 @@\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n- *\n *\/\n \n #include \"xmms\/xmms_defs.h\"\n@@ -23,8 +22,11 @@\n #include <jack\/jack.h>\n #include <sys\/time.h>\n \n-#define min(a,b) (((a) < (b)) ? (a) : (b))\n-\n+\n+\n+\/*\n+ * Defines\n+ *\/\n #define ERR_SUCCESS 0\n #define ERR_OPENING_JACK 1\n #define ERR_RATE_MISMATCH 2\n@@ -34,39 +36,8 @@\n #define ERR_PORT_NAME_OUTPUT_CHANNEL_MISMATCH 6\n #define ERR_PORT_NOT_FOUND 7\n \n-enum status_enum { PLAYING, PAUSED, STOPPED, CLOSED, RESET };\n-\n-typedef struct xmms_jack_data_St {\n-\tguint rate;\n-\tgboolean have_mixer;\n-\txmms_config_property_t *mixer_conf;\n-\n-\tunsigned char* sound_buffer; \/* temporary buffer used to process data before sending to jack *\/\n-\n-\tjack_port_t** output_port; \/* output ports *\/\n-\tjack_client_t* client; \/* pointer to jack client *\/\n-\tenum status_enum state; \/* one of PLAYING, PAUSED, STOPPED, CLOSED, RESET etc*\/\n-\n-\tchar **channel_names; \/* array of strings that represents channel names, null terminated *\/\n-\tfloat *volume;\n-\tlong sample_rate; \/* samples(frames) per second *\/\n-\tunsigned long num_input_channels; \/* number of input channels(1 is mono, 2 stereo etc..) *\/\n-\tunsigned long num_output_channels; \/* number of output channels(1 is mono, 2 stereo etc..) *\/\n-\n-\tunsigned long buffer_size; \/* number of bytes in the buffer allocated for processing data in JACK_Callback *\/\n-} xmms_jack_data_t;\n-\n-\n-static int\n-_JACK_OpenDevice(xmms_output_t *output);\n-static int\n-_JACK_Open(xmms_output_t *output, unsigned int bytes_per_channel, unsigned long *rate, int channels);\n-static gboolean xmms_jack_start(xmms_output_t *output);\n-\n-\n \n #define CALLBACK_TRACE 0\n-\n \n #if CALLBACK_TRACE\n #define XMMS_CALLBACK_DBG XMMS_DBG\n@@ -75,53 +46,175 @@\n #endif\n \n \n-\/**\n- * floating point volume routine\n- * volume should be a value between 0.0 and 1.0\n+\n+\/*\n+ * Type definitions\n+ *\/\n+enum status_enum {\n+\tPLAYING,\n+\tPAUSED,\n+\tSTOPPED,\n+\tCLOSED,\n+\tRESET\n+};\n+\n+typedef struct xmms_jack_data_St {\n+\tguint rate;\n+\tgboolean have_mixer;\n+\txmms_config_property_t *mixer_conf;\n+\n+\t\/* temporary buffer used to process\n+\t data before sending to jack *\/\n+\tguchar *sound_buffer;\n+\n+\t\/* output ports *\/\n+\tjack_port_t **output_port;\n+\n+\t\/* pointer to jack client *\/\n+\tjack_client_t *client;\n+\n+\t\/* one of PLAYING, PAUSED, STOPPED,\n+\t * CLOSED, RESET etc *\/\n+\tenum status_enum state;\n+\n+\t\/* array of strings that represents\n+\t channel names, null terminated *\/\n+\tgchar **channel_names;\n+\n+\tgfloat *volume;\n+\n+\t\/* samples (frames) per second *\/\n+\tglong sample_rate;\n+\n+\t\/* number of input channels\n+\t 1 is mono, 2 stereo etc *\/\n+\tgulong num_input_channels;\n+\n+\t\/* number of output channels\n+\t 1 is mono, 2 stereo etc *\/\n+\tgulong num_output_channels;\n+\n+\t\/* number of bytes in the buffer\n+\t allocated for processing data\n+\t in JACK_Callback *\/\n+\tgulong buffer_size;\n+\n+} xmms_jack_data_t;\n+\n+\n+\n+\/*\n+ * Function prototypes\n+ *\/\n+static gboolean xmms_jack_new (xmms_output_t *output);\n+static void xmms_jack_destroy (xmms_output_t *output);\n+static void xmms_jack_flush (xmms_output_t *output);\n+static gboolean xmms_jack_volume_set (xmms_output_t *output,\n+ const gchar *channel,\n+ guint volume);\n+static gboolean xmms_jack_volume_get (xmms_output_t *output,\n+ const gchar **names, guint *values,\n+ guint *num_channels);\n+static guint xmms_jack_buffersize_get (xmms_output_t *output);\n+static gboolean xmms_jack_status (xmms_output_t *output,\n+ xmms_playback_status_t status);\n+static gint xmms_jack_open_device (xmms_output_t *output);\n+static gint xmms_jack_open (xmms_output_t *output, guint bytes_per_channel,\n+ gulong *rate, gint channels);\n+static gboolean xmms_jack_start (xmms_output_t *output);\n+static gboolean xmms_jack_plugin_setup (xmms_output_plugin_t *plugin);\n+static void xmms_jack_float_volume_effect (jack_default_audio_sample_t **buff,\n+ gulong nsamples,\n+ guint output_channels,\n+ gfloat *volume);\n+static void xmms_jack_sample_silence_ds (jack_default_audio_sample_t *dst,\n+ gulong nsamples);\n+static int xmms_jack_callback (jack_nframes_t nframes, void *arg);\n+\n+\n+\n+\/*\n+ * Plugin header\n+ *\/\n+XMMS_OUTPUT_PLUGIN (\"jack\", \"Jack Output\", XMMS_VERSION,\n+ \"Jack audio server output plugin\",\n+ xmms_jack_plugin_setup);\n+\n+static gboolean\n+xmms_jack_plugin_setup (xmms_output_plugin_t *plugin)\n+{\n+\txmms_output_methods_t methods;\n+\n+\tXMMS_OUTPUT_METHODS_INIT (methods);\n+\n+\tmethods.new = xmms_jack_new;\n+\tmethods.destroy = xmms_jack_destroy;\n+\n+\tmethods.flush = xmms_jack_flush;\n+\n+\tmethods.volume_get = xmms_jack_volume_get;\n+\tmethods.volume_set = xmms_jack_volume_set;\n+\n+\tmethods.status = xmms_jack_status;\n+\n+\tmethods.latency_get = xmms_jack_buffersize_get;\n+\n+\txmms_output_plugin_methods_set (plugin, &methods);\n+\n+\treturn TRUE;\n+}\n+\n+\n+\n+\/*\n+ * Member functions\n+ *\/\n+\n+\/**\n+ * Floating point volume routine.\n+ * Volume should be a value between 0.0 and 1.0.\n+ *\n * @param sample buffer to apply volume adjustment to\n * @param number of samples to process\n * @param value to apply to these samples\n *\/\n static void\n-_JACK_float_volume_effect(jack_default_audio_sample_t **buffer, unsigned long nsamples, \n- unsigned int output_channels, float* volume)\n-{\n- unsigned int x;\n-\n- jack_default_audio_sample_t *buf;\n- unsigned long samples;\n- float vol;\n-\n- \/* process each output channel *\/\n- for(x = 0; x < output_channels; x++)\n- {\n- buf = buffer[x];\n- samples = nsamples;\n- vol = volume[x];\n-\n- if(vol < 0) vol = 0;\n- if(vol > 1.0) vol = 1.0;\n-\n- while (samples--)\n- {\n- *buf = (*buf) * vol;\n- buf++;\n- } \n- }\n-}\n-\n-\n-\/**\n- * fill dst buffer with nsamples worth of silence\n+xmms_jack_float_volume_effect (jack_default_audio_sample_t **buffer,\n+ gulong nsamples, guint output_channels,\n+ gfloat *volume)\n+{\n+\tjack_default_audio_sample_t *buf;\n+\tgulong samples;\n+\tgfloat vol;\n+\tguint x;\n+\n+\t\/* process each output channel *\/\n+\tfor (x = 0; x < output_channels; x++) {\n+\t\tbuf = buffer[x];\n+\t\tvol = volume[x];\n+\t\tsamples = nsamples;\n+\n+\t\tvol = CLAMP (vol, 0.0, 1.0);\n+\n+\t\twhile (samples--) {\n+\t\t\t*buf = (*buf) * vol;\n+\t\t\tbuf++;\n+\t\t}\n+\t}\n+}\n+\n+\n+\/**\n+ * Fill dst buffer with nsamples worth of silence.\n+ *\n * @param buffer to fill with silence\n * @param number of samples of silence to fill the buffer with\n *\/\n static void\n-_JACK_sample_silence_dS (jack_default_audio_sample_t *dst, unsigned long nsamples)\n+xmms_jack_sample_silence_ds (jack_default_audio_sample_t *dst, gulong nsamples)\n {\n \t\/* ALERT: signed sign-extension portability !!! *\/\n-\twhile (nsamples--)\n-\t{\n+\twhile (nsamples--) {\n \t\t*dst = 0;\n \t\tdst++;\n \t}\n@@ -129,191 +222,246 @@\n \n \n \/**\n- * Main callback, jack calls this function anytime it needs new data\n- * @param number of frames of data that jack wants\n- * @param pointer to xmms output structure\n+ * Main callback, jack calls this function anytime it needs new data.\n+ *\n+ * @param nframes number of frames of data that jack wants\n+ * @param arg pointer to xmms output structure\n+ * @return always zero\n *\/\n static int\n-JACK_callback (jack_nframes_t nframes, void *arg)\n-{\n-\tjack_default_audio_sample_t** out_buffer;\n-\txmms_jack_data_t *data;\n-\tint i;\n-\txmms_output_t *output = (xmms_output_t*)arg;\n-\n-\tXMMS_CALLBACK_DBG(\"nframes %ld, sizeof(jack_default_audio_sample_t) == %ld\", (long)nframes,\n-\t sizeof(jack_default_audio_sample_t));\n+xmms_jack_callback (jack_nframes_t nframes, void *arg)\n+{\n+\tjack_default_audio_sample_t **out_buffer;\n+\txmms_output_t *output = (xmms_output_t*) arg;\n+\txmms_jack_data_t *data;\n+\tgint i;\n+\n+\tXMMS_CALLBACK_DBG (\"nframes %ld, \"\n+\t \"sizeof(jack_default_audio_sample_t) == %ld\",\n+\t (long) nframes, sizeof (jack_default_audio_sample_t));\n \n \tdata = xmms_output_private_data_get (output);\n \n-\tif(!data->client)\n-\t\txmms_log_fatal(\"client is closed, this is weird...\");\n-\n-\tXMMS_CALLBACK_DBG(\"num_output_channels = %ld, num_input_channels = %ld\",\n-\t data->num_output_channels, data->num_input_channels);\n+\tif (!data->client) {\n+\t\txmms_log_fatal (\"client is closed, this is weird...\");\n+\t}\n+\n+\tXMMS_CALLBACK_DBG (\"num_output_channels = %ld, num_input_channels = %ld\",\n+\t data->num_output_channels, data->num_input_channels);\n \n \t\/* retrieve the buffers for the output ports *\/\n-\tout_buffer = g_malloc(sizeof(jack_port_t*) * data->num_output_channels);\n-\tfor(i = 0; i < data->num_output_channels; i++)\n-\t\tout_buffer[i] = (jack_default_audio_sample_t *) jack_port_get_buffer(data->output_port[i], nframes);\n+\tout_buffer = g_new (jack_default_audio_sample_t *,\n+\t data->num_output_channels);\n+\n+\tfor (i = 0; i < data->num_output_channels; i++) {\n+\t\tout_buffer[i] = (jack_default_audio_sample_t *)\n+\t\t jack_port_get_buffer (data->output_port[i], nframes);\n+\t}\n \n \t\/* handle playing state *\/\n-\tif(data->state == PLAYING)\n-\t{\n-\t\tunsigned long jackFramesAvailable = nframes; \/* frames we have left to write to jack *\/\n-\t\tlong inputFramesAvailable; \/* frames we have available this loop *\/\n-\t\tunsigned long numFramesToWrite; \/* num frames we are writing this loop *\/\n-\n-\t\tXMMS_CALLBACK_DBG(\"playing... jackFramesAvailable = %ld\", jackFramesAvailable);\n-\n-\t\t\/* see if our buffer is large enough for the data we are writing *\/\n-\t\t\/* ie. Buffer_size < (bytes we already wrote + bytes we are going to write in this loop) *\/\n-\t\t\/* Note: sound_buffer is always filled with 16-bit data *\/\n-\t\t\/* so frame * 2 bytes(16 bits) * X output channels *\/\n-\t\tif(data->buffer_size < (jackFramesAvailable * sizeof(float) * data->num_output_channels))\n-\t\t{\n-\t\t\tXMMS_DBG(\"our buffer must have changed size\");\n-\t\t\txmms_log_fatal(\"allocated %ld bytes, need %ld bytes\", data->buffer_size,\n-\t\t\t\t jackFramesAvailable * sizeof(float) * data->num_output_channels);\n-\t\t\tg_free(out_buffer); \/* free output buffer ports *\/\n+\tif (data->state == PLAYING) {\n+\t\tgulong tmp;\n+\n+\t \t\/* frames we have left to write to jack *\/\n+\t\tgulong jackFramesAvailable = nframes;\n+\n+\t\t\/* frames we have available this loop *\/\n+\t\tglong inputFramesAvailable;\n+\n+\t\t\/* num frames we are writing this loop *\/\n+\t\tgulong numFramesToWrite;\n+\n+\t\tXMMS_CALLBACK_DBG (\"playing... jackFramesAvailable = %ld\",\n+\t\t jackFramesAvailable);\n+\n+\t\t\/* see if our buffer is large enough for the data we are writing\n+\t\t * ie. Buffer_size < (bytes we already wrote + bytes we are\n+\t\t * going to write in this loop).\n+\t\t * Note: sound_buffer is always filled with 16-bit data\n+\t\t * so frame * 2 bytes(16 bits) * X output channels *\/\n+\t\ttmp = jackFramesAvailable * sizeof (gfloat) * data->num_output_channels;\n+\n+\t\tif (data->buffer_size < tmp) {\n+\t\t\txmms_log_fatal (\"our buffer must have changed size, \"\n+\t\t\t \"allocated %ld bytes, need %ld bytes\",\n+\t\t\t data->buffer_size, tmp);\n+\t\t\tg_free (out_buffer); \/* free output buffer ports *\/\n \t\t\treturn 0;\n \t\t}\n \n-\t\tXMMS_CALLBACK_DBG(\"trying to read %ld bytes\\n\", jackFramesAvailable * sizeof(float) * data->num_input_channels);\n-\n-\t\tinputFramesAvailable = xmms_output_read(output, (gchar *)data->sound_buffer,\n- jackFramesAvailable * sizeof(float) * data->num_input_channels);\n-\t\tif(inputFramesAvailable == -1) inputFramesAvailable = 0;\n-\n-\t\tinputFramesAvailable = inputFramesAvailable \/ (sizeof(float) * data->num_input_channels);\n-\n-\t\tXMMS_CALLBACK_DBG(\"inputFramesAvailable == %ld, jackFramesAvailable == %ld\",\n- inputFramesAvailable, jackFramesAvailable);\n-\n-\t\t\/* write as many bytes as we have space remaining, or as much as we have data to write *\/\n-\t\tnumFramesToWrite = min(jackFramesAvailable, inputFramesAvailable);\n-\n-\t\tXMMS_CALLBACK_DBG(\"nframes == %ld, jackFramesAvailable == %ld,\\n\\tdata->num_input_channels == %ld, data->num_output_channels == %ld\",\n-\t\t\t\t (long)nframes, jackFramesAvailable, data->num_input_channels, data->num_output_channels);\n-\n-\t\tfor(i = 0; i < numFramesToWrite; i++)\n-\t\t{\n-\t\t\tout_buffer[0][i] = ((float*)data->sound_buffer)[i*2];\n-\t\t\tout_buffer[1][i] = ((float*)data->sound_buffer)[i*2+1];\n-\t\t}\n-\n-\t\tjackFramesAvailable-=numFramesToWrite; \/* take away what was written *\/\n-\n-\t\tXMMS_CALLBACK_DBG(\"jackFramesAvailable == %ld\", jackFramesAvailable);\n-\n-\t\t\/* Now that we have finished filling the buffer either until it is full or until *\/\n-\t\t\/* we have run out of application sound data to process, output *\/\n-\t\t\/* the audio to the jack server *\/\n-\n-\t\t\/* apply volume to the floating point output sound buffer *\/\n-\t\tXMMS_CALLBACK_DBG(\"appling volume of \");\n-\t\tfor(i = 0; i < data->num_output_channels; i++)\n-\t\t{\n-\t\t\tXMMS_CALLBACK_DBG(\"\\t%f to channel %d \", data->volume[i], i);\n-\t\t}\n-\t\tXMMS_CALLBACK_DBG(\"to %ld frames and %ld channels\",\n-\t\t\t\t (nframes - jackFramesAvailable), data->num_output_channels);\n-\t\t_JACK_float_volume_effect(out_buffer, (nframes - jackFramesAvailable),\n-\t\t\t\t data->num_output_channels, data->volume);\n-\n-\t\t\/* see if we still have jackBytesLeft here, if we do that means that we\n-\t\t ran out of wave data to play and had a buffer underrun, fill in\n-\t\t the rest of the space with zero bytes so at least there is silence *\/\n-\t\tif(jackFramesAvailable)\n-\t\t{\n-\t\t\tXMMS_CALLBACK_DBG(\"buffer underrun of %ld frames\", jackFramesAvailable);\n-\t\t\tfor(i = 0 ; i < data->num_output_channels; i++)\n-\t\t\t\t_JACK_sample_silence_dS(out_buffer[i] + (nframes - jackFramesAvailable),\n-\t\t\t\t\t\t\tjackFramesAvailable);\n-\t\t}\n-\t}\n-\telse if(data->state == PAUSED ||\n-\t\tdata->state == STOPPED ||\n-\t\tdata->state == CLOSED || data->state == RESET)\n-\t{\n-\t\tXMMS_CALLBACK_DBG(\"PAUSED or STOPPED or CLOSED, outputting silence\");\n+\t\ttmp = jackFramesAvailable * sizeof(gfloat) * data->num_input_channels;\n+\t\tXMMS_CALLBACK_DBG (\"trying to read %ld bytes\\n\", tmp);\n+\n+\t\tinputFramesAvailable = xmms_output_read (output,\n+\t\t (gchar *) data->sound_buffer,\n+\t\t tmp);\n+\n+\t\tif (inputFramesAvailable == -1) {\n+\t\t\tinputFramesAvailable = 0;\n+\t\t}\n+\n+\t\tinputFramesAvailable = inputFramesAvailable \/\n+\t\t (sizeof (gfloat) * data->num_input_channels);\n+\n+\t\tXMMS_CALLBACK_DBG (\"inputFramesAvailable == %ld, \"\n+\t\t \"jackFramesAvailable == %ld\",\n+\t\t inputFramesAvailable, jackFramesAvailable);\n+\n+\t\t\/* write as many bytes as we have space remaining,\n+\t\t * or as much as we have data to write *\/\n+\t\tnumFramesToWrite = MIN (jackFramesAvailable, inputFramesAvailable);\n+\n+\t\tXMMS_CALLBACK_DBG (\"nframes == %ld, jackFramesAvailable == %ld,\\n\"\n+\t\t \"\\tdata->num_input_channels == %ld,\"\n+\t\t \"data->num_output_channels == %ld\",\n+\t\t (glong) nframes, jackFramesAvailable,\n+\t\t data->num_input_channels,\n+\t\t data->num_output_channels);\n+\n+\t\tfor (i = 0; i < numFramesToWrite; i++) {\n+\t\t\tout_buffer[0][i] = ((gfloat*) data->sound_buffer)[i*2];\n+\t\t\tout_buffer[1][i] = ((gfloat*) data->sound_buffer)[i*2+1];\n+\t\t}\n+\n+\t\t\/* take away what was written *\/\n+\t\tjackFramesAvailable -= numFramesToWrite;\n+\n+\t\tXMMS_CALLBACK_DBG (\"jackFramesAvailable == %ld\", jackFramesAvailable);\n+\n+\t\t\/* Now that we have finished filling the buffer, either until\n+\t\t * it is full or until we have run out of application sound\n+\t\t * data to process, output the audio to the jack server and\n+\t\t * apply volume to the floating point output sound buffer *\/\n+\t\tXMMS_CALLBACK_DBG (\"appling volume of \");\n+\n+\t\tfor (i = 0; i < data->num_output_channels; i++) {\n+\t\t\tXMMS_CALLBACK_DBG (\"\\t%f to channel %d \", data->volume[i], i);\n+\t\t}\n+\t\t\n+\t\tXMMS_CALLBACK_DBG (\"to %ld frames and %ld channels\",\n+\t\t (nframes - jackFramesAvailable),\n+\t\t data->num_output_channels);\n+\t\t\n+\t\txmms_jack_float_volume_effect (out_buffer,\n+\t\t (nframes - jackFramesAvailable),\n+\t\t data->num_output_channels,\n+\t\t data->volume);\n+\n+\t\t\/* see if we still have jackBytesLeft here, if we do that means\n+\t\t * that we ran out of wave data to play and had a buffer underrun,\n+\t\t * fill in the rest of the space with zero bytes so at least there\n+\t\t * is silence *\/\n+\t\tif (jackFramesAvailable) {\n+\t\t\tXMMS_CALLBACK_DBG (\"buffer underrun of %ld frames\",\n+\t\t\t jackFramesAvailable);\n+\t\t\t\n+\t\t\tfor (i = 0 ; i < data->num_output_channels; i++) {\n+\t\t\t\tjack_default_audio_sample_t *dest;\n+\n+\t\t\t\tdest = out_buffer[i] + (nframes - jackFramesAvailable);\n+\n+\t\t\t\txmms_jack_sample_silence_ds (dest, jackFramesAvailable);\n+\t\t\t}\n+\t\t}\n+\t}\n+\telse if (data->state == PAUSED || data->state == STOPPED ||\n+\t data->state == CLOSED || data->state == RESET) {\n+\n+\t\tXMMS_CALLBACK_DBG (\"PAUSED or STOPPED or CLOSED, outputting silence\");\n \n \t\t\/* output silence if nothing is being outputted *\/\n-\t\tfor(i = 0; i < data->num_output_channels; i++)\n-\t\t\t_JACK_sample_silence_dS(out_buffer[i], nframes);\n+\t\tfor (i = 0; i < data->num_output_channels; i++) {\n+\t\t\txmms_jack_sample_silence_ds (out_buffer[i], nframes);\n+\t\t}\n \n \t\t\/* if we were told to reset then zero out some variables *\/\n \t\t\/* and transition to STOPPED *\/\n-\t\tif(data->state == RESET)\n-\t\t\tdata->state = STOPPED; \/* transition to STOPPED *\/\n-\t}\n-\n-\tXMMS_CALLBACK_DBG(\"callback done\");\n-\n-\tg_free(out_buffer); \/* free output buffer ports *\/\n+\t\tif (data->state == RESET) {\n+\n+\t\t \t\/* transition to STOPPED *\/\n+\t\t\tdata->state = STOPPED;\n+\n+\t\t}\n+\t}\n+\n+\tXMMS_CALLBACK_DBG (\"callback done\");\n+\n+\t\/* free output buffer ports *\/\n+\tg_free (out_buffer);\n \n \treturn 0;\n }\n \n \/**\n- * Callback when the server changes the number of frames\n- * @param new number of frames per callback\n- * @param pointer to xmms output structure\n- *\/\n-static int\n+ * Callback when the server changes the number of frames.\n+ *\n+ * @param nframes new number of frames per callback\n+ * @param arg pointer to xmms output structure\n+ * @return always zero\n+ *\/\n+static gint\n JACK_bufsize (jack_nframes_t nframes, void *arg)\n {\n \txmms_jack_data_t* data;\n-\tunsigned long buffer_required;\n-\n-\tdata = xmms_output_private_data_get((xmms_output_t*)arg);\n-\n-\tXMMS_DBG(\"the maximum buffer size is now %lu frames\", (unsigned long)nframes);\n-\n-\t\/* make sure the callback routine has adequate memory for the nframes it will get *\/\n-\t\/* ie. Buffer_size < (bytes we already wrote + bytes we are going to write in this loop) *\/\n-\t\/* frames * sizeof(float) * X channels of output *\/\n-\tbuffer_required = nframes * sizeof(float) * data->num_output_channels;\n-\tif(data->buffer_size < buffer_required)\n-\t{\n-\t\tXMMS_DBG(\"expanding buffer from data->buffer_size == %ld, to %ld\",\n-\t\t\t data->buffer_size, buffer_required);\n+\tgulong buffer_required;\n+\n+\tdata = xmms_output_private_data_get ((xmms_output_t *) arg);\n+\n+\tXMMS_DBG (\"the maximum buffer size is now %lu frames\",\n+\t (gulong) nframes);\n+\n+\t\/* make sure the callback routine has adequate memory for the nframes\n+\t * it will get ie. Buffer_size < (bytes we already wrote +\n+\t * bytes we are going to write in this loop) *\/\n+\n+\t\/* frames * sizeof(gfloat) * X channels of output *\/\n+\tbuffer_required = nframes * sizeof (gfloat) * data->num_output_channels;\n+\tif (data->buffer_size < buffer_required) {\n+\n+\t\tXMMS_DBG (\"expanding buffer from data->buffer_size == %ld, to %ld\",\n+\t\t data->buffer_size, buffer_required);\n+\n \t\tdata->buffer_size = buffer_required;\n-\t\tdata->sound_buffer = realloc(data->sound_buffer, data->buffer_size);\n+\t\tdata->sound_buffer = g_realloc (data->sound_buffer, data->buffer_size);\n \n \t\t\/* if we don't have a buffer then error out *\/\n-\t\tif(!data->sound_buffer)\n-\t\t{\n-\t\t\txmms_log_fatal(\"error allocating sound_buffer memory\");\n+\t\tif (!data->sound_buffer) {\n+\t\t\txmms_log_fatal (\"error allocating sound_buffer memory\");\n \t\t\treturn 0;\n \t\t}\n \t}\n \n-\tXMMS_DBG(\"JACK_bufsize called\");\n+\tXMMS_DBG (\"JACK_bufsize called\");\n+\n \treturn 0;\n }\n \n-\/**\n- * Callback that occurs when jacks sample rate changes\n- * @param new sample rate in frames per-second\n- * @param pointer to the xmms output structure\n- *\/\n-static int\n+\n+\/**\n+ * Callback that occurs when jacks sample rate changes.\n+ *\n+ * @param nframes new sample rate in frames per-second\n+ * @param arg pointer to the xmms output structure\n+ * @return always zero\n+ *\/\n+static gint\n JACK_srate (jack_nframes_t nframes, void *arg)\n {\n-\tXMMS_DBG(\"the sample rate is now %lu\/sec\", (unsigned long)nframes);\n+\tXMMS_DBG (\"the sample rate is now %lu\/sec\", (gulong) nframes);\n \treturn 0;\n }\n \n-\/**\n- * Callback that is called when jack is shutting down\n- * @param void pointer to xmms output structure\n+\n+\/**\n+ * Callback that is called when jack is shutting down.\n+ *\n+ * @param arg void pointer to xmms output structure\n *\/\n static void\n-JACK_shutdown(void* arg)\n-{\n-\txmms_jack_data_t *data;\n-\txmms_output_t *output = (xmms_output_t*)arg;\n+JACK_shutdown (void *arg)\n+{\n+\txmms_jack_data_t *data;\n+\txmms_output_t *output = (xmms_output_t*) arg;\n \txmms_error_t error;\n \n \tdata = xmms_output_private_data_get (output);\n@@ -321,341 +469,373 @@\n \n \tdata->client = 0; \/* reset client *\/\n \n-\tXMMS_DBG(\"trying to reconnect to jack\");\n+\tXMMS_DBG (\"trying to reconnect to jack\");\n \n \t\/* lets see if we can't reestablish the connection *\/\n-\tif(_JACK_OpenDevice(output) != ERR_SUCCESS)\n-\t{\n-\t\txmms_log_error(\"unable to reconnect with jack...\");\n-\t\txmms_error_set(&error, XMMS_ERROR_GENERIC, \"Jack shutdown, unable to reconnect...\");\n-\t\txmms_output_set_error(output, &error);\n-\t}\n-}\n-\n-\n-\/**\n- * Callback that jack calls if an error occurs\n- * @param ascii text description of error\n+\tif (xmms_jack_open_device (output) != ERR_SUCCESS) {\n+\t\txmms_log_error (\"unable to reconnect with jack...\");\n+\t\txmms_error_set (&error, XMMS_ERROR_GENERIC,\n+\t\t \"Jack shutdown, unable to reconnect...\");\n+\t\txmms_output_set_error (output, &error);\n+\t}\n+}\n+\n+\n+\/**\n+ * Callback that jack calls if an error occurs.\n+ *\n+ * @param desc ascii text description of error\n *\/\n static void\n-JACK_Error(const char *desc)\n-{\n-\tXMMS_DBG(\"JACK_Error() %s\", desc);\n+JACK_Error (const gchar *desc)\n+{\n+\tXMMS_DBG (\"JACK_Error() %s\", desc);\n }\n \n \n \/**\n * Set an internal variable to tell JACK_Callback() to reset this device\n- * when the next callback occurs\n- * @param pointer to a xmms_jack_data_t structure\n+ * when the next callback occurs.\n+ *\n+ * @param data pointer to a xmms_jack_data_t structure\n *\/\n void\n-_JACK_reset(xmms_jack_data_t *data)\n-{\n-\tXMMS_DBG(\"_JACK_reset() resetting this of %p\", data);\n-\n-\t\/* NOTE: we use the RESET state so we don't need to worry about clearing out *\/\n-\t\/* variables that the callback modifies while the callback is running *\/\n-\t\/* we set the state to RESET and the callback clears the variables out for us *\/\n-\tdata->state = RESET; \/* tell the callback that we are to reset, the callback will transition this to STOPPED *\/\n-}\n-\n-\/* free the array of channel names *\/\n+xmms_jack_reset (xmms_jack_data_t *data)\n+{\n+\tXMMS_DBG (\"xmms_jack_reset() resetting this of %p\", data);\n+\n+\t\/* NOTE: we use the RESET state so we don't need to worry about\n+\t * clearing out variables that the callback modifies while the\n+\t * callback is running we set the state to RESET and the callback\n+\t * clears the variables out for us *\/\n+\n+\t\/* tell the callback that we are to reset, the callback will\n+\t * transition this to STOPPED *\/\n+\tdata->state = RESET;\n+}\n+\n+\n+\/**\n+ * Free the array of channel names.\n+ *\n+ * @param data pointer to a xmms_jack_data_t structure\n+ *\/\n static void\n-xmms_jack_free_channel_names(xmms_jack_data_t *data)\n-{\n-\tunsigned int x = 0;\n-\n+xmms_jack_free_channel_names (xmms_jack_data_t *data)\n+{\n \t\/* free up the existing channel names *\/\n-\tif(data->channel_names)\n-\t{\n-\t\twhile(data->channel_names[x])\n-\t\t{\n-\t\t\tg_free(data->channel_names[x]);\n-\t\t\tx++;\n-\t\t}\n-\t\tg_free(data->channel_names);\n-\n-\t\tdata->channel_names = 0;\n-\t}\n-}\n-\n-\/* create an array of channel names *\/\n+\tif (data->channel_names) {\n+\t\tguint x;\n+\t\tfor (x = 0; data->channel_names[x]; x++) {\n+\t\t\tg_free (data->channel_names[x]);\n+\t\t}\n+\t\tg_free (data->channel_names);\n+\n+\t\tdata->channel_names = NULL;\n+\t}\n+}\n+\n+\n+\/**\n+ * Create an array of channel names.\n+ *\n+ * @param data pointer to a xmms_jack_data_t structure\n+ *\/\n static void\n-xmms_jack_create_channel_names(xmms_jack_data_t *data)\n-{\n-\tunsigned int x;\n- \n+xmms_jack_create_channel_names (xmms_jack_data_t *data)\n+{\n+\tguint x;\n+\n \t\/* assign channel names to each of the channels *\/\n-\tdata->channel_names = g_malloc(sizeof(char*) * (data->num_output_channels + 1));\n-\tfor(x = 0; x < data->num_output_channels; x++)\n-\t{\n-\t\tchar channel_name[32];\n-\t\tg_snprintf(channel_name, sizeof(channel_name), \"port%d\", x);\n-\t\tdata->channel_names[x] = g_strdup(channel_name);\n-\t}\n-\tdata->channel_names[data->num_output_channels] = 0; \/* null terminate the string list *\/\n-}\n-\n-\/**\n- * Close a jack connection cleanly\n- * @param output xmms object\n+\tdata->channel_names = g_new (gchar *, data->num_output_channels + 1);\n+\n+\tfor (x = 0; x < data->num_output_channels; x++) {\n+\t\tgchar channel_name[32];\n+\t\tg_snprintf (channel_name, sizeof (channel_name), \"port%d\", x);\n+\t\tdata->channel_names[x] = g_strdup (channel_name);\n+\t}\n+\n+ \t\/* null terminate the string list *\/\n+\tdata->channel_names[data->num_output_channels] = NULL;\n+}\n+\n+\n+\/**\n+ * Close a jack connection cleanly.\n+ *\n+ * @param output The output structure.\n *\/\n static void\n-_JACK_CloseDevice(xmms_output_t *output)\n-{\n-\txmms_jack_data_t *data;\n-\tXMMS_DBG(\"_JACK_CloseDevice() closing the jack client thread\");\n-\n-\tdata = xmms_output_private_data_get(output);\n-\n-\tif(data->client)\n-\t{\n-\t\tXMMS_DBG(\"after jack_deactivate()\");\n-\t\tjack_client_close(data->client);\n-\t}\n-\n-\t_JACK_reset(data);\n-\tdata->client = 0; \/* reset client *\/\n-\tg_free(data->sound_buffer); \/* free buffer memory *\/\n-\tdata->sound_buffer = 0;\n-\tdata->buffer_size = 0; \/* zero out size of the buffer *\/\n+xmms_jack_close_device (xmms_output_t *output)\n+{\n+\txmms_jack_data_t *data;\n+\n+\tXMMS_DBG (\"xmms_jack_close_device() closing the jack client thread\");\n+\n+\tdata = xmms_output_private_data_get (output);\n+\n+\tif (data->client) {\n+\t\tXMMS_DBG (\"after jack_deactivate()\");\n+\t\tjack_client_close (data->client);\n+\t}\n+\n+\txmms_jack_reset (data);\n+\n+ \t\/* reset client *\/\n+\tdata->client = NULL;\n+\n+ \t\/* free buffer memory *\/\n+\tg_free (data->sound_buffer);\n+\n+\tdata->sound_buffer = NULL;\n+\n+ \t\/* zero out size of the buffer *\/\n+\tdata->buffer_size = 0;\n \n \t\/* free up the output_port array *\/\n-\tif(data->output_port)\n-\t{\n-\t\tg_free(data->output_port);\n-\t\tdata->output_port = 0;\n-\t}\n- \n+\tif (data->output_port) {\n+\t\tg_free (data->output_port);\n+\t\tdata->output_port = NULL;\n+\t}\n+\n \t\/* free the volume array *\/\n-\tif(data->volume)\n-\t{\n-\t\tg_free(data->volume);\n-\t\tdata->volume = 0;\n+\tif (data->volume) {\n+\t\tg_free (data->volume);\n+\t\tdata->volume = NULL;\n \t}\n \n \t\/* free the channel names *\/\n-\txmms_jack_free_channel_names(data);\n-}\n-\n-\/**\n- * Open a jack device\n- * @param output xmms object\n- *\/\n-static int\n-_JACK_OpenDevice(xmms_output_t *output)\n-{\n-\txmms_jack_data_t *data;\n-\tconst char** ports;\n-\tint i;\n-\tchar client_name[64];\n-\tint failed = 0;\n-\n-\tXMMS_DBG(\"creating jack client and setting up callbacks\");\n-\n-\tdata = xmms_output_private_data_get(output);\n+\txmms_jack_free_channel_names (data);\n+}\n+\n+\n+\/**\n+ * Open a jack device.\n+ *\n+ * @param output The output structure.\n+ * @return success status\n+ *\/\n+static gint\n+xmms_jack_open_device (xmms_output_t *output)\n+{\n+\txmms_jack_data_t *data;\n+\tconst gchar** ports;\n+\tgint i, ret;\n+\tgchar client_name[64];\n+\tgint failed = 0;\n+\n+\tXMMS_DBG (\"creating jack client and setting up callbacks\");\n+\n+\tdata = xmms_output_private_data_get (output);\n \n \t\/* see if this device is already open *\/\n-\tif(data->client)\n+\tif (data->client) {\n \t\treturn ERR_OPENING_JACK;\n+\t}\n \n \t\/* zero out the buffer pointer and the size of the buffer *\/\n-\tdata->sound_buffer = 0;\n+\tdata->sound_buffer = NULL;\n \tdata->buffer_size = 0;\n \n \t\/* set up an error handler *\/\n-\tjack_set_error_function(JACK_Error);\n+\tjack_set_error_function (JACK_Error);\n \n \t\/* try to become a client of the JACK server *\/\n \tsrand (time (NULL));\n-\tg_snprintf(client_name, sizeof(client_name), \"xmms_jack_%d_%d\", 0, rand());\n-\tXMMS_DBG(\"client name '%s'\", client_name);\n-\tif ((data->client = jack_client_new(client_name)) == 0)\n-\t{\n-\t\t\/* jack has problems with shutting down clients, so lets *\/\n-\t\t\/* wait a short while and try once more before we give up *\/\n-\t\tif ((data->client = jack_client_new(client_name)) == 0)\n-\t\t{\n-\t\t\tXMMS_DBG(\"unable to jack_client_new(), jack server not running?\");\n+\tg_snprintf (client_name, sizeof (client_name),\n+\t \"xmms_jack_%d_%d\", 0, rand ());\n+\n+\tXMMS_DBG (\"client name '%s'\", client_name);\n+\n+\tdata->client = jack_client_new (client_name);\n+\tif (!data->client) {\n+\t\t\/* jack has problems with shutting down clients, so lets\n+\t\t * wait a short while and try once more before we give up *\/\n+\t\tdata->client = jack_client_new (client_name);\n+\t\tif (!data->client) {\n+\t\t\tXMMS_DBG (\"unable to jack_client_new(), jack server not running?\");\n \t\t\treturn ERR_OPENING_JACK;\n \t\t}\n \t}\n \n-\t\/* JACK server to call `JACK_callback()' whenever\n-\t there is work to be done. *\/\n-\tjack_set_process_callback(data->client, JACK_callback, output);\n+\t\/* JACK server to call `xmms_jack_callback()' whenever\n+\t * there is work to be done. *\/\n+\tjack_set_process_callback (data->client, xmms_jack_callback, output);\n \n \t\/* setup a buffer size callback *\/\n-\tjack_set_buffer_size_callback(data->client, JACK_bufsize, output);\n+\tjack_set_buffer_size_callback (data->client, JACK_bufsize, output);\n \n \t\/* tell the JACK server to call `srate()' whenever\n \t the sample rate of the system changes. *\/\n-\tjack_set_sample_rate_callback(data->client, JACK_srate, output);\n+\tjack_set_sample_rate_callback (data->client, JACK_srate, output);\n \n \t\/* tell the JACK server to call `jack_shutdown()' if\n-\t it ever shuts down, either entirely, or if it\n-\t just decides to stop calling us. *\/\n-\tjack_on_shutdown(data->client, JACK_shutdown, output);\n+\t * it ever shuts down, either entirely, or if it\n+\t * just decides to stop calling us. *\/\n+\tjack_on_shutdown (data->client, JACK_shutdown, output);\n \n \t\/* display the current sample rate. once the client is activated\n-\t (see below), you should rely on your own sample rate\n-\t callback (see above) for this value. *\/\n-\tdata->sample_rate = jack_get_sample_rate(data->client);\n-\tXMMS_DBG(\"engine sample rate: %lu\", data->sample_rate);\n+\t * (see below), you should rely on your own sample rate\n+\t * callback (see above) for this value. *\/\n+\tdata->sample_rate = jack_get_sample_rate (data->client);\n+\tXMMS_DBG (\"engine sample rate: %lu\", data->sample_rate);\n \n \t\/* free, if allocated, and allocate memory for the output ports *\/\n-\tif(data->output_port)\n-\t{\n-\t\tg_free(data->output_port);\n+\tif (data->output_port) {\n+\t\tg_free (data->output_port);\n \t\tdata->output_port = 0;\n \t}\n-\tdata->output_port = g_malloc(sizeof(jack_port_t*) * data->num_output_channels);\n+\n+\tdata->output_port = g_new (jack_port_t *, data->num_output_channels);\n \n \t\/* create the output ports *\/\n-\tfor(i = 0; i < data->num_output_channels; i++)\n-\t{\n-\t\tchar portname[32];\n-\t\tg_snprintf(portname, sizeof(portname), \"out_%d\", i);\n-\t\tXMMS_DBG(\"port %d is named '%s'\", i, portname);\n-\t\tdata->output_port[i] = jack_port_register(data->client, portname,\n-\t\t\t\t\t\t\t JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);\n+\tfor(i = 0; i < data->num_output_channels; i++) {\n+\t\tgchar portname[32];\n+\t\tg_snprintf (portname, sizeof (portname), \"out_%d\", i);\n+\t\tXMMS_DBG (\"port %d is named '%s'\", i, portname);\n+\t\tdata->output_port[i] = jack_port_register (data->client, portname,\n+\t\t JACK_DEFAULT_AUDIO_TYPE,\n+\t\t JackPortIsOutput, 0);\n \t}\n \n \t\/* set the initial buffer size *\/\n-\tJACK_bufsize(jack_get_buffer_size(data->client), output);\n+\tJACK_bufsize (jack_get_buffer_size (data->client), output);\n \n \t\/* tell the JACK server that we are ready to roll *\/\n-\tif(jack_activate(data->client))\n-\t{\n-\t\txmms_log_fatal( \"cannot activate client\");\n+\tif (jack_activate (data->client)) {\n+\t\txmms_log_fatal ( \"cannot activate client\");\n \t\treturn ERR_OPENING_JACK;\n \t}\n \n \n-\tXMMS_DBG(\"jack_get_ports() passing in NULL\/NULL\");\n-\tports = jack_get_ports(data->client, NULL, NULL, JackPortIsInput);\n+\tXMMS_DBG (\"jack_get_ports() passing in NULL\/NULL\");\n+\tports = jack_get_ports (data->client, NULL, NULL, JackPortIsInput);\n \n \n \t\/* display a trace of the output ports we found *\/\n-\tfor(i = 0; ports[i]; i++)\n-\t\tXMMS_DBG(\"ports[%d] = '%s'\", i, ports[i]);\n+\tfor (i = 0; ports[i]; i++) {\n+\t\tXMMS_DBG (\"ports[%d] = '%s'\", i, ports[i]);\n+\t}\n \n \t\/* see if we have enough ports *\/\n-\tif(i < data->num_output_channels)\n-\t{\n-\t\tXMMS_DBG(\"ERR: jack_get_ports() failed to find ports with jack port flags of 0x%X'\", JackPortIsInput);\n+\tif (i < data->num_output_channels) {\n+\t\tXMMS_DBG (\"ERR: jack_get_ports() failed to find \"\n+\t\t \"ports with jack port flags of 0x%X'\", JackPortIsInput);\n \t\treturn ERR_PORT_NOT_FOUND;\n \t}\n \n \t\/* connect the ports. Note: you can't do this before\n-\t the client is activated (this may change in the future). *\/\n-\tfor(i = 0; i < data->num_output_channels; i++)\n-\t{\n-\t\tXMMS_DBG(\"jack_connect() to port '%p'\", data->output_port[i]);\n-\t\tif(jack_connect(data->client, jack_port_name(data->output_port[i]), ports[i]))\n-\t\t{\n-\t\t\txmms_log_fatal(\"cannot connect to output port %d('%s')\", i, ports[i]);\n+\t * the client is activated (this may change in the future). *\/\n+\tfor (i = 0; i < data->num_output_channels; i++) {\n+\t\tXMMS_DBG (\"jack_connect() to port '%p'\", data->output_port[i]);\n+\n+\t\tret = jack_connect (data->client,\n+\t\t jack_port_name (data->output_port[i]), ports[i]);\n+\t\tif (ret) {\n+\t\t\txmms_log_fatal (\"cannot connect to output port %d('%s')\", i,\n+\t\t\t ports[i]);\n \t\t\tfailed = 1;\n \t\t}\n-\t} \n-\n-\tfree(ports); \/* free the returned array of ports *\/\n-\n-\t\/* free any existing volume structure that might exist *\/\n-\t\/* we could have created it with a different number of *\/\n-\t\/* output channels *\/\n-\tif(data->volume)\n-\t{\n-\t\tg_free(data->volume);\n+\t}\n+\n+\tg_free (ports); \/* free the returned array of ports *\/\n+\n+\t\/* free any existing volume structure that might exist\n+\t * we could have created it with a different number of\n+\t * output channels *\/\n+\tif (data->volume) {\n+\t\tg_free (data->volume);\n \t\tdata->volume = 0;\n \t}\n \n \t\/* allocate space for the volume of each channel *\/\n-\tdata->volume = g_malloc(sizeof(float) * data->num_output_channels);\n+\tdata->volume = g_new (gfloat, data->num_output_channels);\n \n \t\/* free the old channel names *\/\n-\txmms_jack_free_channel_names(data);\n+\txmms_jack_free_channel_names (data);\n \n \t\/* create new channel names *\/\n-\txmms_jack_create_channel_names(data);\n-\n-\t\/* if something failed we need to shut the client down and return 0 *\/\n-\tif(failed)\n-\t{\n-\t\t_JACK_CloseDevice(output);\n+\txmms_jack_create_channel_names (data);\n+\n+\t\/* if something failed we need to shut\n+\t * the client down and return 0 *\/\n+\tif (failed) {\n+\t\txmms_jack_close_device (output);\n \t\treturn ERR_OPENING_JACK;\n \t}\n \n \treturn ERR_SUCCESS; \/* return success *\/\n }\n \n-\/**\n- * Handle the non-jack related aspects of opening up the device\n- * @param output xmms object\n- * @param bytes per channel\n- * @param pointer to the requested rate, will be set to jack's rate\n- * @param number of channels\n- *\/\n-static int\n-_JACK_Open(xmms_output_t *output, unsigned int bytes_per_channel,\n-\t unsigned long *rate, int channels)\n-{ \n-\tint retval;\n-\tint output_channels, input_channels;\n-\tlong bytes_per_output_frame;\n-\tlong bytes_per_input_frame;\n-\txmms_jack_data_t *data;\n-\n-\tdata = xmms_output_private_data_get(output);\n+\n+\/**\n+ * Handle the non-jack related aspects of opening up the device.\n+ *\n+ * @param output The output structure.\n+ * @param bytes_per_channel bytes per channel\n+ * @param rate pointer to the requested rate, will be set to jack's rate\n+ * @param channels number of channels\n+ * @return success status\n+ *\/\n+static gint\n+xmms_jack_open (xmms_output_t *output, guint bytes_per_channel,\n+ gulong *rate, gint channels)\n+{\n+\tgint output_channels, input_channels;\n+\tglong bytes_per_output_frame;\n+\tglong bytes_per_input_frame;\n+\txmms_jack_data_t *data;\n+\tgint retval;\n+\n+\tdata = xmms_output_private_data_get (output);\n \n \toutput_channels = input_channels = channels;\n \n-\t_JACK_reset(data); \/* flushes all queued buffers, sets status to STOPPED and resets some variables *\/\n-\n-\t\/* data->sample_rate is set by _JACK_OpenDevice() *\/\n-\tdata->num_input_channels = input_channels;\n-\tdata->num_output_channels = output_channels;\n-\tbytes_per_input_frame = (bytes_per_channel*data->num_input_channels);\n-\tbytes_per_output_frame = (bytes_per_channel*data->num_output_channels);\n-\n-\tXMMS_DBG(\"num_input_channels == %ld\", data->num_input_channels);\n-\tXMMS_DBG(\"num_output_channels == %ld\", data->num_output_channels);\n-\tXMMS_DBG(\"bytes_per_output_frame == %ld\", bytes_per_output_frame);\n-\tXMMS_DBG(\"bytes_per_input_frame == %ld\", bytes_per_input_frame);\n+ \t\/* flushes all queued buffers, sets status\n+\t * to STOPPED and resets some variables *\/\n+\txmms_jack_reset (data);\n+\n+\t\/* data->sample_rate is set by xmms_jack_open_device() *\/\n+\tdata->num_input_channels = input_channels;\n+\tdata->num_output_channels = output_channels;\n+\tbytes_per_input_frame = (bytes_per_channel * data->num_input_channels);\n+\tbytes_per_output_frame = (bytes_per_channel * data->num_output_channels);\n+\n+\tXMMS_DBG (\"num_input_channels == %ld\", data->num_input_channels);\n+\tXMMS_DBG (\"num_output_channels == %ld\", data->num_output_channels);\n+\tXMMS_DBG (\"bytes_per_output_frame == %ld\", bytes_per_output_frame);\n+\tXMMS_DBG (\"bytes_per_input_frame == %ld\", bytes_per_input_frame);\n \n \t\/* make sure bytes_per_frame is valid and non-zero *\/\n-\tif(!bytes_per_output_frame)\n-\t{\n-\t\txmms_log_fatal(\"bytes_per_output_frame is zero\");\n+\tif (!bytes_per_output_frame) {\n+\t\txmms_log_fatal (\"bytes_per_output_frame is zero\");\n \t\treturn ERR_BYTES_PER_OUTPUT_FRAME_INVALID;\n \t}\n \n \t\/* make sure bytes_per_frame is valid and non-zero *\/\n-\tif(!bytes_per_input_frame)\n-\t{\n-\t\txmms_log_fatal(\"bytes_per_output_frame is zero\");\n+\tif (!bytes_per_input_frame) {\n+\t\txmms_log_fatal (\"bytes_per_output_frame is zero\");\n \t\treturn ERR_BYTES_PER_INPUT_FRAME_INVALID;\n \t}\n \n \t\/* go and open up the device *\/\n-\tretval = _JACK_OpenDevice(output);\n-\tif(retval != ERR_SUCCESS)\n-\t{\n-\t\tXMMS_DBG(\"error opening jack device\");\n+\tretval = xmms_jack_open_device (output);\n+\tif (retval != ERR_SUCCESS) {\n+\t\tXMMS_DBG (\"error opening jack device\");\n \t\treturn retval;\n-\t} else\n-\t{\n-\t\tXMMS_DBG(\"succeeded opening jack device\");\n-\t}\n-\n-\t\/* make sure the sample rate of the jack server matches that of the client *\/\n-\tif((long)(*rate) != data->sample_rate)\n-\t{\n-\t\tXMMS_DBG(\"rate of %ld doesn't match jack sample rate of %ld, returning error\",\n-\t\t\t *rate, data->sample_rate);\n+\t} else {\n+\t\tXMMS_DBG (\"succeeded opening jack device\");\n+\t}\n+\n+\t\/* make sure the sample rate of the jack server\n+\t * matches that of the client *\/\n+\tif ((glong)(*rate) != data->sample_rate) {\n+\t\tXMMS_DBG (\"rate of %ld doesn't match jack sample rate of %ld,\"\n+\t\t \"returning error\", *rate, data->sample_rate);\n+\n \t\t*rate = data->sample_rate;\n-\t\t_JACK_CloseDevice(output);\n+\t\txmms_jack_close_device (output);\n+\n \t\treturn ERR_RATE_MISMATCH;\n \t}\n \n@@ -664,27 +844,28 @@\n \n \n \/**\n- * Set volume\n- * @param output xmms object\n- * @param input channel name string\n- * @param input volume level(range of 0 to 100)\n+ * Set volume.\n+ *\n+ * @param output The output structure.\n+ * @param channel input channel name string\n+ * @param volume input volume level(range of 0 to 100)\n+ * @return TRUE on success\n *\/\n static gboolean\n-xmms_jack_volume_set(xmms_output_t *output, const gchar *channel, guint volume)\n-{\n-\txmms_jack_data_t *data;\n-\tunsigned char x;\n+xmms_jack_volume_set (xmms_output_t *output, const gchar *channel,\n+ guint volume)\n+{\n+\txmms_jack_data_t *data;\n+\tguchar x;\n \n \tg_return_val_if_fail (output, 0);\n \tdata = xmms_output_private_data_get (output);\n \tg_return_val_if_fail (data, 0);\n \n \t\/* find the channel whos volume we should change *\/\n-\tfor(x = 0; x < data->num_output_channels; x++)\n-\t{\n-\t\tif(g_strcasecmp(channel, data->channel_names[x]) == 0)\n-\t\t{\n-\t\t\tdata->volume[x] = (float) volume \/ 100.0;\n+\tfor (x = 0; x < data->num_output_channels; x++) {\n+\t\tif (g_strcasecmp (channel, data->channel_names[x]) == 0) {\n+\t\t\tdata->volume[x] = (gfloat) volume \/ 100.0;\n \t\t\treturn TRUE;\n \t\t}\n \t}\n@@ -692,21 +873,31 @@\n \treturn FALSE;\n }\n \n+\n+\/**\n+ * Get current volume.\n+ *\n+ * @param output The output structure.\n+ * @param names channel names\n+ * @param values channel values\n+ * @param num_channels number of channels\n+ * @return TRUE on success\n+ *\/\n static gboolean\n xmms_jack_volume_get (xmms_output_t *output,\n const gchar **names, guint *values,\n guint *num_channels)\n {\n \txmms_jack_data_t *data;\n-\tunsigned int x;\n+\tguint x;\n+\n \tg_return_val_if_fail (output, FALSE);\n \tdata = xmms_output_private_data_get (output);\n \tg_return_val_if_fail (data, FALSE);\n \n-\t\/* *num_channels of 0 indicates that the caller is requesting the *\/\n-\t\/* number of channels we have *\/\n-\tif (!*num_channels)\n-\t{\n+\t\/* (*num_channels) of 0 indicates that the caller is requesting the\n+\t * number of channels we have *\/\n+\tif (!*num_channels) {\n \t\t*num_channels = data->num_output_channels;\n \t\treturn TRUE;\n \t}\n@@ -718,49 +909,55 @@\n \t\treturn FALSE;\n \t}\n \n-\tfor(x = 0; x < data->num_output_channels; x++)\n-\t{\n-\t\tvalues[x] = (guint)(data->volume[x] * 100);\n+\tfor (x = 0; x < data->num_output_channels; x++) {\n+\t\tvalues[x] = (guint) data->volume[x] * 100;\n \t\tnames[x] = data->channel_names[x];\n \t}\n \n \treturn TRUE;\n }\n \n+\n \/**\n * Flush the audio output, doesn't apply as we don't buffer any\n- * audio data\n- * @param output xmms object\n+ * audio data.\n+ *\n+ * @param output The output structure.\n *\/\n static void\n-xmms_jack_flush(xmms_output_t *output)\n-{\n-\tXMMS_DBG(\"xmms_jack_flush called\");\n-\treturn;\n-}\n-\n-\/**\n- * Create a new jack object\n- * @param output xmms object\n+xmms_jack_flush (xmms_output_t *output)\n+{\n+\tXMMS_DBG (\"xmms_jack_flush called\");\n+}\n+\n+\n+\/**\n+ * Create a new jack object.\n+ *\n+ * @param output The output structure.\n+ * @return TRUE on success\n *\/\n static gboolean\n-xmms_jack_new(xmms_output_t *output)\n-{\n-\txmms_jack_data_t *data;\n-\n-\tXMMS_DBG (\"xmms_jack_new\"); \n+xmms_jack_new (xmms_output_t *output)\n+{\n+\txmms_jack_data_t *data;\n+\n+\tXMMS_DBG (\"xmms_jack_new\");\n \n \tg_return_val_if_fail (output, FALSE);\n \tdata = g_new0 (xmms_jack_data_t, 1);\n \n-\txmms_output_private_data_set (output, data); \n+\txmms_output_private_data_set (output, data);\n \n \treturn xmms_jack_start (output);\n }\n \n+\n \/**\n * Frees the plugin data allocated in xmms_jack_new()\n- * and closes the connection to jack\n+ * and closes the connection to jack.\n+ *\n+ * @param output The output structure.\n *\/\n static void\n xmms_jack_destroy (xmms_output_t *output)\n@@ -772,24 +969,23 @@\n \tg_return_if_fail (data);\n \n \t\/* if playing, stop and close the device *\/\n-\tif(data->state == PLAYING)\n-\t{\n+\tif (data->state == PLAYING) {\n \t\tdata->state = STOPPED;\n-\t\t_JACK_CloseDevice(output);\n+\t\txmms_jack_close_device (output);\n \t}\n \n \tg_free (data);\n }\n \n+\n \/**\n * Get buffersize.\n *\n * @param output The output structure.\n- * \n * @return the current buffer size or 0 on failure.\n *\/\n static guint\n-xmms_jack_buffersize_get(xmms_output_t *output)\n+xmms_jack_buffersize_get (xmms_output_t *output)\n {\n \txmms_jack_data_t *data;\n \n@@ -800,14 +996,21 @@\n \treturn data->buffer_size;\n }\n \n+\n+\/**\n+ * Initialize jack output.\n+ *\n+ * @param output The output structure.\n+ * @return TRUE if a connection to the jack sound daemon was established\n+ *\/\n static gboolean\n-xmms_jack_start(xmms_output_t *output)\n-{\n-\txmms_jack_data_t *data;\n-\tunsigned long outputFrequency = 0;\n-\tint bytes_per_sample = 2;\n-\tint channels = 2; \/** @todo stop hardcoding 2 channels here *\/\n-\tunsigned int retval;\n+xmms_jack_start (xmms_output_t *output)\n+{\n+\txmms_jack_data_t *data;\n+\tgulong outputFrequency = 0;\n+\tgint bytes_per_sample = 2;\n+\tgint channels = 2; \/* @todo stop hardcoding 2 channels here *\/\n+\tguint ret;\n \n \tg_return_val_if_fail (output, FALSE);\n \tdata = xmms_output_private_data_get (output);\n@@ -816,99 +1019,80 @@\n \tXMMS_DBG (\"xmms_jack_start\");\n \n \t\/* if we are already open, just return true *\/\n-\tif(data->client)\n+\tif(data->client) {\n \t\treturn TRUE;\n-\n-\tretval = _JACK_Open(output, bytes_per_sample, &outputFrequency, channels);\n-\tif(retval == ERR_RATE_MISMATCH)\n-\t{\n-\t\tXMMS_DBG(\"we want a rate of '%ld', opening at jack rate\", outputFrequency);\n+\t}\n+\n+\tret = xmms_jack_open (output, bytes_per_sample,\n+\t &outputFrequency, channels);\n+\n+\tif (ret == ERR_RATE_MISMATCH) {\n+\t\tXMMS_DBG (\"we want a rate of '%ld', opening at jack rate\",\n+\t\t outputFrequency);\n \n \t\t\/* open the jack device with true jack's rate, return 0 upon failure *\/\n-\t\tif((retval = _JACK_Open(output, bytes_per_sample, &outputFrequency, channels)))\n-\t\t{\n-\t\t\tXMMS_DBG(\"failed to open jack with _JACK_Open(), error %d\", retval);\n+\t\tret = xmms_jack_open (output, bytes_per_sample,\n+\t\t &outputFrequency, channels);\n+\n+\t\tif (ret) {\n+\t\t\txmms_log_error (\"failed to open jack with xmms_jack_open(),\"\n+\t\t\t \"error %d\", ret);\n \t\t\treturn FALSE;\n \t\t}\n+\n \t\tXMMS_DBG(\"success!!\");\n-\t} else if(retval != ERR_SUCCESS)\n-\t{\n-\t\tXMMS_DBG(\"failed to open jack with _JACK_Open(), error %d\", retval);\n+\t} else if (ret != ERR_SUCCESS) {\n+\t\txmms_log_error (\"failed to open jack with xmms_jack_open(), error %d\",\n+\t\t ret);\n \t\treturn FALSE;\n \t}\n \n \tdata->rate = outputFrequency;\n \n-\txmms_output_format_add(output,\n- XMMS_SAMPLE_FORMAT_FLOAT,\n- channels, outputFrequency);\n-\n-\tXMMS_DBG(\"jack started!!\");\n+\txmms_output_format_add (output, XMMS_SAMPLE_FORMAT_FLOAT,\n+\t channels, outputFrequency);\n+\n+\tXMMS_DBG (\"jack started!!\");\n \n \treturn TRUE;\n }\n \n-\/**\n- * Callback from xmms whenever the playback state of the plugin changes\n- * @param output xmms object\n- * @param requested status\n+\n+\/**\n+ * Callback from xmms whenever the playback state of the plugin changes.\n+ *\n+ * @param output The output structure.\n+ * @param status requested status\n+ * @return TRUE on success\n *\/\n static gboolean\n xmms_jack_status (xmms_output_t *output, xmms_playback_status_t status)\n {\n \txmms_jack_data_t *data;\n+\tconst gchar *tmp;\n \n \tg_return_val_if_fail (output, FALSE);\n \tdata = xmms_output_private_data_get (output);\n \tg_return_val_if_fail (data, FALSE);\n \n-\tXMMS_DBG (\"changed status! '%s'\", (status == XMMS_PLAYBACK_STATUS_PLAY) ? \"PLAYING\" : \"STOPPED\");\n-\tif(status == XMMS_PLAYBACK_STATUS_PLAY)\n-\t{\n-\t\tif(!xmms_jack_start(output))\n-\t\t{\n-\t\t\txmms_log_error(\"unable to start jack with jack_start(), is jack server running?\");\n+\tif (status == XMMS_PLAYBACK_STATUS_PLAY) {\n+\t\ttmp = \"PLAYING\";\n+\t} else {\n+\t\ttmp = \"STOPPED\";\n+\t}\n+\tXMMS_DBG (\"changed status! '%s'\", tmp);\n+\n+\tif (status == XMMS_PLAYBACK_STATUS_PLAY) {\n+\t\tif (!xmms_jack_start (output)) {\n+\t\t\txmms_log_error (\"unable to start jack with jack_start(),\"\n+\t\t\t \"is jack server running?\");\n \t\t\treturn FALSE;\n \t\t}\n+\n \t\tdata->state = PLAYING;\n-\t}\n-\telse\n-\t{\n+\t} else {\n \t\tdata->state = STOPPED;\n \t}\n \n \treturn TRUE;\n }\n-\n-\/**\n- * Get plugin information\n- *\/\n-static gboolean xmms_jack_plugin_setup (xmms_output_plugin_t *plugin);\n-\n-XMMS_OUTPUT_PLUGIN (\"jack\", \"Jack Output\", XMMS_VERSION,\n- \"Jack audio server output plugin\",\n- xmms_jack_plugin_setup);\n-\n-static gboolean\n-xmms_jack_plugin_setup (xmms_output_plugin_t *plugin)\n-{\n-\txmms_output_methods_t methods;\n-\n-\tXMMS_OUTPUT_METHODS_INIT(methods);\n-\n-\tmethods.new = xmms_jack_new;\n-\tmethods.destroy = xmms_jack_destroy;\n-\n-\tmethods.flush = xmms_jack_flush;\n-\n-\tmethods.volume_get = xmms_jack_volume_get;\n-\tmethods.volume_set = xmms_jack_volume_set;\n-\n-\tmethods.status = xmms_jack_status;\n-\n-\tmethods.latency_get = xmms_jack_buffersize_get;\n-\n-\txmms_output_plugin_methods_set (plugin, &methods);\n-\n-\treturn TRUE;\n-}\n"} {"commit":"e3d3c04a6cd7351fe8279234eb8c5aea27ad6bf9","subject":"qemu: Fix improper indention","message":"qemu: Fix improper indention\n\nCommit id 'ce61c164' indented wrong - not sure how I did that...\n","repos":"libvirt\/libvirt,VenkatDatta\/libvirt,crobinso\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,taget\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,datto\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,datto\/libvirt,jfehlig\/libvirt,taget\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,taget\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt,eskultety\/libvirt,zippy2\/libvirt,crobinso\/libvirt,datto\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt,eskultety\/libvirt,taget\/libvirt,datto\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,olafhering\/libvirt,olafhering\/libvirt,libvirt\/libvirt,libvirt\/libvirt,taget\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_command.c\n+++ src\/qemu\/qemu_command.c\n@@ -5041,20 +5041,20 @@\n telnet ? \",telnet\" : \"\",\n dev->data.tcp.listen ? \",server,nowait\" : \"\");\n \n- if (cfg->chardevTLS) {\n- char *objalias = NULL;\n-\n- if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir,\n- dev->data.tcp.listen,\n- cfg->chardevTLSx509verify,\n- alias, qemuCaps) < 0)\n- goto error;\n-\n- if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias)))\n- goto error;\n- virBufferAsprintf(&buf, \",tls-creds=%s\", objalias);\n- VIR_FREE(objalias);\n- }\n+ if (cfg->chardevTLS) {\n+ char *objalias = NULL;\n+\n+ if (qemuBuildTLSx509CommandLine(cmd, cfg->chardevTLSx509certdir,\n+ dev->data.tcp.listen,\n+ cfg->chardevTLSx509verify,\n+ alias, qemuCaps) < 0)\n+ goto error;\n+\n+ if (!(objalias = qemuAliasTLSObjFromChardevAlias(alias)))\n+ goto error;\n+ virBufferAsprintf(&buf, \",tls-creds=%s\", objalias);\n+ VIR_FREE(objalias);\n+ }\n break;\n \n case VIR_DOMAIN_CHR_TYPE_UNIX:\n"} {"commit":"f12f34fe2f50cffb37a4cad9ce0f07a305dafca1","subject":"assign the whole slot to the PCI device that has no address","message":"assign the whole slot to the PCI device that has no address\n\nIf user does not specify the PCI address, we should auto assign an unused slot.\n","repos":"nertpinx\/libvirt,jeckersb\/libvirt,datto\/libvirt,rmarwaha\/libvirt1,andreabolognani\/libvirt,kantai\/libvirt-vfork,libvirt\/libvirt,VenkatDatta\/libvirt,agx\/libvirt,olafhering\/libvirt,libvirt\/libvirt,siboulet\/libvirt-openvz,crobinso\/libvirt,leilihh\/libvirt,warewolf\/libvirt,leilihh\/libvirt,dumbbell\/libvirt,novel\/fbsd-libvirt,rlaager\/libvirt,foomango\/libvirt,wiedi\/libvirt,shugaoye\/libvirt,VenkatDatta\/libvirt,zippy2\/libvirt,iam-TJ\/libvirt,jardasgit\/libvirt,kantai\/libvirt-vfork,danwent\/libvirt-ovs,kantai\/libvirt-vfork,foomango\/libvirt,eskultety\/libvirt,emaste\/libvirt,trainstack\/libvirt,trainstack\/libvirt,rmarwaha\/libvirt1,elmarco\/libvirt,wiedi\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jardasgit\/libvirt,jfehlig\/libvirt,warewolf\/libvirt,bjzhang\/libvirt,bjzhang\/libvirt,andreabolognani\/libvirt,agx\/libvirt,iam-TJ\/libvirt,kantai\/libvirt-vfork,eskultety\/libvirt,soulxu\/libvirt-xuhj,emaste\/libvirt,warewolf\/libvirt,wiedi\/libvirt,rmarwaha\/libvirt,iam-TJ\/libvirt,dumbbell\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,cbosdo\/libvirt,dumbbell\/libvirt,trainstack\/libvirt,eskultety\/libvirt,siboulet\/libvirt-openvz,jardasgit\/libvirt,agx\/libvirt,elmarco\/libvirt,foomango\/libvirt,datto\/libvirt,olafhering\/libvirt,trainstack\/libvirt,jardasgit\/libvirt,soulxu\/libvirt-xuhj,dumbbell\/libvirt,iam-TJ\/libvirt,datto\/libvirt,shugaoye\/libvirt,andreabolognani\/libvirt,trainstack\/libvirt,dumbbell\/libvirt,leilihh\/libvirt,novel\/fbsd-libvirt,novel\/fbsd-libvirt,elmarco\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,fabianfreyer\/libvirt,cbosdo\/libvirt,cbosdo\/libvirt,taget\/libvirt,warewolf\/libvirt,trainstack\/libvirt,wiedi\/libvirt,elmarco\/libvirt,novel\/fbsd-libvirt,bjzhang\/libvirt,jfehlig\/libvirt,soulxu\/libvirt-xuhj,jeckersb\/libvirt,jardasgit\/libvirt,agx\/libvirt,usc-isi\/libvirt,foomango\/libvirt,wiedi\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,taget\/libvirt,fabianfreyer\/libvirt,usc-isi\/libvirt,danwent\/libvirt-ovs,andreabolognani\/libvirt,datto\/libvirt,soulxu\/libvirt-xuhj,danwent\/libvirt-ovs,agx\/libvirt,eskultety\/libvirt,datto\/libvirt,rmarwaha\/libvirt1,shugaoye\/libvirt,usc-isi\/libvirt,fabianfreyer\/libvirt,iam-TJ\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,cbosdo\/libvirt,soulxu\/libvirt-xuhj,zippy2\/libvirt,novel\/fbsd-libvirt,zhlcindy\/libvirt-1.1.4-maintain,leilihh\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,usc-isi\/libvirt,novel\/fbsd-libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,wiedi\/libvirt,VenkatDatta\/libvirt,warewolf\/libvirt,jeckersb\/libvirt,leilihh\/libvirt,rmarwaha\/libvirt1,trainstack\/libvirt,emaste\/libvirt,bjzhang\/libvirt,siboulet\/libvirt-openvz,siboulet\/libvirt-openvz,dumbbell\/libvirt,shugaoye\/libvirt,emaste\/libvirt,novel\/fbsd-libvirt,novel\/fbsd-libvirt,jeckersb\/libvirt,libvirt\/libvirt,jeckersb\/libvirt,VenkatDatta\/libvirt,VenkatDatta\/libvirt,zippy2\/libvirt,danwent\/libvirt-ovs,rmarwaha\/libvirt1,jfehlig\/libvirt,crobinso\/libvirt,rmarwaha\/libvirt,iam-TJ\/libvirt,leilihh\/libvirt,rlaager\/libvirt,danwent\/libvirt-ovs,zhlcindy\/libvirt-1.1.4-maintain,shugaoye\/libvirt,elmarco\/libvirt,emaste\/libvirt,warewolf\/libvirt,rlaager\/libvirt,kantai\/libvirt-vfork,taget\/libvirt,jeckersb\/libvirt,zippy2\/libvirt,rmarwaha\/libvirt1,taget\/libvirt,fabianfreyer\/libvirt,rmarwaha\/libvirt,taget\/libvirt,rmarwaha\/libvirt,rmarwaha\/libvirt,warewolf\/libvirt,foomango\/libvirt,emaste\/libvirt,crobinso\/libvirt,rmarwaha\/libvirt,andreabolognani\/libvirt,usc-isi\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jeckersb\/libvirt,emaste\/libvirt,iam-TJ\/libvirt,novel\/fbsd-libvirt,rlaager\/libvirt,crobinso\/libvirt,wiedi\/libvirt,bjzhang\/libvirt,cbosdo\/libvirt,jfehlig\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_command.c\n+++ src\/qemu\/qemu_command.c\n@@ -779,6 +779,35 @@\n return NULL;\n }\n \n+\/* check whether the slot is used by the other device\n+ * Return 0 if the slot is not used by the other device, or -1 if the slot\n+ * is used by the other device.\n+ *\/\n+static int qemuDomainPCIAddressCheckSlot(qemuDomainPCIAddressSetPtr addrs,\n+ virDomainDeviceInfoPtr dev)\n+{\n+ char *addr;\n+ virDomainDeviceInfo temp_dev;\n+ int function;\n+\n+ temp_dev = *dev;\n+ for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) {\n+ temp_dev.addr.pci.function = function;\n+ addr = qemuPCIAddressAsString(&temp_dev);\n+ if (!addr)\n+ return -1;\n+\n+ if (virHashLookup(addrs->used, addr)) {\n+ VIR_FREE(addr);\n+ return -1;\n+ }\n+\n+ VIR_FREE(addr);\n+ }\n+\n+ return 0;\n+}\n+\n int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs,\n virDomainDeviceInfoPtr dev)\n {\n@@ -917,18 +946,17 @@\n if (!(addr = qemuPCIAddressAsString(&maybe)))\n return -1;\n \n- if (virHashLookup(addrs->used, addr)) {\n+ if (qemuDomainPCIAddressCheckSlot(addrs, &maybe) < 0) {\n VIR_DEBUG(\"PCI addr %s already in use\", addr);\n VIR_FREE(addr);\n continue;\n }\n \n VIR_DEBUG(\"Allocating PCI addr %s\", addr);\n-\n- if (virHashAddEntry(addrs->used, addr, addr) < 0) {\n- VIR_FREE(addr);\n+ VIR_FREE(addr);\n+\n+ if (qemuDomainPCIAddressReserveSlot(addrs, i) < 0)\n return -1;\n- }\n \n dev->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;\n dev->addr.pci = maybe.addr.pci;\n"} {"commit":"241969d465c5de4d9ebf51de7e82e1b25143ba82","subject":"qemu_command: use confidential-guest-support if available","message":"qemu_command: use confidential-guest-support if available\n\nSigned-off-by: Pavel Hrdina <d4772d05997b8abf035041e3b4f4996380ea7e7a@redhat.com>\nReviewed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"zippy2\/libvirt,zippy2\/libvirt,crobinso\/libvirt,libvirt\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,olafhering\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,olafhering\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_command.c\n+++ src\/qemu\/qemu_command.c\n@@ -6974,8 +6974,13 @@\n if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_LOADPARM))\n qemuAppendLoadparmMachineParm(&buf, def);\n \n- if (def->sev)\n- virBufferAddLit(&buf, \",memory-encryption=sev0\");\n+ if (def->sev) {\n+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT)) {\n+ virBufferAddLit(&buf, \",confidential-guest-support=sev0\");\n+ } else {\n+ virBufferAddLit(&buf, \",memory-encryption=sev0\");\n+ }\n+ }\n \n if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {\n if (priv->pflash0)\n"} {"commit":"a4ca6e5d0f9f707b81f757eeac381144c8e0533c","subject":"qemu: avoid leaking uninit data from hotplug to dumpxml","message":"qemu: avoid leaking uninit data from hotplug to dumpxml\n\nDetected by Coverity. The fix in 2c27dfa didn't catch all bad\ninstances of memcpy(). Thankfully, on further analysis, all of\nthe problematic uses are only triggered by old qemu that lacks\n-device.\n\n* src\/qemu\/qemu_hotplug.c (qemuDomainAttachPciDiskDevice)\n(qemuDomainAttachNetDevice, qemuDomainAttachHostPciDevice): Init\nall fields since monitor only populates some of them.\n","repos":"trainstack\/libvirt,rmarwaha\/libvirt,dumbbell\/libvirt,agx\/libvirt,zippy2\/libvirt,jeckersb\/libvirt,leilihh\/libvirt,VenkatDatta\/libvirt,cbosdo\/libvirt,wiedi\/libvirt,novel\/fbsd-libvirt,shugaoye\/libvirt,cbosdo\/libvirt,rlaager\/libvirt,rmarwaha\/libvirt1,siboulet\/libvirt-openvz,usc-isi\/libvirt,bjzhang\/libvirt,andreabolognani\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,iam-TJ\/libvirt,warewolf\/libvirt,bjzhang\/libvirt,jeckersb\/libvirt,rmarwaha\/libvirt1,trainstack\/libvirt,jeckersb\/libvirt,libvirt\/libvirt,dumbbell\/libvirt,fabianfreyer\/libvirt,iam-TJ\/libvirt,eskultety\/libvirt,dumbbell\/libvirt,wiedi\/libvirt,olafhering\/libvirt,crobinso\/libvirt,warewolf\/libvirt,nertpinx\/libvirt,usc-isi\/libvirt,emaste\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,leilihh\/libvirt,novel\/fbsd-libvirt,elmarco\/libvirt,VenkatDatta\/libvirt,novel\/fbsd-libvirt,iam-TJ\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,eskultety\/libvirt,bjzhang\/libvirt,danwent\/libvirt-ovs,siboulet\/libvirt-openvz,jardasgit\/libvirt,elmarco\/libvirt,rlaager\/libvirt,crobinso\/libvirt,foomango\/libvirt,rlaager\/libvirt,trainstack\/libvirt,wiedi\/libvirt,eskultety\/libvirt,rmarwaha\/libvirt1,emaste\/libvirt,novel\/fbsd-libvirt,jardasgit\/libvirt,shugaoye\/libvirt,danwent\/libvirt-ovs,bjzhang\/libvirt,rmarwaha\/libvirt1,iam-TJ\/libvirt,shugaoye\/libvirt,danwent\/libvirt-ovs,rlaager\/libvirt,wiedi\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jardasgit\/libvirt,taget\/libvirt,jfehlig\/libvirt,foomango\/libvirt,dumbbell\/libvirt,iam-TJ\/libvirt,nertpinx\/libvirt,jeckersb\/libvirt,taget\/libvirt,leilihh\/libvirt,elmarco\/libvirt,zippy2\/libvirt,agx\/libvirt,emaste\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,fabianfreyer\/libvirt,novel\/fbsd-libvirt,jeckersb\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,shugaoye\/libvirt,eskultety\/libvirt,dumbbell\/libvirt,leilihh\/libvirt,libvirt\/libvirt,elmarco\/libvirt,datto\/libvirt,nertpinx\/libvirt,rlaager\/libvirt,jeckersb\/libvirt,iam-TJ\/libvirt,VenkatDatta\/libvirt,libvirt\/libvirt,warewolf\/libvirt,emaste\/libvirt,taget\/libvirt,siboulet\/libvirt-openvz,novel\/fbsd-libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt,foomango\/libvirt,siboulet\/libvirt-openvz,trainstack\/libvirt,jardasgit\/libvirt,foomango\/libvirt,olafhering\/libvirt,rmarwaha\/libvirt,shugaoye\/libvirt,agx\/libvirt,datto\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,danwent\/libvirt-ovs,eskultety\/libvirt,agx\/libvirt,leilihh\/libvirt,rmarwaha\/libvirt1,trainstack\/libvirt,andreabolognani\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,novel\/fbsd-libvirt,siboulet\/libvirt-openvz,emaste\/libvirt,danwent\/libvirt-ovs,leilihh\/libvirt,iam-TJ\/libvirt,dumbbell\/libvirt,andreabolognani\/libvirt,warewolf\/libvirt,fabianfreyer\/libvirt,usc-isi\/libvirt,olafhering\/libvirt,warewolf\/libvirt,cbosdo\/libvirt,foomango\/libvirt,wiedi\/libvirt,VenkatDatta\/libvirt,andreabolognani\/libvirt,rmarwaha\/libvirt,jfehlig\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,warewolf\/libvirt,crobinso\/libvirt,trainstack\/libvirt,bjzhang\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,rmarwaha\/libvirt,elmarco\/libvirt,usc-isi\/libvirt,taget\/libvirt,warewolf\/libvirt,novel\/fbsd-libvirt,cbosdo\/libvirt,emaste\/libvirt,usc-isi\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,agx\/libvirt,rmarwaha\/libvirt,emaste\/libvirt,jeckersb\/libvirt,taget\/libvirt,wiedi\/libvirt,rmarwaha\/libvirt1,trainstack\/libvirt,libvirt\/libvirt,wiedi\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_hotplug.c\n+++ src\/qemu\/qemu_hotplug.c\n@@ -246,7 +246,7 @@\n }\n }\n } else {\n- virDomainDevicePCIAddress guestAddr;\n+ virDomainDevicePCIAddress guestAddr = disk->info.addr.pci;\n ret = qemuMonitorAddPCIDisk(priv->mon,\n disk->src,\n type,\n@@ -775,6 +775,7 @@\n goto try_remove;\n }\n } else {\n+ guestAddr = net->info.addr.pci;\n if (qemuMonitorAddPCINetwork(priv->mon, nicstr,\n &guestAddr) < 0) {\n qemuDomainObjExitMonitorWithDriver(driver, vm);\n@@ -929,7 +930,7 @@\n configfd, configfd_name);\n qemuDomainObjExitMonitorWithDriver(driver, vm);\n } else {\n- virDomainDevicePCIAddress guestAddr;\n+ virDomainDevicePCIAddress guestAddr = hostdev->info.addr.pci;\n \n qemuDomainObjEnterMonitorWithDriver(driver, vm);\n ret = qemuMonitorAddPCIHostDevice(priv->mon,\n"} {"commit":"e4d96324b48b8aab864212382390a5c4a40970d2","subject":"qemu_hotplug: remove extra function in middle of DetachController call chain","message":"qemu_hotplug: remove extra function in middle of DetachController call chain\n\nqemuDomainDetachDeviceControllerLive() just checks if the controller\ntype is SCSI, and then either returns failure, or calls\nqemuDomainDetachControllerDevice().\n\nInstead, lets just check for type != SCSI at the top of the latter\nfunction, and call it directly.\n\nSigned-off-by: Laine Stump <c23361c43fbf79fed83e8b76173707b083d6caf5@laine.org>\nACKed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"fabianfreyer\/libvirt,eskultety\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,eskultety\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,zippy2\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,eskultety\/libvirt,zippy2\/libvirt,eskultety\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jardasgit\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_hotplug.c\n+++ src\/qemu\/qemu_hotplug.c\n@@ -5527,6 +5527,13 @@\n {\n int idx, ret = -1;\n virDomainControllerDefPtr detach = NULL;\n+\n+ if (dev->data.controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {\n+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED,\n+ _(\"'%s' controller cannot be hot unplugged.\"),\n+ virDomainControllerTypeToString(dev->data.controller->type));\n+ return -1;\n+ }\n \n if ((idx = virDomainControllerFind(vm->def,\n dev->data.controller->type,\n@@ -6170,27 +6177,6 @@\n }\n \n \n-static int\n-qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,\n- virDomainObjPtr vm,\n- virDomainDeviceDefPtr dev,\n- bool async)\n-{\n- virDomainControllerDefPtr cont = dev->data.controller;\n- int ret = -1;\n-\n- switch (cont->type) {\n- case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:\n- ret = qemuDomainDetachControllerDevice(driver, vm, dev, async);\n- break;\n- default :\n- virReportError(VIR_ERR_OPERATION_UNSUPPORTED,\n- _(\"'%s' controller cannot be hot unplugged.\"),\n- virDomainControllerTypeToString(cont->type));\n- }\n- return ret;\n-}\n-\n int\n qemuDomainDetachDeviceLive(virDomainObjPtr vm,\n virDomainDeviceDefPtr dev,\n@@ -6204,7 +6190,7 @@\n ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev, async);\n break;\n case VIR_DOMAIN_DEVICE_CONTROLLER:\n- ret = qemuDomainDetachDeviceControllerLive(driver, vm, dev, async);\n+ ret = qemuDomainDetachControllerDevice(driver, vm, dev, async);\n break;\n case VIR_DOMAIN_DEVICE_LEASE:\n ret = qemuDomainDetachLease(driver, vm, dev->data.lease);\n"} {"commit":"0af2661d72e04623a808227a98fe2328c2ab0b20","subject":"https:\/\/bugs.chromium.org\/p\/oss-fuzz\/issues\/detail?id=11930","message":"https:\/\/bugs.chromium.org\/p\/oss-fuzz\/issues\/detail?id=11930\n","repos":"Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- coders\/caption.c\n+++ coders\/caption.c\n@@ -136,8 +136,9 @@\n assert(exception != (ExceptionInfo *) NULL);\n assert(exception->signature == MagickCoreSignature);\n image=AcquireImage(image_info,exception);\n- (void) ResetImagePixels(image,exception);\n (void) ResetImagePage(image,\"0x0+0+0\");\n+ if ((image->columns != 0) && (image->rows != 0))\n+ (void) SetImageBackgroundColor(image);\n \/*\n Format caption.\n *\/\n"} {"commit":"c00ad8e3921cccd8e7c254520d631aefcdec2a22","subject":"salut-muc-manager.c: fix string leaks in browser_removed","message":"salut-muc-manager.c: fix string leaks in browser_removed\n\n\n20071102133114-7fe3f-5405a7ee37f5eaa9c6bd62a92574f5af9160ea64.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/salut-muc-manager.c\n+++ src\/salut-muc-manager.c\n@@ -1058,10 +1058,17 @@\n && !tp_strdiff (type, r_type)\n && !tp_strdiff (domain, r_domain))\n {\n+ g_free (r_name);\n+ g_free (r_type);\n+ g_free (r_domain);\n g_object_unref (resolver);\n g_array_remove_index_fast (arr, i);\n break;\n }\n+\n+ g_free (r_name);\n+ g_free (r_type);\n+ g_free (r_domain);\n }\n \n if (arr->len > 0)\n"} {"commit":"eb661d570826b69fe44034ea9e74fbc068da66bd","subject":"Fix get attendees memory leak","message":"Fix get attendees memory leak\n","repos":"GNOME\/evolution-ews,GNOME\/evolution-ews","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/server\/e-ews-item.c\n+++ src\/server\/e-ews-item.c\n@@ -83,6 +83,7 @@\n \n static GObjectClass *parent_class = NULL;\n static void\tews_item_free_mailbox (EwsMailbox *mb);\n+static void\tews_item_free_attendee (EwsAttendee *attendee);\n \n static void\n e_ews_item_dispose (GObject *object)\n@@ -145,6 +146,13 @@\n \t\tpriv->attachments_list = NULL;\n \t}\n \n+\tif (priv->attendees) {\n+\t\tg_slist_foreach (priv->attendees, (GFunc) ews_item_free_attendee, NULL);\n+\t\tg_slist_free (priv->attendees);\n+\t\tpriv->attendees = NULL;\n+\n+\t}\n+\n \tews_item_free_mailbox (priv->sender);\n \tews_item_free_mailbox (priv->from);\n \n@@ -203,6 +211,15 @@\n \t}\n }\n \n+static void\n+ews_item_free_attendee (EwsAttendee *attendee)\n+{\n+\tif (attendee) {\n+\t\tews_item_free_mailbox (attendee->mailbox);\n+\t\tg_free (attendee->responsetype);\n+\t\tg_free (attendee);\n+\t}\n+}\n \n static time_t\n ews_item_parse_date (const gchar *dtstring)\n@@ -754,8 +771,15 @@\n \t\/* Return NULL if RoutingType of Mailbox is not SMTP\n \t\t For instance, people who don't exist any more\t*\/\n \tsubparam = e_soap_parameter_get_first_child_by_name (param, \"RoutingType\");\n-\tif (g_ascii_strcasecmp (e_soap_parameter_get_string_value (subparam), \"SMTP\"))\n-\t\treturn NULL;\n+\tif (subparam) {\n+\t\tgchar *routingtype;\n+\t\troutingtype = e_soap_parameter_get_string_value (subparam);\n+\t\tif (g_ascii_strcasecmp (routingtype, \"SMTP\")) {\n+\t\t\tg_free (routingtype);\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tg_free (routingtype);\n+\t}\n \n \tmb = g_new0 (EwsMailbox, 1);\n \n"} {"commit":"2ec1a14a3415453e769d8642bc2387493901617a","subject":"refactor(server): Simplify Session logging definitions","message":"refactor(server): Simplify Session logging definitions\n","repos":"open62541\/open62541,open62541\/open62541,jpfr\/open62541,jpfr\/open62541,jpfr\/open62541,open62541\/open62541,open62541\/open62541,JGrothoff\/open62541,JGrothoff\/open62541,JGrothoff\/open62541,jpfr\/open62541,JGrothoff\/open62541","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/server\/ua_session.h\n+++ src\/server\/ua_session.h\n@@ -131,7 +131,7 @@\n * string of length zero). *\/\n \n #define UA_LOG_SESSION_INTERNAL(LOGGER, LEVEL, SESSION, MSG, ...) \\\n- do { \\\n+ if(UA_LOGLEVEL <= UA_LOGLEVEL_##LEVEL) { \\\n int nameLen = (SESSION) ? (int)(SESSION)->sessionName.length : 0; \\\n const char *nameStr = (SESSION) ? \\\n (const char*)(SESSION)->sessionName.data : NULL; \\\n@@ -140,49 +140,20 @@\n UA_LOG_##LEVEL(LOGGER, UA_LOGCATEGORY_SESSION, \\\n \"SecureChannel %\" PRIu32 \" | Session \\\"%.*s\\\" | \" MSG \"%.0s\", \\\n chanId, nameLen, nameStr, __VA_ARGS__); \\\n- } while(0)\n+ }\n \n-#if UA_LOGLEVEL <= 100\n-# define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, TRACE, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_TRACE_SESSION(LOGGER, SESSION, ...)\n-#endif\n-\n-#if UA_LOGLEVEL <= 200\n-# define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, DEBUG, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_DEBUG_SESSION(LOGGER, SESSION, ...)\n-#endif\n-\n-#if UA_LOGLEVEL <= 300\n-# define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, INFO, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_INFO_SESSION(LOGGER, SESSION, ...)\n-#endif\n-\n-#if UA_LOGLEVEL <= 400\n-# define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, WARNING, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_WARNING_SESSION(LOGGER, SESSION, ...)\n-#endif\n-\n-#if UA_LOGLEVEL <= 500\n-# define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, ERROR, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_ERROR_SESSION(LOGGER, SESSION, ...)\n-#endif\n-\n-#if UA_LOGLEVEL <= 600\n-# define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...) \\\n+#define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...) \\\n UA_MACRO_EXPAND(UA_LOG_SESSION_INTERNAL(LOGGER, FATAL, SESSION, __VA_ARGS__, \"\"))\n-#else\n-# define UA_LOG_FATAL_SESSION(LOGGER, SESSION, ...)\n-#endif\n \n _UA_END_DECLS\n \n"} {"commit":"2445e22d298553659bc02bcef09708e82a42e943","subject":"Fixed a bug in syncio_memory.c","message":"Fixed a bug in syncio_memory.c\n\ngit-svn-id: a739a095880fa3ebc46f89d9df64e20166cf4ba9@2073 70169cfe-8b10-0410-8925-dcb4b91034d8\n","repos":"sttts\/gwenhywfar,sttts\/gwenhywfar,sttts\/gwenhywfar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sio\/syncio_memory.c\n+++ src\/sio\/syncio_memory.c\n@@ -97,6 +97,7 @@\n GWEN_Buffer_AppendBytes(xio->buffer, (const char*) buffer, size);\n GWEN_Buffer_Rewind(xio->buffer);\n }\n+ GWEN_SyncIo_SetStatus(sio, GWEN_SyncIo_Status_Connected);\n return sio;\n }\n \n"} {"commit":"766bc6443a2b114e74d69993a4ce66246d97931e","subject":"Don't try to unset GValue's without a type","message":"Don't try to unset GValue's without a type\n\n\n20070528153533-b58c9-6f6e0399caea538e27762127d16f809c2f837303.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sip-media-channel.c\n+++ src\/sip-media-channel.c\n@@ -691,13 +691,13 @@\n \n g_ptr_array_add (ret, g_value_get_boxed (&handler));\n }\n- else\n- g_value_init (&handler, G_TYPE_NONE);\n \n tp_svc_channel_interface_media_signalling_return_from_get_session_handlers (\n context, ret);\n \n- g_value_unset (&handler);\n+ if (G_IS_VALUE(&handler))\n+ g_value_unset (&handler);\n+\n g_ptr_array_free (ret, TRUE);\n }\n \n"} {"commit":"5ee3a315d349ce703b43fac153814d4129b4d6de","subject":"Signal the call state In_Progress on response 183 Session Progress","message":"Signal the call state In_Progress on response 183 Session Progress\n\nThis is the proper fix for the early media case. Before,\nwe could only pretend that the call state is Ringing.\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sip-media-channel.c\n+++ src\/sip-media-channel.c\n@@ -1180,13 +1180,16 @@\n switch (status)\n {\n case 180:\n- case 183: \/* FIXME: use state IN_PROGRESS when we get it from the spec *\/\n tpsip_media_channel_change_call_state (self, peer,\n TP_CHANNEL_CALL_STATE_RINGING, 0);\n break;\n case 182:\n tpsip_media_channel_change_call_state (self, peer,\n TP_CHANNEL_CALL_STATE_QUEUED, 0);\n+ break;\n+ case 183:\n+ tpsip_media_channel_change_call_state (self, peer,\n+ TP_CHANNEL_CALL_STATE_IN_PROGRESS, 0);\n break;\n }\n break;\n"} {"commit":"27a2d88bc3eb76a30f4d72c385354591e48a7d33","subject":"Emit MembersChanged with reason _NO_ANSWER if the media session times out","message":"Emit MembersChanged with reason _NO_ANSWER if the media session times out\n\n\n20070509132229-5b6ca-66d9c02e70faf5906cc33266f60932a37e8cb248.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sip-media-session.c\n+++ src\/sip-media-session.c\n@@ -551,10 +551,25 @@\n static gboolean priv_timeout_session (gpointer data)\n {\n SIPMediaSession *session = data;\n-\n- g_debug (\"%s: session timed out\", G_STRFUNC);\n+ TpIntSet *set;\n+ TpHandle peer;\n+\n+ DEBUG(\"session timed out\");\n if (session)\n- sip_media_session_terminate (session);\n+ {\n+ SIPMediaSessionPrivate *priv = SIP_MEDIA_SESSION_GET_PRIVATE (session); \n+\n+ peer = sip_media_session_get_peer (session);\n+\n+ set = tp_intset_new ();\n+ tp_intset_add (set, peer);\n+ tp_group_mixin_change_members ((GObject *)priv->channel, \"Timed out\",\n+ NULL, set, NULL, NULL, 0,\n+ TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER);\n+ tp_intset_destroy (set);\n+\n+ sip_media_session_terminate (session);\n+ }\n \n return FALSE;\n }\n"} {"commit":"07afc6c1b1db534b9a163407209de75d75ba1635","subject":"SIPMediaSession: macroized the DBus type functions","message":"SIPMediaSession: macroized the DBus type functions\n\n\n20070524181707-5b6ca-01798f9e44977c421e45d09461b0a6d55e0db308.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sip-media-session.c\n+++ src\/sip-media-session.c\n@@ -42,6 +42,7 @@\n #include \"sip-connection-helpers.h\"\n #include \"sip-media-session.h\"\n #include \"sip-media-stream.h\"\n+#include \"telepathy-helpers.h\"\n \n #define DEBUG_FLAG SIP_DEBUG_MEDIA\n #include \"debug.h\"\n@@ -713,23 +714,16 @@\n sip_media_channel_stream_state (priv->channel, stream_id, state);\n }\n \n-static GType\n-sip_media_session_stream_type (void) \/* G_GNUC_CONST *\/\n-{\n- static GType type = 0;\n-\n- if (!type)\n- type = dbus_g_type_get_struct (\"GValueArray\",\n- G_TYPE_UINT,\n- G_TYPE_UINT,\n- G_TYPE_UINT,\n- G_TYPE_UINT,\n- G_TYPE_UINT,\n- G_TYPE_UINT,\n- G_TYPE_INVALID);\n-\n- return type;\n-}\n+DEFINE_TP_STRUCT_TYPE(sip_media_session_stream_type,\n+ G_TYPE_UINT,\n+ G_TYPE_UINT,\n+ G_TYPE_UINT,\n+ G_TYPE_UINT,\n+ G_TYPE_UINT,\n+ G_TYPE_UINT)\n+\n+DEFINE_TP_LIST_FREE(sip_media_session_free_stream_list,\n+ sip_media_session_stream_type ())\n \n void\n priv_add_stream_list_entry (GPtrArray *list,\n@@ -818,20 +812,6 @@\n }\n \n return TRUE;\n-}\n-\n-void\n-sip_media_session_free_stream_list (GPtrArray *list)\n-{\n- GType stream_type;\n- guint i;\n-\n- stream_type = sip_media_session_stream_type ();\n-\n- for (i = 0; i < list->len; i++)\n- g_boxed_free (stream_type, g_ptr_array_index (list, i));\n-\n- g_ptr_array_free (list, TRUE);\n }\n \n void sip_media_session_accept (SIPMediaSession *self, gboolean accept)\n"} {"commit":"601916bd68ce852ad069021c49c1804ccc4c30d9","subject":"fixed lingering errors in alias.c ininvolving aliastab casting","message":"fixed lingering errors in alias.c ininvolving aliastab casting\n","repos":"c1moore\/YAS,c1moore\/YAS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- commands\/alias.c\n+++ commands\/alias.c\n@@ -1,4 +1,5 @@\n #include <syscall.h>\n+#include <string.h>\n #include <unistd.h>\n #include <stdio.h>\n #include <sys\/types.h>\n@@ -17,7 +18,7 @@\n \t\t\tprintf(\"No aliases set\\n\");\n \t\t\treturn(0);\n \t\t}\t\t\t\n-\t\twhile (curr != NULL) {\n+\t\twhile (curr->next != NULL) {\n \t\t\tprintf(\"%s = %s\\n\",curr->alias,curr->cmd);\n \t\t\tcurr = curr->next;\n \t\t}\n@@ -34,8 +35,8 @@\n \t\t}*\/\n \n \t\t\/\/stops aliases being set to themselves\n-\t\tif(argv[1] == argv[2]) {\n-\t\t\tprintf(\"You can't do that\");\n+\t\tif(strcmp(argv[1],argv[2]) == 0) {\n+\t\t\tperror(\"You can't do that\");\n \t\t\treturn(ARG_ERR);\n \t\t}\n \n@@ -44,23 +45,30 @@\n \t\t\/*goes theough aliastab until it reaches the end of the list. If\n \t\tat anypoint it catches either the inputed command or alias has been \n \t\ttaken it returns an error and alerts the user*\/\n-\t\twhile (curr != NULL) {\n-\t\t\tif(argv[2] == curr->cmd) {\n+\t\twhile (curr->next != NULL) {\n+\t\t\tif(strcmp(argv[2],curr->cmd) == 0) {\n \t\t\t\tfprintf(stderr,\"Command %s is already set with alias %s\",argv[2],curr->alias);\n \t\t\t\treturn(BUILTIN_ERR);\n \t\t\t}\n-\t\t\telse if(argv[1] == curr->alias) {\n+\t\t\telse if(strcmp(argv[1],curr->alias) == 0) {\n \t\t\t\tfprintf(stderr,\"Alias %s is already set with command %s\",argv[1],curr->cmd);\n+\t\t\t\treturn(BUILTIN_ERR);\n \t\t\t}\n \t\t\telse {\n \t\t\t\tcurr = curr->next;\n \t\t\t}\n \t\t}\n \n-\t\tcurr->next = malloc(sizeof(*curr));\t\t\/\/creates new ending node\n-\t\tcurr->alias = argv[1];\t\t\t\t\t\/\/sets new node with the alias\n-\t\tcurr->cmd = argv[2];\t\t\t\t\t\/\/and command\n+\t\tcurr->next = (struct yas_alias*)malloc(sizeof(struct yas_alias));\t\t\/\/creates new ending node\n+\t\t\n+\t\tmalloc(strlen(argv[1])+1);\t\t\t\/\/sets new node with the alias\n+\t\tcurr->alias = argv[1];\n+\t\t\n+\t\tmalloc(strlen(argv[2])+1);\t\t\t\/\/sets new node with command\n+\t\tcurr->cmd = argv[2];\t\t\t\t\n+\t\t\n \t\tcurr->next->next = NULL;\t\t\t\t\/\/sets next node to be NULL\n+\t\tnum_aliases++;\t\t\t\t\t\t\t\/\/increments num_aliases global variable\n \n \t\tprintf(\"%s = %s\\n\",curr->alias,curr->cmd);\n \t\treturn(0);\n"} {"commit":"7a0714feb1e9b801b68e03d6bfefe9a046a6c41a","subject":"sixtracklib\/common: bugfixing in tracking functions","message":"sixtracklib\/common: bugfixing in tracking functions\n","repos":"SixTrack\/SixTrackLib,SixTrack\/SixTrackLib,SixTrack\/SixTrackLib,SixTrack\/SixTrackLib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sixtracklib\/common\/track.h\n+++ sixtracklib\/common\/track.h\n@@ -3,13 +3,13 @@\n \n #if !defined( SIXTRL_NO_INCLUDES )\n #include \"sixtracklib\/_impl\/definitions.h\"\n+ #include \"sixtracklib\/common\/particles.h\"\n #endif \/* !defined( SIXTRL_NO_INCLUDES ) *\/\n \n #if !defined( _GPUCODE ) && defined( __cplusplus )\n extern \"C\" {\n #endif \/* !defined( _GPUCODE ) && defined( __cplusplus ) *\/\n \n-struct NS(Particles);\n struct NS(Drift);\n struct NS(DriftExact);\n struct NS(MultiPole);\n@@ -19,13 +19,13 @@\n \/* struct NS(BeamBeam); *\/\n \n SIXTRL_FN SIXTRL_STATIC SIXTRL_TRACK_RETURN NS(Track_particle_drift)(\n- SIXTRL_ARGPTR_DEC struct NS(Particles)* SIXTRL_RESTRICT particles,\n+ SIXTRL_ARGPTR_DEC NS(Particles)* SIXTRL_RESTRICT particles,\n NS(particle_num_elements_t) const ii,\n SIXTRL_DATAPTR_DEC const struct NS(Drift)\n *const SIXTRL_RESTRICT drift );\n \n SIXTRL_FN SIXTRL_STATIC SIXTRL_TRACK_RETURN NS(Track_particle_drift_exact)(\n- SIXTRL_ARGPTR_DEC struct NS(Particles)* SIXTRL_RESTRICT particles,\n+ SIXTRL_ARGPTR_DEC NS(Particles)* SIXTRL_RESTRICT particles,\n NS(particle_num_elements_t) const ii,\n SIXTRL_DATAPTR_DEC const struct NS(DriftExact)\n *const SIXTRL_RESTRICT drift );\n@@ -126,7 +126,7 @@\n real_t const xp = NS(Particles_get_px_value )( particles, ii ) * rpp;\n real_t const yp = NS(Particles_get_py_value )( particles, ii ) * rpp;\n real_t const rvv = NS(Particles_get_rvv_value)( particles, ii );\n- real_t const dzeta = rvv - ONE + ONE_HALF * ( xp*xp + yp*yp );\n+ real_t const dzeta = rvv - ( ONE + ONE_HALF * ( xp*xp + yp*yp ) );\n \n real_t zeta = NS(Particles_get_zeta_value)( particles, ii );\n real_t s = NS(Particles_get_s_value)( particles, ii );\n@@ -135,6 +135,9 @@\n \n real_t const length = NS(Drift_get_length)( drift );\n \n+ SIXTRL_ASSERT( NS(Particles_get_beta0_value)( particles, ii ) >\n+ ( real_t )0 );\n+\n s += length;\n x += length * xp;\n y += length * yp;\n@@ -165,13 +168,13 @@\n real_t const px = NS(Particles_get_px_value)( particles, ii );\n real_t const py = NS(Particles_get_py_value)( particles, ii );\n real_t const beta0 = NS(Particles_get_beta0_value)( particles, ii );\n- real_t const psigma = NS(Particles_get_psigma_valule)( particles, ii );\n+ real_t const psigma = NS(Particles_get_psigma_value)( particles, ii );\n real_t const rvv = NS(Particles_get_rvv_value)( particles, ii );\n real_t const length = NS(DriftExact_get_length)( drift );\n \n real_t const lzpi = length \/ sqrt( opd * opd - px * px - py * py );\n real_t const dzeta =\n- rvv * ( length - ( beta0 * beta0 * psigma + ONE ) * lpzi );\n+ rvv * ( length - ( beta0 * beta0 * psigma + ONE ) * lzpi );\n \n real_t s = NS(Particles_get_s_value)( particles, ii );\n real_t x = NS(Particles_get_x_value)( particles, ii );\n@@ -182,8 +185,8 @@\n \n s += length;\n zeta += dzeta;\n- x += px * lpzi;\n- y += py * lpzi;\n+ x += px * lzpi;\n+ y += py * lzpi;\n \n NS(Particles_set_s_value)( particles, ii, s );\n NS(Particles_set_x_value)( particles, ii, x );\n@@ -200,8 +203,8 @@\n NS(particle_num_elements_t) const ii,\n SIXTRL_ARGPTR_DEC const NS(MultiPole) *const SIXTRL_RESTRICT mp )\n {\n- typename NS(particle_real_t) real_t;\n- typename NS(particle_index_t) index_t;\n+ typedef NS(particle_real_t) real_t;\n+ typedef NS(particle_index_t) index_t;\n \n SIXTRL_STATIC_VAR index_t const TWO = ( index_t )2;\n SIXTRL_STATIC_VAR real_t const ZERO = ( real_t )0.0;\n@@ -223,10 +226,16 @@\n real_t px = NS(Particles_get_px_value)( particles, ii );\n real_t py = NS(Particles_get_py_value)( particles, ii );\n \n- for( ; index_x >= 0 ; index_x -= TWO, index_y -= TWO )\n+ while( index_x > 0 )\n {\n real_t const zre = dpx * x - dpy * y;\n real_t const zim = dpx * y + dpy * x;\n+\n+ SIXTRL_ASSERT( index_x >= TWO );\n+ SIXTRL_ASSERT( index_y >= TWO );\n+\n+ index_x -= TWO;\n+ index_y -= TWO;\n \n dpx = NS(MultiPole_get_bal_value)( mp, index_x ) + zre;\n dpy = NS(MultiPole_get_bal_value)( mp, index_y ) + zim;\n@@ -238,7 +247,7 @@\n if( ( hxl > ZERO ) || ( hyl > ZERO ) || ( hxl < ZERO ) || ( hyl < ZERO ) )\n {\n real_t const delta = NS(Particles_get_delta_value)( particles, ii );\n- real_t const length = NS(MulitPole_get_length)( mp );\n+ real_t const length = NS(MultiPole_get_length)( mp );\n \n real_t const hxlx = x * hxl;\n real_t const hyly = y * hyl;\n@@ -247,13 +256,18 @@\n zeta -= chi * ( hxlx - hyly );\n NS(Particles_set_zeta_value)( particles, ii, zeta );\n \n- dpx += hxl + hxl * delta;\n- dpy -= hyl + hyl * delta;\n-\n if( length > ZERO )\n {\n- dpx -= chi * NS(MultiPole_get_bal_value)( mp, 0 ) * hxlx \/ length;\n- dpy += chi * NS(MultiPole_get_bal_value)( mp, 1 ) * hyly \/ length;\n+ real_t const b1l = chi * NS(MultiPole_get_bal_value)( mp, 0 );\n+ real_t const a1l = chi * NS(MultiPole_get_bal_value)( mp, 1 );\n+\n+ dpx += hxl + hxl * delta - b1l * hxlx \/ length;\n+ dpy -= hyl + hyl * delta - a1l * hyly \/ length;\n+ }\n+ else\n+ {\n+ dpx += hxl + hxl * delta;\n+ dpy -= hyl + hyl * delta;\n }\n }\n \n@@ -333,11 +347,12 @@\n SIXTRL_STATIC_VAR real_t const PI =\n ( real_t )3.1415926535897932384626433832795028841971693993751;\n \n- SIXTRL_STATIC_VAR real_t const ZERO = ( real_t )0.0;\n- SIXTRL_STATIC_VAR real_t const ONE = ( real_t )1.0;\n- SIXTRL_STATIC_VAR real_t const TWO = ( real_t )2.0;\n- SIXTRL_STATIC_VAR real_t const DEG2RAD = ( real_t )180.0 \/ PI;\n- SIXTRL_STATIC_VAR real_t const K_FACTOR = TWO * PI \/ ( real_t )299792458.0;\n+ SIXTRL_STATIC_VAR real_t const ZERO = ( real_t )0.0;\n+ SIXTRL_STATIC_VAR real_t const ONE = ( real_t )1.0;\n+ SIXTRL_STATIC_VAR real_t const TWO = ( real_t )2.0;\n+\n+ real_t const DEG2RAD = ( real_t )180.0 \/ PI;\n+ real_t const K_FACTOR = ( TWO * PI ) \/ ( real_t )299792458.0;\n \n real_t const beta0 = NS(Particles_get_beta0_value)( particles, ii );\n real_t const zeta = NS(Particles_get_zeta_value)( particles, ii );\n@@ -352,14 +367,13 @@\n real_t beta = ZERO;\n real_t one_plus_delta = ZERO;\n \n-\n- real_t const tau = zeta \/ ( beta0 * rvv );\n- real_t ptau = psigma * beta0;\n-\n- real_t const phase = DEG2RAD * NS(Cavity_get_lag)( cav ) -\n- K_FACTOR * NS(Cavity_get_frequency)( cav ) * tau;\n-\n- real_t const energy = chi * sin( phase ) * NS(Cavity_get_voltage)( cav );\n+ real_t const tau = zeta \/ ( beta0 * rvv );\n+ real_t ptau = psigma * beta0;\n+\n+ real_t const phase = DEG2RAD * NS(Cavity_get_lag)( cav ) -\n+ K_FACTOR * NS(Cavity_get_frequency)( cav ) * tau;\n+\n+ real_t const energy = chi * sin( phase ) * NS(Cavity_get_voltage)( cav );\n \n SIXTRL_ASSERT( ii < NS(Particles_get_num_of_particles)( particles ) );\n SIXTRL_ASSERT( rvv > ZERO );\n@@ -711,7 +725,7 @@\n return ret;\n }\n \n-SIXTRL_INLINE SIXTRL_TRACK_RETURN NS(Track_beam_element_particles_subsets)(\n+SIXTRL_INLINE SIXTRL_TRACK_RETURN NS(Track_beam_elements_particles_subset)(\n SIXTRL_ARGPTR_DEC NS(Particles)* SIXTRL_RESTRICT p,\n NS(particle_num_elements_t) p_index_begin,\n NS(particle_num_elements_t) const p_index_end,\n@@ -720,7 +734,6 @@\n {\n SIXTRL_TRACK_RETURN ret = ( SIXTRL_TRACK_RETURN )0;\n \n- SIXTRL_ASSERT( begin_addr != ( address_t )0u );\n SIXTRL_ASSERT( ( ( uintptr_t )be_info_end ) >= ( uintptr_t )be_info_it );\n \n SIXTRL_ASSERT( ( be_info_it != SIXTRL_NULLPTR ) ||\n@@ -742,7 +755,7 @@\n {\n typedef NS(particle_num_elements_t) num_elem_t;\n \n- return NS(Track_beam_element_particles_subsets)( p,\n+ return NS(Track_beam_elements_particles_subset)( p,\n ( num_elem_t )0u, NS(Particles_get_num_of_particles)( p ),\n be_info_begin, be_info_end );\n }\n"} {"commit":"abcc56d3bfe8f82ec85fbe5642cae06736595e80","subject":"Split a panic in condvar.c into two panic","message":"Split a panic in condvar.c into two panic\n","repos":"bowlofstew\/sv6,aclements\/sv6,aclements\/sv6,bowlofstew\/sv6,bowlofstew\/sv6,bowlofstew\/sv6,aclements\/sv6,aclements\/sv6,aclements\/sv6,bowlofstew\/sv6","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- condvar.c\n+++ condvar.c\n@@ -116,8 +116,12 @@\n acquire(&cv->lock);\n LIST_FOREACH_SAFE(p, &cv->waiters, cv_waiters, tmp) {\n acquire(&p->lock);\n- if(p->state != SLEEPING || p->oncv != cv)\n- panic(\"cv_wakeup\");\n+ if (p->state != SLEEPING)\n+ panic(\"cv_wakeup: pid %u name %s state %u\",\n+ p->pid, p->name, p->state);\n+ if (p->oncv != cv)\n+ panic(\"cv_wakeup: pid %u name %s p->cv %p cv %p\",\n+ p->pid, p->name, p->oncv, cv);\n if (p->cv_wakeup) {\n acquire(&sleepers_lock);\n LIST_REMOVE(p, cv_sleep);\n"} {"commit":"1dcc5e3ea667717b8beaec9b95c955da70d99c49","subject":"\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u79fb\u52d5\u3092\u8ffd\u52a0","message":"\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u79fb\u52d5\u3092\u8ffd\u52a0\n","repos":"horie-t\/Aomushi,horie-t\/Aomushi","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- bootpack.c\n+++ bootpack.c\n@@ -18,7 +18,7 @@\n struct TASK *task_a, *task_cons;\n struct CONSOLE *cons;\n \n- int x, y, mx, my;\n+ int x, y, mx, my, mmx = -1, mmy = -1;\n int i, j;\n int key_to = 0, key_shift = 0, key_leds = (binfo->leds >> 4) & 7, keycmd_wait = -1;\n int cursor_x, cursor_c;\n@@ -30,7 +30,7 @@\n \n struct SHTCTL *shtctl;\n struct SHEET *sht_back, *sht_win, *sht_mouse, *sht_cons;\n- struct SHEET *sht;\n+ struct SHEET *sht = 0;\n unsigned char *buf_back, *buf_win, buf_mouse[256], *buf_cons;\n \n static char keytable0[0x80] = {\n@@ -296,18 +296,35 @@\n \n \t if (mdec.btn & 0x01 != 0) {\n \t \/* \u5de6\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u3044\u308b *\/\n-\t \/* \u4e0a\u306e\u4e0b\u6577\u304d\u304b\u3089\u9806\u756a\u306b\u30de\u30a6\u30b9\u304c\u6307\u3057\u3066\u3044\u308b\u4e0b\u6577\u304d\u3092\u63a2\u3059 *\/\n-\t for (j = shtctl->top - 1; j > 0; j--) {\n-\t sht = shtctl->sheets[j];\n-\t x = mx - sht->vx0;\n-\t y = my - sht->vy0;\n-\t if (0 <= x && x < sht->bxsize && 0 <= y && y < sht->bysize) {\n-\t\tif (sht->buf[y * sht->bxsize + x] != sht->col_inv) {\n-\t\t sheet_updown(sht, shtctl->top - 1);\n-\t\t break;\n+\t if (mmx < 0) {\n+\t \/* \u901a\u5e38\u30e2\u30fc\u30c9\u306e\u5834\u5408 *\/\n+\t \/* \u4e0a\u306e\u4e0b\u6577\u304d\u304b\u3089\u9806\u756a\u306b\u30de\u30a6\u30b9\u304c\u6307\u3057\u3066\u3044\u308b\u4e0b\u6577\u304d\u3092\u63a2\u3059 *\/\n+\t for (j = shtctl->top - 1; j > 0; j--) {\n+\t\tsht = shtctl->sheets[j];\n+\t\tx = mx - sht->vx0;\n+\t\ty = my - sht->vy0;\n+\t\tif (0 <= x && x < sht->bxsize && 0 <= y && y < sht->bysize) {\n+\t\t if (sht->buf[y * sht->bxsize + x] != sht->col_inv) {\n+\t\t sheet_updown(sht, shtctl->top - 1);\n+\t\t if (3 <= x && x < sht->bxsize - 3 && 3 <= y && y < 21) {\n+\t\t mmx = mx;\t\/* \u30de\u30a6\u30b9\u79fb\u52d5\u30e2\u30fc\u30c9\u3078 *\/\n+\t\t mmy = my;\n+\t\t }\n+\t\t break;\n+\t\t }\n \t\t}\n \t }\n+\t } else {\n+\t \/* \u30a6\u30a3\u30f3\u30c9\u30a6\u79fb\u52d5\u30e2\u30fc\u30c9\u306e\u5834\u5408 *\/\n+\t x = mx - mmx;\n+\t y = my - mmy;\n+\t sheet_slide(sht, sht->vx0 + x, sht->vy0 + y);\n+\t mmx = mx;\n+\t mmy = my;\n \t }\n+\t } else {\n+\t \/* \u5de6\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u3044\u306a\u3044 *\/\n+\t mmx = -1;\n \t }\n \t}\n } else if (i <= 1) {\t\/* \u30ab\u30fc\u30bd\u30eb\u7528\u30bf\u30a4\u30de *\/\n"} {"commit":"a3b88674d7757abc5c6bd62fcdc0d82ded1f4772","subject":"netplay resync tweaks","message":"netplay resync tweaks\n","repos":"ChenThread\/little-emu,ChenThread\/little-emu,ChenThread\/little-emu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- bots\/net.c\n+++ bots\/net.c\n@@ -221,10 +221,10 @@\n \n #ifdef SERVER\n \t\/\/ Do a quick check\n-\tif(player_cli[0] < 0) {\n+\tif(player_cli[0] < 0 && player_cli[1] >= 0) {\n \t\tplayer_frame_idx[0] = backlog_end;\n \t}\n-\tif(player_cli[1] < 0) {\n+\tif(player_cli[1] < 0 && player_cli[0] >= 0) {\n \t\tplayer_frame_idx[1] = backlog_end;\n \t}\n \n@@ -351,7 +351,7 @@\n \t\t\t\tsintro_buf[0] = 0x01;\n \t\t\t\t((uint32_t *)(sintro_buf+1))[0] = (pidx == -1\n \t\t\t\t\t? backlog_end\n-\t\t\t\t\t: player_frame_idx[pidx]);\n+\t\t\t\t\t: player_initial_frame_idx[pidx]);\n \t\t\t\t((int32_t *)(sintro_buf+1))[1] = pidx;\n \t\t\t\tcli_keepalive_recv[cidx] = now+keepalive_period;\n \t\t\t\tsendto(sockfd, sintro_buf, sizeof(sintro_buf), 0,\n@@ -369,7 +369,7 @@\n \t\t\t\tsintro_buf[0] = 0x01;\n \t\t\t\t((uint32_t *)(sintro_buf+1))[0] = (pidx == -1\n \t\t\t\t\t? backlog_end\n-\t\t\t\t\t: player_frame_idx[pidx]);\n+\t\t\t\t\t: player_initial_frame_idx[pidx]);\n \t\t\t\t((int32_t *)(sintro_buf+1))[1] = pidx;\n \t\t\t\tsendto(sockfd, sintro_buf, sizeof(sintro_buf), 0,\n \t\t\t\t\t(struct sockaddr *)&maddr, maddr_len);\n"} {"commit":"3bf6d57babe57d0039346228d989b605253bed36","subject":"Fixed SEGFAULT when parsing a CLF log format and using --ignore-crawlers.","message":"Fixed SEGFAULT when parsing a CLF log format and using --ignore-crawlers.\n","repos":"Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- browsers.c\n+++ browsers.c\n@@ -258,8 +258,12 @@\n is_crawler (const char *agent)\n {\n char type[BROWSER_TYPE_LEN];\n- char *browser, *a = xstrdup (agent);\n- if ((browser = verify_browser (a, type)) != NULL)\n+ char *browser, *a;\n+\n+ if (agent == NULL || *agent == '\\0')\n+ return 0;\n+\n+ if ((a = xstrdup (agent), browser = verify_browser (a, type)) != NULL)\n free (browser);\n free (a);\n \n"} {"commit":"15e02b372ddebd2aac829707786462798f91d509","subject":"send-pack: allow generic sha1 expression on the source side.","message":"send-pack: allow generic sha1 expression on the source side.\n\nThis extends the source side semantics to match what Linus\nsuggested.\n\nAn example:\n\n $ git-send-pack kernel.org:\/pub\/scm\/git\/git.git pu^^:master pu\n\n would allow me to push the current pu into pu, and the\n commit two commits before it into master, on my public\n repository.\n\nThe revised rule for updating remote heads is as follows.\n\n $ git-send-pack [--all] <remote> [<ref>...]\n\n - When no <ref> is specified:\n\n - with '--all', it is the same as specifying the full refs\/*\n path for all local refs;\n\n - without '--all', it is the same as specifying the full\n refs\/* path for refs that exist on both ends;\n\n - When one or more <ref>s are specified:\n\n - a single token <ref> (i.e. no colon) must be a pattern that\n tail-matches refs\/* path for an existing local ref. It is\n an error for the pattern to match no local ref, or more\n than one local refs. The matching ref is pushed to the\n remote end under the same name.\n\n - <src>:<dst> can have different cases. <src> is first tried\n as the tail-matching pattern for refs\/* path.\n\n - If more than one matches are found, it is an error.\n\n - If one match is found, <dst> must either match no remote\n ref and start with \"refs\/\", or match exactly one remote\n ref. That remote ref is updated with the sha1 value\n obtained from the <src> sha1.\n\n - If no match is found, it is given to get_extended_sha1();\n it is an error if get_extended_sha1() does not find an\n object name. If it succeeds, <dst> must either match\n no remote ref and start with \"refs\/\" or match exactly\n one remote ref. That remote ref is updated with the sha1\n value.\n\nSigned-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- connect.c\n+++ connect.c\n@@ -133,6 +133,20 @@\n \t**tail = NULL;\n }\n \n+static struct ref *try_explicit_object_name(const char *name)\n+{\n+\tunsigned char sha1[20];\n+\tstruct ref *ref;\n+\tint len;\n+\tif (get_sha1(name, sha1))\n+\t\treturn NULL;\n+\tlen = strlen(name) + 1;\n+\tref = xcalloc(1, sizeof(*ref) + len);\n+\tmemcpy(ref->name, name, len);\n+\tmemcpy(ref->new_sha1, sha1, 20);\n+\treturn ref;\n+}\n+\n static int match_explicit_refs(struct ref *src, struct ref *dst,\n \t\t\t struct ref ***dst_tail, struct refspec *rs)\n {\n@@ -145,6 +159,12 @@\n \t\tcase 1:\n \t\t\tbreak;\n \t\tcase 0:\n+\t\t\t\/* The source could be in the get_sha1() format\n+\t\t\t * not a reference name.\n+\t\t\t *\/\n+\t\t\tmatched_src = try_explicit_object_name(rs[i].src);\n+\t\t\tif (matched_src)\n+\t\t\t\tbreak;\n \t\t\terrs = 1;\n \t\t\terror(\"src refspec %s does not match any.\");\n \t\t\tbreak;\n"} {"commit":"83f2567c8f2d4da12b97ffd88f897a9490f5b0b0","subject":"Split out code in a new function and call it instead of duplicating it.","message":"Split out code in a new function and call it instead of duplicating it.\n","repos":"libav\/c99-to-c89,mstorsjo\/c99-to-c89,rbultje\/c99-to-c89,libav\/c99-to-c89,rbultje\/c99-to-c89,mstorsjo\/c99-to-c89","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- convert.c\n+++ convert.c\n@@ -1218,6 +1218,47 @@\n }\n }\n \n+static void declare_variable(CompoundLiteralList *l, unsigned cur_tok_off,\n+ CXToken *tokens, unsigned n_tokens,\n+ const char *var_name, unsigned *lnum,\n+ unsigned *cpos)\n+{\n+ unsigned idx1, idx2, off, n;\n+\n+ \/* type information, e.g. 'int' or 'struct AVRational' *\/\n+ idx1 = find_token_for_offset(tokens, n_tokens, cur_tok_off,\n+ l->cast_token.start);\n+ idx2 = find_token_for_offset(tokens, n_tokens, cur_tok_off,\n+ l->cast_token_array_start);\n+ get_token_position(tokens[idx1 + 1], lnum, cpos, &off);\n+ for (n = idx1 + 1; n <= idx2 - 1; n++) {\n+ indent_for_token(tokens[n], lnum, cpos, &off);\n+ print_token(tokens[n], lnum, cpos);\n+ }\n+\n+ \/* variable name and array tokens, e.g. 'tmp[]' *\/\n+ print_literal_text(\" \", lnum, cpos);\n+ print_literal_text(var_name, lnum, cpos);\n+ idx1 = find_token_for_offset(tokens, n_tokens, cur_tok_off,\n+ l->cast_token.end);\n+ for (n = idx2; n <= idx1 - 1; n++) {\n+ indent_for_token(tokens[n], lnum, cpos, &off);\n+ print_token(tokens[n], lnum, cpos);\n+ }\n+ print_literal_text(\" = \", lnum, cpos);\n+\n+ \/* value *\/\n+ idx1 = find_token_for_offset(tokens, n_tokens, cur_tok_off,\n+ l->value_token.start);\n+ idx2 = find_token_for_offset(tokens, n_tokens, cur_tok_off,\n+ l->value_token.end);\n+ get_token_position(tokens[idx1], lnum, cpos, &off);\n+ for (n = idx1; n <= idx2; n++) {\n+ indent_for_token(tokens[n], lnum, cpos, &off);\n+ print_token(tokens[n], lnum, cpos);\n+ }\n+}\n+\n static void replace_comp_literal(CompoundLiteralList *l, unsigned *lnum,\n unsigned *cpos, unsigned *_n,\n CXToken *tokens, unsigned n_tokens)\n@@ -1232,34 +1273,28 @@\n unsigned n, idx1, idx2, off;\n \n print_literal_text(\"{ \", lnum, cpos);\n- idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token.start);\n- idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token.end);\n- for (n = idx1 + 1; n < idx2; n++) {\n- print_token(tokens[n], lnum, cpos);\n- print_literal_text(\" \", lnum, cpos);\n- }\n- print_literal_text(\"tmp__ = \", lnum, cpos);\n- idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->value_token.start);\n- idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->value_token.end);\n- get_token_position(tokens[idx1], lnum, cpos, &off);\n- for (n = idx1; n <= idx2; n++) {\n- indent_for_token(tokens[n], lnum, cpos, &off);\n- print_token(tokens[n], lnum, cpos);\n- }\n+ declare_variable(l, *_n, tokens, n_tokens, \"tmp__\", lnum, cpos);\n print_literal_text(\"; \", lnum, cpos);\n+\n+ \/\/ the actual statement follows\n idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n l->context_start);\n idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n l->cast_token.start);\n+ get_token_position(tokens[idx1], lnum, cpos, &off);\n for (n = idx1; n < idx2; n++) {\n+ indent_for_token(tokens[n], lnum, cpos, &off);\n print_token(tokens[n], lnum, cpos);\n- print_literal_text(\" \", lnum, cpos);\n- }\n- print_literal_text(\"tmp__; }\", lnum, cpos);\n+ }\n+ \/\/ FIXME here, we skip the ';' token; instead, we should print that\n+ \/\/ token and possibly closing brackets around it (e.g. the remainder\n+ \/\/ of a function call), so we support constructs that look like\n+ \/\/ function((AVRational) { b, c }) or variants of that also.\n+ print_literal_text(\" tmp__; }\", lnum, cpos);\n+\n+ \/\/ FIXME what if there are two CLs in a single (set of) function calls?\n+ \/\/ E.g. function((AVRational) { a, b }, (AVRational) { c, d }) or\n+ \/\/ function(function2((AVRational) { a, b }), (AVRational) { c, d }).\n \n *_n = find_token_for_offset(tokens, n_tokens, *_n,\n l->value_token.end) + 1;\n@@ -1272,45 +1307,9 @@\n \n \/\/ declare static const variable\n print_literal_text(\"static \", lnum, cpos);\n- idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token.start) + 1;\n- idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token_array_start) - 1;\n- get_token_position(tokens[idx1], lnum, cpos, &off);\n- for (n = idx1; n <= idx2; n++) {\n- \/\/ FIXME split array out\n- indent_for_token(tokens[n], lnum, cpos, &off);\n- print_token(tokens[n], lnum, cpos);\n- }\n- \/\/ need unique name (see below)\n snprintf(tmp, sizeof(tmp), \"tmp__%u\", unique_cntr++);\n- print_literal_text(\" \", lnum, cpos);\n- print_literal_text(tmp, lnum, cpos);\n l->data.t_c_d.tmp_var_name = strdup(tmp);\n-\n- \/\/ array tokens, if any\n- idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token_array_start);\n- idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->cast_token.end) - 1;\n- get_token_position(tokens[idx1], lnum, cpos, &off);\n- for (n = idx1; n <= idx2; n++) {\n- indent_for_token(tokens[n], lnum, cpos, &off);\n- print_token(tokens[n], lnum, cpos);\n- }\n-\n- print_literal_text(\" = \", lnum, cpos);\n-\n- idx1 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->value_token.start);\n- idx2 = find_token_for_offset(tokens, n_tokens, *_n,\n- l->value_token.end);\n- get_token_position(tokens[idx1], lnum, cpos, &off);\n- for (n = idx1; n <= idx2; n++) {\n- \/\/ FIXME split array out\n- indent_for_token(tokens[n], lnum, cpos, &off);\n- print_token(tokens[n], lnum, cpos);\n- }\n+ declare_variable(l, *_n, tokens, n_tokens, tmp, lnum, cpos);\n print_literal_text(\";\", lnum, cpos);\n \n \/\/ re-insert in list now for replacement of the variable\n"} {"commit":"a39cccdacb240614177cddfa67275dc36ffe9592","subject":"Safety net - comment BX_WRITE_32BIT_REG macro - always use WRITE_32BIT_REGZ instead !","message":"Safety net - comment BX_WRITE_32BIT_REG macro - always use WRITE_32BIT_REGZ instead !\n","repos":"marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cpu\/cpu.h\n+++ cpu\/cpu.h\n@@ -194,9 +194,11 @@\n BX_CPU_THIS_PTR gen_reg[index].word.rx = val; \\\n }\n \n+\/*\n #define BX_WRITE_32BIT_REG(index, val) {\\\n BX_CPU_THIS_PTR gen_reg[index].dword.erx = val; \\\n }\n+*\/\n \n #if BX_SUPPORT_X86_64\n \n"} {"commit":"2249fb3c919fb590bffb53c2d6227bbba58487c4","subject":"crtools: check optind is valid before parsing command argument","message":"crtools: check optind is valid before parsing command argument\n\nSigned-off-by: Stanislav Kinsbursky <43b28e187c4fe6e53d7ab0bb71957481e322f182@openvz.org>\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\n","repos":"efiop\/criu,sdgdsffdsfff\/criu,KKoukiou\/criu-remote,LK4D4\/criu,wtf42\/criu,eabatalov\/criu,rentzsch\/criu,eabatalov\/criu,fbocharov\/criu,marcosnils\/criu,sdgdsffdsfff\/criu,KKoukiou\/criu-remote,rentzsch\/criu,fbocharov\/criu,efiop\/criu,kawamuray\/criu,ldu4\/criu,fbocharov\/criu,wtf42\/criu,fbocharov\/criu,fbocharov\/criu,svloyso\/criu,efiop\/criu,svloyso\/criu,LK4D4\/criu,biddyweb\/criu,gablg1\/criu,gonkulator\/criu,gonkulator\/criu,gablg1\/criu,tych0\/criu,tych0\/criu,tych0\/criu,gonkulator\/criu,KKoukiou\/criu-remote,efiop\/criu,gonkulator\/criu,kawamuray\/criu,sdgdsffdsfff\/criu,svloyso\/criu,LK4D4\/criu,marcosnils\/criu,AuthenticEshkinKot\/criu,biddyweb\/criu,AuthenticEshkinKot\/criu,wtf42\/criu,ldu4\/criu,rentzsch\/criu,marcosnils\/criu,rentzsch\/criu,gablg1\/criu,wtf42\/criu,eabatalov\/criu,KKoukiou\/criu-remote,biddyweb\/criu,KKoukiou\/criu-remote,gablg1\/criu,marcosnils\/criu,kawamuray\/criu,AuthenticEshkinKot\/criu,AuthenticEshkinKot\/criu,sdgdsffdsfff\/criu,LK4D4\/criu,LK4D4\/criu,rentzsch\/criu,biddyweb\/criu,eabatalov\/criu,gablg1\/criu,sdgdsffdsfff\/criu,efiop\/criu,AuthenticEshkinKot\/criu,efiop\/criu,marcosnils\/criu,wtf42\/criu,kawamuray\/criu,tych0\/criu,AuthenticEshkinKot\/criu,rentzsch\/criu,KKoukiou\/criu-remote,wtf42\/criu,biddyweb\/criu,gonkulator\/criu,gonkulator\/criu,ldu4\/criu,ldu4\/criu,sdgdsffdsfff\/criu,biddyweb\/criu,svloyso\/criu,gablg1\/criu,svloyso\/criu,marcosnils\/criu,svloyso\/criu,LK4D4\/criu,fbocharov\/criu,ldu4\/criu,eabatalov\/criu,eabatalov\/criu,kawamuray\/criu,tych0\/criu,kawamuray\/criu,tych0\/criu,ldu4\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- crtools.c\n+++ crtools.c\n@@ -182,6 +182,9 @@\n \t\treturn -1;\n \t}\n \n+\tif (optind >= argc)\n+\t\tgoto usage;\n+\n \tif (strcmp(argv[optind], \"dump\") &&\n \t strcmp(argv[optind], \"restore\") &&\n \t strcmp(argv[optind], \"show\") &&\n"} {"commit":"b84babe630df1ba8f8bce42b8667e3b5869577d5","subject":"get_image_path: calculate size of string correctly","message":"get_image_path: calculate size of string correctly\n\nSigned-off-by: Andrey Vagin <74c05afa918858348d6db8037d82fa8124870113@openvz.org>\nSigned-off-by: Cyrill Gorcunov <7a1ea01eee6961eb1e372e3508c2670446d086f4@openvz.org>\n","repos":"biddyweb\/criu,svloyso\/criu,sdgdsffdsfff\/criu,marcosnils\/criu,marcosnils\/criu,svloyso\/criu,tych0\/criu,rentzsch\/criu,gonkulator\/criu,gonkulator\/criu,wtf42\/criu,marcosnils\/criu,rentzsch\/criu,biddyweb\/criu,sdgdsffdsfff\/criu,wtf42\/criu,marcosnils\/criu,LK4D4\/criu,eabatalov\/criu,eabatalov\/criu,eabatalov\/criu,sdgdsffdsfff\/criu,wtf42\/criu,tych0\/criu,LK4D4\/criu,efiop\/criu,tych0\/criu,efiop\/criu,gablg1\/criu,eabatalov\/criu,ldu4\/criu,gonkulator\/criu,marcosnils\/criu,sdgdsffdsfff\/criu,AuthenticEshkinKot\/criu,marcosnils\/criu,eabatalov\/criu,ldu4\/criu,wtf42\/criu,rentzsch\/criu,gonkulator\/criu,LK4D4\/criu,gablg1\/criu,tych0\/criu,fbocharov\/criu,gablg1\/criu,KKoukiou\/criu-remote,KKoukiou\/criu-remote,svloyso\/criu,rentzsch\/criu,biddyweb\/criu,fbocharov\/criu,KKoukiou\/criu-remote,svloyso\/criu,ldu4\/criu,kawamuray\/criu,AuthenticEshkinKot\/criu,eabatalov\/criu,AuthenticEshkinKot\/criu,kawamuray\/criu,wtf42\/criu,gonkulator\/criu,fbocharov\/criu,fbocharov\/criu,LK4D4\/criu,gablg1\/criu,kawamuray\/criu,KKoukiou\/criu-remote,efiop\/criu,tych0\/criu,ldu4\/criu,fbocharov\/criu,LK4D4\/criu,biddyweb\/criu,ldu4\/criu,AuthenticEshkinKot\/criu,biddyweb\/criu,efiop\/criu,fbocharov\/criu,kawamuray\/criu,rentzsch\/criu,rentzsch\/criu,kawamuray\/criu,ldu4\/criu,gonkulator\/criu,kawamuray\/criu,biddyweb\/criu,LK4D4\/criu,tych0\/criu,gablg1\/criu,sdgdsffdsfff\/criu,svloyso\/criu,efiop\/criu,gablg1\/criu,efiop\/criu,sdgdsffdsfff\/criu,AuthenticEshkinKot\/criu,svloyso\/criu,AuthenticEshkinKot\/criu,KKoukiou\/criu-remote,KKoukiou\/criu-remote,wtf42\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- crtools.c\n+++ crtools.c\n@@ -239,9 +239,11 @@\n \n \tstrcpy(path, image_dir);\n \tpath[image_dir_size] = '\/';\n+\tsize -= image_dir_size + 1;\n+\n \tret = snprintf(path + image_dir_size + 1, size, fmt, pid);\n-\tif (ret == -1 || ret > size) {\n-\t\tpr_err(\"can't get image path\");\n+\tif (ret == -1 || ret >= size) {\n+\t\tpr_err(\"can't get image path\\n\");\n \t\treturn -1;\n \t}\n \treturn 0;\n"} {"commit":"d40e5145295ffe3d731a916033ecc809fffb72ff","subject":"Added c source file which is capable of determining the amount of tabs needed for a srl16 shift register in Xilinx FPGAs","message":"Added c source file which is capable of determining the amount of tabs needed for a srl16 shift register in Xilinx FPGAs\n","repos":"hhanff\/software,hhanff\/software,hhanff\/software,hhanff\/software,hhanff\/software,hhanff\/software,hhanff\/software","returncode":1,"stderr":"error: pathspec 'c\/srl16e.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- c\/srl16e.c\n+++ c\/srl16e.c\n@@ -0,0 +1,104 @@\n+\/*\n+ This program is meant to determine tap addresses for a concatenation\n+ of srl16es used as an enable pulse generator.\n+ It can be compiled by\n+ > gcc -std=c99 -lm -g -Wall -Wextra -pedantic srl16e.c -o srl16e\n+ The desired enable pulse frequency can be set by the constant\n+ desired_pulse_frequency.\n+ If the program finds an ideal set of tap addresses leading to the\n+ exact enable pulse frequency, it will terminate with\n+*\/\n+\n+#include \"stdio.h\"\n+#include \"stdlib.h\"\n+#include <math.h>\n+\n+int srl16e(){\n+ const unsigned int clock_frequency = 20000000; \/\/ in Hertz\n+ const unsigned int desired_pulse_frequency = 1000; \/\/ in Hertz\n+ \/\/ This is the factor which is needed to derive the desired_pulse_frequency\n+ unsigned int div = clock_frequency\/desired_pulse_frequency;\n+ unsigned int div_temp = 0;\n+ int error = div;\n+ unsigned int i = 0;\n+\n+ \/\/ Determin the amount of srl16 to instantiate for the desired pulse frequency\n+ unsigned int nr_of_srl16e = 0;\n+ while ( div > 0 ) {\n+ div \/= 16;\n+ nr_of_srl16e += 1;\n+ }\n+ nr_of_srl16e += 1;\n+\n+ printf(\"nr_of_srl16es = %d\\n\", nr_of_srl16e);\n+ \/\/ restore value:\n+ div = clock_frequency\/desired_pulse_frequency;\n+\n+ \/\/ Create an array which will contain the calculated tap addresses\n+ unsigned char tap_array[nr_of_srl16e];\n+\n+ \/\/ Reset the array\n+ for(i = 0; i < nr_of_srl16e; i++){\n+ tap_array[i] = 0;\n+ }\n+ tap_array[0] = 0;\n+\n+ while (pow(16.,(float)nr_of_srl16e) != 1.0*div_temp ) {\n+ \/\/ Determine the sum over the array\n+ div_temp = tap_array[0];\n+ for(i = 1; i < nr_of_srl16e; i++){\n+ div_temp = tap_array[i] * div_temp;\n+ }\n+ \/* printf(\"div_temp = %d\\n\", div_temp); *\/\n+\n+ \/*\n+ if the new error is smaller than the old error:\n+ - Store the new error\n+ - Output the tap values\n+ *\/\n+ if(abs(error) > abs(div-div_temp)){\n+ error = div - div_temp;\n+ printf(\"new error = %d, div = %d, div_temp = %d \\n\", error, div, div_temp);\n+ for(i = 0; i < nr_of_srl16e ; i++){\n+ printf(\"tap %d = %d | \", i, tap_array[i]);\n+ }\n+ puts(\"\");\n+ if (div_temp == div){\n+ puts(\"Ideal factors found:\");\n+ for(i = 0; i < nr_of_srl16e ; i++){\n+ \/*\n+ '-1' due to the fact that tap 0 is already an output in\n+ the srl16e\n+ *\/\n+ printf(\"tap_addr_i(%d) = %d \\n\", i, tap_array[i]-1);\n+ }\n+ return 0;\n+ }\n+\n+ }\n+\n+ unsigned int tap_array_temp = 0;\n+\n+ \/\/ Concatenate the complete number\n+ for(i = 0; i < nr_of_srl16e; i++){\n+ tap_array_temp = tap_array_temp+(tap_array[i]<<(i*4));\n+ }\n+ \/* printf(\"tap_array_temp = %d \\n\", tap_array_temp); *\/\n+ tap_array_temp += 1;\n+\n+ for(i = 0; i < nr_of_srl16e; i++){\n+ tap_array[i] = (tap_array_temp>>(i*4));\n+ tap_array[i] &= 15;\n+ }\n+\n+\n+ } \/\/while\n+ return 0;\n+\n+}\n+\n+int main()\n+{\n+ srl16e();\n+ return 0;\n+}\n"} {"commit":"aa80ed031e61db1c41be516d65ea0810169a6562","subject":"Improve description of get_utchour()","message":"Improve description of get_utchour()\n","repos":"rene0\/dcf77pi,rene0\/dcf77pi","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- calendar.h\n+++ calendar.h\n@@ -76,7 +76,7 @@\n * Calculates the hour in UTC from the given time.\n *\n * @param time The time to calculate the hour in UTC from.\n- * @return The hour value in UTC.\n+ * @return The hour value in UTC, or 24 in case of an error.\n *\/\n int get_utchour(struct tm time);\n \n"} {"commit":"bd76a056f637b9f7bd554e054dbc9548f43ba43e","subject":"Draw the initial screen.","message":"Draw the initial screen.\n","repos":"rene0\/dcf77pi,rene0\/dcf77pi","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- dcf77pi.c\n+++ dcf77pi.c\n@@ -174,6 +174,19 @@\n \t\t\tcurses_cleanup(\"Creating decode_win failed.\\n\");\n \t\t\treturn 0;\n \t\t}\n+\t\t\/* draw initial screen *\/\n+\t\tmvwprintw(main_win0, 0, 0, \"Civil buffer:\");\n+\t\twrefresh(main_win0);\n+\t\tmvwprintw(main_win1, 0, 0, \"[S] -> toggle time sync [Q] -> quit\");\n+\t\tmvwchgat(main_win1, 0, 1, 1, A_NORMAL, 4, NULL);\n+\t\tmvwchgat(main_win1, 0, 27, 1, A_NORMAL, 4, NULL);\n+\t\twrefresh(main_win1);\n+\t\tmvwprintw(alarm_win, 0, 0, \"German civil warning:\");\n+\t\twrefresh(alarm_win);\n+\t\tmvwprintw(input_win0, 0, 0, \"old\");\n+\t\twrefresh(input_win0);\n+\t\tmvwprintw(input_win1, 0, 0, \"act total realfreq Hz increment bit\");\n+\t\twrefresh(input_win1);\n \t}\n \n \tfor (;;) {\n"} {"commit":"dfd6b350e13d9915b819b92c890052d7474188c5","subject":"Fix small problems in code.c","message":"Fix small problems in code.c\n\nThese problems were caused due to a bad synchronyzation\nwith other parts of the code, mainly cc.h\n","repos":"k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- cc1\/code.c\n+++ cc1\/code.c\n@@ -290,7 +290,7 @@\n \t\twhile (isprint(*bp) && bp < lim)\n \t\t\t++bp;\n \t\tif ((n = bp - s) > 1)\n-\t\t\tprintf(\"\\t#%c%.*s\\n\", L_NAME, n, s);\n+\t\t\tprintf(\"\\t#\\\"%.*s\\n\", n, s);\n \t\telse\n \t\t\tbp = s;\n \t\tif (bp == lim)\n@@ -377,8 +377,7 @@\n \tputchar('\\t');\n \temitletter(sym->type);\n \tprintf(\"\\t\\\"%s\", (sym->name) ? sym->name : \"\");\n-\tif (op != OFUN)\n-\t\tputchar('\\n');\n+\tputchar('\\n');\n \tsym->flags |= ISEMITTED;\n }\n \n@@ -422,7 +421,7 @@\n \tSymbol *sym = arg, **sp;\n \n \temitdcl(op, arg);\n-\tputs(\"\\n{\");\n+\tputs(\"{\");\n \n \tfor (sp = sym->u.pars; sp && *sp; ++sp)\n \t\temit(ODECL, *sp);\n"} {"commit":"11a54cd44d6c786b0367e958057c9cda5ddcf629","subject":"Refactoring","message":"Refactoring\n","repos":"KoynovStas\/CRC_CPP_Template,KoynovStas\/CRC_CPP_Template","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- universal_crc.h\n+++ universal_crc.h\n@@ -175,6 +175,44 @@\n \n \n template <uint8_t Bits, CRC_TYPE Poly, CRC_TYPE Init, bool RefIn, bool RefOut, CRC_TYPE XorOut>\n+int Universal_CRC<Bits, Poly, Init, RefIn, RefOut, XorOut>::get_crc(CRC_Type *crc, const char *file_name)\n+{\n+\n+ if( !file_name || !crc )\n+ return -1; \/\/Bad param\n+\n+ *crc = init;\n+\n+ char buf[4096];\n+\n+\n+ FILE *stream = fopen(file_name, \"rb\");\n+ if( stream == NULL )\n+ return -1; \/\/Cant open file\n+\n+\n+ while( !feof(stream) )\n+ {\n+ size_t len = fread(buf, 1, sizeof(buf), stream);\n+ *crc = get_crc(*crc, buf, len);\n+ }\n+\n+\n+ fclose(stream);\n+\n+\n+ if(RefOut^RefIn) *crc = reflect(*crc, Bits);\n+\n+ *crc ^= XorOut;\n+ *crc &= crc_mask; \/\/for CRC not power 2\n+\n+\n+ return 0; \/\/good job\n+}\n+\n+\n+\n+template <uint8_t Bits, CRC_TYPE Poly, CRC_TYPE Init, bool RefIn, bool RefOut, CRC_TYPE XorOut>\n CRC_TYPE Universal_CRC<Bits, Poly, Init, RefIn, RefOut, XorOut>::reflect(CRC_Type data, uint8_t num_bits)\n {\n \n@@ -190,44 +228,6 @@\n }\n \n return reflection;\n-}\n-\n-\n-\n-template <uint8_t Bits, CRC_TYPE Poly, CRC_TYPE Init, bool RefIn, bool RefOut, CRC_TYPE XorOut>\n-int Universal_CRC<Bits, Poly, Init, RefIn, RefOut, XorOut>::get_crc(CRC_Type *crc, const char *file_name)\n-{\n-\n- if( !file_name || !crc )\n- return -1; \/\/Bad param\n-\n- *crc = init;\n-\n- char buf[4096];\n-\n-\n- FILE *stream = fopen(file_name, \"rb\");\n- if( stream == NULL )\n- return -1; \/\/Cant open file\n-\n-\n- while( !feof(stream) )\n- {\n- size_t len = fread(buf, 1, sizeof(buf), stream);\n- *crc = get_crc(*crc, buf, len);\n- }\n-\n-\n- fclose(stream);\n-\n-\n- if(RefOut^RefIn) *crc = reflect(*crc, Bits);\n-\n- *crc ^= XorOut;\n- *crc &= crc_mask; \/\/for CRC not power 2\n-\n-\n- return 0; \/\/good job\n }\n \n \n"} {"commit":"54f95598858aa76b912be8dc0b980070724f31f2","subject":"[cc1] Fix NULL pointer dereference","message":"[cc1] Fix NULL pointer dereference\n","repos":"k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- cc1\/decl.c\n+++ cc1\/decl.c\n@@ -216,7 +216,7 @@\n \t\t\tsym->flags |= ISAUTO;\n \t\t\tif ((sym = install(NS_IDEN, sym)) == NULL) {\n \t\t\t\terrorp(\"redefinition of parameter '%s'\",\n-\t\t\t\t sym->name);\n+\t\t\t\t yylval.sym->name);\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif (n < NR_FUNPARAM) {\n"} {"commit":"80d42cffa5f34da8c385df6ca39bf573a01b6e03","subject":"Fix signed-unsigned char mixup which led to a segfault.","message":"Fix signed-unsigned char mixup which led to a segfault.\n","repos":"run4flat\/Primo,run4flat\/Primo","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- unix\/apc_misc.c\n+++ unix\/apc_misc.c\n@@ -618,7 +618,7 @@\n if ( id == crUser) return hot_spot;\n if ( !load_pointer_font()) return (Point){0,0};\n \n- idx = *((char*)&(cursor_map[id]));\n+ idx = cursor_map[id];\n fs = guts.pointer_font;\n if ( !fs-> per_char)\n cs = &fs-> min_bounds;\n@@ -696,7 +696,7 @@\n gcv. foreground = 0;\n XChangeGC( DISP, gc, GCBackground | GCForeground, &gcv);\n XDrawString( DISP, p2, gc, w\/2, h\/2, (c = (char)(cursor_map[id]+1), &c), 1);\n- XDrawString( DISP, p1, gc, w\/2, h\/2, (char*)&(cursor_map[id]), 1);\n+ XDrawString( DISP, p1, gc, w\/2, h\/2, (c = (char)cursor_map[id], &c), 1);\n XFreeGC( DISP, gc);\n }\n CIcon(icon)-> create_empty( icon, w, h, imMono);\n"} {"commit":"bb1cd7c8595651dabecee45fcad96d6d7f579de5","subject":"[cc1] fix continue statement within for loop","message":"[cc1] fix continue statement within for loop\n","repos":"k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- cc1\/stmt.c\n+++ cc1\/stmt.c\n@@ -92,12 +92,13 @@\n static void\n For(Symbol *lbreak, Symbol *lcont, Switch *lswitch)\n {\n-\tSymbol *begin, *cond, *end;\n+\tSymbol *begin, *cond;\n \tNode *econd, *einc, *einit;\n \n \tbegin = newlabel();\n-\tend = newlabel();\n+\tlcont = newlabel();\n \tcond = newlabel();\n+\tlbreak = newlabel();\n \n \texpect(FOR);\n \texpect('(');\n@@ -110,15 +111,18 @@\n \n \temit(OEXPR, einit);\n \temit(OJUMP, cond);\n+\n \temit(OBLOOP, NULL);\n \temit(OLABEL, begin);\n-\tstmt(end, begin, lswitch);\n+\tstmt(lbreak, lcont, lswitch);\n+\temit(OLABEL, lcont);\n \temit(OEXPR, einc);\n \temit(OLABEL, cond);\n \temit((econd) ? OBRANCH : OJUMP, begin);\n \temit(OEXPR, econd);\n \temit(OELOOP, NULL);\n-\temit(OLABEL, end);\n+\n+\temit(OLABEL, lbreak);\n }\n \n static void\n"} {"commit":"d286a128a8cd010b674a374ae9141cd2ecf0baa9","subject":"Refine output files","message":"Refine output files\n\nSigned-off-by: Shaka Huang <28691958110b9b8ab6670bfb48479d3246d5dd97@gmail.com>\n","repos":"shakalaca\/ZenFone2-boot-tools,shakalaca\/ZenFone2-boot-tools,shakalaca\/ZenFone2-boot-tools,shakalaca\/ZenFone2-boot-tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- unpackbootimg.c\n+++ unpackbootimg.c\n@@ -34,7 +34,7 @@\n \n void write_string_to_file(char* file, char* string)\n {\n- FILE* f = fopen(file, \"w\");\n+ FILE* f = fopen(file, \"a\");\n fwrite(string, strlen(string), 1, f);\n fwrite(\"\\n\", 1, 1, f);\n fclose(f);\n@@ -126,60 +126,60 @@\n }\n \n \/\/printf(\"cmdline...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-cmdline\");\n+ sprintf(tmp, \"%s\/cmdline\", directory);\n+ remove(tmp);\n write_string_to_file(tmp, (char *)header.cmdline);\n \n+ sprintf(tmp, \"%s\/image_info\", directory);\n+ remove(tmp);\n+ \n+ \/\/printf(\"pagesize...\\n\");\n+ char pagesizetmp[200];\n+ sprintf(pagesizetmp, \"page_size=%d\", header.page_size);\n+ write_string_to_file(tmp, pagesizetmp);\n+ \n \/\/printf(\"base...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-base\");\n char basetmp[200];\n- sprintf(basetmp, \"%08x\", base);\n+ sprintf(basetmp, \"base_addr=0x%08x\", base);\n write_string_to_file(tmp, basetmp);\n \n- \/\/printf(\"pagesize...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-pagesize\");\n- char pagesizetmp[200];\n- sprintf(pagesizetmp, \"%d\", header.page_size);\n- write_string_to_file(tmp, pagesizetmp);\n- \n \/\/printf(\"kerneloff...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-kerneloff\");\n char kernelofftmp[200];\n- sprintf(kernelofftmp, \"%08x\", header.kernel_addr - base);\n+ sprintf(kernelofftmp, \"kernel_offset=0x%08x\", header.kernel_addr - base);\n write_string_to_file(tmp, kernelofftmp);\n+\n+ \/\/printf(\"kernelsize...\\n\");\n+ char kernelsizetmp[200];\n+ sprintf(kernelsizetmp, \"kernel_size=%d\", header.kernel_size);\n+ write_string_to_file(tmp, kernelsizetmp);\n \n \/\/printf(\"ramdiskoff...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-ramdiskoff\");\n char ramdiskofftmp[200];\n- sprintf(ramdiskofftmp, \"%08x\", header.ramdisk_addr - base);\n+ sprintf(ramdiskofftmp, \"ramdisk_offset=0x%08x\", header.ramdisk_addr - base);\n write_string_to_file(tmp, ramdiskofftmp);\n+ \n+ \/\/printf(\"ramdisksize...\\n\");\n+ char ramdisksizetmp[200];\n+ sprintf(ramdisksizetmp, \"ramdisk_size=%d\", header.ramdisk_size);\n+ write_string_to_file(tmp, ramdisksizetmp);\n \n if (header.second_size != 0) {\n \/\/printf(\"secondoff...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-secondoff\");\n char secondofftmp[200];\n- sprintf(secondofftmp, \"%08x\", header.second_addr - base);\n+ sprintf(secondofftmp, \"second_offset=0x%08x\", header.second_addr - base);\n write_string_to_file(tmp, secondofftmp);\n- }\n- \n- \/\/printf(\"tagsoff...\\n\");\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-tagsoff\");\n- char tagsofftmp[200];\n- sprintf(tagsofftmp, \"%08x\", header.tags_addr - base);\n- write_string_to_file(tmp, tagsofftmp);\n+\n+ \/\/printf(\"secondsize...\\n\");\n+ char secondsizetmp[200];\n+ sprintf(secondsizetmp, \"second_size=%d\", header.second_size);\n+ write_string_to_file(tmp, secondsizetmp);\n+ }\n \n total_read += sizeof(header);\n \/\/printf(\"total read: %d\\n\", total_read);\n total_read += read_padding(f, sizeof(header), pagesize);\n \n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-zImage\");\n+ sprintf(tmp, \"%s\/zImage\", directory);\n FILE *k = fopen(tmp, \"wb\");\n byte* kernel = (byte*)malloc(header.kernel_size);\n \/\/printf(\"Reading kernel...\\n\");\n@@ -191,8 +191,7 @@\n \/\/printf(\"total read: %d\\n\", header.kernel_size);\n total_read += read_padding(f, header.kernel_size, pagesize);\n \n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-ramdisk.gz\");\n+ sprintf(tmp, \"%s\/ramdisk.cpio.gz\", directory);\n FILE *r = fopen(tmp, \"wb\");\n byte* ramdisk = (byte*)malloc(header.ramdisk_size);\n \/\/printf(\"Reading ramdisk...\\n\");\n@@ -205,8 +204,7 @@\n total_read += read_padding(f, header.ramdisk_size, pagesize);\n \n if (header.second_size != 0) {\n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-second\");\n+ sprintf(tmp, \"%s\/second.bin\", directory);\n FILE *s = fopen(tmp, \"wb\");\n byte* second = (byte*)malloc(header.second_size);\n \/\/printf(\"Reading second...\\n\");\n@@ -219,8 +217,7 @@\n \/\/printf(\"total read: %d\\n\", header.second_size);\n total_read += read_padding(f, header.second_size, pagesize);\n \n- sprintf(tmp, \"%s\/%s\", directory, basename(filename));\n- strcat(tmp, \"-signature\");\n+ sprintf(tmp, \"%s\/signature\", directory);\n FILE *fsig = fopen(tmp, \"wb\");\n byte* bsig = (byte*)malloc(728);\n \/\/printf(\"Reading signature...\\n\");\n"} {"commit":"7d429eebbcf92d6c7b713515386fccf0c27132c6","subject":"delete blank records","message":"delete blank records\n","repos":"singpolyma\/theveeb-ecosystem,singpolyma\/theveeb-ecosystem,singpolyma\/theveeb-ecosystem","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- update\/update.c\n+++ update\/update.c\n@@ -326,6 +326,7 @@\n \n \t\/* Clean up disk space *\/\n \tif(!chained_call) {\n+\t\tsafe_execute(db, \"DELETE FROM packages WHERE package='';\");\n \t\tsafe_execute(db, \"VACUUM;\");\n \t}\n \n"} {"commit":"a26974f1f5c848c8d8fbee8c8ea2aa95301f6482","subject":"Simplify names.","message":"Simplify names.\n","repos":"kristapsdz\/letskencrypt-portable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- util-portable.c\n+++ util-portable.c\n@@ -26,8 +26,8 @@\n \n #include \"extern.h\"\n \n-static\tuid_t nobody_uid;\n-static\tgid_t nobody_gid;\n+static\tuid_t uid;\n+static\tgid_t gid;\n \n int\n dropfs(const char *path)\n@@ -61,13 +61,13 @@\n \t\treturn(0);\n \t}\n \n-\tnobody_uid = passent->pw_uid;\n-\tnobody_gid = passent->pw_gid;\n+\tuid = passent->pw_uid;\n+\tgid = passent->pw_gid;\n \treturn(1);\n }\n \n int\n-dropprivs(uid_t uid, gid_t gid)\n+dropprivs(void)\n {\n \n \t\/*\n"} {"commit":"d21c0a90c374b88e09f173de42ed9a388f84f169","subject":"util\/cbi-util: Check pointer before using it","message":"util\/cbi-util: Check pointer before using it\n\nChange-Id: If11de8883b001f16d7e8f859a416fbdc5ea0391a\nSigned-off-by: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@google.com>\nFound-by: Coverity Scan #187038\nReviewed-on: https:\/\/chromium-review.googlesource.com\/1151121\nCommit-Ready: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@chromium.org>\nTested-by: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@chromium.org>\nReviewed-by: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- util\/cbi-util.c\n+++ util\/cbi-util.c\n@@ -333,10 +333,12 @@\n {\n \tuint32_t v;\n \tstruct cbi_data *d = cbi_find_tag(buf, tag);\n-\tconst char *name = d->tag < CBI_TAG_COUNT ? field_name[d->tag] : \"???\";\n+\tconst char *name;\n \n \tif (!d)\n \t\treturn;\n+\n+\tname = d->tag < CBI_TAG_COUNT ? field_name[d->tag] : \"???\";\n \n \tswitch (d->size) {\n \tcase 1:\n"} {"commit":"ea1373a678d66d0ce2416582d76f920c0418d99d","subject":"fix a bug in util::Optional move constructor","message":"fix a bug in util::Optional move constructor\n","repos":"weinstein\/steinlang,weinstein\/steinlang","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- util\/optional.h\n+++ util\/optional.h\n@@ -13,7 +13,7 @@\n Optional(const EmptyOptional&) : Optional() {}\n \n Optional(const T& x) : is_present_(true), data_(x) {}\n- Optional(T&& x) : is_present_(true), data_(x) {}\n+ Optional(T&& x) : is_present_(true), data_(std::move(x)) {}\n \n Optional<T>& operator=(const T& x) {\n if (!is_present_) {\n"} {"commit":"8e25685a4b546b8ab4da86ef0fbe35b9348a1a18","subject":"VOP_GETPAGES expects the vnode locked. Make it so. Note that VOP_PUTPAGES has the same problems, but the fix will be more complicated.","message":"VOP_GETPAGES expects the vnode locked. Make it so.\nNote that VOP_PUTPAGES has the same problems, but the fix will be more\ncomplicated.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- uvm\/uvm_vnode.c\n+++ uvm\/uvm_vnode.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: uvm_vnode.c,v 1.27 2001\/11\/28 19:28:15 art Exp $\t*\/\n+\/*\t$OpenBSD: uvm_vnode.c,v 1.28 2001\/12\/02 23:37:52 art Exp $\t*\/\n \/*\t$NetBSD: uvm_vnode.c,v 1.50 2001\/05\/26 21:27:21 chs Exp $\t*\/\n \n \/*\n@@ -79,10 +79,10 @@\n \t\t\t\t\t struct vm_page **, int));\n boolean_t\t\tuvn_flush __P((struct uvm_object *, voff_t, voff_t,\n \t\t\t\t int));\n-static int\t\tuvn_get __P((struct uvm_object *, voff_t,\n+int\t\t\tuvn_get __P((struct uvm_object *, voff_t,\n \t\t\t\t struct vm_page **, int *, int, vm_prot_t,\n \t\t\t\t int, int));\n-static int\t\tuvn_put __P((struct uvm_object *, struct vm_page **,\n+int\t\t\tuvn_put __P((struct uvm_object *, struct vm_page **,\n \t\t\t\t int, boolean_t));\n static void\t\tuvn_reference __P((struct uvm_object *));\n static boolean_t\tuvn_releasepg __P((struct vm_page *,\n@@ -817,7 +817,7 @@\n * => note: caller must set PG_CLEAN and pmap_clear_modify (if needed)\n *\/\n \n-static int\n+int\n uvn_put(uobj, pps, npages, flags)\n \tstruct uvm_object *uobj;\n \tstruct vm_page **pps;\n@@ -842,7 +842,7 @@\n * => NOTE: caller must check for released pages!!\n *\/\n \n-static int\n+int\n uvn_get(uobj, offset, pps, npagesp, centeridx, access_type, advice, flags)\n \tstruct uvm_object *uobj;\n \tvoff_t offset;\n@@ -853,12 +853,20 @@\n \tint advice, flags;\n {\n \tstruct vnode *vp = (struct vnode *)uobj;\n+\tstruct proc *p = curproc;\n \tint error;\n \tUVMHIST_FUNC(\"uvn_get\"); UVMHIST_CALLED(ubchist);\n \n \tUVMHIST_LOG(ubchist, \"vp %p off 0x%x\", vp, (int)offset, 0,0);\n+\terror = vn_lock(vp, LK_EXCLUSIVE|LK_RECURSEFAIL|LK_NOWAIT, p);\n+\tif (error) {\n+\t\tif (error == EBUSY)\n+\t\t\treturn EAGAIN;\n+\t\treturn error;\n+\t}\n \terror = VOP_GETPAGES(vp, offset, pps, npagesp, centeridx,\n-\t\t\t access_type, advice, flags);\n+\t\t access_type, advice, flags);\n+\tVOP_UNLOCK(vp, LK_RELEASE, p);\n \treturn error;\n }\n \n"} {"commit":"7ccb535e43e1962759c1ad595c72d06285f321af","subject":"Add DIOCGPDINFO support. 'disklabel -d svnd0' now works.","message":"Add DIOCGPDINFO support. 'disklabel -d svnd0' now works.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/vnd.c\n+++ dev\/vnd.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: vnd.c,v 1.86 2008\/06\/29 20:05:22 krw Exp $\t*\/\n+\/*\t$OpenBSD: vnd.c,v 1.87 2008\/07\/20 01:53:43 krw Exp $\t*\/\n \/*\t$NetBSD: vnd.c,v 1.26 1996\/03\/30 23:06:11 christos Exp $\t*\/\n \n \/*\n@@ -923,6 +923,12 @@\n \n \t\tbreak;\n \n+\tcase DIOCGPDINFO:\n+\t\tif ((vnd->sc_flags & VNF_HAVELABEL) == 0)\n+\t\t\treturn (ENOTTY);\n+\t\tvndgetdisklabel(dev, vnd, (struct disklabel *)addr, 1);\n+\t\treturn (0);\n+\n \tcase DIOCGDINFO:\n \t\tif ((vnd->sc_flags & VNF_HAVELABEL) == 0)\n \t\t\treturn (ENOTTY);\n"} {"commit":"33d728f8cbf52af6a1540cc0551aea762ce1252d","subject":"Forgot to update @defgroup","message":"Forgot to update @defgroup\n\ngit-svn-id: dd14d189f2554b0b3f4c2209a95c13d2029e3fe8@203 96dfbd92-d197-e211-9ca9-00110a534b34\n","repos":"RyuKojiro\/v6502","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- v6502\/linectl.h\n+++ v6502\/linectl.h\n@@ -11,7 +11,7 @@\n \n #include <sys\/types.h>\n \n-\/** @defgroup mem_access Memory Access *\/\n+\/** @defgroup linectl Line Manipulation Functions *\/\n \/**@{*\/\n \/** @brief Destructively trim trailing whitespace with NUL *\/\n void trimtaild(char *str);\n"} {"commit":"461f764e564b7fc4acc811f2023977d93deca8dd","subject":"adjust for aosp relocating ISurface.h","message":"adjust for aosp relocating ISurface.h\n\nChange-Id: I34707b878d7c0318b3b12cfc96d08ca61a5b9055\n","repos":"CyanogenMod\/android_hardware_intel_common_libva,SlimRoms\/hardware_intel_common_libva,geekboxzone\/mmallow_hardware_intel_common_libva,CM-zenfone2\/android_hardware_intel_common_libva,geekboxzone\/mmallow_hardware_intel_common_libva,CyanogenMod\/android_hardware_intel_common_libva,OneRom\/hardware_intel_common_libva,CyanogenMod\/android_hardware_intel_common_libva,OneRom\/hardware_intel_common_libva,DirtyUnicorns\/android_hardware_intel_common_libva,SlimRoms\/hardware_intel_common_libva,DirtyUnicorns\/android_hardware_intel_common_libva,OneRom\/hardware_intel_common_libva,CM-zenfone2\/android_hardware_intel_common_libva,DirtyUnicorns\/android_hardware_intel_common_libva,geekboxzone\/mmallow_hardware_intel_common_libva,SlimRoms\/hardware_intel_common_libva,CM-zenfone2\/android_hardware_intel_common_libva","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- va\/va_android.h\n+++ va\/va_android.h\n@@ -20,7 +20,7 @@\n \n #ifdef __cplusplus\n #ifdef ANDROID \n-#include <ui\/ISurface.h>\n+#include <surfaceflinger\/ISurface.h>\n using namespace android;\n \n \/*\n"} {"commit":"dfd7c2f0293cc6c3655c6c2ea3de11dc928dead8","subject":"unconfiguring of ccd causes system panic; fix from gdonl@gv.ssi1.com; netbsd pr#1820","message":"unconfiguring of ccd causes system panic; fix from gdonl@gv.ssi1.com; netbsd pr#1820\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ccd.c\n+++ dev\/ccd.c\n@@ -1107,8 +1107,9 @@\n \t\t\t(void)vn_close(cs->sc_cinfo[i].ci_vp, FREAD|FWRITE,\n \t\t\t p->p_ucred, p);\n \t\t\tfree(cs->sc_cinfo[i].ci_path, M_DEVBUF);\n+\t\t}\n+\t\tfor (i = 0; cs->sc_itable[i].ii_ndisk; ++i)\n \t\t\tfree(cs->sc_itable[i].ii_index, M_DEVBUF);\n-\t\t}\n \t\tfree(cs->sc_cinfo, M_DEVBUF);\n \t\tfree(cs->sc_itable, M_DEVBUF);\n \t\tbzero(cs, sizeof(struct ccd_softc));\n"} {"commit":"f5cf3c84dbf0432243535d1848f96409683d1c28","subject":"device_ref() by hand, since this is a pseudo-device and was not attached through config_attach() ok matthew jsing","message":"device_ref() by hand, since this is a pseudo-device and was not attached\nthrough config_attach()\nok matthew jsing\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/vnd.c\n+++ dev\/vnd.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: vnd.c,v 1.116 2011\/05\/31 17:35:35 matthew Exp $\t*\/\n+\/*\t$OpenBSD: vnd.c,v 1.117 2011\/06\/02 16:14:40 deraadt Exp $\t*\/\n \/*\t$NetBSD: vnd.c,v 1.26 1996\/03\/30 23:06:11 christos Exp $\t*\/\n \n \/*\n@@ -182,6 +182,7 @@\n \tvnd_softc = (struct vnd_softc *)mem;\n \tfor (i = 0; i < num; i++) {\n \t\trw_init(&vnd_softc[i].sc_rwlock, \"vndlock\");\n+\t\tdevice_ref(&vnd_softc[i].sc_dev);\n \t}\n \tnumvnd = num;\n \n"} {"commit":"f66568256cdf1f75efc2defd28283f020f4f0a8e","subject":"assign a pad for each window","message":"assign a pad for each window\n\nCreate a pad for each pm blocks, so we can use the same code\nto scroll the values on the display.\n\nSigned-off-by: Daniel Lezcano <e9fa45941f2ebe89c1b9d6c5f339ab42eadb8567@linaro.org>\n","repos":"gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug,gromaudio\/android_external_powerdebug,yinquan529\/platform-external-powerdebug","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -31,10 +31,6 @@\n };\n \n static WINDOW *header_win;\n-static WINDOW *regulator_win;\n-static WINDOW *clock_pad;\n-static WINDOW *clock_labels;\n-static WINDOW *sensor_win;\n static WINDOW *footer_win;\n \n int maxx, maxy;\n@@ -50,6 +46,8 @@\n };\n \n struct windata {\n+\tWINDOW *win;\n+\tWINDOW *pad;\n \tstruct rowdata *rowdata;\n \tchar *name;\n \tint nrdata;\n@@ -70,6 +68,9 @@\n \n int display_init(void)\n {\n+\tint i;\n+\tsize_t array_size = sizeof(windata) \/ sizeof(windata[0]);\n+\n \tif (!initscr())\n \t\treturn -1;\n \n@@ -97,21 +98,17 @@\n \n \tgetmaxyx(stdscr, maxy, maxx);\n \n-\tregulator_win = subwin(stdscr, maxy - 2, maxx, 1, 0);\n-\tif (!regulator_win)\n-\t\treturn -1;\n-\n-\tclock_labels = subwin(stdscr, maxy - 2, maxx, 1, 0);\n-\tif (!clock_labels)\n-\t\treturn -1;\n-\n-\tclock_pad = newpad(maxrows, maxx);\n-\tif (!clock_pad)\n-\t\treturn -1;\n-\n-\tsensor_win = subwin(stdscr, maxy - 2, maxx, 1, 0);\n-\tif (!sensor_win)\n-\t\treturn -1;\n+\tfor (i = 0; i < array_size; i++) {\n+\n+\t\twindata[i].win = subwin(stdscr, maxy - 2, maxx, 1, 0);\n+\t\tif (!windata[i].win)\n+\t\t\treturn -1;\n+\n+\t\twindata[i].pad = newpad(maxrows, maxx);\n+\t\tif (!windata[i].pad)\n+\t\t\treturn -1;\n+\n+\t}\n \n \theader_win = subwin(stdscr, 1, maxx, 0, 0);\n \tif (!header_win)\n@@ -142,17 +139,9 @@\n \n }\n \n-void create_selectedwindow(int selectedwindow)\n-{\n-\tswitch (selectedwindow) {\n-\tcase REGULATOR:\n-\t\twrefresh(regulator_win);\n-\t\tbreak;\n-\n-\tcase SENSOR:\n-\t\twrefresh(sensor_win);\n-\t\tbreak;\n-\t}\n+void create_selectedwindow(int win)\n+{\n+\twrefresh(windata[win].win);\n }\n \n void show_header(int selectedwindow)\n@@ -192,6 +181,8 @@\n \n void print_regulator_header(void)\n {\n+\tWINDOW *regulator_win = windata[REGULATOR].win;\n+\n \twerase(regulator_win);\n \twattron(regulator_win, A_BOLD);\n \tprint(regulator_win, 0, 0, \"Name\");\n@@ -208,73 +199,23 @@\n \n void print_clock_header(void)\n {\n-\twerase(clock_labels);\n-\twattron(clock_labels, A_BOLD);\n-\tprint(clock_labels, 0, 0, \"Name\");\n-\tprint(clock_labels, 56, 0, \"Flags\");\n-\tprint(clock_labels, 75, 0, \"Rate\");\n-\tprint(clock_labels, 88, 0, \"Usecount\");\n-\tprint(clock_labels, 98, 0, \"Children\");\n-\twattroff(clock_labels, A_BOLD);\n-\twrefresh(clock_labels);\n-}\n-\n-#if 0\n-void show_regulator_info(struct regulator_info *reg_info, int nr_reg, int verbose)\n-{\n-\tint i, count = 1;\n-\n-\tprint_regulator_header();\n-\n-\twrefresh(regulator_win);\n-\n-\treturn;\n-\n-\t(void)verbose;\n-\n-\tfor (i = 0; i < nr_reg; i++) {\n-\t\tint col = 0;\n-\n-\t\tif ((i + 2) > (maxy-2))\n-\t\t\tbreak;\n-\n-\t\tif (reg_info[i].num_users > 0)\n-\t\t\twattron(regulator_win, WA_BOLD);\n-\t\telse\n-\t\t\twattroff(regulator_win, WA_BOLD);\n-\n-\t\tprint(regulator_win, col, count, \"%s\",\n-\t\t\treg_info[i].name);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%s\",\n-\t\t\treg_info[i].status);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%s\",\n-\t\t\treg_info[i].state);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%s\",\n-\t\t\treg_info[i].type);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%d\",\n-\t\t\treg_info[i].num_users);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%d\",\n-\t\t\treg_info[i].microvolts);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%d\",\n-\t\t\treg_info[i].min_microvolts);\n-\t\tcol += 12;\n-\t\tprint(regulator_win, col, count, \"%d\",\n-\t\t\treg_info[i].max_microvolts);\n-\n-\t\tcount++;\n-\t}\n-\twrefresh(regulator_win);\n-}\n-#endif\n+\tWINDOW *clock_win = windata[CLOCK].win;\n+\n+\twerase(clock_win);\n+\twattron(clock_win, A_BOLD);\n+\tprint(clock_win, 0, 0, \"Name\");\n+\tprint(clock_win, 56, 0, \"Flags\");\n+\tprint(clock_win, 75, 0, \"Rate\");\n+\tprint(clock_win, 88, 0, \"Usecount\");\n+\tprint(clock_win, 98, 0, \"Children\");\n+\twattroff(clock_win, A_BOLD);\n+\twrefresh(clock_win);\n+}\n \n void print_sensor_header(void)\n {\n+\tWINDOW *sensor_win = windata[SENSOR].win;\n+\n \twerase(sensor_win);\n \twattron(sensor_win, A_BOLD);\n \tprint(sensor_win, 0, 0, \"Name\");\n@@ -289,14 +230,14 @@\n \n int display_refresh_pad(int win)\n {\n-\treturn prefresh(clock_pad, windata[win].scrolling,\n+\treturn prefresh(windata[win].pad, windata[win].scrolling,\n \t\t\t0, 2, 0, maxy - 2, maxx);\n }\n \n-static int inline display_clock_un_select(int win, int line,\n+static int inline display_un_select(int win, int line,\n \t\t\t\t\t bool highlight, bool bold)\n {\n-\tif (mvwchgat(clock_pad, line, 0, -1,\n+\tif (mvwchgat(windata[win].pad, line, 0, -1,\n \t\t highlight ? WA_STANDOUT :\n \t\t bold ? WA_BOLD: WA_NORMAL, 0, NULL) < 0)\n \t\treturn -1;\n@@ -306,12 +247,12 @@\n \n int display_select(int win, int line)\n {\n-\treturn display_clock_un_select(win, line, true, false);\n+\treturn display_un_select(win, line, true, false);\n }\n \n int display_unselect(int win, int line, bool bold)\n {\n-\treturn display_clock_un_select(win, line, false, bold);\n+\treturn display_un_select(win, line, false, bold);\n }\n \n void *display_get_row_data(int win)\n@@ -337,11 +278,11 @@\n \treturn 0;\n }\n \n-int display_reset_cursor(win)\n+int display_reset_cursor(int win)\n {\n \twindata[win].nrdata = 0;\n-\twerase(clock_pad);\n-\treturn wmove(clock_pad, 0, 0);\n+\twerase(windata[win].pad);\n+\treturn wmove(windata[win].pad, 0, 0);\n }\n \n int display_print_line(int win, int line, char *str, int bold, void *data)\n@@ -358,12 +299,12 @@\n \t\treturn -1;\n \n \tif (attr)\n-\t\twattron(clock_pad, attr);\n-\n-\twprintw(clock_pad, \"%s\\n\", str);\n+\t\twattron(windata[win].pad, attr);\n+\n+\twprintw(windata[win].pad, \"%s\\n\", str);\n \n \tif (attr)\n-\t\twattroff(clock_pad, attr);\n+\t\twattroff(windata[win].pad, attr);\n \n \treturn 0;\n }\n"} {"commit":"548ddb4105514f6ebda5ac431dffc7d694e9a493","subject":"Mikal: Removed unneeded file","message":"Mikal: Removed unneeded file\n","repos":"lvv\/libpanda,lvv\/libpanda,lvv\/libpanda","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -1,63 +0,0 @@\n-\/******************************************************************************\n- display.c\n-\n- Change Control: DDMMYYYY\n- Michael Still File created 31032001\n-\n- Purpose:\n- This file looks after things that the user can do to change the way the\n- PDF document displays within viewers. Most of these things might not be\n- supported by all viewers.\n-******************************************************************************\/\n-\n-#if defined _WINDOWS\n- #include \"panda\/constants.h\"\n- #include \"panda\/functions.h\"\n-#else\n- #include <panda\/constants.h>\n- #include <panda\/functions.h>\n-#endif\n-\n-\/******************************************************************************\n-DOCBOOK START\n-\n-FUNCTION panda_setlinestart\n-PURPOSE sets the starting point of a curve\n-\n-SYNOPSIS START\n-#include<panda\/constants.h>\n-#include<panda\/functions.h>\n-void panda_setlinestart (panda_page * target, int x, int y);\n-SYNOPSIS END\n-\n-DESCRIPTION Set the starting point for the sequence of curves and lines that it to be drawn on the current page. This call is compulsory for almost all of the line drawing functions. It is not required for the <command>panda_rectangle<\/command> call.\n-\n-RETURNS Nothing\n-\n-EXAMPLE START\n-#include<panda\/constants.h>\n-#include<panda\/functions.h>\n-\n-panda_pdf *document;\n-panda_page *page;\n-\n-panda_init();\n-\n-document = panda_open(\"filename.pdf\", \"w\");\n-page = panda_newpage (document, panda_pagesize_a4);\n-\n-panda_setlinestart (page, 100, 200);\n-EXAMPLE END\n-SEEALSO \n-DOCBOOK END\n-******************************************************************************\/\n-\n-\/\/ Set the start point of a line on the page\n-void\n-panda_setlinestart (panda_page * target, int x, int y)\n-{\n- panda_entergraphicsmode (target);\n- target->contents->layoutstream =\n- panda_streamprintf (target->contents->layoutstream,\n-\t\t\t\"%d %d m\\n\", x, target->height - y);\n-}\n"} {"commit":"a0d6a0e52f7474ac7881a8fd2d780bea3dedb56f","subject":"don't use the backend context here either","message":"don't use the backend context here either\n\nwe never mess with any translation matrices, so there's no reason (i\nthink) that this shouldn't just be the identity matrix always\n","repos":"doy\/runes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -447,7 +447,7 @@\n t->font_italic ? CAIRO_FONT_SLANT_ITALIC : CAIRO_FONT_SLANT_NORMAL,\n t->font_bold ? CAIRO_FONT_WEIGHT_BOLD : CAIRO_FONT_WEIGHT_NORMAL);\n cairo_matrix_init_scale(&font_matrix, t->font_size, t->font_size);\n- cairo_get_matrix(t->backend_cr, &ctm);\n+ cairo_matrix_init_identity(&ctm);\n return cairo_scaled_font_create(\n font_face, &font_matrix, &ctm, cairo_font_options_create());\n }\n"} {"commit":"e1a863b52ee0277170b5a6048f8170de52b20c29","subject":"Fixed a typo.","message":"Fixed a typo.\n","repos":"danesh-d\/do-sort","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- do_sort.h\n+++ do_sort.h\n@@ -111,7 +111,7 @@\n class strand_sort : public sort {\n private:\n \/\/ This vector indicates which element has been deleted from the main\n- \/\/ vector, by setting the deleted element's element to false.\n+ \/\/ vector, by setting the deleted element's flag to false.\n vector<bool> flags;\n vector<int> sub_v;\n vector<int> sorted_v;\n"} {"commit":"efd7056734328fe7dff625413183122fc2216c45","subject":"Fix ch_out iteration length.","message":"Fix ch_out iteration length.\n","repos":"okaxaki\/emu2413,digital-sound-antiques\/emu2413","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- emu2413.c\n+++ emu2413.c\n@@ -1086,7 +1086,7 @@\n INLINE static void mix_output(OPLL *opll) {\n int16_t out = 0;\n int i;\n- for (i = 0; i < 15; i++) {\n+ for (i = 0; i < 14; i++) {\n out += opll->ch_out[i];\n }\n if (opll->conv) {\n@@ -1100,7 +1100,7 @@\n int16_t *out = opll->mix_out;\n int i;\n out[0] = out[1] = 0;\n- for (i = 0; i < 15; i++) {\n+ for (i = 0; i < 14; i++) {\n if (opll->pan[i] & 1)\n out[1] += opll->ch_out[i];\n if (opll->pan[i] & 2)\n@@ -1211,7 +1211,7 @@\n for (i = 0; i < 15; i++)\n opll->pan[i] = 3;\n \n- for (i = 0; i < 15; i++) {\n+ for (i = 0; i < 14; i++) {\n opll->ch_out[i] = 0;\n }\n }\n"} {"commit":"4aa007205043280d89301c8a7c2444682625df6d","subject":"Make Clang warnings go away.","message":"Make Clang warnings go away.\n","repos":"skeeto\/enchive","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- enchive.c\n+++ enchive.c\n@@ -502,7 +502,7 @@\n {\"derive\", 'd', OPTPARSE_NONE},\n {\"force\", 'f', OPTPARSE_NONE},\n {\"plain\", 'u', OPTPARSE_NONE},\n- {0}\n+ {0, 0, 0}\n };\n \n char *pubfile = global_pubkey;\n@@ -563,7 +563,7 @@\n {\n static const struct optparse_long archive[] = {\n {\"delete\", 'd', OPTPARSE_NONE},\n- {0}\n+ {0, 0, 0}\n };\n \n char *infile;\n@@ -643,7 +643,7 @@\n {\n static const struct optparse_long extract[] = {\n {\"delete\", 'd', OPTPARSE_NONE},\n- {0}\n+ {0, 0, 0}\n };\n \n char *infile;\n@@ -719,7 +719,7 @@\n command_help(struct optparse *options)\n {\n static const struct optparse_long help[] = {\n- {0}\n+ {0, 0, 0}\n };\n \n char *command;\n@@ -769,7 +769,7 @@\n {\"random-device\", 'r', OPTPARSE_REQUIRED},\n {\"pubkey\", 'p', OPTPARSE_REQUIRED},\n {\"seckey\", 's', OPTPARSE_REQUIRED},\n- {0}\n+ {0, 0, 0}\n };\n \n int option;\n"} {"commit":"97cd8b24d6f2d9ff9a8233901d2a1c9343bca0c9","subject":"add errmsg.go generator (written by c)","message":"add errmsg.go generator (written by c)\n","repos":"arteev\/firebirdsql,nakagami\/firebirdsql,rowland\/firebirdsql,arteev\/firebirdsql,rowland\/firebirdsql,nakagami\/firebirdsql","returncode":1,"stderr":"error: pathspec 'errmsgs.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- errmsgs.c\n+++ errmsgs.c\n@@ -0,0 +1,57 @@\n+ \/*******************************************************************************\n+ The MIT License (MIT)\n+\n+ Copyright (c) 2009-2015 Hajime Nakagami\n+\n+ Permission is hereby granted, free of charge, to any person obtaining a copy of\n+ this software and associated documentation files (the \"Software\"), to deal in\n+ the Software without restriction, including without limitation the rights to\n+ use, copy, modify, merge, publish, distribute, sublicense, and\/or sell copies of\n+ the Software, and to permit persons to whom the Software is furnished to do so,\n+ subject to the following conditions:\n+\n+ The above copyright notice and this permission notice shall be included in all\n+ copies or substantial portions of the Software.\n+\n+ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\n+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\n+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\n+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\n+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+ *******************************************************************************\/\n+#include <stdio.h>\n+#define\tSLONG long\n+#define SCHAR char\n+\n+\/\/ wget https:\/\/raw.githubusercontent.com\/FirebirdSQL\/core\/master\/src\/include\/gen\/msgs.h\n+\/\/ perl -pi -e 's\/\\\\\\\"\/\\\\\\\\\\\\\"\/g' msgs.h\n+\n+#include \"msgs.h\" \n+\n+int main(int argc, char *argv[])\n+{\n+ int i;\n+ FILE *fp = fopen(\"errmsgs.go\", \"w\");\n+\n+ fprintf(fp, \"\\\n+\/****************************************************************************\\n\\\n+The contents of this file are subject to the Interbase Public\\n\\\n+License Version 1.0 (the \\\"License\\\"); you may not use this file\\n\\\n+except in compliance with the License. You may obtain a copy\\n\\\n+of the License at http:\/\/www.Inprise.com\/IPL.html\\n\\\n+\\n\\\n+Software distributed under the License is distributed on an\\n\\\n+\\\"AS IS\\\" basis, WITHOUT WARRANTY OF ANY KIND, either express\\n\\\n+or implied. See the License for the specific language governing\\n\\\n+rights and limitations under the License.\\n\\n\\\n+*****************************************************************************\/\\n\");\n+ fprintf(fp, \"package firebirdsql\\n\\nvar errmsgs = map[int]string{\\n\");\n+ for (i = 0; messages[i].code_text; i++) {\n+ fprintf(fp, \"\\t%ld: \\\"%s\\\\n\\\",\\n\", messages[i].code_number, messages[i].code_text);\n+ }\n+ fprintf(fp, \"}\\n\");\n+\n+ fclose(fp);\n+ return 0;\n+}\n"} {"commit":"f605f14b7b7a44110b1ea474d5aa1427a5d33535","subject":"LU decomp working - would like to improve partitioning method. Instead of only partitioning into n^2 square blocks, perhaps rectangles","message":"LU decomp working - would like to improve partitioning method. Instead of only partitioning into n^2 square blocks, perhaps rectangles\n","repos":"ccotter\/libdeterm,ccotter\/libdeterm,ccotter\/libdeterm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- eval\/lu.c\n+++ eval\/lu.c\n@@ -6,8 +6,11 @@\n #include <stdio.h>\n #include <pthread.h>\n \n-#define MINDIM 4\n-#define MAXDIM MINDIM\n+#include \"bench.h\"\n+\n+#define MINDIM 16\n+#define MAXDIM 1024\n+#define MAXTHREADS 32\n \n #define max(a,b) \\\n \t({ __typeof__ (a) _a = (a); \\\n@@ -18,7 +21,6 @@\n \t __typeof__ (b) _b = (b); \\\n \t _a < _b ? _a : _b; })\n \n-int NT;\n typedef float mtype;\n struct luargs\n {\n@@ -33,7 +35,6 @@\n }\n #endif\n \n-static void print(mtype *arr);\n void *lu(void*);\n \n pthread_t threads[MAXDIM][MAXDIM];\n@@ -42,7 +43,7 @@\n int done[MAXDIM][MAXDIM];\n struct luargs args[MAXDIM][MAXDIM];\n \n-mtype A[MAXDIM*MAXDIM], L[MAXDIM*MAXDIM], A2[MAXDIM*MAXDIM];\n+mtype A[MAXDIM*MAXDIM], L[MAXDIM*MAXDIM];\n mtype x[MAXDIM], P[MAXDIM];\n int n;\n #define VAL(_a, _i, _j) (_a[_i * MAXDIM + _j])\n@@ -90,70 +91,22 @@\n \tint row1 = (_i + 1) * probsize;\n \tint col1 = (_j + 1) * probsize;\n \tint k;\n-\tprintf(\"(%d,%d): [%d,%d] [%d,%d]\\n\", _i,_j,row0,row1-1,col0,col1-1);\n \n \twaitthread(_i-1,_j);\n \twaitthread(_i,_j-1);\n \n \tint i, j;\n-\tint QW,WQ;\n-\tQW=2;\n-\tWQ=2;\n \tfor (i = row0; i < row1; ++i) {\n \t\tfor (j = col0; j < col1; ++j) {\n-\t\t\tprintf(\"A:%d %d\\n\", i,j);\n-\t\t\tfor (k = 0; k < min(_i, _j); ++k) {\n-\t\t\t\tint l;\n-\t\t\t\tfor (l = 0; l < probsize; ++l) {\n-\t\t\t\t\tint _k = k * probsize + l;\n-\t\t\tprintf(\" (%d,%d)use L:%d %d\\n\", i,j,i,_k);\n-\t\t\tprintf(\" (%d,%d)use A:%d %d\\n\", i,j,_k,j);\n-\t\t\t\t\tif (i==QW&&j==WQ)\n-\t\t\t\t\t\tprintf(\"(%d,%d):%d-%d (%d,%d)=%.8f (%d,%d)=%.8f\\n\",\n-\t\t\t\t\t\t\t\ti,j,k,\n-\t\t\t\t\t\t\t\tprobsize-row1+i,i,_k,VAL(L,i,_k),_k,j,VAL(A,_k,j));\n-\t\t\t\t\tVAL(A, i, j) = VAL(A, i, j) - VAL(L, i, _k) * VAL(A, _k, j);\n-\t\t\t\t\tif (i==QW&&j==WQ)\n-\t\t\t\t\t\tprintf(\" final=%.8f\\n\", VAL(A,i,j));\n-\t\t\t\t}\n+\t\t\tint k;\n+\t\t\tfor (k = 0; k < min(i, j); ++k) {\n+\t\t\t\tVAL(A, i, j) -= VAL(L, i, k) * VAL(A, k, j);\n \t\t\t}\n-\t\t\tif (i==QW&&j==WQ)\n-\t\t\t\tprintf(\"is %d\\n\", probsize-row1+i);\n-\t\t\tfor (k = 0; k < probsize - row1 + i; ++k) {\n-\t\t\t\tint _k = k + row0;\n-\t\t\t\tprintf(\" use L:%d %d\\n\", i,_k);\n-\t\t\t\tprintf(\" use A:%d %d\\n\", _k,j);\n-\t\t\t\tif (i==QW&&j==WQ)\n-\t\t\t\t\tprintf(\"o(%d,%d):%d-%d (%d,%d)=%.8f (%d,%d)=%.8f\\n\",\n-\t\t\t\t\t\t\ti,j,k,\n-\t\t\t\t\t\t\tprobsize-row1+i,i,_k,VAL(L,i,_k),_k,j,VAL(A,_k,j));\n-\t\t\t\tVAL(A, i, j) = VAL(A, i, j) - VAL(L, i, _k) * VAL(A, _k, j);\n-\t\t\t\tif (i==QW&&j==WQ)\n-\t\t\t\t\tprintf(\" final=%.8f\\n\", VAL(A,i,j));\n-\t\t\t}\n-\t\t\tif (i > j) {\n-#if 0\n-\t\t\t\tif (i==2&&j==1) {\n-\t\t\t\t\tprintf(\"start\\n\");\n-\t\t\t\t\tprint(A);\n-\t\t\t\t\tprint(L);\n-\t\t\t\t\tprintf(\"ok\\n\");\n-\t\t\t\t}\n-#endif\n-\t\t\t\tprintf(\"made L %d %d\\n\",i,j);\n-\t\t\t\tVAL(L, i, j) = VAL(A2, i, j) \/ VAL(A2, j, j);\n-\t\t\t}\n-\t\t}\n-\t}\n-#if 0\n-\tfor (i = row0; i < row1; ++i) {\n-\t\tfor (j = col0; j < col1; ++j) {\n \t\t\tif (i > j) {\n \t\t\t\tVAL(L, i, j) = VAL(A, i, j) \/ VAL(A, j, j);\n \t\t\t}\n \t\t}\n \t}\n-#endif\n \tthreaddone(_i, _j);\n \treturn NULL;\n }\n@@ -171,7 +124,6 @@\n \t\t\tdone[i][j] = 0;\n \t\t\tpthread_mutex_init(&mutexes[i][j], NULL);\n \t\t\tpthread_cond_init(&conds[i][j], NULL);\n-\t\t\t++NT;\n \t\t\tpthread_create(&threads[i][j], NULL, lu, &args[i][j]);\n \t\t}\n \t}\n@@ -197,7 +149,6 @@\n \t\t\t\tVAL(L,i,i)=1;\n \t\t}\n \t}\n-\tprintf(\"finished %d\\n\", partition);\n }\n \n #include \"..\/inc\/rng.h\"\n@@ -208,76 +159,30 @@\n \tfor (i = 0; i < n; ++i) {\n \t\tint j;\n \t\tfor (j = 0; j < n; ++j) {\n-\t\t\tVAL(A2, i, j) = VAL(A, i, j) = brand() % 100 + 100;\n+\t\t\tVAL(A, i, j) = brand() % 100 + 100;\n \t\t}\n \t}\n }\n \n-int intcmp(const void *_a, const void *_b)\n-{\n-\tint a = *(int*)_a, b = *(int*)_b;\n-\tif (a<b)\n-\t\treturn -1;\n-\telse if (a>b)\n-\t\treturn 1;\n-\treturn 0;\n-}\n-\n int main(void)\n {\n-\tn = MINDIM;\n-\tint i;\n-\tgenmatrix(1);\n-\tprint(A);\n-\tplu(MINDIM\/2);\n-\tprint(L);\n-\tprintf(\"\\n\");\n-\tprint(A);\n-\tprintf(\"Created %d threads\\n\", NT);\n-\n-#if 0\n-\tfor (i = 0; i < n; ++i) {\n-\t\tint j;\n-\t\tfor (j = 0; j < n; ++j) {\n-\t\t\tint k;\n-\t\t\tfor (k = 1; k < deps[i][j][0]; ++k) {\n-\t\t\t\tint a = deps[i][j][k] \/ MAXDIM;\n-\t\t\t\tint b = deps[i][j][k] % MAXDIM;\n-\t\t\t\tif (i!=a&&j!=b)\n-\t\t\t\t\tprintf(\"oops\");\n-\t\t\t}\n-#if 0\n-\t\t\tqsort(&deps[i][j][1] , deps[i][j][0], sizeof(int), intcmp);\n-\t\t\tprintf(\"(%d,%d): \", i, j);\n-\t\t\tfor (k = 1; k < deps[i][j][0]; ++k) {\n-\t\t\t\tint Q = deps[i][j][k];\n-\t\t\t\tprintf(\"(%d,%d) \", Q\/MAXDIM,Q%MAXDIM);\n-\t\t\t}\n-\t\t\tprintf(\"\\n\");\n-#endif\n+\tfor (n = MINDIM; n <= MAXDIM; n *= 2) {\n+\t\tprintf(\"Matrix size: %dx%d = %d (%ld bytes)\\n\", n, n, n * n,\n+\t\t\t\tn * n * sizeof(mtype));\n+\t\tint i;\n+\t\tfor (i = 1; i <= n && i*i <= MAXTHREADS; i *= 2) {\n+\t\t\tgenmatrix(1);\n+\t\t\tlong tt = bench_time();\n+\t\t\tplu(i);\n+\t\t\ttt = bench_time() - tt;\n+\t\t\tint blksize = n \/ i;\n+\t\t\tprintf(\"blksize %dx%d (nthreads=%d): %ld.%.9ld\\n\",\n+\t\t\t\t\tblksize, blksize, i * i,\n+\t\t\t\t\ttt \/ 1000000000,\n+\t\t\t\t\ttt % 1000000000);\n \t\t}\n-\t}\n-#endif\n-\treturn 0;\n-\tfor (i = 1; i <= n \/ 2; i *= 2) {\n-\t\tgenmatrix(1);\n-\t\tplu(i);\n-\t\tprint(A);\n+\t\tprintf(\"\\n\");\n \t}\n \treturn 0;\n }\n \n-static void print(mtype *arr)\n-{\n-\tint i;\n-\tif (n>8)\n-\t\treturn;\n-\tfor (i = 0; i < n; ++i) {\n-\t\tint j;\n-\t\tfor (j = 0; j < n; ++j) {\n-\t\t\tprintf(\"%.8f \", VAL(arr, i, j));\n-\t\t}\n-\t\tprintf(\"\\n\");\n-\t}\n-}\n-\n"} {"commit":"9d78dac57ecba0893b5fa95c320f5437c3dad3e8","subject":"Implement LXC::run_command","message":"Implement LXC::run_command\n","repos":"andrenth\/ruby-lxc,akshaykarle\/ruby-lxc,lxc\/ruby-lxc,akshaykarle\/ruby-lxc,andrenth\/ruby-lxc,lxc\/ruby-lxc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/lxc.c\n+++ ext\/lxc.c\n@@ -1137,6 +1137,24 @@\n }\n \n static VALUE\n+lxc_run_command(VALUE self, VALUE rb_command)\n+{\n+ int ret;\n+ lxc_attach_command_t cmd;\n+ VALUE rb_program;\n+\n+ rb_program = rb_ary_shift(rb_command);\n+ cmd.program = StringValuePtr(rb_program);\n+ cmd.argv = ruby_to_c_string_array(rb_command);\n+\n+ ret = lxc_attach_run_command(&cmd);\n+ if (ret == -1)\n+ rb_raise(Error, \"unable to run command\");\n+ \/* NOTREACHED *\/\n+ return Qnil;\n+}\n+\n+static VALUE\n lxc_default_config_path(VALUE self)\n {\n return rb_str_new2(lxc_get_default_config_path());\n@@ -1200,8 +1218,7 @@\n \n \/\/rb_define_singleton_method(LXC, \"arch_to_personality\",\n \/\/ lxc_arch_to_personality, 1);\n- \/\/rb_define_singleton_method(LXC, \"attach_run_command\",\n- \/\/ lxc_attach_run_command, 0);\n+ rb_define_singleton_method(LXC, \"run_command\", lxc_run_command, 0);\n \/\/rb_define_singleton_method(LXC, \"attach_run_shell\",\n \/\/ lxc_attach_run_shell, 0);\n rb_define_singleton_method(LXC, \"default_config_path\",\n"} {"commit":"165d27966992ecd4d3f2e70babca80eeafbb7083","subject":"Header formating","message":"Header formating\n","repos":"TheNotary\/FayeCpp,TheNotary\/FayeCpp,TheNotary\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,TheNotary\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,TheNotary\/FayeCpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fayecpp.h\n+++ fayecpp.h\n@@ -1970,6 +1970,7 @@\n \t\t\n \t\tvirtual ~REStaticString();\n \t};\n+\t\n \t\n \tclass REMutableString;\n \t\n"} {"commit":"5de7f8e11e9a7e9813c80efe45704a4f1ca620b3","subject":"Windows DLL extern constants","message":"Windows DLL extern constants\n","repos":"OlehKulykov\/FayeCpp,TheNotary\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,OlehKulykov\/FayeCpp,TheNotary\/FayeCpp,TheNotary\/FayeCpp,TheNotary\/FayeCpp,OlehKulykov\/FayeCpp,TheNotary\/FayeCpp,OlehKulykov\/FayeCpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fayecpp.h\n+++ fayecpp.h\n@@ -122,35 +122,19 @@\n #\tif defined(_MSC_VER)\n #\t\tdefine __RE_PUBLIC_CLASS_API__ __declspec(dllexport)\n # define __RE_EXPORT_IMPLEMENTATION_TEMPLATE__\n-\/\/#\t\tif defined(__cplusplus) || defined(_cplusplus)\n-\/\/#\t\t\tdefine __RE_EXTERN__ extern \"C\" __declspec(dllexport)\n-\/\/#\t\telse\n-#\t\t\tdefine __RE_EXTERN__ extern __declspec(dllexport)\n-\/\/#\t\tendif\n+#\t\tdefine __RE_EXTERN__ extern __declspec(dllexport)\n #\telif defined(__GNUC__)\n #\t\tdefine __RE_PUBLIC_CLASS_API__ __attribute__((dllexport))\n-\/\/#\t\tif defined(__cplusplus) || defined(_cplusplus)\n-\/\/#\t\t\tdefine __RE_EXTERN__ extern \"C\" __attribute__((dllexport))\n-\/\/#\t\telse\n-#\t\t\tdefine __RE_EXTERN__ extern __attribute__((dllexport))\n-\/\/#\t\tendif\n+#\t\tdefine __RE_EXTERN__ extern __attribute__((dllexport))\n #\tendif\n #else\n #\tif defined(_MSC_VER)\n #\t\tdefine __RE_PUBLIC_CLASS_API__ __declspec(dllimport)\n-\/\/#\t\tif defined(__cplusplus) || defined(_cplusplus)\n-\/\/#\t\t\tdefine __RE_EXTERN__ extern \"C\" __declspec(dllimport)\n-\/\/#\t\telse\n-#\t\t\tdefine __RE_EXTERN__ extern __declspec(dllimport)\n-\/\/#\t\tendif\n+#\t\tdefine __RE_EXTERN__ extern __declspec(dllimport)\n # define __RE_EXPORT_IMPLEMENTATION_TEMPLATE__ extern\n #\telif defined(__GNUC__)\n #\t\tdefine __RE_PUBLIC_CLASS_API__ __attribute__((dllimport))\n-\/\/#\t\tif defined(__cplusplus) || defined(_cplusplus)\n-\/\/#\t\t\tdefine __RE_EXTERN__ extern \"C\" __attribute__((dllimport))\n-\/\/#\t\telse\n-#\t\t\tdefine __RE_EXTERN__ extern __attribute__((dllimport))\n-\/\/#\t\tendif\n+#\t\tdefine __RE_EXTERN__ extern __attribute__((dllimport))\n #\tendif\n #endif\n \n@@ -165,11 +149,7 @@\n \n \n #ifndef __RE_EXTERN__\n-\/\/#\tif defined(__cplusplus) || defined(_cplusplus)\n-\/\/#\t\tdefine __RE_EXTERN__ extern \"C\"\n-\/\/#\telse\n-#\t\tdefine __RE_EXTERN__ extern\n-\/\/#\tendif\n+#\tdefine __RE_EXTERN__ extern\n #endif\n \n \n"} {"commit":"d1666af57cb7c3f6231793487b1861818f26ba18","subject":"update 10\/07\/15","message":"update 10\/07\/15","repos":"Felipe31\/Shortest_Path","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fibHeap.c\n+++ fibHeap.c\n@@ -1,5 +1,6 @@\n #include \"fib.h\"\n-#include <math.h>\n+#include \"math.h\"\n+\/\/http:\/\/www.sanfoundry.com\/cpp-program-implement-fibonacci-heap\/\n \/*---------------------------------------------- INICIALIZAR ----------------------------------------------*\/\n \n HeapFib * makeHeapFib()\n@@ -15,29 +16,67 @@\n }\n \n \n+\/*---------------------------------------------- CRIA N\u00d3 ----------------------------------------------*\/\n+NoHeapFib * criaNoFib(int custo)\n+{\n+\tNoHeapFib * no = (NoHeapFib *) malloc(sizeof(NoHeapFib));\n+\tif(!no) return NULL;\n+\n+\tno->pai = NULL;\n+\tno->filho = NULL;\n+\tno->custo = custo;\n+\tno->grau = 0;\n+\tno->marca = 0; \t\n+\tno->esq = no->dir = no;\n+\n+\treturn no;\n+}\n+\n+\n \/*---------------------------------------------- IMPRIMIR ----------------------------------------------*\/\n \n-void imprimir( NoHeapFib* No, NoHeapFib * pai){\n-\tprintf(\"Elemento: %d \", No == NULL ? INT_MIN : No -> custo);\n-\n-\/*\tif( No->filho != NULL){\n-\t\timprimir( No->filho, No->filho);\n-\t}\n-*\/\n-\tif( No->dir != pai){\n-\t\timprimir( No->dir, pai);\n-\t}\n+void imprimir( NoHeapFib* no){\n+\tassert(no);\n+\n+\tNoHeapFib * filho = no;\n+\n+\tdo\n+\t{\n+\t\tprintf(\"%d \", no->custo);\n+\n+\t\tif (no->filho)\n+\t\t{\n+\t\t\tprintf(\"V \");\n+\t\t\timprimir(no->filho);\n+\t\t\tprintf(\"\u02c6 \");\n+\n+\t\t}\n+\n+\t\tno = no->dir;\n+\n+\t\tif(no != filho)\n+\t\t\tprintf(\"-> \");\n+\n+\n+\t}while(no != filho);\n }\n \n \n void imprimirHeapFib(HeapFib* H){\n-\n-\tif(H -> noMin)\n-\t\timprimir(H->noMin, H->noMin);\n+\tprintf(\"\\n\");\n+\n+\tif(!H->noMin)\n+\t{\t\n+\t\tprintf(\"Heap vazio\\n\");\n+\t\treturn;\n+\t}\n \telse \n-\t\tprintf(\"Heap vazio!\");\n-\n-\tputs(\"\");\n+\t{\n+\t\tprintf(\"Itens do Heap\\n\");\n+\t\timprimir(H->noMin);\n+\t}\n+\n+\tputs(\"\\n\");\n }\t\n \n \n@@ -47,62 +86,38 @@\n NoHeapFib * insereFib(HeapFib* H, int custo){\n \tassert(H);\n \n-\tNoHeapFib* novoNo = (NoHeapFib*) malloc( sizeof( NoHeapFib));\n-\tif(novoNo == NULL) return novoNo;\n-\n-\tnovoNo->pai = NULL;\n-\tnovoNo->filho = NULL;\n-\tnovoNo->custo = custo;\n-\tnovoNo->grau = 0;\n-\tnovoNo->marca = 0; \n-\n-\n-\tif ( H->noMin == NULL){\n-\t\tnovoNo->esq = novoNo;\n-\t\tnovoNo->dir = novoNo;\n-\t\tH->noMin = novoNo;\n-\t}\n-\telse{\n-\t\tnovoNo->esq = (H -> noMin)->esq;\n-\t\t(H -> noMin)->esq = novoNo;\n-\t\tnovoNo->dir = (H -> noMin);\n-\t\t(novoNo->esq)->dir = novoNo;\n-\n-\t\tif ( custo < (H -> noMin) -> custo){\n-\t\t\t(H -> noMin) = novoNo;\n-\t\t}\n-\t}\n-\n-\t(H -> qtdNos)++;\n-\treturn novoNo;\n-}\n-\n-\n-NoHeapFib * insereFibNoPronto(HeapFib* H, NoHeapFib* No){\n-\tassert(H);\n-\tassert(No);\n+\tNoHeapFib * no = criaNoFib(custo);\n+\tif(!no) return NULL;\n+\n+\treturn insereFibNoPronto(H, no);\n+}\n+\n+\n+NoHeapFib * insereFibNoPronto(HeapFib* H, NoHeapFib* no){\n+\tassert(H);\n+\tassert(no);\n \t\n \tif (H->noMin == NULL){\n-\t\tH->noMin = No;\n-\t\tNo->esq = No->dir = No;\n+\t\tH->noMin = no;\n+\t\tno->esq = no->dir = no;\n \t}\n \n \telse{\n-\t\tNo->esq = H->noMin->esq;\n-\t\tH->noMin->esq = No;\n-\t\tNo->esq->dir = No;\n-\t\tNo->dir = H->noMin;\n-\t}\n-\n-\tNo->pai = NULL;\n-\tNo->filho = NULL;\n-\tNo->marca = 0;\n+\t\tno->esq = H->noMin->esq;\n+\t\tH->noMin->esq = no;\n+\t\tno->esq->dir = no;\n+\t\tno->dir = H->noMin;\n+\t}\n+\n+\tno->pai = NULL;\n+\tno->filho = NULL;\n+\tno->marca = 0;\n \tH->qtdNos++;\n \n-\tif (No->custo < H->noMin->custo)\n-\t\tH->noMin = No;\n-\n-\treturn No;\n+\tif (no->custo < H->noMin->custo)\n+\t\tH->noMin = no;\n+\n+\treturn no;\n \n }\n \n@@ -116,13 +131,10 @@\n \tassert(H);\n \n \/*********************** Remove Y da lista de raizes ***********************\/\n-\tif (H -> noMin == y)\n-\t\tH -> noMin = y -> dir;\n-\n \t(y -> dir) -> esq = y -> esq;\n \t(y -> esq) -> dir = y -> dir;\n \n-\tif(x->dir == x)\n+\tif(x->dir == x || H -> noMin == y)\n \t\tH -> noMin = x;\n \n \/*********************** Y vira filho de X ***********************\/\n@@ -130,8 +142,7 @@\n \tif(x -> filho == NULL)\n \t{\n \t \tx -> filho = y;\n-\t \ty -> esq = y;\n-\t \ty -> dir = y;\n+\t \ty -> esq = y -> dir = y;\n \n \t}\n \n@@ -155,7 +166,10 @@\n void consolidar(HeapFib * H){\n \tassert(H);\n \t\n-\tint d = (log(H->qtdNos))\/(log(2));\n+\tint d = H->qtdNos; \/\/(log(H->qtdNos))\/(log(1.61803));\n+\n+\t\/\/printf(\"qtdNos: %d\\nd: %d\", H->qtdNos, d );\n+\n \tNoHeapFib **a = (NoHeapFib **) calloc(d, sizeof(NoHeapFib *));\n \tint i, grau;\n \tNoHeapFib * y, * troca, * x;\n@@ -168,9 +182,7 @@\n \tdo{\n \n \t\tgrau = x->grau;\n-printf(\"grau = %d\\n\", grau );\n-\n-puts(\"tt\");\n+\n \t\twhile(a[grau])\n \t\t{\n \t\t\ty = a[grau];\n@@ -184,20 +196,19 @@\n \n \t\t\t}\n \t\t\t\n-\n \t\t\theapFibLink(H, y, x);\n \t\t\t\n \t\t\tif(x->dir == x || H->noMin == y)\n \t\t\t\tH->noMin = x;\n \n \t\t\ta[grau] = NULL;\n-\t\t\tgrau++;\n-\n-\t\t}\n-puts(\"yy\");\n+\t\t\tgrau = x->grau;\n+\n+\t\t}\n \n \t\ta[grau] = x;\n \n+\n \t\tx = x->dir;\n \n \t}while(x != H -> noMin);\n@@ -207,7 +218,7 @@\n \n \tfor(i = 0; i < d; i++)\n \t{\n-\t\tif( a[i] )\n+\t\tif(a[i])\n \t\t{\n \t\t\tif(!(H->noMin))\n \t\t\t{\n@@ -252,24 +263,22 @@\n \t\t{\n \/*********************** Insere todos os filhos de noExtraido na lista de raizes ***********************\/\n \n-\t\t\tfilho->esq->dir = noExtraido->dir;\n-\t\t\tnoExtraido->dir->esq = filho->esq;\n-\n-\t\t\tfilho->esq = noExtraido;\n-\t\t\tnoExtraido->dir = filho;\n-\n \t\t\taux = filho;\n- \/\/ puts(\"james extract | \"); \n \t\t\t\n \t\t\tdo\n \t\t\t{\n-\t\t\t\/\/\tprintf(\"filho: %d aux: %d \\n\", filho->custo, aux->custo );\n \t\t\t\taux->pai= NULL;\n \t\t\t\taux = aux->dir;\n \n \n \t\t\t}while(aux != filho);\n- \/\/ puts(\" bond extract | \"); \n+\n+\t\t\tfilho->esq->dir = noExtraido->dir;\n+\t\t\tnoExtraido->dir->esq = filho->esq;\n+\n+\t\t\tfilho->esq = noExtraido;\n+\t\t\tnoExtraido->dir = filho;\n+\t\t\tnoExtraido -> filho = NULL;\n \n \t\t}\n \/*********************** Remove noExtraido da lista de raizes ***********************\/\n@@ -284,9 +293,10 @@\n \t\t\tnoExtraido->dir->esq = noExtraido->esq;\n \n \t\t\tH->noMin = noExtraido->dir;\n-\n+\t\/\/imprimirHeapFib(H);\n \t\t\tconsolidar(H);\n-\n+\tputs(\"\\ndepoisi\\n\");\n+\timprimirHeapFib(H);\n \t\t}\n \n \t\tH->qtdNos--;\n@@ -308,13 +318,13 @@\n \n if(y -> filho == x)\n {\n- if(x -> esq == x)\n+ if(x -> dir == x)\n {\n y -> filho = NULL;\n }\n else\n {\n- y -> filho = x -> esq;\n+ y -> filho = x -> dir;\n }\n }\n \n@@ -348,11 +358,10 @@\n }\n \n \n-void decreaseKey(HeapFib* H, NoHeapFib* x , int k, verticeDjk * predec)\n+void decreaseKey(HeapFib* H, NoHeapFib* x , int k)\n {\n assert(H);\n assert(x);\n- assert(predec);\n \n if(k > x -> custo) \n {\n@@ -362,11 +371,7 @@\n \n x -> custo = k;\n \n- verticeDjk * x2 = (verticeDjk *) x;\n-\n- x2 -> predec = predec;\n-\n- NoHeapFib* y = x->pai;\n+ NoHeapFib * y = x->pai;\n \n if(y != NULL && x -> custo < y -> custo)\n {\n"} {"commit":"4945df030af0b4197adb3b17d1184ad991ac3f05","subject":"format","message":"format\n","repos":"credativ\/linux-ftools,credativ\/linux-ftools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fincore.c\n+++ fincore.c\n@@ -14,6 +14,32 @@\n long cached_size;\n };\n \n+char *foobar( int value ) {\n+\n+ static char buff[100];\n+\n+ sprintf( buff, \"%d\", value );\n+\n+ return buff;\n+\n+}\n+\n+char *__itoa(int n) {\n+\tstatic char retbuf[100];\n+\tsprintf(retbuf, \"%d\", n);\n+\treturn retbuf;\n+}\n+\n+char *_ltoa( off_t value ) {\n+\n+ static char buff[100];\n+\n+ sprintf( buff, \"%ld\", value );\n+\n+ return buff;\n+\n+}\n+\n void fincore(char* path, \n int pages, \n int summarize, \n@@ -139,32 +165,6 @@\n \n }\n \n-char *foobar( int value ) {\n-\n- static char buff[100];\n-\n- sprintf( buff, \"%d\", value );\n-\n- return buff;\n-\n-}\n-\n-char *__itoa(int n) {\n-\tstatic char retbuf[100];\n-\tsprintf(retbuf, \"%d\", n);\n-\treturn retbuf;\n-}\n-\n-char *_ltoa( off_t value ) {\n-\n- static char buff[100];\n-\n- sprintf( buff, \"%ld\", value );\n-\n- return buff;\n-\n-}\n-\n \/\/ print help \/ usage\n void help() {\n \n"} {"commit":"e340cb6ddfe084e290fae8ba5a82033ef891df43","subject":"format","message":"format\n","repos":"credativ\/linux-ftools,credativ\/linux-ftools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fincore.c\n+++ fincore.c\n@@ -116,7 +116,7 @@\n \n printf( \"%-120s %15s\\n\",\n path,\n- _itoa( file_stat.st_size )\n+ ___itoa( file_stat.st_size )\n \n );\n \n@@ -139,7 +139,7 @@\n \n }\n \n-char* _itoa( long value ) {\n+char* ___itoa( long value ) {\n \n char* buff ;\n \n"} {"commit":"c3178e2dfaf695e507a48e99cde1c82e8d400ba3","subject":"don't show graph values","message":"don't show graph values\n","repos":"credativ\/linux-ftools,credativ\/linux-ftools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fincore.c\n+++ fincore.c\n@@ -113,7 +113,7 @@\n \n int nr_regions = 160;\n \n- *regions = calloc( nr_regions , sizeof(regions) ) ;\n+ *regions = (int*)calloc( nr_regions , sizeof(regions) ) ;\n \n if ( regions == NULL ) {\n perror( \"Could not allocate memory\" );\n"} {"commit":"c26a4ff2c2e7e445738f6bd4898abf5080ce2d7f","subject":"Fixed debug printing stuff","message":"Fixed debug printing stuff\n","repos":"cs3013-patandpat\/Project4,cs3013-patandpat\/Project4","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- virtualmemory.c\n+++ virtualmemory.c\n@@ -57,7 +57,6 @@\n \t}\n \tpthread_mutex_unlock(&(pageTable[i].lock));\n \tpthread_cond_broadcast(&(pageTable[i].condition_variable));\n-printf(\"SETUP PAGE DEBUG FINISH\\n\");\n \treturn i;\n }\n \n@@ -207,7 +206,6 @@\n \t\/\/find a random slot of memory to evict\n \tint i;\n \tif(memoryType == RAM){\n-printf(\"STARTING EVICT2 RAM DEBUG\\n\");\n \t\tint ram_found = 0;\n \t\tTableEntry pagesInRam[RAM_SIZE];\n \t\tint tableEntry[RAM_SIZE];\n@@ -234,7 +232,6 @@\n \t\tusleep(RAM_ACCESS);\n \t\tram[pagesInRam[evictThis].physicalAddress] = -1;\n \t\tsetupPage(tableEntry[evictThis],SSD,freeSpace + RAM_SIZE);\n-printf(\"EVICT TWO RAM DEBUG FINISH\\n\");\n \t}\n \telse if (memoryType == SSD){\n \t\tint ssd_found = 0;\n@@ -259,16 +256,11 @@\n \t\tint evictThis = rand() %(ssd_found);\n \t\tif(DEBUG) printf(\"SSD eviction successful.\\n\");\n \t\tusleep(SSD_ACCESS + HD_ACCESS);\n-printf(\"EVICT2 HD COPYING DEBUG EVICTtHIS = %d\\n\", evictThis);\n \t\thd[freeSpace] = ssd[pagesInSSD[evictThis].physicalAddress - RAM_SIZE];\n-printf(\"EVICT2 HD COPIED DEBUG\\n\");\n \t\tusleep(SSD_ACCESS);\n \t\tssd[pagesInSSD[evictThis].physicalAddress - RAM_SIZE] = -1;\n-printf(\"EVICT2 SSD SETUP PAGE\\n\");\n \t\tsetupPage(tableEntry[evictThis],HD,freeSpace + (RAM_SIZE + SSD_SIZE));\n-printf(\"EVICT2 SSD DEBUG FINISH\\n\");\n-\t}\n-printf(\"EVICT2 COMPLETED\\n\");\n+\t}\n }\n \n void evictThree(int memoryType, int freeSpace){\n@@ -334,33 +326,26 @@\n \t\tfreeSpace = findFreeMemoryLoc(SSD);\n \t\tif(freeSpace == -1){\n \t\t\tif(DEBUG) printf(\"No space available in SSD. Attempting to clear space.\\n\");\n-printf(\"EVICTING SSD DEBUG\\n\");\n \t\t\tevict(SSD);\n-printf(\"SSD EVCITED _ FINDING FREE SPACE\\n\");\n \t\t\tfreeSpace = findFreeMemoryLoc(SSD);\n-printf(\"FREE SPACE FOUND IN SSD\");\n \t\t}\n \t}\n \telse if(memoryType == SSD){\n \t\tfreeSpace = findFreeMemoryLoc(HD);\n \t\tif(freeSpace == -1){\n-\t\t\tprintf(\"Hard drive is full. Lossless eviction not possible.\\n\");\n+\t\t\tif(DEBUG) printf(\"Hard drive is full. Lossless eviction not possible.\\n\");\n \t\t\treturn;\n \t\t}\n \t}\n \tif(evictType == 0) \n \t\tevictOne(memoryType, freeSpace);\/\/first page found is evicted\n-\telse if(evictType == 1) {\n-printf(\"CALLING EVICT2 DEBUG MEMTYPE = %d FREESPACE = %d\\n\",memoryType,freeSpace);\n+\telse if(evictType == 1) {s\n \t\tevictTwo(memoryType, freeSpace);\/\/randomly pick a page to evict\n-printf(\"ENDED EVICT2 DEBUG\\n\");\n }\n \telse if(evictType == 2) \n \t\tevictThree(memoryType, freeSpace);\/\/use second chance algorithm to pick a page to evict\n \telse \n \t\tevictThree(memoryType, freeSpace);\/\/default to second chance\n-\n-printf(\"END EVICT BASE DEBUG\\n\");\n }\n \n void handlePageFault(vAddr address){\n@@ -426,9 +411,7 @@\n \telse if(freeSpace == -1){\n \t\tif(DEBUG) printf(\"There is no free space in RAM for this page.\\n\");\n \t\tevict(RAM);\n-printf(\"before.\\n\");\n \t\tfreeSpace = findFreeMemoryLoc(RAM);\n-printf(\"after.\\n\");\n \t}\n \tint i ;\n \tfor(i = 0 ; i < 1000 ; i++)\n@@ -442,7 +425,7 @@\n int *get_value_safe(vAddr address){\n \tif(DEBUG) printf(\"Searching for value at address: %d\\n\", address);\n \tif(pageTable[address].occupied == 0){\n-\t\tprintf(\"Page doesn't exist for this address.\\n\");\n+\t\tif(DEBUG) printf(\"Page doesn't exist for this address.\\n\");\n \t\treturn NULL;\n \t}\n \telse{\n@@ -498,7 +481,6 @@\n \t\t\treturn;\n \t\t}\n \t\telse{\n-\t\t\tprintf(\"waiting.\\n\");\n \t\t\tpthread_cond_wait(&(pageTable[address].condition_variable),&(pageTable[address].lock));\n \t\t}\n \t}\n@@ -515,7 +497,6 @@\n \t\t\treturn;\n \t\t}\n \t\telse{\n-\t\t\tprintf(\"waiting.\\n\");\n \t\t\tpthread_cond_wait(&(pageTable[address].condition_variable),&(pageTable[address].lock));\n \t\t}\n \t}\n@@ -597,7 +578,7 @@\n \t\tif(evictType > 2 || evictType < 0) evictType = rand()%3;\n \t}else evictType = 0;\n \t\n-\tprintf(\"evicting using %d.\\n\",evictType);\n+\tprintf(\"Evicting using %d.\\n\",evictType);\n \t\n \tpageCount = 0;\n \t\n"} {"commit":"c2a608fd2dd2cd5d95471be31f1580d26ed34bd3","subject":"getting there.","message":"getting there.\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -18,7 +18,7 @@\n \n #define\tNUM(a)\t(sizeof (a)\/sizeof ((a)[0]))\n \n-#define\tMAX_FLOW_TYPE\t24\t\/* maximum number of bytes in a flow id *\/\n+#define\tMAX_FLOW_ID_BYTES\t24\t\/* maximum number of bytes in flow id *\/\n \n #define PICKUP_NETSHORT(p) ((((u_char *)p)[0]<<8)|((u_char *)p)[1])\n \n@@ -54,6 +54,21 @@\n hentry_p next_in_table;\n u_char key[1];\t\t\/* variable sized (KEEP AT END!) *\/\n };\n+\n+typedef struct {\n+\tchar\t*name;\t\t\/* external name *\/\n+\tchar\toffset,\t\t\/* where in header *\/\n+\t\tnumbytes,\t\/* length of field *\/\n+\t\tmask;\t\t\/* mask for data *\/\n+} atoft_t, *atoft_p;\n+\n+atoft_t atoft[] = {\n+\t{ \"IHV\", 0, 1, 0xf0 }, { \"IHL\", 0, 1, 0x0f }, { \"TOS\", 1, 1 },\n+\t{ \"LEN\", 2, 2 }, { \"ID\", 4, 2 }, { \"FOFF\", 6, 2}, { \"TTL\", 8, 1},\n+\t{ \"PROT\", 9, 1}, { \"SUM\", 10, 2}, { \"SRC\", 12, 4}, { \"DST\", 16, 4},\n+\t{ \"SPORT\", 20, 2}, { \"DPORT\", 22, 2}\n+};\n+\n \n \/* definition of FIX packet format *\/\n \n@@ -114,15 +129,16 @@\n \n int binsecs = 0;\t\t\/* number of seconds in a bin *\/\n \n-u_char flow_type[2*MAX_FLOW_TYPE];\n-int flow_type_len, flow_id_len, flow_type_covers;\n+u_char flow_type_indicies[MAX_FLOW_ID_BYTES];\n+u_char flow_bytes_and_mask[2*MAX_FLOW_ID_BYTES];\n+int flow_bytes_and_mask_len, flow_id_len, flow_id_covers;\n \n pcap_t *pcap_descriptor;\n char pcap_errbuf[PCAP_ERRBUF_SIZE];\n \n FILE *fix_descriptor;\n \n-u_char pending_flow_id[MAX_FLOW_TYPE];\n+u_char pending_flow_id[MAX_FLOW_ID_BYTES];\n int pending;\n int packet_error = 0;\n \n@@ -301,7 +317,7 @@\n static void\n packetin(Tcl_Interp *interp, const u_char *packet, int len)\n {\n- u_char flow_id[MAX_FLOW_TYPE];\n+ u_char flow_id[MAX_FLOW_ID_BYTES];\n int i, j;\n hentry_p hent;\n \n@@ -310,18 +326,19 @@\n \/* if no packet pending, then process this packet *\/\n if (pending == 0) {\n \n-\tif (len < flow_type_covers) {\n+\tif (len < flow_id_covers) {\n \t gstats.runts++;\n \t return;\n \t}\n-\tif ((packet[6]&0x1fff) && (flow_type_covers > 20)) {\n+\tif ((packet[6]&0x1fff) && (flow_id_covers > 20)) {\n \t gstats.fragments++;\t\/* can't deal with if looking at ports *\/\n \t return;\n \t}\n \n \t\/* create flow id for this packet *\/\n-\tfor (i = 0, j = 0; j < flow_type_len; i++, j += 2) {\n-\t pending_flow_id[i] = packet[flow_type[j]]&flow_type[j+1];\n+\tfor (i = 0, j = 0; j < flow_bytes_and_mask_len; i++, j += 2) {\n+\t pending_flow_id[i] = packet[flow_bytes_and_mask[j]]\n+\t\t\t\t\t\t &flow_bytes_and_mask[j+1];\n \t}\n \n } else {\n@@ -476,7 +493,7 @@\n \tinterp->result = \"need to call teho_set_{tcpd,fix}_file first\";\n \treturn TCL_ERROR;\n }\n- if (flow_type_len == 0) {\n+ if (flow_bytes_and_mask_len == 0) {\n \tinterp->result = \"need to call teho_set_flow_type first\";\n \treturn TCL_ERROR;\n }\n@@ -502,21 +519,19 @@\n {\n char initial[200], after[200];\n char *curdesc;\n- int i = 0;\t\t\/* number of bytes in flow_type used *\/\n- static struct {\n-\tchar *name;\t\/* external name *\/\n-\tchar offset, numbytes, mask;\t\/* where in header, len, mask *\/\n- } *xp, x[] = {\n-\t{ \"IHV\", 0, 1, 0xf0 }, { \"IHL\", 0, 1, 0x0f }, { \"TOS\", 1, 1 },\n-\t{ \"LEN\", 2, 2 }, { \"ID\", 4, 2 }, { \"FOFF\", 6, 2}, { \"TTL\", 8, 1},\n-\t{ \"PROT\", 9, 1}, { \"SUM\", 10, 2}, { \"SRC\", 12, 4}, { \"DST\", 16, 4},\n-\t{ \"SPORT\", 20, 2}, { \"DPORT\", 22, 2}\n- };\n+ int bandm = 0;\t\/* number of bytes in flow_bytes_and_mask used *\/\n+ int indicies = 0;\t\/* index (in atoft) of each field in flow id *\/\n+ atoft_p xp;\n+\n+ \/* forget current file type *\/\n+ flow_bytes_and_mask_len = 0;\n+ flow_id_covers = 0;\n+ flow_id_len = 0;\n \n curdesc = name;\n \n if (strlen(name) > NUM(initial)) {\n-\tinterp->result = \"flow_type too long\";\n+\tinterp->result = \"flow name too long\";\n \treturn TCL_ERROR;\n }\n \n@@ -531,27 +546,32 @@\n \t} else {\n \t curdesc = after+1;\t\/* +1 to strip off delimiter *\/\n \t}\n-\tfor (j = 0, xp = x; j < NUM(x); j++, xp++) {\n+\tfor (j = 0, xp = atoft; j < NUM(atoft); j++, xp++) {\n \t if (strcasecmp(xp->name, initial) == 0) {\n \t\tint off, num, mask;\n \t\toff = xp->offset;\n \t\tnum = xp->numbytes;\n \t\tmask = xp->mask ? xp->mask : 0xff;\n \t\twhile (num--) {\n-\t\t if (i >= (2*MAX_FLOW_TYPE)) {\n-\t\t\tinterp->result = \"flow_type too long\";\n+\t\t if (bandm >= (2*MAX_FLOW_ID_BYTES)) {\n+\t\t\tinterp->result = \"flow type too long\";\n \t\t\treturn TCL_ERROR;\n \t\t }\n-\t\t if (off > flow_type_covers) {\n-\t\t\tflow_type_covers = off;\n+\t\t if (off > flow_id_covers) {\n+\t\t\tflow_id_covers = off;\n \t\t }\n-\t\t flow_type[i++] = off++;\n-\t\t flow_type[i++] = mask;\n+\t\t flow_bytes_and_mask[bandm++] = off++;\n+\t\t flow_bytes_and_mask[bandm++] = mask;\n \t\t}\n+\t\tif (indicies >= NUM(flow_type_indicies)) {\n+\t\t interp->result = \"too many fields in flow type\";\n+\t\t return TCL_ERROR;\n+\t\t}\n+\t\tflow_type_indicies[indicies++] = j;\n \t\tbreak;\n \t }\n \t}\n-\tif (j >= NUM(x)) {\n+\tif (j >= NUM(atoft)) {\n \t static char errbuf[100];\n \n \t interp->result = errbuf;\n@@ -561,8 +581,8 @@\n \t}\n }\n goodout:\n- flow_type_len = i;\n- flow_id_len = i\/2;\n+ flow_bytes_and_mask_len = bandm;\n+ flow_id_len = bandm\/2;\n return TCL_OK;\n }\n \n"} {"commit":"d2f4ab4b377cc8701a395f9e96f5fbb4dde2d20a","subject":"Add in df and mf, which cleans up some stuff.","message":"Add in df and mf, which cleans up some stuff.\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -12,11 +12,9 @@\n *\t\texamples of use; warn about memory consumption.\n *\t7.\tVerify the results of callouts (new flow, recv,\n *\t\ttimer) are valid.\n- * \t8. \tSet atoft[] from Tcl code\n+ * \t8. \tSet atoft[] from Tcl code. (Need to change \"alltags\"\n+ *\t\tin [fsim_setft]; or delete!)\n * \t9. \tProtohasports...\n- * 10. \tSeparate out MF and DF from foff in atoft; generalize\n- * \t \tflow_id_to_string (requires fixes to set_flow_type()\n- *\t\t*and* to FLOW_ID_FROM_HDR() and (maybe) tbl_lookup()\n * 11. \tSpecify trace file\/format on command line;\n * \t \tadd fsim_fileinfo (returns name and format).\n *\/\n@@ -279,8 +277,8 @@\n typedef struct {\n \tchar\t*name;\t\t\/* external name *\/\n \tu_char\toffset,\t\t\/* where in header *\/\n-\t\tnumbytes,\t\/* length of field *\/\n-\t\tmask,\t\t\/* mask for data *\/\n+\t\tfirstbit,\t\/* where the first bit is (0 == MSB) *\/\n+\t\tnumbits,\t\/* number of bits *\/\n \t\tfmt;\t\t\/* format for output (see below) *\/\n } atoft_t, *atoft_p;\n \n@@ -289,11 +287,12 @@\n #define\tFMT_HEX\t\t2\t\/* 0x2a *\/\n \n atoft_t atoft[] = {\n-\t{ \"ihv\", 0, 1, 0xf0 }, { \"ihl\", 0, 1, 0x0f }, { \"tos\", 1, 1 },\n-\t{ \"len\", 2, 2 }, { \"id\", 4, 2 }, { \"foff\", 6, 2}, { \"ttl\", 8, 1},\n-\t{ \"prot\", 9, 1}, { \"sum\", 10, 2},\n-\t{ \"src\", 12, 4, 0, FMT_DOTTED}, { \"dst\", 16, 4, 0, FMT_DOTTED},\n-\t{ \"sport\", 20, 2}, { \"dport\", 22, 2}\n+\t{ \"ihv\", 0, 0, 4 }, { \"ihl\", 0, 4, 4 }, { \"tos\", 1, 0, 8 },\n+\t{ \"len\", 2, 0, 16 }, { \"id\", 4, 0, 16 },\n+\t{ \"df\", 6, 1, 1}, { \"mf\", 6, 2, 1}, { \"foff\", 6, 3, 13},\n+\t{ \"ttl\", 8, 0, 8}, { \"prot\", 9, 0, 8}, { \"sum\", 10, 0, 16},\n+\t{ \"src\", 12, 0, 32, FMT_DOTTED}, { \"dst\", 16, 0, 32, FMT_DOTTED},\n+\t{ \"sport\", 20, 0, 16}, { \"dport\", 22, 0, 16}\n };\n \n \n@@ -500,7 +499,8 @@\n char *sep = \"\", *dot, *fmt0xff, *fmt0xf;\n atoft_p xp;\n u_long decimal;\n- int i, j;\n+ int i, firstbit, numbits, lastbit;\n+ u_long byte;\n \n result[0] = 0;\n for (i = 0; i < ft->fti_type_indicies_len; i++) {\n@@ -524,35 +524,30 @@\n \t\t\t\t__FILE__, __LINE__, xp->fmt);\n \t break;\n \t}\n-\t\/* (clearly, mask 0xf0 or 0x0f is incompatible with numbytes > 1) *\/\n-\tfor (j = 0; j < xp->numbytes; j++) {\n-\t if ((xp->mask == 0) || (xp->mask == 0xff)) {\n-\t\tif (xp->fmt == FMT_DECIMAL) {\n-\t\t decimal = (decimal<<8)+*id++;\n+\n+\tfirstbit = xp->firstbit;\n+\tnumbits = xp->numbits;\n+\twhile (numbits > 0) {\n+\t byte = *id++;\n+\t lastbit = (firstbit+numbits) > 8 ? 7 : firstbit+numbits-1;\n+\t if (firstbit > 0) {\n+\t\tbyte = (byte<<(firstbit+24))>>(firstbit+24);\n+\t }\n+\t if (lastbit < 7) {\n+\t\tbyte = (byte>>(7-lastbit))<<(7-lastbit);\n+\t }\n+\t if (xp->fmt == FMT_DECIMAL) {\n+\t\tdecimal = (decimal<<(lastbit-firstbit+1))+(byte>>(7-lastbit));\n+\t } else {\n+\t\tif (firstbit < 4) {\n+\t\t sprintf(fidp, fmt0xff, dot, byte);\n \t\t} else {\n-\t\t sprintf(fidp, fmt0xff, dot, *id++);\n-\t\t fidp += strlen(fidp);\n+\t\t sprintf(fidp, fmt0xf, dot, byte);\n \t\t}\n-\t } else if (xp->mask == 0xf0) {\n-\t\tif (xp->fmt == FMT_DECIMAL) {\n-\t\t decimal = (decimal<<4)+((*id++)>>4);\n-\t\t} else {\n-\t\t sprintf(fidp, fmt0xf, dot, (*id++)>>4);\n-\t\t fidp += strlen(fidp);\n-\t\t}\n-\t } else if (xp->mask == 0x0f) {\n-\t\tif (xp->fmt == FMT_DECIMAL) {\n-\t\t decimal = (decimal<<4)+((*id++)&0xf);\n-\t\t} else {\n-\t\t sprintf(fidp, fmt0xf, dot, (*id++)&0xf);\n-\t\t fidp += strlen(fidp);\n-\t\t}\n-\t } else {\n-\t\t\/* unknown value for mask *\/\n-\t\tfprintf(stderr,\n-\t\t\t\"%s:%d --- mask value %x of index %d of atoft bad!\\n\",\n-\t\t\t\t__FILE__, __LINE__, xp->mask, i);\n-\t }\n+\t\tfidp += strlen(fidp);\n+\t }\n+\t numbits -= (8-firstbit);\n+\t firstbit = 0;\n \t if (xp->fmt == FMT_DOTTED) {\n \t\tdot = \".\";\n \t }\n@@ -1380,23 +1375,34 @@\n \t}\n \tfor (j = 0, xp = atoft; j < NUM(atoft); j++, xp++) {\n \t if (strcasecmp(xp->name, initial) == 0) {\n-\t\tint off, num, mask;\n+\t\tint off, firstbit, numbits, lastbit;\n+\t\tu_long mask;\n \t\toff = xp->offset;\n-\t\tnum = xp->numbytes;\n-\t\tmask = xp->mask ? xp->mask : 0xff;\n-\t\twhile (num--) {\n+\t\tfirstbit = xp->firstbit;\n+\t\tnumbits = xp->numbits;\n+\t\twhile (numbits > 0) {\n \t\t if (bandm >= (2*MAX_FLOW_ID_BYTES)) {\n-\t\t\tinterp->result = \"flow type too long\";\n+\t\t\tinterp->result = \"flow type specifier too long\";\n \t\t\treturn TCL_ERROR;\n \t\t }\n \t\t if (off > fti->fti_id_covers) {\n \t\t\tfti->fti_id_covers = off;\n \t\t }\n+\t\t mask = 0xff;\n+\t\t lastbit = (firstbit+numbits) > 8 ? 7 : (firstbit+numbits-1);\n+\t\t if (firstbit > 0) {\n+\t\t\tmask = (mask<<(firstbit+24))>>(firstbit+24);\n+\t\t }\n+\t\t if (lastbit < 7) {\n+\t\t\tmask = (mask>>(7-lastbit))<<(7-lastbit);\n+\t\t }\n+\t\t numbits -= (8-firstbit);\n+\t\t firstbit = 0;\n \t\t fti->fti_bytes_and_mask[bandm++] = off++;\n \t\t fti->fti_bytes_and_mask[bandm++] = mask;\n \t\t}\n \t\tif (indicies >= NUM(fti->fti_type_indicies)) {\n-\t\t interp->result = \"too many fields in flow type\";\n+\t\t interp->result = \"too many fields in flow type specifier\";\n \t\t return TCL_ERROR;\n \t\t}\n \t\tfti->fti_type_indicies[indicies++] = j;\n"} {"commit":"bb6f6dbaa48c53525a7a4f9d4df719c3b0b582af","subject":"[PATCH] do_coredump() should reset group_stop_count earlier","message":"[PATCH] do_coredump() should reset group_stop_count earlier\n\n__group_complete_signal() sets ->group_stop_count in sig_kernel_coredump()\npath and marks the target thread as ->group_exit_task. So any thread\nexcept group_exit_task will go to handle_group_stop()->finish_stop().\n\nHowever, when group_exit_task actually starts do_coredump(), it sets\nSIGNAL_GROUP_EXIT, but does not reset ->group_stop_count while killing\nother threads. If we have not yet stopped threads in the same thread\ngroup, they all will spin in kernel mode until group_exit_task sends them\nSIGKILL, because ->group_stop_count > 0 means:\n\n\trecalc_sigpending_tsk() never clears TIF_SIGPENDING\n\n\tget_signal_to_deliver() goes to handle_group_stop()\n\n\thandle_group_stop() returns when SIGNAL_GROUP_EXIT set\n\n\tsyscall_exit\/resume_userspace notice TIF_SIGPENDING,\n\tcall get_signal_to_deliver() again.\n\nSo we are wasting cpu cycles, and if one of these threads is rt_task() this\nmay be a serious problem.\n\nNOTE: do_coredump() holds ->mmap_sem, so not stopped threads can't escape\ncoredumping after clearing ->group_stop_count.\n\nSee also this thread: http:\/\/marc.theaimsgroup.com\/?t=112739139900002\n\nSigned-off-by: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@tv-sign.ru>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/exec.c\n+++ fs\/exec.c\n@@ -1462,6 +1462,7 @@\n \tif (!(current->signal->flags & SIGNAL_GROUP_EXIT)) {\n \t\tcurrent->signal->flags = SIGNAL_GROUP_EXIT;\n \t\tcurrent->signal->group_exit_code = exit_code;\n+\t\tcurrent->signal->group_stop_count = 0;\n \t\tretval = 0;\n \t}\n \tspin_unlock_irq(¤t->sighand->siglock);\n@@ -1477,7 +1478,6 @@\n \t * Clear any false indication of pending signals that might\n \t * be seen by the filesystem code called to write the core file.\n \t *\/\n-\tcurrent->signal->group_stop_count = 0;\n \tclear_thread_flag(TIF_SIGPENDING);\n \n \tif (current->signal->rlim[RLIMIT_CORE].rlim_cur < binfmt->min_coredump)\n"} {"commit":"9e4a36ece652908276bc4abb4324ec56292453e1","subject":"userns: Fail exec for suid and sgid binaries with ids outside our user namespace.","message":"userns: Fail exec for suid and sgid binaries with ids outside our user namespace.\n\nAcked-by: Serge Hallyn <3df611b026e4639bee8aef7a4beb2e39fcebb313@canonical.com>\nSigned-off-by: Eric W. Biederman <8a741aa8cbd77ebc4a56ddb528ce9fd15d42f034@xmission.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/exec.c\n+++ fs\/exec.c\n@@ -1291,8 +1291,11 @@\n \tif (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)) {\n \t\t\/* Set-uid? *\/\n \t\tif (mode & S_ISUID) {\n+\t\t\tif (!kuid_has_mapping(bprm->cred->user_ns, inode->i_uid))\n+\t\t\t\treturn -EPERM;\n \t\t\tbprm->per_clear |= PER_CLEAR_ON_SETID;\n \t\t\tbprm->cred->euid = inode->i_uid;\n+\n \t\t}\n \n \t\t\/* Set-gid? *\/\n@@ -1302,6 +1305,8 @@\n \t\t * executable.\n \t\t *\/\n \t\tif ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {\n+\t\t\tif (!kgid_has_mapping(bprm->cred->user_ns, inode->i_gid))\n+\t\t\t\treturn -EPERM;\n \t\t\tbprm->per_clear |= PER_CLEAR_ON_SETID;\n \t\t\tbprm->cred->egid = inode->i_gid;\n \t\t}\n"} {"commit":"7a5e873f096e04e6d8719e4ecb7b70d2decca503","subject":"signals: de_thread: simplify the ->child_reaper switching","message":"signals: de_thread: simplify the ->child_reaper switching\n\nNow that we rely on SIGNAL_UNKILLABLE flag, de_thread() doesn't need the nasty\nhack to kill the old ->child_reaper during the mt-exec.\n\nThis also means we can avoid taking tasklist_lock around zap_other_threads().\n\nSigned-off-by: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@tv-sign.ru>\nCc: Roland McGrath <0d270388f2f92757a5de0f4bd891d3b392c44c4f@redhat.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/exec.c\n+++ fs\/exec.c\n@@ -766,9 +766,7 @@\n \n \t\/*\n \t * Kill all other threads in the thread group.\n-\t * We must hold tasklist_lock to call zap_other_threads.\n \t *\/\n-\tread_lock(&tasklist_lock);\n \tspin_lock_irq(lock);\n \tif (signal_group_exit(sig)) {\n \t\t\/*\n@@ -776,21 +774,10 @@\n \t\t * return so that the signal is processed.\n \t\t *\/\n \t\tspin_unlock_irq(lock);\n-\t\tread_unlock(&tasklist_lock);\n \t\treturn -EAGAIN;\n \t}\n-\n-\t\/*\n-\t * child_reaper ignores SIGKILL, change it now.\n-\t * Reparenting needs write_lock on tasklist_lock,\n-\t * so it is safe to do it under read_lock.\n-\t *\/\n-\tif (unlikely(tsk->group_leader == task_child_reaper(tsk)))\n-\t\ttask_active_pid_ns(tsk)->child_reaper = tsk;\n-\n \tsig->group_exit_task = tsk;\n \tzap_other_threads(tsk);\n-\tread_unlock(&tasklist_lock);\n \n \t\/* Account for the thread group leader hanging around: *\/\n \tcount = thread_group_leader(tsk) ? 1 : 2;\n@@ -821,6 +808,8 @@\n \t\t\tschedule();\n \t\t}\n \n+\t\tif (unlikely(task_child_reaper(tsk) == leader))\n+\t\t\ttask_active_pid_ns(tsk)->child_reaper = tsk;\n \t\t\/*\n \t\t * The only record we have of the real-time age of a\n \t\t * process, regardless of execs it's done, is start_time.\n"} {"commit":"33f3d40cfeb42509939f053e5cb53afc83e81dd9","subject":"FT-93 Add function prototype (missed last commit unfortunately)","message":"FT-93 Add function prototype (missed last commit unfortunately)\n","repos":"ollie314\/server,kuszmaul\/PerconaFT-tmp,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT-tmp,ottok\/PerconaFT,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,percona\/PerconaFT,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT,natsys\/mariadb_10.2,davidl-zend\/zenddbi,kuszmaul\/PerconaFT-tmp,davidl-zend\/zenddbi,davidl-zend\/zenddbi,kuszmaul\/PerconaFT,flynn1973\/mariadb-aix,ollie314\/server,kuszmaul\/PerconaFT,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,percona\/PerconaFT,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,slanterns\/server,natsys\/mariadb_10.2,ollie314\/server,kuszmaul\/PerconaFT-tmp,BohuTANG\/ft-index,davidl-zend\/zenddbi,BohuTANG\/ft-index,ollie314\/server,kuszmaul\/PerconaFT,flynn1973\/mariadb-aix,ottok\/PerconaFT,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ottok\/PerconaFT,BohuTANG\/ft-index,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,ollie314\/server,BohuTANG\/ft-index,natsys\/mariadb_10.2,natsys\/mariadb_10.2,natsys\/mariadb_10.2,percona\/PerconaFT,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,percona\/PerconaFT,davidl-zend\/zenddbi,ottok\/PerconaFT,natsys\/mariadb_10.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ft\/node.h\n+++ ft\/node.h\n@@ -146,8 +146,11 @@\n \n int num_pivots() const;\n \n- \/\/ return: the sum of the keys sizes of each pivot\n+ \/\/ return: the total size of this data structure\n size_t total_size() const;\n+\n+ \/\/ return: the sum of the keys sizes of each pivot (for serialization)\n+ size_t serialized_size() const;\n \n private:\n inline size_t _align4(size_t x) const {\n"} {"commit":"7d051407d86f0c6454b64196cb3d6ac444385341","subject":"Create funcptr.c","message":"Create funcptr.c\n","repos":"wedusk101\/C","returncode":1,"stderr":"error: pathspec 'funcptr.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- funcptr.c\n+++ funcptr.c\n@@ -0,0 +1,72 @@\n+\/*Sample function to demonstrate the use of function pointers in C.*\/\n+#include <stdio.h>\n+#include <stdlib.h>\n+\n+typedef struct\n+{\n+\tint *listPtr;\n+\tint size;\n+} List;\t\n+\n+int sum(int a, int b)\n+{\n+\treturn a + b;\n+}\n+\n+int fmadd(int a, int b, int c)\n+{\n+\treturn a * b + c;\n+}\n+\n+List* genRandList(int len)\n+{\n+\tList *arr = (List*)malloc(sizeof(List));\n+\tarr->size = len;\n+\tarr->listPtr = (int*)malloc(len * sizeof(int));\n+\tfor (int i = 0; i < len; ++i)\n+\t\tarr->listPtr[i] = rand();\n+\t\n+\treturn arr;\n+}\n+\n+int operateSum(int (*sum) (int, int), int x, int y)\n+{\n+\treturn sum(x, y);\n+}\n+\n+int operateFMA(int (*fmadd) (int, int, int), int x, int y, int z)\n+{\n+\treturn fmadd(x, y, z);\n+}\n+\n+List* operateRandList(List* (*genRandList) (int), int size)\n+{\n+\treturn genRandList(size);\n+}\n+\n+int main(int argc, char **argv)\n+{\n+\tint a = 0, b = 0, c = 0, len = 0;\n+\t\n+\tprintf(\"Please enter two integers to add.\\n\");\n+\tscanf(\"%d%d\", &a, &b);\n+\tint s = operateSum(sum, a, b);\n+\tprintf(\"The sum is %d.\\n\", s);\n+\t\n+\tprintf(\"Please enter three integers for fused multiply add.\\n\");\n+\tscanf(\"%d%d%d\", &a, &b, &c);\n+\tint fma = operateFMA(fmadd, a, b, c);\n+\tprintf(\"The result of the fused multiply add operation is %d.\\n\", fma);\n+\t\n+\tprintf(\"Please enter the length of the required list of random numbers.\\n\");\n+\tscanf(\"%d\", &len);\n+\tList *arr = operateRandList(genRandList, len);\t\n+\tprintf(\"The list of random numbers is:\\n\");\n+\tfor (int i = 0; i < arr->size; ++i)\n+\t\tprintf(\"%d\\n\", arr->listPtr[i]);\n+\t\t\n+\tfree(arr->listPtr);\n+\tfree(arr);\n+\treturn 0;\n+}\n+\t"} {"commit":"2cbd50eec91aedd4e10167bac0ee53da5f9a2518","subject":"removed wait after calibration because it leads to overwriting the calibration data","message":"removed wait after calibration because it leads to overwriting the calibration data\n","repos":"aschulm\/battor,aschulm\/battor,aschulm\/battor,aschulm\/battor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fw\/main.c\n+++ fw\/main.c\n@@ -120,11 +120,6 @@\n \t\t\t\tADCA.CH0.MUXCTRL = ADC_CH_MUXPOS_PIN1_gc | ADC_CH_MUXNEG_GND_MODE3_gc; \/\/ voltage measurment\n \t\t\t\tmux_select(MUX_R); \/\/ current measurement\n \t\t\t\tg_control_calibrated = 1;\n-\n-\t\t\t\t\/\/ let the ADC settle\n-\t\t\t\tdma_stop();\n-\t\t\t\ttimer_sleep_ms(10);\n-\t\t\t\tdma_start();\n \t\t\t}\n \n \t\t\tif (g_control_mode == CONTROL_MODE_STREAM && g_control_read_ready)\n"} {"commit":"0d8fadff4034bcf01ff0c851342e801a169cc48e","subject":"only run timeout if stirring happened, save cycles for mass energy conservation","message":"only run timeout if stirring happened, save cycles for mass energy conservation\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/rnd.c\n+++ dev\/rnd.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: rnd.c,v 1.47 2001\/05\/08 17:30:56 mickey Exp $\t*\/\n+\/*\t$OpenBSD: rnd.c,v 1.48 2001\/06\/24 20:52:05 mickey Exp $\t*\/\n \n \/*\n * random.c -- A strong random number generator\n@@ -459,8 +459,9 @@\n static __inline void extract_entropy __P((register u_int8_t *, int));\n \n static __inline u_int8_t arc4_getbyte __P((void));\n-void arc4_stir __P((void));\n+static __inline void arc4_stir __P((void));\n void arc4_reinit __P((void *v));\n+void arc4maybeinit __P((void));\n \n \/* Arcfour random stream generator. This code is derived from section\n * 17.1 of Applied Cryptography, second edition, which describes a\n@@ -480,7 +481,7 @@\n * RC4 is a registered trademark of RSA Laboratories.\n *\/\n \n-void\n+static __inline void\n arc4_stir(void)\n {\n \tu_int8_t buf[256];\n@@ -528,24 +529,28 @@\n \treturn arc4random_state.s[(si + sj) & 0xff];\n }\n \n-static __inline void\n+void\n arc4maybeinit(void)\n {\n+\textern int hz;\n+\n \tif (!arc4random_initialized) {\n \t\tarc4random_initialized++;\n \t\tarc4_stir();\n+\t\t\/* 10 minutes, per dm@'s suggestion *\/\n+\t\ttimeout_add(&arc4_timeout, 10 * 60 * hz);\n \t}\n }\n \n+\/*\n+ * called by timeout to mark arc4 for stirring,\n+ * actuall stirring happens on any access attempt.\n+ *\/\n void\n arc4_reinit(v)\n \tvoid *v;\n {\n-\textern int hz;\n-\n \tarc4random_initialized = 0;\n-\t\/* 10 minutes, per dm@'s suggestion *\/\n-\ttimeout_add(&arc4_timeout, 10 * 60 * hz);\n }\n \n int\n@@ -747,7 +752,7 @@\n \n \t\t\/*\n \t\t * the logic is to drop low-entropy entries,\n-\t\t * in hope for dequeuing to be more sourcefull\n+\t\t * in hope for dequeuing to be more randomfull\n \t\t *\/\n \t\tif (rnd_qlen() > QEVSLOW && nbits < QEVSBITS) {\n \t\t\trndstats.rnd_drople++;\n"} {"commit":"6e2e16d1ac4206101a2a25a5b8bf1c66d0f1d116","subject":"fix accounting bug on extraction - we were incorrectly subtracting many times the amount requested from the pool's entropy estimate; ok mickey@ deraadt@","message":"fix accounting bug on extraction - we were incorrectly subtracting many times\nthe amount requested from the pool's entropy estimate; ok mickey@ deraadt@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/rnd.c\n+++ dev\/rnd.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: rnd.c,v 1.77 2005\/05\/27 16:33:27 ho Exp $\t*\/\n+\/*\t$OpenBSD: rnd.c,v 1.78 2005\/07\/07 00:11:24 djm Exp $\t*\/\n \n \/*\n * rnd.c -- A strong random number generator\n@@ -889,24 +889,28 @@\n {\n \tstruct random_bucket *rs = &random_state;\n \tu_char buffer[16];\n+\tMD5_CTX tmp;\n+\tu_int i;\n+\tint s;\n \n \tadd_timer_randomness(nbytes);\n \n \twhile (nbytes) {\n-\t\tMD5_CTX tmp;\n-\t\tint i, s;\n+\t\tif (nbytes < sizeof(buffer) \/ 2)\n+\t\t\ti = nbytes;\n+\t\telse\n+\t\t\ti = sizeof(buffer) \/ 2;\n \n \t\t\/* Hash the pool to get the output *\/\n \t\tMD5Init(&tmp);\n \t\ts = splhigh();\n \t\tMD5Update(&tmp, (u_int8_t*)rs->pool, sizeof(rs->pool));\n-\t\tif (rs->entropy_count \/ 8 > nbytes)\n-\t\t\trs->entropy_count -= nbytes * 8;\n+\t\tif (rs->entropy_count \/ 8 > i)\n+\t\t\trs->entropy_count -= i * 8;\n \t\telse\n \t\t\trs->entropy_count = 0;\n \t\tsplx(s);\n \t\tMD5Final(buffer, &tmp);\n-\t\tbzero(&tmp, sizeof(tmp));\n \n \t\t\/*\n \t\t * In case the hash function has some recognizable\n@@ -922,10 +926,7 @@\n \t\tbuffer[7] ^= buffer[ 8];\n \n \t\t\/* Copy data to destination buffer *\/\n-\t\tif (nbytes < sizeof(buffer) \/ 2)\n-\t\t\tbcopy(buffer, buf, i = nbytes);\n-\t\telse\n-\t\t\tbcopy(buffer, buf, i = sizeof(buffer) \/ 2);\n+\t\tbcopy(buffer, buf, i);\n \t\tnbytes -= i;\n \t\tbuf += i;\n \n@@ -935,6 +936,7 @@\n \t}\n \n \t\/* Wipe data from memory *\/\n+\tbzero(&tmp, sizeof(tmp));\n \tbzero(&buffer, sizeof(buffer));\n }\n \n"} {"commit":"f6959ba09ef1b55d4b7b6f7efd29217e132ca2bf","subject":" Fix memory object compile problems.","message":" Fix memory object compile problems.\n","repos":"themperek\/iverilog,CastMi\/iverilog,CastMi\/iverilog,CastMi\/iverilog,themperek\/iverilog,themperek\/iverilog","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- vvm\/vvm_gates.h\n+++ vvm\/vvm_gates.h\n@@ -19,7 +19,7 @@\n * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n *\/\n #if !defined(WINNT) && !defined(macintosh)\n-#ident \"$Id: vvm_gates.h,v 1.54 2000\/04\/01 21:40:23 steve Exp $\"\n+#ident \"$Id: vvm_gates.h,v 1.55 2000\/04\/08 05:49:59 steve Exp $\"\n #endif\n \n # include \"vvm.h\"\n@@ -516,8 +516,8 @@\n \t }\n \n void send_out_()\n-\t { vpip_bit_t*ov_bits[WIDTH];\n-\t vvm_bitset_t ov(bits, WIDTH);\n+\t { vpip_bit_t ov_bits[WIDTH];\n+\t vvm_bitset_t ov(ov_bits, WIDTH);\n \t mem_->get_word(addr_val_, ov);\n \t for (unsigned bit = 0 ; bit < WIDTH ; bit += 1) {\n \t\t vvm_out_event*ev = new vvm_out_event(ov[bit], out_+bit);\n@@ -867,6 +867,9 @@\n \n \/*\n * $Log: vvm_gates.h,v $\n+ * Revision 1.55 2000\/04\/08 05:49:59 steve\n+ * Fix memory object compile problems.\n+ *\n * Revision 1.54 2000\/04\/01 21:40:23 steve\n * Add support for integer division.\n *\n"} {"commit":"bf585a584971a2a145e7730a2a43256284fa8725","subject":"Add newline to clean up progress messages","message":"Add newline to clean up progress messages\n","repos":"mapbox\/tippecanoe,mapbox\/tippecanoe,joykuotw\/tippecanoe,mapbox\/tippecanoe,mapbox\/tippecanoe,joykuotw\/tippecanoe","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- geojson.c\n+++ geojson.c\n@@ -1566,6 +1566,9 @@\n \t\t\t\tix->end = geompos;\n \t\t\t}\n \t\t}\n+\t\tif (!quiet) {\n+\t\t\tfprintf(stderr, \"\\n\");\n+\t\t}\n \n \t\tfclose(geomfile);\n \n"} {"commit":"48c773d1432a29405f7a4834c22dbc3f25eb1f31","subject":"M ...","message":"M ...\n","repos":"dawter\/tools,dawter\/tools,dawter\/tools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- get_min.c\n+++ get_min.c\n@@ -1,4 +1,5 @@\n #include <stdio.h>\n+#include <assert.h>\n \n \/*\n * Given an integer X, design an algorithm to find the nteger Y that is just larger than X\n@@ -9,12 +10,48 @@\n int get_min(int x)\n {\n \tint ret = 0;\n+\tint loc = 1;\n+\n+\twhile( x>10 ) {\n+\t\tret *= 10;\n+\t\tret += 3;\n+\t\tloc *= 10;\n+\t\tx\/=10;\n+\t}\n+\n+\tif( x >0 && x < 3) {\n+\t\tret = ret + loc*3;\n+\t}\n+\telse if( x>=3 && x<5) {\n+\t\tret = ret + loc*5;\n+\t}\n+\telse {\n+\t\tret = ret + loc*33;\n+\t}\n \n \treturn ret;\n }\n \n+void test()\n+{\n+\tassert()\n+}\n+\n int main(int argc, char** argv)\n {\n-\t\n+\tint x = 3;\n+\n+\tif(argc > 1) {\n+\t\tx = atoi(argv[1]);\n+\t}\n+\telse {\n+\t\tprintf(\"inpu x:\");\n+\t\tscanf(\"%d\", &x);\n+\t}\n+\n+\tprintf(\"x: %d\\n\", x);\n+\tprintf(\"y: %d\\n\", get_min(x));\n+\n \treturn 0;\n }\n+\n"} {"commit":"8ea672565487afa00545fb5f55051971a1d52c43","subject":"When using glClear with the scissor test enabled, limit the clear rectangle to the scissor rectangle.","message":"When using glClear with the scissor test enabled, limit the clear\nrectangle to the scissor rectangle.\n","repos":"jsgf\/pspgl,jsgf\/pspgl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- glClear.c\n+++ glClear.c\n@@ -14,6 +14,7 @@\n \tstruct pspgl_surface *s = pspgl_curctx->draw;\n \tunsigned long clearmask = pspgl_curctx->clear.color;\n \tunsigned long clearmode = 0;\n+\tunsigned x, y, width, height;\n \n \tif (mask & ~(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)) {\n \t\tGLERROR(GL_INVALID_VALUE);\n@@ -44,14 +45,26 @@\n \tif (s->depth_buffer && (mask & GL_DEPTH_BUFFER_BIT))\n \t\tclearmode |= GU_DEPTH_BUFFER_BIT;\n \n+\tif (pspgl_curctx->scissor_test.enabled) {\n+\t\tx = pspgl_curctx->scissor_test.x;\n+\t\ty = pspgl_curctx->scissor_test.y;\n+\t\twidth = pspgl_curctx->scissor_test.width;\n+\t\theight = pspgl_curctx->scissor_test.height;\n+\t} else {\n+\t\tx = 0;\n+\t\ty = 0;\n+\t\twidth = s->width;\n+\t\theight = s->height;\n+\t}\n+\n \tvbuf[0].color = clearmask;\n-\tvbuf[0].x = 0;\n-\tvbuf[0].y = 0;\n+\tvbuf[0].x = x;\n+\tvbuf[0].y = s->height - y;\n \tvbuf[0].z = pspgl_curctx->clear.depth;\n \n \tvbuf[1].color = clearmask;\n-\tvbuf[1].x = s->width;\n-\tvbuf[1].y = s->height;\n+\tvbuf[1].x = x + width;\n+\tvbuf[1].y = s->height - (y + height);\n \tvbuf[1].z = pspgl_curctx->clear.depth;\n \n \t\/* enable clear mode *\/\n"} {"commit":"2bdb141282b6253d694400ec63093454233a6c04","subject":"more initial stacking tuning","message":"more initial stacking tuning\n","repos":"seanpringle\/goomwwm,seanpringle\/goomwwm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- goomwwm.c\n+++ goomwwm.c\n@@ -3297,10 +3297,6 @@\n \t\t\tclient_activate(c, RAISE, WARPDEF);\n \t\t} else\n \t\t{\n-\t\t\t\/\/ update focus history order. pretend this window has been activated before\n-\t\t\twinlist_forget(windows_activated, c->window);\n-\t\t\twinlist_prepend(windows_activated, c->window, NULL);\n-\t\t\tclient_flash(c, config_flash_on, config_flash_ms);\n \t\t\t\/\/ if on current tag, place new window under active window and next in activate-order\n \t\t\tif (c->cache->tags & current_tag && (a = window_active_client(c->xattr.root, current_tag)) && a->window != c->window)\n \t\t\t{\n@@ -3308,7 +3304,13 @@\n \t\t\t\twinlist_forget(windows_activated, a->window);\n \t\t\t\twinlist_append(windows_activated, c->window, NULL);\n \t\t\t\twinlist_append(windows_activated, a->window, NULL);\n+\t\t\t} else\n+\t\t\t{\n+\t\t\t\t\/\/ TODO: make this smart enough to place window on top on another tag\n+\t\t\t\twinlist_forget(windows_activated, c->window);\n+\t\t\t\twinlist_prepend(windows_activated, c->window, NULL);\n \t\t\t}\n+\t\t\tclient_flash(c, config_flash_on, config_flash_ms);\n \t\t}\n \t\t\/\/ post-placement rules. yes, can do both contract and expand in one rule. it makes sense...\n \t\tunsigned int tag = current_tag; current_tag = desktop_to_tag(tag_to_desktop(c->cache->tags));\n"} {"commit":"baaa935a39420369fe15c03d70e3c2fe30758106","subject":"internal code cleanup","message":"internal code cleanup\n","repos":"kristopolous\/graphit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- graphit.h\n+++ graphit.h\n@@ -58,21 +58,25 @@\n int width, int height,\n float min, float max);\n \n- \/\/ Takes the vector data and does\n+ \/\/ Takes the vector, data, and does\n \/\/ a linear interpolation of it to\n- \/\/ a width, width, into the vector\n- \/\/ interpolated. Returns 0 on success.\n+ \/\/ a width, width, into a vector\n+ \/\/ of floats, interpolated. \n+ \/\/\n+ \/\/ Returns 0 on success.\n int interpolate(\n vector<float> &interpolated, \n vector<float> data, \n int width);\n \n- \/\/ Takes a vector interpolated,\n- \/\/ a plotting height, height, and\n- \/\/ a minimum and maximum to plot,\n- \/\/ min and max, and scales the \n- \/\/ interpolation to values\n- \/\/ which can be plotted.\n+ \/\/ Takes a vector of floats, \n+ \/\/ interpolated, a plotting height, \n+ \/\/ height, and a minimum and \n+ \/\/ maximum to plot, min and max, \n+ \/\/ and scales the interpolation \n+ \/\/ to values which can be plotted,\n+ \/\/ depositing those in a vector\n+ \/\/ of floats, rasterized.\n \/\/\n \/\/ Returns 0 on success.\n int rasterize(\n@@ -83,9 +87,10 @@\n \n \/\/ Takes a vector, rasterized,\n \/\/ and a given width and height,\n- \/\/ and fills up a vector of wstrings\n- \/\/ with the character set according\n- \/\/ to those values\n+ \/\/ and fills up a vector of wstrings,\n+ \/\/ buffer, with the character set\n+ \/\/ specified to the static use_unicode()\n+ \/\/ according to those values.\n \/\/\n \/\/ Returns 0 on success.\n int plot(\n@@ -95,7 +100,7 @@\n \n \n \/\/ The plotting charset, defined\n- \/\/ statically through use_unicode\n+ \/\/ statically through use_unicode()\n static wstring m_charset;\n };\n \n"} {"commit":"4f8c9bda90a84bc49d2bd1f566526d5c7314a457","subject":"Just mucking around","message":"Just mucking around\n","repos":"Tuckers\/gravity,Tuckers\/gravity","returncode":1,"stderr":"error: pathspec 'gravity.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- gravity.c\n+++ gravity.c\n@@ -0,0 +1,49 @@\n+#include <simple2d.h>\n+\n+int height = 960;\n+int width = 540;\n+\n+void on_key(S2D_Event e, const char *key) {\n+ switch (e) {\n+ case S2D_KEYDOWN:\n+ printf(\"Key %s pressed\\n\", key);\n+ break;\n+\n+ case S2D_KEY:\n+ printf(\"Key %s held down\\n\", key);\n+ break;\n+\n+ case S2D_KEYUP:\n+ printf(\"Key %s released\\n\", key);\n+ break;\n+ }\n+}\n+\n+void render() {\n+ S2D_DrawTriangle(\n+ 320, 50, 1, 0, 0, 1,\n+ 540, 430, 0, 1, 0, 1,\n+ 100, 430, 0, 0, 1, 1\n+ );\n+}\n+\n+int main() {\n+\n+ S2D_Diagnostics(true);\n+ S2D_Window *window = S2D_CreateWindow(\n+ \"Gravity\", width, height, NULL, render, 0\n+ );\n+\n+ \/\/ Cap the frame rate, 60 frames per second by default\n+ window->fps_cap = 60;\n+\n+ \/\/ Set the window background color, black by default\n+ window->background.r = 1.0;\n+ window->background.g = 0.5;\n+ window->background.b = 0.8;\n+ window->on_key = on_key;\n+\n+ S2D_Show(window);\n+ S2D_FreeWindow(window);\n+ return 0;\n+}\n"} {"commit":"49d6d0a18de53ad49685cf8b38a66cd371d81fab","subject":"Codding style: bad identation","message":"Codding style: bad identation\n","repos":"Kurento\/kurento-media-server,mparis\/kurento-media-server,lulufei\/kurento-media-server,TribeMedia\/kurento-media-server,mparis\/kurento-media-server,Kurento\/kurento-media-server,TribeMedia\/kurento-media-server,todotobe1\/kurento-media-server,todotobe1\/kurento-media-server,shelsonjava\/kurento-media-server,shelsonjava\/kurento-media-server,lulufei\/kurento-media-server","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/kms-sdp-media.c\n+++ src\/core\/kms-sdp-media.c\n@@ -441,9 +441,9 @@\n \tg_object_class_install_property(gobject_class, PROP_MODE, pspec);\n \n \tpspec = g_param_spec_enum(\"type\", \"Media Type\",\n-\t\t\t\t \"The connection media type\",\n-\t\t\t KMS_MEDIA_TYPE, KMS_MEDIA_TYPE_UNKNOWN,\n-\t\t\t G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);\n+\t\t\t\t\"The connection media type\",\n+\t\t\t\tKMS_MEDIA_TYPE, KMS_MEDIA_TYPE_UNKNOWN,\n+\t\t\t\tG_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE);\n \n \tg_object_class_install_property(gobject_class, PROP_TYPE, pspec);\n \n"} {"commit":"3533fb08129e4416256f8cae2cdc75e29cd03a1f","subject":"leaf move","message":"leaf move\n","repos":"felix-halim\/c-tree,felix-halim\/c-tree,felix-halim\/c-tree","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ctree_exp_leafsize.h\n+++ src\/ctree_exp_leafsize.h\n@@ -805,11 +805,13 @@\n if (slack >= INTERNAL_BSIZE)\n return leaf_compact(b, start, i);\n } else {\n+ return false;\n \/\/ if (slack) fprintf(stderr, \"gathered slack = %d, %d\\n\", slack, i - start);\n slack = 0;\n start = i + 1;\n }\n }\n+ fprintf(stderr, \"gathered slack = %d\\n\", slack);\n return false;\n }\n \n@@ -848,12 +850,12 @@\n ret = make_pair(true, BUCKET(p.first)->D[pos]);\n \n \/\/ OPTIONAL optimization:\n- \/*\n+ \n int parent = BUCKET(p.first)->parent;\n if (parent != -1) {\n leaf_compact(parent);\n }\n- *\/\n+ \n } else {\n int b = BUCKET(p.first)->parent;\n while (b != -1) {\n"} {"commit":"22d75c07385710008de0b5c8b863b840c7299618","subject":"Corretti i tipi di ritorno di JTransmissionMethod","message":"Corretti i tipi di ritorno di JTransmissionMethod\n","repos":"alessandro1105\/Jack_Arduino_Library","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- JTransmissionMethod.h\n+++ JTransmissionMethod.h\n@@ -26,9 +26,9 @@\n \n \tpublic:\n \t\t\n-\t\tvirtual int receive(char *buffer, int size); \/\/deve restituire il messaggio da passare a Jack\n+\t\tvirtual size_t receive(char *buffer, int size); \/\/deve restituire il messaggio da passare a Jack\n \t\tvirtual void send(char *message, int length); \/\/invia il messaggio\n-\t\tvirtual int available(); \/\/restituisce true se ci sono dati da ricevere nel buffer\n+\t\tvirtual size_t available(); \/\/restituisce true se ci sono dati da ricevere nel buffer\n \n };\n \n"} {"commit":"549596dbd78f3810732e21a1fecb64fb47ce7168","subject":"Changed SD advdata in gateway example, now has semi-unique device names","message":"Changed SD advdata in gateway example, now has semi-unique\ndevice names\n","repos":"mrquincle\/nRF51-ble-bcast-mesh,ihassin\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,ihassin\/nRF51-ble-bcast-mesh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/BLE_Gateway\/nrf_adv_conn.c\n+++ examples\/BLE_Gateway\/nrf_adv_conn.c\n@@ -55,7 +55,7 @@\n *****************************************************************************\/\n \n \/* Advertisement data *\/\n-static uint8_t ble_adv_man_data[] = {0x01 \/* PDU_ID *\/, 0xA0, 0xA1, 0xA2, 0xA3};\n+\/\/static uint8_t ble_adv_man_data[] = {0x01 \/* PDU_ID *\/, 0xA0, 0xA1, 0xA2, 0xA3};\n \n \/* BLE advertisement parameters *\/\n static ble_gap_adv_params_t ble_adv_params = {\n@@ -138,21 +138,29 @@\n \n \/* Fill advertisement data struct: *\/\n uint8_t flags = BLE_GAP_ADV_FLAG_BR_EDR_NOT_SUPPORTED;\n- ble_advdata_manuf_data_t man_data;\n- man_data.company_identifier = 0x004C;\n- man_data.data.p_data = &ble_adv_man_data[0];\n- man_data.data.size = 5;\n \n memset(&ble_adv_data, 0, sizeof(ble_adv_data));\n \n ble_adv_data.flags.size = 1;\n ble_adv_data.flags.p_data = &flags;\n ble_adv_data.name_type = BLE_ADVDATA_FULL_NAME;\n- ble_adv_data.p_manuf_specific_data = &man_data;\n+ \/\/ble_adv_data.p_manuf_specific_data = &man_data;\n \n+ ble_gap_conn_sec_mode_t name_sec_mode = {1, 1};\n+ ble_gap_addr_t my_addr;\n+ \n+ error_code = sd_ble_gap_address_get(&my_addr);\n+ APP_ERROR_CHECK(error_code);\n+ \n+ char name[64];\n+ sprintf(name, \"rbc_mesh #%d\", \n+ ((uint16_t) my_addr.addr[4] << 8) | (my_addr.addr[5]));\n+ \n+ error_code = sd_ble_gap_device_name_set(&name_sec_mode, (uint8_t*) name, strlen(name));\n+ APP_ERROR_CHECK(error_code);\n+ \n \/* Set advertisement data with ble_advdata-lib *\/\n error_code = ble_advdata_set(&ble_adv_data, NULL);\n-\n APP_ERROR_CHECK(error_code);\n \n \/* Start advertising *\/\n"} {"commit":"b4c84796d3746016938c553156880838ff3ac84e","subject":"zen board","message":"zen board\n","repos":"Dauie\/ft_db","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- db_printdb.c\n+++ db_printdb.c\n@@ -15,24 +15,27 @@\n \n void\tdb_printhelp(void)\n {\n-\tprintf(\".\/ft_db -mode [table \/ dir] [key] [value \/ new value ...]\\n\");\n-\tprintf(\"\t_________________________________\\n\");\n-\tprintf(\"\t| \\033[01;31m%s\\033[0m \\033[22;31mZEN\\033[0m \\033[01;31m%s\\033[0m \\033[22;31mDATA\\033[0m \\033[01;31m%s\\033[0m |\\n\", G_EDIV, G_TSYM, G_EDIV);\n-\tprintf(\"\t| |\\n\");\n-\tprintf(\"\t| \\033[22;31m%s\\033[0m :\ttable symbol |\\n\", G_TSYM);\n-\tprintf(\"\t| \\033[22;31m%s\\033[0m :\tentry symbol |\\n\", G_ESYM);\n-\tprintf(\"\t| \\033[01;31m-_-_-_-_\\033[0m \\033[22;31mLegend\\033[0m \\033[01;31m-_-_-_-_\\033[0m |\\n\");\n-\tprintf(\"\t| |\\n\");\n-\tprintf(\"\t| \\033[01;31m-ae\\033[0m : add entry |\\n\");\n-\tprintf(\"\t| \\033[01;31m-dt\\033[0m : delete table |\\n\");\n-\tprintf(\"\t| \\033[01;31m-dt\\033[0m : delete entry |\\n\");\n-\tprintf(\"\t| \\033[01;31m-dv\\033[0m : delete entry's value |\\n\");\n-\tprintf(\"\t| \\033[01;31m-pd\\033[0m : print entire DB |\\n\");\n-\tprintf(\"\t| \\033[01;31m-pt\\033[0m : print table |\\n\");\n-\tprintf(\"\t| \\033[01;31m-ptm\\033[0m: print table info |\\n\");\n-\tprintf(\"\t| \\033[01;31m-pe\\033[0m : print entry |\\n\");\n-\tprintf(\"\t| \\033[01;31m-xe\\033[0m : export db |\\n\");\n-\tprintf(\"\t_________________________________\\n\");\n+\t\tprintf(\".\/ft_db -mode [table] [key] [value \/ new value ...]\\n\");\n+ \tprintf(\"\t________________________________\\n\");\n+ \tprintf(\"\t%s %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m%s\\033[0m \\033[01;31mZEN\\033[0m \\033[22;31m%s\\033[0m \\033[01;31mDATA\\033[0m \\033[22;31m%s\\033[0m %s\\n\", G_DLIN, G_EDIV, G_TSYM, G_EDIV, G_DLIN);\n+ \tprintf(\"\t%s %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m%s\\033[0m :\ttable symbol %s\\n\", G_DLIN, G_TSYM, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m%s\\033[0m :\tentry symbol %s\\n\", G_DLIN, G_ESYM, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-_-_-_-_\\033[0m \\033[01;31mLegend\\033[0m \\033[22;31m_-_-_-_-\\033[0m %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-ae\\033[0m : add entry %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-dt\\033[0m : delete table %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-de\\033[0m : delete entry %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-dv\\033[0m : delete entry's value %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-pd\\033[0m : print entire DB %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-pt\\033[0m : print table %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-ptm\\033[0m: print table info %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-pe\\033[0m : print entry %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-xt\\033[0m : export table %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s \\033[22;31m-xe\\033[0m : export entry %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s %s\\n\", G_DLIN, G_DLIN);\n+ \tprintf(\"\t%s_______________________________%s\\n\", G_DLIN, G_DLIN);\n }\n \n void\tdb_printdb(t_tnode *t_tree)\n@@ -110,4 +113,3 @@\n \t\tprintf(\"%s %s\", entry->cmembr[i], G_EDIV);\n \tprintf(\"\\n\");\n }\n-\n"} {"commit":"aa2430e5ad9342c73acbfa29463676832c3b7b41","subject":"Add MainChannelClientPrivate struct","message":"Add MainChannelClientPrivate struct\n\nEncapsulate private data and prepare for port to GObject\n\nAcked-by: Frediano Ziglio <fziglio@redhat.com\n","repos":"fgouget\/spice,fgouget\/spice,fgouget\/spice,fgouget\/spice","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- server\/main-channel-client.c\n+++ server\/main-channel-client.c\n@@ -42,8 +42,8 @@\n #define CLIENT_CONNECTIVITY_TIMEOUT (MSEC_PER_SEC * 30)\n #define PING_INTERVAL (MSEC_PER_SEC * 10)\n \n-struct MainChannelClient {\n- RedChannelClient base;\n+typedef struct MainChannelClientPrivate MainChannelClientPrivate;\n+struct MainChannelClientPrivate {\n uint32_t connection_id;\n uint32_t ping_id;\n uint32_t net_test_id;\n@@ -62,6 +62,12 @@\n int seamless_mig_dst;\n };\n \n+struct MainChannelClient {\n+ RedChannelClient base;\n+\n+ MainChannelClientPrivate priv[1];\n+};\n+\n typedef struct RedPingPipeItem {\n RedPipeItem base;\n int size;\n@@ -141,15 +147,15 @@\n \n void main_channel_client_start_net_test(MainChannelClient *mcc, int test_rate)\n {\n- if (!mcc || mcc->net_test_id) {\n+ if (!mcc || mcc->priv->net_test_id) {\n return;\n }\n if (test_rate) {\n if (main_channel_client_push_ping(mcc, NET_TEST_WARMUP_BYTES)\n && main_channel_client_push_ping(mcc, 0)\n && main_channel_client_push_ping(mcc, NET_TEST_BYTES)) {\n- mcc->net_test_id = mcc->ping_id - 2;\n- mcc->net_test_stage = NET_TEST_STAGE_WARMUP;\n+ mcc->priv->net_test_id = mcc->priv->ping_id - 2;\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_WARMUP;\n }\n } else {\n red_channel_client_start_connectivity_monitoring(&mcc->base, CLIENT_CONNECTIVITY_TIMEOUT);\n@@ -253,7 +259,7 @@\n {\n RedPipeItem *item;\n \n- item = main_init_item_new(mcc->connection_id, display_channels_hint,\n+ item = main_init_item_new(mcc->priv->connection_id, display_channels_hint,\n current_mouse_mode, is_client_mouse_allowed,\n multi_media_time, ram_hint);\n red_channel_client_pipe_add_push(&mcc->base, item);\n@@ -339,12 +345,12 @@\n {\n RedClient *client = red_channel_client_get_client(&mcc->base);\n spice_printerr(\"client %p connected: %d seamless %d\", client, success, seamless);\n- if (mcc->mig_wait_connect) {\n+ if (mcc->priv->mig_wait_connect) {\n RedChannel *channel = red_channel_client_get_channel(&mcc->base);\n MainChannel *main_channel = SPICE_CONTAINEROF(channel, MainChannel, base);\n \n- mcc->mig_wait_connect = FALSE;\n- mcc->mig_connect_ok = success;\n+ mcc->priv->mig_wait_connect = FALSE;\n+ mcc->priv->mig_connect_ok = success;\n spice_assert(main_channel->num_clients_mig_wait);\n spice_assert(!seamless || main_channel->num_clients_mig_wait == 1);\n if (!--main_channel->num_clients_mig_wait) {\n@@ -363,7 +369,7 @@\n {\n RedChannel *channel = red_channel_client_get_channel(&mcc->base);\n if (reds_on_migrate_dst_set_seamless(channel->reds, mcc, src_version)) {\n- mcc->seamless_mig_dst = TRUE;\n+ mcc->priv->seamless_mig_dst = TRUE;\n red_channel_client_pipe_add_empty_msg(&mcc->base,\n SPICE_MSG_MAIN_MIGRATE_DST_SEAMLESS_ACK);\n } else {\n@@ -378,38 +384,38 @@\n \n roundtrip = g_get_monotonic_time() - ping->timestamp;\n \n- if (ping->id == mcc->net_test_id) {\n- switch (mcc->net_test_stage) {\n+ if (ping->id == mcc->priv->net_test_id) {\n+ switch (mcc->priv->net_test_stage) {\n case NET_TEST_STAGE_WARMUP:\n- mcc->net_test_id++;\n- mcc->net_test_stage = NET_TEST_STAGE_LATENCY;\n- mcc->latency = roundtrip;\n+ mcc->priv->net_test_id++;\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_LATENCY;\n+ mcc->priv->latency = roundtrip;\n break;\n case NET_TEST_STAGE_LATENCY:\n- mcc->net_test_id++;\n- mcc->net_test_stage = NET_TEST_STAGE_RATE;\n- mcc->latency = MIN(mcc->latency, roundtrip);\n+ mcc->priv->net_test_id++;\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_RATE;\n+ mcc->priv->latency = MIN(mcc->priv->latency, roundtrip);\n break;\n case NET_TEST_STAGE_RATE:\n- mcc->net_test_id = 0;\n- if (roundtrip <= mcc->latency) {\n+ mcc->priv->net_test_id = 0;\n+ if (roundtrip <= mcc->priv->latency) {\n \/\/ probably high load on client or server result with incorrect values\n spice_printerr(\"net test: invalid values, latency %\" PRIu64\n \" roundtrip %\" PRIu64 \". assuming high\"\n- \"bandwidth\", mcc->latency, roundtrip);\n- mcc->latency = 0;\n- mcc->net_test_stage = NET_TEST_STAGE_INVALID;\n+ \"bandwidth\", mcc->priv->latency, roundtrip);\n+ mcc->priv->latency = 0;\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_INVALID;\n red_channel_client_start_connectivity_monitoring(&mcc->base,\n CLIENT_CONNECTIVITY_TIMEOUT);\n break;\n }\n- mcc->bitrate_per_sec = (uint64_t)(NET_TEST_BYTES * 8) * 1000000\n- \/ (roundtrip - mcc->latency);\n- mcc->net_test_stage = NET_TEST_STAGE_COMPLETE;\n+ mcc->priv->bitrate_per_sec = (uint64_t)(NET_TEST_BYTES * 8) * 1000000\n+ \/ (roundtrip - mcc->priv->latency);\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_COMPLETE;\n spice_printerr(\"net test: latency %f ms, bitrate %\"PRIu64\" bps (%f Mbps)%s\",\n- (double)mcc->latency \/ 1000,\n- mcc->bitrate_per_sec,\n- (double)mcc->bitrate_per_sec \/ 1024 \/ 1024,\n+ (double)mcc->priv->latency \/ 1000,\n+ mcc->priv->bitrate_per_sec,\n+ (double)mcc->priv->bitrate_per_sec \/ 1024 \/ 1024,\n main_channel_client_is_low_bandwidth(mcc) ? \" LOW BANDWIDTH\" : \"\");\n red_channel_client_start_connectivity_monitoring(&mcc->base,\n CLIENT_CONNECTIVITY_TIMEOUT);\n@@ -417,9 +423,9 @@\n default:\n spice_printerr(\"invalid net test stage, ping id %d test id %d stage %d\",\n ping->id,\n- mcc->net_test_id,\n- mcc->net_test_stage);\n- mcc->net_test_stage = NET_TEST_STAGE_INVALID;\n+ mcc->priv->net_test_id,\n+ mcc->priv->net_test_stage);\n+ mcc->priv->net_test_stage = NET_TEST_STAGE_INVALID;\n }\n return;\n } else {\n@@ -451,19 +457,19 @@\n \n void main_channel_client_migrate_cancel_wait(MainChannelClient *mcc)\n {\n- if (mcc->mig_wait_connect) {\n+ if (mcc->priv->mig_wait_connect) {\n spice_printerr(\"client %p cancel wait connect\",\n red_channel_client_get_client(&mcc->base));\n- mcc->mig_wait_connect = FALSE;\n- mcc->mig_connect_ok = FALSE;\n- }\n- mcc->mig_wait_prev_complete = FALSE;\n+ mcc->priv->mig_wait_connect = FALSE;\n+ mcc->priv->mig_connect_ok = FALSE;\n+ }\n+ mcc->priv->mig_wait_prev_complete = FALSE;\n }\n \n void main_channel_client_migrate_dst_complete(MainChannelClient *mcc)\n {\n- if (mcc->mig_wait_prev_complete) {\n- if (mcc->mig_wait_prev_try_seamless) {\n+ if (mcc->priv->mig_wait_prev_complete) {\n+ if (mcc->priv->mig_wait_prev_try_seamless) {\n RedChannel *channel = red_channel_client_get_channel(&mcc->base);\n spice_assert(g_list_length(channel->clients) == 1);\n red_channel_client_pipe_add_type(&mcc->base,\n@@ -471,8 +477,8 @@\n } else {\n red_channel_client_pipe_add_type(&mcc->base, RED_PIPE_ITEM_TYPE_MAIN_MIGRATE_BEGIN);\n }\n- mcc->mig_wait_connect = TRUE;\n- mcc->mig_wait_prev_complete = FALSE;\n+ mcc->priv->mig_wait_connect = TRUE;\n+ mcc->priv->mig_wait_prev_complete = FALSE;\n }\n }\n \n@@ -483,7 +489,7 @@\n RedClient *client = red_channel_client_get_client(&mcc->base);\n int semi_seamless_support = red_channel_client_test_remote_cap(&mcc->base,\n SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE);\n- if (semi_seamless_support && mcc->mig_connect_ok) {\n+ if (semi_seamless_support && mcc->priv->mig_connect_ok) {\n if (success) {\n spice_printerr(\"client %p MIGRATE_END\", client);\n red_channel_client_pipe_add_empty_msg(&mcc->base, SPICE_MSG_MAIN_MIGRATE_END);\n@@ -498,8 +504,8 @@\n red_channel_client_pipe_add_type(&mcc->base, RED_PIPE_ITEM_TYPE_MAIN_MIGRATE_SWITCH_HOST);\n }\n }\n- mcc->mig_connect_ok = FALSE;\n- mcc->mig_wait_connect = FALSE;\n+ mcc->priv->mig_connect_ok = FALSE;\n+ mcc->priv->mig_wait_connect = FALSE;\n \n return ret;\n }\n@@ -514,11 +520,11 @@\n main_channel_client_push_ping(mcc, 0);\n } else if (!strcmp(opt, \"on\")) {\n if (has_interval && interval > 0) {\n- mcc->ping_interval = interval * MSEC_PER_SEC;\n+ mcc->priv->ping_interval = interval * MSEC_PER_SEC;\n }\n- reds_core_timer_start(channel->reds, mcc->ping_timer, mcc->ping_interval);\n+ reds_core_timer_start(channel->reds, mcc->priv->ping_timer, mcc->priv->ping_interval);\n } else if (!strcmp(opt, \"off\")) {\n- reds_core_timer_cancel(channel->reds, mcc->ping_timer);\n+ reds_core_timer_cancel(channel->reds, mcc->priv->ping_timer);\n } else {\n return;\n }\n@@ -531,11 +537,11 @@\n \n if (!red_channel_client_is_connected(&mcc->base)) {\n spice_printerr(\"not connected to peer, ping off\");\n- reds_core_timer_cancel(channel->reds, mcc->ping_timer);\n+ reds_core_timer_cancel(channel->reds, mcc->priv->ping_timer);\n return;\n }\n do_ping_client(mcc, NULL, 0, 0);\n- reds_core_timer_start(channel->reds, mcc->ping_timer, mcc->ping_interval);\n+ reds_core_timer_start(channel->reds, mcc->priv->ping_timer, mcc->priv->ping_interval);\n }\n #endif \/* RED_STATISTICS *\/\n \n@@ -549,36 +555,36 @@\n client, stream, FALSE, num_common_caps,\n common_caps, num_caps, caps);\n spice_assert(mcc != NULL);\n- mcc->connection_id = connection_id;\n- mcc->bitrate_per_sec = ~0;\n+ mcc->priv->connection_id = connection_id;\n+ mcc->priv->bitrate_per_sec = ~0;\n #ifdef RED_STATISTICS\n- if (!(mcc->ping_timer = reds_core_timer_add(red_channel_get_server(&main_chan->base), ping_timer_cb, mcc))) {\n+ if (!(mcc->priv->ping_timer = reds_core_timer_add(red_channel_get_server(&main_chan->base), ping_timer_cb, mcc))) {\n spice_error(\"ping timer create failed\");\n }\n- mcc->ping_interval = PING_INTERVAL;\n+ mcc->priv->ping_interval = PING_INTERVAL;\n #endif\n return mcc;\n }\n \n int main_channel_client_is_network_info_initialized(MainChannelClient *mcc)\n {\n- return mcc->net_test_stage == NET_TEST_STAGE_COMPLETE;\n+ return mcc->priv->net_test_stage == NET_TEST_STAGE_COMPLETE;\n }\n \n int main_channel_client_is_low_bandwidth(MainChannelClient *mcc)\n {\n \/\/ TODO: configurable?\n- return mcc->bitrate_per_sec < 10 * 1024 * 1024;\n+ return mcc->priv->bitrate_per_sec < 10 * 1024 * 1024;\n }\n \n uint64_t main_channel_client_get_bitrate_per_sec(MainChannelClient *mcc)\n {\n- return mcc->bitrate_per_sec;\n+ return mcc->priv->bitrate_per_sec;\n }\n \n uint64_t main_channel_client_get_roundtrip_ms(MainChannelClient *mcc)\n {\n- return mcc->latency \/ 1000;\n+ return mcc->priv->latency \/ 1000;\n }\n \n void main_channel_client_migrate(RedChannelClient *rcc)\n@@ -597,14 +603,14 @@\n RedClient *client = red_channel_client_get_client(rcc);\n if (red_client_during_migrate_at_target(client)) {\n spice_printerr(\"client %p: wait till previous migration completes\", client);\n- mcc->mig_wait_prev_complete = TRUE;\n- mcc->mig_wait_prev_try_seamless = FALSE;\n+ mcc->priv->mig_wait_prev_complete = TRUE;\n+ mcc->priv->mig_wait_prev_try_seamless = FALSE;\n } else {\n red_channel_client_pipe_add_type(rcc,\n RED_PIPE_ITEM_TYPE_MAIN_MIGRATE_BEGIN);\n- mcc->mig_wait_connect = TRUE;\n+ mcc->priv->mig_wait_connect = TRUE;\n }\n- mcc->mig_connect_ok = FALSE;\n+ mcc->priv->mig_connect_ok = FALSE;\n main_channel->num_clients_mig_wait++;\n return TRUE;\n }\n@@ -618,14 +624,14 @@\n SPICE_MAIN_CAP_SEAMLESS_MIGRATE));\n if (red_client_during_migrate_at_target(client)) {\n spice_printerr(\"client %p: wait till previous migration completes\", client);\n- mcc->mig_wait_prev_complete = TRUE;\n- mcc->mig_wait_prev_try_seamless = TRUE;\n+ mcc->priv->mig_wait_prev_complete = TRUE;\n+ mcc->priv->mig_wait_prev_try_seamless = TRUE;\n } else {\n red_channel_client_pipe_add_type(&mcc->base,\n RED_PIPE_ITEM_TYPE_MAIN_MIGRATE_BEGIN_SEAMLESS);\n- mcc->mig_wait_connect = TRUE;\n- }\n- mcc->mig_connect_ok = FALSE;\n+ mcc->priv->mig_wait_connect = TRUE;\n+ }\n+ mcc->priv->mig_connect_ok = FALSE;\n }\n \n RedChannelClient* main_channel_client_get_base(MainChannelClient* mcc)\n@@ -636,12 +642,12 @@\n \n uint32_t main_channel_client_get_connection_id(MainChannelClient *mcc)\n {\n- return mcc->connection_id;\n+ return mcc->priv->connection_id;\n }\n \n static uint32_t main_channel_client_next_ping_id(MainChannelClient *mcc)\n {\n- return ++mcc->ping_id;\n+ return ++mcc->priv->ping_id;\n }\n \n static void main_channel_marshall_channels(RedChannelClient *rcc,\n@@ -867,8 +873,8 @@\n * we ignore any pipe item that arrives before the INIT msg is sent.\n * For seamless we don't send INIT, and the connection continues from the same place\n * it stopped on the src side. *\/\n- if (!mcc->init_sent &&\n- !mcc->seamless_mig_dst &&\n+ if (!mcc->priv->init_sent &&\n+ !mcc->priv->seamless_mig_dst &&\n base->type != RED_PIPE_ITEM_TYPE_MAIN_INIT) {\n spice_printerr(\"Init msg for client %p was not sent yet \"\n \"(client is probably during semi-seamless migration). Ignoring msg type %d\",\n@@ -902,7 +908,7 @@\n main_channel_marshall_migrate_data_item(rcc, m, base);\n break;\n case RED_PIPE_ITEM_TYPE_MAIN_INIT:\n- mcc->init_sent = TRUE;\n+ mcc->priv->init_sent = TRUE;\n main_channel_marshall_init(rcc, m,\n SPICE_UPCAST(RedInitPipeItem, base));\n break;\n"} {"commit":"adff264fe66d78a166dc887f861e7273d0cb1654","subject":"[PATCH] GPIO API: S3C2410 wrapper cleanup","message":"[PATCH] GPIO API: S3C2410 wrapper cleanup\n\nthis one adds an #include <asm\/arch\/regs-gpio.h>.\nTested by Roman Moravcik on s3c2440.\n\nBased on the discussion last december\n(http:\/\/lkml.org\/lkml\/2006\/12\/20\/243), this patch\n - fixes comment and includes in gpio.h\n - adds the gpio_to_irq definition for S3C2400\n - includes asm\/arch\/regs-gpio.h for pin direction\n definitions\n\nSigned-off-by: Philipp Zabel <1f94b3da04d839c1c06fd881f52fcf8011297561@gmail.com>\nSigned-off-by: David Brownell <a0d09457d62acbdeb1fae1223575100ccbfffdf9@users.sourceforge.net>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-arm\/arch-s3c2410\/gpio.h\n+++ include\/asm-arm\/arch-s3c2410\/gpio.h\n@@ -1,7 +1,7 @@\n \/*\n- * linux\/include\/asm-arm\/arch-pxa\/gpio.h\n+ * linux\/include\/asm-arm\/arch-s3c2410\/gpio.h\n *\n- * S3C2400 GPIO wrappers for arch-neutral GPIO calls\n+ * S3C2410 GPIO wrappers for arch-neutral GPIO calls\n *\n * Written by Philipp Zabel <philipp.zabel@gmail.com>\n *\n@@ -21,14 +21,12 @@\n *\n *\/\n \n-#ifndef __ASM_ARCH_PXA_GPIO_H\n-#define __ASM_ARCH_PXA_GPIO_H\n+#ifndef __ASM_ARCH_S3C2410_GPIO_H\n+#define __ASM_ARCH_S3C2410_GPIO_H\n \n-#include <asm\/arch\/pxa-regs.h>\n-#include <asm\/arch\/irqs.h>\n-#include <asm\/arch\/hardware.h>\n-\n-#include <asm\/errno.h>\n+#include <asm\/irq.h>\n+#include <asm\/hardware.h>\n+#include <asm\/arch\/regs-gpio.h>\n \n static inline int gpio_request(unsigned gpio, const char *label)\n {\n@@ -57,8 +55,11 @@\n \n #include <asm-generic\/gpio.h>\t\t\t\/* cansleep wrappers *\/\n \n-\/* FIXME or maybe s3c2400_gpio_getirq() ... *\/\n+#ifdef CONFIG_CPU_S3C2400\n+#define gpio_to_irq(gpio)\t\ts3c2400_gpio_getirq(gpio)\n+#else\n #define gpio_to_irq(gpio)\t\ts3c2410_gpio_getirq(gpio)\n+#endif\n \n \/* FIXME implement irq_to_gpio() *\/\n \n"} {"commit":"e4a1bb5ba32d8e9440d7078880663531a0699fec","subject":"Properly lock SPU_CHANNEL_REGISTER.","message":"Properly lock SPU_CHANNEL_REGISTER.\n\n( At best, a = b++ is not atomic)\n","repos":"jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,krichter722\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/video_output\/vout_subpictures.c\n+++ src\/video_output\/vout_subpictures.c\n@@ -1322,7 +1322,10 @@\n {\n case SPU_CHANNEL_REGISTER:\n pi = (int *)va_arg( args, int * );\n- if( pi ) *pi = p_spu->i_channel++;\n+ vlc_mutex_lock( &p_spu->subpicture_lock );\n+ if( pi )\n+ *pi = p_spu->i_channel++;\n+ vlc_mutex_unlock( &p_spu->subpicture_lock );\n break;\n \n case SPU_CHANNEL_CLEAR:\n"} {"commit":"df6b8c2a0f664a2fb04ec22b75d325b4bbde13f7","subject":"add flag to stage api change in skia tilemodes","message":"add flag to stage api change in skia tilemodes\n\nTest: make\n\nChange-Id: I97106e3ad18c21b6be57669443f2ce30292a54fe\n","repos":"aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/config\/SkUserConfigManual.h\n+++ include\/config\/SkUserConfigManual.h\n@@ -23,7 +23,8 @@\n #define SK_IGNORE_GPU_DITHER\n #define SK_SUPPORT_DEPRECATED_CLIPOPS\n #define SK_SUPPORT_LEGACY_DRAWLOOPER\n-\n+ #define SK_SUPPORT_LEGACY_TILEMODE_ENUM\n+ \n \/\/ Needed until we fix https:\/\/bug.skia.org\/2440\n #define SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG\n #define SK_SUPPORT_LEGACY_EMBOSSMASKFILTER\n"} {"commit":"e7f619c6ffcc38fde8ae90b01c9a924af11230e7","subject":"Make input arguments 'const'.","message":"Make input arguments 'const'.\n","repos":"naliboff\/dealii,shakirbsm\/dealii,naliboff\/dealii,spco\/dealii,spco\/dealii,spco\/dealii,sairajat\/dealii,kalj\/dealii,spco\/dealii,angelrca\/dealii,danshapero\/dealii,danshapero\/dealii,spco\/dealii,sairajat\/dealii,danshapero\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,naliboff\/dealii,danshapero\/dealii,angelrca\/dealii,naliboff\/dealii,angelrca\/dealii,angelrca\/dealii,JaeryunYim\/dealii,angelrca\/dealii,kalj\/dealii,shakirbsm\/dealii,JaeryunYim\/dealii,angelrca\/dealii,naliboff\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,kalj\/dealii,JaeryunYim\/dealii,danshapero\/dealii,kalj\/dealii,kalj\/dealii,EGP-CIG-REU\/dealii,spco\/dealii,sairajat\/dealii,naliboff\/dealii,shakirbsm\/dealii,shakirbsm\/dealii,kalj\/dealii,shakirbsm\/dealii,EGP-CIG-REU\/dealii,sairajat\/dealii,angelrca\/dealii,shakirbsm\/dealii,sairajat\/dealii,spco\/dealii,JaeryunYim\/dealii,danshapero\/dealii,sairajat\/dealii,naliboff\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,sairajat\/dealii,EGP-CIG-REU\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,JaeryunYim\/dealii,danshapero\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/deal.II\/lac\/sparse_direct.h\n+++ include\/deal.II\/lac\/sparse_direct.h\n@@ -226,12 +226,14 @@\n * If @p transpose is set to true this function solves for the transpose of\n * the matrix, i.e. $x=A^{-T}b$.\n *\/\n- void solve (Vector<double> &rhs_and_solution, bool transpose = false) const;\n+ void solve (Vector<double> &rhs_and_solution,\n+ const bool transpose = false) const;\n \n \/**\n * Same as before, but for block vectors.\n *\/\n- void solve (BlockVector<double> &rhs_and_solution, bool transpose = false) const;\n+ void solve (BlockVector<double> &rhs_and_solution,\n+ const bool transpose = false) const;\n \n \/**\n * Call the two functions factorize() and solve() in that order, i.e.\n@@ -242,7 +244,7 @@\n template <class Matrix>\n void solve (const Matrix &matrix,\n Vector<double> &rhs_and_solution,\n- bool transpose = false);\n+ const bool transpose = false);\n \n \/**\n * Same as before, but for block vectors.\n@@ -250,7 +252,7 @@\n template <class Matrix>\n void solve (const Matrix &matrix,\n BlockVector<double> &rhs_and_solution,\n- bool transpose = false);\n+ const bool transpose = false);\n \n \/**\n * @}\n"} {"commit":"6ccc5dd0f5a6897b60e719b348d1eb0bbd597288","subject":"Remove repeated rs2_stream in comments","message":"Remove repeated rs2_stream in comments","repos":"IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- examples\/sensor-control\/api_how_to.h\n+++ examples\/sensor-control\/api_how_to.h\n@@ -356,8 +356,8 @@\n \/\/ supported by the RealSense SDK\n \/\/ For example:\n \/\/ * rs2_stream::RS2_STREAM_DEPTH describes a stream of depth images\n- \/\/ * rs2_stream::rs2_stream::RS2_STREAM_COLOR describes a stream of color images\n- \/\/ * rs2_stream::rs2_stream::RS2_STREAM_INFRARED describes a stream of infrared images\n+ \/\/ * rs2_stream::RS2_STREAM_COLOR describes a stream of color images\n+ \/\/ * rs2_stream::RS2_STREAM_INFRARED describes a stream of infrared images\n \n \/\/ As mentioned, a sensor can have multiple streams.\n \/\/ In order to distinguish between streams with the same\n"} {"commit":"f378cb483ea78f87fa10e94da4b7709e66848781","subject":"Teach gtest to autodetect rtti support with clang (by Nico Weber).","message":"Teach gtest to autodetect rtti support with clang (by Nico Weber).\n\n","repos":"obruns\/gtest,obruns\/gtest,obruns\/gtest,obruns\/gtest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -391,6 +391,13 @@\n # define GTEST_HAS_RTTI 0\n # endif \/\/ __GXX_RTTI\n \n+\/\/ Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends\n+\/\/ using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the\n+\/\/ first version with C++ support.\n+# elif defined(__clang__)\n+\n+# define GTEST_HAS_RTTI __has_feature(cxx_rtti)\n+\n \/\/ Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if\n \/\/ both the typeid and dynamic_cast features are present.\n # elif defined(__IBMCPP__) && (__IBMCPP__ >= 900)\n"} {"commit":"21512ceac232b80a24f236cbaedaf523c0b969a3","subject":"Fixed a bug of sub layers hierarchy.","message":"Fixed a bug of sub layers hierarchy.\n","repos":"CocoaBob\/PebbleTransilien,CocoaBob\/PebbleTransilien,CocoaBob\/PebbleTransilien,CocoaBob\/PebbleTransilien,CocoaBob\/PebbleTransilien","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/windows\/search_station_window.c\n+++ src\/windows\/search_station_window.c\n@@ -195,7 +195,9 @@\n Layer *window_layer = window_get_root_layer(s_window);\n layer_add_child(window_layer, s_panel_layer);\n #else\n- layer_insert_below_sibling(s_panel_layer, inverter_layer_get_layer(s_inverter_layer));\n+ \/\/ To make sure the panel layer is under the inverter layer\n+ \/\/ But we can't just insert it below the inverter layer which isn't always there\n+ layer_insert_above_sibling(s_panel_layer, menu_layer_get_layer(s_menu_layer));\n #endif\n }\n }\n"} {"commit":"dea4205556f507b31f3162be1e60f5f7a76c212d","subject":"add new codes","message":"add new codes\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@36725 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Bitcode\/LLVMBitCodes.h\n+++ include\/llvm\/Bitcode\/LLVMBitCodes.h\n@@ -28,11 +28,12 @@\n MODULE_BLOCK_ID = 0,\n \n \/\/ Module sub-block id's\n- TYPE_BLOCK_ID = 1,\n- CONSTANTS_BLOCK_ID = 2,\n- FUNCTION_BLOCK_ID = 3,\n- TYPE_SYMTAB_BLOCK_ID = 4,\n- VALUE_SYMTAB_BLOCK_ID = 5\n+ PARAMATTR_BLOCK_ID = 1,\n+ TYPE_BLOCK_ID = 2,\n+ CONSTANTS_BLOCK_ID = 3,\n+ FUNCTION_BLOCK_ID = 4,\n+ TYPE_SYMTAB_BLOCK_ID = 5,\n+ VALUE_SYMTAB_BLOCK_ID = 6\n };\n \n \n@@ -58,6 +59,11 @@\n \n \/\/\/ MODULE_CODE_PURGEVALS: [numvals]\n MODULE_CODE_PURGEVALS = 10\n+ };\n+ \n+ \/\/\/ PARAMATTR blocks have code for defining a parameter attribute set.\n+ enum ParamAttrCodes {\n+ PARAMATTR_CODE_ENTRY = 1 \/\/ ENTRY: [paramidx0, attr0, paramidx1, attr1...]\n };\n \n \/\/\/ TYPE blocks have codes for each type primitive they use.\n"} {"commit":"462cd887ff5df97e4ef43a242c6c0127a7acbdfa","subject":"use doubles for faster error bounds in fmprb_poly_mullow_block2","message":"use doubles for faster error bounds in fmprb_poly_mullow_block2\n","repos":"pascalmolin\/arb,pascalmolin\/arb,argriffing\/arb,argriffing\/arb,fredrik-johansson\/arb,fredrik-johansson\/arb,argriffing\/arb,pascalmolin\/arb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmprb_poly\/mullow_block2.c\n+++ fmprb_poly\/mullow_block2.c\n@@ -23,10 +23,23 @@\n \n ******************************************************************************\/\n \n+#include <math.h>\n #include \"fmprb_poly.h\"\n \n void _fmprb_poly_get_scale(fmpz_t scale, fmprb_srcptr x, long xlen,\n fmprb_srcptr y, long ylen);\n+\n+static int\n+_fmprb_vec_is_finite(fmprb_srcptr x, long len)\n+{\n+ long i;\n+\n+ for (i = 0; i < len; i++)\n+ if (!fmprb_is_finite(x + i))\n+ return 0;\n+\n+ return 1;\n+}\n \n \/*static __inline__ *\/ void\n fmpr_add_abs_ubound(fmpr_t z, const fmpr_t x, const fmpr_t y, long prec)\n@@ -60,16 +73,61 @@\n }\n \n \/* Break fmpr vector into same-exponent blocks where the largest block\n- has a height of at most ALPHA*prec + BETA bits. *\/\n+ has a height of at most ALPHA*prec + BETA bits. These are just\n+ tuning parameters. Note that ALPHA * FMPRB_RAD_PREC + BETA\n+ should be smaller than DOUBLE_BLOCK_MAX_HEIGHT if we want to use\n+ doubles for error bounding. *\/\n #define ALPHA 3.0\n #define BETA 512\n \n-void\n-_fmpr_vec_get_fmpz_2exp_blocks(fmpz * coeffs, fmpz * exps, long * blocks,\n- const fmpz_t scale, fmpr_srcptr x, long len, long step, long prec)\n+\n+\/* Maximum length of block for which we use double multiplication\n+ (for longer blocks, we use fmpz_poly multiplication). This is essentially\n+ just a tuning parameter, but note that it must be considered when\n+ compensating for rounding error below. *\/\n+#define DOUBLE_BLOCK_MAX_LENGTH 1000\n+\n+\/* Computing a dot product of length DOUBLE_BLOCK_MAX_LENGTH involving\n+ only nonnegative numbers, and then multiplying by this factor, must give\n+ an upper bound for the exact dot product (we can assume that no\n+ overflow or underflow occurs). The following is certainly\n+ sufficient, but it would be nice to include a formal proof here. *\/\n+#define DOUBLE_ROUNDING_FACTOR (1.0 + 1e-9)\n+\n+\/* Maximum height for which we use double multiplication. Since the dynamic\n+ exponent range of doubles is about +\/- 1024, this must be less than about\n+ 1024 (to allow the product of two numbers). This must also\n+ account for adding FMPRB_RAD_PREC bits. *\/\n+#define DOUBLE_BLOCK_MAX_HEIGHT 800\n+\n+\/* We divide coefficients by 2^DOUBLE_BLOCK_SHIFT when converting them to\n+ doubles, in order to use the whole exponent range. Note that this means\n+ numbers of size (2^(-DOUBLE_BLOCK_SHIFT))^2 must not underflow. *\/\n+#define DOUBLE_BLOCK_SHIFT (DOUBLE_BLOCK_MAX_HEIGHT \/ 2)\n+\n+\n+\/* Converts fmpr vector to a vector of blocks, where each block is\n+ a vector of fmpz integers on a common exponent.\n+ Optionally, we also generate doubles on the same common exponent\n+ (minus DOUBLE_BLOCK_SHIFT), where this can be done exactly. *\/\n+\n+static __inline__ int \/* returns new can_use_doubles status *\/\n+_fmpr_vec_get_fmpz_2exp_blocks\n+(\n+ fmpz * coeffs, \/* output fmpz coefficients *\/\n+ double * dblcoeffs, \/* output double coefficients (optional) *\/\n+ fmpz * exps, \/* common exponent of each block *\/\n+ long * blocks, \/* start positions of blocks (plus end marker) *\/\n+ const fmpz_t scale, \/* compose input poly by x -> x\/2^scale *\/\n+ fmpr_srcptr x, \/* first in vector of input coefficient *\/\n+ long len, \/* number of input coefficients *\/\n+ long step, \/* step length to read input coefficients*\/\n+ long prec, \/* prec *\/\n+ int can_use_doubles\n+)\n {\n fmpz_t top, bot, t, b, v, block_top, block_bot;\n- long i, j, s, block;\n+ long i, j, s, block, bits, maxheight;\n int in_zero;\n \n fmpz_init(top);\n@@ -84,17 +142,26 @@\n block = 0;\n in_zero = 1;\n \n+ if (prec == FMPR_PREC_EXACT)\n+ maxheight = FMPR_PREC_EXACT;\n+ else\n+ maxheight = ALPHA * prec + BETA;\n+\n+ can_use_doubles = can_use_doubles && (maxheight <= DOUBLE_BLOCK_MAX_HEIGHT);\n+\n for (i = 0; i < len; i++)\n {\n- \/* Skip (must be zero, since we assume there are no Infs\/NaNs) *\/\n+ \/* Skip (must be zero, since we assume there are no Infs\/NaNs). *\/\n if (fmpr_is_special(x + i * step))\n continue;\n \n \/* Bottom and top exponent of current number *\/\n fmpz_set(bot, fmpr_expref(x + i * step));\n- \/* Divide coefficient by 2^(scale * i) *\/\n fmpz_submul_ui(bot, scale, i);\n- fmpz_add_ui(top, bot, fmpz_bits(fmpr_manref(x + i * step)));\n+ bits = fmpz_bits(fmpr_manref(x + i * step));\n+ fmpz_add_ui(top, bot, bits);\n+\n+ can_use_doubles = can_use_doubles && (bits <= FMPRB_RAD_PREC);\n \n \/* Extend current block. *\/\n if (in_zero)\n@@ -109,7 +176,7 @@\n fmpz_sub(v, t, b);\n \n \/* extend current block *\/\n- if (prec == FMPR_PREC_EXACT || fmpz_cmp_ui(v, ALPHA * prec + BETA) < 0)\n+ if (fmpz_cmp_ui(v, maxheight) < 0)\n {\n fmpz_swap(block_top, t);\n fmpz_swap(block_bot, b);\n@@ -141,9 +208,12 @@\n {\n for (j = blocks[i]; j < blocks[i + 1]; j++)\n {\n- if (fmpr_is_zero(x + j * step))\n+ if (fmpr_is_special(x + j * step))\n {\n fmpz_zero(coeffs + j);\n+\n+ if (can_use_doubles)\n+ dblcoeffs[j] = 0.0;\n }\n else\n {\n@@ -155,6 +225,17 @@\n if (s < 0) abort(); \/* Bug catcher *\/\n \n fmpz_mul_2exp(coeffs + j, fmpr_manref(x + j * step), s);\n+\n+ if (can_use_doubles)\n+ {\n+ double c = *fmpr_manref(x + j * step);\n+ c = ldexp(c, s - DOUBLE_BLOCK_SHIFT);\n+\n+ if (c < 1e-150 || c > 1e150) \/* Bug catcher *\/\n+ abort();\n+\n+ dblcoeffs[j] = c;\n+ }\n }\n }\n }\n@@ -166,32 +247,19 @@\n fmpz_clear(v);\n fmpz_clear(block_top);\n fmpz_clear(block_bot);\n-}\n-\n-static int\n-has_infnan(fmprb_srcptr x, long len)\n-{\n- long i;\n-\n- for (i = 0; i < len; i++)\n- {\n- if (fmpr_is_nan(fmprb_midref(x + i)) || fmpr_is_inf(fmprb_midref(x + i))\n- || fmpr_is_nan(fmprb_radref(x + i)) || fmpr_is_inf(fmprb_radref(x + i)))\n- {\n- return 1;\n- }\n- }\n-\n- return 0;\n-}\n-\n-void\n+\n+ return can_use_doubles;\n+}\n+\n+static __inline__ void\n _fmprb_poly_addmullow_rad(fmprb_ptr z, fmpz * zz,\n- const fmpz * xz, const fmpz * xexps, const long * xblocks, long xlen,\n- const fmpz * yz, const fmpz * yexps, const long * yblocks, long ylen,\n- long n)\n-{\n- long i, j, k, xp, yp, xl, yl, bn;\n+ const fmpz * xz, const double * xdbl, const fmpz * xexps,\n+ const long * xblocks, long xlen,\n+ const fmpz * yz, const double * ydbl, const fmpz * yexps,\n+ const long * yblocks, long ylen,\n+ long n, int can_use_doubles)\n+{\n+ long i, j, k, ii, xp, yp, xl, yl, bn;\n fmpz_t zexp;\n fmpr_t t;\n \n@@ -211,20 +279,49 @@\n xl = FLINT_MIN(xl, bn);\n yl = FLINT_MIN(yl, bn);\n \n- if (xl >= yl)\n- _fmpz_poly_mullow(zz, xz + xp, xl, yz + yp, yl, bn);\n+ fmpz_add_inline(zexp, xexps + i, yexps + j);\n+\n+ if (can_use_doubles && xl > 1 && yl > 1 &&\n+ (xl < DOUBLE_BLOCK_MAX_LENGTH || yl < DOUBLE_BLOCK_MAX_LENGTH))\n+ {\n+ fmpz_add_ui(zexp, zexp, 2 * DOUBLE_BLOCK_SHIFT);\n+\n+ for (k = 0; k < bn; k++)\n+ {\n+ \/* Classical multiplication (may round down!) *\/\n+ double ss = 0.0;\n+\n+ for (ii = FLINT_MAX(0, k - yl + 1);\n+ ii <= FLINT_MIN(xl - 1, k); ii++)\n+ {\n+ ss += xdbl[xp + ii] * ydbl[yp + k - ii];\n+ }\n+\n+ \/* Compensate for rounding error *\/\n+ ss *= DOUBLE_ROUNDING_FACTOR;\n+\n+ fmpr_set_d(t, ss);\n+ fmpr_mul_2exp_fmpz(t, t, zexp);\n+ fmpr_add(fmprb_radref(z + xp + yp + k),\n+ fmprb_radref(z + xp + yp + k), t,\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+ }\n+ }\n else\n- _fmpz_poly_mullow(zz, yz + yp, yl, xz + xp, xl, bn);\n-\n- fmpz_add_inline(zexp, xexps + i, yexps + j);\n-\n- for (k = 0; k < bn; k++)\n- {\n- fmpr_set_round_fmpz_2exp(t, zz + k, zexp,\n- FMPRB_RAD_PREC, FMPR_RND_UP);\n- fmpr_add(fmprb_radref(z + xp + yp + k),\n- fmprb_radref(z + xp + yp + k), t,\n- FMPRB_RAD_PREC, FMPR_RND_UP);\n+ {\n+ if (xl >= yl)\n+ _fmpz_poly_mullow(zz, xz + xp, xl, yz + yp, yl, bn);\n+ else\n+ _fmpz_poly_mullow(zz, yz + yp, yl, xz + xp, xl, bn);\n+\n+ for (k = 0; k < bn; k++)\n+ {\n+ fmpr_set_round_fmpz_2exp(t, zz + k, zexp,\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+ fmpr_add(fmprb_radref(z + xp + yp + k),\n+ fmprb_radref(z + xp + yp + k), t,\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+ }\n }\n }\n }\n@@ -233,7 +330,7 @@\n fmpr_clear(t);\n }\n \n-void\n+static __inline__ void\n _fmprb_poly_addmullow_block(fmprb_ptr z, fmpz * zz,\n const fmpz * xz, const fmpz * xexps, const long * xblocks, long xlen,\n const fmpz * yz, const fmpz * yexps, const long * yblocks, long ylen,\n@@ -334,7 +431,8 @@\n }\n \n \/* We don't know how to deal with infinities or NaNs *\/\n- if (has_infnan(x, xlen) || (!squaring && has_infnan(y, ylen)))\n+ if (!_fmprb_vec_is_finite(x, xlen) ||\n+ (!squaring && !_fmprb_vec_is_finite(y, ylen)))\n {\n _fmprb_poly_mullow_classical(z, x, xlen, y, ylen, n, prec);\n return;\n@@ -369,74 +467,123 @@\n = (xm*ym) + (xm*yr + xr*(ym + yr)) *\/\n if (xrlen != 0 || yrlen != 0)\n {\n- fmpr_ptr tmp = _fmpr_vec_init(FLINT_MAX(xlen, ylen));\n+ fmpr_ptr tmp;\n+ double *xdbl, *ydbl;\n+ int can_use_doubles = 1;\n+\n+ tmp = _fmpr_vec_init(FLINT_MAX(xlen, ylen));\n+ xdbl = flint_malloc(sizeof(double) * xlen);\n+ ydbl = flint_malloc(sizeof(double) * ylen);\n \n \/* (xm + xr)^2 = (xm*ym) + (xr^2 + 2 xm xr)\n = (xm*ym) + xr*(2 xm + xr) *\/\n if (squaring)\n {\n- _fmpr_vec_get_fmpz_2exp_blocks(xz, xe, xblocks, scale, fmprb_radref(x), xrlen, 2, FMPRB_RAD_PREC);\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(xz, xdbl, xe,\n+ xblocks, scale, fmprb_radref(x), xrlen, 2,\n+ FMPRB_RAD_PREC, can_use_doubles);\n \n for (i = 0; i < xlen; i++)\n {\n- fmpr_abs_round(tmp + i, fmprb_midref(x + i), FMPRB_RAD_PREC, FMPR_RND_UP);\n+ fmpr_abs_round(tmp + i, fmprb_midref(x + i),\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n fmpr_mul_2exp_si(tmp + i, tmp + i, 1);\n- fmpr_add(tmp + i, tmp + i, fmprb_radref(x + i), FMPRB_RAD_PREC, FMPR_RND_UP);\n- }\n- _fmpr_vec_get_fmpz_2exp_blocks(yz, ye, yblocks, scale, tmp, xlen, 1, FMPRB_RAD_PREC);\n-\n- _fmprb_poly_addmullow_rad(z, zz, xz, xe, xblocks, xrlen, yz, ye, yblocks, xlen, n);\n+ fmpr_add(tmp + i, tmp + i, fmprb_radref(x + i),\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+ }\n+\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(yz, ydbl, ye,\n+ yblocks, scale, tmp, xlen, 1,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n+ _fmprb_poly_addmullow_rad(z, zz,\n+ xz, xdbl, xe, xblocks, xrlen,\n+ yz, ydbl, ye, yblocks, xlen, n, can_use_doubles);\n }\n else if (yrlen == 0)\n {\n \/* xr * |ym| *\/\n- _fmpr_vec_get_fmpz_2exp_blocks(xz, xe, xblocks, scale, fmprb_radref(x), xrlen, 2, FMPRB_RAD_PREC);\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(xz, xdbl, xe,\n+ xblocks, scale, fmprb_radref(x), xrlen, 2,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n for (i = 0; i < ymlen; i++)\n- fmpr_abs_round(tmp + i, fmprb_midref(y + i), FMPRB_RAD_PREC, FMPR_RND_UP);\n- _fmpr_vec_get_fmpz_2exp_blocks(yz, ye, yblocks, scale, tmp, ymlen, 1, FMPRB_RAD_PREC);\n- _fmprb_poly_addmullow_rad(z, zz, xz, xe, xblocks, xrlen, yz, ye, yblocks, ymlen, n);\n+ fmpr_abs_round(tmp + i, fmprb_midref(y + i),\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(yz, ydbl, ye,\n+ yblocks, scale, tmp, ymlen, 1,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n+ _fmprb_poly_addmullow_rad(z, zz,\n+ xz, xdbl, xe, xblocks, xrlen,\n+ yz, ydbl, ye, yblocks, ymlen, n, can_use_doubles);\n }\n else\n {\n \/* |xm| * yr *\/\n for (i = 0; i < xmlen; i++)\n- fmpr_abs_round(tmp + i, fmprb_midref(x + i), FMPRB_RAD_PREC, FMPR_RND_UP);\n-\n- _fmpr_vec_get_fmpz_2exp_blocks(xz, xe, xblocks, scale, tmp, xmlen, 1, FMPRB_RAD_PREC);\n-\n- _fmpr_vec_get_fmpz_2exp_blocks(yz, ye, yblocks, scale, fmprb_radref(y), yrlen, 2, FMPRB_RAD_PREC);\n-\n- _fmprb_poly_addmullow_rad(z, zz, xz, xe, xblocks, xmlen, yz, ye, yblocks, yrlen, n);\n+ fmpr_abs_round(tmp + i, fmprb_midref(x + i),\n+ FMPRB_RAD_PREC, FMPR_RND_UP);\n+\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(xz, xdbl, xe,\n+ xblocks, scale, tmp, xmlen, 1,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(yz, ydbl, ye,\n+ yblocks, scale, fmprb_radref(y), yrlen, 2,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n+ _fmprb_poly_addmullow_rad(z, zz,\n+ xz, xdbl, xe, xblocks, xmlen,\n+ yz, ydbl, ye, yblocks, yrlen, n, can_use_doubles);\n \n \/* xr*(|ym| + yr) *\/\n if (xrlen != 0)\n {\n- _fmpr_vec_get_fmpz_2exp_blocks(xz, xe, xblocks, scale, fmprb_radref(x), xrlen, 2, FMPRB_RAD_PREC);\n+ can_use_doubles = 1;\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(xz, xdbl, xe,\n+ xblocks, scale, fmprb_radref(x), xrlen, 2,\n+ FMPRB_RAD_PREC, can_use_doubles);\n \n for (i = 0; i < ylen; i++)\n- fmpr_add_abs_ubound(tmp + i, fmprb_midref(y + i), fmprb_radref(y + i), FMPRB_RAD_PREC);\n-\n- _fmpr_vec_get_fmpz_2exp_blocks(yz, ye, yblocks, scale, tmp, ylen, 1, FMPRB_RAD_PREC);\n- _fmprb_poly_addmullow_rad(z, zz, xz, xe, xblocks, xrlen, yz, ye, yblocks, ylen, n);\n+ fmpr_add_abs_ubound(tmp + i, fmprb_midref(y + i),\n+ fmprb_radref(y + i), FMPRB_RAD_PREC);\n+\n+ can_use_doubles = _fmpr_vec_get_fmpz_2exp_blocks(yz, ydbl, ye,\n+ yblocks, scale, tmp, ylen, 1,\n+ FMPRB_RAD_PREC, can_use_doubles);\n+\n+ _fmprb_poly_addmullow_rad(z, zz,\n+ xz, xdbl, xe, xblocks, xrlen,\n+ yz, ydbl, ye, yblocks, ylen, n, can_use_doubles);\n }\n }\n \n _fmpr_vec_clear(tmp, FLINT_MAX(xlen, ylen));\n+ flint_free(xdbl);\n+ flint_free(ydbl);\n }\n \n \/* multiply midpoints *\/\n if (xmlen != 0 && ymlen != 0)\n {\n- _fmpr_vec_get_fmpz_2exp_blocks(xz, xe, xblocks, scale, fmprb_midref(x), xmlen, 2, prec);\n+ _fmpr_vec_get_fmpz_2exp_blocks(xz, NULL, xe, xblocks,\n+ scale, fmprb_midref(x), xmlen, 2, prec, 0);\n \n if (squaring)\n {\n- _fmprb_poly_addmullow_block(z, zz, xz, xe, xblocks, xmlen, xz, xe, xblocks, xmlen, n, prec, 1);\n+ _fmprb_poly_addmullow_block(z, zz,\n+ xz, xe, xblocks, xmlen, xz, xe, xblocks, xmlen, n, prec, 1);\n }\n else\n {\n- _fmpr_vec_get_fmpz_2exp_blocks(yz, ye, yblocks, scale, fmprb_midref(y), ymlen, 2, prec);\n- _fmprb_poly_addmullow_block(z, zz, xz, xe, xblocks, xmlen, yz, ye, yblocks, ymlen, n, prec, 0);\n+ _fmpr_vec_get_fmpz_2exp_blocks(yz, NULL, ye, yblocks,\n+ scale, fmprb_midref(y), ymlen, 2, prec, 0);\n+\n+ _fmprb_poly_addmullow_block(z, zz,\n+ xz, xe, xblocks, xmlen,\n+ yz, ye, yblocks, ymlen, n, prec, 0);\n }\n }\n \n"} {"commit":"4f01c1ee9920e25bb9695189439ed5e29fc9128d","subject":"Can't use ref to stack value!","message":"Can't use ref to stack value!\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@354 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/MachineInstr.h\n+++ include\/llvm\/CodeGen\/MachineInstr.h\n@@ -293,7 +293,7 @@\n private:\n unsigned int i;\n int resultPos;\n- _MI*& minstr;\n+ _MI* minstr;\n \n inline void\tskipToNextVal() {\n while (i < minstr->getNumOperands() &&\n"} {"commit":"e602963840f91a673443aff98d14d339194882d1","subject":"Fix race condition in collect(..)","message":"Fix race condition in collect(..)\n\nSummary: This is a temporary fix (until D2015320 is checked in) for race condition(s) in collect(..) method.\n\nTest Plan:\nRun unit tests\nRun buffalo_aggregator canary\n\nReviewed By: jsedgwick@fb.com\n\nSubscribers: folly-diffs@, jsedgwick, yfeldblum, chalfant\n\nFB internal diff: D2037406\n\nTasks: 6894157\n\nSignature: t1:2037406:1430435227:ed9612d016cdbd708e2deba02dc4fe0b59632f5a\n","repos":"leolujuyi\/folly,fw1121\/folly,raphaelamorim\/folly,brunomorishita\/folly,Eagle-X\/folly,PPC64\/folly,reddit\/folly,SeanRBurton\/folly,romange\/folly,guker\/folly,alexst07\/folly,loversInJapan\/folly,Hincoin\/folly,nickhen\/folly,rklabs\/folly,SammyK\/folly,Hincoin\/folly,SeanRBurton\/folly,kernelim\/folly,bsampath\/folly,bowlofstew\/folly,tomhughes\/folly,arg0\/folly,bsampath\/folly,shaobz\/folly,stonegithubs\/folly,shaobz\/folly,renyinew\/folly,SeanRBurton\/folly,leolujuyi\/folly,project-zerus\/folly,lifei\/folly,juniway\/folly,fw1121\/folly,stonegithubs\/folly,CJstar\/folly,gaoyingie\/folly,tempbottle\/folly,KSreeHarsha\/folly,raphaelamorim\/folly,guker\/folly,xzmagic\/folly,colemancda\/folly,rklabs\/folly,reddit\/folly,theiver9827\/folly,stonegithubs\/folly,juniway\/folly,PoisonBOx\/folly,theiver9827\/folly,mqeizi\/folly,rklabs\/folly,reddit\/folly,lifei\/folly,upsoft\/folly,project-zerus\/folly,CJstar\/folly,chjp2046\/folly,stonegithubs\/folly,constantine001\/folly,leolujuyi\/folly,tempbottle\/folly,floxard\/folly,KSreeHarsha\/folly,charsyam\/folly,chjp2046\/folly,constantine001\/folly,yangjin-unique\/folly,sakishum\/folly,upsoft\/folly,tomhughes\/folly,charsyam\/folly,brunomorishita\/folly,Eagle-X\/folly,theiver9827\/folly,arg0\/folly,loversInJapan\/folly,constantine001\/folly,alexst07\/folly,upsoft\/folly,sakishum\/folly,colemancda\/folly,SammyK\/folly,yangjin-unique\/folly,bobegir\/folly,rklabs\/folly,PoisonBOx\/folly,Eagle-X\/folly,KSreeHarsha\/folly,Orvid\/folly,bobegir\/folly,nickhen\/folly,CJstar\/folly,wildinto\/folly,clearlylin\/folly,KSreeHarsha\/folly,PPC64\/folly,chjp2046\/folly,tempbottle\/folly,juniway\/folly,charsyam\/folly,colemancda\/folly,reddit\/folly,sakishum\/folly,romange\/folly,gavioto\/folly,mqeizi\/folly,bikong2\/folly,CJstar\/folly,bobegir\/folly,charsyam\/folly,hongliangzhao\/folly,clearlinux\/folly,cole14\/folly,doctaweeks\/folly,raphaelamorim\/folly,Hincoin\/folly,raphaelamorim\/folly,arg0\/folly,brunomorishita\/folly,upsoft\/folly,juniway\/folly,fw1121\/folly,CJstar\/folly,shaobz\/folly,brunomorishita\/folly,Eagle-X\/folly,bikong2\/folly,yangjin-unique\/folly,hongliangzhao\/folly,nickhen\/folly,zhiweicai\/folly,romange\/folly,clearlinux\/folly,bsampath\/folly,shaobz\/folly,PoisonBOx\/folly,guker\/folly,loversInJapan\/folly,wildinto\/folly,nickhen\/folly,gaoyingie\/folly,facebook\/folly,bowlofstew\/folly,brunomorishita\/folly,Hincoin\/folly,Orvid\/folly,bsampath\/folly,gaoyingie\/folly,wildinto\/folly,chjp2046\/folly,reddit\/folly,clearlylin\/folly,romange\/folly,juniway\/folly,sonnyhu\/folly,constantine001\/folly,floxard\/folly,bsampath\/folly,PPC64\/folly,bikong2\/folly,bowlofstew\/folly,shaobz\/folly,loverszhaokai\/folly,bowlofstew\/folly,doctaweeks\/folly,kernelim\/folly,fw1121\/folly,bobegir\/folly,stonegithubs\/folly,lifei\/folly,Orvid\/folly,PoisonBOx\/folly,nickhen\/folly,renyinew\/folly,kernelim\/folly,bikong2\/folly,alexst07\/folly,xzmagic\/folly,facebook\/folly,bowlofstew\/folly,constantine001\/folly,upsoft\/folly,wildinto\/folly,loverszhaokai\/folly,yangjin-unique\/folly,xzmagic\/folly,project-zerus\/folly,loverszhaokai\/folly,clearlylin\/folly,Hincoin\/folly,clearlylin\/folly,renyinew\/folly,Orvid\/folly,theiver9827\/folly,kernelim\/folly,SeanRBurton\/folly,cole14\/folly,hongliangzhao\/folly,doctaweeks\/folly,sonnyhu\/folly,fw1121\/folly,gavioto\/folly,PPC64\/folly,mqeizi\/folly,xzmagic\/folly,clearlinux\/folly,yangjin-unique\/folly,facebook\/folly,hongliangzhao\/folly,theiver9827\/folly,lifei\/folly,guker\/folly,bikong2\/folly,xzmagic\/folly,guker\/folly,kernelim\/folly,gaoyingie\/folly,Eagle-X\/folly,clearlylin\/folly,clearlinux\/folly,doctaweeks\/folly,facebook\/folly,PoisonBOx\/folly,renyinew\/folly,mqeizi\/folly,sakishum\/folly,zhiweicai\/folly,zhiweicai\/folly,loverszhaokai\/folly,sonnyhu\/folly,floxard\/folly,sonnyhu\/folly,loversInJapan\/folly,arg0\/folly,colemancda\/folly,gavioto\/folly,cole14\/folly,PPC64\/folly,romange\/folly,doctaweeks\/folly,SammyK\/folly,floxard\/folly,loversInJapan\/folly,gaoyingie\/folly,tomhughes\/folly,zhiweicai\/folly,facebook\/folly,mqeizi\/folly,raphaelamorim\/folly,project-zerus\/folly,leolujuyi\/folly,SeanRBurton\/folly,gavioto\/folly,chjp2046\/folly,Orvid\/folly,sonnyhu\/folly,SammyK\/folly,colemancda\/folly,alexst07\/folly,tempbottle\/folly,clearlinux\/folly,zhiweicai\/folly,wildinto\/folly,floxard\/folly,SammyK\/folly,bobegir\/folly,rklabs\/folly,loverszhaokai\/folly,renyinew\/folly,lifei\/folly,tomhughes\/folly,KSreeHarsha\/folly,tempbottle\/folly,alexst07\/folly,cole14\/folly,sakishum\/folly,project-zerus\/folly,hongliangzhao\/folly,cole14\/folly,tomhughes\/folly,gavioto\/folly,leolujuyi\/folly,arg0\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/futures\/Future-inl.h\n+++ folly\/futures\/Future-inl.h\n@@ -620,13 +620,13 @@\n Optional<T>\n >::type VecT;\n \n- explicit CollectContext(int n) : count(0), threw(false) {\n+ explicit CollectContext(int n) : count(0), success_count(0), threw(false) {\n results.resize(n);\n }\n \n Promise<std::vector<T>> p;\n std::vector<VecT> results;\n- std::atomic<size_t> count;\n+ std::atomic<size_t> count, success_count;\n std::atomic_bool threw;\n \n typedef std::vector<T> result_type;\n@@ -647,10 +647,10 @@\n template <>\n struct CollectContext<void> {\n \n- explicit CollectContext(int n) : count(0), threw(false) {}\n+ explicit CollectContext(int n) : count(0), success_count(0), threw(false) {}\n \n Promise<void> p;\n- std::atomic<size_t> count;\n+ std::atomic<size_t> count, success_count;\n std::atomic_bool threw;\n \n typedef void result_type;\n@@ -690,7 +690,6 @@\n assert(i < n);\n auto& f = *first;\n f.setCallback_([ctx, i, n](Try<T> t) {\n- auto c = ++ctx->count;\n \n if (t.hasException()) {\n if (!ctx->threw.exchange(true)) {\n@@ -698,12 +697,12 @@\n }\n } else if (!ctx->threw) {\n ctx->addResult(i, t);\n- if (c == n) {\n+ if (++ctx->success_count == n) {\n ctx->setValue();\n }\n }\n \n- if (c == n) {\n+ if (++ctx->count == n) {\n delete ctx;\n }\n });\n"} {"commit":"e1aa6d0695f6dbce4f36b707c417b524decb98c4","subject":"Added include of config.h to get const stub macro if necessary.","message":"Added include of config.h to get const stub macro if necessary.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@3709 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libgphoto2_port\/libgphoto2_port\/gphoto2-port.h\n+++ libgphoto2_port\/libgphoto2_port\/gphoto2-port.h\n@@ -21,6 +21,7 @@\n #ifndef __GPHOTO2_PORT_H__\n #define __GPHOTO2_PORT_H__\n \n+#include <config.h>\n #include <gphoto2-port-info-list.h>\n \n \/* For portability *\/\n"} {"commit":"f435214742a330de5b284175e74a7e7075e269f2","subject":"demos: Support cube on iOS and macOS via MoltenVK","message":"demos: Support cube on iOS and macOS via MoltenVK\n","repos":"KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- demos\/cube.c\n+++ demos\/cube.c\n@@ -21,6 +21,7 @@\n * Author: Jon Ashburn <jon@lunarg.com>\n * Author: Gwan-gyeong Mun <elongbug@gmail.com>\n * Author: Tony Barbour <tony@LunarG.com>\n+* Author: Bill Hollings <bill.hollings@brenwill.com>\n *\/\n \n #define _GNU_SOURCE\n@@ -304,6 +305,8 @@\n #elif defined(VK_USE_PLATFORM_MIR_KHR)\n #elif defined(VK_USE_PLATFORM_ANDROID_KHR)\n ANativeWindow *window;\n+#elif (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK))\n+ void *window;\n #endif\n VkSurfaceKHR surface;\n bool prepared;\n@@ -1113,6 +1116,11 @@\n \/* Load a ppm file into memory *\/\n bool loadTexture(const char *filename, uint8_t *rgba_data,\n VkSubresourceLayout *layout, int32_t *width, int32_t *height) {\n+\n+#if (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK))\n+\tfilename =[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: @(filename)].UTF8String;\n+#endif\n+\t\n #ifdef __ANDROID__\n #include <lunarg.ppm.h>\n char *cPtr;\n@@ -1626,6 +1634,10 @@\n size_t U_ASSERT_ONLY retval;\n void *shader_code;\n \n+#if (defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK))\n+\tfilename =[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: @(filename)].UTF8String;\n+#endif\n+\t\n FILE *fp = fopen(filename, \"rb\");\n if (!fp)\n return NULL;\n@@ -2797,6 +2809,16 @@\n demo->extension_names[demo->enabled_extension_count++] =\n VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;\n }\n+#elif defined(VK_USE_PLATFORM_IOS_MVK)\n+ if (!strcmp(VK_MVK_IOS_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) {\n+ platformSurfaceExtFound = 1;\n+ demo->extension_names[demo->enabled_extension_count++] = VK_MVK_IOS_SURFACE_EXTENSION_NAME;\n+ }\n+#elif defined(VK_USE_PLATFORM_MACOS_MVK)\n+ if (!strcmp(VK_MVK_MACOS_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) {\n+ platformSurfaceExtFound = 1;\n+ demo->extension_names[demo->enabled_extension_count++] = VK_MVK_MACOS_SURFACE_EXTENSION_NAME;\n+ }\n #endif\n if (!strcmp(VK_EXT_DEBUG_REPORT_EXTENSION_NAME,\n instance_extensions[i].extensionName)) {\n@@ -2829,6 +2851,20 @@\n \"look at the Getting Started guide for additional \"\n \"information.\\n\",\n \"vkCreateInstance Failure\");\n+#elif defined(VK_USE_PLATFORM_IOS_MVK)\n+\t\tERR_EXIT(\"vkEnumerateInstanceExtensionProperties failed to find the \"\n+\t\t\t\t VK_MVK_IOS_SURFACE_EXTENSION_NAME\" extension.\\n\\nDo you have a compatible \"\n+\t\t\t\t \"Vulkan installable client driver (ICD) installed?\\nPlease \"\n+\t\t\t\t \"look at the Getting Started guide for additional \"\n+\t\t\t\t \"information.\\n\",\n+\t\t\t\t \"vkCreateInstance Failure\");\n+#elif defined(VK_USE_PLATFORM_MACOS_MVK)\n+\t\tERR_EXIT(\"vkEnumerateInstanceExtensionProperties failed to find the \"\n+\t\t\t\t VK_MVK_MACOS_SURFACE_EXTENSION_NAME\" extension.\\n\\nDo you have a compatible \"\n+\t\t\t\t \"Vulkan installable client driver (ICD) installed?\\nPlease \"\n+\t\t\t\t \"look at the Getting Started guide for additional \"\n+\t\t\t\t \"information.\\n\",\n+\t\t\t\t \"vkCreateInstance Failure\");\n #elif defined(VK_USE_PLATFORM_XCB_KHR)\n ERR_EXIT(\"vkEnumerateInstanceExtensionProperties failed to find \"\n \"the \" VK_KHR_XCB_SURFACE_EXTENSION_NAME\n@@ -3149,6 +3185,22 @@\n err = vkCreateXcbSurfaceKHR(demo->inst, &createInfo, NULL, &demo->surface);\n #elif defined(VK_USE_PLATFORM_DISPLAY_KHR)\n err = demo_create_display_surface(demo);\n+#elif defined(VK_USE_PLATFORM_IOS_MVK)\n+ VkIOSSurfaceCreateInfoMVK surface;\n+ surface.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK;\n+ surface.pNext = NULL;\n+ surface.flags = 0;\n+ surface.pView = demo->window;\n+\n+ err = vkCreateIOSSurfaceMVK(demo->inst, &surface, NULL, &demo->surface);\n+#elif defined(VK_USE_PLATFORM_MACOS_MVK)\n+ VkMacOSSurfaceCreateInfoMVK surface;\n+ surface.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;\n+ surface.pNext = NULL;\n+ surface.flags = 0;\n+ surface.pView = demo->window;\n+\n+ err = vkCreateMacOSSurfaceMVK(demo->inst, &surface, NULL, &demo->surface);\n #endif\n assert(!err);\n \n@@ -3503,6 +3555,27 @@\n \n return (int)msg.wParam;\n }\n+\n+#elif defined(VK_USE_PLATFORM_IOS_MVK) || defined(VK_USE_PLATFORM_MACOS_MVK)\n+static void demo_main(struct demo *demo, void* view) {\n+\tconst char* argv[] = { \"CubeSample\" };\n+\tint argc = sizeof(argv) \/ sizeof(char*);\n+\n+\tdemo_init(demo, argc, (char**)argv);\n+\tdemo->window = view;\n+\tdemo_init_vk_swapchain(demo);\n+\tdemo_prepare(demo);\n+\tdemo->spin_angle = 0.4f;\n+}\n+\n+static void demo_update_and_draw(struct demo *demo) {\n+\t\/\/ Wait for work to finish before updating MVP.\n+\tvkDeviceWaitIdle(demo->device);\n+\tdemo_update_data_buffer(demo);\n+\n+\tdemo_draw(demo);\n+}\n+\n #elif defined(VK_USE_PLATFORM_ANDROID_KHR)\n #include <android\/log.h>\n #include <android_native_app_glue.h>\n"} {"commit":"e84d2066ce4a0d3e753e3171333a69f4081dcd56","subject":"Mark these as V9 specific","message":"Mark these as V9 specific\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@22572 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/CodeGen\/MachineInstr.h\n+++ include\/llvm\/CodeGen\/MachineInstr.h\n@@ -503,10 +503,10 @@\n void dump() const;\n friend std::ostream& operator<<(std::ostream& os, const MachineInstr& minstr);\n \n- \/\/\n \/\/ Define iterators to access the Value operands of the Machine Instruction.\n \/\/ Note that these iterators only enumerate the explicit operands.\n- \/\/ begin() and end() are defined to produce these iterators...\n+ \/\/ begin() and end() are defined to produce these iterators. NOTE, these are\n+ \/\/ SparcV9 specific!\n \/\/\n template<class _MI, class _V> class ValOpIterator;\n typedef ValOpIterator<const MachineInstr*,const Value*> const_val_op_iterator;\n@@ -711,7 +711,7 @@\n void SetRegForImplicitRef(unsigned i, int regNum);\n \n \/\/\n- \/\/ Iterator to enumerate machine operands.\n+ \/\/ Iterator to enumerate machine operands. NOTE, this is SPARCV9 specific!\n \/\/\n template<class MITy, class VTy>\n class ValOpIterator : public forward_iterator<VTy, ptrdiff_t> {\n@@ -763,10 +763,9 @@\n }\n };\n \n- \/\/ define begin() and end()\n+ \/\/ Note: These are Sparc-V9 specific!\n val_op_iterator begin() { return val_op_iterator::begin(this); }\n val_op_iterator end() { return val_op_iterator::end(this); }\n-\n const_val_op_iterator begin() const {\n return const_val_op_iterator::begin(this);\n }\n"} {"commit":"aa669f8e627e9e088a7313e3d4cc7da73bc29cf2","subject":"To reduce risk of stack overflow when catching up with deferred work, make blocking operation runOnMainContext","message":"To reduce risk of stack overflow when catching up with deferred work, make blocking operation runOnMainContext\n\nSummary: Shift wait execution off of a (potential) fiber stack to reduce risk of stack overflows while running deferred work.\n\nReviewed By: andriigrynenko\n\nDifferential Revision: D16643654\n\nfbshipit-source-id: 3ab1fe762b8f93c011cdb926e7689281018f54bc\n","repos":"facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/futures\/Future-inl.h\n+++ folly\/futures\/Future-inl.h\n@@ -572,11 +572,17 @@\n \n void drive() {\n baton_.wait();\n- baton_.reset();\n- auto funcs = std::move(queue_.wlock()->funcs);\n- for (auto& func : funcs) {\n- std::exchange(func, nullptr)();\n- }\n+#if FOLLY_FUTURE_USING_FIBER\n+ fibers::runInMainContext([&]() {\n+#endif\n+ baton_.reset();\n+ auto funcs = std::move(queue_.wlock()->funcs);\n+ for (auto& func : funcs) {\n+ std::exchange(func, nullptr)();\n+ }\n+#if FOLLY_FUTURE_USING_FIBER\n+ });\n+#endif\n }\n \n using Clock = std::chrono::steady_clock;\n@@ -585,12 +591,18 @@\n if (!baton_.try_wait_until(deadline)) {\n return false;\n }\n- baton_.reset();\n- auto funcs = std::move(queue_.wlock()->funcs);\n- for (auto& func : funcs) {\n- std::exchange(func, nullptr)();\n- }\n- return true;\n+#if FOLLY_FUTURE_USING_FIBER\n+ return fibers::runInMainContext([&]() {\n+#endif\n+ baton_.reset();\n+ auto funcs = std::move(queue_.wlock()->funcs);\n+ for (auto& func : funcs) {\n+ std::exchange(func, nullptr)();\n+ }\n+ return true;\n+#if FOLLY_FUTURE_USING_FIBER\n+ });\n+#endif\n }\n \n void detach() {\n"} {"commit":"e6decacd0a03a61f00068264b024e7bbb119b051","subject":"Fix\/enable UDP packet reassembly (#7036)","message":"Fix\/enable UDP packet reassembly (#7036)\n\n* Fix\/enable UDP packet reassembly\r\n\r\nUdpContext didn't care about pbuf chaining when receiving datagrams, leading\r\nto fragments delivered to the application as individual packets.\r\n\r\n* Provide pbuf_get_contiguous for backwards compatibility with LwIP 1.4\r\n\r\nImplementation copied verbatim from LwIP 2.1.2\r\n\r\n* Cosmetic changes to meet coding style\r\n\r\nCo-authored-by: david gauchard <4a7a067b9ad5eb71c0bf113a04bfd7e78b021cdd@laas.fr>\r\nCo-authored-by: Develo <f1eea6592757f97fa52d722d4289075385d7ae74@gmail.com>\r\n","repos":"sticilface\/Arduino,sticilface\/Arduino,esp8266\/Arduino,esp8266\/Arduino,sticilface\/Arduino,sticilface\/Arduino,esp8266\/Arduino,esp8266\/Arduino,sticilface\/Arduino,esp8266\/Arduino","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libraries\/ESP8266WiFi\/src\/include\/UdpContext.h\n+++ libraries\/ESP8266WiFi\/src\/include\/UdpContext.h\n@@ -187,7 +187,7 @@\n if (!_rx_buf)\n return 0;\n \n- return _rx_buf->len - _rx_buf_offset;\n+ return _rx_buf->tot_len - _rx_buf_offset;\n }\n \n size_t tell() const\n@@ -202,7 +202,7 @@\n }\n \n bool isValidOffset(const size_t pos) const {\n- return (pos <= _rx_buf->len);\n+ return (pos <= _rx_buf->tot_len);\n }\n \n CONST IPAddress& getRemoteAddress() CONST\n@@ -238,6 +238,10 @@\n }\n \n auto deleteme = _rx_buf;\n+\n+ while(_rx_buf->len != _rx_buf->tot_len)\n+ _rx_buf = _rx_buf->next;\n+\n _rx_buf = _rx_buf->next;\n \n if (_rx_buf)\n@@ -274,10 +278,10 @@\n \n int read()\n {\n- if (!_rx_buf || _rx_buf_offset >= _rx_buf->len)\n+ if (!_rx_buf || _rx_buf_offset >= _rx_buf->tot_len)\n return -1;\n \n- char c = reinterpret_cast<char*>(_rx_buf->payload)[_rx_buf_offset];\n+ char c = pbuf_get_at(_rx_buf, _rx_buf_offset);\n _consume(1);\n return c;\n }\n@@ -287,11 +291,17 @@\n if (!_rx_buf)\n return 0;\n \n- size_t max_size = _rx_buf->len - _rx_buf_offset;\n+ size_t max_size = _rx_buf->tot_len - _rx_buf_offset;\n size = (size < max_size) ? size : max_size;\n- DEBUGV(\":urd %d, %d, %d\\r\\n\", size, _rx_buf->len, _rx_buf_offset);\n-\n- memcpy(dst, reinterpret_cast<char*>(_rx_buf->payload) + _rx_buf_offset, size);\n+ DEBUGV(\":urd %d, %d, %d\\r\\n\", size, _rx_buf->tot_len, _rx_buf_offset);\n+\n+ void* buf = pbuf_get_contiguous(_rx_buf, dst, size, size, _rx_buf_offset);\n+ if(!buf)\n+ return 0;\n+\n+ if(buf != dst)\n+ memcpy(dst, buf, size);\n+\n _consume(size);\n \n return size;\n@@ -299,10 +309,10 @@\n \n int peek() const\n {\n- if (!_rx_buf || _rx_buf_offset == _rx_buf->len)\n+ if (!_rx_buf || _rx_buf_offset == _rx_buf->tot_len)\n return -1;\n \n- return reinterpret_cast<char*>(_rx_buf->payload)[_rx_buf_offset];\n+ return pbuf_get_at(_rx_buf, _rx_buf_offset);\n }\n \n void flush()\n@@ -311,7 +321,7 @@\n if (!_rx_buf)\n return;\n \n- _consume(_rx_buf->len - _rx_buf_offset);\n+ _consume(_rx_buf->tot_len - _rx_buf_offset);\n }\n \n size_t append(const char* data, size_t size)\n@@ -432,8 +442,8 @@\n void _consume(size_t size)\n {\n _rx_buf_offset += size;\n- if (_rx_buf_offset > _rx_buf->len) {\n- _rx_buf_offset = _rx_buf->len;\n+ if (_rx_buf_offset > _rx_buf->tot_len) {\n+ _rx_buf_offset = _rx_buf->tot_len;\n }\n }\n \n@@ -522,6 +532,90 @@\n reinterpret_cast<UdpContext*>(arg)->_recv(upcb, p, srcaddr, srcport);\n }\n \n+#if LWIP_VERSION_MAJOR == 1\n+ \/*\n+ * Code in this conditional block is copied\/backported verbatim from\n+ * LwIP 2.1.2 to provide pbuf_get_contiguous.\n+ *\/\n+\n+ static const struct pbuf *\n+ pbuf_skip_const(const struct pbuf *in, u16_t in_offset, u16_t *out_offset)\n+ {\n+ u16_t offset_left = in_offset;\n+ const struct pbuf *pbuf_it = in;\n+\n+ \/* get the correct pbuf *\/\n+ while ((pbuf_it != NULL) && (pbuf_it->len <= offset_left)) {\n+ offset_left = (u16_t)(offset_left - pbuf_it->len);\n+ pbuf_it = pbuf_it->next;\n+ }\n+ if (out_offset != NULL) {\n+ *out_offset = offset_left;\n+ }\n+ return pbuf_it;\n+ }\n+\n+ u16_t\n+ pbuf_copy_partial(const struct pbuf *buf, void *dataptr, u16_t len, u16_t offset)\n+ {\n+ const struct pbuf *p;\n+ u16_t left = 0;\n+ u16_t buf_copy_len;\n+ u16_t copied_total = 0;\n+\n+ LWIP_ERROR(\"pbuf_copy_partial: invalid buf\", (buf != NULL), return 0;);\n+ LWIP_ERROR(\"pbuf_copy_partial: invalid dataptr\", (dataptr != NULL), return 0;);\n+\n+ \/* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. *\/\n+ for (p = buf; len != 0 && p != NULL; p = p->next) {\n+ if ((offset != 0) && (offset >= p->len)) {\n+ \/* don't copy from this buffer -> on to the next *\/\n+ offset = (u16_t)(offset - p->len);\n+ } else {\n+ \/* copy from this buffer. maybe only partially. *\/\n+ buf_copy_len = (u16_t)(p->len - offset);\n+ if (buf_copy_len > len) {\n+ buf_copy_len = len;\n+ }\n+ \/* copy the necessary parts of the buffer *\/\n+ MEMCPY(&((char *)dataptr)[left], &((char *)p->payload)[offset], buf_copy_len);\n+ copied_total = (u16_t)(copied_total + buf_copy_len);\n+ left = (u16_t)(left + buf_copy_len);\n+ len = (u16_t)(len - buf_copy_len);\n+ offset = 0;\n+ }\n+ }\n+ return copied_total;\n+ }\n+\n+ void *\n+ pbuf_get_contiguous(const struct pbuf *p, void *buffer, size_t bufsize, u16_t len, u16_t offset)\n+ {\n+ const struct pbuf *q;\n+ u16_t out_offset;\n+\n+ LWIP_ERROR(\"pbuf_get_contiguous: invalid buf\", (p != NULL), return NULL;);\n+ LWIP_ERROR(\"pbuf_get_contiguous: invalid dataptr\", (buffer != NULL), return NULL;);\n+ LWIP_ERROR(\"pbuf_get_contiguous: invalid dataptr\", (bufsize >= len), return NULL;);\n+\n+ q = pbuf_skip_const(p, offset, &out_offset);\n+ if (q != NULL) {\n+ if (q->len >= (out_offset + len)) {\n+ \/* all data in this pbuf, return zero-copy *\/\n+ return (u8_t *)q->payload + out_offset;\n+ }\n+ \/* need to copy *\/\n+ if (pbuf_copy_partial(q, buffer, len, out_offset) != len) {\n+ \/* copying failed: pbuf is too short *\/\n+ return NULL;\n+ }\n+ return buffer;\n+ }\n+ \/* pbuf is too short (offset does not fit in) *\/\n+ return NULL;\n+ }\n+#endif\n+\n private:\n udp_pcb* _pcb;\n pbuf* _rx_buf;\n"} {"commit":"27d882ab1f31bd64c3ba9671d27848ed4ca04568","subject":"make_mx_array support for entities","message":"make_mx_array support for entities\n\nSFINAE FTW\n","repos":"mpsonntag\/nix-mx,mpsonntag\/nix-mx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/utils\/mkarray.h\n+++ src\/utils\/mkarray.h\n@@ -25,9 +25,9 @@\n \n mxArray *make_mx_array(const nix::DataSet &da);\n \n-template<typename T>\n+template<typename T, nix::DataType dt = nix::to_data_type<T>::value>\n mxArray* make_mx_array(const std::vector<T> &v) {\n-\tDType2 dtype = dtype_nix2mex(nix::to_data_type<T>::value);\n+\tDType2 dtype = dtype_nix2mex(dt);\n \tmxArray *data = mxCreateNumericMatrix(1, v.size(), dtype.cid, dtype.clx);\n \tdouble *ptr = mxGetPr(data);\n \tmemcpy(ptr, v.data(), sizeof(T) * v.size());\n@@ -49,7 +49,6 @@\n \treturn data;\n }\n \n-template<>\n inline mxArray* make_mx_array(const std::vector<nix::Value> &v) {\n \tif (v.empty()) {\n \t\treturn nullptr;\n@@ -97,4 +96,17 @@\n \treturn make_mx_array(h.address());\n }\n \n+template<typename T, int EntityId = entity_to_id<T>::value>\n+inline mxArray *make_mx_array(const std::vector<T> &v) {\n+\tconst mwSize size = static_cast<mwSize>(v.size());\n+\tmxArray *lst = mxCreateCellArray(1, &size);\n+\n+\tfor (size_t i = 0; i < v.size(); i++) {\n+\t\thandle hdl = handle(v[i]);\n+\t\tmxSetCell(lst, i, make_mx_array(hdl));\n+\t}\n+\n+\treturn lst;\n+}\n+\n #endif\n"} {"commit":"bc51bb6cacbe6c841598316115e4f89b6ac867e4","subject":"added assertions","message":"added assertions\n\ngit-svn-id: 33ed6c3feaacb64944efc691d1ae8e09b17f2bf9@1466014 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"kgiusti\/qpid-proton,apache\/qpid-proton,FlaPer87\/qpid-proton,jeckersb\/Proton,kgiusti\/qpid-proton,wprice\/qpid-proton,datawire\/qpid-proton,gemmellr\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,jeckersb\/Proton,ssorj\/qpid-proton,alanconway\/qpid-proton,wprice\/qpid-proton,datawire\/qpid-proton,ChugR\/qpid-proton,ChugR\/qpid-proton,RobertoMalatesta\/qpid-proton,RobertoMalatesta\/qpid-proton,Azure\/qpid-proton,prestona\/qpid-proton,wprice\/qpid-proton,dcristoloveanu\/qpid-proton,ChugR\/qpid-proton,jeckersb\/Proton,Karm\/qpid-proton,datawire\/qpid-proton,FlaPer87\/qpid-proton,Azure\/qpid-proton,bozzzzo\/qpid-proton,FlaPer87\/qpid-proton,RobertoMalatesta\/qpid-proton,ssorj\/qpid-proton,FlaPer87\/qpid-proton,jeckersb\/Proton,jeckersb\/Proton,wprice\/qpid-proton,RobertoMalatesta\/qpid-proton,ssorj\/qpid-proton,datawire\/qpid-proton,wprice\/qpid-proton,bozzzzo\/qpid-proton,wprice\/qpid-proton,RobertoMalatesta\/qpid-proton,bozzzzo\/qpid-proton,alanconway\/qpid-proton,gemmellr\/qpid-proton-j,prestona\/qpid-proton,wprice\/qpid-proton,Azure\/qpid-proton,prestona\/qpid-proton,apache\/qpid-proton,dcristoloveanu\/qpid-proton,kgiusti\/qpid-proton,astitcher\/qpid-proton,Karm\/qpid-proton,dcristoloveanu\/qpid-proton,RobertoMalatesta\/qpid-proton,gemmellr\/qpid-proton,apache\/qpid-proton,jeckersb\/Proton,bozzzzo\/qpid-proton,jeckersb\/Proton,jeckersb\/Proton,wprice\/qpid-proton,FlaPer87\/qpid-proton,jeckersb\/Proton,Karm\/qpid-proton,FlaPer87\/qpid-proton,clemensv\/qpid-proton,Karm\/qpid-proton,dcristoloveanu\/qpid-proton,Karm\/qpid-proton,kgiusti\/qpid-proton,prestona\/qpid-proton,astitcher\/qpid-proton,apache\/qpid-proton,dcristoloveanu\/qpid-proton,datawire\/qpid-proton,gemmellr\/qpid-proton,Azure\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,RobertoMalatesta\/qpid-proton,clemensv\/qpid-proton,datawire\/qpid-proton,Azure\/qpid-proton,datawire\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,wprice\/qpid-proton,Azure\/qpid-proton,apache\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,clemensv\/qpid-proton,wprice\/qpid-proton,datawire\/qpid-proton,astitcher\/qpid-proton,Karm\/qpid-proton,FlaPer87\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,clemensv\/qpid-proton,dcristoloveanu\/qpid-proton,RobertoMalatesta\/qpid-proton,FlaPer87\/qpid-proton,Azure\/qpid-proton,FlaPer87\/qpid-proton,ssorj\/qpid-proton,clemensv\/qpid-proton,clemensv\/qpid-proton,gemmellr\/qpid-proton,FlaPer87\/qpid-proton,dcristoloveanu\/qpid-proton,datawire\/qpid-proton,prestona\/qpid-proton,kgiusti\/qpid-proton,clemensv\/qpid-proton,jeckersb\/Proton,bozzzzo\/qpid-proton,dcristoloveanu\/qpid-proton,RobertoMalatesta\/qpid-proton,bozzzzo\/qpid-proton,Azure\/qpid-proton,FlaPer87\/qpid-proton,kgiusti\/qpid-proton,datawire\/qpid-proton,datawire\/qpid-proton,Karm\/qpid-proton,bozzzzo\/qpid-proton,RobertoMalatesta\/qpid-proton,gemmellr\/qpid-proton,clemensv\/qpid-proton,clemensv\/qpid-proton,Karm\/qpid-proton,astitcher\/qpid-proton,jeckersb\/Proton,bozzzzo\/qpid-proton,ssorj\/qpid-proton,bozzzzo\/qpid-proton,dcristoloveanu\/qpid-proton,prestona\/qpid-proton,clemensv\/qpid-proton,clemensv\/qpid-proton,ChugR\/qpid-proton,FlaPer87\/qpid-proton,alanconway\/qpid-proton,Karm\/qpid-proton,bozzzzo\/qpid-proton,bozzzzo\/qpid-proton,gemmellr\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,astitcher\/qpid-proton,jeckersb\/Proton,Azure\/qpid-proton,RobertoMalatesta\/qpid-proton,wprice\/qpid-proton,ssorj\/qpid-proton,dcristoloveanu\/qpid-proton,datawire\/qpid-proton,Karm\/qpid-proton,dcristoloveanu\/qpid-proton,prestona\/qpid-proton,gemmellr\/qpid-proton-j,dcristoloveanu\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,alanconway\/qpid-proton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- proton-c\/src\/engine\/engine.c\n+++ proton-c\/src\/engine\/engine.c\n@@ -1196,6 +1196,8 @@\n if (!delivery) return NULL;\n delivery->tag = pn_buffer(16);\n delivery->bytes = pn_buffer(64);\n+ } else {\n+ assert(!delivery->tpwork);\n }\n delivery->link = link;\n pn_buffer_clear(delivery->tag);\n@@ -1272,13 +1274,14 @@\n \n void *pn_delivery_get_context(pn_delivery_t *delivery)\n {\n- return delivery ? delivery->context : NULL;\n+ assert(delivery);\n+ return delivery->context;\n }\n \n void pn_delivery_set_context(pn_delivery_t *delivery, void *context)\n {\n- if (delivery)\n- delivery->context = context;\n+ assert(delivery);\n+ delivery->context = context;\n }\n \n pn_delivery_tag_t pn_delivery_tag(pn_delivery_t *delivery)\n@@ -1350,7 +1353,6 @@\n {\n pn_link_t *link = delivery->link;\n LL_REMOVE(link, unsettled, delivery);\n- \/\/ TODO: what if we settle the current delivery?\n LL_ADD(link, settled, delivery);\n pn_buffer_clear(delivery->tag);\n pn_buffer_clear(delivery->bytes);\n@@ -1359,6 +1361,7 @@\n \n void pn_full_settle(pn_delivery_buffer_t *db, pn_delivery_t *delivery)\n {\n+ assert(!delivery->work);\n pn_delivery_state_t *state = (pn_delivery_state_t *) delivery->transport_context;\n delivery->transport_context = NULL;\n if (state) state->delivery = NULL;\n"} {"commit":"08600d64b62ba653048697ae99bd3162a459b332","subject":"shut ami up, bad me.","message":"shut ami up, bad me.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/ami.c\n+++ dev\/ic\/ami.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ami.c,v 1.30 2005\/03\/29 22:24:27 marco Exp $\t*\/\n+\/*\t$OpenBSD: ami.c,v 1.31 2005\/04\/01 20:14:40 marco Exp $\t*\/\n \n \/*\n * Copyright (c) 2001 Michael Shalayeff\n@@ -45,7 +45,7 @@\n *\tTheo de Raadt.\n *\/\n \n-#define\tAMI_DEBUG\n+ \/*#define\tAMI_DEBUG *\/\n \n #include <sys\/param.h>\n #include <sys\/systm.h>\n@@ -1723,7 +1723,10 @@\n \tbus_dmamap_t idatamap;\n \tbus_dma_segment_t idataseg[1];\n \tpaddr_t\tpa;\n+\n+#ifdef AMI_DEBUG\n \tu_int8_t i = 0;\n+#endif \/* AMI_DEBUG *\/\n \n \tAMI_DPRINTF(AMI_D_IOCTL, (\"in passthrough\\n\"));\n \n"} {"commit":"105e5a12cb05a3ad4e37cf12d2928f4b71696e95","subject":"radio: browser: fix memory leak on station cover","message":"radio: browser: fix memory leak on station cover\n","repos":"dillya\/melo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/radio\/melo_radio_browser.c\n+++ modules\/radio\/melo_radio_browser.c\n@@ -241,6 +241,7 @@\n \/* Init media item *\/\n browser__response__media_item__init (&items[i]);\n media_list.items[i] = &items[i];\n+ tags__tags__init (&tags[i]);\n \n \/* Get next entry *\/\n obj = json_array_get_object_element (array, i);\n@@ -255,7 +256,6 @@\n items[i].actions = actions_ptr;\n \n \/* Set tags *\/\n- tags__tags__init (&tags[i]);\n items[i].tags = &tags[i];\n \n \/* Set cover *\/\n@@ -269,6 +269,11 @@\n msg = melo_message_new (browser__response__get_packed_size (&resp));\n melo_message_set_size (\n msg, browser__response__pack (&resp, melo_message_get_data (msg)));\n+\n+ \/* Free covers *\/\n+ for (i = 0; i < len; i++)\n+ if (tags[i].cover != protobuf_c_empty_string)\n+ g_free (tags[i].cover);\n \n \/* Free item list *\/\n free (items_ptr);\n"} {"commit":"a20fbca38d1adae9351b4777a5300f463003a56e","subject":"Add a macro for testing the e_machine field of Elf64_Ehdr.","message":"Add a macro for testing the e_machine field of Elf64_Ehdr.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/alpha\/include\/elf.h\n+++ sys\/alpha\/include\/elf.h\n@@ -23,7 +23,7 @@\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n *\n- * $Id: elf.h,v 1.1.1.1 1998\/03\/09 05:42:33 jb Exp $\n+ * $Id: elf.h,v 1.2 1998\/06\/10 10:54:57 dfr Exp $\n *\/\n \n #ifndef _MACHINE_ELF_H_\n@@ -34,6 +34,8 @@\n *\/\n \n #include <sys\/elf64.h>\t\/* Definitions common to all 64 bit architectures. *\/\n+\n+#define ELF_MACHINE_OK(x)\t((x) == EM_ALPHA)\n \n \/*\n * Auxiliary vector entries for passing information to the interpreter.\n"} {"commit":"67be01624fe30aca2dabcf5c50df8a4ba5ecc7bf","subject":"remove no longer used rate related variable\/defines","message":"remove no longer used rate related variable\/defines\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/atw.c\n+++ dev\/ic\/atw.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: atw.c,v 1.50 2007\/01\/03 18:16:43 claudio Exp $\t*\/\n+\/*\t$OpenBSD: atw.c,v 1.51 2007\/02\/14 04:46:44 jsg Exp $\t*\/\n \/*\t$NetBSD: atw.c,v 1.69 2004\/07\/23 07:07:55 dyoung Exp $\t*\/\n \n \/*-\n@@ -141,10 +141,6 @@\n *\/\n \n #define ATW_REFSLAVE\t\/* slavishly do what the reference driver does *\/\n-\n-#define\tVOODOO_DUR_11_ROUNDING\t\t0x01 \/* necessary *\/\n-#define\tVOODOO_DUR_2_4_SPECIALCASE\t0x02 \/* NOT necessary *\/\n-int atw_voodoo = VOODOO_DUR_11_ROUNDING;\n \n int atw_bbp_io_enable_delay = 20 * 1000;\n int atw_bbp_io_disable_delay = 2 * 1000;\n"} {"commit":"6605c73f36aa7f471f0f348c683689ecc3c8eec2","subject":"Always check the sensekey field on ATAPI returns Add INQUIRY to cmd2str.","message":"Always check the sensekey field on ATAPI returns\nAdd INQUIRY to cmd2str.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/ata\/ata-queue.c\n+++ sys\/dev\/ata\/ata-queue.c\n@@ -264,7 +264,7 @@\n \tif (request->result)\n \t break;\n \n-\tif (request->error & ATA_E_MASK) {\n+\tif (request->error) {\n \t switch ((request->error & ATA_SK_MASK)) {\n \t case ATA_SK_RECOVERED_ERROR:\n \t\tata_prtdev(request->device, \"WARNING - %s recovered error\\n\",\n@@ -297,6 +297,8 @@\n \t\t\t \"\\2NO_MEDIA\\1ILLEGAL_LENGTH\");\n \t\trequest->result = EIO;\n \t }\n+\t if (request->error & ATA_E_MASK)\n+\t\trequest->result = EIO;\n \t}\n \tbreak;\n }\n@@ -369,6 +371,7 @@\n \tcase 0x0a: return (\"WRITE\");\n \tcase 0x10: return (\"WEOF\");\n \tcase 0x11: return (\"SPACE\");\n+\tcase 0x12: return (\"INQUIRY\");\n \tcase 0x15: return (\"MODE_SELECT\");\n \tcase 0x19: return (\"ERASE\");\n \tcase 0x1a: return (\"MODE_SENSE\");\n"} {"commit":"09431a56fb3386c64d5119b11b25e42882f63600","subject":"correct some debugging printfs","message":"correct some debugging printfs\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/gem.c\n+++ dev\/ic\/gem.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: gem.c,v 1.33 2003\/07\/09 18:21:45 krw Exp $\t*\/\n+\/*\t$OpenBSD: gem.c,v 1.34 2003\/07\/15 03:52:30 jason Exp $\t*\/\n \/*\t$NetBSD: gem.c,v 1.1 2001\/09\/16 00:11:43 eeh Exp $ *\/\n \n \/*\n@@ -505,7 +505,6 @@\n \tbus_space_handle_t h = sc->sc_h;\n \tint i;\n \n-\n \t\/*\n \t * Resetting while DMA is in progress can cause a bus hang, so we\n \t * disable DMA first.\n@@ -517,7 +516,7 @@\n \t\tif ((bus_space_read_4(t, h, GEM_RX_CONFIG) & 1) == 0)\n \t\t\tbreak;\n \tif ((bus_space_read_4(t, h, GEM_RX_CONFIG) & 1) != 0)\n-\t\tprintf(\"%s: cannot disable read dma\\n\",\n+\t\tprintf(\"%s: cannot disable rx dma\\n\",\n \t\t\tsc->sc_dev.dv_xname);\n \n \t\/* Wait 5ms extra. *\/\n@@ -559,7 +558,7 @@\n \t\tif ((bus_space_read_4(t, h, GEM_TX_CONFIG) & 1) == 0)\n \t\t\tbreak;\n \tif ((bus_space_read_4(t, h, GEM_TX_CONFIG) & 1) != 0)\n-\t\tprintf(\"%s: cannot disable read dma\\n\",\n+\t\tprintf(\"%s: cannot disable tx dma\\n\",\n \t\t\tsc->sc_dev.dv_xname);\n \n \t\/* Wait 5ms extra. *\/\n@@ -572,7 +571,7 @@\n \t\tif ((bus_space_read_4(t, h, GEM_RESET) & GEM_RESET_TX) == 0)\n \t\t\tbreak;\n \tif ((bus_space_read_4(t, h, GEM_RESET) & GEM_RESET_TX) != 0) {\n-\t\tprintf(\"%s: cannot reset receiver\\n\",\n+\t\tprintf(\"%s: cannot reset transmitter\\n\",\n \t\t\tsc->sc_dev.dv_xname);\n \t\treturn (1);\n \t}\n"} {"commit":"e1058a41ca850c8d1513021390defc5a4e5c4b07","subject":"Charger: Silent error retrieving CHARGE_PORT_NONE input","message":"Charger: Silent error retrieving CHARGE_PORT_NONE input\n\nIn OCPC, the charger_get_params() function will regularly be calling\ncharger_get_input_current_limit() with the active charger chip. This\nmay be CHARGE_PORT_NONE if the board is not currently charging. In\nthese cases, silently return an invalid status.\n\nBRANCH=None\nBUG=None\nTEST=on drawcia, confirm no console spam with no active charger chip\n\nSigned-off-by: Diana Z <cb2016afc7183e5356c690dc63b4ba817470501a@chromium.org>\nChange-Id: I9a6b85584488f9381b1e1b8d7527b7ebd68a75e0\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/2580838\nReviewed-by: Aseda Aboagye <12c9b286316a940fd31c24070da5ab64cdd4d0e7@chromium.org>\nCommit-Queue: Aseda Aboagye <12c9b286316a940fd31c24070da5ab64cdd4d0e7@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- common\/charger.c\n+++ common\/charger.c\n@@ -473,7 +473,11 @@\n enum ec_error_list charger_get_input_current_limit(int chgnum,\n \t\t\t\t\t\t int *input_current)\n {\n-\tif (chgnum < 0 || chgnum >= board_get_charger_chip_count()) {\n+\t\/* Note: may be called with CHARGE_PORT_NONE regularly *\/\n+\tif (chgnum < 0)\n+\t\treturn EC_ERROR_INVAL;\n+\n+\tif (chgnum >= board_get_charger_chip_count()) {\n \t\tCPRINTS(\"%s(%d) Invalid charger!\", __func__, chgnum);\n \t\treturn EC_ERROR_INVAL;\n \t}\n"} {"commit":"ebbc873044d70fc8b8cbbd1b281559c33d3bcf43","subject":"There is no need for elaborate queries and error checking when trying to set FW4MSG_ENCAP.","message":"There is no need for elaborate queries and error checking when trying to\nset FW4MSG_ENCAP.\n\nMFC after:\t3 days\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/cxgbe\/t4_main.c\n+++ sys\/dev\/cxgbe\/t4_main.c\n@@ -2480,27 +2480,13 @@\n set_params__post_init(struct adapter *sc)\n {\n \tuint32_t param, val;\n-\tint rc;\n-\n+\n+\t\/* ask for encapsulated CPLs *\/\n \tparam = FW_PARAM_PFVF(CPLFW4MSG_ENCAP);\n-\trc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);\n-\tif (rc == 0) {\n-\t\t\/* ask for encapsulated CPLs *\/\n-\t\tparam = FW_PARAM_PFVF(CPLFW4MSG_ENCAP);\n-\t\tval = 1;\n-\t\trc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);\n-\t\tif (rc != 0) {\n-\t\t\tdevice_printf(sc->dev,\n-\t\t\t \"failed to set parameter (post_init): %d.\\n\", rc);\n-\t\t\treturn (rc);\n-\t\t}\n-\t} else if (rc != FW_EINVAL) {\n-\t\tdevice_printf(sc->dev,\n-\t\t \"failed to check for encapsulated CPLs: %d.\\n\", rc);\n-\t} else\n-\t\trc = 0;\t\/* the firmware doesn't support the param, no worries *\/\n-\n-\treturn (rc);\n+\tval = 1;\n+\t(void)t4_set_params(sc, sc->mbox, sc->pf, 0, 1, ¶m, &val);\n+\n+\treturn (0);\n }\n \n #undef FW_PARAM_PFVF\n"} {"commit":"e4e69b4bb2b2d78a20e63cd290fbf68d3406dcee","subject":"destroy: Implement internal API for phyp driver","message":"destroy: Implement internal API for phyp driver\n","repos":"shugaoye\/libvirt,trainstack\/libvirt,cbosdo\/libvirt,soulxu\/libvirt-xuhj,usc-isi\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,kantai\/libvirt-vfork,datto\/libvirt,iam-TJ\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,trainstack\/libvirt,agx\/libvirt,andreabolognani\/libvirt,kantai\/libvirt-vfork,jfehlig\/libvirt,shugaoye\/libvirt,danwent\/libvirt-ovs,leilihh\/libvirt,kantai\/libvirt-vfork,libvirt\/libvirt,jeckersb\/libvirt,soulxu\/libvirt-xuhj,soulxu\/libvirt-xuhj,elmarco\/libvirt,andreabolognani\/libvirt,rmarwaha\/libvirt,bjzhang\/libvirt,usc-isi\/libvirt,zippy2\/libvirt,siboulet\/libvirt-openvz,nertpinx\/libvirt,kantai\/libvirt-vfork,trainstack\/libvirt,iam-TJ\/libvirt,wiedi\/libvirt,VenkatDatta\/libvirt,warewolf\/libvirt,nertpinx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,leilihh\/libvirt,novel\/fbsd-libvirt,rlaager\/libvirt,emaste\/libvirt,emaste\/libvirt,usc-isi\/libvirt,cbosdo\/libvirt,jfehlig\/libvirt,novel\/fbsd-libvirt,wiedi\/libvirt,leilihh\/libvirt,foomango\/libvirt,jeckersb\/libvirt,soulxu\/libvirt-xuhj,agx\/libvirt,emaste\/libvirt,siboulet\/libvirt-openvz,usc-isi\/libvirt,jeckersb\/libvirt,siboulet\/libvirt-openvz,cbosdo\/libvirt,VenkatDatta\/libvirt,leilihh\/libvirt,shugaoye\/libvirt,jfehlig\/libvirt,rlaager\/libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt1,elmarco\/libvirt,bjzhang\/libvirt,libvirt\/libvirt,wiedi\/libvirt,shugaoye\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jeckersb\/libvirt,rmarwaha\/libvirt,bjzhang\/libvirt,iam-TJ\/libvirt,fabianfreyer\/libvirt,dumbbell\/libvirt,rmarwaha\/libvirt,trainstack\/libvirt,eskultety\/libvirt,rmarwaha\/libvirt1,zhlcindy\/libvirt-1.1.4-maintain,warewolf\/libvirt,dumbbell\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,agx\/libvirt,wiedi\/libvirt,agx\/libvirt,olafhering\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,shugaoye\/libvirt,iam-TJ\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,jeckersb\/libvirt,cbosdo\/libvirt,rmarwaha\/libvirt,datto\/libvirt,dumbbell\/libvirt,warewolf\/libvirt,zippy2\/libvirt,foomango\/libvirt,danwent\/libvirt-ovs,elmarco\/libvirt,trainstack\/libvirt,novel\/fbsd-libvirt,emaste\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,olafhering\/libvirt,bjzhang\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,taget\/libvirt,elmarco\/libvirt,jeckersb\/libvirt,zippy2\/libvirt,taget\/libvirt,wiedi\/libvirt,wiedi\/libvirt,jardasgit\/libvirt,foomango\/libvirt,datto\/libvirt,rlaager\/libvirt,trainstack\/libvirt,danwent\/libvirt-ovs,libvirt\/libvirt,danwent\/libvirt-ovs,elmarco\/libvirt,foomango\/libvirt,andreabolognani\/libvirt,libvirt\/libvirt,crobinso\/libvirt,wiedi\/libvirt,jfehlig\/libvirt,dumbbell\/libvirt,crobinso\/libvirt,kantai\/libvirt-vfork,taget\/libvirt,cbosdo\/libvirt,novel\/fbsd-libvirt,siboulet\/libvirt-openvz,novel\/fbsd-libvirt,jardasgit\/libvirt,warewolf\/libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt1,agx\/libvirt,leilihh\/libvirt,nertpinx\/libvirt,warewolf\/libvirt,datto\/libvirt,emaste\/libvirt,dumbbell\/libvirt,iam-TJ\/libvirt,foomango\/libvirt,emaste\/libvirt,soulxu\/libvirt-xuhj,fabianfreyer\/libvirt,novel\/fbsd-libvirt,leilihh\/libvirt,iam-TJ\/libvirt,taget\/libvirt,rmarwaha\/libvirt1,rmarwaha\/libvirt,emaste\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,rlaager\/libvirt,iam-TJ\/libvirt,taget\/libvirt,usc-isi\/libvirt,VenkatDatta\/libvirt,rlaager\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,rmarwaha\/libvirt1,novel\/fbsd-libvirt,rmarwaha\/libvirt1,rmarwaha\/libvirt,bjzhang\/libvirt,eskultety\/libvirt,datto\/libvirt,jeckersb\/libvirt,dumbbell\/libvirt,warewolf\/libvirt,siboulet\/libvirt-openvz,crobinso\/libvirt,warewolf\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,eskultety\/libvirt,danwent\/libvirt-ovs,VenkatDatta\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/phyp\/phyp_driver.c\n+++ src\/phyp\/phyp_driver.c\n@@ -3497,7 +3497,8 @@\n }\n \n static int\n-phypDomainDestroy(virDomainPtr dom)\n+phypDomainDestroyFlags(virDomainPtr dom,\n+ unsigned int flags)\n {\n int result = -1;\n ConnectionData *connection_data = dom->conn->networkPrivateData;\n@@ -3509,6 +3510,8 @@\n char *ret = NULL;\n virBuffer buf = VIR_BUFFER_INITIALIZER;\n \n+ virCheckFlags(0, -1);\n+\n virBufferAddLit(&buf, \"rmsyscfg\");\n if (system_type == HMC)\n virBufferAsprintf(&buf, \" -m %s\", managed_system);\n@@ -3528,6 +3531,12 @@\n VIR_FREE(ret);\n \n return result;\n+}\n+\n+static int\n+phypDomainDestroy(virDomainPtr dom)\n+{\n+ return phypDomainDestroyFlags(dom, 0);\n }\n \n static int\n@@ -3763,6 +3772,7 @@\n .domainShutdown = phypDomainShutdown, \/* 0.7.0 *\/\n .domainReboot = phypDomainReboot, \/* 0.9.1 *\/\n .domainDestroy = phypDomainDestroy, \/* 0.7.3 *\/\n+ .domainDestroyFlags = phypDomainDestroyFlags, \/* 0.9.4 *\/\n .domainGetInfo = phypDomainGetInfo, \/* 0.7.0 *\/\n .domainGetState = phypDomainGetState, \/* 0.9.2 *\/\n .domainSetVcpus = phypDomainSetCPU, \/* 0.7.3 *\/\n"} {"commit":"0728bc5a2a572ace4367f7344d2a20d5096dfca0","subject":"Enable tagged queueing.","message":"Enable tagged queueing.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/qlw.c\n+++ dev\/ic\/qlw.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: qlw.c,v 1.6 2014\/03\/08 16:04:02 kettenis Exp $ *\/\n+\/*\t$OpenBSD: qlw.c,v 1.7 2014\/03\/08 16:34:29 kettenis Exp $ *\/\n \n \/*\n * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>\n@@ -1275,6 +1275,9 @@\n \t\t}\n \t}\n \n+\tif (sc->sc_running && (xs->sc_link->quirks & SDEV_NOTAGS) == 0)\n+\t\tdir |= QLW_IOCB_CMD_SIMPLE_QUEUE;\n+\n \treq->req_flags = htole16(dir);\n \n \t\/*\n"} {"commit":"397cb6ff55c16de6362fe96f2049c662f4fed8bd","subject":"Solaris portability fix.","message":"Solaris portability fix.\n\n\ngit-svn-id: e875384d7a5ebd9b2def38a8354dae1fda8e73bc@3327 be551aaa-1e26-0410-a405-d3ace91eadb9\n","repos":"chantra\/unbound,chantra\/unbound,NLnetLabs\/unbound,chantra\/unbound,chantra\/unbound,chantra\/unbound,NLnetLabs\/unbound,NLnetLabs\/unbound,NLnetLabs\/unbound","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- smallapp\/unbound-control.c\n+++ smallapp\/unbound-control.c\n@@ -204,12 +204,12 @@\n \t\t\tfatal_exit(\"could not parse IP@port: %s\", svr);\n #ifdef HAVE_SYS_UN_H\n \t} else if(svr[0] == '\/') {\n-\t\tstruct sockaddr_un* sun = (struct sockaddr_un *) &addr;\n-\t\tsun->sun_family = AF_LOCAL;\n+\t\tstruct sockaddr_un* usock = (struct sockaddr_un *) &addr;\n+\t\tusock->sun_family = AF_LOCAL;\n #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN\n-\t\tsun->sun_len = (socklen_t)sizeof(sun);\n-#endif\n-\t\t(void)strlcpy(sun->sun_path, svr, sizeof(sun->sun_path));\n+\t\tusock->sun_len = (socklen_t)sizeof(usock);\n+#endif\n+\t\t(void)strlcpy(usock->sun_path, svr, sizeof(usock->sun_path));\n \t\taddrlen = (socklen_t)sizeof(struct sockaddr_un);\n \t\taddrfamily = AF_LOCAL;\n #endif\n"} {"commit":"abe4841beb138ceb047344c321ca7e12d928bb89","subject":"Don't try to sha1 an invalid avatar","message":"Don't try to sha1 an invalid avatar\n\n\n20061018171520-53eee-40a7f14e521c541685f102eaab43c9f457c3fe7d.gz\n","repos":"jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/vcard-manager.c\n+++ src\/vcard-manager.c\n@@ -282,9 +282,9 @@\n gchar *sha1;\n \n avatar = base64_decode (lm_message_node_get_value (binval));\n- sha1 = sha1_hex (avatar->str, avatar->len);\n if (avatar)\n {\n+ sha1 = sha1_hex (avatar->str, avatar->len);\n DEBUG (\"Successfully decoded PHOTO.BINVAL, SHA-1 %s\", sha1);\n g_signal_emit (self, signals[GOT_SELF_INITIAL_AVATAR], 0, sha1);\n }\n"} {"commit":"410b7f526d67274a6eaae57f524fbb5ee0fd7a99","subject":"- type definition of 'bx_vga_tminfo_t' fixed. MSVC doesn't like the other style of type definition.","message":"- type definition of 'bx_vga_tminfo_t' fixed. MSVC doesn't like the other style\n of type definition.\n","repos":"marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet,marmolejo\/bochs-zet","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gui\/gui.h\n+++ gui\/gui.h\n@@ -24,7 +24,7 @@\n \/\/ License along with this library; if not, write to the Free Software\n \/\/ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n \n-typedef struct bx_vga_tminfo_t {\n+typedef struct {\n Bit8u cs_start;\n Bit8u cs_end;\n Bit16u line_offset;\n@@ -32,7 +32,7 @@\n Bit8u h_panning;\n Bit8u v_panning;\n bx_bool line_graphics;\n-};\n+} bx_vga_tminfo_t;\n \n \n BOCHSAPI extern class bx_gui_c *bx_gui;\n"} {"commit":"b5b956bd214742892cd242ec38e4cc64c213e59e","subject":"Remove dead code.","message":"Remove dead code.\n","repos":"SymbiFlow\/nextpnr,YosysHQ\/nextpnr,YosysHQ\/nextpnr,SymbiFlow\/nextpnr,YosysHQ\/nextpnr,SymbiFlow\/nextpnr,SymbiFlow\/nextpnr,YosysHQ\/nextpnr","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- common\/nextpnr.h\n+++ common\/nextpnr.h\n@@ -347,8 +347,6 @@\n std::mutex mutex;\n pthread_t mutex_owner;\n \n- std::mutex generation_mutex;\n-\n public:\n std::unordered_map<IdString, std::unique_ptr<NetInfo>> nets;\n std::unordered_map<IdString, std::unique_ptr<CellInfo>> cells;\n"} {"commit":"3553317f2b05659a73567cd018e2fb08cd338b95","subject":"hal: enable ws2811 subsystem","message":"hal: enable ws2811 subsystem\n","repos":"janfietz\/tmb_musicplayer,janfietz\/tmb_musicplayer,janfietz\/tmb_musicplayer,janfietz\/tmb_musicplayer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- halconf.h\n+++ halconf.h\n@@ -174,7 +174,7 @@\n * @brief Enables the USB subsystem.\r\n *\/\r\n #if !defined(HAL_USE_WS281X) || defined(__DOXYGEN__)\r\n-#define HAL_USE_WS281X FALSE\r\n+#define HAL_USE_WS281X TRUE\r\n #endif\r\n \r\n \/**\r\n"} {"commit":"b58351ec2f7c057dcfe0aff883064039702a56d7","subject":"Set sync process_key_event in ibus-x11","message":"Set sync process_key_event in ibus-x11\n\nIf X11 client application spend time during XNextEvent(), e.g. sleep(1),\nunder async process_key_event(), X11 does not keep the event order.\nI don't know why the event order is broken but now set the sync mode.\n\nBUG=https:\/\/code.google.com\/p\/ibus\/issues\/detail?id=1697\nTEST=client\/x11\/ibus-x11\n\nReview URL: https:\/\/codereview.appspot.com\/240860043\n","repos":"fujiwarat\/ibus,fujiwarat\/ibus,ibus\/ibus,ibus\/ibus,ibus\/ibus,j717273419\/ibus,j717273419\/ibus,Keruspe\/ibus,fujiwarat\/ibus,Keruspe\/ibus,ibus\/ibus,j717273419\/ibus,Keruspe\/ibus,fujiwarat\/ibus,j717273419\/ibus,Keruspe\/ibus","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- client\/x11\/main.c\n+++ client\/x11\/main.c\n@@ -116,7 +116,7 @@\n \n static IBusBus *_bus = NULL;\n \n-static gboolean _use_sync_mode = FALSE;\n+static gboolean _use_sync_mode = TRUE;\n \n static void\n _xim_preedit_start (XIMS xims, const X11IC *x11ic)\n@@ -1015,7 +1015,8 @@\n g_signal_connect (_bus, \"disconnected\",\n G_CALLBACK (_bus_disconnected_cb), NULL);\n \n- _use_sync_mode = _get_boolean_env (\"IBUS_ENABLE_SYNC_MODE\", FALSE);\n+ \/* https:\/\/code.google.com\/p\/ibus\/issues\/detail?id=1697 *\/\n+ _use_sync_mode = _get_boolean_env (\"IBUS_ENABLE_SYNC_MODE\", TRUE);\n }\n \n static void\n"} {"commit":"68ea7e93611218dc4342f3dd0c0234dfa565dd9c","subject":"rename start command as launch","message":"rename start command as launch","repos":"gchauvet\/satellite,gchauvet\/satellite,gchauvet\/satellite","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- frontends\/phobos\/src\/main\/c\/phobos.c\n+++ frontends\/phobos\/src\/main\/c\/phobos.c\n@@ -63,7 +63,7 @@\n \r\n \/* Allowed commands *\/\r\n static LPCWSTR _commands[] = {\r\n- L\"RS\", \/* 1 Run Service *\/\r\n+ L\"LS\", \/* 1 launch Service *\/\r\n L\"US\", \/* 2 Update Service parameters *\/\r\n L\"IS\", \/* 3 Install Service *\/\r\n L\"DS\", \/* 4 Delete Service *\/\r\n@@ -73,7 +73,7 @@\n };\r\n \r\n static LPCWSTR _altcmds[] = {\r\n- L\"service\", \/* 1 Run Service *\/\r\n+ L\"launch\", \/* 1 Run Service *\/\r\n L\"update\", \/* 2 Update Service parameters *\/\r\n L\"install\", \/* 3 Install Service *\/\r\n L\"delete\", \/* 4 Delete Service *\/\r\n@@ -315,7 +315,7 @@\n fwprintf(stderr, L\" install [ServiceName] Install Service\\n\");\r\n fwprintf(stderr, L\" update [ServiceName] Update Service parameters\\n\");\r\n fwprintf(stderr, L\" delete [ServiceName] Delete Service\\n\");\r\n- fwprintf(stderr, L\" start [ServiceName] Start Service (used by Microsoft Service Control Manager)\\n\");\r\n+ fwprintf(stderr, L\" service [ServiceName] Start Service (used by Microsoft Service Control Manager)\\n\");\r\n fwprintf(stderr, L\" version Display version\\n\");\r\n fwprintf(stderr, L\" Options:\\n\");\r\n while (_options[i].szName) {\r\n@@ -508,7 +508,7 @@\n \/* Replace not needed quotes *\/\r\n apxStrQuoteInplaceW(szImage);\r\n \/* Add run-service command line option *\/\r\n- wcsncat(szImage, L\" start \", SIZ_HUGLEN);\r\n+ wcsncat(szImage, L\" launch \", SIZ_HUGLEN);\r\n wcsncat(szName, lpCmdline->szApplication, SIZ_BUFLEN);\r\n apxStrQuoteInplaceW(szName);\r\n wcsncat(szImage, szName, SIZ_HUGLEN);\r\n"} {"commit":"2dd713ebf4fcfbbc0cd361668793fa76861d0fff","subject":"Bump up the number of egress queues that the driver is allowed to use.","message":"Bump up the number of egress queues that the driver is allowed to use.\n\nMFC after:\t3 days\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/cxgbe\/t4_main.c\n+++ sys\/dev\/cxgbe\/t4_main.c\n@@ -415,7 +415,7 @@\n \n \t\/* These are total (sum of all ports) limits for a bus driver *\/\n \trc = -t4_cfg_pfvf(sc, sc->mbox, sc->pf, 0,\n-\t 64,\t\t\/* max # of egress queues *\/\n+\t 128,\t\/* max # of egress queues *\/\n \t 64,\t\t\/* max # of egress Ethernet or control queues *\/\n \t 64,\t\t\/* max # of ingress queues with fl\/interrupt *\/\n \t 0,\t\t\/* max # of ingress queues without interrupt *\/\n"} {"commit":"13efa7ec1a0ddcce04a6cb9b8c17fdef4dd1fd6e","subject":"remove more using files, and bogus header includes","message":"remove more using files, and bogus header includes\n","repos":"yantrabuddhi\/atomspace,williampma\/atomspace,gaapt\/opencog,iAMr00t\/opencog,kinoc\/opencog,williampma\/opencog,inflector\/opencog,TheNameIsNigel\/opencog,rTreutlein\/atomspace,yantrabuddhi\/atomspace,yantrabuddhi\/opencog,inflector\/opencog,gavrieltal\/opencog,Selameab\/atomspace,roselleebarle04\/opencog,jswiergo\/atomspace,roselleebarle04\/opencog,printedheart\/atomspace,AmeBel\/opencog,rTreutlein\/atomspace,ArvinPan\/atomspace,virneo\/opencog,Tiggels\/opencog,gavrieltal\/opencog,anitzkin\/opencog,kinoc\/opencog,eddiemonroe\/atomspace,williampma\/opencog,misgeatgit\/opencog,rodsol\/atomspace,Tiggels\/opencog,sumitsourabh\/opencog,Tiggels\/opencog,MarcosPividori\/atomspace,gaapt\/opencog,misgeatgit\/opencog,AmeBel\/atomspace,gaapt\/opencog,inflector\/atomspace,TheNameIsNigel\/opencog,cosmoharrigan\/atomspace,ceefour\/opencog,Tiggels\/opencog,iAMr00t\/opencog,jlegendary\/opencog,eddiemonroe\/atomspace,Selameab\/opencog,gaapt\/opencog,rodsol\/opencog,AmeBel\/atomspace,Allend575\/opencog,ArvinPan\/atomspace,AmeBel\/opencog,rohit12\/opencog,ceefour\/atomspace,jlegendary\/opencog,jlegendary\/opencog,rohit12\/opencog,kim135797531\/opencog,rTreutlein\/atomspace,andre-senna\/opencog,cosmoharrigan\/opencog,yantrabuddhi\/atomspace,virneo\/opencog,ArvinPan\/atomspace,cosmoharrigan\/opencog,ruiting\/opencog,Selameab\/opencog,printedheart\/opencog,williampma\/opencog,UIKit0\/atomspace,shujingke\/opencog,misgeatgit\/opencog,virneo\/opencog,Allend575\/opencog,ceefour\/atomspace,gaapt\/opencog,printedheart\/opencog,iAMr00t\/opencog,rohit12\/atomspace,inflector\/atomspace,AmeBel\/opencog,ruiting\/opencog,eddiemonroe\/opencog,iAMr00t\/opencog,kinoc\/opencog,zhaozengguang\/opencog,roselleebarle04\/opencog,inflector\/atomspace,Selameab\/atomspace,zhaozengguang\/opencog,misgeatgit\/opencog,andre-senna\/opencog,gavrieltal\/opencog,eddiemonroe\/atomspace,shujingke\/opencog,AmeBel\/opencog,printedheart\/opencog,inflector\/atomspace,ceefour\/opencog,yantrabuddhi\/opencog,misgeatgit\/opencog,Selameab\/opencog,misgeatgit\/opencog,eddiemonroe\/opencog,ArvinPan\/opencog,gaapt\/opencog,virneo\/atomspace,prateeksaxena2809\/opencog,yantrabuddhi\/atomspace,williampma\/atomspace,cosmoharrigan\/atomspace,ruiting\/opencog,misgeatgit\/atomspace,printedheart\/atomspace,ArvinPan\/opencog,prateeksaxena2809\/opencog,virneo\/atomspace,eddiemonroe\/atomspace,shujingke\/opencog,gavrieltal\/opencog,tim777z\/opencog,kim135797531\/opencog,ceefour\/opencog,rodsol\/atomspace,kim135797531\/opencog,yantrabuddhi\/atomspace,virneo\/atomspace,roselleebarle04\/opencog,inflector\/opencog,virneo\/opencog,misgeatgit\/opencog,yantrabuddhi\/opencog,ceefour\/opencog,kim135797531\/opencog,rohit12\/atomspace,sumitsourabh\/opencog,inflector\/opencog,misgeatgit\/atomspace,eddiemonroe\/opencog,TheNameIsNigel\/opencog,UIKit0\/atomspace,Tiggels\/opencog,cosmoharrigan\/atomspace,Selameab\/atomspace,Tiggels\/opencog,prateeksaxena2809\/opencog,williampma\/opencog,tim777z\/opencog,anitzkin\/opencog,prateeksaxena2809\/opencog,inflector\/opencog,AmeBel\/atomspace,zhaozengguang\/opencog,TheNameIsNigel\/opencog,sanuj\/opencog,shujingke\/opencog,ArvinPan\/opencog,ceefour\/opencog,MarcosPividori\/atomspace,williampma\/atomspace,rodsol\/opencog,tim777z\/opencog,printedheart\/atomspace,virneo\/opencog,UIKit0\/atomspace,misgeatgit\/atomspace,gavrieltal\/opencog,shujingke\/opencog,jswiergo\/atomspace,ruiting\/opencog,Allend575\/opencog,yantrabuddhi\/opencog,sanuj\/opencog,cosmoharrigan\/opencog,williampma\/opencog,cosmoharrigan\/atomspace,kinoc\/opencog,MarcosPividori\/atomspace,rodsol\/atomspace,sanuj\/opencog,jswiergo\/atomspace,ruiting\/opencog,kim135797531\/opencog,jlegendary\/opencog,sanuj\/opencog,prateeksaxena2809\/opencog,rTreutlein\/atomspace,ceefour\/opencog,jlegendary\/opencog,andre-senna\/opencog,zhaozengguang\/opencog,TheNameIsNigel\/opencog,MarcosPividori\/atomspace,sumitsourabh\/opencog,ArvinPan\/atomspace,ceefour\/atomspace,Allend575\/opencog,eddiemonroe\/opencog,eddiemonroe\/opencog,virneo\/opencog,rodsol\/atomspace,iAMr00t\/opencog,zhaozengguang\/opencog,anitzkin\/opencog,andre-senna\/opencog,Selameab\/atomspace,rohit12\/atomspace,jlegendary\/opencog,ruiting\/opencog,anitzkin\/opencog,jlegendary\/opencog,misgeatgit\/atomspace,eddiemonroe\/opencog,ceefour\/opencog,sumitsourabh\/opencog,misgeatgit\/atomspace,anitzkin\/opencog,ruiting\/opencog,ArvinPan\/opencog,williampma\/opencog,sumitsourabh\/opencog,andre-senna\/opencog,shujingke\/opencog,shujingke\/opencog,gavrieltal\/opencog,AmeBel\/atomspace,AmeBel\/atomspace,yantrabuddhi\/opencog,rohit12\/opencog,anitzkin\/opencog,kim135797531\/opencog,printedheart\/opencog,inflector\/opencog,rodsol\/opencog,gaapt\/opencog,rodsol\/opencog,AmeBel\/opencog,rohit12\/atomspace,inflector\/atomspace,ArvinPan\/opencog,printedheart\/atomspace,kim135797531\/opencog,misgeatgit\/opencog,andre-senna\/opencog,rohit12\/opencog,Selameab\/opencog,yantrabuddhi\/opencog,zhaozengguang\/opencog,kinoc\/opencog,prateeksaxena2809\/opencog,sumitsourabh\/opencog,cosmoharrigan\/opencog,ArvinPan\/opencog,misgeatgit\/opencog,kinoc\/opencog,roselleebarle04\/opencog,sanuj\/opencog,rohit12\/opencog,tim777z\/opencog,cosmoharrigan\/opencog,Allend575\/opencog,AmeBel\/opencog,Selameab\/opencog,rodsol\/opencog,rodsol\/opencog,jswiergo\/atomspace,inflector\/opencog,Selameab\/opencog,sanuj\/opencog,eddiemonroe\/opencog,williampma\/atomspace,ceefour\/atomspace,printedheart\/opencog,rohit12\/opencog,anitzkin\/opencog,roselleebarle04\/opencog,UIKit0\/atomspace,eddiemonroe\/atomspace,cosmoharrigan\/opencog,sumitsourabh\/opencog,inflector\/opencog,rTreutlein\/atomspace,virneo\/opencog,gavrieltal\/opencog,Allend575\/opencog,printedheart\/opencog,tim777z\/opencog,iAMr00t\/opencog,virneo\/atomspace,andre-senna\/opencog,roselleebarle04\/opencog,TheNameIsNigel\/opencog,kinoc\/opencog,prateeksaxena2809\/opencog,Allend575\/opencog,yantrabuddhi\/opencog,AmeBel\/opencog,tim777z\/opencog","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/comboreduct\/reduct\/using.h\n+++ opencog\/comboreduct\/reduct\/using.h\n@@ -1,57 +0,0 @@\n-\/*\n- * opencog\/comboreduct\/reduct\/using.h\n- *\n- * Copyright (C) 2002-2008 Novamente LLC\n- * All Rights Reserved\n- *\n- * Written by Moshe Looks\n- *\n- * This program is free software; you can redistribute it and\/or modify\n- * it under the terms of the GNU Affero General Public License v3 as\n- * published by the Free Software Foundation and including the exceptions\n- * at http:\/\/opencog.org\/wiki\/Licenses\n- *\n- * This program is distributed in the hope that it will be useful,\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n- * GNU General Public License for more details.\n- *\n- * You should have received a copy of the GNU Affero General Public License\n- * along with this program; if not, write to:\n- * Free Software Foundation, Inc.,\n- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n- *\/\n-#ifndef _REDUCT_USING_H\n-#define _REDUCT_USING_H\n-\n-#include <boost\/variant.hpp>\n-\/\/#include <boost\/bind.hpp>\n-#include <boost\/iterator\/counting_iterator.hpp>\n-#include <boost\/iterator\/indirect_iterator.hpp>\n-#include <boost\/ptr_container\/ptr_vector.hpp>\n-\n-#include <opencog\/comboreduct\/combo\/vertex.h>\n-\n-#include <functional>\n-#include <algorithm>\n-\n-\/\/\/ anything that gets imported into the reduct namespace with a using\n-\/\/\/ directive should go here\n-namespace opencog { namespace reduct {\n-using namespace opencog::combo;\n-using boost::variant;\n-using boost::static_visitor;\n-\/\/ using boost::bind;\n-using boost::make_counting_iterator;\n-using boost::make_indirect_iterator;\n-using boost::apply_visitor;\n-using boost::ptr_vector;\n-using std::find_if;\n-using std::distance;\n-using std::make_pair; \n-using std::shared_ptr;\n-\n-} \/\/ ~namespace reduct\n-} \/\/ ~namespace opencog\n-\n-#endif\n"} {"commit":"7cc153206e26d3315e5312ee76d8844db59623f4","subject":"This commit was generated by cvs2svn to compensate for changes in r33827, which included commits to RCS files with non-trunk default branches.","message":"This commit was generated by cvs2svn to compensate for changes in r33827,\nwhich included commits to RCS files with non-trunk default branches.\n\n","repos":"marschap\/pkg-opensc,marschap\/pkg-opensc,marschap\/pkg-opensc,marschap\/pkg-opensc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pkcs11\/mechanism.c\n+++ src\/pkcs11\/mechanism.c\n@@ -17,7 +17,7 @@\n \tsc_pkcs11_mechanism_type_t *sign_type;\n };\n \n-\/* Also used for verification data *\/\n+\/* Also used for verification and decryption data *\/\n struct signature_data {\n \tstruct sc_pkcs11_object *key;\n \tstruct hash_signature_info *info;\n@@ -639,6 +639,103 @@\n #endif\n \n \/*\n+ * Initialize a decryption context. When we get here, we know\n+ * the key object is capable of decrypting _something_\n+ *\/\n+CK_RV\n+sc_pkcs11_decr_init(struct sc_pkcs11_session *session,\n+\t\t\tCK_MECHANISM_PTR pMechanism,\n+\t\t\tstruct sc_pkcs11_object *key,\n+\t\t\tCK_MECHANISM_TYPE key_type)\n+{\n+\tstruct sc_pkcs11_card *p11card;\n+\tsc_pkcs11_operation_t *operation;\n+\tsc_pkcs11_mechanism_type_t *mt;\n+\tCK_RV rv;\n+\n+\tif (!session || !session->slot\n+\t || !(p11card = session->slot->card))\n+\t\treturn CKR_ARGUMENTS_BAD;\n+\n+\t\/* See if we support this mechanism type *\/\n+\tmt = sc_pkcs11_find_mechanism(p11card, pMechanism->mechanism, CKF_DECRYPT);\n+\tif (mt == NULL)\n+\t\treturn CKR_MECHANISM_INVALID;\n+\n+\t\/* See if compatible with key type *\/\n+\tif (mt->key_type != key_type)\n+\t\treturn CKR_KEY_TYPE_INCONSISTENT;\n+\n+\trv = session_start_operation(session, SC_PKCS11_OPERATION_DECRYPT, mt, &operation);\n+\tif (rv != CKR_OK)\n+\t\treturn rv;\n+\n+\tmemcpy(&operation->mechanism, pMechanism, sizeof(CK_MECHANISM));\n+\trv = mt->decrypt_init(operation, key);\n+\n+\tif (rv != CKR_OK)\n+\t\tsession_stop_operation(session, SC_PKCS11_OPERATION_DECRYPT);\n+\n+\treturn rv;\n+}\n+\n+CK_RV\n+sc_pkcs11_decr(struct sc_pkcs11_session *session,\n+\t\tCK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen,\n+\t\tCK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen)\n+{\n+\tsc_pkcs11_operation_t *op;\n+\tint rv;\n+\n+\trv = session_get_operation(session, SC_PKCS11_OPERATION_DECRYPT, &op);\n+\tif (rv != CKR_OK)\n+\t\treturn rv;\n+\n+\trv = op->type->decrypt(op, pEncryptedData, ulEncryptedDataLen,\n+\t pData, pulDataLen);\n+\n+\tif (rv != CKR_BUFFER_TOO_SMALL && pData != NULL)\n+\t\tsession_stop_operation(session, SC_PKCS11_OPERATION_DECRYPT);\n+\n+\treturn rv;\n+}\n+\n+\/*\n+ * Initialize a signature operation\n+ *\/\n+static CK_RV\n+sc_pkcs11_decrypt_init(sc_pkcs11_operation_t *operation,\n+\t\t\tstruct sc_pkcs11_object *key)\n+{\n+\tstruct signature_data *data;\n+\n+\tif (!(data = (struct signature_data *) calloc(1, sizeof(*data))))\n+\t\treturn CKR_HOST_MEMORY;\n+\n+\tdata->key = key;\n+\n+\toperation->priv_data = data;\n+\treturn CKR_OK;\n+}\n+\n+static CK_RV\n+sc_pkcs11_decrypt(sc_pkcs11_operation_t *operation,\n+\t\tCK_BYTE_PTR pEncryptedData, CK_ULONG ulEncryptedDataLen,\n+\t\tCK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen)\n+{\n+\tstruct signature_data *data;\n+\tstruct sc_pkcs11_object *key;\n+\n+\tdata = (struct signature_data*) operation->priv_data;\n+\n+\tkey = data->key;\n+\treturn key->ops->decrypt(operation->session,\n+\t\t\t\tkey, &operation->mechanism,\n+\t\t\t\tpEncryptedData, ulEncryptedDataLen,\n+\t\t\t\tpData, pulDataLen);\n+}\n+\n+\/*\n * Create new mechanism type for a mechanism supported by\n * the card\n *\/\n@@ -675,6 +772,10 @@\n \tif (pInfo->flags & CKF_UNWRAP) {\n \t\t\/* ... *\/\n \t}\n+\tif (pInfo->flags & CKF_DECRYPT) {\n+\t\tmt->decrypt_init = sc_pkcs11_decrypt_init;\n+\t\tmt->decrypt = sc_pkcs11_decrypt;\n+\t}\n \n \treturn mt;\n }\n"} {"commit":"41ea987c386b19dd5c92cb91a8c726638143095b","subject":"dumppredjoin: fix leaks","message":"dumppredjoin: fix leaks\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- monetdb5\/extras\/jaql\/jaqlgencode.c\n+++ monetdb5\/extras\/jaql\/jaqlgencode.c\n@@ -1092,7 +1092,7 @@\n \tjson_var *vars, *ljv, *rjv;\n \tjoin_result *jro = NULL, *jrs = NULL, *jrw = NULL, *jrl, *jrr = NULL, *jrn, *jrv, *jrp;\n \n-\tjgvar *jgraph = NULL;\n+\tjgvar *jgraph = NULL, *ograph = NULL;\n \n \t\/* iterate through all predicates and load the set from the correct\n \t * JSON variable *\/\n@@ -1505,7 +1505,7 @@\n \t\t}\n \t}\n \n-\tjgraph = calculatejoingraph(jrs);\n+\tograph = jgraph = calculatejoingraph(jrs);\n \t\/* FIXME: at this point, there may be joins like a->c, while there\n \t * is a->b->c, in which case a->c is a reduction on a and c, having\n \t * effect on everything inbetween (only b in this case) *\/\n@@ -2016,6 +2016,11 @@\n \t\tjrs = jrw->next;\n \t\tGDKfree(jrw);\n \t}\n+\tfor (jgraph = ograph->next; jgraph != NULL; jgraph = jgraph->next) {\n+\t\tGDKfree(jgraph->prev);\n+\t\tograph = jgraph;\n+\t}\n+\tGDKfree(ograph);\n }\n \n static int\n"} {"commit":"d47dbfada41aa4fb5df9f7cffe873786fc4849cc","subject":"client\/x11: Enhance Xutf8TextListToTextProperty","message":"client\/x11: Enhance Xutf8TextListToTextProperty\n\nXCompoundTextStyle depends on the current locale and some locales fail\nto to get the compound text style.\nIf Xutf8TextListToTextProperty() fails, now ibus-x11 tries to get\nthe compound text style with UTF-8 encoding.\n\nBUG=https:\/\/github.com\/ibus\/ibus\/issues\/2422\n","repos":"fujiwarat\/ibus,ibus\/ibus,fujiwarat\/ibus,fujiwarat\/ibus,ibus\/ibus,ibus\/ibus,fujiwarat\/ibus,ibus\/ibus","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- client\/x11\/main.c\n+++ client\/x11\/main.c\n@@ -2,7 +2,7 @@\n \/* vim:set et sts=4: *\/\n \/* ibus\n * Copyright (C) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>\n- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>\n+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>\n * Copyright (C) 2007-2015 Red Hat, Inc.\n *\n * main.c:\n@@ -47,6 +47,8 @@\n #include <stdlib.h>\n \n #include <getopt.h>\n+\n+#define ESC_SEQUENCE_ISO10646_1 \"\\033%G\"\n \n #define LOG(level, fmt_args...) \\\n if (g_debug_level >= (level)) { \\\n@@ -254,9 +256,17 @@\n text.feedback = feedback;\n \n if (len > 0) {\n- Xutf8TextListToTextProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),\n- (char **)&preedit_string,\n- 1, XCompoundTextStyle, &tp);\n+ int ret = Xutf8TextListToTextProperty (\n+ GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),\n+ (char **)&preedit_string,\n+ 1, XCompoundTextStyle, &tp);\n+ if (ret == EXIT_FAILURE) {\n+ XFree (tp.value);\n+ tp.value = (unsigned char *)g_strdup_printf (\n+ \"%s%s\",\n+ ESC_SEQUENCE_ISO10646_1,\n+ preedit_string);\n+ }\n text.encoding_is_wchar = 0;\n text.length = strlen ((char*)tp.value);\n text.string.multi_byte = (char*)tp.value;\n@@ -883,9 +893,26 @@\n \n XTextProperty tp;\n IMCommitStruct cms = {0};\n-\n- Xutf8TextListToTextProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),\n- (gchar **)&(text->text), 1, XCompoundTextStyle, &tp);\n+ int ret;\n+\n+ ret = Xutf8TextListToTextProperty (\n+ GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),\n+ (gchar **)&(text->text), 1, XCompoundTextStyle, &tp);\n+ \/* XCompoundTextStyle uses the encoding escaped sequence + encoded chars\n+ * matched to the specified multibyte characters: text->text, and\n+ * libX11.so sorts the encoding sets by locale.\n+ * If an encoded string fails to be matched, ibus-x11 specifies the\n+ * ISO10641-1 encoding and that escaped sequence is \"\\033%G\":\n+ * https:\/\/gitlab.freedesktop.org\/xorg\/lib\/libx11\/-\/blob\/master\/src\/xlibi18n\/lcCT.c\n+ * , and the encoding is UTF-8 with utf8_wctomb():\n+ * https:\/\/gitlab.freedesktop.org\/xorg\/lib\/libx11\/-\/blob\/master\/src\/xlibi18n\/lcUniConv\/utf8.h\n+ *\/\n+ if (ret == EXIT_FAILURE) {\n+ XFree (tp.value);\n+ tp.value = (unsigned char *)g_strdup_printf (\"%s%s\",\n+ ESC_SEQUENCE_ISO10646_1,\n+ text->text);\n+ }\n \n cms.major_code = XIM_COMMIT;\n cms.icid = x11ic->icid;\n"} {"commit":"47c8be74f62c75c5a1f8e6b2f9a150fa925b98c2","subject":"[MS] Adjust default COV threshold.","message":"[MS] Adjust default COV threshold.\n","repos":"chaoran\/hpc-queue,chaoran\/hpc-queue,chaoran\/hpc-queue,chaoran\/fast-wait-free-queue,chaoran\/fast-wait-free-queue,chaoran\/fast-wait-free-queue","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- harness.c\n+++ harness.c\n@@ -15,7 +15,7 @@\n #endif\n \n #ifndef COV_THRESHOLD\n-#define COV_THRESHOLD 0.02\n+#define COV_THRESHOLD 0.01\n #endif\n \n static double times[NUM_ITERS];\n"} {"commit":"be3204b3ccd45933439b4af37514d1960754f2eb","subject":"Compiling","message":"Compiling\n","repos":"nmoya\/3d-image-processing,nmoya\/3d-image-processing,nmoya\/3d-image-processing","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/visualization.c\n+++ src\/visualization.c\n@@ -1068,7 +1068,45 @@\n gc->viewdir->V = TransformVector(gc->viewdir->Rinv, gc->viewdir->V);\n }\n }\n-\n+Image *ObjectBorders(Image *bin, AdjRel *A)\n+{\n+ Image *border = CreateImage(bin->xsize, bin->ysize, bin->zsize);\n+ int i, p, q;\n+ Voxel u, v;\n+\n+ for (u.z = 0; u.z < bin->zsize; u.z++)\n+ for (u.y = 0; u.y < bin->ysize; u.y++)\n+ for (u.x = 0; u.x < bin->xsize; u.x++)\n+ {\n+ p = GetVoxelIndex(bin, u);\n+ if (bin->val[p] != 0)\n+ {\n+ for (i = 1; i < A->n; i++)\n+ {\n+ v.x = u.x + A->adj[i].dx;\n+ v.y = u.y + A->adj[i].dy;\n+ v.z = u.z + A->adj[i].dz;\n+ if (ValidVoxel(bin, v))\n+ {\n+ q = GetVoxelIndex(bin, v);\n+ if (bin->val[q] == 0)\n+ {\n+ border->val[p] = 255;\n+ break;\n+ }\n+ }\n+ else\n+ {\n+ border->val[p] = 255;\n+ break;\n+ }\n+ }\n+ }\n+ }\n+ CopyVoxelSize(bin, border);\n+\n+ return (border);\n+}\n void SetObjectNormal(GraphicalContext *gc)\n {\n AdjRel *A;\n@@ -1078,7 +1116,7 @@\n int i, p, q;\n Voxel u, v;\n Vector N;\n- Set *S = NULL;\n+ Image *borders = NULL;\n \n if (gc->label == NULL)\n Error(\"Object labels are required\", \"SetObjectNormal\");\n@@ -1090,7 +1128,7 @@\n \n A = Spheric(sqrtf(3.0));\n dist = ShellSignedDistTrans(gc->label, A, 5);\n- S = ObjectBorderSet(gc->label, A);\n+ borders = ObjectBorders(gc->label, A);\n DestroyAdjRel(&A);\n \n \/* estimate object-based normal vectors and set opacity scene for the shell *\/\n@@ -1103,46 +1141,47 @@\n for (i = 0; i < A->n; i++)\n mag[i] = sqrtf(A->adj[i].dx * A->adj[i].dx + A->adj[i].dy * A->adj[i].dy + A->adj[i].dz * A->adj[i].dz);\n \n- while (S != NULL)\n- {\n-\n- p = RemoveSet(&S);\n-\n- gc->opacity->val[p] = 1.0;\n-\n- u = FGetVoxelCoord(dist, p);\n- N.x = N.y = N.z = 0.0;\n-\n- for (i = 1; i < A->n; i++)\n- {\n- v = GetAdjacentVoxel(A, u, i);\n+ for (p = 0; p < borders->n; p++)\n+ {\n+ if (borders->val[p] != 0)\n+ {\n+ gc->opacity->val[p] = 1.0;\n+\n+ u = GetVoxelCoord(dist, p);\n+ N.x = N.y = N.z = 0.0;\n+\n+ for (i = 1; i < A->n; i++)\n+ {\n+ v = GetAdjacentVoxel(A, u, i);\n+ if (FValidVoxel(dist, v))\n+ {\n+ q = FGetVoxelIndex(dist, v);\n+ Delta = dist->val[q] - dist->val[p];\n+ N.x += Delta * A->adj[i].dx \/ mag[i];\n+ N.y += Delta * A->adj[i].dy \/ mag[i];\n+ N.z += Delta * A->adj[i].dz \/ mag[i];\n+ }\n+ }\n+\n+ \/* force normal to point outward the object *\/\n+ N = NormalizeVector(N);\n+ v.x = ROUND(u.x + N.x); v.y = ROUND(u.y + N.y); v.z = ROUND(u.z + N.z);\n if (FValidVoxel(dist, v))\n {\n q = FGetVoxelIndex(dist, v);\n- Delta = dist->val[q] - dist->val[p];\n- N.x += Delta * A->adj[i].dx \/ mag[i];\n- N.y += Delta * A->adj[i].dy \/ mag[i];\n- N.z += Delta * A->adj[i].dz \/ mag[i];\n+ if (gc->label->val[q] != 0)\n+ {\n+ N.x = -N.x; N.y = -N.y; N.z = -N.z;\n+ }\n }\n- }\n-\n- \/* force normal to point outward the object *\/\n- N = NormalizeVector(N);\n- v.x = ROUND(u.x + N.x); v.y = ROUND(u.y + N.y); v.z = ROUND(u.z + N.z);\n- if (FValidVoxel(dist, v))\n- {\n- q = FGetVoxelIndex(dist, v);\n- if (gc->label->val[q] != 0)\n- {\n- N.x = -N.x; N.y = -N.y; N.z = -N.z;\n- }\n- }\n- gc->normal->val[p] = GetNormalIndex(N);\n+ gc->normal->val[p] = GetNormalIndex(N);\n+ }\n }\n \n free(mag);\n- DestroyAdjRel(&A);\n- DestroyFImage(&dist);\n+ DestroyAdjRel(A);\n+ DestroyImage(borders);\n+ DestroyFImage(dist);\n \n }\n \n"} {"commit":"03790daf0ef18da07a62c9461c2f4e9690fdb479","subject":"Convert the #if 0 magic to #if SCAN_IICBUS, and make it actually compile again. While it's not generally recommended anymore, it might still prove useful for debugging purposes.","message":"Convert the #if 0 magic to #if SCAN_IICBUS, and make it actually compile\nagain. While it's not generally recommended anymore, it might still prove\nuseful for debugging purposes.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/iicbus\/iicbus.c\n+++ sys\/dev\/iicbus\/iicbus.c\n@@ -47,6 +47,9 @@\n \n static devclass_t iicbus_devclass;\n \n+\/* See comments below for why auto-scanning is a bad idea. *\/\n+#define SCAN_IICBUS 0\n+\n \/*\n * Device methods\n *\/\n@@ -83,7 +86,7 @@\n \treturn (0);\n }\n \n-#if 0\n+#if SCAN_IICBUS\n static int \n iic_probe_device(device_t dev, u_char addr)\n {\n@@ -113,6 +116,10 @@\n static int\n iicbus_attach(device_t dev)\n {\n+#if SCAN_IICBUS\n+\tunsigned char addr;\n+#endif\n+\n \tiicbus_reset(dev, IIC_FASTEST, 0, NULL);\n \n \t\/* device probing is meaningless since the bus is supposed to be\n@@ -120,11 +127,11 @@\n \t * accesses like stop after start to fast, reads for less than\n \t * x bytes...\n \t *\/\n-#if 0\n+#if SCAN_IICBUS\n \tprintf(\"Probing for devices on iicbus%d:\", device_get_unit(dev));\n \n \t\/* probe any devices *\/\n-\tfor (addr = FIRST_SLAVE_ADDR; addr <= LAST_SLAVE_ADDR; addr++) {\n+\tfor (addr = 16; addr < 240; addr++) {\n \t\tif (iic_probe_device(dev, (u_char)addr)) {\n \t\t\tprintf(\" <%x>\", addr);\n \t\t}\n"} {"commit":"06b753ec09a7ef8ae93992b3faaf009d4fc7fc8c","subject":"Ensure newline at end of file (suppress warning)","message":"Ensure newline at end of file (suppress warning)\n","repos":"blanham\/PDCLib,blanham\/PDCLib,blanham\/PDCLib,blanham\/PDChickenLib,blanham\/PDChickenLib,blanham\/PDChickenLib","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- functions\/uchar\/_PDCLIB_c32srtombs.c\n+++ functions\/uchar\/_PDCLIB_c32srtombs.c\n@@ -58,4 +58,4 @@\n TESTCASE( NO_TESTDRIVER );\n return TEST_RESULTS;\n }\n-#endif+#endif\n"} {"commit":"1a5d301def03e7800eaba94bf3fc6abbef0eb091","subject":"Fix a mangled comment.","message":"Fix a mangled comment.\n","repos":"leemichaelRazer\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,leemichaelRazer\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,leemichaelRazer\/OSVR-Core,leemichaelRazer\/OSVR-Core,godbyk\/OSVR-Core,leemichaelRazer\/OSVR-Core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- inc\/osvr\/PluginHost\/PluginSpecificRegistrationContext.h\n+++ inc\/osvr\/PluginHost\/PluginSpecificRegistrationContext.h\n@@ -53,14 +53,11 @@\n \/\/\/ context. Ownership is transferred to the caller.\n \/\/\/\n \/\/\/ Typically called by a RegistrationContext in the loadPlugin method,\n- \/\/\/ this\n- \/\/\/ may also be used for statically-linked \"plugins\" whether in\n- \/\/\/ deployment\n- \/\/\/ or testing.\n+ \/\/\/ this may also be used for statically-linked \"plugins\" whether in\n+ \/\/\/ deployment or testing.\n \/\/\/\n \/\/\/ @param name The plugin name, conventionally in an\n- \/\/\/ underscore-delimited\n- \/\/\/ reverse DNS format.\n+ \/\/\/ underscore-delimited reverse DNS format.\n OSVR_PLUGINHOST_EXPORT static PluginRegPtr\n create(std::string const &name);\n \n"} {"commit":"bf24959918149ddaa97b905ce6aaedd67b6625f0","subject":"runtime: fix buffer overflow in make(chan) On 32-bits one can arrange make(chan) params so that the chan buffer gives you access to whole memory.","message":"runtime: fix buffer overflow in make(chan)\nOn 32-bits one can arrange make(chan) params so that\nthe chan buffer gives you access to whole memory.\n\nLGTM=r\nR=golang-codereviews, r\nCC=bradfitz, golang-codereviews, iant, khr\nhttps:\/\/codereview.appspot.com\/50250045\n","repos":"tv42\/old-go,pombredanne\/go-deleteme,pombredanne\/go-deleteme,pombredanne\/go-deleteme,tv42\/old-go,tv42\/old-go,tv42\/old-go,pombredanne\/go-deleteme,pombredanne\/go-deleteme,tv42\/old-go,tv42\/old-go,tv42\/old-go,pombredanne\/go-deleteme,pombredanne\/go-deleteme","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/chan.c\n+++ src\/pkg\/runtime\/chan.c\n@@ -104,7 +104,7 @@\n \tif((sizeof(*c)%MAXALIGN) != 0 || elem->align > MAXALIGN)\n \t\truntime\u00b7throw(\"makechan: bad alignment\");\n \n-\tif(hint < 0 || (intgo)hint != hint || (elem->size > 0 && hint > MaxMem \/ elem->size))\n+\tif(hint < 0 || (intgo)hint != hint || (elem->size > 0 && hint > (MaxMem - sizeof(*c)) \/ elem->size))\n \t\truntime\u00b7panicstring(\"makechan: size out of range\");\n \n \t\/\/ allocate memory in one call\n"} {"commit":"70d602bfe85d3b60ef52cd03b07090d661b531ef","subject":"Fix compilation.","message":"Fix compilation.\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- monetdb5\/optimizer\/opt_centipede.c\n+++ monetdb5\/optimizer\/opt_centipede.c\n@@ -453,7 +453,6 @@\n \tMalBlkPtr plan, cntrl, stub;\n \tstr msg= MAL_SUCCEED;\n \tchar nme[BUFSIZ];\n-\tchar *head, *tail; \/* oid reference to target table*\/\n \toid plantag;\n \n \tstatus = GDKzalloc(mb->ssize * sizeof(int));\n@@ -478,8 +477,6 @@\n \told = plan->stmt;\n \tif ( newMalBlkStmt(plan,plan->ssize) < 0 )\n \t\treturn;\n-\thead = GDKzalloc(mb->vsize);\n-\ttail = GDKzalloc(mb->vsize);\n \n #ifdef _DEBUG_OPT_CENTIPEDE_\n \tmnstr_printf(cntxt->fdout,\"#Remote plan framework\\n\");\n@@ -603,7 +600,7 @@\n \t\tmnstr_printf(cntxt->fdout,\"%s \",statusname[status[i]]);\n \t\tfor (j=0; j< old[i]->retc; j++){\n \t\t\tint x = old[i]->argv[j];\n-\t\t\tmnstr_printf(cntxt->fdout,\"[%d]%d %c%c \",x,vars[x], head[x]+'0', tail[x]+'0');\n+\t\t\tmnstr_printf(cntxt->fdout,\"[%d]%d \",x,vars[x]);\n \t\t}\n \t\tprintInstruction(cntxt->fdout, mb,0,old[i],LIST_MAL_STMT);\n \t}\n@@ -652,7 +649,7 @@\n \t\tmnstr_printf(cntxt->fdout,\"%s \",statusname[status[i]]);\n \t\tfor (j=0; j< old[i]->retc; j++){\n \t\t\tint x = old[i]->argv[j];\n-\t\t\tmnstr_printf(cntxt->fdout,\"[%d]%d %c%c \",x,vars[x], head[x]+'0', tail[x]+'0');\n+\t\t\tmnstr_printf(cntxt->fdout,\"[%d]%d \",x,vars[x]);\n \t\t}\n \t\tprintInstruction(cntxt->fdout, mb,0,old[i],LIST_MAL_STMT);\n \t}\n@@ -723,7 +720,7 @@\n \t\t\t\/* check for aggregate versions *\/\n \t\t\tif (sscanf(getVarName(plan,getArg(p,1)),\"r1_%d\",&k) == 1) {\n \t\t\t\tchar nme[BUFSIZ];\n-\t\t\t\tsnprintf(nme,BUFSIZ,\"%C_d\",k);\n+\t\t\t\tsnprintf(nme,BUFSIZ,\"C_%d\",k);\n \t\t\t\tk= findVariable(plan,nme);\n \t\t\t\tif ( k >= 0)\n \t\t\t\t\tgetArg(p,0)= findVariable(plan,nme);\n@@ -866,7 +863,7 @@\n \n \tmsg = GDKgetenv(\"gdk_readonly\");\n \tif( msg == 0 || strcmp(msg,\"yes\")) {\n-\t\tmnstr_printf(cntxt->fdout,\"#WARNING centipede only works for readonly databases\\n\");\n+\t\t\/\/mnstr_printf(cntxt->fdout,\"#WARNING centipede only works for readonly databases\\n\");\n \t\t\/\/return 0;\n \t}\n \tif ( nrservers == 0)\n"} {"commit":"4ae08862bae5f549aa46ff02b89eb59645324413","subject":"net: ti816x: oops.. Use option","message":"net: ti816x: oops.. Use option","repos":"Kakadu\/embox,Kakadu\/embox,embox\/embox,vrxfile\/embox-trik,embox\/embox,Kefir0192\/embox,vrxfile\/embox-trik,embox\/embox,Kefir0192\/embox,vrxfile\/embox-trik,mike2390\/embox,vrxfile\/embox-trik,Kakadu\/embox,abusalimov\/embox,embox\/embox,Kakadu\/embox,vrxfile\/embox-trik,gzoom13\/embox,gzoom13\/embox,Kakadu\/embox,Kefir0192\/embox,Kefir0192\/embox,mike2390\/embox,mike2390\/embox,vrxfile\/embox-trik,abusalimov\/embox,gzoom13\/embox,Kakadu\/embox,mike2390\/embox,Kakadu\/embox,mike2390\/embox,mike2390\/embox,abusalimov\/embox,embox\/embox,abusalimov\/embox,gzoom13\/embox,abusalimov\/embox,vrxfile\/embox-trik,Kefir0192\/embox,gzoom13\/embox,embox\/embox,gzoom13\/embox,Kefir0192\/embox,Kefir0192\/embox,gzoom13\/embox,mike2390\/embox,abusalimov\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/drivers\/net\/ti816x.c\n+++ src\/drivers\/net\/ti816x.c\n@@ -32,7 +32,7 @@\n \n EMBOX_UNIT_INIT(ti816x_init);\n \n-#define MODOPS_PREP_BUFF_CNT 10\/\/OPTION_GET(NUMBER, prep_buff_cnt)\n+#define MODOPS_PREP_BUFF_CNT OPTION_GET(NUMBER, prep_buff_cnt)\n #define DEFAULT_CHANNEL 0\n \n struct emac_desc_head {\n"} {"commit":"8e2c9d1f9b461dc2847e27c057497c8331f46ce9","subject":"Correcting bad idea of how to close out kml.","message":"Correcting bad idea of how to close out kml.\n\n","repos":"fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,AveRapina\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,AveRapina\/visionworkbench,AveRapina\/visionworkbench,AveRapina\/visionworkbench,AveRapina\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,AveRapina\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,fengzhyuan\/visionworkbench","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vw\/FileIO\/KML.h\n+++ src\/vw\/FileIO\/KML.h\n@@ -91,10 +91,11 @@\n void append_network( std::string link,\n \t\t\t double north, double south,\n \t\t\t double east, double west );\n- \n+\n+ void close_kml( void ); \/\/ If it seems the file wasn't finished, try this.\n protected:\n void open_kml( void );\n- void close_kml( void );\n+ \n };\n \n \/\/ High Level Tools!\n"} {"commit":"814592ea5bfeb80b57f7a2f7fbeb3b0dd039a525","subject":"[droid-source] Use IN_BUILTIN_MIC as default input device.","message":"[droid-source] Use IN_BUILTIN_MIC as default input device.\n","repos":"sledges\/pulseaudio-modules-droid,sledges\/pulseaudio-modules-droid,jusa\/pulseaudio-modules-droid,mlehtima\/pulseaudio-modules-droid,mer-hybris\/pulseaudio-modules-droid,ballock\/pulseaudio-modules-droid,mer-hybris\/pulseaudio-modules-droid,mlehtima\/pulseaudio-modules-droid,ballock\/pulseaudio-modules-droid,sledges\/pulseaudio-modules-droid,jusa\/pulseaudio-modules-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/droid\/droid-source.c\n+++ src\/droid\/droid-source.c\n@@ -488,7 +488,6 @@\n pa_log_info(\"FIXME: Setting AUDIO_DEVICE_IN_BUILTIN_MIC as initial device.\");\n dev_in = AUDIO_DEVICE_IN_BUILTIN_MIC;\n #endif\n- dev_in = AUDIO_DEVICE_IN_DEFAULT;\n pa_droid_hw_module_lock(u->hw_module);\n ret = u->hw_module->device->open_input_stream(u->hw_module->device,\n u->hw_module->stream_in_id++,\n"} {"commit":"688b995b7ddffd1ad75b2ce58ff09abd2b11ad3b","subject":"runtime: poor man's heap type info checker It's not trivial to make a comprehensive check due to inferior pointers, reflect, gob, etc. But this is essentially what I've used to debug the GC issues. Update issue 5193.","message":"runtime: poor man's heap type info checker\nIt's not trivial to make a comprehensive check\ndue to inferior pointers, reflect, gob, etc.\nBut this is essentially what I've used to debug\nthe GC issues.\nUpdate issue 5193.\n\nR=golang-dev, iant, 0xe2.0x9a.0x9b, r\nCC=golang-dev\nhttps:\/\/codereview.appspot.com\/8455043\n","repos":"webfd\/go-zh,rdp\/rogerpack2005-golang,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,d0f\/go-zh,scirelli\/scirelli-go,webfd\/go-zh,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,scirelli\/scirelli-go,bryanxu\/go-zh,mhennings\/marcohennings-go,scirelli\/scirelli-go,mhennings\/marcohennings-go,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,webfd\/go-zh,bryanxu\/go-zh,mhennings\/marcohennings-go,mhennings\/marcohennings-go,scirelli\/scirelli-go,rdp\/rogerpack2005-golang,d0f\/go-zh,mhennings\/marcohennings-go,webfd\/go-zh,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,bryanxu\/go-zh,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,scirelli\/scirelli-go,d0f\/go-zh,d0f\/go-zh,scirelli\/scirelli-go,rdp\/rogerpack2005-golang,scirelli\/scirelli-go,webfd\/go-zh,d0f\/go-zh,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,d0f\/go-zh,scirelli\/scirelli-go,d0f\/go-zh,d0f\/go-zh,bryanxu\/go-zh,webfd\/go-zh,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,webfd\/go-zh,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/mgc0.c\n+++ src\/pkg\/runtime\/mgc0.c\n@@ -553,6 +553,59 @@\n \tuintptr *loop_or_ret;\n };\n \n+\/\/ Sanity check for the derived type info objti.\n+static void\n+checkptr(void *obj, uintptr objti)\n+{\n+\tuintptr *pc1, *pc2, type, tisize, i, j, x;\n+\tbyte *objstart;\n+\tType *t;\n+\tMSpan *s;\n+\n+\tif(!Debug)\n+\t\truntime\u00b7throw(\"checkptr is debug only\");\n+\n+\tif(obj < runtime\u00b7mheap->arena_start || obj >= runtime\u00b7mheap->arena_used)\n+\t\treturn;\n+\ttype = runtime\u00b7gettype(obj);\n+\tt = (Type*)(type & ~(uintptr)(PtrSize-1));\n+\tif(t == nil)\n+\t\treturn;\n+\tx = (uintptr)obj >> PageShift;\n+\tif(sizeof(void*) == 8)\n+\t\tx -= (uintptr)(runtime\u00b7mheap->arena_start)>>PageShift;\n+\ts = runtime\u00b7mheap->map[x];\n+\tobjstart = (byte*)((uintptr)s->start<<PageShift);\n+\tif(s->sizeclass != 0) {\n+\t\ti = ((byte*)obj - objstart)\/s->elemsize;\n+\t\tobjstart += i*s->elemsize;\n+\t}\n+\ttisize = *(uintptr*)objti;\n+\t\/\/ Sanity check for object size: it should fit into the memory block.\n+\tif((byte*)obj + tisize > objstart + s->elemsize)\n+\t\truntime\u00b7throw(\"invalid gc type info\");\n+\tif(obj != objstart)\n+\t\treturn;\n+\t\/\/ If obj points to the beginning of the memory block,\n+\t\/\/ check type info as well.\n+\tif(t->string == nil ||\n+\t\t\/\/ Gob allocates unsafe pointers for indirection.\n+\t\t(runtime\u00b7strcmp(t->string->str, (byte*)\"unsafe.Pointer\") &&\n+\t\t\/\/ Runtime and gc think differently about closures.\n+\t\truntime\u00b7strstr(t->string->str, (byte*)\"struct { F uintptr\") != t->string->str)) {\n+\t\tpc1 = (uintptr*)objti;\n+\t\tpc2 = (uintptr*)t->gc;\n+\t\t\/\/ A simple best-effort check until first GC_END.\n+\t\tfor(j = 1; pc1[j] != GC_END && pc2[j] != GC_END; j++) {\n+\t\t\tif(pc1[j] != pc2[j]) {\n+\t\t\t\truntime\u00b7printf(\"invalid gc type info for '%s' at %p, type info %p, block info %p\\n\",\n+\t\t\t\t\tt->string ? (int8*)t->string->str : (int8*)\"?\", j, pc1[j], pc2[j]);\n+\t\t\t\truntime\u00b7throw(\"invalid gc type info\");\n+\t\t\t}\n+\t\t}\n+\t}\n+}\t\t\t\t\t\n+\n \/\/ scanblock scans a block of n bytes starting at pointer b for references\n \/\/ to other objects, scanning any it finds recursively until there are no\n \/\/ unscanned objects left. Instead of using an explicit recursion, it keeps\n@@ -646,6 +699,17 @@\n \t\t\t\tstack_top.loop_or_ret = pc+1;\n \t\t\t} else {\n \t\t\t\tstack_top.count = 1;\n+\t\t\t}\n+\t\t\tif(Debug) {\n+\t\t\t\t\/\/ Simple sanity check for provided type info ti:\n+\t\t\t\t\/\/ The declared size of the object must be not larger than the actual size\n+\t\t\t\t\/\/ (it can be smaller due to inferior pointers).\n+\t\t\t\t\/\/ It's difficult to make a comprehensive check due to inferior pointers,\n+\t\t\t\t\/\/ reflection, gob, etc.\n+\t\t\t\tif(pc[0] > n) {\n+\t\t\t\t\truntime\u00b7printf(\"invalid gc type info: type info size %p, block size %p\\n\", pc[0], n);\n+\t\t\t\t\truntime\u00b7throw(\"invalid gc type info\");\n+\t\t\t\t}\n \t\t\t}\n \t\t} else if(UseSpanType) {\n \t\t\tif(CollectStats)\n@@ -723,6 +787,8 @@\n \t\t\tobj = *(void**)(stack_top.b + pc[1]);\n \t\t\tobjti = pc[2];\n \t\t\tpc += 3;\n+\t\t\tif(Debug)\n+\t\t\t\tcheckptr(obj, objti);\n \t\t\tbreak;\n \n \t\tcase GC_SLICE:\n"} {"commit":"646f9dcbf4ca4c9b7e581fa70033c8dd5b9678c4","subject":"INTEGRATION: CWS dmake43p01 (1.5.6); FILE MERGED 2006\/02\/03 19:46:31 vq 1.5.6.10: #i61170# Let $(TMD)\/somedir always be a valid path. Adjust the dmake bootstrap makefile to this change. 2006\/02\/01 23:28:55 vq 1.5.6.9: #i60948# Add -m option family to generate timing information for targets and\/or recipes. (Autotools files were regenerated.) 2006\/01\/27 01:16:41 vq 1.5.6.8: #i61170# Add micro optimization as usually PWD is equal to MAKEDIR. 2006\/01\/26 02:54:28 vq 1.5.6.7: #i61170# Fix TMD macro and regenerate autotool files. 2006\/01\/04 04:07:16 vq 1.5.6.6: #i58259# Fix thinko and solve the problems with all testcases from the issue. 2006\/01\/04 02:13:11 vq 1.5.6.5: #i58259# Partial fix. This fixes the use of dp after it was freed. 2005\/10\/11 17:39:39 vq 1.5.6.4: #i54938# Fix problem when building infered .INCLUDE makefiles and doing parallel builds. 2005\/05\/05 21:27:21 vq 1.5.6.3: #i43310# Fix dmakes handling of multiple (::) targets concerning attributes and flags. Note: An attribute given for a subtarget will also be applied for all other subtargets. (Also add a few comments.) 2005\/03\/14 03:21:59 vq 1.5.6.2: #i37053# Fix continuation char handling. 2004\/11\/12 03:45:09 vq 1.5.6.1: #i37053# dmake line continuation fix.","message":"INTEGRATION: CWS dmake43p01 (1.5.6); FILE MERGED\n2006\/02\/03 19:46:31 vq 1.5.6.10: #i61170# Let $(TMD)\/somedir always be a valid path.\nAdjust the dmake bootstrap makefile to this change.\n2006\/02\/01 23:28:55 vq 1.5.6.9: #i60948# Add -m option family to generate timing information for targets\nand\/or recipes. (Autotools files were regenerated.)\n2006\/01\/27 01:16:41 vq 1.5.6.8: #i61170# Add micro optimization as usually PWD is equal to MAKEDIR.\n2006\/01\/26 02:54:28 vq 1.5.6.7: #i61170# Fix TMD macro and regenerate autotool files.\n2006\/01\/04 04:07:16 vq 1.5.6.6: #i58259# Fix thinko and solve the problems with all testcases from the\nissue.\n2006\/01\/04 02:13:11 vq 1.5.6.5: #i58259# Partial fix. This fixes the use of dp after it was freed.\n2005\/10\/11 17:39:39 vq 1.5.6.4: #i54938# Fix problem when building infered .INCLUDE makefiles and doing\nparallel builds.\n2005\/05\/05 21:27:21 vq 1.5.6.3: #i43310# Fix dmakes handling of multiple (::) targets concerning attributes\nand flags. Note: An attribute given for a subtarget will also be applied for\nall other subtargets. (Also add a few comments.)\n2005\/03\/14 03:21:59 vq 1.5.6.2: #i37053# Fix continuation char handling.\n2004\/11\/12 03:45:09 vq 1.5.6.1: #i37053# dmake line continuation fix.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- dmake\/make.c\n+++ dmake\/make.c\n@@ -1,6 +1,6 @@\n \/* $RCSfile: make.c,v $\n--- $Revision: 1.5 $\n--- last change: $Author: rt $ $Date: 2004-09-08 16:06:46 $\n+-- $Revision: 1.6 $\n+-- last change: $Author: hr $ $Date: 2006-04-20 12:01:03 $\n --\n -- SYNOPSIS\n -- Perform the update of all outdated targets.\n@@ -237,7 +237,7 @@\n char *inf = NIL(char);\n char *outall = NIL(char);\n char *imm = NIL(char);\n- int rval = 0;\n+ int rval = 0; \/* 0==ready, 1==target still running, -1==error *\/\n int push = 0;\n int made = F_MADE;\n int ignore;\n@@ -281,6 +281,11 @@\n }\n \n DB_PRINT( \"mem\", (\"%s:-A mem %ld\", cp->CE_NAME, (long) coreleft()) );\n+\n+ \/* FIXME: F_MULTI targets don't have cp->ce_recipe set but the recipes\n+ * are known nevertheless. It is not necessary to infer them.\n+ * If (cp->ce_flag & F_MULTI) is true the recipes of the corresponding\n+ * subtargets can be used. *\/\n if( cp->ce_recipe == NIL(STRING) ) {\n char *dir = cp->ce_dir;\n \n@@ -318,6 +323,7 @@\n \/* Inherit the stat info from the parent. *\/\n cp->ce_time = cp->ce_parent->ce_time;\n cp->ce_flag |= F_STAT;\n+ \/* Propagate the A_PRECIOUS attribute from the parent. *\/\n cp->ce_attr |= cp->ce_parent->ce_attr & A_PRECIOUS;\n }\n else {\n@@ -403,6 +409,7 @@\n }\n }\n \n+ \/* First round, will be repeated a second time below. *\/\n for( prev=NULL,dp=cp->ce_prq; dp != NIL(LINK); prev=dp, dp=next ) {\n int seq;\n int nesting_count;\n@@ -453,6 +460,7 @@\n if( strcmp(name,cp->CE_NAME) == 0 )\n Fatal(\"Detected circular dynamic dependency; generated '%s'\",name);\n \n+ \/* Call helper for dynamic prerequisite expansion. *\/\n dp = _expand_dynamic_prq( cp->ce_prq, dp, name );\n FREE( name );\n \n@@ -469,9 +477,11 @@\n FREE(dp);\n if ( prev == NIL(LINK) ) {\n cp->ce_prq = next;\n+ dp = NULL; \/* dp will be the new value of prev. *\/\n }\n else {\n prev->cl_next = next;\n+ dp = prev;\n }\n continue;\n }\n@@ -516,6 +526,9 @@\n for( dp = cp->ce_prq; dp != NIL(LINK); dp = dp->cl_next ) {\n int tgflg;\n tcp = dp->cl_prq;\n+ if( tcp == NIL(CELL) )\n+ Fatal(\"Internal Error: Found prerequisite list cell without prerequisite!\");\n+\n name = tcp->ce_fname;\n \n \/* make certain that all prerequisites are made prior to advancing. *\/\n@@ -553,8 +566,11 @@\n DB_PRINT( \"make\", (\"I make '%s' if %ld > %ld\", cp->CE_NAME, otime,\n cp->ce_time) );\n \n- if( Verbose & V_MAKE && !(cp->ce_flag & F_MULTI) ) {\n+ if( Verbose & V_MAKE ) {\n printf( \"%s: >>>> Making \", Pname );\n+ \/* Also print the F_MULTI master target. *\/\n+ if( cp->ce_flag & F_MULTI )\n+ printf( \"(::-\\\"master\\\" target) \" );\n if( cp->ce_count != 0 )\n printf( \"[%s::{%d}]\\n\", cp->CE_NAME, cp->ce_count );\n else\n@@ -581,6 +597,9 @@\n || ((cp->ce_flag & F_TARGET) && Force)\n ) {\n \n+ if( Measure & M_TARGET )\n+ Do_profile_output( \"s\", M_TARGET, cp );\n+\n \/* Only checking so stop as soon as we determine we will make\n * something *\/\n if( Check ) {\n@@ -616,6 +635,7 @@\n Update_time_stamp( cp );\n }\n else if( cp->ce_recipe != NIL(STRING) ) {\n+ \/* If a recipe is found use it. Note this misses F_MULTI targets. *\/\n if( !(cp->ce_flag & F_SINGLE) )\n rval = Exec_commands( cp );\n else {\n@@ -623,19 +643,27 @@\n \n _drop_mac( m_q );\n \n+ \/* Build all out of date prerequisites. *\/\n if( outall && *outall ) {\n+ \/* Wait for each prerequisite to finish, save the status\n+ * of Wait_for_completion. *\/\n+ int wait_for_completion_status = Wait_for_completion;\n+ Wait_for_completion = TRUE;\n+\n SET_TOKEN( &tk, outall );\n \n+ \/* No need to update the target timestamp until all\n+ * prerequisites are done. *\/\n Doing_bang = TRUE;\n name = Get_token( &tk, \"\", FALSE );\n do {\n m_q->ht_value = name;\n \n- Wait_for_completion = TRUE; \/* Reset in Exec_commands *\/\n rval = Exec_commands( cp );\n Unlink_temp_files(cp);\n }\n while( *(name = Get_token( &tk, \"\", FALSE )) != '\\0' );\n+ Wait_for_completion = wait_for_completion_status;\n Doing_bang = FALSE;\n }\n \n@@ -644,10 +672,17 @@\n }\n }\n else if( !(cp->ce_flag & F_RULES) && !(cp->ce_flag & F_STAT) &&\n- (!(cp->ce_attr & A_ROOT) || !(cp->ce_flag & F_EXPLICIT)) )\n+ (!(cp->ce_attr & A_ROOT) || !(cp->ce_flag & F_EXPLICIT)) &&\n+ !(cp->ce_count) )\n+ \/* F_MULTI subtargets should evaluate its parents F_RULES value\n+ * but _make_multi always sets the F_RULES value of the master\n+ * target. Assume F_RULES is set for subtargets. This might not\n+ * be true if there are no prerequisites and no recipes in any\n+ * of the subtargets. (FIXME) *\/\n Fatal( \"Don't know how to make `%s'\",cp->CE_NAME );\n else {\n \/* Empty recipe, set the flag as MADE and update the time stamp *\/\n+ \/* This might be a the master cell of a F_MULTI target. *\/\n Update_time_stamp( cp );\n }\n }\n@@ -793,19 +828,25 @@\n \n \n static LINKPTR\n-_expand_dynamic_prq( head, lp, name )\n+_expand_dynamic_prq( head, lp, name )\/*\n+=======================================\n+ The string name can contain one or more target names. Check if these are\n+ already a prerequisite for the current target. If not add them to the list\n+ of prerequisites. If no prerequisites were added set lp->cl_prq to NULL. *\/\n LINKPTR head;\n LINKPTR lp;\n char *name;\n {\n CELLPTR cur = lp->cl_prq;\n \n+ \/* If condition is true, no space is found. *\/\n if ( strchr(name, ' ') == NIL(char) ) {\n CELLPTR prq = Def_cell(name);\n LINKPTR tmp;\n \n for(tmp=head;tmp != NIL(LINK) && tmp->cl_prq != prq;tmp=tmp->cl_next);\n \n+ \/* If tmp is NULL then the prerequisite is new and is added to the list. *\/\n if ( !tmp )\n lp->cl_prq = prq;\n }\n@@ -816,14 +857,18 @@\n char *p;\n int first=TRUE;\n \n+ \/* Handle more than one prerequisite. *\/\n SET_TOKEN(&token, name);\n while (*(p=Get_token(&token, \"\", FALSE)) != '\\0') {\n CELLPTR prq = Def_cell(p);\n LINKPTR tmp;\n \n for(tmp=head;tmp != NIL(LINK) && tmp->cl_prq != prq;tmp=tmp->cl_next);\n+\n+ \/* If tmp is not NULL the prerequisite already exists. *\/\n if ( tmp ) continue;\n \n+ \/* Add list elements when more then one new prerequisite is found. *\/\n if ( first ) {\n first = FALSE;\n }\n@@ -839,6 +884,7 @@\n CLEAR_TOKEN( &token );\n }\n \n+ \/* If the condition is true no new prerequisits were found. *\/\n if ( lp->cl_prq == cur ) {\n lp->cl_prq = NIL(CELL);\n lp->cl_flag = 0;\n@@ -938,8 +984,8 @@\n .IGNORE and .SILENT treatment for the group.\n \n The function returns 0, if the command is executed and has successfully\n- returned, and returns 1 if the command is executing but has not yet\n- returned (for parallel makes).\n+ returned, and it returns 1 if the command is executing but has not yet\n+ returned or -1 if an error occured (Return value from Do_cmnd()).\n \n The F_MADE bit in the cell is guaranteed set when the command has\n successfully completed. *\/\n@@ -961,6 +1007,9 @@\n \n DB_ENTER( \"Exec_commands\" );\n \n+ if( cp->ce_recipe == NIL(STRING) )\n+ Fatal(\"Internal Error: No recipe found!\");\n+\n attr = Glob_attr | cp->ce_attr;\n trace = Trace || !(attr & A_SILENT);\n group = cp->ce_flag & F_GROUP;\n@@ -1066,7 +1115,9 @@\n \n \/* We force execution of the recipe if we are tracing and the .EXECUTE\n * attribute was given or if the it is not a group recipe and the\n- * recipe line contains the string $(MAKE). *\/\n+ * recipe line contains the string $(MAKE). Wait_for_completion might\n+ * be changed gobaly but this is without consequences as we wait for\n+ * every recipe with .EXECUTE and don't start anything else. *\/\n if( Trace\n && ((l_attr & A_EXECUTE)||(!group && DmStrStr(rp->st_string,\"$(MAKE)\")))\n ) {\n@@ -1108,7 +1159,6 @@\n TRUE, TRUE);\n }\n \n- Wait_for_completion = FALSE;\n _recipes[ RP_RECIPE ] = orp;\n cp->ce_attr &= ~A_ERROR;\n DB_RETURN( rval );\n@@ -1119,8 +1169,11 @@\n Print_cmnd( cmnd, echo, map )\/*\n ================================\n This routine is called to print out the command to stdout. If echo is\n- false the printing to stdout is supressed, but the new lines in the command\n- are still deleted. *\/\n+ false the printing to stdout is supressed.\n+ The routine is also used to remove the line continuation sequence\n+ \\<nl> from the command string and convert escape sequences if the\n+ map flag is set.\n+ The changed string is used later to actually to execute the command. *\/\n char *cmnd;\n int echo;\n int map;\n@@ -1141,11 +1194,14 @@\n tmp[2] = '\\0';\n \n for( p=cmnd; *(n = DmStrPbrk(p,tmp)) != '\\0'; )\n+ \/* Remove the \\<nl> sequences. *\/\n if(*n == CONTINUATION_CHAR && n[1] == '\\n') {\n DB_PRINT( \"make\", (\"fixing [%s]\", p) );\n strcpy( n, n+2 );\n p = n;\n }\n+ \/* Look for an escape sequence and replace it by it's corresponding\n+ * character value. *\/\n else {\n if( *n == ESCAPE_CHAR && map ) Map_esc( n );\n p = n+1;\n@@ -1259,45 +1315,100 @@\n static void\n _set_tmd()\/*\n ============\n- Set the TWD Macro *\/\n-{\n- TKSTR md, pd;\n+ Set the TMD Macro *\/\n+{\n char *m, *p;\n+ char *mend, *pend;\n+ char *mtd, *ptd;\n+ int mleadslash, pleadslash;\n char *tmd;\n- int is_sep;\n int first = 1;\n \n- SET_TOKEN( &md, Makedir );\n- SET_TOKEN( &pd, Pwd );\n-\n- m = Get_token( &md, DirBrkStr, FALSE );\n- (void) Get_token( &pd, DirBrkStr, FALSE );\n- is_sep = (strchr(DirBrkStr, *m) != NIL(char));\n+ \/* Don't use Get_token because this fails on paths that contain spaces. *\/\n+ m = DmStrSpn(Makedir, DirBrkStr);\n+ mleadslash = m - Makedir;\n+ p = DmStrSpn(Pwd, DirBrkStr);\n+ pleadslash = p - Pwd;\n+\n+ \/* leading slashes can only mean POSIX paths or Windows resources (two)\n+ * slashes. In any case if the number of slashes are not equal there\n+ * can be no relative path from one two the other. Use the Makedir path. *\/\n+ if(mleadslash != pleadslash) {\n+ tmd = Makedir;\n+ goto tmd_end;\n+ }\n+\n+ \/* If Makedir and Pwd are identical skip to the end. *\/\n+ for(mend=m, pend=p; *mend && *pend && *mend==*pend; mend++, pend++)\n+ ;\n+ if( ( ! *mend ) && ( ! *pend ) ) {\n+ tmd = DmStrDup( \".\" );\n+ goto tmd_end;\n+ }\n+\n+ \/* If Makedir and Pwd are not identical we will construct TMD. *\/\n tmd = DmStrDup( \"\" );\n \n do {\n- m = Get_token( &md, DirBrkStr, FALSE );\n- p = Get_token( &pd, DirBrkStr, FALSE );\n-\n- if( !is_sep && strcmp(m, p) ) { \/* they differ *\/\n+\n+ \/* get the next top directory name *\/\n+ mend = DmStrPbrk( m, DirBrkStr );\n+ \/* For DOSish filenames the first part might be a drive letter *\/\n+#if !defined(NO_DRIVE_LETTERS)\n+ if( first && *mend == ':' )\n+ mend++;\n+#endif\n+\n+ mtd = DmSubStr( m, mend ); \/* Free later *\/\n+ \/* {m|p}end either points to a DirBrkStr member or the end of string. *\/\n+ if(*mend) mend++;\n+ m = mend;\n+\n+ pend = DmStrPbrk( p, DirBrkStr );\n+#if !defined(NO_DRIVE_LETTERS)\n+ if( first && *pend == ':' )\n+ pend++;\n+#endif\n+\n+ ptd = DmSubStr( p, pend ); \/* Free later *\/\n+ if(*pend) pend++;\n+ p = pend;\n+\n+ if( strcmp(mtd, ptd) ) { \/* they differ *\/\n char *tmp = 0;\n+\n if( first ) { \/* They differ in the first component *\/\n+ FREE( tmd );\n+ FREE( mtd );\n+ FREE( ptd );\n tmd = Makedir; \/* In this case use the full path *\/\n break;\n }\n \n- if( *p ) tmp = Build_path( \"..\", tmd );\n- if( *m ) tmp = Build_path( tmd, m );\n- FREE( tmd );\n- tmd = DmStrDup( tmp );\n- }\n-\n- is_sep = 1-is_sep;\n+ if( *ptd ) {\n+ \/* Build_path puts a DirSepStr behind the first parameter if\n+ * its length is greater null, even if the second parameter\n+ * is empty. *\/\n+ if(*tmd)\n+ tmp = Build_path( \"..\", tmd );\n+ else\n+ tmp = \"..\";\n+ FREE( tmd );\n+ tmd = DmStrDup( tmp );\n+ }\n+ if( *mtd ) {\n+ tmp = Build_path( tmd, mtd );\n+ FREE( tmd );\n+ tmd = DmStrDup( tmp );\n+ }\n+ }\n+\n+ FREE( mtd );\n+ FREE( ptd );\n first = 0;\n } while (*m || *p);\n \n- CLEAR_TOKEN( &md );\n- CLEAR_TOKEN( &pd );\n+tmd_end:\n \n Def_macro( \"TMD\", tmd, M_MULTI | M_EXPANDED );\n if( tmd != Makedir ) FREE( tmd );\n"} {"commit":"94bdc042d526196294da5c7a396425384cffbb1f","subject":"Use correct index when counting short errors.","message":"Use correct index when counting short errors.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/musycc\/musycc.c\n+++ sys\/dev\/musycc\/musycc.c\n@@ -803,7 +803,7 @@\n \t\t\tcase 0:\n \t\t\t\tif (er == 13) {\t\/* SHT *\/\n \t\t\t\t\tsc->chan[ch]->last_rxerr = time_second;\n-\t\t\t\t\tsc->chan[i]->short_error++;\n+\t\t\t\t\tsc->chan[ch]->short_error++;\n \t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\tdefault:\n"} {"commit":"cff066ee25ca9cd4b94745ac4f5a93ffb52b9d46","subject":"MINOR bumped required version","message":"MINOR bumped required version\n","repos":"nomovok-opensource\/cutedriver-visualizer,nomovok-opensource\/cutedriver-visualizer,nomovok-opensource\/cutedriver-visualizer,nomovok-opensource\/cutedriver-visualizer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- common\/version.h\n+++ common\/version.h\n@@ -21,7 +21,7 @@\n #ifndef VISUALIZER_VERSION_H\n #define VISUALIZER_VERSION_H\n \n-#define VISUALIZER_VERSION \"1.5.3\"\n-#define REQUIRED_DRIVER_VERSION \"1.0.0\"\n+#define VISUALIZER_VERSION \"2.0.0\"\n+#define REQUIRED_DRIVER_VERSION \"2.0.0\"\n \n #endif \/\/ VISUALIZER_VERSION_H\n"} {"commit":"4bef4a8a519315fdfd4883829d5abdda329bc16f","subject":"Reformatting to improve code readability.","message":"Reformatting to improve code readability.\n","repos":"alvations\/mosesdecoder,tofula\/mosesdecoder,pjwilliams\/mosesdecoder,KonceptGeek\/mosesdecoder,alvations\/mosesdecoder,emjotde\/mosesdecoder_nmt,emjotde\/mosesdecoder_nmt,hychyc07\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,KonceptGeek\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,tofula\/mosesdecoder,emjotde\/mosesdecoder_nmt,tofula\/mosesdecoder,hychyc07\/mosesdecoder,moses-smt\/mosesdecoder,pjwilliams\/mosesdecoder,KonceptGeek\/mosesdecoder,tofula\/mosesdecoder,KonceptGeek\/mosesdecoder,tofula\/mosesdecoder,pjwilliams\/mosesdecoder,emjotde\/mosesdecoder_nmt,tofula\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,hychyc07\/mosesdecoder,pjwilliams\/mosesdecoder,pjwilliams\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,pjwilliams\/mosesdecoder,emjotde\/mosesdecoder_nmt,alvations\/mosesdecoder,hychyc07\/mosesdecoder,pjwilliams\/mosesdecoder,hychyc07\/mosesdecoder,emjotde\/mosesdecoder_nmt,emjotde\/mosesdecoder_nmt,alvations\/mosesdecoder,KonceptGeek\/mosesdecoder,pjwilliams\/mosesdecoder,pjwilliams\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,KonceptGeek\/mosesdecoder,hychyc07\/mosesdecoder,KonceptGeek\/mosesdecoder,KonceptGeek\/mosesdecoder,KonceptGeek\/mosesdecoder,pjwilliams\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,moses-smt\/mosesdecoder,hychyc07\/mosesdecoder,KonceptGeek\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- moses\/FF\/StatefulFeatureFunction.h\n+++ moses\/FF\/StatefulFeatureFunction.h\n@@ -17,7 +17,9 @@\n static std::vector<const StatefulFeatureFunction*> m_statefulFFs;\n \n public:\n- static const std::vector<const StatefulFeatureFunction*>& GetStatefulFeatureFunctions() {\n+ static const std::vector<const StatefulFeatureFunction*>& \n+ GetStatefulFeatureFunctions() \n+ {\n return m_statefulFFs;\n }\n \n"} {"commit":"f6c2589c36128b9c4480627cbaa6551101a67637","subject":"runtime: fix scanning of not started goroutines","message":"runtime: fix scanning of not started goroutines\n\nThe stack scanner for not started goroutines ignored the arguments\narea when its size was unknown. With this change, the distance\nbetween the stack pointer and the stack base will be used instead.\n\nFixes issue 5486\n\nR=golang-dev, bradfitz, iant, dvyukov\nCC=golang-dev\nhttps:\/\/codereview.appspot.com\/9440043\n","repos":"sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,rdp\/rogerpack2005-golang,mhennings\/marcohennings-go,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,d0f\/go-zh,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,d0f\/go-zh,d0f\/go-zh,sanjosh\/sanjos100-tipc,webfd\/go-zh,bryanxu\/go-zh,webfd\/go-zh,bryanxu\/go-zh,webfd\/go-zh,bryanxu\/go-zh,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,d0f\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,d0f\/go-zh,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,webfd\/go-zh,webfd\/go-zh,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,d0f\/go-zh,rdp\/rogerpack2005-golang,webfd\/go-zh,rdp\/rogerpack2005-golang,rdp\/rogerpack2005-golang,mhennings\/marcohennings-go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/mgc0.c\n+++ src\/pkg\/runtime\/mgc0.c\n@@ -1454,11 +1454,18 @@\n \t\t\t\/\/ be scanned. No other live values should be on the\n \t\t\t\/\/ stack.\n \t\t\tf = runtime\u00b7findfunc((uintptr)gp->fnstart->fn);\n-\t\t\tif(f->args > 0) {\n+\t\t\tif(f->args != 0) {\n \t\t\t\tif(thechar == '5')\n \t\t\t\t\tsp += sizeof(uintptr);\n-\t\t\t\taddroot((Obj){sp, f->args, 0});\n-\t\t\t}\n+\t\t\t\t\/\/ If the size of the arguments is known\n+\t\t\t\t\/\/ scan just the incoming arguments.\n+\t\t\t\t\/\/ Otherwise, scan everything between the\n+\t\t\t\t\/\/ top and the bottom of the stack.\n+\t\t\t\tif(f->args > 0)\n+\t\t\t\t\taddroot((Obj){sp, f->args, 0});\n+\t\t\t\telse\n+\t\t\t\t\taddroot((Obj){sp, (byte*)stk - sp, 0}); \n+\t\t\t} \n \t\t\treturn;\n \t\t}\n \t}\n"} {"commit":"4df9bf1fb1993526c88316f01cd4014e89595de8","subject":"Add sceIoGetRemoteKPLSData","message":"Add sceIoGetRemoteKPLSData","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2kern\/kernel\/iofilemgr.h\n+++ include\/psp2kern\/kernel\/iofilemgr.h\n@@ -100,6 +100,16 @@\n *\/\n int ksceIoUmount(int id, int a2, int a3, int a4);\n \n+\/**\n+ * Get Remote Kernel Process Local Storage Data\n+ *\n+ * @param[in] pid - The target process id\n+ * @param[out] dst - The pointer of RemoteKPLS output buffer. size is 0x1C.\n+ *\n+ * @return < 0 on error.\n+ *\/\n+int ksceIoGetRemoteKPLSData(SceUID pid, void *dst);\n+\n #ifdef __cplusplus\n }\n #endif\n"} {"commit":"32d094709ca15e790df27eab1740ec40fb1d650a","subject":"Removed template functions that would leak implementation.","message":"Removed template functions that would leak implementation.\n","repos":"OSVR\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- inc\/osvr\/Util\/Logger.h\n+++ inc\/osvr\/Util\/Logger.h\n@@ -188,6 +188,10 @@\n OSVR_UTIL_EXPORT detail::LineLogger critical();\n OSVR_UTIL_EXPORT detail::LineLogger alert();\n OSVR_UTIL_EXPORT detail::LineLogger emerg();\n+\n+#if 0\n+ \/\/ These functions are not yet implemented because they expose the\n+ \/\/ underlying spdlog classes.\n \n \/\/ Logger.log(log_level, cppformat_string, arg1, arg2, arg3, ...) call\n \/\/ style\n@@ -216,10 +220,15 @@\n return emerg(fmt, std::forward<Args>(args)...);\n }\n }\n+#endif\n \n \/\/ logger.log(log_level, msg) << \"..\" call style\n OSVR_UTIL_EXPORT detail::LineLogger log(LogLevel level,\n const char *msg);\n+\n+#if 0\n+ \/\/ These functions are not yet implemented because they expose the\n+ \/\/ underlying spdlog classes.\n \n \/\/ logger.log(log_level, msg) << \"..\" call style\n template <typename T>\n@@ -248,6 +257,7 @@\n \n return info(std::forward<T>(msg));\n }\n+#endif\n \n \/\/ logger.log(log_level) << \"..\" call style\n OSVR_UTIL_EXPORT detail::LineLogger log(LogLevel level);\n"} {"commit":"1cc1075f0d19d12d9b67ca28800c5cf85fd9b555","subject":"netmap_do_regif: fix reference leak on memory allocator","message":"netmap_do_regif: fix reference leak on memory allocator\n","repos":"luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- sys\/dev\/netmap\/netmap.c\n+++ sys\/dev\/netmap\/netmap.c\n@@ -2095,7 +2095,7 @@\n \t\t\t\t\tnetmap_mem_bufsize(na->nm_mem),\n \t\t\t\t\tnm_os_ifnet_mtu(na->ifp));\n \t\t\t\terror = EINVAL;\n-\t\t\t\tgoto err;\n+\t\t\t\tgoto err_drop_mem;\n \t\t\t}\n \t\t}\n \n"} {"commit":"6a1f5af0c19497726ba2495cc808d5c4727aa6b6","subject":"diff reduction (whitespace)","message":"diff reduction (whitespace)\n","repos":"luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- sys\/dev\/netmap\/netmap.c\n+++ sys\/dev\/netmap\/netmap.c\n@@ -494,7 +494,6 @@\n int netmap_no_pendintr = 1;\n int netmap_txsync_retry = 2;\n int netmap_adaptive_io = 0;\n-\n int netmap_flags = 0;\t\/* debug flags *\/\n int netmap_fwd = 0;\t\/* force transparent mode *\/\n \n@@ -512,7 +511,12 @@\n int netmap_generic_ringsize = 1024; \/* Generic ringsize. *\/\n int netmap_generic_rings = 1; \/* number of queues in generic. *\/\n \n+\/*\n+ * SYSCTL calls are grouped between SYSBEGIN and SYSEND to be emulated\n+ * in some other operating systems\n+ *\/\n SYSBEGIN(main_init);\n+\n SYSCTL_NODE(_dev, OID_AUTO, netmap, CTLFLAG_RW, 0, \"Netmap args\");\n SYSCTL_INT(_dev_netmap, OID_AUTO, verbose,\n CTLFLAG_RW, &netmap_verbose, 0, \"Verbose mode\");\n@@ -532,6 +536,7 @@\n SYSCTL_INT(_dev_netmap, OID_AUTO, generic_mit, CTLFLAG_RW, &netmap_generic_mit, 0 , \"\");\n SYSCTL_INT(_dev_netmap, OID_AUTO, generic_ringsize, CTLFLAG_RW, &netmap_generic_ringsize, 0 , \"\");\n SYSCTL_INT(_dev_netmap, OID_AUTO, generic_rings, CTLFLAG_RW, &netmap_generic_rings, 0 , \"\");\n+\n SYSEND;\n \n NMG_LOCK_T\tnetmap_global_lock;\n"} {"commit":"2282bf1f8250f22a9178eca2710a437d8a5fd6cb","subject":"Fix whitespace (missing newline)","message":"Fix whitespace (missing newline)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/netmap\/netmap.c\n+++ sys\/dev\/netmap\/netmap.c\n@@ -1282,7 +1282,8 @@\n * kring\tN+1\tis only used for the selinfo for all queues.\n * Return 0 on success, ENOMEM otherwise.\n *\n- * By default the receive and transmit adapter ring counts are both initialized * to num_queues. na->num_tx_rings can be set for cards with different tx\/rx\n+ * By default the receive and transmit adapter ring counts are both initialized\n+ * to num_queues. na->num_tx_rings can be set for cards with different tx\/rx\n * setups.\n *\/\n int\n"} {"commit":"ce1c20248d26cbab7e36f4365021b7d007cdb589","subject":"I have attached 5 patches (split up for ease of review) to plperl.c.","message":"I have attached 5 patches (split up for ease of review) to plperl.c.\n\n1. Two minor cleanups:\n\n - We don't need to call hv_exists+hv_fetch; we should just check the\n return value of hv_fetch.\n - newSVpv(\"undef\",0) is the string \"undef\", not a real undef.\n\n2. This should fix the bug Andrew Dunstan described in a recent -hackers\n post. It replaces three bogus \"eval_pv(key, 0)\" calls with newSVpv,\n and eliminates another redundant hv_exists+hv_fetch pair.\n\n3. plperl_build_tuple_argument builds up a string of Perl code to create\n a hash representing the tuple. This patch creates the hash directly.\n\n4. Another minor cleanup: replace a couple of av_store()s with av_push.\n\n5. Analogous to #3 for plperl_trigger_build_args. This patch removes the\n static sv_add_tuple_value function, which does much the same as two\n other utility functions defined later, and merges the functionality\n into plperl_hash_from_tuple.\n\nI have tested the patches to the best of my limited ability, but I would\nappreciate it very much if someone else could review and test them too.\n\n(Thanks to Andrew and David Fetter for their help with some testing.)\n\nAbhijit Menon-Sen\n","repos":"tangp3\/gpdb,Quikling\/gpdb,edespino\/gpdb,tangp3\/gpdb,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,yazun\/postgres-xl,royc1\/gpdb,ahachete\/gpdb,atris\/gpdb,tpostgres-projects\/tPostgres,postmind-net\/postgres-xl,greenplum-db\/gpdb,chrishajas\/gpdb,xuegang\/gpdb,edespino\/gpdb,chrishajas\/gpdb,cjcjameson\/gpdb,xinzweb\/gpdb,cjcjameson\/gpdb,ahachete\/gpdb,xuegang\/gpdb,randomtask1155\/gpdb,foyzur\/gpdb,tangp3\/gpdb,ahachete\/gpdb,Quikling\/gpdb,edespino\/gpdb,50wu\/gpdb,foyzur\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,cjcjameson\/gpdb,tpostgres-projects\/tPostgres,postmind-net\/postgres-xl,yazun\/postgres-xl,foyzur\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,lpetrov-pivotal\/gpdb,zaksoup\/gpdb,rubikloud\/gpdb,jmcatamney\/gpdb,yazun\/postgres-xl,pavanvd\/postgres-xl,Quikling\/gpdb,foyzur\/gpdb,pavanvd\/postgres-xl,rvs\/gpdb,royc1\/gpdb,50wu\/gpdb,lisakowen\/gpdb,pavanvd\/postgres-xl,cjcjameson\/gpdb,Chibin\/gpdb,foyzur\/gpdb,ashwinstar\/gpdb,yuanzhao\/gpdb,janebeckman\/gpdb,adam8157\/gpdb,adam8157\/gpdb,tpostgres-projects\/tPostgres,cjcjameson\/gpdb,CraigHarris\/gpdb,pavanvd\/postgres-xl,atris\/gpdb,xuegang\/gpdb,Chibin\/gpdb,50wu\/gpdb,edespino\/gpdb,chrishajas\/gpdb,rubikloud\/gpdb,Postgres-XL\/Postgres-XL,techdragon\/Postgres-XL,lisakowen\/gpdb,rvs\/gpdb,snaga\/postgres-xl,Quikling\/gpdb,ovr\/postgres-xl,ahachete\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,cjcjameson\/gpdb,zaksoup\/gpdb,Postgres-XL\/Postgres-XL,xuegang\/gpdb,royc1\/gpdb,kaknikhil\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,lpetrov-pivotal\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,oberstet\/postgres-xl,adam8157\/gpdb,lpetrov-pivotal\/gpdb,xuegang\/gpdb,zaksoup\/gpdb,greenplum-db\/gpdb,snaga\/postgres-xl,royc1\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,Chibin\/gpdb,atris\/gpdb,xinzweb\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,tangp3\/gpdb,lisakowen\/gpdb,arcivanov\/postgres-xl,yuanzhao\/gpdb,zaksoup\/gpdb,lpetrov-pivotal\/gpdb,techdragon\/Postgres-XL,cjcjameson\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,randomtask1155\/gpdb,jmcatamney\/gpdb,atris\/gpdb,50wu\/gpdb,yazun\/postgres-xl,xinzweb\/gpdb,ovr\/postgres-xl,rvs\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,kmjungersen\/PostgresXL,lpetrov-pivotal\/gpdb,adam8157\/gpdb,atris\/gpdb,Chibin\/gpdb,arcivanov\/postgres-xl,techdragon\/Postgres-XL,chrishajas\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,postmind-net\/postgres-xl,foyzur\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,kmjungersen\/PostgresXL,greenplum-db\/gpdb,tangp3\/gpdb,lintzc\/gpdb,rubikloud\/gpdb,oberstet\/postgres-xl,0x0FFF\/gpdb,greenplum-db\/gpdb,kmjungersen\/PostgresXL,adam8157\/gpdb,kaknikhil\/gpdb,chrishajas\/gpdb,ashwinstar\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,lpetrov-pivotal\/gpdb,kaknikhil\/gpdb,oberstet\/postgres-xl,chrishajas\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,lisakowen\/gpdb,0x0FFF\/gpdb,tangp3\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,snaga\/postgres-xl,adam8157\/gpdb,Quikling\/gpdb,rvs\/gpdb,randomtask1155\/gpdb,zeroae\/postgres-xl,zaksoup\/gpdb,xinzweb\/gpdb,lintzc\/gpdb,zeroae\/postgres-xl,xinzweb\/gpdb,0x0FFF\/gpdb,xuegang\/gpdb,royc1\/gpdb,arcivanov\/postgres-xl,rvs\/gpdb,edespino\/gpdb,lintzc\/gpdb,ahachete\/gpdb,Chibin\/gpdb,foyzur\/gpdb,rvs\/gpdb,rvs\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,adam8157\/gpdb,lpetrov-pivotal\/gpdb,greenplum-db\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,Postgres-XL\/Postgres-XL,lintzc\/gpdb,zeroae\/postgres-xl,Chibin\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,0x0FFF\/gpdb,janebeckman\/gpdb,ovr\/postgres-xl,kmjungersen\/PostgresXL,techdragon\/Postgres-XL,lintzc\/gpdb,rvs\/gpdb,zaksoup\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,arcivanov\/postgres-xl,ahachete\/gpdb,edespino\/gpdb,snaga\/postgres-xl,janebeckman\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,Quikling\/gpdb,rubikloud\/gpdb,atris\/gpdb,tpostgres-projects\/tPostgres,Postgres-XL\/Postgres-XL,lintzc\/gpdb,50wu\/gpdb,randomtask1155\/gpdb,tangp3\/gpdb,foyzur\/gpdb,janebeckman\/gpdb,CraigHarris\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,Quikling\/gpdb,rubikloud\/gpdb,adam8157\/gpdb,postmind-net\/postgres-xl,ashwinstar\/gpdb,ovr\/postgres-xl,lintzc\/gpdb,janebeckman\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,postmind-net\/postgres-xl,CraigHarris\/gpdb,kaknikhil\/gpdb,arcivanov\/postgres-xl,CraigHarris\/gpdb,50wu\/gpdb,50wu\/gpdb,oberstet\/postgres-xl,rvs\/gpdb,jmcatamney\/gpdb,yazun\/postgres-xl,tangp3\/gpdb,jmcatamney\/gpdb,ovr\/postgres-xl,atris\/gpdb,zeroae\/postgres-xl,yuanzhao\/gpdb,royc1\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,rubikloud\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,royc1\/gpdb,Postgres-XL\/Postgres-XL,snaga\/postgres-xl,Chibin\/gpdb,xinzweb\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,royc1\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,CraigHarris\/gpdb,xuegang\/gpdb,randomtask1155\/gpdb,yuanzhao\/gpdb,rubikloud\/gpdb,oberstet\/postgres-xl,kaknikhil\/gpdb,atris\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,pavanvd\/postgres-xl,kaknikhil\/gpdb,CraigHarris\/gpdb,chrishajas\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/pl\/plperl\/plperl.c\n+++ src\/pl\/plperl\/plperl.c\n@@ -33,7 +33,7 @@\n *\t ENHANCEMENTS, OR MODIFICATIONS.\n *\n * IDENTIFICATION\n- *\t $PostgreSQL: pgsql\/src\/pl\/plperl\/plperl.c,v 1.54 2004\/10\/07 19:01:09 momjian Exp $\n+ *\t $PostgreSQL: pgsql\/src\/pl\/plperl\/plperl.c,v 1.55 2004\/10\/15 17:08:26 momjian Exp $\n *\n **********************************************************************\/\n \n@@ -276,32 +276,29 @@\n \tplperl_safe_init_done = true;\n }\n \n-\/**********************************************************************\n- * turn a tuple into a hash expression and add it to a list\n- **********************************************************************\/\n-static void\n-plperl_sv_add_tuple_value(SV *rv, HeapTuple tuple, TupleDesc tupdesc)\n-{\n-\tint\t\t\ti;\n-\tchar\t *value;\n-\tchar\t *key;\n-\n-\tsv_catpvf(rv, \"{ \");\n-\n+\n+static HV *\n+plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)\n+{\n+\tint\ti;\n+\tHV *hv = newHV();\n \tfor (i = 0; i < tupdesc->natts; i++)\n \t{\n-\t\tkey = SPI_fname(tupdesc, i + 1);\n-\t\tvalue = SPI_getvalue(tuple, tupdesc, i + 1);\n-\t\tif (value)\n-\t\t\tsv_catpvf(rv, \"%s => '%s'\", key, value);\n+\t\tSV *value;\n+\n+\t\tchar *key = SPI_fname(tupdesc, i+1);\n+\t\tchar *val = SPI_getvalue(tuple, tupdesc, i + 1);\n+\n+\t\tif (val)\n+\t\t\tvalue = newSVpv(val, 0);\n \t\telse\n-\t\t\tsv_catpvf(rv, \"%s => undef\", key);\n-\t\tif (i != tupdesc->natts - 1)\n-\t\t\tsv_catpvf(rv, \", \");\n-\t}\n-\n-\tsv_catpvf(rv, \" }\");\n-}\n+\t\t\tvalue = newSV(0);\n+\n+\t\thv_store(hv, key, strlen(key), value, 0);\n+\t}\n+\treturn hv;\n+}\n+\n \n \/**********************************************************************\n * set up arguments for a trigger call\n@@ -312,76 +309,89 @@\n \tTriggerData *tdata;\n \tTupleDesc\ttupdesc;\n \tint\t\t\ti = 0;\n-\tSV\t\t *rv;\n-\n-\trv = newSVpv(\"{ \", 0);\n+\tchar\t *level;\n+\tchar\t *event;\n+\tchar\t *relid;\n+\tchar\t *when;\n+\tHV\t\t *hv;\n+\n+\thv = newHV();\n \n \ttdata = (TriggerData *) fcinfo->context;\n-\n \ttupdesc = tdata->tg_relation->rd_att;\n \n-\tsv_catpvf(rv, \"name => '%s'\", tdata->tg_trigger->tgname);\n-\tsv_catpvf(rv, \", relid => '%s'\", DatumGetCString(DirectFunctionCall1(oidout, ObjectIdGetDatum(tdata->tg_relation->rd_id))));\n+\trelid = DatumGetCString(\n+\t\t\t\tDirectFunctionCall1(\n+\t\t\t\t\toidout, ObjectIdGetDatum(tdata->tg_relation->rd_id)\n+\t\t\t\t)\n+\t\t\t);\n+\n+\thv_store(hv, \"name\", 4, newSVpv(tdata->tg_trigger->tgname, 0), 0);\n+\thv_store(hv, \"relid\", 5, newSVpv(relid, 0), 0);\n \n \tif (TRIGGER_FIRED_BY_INSERT(tdata->tg_event))\n \t{\n-\t\tsv_catpvf(rv, \", event => 'INSERT'\");\n-\t\tsv_catpvf(rv, \", new =>\");\n-\t\tplperl_sv_add_tuple_value(rv, tdata->tg_trigtuple, tupdesc);\n+\t\tevent = \"INSERT\";\n+\t\thv_store(hv, \"new\", 3,\n+\t\t\t\t newRV((SV *)plperl_hash_from_tuple(tdata->tg_trigtuple,\n+\t\t\t\t\t\t\t\t\t\t\t\t\ttupdesc)),\n+\t\t\t\t 0);\n \t}\n \telse if (TRIGGER_FIRED_BY_DELETE(tdata->tg_event))\n \t{\n-\t\tsv_catpvf(rv, \", event => 'DELETE'\");\n-\t\tsv_catpvf(rv, \", old => \");\n-\t\tplperl_sv_add_tuple_value(rv, tdata->tg_trigtuple, tupdesc);\n+\t\tevent = \"DELETE\";\n+\t\thv_store(hv, \"old\", 3,\n+\t\t\t\t newRV((SV *)plperl_hash_from_tuple(tdata->tg_trigtuple,\n+\t\t\t\t\t\t\t\t\t\t\t\t\ttupdesc)),\n+\t\t\t\t 0);\n \t}\n \telse if (TRIGGER_FIRED_BY_UPDATE(tdata->tg_event))\n \t{\n-\t\tsv_catpvf(rv, \", event => 'UPDATE'\");\n-\n-\t\tsv_catpvf(rv, \", new =>\");\n-\t\tplperl_sv_add_tuple_value(rv, tdata->tg_newtuple, tupdesc);\n-\n-\t\tsv_catpvf(rv, \", old => \");\n-\t\tplperl_sv_add_tuple_value(rv, tdata->tg_trigtuple, tupdesc);\n-\t}\n+\t\tevent = \"UPDATE\";\n+\t\thv_store(hv, \"old\", 3,\n+\t\t\t\t newRV((SV *)plperl_hash_from_tuple(tdata->tg_trigtuple,\n+\t\t\t\t\t\t\t\t\t\t\t\t\ttupdesc)),\n+\t\t\t\t 0);\n+\t\thv_store(hv, \"new\", 3,\n+\t\t\t\t newRV((SV *)plperl_hash_from_tuple(tdata->tg_newtuple,\n+\t\t\t\t\t\t\t\t\t\t\t\t\ttupdesc)),\n+\t\t\t\t 0);\n+\t}\n+\telse {\n+\t\tevent = \"UNKNOWN\";\n+\t}\n+\n+\thv_store(hv, \"event\", 5, newSVpv(event, 0), 0);\n+\thv_store(hv, \"argc\", 4, newSViv(tdata->tg_trigger->tgnargs), 0);\n+\n+\tif (tdata->tg_trigger->tgnargs != 0)\n+\t{\n+\t\tAV *av = newAV();\n+\t\tfor (i=0; i < tdata->tg_trigger->tgnargs; i++)\n+\t\t\tav_push(av, newSVpv(tdata->tg_trigger->tgargs[i], 0));\n+\t\thv_store(hv, \"args\", 4, newRV((SV *)av), 0);\n+\t}\n+\n+\thv_store(hv, \"relname\", 7,\n+\t\t\t newSVpv(SPI_getrelname(tdata->tg_relation), 0), 0);\n+\n+\tif (TRIGGER_FIRED_BEFORE(tdata->tg_event))\n+\t\twhen = \"BEFORE\";\n+\telse if (TRIGGER_FIRED_AFTER(tdata->tg_event))\n+\t\twhen = \"AFTER\";\n \telse\n-\t\tsv_catpvf(rv, \", event => 'UNKNOWN'\");\n-\n-\tsv_catpvf(rv, \", argc => %d\", tdata->tg_trigger->tgnargs);\n-\n-\tif (tdata->tg_trigger->tgnargs != 0)\n-\t{\n-\t\tsv_catpvf(rv, \", args => [ \");\n-\t\tfor (i = 0; i < tdata->tg_trigger->tgnargs; i++)\n-\t\t{\n-\t\t\tsv_catpvf(rv, \"%s\", tdata->tg_trigger->tgargs[i]);\n-\t\t\tif (i != tdata->tg_trigger->tgnargs - 1)\n-\t\t\t\tsv_catpvf(rv, \", \");\n-\t\t}\n-\t\tsv_catpvf(rv, \" ]\");\n-\t}\n-\tsv_catpvf(rv, \", relname => '%s'\", SPI_getrelname(tdata->tg_relation));\n-\n-\tif (TRIGGER_FIRED_BEFORE(tdata->tg_event))\n-\t\tsv_catpvf(rv, \", when => 'BEFORE'\");\n-\telse if (TRIGGER_FIRED_AFTER(tdata->tg_event))\n-\t\tsv_catpvf(rv, \", when => 'AFTER'\");\n+\t\twhen = \"UNKNOWN\";\n+\thv_store(hv, \"when\", 4, newSVpv(when, 0), 0);\n+\n+\tif (TRIGGER_FIRED_FOR_ROW(tdata->tg_event))\n+\t\tlevel = \"ROW\";\n+\telse if (TRIGGER_FIRED_FOR_STATEMENT(tdata->tg_event))\n+\t\tlevel = \"STATEMENT\";\n \telse\n-\t\tsv_catpvf(rv, \", when => 'UNKNOWN'\");\n-\n-\tif (TRIGGER_FIRED_FOR_ROW(tdata->tg_event))\n-\t\tsv_catpvf(rv, \", level => 'ROW'\");\n-\telse if (TRIGGER_FIRED_FOR_STATEMENT(tdata->tg_event))\n-\t\tsv_catpvf(rv, \", level => 'STATEMENT'\");\n-\telse\n-\t\tsv_catpvf(rv, \", level => 'UNKNOWN'\");\n-\n-\tsv_catpvf(rv, \" }\");\n-\n-\trv = perl_eval_pv(SvPV(rv, PL_na), TRUE);\n-\n-\treturn rv;\n+\t\tlevel = \"UNKNOWN\";\n+\thv_store(hv, \"level\", 5, newSVpv(level, 0), 0);\n+\n+\treturn newRV((SV*)hv);\n }\n \n \n@@ -440,21 +450,17 @@\n plperl_get_keys(HV *hv)\n {\n \tAV\t\t *ret;\n-\tint\t\t\tkey_count;\n \tSV\t\t *val;\n \tchar\t *key;\n \tI32\t\t\tklen;\n \n-\tkey_count = 0;\n \tret = newAV();\n \n \thv_iterinit(hv);\n \twhile ((val = hv_iternextsv(hv, (char **) &key, &klen)))\n-\t{\n-\t\tav_store(ret, key_count, eval_pv(key, TRUE));\n-\t\tkey_count++;\n-\t}\n+\t\tav_push(ret, newSVpv(key, 0));\n \thv_iterinit(hv);\n+\n \treturn ret;\n }\n \n@@ -484,11 +490,8 @@\n static char *\n plperl_get_elem(HV *hash, char *key)\n {\n-\tSV\t\t **svp;\n-\n-\tif (hv_exists_ent(hash, eval_pv(key, TRUE), FALSE))\n-\t\tsvp = hv_fetch(hash, key, strlen(key), FALSE);\n-\telse\n+\tSV **svp = hv_fetch(hash, key, strlen(key), FALSE);\n+\tif (!svp)\n \t{\n \t\telog(ERROR, \"plperl: key '%s' not found\", key);\n \t\treturn NULL;\n@@ -998,7 +1001,8 @@\n \t\t\tg_attr_num = tupdesc->natts;\n \n \t\t\tfor (i = 0; i < tupdesc->natts; i++)\n-\t\t\t\tav_store(g_column_keys, i + 1, eval_pv(SPI_fname(tupdesc, i + 1), TRUE));\n+\t\t\t\tav_store(g_column_keys, i + 1,\n+\t\t\t\t\t\t newSVpv(SPI_fname(tupdesc, i+1), 0));\n \n \t\t\tslot = TupleDescGetSlot(tupdesc);\n \t\t\tfuncctx->slot = slot;\n@@ -1269,6 +1273,7 @@\n \tint\t\t\tproname_len;\n \tplperl_proc_desc *prodesc = NULL;\n \tint\t\t\ti;\n+\tSV\t\t\t**svp;\n \n \t\/* We'll need the pg_proc tuple in any case... *\/\n \tprocTup = SearchSysCache(PROCOID,\n@@ -1291,12 +1296,12 @@\n \t\/************************************************************\n \t * Lookup the internal proc name in the hashtable\n \t ************************************************************\/\n-\tif (hv_exists(plperl_proc_hash, internal_proname, proname_len))\n+\tsvp = hv_fetch(plperl_proc_hash, internal_proname, proname_len, FALSE);\n+\tif (svp)\n \t{\n \t\tbool\t\tuptodate;\n \n-\t\tprodesc = (plperl_proc_desc *) SvIV(*hv_fetch(plperl_proc_hash,\n-\t\t\t\t\t\t\t\t\t internal_proname, proname_len, 0));\n+\t\tprodesc = (plperl_proc_desc *) SvIV(*svp);\n \n \t\t\/************************************************************\n \t\t * If it's present, must check whether it's still up to date.\n@@ -1519,7 +1524,7 @@\n plperl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc)\n {\n \tint\t\t\ti;\n-\tSV\t\t *output;\n+\tHV\t\t *hv;\n \tDatum\t\tattr;\n \tbool\t\tisnull;\n \tchar\t *attname;\n@@ -1527,31 +1532,22 @@\n \tHeapTuple\ttypeTup;\n \tOid\t\t\ttypoutput;\n \tOid\t\t\ttypioparam;\n-\n-\toutput = sv_2mortal(newSVpv(\"{\", 0));\n+\tint\t\t\tnamelen;\n+\n+\thv = newHV();\n \n \tfor (i = 0; i < tupdesc->natts; i++)\n \t{\n-\t\t\/* ignore dropped attributes *\/\n \t\tif (tupdesc->attrs[i]->attisdropped)\n \t\t\tcontinue;\n \n-\t\t\/************************************************************\n-\t\t * Get the attribute name\n-\t\t ************************************************************\/\n \t\tattname = tupdesc->attrs[i]->attname.data;\n-\n-\t\t\/************************************************************\n-\t\t * Get the attributes value\n-\t\t ************************************************************\/\n+\t\tnamelen = strlen(attname);\n \t\tattr = heap_getattr(tuple, i + 1, tupdesc, &isnull);\n \n-\t\t\/************************************************************\n-\t\t *\tIf it is null it will be set to undef in the hash.\n-\t\t ************************************************************\/\n-\t\tif (isnull)\n-\t\t{\n-\t\t\tsv_catpvf(output, \"'%s' => undef,\", attname);\n+\t\tif (isnull) {\n+\t\t\t\/* Store (attname => undef) and move on. *\/\n+\t\t\thv_store(hv, attname, namelen, newSV(0), 0);\n \t\t\tcontinue;\n \t\t}\n \n@@ -1577,13 +1573,11 @@\n \t\t\t\t\t\t\t\t\t\t\t\t\t attr,\n \t\t\t\t\t\t\t\t\t\t\tObjectIdGetDatum(typioparam),\n \t\t\t\t\t\t Int32GetDatum(tupdesc->attrs[i]->atttypmod)));\n-\t\tsv_catpvf(output, \"'%s' => '%s',\", attname, outputstr);\n-\t\tpfree(outputstr);\n-\t}\n-\n-\tsv_catpv(output, \"}\");\n-\toutput = perl_eval_pv(SvPV(output, PL_na), TRUE);\n-\treturn output;\n+\n+\t\thv_store(hv, attname, namelen, newSVpv(outputstr, 0), 0);\n+\t}\n+\n+\treturn sv_2mortal(newRV((SV *)hv));\n }\n \n \n@@ -1597,36 +1591,6 @@\n \tret_hv = plperl_spi_execute_fetch_result(SPI_tuptable, SPI_processed, spi_rv);\n \n \treturn ret_hv;\n-}\n-\n-static HV *\n-plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)\n-{\n-\tint\t\t\ti;\n-\tchar\t *attname;\n-\tchar\t *attdata;\n-\n-\tHV\t\t *array;\n-\n-\tarray = newHV();\n-\n-\tfor (i = 0; i < tupdesc->natts; i++)\n-\t{\n-\t\t\/************************************************************\n-\t\t* Get the attribute name\n-\t\t************************************************************\/\n-\t\tattname = tupdesc->attrs[i]->attname.data;\n-\n-\t\t\/************************************************************\n-\t\t* Get the attributes value\n-\t\t************************************************************\/\n-\t\tattdata = SPI_getvalue(tuple, tupdesc, i + 1);\n-\t\tif (attdata)\n-\t\t\thv_store(array, attname, strlen(attname), newSVpv(attdata, 0), 0);\n-\t\telse\n-\t\t\thv_store(array, attname, strlen(attname), newSVpv(\"undef\", 0), 0);\n-\t}\n-\treturn array;\n }\n \n static HV *\n@@ -1653,7 +1617,7 @@\n \t\t\tfor (i = 0; i < processed; i++)\n \t\t\t{\n \t\t\t\trow = plperl_hash_from_tuple(tuptable->vals[i], tuptable->tupdesc);\n-\t\t\t\tav_store(rows, i, newRV_noinc((SV *) row));\n+\t\t\t\tav_push(rows, newRV_noinc((SV *)row));\n \t\t\t}\n \t\t\thv_store(result, \"rows\", strlen(\"rows\"),\n \t\t\t\t\t newRV_noinc((SV *) rows), 0);\n"} {"commit":"932d66e29676a180e63404d8af9986e1b96aec8f","subject":"Make a few more methods public in the builder.","message":"Make a few more methods public in the builder.\n","repos":"arangodb\/Jason,arangodb\/velocypack,arangodb\/velocypack,arangodb\/velocypack,arangodb\/Jason,arangodb\/Jason,arangodb\/Jason,arangodb\/velocypack","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/JasonBuilder.h\n+++ include\/JasonBuilder.h\n@@ -271,8 +271,6 @@\n return *this;\n }\n \n- private:\n-\n void addNull () {\n reserveSpace(1);\n _start[_pos++] = 0x01;\n@@ -351,6 +349,16 @@\n return target;\n }\n \n+ void addArray () {\n+ addCompoundValue(0x05);\n+ }\n+\n+ void addObject () {\n+ addCompoundValue(0x08);\n+ }\n+\n+ private:\n+\n void addCompoundValue (uint8_t type) {\n reserveSpace(10);\n \/\/ an array is started:\n@@ -364,14 +372,6 @@\n _pos += 8; \/\/ Possible space for long bytelength\n }\n \n- void addArray () {\n- addCompoundValue(0x05);\n- }\n- \n- void addObject () {\n- addCompoundValue(0x08);\n- }\n- \n void set (Jason const& item);\n \n uint8_t* set (JasonPair const& pair);\n"} {"commit":"13168ae9b132a9fa6d13c30a7f06bd60646c7cbf","subject":"style(9)","message":"style(9)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/nfe\/if_nfereg.h\n+++ sys\/dev\/nfe\/if_nfereg.h\n@@ -18,146 +18,146 @@\n * $FreeBSD$\n *\/\n \n-#define NFE_PCI_BA\t\t0x10\n-\n-#define NFE_RX_RING_COUNT\t128\n-#define NFE_TX_RING_COUNT\t256\n-\n-#define NFE_JBYTES\t\t(ETHER_MAX_LEN_JUMBO + ETHER_ALIGN)\n-#define NFE_JPOOL_COUNT\t\t(NFE_RX_RING_COUNT + 64)\n-#define NFE_JPOOL_SIZE\t\t(NFE_JPOOL_COUNT * NFE_JBYTES)\n-\n-#define NFE_MAX_SCATTER\t\t(NFE_TX_RING_COUNT - 2)\n-\n-#define NFE_IRQ_STATUS\t\t0x000\n-#define NFE_IRQ_MASK\t\t0x004\n-#define NFE_SETUP_R6\t\t0x008\n-#define NFE_IMTIMER\t\t0x00c\n-#define NFE_MISC1\t\t0x080\n-#define NFE_TX_CTL\t\t0x084\n-#define NFE_TX_STATUS\t\t0x088\n-#define NFE_RXFILTER\t\t0x08c\n-#define NFE_RXBUFSZ\t\t0x090\n-#define NFE_RX_CTL\t\t0x094\n-#define NFE_RX_STATUS\t\t0x098\n-#define NFE_RNDSEED\t\t0x09c\n-#define NFE_SETUP_R1\t\t0x0a0\n-#define NFE_SETUP_R2\t\t0x0a4\n-#define NFE_MACADDR_HI\t\t0x0a8\n-#define NFE_MACADDR_LO\t\t0x0ac\n-#define NFE_MULTIADDR_HI\t0x0b0\n-#define NFE_MULTIADDR_LO\t0x0b4\n-#define NFE_MULTIMASK_HI\t0x0b8\n-#define NFE_MULTIMASK_LO\t0x0bc\n-#define NFE_PHY_IFACE\t\t0x0c0\n-#define NFE_TX_RING_ADDR_LO\t0x100\n-#define NFE_RX_RING_ADDR_LO\t0x104\n-#define NFE_RING_SIZE\t\t0x108\n-#define NFE_TX_UNK\t\t0x10c\n-#define NFE_LINKSPEED\t\t0x110\n-#define NFE_SETUP_R5\t\t0x130\n-#define NFE_SETUP_R3\t\t0x13C\n-#define NFE_SETUP_R7\t\t0x140\n-#define NFE_RXTX_CTL\t\t0x144\n-#define NFE_TX_RING_ADDR_HI\t0x148\n-#define NFE_RX_RING_ADDR_HI\t0x14c\n-#define NFE_PHY_STATUS\t\t0x180\n-#define NFE_SETUP_R4\t\t0x184\n-#define NFE_STATUS\t\t0x188\n-#define NFE_PHY_SPEED\t\t0x18c\n-#define NFE_PHY_CTL\t\t0x190\n-#define NFE_PHY_DATA\t\t0x194\n-#define NFE_WOL_CTL\t\t0x200\n-#define NFE_PATTERN_CRC\t\t0x204\n-#define NFE_PATTERN_MASK\t0x208\n-#define NFE_PWR_CAP\t\t0x268\n-#define NFE_PWR_STATE\t\t0x26c\n-#define NFE_VTAG_CTL\t\t0x300\n-\n-#define NFE_PHY_ERROR\t\t0x00001\n-#define NFE_PHY_WRITE\t\t0x00400\n-#define NFE_PHY_BUSY\t\t0x08000\n-#define NFE_PHYADD_SHIFT\t5\n-\n-#define NFE_STATUS_MAGIC\t0x140000\n-\n-#define NFE_R1_MAGIC\t\t0x16070f\n-#define NFE_R2_MAGIC\t\t0x16\n-#define NFE_R4_MAGIC\t\t0x08\n-#define NFE_R6_MAGIC\t\t0x03\n-#define NFE_WOL_MAGIC\t\t0x1111\n-#define NFE_RX_START\t\t0x01\n-#define NFE_TX_START\t\t0x01\n-\n-#define NFE_IRQ_RXERR\t\t0x0001\n-#define NFE_IRQ_RX\t\t0x0002\n-#define NFE_IRQ_RX_NOBUF\t0x0004\n-#define NFE_IRQ_TXERR\t\t0x0008\n-#define NFE_IRQ_TX_DONE\t\t0x0010\n-#define NFE_IRQ_TIMER\t\t0x0020\n-#define NFE_IRQ_LINK\t\t0x0040\n-#define NFE_IRQ_TXERR2\t\t0x0080\n-#define NFE_IRQ_TX1\t\t0x0100\n-\n-#define NFE_IRQ_WANTED\t\t\t\t\t\t\t\\\n+#define\tNFE_PCI_BA\t\t0x10\n+\n+#define\tNFE_RX_RING_COUNT\t128\n+#define\tNFE_TX_RING_COUNT\t256\n+\n+#define\tNFE_JBYTES\t\t(ETHER_MAX_LEN_JUMBO + ETHER_ALIGN)\n+#define\tNFE_JPOOL_COUNT\t\t(NFE_RX_RING_COUNT + 64)\n+#define\tNFE_JPOOL_SIZE\t\t(NFE_JPOOL_COUNT * NFE_JBYTES)\n+\n+#define\tNFE_MAX_SCATTER\t\t(NFE_TX_RING_COUNT - 2)\n+\n+#define\tNFE_IRQ_STATUS\t\t0x000\n+#define\tNFE_IRQ_MASK\t\t0x004\n+#define\tNFE_SETUP_R6\t\t0x008\n+#define\tNFE_IMTIMER\t\t0x00c\n+#define\tNFE_MISC1\t\t0x080\n+#define\tNFE_TX_CTL\t\t0x084\n+#define\tNFE_TX_STATUS\t\t0x088\n+#define\tNFE_RXFILTER\t\t0x08c\n+#define\tNFE_RXBUFSZ\t\t0x090\n+#define\tNFE_RX_CTL\t\t0x094\n+#define\tNFE_RX_STATUS\t\t0x098\n+#define\tNFE_RNDSEED\t\t0x09c\n+#define\tNFE_SETUP_R1\t\t0x0a0\n+#define\tNFE_SETUP_R2\t\t0x0a4\n+#define\tNFE_MACADDR_HI\t\t0x0a8\n+#define\tNFE_MACADDR_LO\t\t0x0ac\n+#define\tNFE_MULTIADDR_HI\t0x0b0\n+#define\tNFE_MULTIADDR_LO\t0x0b4\n+#define\tNFE_MULTIMASK_HI\t0x0b8\n+#define\tNFE_MULTIMASK_LO\t0x0bc\n+#define\tNFE_PHY_IFACE\t\t0x0c0\n+#define\tNFE_TX_RING_ADDR_LO\t0x100\n+#define\tNFE_RX_RING_ADDR_LO\t0x104\n+#define\tNFE_RING_SIZE\t\t0x108\n+#define\tNFE_TX_UNK\t\t0x10c\n+#define\tNFE_LINKSPEED\t\t0x110\n+#define\tNFE_SETUP_R5\t\t0x130\n+#define\tNFE_SETUP_R3\t\t0x13C\n+#define\tNFE_SETUP_R7\t\t0x140\n+#define\tNFE_RXTX_CTL\t\t0x144\n+#define\tNFE_TX_RING_ADDR_HI\t0x148\n+#define\tNFE_RX_RING_ADDR_HI\t0x14c\n+#define\tNFE_PHY_STATUS\t\t0x180\n+#define\tNFE_SETUP_R4\t\t0x184\n+#define\tNFE_STATUS\t\t0x188\n+#define\tNFE_PHY_SPEED\t\t0x18c\n+#define\tNFE_PHY_CTL\t\t0x190\n+#define\tNFE_PHY_DATA\t\t0x194\n+#define\tNFE_WOL_CTL\t\t0x200\n+#define\tNFE_PATTERN_CRC\t\t0x204\n+#define\tNFE_PATTERN_MASK\t0x208\n+#define\tNFE_PWR_CAP\t\t0x268\n+#define\tNFE_PWR_STATE\t\t0x26c\n+#define\tNFE_VTAG_CTL\t\t0x300\n+\n+#define\tNFE_PHY_ERROR\t\t0x00001\n+#define\tNFE_PHY_WRITE\t\t0x00400\n+#define\tNFE_PHY_BUSY\t\t0x08000\n+#define\tNFE_PHYADD_SHIFT\t5\n+\n+#define\tNFE_STATUS_MAGIC\t0x140000\n+\n+#define\tNFE_R1_MAGIC\t\t0x16070f\n+#define\tNFE_R2_MAGIC\t\t0x16\n+#define\tNFE_R4_MAGIC\t\t0x08\n+#define\tNFE_R6_MAGIC\t\t0x03\n+#define\tNFE_WOL_MAGIC\t\t0x1111\n+#define\tNFE_RX_START\t\t0x01\n+#define\tNFE_TX_START\t\t0x01\n+\n+#define\tNFE_IRQ_RXERR\t\t0x0001\n+#define\tNFE_IRQ_RX\t\t0x0002\n+#define\tNFE_IRQ_RX_NOBUF\t0x0004\n+#define\tNFE_IRQ_TXERR\t\t0x0008\n+#define\tNFE_IRQ_TX_DONE\t\t0x0010\n+#define\tNFE_IRQ_TIMER\t\t0x0020\n+#define\tNFE_IRQ_LINK\t\t0x0040\n+#define\tNFE_IRQ_TXERR2\t\t0x0080\n+#define\tNFE_IRQ_TX1\t\t0x0100\n+\n+#define\tNFE_IRQ_WANTED\t\t\t\t\t\t\t\\\n \t(NFE_IRQ_RXERR | NFE_IRQ_RX_NOBUF | NFE_IRQ_RX |\t\t\\\n \t NFE_IRQ_TXERR | NFE_IRQ_TXERR2 | NFE_IRQ_TX_DONE |\t\t\\\n \t NFE_IRQ_LINK)\n \n-#define NFE_RXTX_KICKTX\t\t0x0001\n-#define NFE_RXTX_BIT1\t\t0x0002\n-#define NFE_RXTX_BIT2\t\t0x0004\n-#define NFE_RXTX_RESET\t\t0x0010\n-#define NFE_RXTX_VTAG_STRIP\t0x0040\n-#define NFE_RXTX_VTAG_INSERT\t0x0080\n-#define NFE_RXTX_RXCSUM\t\t0x0400\n-#define NFE_RXTX_V2MAGIC\t0x2100\n-#define NFE_RXTX_V3MAGIC\t0x2200\n-#define NFE_RXFILTER_MAGIC\t0x007f0008\n-#define NFE_U2M\t\t\t(1 << 5)\n-#define NFE_PROMISC\t\t(1 << 7)\n+#define\tNFE_RXTX_KICKTX\t\t0x0001\n+#define\tNFE_RXTX_BIT1\t\t0x0002\n+#define\tNFE_RXTX_BIT2\t\t0x0004\n+#define\tNFE_RXTX_RESET\t\t0x0010\n+#define\tNFE_RXTX_VTAG_STRIP\t0x0040\n+#define\tNFE_RXTX_VTAG_INSERT\t0x0080\n+#define\tNFE_RXTX_RXCSUM\t\t0x0400\n+#define\tNFE_RXTX_V2MAGIC\t0x2100\n+#define\tNFE_RXTX_V3MAGIC\t0x2200\n+#define\tNFE_RXFILTER_MAGIC\t0x007f0008\n+#define\tNFE_U2M\t\t\t(1 << 5)\n+#define\tNFE_PROMISC\t\t(1 << 7)\n \n \/* default interrupt moderation timer of 128us *\/\n-#define NFE_IM_DEFAULT\t((128 * 100) \/ 1024)\n-\n-#define NFE_VTAG_ENABLE\t\t(1 << 13)\n-\n-#define NFE_PWR_VALID\t\t(1 << 8)\n-#define NFE_PWR_WAKEUP\t\t(1 << 15)\n-\n-#define NFE_MEDIA_SET\t\t0x10000\n+#define\tNFE_IM_DEFAULT\t((128 * 100) \/ 1024)\n+\n+#define\tNFE_VTAG_ENABLE\t\t(1 << 13)\n+\n+#define\tNFE_PWR_VALID\t\t(1 << 8)\n+#define\tNFE_PWR_WAKEUP\t\t(1 << 15)\n+\n+#define\tNFE_MEDIA_SET\t\t0x10000\n #define\tNFE_MEDIA_1000T\t\t0x00032\n-#define NFE_MEDIA_100TX\t\t0x00064\n-#define NFE_MEDIA_10T\t\t0x003e8\n-\n-#define NFE_PHY_100TX\t\t(1 << 0)\n-#define NFE_PHY_1000T\t\t(1 << 1)\n-#define NFE_PHY_HDX\t\t(1 << 8)\n-\n-#define NFE_MISC1_MAGIC\t\t0x003b0f3c\n-#define NFE_MISC1_HDX\t\t(1 << 1)\n-\n-#define NFE_SEED_MASK\t\t0x0003ff00\n-#define NFE_SEED_10T\t\t0x00007f00\n-#define NFE_SEED_100TX\t\t0x00002d00\n-#define NFE_SEED_1000T\t\t0x00007400\n+#define\tNFE_MEDIA_100TX\t\t0x00064\n+#define\tNFE_MEDIA_10T\t\t0x003e8\n+\n+#define\tNFE_PHY_100TX\t\t(1 << 0)\n+#define\tNFE_PHY_1000T\t\t(1 << 1)\n+#define\tNFE_PHY_HDX\t\t(1 << 8)\n+\n+#define\tNFE_MISC1_MAGIC\t\t0x003b0f3c\n+#define\tNFE_MISC1_HDX\t\t(1 << 1)\n+\n+#define\tNFE_SEED_MASK\t\t0x0003ff00\n+#define\tNFE_SEED_10T\t\t0x00007f00\n+#define\tNFE_SEED_100TX\t\t0x00002d00\n+#define\tNFE_SEED_1000T\t\t0x00007400\n \n \/* Rx\/Tx descriptor *\/\n struct nfe_desc32 {\n \tuint32_t\tphysaddr;\n \tuint16_t\tlength;\n \tuint16_t\tflags;\n-#define NFE_RX_FIXME_V1\t\t0x6004\n-#define NFE_RX_VALID_V1\t\t(1 << 0)\n-#define NFE_TX_ERROR_V1\t\t0x7808\n-#define NFE_TX_LASTFRAG_V1\t(1 << 0)\n-#define NFE_RX_ERROR1_V1\t(1<<7)\n-#define NFE_RX_ERROR2_V1\t(1<<8)\n-#define NFE_RX_ERROR3_V1\t(1<<9)\n-#define NFE_RX_ERROR4_V1\t(1<<10)\n+#define\tNFE_RX_FIXME_V1\t\t0x6004\n+#define\tNFE_RX_VALID_V1\t\t(1 << 0)\n+#define\tNFE_TX_ERROR_V1\t\t0x7808\n+#define\tNFE_TX_LASTFRAG_V1\t(1 << 0)\n+#define\tNFE_RX_ERROR1_V1\t(1<<7)\n+#define\tNFE_RX_ERROR2_V1\t(1<<8)\n+#define\tNFE_RX_ERROR3_V1\t(1<<9)\n+#define\tNFE_RX_ERROR4_V1\t(1<<10)\n } __packed;\n \n-#define NFE_V1_TXERR\t\"\\020\"\t\\\n+#define\tNFE_V1_TXERR\t\"\\020\"\t\\\n \t\"\\14TXERROR\\13UNDERFLOW\\12LATECOLLISION\\11LOSTCARRIER\\10DEFERRED\" \\\n \t\"\\08FORCEDINT\\03RETRY\\00LASTPACKET\"\n \n@@ -165,38 +165,38 @@\n struct nfe_desc64 {\n \tuint32_t\tphysaddr[2];\n \tuint32_t\tvtag;\n-#define NFE_RX_VTAG\t\t(1 << 16)\n-#define NFE_TX_VTAG\t\t(1 << 18)\n+#define\tNFE_RX_VTAG\t\t(1 << 16)\n+#define\tNFE_TX_VTAG\t\t(1 << 18)\n \tuint16_t\tlength;\n \tuint16_t\tflags;\n-#define NFE_RX_FIXME_V2\t\t0x4300\n-#define NFE_RX_VALID_V2\t\t(1 << 13)\n-#define NFE_TX_ERROR_V2\t\t0x5c04\n-#define NFE_TX_LASTFRAG_V2\t(1 << 13)\n-#define NFE_RX_IP_CSUMOK_V2\t0x1000\n-#define NFE_RX_UDP_CSUMOK_V2\t0x1400\n-#define NFE_RX_TCP_CSUMOK_V2\t0x1800\n-#define NFE_RX_ERROR1_V2\t(1<<2)\n-#define NFE_RX_ERROR2_V2\t(1<<3)\n-#define NFE_RX_ERROR3_V2\t(1<<4)\n-#define NFE_RX_ERROR4_V2\t(1<<5)\n+#define\tNFE_RX_FIXME_V2\t\t0x4300\n+#define\tNFE_RX_VALID_V2\t\t(1 << 13)\n+#define\tNFE_TX_ERROR_V2\t\t0x5c04\n+#define\tNFE_TX_LASTFRAG_V2\t(1 << 13)\n+#define\tNFE_RX_IP_CSUMOK_V2\t0x1000\n+#define\tNFE_RX_UDP_CSUMOK_V2\t0x1400\n+#define\tNFE_RX_TCP_CSUMOK_V2\t0x1800\n+#define\tNFE_RX_ERROR1_V2\t(1<<2)\n+#define\tNFE_RX_ERROR2_V2\t(1<<3)\n+#define\tNFE_RX_ERROR3_V2\t(1<<4)\n+#define\tNFE_RX_ERROR4_V2\t(1<<5)\n } __packed;\n \n-#define NFE_V2_TXERR\t\"\\020\"\t\\\n+#define\tNFE_V2_TXERR\t\"\\020\"\t\\\n \t\"\\14FORCEDINT\\13LASTPACKET\\12UNDERFLOW\\10LOSTCARRIER\\09DEFERRED\\02RETRY\"\n \n \/* flags common to V1\/V2 descriptors *\/\n-#define NFE_RX_CSUMOK\t\t0x1c00\n-#define NFE_RX_ERROR\t\t(1 << 14)\n-#define NFE_RX_READY\t\t(1 << 15)\n-#define NFE_TX_TCP_CSUM\t\t(1 << 10)\n-#define NFE_TX_IP_CSUM\t\t(1 << 11)\n-#define NFE_TX_VALID\t\t(1 << 15)\n-\n-#define NFE_READ(sc, reg) \\\n+#define\tNFE_RX_CSUMOK\t\t0x1c00\n+#define\tNFE_RX_ERROR\t\t(1 << 14)\n+#define\tNFE_RX_READY\t\t(1 << 15)\n+#define\tNFE_TX_TCP_CSUM\t\t(1 << 10)\n+#define\tNFE_TX_IP_CSUM\t\t(1 << 11)\n+#define\tNFE_TX_VALID\t\t(1 << 15)\n+\n+#define\tNFE_READ(sc, reg) \\\n \tbus_space_read_4((sc)->nfe_memt, (sc)->nfe_memh, (reg))\n \n-#define NFE_WRITE(sc, reg, val) \\\n+#define\tNFE_WRITE(sc, reg, val) \\\n \tbus_space_write_4((sc)->nfe_memt, (sc)->nfe_memh, (reg), (val))\n \n #ifndef PCI_VENDOR_NVIDIA\n@@ -235,14 +235,14 @@\n #define\tPCI_PRODUCT_NVIDIA_MCP51_LAN1\tPCI_PRODUCT_NVIDIA_NFORCE430_LAN1\n #define\tPCI_PRODUCT_NVIDIA_MCP51_LAN2\tPCI_PRODUCT_NVIDIA_NFORCE430_LAN2\n \n-#define NFE_DEBUG\t\t0x0000\n-#define NFE_DEBUG_INIT\t\t0x0001\n-#define NFE_DEBUG_RUNNING\t0x0002\n-#define NFE_DEBUG_DEINIT \t0x0004\n-#define NFE_DEBUG_IOCTL\t\t0x0008\n-#define NFE_DEBUG_INTERRUPT\t0x0010\n-#define NFE_DEBUG_API\t\t0x0020\n-#define NFE_DEBUG_LOCK\t\t0x0040\n-#define NFE_DEBUG_BROKEN\t0x0080\n-#define NFE_DEBUG_MII\t\t0x0100\n-#define NFE_DEBUG_ALL\t\t0xFFFF\n+#define\tNFE_DEBUG\t\t0x0000\n+#define\tNFE_DEBUG_INIT\t\t0x0001\n+#define\tNFE_DEBUG_RUNNING\t0x0002\n+#define\tNFE_DEBUG_DEINIT \t0x0004\n+#define\tNFE_DEBUG_IOCTL\t\t0x0008\n+#define\tNFE_DEBUG_INTERRUPT\t0x0010\n+#define\tNFE_DEBUG_API\t\t0x0020\n+#define\tNFE_DEBUG_LOCK\t\t0x0040\n+#define\tNFE_DEBUG_BROKEN\t0x0080\n+#define\tNFE_DEBUG_MII\t\t0x0100\n+#define\tNFE_DEBUG_ALL\t\t0xFFFF\n"} {"commit":"b135508c98b99754af9f53c2cf6a7b92fb4f0439","subject":"Following up a previous thought I had, yesterday I realised how to return arays nicely without having to make the plperl programmer aware of anything. The attached patch allows plperl to return an arrayref where the function returns an array type. It silently calls a perl function to stringify the array before passing it to the pg array parser. Non-array returns are handled as before (i.e. passed through this process) so it is backwards compatible. I will presently submit regression tests and docs.","message":"Following up a previous thought I had, yesterday I realised how to\nreturn arays nicely without having to make the plperl programmer aware\nof anything. The attached patch allows plperl to return an arrayref\nwhere the function returns an array type. It silently calls a perl\nfunction to stringify the array before passing it to the pg array\nparser. Non-array returns are handled as before (i.e. passed through\nthis process) so it is backwards compatible. I will presently submit\nregression tests and docs.\n\nexample:\n\nandrew=# create or replace function blah() returns text[][] language\nplperl as $$ return [['a\"b','c,d'],['e\\\\f','g']]; $$;\nCREATE FUNCTION\nandrew=# select blah();\n blah\n-----------------------------\n {{\"a\\\"b\",\"c,d\"},{\"e\\\\f\",g}}\n\n\nThis would complete half of the TODO item:\n\n . Pass arrays natively instead of as text between plperl and postgres\n\n(The other half is translating pg array arguments to perl arrays - that\nwill have to wait for 8.1).\n\nSome of this patch is adapted from a previously submitted patch from\nSergej Sergeev. Both he and Abhijit Menon-Sen have looked it over\nbriefly and tentatively said it looks ok.\n\nAndrew Dunstan\n","repos":"zeroae\/postgres-xl,ahachete\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,kmjungersen\/PostgresXL,Chibin\/gpdb,greenplum-db\/gpdb,royc1\/gpdb,xuegang\/gpdb,chrishajas\/gpdb,zaksoup\/gpdb,rubikloud\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,Chibin\/gpdb,pavanvd\/postgres-xl,CraigHarris\/gpdb,atris\/gpdb,adam8157\/gpdb,lpetrov-pivotal\/gpdb,atris\/gpdb,janebeckman\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,chrishajas\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,pavanvd\/postgres-xl,edespino\/gpdb,oberstet\/postgres-xl,tangp3\/gpdb,ovr\/postgres-xl,royc1\/gpdb,0x0FFF\/gpdb,0x0FFF\/gpdb,rvs\/gpdb,ashwinstar\/gpdb,xuegang\/gpdb,ovr\/postgres-xl,greenplum-db\/gpdb,snaga\/postgres-xl,kmjungersen\/PostgresXL,CraigHarris\/gpdb,rubikloud\/gpdb,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,Chibin\/gpdb,Quikling\/gpdb,adam8157\/gpdb,lintzc\/gpdb,greenplum-db\/gpdb,chrishajas\/gpdb,yazun\/postgres-xl,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,edespino\/gpdb,pavanvd\/postgres-xl,yuanzhao\/gpdb,ahachete\/gpdb,50wu\/gpdb,50wu\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,tangp3\/gpdb,50wu\/gpdb,edespino\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,adam8157\/gpdb,tangp3\/gpdb,xuegang\/gpdb,yazun\/postgres-xl,50wu\/gpdb,zaksoup\/gpdb,yazun\/postgres-xl,lintzc\/gpdb,greenplum-db\/gpdb,ahachete\/gpdb,arcivanov\/postgres-xl,atris\/gpdb,rvs\/gpdb,lpetrov-pivotal\/gpdb,edespino\/gpdb,techdragon\/Postgres-XL,rubikloud\/gpdb,rubikloud\/gpdb,CraigHarris\/gpdb,rvs\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,0x0FFF\/gpdb,ahachete\/gpdb,tangp3\/gpdb,foyzur\/gpdb,chrishajas\/gpdb,janebeckman\/gpdb,pavanvd\/postgres-xl,CraigHarris\/gpdb,zaksoup\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,foyzur\/gpdb,atris\/gpdb,cjcjameson\/gpdb,50wu\/gpdb,chrishajas\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,foyzur\/gpdb,janebeckman\/gpdb,edespino\/gpdb,techdragon\/Postgres-XL,adam8157\/gpdb,zaksoup\/gpdb,yuanzhao\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,edespino\/gpdb,royc1\/gpdb,xuegang\/gpdb,xinzweb\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,postmind-net\/postgres-xl,yuanzhao\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,xuegang\/gpdb,CraigHarris\/gpdb,ovr\/postgres-xl,arcivanov\/postgres-xl,foyzur\/gpdb,adam8157\/gpdb,snaga\/postgres-xl,kaknikhil\/gpdb,xuegang\/gpdb,kaknikhil\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,lintzc\/gpdb,0x0FFF\/gpdb,zeroae\/postgres-xl,xinzweb\/gpdb,oberstet\/postgres-xl,yazun\/postgres-xl,lpetrov-pivotal\/gpdb,Quikling\/gpdb,0x0FFF\/gpdb,rubikloud\/gpdb,foyzur\/gpdb,lpetrov-pivotal\/gpdb,techdragon\/Postgres-XL,Quikling\/gpdb,lpetrov-pivotal\/gpdb,royc1\/gpdb,edespino\/gpdb,randomtask1155\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,yazun\/postgres-xl,atris\/gpdb,techdragon\/Postgres-XL,lisakowen\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,Quikling\/gpdb,tpostgres-projects\/tPostgres,rvs\/gpdb,kaknikhil\/gpdb,janebeckman\/gpdb,foyzur\/gpdb,Chibin\/gpdb,Postgres-XL\/Postgres-XL,rubikloud\/gpdb,cjcjameson\/gpdb,tpostgres-projects\/tPostgres,randomtask1155\/gpdb,Postgres-XL\/Postgres-XL,snaga\/postgres-xl,jmcatamney\/gpdb,ahachete\/gpdb,lisakowen\/gpdb,zaksoup\/gpdb,ovr\/postgres-xl,lpetrov-pivotal\/gpdb,chrishajas\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,kaknikhil\/gpdb,Postgres-XL\/Postgres-XL,kmjungersen\/PostgresXL,edespino\/gpdb,edespino\/gpdb,rvs\/gpdb,Chibin\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,chrishajas\/gpdb,jmcatamney\/gpdb,rvs\/gpdb,ashwinstar\/gpdb,pavanvd\/postgres-xl,rvs\/gpdb,randomtask1155\/gpdb,postmind-net\/postgres-xl,kaknikhil\/gpdb,postmind-net\/postgres-xl,adam8157\/gpdb,Quikling\/gpdb,zaksoup\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,yuanzhao\/gpdb,atris\/gpdb,lintzc\/gpdb,zaksoup\/gpdb,yuanzhao\/gpdb,ahachete\/gpdb,Quikling\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,arcivanov\/postgres-xl,CraigHarris\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,snaga\/postgres-xl,cjcjameson\/gpdb,rvs\/gpdb,kaknikhil\/gpdb,50wu\/gpdb,zeroae\/postgres-xl,0x0FFF\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,lintzc\/gpdb,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,ahachete\/gpdb,jmcatamney\/gpdb,randomtask1155\/gpdb,janebeckman\/gpdb,xuegang\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,cjcjameson\/gpdb,foyzur\/gpdb,greenplum-db\/gpdb,arcivanov\/postgres-xl,cjcjameson\/gpdb,rvs\/gpdb,randomtask1155\/gpdb,kmjungersen\/PostgresXL,oberstet\/postgres-xl,atris\/gpdb,randomtask1155\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,Quikling\/gpdb,atris\/gpdb,arcivanov\/postgres-xl,tpostgres-projects\/tPostgres,oberstet\/postgres-xl,tangp3\/gpdb,yuanzhao\/gpdb,janebeckman\/gpdb,lintzc\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,techdragon\/Postgres-XL,lpetrov-pivotal\/gpdb,lintzc\/gpdb,tpostgres-projects\/tPostgres,ovr\/postgres-xl,janebeckman\/gpdb,Postgres-XL\/Postgres-XL,tangp3\/gpdb,greenplum-db\/gpdb,oberstet\/postgres-xl,royc1\/gpdb,royc1\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,Postgres-XL\/Postgres-XL,tangp3\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,Chibin\/gpdb,Chibin\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,xuegang\/gpdb,postmind-net\/postgres-xl,cjcjameson\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,royc1\/gpdb,snaga\/postgres-xl","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/pl\/plperl\/plperl.c\n+++ src\/pl\/plperl\/plperl.c\n@@ -33,7 +33,7 @@\n *\t ENHANCEMENTS, OR MODIFICATIONS.\n *\n * IDENTIFICATION\n- *\t $PostgreSQL: pgsql\/src\/pl\/plperl\/plperl.c,v 1.82 2005\/07\/10 15:19:43 momjian Exp $\n+ *\t $PostgreSQL: pgsql\/src\/pl\/plperl\/plperl.c,v 1.83 2005\/07\/10 15:32:47 momjian Exp $\n *\n **********************************************************************\/\n \n@@ -81,6 +81,7 @@\n \tbool\t\tlanpltrusted;\n \tbool\t\tfn_retistuple;\t\/* true, if function returns tuple *\/\n \tbool\t\tfn_retisset;\t\/* true, if function returns set *\/\n+\tbool fn_retisarray; \/* true if function returns array *\/\n \tOid\t\t\tresult_oid;\t\t\/* Oid of result type *\/\n \tFmgrInfo\tresult_in_func;\t\/* I\/O function and arg for result type *\/\n \tOid\t\t\tresult_typioparam;\n@@ -194,7 +195,28 @@\n \t\t\"sub ::plperl_warn { my $msg = shift; &elog(&NOTICE, $msg); } \"\n \t\t\"$SIG{__WARN__} = \\\\&::plperl_warn; \"\n \t\t\"sub ::mkunsafefunc {return eval(qq[ sub { $_[0] $_[1] } ]); }\"\n+\t\t\"sub ::_plperl_to_pg_array\"\n+\t\t\"{\"\n+\t\t\" my $arg = shift; ref $arg eq 'ARRAY' || return $arg; \"\n+\t\t\" my $res = ''; my $first = 1; \"\n+\t\t\" foreach my $elem (@$arg) \"\n+\t\t\" { \"\n+\t\t\" $res .= ', ' unless $first; $first = undef; \"\n+\t\t\" if (ref $elem) \"\n+\t\t\" { \"\n+\t\t\" $res .= _plperl_to_pg_array($elem); \"\n+\t\t\" } \"\n+\t\t\" else \"\n+\t\t\" { \"\n+\t\t\" my $str = qq($elem); \"\n+\t\t\" $str =~ s\/([\\\"\\\\\\\\])\/\\\\\\\\$1\/g; \"\n+\t\t\" $res .= qq(\\\"$str\\\"); \"\n+\t\t\" } \"\n+\t\t\" } \"\n+\t\t\" return qq({$res}); \"\n+\t\t\"} \"\n \t};\n+\n \n \tstatic char\t *strict_embedding[3] = {\n \t\t\"\", \"-e\",\n@@ -231,6 +253,7 @@\n \t\"$PLContainer->permit(qw[:base_math !:base_io sort time]);\"\n \t\"$PLContainer->share(qw[&elog &spi_exec_query &return_next \"\n \t\"&spi_query &spi_fetchrow \"\n+\t\"&_plperl_to_pg_array \"\n \t\"&DEBUG &LOG &INFO &NOTICE &WARNING &ERROR %_SHARED ]);\"\n \t\t\t ;\n \n@@ -329,6 +352,34 @@\n \ttup = BuildTupleFromCStrings(attinmeta, values);\n \tpfree(values);\n \treturn tup;\n+}\n+\n+\/*\n+ * convert perl array to postgres string representation\n+ *\/\n+static SV*\n+plperl_convert_to_pg_array(SV *src)\n+{\n+ SV* rv;\n+\tint count;\n+\tdSP ;\n+\n+\tPUSHMARK(SP) ;\n+\tXPUSHs(src);\n+\tPUTBACK ;\n+\n+\tcount = call_pv(\"_plperl_to_pg_array\", G_SCALAR);\n+\n+\tSPAGAIN ;\n+\n+\tif (count != 1)\n+\t\tcroak(\"Big trouble\\n\") ;\n+\n+\trv = POPs;\n+\t\t\t \n+\tPUTBACK ;\n+\n+ return rv;\n }\n \n \n@@ -869,7 +920,8 @@\n \n \trsi = (ReturnSetInfo *)fcinfo->resultinfo;\n \n-\tif (prodesc->fn_retisset) {\n+\tif (prodesc->fn_retisset) \n+\t{\n \t\tif (!rsi || !IsA(rsi, ReturnSetInfo) ||\n \t\t\t(rsi->allowedModes & SFRM_Materialize) == 0 ||\n \t\t\trsi->expectedDesc == NULL)\n@@ -890,7 +942,8 @@\n \t\t\tint i = 0;\n \t\t\tSV **svp = 0;\n \t\t\tAV *rav = (AV *)SvRV(perlret);\n-\t\t\twhile ((svp = av_fetch(rav, i, FALSE)) != NULL) {\n+\t\t\twhile ((svp = av_fetch(rav, i, FALSE)) != NULL) \n+\t\t\t{\n \t\t\t\tplperl_return_next(*svp);\n \t\t\t\ti++;\n \t\t\t}\n@@ -904,7 +957,8 @@\n \t\t}\n \n \t\trsi->returnMode = SFRM_Materialize;\n-\t\tif (prodesc->tuple_store) {\n+\t\tif (prodesc->tuple_store) \n+\t\t{\n \t\t\trsi->setResult = prodesc->tuple_store;\n \t\t\trsi->setDesc = prodesc->tuple_desc;\n \t\t}\n@@ -949,8 +1003,20 @@\n \t}\n \telse\n \t{\n-\t\t\/* Return a perl string converted to a Datum *\/\n-\t\tchar *val = SvPV(perlret, PL_na);\n+ \/* Return a perl string converted to a Datum *\/\n+ char *val;\n+ SV* array_ret;\n+ \n+\n+ if (prodesc->fn_retisarray && SvTYPE(SvRV(perlret)) == SVt_PVAV)\n+ {\n+ array_ret = plperl_convert_to_pg_array(perlret);\n+ SvREFCNT_dec(perlret);\n+ perlret = array_ret;\n+ }\n+\n+\t\tval = SvPV(perlret, PL_na);\n+\n \t\tretval = FunctionCall3(&prodesc->result_in_func,\n \t\t\t\t\t\t\t CStringGetDatum(val),\n \t\t\t\t\t\t\t ObjectIdGetDatum(prodesc->result_typioparam),\n@@ -1208,6 +1274,9 @@\n \t\t\tprodesc->fn_retistuple = (typeStruct->typtype == 'c' ||\n \t\t\t\t\t\t\t\t\t procStruct->prorettype == RECORDOID);\n \n+\t\t\tprodesc->fn_retisarray = \n+\t\t\t\t(typeStruct->typlen == -1 && typeStruct->typelem) ;\n+\n \t\t\tperm_fmgr_info(typeStruct->typinput, &(prodesc->result_in_func));\n \t\t\tprodesc->result_typioparam = getTypeIOParam(typeTup);\n \n"} {"commit":"b0746a4f966e43db473075c36cf6ec7475798ba4","subject":"Bit mask definitions for firmware versioning.","message":"Bit mask definitions for firmware versioning.\n\nAdded versioning info to the MIB sizes array so that both raycontrol\nand if_ray have a better chance of not sending duff data to the ECF.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/ray\/if_raymib.h\n+++ sys\/dev\/ray\/if_raymib.h\n@@ -32,6 +32,15 @@\n *\n *\/\n \n+\/*\n+ * Bit mask definitions for firmware versioning\n+ *\/\n+#define RAY_V4\t0x1\n+#define RAY_V5\t0x2\n+\n+\/*\n+ * MIB stuctures\n+ *\/\n struct ray_mib_common_head {\t\t\t\/*Offset*\/\t\/*Size*\/\n u_int8_t\tmib_net_type;\t\t\t\/*00*\/ \n u_int8_t\tmib_ap_status;\t\t\t\/*01*\/\n@@ -221,9 +230,9 @@\n \t\"Scan mode\",\t\t\t\\\n \t\"APM mode\",\t\t\t\\\n \t\"MAC address\",\t\t\t\\\n-\t\"FRAG_THRESH\",\t\t\t\\\n-\t\"DWELL_TIME\",\t\t\t\\\n-\t\"BEACON_PERIOD\",\t\t\\\n+\t\"Fragmentation threshold\",\t\\\n+\t\"Dwell tIME\",\t\t\t\\\n+\t\"Beacon period\",\t\t\\\n \t\"DTIM_INTERVAL\",\t\t\\\n \t\"MAX_RETRY\",\t\t\t\\\n \t\"ACK_TIMO\",\t\t\t\\\n@@ -336,7 +345,7 @@\n \t\"\",\t\t\t\t\t\\\n \t\"Current PRIV_START\",\t\t\t\\\n \t\"Current PRIV_JOIN\",\t\t\t\\\n-\t\"N\/A\",\t\t\t\t\t\\\n+\t\"\",\t\t\t\t\t\\\n \t\"N\/A\",\t\t\t\t\t\\\n \t\"Desired DEF_TXRATE\",\t\t\t\\\n \t\"Desired ENCRYPT\",\t\t\t\\\n@@ -347,72 +356,82 @@\n }\n \n \/*\n- * Sizes for each MIB element\n- *\/\n-#define RAY_MIB_SIZES {\t\t\t\t\t\\\n-\t1,\t\/* RAY_MIB_NET_TYPE *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_AP_STATUS *\/\t\t\t\\\n-\tIEEE80211_NWID_LEN,\t\/* RAY_MIB_SSID *\/\t\\\n-\t1,\t\/* RAY_MIB_SCAN_MODE *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_APM_MODE *\/\t\t\t\\\n-\tETHER_ADDR_LEN,\/* RAY_MIB_MAC_ADDR *\/\t\t\\\n-\t2,\t\/* RAY_MIB_FRAG_THRESH *\/\t\t\\\n-\t2,\t\/* RAY_MIB_DWELL_TIME *\/\t\t\\\n-\t2,\t\/* RAY_MIB_BEACON_PERIOD *\/\t\t\\\n-\t1,\t\/* RAY_MIB_DTIM_INTERVAL *\/\t\t\\\n-\t1,\t\/* RAY_MIB_MAX_RETRY *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_ACK_TIMO *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_SIFS *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_DIFS *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_PIFS *\/\t\t\t\\\n-\t2,\t\/* RAY_MIB_RTS_THRESH *\/\t\t\\\n-\t2,\t\/* RAY_MIB_SCAN_DWELL *\/\t\t\\\n-\t2,\t\/* RAY_MIB_SCAN_MAX_DWELL *\/\t\t\\\n-\t1,\t\/* RAY_MIB_ASSOC_TIMO *\/\t\t\\\n-\t1,\t\/* RAY_MIB_ADHOC_SCAN_CYCLE *\/\t\t\\\n-\t1,\t\/* RAY_MIB_INFRA_SCAN_CYCLE *\/\t\t\\\n-\t1,\t\/* RAY_MIB_INFRA_SUPER_SCAN_CYCLE *\/\t\\\n-\t1,\t\/* RAY_MIB_PROMISC *\/\t\t\t\\\n-\t2,\t\/* RAY_MIB_UNIQ_WORD *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_SLOT_TIME *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_ROAM_LOW_SNR_THRESH *\/\t\\\n-\t1,\t\/* RAY_MIB_LOW_SNR_COUNT *\/\t\t\\\n-\t1,\t\/* RAY_MIB_INFRA_MISSED_BEACON_COUNT *\/\t\\\n-\t1,\t\/* RAY_MIB_ADHOC_MISSED_BEACON_COUNT *\/\t\\\n-\t1,\t\/* RAY_MIB_COUNTRY_CODE *\/\t\t\\\n-\t1,\t\/* RAY_MIB_HOP_SEQ *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_HOP_SEQ_LEN *\/\t\t\\\n-\t2,\t\/* RAY_MIB_CW_MAX *\/\t\t\t\\\n-\t2,\t\/* RAY_MIB_CW_MIN *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_NOISE_FILTER_GAIN *\/\t\t\\\n-\t1,\t\/* RAY_MIB_NOISE_LIMIT_OFFSET *\/\t\\\n-\t1,\t\/* RAY_MIB_RSSI_THRESH_OFFSET *\/\t\\\n-\t1,\t\/* RAY_MIB_BUSY_THRESH_OFFSET *\/\t\\\n-\t1,\t\/* RAY_MIB_SYNC_THRESH *\/\t\t\\\n-\t1,\t\/* RAY_MIB_TEST_MODE *\/\t\t\t\\\n-\t1,\t\/* RAY_MIB_TEST_MIN_CHAN *\/\t\t\\\n-\t1,\t\/* RAY_MIB_TEST_MAX_CHAN *\/\t\t\\\n-\t1,\t\/* RAY_MIB_ALLOW_PROBE_RESP *\/\t\t\\\n-\t1,\t\/* RAY_MIB_PRIVACY_MUST_START *\/\t\\\n-\t1,\t\/* RAY_MIB_PRIVACY_CAN_JOIN *\/\t\t\\\n-\t8,\t\/* RAY_MIB_BASIC_RATE_SET *\/\t\t\\\n-\t1,\t\/* RAY_MIB_VERSION *\/\t\t\t\\\n-\tETHER_ADDR_LEN,\t\/* RAY_MIB_CUR_BSSID *\/\t\t\\\n-\t1,\t\/* RAY_MIB_CUR_INITED *\/\t\t\\\n-\t1,\t\/* RAY_MIB_CUR_DEF_TXRATE *\/\t\t\\\n-\t1,\t\/* RAY_MIB_CUR_ENCRYPT *\/\t\t\\\n-\t1,\t\/* RAY_MIB_CUR_NET_TYPE *\/\t\t\\\n-\tIEEE80211_NWID_LEN, \/* RAY_MIB_CUR_SSID *\/\t\\\n-\t1,\t\/* RAY_MIB_CUR_PRIV_START *\/\t\t\\\n-\t1,\t\/* RAY_MIB_CUR_PRIV_JOIN *\/\t\t\\\n-\tETHER_ADDR_LEN,\t\/* RAY_MIB_DES_BSSID *\/\t\t\\\n-\t1,\t\/* RAY_MIB_DES_INITED *\/\t\t\\\n-\t1,\t\/* RAY_MIB_DES_DEF_TXRATE *\/\t\t\\\n-\t1,\t\/* RAY_MIB_DES_ENCRYPT *\/\t\t\\\n-\t1,\t\/* RAY_MIB_DES_NET_TYPE *\/\t\t\\\n-\tIEEE80211_NWID_LEN, \/* RAY_MIB_DES_SSID *\/\t\\\n-\t1,\t\/* RAY_MIB_DES_PRIV_START *\/\t\t\\\n-\t1 \t\/* RAY_MIB_DES_PRIV_JOIN *\/\t\t\\\n+ * Applicable versions and work size for each MIB element\n+ *\/\n+#define RAY_MIB_INFO_SIZ4 1\n+#define RAY_MIB_INFO_SIZ5 2\n+#define RAY_MIB_SIZE(info, mib, version) \\\n+\tinfo[(mib)][(version & RAY_V4)?RAY_MIB_INFO_SIZ4:RAY_MIB_INFO_SIZ5]\n+#define RAY_MIB_INFO {\t\t\t\t\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_NET_TYPE *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_AP_STATUS *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\tIEEE80211_NWID_LEN, \t\t\t\t\t\\\n+\t\t\tIEEE80211_NWID_LEN},\/* RAY_MIB_SSID *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_SCAN_MODE *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_APM_MODE *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\tETHER_ADDR_LEN,\t\t\t\t\t\t\\\n+\t\t\tETHER_ADDR_LEN},\/* RAY_MIB_MAC_ADDR *\/\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_FRAG_THRESH *\/\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_DWELL_TIME *\/\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_BEACON_PERIOD *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DTIM_INTERVAL *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_MAX_RETRY *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_ACK_TIMO *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_SIFS *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DIFS *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_PIFS *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_RTS_THRESH *\/\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_SCAN_DWELL *\/\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_SCAN_MAX_DWELL *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_ASSOC_TIMO *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_ADHOC_SCAN_CYCLE *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_INFRA_SCAN_CYCLE *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_INFRA_SUPER_SCAN_CYCLE *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_PROMISC *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t2,\t2},\t\/* RAY_MIB_UNIQ_WORD *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_SLOT_TIME *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_ROAM_LOW_SNR_THRESH *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_LOW_SNR_COUNT *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_INFRA_MISSED_BEACON_COUNT *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_ADHOC_MISSED_BEACON_COUNT *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_COUNTRY_CODE *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_HOP_SEQ *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_HOP_SEQ_LEN *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t2},\t\/* RAY_MIB_CW_MAX *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t2},\t\/* RAY_MIB_CW_MIN *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_NOISE_FILTER_GAIN *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_NOISE_LIMIT_OFFSET *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_RSSI_THRESH_OFFSET *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_BUSY_THRESH_OFFSET *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_SYNC_THRESH *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_TEST_MODE *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_TEST_MIN_CHAN *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_TEST_MAX_CHAN *\/\t\t\\\n+{ RAY_V5,\t0,\t1},\t\/* RAY_MIB_ALLOW_PROBE_RESP *\/\t\t\\\n+{ RAY_V5,\t0,\t1},\t\/* RAY_MIB_PRIVACY_MUST_START *\/\t\\\n+{ RAY_V5,\t0,\t1},\t\/* RAY_MIB_PRIVACY_CAN_JOIN *\/\t\t\\\n+{ RAY_V5,\t0,\t8},\t\/* RAY_MIB_BASIC_RATE_SET *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_VERSION *\/\t\t\t\\\n+{RAY_V4|RAY_V5,\tETHER_ADDR_LEN,\t\t\t\t\t\t\\\n+\t\t\tETHER_ADDR_LEN},\/* RAY_MIB_CUR_BSSID *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_INITED *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_DEF_TXRATE *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_ENCRYPT *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_NET_TYPE *\/\t\t\\\n+{RAY_V4|RAY_V5,\tIEEE80211_NWID_LEN,\t\t\t\t\t\\\n+\t\t\tIEEE80211_NWID_LEN}, \/* RAY_MIB_CUR_SSID *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_PRIV_START *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_CUR_PRIV_JOIN *\/\t\t\\\n+{RAY_V4|RAY_V5,\tETHER_ADDR_LEN,\t\t\t\t\t\t\\\n+\t\t\tETHER_ADDR_LEN},\/* RAY_MIB_DES_BSSID *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DES_INITED *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DES_DEF_TXRATE *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DES_ENCRYPT *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DES_NET_TYPE *\/\t\t\\\n+{RAY_V4|RAY_V5,\tIEEE80211_NWID_LEN, \t\t\t\t\t\\\n+\t\t\tIEEE80211_NWID_LEN}, \/* RAY_MIB_DES_SSID *\/\t\\\n+{RAY_V4|RAY_V5,\t1,\t1},\t\/* RAY_MIB_DES_PRIV_START *\/\t\t\\\n+{RAY_V4|RAY_V5,\t1, \t1} \t\/* RAY_MIB_DES_PRIV_JOIN *\/\t\t\\\n }\n \n \/*\n@@ -999,10 +1018,6 @@\n \/* device can possibly return up to 255 *\/\n #define\tRAY_FAILCAUSE_EDEVSTOP\t256\n \n-#ifdef KERNEL\n-#define\tRAY_FAILCAUSE_WAITING\t257\n-#endif\n-\n \/* Get a param the data is a ray_param_req structure *\/\n #define\tSIOCSRAYPARAM\tSIOCSIFGENERIC\n #define\tSIOCGRAYPARAM\tSIOCGIFGENERIC\n"} {"commit":"647995c0a7a950b15412a1ac7e5060e5f2d0dcf8","subject":"add GetSize to ObjectPropListParser, make all methods static","message":"add GetSize to ObjectPropListParser, make all methods static\n","repos":"whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mtp\/ptp\/ObjectPropertyListParser.h\n+++ mtp\/ptp\/ObjectPropertyListParser.h\n@@ -73,7 +73,15 @@\n \ttemplate<typename PropertyValueType, template <typename> class Parser = impl::ObjectPropertyParser>\n \tstruct ObjectPropertyListParser\n \t{\n-\t\tvoid Parse(const ByteArray & data, const std::function<void (ObjectId, ObjectProperty property, const PropertyValueType &)> &func)\n+\t\tstatic u32 GetSize(const ByteArray & data)\n+\t\t{\n+\t\t\tInputStream stream(data);\n+\t\t\tu32 n;\n+\t\t\tstream >> n;\n+\t\t\treturn n;\n+\t\t}\n+\n+\t\tstatic void Parse(const ByteArray & data, const std::function<void (ObjectId, ObjectProperty property, const PropertyValueType &)> &func)\n \t\t{\n \t\t\tInputStream stream(data);\n \t\t\tu32 n;\n@@ -93,6 +101,8 @@\n \t\t\t}\n \t\t}\n \t};\n+\n+\tusing ObjectStringPropertyListParser = ObjectPropertyListParser<std::string>;\n }\n \n #endif\n"} {"commit":"0c173f44b34991f342b56f952cf263d57dfdd13c","subject":"add suspend\/resume for yamaha chips","message":"add suspend\/resume for yamaha chips\n\nSubmitted by:\tIra L Cooper <ira@MIT.EDU>\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/sound\/isa\/mss.c\n+++ sys\/dev\/sound\/isa\/mss.c\n@@ -36,6 +36,8 @@\n \n #define MSS_BUFFSIZE (65536 - 256)\n #define\tabs(x)\t(((x) < 0) ? -(x) : (x))\n+#define MSS_INDEXED_REGS 0x20\n+#define OPL_INDEXED_REGS 0x19\n \n struct mss_info;\n \n@@ -60,6 +62,8 @@\n int\t\t drq2_rid;\n bus_dma_tag_t parent_dmat;\n \n+ char mss_indexed_regs[MSS_INDEXED_REGS];\n+ char opl_indexed_regs[OPL_INDEXED_REGS];\n int pdma, rdma;\n int bd_id; \/* used to hold board-id info, eg. sb version,\n \t\t * mss codec type, etc. etc.\n@@ -944,10 +948,79 @@\n \treturn mss_doattach(dev, mss);\n }\n \n+\/*\n+ * mss_resume() is the code to allow a laptop to resume using the sound\n+ * card.\n+ *\n+ * This routine re-sets the state of the board to the state before going\n+ * to sleep. According to the yamaha docs this is the right thing to do,\n+ * but getting DMA restarted appears to be a bit of a trick, so the device\n+ * has to be closed and re-opened to be re-used, but there is no skipping\n+ * problem, and volume, bass\/treble and most other things are restored\n+ * properly.\n+ *\n+ *\/\n+\n+static int\n+mss_resume(device_t dev)\n+{\n+ \t\/*\n+ \t * Restore the state taken below.\n+ \t *\/\n+ \tstruct mss_info *mss;\n+ \tint i;\n+\n+ \tmss = pcm_getdevinfo(dev);\n+\n+ \tif (mss->bd_id == MD_YM0020)\n+ \t{\n+\t\t\/* This works on a Toshiba Libretto 100CT. *\/\n+\t\tfor (i = 0; i < MSS_INDEXED_REGS; i++)\n+ \t\t\tad_write(mss, i, mss->mss_indexed_regs[i]);\n+\t\tfor (i = 0; i < OPL_INDEXED_REGS; i++)\n+ \t\t\tconf_wr(mss, i, mss->opl_indexed_regs[i]);\n+\t\tmss_intr(mss);\n+ \t}\n+ \treturn 0;\n+\n+}\n+\n+\/*\n+ * mss_suspend() is the code that gets called right before a laptop\n+ * suspends.\n+ *\n+ * This code saves the state of the sound card right before shutdown\n+ * so it can be restored above.\n+ *\n+ *\/\n+\n+static int\n+mss_suspend(device_t dev)\n+{\n+ \tint i;\n+ \tstruct mss_info *mss;\n+\n+ \tmss = pcm_getdevinfo(dev);\n+\n+ \tif(mss->bd_id == MD_YM0020)\n+ \t{\n+\t\t\/* this stops playback. *\/\n+\t\tconf_wr(mss, 0x12, 0x0c);\n+\t\tfor(i = 0; i < MSS_INDEXED_REGS; i++)\n+ \t\t\tmss->mss_indexed_regs[i] = ad_read(mss, i);\n+\t\tfor(i = 0; i < OPL_INDEXED_REGS; i++)\n+ \t\t\tmss->opl_indexed_regs[i] = conf_rd(mss, i);\n+\t\tmss->opl_indexed_regs[0x12] = 0x0;\n+ \t}\n+ \treturn 0;\n+}\n+\n static device_method_t mss_methods[] = {\n \t\/* Device interface *\/\n \tDEVMETHOD(device_probe,\t\tmss_probe),\n \tDEVMETHOD(device_attach,\tmss_attach),\n+\tDEVMETHOD(device_suspend, mss_suspend),\n+\tDEVMETHOD(device_resume, mss_resume),\n \n \t{ 0, 0 }\n };\n@@ -1443,6 +1516,8 @@\n \t\/* Device interface *\/\n \tDEVMETHOD(device_probe,\t\tpnpmss_probe),\n \tDEVMETHOD(device_attach,\tpnpmss_attach),\n+\tDEVMETHOD(device_suspend, mss_suspend),\n+\tDEVMETHOD(device_resume, mss_resume),\n \n \t{ 0, 0 }\n };\n"} {"commit":"72d7922c4c3d6897cff978dd25311850b4b31dce","subject":"Fix bug due to conversion to cgraph","message":"Fix bug due to conversion to cgraph\n","repos":"tkelman\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,ellson\/graphviz,kbrock\/graphviz,tkelman\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,jho1965us\/graphviz,ellson\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,tkelman\/graphviz,kbrock\/graphviz,kbrock\/graphviz,ellson\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,ellson\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,ellson\/graphviz,kbrock\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,tkelman\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,tkelman\/graphviz,kbrock\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- cmd\/tools\/mm2gv.c\n+++ cmd\/tools\/mm2gv.c\n@@ -260,7 +260,6 @@\n } else {\n g = agopen (\"G\", Agdirected, (Agdisc_t *) 0);\n }\n- aginit (g, AGNODE, \"nodeinfo\", sizeof(Agnodeinfo_t), TRUE);\n sprintf (buf, \"%f\", 1.0);\n \n label_string = strcpy(label_string, name);\n@@ -282,6 +281,7 @@\n for (i = 0; i < A->m; i++) {\n sprintf (buf, \"%d\", i);\n n = agnode (g, buf, 1);\n+ agbindrec (n, \"nodeinfo\", sizeof(Agnodeinfo_t), TRUE);\n ND_id(n) = i;\n arr[i] = n;\n }\n"} {"commit":"3b62c472a01a68a303f7662a362a88f0b624be38","subject":"handle duplex properly in the AIOGCAP ioctl - this may (partially?) fix rat","message":"handle duplex properly in the AIOGCAP ioctl - this may (partially?) fix rat\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/sound\/pcm\/dsp.c\n+++ sys\/dev\/sound\/pcm\/dsp.c\n@@ -275,6 +275,8 @@\n \t\t\t\/* XXX bad on sb16 *\/\n \t \t\tp->formats = (rcaps? rcaps->formats : 0xffffffff) &\n \t\t\t \t (pcaps? pcaps->formats : 0xffffffff);\n+\t\t\tif (rdch && wrch)\n+\t\t\t\tp->formats |= (d->flags & SD_F_SIMPLEX)? 0 : AFMT_FULLDUPLEX;\n \t \t\tp->mixers = 1; \/* default: one mixer *\/\n \t \t\tp->inputs = d->mixer.devs;\n \t \t\tp->left = p->right = 100;\n"} {"commit":"bc3cfdad44cdada9a54af08587f04a6004fb974a","subject":"Remove left behind debug printf","message":"Remove left behind debug printf\n","repos":"AnotherJohnH\/Platform,AnotherJohnH\/Platform,AnotherJohnH\/Platform,AnotherJohnH\/Platform","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/STB\/SmallLex.h\n+++ include\/STB\/SmallLex.h\n@@ -117,7 +117,6 @@\n \n bool doMatch(const char* token, const char* description, bool err)\n {\n- printf(\"\\n\");\n bool is_regex = description != nullptr;\n \n char ch;\n"} {"commit":"37a4441439b6d47c934b7ca280a7c85f6cfd7b9e","subject":"Struct ifatm isn't at the beginning of the softc anymore. Use the correct way (IFP2IFATM()) to access it.","message":"Struct ifatm isn't at the beginning of the softc anymore. Use the\ncorrect way (IFP2IFATM()) to access it.\n\nApproved by:\tre\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/utopia\/utopia.c\n+++ sys\/dev\/utopia\/utopia.c\n@@ -223,7 +223,7 @@\n static int\n utopia_media_change(struct ifnet *ifp)\n {\n-\tstruct ifatm *ifatm = (struct ifatm *)ifp->if_softc;\n+\tstruct ifatm *ifatm = IFP2IFATM(ifp);\n \tstruct utopia *utp = ifatm->phy;\n \tint error = 0;\n \n@@ -262,7 +262,7 @@\n static void\n utopia_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)\n {\n-\tstruct utopia *utp = ((struct ifatm *)ifp->if_softc)->phy;\n+\tstruct utopia *utp = IFP2IFATM(ifp)->phy;\n \n \tUTP_LOCK(utp);\n \tif (utp->chip->type != UTP_TYPE_UNKNOWN && utp->state & UTP_ST_ACTIVE) {\n"} {"commit":"5be0eebeba4e4dc596ef48e96213aeb8fcb1be29","subject":"Fix error: '__glibc_unlikely' undefined","message":"Fix error: '__glibc_unlikely' undefined\n\nSigned-off-by: You-Sheng Yang (\u694a\u6709\u52dd) <f349d20a1ec405bb1f9f57f706f552f13a94efa4@gmail.com>\n","repos":"laarid\/package_android-bionic,laarid\/package_android-bionic","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/bionic\/cdefs.h\n+++ include\/bionic\/cdefs.h\n@@ -23,7 +23,7 @@\n \n #include <sys\/cdefs.h>\n \n-#if defined(__GNUC__)\n+#if defined(__glibc_unlikely)\n #define __predict_false(expr) __glibc_unlikely(expr)\n #define __predict_true(expr) __glibc_likely(expr)\n #else\n"} {"commit":"0c48aa72906c5948bcac2283166cb2d0071f9d4b","subject":"Replace goto with continue.","message":"Replace goto with continue.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/i386\/i386\/machdep.c\n+++ sys\/i386\/i386\/machdep.c\n@@ -1669,16 +1669,16 @@\n \t\t\t smap->type, smap->base, smap->length);\n \n \t\tif (smap->type != 0x01)\n-\t\t\tgoto next_run;\n+\t\t\tcontinue;\n \n \t\tif (smap->length == 0)\n-\t\t\tgoto next_run;\n+\t\t\tcontinue;\n \n #ifndef PAE\n \t\tif (smap->base >= 0xffffffff) {\n \t\t\tprintf(\"%uK of memory above 4GB ignored\\n\",\n \t\t\t (u_int)(smap->length \/ 1024));\n-\t\t\tgoto next_run;\n+\t\t\tcontinue;\n \t\t}\n #endif\n \n@@ -1687,13 +1687,13 @@\n \t\t\t\tif (boothowto & RB_VERBOSE)\n \t\t\t\t\tprintf(\n \t\"Overlapping or non-montonic memory region, ignoring second region\\n\");\n-\t\t\t\tgoto next_run;\n+\t\t\t\tcontinue;\n \t\t\t}\n \t\t}\n \n \t\tif (smap->base == physmap[physmap_idx + 1]) {\n \t\t\tphysmap[physmap_idx + 1] += smap->length;\n-\t\t\tgoto next_run;\n+\t\t\tcontinue;\n \t\t}\n \n \t\tphysmap_idx += 2;\n@@ -1704,7 +1704,6 @@\n \t\t}\n \t\tphysmap[physmap_idx] = smap->base;\n \t\tphysmap[physmap_idx + 1] = smap->base + smap->length;\n-next_run: ;\n \t} while (vmf.vmf_ebx != 0);\n \n \t\/*\n"} {"commit":"c85a0e4f44c3f119cc6ed3b4d3e975e35f9c4b76","subject":"arm: correct value of ARM_GRP_INT (=CS_GRP_INT=4)","message":"arm: correct value of ARM_GRP_INT (=CS_GRP_INT=4)\n","repos":"xia0pin9\/capstone,fvrmatteo\/capstone,bSr43\/capstone,xia0pin9\/capstone,AmesianX\/capstone,fvrmatteo\/capstone,fvrmatteo\/capstone,xia0pin9\/capstone,xia0pin9\/capstone,bSr43\/capstone,AmesianX\/capstone,xia0pin9\/capstone,bSr43\/capstone,fvrmatteo\/capstone,fvrmatteo\/capstone,bSr43\/capstone,xia0pin9\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,xia0pin9\/capstone,bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone,fvrmatteo\/capstone,AmesianX\/capstone,fvrmatteo\/capstone,AmesianX\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/capstone\/arm.h\n+++ include\/capstone\/arm.h\n@@ -887,8 +887,8 @@\n \t\/\/ all jump instructions (conditional+direct+indirect jumps)\n \tARM_GRP_JUMP,\t\/\/ = CS_GRP_JUMP\n \tARM_GRP_CALL,\t\/\/ = CS_GRP_CALL\n+\tARM_GRP_INT = 4, \/\/ = CS_GRP_INT\n \tARM_GRP_PRIVILEGE = 6, \/\/ = CS_GRP_PRIVILEGE\n-\tARM_GRP_INT,\t\/\/ = CS_GRP_INT\n \n \t\/\/> Architecture-specific groups\n \tARM_GRP_CRYPTO = 128,\n"} {"commit":"d42f60eea8294c333e05d318f500d224a50d6922","subject":"Cleanup.","message":"Cleanup.\n","repos":"sigmavirus24\/wmii,darkfeline\/wmii,sigmavirus24\/wmii,sigmavirus24\/wmii,rvedam\/wmii,rvedam\/wmii,sigmavirus24\/wmii,Sirikid\/wmii,jerluc\/wmii,Sirikid\/wmii,wingyplus\/wmii,wingyplus\/wmii,rvedam\/wmii,darkfeline\/wmii,darkfeline\/wmii,wingyplus\/wmii,wingyplus\/wmii,jerluc\/wmii,darkfeline\/wmii,jerluc\/wmii,wingyplus\/wmii,Sirikid\/wmii,Sirikid\/wmii,sigmavirus24\/wmii,rvedam\/wmii,darkfeline\/wmii,jerluc\/wmii,rvedam\/wmii,jerluc\/wmii,Sirikid\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wmii\/column.c\n+++ cmd\/wmii\/column.c\n@@ -20,7 +20,8 @@\n \tchar *s, *t, *orig;\n \tchar add, old;\n \n-\t\/* The mapping between the current internal\n+\t\/*\n+\t * The mapping between the current internal\n \t * representation and the external interface\n \t * is currently a bit complex. That will probably\n \t * change.\n@@ -343,69 +344,69 @@\n }\n \n static void\n-column_fit(Area *a, uint *ncolp, uint *nuncolp) {\n+column_fit(Area *a, uint *n_colp, uint *n_uncolp) {\n \tFrame *f, **fp;\n \tuint minh, dy;\n-\tuint ncol, nuncol;\n-\tuint colh, uncolh;\n+\tuint n_col, n_uncol;\n+\tuint col_h, uncol_h;\n \tint surplus, i, j;\n \n \t\/* The minimum heights of collapsed and uncollpsed frames.\n \t *\/\n \tminh = labelh(def.font);\n-\tcolh = labelh(def.font);\n-\tuncolh = minh + colh + 1;\n+\tcol_h = labelh(def.font);\n+\tuncol_h = minh + col_h + 1;\n \tif(a->max && !resizing)\n-\t\tcolh = 0;\n+\t\tcol_h = 0;\n \n \t\/* Count collapsed and uncollapsed frames. *\/\n-\tncol = 0;\n-\tnuncol = 0;\n+\tn_col = 0;\n+\tn_uncol = 0;\n \tfor(f=a->frame; f; f=f->anext) {\n \t\tframe_resize(f, f->colr);\n \t\tif(f->collapsed)\n-\t\t\tncol++;\n+\t\t\tn_col++;\n \t\telse\n-\t\t\tnuncol++;\n-\t}\n-\n-\tif(nuncol == 0) {\n-\t\tnuncol++;\n-\t\tncol--;\n+\t\t\tn_uncol++;\n+\t}\n+\n+\tif(n_uncol == 0) {\n+\t\tn_uncol++;\n+\t\tn_col--;\n \t\t(a->sel ? a->sel : a->frame)->collapsed = false;\n \t}\n \n \t\/* FIXME: Kludge. See frame_attachrect. *\/\n \tdy = Dy(a->view->r[a->screen]) - Dy(a->r);\n-\tminh = colh * (ncol + nuncol - 1) + uncolh;\n+\tminh = col_h * (n_col + n_uncol - 1) + uncol_h;\n \tif(dy && Dy(a->r) < minh)\n \t\ta->r.max.y += min(dy, minh - Dy(a->r));\n \n \tsurplus = Dy(a->r)\n-\t\t- (ncol * colh)\n-\t\t- (nuncol * uncolh);\n+\t\t- (n_col * col_h)\n+\t\t- (n_uncol * uncol_h);\n \n \t\/* Collapse until there is room *\/\n \tif(surplus < 0) {\n-\t\ti = ceil(-1.F * surplus \/ (uncolh - colh));\n-\t\tif(i >= nuncol)\n-\t\t\ti = nuncol - 1;\n-\t\tnuncol -= i;\n-\t\tncol += i;\n-\t\tsurplus += i * (uncolh - colh);\n+\t\ti = ceil(-1.F * surplus \/ (uncol_h - col_h));\n+\t\tif(i >= n_uncol)\n+\t\t\ti = n_uncol - 1;\n+\t\tn_uncol -= i;\n+\t\tn_col += i;\n+\t\tsurplus += i * (uncol_h - col_h);\n \t}\n \t\/* Push to the floating layer until there is room *\/\n \tif(surplus < 0) {\n-\t\ti = ceil(-1.F * surplus \/ colh);\n-\t\tif(i > ncol)\n-\t\t\ti = ncol;\n-\t\tncol -= i;\n-\t\tsurplus += i * colh;\n+\t\ti = ceil(-1.F * surplus \/ col_h);\n+\t\tif(i > n_col)\n+\t\t\ti = n_col;\n+\t\tn_col -= i;\n+\t\tsurplus += i * col_h;\n \t}\n \n \t\/* Decide which to collapse and which to float. *\/\n-\tj = nuncol - 1;\n-\ti = ncol - 1;\n+\tj = n_uncol - 1;\n+\ti = n_col - 1;\n \tfor(fp=&a->frame; *fp;) {\n \t\tf = *fp;\n \t\tif(f != a->sel) {\n@@ -427,22 +428,22 @@\n \t\tfp = &f->anext;\n \t}\n \n-\tif(ncolp) *ncolp = ncol;\n-\tif(nuncolp) *nuncolp = nuncol;\n+\tif(n_colp) *n_colp = n_col;\n+\tif(n_uncolp) *n_uncolp = n_uncol;\n }\n \n void\n column_settle(Area *a) {\n \tFrame *f;\n \tuint yoff, yoffcr;\n-\tint surplus, nuncol, n;\n-\n-\tnuncol = 0;\n+\tint surplus, n_uncol, n;\n+\n+\tn_uncol = 0;\n \tsurplus = column_surplus(a);\n \tfor(f=a->frame; f; f=f->anext)\n-\t\tif(!f->collapsed) nuncol++;\n-\n-\tif(nuncol == 0) {\n+\t\tif(!f->collapsed) n_uncol++;\n+\n+\tif(n_uncol == 0) {\n \t\tfprint(2, \"%s: Badness: No uncollapsed frames, column %d, view %q\\n\",\n \t\t\t\targv0, area_idx(a), a->view->name);\n \t\treturn;\n@@ -453,8 +454,8 @@\n \n \tyoff = a->r.min.y;\n \tyoffcr = yoff;\n-\tn = surplus % nuncol;\n-\tsurplus \/= nuncol;\n+\tn = surplus % n_uncol;\n+\tsurplus \/= n_uncol;\n \tfor(f=a->frame; f; f=f->anext) {\n \t\tf->r = rectsetorigin(f->r, Pt(a->r.min.x, yoff));\n \t\tf->colr = rectsetorigin(f->colr, Pt(a->r.min.x, yoffcr));\n@@ -729,7 +730,6 @@\n \n \tcolumn_resizeframe_h(f, r);\n \n-\t\/* view_arrange(v); *\/\n \tview_update(v);\n }\n \n"} {"commit":"9912dd8f10ac82c232b6b6d60135f5b99bf9dcd4","subject":"Fixed reversed arguments and poor formatting and comments for OUT*. The reversals were doubled except in comments so there was no problem at runtime.","message":"Fixed reversed arguments and poor formatting and comments for OUT*.\nThe reversals were doubled except in comments so there was no problem\nat runtime.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/i386\/isa\/sound\/os.h\n+++ sys\/i386\/isa\/sound\/os.h\n@@ -240,19 +240,19 @@\n \n #if 0\n \/* \n- * The outb(0, 0x80) is just for slowdown. It's bit unsafe since\n- * this address could be used for something usefull.\n+ * outb(0x5f, 0) and outb(0x80, 0) are just for delay. They are a bit\n+ * unsafe since there might be a device at the magic address.\n *\/\n #ifdef PC98\n-#define OUTB(addr, data)\t{outb(data, addr);outb(0x5f, 0);}\n-#define OUTW(addr, data)\t{outw(data, addr);outb(0x5f, 0);}\n+#define OUTB(data, addr)\t{ outb(addr, data); outb(0x5f, 0); }\n+#define OUTW(data, addr)\t{ outw(addr, data); outb(0x5f, 0); }\n #else \/* IBM-PC *\/\n-#define OUTB(addr, data)\t{outb(data, addr);outb(0x80, 0);}\n-#define OUTW(addr, data)\t{outw(data, addr);outb(0x80, 0);}\n+#define OUTB(data, addr)\t{ outb(addr, data); outb(0x80, 0); }\n+#define OUTW(data, addr)\t{ outw(addr, data); outb(0x80, 0); }\n #endif \/* PC98 *\/\n #else\n-#define OUTB(addr, data)\toutb(data, addr)\n-#define OUTW(addr, data)\toutw(data, addr)\n+#define OUTB(data, addr)\toutb(addr, data)\n+#define OUTW(data, addr)\toutw(addr, data)\n #endif\n \n \/* memcpy() was not defined on FreeBSD. Lets define it here *\/\n"} {"commit":"307973f2b1daf08020276b4385624c9a80f8f98b","subject":"Fix ARM_GRP_PRIVILEGE","message":"Fix ARM_GRP_PRIVILEGE\n","repos":"xia0pin9\/capstone,AmesianX\/capstone,xia0pin9\/capstone,xia0pin9\/capstone,bSr43\/capstone,fvrmatteo\/capstone,AmesianX\/capstone,AmesianX\/capstone,AmesianX\/capstone,bSr43\/capstone,fvrmatteo\/capstone,fvrmatteo\/capstone,bSr43\/capstone,AmesianX\/capstone,xia0pin9\/capstone,fvrmatteo\/capstone,AmesianX\/capstone,bSr43\/capstone,fvrmatteo\/capstone,bSr43\/capstone,xia0pin9\/capstone,fvrmatteo\/capstone,bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone,fvrmatteo\/capstone,xia0pin9\/capstone,xia0pin9\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/capstone\/arm.h\n+++ include\/capstone\/arm.h\n@@ -878,6 +878,7 @@\n \t\/\/> Generic groups\n \t\/\/ all jump instructions (conditional+direct+indirect jumps)\n \tARM_GRP_JUMP,\t\/\/ = CS_GRP_JUMP\n+\tARM_GRP_PRIVILEGE = 6, \/\/ = CS_GRP_PRIVILEGE\n \n \t\/\/> Architecture-specific groups\n \tARM_GRP_CRYPTO = 128,\n@@ -912,7 +913,6 @@\n \tARM_GRP_DPVFP,\n \tARM_GRP_V6M,\n \tARM_GRP_VIRTUALIZATION,\n-\tARM_GRP_PRIVILEGE,\n \n \tARM_GRP_ENDING,\n } arm_insn_group;\n"} {"commit":"4c85d31e61c0865570788de0d32ffaf3f1b63650","subject":"Fix small memory leak, thanks Andrey Teleshov","message":"Fix small memory leak, thanks Andrey Teleshov\n","repos":"sunaku\/wmii,sunaku\/wmii,bwhmather\/wmii,bwhmather\/wmii,0intro\/wmii,sunaku\/wmii,bwhmather\/wmii,0intro\/wmii,0intro\/wmii,bwhmather\/wmii,sunaku\/wmii,sunaku\/wmii,0intro\/wmii,bwhmather\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wmii\/column.c\n+++ cmd\/wmii\/column.c\n@@ -59,8 +59,10 @@\n \t\t\t\t\ta->mode = Colstack;\n \t\t\t\telse\n \t\t\t\t\ta->mode = a->mode == Coldefault ? Colstack : Coldefault;\n-\t\t\t}else\n+\t\t\t}else {\n+\t\t\t\tfree(orig);\n \t\t\t\treturn false;\n+\t\t\t}\n \t\t}\n \t\tt = s;\n \t\tif(old)\n"} {"commit":"d784320cf0550a90988b4a1808e38f1f9d648253","subject":"Be more careful with how we do a chip reset.","message":"Be more careful with how we do a chip reset.\n\nClean up some comments.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/i386\/scsi\/aic7xxx.c\n+++ sys\/i386\/scsi\/aic7xxx.c\n@@ -24,7 +24,7 @@\n *\n * commenced: Sun Sep 27 18:14:01 PDT 1992\n *\n- * $Id: aic7xxx.c,v 1.19 1995\/04\/01 19:53:04 gibbs Exp $\n+ * $Id: aic7xxx.c,v 1.20 1995\/04\/09 06:39:01 gibbs Exp $\n *\/\n \/*\n * TODO:\n@@ -461,6 +461,7 @@\n #define HA_RETURN_1\t\t0xc4aul\n #define\t\tSEND_WDTR\t0x80\n #define\t\tSEND_SDTR\t0x80\n+#define\t\tSEND_REJ\t0x40\n \n #define HA_SIGSTATE\t\t0xc4bul\n \n@@ -669,8 +670,8 @@\n return;\n }\n }\n-\t\/* Default to asyncronous transfer *\/\n- *scsirate = 0;\n+\t\/* Default to asyncronous transfers. Also reject this SDTR request. *\/\n+\t*scsirate = 0;\n \tprintf(\"ahc%d: target %d using asyncronous transfers\\n\",\n \t\tunit, target );\n #ifdef AHC_DEBUG\n@@ -834,7 +835,7 @@\n \t\t\t\t * multiply by four\n \t\t\t\t *\/\n \t transfer = inb(HA_ARG_1 + iobase) << 2;\n-\t\t\t\t\/* The bottom half of SCSIXFER*\/\n+\t\t\t\t\/* The bottom half of SCSIXFER *\/\n \t\t\t\toffset = inb(ACCUM + iobase);\n \t\t\t\tscsi_id = inb(SCSIID + iobase) >> 0x4;\n \t\t\t\tahc_scsirate(&rate, transfer, offset, unit,\n@@ -848,8 +849,21 @@\n \t\t\t\trate |= targ_scratch & 0x80;\t\n \t\t\t\toutb(HA_TARG_SCRATCH + iobase + scsi_id, rate);\n \t\t\t\toutb(SCSIRATE + iobase, rate); \n+\t\t\t\tif( (rate & 0x7f) == 0 ) \n+\t\t\t\t{\n+\t\t\t\t\t\/*\n+\t\t\t\t\t * The requested rate was so low\n+\t\t\t\t\t * that asyncronous transfers are\n+\t\t\t\t\t * faster (not to mention the \n+\t\t\t\t\t * controller won't support them),\n+\t\t\t\t\t * so we issue a message reject to\n+\t\t\t\t\t * ensure we go to asyncronous\n+\t\t\t\t\t * transfers.\n+\t\t\t\t\t *\/\n+\t\t\t\t\toutb(HA_RETURN_1 + iobase, SEND_REJ);\n+\t\t\t\t}\n \t\t\t\t\/* See if we initiated Sync Negotiation *\/\n-\t\t\t\tif(ahc->sdtrpending & (0x01 << scsi_id))\n+\t\t\t\telse if(ahc->sdtrpending & (0x01 << scsi_id))\n \t\t\t\t{\n \t\t\t\t\t\/*\n \t\t\t\t\t * Don't send an SDTR back to\n@@ -1370,8 +1384,8 @@\n \t\/* Save the IRQ type before we do a chip reset *\/\n \n \tahc->unpause = (inb(HCNTRL + iobase) & IRQMS) | INTEN;\n-\tahc->pause = (inb(HCNTRL + iobase) & IRQMS) | INTEN | PAUSE;\n-\toutb(HCNTRL + iobase, CHIPRST);\n+\tahc->pause = ahc->unpause | PAUSE;\n+\toutb(HCNTRL + iobase, CHIPRST | ahc->pause);\n \t\/*\n \t * Ensure that the reset has finished\n \t *\/\n@@ -1382,8 +1396,10 @@\n \t\t\tbreak;\n \t}\n \tif(wait == 0) {\n-\t\tprintf(\"ahc%d: Failed chip reset - probe failed!\\n\", unit);\n-\t\treturn(1);\n+\t\tprintf(\"ahc%d: WARNING - Failed chip reset! \"\n+\t\t \"Trying to initialize anyway.\\n\", unit);\n+\t\t\/* Forcibly clear CHIPRST *\/\n+\t\toutb(HCNTRL + iobase, ahc->pause);\n \t}\n \tswitch( ahc->type ) {\n \t case AHC_274:\n@@ -1403,7 +1419,10 @@\n \t\tahc->maxscbs = 0x10;\n \t\t#define DFTHRESH 3\n \t\toutb(DSPCISTATUS + iobase, DFTHRESH << 6);\n-\t\t\/* XXX Hard coded SCSI ID for now *\/\n+\t\t\/* \n+\t\t * XXX Hard coded SCSI ID until we can read it from the\n+\t\t * SEEPROM or NVRAM.\n+\t\t *\/\n \t\toutb(HA_SCSICONF + iobase, 0x07 | (DFTHRESH << 6));\n \t\t\/* In case we are a wide card *\/\n \t\toutb(HA_SCSICONF + 1 + iobase, 0x07);\n@@ -1505,7 +1524,7 @@\n \t\t}\n \t}\n \n-\t\/* Set the SCSI Id, SXFRCTL1, and SIMODE1, for both channes *\/\n+\t\/* Set the SCSI Id, SXFRCTL1, and SIMODE1, for both channels *\/\n \tif( ahc->type & AHC_TWIN)\n \t{\n \t\t\/* \n@@ -2097,12 +2116,10 @@\n ,scb->xs->sc_link->lun \n ,scb->xs->sc_link->device->name\n ,scb->xs->sc_link->dev_unit);\n+#ifdef SCSIDEBUG\n+\tshow_scsi_cmd(scb->xs); \n+#endif\n #ifdef AHC_DEBUG\n-#ifdef\tSCSIDEBUG\n-\tif (ahc_debug & AHC_SHOWCMDS) {\n-\t\tshow_scsi_cmd(scb->xs); \n-\t}\n-#endif\n if (ahc_debug & AHC_SHOWSCBS)\n ahc_print_active_scb(unit);\n #endif \/*AHC_DEBUG *\/\n"} {"commit":"1c4c424f86f51942b44a5f5dc6a86c3ec7179cf1","subject":"working on neuro, now can be compiled, need to provide L values","message":"working on neuro, now can be compiled, need to provide L values\n","repos":"eth-cscs\/PASC_inference,eth-cscs\/PASC_inference,eth-cscs\/PASC_inference,eth-cscs\/PASC_inference,eth-cscs\/PASC_inference,eth-cscs\/PASC_inference","returncode":1,"stderr":"error: pathspec 'include\/data\/edfdata.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- include\/data\/edfdata.h\n+++ include\/data\/edfdata.h\n@@ -0,0 +1,731 @@\n+\/** @file edfdata.cu\n+ * @brief this is only for PETSC!\n+ * \n+ * @author Lukas Pospisil\n+ *\/\n+\n+#ifndef PASC_EDFDATA_H\n+#define\tPASC_EDFDATA_H\n+\n+#ifndef USE_PETSCVECTOR\n+ #error 'EDFDATA is for PETSCVECTOR'\n+#endif\n+\n+typedef petscvector::PetscVector PetscVector;\n+\n+#include <iostream>\n+#include \"common\/common.h\"\n+#include \"algebra\/bgmgraph.h\"\n+#include \"model\/tsmodel.h\"\n+#include \"data\/tsdata.h\"\n+\n+namespace pascinference {\n+namespace data {\n+\n+template<class VectorBase>\n+class EdfData: public TSData<VectorBase> {\n+\tprotected:\n+\t\t\/* informations from EDF file *\/\n+\t\tstruct Record {\n+\t\t\tstd::string *hdr_label;\n+\t\t\tstd::string *hdr_transducer;\n+\t\t\tstd::string *hdr_units;\n+\t\t\tdouble hdr_physicalMin; \/\/ TODO: double or int?\n+\t\t\tdouble hdr_physicalMax;\n+\t\t\tdouble hdr_digitalMin;\n+\t\t\tdouble hdr_digitalMax;\n+\t\t\tstd::string *hdr_prefilter;\n+\t\t\tint hdr_samples;\n+\t\t};\n+\t\tint hdr_ver;\n+\t\tstd::string hdr_patientID;\n+\t\tstd::string hdr_recordID;\n+\t\tstd::string hdr_startdate;\n+\t\tstd::string hdr_starttime;\n+\t\tint hdr_bytes;\n+\t\tint hdr_records;\n+\t\tint hdr_duration;\n+\t\tint hdr_ns;\n+\t\tRecord *hdr_records_detail;\n+\t\tbool free_hdr_records_detail;\n+\n+\t\tvoid edfRead(std::string filename, int max_record_nmb = -1);\n+\n+\t\t\/* preliminary data *\/\n+\t\tint Tpreliminary;\n+\t\tGeneralVector<VectorBase> *datavectorpreliminary;\n+\n+\tpublic:\n+\t\tEdfData(std::string filename_data, int max_record_nmb = -1);\n+\t\t~EdfData();\n+\n+\t\tvirtual void print(ConsoleOutput &output) const;\n+\t\tvirtual void print(ConsoleOutput &output_global, ConsoleOutput &output_local) const;\n+\n+\t\tvirtual void printcontent(ConsoleOutput &output) const;\n+\t\tvirtual void printcontent(ConsoleOutput &output_global, ConsoleOutput &output_local) const;\n+\t\tvirtual std::string get_name() const;\n+\n+\t\tvoid saveVTK(std::string filename) const;\n+\n+\t\tint get_Tpreliminary() const;\n+\t\tvoid set_decomposition(Decomposition &decomposition);\n+\n+};\n+\n+\n+}\n+} \/* end of namespace *\/\n+\n+\/* ------------- implementation ----------- *\/\n+\/\/TODO: move to impls\n+\n+namespace pascinference {\n+namespace data {\n+\n+template<>\n+void EdfData<PetscVector>::edfRead(std::string filename, int max_record_nmb){\n+\tLOG_FUNC_BEGIN\n+\n+\t\/* open file *\/\n+\tstd::ifstream myfile(filename.c_str(), std::ios::in | std::ios::binary);\n+\n+\tmyfile.seekg(0, std::ios::beg);\n+\n+\tint i;\n+\tchar buffer[100];\n+\n+\t\/* ------ HEADER ------ *\/\n+\tmyfile.read(buffer, 8);\n+\thdr_ver = atoi(buffer);\n+\n+\tmyfile.read(buffer, 80);\n+\thdr_patientID = std::string(buffer);\n+\n+\tmyfile.read(buffer, 80);\n+\thdr_recordID = std::string(buffer);\n+\n+\tmyfile.read(buffer, 8);\n+\thdr_startdate = std::string(buffer);\n+\n+\tmyfile.read(buffer, 8);\n+\thdr_starttime = std::string(buffer);\n+\n+\tmyfile.read(buffer, 8);\n+\thdr_bytes = atoi(buffer);\n+\n+\tmyfile.read(buffer, 44);\n+\t\/* reserved *\/\n+\t\n+\tmyfile.read(buffer, 8);\n+\thdr_records = atoi(buffer);\n+\n+\t\/* cut the dataset if user provided max number of records *\/\n+\tif(max_record_nmb > 0 && hdr_records > max_record_nmb){\n+\t\thdr_records = max_record_nmb;\n+\t}\n+\n+\tmyfile.read(buffer, 8);\n+\thdr_duration = atoi(buffer);\n+\n+\tmyfile.read(buffer, 4);\n+\thdr_ns = atoi(buffer);\n+\n+\t\/* arrays *\/\n+\thdr_records_detail = (Record*)malloc(sizeof(Record)*hdr_ns);\n+\tfree_hdr_records_detail = true;\n+\t\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 16);\n+\t\thdr_records_detail[i].hdr_label = new std::string(buffer);\n+\t}\n+\t\t\t\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 80);\n+\t\thdr_records_detail[i].hdr_transducer = new std::string(buffer);\n+\t}\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_units = new std::string(buffer);\n+\t}\n+\t\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_physicalMin = atof(buffer);\n+\t}\n+\t\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_physicalMax = atof(buffer);\n+\t}\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_digitalMin = atof(buffer);\n+\t}\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_digitalMax = atof(buffer);\n+\t}\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 80);\n+\t\thdr_records_detail[i].hdr_prefilter = new std::string(buffer);\n+\t}\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 8);\n+\t\thdr_records_detail[i].hdr_samples = atoi(buffer);\n+\t}\t\n+\n+\tfor(i=0;i<hdr_ns;i++){\n+\t\tmyfile.read(buffer, 32);\n+\t\t\/* reserved *\/\n+\t}\t\n+\n+\t\/* ------ PREPARE DATAVECTOR ------ *\/\n+\t\/* compute vector lengths *\/\n+\tthis->Tpreliminary = hdr_records_detail[0].hdr_samples*hdr_records;\n+\tint R = hdr_ns-1;\n+\n+\t\/* prepare preliminary datavector and load data *\/\n+\tVec datapreload_Vec;\n+\tTRY( VecCreate(PETSC_COMM_WORLD,&datapreload_Vec) );\n+\tTRY( VecSetSizes(datapreload_Vec,PETSC_DECIDE,Tpreliminary*R) );\n+\tTRY( VecSetFromOptions(datapreload_Vec) );\n+\tthis->datavectorpreliminary = new GeneralVector<PetscVector>(datapreload_Vec);\n+\n+\t\/* ------ RECORDS ------ *\/\n+\tint recnum, ii, samplei, index;\n+\tdouble scalefac, dc;\n+ \n+\tint16_t value;\n+\n+ for(recnum = 0; recnum < hdr_records; recnum++){\n+\t\tfor(ii = 0; ii < R; ii++){\n+\t\t\tscalefac = (hdr_records_detail[ii].hdr_physicalMax - hdr_records_detail[ii].hdr_physicalMin)\/(double)(hdr_records_detail[ii].hdr_digitalMax - hdr_records_detail[ii].hdr_digitalMin);\n+\t\t\tdc = hdr_records_detail[ii].hdr_physicalMax - scalefac*hdr_records_detail[ii].hdr_digitalMax;\n+\n+\t\t\tfor(samplei=0; samplei < hdr_records_detail[ii].hdr_samples; samplei++){\n+\t\t\t\tmyfile.read((char *)&value, sizeof(int16_t)); \/* read block of memory *\/\n+\t\t\t\tvalue = value * scalefac + dc;\n+\t\t\t\tindex = ii*this->Tpreliminary + recnum*hdr_records_detail[ii].hdr_samples + samplei;\n+\t\t\t\tTRY( VecSetValue(datapreload_Vec, index, value, INSERT_VALUES) );\n+\t\t\t}\n+ }\n+ }\n+\n+\t\/* vector is prepared *\/\n+\tTRY( VecAssemblyBegin(datapreload_Vec) );\n+\tTRY( VecAssemblyEnd(datapreload_Vec) );\n+\n+\t\/* close file *\/\n+ myfile.close();\t\t\n+\n+\tTRY( PetscBarrier(NULL) );\n+\n+\tLOG_FUNC_END\n+}\n+\n+\/* set decomposition - from preliminary to real data *\/\n+template<class VectorBase>\n+void EdfData<VectorBase>::set_decomposition(Decomposition &new_decomposition) {\n+\tLOG_FUNC_BEGIN\n+\n+\tthis->decomposition = &new_decomposition;\n+\n+\t\/* prepare real datavector *\/\n+\tVec data_Vec;\n+\tthis->decomposition->createGlobalVec_data(&data_Vec);\n+\tthis->datavector = new GeneralVector<PetscVector>(data_Vec);\n+\tthis->destroy_datavector = true;\n+\t\n+\t\/* permute orig to new using parallel layout *\/\n+\tVec datapreload_Vec = datavectorpreliminary->get_vector();\n+\tthis->decomposition->permute_TRxdim(datapreload_Vec, data_Vec);\n+\t\n+\t\/* destroy preliminary data *\/\n+\tTRY(VecDestroy(&datapreload_Vec));\n+\t\n+\tLOG_FUNC_END\n+}\n+\n+\n+\/* from filename *\/\n+template<class VectorBase>\n+EdfData<VectorBase>::EdfData(std::string filename_data, int max_record_nmb){\n+\tLOG_FUNC_BEGIN\n+\n+\t\/* read data from input file *\/\n+\tedfRead(filename_data, max_record_nmb);\n+\n+\tthis->destroy_gammavector = false;\n+\tthis->destroy_thetavector = false;\n+\n+\tLOG_FUNC_END\n+}\n+\n+\/* destructor *\/\n+template<class VectorBase>\n+EdfData<VectorBase>::~EdfData(){\n+\tLOG_FUNC_BEGIN\n+\t\n+\t\/* if I created a datavector, then I should also be able to destroy it *\/\n+\tif(this->free_hdr_records_detail){\n+\t\tfree(this->hdr_records_detail);\n+\t}\n+\n+\tLOG_FUNC_END\n+}\n+\n+\n+\/* print info about data *\/\n+template<class VectorBase>\n+void EdfData<VectorBase>::print(ConsoleOutput &output) const {\n+\tLOG_FUNC_BEGIN\n+\n+\toutput << this->get_name() << std::endl;\n+\t\n+\t\/* give information about presence of the data *\/\n+\toutput << \" - version of this data format: \" << hdr_ver << std::endl;\n+\toutput << \" - local patient identification: \" << hdr_patientID << std::endl;\n+\toutput << \" - local recording identification: \" << hdr_recordID << std::endl;\n+\toutput << \" - startdate of recording (dd.mm.yy): \" << hdr_startdate << std::endl;\n+\toutput << \" - starttime of recording (hh.mm.ss): \" << hdr_starttime << std::endl;\n+\toutput << \" - number of bytes in header record: \" << hdr_bytes << std::endl;\n+\toutput << \" - number of data records (-1 if unknown): \" << hdr_records << std::endl;\n+\toutput << \" - duration of a data record, in seconds: \" << hdr_duration << std::endl;\n+\toutput << \" - number of signals (ns) in data record: \" << hdr_ns << std::endl;\n+\/*\n+\toutput << \" - record details:\" << std::endl;\n+\tfor(int i=0;i<hdr_ns;i++){\n+\t\toutput << \" - id: \" << i << std::endl;\n+\t\toutput << \" label: \" << *hdr_records_detail[i].hdr_label << std::endl;\n+\t\toutput << \" transducer type: \" << *hdr_records_detail[i].hdr_transducer << std::endl;\n+\t\toutput << \" physical dimension: \" << *hdr_records_detail[i].hdr_units << std::endl;\n+\t\toutput << \" physical minimum: \" << hdr_records_detail[i].hdr_physicalMin << std::endl;\n+\t\toutput << \" physical maximum: \" << hdr_records_detail[i].hdr_physicalMax << std::endl;\n+\t\toutput << \" digital minimum: \" << hdr_records_detail[i].hdr_digitalMin << std::endl;\n+\t\toutput << \" digital maximum: \" << hdr_records_detail[i].hdr_digitalMax << std::endl;\n+\t\toutput << \" prefiltering: \" << *hdr_records_detail[i].hdr_prefilter << std::endl;\n+\t\toutput << \" nr of samples: \" << hdr_records_detail[i].hdr_samples << std::endl;\n+\t}\n+*\/\n+\toutput << \"----------------------------------------------------------------\" << std::endl;\n+\n+\toutput << \" - Tpreliminary: \" << this->get_T() << std::endl;\n+\n+\tif(this->decomposition){\n+\t\toutput << \" - T : \" << this->get_T() << std::endl;\n+\t\toutput << \" - xdim : \" << this->get_xdim() << std::endl;\n+\t\toutput << \" - K : \" << this->get_K() << std::endl;\n+\t\toutput << \" - R : \" << this->get_R() << std::endl;\n+\t}\n+\n+\tif(this->tsmodel){\n+\t\toutput << \" - model : \" << this->tsmodel->get_name() << std::endl;\n+\t} else {\n+\t\toutput << \" - model : NO\" << std::endl;\n+\t}\n+\t\n+\toutput << \" - datavector : \";\n+\tif(this->datavector){\n+\t\toutput << \"YES (size: \" << this->datavector->size() << \")\" << std::endl;\n+\t} else {\n+\t\toutput << \"NO\" << std::endl;\n+\t}\n+\toutput << \" - gammavector : \";\n+\tif(this->gammavector){\n+\t\toutput << \"YES (size: \" << this->gammavector->size() << \")\" << std::endl;\n+\t} else {\n+\t\toutput << \"NO\" << std::endl;\n+\t}\n+\toutput << \" - thetavector: \";\n+\tif(this->thetavector){\n+\t\toutput << \"YES (size: \" << this->thetavector->size() << \")\" << std::endl;\n+\t} else {\n+\t\toutput << \"NO\" << std::endl;\n+\t}\n+\n+\toutput.synchronize();\n+\n+\tLOG_FUNC_END\n+}\n+\n+\/* print info about data *\/\n+template<class VectorBase>\n+void EdfData<VectorBase>::print(ConsoleOutput &output_global, ConsoleOutput &output_local) const {\n+\tLOG_FUNC_BEGIN\n+\n+\toutput_global << this->get_name() << std::endl;\n+\t\n+\t\/* give information about presence of the data *\/\n+\toutput_global << \" - version of this data format: \" << hdr_ver << std::endl;\n+\toutput_global << \" - local patient identification: \" << hdr_patientID << std::endl;\n+\toutput_global << \" - local recording identification: \" << hdr_recordID << std::endl;\n+\toutput_global << \" - startdate of recording (dd.mm.yy): \" << hdr_startdate << std::endl;\n+\toutput_global << \" - starttime of recording (hh.mm.ss): \" << hdr_starttime << std::endl;\n+\toutput_global << \" - number of bytes in header record: \" << hdr_bytes << std::endl;\n+\toutput_global << \" - number of data records (-1 if unknown): \" << hdr_records << std::endl;\n+\toutput_global << \" - duration of a data record, in seconds: \" << hdr_duration << std::endl;\n+\toutput_global << \" - number of signals (ns) in data record: \" << hdr_ns << std::endl;\n+\/*\n+\toutput_global << \" - record details:\" << std::endl;\n+\tfor(int i=0;i<hdr_ns;i++){\n+\t\toutput_global << \" - id: \" << i << std::endl;\n+\t\toutput_global << \" label: \" << *hdr_records_detail[i].hdr_label << std::endl;\n+\t\toutput_global << \" transducer type: \" << *hdr_records_detail[i].hdr_transducer << std::endl;\n+\t\toutput_global << \" physical dimension: \" << *hdr_records_detail[i].hdr_units << std::endl;\n+\t\toutput_global << \" physical minimum: \" << hdr_records_detail[i].hdr_physicalMin << std::endl;\n+\t\toutput_global << \" physical maximum: \" << hdr_records_detail[i].hdr_physicalMax << std::endl;\n+\t\toutput_global << \" digital minimum: \" << hdr_records_detail[i].hdr_digitalMin << std::endl;\n+\t\toutput_global << \" digital maximum: \" << hdr_records_detail[i].hdr_digitalMax << std::endl;\n+\t\toutput_global << \" prefiltering: \" << *hdr_records_detail[i].hdr_prefilter << std::endl;\n+\t\toutput_global << \" nr of samples: \" << hdr_records_detail[i].hdr_samples << std::endl;\n+\t}\n+*\/\n+\toutput_global << \"----------------------------------------------------------------\" << std::endl;\n+\t\n+\t\/* give information about presence of the data *\/\n+\toutput_global << \" - Tpreliminary: \" << this->get_T() << std::endl;\n+\n+\tif(this->decomposition){\n+\t\toutput_global << \" - T : \" << this->get_T() << std::endl;\n+\t\toutput_local << \" - Tlocal : \" << this->get_Tlocal() << std::endl;\n+\t\toutput_local.synchronize();\n+\t\toutput_global << \" - xdim : \" << this->get_xdim() << std::endl;\n+\t\toutput_global << \" - K : \" << this->get_K() << std::endl;\n+\t\toutput_global << \" - R : \" << this->get_R() << std::endl;\n+\t\toutput_local << \" - Rlocal : \" << this->get_Rlocal() << std::endl;\n+\t\toutput_local.synchronize();\n+\t}\n+\n+\tif(this->tsmodel){\n+\t\toutput_global << \" - model : \" << this->tsmodel->get_name() << std::endl;\n+\t} else {\n+\t\toutput_global << \" - model : NO\" << std::endl;\n+\t}\n+\t\n+\toutput_global << \" - datavector : \";\n+\tif(this->datavector){\n+\t\toutput_global << \"YES (size: \" << this->datavector->size() << \")\" << std::endl;\n+\t\toutput_local << \" - local size : \" << this->datavector->local_size() << std::endl;\n+\t\toutput_local.synchronize();\n+\t} else {\n+\t\toutput_global << \"NO\" << std::endl;\n+\t}\n+\t\n+\toutput_global << \" - gammavector : \";\n+\tif(this->gammavector){\n+\t\toutput_global << \"YES (size: \" << this->gammavector->size() << \")\" << std::endl;\n+\t\toutput_local << \" - local size : \" << this->gammavector->local_size() << std::endl;\n+\t\toutput_local.synchronize();\n+\t} else {\n+\t\toutput_global << \"NO\" << std::endl;\n+\t}\n+\t\n+\toutput_global << \" - thetavector : \";\n+\tif(this->thetavector){\n+\t\toutput_global << \"YES (size: \" << this->thetavector->size() << \")\" << std::endl;\n+\t\toutput_local << \" - local size : \" << this->thetavector->local_size() << std::endl;\n+\t\toutput_local.synchronize();\n+\t} else {\n+\t\toutput_global << \"NO\" << std::endl;\n+\t}\n+\n+\toutput_global.synchronize();\n+\n+\tLOG_FUNC_END\n+}\n+\n+\/* print content of all data *\/\n+template<class VectorBase>\n+void EdfData<VectorBase>::printcontent(ConsoleOutput &output) const {\n+\tLOG_FUNC_BEGIN\n+\n+\toutput << this->get_name() << std::endl;\n+\t\n+\t\/* print the content of the data *\/\n+\toutput << \" - datavector : \";\n+\tif(this->datavector){\n+\t\toutput << *this->datavector << std::endl;\n+\t} else {\n+\t\toutput << \"not set\" << std::endl;\n+\t}\n+\n+\toutput << \" - gammavector : \";\n+\tif(this->gammavector){\n+\t\toutput << *this->gammavector << std::endl;\n+\t} else {\n+\t\toutput << \"not set\" << std::endl;\n+\t}\n+\n+\toutput << \" - thetavector : \";\n+\tif(this->thetavector){\n+\t\toutput << *this->thetavector << std::endl;\n+\t} else {\n+\t\toutput << \"not set\" << std::endl;\n+\t}\n+\n+\tLOG_FUNC_END\n+}\n+\n+\/* print content of all data *\/\n+template<class VectorBase>\n+void EdfData<VectorBase>::printcontent(ConsoleOutput &output_global,ConsoleOutput &output_local) const {\n+\tLOG_FUNC_BEGIN\n+\n+\toutput_global << this->get_name() << std::endl;\n+\t\n+\t\/* print the content of the data *\/\n+\toutput_local << \" - datavector : \";\n+\tif(this->datavector){\n+\t\toutput_local << *this->datavector << std::endl;\n+\t} else {\n+\t\toutput_local << \"not set\" << std::endl;\n+\t}\n+\toutput_local.synchronize();\n+\n+\toutput_local << \" - gammavector : \";\n+\tif(this->gammavector){\n+\t\toutput_local << *this->gammavector << std::endl;\n+\t} else {\n+\t\toutput_local << \"not set\" << std::endl;\n+\t}\n+\toutput_local.synchronize();\n+\n+\toutput_local << \" - thetavector : \";\n+\tif(this->thetavector){\n+\t\toutput_local << *this->thetavector << std::endl;\n+\t} else {\n+\t\toutput_local << \"not set\" << std::endl;\n+\t}\n+\toutput_local.synchronize();\n+\n+\toutput_global.synchronize();\n+\n+\tLOG_FUNC_END\n+}\n+\n+template<class VectorBase>\n+std::string EdfData<VectorBase>::get_name() const {\n+\treturn \"EDF Time-series Data\";\n+}\n+\n+template<class VectorBase>\n+int EdfData<VectorBase>::get_Tpreliminary() const{\n+\treturn this->Tpreliminary;\n+}\n+\n+template<>\n+void EdfData<PetscVector>::saveVTK(std::string filename) const{\n+\tTimer timer_saveVTK; \n+\ttimer_saveVTK.restart();\n+\ttimer_saveVTK.start();\n+\n+\tint T = get_T();\n+\tint Tlocal = get_Tlocal();\n+\tint Tbegin = get_Tbegin();\n+\tint Tend = get_Tend();\n+\tconst int *Tranges = decomposition->get_DDT_ranges();\n+\n+\tint K = get_K();\n+\tint R = get_R();\n+\tint Rlocal = get_Rlocal();\n+\tint *DDR_affiliation = decomposition->get_DDR_affiliation();\n+\tint DDR_rank = decomposition->get_DDR_rank();\n+\tint DDR_size = decomposition->get_DDR_size();\n+\n+\tint xdim = get_xdim();\n+\n+\tint prank = GlobalManager.get_rank();\n+\tint psize = GlobalManager.get_size();\n+\n+\t\/* to manipulate with filename *\/\n+\tstd::ostringstream oss_filename;\n+\n+\t\/* to manipulate with file *\/\n+\tstd::ofstream myfile;\n+\n+\t\/* master writes the main file *\/\n+\tif(prank == 0){\n+\t\t\/* create folder *\/\n+\t\toss_filename << \"results\/\" << filename;\n+\t\tboost::filesystem::path dir(oss_filename.str().c_str());\n+\t\tboost::filesystem::create_directory(dir);\n+\t\toss_filename.str(\"\");\n+\t\t\n+\t\t\/* write to the name of file *\/\n+\t\toss_filename << \"results\/\" << filename << \"\/\" << filename << \".pvd\";\n+\t\tmyfile.open(oss_filename.str().c_str());\n+\t\toss_filename.str(\"\");\n+\n+\t\t\/* write header to file *\/\n+\t\tmyfile << \"<?xml version=\\\"1.0\\\"?>\" << std::endl;\n+\t\tmyfile << \"<VTKFile type=\\\"Collection\\\" version=\\\"0.1\\\" byte_order=\\\"LittleEndian\\\" compressor=\\\"vtkZLibDataCompressor\\\">\" << std::endl;\n+\t\tmyfile << \"<Collection>\" << std::endl;\n+\t\tfor(int t=0;t<T;t++){\n+\t\t\tfor(int r=0;r<DDR_size;r++){\n+\t\t\t\tmyfile << \" <DataSet timestep=\\\"\" << t << \"\\\" group=\\\"\\\" part=\\\"r\\\" file=\\\"edf_\" << r << \"_\" << t <<\".vtu\\\"\/>\" << std::endl;\n+\t\t\t}\n+\t\t}\n+\n+\t\tmyfile << \"<\/Collection>\" << std::endl;\n+\t\tmyfile << \"<\/VTKFile>\";\n+\t\t\n+\t\tmyfile.close();\n+\t}\n+\n+\tTRY( PetscBarrier(NULL));\n+\n+\t\/* compute recovered vector *\/\n+\tVec gammak_Vec;\n+\tIS gammak_is;\n+\t\n+\tVec data_recovered_Vec;\n+\tTRY( VecDuplicate(datavector->get_vector(), &data_recovered_Vec) );\n+\tTRY( VecSet(data_recovered_Vec,0.0));\n+\tGeneralVector<PetscVector> data_recovered(data_recovered_Vec);\n+\n+\tdouble *theta_arr;\n+\tTRY( VecGetArray(thetavector->get_vector(),&theta_arr) );\n+\n+\tfor(int k=0;k<K;k++){ \n+\t\t\/* get gammak *\/\n+\t\tthis->decomposition->createIS_gammaK(&gammak_is, k);\n+\t\tTRY( VecGetSubVector(gammavector->get_vector(), gammak_is, &gammak_Vec) );\n+\n+\t\t\/* add to recovered image *\/\n+\t\tTRY( VecAXPY(data_recovered_Vec, theta_arr[k], gammak_Vec) );\n+\n+\t\tTRY( VecRestoreSubVector(gammavector->get_vector(), gammak_is, &gammak_Vec) );\n+\t\tTRY( ISDestroy(&gammak_is) );\n+\t}\t\n+\n+\tdouble *data_arr;\n+\tTRY( VecGetArray(datavector->get_vector(), &data_arr) );\n+\n+\tdouble *data_recovered_arr;\n+\tTRY( VecGetArray(data_recovered_Vec, &data_recovered_arr) );\n+\n+\tdouble *gamma_arr;\n+\tTRY( VecGetArray(gammavector->get_vector(), &gamma_arr) );\n+\n+\tint coordinates_dim = tsmodel->get_coordinatesVTK_dim();\n+\tdouble *coordinates_arr;\n+\tTRY( VecGetArray(tsmodel->get_coordinatesVTK()->get_vector(), &coordinates_arr) );\n+\n+\tdouble gamma_max;\n+\tint gamma_maxk;\n+\n+\t\/* each processor writes its own portion of data *\/\n+\tfor(int t=Tbegin;t < Tend;t++){\n+\t\toss_filename.str(\"\");\n+\t\toss_filename << \"results\/\" << filename << \"\/edf_\" << DDR_rank << \"_\" << t << \".vtu\";\n+\n+\t\tmyfile.open(oss_filename.str().c_str());\n+\n+\t\tmyfile << \"<?xml version=\\\"1.0\\\"?>\" << std::endl;\n+\t\tmyfile << \"<VTKFile type=\\\"UnstructuredGrid\\\" version=\\\"0.1\\\" byte_order=\\\"LittleEndian\\\">\" << std::endl;\n+\t\tmyfile << \" <UnstructuredGrid>\" << std::endl;\n+\t\tmyfile << \"\t <Piece NumberOfPoints=\\\"\" << Rlocal << \"\\\" NumberOfCells=\\\"0\\\" >\" << std::endl;\n+\t\tmyfile << \" <PointData Scalars=\\\"scalars\\\">\" << std::endl;\n+\n+\t\t\/* original data *\/\n+\t\tmyfile << \" <DataArray type=\\\"Float32\\\" Name=\\\"original\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tfor(int r=0;r<Rlocal;r++){\n+\t\t\tmyfile << data_arr[(t-Tbegin)*Rlocal+r] << std::endl;\n+\t\t}\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\n+\t\t\/* value of gamma *\/\n+\t\tfor(int k=0;k<K;k++){\n+\t\t\tmyfile << \" <DataArray type=\\\"Float32\\\" Name=\\\"gamma_\" << k << \"\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\t\tfor(int r=0;r<Rlocal;r++){\n+\t\t\t\tmyfile << gamma_arr[(t-Tbegin)*Rlocal*K+r*K+k] << std::endl;\n+\t\t\t}\n+\t\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\t}\n+\n+\t\t\/* cluster affiliation *\/\n+\t\tmyfile << \" <DataArray type=\\\"Float32\\\" Name=\\\"gamma_max\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tfor(int r=0;r<Rlocal;r++){\n+\t\t\tgamma_max = 0.0;\n+\t\t\tgamma_maxk = 0;\n+\t\t\tfor(int k=0;k<K;k++){\n+\t\t\t\tif(gamma_arr[(t-Tbegin)*Rlocal*K + r*K + k] > gamma_max){\n+\t\t\t\t\tgamma_max = gamma_arr[(t-Tbegin)*Rlocal*K + r*K + k];\n+\t\t\t\t\tgamma_maxk = k;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tmyfile << gamma_maxk << std::endl;\n+\t\t}\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\n+\t\t\/* original data *\/\n+\t\tmyfile << \" <DataArray type=\\\"Float32\\\" Name=\\\"recovered\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tfor(int r=0;r<Rlocal;r++){\n+\t\t\tmyfile << data_recovered_arr[(t-Tbegin)*Rlocal+r] << std::endl;\n+\t\t}\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\tmyfile << \" <\/PointData>\" << std::endl;\n+\n+\t\tmyfile << \" <CellData Scalars=\\\"scalars\\\">\" << std::endl;\n+\t\tmyfile << \" <\/CellData>\" << std::endl;\n+\t\tmyfile << \" <Points>\" << std::endl;\n+\t\tmyfile << \" <DataArray type=\\\"Float32\\\" NumberOfComponents=\\\"3\\\" format=\\\"ascii\\\">\" << std::endl;\n+\n+\t\tfor(int r=0;r<R;r++){\n+\t\t\tif(DDR_rank == DDR_affiliation[r]){\n+\t\t\t\t\/* 1D *\/\n+\t\t\t\tif(coordinates_dim == 1){\n+\t\t\t\t\tmyfile << coordinates_arr[r] << \" 0 0\" << std::endl;\n+\t\t\t\t}\n+\n+\t\t\t\t\/* 2D *\/\n+\t\t\t\tif(coordinates_dim == 2){\n+\t\t\t\t\tmyfile << coordinates_arr[r] << \" \" << coordinates_arr[r+R] << \" 0\" << std::endl;\n+\t\t\t\t}\n+\n+\t\t\t\t\/* 3D *\/\n+\t\t\t\tif(coordinates_dim == 3){\n+\t\t\t\t\tmyfile << coordinates_arr[r] << coordinates_arr[r+R] << \" \" << coordinates_arr[r+2*R] << std::endl;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\t\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\tmyfile << \" <\/Points>\" << std::endl;\n+\t\tmyfile << \" <Cells>\" << std::endl;\n+\t\tmyfile << \" <DataArray type=\\\"Int32\\\" Name=\\\"connectivity\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\tmyfile << \"\t\t<DataArray type=\\\"Int32\\\" Name=\\\"offsets\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\tmyfile << \"\t\t<DataArray type=\\\"UInt8\\\" Name=\\\"types\\\" format=\\\"ascii\\\">\" << std::endl;\n+\t\tmyfile << \" <\/DataArray>\" << std::endl;\n+\t\tmyfile << \" <\/Cells>\" << std::endl;\n+\t\tmyfile << \" <\/Piece>\" << std::endl;\n+\t\tmyfile << \" <\/UnstructuredGrid>\" << std::endl;\n+\t\tmyfile << \"<\/VTKFile>\" << std::endl;\n+\n+\t\tmyfile.close();\n+\t}\n+\n+\tTRY( VecRestoreArray(gammavector->get_vector(), &gamma_arr) );\n+\tTRY( VecRestoreArray(thetavector->get_vector(), &theta_arr) );\n+\tTRY( VecRestoreArray(datavector->get_vector(), &data_arr) );\n+\tTRY( VecRestoreArray(data_recovered_Vec, &data_arr) );\n+\tTRY( VecRestoreArray(tsmodel->get_coordinatesVTK()->get_vector(), &coordinates_arr) );\n+\n+\ttimer_saveVTK.stop();\n+\tcoutAll << \" - problem saved to VTK in: \" << timer_saveVTK.get_value_sum() << std::endl;\n+\tcoutAll.synchronize();\n+}\n+\n+\n+}\n+} \/* end namespace *\/\n+\n+#endif\n"} {"commit":"85882004f44d8c23e551cb8ffafc9c83c71fa3fb","subject":"Fix scrolling across Xinerama screens via keyboard. Fixes issue #126.","message":"Fix scrolling across Xinerama screens via keyboard. Fixes issue #126.\n","repos":"bartman\/wmii,bartman\/wmii,bartman\/wmii,bartman\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wmii\/screen.c\n+++ cmd\/wmii\/screen.c\n@@ -81,16 +81,13 @@\n \n static Rectangle\n leastthing(Rectangle rect, int direction, Vector_ptr *vec, Rectangle (*key)(void*)) {\n-\tvoid *p;\n \tRectangle r;\n-\tPoint pt;\n \tint i, best, d;\n \n \tSET(d);\n \tSET(best);\n \tfor(i=0; i < vec->n; i++) {\n-\t\tp = vec->ary[i];\n-\t\tr = key(p);\n+\t\tr = key(vec->ary[i]);\n \t\tswitch(direction) {\n \t\tcase South: d = r.min.y; break;\n \t\tcase North: d = -r.max.y; break;\n@@ -100,14 +97,13 @@\n \t\tif(i == 0 || d < best)\n \t\t\tbest = d;\n \t}\n-\tpt = rect.min;\n \tswitch(direction) {\n-\tcase South: pt.y = best - Dy(rect); break;\n-\tcase North: pt.y = -best + Dy(rect); break;\n-\tcase East: pt.x = best - Dy(rect); break;\n-\tcase West: pt.x = -best + Dy(rect); break;\n+\tcase South: rect.min.y = rect.max.y = best; break;\n+\tcase North: rect.min.y = rect.max.y = -best; break;\n+\tcase East: rect.min.x = rect.max.x = best; break;\n+\tcase West: rect.min.x = rect.max.x = -best; break;\n \t}\n-\treturn rectsetorigin(rect, pt);\n+\treturn rect;\n }\n \n void*\n"} {"commit":"0880a68a98d5e8f3fccc19192a511f1a86df12f4","subject":"argh! cut\/paste typo. :-( (committed on a different machine to what I was testing it on)","message":"argh! cut\/paste typo. :-(\n(committed on a different machine to what I was testing it on)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ia64\/ia64\/machdep.c\n+++ sys\/ia64\/ia64\/machdep.c\n@@ -750,7 +750,7 @@\n \t\t\/* Remove the last segment if it now has no pages. *\/\n \t\tif (phys_avail[i] == phys_avail[i+1]) {\n \t\t\tphys_avail[i] = 0;\n-\t\t\tphys_avail[i+] = 0;\n+\t\t\tphys_avail[i+1] = 0;\n \t\t}\n \n \t\t\/* warn if the message buffer had to be shrunk *\/\n"} {"commit":"29de9270c435d62807354322739403253c738fea","subject":"Fix typo","message":"Fix typo\n","repos":"DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib,DIPlib\/diplib","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/diplib\/graph.h\n+++ include\/diplib\/graph.h\n@@ -92,12 +92,12 @@\n \n \/\/ TODO: Make a graph from a labelled image, where vertices are labeled regions.\n \n- \/\/\/ \\bried returns the number of vertices in the graph.\n+ \/\/\/ \\brief returns the number of vertices in the graph.\n dip::uint NumberOfVertices() const {\n return vertices_.size();\n };\n \n- \/\/\/ \\bried returns the number of edges in the graph.\n+ \/\/\/ \\brief returns the number of edges in the graph.\n dip::uint NumberOfEdges() const {\n return edges_.size();\n };\n"} {"commit":"3797d9ecfd0598a6d59a7637523545b49a4af853","subject":"Move the sysctl related fields to the end of the structure and make them conditional upon _KERNEL. libkvm includes <sys\/pcpu.h> and <sys\/sysctl.h> does not expose the structure definitions to userland.","message":"Move the sysctl related fields to the end of the structure and\nmake them conditional upon _KERNEL. libkvm includes <sys\/pcpu.h>\nand <sys\/sysctl.h> does not expose the structure definitions to\nuserland.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ia64\/include\/pcpu.h\n+++ sys\/ia64\/include\/pcpu.h\n@@ -34,9 +34,6 @@\n #include <machine\/pcb.h>\n \n struct pcpu_stats {\n-\tstruct sysctl_ctx_list pcs_sysctl_ctx;\n-\tstruct sysctl_oid *pcs_sysctl_tree;\n-\n \tu_long\t\tpcs_nasts;\t\t\/* IPI_AST counter. *\/\n \tu_long\t\tpcs_nclks;\t\t\/* Clock interrupt counter. *\/\n \tu_long\t\tpcs_nextints;\t\t\/* ExtINT counter. *\/\n@@ -46,6 +43,11 @@\n \tu_long\t\tpcs_nrdvs;\t\t\/* IPI_RENDEZVOUS counter. *\/\n \tu_long\t\tpcs_nstops;\t\t\/* IPI_STOP counter. *\/\n \tu_long\t\tpcs_nstrays;\t\t\/* Stray interrupt counter. *\/\n+\n+#ifdef _KERNEL\n+\tstruct sysctl_ctx_list pcs_sysctl_ctx;\n+\tstruct sysctl_oid *pcs_sysctl_tree;\n+#endif\n };\n \n #define\tPCPU_MD_FIELDS\t\t\t\t\t\t\t\\\n"} {"commit":"726940601dee357675934fd7d3a501490d3ed173","subject":"small bug fix in metric util.h","message":"small bug fix in metric util.h\n","repos":"kaishengyao\/cnn,kaishengyao\/cnn","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cnn\/metric-util.h\n+++ cnn\/metric-util.h\n@@ -241,18 +241,21 @@\n pair<cnn::real, cnn::real> GetStats(const vector<int> & refTokens, const vector<int> & hypTokens)\n {\n cnn::real refidf = 0, hypidf = 0; \n- if (refTokens.size() > 0)\n- {\n- for (const auto & p : refTokens)\n- refidf += mv_idfs[p];\n- refidf \/= refTokens.size();\n- }\n-\n- if (hypTokens.size() > 0)\n- {\n- for (const auto & p : hypTokens)\n- hypidf += mv_idfs[p];\n- hypidf \/= hypTokens.size();\n+ if (mv_idfs.size() > 0)\n+ {\n+ if (refTokens.size() > 0)\n+ {\n+ for (const auto & p : refTokens)\n+ refidf += mv_idfs[p];\n+ refidf \/= refTokens.size();\n+ }\n+\n+ if (hypTokens.size() > 0)\n+ {\n+ for (const auto & p : hypTokens)\n+ hypidf += mv_idfs[p];\n+ hypidf \/= hypTokens.size();\n+ }\n }\n \n return make_pair(refidf, hypidf);\n"} {"commit":"e63870b27cb7709e0f1f276a29bb10740fe4884f","subject":"Refactor string joining utility method","message":"Refactor string joining utility method\n","repos":"bdamer\/dukat,bdamer\/dukat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/dukat\/string.h\n+++ include\/dukat\/string.h\n@@ -13,13 +13,13 @@\n \t}\n \n \ttemplate<typename T>\n-\tstd::string to_string(const std::vector<T>& vec)\n+\tstd::string join(const std::vector<T>& items, const char* delim = \",\")\n \t{\n \t\tstd::ostringstream oss;\n-\t\tif (!vec.empty())\n+\t\tif (!items.empty())\n \t\t{\n-\t\t\tstd::copy(vec.begin(), vec.end() - 1, std::ostream_iterator<int>(oss, \",\"));\n-\t\t\toss << vec.back();\n+\t\t\tstd::copy(items.begin(), items.end() - 1, std::ostream_iterator<int>(oss, delim));\n+\t\t\toss << items.back();\n \t\t}\n \t\treturn oss.str();\n \t}\n"} {"commit":"18fd363e76bbef7444685a623c818f235b37b287","subject":"Added the edraw header","message":"Added the edraw header\n","repos":"DrItanium\/neutron,DrItanium\/electron-platform,DrItanium\/electron-platform,DrItanium\/electron-platform","returncode":1,"stderr":"error: pathspec 'sys\/include\/lib\/edraw.h' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- sys\/include\/lib\/edraw.h\n+++ sys\/include\/lib\/edraw.h\n@@ -0,0 +1,2 @@\n+\/* edraw.h *\/\n+extern void InitializeDrawRoutines(void* theEnv);\n"} {"commit":"56877714595f92a6c8ee701d82e7d1377b50e349","subject":"Fix a race in regard of p_numthreads.","message":"Fix a race in regard of p_numthreads.\n\nSubmitted by:\tGiovanni Trematerra\n\t\t<giovanni dot trematerra at gmail dot com>\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/kern_kthread.c\n+++ sys\/kern\/kern_kthread.c\n@@ -312,18 +312,17 @@\n {\n \tstruct proc *p;\n \n+\tp = curthread->td_proc;\n+\n \t\/* A module may be waiting for us to exit. *\/\n \twakeup(curthread);\n-\n-\t\/*\n-\t * We could rely on thread_exit to call exit1() but\n-\t * there is extra work that needs to be done\n-\t *\/\n-\tif (curthread->td_proc->p_numthreads == 1)\n-\t\tkproc_exit(0);\t\/* never returns *\/\n-\n-\tp = curthread->td_proc;\n-\tPROC_LOCK(p);\n+\tPROC_LOCK(p);\n+\tif (curthread->td_proc->p_numthreads == 1) {\n+\t\tPROC_UNLOCK(p);\n+\t\tkproc_exit(0);\n+\n+\t\t\/* NOTREACHED. *\/\n+\t}\n \tPROC_SLOCK(p);\n \tthread_exit();\n }\n"} {"commit":"f5b0c94db5f2b734e6a5f99af2376f0af02734f5","subject":"Only require privilege to set the current time adjustment, not in order to query it.","message":"Only require privilege to set the current time adjustment, not in order to\nquery it.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/kern_ntptime.c\n+++ sys\/kern\/kern_ntptime.c\n@@ -950,9 +950,6 @@\n \tstruct timeval atv;\n \tint error;\n \n-\tif ((error = priv_check(td, PRIV_ADJTIME)))\n-\t\treturn (error);\n-\n \tmtx_lock(&Giant);\n \tif (olddelta) {\n \t\tatv.tv_sec = time_adjtime \/ 1000000;\n@@ -963,10 +960,15 @@\n \t\t}\n \t\t*olddelta = atv;\n \t}\n-\tif (delta)\n+\tif (delta) {\n+\t\tif ((error = priv_check(td, PRIV_ADJTIME))) {\n+\t\t\tmtx_unlock(&Giant);\n+\t\t\treturn (error);\n+\t\t}\n \t\ttime_adjtime = (int64_t)delta->tv_sec * 1000000 +\n \t\t delta->tv_usec;\n+\t}\n \tmtx_unlock(&Giant);\n-\treturn (error);\n+\treturn (0);\n }\n \n"} {"commit":"c65ca5575a5cb29b50c63a8651103d0d5e261d28","subject":"Use the recently added msleep_spin() function to simplify the callout_drain() logic. We no longer need a separate non-spin mutex to do sleep\/wakeup with, instead we can now just use the one spin mutex to manage all the callout functionality.","message":"Use the recently added msleep_spin() function to simplify the\ncallout_drain() logic. We no longer need a separate non-spin mutex to\ndo sleep\/wakeup with, instead we can now just use the one spin mutex to\nmanage all the callout functionality.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/kern_timeout.c\n+++ sys\/kern\/kern_timeout.c\n@@ -78,37 +78,22 @@\n \/**\n * Locked by callout_lock:\n * curr_callout - If a callout is in progress, it is curr_callout.\n- * If curr_callout is non-NULL, threads waiting on\n- * callout_wait will be woken up as soon as the \n+ * If curr_callout is non-NULL, threads waiting in\n+ * callout_drain() will be woken up as soon as the \n * relevant callout completes.\n * curr_cancelled - Changing to 1 with both callout_lock and c_mtx held\n * guarantees that the current callout will not run.\n * The softclock() function sets this to 0 before it\n * drops callout_lock to acquire c_mtx, and it calls\n- * the handler only if curr_cancelled still 0 when\n+ * the handler only if curr_cancelled is still 0 after\n * c_mtx is successfully acquired.\n- * wakeup_ctr - Incremented every time a thread wants to wait\n- * for a callout to complete. Modified only when\n+ * callout_wait - If a thread is waiting in callout_drain(), then\n+ * callout_wait is nonzero. Set only when\n * curr_callout is non-NULL.\n- * wakeup_needed - If a thread is waiting on callout_wait, then\n- * wakeup_needed is nonzero. Increased only when\n- * cutt_callout is non-NULL.\n *\/\n static struct callout *curr_callout;\n static int curr_cancelled;\n-static int wakeup_ctr;\n-static int wakeup_needed;\n-\n-\/**\n- * Locked by callout_wait_lock:\n- * callout_wait - If wakeup_needed is set, callout_wait will be\n- * triggered after the current callout finishes.\n- * wakeup_done_ctr - Set to the current value of wakeup_ctr after\n- * callout_wait is triggered.\n- *\/\n-static struct mtx callout_wait_lock;\n-static struct cv callout_wait;\n-static int wakeup_done_ctr;\n+static int callout_wait;\n \n \/*\n * kern_timeout_callwheel_alloc() - kernel low level callwheel initialization \n@@ -157,8 +142,6 @@\n \t\tTAILQ_INIT(&callwheel[i]);\n \t}\n \tmtx_init(&callout_lock, \"callout\", NULL, MTX_SPIN | MTX_RECURSE);\n-\tmtx_init(&callout_wait_lock, \"callout_wait_lock\", NULL, MTX_DEF);\n-\tcv_init(&callout_wait, \"callout_wait\");\n }\n \n \/*\n@@ -188,7 +171,6 @@\n \tint mpcalls;\n \tint mtxcalls;\n \tint gcalls;\n-\tint wakeup_cookie;\n #ifdef DIAGNOSTIC\n \tstruct bintime bt1, bt2;\n \tstruct timespec ts2;\n@@ -262,8 +244,7 @@\n \t\t\t\t\t *\/\n \t\t\t\t\tif (curr_cancelled) {\n \t\t\t\t\t\tmtx_unlock(c_mtx);\n-\t\t\t\t\t\tmtx_lock_spin(&callout_lock);\n-\t\t\t\t\t\tgoto done_locked;\n+\t\t\t\t\t\tgoto skip;\n \t\t\t\t\t}\n \t\t\t\t\t\/* The callout cannot be stopped now. *\/\n \t\t\t\t\tcurr_cancelled = 1;\n@@ -308,22 +289,16 @@\n #endif\n \t\t\t\tif ((c_flags & CALLOUT_RETURNUNLOCKED) == 0)\n \t\t\t\t\tmtx_unlock(c_mtx);\n+\t\t\tskip:\n \t\t\t\tmtx_lock_spin(&callout_lock);\n-done_locked:\n \t\t\t\tcurr_callout = NULL;\n-\t\t\t\tif (wakeup_needed) {\n+\t\t\t\tif (callout_wait) {\n \t\t\t\t\t\/*\n-\t\t\t\t\t * There might be someone waiting\n+\t\t\t\t\t * There is someone waiting\n \t\t\t\t\t * for the callout to complete.\n \t\t\t\t\t *\/\n-\t\t\t\t\twakeup_cookie = wakeup_ctr;\n-\t\t\t\t\tmtx_unlock_spin(&callout_lock);\n-\t\t\t\t\tmtx_lock(&callout_wait_lock);\n-\t\t\t\t\tcv_broadcast(&callout_wait);\n-\t\t\t\t\twakeup_done_ctr = wakeup_cookie;\n-\t\t\t\t\tmtx_unlock(&callout_wait_lock);\n-\t\t\t\t\tmtx_lock_spin(&callout_lock);\n-\t\t\t\t\twakeup_needed = 0;\n+\t\t\t\t\twakeup(&callout_wait);\n+\t\t\t\t\tcallout_wait = 0;\n \t\t\t\t}\n \t\t\t\tsteps = 0;\n \t\t\t\tc = nextsoftcheck;\n@@ -445,7 +420,7 @@\n \t\t *\/\n \t\tif (c->c_mtx != NULL && !curr_cancelled)\n \t\t\tcancelled = curr_cancelled = 1;\n-\t\tif (wakeup_needed) {\n+\t\tif (callout_wait) {\n \t\t\t\/*\n \t\t\t * Someone has called callout_drain to kill this\n \t\t\t * callout. Don't reschedule.\n@@ -497,7 +472,7 @@\n \tstruct\tcallout *c;\n \tint\tsafe;\n {\n-\tint use_mtx, wakeup_cookie;\n+\tint use_mtx;\n \n \tif (!safe && c->c_mtx != NULL) {\n #ifdef notyet \/* Some callers do not hold Giant for Giant-locked callouts. *\/\n@@ -512,37 +487,47 @@\n \n \tmtx_lock_spin(&callout_lock);\n \t\/*\n-\t * Don't attempt to delete a callout that's not on the queue.\n+\t * If the callout isn't pending, it's not on the queue, so\n+\t * don't attempt to remove it from the queue. We can try to\n+\t * stop it by other means however.\n \t *\/\n \tif (!(c->c_flags & CALLOUT_PENDING)) {\n \t\tc->c_flags &= ~CALLOUT_ACTIVE;\n+\n+\t\t\/*\n+\t\t * If it wasn't on the queue and it isn't the current\n+\t\t * callout, then we can't stop it, so just bail.\n+\t\t *\/\n \t\tif (c != curr_callout) {\n \t\t\tmtx_unlock_spin(&callout_lock);\n \t\t\treturn (0);\n \t\t}\n+\n \t\tif (safe) {\n-\t\t\t\/* We need to wait until the callout is finished. *\/\n-\t\t\twakeup_needed = 1;\n-\t\t\twakeup_cookie = wakeup_ctr++;\n-\t\t\tmtx_unlock_spin(&callout_lock);\n-\t\t\tmtx_lock(&callout_wait_lock);\n-\n \t\t\t\/*\n-\t\t\t * Check to make sure that softclock() didn't\n-\t\t\t * do the wakeup in between our dropping\n-\t\t\t * callout_lock and picking up callout_wait_lock\n+\t\t\t * The current callout is running (or just\n+\t\t\t * about to run) and blocking is allowed, so\n+\t\t\t * just wait for the current invocation to\n+\t\t\t * finish.\n \t\t\t *\/\n-\t\t\tif (wakeup_cookie - wakeup_done_ctr > 0)\n-\t\t\t\tcv_wait(&callout_wait, &callout_wait_lock);\n-\n-\t\t\tmtx_unlock(&callout_wait_lock);\n+\t\t\twhile (c == curr_callout) {\n+\t\t\t\tcallout_wait = 1;\n+\t\t\t\tmsleep_spin(&callout_wait, &callout_lock,\n+\t\t\t\t \"codrain\", 0);\n+\t\t\t}\n \t\t} else if (use_mtx && !curr_cancelled) {\n-\t\t\t\/* We can stop the callout before it runs. *\/\n+\t\t\t\/*\n+\t\t\t * The current callout is waiting for it's\n+\t\t\t * mutex which we hold. Cancel the callout\n+\t\t\t * and return. After our caller drops the\n+\t\t\t * mutex, the callout will be skipped in\n+\t\t\t * softclock().\n+\t\t\t *\/\n \t\t\tcurr_cancelled = 1;\n \t\t\tmtx_unlock_spin(&callout_lock);\n \t\t\treturn (1);\n-\t\t} else\n-\t\t\tmtx_unlock_spin(&callout_lock);\n+\t\t}\n+\t\tmtx_unlock_spin(&callout_lock);\n \t\treturn (0);\n \t}\n \tc->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING);\n"} {"commit":"bd4deb1a124288d55a49175d213c0e530e1f10fb","subject":"DD: Address clang warning","message":"DD: Address clang warning\n\nIn file included from DD.cpp:18:\n..\/..\/include\/geos\/math\/DD.h:122:9: error: definition of implicit copy assignment operator for 'DD' is deprecated because it has a user-declared copy constructor [-Werror,-Wdeprecated-copy]\n DD(const DD &dd) : hi(dd.hi), lo(dd.lo) {};\n ^\nDD.cpp:389:15: note: in implicit copy assignment operator for 'geos::math::DD' first required here\n r = r*r;\n","repos":"libgeos\/libgeos,libgeos\/libgeos,mwtoews\/libgeos,libgeos\/libgeos,libgeos\/libgeos,mwtoews\/libgeos,libgeos\/libgeos,mwtoews\/libgeos,mwtoews\/libgeos,mwtoews\/libgeos,mwtoews\/libgeos,mwtoews\/libgeos","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/geos\/math\/DD.h\n+++ include\/geos\/math\/DD.h\n@@ -119,7 +119,6 @@\n public:\n DD(double p_hi, double p_lo) : hi(p_hi), lo(p_lo) {};\n DD(double x) : hi(x), lo(0.0) {};\n- DD(const DD &dd) : hi(dd.hi), lo(dd.lo) {};\n DD() : hi(0.0), lo(0.0) {};\n \n bool operator==(const DD &rhs) const\n"} {"commit":"c6be3c9271c25e408ec223d708155cc24ae23617","subject":"Fix up the comment.","message":"Fix up the comment.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netgraph\/netgraph.h\n+++ sys\/netgraph\/netgraph.h\n@@ -1027,8 +1027,8 @@\n *\n * If a different link time is desired, e.g., a device driver that\n * needs to install its netgraph type before probing, use the\n- * NETGRAPH_INIT_ORDERED() macro instead. Deivce drivers probably\n- * want to use SI_SUB_DRIVERS instead of SI_SUB_PSEUDO.\n+ * NETGRAPH_INIT_ORDERED() macro instead. Device drivers probably\n+ * want to use SI_SUB_DRIVERS\/SI_ORDER_FIRST.\n *\/\n \n #define NETGRAPH_INIT_ORDERED(typename, typestructp, sub, order)\t\\\n"} {"commit":"7809bee779ed0695447ede6fb5b402e8f91faaab","subject":"Supress output.","message":"Supress output.\n","repos":"PaulDodd\/JsonParser","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/json_wrapper.h\n+++ include\/json_wrapper.h\n@@ -570,7 +570,7 @@\n \n void Destroy()\n {\n- cout << \"Destroying \" << m_name << \" objects!\" << endl;\n+ \/\/ cout << \"Destroying \" << m_name << \" objects!\" << endl;\n map<string, CJSONValue* >::iterator iter;\n for(iter = m_Map.begin(); iter != m_Map.end(); iter++)\n {\n@@ -747,7 +747,7 @@\n \/\/ Destructor.\n ~CJSONValuePointer()\n {\n- cout << \"Calling ~CJSONValuePointer \"<< m_pJson << endl;\n+ \/\/ cout << \"Calling ~CJSONValuePointer \"<< m_pJson << endl;\n if(m_pJson && !m_pJson->IsObject()) \/\/ do not delete json object.\n delete m_pJson;\n m_pJson = NULL;\n@@ -798,7 +798,7 @@\n \/\/ Destructor.\n ~CJSONValuePointer()\n {\n- cout << \"Calling ~CJSONValuePointer<TVal, CJSONValueObject>\"<< m_pJson << endl;\n+ \/\/ cout << \"Calling ~CJSONValuePointer<TVal, CJSONValueObject>\"<< m_pJson << endl;\n \/\/ nothing to delete this time\n }\n \n"} {"commit":"698b0138320a007f2cfeef510ccd43bffbd9411a","subject":"Send link state change control messages to \"orphans\" hook as well.","message":"Send link state change control messages to \"orphans\" hook as well.\n\nMFC after:\t1 week\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netgraph\/ng_ether.c\n+++ sys\/netgraph\/ng_ether.c\n@@ -359,9 +359,6 @@\n \tstruct ng_mesg *msg;\n \tint cmd, dummy_error = 0;\n \n-\tif (priv->lower == NULL)\n- return;\n-\n \tif (state == LINK_STATE_UP)\n \t\tcmd = NGM_LINK_IS_UP;\n \telse if (state == LINK_STATE_DOWN)\n@@ -369,9 +366,16 @@\n \telse\n \t\treturn;\n \n-\tNG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);\n-\tif (msg != NULL)\n-\t\tNG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);\n+\tif (priv->lower != NULL) {\n+\t\tNG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);\n+\t\tif (msg != NULL)\n+\t\t\tNG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);\n+\t}\n+\tif (priv->orphan != NULL) {\n+\t\tNG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);\n+\t\tif (msg != NULL)\n+\t\t\tNG_SEND_MSG_HOOK(dummy_error, node, msg, priv->orphan, 0);\n+\t}\n }\n \n \/******************************************************************\n"} {"commit":"57cfb4cf84094db1bd81a72982129fae3cb81bde","subject":"Fix \"##\" duplicated hashes in the C docs","message":"Fix \"##\" duplicated hashes in the C docs\n\nPart-of: <https:\/\/gitlab.gnome.org\/GNOME\/librsvg\/-\/merge_requests\/585>\n","repos":"GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/librsvg\/rsvg.h\n+++ include\/librsvg\/rsvg.h\n@@ -638,7 +638,7 @@\n \/**\n * rsvg_handle_get_pixbuf_sub:\n * @handle: An #RsvgHandle\n- * @id: (nullable): An element's id within the SVG, starting with \"##\" (a single\n+ * @id: (nullable): An element's id within the SVG, starting with \"#\" (a single\n * hash character), for example, \"##layer1\". This notation corresponds to a\n * URL's fragment ID. Alternatively, pass %NULL to use the whole SVG.\n *\n@@ -719,7 +719,7 @@\n * rsvg_handle_get_dimensions_sub:\n * @handle: A #RsvgHandle\n * @dimension_data: (out): A place to store the SVG's size\n- * @id: (nullable): An element's id within the SVG, starting with \"##\" (a single\n+ * @id: (nullable): An element's id within the SVG, starting with \"#\" (a single\n * hash character), for example, \"##layer1\". This notation corresponds to a\n * URL's fragment ID. Alternatively, pass %NULL to use the whole SVG.\n *\n@@ -746,7 +746,7 @@\n * rsvg_handle_get_position_sub:\n * @handle: A #RsvgHandle\n * @position_data: (out): A place to store the SVG fragment's position.\n- * @id: (nullable): An element's id within the SVG, starting with \"##\" (a single\n+ * @id: (nullable): An element's id within the SVG, starting with \"#\" (a single\n * hash character), for example, \"##layer1\". This notation corresponds to a\n * URL's fragment ID. Alternatively, pass %NULL to use the whole SVG.\n *\n@@ -774,7 +774,7 @@\n \/**\n * rsvg_handle_has_sub:\n * @handle: a #RsvgHandle\n- * @id: An element's id within the SVG, starting with \"##\" (a single hash\n+ * @id: An element's id within the SVG, starting with \"#\" (a single hash\n * character), for example, \"##layer1\". This notation corresponds to a URL's\n * fragment ID.\n *\n"} {"commit":"175b38b9db1d424471b6a9d63269495d4766e56f","subject":"Prevent dereferencing a NULL route pointer when trying to update the route MTU.","message":"Prevent dereferencing a NULL route pointer when trying to update the\nroute MTU.\n\nThis bug is very difficult to reach and not remotely exploitable.\n\nFound by:\tCoverity Prevent(tm)\nCoverity ID:\tCID162\nSponsored by:\tTCP\/IP Optimization Fundraise 2005\nMFC after:\t3 days\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_output.c\n+++ sys\/netinet\/ip_output.c\n@@ -790,7 +790,8 @@\n \t\t * them, there is no way for one to update all its\n \t\t * routes when the MTU is changed.\n \t\t *\/\n-\t\tif ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST)) &&\n+\t\tif (ro != NULL &&\n+\t\t (ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST)) &&\n \t\t (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) {\n \t\t\tro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu;\n \t\t}\n"} {"commit":"1552945669b4fb23bff8d3b30221bfe3ade63515","subject":"libata: use ata_port_printk() in ata_wait_idle()","message":"libata: use ata_port_printk() in ata_wait_idle()\n\nata_wait_idle() identified controller by printing out the address of\nthe Status register. This is bogus because 1. it's iomapped address\n2. some controllers don't have Status register and don't initialize\nthe field. Use ata_port_printk() instead.\n\nSigned-off-by: Tejun Heo <ccfba69985e72fbcd9ba8bbb6db43d42971ad06d@gmail.com>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/libata.h\n+++ include\/linux\/libata.h\n@@ -1182,9 +1182,11 @@\n {\n \tu8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);\n \n+#ifdef ATA_DEBUG\n \tif (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))\n-\t\tDPRINTK(\"ATA: abnormal status 0x%X on port 0x%p\\n\",\n-\t\t\tstatus, ap->ioaddr.status_addr);\n+\t\tata_port_printk(ap, KERN_DEBUG, \"abnormal Status 0x%X\\n\",\n+\t\t\t\tstatus);\n+#endif\n \n \treturn status;\n }\n"} {"commit":"2f32ae6c9b685bd5c078db373fe39a5446414002","subject":"Compensate for decreasing the minimum retransmit timeout.","message":"Compensate for decreasing the minimum retransmit timeout.\n\nReviewed by:\tjlemon\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/tcp_timer.c\n+++ sys\/netinet\/tcp_timer.c\n@@ -160,9 +160,9 @@\n { 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 64, 64 };\n \n int\ttcp_backoff[TCP_MAXRXTSHIFT + 1] =\n- { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };\n-\n-static int tcp_totbackoff = 511;\t\/* sum of tcp_backoff[] *\/\n+ { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512 };\n+\n+static int tcp_totbackoff = 2559;\t\/* sum of tcp_backoff[] *\/\n \n \/*\n * TCP timer processing.\n"} {"commit":"d020283dc694c9ec31b410f522252f7a8397e67d","subject":"PM \/ QoS: CPU C-state breakage with PM Qos change","message":"PM \/ QoS: CPU C-state breakage with PM Qos change\n\nLooks like change \"PM QoS: Move and rename the implementation files\"\nmerged during the 3.2 development cycle made PM QoS depend on\nCONFIG_PM which depends on (PM_SLEEP || PM_RUNTIME).\n\nThat breaks CPU C-states with kernels not having these CONFIGs, causing CPUs\nto spend time in Polling loop idle instead of going into deep C-states,\nconsuming way way more power. This is with either acpi idle or intel idle\nenabled.\n\nEither CONFIG_PM should be enabled with any pm_qos users or\nthe !CONFIG_PM pm_qos_request() should return sane defaults not to break\nthe existing users. Here's is the patch for the latter option.\n\n[rjw: Modified the changelog slightly.]\n\nSigned-off-by: Venkatesh Pallipadi <0192021264f7ae88e4662be72db68a0c93b1d052@google.com>\nSigned-off-by: Rafael J. Wysocki <a11f87183a953ab11f50fbafff689c5a7fa3506c@sisk.pl>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/pm_qos.h\n+++ include\/linux\/pm_qos.h\n@@ -110,7 +110,19 @@\n \t\t\t{ return; }\n \n static inline int pm_qos_request(int pm_qos_class)\n-\t\t\t{ return 0; }\n+{\n+\tswitch (pm_qos_class) {\n+\tcase PM_QOS_CPU_DMA_LATENCY:\n+\t\treturn PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;\n+\tcase PM_QOS_NETWORK_LATENCY:\n+\t\treturn PM_QOS_NETWORK_LAT_DEFAULT_VALUE;\n+\tcase PM_QOS_NETWORK_THROUGHPUT:\n+\t\treturn PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;\n+\tdefault:\n+\t\treturn PM_QOS_DEFAULT_VALUE;\n+\t}\n+}\n+\n static inline int pm_qos_add_notifier(int pm_qos_class,\n \t\t\t\t struct notifier_block *notifier)\n \t\t\t{ return 0; }\n"} {"commit":"024856cbe60b841fa0d8330dd02b04cdc8bf12e9","subject":"MWW: Argh. I thought this was fixed. Not sure what happened.","message":"MWW: Argh. I thought this was fixed. Not sure what happened.\n","repos":"smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm,smaccm\/smaccm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fm-workbench\/trusted-build\/edu.umn.cs.crisys.smaccm.aadl2rtos\/aadl2rtos_resource\/pixhawk_clock_driver.c\n+++ fm-workbench\/trusted-build\/edu.umn.cs.crisys.smaccm.aadl2rtos\/aadl2rtos_resource\/pixhawk_clock_driver.c\n@@ -22,7 +22,6 @@\n \n \n uint64_t ticks = 0;\n-uint64_t the_CPU_rate = 0; \n uint32_t the_interval = 0;\n uint64_t the_CPU_rate = 0;\n \n"} {"commit":"22ea9c070350b824d6c3b65bce06ee7c6cc87b99","subject":"remove unused random32() and srandom32()","message":"remove unused random32() and srandom32()\n\nAfter finishing a naming transition, remove unused backward\ncompatibility wrapper macros\n\nSigned-off-by: Akinobu Mita <3807cf899f217da549814bf6c330d3b6e6819ccf@gmail.com>\nCc: \"Theodore Ts'o\" <4ed386e0495d3e109932df055831d9ec2f824927@mit.edu>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/random.h\n+++ include\/linux\/random.h\n@@ -28,13 +28,6 @@\n u32 prandom_u32(void);\n void prandom_bytes(void *buf, int nbytes);\n void prandom_seed(u32 seed);\n-\n-\/*\n- * These macros are preserved for backward compatibility and should be\n- * removed as soon as a transition is finished.\n- *\/\n-#define random32() prandom_u32()\n-#define srandom32(seed) prandom_seed(seed)\n \n u32 prandom_u32_state(struct rnd_state *);\n void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);\n"} {"commit":"7879220c01bc02894bebf8bc0efd7e32aefd4b07","subject":"Add a sysctl pair for the pcic memory allocation range \tmachdep.pccard.pcic_mem_start \tmachdep.pccard.pcic_mem_end and default the range to IOM_BEGIN\/IOM_END.","message":"Add a sysctl pair for the pcic memory allocation range\n\tmachdep.pccard.pcic_mem_start\n\tmachdep.pccard.pcic_mem_end\nand default the range to IOM_BEGIN\/IOM_END.\n\nThis may prove useful to if_ray users (and others) on more modern\nhardware that maps BIOS stuff into 0xd000-0xdffff.\n\nMFC: after 1 week\n\nApproved by:\timp\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/pccard\/pccard_nbk.c\n+++ sys\/pccard\/pccard_nbk.c\n@@ -53,12 +53,15 @@\n #include <sys\/systm.h>\n #include <sys\/module.h>\n #include <sys\/kernel.h>\n+#include <sys\/sysctl.h>\n #include <sys\/queue.h>\n #include <sys\/types.h>\n \n #include <sys\/bus.h>\n #include <machine\/bus.h>\n #include <machine\/resource.h>\n+\n+#include <i386\/isa\/isa.h>\n \n #include <pccard\/cardinfo.h>\n #include <pccard\/slot.h>\n@@ -76,6 +79,16 @@\n #define PCCARD_NDRQ\t0\n \n #define PCCARD_DEVINFO(d) (struct pccard_devinfo *) device_get_ivars(d)\n+\n+SYSCTL_NODE(_machdep, OID_AUTO, pccard, CTLFLAG_RW, 0, \"pccard\");\n+\n+static u_long pcic_mem_start = IOM_BEGIN;\n+static u_long pcic_mem_end = IOM_END;\n+\n+SYSCTL_ULONG(_machdep_pccard, OID_AUTO, pcic_mem_start, CTLFLAG_RW,\n+ &pcic_mem_start, 0, \"\");\n+SYSCTL_ULONG(_machdep_pccard, OID_AUTO, pcic_mem_end, CTLFLAG_RW,\n+ &pcic_mem_end, 0, \"\");\n \n \/*\n * glue for NEWCARD\/OLDCARD compat layer\n@@ -215,7 +228,7 @@\n {\n \t\/*\n \t * Consider adding a resource definition. We allow rid 0 for\n-\t * irq, 0-3 for memory and 0-1 for ports\n+\t * irq, 0-4 for memory and 0-1 for ports\n \t *\/\n \tint passthrough = (device_get_parent(child) != bus);\n \tint isdefault;\n@@ -225,8 +238,8 @@\n \tstruct resource *res;\n \n \tif (start == 0 && end == ~0 && type == SYS_RES_MEMORY && count != 1) {\n-\t\tstart = 0xd0000;\n-\t\tend = 0xdffff;\n+\t\tstart = pcic_mem_start;\n+\t\tend = pcic_mem_end;\n \t}\n \tisdefault = (start == 0UL && end == ~0UL);\n \tif (!passthrough && !isdefault) {\n"} {"commit":"b4fe8ba7a310da6a2b99e3abe67c7815198cde49","subject":"regmap: Add generic macro to define regmap_irq","message":"regmap: Add generic macro to define regmap_irq\n\nAdd REGMAP_IRQ_REG macro in regmap.h to define regmap_irq\nstructure easily for other driver module.\n\nSigned-off-by: Qipeng Zha <a8f71c12270d4aa03666e926cbad245d71c25649@intel.com>\nAcked-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\nSigned-off-by: Lee Jones <630e34333487a351a857f6b705e04d30b37c1629@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/regmap.h\n+++ include\/linux\/regmap.h\n@@ -791,6 +791,9 @@\n \tunsigned int mask;\n };\n \n+#define REGMAP_IRQ_REG(_irq, _off, _mask)\t\t\\\n+\t[_irq] = { .reg_offset = (_off), .mask = (_mask) }\n+\n \/**\n * Description of a generic regmap irq_chip. This is not intended to\n * handle every possible interrupt controller, but it should handle a\n"} {"commit":"ae0070400298fe2b9c55eac51b6233e66ff8eb71","subject":"Historically when an application wrote an entire block of a file, the kernel allocated a buffer but did not zero it as it was about to be completely filled by a uiomove() from the user's buffer. However, if the uiomove() failed, the old contents of the buffer could be exposed especially if the file was being mmap'ed. The fix was to always zero the buffer when it was allocated.","message":"Historically when an application wrote an entire block of a file,\nthe kernel allocated a buffer but did not zero it as it was about\nto be completely filled by a uiomove() from the user's buffer.\nHowever, if the uiomove() failed, the old contents of the buffer\ncould be exposed especially if the file was being mmap'ed. The\nfix was to always zero the buffer when it was allocated.\n\nThis change first attempts the uiomove() to the newly allocated\n(and dirty) buffer and only zeros it if the uiomove() fails. The\neffect is to eliminate the gratuitous zeroing of the buffer in\nthe usual case where the uiomove() successfully fills it.\n\nReviewed by: kib\nTested by: scottl\nMFC after: 2 weeks (to 9 only)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ufs\/ffs\/ffs_vnops.c\n+++ sys\/ufs\/ffs\/ffs_vnops.c\n@@ -718,15 +718,6 @@\n \t\t\tvnode_pager_setsize(vp, ip->i_size);\n \t\t\tbreak;\n \t\t}\n-\t\t\/*\n-\t\t * If the buffer is not valid we have to clear out any\n-\t\t * garbage data from the pages instantiated for the buffer.\n-\t\t * If we do not, a failed uiomove() during a write can leave\n-\t\t * the prior contents of the pages exposed to a userland\n-\t\t * mmap(). XXX deal with uiomove() errors a better way.\n-\t\t *\/\n-\t\tif ((bp->b_flags & B_CACHE) == 0 && fs->fs_bsize <= xfersize)\n-\t\t\tvfs_bio_clrbuf(bp);\n \t\tif (ioflag & IO_DIRECT)\n \t\t\tbp->b_flags |= B_DIRECT;\n \t\tif ((ioflag & (IO_SYNC|IO_INVAL)) == (IO_SYNC|IO_INVAL))\n@@ -743,6 +734,26 @@\n \n \t\terror =\n \t\t uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio);\n+\t\t\/*\n+\t\t * If the buffer is not already filled and we encounter an\n+\t\t * error while trying to fill it, we have to clear out any\n+\t\t * garbage data from the pages instantiated for the buffer.\n+\t\t * If we do not, a failed uiomove() during a write can leave\n+\t\t * the prior contents of the pages exposed to a userland mmap.\n+\t\t *\n+\t\t * Note that we need only clear buffers with a transfer size\n+\t\t * equal to the block size because buffers with a shorter\n+\t\t * transfer size were cleared above by the call to UFS_BALLOC()\n+\t\t * with the BA_CLRBUF flag set.\n+\t\t *\n+\t\t * If the source region for uiomove identically mmaps the\n+\t\t * buffer, uiomove() performed the NOP copy, and the buffer\n+\t\t * content remains valid because the page fault handler\n+\t\t * validated the pages.\n+\t\t *\/\n+\t\tif (error != 0 && (bp->b_flags & B_CACHE) == 0 &&\n+\t\t fs->fs_bsize == xfersize)\n+\t\t\tvfs_bio_clrbuf(bp);\n \t\tif ((ioflag & (IO_VMIO|IO_DIRECT)) &&\n \t\t (LIST_EMPTY(&bp->b_dep))) {\n \t\t\tbp->b_flags |= B_RELBUF;\n"} {"commit":"67f11f4deda0818640decb19a28c537dbe5d429e","subject":"net: Remove linux\/prefetch.h include from linux\/skbuff.h","message":"net: Remove linux\/prefetch.h include from linux\/skbuff.h\n\nNo longer needed.\n\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/skbuff.h\n+++ include\/linux\/skbuff.h\n@@ -28,7 +28,6 @@\n #include <net\/checksum.h>\n #include <linux\/rcupdate.h>\n #include <linux\/dmaengine.h>\n-#include <linux\/prefetch.h>\n #include <linux\/hrtimer.h>\n \n \/* Don't change this without changing skb_csum_unnecessary! *\/\n"} {"commit":"a105f5d7fd400b5c08d8493a9d051428dfa6d646","subject":"MFC r283968: Syncing a directory vnode might drop the vnode lock in the softdep_sync() similarly to the regular vnode sync. Allow retry for both vnode types.","message":"MFC r283968:\nSyncing a directory vnode might drop the vnode lock in the\nsoftdep_sync() similarly to the regular vnode sync. Allow retry for\nboth vnode types.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ufs\/ffs\/ffs_vnops.c\n+++ sys\/ufs\/ffs\/ffs_vnops.c\n@@ -200,8 +200,8 @@\n \t\t * bo_dirty list. Recheck and resync as needed.\n \t\t *\/\n \t\tBO_LOCK(bo);\n-\t\tif (vp->v_type == VREG && (bo->bo_numoutput > 0 ||\n-\t\t bo->bo_dirty.bv_cnt > 0)) {\n+\t\tif ((vp->v_type == VREG || vp->v_type == VDIR) &&\n+\t\t (bo->bo_numoutput > 0 || bo->bo_dirty.bv_cnt > 0)) {\n \t\t\tBO_UNLOCK(bo);\n \t\t\tgoto retry;\n \t\t}\n"} {"commit":"f5bb1bcf01007137c3b4f4ecd8b17d1fd18e693f","subject":"Add documentation to CommandSyncPut","message":"Add documentation to CommandSyncPut\n","repos":"Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/command.h\n+++ include\/mega\/command.h\n@@ -1210,8 +1210,20 @@\n public:\n void procresult();\n \n+ \/\/ Register a new Sync\n CommandSyncPut(MegaClient* client, SyncType type, handle nodeHandle, const string& localFolder, handle deviceId, const string& syncName, int state, int subState, const string& extraData);\n \n+ \/\/ Update a Sync\n+ \/\/ Params that keep the same value are passed with invalid value to avoid to send to the server\n+ \/\/ Invalid values:\n+ \/\/ - type: SyncType::INVALID\n+ \/\/ - nodeHandle: UNDEF\n+ \/\/ - localFolder: nullptr\n+ \/\/ - deviceId: UNDEF\n+ \/\/ - SyncName: nullptr\n+ \/\/ - state: -1\n+ \/\/ - subState: -1\n+ \/\/ - extraData: nullptr\n CommandSyncPut(MegaClient* client, handle syncId, SyncType type, handle nodeHandle, const char* localFolder, handle deviceId, const char* syncName, int state, int subState, const char* extraData);\n };\n \n"} {"commit":"aced78844d403cad78872e4d433d965bafad68e4","subject":"Fix bindings for functions returning void. Previous string parameter bugfix broke them. Automated testing is needed soon to prevent this kind of situations.","message":"Fix bindings for functions returning void.\nPrevious string parameter bugfix broke them.\nAutomated testing is needed soon to prevent this kind of situations.\n","repos":"charto\/nbind,charto\/nbind,charto\/nbind,charto\/nbind,charto\/nbind,charto\/nbind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/nbind\/Caller.h\n+++ include\/nbind\/Caller.h\n@@ -37,13 +37,13 @@\n \n \ttemplate <class Bound, typename Method, typename NanArgs>\n \tstatic std::nullptr_t call(Bound &target, Method method, NanArgs args) {\n-\t\t(target.*method)(Args::get(args)...);\n+\t\t(target.*method)(Args(args).get()...);\n \t\treturn(nullptr);\n \t}\n \n \ttemplate <typename Function, typename NanArgs>\n \tstatic std::nullptr_t call(Function func, NanArgs args) {\n-\t\t(*func)(Args::get(args)...);\n+\t\t(*func)(Args(args).get()...);\n \t\treturn(nullptr);\n \t}\n \n"} {"commit":"ef100682814c429709f0904b757595e25019cb31","subject":"cfg80211: annotate cfg80211_inform_bss","message":"cfg80211: annotate cfg80211_inform_bss\n\nThis function returns a referenced BSS struct\n(or NULL), annotate with __must_check. It seems\nthat a lot of drivers get this completely wrong\nand leak all BSS structs as a result.\n\nReported-by: Adam Mikuta <95831f49ffc3f0aae80f824b2c13ede909919ae4@tieto.com>\nSigned-off-by: Johannes Berg <bff32994ff0f8d048f262a8388145a71b6071bfe@intel.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/net\/cfg80211.h\n+++ include\/net\/cfg80211.h\n@@ -2636,8 +2636,10 @@\n *\n * This informs cfg80211 that BSS information was found and\n * the BSS should be updated\/added.\n- *\/\n-struct cfg80211_bss*\n+ *\n+ * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!\n+ *\/\n+struct cfg80211_bss * __must_check\n cfg80211_inform_bss_frame(struct wiphy *wiphy,\n \t\t\t struct ieee80211_channel *channel,\n \t\t\t struct ieee80211_mgmt *mgmt, size_t len,\n@@ -2659,8 +2661,10 @@\n *\n * This informs cfg80211 that BSS information was found and\n * the BSS should be updated\/added.\n- *\/\n-struct cfg80211_bss*\n+ *\n+ * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!\n+ *\/\n+struct cfg80211_bss * __must_check\n cfg80211_inform_bss(struct wiphy *wiphy,\n \t\t struct ieee80211_channel *channel,\n \t\t const u8 *bssid,\n"} {"commit":"099fe7b98f3b0980c51223e0a91ee80a0e4832dd","subject":"net\/ethernet: Let's use the same parameter names everywhere","message":"net\/ethernet: Let's use the same parameter names everywhere\n\ns\/eth_dev\/dev\n\nSigned-off-by: Tomasz Bursztyka <ba81a3a719836727e6857ae83462b9f52ec41006@linux.intel.com>\n","repos":"finikorg\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,nashif\/zephyr,kraj\/zephyr,finikorg\/zephyr,finikorg\/zephyr,kraj\/zephyr,nashif\/zephyr,punitvara\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,ldts\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,explora26\/zephyr,Vudentz\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,galak\/zephyr,kraj\/zephyr,Vudentz\/zephyr,punitvara\/zephyr,galak\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,punitvara\/zephyr,explora26\/zephyr,galak\/zephyr,galak\/zephyr,ldts\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr,kraj\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/net\/ethernet.h\n+++ include\/net\/ethernet.h\n@@ -135,7 +135,7 @@\n \n #if defined(CONFIG_PTP_CLOCK)\n \t\/** Return ptp_clock device that is tied to this ethernet device *\/\n-\tstruct device *(*get_ptp_clock)(struct device *eth_dev);\n+\tstruct device *(*get_ptp_clock)(struct device *dev);\n #endif \/* CONFIG_PTP_CLOCK *\/\n };\n \n"} {"commit":"b40d6376ff470572e2fafb20ca06a68f2d7940cb","subject":"nl802154: introduce cca mode enums","message":"nl802154: introduce cca mode enums\n\nThis patch adds enums for 802.15.4 specific CCA settings.\n\nSigned-off-by: Alexander Aring <d03dbcdedb9639e397df9b8578e8fc8274f4e6c4@gmail.com>\nSigned-off-by: Marcel Holtmann <44592b4eea36663c86b994bb0ea99d15309c1c7d@holtmann.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"fd25ea42dac1edba43fb21343c230ee22f3dcd66","subject":"Emitter: Mark emitter as clean after cleanup","message":"Emitter: Mark emitter as clean after cleanup\n","repos":"craflin\/libnstd","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/nstd\/Emitter.h\n+++ include\/nstd\/Emitter.h\n@@ -76,6 +76,7 @@\n if(!invalidated)\n {\n if(data && !(data->activation = next) && data->dirty)\n+ {\n for(List<Slot>::Iterator i = data->slots.begin(), end = data->slots.end(); i != end;)\n switch(i->state)\n {\n@@ -87,6 +88,8 @@\n default:\n ++i;\n }\n+ data->dirty = false;\n+ }\n }\n else if(next)\n next->invalidated = true;\n"} {"commit":"fe42d15ea577b1f565695a1528be0acdfb89578b","subject":"Add non copiable","message":"Add non copiable\n","repos":"entuerto\/liborion,entuerto\/liborion,entuerto\/liborion","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/orion\/Common.h\n+++ include\/orion\/Common.h\n@@ -46,6 +46,32 @@\n \n template <class ElementType>\n class Span;\n+\n+\/\/-------------------------------------------------------------------------------------------------\n+\n+struct NonCopyable\n+{\n+ NonCopyable() = default;\n+ ~NonCopyable() = default;\n+ \n+ NonCopyable(NonCopyable const&) = delete;\n+ NonCopyable(NonCopyable&&) = delete;\n+\n+ NonCopyable& operator=(NonCopyable const&) = delete;\n+ NonCopyable& operator=(NonCopyable&&) = delete;\n+};\n+\n+\/\/-------------------------------------------------------------------------------------------------\n+\n+template<typename... Ts>\n+inline constexpr void ignore_unused(const Ts&...)\n+{\n+}\n+\n+template<typename... Ts>\n+inline constexpr void ignore_unused()\n+{\n+}\n \n \/\/-------------------------------------------------------------------------------------------------\n \/\/ -- Source file location \n"} {"commit":"2ec1a3fcefc38cc14005ed518a46ab2150dc7c04","subject":"include\/rgb_keyboard.h: Format with clang-format","message":"include\/rgb_keyboard.h: Format with clang-format\n\nBUG=b:236386294\nBRANCH=none\nTEST=none\n\nChange-Id: I9f9d08aa335a834245440b52040b5038c09f58d7\nSigned-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3730396\nReviewed-by: Jeremy Bettis <4df7b5147fee087dca33c181f288ee7dbf56e022@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/rgb_keyboard.h\n+++ include\/rgb_keyboard.h\n@@ -10,16 +10,16 @@\n #include \"stddef.h\"\n \n \/* Use this instead of '3' for readability where applicable. *\/\n-#define SIZE_OF_RGB\t\tsizeof(struct rgb_s)\n+#define SIZE_OF_RGB sizeof(struct rgb_s)\n \n-#define RGBKBD_MAX_GCC_LEVEL\t0xff\n-#define RGBKBD_MAX_SCALE\t0xff\n+#define RGBKBD_MAX_GCC_LEVEL 0xff\n+#define RGBKBD_MAX_SCALE 0xff\n \n-#define RGBKBD_CTX_TO_GRID(ctx)\t((ctx) - &rgbkbds[0])\n+#define RGBKBD_CTX_TO_GRID(ctx) ((ctx) - &rgbkbds[0])\n \n struct rgbkbd_cfg {\n \t\/* Driver for LED IC *\/\n-\tconst struct rgbkbd_drv * const drv;\n+\tconst struct rgbkbd_drv *const drv;\n \t\/* SPI\/I2C port (i.e. index of spi_devices[], i2c_ports[]) *\/\n \tunion {\n \t\tconst uint8_t i2c;\n@@ -50,7 +50,7 @@\n \n struct rgbkbd {\n \t\/* Static configuration *\/\n-\tconst struct rgbkbd_cfg * const cfg;\n+\tconst struct rgbkbd_cfg *const cfg;\n \t\/* Current state of the port *\/\n \tenum rgbkbd_state state;\n \t\/* Buffer containing color info for each dot. *\/\n@@ -85,8 +85,8 @@\n \t * @param len Length of LEDs to be set.\n \t * @return enum ec_error_list\n \t *\/\n-\tint (*set_scale)(struct rgbkbd *ctx, uint8_t offset,\n-\t\t\t struct rgb_s scale, uint8_t len);\n+\tint (*set_scale)(struct rgbkbd *ctx, uint8_t offset, struct rgb_s scale,\n+\t\t\t uint8_t len);\n \t\/**\n \t * Set global current control.\n \t *\n@@ -98,24 +98,24 @@\n \n \/* Represents a position of an LED in RGB matrix. *\/\n struct rgbkbd_coord {\n-\tuint8_t y: 3;\n-\tuint8_t x: 5;\n+\tuint8_t y : 3;\n+\tuint8_t x : 5;\n };\n \n- \/*\n- * For optimization, LED coordinates are encoded in LED IDs. This saves us one\n- * translation.\n- *\/\n+\/*\n+ * For optimization, LED coordinates are encoded in LED IDs. This saves us one\n+ * translation.\n+ *\/\n union rgbkbd_coord_u8 {\n \tuint8_t u8;\n \tstruct rgbkbd_coord coord;\n };\n \n-#define RGBKBD_COORD(x,y)\t((x) << 3 | (y))\n+#define RGBKBD_COORD(x, y) ((x) << 3 | (y))\n \/* Delimiter for rgbkbd_map data *\/\n-#define RGBKBD_DELM\t\t0xff\n+#define RGBKBD_DELM 0xff\n \/* Non-existent entry indicator for rgbkbd_table *\/\n-#define RGBKBD_NONE\t\t0x00\n+#define RGBKBD_NONE 0x00\n \n \/*\n * The matrix consists of multiple grids:\n"} {"commit":"6eb0ca9a1f64e1f2c833c6fd482393ad7edf9433","subject":"Added prototypes around netent and protoent","message":"Added prototypes around netent and protoent\n","repos":"DeforaOS\/libc,DeforaOS\/libc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/socket\/netdb.h\n+++ include\/socket\/netdb.h\n@@ -18,6 +18,7 @@\n #ifndef LIBSOCKET_NETDB_H\n # define LIBSOCKET_NETDB_H\n \n+# include <inttypes.h>\n # include <netinet\/in.h>\n \n \n@@ -46,6 +47,27 @@\n \tint h_addrtype;\n \tint h_length;\n \tchar ** h_addr_list;\n+};\n+# endif\n+\n+# ifndef netent\n+# define netent netent\n+struct netent\n+{\n+\tchar * n_name;\n+\tchar ** n_aliases;\n+\tint n_addrtype;\n+\tuint32_t n_net;\n+};\n+# endif\n+\n+# ifndef protoent\n+# define protoent protoent\n+struct protoent\n+{\n+\tchar * p_name;\n+\tchar ** p_aliases;\n+\tint p_proto;\n };\n # endif\n \n@@ -92,6 +114,8 @@\n \n \/* functions *\/\n void endhostent(void);\n+void endnetent(void);\n+void endprotoent(void);\n void endservent(void);\n void freeaddrinfo(struct addrinfo * ai);\n const char * gai_strerror(int ecode);\n@@ -102,12 +126,20 @@\n int getnameinfo(const struct sockaddr * sa, socklen_t salen, char * node,\n \t\tsocklen_t nodelen, char * service, socklen_t servicelen,\n \t\tint flags);\n+struct netent * getnetbyaddr(uint32_t net, int type);\n+struct netent * getnetbyname(const char * name);\n+struct netent * getnetent(void);\n+struct protoent * getprotobyname(const char * name);\n+struct protoent * getprotobynumber(int proto);\n+struct protoent * getprotoent(void);\n struct servent * getservbyname(const char * name, const char * protocol);\n struct servent * getservbyport(int port, const char * protocol);\n struct servent * getservent(void);\n struct hostent * gethostent(void);\n char * hstrerror(int errnum);\n void sethostent(int stayopen);\n+void setnetent(int stayopen);\n+void setprotoent(int stayopen);\n void setservent(int stayopen);\n \n #endif \/* !LIBSOCKET_NETDB_H *\/\n"} {"commit":"dc644281acd5da8f7dcbf490ba650d22d8bbb93c","subject":"Essential refactoring that made the test not crashing.","message":"Essential refactoring that made the test not crashing.\n","repos":"GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/vk_mem_alloc.h\n+++ include\/vk_mem_alloc.h\n@@ -5047,7 +5047,8 @@\n class VmaBlockMetadata\r\n {\r\n public:\r\n- VmaBlockMetadata(VmaAllocator hAllocator, bool isVirtual);\r\n+ \/\/ pAllocationCallbacks, if not null, must be owned externally - alive and unchanged for the whole lifetime of this object.\r\n+ VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual);\r\n virtual ~VmaBlockMetadata() { }\r\n virtual void Init(VkDeviceSize size) { m_Size = size; }\r\n \r\n@@ -5143,7 +5144,7 @@\n {\r\n VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic)\r\n public:\r\n- VmaBlockMetadata_Generic(VmaAllocator hAllocator, bool isVirtual);\r\n+ VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual);\r\n virtual ~VmaBlockMetadata_Generic();\r\n virtual void Init(VkDeviceSize size);\r\n \r\n@@ -5323,7 +5324,7 @@\n {\r\n VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear)\r\n public:\r\n- VmaBlockMetadata_Linear(VmaAllocator hAllocator, bool isVirtual);\r\n+ VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual);\r\n virtual ~VmaBlockMetadata_Linear();\r\n virtual void Init(VkDeviceSize size);\r\n \r\n@@ -5455,7 +5456,7 @@\n {\r\n VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy)\r\n public:\r\n- VmaBlockMetadata_Buddy(VmaAllocator hAllocator, bool isVirtual);\r\n+ VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual);\r\n virtual ~VmaBlockMetadata_Buddy();\r\n virtual void Init(VkDeviceSize size);\r\n \r\n@@ -7666,9 +7667,9 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n \/\/ class VmaBlockMetadata\r\n \r\n-VmaBlockMetadata::VmaBlockMetadata(VmaAllocator hAllocator, bool isVirtual) :\r\n+VmaBlockMetadata::VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual) :\r\n m_Size(0),\r\n- m_pAllocationCallbacks(hAllocator->GetAllocationCallbacks()),\r\n+ m_pAllocationCallbacks(pAllocationCallbacks),\r\n m_IsVirtual(isVirtual)\r\n {\r\n }\r\n@@ -7741,12 +7742,12 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n \/\/ class VmaBlockMetadata_Generic\r\n \r\n-VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(VmaAllocator hAllocator, bool isVirtual) :\r\n- VmaBlockMetadata(hAllocator, isVirtual),\r\n+VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual) :\r\n+ VmaBlockMetadata(pAllocationCallbacks, isVirtual),\r\n m_FreeCount(0),\r\n m_SumFreeSize(0),\r\n- m_Suballocations(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),\r\n- m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(hAllocator->GetAllocationCallbacks()))\r\n+ m_Suballocations(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n+ m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(pAllocationCallbacks))\r\n {\r\n }\r\n \r\n@@ -8755,11 +8756,11 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n \/\/ class VmaBlockMetadata_Linear\r\n \r\n-VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(VmaAllocator hAllocator, bool isVirtual) :\r\n- VmaBlockMetadata(hAllocator, isVirtual),\r\n+VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual) :\r\n+ VmaBlockMetadata(pAllocationCallbacks, isVirtual),\r\n m_SumFreeSize(0),\r\n- m_Suballocations0(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),\r\n- m_Suballocations1(VmaStlAllocator<VmaSuballocation>(hAllocator->GetAllocationCallbacks())),\r\n+ m_Suballocations0(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n+ m_Suballocations1(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n m_1stVectorIndex(0),\r\n m_2ndVectorMode(SECOND_VECTOR_EMPTY),\r\n m_1stNullItemsBeginCount(0),\r\n@@ -10546,8 +10547,8 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n \/\/ class VmaBlockMetadata_Buddy\r\n \r\n-VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(VmaAllocator hAllocator, bool isVirtual) :\r\n- VmaBlockMetadata(hAllocator, isVirtual),\r\n+VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks, bool isVirtual) :\r\n+ VmaBlockMetadata(pAllocationCallbacks, isVirtual),\r\n m_Root(VMA_NULL),\r\n m_AllocationCount(0),\r\n m_FreeCount(1),\r\n@@ -11165,18 +11166,18 @@\n switch(algorithm)\r\n {\r\n case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:\r\n- m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator,\r\n+ m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator->GetAllocationCallbacks(),\r\n false); \/\/ isVirtual\r\n break;\r\n case VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT:\r\n- m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Buddy)(hAllocator,\r\n+ m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Buddy)(hAllocator->GetAllocationCallbacks(),\r\n false); \/\/ isVirtual\r\n break;\r\n default:\r\n VMA_ASSERT(0);\r\n \/\/ Fall-through.\r\n case 0:\r\n- m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Generic)(hAllocator,\r\n+ m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Generic)(hAllocator->GetAllocationCallbacks(),\r\n false); \/\/ isVirtual\r\n }\r\n m_pMetadata->Init(newSize);\r\n"} {"commit":"f6a439a63bf119ef0a1f6ea1489982226ede3673","subject":"Update LHS_2.c","message":"Update LHS_2.c","repos":"gaoyuantim\/LHS-Maximin,jbect\/LHS-Maximin,gaoyuantim\/LHS-Maximin,jbect\/LHS-Maximin","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- LHS_EXSAUSTIF\/LHS_2.c\n+++ LHS_EXSAUSTIF\/LHS_2.c\n@@ -2,7 +2,7 @@\n * *\r\n * Copyright Notice *\r\n * *\r\n-* Copyright (C) 2016 CentraleSupelec *\r\n+* Copyright (C) 2016 Yuan Gao <gaoyuantim@gmail.com> *\r\n * *\r\n * Author: Yuan Gao <gaoyuantim@gmail.com> *\r\n * *\r\n@@ -22,232 +22,232 @@\n * License along with this program; if not, see *\r\n * <http:\/\/www.gnu.org\/licenses\/>. *\r\n * *\r\n-******************************************************************************\/\n-#include \"mex.h\"\n-#include <stdio.h>\n-#include <stdlib.h>\n-\n-\n-int MIN(int a, int b){\n-\tif (a>b) return b;\n-\telse return a;\n-}\n-\n-void Swap(int *a, int *b){\n-\tint temp = *a;\n-\t*a = *b;\n-\t*b = temp;\n-}\n-int Square(int a){\n-\treturn a*a;\n-}\n-\n-void Copy(int *a, int *b, int length){\n-\tfor (int i = 0; i < length; i++){\n-\t\ta[i] = b[i];\n-\t}\n-}\n-\n-void LHS_Start(int m, int n, double *D2_maximin, double *coord_fix);\n-int Colone_Change(int dimension, int position, int m, int n, int *coord, int *coord_maximin, int *Delta2_pairs, int *D2_pairs, double D2_maximin);\n-int Ligne_Change(int dimension, int m, int n, int *coord_fix, int *D2_pairs, double D2_maximin);\n-void Caculation(int p_1, int p_2, int m, int n, int **delta2_pairs, int *D2_pairs);\n-\n-void mexFunction(int nlhs, mxArray *plhs[], int nrhs,\n- const mxArray *prhs[]){\n- \n- int m, n;\n- double *D2_maximin;\n-\n- if (nrhs != 2){\n- mexErrMsgTxt(\"We need two caracters!\");\n- }\n- m = (int)mxGetScalar(prhs[0]);\n- n = (int)mxGetScalar(prhs[1]);\n- plhs[0] = mxCreateDoubleMatrix(1,1,mxREAL);\n- plhs[1] = mxCreateDoubleMatrix(n,m,mxREAL);\n- \n- double *Table_max;\n- D2_maximin = mxGetPr(plhs[0]);\n- Table_max = mxGetPr(plhs[1]);\n- \n- LHS_Start(m, n, D2_maximin, Table_max);\n-}\n-\n-void LHS_Start(int m, int n, double *D2_result, double *Table_max){\n-\tint i, j;\n-\tint *D2_pairs, *coord_fix;\n- \n-\t\/*Initialisaiton of coordinates and distance2*\/\n-\tcoord_fix = (int *)malloc(m*n*sizeof(int));\n- D2_pairs = (int *)malloc(n*n*sizeof(int));\n-\tfor (i = 0; i < n*n; i++){\n-\t\tD2_pairs[i] = 0;\n-\t}\n-\n-\t*D2_result = (double)Ligne_Change(1, m, n, coord_fix, D2_pairs, 0);\n- \n- for (i = 0; i < m*n; i++){\n- Table_max[i] = (double)coord_fix[i];\n- }\n- \n-\t\/* Free pointer*\/\n- free(coord_fix);\n- coord_fix = NULL;\n-\tfree(D2_pairs);\n-\tD2_pairs = NULL;\n-}\n-\n-\n-\n-void Caculation(int p_1, int p_2, int m, int n, int *Delta2_pairs, int *D2_pairs){\n-\n-\t\/*Change distance2 between the points in the same dimension*\/\n-\tint *t1, *t2;\n-\tint p_1n = p_1 * n;\n-\tint p_2n = p_2 * n;\n-\tfor (int i = 0; i<n; i++){\n-\t\tif ((i != p_1) && (i != p_2)){\n-\t\t\tt1 = Delta2_pairs + p_1n + i;\n-\t\t\tt2 = Delta2_pairs + p_2n + i;\n-\t\t\tSwap(t1, t2);\n-\t\t\tDelta2_pairs[i*n + p_1] = *t1;\n-\t\t\tDelta2_pairs[i*n + p_2] = *t2;\n-\t\t}\n-\t}\n-\n-\t\/*Calculation D2*\/\n-\tint in;\n-\tfor (int i = 0; i < n; i++){\n-\t\tin = i * n;\n-\t\tt1 = Delta2_pairs + p_1n + i;\n-\t\tt2 = Delta2_pairs + p_2n + i;\n-\t\tif ((i != p_1) && (i != p_2)){\n-\t\t\tD2_pairs[in + p_1] = D2_pairs[in + p_1] + *t1 - *t2;\n-\t\t\tD2_pairs[in + p_2] = D2_pairs[in + p_2] + *t2 - *t1;\n-\t\t\tD2_pairs[p_1n + i] = D2_pairs[in + p_1] ;\n-\t\t\tD2_pairs[p_2n + i] = D2_pairs[in + p_2];\n-\t\t}\n-\t}\n-}\n-\n-int Colone_Change(int dimension, int position, int m, int n, int *coord, int *coord_maximin, int *Delta2_pairs_fix, int *D2_pairs_fix, double D2_maximin){\n-\t\n-\tint p_1 = position - 1;\n-\tint D2_min;\n-\tint *t1, *t2;\n-\tint *Delta2_pairs, *D2_pairs;\n-\n-\tDelta2_pairs = (int *)malloc(n*n*sizeof(int));\n-\tD2_pairs = (int *)malloc(n*n*sizeof(int));\n-\n-\t\/*Iteration of every point in each dimension*\/\n-\tif (position != n){\n-\t\tfor (int p_2 = p_1; p_2 < n; p_2++){\n-\t\t\t\n-\t\t\t\/*Exchange the coordinates*\/\n-\t\t\tt1 = coord + p_1;\n-\t\t\tt2 = coord + p_2;\n-\t\t\tSwap(t1, t2);\n-\n-\t\t\t\/*Copyback the Distance2, D2*\/\n-\t\t\tCopy(Delta2_pairs, Delta2_pairs_fix, n*n);\n-\t\t\tCopy(D2_pairs, D2_pairs_fix, n*n);\n-\n-\t\t\t\/*Update Distance2, D2*\/\n-\t\t\tif (p_1 != p_2){\n-\t\t\t\tCaculation(p_1, p_2, m, n, Delta2_pairs, D2_pairs);\n-\t\t\t}\n-\n-\t\t\tif (dimension < m){\n-\t\t\t\t\/*The maximin from the dimension behind*\/\n-\t\t\t\tD2_min = Ligne_Change(dimension + 1, m, n, coord + n, D2_pairs, D2_maximin);\n-\n-\t\t\t\tif (D2_min > D2_maximin){\n-\t\t\t\t\tD2_maximin = D2_min;\n-\t\t\t\t\tCopy(coord_maximin, coord, n*(m - dimension + 1));\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\telse {\n-\t\t\t\t\/*Caculation of D2_min in the last dimension*\/\n-\t\t\t\tD2_min = n*n*m;\n-\t\t\t\tfor (int i = 0; i < n; i++){\n-\t\t\t\t\tfor (int j = i + 1; j < n; j++){\n-\t\t\t\t\t\tD2_min = MIN(D2_min, D2_pairs[i*n + j]);\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\tif (D2_min > D2_maximin){\n-\t\t\t\t\tD2_maximin = D2_min;\n-\t\t\t\t\tCopy(coord_maximin, coord, n);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\t\/*Update D2_maximin when D2_maximin from dimension behind or in the last dimension*\/\n-\n-\t\t\tD2_maximin = Colone_Change(dimension, position + 1, m, n, coord, coord_maximin, Delta2_pairs, D2_pairs, D2_maximin);\n-\t\t\t\n-\t\t\tSwap(t1, t2);\n-\t\t}\n-\t}\n-\t\n-\t\/*Clear Pointer*\/\n-\tfree(D2_pairs);\n-\tD2_pairs = NULL;\n-\tfree(Delta2_pairs);\n-\tDelta2_pairs = NULL;\n-\n-\treturn D2_maximin;\n-}\n-\n-int Ligne_Change(int dimension, int m, int n, int *coord_fix, int *D2_pairs_fix, double D2_maximin){\n-\t\n-\tint *coord, *coord_maximin, *D2_pairs;\n-\t\n-\tD2_pairs = (int *)malloc(n*n*sizeof(int));\n-\tCopy(D2_pairs, D2_pairs_fix, n*n);\n-\n-\t\/*Initilisation of the coordinates in this dimension*\/\n-\tcoord = (int *)malloc(n*(m - dimension + 1)*sizeof(int));\n-\tcoord_maximin = (int *)malloc(n*(m - dimension + 1)*sizeof(int));\n-\tfor (int i = 0; i < n; i++){\n-\t\tcoord[i] = i;\n-\t\tcoord_maximin[i] = i;\n-\t}\n-\n-\t\/*Initialisation of Delta2_pairs in this dimension*\/\n-\tint *Delta2_pairs;\n-\tDelta2_pairs = (int *)malloc(n*n*sizeof(int));\n-\tfor (int i = 0; i < n; i++){\n-\t\tfor (int j = 0; j < n; j++){\n-\t\t\tDelta2_pairs[i*n + j] = Square(coord[i] - coord[j]);\n-\t\t\tD2_pairs[i*n + j] += Delta2_pairs[i*n + j];\n-\t\t}\n-\t}\n-\n-\tif (dimension == 1){\n-\t\tfor (int i = 0; i < n; i++){\n-\t\t\tcoord_fix[i] = i;\n-\t\t}\n-\t\t\/*Clear pointer*\/\n-\t\tfree(Delta2_pairs);\n-\t\tDelta2_pairs = NULL;\n-\n-\t\treturn (Ligne_Change(dimension + 1, m, n, coord_fix + n, D2_pairs, D2_maximin));\n-\t}\n-\n-\t\/*Go to the colone part*\/\n-\tD2_maximin = Colone_Change(dimension, 1, m, n, coord, coord_maximin, Delta2_pairs, D2_pairs, D2_maximin);\n-\tCopy(coord_fix, coord_maximin, n*(m - dimension + 1));\n-\n-\t\/*Clear pointer*\/\n-\tfree(coord);\n-\tcoord = NULL;\n-\tfree(D2_pairs);\n-\tD2_pairs = NULL;\n-\tfree(Delta2_pairs);\n-\tDelta2_pairs = NULL;\n-\tfree(coord_maximin);\n-\tcoord_maximin = NULL;\n-\n-\treturn D2_maximin;\n-}+******************************************************************************\/\r\n+#include \"mex.h\"\r\n+#include <stdio.h>\r\n+#include <stdlib.h>\r\n+\r\n+\r\n+int MIN(int a, int b){\r\n+\tif (a>b) return b;\r\n+\telse return a;\r\n+}\r\n+\r\n+void Swap(int *a, int *b){\r\n+\tint temp = *a;\r\n+\t*a = *b;\r\n+\t*b = temp;\r\n+}\r\n+int Square(int a){\r\n+\treturn a*a;\r\n+}\r\n+\r\n+void Copy(int *a, int *b, int length){\r\n+\tfor (int i = 0; i < length; i++){\r\n+\t\ta[i] = b[i];\r\n+\t}\r\n+}\r\n+\r\n+void LHS_Start(int m, int n, double *D2_maximin, double *coord_fix);\r\n+int Colone_Change(int dimension, int position, int m, int n, int *coord, int *coord_maximin, int *Delta2_pairs, int *D2_pairs, double D2_maximin);\r\n+int Ligne_Change(int dimension, int m, int n, int *coord_fix, int *D2_pairs, double D2_maximin);\r\n+void Caculation(int p_1, int p_2, int m, int n, int **delta2_pairs, int *D2_pairs);\r\n+\r\n+void mexFunction(int nlhs, mxArray *plhs[], int nrhs,\r\n+ const mxArray *prhs[]){\r\n+ \r\n+ int m, n;\r\n+ double *D2_maximin;\r\n+\r\n+ if (nrhs != 2){\r\n+ mexErrMsgTxt(\"We need two caracters!\");\r\n+ }\r\n+ m = (int)mxGetScalar(prhs[0]);\r\n+ n = (int)mxGetScalar(prhs[1]);\r\n+ plhs[0] = mxCreateDoubleMatrix(1,1,mxREAL);\r\n+ plhs[1] = mxCreateDoubleMatrix(n,m,mxREAL);\r\n+ \r\n+ double *Table_max;\r\n+ D2_maximin = mxGetPr(plhs[0]);\r\n+ Table_max = mxGetPr(plhs[1]);\r\n+ \r\n+ LHS_Start(m, n, D2_maximin, Table_max);\r\n+}\r\n+\r\n+void LHS_Start(int m, int n, double *D2_result, double *Table_max){\r\n+\tint i, j;\r\n+\tint *D2_pairs, *coord_fix;\r\n+ \r\n+\t\/*Initialisaiton of coordinates and distance2*\/\r\n+\tcoord_fix = (int *)malloc(m*n*sizeof(int));\r\n+ D2_pairs = (int *)malloc(n*n*sizeof(int));\r\n+\tfor (i = 0; i < n*n; i++){\r\n+\t\tD2_pairs[i] = 0;\r\n+\t}\r\n+\r\n+\t*D2_result = (double)Ligne_Change(1, m, n, coord_fix, D2_pairs, 0);\r\n+ \r\n+ for (i = 0; i < m*n; i++){\r\n+ Table_max[i] = (double)coord_fix[i];\r\n+ }\r\n+ \r\n+\t\/* Free pointer*\/\r\n+ free(coord_fix);\r\n+ coord_fix = NULL;\r\n+\tfree(D2_pairs);\r\n+\tD2_pairs = NULL;\r\n+}\r\n+\r\n+\r\n+\r\n+void Caculation(int p_1, int p_2, int m, int n, int *Delta2_pairs, int *D2_pairs){\r\n+\r\n+\t\/*Change distance2 between the points in the same dimension*\/\r\n+\tint *t1, *t2;\r\n+\tint p_1n = p_1 * n;\r\n+\tint p_2n = p_2 * n;\r\n+\tfor (int i = 0; i<n; i++){\r\n+\t\tif ((i != p_1) && (i != p_2)){\r\n+\t\t\tt1 = Delta2_pairs + p_1n + i;\r\n+\t\t\tt2 = Delta2_pairs + p_2n + i;\r\n+\t\t\tSwap(t1, t2);\r\n+\t\t\tDelta2_pairs[i*n + p_1] = *t1;\r\n+\t\t\tDelta2_pairs[i*n + p_2] = *t2;\r\n+\t\t}\r\n+\t}\r\n+\r\n+\t\/*Calculation D2*\/\r\n+\tint in;\r\n+\tfor (int i = 0; i < n; i++){\r\n+\t\tin = i * n;\r\n+\t\tt1 = Delta2_pairs + p_1n + i;\r\n+\t\tt2 = Delta2_pairs + p_2n + i;\r\n+\t\tif ((i != p_1) && (i != p_2)){\r\n+\t\t\tD2_pairs[in + p_1] = D2_pairs[in + p_1] + *t1 - *t2;\r\n+\t\t\tD2_pairs[in + p_2] = D2_pairs[in + p_2] + *t2 - *t1;\r\n+\t\t\tD2_pairs[p_1n + i] = D2_pairs[in + p_1] ;\r\n+\t\t\tD2_pairs[p_2n + i] = D2_pairs[in + p_2];\r\n+\t\t}\r\n+\t}\r\n+}\r\n+\r\n+int Colone_Change(int dimension, int position, int m, int n, int *coord, int *coord_maximin, int *Delta2_pairs_fix, int *D2_pairs_fix, double D2_maximin){\r\n+\t\r\n+\tint p_1 = position - 1;\r\n+\tint D2_min;\r\n+\tint *t1, *t2;\r\n+\tint *Delta2_pairs, *D2_pairs;\r\n+\r\n+\tDelta2_pairs = (int *)malloc(n*n*sizeof(int));\r\n+\tD2_pairs = (int *)malloc(n*n*sizeof(int));\r\n+\r\n+\t\/*Iteration of every point in each dimension*\/\r\n+\tif (position != n){\r\n+\t\tfor (int p_2 = p_1; p_2 < n; p_2++){\r\n+\t\t\t\r\n+\t\t\t\/*Exchange the coordinates*\/\r\n+\t\t\tt1 = coord + p_1;\r\n+\t\t\tt2 = coord + p_2;\r\n+\t\t\tSwap(t1, t2);\r\n+\r\n+\t\t\t\/*Copyback the Distance2, D2*\/\r\n+\t\t\tCopy(Delta2_pairs, Delta2_pairs_fix, n*n);\r\n+\t\t\tCopy(D2_pairs, D2_pairs_fix, n*n);\r\n+\r\n+\t\t\t\/*Update Distance2, D2*\/\r\n+\t\t\tif (p_1 != p_2){\r\n+\t\t\t\tCaculation(p_1, p_2, m, n, Delta2_pairs, D2_pairs);\r\n+\t\t\t}\r\n+\r\n+\t\t\tif (dimension < m){\r\n+\t\t\t\t\/*The maximin from the dimension behind*\/\r\n+\t\t\t\tD2_min = Ligne_Change(dimension + 1, m, n, coord + n, D2_pairs, D2_maximin);\r\n+\r\n+\t\t\t\tif (D2_min > D2_maximin){\r\n+\t\t\t\t\tD2_maximin = D2_min;\r\n+\t\t\t\t\tCopy(coord_maximin, coord, n*(m - dimension + 1));\r\n+\t\t\t\t}\r\n+\t\t\t}\r\n+\t\t\telse {\r\n+\t\t\t\t\/*Caculation of D2_min in the last dimension*\/\r\n+\t\t\t\tD2_min = n*n*m;\r\n+\t\t\t\tfor (int i = 0; i < n; i++){\r\n+\t\t\t\t\tfor (int j = i + 1; j < n; j++){\r\n+\t\t\t\t\t\tD2_min = MIN(D2_min, D2_pairs[i*n + j]);\r\n+\t\t\t\t\t}\r\n+\t\t\t\t}\r\n+\t\t\t\tif (D2_min > D2_maximin){\r\n+\t\t\t\t\tD2_maximin = D2_min;\r\n+\t\t\t\t\tCopy(coord_maximin, coord, n);\r\n+\t\t\t\t}\r\n+\t\t\t}\r\n+\r\n+\t\t\t\/*Update D2_maximin when D2_maximin from dimension behind or in the last dimension*\/\r\n+\r\n+\t\t\tD2_maximin = Colone_Change(dimension, position + 1, m, n, coord, coord_maximin, Delta2_pairs, D2_pairs, D2_maximin);\r\n+\t\t\t\r\n+\t\t\tSwap(t1, t2);\r\n+\t\t}\r\n+\t}\r\n+\t\r\n+\t\/*Clear Pointer*\/\r\n+\tfree(D2_pairs);\r\n+\tD2_pairs = NULL;\r\n+\tfree(Delta2_pairs);\r\n+\tDelta2_pairs = NULL;\r\n+\r\n+\treturn D2_maximin;\r\n+}\r\n+\r\n+int Ligne_Change(int dimension, int m, int n, int *coord_fix, int *D2_pairs_fix, double D2_maximin){\r\n+\t\r\n+\tint *coord, *coord_maximin, *D2_pairs;\r\n+\t\r\n+\tD2_pairs = (int *)malloc(n*n*sizeof(int));\r\n+\tCopy(D2_pairs, D2_pairs_fix, n*n);\r\n+\r\n+\t\/*Initilisation of the coordinates in this dimension*\/\r\n+\tcoord = (int *)malloc(n*(m - dimension + 1)*sizeof(int));\r\n+\tcoord_maximin = (int *)malloc(n*(m - dimension + 1)*sizeof(int));\r\n+\tfor (int i = 0; i < n; i++){\r\n+\t\tcoord[i] = i;\r\n+\t\tcoord_maximin[i] = i;\r\n+\t}\r\n+\r\n+\t\/*Initialisation of Delta2_pairs in this dimension*\/\r\n+\tint *Delta2_pairs;\r\n+\tDelta2_pairs = (int *)malloc(n*n*sizeof(int));\r\n+\tfor (int i = 0; i < n; i++){\r\n+\t\tfor (int j = 0; j < n; j++){\r\n+\t\t\tDelta2_pairs[i*n + j] = Square(coord[i] - coord[j]);\r\n+\t\t\tD2_pairs[i*n + j] += Delta2_pairs[i*n + j];\r\n+\t\t}\r\n+\t}\r\n+\r\n+\tif (dimension == 1){\r\n+\t\tfor (int i = 0; i < n; i++){\r\n+\t\t\tcoord_fix[i] = i;\r\n+\t\t}\r\n+\t\t\/*Clear pointer*\/\r\n+\t\tfree(Delta2_pairs);\r\n+\t\tDelta2_pairs = NULL;\r\n+\r\n+\t\treturn (Ligne_Change(dimension + 1, m, n, coord_fix + n, D2_pairs, D2_maximin));\r\n+\t}\r\n+\r\n+\t\/*Go to the colone part*\/\r\n+\tD2_maximin = Colone_Change(dimension, 1, m, n, coord, coord_maximin, Delta2_pairs, D2_pairs, D2_maximin);\r\n+\tCopy(coord_fix, coord_maximin, n*(m - dimension + 1));\r\n+\r\n+\t\/*Clear pointer*\/\r\n+\tfree(coord);\r\n+\tcoord = NULL;\r\n+\tfree(D2_pairs);\r\n+\tD2_pairs = NULL;\r\n+\tfree(Delta2_pairs);\r\n+\tDelta2_pairs = NULL;\r\n+\tfree(coord_maximin);\r\n+\tcoord_maximin = NULL;\r\n+\r\n+\treturn D2_maximin;\r\n+}\r\n"} {"commit":"fd048091731f98a58ad8f982ed92c4f62589bba7","subject":"Cleanup.","message":"Cleanup.\n\ngit-svn-id: 36de21aa7b1472b3fce746da1590bf50bb7584d6@418 6a6d099a-6a11-0410-877e-d5a07a98cbd2\n","repos":"Thunder07\/Play--Framework,Thunder07\/Play--Framework,AbandonedCart\/Play-Framework,Alloyed\/Play--Framework,Alloyed\/Play--Framework,Thunder07\/Play--Framework,AbandonedCart\/Play-Framework,AbandonedCart\/Play-Framework,Alloyed\/Play--Framework","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/win32\/Window.h\n+++ include\/win32\/Window.h\n@@ -1,5 +1,4 @@\n-#ifndef _WINDOW_H_\r\n-#define _WINDOW_H_\r\n+#pragma once\r\n \r\n #include <windows.h>\r\n #include \"tcharx.h\"\r\n@@ -15,8 +14,10 @@\n \t\t{\r\n \t\tpublic:\r\n \t\t\t\t\t\t\t\t\tCWindow();\r\n+\t\t\t\t\t\t\t\t\tCWindow(const CWindow&) = delete;\r\n \t\t\tvirtual\t\t\t\t\t~CWindow();\r\n \r\n+\t\t\tCWindow&\t\t\t\toperator =(const CWindow&) = delete;\r\n \t\t\t\t\t\t\t\t\toperator HWND() const;\r\n \r\n \t\t\tstatic LRESULT WINAPI\tWndProc(HWND, unsigned int, WPARAM, LPARAM);\r\n@@ -105,10 +106,6 @@\n \t\t\tvirtual long\t\t\tOnSetFocus();\r\n \t\t\tvirtual long\t\t\tOnKillFocus();\r\n \r\n-\t\tprivate:\r\n-\t\t\t\t\t\t\t\t\tCWindow(const CWindow&);\r\n-\t\t\tCWindow&\t\t\t\toperator =(const CWindow&);\r\n-\r\n \t\tpublic:\r\n \t\t\tHWND\t\t\t\t\tm_hWnd;\r\n \t\t\tbool\t\t\t\t\tm_hasClassPtr;\r\n@@ -117,5 +114,3 @@\n \t\t};\r\n \t}\r\n };\r\n-\r\n-#endif\r\n"} {"commit":"ef879dfd545ba82d020dc12791ee7dbdeed94879","subject":"linux\/virtio: add missing initialization of scatter-gather lists","message":"linux\/virtio: add missing initialization of scatter-gather lists\n\nRX and TX scatterlists should be initialized before passing them to\nvirtqueue APIs, otherwise those APIs will detect unexpected list chaining\nis not expected (virtio_net netmap adapter uses one virtio descriptor per\npacket).\n\nSigned-off-by: Nikita Kalyazin <82c94e8210876770e26693ca4e87eab4d9598ab2@samsung.com>\nReviewed-by: Vincenzo Maffione <9c61b7c5ebb3b288da4fe59954d7c41958e8c3d4@gmail.com>\n","repos":"luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- LINUX\/virtio_netmap.h\n+++ LINUX\/virtio_netmap.h\n@@ -114,6 +114,8 @@\n #define GET_RX_SG(_vi, _i)\t\t(_vi)->rq[_i].sg\n #define GET_TX_SG(_vi, _i)\t\t(_vi)->sq[_i].sg\n #define COMPAT_DECL_SG\n+#define INIT_SGS(_vi)\t\t\tvirtio_netmap_init_sgs(_vi)\n+#define SG_INIT_TABLE(_sgl, _n)\n #ifdef NETMAP_LINUX_VIRTIO_RQ_NUM\n \/* multi queue, num field exists *\/\n #define DECR_NUM(_vi, _i)\t\t--(_vi)->rq[_i].num\n@@ -141,6 +143,8 @@\n function. This macro does this definition, which is not necessary\n for subsequent versions. *\/\n #define COMPAT_DECL_SG\t\t\tstruct scatterlist _compat_sg;\n+#define INIT_SGS(_vi)\n+#define SG_INIT_TABLE(_sgl, _n)\t\tsg_init_table(_sgl, _n)\n \/* Use the scatterlist struct defined in the current function *\/\n #define GET_RX_SG(_vi, _i)\t&_compat_sg\n #define GET_TX_SG(_vi, _i)\t&_compat_sg\n@@ -181,6 +185,19 @@\n \t}\n }\n \n+static void\n+virtio_netmap_init_sgs(struct SOFTC_T *vi)\n+{\n+\tCOMPAT_DECL_SG\n+\tint i;\n+\n+\tfor (i = 0; i < DEV_NUM_TX_QUEUES(vi->dev); i++)\n+\t\tsg_init_table(GET_TX_SG(vi, i), 1);\n+\n+\tfor (i = 0; i < DEV_NUM_RX_QUEUES(vi->dev); i++)\n+\t\tsg_init_table(GET_RX_SG(vi, i), 1);\n+}\n+\n \/* Register and unregister. *\/\n static int\n virtio_netmap_reg(struct netmap_adapter *na, int onoff)\n@@ -208,6 +225,11 @@\n \t\t * before calling free_unused_bufs(), that uses\n \t\t * virtqueue_detach_unused_buf(). *\/\n \t\tvirtio_netmap_clean_used_rings(na, vi);\n+\n+\t\t\/* Initialize sg lists with single element.\n+\t\t * We need this because host driver may use more than one buffer\n+\t\t * per packet, whereas netmap uses single buffer per packet. *\/\n+\t\tINIT_SGS(vi);\n \n \t\t\/* We have to drain the RX virtqueues, otherwise the\n \t\t * virtio_netmap_init_buffer() called by the subsequent\n@@ -330,6 +352,7 @@\n \t\t\t\/* Initialize the scatterlist, expose it to the hypervisor,\n \t\t\t * and kick the hypervisor (if necessary).\n \t\t\t *\/\n+\t\t\tSG_INIT_TABLE(sg, 1);\n sg_set_buf(sg, addr, len);\n err = virtqueue_add_outbuf(vq, sg, 1, na, GFP_ATOMIC);\n if (err < 0) {\n@@ -436,6 +459,7 @@\n \t\t\t\/* Initialize the scatterlist, expose it to the hypervisor,\n \t\t\t * and kick the hypervisor (if necessary).\n \t\t\t *\/\n+\t\t\tSG_INIT_TABLE(sg, 1);\n sg_set_buf(sg, addr, ring->nr_buf_size);\n err = virtqueue_add_inbuf(vq, sg, 1, na, GFP_ATOMIC);\n if (err < 0) {\n@@ -499,6 +523,7 @@\n \n slot = &ring->slot[i];\n addr = NMB(na, slot);\n+\t\t\tSG_INIT_TABLE(sg, 1);\n sg_set_buf(sg, addr, ring->nr_buf_size);\n err = virtqueue_add_inbuf(vq, sg, 1, na, GFP_ATOMIC);\n if (err < 0) {\n@@ -775,6 +800,7 @@\n \n skb = netdev_alloc_skb_ip_align(vi->dev, GOOD_COPY_LEN);\n skb_put(skb, 64);\n+\t\t sg_init_table(sg, 1)\n sg_set_buf(&sg, skb->cb, 64);\n num_sg = skb_to_sgvec(skb, &sg, 0, skb->len);\n if (skb) {\n"} {"commit":"5e8b904e009ead8ab81bf10ba69e5cde96cdb85d","subject":"Implement hashtbl grow when capacity exceeded.","message":"Implement hashtbl grow when capacity exceeded.\n","repos":"jeaf\/ckit,jeaf\/ckit,jeaf\/ckit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hashtbl.c\n+++ hashtbl.c\n@@ -1,3 +1,20 @@\n+void hashtbl_$type_grow(hashtbl_$type* a)\n+{\n+ hashtbl_$type new_ht;\n+ new_ht.size = 0;\n+ new_ht.capacity = a->capacity << 1;\n+ new_ht.items = calloc(new_ht.capacity, sizeof(hashtbl_item));\n+ for (unsigned i = 0; i < a->capacity; ++i)\n+ {\n+ if (a->items[i].state == VALID)\n+ {\n+ *hashtbl_$type_lookup(&new_ht, a->items[i].hash) = a->items[i].data;\n+ }\n+ }\n+ free(a->items);\n+ *a = new_ht;\n+}\n+\n void hashtbl_$type_ctor(hashtbl_$type* a)\n {\n assert(a);\n@@ -50,6 +67,12 @@\n assert(a->capacity > 0);\n assert(a->items);\n assert((a->capacity & (a->capacity - 1)) == 0); \/\/ must be power of 2\n+ \n+ \/\/ First check if we need to grow the hashtbl\n+ if (((float)a->size \/ a->capacity) > 0.3)\n+ {\n+ hashtbl_$type_grow(a);\n+ }\n \n unsigned hashidx = hash & (a->capacity - 1);\n unsigned offset = 0;\n"} {"commit":"9789e4c930fc1b3869f75a36e481a0c17e341d6a","subject":"component: driver: usb: enlarge uconfig_descriptor's data array space","message":"component: driver: usb: enlarge uconfig_descriptor's data array space\n\nif you add more compositive usb device(more than 4), the data[256]\ncan't hold all the devices's config information, array out of bounds.\n\nFixes: 60c27fc4b (\"add USB composite and mass storage class features in USB device stack\")\nSigned-off-by: Dillon Min <a51e4fed4185d611e028f04be1a8b85c0dc0928a@gmail.com>\n","repos":"nongxiaoming\/rt-thread,nongxiaoming\/rt-thread,weety\/rt-thread,nongxiaoming\/rt-thread,ArdaFu\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,RT-Thread\/rt-thread,weety\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,ArdaFu\/rt-thread,armink\/rt-thread,armink\/rt-thread,nongxiaoming\/rt-thread,hezlog\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,RT-Thread\/rt-thread,nongxiaoming\/rt-thread,geniusgogo\/rt-thread,geniusgogo\/rt-thread,weety\/rt-thread,geniusgogo\/rt-thread,ArdaFu\/rt-thread,weety\/rt-thread,geniusgogo\/rt-thread,ArdaFu\/rt-thread,hezlog\/rt-thread,geniusgogo\/rt-thread,hezlog\/rt-thread,hezlog\/rt-thread,ArdaFu\/rt-thread,weety\/rt-thread,hezlog\/rt-thread,weety\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,weety\/rt-thread,hezlog\/rt-thread,geniusgogo\/rt-thread,RT-Thread\/rt-thread,ArdaFu\/rt-thread,armink\/rt-thread,armink\/rt-thread,RT-Thread\/rt-thread,armink\/rt-thread,ArdaFu\/rt-thread","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- components\/drivers\/include\/drivers\/usb_common.h\n+++ components\/drivers\/include\/drivers\/usb_common.h\n@@ -112,7 +112,7 @@\n #define USB_STRING_CONFIG_INDEX 0x04\n #define USB_STRING_INTERFACE_INDEX 0x05\n #define USB_STRING_OS_INDEX 0x06\n-#define USB_STRING_MAX USB_STRING_OS_INDEX\n+#define USB_STRING_MAX 0xff\n \n #define USB_STRING_OS \"MSFT100A\"\n \n@@ -301,7 +301,7 @@\n rt_uint8_t iConfiguration;\n rt_uint8_t bmAttributes;\n rt_uint8_t MaxPower;\n- rt_uint8_t data[256];\n+ rt_uint8_t data[2048];\n };\n typedef struct uconfig_descriptor* ucfg_desc_t;\n \n"} {"commit":"e82b1677e6eba4495f92886fa339befb3dfd06f4","subject":"Fix other Win32 compilation errors in pmie dstruct.c","message":"Fix other Win32 compilation errors in pmie dstruct.c\n","repos":"ryandoyle\/pcp_original,aeg-aeg\/pcpfans,edwardt\/pcp,adfernandes\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,prasincs\/pcp,prasincs\/pcp,prasincs\/pcp,tjanez\/pcp,wuliming\/pcp,prasincs\/pcp,tjanez\/pcp,edwardt\/pcp,andyvand\/cygpcpfans,ryandoyle\/pcp_original,tjanez\/pcp,aeg-aeg\/pcpfans,edwardt\/pcp,adfernandes\/pcp,wuliming\/pcp,andyvand\/cygpcpfans,andyvand\/cygpcpfans,edwardt\/pcp,tjanez\/pcp,tjanez\/pcp,adfernandes\/pcp,prasincs\/pcp,mbaldessari\/pcp,adfernandes\/pcp,aeg-aeg\/pcpfans,prasincs\/pcp,adfernandes\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,andyvand\/cygpcpfans,mbaldessari\/pcp,edwardt\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,wuliming\/pcp,tjanez\/pcp,mbaldessari\/pcp,ryandoyle\/pcp_original,andyvand\/cygpcpfans,ryandoyle\/pcp_original,ryandoyle\/pcp_original,ryandoyle\/pcp_original,wuliming\/pcp,prasincs\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,aeg-aeg\/pcpfans,prasincs\/pcp,wuliming\/pcp,edwardt\/pcp,wuliming\/pcp,edwardt\/pcp,adfernandes\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,ryandoyle\/pcp_original,ryandoyle\/pcp_original,tjanez\/pcp,aeg-aeg\/pcpfans,mbaldessari\/pcp,edwardt\/pcp,mbaldessari\/pcp,mbaldessari\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pmie\/src\/dstruct.c\n+++ src\/pmie\/src\/dstruct.c\n@@ -18,26 +18,21 @@\n * with this program; if not, write to the Free Software Foundation, Inc.,\n * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n *\/\n-\n-#include <stdio.h>\n-#include <stdlib.h>\n+#include \"pmapi.h\"\n+#include \"impl.h\"\n+#include <math.h>\n #include <ctype.h>\n-#include <syslog.h>\n-#include <sys\/types.h>\n-#include <sys\/param.h>\n+#include <limits.h>\n+#ifdef HAVE_SYS_WAIT_H\n #include <sys\/wait.h>\n-#include <unistd.h>\n-#include <time.h>\n-#include <string.h>\n-#include <limits.h>\n-#include <math.h>\n+#endif\n #include \"dstruct.h\"\n #include \"symbol.h\"\n #include \"pragmatics.h\"\n #include \"fun.h\"\n #include \"eval.h\"\n #include \"show.h\"\n-#include \"impl.h\"\n+\n #if defined(HAVE_VALUES_H)\n #include <values.h>\n #endif\n@@ -200,8 +195,8 @@\n {\n RealTime\tdelay;\t\/* interval to sleep *\/\n int\t\tsts;\n+#ifdef HAVE_WAITPID\n pid_t\tpid;\n-\n \n \/* harvest terminated children *\/\n while ((pid = waitpid(-1, &sts, WNOHANG)) > (pid_t)0) {\n@@ -217,6 +212,7 @@\n #endif\n \t;\n }\n+#endif\n \n if (!archives) {\n \tstruct timespec ts, tleft;\n"} {"commit":"ff92e6a70e7f4d969321a74000350905fe53da18","subject":"Move UIKit import before NS_ASSUME_NONNULL_BEGIN","message":"Move UIKit import before NS_ASSUME_NONNULL_BEGIN\n","repos":"Moblico\/MoblicoSDK-iOS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MoblicoSDK\/MLCMedia.h\n+++ MoblicoSDK\/MLCMedia.h\n@@ -15,11 +15,13 @@\n *\/\n \n #import <MoblicoSDK\/MLCEntity.h>\n+#if TARGET_OS_IOS\n+#import <UIKit\/UIKit.h>\n+#endif\n \n NS_ASSUME_NONNULL_BEGIN\n \n #if TARGET_OS_IOS\n-#import <UIKit\/UIKit.h>\n typedef void(^MLCMediaImageCompletionHandler)(UIImage *_Nullable image, NSError *_Nullable error, BOOL fromCache) NS_SWIFT_NAME(MLCMedia.ImageCompletionHandler);\n #else\n typedef void(^MLCMediaImageCompletionHandler)(NSData *_Nullable data, NSError *_Nullable error, BOOL fromCache) NS_SWIFT_NAME(MLCMedia.ImageCompletionHandler);\n"} {"commit":"af9d401e7c5360cc5acd69ff1898e33d16827853","subject":"Plug memory leak.","message":"Plug memory leak.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/posixmodule.c\n+++ Modules\/posixmodule.c\n@@ -5578,6 +5578,7 @@\n \tPyDict_SetItemString(d, \"error\", PyExc_OSError);\n \n #ifdef HAVE_PUTENV\n-\tposix_putenv_garbage = PyDict_New();\n-#endif\n-}\n+\tif (posix_putenv_garbage == NULL)\n+\t\tposix_putenv_garbage = PyDict_New();\n+#endif\n+}\n"} {"commit":"8debd4ba2186f92dc99bd2a0a2bec1254d955804","subject":"CircularBufferBase: Drop excessive variables","message":"CircularBufferBase: Drop excessive variables\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- stingraykit\/io\/CircularBufferBase.h\n+++ stingraykit\/io\/CircularBufferBase.h\n@@ -143,11 +143,7 @@\n \t\t}\n \n \t\tsize_t GetSize() const\n-\t\t{\n-\t\t\tsize_t total_data_size = (_writeOffset >= _readOffset) ? (_writeOffset - _readOffset)\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t : (GetStorageSize() - _readOffset + _writeOffset);\n-\t\t\treturn total_data_size;\n-\t\t}\n+\t\t{ return (_writeOffset >= _readOffset) ? (_writeOffset - _readOffset) : (GetStorageSize() - _readOffset + _writeOffset); }\n \n \t\tsize_t GetFreeSize() const\n \t\t{ return (_writeOffset >= _readOffset) ? (GetStorageSize() - _writeOffset + _readOffset - 1) : (_readOffset - _writeOffset - 1); }\n@@ -163,20 +159,17 @@\n \t\t\t\ts_logger.Warning() << \"ro: \" << _readOffset << \", wo: \" << _writeOffset << \", ls: \" << _lockedDataSize;\n \t\t\t}\n \n-\t\t\tsize_t resultSize = size;\n-\t\t\tif (_writeOffset >= _readOffset)\n-\t\t\t\tresultSize = std::min(resultSize, _writeOffset - _readOffset);\n-\t\t\telse\n-\t\t\t\tresultSize = std::min(resultSize, GetStorageSize() - _readOffset);\n-\n-\t\t\t_lockedDataSize = resultSize;\n+\t\t\tif (_writeOffset >= _readOffset)\n+\t\t\t\t_lockedDataSize = std::min(size, _writeOffset - _readOffset);\n+\t\t\telse\n+\t\t\t\t_lockedDataSize = std::min(size, GetStorageSize() - _readOffset);\n \n \t\t\tif (_loggingEnabled)\n \t\t\t{\n \t\t\t\ts_logger.Warning() << \"ro: \" << _readOffset << \", wo: \" << _writeOffset << \", ls: \" << _lockedDataSize;\n \t\t\t\ts_logger.Warning() << \"Pop finished\";\n \t\t\t}\n-\t\t\treturn make_shared_ptr<CircularDataReserver>(ReadStorage(_readOffset, resultSize), Bind(&CircularBufferBase::ReleaseData, this, _1));\n+\t\t\treturn make_shared_ptr<CircularDataReserver>(ReadStorage(_readOffset, _lockedDataSize), Bind(&CircularBufferBase::ReleaseData, this, _1));\n \t\t}\n \n \t\tvoid Push(const ConstByteData& data)\n"} {"commit":"9aac1ade12b4832bf2efdff91bdd98c1288bf9d6","subject":"SCardGetStatusChange(): exists if the list of readers changed (one reader added) so that the application can update its list of readers","message":"SCardGetStatusChange(): exists if the list of readers changed (one\nreader added) so that the application can update its list of readers\n\nThanks to Najam Siddiqui for a preliminary patch.\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@1673 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/winscard_clnt.c\n+++ src\/winscard_clnt.c\n@@ -42,6 +42,11 @@\n \n #ifndef min\n #define min(a,b) (((a) < (b)) ? (a) : (b))\n+#endif\n+\n+#ifndef TRUE\n+#define TRUE 1\n+#define FALSE 0\n #endif\n \n \/**\n@@ -1517,6 +1522,7 @@\n \tDWORD dwBreakFlag = 0;\n \tint j;\n \tDWORD dwContextIndex;\n+\tint currentReaderCount = 0;\n \n \tif (rgReaderStates == 0 && cReaders > 0)\n \t\treturn SCARD_E_INVALID_PARAMETER;\n@@ -1632,16 +1638,39 @@\n \n \tpsContextMap[dwContextIndex].contextBlockStatus = BLOCK_STATUS_BLOCKING;\n \n+\t\/* Get the initial reader count on the system *\/\n+\tfor (j=0; j < PCSCLITE_MAX_READERS_CONTEXTS; j++)\n+\t\tif ((readerStates[j])->readerID != 0)\n+\t\t\tcurrentReaderCount++;\n+\n \tj = 0;\n \n \tdo\n \t{\n+\t\tint newReaderCount = 0;\n+\t\tchar ReaderCountChanged = FALSE;\n+\n \t\tif (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)\n \t\t{\n \t\t\tSYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);\t\n \t\t\treturn SCARD_E_NO_SERVICE;\n \t\t}\n \n+\t\tif (j == 0)\n+\t\t{\n+\t\t\tint i;\n+\n+\t\t\tfor (i=0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)\n+\t\t\t\tif ((readerStates[i])->readerID != 0)\n+\t\t\t\t\tnewReaderCount++;\n+\n+\t\t\tif (newReaderCount != currentReaderCount)\n+\t\t\t{\n+\t\t\t\tLog1(PCSC_LOG_INFO, \"Reader list changed\");\n+\t\t\t\tReaderCountChanged = TRUE;\n+\t\t\t\tcurrentReaderCount = newReaderCount;\n+\t\t\t}\n+\t\t}\n \t\tcurrReader = &rgReaderStates[j];\n \n \t\/************ Look for IGNORED readers ****************************\/\n@@ -1905,7 +1934,18 @@\n \t\t *\/\n \t\tj = j + 1;\n \t\tif (j == cReaders)\n+\t\t{\n+\t\t\tif (!dwBreakFlag)\n+\t\t\t{\n+\t\t\t\t\/* break if the reader count changed,\n+\t\t\t\t * so that the calling application can update\n+\t\t\t\t * the reader list\n+\t\t\t\t *\/\n+\t\t\t\tif (ReaderCountChanged)\n+\t\t\t\t\tbreak;\n+\t\t\t}\n \t\t\tj = 0;\n+\t\t}\n \n \t\t\/*\n \t\t * Declare all the break conditions\n"} {"commit":"d8a42e96719e13a91b1c8fae380cc3fb9e27506f","subject":"Move the definition of DO_TRACE, DO_PROFILE, and DO_CHECK_SAME_PROCESS at the top of the file, and add documentation.","message":"Move the definition of DO_TRACE, DO_PROFILE, and DO_CHECK_SAME_PROCESS\nat the top of the file, and add documentation.\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@5589 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/winscard_clnt.c\n+++ src\/winscard_clnt.c\n@@ -106,6 +106,19 @@\n #include \"winscard_msg.h\"\n #include \"utils.h\"\n \n+\/* Display, on stderr, a trace of the WinSCard calls with arguments and\n+ * results *\/\n+#undef DO_TRACE\n+\n+\/* Profile the execution time of WinSCard calls *\/\n+#undef DO_PROFILE\n+\n+\/* Check that handles are not shared between (forked) processes\n+ * This check is disabled since some systems uses the same PID for\n+ * different threads of a same process *\/\n+#undef DO_CHECK_SAME_PROCESS\n+\n+\n \/** used for backward compatibility *\/\n #define SCARD_PROTOCOL_ANY_OLD\t0x1000\n \n@@ -122,7 +135,6 @@\n #define COLOR_MAGENTA \"\\33[35m\"\n #define COLOR_NORMAL \"\\33[0m\"\n \n-#undef DO_TRACE\n #ifdef DO_TRACE\n \n #include <stdio.h>\n@@ -150,7 +162,6 @@\n #define API_TRACE_OUT(...)\n #endif\n \n-#undef DO_PROFILE\n #ifdef DO_PROFILE\n \n #define PROFILE_FILE \"\/tmp\/pcsc_profile\"\n"} {"commit":"357ad26b54af0380c33b3cf3a7e4b93f5aaad4df","subject":"fixed a typo in the mlib:\/\/ code.","message":"fixed a typo in the mlib:\/\/ code.\n\nBK KEY: tru@xmms.org|ChangeSet|20050326234723|48741\n","repos":"oneman\/xmms2-oneman-old,six600110\/xmms2,six600110\/xmms2,theefer\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman,theefer\/xmms2,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,six600110\/xmms2,theefer\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,oneman\/xmms2-oneman-old,krad-radio\/xmms2-krad,dreamerc\/xmms2,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,oneman\/xmms2-oneman-old,theefer\/xmms2,chrippa\/xmms2,chrippa\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,dreamerc\/xmms2,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,oneman\/xmms2-oneman,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,dreamerc\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,chrippa\/xmms2,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2,dreamerc\/xmms2,chrippa\/xmms2,dreamerc\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman-old,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,xmms2\/xmms2-stable,oneman\/xmms2-oneman","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/xmms\/medialib.c\n+++ src\/xmms\/medialib.c\n@@ -213,7 +213,7 @@\n \tg_return_val_if_fail (url, 0);\n \tg_mutex_lock (medialib->mutex);\n \n-\tif (g_strncasecmp (url, \"mlib:\/\/\", 7) == 0) {\n+\tif (g_strncasecmp (url, \"mlib\", 4) == 0) {\n \t\tconst gchar *p = url+9;\n \t\tid = strtol (p, NULL, 10);\n \t\t\/* Hmmm, maybe verify that this entry exists? *\/\n"} {"commit":"afdf1e718f7e6e0a5bc20d85d453e2c19876721c","subject":"Check for magic value in hildon_window_get_active_window()","message":"Check for magic value in hildon_window_get_active_window()\n\nWhen the task switcher is visible, _MB_CURRENT_APP_WINDOW doesn't\ncontain any actual window ID but a magic value instead (0xFFFFFFFF).\n\nhildon_window_get_active_window() must check this special case and\nreturn 'None' when the task switche is visible.\n\nFixes: NB#135750 (Permanent XErrors while switching between windows\nand task switcher)\n","repos":"android-808\/libhildon,android-808\/libhildon,android-808\/libhildon,Cordia\/libhildon,Cordia\/libhildon,Cordia\/libhildon","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hildon\/hildon-window.c\n+++ hildon\/hildon-window.c\n@@ -1062,7 +1062,9 @@\n if (win.win != NULL)\n XFree(win.char_pointer);\n \n- return ret;\n+ \/* 0xFFFFFFFF is not an actual window ID, but a magic value to\n+ * indicate that the task switcher is visible *\/\n+ return (ret != 0xFFFFFFFF) ? ret : None;\n }\n \n static int\n"} {"commit":"e661161f2eaf9ec58b4a2f372cb23a457b1a8ffd","subject":"Simple wrlock test.","message":"Simple wrlock test.\n","repos":"kstephens\/smal,kstephens\/smal,kstephens\/smal","returncode":1,"stderr":"error: pathspec 't\/pthread_rwlock_test.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- t\/pthread_rwlock_test.c\n+++ t\/pthread_rwlock_test.c\n@@ -0,0 +1,55 @@\n+#include <stdlib.h> \/* malloc(), free() *\/\n+#include <pthread.h> \/* pthread_rwlock_* *\/\n+#include <sys\/errno.h> \/* EDEADLK *\/\n+#include <stdio.h> \/* perror() *\/\n+#include <assert.h>\n+\n+#define my_ASSERT(X,E)\t\t\t\t\t\t\t\\\n+ ({\t\t\t\t\t\t\t\t\t\\\n+ int _result = (X);\t\t\t\t\t\t\t\\\n+ fprintf(stderr, \" %s:%d %s = %d\\n\", __FILE__, __LINE__, #X, _result); \\\n+ if ( ! (_result E) ) {\t\t\t\t\t\t\\\n+ fprintf(stderr, \" FAILED: expected %s %s\\n\", #X, #E);\t\t\\\n+ abort();\t\t\t\t\t\t\t\t\\\n+ }\t\t\t\t\t\t\t\t\t\\\n+ _result;\t\t\t\t\t\t\t\t\\\n+ })\n+\n+int main(int argc, char **argv)\n+{\n+ pthread_rwlock_t lock_1, lock_2;\n+\n+ my_ASSERT(pthread_rwlock_init(&lock_1, 0), == 0);\n+ my_ASSERT(pthread_rwlock_init(&lock_2, 0), == 0);\n+\n+ {\n+ my_ASSERT(pthread_rwlock_rdlock(&lock_1), == 0);\n+ \n+ \/* rdlock() is reentrant. *\/\n+ {\n+ my_ASSERT(pthread_rwlock_rdlock(&lock_1), == 0);\n+ \n+ my_ASSERT(pthread_rwlock_unlock(&lock_1), == 0);\n+ }\n+\n+ my_ASSERT(pthread_rwlock_unlock(&lock_1), == 0);\n+ }\n+\n+ {\n+ my_ASSERT(pthread_rwlock_wrlock(&lock_1), == 0);\n+ \n+ \/* wrlock() is not reentrant. *\/\n+ {\n+ my_ASSERT(pthread_rwlock_wrlock(&lock_1), == EDEADLK);\n+ \n+ \/\/ my_ASSERT(pthread_rwlock_unlock(&lock_1), == 0);\n+ }\n+\n+ my_ASSERT(pthread_rwlock_unlock(&lock_1), == 0);\n+ }\n+\n+ my_ASSERT(pthread_rwlock_destroy(&lock_1), == 0);\n+ my_ASSERT(pthread_rwlock_destroy(&lock_2), == 0);\n+\n+ return 0;\n+}\n"} {"commit":"337e4ecefb338202c440480e8bcec877a8fae8f5","subject":"Replaced substitution macro for trace() function by two empy functions for C89 compliance","message":"Replaced substitution macro for trace() function by two empy functions for C89 compliance\n","repos":"zevv\/zForth","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/zforth\/zforth.c\n+++ src\/zforth\/zforth.c\n@@ -142,7 +142,8 @@\n }\n \n #else\n-#define trace(...) {}\n+static void trace(const char *fmt, ...) { }\n+static const char *op_name(zf_addr addr) { return NULL; }\n #endif\n \n \n"} {"commit":"d2965852e2d38a50a167f4c598891c914230fdf0","subject":"[libu] same as last ci","message":"[libu] same as last ci\n","repos":"xunmengfeng\/libu,koanlogic\/libu,koanlogic\/libu,xunmengfeng\/libu","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- srcs\/toolbox\/misc.c\n+++ srcs\/toolbox\/misc.c\n@@ -723,12 +723,13 @@\n \n tmp = strtol(nptr, &endptr, 10);\n \n- \/* chech if no valid digits where supplied:\n- * glibc does not handle this as an explicit error *\/\n- dbg_err_ifm (nptr == endptr, \"no digits here\");\n- \n dbg_err_sif (tmp == 0 && errno == EINVAL);\n dbg_err_sif ((tmp == LONG_MIN || tmp == LONG_MAX) && errno == ERANGE);\n+\n+ \/* check if no valid digit string was supplied\n+ * glibc does not handle this as an explicit error (would return\n+ * 0 with errno unset) *\/\n+ dbg_err_ifm (nptr == endptr, \"invalid base10 string: %s\", nptr);\n \n \/* check overflows\/underflows when int bits are less than long bits *\/\n #if (INT_MAX < LONG_MAX) \n"} {"commit":"91034033084ecad735b314e510ef76184c16fe79","subject":"net: lwm2m: support NET_SOCKETS_OFFLOAD in peer parsing","message":"net: lwm2m: support NET_SOCKETS_OFFLOAD in peer parsing\n\nThe LwM2M implementation for DNS resolving has checks which\nconfigure hints based on whether IPv4 or IPv6 are enabled.\nNeither of them need enabled if using NET_SOCKETS_OFFLOAD,\nwhich then causes an error to be returned to due to\n\"hints.ai_family\" not being set.\n\nAlso the offload API need to know when to free the allocated\n\"struct addrinfo\" instead of calling free() generically,\nthus let's use the freeaddrinfo() API for sockets which will\ncall into the offload API if needed.\n\nFixes: https:\/\/github.com\/zephyrproject-rtos\/zephyr\/issues\/18765\n\nSigned-off-by: Jun Qing Zou <6a09ad00515025ead13bd7a988225550d3a12ca0@nordicsemi.no>\n","repos":"nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,finikorg\/zephyr,nashif\/zephyr,finikorg\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,galak\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,nashif\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/net\/lib\/lwm2m\/lwm2m_engine.c\n+++ subsys\/net\/lib\/lwm2m\/lwm2m_engine.c\n@@ -4209,6 +4209,8 @@\n \tu16_t off, len;\n \tu8_t tmp;\n \n+\tLOG_DBG(\"Parse url: %s\", log_strdup(url));\n+\n \thttp_parser_url_init(&parser);\n \tret = http_parser_parse_url(url, strlen(url), 0, &parser);\n \tif (ret < 0) {\n@@ -4267,6 +4269,9 @@\n #elif defined(CONFIG_NET_IPV6)\n \t\thints.ai_family = AF_INET6;\n #elif defined(CONFIG_NET_IPV4)\n+\t\thints.ai_family = AF_INET;\n+#elif defined(CONFIG_NET_SOCKETS_OFFLOAD)\n+\t\tmemset(&hints, 0, sizeof(hints));\n \t\thints.ai_family = AF_INET;\n #else\n \t\thints.ai_family = AF_UNSPEC;\n@@ -4282,7 +4287,7 @@\n \n \t\tmemcpy(addr, res->ai_addr, sizeof(*addr));\n \t\taddr->sa_family = res->ai_family;\n-\t\tfree(res);\n+\t\tfreeaddrinfo(res);\n #else\n \t\tgoto cleanup;\n #endif \/* CONFIG_DNS_RESOLVER *\/\n"} {"commit":"cb93943e54097f6fc6701850dae33665160b2f12","subject":"Split out a helper function. No functional change.","message":"Split out a helper function. No functional change.\n\n* subversion\/libsvn_fs_fs\/rep-cache.c\n (svn_fs_fs__get_rep_reference): Move code to a new helper function.\n (rep_has_been_born): New helper function.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1146153 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/rep-cache.c\n+++ subversion\/libsvn_fs_fs\/rep-cache.c\n@@ -39,6 +39,44 @@\n REP_CACHE_DB_SQL_DECLARE_STATEMENTS(statements);\n \n \n+\f+\n+\/** Helper functions. **\/\n+\n+\n+\/* Check that REP refers to a revision that exists in FS. *\/\n+static svn_error_t *\n+rep_has_been_born(representation_t *rep,\n+ svn_fs_t *fs,\n+ apr_pool_t *pool)\n+{\n+ fs_fs_data_t *ffd = fs->fsap_data;\n+ svn_revnum_t youngest;\n+\n+ SVN_ERR_ASSERT(rep);\n+\n+ youngest = ffd->youngest_rev_cache;\n+ if (youngest < rep->revision)\n+ {\n+ \/* Stale cache. *\/\n+ SVN_ERR(svn_fs_fs__youngest_rev(&youngest, fs, pool));\n+\n+ \/* Fresh cache. *\/\n+ if (youngest < rep->revision)\n+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,\n+ _(\"Youngest revision is r%ld, but \"\n+ \"rep-cache contains r%ld\"),\n+ youngest, rep->revision);\n+ }\n+\n+ return SVN_NO_ERROR;\n+}\n+\n+\n+\f+\n+\/** Library-private API's. **\/\n+\n \/* Body of svn_fs_fs__open_rep_cache().\n Implements svn_atomic__init_once().init_func.\n *\/\n@@ -121,25 +159,8 @@\n else\n *rep = NULL;\n \n- \/* Sanity check. *\/\n if (*rep)\n- {\n- svn_revnum_t youngest;\n-\n- youngest = ffd->youngest_rev_cache;\n- if (youngest < (*rep)->revision)\n- {\n- \/* Stale cache. *\/\n- SVN_ERR(svn_fs_fs__youngest_rev(&youngest, fs, pool));\n-\n- \/* Fresh cache. *\/\n- if (youngest < (*rep)->revision)\n- return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,\n- _(\"Youngest revision is r%ld, but \"\n- \"rep-cache contains r%ld\"),\n- youngest, (*rep)->revision);\n- }\n- }\n+ SVN_ERR(rep_has_been_born(*rep, fs, pool));\n \n return svn_sqlite__reset(stmt);\n }\n"} {"commit":"7c65379a78874d4cee4587f5bb71cf2546620c81","subject":"Parsing strings in C - Great Fun since 1972!","message":"Parsing strings in C - Great Fun since 1972!\n\nFix a segfault reported by Jens Seidel in:\n\n Date: Sun, 16 Nov 2008 17:53:20 +0100\n From: Jens Seidel <jensseidel@users.sf.net>\n To: dev@subversion.tigris.org\n Message-ID: <20081116165320.GA3562@merkur.sol.de>\n Subject: Re: Segfault during \"svn info\"\n http:\/\/subversion.tigris.org\/servlets\/ReadMsg?list=dev&msgNo=145419\n\n* subversion\/libsvn_subr\/dirent_uri.c\n (svn_uri_is_canonical): Do not blindly assume that supplied\n uri's hostname part contains a slash. We were running over\n the terminating null if it didn't.\n Also, put a block of windows-specific code which assumes\n that a character pointer points to a slash into an if\n statement which checks for this.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/dirent_uri.c\n+++ subversion\/libsvn_subr\/dirent_uri.c\n@@ -1029,7 +1029,7 @@\n \n \/* Found a hostname, check that it's all lowercase. *\/\n ptr = seg;\n- while (*ptr != '\/')\n+ while (*ptr && *ptr != '\/')\n {\n if (*ptr >= 'A' && *ptr <= 'Z')\n return FALSE;\n@@ -1039,13 +1039,16 @@\n }\n \n #if defined(WIN32) || defined(__CYGWIN__)\n- \/* If this is a file url, ptr now points to the third '\/' in\n- file:\/\/\/C:\/path. Check that if we have such a URL the drive\n- letter is in uppercase. *\/\n- if (strncmp(uri, \"file:\", 5) == 0 &&\n- ! (*(ptr+1) >= 'A' && *(ptr+1) <= 'Z') &&\n- *(ptr+2) == ':')\n- return FALSE;\n+ if (*ptr == '\/')\n+ {\n+ \/* If this is a file url, ptr now points to the third '\/' in\n+ file:\/\/\/C:\/path. Check that if we have such a URL the drive\n+ letter is in uppercase. *\/\n+ if (strncmp(uri, \"file:\", 5) == 0 &&\n+ ! (*(ptr+1) >= 'A' && *(ptr+1) <= 'Z') &&\n+ *(ptr+2) == ':')\n+ return FALSE;\n+ }\n #endif \/* WIN32 or Cygwin *\/\n \n \/* Now validate the rest of the URI. *\/\n"} {"commit":"3ac48ebb9eeef50f7597d61edc9c5f5e3d351595","subject":"typo","message":"typo\n\n\n","repos":"opendnssec\/opendnssec-svn,opendnssec\/opendnssec-svn,opendnssec\/opendnssec-svn,opendnssec\/opendnssec-svn","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- signer\/src\/signer\/zonedata.c\n+++ signer\/src\/signer\/zonedata.c\n@@ -1260,7 +1260,7 @@\n \n if (ods_strcmp(sc->soa_serial, \"unixtime\") == 0) {\n soa = (uint32_t) time_now();\n- if (zd->intialized && !DNS_SERIAL_GT(soa, prev)) {\n+ if (zd->initialized && !DNS_SERIAL_GT(soa, prev)) {\n soa = prev + 1;\n }\n } else if (strncmp(sc->soa_serial, \"counter\", 7) == 0) {\n"} {"commit":"2ec7740c3a4661c2b0c05278a6f756c291547647","subject":"suppress gcc complaint","message":"suppress gcc complaint\n","repos":"jinguoli\/hiredis,redis\/hiredis,jinguoli\/hiredis,redis\/hiredis,charsyam\/hiredis,jinguoli\/hiredis,thomaslee\/hiredis,thomaslee\/hiredis,redis\/hiredis,charsyam\/hiredis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hiredis.h\n+++ hiredis.h\n@@ -99,7 +99,7 @@\n * need to copy the result into our private buffer. *\/ \\\n if (err_str != (buf)) { \\\n strncpy((buf), err_str, ((len) - 1)); \\\n- buf[(len)-1] = '\\0'; \\\n+ (buf)[(len)-1] = '\\0'; \\\n } \\\n } while (0)\n #endif\n"} {"commit":"9834a2894635e97823658e6a0f29393c783f7b3f","subject":"Specialize case for averaging the two median values for an even number of sketches.","message":"Specialize case for averaging the two median values for an even number of sketches.\n","repos":"dnbh\/hll,dnbh\/hll","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hll_dev.h\n+++ hll_dev.h\n@@ -267,7 +267,7 @@\n }\n if(size() < 32) {\n std::sort(std::begin(values), std::end(values));\n- return values[size() >> 1];\n+ return .5 * (values[size() >> 1] + values[(size() >> 1) - 1]);\n }\n std::nth_element(std::begin(values), std::begin(values) + (size() >> 1) - 1, std::end(values));\n return .5 * (values[(values.size() >> 1) - 1] + *std::min_element(std::cbegin(values) + (size() >> 1), std::end(values)));\n"} {"commit":"e2776af8fe91dec685980fd5ef75736be9d6402d","subject":"add timestamp","message":"add timestamp\n","repos":"verybadsoldier\/hmcfgusb,verybadsoldier\/hmcfgusb,verybadsoldier\/hmcfgusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hmsniff.c\n+++ hmsniff.c\n@@ -29,10 +29,7 @@\n #include <strings.h>\n #include <poll.h>\n #include <errno.h>\n-#include <sys\/types.h>\n-#include <sys\/socket.h>\n-#include <netinet\/in.h>\n-#include <arpa\/inet.h>\n+#include <sys\/time.h>\n #include <libusb-1.0\/libusb.h>\n \n #include \"hexdump.h\"\n@@ -95,7 +92,16 @@\n \n static void dissect_hm(uint8_t *buf, int len)\n {\n+\tstruct timeval tv;\n+\tstruct tm *tmp;\n+\tchar ts[32];\n \tint i;\n+\n+\tgettimeofday(&tv, NULL);\n+\ttmp = localtime(&tv.tv_sec);\n+\tmemset(ts, 0, sizeof(ts));\n+\tstrftime(ts, sizeof(ts)-1, \"%Y-%m-%d %H:%M:%S\", tmp);\n+\tprintf(\"%s.%06ld: \", ts, tv.tv_usec);\n \n \tfor (i = 0; i < len; i++) {\n \t\tprintf(\"%02X\", buf[i]);\n"} {"commit":"210ed0f81cdd95ceb1ed260e7d185338bc9bd403","subject":"nothing to say","message":"nothing to say\n","repos":"yl3dy\/amber,yl3dy\/amber","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hostadd.c\n+++ hostadd.c\n@@ -1 +1 @@\n-#include \"hostadd.c\"\n+#include \"hostadd.h\"\n"} {"commit":"50290a2c0cfd060355f0c053d5d9270db02eacd3","subject":"Fix STRIP=on.","message":"Fix STRIP=on.","repos":"rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit,tectronics\/relic-toolkit,rajeevakarv\/relic-toolkit,rajeevakarv\/relic-toolkit,tectronics\/relic-toolkit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fpx\/relic_fp12_sqr.c\n+++ src\/fpx\/relic_fp12_sqr.c\n@@ -142,6 +142,8 @@\n \t}\n }\n \n+#if PP_EXT == LAZYR || !defined(STRIP)\n+\n void fp12_sqr2(fp12_t c, fp12_t a) {\n \tfp2_t t0, t1, t2, t3, t4, t5, t6, t7, t8, t9;\n \tdv2_t u0, u1, u2, u3, u4, u5, u6, u7, u8, u9;\n@@ -248,6 +250,8 @@\n \t}\n }\n \n+#endif\n+\n #if PP_EXT == BASIC || !defined(STRIP)\n \n void fp12_sqr_cyc_basic(fp12_t c, fp12_t a) {\n"} {"commit":"b5c79bf146903adc7cc1bf91ef24b741c0e85919","subject":"Fix #160","message":"Fix #160\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -1736,13 +1736,14 @@\n is_running_ = true;\n \n for (;;) {\n+ if (svr_sock_ == INVALID_SOCKET) {\n+ \/\/ The server socket was closed by 'stop' method.\n+ break;\n+ }\n+\n auto val = detail::select_read(svr_sock_, 0, 100000);\n \n if (val == 0) { \/\/ Timeout\n- if (svr_sock_ == INVALID_SOCKET) {\n- \/\/ The server socket was closed by 'stop' method.\n- break;\n- }\n continue;\n }\n \n"} {"commit":"0d96d56298d5a918f60babbf5ae26a8a74e8183d","subject":"phb4: Use the return value of phb4_fenced() in phb4_get_diag_data()","message":"phb4: Use the return value of phb4_fenced() in phb4_get_diag_data()\n\nphb4_get_diag_data() checks the flags for the PHB4_AIB_FENCED after\nhaving called phb4_fenced(). This information is returned by\nphb4_fenced().\n\nThis patch was prompted by an unused return value warning in Coverity.\n\nFixes: CID 163734\nSigned-off-by: Cyril Bur <6ce38dade8c4b52fd55c193fae70fd1d1275c3c3@au1.ibm.com>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.ibm.com>\n","repos":"stewart-ibm\/skiboot,shenki\/skiboot,legoater\/skiboot,shenki\/skiboot,qemu\/skiboot,shenki\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,legoater\/skiboot,legoater\/skiboot,open-power\/skiboot,legoater\/skiboot,legoater\/skiboot,qemu\/skiboot,shenki\/skiboot,stewart-ibm\/skiboot,open-power\/skiboot,shenki\/skiboot,open-power\/skiboot,open-power\/skiboot,qemu\/skiboot,open-power\/skiboot,qemu\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb4.c\n+++ hw\/phb4.c\n@@ -3755,6 +3755,7 @@\n \t\t\t\t void *diag_buffer,\n \t\t\t\t uint64_t diag_buffer_len)\n {\n+\tbool fenced;\n \tstruct phb4 *p = phb_to_phb4(phb);\n \tstruct OpalIoPhb4ErrorData *data = diag_buffer;\n \n@@ -3767,10 +3768,10 @@\n \t * Dummy check for fence so that phb4_read_phb_status knows\n \t * whether to use ASB or AIB\n \t *\/\n-\tphb4_fenced(p);\n+\tfenced = phb4_fenced(p);\n \tphb4_read_phb_status(p, data);\n \n-\tif (!(p->flags & PHB4_AIB_FENCED))\n+\tif (!fenced)\n \t\tphb4_eeh_dump_regs(p);\n \n \t\/*\n"} {"commit":"edb34a33c9638417c37d5af352712c46317434ef","subject":"Remove connp_is_private, because it is not needed.","message":"Remove connp_is_private, because it is not needed.","repos":"montekki\/libhtp,montekki\/libhtp,wxsBSD\/libhtp,wxsBSD\/libhtp,montekki\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,glongo\/libhtp,montekki\/libhtp,OISF\/libhtp,wxsBSD\/libhtp,glongo\/libhtp,glongo\/libhtp,OISF\/libhtp,montekki\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,glongo\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,OISF\/libhtp,glongo\/libhtp,montekki\/libhtp,glongo\/libhtp,wxsBSD\/libhtp,glongo\/libhtp,montekki\/libhtp,OISF\/libhtp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- htp\/htp.h\n+++ htp\/htp.h\n@@ -860,8 +860,6 @@\n \/** The connection parsed associated with this transaction. *\/\n htp_connp_t *connp;\n \n- int connp_is_private;\n-\n \/** The connection to which this transaction belongs. *\/\n htp_conn_t *conn;\n \n"} {"commit":"3dff60eb16d1ae374d7730111152eb114791b030","subject":"Fix #565","message":"Fix #565\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -1753,7 +1753,7 @@\n pfd_read.fd = sock;\n pfd_read.events = POLLOUT;\n \n- auto timeout = static_cast<int>(sec * 1000 + usec \/ 1000);\n+ auto timeout = static_cast<int>(sec * 1000 + usec);\n \n return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); });\n #else\n"} {"commit":"d43574a62107dd1c28ced76de2f0998cfc6ca748","subject":"Added missing windows plugin exports.","message":"Added missing windows plugin exports.\n\ngit-svn-id: f4e1a40f847802203273bde8e26df4d11611876a@3423 44470bb9-56e9-0310-a0f8-c586564d3dc6\n","repos":"lynxis\/libavg,pararthshah\/libavg-vaapi,pararthshah\/libavg-vaapi,lynxis\/libavg,pararthshah\/libavg-vaapi,pararthshah\/libavg-vaapi,lynxis\/libavg,lynxis\/libavg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/graphics\/OGLHelper.h\n+++ src\/graphics\/OGLHelper.h\n@@ -48,14 +48,14 @@\n \n namespace avg {\n \n-void OGLErrorCheck(int avgcode, const char * where);\n+void AVG_API OGLErrorCheck(int avgcode, const char * where);\n #ifdef _WIN32\n-void winOGLErrorCheck(BOOL bOK, const std::string & where);\n+void AVG_API winOGLErrorCheck(BOOL bOK, const std::string & where);\n #endif\n-bool queryOGLExtension(const char *extName);\n-bool queryGLXExtension(const char *extName);\n-void getGLVersion(int & major, int& minor);\n-void getGLShadingLanguageVersion(int & major, int& minor);\n+bool AVG_API queryOGLExtension(const char *extName);\n+bool AVG_API queryGLXExtension(const char *extName);\n+void AVG_API getGLVersion(int & major, int& minor);\n+void AVG_API getGLShadingLanguageVersion(int & major, int& minor);\n \n enum OGLMemoryMode { \n OGL, \/\/ Standard OpenGL\n@@ -63,7 +63,7 @@\n };\n \n typedef void (*GLfunction)();\n-GLfunction getFuzzyProcAddress(const char * psz);\n+GLfunction AVG_API getFuzzyProcAddress(const char * psz);\n \n namespace glproc {\n extern AVG_API PFNGLGENBUFFERSPROC GenBuffers;\n"} {"commit":"69e75f4a6714904f2852832896c887aabba71b44","subject":"Fix #635. HTTPS request stucked with proxy (#637)","message":"Fix #635. HTTPS request stucked with proxy (#637)\n\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -384,6 +384,7 @@\n struct Response {\n std::string version;\n int status = -1;\n+ std::string reason;\n Headers headers;\n std::string body;\n \n@@ -4621,12 +4622,13 @@\n \n if (!line_reader.getline()) { return false; }\n \n- const static std::regex re(\"(HTTP\/1\\\\.[01]) (\\\\d+).*?\\r\\n\");\n+ const static std::regex re(\"(HTTP\/1\\\\.[01]) (\\\\d+) (.*?)\\r\\n\");\n \n std::cmatch m;\n if (std::regex_match(line_reader.ptr(), m, re)) {\n res.version = std::string(m[1]);\n res.status = std::stoi(std::string(m[2]));\n+ res.reason = std::string(m[3]);\n }\n \n return true;\n@@ -5035,7 +5037,7 @@\n }\n \n if (res.get_header_value(\"Connection\") == \"close\" ||\n- res.version == \"HTTP\/1.0\") {\n+ (res.version == \"HTTP\/1.0\" && res.reason != \"Connection established\")) {\n stop_core();\n }\n \n"} {"commit":"6c07050bdf9f48456a4a72017d7fe6f27f21063c","subject":"Fixes an uninitialized field in class OsStackTraceGetter.","message":"Fixes an uninitialized field in class OsStackTraceGetter.\n","repos":"opensourceDA\/googletest,opensourceDA\/googletest,opensourceDA\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/gtest-internal-inl.h\n+++ src\/gtest-internal-inl.h\n@@ -606,7 +606,7 @@\n \/\/ A working implementation of the OsStackTraceGetterInterface interface.\n class OsStackTraceGetter : public OsStackTraceGetterInterface {\n public:\n- OsStackTraceGetter() {}\n+ OsStackTraceGetter() : caller_frame_(NULL) {}\n virtual String CurrentStackTrace(int max_depth, int skip_count);\n virtual void UponLeavingGTest();\n \n"} {"commit":"767ed02280b4393c69f27106df5a849d6d7793bf","subject":"Added WSInit class to initialize WinSock2.","message":"Added WSInit class to initialize WinSock2.\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -87,7 +87,6 @@\n typedef std::function<void (const Request&, const Response&)> Logger;\n \n Server();\n- ~Server();\n \n void get(const char* pattern, Handler handler);\n void post(const char* pattern, Handler handler);\n@@ -116,7 +115,6 @@\n class Client {\n public:\n Client(const char* host, int port);\n- ~Client();\n \n std::shared_ptr<Response> get(const char* url);\n std::shared_ptr<Response> head(const char* url);\n@@ -504,6 +502,22 @@\n });\n }\n \n+#ifdef _WIN32\n+class WSInit {\n+public:\n+ WSInit::WSInit() {\n+ WSADATA wsaData;\n+ WSAStartup(0x0002, &wsaData);\n+ }\n+\n+ WSInit::~WSInit() {\n+ WSACleanup();\n+ }\n+};\n+\n+static WSInit wsinit_;\n+#endif\n+\n } \/\/ namespace detail\n \n \/\/ Request implementation\n@@ -559,17 +573,6 @@\n inline Server::Server()\n : svr_sock_(-1)\n {\n-#ifdef _WIN32\n- WSADATA wsaData;\n- WSAStartup(0x0002, &wsaData);\n-#endif\n-}\n-\n-inline Server::~Server()\n-{\n-#ifdef _WIN32\n- WSACleanup();\n-#endif\n }\n \n inline void Server::get(const char* pattern, Handler handler)\n@@ -730,17 +733,6 @@\n : host_(host)\n , port_(port)\n {\n-#ifdef _WIN32\n- WSADATA wsaData;\n- WSAStartup(0x0002, &wsaData);\n-#endif\n-}\n-\n-inline Client::~Client()\n-{\n-#ifdef _WIN32\n- WSACleanup();\n-#endif\n }\n \n inline bool Client::read_response_line(FILE* fp, Response& res)\n"} {"commit":"0ce7482fb650f3b2ffd52bbfb1546cdd8aa9117c","subject":"npu2: Add performance tuning SCOM inits","message":"npu2: Add performance tuning SCOM inits\n\nPeer-to-peer GPU bandwidth latency testing has produced some tunable\nvalues that improve performance. Add them to our device initialization.\n\nFile these under things that need to be cleaned up with nice #defines\nfor the register names and bitfields when we get time.\n\nA few of the settings are dependent on the system's particular NVLink\ntopology, so introduce a helper to determine how many links go to a\nsingle GPU.\n\nSigned-off-by: Reza Arbab <4c896a97e6b998365c2d50a267b0f1ca5f7995de@linux.vnet.ibm.com>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.vnet.ibm.com>\n","repos":"stewart-ibm\/skiboot,legoater\/skiboot,qemu\/skiboot,shenki\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,legoater\/skiboot,qemu\/skiboot,qemu\/skiboot,legoater\/skiboot,open-power\/skiboot,open-power\/skiboot,open-power\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,open-power\/skiboot,legoater\/skiboot,qemu\/skiboot,shenki\/skiboot,shenki\/skiboot,shenki\/skiboot,open-power\/skiboot,qemu\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/npu2.c\n+++ hw\/npu2.c\n@@ -683,9 +683,73 @@\n \treturn 0;\n }\n \n+static int npu2_links_per_gpu(struct phb *phb,\n+\t\t\t struct pci_device *pd,\n+\t\t\t void *data)\n+{\n+\tstruct npu2 *p = phb_to_npu2_nvlink(phb);\n+\tstruct npu2_dev *dev;\n+\tint *nlinks = (int *)data;\n+\n+\tdev = npu2_bdf_to_dev(p, pd->bdfn);\n+\tassert(dev);\n+\n+\tif (dev->nvlink.phb && dev->nvlink.pd && dev->nvlink.pd->dn) {\n+\t\tconst struct dt_property *prop;\n+\t\tint n;\n+\n+\t\t\/* The link count is the number of phandles in \"ibm,npu\" *\/\n+\t\tprop = dt_find_property(dev->nvlink.pd->dn, \"ibm,npu\");\n+\t\tif (!prop)\n+\t\t\treturn 0;\n+\n+\t\t\/* Count could vary by gpu, so find the max *\/\n+\t\tn = prop->len \/ sizeof(uint32_t);\n+\t\tif (n > *nlinks)\n+\t\t\t*nlinks = n;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void npu2_phb_fixup_scominit(struct dt_node *dn, int links_per_gpu)\n+{\n+\tuint32_t gcid = dt_get_chip_id(dn);\n+\tuint64_t val, mask;\n+\n+\t\/*\n+\t * MRBSP settings for 2- and 3-link GPU systems. These can improve\n+\t * GPU peer-to-peer fully ordered write performance.\n+\t *\/\n+\tif (links_per_gpu == 3) {\n+\t\tval = PPC_BIT(30) | PPC_BIT(34) | PPC_BIT(36) | PPC_BIT(37) |\n+\t\t PPC_BIT(44) | PPC_BIT(45);\n+\t\tmask = PPC_BITMASK(28,39) | PPC_BITMASK(44,47);\n+\t} else if (links_per_gpu == 2) {\n+\t\tval = PPC_BIT(46) | PPC_BIT(47);\n+\t\tmask = PPC_BITMASK(44,47);\n+\t} else\n+\t\treturn;\n+\n+\txscom_write_mask(gcid, 0x50110c0, val, mask);\n+\txscom_write_mask(gcid, 0x50112c0, val, mask);\n+\txscom_write_mask(gcid, 0x50114c0, val, mask);\n+}\n+\n static void npu2_phb_final_fixup(struct phb *phb)\n {\n+\tint links_per_gpu = 0;\n+\tstruct dt_node *np;\n+\n \tpci_walk_dev(phb, NULL, npu2_dn_fixup, NULL);\n+\n+\t\/*\n+\t * Now that the emulated devices are bound to the real ones, we can\n+\t * determine links_per_gpu and do some final init.\n+\t *\/\n+\tpci_walk_dev(phb, NULL, npu2_links_per_gpu, &links_per_gpu);\n+\tdt_for_each_compatible(dt_root, np, \"ibm,power9-npu\")\n+\t\tnpu2_phb_fixup_scominit(np, links_per_gpu);\n }\n \n static void npu2_init_ioda_cache(struct npu2 *p)\n@@ -1275,7 +1339,7 @@\n \tstruct proc_chip *proc_chip;\n \tstruct dt_node *np;\n \tuint32_t gcid, scom, index, phb_index, links;\n-\tuint64_t reg[2], mm_win[2];\n+\tuint64_t reg[2], mm_win[2], val;\n \tchar *path;\n \n \t\/* Abort if any OpenCAPI links detected *\/\n@@ -1330,6 +1394,37 @@\n \txscom_write_mask(gcid, 0x5011330, PPC_BIT(0), PPC_BIT(0));\n \txscom_write_mask(gcid, 0x5011510, PPC_BIT(0), PPC_BIT(0));\n \txscom_write_mask(gcid, 0x5011530, PPC_BIT(0), PPC_BIT(0));\n+\n+\t\/*\n+\t * Enable relaxed ordering for peer-to-peer reads\n+\t *\/\n+\tval = PPC_BIT(5) | PPC_BIT(29);\n+\txscom_write_mask(gcid, 0x501100c, val, val);\n+\txscom_write_mask(gcid, 0x501103c, val, val);\n+\txscom_write_mask(gcid, 0x501106c, val, val);\n+\txscom_write_mask(gcid, 0x501109c, val, val);\n+\txscom_write_mask(gcid, 0x501120c, val, val);\n+\txscom_write_mask(gcid, 0x501123c, val, val);\n+\txscom_write_mask(gcid, 0x501126c, val, val);\n+\txscom_write_mask(gcid, 0x501129c, val, val);\n+\txscom_write_mask(gcid, 0x501140c, val, val);\n+\txscom_write_mask(gcid, 0x501143c, val, val);\n+\txscom_write_mask(gcid, 0x501146c, val, val);\n+\txscom_write_mask(gcid, 0x501149c, val, val);\n+\n+\tval = PPC_BIT(6) | PPC_BIT(7) | PPC_BIT(11);\n+\txscom_write_mask(gcid, 0x5011009, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011039, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011069, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011099, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011209, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011239, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011269, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011299, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011409, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011439, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011469, val, PPC_BITMASK(6,11));\n+\txscom_write_mask(gcid, 0x5011499, val, PPC_BITMASK(6,11));\n \n \tindex = dt_prop_get_u32(dn, \"ibm,npu-index\");\n \tphb_index = dt_prop_get_u32(dn, \"ibm,phb-index\");\n"} {"commit":"8e838b6d5919a3049abdfd99c9ef06fb53546952","subject":"Added size & reset virtuals","message":"Added size & reset virtuals\n","repos":"GatorQue\/etl,ETLCPP\/etl,GatorQue\/etl,GatorQue\/etl,ETLCPP\/etl,venkatarajasekhar\/etl,ETLCPP\/etl,venkatarajasekhar\/etl,venkatarajasekhar\/etl,ETLCPP\/etl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ibitset.h\n+++ ibitset.h\n@@ -54,6 +54,11 @@\n }\n \n \/\/*************************************************************************\n+ \/\/\/ The size of the bitset.\n+ \/\/*************************************************************************\n+ virtual size_t size() const = 0;\n+\n+ \/\/*************************************************************************\n \/\/\/ Check the bit at the position.\n \/\/*************************************************************************\n virtual bool test(size_t position) const = 0;\n@@ -67,6 +72,11 @@\n \/\/\/ Reset the bit at the position.\n \/\/*************************************************************************\n virtual ibitset& reset(size_t position) = 0;\n+\n+ \/\/*************************************************************************\n+ \/\/\/ Reset all the bits.\n+ \/\/*************************************************************************\n+ virtual ibitset& reset() = 0;\n \n \/\/*************************************************************************\n \/\/\/ Finds the first bit in the specified state.\n"} {"commit":"80a01174802dd95a543e116b8cf66ae639674c47","subject":"cpp: #if <undefined> example","message":"cpp: #if <undefined> example\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":1,"stderr":"error: pathspec 'if_elif.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- if_elif.c\n+++ if_elif.c\n@@ -0,0 +1,5 @@\n+#if undefined_word\n+never see me\n+#else\n+hi\n+#endif\n"} {"commit":"8b45545473b0ac5b5ae23af12b872339e0848db6","subject":"output more info","message":"output more info\n","repos":"kern-lab\/im_clam","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- im_clam.c\n+++ im_clam.c\n@@ -354,6 +354,7 @@\n \t\tmaximizeLikNLOpt(&lik, currentParams, mle);\n \t\tfi = getFisherInfoMatrix(mle, lik, currentParams);\t\n \t\tif(rank == 0){\n+\t\t\tprintf(\"for scaling:\\nu: %lf gen: %lf N0:%lf\\n\",u,gen,N0);\n \t\t\tprintf(\"Composite Likelihood estimates of IM params (scaled by 1\/theta_pop1):\\n\");\n \t\t\tprintf(\"theta_pop2\\ttheta_anc\\tmig_1->2\\tmig_2->1\\tt_div\\n\");\n \t\t\tfor(i=0;i<5;i++)printf(\"%f\\t\",(float)mle[i]);\n"} {"commit":"b774a2290e08c3f8c8bcb93618eee12f2cefe498","subject":"Version 0.9.3b","message":"Version 0.9.3b\n","repos":"Wohlstand\/imf2mid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- imf2mid.h\n+++ imf2mid.h\n@@ -26,7 +26,7 @@\n #ifndef CONVERTER_H\n #define CONVERTER_H\n \n-#define IMF2MID_VERSION \"0.9.1b\"\n+#define IMF2MID_VERSION \"0.9.3b\"\n \n #if defined(MSDOS) || defined(__MSDOS__) || defined(_MSDOS) || defined(__DOS__)\n typedef unsigned char uint8_t;\n"} {"commit":"c91a7390dc94cc2e7cbb105cc8f98e27c2c5613f","subject":"Removed tabs","message":"Removed tabs\n","repos":"escortkeel\/k-os,escortkeel\/k-os,escortkeel\/k-os","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- inc\/elf.h\n+++ inc\/elf.h\n@@ -2,7 +2,7 @@\n #define KERNEL_ELF_H\n \n #include \"int.h\"\n-#include <common.h>\n+#include \"common.h\"\n \n typedef uint32_t Elf32_Addr;\n typedef uint16_t Elf32_Half;\n@@ -49,21 +49,21 @@\n #define EM_MIPS 8\n \n typedef struct elf32_hdr {\n- unsigned char\te_ident[EI_NIDENT];\n- Elf32_Half\te_type;\n- Elf32_Half\te_machine;\n- Elf32_Word\te_version;\n- Elf32_Addr\te_entry;\n- Elf32_Off\te_phoff;\n- Elf32_Off\te_shoff;\n- Elf32_Word\te_flags;\n- Elf32_Half\te_ehsize;\n- Elf32_Half\te_phentsize;\n- Elf32_Half\te_phnum;\n- Elf32_Half\te_shentsize;\n- Elf32_Half\te_shnum;\n- Elf32_Half\te_shstrndx;\n-} Elf32_Ehdr;\n+ unsigned char e_ident[EI_NIDENT];\n+ Elf32_Half e_type;\n+ Elf32_Half e_machine;\n+ Elf32_Word e_version;\n+ Elf32_Addr e_entry;\n+ Elf32_Off\t e_phoff;\n+ Elf32_Off\t e_shoff;\n+ Elf32_Word e_flags;\n+ Elf32_Half e_ehsize;\n+ Elf32_Half e_phentsize;\n+ Elf32_Half e_phnum;\n+ Elf32_Half e_shentsize;\n+ Elf32_Half e_shnum;\n+ Elf32_Half e_shstrndx;\n+} PACKED Elf32_Ehdr;\n \n #define PT_NULL 0\n #define PT_LOAD 1\n@@ -91,7 +91,7 @@\n Elf32_Word\tp_memsz;\n Elf32_Word\tp_flags;\n Elf32_Word\tp_align;\n-} Elf32_Phdr;\n+} PACKED Elf32_Phdr;\n \n #define ELF32_ST_TYPE(i) ((i) & 0xf)\n #define ELF32_ST_BIND(i) ((i) >> 4)\n@@ -120,9 +120,9 @@\n uint32_t name;\n uint32_t value;\n uint32_t size;\n- uint8_t info;\n- uint8_t other;\n+ uint8_t info;\n+ uint8_t other;\n uint16_t shndx;\n-} __attribute__((packed)) elf_symbol_t;\n+} PACKED elf_symbol_t;\n \n #endif\n"} {"commit":"2b159ef749f66257953ff31fb40f9b93eea4a795","subject":"Update Copyright to reflect code written by both entities.","message":"Update Copyright to reflect code written by both entities.\n","repos":"jeagle\/icwtest","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- icwtest.c\n+++ icwtest.c\n@@ -1,5 +1,6 @@\n \/*\n * Copyright (c) 2012-2013, Yahoo! Inc All rights reserved.\n+ * Copyright (c) 2013-2014, John Eaglesham All rights reserved.\n *\n * Redistribution and use in source and binary forms, with or without\n * modification, are permitted provided that the following conditions are met:\n"} {"commit":"025c85f8dcdbf732bf673e71431f2e46a472b14f","subject":"shell: simplify ping6 parameter parsing","message":"shell: simplify ping6 parameter parsing\n\nRemoves some duplication.\n","repos":"OlegHahm\/RIOT,ks156\/RIOT,tfar\/RIOT,kb2ma\/RIOT,ant9000\/RIOT,ks156\/RIOT,mziegert\/RIOT,jfischer-phytec-iot\/RIOT,jremmert-phytec-iot\/RIOT,dhruvvyas90\/RIOT,binarylemon\/RIOT,RubikonAlpha\/RIOT,brettswann\/RIOT,binarylemon\/RIOT,zhuoshuguo\/RIOT,RubikonAlpha\/RIOT,thomaseichinger\/RIOT,attdona\/RIOT,jremmert-phytec-iot\/RIOT,MohmadAyman\/RIOT,kYc0o\/RIOT,Yonezawa-T2\/RIOT,thomaseichinger\/RIOT,mfrey\/RIOT,binarylemon\/RIOT,neumodisch\/RIOT,jbeyerstedt\/RIOT-OTA-update,mziegert\/RIOT,smlng\/RIOT,adjih\/RIOT,BytesGalore\/RIOT,biboc\/RIOT,A-Paul\/RIOT,dhruvvyas90\/RIOT,lazytech-org\/RIOT,watr-li\/RIOT,A-Paul\/RIOT,rakendrathapa\/RIOT,asanka-code\/RIOT,mziegert\/RIOT,jremmert-phytec-iot\/RIOT,josephnoir\/RIOT,kerneltask\/RIOT,backenklee\/RIOT,dhruvvyas90\/RIOT,roberthartung\/RIOT,backenklee\/RIOT,Yonezawa-T2\/RIOT,gautric\/RIOT,Hyungsin\/RIOT-OS,RBartz\/RIOT,stevenj\/RIOT,dkm\/RIOT,MohmadAyman\/RIOT,kb2ma\/RIOT,beurdouche\/RIOT,plushvoxel\/RIOT,msolters\/RIOT,gebart\/RIOT,cladmi\/RIOT,d00616\/RIOT,authmillenon\/RIOT,syin2\/RIOT,rakendrathapa\/RIOT,jfischer-phytec-iot\/RIOT,x3ro\/RIOT,dhruvvyas90\/RIOT,msolters\/RIOT,MohmadAyman\/RIOT,khhhh\/RIOT,gebart\/RIOT,adjih\/RIOT,stevenj\/RIOT,josephnoir\/RIOT,josephnoir\/RIOT,adjih\/RIOT,plushvoxel\/RIOT,aeneby\/RIOT,hamilton-mote\/RIOT-OS,adrianghc\/RIOT,rfuentess\/RIOT,zhuoshuguo\/RIOT,asanka-code\/RIOT,l3nko\/RIOT,neiljay\/RIOT,lazytech-org\/RIOT,yogo1212\/RIOT,miri64\/RIOT,jbeyerstedt\/RIOT-OTA-update,khhhh\/RIOT,Hyungsin\/RIOT-OS,mfrey\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,smlng\/RIOT,herrfz\/RIOT,shady33\/RIOT,yogo1212\/RIOT,x3ro\/RIOT,kbumsik\/RIOT,malosek\/RIOT,rousselk\/RIOT,OTAkeys\/RIOT,lebrush\/RIOT,immesys\/RiSyn,kaspar030\/RIOT,gautric\/RIOT,syin2\/RIOT,biboc\/RIOT,ant9000\/RIOT,shady33\/RIOT,gebart\/RIOT,khhhh\/RIOT,wentaoshang\/RIOT,alignan\/RIOT,FrancescoErmini\/RIOT,alignan\/RIOT,malosek\/RIOT,avmelnikoff\/RIOT,immesys\/RiSyn,RubikonAlpha\/RIOT,lebrush\/RIOT,rousselk\/RIOT,LudwigKnuepfer\/RIOT,lazytech-org\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,dailab\/RIOT,watr-li\/RIOT,stevenj\/RIOT,OlegHahm\/RIOT,x3ro\/RIOT,tfar\/RIOT,kYc0o\/RIOT,beurdouche\/RIOT,LudwigKnuepfer\/RIOT,syin2\/RIOT,mtausig\/RIOT,roberthartung\/RIOT,Yonezawa-T2\/RIOT,RBartz\/RIOT,khhhh\/RIOT,herrfz\/RIOT,haoyangyu\/RIOT,FrancescoErmini\/RIOT,jasonatran\/RIOT,l3nko\/RIOT,backenklee\/RIOT,d00616\/RIOT,adrianghc\/RIOT,rakendrathapa\/RIOT,x3ro\/RIOT,RIOT-OS\/RIOT,miri64\/RIOT,rajma996\/RIOT,kaspar030\/RIOT,watr-li\/RIOT,RBartz\/RIOT,beurdouche\/RIOT,alignan\/RIOT,authmillenon\/RIOT,zhuoshuguo\/RIOT,OlegHahm\/RIOT,TobiasFredersdorf\/RIOT,mfrey\/RIOT,herrfz\/RIOT,authmillenon\/RIOT,asanka-code\/RIOT,neumodisch\/RIOT,Hyungsin\/RIOT-OS,jremmert-phytec-iot\/RIOT,ks156\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,RubikonAlpha\/RIOT,kaleb-himes\/RIOT,jfischer-phytec-iot\/RIOT,altairpearl\/RIOT,katezilla\/RIOT,neumodisch\/RIOT,rfuentess\/RIOT,yogo1212\/RIOT,rousselk\/RIOT,kaspar030\/RIOT,TobiasFredersdorf\/RIOT,wentaoshang\/RIOT,attdona\/RIOT,MohmadAyman\/RIOT,neiljay\/RIOT,thomaseichinger\/RIOT,miri64\/RIOT,smlng\/RIOT,RIOT-OS\/RIOT,adjih\/RIOT,malosek\/RIOT,immesys\/RiSyn,plushvoxel\/RIOT,tfar\/RIOT,basilfx\/RIOT,plushvoxel\/RIOT,Ell-i\/RIOT,basilfx\/RIOT,dkm\/RIOT,lebrush\/RIOT,roberthartung\/RIOT,attdona\/RIOT,stevenj\/RIOT,zhuoshuguo\/RIOT,dkm\/RIOT,alignan\/RIOT,hamilton-mote\/RIOT-OS,LudwigOrtmann\/RIOT,khhhh\/RIOT,kaspar030\/RIOT,kerneltask\/RIOT,gautric\/RIOT,asanka-code\/RIOT,LudwigOrtmann\/RIOT,Josar\/RIOT,hamilton-mote\/RIOT-OS,kaleb-himes\/RIOT,dailab\/RIOT,thomaseichinger\/RIOT,LudwigKnuepfer\/RIOT,FrancescoErmini\/RIOT,MohmadAyman\/RIOT,adrianghc\/RIOT,zhuoshuguo\/RIOT,kerneltask\/RIOT,binarylemon\/RIOT,roberthartung\/RIOT,FrancescoErmini\/RIOT,kYc0o\/RIOT,katezilla\/RIOT,kerneltask\/RIOT,neiljay\/RIOT,ant9000\/RIOT,x3ro\/RIOT,neumodisch\/RIOT,jbeyerstedt\/RIOT-OTA-update,OlegHahm\/RIOT,alignan\/RIOT,plushvoxel\/RIOT,toonst\/RIOT,brettswann\/RIOT,asanka-code\/RIOT,LudwigKnuepfer\/RIOT,haoyangyu\/RIOT,backenklee\/RIOT,jbeyerstedt\/RIOT-OTA-update,herrfz\/RIOT,gebart\/RIOT,lebrush\/RIOT,shady33\/RIOT,attdona\/RIOT,hamilton-mote\/RIOT-OS,wentaoshang\/RIOT,d00616\/RIOT,biboc\/RIOT,RBartz\/RIOT,malosek\/RIOT,asanka-code\/RIOT,Hyungsin\/RIOT-OS,mziegert\/RIOT,haoyangyu\/RIOT,kYc0o\/RIOT,toonst\/RIOT,Ell-i\/RIOT,beurdouche\/RIOT,haoyangyu\/RIOT,zhuoshuguo\/RIOT,TobiasFredersdorf\/RIOT,Ell-i\/RIOT,aeneby\/RIOT,tfar\/RIOT,neumodisch\/RIOT,mziegert\/RIOT,mtausig\/RIOT,altairpearl\/RIOT,mtausig\/RIOT,rajma996\/RIOT,wentaoshang\/RIOT,brettswann\/RIOT,josephnoir\/RIOT,jfischer-phytec-iot\/RIOT,yogo1212\/RIOT,kbumsik\/RIOT,aeneby\/RIOT,l3nko\/RIOT,d00616\/RIOT,dailab\/RIOT,neumodisch\/RIOT,msolters\/RIOT,basilfx\/RIOT,jasonatran\/RIOT,cladmi\/RIOT,immesys\/RiSyn,dkm\/RIOT,attdona\/RIOT,cladmi\/RIOT,Yonezawa-T2\/RIOT,biboc\/RIOT,ks156\/RIOT,haoyangyu\/RIOT,mtausig\/RIOT,kaleb-himes\/RIOT,adjih\/RIOT,msolters\/RIOT,toonst\/RIOT,toonst\/RIOT,yogo1212\/RIOT,kbumsik\/RIOT,FrancescoErmini\/RIOT,ant9000\/RIOT,smlng\/RIOT,ant9000\/RIOT,kb2ma\/RIOT,authmillenon\/RIOT,thomaseichinger\/RIOT,basilfx\/RIOT,brettswann\/RIOT,cladmi\/RIOT,kYc0o\/RIOT,stevenj\/RIOT,RIOT-OS\/RIOT,rakendrathapa\/RIOT,mfrey\/RIOT,altairpearl\/RIOT,wentaoshang\/RIOT,OTAkeys\/RIOT,mtausig\/RIOT,rajma996\/RIOT,malosek\/RIOT,FrancescoErmini\/RIOT,lazytech-org\/RIOT,roberthartung\/RIOT,smlng\/RIOT,brettswann\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,binarylemon\/RIOT,toonst\/RIOT,authmillenon\/RIOT,RIOT-OS\/RIOT,kbumsik\/RIOT,gautric\/RIOT,altairpearl\/RIOT,LudwigOrtmann\/RIOT,jfischer-phytec-iot\/RIOT,jremmert-phytec-iot\/RIOT,RubikonAlpha\/RIOT,kb2ma\/RIOT,avmelnikoff\/RIOT,mziegert\/RIOT,RBartz\/RIOT,RIOT-OS\/RIOT,katezilla\/RIOT,l3nko\/RIOT,kaleb-himes\/RIOT,shady33\/RIOT,rousselk\/RIOT,BytesGalore\/RIOT,A-Paul\/RIOT,rousselk\/RIOT,rajma996\/RIOT,khhhh\/RIOT,watr-li\/RIOT,wentaoshang\/RIOT,Josar\/RIOT,kb2ma\/RIOT,altairpearl\/RIOT,binarylemon\/RIOT,watr-li\/RIOT,gebart\/RIOT,aeneby\/RIOT,rousselk\/RIOT,herrfz\/RIOT,neiljay\/RIOT,BytesGalore\/RIOT,lebrush\/RIOT,tfar\/RIOT,haoyangyu\/RIOT,avmelnikoff\/RIOT,katezilla\/RIOT,kaleb-himes\/RIOT,msolters\/RIOT,l3nko\/RIOT,watr-li\/RIOT,BytesGalore\/RIOT,cladmi\/RIOT,shady33\/RIOT,Josar\/RIOT,d00616\/RIOT,TobiasFredersdorf\/RIOT,OTAkeys\/RIOT,stevenj\/RIOT,RBartz\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,adrianghc\/RIOT,Yonezawa-T2\/RIOT,Ell-i\/RIOT,jbeyerstedt\/RIOT-OTA-update,kaspar030\/RIOT,malosek\/RIOT,mfrey\/RIOT,brettswann\/RIOT,Hyungsin\/RIOT-OS,Yonezawa-T2\/RIOT,kbumsik\/RIOT,msolters\/RIOT,jremmert-phytec-iot\/RIOT,avmelnikoff\/RIOT,jasonatran\/RIOT,dailab\/RIOT,BytesGalore\/RIOT,Ell-i\/RIOT,shady33\/RIOT,aeneby\/RIOT,LudwigOrtmann\/RIOT,TobiasFredersdorf\/RIOT,biboc\/RIOT,josephnoir\/RIOT,herrfz\/RIOT,lebrush\/RIOT,altairpearl\/RIOT,adrianghc\/RIOT,l3nko\/RIOT,MohmadAyman\/RIOT,OTAkeys\/RIOT,syin2\/RIOT,immesys\/RiSyn,hamilton-mote\/RIOT-OS,OlegHahm\/RIOT,rakendrathapa\/RIOT,rfuentess\/RIOT,jasonatran\/RIOT,kerneltask\/RIOT,dhruvvyas90\/RIOT,dailab\/RIOT,ks156\/RIOT,yogo1212\/RIOT,Josar\/RIOT,katezilla\/RIOT,rajma996\/RIOT,lazytech-org\/RIOT,backenklee\/RIOT,A-Paul\/RIOT,miri64\/RIOT,dkm\/RIOT,miri64\/RIOT,dhruvvyas90\/RIOT,rfuentess\/RIOT,immesys\/RiSyn,beurdouche\/RIOT,LudwigKnuepfer\/RIOT,rakendrathapa\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,syin2\/RIOT,Josar\/RIOT,A-Paul\/RIOT,gautric\/RIOT,rfuentess\/RIOT,LudwigOrtmann\/RIOT,avmelnikoff\/RIOT,attdona\/RIOT,d00616\/RIOT,RubikonAlpha\/RIOT,rajma996\/RIOT,jasonatran\/RIOT,basilfx\/RIOT,LudwigOrtmann\/RIOT,neiljay\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sys\/shell\/commands\/sc_icmpv6_echo.c\n+++ sys\/shell\/commands\/sc_icmpv6_echo.c\n@@ -143,51 +143,30 @@\n timex_t min_rtt = { UINT32_MAX, UINT32_MAX }, max_rtt = { 0, 0 };\n timex_t sum_rtt = { 0, 0 };\n timex_t start, stop;\n-\n- switch (argc) {\n- case 0:\n- case 1:\n+ int param_offset = 0;\n+\n+ if (argc < 2) {\n+ usage(argv);\n+ return 1;\n+ }\n+ else if ((count = atoi(argv[1])) > 0) {\n+ if (argc < 3) {\n usage(argv);\n return 1;\n-\n- case 2:\n- addr_str = argv[1];\n- break;\n-\n- case 3:\n- count = atoi(argv[1]);\n- if (count > 0) {\n- addr_str = argv[2];\n- }\n- else {\n- count = 3;\n- addr_str = argv[1];\n- payload_len = atoi(argv[2]);\n- }\n-\n- break;\n-\n- case 4:\n- count = atoi(argv[1]);\n- if (count > 0) {\n- addr_str = argv[2];\n- payload_len = atoi(argv[3]);\n- }\n- else {\n- count = 3;\n- addr_str = argv[1];\n- payload_len = atoi(argv[2]);\n- _a_to_timex(&delay, argv[3]);\n- }\n- break;\n-\n- case 5:\n- default:\n- count = atoi(argv[1]);\n- addr_str = argv[2];\n- payload_len = atoi(argv[3]);\n- _a_to_timex(&delay, argv[4]);\n- break;\n+ }\n+ param_offset = 1;\n+ }\n+ else {\n+ count = 3;\n+ }\n+\n+ addr_str = argv[1 + param_offset];\n+\n+ if (argc > (2 + param_offset)) {\n+ payload_len = atoi(argv[2 + param_offset]);\n+ }\n+ if (argc > (3 + param_offset)) {\n+ _a_to_timex(&delay, argv[3 + param_offset]);\n }\n \n if ((ipv6_addr_from_str(&addr, addr_str) == NULL) || (((int)payload_len) < 0)) {\n"} {"commit":"e3045e8afef562eed07ceec25b527df268340bbb","subject":"shell: drop duplicate ICMPv6 echo responses","message":"shell: drop duplicate ICMPv6 echo responses\n","repos":"lebrush\/RIOT,dhruvvyas90\/RIOT,rfuentess\/RIOT,LudwigOrtmann\/RIOT,mziegert\/RIOT,malosek\/RIOT,authmillenon\/RIOT,beurdouche\/RIOT,RubikonAlpha\/RIOT,kerneltask\/RIOT,basilfx\/RIOT,haoyangyu\/RIOT,Yonezawa-T2\/RIOT,mtausig\/RIOT,Hyungsin\/RIOT-OS,dkm\/RIOT,aeneby\/RIOT,A-Paul\/RIOT,RBartz\/RIOT,cladmi\/RIOT,msolters\/RIOT,watr-li\/RIOT,RubikonAlpha\/RIOT,syin2\/RIOT,kb2ma\/RIOT,altairpearl\/RIOT,zhuoshuguo\/RIOT,LudwigKnuepfer\/RIOT,katezilla\/RIOT,OTAkeys\/RIOT,mtausig\/RIOT,LudwigOrtmann\/RIOT,josephnoir\/RIOT,rfuentess\/RIOT,MohmadAyman\/RIOT,mziegert\/RIOT,aeneby\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,LudwigKnuepfer\/RIOT,jasonatran\/RIOT,Ell-i\/RIOT,OlegHahm\/RIOT,MohmadAyman\/RIOT,asanka-code\/RIOT,thomaseichinger\/RIOT,Yonezawa-T2\/RIOT,ks156\/RIOT,RIOT-OS\/RIOT,mtausig\/RIOT,Josar\/RIOT,kaleb-himes\/RIOT,MohmadAyman\/RIOT,tfar\/RIOT,jfischer-phytec-iot\/RIOT,asanka-code\/RIOT,altairpearl\/RIOT,miri64\/RIOT,lebrush\/RIOT,tfar\/RIOT,jremmert-phytec-iot\/RIOT,kaspar030\/RIOT,lazytech-org\/RIOT,x3ro\/RIOT,plushvoxel\/RIOT,d00616\/RIOT,Hyungsin\/RIOT-OS,A-Paul\/RIOT,immesys\/RiSyn,adrianghc\/RIOT,cladmi\/RIOT,tfar\/RIOT,neumodisch\/RIOT,herrfz\/RIOT,thomaseichinger\/RIOT,kaspar030\/RIOT,basilfx\/RIOT,haoyangyu\/RIOT,yogo1212\/RIOT,x3ro\/RIOT,x3ro\/RIOT,backenklee\/RIOT,altairpearl\/RIOT,yogo1212\/RIOT,hamilton-mote\/RIOT-OS,Josar\/RIOT,rajma996\/RIOT,wentaoshang\/RIOT,malosek\/RIOT,rfuentess\/RIOT,plushvoxel\/RIOT,beurdouche\/RIOT,rousselk\/RIOT,FrancescoErmini\/RIOT,rousselk\/RIOT,josephnoir\/RIOT,toonst\/RIOT,kaleb-himes\/RIOT,gautric\/RIOT,basilfx\/RIOT,smlng\/RIOT,dhruvvyas90\/RIOT,msolters\/RIOT,msolters\/RIOT,dkm\/RIOT,kbumsik\/RIOT,watr-li\/RIOT,jremmert-phytec-iot\/RIOT,lazytech-org\/RIOT,yogo1212\/RIOT,TobiasFredersdorf\/RIOT,khhhh\/RIOT,avmelnikoff\/RIOT,dhruvvyas90\/RIOT,asanka-code\/RIOT,smlng\/RIOT,ant9000\/RIOT,beurdouche\/RIOT,l3nko\/RIOT,mfrey\/RIOT,Ell-i\/RIOT,biboc\/RIOT,BytesGalore\/RIOT,kaleb-himes\/RIOT,roberthartung\/RIOT,alignan\/RIOT,stevenj\/RIOT,kaspar030\/RIOT,wentaoshang\/RIOT,LudwigOrtmann\/RIOT,Ell-i\/RIOT,d00616\/RIOT,stevenj\/RIOT,mfrey\/RIOT,gebart\/RIOT,msolters\/RIOT,kbumsik\/RIOT,kbumsik\/RIOT,rajma996\/RIOT,katezilla\/RIOT,gebart\/RIOT,alignan\/RIOT,rakendrathapa\/RIOT,gebart\/RIOT,neumodisch\/RIOT,mziegert\/RIOT,rousselk\/RIOT,attdona\/RIOT,neumodisch\/RIOT,attdona\/RIOT,Ell-i\/RIOT,wentaoshang\/RIOT,stevenj\/RIOT,altairpearl\/RIOT,adrianghc\/RIOT,kb2ma\/RIOT,kYc0o\/RIOT,neiljay\/RIOT,khhhh\/RIOT,lebrush\/RIOT,rakendrathapa\/RIOT,toonst\/RIOT,jfischer-phytec-iot\/RIOT,josephnoir\/RIOT,cladmi\/RIOT,d00616\/RIOT,khhhh\/RIOT,neumodisch\/RIOT,cladmi\/RIOT,miri64\/RIOT,herrfz\/RIOT,tfar\/RIOT,syin2\/RIOT,d00616\/RIOT,malosek\/RIOT,l3nko\/RIOT,smlng\/RIOT,kYc0o\/RIOT,wentaoshang\/RIOT,shady33\/RIOT,rajma996\/RIOT,lazytech-org\/RIOT,ks156\/RIOT,OTAkeys\/RIOT,smlng\/RIOT,dkm\/RIOT,kaspar030\/RIOT,miri64\/RIOT,MohmadAyman\/RIOT,rfuentess\/RIOT,Yonezawa-T2\/RIOT,OlegHahm\/RIOT,rakendrathapa\/RIOT,immesys\/RiSyn,kaleb-himes\/RIOT,daniel-k\/RIOT,adrianghc\/RIOT,watr-li\/RIOT,LudwigOrtmann\/RIOT,dhruvvyas90\/RIOT,asanka-code\/RIOT,A-Paul\/RIOT,avmelnikoff\/RIOT,syin2\/RIOT,beurdouche\/RIOT,latsku\/RIOT,FrancescoErmini\/RIOT,LudwigKnuepfer\/RIOT,adrianghc\/RIOT,LudwigOrtmann\/RIOT,gautric\/RIOT,lazytech-org\/RIOT,alignan\/RIOT,FrancescoErmini\/RIOT,latsku\/RIOT,A-Paul\/RIOT,altairpearl\/RIOT,neumodisch\/RIOT,hamilton-mote\/RIOT-OS,jbeyerstedt\/RIOT-OTA-update,kbumsik\/RIOT,TobiasFredersdorf\/RIOT,TobiasFredersdorf\/RIOT,katezilla\/RIOT,jfischer-phytec-iot\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,msolters\/RIOT,syin2\/RIOT,mtausig\/RIOT,adjih\/RIOT,dailab\/RIOT,neiljay\/RIOT,gautric\/RIOT,rakendrathapa\/RIOT,neiljay\/RIOT,mfrey\/RIOT,kerneltask\/RIOT,dailab\/RIOT,d00616\/RIOT,stevenj\/RIOT,OlegHahm\/RIOT,neiljay\/RIOT,malosek\/RIOT,binarylemon\/RIOT,watr-li\/RIOT,lebrush\/RIOT,smlng\/RIOT,RBartz\/RIOT,RubikonAlpha\/RIOT,OTAkeys\/RIOT,asanka-code\/RIOT,binarylemon\/RIOT,zhuoshuguo\/RIOT,TobiasFredersdorf\/RIOT,authmillenon\/RIOT,dhruvvyas90\/RIOT,avmelnikoff\/RIOT,thomaseichinger\/RIOT,adjih\/RIOT,dailab\/RIOT,OTAkeys\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,Josar\/RIOT,hamilton-mote\/RIOT-OS,stevenj\/RIOT,mziegert\/RIOT,brettswann\/RIOT,FrancescoErmini\/RIOT,miri64\/RIOT,LudwigKnuepfer\/RIOT,kerneltask\/RIOT,OTAkeys\/RIOT,watr-li\/RIOT,hamilton-mote\/RIOT-OS,Ell-i\/RIOT,binarylemon\/RIOT,kerneltask\/RIOT,immesys\/RiSyn,shady33\/RIOT,kerneltask\/RIOT,binarylemon\/RIOT,Yonezawa-T2\/RIOT,lebrush\/RIOT,biboc\/RIOT,l3nko\/RIOT,d00616\/RIOT,daniel-k\/RIOT,ant9000\/RIOT,herrfz\/RIOT,toonst\/RIOT,TobiasFredersdorf\/RIOT,dhruvvyas90\/RIOT,Hyungsin\/RIOT-OS,mfrey\/RIOT,jfischer-phytec-iot\/RIOT,mziegert\/RIOT,rousselk\/RIOT,binarylemon\/RIOT,latsku\/RIOT,watr-li\/RIOT,neumodisch\/RIOT,kYc0o\/RIOT,khhhh\/RIOT,FrancescoErmini\/RIOT,alignan\/RIOT,immesys\/RiSyn,jremmert-phytec-iot\/RIOT,kYc0o\/RIOT,yogo1212\/RIOT,RBartz\/RIOT,yogo1212\/RIOT,latsku\/RIOT,l3nko\/RIOT,daniel-k\/RIOT,immesys\/RiSyn,adjih\/RIOT,avmelnikoff\/RIOT,kbumsik\/RIOT,gebart\/RIOT,brettswann\/RIOT,jasonatran\/RIOT,Josar\/RIOT,x3ro\/RIOT,mtausig\/RIOT,attdona\/RIOT,haoyangyu\/RIOT,miri64\/RIOT,LudwigOrtmann\/RIOT,roberthartung\/RIOT,shady33\/RIOT,rakendrathapa\/RIOT,malosek\/RIOT,brettswann\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,jbeyerstedt\/RIOT-OTA-update,latsku\/RIOT,ks156\/RIOT,jremmert-phytec-iot\/RIOT,roberthartung\/RIOT,biboc\/RIOT,dailab\/RIOT,beurdouche\/RIOT,zhuoshuguo\/RIOT,basilfx\/RIOT,toonst\/RIOT,authmillenon\/RIOT,thomaseichinger\/RIOT,adjih\/RIOT,jbeyerstedt\/RIOT-OTA-update,katezilla\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,backenklee\/RIOT,herrfz\/RIOT,dkm\/RIOT,thomaseichinger\/RIOT,malosek\/RIOT,roberthartung\/RIOT,brettswann\/RIOT,adjih\/RIOT,MohmadAyman\/RIOT,avmelnikoff\/RIOT,rajma996\/RIOT,haoyangyu\/RIOT,basilfx\/RIOT,cladmi\/RIOT,rousselk\/RIOT,dkm\/RIOT,rfuentess\/RIOT,kaleb-himes\/RIOT,toonst\/RIOT,khhhh\/RIOT,jremmert-phytec-iot\/RIOT,rajma996\/RIOT,Hyungsin\/RIOT-OS,RIOT-OS\/RIOT,jbeyerstedt\/RIOT-OTA-update,dailab\/RIOT,Yonezawa-T2\/RIOT,brettswann\/RIOT,lazytech-org\/RIOT,RBartz\/RIOT,msolters\/RIOT,backenklee\/RIOT,RubikonAlpha\/RIOT,zhuoshuguo\/RIOT,OlegHahm\/RIOT,ant9000\/RIOT,herrfz\/RIOT,LudwigKnuepfer\/RIOT,biboc\/RIOT,kaspar030\/RIOT,daniel-k\/RIOT,katezilla\/RIOT,syin2\/RIOT,jasonatran\/RIOT,rousselk\/RIOT,ks156\/RIOT,attdona\/RIOT,BytesGalore\/RIOT,kb2ma\/RIOT,BytesGalore\/RIOT,RBartz\/RIOT,aeneby\/RIOT,binarylemon\/RIOT,haoyangyu\/RIOT,RIOT-OS\/RIOT,yogo1212\/RIOT,RubikonAlpha\/RIOT,plushvoxel\/RIOT,aeneby\/RIOT,ant9000\/RIOT,FrancescoErmini\/RIOT,hamilton-mote\/RIOT-OS,daniel-k\/RIOT,mfrey\/RIOT,RIOT-OS\/RIOT,attdona\/RIOT,MohmadAyman\/RIOT,RBartz\/RIOT,roberthartung\/RIOT,brettswann\/RIOT,backenklee\/RIOT,mziegert\/RIOT,stevenj\/RIOT,backenklee\/RIOT,BytesGalore\/RIOT,x3ro\/RIOT,Hyungsin\/RIOT-OS,Josar\/RIOT,josephnoir\/RIOT,ks156\/RIOT,jasonatran\/RIOT,haoyangyu\/RIOT,gautric\/RIOT,shady33\/RIOT,rakendrathapa\/RIOT,kb2ma\/RIOT,zhuoshuguo\/RIOT,attdona\/RIOT,tfar\/RIOT,josephnoir\/RIOT,wentaoshang\/RIOT,BytesGalore\/RIOT,neiljay\/RIOT,alignan\/RIOT,adrianghc\/RIOT,altairpearl\/RIOT,shady33\/RIOT,jfischer-phytec-iot\/RIOT,biboc\/RIOT,Yonezawa-T2\/RIOT,plushvoxel\/RIOT,aeneby\/RIOT,RubikonAlpha\/RIOT,kYc0o\/RIOT,khhhh\/RIOT,OlegHahm\/RIOT,wentaoshang\/RIOT,immesys\/RiSyn,foss-for-synopsys-dwc-arc-processors\/RIOT,herrfz\/RIOT,l3nko\/RIOT,rajma996\/RIOT,A-Paul\/RIOT,lebrush\/RIOT,jbeyerstedt\/RIOT-OTA-update,kb2ma\/RIOT,plushvoxel\/RIOT,gebart\/RIOT,authmillenon\/RIOT,jasonatran\/RIOT,l3nko\/RIOT,gautric\/RIOT,daniel-k\/RIOT,RIOT-OS\/RIOT,shady33\/RIOT,latsku\/RIOT,zhuoshuguo\/RIOT,ant9000\/RIOT,jremmert-phytec-iot\/RIOT,asanka-code\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sys\/shell\/commands\/sc_icmpv6_echo.c\n+++ sys\/shell\/commands\/sc_icmpv6_echo.c\n@@ -136,6 +136,7 @@\n timex_t delay = { 1, 0 };\n char *addr_str;\n ipv6_addr_t addr;\n+ msg_t msg;\n gnrc_netreg_entry_t *ipv6_entry, my_entry = { NULL, ICMPV6_ECHO_REP,\n thread_getpid()\n };\n@@ -211,7 +212,6 @@\n vtimer_now(&start);\n \n while ((remaining--) > 0) {\n- msg_t msg;\n gnrc_pktsnip_t *pkt;\n timex_t start, stop, timeout = { 5, 0 };\n \n@@ -284,6 +284,13 @@\n stop = timex_sub(stop, start);\n \n gnrc_netreg_unregister(GNRC_NETTYPE_ICMPV6, &my_entry);\n+ while(msg_try_receive(&msg) > 0) {\n+ if (msg.type == GNRC_NETAPI_MSG_TYPE_RCV) {\n+ printf(\"dropping additional response packet (probably caused by duplicates)\\n\");\n+ gnrc_pktsnip_t *pkt = (gnrc_pktsnip_t *)msg.content.ptr;\n+ gnrc_pktbuf_release(pkt);\n+ }\n+ }\n \n printf(\"--- %s ping statistics ---\\n\", addr_str);\n \n"} {"commit":"ee33e6941b66688abefd879306da67c5f0b36760","subject":"shell ping6: do not try to parse address as count","message":"shell ping6: do not try to parse address as count\n\nThe first parameter should be handled as count only if there are at least two parameters given.\n","repos":"A-Paul\/RIOT,dailab\/RIOT,mfrey\/RIOT,kaspar030\/RIOT,shady33\/RIOT,basilfx\/RIOT,binarylemon\/RIOT,rajma996\/RIOT,RBartz\/RIOT,mziegert\/RIOT,thomaseichinger\/RIOT,jremmert-phytec-iot\/RIOT,zhuoshuguo\/RIOT,avmelnikoff\/RIOT,biboc\/RIOT,attdona\/RIOT,asanka-code\/RIOT,Ell-i\/RIOT,dhruvvyas90\/RIOT,Josar\/RIOT,Hyungsin\/RIOT-OS,avmelnikoff\/RIOT,authmillenon\/RIOT,adjih\/RIOT,gautric\/RIOT,OlegHahm\/RIOT,josephnoir\/RIOT,kerneltask\/RIOT,lebrush\/RIOT,malosek\/RIOT,kaspar030\/RIOT,jasonatran\/RIOT,adjih\/RIOT,RubikonAlpha\/RIOT,rakendrathapa\/RIOT,biboc\/RIOT,brettswann\/RIOT,alignan\/RIOT,rousselk\/RIOT,brettswann\/RIOT,ks156\/RIOT,rousselk\/RIOT,asanka-code\/RIOT,toonst\/RIOT,katezilla\/RIOT,dailab\/RIOT,MohmadAyman\/RIOT,khhhh\/RIOT,lebrush\/RIOT,RubikonAlpha\/RIOT,ks156\/RIOT,roberthartung\/RIOT,rousselk\/RIOT,attdona\/RIOT,mfrey\/RIOT,gautric\/RIOT,jfischer-phytec-iot\/RIOT,kYc0o\/RIOT,authmillenon\/RIOT,thomaseichinger\/RIOT,toonst\/RIOT,yogo1212\/RIOT,mziegert\/RIOT,roberthartung\/RIOT,dkm\/RIOT,OlegHahm\/RIOT,jremmert-phytec-iot\/RIOT,tfar\/RIOT,rfuentess\/RIOT,neiljay\/RIOT,RIOT-OS\/RIOT,katezilla\/RIOT,brettswann\/RIOT,TobiasFredersdorf\/RIOT,plushvoxel\/RIOT,mziegert\/RIOT,FrancescoErmini\/RIOT,neumodisch\/RIOT,shady33\/RIOT,ant9000\/RIOT,adjih\/RIOT,basilfx\/RIOT,toonst\/RIOT,TobiasFredersdorf\/RIOT,wentaoshang\/RIOT,shady33\/RIOT,l3nko\/RIOT,kb2ma\/RIOT,smlng\/RIOT,kaleb-himes\/RIOT,aeneby\/RIOT,beurdouche\/RIOT,biboc\/RIOT,A-Paul\/RIOT,LudwigKnuepfer\/RIOT,neumodisch\/RIOT,mfrey\/RIOT,rfuentess\/RIOT,beurdouche\/RIOT,kaspar030\/RIOT,gebart\/RIOT,cladmi\/RIOT,OlegHahm\/RIOT,thomaseichinger\/RIOT,LudwigKnuepfer\/RIOT,RIOT-OS\/RIOT,smlng\/RIOT,dhruvvyas90\/RIOT,khhhh\/RIOT,zhuoshuguo\/RIOT,shady33\/RIOT,altairpearl\/RIOT,neumodisch\/RIOT,tfar\/RIOT,altairpearl\/RIOT,neumodisch\/RIOT,OTAkeys\/RIOT,tfar\/RIOT,kaleb-himes\/RIOT,rfuentess\/RIOT,altairpearl\/RIOT,A-Paul\/RIOT,aeneby\/RIOT,cladmi\/RIOT,kb2ma\/RIOT,hamilton-mote\/RIOT-OS,zhuoshuguo\/RIOT,kYc0o\/RIOT,neumodisch\/RIOT,josephnoir\/RIOT,jfischer-phytec-iot\/RIOT,LudwigOrtmann\/RIOT,wentaoshang\/RIOT,kbumsik\/RIOT,A-Paul\/RIOT,Ell-i\/RIOT,ks156\/RIOT,x3ro\/RIOT,plushvoxel\/RIOT,kerneltask\/RIOT,OTAkeys\/RIOT,lebrush\/RIOT,TobiasFredersdorf\/RIOT,dkm\/RIOT,shady33\/RIOT,katezilla\/RIOT,cladmi\/RIOT,Hyungsin\/RIOT-OS,FrancescoErmini\/RIOT,jfischer-phytec-iot\/RIOT,rajma996\/RIOT,l3nko\/RIOT,jbeyerstedt\/RIOT-OTA-update,rajma996\/RIOT,RubikonAlpha\/RIOT,kb2ma\/RIOT,smlng\/RIOT,MohmadAyman\/RIOT,jbeyerstedt\/RIOT-OTA-update,kaleb-himes\/RIOT,basilfx\/RIOT,herrfz\/RIOT,jremmert-phytec-iot\/RIOT,attdona\/RIOT,lazytech-org\/RIOT,lazytech-org\/RIOT,kbumsik\/RIOT,hamilton-mote\/RIOT-OS,jremmert-phytec-iot\/RIOT,FrancescoErmini\/RIOT,tfar\/RIOT,smlng\/RIOT,backenklee\/RIOT,LudwigOrtmann\/RIOT,lazytech-org\/RIOT,alignan\/RIOT,zhuoshuguo\/RIOT,alignan\/RIOT,rajma996\/RIOT,neiljay\/RIOT,khhhh\/RIOT,alignan\/RIOT,wentaoshang\/RIOT,wentaoshang\/RIOT,Josar\/RIOT,stevenj\/RIOT,d00616\/RIOT,malosek\/RIOT,mfrey\/RIOT,herrfz\/RIOT,adjih\/RIOT,basilfx\/RIOT,josephnoir\/RIOT,immesys\/RiSyn,MohmadAyman\/RIOT,rfuentess\/RIOT,alignan\/RIOT,cladmi\/RIOT,toonst\/RIOT,MohmadAyman\/RIOT,d00616\/RIOT,tfar\/RIOT,dailab\/RIOT,malosek\/RIOT,kerneltask\/RIOT,RBartz\/RIOT,malosek\/RIOT,gebart\/RIOT,immesys\/RiSyn,jfischer-phytec-iot\/RIOT,d00616\/RIOT,toonst\/RIOT,katezilla\/RIOT,rousselk\/RIOT,asanka-code\/RIOT,Josar\/RIOT,Josar\/RIOT,authmillenon\/RIOT,shady33\/RIOT,immesys\/RiSyn,gautric\/RIOT,mfrey\/RIOT,josephnoir\/RIOT,LudwigOrtmann\/RIOT,BytesGalore\/RIOT,Yonezawa-T2\/RIOT,gebart\/RIOT,beurdouche\/RIOT,kbumsik\/RIOT,zhuoshuguo\/RIOT,Ell-i\/RIOT,asanka-code\/RIOT,rajma996\/RIOT,RIOT-OS\/RIOT,RIOT-OS\/RIOT,hamilton-mote\/RIOT-OS,kerneltask\/RIOT,authmillenon\/RIOT,cladmi\/RIOT,RBartz\/RIOT,LudwigKnuepfer\/RIOT,BytesGalore\/RIOT,binarylemon\/RIOT,dkm\/RIOT,kaspar030\/RIOT,josephnoir\/RIOT,malosek\/RIOT,thomaseichinger\/RIOT,Hyungsin\/RIOT-OS,BytesGalore\/RIOT,kaleb-himes\/RIOT,x3ro\/RIOT,jasonatran\/RIOT,dailab\/RIOT,miri64\/RIOT,asanka-code\/RIOT,stevenj\/RIOT,miri64\/RIOT,binarylemon\/RIOT,syin2\/RIOT,x3ro\/RIOT,rakendrathapa\/RIOT,avmelnikoff\/RIOT,syin2\/RIOT,Yonezawa-T2\/RIOT,jfischer-phytec-iot\/RIOT,FrancescoErmini\/RIOT,Ell-i\/RIOT,authmillenon\/RIOT,MohmadAyman\/RIOT,x3ro\/RIOT,kerneltask\/RIOT,lazytech-org\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,yogo1212\/RIOT,ant9000\/RIOT,herrfz\/RIOT,rakendrathapa\/RIOT,backenklee\/RIOT,wentaoshang\/RIOT,mziegert\/RIOT,Josar\/RIOT,khhhh\/RIOT,lebrush\/RIOT,adrianghc\/RIOT,jasonatran\/RIOT,immesys\/RiSyn,brettswann\/RIOT,A-Paul\/RIOT,kaspar030\/RIOT,adrianghc\/RIOT,syin2\/RIOT,BytesGalore\/RIOT,rousselk\/RIOT,avmelnikoff\/RIOT,mziegert\/RIOT,Hyungsin\/RIOT-OS,rfuentess\/RIOT,stevenj\/RIOT,binarylemon\/RIOT,dkm\/RIOT,attdona\/RIOT,adrianghc\/RIOT,ks156\/RIOT,gautric\/RIOT,rousselk\/RIOT,LudwigKnuepfer\/RIOT,kaleb-himes\/RIOT,gebart\/RIOT,miri64\/RIOT,biboc\/RIOT,rakendrathapa\/RIOT,TobiasFredersdorf\/RIOT,jbeyerstedt\/RIOT-OTA-update,kbumsik\/RIOT,binarylemon\/RIOT,aeneby\/RIOT,RubikonAlpha\/RIOT,herrfz\/RIOT,attdona\/RIOT,d00616\/RIOT,OlegHahm\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,katezilla\/RIOT,ant9000\/RIOT,RubikonAlpha\/RIOT,yogo1212\/RIOT,RBartz\/RIOT,altairpearl\/RIOT,herrfz\/RIOT,aeneby\/RIOT,mtausig\/RIOT,jasonatran\/RIOT,altairpearl\/RIOT,rakendrathapa\/RIOT,dhruvvyas90\/RIOT,kb2ma\/RIOT,dkm\/RIOT,roberthartung\/RIOT,mtausig\/RIOT,Ell-i\/RIOT,l3nko\/RIOT,LudwigOrtmann\/RIOT,Yonezawa-T2\/RIOT,dhruvvyas90\/RIOT,aeneby\/RIOT,neiljay\/RIOT,hamilton-mote\/RIOT-OS,neiljay\/RIOT,hamilton-mote\/RIOT-OS,MohmadAyman\/RIOT,attdona\/RIOT,Yonezawa-T2\/RIOT,FrancescoErmini\/RIOT,plushvoxel\/RIOT,lebrush\/RIOT,biboc\/RIOT,immesys\/RiSyn,basilfx\/RIOT,beurdouche\/RIOT,Hyungsin\/RIOT-OS,rajma996\/RIOT,gebart\/RIOT,roberthartung\/RIOT,neiljay\/RIOT,lebrush\/RIOT,RubikonAlpha\/RIOT,jbeyerstedt\/RIOT-OTA-update,adrianghc\/RIOT,rakendrathapa\/RIOT,binarylemon\/RIOT,kbumsik\/RIOT,RBartz\/RIOT,neumodisch\/RIOT,kYc0o\/RIOT,BytesGalore\/RIOT,d00616\/RIOT,Yonezawa-T2\/RIOT,jremmert-phytec-iot\/RIOT,x3ro\/RIOT,stevenj\/RIOT,yogo1212\/RIOT,gautric\/RIOT,zhuoshuguo\/RIOT,ant9000\/RIOT,khhhh\/RIOT,LudwigKnuepfer\/RIOT,miri64\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,immesys\/RiSyn,kb2ma\/RIOT,dhruvvyas90\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,herrfz\/RIOT,kYc0o\/RIOT,plushvoxel\/RIOT,dailab\/RIOT,syin2\/RIOT,OTAkeys\/RIOT,yogo1212\/RIOT,mtausig\/RIOT,LudwigOrtmann\/RIOT,OTAkeys\/RIOT,d00616\/RIOT,jremmert-phytec-iot\/RIOT,l3nko\/RIOT,wentaoshang\/RIOT,altairpearl\/RIOT,l3nko\/RIOT,yogo1212\/RIOT,avmelnikoff\/RIOT,malosek\/RIOT,asanka-code\/RIOT,ks156\/RIOT,l3nko\/RIOT,syin2\/RIOT,beurdouche\/RIOT,plushvoxel\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,jbeyerstedt\/RIOT-OTA-update,smlng\/RIOT,FrancescoErmini\/RIOT,mziegert\/RIOT,backenklee\/RIOT,adjih\/RIOT,stevenj\/RIOT,mtausig\/RIOT,lazytech-org\/RIOT,jasonatran\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,stevenj\/RIOT,backenklee\/RIOT,adrianghc\/RIOT,RBartz\/RIOT,authmillenon\/RIOT,roberthartung\/RIOT,TobiasFredersdorf\/RIOT,khhhh\/RIOT,mtausig\/RIOT,backenklee\/RIOT,thomaseichinger\/RIOT,brettswann\/RIOT,miri64\/RIOT,kYc0o\/RIOT,brettswann\/RIOT,ant9000\/RIOT,dhruvvyas90\/RIOT,Yonezawa-T2\/RIOT,LudwigOrtmann\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sys\/shell\/commands\/sc_icmpv6_echo.c\n+++ sys\/shell\/commands\/sc_icmpv6_echo.c\n@@ -161,11 +161,7 @@\n usage(argv);\n return 1;\n }\n- else if ((count = atoi(argv[1])) > 0) {\n- if (argc < 3) {\n- usage(argv);\n- return 1;\n- }\n+ else if ((argc > 2) && ((count = atoi(argv[1])) > 0)) {\n param_offset = 1;\n }\n else {\n"} {"commit":"77abed157a62c3cde74bf648b0302a9c8090bfa9","subject":"in_uade: Fixup to new API [ADAPTIVE]","message":"in_uade: Fixup to new API [ADAPTIVE]\n","repos":"japeq\/japlay","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- in_uade.c\n+++ in_uade.c\n@@ -19,29 +19,52 @@\n \tstruct uade_state *play;\n };\n \n-static void init_uade(struct input_plugin_ctx *ctx)\n+static int init_uade(struct input_plugin_ctx *ctx)\n {\n+\tint ret = 0;\n+\n \t\/* Fix me: racy initialization *\/\n-\tif (scanstate == NULL)\n+\tif (scanstate == NULL) {\n \t\tscanstate = uade_new_state(NULL, NULL);\n-\tif (ctx != NULL && ctx->play == NULL)\n+\t\tif (scanstate == NULL) {\n+\t\t\twarning(\"uade: can not initialize scanstate\\n\");\n+\t\t\tret = -1;\n+\t\t}\n+\t}\n+\n+\tif (ctx != NULL && ctx->play == NULL) {\n \t\tctx->play = uade_new_state(NULL, NULL);\n+\t\tif (ctx->play == NULL)\n+\t\t\tret = -1;\n+\t}\n+\n+\treturn ret;\n }\n \n static bool uade_detect(const char *filename)\n {\n-\tinit_uade(NULL);\n+\tif (init_uade(NULL))\n+\t\treturn 0;\n \treturn uade_is_our_file(filename, scanstate);\n }\n \n static int uade_open(struct input_plugin_ctx *ctx, struct input_state *state,\n \t\t const char *filename)\n {\n+\tint ret;\n+\n \tUNUSED(state);\n \n-\tinit_uade(ctx);\n+\tif (init_uade(ctx))\n+\t\treturn -1;\n \n-\tif (uade_play(filename, -1, ctx->play)) {\n+\tret = uade_play(filename, -1, ctx->play);\n+\tif (ret < 0) {\n+\t\twarning(\"uade: protocol error while playing %s\\n\", filename);\n+\t\tuade_cleanup_state(ctx->play);\n+\t\tctx->play = NULL;\n+\t\treturn -1;\n+\t} else if (ret == 0) {\n \t\twarning(\"uade: unable to open file %s\\n\", filename);\n \t\treturn -1;\n \t}\n@@ -55,9 +78,7 @@\n \n static const char *get_fname(struct uade_state *state)\n {\n-\tstruct uade_song_info info;\n-\tuade_get_song_info(&info, state);\n-\treturn info.fname;\n+\treturn uade_get_song_info(state)->modulefname;\n }\n \n static size_t uade_fillbuf(struct input_plugin_ctx *ctx, sample_t *buffer,\n"} {"commit":"a9e3c94d76c38159b389e2039658213760670619","subject":"SUBSCRIBE\/UNSUBSCRIBE was broken with namespace prefixes.","message":"SUBSCRIBE\/UNSUBSCRIBE was broken with namespace prefixes.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-subscribe.c\n+++ src\/imap\/cmd-subscribe.c\n@@ -22,13 +22,12 @@\n \t\treturn TRUE;\n \t}\n \tstorage = ns->storage;\n-\tverify_name += strlen(ns->prefix);\n \n \tif ((client_workarounds & WORKAROUND_TB_EXTRA_MAILBOX_SEP) != 0 &&\n \t *mailbox != '\\0' && mailbox[strlen(mailbox)-1] ==\n \t mail_storage_get_hierarchy_sep(storage)) {\n \t\t\/* verify the validity without the trailing '\/' *\/\n-\t\tverify_name = t_strndup(mailbox, strlen(mailbox)-1);\n+\t\tverify_name = t_strndup(verify_name, strlen(verify_name)-1);\n \t}\n \n \tif (!client_verify_mailbox_name(cmd, verify_name, subscribe, FALSE))\n"} {"commit":"2e06761531849a85cc35b2eacfe01b9958392820","subject":"fix error message","message":"fix error message\n","repos":"mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- racket\/src\/racket\/src\/list.c\n+++ racket\/src\/racket\/src\/list.c\n@@ -3131,7 +3131,7 @@\n if (!scheme_check_proc_arity(NULL, 3, 1, 2, vals))\n scheme_raise_exn(MZEXN_FAIL_CONTRACT,\n \"%s: chaperone produced a second value that does not match the expected contract\\n\"\n- \" expected: (procedure-arity-includes\/c 2)\\n\"\n+ \" expected: (procedure-arity-includes\/c 3)\\n\"\n \" received: %V\", \n who,\n red);\n"} {"commit":"5102e4d88293f292bd581e2eb9d875a71f3e8af8","subject":"card-piv: 'emulate' MF selection by selection of the PIV applet ...","message":"card-piv: 'emulate' MF selection by selection of the PIV applet ...\n\nso that, PIV card can be used with the 'opensc-explorer' interactive tool\n\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@5317 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"aobaid\/OpenSC,l1k\/OpenSC,germanblanco\/OpenSC,rickyepoderi\/OpenSC,germanblanco\/OpenSC,fabled\/OpenSC,adminmt\/OpenSC,rickyepoderi\/OpenSC,Jakuje\/OpenSC,dirkx\/OpenSC.tokend,kasparsd\/opensc-latvia-id,dirkx\/OpenSC.tokend,0x7678\/myOpenSC,0x7678\/OpenSC,fabled\/OpenSC,velter\/OpenSC,dirkx\/OpenSC.tokend,fabled\/OpenSC,marschap\/pkg-opensc,fabled\/OpenSC,marschap\/pkg-opensc,gemini\/OpenSC,carlhoerberg\/OpenSC,0x7678\/myOpenSC,dirkx\/OpenSC.tokend,dirkx\/OpenSC,gemini\/OpenSC,philipWendland\/OpenSC,0x7678\/myOpenSC,CardContact\/OpenSC,frankmorgner\/OpenSC,metsma\/OpenSC,dengert\/OpenSC,hongquan\/OpenSC-main,0x7678\/myOpenSC,kasparsd\/opensc-latvia-id,kasparsd\/opensc-latvia-id,gemini\/OpenSC,velter\/OpenSC,0x7678\/OpenSC,jpki\/OpenSC,philipWendland\/OpenSC,hhonkanen\/OpenSC,tidatida\/OpenSC,l1k\/OpenSC,philipWendland\/OpenSC,carlhoerberg\/OpenSC,0x7678\/OpenSC,LudovicRousseau\/OpenSC,rickyepoderi\/OpenSC,carlhoerberg\/OpenSC,ieugen\/OpenSC,mtrojnar\/OpenSC,financeX\/OpenSC,dengert\/OpenSC,velter\/OpenSC,jpki\/OpenSC,AktivCo\/OpenSC,ieugen\/OpenSC,adminmt\/OpenSC,OpenSC\/OpenSC,metsma\/OpenSC,mouse07410\/OpenSC,hongquan\/OpenSC-main,nmav\/OpenSC,viktorTarasov\/OpenSC-SM,OpenSC\/OpenSC,ieugen\/OpenSC,CardContact\/OpenSC,hhonkanen\/OpenSC,dirkx\/OpenSC,frankmorgner\/OpenSC,UIKit0\/OpenSC,aobaid\/OpenSC,financeX\/OpenSC,UIKit0\/OpenSC,gentoo\/OpenSC,l1k\/OpenSC,AktivCo\/OpenSC,adminmt\/OpenSC,dirkx\/OpenSC,velter\/OpenSC,martinpaljak\/OpenSC,martinpaljak\/OpenSC,Jakuje\/OpenSC,carlhoerberg\/OpenSC,germanblanco\/OpenSC,Jakuje\/OpenSC,adminmt\/OpenSC,tidatida\/OpenSC,dirkx\/OpenSC.tokend,0x7678\/OpenSC,mouse07410\/OpenSC,frankmorgner\/OpenSC,viktorTarasov\/OpenSC-SM,tidatida\/OpenSC,ieugen\/OpenSC,AktivCo\/OpenSC,metsma\/OpenSC,financeX\/OpenSC,carlhoerberg\/OpenSC,gentoo\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,CardContact\/OpenSC,frankmorgner\/OpenSC,tidatida\/OpenSC,gentoo\/OpenSC,dirkx\/OpenSC.tokend,financeX\/OpenSC,dirkx\/OpenSC,marschap\/pkg-opensc,UIKit0\/OpenSC,viktorTarasov\/OpenSC-SM,financeX\/OpenSC,mouse07410\/OpenSC,mtrojnar\/OpenSC,nmav\/OpenSC,dirkx\/OpenSC,OpenSC\/OpenSC,Jakuje\/OpenSC,hongquan\/OpenSC-main,marschap\/pkg-opensc,mtrojnar\/OpenSC,kasparsd\/opensc-latvia-id,aobaid\/OpenSC,0x7678\/myOpenSC,aobaid\/OpenSC,nmav\/OpenSC,jpki\/OpenSC,LudovicRousseau\/OpenSC,LudovicRousseau\/OpenSC,martinpaljak\/OpenSC,UIKit0\/OpenSC,gentoo\/OpenSC,hhonkanen\/OpenSC,dengert\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libopensc\/card-piv.c\n+++ src\/libopensc\/card-piv.c\n@@ -676,7 +676,7 @@\n \tSC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);\n \tsc_debug(card->ctx, SC_LOG_DEBUG_NORMAL,\n \t\t\"Got args: aid=%x, aidlen=%d, response=%x, responselen=%d\\n\",\n-\t\taid, aidlen, response, *responselen);\n+\t\taid, aidlen, response, responselen ? *responselen : 0);\n \n \tsc_format_apdu(card, &apdu, \n \t\tresponse == NULL ? SC_APDU_CASE_3_SHORT : SC_APDU_CASE_4_SHORT, 0xA4, 0x04, 0x00);\n@@ -684,11 +684,12 @@\n \tapdu.data = aid;\n \tapdu.datalen = aidlen;\n \tapdu.resp = response;\n-\tapdu.resplen = *responselen;\n+\tapdu.resplen = responselen ? *responselen : 0;\n \tapdu.le = response == NULL ? 0 : 256; \/* could be 21 for fci *\/\n \n \tr = sc_transmit_apdu(card, &apdu);\n-\t*responselen = apdu.resplen;\n+\tif (responselen)\n+\t\t*responselen = apdu.resplen;\n \tSC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, \"PIV select failed\");\n \tSC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, sc_check_sw(card, apdu.sw1, apdu.sw2));\n }\n@@ -2103,9 +2104,17 @@\n \t\n \t\/* only support single EF in current application *\/\n \n-\tif (pathlen > 2 && memcmp(path, \"\\x3F\\x00\", 2) == 0) {\n-\t\tpath += 2;\n-\t\tpathlen -= 2;\n+\tif (memcmp(path, \"\\x3F\\x00\", 2) == 0) {\n+\t\tif (pathlen == 2) {\n+\t\t\tr = piv_select_aid(card, piv_aids[0].value, piv_aids[0].len_short, NULL, NULL);\n+\t\t\tSC_TEST_RET(card->ctx, SC_LOG_DEBUG_NORMAL, r, \"Cannot select PIV AID\");\n+\t\t\n+\t\t\tSC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r); \n+\t\t}\n+\t\telse if (pathlen > 2) {\n+\t\t\tpath += 2;\n+\t\t\tpathlen -= 2;\n+\t\t}\n \t}\n \t \n \ti = piv_find_obj_by_containerid(card, path);\n"} {"commit":"cd17180e64f098ced20adb45eacc0d6864d473d1","subject":"Add docstring documentation for new PVRTC enum","message":"Add docstring documentation for new PVRTC enum\n","repos":"googlestadia\/renderdoc,cgmb\/renderdoc,etnlGD\/renderdoc,TurtleRockStudios\/renderdoc_public,baldurk\/renderdoc,Zorro666\/renderdoc,cgmb\/renderdoc,cgmb\/renderdoc,baldurk\/renderdoc,michaelrgb\/renderdoc,etnlGD\/renderdoc,etnlGD\/renderdoc,TurtleRockStudios\/renderdoc_public,michaelrgb\/renderdoc,michaelrgb\/renderdoc,TurtleRockStudios\/renderdoc_public,googlestadia\/renderdoc,Zorro666\/renderdoc,googlestadia\/renderdoc,Zorro666\/renderdoc,baldurk\/renderdoc,baldurk\/renderdoc,cgmb\/renderdoc,baldurk\/renderdoc,TurtleRockStudios\/renderdoc_public,etnlGD\/renderdoc,michaelrgb\/renderdoc,etnlGD\/renderdoc,googlestadia\/renderdoc,Zorro666\/renderdoc,baldurk\/renderdoc,etnlGD\/renderdoc,TurtleRockStudios\/renderdoc_public,Zorro666\/renderdoc,michaelrgb\/renderdoc,googlestadia\/renderdoc,TurtleRockStudios\/renderdoc_public,Zorro666\/renderdoc,cgmb\/renderdoc,googlestadia\/renderdoc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- renderdoc\/api\/replay\/replay_enums.h\n+++ renderdoc\/api\/replay\/replay_enums.h\n@@ -1115,6 +1115,10 @@\n .. data:: YUV\n \n The pixel data is in an opaque YUV format.\n+\n+.. data:: PVRTC\n+\n+ PowerVR properitary texture compression format.\n )\");\n enum class ResourceFormatType : uint8_t\n {\n"} {"commit":"ae37e0bdd3392700c05e787553e33a417d927490","subject":"Added defins for company name, component id, install timeout (network component installation)","message":"Added defins for company name, component id, install timeout (network component installation)\n","repos":"SageAxcess\/pcap-ndis6,SageAxcess\/pcap-ndis6,SageAxcess\/pcap-ndis6,SageAxcess\/pcap-ndis6","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/shared\/SharedTypes.h\n+++ src\/shared\/SharedTypes.h\n@@ -204,6 +204,11 @@\n \n } PACKET_DESC, *PPACKET_DESC, *LPPACKET_DESC;\n \n+#define FILTER_COMPANY_PRODUCT_NAME L\"ChangeDynamix AEGIS\"\n+#define FILTER_COMPONENT_ID L\"PcapNdis6\"\n+#define FILTER_INSTALL_TIMEOUT 60000\n+\n+\n #define FILTER_UNIQUE_NAME L\"{37195A99-7BC5-4C82-B00A-553C75C0AA1A}\"\n #define FILTER_SERVICE_NAME L\"PcapNdis6\"\n #define FILTER_PROTOCOL_NAME\t\t L\"PcapNdis6\"\n"} {"commit":"25ae538b0db6cca5ad64b4717596ad743f8fdb8c","subject":"When RX checksum offloading is active, AX88772B will prepend a checksum header. The header contains a received frame length but the defined length for AX88772B is different with other ASIX controllers. When the RX checksum is off, AX88772B controller does not prepend a checksum header so driver has to use normal header length mask. This change should fix RX errors when RX checksum offloading is off.","message":"When RX checksum offloading is active, AX88772B will prepend a\nchecksum header. The header contains a received frame length but\nthe defined length for AX88772B is different with other ASIX\ncontrollers. When the RX checksum is off, AX88772B controller does\nnot prepend a checksum header so driver has to use normal header\nlength mask.\nThis change should fix RX errors when RX checksum offloading is\noff.\n\nTested by:\tkevlo\nMFC After:\t1 week\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"596c62f81fa81ba20e46c398d6c38c894e150ad1","subject":"Sprz\u0105tanie ostrze\u017ce\u0144.","message":"Sprz\u0105tanie ostrze\u017ce\u0144.\n\n\ngit-svn-id: 5ce22904ebd2e91e07686586c06e775ed4fb9e1a@1290 d0e0d552-48cc-411f-a74d-6ebdfb0732cf\n","repos":"porridge\/libgadu,porridge\/libgadu,porridge\/libgadu","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"bcda6ec5276ac5d4957c0597834d6d1ede6c03f0","subject":"Added comments and to-be-implemented test functions","message":"Added comments and to-be-implemented test functions\n","repos":"Forceflow\/libmorton","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/libmorton_test_2D.h\n+++ test\/libmorton_test_2D.h\n@@ -1,6 +1,5 @@\n #pragma once\n #include \"libmorton_test.h\"\n-\n \n \/\/ Config variables (defined elsewhere)\n extern size_t RAND_POOL_SIZE;\n@@ -9,7 +8,7 @@\n extern unsigned int times;\n extern std::vector<uint_fast64_t> running_sums;\n \n-\/\/ Check a 2D Encode Function for correctness\n+\/\/ Check a 2D encode function for correctness\n template <typename morton, typename coord, size_t bits>\n static bool check2D_EncodeFunction(const encode_f_2D_wrapper<morton, coord> &function) {\n \t\n@@ -45,7 +44,7 @@\n \treturn everything_okay;\n }\n \n-\/\/ Check a 2D Decode Function for correctness\n+\/\/ Check a 2D decode function for correctness\n template <typename morton, typename coord, size_t bits>\n static bool check2D_DecodeFunction(const decode_f_2D_wrapper<morton, coord> &function) {\n \n@@ -93,6 +92,7 @@\n \treturn everything_okay;\n }\n \n+\/\/ Check vector of 2D encode functions for correctness\n template <typename morton, typename coord, size_t bits>\n inline bool check2D_EncodeCorrectness(std::vector<encode_f_2D_wrapper<morton, coord>> encoders) {\n \tprintf(\"++ Checking correctness of 2D encoders (%zu bit) methods ... \", bits);\n@@ -104,6 +104,7 @@\n \treturn ok;\n }\n \n+\/\/ Check vector of 2D decode functions for correctness\n template <typename morton, typename coord, size_t bits>\n inline bool check2D_DecodeCorrectness(std::vector<decode_f_2D_wrapper<morton, coord>> decoders) {\n \tprintf(\"++ Checking correctness of 2D decoding (%zu bit) methods ... \", bits);\n@@ -115,6 +116,7 @@\n \treturn ok;\n }\n \n+\/\/ Check 2D encode function performance (linear)\n template <typename morton, typename coord>\n static double testEncode_2D_Linear_Perf(morton(*function)(coord, coord), size_t times) {\n \tTimer timer = Timer();\n@@ -132,6 +134,7 @@\n \treturn timer.elapsed_time_milliseconds \/ (float)times;\n }\n \n+\/\/ Check 2D encode function performance (random)\n template <typename morton, typename coord>\n static double testEncode_2D_Random_Perf(morton(*function)(coord, coord), size_t times) {\n \tTimer timer = Timer();\n@@ -157,3 +160,15 @@\n \trunning_sums.push_back(runningsum);\n \treturn timer.elapsed_time_milliseconds \/ (float)times;\n }\n+\n+\/\/ TODO: Check 2D decode function performance (linear)\n+template <typename morton, typename coord>\n+static double testDecode_2D_Linear_Perf(morton(*function)(coord, coord), size_t times) {\n+\t\/\/ TODO\n+}\n+\n+\/\/ TODO: Check 2D decode function performance (random)\n+template <typename morton, typename coord>\n+static double testEncode_2D_Random_Perf(morton(*function)(coord, coord), size_t times) {\n+\t\/\/ TODO\n+}\n"} {"commit":"56f35ede0a14b5206ced8d01c84203bbea257314","subject":"macos: disable ASL for timerfd tests","message":"macos: disable ASL for timerfd tests\n","repos":"jiixyj\/epoll-shim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/timerfd-root-test.c\n+++ test\/timerfd-root-test.c\n@@ -45,7 +45,12 @@\n ATF_TC(timerfd_root__zero_read_on_abs_realtime);\n ATF_TC_HEAD(timerfd_root__zero_read_on_abs_realtime, tc)\n {\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__zero_read_on_abs_realtime, tc)\n {\n@@ -122,7 +127,12 @@\n ATF_TC(timerfd_root__read_on_abs_realtime_no_interval);\n ATF_TC_HEAD(timerfd_root__read_on_abs_realtime_no_interval, tc)\n {\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__read_on_abs_realtime_no_interval, tc)\n {\n@@ -160,7 +170,12 @@\n ATF_TC(timerfd_root__cancel_on_set);\n ATF_TC_HEAD(timerfd_root__cancel_on_set, tc)\n {\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__cancel_on_set, tc)\n {\n@@ -295,7 +310,12 @@\n ATF_TC(timerfd_root__cancel_on_set_init);\n ATF_TC_HEAD(timerfd_root__cancel_on_set_init, tc)\n {\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__cancel_on_set_init, tc)\n {\n@@ -363,7 +383,12 @@\n ATF_TC_HEAD(timerfd_root__clock_change_notification, tc)\n {\n \tatf_tc_set_md_var(tc, \"timeout\", \"10\");\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__clock_change_notification, tc)\n {\n@@ -408,7 +433,12 @@\n ATF_TC(timerfd_root__advance_time_no_cancel);\n ATF_TC_HEAD(timerfd_root__advance_time_no_cancel, tc)\n {\n-\tatf_tc_set_md_var(tc, \"X-ctest.properties\", \"RUN_SERIAL TRUE\");\n+\tatf_tc_set_md_var(tc, \"X-ctest.properties\",\n+\t \"RUN_SERIAL TRUE\"\n+#ifdef __APPLE__\n+\t \" ENVIRONMENT ASL_DISABLE=1\"\n+#endif\n+\t);\n }\n ATF_TC_BODY_FD_LEAKCHECK(timerfd_root__advance_time_no_cancel, tc)\n {\n"} {"commit":"c21102dd435bf18b106f7120f13b6a88bb3ede63","subject":"debug","message":"debug\n","repos":"arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat,arahatashun\/cansat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test_program\/gyromotor.c\n+++ test_program\/gyromotor.c\n@@ -30,10 +30,10 @@\n \t\treadGyro(&gyro_data);\n \t\tnow = millis();\n \t\tint delta_time = now-lastTime;\n-\t\tdelta_theta += gyro_data.gyroZ_scaled*delta_time\/1000;\/\/convert2seconds\n+\t\tdelta_theta -= gyro_data.gyroZ_scaled*delta_time\/1000;\/\/convert2seconds\n \t\tprintf(\"%f\\n\",delta_theta);\n \t\tlastTime = now;\n-\t\tdouble rotate_power = delta_theta + 90;\n+\t\tdouble rotate_power = 90 - delat_theta;\n \t\tprintf(\"rotate power:%f\\n\",rotate_power);\n \t\tmotor_rotate(rotate_power);\n \t}\n"} {"commit":"c7fcb3f2aa36c00dd87361da760459699f408076","subject":"cbor: rename RUN_ONE test macro","message":"cbor: rename RUN_ONE test macro\n\nThis makes the next commit cleaner.\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/libjeffpc,jeffpc\/libjeffpc,jeffpc\/libjeffpc,jeffpc\/libjeffpc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/test_cbor_unpack.c\n+++ tests\/test_cbor_unpack.c\n@@ -38,7 +38,7 @@\n \tfprintf(stderr, \"%s\", tmp);\n }\n \n-#define RUN_ONE(fxn, exp_ret, alloc, in, exp)\t\t\t\t\\\n+#define RUN_ONE_SIMPLE(fxn, exp_ret, alloc, in, exp)\t\t\t\t\\\n \tdo {\t\t\t\t\t\t\t\t\\\n \t\tstruct buffer tmp;\t\t\t\t\t\\\n \t\tstruct val *wrap;\t\t\t\t\t\\\n@@ -87,25 +87,25 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), 0, VNULL(), in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &nelem, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_array_end(in, true),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_map_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), 0, VNULL(), in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &nelem, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, true),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n }\n \n@@ -120,25 +120,25 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), 0, VBOOL(b), in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &nelem, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_array_end(in, true),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_map_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), 0, VBOOL(b), in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &nelem, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, true),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n }\n \n@@ -154,25 +154,25 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), 0, VINT(u), in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), int_ret, VINT(i), in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), 0, VINT(u), in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), int_ret, VINT(i), in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &nelem, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_array_end(in, true),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_map_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &nelem, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, true),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n }\n \n@@ -187,25 +187,25 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t 0, VSTR(s), in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),0, VSTRCAST(str), in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &nelem, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_array_end(in, true),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_map_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),0, VSTRCAST(str), in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &nelem, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, true),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n }\n \n@@ -220,28 +220,28 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n \n #if 0\n-\t\/* FIXME: RUN_ONE resets the buffer state *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &npairs, &end_required),\n+\t\/* FIXME: RUN_ONE_SIMPLE resets the buffer state *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &npairs, &end_required),\n \t\t\t\t\t 0, X, in, exp);\n \t\/* TODO: unpack vals in a loop *\/\n-\tRUN_ONE(cbor_unpack_array_end(in, end_required),\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, end_required),\n \t\t\t\t\t 0, X, in, exp);\n #endif\n \n \t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_map_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n }\n \n@@ -256,27 +256,27 @@\n \tchar *s;\n \tbool b;\n \n-\tRUN_ONE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n+\tRUN_ONE_SIMPLE(cbor_unpack_uint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_nint(&tmp, &u), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_int(&tmp, &i), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_cstr_len(&tmp, &s, &ss),\n \t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n-\n-\t\/* only need to check the starts & forced ends *\/\n-\tRUN_ONE(cbor_unpack_array_start(in, &nelem, &end_required),\n-\t\t\t\t\t -EILSEQ, NULL, in, exp);\n-\tRUN_ONE(cbor_unpack_array_end(in, true),\n+\tRUN_ONE_SIMPLE(cbor_unpack_str(&tmp, &str),-EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_bool(&tmp, &b), -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_null(&tmp), -EILSEQ, NULL, in, exp);\n+\n+\t\/* only need to check the starts & forced ends *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_start(in, &nelem, &end_required),\n+\t\t\t\t\t -EILSEQ, NULL, in, exp);\n+\tRUN_ONE_SIMPLE(cbor_unpack_array_end(in, true),\n \t\t\t\t\t -EILSEQ, NULL, in, exp);\n \n #if 0\n-\t\/* FIXME: RUN_ONE resets the buffer state *\/\n-\tRUN_ONE(cbor_unpack_map_start(in, &npairs, &end_required),\n+\t\/* FIXME: RUN_ONE_SIMPLE resets the buffer state *\/\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_start(in, &npairs, &end_required),\n \t\t\t\t\t 0, X, in, exp);\n \t\/* TODO: unpack vals in a loop *\/\n-\tRUN_ONE(cbor_unpack_map_end(in, end_required),\n+\tRUN_ONE_SIMPLE(cbor_unpack_map_end(in, end_required),\n \t\t\t\t\t 0, X, in, exp);\n #endif\n }\n"} {"commit":"fffe8b547dbdfba227b955fae0347258b19495b4","subject":"- ehci: free error TD for recovery","message":"- ehci: free error TD for recovery\n","repos":"hathach\/tinyusb,hathach\/tinyusb,hathach\/tinyusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tinyusb\/host\/ehci\/ehci.c\n+++ tinyusb\/host\/ehci\/ehci.c\n@@ -561,13 +561,17 @@\n \/\/p_qhd->qtd_overlay.non_hs_period_missed_uframe || p_qhd->qtd_overlay.pingstate_err TODO split transaction error\n (p_qhd->device_address != 0 && p_qhd->qtd_overlay.halted) ) \/\/ addr0 cannot be protocol STALL\n {\n+ hal_debugger_breakpoint();\n+\n+ p_qhd->p_qtd_list_head->used = 0; \/\/ free QTD\n+ qtd_remove_1st_from_qhd(p_qhd);\n+\n pipe_handle_t pipe_hdl = { .dev_addr = p_qhd->device_address };\n if (p_qhd->endpoint_number) \/\/ if not Control, can only be Bulk\n {\n pipe_hdl.xfer_type = TUSB_XFER_BULK;\n pipe_hdl.index = qhd_get_index(p_qhd);\n }\n- hal_debugger_breakpoint();\n usbh_isr( pipe_hdl, p_qhd->class_code, TUSB_EVENT_XFER_ERROR); \/\/ call USBH callback\n }\n \n"} {"commit":"11930196373d605c76fb6cda0b77b71ab3584a8d","subject":"tools\/bluetooth-player: Add show command","message":"tools\/bluetooth-player: Add show command\n\nAdd support for show command which can be used to show player\ninformation\n","repos":"ComputeCycles\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,mapfau\/bluez,pkarasev3\/bluez,pkarasev3\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/bluetooth-player.c\n+++ tools\/bluetooth-player.c\n@@ -323,6 +323,124 @@\n \t}\n }\n \n+static GDBusProxy *find_player(const char *path)\n+{\n+\tGSList *l;\n+\n+\tfor (l = players; l; l = g_slist_next(l)) {\n+\t\tGDBusProxy *proxy = l->data;\n+\n+\t\tif (strcmp(path, g_dbus_proxy_get_path(proxy)) == 0)\n+\t\t\treturn proxy;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static void print_iter(const char *label, const char *name,\n+\t\t\t\t\t\tDBusMessageIter *iter)\n+{\n+\tdbus_bool_t valbool;\n+\tdbus_uint32_t valu32;\n+\tdbus_uint16_t valu16;\n+\tdbus_int16_t vals16;\n+\tconst char *valstr;\n+\tDBusMessageIter subiter;\n+\n+\tif (iter == NULL) {\n+\t\trl_printf(\"%s%s is nil\\n\", label, name);\n+\t\treturn;\n+\t}\n+\n+\tswitch (dbus_message_iter_get_arg_type(iter)) {\n+\tcase DBUS_TYPE_INVALID:\n+\t\trl_printf(\"%s%s is invalid\\n\", label, name);\n+\t\tbreak;\n+\tcase DBUS_TYPE_STRING:\n+\tcase DBUS_TYPE_OBJECT_PATH:\n+\t\tdbus_message_iter_get_basic(iter, &valstr);\n+\t\trl_printf(\"%s%s: %s\\n\", label, name, valstr);\n+\t\tbreak;\n+\tcase DBUS_TYPE_BOOLEAN:\n+\t\tdbus_message_iter_get_basic(iter, &valbool);\n+\t\trl_printf(\"%s%s: %s\\n\", label, name,\n+\t\t\t\t\tvalbool == TRUE ? \"yes\" : \"no\");\n+\t\tbreak;\n+\tcase DBUS_TYPE_UINT32:\n+\t\tdbus_message_iter_get_basic(iter, &valu32);\n+\t\trl_printf(\"%s%s: 0x%06x\\n\", label, name, valu32);\n+\t\tbreak;\n+\tcase DBUS_TYPE_UINT16:\n+\t\tdbus_message_iter_get_basic(iter, &valu16);\n+\t\trl_printf(\"%s%s: 0x%04x\\n\", label, name, valu16);\n+\t\tbreak;\n+\tcase DBUS_TYPE_INT16:\n+\t\tdbus_message_iter_get_basic(iter, &vals16);\n+\t\trl_printf(\"%s%s: %d\\n\", label, name, vals16);\n+\t\tbreak;\n+\tcase DBUS_TYPE_VARIANT:\n+\t\tdbus_message_iter_recurse(iter, &subiter);\n+\t\tprint_iter(label, name, &subiter);\n+\t\tbreak;\n+\tcase DBUS_TYPE_ARRAY:\n+\t\tdbus_message_iter_recurse(iter, &subiter);\n+\t\twhile (dbus_message_iter_get_arg_type(&subiter) !=\n+\t\t\t\t\t\t\tDBUS_TYPE_INVALID) {\n+\t\t\tprint_iter(label, name, &subiter);\n+\t\t\tdbus_message_iter_next(&subiter);\n+\t\t}\n+\t\tbreak;\n+\tcase DBUS_TYPE_DICT_ENTRY:\n+\t\tdbus_message_iter_recurse(iter, &subiter);\n+\t\tdbus_message_iter_get_basic(&subiter, &valstr);\n+\t\tdbus_message_iter_next(&subiter);\n+\t\tprint_iter(label, valstr, &subiter);\n+\t\tbreak;\n+\tdefault:\n+\t\trl_printf(\"%s%s has unsupported type\\n\", label, name);\n+\t\tbreak;\n+\t}\n+}\n+\n+static void print_property(GDBusProxy *proxy, const char *name)\n+{\n+\tDBusMessageIter iter;\n+\n+\tif (g_dbus_proxy_get_property(proxy, name, &iter) == FALSE)\n+\t\treturn;\n+\n+\tprint_iter(\"\\t\", name, &iter);\n+}\n+\n+static void cmd_show(int argc, char *argv[])\n+{\n+\tGDBusProxy *proxy;\n+\n+\tif (argc < 2) {\n+\t\tif (check_default_player() == FALSE)\n+\t\t\treturn;\n+\n+\t\tproxy = default_player;\n+\t} else {\n+\t\tproxy = find_player(argv[1]);\n+\t\tif (!proxy) {\n+\t\t\trl_printf(\"Player %s not available\\n\", argv[1]);\n+\t\t\treturn;\n+\t\t}\n+\t}\n+\n+\trl_printf(\"Player %s\\n\", g_dbus_proxy_get_path(proxy));\n+\n+\tprint_property(proxy, \"Name\");\n+\tprint_property(proxy, \"Repeat\");\n+\tprint_property(proxy, \"Equalizer\");\n+\tprint_property(proxy, \"Shuffle\");\n+\tprint_property(proxy, \"Scan\");\n+\tprint_property(proxy, \"Status\");\n+\tprint_property(proxy, \"Position\");\n+\tprint_property(proxy, \"Track\");\n+}\n+\n static const struct {\n \tconst char *cmd;\n \tconst char *arg;\n@@ -330,6 +448,7 @@\n \tconst char *desc;\n } cmd_table[] = {\n \t{ \"list\", NULL, cmd_list, \"List available players\" },\n+\t{ \"show\", \"[player]\", cmd_show, \"Player information\" },\n \t{ \"play\", NULL, cmd_play, \"Start playback\" },\n \t{ \"pause\", NULL, cmd_pause, \"Pause playback\" },\n \t{ \"stop\", NULL, cmd_stop, \"Stop playback\" },\n@@ -590,71 +709,6 @@\n \t\tplayer_removed(proxy);\n }\n \n-static void print_iter(const char *label, const char *name,\n-\t\t\t\t\t\tDBusMessageIter *iter)\n-{\n-\tdbus_bool_t valbool;\n-\tdbus_uint32_t valu32;\n-\tdbus_uint16_t valu16;\n-\tdbus_int16_t vals16;\n-\tconst char *valstr;\n-\tDBusMessageIter subiter;\n-\n-\tif (iter == NULL) {\n-\t\trl_printf(\"%s%s is nil\\n\", label, name);\n-\t\treturn;\n-\t}\n-\n-\tswitch (dbus_message_iter_get_arg_type(iter)) {\n-\tcase DBUS_TYPE_INVALID:\n-\t\trl_printf(\"%s%s is invalid\\n\", label, name);\n-\t\tbreak;\n-\tcase DBUS_TYPE_STRING:\n-\tcase DBUS_TYPE_OBJECT_PATH:\n-\t\tdbus_message_iter_get_basic(iter, &valstr);\n-\t\trl_printf(\"%s%s: %s\\n\", label, name, valstr);\n-\t\tbreak;\n-\tcase DBUS_TYPE_BOOLEAN:\n-\t\tdbus_message_iter_get_basic(iter, &valbool);\n-\t\trl_printf(\"%s%s: %s\\n\", label, name,\n-\t\t\t\t\tvalbool == TRUE ? \"yes\" : \"no\");\n-\t\tbreak;\n-\tcase DBUS_TYPE_UINT32:\n-\t\tdbus_message_iter_get_basic(iter, &valu32);\n-\t\trl_printf(\"%s%s: 0x%06x\\n\", label, name, valu32);\n-\t\tbreak;\n-\tcase DBUS_TYPE_UINT16:\n-\t\tdbus_message_iter_get_basic(iter, &valu16);\n-\t\trl_printf(\"%s%s: 0x%04x\\n\", label, name, valu16);\n-\t\tbreak;\n-\tcase DBUS_TYPE_INT16:\n-\t\tdbus_message_iter_get_basic(iter, &vals16);\n-\t\trl_printf(\"%s%s: %d\\n\", label, name, vals16);\n-\t\tbreak;\n-\tcase DBUS_TYPE_VARIANT:\n-\t\tdbus_message_iter_recurse(iter, &subiter);\n-\t\tprint_iter(label, name, &subiter);\n-\t\tbreak;\n-\tcase DBUS_TYPE_ARRAY:\n-\t\tdbus_message_iter_recurse(iter, &subiter);\n-\t\twhile (dbus_message_iter_get_arg_type(&subiter) !=\n-\t\t\t\t\t\t\tDBUS_TYPE_INVALID) {\n-\t\t\tprint_iter(label, name, &subiter);\n-\t\t\tdbus_message_iter_next(&subiter);\n-\t\t}\n-\t\tbreak;\n-\tcase DBUS_TYPE_DICT_ENTRY:\n-\t\tdbus_message_iter_recurse(iter, &subiter);\n-\t\tdbus_message_iter_get_basic(&subiter, &valstr);\n-\t\tdbus_message_iter_next(&subiter);\n-\t\tprint_iter(label, valstr, &subiter);\n-\t\tbreak;\n-\tdefault:\n-\t\trl_printf(\"%s%s has unsupported type\\n\", label, name);\n-\t\tbreak;\n-\t}\n-}\n-\n static void property_changed(GDBusProxy *proxy, const char *name,\n \t\t\t\t\tDBusMessageIter *iter, void *user_data)\n {\n"} {"commit":"1a2eaefa47ba1e0e199cfe8a4653a5023425bce5","subject":"app\/testpmd: fix build without drivers","message":"app\/testpmd: fix build without drivers\n\nWhen ixgbe and bnxt are disabled, compilation was failing:\n\napp\/test-pmd\/cmdline.c:9396:11: error:\n\tvariable 'vf_rxmode' set but not used\n\nFixes: 4cfe399f6550 (\"net\/bnxt: support to set VF rxmode\")\nCc: stable@dpdk.org\n\nSigned-off-by: Thomas Monjalon <5f50a84c1fa3bcff146405017f36aec1a10a9e38@monjalon.net>\nAcked-by: Bruce Richardson <66b9e8e8fbd5e9f41f91b0af050876182ce9d0e4@intel.com>\nAcked-by: Ajit Khaparde <01965fbd61169dc18f3fb5e13de7f67d298f8924@broadcom.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- app\/test-pmd\/cmdline.c\n+++ app\/test-pmd\/cmdline.c\n@@ -9409,6 +9409,7 @@\n \t}\n \n \tRTE_SET_USED(is_on);\n+\tRTE_SET_USED(vf_rxmode);\n \n #ifdef RTE_NET_IXGBE\n \tif (ret == -ENOTSUP)\n"} {"commit":"a0a47b069b3bdcad769835f3d5ad0aadbc7d394b","subject":"Working on implementing event listener test","message":"Working on implementing event listener test\n","repos":"rliou92\/umonitor,rliou92\/umonitor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -26,11 +26,12 @@\n XEvent event;\n Atom edid_atom, *temp;\n char* display_name = 0; \/\/ TODO is this correct?\n-int i,j,k,l,z;\n+int i,j,k,l,z,num_conn_outputs,num_profiles;\n int *m;\n int save = 0;\n int load = 0;\n int delete = 0;\n+int test_event = 0;\n int numMon,nprop;\n int quiet = 0;\n int cfg_idx;\n@@ -59,6 +60,7 @@\n void load_val_from_config(void);\n void edid_to_string(void);\n void save_profile(void);\n+void listen_for_event(void);\n \n int main(int argc, char **argv) {\n \n@@ -72,6 +74,9 @@\n \t\t}\n \t\telse if (!strcmp(\"--delete\", argv[1])){\n \t\t\tdelete = 1;\n+\t\t}\n+\t\telse if (!strcmp(\"--test-event\", argv[1])){\n+\t\t\ttest_event = 1;\n \t\t}\n \n \t\tprofile_name = argv[2];\n@@ -112,58 +117,66 @@\n \t\t}\n \t}\n \n-\n-\n-\t\/*while (1){\n-\t XNextEvent(myDisp, (XEvent *) &event);\n-\n-\t printf (\"Event received, type = %d\\n\", event.type);\n+\tif (test_event){\n+\t\tlisten_for_event();\n+\t}\n+\n+}\n+\n+void listen_for_event(){\n+\t\/\/ while (1){\n+\t\/\/ Need to find out which profile to load\n+\t\/\/ XNextEvent(myDisp, (XEvent *) &event);\n+\n+\t\/\/ printf (\"Event received, type = %d\\n\", event.type);\n \t\/\/ Get list of connected outputs\n-\tmyDisp = XOpenDisplay(display_name);\n-\tmyWin = DefaultRootWindow(myDisp);\n-\tedid_atom = XInternAtom(myDisp,edid_name,only_if_exists);\n-\n-\t\/\/ Get screen configuration\n-\t\/\/ TODO Assume 1 screen?\n-\t\/\/ TODO Gotta free myScreen XRRFree-something\n-\tmyScreen = XRRGetScreenResources(myDisp,myWin);\n-\t\/\/ XRRSelectInput(myDisp,myWin,RROutputChangeNotifyMask);\n+\tfetch_display_status();\t\n+\n+\tconstruct_output_list();\n+\t\/\/ Get list of available profiles\n+\tnum_profiles = config_setting_length(config_root_setting(&config));\n+\tprintf(\"Num profiles: %d\\n\", num_profiles);\n+\tload_val_from_config();\n+\t\n+\t\/\/ For each profile\n+\t\/\/ Get list of profile outputs\n+\t\/\/ See if the list of connected outputs match the list of profile outputs\n+\t\/\/ If match - load!\n \n \t\/\/ myCrtc = (XRRCrtcInfo*) malloc(myScreen->ncrtc * sizeof(XRRCrtcInfo));\n \t\/\/ for(k=0;k<myScreen->ncrtc;++k) {\n \t\/\/ \tmyCrtc[k] = *XRRGetCrtcInfo(myDisp,myScreen,myScreen->crtcs[k]);\n \t\/\/ }\n \n-\t\/\/ printf(\"Number of outputs: %d\\n\", myScreen->noutput);\n-\tfor (i=0;i<myScreen->noutput;++i) {\n-\tmyOutput = XRRGetOutputInfo(myDisp,myScreen,myScreen->outputs[i]);\n-\t\/\/ printf(\"Name: %s Connection %d\\n\",myOutput->name,myOutput->connection);\n-\tif (!myOutput->connection) {\n-\tXRRGetOutputProperty(myDisp,myScreen->outputs[i],edid_atom,0,100,False,False,AnyPropertyType,&actual_type,&actual_format,&nitems,&bytes_after,&edid);\n-\tif (nitems) {\n-\t\/\/ printf(\"%s: \",edid_name);\n-\t\/\/ Make edid into string\n-\tedid_string = (unsigned char *) malloc((nitems+1) * sizeof(char));\n-\tfor (z=0;z<nitems;++z) {\n-\tif (edid[z] == '\\0') {\n-\tedid_string[z] = '0';\n-\t}\n-\telse {\n-\tedid_string[z] = edid[z];\n-\t}\n-\t\/\/printf(\"%c\",edid_string[z]);\n-\t}\n-\tprintf(\"\\n\");\n-\tedid_string[nitems] = '\\0';\n-\t\/\/ Find out which profile matches the list\n-\t\/\/ XRRUpdateConfiguration?\n-\t}\n-\n-\t}\n-\t}\n-\t}*\/\n-}\n-\n+\t\/\/ \/\/ printf(\"Number of outputs: %d\\n\", myScreen->noutput);\n+\t\/\/ for (i=0;i<myScreen->noutput;++i) {\n+\t\/\/ myOutput = XRRGetOutputInfo(myDisp,myScreen,myScreen->outputs[i]);\n+\t\/\/ \/\/ printf(\"Name: %s Connection %d\\n\",myOutput->name,myOutput->connection);\n+\t\/\/ if (!myOutput->connection) {\n+\t\/\/ XRRGetOutputProperty(myDisp,myScreen->outputs[i],edid_atom,0,100,False,False,AnyPropertyType,&actual_type,&actual_format,&nitems,&bytes_after,&edid);\n+\t\/\/ if (nitems) {\n+\t\/\/ \/\/ printf(\"%s: \",edid_name);\n+\t\/\/ \/\/ Make edid into string\n+\t\/\/ edid_string = (unsigned char *) malloc((nitems+1) * sizeof(char));\n+\t\/\/ for (z=0;z<nitems;++z) {\n+\t\/\/ if (edid[z] == '\\0') {\n+\t\/\/ edid_string[z] = '0';\n+\t\/\/ }\n+\t\/\/ else {\n+\t\/\/ edid_string[z] = edid[z];\n+\t\/\/ }\n+\t\/\/ \/\/printf(\"%c\",edid_string[z]);\n+\t\/\/ }\n+\t\/\/ printf(\"\\n\");\n+\t\/\/ edid_string[nitems] = '\\0';\n+\t\/\/ \/\/ Find out which profile matches the list\n+\t\/\/ \/\/ XRRUpdateConfiguration?\n+\t\/\/ }\n+\n+\t\/\/ }\n+\t\/\/ }\n+\t\/\/ }\n+}\n \n void load_profile(){\n \tprintf(\"Loading profile\\n\");\n@@ -180,10 +193,10 @@\n \t\tload_val_from_config();\n \n \t\t\/\/ Now I have both lists, so can do a double loops arounnd list of connected monitors and the saved monitors\n-\t\t\/\/ k is the number of connected outputs\n+\t\t\/\/ num_conn_outputs is the number of connected outputs\n \t\t\/\/ l is the number of loaded monitors\n \t\tprintf(\"Trying to find matching monitor...\\n\");\n-\t\tfor (i=0;i<k;++i) {\n+\t\tfor (i=0;i<num_conn_outputs;++i) {\n \t\t\t\/\/ Loop around connected outputs\n \t\t\t\/\/ Get edid\n \t\t\tprintf(\"%d\\n\",cur_output[i].outputNum);\n@@ -244,7 +257,10 @@\n }\n \n void construct_output_list(){\n-\tk = 0;\n+\t\/\/ Constructs a linked list containing output information\n+\t\/\/ Outputs:\tcur_output:\t\tpointer to head of linked list\n+\t\/\/ \t\tnum_conn_outputs:\tlength of linked list\t\n+\tnum_conn_outputs = 0;\n \tfor (i=0;i<myScreen->noutput;++i) {\n \t\tmyOutput = XRRGetOutputInfo(myDisp,myScreen,myScreen->outputs[i]);\n \t\t\/\/ printf(\"Name: %s Connection %d\\n\",myOutput->name,myOutput->connection);\n@@ -256,7 +272,7 @@\n \t\t\tnew_output->next = head;\n \t\t\tnew_output->outputNum = i;\n \t\t\thead = new_output;\n-\t\t\t++k;\n+\t\t\t++num_conn_outputs;\n \t\t\tprintf(\"Oh where oh where\\n\");\n \t\t}\n \t}\n@@ -265,6 +281,11 @@\n }\n \n void load_val_from_config(){\n+\t\/\/ Loads all settings from the configuration file \n+\t\/\/ Inputs: list\n+\t\/\/ Outputs: edid_val, resolution_str, pos_val\n+\t\/\/ \tl: how many saved profiles there are\n+\t\n \tl = config_setting_length(list);\n \tedid_val = (const char **) malloc(l * sizeof(const char *));\n \tresolution_str = (const char **) malloc(l * sizeof(const char *));\n"} {"commit":"3ab4f76d4c1720b757b273ac5a861cd7ede36c4c","subject":"InterruptIn.h: Update comments","message":"InterruptIn.h: Update comments\n","repos":"kjbracey-arm\/mbed,andcor02\/mbed-os,kjbracey-arm\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,kjbracey-arm\/mbed,kjbracey-arm\/mbed,mbedmicro\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,mbedmicro\/mbed,andcor02\/mbed-os,mbedmicro\/mbed,andcor02\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/InterruptIn.h\n+++ drivers\/InterruptIn.h\n@@ -48,6 +48,7 @@\n * }\n *\n * int main() {\n+ * \/\/ register trigger() to be called upon the rising edge of event\n * event.rise(&trigger);\n * while(1) {\n * led = !led;\n@@ -71,7 +72,10 @@\n * and the pin configured to the specified mode.\n *\n * @param pin InterruptIn pin to connect to\n- * @param mode The mode to set the pin to (PullUp\/PullDown\/etc.)\n+ * @param mode Desired Pin mode configuration.\n+ * (Valid values could be PullNone\/PullDown\/PullUp\/PullDefault\n+ * See PinNames.h for your target for definitions)\n+ *\n *\/\n InterruptIn(PinName pin, PinMode mode);\n \n@@ -142,7 +146,8 @@\n \n \/** Set the input pin mode\n *\n- * @param pull PullUp, PullDown, PullNone\n+ * @param pull PullUp, PullDown, PullNone, PullDefault\n+ * See PinNames.h for your target for definitions)\n *\/\n void mode(PinMode pull);\n \n"} {"commit":"52f2c6f2598d19624a5f40d13be37c0701c26075","subject":"app\/testpmd: log reason of port start failure","message":"app\/testpmd: log reason of port start failure\n\nProvide a bit more diagnostics information when port start fails.\n\nSigned-off-by: Andrew Rybchenko <4155e7bf8e0185127625dac6d84336299844982f@oktetlabs.ru>\nAcked-by: Xiaoyun Li <151cc00bdba86cfa2ecfc39aaa98def8f092d9d8@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- app\/test-pmd\/testpmd.c\n+++ app\/test-pmd\/testpmd.c\n@@ -2626,8 +2626,10 @@\n \t\tcnt_pi++;\n \n \t\t\/* start port *\/\n-\t\tif (rte_eth_dev_start(pi) < 0) {\n-\t\t\tprintf(\"Fail to start port %d\\n\", pi);\n+\t\tdiag = rte_eth_dev_start(pi);\n+\t\tif (diag < 0) {\n+\t\t\tprintf(\"Fail to start port %d: %s\\n\", pi,\n+\t\t\t rte_strerror(-diag));\n \n \t\t\t\/* Fail to setup rx queue, return *\/\n \t\t\tif (rte_atomic16_cmpset(&(port->port_status),\n"} {"commit":"8f445749366e048c3dcd8fbf006336eb4c93e03d","subject":"added halfdelay logic for display input","message":"added halfdelay logic for display input\n","repos":"MKelm\/ncmct,MKelm\/ncmct","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- display.c\n+++ display.c\n@@ -3,6 +3,7 @@\n #include <locale.h>\n #include <ctype.h>\n #include \"display.h\"\n+#include \"round.h\"\n \n int maxy, maxx;\n WINDOW *header, *footer, *output, *input;\n@@ -129,9 +130,20 @@\n }\n \n char *dsp_get_input(void) {\n- static char str[128];\n wclear(input);\n mvwaddstr(input, 0, 1, \">> \");\n- mvwgetnstr(input, 0, 4, str, 127);\n+ wrefresh(input);\n+ static char str[128];\n+ int i;\n+ for (i = 0; i < 128; i++) {\n+ halfdelay(round_get_remaining_seconds()*10);\n+ str[i] = wgetch(input);\n+ if (round_get_remaining_seconds() <= 0 || str[i] == '\\n') {\n+ str[i] = '\\0';\n+ break;\n+ } else if (str[i] == '\\0') {\n+ i--;\n+ }\n+ }\n return str;\n }"} {"commit":"8f71efe25f8718200027b547a3e749ae3300fe60","subject":"sata_mv: fix loop with last port","message":"sata_mv: fix loop with last port\n\ncommit f351b2d638c3cb0b95adde3549b7bfaf3f991dfa\n sata_mv: Support SoC controllers\n\ncause panic:\n\nscsi 4:0:0:0: Direct-Access ATA HITACHI HDS7225S V44O PQ: 0 ANSI: 5\nsd 4:0:0:0: [sde] 488390625 512-byte hardware sectors (250056 MB)\nsd 4:0:0:0: [sde] Write Protect is off\nsd 4:0:0:0: [sde] Mode Sense: 00 3a 00 00\nsd 4:0:0:0: [sde] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA\nsd 4:0:0:0: [sde] 488390625 512-byte hardware sectors (250056 MB)\nsd 4:0:0:0: [sde] Write Protect is off\nsd 4:0:0:0: [sde] Mode Sense: 00 3a 00 00\nsd 4:0:0:0: [sde] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA\n sde:<1>BUG: unable to handle kernel NULL pointer dereference at 000000000000001a\nIP: [<ffffffff806262c7>] mv_interrupt+0x21c\/0x4cc\nPGD 0\nOops: 0000 [1] SMP\nCPU 3\nModules linked in:\nPid: 0, comm: swapper Not tainted 2.6.24-smp-08636-g0afc2ed-dirty #26\nRIP: 0010:[<ffffffff806262c7>] [<ffffffff806262c7>] mv_interrupt+0x21c\/0x4cc\nRSP: 0000:ffff8102050bbec8 EFLAGS: 00010297\nRAX: 0000000000000008 RBX: 0000000000000000 RCX: 0000000000000003\nRDX: 0000000000008000 RSI: 0000000000000286 RDI: ffff8102035180e0\nRBP: 0000000000000001 R08: 0000000000000003 R09: ffff8102036613e0\nR10: 0000000000000002 R11: ffffffff8061474c R12: ffff8102035bf828\nR13: 0000000000000008 R14: ffff81020348ece8 R15: ffffc20002cb2000\nFS: 0000000000000000(0000) GS:ffff810405025700(0000) knlGS:0000000000000000\nCS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b\nCR2: 000000000000001a CR3: 0000000000201000 CR4: 00000000000006e0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess swapper (pid: 0, threadinfo ffff810405094000, task ffff8102050b28c0)\nStack: 000000010000000c 0002040000220400 0000001100000002 ffff81020348eda8\n 0000000000000001 ffff8102035f2cc0 0000000000000000 0000000000000000\n 0000000000000018 0000000000000000 0000000000000000 ffffffff80269ee8\nCall Trace:\n <IRQ> [<ffffffff80269ee8>] ? handle_IRQ_event+0x25\/0x53\n [<ffffffff8026b393>] ? handle_fasteoi_irq+0x90\/0xc8\n [<ffffffff802218e2>] ? do_IRQ+0xf1\/0x15f\n [<ffffffff8021df24>] ? default_idle+0x0\/0x55\n [<ffffffff8021f361>] ? ret_from_intr+0x0\/0xa\n <EOI> [<ffffffff8023010c>] ? lapic_next_event+0x0\/0xa\n [<ffffffff8021df55>] ? default_idle+0x31\/0x55\n [<ffffffff8021df50>] ? default_idle+0x2c\/0x55\n [<ffffffff8021df24>] ? default_idle+0x0\/0x55\n [<ffffffff8021e00b>] ? cpu_idle+0x92\/0xb8\n\nCode: 41 14 85 c0 89 44 24 14 0f 84 9d 02 00 00 f7 d0 01 d6 41 89 d5 89 41 14 8b 41 14 89 34 24 e9 7e 02 00 00 49 63 c5 49 8b 5c c6 48 <f6> 43 1a 80 4c 8b a3 20 37 00 00 0f 85 62 02 00 00 31 c9 41 83\nRIP [<ffffffff806262c7>] mv_interrupt+0x21c\/0x4cc\n RSP <ffff8102050bbec8>\nCR2: 000000000000001a\n---[ end trace 2583b5f7a5350584 ]---\nKernel panic - not syncing: Aiee, killing interrupt handler!\n\nlast_port already include port0 base.\nthis patch change use last_port directly, and move pp assignment later.\n\nSigned-off-by: Yinghai Lu <85a101cfd167df9f17f083a8913750b6c2905e71@sun.com>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ata\/sata_mv.c\n+++ drivers\/ata\/sata_mv.c\n@@ -1716,13 +1716,15 @@\n \tVPRINTK(\"ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\\n\",\n \t\thc, relevant, hc_irq_cause);\n \n-\tfor (port = port0; port < port0 + last_port; port++) {\n+\tfor (port = port0; port < last_port; port++) {\n \t\tstruct ata_port *ap = host->ports[port];\n-\t\tstruct mv_port_priv *pp = ap->private_data;\n+\t\tstruct mv_port_priv *pp;\n \t\tint have_err_bits, hard_port, shift;\n \n \t\tif ((!ap) || (ap->flags & ATA_FLAG_DISABLED))\n \t\t\tcontinue;\n+\n+\t\tpp = ap->private_data;\n \n \t\tshift = port << 1;\t\t\/* (port * 2) *\/\n \t\tif (port >= MV_PORTS_PER_HC) {\n"} {"commit":"a37f86305c80f441b8b99dae7c19d3f9d2effc15","subject":"driver core: Release device_hotplug_lock when store_mem_state returns EINVAL","message":"driver core: Release device_hotplug_lock when store_mem_state returns EINVAL\n\nWhen inserting a wrong value to \/sys\/devices\/system\/memory\/memoryX\/state file,\nfollowing messages are shown. And device_hotplug_lock is never released.\n\n================================================\n[ BUG: lock held when returning to user space! ]\n3.12.0-rc4-debug+ #3 Tainted: G W\n------------------------------------------------\nbash\/6442 is leaving the kernel with locks still held!\n1 lock held by bash\/6442:\n #0: (device_hotplug_lock){+.+.+.}, at: [<ffffffff8146cbb5>] lock_device_hotplug_sysfs+0x15\/0x50\n\nThis issue was introdued by commit fa2be40 (drivers: base: use standard\ndevice online\/offline for state change).\n\nThis patch releases device_hotplug_lcok when store_mem_state returns EINVAL.\n\nSigned-off-by: Yasuaki Ishimatsu <9b26f769475fafc2d25107053b1bdd774d49438a@jp.fujitsu.com>\nReviewed-by: Toshi Kani <322b9f75d3806917607539efc168804d71b9503d@hp.com>\nCC: Seth Jennings <527af9e7c640877508ac9f4ddd8647c066bca6c6@linux.vnet.ibm.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/base\/memory.c\n+++ drivers\/base\/memory.c\n@@ -333,8 +333,10 @@\n \t\tonline_type = ONLINE_KEEP;\n \telse if (!strncmp(buf, \"offline\", min_t(int, count, 7)))\n \t\tonline_type = -1;\n-\telse\n-\t\treturn -EINVAL;\n+\telse {\n+\t\tret = -EINVAL;\n+\t\tgoto err;\n+\t}\n \n \tswitch (online_type) {\n \tcase ONLINE_KERNEL:\n@@ -357,6 +359,7 @@\n \t\tret = -EINVAL; \/* should never happen *\/\n \t}\n \n+err:\n \tunlock_device_hotplug();\n \n \tif (ret)\n"} {"commit":"c56c81abe7e684bc6203632d807303eb765690dc","subject":"dmatest: fix max channels handling","message":"dmatest: fix max channels handling\n\nThe check for reaching max_channels is short circuited by 'continuing'\nafter successfully adding a channel.\n\n[ Impact: make the 'max_channels' module parameter actually have an effect ]\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nReported-by: Dan Carpenter <72501f147b2753e6660fdce744d9ac3084854f5e@gmail.com>\nSigned-off-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/dma\/dmatest.c\n+++ drivers\/dma\/dmatest.c\n@@ -531,9 +531,7 @@\n \t\tchan = dma_request_channel(mask, filter, NULL);\n \t\tif (chan) {\n \t\t\terr = dmatest_add_channel(chan);\n-\t\t\tif (err == 0)\n-\t\t\t\tcontinue;\n-\t\t\telse {\n+\t\t\tif (err) {\n \t\t\t\tdma_release_channel(chan);\n \t\t\t\tbreak; \/* add_channel failed, punt *\/\n \t\t\t}\n"} {"commit":"97a43dfe84119528ec2576129b91d619219ab716","subject":"dmaengine i.MX DMA: do not initialize chan_id field","message":"dmaengine i.MX DMA: do not initialize chan_id field\n\nSigned-off-by: Sascha Hauer <c00cbc2b736c26791a3822db86f8796fe9efff67@pengutronix.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/dma\/imx-dma.c\n+++ drivers\/dma\/imx-dma.c\n@@ -366,7 +366,6 @@\n \t\tdma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask);\n \n \t\timxdmac->chan.device = &imxdma->dma_device;\n-\t\timxdmac->chan.chan_id = i;\n \t\timxdmac->channel = i;\n \n \t\t\/* Add the channel to the DMAC list *\/\n"} {"commit":"2737583ea068b8e56f9d34b73a5860dc25227a73","subject":"dmaengine: mxs-dma: use DMA_COMPLETE for dma completion status","message":"dmaengine: mxs-dma: use DMA_COMPLETE for dma completion status\n\nAcked-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\nAcked-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"da0a908ed96b3eda788d6dc87b3e0b1610c40ec8","subject":"pch_dma: remove useless use of lock","message":"pch_dma: remove useless use of lock\n\nAccordingly to dma_cookie_status() description locking is not required.\n\nSigned-off-by: Andy Shevchenko <74f0c009df510614346aa771cd21959b78cdb413@linux.intel.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c5a9f9d0895b2c16908979244d3d678fd6db0545","subject":"pch_dma: fix kernel error issue","message":"pch_dma: fix kernel error issue\n\nfix the following kernel error\n\n------------[ cut here ]------------\nWARNING: at kernel\/softirq.c:159 _local_bh_enable_ip.clone.5+0x35\/0x71()\nHardware name: To be filled by O.E.M.\nModules linked in: pch_uart pch_dma fuse mga drm cpufreq_ondemand acpi_cpufreq mperf ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables ipv6 uinput snd_hda_codec_realtek snd_hda_intel snd_hda_codec matroxfb_base snd_hwdep 8250_pnp snd_seq snd_seq_device matroxfb_DAC1064 snd_pcm joydev 8250 matroxfb_accel snd_timer matroxfb_Ti3026 ppdev pegasus parport_pc snd parport matroxfb_g450 g450_pll serial_core video output matroxfb_misc soundcore snd_page_alloc serio_raw pcspkr ext4 jbd2 crc16 sdhci_pci sdhci mmc_core floppy [last unloaded: scsi_wait_scan]\nPid: 0, comm: swapper Not tainted 2.6.37.upstream_check+ #8\nCall Trace:\n [<c0433add>] warn_slowpath_common+0x65\/0x7a\n [<c043825b>] ? _local_bh_enable_ip.clone.5+0x35\/0x71\n [<c0433b01>] warn_slowpath_null+0xf\/0x13\n [<c043825b>] _local_bh_enable_ip.clone.5+0x35\/0x71\n [<c043829f>] local_bh_enable_ip+0x8\/0xa\n [<c06ec471>] _raw_spin_unlock_bh+0x10\/0x12\n [<f82b57dd>] pd_prep_slave_sg+0xba\/0x200 [pch_dma]\n [<f82f7b7a>] pch_uart_interrupt+0x44d\/0x6aa [pch_uart]\n [<c046fa97>] handle_IRQ_event+0x1d\/0x9e\n [<c047146f>] handle_fasteoi_irq+0x90\/0xc7\n [<c04713df>] ? handle_fasteoi_irq+0x0\/0xc7\n <IRQ> [<c04045af>] ? do_IRQ+0x3e\/0x89\n [<c04035a9>] ? common_interrupt+0x29\/0x30\n [<c04400d8>] ? sys_getpriority+0x12d\/0x1a2\n [<c058bb2b>] ? arch_local_irq_enable+0x5\/0xb\n [<c058c740>] ? acpi_idle_enter_bm+0x22a\/0x261\n [<c0648b11>] ? cpuidle_idle_call+0x70\/0xa1\n [<c0401f44>] ? cpu_idle+0x49\/0x6a\n [<c06d9fc4>] ? rest_init+0x58\/0x5a\n [<c089e762>] ? start_kernel+0x2d0\/0x2d5\n [<c089e0ce>] ? i386_start_kernel+0xce\/0xd5\n\nSigned-off-by: Tomoya MORINAGA <d1171211b1154da483963a5aecdf2602ee7000da@dsn.okisemi.com>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/dma\/pch_dma.c\n+++ drivers\/dma\/pch_dma.c\n@@ -366,7 +366,7 @@\n \tstruct pch_dma_chan *pd_chan = to_pd_chan(txd->chan);\n \tdma_cookie_t cookie;\n \n-\tspin_lock_bh(&pd_chan->lock);\n+\tspin_lock(&pd_chan->lock);\n \tcookie = pdc_assign_cookie(pd_chan, desc);\n \n \tif (list_empty(&pd_chan->active_list)) {\n@@ -376,7 +376,7 @@\n \t\tlist_add_tail(&desc->desc_node, &pd_chan->queue);\n \t}\n \n-\tspin_unlock_bh(&pd_chan->lock);\n+\tspin_unlock(&pd_chan->lock);\n \treturn 0;\n }\n \n@@ -386,7 +386,7 @@\n \tstruct pch_dma *pd = to_pd(chan->device);\n \tdma_addr_t addr;\n \n-\tdesc = pci_pool_alloc(pd->pool, GFP_KERNEL, &addr);\n+\tdesc = pci_pool_alloc(pd->pool, flags, &addr);\n \tif (desc) {\n \t\tmemset(desc, 0, sizeof(struct pch_dma_desc));\n \t\tINIT_LIST_HEAD(&desc->tx_list);\n@@ -405,7 +405,7 @@\n \tstruct pch_dma_desc *ret = NULL;\n \tint i;\n \n-\tspin_lock_bh(&pd_chan->lock);\n+\tspin_lock(&pd_chan->lock);\n \tlist_for_each_entry_safe(desc, _d, &pd_chan->free_list, desc_node) {\n \t\ti++;\n \t\tif (async_tx_test_ack(&desc->txd)) {\n@@ -415,15 +415,15 @@\n \t\t}\n \t\tdev_dbg(chan2dev(&pd_chan->chan), \"desc %p not ACKed\\n\", desc);\n \t}\n-\tspin_unlock_bh(&pd_chan->lock);\n+\tspin_unlock(&pd_chan->lock);\n \tdev_dbg(chan2dev(&pd_chan->chan), \"scanned %d descriptors\\n\", i);\n \n \tif (!ret) {\n \t\tret = pdc_alloc_desc(&pd_chan->chan, GFP_NOIO);\n \t\tif (ret) {\n-\t\t\tspin_lock_bh(&pd_chan->lock);\n+\t\t\tspin_lock(&pd_chan->lock);\n \t\t\tpd_chan->descs_allocated++;\n-\t\t\tspin_unlock_bh(&pd_chan->lock);\n+\t\t\tspin_unlock(&pd_chan->lock);\n \t\t} else {\n \t\t\tdev_err(chan2dev(&pd_chan->chan),\n \t\t\t\t\"failed to alloc desc\\n\");\n@@ -437,10 +437,10 @@\n \t\t\t struct pch_dma_desc *desc)\n {\n \tif (desc) {\n-\t\tspin_lock_bh(&pd_chan->lock);\n+\t\tspin_lock(&pd_chan->lock);\n \t\tlist_splice_init(&desc->tx_list, &pd_chan->free_list);\n \t\tlist_add(&desc->desc_node, &pd_chan->free_list);\n-\t\tspin_unlock_bh(&pd_chan->lock);\n+\t\tspin_unlock(&pd_chan->lock);\n \t}\n }\n \n@@ -530,9 +530,9 @@\n \tstruct pch_dma_chan *pd_chan = to_pd_chan(chan);\n \n \tif (pdc_is_idle(pd_chan)) {\n-\t\tspin_lock_bh(&pd_chan->lock);\n+\t\tspin_lock(&pd_chan->lock);\n \t\tpdc_advance_work(pd_chan);\n-\t\tspin_unlock_bh(&pd_chan->lock);\n+\t\tspin_unlock(&pd_chan->lock);\n \t}\n }\n \n@@ -592,7 +592,6 @@\n \t\t\tgoto err_desc_get;\n \t\t}\n \n-\n \t\tif (!first) {\n \t\t\tfirst = desc;\n \t\t} else {\n@@ -641,13 +640,13 @@\n \n \tspin_unlock_bh(&pd_chan->lock);\n \n-\n \treturn 0;\n }\n \n static void pdc_tasklet(unsigned long data)\n {\n \tstruct pch_dma_chan *pd_chan = (struct pch_dma_chan *)data;\n+\tunsigned long flags;\n \n \tif (!pdc_is_idle(pd_chan)) {\n \t\tdev_err(chan2dev(&pd_chan->chan),\n@@ -655,12 +654,12 @@\n \t\treturn;\n \t}\n \n-\tspin_lock_bh(&pd_chan->lock);\n+\tspin_lock_irqsave(&pd_chan->lock, flags);\n \tif (test_and_clear_bit(0, &pd_chan->err_status))\n \t\tpdc_handle_error(pd_chan);\n \telse\n \t\tpdc_advance_work(pd_chan);\n-\tspin_unlock_bh(&pd_chan->lock);\n+\tspin_unlock_irqrestore(&pd_chan->lock, flags);\n }\n \n static irqreturn_t pd_irq(int irq, void *devid)\n"} {"commit":"75d890577808925f997e4a985f78b64e9f4a26c3","subject":"gpu: ion: Loop on the handle count when destroying","message":"gpu: ion: Loop on the handle count when destroying\n\nWhen destroying a handle, all kernel mappings to that handle\nshould be destroyed. Other handles may still have references\nand valid mappings to the buffer underneath which should not\nbe destroyed. Loop on the handle reference count, not the buffer\nreference count to get rid of all kernel mappings for the handle.\n\nChange-Id: I7dc5d6a86513fc5fa4e21110ceab434714ea2493\nSigned-off-by: Laura Abbott <e7b4910f4742918f5926c991d8a2cd122ac7e295@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/ion\/ion.c\n+++ drivers\/gpu\/ion\/ion.c\n@@ -232,7 +232,7 @@\n \tmutex_lock(&client->lock);\n \n \tmutex_lock(&buffer->lock);\n-\twhile (buffer->kmap_cnt)\n+\twhile (handle->kmap_cnt)\n \t\tion_handle_kmap_put(handle);\n \tmutex_unlock(&buffer->lock);\n \n"} {"commit":"586cf2681f527ce8b85b9bd57c8b9f7945fbe051","subject":"ide-dma: don't reset request fields on dma_timeout_retry()","message":"ide-dma: don't reset request fields on dma_timeout_retry()\n\nImpact: drop unnecessary code\n\nNow that everything uses bio and block operations, there is no need to\nreset request fields manually when retrying a request. Every field is\nguaranteed to be always valid. Drop unnecessary request field\nresetting from ide_dma_timeout_retry().\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/ide\/ide-dma.c\n+++ drivers\/ide\/ide-dma.c\n@@ -510,23 +510,11 @@\n \t\/*\n \t * un-busy drive etc and make sure request is sane\n \t *\/\n-\n \trq = hwif->rq;\n-\tif (!rq)\n-\t\tgoto out;\n-\n-\thwif->rq = NULL;\n-\n-\trq->errors = 0;\n-\n-\tif (!rq->bio)\n-\t\tgoto out;\n-\n-\trq->sector = rq->bio->bi_sector;\n-\trq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;\n-\trq->hard_cur_sectors = rq->current_nr_sectors;\n-\trq->buffer = bio_data(rq->bio);\n-out:\n+\tif (rq) {\n+\t\thwif->rq = NULL;\n+\t\trq->errors = 0;\n+\t}\n \treturn ret;\n }\n \n"} {"commit":"d7ee88d048542f8052fc2d3c1413ac2287d826f5","subject":"batman-adv: remove batadv_tt_global_add_orig declaration","message":"batman-adv: remove batadv_tt_global_add_orig declaration\n\nbatadv_tt_global_add_orig is neither used nor implemented\nanymore, therefore it is possible to remove its declaration\n\nSigned-off-by: Antonio Quartulli <ed91ce0fd2670d4a98b12fc9ec6b7a497c7ed53f@autistici.org>\nSigned-off-by: Marek Lindner <104240d543ffdbcddd3f116d866dc6166bffcd7a@yahoo.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/batman-adv\/translation-table.h\n+++ net\/batman-adv\/translation-table.h\n@@ -27,9 +27,6 @@\n \t\t\t\tconst uint8_t *addr, const char *message,\n \t\t\t\tbool roaming);\n int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset);\n-void batadv_tt_global_add_orig(struct batadv_priv *bat_priv,\n-\t\t\t struct batadv_orig_node *orig_node,\n-\t\t\t const unsigned char *tt_buff, int tt_buff_len);\n int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);\n void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,\n \t\t\t struct batadv_orig_node *orig_node,\n"} {"commit":"feac7dc9788c6453cf190773a7fcb05cb991a46d","subject":"drivers\/pir: fix typo 'whan' -> 'when'","message":"drivers\/pir: fix typo 'whan' -> 'when'\n","repos":"OlegHahm\/RIOT,OlegHahm\/RIOT,jasonatran\/RIOT,OTAkeys\/RIOT,miri64\/RIOT,miri64\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,OTAkeys\/RIOT,ant9000\/RIOT,kYc0o\/RIOT,ant9000\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT,OTAkeys\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,kaspar030\/RIOT,ant9000\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,miri64\/RIOT,ant9000\/RIOT,kYc0o\/RIOT,OlegHahm\/RIOT,authmillenon\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,jasonatran\/RIOT,kaspar030\/RIOT,authmillenon\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/include\/pir.h\n+++ drivers\/include\/pir.h\n@@ -123,7 +123,7 @@\n int pir_get_occupancy(pir_t *dev, int16_t *occup);\n \n \/**\n- * @brief Register a thread for notification whan state changes on the\n+ * @brief Register a thread for notification when state changes on the\n * motion sensor.\n *\n * @note\n"} {"commit":"55b42c5ae9c048de25233434afc7b71b01bee9e6","subject":"dm crypt: drop device ref in ctr error path","message":"dm crypt: drop device ref in ctr error path\n\nAdd a missing 'dm_put_device' in an error path in crypt target constructor.\n\nSigned-off-by: Dmitry Monakhov <eecfa5af1016ca9db755569d9919e212ab6a1c94@openvz.org>\nSigned-off-by: Milan Broz <4fc71305d292596831a01a4d34d4779c7772dbfd@redhat.com>\nSigned-off-by: Alasdair G Kergon <620085386a2c64ec2f1d43bef997c15003f13da2@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/md\/dm-crypt.c\n+++ drivers\/md\/dm-crypt.c\n@@ -861,7 +861,7 @@\n \t\tcc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);\n \t\tif (!cc->iv_mode) {\n \t\t\tti->error = \"Error kmallocing iv_mode string\";\n-\t\t\tgoto bad5;\n+\t\t\tgoto bad_iv_mode;\n \t\t}\n \t\tstrcpy(cc->iv_mode, ivmode);\n \t} else\n@@ -870,6 +870,8 @@\n \tti->private = cc;\n \treturn 0;\n \n+bad_iv_mode:\n+\tdm_put_device(ti, cc->dev);\n bad5:\n \tbioset_free(cc->bs);\n bad_bs:\n"} {"commit":"36caf3e525b24556f649aecd097cad73bde6f035","subject":"memory: emif: Fix the incorrect 'size' parameter in memcpy","message":"memory: emif: Fix the incorrect 'size' parameter in memcpy\n\nThe issue was that only the first timings table was added to the\nemif platform data at the emif driver registration. All other\ntimings tables was filled with zeros. Now all emif timings table\nare added to the platform data.\n\nSigned-off-by: Oleksandr Dmytryshyn <e42d9ed0b11728120d1c5543054540de954900bd@ti.com>\nSigned-off-by: Lokesh Vutla <c1574519d727edaf2e16b260e452051ef77bf018@ti.com>\nAcked-by: Santosh Shilimkar <5b4d8dc9ea337fff5fd1729321eda9873ade0b09@ti.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/memory\/emif.c\n+++ drivers\/memory\/emif.c\n@@ -1468,7 +1468,7 @@\n \tif (pd->timings) {\n \t\ttemp = devm_kzalloc(dev, size, GFP_KERNEL);\n \t\tif (temp) {\n-\t\t\tmemcpy(temp, pd->timings, sizeof(*pd->timings));\n+\t\t\tmemcpy(temp, pd->timings, size);\n \t\t\tpd->timings = temp;\n \t\t} else {\n \t\t\tdev_warn(dev, \"%s:%d: allocation error\\n\", __func__,\n"} {"commit":"c88fd91bcd016b84e5f7d7ebd583e073e5ead48a","subject":"mfd: stw481x: Check the return value of devm_regmap_init_i2c","message":"mfd: stw481x: Check the return value of devm_regmap_init_i2c\n\ndevm_regmap_init_i2c can fail. Check for it.\n\nSigned-off-by: Sachin Kamat <1c3b1584a6008857f36c03c58f657c0fc16fc09e@linaro.org>\nSigned-off-by: Lee Jones <630e34333487a351a857f6b705e04d30b37c1629@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"f5cf8f07423b2677cebebcebc863af77223a4972","subject":"mtd: Disable mtdchar mmap on MMU systems","message":"mtd: Disable mtdchar mmap on MMU systems\n\nThis code was broken because it assumed that all MTD devices were map-based.\nDisable it for now, until it can be fixed properly for the next merge window.\n\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/mtdchar.c\n+++ drivers\/mtd\/mtdchar.c\n@@ -1162,7 +1162,11 @@\n \tresource_size_t start, off;\n \tunsigned long len, vma_len;\n \n-\tif (mtd->type == MTD_RAM || mtd->type == MTD_ROM) {\n+ \/* This is broken because it assumes the MTD device is map-based\n+\t and that mtd->priv is a valid struct map_info. It should be\n+\t replaced with something that uses the mtd_get_unmapped_area()\n+\t operation properly. *\/\n+\tif (0 \/*mtd->type == MTD_RAM || mtd->type == MTD_ROM*\/) {\n \t\toff = get_vm_offset(vma);\n \t\tstart = map->phys;\n \t\tlen = PAGE_ALIGN((start & ~PAGE_MASK) + map->size);\n"} {"commit":"1bc7749c39412d87a6099a3dc3a79a3039533b57","subject":"mtd: Remove the duplicate code that checks for bad blocks.","message":"mtd: Remove the duplicate code that checks for bad blocks.\n\nThe functionality in the block that is removed is already\nhandled by the function part_fill_badblockstats which is\ncalled right before this block. This should not have been\nthere in the first place. With the introduction of the\nlazy ecc stats functionality this part of the code should\ngo away.\n\nChange-Id: I925c24602613de4be76c6c3d5d46f7e549ccf5de\nSigned-off-by: Murali Palnati <225bcbdb786cb7f23850999fdb7b900cc1bfd186@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mtd\/mtdpart.c\n+++ drivers\/mtd\/mtdpart.c\n@@ -538,15 +538,6 @@\n #ifndef CONFIG_MTD_LAZYECCSTATS\n \tpart_fill_badblockstats(&(slave->mtd));\n #endif\n-\tif (master->_block_isbad) {\n-\t\tuint64_t offs = 0;\n-\n-\t\twhile (offs < slave->mtd.size) {\n-\t\t\tif (mtd_block_isbad(master, offs + slave->offset))\n-\t\t\t\tslave->mtd.ecc_stats.badblocks++;\n-\t\t\toffs += slave->mtd.erasesize;\n-\t\t}\n-\t}\n \n out_register:\n \treturn slave;\n"} {"commit":"0e707ae79ba357d60b8a36025ec8968e5020d827","subject":"UBI: do propagate positive error codes up","message":"UBI: do propagate positive error codes up\n\nUBI uses positive function return codes internally, and should not propagate\nthem up, except in the place this path fixes. Here is the original bug report\nfrom Dan Carpenter:\n\nThe problem is really in ubi_eba_read_leb().\n\ndrivers\/mtd\/ubi\/eba.c\n 412 err = ubi_io_read_vid_hdr(ubi, pnum, vid_hdr, 1);\n 413 if (err && err != UBI_IO_BITFLIPS) {\n 414 if (err > 0) {\n 415 \/*\n 416 * The header is either absent or corrupted.\n 417 * The former case means there is a bug -\n 418 * switch to read-only mode just in case.\n 419 * The latter case means a real corruption - we\n 420 * may try to recover data. FIXME: but this is\n 421 * not implemented.\n 422 *\/\n 423 if (err == UBI_IO_BAD_HDR_EBADMSG ||\n 424 err == UBI_IO_BAD_HDR) {\n 425 ubi_warn(\"corrupted VID header at PEB %d, LEB %d:%d\",\n 426 pnum, vol_id, lnum);\n 427 err = -EBADMSG;\n 428 } else\n 429 ubi_ro_mode(ubi);\n\nOn this path we return UBI_IO_FF and UBI_IO_FF_BITFLIPS and it\neventually gets passed to ERR_PTR(). We probably dereference the bad\npointer and oops. At that point we've gone read only so it was already\na bad situation...\n\n 430 }\n 431 goto out_free;\n 432 } else if (err == UBI_IO_BITFLIPS)\n 433 scrub = 1;\n 434\n\nReported-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Artem Bityutskiy <2f96f8cd3e2780a209d0ab27d1b44624d0019d3f@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/ubi\/eba.c\n+++ drivers\/mtd\/ubi\/eba.c\n@@ -426,6 +426,7 @@\n \t\t\t\t\t\t pnum, vol_id, lnum);\n \t\t\t\t\terr = -EBADMSG;\n \t\t\t\t} else\n+\t\t\t\t\terr = -EINVAL;\n \t\t\t\t\tubi_ro_mode(ubi);\n \t\t\t}\n \t\t\tgoto out_free;\n"} {"commit":"1fbe49328f7442090439addddf441fb5b3186e71","subject":"gianfar: Fix BD_LENGTH_MASK definition","message":"gianfar: Fix BD_LENGTH_MASK definition\n\nBD_LENGTH_MASK is supposed to catch the low 16-bits of the status field, not\nthe low byte. The old way, we would never be able to clean up tx packets with\nsizes divisible by 256.\n\nSigned-off-by: Andy Fleming <761b620017597639866580fd234cedf470f42bc1@freescale.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/gianfar.h\n+++ drivers\/net\/gianfar.h\n@@ -312,7 +312,7 @@\n #define ATTRELI_EI(x) (x)\n \n #define BD_LFLAG(flags) ((flags) << 16)\n-#define BD_LENGTH_MASK\t\t0x00ff\n+#define BD_LENGTH_MASK\t\t0x0000ffff\n \n \/* TxBD status field bits *\/\n #define TXBD_READY\t\t0x8000\n"} {"commit":"b1ffa2114843452642732ded678ada4c141c4eba","subject":"net\/sfc: retry port start to handle MC reboot in the middle","message":"net\/sfc: retry port start to handle MC reboot in the middle\n\nMC reboot may be provoked by the other function which is either\nstarting in parallel or, for example, reconfiguring UDP tunnel\nports.\n\nSigned-off-by: Andrew Rybchenko <ac94ab2a8fe9a9a087f6e24dcbc16626b52c07e8@solarflare.com>\nReviewed-by: Andy Moreton <adbee5d9b6a6a553b71b14302d03837591e26c9d@solarflare.com>\nReviewed-by: Ivan Malov <436a2feb05eb79a6862681e66bd0193220e8fb2d@oktetlabs.ru>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/sfc\/sfc.c\n+++ drivers\/net\/sfc\/sfc.c\n@@ -271,9 +271,81 @@\n \treturn efx_nic_set_drv_limits(sa->nic, &lim);\n }\n \n+static int\n+sfc_try_start(struct sfc_adapter *sa)\n+{\n+\tint rc;\n+\n+\tsfc_log_init(sa, \"entry\");\n+\n+\tSFC_ASSERT(sfc_adapter_is_locked(sa));\n+\tSFC_ASSERT(sa->state == SFC_ADAPTER_STARTING);\n+\n+\tsfc_log_init(sa, \"set resource limits\");\n+\trc = sfc_set_drv_limits(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_set_drv_limits;\n+\n+\tsfc_log_init(sa, \"init nic\");\n+\trc = efx_nic_init(sa->nic);\n+\tif (rc != 0)\n+\t\tgoto fail_nic_init;\n+\n+\trc = sfc_intr_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_intr_start;\n+\n+\trc = sfc_ev_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_ev_start;\n+\n+\trc = sfc_port_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_port_start;\n+\n+\trc = sfc_rx_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_rx_start;\n+\n+\trc = sfc_tx_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_tx_start;\n+\n+\trc = sfc_flow_start(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_flows_insert;\n+\n+\tsfc_log_init(sa, \"done\");\n+\treturn 0;\n+\n+fail_flows_insert:\n+\tsfc_tx_stop(sa);\n+\n+fail_tx_start:\n+\tsfc_rx_stop(sa);\n+\n+fail_rx_start:\n+\tsfc_port_stop(sa);\n+\n+fail_port_start:\n+\tsfc_ev_stop(sa);\n+\n+fail_ev_start:\n+\tsfc_intr_stop(sa);\n+\n+fail_intr_start:\n+\tefx_nic_fini(sa->nic);\n+\n+fail_nic_init:\n+fail_set_drv_limits:\n+\tsfc_log_init(sa, \"failed %d\", rc);\n+\treturn rc;\n+}\n+\n int\n sfc_start(struct sfc_adapter *sa)\n {\n+\tunsigned int start_tries = 3;\n \tint rc;\n \n \tsfc_log_init(sa, \"entry\");\n@@ -293,64 +365,19 @@\n \n \tsa->state = SFC_ADAPTER_STARTING;\n \n-\tsfc_log_init(sa, \"set resource limits\");\n-\trc = sfc_set_drv_limits(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_set_drv_limits;\n-\n-\tsfc_log_init(sa, \"init nic\");\n-\trc = efx_nic_init(sa->nic);\n-\tif (rc != 0)\n-\t\tgoto fail_nic_init;\n-\n-\trc = sfc_intr_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_intr_start;\n-\n-\trc = sfc_ev_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_ev_start;\n-\n-\trc = sfc_port_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_port_start;\n-\n-\trc = sfc_rx_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_rx_start;\n-\n-\trc = sfc_tx_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_tx_start;\n-\n-\trc = sfc_flow_start(sa);\n-\tif (rc != 0)\n-\t\tgoto fail_flows_insert;\n+\tdo {\n+\t\trc = sfc_try_start(sa);\n+\t} while ((--start_tries > 0) &&\n+\t\t (rc == EIO || rc == EAGAIN || rc == ENOENT || rc == EINVAL));\n+\n+\tif (rc != 0)\n+\t\tgoto fail_try_start;\n \n \tsa->state = SFC_ADAPTER_STARTED;\n \tsfc_log_init(sa, \"done\");\n \treturn 0;\n \n-fail_flows_insert:\n-\tsfc_tx_stop(sa);\n-\n-fail_tx_start:\n-\tsfc_rx_stop(sa);\n-\n-fail_rx_start:\n-\tsfc_port_stop(sa);\n-\n-fail_port_start:\n-\tsfc_ev_stop(sa);\n-\n-fail_ev_start:\n-\tsfc_intr_stop(sa);\n-\n-fail_intr_start:\n-\tefx_nic_fini(sa->nic);\n-\n-fail_nic_init:\n-fail_set_drv_limits:\n+fail_try_start:\n \tsa->state = SFC_ADAPTER_CONFIGURED;\n fail_bad_state:\n \tsfc_log_init(sa, \"failed %d\", rc);\n"} {"commit":"b75c6dbb45a49289b90f885c7fb6d9ac39a21688","subject":"tc35815: Enable NAPI","message":"tc35815: Enable NAPI\n\nThis driver has NAPI code but it has been disabled. Enable it now.\nThe non-napi code will be removed lator.\n\nSigned-off-by: Atsushi Nemoto <80aeab2fcc576fb9134b563f36af765199d49e90@mba.ocn.ne.jp>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/tc35815.c\n+++ drivers\/net\/tc35815.c\n@@ -22,6 +22,7 @@\n * All Rights Reserved.\n *\/\n \n+#define TC35815_NAPI\n #ifdef TC35815_NAPI\n #define DRV_VERSION\t\"1.38-NAPI\"\n #else\n"} {"commit":"be8b6d510072461b50958527e7b157f53e5388d7","subject":"rtc: rtc-mxc: convert to module_platform_driver","message":"rtc: rtc-mxc: convert to module_platform_driver\n\nConverting to module_platform_driver can make the code smaller and cleaner.\n\nSigned-off-by: Fabio Estevam <679188261afeb60eb822cd934fd7b46a48ddd743@freescale.com>\nCc: Sascha Hauer <c00cbc2b736c26791a3822db86f8796fe9efff67@pengutronix.de>\nCc: Alessandro Zummo <f0b9bd96bf07bfecc189c62159960134588fafe5@towertech.it>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/rtc\/rtc-mxc.c\n+++ drivers\/rtc\/rtc-mxc.c\n@@ -343,7 +343,7 @@\n \t.alarm_irq_enable\t= mxc_rtc_alarm_irq_enable,\n };\n \n-static int __init mxc_rtc_probe(struct platform_device *pdev)\n+static int __devinit mxc_rtc_probe(struct platform_device *pdev)\n {\n \tstruct resource *res;\n \tstruct rtc_device *rtc;\n@@ -433,7 +433,7 @@\n \treturn ret;\n }\n \n-static int __exit mxc_rtc_remove(struct platform_device *pdev)\n+static int __devexit mxc_rtc_remove(struct platform_device *pdev)\n {\n \tstruct rtc_plat_data *pdata = platform_get_drvdata(pdev);\n \n@@ -480,21 +480,11 @@\n #endif\n \t\t .owner\t= THIS_MODULE,\n \t},\n-\t.remove\t\t= __exit_p(mxc_rtc_remove),\n+\t.probe = mxc_rtc_probe,\n+\t.remove = __devexit_p(mxc_rtc_remove),\n };\n \n-static int __init mxc_rtc_init(void)\n-{\n-\treturn platform_driver_probe(&mxc_rtc_driver, mxc_rtc_probe);\n-}\n-\n-static void __exit mxc_rtc_exit(void)\n-{\n-\tplatform_driver_unregister(&mxc_rtc_driver);\n-}\n-\n-module_init(mxc_rtc_init);\n-module_exit(mxc_rtc_exit);\n+module_platform_driver(mxc_rtc_driver)\n \n MODULE_AUTHOR(\"Daniel Mack <daniel@caiaq.de>\");\n MODULE_DESCRIPTION(\"RTC driver for Freescale MXC\");\n"} {"commit":"fa9200ee0ba7a09dd2276a40e380d46308f86597","subject":"drivers: spi_k64: Correct init priority for SPI","message":"drivers: spi_k64: Correct init priority for SPI\n\nUse configured init priority same way it is used for other SPI\ndrivers. Default priority initializes SPI before console hiding\npossible errors and debug messages.\n\nChange-Id: Iddc9c783290d852caa8a9385de4ab114f8f7a2e3\nSigned-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>\n","repos":"rsalveti\/zephyr,kraj\/zephyr,finikorg\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3200,tidyjiang8\/zephyr-doc,nashif\/zephyr,nashif\/zephyr,Vudentz\/zephyr,erwango\/zephyr,erwango\/zephyr,fractalclone\/zephyr-riscv,aceofall\/zephyr-iotos,finikorg\/zephyr,holtmann\/zephyr,mbolivar\/zephyr,tidyjiang8\/zephyr-doc,ldts\/zephyr,pklazy\/zephyr,runchip\/zephyr-cc3220,galak\/zephyr,tidyjiang8\/zephyr-doc,ldts\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,rsalveti\/zephyr,fractalclone\/zephyr-riscv,nashif\/zephyr,GiulianoFranchetto\/zephyr,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3200,mbolivar\/zephyr,punitvara\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,Vudentz\/zephyr,aceofall\/zephyr-iotos,GiulianoFranchetto\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,pklazy\/zephyr,galak\/zephyr,aceofall\/zephyr-iotos,fbsder\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,zephyriot\/zephyr,bigdinotech\/zephyr,zephyrproject-rtos\/zephyr,bigdinotech\/zephyr,erwango\/zephyr,zephyriot\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,punitvara\/zephyr,ldts\/zephyr,fractalclone\/zephyr-riscv,ldts\/zephyr,Vudentz\/zephyr,galak\/zephyr,fbsder\/zephyr,fbsder\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,bboozzoo\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3220,holtmann\/zephyr,mbolivar\/zephyr,sharronliu\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,kraj\/zephyr,pklazy\/zephyr,fractalclone\/zephyr-riscv,punitvara\/zephyr,zephyriot\/zephyr,bigdinotech\/zephyr,sharronliu\/zephyr,erwango\/zephyr,zephyrproject-rtos\/zephyr,rsalveti\/zephyr,erwango\/zephyr,galak\/zephyr,mbolivar\/zephyr,runchip\/zephyr-cc3200,bboozzoo\/zephyr,rsalveti\/zephyr,punitvara\/zephyr,kraj\/zephyr,zephyriot\/zephyr,bboozzoo\/zephyr,fbsder\/zephyr,fbsder\/zephyr,explora26\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,tidyjiang8\/zephyr-doc,sharronliu\/zephyr,aceofall\/zephyr-iotos,nashif\/zephyr,pklazy\/zephyr,finikorg\/zephyr,holtmann\/zephyr,holtmann\/zephyr,finikorg\/zephyr,galak\/zephyr,pklazy\/zephyr,ldts\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,kraj\/zephyr,bboozzoo\/zephyr,holtmann\/zephyr,sharronliu\/zephyr,explora26\/zephyr,punitvara\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/spi\/spi_k64.c\n+++ drivers\/spi\/spi_k64.c\n@@ -1104,8 +1104,8 @@\n \n DEVICE_DEFINE(spi_k64_port_0, CONFIG_SPI_0_NAME, spi_k64_init,\n \t spi_k64_device_ctrl, &spi_k64_data_port_0,\n-\t &spi_k64_config_0, PRE_KERNEL_1,\n-\t CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &k64_spi_api);\n+\t &spi_k64_config_0, POST_KERNEL,\n+\t CONFIG_SPI_INIT_PRIORITY, &k64_spi_api);\n \n \n void spi_config_0_irq(void)\n@@ -1133,8 +1133,8 @@\n \n DEVICE_DEFINE(spi_k64_port_1, CONFIG_SPI_1_NAME, spi_k64_init,\n \t spi_k64_device_ctrl, &spi_k64_data_port_1,\n-\t &spi_k64_config_1, PRE_KERNEL_1,\n-\t CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &k64_spi_api);\n+\t &spi_k64_config_1, POST_KERNEL,\n+\t CONFIG_SPI_INIT_PRIORITY, &k64_spi_api);\n \n \n void spi_config_1_irq(void)\n@@ -1162,8 +1162,8 @@\n \n DEVICE_DEFINE(spi_k64_port_2, CONFIG_SPI_2_NAME, spi_k64_init,\n \t spi_k64_device_ctrl, &spi_k64_data_port_2,\n-\t &spi_k64_config_2, PRE_KERNEL_1,\n-\t CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &k64_spi_api);\n+\t &spi_k64_config_2, POST_KERNEL,\n+\t CONFIG_SPI_INIT_PRIORITY, &k64_spi_api);\n \n \n void spi_config_2_irq(void)\n"} {"commit":"ae363e54eca7ccf1e164ad2713e3399756298066","subject":"drivers: spi_sam: Config chip select pin when driver init","message":"drivers: spi_sam: Config chip select pin when driver init\n\nConfigure spi chip select based on pinmap defines, add support\nfor hardware chip select control support.\n\nSigned-off-by: qianfan Zhao <0d01fab1932da5a147025f14dd5829cf5bf10d4d@163.com>\n","repos":"ldts\/zephyr,nashif\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,galak\/zephyr,nashif\/zephyr,galak\/zephyr,explora26\/zephyr,galak\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr,ldts\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,finikorg\/zephyr,explora26\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,finikorg\/zephyr,explora26\/zephyr,punitvara\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,explora26\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/spi\/spi_sam.c\n+++ drivers\/spi\/spi_sam.c\n@@ -23,6 +23,7 @@\n \tSpi *regs;\n \tu32_t periph_id;\n \tstruct soc_gpio_pin pins;\n+\tstruct soc_gpio_pin cs[SAM_SPI_CHIP_SELECT_COUNT];\n };\n \n \/* Device run time data *\/\n@@ -413,9 +414,16 @@\n {\n \tconst struct spi_sam_config *cfg = dev->config->config_info;\n \tstruct spi_sam_data *data = dev->driver_data;\n+\tint i;\n \n \tsoc_pmc_peripheral_enable(cfg->periph_id);\n \tsoc_gpio_configure(&cfg->pins);\n+\n+\tfor (i = 0; i < SAM_SPI_CHIP_SELECT_COUNT; i++) {\n+\t\tif (cfg->cs[i].regs) {\n+\t\t\tsoc_gpio_configure(&cfg->cs[i]);\n+\t\t}\n+\t}\n \n \tspi_context_unlock_unconditionally(&data->ctx);\n \n@@ -434,11 +442,20 @@\n \t.release = spi_sam_release,\n };\n \n+#ifndef PINS_SPI0_CS\n+#define PINS_SPI0_CS { {0, (Pio *)0, 0, 0}, }\n+#endif\n+\n+#ifndef PINS_SPI1_CS\n+#define PINS_SPI1_CS { {0, (Pio *)0, 0, 0}, }\n+#endif\n+\n #define SPI_SAM_DEFINE_CONFIG(n)\t\t\t\t\t\\\n \tstatic const struct spi_sam_config spi_sam_config_##n = {\t\\\n \t\t.regs = (Spi *)CONFIG_SPI_##n##_BASE_ADDRESS,\t\t\\\n \t\t.periph_id = CONFIG_SPI_##n##_PERIPHERAL_ID,\t\t\\\n \t\t.pins = PINS_SPI##n,\t\t\t\t\t\\\n+\t\t.cs = PINS_SPI##n##_CS,\t\t\t\t\t\\\n \t}\n \n #define SPI_SAM_DEVICE_INIT(n)\t\t\t\t\t\t\\\n"} {"commit":"5d9a07b0de512b77bf28d2401e5fe3351f00a240","subject":"vhost: relax used address alignment","message":"vhost: relax used address alignment\n\nvirtio 1.0 only requires used address to be 4 byte aligned,\nvhost required 8 bytes (size of vring_used_elem).\nFix up vhost to match that.\n\nAdditionally, while vhost correctly requires 8 byte\nalignment for log, it's unconnected to used ring:\nit's a consequence that log has u64 entries.\nTweak code to make that clearer.\n\nSigned-off-by: Michael S. Tsirkin <255103e50249e3d658441816e0597170ebfc16ef@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d2e8d369cd92a8bb856ff530fa1e4c03b0e0ff55","subject":"arcfb: kill sparse warning","message":"arcfb: kill sparse warning\n\nThe framebuffer memory is allocated from system RAM (vmalloc'ed). Add __force\nannotations.\n\nSigned-off-by: Antonino Daplas <be03a811842969f6b435f66cb85a30eb479a8702@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/arcfb.c\n+++ drivers\/video\/arcfb.c\n@@ -262,7 +262,8 @@\n \tks108_set_yaddr(par, chipindex, upper\/8);\n \n \tlinesize = par->info->var.xres\/8;\n-\tsrc = par->info->screen_base + (left\/8) + (upper * linesize);\n+\tsrc = (unsigned char __force *) par->info->screen_base + (left\/8) +\n+\t\t(upper * linesize);\n \tks108_set_xaddr(par, chipindex, left);\n \n \tbitmask=1;\n@@ -477,7 +478,7 @@\n \tif (count) {\n \t\tchar *base_addr;\n \n-\t\tbase_addr = info->screen_base;\n+\t\tbase_addr = (char __force *)info->screen_base;\n \t\tcount -= copy_from_user(base_addr + p, buf, count);\n \t\t*ppos += count;\n \t\terr = -EFAULT;\n@@ -603,7 +604,7 @@\n \n \tif (info) {\n \t\tunregister_framebuffer(info);\n-\t\tvfree(info->screen_base);\n+\t\tvfree((void __force *)info->screen_base);\n \t\tframebuffer_release(info);\n \t}\n \treturn 0;\n"} {"commit":"89c223a616cddd9eab792b860f61f99cec53c4e8","subject":"macfb: Do not overflow fb_fix_screeninfo.id","message":"macfb: Do not overflow fb_fix_screeninfo.id\n\nDon't overflow the 16-character fb_fix_screeninfo id string (fixes some \nconsole erasing and blanking artifacts). Have the ID default to \"Unknown\" \non machines with no built-in video and no nubus devices. Check for \nfb_alloc_cmap failure.\n\nSigned-off-by: Finn Thain <94052abb058aed443995dc4f8d236e022112765d@telegraphics.com.au>\nSigned-off-by: Geert Uytterhoeven <0da414d9d963da4039c2a0525b1844228075aa58@linux-m68k.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/macfb.c\n+++ drivers\/video\/macfb.c\n@@ -164,7 +164,6 @@\n };\n \n static struct fb_fix_screeninfo macfb_fix = {\n-\t.id\t= \"Macintosh \",\n \t.type\t= FB_TYPE_PACKED_PIXELS,\n \t.accel\t= FB_ACCEL_NONE,\n };\n@@ -760,22 +759,22 @@\n \n \t\tswitch(ndev->dr_hw) {\n \t\tcase NUBUS_DRHW_APPLE_MDC:\n-\t\t\tstrcat( macfb_fix.id, \"Display Card\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Mac Disp. Card\");\n \t\t\tmacfb_setpalette = mdc_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tbreak;\n \t\tcase NUBUS_DRHW_APPLE_TFB:\n-\t\t\tstrcat( macfb_fix.id, \"Toby\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Toby\");\n \t\t\tmacfb_setpalette = toby_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tbreak;\n \t\tcase NUBUS_DRHW_APPLE_JET:\n-\t\t\tstrcat( macfb_fix.id, \"Jet\");\n+\t\t\tstrcpy(macfb_fix.id, \"Jet\");\n \t\t\tmacfb_setpalette = jet_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tbreak;\t\t\t\n \t\tdefault:\n-\t\t\tstrcat( macfb_fix.id, \"Generic NuBus\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Generic NuBus\");\n \t\t\tbreak;\n \t\t}\n \t}\n@@ -786,21 +785,11 @@\n \tif (!video_is_nubus)\n \t\tswitch( mac_bi_data.id )\n \t\t{\n-\t\t\t\/* These don't have onboard video. Eventually, we may\n-\t\t\t be able to write separate framebuffer drivers for\n-\t\t\t them (tobyfb.c, hiresfb.c, etc, etc) *\/\n-\t\tcase MAC_MODEL_II:\n-\t\tcase MAC_MODEL_IIX:\n-\t\tcase MAC_MODEL_IICX:\n-\t\tcase MAC_MODEL_IIFX:\n-\t\t\tstrcat( macfb_fix.id, \"Generic NuBus\" );\n-\t\t\tbreak;\n-\n \t\t\t\/* Valkyrie Quadras *\/\n \t\tcase MAC_MODEL_Q630:\n \t\t\t\/* I'm not sure about this one *\/\n \t\tcase MAC_MODEL_P588:\n-\t\t\tstrcat( macfb_fix.id, \"Valkyrie built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Valkyrie\");\n \t\t\tmacfb_setpalette = valkyrie_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tvalkyrie_cmap_regs = ioremap(DAC_BASE, 0x1000);\n@@ -823,7 +812,7 @@\n \t\tcase MAC_MODEL_Q700:\n \t\tcase MAC_MODEL_Q900:\n \t\tcase MAC_MODEL_Q950:\n-\t\t\tstrcat( macfb_fix.id, \"DAFB built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"DAFB\");\n \t\t\tmacfb_setpalette = dafb_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tdafb_cmap_regs = ioremap(DAFB_BASE, 0x1000);\n@@ -831,7 +820,7 @@\n \n \t\t\t\/* LC II uses the V8 framebuffer *\/\n \t\tcase MAC_MODEL_LCII:\n-\t\t\tstrcat( macfb_fix.id, \"V8 built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"V8\");\n \t\t\tmacfb_setpalette = v8_brazil_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tv8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);\n@@ -843,7 +832,7 @@\n \t\tcase MAC_MODEL_IIVI:\n \t\tcase MAC_MODEL_IIVX:\n \t\tcase MAC_MODEL_P600:\n-\t\t\tstrcat( macfb_fix.id, \"Brazil built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Brazil\");\n \t\t\tmacfb_setpalette = v8_brazil_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n \t\t\tv8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);\n@@ -860,7 +849,7 @@\n \t\tcase MAC_MODEL_P460:\n \t\t\tmacfb_setpalette = v8_brazil_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n-\t\t\tstrcat( macfb_fix.id, \"Sonora built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Sonora\");\n \t\t\tv8_brazil_cmap_regs = ioremap(DAC_BASE, 0x1000);\n \t\t\tbreak;\n \n@@ -871,7 +860,7 @@\n \t\tcase MAC_MODEL_IISI:\n \t\t\tmacfb_setpalette = rbv_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n-\t\t\tstrcat( macfb_fix.id, \"RBV built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"RBV\");\n \t\t\trbv_cmap_regs = ioremap(DAC_BASE, 0x1000);\n \t\t\tbreak;\n \n@@ -880,7 +869,7 @@\n \t\tcase MAC_MODEL_C660:\n \t\t\tmacfb_setpalette = civic_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n-\t\t\tstrcat( macfb_fix.id, \"Civic built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Civic\");\n \t\t\tcivic_cmap_regs = ioremap(CIVIC_BASE, 0x1000);\n \t\t\tbreak;\n \n@@ -901,7 +890,7 @@\n \t\t\t\tv8_brazil_cmap_regs =\n \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n \t\t\t}\n-\t\t\tstrcat( macfb_fix.id, \"LC built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"LC\");\n \t\t\tbreak;\n \t\t\t\/* We think this may be like the LC II *\/\n \t\tcase MAC_MODEL_CCL:\n@@ -911,18 +900,18 @@\n \t\t\t\tv8_brazil_cmap_regs =\n \t\t\t\t\tioremap(DAC_BASE, 0x1000);\n \t\t\t}\n-\t\t\tstrcat( macfb_fix.id, \"Color Classic built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Color Classic\");\n \t\t\tbreak;\n \n \t\t\t\/* And we *do* mean \"weirdos\" *\/\n \t\tcase MAC_MODEL_TV:\n-\t\t\tstrcat( macfb_fix.id, \"Mac TV built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Mac TV\");\n \t\t\tbreak;\n \n \t\t\t\/* These don't have colour, so no need to worry *\/\n \t\tcase MAC_MODEL_SE30:\n \t\tcase MAC_MODEL_CLII:\n-\t\t\tstrcat( macfb_fix.id, \"Monochrome built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Monochrome\");\n \t\t\tbreak;\n \n \t\t\t\/* Powerbooks are particularly difficult. Many of\n@@ -935,7 +924,7 @@\n \t\tcase MAC_MODEL_PB140:\n \t\tcase MAC_MODEL_PB145:\n \t\tcase MAC_MODEL_PB170:\n-\t\t\tstrcat( macfb_fix.id, \"DDC built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"DDC\");\n \t\t\tbreak;\n \n \t\t\t\/* Internal is GSC, External (if present) is ViSC *\/\n@@ -945,13 +934,13 @@\n \t\tcase MAC_MODEL_PB180:\n \t\tcase MAC_MODEL_PB210:\n \t\tcase MAC_MODEL_PB230:\n-\t\t\tstrcat( macfb_fix.id, \"GSC built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"GSC\");\n \t\t\tbreak;\n \n \t\t\t\/* Internal is TIM, External is ViSC *\/\n \t\tcase MAC_MODEL_PB165C:\n \t\tcase MAC_MODEL_PB180C:\n-\t\t\tstrcat( macfb_fix.id, \"TIM built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"TIM\");\n \t\t\tbreak;\n \n \t\t\t\/* Internal is CSC, External is Keystone+Ariel. *\/\n@@ -963,12 +952,12 @@\n \t\tcase MAC_MODEL_PB280C:\n \t\t\tmacfb_setpalette = csc_setpalette;\n \t\t\tmacfb_defined.activate = FB_ACTIVATE_NOW;\n-\t\t\tstrcat( macfb_fix.id, \"CSC built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"CSC\");\n \t\t\tcsc_cmap_regs = ioremap(CSC_BASE, 0x1000);\n \t\t\tbreak;\n \t\t\n \t\tdefault:\n-\t\t\tstrcat( macfb_fix.id, \"Unknown\/Unsupported built-in\" );\n+\t\t\tstrcpy(macfb_fix.id, \"Unknown\");\n \t\t\tbreak;\n \t\t}\n \n@@ -978,16 +967,23 @@\n \tfb_info.pseudo_palette\t= pseudo_palette;\n \tfb_info.flags\t\t= FBINFO_DEFAULT;\n \n-\tfb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);\n+\terr = fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);\n+\tif (err)\n+\t\tgoto fail_unmap;\n \t\n \terr = register_framebuffer(&fb_info);\n-\tif (!err)\n-\t\tprintk(\"fb%d: %s frame buffer device\\n\",\n-\t\t fb_info.node, fb_info.fix.id);\n-\telse {\n-\t\tiounmap(fb_info.screen_base);\n-\t\tiounmap_macfb();\n-\t}\n+\tif (err)\n+\t\tgoto fail_dealloc;\n+\n+\tprintk(\"fb%d: %s frame buffer device\\n\",\n+\t fb_info.node, fb_info.fix.id);\n+\treturn 0;\n+\n+fail_dealloc:\n+\tfb_dealloc_cmap(&fb_info.cmap);\n+fail_unmap:\n+\tiounmap(fb_info.screen_base);\n+\tiounmap_macfb();\n \treturn err;\n }\n \n"} {"commit":"327fc8752a3c08fc7dc7d382883e65aad2f03bde","subject":"tgafb: fix cmap memory leak","message":"tgafb: fix cmap memory leak\n\nFix cmap leak when register_framebuffer fails.\n\nSigned-off-by: Andres Salomon <3945bcf5fa0c9ecb9066fe0f9d287073618c06cc@debian.org>\nAcked-by: Krzysztof Helt <e36322531041744f35a39a40f0faffcfb5b388ff@poczta.fm>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/tgafb.c\n+++ drivers\/video\/tgafb.c\n@@ -1663,7 +1663,7 @@\n \tif (register_framebuffer(info) < 0) {\n \t\tprintk(KERN_ERR \"tgafb: Could not register framebuffer\\n\");\n \t\tret = -EINVAL;\n-\t\tgoto err1;\n+\t\tgoto err2;\n \t}\n \n \tif (tga_bus_pci) {\n@@ -1682,6 +1682,8 @@\n \n \treturn 0;\n \n+ err2:\n+\tfb_dealloc_cmap(&info->cmap);\n err1:\n \tif (mem_base)\n \t\tiounmap(mem_base);\n"} {"commit":"ceeddb4e69b2010b0f4f88c9e06dc83d80b49db6","subject":"video: udlfb: Use NULL instead of 0","message":"video: udlfb: Use NULL instead of 0\n\nnew_back is a pointer. Use NULL instead of 0.\n\nSigned-off-by: Sachin Kamat <1c3b1584a6008857f36c03c58f657c0fc16fc09e@linaro.org>\nCc: Bernie Thompson <853520c0eaeb91fa22b7d2c2bb860b746e447d45@plugable.com>\nSigned-off-by: Tomi Valkeinen <e1ca4dbb8be1acaf20734fecd2da10ed1d46a9bb@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d964f3b8df1922e5668e99ac07d14d07a37d5d59","subject":"FIXED: - OK and NOT OK was wrong in canSend()","message":"FIXED: - OK and NOT OK was wrong in canSend()\n","repos":"mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3,mistoll\/CanFestival-3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/win32\/win32.c\n+++ drivers\/win32\/win32.c\n@@ -136,13 +136,12 @@\n \/***************************************************************************\/\n UNS8 canSend(CAN_PORT port, Message *m)\n {\n-\tUNS8 res;\n+\tUNS8 res = 1; \/\/NOT OK\n \tif (port && (m_canSend != NULL))\n \t{\n \t\tres = m_canSend(((CANPort*)port)->fd, m);\n-\t\tif (res) return 1; \/\/ OK\n-\t}\n-\treturn 0; \/\/ NOT OK\n+\t}\n+\treturn res;\n }\n \n \/***************************************************************************\/\n"} {"commit":"d333ddb28c47056eadd98f4163340a80c69dba9a","subject":"[IOT-3295] Test CT2.3.1 fails fix","message":"[IOT-3295] Test CT2.3.1 fails fix\n\n\tReverts ocpayload.c to commit e64d33ff21e91b3d935be7016e57257b86ba0530\n\nSigned-off-by: Iurii Metelytsia <34dfdb0362b6007f103e91208ebd2ce0dc91012d@samsung.com>\nChange-Id: Ib88b999ef911bcfb61bfd32f97900b529af7ccee\n","repos":"rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- resource\/csdk\/stack\/src\/ocpayload.c\n+++ resource\/csdk\/stack\/src\/ocpayload.c\n@@ -902,7 +902,10 @@\n }\n \n size_t total = 1;\n- for(; total < MAX_REP_ARRAY_DEPTH && dimensions[total] != 0; ++total);\n+ for(uint8_t i = 0; i < MAX_REP_ARRAY_DEPTH && dimensions[i] != 0; ++i)\n+ {\n+ total *= dimensions[i];\n+ }\n return total;\n }\n \n@@ -1208,7 +1211,7 @@\n return false;\n }\n \n- char** newArray = (char**)OICCalloc(dimTotal, sizeof(char*));\n+ char** newArray = (char**)OICMalloc(dimTotal * sizeof(char*));\n \n if (!newArray)\n {\n"} {"commit":"c018749d4d5a9f00558c964f316f6a3af6c19749","subject":"Plug leak on error","message":"Plug leak on error\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib2\/ext\/glib2\/rbglib_maincontext.c\n+++ glib2\/ext\/glib2\/rbglib_maincontext.c\n@@ -538,9 +538,9 @@\n }\n \n struct mc_query_body_args {\n+ gint timeout_;\n GPollFD *fds;\n- gint timeout_;\n- gint ret;\n+ gint n_fds;\n };\n \n static VALUE\n@@ -550,9 +550,9 @@\n gint i;\n VALUE ary = rb_ary_new();\n \n- for (i = 0; i < args->ret; i++)\n+ for (i = 0; i < args->n_fds; i++)\n rb_ary_push(ary, BOXED2RVAL(&args->fds[i], G_TYPE_POLL_FD));\n- \n+\n return rb_assoc_new(INT2NUM(args->timeout_), ary);\n }\n \n@@ -564,31 +564,29 @@\n return Qnil;\n }\n \n-static VALUE\n-mc_query(VALUE self, VALUE max_priority)\n-{\n+#define QUERY_DEFAULT_FDS 100\n+\n+static VALUE\n+mc_query(VALUE self, VALUE rbmax_priority)\n+{\n+ GMainContext *context = _SELF(self);\n+ gint max_priority = NUM2INT(rbmax_priority);\n gint timeout_;\n+ GPollFD *fds;\n+ gint n_fds;\n struct mc_query_body_args args;\n- \n- GPollFD *fds = g_new(GPollFD, 100);\n- gint ret = g_main_context_query(_SELF(self),\n- NUM2INT(max_priority), \n- &timeout_,\n- fds,\n- 100);\n- if (ret > 100) {\n+\n+ fds = g_new(GPollFD, QUERY_DEFAULT_FDS);\n+ n_fds = g_main_context_query(context, max_priority, &timeout_, fds, QUERY_DEFAULT_FDS);\n+ if (n_fds > QUERY_DEFAULT_FDS) {\n g_free(fds);\n- fds = g_new(GPollFD, ret);\n- g_main_context_query(_SELF(self),\n- NUM2INT(max_priority),\n- &timeout_,\n- fds,\n- ret);\n- }\n-\n+ fds = g_new(GPollFD, n_fds);\n+ g_main_context_query(context, max_priority, &timeout_, fds, n_fds);\n+ }\n+\n+ args.timeout_ = timeout_;\n args.fds = fds;\n- args.timeout_ = timeout_;\n- args.ret = ret;\n+ args.n_fds = n_fds;\n return rb_ensure(mc_query_body, (VALUE)&args,\n mc_query_ensure, (VALUE)fds);\n }\n"} {"commit":"8e3354f7b9df2ef97c3e84ca217b1a9ac52f2e86","subject":"adjust 'BSLS_DEPRECATE_IS_ACTIVE' release for 'valueOr'","message":"adjust 'BSLS_DEPRECATE_IS_ACTIVE' release for 'valueOr'\n","repos":"bloomberg\/bde,bloomberg\/bde,che2\/bde,che2\/bde,bloomberg\/bde,che2\/bde,bloomberg\/bde,bloomberg\/bde,che2\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bdl\/bdlb\/bdlb_nullablevalue.h\n+++ groups\/bdl\/bdlb\/bdlb_nullablevalue.h\n@@ -541,7 +541,7 @@\n \/\/ otherwise. Note that this method returns *by* *value*, so may be\n \/\/ inefficient in some contexts.\n \n- #if BSLS_DEPRECATE_IS_ACTIVE(BDL, 3, 3)\n+ #if BSLS_DEPRECATE_IS_ACTIVE(BDL, 3, 5)\n BSLS_DEPRECATE\n #endif\n const TYPE *valueOr(const TYPE *value) const;\n"} {"commit":"54fa7b48602fc0f44894d2b4358d2881683edbad","subject":"Use in_place constructor for loggers","message":"Use in_place constructor for loggers\n\nReviewed By: glamtechie\n\nDifferential Revision: D6713941\n\nfbshipit-source-id: 7f71a12aeed17a8c71ceb518db8a65f78bb49425\n","repos":"facebook\/mcrouter,facebook\/mcrouter,facebook\/mcrouter,facebook\/mcrouter","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mcrouter\/ProxyRequestContextTyped.h\n+++ mcrouter\/ProxyRequestContextTyped.h\n@@ -1,5 +1,5 @@\n \/*\n- * Copyright (c) 2017, Facebook, Inc.\n+ * Copyright (c) 2017-present, Facebook, Inc.\n * All rights reserved.\n *\n * This source code is licensed under the BSD-style license found in the\n@@ -8,6 +8,8 @@\n *\n *\/\n #pragma once\n+\n+#include <folly\/Utility.h>\n \n #include \"mcrouter\/ProxyRequestContext.h\"\n #include \"mcrouter\/ProxyRequestLogger.h\"\n@@ -140,8 +142,8 @@\n ProxyRequestPriority priority__)\n : ProxyRequestContext(pr, priority__),\n proxy_(pr),\n- logger_(ProxyRequestLogger<RouterInfo>(pr)),\n- additionalLogger_(AdditionalLogger(*this)) {}\n+ logger_(folly::in_place, pr),\n+ additionalLogger_(folly::in_place, *this) {}\n \n Proxy<RouterInfo>& proxy_;\n \n"} {"commit":"5eac936a8a934304ed6bb1b45b2c8ccc80f2cba8","subject":"[APPROVAL] bslstl-sharedptr-cpp11-fix-REBASED-drqs-58999996 to master","message":"[APPROVAL] bslstl-sharedptr-cpp11-fix-REBASED-drqs-58999996 to master\n","repos":"saxena84\/bde,frutiger\/bde,osubboo\/bde,RMGiroux\/bde-allocator-benchmarks,che2\/bde,dharesign\/bde,bloomberg\/bde,minhlongdo\/bde,bloomberg\/bde,saxena84\/bde,bloomberg\/bde-allocator-benchmarks,che2\/bde,mversche\/bde,gbleaney\/Allocator-Benchmarks,bowlofstew\/bde,bloomberg\/bde,bloomberg\/bde,idispatch\/bde,idispatch\/bde,apaprocki\/bde,apaprocki\/bde,bloomberg\/bde-allocator-benchmarks,che2\/bde,saxena84\/bde,mversche\/bde,dharesign\/bde,bowlofstew\/bde,che2\/bde,apaprocki\/bde,osubboo\/bde,RMGiroux\/bde-allocator-benchmarks,frutiger\/bde,osubboo\/bde,dbremner\/bde,minhlongdo\/bde,bloomberg\/bde-allocator-benchmarks,jmptrader\/bde,idispatch\/bde,idispatch\/bde,apaprocki\/bde,dbremner\/bde,mversche\/bde,minhlongdo\/bde,jmptrader\/bde,frutiger\/bde,gbleaney\/Allocator-Benchmarks,dharesign\/bde,RMGiroux\/bde-allocator-benchmarks,osubboo\/bde,bloomberg\/bde,mversche\/bde,jmptrader\/bde,minhlongdo\/bde,dbremner\/bde,jmptrader\/bde,bowlofstew\/bde,frutiger\/bde,bowlofstew\/bde,dharesign\/bde,gbleaney\/Allocator-Benchmarks,RMGiroux\/bde-allocator-benchmarks,bloomberg\/bde-allocator-benchmarks,RMGiroux\/bde-allocator-benchmarks,apaprocki\/bde,dbremner\/bde,gbleaney\/Allocator-Benchmarks,bloomberg\/bde-allocator-benchmarks,saxena84\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bsl\/bslstl\/bslstl_sharedptr.h\n+++ groups\/bsl\/bslstl\/bslstl_sharedptr.h\n@@ -4961,7 +4961,7 @@\n }\n \n template<class ELEMENT_TYPE, class... ARGS>\n-bsl::shared_ptr<ELEMENT_TYPE> bsl::make_shared(const ARGS&... args);\n+bsl::shared_ptr<ELEMENT_TYPE> bsl::make_shared(const ARGS&... args)\n {\n typedef BloombergLP::bslma::SharedPtrInplaceRep<ELEMENT_TYPE> Rep;\n BloombergLP::bslma::Allocator *basicAllocator =\n"} {"commit":"50ed105d0537d2d299b4d0d29da6e02bc5afb1b6","subject":"fs: nvs: Fix handling of corrupt ate's in garbage collector","message":"fs: nvs: Fix handling of corrupt ate's in garbage collector\n\nnvs_gc does not verify the crc8 of close_ate before using\nclose_ate.offset. This means that close_ate.offset could contain an\noffset that points beyond valid ate's in the sector. For example, there\nmight be a valid ate at offset 0x100 but close_ate.offset is 0x200.\nIf that is the case that value will not be moved and so it will be lost.\n\nSolve this by refactoring the recovery loop from nvs_prev_ate into\nnvs_recover_last_ate and use that function in nvs_gc if a corrupt\nclose_ate is found.\n\nThe crc8 of gc_ate is not checked before trying to find another ate\nwith the same id. If there are no valid ate with that id in the whole\nfs the inner while(1)-loop will never stop since the break condition\nincludes a check for a correct crc8.\n\nSolve this by skipping gc_ate's with an invalid crc8.\n\nFixes #26407\n\nSigned-off-by: Tobias Svehagen <d3302b125bdd383498bbe4afb41749ba75a64b52@gmail.com>\n","repos":"Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,nashif\/zephyr,nashif\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/fs\/nvs\/nvs.c\n+++ subsys\/fs\/nvs\/nvs.c\n@@ -326,14 +326,52 @@\n }\n \/* end of flash routines *\/\n \n+\/* If the closing ate has an invalid crc8, its offset cannot be trusted and\n+ * the last valod ate of the sector should instead try to be recovered by going\n+ * through all ate's.\n+ *\n+ * addr should point to the faulty closing ate and will be updated to the last\n+ * valid ate. If no valid ate is found it will be left untouched.\n+ *\/\n+static int nvs_recover_last_ate(struct nvs_fs *fs, uint32_t *addr)\n+{\n+\tuint32_t data_end_addr, ate_end_addr;\n+\tstruct nvs_ate end_ate;\n+\tsize_t ate_size;\n+\tint rc;\n+\n+\tLOG_DBG(\"Recovering last ate from sector %d\",\n+\t\t(*addr >> ADDR_SECT_SHIFT));\n+\n+\tate_size = nvs_al_size(fs, sizeof(struct nvs_ate));\n+\n+\t*addr -= ate_size;\n+\tate_end_addr = *addr;\n+\tdata_end_addr = *addr & ADDR_SECT_MASK;\n+\twhile (ate_end_addr > data_end_addr) {\n+\t\trc = nvs_flash_ate_rd(fs, ate_end_addr, &end_ate);\n+\t\tif (rc) {\n+\t\t\treturn rc;\n+\t\t}\n+\t\tif (!nvs_ate_crc8_check(&end_ate)) {\n+\t\t\t\/* found a valid ate, update data_end_addr and *addr *\/\n+\t\t\tdata_end_addr &= ADDR_SECT_MASK;\n+\t\t\tdata_end_addr += end_ate.offset + end_ate.len;\n+\t\t\t*addr = ate_end_addr;\n+\t\t}\n+\t\tate_end_addr -= ate_size;\n+\t}\n+\n+\treturn 0;\n+}\n+\n \/* walking through allocation entry list, from newest to oldest entries\n * read ate from addr, modify addr to the previous ate\n *\/\n static int nvs_prev_ate(struct nvs_fs *fs, uint32_t *addr, struct nvs_ate *ate)\n {\n \tint rc;\n-\tstruct nvs_ate close_ate, end_ate;\n-\tuint32_t data_end_addr, ate_end_addr;\n+\tstruct nvs_ate close_ate;\n \tsize_t ate_size;\n \n \tate_size = nvs_al_size(fs, sizeof(struct nvs_ate));\n@@ -382,28 +420,12 @@\n \t\/* The close_ate had an invalid CRC8 or the last added ate offset was\n \t * recognized as incorrect, `lets find out the last valid ate\n \t * and point the address to this found ate.\n-\t *\/\n-\t*addr -= ate_size;\n-\tate_end_addr = *addr;\n-\tdata_end_addr = *addr & ADDR_SECT_MASK;\n-\twhile (ate_end_addr > data_end_addr) {\n-\t\trc = nvs_flash_ate_rd(fs, ate_end_addr, &end_ate);\n-\t\tif (rc) {\n-\t\t\treturn rc;\n-\t\t}\n-\t\tif (!nvs_ate_crc8_check(&end_ate)) {\n-\t\t\t\/* found a valid ate, update data_end_addr and *addr *\/\n-\t\t\tdata_end_addr &= ADDR_SECT_MASK;\n-\t\t\tdata_end_addr += end_ate.offset + end_ate.len;\n-\t\t\t*addr = ate_end_addr;\n-\t\t}\n-\t\tate_end_addr -= ate_size;\n-\t}\n-\t\/* remark: if there was absolutely no valid data in the sector *addr\n+\t *\n+\t * remark: if there was absolutely no valid data in the sector *addr\n \t * is kept at sector_end - 2*ate_size, the next read will contain\n \t * invalid data and continue with a sector jump\n \t *\/\n-\treturn 0;\n+\treturn nvs_recover_last_ate(fs, addr);\n }\n \n static void nvs_sector_advance(struct nvs_fs *fs, uint32_t *addr)\n@@ -480,17 +502,29 @@\n \n \tstop_addr = gc_addr - ate_size;\n \n-\tgc_addr &= ADDR_SECT_MASK;\n-\tgc_addr += close_ate.offset;\n-\n-\twhile (1) {\n+\tif (!nvs_ate_crc8_check(&close_ate)) {\n+\t\tgc_addr &= ADDR_SECT_MASK;\n+\t\tgc_addr += close_ate.offset;\n+\t} else {\n+\t\trc = nvs_recover_last_ate(fs, &gc_addr);\n+\t\tif (rc) {\n+\t\t\treturn rc;\n+\t\t}\n+\t}\n+\n+\tdo {\n \t\tgc_prev_addr = gc_addr;\n \t\trc = nvs_prev_ate(fs, &gc_addr, &gc_ate);\n \t\tif (rc) {\n \t\t\treturn rc;\n \t\t}\n+\n+\t\tif (nvs_ate_crc8_check(&gc_ate)) {\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\twlk_addr = fs->ate_wra;\n-\t\twhile (1) {\n+\t\tdo {\n \t\t\twlk_prev_addr = wlk_addr;\n \t\t\trc = nvs_prev_ate(fs, &wlk_addr, &wlk_ate);\n \t\t\tif (rc) {\n@@ -505,7 +539,8 @@\n \t\t\t (!nvs_ate_crc8_check(&wlk_ate))) {\n \t\t\t\tbreak;\n \t\t\t}\n-\t\t}\n+\t\t} while (wlk_addr != fs->ate_wra);\n+\n \t\t\/* if walk has reached the same address as gc_addr copy is\n \t\t * needed unless it is a deleted item.\n \t\t *\/\n@@ -529,12 +564,7 @@\n \t\t\t\treturn rc;\n \t\t\t}\n \t\t}\n-\n-\t\t\/* stop gc at end of the sector *\/\n-\t\tif (gc_prev_addr == stop_addr) {\n-\t\t\tbreak;\n-\t\t}\n-\t}\n+\t} while (gc_prev_addr != stop_addr);\n \n \trc = nvs_flash_erase_sector(fs, sec_addr);\n \tif (rc) {\n"} {"commit":"bbf9fd12c717d291a1d76ba4c66d982b010705b9","subject":"Remove trailing slashes from --dbpath argument.","message":"Remove trailing slashes from --dbpath argument.\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- tools\/mserver\/mserver5.c\n+++ tools\/mserver\/mserver5.c\n@@ -292,6 +292,12 @@\n \t\tswitch (c) {\n \t\tcase 0:\n \t\t\tif (strcmp(long_options[option_index].name, \"dbpath\") == 0) {\n+\t\t\t\tsize_t optarglen = strlen(optarg);\n+\t\t\t\t\/* remove trailing directory separator *\/\n+\t\t\t\twhile (optarglen > 0 &&\n+\t\t\t\t (optarg[optarglen - 1] == '\/' ||\n+\t\t\t\t\toptarg[optarglen - 1] == '\\\\'))\n+\t\t\t\t\toptarg[--optarglen] = '\\0';\n \t\t\t\tsetlen = mo_add_option(&set, setlen, opt_cmdline, \"gdk_dbpath\", optarg);\n \t\t\t\tbreak;\n \t\t\t}\n"} {"commit":"d53b7b92cbe8b70031b1113112341ac106306722","subject":"TODO-786","message":"TODO-786","repos":"opentrv\/OTRadioLink,opentrv\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,Denzo77\/OTRadioLink,Denzo77\/OTRadioLink,DamonHD\/OTRadioLink,opentrv\/OTRadioLink,DamonHD\/OTRadioLink,DamonHD\/OTRadioLink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- content\/OTRadioLink\/utility\/OTV0P2BASE_EEPROM.h\n+++ content\/OTRadioLink\/utility\/OTV0P2BASE_EEPROM.h\n@@ -156,13 +156,20 @@\n \/\/ Minimum (total percentage across all rads) that all rads should be on before heating should fire.\n #define V0P2BASE_EE_START_MIN_TOTAL_VALVE_PC_OPEN 31 \/\/ Ignored entirely if outside range [1,100], eg if default\/unprogrammed 0xff.\n \n+\n+\/\/ GENERIC STORAGE AREA.\n+\/\/ Lowest EEPROM address allowed for raw inspect\/set.\n+\/\/ Items beyond this may be particularly security-sensitive, eg secret keys.\n+static const intptr_t V0P2BASE_EE_START_RAW_INSPECTABLE = 32;\n+\/\/ Length of generic storage area.\n+static const uint8_t V0P2BASE_EE_LEN_RAW_INSPECTABLE = 32;\n+\/\/ Highest EEPROM address allowed for raw inspect\/set.\n+\/\/ Items beyond this may be particularly security-sensitive, eg secret keys.\n+static const intptr_t V0P2BASE_EE_END_RAW_INSPECTABLE = V0P2BASE_EE_START_RAW_INSPECTABLE + V0P2BASE_EE_LEN_RAW_INSPECTABLE - 1;\n \/\/ Lockout time in hours before energy-saving setbacks are enabled (if not 0), stored inverted.\n \/\/ Stored inverted so that a default erased (0xff) value will be seen as 0, so no lockout and thus normal behaviour.\n-static const intptr_t V0P2BASE_EE_START_SETBACK_LOCKOUT_COUNTDOWN_H_INV = 32;\n-\n-\/\/ Highest EEPROM address allowed for raw inspect\/set.\n-\/\/ Items beyond this may be particularly security-sensitive, eg secret keys.\n-static const intptr_t V0P2BASE_EE_END_RAW_INSPECTABLE = 63;\n+static const intptr_t V0P2BASE_EE_START_SETBACK_LOCKOUT_COUNTDOWN_H_INV = 0 + V0P2BASE_EE_START_RAW_INSPECTABLE;\n+\n \n \/\/ TX message counter (most-significant) persistent reboot\/restart 3 bytes. (TODO-728)\n \/\/ Nominally the counter associated with the primary TX key,\n"} {"commit":"304d07679ba9cd0e8c0408c2be3c1b3b498f01c1","subject":"bslstl_stringref: speed up aliasing equality comparisons","message":"bslstl_stringref: speed up aliasing equality comparisons\n","repos":"bloomberg\/bde,che2\/bde,che2\/bde,bloomberg\/bde,bloomberg\/bde,bloomberg\/bde,che2\/bde,che2\/bde,bloomberg\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bsl\/bslstl\/bslstl_stringref.h\n+++ groups\/bsl\/bslstl\/bslstl_stringref.h\n@@ -1107,7 +1107,11 @@\n bool bslstl::operator==(const StringRefImp<CHAR_TYPE>& lhs,\n const StringRefImp<CHAR_TYPE>& rhs)\n {\n- return lhs.length() == rhs.length() && lhs.compare(rhs) == 0;\n+ return lhs.length() != rhs.length()\n+ ? false\n+ : lhs.data() == rhs.data()\n+ ? true\n+ : lhs.compare(rhs) == 0;\n }\n \n template <class CHAR_TYPE>\n"} {"commit":"430ef71fc0e5669c7f30abc12d00b8ab2ec6f49a","subject":"nimble\/ll\/dtm: Change event callback name","message":"nimble\/ll\/dtm: Change event callback name\n\nWe'll have more of them soon.\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_dtm.c\n+++ nimble\/controller\/src\/ble_ll_dtm.c\n@@ -151,7 +151,7 @@\n }\n \n static void\n-ble_ll_dtm_event(struct ble_npl_event *evt) {\n+ble_ll_dtm_ev_tx_resched_cb(struct ble_npl_event *evt) {\n \/* It is called in LL context *\/\n struct dtm_ctx *ctx = ble_npl_event_get_arg(evt);\n int rc;\n@@ -326,7 +326,7 @@\n os_cputime_usecs_to_ticks(5000);\n \n \/* Prepare os_event *\/\n- ble_npl_event_init(&g_ble_ll_dtm_ctx.evt, ble_ll_dtm_event,\n+ ble_npl_event_init(&g_ble_ll_dtm_ctx.evt, ble_ll_dtm_ev_tx_resched_cb,\n &g_ble_ll_dtm_ctx);\n \n ble_ll_dtm_calculate_itvl(&g_ble_ll_dtm_ctx, len, phy_mode);\n"} {"commit":"bc076f84377baa27ea399c60ad0ed29bd13ffbd2","subject":"gobex: Add proper responses to all requests in test-server","message":"gobex: Add proper responses to all requests in test-server\n","repos":"mapfau\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,ComputeCycles\/bluez,mapfau\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,mapfau\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/obex-server-tool.c\n+++ tools\/obex-server-tool.c\n@@ -64,11 +64,26 @@\n static void req_func(GObex *obex, GObexPacket *req, gpointer user_data)\n {\n \tgboolean final;\n-\tguint8 op = g_obex_packet_get_operation(req, &final);\n+\tguint8 rsp, op = g_obex_packet_get_operation(req, &final);\n \n \tg_print(\"Request 0x%02x%s\\n\", op, final ? \" (final)\" : \"\");\n \n-\tg_obex_response(obex, op, G_OBEX_RSP_SUCCESS, NULL, NULL);\n+\tswitch (op) {\n+\tcase G_OBEX_OP_CONNECT:\n+\t\trsp = G_OBEX_RSP_SUCCESS;\n+\t\tbreak;\n+\tcase G_OBEX_OP_PUT:\n+\t\tif (g_obex_packet_find_header(req, G_OBEX_HDR_ID_BODY))\n+\t\t\trsp = G_OBEX_RSP_CONTINUE;\n+\t\telse\n+\t\t\trsp = G_OBEX_RSP_SUCCESS;\n+\t\tbreak;\n+\tdefault:\n+\t\trsp = G_OBEX_RSP_NOT_IMPLEMENTED;\n+\t\tbreak;\n+\t}\n+\n+\tg_obex_response(obex, op, rsp, NULL, NULL);\n }\n \n static gboolean unix_accept(GIOChannel *chan, GIOCondition cond, gpointer data)\n"} {"commit":"bcf57bb4f9bf11efd06e79c53ac6a6f0b63d904a","subject":"Drop obsolete decls.","message":"Drop obsolete decls.\n","repos":"01org\/iotg-lin-gfx-gstreamer-vaapi,gbeauchesne\/gstreamer-vaapi,ceyusa\/gstreamer-vaapi,sreerenjb\/sree-gstreamer-vaapi,ceyusa\/gstreamer-vaapi,gbeauchesne\/gstreamer-vaapi,CapOM\/gstreamer-vaapi,gbeauchesne\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi,CapOM\/gstreamer-vaapi,sreerenjb\/sree-gstreamer-vaapi,01org\/iotg-lin-gfx-gstreamer-vaapi,GStreamer\/gstreamer-vaapi,01org\/iotg-lin-gfx-gstreamer-vaapi,sreerenjb\/sree-gstreamer-vaapi,CapOM\/gstreamer-vaapi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst-libs\/gst\/vaapi\/gstvaapidecoder.h\n+++ gst-libs\/gst\/vaapi\/gstvaapidecoder.h\n@@ -126,15 +126,6 @@\n );\n \n gboolean\n-gst_vaapi_decoder_start(GstVaapiDecoder *decoder);\n-\n-gboolean\n-gst_vaapi_decoder_pause(GstVaapiDecoder *decoder);\n-\n-gboolean\n-gst_vaapi_decoder_stop(GstVaapiDecoder *decoder);\n-\n-gboolean\n gst_vaapi_decoder_put_buffer_data(\n GstVaapiDecoder *decoder,\n const guchar *buf,\n"} {"commit":"8dc7c651dd7d95b548adef8cd56908392d3ba432","subject":"perf config: Allow '_' in config file variable names","message":"perf config: Allow '_' in config file variable names\n\nFor annotate I want to be able to have variables that are the same as\nthe ones representing feature toggles.\n\nCc: David Ahern <b80c1600f604d3b0d768f26f90a76757e76005dd@gmail.com>\nCc: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Mike Galbraith <3cfa3897b7f55b5396b7a47c83b66325184bc9b4@gmx.de>\nCc: Namhyung Kim <5c915a589b3ddf58cebf14bec41bcc143b37ac3c@gmail.com>\nCc: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nCc: Peter Zijlstra <3fddac958924aef220f202ca567388ddab3f14a8@infradead.org>\nCc: Stephane Eranian <f199ae9781930a5b94b284ca2f471140752002a7@google.com>\nLink: 72b964237a6b6920550e05e168eae1b5f4ff33c3@git.kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/perf\/util\/config.c\n+++ tools\/perf\/util\/config.c\n@@ -120,7 +120,7 @@\n \n static inline int iskeychar(int c)\n {\n-\treturn isalnum(c) || c == '-';\n+\treturn isalnum(c) || c == '-' || c == '_';\n }\n \n static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)\n"} {"commit":"9bb65e4c1030f31b7c21b16f1d7eddbfd6eaade9","subject":"libs: surface: initialize VASurfaceAttribExternalBuffers","message":"libs: surface: initialize VASurfaceAttribExternalBuffers\n\nInitialize VASurfaceAttribExternalBuffers using compiler's syntax\nrather than using memset().\n","repos":"ceyusa\/gstreamer-vaapi,ceyusa\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi,GStreamer\/gstreamer-vaapi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst-libs\/gst\/vaapi\/gstvaapisurface.c\n+++ gst-libs\/gst\/vaapi\/gstvaapisurface.c\n@@ -140,7 +140,7 @@\n guint chroma_type, va_chroma_format, i;\n const VAImageFormat *va_format;\n VASurfaceAttrib attribs[3], *attrib;\n- VASurfaceAttribExternalBuffers extbuf;\n+ VASurfaceAttribExternalBuffers extbuf = { 0, };\n gboolean extbuf_needed = FALSE;\n \n va_format = gst_vaapi_video_format_to_va_format (format);\n@@ -155,7 +155,6 @@\n if (!va_chroma_format)\n goto error_unsupported_format;\n \n- memset (&extbuf, 0, sizeof (extbuf));\n extbuf.pixel_format = va_format->fourcc;\n extbuf.width = GST_VIDEO_INFO_WIDTH (vip);\n extbuf.height = GST_VIDEO_INFO_HEIGHT (vip);\n@@ -232,7 +231,7 @@\n guint chroma_type, va_chroma_format;\n const VAImageFormat *va_format;\n VASurfaceAttrib attribs[2], *attrib;\n- VASurfaceAttribExternalBuffers extbuf;\n+ VASurfaceAttribExternalBuffers extbuf = { 0, };\n unsigned long extbuf_handle;\n guint i, width, height;\n \n"} {"commit":"0817df08d31cd961be225e601d8ec92acac62027","subject":"perf evlist: Reset SIGTERM handler in workload child process","message":"perf evlist: Reset SIGTERM handler in workload child process\n\nJiri reported hanging perf tests on latest acme's perf\/core and bisected\nit to 87f303a9f:\n\n[jolsa@krava2 perf]$ cat \/proc\/sys\/kernel\/perf_event_paranoid\n1\n[jolsa@krava2 perf]$ .\/perf record -C 0 kill\nError:\nYou may not have permission to collect %sstats.\nConsider tweaking \/proc\/sys\/kernel\/perf_event_paranoid:\n -1 - Not paranoid at all\n 0 - Disallow raw tracepoint access for unpriv\n 1 - Disallow cpu events for unpriv\n 2 - Disallow kernel profiling for unpriv\n\nNeed to let default handling kickin for workload process.\n\nReported-by: Jiri Olsa <2c6594f608aa3d41e98d48846a6328831f7084ad@redhat.com>\nSigned-off-by: David Ahern <b80c1600f604d3b0d768f26f90a76757e76005dd@gmail.com>\nAcked-by: Jiri Olsa <2c6594f608aa3d41e98d48846a6328831f7084ad@redhat.com>\nTested-by: Jiri Olsa <2c6594f608aa3d41e98d48846a6328831f7084ad@redhat.com>\nLink: http:\/\/lkml.kernel.org\/r\/1369525839-1261-1-git-send-email-b80c1600f604d3b0d768f26f90a76757e76005dd@gmail.com\nSigned-off-by: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/perf\/util\/evlist.c\n+++ tools\/perf\/util\/evlist.c\n@@ -776,6 +776,8 @@\n \t\tif (pipe_output)\n \t\t\tdup2(2, 1);\n \n+\t\tsignal(SIGTERM, SIG_DFL);\n+\n \t\tclose(child_ready_pipe[0]);\n \t\tclose(go_pipe[1]);\n \t\tfcntl(go_pipe[0], F_SETFD, FD_CLOEXEC);\n"} {"commit":"286c919fa1a1834830eab232930c925e7ecf10a1","subject":"Add sink pad and valve to FsMsnSession","message":"Add sink pad and valve to FsMsnSession\n","repos":"tieto\/farstream,pexip\/farstream,tieto\/farstream,pexip\/farstream,kakaroto\/farstream,tieto\/farstream,tieto\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,shadeslayer\/farstream,shadeslayer\/farstream,kakaroto\/farstream,kakaroto\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,kakaroto\/farstream,pexip\/farstream,shadeslayer\/farstream,shadeslayer\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsmsnconference\/fs-msn-session.c\n+++ gst\/fsmsnconference\/fs-msn-session.c\n@@ -70,6 +70,9 @@\n FsMsnStream *stream;\n \n GError *construction_error;\n+\n+ GstPad *media_sink_pad;\n+ GstElement *valve;\n \n gboolean disposed;\n };\n@@ -155,6 +158,20 @@\n }\n \n static void\n+stop_and_remove (GstBin *conf, GstElement **element, gboolean unref)\n+{\n+ if (*element == NULL)\n+ return;\n+\n+ gst_element_set_locked_state (*element, TRUE);\n+ gst_element_set_state (*element, GST_STATE_NULL);\n+ gst_bin_remove (conf, *element);\n+ if (unref)\n+ gst_object_unref (*element);\n+ *element = NULL;\n+}\n+\n+static void\n fs_msn_session_dispose (GObject *object)\n {\n FsMsnSession *self = FS_MSN_SESSION (object);\n@@ -166,7 +183,10 @@\n \n conferencebin = GST_BIN (self->priv->conference);\n \n- FS_MSN_SESSION_UNLOCK (self);\n+ stop_and_remove (conferencebin, &self->priv->valve, TRUE);\n+\n+ if (self->priv->media_sink_pad)\n+ gst_pad_set_active (self->priv->media_sink_pad, FALSE);\n \n \/* MAKE sure dispose does not run twice. *\/\n self->priv->disposed = TRUE;\n@@ -237,6 +257,49 @@\n static void\n fs_msn_session_constructed (GObject *object)\n {\n+ FsMsnSession *self = FS_MSN_SESSION (object);\n+ GstPad *pad;\n+\n+ self->priv->valve = gst_element_factory_make (\"fsvalve\", NULL);\n+\n+ if (!self->priv->valve)\n+ {\n+ self->priv->construction_error = g_error_new (FS_ERROR,\n+ FS_ERROR_CONSTRUCTION, \"Could not make sink valve\");\n+ return;\n+ }\n+\n+ if (!gst_bin_add (GST_BIN (self->priv->conference), self->priv->valve))\n+ {\n+ self->priv->construction_error = g_error_new (FS_ERROR,\n+ FS_ERROR_CONSTRUCTION, \"Could not add valve to conference\");\n+ return;\n+ }\n+\n+ pad = gst_element_get_static_pad (self->priv->valve, \"sink\");\n+ self->priv->media_sink_pad = gst_ghost_pad_new (\"sink1\", pad);\n+ gst_object_unref (pad);\n+\n+ if (!pad)\n+ {\n+ self->priv->construction_error = g_error_new (FS_ERROR,\n+ FS_ERROR_CONSTRUCTION, \"Could not create sink ghost pad\");\n+ return;\n+ }\n+\n+ gst_pad_set_active (self->priv->media_sink_pad, TRUE);\n+ if (!gst_element_add_pad (GST_ELEMENT (self->priv->conference),\n+ self->priv->media_sink_pad))\n+ {\n+ self->priv->construction_error = g_error_new (FS_ERROR,\n+ FS_ERROR_CONSTRUCTION, \"Could not add sink pad to conference\");\n+ gst_object_unref (self->priv->media_sink_pad);\n+ self->priv->media_sink_pad = NULL;\n+ return;\n+ }\n+\n+ gst_element_sync_state_with_parent (self->priv->valve);\n+\n GST_CALL_PARENT (G_OBJECT_CLASS, constructed, (object));\n }\n \n"} {"commit":"e735fb265a11921bae633b7ee86f38415d0bbeaa","subject":"Use the negotiated codecs in the streams instead of regenerating them every time","message":"Use the negotiated codecs in the streams instead of regenerating them every time\n","repos":"tieto\/farstream,kakaroto\/farstream,kakaroto\/farstream,kakaroto\/farstream,tieto\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,kakaroto\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,pexip\/farstream,shadeslayer\/farstream,shadeslayer\/farstream,pexip\/farstream,tieto\/farstream,tieto\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,shadeslayer\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-session.c\n+++ gst\/fsrtpconference\/fs-rtp-session.c\n@@ -2392,7 +2392,6 @@\n CodecAssociation *ca = NULL;\n GList *item = NULL;\n \n-\n if (!session->priv->codec_associations)\n {\n g_set_error (error, FS_ERROR, FS_ERROR_INTERNAL,\n@@ -2409,46 +2408,29 @@\n return NULL;\n }\n \n- recv_codec = codec_copy_without_config (ca->codec);\n-\n if (stream)\n {\n- GList *remote_codecs = NULL;\n- FsCodec *remote_codec = NULL;\n-\n- g_object_get (stream, \"remote-codecs\", &remote_codecs, NULL);\n-\n-\n- for (item = remote_codecs; item; item = g_list_next (item))\n+ GList *stream_codecs = NULL;\n+\n+ g_object_get (stream, \"negotiated-codecs\", &stream_codecs, NULL);\n+\n+ for(item = stream_codecs; item; item = g_list_next (item))\n {\n- FsCodec *tmpcodec = NULL;\n- remote_codec = item->data;\n-\n- tmpcodec = sdp_is_compat (ca->codec, remote_codec);\n- if (tmpcodec)\n- {\n- fs_codec_destroy (tmpcodec);\n+ recv_codec = item->data;\n+ if (recv_codec->id == pt)\n break;\n- }\n }\n \n- if (item == NULL)\n- remote_codec = NULL;\n-\n- if (remote_codec)\n- {\n- for (item = remote_codec->optional_params; item;\n- item = g_list_next (item))\n- {\n- FsCodecParameter *param = item->data;\n- if (codec_has_config_data_named (recv_codec, param->name))\n- fs_codec_add_optional_parameter (recv_codec, param->name,\n- param->value);\n- }\n- }\n-\n- fs_codec_list_destroy (remote_codecs);\n- }\n+ if (item)\n+ stream_codecs = g_list_remove_all (stream_codecs, item);\n+ else\n+ recv_codec = NULL;\n+\n+ fs_codec_list_destroy (stream_codecs);\n+ }\n+\n+ if (!recv_codec)\n+ recv_codec = codec_copy_without_config (ca->codec);\n \n if (bp)\n *bp = ca->blueprint;\n"} {"commit":"17374fe00543ad8a289560b984447e6f882fe078","subject":"Store the media_type in FsRtpSession","message":"Store the media_type in FsRtpSession\n","repos":"tieto\/farstream,kakaroto\/farstream,pexip\/farstream,tieto\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,ahmedammar\/skype_farsight2,kakaroto\/farstream,pexip\/farstream,tieto\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,shadeslayer\/farstream,shadeslayer\/farstream,shadeslayer\/farstream,tieto\/farstream,kakaroto\/farstream,kakaroto\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-session.c\n+++ gst\/fsrtpconference\/fs-rtp-session.c\n@@ -57,8 +57,7 @@\n \n struct _FsRtpSessionPrivate\n {\n- \/* List of Streams *\/\n- GPtrArray *stream_list;\n+ FsMediaType media_type;\n \n gboolean disposed;\n };\n@@ -72,13 +71,13 @@\n static void fs_rtp_session_finalize (GObject *object);\n \n static void fs_rtp_session_get_property (GObject *object,\n- guint prop_id,\n- GValue *value,\n- GParamSpec *pspec);\n+ guint prop_id,\n+ GValue *value,\n+ GParamSpec *pspec);\n static void fs_rtp_session_set_property (GObject *object,\n- guint prop_id,\n- const GValue *value,\n- GParamSpec *pspec);\n+ guint prop_id,\n+ const GValue *value,\n+ GParamSpec *pspec);\n \n static FsStream *fs_rtp_session_new_stream (FsSession *session,\n FsParticipant *participant,\n@@ -294,6 +293,16 @@\n GValue *value,\n GParamSpec *pspec)\n {\n+ FsRtpSession *self = FS_RTP_SESSION (object);\n+\n+ switch (prop_id) {\n+ case PROP_MEDIA_TYPE:\n+ g_value_set_enum (value, self->priv->media_type);\n+ break;\n+ default:\n+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);\n+ break;\n+ }\n }\n \n static void\n@@ -302,6 +311,16 @@\n const GValue *value,\n GParamSpec *pspec)\n {\n+ FsRtpSession *self = FS_RTP_SESSION (object);\n+\n+ switch (prop_id) {\n+ case PROP_MEDIA_TYPE:\n+ self->priv->media_type = g_value_get_enum (value);\n+ break;\n+ default:\n+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);\n+ break;\n+ }\n }\n \n \/**\n"} {"commit":"97df2bce606ad2b5768eb8032ade9122b1a932aa","subject":"Use negotiatied codecs to generate new local codecs","message":"Use negotiatied codecs to generate new local codecs\n","repos":"kakaroto\/farstream,shadeslayer\/farstream,shadeslayer\/farstream,pexip\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,kakaroto\/farstream,pexip\/farstream,tieto\/farstream,tieto\/farstream,kakaroto\/farstream,tieto\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,kakaroto\/farstream,pexip\/farstream,tieto\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,tieto\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-session.c\n+++ gst\/fsrtpconference\/fs-rtp-session.c\n@@ -1245,7 +1245,7 @@\n \n new_local_codec_associations = create_local_codec_associations (\n self->priv->blueprints, new_local_codecs_configuration,\n- self->priv->local_codec_associations);\n+ self->priv->negotiated_codec_associations);\n \n if (new_local_codec_associations)\n {\n"} {"commit":"c8d86ffb2be5c1bea35287cb9bf59dcb10ceea0b","subject":"Add RVAL2GTKRADIOTOOLBUTTONGSLIST","message":"Add RVAL2GTKRADIOTOOLBUTTONGSLIST\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkradiotoolbutton.c\n+++ gtk2\/ext\/gtk2\/rbgtkradiotoolbutton.c\n@@ -17,39 +17,77 @@\n \n static VALUE gRToolButton;\n \n+struct rbgtk_rval2gtkradiotoolbuttongslist_args {\n+ VALUE ary;\n+ long n;\n+ GSList *result;\n+};\n+\n+static VALUE\n+rbgtk_rval2gtkradiotoolbuttongslist_body(VALUE value)\n+{\n+ long i;\n+ struct rbgtk_rval2gtkradiotoolbuttongslist_args *args = (struct rbgtk_rval2gtkradiotoolbuttongslist_args *)value;\n+\n+ for (i = 0; i < args->n; i++)\n+ args->result = g_slist_append(args->result, GTK_RADIO_MENU_ITEM(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));\n+\n+ return Qnil;\n+}\n+\n+static VALUE\n+rbgtk_rval2gtkradiotoolbuttongslist_rescue(VALUE value)\n+{\n+ g_slist_free(((struct rbgtk_rval2gtkradiotoolbuttongslist_args *)value)->result);\n+\n+ rb_exc_raise(rb_errinfo());\n+}\n+\n+static GSList *\n+rbgtk_rval2gtkradiotoolbuttongslist(VALUE value)\n+{\n+ struct rbgtk_rval2gtkradiotoolbuttongslist_args args;\n+\n+ args.ary = rb_ary_to_ary(value);\n+ args.n = RARRAY_LEN(args.ary);\n+ args.result = NULL;\n+\n+ rb_rescue(rbgtk_rval2gtkradiotoolbuttongslist_body, (VALUE)&args,\n+ rbgtk_rval2gtkradiotoolbuttongslist_rescue, (VALUE)&args);\n+\n+ return args.result;\n+}\n+\n+#define RVAL2GTKRADIOTOOLBUTTONGSLIST(value) rbgtk_rval2gtkradiotoolbuttongslist(value)\n+\n static VALUE\n rbtn_initialize(int argc, VALUE *argv, VALUE self)\n {\n- VALUE group_or_stock_id, stock_id;\n+ VALUE group_or_stock_id, rbstock_id;\n GtkToolItem *widget;\n \n- if (rb_scan_args(argc, argv, \"02\", &group_or_stock_id, &stock_id) > 0) {\n- GSList* list = NULL;\n- if (TYPE(group_or_stock_id) == T_ARRAY){\n- int i;\n- Check_Type(group_or_stock_id, T_ARRAY);\n- for (i = 0; i < RARRAY_LEN(group_or_stock_id); i++) {\n- list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group_or_stock_id)[i]));\n- }\n- } else if (rb_obj_is_kind_of(group_or_stock_id, gRToolButton)){\n- list = gtk_radio_tool_button_get_group(_SELF(group_or_stock_id));\n- } else {\n- list = NULL;\n- }\n- if (NIL_P(stock_id)){\n- widget = gtk_radio_tool_button_new(list);\n- } else {\n- if (TYPE(stock_id) == T_SYMBOL){\n- widget = gtk_radio_tool_button_new_from_stock(list, rb_id2name(SYM2ID(stock_id)));\n- } else {\n- widget = gtk_radio_tool_button_new_from_stock(list, RVAL2CSTR(stock_id));\n- }\n- }\n+ if (rb_scan_args(argc, argv, \"02\", &group_or_stock_id, &rbstock_id) > 0) {\n+ GSList *group = NULL;\n+ const gchar *stock_id = TYPE(rbstock_id) == T_SYMBOL ?\n+ rb_id2name(SYM2ID(rbstock_id)) :\n+ RVAL2CSTR_ACCEPT_NIL(rbstock_id);\n+\n+ if (TYPE(group_or_stock_id) == T_ARRAY)\n+ \/* TODO: This has a potential for leaking. *\/\n+ group = RVAL2GTKRADIOTOOLBUTTONGSLIST(group_or_stock_id);\n+ else if (rb_obj_is_kind_of(group_or_stock_id, gRToolButton))\n+ group = gtk_radio_tool_button_get_group(_SELF(group_or_stock_id));\n+\n+ if (stock_id == NULL)\n+ widget = gtk_radio_tool_button_new(group);\n+ else\n+ widget = gtk_radio_tool_button_new_from_stock(group, stock_id);\n } else {\n widget = gtk_radio_tool_button_new(NULL);\n }\n- \n+\n RBGTK_INITIALIZE(self, widget);\n+\n return Qnil;\n }\n \n@@ -61,19 +99,16 @@\n }\n \n static VALUE\n-rbtn_set_group(VALUE self, VALUE group)\n+rbtn_set_group(VALUE self, VALUE rbgroup)\n {\n- GSList* list = NULL;\n- if (TYPE(group) == T_ARRAY){\n- int i;\n- for (i = 0; i < RARRAY_LEN(group); i++){\n- list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group)[i]));\n- }\n- } else {\n- list = gtk_radio_tool_button_get_group(_SELF(group));\n- }\n- gtk_radio_tool_button_set_group(_SELF(self), list);\n- \n+ GtkRadioToolButton *button = _SELF(self);\n+ GSList *group = TYPE(rbgroup) == T_ARRAY ?\n+ \/* TODO: This might leak. *\/\n+ RVAL2GTKRADIOTOOLBUTTONGSLIST(rbgroup) :\n+ gtk_radio_tool_button_get_group(_SELF(rbgroup));\n+\n+ gtk_radio_tool_button_set_group(button, group);\n+\n return self;\n }\n \n"} {"commit":"a3fbf4dfe1bf2386add261dc7c2809b652b5f9ae","subject":"pack-objects: make in_pack_header_size a variable of its own","message":"pack-objects: make in_pack_header_size a variable of its own\n\nIt currently aliases delta_size on the principle that reused deltas won't\ngo through the whole delta matching loop hence delta_size was unused.\nThis is not true if given delta doesn't find its base in the pack though.\nBut we need that information even for whole object data reuse.\n\nWell in short the current state looks awful and is prone to bugs. It just\nworks fine now because try_delta() tests trg_entry->delta before using\ntrg_entry->delta_size, but that is a bit subtle and I was wondering for a\nwhile why things just worked fine... even if I'm guilty of having\nintroduced this abomination myself in the first place.\n\nLet's do the sensible thing instead with no ambiguity, which is to have\na separate variable for in_pack_header_size. This might even help future\noptimizations.\n\nWhile at it, let's reorder some struct object_entry members so they all\nalign well with their own width, regardless of the architecture or the\nsize of off_t. Some memory saving is to be expected with this alone.\n\nSigned-off-by: Nicolas Pitre <d659c10e27d52b00987b65e85d99bce5480adcae@cam.org>\nSigned-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- builtin-pack-objects.c\n+++ builtin-pack-objects.c\n@@ -22,28 +22,26 @@\n \n struct object_entry {\n \tunsigned char sha1[20];\n+\tuint32_t crc32;\t\t\/* crc of raw pack data for this object *\/\n+\toff_t offset;\t\t\/* offset into the final pack file *\/\n \tunsigned long size;\t\/* uncompressed size *\/\n-\toff_t offset;\t\/* offset into the final pack file;\n-\t\t\t\t * nonzero if already written.\n-\t\t\t\t *\/\n+\tunsigned int hash;\t\/* name hint hash *\/\n \tunsigned int depth;\t\/* delta depth *\/\n-\tunsigned int hash;\t\/* name hint hash *\/\n-\tenum object_type type;\n-\tenum object_type in_pack_type;\t\/* could be delta *\/\n-\tunsigned long delta_size;\t\/* delta data size (uncompressed) *\/\n-#define in_pack_header_size delta_size\t\/* only when reusing pack data *\/\n-\tstruct object_entry *delta;\t\/* delta base object *\/\n \tstruct packed_git *in_pack; \t\/* already in pack *\/\n \toff_t in_pack_offset;\n+\tstruct object_entry *delta;\t\/* delta base object *\/\n \tstruct object_entry *delta_child; \/* deltified objects who bases me *\/\n \tstruct object_entry *delta_sibling; \/* other deltified objects who\n \t\t\t\t\t * uses the same base as me\n \t\t\t\t\t *\/\n-\tint preferred_base;\t\/* we do not pack this, but is encouraged to\n-\t\t\t\t * be used as the base objectto delta huge\n-\t\t\t\t * objects against.\n-\t\t\t\t *\/\n-\tuint32_t crc32;\t\t\/* crc of raw pack data for this object *\/\n+\tunsigned long delta_size;\t\/* delta data size (uncompressed) *\/\n+\tenum object_type type;\n+\tenum object_type in_pack_type;\t\/* could be delta *\/\n+\tunsigned char in_pack_header_size;\n+\tunsigned char preferred_base; \/* we do not pack this, but is available\n+\t\t\t\t * to be used as the base objectto delta\n+\t\t\t\t * objects against.\n+\t\t\t\t *\/\n };\n \n \/*\n"} {"commit":"17cf2ad2edec3b8a283e38879884821067af7843","subject":"changed the index sorting from sorting by pts to sorting by timecode","message":"changed the index sorting from sorting by pts to sorting by timecode\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -43,9 +43,10 @@\n int frame_duration;\n } StreamContext;\n \n-static int idx_sort_by_pts(const void *idx1, const void *idx2)\n-{\n- return ((Index *)idx1)->pts - ((Index *)idx2)->pts;\n+static int idx_sort_by_timecode(const void *idx1, const void *idx2)\n+{\n+ return (((Index*) idx1)->timecode.hours * 1000000 + ((Index*) idx1)->timecode.minutes * 10000 + ((Index*) idx1)->timecode.seconds * 100 + ((Index*) idx1)->timecode.frames) - \n+ (((Index*) idx2)->timecode.hours * 1000000 + ((Index*) idx2)->timecode.minutes * 10000 + ((Index*) idx2)->timecode.seconds * 100 + ((Index*) idx2)->timecode.frames);\n }\n \n extern AVInputFormat mpegps_demuxer;\n@@ -81,7 +82,7 @@\n url_open_dyn_buf(&indexpb);\n int i;\n \n- qsort(stcontext->index, stcontext->frame_num, sizeof(Index), idx_sort_by_pts);\n+ qsort(stcontext->index, stcontext->frame_num, sizeof(Index), idx_sort_by_timecode);\n put_le64(&indexpb, 0x534A2D494E444558LL); \/\/ Magic number : SJ-INDEX in hex\n put_byte(&indexpb, 0x00000000); \/\/ Version\n for (i = 0; i < stcontext->frame_num; i++) {\n"} {"commit":"6b368604d62abda02e790f6bb1855f12ad780d5a","subject":"removed unused fps_list array","message":"removed unused fps_list array\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -8,7 +8,6 @@\n \n \/\/#define DEBUG\n \n-static const int fps_list[8] = {24, 24, 25, 30, 30, 50, 60, 60};\n typedef struct MpegDemuxContext {\n int32_t header_state;\n unsigned char psm_es_type[256];\n"} {"commit":"051c43d022aca46e7c23947ef021d3cda6cfacc2","subject":"Improve error reporting.","message":"Improve error reporting.\n","repos":"erikogan\/passenger,antek-drzewiecki\/passenger,clemensg\/passenger,bf4\/passenger,gravitystorm\/passenger,fabiokung\/passenger-debian,openSUSE\/passenger,cgvarela\/passenger,cgvarela\/passenger,gravitystorm\/passenger,phusion\/passenger,kewaunited\/passenger,phusion\/passenger,clemensg\/passenger,antek-drzewiecki\/passenger,pkmiec\/passenger,antek-drzewiecki\/passenger,gravitystorm\/passenger,phusion\/passenger,cgvarela\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,kewaunited\/passenger,pkmiec\/passenger,phusion\/passenger,fabiokung\/passenger-debian,erikogan\/passenger,gravitystorm\/passenger,fabiokung\/passenger-debian,cgvarela\/passenger,pkmiec\/passenger,phusion\/passenger,clemensg\/passenger,jawj\/passenger,cgvarela\/passenger,antek-drzewiecki\/passenger,antek-drzewiecki\/passenger,bf4\/passenger,fabiokung\/passenger-debian,pkmiec\/passenger,jawj\/passenger,bf4\/passenger,pkmiec\/passenger,jawj\/passenger,phusion\/passenger,openSUSE\/passenger,bf4\/passenger,openSUSE\/passenger,clemensg\/passenger,antek-drzewiecki\/passenger,openSUSE\/passenger,cgvarela\/passenger,kewaunited\/passenger,erikogan\/passenger,pkmiec\/passenger,jawj\/passenger,phusion\/passenger,openSUSE\/passenger,bf4\/passenger,jawj\/passenger,erikogan\/passenger,bf4\/passenger,jawj\/passenger,kewaunited\/passenger,kewaunited\/passenger,jawj\/passenger,kewaunited\/passenger,gravitystorm\/passenger,kewaunited\/passenger,kewaunited\/passenger,antek-drzewiecki\/passenger,pkmiec\/passenger,erikogan\/passenger,cgvarela\/passenger,openSUSE\/passenger,phusion\/passenger,fabiokung\/passenger-debian,clemensg\/passenger,erikogan\/passenger,clemensg\/passenger,gravitystorm\/passenger,clemensg\/passenger,bf4\/passenger,fabiokung\/passenger-debian,clemensg\/passenger","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/apache2\/ApplicationPoolServer.h\n+++ ext\/apache2\/ApplicationPoolServer.h\n@@ -514,10 +514,10 @@\n \t\t\tret = mkfifo(filename, S_IRUSR | S_IWUSR);\n \t\t} while (ret == -1 && errno == EINTR);\n \t\tif (ret == -1 && errno != EEXIST) {\n-\t\t\tfprintf(stderr, \"*** WARNING: Could not create FIFO '%s'; \"\n-\t\t\t\t\"disabling Passenger ApplicationPool status reporting.\\n\",\n-\t\t\t\tfilename);\n-\t\t\tfflush(stderr);\n+\t\t\tint e = errno;\n+\t\t\tP_WARN(\"*** WARNING: Could not create FIFO '\" << filename <<\n+\t\t\t\t\"': \" << strerror(e) << \" (\" << e << \")\" << endl <<\n+\t\t\t\t\"Disabling Passenger ApplicationPool status reporting.\");\n \t\t\tstatusReportFIFO = \"\";\n \t\t} else {\n \t\t\tstatusReportFIFO = filename;\n"} {"commit":"c8307a67cd9784e3670a6b360b02d0f3acc750b6","subject":"protect version","message":"protect version\n","repos":"github\/version_sorter,github\/version_sorter,github\/version_sorter","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/version_sorter\/version_sorter.c\n+++ ext\/version_sorter\/version_sorter.c\n@@ -171,47 +171,25 @@\n \treturn version;\n }\n \n-static VALUE rb_cSortContext;\n-\n struct sort_context {\n+\tVALUE rb_self;\n+\tVALUE rb_version_array;\n+\tcompare_callback_t *cmp;\n \tstruct version_number **versions;\n-\tlong length;\n };\n \n-static void sort_context_free(void *p) {\n-\tstruct sort_context *context = p;\n-\tlong i;\n-\n-\tfor (i = 0; i < context->length; ++i) {\n-\t\txfree(context->versions[i]);\n-\t}\n-\txfree(context->versions);\n-\txfree(context);\n-}\n-\n-static VALUE\n-rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)\n-{\n+static VALUE\n+rb_version_sort_1_cb(VALUE arg)\n+{\n+\tstruct sort_context *context = (struct sort_context *)arg;\n \tlong length, i;\n \tVALUE *rb_version_ptr;\n \n-\tCheck_Type(rb_version_array, T_ARRAY);\n-\n-\tlength = RARRAY_LEN(rb_version_array);\n-\tif (!length)\n-\t\treturn rb_ary_new();\n-\n-\tstruct sort_context *context;\n-\tcontext = ALLOC(struct sort_context);\n-\tcontext->length = length;\n-\tcontext->versions = xcalloc(length, sizeof(struct version_number *));\n-\n-\tVALUE data = Data_Wrap_Struct(rb_cSortContext, NULL, sort_context_free, context);\n-\n+\tlength = RARRAY_LEN(context->rb_version_array);\n \tfor (i = 0; i < length; ++i) {\n \t\tVALUE rb_version, rb_version_string;\n \n-\t\trb_version = rb_ary_entry(rb_version_array, i);\n+\t\trb_version = rb_ary_entry(context->rb_version_array, i);\n \t\tif (rb_block_given_p())\n \t\t\trb_version_string = rb_yield(rb_version);\n \t\telse\n@@ -221,11 +199,44 @@\n \t\tcontext->versions[i]->rb_version = rb_version;\n \t}\n \n-\tqsort(context->versions, length, sizeof(struct version_number *), cmp);\n-\trb_version_ptr = RARRAY_PTR(rb_version_array);\n+\tqsort(context->versions, length, sizeof(struct version_number *), context->cmp);\n+\trb_version_ptr = RARRAY_PTR(context->rb_version_array);\n \n \tfor (i = 0; i < length; ++i) {\n \t\trb_version_ptr[i] = context->versions[i]->rb_version;\n+\t}\n+\n+\treturn context->rb_version_array;\n+}\n+\n+static VALUE\n+rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)\n+{\n+\tlong length, i;\n+\tint exception;\n+\n+\tCheck_Type(rb_version_array, T_ARRAY);\n+\n+\tlength = RARRAY_LEN(rb_version_array);\n+\tif (!length)\n+\t\treturn rb_ary_new();\n+\n+\tstruct sort_context context = {\n+\t\trb_self,\n+\t\trb_version_array,\n+\t\tcmp,\n+\t\txcalloc(length, sizeof(struct version_number *)),\n+\t};\n+\n+\tVALUE result = rb_protect(rb_version_sort_1_cb, (VALUE)&context, &exception);\n+\n+\tfor (i = 0; i < length; ++i) {\n+\t\txfree(context.versions[i]);\n+\t}\n+\txfree(context.versions);\n+\n+\tif (exception) {\n+\t\trb_jump_tag(exception);\n \t}\n \n \treturn rb_version_array;\n@@ -277,6 +288,4 @@\n \trb_define_module_function(rb_mVersionSorter, \"sort!\", rb_version_sort_bang, 1);\n \trb_define_module_function(rb_mVersionSorter, \"rsort!\", rb_version_sort_r_bang, 1);\n \trb_define_module_function(rb_mVersionSorter, \"compare\", rb_version_compare, 2);\n-\n-\trb_cSortContext = rb_define_class_under(rb_mVersionSorter, \"SortContext\", rb_cObject);\n-}\n+}\n"} {"commit":"4d1ec680b605a0a5061a9a3b9f09cde1e825ca59","subject":"Fix incorrect usage of scope_ptr with an array. NullAudioRender::buffer_ was declared as scoped_ptr<uint8>, But NullAudioRender::OnInitialize() sets uint8[] to it.","message":"Fix incorrect usage of scope_ptr with an array.\nNullAudioRender::buffer_ was declared as scoped_ptr<uint8>, But\nNullAudioRender::OnInitialize() sets uint8[] to it.\n\nBUG=none\nTEST=none\nReview URL: http:\/\/codereview.chromium.org\/301001\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@29391 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"gavinp\/chromium,Crystalnix\/house-of-life-chromium,gavinp\/chromium,gavinp\/chromium,gavinp\/chromium,yitian134\/chromium,adobe\/chromium,ropik\/chromium,yitian134\/chromium,gavinp\/chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,gavinp\/chromium,adobe\/chromium,ropik\/chromium,yitian134\/chromium,adobe\/chromium,yitian134\/chromium,ropik\/chromium,gavinp\/chromium,ropik\/chromium,yitian134\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,ropik\/chromium,yitian134\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,yitian134\/chromium,adobe\/chromium,adobe\/chromium,gavinp\/chromium,adobe\/chromium,ropik\/chromium,ropik\/chromium,yitian134\/chromium,yitian134\/chromium,adobe\/chromium,Crystalnix\/house-of-life-chromium,Crystalnix\/house-of-life-chromium,adobe\/chromium,Crystalnix\/house-of-life-chromium,ropik\/chromium,yitian134\/chromium,ropik\/chromium,Crystalnix\/house-of-life-chromium,gavinp\/chromium,gavinp\/chromium","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- media\/filters\/null_audio_renderer.h\n+++ media\/filters\/null_audio_renderer.h\n@@ -62,7 +62,7 @@\n size_t bytes_per_millisecond_;\n \n \/\/ A buffer passed to FillBuffer to advance playback.\n- scoped_ptr<uint8> buffer_;\n+ scoped_array<uint8> buffer_;\n size_t buffer_size_;\n \n \/\/ Separate thread used to throw away data.\n"} {"commit":"5224d99ca20df33eca4fd09cb675c93546aa2968","subject":"Update RingRayLib - raylib.c - Add Function : void ImageColorContrast(Image *image, float contrast)","message":"Update RingRayLib - raylib.c - Add Function : void ImageColorContrast(Image *image, float contrast)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"d79b9c6c7cb42c69c15d1b7869a04e889d812b82","subject":"extmod\/nimble: Generate and persist a unique IRK.","message":"extmod\/nimble: Generate and persist a unique IRK.\n\nThis provides a workaround for\nhttps:\/\/github.com\/apache\/mynewt-nimble\/issues\/887.\n\nWithout this, all devices would share a fixed default IRK.\n\nSigned-off-by: Jim Mussared <e84f5c941266186d0c97dcc873413469b954847e@gmail.com>\n","repos":"adafruit\/circuitpython,bvernoux\/micropython,adafruit\/circuitpython,henriknelson\/micropython,adafruit\/circuitpython,bvernoux\/micropython,bvernoux\/micropython,bvernoux\/micropython,adafruit\/circuitpython,henriknelson\/micropython,henriknelson\/micropython,adafruit\/circuitpython,henriknelson\/micropython,bvernoux\/micropython,henriknelson\/micropython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extmod\/nimble\/modbluetooth_nimble.c\n+++ extmod\/nimble\/modbluetooth_nimble.c\n@@ -189,6 +189,59 @@\n assert(rc == 0);\n }\n \n+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING\n+\/\/ For ble_hs_pvcy_set_our_irk\n+#include \"nimble\/host\/src\/ble_hs_pvcy_priv.h\"\n+\/\/ For ble_hs_hci_util_rand\n+#include \"nimble\/host\/src\/ble_hs_hci_priv.h\"\n+\/\/ For ble_hs_misc_restore_irks\n+#include \"nimble\/host\/src\/ble_hs_priv.h\"\n+\n+\/\/ Must be distinct to BLE_STORE_OBJ_TYPE_ in ble_store.h.\n+#define SECRET_TYPE_OUR_IRK 10\n+\n+STATIC int load_irk(void) {\n+ \/\/ NimBLE unconditionally loads a fixed IRK on startup.\n+ \/\/ See https:\/\/github.com\/apache\/mynewt-nimble\/issues\/887\n+\n+ \/\/ Dummy key to use for the store.\n+ \/\/ Technically the secret type is enough as there will only be\n+ \/\/ one IRK so the key doesn't matter, but a NULL (None) key means \"search\".\n+ const uint8_t key[3] = {'i', 'r', 'k'};\n+\n+ int rc;\n+ const uint8_t *irk;\n+ size_t irk_len;\n+ if (mp_bluetooth_gap_on_get_secret(SECRET_TYPE_OUR_IRK, 0, key, sizeof(key), &irk, &irk_len) && irk_len == 16) {\n+ DEBUG_printf(\"load_irk: Applying IRK from store.\\n\");\n+ rc = ble_hs_pvcy_set_our_irk(irk);\n+ if (rc) {\n+ return rc;\n+ }\n+ } else {\n+ DEBUG_printf(\"load_irk: Generating new IRK.\\n\");\n+ uint8_t rand_irk[16];\n+ rc = ble_hs_hci_util_rand(rand_irk, 16);\n+ if (rc) {\n+ return rc;\n+ }\n+ DEBUG_printf(\"load_irk: Saving new IRK.\\n\");\n+ if (!mp_bluetooth_gap_on_set_secret(SECRET_TYPE_OUR_IRK, key, sizeof(key), rand_irk, 16)) {\n+ return BLE_HS_EINVAL;\n+ }\n+ DEBUG_printf(\"load_irk: Applying new IRK.\\n\");\n+ rc = ble_hs_pvcy_set_our_irk(rand_irk);\n+ if (rc) {\n+ return rc;\n+ }\n+ }\n+\n+ \/\/ Loading an IRK will clear all peer IRKs, so reload them from the store.\n+ rc = ble_hs_misc_restore_irks();\n+ return rc;\n+}\n+#endif\n+\n STATIC void sync_cb(void) {\n int rc;\n (void)rc;\n@@ -198,6 +251,11 @@\n if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {\n return;\n }\n+\n+ #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING\n+ rc = load_irk();\n+ assert(rc == 0);\n+ #endif\n \n if (has_public_address()) {\n nimble_address_mode = BLE_OWN_ADDR_PUBLIC;\n"} {"commit":"207666bbccb5ddd6e5277a7c5ac1107031a4fbbf","subject":"Deprecated FXMessageBox","message":"Deprecated FXMessageBox\n","repos":"ned14\/tnfox,ned14\/tnfox,ned14\/tnfox,ned14\/tnfox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/FXMessageBox.h\n+++ include\/FXMessageBox.h\n@@ -58,6 +58,8 @@\n \r\n \r\n \/**\r\n+* \\deprecated This class is deprecated in favour of FX::FXHandedMsgBox\r\n+*\r\n * A Message Box is a convenience class which provides a dialog for\r\n * very simple common yes\/no type interactions with the user.\r\n * The message box has an optional icon, a title string, and the question\r\n@@ -92,54 +94,54 @@\n public:\r\n \r\n \/\/\/ Construct message box with given caption, icon, and message text\r\n- FXMessageBox(FXWindow* owner,const FXString& caption,const FXString& text,FXIcon* ic=NULL,FXuint opts=0,FXint x=0,FXint y=0);\r\n+ FXMessageBox(FXWindow* owner,const FXString& caption,const FXString& text,FXIcon* ic=NULL,FXuint opts=0,FXint x=0,FXint y=0) FXDEPRECATED;\r\n \r\n \/\/\/ Construct free floating message box with given caption, icon, and message text\r\n- FXMessageBox(FXApp* app,const FXString& caption,const FXString& text,FXIcon* ic=NULL,FXuint opts=0,FXint x=0,FXint y=0);\r\n+ FXMessageBox(FXApp* app,const FXString& caption,const FXString& text,FXIcon* ic=NULL,FXuint opts=0,FXint x=0,FXint y=0) FXDEPRECATED;\r\n \r\n \/**\r\n * Show a modal error message.\r\n * The text message may contain printf-tyle formatting commands.\r\n *\/\r\n- static FXuint error(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint error(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show modal error message, in free floating window.\r\n *\/\r\n- static FXuint error(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint error(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show a modal warning message\r\n * The text message may contain printf-tyle formatting commands.\r\n *\/\r\n- static FXuint warning(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint warning(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show modal warning message, in free floating window.\r\n *\/\r\n- static FXuint warning(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint warning(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show a modal question dialog\r\n * The text message may contain printf-tyle formatting commands.\r\n *\/\r\n- static FXuint question(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint question(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show modal question message, in free floating window.\r\n *\/\r\n- static FXuint question(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint question(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show a modal information dialog\r\n * The text message may contain printf-tyle formatting commands.\r\n *\/\r\n- static FXuint information(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint information(FXWindow* owner,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n \/**\r\n * Show modal information message, in free floating window.\r\n *\/\r\n- static FXuint information(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) ;\r\n+ static FXuint information(FXApp* app,FXuint opts,const char* caption,const char* message,...) FX_PRINTF(4,5) FXDEPRECATED;\r\n \r\n };\r\n \r\n"} {"commit":"276706485f6ce03974ce6157735b6781de92ef03","subject":"Simply SharedObject","message":"Simply SharedObject\n","repos":"elf0\/elf.cpp,elf0\/elf.cpp","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- include\/SharedObject.h\n+++ include\/SharedObject.h\n@@ -6,20 +6,59 @@\n namespace elf{\n \n template<typename T>\n-class SharedObject;\n+class SharedPointer;\n+\n+template<typename T>\n+class SharedObject{\n+public:\n+ SharedObject(){\n+ fprintf(stderr, \"SharedObject(): %lu\\n\", _nReferences);\n+ }\n+private:\n+ ~SharedObject(){\n+ fprintf(stderr, \"~SharedObject(): %lu\\n\", _nReferences);\n+ }\n+\n+ void Reference(){\n+ ++_nReferences;\n+ fprintf(stderr, \"Reference: %lu\\n\", _nReferences);\n+ }\n+\n+ void Dereference(){\n+ fprintf(stderr, \"Dereference: %lu\\n\", _nReferences);\n+ if(--_nReferences == 0){\n+ get()->~T();\n+ delete this;\n+ }\n+ }\n+\n+ T *get()const{\n+ return (T*)_object;\n+ }\n+\n+ Byte _object[sizeof(T)];\n+ size_t _nReferences = 1;\n+ friend class SharedPointer<T>;\n+};\n \n template<typename T>\n class SharedPointer{\n public:\n- SharedPointer(){};\n+\/\/ SharedPointer(): _pObject(new SharedObject<T>()){\n+\/\/ }\n+\n+ SharedPointer(SharedObject<T> *pObject): _pObject(pObject){\n+ }\n \n SharedPointer(const SharedPointer &other)\n : _pObject(other._pObject){\n- \/\/fprintf(stderr, \"Copy constructor\\n\");\n+ fprintf(stderr, \"SharedPointer: Copy constructor\\n\");\n Reference();\n }\n \n- ~SharedPointer(){Dereference();}\n+ ~SharedPointer(){\n+ Dereference();\n+ }\n \n SharedPointer &operator=(const SharedPointer &other){\n \/\/fprintf(stderr, \"operator=()\\n\");\n@@ -37,12 +76,16 @@\n return _pObject != other._pObject;\n }\n \n+ T *get()const{\n+ return (T*)_pObject;\n+ }\n+\n T &operator*()const{\n- return *(T*)_pObject;\n+ return *get();\n }\n \n T *operator->()const{\n- return _pObject;\n+ return get();\n }\n \n bool operator==(const SharedPointer &other)const{\n@@ -71,10 +114,6 @@\n }\n \n private:\n- SharedPointer(SharedObject<T> *pObject): _pObject(pObject){\n-\/\/ fprintf(stderr, \"SharedPointer(SharedObject<T> *pObject)\\n\");\n- }\n-\n void Reference(){\n if(_pObject)\n _pObject->Reference();\n@@ -85,32 +124,15 @@\n _pObject->Dereference();\n }\n SharedObject<T> *_pObject = nullptr;\n- friend class SharedObject<T>;\n };\n \n-template<typename T>\n-class SharedObject: public T{\n-public:\n- static SharedPointer<T> New(const T &object){\n- return SharedPointer<T>(new SharedObject(object));\n- }\n+#define GET_OVERLOAD_NAME(_1,_2,NAME,...) NAME\n+#define NewShared(...) GET_OVERLOAD_NAME(__VA_ARGS__, NewShared2, NewShared1)(__VA_ARGS__)\n \n- void Reference(){\n- ++_nReferences;\n- \/\/fprintf(stderr, \"Reference: %lu\\n\", _nReferences);\n- }\n+#define NewShared1(TYPE)\\\n+ elf::SharedPointer<TYPE>((elf::SharedObject<TYPE>*)(new (new elf::SharedObject<TYPE>()) TYPE()))\n \n- void Dereference(){\n- \/\/fprintf(stderr, \"Dereference: %lu\\n\", _nReferences);\n- if(--_nReferences == 0)\n- delete this;\n- }\n-\n-private:\n- SharedObject(const T &object): T(object){}\n- ~SharedObject(){}\n-\n- size_t _nReferences = 1;\n-};\n+#define NewShared2(TYPE, CONSTRUCTOR_PARAMETERS)\\\n+ elf::SharedPointer<TYPE>((elf::SharedObject<TYPE>*)(new (new elf::SharedObject<TYPE>()) TYPE(CONSTRUCTOR_PARAMETERS)))\n \n }\/\/namespace elf\n"} {"commit":"86f2937e3de72b56533513a0016ff0ced83b36fb","subject":"fix msgqueue bug","message":"fix msgqueue bug\n","repos":"Water-Melon\/Melon","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- melang\/msgqueue\/mln_lang_msgqueue.c\n+++ melang\/msgqueue\/mln_lang_msgqueue.c\n@@ -85,7 +85,7 @@\n mln_fheap_t *mq_timeout_set;\n if ((mq_set = mln_lang_resource_fetch(ctx->lang, \"mq\")) == NULL) {\n struct mln_rbtree_attr rbattr;\n- rbattr.pool = ctx->pool;\n+ rbattr.pool = ctx->lang->pool;\n rbattr.cmp = (rbtree_cmp)mln_lang_mq_cmp;\n rbattr.data_free = (rbtree_free_data)mln_lang_mq_free;\n rbattr.cache = 0;\n"} {"commit":"36cfbaad815908f54872a7b471e9a7a09b4084a4","subject":"[MIPS] Convert list of CPU types from #define to enum.","message":"[MIPS] Convert list of CPU types from #define to enum.\n\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-mips\/cpu.h\n+++ include\/asm-mips\/cpu.h\n@@ -157,76 +157,55 @@\n \n #define FPIR_IMP_NONE\t\t0x0000\n \n-#define CPU_UNKNOWN\t\t 0\n-#define CPU_R2000\t\t 1\n-#define CPU_R3000\t\t 2\n-#define CPU_R3000A\t\t 3\n-#define CPU_R3041\t\t 4\n-#define CPU_R3051\t\t 5\n-#define CPU_R3052\t\t 6\n-#define CPU_R3081\t\t 7\n-#define CPU_R3081E\t\t 8\n-#define CPU_R4000PC\t\t 9\n-#define CPU_R4000SC\t\t10\n-#define CPU_R4000MC\t\t11\n-#define CPU_R4200\t\t12\n-#define CPU_R4400PC\t\t13\n-#define CPU_R4400SC\t\t14\n-#define CPU_R4400MC\t\t15\n-#define CPU_R4600\t\t16\n-#define CPU_R6000\t\t17\n-#define CPU_R6000A\t\t18\n-#define CPU_R8000\t\t19\n-#define CPU_R10000\t\t20\n-#define CPU_R12000\t\t21\n-#define CPU_R4300\t\t22\n-#define CPU_R4650\t\t23\n-#define CPU_R4700\t\t24\n-#define CPU_R5000\t\t25\n-#define CPU_R5000A\t\t26\n-#define CPU_R4640\t\t27\n-#define CPU_NEVADA\t\t28\n-#define CPU_RM7000\t\t29\n-#define CPU_R5432\t\t30\n-#define CPU_4KC\t\t\t31\n-#define CPU_5KC\t\t\t32\n-#define CPU_R4310\t\t33\n-#define CPU_SB1\t\t\t34\n-#define CPU_TX3912\t\t35\n-#define CPU_TX3922\t\t36\n-#define CPU_TX3927\t\t37\n-#define CPU_AU1000\t\t38\n-#define CPU_4KEC\t\t39\n-#define CPU_4KSC\t\t40\n-#define CPU_VR41XX\t\t41\n-#define CPU_R5500\t\t42\n-#define CPU_TX49XX\t\t43\n-#define CPU_AU1500\t\t44\n-#define CPU_20KC\t\t45\n-#define CPU_VR4111\t\t46\n-#define CPU_VR4121\t\t47\n-#define CPU_VR4122\t\t48\n-#define CPU_VR4131\t\t49\n-#define CPU_VR4181\t\t50\n-#define CPU_VR4181A\t\t51\n-#define CPU_AU1100\t\t52\n-#define CPU_SR71000\t\t53\n-#define CPU_RM9000\t\t54\n-#define CPU_25KF\t\t55\n-#define CPU_VR4133\t\t56\n-#define CPU_AU1550\t\t57\n-#define CPU_24K\t\t\t58\n-#define CPU_AU1200\t\t59\n-#define CPU_34K\t\t\t60\n-#define CPU_PR4450\t\t61\n-#define CPU_SB1A\t\t62\n-#define CPU_74K\t\t\t63\n-#define CPU_R14000\t\t64\n-#define CPU_LOONGSON1 65\n-#define CPU_LOONGSON2 66\n-#define CPU_BCM3302\t\t67\n-#define CPU_BCM4710\t\t68\n-#define CPU_LAST\t\t68\n+enum cpu_type_enum {\n+\tCPU_UNKNOWN,\n+\n+\t\/*\n+\t * R2000 class processors\n+\t *\/\n+\tCPU_R2000, CPU_R3000, CPU_R3000A, CPU_R3041, CPU_R3051, CPU_R3052,\n+\tCPU_R3081, CPU_R3081E,\n+\n+\t\/*\n+\t * R6000 class processors\n+\t *\/\n+\tCPU_R6000, CPU_R6000A,\n+\n+\t\/*\n+\t * R4000 class processors\n+\t *\/\n+\tCPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,\n+\tCPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,\n+\tCPU_R4700, CPU_R5000, CPU_R5000A, CPU_R5500, CPU_NEVADA, CPU_R5432,\n+\tCPU_R10000, CPU_R12000, CPU_R14000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,\n+\tCPU_VR4122, CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,\n+\tCPU_SR71000, CPU_RM9000, CPU_TX49XX,\n+\n+\t\/*\n+\t * R8000 class processors\n+\t *\/\n+\tCPU_R8000,\n+\n+\t\/*\n+\t * TX3900 class processors\n+\t *\/\n+\tCPU_TX3912, CPU_TX3922, CPU_TX3927,\n+\n+\t\/*\n+\t * MIPS32 class processors\n+\t *\/\n+\tCPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,\n+\tCPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,\n+\tCPU_BCM3302, CPU_BCM4710,\n+\n+\t\/*\n+\t * MIPS64 class processors\n+\t *\/\n+\tCPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,\n+\n+\tCPU_LAST\n+};\n+\n \n \/*\n * ISA Level encodings\n"} {"commit":"8ac6e2c30d8b008f1edf92a04a8780c8d3dc9ed7","subject":"added doxygen to constructors and const to getters","message":"added doxygen to constructors and const to getters\n\n","repos":"andcor02\/mbed-os,betzw\/mbed-os,betzw\/mbed-os,kjbracey-arm\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,c1728p9\/mbed-os,mbedmicro\/mbed,kjbracey-arm\/mbed,betzw\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,c1728p9\/mbed-os,betzw\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,c1728p9\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,c1728p9\/mbed-os,kjbracey-arm\/mbed,betzw\/mbed-os,betzw\/mbed-os,kjbracey-arm\/mbed,c1728p9\/mbed-os,c1728p9\/mbed-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- features\/FEATURE_BLE\/ble\/BLETypes.h\n+++ features\/FEATURE_BLE\/ble\/BLETypes.h\n@@ -639,8 +639,25 @@\n PHY_SET_CODED = 0x04\n };\n \n+ \/**\n+ * Create set that indicates no preference.\n+ *\/\n phy_set_t() : _value(0) { }\n+\n+ \/**\n+ * Create a set based on the mask specified in the Bluetooth spec.\n+ *\n+ * @param value Octet containing the set of preferred PHYs\n+ *\/\n phy_set_t(uint8_t value) : _value(value) { }\n+\n+ \/**\n+ * Create a set based on individual settings.\n+ *\n+ * @param phy_1m Prefer LE 1M\n+ * @param phy_2m Prefer LE 2M if avaiable\n+ * @param phy_coded Prefer coded modulation if avaiable\n+ *\/\n phy_set_t(\n bool phy_1m,\n bool phy_2m,\n@@ -698,23 +715,23 @@\n }\n }\n \n- bool get_1m() {\n+ bool get_1m() const {\n return (_value & PHY_SET_1M);\n }\n \n- bool get_2m() {\n+ bool get_2m() const {\n return (_value & PHY_SET_2M);\n }\n \n- bool get_coded() {\n+ bool get_coded() const {\n return (_value & PHY_SET_CODED);\n }\n \n- operator uint8_t() {\n+ operator uint8_t() const {\n return _value;\n }\n \n- uint8_t value() const {\n+ uint8_t value() const const {\n return _value;\n }\n \n"} {"commit":"2567d71cc7acd99f0a0dd02e17fe17fd7df7b30c","subject":"x86: fix asm\/e820.h for userspace inclusion","message":"x86: fix asm\/e820.h for userspace inclusion\n\nasm-x86\/e820.h is included from userspace. 'x86: make e820.c to have\ncommon functions' (b79cd8f1268bab57ff85b19d131f7f23deab2dee) broke it:\n\n\tmake -C Documentation\/lguest\n\tcc -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I..\/..\/include\nlguest.c -lz -o lguest\n\tIn file included from ..\/..\/include\/asm-x86\/bootparam.h:8,\n\t from lguest.c:45:\n\t..\/..\/include\/asm\/e820.h:66: error: expected \u2018)\u2019 before \u2018start\u2019\n\t..\/..\/include\/asm\/e820.h:67: error: expected \u2018)\u2019 before \u2018start\u2019\n\t..\/..\/include\/asm\/e820.h:68: error: expected \u2018)\u2019 before \u2018start\u2019\n\t..\/..\/include\/asm\/e820.h:72: error: expected \u2018=\u2019, \u2018,\u2019, \u2018;\u2019, \u2018asm\u2019\nor \u2018__attribute__\u2019 before \u2018e820_update_range\u2019\n\t...\n\nSigned-off-by: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\nCc: Yinghai Lu <086d370ab7099a37fc1e7d4667336777772c5d99@gmail.com>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-x86\/e820.h\n+++ include\/asm-x86\/e820.h\n@@ -59,6 +59,7 @@\n \tstruct e820entry map[E820_X_MAX];\n };\n \n+#ifdef __KERNEL__\n \/* see comment in arch\/x86\/kernel\/e820.c *\/\n extern struct e820map e820;\n extern struct e820map e820_saved;\n@@ -115,7 +116,7 @@\n extern char *default_machine_specific_memory_setup(void);\n extern char *machine_specific_memory_setup(void);\n extern char *memory_setup(void);\n-\n+#endif \/* __KERNEL__ *\/\n #endif \/* __ASSEMBLY__ *\/\n \n #define ISA_START_ADDRESS\t0xa0000\n"} {"commit":"f8d3191e05080ecbedfc0c2e0080c1e549c55327","subject":"Added next_index and next_ptr to bert_decoder.","message":"Added next_index and next_ptr to bert_decoder.\n","repos":"postmodern\/libBERT","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/bert\/decoder.h\n+++ include\/bert\/decoder.h\n@@ -17,6 +17,9 @@\n \tunsigned int chunk_index;\n \tconst unsigned char *buffer_ptr;\n \n+\tunsigned int next_index;\n+\tconst unsigned char *next_ptr;\n+\n \tsize_t boarder_length;\n \tunsigned char boarder_buffer[BERT_SHORT_BUFFER];\n };\n"} {"commit":"00c8f14cc0ffe3791a3e35bca3196cb52510a9e7","subject":"adsr: making internal slope class public so that it is accessible for unit testing.","message":"adsr: making internal slope class public so that it is accessible for unit testing.\n","repos":"Cycling74\/min-lib,Cycling74\/min-lib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/c74_lib_adsr.h\n+++ include\/c74_lib_adsr.h\n@@ -13,6 +13,7 @@\n \t\/\/\/\tGenerate an <a href=\"https:\/\/en.wikipedia.org\/wiki\/Synthesizer#Attack_Decay_Sustain_Release_.28ADSR.29_envelope\">ADSR<\/a> envelope.\n \n \tclass adsr {\n+\tpublic:\n \n \t\tclass slope {\n \t\t\tconst int k_power_multiplier = 5.0; \/\/ higher number yields more extreme curves\n@@ -45,8 +46,6 @@\n \t\t\tbool\tm_is_linear\t{ true };\n \t\t};\n \n-\n-\tpublic:\n \n \t\tvoid initial(number initial_value) {\n \t\t\tm_initial_cached = initial_value;\n"} {"commit":"618ff6d2d4cc36abc7aa958b47c32b07f7108150","subject":"Changing gl::scale(vec2) -> (x,y,1) from (x,y,0)","message":"Changing gl::scale(vec2) -> (x,y,1) from (x,y,0)\n","repos":"sosolimited\/Cinder,2666hz\/Cinder,2666hz\/Cinder,2666hz\/Cinder,morbozoo\/sonyHeadphones,morbozoo\/sonyHeadphones,2666hz\/Cinder,sosolimited\/Cinder,morbozoo\/sonyHeadphones,sosolimited\/Cinder,sosolimited\/Cinder,morbozoo\/sonyHeadphones","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/cinder\/gl\/gl.h\n+++ include\/cinder\/gl\/gl.h\n@@ -133,9 +133,9 @@\n \/\/! Produces a scale by \\a scale in the current matrix.\n void scale( const Vec3f &scl );\n \/\/! Produces a scale by \\a scl in the current matrix.\n-inline void scale( const Vec2f &scl ) { scale( Vec3f( scl.x, scl.y, 0 ) ); }\n+inline void scale( const Vec2f &scl ) { scale( Vec3f( scl.x, scl.y, 1 ) ); }\n \/\/! Produces a scale by \\a x and \\a y in the current matrix.\n-inline void scale( float x, float y ) { scale( Vec3f( x, y, 0 ) ); }\n+inline void scale( float x, float y ) { scale( Vec3f( x, y, 1 ) ); }\n \/\/! Produces a scale by \\a x, \\a y and \\a z in the current matrix.\n inline void scale( float x, float y, float z ) { scale( Vec3f( x, y, z ) ); }\n \n"} {"commit":"843eed4b8ad17a6a3b52bc01d6baa0f936c42d7e","subject":"Document tp_connection_manager_new() parameter manager_filename","message":"Document tp_connection_manager_new() parameter manager_filename\n\n\n20071121162348-53eee-b40d6330937aef7c3ca6295f0aa89da10299b285.gz\n","repos":"Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-glib\/connection-manager.c\n+++ telepathy-glib\/connection-manager.c\n@@ -958,6 +958,7 @@\n * tp_connection_manager_new:\n * @dbus: Proxy for the D-Bus daemon\n * @name: The connection manager name\n+ * @manager_filename: The #TpConnectionManager::manager-file property\n *\n * Convenience function to create a new connection manager proxy.\n *\n"} {"commit":"48913465db5f6077be48a7333c56e03e77b107a1","subject":"Revert \"remove legacy forward declares\"","message":"Revert \"remove legacy forward declares\"\n\nThis reverts commit 00dcf668659ab26b8691c64a977fdd19e9e8df09.\n\nReason for revert: breaks IWYU on chrome\/win and google3\n\nOriginal change's description:\n> remove legacy forward declares\n> \n> Bug: skia:\n> Change-Id: Ie83cef8e47b27c3a59fe251b9c81dca7c4d15232\n> Reviewed-on: https:\/\/skia-review.googlesource.com\/c\/188820\n> Reviewed-by: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\n> Auto-Submit: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\n> Commit-Queue: Ravi Mistry <rmistry@google.com>\n\nTBR=rmistry@google.com,f5cabf8735907151a446812c9875d6c0c712d847@google.com\n\nChange-Id: I2931fb7d24c8a908be4a21a52e4ef0caf6618f32\nNo-Presubmit: true\nNo-Tree-Checks: true\nNo-Try: true\nBug: skia:\nReviewed-on: https:\/\/skia-review.googlesource.com\/c\/188821\nReviewed-by: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\nCommit-Queue: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\n","repos":"HalCanary\/skia-hc,HalCanary\/skia-hc,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,google\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,rubenvb\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,google\/skia,rubenvb\/skia,rubenvb\/skia,HalCanary\/skia-hc,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,google\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,google\/skia,rubenvb\/skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,rubenvb\/skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,rubenvb\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/core\/SkPaint.h\n+++ include\/core\/SkPaint.h\n@@ -34,6 +34,10 @@\n class SkPathEffect;\n struct SkPoint;\n class SkShader;\n+\n+\/\/ TODO: remove after updating android sites to IWYU\n+#include \"SkFontMetrics.h\"\n+class SkSurfaceProps;\n \n \/** \\class SkPaint\n SkPaint controls options applied when drawing. SkPaint collects all\n"} {"commit":"8a2ba3adf045bd0080c215b91aedafe395f59edf","subject":"Print flag names.","message":"Print flag names.\n","repos":"Rhialto\/macro11,Rhialto\/macro11,Rhialto\/macro11","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- dumpobj.c\n+++ dumpobj.c\n@@ -356,7 +356,15 @@\n flags);\n break;\n case 5:\n- sprintf(gsdline, \"\\tPSECT %s=%o flags=%o\\n\", name, value, flags);\n+ sprintf(gsdline, \"\\tPSECT %s=%o %s%s %s %s %s %s %s flags=%o\\n\", name, value,\n+ flags & 01 ? \"SAV \" : \"\",\n+ flags & 02 ? \"LIB \" : \"\",\n+ flags & 04 ? \"OVR\" : \"CON\",\n+ flags & 020 ? \"RO\" : \"RW\",\n+ flags & 040 ? \"REL\" : \"ABS\",\n+ flags & 0100 ? \"GBL\" : \"LCL\",\n+ flags & 0200 ? \"D\" : \"I\",\n+ flags);\n psects[psectid] = strdup(name);\n trim(psects[psectid++]);\n break;\n@@ -693,7 +701,7 @@\n got_libend(cp, len);\n break;\n default:\n- printf(\"Unknown record type %d\\n\", cp[0] & 0xff);\n+ printf(\"Unknown record type %o\\n\", cp[0] & 0xff);\n break;\n }\n \n"} {"commit":"faf68c83f8c4f2faf37c7b2cd7250621601ed3bd","subject":"Add a definition for the system call.","message":"Add a definition for the system call.\n","repos":"Jonimoose\/libfxcg,Jonimoose\/libfxcg,Jonimoose\/libfxcg","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/fxcg\/display.h\n+++ include\/fxcg\/display.h\n@@ -26,6 +26,7 @@\n void DrawFrameWorkbench( int, int, int, int, int );\n \/\/VRAM general display manipulating syscalls:\n void *GetVRAMAddress(void); \/\/ Return a pointer to the system's video memory.\n+void* GetSecondaryVRAMAddress(void); \/\/ Return a pointer to the memory used by SaveVRAM_1 and LoadVRAM_1.\n void Bdisp_AllClr_VRAM( void );\n void Bdisp_SetPoint_VRAM( int x, int y, int color );\n void Bdisp_SetPointWB_VRAM( int x, int y, int color );\n"} {"commit":"9a10a49015e620e3ec6992dfcdbf42ceeadfdee7","subject":"const char* for slice data","message":"const char* for slice data\n","repos":"rescrv\/e,rescrv\/e","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- e\/slice.h\n+++ e\/slice.h\n@@ -57,6 +57,7 @@\n public:\n int compare(const slice& rhs) const;\n const uint8_t* data() const { return m_data; }\n+ const char* cdata() const { return reinterpret_cast<const char*>(m_data); }\n const char* c_str() const { return reinterpret_cast<const char*>(m_data); }\n bool empty() const { return m_sz == 0; }\n std::string hex() const;\n"} {"commit":"3245f638935fe7a95b5fb578c60361c41893e37f","subject":"Added default destructors, constructors, operators etc. to satisfy clang-tidy cppcoreguidelines checks. Added \/\/ NOLINT to lines using reinterpret_cast to silence checks.","message":"Added default destructors, constructors, operators etc. to satisfy clang-tidy cppcoreguidelines checks. Added \/\/ NOLINT to lines using reinterpret_cast to silence checks.\n","repos":"martinmoene\/gsl-lite,martinmoene\/gsl-lite,martinmoene\/gsl-lite","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/gsl\/gsl-lite.h\n+++ include\/gsl\/gsl-lite.h\n@@ -515,6 +515,7 @@\n gsl_is_delete_access:\n gsl_api final_act( final_act const & ) gsl_is_delete;\n gsl_api final_act & operator=( final_act const & ) gsl_is_delete;\n+ gsl_api final_act & operator=( final_act && ) gsl_is_delete;\n \n protected:\n gsl_api void dismiss() gsl_noexcept\n@@ -849,10 +850,14 @@\n gsl_api not_null & operator=( T t ) { ptr_ = t ; Expects( ptr_ != gsl_nullptr ); return *this; }\n \n #if gsl_HAVE_IS_DEFAULT\n- gsl_api gsl_constexpr not_null( not_null const & other ) = default;\n+ gsl_api gsl_constexpr not_null( not_null const & other ) = default;\n+ gsl_api gsl_constexpr not_null( not_null && other ) = default;\n+ gsl_api ~not_null() = default;\n gsl_api not_null & operator=( not_null const & other ) = default;\n-#else\n- gsl_api gsl_constexpr not_null( not_null const & other ) : ptr_ ( other.ptr_ ) {}\n+ gsl_api not_null & operator=( not_null && other ) = default;\n+#else\n+ gsl_api gsl_constexpr not_null( not_null const & other ) : ptr_ ( other.ptr_ ) {}\n+ gsl_api ~not_null() {};\n gsl_api not_null & operator=( not_null const & other ) { ptr_ = other.ptr_; return *this; }\n #endif\n \n@@ -1301,6 +1306,12 @@\n {}\n \n #if gsl_HAVE_IS_DEFAULT\n+ ~span() = default;\n+#else\n+ ~span() {}\n+#endif\n+\n+#if gsl_HAVE_IS_DEFAULT\n gsl_api span & operator=( span && ) = default;\n gsl_api span & operator=( span const & ) = default;\n #else\n@@ -1437,19 +1448,19 @@\n \n gsl_api span< const byte > as_bytes() const gsl_noexcept\n {\n- return span< const byte >( reinterpret_cast<const byte *>( data() ), size_bytes() );\n+ return span< const byte >( reinterpret_cast<const byte *>( data() ), size_bytes() ); \/\/ NOLINT\n }\n \n gsl_api span< byte > as_writeable_bytes() const gsl_noexcept\n {\n- return span< byte >( reinterpret_cast<byte *>( data() ), size_bytes() );\n+ return span< byte >( reinterpret_cast<byte *>( data() ), size_bytes() ); \/\/ NOLINT\n }\n \n template< class U >\n gsl_api span< U > as_span() const gsl_noexcept\n {\n Expects( ( this->size_bytes() % sizeof(U) ) == 0 );\n- return span< U >( reinterpret_cast<U *>( this->data() ), this->size_bytes() \/ sizeof( U ) );\n+ return span< U >( reinterpret_cast<U *>( this->data() ), this->size_bytes() \/ sizeof( U ) ); \/\/ NOLINT\n }\n \n private:\n@@ -1548,13 +1559,13 @@\n template< class T >\n gsl_api inline span< const byte > as_bytes( span<T> spn ) gsl_noexcept\n {\n- return span< const byte >( reinterpret_cast<const byte *>( spn.data() ), spn.size_bytes() );\n+ return span< const byte >( reinterpret_cast<const byte *>( spn.data() ), spn.size_bytes() ); \/\/ NOLINT\n }\n \n template< class T>\n gsl_api inline span< byte > as_writeable_bytes( span<T> spn ) gsl_noexcept\n {\n- return span< byte >( reinterpret_cast<byte *>( spn.data() ), spn.size_bytes() );\n+ return span< byte >( reinterpret_cast<byte *>( spn.data() ), spn.size_bytes() ); \/\/ NOLINT\n }\n \n template< class T >\n@@ -1656,7 +1667,7 @@\n return 0;\n \n std::size_t len = 0;\n- while ( len < max && ptr[len] )\n+ while ( len < max && ptr[len] ) \/\/ NOLINT\n ++len;\n \n return len;\n@@ -1806,7 +1817,7 @@\n #endif\n >\n gsl_api gsl_constexpr basic_string_span( basic_string_span<U> const & rhs )\n- : span_( reinterpret_cast<pointer>( rhs.data() ), rhs.length() )\n+ : span_( reinterpret_cast<pointer>( rhs.data() ), rhs.length() ) \/\/ NOLINT\n {}\n \n #if gsl_CPP11_OR_GREATER || gsl_COMPILER_MSVC_VERSION >= 12\n@@ -1814,7 +1825,7 @@\n , class = typename std::enable_if< std::is_convertible<typename basic_string_span<U>::pointer, pointer>::value >::type\n >\n gsl_api gsl_constexpr basic_string_span( basic_string_span<U> && rhs )\n- : span_( reinterpret_cast<pointer>( rhs.data() ), rhs.length() )\n+ : span_( reinterpret_cast<pointer>( rhs.data() ), rhs.length() ) \/\/ NOLINT\n {}\n #endif\n \n@@ -2101,7 +2112,7 @@\n template< class T >\n gsl_api inline span< const byte > as_bytes( basic_string_span<T> spn ) gsl_noexcept\n {\n- return span< const byte >( reinterpret_cast<const byte *>( spn.data() ), spn.size_bytes() );\n+ return span< const byte >( reinterpret_cast<const byte *>( spn.data() ), spn.size_bytes() ); \/\/ NOLINT\n }\n \n \/\/\n"} {"commit":"1a8da49412ab7ddb04bead960aacd19243330341","subject":"thecl\/ecldump: Pass the version to ecldump_translate_print.","message":"thecl\/ecldump: Pass the version to ecldump_translate_print.\n","repos":"shnnmnn\/thtk,shnnmnn\/thtk,BLumia\/thtk,NecrotekX\/thtkx,NecrotekX\/thtkx,BLumia\/thtk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ecldump.c\n+++ ecldump.c\n@@ -351,7 +351,7 @@\n }\n \n static void\n-ecldump_translate_print(ecl_t* ecl)\n+ecldump_translate_print(ecl_t* ecl, unsigned int version)\n {\n unsigned int i;\n \n@@ -608,7 +608,7 @@\n switch (mode) {\n case ECLDUMP_MODE_NORMAL:\n ecldump_translate(&ecl, version);\n- ecldump_translate_print(&ecl);\n+ ecldump_translate_print(&ecl, version);\n break;\n case ECLDUMP_MODE_PARAMETERS:\n ecldump_list_params(&ecl);\n"} {"commit":"d2460b3a2f2690813abdf3b350be9dc5ebf2fe18","subject":"Bloom filter implementation for selection optimisation.","message":"Bloom filter implementation for selection optimisation.\n","repos":"zhuyadong\/libcss,zhuyadong\/libcss,prepare\/netsurf_libcss,prepare\/netsurf_libcss,zhuyadong\/libcss,prepare\/netsurf_libcss","returncode":1,"stderr":"error: pathspec 'include\/libcss\/bloom.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- include\/libcss\/bloom.h\n+++ include\/libcss\/bloom.h\n@@ -0,0 +1,205 @@\n+\/*\n+ * This file is part of LibCSS.\n+ * Licensed under the MIT License,\n+ * http:\/\/www.opensource.org\/licenses\/mit-license.php\n+ * Copyright 2013 Michael Drake <tlsa@netsurf-browser.org>\n+ *\/\n+\n+\/** \\file\n+ * Bloom filter for CSS style selection optimisation.\n+ *\n+ * Attempting to match CSS rules by querying the client about DOM nodes via\n+ * the selection callbacks is slow. To avoid this, clients may pass a node\n+ * bloom filter to css_get_style. This bloom filter has bits set according\n+ * to the node's ancestor element names, class names and id names.\n+ *\n+ * Generate the bloom filter by adding calling css_bloom_add_hash() on each\n+ * ancestor element name, class name and id name for the node.\n+ *\n+ * Use the insesnsitive lwc_string:\n+ *\n+ * lwc_string_hash_value(str->insensitive)\n+ *\/\n+\n+#ifndef libcss_bloom_h_\n+#define libcss_bloom_h_\n+\n+#ifdef __cplusplus\n+extern \"C\"\n+{\n+#endif\n+\n+#include <stdint.h>\n+\n+\/* Size of bloom filter as multiple of 32 bits.\n+ * Has to be 4, 8, or 16.\n+ * Larger increases optimisation of style selection engine but uses more memory.\n+ *\/\n+#define CSS_BLOOM_SIZE 4\n+\n+\n+\n+\/* Check valid bloom filter size *\/\n+#if !(CSS_BLOOM_SIZE == 4 || CSS_BLOOM_SIZE == 8 || CSS_BLOOM_SIZE == 16)\n+# error Unsupported bloom filter size. Size must be {4|8|16}.\n+#endif\n+\n+\/* Setup index bit mask *\/\n+#define INDEX_BITS_N (CSS_BLOOM_SIZE - 1)\n+\n+\n+\n+\/* type for bloom *\/\n+typedef uint32_t css_bloom;\n+\n+\n+\/**\n+ * Add a hash value to the bloom filter.\n+ *\n+ * \\param bloom\tbloom filter to insert into\n+ * \\param hash\tlibwapcaplet hash value to insert\n+ *\/\n+static inline void css_bloom_add_hash(css_bloom bloom[CSS_BLOOM_SIZE],\n+\t\tlwc_hash hash)\n+{\n+\tunsigned int bit = hash & 0x1f; \/* Top 5 bits *\/\n+\tunsigned int index = (hash >> 5) & INDEX_BITS_N; \/* Next N bits *\/\n+\n+\tbloom[index] |= (1 << bit);\n+}\n+\n+\n+\/**\n+ * Test whether bloom filter contains given hash value.\n+ *\n+ * \\param bloom\tbloom filter to check inside\n+ * \\param hash\tlibwapcaplet hash value to look for\n+ * \\return true hash value is already set in bloom\n+ *\/\n+static inline bool css_bloom_has_hash(const css_bloom bloom[CSS_BLOOM_SIZE],\n+\t\tlwc_hash hash)\n+{\n+\tunsigned int bit = hash & 0x1f; \/* Top 5 bits *\/\n+\tunsigned int index = (hash >> 5) & INDEX_BITS_N; \/* Next N bits *\/\n+\n+\treturn (bloom[index] & (1 << bit));\n+}\n+\n+\n+\/**\n+ * Test whether bloom 'a' is a subset of bloom 'b'.\n+ *\n+ * \\param a\tpotential subset bloom to test\n+ * \\param b\tsuperset bloom\n+ * \\return true iff 'a' is subset of 'b'\n+ *\/\n+static inline bool css_bloom_in_bloom(const css_bloom a[CSS_BLOOM_SIZE],\n+\t\tconst css_bloom b[CSS_BLOOM_SIZE])\n+{\n+\tif ((a[0] & b[0]) != a[0])\n+\t\treturn false;\n+\tif ((a[1] & b[1]) != a[1])\n+\t\treturn false;\n+\tif ((a[2] & b[2]) != a[2])\n+\t\treturn false;\n+\tif ((a[3] & b[3]) != a[3])\n+\t\treturn false;\n+#if (CSS_BLOOM_SIZE > 4)\n+\tif ((a[4] & b[4]) != a[4])\n+\t\treturn false;\n+\tif ((a[5] & b[5]) != a[5])\n+\t\treturn false;\n+\tif ((a[6] & b[6]) != a[6])\n+\t\treturn false;\n+\tif ((a[7] & b[7]) != a[7])\n+\t\treturn false;\n+#endif\n+#if (CSS_BLOOM_SIZE > 8)\n+\tif ((a[8] & b[8]) != a[8])\n+\t\treturn false;\n+\tif ((a[9] & b[9]) != a[9])\n+\t\treturn false;\n+\tif ((a[10] & b[10]) != a[10])\n+\t\treturn false;\n+\tif ((a[11] & b[11]) != a[11])\n+\t\treturn false;\n+\tif ((a[12] & b[12]) != a[12])\n+\t\treturn false;\n+\tif ((a[13] & b[13]) != a[13])\n+\t\treturn false;\n+\tif ((a[14] & b[14]) != a[14])\n+\t\treturn false;\n+\tif ((a[15] & b[15]) != a[15])\n+\t\treturn false;\n+#endif\n+\treturn true;\n+}\n+\n+\n+\/**\n+ * Merge bloom 'a' into bloom 'b'.\n+ *\n+ * \\param a\tbloom to insert\n+ * \\param b\ttarget bloom\n+ *\/\n+static inline void css_bloom_merge(const css_bloom a[CSS_BLOOM_SIZE],\n+\t\tcss_bloom b[CSS_BLOOM_SIZE])\n+{\n+\tb[0] |= a[0];\n+\tb[1] |= a[1];\n+\tb[2] |= a[2];\n+\tb[3] |= a[3];\n+#if (CSS_BLOOM_SIZE > 4)\n+\tb[4] |= a[4];\n+\tb[5] |= a[5];\n+\tb[6] |= a[6];\n+\tb[7] |= a[7];\n+#endif\n+#if (CSS_BLOOM_SIZE > 8)\n+\tb[8] |= a[8];\n+\tb[9] |= a[9];\n+\tb[10] |= a[10];\n+\tb[11] |= a[11];\n+\tb[12] |= a[12];\n+\tb[13] |= a[13];\n+\tb[14] |= a[14];\n+\tb[15] |= a[15];\n+#endif\n+}\n+\n+\n+\/**\n+ * Initialise a bloom filter to 0\n+ *\n+ * \\param bloom\tbloom filter to initialise\n+ *\/\n+static inline void css_bloom_init(css_bloom bloom[CSS_BLOOM_SIZE])\n+{\n+\tbloom[0] = 0;\n+\tbloom[1] = 0;\n+\tbloom[2] = 0;\n+\tbloom[3] = 0;\n+#if (CSS_BLOOM_SIZE > 4)\n+\tbloom[4] = 0;\n+\tbloom[5] = 0;\n+\tbloom[6] = 0;\n+\tbloom[7] = 0;\n+#endif\n+#if (CSS_BLOOM_SIZE > 8)\n+\tbloom[8] = 0;\n+\tbloom[9] = 0;\n+\tbloom[10] = 0;\n+\tbloom[11] = 0;\n+\tbloom[12] = 0;\n+\tbloom[13] = 0;\n+\tbloom[14] = 0;\n+\tbloom[15] = 0;\n+#endif\n+}\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif\n+\n"} {"commit":"7663c1e2792a9662b23dec6e19bfcd3d55360b8f","subject":"Improve queue_is_locked()","message":"Improve queue_is_locked()\n\nspin_is_locked() doesn't work on UP without spinlock debugging. Make it\nsafer and just return 1 on UP, so we don't get false positives. The plan\nis to kill this debug function during the -rc cycle.\n\nSigned-off-by: Jens Axboe <165ab144a3ccfd9429d5c6466b275f24fafdb114@oracle.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/blkdev.h\n+++ include\/linux\/blkdev.h\n@@ -412,8 +412,12 @@\n \n static inline int queue_is_locked(struct request_queue *q)\n {\n+#ifdef CONFIG_SMP\n \tspinlock_t *lock = q->queue_lock;\n \treturn lock && spin_is_locked(lock);\n+#else\n+\treturn 1;\n+#endif\n }\n \n static inline void queue_flag_set_unlocked(unsigned int flag,\n"} {"commit":"e5fbf67dab3341133d4ee3b1c8ce780e087733ba","subject":"Typo in compat_sys_lseek() declaration","message":"Typo in compat_sys_lseek() declaration\n\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/compat.h\n+++ include\/linux\/compat.h\n@@ -337,7 +337,7 @@\n asmlinkage ssize_t compat_sys_pwritev(compat_ulong_t fd,\n \t\tconst struct compat_iovec __user *vec,\n \t\tcompat_ulong_t vlen, u32 pos_low, u32 pos_high);\n-asmlinkage long comat_sys_lseek(unsigned int, compat_off_t, unsigned int);\n+asmlinkage long compat_sys_lseek(unsigned int, compat_off_t, unsigned int);\n \n asmlinkage long compat_sys_execve(const char __user *filename, const compat_uptr_t __user *argv,\n \t\t const compat_uptr_t __user *envp);\n"} {"commit":"3ad819c61f5f8347f39cdcbe652b3c60ec615888","subject":"[CRYPTO] api: Deprecate crypto_digest_* and crypto_alg_available","message":"[CRYPTO] api: Deprecate crypto_digest_* and crypto_alg_available\n\nThis patch marks the crypto_digest_* functions and crypto_alg_available\nas deprecated. They've been replaced by crypto_hash_* and crypto_has_*\nrespectively.\n\nSigned-off-by: Herbert Xu <ef65de1c7be0aa837fe7b25ba9a7739905af6a55@gondor.apana.org.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/crypto.h\n+++ include\/linux\/crypto.h\n@@ -241,9 +241,12 @@\n * Algorithm query interface.\n *\/\n #ifdef CONFIG_CRYPTO\n-int crypto_alg_available(const char *name, u32 flags);\n+int crypto_alg_available(const char *name, u32 flags)\n+\t__deprecated_for_modules;\n int crypto_has_alg(const char *name, u32 type, u32 mask);\n #else\n+static int crypto_alg_available(const char *name, u32 flags);\n+\t__deprecated_for_modules;\n static inline int crypto_alg_available(const char *name, u32 flags)\n {\n \treturn 0;\n@@ -704,12 +707,15 @@\n \t\t\t\t\t\tdst, src);\n }\n \n-void crypto_digest_init(struct crypto_tfm *tfm);\n+void crypto_digest_init(struct crypto_tfm *tfm) __deprecated_for_modules;\n void crypto_digest_update(struct crypto_tfm *tfm,\n-\t\t\t struct scatterlist *sg, unsigned int nsg);\n-void crypto_digest_final(struct crypto_tfm *tfm, u8 *out);\n+\t\t\t struct scatterlist *sg, unsigned int nsg)\n+\t__deprecated_for_modules;\n+void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)\n+\t__deprecated_for_modules;\n void crypto_digest_digest(struct crypto_tfm *tfm,\n-\t\t\t struct scatterlist *sg, unsigned int nsg, u8 *out);\n+\t\t\t struct scatterlist *sg, unsigned int nsg, u8 *out)\n+\t__deprecated_for_modules;\n \n static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm)\n {\n@@ -723,6 +729,8 @@\n \treturn __crypto_hash_cast(tfm);\n }\n \n+static int crypto_digest_setkey(struct crypto_tfm *tfm, const u8 *key,\n+\t\t\t\tunsigned int keylen) __deprecated;\n static inline int crypto_digest_setkey(struct crypto_tfm *tfm,\n const u8 *key, unsigned int keylen)\n {\n"} {"commit":"24924a20dab603089011f9d3eb7622f0f6ef93c0","subject":"vfs: constify dentry parameter in d_count()","message":"vfs: constify dentry parameter in d_count()\n\nso that it can be used in places like d_compare\/d_hash\nwithout causing a compiler warning.\n\nSigned-off-by: Peng Tao <4fb2b5cc20694ed9d470f738b651303a1e636b2d@emc.com>\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ac7b9004909d03d67016368093e81d37cae72895","subject":"generic swap(): don't return a value from swap()","message":"generic swap(): don't return a value from swap()\n\nThe swap() macro is accidentally retuning the value of its first argument.\nChange it into a doesn't-return-anything macro before someone goes and\nrelies upon this behaviour.\n\nSigned-off-by: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nCc: Wu Fengguang <f25caf39e3e90f2a28a0f6211af92081109b663e@linux.intel.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/kernel.h\n+++ include\/linux\/kernel.h\n@@ -480,7 +480,8 @@\n \/*\n * swap - swap value of @a and @b\n *\/\n-#define swap(a, b) ({ typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; })\n+#define swap(a, b) \\\n+\tdo { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)\n \n \/**\n * container_of - cast a member of a structure out to the containing structure\n"} {"commit":"a76761b621bcd8336065c4fe3a74f046858bc34c","subject":"percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP","message":"percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP\n\n!CONFIG_SMP was missing pcpu_lpage_remapped() definition causing build\nfailure. Add dummy implementation. This was discovered by linux-next\ntesting.\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nCc: Randy Dunlap <e1d10faa7e2a0c027bf1ff1d20e7fd10154be7ea@oracle.com>\nCc: Kamalesh Babulal <30b3129b1a1b0120e30fdc2f7d8e6560be5d0735@linux.vnet.ibm.com>\nCc: Stephen Rothwell <4bf0fb350827ce8d86875e76c923a478597c3cef@canb.auug.org.au>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/percpu.h\n+++ include\/linux\/percpu.h\n@@ -183,6 +183,11 @@\n }\n \n static inline void __init setup_per_cpu_areas(void) { }\n+\n+static inline void *pcpu_lpage_remapped(void *kaddr)\n+{\n+\treturn NULL;\n+}\n \n #endif \/* CONFIG_SMP *\/\n \n"} {"commit":"d184d6eb1dc3c9869e25a8e422be5c55ab0db4ac","subject":"ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED","message":"ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED\n\nThe fake SIGSTOP during attach has numerous problems. PTRACE_SEIZE\nis already fine, but we have basically the same problems is SIGSTOP\nis sent on auto-attach, the tracer can't know if this signal signal\nshould be cancelled or not.\n\nChange ptrace_event() to set JOBCTL_TRAP_STOP if the new child is\nPT_SEIZED, this triggers the PTRACE_EVENT_STOP report.\n\nThereafter a PT_SEIZED task can never report the bogus SIGSTOP.\n\nTest-case:\n\n\t#define PTRACE_SEIZE\t\t0x4206\n\t#define PTRACE_SEIZE_DEVEL\t0x80000000\n\t#define PTRACE_EVENT_STOP\t7\n\t#define WEVENT(s)\t\t((s & 0xFF0000) >> 16)\n\n\tint main(void)\n\t{\n\t\tint child, grand_child, status;\n\t\tlong message;\n\n\t\tchild = fork();\n\t\tif (!child) {\n\t\t\tkill(getpid(), SIGSTOP);\n\t\t\tfork();\n\t\t\tassert(0);\n\t\t\treturn 0x23;\n\t\t}\n\n\t\tassert(ptrace(PTRACE_SEIZE, child, 0,PTRACE_SEIZE_DEVEL) == 0);\n\t\tassert(wait(&status) == child);\n\t\tassert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGSTOP);\n\n\t\tassert(ptrace(PTRACE_SETOPTIONS, child, 0, PTRACE_O_TRACEFORK) == 0);\n\n\t\tassert(ptrace(PTRACE_CONT, child, 0,0) == 0);\n\t\tassert(waitpid(child, &status, 0) == child);\n\t\tassert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGTRAP);\n\t\tassert(WEVENT(status) == PTRACE_EVENT_FORK);\n\n\t\tassert(ptrace(PTRACE_GETEVENTMSG, child, 0, &message) == 0);\n\t\tgrand_child = message;\n\n\t\tassert(waitpid(grand_child, &status, 0) == grand_child);\n\t\tassert(WIFSTOPPED(status) && WSTOPSIG(status) == SIGTRAP);\n\t\tassert(WEVENT(status) == PTRACE_EVENT_STOP);\n\n\t\tkill(child, SIGKILL);\n\t\tkill(grand_child, SIGKILL);\n\t\treturn 0;\n\t}\n\nSigned-off-by: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@redhat.com>\nAcked-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/ptrace.h\n+++ include\/linux\/ptrace.h\n@@ -228,7 +228,11 @@\n \t\tchild->ptrace = current->ptrace;\n \t\t__ptrace_link(child, current->parent);\n \n-\t\tsigaddset(&child->pending.signal, SIGSTOP);\n+\t\tif (child->ptrace & PT_SEIZED)\n+\t\t\ttask_set_jobctl_pending(child, JOBCTL_TRAP_STOP);\n+\t\telse\n+\t\t\tsigaddset(&child->pending.signal, SIGSTOP);\n+\n \t\tset_tsk_thread_flag(child, TIF_SIGPENDING);\n \t}\n }\n"} {"commit":"7647f14fe4cd98151f8e90656c01fe61044de714","subject":"lib\/rbtree.c: fix typo in comment","message":"lib\/rbtree.c: fix typo in comment\n\nSigned-off-by: John de la Garza <a51dda7c7ff50b61eaea0444371f4a6a9301e501@jjdev.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"f525c06d12b72cddb085df7f6f348c3c5a39b3ce","subject":"[SKB]: __skb_dequeue = skb_peek + __skb_unlink","message":"[SKB]: __skb_dequeue = skb_peek + __skb_unlink\n\nBy rearranging the order of declarations, __skb_dequeue() is expressed in terms of\n\n * skb_peek() and\n * __skb_unlink(),\n\nthus in effect mirroring the analogue implementation of __skb_dequeue_tail().\n\nSigned-off-by: Gerrit Renker <3b97070d46ccd66422a8e7b83e6967ed84780538@erg.abdn.ac.uk>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/skbuff.h\n+++ include\/linux\/skbuff.h\n@@ -734,35 +734,6 @@\n \tnext->prev = prev->next = newsk;\n }\n \n-\n-\/**\n- *\t__skb_dequeue - remove from the head of the queue\n- *\t@list: list to dequeue from\n- *\n- *\tRemove the head of the list. This function does not take any locks\n- *\tso must be used with appropriate locks held only. The head item is\n- *\treturned or %NULL if the list is empty.\n- *\/\n-extern struct sk_buff *skb_dequeue(struct sk_buff_head *list);\n-static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)\n-{\n-\tstruct sk_buff *next, *prev, *result;\n-\n-\tprev = (struct sk_buff *) list;\n-\tnext = prev->next;\n-\tresult = NULL;\n-\tif (next != prev) {\n-\t\tresult\t = next;\n-\t\tnext\t = next->next;\n-\t\tlist->qlen--;\n-\t\tnext->prev = prev;\n-\t\tprev->next = next;\n-\t\tresult->next = result->prev = NULL;\n-\t}\n-\treturn result;\n-}\n-\n-\n \/*\n *\tInsert a packet on a list.\n *\/\n@@ -803,8 +774,22 @@\n \tprev->next = next;\n }\n \n-\n-\/* XXX: more streamlined implementation *\/\n+\/**\n+ *\t__skb_dequeue - remove from the head of the queue\n+ *\t@list: list to dequeue from\n+ *\n+ *\tRemove the head of the list. This function does not take any locks\n+ *\tso must be used with appropriate locks held only. The head item is\n+ *\treturned or %NULL if the list is empty.\n+ *\/\n+extern struct sk_buff *skb_dequeue(struct sk_buff_head *list);\n+static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list)\n+{\n+\tstruct sk_buff *skb = skb_peek(list);\n+\tif (skb)\n+\t\t__skb_unlink(skb, list);\n+\treturn skb;\n+}\n \n \/**\n *\t__skb_dequeue_tail - remove from the tail of the queue\n"} {"commit":"cd58950a5345f006a318f178705b9250aa54425c","subject":"skbuff: remove unused dev_consume_skb macro definition","message":"skbuff: remove unused dev_consume_skb macro definition\n\ndev_consume_skb and kfree_skb_clean have no users and in the case of\nkfree_skb_clean could cause potential build issues since I cannot find\nwhere it is defined. Based on the patch in which it was introduced it\nappears to have been a bit of leftover code from an earlier version of the\npatch in which kfree_skb_clean was dropped in favor of consume_skb.\n\nSigned-off-by: Alexander Duyck <af56634f9be8457194a3461ec96c497f138af4ff@intel.com>\nSigned-off-by: Jeff Kirsher <87e35f5be20bb3e67f4ba6b86f5f6be3085b1b3a@intel.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"616beb17d44e17f77ac4505eb014fb7cacb04b34","subject":"qemu: Use more specific prefixes","message":"qemu: Use more specific prefixes\n\nWhile the chances of the current checks resulting in false\npositives are basically zero, it's still nicer to check for\nthe full prefix instead of the prefix's prefix.\n\nSigned-off-by: Andrea Bolognani <3ada0bee826c753786fdbba72243dfba997094cf@redhat.com>\n","repos":"andreabolognani\/libvirt,zippy2\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,eskultety\/libvirt,crobinso\/libvirt,eskultety\/libvirt,libvirt\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,libvirt\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_domain.c\n+++ src\/qemu\/qemu_domain.c\n@@ -9885,7 +9885,7 @@\n bool\n qemuDomainMachineIsQ35(const char *machine)\n {\n- return (STRPREFIX(machine, \"pc-q35\") ||\n+ return (STRPREFIX(machine, \"pc-q35-\") ||\n STREQ(machine, \"q35\"));\n }\n \n@@ -9903,7 +9903,7 @@\n return (STREQ(machine, \"pc\") ||\n STRPREFIX(machine, \"pc-0.\") ||\n STRPREFIX(machine, \"pc-1.\") ||\n- STRPREFIX(machine, \"pc-i440\") ||\n+ STRPREFIX(machine, \"pc-i440fx-\") ||\n STRPREFIX(machine, \"rhel\"));\n }\n \n"} {"commit":"67fed45930fa31e92c11beb3a3dbf83a1a92a58d","subject":"net: Add new interfaces for SKB list light-weight init and splicing.","message":"net: Add new interfaces for SKB list light-weight init and splicing.\n\nThis will be used by subsequent changesets.\n\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/skbuff.h\n+++ include\/linux\/skbuff.h\n@@ -660,6 +660,22 @@\n \treturn list_->qlen;\n }\n \n+\/**\n+ *\t__skb_queue_head_init - initialize non-spinlock portions of sk_buff_head\n+ *\t@list: queue to initialize\n+ *\n+ *\tThis initializes only the list and queue length aspects of\n+ *\tan sk_buff_head object. This allows to initialize the list\n+ *\taspects of an sk_buff_head without reinitializing things like\n+ *\tthe spinlock. It can also be used for on-stack sk_buff_head\n+ *\tobjects where the spinlock is known to not be used.\n+ *\/\n+static inline void __skb_queue_head_init(struct sk_buff_head *list)\n+{\n+\tlist->prev = list->next = (struct sk_buff *)list;\n+\tlist->qlen = 0;\n+}\n+\n \/*\n * This function creates a split out lock class for each invocation;\n * this is needed for now since a whole lot of users of the skb-queue\n@@ -671,8 +687,7 @@\n static inline void skb_queue_head_init(struct sk_buff_head *list)\n {\n \tspin_lock_init(&list->lock);\n-\tlist->prev = list->next = (struct sk_buff *)list;\n-\tlist->qlen = 0;\n+\t__skb_queue_head_init(list);\n }\n \n static inline void skb_queue_head_init_class(struct sk_buff_head *list,\n@@ -697,6 +712,83 @@\n \tnewsk->prev = prev;\n \tnext->prev = prev->next = newsk;\n \tlist->qlen++;\n+}\n+\n+static inline void __skb_queue_splice(const struct sk_buff_head *list,\n+\t\t\t\t struct sk_buff *prev,\n+\t\t\t\t struct sk_buff *next)\n+{\n+\tstruct sk_buff *first = list->next;\n+\tstruct sk_buff *last = list->prev;\n+\n+\tfirst->prev = prev;\n+\tprev->next = first;\n+\n+\tlast->next = next;\n+\tnext->prev = last;\n+}\n+\n+\/**\n+ *\tskb_queue_splice - join two skb lists, this is designed for stacks\n+ *\t@list: the new list to add\n+ *\t@head: the place to add it in the first list\n+ *\/\n+static inline void skb_queue_splice(const struct sk_buff_head *list,\n+\t\t\t\t struct sk_buff_head *head)\n+{\n+\tif (!skb_queue_empty(list)) {\n+\t\t__skb_queue_splice(list, (struct sk_buff *) head, head->next);\n+\t\thead->qlen = list->qlen;\n+\t}\n+}\n+\n+\/**\n+ *\tskb_queue_splice - join two skb lists and reinitialise the emptied list\n+ *\t@list: the new list to add\n+ *\t@head: the place to add it in the first list\n+ *\n+ *\tThe list at @list is reinitialised\n+ *\/\n+static inline void skb_queue_splice_init(struct sk_buff_head *list,\n+\t\t\t\t\t struct sk_buff_head *head)\n+{\n+\tif (!skb_queue_empty(list)) {\n+\t\t__skb_queue_splice(list, (struct sk_buff *) head, head->next);\n+\t\thead->qlen = list->qlen;\n+\t\t__skb_queue_head_init(list);\n+\t}\n+}\n+\n+\/**\n+ *\tskb_queue_splice_tail - join two skb lists, each list being a queue\n+ *\t@list: the new list to add\n+ *\t@head: the place to add it in the first list\n+ *\/\n+static inline void skb_queue_splice_tail(const struct sk_buff_head *list,\n+\t\t\t\t\t struct sk_buff_head *head)\n+{\n+\tif (!skb_queue_empty(list)) {\n+\t\t__skb_queue_splice(list, head->prev, (struct sk_buff *) head);\n+\t\thead->qlen = list->qlen;\n+\t}\n+}\n+\n+\/**\n+ *\tskb_queue_splice_tail - join two skb lists and reinitialise the emptied list\n+ *\t@list: the new list to add\n+ *\t@head: the place to add it in the first list\n+ *\n+ *\tEach of the lists is a queue.\n+ *\tThe list at @list is reinitialised\n+ *\/\n+static inline void skb_queue_splice_tail_init(struct sk_buff_head *list,\n+\t\t\t\t\t struct sk_buff_head *head)\n+{\n+\tif (!skb_queue_empty(list)) {\n+\t\t__skb_queue_splice(list, head->prev, (struct sk_buff *) head);\n+\t\thead->qlen = list->qlen;\n+\t\t__skb_queue_head_init(list);\n+\t}\n }\n \n \/**\n"} {"commit":"c71045a9cb987da79a60711f79a1ee32fb49bf18","subject":"qemu: snapshot: Forbid taking snapshot in invalid state","message":"qemu: snapshot: Forbid taking snapshot in invalid state\n\nSimilarly to 49a3a649a85f9d3d478be355aa8694bce889586a forbid creating\nsnapshots in domain states impossible to reach in qemu.\n","repos":"nertpinx\/libvirt,crobinso\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,rlaager\/libvirt,olafhering\/libvirt,eskultety\/libvirt,crobinso\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,andreabolognani\/libvirt,elmarco\/libvirt,rlaager\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,eskultety\/libvirt,rlaager\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,taget\/libvirt,elmarco\/libvirt,zippy2\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,shugaoye\/libvirt,eskultety\/libvirt,libvirt\/libvirt,rlaager\/libvirt,zippy2\/libvirt,shugaoye\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,shugaoye\/libvirt,VenkatDatta\/libvirt,libvirt\/libvirt,datto\/libvirt,crobinso\/libvirt,agx\/libvirt,shugaoye\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,agx\/libvirt,andreabolognani\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,datto\/libvirt,crobinso\/libvirt,taget\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,taget\/libvirt,andreabolognani\/libvirt,elmarco\/libvirt,agx\/libvirt,agx\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,datto\/libvirt,agx\/libvirt,jfehlig\/libvirt,taget\/libvirt,datto\/libvirt,taget\/libvirt,jfehlig\/libvirt,shugaoye\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_driver.c\n+++ src\/qemu\/qemu_driver.c\n@@ -13390,6 +13390,26 @@\n virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \"%s\",\n _(\"live snapshot creation is supported only \"\n \"with external checkpoints\"));\n+ goto cleanup;\n+ }\n+\n+ \/* allow snapshots only in certain states *\/\n+ switch ((virDomainState) vm->state.state) {\n+ \/* valid states *\/\n+ case VIR_DOMAIN_RUNNING:\n+ case VIR_DOMAIN_PAUSED:\n+ case VIR_DOMAIN_SHUTDOWN:\n+ case VIR_DOMAIN_SHUTOFF:\n+ case VIR_DOMAIN_CRASHED:\n+ case VIR_DOMAIN_PMSUSPENDED:\n+ break;\n+\n+ \/* invalid states *\/\n+ case VIR_DOMAIN_NOSTATE:\n+ case VIR_DOMAIN_BLOCKED: \/* invalid state, unused in qemu *\/\n+ case VIR_DOMAIN_LAST:\n+ virReportError(VIR_ERR_INTERNAL_ERROR, _(\"Invalid domain state %s\"),\n+ virDomainStateTypeToString(vm->state.state));\n goto cleanup;\n }\n \n"} {"commit":"991ac30d8b30ab6051dff5a7b07d84e6f5efa3a6","subject":"sysctl: the include of rcupdate.h is only needed in the kernel","message":"sysctl: the include of rcupdate.h is only needed in the kernel\n\nFixes this built error:\n\ninclude\/linux\/sysctl.h:28: included file 'linux\/rcupdate.h' is not exported\n\nSigned-off-by: Stephen Rothwell <4bf0fb350827ce8d86875e76c923a478597c3cef@canb.auug.org.au>\nAcked-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/sysctl.h\n+++ include\/linux\/sysctl.h\n@@ -25,7 +25,6 @@\n #include <linux\/kernel.h>\n #include <linux\/types.h>\n #include <linux\/compiler.h>\n-#include <linux\/rcupdate.h>\n \n struct completion;\n \n@@ -931,6 +930,7 @@\n \n #ifdef __KERNEL__\n #include <linux\/list.h>\n+#include <linux\/rcupdate.h>\n \n \/* For the \/proc\/sys support *\/\n struct ctl_table;\n"} {"commit":"46da762669bada3b297bea1217c96af9d4c514c7","subject":"qemu: snapshot: Don't overload 'ret' in qemuDomainSnapshotCreateDiskActive","message":"qemu: snapshot: Don't overload 'ret' in qemuDomainSnapshotCreateDiskActive\n\nIntroduce 'rc' for collecting state from monitor commands so that we can\ninitialize 'ret' to -1. This also fixes few cases which could return 0\nfrom the function despite an error condition.\n\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"jfehlig\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,crobinso\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,olafhering\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,eskultety\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_driver.c\n+++ src\/qemu\/qemu_driver.c\n@@ -15239,7 +15239,8 @@\n qemuDomainObjPrivatePtr priv = vm->privateData;\n VIR_AUTOPTR(virJSONValue) actions = NULL;\n bool do_transaction = false;\n- int ret = 0;\n+ int rc;\n+ int ret = -1;\n size_t i;\n bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;\n qemuDomainSnapshotDiskDataPtr diskdata = NULL;\n@@ -15263,11 +15264,9 @@\n * VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL with a valid file name and\n * qcow2 format. *\/\n for (i = 0; i < ndiskdata; i++) {\n- ret = qemuDomainSnapshotCreateSingleDiskActive(driver, vm,\n- &diskdata[i],\n- actions, reuse);\n-\n- if (ret < 0)\n+ if (qemuDomainSnapshotCreateSingleDiskActive(driver, vm,\n+ &diskdata[i],\n+ actions, reuse) < 0)\n goto error;\n \n do_transaction = true;\n@@ -15277,23 +15276,25 @@\n if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)\n goto cleanup;\n \n- ret = qemuMonitorTransaction(priv->mon, &actions);\n+ rc = qemuMonitorTransaction(priv->mon, &actions);\n \n if (qemuDomainObjExitMonitor(driver, vm) < 0)\n- ret = -1;\n+ rc = -1;\n \n for (i = 0; i < ndiskdata; i++) {\n qemuDomainSnapshotDiskDataPtr dd = &diskdata[i];\n \n- virDomainAuditDisk(vm, dd->disk->src, dd->src, \"snapshot\", ret >= 0);\n-\n- if (ret == 0)\n+ virDomainAuditDisk(vm, dd->disk->src, dd->src, \"snapshot\", rc >= 0);\n+\n+ if (rc == 0)\n qemuDomainSnapshotUpdateDiskSources(dd);\n }\n \n- if (ret < 0)\n+ if (rc < 0)\n goto error;\n }\n+\n+ ret = 0;\n \n error:\n if (ret < 0) {\n"} {"commit":"7b82d553889a9123aa38ae8a21054d509ef6375d","subject":"gcc fix","message":"gcc fix\n\n\ngit-svn-id: e2e1a767b54e5f731ad8ac18fa5089ee37d5625a@393 7ec92016-0320-0410-acc4-a06ded1c099a\n","repos":"claudiordgz\/Loki,claudiordgz\/Loki,claudiordgz\/Loki","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/loki\/Functor.h\n+++ include\/loki\/Functor.h\n@@ -1363,7 +1363,7 @@\n struct BinderFirstBoundTypeStorage< Functor<R, TList, ThreadingModel> >\n {\n \t\t\ttypedef Functor<R, TList, ThreadingModel> OriginalFunctor;\n- typedef typename const TypeTraits<OriginalFunctor>::ReferredType RefOrValue;\n+ typedef const typename TypeTraits<OriginalFunctor>::ReferredType RefOrValue;\n }; \n \n \n"} {"commit":"dac4f609cf10a2283dc638ae324a60286e0b9f6f","subject":"don't try getting a parent path when path is NULL","message":"don't try getting a parent path when path is NULL\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- swfdec\/swfdec_url.c\n+++ swfdec\/swfdec_url.c\n@@ -223,7 +223,8 @@\n SwfdecURL *ret;\n \n path = g_strdup (url->path);\n- swfdec_url_path_to_parent_path (path);\n+ if (path)\n+ swfdec_url_path_to_parent_path (path);\n ret = swfdec_url_new_components (url->protocol, url->host, url->port,\n path, NULL);\n g_free (path);\n"} {"commit":"841d104a77623eeb8c6d9ea28407d36a1172bf73","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"gridcf\/gct,gridcf\/gct,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gass\/copy\/source\/globus_gass_copy.c\n+++ gass\/copy\/source\/globus_gass_copy.c\n@@ -242,6 +242,12 @@\n return result;\n \n result = globus_ftp_client_handle_destroy(&handle->ftp_dest_handle);\n+\n+\tif(handle->err != GLOBUS_NULL)\n+ globus_libc_free(handle->err);\n+\n+ handle->err = GLOBUS_NULL;\n+\n return result; \n }\n else\n"} {"commit":"9ec151538b722bf60ad098703caab422341acddd","subject":"NL@EOF fix","message":"NL@EOF fix\n","repos":"sedna\/sedna,sedna\/sedna,sedna\/sedna,sedna\/sedna,sedna\/sedna,sedna\/sedna","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/tr\/crmutils\/global_options.h\n+++ kernel\/tr\/crmutils\/global_options.h\n@@ -35,4 +35,4 @@\n bool separateTuples;\n };\n \n-#endif \/* _GLOBAL_OPTIONS_H_ *\/+#endif \/* _GLOBAL_OPTIONS_H_ *\/\n"} {"commit":"dc4d4c2f88576d88db6f1913953e8ff3374df21f","subject":"Species mass densities were not correct. This should be it now. Let's hope...","message":"Species mass densities were not correct. This should be it now. Let's hope...\n","repos":"mzemp\/iof","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- iof_art.c\n+++ iof_art.c\n@@ -597,12 +597,16 @@\n \tassert(ad.Nrtchemspecies == 6);\n \tif (ad.ELECTRON_ION_NONEQUILIBRIUM) index = 9;\n \telse index = 8;\n+\t\/*\n+\t** What is written out for species j is X_j * gas_density where X_j = N_j \/ N_Nucleons\n+\t** => need to multiply with number of nucleons of species j to get the mass density\n+\t*\/\n \tagp->HI_density = cellhydroproperties[index];\n \tagp->HII_density = cellhydroproperties[index+1];\n-\tagp->HeI_density = cellhydroproperties[index+2];\n-\tagp->HeII_density = cellhydroproperties[index+3];\n-\tagp->HeIII_density = cellhydroproperties[index+4];\n-\tagp->H2_density = cellhydroproperties[index+5]*2; \/* only half the mass density written out *\/\n+\tagp->HeI_density = cellhydroproperties[index+2]*4;\n+\tagp->HeII_density = cellhydroproperties[index+3]*4;\n+\tagp->HeIII_density = cellhydroproperties[index+4]*4;\n+\tagp->H2_density = cellhydroproperties[index+5]*2;\n \t}\n agp->metal_density_SNII = 0;\n agp->metal_density_SNIa = 0;\n"} {"commit":"a19bfdbf6a112affbbc038bbe5856c28b1619641","subject":"fixed: doc","message":"fixed: doc\n","repos":"tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/BALL\/FORMAT\/trajectoryFile.h\n+++ include\/BALL\/FORMAT\/trajectoryFile.h\n@@ -1,4 +1,4 @@\n-\/\/ $Id: trajectoryFile.h,v 1.8 2001\/05\/14 19:21:03 amoll Exp $\n+\/\/ $Id: trajectoryFile.h,v 1.9 2001\/09\/11 12:29:13 anker Exp $\n \n #ifndef BALL_FORMAT_TRAJECTORYFILE_H\n #define BALL_FORMAT_TRAJECTORYFILE_H\n@@ -110,8 +110,9 @@\n \t\tvirtual bool writeHeader()\n \t\t\tthrow();\n \n-\t\t\/** Append a list of SnapShots to an existing file.\n-\t\t\t\t@param buffer the list os SnapShots we want to save\n+\t\t\/** Append a SnapShot to an existing file. {\\bf Note} that this method\n+\t\t\t\tdoes {\\bf note} update the header.\n+\t\t\t\t@param snapshot the SnapShot we want to save\n \t\t\t\t@return true, if writing was successful\n \t\t*\/\n \t\tvirtual bool append(const SnapShot& snapshot)\n"} {"commit":"c6f26fc207a31fd069779ebdd400196249c9784a","subject":"qemu: driver: Split out regular vcpu hotplug code into a function","message":"qemu: driver: Split out regular vcpu hotplug code into a function\n\nAll other modes of qemuDomainSetVcpusFlags have helpers so finish the\nwork by splitting the regular code into a new function.\n\nThis patch also touches up the coding (spacing) style.\n","repos":"datto\/libvirt,VenkatDatta\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,taget\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,zippy2\/libvirt,eskultety\/libvirt,zippy2\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,taget\/libvirt,nertpinx\/libvirt,datto\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,taget\/libvirt,libvirt\/libvirt,libvirt\/libvirt,crobinso\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,datto\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_driver.c\n+++ src\/qemu\/qemu_driver.c\n@@ -4858,7 +4858,53 @@\n \n \n static int\n-qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,\n+qemuDomainSetVcpusInternal(virQEMUDriverPtr driver,\n+ virDomainObjPtr vm,\n+ virDomainDefPtr def,\n+ virDomainDefPtr persistentDef,\n+ unsigned int nvcpus)\n+{\n+ virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);\n+ int ret = -1;\n+\n+ if (def && nvcpus > virDomainDefGetVcpusMax(def)) {\n+ virReportError(VIR_ERR_INVALID_ARG,\n+ _(\"requested vcpus is greater than max allowable\"\n+ \" vcpus for the live domain: %u > %u\"),\n+ nvcpus, virDomainDefGetVcpusMax(def));\n+ goto cleanup;\n+ }\n+\n+ if (persistentDef && nvcpus > virDomainDefGetVcpusMax(persistentDef)) {\n+ virReportError(VIR_ERR_INVALID_ARG,\n+ _(\"requested vcpus is greater than max allowable\"\n+ \" vcpus for the persistent domain: %u > %u\"),\n+ nvcpus, virDomainDefGetVcpusMax(persistentDef));\n+ goto cleanup;\n+ }\n+\n+ if (def && qemuDomainSetVcpusLive(driver, cfg, vm, nvcpus) < 0)\n+ goto cleanup;\n+\n+ if (persistentDef) {\n+ if (virDomainDefSetVcpus(persistentDef, nvcpus) < 0)\n+ goto cleanup;\n+\n+ if (virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef) < 0)\n+ goto cleanup;\n+ }\n+\n+ ret = 0;\n+\n+ cleanup:\n+ virObjectUnref(cfg);\n+ return ret;\n+}\n+\n+\n+static int\n+qemuDomainSetVcpusFlags(virDomainPtr dom,\n+ unsigned int nvcpus,\n unsigned int flags)\n {\n virQEMUDriverPtr driver = dom->conn->privateData;\n@@ -4866,7 +4912,6 @@\n virDomainDefPtr def;\n virDomainDefPtr persistentDef;\n int ret = -1;\n- virQEMUDriverConfigPtr cfg = NULL;\n \n virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |\n VIR_DOMAIN_AFFECT_CONFIG |\n@@ -4876,69 +4921,30 @@\n if (!(vm = qemuDomObjFromDomain(dom)))\n goto cleanup;\n \n- cfg = virQEMUDriverGetConfig(driver);\n-\n if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0)\n goto cleanup;\n \n if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)\n goto cleanup;\n \n- if (flags & VIR_DOMAIN_VCPU_GUEST) {\n+ if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)\n+ goto endjob;\n+\n+ if (flags & VIR_DOMAIN_VCPU_GUEST)\n ret = qemuDomainSetVcpusAgent(vm, nvcpus);\n- goto endjob;\n- }\n-\n- if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)\n- goto endjob;\n-\n- if (flags & VIR_DOMAIN_VCPU_MAXIMUM) {\n+ else if (flags & VIR_DOMAIN_VCPU_MAXIMUM)\n ret = qemuDomainSetVcpusMax(driver, def, persistentDef, nvcpus);\n- goto endjob;\n- }\n-\n- if (def) {\n- if (nvcpus > virDomainDefGetVcpusMax(def)) {\n- virReportError(VIR_ERR_INVALID_ARG,\n- _(\"requested vcpus is greater than max allowable\"\n- \" vcpus for the live domain: %u > %u\"),\n- nvcpus, virDomainDefGetVcpusMax(def));\n- goto endjob;\n- }\n- }\n-\n- if (persistentDef) {\n- if (nvcpus > virDomainDefGetVcpusMax(persistentDef)) {\n- virReportError(VIR_ERR_INVALID_ARG,\n- _(\"requested vcpus is greater than max allowable\"\n- \" vcpus for the persistent domain: %u > %u\"),\n- nvcpus, virDomainDefGetVcpusMax(persistentDef));\n- goto endjob;\n- }\n- }\n-\n- if (def && qemuDomainSetVcpusLive(driver, cfg, vm, nvcpus) < 0)\n- goto endjob;\n-\n- if (persistentDef) {\n- if (virDomainDefSetVcpus(persistentDef, nvcpus) < 0)\n- goto endjob;\n-\n- if (virDomainSaveConfig(cfg->configDir, driver->caps,\n- persistentDef) < 0)\n- goto endjob;\n- }\n-\n- ret = 0;\n+ else\n+ ret = qemuDomainSetVcpusInternal(driver, vm, def, persistentDef, nvcpus);\n \n endjob:\n qemuDomainObjEndJob(driver, vm);\n \n cleanup:\n virDomainObjEndAPI(&vm);\n- virObjectUnref(cfg);\n- return ret;\n-}\n+ return ret;\n+}\n+\n \n static int\n qemuDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)\n"} {"commit":"76748b2b60a98c529f92dff2003629c99213db04","subject":"Support execute with empty argument.","message":"Support execute with empty argument.\n","repos":"swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- swoole_mysql_coro.c\n+++ swoole_mysql_coro.c\n@@ -82,7 +82,7 @@\n ZEND_END_ARG_INFO()\n #endif\n \n-ZEND_BEGIN_ARG_INFO_EX(arginfo_swoole_mysql_coro_statement_execute, 0, 0, 1)\n+ZEND_BEGIN_ARG_INFO_EX(arginfo_swoole_mysql_coro_statement_execute, 0, 0, 0)\n ZEND_ARG_INFO(0, params)\n ZEND_ARG_INFO(0, timeout)\n ZEND_END_ARG_INFO()\n@@ -250,10 +250,15 @@\n return SW_ERR;\n }\n \n- if (php_swoole_array_length(params) != statement->param_count)\n+ int params_length = 0;\n+ if (params){\n+ params_length = php_swoole_array_length(params);\n+ }\n+\n+ if (params_length != statement->param_count)\n {\n swoole_php_fatal_error(E_WARNING, \"mysql statement#%d expects %d parameter, %d given.\", statement->id,\n- statement->param_count, php_swoole_array_length(params));\n+ statement->param_count, params_length);\n return SW_ERR;\n }\n \n@@ -281,8 +286,13 @@\n \n mysql_request_buffer->length += 9;\n \n+ if (params_length == 0)\n+ {\n+ goto send;\n+ }\n+\n \/\/null bitmap\n- unsigned int null_count = (php_swoole_array_length(params) + 7) \/ 8;\n+ unsigned int null_count = (params_length + 7) \/ 8;\n memset(p, 0, null_count);\n p += null_count;\n mysql_request_buffer->length += null_count;\n@@ -299,11 +309,10 @@\n p += 2;\n }\n \n- mysql_request_buffer->length += php_swoole_array_length(params) * 2;\n+ mysql_request_buffer->length += params_length * 2;\n \n long lval;\n char buf[10];\n-\n {\n zval *value;\n zval _value;\n@@ -343,6 +352,8 @@\n zval_dtor(value);\n SW_HASHTABLE_FOREACH_END();\n }\n+\n+ send:\n \n \/\/length\n mysql_pack_length(mysql_request_buffer->length - 4, mysql_request_buffer->str);\n@@ -963,10 +974,10 @@\n \n static PHP_METHOD(swoole_mysql_coro_statement, execute)\n {\n- zval *params;\n+ zval *params = NULL;\n double timeout = -1;\n \n- if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, \"a|d\", ¶ms, &timeout) == FAILURE)\n+ if (zend_parse_parameters(ZEND_NUM_ARGS()TSRMLS_CC, \"|ad\", ¶ms, &timeout) == FAILURE)\n {\n RETURN_FALSE;\n }\n"} {"commit":"43fb8ea861e6023ef7d08eabf252518e9ef4e749","subject":"Update version","message":"Update version\n","repos":"Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/version.h\n+++ include\/mega\/version.h\n@@ -5,5 +5,5 @@\n #define MEGA_MINOR_VERSION 6\n #endif\n #ifndef MEGA_MICRO_VERSION\n-#define MEGA_MICRO_VERSION 6\n+#define MEGA_MICRO_VERSION 7\n #endif\n"} {"commit":"f995d4e95f3420d9ad2a3294f43c75327c530d14","subject":"Fixed few trival items in the file","message":"Fixed few trival items in the file\n\nfixed some trival items\n","repos":"davidzchen\/tensorflow,aam-at\/tensorflow,Intel-Corporation\/tensorflow,renyi533\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,aam-at\/tensorflow,davidzchen\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,renyi533\/tensorflow,davidzchen\/tensorflow,cxxgtxy\/tensorflow,DavidNorman\/tensorflow,gunan\/tensorflow,gautam1858\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,gautam1858\/tensorflow,davidzchen\/tensorflow,petewarden\/tensorflow,Intel-Corporation\/tensorflow,aam-at\/tensorflow,jhseu\/tensorflow,ppwwyyxx\/tensorflow,annarev\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-experimental_link_static_libraries_once,xzturn\/tensorflow,renyi533\/tensorflow,yongtang\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,annarev\/tensorflow,cxxgtxy\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,Intel-tensorflow\/tensorflow,aldian\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,gunan\/tensorflow,yongtang\/tensorflow,sarvex\/tensorflow,arborh\/tensorflow,adit-chandra\/tensorflow,cxxgtxy\/tensorflow,davidzchen\/tensorflow,Intel-tensorflow\/tensorflow,aldian\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,DavidNorman\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow,ghchinoy\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aam-at\/tensorflow,Intel-tensorflow\/tensorflow,adit-chandra\/tensorflow,karllessard\/tensorflow,adit-chandra\/tensorflow,xzturn\/tensorflow,sarvex\/tensorflow,renyi533\/tensorflow,gautam1858\/tensorflow,freedomtan\/tensorflow,yongtang\/tensorflow,aam-at\/tensorflow,karllessard\/tensorflow,arborh\/tensorflow,arborh\/tensorflow,freedomtan\/tensorflow,jhseu\/tensorflow,ghchinoy\/tensorflow,Intel-Corporation\/tensorflow,alsrgv\/tensorflow,freedomtan\/tensorflow,DavidNorman\/tensorflow,sarvex\/tensorflow,DavidNorman\/tensorflow,gunan\/tensorflow,DavidNorman\/tensorflow,annarev\/tensorflow,cxxgtxy\/tensorflow,freedomtan\/tensorflow,xzturn\/tensorflow,alsrgv\/tensorflow,davidzchen\/tensorflow,davidzchen\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow,gunan\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-pywrap_saved_model,chemelnucfin\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,petewarden\/tensorflow,jhseu\/tensorflow,adit-chandra\/tensorflow,arborh\/tensorflow,davidzchen\/tensorflow,freedomtan\/tensorflow,renyi533\/tensorflow,sarvex\/tensorflow,chemelnucfin\/tensorflow,petewarden\/tensorflow,alsrgv\/tensorflow,sarvex\/tensorflow,DavidNorman\/tensorflow,arborh\/tensorflow,frreiss\/tensorflow-fred,jhseu\/tensorflow,frreiss\/tensorflow-fred,ghchinoy\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,jhseu\/tensorflow,alsrgv\/tensorflow,annarev\/tensorflow,chemelnucfin\/tensorflow,gautam1858\/tensorflow,Intel-tensorflow\/tensorflow,freedomtan\/tensorflow,arborh\/tensorflow,frreiss\/tensorflow-fred,jhseu\/tensorflow,annarev\/tensorflow,paolodedios\/tensorflow,alsrgv\/tensorflow,freedomtan\/tensorflow,gunan\/tensorflow,chemelnucfin\/tensorflow,freedomtan\/tensorflow,petewarden\/tensorflow,alsrgv\/tensorflow,cxxgtxy\/tensorflow,karllessard\/tensorflow,annarev\/tensorflow,gautam1858\/tensorflow,ppwwyyxx\/tensorflow,tensorflow\/tensorflow,adit-chandra\/tensorflow,DavidNorman\/tensorflow,adit-chandra\/tensorflow,ppwwyyxx\/tensorflow,arborh\/tensorflow,aam-at\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,ppwwyyxx\/tensorflow,yongtang\/tensorflow,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aldian\/tensorflow,ghchinoy\/tensorflow,karllessard\/tensorflow,jhseu\/tensorflow,xzturn\/tensorflow,renyi533\/tensorflow,Intel-tensorflow\/tensorflow,frreiss\/tensorflow-fred,alsrgv\/tensorflow,DavidNorman\/tensorflow,chemelnucfin\/tensorflow,yongtang\/tensorflow,paolodedios\/tensorflow,aam-at\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,ghchinoy\/tensorflow,ppwwyyxx\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aam-at\/tensorflow,gunan\/tensorflow,jhseu\/tensorflow,ppwwyyxx\/tensorflow,jhseu\/tensorflow,jhseu\/tensorflow,xzturn\/tensorflow,aldian\/tensorflow,ppwwyyxx\/tensorflow,arborh\/tensorflow,karllessard\/tensorflow,Intel-Corporation\/tensorflow,alsrgv\/tensorflow,xzturn\/tensorflow,sarvex\/tensorflow,jhseu\/tensorflow,tensorflow\/tensorflow,annarev\/tensorflow,adit-chandra\/tensorflow,alsrgv\/tensorflow,xzturn\/tensorflow,arborh\/tensorflow,adit-chandra\/tensorflow,davidzchen\/tensorflow,yongtang\/tensorflow,DavidNorman\/tensorflow,ghchinoy\/tensorflow,ppwwyyxx\/tensorflow,annarev\/tensorflow,freedomtan\/tensorflow,Intel-tensorflow\/tensorflow,frreiss\/tensorflow-fred,gautam1858\/tensorflow,alsrgv\/tensorflow,renyi533\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-experimental_link_static_libraries_once,ghchinoy\/tensorflow,petewarden\/tensorflow,xzturn\/tensorflow,gunan\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow,xzturn\/tensorflow,yongtang\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow-pywrap_tf_optimizer,Intel-tensorflow\/tensorflow,chemelnucfin\/tensorflow,gautam1858\/tensorflow,ppwwyyxx\/tensorflow,Intel-Corporation\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,frreiss\/tensorflow-fred,tensorflow\/tensorflow-pywrap_tf_optimizer,adit-chandra\/tensorflow,cxxgtxy\/tensorflow,sarvex\/tensorflow,gautam1858\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow,arborh\/tensorflow,arborh\/tensorflow,gautam1858\/tensorflow,aam-at\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow,paolodedios\/tensorflow,chemelnucfin\/tensorflow,ppwwyyxx\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,xzturn\/tensorflow,karllessard\/tensorflow,yongtang\/tensorflow,ppwwyyxx\/tensorflow,paolodedios\/tensorflow,davidzchen\/tensorflow,aldian\/tensorflow,gunan\/tensorflow,gunan\/tensorflow,sarvex\/tensorflow,renyi533\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,Intel-Corporation\/tensorflow,ghchinoy\/tensorflow,jhseu\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,cxxgtxy\/tensorflow,freedomtan\/tensorflow,chemelnucfin\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow,xzturn\/tensorflow,cxxgtxy\/tensorflow,freedomtan\/tensorflow,adit-chandra\/tensorflow,karllessard\/tensorflow,gautam1858\/tensorflow,DavidNorman\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,petewarden\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,annarev\/tensorflow,xzturn\/tensorflow,aldian\/tensorflow,frreiss\/tensorflow-fred,paolodedios\/tensorflow,ppwwyyxx\/tensorflow,adit-chandra\/tensorflow,Intel-tensorflow\/tensorflow,gunan\/tensorflow,renyi533\/tensorflow,karllessard\/tensorflow,gautam1858\/tensorflow,gunan\/tensorflow,renyi533\/tensorflow,Intel-tensorflow\/tensorflow,gunan\/tensorflow,ghchinoy\/tensorflow,tensorflow\/tensorflow,freedomtan\/tensorflow,aam-at\/tensorflow,petewarden\/tensorflow,gautam1858\/tensorflow,yongtang\/tensorflow,renyi533\/tensorflow,chemelnucfin\/tensorflow,alsrgv\/tensorflow,DavidNorman\/tensorflow,aam-at\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,petewarden\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow,ghchinoy\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,karllessard\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow,aldian\/tensorflow,Intel-Corporation\/tensorflow,ghchinoy\/tensorflow,DavidNorman\/tensorflow,aam-at\/tensorflow,chemelnucfin\/tensorflow,Intel-tensorflow\/tensorflow,renyi533\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,adit-chandra\/tensorflow,ghchinoy\/tensorflow,aldian\/tensorflow,davidzchen\/tensorflow,chemelnucfin\/tensorflow,alsrgv\/tensorflow,yongtang\/tensorflow,Intel-Corporation\/tensorflow,petewarden\/tensorflow,chemelnucfin\/tensorflow,frreiss\/tensorflow-fred,arborh\/tensorflow","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tensorflow\/lite\/kernels\/test_util.h\n+++ tensorflow\/lite\/kernels\/test_util.h\n@@ -46,7 +46,7 @@\n inline std::vector<T> Quantize(const std::vector<float>& data, float scale,\n int32_t zero_point) {\n std::vector<T> q;\n- for (float f : data) {\n+ for (const auto& f : data) {\n q.push_back(static_cast<T>(std::max<float>(\n std::numeric_limits<T>::min(),\n std::min<float>(std::numeric_limits<T>::max(),\n@@ -59,7 +59,7 @@\n inline std::vector<float> Dequantize(const std::vector<T>& data, float scale,\n int32_t zero_point) {\n std::vector<float> f;\n- for (T q : data) {\n+ for (const T q : data) {\n f.push_back(scale * (q - zero_point));\n }\n return f;\n@@ -276,7 +276,7 @@\n << \". Requested \" << typeToTfLiteType<T>() << \", got \"\n << t->type;\n }\n- for (T f : data) {\n+ for (const T f : data) {\n *v = f;\n ++v;\n }\n@@ -296,7 +296,7 @@\n << \". Requested \" << typeToTfLiteType<T>() << \", got \"\n << t->type;\n }\n- for (T f : data) {\n+ for (const T f : data) {\n *v = f;\n ++v;\n }\n@@ -496,7 +496,7 @@\n static std::vector<string> GetKernelTags(\n const std::map<string, TfLiteRegistration*>& kernel_map) {\n std::vector<string> tags;\n- for (auto it : kernel_map) {\n+ for (const auto& it : kernel_map) {\n tags.push_back(it.first);\n }\n return tags;\n"} {"commit":"d40598ef970c54776e2bc9141fea56d5f6e8d3d0","subject":"Finish last Freedome to Move commit","message":"Finish last Freedome to Move commit\n","repos":"MarkZH\/Genetic_Chess,MarkZH\/Genetic_Chess,MarkZH\/Genetic_Chess,MarkZH\/Genetic_Chess,MarkZH\/Genetic_Chess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/Genes\/Freedom_To_Move_Gene.h\n+++ include\/Genes\/Freedom_To_Move_Gene.h\n@@ -20,7 +20,7 @@\n std::string name() const override;\n \n private:\n- size_t initial_number_of_moves;\n+ double initial_number_of_moves;\n \n double score_board(const Board& board) const override;\n };\n"} {"commit":"de01bad2f5dec2977143aa242e7eba71d11a4363","subject":"[PATCH] make ipc\/shm.c:shm_nopage() static","message":"[PATCH] make ipc\/shm.c:shm_nopage() static\n\nshm_nopage() can become static.\n\nSigned-off-by: Adrian Bunk <0b86548ef377da0031a3ff3f0c4e06f016e20105@stusta.de>\nAcked-by: Eric W. Biederman <8a741aa8cbd77ebc4a56ddb528ce9fd15d42f034@xmission.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ipc\/shm.c\n+++ ipc\/shm.c\n@@ -226,8 +226,8 @@\n \tmutex_unlock(&shm_ids(ns).mutex);\n }\n \n-struct page *shm_nopage(struct vm_area_struct *vma, unsigned long address,\n-\t\t\tint *type)\n+static struct page *shm_nopage(struct vm_area_struct *vma,\n+\t\t\t unsigned long address, int *type)\n {\n \tstruct file *file = vma->vm_file;\n \tstruct shm_file_data *sfd = shm_file_data(file);\n"} {"commit":"b2c9a879408aec382611b1d2a817b83b9a8b344a","subject":"root_squash: virFileOperation may fail with EPERM too","message":"root_squash: virFileOperation may fail with EPERM too\n\nOver root-squashing nfs, when virFileOperation() is called as uid==0,\nit may fail with EACCES, but also with EPERM, due to\nvirFileOperationNoFork()'s failed attemp to chown a writable file.\n\nqemudDomainSaveFlag() should expect this case, too.\n","repos":"fabianfreyer\/libvirt,shugaoye\/libvirt,fabianfreyer\/libvirt,rmarwaha\/libvirt,iam-TJ\/libvirt,warewolf\/libvirt,rbu\/libvirt,kantai\/libvirt-vfork,novel\/fbsd-libvirt,warewolf\/libvirt,olafhering\/libvirt,agx\/libvirt,olafhering\/libvirt,olafhering\/libvirt,warewolf\/libvirt,elmarco\/libvirt,jeckersb\/libvirt,VenkatDatta\/libvirt,rlaager\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,wiedi\/libvirt,rlaager\/libvirt,rlaager\/libvirt,jfehlig\/libvirt,emaste\/libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,libvirt\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,libvirt\/libvirt,leilihh\/libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt,taget\/libvirt,trainstack\/libvirt,emaste\/libvirt,iam-TJ\/libvirt,soulxu\/libvirt-xuhj,soulxu\/libvirt-xuhj,datto\/libvirt,libvirt\/libvirt,eskultety\/libvirt,foomango\/libvirt,VenkatDatta\/libvirt,emaste\/libvirt,jeckersb\/libvirt,trainstack\/libvirt,taget\/libvirt,dumbbell\/libvirt,novel\/fbsd-libvirt,shugaoye\/libvirt,iam-TJ\/libvirt,emaste\/libvirt,datto\/libvirt,jardasgit\/libvirt,kantai\/libvirt-vfork,jeckersb\/libvirt,rmarwaha\/libvirt,rbu\/libvirt,trainstack\/libvirt,elmarco\/libvirt,wiedi\/libvirt,rmarwaha\/libvirt,wiedi\/libvirt,danwent\/libvirt-ovs,nertpinx\/libvirt,crobinso\/libvirt,rlaager\/libvirt,shugaoye\/libvirt,warewolf\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,trainstack\/libvirt,bjzhang\/libvirt,rbu\/libvirt,datto\/libvirt,agx\/libvirt,crobinso\/libvirt,libvirt\/libvirt,wiedi\/libvirt,jeckersb\/libvirt,dumbbell\/libvirt,bjzhang\/libvirt,dumbbell\/libvirt,eskultety\/libvirt,emaste\/libvirt,leilihh\/libvirt,rmarwaha\/libvirt,bjzhang\/libvirt,novel\/fbsd-libvirt,eskultety\/libvirt,usc-isi\/libvirt,olafhering\/libvirt,agx\/libvirt,shugaoye\/libvirt,usc-isi\/libvirt,foomango\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,dumbbell\/libvirt,taget\/libvirt,jardasgit\/libvirt,warewolf\/libvirt,dumbbell\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,rmarwaha\/libvirt1,siboulet\/libvirt-openvz,siboulet\/libvirt-openvz,novel\/fbsd-libvirt,zhlcindy\/libvirt-1.1.4-maintain,sshah-solarflare\/Libvirt-PCI-passthrough-,emaste\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,danwent\/libvirt-ovs,foomango\/libvirt,usc-isi\/libvirt,wiedi\/libvirt,nertpinx\/libvirt,leilihh\/libvirt,jardasgit\/libvirt,rmarwaha\/libvirt1,danwent\/libvirt-ovs,trainstack\/libvirt,foomango\/libvirt,bjzhang\/libvirt,cbosdo\/libvirt,jfehlig\/libvirt,leilihh\/libvirt,iam-TJ\/libvirt,jeckersb\/libvirt,jfehlig\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,soulxu\/libvirt-xuhj,kantai\/libvirt-vfork,danwent\/libvirt-ovs,novel\/fbsd-libvirt,zippy2\/libvirt,rbu\/libvirt,novel\/fbsd-libvirt,warewolf\/libvirt,rbu\/libvirt,datto\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,siboulet\/libvirt-openvz,eskultety\/libvirt,trainstack\/libvirt,jardasgit\/libvirt,agx\/libvirt,kantai\/libvirt-vfork,usc-isi\/libvirt,elmarco\/libvirt,iam-TJ\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,cbosdo\/libvirt,iam-TJ\/libvirt,warewolf\/libvirt,foomango\/libvirt,elmarco\/libvirt,danwent\/libvirt-ovs,siboulet\/libvirt-openvz,eskultety\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,nertpinx\/libvirt,shugaoye\/libvirt,rmarwaha\/libvirt1,dumbbell\/libvirt,siboulet\/libvirt-openvz,agx\/libvirt,kantai\/libvirt-vfork,rmarwaha\/libvirt1,sshah-solarflare\/Libvirt-PCI-passthrough-,usc-isi\/libvirt,rmarwaha\/libvirt,leilihh\/libvirt,cbosdo\/libvirt,novel\/fbsd-libvirt,wiedi\/libvirt,jeckersb\/libvirt,cbosdo\/libvirt,rmarwaha\/libvirt1,emaste\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,taget\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,bjzhang\/libvirt,leilihh\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,nertpinx\/libvirt,fabianfreyer\/libvirt,trainstack\/libvirt,elmarco\/libvirt,iam-TJ\/libvirt,VenkatDatta\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,datto\/libvirt,rmarwaha\/libvirt1,soulxu\/libvirt-xuhj,jeckersb\/libvirt,cbosdo\/libvirt,wiedi\/libvirt,novel\/fbsd-libvirt,soulxu\/libvirt-xuhj","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_driver.c\n+++ src\/qemu\/qemu_driver.c\n@@ -5402,13 +5402,13 @@\n qemudDomainSaveFileOpHook, &hdata,\n 0)) < 0) {\n \/* If we failed as root, and the error was permission-denied\n- (EACCES), assume it's on a network-connected share where\n- root access is restricted (eg, root-squashed NFS). If the\n+ (EACCES or EPERM), assume it's on a network-connected share\n+ where root access is restricted (eg, root-squashed NFS). If the\n qemu user (driver->user) is non-root, just set a flag to\n bypass security driver shenanigans, and retry the operation\n after doing setuid to qemu user *\/\n \n- if ((rc != -EACCES) ||\n+ if (((rc != -EACCES) && (rc != -EPERM)) ||\n driver->user == getuid()) {\n virReportSystemError(-rc, _(\"Failed to create domain save file '%s'\"),\n path);\n"} {"commit":"65d111570131c72470868322680a0f7e28da643f","subject":"Address override warnings","message":"Address override warnings\n","repos":"Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/megaapi_impl.h\n+++ include\/megaapi_impl.h\n@@ -233,17 +233,17 @@\n void abortCurrent();\n \n \/\/ MegaBackup interface\n- MegaBackup *copy();\n- const char *getLocalFolder() const;\n- MegaHandle getMegaHandle() const;\n- int getTag() const;\n- int64_t getPeriod() const;\n- const char *getPeriodString() const;\n- int getMaxBackups() const;\n- int getState() const;\n- long long getNextStartTime(long long oldStartTimeAbsolute = -1) const;\n- bool getAttendPastBackups() const;\n- MegaTransferList *getFailedTransfers();\n+ MegaBackup *copy() override;\n+ const char *getLocalFolder() const override;\n+ MegaHandle getMegaHandle() const override;\n+ int getTag() const override;\n+ int64_t getPeriod() const override;\n+ const char *getPeriodString() const override;\n+ int getMaxBackups() const override;\n+ int getState() const override;\n+ long long getNextStartTime(long long oldStartTimeAbsolute = -1) const override;\n+ bool getAttendPastBackups() const override;\n+ MegaTransferList *getFailedTransfers() override;\n \n \n \/\/ MegaBackup setters\n@@ -336,23 +336,23 @@\n void onTransferTemporaryError(MegaApi *, MegaTransfer *t, MegaError* e) override;\n void onTransferFinish(MegaApi* api, MegaTransfer *transfer, MegaError *e) override;\n \n- long long getNumberFolders() const;\n+ long long getNumberFolders() const override;\n void setNumberFolders(long long value);\n- long long getNumberFiles() const;\n+ long long getNumberFiles() const override;\n void setNumberFiles(long long value);\n- long long getMeanSpeed() const;\n+ long long getMeanSpeed() const override;\n void setMeanSpeed(long long value);\n- long long getSpeed() const;\n+ long long getSpeed() const override;\n void setSpeed(long long value);\n- long long getTotalBytes() const;\n+ long long getTotalBytes() const override;\n void setTotalBytes(long long value);\n- long long getTransferredBytes() const;\n+ long long getTransferredBytes() const override;\n void setTransferredBytes(long long value);\n- int64_t getUpdateTime() const;\n+ int64_t getUpdateTime() const override;\n void setUpdateTime(const int64_t &value);\n- int64_t getCurrentBKStartTime() const;\n+ int64_t getCurrentBKStartTime() const override;\n void setCurrentBKStartTime(const int64_t &value);\n- long long getTotalFiles() const;\n+ long long getTotalFiles() const override;\n void setTotalFiles(long long value);\n MegaBackupListener *getBackupListener() const;\n void setBackupListener(MegaBackupListener *value);\n"} {"commit":"fadc0dbba9313f38cfe02fb3df4eb647475098f7","subject":"Guards","message":"Guards\n\nCreated \"Guards\" folder and the Input Guard.\nA guard receives an event and uses it's information to react.\n","repos":"Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE,Degryll\/ZBE","returncode":1,"stderr":"error: pathspec 'include\/ZBE\/core\/guards\/InputGuard.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- include\/ZBE\/core\/guards\/InputGuard.h\n+++ include\/ZBE\/core\/guards\/InputGuard.h\n@@ -0,0 +1,30 @@\n+\/**\n+ * Copyright 2015 Batis Degryll Ludo\n+ * @file InputGuard.h\n+ * @since 2016-08-21\n+ * @date 2016-08-21\n+ * @author Batis\n+ * @brief Receives a keyboard event and reacts to that.\n+ *\/\n+\n+#include \"ZBE\/core\/events\/InputEvent.h\"\n+#ifndef CORE_GUARDS_INPUTGUARD_H\n+#define CORE_GUARDS_INPUTGUARD_H\n+\n+namespace zbe {\n+ \/** \\brief Receives a keyboard event and reacts to that.\n+ *\/\n+ class InputGuard {\n+ public:\n+\n+ \/** \\brief Do the Guard job.\n+ *\/\n+ virtual void run(InputEvent* e) = 0;\n+\n+ \/** \\brief Destructor.\n+ *\/\n+ virtual ~InputGuard(){};\n+ };\n+}\n+\n+#endif \/\/ CORE_GUARDS_INPUTGUARD_H\n"} {"commit":"65daebb7d8605796dea55026cd6831c825257376","subject":"This file never needed to see what is in the internal struct resource, all it needed was a call to rman_get_start().","message":"This file never needed to see what is in the internal struct resource,\nall it needed was a call to rman_get_start().\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/alpha\/isa\/isa.c\n+++ sys\/alpha\/isa\/isa.c\n@@ -27,7 +27,6 @@\n #include <sys\/cdefs.h>\n __FBSDID(\"$FreeBSD$\");\n \n-#define __RMAN_RESOURCE_VISIBLE\n #include <sys\/param.h>\n #include <sys\/systm.h>\n #include <sys\/kernel.h>\n@@ -359,28 +358,28 @@\n \t\treturn ENOMEM;\n \tii->intr = intr;\n \tii->arg = arg;\n-\tii->irq = irq->r_start;\n+\tii->irq = rman_get_start(irq);\n \n \terror = alpha_setup_intr(\n \t\t\t device_get_nameunit(child ? child : dev),\n-\t\t\t 0x800 + (irq->r_start << 4), \n+\t\t\t 0x800 + (ii->irq << 4), \n \t\t\t ((flags & INTR_FAST) ? isa_handle_fast_intr :\n \t\t\t isa_handle_intr), ii, flags, &ii->ih,\n-\t\t\t &intrcnt[INTRCNT_ISA_IRQ + irq->r_start],\n+\t\t\t &intrcnt[INTRCNT_ISA_IRQ + ii->irq],\n \t\t\t isa_disable_intr, isa_enable_intr);\n \tif (error) {\n \t\tfree(ii, M_DEVBUF);\n \t\treturn error;\n \t}\n \tmtx_lock_spin(&icu_lock);\n-\tisa_intr_enable(irq->r_start);\n+\tisa_intr_enable(ii->irq);\n \tmtx_unlock_spin(&icu_lock);\n \n \t*cookiep = ii;\n \n \tif (child)\n \t\tdevice_printf(child, \"interrupting at ISA irq %d\\n\",\n-\t\t\t (int)irq->r_start);\n+\t\t\t (int)ii->irq);\n \n \treturn 0;\n }\n@@ -406,11 +405,10 @@\n \n \tif (num_handlers == 1) {\n \t\tmtx_lock_spin(&icu_lock);\n-\t\tisa_intr_disable(irq->r_start);\n+\t\tisa_intr_disable(ii->irq);\n \t\tmtx_unlock_spin(&icu_lock);\n \t\tif (platform.isa_teardown_intr) {\n-\t\t\tplatform.isa_teardown_intr(dev, child, irq, \n-\t\t\t\t\t\t cookie);\t\n+\t\t\tplatform.isa_teardown_intr(dev, child, irq, cookie);\t\n \t\t\treturn 0;\n \t\t}\n \n"} {"commit":"5e9a39d6ad6eee207a7af88bb1bbe1deefb8bbb2","subject":"Reflow comments; NFC","message":"Reflow comments; NFC\n\nPiperOrigin-RevId: 200783258\n","repos":"ghchinoy\/tensorflow,AnishShah\/tensorflow,gautam1858\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,apark263\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,ppwwyyxx\/tensorflow,tensorflow\/tensorflow,jendap\/tensorflow,jalexvig\/tensorflow,xodus7\/tensorflow,jbedorf\/tensorflow,davidzchen\/tensorflow,hehongliang\/tensorflow,kevin-coder\/tensorflow-fork,aldian\/tensorflow,dancingdan\/tensorflow,alshedivat\/tensorflow,apark263\/tensorflow,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,jhseu\/tensorflow,karllessard\/tensorflow,ghchinoy\/tensorflow,asimshankar\/tensorflow,Intel-tensorflow\/tensorflow,davidzchen\/tensorflow,AnishShah\/tensorflow,chemelnucfin\/tensorflow,jbedorf\/tensorflow,dongjoon-hyun\/tensorflow,ZhangXinNan\/tensorflow,davidzchen\/tensorflow,frreiss\/tensorflow-fred,theflofly\/tensorflow,xzturn\/tensorflow,jhseu\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,xodus7\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,jart\/tensorflow,DavidNorman\/tensorflow,asimshankar\/tensorflow,ageron\/tensorflow,benoitsteiner\/tensorflow-xsmm,meteorcloudy\/tensorflow,Bismarrck\/tensorflow,davidzchen\/tensorflow,Intel-Corporation\/tensorflow,brchiu\/tensorflow,davidzchen\/tensorflow,ZhangXinNan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,frreiss\/tensorflow-fred,DavidNorman\/tensorflow,brchiu\/tensorflow,ageron\/tensorflow,manipopopo\/tensorflow,renyi533\/tensorflow,alshedivat\/tensorflow,brchiu\/tensorflow,petewarden\/tensorflow,jart\/tensorflow,girving\/tensorflow,xodus7\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,hfp\/tensorflow-xsmm,snnn\/tensorflow,davidzchen\/tensorflow,gunan\/tensorflow,annarev\/tensorflow,kevin-coder\/tensorflow-fork,aselle\/tensorflow,kobejean\/tensorflow,snnn\/tensorflow,theflofly\/tensorflow,xodus7\/tensorflow,alsrgv\/tensorflow,ppwwyyxx\/tensorflow,gojira\/tensorflow,manipopopo\/tensorflow,lukeiwanski\/tensorflow,Bismarrck\/tensorflow,theflofly\/tensorflow,dongjoon-hyun\/tensorflow,xodus7\/tensorflow,Intel-Corporation\/tensorflow,gojira\/tensorflow,gojira\/tensorflow,freedomtan\/tensorflow,drpngx\/tensorflow,gautam1858\/tensorflow,frreiss\/tensorflow-fred,dancingdan\/tensorflow,aam-at\/tensorflow,jbedorf\/tensorflow,aldian\/tensorflow,xzturn\/tensorflow,girving\/tensorflow,manipopopo\/tensorflow,alshedivat\/tensorflow,girving\/tensorflow,dancingdan\/tensorflow,gautam1858\/tensorflow,jbedorf\/tensorflow,renyi533\/tensorflow,kevin-coder\/tensorflow-fork,Intel-tensorflow\/tensorflow,dongjoon-hyun\/tensorflow,gunan\/tensorflow,ppwwyyxx\/tensorflow,frreiss\/tensorflow-fred,chemelnucfin\/tensorflow,Intel-tensorflow\/tensorflow,ZhangXinNan\/tensorflow,davidzchen\/tensorflow,apark263\/tensorflow,ageron\/tensorflow,hfp\/tensorflow-xsmm,aam-at\/tensorflow,annarev\/tensorflow,jbedorf\/tensorflow,brchiu\/tensorflow,AnishShah\/tensorflow,apark263\/tensorflow,ZhangXinNan\/tensorflow,Bismarrck\/tensorflow,petewarden\/tensorflow,jhseu\/tensorflow,gunan\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,AnishShah\/tensorflow,jart\/tensorflow,xzturn\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,Bismarrck\/tensorflow,chemelnucfin\/tensorflow,theflofly\/tensorflow,paolodedios\/tensorflow,adit-chandra\/tensorflow,brchiu\/tensorflow,snnn\/tensorflow,arborh\/tensorflow,caisq\/tensorflow,gojira\/tensorflow,apark263\/tensorflow,girving\/tensorflow,alsrgv\/tensorflow,chemelnucfin\/tensorflow,drpngx\/tensorflow,paolodedios\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,ghchinoy\/tensorflow,alshedivat\/tensorflow,brchiu\/tensorflow,Bismarrck\/tensorflow,girving\/tensorflow,tensorflow\/tensorflow,jendap\/tensorflow,seanli9jan\/tensorflow,alsrgv\/tensorflow,kobejean\/tensorflow,gautam1858\/tensorflow,gautam1858\/tensorflow,karllessard\/tensorflow,Intel-tensorflow\/tensorflow,manipopopo\/tensorflow,tensorflow\/tensorflow,aselle\/tensorflow,jhseu\/tensorflow,adit-chandra\/tensorflow,gunan\/tensorflow,freedomtan\/tensorflow,dancingdan\/tensorflow,manipopopo\/tensorflow,jbedorf\/tensorflow,kobejean\/tensorflow,renyi533\/tensorflow,apark263\/tensorflow,lukeiwanski\/tensorflow,chemelnucfin\/tensorflow,lukeiwanski\/tensorflow,jendap\/tensorflow,cxxgtxy\/tensorflow,manipopopo\/tensorflow,kevin-coder\/tensorflow-fork,tensorflow\/tensorflow-pywrap_saved_model,jart\/tensorflow,aselle\/tensorflow,chemelnucfin\/tensorflow,gunan\/tensorflow,brchiu\/tensorflow,xzturn\/tensorflow,gautam1858\/tensorflow,jhseu\/tensorflow,davidzchen\/tensorflow,benoitsteiner\/tensorflow-xsmm,renyi533\/tensorflow,ppwwyyxx\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,alshedivat\/tensorflow,frreiss\/tensorflow-fred,benoitsteiner\/tensorflow-xsmm,gojira\/tensorflow,Intel-Corporation\/tensorflow,ghchinoy\/tensorflow,gojira\/tensorflow,dongjoon-hyun\/tensorflow,caisq\/tensorflow,yongtang\/tensorflow,xzturn\/tensorflow,aldian\/tensorflow,karllessard\/tensorflow,yongtang\/tensorflow,jhseu\/tensorflow,brchiu\/tensorflow,caisq\/tensorflow,ageron\/tensorflow,karllessard\/tensorflow,gunan\/tensorflow,ZhangXinNan\/tensorflow,aselle\/tensorflow,drpngx\/tensorflow,ageron\/tensorflow,asimshankar\/tensorflow,jhseu\/tensorflow,caisq\/tensorflow,aam-at\/tensorflow,manipopopo\/tensorflow,annarev\/tensorflow,asimshankar\/tensorflow,frreiss\/tensorflow-fred,meteorcloudy\/tensorflow,ghchinoy\/tensorflow,manipopopo\/tensorflow,AnishShah\/tensorflow,gojira\/tensorflow,asimshankar\/tensorflow,freedomtan\/tensorflow,jalexvig\/tensorflow,ppwwyyxx\/tensorflow,caisq\/tensorflow,jalexvig\/tensorflow,jbedorf\/tensorflow,yongtang\/tensorflow,yongtang\/tensorflow,petewarden\/tensorflow,jalexvig\/tensorflow,hehongliang\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,dongjoon-hyun\/tensorflow,theflofly\/tensorflow,apark263\/tensorflow,petewarden\/tensorflow,hehongliang\/tensorflow,xzturn\/tensorflow,alsrgv\/tensorflow,gojira\/tensorflow,Intel-Corporation\/tensorflow,sarvex\/tensorflow,ageron\/tensorflow,alshedivat\/tensorflow,frreiss\/tensorflow-fred,ppwwyyxx\/tensorflow,freedomtan\/tensorflow,meteorcloudy\/tensorflow,xzturn\/tensorflow,theflofly\/tensorflow,lukeiwanski\/tensorflow,snnn\/tensorflow,seanli9jan\/tensorflow,paolodedios\/tensorflow,cxxgtxy\/tensorflow,alsrgv\/tensorflow,ghchinoy\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,paolodedios\/tensorflow,jhseu\/tensorflow,ZhangXinNan\/tensorflow,benoitsteiner\/tensorflow-xsmm,drpngx\/tensorflow,jendap\/tensorflow,arborh\/tensorflow,davidzchen\/tensorflow,dancingdan\/tensorflow,gautam1858\/tensorflow,annarev\/tensorflow,seanli9jan\/tensorflow,ageron\/tensorflow,jalexvig\/tensorflow,renyi533\/tensorflow,renyi533\/tensorflow,gunan\/tensorflow,paolodedios\/tensorflow,Intel-tensorflow\/tensorflow,benoitsteiner\/tensorflow-xsmm,ageron\/tensorflow,hfp\/tensorflow-xsmm,sarvex\/tensorflow,kevin-coder\/tensorflow-fork,xodus7\/tensorflow,gunan\/tensorflow,ghchinoy\/tensorflow,jbedorf\/tensorflow,jendap\/tensorflow,yongtang\/tensorflow,aselle\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,DavidNorman\/tensorflow,ZhangXinNan\/tensorflow,hfp\/tensorflow-xsmm,karllessard\/tensorflow,meteorcloudy\/tensorflow,arborh\/tensorflow,adit-chandra\/tensorflow,AnishShah\/tensorflow,freedomtan\/tensorflow,hfp\/tensorflow-xsmm,tensorflow\/tensorflow-experimental_link_static_libraries_once,hfp\/tensorflow-xsmm,aam-at\/tensorflow,frreiss\/tensorflow-fred,brchiu\/tensorflow,gautam1858\/tensorflow,cxxgtxy\/tensorflow,aselle\/tensorflow,sarvex\/tensorflow,adit-chandra\/tensorflow,manipopopo\/tensorflow,frreiss\/tensorflow-fred,snnn\/tensorflow,kevin-coder\/tensorflow-fork,petewarden\/tensorflow,yongtang\/tensorflow,aldian\/tensorflow,xodus7\/tensorflow,kevin-coder\/tensorflow-fork,jendap\/tensorflow,Bismarrck\/tensorflow,jalexvig\/tensorflow,ppwwyyxx\/tensorflow,freedomtan\/tensorflow,alshedivat\/tensorflow,xodus7\/tensorflow,seanli9jan\/tensorflow,brchiu\/tensorflow,alsrgv\/tensorflow,ghchinoy\/tensorflow,dongjoon-hyun\/tensorflow,paolodedios\/tensorflow,dancingdan\/tensorflow,lukeiwanski\/tensorflow,AnishShah\/tensorflow,Bismarrck\/tensorflow,AnishShah\/tensorflow,jendap\/tensorflow,AnishShah\/tensorflow,apark263\/tensorflow,meteorcloudy\/tensorflow,gautam1858\/tensorflow,drpngx\/tensorflow,adit-chandra\/tensorflow,yongtang\/tensorflow,jalexvig\/tensorflow,girving\/tensorflow,annarev\/tensorflow,girving\/tensorflow,karllessard\/tensorflow,jhseu\/tensorflow,Intel-Corporation\/tensorflow,aselle\/tensorflow,meteorcloudy\/tensorflow,ZhangXinNan\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,cxxgtxy\/tensorflow,alshedivat\/tensorflow,theflofly\/tensorflow,kobejean\/tensorflow,aam-at\/tensorflow,jendap\/tensorflow,ppwwyyxx\/tensorflow,benoitsteiner\/tensorflow-xsmm,jalexvig\/tensorflow,ppwwyyxx\/tensorflow,brchiu\/tensorflow,benoitsteiner\/tensorflow-xsmm,paolodedios\/tensorflow,petewarden\/tensorflow,dancingdan\/tensorflow,lukeiwanski\/tensorflow,manipopopo\/tensorflow,jart\/tensorflow,jbedorf\/tensorflow,gautam1858\/tensorflow,frreiss\/tensorflow-fred,girving\/tensorflow,jart\/tensorflow,lukeiwanski\/tensorflow,jendap\/tensorflow,jhseu\/tensorflow,Intel-Corporation\/tensorflow,gunan\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,DavidNorman\/tensorflow,cxxgtxy\/tensorflow,hehongliang\/tensorflow,chemelnucfin\/tensorflow,karllessard\/tensorflow,chemelnucfin\/tensorflow,sarvex\/tensorflow,Intel-tensorflow\/tensorflow,sarvex\/tensorflow,annarev\/tensorflow,asimshankar\/tensorflow,dancingdan\/tensorflow,karllessard\/tensorflow,benoitsteiner\/tensorflow-xsmm,aselle\/tensorflow,xzturn\/tensorflow,meteorcloudy\/tensorflow,asimshankar\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,tensorflow\/tensorflow-experimental_link_static_libraries_once,snnn\/tensorflow,arborh\/tensorflow,kevin-coder\/tensorflow-fork,xzturn\/tensorflow,yongtang\/tensorflow,chemelnucfin\/tensorflow,jhseu\/tensorflow,drpngx\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow,jart\/tensorflow,alsrgv\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,annarev\/tensorflow,xodus7\/tensorflow,sarvex\/tensorflow,Intel-Corporation\/tensorflow,frreiss\/tensorflow-fred,girving\/tensorflow,adit-chandra\/tensorflow,theflofly\/tensorflow,aldian\/tensorflow,snnn\/tensorflow,alsrgv\/tensorflow,girving\/tensorflow,dancingdan\/tensorflow,theflofly\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow,kobejean\/tensorflow,drpngx\/tensorflow,asimshankar\/tensorflow,seanli9jan\/tensorflow,cxxgtxy\/tensorflow,hfp\/tensorflow-xsmm,dongjoon-hyun\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,asimshankar\/tensorflow,alsrgv\/tensorflow,ghchinoy\/tensorflow,ageron\/tensorflow,jbedorf\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,aselle\/tensorflow,DavidNorman\/tensorflow,ghchinoy\/tensorflow,arborh\/tensorflow,gojira\/tensorflow,tensorflow\/tensorflow,petewarden\/tensorflow,ZhangXinNan\/tensorflow,aam-at\/tensorflow,apark263\/tensorflow,cxxgtxy\/tensorflow,hfp\/tensorflow-xsmm,davidzchen\/tensorflow,karllessard\/tensorflow,chemelnucfin\/tensorflow,xodus7\/tensorflow,alsrgv\/tensorflow,xodus7\/tensorflow,petewarden\/tensorflow,caisq\/tensorflow,lukeiwanski\/tensorflow,adit-chandra\/tensorflow,adit-chandra\/tensorflow,jbedorf\/tensorflow,kevin-coder\/tensorflow-fork,hehongliang\/tensorflow,davidzchen\/tensorflow,seanli9jan\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,renyi533\/tensorflow,Intel-tensorflow\/tensorflow,lukeiwanski\/tensorflow,xzturn\/tensorflow,gunan\/tensorflow,freedomtan\/tensorflow,jendap\/tensorflow,hfp\/tensorflow-xsmm,hehongliang\/tensorflow,yongtang\/tensorflow,manipopopo\/tensorflow,asimshankar\/tensorflow,cxxgtxy\/tensorflow,snnn\/tensorflow,snnn\/tensorflow,caisq\/tensorflow,Intel-Corporation\/tensorflow,DavidNorman\/tensorflow,girving\/tensorflow,adit-chandra\/tensorflow,AnishShah\/tensorflow,xzturn\/tensorflow,chemelnucfin\/tensorflow,dongjoon-hyun\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow,gunan\/tensorflow,alsrgv\/tensorflow,jhseu\/tensorflow,paolodedios\/tensorflow,xzturn\/tensorflow,kobejean\/tensorflow,freedomtan\/tensorflow,DavidNorman\/tensorflow,dongjoon-hyun\/tensorflow,tensorflow\/tensorflow,arborh\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,freedomtan\/tensorflow,jart\/tensorflow,seanli9jan\/tensorflow,ghchinoy\/tensorflow,dongjoon-hyun\/tensorflow,gojira\/tensorflow,karllessard\/tensorflow,arborh\/tensorflow,renyi533\/tensorflow,jart\/tensorflow,dancingdan\/tensorflow,renyi533\/tensorflow,DavidNorman\/tensorflow,kevin-coder\/tensorflow-fork,arborh\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,Bismarrck\/tensorflow,jalexvig\/tensorflow,DavidNorman\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,ppwwyyxx\/tensorflow,sarvex\/tensorflow,meteorcloudy\/tensorflow,alshedivat\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,annarev\/tensorflow,seanli9jan\/tensorflow,Intel-tensorflow\/tensorflow,theflofly\/tensorflow,petewarden\/tensorflow,Intel-tensorflow\/tensorflow,aam-at\/tensorflow,kobejean\/tensorflow,ZhangXinNan\/tensorflow,alshedivat\/tensorflow,Bismarrck\/tensorflow,theflofly\/tensorflow,DavidNorman\/tensorflow,hfp\/tensorflow-xsmm,jart\/tensorflow,caisq\/tensorflow,aselle\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow-pywrap_tf_optimizer,Intel-tensorflow\/tensorflow,Bismarrck\/tensorflow,arborh\/tensorflow,asimshankar\/tensorflow,hfp\/tensorflow-xsmm,ppwwyyxx\/tensorflow,tensorflow\/tensorflow,Bismarrck\/tensorflow,aam-at\/tensorflow,theflofly\/tensorflow,ghchinoy\/tensorflow,aldian\/tensorflow,adit-chandra\/tensorflow,aldian\/tensorflow,arborh\/tensorflow,alshedivat\/tensorflow,benoitsteiner\/tensorflow-xsmm,jalexvig\/tensorflow,kobejean\/tensorflow,jalexvig\/tensorflow,renyi533\/tensorflow,paolodedios\/tensorflow,drpngx\/tensorflow,dongjoon-hyun\/tensorflow,ppwwyyxx\/tensorflow,lukeiwanski\/tensorflow,drpngx\/tensorflow,annarev\/tensorflow,arborh\/tensorflow,yongtang\/tensorflow,jbedorf\/tensorflow,ageron\/tensorflow,gunan\/tensorflow,AnishShah\/tensorflow,renyi533\/tensorflow,annarev\/tensorflow,kobejean\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-experimental_link_static_libraries_once,aselle\/tensorflow,ageron\/tensorflow,gautam1858\/tensorflow,kevin-coder\/tensorflow-fork,sarvex\/tensorflow,caisq\/tensorflow,drpngx\/tensorflow,snnn\/tensorflow,DavidNorman\/tensorflow,apark263\/tensorflow,seanli9jan\/tensorflow,renyi533\/tensorflow,aam-at\/tensorflow,apark263\/tensorflow,DavidNorman\/tensorflow,petewarden\/tensorflow,ageron\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,meteorcloudy\/tensorflow,aldian\/tensorflow,dancingdan\/tensorflow,seanli9jan\/tensorflow,davidzchen\/tensorflow,meteorcloudy\/tensorflow,gojira\/tensorflow,kobejean\/tensorflow,freedomtan\/tensorflow,adit-chandra\/tensorflow,petewarden\/tensorflow,freedomtan\/tensorflow,gautam1858\/tensorflow,seanli9jan\/tensorflow,tensorflow\/tensorflow,alsrgv\/tensorflow,hehongliang\/tensorflow,ZhangXinNan\/tensorflow,benoitsteiner\/tensorflow-xsmm,caisq\/tensorflow,jendap\/tensorflow,chemelnucfin\/tensorflow,snnn\/tensorflow,benoitsteiner\/tensorflow-xsmm,adit-chandra\/tensorflow,annarev\/tensorflow,arborh\/tensorflow,kobejean\/tensorflow","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tensorflow\/stream_executor\/stream.h\n+++ tensorflow\/stream_executor\/stream.h\n@@ -156,14 +156,13 @@\n const TypedKernel<Params...> &kernel, Args... args);\n \n \/\/ Record a \"start\" event for the interval timer at this point in the\n- \/\/ stream's\n- \/\/ execution (relative to the previously and subsequently enqueued items in\n- \/\/ the stream's execution). Streams may be started\/stopped multiple times.\n+ \/\/ stream's execution (relative to the previously and subsequently enqueued\n+ \/\/ items in the stream's execution). Streams may be started\/stopped multiple\n+ \/\/ times.\n Stream &ThenStartTimer(Timer *t);\n \n \/\/ Record a \"stop\" event for the interval timer at this point in the\n- \/\/ stream's\n- \/\/ execution. See also Stream::ThenStartTimer.\n+ \/\/ stream's execution. See also Stream::ThenStartTimer.\n Stream &ThenStopTimer(Timer *t);\n \n \/\/ TODO(leary) If work is added to the stream that is being depended upon,\n@@ -179,8 +178,7 @@\n \/\/\n \/\/ Checks that a stream does not wait for itself, and it is up to the\n \/\/ user to guarantee that a stream does not come to wait on itself in a\n- \/\/ cyclic\n- \/\/ manner; in that case, behavior is undefined.\n+ \/\/ cyclic manner; in that case, behavior is undefined.\n \/\/\n \/\/ N.B. Base recursion case for the variadic ThenWaitFor.\n Stream &ThenWaitFor(Stream *other);\n"} {"commit":"0a1c5ed7e9544b3acb0ae354e9c52eec58119924","subject":"isl_aff.c: move isl_multi_pw_aff_is_cst definition down","message":"isl_aff.c: move isl_multi_pw_aff_is_cst definition down\n\nThis will make it easier to extract isl_multi_*_every\nin the next commit.\n\nSigned-off-by: Sven Verdoolaege <dd860110a62b19214c4ee03aec0abffecb4e86b8@cerebras.net>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_aff.c\n+++ isl_aff.c\n@@ -3319,24 +3319,6 @@\n \n \tfor (i = 0; i < pwaff->n; ++i) {\n \t\tisl_bool is_cst = isl_aff_is_cst(pwaff->p[i].aff);\n-\t\tif (is_cst < 0 || !is_cst)\n-\t\t\treturn is_cst;\n-\t}\n-\n-\treturn isl_bool_true;\n-}\n-\n-\/* Are all elements of \"mpa\" piecewise constants?\n- *\/\n-isl_bool isl_multi_pw_aff_is_cst(__isl_keep isl_multi_pw_aff *mpa)\n-{\n-\tint i;\n-\n-\tif (!mpa)\n-\t\treturn isl_bool_error;\n-\n-\tfor (i = 0; i < mpa->n; ++i) {\n-\t\tisl_bool is_cst = isl_pw_aff_is_cst(mpa->u.p[i]);\n \t\tif (is_cst < 0 || !is_cst)\n \t\t\treturn is_cst;\n \t}\n@@ -6281,6 +6263,24 @@\n #include <isl_multi_tuple_id_templ.c>\n #include <isl_multi_zero_templ.c>\n \n+\/* Are all elements of \"mpa\" piecewise constants?\n+ *\/\n+isl_bool isl_multi_pw_aff_is_cst(__isl_keep isl_multi_pw_aff *mpa)\n+{\n+\tint i;\n+\n+\tif (!mpa)\n+\t\treturn isl_bool_error;\n+\n+\tfor (i = 0; i < mpa->n; ++i) {\n+\t\tisl_bool is_cst = isl_pw_aff_is_cst(mpa->u.p[i]);\n+\t\tif (is_cst < 0 || !is_cst)\n+\t\t\treturn is_cst;\n+\t}\n+\n+\treturn isl_bool_true;\n+}\n+\n \/* Does \"mpa\" have a non-trivial explicit domain?\n *\n * The explicit domain, if present, is trivial if it represents\n"} {"commit":"77284b6242e0fa9a7433d4b28c2f8f1d3c2ec854","subject":"Print an array index that is computed as ptrdiff_t with %tu.","message":"Print an array index that is computed as ptrdiff_t with %tu.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/en\/midway.c\n+++ sys\/dev\/en\/midway.c\n@@ -1220,8 +1220,8 @@\n \tslot->vcc = vc;\n \n \tKASSERT (_IF_QLEN(&slot->indma) == 0 && _IF_QLEN(&slot->q) == 0,\n-\t (\"en_rxctl: left over mbufs on enable slot=%ld\",\n-\t (long)(vc->rxslot - sc->rxslot)));\n+\t (\"en_rxctl: left over mbufs on enable slot=%tu\",\n+\t vc->rxslot - sc->rxslot));\n \n \tvc->txspeed = 0;\n \tvc->txslot = sc->txslot;\n"} {"commit":"f30147af91caa84c3c40dcf59c5fc6bd203d439a","subject":"fixing template issues in relation to std::min\/max","message":"fixing template issues in relation to std::min\/max\n","repos":"blefaudeux\/CppNumericalSolvers,blefaudeux\/CppNumericalSolvers,blefaudeux\/CppNumericalSolvers,blefaudeux\/CppNumericalSolvers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cns\/linesearch\/morethuente.h\n+++ include\/cns\/linesearch\/morethuente.h\n@@ -227,7 +227,7 @@\n bound = 1;\n Dtype theta = 3 * (fx - fp) \/ (stp - stx) + dx + dp;\n Dtype s = std::max(theta, std::max( dx, dp));\n- Dtype gamma = s * sqrt(std::max(0., (theta \/ s) * (theta \/ s) - (dx \/ s) * (dp \/ s)));\n+ Dtype gamma = s * sqrt(std::max(Dtype(0.), (theta \/ s) * (theta \/ s) - (dx \/ s) * (dp \/ s)));\n if (stp > stx)\n gamma = -gamma;\n Dtype p = (gamma - dp) + theta;\n@@ -299,9 +299,9 @@\n \n if (brackt & bound) {\n if (sty > stx) {\n- stp = std::min(stx + 0.66 * (sty - stx), stp);\n- } else {\n- stp = std::max(stx + 0.66 * (sty - stx), stp);\n+ stp = std::min( Dtype(stx + 0.66 * (sty - stx)), stp);\n+ } else {\n+ stp = std::max( Dtype(stx + 0.66 * (sty - stx)), stp);\n }\n }\n \n"} {"commit":"9d3a5932dc8877c7f2e09d9df8ce908b1202ec2c","subject":"isl_ast.c: fix typo in comment","message":"isl_ast.c: fix typo in comment\n\nSigned-off-by: Sven Verdoolaege <dd860110a62b19214c4ee03aec0abffecb4e86b8@cerebras.net>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_ast.c\n+++ isl_ast.c\n@@ -105,7 +105,7 @@\n \n \/* Set the print_user callback of \"options\" to \"print_user\".\n *\n- * If this callback is set, then it used to print user nodes in the AST.\n+ * If this callback is set, then it is used to print user nodes in the AST.\n * Otherwise, the expression associated to the user node is printed.\n *\/\n __isl_give isl_ast_print_options *isl_ast_print_options_set_print_user(\n"} {"commit":"bdfbe804c2303cb4b178bb4b5c3e855892472033","subject":"wireless: fix fatal kernel-doc error + warning in mac80211.h","message":"wireless: fix fatal kernel-doc error + warning in mac80211.h\n\nFix new kernel-doc Error and Warning in <net\/mac80211.h>:\n\n Error(linux-2.6.39-git5\/include\/net\/mac80211.h:550): cannot understand prototype: 'struct ieee80211_sched_scan_ies '\n Warning(linux-2.6.39-git5\/include\/net\/mac80211.h:2289): No description found for parameter 'sta'\n\nSigned-off-by: Randy Dunlap <e1d10faa7e2a0c027bf1ff1d20e7fd10154be7ea@oracle.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/net\/mac80211.h\n+++ include\/net\/mac80211.h\n@@ -538,7 +538,7 @@\n };\n \n \/**\n- * ieee80211_sched_scan_ies - scheduled scan IEs\n+ * struct ieee80211_sched_scan_ies - scheduled scan IEs\n *\n * This structure is used to pass the appropriate IEs to be used in scheduled\n * scans for all bands. It contains both the IEs passed from the userspace\n@@ -2278,6 +2278,7 @@\n \n \/**\n * ieee80211_sta_set_tim - set the TIM bit for a sleeping station\n+ * @sta: &struct ieee80211_sta pointer for the sleeping station\n *\n * If a driver buffers frames for a powersave station instead of passing\n * them back to mac80211 for retransmission, the station needs to be told\n"} {"commit":"08b00aca9e269d2ad577b8847f9536347ec40d0d","subject":"Move a function to a different place in the source so that we match NetBSD.","message":"Move a function to a different place in the source so that we match\nNetBSD.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/usb\/usbdi.c\n+++ sys\/dev\/usb\/usbdi.c\n@@ -1,4 +1,4 @@\n-\/*\t$NetBSD: usbdi.c,v 1.88 2001\/11\/22 04:31:01 augustss Exp $\t*\/\n+\/*\t$NetBSD: usbdi.c,v 1.89 2001\/12\/02 23:25:25 augustss Exp $\t*\/\n \/*\t$FreeBSD$\t*\/\n \n \/*\n@@ -1083,22 +1083,6 @@\n }\n \n \/*\n- * Search for a vendor\/product pair in an array. The item size is\n- * given as an argument.\n- *\/\n-const struct usb_devno *\n-usb_match_device(const struct usb_devno *tbl, u_int nentries, u_int sz,\n-\t\t u_int16_t vendor, u_int16_t product)\n-{\n-\twhile (nentries-- > 0) {\n-\t\tif (tbl->ud_vendor == vendor && tbl->ud_product == product)\n-\t\t\treturn (tbl);\n-\t\ttbl = (const struct usb_devno *)((const char *)tbl + sz);\n-\t}\n-\treturn (NULL);\n-}\n-\n-\/*\n * usbd_ratecheck() can limit the number of error messages that occurs.\n * When a device is unplugged it may take up to 0.25s for the hub driver\n * to notice it. If the driver continuosly tries to do I\/O operations\n@@ -1115,6 +1099,22 @@\n \treturn (1);\n }\n \n+\/*\n+ * Search for a vendor\/product pair in an array. The item size is\n+ * given as an argument.\n+ *\/\n+const struct usb_devno *\n+usb_match_device(const struct usb_devno *tbl, u_int nentries, u_int sz,\n+\t\t u_int16_t vendor, u_int16_t product)\n+{\n+\twhile (nentries-- > 0) {\n+\t\tif (tbl->ud_vendor == vendor && tbl->ud_product == product)\n+\t\t\treturn (tbl);\n+\t\ttbl = (const struct usb_devno *)((const char *)tbl + sz);\n+\t}\n+\treturn (NULL);\n+}\n+\n #if defined(__FreeBSD__)\n int\n usbd_driver_load(module_t mod, int what, void *arg)\n"} {"commit":"4224132edebbb1d6cbf839311e65c6282b85448e","subject":"Adapted display style a little bit.","message":"Adapted display style a little bit.\n","repos":"ironpinguin\/rpi-dog128,ironpinguin\/rpi-dog128,ironpinguin\/rpi-dog128","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- emu\/emu.c\n+++ emu\/emu.c\n@@ -13,11 +13,14 @@\n #define PIXEL_WIDTH 128\n #define PIXEL_HEIGHT 64\n \n-#define SCREEN_HEIGHT 2.0\n+#define SCREEN_HEIGHT 1.6\n #define SCREEN_WIDTH 2.0\n \n #define XOFFSET -1.0\n-#define YOFFSET 1.0\n+#define YOFFSET 0.8\n+\n+#define BGCOLOR 0.8,0.8,0.1\n+#define PIXEL_COLOR 0.3,0.3,0.3\n \n static void\n renderQuad(float x1, float y1, float x2, float y2)\n@@ -35,8 +38,10 @@\n }\n \n static void\n-renderDisplayPixel(float y, float x)\n+renderDisplayPixel(float y, float x, float r, float g, float b)\n {\n+ glColor3f(r, g, b);\n+\n float view_width = SCREEN_WIDTH;\n float view_height = SCREEN_HEIGHT;\n float sizex = view_width \/ (float)PIXEL_WIDTH;\n@@ -54,14 +59,15 @@\n \n glClear(GL_COLOR_BUFFER_BIT);\n \n- glColor3f(1,1,1);\n+ glColor3f(BGCOLOR);\n+ renderQuad(XOFFSET, YOFFSET, XOFFSET+SCREEN_WIDTH, YOFFSET-SCREEN_HEIGHT);\n \n for (x=0;x<PIXEL_WIDTH;x++)\n {\n for (y=0;y<PIXEL_HEIGHT;y++)\n {\n if (ram[x][y] > 0) {\n- renderDisplayPixel(y,x);\n+ renderDisplayPixel(y, x, PIXEL_COLOR);\n }\n }\n }\n@@ -83,7 +89,7 @@\n \/\/ GL init:\n glutInit(&argc, argv);\n glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);\n- glutCreateWindow(\"Main\");\n+ glutCreateWindow(\"cpi_dogl emu\");\n \n glutDisplayFunc(display);\n \n"} {"commit":"7bca4b77058035868f0043ad3d611f4237f14b82","subject":"parpack: fix compiler warning","message":"parpack: fix compiler warning\n","repos":"danshapero\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,spco\/dealii,JaeryunYim\/dealii,pesser\/dealii,sairajat\/dealii,angelrca\/dealii,sairajat\/dealii,naliboff\/dealii,shakirbsm\/dealii,spco\/dealii,spco\/dealii,JaeryunYim\/dealii,angelrca\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,spco\/dealii,naliboff\/dealii,danshapero\/dealii,shakirbsm\/dealii,angelrca\/dealii,naliboff\/dealii,spco\/dealii,naliboff\/dealii,angelrca\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,pesser\/dealii,kalj\/dealii,jperryhouts\/dealii,pesser\/dealii,kalj\/dealii,sairajat\/dealii,sairajat\/dealii,danshapero\/dealii,kalj\/dealii,jperryhouts\/dealii,danshapero\/dealii,pesser\/dealii,pesser\/dealii,kalj\/dealii,angelrca\/dealii,spco\/dealii,spco\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,pesser\/dealii,kalj\/dealii,naliboff\/dealii,EGP-CIG-REU\/dealii,angelrca\/dealii,jperryhouts\/dealii,JaeryunYim\/dealii,shakirbsm\/dealii,sairajat\/dealii,danshapero\/dealii,EGP-CIG-REU\/dealii,naliboff\/dealii,naliboff\/dealii,sairajat\/dealii,EGP-CIG-REU\/dealii,EGP-CIG-REU\/dealii,shakirbsm\/dealii,danshapero\/dealii,danshapero\/dealii,kalj\/dealii,kalj\/dealii,shakirbsm\/dealii,angelrca\/dealii,shakirbsm\/dealii,sairajat\/dealii,pesser\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,EGP-CIG-REU\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/deal.II\/lac\/parpack_solver.h\n+++ include\/deal.II\/lac\/parpack_solver.h\n@@ -913,10 +913,10 @@\n AssertThrow (false, PArpackExcInfoPdneupd(info));\n }\n \n- for (size_type i=0; i<nev; ++i)\n+ for (int i=0; i<nev; ++i)\n {\n eigenvectors[i] = 0.0;\n- Assert (i*nloc + nloc <= v.size(), dealii::ExcInternalError() );\n+ Assert (i*nloc + nloc <= (int)v.size(), dealii::ExcInternalError() );\n \n eigenvectors[i].add (nloc,\n &local_indices[0],\n"} {"commit":"d60754e4527ac2d793efbdbcdae1580534d01b0f","subject":"isl_basic_map_uncurry: add missing isl_basic_map_cow","message":"isl_basic_map_uncurry: add missing isl_basic_map_cow\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"cfx-next\/toolchain_isl-upstream,epowers\/isl,KangDroidSMProject\/ISL,tobig\/isl,inducer\/isl-mirror,PollyLabs\/isl,evaautomation\/isl,abduld\/isl,UBERTC\/isl,tobig\/isl,jleben\/isl,UBERTC\/isl,nicolasvasilache\/isl,epowers\/isl,KangDroidSMProject\/ISL,VanirLLVM\/toolchain_isl,Distrotech\/isl,BenzoSM\/isl,evaautomation\/isl,UBERTC\/isl,crossbuild\/isl,simbuerg\/isl,cfx-next\/toolchain_isl-upstream,Meinersbur\/isl,Meinersbur\/isl,cfx-next\/toolchain_isl-upstream,evaautomation\/isl,Meinersbur\/isl,cfx-next\/toolchain_isl-upstream,simbuerg\/isl,jleben\/isl,PollyLabs\/isl,KangDroidSMProject\/ISL,abduld\/isl,BobSaget-Mod\/libisl,VanirLLVM\/toolchain_isl,tobig\/isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,simbuerg\/isl,jleben\/isl,SaberMod\/isl-current,Meinersbur\/isl,KangDroidSMProject\/ISL,BobSaget-Mod\/libisl,serge-sans-paille\/isl,Distrotech\/isl,epowers\/isl,BenzoSM\/isl,Distrotech\/isl,evaautomation\/isl,jleben\/isl,serge-sans-paille\/isl,abduld\/isl,inducer\/isl-mirror,jleben\/isl,PollyLabs\/isl,inducer\/isl-mirror,simbuerg\/isl,nicolasvasilache\/isl,BenzoSM\/isl,nicolasvasilache\/isl,cfx-next\/toolchain_isl-upstream,abduld\/isl,VanirLLVM\/toolchain_isl,SaberMod\/isl-current,nicolasvasilache\/isl,tobig\/isl,Distrotech\/isl,KangDroidSMProject\/ISL,crossbuild\/isl,BobSaget-Mod\/libisl,Distrotech\/isl,UBERTC\/isl,serge-sans-paille\/isl,simbuerg\/isl,crossbuild\/isl,SaberMod\/isl-current,serge-sans-paille\/isl,VanirLLVM\/toolchain_isl,inducer\/isl-mirror,PollyLabs\/isl,BenzoSM\/isl,inducer\/isl-mirror,serge-sans-paille\/isl,SaberMod\/isl-current,epowers\/isl,BenzoSM\/isl,nicolasvasilache\/isl,crossbuild\/isl,epowers\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -10470,6 +10470,9 @@\n \t\tisl_die(bmap->ctx, isl_error_invalid,\n \t\t\t\"basic map cannot be uncurried\",\n \t\t\treturn isl_basic_map_free(bmap));\n+\tbmap = isl_basic_map_cow(bmap);\n+\tif (!bmap)\n+\t\treturn NULL;\n \tbmap->dim = isl_space_uncurry(bmap->dim);\n \tif (!bmap->dim)\n \t\treturn isl_basic_map_free(bmap);\n"} {"commit":"57a3d130f6804aa2d45e7548c40f3e455a4b424b","subject":"style(9).","message":"style(9).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/sys_pipe.c\n+++ sys\/kern\/sys_pipe.c\n@@ -481,8 +481,9 @@\n \t\t\t\tsize = (u_int) uio->uio_resid;\n \n \t\t\tPIPE_UNLOCK(rpipe);\n-\t\t\terror = uiomove(&rpipe->pipe_buffer.buffer[rpipe->pipe_buffer.out],\n-\t\t\t\t\tsize, uio);\n+\t\t\terror = uiomove(\n+\t\t\t &rpipe->pipe_buffer.buffer[rpipe->pipe_buffer.out],\n+\t\t\t size, uio);\n \t\t\tPIPE_LOCK(rpipe);\n \t\t\tif (error)\n \t\t\t\tbreak;\n@@ -551,9 +552,9 @@\n \t\t\t\tbreak;\n \n \t\t\t\/*\n-\t\t\t * Unlock the pipe buffer for our remaining processing. We\n-\t\t\t * will either break out with an error or we will sleep and\n-\t\t\t * relock to loop.\n+\t\t\t * Unlock the pipe buffer for our remaining processing. \n+\t\t\t * We will either break out with an error or we will\n+\t\t\t * sleep and relock to loop.\n \t\t\t *\/\n \t\t\tpipeunlock(rpipe);\n \n@@ -1043,24 +1044,31 @@\n \t\t\t\t\t *\/\n \t\t\t\t\tif (wpipe->pipe_buffer.in + segsize != \n \t\t\t\t\t wpipe->pipe_buffer.size)\n-\t\t\t\t\t\tpanic(\"Expected pipe buffer wraparound disappeared\");\n+\t\t\t\t\t\tpanic(\"Expected pipe buffer \"\n+\t\t\t\t\t\t \"wraparound disappeared\");\n \t\t\t\t\t\t\n \t\t\t\t\tPIPE_UNLOCK(rpipe);\n-\t\t\t\t\terror = uiomove(&wpipe->pipe_buffer.buffer[0],\n-\t\t\t\t\t\t\tsize - segsize, uio);\n+\t\t\t\t\terror = uiomove(\n+\t\t\t\t\t &wpipe->pipe_buffer.buffer[0],\n+\t\t\t\t \t size - segsize, uio);\n \t\t\t\t\tPIPE_LOCK(rpipe);\n \t\t\t\t}\n \t\t\t\tif (error == 0) {\n \t\t\t\t\twpipe->pipe_buffer.in += size;\n \t\t\t\t\tif (wpipe->pipe_buffer.in >=\n \t\t\t\t\t wpipe->pipe_buffer.size) {\n-\t\t\t\t\t\tif (wpipe->pipe_buffer.in != size - segsize + wpipe->pipe_buffer.size)\n-\t\t\t\t\t\t\tpanic(\"Expected wraparound bad\");\n-\t\t\t\t\t\twpipe->pipe_buffer.in = size - segsize;\n+\t\t\t\t\t\tif (wpipe->pipe_buffer.in !=\n+\t\t\t\t\t\t size - segsize +\n+\t\t\t\t\t\t wpipe->pipe_buffer.size)\n+\t\t\t\t\t\t\tpanic(\"Expected \"\n+\t\t\t\t\t\t\t \"wraparound bad\");\n+\t\t\t\t\t\twpipe->pipe_buffer.in = size -\n+\t\t\t\t\t\t segsize;\n \t\t\t\t\t}\n \t\t\t\t\n \t\t\t\t\twpipe->pipe_buffer.cnt += size;\n-\t\t\t\t\tif (wpipe->pipe_buffer.cnt > wpipe->pipe_buffer.size)\n+\t\t\t\t\tif (wpipe->pipe_buffer.cnt >\n+\t\t\t\t\t wpipe->pipe_buffer.size)\n \t\t\t\t\t\tpanic(\"Pipe buffer overflow\");\n \t\t\t\t\n \t\t\t\t}\n"} {"commit":"4649a8f25b8627a7f5c09a5226e9ba3a7b1e78f2","subject":"Added basis for selecting arbitrary fonts at runtime.","message":"Added basis for selecting arbitrary fonts at runtime.\n","repos":"ironpinguin\/rpi-dog128,ironpinguin\/rpi-dog128,ironpinguin\/rpi-dog128","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- emu\/emu.c\n+++ emu\/emu.c\n@@ -78,10 +78,11 @@\n int\n main(int argc, char * argv[])\n {\n+ initFonts();\n char *buff = \"Hallo\";\n \/\/ Set display:\n clear();\n- selectFont(FONT10x16_1);\n+ selectFont(FONT16x26_1); \/\/ FONT10x16_1);\n writeText(buff, 1, 1);\n buff = \"Michele!\";\n writeText(buff, 1, 27);\n"} {"commit":"433762b277daea4eeb841e88c59dac9183395902","subject":"isl_basic_map_deltas: rename \"dim\" variables to \"space\"","message":"isl_basic_map_deltas: rename \"dim\" variables to \"space\"\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"inducer\/isl-mirror,KangDroidSMProject\/ISL,simbuerg\/isl,PollyLabs\/isl,evaautomation\/isl,tobig\/isl,Distrotech\/isl,Meinersbur\/isl,KangDroidSMProject\/ISL,nicolasvasilache\/isl,BenzoSM\/isl,Distrotech\/isl,simbuerg\/isl,inducer\/isl-mirror,Meinersbur\/isl,Distrotech\/isl,UBERTC\/isl,UBERTC\/isl,nicolasvasilache\/isl,nicolasvasilache\/isl,nicolasvasilache\/isl,Distrotech\/isl,PollyLabs\/isl,simbuerg\/isl,simbuerg\/isl,inducer\/isl-mirror,Meinersbur\/isl,PollyLabs\/isl,tobig\/isl,KangDroidSMProject\/ISL,inducer\/isl-mirror,PollyLabs\/isl,evaautomation\/isl,Meinersbur\/isl,KangDroidSMProject\/ISL,nicolasvasilache\/isl,PollyLabs\/isl,KangDroidSMProject\/ISL,tobig\/isl,simbuerg\/isl,Distrotech\/isl,UBERTC\/isl,inducer\/isl-mirror,UBERTC\/isl,BenzoSM\/isl,BenzoSM\/isl,BenzoSM\/isl,BenzoSM\/isl,evaautomation\/isl,tobig\/isl,evaautomation\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -7341,7 +7341,7 @@\n *\/\n struct isl_basic_set *isl_basic_map_deltas(struct isl_basic_map *bmap)\n {\n-\tisl_space *dims, *target_dim;\n+\tisl_space *space, *target_space;\n \tstruct isl_basic_set *bset;\n \tunsigned dim;\n \tunsigned nparam;\n@@ -7352,14 +7352,14 @@\n \tisl_assert(bmap->ctx, isl_space_tuple_is_equal(bmap->dim, isl_dim_in,\n \t\t\t\t\t\t bmap->dim, isl_dim_out),\n \t\t goto error);\n-\ttarget_dim = isl_space_domain(isl_basic_map_get_space(bmap));\n+\ttarget_space = isl_space_domain(isl_basic_map_get_space(bmap));\n \tdim = isl_basic_map_n_in(bmap);\n \tnparam = isl_basic_map_n_param(bmap);\n \tbset = isl_basic_set_from_basic_map(bmap);\n \tbset = isl_basic_set_cow(bset);\n-\tdims = isl_basic_set_get_space(bset);\n-\tdims = isl_space_add_dims(dims, isl_dim_set, dim);\n-\tbset = isl_basic_set_extend_space(bset, dims, 0, dim, 0);\n+\tspace = isl_basic_set_get_space(bset);\n+\tspace = isl_space_add_dims(space, isl_dim_set, dim);\n+\tbset = isl_basic_set_extend_space(bset, space, 0, dim, 0);\n \tbset = isl_basic_set_swap_vars(bset, 2*dim);\n \tfor (i = 0; i < dim; ++i) {\n \t\tint j = isl_basic_map_alloc_equality(\n@@ -7374,7 +7374,7 @@\n \t\tisl_int_set_si(bset->eq[j][1+nparam+2*dim+i], -1);\n \t}\n \tbset = isl_basic_set_project_out(bset, isl_dim_set, dim, 2*dim);\n-\tbset = isl_basic_set_reset_space(bset, target_dim);\n+\tbset = isl_basic_set_reset_space(bset, target_space);\n \treturn bset;\n error:\n \tisl_basic_map_free(bmap);\n"} {"commit":"865828bc514ab51445e2993c1d004c10a2645ad3","subject":"GabbleRoomlistChannel: add immutable Interfaces property to channel details","message":"GabbleRoomlistChannel: add immutable Interfaces property to channel details\n","repos":"community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/roomlist-channel.c\n+++ src\/roomlist-channel.c\n@@ -199,6 +199,7 @@\n TP_IFACE_CHANNEL, \"InitiatorHandle\",\n TP_IFACE_CHANNEL, \"InitiatorID\",\n TP_IFACE_CHANNEL, \"Requested\",\n+ TP_IFACE_CHANNEL, \"Interfaces\",\n TP_IFACE_CHANNEL_TYPE_ROOM_LIST, \"Server\",\n NULL));\n break;\n"} {"commit":"3af38ebcff9f915be3fc17cd9cc96f904f9acd06","subject":"Revert \"Define some function macros for backwards compatibility\"","message":"Revert \"Define some function macros for backwards compatibility\"\n\nThis reverts commit 78f3f7d1d8819d77d9c41985c41c72ef9b705479.\n","repos":"Zeex\/sampgdk,WopsS\/sampgdk,WopsS\/sampgdk,WopsS\/sampgdk,Zeex\/sampgdk,Zeex\/sampgdk","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/sampgdk\/samp.h\n+++ include\/sampgdk\/samp.h\n@@ -237,17 +237,6 @@\n \n #define CLICK_SOURCE_SCOREBOARD (0)\n \n-\/* Backwards compatibility *\/\n-#define GetServerTickCount GetTickCount \/* deprecated *\/\n-#define MenuCreate CreateMenu \/* deprecated *\/\n-#define MenuDestroy DestroyMenu \/* deprecated *\/\n-#define MenuAddItem AddMenuItem \/* deprecated *\/\n-#define MenuSetColumnHeader SetMenuColumnHeader \/* deprecated *\/\n-#define MenuShowForPlayer ShowMenuForPlayer \/* deprecated *\/\n-#define MenuHideForPlayer HideMenuForPlayer \/* deprecated *\/\n-#define MenuDisable DisableMenu \/* deprecated *\/\n-#define MenuDisableRow DisableMenuRow \/* deprecated *\/\n-\n #ifdef __cplusplus\n template<size_t N> inline bool GetNetworkStats(char (&retstr)[N]) { \n \treturn GetNetworkStats(retstr, N); \n"} {"commit":"e2c043171a7b51adf1beee9577160cea581f633b","subject":"Fixed an uninitialized variable (argument to vm_map_find) -- problem that DG detected, and promptly found a fix. Submitted by:\tdavidg","message":"Fixed an uninitialized variable (argument to vm_map_find) -- problem\nthat DG detected, and promptly found a fix.\nSubmitted by:\tdavidg\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/sys_pipe.c\n+++ sys\/kern\/sys_pipe.c\n@@ -18,7 +18,7 @@\n * 5. Modifications may be freely made to this file if the above conditions\n * are met.\n *\n- * $Id$\n+ * $Id: sys_pipe.c,v 1.1 1996\/01\/28 23:38:26 dyson Exp $\n *\/\n \n #ifndef OLD_PIPE\n@@ -147,7 +147,7 @@\n pipeinit(cpipe)\n \tstruct pipe *cpipe;\n {\n-\tint npages;\n+\tint npages, error;\n \n \tnpages = round_page(PIPESIZE)\/PAGE_SIZE;\n \n@@ -156,15 +156,18 @@\n \t * kernel_object.\n \t *\/\n \tcpipe->pipe_buffer.object = vm_object_allocate(OBJT_DEFAULT, npages);\n+\tcpipe->pipe_buffer.buffer = (caddr_t) vm_map_min(kernel_map);\n \n \t\/*\n \t * Insert the object into the kernel map, and allocate kva for it.\n \t * The map entry is, by default, pageable.\n \t *\/\n-\tif (vm_map_find(kernel_map, cpipe->pipe_buffer.object, 0,\n+\terror = vm_map_find(kernel_map, cpipe->pipe_buffer.object, 0,\n \t\t(vm_offset_t *) &cpipe->pipe_buffer.buffer, PIPESIZE, 1,\n-\t\tVM_PROT_ALL, VM_PROT_ALL, 0) != KERN_SUCCESS)\n-\t\tpanic(\"pipeinit: cannot allocate pipe -- out of kvm\");\n+\t\tVM_PROT_ALL, VM_PROT_ALL, 0);\n+\n+\tif (error != KERN_SUCCESS)\n+\t\tpanic(\"pipeinit: cannot allocate pipe -- out of kvm -- code = %d\", error);\n \n \tcpipe->pipe_buffer.in = 0;\n \tcpipe->pipe_buffer.out = 0;\n"} {"commit":"d547a4d8d7d644255baeb0727bf2dede914eda9f","subject":"Add molly guard to firmware update","message":"Add molly guard to firmware update\n","repos":"Microsemi\/switchtec-user,Microsemi\/switchtec-user","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cli\/main.c\n+++ cli\/main.c\n@@ -134,6 +134,24 @@\n \treturn 0;\n }\n \n+static int ask_if_sure(int always_yes)\n+{\n+\tchar buf[10];\n+\n+\tif (always_yes)\n+\t\treturn 0;\n+\n+\tfprintf(stderr, \"Do you want to continue? [y\/N] \");\n+\tfgets(buf, sizeof(buf), stdin);\n+\n+\tif (strcmp(buf, \"y\\n\") == 0 || strcmp(buf, \"Y\\n\") == 0)\n+\t\treturn 0;\n+\n+\tfprintf(stderr, \"Abort.\\n\");\n+\terrno = EINTR;\n+\treturn -errno;\n+}\n+\n static int hard_reset(int argc, char **argv, struct command *cmd,\n \t\t struct plugin *plugin)\n {\n@@ -142,11 +160,11 @@\n \tconst char *desc = \"Perform a hard reset on the switch\";\n \n \tstatic struct {\n-\t\tint confirm;\n+\t\tint assume_yes;\n \t} cfg;\n \tconst struct argconfig_commandline_options opts[] = {\n-\t\t{\"confirm\", 'c', \"\", CFG_NONE, &cfg.confirm, no_argument,\n-\t\t \"confirm you really want to perform a hard-reset command\"},\n+\t\t{\"yes\", 'y', \"\", CFG_NONE, &cfg.assume_yes, no_argument,\n+\t\t \"assume yes when prompted\"},\n \t\t{NULL}};\n \n \tdev = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));\n@@ -154,16 +172,15 @@\n \tif (dev == NULL)\n \t\treturn -errno;\n \n-\tif (!cfg.confirm) {\n+\tif (!cfg.assume_yes)\n \t\tfprintf(stderr,\n-\t\t\t\"WARNING: a hard reset can leave the system in a\\n\"\n-\t\t\t\"broken state. Make sure you reboot after issuing\\n\"\n-\t\t\t\"this command.\\n\\n\"\n-\t\t\t\"To bypass this warning and actually perform the \\n\"\n-\t\t\t\"command add a --confirm option to the command line.\\n\");\n-\n-\t\treturn 1;\n-\t}\n+\t\t\t\"WARNING: if your system does not support hotplug,\\n\"\n+\t\t\t\"a hard reset can leave the system in a broken state.\\n\"\n+\t\t\t\"Make sure you reboot after issuing this command.\\n\\n\");\n+\n+\tret = ask_if_sure(cfg.assume_yes);\n+\tif (ret)\n+\t\treturn ret;\n \n \tret = switchtec_hard_reset(dev);\n \tif (ret) {\n@@ -252,8 +269,15 @@\n \tint ret;\n \tconst char *desc = \"Flash the firmware with a new image\";\n \n-\tdev = parse_and_open(argc, argv, desc, empty_opts, &empty_cfg,\n-\t\t\t sizeof(empty_cfg));\n+\tstatic struct {\n+\t\tint assume_yes;\n+\t} cfg;\n+\tconst struct argconfig_commandline_options opts[] = {\n+\t\t{\"yes\", 'y', \"\", CFG_NONE, &cfg.assume_yes, no_argument,\n+\t\t \"assume yes when prompted\"},\n+\t\t{NULL}};\n+\n+\tdev = parse_and_open(argc, argv, desc, opts, &cfg, sizeof(cfg));\n \n \tif (dev == NULL)\n \t\treturn -errno;\n@@ -264,9 +288,18 @@\n \t\texit(-EINVAL);\n \t}\n \n+\tprintf(\"Writing the following firmware image to %s:\\n\",\n+\t argv[optind-1]);\n+\n \timg_fd = open_and_print_fw_image(argv[optind]);\n \tif (img_fd < 0)\n \t\treturn img_fd;\n+\n+\tret = ask_if_sure(cfg.assume_yes);\n+\tif (ret) {\n+\t\tclose(img_fd);\n+\t\treturn ret;\n+\t}\n \n \tret = switchtec_fw_update(dev, img_fd, fw_update_callback);\n \tclose(img_fd);\n"} {"commit":"1f8920cba3420012ad2e4dcf103e9d20a2449570","subject":"Fix audio and video pts.","message":"Fix audio and video pts.","repos":"rectalogic\/librawmedia,rectalogic\/librawmedia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- encoder.c\n+++ encoder.c\n@@ -10,10 +10,10 @@\n \n struct RawMediaVideo {\n AVStream* avstream;\n- \/\/XXX needs AVFrame, can we alloc avframe then avpicture_alloc into that? apparently encoe_video2 will leak then http:\/\/ffmpeg.org\/pipermail\/ffmpeg-devel\/2010-May\/095305.html\n AVFrame* avframe;\n int width;\n int height;\n+ int pts_per_frame;\n struct SwsContext* sws_ctx;\n } video;\n \n@@ -59,7 +59,6 @@\n avstream = avformat_new_stream(format_ctx, codec);\n if (!avstream)\n return NULL;\n- \/\/XXX do we need to set stream->id = 1?\n AVCodecContext* codec_ctx = avstream->codec;\n codec_ctx->sample_fmt = RAWMEDIA_AUDIO_SAMPLE_FMT;\n codec_ctx->sample_rate = RAWMEDIA_AUDIO_SAMPLE_RATE;\n@@ -124,13 +123,14 @@\n }\n rme->video.width = config->width;\n rme->video.height = config->height;\n-\n+ rme->video.pts_per_frame = config->framerate_den;\n if (!(rme->video.avframe = avcodec_alloc_frame()))\n goto error;\n if (avpicture_alloc((AVPicture*)rme->video.avframe,\n RAWMEDIA_VIDEO_ENCODE_PIXEL_FORMAT,\n rme->video.width, rme->video.height) < 0)\n goto error;\n+ rme->video.avframe->pts = 0;\n }\n \n if (config->has_audio) {\n@@ -146,6 +146,7 @@\n av_rescale_q(1, time_base, RAWMEDIA_AUDIO_TIME_BASE);\n if (!(rme->audio.avframe = avcodec_alloc_frame()))\n goto error;\n+ rme->audio.avframe->pts = 0;\n }\n \n if (!(format_ctx->flags & AVFMT_NOFILE)) {\n@@ -155,7 +156,7 @@\n goto error;\n }\n }\n- \/\/XXX pass options with yuvs tag?\n+\n if (avformat_write_header(format_ctx, NULL) < 0) {\n av_log(NULL, AV_LOG_FATAL, \"%s: failed to write header.\\n\",\n filename);\n@@ -185,7 +186,6 @@\n avpicture_free((AVPicture*)rme->video.avframe);\n av_free(rme->video.avframe);\n sws_freeContext(rme->video.sws_ctx);\n- \/\/XXX av_free picture\/tmp_picture\/video_outbuf? (see muxing.c)\n }\n if (rme->audio.avstream) {\n avcodec_close(rme->audio.avstream->codec);\n@@ -231,21 +231,23 @@\n int rawmedia_encode_video(RawMediaEncoder* rme, uint8_t* input) {\n int r = 0;\n struct RawMediaVideo* video = &rme->video;\n+ AVCodecContext* codec_ctx = video->avstream->codec;\n AVPacket pkt = {0};\n- av_init_packet(&pkt);\n+\n if ((r = convert_video(rme, input)) < 0)\n return r;\n \n int got_packet = 0;\n- if ((r = avcodec_encode_video2(video->avstream->codec, &pkt,\n- video->avframe, &got_packet)) < 0)\n+ if ((r = avcodec_encode_video2(codec_ctx, &pkt, video->avframe, &got_packet)) < 0)\n return r;\n if (!got_packet)\n return 0;\n pkt.stream_index = video->avstream->index;\n if ((r = av_interleaved_write_frame(rme->format_ctx, &pkt)) < 0)\n return r;\n- \/\/XXX?? av_free_packet(&pkt);\n+\n+ video->avframe->pts += video->pts_per_frame;\n+\n return r;\n }\n \n@@ -253,13 +255,14 @@\n int r = 0;\n struct RawMediaAudio* audio = &rme->audio;\n AVPacket pkt = {0};\n- av_init_packet(&pkt);\n+\n audio->avframe->nb_samples = audio->input_samples_per_frame;\n int nb_channels = av_get_channel_layout_nb_channels(RAWMEDIA_AUDIO_CHANNEL_LAYOUT);\n if ((r = avcodec_fill_audio_frame(audio->avframe, nb_channels,\n RAWMEDIA_AUDIO_SAMPLE_FMT, input,\n rme->info.audio_framebuffer_size, 1)))\n return r;\n+\n int got_packet = 0;\n if ((r = avcodec_encode_audio2(audio->avstream->codec, &pkt,\n audio->avframe, &got_packet)) < 0)\n@@ -269,7 +272,9 @@\n pkt.stream_index = audio->avstream->index;\n if ((r = av_interleaved_write_frame(rme->format_ctx, &pkt)) < 0)\n return r;\n- \/\/XXX?? av_free_packet(&pkt);\n+\n+ audio->avframe->pts += audio->input_samples_per_frame;\n+\n return r;\n }\n \n"} {"commit":"685601f27cb1a396c9c6ca62d30c6dbb0e9dcbf9","subject":"Remove deprecated message from hipLaunchModuleKernel","message":"Remove deprecated message from hipLaunchModuleKernel\n\nChange-Id: I87675453ae4363e3340a9d1491bb00543fa8c6e0\n","repos":"GPUOpen-ProfessionalCompute-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/hcc_detail\/hip_runtime_api.h\n+++ include\/hcc_detail\/hip_runtime_api.h\n@@ -1162,7 +1162,7 @@\n unsigned int sharedMemBytes,\n hipStream_t stream,\n void **kernelParams,\n- void **extra) __attribute__((deprecated(\"kernelParams is not fully supported, use extra instead\"))) ;\n+ void **extra) ;\n \n \/\/ doxygen end Version Management\n \/**\n"} {"commit":"bbbd38bb6ed26e4297e86de22a4318b9c50d62b9","subject":"isl_map_intersect: detect empty result also in case of adding a single constraint","message":"isl_map_intersect: detect empty result also in case of adding a single constraint\n\nCommit ed3b444 (isl_map_intersect: add special case for adding a single\nconstraint) added a special case of adding a single constraint but\nneglected to detect an empty result in this special case.\n","repos":"serge-sans-paille\/isl,BenzoSM\/isl,evaautomation\/isl,simbuerg\/isl,tobig\/isl,Distrotech\/isl,evaautomation\/isl,simbuerg\/isl,UBERTC\/isl,Meinersbur\/isl,BobSaget-Mod\/libisl,PollyLabs\/isl,crossbuild\/isl,inducer\/isl-mirror,serge-sans-paille\/isl,VanirLLVM\/toolchain_isl,serge-sans-paille\/isl,BenzoSM\/isl,jleben\/isl,tobig\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,pierrotdelalune\/isl,abduld\/isl,Meinersbur\/isl,VanirLLVM\/toolchain_isl,epowers\/isl,pierrotdelalune\/isl,simbuerg\/isl,tobig\/isl,inducer\/isl-mirror,BenzoSM\/isl,BenzoSM\/isl,crossbuild\/isl,abduld\/isl,abduld\/isl,SaberMod\/isl-current,jleben\/isl,nicolasvasilache\/isl,cfx-next\/toolchain_isl-upstream,jleben\/isl,serge-sans-paille\/isl,Meinersbur\/isl,jleben\/isl,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,Distrotech\/isl,cfx-next\/toolchain_isl-upstream,epowers\/isl,epowers\/isl,inducer\/isl-mirror,simbuerg\/isl,crossbuild\/isl,Distrotech\/isl,BobSaget-Mod\/libisl,serge-sans-paille\/isl,UBERTC\/isl,cfx-next\/toolchain_isl-upstream,nicolasvasilache\/isl,crossbuild\/isl,evaautomation\/isl,PollyLabs\/isl,PollyLabs\/isl,inducer\/isl-mirror,KangDroidSMProject\/ISL,KangDroidSMProject\/ISL,evaautomation\/isl,PollyLabs\/isl,simbuerg\/isl,Distrotech\/isl,inducer\/isl-mirror,pierrotdelalune\/isl,BenzoSM\/isl,UBERTC\/isl,KangDroidSMProject\/ISL,nicolasvasilache\/isl,cfx-next\/toolchain_isl-upstream,VanirLLVM\/toolchain_isl,abduld\/isl,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,SaberMod\/isl-current,epowers\/isl,Meinersbur\/isl,VanirLLVM\/toolchain_isl,BobSaget-Mod\/libisl,SaberMod\/isl-current,nicolasvasilache\/isl,SaberMod\/isl-current,PollyLabs\/isl,tobig\/isl,pierrotdelalune\/isl,epowers\/isl,pierrotdelalune\/isl,jleben\/isl,UBERTC\/isl,cfx-next\/toolchain_isl-upstream,Distrotech\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -1876,6 +1876,11 @@\n \tif (!map1->p[0])\n \t\tgoto error;\n \n+\tif (isl_basic_map_fast_is_empty(map1->p[0])) {\n+\t\tisl_basic_map_free(map1->p[0]);\n+\t\tmap1->n = 0;\n+\t}\n+\n \tisl_map_free(map2);\n \n \treturn map1;\n"} {"commit":"ce3df031354d4e61c42f025b34a2020b5b35f27b","subject":"Increase the components array size","message":"Increase the components array size\n\nIncrease the components array size from 80 to 128 chars.\nThe string there is supposed to be null-terminated, so it can cover\nthe smaller array size in the older version, too.\n\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"takaswie\/alsa-lib,zedongchen\/alsa-lib,mikelima\/alsa-lib,mengdonglin\/alsa-lib,alsa-project\/alsa-lib,tiwai\/alsa-lib,lgirdwood\/alsa-lib,mengdonglin\/alsa-lib,alsa-project\/alsa-lib,zedongchen\/alsa-lib,tiwai\/alsa-lib,gittup\/alsa-lib,Distrotech\/alsa-lib,gittup\/alsa-lib,tiwai\/alsa-lib,mengdonglin\/alsa-lib,lgirdwood\/alsa-lib,lgirdwood\/alsa-lib,Distrotech\/alsa-lib,zedongchen\/alsa-lib,mikelima\/alsa-lib,takaswie\/alsa-lib,mengdonglin\/alsa-lib,mikelima\/alsa-lib,alsa-project\/alsa-lib,lgirdwood\/alsa-lib,takaswie\/alsa-lib,alsa-project\/alsa-lib,gittup\/alsa-lib,Distrotech\/alsa-lib,zedongchen\/alsa-lib,Distrotech\/alsa-lib,mengdonglin\/alsa-lib,zedongchen\/alsa-lib,mikelima\/alsa-lib,takaswie\/alsa-lib,mikelima\/alsa-lib,tiwai\/alsa-lib,gittup\/alsa-lib,Distrotech\/alsa-lib,lgirdwood\/alsa-lib,takaswie\/alsa-lib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/sound\/asound.h\n+++ include\/sound\/asound.h\n@@ -725,7 +725,7 @@\n * *\n ****************************************************************************\/\n \n-#define SNDRV_CTL_VERSION\t\tSNDRV_PROTOCOL_VERSION(2, 0, 5)\n+#define SNDRV_CTL_VERSION\t\tSNDRV_PROTOCOL_VERSION(2, 0, 6)\n \n struct sndrv_ctl_card_info {\n \tint card;\t\t\t\/* card number *\/\n@@ -736,8 +736,7 @@\n \tunsigned char longname[80];\t\/* name + info text about soundcard *\/\n \tunsigned char reserved_[16];\t\/* reserved for future (was ID of mixer) *\/\n \tunsigned char mixername[80];\t\/* visual mixer identification *\/\n-\tunsigned char components[80];\t\/* card components \/ fine identification, delimited with one space (AC97 etc..) *\/\n-\tunsigned char reserved[48];\t\/* reserved for future *\/\n+\tunsigned char components[128];\t\/* card components \/ fine identification, delimited with one space (AC97 etc..) *\/\n };\n \n enum sndrv_ctl_elem_type {\n"} {"commit":"81b59515b3258981075e4330656dd21491eab282","subject":"Cleanup accidentally include #if 0 section.","message":"Cleanup accidentally include #if 0 section.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/vfs_hash.c\n+++ sys\/kern\/vfs_hash.c\n@@ -33,41 +33,6 @@\n #include <sys\/kernel.h>\n #include <sys\/malloc.h>\n #include <sys\/vnode.h>\n-\n-#if 0\n-#include \"opt_mac.h\"\n-\n-#include <sys\/bio.h>\n-#include <sys\/buf.h>\n-#include <sys\/conf.h>\n-#include <sys\/event.h>\n-#include <sys\/eventhandler.h>\n-#include <sys\/extattr.h>\n-#include <sys\/fcntl.h>\n-#include <sys\/kdb.h>\n-#include <sys\/kthread.h>\n-#include <sys\/mac.h>\n-#include <sys\/mount.h>\n-#include <sys\/namei.h>\n-#include <sys\/reboot.h>\n-#include <sys\/sleepqueue.h>\n-#include <sys\/stat.h>\n-#include <sys\/sysctl.h>\n-#include <sys\/syslog.h>\n-#include <sys\/vmmeter.h>\n-\n-#include <machine\/stdarg.h>\n-\n-#include <vm\/vm.h>\n-#include <vm\/vm_object.h>\n-#include <vm\/vm_extern.h>\n-#include <vm\/pmap.h>\n-#include <vm\/vm_map.h>\n-#include <vm\/vm_page.h>\n-#include <vm\/vm_kern.h>\n-#include <vm\/uma.h>\n-\n-#endif\n \n static MALLOC_DEFINE(M_VFS_HASH, \"VFS hash\", \"VFS hash table\");\n \n"} {"commit":"6d7aa580659d6d6758ef6fe2de39def43ef04406","subject":"Add `SurfaceWalker` to doosabin\/doosabin.h","message":"Add `SurfaceWalker` to doosabin\/doosabin.h\n","repos":"rstebbing\/subdivision,rstebbing\/subdivision","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- doosabin\/doosabin.h\n+++ doosabin\/doosabin.h\n@@ -759,6 +759,188 @@\n std::vector<std::unique_ptr<Patch>> _patches;\r\n };\r\n \r\n+\/\/ SurfaceWalker\r\n+template <typename Scalar>\r\n+class SurfaceWalker {\r\n+ typedef Surface<Scalar> Surface;\r\n+ typedef typename Surface::Matrix Matrix;\r\n+ typedef typename Surface::Vector Vector;\r\n+ typedef typename Surface::Vector2 Vector2;\r\n+\r\n+ public:\r\n+ SurfaceWalker(const Surface* surface)\r\n+ : surface_(surface) {}\r\n+\r\n+ template <typename TX, typename U, typename Delta, typename U1>\r\n+ bool ApplyUpdate(const TX& X, const int p, const U& u, const Delta& delta,\r\n+ int* p1, U1* u1) {\r\n+ int p1_depth = -1;\r\n+ \/\/ TODO Replace with better strategy which doesn't allocate dynamically.\r\n+ std::vector<unsigned char> patch_index_explored(\r\n+ surface_->number_of_patches());\r\n+ return ApplyUpdateInternal(X, p, u, delta, p1, u1,\r\n+ 0, &p1_depth, &patch_index_explored);\r\n+ }\r\n+\r\n+ private:\r\n+ template <typename TX, typename U, typename Delta, typename U1>\r\n+ bool ApplyUpdateInternal(\r\n+ const TX& X, const int p, const U& u, const Delta& delta,\r\n+ int* p1, U1* u1,\r\n+ int depth,\r\n+ int* p1_depth,\r\n+ std::vector<unsigned char>* patch_index_explored) const {\r\n+ assert(X.rows() == 3);\r\n+\r\n+ Scalar t[4];\r\n+ int num_intersections = WhichEdgesBroke(u, delta, t);\r\n+ if (num_intersections == 0) {\r\n+ *p1 = p;\r\n+ (*u1)[0] = u[0] + delta[0];\r\n+ (*u1)[1] = u[1] + delta[1];\r\n+ return true;\r\n+ }\r\n+ Vector2 _u, _delta;\r\n+ _u << u[0], u[1];\r\n+ _delta << delta[0], delta[1];\r\n+\r\n+ (*patch_index_explored)[p] = 1;\r\n+\r\n+ assert(num_intersections <= 2);\r\n+\r\n+ int p_edge_index = 0;\r\n+ for (int n = 0; n < num_intersections; ++n, ++p_edge_index) {\r\n+ while (t[p_edge_index] < 0) {\r\n+ ++p_edge_index;\r\n+ }\r\n+\r\n+ Vector2 u_1;\r\n+ u_1 = _u + t[p_edge_index] * _delta;\r\n+\r\n+ int p1_edge_index, p_1;\r\n+ bool has_adjacent_patch = GotoAdjacentPatch(p, p_edge_index,\r\n+ &p_1, &p1_edge_index);\r\n+ has_adjacent_patch &= 0 == (*patch_index_explored)[p_1];\r\n+\r\n+ if (!has_adjacent_patch) {\r\n+ if (depth > *p1_depth) {\r\n+ *p1_depth = depth;\r\n+ *p1 = p;\r\n+ (*u1)[0] = u_1[0];\r\n+ (*u1)[1] = u_1[1];\r\n+ }\r\n+ continue;\r\n+ }\r\n+\r\n+ Eigen::Matrix<Scalar, 4, 1> y0, y1;\r\n+ y0 << 1 - u_1[0], u_1[1], u_1[0], 1 - u_1[1];\r\n+ y1[0] = y0[(p_edge_index + 3) % 4];\r\n+ y1[1] = y0[(p_edge_index + 0) % 4];\r\n+ y1[2] = y0[(p_edge_index + 1) % 4];\r\n+ y1[3] = y0[(p_edge_index + 2) % 4];\r\n+\r\n+ Vector2 u_p1;\r\n+ u_p1 << y1[(p1_edge_index + 3) % 4], y1[p1_edge_index];\r\n+\r\n+ Eigen::Matrix<Scalar, 3, 2> M0, M1;\r\n+ FillPatchTransformationMatrix(X, p, u_1, &M0);\r\n+ FillPatchTransformationMatrix(X, p_1, u_p1, &M1);\r\n+ Eigen::Matrix<Scalar, 2, 2> A0 = M1.transpose() * M1,\r\n+ A0_I = A0.inverse();\r\n+ Eigen::Matrix<Scalar, 2, 3> M1_I = A0_I * M1.transpose();\r\n+ Eigen::Matrix<Scalar, 2, 2> M = M1_I * M0;\r\n+ Vector2 delta_1 = M * _delta;\r\n+ delta_1 *= std::max(Scalar(0), 1 - t[p_edge_index]);\r\n+\r\n+ if (ApplyUpdateInternal(X, p_1, u_p1, delta_1, p1, u1,\r\n+ depth + 1, p1_depth, patch_index_explored)) {\r\n+ return true;\r\n+ }\r\n+ }\r\n+\r\n+ return false;\r\n+ }\r\n+\r\n+ template <typename U, typename Delta>\r\n+ int WhichEdgesBroke(const U& u,\r\n+ const Delta& delta,\r\n+ Scalar* t) const {\r\n+ \/\/ Note that the transformation to `x` and `delta_x` isn't strictly\r\n+ \/\/ required; it just made for easier reasoning in initial testing.\r\n+ static const Scalar X0_data[8] = {0, 0,\r\n+ 1, 0,\r\n+ 1, 1,\r\n+ 0, 1};\r\n+ static const Eigen::Map<const Eigen::Matrix<Scalar, 2, 4>> X0(X0_data);\r\n+\r\n+ Eigen::Vector2d x = u[0] * X0.col(1) + u[1] * X0.col(3);\r\n+ Eigen::Vector2d delta_x = delta[0] * X0.col(1) + delta[1] * X0.col(3);\r\n+\r\n+ Eigen::Matrix2d A;\r\n+ A.col(0) = delta_x;\r\n+\r\n+ int num_intersections = 0;\r\n+\r\n+ \/\/ Fill `t` in reverse order so that `t` corresponds to patch edge\r\n+ \/\/ ordering and not patch domain edge ordering.\r\n+ for (int i = 0; i < 4; ++i) {\r\n+ Eigen::Vector2d m = X0.col((i + 1) % 4) - X0.col(i);\r\n+ A.col(1) = -m;\r\n+\r\n+ Eigen::Matrix2d A_I = A.inverse();\r\n+ Eigen::Vector2d v = A_I * (X0.col(i) - x);\r\n+ if (-kUEps <= v[0] && v[0] <= 1.0 + kUEps &&\r\n+ -kUEps <= v[1] && v[1] <= 1.0 + kUEps &&\r\n+ ((delta_x[0] * m[1] - m[0] * delta_x[1]) >= 0.0)) {\r\n+ \/\/ `t` is clamped to [0, 1] so that the delta can never be increased\r\n+ \/\/ in the calling function.\r\n+ t[3 - i] = std::max(0.0, std::min(1.0, v[0]));\r\n+ ++num_intersections;\r\n+ }\r\n+ else {\r\n+ t[3 - i] = Scalar(-1);\r\n+ }\r\n+ }\r\n+\r\n+ return num_intersections;\r\n+ }\r\n+\r\n+ bool GotoAdjacentPatch(int p, int p_edge_index,\r\n+ int* p1, int* p1_edge_index) const {\r\n+ *p1 = surface_->adjacent_patch_indices(p)[p_edge_index];\r\n+ if (*p1 < 0)\r\n+ return false;\r\n+\r\n+ auto & adjacent_patches_in_p1 = surface_->adjacent_patch_indices(*p1);\r\n+ auto i = std::find(adjacent_patches_in_p1.begin(),\r\n+ adjacent_patches_in_p1.end(),\r\n+ p);\r\n+ *p1_edge_index = static_cast<int>(std::distance(\r\n+ adjacent_patches_in_p1.begin(), i));\r\n+ return true;\r\n+ }\r\n+\r\n+ template <typename TX, typename U>\r\n+ void FillPatchTransformationMatrix(const TX& X, int p, const U& u,\r\n+ Eigen::Matrix<Scalar, 3, 2>* M) const {\r\n+ auto& patch_vertex_indices = surface_->patch_vertex_indices(p);\r\n+\r\n+ \/\/ TODO Replace with better strategy which doesn't allocate dynamically.\r\n+ size_t n = patch_vertex_indices.size();\r\n+ Matrix Xp(X.rows(), patch_vertex_indices.size());\r\n+ for (size_t i = 0; i < n; ++i) {\r\n+ Xp.col(i) = X.col(patch_vertex_indices[i]);\r\n+ }\r\n+\r\n+ Eigen::Map<Vector2> mu(M->data() + 0), mv(M->data() + 3);\r\n+ surface_->Mu(p, u, Xp, &mu);\r\n+ surface_->Mv(p, u, Xp, &mv);\r\n+ }\r\n+\r\n+private:\r\n+ const Surface* surface_;\r\n+};\r\n+\r\n } \/\/ namespace doosabin\r\n \r\n #endif \/\/ DOOSABIN_H\r\n"} {"commit":"b70c97634eaee52ec7b5cbe3796deba4defc36a0","subject":"sync usage(): init become create","message":"sync usage(): init become create\n","repos":"bapt\/cblog,bapt\/cblog","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- cli\/main.c\n+++ cli\/main.c\n@@ -29,7 +29,7 @@\n {\n \tprintf(\"Usage: %s cmd [option]\\n\\n\\\n \t\t\tExample:\\n\\\n-\t\t\tinit\\n\\\n+\t\t\tcreate\\n\\\n \t\t\tadd file_post\\n\\\n \t\t\tdel file_post\\n\\\n \t\t\tget file_post1 file_post2 ... file_postN\\n\\\n"} {"commit":"5d7d61f7d038d9a61b887555600ef6b1d30acc13","subject":"cleaning up code","message":"cleaning up code\n","repos":"sarracini\/Encyption-With-Threads","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- encrypt.c\n+++ encrypt.c\n@@ -14,10 +14,7 @@\n #include <time.h>\n \n #define TEN_MILLIS_IN_NANOS 10000000\n-\/* to do:\n- -ALL the error handling\n- -test test test\n-*\/\n+\n \/\/ some global variables\n int active_in;\n int active_work;\n@@ -40,6 +37,7 @@\n \n BufferItem *result;\n \n+\/\/ putting the thread to sleep for a random amount of time\n void thread_sleep(void){\n \tstruct timespec t;\n \tint seed = 0;\n@@ -48,6 +46,7 @@\n \tnanosleep(&t, NULL);\n }\n \n+\/\/ check if the buffer is empty\n int is_buffer_empty(){\n \tint i = 0;\n \twhile (i < bufSize){\n@@ -59,8 +58,8 @@\n \treturn 0;\n }\n \n+\/\/ return the first empty item in the buffer\n int first_empty_item_in_buffer(){\n-\t\/\/int empty;\n \tint i = 0;\n \tif (is_buffer_empty()){\n \t\twhile (i < bufSize){\n@@ -73,6 +72,7 @@\n \treturn -1;\n }\n \n+\/\/ return the first item that is ready to be worked on in the buffer\n int first_work_item_in_buffer(){\n \tint i = 0;\n \twhile (i < bufSize){\n@@ -84,6 +84,7 @@\n \treturn -1;\n }\n \n+\/\/ return the first encrypted item to be written to the file from the buffer\n int first_out_item_in_buffer(){\n \tint i = 0;\n \twhile (i < bufSize){\n@@ -95,6 +96,7 @@\n \treturn -1;\n }\n \n+\/\/ initialize the buffer - set all states to empty\n void initialize_buffer(){\n \tint i = 0;\n \twhile (i < bufSize){\n@@ -103,6 +105,7 @@\n \t}\n }\n \n+\/\/ error handling for valid user input\n void valid_input(int param, int expected, char* msg){\n \tif (param < expected){\n \t\tfprintf(stderr, \"%s\\n\", msg);\n@@ -110,12 +113,14 @@\n \t}\n }\n \n+\/\/ error handling for valid user key\n void valid_key(int param, char* msg){\n \tif (param > 127 || param < -127){\n \t\tfprintf(stderr, \"%s\\n\", msg);\n \t}\n }\n \n+\/\/ the in thread - read from file and write to buffer\n void *IN_thread(void *param){\n \tint index;\n \tchar curr;\n@@ -123,18 +128,19 @@\n \n \tthread_sleep();\n \t\n-\tdo{\n-\n+\tdo {\n+\t\t\/\/ critical section for returning first empty item in buffer\n \t\tpthread_mutex_lock(&mutexWORK);\n \t\tindex = first_empty_item_in_buffer();\t\t\t\n \n \t\twhile (index > -1){\n \n-\t\t\tif(is_buffer_empty()) {\n+\t\t\t\/\/ if the buffer is empty - sleep\n+\t\t\tif (is_buffer_empty()) {\n \t\t\t\tthread_sleep();\n \t\t\t}\n \t\t\t\n-\t\t\t\/\/ critical section to read in file \n+\t\t\t\/\/ critical section to read in file and store character\n \t\t\tpthread_mutex_lock(&mutexIN);\n \t\t\toffset = ftell(file_in);\n \t\t\tcurr = fgetc(file_in);\n@@ -143,18 +149,23 @@\n \t\t\tif (curr == EOF){\n \t\t\t\tbreak;\n \t\t\t}\n+\n \t\t\telse{ \n+\t\t\t\t\/\/ store character to buffer and indicate that it is ready for work then grab next item\n \t\t\t\tresult[index].offset = offset;\n \t\t\t\tresult[index].data = curr;\n \t\t\t\tresult[index].state = 'w';\n \t\t\t\tindex = first_empty_item_in_buffer();\n \t\t\t}\n-\n-\t\t}\n+\t\t}\n+\n \t\tpthread_mutex_unlock(&mutexWORK);\n-\t\tthread_sleep();\t\n+\n \t} while (!feof(file_in));\n \n+\tthread_sleep();\t\n+\n+\t\/\/ decrease the number of active in threads \n \tpthread_mutex_lock(&mutexWORK);\n \tactive_in--;\n \tpthread_mutex_unlock(&mutexWORK);\n@@ -162,6 +173,7 @@\n \treturn NULL;\n }\n \n+\/\/ the work thread - read from the buffer, encrypt the character and write back to buffer\n void *WORK_thread(void *param){\n \tint index = 0;\n \tint local_active_in;\n@@ -170,30 +182,34 @@\n \t\n \tthread_sleep();\n \n-\tdo{\n-\n+\tdo {\n+\t\t\/\/ critical section tp read in the first item ready to be encrypted\n \t\tpthread_mutex_lock(&mutexWORK);\n \t\tindex = first_work_item_in_buffer();\n \t\t\n \t\tif (index > -1){\n \t\t\t\n+\t\t\t\/\/ store that current item in the buffer\n \t\t\tcurr = result[index].data;\n \t\t\t\n-\t\t\tif(is_buffer_empty()) {\n+\t\t\t\/\/ if the buffer is empty - sleep\n+\t\t\tif (is_buffer_empty()) {\n \t\t\t\tthread_sleep();\n \t\t\t}\n \t\t\t\n \t\t\tif (curr == EOF){\n \t\t\t\tbreak;\n \t\t\t}\n-\t\t\t\/\/ encrypting\/decrypting file if there is work to be done and buffer is non-empty\n+\t\t\t\n+\t\t\t\/\/ encrypting\/decrypting the single current character\n \t\t\tif (key >= 0 && curr > 31 && curr < 127){\n \t\t\t\tcurr = (((int)curr-32)+2*95+key)%95+32;\n \t\t\t}\n \t\t\telse if (key < 0 && curr > 31 && curr < 127){\n \t\t\t\tcurr = (((int)curr-32)+2*95-(-1*key))%95+32;\n \t\t\t}\n-\t\t\t\/\/ critical section to write encrypted character back to buffer, change state and grab next work byte\n+\n+\t\t\t\/\/ write encrypted character back to buffer, indicate it's ready to be outputted\n \t\t\tresult[index].data = curr;\n \t\t\tresult[index].state = 'o';\n \t\t}\n@@ -203,6 +219,9 @@\n \n \t} while (index > -1 || local_active_in > 0);\n \n+\tthread_sleep();\t\n+\n+\t\/\/ decrease the number of active work threads\n \tpthread_mutex_lock(&mutexWORK);\n \tactive_work--;\n \tpthread_mutex_unlock(&mutexWORK);\n@@ -210,6 +229,7 @@\n \treturn NULL;\n }\n \n+\/\/ the output thread - read from buffer and write to file\n void *OUT_thread(void *param){\n \tint index = 0;\n \tchar curr;\n@@ -218,20 +238,23 @@\n \n \tthread_sleep();\n \n-\t\t\n-\tdo{\n-\n+\tdo {\n+\n+\t\t\/\/ critical section to read in the first item to be outputted\n \t\tpthread_mutex_lock(&mutexWORK);\n \t\tindex = first_out_item_in_buffer();\n \n \t\tif (index > -1){\n+\n+\t\t\t\/\/ store that current character \n \t\t\toffset = result[index].offset;\n \t\t\tcurr = result[index].data;\n \n-\n-\t\t\tif(is_buffer_empty()) {\n+\t\t\t\/\/ if the buffer is empty - sleep\n+\t\t\tif (is_buffer_empty()) {\n \t\t\t\tthread_sleep();\n \t\t\t}\n+\n \t\t\t\/\/ critical section for writing to file \n \t\t\tpthread_mutex_lock(&mutexOUT);\n \t\t\tif (fseek(file_out, result[index].offset, SEEK_SET) == -1) {\n@@ -244,15 +267,18 @@\n \t\t\t}\n \t\t\tpthread_mutex_unlock(&mutexOUT);\n \n-\t\t\t\/\/ critical section for writing to file \n+\t\t\t\/\/ store empty character to buffer and indicate that it is empty\n \t\t\tresult[index].data = '\\0';\n \t\t\tresult[index].state = 'e';\n \t\t\tresult[index].offset = 0;\n \t\t}\n+\n \t\tlocal_active_work = active_work;\n \t\tpthread_mutex_unlock(&mutexWORK);\n-\t\tthread_sleep();\n-\t}while (index > -1 || local_active_work > 0);\n+\t\n+\t} while (index > -1 || local_active_work > 0);\n+\t\n+\tthread_sleep();\n \t\n \treturn NULL;\n }\n@@ -262,6 +288,7 @@\n \tint nIN;\n \tint nOUT;\n \tint nWORK; \n+\t\n \t\/\/ initialize all mutexes\n \tpthread_mutex_init(&mutexIN, NULL);\n \tpthread_mutex_init(&mutexWORK, NULL);\n@@ -275,7 +302,6 @@\n \tnWORK = atoi(argv[3]);\n \tnOUT = atoi(argv[4]);\n \tbufSize = atoi(argv[7]);\n-\n \tactive_in = nIN;\n \tactive_work = nWORK;\n \n@@ -326,7 +352,7 @@\n \tpthread_mutex_destroy(&mutexOUT);\n \tpthread_mutex_destroy(&mutexWORK);\n \n-\t\/\/ close all files\n+\t\/\/ close all files and free buffer\n \tfclose(file_in);\n \tfclose(file_out);\n \tfree(result);\n"} {"commit":"9181fbb0b7e5f7db4df486b8600ea78092c4ffb1","subject":"Add abs\/real\/imag functions for hipFloatComplex\/hipDoubleComplex","message":"Add abs\/real\/imag functions for hipFloatComplex\/hipDoubleComplex\n","repos":"GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/hip\/hcc_detail\/hip_complex.h\n+++ include\/hip\/hcc_detail\/hip_complex.h\n@@ -234,7 +234,6 @@\n \n __device__ __host__ static inline float hipCabsf(hipFloatComplex z) { return sqrtf(hipCsqabsf(z)); }\n \n-\n __device__ __host__ static inline double hipCreal(hipDoubleComplex z) { return z.x; }\n \n __device__ __host__ static inline double hipCimag(hipDoubleComplex z) { return z.y; }\n@@ -314,4 +313,12 @@\n return make_hipDoubleComplex(real, imag);\n }\n \n-#endif\n+#define __DEFINE_HIP_COMPLEX_FUN(func) \\\n+__device__ __host__ inline float func(const hipFloatComplex& z) { return hipC##func##f(z); } \\\n+__device__ __host__ inline double func(const hipDoubleComplex& z) { return hipC##func(z); }\n+\n+__DEFINE_HIP_COMPLEX_FUN(abs)\n+__DEFINE_HIP_COMPLEX_FUN(real)\n+__DEFINE_HIP_COMPLEX_FUN(imag)\n+\n+#endif\n"} {"commit":"4fe15d3031ce4a9b0b5c4e00bf93a19a4df54b98","subject":"isl_set_flat_product: call isl_map_range_flat_product","message":"isl_set_flat_product: call isl_map_range_flat_product\n\nA set only has a \"range\", so we should only compute the product of\nthat range and not of the domain.\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"VanirLLVM\/toolchain_isl,abduld\/isl,evaautomation\/isl,abduld\/isl,abduld\/isl,UBERTC\/isl,pierrotdelalune\/isl,crossbuild\/isl,simbuerg\/isl,evaautomation\/isl,serge-sans-paille\/isl,evaautomation\/isl,jleben\/isl,jleben\/isl,Meinersbur\/isl,VanirLLVM\/toolchain_isl,BenzoSM\/isl,Meinersbur\/isl,simbuerg\/isl,pierrotdelalune\/isl,nicolasvasilache\/isl,serge-sans-paille\/isl,nicolasvasilache\/isl,PollyLabs\/isl,PollyLabs\/isl,SaberMod\/isl-current,evaautomation\/isl,serge-sans-paille\/isl,cfx-next\/toolchain_isl-upstream,simbuerg\/isl,cfx-next\/toolchain_isl-upstream,inducer\/isl-mirror,UBERTC\/isl,crossbuild\/isl,cfx-next\/toolchain_isl-upstream,BenzoSM\/isl,Distrotech\/isl,crossbuild\/isl,KangDroidSMProject\/ISL,nicolasvasilache\/isl,BenzoSM\/isl,Distrotech\/isl,simbuerg\/isl,inducer\/isl-mirror,pierrotdelalune\/isl,epowers\/isl,jleben\/isl,inducer\/isl-mirror,PollyLabs\/isl,PollyLabs\/isl,UBERTC\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,BobSaget-Mod\/libisl,Distrotech\/isl,tobig\/isl,KangDroidSMProject\/ISL,Meinersbur\/isl,SaberMod\/isl-current,Meinersbur\/isl,serge-sans-paille\/isl,cfx-next\/toolchain_isl-upstream,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,crossbuild\/isl,nicolasvasilache\/isl,epowers\/isl,Distrotech\/isl,KangDroidSMProject\/ISL,VanirLLVM\/toolchain_isl,SaberMod\/isl-current,simbuerg\/isl,jleben\/isl,nicolasvasilache\/isl,epowers\/isl,BobSaget-Mod\/libisl,epowers\/isl,epowers\/isl,tobig\/isl,tobig\/isl,pierrotdelalune\/isl,pierrotdelalune\/isl,abduld\/isl,Distrotech\/isl,inducer\/isl-mirror,BenzoSM\/isl,serge-sans-paille\/isl,tobig\/isl,SaberMod\/isl-current,jleben\/isl,UBERTC\/isl,BobSaget-Mod\/libisl,BenzoSM\/isl,inducer\/isl-mirror,BobSaget-Mod\/libisl,VanirLLVM\/toolchain_isl,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -7457,7 +7457,7 @@\n __isl_give isl_basic_set *isl_basic_set_flat_product(\n \t__isl_take isl_basic_set *bset1, __isl_take isl_basic_set *bset2)\n {\n-\treturn isl_basic_map_flat_product(bset1, bset2);\n+\treturn isl_basic_map_flat_range_product(bset1, bset2);\n }\n \n __isl_give isl_basic_map *isl_basic_map_range_product(\n@@ -7591,7 +7591,7 @@\n __isl_give isl_set *isl_set_flat_product(__isl_take isl_set *set1,\n \t__isl_take isl_set *set2)\n {\n-\treturn (isl_set *)isl_map_flat_product((isl_map *)set1, (isl_map *)set2);\n+\treturn isl_map_flat_range_product(set1, set2);\n }\n \n \/* Given two maps A -> B and C -> D, construct a map (A * C) -> [B -> D]\n"} {"commit":"f962a999876cad738cf92c1ef9a36d8db7dd5b36","subject":"Add float.h implementation header","message":"Add float.h implementation header\n","repos":"larmel\/lacc,larmel\/c-compiler,larmel\/c-compiler,larmel\/c-compiler,larmel\/lacc","returncode":1,"stderr":"error: pathspec 'include\/stdlib\/float.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- include\/stdlib\/float.h\n+++ include\/stdlib\/float.h\n@@ -0,0 +1,26 @@\n+#ifndef _FLOAT_H\n+#define _FLOAT_H\n+\n+\/* IEEE float.\n+ *\/\n+#define FLT_RADIX 2\n+#define FLT_ROUNDS 1\n+#define FLT_DIG 6\n+#define FLT_EPSILON 1.19209290e-07f\n+#define FLT_MANT_DIG 24\n+#define FLT_MAX 3.40282347e+38f\n+#define FLT_MAX_EXP 128\n+#define FLT_MIN 1.17549435e-38f\n+#define FLT_MIN_EXP (-125)\n+\n+\/* IEEE double.\n+ *\/\n+#define DBL_DIG 15\n+#define DBL_EPSILON 2.2204460492503131e-16\n+#define DBL_MANT_DIG 53\n+#define DBL_MAX 1.7976931348623157e+308\n+#define DBL_MAX_EXP 1024\n+#define DBL_MIN 2.2250738585072014e-308\n+#define DBL_MIN_EXP (-1021)\n+\n+#endif\n"} {"commit":"80040f21a37a2d2eef35514413b78a71a3e10e1a","subject":"Detect that a vnode has been reclaimed while vflush() was waiting to lock the vnode and restart the loop. Vflush() is vulnerable since it does not hold a reference to the vnode and it holds no other locks while waiting for the vnode lock. The vnode will no longer be on the list when the loop is restarted.","message":"Detect that a vnode has been reclaimed while vflush() was waiting to lock\nthe vnode and restart the loop. Vflush() is vulnerable since it does not\nhold a reference to the vnode and it holds no other locks while waiting\nfor the vnode lock. The vnode will no longer be on the list when the\nloop is restarted.\n\nApproved by:\tre (rwatson)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/vfs_subr.c\n+++ sys\/kern\/vfs_subr.c\n@@ -2398,6 +2398,17 @@\n \t\tmtx_unlock(&mntvnode_mtx);\n \t\tvn_lock(vp, LK_INTERLOCK | LK_EXCLUSIVE | LK_RETRY, td);\n \t\t\/*\n+\t\t * This vnode could have been reclaimed while we were\n+\t\t * waiting for the lock since we are not holding a\n+\t\t * reference.\n+\t\t * Start over if the vnode was reclaimed.\n+\t\t *\/\n+\t\tif (vp->v_mount != mp) {\n+\t\t\tVOP_UNLOCK(vp, 0, td);\n+\t\t\tmtx_lock(&mntvnode_mtx);\n+\t\t\tgoto loop;\n+\t\t}\n+\t\t\/*\n \t\t * Skip over a vnodes marked VV_SYSTEM.\n \t\t *\/\n \t\tif ((flags & SKIPSYSTEM) && (vp->v_vflag & VV_SYSTEM)) {\n"} {"commit":"941d800619ebee82be8d93517109965d704a3360","subject":"Minor reshuffling and name changes in doosabin\/doosabin.h","message":"Minor reshuffling and name changes in doosabin\/doosabin.h\n","repos":"rstebbing\/subdivision,rstebbing\/subdivision","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- doosabin\/doosabin.h\n+++ doosabin\/doosabin.h\n@@ -20,6 +20,13 @@\n \/\/ doosabin\r\n namespace doosabin {\r\n \r\n+\/\/ Constants.\r\n+\r\n+\/\/ `kMaxSubdivisionDepth` and `kValidUEpsilon` set the subdivision limit and\r\n+\/\/ adjustment to coordinates on the penultimate subdivision level.\r\n+static const size_t kMaxSubdivisionDepth = 10;\r\n+static const double kValidUEpsilon = 1e-6;\r\n+\r\n \/\/ Types.\r\n using face_array::FaceArray;\r\n using modulo::modulo;\r\n@@ -41,10 +48,8 @@\n (*w)[0] = T(N + 5) \/ (4 * N);\r\n }\r\n \r\n-\/\/ kNumBiquadraticBsplineBasis\r\n+\/\/ BiquadraticBsplineBasis\r\n const size_t kNumBiquadraticBsplineBasis = 9;\r\n-\r\n-\/\/ kBiquadraticBsplineBasis\r\n const int kBiquadraticBsplineBasis[kNumBiquadraticBsplineBasis][2] = {{1, 1},\r\n {1, 0},\r\n {0, 0},\r\n@@ -55,7 +60,6 @@\n {2, 1},\r\n {2, 0}};\r\n \r\n-\/\/ BiquadraticBsplineBasis\r\n template <typename F, typename G, typename U, typename B>\r\n inline void BiquadraticBsplineBasis(const U& u, B* b) {\r\n if (b->size() != kNumBiquadraticBsplineBasis) {\r\n@@ -76,12 +80,6 @@\n {-1, 1},\r\n { 1, 1},\r\n { 1, -1}};\r\n-\r\n-\/\/ kMaxSubdivisionDepth\r\n-static const size_t kMaxSubdivisionDepth = 10;\r\n-\r\n-\/\/ kValidUEpsilon\r\n-static const double kValidUEpsilon = 1e-6;\r\n \r\n \/\/ Patch (forward declaration)\r\n template <typename Scalar>\r\n@@ -201,8 +199,8 @@\n _S.setIdentity(n, n);\r\n }\r\n \r\n- \/\/ Subdivision (core)\r\n- void SubdivideChildren() {\r\n+ \/\/ Subdivision\r\n+ void Subdivide() {\r\n \/\/ Don't repeat subdivision.\r\n if (_children.size() > 0) {\r\n return;\r\n@@ -326,7 +324,7 @@\n }\r\n }\r\n \r\n- \/\/ Evaluate\r\n+ \/\/ Evaluation\r\n template <typename F, typename G, typename E, typename U, typename R>\r\n void Evaluate(const U& u, R* r) {\r\n Vector2 _u(u);\r\n@@ -348,7 +346,7 @@\n return;\r\n }\r\n \r\n- SubdivideChildren();\r\n+ Subdivide();\r\n \r\n assert(_depth <= (kMaxSubdivisionDepth - 1));\r\n if (_depth == (kMaxSubdivisionDepth - 1)) {\r\n@@ -416,8 +414,6 @@\n \r\n return _V;\r\n }\r\n-\r\n- \/\/ Evaluation functors.\r\n \r\n \/\/ EvaluatePosition\r\n struct EvaluatePositionFunctor {\r\n"} {"commit":"862d5e4d43690fae4f19d2326262e89d36c3a227","subject":"fixed bug in qpp::Singleton<T>","message":"fixed bug in qpp::Singleton<T>\n\nit is now not possible anymore to delete an instance via a pointer to\nit (declared void operator delete(void*) private)\n","repos":"QCT-IQC\/qpp,vsoftco\/qpp,vsoftco\/qpp,vsoftco\/qpp,QCT-IQC\/qpp,QCT-IQC\/qpp,vsoftco\/qpp,QCT-IQC\/qpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/internal\/classes\/singleton.h\n+++ include\/internal\/classes\/singleton.h\n@@ -71,7 +71,6 @@\n template<typename T>\n class Singleton\n {\n-\n protected:\n \/\/ prevents deleting pointer to instance\n static void operator delete(void*)\n@@ -85,7 +84,7 @@\n Singleton& operator=(const Singleton&) = delete;\n \n virtual ~Singleton() = default; \/\/ to silence base class Singleton<T> has a\n- \/\/ non-virtual destructor [-Weffc++]\n+ \/\/ non-virtual destructor [-Weffc++]\n \n public:\n static T& get_instance() noexcept(std::is_nothrow_constructible<T>::value)\n"} {"commit":"07464c86836b8b27a728bc472f9be5b32660b353","subject":"isl_basic_map_update_from_tab: re-gauss resulting bmap","message":"isl_basic_map_update_from_tab: re-gauss resulting bmap\n\nMany functions assume that their inputs have been gaussed.\n","repos":"BenzoSM\/isl,BobSaget-Mod\/libisl,nicolasvasilache\/isl,nicolasvasilache\/isl,evaautomation\/isl,serge-sans-paille\/isl,UBERTC\/isl,KangDroidSMProject\/ISL,BobSaget-Mod\/libisl,tobig\/isl,simbuerg\/isl,BenzoSM\/isl,PollyLabs\/isl,inducer\/isl-mirror,VanirLLVM\/toolchain_isl,epowers\/isl,Distrotech\/isl,simbuerg\/isl,Distrotech\/isl,simbuerg\/isl,Distrotech\/isl,SaberMod\/isl-current,tobig\/isl,crossbuild\/isl,epowers\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,crossbuild\/isl,jleben\/isl,KangDroidSMProject\/ISL,VanirLLVM\/toolchain_isl,cfx-next\/toolchain_isl-upstream,tobig\/isl,SaberMod\/isl-current,abduld\/isl,serge-sans-paille\/isl,epowers\/isl,serge-sans-paille\/isl,cfx-next\/toolchain_isl-upstream,UBERTC\/isl,jleben\/isl,cfx-next\/toolchain_isl-upstream,BenzoSM\/isl,serge-sans-paille\/isl,evaautomation\/isl,pierrotdelalune\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,pierrotdelalune\/isl,pierrotdelalune\/isl,PollyLabs\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,jleben\/isl,Meinersbur\/isl,pierrotdelalune\/isl,SaberMod\/isl-current,KangDroidSMProject\/ISL,SaberMod\/isl-current,nicolasvasilache\/isl,Meinersbur\/isl,Distrotech\/isl,crossbuild\/isl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,epowers\/isl,abduld\/isl,cfx-next\/toolchain_isl-upstream,cfx-next\/toolchain_isl-upstream,UBERTC\/isl,PollyLabs\/isl,VanirLLVM\/toolchain_isl,tobig\/isl,PollyLabs\/isl,simbuerg\/isl,simbuerg\/isl,jleben\/isl,VanirLLVM\/toolchain_isl,KangDroidSMProject\/ISL,Distrotech\/isl,jleben\/isl,abduld\/isl,epowers\/isl,UBERTC\/isl,evaautomation\/isl,Meinersbur\/isl,BenzoSM\/isl,Meinersbur\/isl,BenzoSM\/isl,crossbuild\/isl,inducer\/isl-mirror,evaautomation\/isl,abduld\/isl,KangDroidSMProject\/ISL,inducer\/isl-mirror,pierrotdelalune\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_tab.c\n+++ isl_tab.c\n@@ -2163,6 +2163,8 @@\n \t\t\telse if (isl_tab_is_redundant(tab, n_eq + i))\n \t\t\t\tisl_basic_map_drop_inequality(bmap, i);\n \t\t}\n+\tif (bmap->n_eq != n_eq)\n+\t\tisl_basic_map_gauss(bmap, NULL);\n \tif (!tab->rational &&\n \t !bmap->sample && isl_tab_sample_is_integer(tab))\n \t\tbmap->sample = extract_integer_sample(tab);\n"} {"commit":"6cefa9c01d4b9783808e83b0072bd1fde6c9cedd","subject":"Added extern C to varintdecode.h","message":"Added extern C to varintdecode.h","repos":"lemire\/MaskedVByte","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/varintdecode.h\n+++ include\/varintdecode.h\n@@ -6,6 +6,10 @@\n #include <stdint.h>\/\/ please use a C99-compatible compiler\n #include <stddef.h>\n \n+#if defined(__cplusplus)\n+extern \"C\" {\n+#endif\n+\t\n \/\/ Read \"length\" 32-bit integers in varint format from in, storing the result in out. Returns the number of bytes read.\n size_t masked_vbyte_decode(const uint8_t* in, uint32_t* out, uint64_t length);\n \n@@ -28,4 +32,8 @@\n int masked_vbyte_search_delta(const uint8_t *in, uint64_t length, uint32_t prev,\n uint32_t key, uint32_t *presult);\n \n+#if defined(__cplusplus)\n+};\n+#endif\n+\n #endif \/* VARINTDECODE_H_ *\/\n"} {"commit":"ab4b179a9df9652931437bbe36244e508de42ded","subject":"Don't print the verbosity number on stderr.","message":"Don't print the verbosity number on stderr.\n","repos":"wesleyd\/charade,wesleyd\/charade,wesleyd\/charade,wesleyd\/charade","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- eprintf.h\n+++ eprintf.h\n@@ -12,7 +12,7 @@\n extern unsigned int g_volume;\n \n #define EPRINTF(Level, Format, Args...) \\\n- eprintf(Level, \"%d %s: \" Format, Level, __func__, ##Args)\n+ eprintf(Level, \"%s: \" Format, __func__, ##Args)\n \n int eprintf(int level, const char *fmt, ...)\n __attribute__ ((format (printf, 2, 3)));\n"} {"commit":"a32a200792ebecceec10edd874e410c1913c939c","subject":"getnewvnode() can be called with NULL mp.","message":"getnewvnode() can be called with NULL mp.\n\nFound by:\tCoverity Prevent (tm)\nCoverity ID:\t1521\nConfirmed by:\tphk\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/vfs_subr.c\n+++ sys\/kern\/vfs_subr.c\n@@ -869,7 +869,7 @@\n \t * Wait for available vnodes.\n \t *\/\n \tif (numvnodes > desiredvnodes) {\n-\t\tif (mp->mnt_kern_flag & MNTK_SUSPEND) {\n+\t\tif (mp != NULL && (mp->mnt_kern_flag & MNTK_SUSPEND)) {\n \t\t\t\/*\n \t\t\t * File system is beeing suspended, we cannot risk a\n \t\t\t * deadlock here, so allocate new vnode anyway.\n"} {"commit":"2ff0bceaa726123620f714f0567cf901bf8cf113","subject":"msg_...: default value for MODULE_STRING","message":"msg_...: default value for MODULE_STRING\n\nThis was often confusing external plugin authors.\n","repos":"xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/vlc_messages.h\n+++ include\/vlc_messages.h\n@@ -77,6 +77,10 @@\n #define msg_Dbg( p_this, ... ) \\\n vlc_Log( VLC_OBJECT(p_this), VLC_MSG_DBG, MODULE_STRING, __VA_ARGS__ )\n \n+#ifndef MODULE_STRING\n+# define MODULE_STRING __FILE__\n+#endif\n+\n \/**\n * @}\n *\/\n"} {"commit":"6cadba08cd1ba50a069d07a831817dfbbd089039","subject":"Add pagemask debugging output in \"show tlb\" in the debugger.","message":"Add pagemask debugging output in \"show tlb\" in the debugger.\n\nApproved by:\tre (marius)\nObtained from:\tbsdimp\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/mips\/mips\/tlb.c\n+++ sys\/mips\/mips\/tlb.c\n@@ -54,6 +54,7 @@\n \t\tregister_t entryhi;\n \t\tregister_t entrylo0;\n \t\tregister_t entrylo1;\n+\t\tregister_t pagemask;\n \t} entry[MIPS_MAX_TLB_ENTRIES];\n };\n \n@@ -285,6 +286,7 @@\n \t\ttlb_read();\n \n \t\ttlb_state[cpu].entry[i].entryhi = mips_rd_entryhi();\n+\t\ttlb_state[cpu].entry[i].pagemask = mips_rd_pagemask();\n \t\ttlb_state[cpu].entry[i].entrylo0 = mips_rd_entrylo0();\n \t\ttlb_state[cpu].entry[i].entrylo1 = mips_rd_entrylo1();\n \t}\n@@ -339,7 +341,7 @@\n \n DB_SHOW_COMMAND(tlb, ddb_dump_tlb)\n {\n-\tregister_t ehi, elo0, elo1;\n+\tregister_t ehi, elo0, elo1, epagemask;\n \tunsigned i, cpu, ntlb;\n \n \t\/*\n@@ -378,11 +380,12 @@\n \t\tehi = tlb_state[cpu].entry[i].entryhi;\n \t\telo0 = tlb_state[cpu].entry[i].entrylo0;\n \t\telo1 = tlb_state[cpu].entry[i].entrylo1;\n+\t\tepagemask = tlb_state[cpu].entry[i].pagemask;\n \n \t\tif (elo0 == 0 && elo1 == 0)\n \t\t\tcontinue;\n \n-\t\tdb_printf(\"#%u\\t=> %jx\\n\", i, (intmax_t)ehi);\n+\t\tdb_printf(\"#%u\\t=> %jx (pagemask %jx)\\n\", i, (intmax_t)ehi, (intmax_t) epagemask);\n \t\tdb_printf(\" Lo0\\t%jx\\t(%#jx)\\n\", (intmax_t)elo0, (intmax_t)TLBLO_PTE_TO_PA(elo0));\n \t\tdb_printf(\" Lo1\\t%jx\\t(%#jx)\\n\", (intmax_t)elo1, (intmax_t)TLBLO_PTE_TO_PA(elo1));\n \t}\n"} {"commit":"e996ec4b3167a7657998178804a7c2c6f1c4016f","subject":"Add equality operator.","message":"Add equality operator.\n","repos":"AbandonedCart\/Play-Framework,AbandonedCart\/Play-Framework,Thunder07\/Play--Framework,Thunder07\/Play--Framework,Thunder07\/Play--Framework,AbandonedCart\/Play-Framework","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/win32\/ComPtr.h\n+++ include\/win32\/ComPtr.h\n@@ -84,6 +84,11 @@\n \t\t\t\treturn &m_ptr;\r\n \t\t\t}\r\n \r\n+\t\t\tbool operator ==(const CComPtr& rhs) const\r\n+\t\t\t{\r\n+\t\t\t\treturn m_ptr == rhs.m_ptr;\r\n+\t\t\t}\r\n+\r\n \t\t\tPtrType* Detach()\r\n \t\t\t{\r\n \t\t\t\tPtrType* result = m_ptr;\r\n"} {"commit":"f131661e5a369a83a42340258f68a01183bf3770","subject":"Define TRUE and FALSE.","message":"Define TRUE and FALSE.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_fw.c\n+++ sys\/netinet\/ip_fw.c\n@@ -51,6 +51,13 @@\n #define dprintf4(a1,a2,a3,a4)\n #endif\n \n+#ifndef TRUE\n+#define TRUE\t1\n+#endif\n+\n+#ifndef FALSE\n+#define FALSE\t0\n+#endif\n \n #define print_ip(a)\t printf(\"%ld.%ld.%ld.%ld\",(ntohl(a.s_addr)>>24)&0xFF,\\\n \t\t\t\t \t\t (ntohl(a.s_addr)>>16)&0xFF,\\\n"} {"commit":"6ca323ef63a448a489c16f9cbb57db639aa48201","subject":"Handle busy status of the page in a way expected for pager_getpage(). Flush requested page, unbusy other pages, do not clear m->busy.","message":"Handle busy status of the page in a way expected for pager_getpage().\nFlush requested page, unbusy other pages, do not clear m->busy.\n\nReviewed by:\talc\nMFC after:\t1 week\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/vm\/phys_pager.c\n+++ sys\/vm\/phys_pager.c\n@@ -152,10 +152,10 @@\n \t\tKASSERT(m[i]->dirty == 0,\n \t\t (\"phys_pager_getpages: dirty page %p\", m[i]));\n \t\t\/* The requested page must remain busy, the others not. *\/\n-\t\tif (reqpage != i) {\n-\t\t\tm[i]->oflags &= ~VPO_BUSY;\n-\t\t\tm[i]->busy = 0;\n-\t\t}\n+\t\tif (i == reqpage)\n+\t\t\tvm_page_flash(m[i]);\n+\t\telse\n+\t\t\tvm_page_wakeup(m[i]);\n \t}\n \treturn (VM_PAGER_OK);\n }\n"} {"commit":"e3935c934a1ea85c57b744bcc9e31c43d9d4b0a0","subject":"Eliminate unnecessary page queues locking.","message":"Eliminate unnecessary page queues locking.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/vm\/swap_pager.c\n+++ sys\/vm\/swap_pager.c\n@@ -1140,16 +1140,12 @@\n \t\t\n \t\tfor (k = 0; k < i; ++k) {\n \t\t\tvm_page_lock(m[k]);\n-\t\t\tvm_page_lock_queues();\n \t\t\tswp_pager_free_nrpage(m[k]);\n-\t\t\tvm_page_unlock_queues();\n \t\t\tvm_page_unlock(m[k]);\n \t\t}\n \t\tfor (k = j; k < count; ++k) {\n \t\t\tvm_page_lock(m[k]);\n-\t\t\tvm_page_lock_queues();\n \t\t\tswp_pager_free_nrpage(m[k]);\n-\t\t\tvm_page_unlock_queues();\n \t\t\tvm_page_unlock(m[k]);\n \t\t}\n \t}\n"} {"commit":"28fc72bfc1b4a9d432eb939e7f06f6a4b40a603a","subject":" * Added test code of the <menu type> attribute for SoftBank XHTML converter.","message":" * Added test code of the <menu type> attribute for SoftBank XHTML converter.\n\n\ngit-svn-id: 4ec3457f076cc669589aef85c1dfbed86f312c92@2510 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_jxhtml\/test_chxj_jxhtml.c\n+++ test\/chxj_jxhtml\/test_chxj_jxhtml.c\n@@ -324,6 +324,11 @@\n void test_jxhtml_menu_tag_003();\n void test_jxhtml_menu_tag_004();\n void test_jxhtml_menu_tag_005();\n+void test_jxhtml_menu_tag_006();\n+void test_jxhtml_menu_tag_007();\n+void test_jxhtml_menu_tag_008();\n+void test_jxhtml_menu_tag_009();\n+void test_jxhtml_menu_tag_010();\n \n void test_jxhtml_ol_tag_001();\n void test_jxhtml_ol_tag_002();\n@@ -814,6 +819,11 @@\n CU_add_test(jxhtml_suite, \"test <menu> 3.\" , test_jxhtml_menu_tag_003);\n CU_add_test(jxhtml_suite, \"test <menu> 4.\" , test_jxhtml_menu_tag_004);\n CU_add_test(jxhtml_suite, \"test <menu> 5.\" , test_jxhtml_menu_tag_005);\n+ CU_add_test(jxhtml_suite, \"test <menu> 6.\" , test_jxhtml_menu_tag_006);\n+ CU_add_test(jxhtml_suite, \"test <menu> 7.\" , test_jxhtml_menu_tag_007);\n+ CU_add_test(jxhtml_suite, \"test <menu> 8.\" , test_jxhtml_menu_tag_008);\n+ CU_add_test(jxhtml_suite, \"test <menu> 9.\" , test_jxhtml_menu_tag_009);\n+ CU_add_test(jxhtml_suite, \"test <menu> 10.\" , test_jxhtml_menu_tag_010);\n \/*=========================================================================*\/\n \/* <OL> *\/\n \/*=========================================================================*\/\n@@ -8989,6 +8999,156 @@\n #undef TEST_STRING\n #undef RESULT_STRING\n }\n+void test_jxhtml_menu_tag_006() \n+{\n+#define TEST_STRING \"<menu type=\\\"disc\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+#define RESULT_STRING \"<menu type=\\\"disc\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"actual:[%s]\\n\", ret);\n+ fprintf(stderr, \"expect:[%s]\\n\", RESULT_STRING);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_jxhtml_menu_tag_007() \n+{\n+#define TEST_STRING \"<menu type=\\\"circle\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+#define RESULT_STRING \"<menu type=\\\"circle\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"actual:[%s]\\n\", ret);\n+ fprintf(stderr, \"expect:[%s]\\n\", RESULT_STRING);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_jxhtml_menu_tag_008() \n+{\n+#define TEST_STRING \"<menu type=\\\"square\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+#define RESULT_STRING \"<menu type=\\\"square\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"actual:[%s]\\n\", ret);\n+ fprintf(stderr, \"expect:[%s]\\n\", RESULT_STRING);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_jxhtml_menu_tag_009() \n+{\n+#define TEST_STRING \"<menu type=\\\"\\\"><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+#define RESULT_STRING \"<menu><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"actual:[%s]\\n\", ret);\n+ fprintf(stderr, \"expect:[%s]\\n\", RESULT_STRING);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_jxhtml_menu_tag_010() \n+{\n+#define TEST_STRING \"<menu type><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+#define RESULT_STRING \"<menu><li>\uff8a\uff9d\uff76\uff78<\/li><li>\uff8a\uff9d\uff76\uff78<\/li><\/menu>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_jxhtml(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ fprintf(stderr, \"actual:[%s]\\n\", ret);\n+ fprintf(stderr, \"expect:[%s]\\n\", RESULT_STRING);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n \/*============================================================================*\/\n \/* <OL> *\/\n \/*============================================================================*\/\n"} {"commit":"a46c40603f4cfc80fbff6c69ce2444b3dfef86dd","subject":"Added windows makehappy go fix superquick happy 5000 hack Mk. XVI.","message":"Added windows makehappy go fix superquick happy 5000 hack Mk. XVI.\n","repos":"xles\/journal,xles\/journal","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- journal.c\n+++ journal.c\n@@ -36,8 +36,10 @@\n \n #ifdef _WIN32\n #define getcwd(a,b) _getcwd(a,b)\n+ #define _mkdir(a,b) mkdir(a)\n #else\n #define _WIN32 0\n+ #define _mkdir(a,b) mkdir(a,b)\n #include \"mongoose.h\"\n #endif\n \n@@ -300,7 +302,7 @@\n \tchar target[strlen(cwd)+10];\n \tstrncpy(target,cwd,sizeof(target));\n \tsnprintf(target,sizeof(target),\"%s\/%s\",target,\".journal\");\n-\tint result = mkdir(target, 0755);\n+\tint result = _mkdir(target, 0755);\n \tif (result < 0) {\n \t \tprintf(\"Error: %s in '%s'\\n\", strerror(errno), cwd);\n \t\treturn;\n@@ -312,7 +314,7 @@\n \t\t\"allow from 127.0.0.1\\n\",fp);\n \tfclose(fp);\n \n-\tmkdir(\".journal\/posts\", 0755);\n+\t_mkdir(\".journal\/posts\", 0755);\n \tmkpage();\n \tputs(\"Successfully initialized a new journal.\");\n }\n"} {"commit":"90816de717b1396c165af81cacb81992f389d9eb","subject":"Update the copyright information","message":"Update the copyright information\n","repos":"DeforaOS\/libc,DeforaOS\/libc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/kernel\/netbsd\/sys\/resource.h\n+++ include\/kernel\/netbsd\/sys\/resource.h\n@@ -1,5 +1,5 @@\n \/* $Id$ *\/\n-\/* Copyright (c) 2007-2012 Pierre Pronchery <khorben@defora.org> *\/\n+\/* Copyright (c) 2007-2015 Pierre Pronchery <khorben@defora.org> *\/\n \/* This file is part of DeforaOS System libc *\/\n \/* All rights reserved.\n *\n"} {"commit":"9b90644e7d852f55c7e0ac8c8022f193acdd997a","subject":"virnetserver: Need to initialize 'sigdata'","message":"virnetserver: Need to initialize 'sigdata'\n\nIt was possible to call VIR_FREE in error prior to initialization\n","repos":"eskultety\/libvirt,trainstack\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,trainstack\/libvirt,shugaoye\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,iam-TJ\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,taget\/libvirt,datto\/libvirt,cbosdo\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,zhlcindy\/libvirt-1.1.4-maintain,VenkatDatta\/libvirt,trainstack\/libvirt,nertpinx\/libvirt,siboulet\/libvirt-openvz,shugaoye\/libvirt,datto\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,fabianfreyer\/libvirt,elmarco\/libvirt,agx\/libvirt,shugaoye\/libvirt,iam-TJ\/libvirt,eskultety\/libvirt,crobinso\/libvirt,taget\/libvirt,nertpinx\/libvirt,iam-TJ\/libvirt,iam-TJ\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,jfehlig\/libvirt,iam-TJ\/libvirt,zippy2\/libvirt,iam-TJ\/libvirt,datto\/libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,rlaager\/libvirt,agx\/libvirt,iam-TJ\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,olafhering\/libvirt,elmarco\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,cbosdo\/libvirt,libvirt\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,agx\/libvirt,agx\/libvirt,rlaager\/libvirt,cbosdo\/libvirt,fabianfreyer\/libvirt,cbosdo\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,taget\/libvirt,shugaoye\/libvirt,siboulet\/libvirt-openvz,agx\/libvirt,elmarco\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,cbosdo\/libvirt,libvirt\/libvirt,libvirt\/libvirt,eskultety\/libvirt,eskultety\/libvirt,datto\/libvirt,rlaager\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,crobinso\/libvirt,andreabolognani\/libvirt,elmarco\/libvirt,datto\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,trainstack\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,elmarco\/libvirt,VenkatDatta\/libvirt,siboulet\/libvirt-openvz,zippy2\/libvirt,jardasgit\/libvirt,shugaoye\/libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,trainstack\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/rpc\/virnetserver.c\n+++ src\/rpc\/virnetserver.c\n@@ -926,7 +926,7 @@\n virNetServerSignalFunc func,\n void *opaque)\n {\n- virNetServerSignalPtr sigdata;\n+ virNetServerSignalPtr sigdata = NULL;\n struct sigaction sig_action;\n \n virObjectLock(srv);\n"} {"commit":"9fc2b9ca99428b54e6bbfd2d7bf0ccc1c594f1f5","subject":"mfd: da9063: Upgrade of register definitions to support production silicon","message":"mfd: da9063: Upgrade of register definitions to support production silicon\n\nThis patch updates the register definitions for DA9063 to support the\nproduction silicon variant code ID (0x5). These changes are not backwards\ncompatible with the previous register definitions and can only be used\nwith the production variant of DA9063.\n\nSigned-off-by: Opensource [Steve Twiss] <fe2d2d2e9cbc66a66e33b8e3c46609d5cf898468@diasemi.com>\nSigned-off-by: Lee Jones <630e34333487a351a857f6b705e04d30b37c1629@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/mfd\/da9063\/registers.h\n+++ include\/linux\/mfd\/da9063\/registers.h\n@@ -17,11 +17,7 @@\n #define\t_DA9063_REG_H\n \n #define DA9063_I2C_PAGE_SEL_SHIFT\t1\n-\n #define\tDA9063_EVENT_REG_NUM\t\t4\n-#define\tDA9210_EVENT_REG_NUM\t\t2\n-#define\tDA9063_EXT_EVENT_REG_NUM\t(DA9063_EVENT_REG_NUM + \\\n-\t\t\t\t\t\tDA9210_EVENT_REG_NUM)\n \n \/* Page selection I2C or SPI always in the begining of any page. *\/\n \/* Page 0 : I2C access 0x000 - 0x0FF\tSPI access 0x000 - 0x07F *\/\n@@ -61,9 +57,9 @@\n #define\tDA9063_REG_GPIO_10_11\t\t0x1A\n #define\tDA9063_REG_GPIO_12_13\t\t0x1B\n #define\tDA9063_REG_GPIO_14_15\t\t0x1C\n-#define\tDA9063_REG_GPIO_MODE_0_7\t0x1D\n-#define\tDA9063_REG_GPIO_MODE_8_15\t0x1E\n-#define\tDA9063_REG_GPIO_SWITCH_CONT\t0x1F\n+#define\tDA9063_REG_GPIO_MODE0_7\t\t0x1D\n+#define\tDA9063_REG_GPIO_MODE8_15\t0x1E\n+#define\tDA9063_REG_SWITCH_CONT\t\t0x1F\n \n \/* Regulator Control Registers *\/\n #define\tDA9063_REG_BCORE2_CONT\t\t0x20\n@@ -83,7 +79,7 @@\n #define\tDA9063_REG_LDO9_CONT\t\t0x2E\n #define\tDA9063_REG_LDO10_CONT\t\t0x2F\n #define\tDA9063_REG_LDO11_CONT\t\t0x30\n-#define\tDA9063_REG_VIB\t\t\t0x31\n+#define\tDA9063_REG_SUPPLIES\t\t0x31\n #define\tDA9063_REG_DVC_1\t\t0x32\n #define\tDA9063_REG_DVC_2\t\t0x33\n \n@@ -97,9 +93,9 @@\n #define\tDA9063_REG_ADCIN1_RES\t\t0x3A\n #define\tDA9063_REG_ADCIN2_RES\t\t0x3B\n #define\tDA9063_REG_ADCIN3_RES\t\t0x3C\n-#define\tDA9063_REG_MON1_RES\t\t0x3D\n-#define\tDA9063_REG_MON2_RES\t\t0x3E\n-#define\tDA9063_REG_MON3_RES\t\t0x3F\n+#define\tDA9063_REG_MON_A8_RES\t\t0x3D\n+#define\tDA9063_REG_MON_A9_RES\t\t0x3E\n+#define\tDA9063_REG_MON_A10_RES\t\t0x3F\n \n \/* RTC Calendar and Alarm Registers *\/\n #define\tDA9063_REG_COUNT_S\t\t0x40\n@@ -108,15 +104,16 @@\n #define\tDA9063_REG_COUNT_D\t\t0x43\n #define\tDA9063_REG_COUNT_MO\t\t0x44\n #define\tDA9063_REG_COUNT_Y\t\t0x45\n-#define\tDA9063_REG_ALARM_MI\t\t0x46\n-#define\tDA9063_REG_ALARM_H\t\t0x47\n-#define\tDA9063_REG_ALARM_D\t\t0x48\n-#define\tDA9063_REG_ALARM_MO\t\t0x49\n-#define\tDA9063_REG_ALARM_Y\t\t0x4A\n-#define\tDA9063_REG_SECOND_A\t\t0x4B\n-#define\tDA9063_REG_SECOND_B\t\t0x4C\n-#define\tDA9063_REG_SECOND_C\t\t0x4D\n-#define\tDA9063_REG_SECOND_D\t\t0x4E\n+#define\tDA9063_REG_ALARM_S\t\t0x46\n+#define\tDA9063_REG_ALARM_MI\t\t0x47\n+#define\tDA9063_REG_ALARM_H\t\t0x48\n+#define\tDA9063_REG_ALARM_D\t\t0x49\n+#define\tDA9063_REG_ALARM_MO\t\t0x4A\n+#define\tDA9063_REG_ALARM_Y\t\t0x4B\n+#define\tDA9063_REG_SECOND_A\t\t0x4C\n+#define\tDA9063_REG_SECOND_B\t\t0x4D\n+#define\tDA9063_REG_SECOND_C\t\t0x4E\n+#define\tDA9063_REG_SECOND_D\t\t0x4F\n \n \/* Sequencer Control Registers *\/\n #define\tDA9063_REG_SEQ\t\t\t0x81\n@@ -226,35 +223,37 @@\n #define\tDA9063_REG_CONFIG_J\t\t0x10F\n #define\tDA9063_REG_CONFIG_K\t\t0x110\n #define\tDA9063_REG_CONFIG_L\t\t0x111\n-#define\tDA9063_REG_MON_REG_1\t\t0x112\n-#define\tDA9063_REG_MON_REG_2\t\t0x113\n-#define\tDA9063_REG_MON_REG_3\t\t0x114\n-#define\tDA9063_REG_MON_REG_4\t\t0x115\n-#define\tDA9063_REG_MON_REG_5\t\t0x116\n-#define\tDA9063_REG_MON_REG_6\t\t0x117\n-#define\tDA9063_REG_TRIM_CLDR\t\t0x118\n-\n+#define\tDA9063_REG_CONFIG_M\t\t0x112\n+#define\tDA9063_REG_CONFIG_N\t\t0x113\n+\n+#define\tDA9063_REG_MON_REG_1\t\t0x114\n+#define\tDA9063_REG_MON_REG_2\t\t0x115\n+#define\tDA9063_REG_MON_REG_3\t\t0x116\n+#define\tDA9063_REG_MON_REG_4\t\t0x117\n+#define\tDA9063_REG_MON_REG_5\t\t0x11E\n+#define\tDA9063_REG_MON_REG_6\t\t0x11F\n+#define\tDA9063_REG_TRIM_CLDR\t\t0x120\n \/* General Purpose Registers *\/\n-#define\tDA9063_REG_GP_ID_0\t\t0x119\n-#define\tDA9063_REG_GP_ID_1\t\t0x11A\n-#define\tDA9063_REG_GP_ID_2\t\t0x11B\n-#define\tDA9063_REG_GP_ID_3\t\t0x11C\n-#define\tDA9063_REG_GP_ID_4\t\t0x11D\n-#define\tDA9063_REG_GP_ID_5\t\t0x11E\n-#define\tDA9063_REG_GP_ID_6\t\t0x11F\n-#define\tDA9063_REG_GP_ID_7\t\t0x120\n-#define\tDA9063_REG_GP_ID_8\t\t0x121\n-#define\tDA9063_REG_GP_ID_9\t\t0x122\n-#define\tDA9063_REG_GP_ID_10\t\t0x123\n-#define\tDA9063_REG_GP_ID_11\t\t0x124\n-#define\tDA9063_REG_GP_ID_12\t\t0x125\n-#define\tDA9063_REG_GP_ID_13\t\t0x126\n-#define\tDA9063_REG_GP_ID_14\t\t0x127\n-#define\tDA9063_REG_GP_ID_15\t\t0x128\n-#define\tDA9063_REG_GP_ID_16\t\t0x129\n-#define\tDA9063_REG_GP_ID_17\t\t0x12A\n-#define\tDA9063_REG_GP_ID_18\t\t0x12B\n-#define\tDA9063_REG_GP_ID_19\t\t0x12C\n+#define\tDA9063_REG_GP_ID_0\t\t0x121\n+#define\tDA9063_REG_GP_ID_1\t\t0x122\n+#define\tDA9063_REG_GP_ID_2\t\t0x123\n+#define\tDA9063_REG_GP_ID_3\t\t0x124\n+#define\tDA9063_REG_GP_ID_4\t\t0x125\n+#define\tDA9063_REG_GP_ID_5\t\t0x126\n+#define\tDA9063_REG_GP_ID_6\t\t0x127\n+#define\tDA9063_REG_GP_ID_7\t\t0x128\n+#define\tDA9063_REG_GP_ID_8\t\t0x129\n+#define\tDA9063_REG_GP_ID_9\t\t0x12A\n+#define\tDA9063_REG_GP_ID_10\t\t0x12B\n+#define\tDA9063_REG_GP_ID_11\t\t0x12C\n+#define\tDA9063_REG_GP_ID_12\t\t0x12D\n+#define\tDA9063_REG_GP_ID_13\t\t0x12E\n+#define\tDA9063_REG_GP_ID_14\t\t0x12F\n+#define\tDA9063_REG_GP_ID_15\t\t0x130\n+#define\tDA9063_REG_GP_ID_16\t\t0x131\n+#define\tDA9063_REG_GP_ID_17\t\t0x132\n+#define\tDA9063_REG_GP_ID_18\t\t0x133\n+#define\tDA9063_REG_GP_ID_19\t\t0x134\n \n \/* Chip ID and variant *\/\n #define\tDA9063_REG_CHIP_ID\t\t0x181\n@@ -405,8 +404,10 @@\n \/* DA9063_REG_CONTROL_B (addr=0x0F) *\/\n #define\tDA9063_CHG_SEL\t\t\t\t0x01\n #define\tDA9063_WATCHDOG_PD\t\t\t0x02\n+#define\tDA9063_RESET_BLINKING\t\t\t0x04\n #define\tDA9063_NRES_MODE\t\t\t0x08\n #define\tDA9063_NONKEY_LOCK\t\t\t0x10\n+#define\tDA9063_BUCK_SLOWSTART\t\t\t0x80\n \n \/* DA9063_REG_CONTROL_C (addr=0x10) *\/\n #define\tDA9063_DEBOUNCING_MASK\t\t\t0x07\n@@ -466,6 +467,7 @@\n #define\tDA9063_GPADC_PAUSE\t\t\t0x02\n #define\tDA9063_PMIF_DIS\t\t\t\t0x04\n #define\tDA9063_HS2WIRE_DIS\t\t\t0x08\n+#define\tDA9063_CLDR_PAUSE\t\t\t0x10\n #define\tDA9063_BBAT_DIS\t\t\t\t0x20\n #define\tDA9063_OUT_32K_PAUSE\t\t\t0x40\n #define\tDA9063_PMCONT_DIS\t\t\t0x80\n@@ -660,7 +662,7 @@\n #define\t\tDA9063_GPIO15_TYPE_GPO\t\t0x04\n #define\tDA9063_GPIO15_NO_WAKEUP\t\t\t0x80\n \n-\/* DA9063_REG_GPIO_MODE_0_7 (addr=0x1D) *\/\n+\/* DA9063_REG_GPIO_MODE0_7 (addr=0x1D) *\/\n #define\tDA9063_GPIO0_MODE\t\t\t0x01\n #define\tDA9063_GPIO1_MODE\t\t\t0x02\n #define\tDA9063_GPIO2_MODE\t\t\t0x04\n@@ -670,7 +672,7 @@\n #define\tDA9063_GPIO6_MODE\t\t\t0x40\n #define\tDA9063_GPIO7_MODE\t\t\t0x80\n \n-\/* DA9063_REG_GPIO_MODE_8_15 (addr=0x1E) *\/\n+\/* DA9063_REG_GPIO_MODE8_15 (addr=0x1E) *\/\n #define\tDA9063_GPIO8_MODE\t\t\t0x01\n #define\tDA9063_GPIO9_MODE\t\t\t0x02\n #define\tDA9063_GPIO10_MODE\t\t\t0x04\n@@ -702,12 +704,12 @@\n #define\t\tDA9063_SWITCH_SR_5MV\t\t0x10\n #define\t\tDA9063_SWITCH_SR_10MV\t\t0x20\n #define\t\tDA9063_SWITCH_SR_50MV\t\t0x30\n-#define\tDA9063_SWITCH_SR_DIS\t\t\t0x40\n+#define\tDA9063_CORE_SW_INTERNAL\t\t\t0x40\n #define\tDA9063_CP_EN_MODE\t\t\t0x80\n \n \/* DA9063_REGL_Bxxxx_CONT common bits (addr=0x20-0x25) *\/\n #define\tDA9063_BUCK_EN\t\t\t\t0x01\n-#define DA9063_BUCK_GPI_MASK\t\t\t0x06\n+#define\tDA9063_BUCK_GPI_MASK\t\t\t0x06\n #define\t\tDA9063_BUCK_GPI_OFF\t\t0x00\n #define\t\tDA9063_BUCK_GPI_GPIO1\t\t0x02\n #define\t\tDA9063_BUCK_GPI_GPIO2\t\t0x04\n@@ -841,25 +843,27 @@\n #define DA9063_COUNT_YEAR_MASK\t\t\t0x3F\n #define DA9063_MONITOR\t\t\t\t0x40\n \n-\/* DA9063_REG_ALARM_MI (addr=0x46) *\/\n+\/* DA9063_REG_ALARM_S (addr=0x46) *\/\n+#define DA9063_ALARM_S_MASK\t\t\t0x3F\n #define DA9063_ALARM_STATUS_ALARM\t\t0x80\n #define DA9063_ALARM_STATUS_TICK\t\t0x40\n+\/* DA9063_REG_ALARM_MI (addr=0x47) *\/\n #define DA9063_ALARM_MIN_MASK\t\t\t0x3F\n \n-\/* DA9063_REG_ALARM_H (addr=0x47) *\/\n+\/* DA9063_REG_ALARM_H (addr=0x48) *\/\n #define DA9063_ALARM_HOUR_MASK\t\t\t0x1F\n \n-\/* DA9063_REG_ALARM_D (addr=0x48) *\/\n+\/* DA9063_REG_ALARM_D (addr=0x49) *\/\n #define DA9063_ALARM_DAY_MASK\t\t\t0x1F\n \n-\/* DA9063_REG_ALARM_MO (addr=0x49) *\/\n+\/* DA9063_REG_ALARM_MO (addr=0x4A) *\/\n #define DA9063_TICK_WAKE\t\t\t0x20\n #define DA9063_TICK_TYPE\t\t\t0x10\n #define\t\tDA9063_TICK_TYPE_SEC\t\t0x00\n #define\t\tDA9063_TICK_TYPE_MIN\t\t0x10\n #define DA9063_ALARM_MONTH_MASK\t\t\t0x0F\n \n-\/* DA9063_REG_ALARM_Y (addr=0x4A) *\/\n+\/* DA9063_REG_ALARM_Y (addr=0x4B) *\/\n #define DA9063_TICK_ON\t\t\t\t0x80\n #define DA9063_ALARM_ON\t\t\t\t0x40\n #define DA9063_ALARM_YEAR_MASK\t\t\t0x3F\n@@ -906,7 +910,7 @@\n \n \/* DA9063_REG_Bxxxx_CFG common bits (addr=0x9D-0xA2) *\/\n #define DA9063_BUCK_FB_MASK\t\t\t0x07\n-#define DA9063_BUCK_PD_DIS_SHIFT\t\t5\n+#define DA9063_BUCK_PD_DIS_MASK\t\t0x20\n #define DA9063_BUCK_MODE_MASK\t\t\t0xC0\n #define\t\tDA9063_BUCK_MODE_MANUAL\t\t0x00\n #define\t\tDA9063_BUCK_MODE_SLEEP\t\t0x40\n"} {"commit":"122c0352ec480b740a4118819458cbf08d2e5ddb","subject":"support more CUDA error value types","message":"support more CUDA error value types\n","repos":"yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- taichi\/cuda_utils.h\n+++ taichi\/cuda_utils.h\n@@ -6,12 +6,13 @@\n #include <cuda_runtime_api.h>\n #include <driver_types.h>\n \n-#define check_cuda_errors(err) do { \\\n- CUresult __err = (err); \\\n- if (int(__err)) \\\n- TC_ERROR(\"Cuda Error {}: {}\", get_cuda_error_name(__err), \\\n- get_cuda_error_string(__err)); \\\n- } while (0)\n+#define check_cuda_errors(err) \\\n+ { \\\n+ auto __err = (err); \\\n+ if (int(__err)) \\\n+ TC_ERROR(\"Cuda Error {}: {}\", get_cuda_error_name(__err), \\\n+ get_cuda_error_string(__err)); \\\n+ }\n \n TLANG_NAMESPACE_BEGIN\n \n"} {"commit":"de6dd3b9523cd953e759d22044e98e596716c5c2","subject":"document version change","message":"document version change\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@268702 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/ProfileData\/InstrProf.h\n+++ include\/llvm\/ProfileData\/InstrProf.h\n@@ -813,6 +813,7 @@\n \/\/ struct has more fields to describe value profile information.\n \/\/ Version 3: Compressed name section support. Function PGO name reference\n \/\/ from control data struct is changed from raw pointer to Name's MD5 value.\n+\/\/ Version 4: ValueDataBegin field is removed from the raw header.\n const uint64_t Version = INSTR_PROF_RAW_VERSION;\n \n template <class IntPtrT> inline uint64_t getMagic();\n"} {"commit":"ec8136acb14735dcc5c426006b4f0f014a301226","subject":"rtapi: export rtapi_dir","message":"rtapi: export rtapi_dir\n\nthe kernel thread styles need this\n","repos":"cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,ArcEye\/MK-Qt5,araisrobo\/machinekit,kinsamanka\/machinekit,kinsamanka\/machinekit,Cid427\/machinekit,araisrobo\/machinekit,cdsteinkuehler\/MachineKit,mhaberler\/machinekit,cdsteinkuehler\/MachineKit,RunningLight\/machinekit,strahlex\/machinekit,ArcEye\/MK-Qt5,kinsamanka\/machinekit,Cid427\/machinekit,bobvanderlinden\/machinekit,unseenlaser\/machinekit,mhaberler\/machinekit,cdsteinkuehler\/MachineKit,cdsteinkuehler\/MachineKit,araisrobo\/machinekit,ArcEye\/machinekit-testing,strahlex\/machinekit,bobvanderlinden\/machinekit,Cid427\/machinekit,EqAfrica\/machinekit,cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,Cid427\/machinekit,bobvanderlinden\/machinekit,araisrobo\/machinekit,ArcEye\/machinekit-testing,RunningLight\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/linuxcnc,cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,cdsteinkuehler\/MachineKit,EqAfrica\/machinekit,RunningLight\/machinekit,Cid427\/machinekit,mhaberler\/machinekit,ArcEye\/machinekit-testing,unseenlaser\/machinekit,bobvanderlinden\/machinekit,araisrobo\/machinekit,Cid427\/machinekit,strahlex\/machinekit,unseenlaser\/machinekit,EqAfrica\/machinekit,cdsteinkuehler\/linuxcnc,kinsamanka\/machinekit,araisrobo\/machinekit,RunningLight\/machinekit,unseenlaser\/machinekit,unseenlaser\/machinekit,RunningLight\/machinekit,araisrobo\/machinekit,kinsamanka\/machinekit,mhaberler\/machinekit,araisrobo\/machinekit,unseenlaser\/machinekit,EqAfrica\/machinekit,RunningLight\/machinekit,bobvanderlinden\/machinekit,bobvanderlinden\/machinekit,mhaberler\/machinekit,strahlex\/machinekit,strahlex\/machinekit,RunningLight\/machinekit,strahlex\/machinekit,bobvanderlinden\/machinekit,EqAfrica\/machinekit,ArcEye\/MK-Qt5,ArcEye\/machinekit-testing,RunningLight\/machinekit,Cid427\/machinekit,EqAfrica\/machinekit,ArcEye\/MK-Qt5,unseenlaser\/machinekit,mhaberler\/machinekit,mhaberler\/machinekit,kinsamanka\/machinekit,unseenlaser\/machinekit,mhaberler\/machinekit,kinsamanka\/machinekit,ArcEye\/MK-Qt5,ArcEye\/MK-Qt5,strahlex\/machinekit,ArcEye\/MK-Qt5,araisrobo\/machinekit,Cid427\/machinekit,EqAfrica\/machinekit,EqAfrica\/machinekit,cdsteinkuehler\/MachineKit,kinsamanka\/machinekit,cdsteinkuehler\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/rtapi\/rtapi_proc.h\n+++ src\/rtapi\/rtapi_proc.h\n@@ -345,6 +345,7 @@\n }\n }\n \n+EXPORT_SYMBOL(rtapi_dir);\n \n #endif \/* CONFIG_PROC_FS *\/\n #endif \/* RTAPI_PROC_H *\/\n"} {"commit":"1566d18fe2f469839fd91fdbfd65e1d239aa99e6","subject":"custom lowered nodes are legal too","message":"custom lowered nodes are legal too\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@26561 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Target\/TargetLowering.h\n+++ include\/llvm\/Target\/TargetLowering.h\n@@ -192,7 +192,8 @@\n \/\/\/ isOperationLegal - Return true if the specified operation is legal on this\n \/\/\/ target.\n bool isOperationLegal(unsigned Op, MVT::ValueType VT) const {\n- return getOperationAction(Op, VT) == Legal;\n+ return getOperationAction(Op, VT) == Legal ||\n+ getOperationAction(Op, VT) == Custom;\n }\n \n \/\/\/ getTypeToPromoteTo - If the action for this operation is to promote, this\n"} {"commit":"ce5559caf9c50e8e56b3c34e2f0b563b29d1b203","subject":"Variable to keep track of 3 body rxns in Unit tests","message":"Variable to keep track of 3 body rxns in Unit tests\n","repos":"nicholasmalaya\/grins,nicholasmalaya\/grins,nicholasmalaya\/grins,nicholasmalaya\/grins","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/interface\/air_nasa_poly_base.h\n+++ test\/interface\/air_nasa_poly_base.h\n@@ -54,7 +54,8 @@\n _Ea_coeffs(_n_reactions),\n _preexp_coeffs(_n_reactions),\n _temp_exp_coeffs(_n_reactions),\n- _three_body_coeffs(3), \/\/ only 3, three-body reactions\n+ _three_body_coeffs(_n_reactions),\n+ _is_three_body_rxn(_n_reactions,false),\n _reactant_stoich_coeffs(_n_reactions),\n _product_stoich_coeffs(_n_reactions)\n {\n@@ -82,14 +83,17 @@\n _temp_exp_coeffs[3] = 0.42;\n _temp_exp_coeffs[4] = 0.0;\n \n+ _is_three_body_rxn[0] = true;\n _three_body_coeffs[0].resize(_n_species, 1.0);\n _three_body_coeffs[0][_N_idx] = 4.2857;\n _three_body_coeffs[0][_O_idx] = 4.2857;\n \n+ _is_three_body_rxn[1] = true;\n _three_body_coeffs[1].resize(_n_species, 1.0);\n _three_body_coeffs[1][_N_idx] = 5.0;\n _three_body_coeffs[1][_O_idx] = 5.0;\n \n+ _is_three_body_rxn[2] = true;\n _three_body_coeffs[2].resize(_n_species, 1.0);\n _three_body_coeffs[2][_N_idx] = 22.0;\n _three_body_coeffs[2][_O_idx] = 22.0;\n@@ -320,7 +324,9 @@\n std::vector<libMesh::Real> _Ea_coeffs;\n std::vector<libMesh::Real> _preexp_coeffs;\n std::vector<libMesh::Real> _temp_exp_coeffs;\n+\n std::vector<std::vector<libMesh::Real> > _three_body_coeffs;\n+ std::vector<bool> _is_three_body_rxn;\n \n std::vector<std::vector<libMesh::Real> > _reactant_stoich_coeffs;\n std::vector<std::vector<libMesh::Real> > _product_stoich_coeffs;\n"} {"commit":"2f2358c7f60188b907bdc15297db85f0fbf2d02a","subject":"Resolve conflict by re-deleting hold_unref_and_return_handles() and salut_connection_request_handles()","message":"Resolve conflict by re-deleting hold_unref_and_return_handles() and salut_connection_request_handles()\n\n\n20070702110424-53eee-56b0091f8afb395030befed70f311d2a1ff73071.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/salut-connection.c\n+++ src\/salut-connection.c\n@@ -2217,145 +2217,3 @@\n TP_CONNECTION_STATUS_REASON_NETWORK_ERROR);\n return FALSE;\n }\n-\n-static void\n-hold_unref_and_return_handles (DBusGMethodInvocation *context,\n- TpHandleRepoIface *repo, \n- GArray *handles) {\n- GError *error;\n- gchar *sender = dbus_g_method_get_sender(context);\n- int i,j = 0;\n-\n- for (i = 0; i < handles->len; i++)\n- {\n- TpHandle handle = (TpHandle) g_array_index (handles, guint, i);\n- if (!tp_handle_client_hold (repo, sender, handle, &error)) {\n- goto error;\n- }\n- tp_handle_unref(repo, handle);\n- }\n- dbus_g_method_return (context, handles);\n- return;\n-\n-error:\n- dbus_g_method_return_error (context, error);\n- g_error_free (error);\n- for (j = 0; j < i; j++) {\n- TpHandle handle = (TpHandle) g_array_index (handles, guint, j);\n- tp_handle_client_release(repo, sender, handle, NULL);\n- }\n- \/* j == i *\/\n- for (; j < handles->len; j++) {\n- TpHandle handle = (TpHandle) g_array_index (handles, guint, j);\n- tp_handle_unref(repo, handle);\n- }\n-}\n-\n-\n-\/**\n- * salut_connection_request_handles\n- *\n- * Implements DBus method RequestHandles\n- * on interface org.freedesktop.Telepathy.Connection\n- *\n- * @context: The DBUS invocation context to use to return values\n- * or throw an error.\n- *\/\n-void \n-salut_connection_request_handles (TpSvcConnection *iface, \n- guint handle_type, \n- const gchar ** names, \n- DBusGMethodInvocation *context) {\n- SalutConnection *self = SALUT_CONNECTION(iface);\n- TpBaseConnection *base = TP_BASE_CONNECTION(self);\n- GError *error = NULL;\n- const gchar **n;\n- int count = 0;\n- int i, j;\n- GArray *handles = NULL;\n- TpHandleRepoIface *handle_repo = tp_base_connection_get_handles(\n- TP_BASE_CONNECTION(self), handle_type);\n- \n-\n- TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED(base, context);\n-\n- if (!tp_handle_type_is_valid(handle_type, &error)) {\n- DEBUG(\"Invalid handle type: %d\", handle_type);\n- dbus_g_method_return_error(context, error);\n- g_error_free(error);\n- return;\n- }\n-\n- for (n = names; *n != NULL; n++) {\n- if (*n == '\\0') {\n- DEBUG(\"Request for empty name?!\");\n- error = g_error_new(TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,\n- \"Empty handle name\");\n- dbus_g_method_return_error(context, error);\n- g_error_free(error);\n- return;\n- }\n- DEBUG(\"Requested handle of type %d for %s\", handle_type, *n);\n- count++;\n- }\n-\n- switch (handle_type) {\n- case TP_HANDLE_TYPE_CONTACT:\n- case TP_HANDLE_TYPE_LIST:\n- case TP_HANDLE_TYPE_ROOM:\n- handles = g_array_sized_new(FALSE, FALSE, sizeof(TpHandle), count);\n- for (i = 0; i < count ; i++) {\n- TpHandle handle;\n- const gchar *name = names[i];\n- \/*\n- if (!tp_handle_name_is_valid(handle_type, name, &error)) {\n- dbus_g_method_return_error(context, error);\n- g_error_free(error);\n- g_array_free(handles, TRUE);\n- return;\n- }\n- *\/\n-\n- handle = tp_handle_ensure(handle_repo, name, NULL, &error);\n-\n- if (handle == 0) {\n- error = g_error_new (TP_ERRORS, TP_ERROR_NOT_AVAILABLE,\n- \"requested handle %s wasn't available\", name);\n- dbus_g_method_return_error(context, error);\n- g_error_free(error);\n- for (j = 0; j < i; j++) {\n- tp_handle_unref(handle_repo,\n- (TpHandle) g_array_index (handles, TpHandle, j));\n- }\n- g_array_free(handles, TRUE);\n- return;\n- }\n- g_array_append_val(handles, handle);\n- }\n- hold_unref_and_return_handles (context, handle_repo, handles);\n- g_array_free(handles, TRUE);\n- break;\n- default:\n- DEBUG(\"Unimplemented handle type\");\n- error = g_error_new(TP_ERRORS, TP_ERROR_NOT_AVAILABLE, \n- \"unimplemented handle type %u\", handle_type);\n- dbus_g_method_return_error(context, error);\n- g_error_free(error);\n- }\n-\n- return;\n-}\n-\n-static void\n-salut_connection_connection_service_iface_init(gpointer g_iface, \n- gpointer iface_data)\n-{\n- TpSvcConnectionClass *klass =\n- (TpSvcConnectionClass *) g_iface;\n-#define IMPLEMENT(x) tp_svc_connection_implement_##x (klass, \\\n- salut_connection_##x)\n- IMPLEMENT(request_handles);\n-#undef IMPLEMENT\n-}\n-\n-\n"} {"commit":"906bca4ac79d4a28e0822c4953f2ecc19afd8109","subject":"No longer creates socket before network is initialized.","message":"No longer creates socket before network is initialized.\n","repos":"PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth,PerMalmberg\/Smooth","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/smooth\/core\/network\/Socket.h\n+++ include\/smooth\/core\/network\/Socket.h\n@@ -183,7 +183,7 @@\n if (!started)\n {\n this->ip = ip;\n- res = ip->is_valid() && create_socket();\n+ res = ip->is_valid();\n if (res)\n {\n SocketDispatcher::instance().start_socket(shared_from_this());\n@@ -262,13 +262,9 @@\n \/\/ Detect disconnection\n char b[1];\n int res = recv(socket_id, b, 1, MSG_PEEK);\n- if (res <= 0)\n- {\n- if (res == -1)\n- {\n- loge(\"Disconnection detected\");\n- }\n-\n+ if (res < 0)\n+ {\n+ loge(\"Disconnection detected\");\n stop();\n }\n else\n"} {"commit":"14fe1e2768de8f9c22b6f5c3cfb8ded158a8966f","subject":"fixed compat_hash_map to work with MSVC","message":"fixed compat_hash_map to work with MSVC\n\ngit-svn-id: 4e7379b20b57f8e3dde5a0b7363f233184647162@837 4e380d45-d1fd-0310-85a7-d18ec86df0ad\n","repos":"sriram-mahavadi\/extlp,sriram-mahavadi\/extlp,sriram-mahavadi\/extlp,sriram-mahavadi\/extlp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/stxxl\/bits\/compat_hash_map.h\n+++ include\/stxxl\/bits\/compat_hash_map.h\n@@ -20,7 +20,7 @@\n #if defined(STXXL_CXX0X) && defined(__GNUG__) && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40300)\n typedef std::hash<_Tp> result;\n #elif defined(BOOST_MSVC)\n- typedef FIXME:: stdext::hash<_Tp> result;\n+ typedef stdext::hash_compare<_Tp> result;\n #else\n typedef __gnu_cxx::hash<_Tp> result;\n #endif\n"} {"commit":"109da00f50ffb461b77f678f54eb5570a190d0d7","subject":"Hide GenericSignatureImpl::getCanonicalSignature","message":"Hide GenericSignatureImpl::getCanonicalSignature\n","repos":"roambotics\/swift,ahoppen\/swift,xwu\/swift,benlangmuir\/swift,atrick\/swift,hooman\/swift,JGiola\/swift,rudkx\/swift,JGiola\/swift,gregomni\/swift,JGiola\/swift,ahoppen\/swift,atrick\/swift,xwu\/swift,rudkx\/swift,hooman\/swift,roambotics\/swift,apple\/swift,hooman\/swift,hooman\/swift,atrick\/swift,benlangmuir\/swift,glessard\/swift,benlangmuir\/swift,JGiola\/swift,gregomni\/swift,hooman\/swift,atrick\/swift,xwu\/swift,parkera\/swift,gregomni\/swift,rudkx\/swift,glessard\/swift,benlangmuir\/swift,parkera\/swift,atrick\/swift,parkera\/swift,rudkx\/swift,glessard\/swift,glessard\/swift,JGiola\/swift,atrick\/swift,apple\/swift,benlangmuir\/swift,ahoppen\/swift,rudkx\/swift,parkera\/swift,ahoppen\/swift,benlangmuir\/swift,gregomni\/swift,roambotics\/swift,gregomni\/swift,parkera\/swift,xwu\/swift,hooman\/swift,JGiola\/swift,apple\/swift,xwu\/swift,ahoppen\/swift,xwu\/swift,hooman\/swift,roambotics\/swift,apple\/swift,rudkx\/swift,apple\/swift,apple\/swift,gregomni\/swift,glessard\/swift,ahoppen\/swift,roambotics\/swift,parkera\/swift,parkera\/swift,xwu\/swift,parkera\/swift,roambotics\/swift,glessard\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/AST\/GenericSignature.h\n+++ include\/swift\/AST\/GenericSignature.h\n@@ -311,9 +311,6 @@\n \n ASTContext &getASTContext() const;\n \n- \/\/\/ Returns the canonical generic signature. The result is cached.\n- CanGenericSignature getCanonicalSignature() const;\n-\n \/\/\/ Retrieve the generic signature builder for the given generic signature.\n GenericSignatureBuilder *getGenericSignatureBuilder() const;\n \n@@ -456,6 +453,9 @@\n ArrayRef<Requirement> getRequirements() const {\n return {getTrailingObjects<Requirement>(), NumRequirements};\n }\n+\n+ \/\/\/ Returns the canonical generic signature. The result is cached.\n+ CanGenericSignature getCanonicalSignature() const;\n };\n \n void simple_display(raw_ostream &out, GenericSignature sig);\n"} {"commit":"7a769f46724f64230bec0dd91689b231f7b1fcb7","subject":"Fix centroid quantization","message":"Fix centroid quantization\n","repos":"szellmann\/visionaray,szellmann\/visionaray","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/visionaray\/detail\/bvh\/lbvh.h\n+++ include\/visionaray\/detail\/bvh\/lbvh.h\n@@ -129,7 +129,7 @@\n vec3 centroid = centroids[i];\n \n \/\/ Express centroid in [0..1] relative to bounding box\n- centroid = (centroid - centroid_bounds.center()) \/ centroid_bounds.size();\n+ centroid = (centroid + centroid_bounds.size() * 0.5f) \/ centroid_bounds.size();\n \n \/\/ Quantize centroid to 10-bit\n centroid = min(max(centroid * 1024.0f, vec3(0.0f)), vec3(1023.0f));\n"} {"commit":"5a928a2856aca4ff7c1887a7d135a42b5cc0b796","subject":"Fix bad include in test","message":"Fix bad include in test\n\nChange-Id: I8d5cfb60808a5d512eaf7bb0580a657c73dd0d93\n","repos":"Kurento\/kms-crowddetector,shelsonjava\/kms-crowddetector,shelsonjava\/kms-crowddetector,shelsonjava\/kms-crowddetector,Kurento\/kms-crowddetector,Kurento\/kms-crowddetector","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/check\/element\/crowddetector.c\n+++ tests\/check\/element\/crowddetector.c\n@@ -19,7 +19,7 @@\n #include <gst\/check\/gstcheck.h>\n #include <gst\/gst.h>\n #include <glib.h>\n-#include \"kmsuriendpointstate.h\"\n+#include <commons\/kmsuriendpointstate.h>\n \n #include <kmstestutils.h>\n \n"} {"commit":"028087ad7ea3b4cdef1362edb16ade720c7c47e3","subject":"Add new-queue test","message":"Add new-queue test\n\nPair-programmed-with: Marcel M\u00fcller <ea88f7ca6271a6448d05ae59e24f891490fee063@gmail.com>\n","repos":"waysome\/waysome,waysome\/waysome","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/check\/objects\/ws_queue\/test.c\n+++ tests\/check\/objects\/ws_queue\/test.c\n@@ -52,6 +52,13 @@\n }\n END_TEST\n \n+START_TEST (test_queue_new) {\n+ struct ws_queue* q = ws_queue_new();\n+ ck_assert(q);\n+ ws_object_unref(&q->obj);\n+}\n+END_TEST\n+\n static Suite*\n queue_suite(void)\n {\n@@ -61,6 +68,7 @@\n suite_add_tcase(s, tc);\n \n tcase_add_test(tc, test_queue_init);\n+ tcase_add_test(tc, test_queue_new);\n return s;\n }\n \n"} {"commit":"59e44ff8d8c0bf119eb34b7bb8edaa6f9038fafc","subject":"fil0fil.c: Add missing newlines in fprintfs","message":"fil0fil.c:\n Add missing newlines in fprintfs\n","repos":"ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,slanterns\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- innobase\/fil\/fil0fil.c\n+++ innobase\/fil\/fil0fil.c\n@@ -2572,7 +2572,7 @@\n \n \t fprintf(stderr,\n \"InnoDB: Error: could not open single-table tablespace file\\n\"\n-\"InnoDB: %s!\", filepath);\n+\"InnoDB: %s!\\n\", filepath);\n \n \t\tut_free(filepath);\n \n@@ -2587,7 +2587,7 @@\n \n \t fprintf(stderr,\n \"InnoDB: Error: could not measure the size of single-table tablespace file\\n\"\n-\"InnoDB: %s!\", filepath);\n+\"InnoDB: %s!\\n\", filepath);\n \n \t\tos_file_close(file);\n \t\tut_free(filepath);\n"} {"commit":"479aed7658859e076b28fb99f1a61ee5f13d8192","subject":"row0sel.c: Monty said an SQL NULL BLOB field must have NULL as the data pointer value","message":"row0sel.c:\n Monty said an SQL NULL BLOB field must have NULL as the data pointer value\n\n\ninnobase\/row\/row0sel.c:\n Monty said an SQL NULL BLOB field must have NULL as the data pointer value\n","repos":"flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,ollie314\/server,slanterns\/server,natsys\/mariadb_10.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- innobase\/row\/row0sel.c\n+++ innobase\/row\/row0sel.c\n@@ -30,8 +30,6 @@\n #include \"pars0sym.h\"\n #include \"pars0pars.h\"\n #include \"row0mysql.h\"\n-\n-byte\trow_sel_dummy_byte;\n \n \/* Maximum number of rows to prefetch; MySQL interface has another parameter *\/\n #define SEL_MAX_N_PREFETCH\t16\n@@ -2122,13 +2120,12 @@\n \t\t\thas been marked to contain the SQL NULL value.\n \t\t\tThis caused seg faults reported by two users.\n \t\t\tSet the BLOB length to 0 and the data pointer\n-\t\t\tto a dummy allocated mem address to avoid\n-\t\t\ta seg fault. *\/\n+\t\t\tto NULL to avoid a seg fault. *\/\n \n \t\t\tif (templ->type == DATA_BLOB) {\n \t\t\t\trow_sel_field_store_in_mysql_format(\n \t\t\t\tmysql_rec + templ->mysql_col_offset,\n-\t\t\t\ttempl->mysql_col_len, &row_sel_dummy_byte,\n+\t\t\t\ttempl->mysql_col_len, NULL,\n \t\t\t\t0, templ->type, templ->is_unsigned);\n \t\t\t}\n \n"} {"commit":"d7bf8c2e6ee6fb3dfd2abb0dbb4fa5460697ad40","subject":"srv0srv.c: The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that","message":"srv0srv.c:\n The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that\n","repos":"natsys\/mariadb_10.2,natsys\/mariadb_10.2,slanterns\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- innobase\/srv\/srv0srv.c\n+++ innobase\/srv\/srv0srv.c\n@@ -2819,7 +2819,11 @@\n \t\t\n \tsrv_main_thread_op_info = (char*)\"purging\";\n \n-\tn_pages_purged = trx_purge();\n+\tif (srv_fast_shutdown && srv_shutdown_state > 0) {\n+\t n_pages_purged = 0;\n+\t} else {\n+\t n_pages_purged = trx_purge();\n+\t}\n \n \tsrv_main_thread_op_info = (char*)\"reserving kernel mutex\";\n \n@@ -2831,7 +2835,12 @@\n \tmutex_exit(&kernel_mutex);\n \n \tsrv_main_thread_op_info = (char*)\"doing insert buffer merge\";\n-\tn_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20);\n+\n+\tif (srv_fast_shutdown && srv_shutdown_state > 0) {\n+\t n_bytes_merged = 0;\n+\t} else {\n+\t n_bytes_merged = ibuf_contract_for_n_pages(TRUE, 20);\n+\t}\n \n \tsrv_main_thread_op_info = (char*)\"reserving kernel mutex\";\n \n"} {"commit":"77a682a9f6c94bef66845285797f0d172bf2bf04","subject":"current version","message":"current version\n","repos":"linbox-team\/fflas-ffpack,linbox-team\/fflas-ffpack,linbox-team\/fflas-ffpack","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fflas-ffpack\/fflas\/fflas_transpose.h\n+++ fflas-ffpack\/fflas\/fflas_transpose.h\n@@ -34,7 +34,7 @@\n #include \"fflas-ffpack\/fflas\/fflas.h\"\n \n #ifndef FFLAS_TRANSPOSE_BLOCKSIZE \n-#define FFLAS_TRANSPOSE_BLOCKSIZE 32\n+#define FFLAS_TRANSPOSE_BLOCKSIZE 32 \/\/ MUST BE A POWER OF TWO\n #endif\n \n #include \"fflas-ffpack\/fflas\/fflas_simd.h\"\n@@ -218,25 +218,29 @@\n inline typename Field::Element_ptr\n ftransposein_impl (const Field& F, const size_t m, const size_t n,\n \t\t typename Field::Element_ptr A, const size_t lda)\n- { \n+ {\n+ \/\/std::cerr<<\"\\n transposein NOSIMD used\\n\";\n \/\/ rk: m<=lda\n const size_t ls = BLOCK;\n typename Field::Element tmp; F.init(tmp);\n for (size_t i = 0; i < m; i+=ls){\n \/\/ these two loops are for diagonal blocks [i..i+ls,i..i+ls]\n for (size_t _i = i; _i < std::min(m, i+ls); _i++)\n-\tfor (size_t _j = _i+1; _j < std::min(n, i+ls); _j++){\t\n+\tfor (size_t _j = _i+1; _j < std::min(n, i+ls); _j++){\n+\t \/\/std::cerr<<\"(\"<<_i<<\",\"<<_j<<\") : \"<<_i*lda+_j<<\" <--> \"<<_j*lda+_i<< std::endl;\n \t tmp= *(A+_i*lda+_j);\n \t *(A+_i*lda+_j)=*(A+_j*lda+_i);\n \t *(A+_j*lda+_i)=tmp;\n \t}\n+ \/\/std::cerr<<\"***********\\n\";\n \/\/ this loops is for off diagonal blocks\n- for (size_t j =i+ls; j < n; j+=ls)\n+ for (size_t j =i+std::min(m,ls); j < n; j+=ls)\n \t\/\/ these two loops are for off diagonal blocks [i..i+ls,j..i+ls] and [j..j+ls,i..i+ls]\n \t\/\/ it might be usefull to copy these two ls x ls blocks into contiugous memory\n \t\/\/ -> this depends upon cache policy and mapping\n \tfor (size_t _i = i; _i < std::min(m, i+ls); _i++)\n \t for (size_t _j = j; _j < std::min(n, j+ls); _j++){\n+\t \/\/std::cerr<<\"(\"<<_i<<\",\"<<_j<<\") : \"<<_i*lda+_j<<\" <--> \"<<_j*lda+_i<< std::endl;\n \t tmp= *(A+_i*lda+_j);\n \t *(A+_i*lda+_j)=*(A+_j*lda+_i);\n \t *(A+_j*lda+_i)=tmp;\n"} {"commit":"ef28d1ccadef461179869a709fc287cd9f6c494f","subject":"put the last test out of the loop, only needs to be tested once","message":"put the last test out of the loop, only needs to be tested once\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -184,9 +184,9 @@\n i++;\n while (j < stc->frame_num && stc->index[j].pic_type == 3)\n j++;\n- if (j == stc->frame_num - 2 && stc->index[j].pic_type != 3 && stc->index[j + 1].pic_type == 3)\n- stc->index[j].pts = stc->index[j + 1].dts + stc->frame_duration;\n- }\n+ }\n+ if (stc->index[stc->frame_num - 2].pic_type != 3 && stc->index[stc->frame_num - 1 ].pic_type == 3)\n+ stc->index[stc->frame_num - 2].pts = stc->index[stc->frame_num - 1 ].dts + stc->frame_duration;\n return 0;\n }\n \n"} {"commit":"c5b005ab7091c9ef4ca9b47569a8e27e54588933","subject":"drbd: use bitmap_parse instead of __bitmap_parse","message":"drbd: use bitmap_parse instead of __bitmap_parse\n\nThe buffer 'sc.cpu_mask' is a kernel buffer. If bitmap_parse is used\ninstead of __bitmap_parse the extra parameter that indicates a kernel\nbuffer is not needed.\n\nSigned-off-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nCc: Lars Ellenberg <b22a6c7fbb694f20ce0f6c20a20ac678b82816de@lists.linbit.com>\nCc: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nCc: Jens Axboe <cd8c6775e60d6f67a6984377324e5290df3d5358@kernel.dk>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Jens Axboe <08e836a620179c237f631ad0545a7ebdf54201f3@fusionio.com>\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nSigned-off-by: Lars Ellenberg <31df9cacdc65c624cc60c2dcd22bbf92dc230e16@linbit.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/block\/drbd\/drbd_main.c\n+++ drivers\/block\/drbd\/drbd_main.c\n@@ -2637,10 +2637,10 @@\n \t\/* silently ignore cpu mask on UP kernel *\/\n \tif (nr_cpu_ids > 1 && res_opts->cpu_mask[0] != 0) {\n \t\t\/* FIXME: Get rid of constant 32 here *\/\n-\t\terr = __bitmap_parse(res_opts->cpu_mask, 32, 0,\n-\t\t\t\tcpumask_bits(new_cpu_mask), nr_cpu_ids);\n+\t\terr = bitmap_parse(res_opts->cpu_mask, 32,\n+\t\t\t\t cpumask_bits(new_cpu_mask), nr_cpu_ids);\n \t\tif (err) {\n-\t\t\tconn_warn(tconn, \"__bitmap_parse() failed with %d\\n\", err);\n+\t\t\tconn_warn(tconn, \"bitmap_parse() failed with %d\\n\", err);\n \t\t\t\/* retcode = ERR_CPU_MASK_PARSE; *\/\n \t\t\tgoto fail;\n \t\t}\n"} {"commit":"73dd0518f8e98118dbd0d93308100ad98d63c149","subject":"Revert \"[DEVMINOR] Add error lock if mutex unlock fail.\"","message":"Revert \"[DEVMINOR] Add error lock if mutex unlock fail.\"\n\nThis reverts commit 6a74992f39b257c882ffbb201b4425d2956b1346.\n","repos":"niavok\/libARSAL,niavok\/libARSAL,kradhub\/libARSAL,Parrot-Developers\/libARSAL,kradhub\/libARSAL,Parrot-Developers\/libARSAL,kradhub\/libARSAL,kradhub\/libARSAL,niavok\/libARSAL,Parrot-Developers\/libARSAL,niavok\/libARSAL","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Sources\/ARSAL_Mutex.c\n+++ Sources\/ARSAL_Mutex.c\n@@ -8,19 +8,12 @@\n #include <config.h>\n #include <libARSAL\/ARSAL_Mutex.h>\n #include <libARSAL\/ARSAL_Time.h>\n-#include <libARSAL\/ARSAL_Print.h>\n-#include <sys\/syscall.h>\n \n #if defined(HAVE_PTHREAD_H)\n #include <pthread.h>\n #else\n #error The pthread.h header is required in order to build the library\n #endif\n-\n-\/**\n- * Tag for ARSAL_PRINT\n- *\/\n-#define ARSAL_MUTEX_TAG \"ARSAL_Mutex\"\n \n int ARSAL_Mutex_Init(ARSAL_Mutex_t *mutex)\n {\n@@ -75,13 +68,6 @@\n \n #if defined(HAVE_PTHREAD_H)\n result = pthread_mutex_unlock((pthread_mutex_t *)*mutex);\n- if (result != 0)\n- {\n- ARSAL_PRINT(ARSAL_PRINT_FATAL, ARSAL_MUTEX_TAG, \"Mutex operation failed! errno = %d , %s ; thread_id = %d\",\n- result,\n- strerror(result),\n- syscall(SYS_gettid));\n- }\n #endif\n \n return result;\n"} {"commit":"16f4e743c81cec1194a0bc4c03e31f19af7ec005","subject":"drivers: block: Mark functions as static in drbd_main.c","message":"drivers: block: Mark functions as static in drbd_main.c\n\nMark functions _drbd_send_uuids(), fill_bitmap_rle_bits() and\ninit_submitter() as static in drbd\/drbd_main.c because they are\nnot used outside this file.\n\nThis eliminates the following warnings in drbd\/drbd_main.c:\ndrivers\/block\/drbd\/drbd_main.c:826:5: warning: no previous prototype for \u2018_drbd_send_uuids\u2019 [-Wmissing-prototypes]\ndrivers\/block\/drbd\/drbd_main.c:1070:5: warning: no previous prototype for \u2018fill_bitmap_rle_bits\u2019 [-Wmissing-prototypes]\ndrivers\/block\/drbd\/drbd_main.c:2592:5: warning: no previous prototype for \u2018init_submitter\u2019 [-Wmissing-prototypes]\n\nSigned-off-by: Rashika Kheria <62a2cbd3422b0d621dafb7ceeff40187aeaed4ed@gmail.com>\nReviewed-by: Josh Triplett <c028c213ed5efcf30c3f4fc7361dbde0c893c5b7@joshtriplett.org>\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/drbd\/drbd_main.c\n+++ drivers\/block\/drbd\/drbd_main.c\n@@ -823,7 +823,7 @@\n \treturn err;\n }\n \n-int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)\n+static int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags)\n {\n \tstruct drbd_socket *sock;\n \tstruct p_uuids *p;\n@@ -1067,7 +1067,7 @@\n \tp->encoding = (p->encoding & (~0x7 << 4)) | (n << 4);\n }\n \n-int fill_bitmap_rle_bits(struct drbd_conf *mdev,\n+static int fill_bitmap_rle_bits(struct drbd_conf *mdev,\n \t\t\t struct p_compressed_bm *p,\n \t\t\t unsigned int size,\n \t\t\t struct bm_xfer_ctx *c)\n@@ -2592,7 +2592,7 @@\n \tkfree(tconn);\n }\n \n-int init_submitter(struct drbd_conf *mdev)\n+static int init_submitter(struct drbd_conf *mdev)\n {\n \t\/* opencoded create_singlethread_workqueue(),\n \t * to be able to say \"drbd%d\", ..., minor *\/\n"} {"commit":"7e35b0de4a70980dda738ee7139f9d0700d27e95","subject":"va_end was missing; no code-gen impact","message":"va_end was missing; no code-gen impact","repos":"dngoins\/DirectXTK,dngoins\/DirectXTK,dngoins\/DirectXTK","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Src\/PlatformHelpers.h\n+++ Src\/PlatformHelpers.h\n@@ -40,6 +40,7 @@\n char buff[1024]={0};\r\n vsprintf_s( buff, format, args );\r\n OutputDebugStringA( buff );\r\n+ va_end( args );\r\n #else\r\n UNREFERENCED_PARAMETER( format );\r\n #endif\r\n"} {"commit":"f56c50e322eed07526a08edefa29fc8bab1e93df","subject":"cpufreq: acpi-cpufreq: Fix up the handling of cpb sysfs attribute","message":"cpufreq: acpi-cpufreq: Fix up the handling of cpb sysfs attribute\n\nThe cpb sysfs attribute is only exposed by the ACPI cpufreq driver\nafter a runtime check. For this purpose, the driver keeps a NULL\nplaceholder in its table of sysfs attributes and replaces the NULL\nwith a pointer to an attribute structure if it decides to expose\ncpb.\n\nThat is confusing, so make the driver set the pointer to the cpb\nattribute structure upfront and replace it with NULL if the\nattribute should not be exposed instead.\n\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\nAcked-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpufreq\/acpi-cpufreq.c\n+++ drivers\/cpufreq\/acpi-cpufreq.c\n@@ -888,7 +888,9 @@\n static struct freq_attr *acpi_cpufreq_attr[] = {\n \t&cpufreq_freq_attr_scaling_available_freqs,\n \t&freqdomain_cpus,\n-\tNULL,\t\/* this is a placeholder for cpb, do not remove *\/\n+#ifdef CONFIG_X86_ACPI_CPUFREQ_CPB\n+\t&cpb,\n+#endif\n \tNULL,\n };\n \n@@ -961,17 +963,16 @@\n \t * only if configured. This is considered legacy code, which\n \t * will probably be removed at some point in the future.\n \t *\/\n-\tif (check_amd_hwpstate_cpu(0)) {\n-\t\tstruct freq_attr **iter;\n-\n-\t\tpr_debug(\"adding sysfs entry for cpb\\n\");\n-\n-\t\tfor (iter = acpi_cpufreq_attr; *iter != NULL; iter++)\n-\t\t\t;\n-\n-\t\t\/* make sure there is a terminator behind it *\/\n-\t\tif (iter[1] == NULL)\n-\t\t\t*iter = &cpb;\n+\tif (!check_amd_hwpstate_cpu(0)) {\n+\t\tstruct freq_attr **attr;\n+\n+\t\tpr_debug(\"CPB unsupported, do not expose it\\n\");\n+\n+\t\tfor (attr = acpi_cpufreq_attr; *attr; attr++)\n+\t\t\tif (*attr == &cpb) {\n+\t\t\t\t*attr = NULL;\n+\t\t\t\tbreak;\n+\t\t\t}\n \t}\n #endif\n \tacpi_cpufreq_boost_init();\n"} {"commit":"f11179e807c8e34db20fec406a88c7121707697f","subject":"Update COBranchRevisionReadingOptions to better explain the current beahviour (thanks Quentin)","message":"Update COBranchRevisionReadingOptions to better explain the current beahviour (thanks Quentin)\n\ngit-svn-id: 3f5c6d78ff0be2386f5eccc3304aa879623f5ca8@10123 7b3f36aa-e6db-49c1-8b4c-66eac1997e64\n","repos":"etoile\/CoreObject,chris-armstrong\/CoreObject,chris-armstrong\/CoreObject,etoile\/CoreObject,chris-armstrong\/CoreObject,chris-armstrong\/CoreObject,etoile\/CoreObject,etoile\/CoreObject","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Store\/COSQLiteStore.h\n+++ Store\/COSQLiteStore.h\n@@ -20,14 +20,26 @@\n \t *\/\n \tCOBranchRevisionReadingDefault = 0,\n \t\/**\n-\t * Return all parent revisions of the branch's head revision, including those in other\n-\t * branches.\n-\t * TODO: Specify how merge parents are treated\n+\t * Return all parent revisions of the branch's head revision, including those in\n+\t * parent branches.\n+\t *\n+\t * Revisions on branches merged into the branch, or on branches merged into\n+\t * parent branches are not included.\n \t *\/\n \tCOBranchRevisionReadingParentBranches = 2,\n \t\/**\n-\t * Finds the set of revisions specified by the other flags, and then\n-\t * expands it by recursively finding all child revisions.\n+\t * Finds the revisions which have the same branch UUID as the one being queried,\n+\t * but are located on anonymous\/implicit branches.\n+\t *\n+\t * These divergent revisions are usually created by undo\/redo actions.\n+\t *\n+\t * Although no branch creation was requested, a divergent revision sequence\n+\t * form a \"branch\" in the history graph, this is why we call these branches implicit or anonymous.\n+\t *\n+\t * Note that this will not return revisions that are descendents of the \n+\t * head revision.\n+\t *\n+\t * See \"lost head\" example in COSQLiteStore documentation.\n \t *\/\n \tCOBranchRevisionReadingDivergentRevisions = 4\n };\n"} {"commit":"54346dc266074952f456adde9fdea4a5f3cdffb4","subject":"dont flag failed nonautoinstantiated bmaps as failure","message":"dont flag failed nonautoinstantiated bmaps as failure\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@16898 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- share\/bmap.c\n+++ share\/bmap.c\n@@ -33,6 +33,7 @@\n #include \"bmap.h\"\n #include \"fidcache.h\"\n #include \"slashrpc.h\"\n+#include \"slerr.h\"\n \n __static SPLAY_GENERATE(bmap_cache, bmapc_memb, bcm_tentry, bmap_cmp);\n \n@@ -256,8 +257,9 @@\n \t}\n out:\n \tif (b) {\n-\t\tDEBUG_BMAP(rc ? PLL_ERROR : PLL_INFO, b,\n-\t\t \"grabbed rc=%d\", rc);\n+\t\tDEBUG_BMAP(rc && (rc != SLERR_BMAP_INVALID ||\n+\t\t (flags & BMAPGETF_NOAUTOINST) == 0) ?\n+\t\t PLL_ERROR : PLL_INFO, b, \"grabbed rc=%d\", rc);\n \t\tif (rc)\n \t\t\tbmap_op_done_type(b, BMAP_OPCNT_LOOKUP);\n \t\telse {\n"} {"commit":"8673b83bf2f013379453b4779047bf3c6ae387e4","subject":"acpi-cpufreq: set current frequency based on target P-State","message":"acpi-cpufreq: set current frequency based on target P-State\n\nCommit 4b31e774 (Always set P-state on initialization) fixed bug\n#4634 and caused the driver to always set the target P-State at\nleast once since the initial P-State may not be the desired one.\nCommit 5a1c0228 (cpufreq: Avoid calling cpufreq driver's target()\nroutine if target_freq == policy->cur) caused a regression in\nthis behavior.\n\nThis fixes the regression by setting policy->cur based on the CPU's\ntarget frequency rather than the CPU's current reported frequency\n(which may be different). This means that the P-State will be set\ninitially if the CPU's target frequency is different from the\ngovernor's target frequency.\n\nThis fixes an issue where setting the default governor to\nperformance wouldn't correctly enable turbo mode on all cores.\n\nSigned-off-by: Ross Lagerwall <fc5e34b58cc89440361196388af610af47c81e07@gmail.com>\nReviewed-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\nAcked-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\nCc: 3.8+ <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpufreq\/acpi-cpufreq.c\n+++ drivers\/cpufreq\/acpi-cpufreq.c\n@@ -347,11 +347,11 @@\n \tswitch (per_cpu(acfreq_data, cpumask_first(mask))->cpu_feature) {\n \tcase SYSTEM_INTEL_MSR_CAPABLE:\n \t\tcmd.type = SYSTEM_INTEL_MSR_CAPABLE;\n-\t\tcmd.addr.msr.reg = MSR_IA32_PERF_STATUS;\n+\t\tcmd.addr.msr.reg = MSR_IA32_PERF_CTL;\n \t\tbreak;\n \tcase SYSTEM_AMD_MSR_CAPABLE:\n \t\tcmd.type = SYSTEM_AMD_MSR_CAPABLE;\n-\t\tcmd.addr.msr.reg = MSR_AMD_PERF_STATUS;\n+\t\tcmd.addr.msr.reg = MSR_AMD_PERF_CTL;\n \t\tbreak;\n \tcase SYSTEM_IO_CAPABLE:\n \t\tcmd.type = SYSTEM_IO_CAPABLE;\n"} {"commit":"8619796d8fc6291de0abc7bf84c9eaabb3787041","subject":"Foward accumulated values to next recursion stage","message":"Foward accumulated values to next recursion stage\n\nThese values are already passed as universal references and should be forwarded to the next `run` call.\nAlso note the discussion in the origin repository: https:\/\/github.com\/aminroosta\/sqlite_modern_cpp\/pull\/5\n","repos":"zauguin\/sqlite_modern_cpp,aminroosta\/sqlite_modern_cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sqlite_modern_cpp.h\n+++ src\/sqlite_modern_cpp.h\n@@ -291,7 +291,7 @@\n \t\tnth_argument_type<Function, sizeof...(Values)> value{};\n \t\tdb.get_col_from_db(sizeof...(Values), value);\n \n-\t\trun<Function>(db, function, values..., value);\n+\t\trun<Function>(db, function, std::forward<Values>(values)..., std::move(value));\n \t}\n \n \ttemplate<\n"} {"commit":"9b1c0d5b4a8e1f2b11cef62630e7e9dddcb7cb99","subject":"Fix incorrect comment for publish_aaaa_on_ipv4","message":"Fix incorrect comment for publish_aaaa_on_ipv4\n\nComment for publish_aaaa_on_ipv4 incorrectly duplicated the\npublish_a_on_ipv6 comment. (Closes: #41)\n","repos":"lathiat\/avahi,heftig\/avahi,lathiat\/avahi,heftig\/avahi,lathiat\/avahi,heftig\/avahi,heftig\/avahi,heftig\/avahi,lathiat\/avahi,heftig\/avahi,lathiat\/avahi,lathiat\/avahi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- avahi-core\/core.h\n+++ avahi-core\/core.h\n@@ -65,7 +65,7 @@\n int disable_publishing; \/**< Disable publishing of any record *\/\n int allow_point_to_point; \/**< Enable publishing on POINTOPOINT interfaces *\/\n int publish_a_on_ipv6; \/**< Publish an IPv4 A RR on IPv6 sockets *\/\n- int publish_aaaa_on_ipv4; \/**< Publish an IPv4 A RR on IPv6 sockets *\/\n+ int publish_aaaa_on_ipv4; \/**< Publish an IPv6 AAAA RR on IPv4 sockets *\/\n unsigned n_cache_entries_max; \/**< Maximum number of cache entries per interface *\/\n AvahiUsec ratelimit_interval; \/**< If non-zero, rate-limiting interval parameter. *\/\n unsigned ratelimit_burst; \/**< If ratelimit_interval is non-zero, rate-limiting burst parameter. *\/\n"} {"commit":"746b3df98b2edc0e0844537a247e820ac6503031","subject":"cpufreq: cpufreq-cpu0: No need to check cpu number in init()","message":"cpufreq: cpufreq-cpu0: No need to check cpu number in init()\n\nIt is not possible for init() to be called for any cpu other than cpu0. During\nbootup whatever cpu is used to boot system will be assigned as cpu0. And later\non policy->cpu can only change if we hotunplug all cpus first and then hotplug\nthem back in different order, which isn't possible (system requires atleast one\ncpu to be up always :)).\n\nThough I can see one situation where policy->cpu can be different then zero.\n- Hot-unplug cpu 0.\n- rmmod cpufreq-cpu0 module\n- insmod it back\n- hotplug cpu 0 again.\n\nHere, policy->cpu would be different. But the driver doesn't have any dependency\non cpu0 as such. We don't mind which cpu of a system is policy->cpu and so this\ncheck is just not required.\n\nRemove it.\n\nSigned-off-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@linaro.org>\nAcked-by: Shawn Guo <912cf7eb7d8018e2943586ae6657d21fd4e38239@linaro.org>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/cpufreq\/cpufreq-cpu0.c\n+++ drivers\/cpufreq\/cpufreq-cpu0.c\n@@ -129,9 +129,6 @@\n static int cpu0_cpufreq_init(struct cpufreq_policy *policy)\n {\n \tint ret;\n-\n-\tif (policy->cpu != 0)\n-\t\treturn -EINVAL;\n \n \tret = cpufreq_frequency_table_cpuinfo(policy, freq_table);\n \tif (ret) {\n"} {"commit":"51443fbf3d2cde16011b994252c8004ebcd66fb0","subject":"cpufreq: intel_pstate: Fix intel_pstate powersave min_perf_pct value","message":"cpufreq: intel_pstate: Fix intel_pstate powersave min_perf_pct value\n\nOn systems that initialize the intel_pstate driver with the performance\ngovernor, and then switch to the powersave governor will not transition to\nlower cpu frequencies until \/sys\/devices\/system\/cpu\/intel_pstate\/min_perf_pct\nis set to a low value.\n\nThe behavior of governor switching changed after commit a04759924e25\n(\"[cpufreq] intel_pstate: honor user space min_perf_pct override on\n resume\"). The commit introduced tracking of performance percentage\nchanges via sysfs in order to restore userspace changes during\nsuspend\/resume. The problem occurs because the global values of the newly\nintroduced max_sysfs_pct and min_sysfs_pct are not lowered on the governor\nchange and this causes the powersave governor to inherit the performance\ngovernor's settings.\n\nA simple change would have been to reset max_sysfs_pct to 100 and\nmin_sysfs_pct to 0 on a governor change, which fixes the problem with\ngovernor switching. However, since we cannot break userspace[1] the fix\nis now to give each governor its own limits storage area so that governor\nspecific changes are tracked.\n\nI successfully tested this by booting with both the performance governor\nand the powersave governor by default, and switching between the two\ngovernors (while monitoring \/sys\/devices\/system\/cpu\/intel_pstate\/ values,\nand looking at the output of cpupower frequency-info). Suspend\/Resume\ntesting was performed by Doug Smythies.\n\n[1] Systems which suspend\/resume using the unmaintained pm-utils package\nwill always transition to the performance governor before the suspend and\nafter the resume. This means a system using the powersave governor will\ngo from powersave to performance, then suspend\/resume, performance to\npowersave. The simple change during governor changes would have been\noverwritten when the governor changed before and after the suspend\/resume.\nI have submitted https:\/\/bugzilla.redhat.com\/show_bug.cgi?id=1271225\nagainst Fedora to remove the 94cpufreq file that causes the problem. It\nshould be noted that pm-utils is obsoleted with newer versions of systemd.\n\nSigned-off-by: Prarit Bhargava <fe4655370dc87a32329d591d6e8472329333dfad@redhat.com>\nAcked-by: Kristen Carlson Accardi <047ff8258f0113ece56e5e2fe9e0d987b14c4333@linux.intel.com>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpufreq\/intel_pstate.c\n+++ drivers\/cpufreq\/intel_pstate.c\n@@ -167,7 +167,20 @@\n \tint min_perf_ctl;\n };\n \n-static struct perf_limits limits = {\n+static struct perf_limits performance_limits = {\n+\t.no_turbo = 0,\n+\t.turbo_disabled = 0,\n+\t.max_perf_pct = 100,\n+\t.max_perf = int_tofp(1),\n+\t.min_perf_pct = 100,\n+\t.min_perf = int_tofp(1),\n+\t.max_policy_pct = 100,\n+\t.max_sysfs_pct = 100,\n+\t.min_policy_pct = 0,\n+\t.min_sysfs_pct = 0,\n+};\n+\n+static struct perf_limits powersave_limits = {\n \t.no_turbo = 0,\n \t.turbo_disabled = 0,\n \t.max_perf_pct = 100,\n@@ -181,6 +194,12 @@\n \t.max_perf_ctl = 0,\n \t.min_perf_ctl = 0,\n };\n+\n+#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE\n+static struct perf_limits *limits = &performance_limits;\n+#else\n+static struct perf_limits *limits = &powersave_limits;\n+#endif\n \n #if IS_ENABLED(CONFIG_ACPI)\n \/*\n@@ -256,7 +275,7 @@\n \tif (turbo_pss_ctl <= cpu->pstate.max_pstate &&\n \t turbo_pss_ctl > cpu->pstate.min_pstate) {\n \t\tpr_debug(\"intel_pstate: no turbo range exists in _PSS\\n\");\n-\t\tlimits.no_turbo = limits.turbo_disabled = 1;\n+\t\tlimits->no_turbo = limits->turbo_disabled = 1;\n \t\tcpu->pstate.turbo_pstate = cpu->pstate.max_pstate;\n \t\tturbo_absent = true;\n \t}\n@@ -415,7 +434,7 @@\n \n \tcpu = all_cpu_data[0];\n \trdmsrl(MSR_IA32_MISC_ENABLE, misc_en);\n-\tlimits.turbo_disabled =\n+\tlimits->turbo_disabled =\n \t\t(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE ||\n \t\t cpu->pstate.max_pstate == cpu->pstate.turbo_pstate);\n }\n@@ -434,14 +453,14 @@\n \n \tfor_each_online_cpu(cpu) {\n \t\trdmsrl_on_cpu(cpu, MSR_HWP_REQUEST, &value);\n-\t\tadj_range = limits.min_perf_pct * range \/ 100;\n+\t\tadj_range = limits->min_perf_pct * range \/ 100;\n \t\tmin = hw_min + adj_range;\n \t\tvalue &= ~HWP_MIN_PERF(~0L);\n \t\tvalue |= HWP_MIN_PERF(min);\n \n-\t\tadj_range = limits.max_perf_pct * range \/ 100;\n+\t\tadj_range = limits->max_perf_pct * range \/ 100;\n \t\tmax = hw_min + adj_range;\n-\t\tif (limits.no_turbo) {\n+\t\tif (limits->no_turbo) {\n \t\t\thw_max = HWP_GUARANTEED_PERF(cap);\n \t\t\tif (hw_max < max)\n \t\t\t\tmax = hw_max;\n@@ -510,7 +529,7 @@\n \tstatic ssize_t show_##file_name\t\t\t\t\t\\\n \t(struct kobject *kobj, struct attribute *attr, char *buf)\t\\\n \t{\t\t\t\t\t\t\t\t\\\n-\t\treturn sprintf(buf, \"%u\\n\", limits.object);\t\t\\\n+\t\treturn sprintf(buf, \"%u\\n\", limits->object);\t\t\\\n \t}\n \n static ssize_t show_turbo_pct(struct kobject *kobj,\n@@ -546,10 +565,10 @@\n \tssize_t ret;\n \n \tupdate_turbo_state();\n-\tif (limits.turbo_disabled)\n-\t\tret = sprintf(buf, \"%u\\n\", limits.turbo_disabled);\n+\tif (limits->turbo_disabled)\n+\t\tret = sprintf(buf, \"%u\\n\", limits->turbo_disabled);\n \telse\n-\t\tret = sprintf(buf, \"%u\\n\", limits.no_turbo);\n+\t\tret = sprintf(buf, \"%u\\n\", limits->no_turbo);\n \n \treturn ret;\n }\n@@ -565,12 +584,12 @@\n \t\treturn -EINVAL;\n \n \tupdate_turbo_state();\n-\tif (limits.turbo_disabled) {\n+\tif (limits->turbo_disabled) {\n \t\tpr_warn(\"intel_pstate: Turbo disabled by BIOS or unavailable on processor\\n\");\n \t\treturn -EPERM;\n \t}\n \n-\tlimits.no_turbo = clamp_t(int, input, 0, 1);\n+\tlimits->no_turbo = clamp_t(int, input, 0, 1);\n \n \tif (hwp_active)\n \t\tintel_pstate_hwp_set();\n@@ -588,11 +607,15 @@\n \tif (ret != 1)\n \t\treturn -EINVAL;\n \n-\tlimits.max_sysfs_pct = clamp_t(int, input, 0 , 100);\n-\tlimits.max_perf_pct = min(limits.max_policy_pct, limits.max_sysfs_pct);\n-\tlimits.max_perf_pct = max(limits.min_policy_pct, limits.max_perf_pct);\n-\tlimits.max_perf_pct = max(limits.min_perf_pct, limits.max_perf_pct);\n-\tlimits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));\n+\tlimits->max_sysfs_pct = clamp_t(int, input, 0 , 100);\n+\tlimits->max_perf_pct = min(limits->max_policy_pct,\n+\t\t\t\t limits->max_sysfs_pct);\n+\tlimits->max_perf_pct = max(limits->min_policy_pct,\n+\t\t\t\t limits->max_perf_pct);\n+\tlimits->max_perf_pct = max(limits->min_perf_pct,\n+\t\t\t\t limits->max_perf_pct);\n+\tlimits->max_perf = div_fp(int_tofp(limits->max_perf_pct),\n+\t\t\t\t int_tofp(100));\n \n \tif (hwp_active)\n \t\tintel_pstate_hwp_set();\n@@ -609,11 +632,15 @@\n \tif (ret != 1)\n \t\treturn -EINVAL;\n \n-\tlimits.min_sysfs_pct = clamp_t(int, input, 0 , 100);\n-\tlimits.min_perf_pct = max(limits.min_policy_pct, limits.min_sysfs_pct);\n-\tlimits.min_perf_pct = min(limits.max_policy_pct, limits.min_perf_pct);\n-\tlimits.min_perf_pct = min(limits.max_perf_pct, limits.min_perf_pct);\n-\tlimits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));\n+\tlimits->min_sysfs_pct = clamp_t(int, input, 0 , 100);\n+\tlimits->min_perf_pct = max(limits->min_policy_pct,\n+\t\t\t\t limits->min_sysfs_pct);\n+\tlimits->min_perf_pct = min(limits->max_policy_pct,\n+\t\t\t\t limits->min_perf_pct);\n+\tlimits->min_perf_pct = min(limits->max_perf_pct,\n+\t\t\t\t limits->min_perf_pct);\n+\tlimits->min_perf = div_fp(int_tofp(limits->min_perf_pct),\n+\t\t\t\t int_tofp(100));\n \n \tif (hwp_active)\n \t\tintel_pstate_hwp_set();\n@@ -693,7 +720,7 @@\n \tu32 vid;\n \n \tval = (u64)pstate << 8;\n-\tif (limits.no_turbo && !limits.turbo_disabled)\n+\tif (limits->no_turbo && !limits->turbo_disabled)\n \t\tval |= (u64)1 << 32;\n \n \tvid_fp = cpudata->vid.min + mul_fp(\n@@ -822,7 +849,7 @@\n \tu64 val;\n \n \tval = (u64)pstate << 8;\n-\tif (limits.no_turbo && !limits.turbo_disabled)\n+\tif (limits->no_turbo && !limits->turbo_disabled)\n \t\tval |= (u64)1 << 32;\n \n \twrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val);\n@@ -905,7 +932,7 @@\n \tint max_perf_adj;\n \tint min_perf;\n \n-\tif (limits.no_turbo || limits.turbo_disabled)\n+\tif (limits->no_turbo || limits->turbo_disabled)\n \t\tmax_perf = cpu->pstate.max_pstate;\n \n \t\/*\n@@ -913,21 +940,21 @@\n \t * policy, or by cpu specific default values determined through\n \t * experimentation.\n \t *\/\n-\tif (limits.max_perf_ctl && limits.max_sysfs_pct >=\n-\t\t\t\t\t\tlimits.max_policy_pct) {\n-\t\t*max = limits.max_perf_ctl;\n+\tif (limits->max_perf_ctl && limits->max_sysfs_pct >=\n+\t\t\t\t\t\tlimits->max_policy_pct) {\n+\t\t*max = limits->max_perf_ctl;\n \t} else {\n \t\tmax_perf_adj = fp_toint(mul_fp(int_tofp(max_perf),\n-\t\t\t\t\tlimits.max_perf));\n+\t\t\t\t\tlimits->max_perf));\n \t\t*max = clamp_t(int, max_perf_adj, cpu->pstate.min_pstate,\n \t\t\t cpu->pstate.turbo_pstate);\n \t}\n \n-\tif (limits.min_perf_ctl) {\n-\t\t*min = limits.min_perf_ctl;\n+\tif (limits->min_perf_ctl) {\n+\t\t*min = limits->min_perf_ctl;\n \t} else {\n \t\tmin_perf = fp_toint(mul_fp(int_tofp(max_perf),\n-\t\t\t\t limits.min_perf));\n+\t\t\t\t limits->min_perf));\n \t\t*min = clamp_t(int, min_perf, cpu->pstate.min_pstate, max_perf);\n \t}\n }\n@@ -1215,34 +1242,35 @@\n \n \tif (policy->policy == CPUFREQ_POLICY_PERFORMANCE &&\n \t policy->max >= policy->cpuinfo.max_freq) {\n-\t\tlimits.min_policy_pct = 100;\n-\t\tlimits.min_perf_pct = 100;\n-\t\tlimits.min_perf = int_tofp(1);\n-\t\tlimits.max_policy_pct = 100;\n-\t\tlimits.max_perf_pct = 100;\n-\t\tlimits.max_perf = int_tofp(1);\n-\t\tlimits.no_turbo = 0;\n-\t\tlimits.max_perf_ctl = 0;\n-\t\tlimits.min_perf_ctl = 0;\n+\t\tpr_debug(\"intel_pstate: set performance\\n\");\n+\t\tlimits = &performance_limits;\n \t\treturn 0;\n \t}\n \n-\tlimits.min_policy_pct = (policy->min * 100) \/ policy->cpuinfo.max_freq;\n-\tlimits.min_policy_pct = clamp_t(int, limits.min_policy_pct, 0 , 100);\n-\tlimits.max_policy_pct = (policy->max * 100) \/ policy->cpuinfo.max_freq;\n-\tlimits.max_policy_pct = clamp_t(int, limits.max_policy_pct, 0 , 100);\n+\tpr_debug(\"intel_pstate: set powersave\\n\");\n+\tlimits = &powersave_limits;\n+\tlimits->min_policy_pct = (policy->min * 100) \/ policy->cpuinfo.max_freq;\n+\tlimits->min_policy_pct = clamp_t(int, limits->min_policy_pct, 0 , 100);\n+\tlimits->max_policy_pct = (policy->max * 100) \/ policy->cpuinfo.max_freq;\n+\tlimits->max_policy_pct = clamp_t(int, limits->max_policy_pct, 0 , 100);\n \n \t\/* Normalize user input to [min_policy_pct, max_policy_pct] *\/\n-\tlimits.min_perf_pct = max(limits.min_policy_pct, limits.min_sysfs_pct);\n-\tlimits.min_perf_pct = min(limits.max_policy_pct, limits.min_perf_pct);\n-\tlimits.max_perf_pct = min(limits.max_policy_pct, limits.max_sysfs_pct);\n-\tlimits.max_perf_pct = max(limits.min_policy_pct, limits.max_perf_pct);\n+\tlimits->min_perf_pct = max(limits->min_policy_pct,\n+\t\t\t\t limits->min_sysfs_pct);\n+\tlimits->min_perf_pct = min(limits->max_policy_pct,\n+\t\t\t\t limits->min_perf_pct);\n+\tlimits->max_perf_pct = min(limits->max_policy_pct,\n+\t\t\t\t limits->max_sysfs_pct);\n+\tlimits->max_perf_pct = max(limits->min_policy_pct,\n+\t\t\t\t limits->max_perf_pct);\n \n \t\/* Make sure min_perf_pct <= max_perf_pct *\/\n-\tlimits.min_perf_pct = min(limits.max_perf_pct, limits.min_perf_pct);\n-\n-\tlimits.min_perf = div_fp(int_tofp(limits.min_perf_pct), int_tofp(100));\n-\tlimits.max_perf = div_fp(int_tofp(limits.max_perf_pct), int_tofp(100));\n+\tlimits->min_perf_pct = min(limits->max_perf_pct, limits->min_perf_pct);\n+\n+\tlimits->min_perf = div_fp(int_tofp(limits->min_perf_pct),\n+\t\t\t\t int_tofp(100));\n+\tlimits->max_perf = div_fp(int_tofp(limits->max_perf_pct),\n+\t\t\t\t int_tofp(100));\n \n #if IS_ENABLED(CONFIG_ACPI)\n \tcpu = all_cpu_data[policy->cpu];\n@@ -1251,14 +1279,14 @@\n \n \t\tcontrol = convert_to_native_pstate_format(cpu, i);\n \t\tif (control * cpu->pstate.scaling == policy->max)\n-\t\t\tlimits.max_perf_ctl = control;\n+\t\t\tlimits->max_perf_ctl = control;\n \t\tif (control * cpu->pstate.scaling == policy->min)\n-\t\t\tlimits.min_perf_ctl = control;\n+\t\t\tlimits->min_perf_ctl = control;\n \t}\n \n \tpr_debug(\"intel_pstate: max %u policy_max %u perf_ctl [0x%x-0x%x]\\n\",\n-\t\t policy->cpuinfo.max_freq, policy->max, limits.min_perf_ctl,\n-\t\t limits.max_perf_ctl);\n+\t\t policy->cpuinfo.max_freq, policy->max, limits->min_perf_ctl,\n+\t\t limits->max_perf_ctl);\n #endif\n \n \tif (hwp_active)\n@@ -1303,7 +1331,7 @@\n \n \tcpu = all_cpu_data[policy->cpu];\n \n-\tif (limits.min_perf_pct == 100 && limits.max_perf_pct == 100)\n+\tif (limits->min_perf_pct == 100 && limits->max_perf_pct == 100)\n \t\tpolicy->policy = CPUFREQ_POLICY_PERFORMANCE;\n \telse\n \t\tpolicy->policy = CPUFREQ_POLICY_POWERSAVE;\n"} {"commit":"82f7dae3e81a4054464bee42b49f1d872c7ca63d","subject":"Warn about pidfiles not being created.","message":"Warn about pidfiles not being created.\n\n","repos":"williamh\/openrc,OpenRC\/openrc,OpenRC\/openrc,williamh\/openrc,williamh\/openrc,dwfreed\/openrc,dwfreed\/openrc,dwfreed\/openrc,OpenRC\/openrc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/start-stop-daemon.c\n+++ src\/start-stop-daemon.c\n@@ -1049,9 +1049,12 @@\n \t\t\t} else {\n \t\t\t\tif (pidfile) {\n \t\t\t\t\t\/* The pidfile may not have been written yet - give it some time *\/\n-\t\t\t\t\tif (get_pid (pidfile, true) == -1)\n+\t\t\t\t\tif (get_pid (pidfile, true) == -1) {\n+\t\t\t\t\t\tif (! nloopsp)\n+\t\t\t\t\t\t\teerrorx (\"%s: did not create a valid pid in `%s'\",\n+\t\t\t\t\t\t\t\t\t applet, pidfile);\n \t\t\t\t\t\talive = true;\n-\t\t\t\t\telse\n+\t\t\t\t\t} else\n \t\t\t\t\t\tnloopsp = 0;\n \t\t\t\t}\n \t\t\t\tif (do_stop (exec, cmd, pidfile, uid, 0, true, false, true) > 0)\n"} {"commit":"b06f4a5e722426c928fe85f586d5d28332a50e35","subject":"drivers: flash_stm32_v1: fix a potential unaligned access","message":"drivers: flash_stm32_v1: fix a potential unaligned access\n\nThe flash write function casts a void * to flash_prg_t, which can be 2,\n4 or 8 bytes long depending on the SoC. This can trigger a hard fault\nexception if data is not aligned, such as when passing a constant string\nfrom settings_save_one().\n\nCopying the chunk of data to a temporary variable on the stack to avoid\nthe problem.\n\nSigned-off-by: Fabio Baltieri <161d407f4dc681bfd4aedb33b8273b2aafd727bc@gmail.com>\n","repos":"galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/flash\/flash_stm32_v1.c\n+++ drivers\/flash\/flash_stm32_v1.c\n@@ -210,11 +210,13 @@\n \t\t\t const void *data, unsigned int len)\n {\n \tint i, rc = 0;\n-\tconst flash_prg_t *values = (const flash_prg_t *)data;\n+\tflash_prg_t value;\n \n \tfor (i = 0; i < len \/ sizeof(flash_prg_t); i++) {\n-\t\trc = write_value(dev, offset + i * sizeof(flash_prg_t),\n-\t\t\t\t values[i]);\n+\t\tmemcpy(&value,\n+\t\t (const uint8_t *)data + i * sizeof(flash_prg_t),\n+\t\t sizeof(flash_prg_t));\n+\t\trc = write_value(dev, offset + i * sizeof(flash_prg_t), value);\n \t\tif (rc < 0) {\n \t\t\treturn rc;\n \t\t}\n"} {"commit":"618118416312798d572e9ce77275180d62507821","subject":"drivers: flash: stm32g4x: fix LOG_ERR compiler warning","message":"drivers: flash: stm32g4x: fix LOG_ERR compiler warning\n\noff_t can be 32-bit or 64-bit depending on the platform. STM32 flash\naddresses are always 32-bit so it's safe to use long here.\n\nSigned-off-by: Martin J\u00e4ger <54669547a225ff20cba8b75a4adca540eef25858@libre.solar>\n","repos":"zephyrproject-rtos\/zephyr,galak\/zephyr,nashif\/zephyr,nashif\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,Vudentz\/zephyr,galak\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,nashif\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/flash\/flash_stm32g4x.c\n+++ drivers\/flash\/flash_stm32g4x.c\n@@ -69,7 +69,7 @@\n \t\/* Check if this double word is erased *\/\n \tif (flash[0] != 0xFFFFFFFFUL ||\n \t flash[1] != 0xFFFFFFFFUL) {\n-\t\tLOG_ERR(\"Word at offs %d not erased\", offset);\n+\t\tLOG_ERR(\"Word at offs %ld not erased\", (long)offset);\n \t\treturn -EIO;\n \t}\n \n"} {"commit":"4dee91bea99828468f8c5b56dafce05d41563985","subject":"gpio\/atmel_sam3: convert to use DEVICE_AND_API_INIT()","message":"gpio\/atmel_sam3: convert to use DEVICE_AND_API_INIT()\n\nChange-Id: I09cd91737993d30c89073656b8ae95462d5f317d\nSigned-off-by: Daniel Leung <d94e04d205b5962d7873a139ef298b03c1717f72@intel.com>\n","repos":"sharronliu\/zephyr,rsalveti\/zephyr,aceofall\/zephyr-iotos,finikorg\/zephyr,fractalclone\/zephyr-riscv,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,fractalclone\/zephyr-riscv,nashif\/zephyr,32bitmicro\/zephyr,mbolivar\/zephyr,runchip\/zephyr-cc3220,GiulianoFranchetto\/zephyr,zephyriot\/zephyr,pklazy\/zephyr,fractalclone\/zephyr-riscv,galak\/zephyr,bigdinotech\/zephyr,fractalclone\/zephyr-riscv,Vudentz\/zephyr,punitvara\/zephyr,finikorg\/zephyr,nashif\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3200,holtmann\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,fractalclone\/zephyr-riscv,aceofall\/zephyr-iotos,fbsder\/zephyr,galak\/zephyr,bboozzoo\/zephyr,aceofall\/zephyr-iotos,sharronliu\/zephyr,pklazy\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,punitvara\/zephyr,galak\/zephyr,32bitmicro\/zephyr,kraj\/zephyr,bboozzoo\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,explora26\/zephyr,zephyriot\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,mirzak\/zephyr-os,galak\/zephyr,rsalveti\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,mirzak\/zephyr-os,aceofall\/zephyr-iotos,erwango\/zephyr,holtmann\/zephyr,runchip\/zephyr-cc3220,erwango\/zephyr,tidyjiang8\/zephyr-doc,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,aceofall\/zephyr-iotos,mirzak\/zephyr-os,bboozzoo\/zephyr,erwango\/zephyr,Vudentz\/zephyr,explora26\/zephyr,pklazy\/zephyr,holtmann\/zephyr,tidyjiang8\/zephyr-doc,pklazy\/zephyr,GiulianoFranchetto\/zephyr,sharronliu\/zephyr,runchip\/zephyr-cc3220,explora26\/zephyr,32bitmicro\/zephyr,mirzak\/zephyr-os,fbsder\/zephyr,zephyriot\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3200,32bitmicro\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3200,punitvara\/zephyr,ldts\/zephyr,holtmann\/zephyr,erwango\/zephyr,mirzak\/zephyr-os,bboozzoo\/zephyr,tidyjiang8\/zephyr-doc,GiulianoFranchetto\/zephyr,ldts\/zephyr,runchip\/zephyr-cc3220,explora26\/zephyr,tidyjiang8\/zephyr-doc,pklazy\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,rsalveti\/zephyr,kraj\/zephyr,mbolivar\/zephyr,runchip\/zephyr-cc3220,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3200,nashif\/zephyr,32bitmicro\/zephyr,zephyriot\/zephyr,finikorg\/zephyr,finikorg\/zephyr,ldts\/zephyr,fbsder\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,bigdinotech\/zephyr,sharronliu\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,punitvara\/zephyr,galak\/zephyr,mbolivar\/zephyr,ldts\/zephyr,nashif\/zephyr,ldts\/zephyr,holtmann\/zephyr,fbsder\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpio\/gpio_atmel_sam3.c\n+++ drivers\/gpio\/gpio_atmel_sam3.c\n@@ -303,8 +303,6 @@\n {\n \tstruct gpio_sam3_config *cfg = dev->config->config_info;\n \n-\tdev->driver_api = &gpio_sam3_drv_api_funcs;\n-\n \tcfg->config_func(dev);\n \n \treturn 0;\n@@ -320,9 +318,10 @@\n \t.config_func = gpio_sam3_config_a,\n };\n \n-DEVICE_INIT(gpio_sam3_a, CONFIG_GPIO_ATMEL_SAM3_PORTA_DEV_NAME,\n-\t gpio_sam3_init, NULL, &gpio_sam3_a_cfg,\n-\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);\n+DEVICE_AND_API_INIT(gpio_sam3_a, CONFIG_GPIO_ATMEL_SAM3_PORTA_DEV_NAME,\n+\t\t gpio_sam3_init, NULL, &gpio_sam3_a_cfg,\n+\t\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\n+\t\t &gpio_sam3_drv_api_funcs);\n \n void gpio_sam3_config_a(struct device *dev)\n {\n@@ -345,9 +344,10 @@\n \t.config_func = gpio_sam3_config_b,\n };\n \n-DEVICE_INIT(gpio_sam3_b, CONFIG_GPIO_ATMEL_SAM3_PORTB_DEV_NAME,\n-\t gpio_sam3_init, NULL, &gpio_sam3_b_cfg,\n-\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);\n+DEVICE_AND_API_INIT(gpio_sam3_b, CONFIG_GPIO_ATMEL_SAM3_PORTB_DEV_NAME,\n+\t\t gpio_sam3_init, NULL, &gpio_sam3_b_cfg,\n+\t\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\n+\t\t &gpio_sam3_drv_api_funcs);\n \n void gpio_sam3_config_b(struct device *dev)\n {\n@@ -370,9 +370,10 @@\n \t.config_func = gpio_sam3_config_c,\n };\n \n-DEVICE_INIT(gpio_sam3_c, CONFIG_GPIO_ATMEL_SAM3_PORTC_DEV_NAME,\n-\t gpio_sam3_init, NULL, &gpio_sam3_c_cfg,\n-\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);\n+DEVICE_AND_API_INIT(gpio_sam3_c, CONFIG_GPIO_ATMEL_SAM3_PORTC_DEV_NAME,\n+\t\t gpio_sam3_init, NULL, &gpio_sam3_c_cfg,\n+\t\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\n+\t\t &gpio_sam3_drv_api_funcs);\n \n void gpio_sam3_config_c(struct device *dev)\n {\n@@ -395,9 +396,10 @@\n \t.config_func = gpio_sam3_config_d,\n };\n \n-DEVICE_INIT(gpio_sam3_d, CONFIG_GPIO_ATMEL_SAM3_PORTD_DEV_NAME,\n-\t gpio_sam3_init, NULL, &gpio_sam3_d_cfg,\n-\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);\n+DEVICE_AND_API_INIT(gpio_sam3_d, CONFIG_GPIO_ATMEL_SAM3_PORTD_DEV_NAME,\n+\t\t gpio_sam3_init, NULL, &gpio_sam3_d_cfg,\n+\t\t SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,\n+\t\t &gpio_sam3_drv_api_funcs);\n \n void gpio_sam3_config_d(struct device *dev)\n {\n"} {"commit":"a17538f93c16f0e15e35dc31eedad87e2d9c5c26","subject":"drm\/radeon\/kms: rs400\/480 MC setup is different than r300.","message":"drm\/radeon\/kms: rs400\/480 MC setup is different than r300.\n\nBoot testing on my rs480 laptop found the MC idle never happened\non startup, a quick check with AMD found the idle bit is in a different\nplace on the rs4xx than r300.\n\nImplement a new rs400 mc idle function to fix this.\n\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/rs400.c\n+++ drivers\/gpu\/drm\/radeon\/rs400.c\n@@ -223,15 +223,31 @@\n \treturn 0;\n }\n \n+int rs400_mc_wait_for_idle(struct radeon_device *rdev)\n+{\n+\tunsigned i;\n+\tuint32_t tmp;\n+\n+\tfor (i = 0; i < rdev->usec_timeout; i++) {\n+\t\t\/* read MC_STATUS *\/\n+\t\ttmp = RREG32(0x0150);\n+\t\tif (tmp & (1 << 2)) {\n+\t\t\treturn 0;\n+\t\t}\n+\t\tDRM_UDELAY(1);\n+\t}\n+\treturn -1;\n+}\n+\n void rs400_gpu_init(struct radeon_device *rdev)\n {\n \t\/* FIXME: HDP same place on rs400 ? *\/\n \tr100_hdp_reset(rdev);\n \t\/* FIXME: is this correct ? *\/\n \tr420_pipes_init(rdev);\n-\tif (r300_mc_wait_for_idle(rdev)) {\n-\t\tprintk(KERN_WARNING \"Failed to wait MC idle while \"\n-\t\t \"programming pipes. Bad things might happen.\\n\");\n+\tif (rs400_mc_wait_for_idle(rdev)) {\n+\t\tprintk(KERN_WARNING \"rs400: Failed to wait MC idle while \"\n+\t\t \"programming pipes. Bad things might happen. %08x\\n\", RREG32(0x150));\n \t}\n }\n \n@@ -370,8 +386,8 @@\n \tr100_mc_stop(rdev, &save);\n \n \t\/* Wait for mc idle *\/\n-\tif (r300_mc_wait_for_idle(rdev))\n-\t\tdev_warn(rdev->dev, \"Wait MC idle timeout before updating MC.\\n\");\n+\tif (rs400_mc_wait_for_idle(rdev))\n+\t\tdev_warn(rdev->dev, \"rs400: Wait MC idle timeout before updating MC.\\n\");\n \tWREG32(R_000148_MC_FB_LOCATION,\n \t\tS_000148_MC_FB_START(rdev->mc.vram_start >> 16) |\n \t\tS_000148_MC_FB_TOP(rdev->mc.vram_end >> 16));\n"} {"commit":"12f797ef4b97e5bbd03d0ace0d28bb9362574407","subject":"msm: kgsl: Unmap memory after using it in CFF capture","message":"msm: kgsl: Unmap memory after using it in CFF capture\n\nUnmap memory from kernel space after it is used in CFF capture\nfunction. The kernel mapping is not used frequently and code\nsections that use it will always remap it in kernel.\n\nChange-Id: I7909f11de928b5a5c881a3e693fb54aecd681bd3\nSigned-off-by: Shubhraprakash Das <af9cbceb8388e2170881d17f5ca88833c5c37ed6@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/msm\/kgsl_cffdump.c\n+++ drivers\/gpu\/msm\/kgsl_cffdump.c\n@@ -451,6 +451,8 @@\n \tif (sizebytes > 0)\n \t\tcffdump_printline(-1, CFF_OP_WRITE_MEM, gpuaddr, *(uint *)src,\n \t\t\t0, 0, 0);\n+\t\/* Unmap memory since kgsl_gpuaddr_to_vaddr was called *\/\n+\tkgsl_memdesc_unmap(memdesc);\n }\n \n void kgsl_cffdump_setmem(struct kgsl_device *device,\n"} {"commit":"858a914324c7786f483661e3a89bc8fbe50f1b9d","subject":"hwmon: (ntc_thermistor) Simplify if sequence","message":"hwmon: (ntc_thermistor) Simplify if sequence\n\nReplace unnecessary if with else statement.\n\nThis fixes the following (false) compile warning reported with some combinations\nof C compiler version and configuration.\n\ndrivers\/hwmon\/ntc_thermistor.c: In function 'ntc_show_temp':\ndrivers\/hwmon\/ntc_thermistor.c:225: warning: 'low' may be used uninitialized in\nthis function\ndrivers\/hwmon\/ntc_thermistor.c:225: note: 'low' was declared here\ndrivers\/hwmon\/ntc_thermistor.c:225: warning: 'high' may be used uninitialized in\nthis function\ndrivers\/hwmon\/ntc_thermistor.c:225: note: 'high' was declared here\ndrivers\/hwmon\/ntc_thermistor.c:294: warning: 'temp' may be used uninitialized in\nthis function\n\nSigned-off-by: Guenter Roeck <32ce62c5480002985aec58d7044038218061ef55@ericsson.com>\nAcked-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/hwmon\/ntc_thermistor.c\n+++ drivers\/hwmon\/ntc_thermistor.c\n@@ -211,8 +211,7 @@\n \tif (data->comp[mid].ohm <= ohm) {\n \t\t*i_low = mid;\n \t\t*i_high = mid - 1;\n-\t}\n-\tif (data->comp[mid].ohm > ohm) {\n+\t} else {\n \t\t*i_low = mid + 1;\n \t\t*i_high = mid;\n \t}\n"} {"commit":"26c3d79711a62f0a2741a085dced2bbd0def8fab","subject":"PROTON-2140: Revert an internal ABI change that breaks the Ruby binding","message":"PROTON-2140: Revert an internal ABI change that breaks the Ruby binding\n","repos":"apache\/qpid-proton,kgiusti\/qpid-proton,kgiusti\/qpid-proton,apache\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,astitcher\/qpid-proton,ssorj\/qpid-proton,astitcher\/qpid-proton,ChugR\/qpid-proton,ssorj\/qpid-proton,gemmellr\/qpid-proton,kgiusti\/qpid-proton,gemmellr\/qpid-proton,astitcher\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,ChugR\/qpid-proton,ChugR\/qpid-proton,kgiusti\/qpid-proton,ssorj\/qpid-proton,ChugR\/qpid-proton,astitcher\/qpid-proton,kgiusti\/qpid-proton,apache\/qpid-proton,gemmellr\/qpid-proton,gemmellr\/qpid-proton,ssorj\/qpid-proton,ssorj\/qpid-proton,ChugR\/qpid-proton,gemmellr\/qpid-proton,ssorj\/qpid-proton,kgiusti\/qpid-proton,ChugR\/qpid-proton,apache\/qpid-proton,gemmellr\/qpid-proton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- c\/include\/proton\/cid.h\n+++ c\/include\/proton\/cid.h\n@@ -40,6 +40,8 @@\n CID_pn_collector,\n CID_pn_event,\n \n+ CID_pn_encoder, \/* Unused *\/\n+ CID_pn_decoder, \/* Unused *\/\n CID_pn_data,\n \n CID_pn_connection,\n"} {"commit":"1f023297f7f77d434ecc221018d2e181eac0ae36","subject":"i2c: slave eeprom: clean up sysfs bin attribute read()\/write()","message":"i2c: slave eeprom: clean up sysfs bin attribute read()\/write()\n\nThe change removes redundant sysfs binary file boundary checks,\nsince this task is already done on caller side in fs\/sysfs\/file.c\n\nNote, on file size overflow read() now returns 0, and this is a\ncorrect and expected EOF notification according to POSIX.\n\nSigned-off-by: Vladimir Zapolskiy <cab8e3b5e86fec6508364ac368c160d09cd3a3dc@mleia.com>\nSigned-off-by: Wolfram Sang <fd4ce474653598159cad06f3c83387a05cd53a44@the-dreams.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/i2c\/i2c-slave-eeprom.c\n+++ drivers\/i2c\/i2c-slave-eeprom.c\n@@ -80,9 +80,6 @@\n \tstruct eeprom_data *eeprom;\n \tunsigned long flags;\n \n-\tif (off + count > attr->size)\n-\t\treturn -EFBIG;\n-\n \teeprom = dev_get_drvdata(container_of(kobj, struct device, kobj));\n \n \tspin_lock_irqsave(&eeprom->buffer_lock, flags);\n@@ -97,9 +94,6 @@\n {\n \tstruct eeprom_data *eeprom;\n \tunsigned long flags;\n-\n-\tif (off + count > attr->size)\n-\t\treturn -EFBIG;\n \n \teeprom = dev_get_drvdata(container_of(kobj, struct device, kobj));\n \n"} {"commit":"8ef034e83623c0fa30c6c3a6d43e52c9992be900","subject":"Implemented focus coloring and redrawing.","message":"Implemented focus coloring and redrawing.\n","repos":"292388900\/ui,mirrr\/ui,janstk\/ui,janstk\/ui,HunterChen\/ui,ProtonMail\/ui,ProtonMail\/ui,cainiaocome\/ui,beni55\/ui,cainiaocome\/ui,cainiaocome\/ui,292388900\/ui,robbiev\/ui,HunterChen\/ui,mirrr\/ui,HunterChen\/ui,robbiev\/ui,292388900\/ui,janstk\/ui,mirrr\/ui,hajimehoshi\/ui,ProtonMail\/ui,beni55\/ui,hajimehoshi\/ui,beni55\/ui,hajimehoshi\/ui,robbiev\/ui","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- wintable\/main.c\n+++ wintable\/main.c\n@@ -237,20 +237,28 @@\n \tfor (i = first; i < last; i++) {\n \t\tRECT rsel;\n \t\tHBRUSH background;\n+\t\tint textColor;\n \t\tWCHAR msg[100];\n \n \t\t\/\/ TODO check errors\n-\t\t\/\/ TODO verify correct colors\n \t\trsel.left = r.left;\n \t\trsel.top = y;\n \t\trsel.right = r.right - r.left;\n \t\trsel.bottom = y + tm.tmHeight;\n+\t\t\/\/ TODO verify these two\n \t\tbackground = (HBRUSH) (COLOR_WINDOW + 1);\n+\t\ttextColor = COLOR_WINDOWTEXT;\n \t\tif (t->selected == i) {\n+\t\t\t\/\/ these are the colors wine uses (http:\/\/source.winehq.org\/source\/dlls\/comctl32\/listview.c)\n+\t\t\t\/\/ the two for unfocused are also suggested by http:\/\/stackoverflow.com\/questions\/10428710\/windows-forms-inactive-highlight-color\n \t\t\tbackground = (HBRUSH) (COLOR_HIGHLIGHT + 1);\n-\t\t\tSetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT));\n-\t\t} else\n-\t\t\tSetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT));\n+\t\t\ttextColor = COLOR_HIGHLIGHTTEXT;\n+\t\t\tif (GetFocus() != t->hwnd) {\n+\t\t\t\tbackground = (HBRUSH) (COLOR_BTNFACE + 1);\n+\t\t\t\ttextColor = COLOR_BTNTEXT;\n+\t\t\t}\n+\t\t}\n+\t\tSetTextColor(dc, GetSysColor(textColor));\n \t\tFillRect(dc, &rsel, background);\n \t\tSetBkMode(dc, TRANSPARENT);\n \t\tTextOutW(dc, r.left, y, msg, wsprintf(msg, L\"Item %d\", i));\n@@ -317,6 +325,13 @@\n \tcase WM_LBUTTONDOWN:\n \t\tselectItem(t, wParam, lParam);\n \t\treturn 0;\n+\tcase WM_SETFOCUS:\n+\tcase WM_KILLFOCUS:\n+\t\t\/\/ all we need to do here is redraw the highlight\n+\t\t\/\/ TODO localize to just the selected item\n+\t\t\/\/ TODO ensure giving focus works right\n+\t\tredrawAll(t);\n+\t\treturn 0;\n \tdefault:\n \t\treturn DefWindowProcW(hwnd, uMsg, wParam, lParam);\n \t}\n"} {"commit":"696ddf3dbb27a18c89787eae16a2fa1665ef57f6","subject":"drivers\/periph\/timer: amend documentation for timer_set_periodic()","message":"drivers\/periph\/timer: amend documentation for timer_set_periodic()\n\nThe function needs the `periph_timer_periodic` feature.\nAdd a `@note` about that to the documentation.\n","repos":"jasonatran\/RIOT,OlegHahm\/RIOT,jasonatran\/RIOT,authmillenon\/RIOT,OTAkeys\/RIOT,miri64\/RIOT,authmillenon\/RIOT,miri64\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,kYc0o\/RIOT,RIOT-OS\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,kYc0o\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,OTAkeys\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,kYc0o\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,OTAkeys\/RIOT,OlegHahm\/RIOT,kaspar030\/RIOT,ant9000\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,kaspar030\/RIOT,kYc0o\/RIOT,RIOT-OS\/RIOT,miri64\/RIOT,ant9000\/RIOT,ant9000\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,kaspar030\/RIOT,ant9000\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/include\/periph\/timer.h\n+++ drivers\/include\/periph\/timer.h\n@@ -160,11 +160,13 @@\n int timer_set_absolute(tim_t dev, int channel, unsigned int value);\n \n \/**\n- * @brief Set an absolute timeout value for the given channel of the given timer\n- * The timeout will be called periodically for each iteration\n+ * @brief Set an absolute timeout value for the given channel of the given timer.\n+ * The timeout will be called periodically for each iteration.\n *\n * @note Only one channel with `TIM_FLAG_RESET_ON_MATCH` can be active.\n * Some platforms (Atmel) only allow to use the first channel as TOP value.\n+ *\n+ * @note Needs to be enabled with `FEATURES_REQUIRED += periph_timer_periodic`.\n *\n * @param[in] dev the timer device to set\n * @param[in] channel the channel to set\n"} {"commit":"6dcce3e89dd9b8995eaa600b3c209c4cb7c98f3d","subject":"remove needless enum","message":"remove needless enum\n","repos":"kenhys\/sylpheed-switch-signature,kenhys\/sylpheed-switch-signature","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/switch_signatures.h\n+++ src\/switch_signatures.h\n@@ -47,7 +47,6 @@\n \n enum {\n SIGNATURE_ACCOUNT_COLUMN,\n- SIGNATURE_MAIL_COLUMN,\n SIGNATURE_SUMMARY_COLUMN,\n N_SIGNATURE_COLUMNS\n };\n"} {"commit":"88c66803d716fae099d37c147003524d209983da","subject":"use new instead of malloc for heap allocation in steigs","message":"use new instead of malloc for heap allocation in steigs\n","repos":"eth-cscs\/compression,eth-cscs\/compression,eth-cscs\/compression,eth-cscs\/compression,eth-cscs\/compression,eth-cscs\/compression","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cxx\/compression\/generic_wrappers.h\n+++ cxx\/compression\/generic_wrappers.h\n@@ -44,9 +44,9 @@\n num_eigs = num_eigs>n ? n : num_eigs;\n \n \/\/ allocate memory for storing superdiagonal\n- real *e = (real*)malloc(sizeof(real)*(n-1));\n+ real *e = new real[sizeof(real)*(n-1)];\n \/\/ allocate memory for eigenvectors returned by LAPACK\n- real *z = (real*)malloc(sizeof(real)*(n*n));\n+ real *z = new real[sizeof(real)*(n*n)];\n \/\/ point d to eigs (?steqr stores eigenvalues in vector used to pass in diagonal)\n real *d = eigs;\n \/\/ allocate memory for working array needed by LAPACK\n@@ -75,8 +75,10 @@\n }\n \n \/\/ free working array\n- free(e);\n- free(z);\n+ \/\/free(e);\n+ \/\/free(z);\n+ delete[] e;\n+ delete[] z;\n delete[] work;\n \n return true;\n"} {"commit":"d7092e809f44886dc07adb8e516a04308cb61b4a","subject":"Simon change","message":"Simon change\n\nSimon decided to fix this bug the other way.\n","repos":"cmeeren\/aacgmv2,cmeeren\/aacgmv2,cmeeren\/aacgmv2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c_aacgmv2\/src\/mlt_v2.c\n+++ c_aacgmv2\/src\/mlt_v2.c\n@@ -114,7 +114,7 @@\n * than 30 days, recompute the AACGM-v2 coefficients *\/\n ajd = TimeYMDHMSToJulian(ayr,amo,ady,ahr,amt,asc);\n jd = TimeYMDHMSToJulian(yr,mo,dy,hr,mt,sc);\n- if (fabs(jd-ajd) > 30.0) {\n+ if (abs((int)(jd-ajd)) > 30) {\n err = AACGM_v2_SetDateTime(yr,mo,dy,hr,mt,sc);\n }\n if (err != 0) return (err);\n@@ -201,7 +201,7 @@\n * than 30 days, recompute the AACGM-v2 coefficients *\/\n ajd = TimeYMDHMSToJulian(ayr,amo,ady,ahr,amt,asc);\n jd = TimeYMDHMSToJulian(yr,mo,dy,hr,mt,sc);\n- if (fabs(jd-ajd) > 30.0) {\n+ if (abs((int)(jd-ajd)) > 30) {\n err = AACGM_v2_SetDateTime(yr,mo,dy,hr,mt,sc);\n }\n if (err != 0) return (err);\n"} {"commit":"fc0eb28c0031ec2da872dd296b551453eb1963c9","subject":"Input: atkbd - restore resetting LED state at startup","message":"Input: atkbd - restore resetting LED state at startup\n\nFix breakage caused by commit 9605fb48e1998935a5ee70c965f90ad1ac023add\nWhile the input core indeed takes care of restoring led state and\ntypematic settings upon resume the driver still need to initialize\nthem properly when registering a new device\n\nReported-and-tested-by: Marin Mitov <05ffadc2805b62bd6ddbf8182cbdf73b69101cce@issp.bas.bg>\nSigned-off-by: Dmitry Torokhov <10a8c465cefc9bdd6c925e26964d23c90f1141cc@mail.ru>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/input\/keyboard\/atkbd.c\n+++ drivers\/input\/keyboard\/atkbd.c\n@@ -770,6 +770,30 @@\n \treturn 3;\n }\n \n+static int atkbd_reset_state(struct atkbd *atkbd)\n+{\n+ struct ps2dev *ps2dev = &atkbd->ps2dev;\n+\tunsigned char param[1];\n+\n+\/*\n+ * Set the LEDs to a predefined state (all off).\n+ *\/\n+\n+\tparam[0] = 0;\n+\tif (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS))\n+\t\treturn -1;\n+\n+\/*\n+ * Set autorepeat to fastest possible.\n+ *\/\n+\n+\tparam[0] = 0;\n+\tif (ps2_command(ps2dev, param, ATKBD_CMD_SETREP))\n+\t\treturn -1;\n+\n+\treturn 0;\n+}\n+\n static int atkbd_activate(struct atkbd *atkbd)\n {\n \tstruct ps2dev *ps2dev = &atkbd->ps2dev;\n@@ -1087,6 +1111,7 @@\n \t\t}\n \n \t\tatkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra);\n+\t\tatkbd_reset_state(atkbd);\n \t\tatkbd_activate(atkbd);\n \n \t} else {\n@@ -1267,6 +1292,7 @@\n \n \t\tatkbd->dev = new_dev;\n \t\tatkbd->set = atkbd_select_set(atkbd, atkbd->set, value);\n+\t\tatkbd_reset_state(atkbd);\n \t\tatkbd_activate(atkbd);\n \t\tatkbd_set_keycode_table(atkbd);\n \t\tatkbd_set_device_attrs(atkbd);\n"} {"commit":"7d9f0ee58813940b1b7cb31e35a7e100133d0a2c","subject":"Correct developer documentation for camel_provider_list()","message":"Correct developer documentation for camel_provider_list()\n","repos":"matzipan\/evolution-data-server,tintou\/evolution-data-server,tintou\/evolution-data-server,tintou\/evolution-data-server,matzipan\/evolution-data-server,matzipan\/evolution-data-server,tintou\/evolution-data-server,matzipan\/evolution-data-server,matzipan\/evolution-data-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camel\/camel-provider.c\n+++ camel\/camel-provider.c\n@@ -321,13 +321,11 @@\n }\n \n \/**\n- * camel_session_list_providers:\n- * @session: the session\n+ * camel_provider_list:\n * @load: whether or not to load in providers that are not already loaded\n *\n- * This returns a list of available providers in this session. If @load\n- * is %TRUE, it will first load in all available providers that haven't\n- * yet been loaded.\n+ * This returns a list of available providers. If @load is %TRUE, it will\n+ * first load in all available providers that haven't yet been loaded.\n *\n * Free the returned list with g_list_free(). The #CamelProvider structs\n * in the list are owned by Camel and should not be modified or freed.\n"} {"commit":"d1259416985513ba97f75a63ecf5bc75592a4b8d","subject":"iommu\/amd: Initialize amd_iommu_last_bdf for DEV_ALL","message":"iommu\/amd: Initialize amd_iommu_last_bdf for DEV_ALL\n\nAlso initialize the amd_iommu_last_bdf variable when a\nIVHD_DEV_ALL entry is found in the ACPI table.\n\nSigned-off-by: Joerg Roedel <61aff96566804ea1da8a65de5bcc892ce07caceb@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/iommu\/amd_iommu_init.c\n+++ drivers\/iommu\/amd_iommu_init.c\n@@ -441,6 +441,10 @@\n \twhile (p < end) {\n \t\tdev = (struct ivhd_entry *)p;\n \t\tswitch (dev->type) {\n+\t\tcase IVHD_DEV_ALL:\n+\t\t\t\/* Use maximum BDF value for DEV_ALL *\/\n+\t\t\tupdate_last_devid(0xffff);\n+\t\t\tbreak;\n \t\tcase IVHD_DEV_SELECT:\n \t\tcase IVHD_DEV_RANGE_END:\n \t\tcase IVHD_DEV_ALIAS:\n"} {"commit":"14d160ab72aaa784219f733fbac6032d3494fc73","subject":"irqchip: mips-gic: Fix gic_set_affinity() return value","message":"irqchip: mips-gic: Fix gic_set_affinity() return value\n\nIf the online CPU check in gic_set_affinity() fails, return a proper\nerrno value instead of -1.\n\nSigned-off-by: Andrew Bresticker <6f9d97df82107736b1c4f0e11d74242c25499ec8@chromium.org>\nAcked-by: Jason Cooper <68c46a606457643eab92053c1c05574abb26f861@lakedaemon.net>\nReviewed-by: Qais Yousef <4160b002aa2c00153d66a4cc29a35bf1c83cee97@imgtec.com>\nTested-by: Qais Yousef <4160b002aa2c00153d66a4cc29a35bf1c83cee97@imgtec.com>\nCc: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nCc: Jeffrey Deans <2be0a93191be1e64aab1137941ee06b4757952e1@imgtec.com>\nCc: Markos Chandras <5cdbcb0e11d2b5ebc39222958c54a1c6329d0c9d@imgtec.com>\nCc: Paul Burton <85f1bffadddedccfafc0ae065a06aa636075387f@imgtec.com>\nCc: Jonas Gorski <8a35dafb21031d5c8209b1c0c47aaf0390b56a0e@openwrt.org>\nCc: John Crispin <be6487f9df4dce44a640672d6c07330104d43593@openwrt.org>\nCc: David Daney <1d8a6ccc3596121ad6db8988061b5cda25ecdfb1@gmail.com>\nCc: 562397917b9a8bf316569a848858b12fb417723f@linux-mips.org\nCc: 2578944098299abf708b08eff6fcf60565553586@vger.kernel.org\nPatchwork: https:\/\/patchwork.linux-mips.org\/patch\/7814\/\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/irqchip\/irq-mips-gic.c\n+++ drivers\/irqchip\/irq-mips-gic.c\n@@ -309,7 +309,7 @@\n \n \tcpumask_and(&tmp, cpumask, cpu_online_mask);\n \tif (cpus_empty(tmp))\n-\t\treturn -1;\n+\t\treturn -EINVAL;\n \n \t\/* Assumption : cpumask refers to a single CPU *\/\n \tspin_lock_irqsave(&gic_lock, flags);\n"} {"commit":"837c7e4256d5285700fe0d500eeb15801b55bb0e","subject":"[media] v4l2-dev: G_PARM was incorrectly enabled for all video nodes","message":"[media] v4l2-dev: G_PARM was incorrectly enabled for all video nodes\n\nG_PARM should only be enabled if:\n\n- vidioc_g_parm is present\n- or: it is a video node and vidioc_g_std or tvnorms are set.\n\nWithout this additional check v4l2-compliance would complain about\nbeing able to use g_parm when it didn't expect it.\n\nSigned-off-by: Hans Verkuil <3a513708f73c27e7d36ebc496aa41dad6a3153ea@cisco.com>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/v4l2-dev.c\n+++ drivers\/media\/video\/v4l2-dev.c\n@@ -697,7 +697,8 @@\n \tSET_VALID_IOCTL(ops, VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd);\n \tSET_VALID_IOCTL(ops, VIDIOC_DECODER_CMD, vidioc_decoder_cmd);\n \tSET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);\n-\tif (ops->vidioc_g_parm || vdev->vfl_type == VFL_TYPE_GRABBER)\n+\tif (ops->vidioc_g_parm || (vdev->vfl_type == VFL_TYPE_GRABBER &&\n+\t\t\t\t\t(ops->vidioc_g_std || vdev->tvnorms)))\n \t\tset_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);\n \tSET_VALID_IOCTL(ops, VIDIOC_S_PARM, vidioc_s_parm);\n \tSET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);\n"} {"commit":"d8799b4699af008290e141804b40c5ebf3d7dc35","subject":"V4L\/DVB (8112): videodev: improve extended control support in video_ioctl2()","message":"V4L\/DVB (8112): videodev: improve extended control support in video_ioctl2()\n\n- add sanity checks for the extended controls argument.\n- if the driver only supports extended controls, then convert\n old-style controls to an extended control callback.\n\nSigned-off-by: Hans Verkuil <f625be9dbdcbbd12a043857af148e8fb895d9a1d@xs4all.nl>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/videodev.c\n+++ drivers\/media\/video\/videodev.c\n@@ -710,6 +710,29 @@\n \tprintk(KERN_CONT \"\\n\");\n };\n \n+static inline int check_ext_ctrls(struct v4l2_ext_controls *c)\n+{\n+\t__u32 i;\n+\n+\t\/* zero the reserved fields *\/\n+\tc->reserved[0] = c->reserved[1] = 0;\n+\tfor (i = 0; i < c->count; i++) {\n+\t\tc->controls[i].reserved2[0] = 0;\n+\t\tc->controls[i].reserved2[1] = 0;\n+\t}\n+\t\/* V4L2_CID_PRIVATE_BASE cannot be used as control class\n+\t * when using extended controls. *\/\n+\tif (c->ctrl_class == V4L2_CID_PRIVATE_BASE)\n+\t\treturn 0;\n+\t\/* Check that all controls are from the same control class. *\/\n+\tfor (i = 0; i < c->count; i++) {\n+\t\tif (V4L2_CTRL_ID2CLASS(c->controls[i].id) != c->ctrl_class) {\n+\t\t\tc->error_idx = i;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\treturn 1;\n+}\n \n static int check_fmt (struct video_device *vfd, enum v4l2_buf_type type)\n {\n@@ -1392,10 +1415,24 @@\n \t{\n \t\tstruct v4l2_control *p = arg;\n \n-\t\tif (!vfd->vidioc_g_ctrl)\n-\t\t\tbreak;\n-\n-\t\tret = vfd->vidioc_g_ctrl(file, fh, p);\n+\t\tif (vfd->vidioc_g_ctrl)\n+\t\t\tret = vfd->vidioc_g_ctrl(file, fh, p);\n+\t\telse if (vfd->vidioc_g_ext_ctrls) {\n+\t\t\tstruct v4l2_ext_controls ctrls;\n+\t\t\tstruct v4l2_ext_control ctrl;\n+\n+\t\t\tctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);\n+\t\t\tctrls.count = 1;\n+\t\t\tctrls.controls = &ctrl;\n+\t\t\tctrl.id = p->id;\n+\t\t\tctrl.value = p->value;\n+\t\t\tif (check_ext_ctrls(&ctrls)) {\n+\t\t\t\tret = vfd->vidioc_g_ext_ctrls(file, fh, &ctrls);\n+\t\t\t\tif (ret == 0)\n+\t\t\t\t\tp->value = ctrl.value;\n+\t\t\t}\n+\t\t} else\n+\t\t\tbreak;\n \t\tif (!ret)\n \t\t\tdbgarg(cmd, \"id=0x%x, value=%d\\n\", p->id, p->value);\n \t\telse\n@@ -1405,21 +1442,39 @@\n \tcase VIDIOC_S_CTRL:\n \t{\n \t\tstruct v4l2_control *p = arg;\n-\n-\t\tif (!vfd->vidioc_s_ctrl)\n-\t\t\tbreak;\n+\t\tstruct v4l2_ext_controls ctrls;\n+\t\tstruct v4l2_ext_control ctrl;\n+\n+\t\tif (!vfd->vidioc_s_ctrl && !vfd->vidioc_s_ext_ctrls)\n+\t\t\tbreak;\n+\n \t\tdbgarg(cmd, \"id=0x%x, value=%d\\n\", p->id, p->value);\n \n-\t\tret = vfd->vidioc_s_ctrl(file, fh, p);\n+\t\tif (vfd->vidioc_s_ctrl) {\n+\t\t\tret = vfd->vidioc_s_ctrl(file, fh, p);\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (!vfd->vidioc_s_ext_ctrls)\n+\t\t\tbreak;\n+\n+\t\tctrls.ctrl_class = V4L2_CTRL_ID2CLASS(p->id);\n+\t\tctrls.count = 1;\n+\t\tctrls.controls = &ctrl;\n+\t\tctrl.id = p->id;\n+\t\tctrl.value = p->value;\n+\t\tif (check_ext_ctrls(&ctrls))\n+\t\t\tret = vfd->vidioc_s_ext_ctrls(file, fh, &ctrls);\n \t\tbreak;\n \t}\n \tcase VIDIOC_G_EXT_CTRLS:\n \t{\n \t\tstruct v4l2_ext_controls *p = arg;\n \n+\t\tp->error_idx = p->count;\n \t\tif (!vfd->vidioc_g_ext_ctrls)\n \t\t\tbreak;\n-\t\tret = vfd->vidioc_g_ext_ctrls(file, fh, p);\n+\t\tif (check_ext_ctrls(p))\n+\t\t\tret = vfd->vidioc_g_ext_ctrls(file, fh, p);\n \t\tv4l_print_ext_ctrls(cmd, vfd, p, !ret);\n \t\tbreak;\n \t}\n@@ -1427,22 +1482,24 @@\n \t{\n \t\tstruct v4l2_ext_controls *p = arg;\n \n-\t\tif (vfd->vidioc_s_ext_ctrls) {\n-\t\t\tv4l_print_ext_ctrls(cmd, vfd, p, 1);\n-\n+\t\tp->error_idx = p->count;\n+\t\tif (!vfd->vidioc_s_ext_ctrls)\n+\t\t\tbreak;\n+\t\tv4l_print_ext_ctrls(cmd, vfd, p, 1);\n+\t\tif (check_ext_ctrls(p))\n \t\t\tret = vfd->vidioc_s_ext_ctrls(file, fh, p);\n-\t\t}\n \t\tbreak;\n \t}\n \tcase VIDIOC_TRY_EXT_CTRLS:\n \t{\n \t\tstruct v4l2_ext_controls *p = arg;\n \n-\t\tif (vfd->vidioc_try_ext_ctrls) {\n-\t\t\tv4l_print_ext_ctrls(cmd, vfd, p, 1);\n-\n+\t\tp->error_idx = p->count;\n+\t\tif (!vfd->vidioc_try_ext_ctrls)\n+\t\t\tbreak;\n+\t\tv4l_print_ext_ctrls(cmd, vfd, p, 1);\n+\t\tif (check_ext_ctrls(p))\n \t\t\tret = vfd->vidioc_try_ext_ctrls(file, fh, p);\n-\t\t}\n \t\tbreak;\n \t}\n \tcase VIDIOC_QUERYMENU:\n"} {"commit":"b70a7fab26db65f7daaf04f49a3bd673250f48c7","subject":"mmc: sdhci-spear: Implement suspend\/resume","message":"mmc: sdhci-spear: Implement suspend\/resume\n\nSuspend\/Resume is missing from sdhci-spear driver. This patch adds\nsupport for suspend\/resume for this driver.\n\nSigned-off-by: Viresh Kumar <5ff32272b3d9f86512eddc8e0af523fc6f7924e5@st.com>\nSigned-off-by: Chris Ball <6ca7faee6ca9a094b1ee341f11b840a5608a8746@laptop.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/mmc\/host\/sdhci-spear.c\n+++ drivers\/mmc\/host\/sdhci-spear.c\n@@ -21,6 +21,7 @@\n #include <linux\/interrupt.h>\n #include <linux\/irq.h>\n #include <linux\/platform_device.h>\n+#include <linux\/pm.h>\n #include <linux\/slab.h>\n #include <linux\/mmc\/host.h>\n #include <linux\/mmc\/sdhci-spear.h>\n@@ -271,10 +272,49 @@\n \treturn 0;\n }\n \n+#ifdef CONFIG_PM\n+static int sdhci_suspend(struct device *dev)\n+{\n+\tstruct sdhci_host *host = dev_get_drvdata(dev);\n+\tstruct spear_sdhci *sdhci = dev_get_platdata(dev);\n+\tpm_message_t state = {.event = 0};\n+\tint ret;\n+\n+\tret = sdhci_suspend_host(host, state);\n+\tif (!ret)\n+\t\tclk_disable(sdhci->clk);\n+\n+\treturn ret;\n+}\n+\n+static int sdhci_resume(struct device *dev)\n+{\n+\tstruct sdhci_host *host = dev_get_drvdata(dev);\n+\tstruct spear_sdhci *sdhci = dev_get_platdata(dev);\n+\tint ret;\n+\n+\tret = clk_enable(sdhci->clk);\n+\tif (ret) {\n+\t\tdev_dbg(dev, \"Resume: Error enabling clock\\n\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn sdhci_resume_host(host);\n+}\n+\n+const struct dev_pm_ops sdhci_pm_ops = {\n+\t.suspend\t= sdhci_suspend,\n+\t.resume\t\t= sdhci_resume,\n+};\n+#endif\n+\n static struct platform_driver sdhci_driver = {\n \t.driver = {\n \t\t.name\t= \"sdhci\",\n \t\t.owner\t= THIS_MODULE,\n+#ifdef CONFIG_PM\n+\t\t.pm\t= &sdhci_pm_ops,\n+#endif\n \t},\n \t.probe\t\t= sdhci_probe,\n \t.remove\t\t= __devexit_p(sdhci_remove),\n"} {"commit":"64862dbc98ca0f57022802e8e286c596d8c183e9","subject":"mtd: lpc32xx_mlc: fix warnings caused by enabling unprepared clock","message":"mtd: lpc32xx_mlc: fix warnings caused by enabling unprepared clock\n\nIf common clock framework is configured, the driver generates a warning,\nwhich is fixed by this change:\n\n WARNING: CPU: 0 PID: 1 at drivers\/clk\/clk.c:727 clk_core_enable+0x2c\/0xa4()\n Modules linked in:\n CPU: 0 PID: 1 Comm: swapper Not tainted 4.3.0-rc2+ #206\n Hardware name: LPC32XX SoC (Flattened Device Tree)\n Backtrace:\n [<>] (dump_backtrace) from [<>] (show_stack+0x18\/0x1c)\n [<>] (show_stack) from [<>] (dump_stack+0x20\/0x28)\n [<>] (dump_stack) from [<>] (warn_slowpath_common+0x90\/0xb8)\n [<>] (warn_slowpath_common) from [<>] (warn_slowpath_null+0x24\/0x2c)\n [<>] (warn_slowpath_null) from [<>] (clk_core_enable+0x2c\/0xa4)\n [<>] (clk_core_enable) from [<>] (clk_enable+0x24\/0x38)\n [<>] (clk_enable) from [<>] (lpc32xx_nand_probe+0x208\/0x248)\n [<>] (lpc32xx_nand_probe) from [<>] (platform_drv_probe+0x50\/0xa0)\n [<>] (platform_drv_probe) from [<>] (driver_probe_device+0x18c\/0x408)\n [<>] (driver_probe_device) from [<>] (__driver_attach+0x70\/0x94)\n [<>] (__driver_attach) from [<>] (bus_for_each_dev+0x74\/0x98)\n [<>] (bus_for_each_dev) from [<>] (driver_attach+0x20\/0x28)\n [<>] (driver_attach) from [<>] (bus_add_driver+0x11c\/0x248)\n [<>] (bus_add_driver) from [<>] (driver_register+0xa4\/0xe8)\n [<>] (driver_register) from [<>] (__platform_driver_register+0x50\/0x64)\n [<>] (__platform_driver_register) from [<>] (lpc32xx_nand_driver_init+0x18\/0x20)\n [<>] (lpc32xx_nand_driver_init) from [<>] (do_one_initcall+0x11c\/0x1dc)\n [<>] (do_one_initcall) from [<>] (kernel_init_freeable+0x10c\/0x1d4)\n [<>] (kernel_init_freeable) from [<>] (kernel_init+0x10\/0xec)\n [<>] (kernel_init) from [<>] (ret_from_fork+0x14\/0x24)\n\nSigned-off-by: Vladimir Zapolskiy <cab8e3b5e86fec6508364ac368c160d09cd3a3dc@mleia.com>\nSigned-off-by: Brian Norris <ac73eed4b8a8c9127255a2696c52b2e7503720b8@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/nand\/lpc32xx_mlc.c\n+++ drivers\/mtd\/nand\/lpc32xx_mlc.c\n@@ -692,7 +692,7 @@\n \t\tres = -ENOENT;\n \t\tgoto err_exit1;\n \t}\n-\tclk_enable(host->clk);\n+\tclk_prepare_enable(host->clk);\n \n \tnand_chip->cmd_ctrl = lpc32xx_nand_cmd_ctrl;\n \tnand_chip->dev_ready = lpc32xx_nand_device_ready;\n@@ -800,7 +800,7 @@\n \tif (use_dma)\n \t\tdma_release_channel(host->dma_chan);\n err_exit2:\n-\tclk_disable(host->clk);\n+\tclk_disable_unprepare(host->clk);\n \tclk_put(host->clk);\n err_exit1:\n \tlpc32xx_wp_enable(host);\n@@ -822,7 +822,7 @@\n \tif (use_dma)\n \t\tdma_release_channel(host->dma_chan);\n \n-\tclk_disable(host->clk);\n+\tclk_disable_unprepare(host->clk);\n \tclk_put(host->clk);\n \n \tlpc32xx_wp_enable(host);\n@@ -837,7 +837,7 @@\n \tstruct lpc32xx_nand_host *host = platform_get_drvdata(pdev);\n \n \t\/* Re-enable NAND clock *\/\n-\tclk_enable(host->clk);\n+\tclk_prepare_enable(host->clk);\n \n \t\/* Fresh init of NAND controller *\/\n \tlpc32xx_nand_setup(host);\n@@ -856,7 +856,7 @@\n \tlpc32xx_wp_enable(host);\n \n \t\/* Disable clock *\/\n-\tclk_disable(host->clk);\n+\tclk_disable_unprepare(host->clk);\n \treturn 0;\n }\n \n"} {"commit":"d25963799b1c3f5c3c2970d18a6f083c150b1fe2","subject":"removed unnecessary include","message":"removed unnecessary include\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@1610 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"jbreeden\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/serial.c\n+++ camlibs\/canon\/serial.c\n@@ -28,7 +28,6 @@\n \n \n \/**** new stuff ********\/\n-#include <gphoto2-port.h>\n struct camera_to_usb {\n \t char *name;\n \t unsigned short idVendor;\n"} {"commit":"61a623fe0d451c3977bc9f5a56bbef76cee8818e","subject":"mtd: mpc5121_nfc: Remove unnecessary OOM messages","message":"mtd: mpc5121_nfc: Remove unnecessary OOM messages\n\nThe site-specific OOM messages are unnecessary, because they\nduplicate the MM subsystem generic OOM message.\n\nSigned-off-by: Jingoo Han <fc379137a64feb86ce38ec5811a14280acc1ccfc@samsung.com>\nSigned-off-by: Brian Norris <ac73eed4b8a8c9127255a2696c52b2e7503720b8@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/nand\/mpc5121_nfc.c\n+++ drivers\/mtd\/nand\/mpc5121_nfc.c\n@@ -653,10 +653,8 @@\n \t}\n \n \tprv = devm_kzalloc(dev, sizeof(*prv), GFP_KERNEL);\n-\tif (!prv) {\n-\t\tdev_err(dev, \"Memory exhausted!\\n\");\n+\tif (!prv)\n \t\treturn -ENOMEM;\n-\t}\n \n \tmtd = &prv->mtd;\n \tchip = &prv->chip;\n"} {"commit":"57d27f56c4dcbeabe8808f704d4824df565f7c0b","subject":"the nikon s1 detection also mistakenly detected coolpix s7000","message":"the nikon s1 detection also mistakenly\ndetected coolpix s7000\n\nthis should fix https:\/\/github.com\/gphoto\/libgphoto2\/issues\/25\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -339,7 +339,8 @@\n \t\tif (params->deviceinfo.Model && (\n \t\t\t(params->deviceinfo.Model[0]=='J') ||\t\/* J1 - J3 currently *\/\n \t\t\t(params->deviceinfo.Model[0]=='V') ||\t\/* V1 - V3 currently *\/\n-\t\t\t(params->deviceinfo.Model[0]=='S')\t\/* S1 - S2 currently *\/\n+\t\t\t((params->deviceinfo.Model[0]=='S') && strlen(params->deviceinfo.Model) < 3)\t\/* S1 - S2 currently *\/\n+\t\t\t\t\/* but not S7000 *\/\n \t\t\t)\n \t\t) {\n \t\t\tif (!NIKON_1(&camera->pl->params)) {\n"} {"commit":"5889248ce94faffc71005c671b960effef3f9fab","subject":"net\/bnxt: fix flow director filter","message":"net\/bnxt: fix flow director filter\n\nSet the filter_type before we match a new filter against existing\nfilters. Otherwise we are missing the existing filters.\n\nFixes: 2d64da097aa0 (\"net\/bnxt: support FDIR\")\n\nSigned-off-by: Ajit Khaparde <01965fbd61169dc18f3fb5e13de7f67d298f8924@broadcom.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/bnxt\/bnxt_ethdev.c\n+++ drivers\/net\/bnxt\/bnxt_ethdev.c\n@@ -2407,6 +2407,7 @@\n \t\tret = bnxt_parse_fdir_filter(bp, fdir, filter);\n \t\tif (ret != 0)\n \t\t\tgoto free_filter;\n+\t\tfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;\n \n \t\tmatch = bnxt_match_fdir(bp, filter);\n \t\tif (match != NULL && filter_op == RTE_ETH_FILTER_ADD) {\n@@ -2427,7 +2428,6 @@\n \t\t\tSTAILQ_FIRST(&bp->ff_pool[fdir->action.rx_queue]);\n \n \t\tif (filter_op == RTE_ETH_FILTER_ADD) {\n-\t\t\tfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;\n \t\t\tret = bnxt_hwrm_set_ntuple_filter(bp,\n \t\t\t\t\t\t\t filter->dst_id,\n \t\t\t\t\t\t\t filter);\n"} {"commit":"ff81a72c177e4ce313bba8c2b42b70deb48a426f","subject":"Don't prompt for username\/password if you are going to print usage message and exit.","message":"Don't prompt for username\/password if you are going to print usage message\nand exit.\n","repos":"root42\/esniper,root42\/esniper,root42\/esniper,root42\/esniper,root42\/esniper","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- esniper.c\n+++ esniper.c\n@@ -616,14 +616,14 @@\n \t\t\tif (options.batch) {\n \t\t\t\tprintLog(stderr, \"Error: no username specified.\\n\");\n \t\t\t\toptions.usage = 1;\n-\t\t\t} else\n+\t\t\t} else if (!options.usage)\n \t\t\t\tparseGetoptValue('U', NULL, optiontab);\n \t\t}\n \t\tif (!options.password) {\n \t\t\tif (options.batch) {\n \t\t\t\tprintLog(stderr, \"Error: no password specified.\\n\");\n \t\t\t\toptions.usage = 1;\n-\t\t\t} else\n+\t\t\t} else if (!options.usage)\n \t\t\t\tparseGetoptValue('P', NULL, optiontab);\n \t\t}\n \t}\n"} {"commit":"3741c709d4eb7b0ce0c01c4516e49ee801457645","subject":"INTEGRATION: CWS warnings01 (1.4.304); FILE MERGED 2005\/09\/23 01:42:20 sb 1.4.304.2: RESYNC: (1.4-1.5); FILE MERGED 2005\/09\/20 12:57:25 sb 1.4.304.1: #i53898# Globally disable problematic warnings.","message":"INTEGRATION: CWS warnings01 (1.4.304); FILE MERGED\n2005\/09\/23 01:42:20 sb 1.4.304.2: RESYNC: (1.4-1.5); FILE MERGED\n2005\/09\/20 12:57:25 sb 1.4.304.1: #i53898# Globally disable problematic warnings.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sal\/systools\/win32\/uwinapi\/macros.h\n+++ sal\/systools\/win32\/uwinapi\/macros.h\n@@ -4,9 +4,9 @@\n *\n * $RCSfile: macros.h,v $\n *\n- * $Revision: 1.5 $\n+ * $Revision: 1.6 $\n *\n- * last change: $Author: rt $ $Date: 2005-09-08 16:25:53 $\n+ * last change: $Author: hr $ $Date: 2006-06-20 04:35:43 $\n *\n * The Contents of this file are made available subject to\n * the terms of GNU Lesser General Public License Version 2.1.\n@@ -47,6 +47,9 @@\n # include <TCHAR.H>\n #endif\n \n+\/\/ Globally disable \"warning C4100: unreferenced formal parameter\" caused by\n+\/\/ IMPLEMENT_THUNK:\n+#pragma warning(disable:4100)\n \n \/* Version macros *\/\n \n"} {"commit":"9b19346d219ee55f13e0ee9f475f189151703d09","subject":"Move i_watch close detection out of main\/subfile watch fork.","message":"Move i_watch close detection out of main\/subfile watch fork.\n","repos":"wulf7\/libinotify-kqueue,wulf7\/libinotify-kqueue,wulf7\/libinotify-kqueue","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- worker-thread.c\n+++ worker-thread.c\n@@ -371,10 +371,6 @@\n w->flags |= WF_SKIP_NEXT;\n }\n }\n-\n- if (w->flags & WF_DELETED || flags & NOTE_REVOKE) {\n- iw->is_closed = 1;\n- }\n } else {\n uint32_t i_flags = kqueue_to_inotify (flags, w->flags);\n \n@@ -395,7 +391,8 @@\n }\n }\n \n- if (iw->is_closed) {\n+ if (iw->is_closed || (!(w->flags & WF_ISSUBWATCH) &&\n+ (w->flags & WF_DELETED || flags & NOTE_REVOKE))) {\n worker_remove (wrk, iw->wd);\n }\n }\n"} {"commit":"7d03d1a3e90efe45da02c6fa3504f20a88f4b244","subject":"Fix outgoing connections on Mac OSX","message":"Fix outgoing connections on Mac OSX\n\nconnect() on an already established connection returns error with errno\nset to EISCONN. Treat it as success.","repos":"jsorg71\/xrdp,cocoon\/xrdp,PKRoma\/xrdp,proski\/xrdp,itamarjp\/xrdp,PKRoma\/xrdp,moobyfr\/xrdp,jsorg71\/xrdp,jsorg71\/xrdp,itamarjp\/xrdp,ubuntu-xrdp\/xrdp,metalefty\/xrdp,ubuntu-xrdp\/xrdp,cocoon\/xrdp,neutrinolabs\/xrdp,neutrinolabs\/xrdp,moobyfr\/xrdp,proski\/xrdp,itamarjp\/xrdp,moobyfr\/xrdp,PKRoma\/xrdp,proski\/xrdp,neutrinolabs\/xrdp,ubuntu-xrdp\/xrdp,metalefty\/xrdp,metalefty\/xrdp,cocoon\/xrdp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/os_calls.c\n+++ common\/os_calls.c\n@@ -763,6 +763,13 @@\n }\n }\n }\n+\n+ \/* Mac OSX connect() returns -1 for already established connections *\/\n+ if (res == -1 && errno == EISCONN)\n+ {\n+ res = 0;\n+ }\n+\n return res;\n }\n #else\n@@ -771,6 +778,7 @@\n {\n struct sockaddr_in s;\n struct hostent* h;\n+ int res;\n \n g_memset(&s, 0, sizeof(struct sockaddr_in));\n s.sin_family = AF_INET;\n@@ -793,7 +801,15 @@\n }\n }\n }\n- return connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));\n+ res = connect(sck, (struct sockaddr*)&s, sizeof(struct sockaddr_in));\n+\n+ \/* Mac OSX connect() returns -1 for already established connections *\/\n+ if (res == -1 && errno == EISCONN)\n+ {\n+ res = 0;\n+ }\n+\n+ return res;\n }\n #endif\n \n"} {"commit":"15a7d09ec41f8b9d5c6c305c3defeddb6427299c","subject":"Kill all zombie processes","message":"Kill all zombie processes\n\nSigned-off-by: Johnothan King <a8ddc7217a18e572ca3c72013b682efc8914e2df@protonmail.com>\n","repos":"JohnoKing\/leaninit,JohnoKing\/leaninit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/init.c\n+++ cmd\/init.c\n@@ -104,12 +104,12 @@\n \tif(shrc == 0)\n \t\texecl(\"\/bin\/sh\", \"\/bin\/sh\", RC, NULL);\n \n-\t\/\/ Suspend init\n+\t\/\/ Loop that kills all zombie processes while waiting for a signal\n \tfor(;;) {\n-\t\tsleep(1);\n-\t\tsignal(SIGUSR1, sighandle);\n-\t\tsignal(SIGUSR2, sighandle);\n-\t\tsignal(SIGINT, sighandle);\n+\t\twait(0); \/\/ Kill all zombie processes\n+\t\tsignal(SIGUSR1, sighandle); \/\/ Halt\n+\t\tsignal(SIGUSR2, sighandle); \/\/ Poweroff\n+\t\tsignal(SIGINT, sighandle); \/\/ Reboot\n \t}\n }\n \n"} {"commit":"bc3b07726aa288e2a5e60d9a1dd8188b3faa7385","subject":"ACPI: remove acpi_device_set_context() \"type\" argument","message":"ACPI: remove acpi_device_set_context() \"type\" argument\n\nWe only pass the \"type\" to acpi_device_set_context() so we know whether\nthe device has a handle to which we can attach the acpi_device pointer.\nBut it's safer to just check for the handle directly, since it's in the\nacpi_device already.\n\nSigned-off-by: Bjorn Helgaas <10beeee9ebfac68af8330145c8378a1d1bb2a283@hp.com>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/acpi\/scan.c\n+++ drivers\/acpi\/scan.c\n@@ -1171,29 +1171,27 @@\n \tkfree(info);\n }\n \n-static int acpi_device_set_context(struct acpi_device *device, int type)\n-{\n-\tacpi_status status = AE_OK;\n-\tint result = 0;\n+static int acpi_device_set_context(struct acpi_device *device)\n+{\n+\tacpi_status status;\n+\n \t\/*\n \t * Context\n \t * -------\n \t * Attach this 'struct acpi_device' to the ACPI object. This makes\n-\t * resolutions from handle->device very efficient. Note that we need\n-\t * to be careful with fixed-feature devices as they all attach to the\n-\t * root object.\n-\t *\/\n-\tif (type != ACPI_BUS_TYPE_POWER_BUTTON &&\n-\t type != ACPI_BUS_TYPE_SLEEP_BUTTON) {\n-\t\tstatus = acpi_attach_data(device->handle,\n-\t\t\t\t\t acpi_bus_data_handler, device);\n-\n-\t\tif (ACPI_FAILURE(status)) {\n-\t\t\tprintk(KERN_ERR PREFIX \"Error attaching device data\\n\");\n-\t\t\tresult = -ENODEV;\n-\t\t}\n-\t}\n-\treturn result;\n+\t * resolutions from handle->device very efficient. Fixed hardware\n+\t * devices have no handles, so we skip them.\n+\t *\/\n+\tif (!device->handle)\n+\t\treturn 0;\n+\n+\tstatus = acpi_attach_data(device->handle,\n+\t\t\t\t acpi_bus_data_handler, device);\n+\tif (ACPI_SUCCESS(status))\n+\t\treturn 0;\n+\n+\tprintk(KERN_ERR PREFIX \"Error attaching device data\\n\");\n+\treturn -ENODEV;\n }\n \n static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)\n@@ -1338,7 +1336,7 @@\n \t\t\tgoto end;\n \t}\n \n-\tif ((result = acpi_device_set_context(device, type)))\n+\tif ((result = acpi_device_set_context(device)))\n \t\tgoto end;\n \n \tresult = acpi_device_register(device);\n"} {"commit":"a9541fc204dd26bdde6a5bbe80a9f9bfc9a20a94","subject":"make nikon capture work during liveview","message":"make nikon capture work during liveview\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@11949 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"jbreeden\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -1518,7 +1518,8 @@\n \tPTPObjectInfo\t\toi;\n \tPTPParams\t\t*params = &camera->pl->params;\n \tPTPDevicePropDesc\tpropdesc;\n-\tint\t\t\ti, ret, hasc101 = 0, burstnumber = 1;\n+\tPTPPropertyValue\tpropval;\n+\tint\t\t\tinliveview, i, ret, hasc101 = 0, burstnumber = 1;\n \tuint32_t\t\tnewobject;\n \n \tif (type != GP_CAPTURE_IMAGE)\n@@ -1545,7 +1546,15 @@\n \t\tgp_log (GP_LOG_DEBUG, \"ptp2\", \"burstnumber %d\", burstnumber);\n \t}\n \n-\tif (ptp_operation_issupported(params,PTP_OC_NIKON_AfCaptureSDRAM)) {\n+\t\/* if in liveview mode, we have to run non-af capture *\/\n+\tinliveview = 0;\n+\tif (ptp_property_issupported (params, PTP_DPC_NIKON_LiveViewStatus)) {\n+\t\tret = ptp_getdevicepropvalue (params, PTP_DPC_NIKON_LiveViewStatus, &propval, PTP_DTC_UINT8);\n+\t\tif (ret == PTP_RC_OK)\n+\t\t\tinliveview = propval.u8;\n+\t}\n+\n+\tif (!inliveview && ptp_operation_issupported(params,PTP_OC_NIKON_AfCaptureSDRAM)) {\n \t\tdo {\n \t\t\tret = ptp_nikon_capture_sdram(params);\n \t\t} while (ret == PTP_RC_DeviceBusy);\n"} {"commit":"977e74b5f60de3df9831897b726c16870878eee4","subject":"[PATCH] e1000: Fixes e1000_suspend warning when CONFIG_PM is not enabled","message":"[PATCH] e1000: Fixes e1000_suspend warning when CONFIG_PM is not enabled\n\ndrivers\/net\/e1000\/e1000_main.c:3645: warning: `e1000_suspend' defined\nbut not used\n\nSigned-off-by: Ashutosh Naik <dc4b99cd57bb0e1ca13e70cb3645572f9f6c80e7@adaptec.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@pobox.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/e1000\/e1000_main.c\n+++ drivers\/net\/e1000\/e1000_main.c\n@@ -191,8 +191,8 @@\n static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);\n static void e1000_restore_vlan(struct e1000_adapter *adapter);\n \n+#ifdef CONFIG_PM\n static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);\n-#ifdef CONFIG_PM\n static int e1000_resume(struct pci_dev *pdev);\n #endif\n \n"} {"commit":"43785eaeb1cfb8aed3cf8027f298b242f88fdc45","subject":"ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode","message":"ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode\n\nDon't create mixer volume elements for Headphone and Speaker if they\nuse the same DAC as normal line-outs on AD1988. Otherwise the amp\nvalue gets screwed up, e.g.\n\thttps:\/\/bugzilla.novell.com\/show_bug.cgi?id=398255\n\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\nSigned-off-by: Jaroslav Kysela <72edd5e1a572f82f059ccbb83c92b74d6cb051ff@perex.cz>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sound\/pci\/hda\/patch_analog.c\n+++ sound\/pci\/hda\/patch_analog.c\n@@ -2621,7 +2621,7 @@\n {\n \tstruct ad198x_spec *spec = codec->spec;\n \thda_nid_t nid;\n-\tint idx, err;\n+\tint i, idx, err;\n \tchar name[32];\n \n \tif (! pin)\n@@ -2629,16 +2629,26 @@\n \n \tidx = ad1988_pin_idx(pin);\n \tnid = ad1988_idx_to_dac(codec, idx);\n-\t\/* specify the DAC as the extra output *\/\n-\tif (! spec->multiout.hp_nid)\n-\t\tspec->multiout.hp_nid = nid;\n-\telse\n-\t\tspec->multiout.extra_out_nid[0] = nid;\n-\t\/* control HP volume\/switch on the output mixer amp *\/\n-\tsprintf(name, \"%s Playback Volume\", pfx);\n-\tif ((err = add_control(spec, AD_CTL_WIDGET_VOL, name,\n-\t\t\t HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)\n-\t\treturn err;\n+\t\/* check whether the corresponding DAC was already taken *\/\n+\tfor (i = 0; i < spec->autocfg.line_outs; i++) {\n+\t\thda_nid_t pin = spec->autocfg.line_out_pins[i];\n+\t\thda_nid_t dac = ad1988_idx_to_dac(codec, ad1988_pin_idx(pin));\n+\t\tif (dac == nid)\n+\t\t\tbreak;\n+\t}\n+\tif (i >= spec->autocfg.line_outs) {\n+\t\t\/* specify the DAC as the extra output *\/\n+\t\tif (!spec->multiout.hp_nid)\n+\t\t\tspec->multiout.hp_nid = nid;\n+\t\telse\n+\t\t\tspec->multiout.extra_out_nid[0] = nid;\n+\t\t\/* control HP volume\/switch on the output mixer amp *\/\n+\t\tsprintf(name, \"%s Playback Volume\", pfx);\n+\t\terr = add_control(spec, AD_CTL_WIDGET_VOL, name,\n+\t\t\t\t HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT));\n+\t\tif (err < 0)\n+\t\t\treturn err;\n+\t}\n \tnid = ad1988_mixer_nids[idx];\n \tsprintf(name, \"%s Playback Switch\", pfx);\n \tif ((err = add_control(spec, AD_CTL_BIND_MUTE, name,\n"} {"commit":"51cf8fc285cfdfc12c142011cdadabb9bf401740","subject":"Liberally apply style(9) and move around code blocks for readablity.","message":"Liberally apply style(9) and move around code blocks for readablity.\n","repos":"kristapsdz\/kcaldav,kristapsdz\/kcaldav,kristapsdz\/kcaldav","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- kcaldav.c\n+++ kcaldav.c\n@@ -1,6 +1,6 @@\n \/*\t$Id$ *\/\n \/*\n- * Copyright (c) 2015, 2016, 2018 Kristaps Dzonsons <kristaps@bsd.lv>\n+ * Copyright (c) 2015, 2016, 2018, 2020 Kristaps Dzonsons <kristaps@bsd.lv>\n *\n * Permission to use, copy, modify, and distribute this software for any\n * purpose with or without fee is hereby granted, provided that the above\n@@ -46,10 +46,6 @@\n #include \"extern.h\"\n #include \"kcaldav.h\"\n \n-#ifndef CALDIR\n-#error \"CALDIR token not defined!\"\n-#endif\n-\n int verbose = 1;\n \n const char *const pages[PAGE__MAX] = {\n@@ -98,12 +94,13 @@\n \t * (or random nonce values) over and over again in the hopes of\n \t * filling up our nonce database.\n \t *\/\n+\n \ter = db_nonce_validate(auth->nonce, auth->count);\n \n-\tif (NONCE_ERR == er) {\n+\tif (er == NONCE_ERR) {\n \t\tkerrx(\"%s: nonce database failure\", auth->user);\n-\t\treturn(-2);\n-\t} else if (NONCE_NOTFOUND == er) {\n+\t\treturn (-2);\n+\t} else if (er == NONCE_NOTFOUND) {\n \t\t\/*\n \t\t * We don't have the nonce.\n \t\t * This means that the client has either used one of our\n@@ -111,38 +108,40 @@\n \t\t * earlier session.\n \t\t * Tell them to retry with a new nonce.\n \t\t *\/\n-\t\tif ( ! db_nonce_new(np)) {\n+\n+\t\tif (!db_nonce_new(np)) {\n \t\t\tkerrx(\"%s: nonce database failure\", auth->user);\n-\t\t\treturn(-2);\n+\t\t\treturn (-2);\n \t\t}\n-\t\treturn(0);\n-\t} else if (NONCE_REPLAY == er) {\n-\t\tkerrx(\"%s: REPLAY ATTACK\\n\", auth->user);\n-\t\treturn(-1);\n+\t\treturn 0;\n+\t} else if (er == NONCE_REPLAY) {\n+\t\tkerrx(\"%s: REPLAY ATTACK\", auth->user);\n+\t\treturn (-1);\n \t} \n \n \t\/*\n \t * Now we actually update our nonce file.\n \t * We only get here if the nonce value exists and is fresh.\n \t *\/\n+\n \ter = db_nonce_update(auth->nonce, auth->count);\n \n-\tif (NONCE_ERR == er) {\n+\tif (er == NONCE_ERR) {\n \t\tkerrx(\"%s: nonce database failure\", auth->user);\n-\t\treturn(-2);\n-\t} else if (NONCE_NOTFOUND == er) {\n+\t\treturn (-2);\n+\t} else if (er == NONCE_NOTFOUND) {\n \t\tkerrx(\"%s: nonce update not found?\", auth->user);\n-\t\tif ( ! db_nonce_new(np)) {\n+\t\tif (!db_nonce_new(np)) {\n \t\t\tkerrx(\"%s: nonce database failure\", auth->user);\n-\t\t\treturn(-2);\n+\t\t\treturn (-2);\n \t\t}\n-\t\treturn(0);\n-\t} else if (NONCE_REPLAY == er) {\n-\t\tkerrx(\"%s: REPLAY ATTACK\\n\", auth->user);\n-\t\treturn(-1);\n+\t\treturn 0;\n+\t} else if (er == NONCE_REPLAY) {\n+\t\tkerrx(\"%s: REPLAY ATTACK\", auth->user);\n+\t\treturn (-1);\n \t} \n \n-\treturn(1);\n+\treturn 1;\n }\n \n \/*\n@@ -153,8 +152,8 @@\n kvalid_name(struct kpair *kp)\n {\n \n-\tif ( ! kvalid_stringne(kp))\n-\t\treturn(0);\n+\tif (!kvalid_stringne(kp))\n+\t\treturn 0;\n \treturn (kp->valsz < 1024);\n }\n \n@@ -166,8 +165,8 @@\n kvalid_description(struct kpair *kp)\n {\n \n-\tif ( ! kvalid_stringne(kp))\n-\t\treturn(0);\n+\tif (!kvalid_stringne(kp))\n+\t\treturn 0;\n \treturn (kp->valsz < 4096);\n }\n \n@@ -180,11 +179,12 @@\n kvalid_path(struct kpair *kp)\n {\n \n-\tif ( ! kvalid_stringne(kp))\n-\t\treturn(0);\n+\tif (!kvalid_stringne(kp))\n+\t\treturn 0;\n \telse if (kp->valsz > 256)\n-\t\treturn(0);\n-\treturn(http_safe_string(kp->val));\n+\t\treturn 0;\n+\n+\treturn http_safe_string(kp->val);\n }\n \n \/*\n@@ -197,24 +197,24 @@\n {\n \tsize_t\t i;\n \n-\tif ( ! kvalid_stringne(kp))\n-\t\treturn(0);\n-\tif (7 != kp->valsz && 9 != kp->valsz)\n-\t\treturn(0);\n-\tif ('#' != kp->val[0])\n-\t\treturn(0);\n+\tif (!kvalid_stringne(kp))\n+\t\treturn 0;\n+\tif (kp->valsz != 7 && kp->valsz != 9)\n+\t\treturn 0;\n+\tif (kp->val[0] != '#')\n+\t\treturn 0;\n+\n \tfor (i = 1; i < kp->valsz; i++) {\n-\t\tif (isdigit((int)kp->val[i]))\n+\t\tif (isdigit((unsigned char)kp->val[i]))\n \t\t\tcontinue;\n-\t\tif (isalpha((int)kp->val[i]) && \n-\t\t\t((kp->val[i] >= 'a' && \n-\t\t\t kp->val[i] <= 'f') ||\n-\t\t\t (kp->val[i] >= 'A' &&\n-\t\t\t kp->val[i] <= 'F')))\n+\t\tif (isalpha((unsigned char)kp->val[i]) && \n+\t\t ((kp->val[i] >= 'a' && kp->val[i] <= 'f') ||\n+\t\t (kp->val[i] >= 'A' && kp->val[i] <= 'F')))\n \t\t\tcontinue;\n-\t\treturn(0);\n-\t}\n-\treturn(1);\n+\t\treturn 0;\n+\t}\n+\n+\treturn 1;\n }\n \n \/*\n@@ -226,21 +226,22 @@\n {\n \tsize_t\t i;\n \n-\tif ( ! kvalid_stringne(kp))\n-\t\treturn(0);\n-\tif (32 != kp->valsz)\n-\t\treturn(0);\n+\tif (!kvalid_stringne(kp))\n+\t\treturn 0;\n+\tif (kp->valsz != 32)\n+\t\treturn 0;\n+\n \tfor (i = 0; i < kp->valsz; i++) {\n-\t\tif (isdigit((int)kp->val[i]))\n+\t\tif (isdigit((unsigned char)kp->val[i]))\n \t\t\tcontinue;\n-\t\tif (isalpha((int)kp->val[i]) && \n-\t\t\t islower((int)kp->val[i]) &&\n-\t\t\t kp->val[i] >= 'a' && \n-\t\t\t kp->val[i] <= 'f')\n+\t\tif (isalpha((unsigned char)kp->val[i]) && \n+\t\t islower((unsigned char)kp->val[i]) &&\n+\t\t kp->val[i] >= 'a' && kp->val[i] <= 'f')\n \t\t\tcontinue;\n-\t\treturn(0);\n-\t}\n-\treturn(1);\n+\t\treturn 0;\n+\t}\n+\n+\treturn 1;\n }\n \n \/* \n@@ -254,24 +255,24 @@\n \tstruct ical\t*ical;\n \tstruct caldav\t*dav;\n \n-\tswitch (kp->ctypepos) {\n-\tcase (KMIME_TEXT_CALENDAR):\n+\tif (kp->ctypepos == KMIME_TEXT_CALENDAR) {\n \t\tical = ical_parse(NULL, kp->val, kp->valsz);\n \t\tical_free(ical);\n-\t\treturn(NULL != ical);\n-\tdefault:\n-\t\t\/* Try to parse an XML file. *\/\n-\t\tdav = caldav_parse(kp->val, kp->valsz);\n-\t\tcaldav_free(dav);\n-\t\treturn(NULL != dav);\n-\t}\n+\t\treturn (ical != NULL);\n+\t}\n+\n+\t\/* Try to parse an XML file. *\/\n+\n+\tdav = caldav_parse(kp->val, kp->valsz);\n+\tcaldav_free(dav);\n+\treturn (dav != NULL);\n }\n \n static void\n state_free(struct state *st)\n {\n \n-\tif (NULL == st)\n+\tif (st == NULL)\n \t\treturn;\n \tif (st->prncpl != st->rprncpl)\n \t\tprncpl_free(st->rprncpl);\n@@ -286,15 +287,17 @@\n * Load our principal account into the state object, priming the\n * database beforhand.\n * This will load all of our collections, too.\n+ * Returns <0 on fatal error, 0 if the principal doesn't exist, >0 on\n+ * success.\n *\/\n static int\n state_load(struct state *st, const char *nonce, const char *name)\n {\n \n-\tif ( ! db_init(st->caldir, 0))\n+\tif (!db_init(st->caldir, 0))\n \t\treturn(-1);\n \tst->nonce = nonce;\n-\treturn(db_prncpl_load(&st->prncpl, name));\n+\treturn db_prncpl_load(&st->prncpl, name);\n }\n \n int\n@@ -315,20 +318,14 @@\n \tint\t\t rc;\n \tchar\t\t*np;\n \tsize_t\t\t i, sz;\n-\n-#if HAVE_PLEDGE\n-\tif (-1 == pledge(\"proc stdio rpath \"\n-\t \"cpath wpath flock fattr\", NULL)) {\n-\t\tkerr(\"pledge\");\n-\t\treturn(EXIT_FAILURE);\n-\t}\n-#endif\n-\n+\tenum kcgi_err\t er;\n+\tconst char\t*logfile = \"\";\n+\n+#ifdef LOGFILE\n+\tlogfile = LOGFILE;\n+#endif\n #if !HAVE_ARC4RANDOM\n \tsrandom(time(NULL));\n-#endif\n-#if defined LOGFILE\n-\tkutil_openlog(LOGFILE);\n #endif\n #if defined DEBUG && DEBUG > 1\n \tverbose = 3;\n@@ -336,29 +333,47 @@\n \tverbose = 2;\n #endif\n \n-\tif (KCGI_OK != khttp_parsex\n-\t (&r, ksuffixmap, kmimetypes, KMIME__MAX, \n-\t valid, VALID__MAX, pages, PAGE__MAX, \n-\t KMIME_TEXT_HTML, PAGE_INDEX,\n-\t NULL, NULL, verbose > 2 ? \n-\t KREQ_DEBUG_WRITE | KREQ_DEBUG_READ_BODY : 0, \n-\t NULL))\n+#if HAVE_PLEDGE\n+\tif (pledge(\"proc stdio rpath \"\n+\t \"cpath wpath flock fattr\", NULL) == -1) {\n+\t\tkerr(\"pledge\");\n \t\treturn(EXIT_FAILURE);\n+\t}\n+#endif\n+\n+\t\/* Only open the logfile if it's non-empty. *\/\n+\n+\tif (logfile[0] != '\\0')\n+\t\tkutil_openlog(LOGFILE);\n+\n+\t\/* Parse the main body. *\/\n+\n+\ter = khttp_parsex\n+\t\t(&r, ksuffixmap, kmimetypes, KMIME__MAX, valid, \n+\t\t VALID__MAX, pages, PAGE__MAX, KMIME_TEXT_HTML,\n+\t\t PAGE_INDEX, NULL, NULL, verbose > 2 ? \n+\t\t (KREQ_DEBUG_WRITE | KREQ_DEBUG_READ_BODY) : 0, \n+\t\t NULL);\n+\n+\tif (er != KCGI_OK) {\n+\t\tkerrx(\"khttp_parse: %s\", kcgi_strerror(er));\n+\t\treturn EXIT_FAILURE;\n+\t}\n \n #if HAVE_SANDBOX_INIT\n \trc = sandbox_init\n \t\t(kSBXProfileNoInternet, \n \t\t SANDBOX_NAMED, &np);\n-\tif (-1 == rc) {\n+\tif (rc == -1) {\n \t\tkerrx(\"sandbox_init: %s\", np);\n-\t\tgoto out;\n+\t\treturn EXIT_FAILURE;\n \t}\n #endif\n #if HAVE_PLEDGE\n-\tif (-1 == pledge(\"stdio rpath cpath \"\n-\t \"wpath flock fattr\", NULL)) {\n+\tif (pledge(\"stdio rpath cpath \"\n+\t \"wpath flock fattr\", NULL) == -1) {\n \t\tkerr(\"pledge\");\n-\t\tgoto out;\n+\t\treturn EXIT_FAILURE;\n \t}\n #endif\n \n@@ -369,10 +384,11 @@\n \t * enough to resend an OPTIONS request with HTTP authorisation,\n \t * so let this happen now.\n \t *\/\n-\tif (KMETHOD__MAX == r.method) {\n+\n+\tif (r.method == KMETHOD__MAX) {\n \t\thttp_error(&r, KHTTP_405);\n \t\tgoto out;\n-\t} else if (KMETHOD_OPTIONS == r.method) {\n+\t} else if (r.method == KMETHOD_OPTIONS) {\n \t\tmethod_options(&r);\n \t\tgoto out;\n \t}\n@@ -383,10 +399,11 @@\n \t * so that the client (whomever it is) sends us their login\n \t * credentials and we can do more high-level authentication.\n \t *\/\n-\tif (KAUTH_DIGEST != r.rawauth.type) {\n+\n+\tif (r.rawauth.type != KAUTH_DIGEST) {\n \t\thttp_error(&r, KHTTP_401);\n \t\tgoto out;\n-\t} else if (0 == r.rawauth.authorised) {\n+\t} else if (r.rawauth.authorised == 0) {\n \t\tkerrx(\"%s: bad HTTP authorisation tokens\", r.fullpath);\n \t\thttp_error(&r, KHTTP_401);\n \t\tgoto out;\n@@ -397,13 +414,14 @@\n \t * this client request (i.e., we have some sort of username and\n \t * hashed password), so allocate our state.\n \t *\/\n-\tif (NULL == (r.arg = st = calloc(1, sizeof(struct state)))) {\n+\n+\tif ((r.arg = st = calloc(1, sizeof(struct state))) == NULL) {\n \t\tkerr(NULL);\n \t\thttp_error(&r, KHTTP_505);\n \t\tgoto out;\n \t}\n \n-\tif ('\\0' == r.fullpath[0]) {\n+\tif (r.fullpath[0] == '\\0') {\n \t\tnp = khttp_urlabs(r.scheme, r.host, r.port, r.pname);\n \t\tkhttp_head(&r, kresps[KRESP_STATUS], \n \t\t\t\"%s\", khttps[KHTTP_307]);\n@@ -421,8 +439,9 @@\n \t * First, validate our request paths.\n \t * This is just a matter of copying them over.\n \t *\/\n-\tif ( ! http_paths(r.fullpath, &st->principal,\n-\t\t &st->collection, &st->resource))\n+\n+\tif (!http_paths(r.fullpath,\n+\t &st->principal, &st->collection, &st->resource))\n \t\tgoto out;\n \n \tkdbg(\"%s: %s: \/<%s>\/<%s>\/<%s>\", \n@@ -430,12 +449,13 @@\n \t\tst->principal, st->collection, st->resource);\n \n \t\/* Copy over the calendar directory as well. *\/\n+\n \tsz = strlcpy(st->caldir, CALDIR, sizeof(st->caldir));\n \n \tif (sz >= sizeof(st->caldir)) {\n \t\tkerrx(\"%s: caldir too long!\", st->caldir);\n \t\tgoto out;\n-\t} else if ('\/' == st->caldir[sz - 1])\n+\t} else if (st->caldir[sz - 1] == '\/')\n \t\tst->caldir[sz - 1] = '\\0';\n \n \t\/*\n@@ -443,6 +463,7 @@\n \t * and other stuff.\n \t * We'll do all the authentication afterward: this just loads.\n \t *\/\n+\n \trc = state_load(st, \n \t\tr.rawauth.d.digest.nonce, \n \t\tr.rawauth.d.digest.user);\n@@ -450,7 +471,7 @@\n \tif (rc < 0) {\n \t\thttp_error(&r, KHTTP_505);\n \t\tgoto out;\n-\t} else if (0 == rc) {\n+\t} else if (rc == 0) {\n \t\thttp_error(&r, KHTTP_401);\n \t\tgoto out;\n \t} \n@@ -460,7 +481,7 @@\n \t\tkerrx(\"%s: bad authorisation sequence\", st->prncpl->email);\n \t\thttp_error(&r, KHTTP_401);\n \t\tgoto out;\n-\t} else if (0 == rc) {\n+\t} else if (rc == 0) {\n \t\tkerrx(\"%s: failed authorisation sequence\", st->prncpl->email);\n \t\thttp_error(&r, KHTTP_401);\n \t\tgoto out;\n@@ -482,13 +503,14 @@\n \t * If this clears, that means that the principal is real and not\n \t * replaying prior HTTP authentications.\n \t *\/\n+\n \tif ((rc = nonce_validate(&r.rawauth.d.digest, &np)) < -1) {\n \t\thttp_error(&r, KHTTP_505);\n \t\tgoto out;\n \t} else if (rc < 0) {\n \t\thttp_error(&r, KHTTP_403);\n \t\tgoto out;\n-\t} else if (0 == rc) {\n+\t} else if (rc == 0) {\n \t\tkhttp_head(&r, kresps[KRESP_STATUS], \n \t\t\t\"%s\", khttps[KHTTP_401]);\n \t\tkhttp_head(&r, kresps[KRESP_WWW_AUTHENTICATE],\n@@ -508,9 +530,9 @@\n \t * file exists for the requested URI.\n \t * For HTML access (the browser), we don't care.\n \t *\/\n-\tif (KMIME_APP_JSON == r.mime &&\n-\t (KMETHOD_GET == r.method ||\n-\t KMETHOD_POST == r.method)) {\n+\n+\tif (r.mime == KMIME_APP_JSON &&\n+\t (r.method == KMETHOD_GET || r.method == KMETHOD_POST)) {\n \t\tmethod_json(&r);\n \t\tgoto out;\n \t} \n@@ -519,9 +541,11 @@\n \t * The client is probing.\n \t * Send them to the server root.\n \t *\/\n-\tif ('\\0' == st->principal[0]) {\n+\n+\tif (st->principal[0] == '\\0') {\n \t\tkdbg(\"%s: redirecting probe from client\", \n \t\t\tst->prncpl->email);\n+\n \t\tnp = khttp_urlabs(r.scheme, r.host, r.port, r.pname);\n \t\tkhttp_head(&r, kresps[KRESP_STATUS], \n \t\t\t\"%s\", khttps[KHTTP_307]);\n@@ -538,20 +562,23 @@\n \tif (strcmp(st->principal, st->prncpl->name)) {\n \t\tkdbg(\"%s: requesting other principal \"\n \t\t\t\"collection\", st->prncpl->name);\n+\n \t\trc = db_prncpl_load\n \t\t\t(&st->rprncpl, st->principal);\n \t\tif (rc < 0) {\n \t\t\thttp_error(&r, KHTTP_505);\n \t\t\tgoto out;\n-\t\t} else if (0 == rc) {\n+\t\t} else if (rc == 0) {\n \t\t\thttp_error(&r, KHTTP_401);\n \t\t\tgoto out;\n \t\t}\n+\n \t\t\/* \n \t\t * Look us up in the requested principal's proxies,\n \t\t * i.e., those who are allowed to proxy as the given\n \t\t * principal.\n \t\t *\/\n+\n \t\tfor (i = 0; i < st->rprncpl->proxiesz; i++)\n \t\t\tif (st->prncpl->id ==\n \t\t\t st->rprncpl->proxies[i].proxy)\n@@ -565,12 +592,13 @@\n \t\t\tgoto out;\n \t\t}\n \t\tst->proxy = st->rprncpl->proxies[i].bits;\n+\n \t\tswitch (r.method) {\n-\t\tcase (KMETHOD_PUT):\n-\t\tcase (KMETHOD_PROPPATCH):\n-\t\tcase (KMETHOD_DELETE):\n+\t\tcase KMETHOD_PUT:\n+\t\tcase KMETHOD_PROPPATCH:\n+\t\tcase KMETHOD_DELETE:\n \t\t\t\/* Implies read. *\/\n-\t\t\tif (PROXY_WRITE == st->proxy)\n+\t\t\tif (st->proxy == PROXY_WRITE)\n \t\t\t\tbreak;\n \t\t\tkerrx(\"%s: disallowed reverse proxy \"\n \t\t\t\t\"write on principal: %s\",\n@@ -579,8 +607,8 @@\n \t\t\thttp_error(&r, KHTTP_403);\n \t\t\tgoto out;\n \t\tdefault:\n-\t\t\tif (PROXY_READ == st->proxy || \n-\t\t\t PROXY_WRITE == st->proxy)\n+\t\t\tif (st->proxy == PROXY_READ || \n+\t\t\t st->proxy == PROXY_WRITE)\n \t\t\t\tbreak;\n \t\t\tkerrx(\"%s: disallowed reverse proxy \"\n \t\t\t\t\"read on principal: %s\",\n@@ -596,14 +624,15 @@\n \t * If we're going to look for a calendar collection, try to do\n \t * so now by querying the collections for our principal.\n \t *\/\n-\tif ('\\0' != st->collection[0]) {\n+\n+\tif (st->collection[0] != '\\0') {\n \t\tfor (i = 0; i < st->rprncpl->colsz; i++) {\n \t\t\tif (strcmp(st->rprncpl->cols[i].url, st->collection))\n \t\t\t\tcontinue;\n \t\t\tst->cfg = &st->rprncpl->cols[i];\n \t\t\tbreak;\n \t\t}\n-\t\tif (NULL == st->cfg &&\n+\t\tif (st->cfg == NULL &&\n \t\t strcmp(st->collection, \"calendar-proxy-read\") &&\n \t\t strcmp(st->collection, \"calendar-proxy-write\")) {\n \t\t\tkerrx(\"%s: requesting unknown \"\n@@ -614,23 +643,24 @@\n \t}\n \n \tswitch (r.method) {\n-\tcase (KMETHOD_PUT):\n+\tcase KMETHOD_PUT:\n \t\tmethod_put(&r);\n \t\tbreak;\n-\tcase (KMETHOD_PROPFIND):\n+\tcase KMETHOD_PROPFIND:\n \t\tmethod_propfind(&r);\n \t\tbreak;\n-\tcase (KMETHOD_PROPPATCH):\n+\tcase KMETHOD_PROPPATCH:\n \t\tmethod_proppatch(&r);\n \t\tbreak;\n-\tcase (KMETHOD_POST):\n+\tcase KMETHOD_POST:\n \t\t\/*\n \t\t * According to RFC 4918 section 9.5, we can implement\n \t\t * POST on a collection any way, so ship it to the\n \t\t * dynamic site for dynamic updates.\n \t\t * POST to a resource, however, gets 405'd.\n \t\t *\/\n-\t\tif ('\\0' == st->resource[0]) {\n+\n+\t\tif (st->resource[0] == '\\0') {\n \t\t\tkerrx(\"%s: ignoring post to collection\",\n \t\t\t\tst->prncpl->name);\n \t\t\thttp_error(&r, KHTTP_404);\n@@ -640,24 +670,25 @@\n \t\t\thttp_error(&r, KHTTP_405);\n \t\t}\n \t\tbreak;\n-\tcase (KMETHOD_GET):\n+\tcase KMETHOD_GET:\n \t\t\/*\n \t\t * According to RFC 4918 section 9.4, GET for\n \t\t * collections is undefined and we can do what we want.\n \t\t * Thus, return an HTML page describing the collection.\n \t\t * Otherwise, use the regular WebDAV handler.\n \t\t *\/\n-\t\tif ('\\0' == st->resource[0]) {\n+\n+\t\tif (st->resource[0] == '\\0') {\n \t\t\tkerrx(\"%s: ignoring get of collection\",\n \t\t\t\tst->prncpl->name);\n \t\t\thttp_error(&r, KHTTP_404);\n \t\t} else\n \t\t\tmethod_get(&r);\n \t\tbreak;\n-\tcase (KMETHOD_REPORT):\n+\tcase KMETHOD_REPORT:\n \t\tmethod_report(&r);\n \t\tbreak;\n-\tcase (KMETHOD_DELETE):\n+\tcase KMETHOD_DELETE:\n \t\tmethod_delete(&r);\n \t\tbreak;\n \tdefault:\n@@ -670,5 +701,5 @@\n out:\n \tkhttp_free(&r);\n \tstate_free(st);\n-\treturn(EXIT_SUCCESS);\n-}\n+\treturn EXIT_SUCCESS;\n+}\n"} {"commit":"00bf62bd42173ba0fc9e28f007a05ea4bc5cd8e1","subject":"common: prevent raw use of snprintf","message":"common: prevent raw use of snprintf\n","repos":"moobyfr\/xrdp,jsorg71\/xrdp,neutrinolabs\/xrdp,metalefty\/xrdp,moobyfr\/xrdp,ubuntu-xrdp\/xrdp,PKRoma\/xrdp,jsorg71\/xrdp,metalefty\/xrdp,PKRoma\/xrdp,moobyfr\/xrdp,neutrinolabs\/xrdp,ubuntu-xrdp\/xrdp,PKRoma\/xrdp,ubuntu-xrdp\/xrdp,metalefty\/xrdp,neutrinolabs\/xrdp,jsorg71\/xrdp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/os_calls.c\n+++ common\/os_calls.c\n@@ -1180,9 +1180,9 @@\n {\n struct sockaddr_in *sock_addr_in = &sock_info.sock_addr_in;\n \n- snprintf(msg, sizeof(msg), \"A connection received from %s port %d\",\n- inet_ntoa(sock_addr_in->sin_addr),\n- ntohs(sock_addr_in->sin_port));\n+ g_snprintf(msg, sizeof(msg), \"A connection received from %s port %d\",\n+ inet_ntoa(sock_addr_in->sin_addr),\n+ ntohs(sock_addr_in->sin_port));\n log_message(LOG_LEVEL_INFO, \"%s\", msg);\n \n break;\n@@ -1197,8 +1197,8 @@\n \n inet_ntop(sock_addr_in6->sin6_family,\n &sock_addr_in6->sin6_addr, addr, sizeof(addr));\n- snprintf(msg, sizeof(msg), \"A connection received from %s port %d\",\n- addr, ntohs(sock_addr_in6->sin6_port));\n+ g_snprintf(msg, sizeof(msg), \"A connection received from %s port %d\",\n+ addr, ntohs(sock_addr_in6->sin6_port));\n log_message(LOG_LEVEL_INFO, \"%s\", msg);\n \n break;\n@@ -1358,13 +1358,13 @@\n \n if (ok)\n {\n- snprintf(ip_address, bytes, \"%s:%d - socket: %d\", addr, port, rcv_sck);\n+ g_snprintf(ip_address, bytes, \"%s:%d - socket: %d\", addr, port, rcv_sck);\n }\n }\n \n if (!ok)\n {\n- snprintf(ip_address, bytes, \"NULL:NULL - socket: %d\", rcv_sck);\n+ g_snprintf(ip_address, bytes, \"NULL:NULL - socket: %d\", rcv_sck);\n }\n \n g_free(addr);\n"} {"commit":"61984499d6eff30e724ae6cc5145ae4c0def1d18","subject":"Avoid overflows while in single user mode","message":"Avoid overflows while in single user mode\n\nSigned-off-by: Johnothan King <a8ddc7217a18e572ca3c72013b682efc8914e2df@protonmail.com>\n","repos":"JohnoKing\/leaninit,JohnoKing\/leaninit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/init.c\n+++ cmd\/init.c\n@@ -100,9 +100,10 @@\n \tsetenv(\"RUNLEVEL\", \"1\", 1);\n \n \t\/\/ Use a shell of the user's choice\n-\tchar shell[102];\n+\tchar buffer[101], shell[101];\n \tprintf(CYAN \"* \" WHITE \"Shell to use for single user (defaults to \/bin\/sh):\" RESET \" \");\n-\tscanf(\"%s\", shell);\n+\tfgets(buffer, 101, stdin);\n+\tsscanf(buffer, \"%s\", shell);\n \n \t\/\/ If the given shell is invalid, use \/bin\/sh instead\n \tif(access(shell, X_OK) != 0) {\n"} {"commit":"16574dccd8f62dc1b585325f8a6a0aab10047ed8","subject":"Driver core: make uevent-environment available in uevent-file","message":"Driver core: make uevent-environment available in uevent-file\n\nThis allows sysfs to show the environment variables that are available\nif the uevent happens. This lets userspace not have to cache all of\nthis information as the kernel already knows it.\n\nSigned-off-by: Kay Sievers <a591390dde1303c55d531fd687bfa5ffd43e435e@vrfy.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/base\/core.c\n+++ drivers\/base\/core.c\n@@ -246,6 +246,53 @@\n \t.uevent =\tdev_uevent,\n };\n \n+static ssize_t show_uevent(struct device *dev, struct device_attribute *attr,\n+\t\t\t char *buf)\n+{\n+\tstruct kobject *top_kobj;\n+\tstruct kset *kset;\n+\tchar *envp[32];\n+\tchar data[PAGE_SIZE];\n+\tchar *pos;\n+\tint i;\n+\tsize_t count = 0;\n+\tint retval;\n+\n+\t\/* search the kset, the device belongs to *\/\n+\ttop_kobj = &dev->kobj;\n+\tif (!top_kobj->kset && top_kobj->parent) {\n+\t\tdo {\n+\t\t\ttop_kobj = top_kobj->parent;\n+\t\t} while (!top_kobj->kset && top_kobj->parent);\n+\t}\n+\tif (!top_kobj->kset)\n+\t\tgoto out;\n+\tkset = top_kobj->kset;\n+\tif (!kset->uevent_ops || !kset->uevent_ops->uevent)\n+\t\tgoto out;\n+\n+\t\/* respect filter *\/\n+\tif (kset->uevent_ops && kset->uevent_ops->filter)\n+\t\tif (!kset->uevent_ops->filter(kset, &dev->kobj))\n+\t\t\tgoto out;\n+\n+\t\/* let the kset specific function add its keys *\/\n+\tpos = data;\n+\tretval = kset->uevent_ops->uevent(kset, &dev->kobj,\n+\t\t\t\t\t envp, ARRAY_SIZE(envp),\n+\t\t\t\t\t pos, PAGE_SIZE);\n+\tif (retval)\n+\t\tgoto out;\n+\n+\t\/* copy keys to file *\/\n+\tfor (i = 0; envp[i]; i++) {\n+\t\tpos = &buf[count];\n+\t\tcount += sprintf(pos, \"%s\\n\", envp[i]);\n+\t}\n+out:\n+\treturn count;\n+}\n+\n static ssize_t store_uevent(struct device *dev, struct device_attribute *attr,\n \t\t\t const char *buf, size_t count)\n {\n@@ -621,10 +668,11 @@\n \t\t\t\t\t BUS_NOTIFY_ADD_DEVICE, dev);\n \n \tdev->uevent_attr.attr.name = \"uevent\";\n-\tdev->uevent_attr.attr.mode = S_IWUSR;\n+\tdev->uevent_attr.attr.mode = S_IRUGO | S_IWUSR;\n \tif (dev->driver)\n \t\tdev->uevent_attr.attr.owner = dev->driver->owner;\n \tdev->uevent_attr.store = store_uevent;\n+\tdev->uevent_attr.show = show_uevent;\n \terror = device_create_file(dev, &dev->uevent_attr);\n \tif (error)\n \t\tgoto attrError;\n"} {"commit":"83ba4ddc54d8ea429b6ba0bac185ebee113fba06","subject":"dnsdump: only dump packets that fail ldns and pass wreck","message":"dnsdump: only dump packets that fail ldns and pass wreck\n","repos":"hstern\/nmsg,hstern\/nmsg,hstern\/nmsg,hstern\/nmsg,hstern\/nmsg","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- wreck\/dnsdump.c\n+++ wreck\/dnsdump.c\n@@ -127,7 +127,7 @@\n \n compare:\n \tcount_compare++;\n-\tif (status_wreck != status_ldns && qdcount == 1) {\n+\tif (qdcount == 1 && status_wreck == true && status_ldns == false) {\n \t\tpcap_dump(dumper, hdr, pkt);\n \t\tcount_dump++;\n \t\tprintf(\"count=%u count_dump=%u status_wreck=%u status_ldns=%u\\n\", count, count_dump, status_wreck, status_ldns);\n"} {"commit":"6d7055237cc4c4ecf1beea65471913c11dc8d5a0","subject":"init eventdata too","message":"init eventdata too\n\n","repos":"fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -2430,6 +2430,7 @@\n \tgp_log (GP_LOG_DEBUG, \"ptp2\/wait_for_event\", \"waiting for events timeout %d ms\", timeout);\n \tmemset (&event, 0, sizeof(event));\n \t*eventtype = GP_EVENT_TIMEOUT;\n+\t*eventdata = NULL;\n \n \tgettimeofday (&event_start,NULL);\n \tif (\t(params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&\n"} {"commit":"9562351ae543ca0f5ad67967eeb5a0147cb730b7","subject":"more stuff into example","message":"more stuff into example\n","repos":"picrin\/redisSamples,galdor\/hiredis,owent-contrib\/hiredis,lxfontes\/hiredis,jqk6\/hiredis,tattsun\/hiredis,jinguoli\/hiredis,liulingfree\/hiredis,olgeni\/hiredis,hidebug\/hiredis,arinal\/hiredis,thomaslee\/hiredis,charsyam\/hiredis,jinguoli\/hiredis,charsyam\/hiredis,thedrow\/hiredis,Yhgenomics\/hiredis,chenlicong0821\/hiredis,h1048576\/hiredis,nokiddin\/hiredis,rangan337\/hiredis,Microsoft\/hiredis,redis\/hiredis,galdor\/hiredis,jinguoli\/hiredis,liulingfree\/hiredis,tattsun\/hiredis,texnician\/hiredis-win32,koenvandesande\/hiredis,olgeni\/hiredis,redis\/hiredis,chenlicong0821\/hiredis,hidebug\/hiredis,Microsoft\/hiredis,owent-contrib\/hiredis,nherment\/arsenic,yiliaofan\/hiredis,xjzhou\/hiredis,Yhgenomics\/hiredis,xjzhou\/hiredis,badboy\/hiredis-win,redis\/hiredis,rangan337\/hiredis,thomaslee\/hiredis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -30,7 +30,22 @@\n printf(\"SET (binary API): %s\\n\", reply->reply);\n freeReplyObject(reply);\n \n+ \/* Try a GET and two INCR *\/\n+ reply = redisCommand(fd,\"GET foo\");\n+ printf(\"GET foo: %s\\n\", reply->reply);\n+ freeReplyObject(reply);\n+\n+ reply = redisCommand(fd,\"INCR counter\");\n+ printf(\"INCR counter: %lld\\n\", reply->integer);\n+ freeReplyObject(reply);\n+ \/* again ... *\/\n+ reply = redisCommand(fd,\"INCR counter\");\n+ printf(\"INCR counter: %lld\\n\", reply->integer);\n+ freeReplyObject(reply);\n+\n \/* Create a list of numbers, from 0 to 9 *\/\n+ reply = redisCommand(fd,\"DEL mylist\");\n+ freeReplyObject(reply);\n for (j = 0; j < 10; j++) {\n char buf[64];\n \n"} {"commit":"04b51c5af51507c09bcd2409ce9e7e0a4ee8172a","subject":"igb: add default mac address modifier","message":"igb: add default mac address modifier\n\n- set_mac_addr\n\nSigned-off-by: Liang-Min Larry Wang <2524ccca2a8c3376532a264e722a8ba3ed2154a4@intel.com>\nAcked-by: Andrew Harvey <b2d41a128414c35b0c18610663b0c987496a2976@cisco.com>\nAcked-by: David Harton <41e0a1e2bcc9f6ca8a5f4060a6583dfdda62fd96@cisco.com>\nAcked-by: Konstantin Ananyev <cbd5212b59ab42a210d72992d23a3aa17cfd3eaf@intel.com>\n","repos":"tsphillips\/dpdk-fork,mixja\/dpdk,tsphillips\/dpdk-fork,msune\/dpdk,msune\/dpdk,mixja\/dpdk,venkynv\/dpdk-mirror,john-mcnamara-intel\/dpdk,msune\/dpdk,venkynv\/dpdk-mirror,venkynv\/dpdk-mirror,john-mcnamara-intel\/dpdk,mixja\/dpdk,john-mcnamara-intel\/dpdk,msune\/dpdk,tsphillips\/dpdk-fork,mixja\/dpdk,venkynv\/dpdk-mirror,tsphillips\/dpdk-fork,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/net\/e1000\/igb_ethdev.c\n+++ drivers\/net\/e1000\/igb_ethdev.c\n@@ -137,6 +137,8 @@\n \t\tstruct ether_addr *mac_addr,\n \t\tuint32_t index, uint32_t pool);\n static void eth_igb_rar_clear(struct rte_eth_dev *dev, uint32_t index);\n+static void eth_igb_default_mac_addr_set(struct rte_eth_dev *dev,\n+\t\tstruct ether_addr *addr);\n \n static void igbvf_intr_disable(struct e1000_hw *hw);\n static int igbvf_dev_configure(struct rte_eth_dev *dev);\n@@ -150,6 +152,8 @@\n \t\tuint16_t vlan_id, int on);\n static int igbvf_set_vfta(struct e1000_hw *hw, uint16_t vid, bool on);\n static void igbvf_set_vfta_all(struct rte_eth_dev *dev, bool on);\n+static void igbvf_default_mac_addr_set(struct rte_eth_dev *dev,\n+\t\tstruct ether_addr *addr);\n static int eth_igb_rss_reta_update(struct rte_eth_dev *dev,\n \t\t\t\t struct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t\t\t uint16_t reta_size);\n@@ -283,6 +287,7 @@\n \t.flow_ctrl_set = eth_igb_flow_ctrl_set,\n \t.mac_addr_add = eth_igb_rar_set,\n \t.mac_addr_remove = eth_igb_rar_clear,\n+\t.mac_addr_set = eth_igb_default_mac_addr_set,\n \t.reta_update = eth_igb_rss_reta_update,\n \t.reta_query = eth_igb_rss_reta_query,\n \t.rss_hash_update = eth_igb_rss_hash_update,\n@@ -314,6 +319,7 @@\n \t.tx_queue_setup = eth_igb_tx_queue_setup,\n \t.tx_queue_release = eth_igb_tx_queue_release,\n \t.set_mc_addr_list = eth_igb_set_mc_addr_list,\n+\t.mac_addr_set = igbvf_default_mac_addr_set,\n };\n \n \/**\n@@ -2133,6 +2139,14 @@\n \te1000_rar_set(hw, addr, index);\n }\n \n+static void\n+eth_igb_default_mac_addr_set(struct rte_eth_dev *dev,\n+\t\t\t\tstruct ether_addr *addr)\n+{\n+\teth_igb_rar_clear(dev, 0);\n+\n+\teth_igb_rar_set(dev, (void *)addr, 0, 0);\n+}\n \/*\n * Virtual Function operations\n *\/\n@@ -2366,6 +2380,17 @@\n \n \treturn 0;\n }\n+\n+static void\n+igbvf_default_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *addr)\n+{\n+\tstruct e1000_hw *hw =\n+\t\tE1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\n+\t\/* index is not used by rar_set() *\/\n+\thw->mac.ops.rar_set(hw, (void *)addr, 0);\n+}\n+\n \n static int\n eth_igb_rss_reta_update(struct rte_eth_dev *dev,\n"} {"commit":"d546cd70df2d5d7a409bfb79bd1b9cb4b5789029","subject":"Update UCI.h","message":"Update UCI.h","repos":"ConorGriffin37\/chess,ConorGriffin37\/chess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- engine\/UCI.h\n+++ engine\/UCI.h\n@@ -2,7 +2,7 @@\n #define UCI_H\n \n #include <string>\n-#include \"Board.h\"\n+#include \"board.hpp\"\n \n using namespace std;\n \n"} {"commit":"3007b2ff27e7d4253eb36e210f9827174e67f25b","subject":"fixed non-diagonal K case for gravity in re..vgm..sd","message":"fixed non-diagonal K case for gravity in re..vgm..sd\n","repos":"erdc\/proteus,erdc\/proteus,erdc\/proteus,erdc\/proteus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- proteusModule\/proteus\/numericalFlux.c\n+++ proteusModule\/proteus\/numericalFlux.c\n@@ -11843,7 +11843,8 @@\n \t if (isSeepageFace[ebNE])\n \t\t{\n \t\t \/\/if (u[ebNE*nQuadraturePoints_elementBoundary+k] >= -0.01 || diffusiveFlux[ebNE*nQuadraturePoints_elementBoundary+k] > 0.0)\n-\t\t if (diffusiveFlux[ebNE*nQuadraturePoints_elementBoundary+k] > 0.0)\n+\t\t \/\/if (diffusiveFlux[ebNE*nQuadraturePoints_elementBoundary+k] > 0.0)\n+\t\t if (flux > 0.0)\n \t\t {\n \t\t isDOFBoundary[ebNE*nQuadraturePoints_elementBoundary+k] = 1;\n \t\t }\n"} {"commit":"33d4babb96ad548ab7baf02c4e01c60bef39d7b8","subject":"COMP: Fix for picky C compiler","message":"COMP: Fix for picky C compiler\n","repos":"hendradarwin\/VTK,msmolens\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,spthaolt\/VTK,Wuteyan\/VTK,naucoin\/VTKSlicerWidgets,biddisco\/VTK,gram526\/VTK,collects\/VTK,spthaolt\/VTK,sumedhasingla\/VTK,aashish24\/VTK-old,keithroe\/vtkoptix,sgh\/vtk,sankhesh\/VTK,SimVascular\/VTK,mspark93\/VTK,daviddoria\/PointGraphsPhase1,msmolens\/VTK,berendkleinhaneveld\/VTK,candy7393\/VTK,sumedhasingla\/VTK,SimVascular\/VTK,aashish24\/VTK-old,mspark93\/VTK,collects\/VTK,hendradarwin\/VTK,berendkleinhaneveld\/VTK,sumedhasingla\/VTK,ashray\/VTK-EVM,cjh1\/VTK,Wuteyan\/VTK,spthaolt\/VTK,johnkit\/vtk-dev,spthaolt\/VTK,sankhesh\/VTK,sankhesh\/VTK,keithroe\/vtkoptix,naucoin\/VTKSlicerWidgets,candy7393\/VTK,naucoin\/VTKSlicerWidgets,jeffbaumes\/jeffbaumes-vtk,hendradarwin\/VTK,johnkit\/vtk-dev,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,hendradarwin\/VTK,jmerkow\/VTK,gram526\/VTK,msmolens\/VTK,demarle\/VTK,sgh\/vtk,berendkleinhaneveld\/VTK,collects\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,msmolens\/VTK,keithroe\/vtkoptix,SimVascular\/VTK,jmerkow\/VTK,Wuteyan\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,demarle\/VTK,daviddoria\/PointGraphsPhase1,Wuteyan\/VTK,biddisco\/VTK,daviddoria\/PointGraphsPhase1,keithroe\/vtkoptix,jeffbaumes\/jeffbaumes-vtk,spthaolt\/VTK,sgh\/vtk,sumedhasingla\/VTK,collects\/VTK,candy7393\/VTK,arnaudgelas\/VTK,sankhesh\/VTK,demarle\/VTK,msmolens\/VTK,gram526\/VTK,SimVascular\/VTK,berendkleinhaneveld\/VTK,SimVascular\/VTK,ashray\/VTK-EVM,jmerkow\/VTK,biddisco\/VTK,johnkit\/vtk-dev,Wuteyan\/VTK,candy7393\/VTK,msmolens\/VTK,mspark93\/VTK,jmerkow\/VTK,jeffbaumes\/jeffbaumes-vtk,demarle\/VTK,mspark93\/VTK,aashish24\/VTK-old,keithroe\/vtkoptix,spthaolt\/VTK,sankhesh\/VTK,sumedhasingla\/VTK,demarle\/VTK,biddisco\/VTK,biddisco\/VTK,jmerkow\/VTK,SimVascular\/VTK,demarle\/VTK,jeffbaumes\/jeffbaumes-vtk,jeffbaumes\/jeffbaumes-vtk,biddisco\/VTK,jeffbaumes\/jeffbaumes-vtk,biddisco\/VTK,mspark93\/VTK,mspark93\/VTK,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,jmerkow\/VTK,johnkit\/vtk-dev,arnaudgelas\/VTK,hendradarwin\/VTK,arnaudgelas\/VTK,Wuteyan\/VTK,demarle\/VTK,candy7393\/VTK,aashish24\/VTK-old,ashray\/VTK-EVM,cjh1\/VTK,ashray\/VTK-EVM,gram526\/VTK,cjh1\/VTK,keithroe\/vtkoptix,SimVascular\/VTK,gram526\/VTK,sumedhasingla\/VTK,cjh1\/VTK,hendradarwin\/VTK,sankhesh\/VTK,ashray\/VTK-EVM,cjh1\/VTK,aashish24\/VTK-old,demarle\/VTK,ashray\/VTK-EVM,johnkit\/vtk-dev,jmerkow\/VTK,SimVascular\/VTK,sankhesh\/VTK,aashish24\/VTK-old,gram526\/VTK,ashray\/VTK-EVM,mspark93\/VTK,gram526\/VTK,candy7393\/VTK,sumedhasingla\/VTK,cjh1\/VTK,msmolens\/VTK,berendkleinhaneveld\/VTK,hendradarwin\/VTK,sgh\/vtk,naucoin\/VTKSlicerWidgets,collects\/VTK,arnaudgelas\/VTK,jmerkow\/VTK,Wuteyan\/VTK,collects\/VTK,sgh\/vtk,arnaudgelas\/VTK,berendkleinhaneveld\/VTK,arnaudgelas\/VTK,candy7393\/VTK,sgh\/vtk,keithroe\/vtkoptix,sankhesh\/VTK,mspark93\/VTK,keithroe\/vtkoptix,berendkleinhaneveld\/VTK,naucoin\/VTKSlicerWidgets,msmolens\/VTK,candy7393\/VTK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Wrapping\/vtkWrapTcl.c\n+++ Wrapping\/vtkWrapTcl.c\n@@ -452,7 +452,7 @@\n output_temp(fp, MAX_ARGS,currentFunction->ReturnType,\n currentFunction->ReturnClass, 0);\n handle_return_prototype(fp);\n- \/\/ only use the error variable if we have arguments to parse\n+ \/* only use the error variable if we have arguments to parse *\/\n if (currentFunction->NumberOfArguments)\n {\n fprintf(fp,\" error = 0;\\n\\n\");\n@@ -504,7 +504,7 @@\n return_result(fp);\n fprintf(fp,\" return TCL_OK;\\n\");\n \n- \/\/ close the if error\n+ \/* close the if error *\/\n if (currentFunction->NumberOfArguments)\n {\n fprintf(fp,\" }\\n\");\n"} {"commit":"49ac8bec7039ee8e45116ea6359fd375e737a858","subject":"Remove errant print","message":"Remove errant print\n","repos":"cusplibrary\/cusplibrary,cusplibrary\/cusplibrary,sdalton1\/cusplibrary,sdalton1\/cusplibrary,sdalton1\/cusplibrary,sdalton1\/cusplibrary,cusplibrary\/cusplibrary,cusplibrary\/cusplibrary","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- cusp\/system\/cuda\/detail\/multiply\/coo_spmv_cub.h\n+++ cusp\/system\/cuda\/detail\/multiply\/coo_spmv_cub.h\n@@ -918,7 +918,6 @@\n \/\/ TexVector<ValueType>::BindTexture(d_x, num_cols);\n \n \/\/ cudaDeviceSetSharedMemConfig(cudaSharedMemBankSizeEightByte);\n- std::cout << y[3] << std::endl;\n \n \/\/ Run the COO kernel\n CooKernel<COO_BLOCK_THREADS, COO_ITEMS_PER_THREAD><<<coo_grid_size, COO_BLOCK_THREADS, 0, s>>>(\n@@ -935,8 +934,6 @@\n \n if (coo_grid_size > 1)\n {\n- cusp::array1d<PartialProduct, cusp::host_memory> partials_h(block_partials);\n-\n \/\/ Run the COO finalize kernel\n CooFinalizeKernel<FINALIZE_BLOCK_THREADS, FINALIZE_ITEMS_PER_THREAD><<<1, FINALIZE_BLOCK_THREADS, 0, s>>>(\n thrust::raw_pointer_cast(&block_partials[0]),\n"} {"commit":"8c74fcb80c46e8b554c5ba34f4db0f366cf54ae3","subject":"common: fix a glitch with IPv4 struct initialization","message":"common: fix a glitch with IPv4 struct initialization\n\nPointed out by: andrecbarros\nCloses: #803\n","repos":"cocoon\/xrdp,cocoon\/xrdp,neutrinolabs\/xrdp,metalefty\/xrdp,cocoon\/xrdp,moobyfr\/xrdp,metalefty\/xrdp,neutrinolabs\/xrdp,moobyfr\/xrdp,metalefty\/xrdp,ubuntu-xrdp\/xrdp,jsorg71\/xrdp,PKRoma\/xrdp,moobyfr\/xrdp,ubuntu-xrdp\/xrdp,ubuntu-xrdp\/xrdp,PKRoma\/xrdp,jsorg71\/xrdp,PKRoma\/xrdp,neutrinolabs\/xrdp,jsorg71\/xrdp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/os_calls.c\n+++ common\/os_calls.c\n@@ -1012,7 +1012,7 @@\n errno6 = errno;\n \n \/\/ else IPv4\n- g_memset(&sa, 0, sizeof(s));\n+ g_memset(&s, 0, sizeof(s));\n s.sin_family = AF_INET;\n s.sin_addr.s_addr = htonl(INADDR_LOOPBACK); \/\/ IPv4 127.0.0.1\n s.sin_port = htons((tui16)atoi(port));\n"} {"commit":"809a4c323767dbb355e5923463c7e512e7593e71","subject":"wire up adb args","message":"wire up adb args\n","repos":"tcmulcahy\/fb-adb,JuudeDemos\/fb-adb,0359xiaodong\/fb-adb,0359xiaodong\/fb-adb,0359xiaodong\/fb-adb,niedzielski\/fb-adb,niedzielski\/fb-adb,biddyweb\/fb-adb,n054\/fb-adb,biddyweb\/fb-adb,n054\/fb-adb,niedzielski\/fb-adb,tcmulcahy\/fb-adb,biddyweb\/fb-adb,JuudeDemos\/fb-adb,tcmulcahy\/fb-adb,n054\/fb-adb,JuudeDemos\/fb-adb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cmd_shex.c\n+++ cmd_shex.c\n@@ -27,10 +27,35 @@\n #include \"timestamp.h\"\n #include \"argv.h\"\n \n+static const char usage[] = (\n+ \"%s [OPTS] [CMD [ARGS...]]: run command on Android device\\n\"\n+ \"\\n\"\n+ \" -t\\n\"\n+ \" --force-tty\\n\"\n+ \" Allocate a PTY even when CMD is given\\n\"\n+ \"\\n\"\n+ \" -E EXENAME\\n\"\n+ \" --exename EXENAME\\n\"\n+ \" Run EXENAME on remote host. Default is CMD, which becomes\\n\"\n+ \" argv[0] in any case.\\n\"\n+ \"\\n\"\n+ \" -T\\n\"\n+ \" --disable-tty\\n\"\n+ \" Never give the remote command a pseudo-terminal.\\n\"\n+ \"\\n\"\n+ \" -h\\n\"\n+ \" --help\\n\"\n+ \" Display this message.\\n\"\n+ \"\\n\"\n+ \" -d, -e, -s, -p, -H, -P\\n\"\n+ \" Control the device to which adbx connects. See adb help.\\n\"\n+ \"\\n\"\n+ );\n+\n static void\n print_usage(void)\n {\n- printf(\"%s [-u sock]: shex\\n\", prgname);\n+ printf(usage, prgname);\n }\n \n struct adbx_shex {\n@@ -332,7 +357,7 @@\n static struct option opts[] = {\n { \"help\", no_argument, NULL, 'h' },\n { \"local\", no_argument, NULL, 'l' },\n- { \"exename\", required_argument, NULL, 'e' },\n+ { \"exename\", required_argument, NULL, 'E' },\n { \"force-send-stub\", no_argument, NULL, 'f' },\n { \"force-tty\", no_argument, NULL, 't' },\n { \"disable-tty\", no_argument, NULL, 'T' },\n@@ -340,12 +365,16 @@\n };\n \n for (;;) {\n- char c = getopt_long(argc, (char**) argv, \"+:lhe:ftT\", opts, NULL);\n+ char c = getopt_long(argc,\n+ (char**) argv,\n+ \"+:lhE:ftTdes:p:H:P:\",\n+ opts,\n+ NULL);\n if (c == -1)\n break;\n- \n+\n switch (c) {\n- case 'e':\n+ case 'E':\n exename = optarg;\n break;\n case 'f':\n@@ -362,6 +391,24 @@\n break;\n case 'T':\n tty_mode = TTY_DISABLE;\n+ break;\n+ case 'd':\n+ case 'e':\n+ adb_args = argv_concat(\n+ adb_args,\n+ (const char*[]){xaprintf(\"-%c\", c), NULL},\n+ NULL);\n+ break;\n+ case 's':\n+ case 'p':\n+ case 'H':\n+ case 'P':\n+ adb_args = argv_concat(\n+ adb_args,\n+ (const char*[]){xaprintf(\"-%c\", c),\n+ xstrdup(optarg),\n+ NULL},\n+ NULL);\n break;\n case ':':\n die(EINVAL, \"missing option for -%c\", optopt);\n"} {"commit":"1cabf7dba57011339d7e5a44b2c9829305936372","subject":"bcma: return correct error code when bus scan failed","message":"bcma: return correct error code when bus scan failed\n\nIt is better to return the actual error code than just -1.\n\nSigned-off-by: Hauke Mehrtens <435ddd46dc66c007a1fa20144c823d37e0d23436@hauke-m.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/bcma\/main.c\n+++ drivers\/bcma\/main.c\n@@ -237,7 +237,7 @@\n \terr = bcma_bus_scan(bus);\n \tif (err) {\n \t\tbcma_err(bus, \"Failed to scan: %d\\n\", err);\n-\t\treturn -1;\n+\t\treturn err;\n \t}\n \n \t\/* Early init CC core *\/\n"} {"commit":"436196109973ba942e0a22479577807a69f7bfca","subject":"WARNING: CollisionModel::contactFriction set to 0 by default","message":"WARNING: CollisionModel::contactFriction set to 0 by default\n\nFormer-commit-id: d25abc3402a02dc3ddae0975287ecfe054bd5a19","repos":"FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa,Anatoscope\/sofa,FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa,Anatoscope\/sofa,hdeling\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,hdeling\/sofa,Anatoscope\/sofa,FabienPean\/sofa,Anatoscope\/sofa,Anatoscope\/sofa,FabienPean\/sofa,Anatoscope\/sofa,hdeling\/sofa,hdeling\/sofa,hdeling\/sofa,hdeling\/sofa,FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa,hdeling\/sofa,FabienPean\/sofa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- framework\/sofa\/core\/CollisionModel.h\n+++ framework\/sofa\/core\/CollisionModel.h\n@@ -95,9 +95,9 @@\n , bSimulated(initData(&bSimulated, true, \"simulated\", \"flag indicating if this object is controlled by a simulation\"))\n , bSelfCollision(initData(&bSelfCollision, false, \"selfCollision\", \"flag indication if the object can self collide\"))\n , proximity(initData(&proximity, (SReal)0.0, \"proximity\", \"Distance to the actual (visual) surface\"))\n- , contactStiffness(initData(&contactStiffness, (SReal)10.0, \"contactStiffness\", \"Default contact stiffness\"))\n- , contactFriction(initData(&contactFriction, (SReal)0.01, \"contactFriction\", \"Default contact friction (damping) coefficient\"))\n- , contactRestitution(initData(&contactRestitution, (SReal)0.0, \"contactRestitution\", \"Default contact coefficient of restitution\"))\n+ , contactStiffness(initData(&contactStiffness, (SReal)10.0, \"contactStiffness\", \"Contact stiffness\"))\n+ , contactFriction(initData(&contactFriction, (SReal)0.0, \"contactFriction\", \"Contact friction coefficient (dry or viscous or unused depending on the contact method)\"))\n+ , contactRestitution(initData(&contactRestitution, (SReal)0.0, \"contactRestitution\", \"Contact coefficient of restitution\"))\n , contactResponse(initData(&contactResponse, \"contactResponse\", \"if set, indicate to the ContactManager that this model should use the given class of contacts.\\nNote that this is only indicative, and in particular if both collision models specify a different class it is up to the manager to choose.\"))\n , color(initData(&color, defaulttype::Vec4f(1,0,0,1), \"color\", \"color used to display the collision model if requested\"))\n , group(initData(&group,\"group\",\"IDs of the groups containing this model. No collision can occur between collision models included in a common group (e.g. allowing the same object to have multiple collision models)\"))\n"} {"commit":"da4a7a3926d09c13ae052ede67feb7285e01e3f5","subject":"ALSA: hda - Explicitly keep codec powered up in hdmi_present_sense","message":"ALSA: hda - Explicitly keep codec powered up in hdmi_present_sense\n\nThis should help us avoid the following mutex deadlock:\n\n[] mutex_lock+0x2a\/0x50\n[] hdmi_present_sense+0x53\/0x3a0 [snd_hda_codec_hdmi]\n[] generic_hdmi_resume+0x5a\/0x70 [snd_hda_codec_hdmi]\n[] hda_call_codec_resume+0xec\/0x1d0 [snd_hda_codec]\n[] snd_hda_power_save+0x1e4\/0x280 [snd_hda_codec]\n[] codec_exec_verb+0x5f\/0x290 [snd_hda_codec]\n[] snd_hda_codec_read+0x5b\/0x90 [snd_hda_codec]\n[] snd_hdmi_get_eld_size+0x1e\/0x20 [snd_hda_codec_hdmi]\n[] snd_hdmi_get_eld+0x2c\/0xd0 [snd_hda_codec_hdmi]\n[] hdmi_present_sense+0x9a\/0x3a0 [snd_hda_codec_hdmi]\n[] hdmi_repoll_eld+0x34\/0x50 [snd_hda_codec_hdmi]\n\nSigned-off-by: David Henningsson <9fb354e0a5603a0331399c18f4aa5aab2f9d9c5b@canonical.com>\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"3933b3bb94ebf4981a7c271690944a351a1c07f8","subject":"avoid dead code (Coverity)","message":"avoid dead code (Coverity)\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@14617 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"msmeissn\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -3389,11 +3389,8 @@\n \t\t\t\tusleep(10000); \/* 10 ms ... fixme: perhaps experimental backoff? *\/\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tif (ret != PTP_RC_OK) {\n-\t\t\t\tgp_context_error (context, _(\"Canon Capture failed: %x\"), ret);\n-\t\t\t\treturn translate_ptp_result (ret);\n-\t\t\t}\n-\t\t\treturn GP_OK;\n+\t\t\tgp_context_error (context, _(\"Canon Capture failed: %x\"), ret);\n+\t\t\treturn translate_ptp_result (ret);\n \t\t}\n \t\tgp_log (GP_LOG_DEBUG, \"ptp\/trigger_capture\", \"Canon Powershot capture triggered...\");\n \t\treturn GP_OK;\n"} {"commit":"61712081cde48cc9a74e5c8b8c2629d4364927aa","subject":"Changed window title bar of example","message":"Changed window title bar of example\n","repos":"thynnmas\/slenderer,thynnmas\/slenderer,thynnmas\/slenderer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -320,7 +320,7 @@\n \n \t\/\/ Initialize slenderer\n \tsl_renderer_create( );\n-\twin = sl_renderer_open_window( 512, 512, \"Blobby Volley\", SL_FALSE, SL_FALSE );\n+\twin = sl_renderer_open_window( 512, 512, \"Volleyball\", SL_FALSE, SL_FALSE );\n \t\n \t\/\/ Add the textures\n \tbg_tex = sl_renderer_allocate_texture( );\n"} {"commit":"e48a9fc3641a992d2bc00f17b7a56f57ab9b7512","subject":"net\/e1000: support descriptor status API","message":"net\/e1000: support descriptor status API\n\nrte_eth_rx_descritpr_status and rte_eth_tx_descriptor_status\nare supported by igb VF.\n\nSigned-off-by: Wei Zhao <55941fd0e75edbdf274af2cfac8f147525678f08@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/e1000\/igb_ethdev.c\n+++ drivers\/net\/e1000\/igb_ethdev.c\n@@ -435,6 +435,9 @@\n \t.dev_supported_ptypes_get = eth_igb_supported_ptypes_get,\n \t.rx_queue_setup = eth_igb_rx_queue_setup,\n \t.rx_queue_release = eth_igb_rx_queue_release,\n+\t.rx_descriptor_done = eth_igb_rx_descriptor_done,\n+\t.rx_descriptor_status = eth_igb_rx_descriptor_status,\n+\t.tx_descriptor_status = eth_igb_tx_descriptor_status,\n \t.tx_queue_setup = eth_igb_tx_queue_setup,\n \t.tx_queue_release = eth_igb_tx_queue_release,\n \t.set_mc_addr_list = eth_igb_set_mc_addr_list,\n"} {"commit":"829c48f44a258a69b4afc6d7036d2a5c914fe0e7","subject":"TEST-FW\\VIDEO\\PC: For PCjr and graphics modes, test video memory vs system memory pointers to make sure they match","message":"TEST-FW\\VIDEO\\PC: For PCjr and graphics modes, test video memory vs system memory pointers to make sure they match\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test-fw\/video\/pc\/test.c\n+++ test-fw\/video\/pc\/test.c\n@@ -458,6 +458,29 @@\n port);\n }\n \n+ \/* test if PCjr:\n+ * Make sure what we see at B800:0000 matches the segment we think is PCjr video memory.\n+ * This is a read-only test, to avoid damaging the DOS kernel accidentally.\n+ * According to DOSBox SVN\/DOSBox-X PCjr emulation, only the first 16KB is visible at B800. *\/\n+ if ((vga_state.vga_flags & (VGA_IS_PCJR))) {\n+ VGA_RAM_PTR alt;\n+\n+#if TARGET_MSDOS == 32\n+ alt = (VGA_RAM_PTR)0xB8000;\n+#else\n+ alt = (VGA_RAM_PTR)MK_FP(0xB800,0x0000);\n+#endif\n+\n+ LOG(LOG_DEBUG \"Testing PCjr video memory vs system memory remapping\\n\");\n+\n+ for (i=0;i < 0x2000u;i++) {\n+ if (vmem[i] != alt[i]) {\n+ LOG(LOG_WARN \"VRAM TEST FAILED, PCjr video mem vs system mem associated with it does not match at byte 0x%x\\n\",i);\n+ return;\n+ }\n+ }\n+ }\n+\n \/* test that the RAM is there, note if it is not *\/\n for (i=0;i < ((ymsk+1)*0x2000u);i++)\n vmem[i] = 0x0F ^ i ^ (i << 6);\n@@ -570,6 +593,29 @@\n if (port != 0x3D4)\n LOG(LOG_WARN \"BIOS CRT I\/O port in bios DATA area 0x%x is unusual for this video mode\\n\",\n port);\n+ }\n+\n+ \/* test if PCjr:\n+ * Make sure what we see at B800:0000 matches the segment we think is PCjr video memory.\n+ * This is a read-only test, to avoid damaging the DOS kernel accidentally.\n+ * According to DOSBox SVN\/DOSBox-X PCjr emulation, only the first 16KB is visible at B800. *\/\n+ if ((vga_state.vga_flags & (VGA_IS_PCJR))) {\n+ VGA_RAM_PTR alt;\n+\n+#if TARGET_MSDOS == 32\n+ alt = (VGA_RAM_PTR)0xB8000;\n+#else\n+ alt = (VGA_RAM_PTR)MK_FP(0xB800,0x0000);\n+#endif\n+\n+ LOG(LOG_DEBUG \"Testing PCjr video memory vs system memory remapping\\n\");\n+\n+ for (i=0;i < 0x2000u;i++) {\n+ if (vmem[i] != alt[i]) {\n+ LOG(LOG_WARN \"VRAM TEST FAILED, PCjr video mem vs system mem associated with it does not match at byte 0x%x\\n\",i);\n+ return;\n+ }\n+ }\n }\n \n \/* test that the RAM is there, note if it is not *\/\n"} {"commit":"96b59c3e7d3e8ac42cd92ff602b2446ad8c4d3ff","subject":"Fix error in copy handling","message":"Fix error in copy handling\n","repos":"jmlich\/simarrange,kliment\/simarrange","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- simarrange.c\n+++ simarrange.c\n@@ -390,8 +390,8 @@\n cvZero(itmp);\n int firstpassed=0, placed=0;\n DL_FOREACH(shapes,elt) {\n- placed=0;\n for (copy = elt->done; copy < elt->count; copy++) {\n+ placed=0;\n int ignore_this = 0;\n LL_FOREACH(ignores, ign) {\n if (strncmp(elt->filename, ign->filename, FILENAME_LEN) == 0) {\n"} {"commit":"7ad47996e4a74bc2c93f6e47514d86abc954f918","subject":"1) free binaryHeaders w\/ done with installs 2) free rpmdep structures in both install and uninstall","message":"1) free binaryHeaders w\/ done with installs\n2) free rpmdep structures in both install and uninstall\n","repos":"devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- install.c\n+++ install.c\n@@ -235,6 +235,8 @@\n \t\tstopInstall = 1;\n \t }\n \n+\t rpmdepDone(rpmdep);\n+\n \t if (!stopInstall && conflicts) {\n \t\tfprintf(stderr, \"failed dependencies:\\n\");\n \t\tprintDepProblems(stderr, conflicts, numConflicts);\n@@ -255,6 +257,9 @@\n \n for (i = 0; i < numTmpPackages; i++)\n \tunlink(tmpPackages[i]);\n+\n+ for (i = 0; i < numBinaryPackages; i++) \n+\tfreeHeader(binaryHeaders[i]);\n \n if (db) rpmdbClose(db);\n \n@@ -336,6 +341,8 @@\n \t stopUninstall = 1;\n \t}\n \n+\trpmdepDone(rpmdep);\n+\n \tif (!stopUninstall && conflicts) {\n \t fprintf(stderr, \"removing these packages would break \"\n \t\t\t \"dependencies:\\n\");\n"} {"commit":"8be6f2809b5e0d72c6317ba884be40d6deb11d14","subject":"Improved handling of static functions.","message":"Improved handling of static functions.\n","repos":"jaccovanschaik\/exproto","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- exproto.c\n+++ exproto.c\n@@ -2,7 +2,7 @@\n * exproto.c: Prototype extractor.\n *\n * Copyright:\t(c) 2013 Jacco van Schaik (jacco@jaccovanschaik.net)\n- * Version:\t$Id: exproto.c 15 2016-12-15 16:06:32Z jacco $\n+ * Version:\t$Id: exproto.c 20 2020-01-13 13:22:33Z jacco $\n *\n * This software is distributed under the terms of the MIT license. See\n * http:\/\/www.opensource.org\/licenses\/mit-license.php for details.\n@@ -10,15 +10,16 @@\n \n #include <string.h>\n #include <stdlib.h>\n+#include <stdbool.h>\n #include <stdio.h>\n #include <ctype.h>\n \n #include <libjvs\/buffer.h>\n #include <libjvs\/defs.h>\n \n-static int include_comment = FALSE;\n-static int include_static = FALSE;\n-static int use_cpp = FALSE;\n+static bool include_comment = FALSE;\n+static bool include_static_functions = FALSE;\n+static bool use_cpp = FALSE;\n \n \/*\n * Read a string and add it to <buf>. The string should be terminated by <terminator>.\n@@ -86,9 +87,13 @@\n if (c == '*') {\n c = fgetc(fp);\n \n- bufAddC(buffer, c);\n-\n- if (c == '\/') break;\n+ if (c == '\/') {\n+ bufAddC(buffer, c);\n+ break;\n+ }\n+ else {\n+ ungetc(c, fp);\n+ }\n }\n }\n \n@@ -162,7 +167,9 @@\n \/*\n * Read a declaration up to a semicolon or an open curly brace and add it to <declaration>.\n *\/\n-static int handle_declaration(FILE *fp, Buffer *declaration)\n+const static\n+int\n+handle_declaration(FILE *fp, Buffer *declaration)\n {\n int c;\n \n@@ -221,6 +228,7 @@\n const char *str;\n int len;\n \n+ \/\/ Trim all leading whitespace\n while (TRUE) {\n str = bufGet(&declaration);\n len = bufLen(&declaration);\n@@ -231,6 +239,7 @@\n break;\n }\n \n+ \/\/ Trim all trailing whitespace\n while (TRUE) {\n str = bufGet(&declaration);\n len = bufLen(&declaration);\n@@ -241,7 +250,19 @@\n break;\n }\n \n- if (include_static == TRUE || strncmp(str, \"static\", 6) != 0) {\n+ const char *ptr = strstr(str, \"static\");\n+ bool include_this_function = false;\n+\n+ if (ptr == NULL || include_static_functions)\n+ include_this_function = true; \/\/ No \"static\" or static functions are allowed\n+ else if (ptr == str && isspace(ptr[6]))\n+ include_this_function = false; \/\/ \"static\" at start, followed by whitespace\n+ else if (isspace(ptr[-1]) && isspace(ptr[6]))\n+ include_this_function = false; \/\/ \"static\" preceded and followed by whitespace\n+ else\n+ include_this_function = true; \/\/ \"static\" somewhere in the name maybe?\n+\n+ if (include_this_function) {\n fputc('\\n', out);\n \n if (include_comment && bufLen(&comment) > 0) {\n@@ -321,7 +342,7 @@\n include_comment = TRUE;\n }\n else if (strcmp(argv[i], \"-s\") == 0 || strcmp(argv[i], \"--statics\") == 0) {\n- include_static = TRUE;\n+ include_static_functions = TRUE;\n }\n else if (strcmp(argv[i], \"-h\") == 0 || strcmp(argv[i], \"--help\") == 0) {\n usage(NULL, argv[0], 0);\n"} {"commit":"550e8d1debf075ae18623b893b5de2fb10ef0fb1","subject":"COMP:Fixed warnings.","message":"COMP:Fixed warnings.\n","repos":"spthaolt\/VTK,naucoin\/VTKSlicerWidgets,demarle\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,msmolens\/VTK,ashray\/VTK-EVM,mspark93\/VTK,biddisco\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,demarle\/VTK,keithroe\/vtkoptix,mspark93\/VTK,jmerkow\/VTK,mspark93\/VTK,aashish24\/VTK-old,candy7393\/VTK,ashray\/VTK-EVM,collects\/VTK,ashray\/VTK-EVM,gram526\/VTK,sankhesh\/VTK,arnaudgelas\/VTK,berendkleinhaneveld\/VTK,arnaudgelas\/VTK,keithroe\/vtkoptix,naucoin\/VTKSlicerWidgets,naucoin\/VTKSlicerWidgets,ashray\/VTK-EVM,daviddoria\/PointGraphsPhase1,arnaudgelas\/VTK,aashish24\/VTK-old,johnkit\/vtk-dev,mspark93\/VTK,sankhesh\/VTK,cjh1\/VTK,demarle\/VTK,berendkleinhaneveld\/VTK,mspark93\/VTK,berendkleinhaneveld\/VTK,demarle\/VTK,jeffbaumes\/jeffbaumes-vtk,biddisco\/VTK,collects\/VTK,candy7393\/VTK,daviddoria\/PointGraphsPhase1,berendkleinhaneveld\/VTK,keithroe\/vtkoptix,SimVascular\/VTK,demarle\/VTK,demarle\/VTK,SimVascular\/VTK,gram526\/VTK,jmerkow\/VTK,SimVascular\/VTK,johnkit\/vtk-dev,johnkit\/vtk-dev,sankhesh\/VTK,jmerkow\/VTK,msmolens\/VTK,jeffbaumes\/jeffbaumes-vtk,gram526\/VTK,sumedhasingla\/VTK,sumedhasingla\/VTK,mspark93\/VTK,naucoin\/VTKSlicerWidgets,SimVascular\/VTK,msmolens\/VTK,berendkleinhaneveld\/VTK,candy7393\/VTK,jeffbaumes\/jeffbaumes-vtk,cjh1\/VTK,msmolens\/VTK,johnkit\/vtk-dev,hendradarwin\/VTK,candy7393\/VTK,jmerkow\/VTK,Wuteyan\/VTK,gram526\/VTK,johnkit\/vtk-dev,collects\/VTK,ashray\/VTK-EVM,gram526\/VTK,sankhesh\/VTK,aashish24\/VTK-old,jeffbaumes\/jeffbaumes-vtk,SimVascular\/VTK,sumedhasingla\/VTK,msmolens\/VTK,candy7393\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,spthaolt\/VTK,keithroe\/vtkoptix,aashish24\/VTK-old,candy7393\/VTK,ashray\/VTK-EVM,spthaolt\/VTK,sankhesh\/VTK,naucoin\/VTKSlicerWidgets,spthaolt\/VTK,daviddoria\/PointGraphsPhase1,msmolens\/VTK,collects\/VTK,sumedhasingla\/VTK,SimVascular\/VTK,candy7393\/VTK,gram526\/VTK,msmolens\/VTK,jmerkow\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,arnaudgelas\/VTK,spthaolt\/VTK,keithroe\/vtkoptix,jeffbaumes\/jeffbaumes-vtk,demarle\/VTK,jmerkow\/VTK,mspark93\/VTK,jmerkow\/VTK,Wuteyan\/VTK,johnkit\/vtk-dev,hendradarwin\/VTK,candy7393\/VTK,biddisco\/VTK,keithroe\/vtkoptix,cjh1\/VTK,arnaudgelas\/VTK,sumedhasingla\/VTK,SimVascular\/VTK,Wuteyan\/VTK,biddisco\/VTK,arnaudgelas\/VTK,sankhesh\/VTK,sankhesh\/VTK,SimVascular\/VTK,aashish24\/VTK-old,cjh1\/VTK,daviddoria\/PointGraphsPhase1,spthaolt\/VTK,naucoin\/VTKSlicerWidgets,jeffbaumes\/jeffbaumes-vtk,hendradarwin\/VTK,collects\/VTK,ashray\/VTK-EVM,sankhesh\/VTK,aashish24\/VTK-old,cjh1\/VTK,sumedhasingla\/VTK,jmerkow\/VTK,Wuteyan\/VTK,collects\/VTK,sumedhasingla\/VTK,Wuteyan\/VTK,cjh1\/VTK,demarle\/VTK,keithroe\/vtkoptix,gram526\/VTK,hendradarwin\/VTK,johnkit\/vtk-dev,spthaolt\/VTK,mspark93\/VTK,ashray\/VTK-EVM,hendradarwin\/VTK,keithroe\/vtkoptix,sumedhasingla\/VTK,berendkleinhaneveld\/VTK,biddisco\/VTK,daviddoria\/PointGraphsPhase1,msmolens\/VTK,biddisco\/VTK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Wrapping\/vtkWrapTcl.c\n+++ Wrapping\/vtkWrapTcl.c\n@@ -39,7 +39,7 @@\n {\n free(result);\n }\n- result = (char *)malloc(maxlen+1);\n+ result = (char *)malloc((size_t)(maxlen+1));\n oldmaxlen = maxlen;\n }\n \n"} {"commit":"d9f0bcb0a78d10aaf1d03afedc2b3742536add88","subject":"Return DISCONNECT on GOAWAY without an error","message":"Return DISCONNECT on GOAWAY without an error\n","repos":"pyos\/libcno,pyos\/libcno","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cno\/core.c\n+++ cno\/core.c\n@@ -600,7 +600,7 @@\n const uint32_t error = read4((const uint8_t *) frame->payload.data + 4);\n if (error != CNO_RST_NO_ERROR)\n return CNO_ERROR(TRANSPORT, \"disconnected with error %u\", error);\n- return CNO_OK;\n+ return CNO_ERROR(DISCONNECT, \"disconnected\");\n }\n \n \n"} {"commit":"f0d4724b2a663089d21e19933ca591d842b63230","subject":"bcma: log the id, rev and pkg of the chip found","message":"bcma: log the id, rev and pkg of the chip found\n\nThis makes us see what type of hardware someone uses by the dmesg\noutput.\n\nSigned-off-by: Hauke Mehrtens <435ddd46dc66c007a1fa20144c823d37e0d23436@hauke-m.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/bcma\/scan.c\n+++ drivers\/bcma\/scan.c\n@@ -364,6 +364,7 @@\n void bcma_init_bus(struct bcma_bus *bus)\n {\n \ts32 tmp;\n+\tstruct bcma_chipinfo *chipinfo = &(bus->chipinfo);\n \n \tif (bus->init_done)\n \t\treturn;\n@@ -374,9 +375,12 @@\n \tbcma_scan_switch_core(bus, BCMA_ADDR_BASE);\n \n \ttmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);\n-\tbus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;\n-\tbus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;\n-\tbus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;\n+\tchipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;\n+\tchipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;\n+\tchipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;\n+\tpr_info(\"Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\\n\",\n+\t\tchipinfo->id, chipinfo->rev, chipinfo->pkg);\n+\n \tbus->init_done = true;\n }\n \n"} {"commit":"2c118b4c277406bbd380c9e4adfdcb4424160546","subject":"ASoC: arizona: Add DVFS handling for sample rate control","message":"ASoC: arizona: Add DVFS handling for sample rate control\n\nThe WM8997 and WM5102 codecs need to boost DVFS for higher sample rates.\n\nSigned-off-by: Richard Fitzgerald <22ee0097135072451429b5ac45630d52779cd49b@opensource.wolfsonmicro.com>\nSigned-off-by: Charles Keepax <8e4aa0015eb43ed5ca66aaca3fb498609e1e427c@opensource.wolfsonmicro.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"225e150a77611f2f6e6455c43553a4539d50e494","subject":"Fixed '@internal' usage in core_actions.c","message":"Fixed '@internal' usage in core_actions.c\n","repos":"ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- engine\/core_actions.c\n+++ engine\/core_actions.c\n@@ -52,8 +52,8 @@\n } setvar_data_t;\n \n \/**\n- * @internal\n * Create function for the log action.\n+ * @internal\n *\n * @param[in] ib IronBee engine (unused)\n * @param[in] ctx Current context.\n@@ -86,8 +86,8 @@\n }\n \n \/**\n- * @internal\n * Execute function for the \"log\" action\n+ * @internal\n *\n * @param[in] data C-style string to log\n * @param[in] rule The matched rule\n@@ -109,8 +109,8 @@\n }\n \n \/**\n- * @internal\n * Create function for the setflags action.\n+ * @internal\n *\n * @param[in] ib IronBee engine (unused)\n * @param[in] ctx Current context.\n@@ -143,8 +143,8 @@\n }\n \n \/**\n- * @internal\n * Execute function for the \"set flag\" action\n+ * @internal\n *\n * @param[in] data Name of the flag to set\n * @param[in] rule The matched rule\n@@ -175,6 +175,7 @@\n \n \/**\n * Event action execution callback.\n+ * @internal\n *\n * Create and event and log it.\n *\n@@ -227,8 +228,8 @@\n }\n \n \/**\n- * @internal\n * Create function for the setvar action.\n+ * @internal\n *\n * @param[in] ib IronBee engine (unused)\n * @param[in] ctx Current context.\n@@ -328,8 +329,8 @@\n }\n \n \/**\n- * @internal\n * Execute function for the \"set variable\" action\n+ * @internal\n *\n * @param[in] data Name of the flag to set\n * @param[in] rule The matched rule\n"} {"commit":"8b1159f5f79927e1046adc0f273dc3d7bd8febd1","subject":"adderd SD790is","message":"adderd SD790is\n\n","repos":"fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -1056,6 +1056,8 @@\n \n \t\/* Martin Lasarsch at SUSE. MTP_PROPLIST returns just 0 entries *\/\n \t{\"Canon:Digital IXUS 90 IS\",\t\t0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT},\n+\t\/* Daniel Moyne <daniel.moyne@free.fr> *\/\n+\t{\"Canon:Powershot SD790 IS\",\t\t0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT},\n \n \t\/* https:\/\/sourceforge.net\/tracker\/?func=detail&aid=2722422&group_id=8874&atid=358874 *\/\n \t{\"Canon:Digital IXUS 85 IS\",\t\t0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT},\n"} {"commit":"6d074107b8a6c7044d0dff95f52f848477643a9a","subject":"btshell: Add command to unpair oldest device","message":"btshell: Add command to unpair oldest device\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- apps\/btshell\/src\/cmd.c\n+++ apps\/btshell\/src\/cmd.c\n@@ -2691,12 +2691,25 @@\n {\n ble_addr_t peer;\n int rc;\n+ int oldest;\n \n rc = parse_arg_all(argc - 1, argv + 1);\n if (rc != 0) {\n return rc;\n }\n \n+ rc = parse_arg_bool_dflt(\"oldest\", 0, &oldest);\n+ if (rc != 0) {\n+ console_printf(\"invalid 'oldest' parameter\\n\");\n+ return rc;\n+ }\n+\n+ if (oldest) {\n+ rc = ble_gap_unpair_oldest_peer();\n+ console_printf(\"Unpair oldest status: 0x%02x\\n\", rc);\n+ return 0;\n+ }\n+\n rc = parse_dev_addr(\"peer_\", cmd_peer_addr_types, &peer);\n if (rc != 0) {\n console_printf(\"invalid 'peer_addr' parameter\\n\");\n@@ -2714,6 +2727,7 @@\n \n #if MYNEWT_VAL(SHELL_CMD_HELP)\n static const struct shell_param security_unpair_params[] = {\n+ {\"oldest\", \"usage: =[true|false], default: false\"},\n {\"peer_addr_type\", \"usage: =[public|random|public_id|random_id], default: public\"},\n {\"peer_addr\", \"usage: =[XX:XX:XX:XX:XX:XX]\"},\n {NULL, NULL}\n"} {"commit":"5250c9694fa879532470d87ebf6a485be1124221","subject":"cpsw: fix leaking IO mappings","message":"cpsw: fix leaking IO mappings\n\nThe CPSW driver remaps two different IO regions, but fails to unmap them\nboth. This patch fixes the issue by calling iounmap in the appropriate\nplaces.\n\nSigned-off-by: Richard Cochran <e27030aebe9cad8817d34b8c31dbaf301fb798b9@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/ti\/cpsw.c\n+++ drivers\/net\/ethernet\/ti\/cpsw.c\n@@ -1252,14 +1252,12 @@\n \t\tret = -ENOENT;\n \t\tgoto clean_clk_ret;\n \t}\n-\n \tif (!request_mem_region(priv->cpsw_res->start,\n \t\t\t\tresource_size(priv->cpsw_res), ndev->name)) {\n \t\tdev_err(priv->dev, \"failed request i\/o region\\n\");\n \t\tret = -ENXIO;\n \t\tgoto clean_clk_ret;\n \t}\n-\n \tregs = ioremap(priv->cpsw_res->start, resource_size(priv->cpsw_res));\n \tif (!regs) {\n \t\tdev_err(priv->dev, \"unable to map i\/o region\\n\");\n@@ -1274,16 +1272,14 @@\n \tif (!priv->cpsw_wr_res) {\n \t\tdev_err(priv->dev, \"error getting i\/o resource\\n\");\n \t\tret = -ENOENT;\n-\t\tgoto clean_clk_ret;\n-\t}\n-\n+\t\tgoto clean_iomap_ret;\n+\t}\n \tif (!request_mem_region(priv->cpsw_wr_res->start,\n \t\t\tresource_size(priv->cpsw_wr_res), ndev->name)) {\n \t\tdev_err(priv->dev, \"failed request i\/o region\\n\");\n \t\tret = -ENXIO;\n-\t\tgoto clean_clk_ret;\n-\t}\n-\n+\t\tgoto clean_iomap_ret;\n+\t}\n \tregs = ioremap(priv->cpsw_wr_res->start,\n \t\t\t\tresource_size(priv->cpsw_wr_res));\n \tif (!regs) {\n@@ -1326,7 +1322,7 @@\n \tif (!priv->dma) {\n \t\tdev_err(priv->dev, \"error initializing dma\\n\");\n \t\tret = -ENOMEM;\n-\t\tgoto clean_iomap_ret;\n+\t\tgoto clean_wr_iomap_ret;\n \t}\n \n \tpriv->txch = cpdma_chan_create(priv->dma, tx_chan_num(0),\n@@ -1407,11 +1403,13 @@\n \tcpdma_chan_destroy(priv->txch);\n \tcpdma_chan_destroy(priv->rxch);\n \tcpdma_ctlr_destroy(priv->dma);\n-clean_iomap_ret:\n-\tiounmap(priv->regs);\n+clean_wr_iomap_ret:\n+\tiounmap(priv->wr_regs);\n clean_cpsw_wr_iores_ret:\n \trelease_mem_region(priv->cpsw_wr_res->start,\n \t\t\t resource_size(priv->cpsw_wr_res));\n+clean_iomap_ret:\n+\tiounmap(priv->regs);\n clean_cpsw_iores_ret:\n \trelease_mem_region(priv->cpsw_res->start,\n \t\t\t resource_size(priv->cpsw_res));\n@@ -1442,6 +1440,7 @@\n \tiounmap(priv->regs);\n \trelease_mem_region(priv->cpsw_res->start,\n \t\t\t resource_size(priv->cpsw_res));\n+\tiounmap(priv->wr_regs);\n \trelease_mem_region(priv->cpsw_wr_res->start,\n \t\t\t resource_size(priv->cpsw_wr_res));\n \tpm_runtime_disable(&pdev->dev);\n"} {"commit":"8da4386c7f5b8402f41c739b42cc17500d6d9e8e","subject":"debug","message":"debug\n","repos":"huyanping\/simplefork-extension,huyanping\/simplefork-extension,huyanping\/simplefork-extension,huyanping\/simplefork-extension","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simplefork.c\n+++ simplefork.c\n@@ -168,7 +168,7 @@\n \tif (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), \"zz\", &runnable, &process_name)){\n \t\tRETURN_FALSE;\n \t}\n-\tif (!zend_is_callable(runnable, 0, NULL)) {\n+\tif (zend_is_callable(runnable, 0, NULL)) {\n zend_throw_exception(simplefork_exception_entry, \"execution param must be callable\", 0 TSRMLS_CC);\n }\n \n"} {"commit":"339094f87a9917b1b7f5e35a48f87267794bc75a","subject":"count and logging for tramp insertions","message":"count and logging for tramp insertions\n","repos":"ice799\/memprof,ice799\/memprof","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/elf.c\n+++ ext\/elf.c\n@@ -169,9 +169,13 @@\n unsigned char *byte = ruby_info->text_segment;\n trampee_addr = bin_find_symbol(trampee, NULL);\n size_t count = 0;\n+ int num = 0;\n \n for(; count < ruby_info->text_segment_len; byte++, count++) {\n- arch_insert_st1_tramp(byte, trampee_addr, tramp);\n+ if (arch_insert_st1_tramp(byte, trampee_addr, tramp)) {\n+ \/\/ printf(\"tramped %x\\n\", byte);\n+ num++;\n+ }\n }\n } else {\n trampee_addr = find_got_addr(trampee, NULL);\n"} {"commit":"d949402cb382cc652cac4f70111fd1c8bcb00988","subject":"Handle & erase connection: {close,keep-alive} at library level","message":"Handle & erase connection: {close,keep-alive} at library level\n","repos":"pyos\/libcno,pyos\/libcno","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cno\/core.c\n+++ cno\/core.c\n@@ -943,7 +943,7 @@\n return CNO_ERROR_UP();\n }\n \n- struct cno_header_t headers[CNO_MAX_HEADERS + 3]; \/\/ + :scheme and :authority and maybe connection\n+ struct cno_header_t headers[CNO_MAX_HEADERS + 2]; \/\/ + :scheme and :authority\n struct cno_message_t m = { 0, {}, {}, headers, CNO_MAX_HEADERS };\n struct phr_header headers_phr[CNO_MAX_HEADERS];\n \n@@ -965,6 +965,7 @@\n \/\/ HTTP\/1.0 is probably not really supported either tbh.\n return CNO_ERROR(PROTOCOL, \"HTTP\/1.%d not supported\", minor);\n \n+ int finalRequest = (minor == 0);\n int upgrade = 0;\n int upgradeToH2 = 0;\n int closeDelimited = c->client && !cno_is_informational(m.code);\n@@ -973,9 +974,6 @@\n *it++ = (struct cno_header_t) { CNO_BUFFER_STRING(\":scheme\"), CNO_BUFFER_STRING(\"unknown\"), 0 };\n *it++ = (struct cno_header_t) { CNO_BUFFER_STRING(\":authority\"), CNO_BUFFER_STRING(\"unknown\"), 0 };\n }\n- if (minor == 0)\n- \/\/ HTTP\/1.0 clients *can* specify `connection: keep-alive`, but screw that.\n- *it++ = (struct cno_header_t) { CNO_BUFFER_STRING(\"connection\"), CNO_BUFFER_STRING(\"close\"), 0 };\n for (size_t i = 0; i < m.headers_len; i++) {\n if (!headers_phr[i].name)\n return CNO_ERROR(PROTOCOL, \"HTTP\/1.x line folding rejected\");\n@@ -1021,10 +1019,24 @@\n closeDelimited = 0;\n if (!cno_remove_chunked_te(&it->value))\n continue;\n+ } else if (cno_buffer_eq(it->name, CNO_BUFFER_STRING(\"connection\"))) {\n+ \/\/ XXX actually supposed to be a comma-separated list; does anyone\n+ \/\/ use anything other than \"close\", \"keep-alive\", and \"upgrade\"?\n+ if (cno_buffer_eq(it->value, CNO_BUFFER_STRING(\"close\"))) {\n+ finalRequest = 1;\n+ continue;\n+ } else if (cno_buffer_eq(it->value, CNO_BUFFER_STRING(\"keep-alive\"))) {\n+ finalRequest = 0;\n+ continue;\n+ }\n }\n it++;\n }\n m.headers_len = it - m.headers;\n+\n+ if (finalRequest && c->goaway[CNO_REMOTE] > c->last_stream[CNO_REMOTE])\n+ \/\/ Call `on_close` when this stream terminates.\n+ c->goaway[CNO_REMOTE] = c->last_stream[CNO_REMOTE];\n \n if (c->client) {\n if (s->remaining_payload && cno_is_informational(m.code))\n"} {"commit":"8836b995fd192dba23d312d2a4fba68dd8ca7183","subject":"rbd: simplify snap_by_name() interface","message":"rbd: simplify snap_by_name() interface\n\nThere is only one caller of snap_by_name(), and it passes two values\nto be assigned, both of which are found within an rbd device\nstructure.\n\nChange the interface so it just passes the address of the rbd_dev,\nand make the assignments to its fields directly.\n\nSigned-off-by: Alex Elder <f429030cf5c0faf36fac3d102073b6e63a647baa@inktank.com>\nReviewed-by: Josh Durgin <51652c783f70f5b272ebd02f1fd20d3af7a2449f@inktank.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/block\/rbd.c\n+++ drivers\/block\/rbd.c\n@@ -621,10 +621,10 @@\n \treturn -ENOMEM;\n }\n \n-static int snap_by_name(struct rbd_image_header *header, const char *snap_name,\n-\t\t\tu64 *seq, u64 *size)\n+static int snap_by_name(struct rbd_device *rbd_dev, const char *snap_name)\n {\n \tint i;\n+\tstruct rbd_image_header *header = &rbd_dev->header;\n \tchar *p = header->snap_names;\n \n \trbd_assert(header->snapc != NULL);\n@@ -633,10 +633,9 @@\n \n \t\t\t\/* Found it. Pass back its id and\/or size *\/\n \n-\t\t\tif (seq)\n-\t\t\t\t*seq = header->snapc->snaps[i];\n-\t\t\tif (size)\n-\t\t\t\t*size = header->snap_sizes[i];\n+\t\t\trbd_dev->mapping.snap_id = header->snapc->snaps[i];\n+\t\t\trbd_dev->mapping.size = header->snap_sizes[i];\n+\n \t\t\treturn i;\n \t\t}\n \t\tp += strlen(p) + 1;\t\/* Skip ahead to the next name *\/\n@@ -657,9 +656,7 @@\n \t\trbd_dev->mapping.snap_exists = false;\n \t\trbd_dev->mapping.read_only = rbd_dev->rbd_opts.read_only;\n \t} else {\n-\t\tret = snap_by_name(&rbd_dev->header, snap_name,\n-\t\t\t\t\t&rbd_dev->mapping.snap_id,\n-\t\t\t\t\t&rbd_dev->mapping.size);\n+\t\tret = snap_by_name(rbd_dev, snap_name);\n \t\tif (ret < 0)\n \t\t\tgoto done;\n \t\trbd_dev->mapping.snap_exists = true;\n"} {"commit":"36bc38a7c1c6869a71739c4f9bf1c16e8168ae88","subject":"ASoC: mc13783: Replace usage deprecated MUX\/ENUM macros","message":"ASoC: mc13783: Replace usage deprecated MUX\/ENUM macros\n\nSND_SOC_DAPM_VIRT_MUX and SOC_DAPM_ENUM_VIRT are deprecated and merely an alias\nfor SND_SOC_DAPM_MUX and SOC_DAPM_ENUM. Replace the deprecated macros so we can\neventually remove their definition.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"024d2c07330fe6ba63eb7cfd2d36a23528b5b10e","subject":"(Attribute::getAttr) : New.","message":"(Attribute::getAttr) : New.","repos":"google-code-export\/es-operating-system,berkus\/es-operating-system,vovd\/es-operating-system,quarzoliquido\/es-operating-system,tectronics\/es-operating-system,berkus\/es-operating-system,vovd\/es-operating-system,LambdaLord\/es-operating-system,berkus\/es-operating-system,quarzoliquido\/es-operating-system,berkus\/es-operating-system,tectronics\/es-operating-system,ericmckean\/es-operating-system,google-code-export\/es-operating-system,miiza\/es-operating-system,miiza\/es-operating-system,quarzoliquido\/es-operating-system,vovd\/es-operating-system,josejamilena\/es-operating-system,josejamilena\/es-operating-system,LambdaLord\/es-operating-system,josejamilena\/es-operating-system,vovd\/es-operating-system,tectronics\/es-operating-system,google-code-export\/es-operating-system,vovd\/es-operating-system,LambdaLord\/es-operating-system,ericmckean\/es-operating-system,LambdaLord\/es-operating-system,ericmckean\/es-operating-system,quarzoliquido\/es-operating-system,LambdaLord\/es-operating-system,quarzoliquido\/es-operating-system,quarzoliquido\/es-operating-system,ericmckean\/es-operating-system,google-code-export\/es-operating-system,miiza\/es-operating-system,google-code-export\/es-operating-system,berkus\/es-operating-system,LambdaLord\/es-operating-system,tectronics\/es-operating-system,miiza\/es-operating-system,berkus\/es-operating-system,berkus\/es-operating-system,miiza\/es-operating-system,google-code-export\/es-operating-system,ericmckean\/es-operating-system,miiza\/es-operating-system,ericmckean\/es-operating-system,quarzoliquido\/es-operating-system,LambdaLord\/es-operating-system,google-code-export\/es-operating-system,vovd\/es-operating-system,tectronics\/es-operating-system,miiza\/es-operating-system,ericmckean\/es-operating-system,josejamilena\/es-operating-system,tectronics\/es-operating-system,josejamilena\/es-operating-system,vovd\/es-operating-system,tectronics\/es-operating-system,josejamilena\/es-operating-system,josejamilena\/es-operating-system","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- esidl\/include\/esidl.h\n+++ esidl\/include\/esidl.h\n@@ -1163,6 +1163,11 @@\n \n virtual void setExtendedAttributes(NodeList* list);\n \n+ u32 getAttr() const\n+ {\n+ return attr;\n+ }\n+\n bool isReplaceable() const\n {\n return attr & Replaceable;\n"} {"commit":"e80e887a959ca41066412582c5f79aae5ffd5821","subject":"ixgbe: add define to support 82599 64 IVAR registers","message":"ixgbe: add define to support 82599 64 IVAR registers\n\n82599 supports 64 IVAR registers this patch adds a define to\nallow us to access them.\n\nSigned-off-by: Don Skidmore <db552506339f77ba9019f0c6d9084f81cf1d1757@intel.com>\nAcked-by: Peter P Waskiewicz Jr <019ca817bcedb2fce0c539efa1b71c24f7a6c1c1@intel.com>\nSigned-off-by: Jeff Kirsher <87e35f5be20bb3e67f4ba6b86f5f6be3085b1b3a@intel.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ixgbe\/ixgbe_type.h\n+++ drivers\/net\/ixgbe\/ixgbe_type.h\n@@ -1150,6 +1150,7 @@\n \n \/* Interrupt Vector Allocation Registers *\/\n #define IXGBE_IVAR_REG_NUM 25\n+#define IXGBE_IVAR_REG_NUM_82599 64\n #define IXGBE_IVAR_TXRX_ENTRY 96\n #define IXGBE_IVAR_RX_ENTRY 64\n #define IXGBE_IVAR_RX_QUEUE(_i) (0 + (_i))\n"} {"commit":"f49ef3771a476be2e46f6293b0b27daa0413235d","subject":"add source to github","message":"add source to github\n","repos":"huyanping\/simplefork-extension,huyanping\/simplefork-extension,huyanping\/simplefork-extension,huyanping\/simplefork-extension","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simplefork.c\n+++ simplefork.c\n@@ -119,17 +119,17 @@\n \n \n \/* SimpleFork\\Process *\/\n-\/\/zend_class_entry *process_class_entry = NULL;\n+zend_class_entry *process_class_entry = NULL;\n \/\/\n \/\/ZEND_BEGIN_ARG_INFO(construct_arg_info, 0)\n \/\/ ZEND_ARG_INFO(0, execution)\n \/\/ZEND_END_ARG_INFO()\n \n-\/\/static zend_function_entry process_class_methods[]={\n+static zend_function_entry process_class_methods[]={\n \/\/\tZEND_ME(Process, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)\n \/\/\tZEND_ME(Process, start, NULL, ZEND_ACC_PUBLIC)\n-\/\/\t{NULL,NULL,NULL}\n-\/\/};\n+\t{NULL,NULL,NULL}\n+};\n \n \n \n@@ -211,19 +211,19 @@\n INIT_NS_CLASS_ENTRY(runnable_interface, \"SimpleFork\", \"Runnable\", runnable_interface_methods);\n runnable_interface_entry = zend_register_internal_interface(&runnable_interface TSRMLS_CC);\n \/\/\n-\/\/ zend_class_entry process_class;\n-\/\/ INIT_NS_CLASS_ENTRY(process_class, \"SimpleFork\", \"Process\", process_class_methods);\n-\/\/ process_class_entry = zend_register_internal_class(&process_class TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"queue\", strlen(\"queue\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"cache\", strlen(\"cache\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"runnable\", strlen(\"runnable\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"execution\", strlen(\"execution\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"pid\", strlen(\"pid\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"alive\", strlen(\"alive\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"status\", strlen(\"status\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_property_null(process_class_entry, \"callbacks\", strlen(\"callbacks\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n-\/\/ zend_declare_class_constant_string(process_class_entry, \"BEFORE_START\", strlen(\"BEFORE_START\"), CONST_CS | CONST_PERSISTENT);\n-\/\/ zend_declare_class_constant_string(process_class_entry, \"BEFORE_EXIT\", strlen(\"BEFORE_EXIT\"), CONST_CS | CONST_PERSISTENT);\n+ zend_class_entry process_class;\n+ INIT_NS_CLASS_ENTRY(process_class, \"SimpleFork\", \"Process\", process_class_methods);\n+ process_class_entry = zend_register_internal_class(&process_class TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"queue\", strlen(\"queue\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"cache\", strlen(\"cache\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"runnable\", strlen(\"runnable\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"execution\", strlen(\"execution\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"pid\", strlen(\"pid\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"alive\", strlen(\"alive\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"status\", strlen(\"status\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_property_null(process_class_entry, \"callbacks\", strlen(\"callbacks\"), ZEND_ACC_PROTECTED TSRMLS_CC);\n+ zend_declare_class_constant_string(process_class_entry, \"BEFORE_START\", strlen(\"BEFORE_START\"), CONST_CS | CONST_PERSISTENT);\n+ zend_declare_class_constant_string(process_class_entry, \"BEFORE_EXIT\", strlen(\"BEFORE_EXIT\"), CONST_CS | CONST_PERSISTENT);\n \n \treturn SUCCESS;\n }\n"} {"commit":"e17dd03b88dde99021bf52d940d931e4bd70b751","subject":"function to DEinterleave data","message":"function to DEinterleave data\n\nneeded if we are reading multichannel files (which bring their data intereaved)\n","repos":"kronihias\/libambix,umlaeute\/ambix,iem-projects\/ambix,iem-projects\/ambix,kronihias\/libambix,umlaeute\/ambix,umlaeute\/ambix,iem-projects\/ambix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- utils\/ambix-interleave.c\n+++ utils\/ambix-interleave.c\n@@ -466,7 +466,18 @@\n return ai;\n }\n \n-\n+\/* deinterleave an *interleaved* source of <frames>*<channels> data in dest *\/\n+static void deinterleaver(float*dest, const float*source, uint64_t frames, uint32_t channels) {\n+ uint32_t channel;\n+ for(channel=0; channel<channels; channel++) {\n+ uint64_t frame;\n+ for(frame=0; frame<frames; frame++) {\n+ *dest++ = source[frame*channels+channel];\n+ }\n+ }\n+}\n+\n+\/* interleave a *non-interleaved* source of <frames>*<channels> data in dest *\/\n static void interleaver(float*dest, const float*source, uint64_t frames, uint32_t channels) {\n uint64_t frame;\n \n"} {"commit":"a298ccb8610baeb13b62184c7f6607554e397285","subject":"Handle ignore nodes as operands of Phis (Unknowns for example)","message":"Handle ignore nodes as operands of Phis (Unknowns for example)\n\n[r15495]\n","repos":"killbug2004\/libfirm,davidgiven\/libfirm,8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillbelady2.c\n+++ ir\/be\/bespillbelady2.c\n@@ -823,6 +823,7 @@\n \n static double can_bring_in(global_end_state_t *ges, ir_node *bl, ir_node *irn, double limit, int level)\n {\n+\tbelady_env_t *env = ges->env;\n \tdouble glob_costs = HUGE_VAL;\n \n \tDBG((dbg, DBG_GLOBAL, \"\\t%2Dcan bring in for %+F at block %+F\\n\", level, irn, bl));\n@@ -837,7 +838,16 @@\n \t\tfor (i = 0; i < n; ++i) {\n \t\t\tir_node *pr = get_Block_cfgpred_block(bl, i);\n \t\t\tir_node *op = is_local_phi(bl, irn) ? get_irn_n(irn, i) : irn;\n-\t\t\tdouble c = can_make_available_at_end(ges, pr, op, limit, level + 1);\n+\t\t\tdouble c;\n+\n+\t\t\t\/*\n+\t\t\t * there might by unknwons as operands of phis in that case\n+\t\t\t * we set the costs to zero, since they won't get spilled.\n+\t\t\t *\/\n+\t\t\tif (arch_irn_consider_in_reg_alloc(env->arch, env->cls, op))\n+\t\t\t\tc = can_make_available_at_end(ges, pr, op, limit, level + 1);\n+\t\t\telse\n+\t\t\t\tc = 0.0;\n \n \t\t\tglob_costs += c;\n \n"} {"commit":"2d0f2d44acbb60e5d2a3fd4f90c835d74f6bb674","subject":"pkt-gen: print total stats on pinger exit","message":"pkt-gen: print total stats on pinger exit\n","repos":"luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- apps\/pkt-gen\/pkt-gen.c\n+++ apps\/pkt-gen\/pkt-gen.c\n@@ -1213,6 +1213,7 @@\n \tstruct timespec nexttime = { 0, 0}; \/\/ XXX silence compiler\n \tuint64_t sent = 0, n = targ->g->npackets;\n \tuint64_t count = 0, t_cur, t_min = ~0, av = 0;\n+\tuint64_t g_min = ~0, g_av = 0;\n \tuint64_t buckets[64];\t\/* bins for delays, ns *\/\n \tint rate_limit = targ->g->tx_rate, tosend = 0;\n \n@@ -1347,11 +1348,17 @@\n \t\t\tD(\"k: %d .. %d\\n\\t%s\", 1<<kmin, 1<<k, buf);\n \t\t\tbzero(&buckets, sizeof(buckets));\n \t\t\tcount = 0;\n+\t\t\tg_av += av;\n \t\t\tav = 0;\n+\t\t\tif (t_min < g_min)\n+\t\t\t\tg_min = t_min;\n \t\t\tt_min = ~0;\n \t\t\tlast_print = now;\n \t\t}\n \t}\n+\n+\tif (sent > 0)\n+\t\tD(\"RTT over %\"PRIu64\" packets: min %d av %d ns\", sent, (int)g_min, (int)((double)g_av\/sent));\n \n \t\/* reset the ``used`` flag. *\/\n \ttarg->used = 0;\n"} {"commit":"6d69bb536bac0d403d83db1ca841444981b280cd","subject":"rbd: prevent kernel stack blow up on rbd map","message":"rbd: prevent kernel stack blow up on rbd map\n\nMapping an image with a long parent chain (e.g. image foo, whose parent\nis bar, whose parent is baz, etc) currently leads to a kernel stack\noverflow, due to the following recursion in the reply path:\n\n rbd_osd_req_callback()\n rbd_obj_request_complete()\n rbd_img_obj_callback()\n rbd_img_parent_read_callback()\n rbd_obj_request_complete()\n ...\n\nLimit the parent chain to 16 images, which is ~5K worth of stack. When\nthe above recursion is eliminated, this limit can be lifted.\n\nFixes: http:\/\/tracker.ceph.com\/issues\/12538\n\nCc: stable@vger.kernel.org # 3.10+, needs backporting for < 4.2\nSigned-off-by: Ilya Dryomov <152d4c5bebf13a5b809d42b4d789cf9d887e6698@gmail.com>\nReviewed-by: Josh Durgin <1442af5e32b56bc0fa9c40ad9e4d67aeb05f1e26@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/rbd.c\n+++ drivers\/block\/rbd.c\n@@ -95,6 +95,8 @@\n \n #define RBD_MINORS_PER_MAJOR\t\t256\n #define RBD_SINGLE_MAJOR_PART_SHIFT\t4\n+\n+#define RBD_MAX_PARENT_CHAIN_LEN\t16\n \n #define RBD_SNAP_DEV_NAME_PREFIX\t\"snap_\"\n #define RBD_MAX_SNAP_NAME_LEN\t\\\n@@ -426,7 +428,7 @@\n \t\t\t\t size_t count);\n static ssize_t rbd_remove_single_major(struct bus_type *bus, const char *buf,\n \t\t\t\t size_t count);\n-static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);\n+static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth);\n static void rbd_spec_put(struct rbd_spec *spec);\n \n static int rbd_dev_id_to_minor(int dev_id)\n@@ -5131,13 +5133,24 @@\n \treturn ret;\n }\n \n-static int rbd_dev_probe_parent(struct rbd_device *rbd_dev)\n+\/*\n+ * @depth is rbd_dev_image_probe() -> rbd_dev_probe_parent() ->\n+ * rbd_dev_image_probe() recursion depth, which means it's also the\n+ * length of the already discovered part of the parent chain.\n+ *\/\n+static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth)\n {\n \tstruct rbd_device *parent = NULL;\n \tint ret;\n \n \tif (!rbd_dev->parent_spec)\n \t\treturn 0;\n+\n+\tif (++depth > RBD_MAX_PARENT_CHAIN_LEN) {\n+\t\tpr_info(\"parent chain is too long (%d)\\n\", depth);\n+\t\tret = -EINVAL;\n+\t\tgoto out_err;\n+\t}\n \n \tparent = rbd_dev_create(rbd_dev->rbd_client, rbd_dev->parent_spec,\n \t\t\t\tNULL);\n@@ -5153,7 +5166,7 @@\n \t__rbd_get_client(rbd_dev->rbd_client);\n \trbd_spec_get(rbd_dev->parent_spec);\n \n-\tret = rbd_dev_image_probe(parent, false);\n+\tret = rbd_dev_image_probe(parent, depth);\n \tif (ret < 0)\n \t\tgoto out_err;\n \n@@ -5282,7 +5295,7 @@\n * parent), initiate a watch on its header object before using that\n * object to get detailed information about the rbd image.\n *\/\n-static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping)\n+static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth)\n {\n \tint ret;\n \n@@ -5300,7 +5313,7 @@\n \tif (ret)\n \t\tgoto err_out_format;\n \n-\tif (mapping) {\n+\tif (!depth) {\n \t\tret = rbd_dev_header_watch_sync(rbd_dev);\n \t\tif (ret) {\n \t\t\tif (ret == -ENOENT)\n@@ -5321,7 +5334,7 @@\n \t * Otherwise this is a parent image, identified by pool, image\n \t * and snap ids - need to fill in names for those ids.\n \t *\/\n-\tif (mapping)\n+\tif (!depth)\n \t\tret = rbd_spec_fill_snap_id(rbd_dev);\n \telse\n \t\tret = rbd_spec_fill_names(rbd_dev);\n@@ -5343,12 +5356,12 @@\n \t\t * Need to warn users if this image is the one being\n \t\t * mapped and has a parent.\n \t\t *\/\n-\t\tif (mapping && rbd_dev->parent_spec)\n+\t\tif (!depth && rbd_dev->parent_spec)\n \t\t\trbd_warn(rbd_dev,\n \t\t\t\t \"WARNING: kernel layering is EXPERIMENTAL!\");\n \t}\n \n-\tret = rbd_dev_probe_parent(rbd_dev);\n+\tret = rbd_dev_probe_parent(rbd_dev, depth);\n \tif (ret)\n \t\tgoto err_out_probe;\n \n@@ -5359,7 +5372,7 @@\n err_out_probe:\n \trbd_dev_unprobe(rbd_dev);\n err_out_watch:\n-\tif (mapping)\n+\tif (!depth)\n \t\trbd_dev_header_unwatch_sync(rbd_dev);\n out_header_name:\n \tkfree(rbd_dev->header_name);\n@@ -5422,7 +5435,7 @@\n \tspec = NULL;\t\t\/* rbd_dev now owns this *\/\n \trbd_opts = NULL;\t\/* rbd_dev now owns this *\/\n \n-\trc = rbd_dev_image_probe(rbd_dev, true);\n+\trc = rbd_dev_image_probe(rbd_dev, 0);\n \tif (rc < 0)\n \t\tgoto err_out_rbd_dev;\n \n"} {"commit":"8f5fff7386ef1e92391971ef7a6a1c7981a1461e","subject":"First version of usable editor!","message":"First version of usable editor!\n","repos":"seclorum\/load81,antirez\/load81,saisai\/load81,seclorum\/load81,antirez\/load81,antirez\/load81,seclorum\/load81,saisai\/load81,saisai\/load81,seclorum\/load81,saisai\/load81,antirez\/load81,seclorum\/load81,saisai\/load81,antirez\/load81","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- codakido.c\n+++ codakido.c\n@@ -31,6 +31,7 @@\n #include <lauxlib.h>\n #include <lualib.h>\n #include <errno.h>\n+#include <ctype.h>\n \n #define NOTUSED(V) ((void) V)\n \n@@ -80,6 +81,11 @@\n char *chars;\n } erow;\n \n+typedef struct keyState {\n+ char translation;\n+ int counter;\n+} keyState;\n+\n #define KEY_MAX 512 \/* Latest key is excluded *\/\n struct editorConfig {\n int cx,cy; \/* Cursor x and y position in characters *\/\n@@ -92,7 +98,7 @@\n int numrows; \/* Number of rows *\/\n erow *row; \/* Rows *\/\n time_t lastevent; \/* Last event time, so we can go standby *\/\n- int key[KEY_MAX]; \/* Remember if a key is pressed \/ repeated. *\/\n+ keyState key[KEY_MAX]; \/* Remember if a key is pressed \/ repeated. *\/\n } E;\n \n \/* ============================= Frame buffer ============================== *\/\n@@ -121,6 +127,10 @@\n fprintf(stderr, \"Can't set the video mode: %s\\n\", SDL_GetError());\n return NULL;\n }\n+ \/* Unicode support makes dealing with text input in SDL much simpler as\n+ * keys are translated into characters with automatic support for modifiers\n+ * (for instance shift modifier to print capital letters and symbols). *\/\n+ SDL_EnableUNICODE(SDL_ENABLE);\n return screen;\n }\n \n@@ -535,7 +545,172 @@\n return 0;\n }\n \n-\/* ================================= Editor ================================= *\/\n+\/* ======================= Editor rows implementation ======================= *\/\n+\n+\/* Insert a row at the specified position, shifting the other rows on the bottom\n+ * if required. *\/\n+void editorInsertRow(int at, char *s) {\n+ if (at > E.numrows) return;\n+ E.row = realloc(E.row,sizeof(erow)*(E.numrows+1));\n+ if (at != E.numrows)\n+ memmove(E.row+at+1,E.row+at,sizeof(E.row[0])*(E.numrows-at));\n+ E.row[at].size = strlen(s);\n+ E.row[at].chars = strdup(s);\n+ E.numrows++;\n+}\n+\n+\/* Remove the row at the specified position, shifting the remainign on the\n+ * top. *\/\n+void editorDelRow(int at) {\n+ if (at >= E.numrows) return;\n+ memmove(E.row+at,E.row+at+1,sizeof(E.row[0])*(E.numrows-at-1));\n+ E.numrows--;\n+}\n+\n+\/* Turn the editor rows into a single heap-allocated string.\n+ * Returns the pointer to the heap-allocated string and populate the\n+ * integer pointed by 'buflen' with the size of the string, escluding\n+ * the final nulterm. *\/\n+char *editorRowsToString(int *buflen) {\n+ char *buf = NULL, *p;\n+ int totlen = 0;\n+ int j;\n+\n+ \/* Compute count of bytes *\/\n+ for (j = 0; j < E.numrows; j++)\n+ totlen += E.row[j].size+1; \/* +1 is for \"\\n\" at end of every row *\/\n+ *buflen = totlen;\n+ totlen++; \/* Also make space for nulterm *\/\n+\n+ p = buf = malloc(totlen);\n+ for (j = 0; j < E.numrows; j++) {\n+ memcpy(p,E.row[j].chars,E.row[j].size);\n+ p += E.row[j].size;\n+ *p = '\\n';\n+ p++;\n+ }\n+ *p = '\\0';\n+ return buf;\n+}\n+\n+\/* Insert a character at the specified position in a row, moving the remaining\n+ * chars on the right if needed. *\/\n+void editorRowInsertChar(erow *row, int at, int c) {\n+ if (at > row->size) {\n+ \/* Pad the string with spaces if the insert location is outside the\n+ * current length by more than a single character. *\/\n+ int padlen = at-row->size;\n+ \/* In the next line +2 means: new char and null term. *\/\n+ row->chars = realloc(row->chars,row->size+padlen+2);\n+ memset(row->chars+row->size,' ',padlen);\n+ row->chars[row->size+padlen+1] = '\\0';\n+ row->size += padlen+1;\n+ } else {\n+ \/* If we are in the middle of the string just make space for 1 new\n+ * char plus the (already existing) null term. *\/\n+ row->chars = realloc(row->chars,row->size+2);\n+ memmove(row->chars+at+1,row->chars+at,row->size-at);\n+ row->size++;\n+ }\n+ row->chars[at] = c;\n+}\n+\n+\/* Append the string 's' at the end of a row *\/\n+void editorRowAppendString(erow *row, char *s) {\n+ int l = strlen(s);\n+\n+ row->chars = realloc(row->chars,row->size+l+1);\n+ memcpy(row->chars+row->size,s,l);\n+ row->size += l;\n+ row->chars[row->size] = '\\0';\n+}\n+\n+void editorRowDelChar(erow *row, int at) {\n+ if (row->size <= at) return;\n+ memmove(row->chars+at,row->chars+at+1,row->size-at);\n+ row->size--;\n+}\n+\n+void editorInsertChar(int c) {\n+ int filerow = E.rowoff+E.cy;\n+ int filecol = E.coloff+E.cx;\n+ erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];\n+\n+ \/* If the row where the cursor is currently located does not exist in our\n+ * logical representaion of the file, add enough empty rows as needed. *\/\n+ if (!row) {\n+ while(E.numrows <= filerow)\n+ editorInsertRow(E.numrows,\"\");\n+ }\n+ row = &E.row[filerow];\n+ editorRowInsertChar(row,filecol,c);\n+ if (E.cx == E.screencols-1)\n+ E.coloff++;\n+ else\n+ E.cx++;\n+}\n+\n+\/* Inserting a newline is slightly complex as we have to handle inserting a\n+ * newline in the middle of a line, splitting the line as needed. *\/\n+void editorInsertNewline(void) {\n+ int filerow = E.rowoff+E.cy;\n+ int filecol = E.coloff+E.cx;\n+ erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];\n+\n+ if (!row) return;\n+ \/* If the cursor is over the current line size, we want to conceptually\n+ * think it's just over the last character. *\/\n+ if (filecol >= row->size) filecol = row->size;\n+ if (filecol == 0) {\n+ editorInsertRow(filerow,\"\");\n+ } else {\n+ \/* We are in the middle of a line. Split it between two rows. *\/\n+ editorInsertRow(filerow+1,row->chars+filecol);\n+ row = &E.row[filerow];\n+ row->chars[filecol] = '\\0';\n+ row->size = filecol;\n+ }\n+ if (E.cy == E.screenrows-1) {\n+ E.rowoff++;\n+ } else {\n+ E.cy++;\n+ }\n+ E.cx = 0;\n+ E.coloff = 0;\n+}\n+\n+void editorDelChar() {\n+ int filerow = E.rowoff+E.cy;\n+ int filecol = E.coloff+E.cx;\n+ erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];\n+\n+ if (!row || (filecol == 0 && filerow == 0)) return;\n+ if (filecol == 0) {\n+ \/* Handle the case of column 0, we need to move the current line\n+ * on the right of the previous one. *\/\n+ filecol = E.row[filerow-1].size;\n+ editorRowAppendString(&E.row[filerow-1],row->chars);\n+ editorDelRow(filerow);\n+ if (E.cy == 0)\n+ E.rowoff--;\n+ else\n+ E.cy--;\n+ E.cx = filecol;\n+ if (E.cx >= E.screencols) {\n+ int shift = (E.screencols-E.cx)+1;\n+ E.cx -= shift;\n+ E.coloff += shift;\n+ }\n+ } else {\n+ editorRowDelChar(row,filecol-1);\n+ if (E.cx == 0 && E.coloff)\n+ E.coloff--;\n+ else\n+ E.cx--;\n+ }\n+}\n+\n+\/* ============================= Editor drawing ============================= *\/\n \n void editorDrawCursor(void) {\n int x = E.cx*FONT_KERNING;\n@@ -594,38 +769,7 @@\n strlen(ck.filename), 255,255,255,1);\n }\n \n-void editorInsertRow(int at, char *s) {\n- E.row = realloc(E.row,sizeof(erow)*(E.numrows+1));\n- E.row[E.numrows].size = strlen(s);\n- E.row[E.numrows].chars = strdup(s);\n- E.numrows++;\n-}\n-\n-\/* Turn the editor rows into a single heap-allocated string.\n- * Returns the pointer to the heap-allocated string and populate the\n- * integer pointed by 'buflen' with the size of the string, escluding\n- * the final nulterm. *\/\n-char *editorRowsToString(int *buflen) {\n- char *buf = NULL, *p;\n- int totlen = 0;\n- int j;\n-\n- \/* Compute count of bytes *\/\n- for (j = 0; j < E.numrows; j++)\n- totlen += E.row[j].size+1; \/* +1 is for \"\\n\" at end of every row *\/\n- *buflen = totlen;\n- totlen++; \/* Also make space for nulterm *\/\n-\n- p = buf = malloc(totlen);\n- for (j = 0; j < E.numrows; j++) {\n- memcpy(p,E.row[j].chars,E.row[j].size);\n- p += E.row[j].size;\n- *p = '\\n';\n- p++;\n- }\n- *p = '\\0';\n- return buf;\n-}\n+\/* ========================= Editor events handling ======================== *\/\n \n \/* As long as a key is pressed, we incremnet a counter in order to\n * implement first pression of key and key repeating.\n@@ -693,53 +837,6 @@\n }\n break;\n }\n- E.cblink = 0;\n-}\n-\n-void editorRowInsertChar(erow *row, int at, int c) {\n- \/* Make space for 1 new char, 1 null term. *\/\n- row->chars = realloc(row->chars,row->size+2);\n- memmove(row->chars+at+1,row->chars+at,row->size-at);\n- row->chars[at] = c;\n- row->size++;\n-}\n-\n-void editorRowDelChar(erow *row, int at) {\n- if (row->size <= at) return;\n- memmove(row->chars+at,row->chars+at+1,row->size-at-1);\n- row->size--;\n-}\n-\n-void editorInsertChar(int c) {\n- int filerow = E.rowoff+E.cy;\n- int filecol = E.coloff+E.cx;\n- erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];\n-\n- if (!row) {\n- while(E.numrows < filerow)\n- editorInsertRow(E.numrows,\"\");\n- row = &E.row[filerow];\n- }\n- editorRowInsertChar(row,filecol,c);\n- if (E.cx == E.screencols-1)\n- E.coloff++;\n- else\n- E.cx++;\n- E.lastevent = time(NULL);\n-}\n-\n-void editorDelChar() {\n- int filerow = E.rowoff+E.cy;\n- int filecol = E.coloff+E.cx;\n- erow *row = (filerow >= E.numrows) ? NULL : &E.row[filerow];\n-\n- if (!row || filecol == 0) return;\n- editorRowDelChar(row,filecol-1);\n- if (E.cx == 0 && E.coloff)\n- E.coloff--;\n- else\n- E.cx--;\n- E.lastevent = time(NULL);\n }\n \n int editorEvents(void) {\n@@ -767,7 +864,10 @@\n return 1;\n break;\n default:\n- if (ksym >= 0 && ksym < KEY_MAX) E.key[ksym] = 1;\n+ if (ksym >= 0 && ksym < KEY_MAX) {\n+ E.key[ksym].counter = 1;\n+ E.key[ksym].translation = (event.key.keysym.unicode & 0xff);\n+ }\n break;\n }\n break;\n@@ -775,7 +875,7 @@\n \/* Key released *\/\n case SDL_KEYUP:\n ksym = event.key.keysym.sym;\n- if (ksym >= 0 && ksym < KEY_MAX) E.key[ksym] = 0;\n+ if (ksym >= 0 && ksym < KEY_MAX) E.key[ksym].counter = 0;\n break;\n \/* Mouse click *\/\n case SDL_MOUSEBUTTONDOWN:\n@@ -787,8 +887,11 @@\n \n \/* Convert events into actions *\/\n for (j = 0; j < KEY_MAX; j++) {\n- if (pressed_or_repeated(E.key[j])) {\n+ int i;\n+\n+ if (pressed_or_repeated(E.key[j].counter)) {\n E.lastevent = time(NULL);\n+ E.cblink = 0;\n switch(j) {\n case SDLK_LEFT:\n case SDLK_RIGHT:\n@@ -799,12 +902,24 @@\n case SDLK_BACKSPACE:\n editorDelChar();\n break;\n+ case SDLK_RETURN:\n+ editorInsertNewline();\n+ break;\n+ case SDLK_HOME:\n+ case SDLK_LSHIFT:\n+ case SDLK_RSHIFT:\n+ \/* Ignored *\/\n+ break;\n+ case SDLK_TAB:\n+ for (i = 0; i < 4; i++)\n+ editorInsertChar(' ');\n+ break;\n default:\n- editorInsertChar(j);\n+ editorInsertChar(E.key[j].translation);\n break;\n }\n }\n- if (E.key[j]) E.key[j]++; \/* auto repeat counter *\/\n+ if (E.key[j].counter) E.key[j].counter++; \/* auto repeat counter *\/\n }\n \n \/* Call the draw function at every iteration. *\/\n"} {"commit":"7e6120c57cf92f005f72c6345c0961415099881e","subject":"ASoC: TWL4030: Use usleep_range when appropriate","message":"ASoC: TWL4030: Use usleep_range when appropriate\n\nChange the busy loop delays with usleep_range or msleep calls.\n\nSigned-off-by: Peter Ujfalusi <e5c0b4cdf99ae1d408b9c497159e74b54e02e008@nokia.com>\nAcked-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\nSigned-off-by: Liam Girdwood <a57ef363056e61beffa2efa59c68550d40db03b0@slimlogic.co.uk>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/codecs\/twl4030.c\n+++ sound\/soc\/codecs\/twl4030.c\n@@ -233,6 +233,16 @@\n \treturn 0;\n }\n \n+static inline void twl4030_wait_ms(int time)\n+{\n+\tif (time < 60) {\n+\t\ttime *= 1000;\n+\t\tusleep_range(time, time + 500);\n+\t} else {\n+\t\tmsleep(time);\n+\t}\n+}\n+\n static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)\n {\n \tstruct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);\n@@ -338,10 +348,14 @@\n \ttwl4030_write(codec, TWL4030_REG_ANAMICL,\n \t\treg | TWL4030_CNCL_OFFSET_START);\n \n-\t\/* wait for offset cancellation to complete *\/\n+\t\/*\n+\t * Wait for offset cancellation to complete.\n+\t * Since this takes a while, do not slam the i2c.\n+\t * Start polling the status after ~20ms.\n+\t *\/\n+\tmsleep(20);\n \tdo {\n-\t\t\/* this takes a little while, so don't slam i2c *\/\n-\t\tudelay(2000);\n+\t\tusleep_range(1000, 2000);\n \t\ttwl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte,\n \t\t\t\t TWL4030_REG_ANAMICL);\n \t} while ((i++ < 100) &&\n@@ -725,9 +739,12 @@\n \t\/* Base values for ramp delay calculation: 2^19 - 2^26 *\/\n \tunsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304,\n \t\t\t\t 8388608, 16777216, 33554432, 67108864};\n+\tunsigned int delay;\n \n \ths_gain = twl4030_read_reg_cache(codec, TWL4030_REG_HS_GAIN_SET);\n \ths_pop = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET);\n+\tdelay = (ramp_base[(hs_pop & TWL4030_RAMP_DELAY) >> 2] \/\n+\t\ttwl4030->sysclk) + 1;\n \n \t\/* Enable external mute control, this dramatically reduces\n \t * the pop-noise *\/\n@@ -751,16 +768,14 @@\n \t\ths_pop |= TWL4030_RAMP_EN;\n \t\ttwl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);\n \t\t\/* Wait ramp delay time + 1, so the VMID can settle *\/\n-\t\tmdelay((ramp_base[(hs_pop & TWL4030_RAMP_DELAY) >> 2] \/\n-\t\t\ttwl4030->sysclk) + 1);\n+\t\ttwl4030_wait_ms(delay);\n \t} else {\n \t\t\/* Headset ramp-down _not_ according to\n \t\t * the TRM, but in a way that it is working *\/\n \t\ths_pop &= ~TWL4030_RAMP_EN;\n \t\ttwl4030_write(codec, TWL4030_REG_HS_POPN_SET, hs_pop);\n \t\t\/* Wait ramp delay time + 1, so the VMID can settle *\/\n-\t\tmdelay((ramp_base[(hs_pop & TWL4030_RAMP_DELAY) >> 2] \/\n-\t\t\ttwl4030->sysclk) + 1);\n+\t\ttwl4030_wait_ms(delay);\n \t\t\/* Bypass the reg_cache to mute the headset *\/\n \t\ttwl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,\n \t\t\t\t\ths_gain & (~0x0f),\n@@ -835,7 +850,7 @@\n \tstruct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);\n \n \tif (twl4030->digimic_delay)\n-\t\tmdelay(twl4030->digimic_delay);\n+\t\ttwl4030_wait_ms(twl4030->digimic_delay);\n \treturn 0;\n }\n \n"} {"commit":"cc5436bccb34145ba63ea93a96664a90e69fba86","subject":"mlx5: remove redundant debug message","message":"mlx5: remove redundant debug message\n\nSigned-off-by: Adrien Mazarguil <9d39ea493ca46c560334f650ac5d4b5ffbcb5cf0@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/mlx5\/mlx5_rxmode.c\n+++ drivers\/net\/mlx5\/mlx5_rxmode.c\n@@ -204,8 +204,6 @@\n {\n \tif (hash_rxq->special_flow[flow_type] == NULL)\n \t\treturn;\n-\tDEBUG(\"%p: disabling special flow %s (%d)\",\n-\t (void *)hash_rxq, hash_rxq_flow_type_str(flow_type), flow_type);\n \tclaim_zero(ibv_exp_destroy_flow(hash_rxq->special_flow[flow_type]));\n \thash_rxq->special_flow[flow_type] = NULL;\n \tDEBUG(\"%p: special flow %s (%d) disabled\",\n"} {"commit":"e778bcdb481a93f9deff3c085165f32603a028cf","subject":"Use separate configuration item for group mail forwarding attr","message":"Use separate configuration item for group mail forwarding attr\n","repos":"simta\/simta,simta\/simta,simta\/simta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simta_ldap.c\n+++ simta_ldap.c\n@@ -108,6 +108,7 @@\n char\t\t\t\t*ldap_vacationhost;\n char\t\t\t\t*ldap_vacationattr;\n char\t\t\t\t*ldap_mailfwdattr;\n+ char\t\t\t\t*ldap_gmailfwdattr;\n char\t\t\t\t*ldap_mailattr;\n char\t\t\t\t*ldap_associated_domain;\n int\t\t\t\t\tldap_ndomain;\n@@ -1138,8 +1139,10 @@\n \tmailvals = NULL;\n \terrmsg = NULL;\n \n-\tif (( mailvals = ldap_get_values(ld->ldap_ld, entry,\n-\t\tld->ldap_mailfwdattr )) != NULL) {\n+\t\/* check for group email forwarding (google) *\/\n+\tif ( ld->ldap_gmailfwdattr &&\n+\t\t( mailvals = ldap_get_values(ld->ldap_ld, entry,\n+\t\tld->ldap_gmailfwdattr )) != NULL ) {\n \t break;\n \t}\n \n@@ -2209,6 +2212,22 @@\n \t\tgoto errexit;\n \t }\n \n+\t} else if ( strcasecmp( av[ 0 ], \"groupmailforwardingattr\" ) == 0 ) {\n+\t if ( ac != 2 ) {\n+\t\tsyslog( LOG_ERR, \"%s:%d:%s\", fname, lineno, linecopy );\n+\t\tsyslog( LOG_ERR, \"Missing group mailforwardingattr value\\n\" );\n+\t\tgoto errexit;\n+\t }\n+\t if ( ld->ldap_gmailfwdattr ) {\n+\t\tsyslog( LOG_ERR, \"%s:%d:%s\", fname, lineno, linecopy );\n+\t\tsyslog( LOG_ERR, \"Multiple group mailforwarding attributes\\n\" );\n+\t\tgoto errexit;\n+\t }\n+\t if (( ld->ldap_gmailfwdattr = (char*)strdup( av[ 1 ])) == NULL ) {\n+\t\tsyslog( LOG_ERR, \"gmailfwdattr strdup error: %m\" ); \n+\t\tgoto errexit;\n+\t }\n+\n \t} else if ( strcasecmp( av[ 0 ], \"vacationhost\" ) == 0 ) {\n \t if ( ac != 2 ) {\n \t\tsyslog( LOG_ERR, \"%s:%d:%s\", fname, lineno, linecopy);\n"} {"commit":"cb99d2d21e049c4cf5e802a8f16fa9ddb52f3e6d","subject":"fixed the type of the walker flag","message":"fixed the type of the walker flag\n\n[r5401]\n","repos":"killbug2004\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,davidgiven\/libfirm,8l\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/tr\/tr_inheritance.c\n+++ ir\/tr\/tr_inheritance.c\n@@ -227,7 +227,7 @@\n static void compute_down_closure(type *tp) {\n pset *myset, *subset;\n int i, n_subtypes, n_members, n_supertypes;\n- int master_visited = get_master_type_visited();\n+ unsigned long master_visited = get_master_type_visited();\n \n assert(is_Class_type(tp));\n \n"} {"commit":"c3a9c27379a3031590b025b8221aadbaf547f065","subject":"pkt-gen: update stats also in pinger","message":"pkt-gen: update stats also in pinger\n","repos":"luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap,luigirizzo\/netmap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- apps\/pkt-gen\/pkt-gen.c\n+++ apps\/pkt-gen\/pkt-gen.c\n@@ -1240,7 +1240,7 @@\n \t\tstruct netmap_slot *slot;\n \t\tchar *p;\n \t\tint rv;\n-\t\tuint64_t limit;\n+\t\tuint64_t limit, event = 0;\n \n \t\tif (rate_limit && tosend <= 0) {\n \t\t\ttosend = targ->g->burst;\n@@ -1271,6 +1271,11 @@\n \t\t\t\tring->head = ring->cur = nm_ring_next(ring, ring->cur);\n \t\t\t}\n \t\t}\n+\t\tif (i > 0)\n+\t\t\tevent++;\n+\t\ttarg->ctr.pkts = sent;\n+\t\ttarg->ctr.bytes = sent*size;\n+\t\ttarg->ctr.events = event;\n \t\tif (rate_limit)\n \t\t\ttosend -= i;\n \t\t\/* should use a parameter to decide how often to send *\/\n"} {"commit":"898bc2824ece39a769b40e94579f5fc277689aba","subject":"drivers: char: misc.c: remove trailing whitespace","message":"drivers: char: misc.c: remove trailing whitespace\n\nRemove trailing whitespace from several lines in drivers\/char\/misc.c\nThis was done using scripts\/cleanfile\n\nSigned-off-by: Tal Shorer <5db15a6bc0972273d099aecc00e39204a68414a4@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/misc.c\n+++ drivers\/char\/misc.c\n@@ -117,14 +117,14 @@\n \tconst struct file_operations *new_fops = NULL;\n \n \tmutex_lock(&misc_mtx);\n-\t\n+\n \tlist_for_each_entry(c, &misc_list, list) {\n \t\tif (c->minor == minor) {\n-\t\t\tnew_fops = fops_get(c->fops);\t\t\n+\t\t\tnew_fops = fops_get(c->fops);\n \t\t\tbreak;\n \t\t}\n \t}\n-\t\t\n+\n \tif (!new_fops) {\n \t\tmutex_unlock(&misc_mtx);\n \t\trequest_module(\"char-major-%d-%d\", MISC_MAJOR, minor);\n@@ -167,7 +167,7 @@\n \/**\n *\tmisc_register\t-\tregister a miscellaneous device\n *\t@misc: device structure\n- *\t\n+ *\n *\tRegister a miscellaneous device with the kernel. If the minor\n *\tnumber is set to %MISC_DYNAMIC_MINOR a minor number is assigned\n *\tand placed in the minor field of the structure. For other cases\n@@ -181,7 +181,7 @@\n *\tA zero is returned on success and a negative errno code for\n *\tfailure.\n *\/\n- \n+\n int misc_register(struct miscdevice * misc)\n {\n \tdev_t dev;\n"} {"commit":"c753db4f59418f5647e5c29ba96c8a6aa3b4d073","subject":"fix from formatting","message":"fix from formatting\n","repos":"jpoirier\/picoc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- expression.c\n+++ expression.c\n@@ -882,8 +882,8 @@\n break;\n case TypePointer: Result = VariableAllocValueFromExistingData(Parser,\n BottomValue->Typ->FromType,\n- (union AnyValue*)((char*)BottomValue->Val->Pointer +T\n- ypeSize(BottomValue->Typ->FromType,\n+ (union AnyValue*)((char*)BottomValue->Val->Pointer +\n+ TypeSize(BottomValue->Typ->FromType,\n 0, true) * ArrayIndex),\n BottomValue->IsLValue, BottomValue->LValueFrom);\n break;\n"} {"commit":"35350e995e4f35b56a5dd2ac9bf6728ecef7d8f2","subject":"completed move constructor and move assignment coverage for Lightweight_Hash","message":"completed move constructor and move assignment coverage for Lightweight_Hash\n","repos":"emmanuelleparquier\/rtbkitinstall,pablin87\/rtbkit,pablin87\/rtbkit,ksurendra\/rtbkit,Motrixi\/rtbkit-public,datacratic\/rtbkit,rtbkit\/rtbkit,wesley1001\/rtbkit,ksurendra\/rtbkit,OrbitScripts\/rtbkit,datacratic\/rtbkit,meiry\/rtbkit,OrbitScripts\/rtbkit,OrbitScripts\/rtbkit,rtbkit\/rtbkit,niko-lay\/rtbkit,dinomyte72\/rtbkit,dinomyte72\/rtbkit,rtbkit\/rtbkit,OrbitScripts\/rtbkit,niko-lay\/rtbkit,monoj-khatua\/rtbkit,datacratic\/DasDB,emmanuelleparquier\/rtbkitinstall,emmanuelleparquier\/rtbkitinstall,pswaminathan\/rtbkit,datacratic\/rtbkit,Motrixi\/rtbkit-public,monoj-khatua\/rtbkit,rtbkit\/rtbkit,pswaminathan\/rtbkit,pablin87\/rtbkit,pswaminathan\/rtbkit,wesley1001\/rtbkit,ksurendra\/rtbkit,nagyistoce\/StockExchange-RealTimeBidder-kit,wesley1001\/rtbkit,pswaminathan\/rtbkit,pablin87\/rtbkit,monoj-khatua\/rtbkit,nagyistoce\/StockExchange-RealTimeBidder-kit,Motrixi\/rtbkit-public,monoj-khatua\/rtbkit,winclap\/rtbkit,OrbitScripts\/rtbkit,wesley1001\/rtbkit,datacratic\/DasDB,meiry\/rtbkit,emmanuelleparquier\/rtbkitinstall,datacratic\/rtbkit,nagyistoce\/StockExchange-RealTimeBidder-kit,winclap\/rtbkit,Motrixi\/rtbkit-vainilla,rtbkit\/rtbkit,niko-lay\/rtbkit,monoj-khatua\/rtbkit,Motrixi\/rtbkit-public,Motrixi\/rtbkit-public,Motrixi\/rtbkit-vainilla,Motrixi\/rtbkit-public,emmanuelleparquier\/rtbkitinstall,datacratic\/DasDB,pswaminathan\/rtbkit,winclap\/rtbkit,OrbitScripts\/rtbkit,winclap\/rtbkit,wesley1001\/rtbkit,niko-lay\/rtbkit,dinomyte72\/rtbkit,winclap\/rtbkit,ksurendra\/rtbkit,datacratic\/rtbkit,ksurendra\/rtbkit,dinomyte72\/rtbkit,meiry\/rtbkit,meiry\/rtbkit,rtbkit\/rtbkit,meiry\/rtbkit,datacratic\/DasDB,datacratic\/DasDB,Motrixi\/rtbkit-vainilla,emmanuelleparquier\/rtbkitinstall,monoj-khatua\/rtbkit,Motrixi\/rtbkit-vainilla,niko-lay\/rtbkit,pablin87\/rtbkit,dinomyte72\/rtbkit,datacratic\/rtbkit,pswaminathan\/rtbkit,wesley1001\/rtbkit,ksurendra\/rtbkit,winclap\/rtbkit,dinomyte72\/rtbkit,niko-lay\/rtbkit,Motrixi\/rtbkit-vainilla,nagyistoce\/StockExchange-RealTimeBidder-kit,meiry\/rtbkit,nagyistoce\/StockExchange-RealTimeBidder-kit,pablin87\/rtbkit,nagyistoce\/StockExchange-RealTimeBidder-kit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- utils\/lightweight_hash.h\n+++ utils\/lightweight_hash.h\n@@ -377,12 +377,25 @@\n }\n }\n \n+ Lightweight_Hash_Base(Lightweight_Hash_Base && other)\n+ : storage_(other.storage_), size_(other.size_)\n+ {\n+ other.size_ = 0;\n+ }\n+\n ~Lightweight_Hash_Base()\n {\n destroy();\n }\n \n Lightweight_Hash_Base & operator = (const Lightweight_Hash_Base & other)\n+ {\n+ Lightweight_Hash_Base new_me(other);\n+ swap(new_me);\n+ return *this;\n+ }\n+\n+ Lightweight_Hash_Base & operator = (Lightweight_Hash_Base && other)\n {\n Lightweight_Hash_Base new_me(other);\n swap(new_me);\n@@ -733,7 +746,19 @@\n {\n }\n \n+ Lightweight_Hash(Lightweight_Hash && other)\n+ : Base(other)\n+ {\n+ }\n+\n Lightweight_Hash & operator = (const Lightweight_Hash & other)\n+ {\n+ Lightweight_Hash new_me(other);\n+ swap(new_me);\n+ return *this;\n+ }\n+\n+ Lightweight_Hash & operator = (Lightweight_Hash && other)\n {\n Lightweight_Hash new_me(other);\n swap(new_me);\n@@ -935,7 +960,19 @@\n {\n }\n \n+ Lightweight_Hash_Set(Lightweight_Hash_Set && other)\n+ : Base(other)\n+ {\n+ }\n+\n Lightweight_Hash_Set & operator = (const Lightweight_Hash_Set & other)\n+ {\n+ Lightweight_Hash_Set new_me(other);\n+ swap(new_me);\n+ return *this;\n+ }\n+\n+ Lightweight_Hash_Set & operator = (Lightweight_Hash_Set && other)\n {\n Lightweight_Hash_Set new_me(other);\n swap(new_me);\n"} {"commit":"181da78cd048ce866b05a2e0208ea09d2f80e721","subject":"ASoC: TWL4030: Fix Analog capture path for AUXR","message":"ASoC: TWL4030: Fix Analog capture path for AUXR\n\nAUXR is selected by bit 2 and not by bit 1 in the ANAMICR register.\n\nSigned-off-by: Peter Ujfalusi <e5c0b4cdf99ae1d408b9c497159e74b54e02e008@nokia.com>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/codecs\/twl4030.c\n+++ sound\/soc\/codecs\/twl4030.c\n@@ -432,7 +432,7 @@\n \/* Right analog microphone selection *\/\n static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = {\n \tSOC_DAPM_SINGLE(\"Sub mic\", TWL4030_REG_ANAMICR, 0, 1, 0),\n-\tSOC_DAPM_SINGLE(\"AUXR\", TWL4030_REG_ANAMICR, 1, 1, 0),\n+\tSOC_DAPM_SINGLE(\"AUXR\", TWL4030_REG_ANAMICR, 2, 1, 0),\n };\n \n \/* TX1 L\/R Analog\/Digital microphone selection *\/\n"} {"commit":"3c398b8612b210a159ec7ba5e5c3c341fb0d5eab","subject":"[PATCH] drivers\/net\/wireless\/ipw2100.c: make ipw2100_wpa_assoc_frame() static","message":"[PATCH] drivers\/net\/wireless\/ipw2100.c: make ipw2100_wpa_assoc_frame() static\n\nThis patch makes the needlessly global ipw2100_wpa_assoc_frame() static.\n\nSigned-off-by: Adrian Bunk <0b86548ef377da0031a3ff3f0c4e06f016e20105@stusta.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ipw2100.c\n+++ drivers\/net\/wireless\/ipw2100.c\n@@ -5771,8 +5771,8 @@\n \treturn ret;\n }\n \n-void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,\n-\t\t\t char *wpa_ie, int wpa_ie_len)\n+static void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,\n+\t\t\t\t char *wpa_ie, int wpa_ie_len)\n {\n \n \tstruct ipw2100_wpa_assoc_frame frame;\n"} {"commit":"80195ae328be4d6277b9b269ca607db36c28c102","subject":"Corrected bounce message formatting","message":"Corrected bounce message formatting\n","repos":"simta\/simta,simta\/simta,simta\/simta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simta_ldap.c\n+++ simta_ldap.c\n@@ -780,13 +780,16 @@\n char\t**ufn;\n char\t**vals;\n \n+ char\t*pnl;\n+ char\t*pstart;\n+\n if ( bounce_text( e_addr->e_addr_errors, addr,\n \t\t\": User has no email address registered.\\n\" , NULL ) != 0 ) {\n \treturn;\n }\n \n if ( bounce_text( e_addr->e_addr_errors, \n-\"\\t Name, title, postal address and phone for:\", addr, NULL ) != 0 ) {\n+\"\\tName, title, postal address and phone for: \", addr, NULL ) != 0 ) {\n \treturn;\n }\n \n@@ -837,11 +840,18 @@\n \t return;\n \t}\n } else {\n-\tfor ( idx = 0; vals[idx] != NULL; idx++ ) {\n-\t if ( bounce_text( e_addr->e_addr_errors, \n-\t\t\t\t\"\\t\", vals[idx], NULL ) != 0 ) {\n-\t\tldap_value_free( vals );\n-\t\treturn;\n+ for (pstart = vals[0]; pstart; pstart = pnl) {\n+\t pnl = strchr (pstart, '$');\n+\t if (pnl) {\n+\t\t*pnl = '\\0';\n+\t\tpnl++;\n+\t }\n+\t if (strlen (pstart)) {\t\n+\t\tif ( bounce_text( e_addr->e_addr_errors, \n+\t\t\t\t\"\\t\", pstart, NULL ) != 0 ) {\n+\t\t ldap_value_free( vals );\n+\t\t return;\n+\t\t}\n \t }\n \t}\n \tldap_value_free( vals );\n@@ -1104,7 +1114,6 @@\n char\t*attrval;\n \n char\tbuf[1024];\n- char\t**ufn;\n \n if ( ldap_groups\n && (simta_ldap_value( entry, \"objectClass\", ldap_groups ) == 1 ) ) {\n@@ -1127,18 +1136,14 @@\n \t\tdo_noemail (e_addr, addr, entry);\n \t } else {\n \t\tif ((e_addr->e_addr_errors->e_flags & SUPPRESSNOEMAILERROR) == 0) {\n-\t\t ufn = ldap_explode_dn( addr, 1 );\n-\n-\t\t if ( bounce_text( e_addr->e_addr_errors, ufn[0],\n+\t\t if ( bounce_text( e_addr->e_addr_errors, addr,\n \t\t\" : Group member exists but does not have an email address\" , \n-\t\t\tNULL ) != 0 ) {\n-\t\t\tldap_value_free( ufn );\n+\t\t\t\"\\n\" ) != 0 ) {\n \t\t\tsyslog( LOG_ERR, \n \"simta_ldap_process_entry: Failed building bounce message -- no email: %s\",\n \t\t\t\te_addr->e_addr);\n \t\t\treturn( LDAP_SYSERROR );\n \t\t }\n-\t\t ldap_value_free( ufn );\n \t\t}\n \t }\n #if 0\n@@ -1423,7 +1428,7 @@\n \tldap_msgfree( res );\n \n \tif ( (bounce_text( e_addr->e_addr_errors, search_dn,\n-\t\t\" : Group member does not exist\\n\" , NULL ) != 0 ) \n+\t\t\" : Group member does not exist\" , NULL ) != 0 ) \n \t|| (bounce_text( e_addr->e_addr_errors, \n \"This could be because the distinguished name of the person has changed\\n\" , \n \"If this is the case, the problem can be solved by removing and\\n\",\n"} {"commit":"8f8ecbad09b48e5fe44a8d7f5344e802e9c231c8","subject":"[PATCH] Char: moxa, variables cleanup","message":"[PATCH] Char: moxa, variables cleanup\n\n- rename moxaChannels to moxa_port\n- rename moxa_str to moxa_ports\n- move board global variables into moxa_board\n- move port global variables into moxa_port\n\nSigned-off-by: Jiri Slaby <aeaaaa09d9a5fac7c38743ea79aa4bb8ffb08290@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/moxa.c\n+++ drivers\/char\/moxa.c\n@@ -102,19 +102,35 @@\n \/* {MOXA_BOARD_C218_ISA,8,0xDC000}, *\/\n };\n \n-struct moxa_board_conf {\n+static struct moxa_board_conf {\n \tint boardType;\n \tint numPorts;\n \tunsigned long baseAddr;\n \tint busType;\n \tstruct pci_dev *pdev;\n+\n+\tint loadstat;\n+\n+\tvoid __iomem *basemem;\n+\tvoid __iomem *intNdx;\n+\tvoid __iomem *intPend;\n+\tvoid __iomem *intTable;\n+} moxa_boards[MAX_BOARDS];\n+\n+struct mxser_mstatus {\n+\ttcflag_t cflag;\n+\tint cts;\n+\tint dsr;\n+\tint ri;\n+\tint dcd;\n };\n \n-static struct moxa_board_conf moxa_boards[MAX_BOARDS];\n-static void __iomem *moxaBaseAddr[MAX_BOARDS];\n-static int loadstat[MAX_BOARDS];\n-\n-struct moxa_str {\n+struct moxaq_str {\n+\tint inq;\n+\tint outq;\n+};\n+\n+struct moxa_port {\n \tint type;\n \tint port;\n \tint close_delay;\n@@ -128,17 +144,20 @@\n \tint cflag;\n \twait_queue_head_t open_wait;\n \twait_queue_head_t close_wait;\n+\n+\tstruct timer_list emptyTimer;\n+\tstruct mxser_mstatus GMStatus;\n+\tstruct moxaq_str temp_queue;\n+\n+\tchar chkPort;\n+\tchar lineCtrl;\n+\tvoid __iomem *tableAddr;\n+\tlong curBaud;\n+\tchar DCDState;\n+\tchar lowChkFlag;\n+\n+\tushort breakCnt;\n };\n-\n-struct mxser_mstatus {\n-\ttcflag_t cflag;\n-\tint cts;\n-\tint dsr;\n-\tint ri;\n-\tint dcd;\n-};\n-\n-static struct mxser_mstatus GMStatus[MAX_PORTS];\n \n \/* statusflags *\/\n #define TXSTOPPED\t0x1\n@@ -194,11 +213,11 @@\n static void moxa_poll(unsigned long);\n static void set_tty_param(struct tty_struct *);\n static int block_till_ready(struct tty_struct *, struct file *,\n-\t\t\t struct moxa_str *);\n+\t\t\t struct moxa_port *);\n static void setup_empty_event(struct tty_struct *);\n static void check_xmit_empty(unsigned long);\n-static void shut_down(struct moxa_str *);\n-static void receive_data(struct moxa_str *);\n+static void shut_down(struct moxa_port *);\n+static void receive_data(struct moxa_port *);\n \/*\n * moxa board interface functions:\n *\/\n@@ -228,8 +247,8 @@\n static void MoxaPortTxEnable(int);\n static int MoxaPortResetBrkCnt(int);\n static void MoxaPortSendBreak(int, int);\n-static int moxa_get_serial_info(struct moxa_str *, struct serial_struct __user *);\n-static int moxa_set_serial_info(struct moxa_str *, struct serial_struct __user *);\n+static int moxa_get_serial_info(struct moxa_port *, struct serial_struct __user *);\n+static int moxa_set_serial_info(struct moxa_port *, struct serial_struct __user *);\n static void MoxaSetFifo(int port, int enable);\n \n static const struct tty_operations moxa_ops = {\n@@ -253,9 +272,8 @@\n };\n \n static struct tty_driver *moxaDriver;\n-static struct moxa_str moxaChannels[MAX_PORTS];\n+static struct moxa_port moxa_ports[MAX_PORTS];\n static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0);\n-static struct timer_list moxaEmptyTimer[MAX_PORTS];\n static DEFINE_SPINLOCK(moxa_lock);\n \n #ifdef CONFIG_PCI\n@@ -288,7 +306,7 @@\n static int __init moxa_init(void)\n {\n \tint i, numBoards;\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \n \tprintk(KERN_INFO \"MOXA Intellio family driver version %s\\n\", MOXA_VERSION);\n \tmoxaDriver = alloc_tty_driver(MAX_PORTS + 1);\n@@ -308,7 +326,7 @@\n \tmoxaDriver->flags = TTY_DRIVER_REAL_RAW;\n \ttty_set_operations(moxaDriver, &moxa_ops);\n \n-\tfor (i = 0, ch = moxaChannels; i < MAX_PORTS; i++, ch++) {\n+\tfor (i = 0, ch = moxa_ports; i < MAX_PORTS; i++, ch++) {\n \t\tch->type = PORT_16550A;\n \t\tch->port = i;\n \t\tch->close_delay = 5 * HZ \/ 10;\n@@ -316,6 +334,9 @@\n \t\tch->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;\n \t\tinit_waitqueue_head(&ch->open_wait);\n \t\tinit_waitqueue_head(&ch->close_wait);\n+\n+\t\tsetup_timer(&ch->emptyTimer, check_xmit_empty,\n+\t\t\t\t(unsigned long)ch);\n \t}\n \n \tprintk(\"Tty devices major number = %d\\n\", ttymajor);\n@@ -325,9 +346,6 @@\n \t\tput_tty_driver(moxaDriver);\n \t\treturn -1;\n \t}\n-\tfor (i = 0; i < MAX_PORTS; i++)\n-\t\tsetup_timer(&moxaEmptyTimer[i], check_xmit_empty,\n-\t\t\t\t(unsigned long)&moxaChannels[i]);\n \n \tmod_timer(&moxaTimer, jiffies + HZ \/ 50);\n \n@@ -402,7 +420,8 @@\n \t}\n #endif\n \tfor (i = 0; i < numBoards; i++) {\n-\t\tmoxaBaseAddr[i] = ioremap((unsigned long) moxa_boards[i].baseAddr, 0x4000);\n+\t\tmoxa_boards[i].basemem = ioremap(moxa_boards[i].baseAddr,\n+\t\t\t\t0x4000);\n \t}\n \n \treturn (0);\n@@ -418,15 +437,15 @@\n \tdel_timer_sync(&moxaTimer);\n \n \tfor (i = 0; i < MAX_PORTS; i++)\n-\t\tdel_timer_sync(&moxaEmptyTimer[i]);\n+\t\tdel_timer_sync(&moxa_ports[i].emptyTimer);\n \n \tif (tty_unregister_driver(moxaDriver))\n \t\tprintk(\"Couldn't unregister MOXA Intellio family serial driver\\n\");\n \tput_tty_driver(moxaDriver);\n \n \tfor (i = 0; i < MAX_BOARDS; i++) {\n-\t\tif (moxaBaseAddr[i])\n-\t\t\tiounmap(moxaBaseAddr[i]);\n+\t\tif (moxa_boards[i].basemem)\n+\t\t\tiounmap(moxa_boards[i].basemem);\n \t\tif (moxa_boards[i].busType == MOXA_BUS_TYPE_PCI)\n \t\t\tpci_dev_put(moxa_boards[i].pdev);\n \t}\n@@ -440,7 +459,7 @@\n \n static int moxa_open(struct tty_struct *tty, struct file *filp)\n {\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tint port;\n \tint retval;\n \n@@ -453,7 +472,7 @@\n \t\treturn (-ENODEV);\n \t}\n \n-\tch = &moxaChannels[port];\n+\tch = &moxa_ports[port];\n \tch->count++;\n \ttty->driver_data = ch;\n \tch->tty = tty;\n@@ -479,7 +498,7 @@\n \n static void moxa_close(struct tty_struct *tty, struct file *filp)\n {\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tint port;\n \n \tport = tty->index;\n@@ -499,7 +518,7 @@\n \tif (tty_hung_up_p(filp)) {\n \t\treturn;\n \t}\n-\tch = (struct moxa_str *) tty->driver_data;\n+\tch = (struct moxa_port *) tty->driver_data;\n \n \tif ((tty->count == 1) && (ch->count != 1)) {\n \t\tprintk(\"moxa_close: bad serial port count; tty->count is 1, \"\n@@ -520,7 +539,7 @@\n \tif (ch->asyncflags & ASYNC_INITIALIZED) {\n \t\tsetup_empty_event(tty);\n \t\ttty_wait_until_sent(tty, 30 * HZ);\t\/* 30 seconds timeout *\/\n-\t\tdel_timer_sync(&moxaEmptyTimer[ch->port]);\n+\t\tdel_timer_sync(&moxa_ports[ch->port].emptyTimer);\n \t}\n \tshut_down(ch);\n \tMoxaPortFlushData(port, 2);\n@@ -545,11 +564,11 @@\n static int moxa_write(struct tty_struct *tty,\n \t\t const unsigned char *buf, int count)\n {\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tint len, port;\n \tunsigned long flags;\n \n-\tch = (struct moxa_str *) tty->driver_data;\n+\tch = (struct moxa_port *) tty->driver_data;\n \tif (ch == NULL)\n \t\treturn (0);\n \tport = ch->port;\n@@ -568,11 +587,11 @@\n \n static int moxa_write_room(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \n \tif (tty->stopped)\n \t\treturn (0);\n-\tch = (struct moxa_str *) tty->driver_data;\n+\tch = (struct moxa_port *) tty->driver_data;\n \tif (ch == NULL)\n \t\treturn (0);\n \treturn (MoxaPortTxFree(ch->port));\n@@ -580,7 +599,7 @@\n \n static void moxa_flush_buffer(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tif (ch == NULL)\n \t\treturn;\n@@ -591,7 +610,7 @@\n static int moxa_chars_in_buffer(struct tty_struct *tty)\n {\n \tint chars;\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \t\/*\n \t * Sigh...I have to check if driver_data is NULL here, because\n@@ -623,11 +642,11 @@\n \n static void moxa_put_char(struct tty_struct *tty, unsigned char c)\n {\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tint port;\n \tunsigned long flags;\n \n-\tch = (struct moxa_str *) tty->driver_data;\n+\tch = (struct moxa_port *) tty->driver_data;\n \tif (ch == NULL)\n \t\treturn;\n \tport = ch->port;\n@@ -642,7 +661,7 @@\n \n static int moxa_tiocmget(struct tty_struct *tty, struct file *file)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \tint port;\n \tint flag = 0, dtr, rts;\n \n@@ -668,7 +687,7 @@\n static int moxa_tiocmset(struct tty_struct *tty, struct file *file,\n \t\t\t unsigned int set, unsigned int clear)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \tint port;\n \tint dtr, rts;\n \n@@ -692,7 +711,7 @@\n static int moxa_ioctl(struct tty_struct *tty, struct file *file,\n \t\t unsigned int cmd, unsigned long arg)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \tregister int port;\n \tvoid __user *argp = (void __user *)arg;\n \tint retval;\n@@ -745,14 +764,14 @@\n \n static void moxa_throttle(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tch->statusflags |= THROTTLE;\n }\n \n static void moxa_unthrottle(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tch->statusflags &= ~THROTTLE;\n }\n@@ -760,7 +779,7 @@\n static void moxa_set_termios(struct tty_struct *tty,\n \t\t\t struct ktermios *old_termios)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tif (ch == NULL)\n \t\treturn;\n@@ -772,7 +791,7 @@\n \n static void moxa_stop(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tif (ch == NULL)\n \t\treturn;\n@@ -783,7 +802,7 @@\n \n static void moxa_start(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tif (ch == NULL)\n \t\treturn;\n@@ -797,7 +816,7 @@\n \n static void moxa_hangup(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = (struct moxa_str *) tty->driver_data;\n+\tstruct moxa_port *ch = (struct moxa_port *) tty->driver_data;\n \n \tmoxa_flush_buffer(tty);\n \tshut_down(ch);\n@@ -811,7 +830,7 @@\n static void moxa_poll(unsigned long ignored)\n {\n \tregister int card;\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tstruct tty_struct *tp;\n \tint i, ports;\n \n@@ -824,7 +843,7 @@\n \tfor (card = 0; card < MAX_BOARDS; card++) {\n \t\tif ((ports = MoxaPortsOfCard(card)) <= 0)\n \t\t\tcontinue;\n-\t\tch = &moxaChannels[card * MAX_PORTS_PER_BOARD];\n+\t\tch = &moxa_ports[card * MAX_PORTS_PER_BOARD];\n \t\tfor (i = 0; i < ports; i++, ch++) {\n \t\t\tif ((ch->asyncflags & ASYNC_INITIALIZED) == 0)\n \t\t\t\tcontinue;\n@@ -867,10 +886,10 @@\n static void set_tty_param(struct tty_struct *tty)\n {\n \tregister struct ktermios *ts;\n-\tstruct moxa_str *ch;\n+\tstruct moxa_port *ch;\n \tint rts, cts, txflow, rxflow, xany;\n \n-\tch = (struct moxa_str *) tty->driver_data;\n+\tch = (struct moxa_port *) tty->driver_data;\n \tts = tty->termios;\n \tif (ts->c_cflag & CLOCAL)\n \t\tch->asyncflags &= ~ASYNC_CHECK_CD;\n@@ -890,7 +909,7 @@\n }\n \n static int block_till_ready(struct tty_struct *tty, struct file *filp,\n-\t\t\t struct moxa_str *ch)\n+\t\t\t struct moxa_port *ch)\n {\n \tDECLARE_WAITQUEUE(wait,current);\n \tunsigned long flags;\n@@ -981,33 +1000,33 @@\n \n static void setup_empty_event(struct tty_struct *tty)\n {\n-\tstruct moxa_str *ch = tty->driver_data;\n+\tstruct moxa_port *ch = tty->driver_data;\n \tunsigned long flags;\n \n \tspin_lock_irqsave(&moxa_lock, flags);\n \tch->statusflags |= EMPTYWAIT;\n-\tmod_timer(&moxaEmptyTimer[ch->port], jiffies + HZ);\n+\tmod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);\n \tspin_unlock_irqrestore(&moxa_lock, flags);\n }\n \n static void check_xmit_empty(unsigned long data)\n {\n-\tstruct moxa_str *ch;\n-\n-\tch = (struct moxa_str *) data;\n-\tdel_timer_sync(&moxaEmptyTimer[ch->port]);\n+\tstruct moxa_port *ch;\n+\n+\tch = (struct moxa_port *) data;\n+\tdel_timer_sync(&moxa_ports[ch->port].emptyTimer);\n \tif (ch->tty && (ch->statusflags & EMPTYWAIT)) {\n \t\tif (MoxaPortTxQueue(ch->port) == 0) {\n \t\t\tch->statusflags &= ~EMPTYWAIT;\n \t\t\ttty_wakeup(ch->tty);\n \t\t\treturn;\n \t\t}\n-\t\tmod_timer(&moxaEmptyTimer[ch->port], jiffies + HZ);\n+\t\tmod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);\n \t} else\n \t\tch->statusflags &= ~EMPTYWAIT;\n }\n \n-static void shut_down(struct moxa_str *ch)\n+static void shut_down(struct moxa_port *ch)\n {\n \tstruct tty_struct *tp;\n \n@@ -1027,7 +1046,7 @@\n \tch->asyncflags &= ~ASYNC_INITIALIZED;\n }\n \n-static void receive_data(struct moxa_str *ch)\n+static void receive_data(struct moxa_port *ch)\n {\n \tstruct tty_struct *tp;\n \tstruct ktermios *ts;\n@@ -1355,20 +1374,10 @@\n #define \tDCD_oldstate\t0x80\n \n static unsigned char moxaBuff[10240];\n-static void __iomem *moxaIntNdx[MAX_BOARDS];\n-static void __iomem *moxaIntPend[MAX_BOARDS];\n-static void __iomem *moxaIntTable[MAX_BOARDS];\n-static char moxaChkPort[MAX_PORTS];\n-static char moxaLineCtrl[MAX_PORTS];\n-static void __iomem *moxaTableAddr[MAX_PORTS];\n-static long moxaCurBaud[MAX_PORTS];\n-static char moxaDCDState[MAX_PORTS];\n-static char moxaLowChkFlag[MAX_PORTS];\n static int moxaLowWaterChk;\n static int moxaCard;\n static struct mon_str moxaLog;\n static int moxaFuncTout = HZ \/ 2;\n-static ushort moxaBreakCnt[MAX_PORTS];\n \n static void moxadelay(int);\n static void moxafunc(void __iomem *, int, ushort);\n@@ -1389,16 +1398,18 @@\n *****************************************************************************\/\n void MoxaDriverInit(void)\n {\n-\tint i;\n+\tstruct moxa_port *p;\n+\tunsigned int i;\n \n \tmoxaFuncTout = HZ \/ 2;\t\/* 500 mini-seconds *\/\n \tmoxaCard = 0;\n \tmoxaLog.tick = 0;\n \tmoxaLowWaterChk = 0;\n \tfor (i = 0; i < MAX_PORTS; i++) {\n-\t\tmoxaChkPort[i] = 0;\n-\t\tmoxaLowChkFlag[i] = 0;\n-\t\tmoxaLineCtrl[i] = 0;\n+\t\tp = &moxa_ports[i];\n+\t\tp->chkPort = 0;\n+\t\tp->lowChkFlag = 0;\n+\t\tp->lineCtrl = 0;\n \t\tmoxaLog.rxcnt[i] = 0;\n \t\tmoxaLog.txcnt[i] = 0;\n \t}\n@@ -1420,19 +1431,12 @@\n #define MOXA_GET_CUMAJOR (MOXA + 64)\n #define MOXA_GETMSTATUS (MOXA + 65)\n \n-\n-struct moxaq_str {\n-\tint inq;\n-\tint outq;\n-};\n-\n struct dl_str {\n \tchar __user *buf;\n \tint len;\n \tint cardno;\n };\n \n-static struct moxaq_str temp_queue[MAX_PORTS];\n static struct dl_str dltmp;\n \n void MoxaPortFlushData(int port, int mode)\n@@ -1440,10 +1444,10 @@\n \tvoid __iomem *ofsAddr;\n \tif ((mode < 0) || (mode > 2))\n \t\treturn;\n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tmoxafunc(ofsAddr, FC_FlushQueue, mode);\n \tif (mode != 1) {\n-\t\tmoxaLowChkFlag[port] = 0;\n+\t\tmoxa_ports[port].lowChkFlag = 0;\n \t\tlow_water_check(ofsAddr);\n \t}\n }\n@@ -1481,17 +1485,23 @@\n \tcase MOXA_FLUSH_QUEUE:\n \t\tMoxaPortFlushData(port, arg);\n \t\treturn (0);\n-\tcase MOXA_GET_IOQUEUE:\n-\t\tfor (i = 0; i < MAX_PORTS; i++) {\n-\t\t\tif (moxaChkPort[i]) {\n-\t\t\t\ttemp_queue[i].inq = MoxaPortRxQueue(i);\n-\t\t\t\ttemp_queue[i].outq = MoxaPortTxQueue(i);\n+\tcase MOXA_GET_IOQUEUE: {\n+\t\tstruct moxaq_str __user *argm = argp;\n+\t\tstruct moxa_port *p;\n+\n+\t\tfor (i = 0; i < MAX_PORTS; i++, argm++) {\n+\t\t\tp = &moxa_ports[i];\n+\t\t\tmemset(&p->temp_queue, 0, sizeof(p->temp_queue));\n+\t\t\tif (p->chkPort) {\n+\t\t\t\tp->temp_queue.inq = MoxaPortRxQueue(i);\n+\t\t\t\tp->temp_queue.outq = MoxaPortTxQueue(i);\n \t\t\t}\n+\t\t\tif (copy_to_user(argm, &p->temp_queue,\n+\t\t\t\t\t\tsizeof(p->temp_queue)))\n+\t\t\t\treturn -EFAULT;\n \t\t}\n-\t\tif(copy_to_user(argp, temp_queue, sizeof(struct moxaq_str) * MAX_PORTS))\n-\t\t\treturn -EFAULT;\n \t\treturn (0);\n-\tcase MOXA_GET_OQUEUE:\n+\t} case MOXA_GET_OQUEUE:\n \t\ti = MoxaPortTxQueue(port);\n \t\treturn put_user(i, (unsigned long __user *)argp);\n \tcase MOXA_GET_IQUEUE:\n@@ -1506,33 +1516,39 @@\n \t\tif(copy_to_user(argp, &i, sizeof(int)))\n \t\t\treturn -EFAULT;\n \t\treturn 0;\n-\tcase MOXA_GETMSTATUS:\n-\t\tfor (i = 0; i < MAX_PORTS; i++) {\n-\t\t\tGMStatus[i].ri = 0;\n-\t\t\tGMStatus[i].dcd = 0;\n-\t\t\tGMStatus[i].dsr = 0;\n-\t\t\tGMStatus[i].cts = 0;\n-\t\t\tif (!moxaChkPort[i]) {\n-\t\t\t\tcontinue;\n+\tcase MOXA_GETMSTATUS: {\n+\t\tstruct mxser_mstatus __user *argm = argp;\n+\t\tstruct moxa_port *p;\n+\n+\t\tfor (i = 0; i < MAX_PORTS; i++, argm++) {\n+\t\t\tp = &moxa_ports[i];\n+\t\t\tp->GMStatus.ri = 0;\n+\t\t\tp->GMStatus.dcd = 0;\n+\t\t\tp->GMStatus.dsr = 0;\n+\t\t\tp->GMStatus.cts = 0;\n+\t\t\tif (!p->chkPort) {\n+\t\t\t\tgoto copy;\n \t\t\t} else {\n-\t\t\t\tstatus = MoxaPortLineStatus(moxaChannels[i].port);\n+\t\t\t\tstatus = MoxaPortLineStatus(p->port);\n \t\t\t\tif (status & 1)\n-\t\t\t\t\tGMStatus[i].cts = 1;\n+\t\t\t\t\tp->GMStatus.cts = 1;\n \t\t\t\tif (status & 2)\n-\t\t\t\t\tGMStatus[i].dsr = 1;\n+\t\t\t\t\tp->GMStatus.dsr = 1;\n \t\t\t\tif (status & 4)\n-\t\t\t\t\tGMStatus[i].dcd = 1;\n+\t\t\t\t\tp->GMStatus.dcd = 1;\n \t\t\t}\n \n-\t\t\tif (!moxaChannels[i].tty || !moxaChannels[i].tty->termios)\n-\t\t\t\tGMStatus[i].cflag = moxaChannels[i].cflag;\n+\t\t\tif (!p->tty || !p->tty->termios)\n+\t\t\t\tp->GMStatus.cflag = p->cflag;\n \t\t\telse\n-\t\t\t\tGMStatus[i].cflag = moxaChannels[i].tty->termios->c_cflag;\n+\t\t\t\tp->GMStatus.cflag = p->tty->termios->c_cflag;\n+copy:\n+\t\t\tif (copy_to_user(argm, &p->GMStatus,\n+\t\t\t\t\t\tsizeof(p->GMStatus)))\n+\t\t\t\treturn -EFAULT;\n \t\t}\n-\t\tif(copy_to_user(argp, GMStatus, sizeof(struct mxser_mstatus) * MAX_PORTS))\n-\t\t\treturn -EFAULT;\n \t\treturn 0;\n-\tdefault:\n+\t} default:\n \t\treturn (-ENOIOCTLCMD);\n \tcase MOXA_LOAD_BIOS:\n \tcase MOXA_FIND_BOARD:\n@@ -1570,6 +1586,7 @@\n \n int MoxaDriverPoll(void)\n {\n+\tstruct moxa_board_conf *brd;\n \tregister ushort temp;\n \tregister int card;\n \tvoid __iomem *ofsAddr;\n@@ -1579,43 +1596,44 @@\n \tif (moxaCard == 0)\n \t\treturn (-1);\n \tfor (card = 0; card < MAX_BOARDS; card++) {\n-\t if (loadstat[card] == 0)\n+\t\tbrd = &moxa_boards[card];\n+\t if (brd->loadstat == 0)\n \t\t\tcontinue;\n-\t\tif ((ports = moxa_boards[card].numPorts) == 0)\n+\t\tif ((ports = brd->numPorts) == 0)\n \t\t\tcontinue;\n-\t\tif (readb(moxaIntPend[card]) == 0xff) {\n-\t\t\tip = moxaIntTable[card] + readb(moxaIntNdx[card]);\n+\t\tif (readb(brd->intPend) == 0xff) {\n+\t\t\tip = brd->intTable + readb(brd->intNdx);\n \t\t\tp = card * MAX_PORTS_PER_BOARD;\n \t\t\tports <<= 1;\n \t\t\tfor (port = 0; port < ports; port += 2, p++) {\n \t\t\t\tif ((temp = readw(ip + port)) != 0) {\n \t\t\t\t\twritew(0, ip + port);\n-\t\t\t\t\tofsAddr = moxaTableAddr[p];\n+\t\t\t\t\tofsAddr = moxa_ports[p].tableAddr;\n \t\t\t\t\tif (temp & IntrTx)\n \t\t\t\t\t\twritew(readw(ofsAddr + HostStat) & ~WakeupTx, ofsAddr + HostStat);\n \t\t\t\t\tif (temp & IntrBreak) {\n-\t\t\t\t\t\tmoxaBreakCnt[p]++;\n+\t\t\t\t\t\tmoxa_ports[p].breakCnt++;\n \t\t\t\t\t}\n \t\t\t\t\tif (temp & IntrLine) {\n \t\t\t\t\t\tif (readb(ofsAddr + FlagStat) & DCD_state) {\n-\t\t\t\t\t\t\tif ((moxaDCDState[p] & DCD_oldstate) == 0)\n-\t\t\t\t\t\t\t\tmoxaDCDState[p] = (DCD_oldstate |\n+\t\t\t\t\t\t\tif ((moxa_ports[p].DCDState & DCD_oldstate) == 0)\n+\t\t\t\t\t\t\t\tmoxa_ports[p].DCDState = (DCD_oldstate |\n \t\t\t\t\t\t\t\t\t\t DCD_changed);\n \t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tif (moxaDCDState[p] & DCD_oldstate)\n-\t\t\t\t\t\t\t\tmoxaDCDState[p] = DCD_changed;\n+\t\t\t\t\t\t\tif (moxa_ports[p].DCDState & DCD_oldstate)\n+\t\t\t\t\t\t\t\tmoxa_ports[p].DCDState = DCD_changed;\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n-\t\t\twriteb(0, moxaIntPend[card]);\n+\t\t\twriteb(0, brd->intPend);\n \t\t}\n \t\tif (moxaLowWaterChk) {\n \t\t\tp = card * MAX_PORTS_PER_BOARD;\n \t\t\tfor (port = 0; port < ports; port++, p++) {\n-\t\t\t\tif (moxaLowChkFlag[p]) {\n-\t\t\t\t\tmoxaLowChkFlag[p] = 0;\n-\t\t\t\t\tofsAddr = moxaTableAddr[p];\n+\t\t\t\tif (moxa_ports[p].lowChkFlag) {\n+\t\t\t\t\tmoxa_ports[p].lowChkFlag = 0;\n+\t\t\t\t\tofsAddr = moxa_ports[p].tableAddr;\n \t\t\t\t\tlow_water_check(ofsAddr);\n \t\t\t\t}\n \t\t\t}\n@@ -1921,7 +1939,7 @@\n \n \tif (moxaCard == 0)\n \t\treturn (0);\n-\tif (moxaChkPort[port] == 0)\n+\tif (moxa_ports[port].chkPort == 0)\n \t\treturn (0);\n \treturn (1);\n }\n@@ -1932,9 +1950,9 @@\n \tint MoxaPortLineStatus(int);\n \tshort lowwater = 512;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \twritew(lowwater, ofsAddr + Low_water);\n-\tmoxaBreakCnt[port] = 0;\n+\tmoxa_ports[port].breakCnt = 0;\n \tif ((moxa_boards[port \/ MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||\n \t (moxa_boards[port \/ MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI)) {\n \t\tmoxafunc(ofsAddr, FC_SetBreakIrq, 0);\n@@ -1951,7 +1969,7 @@\n \n void MoxaPortDisable(int port)\n {\n-\tvoid __iomem *ofsAddr = moxaTableAddr[port];\n+\tvoid __iomem *ofsAddr = moxa_ports[port].tableAddr;\n \n \tmoxafunc(ofsAddr, FC_SetFlowCtl, 0);\t\/* disable flow control *\/\n \tmoxafunc(ofsAddr, FC_ClrLineIrq, Magic_code);\n@@ -1977,7 +1995,7 @@\n \n \tif ((baud < 50L) || ((max = MoxaPortGetMaxBaud(port)) == 0))\n \t\treturn (0);\n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tif (baud > max)\n \t\tbaud = max;\n \tif (max == 38400L)\n@@ -1989,7 +2007,7 @@\n \tval = clock \/ baud;\n \tmoxafunc(ofsAddr, FC_SetBaud, val);\n \tbaud = clock \/ val;\n-\tmoxaCurBaud[port] = baud;\n+\tmoxa_ports[port].curBaud = baud;\n \treturn (baud);\n }\n \n@@ -1999,9 +2017,9 @@\n \ttcflag_t cflag;\n \ttcflag_t mode = 0;\n \n-\tif (moxaChkPort[port] == 0 || termio == 0)\n+\tif (moxa_ports[port].chkPort == 0 || termio == 0)\n \t\treturn (-1);\n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tcflag = termio->c_cflag;\t\/* termio->c_cflag *\/\n \n \tmode = termio->c_cflag & CSIZE;\n@@ -2055,13 +2073,13 @@\n \tif (!MoxaPortIsValid(port))\n \t\treturn (-1);\n \tif (dtrState) {\n-\t\tif (moxaLineCtrl[port] & DTR_ON)\n+\t\tif (moxa_ports[port].lineCtrl & DTR_ON)\n \t\t\t*dtrState = 1;\n \t\telse\n \t\t\t*dtrState = 0;\n \t}\n \tif (rtsState) {\n-\t\tif (moxaLineCtrl[port] & RTS_ON)\n+\t\tif (moxa_ports[port].lineCtrl & RTS_ON)\n \t\t\t*rtsState = 1;\n \t\telse\n \t\t\t*rtsState = 0;\n@@ -2074,13 +2092,13 @@\n \tvoid __iomem *ofsAddr;\n \tint mode;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tmode = 0;\n \tif (dtr)\n \t\tmode |= DTR_ON;\n \tif (rts)\n \t\tmode |= RTS_ON;\n-\tmoxaLineCtrl[port] = mode;\n+\tmoxa_ports[port].lineCtrl = mode;\n \tmoxafunc(ofsAddr, FC_LineControl, mode);\n }\n \n@@ -2089,7 +2107,7 @@\n \tvoid __iomem *ofsAddr;\n \tint mode;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tmode = 0;\n \tif (rts)\n \t\tmode |= RTS_FlowCtl;\n@@ -2109,7 +2127,7 @@\n \tvoid __iomem *ofsAddr;\n \tint val;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tif ((moxa_boards[port \/ MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||\n \t (moxa_boards[port \/ MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI)) {\n \t\tmoxafunc(ofsAddr, FC_LineStatus, 0);\n@@ -2120,11 +2138,11 @@\n \tval &= 0x0B;\n \tif (val & 8) {\n \t\tval |= 4;\n-\t\tif ((moxaDCDState[port] & DCD_oldstate) == 0)\n-\t\t\tmoxaDCDState[port] = (DCD_oldstate | DCD_changed);\n+\t\tif ((moxa_ports[port].DCDState & DCD_oldstate) == 0)\n+\t\t\tmoxa_ports[port].DCDState = (DCD_oldstate | DCD_changed);\n \t} else {\n-\t\tif (moxaDCDState[port] & DCD_oldstate)\n-\t\t\tmoxaDCDState[port] = DCD_changed;\n+\t\tif (moxa_ports[port].DCDState & DCD_oldstate)\n+\t\t\tmoxa_ports[port].DCDState = DCD_changed;\n \t}\n \tval &= 7;\n \treturn (val);\n@@ -2134,10 +2152,10 @@\n {\n \tint n;\n \n-\tif (moxaChkPort[port] == 0)\n+\tif (moxa_ports[port].chkPort == 0)\n \t\treturn (0);\n-\tn = moxaDCDState[port];\n-\tmoxaDCDState[port] &= ~DCD_changed;\n+\tn = moxa_ports[port].DCDState;\n+\tmoxa_ports[port].DCDState &= ~DCD_changed;\n \tn &= DCD_changed;\n \treturn (n);\n }\n@@ -2146,9 +2164,9 @@\n {\n \tint n;\n \n-\tif (moxaChkPort[port] == 0)\n+\tif (moxa_ports[port].chkPort == 0)\n \t\treturn (0);\n-\tif (moxaDCDState[port] & DCD_oldstate)\n+\tif (moxa_ports[port].DCDState & DCD_oldstate)\n \t\tn = 1;\n \telse\n \t\tn = 0;\n@@ -2164,8 +2182,8 @@\n \tushort pageno, pageofs, bufhead;\n \tvoid __iomem *baseAddr, *ofsAddr, *ofs;\n \n-\tofsAddr = moxaTableAddr[port];\n-\tbaseAddr = moxaBaseAddr[port \/ MAX_PORTS_PER_BOARD];\n+\tofsAddr = moxa_ports[port].tableAddr;\n+\tbaseAddr = moxa_boards[port \/ MAX_PORTS_PER_BOARD].basemem;\n \ttx_mask = readw(ofsAddr + TX_mask);\n \tspage = readw(ofsAddr + Page_txb);\n \tepage = readw(ofsAddr + EndPage_txb);\n@@ -2227,8 +2245,8 @@\n \tushort pageno, bufhead;\n \tvoid __iomem *baseAddr, *ofsAddr, *ofs;\n \n-\tofsAddr = moxaTableAddr[port];\n-\tbaseAddr = moxaBaseAddr[port \/ MAX_PORTS_PER_BOARD];\n+\tofsAddr = moxa_ports[port].tableAddr;\n+\tbaseAddr = moxa_boards[port \/ MAX_PORTS_PER_BOARD].basemem;\n \thead = readw(ofsAddr + RXrptr);\n \ttail = readw(ofsAddr + RXwptr);\n \trx_mask = readw(ofsAddr + RX_mask);\n@@ -2283,7 +2301,7 @@\n \t}\n \tif ((readb(ofsAddr + FlagStat) & Xoff_state) && (remain < LowWater)) {\n \t\tmoxaLowWaterChk = 1;\n-\t\tmoxaLowChkFlag[port] = 1;\n+\t\tmoxa_ports[port].lowChkFlag = 1;\n \t}\n \treturn (total);\n }\n@@ -2295,7 +2313,7 @@\n \tushort rptr, wptr, mask;\n \tint len;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \trptr = readw(ofsAddr + TXrptr);\n \twptr = readw(ofsAddr + TXwptr);\n \tmask = readw(ofsAddr + TX_mask);\n@@ -2309,7 +2327,7 @@\n \tushort rptr, wptr, mask;\n \tint len;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \trptr = readw(ofsAddr + TXrptr);\n \twptr = readw(ofsAddr + TXwptr);\n \tmask = readw(ofsAddr + TX_mask);\n@@ -2323,7 +2341,7 @@\n \tushort rptr, wptr, mask;\n \tint len;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \trptr = readw(ofsAddr + RXrptr);\n \twptr = readw(ofsAddr + RXwptr);\n \tmask = readw(ofsAddr + RX_mask);\n@@ -2336,7 +2354,7 @@\n {\n \tvoid __iomem *ofsAddr;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tmoxafunc(ofsAddr, FC_SetXoffState, Magic_code);\n }\n \n@@ -2344,7 +2362,7 @@\n {\n \tvoid __iomem *ofsAddr;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tmoxafunc(ofsAddr, FC_SetXonState, Magic_code);\n }\n \n@@ -2352,8 +2370,8 @@\n int MoxaPortResetBrkCnt(int port)\n {\n \tushort cnt;\n-\tcnt = moxaBreakCnt[port];\n-\tmoxaBreakCnt[port] = 0;\n+\tcnt = moxa_ports[port].breakCnt;\n+\tmoxa_ports[port].breakCnt = 0;\n \treturn (cnt);\n }\n \n@@ -2362,7 +2380,7 @@\n {\n \tvoid __iomem *ofsAddr;\n \n-\tofsAddr = moxaTableAddr[port];\n+\tofsAddr = moxa_ports[port].tableAddr;\n \tif (ms100) {\n \t\tmoxafunc(ofsAddr, FC_SendBreak, Magic_code);\n \t\tmoxadelay(ms100 * (HZ \/ 10));\n@@ -2373,7 +2391,7 @@\n \tmoxafunc(ofsAddr, FC_StopBreak, Magic_code);\n }\n \n-static int moxa_get_serial_info(struct moxa_str *info,\n+static int moxa_get_serial_info(struct moxa_port *info,\n \t\t\t\tstruct serial_struct __user *retinfo)\n {\n \tstruct serial_struct tmp;\n@@ -2395,7 +2413,7 @@\n }\n \n \n-static int moxa_set_serial_info(struct moxa_str *info,\n+static int moxa_set_serial_info(struct moxa_port *info,\n \t\t\t\tstruct serial_struct __user *new_info)\n {\n \tstruct serial_struct new_serial;\n@@ -2492,7 +2510,7 @@\n \n \tif(copy_from_user(moxaBuff, tmp, len))\n \t\treturn -EFAULT;\n-\tbaseAddr = moxaBaseAddr[cardno];\n+\tbaseAddr = moxa_boards[cardno].basemem;\n \twriteb(HW_reset, baseAddr + Control_reg);\t\/* reset *\/\n \tmoxadelay(1);\t\t\/* delay 10 ms *\/\n \tfor (i = 0; i < 4096; i++)\n@@ -2508,7 +2526,7 @@\n \tvoid __iomem *baseAddr;\n \tushort tmp;\n \n-\tbaseAddr = moxaBaseAddr[cardno];\n+\tbaseAddr = moxa_boards[cardno].basemem;\n \tswitch (moxa_boards[cardno].boardType) {\n \tcase MOXA_BOARD_C218_ISA:\n \tcase MOXA_BOARD_C218_PCI:\n@@ -2541,7 +2559,7 @@\n \t\treturn -EINVAL;\n \tif(copy_from_user(moxaBuff, tmp, len))\n \t\treturn -EFAULT;\n-\tbaseAddr = moxaBaseAddr[cardno];\n+\tbaseAddr = moxa_boards[cardno].basemem;\n \twritew(len - 7168 - 2, baseAddr + C320bapi_len);\n \twriteb(1, baseAddr + Control_reg);\t\/* Select Page 1 *\/\n \tfor (i = 0; i < 7168; i++)\n@@ -2559,7 +2577,7 @@\n \n \tif(copy_from_user(moxaBuff, tmp, len))\n \t\treturn -EFAULT;\n-\tbaseAddr = moxaBaseAddr[cardno];\n+\tbaseAddr = moxa_boards[cardno].basemem;\n \tswitch (moxa_boards[cardno].boardType) {\n \tcase MOXA_BOARD_C218_ISA:\n \tcase MOXA_BOARD_C218_PCI:\n@@ -2569,11 +2587,13 @@\n \t\t\treturn (retval);\n \t\tport = cardno * MAX_PORTS_PER_BOARD;\n \t\tfor (i = 0; i < moxa_boards[cardno].numPorts; i++, port++) {\n-\t\t\tmoxaChkPort[port] = 1;\n-\t\t\tmoxaCurBaud[port] = 9600L;\n-\t\t\tmoxaDCDState[port] = 0;\n-\t\t\tmoxaTableAddr[port] = baseAddr + Extern_table + Extern_size * i;\n-\t\t\tofsAddr = moxaTableAddr[port];\n+\t\t\tstruct moxa_port *p = &moxa_ports[port];\n+\n+\t\t\tp->chkPort = 1;\n+\t\t\tp->curBaud = 9600L;\n+\t\t\tp->DCDState = 0;\n+\t\t\tp->tableAddr = baseAddr + Extern_table + Extern_size * i;\n+\t\t\tofsAddr = p->tableAddr;\n \t\t\twritew(C218rx_mask, ofsAddr + RX_mask);\n \t\t\twritew(C218tx_mask, ofsAddr + TX_mask);\n \t\t\twritew(C218rx_spage + i * C218buf_pageno, ofsAddr + Page_rxb);\n@@ -2591,11 +2611,13 @@\n \t\t\treturn (retval);\n \t\tport = cardno * MAX_PORTS_PER_BOARD;\n \t\tfor (i = 0; i < moxa_boards[cardno].numPorts; i++, port++) {\n-\t\t\tmoxaChkPort[port] = 1;\n-\t\t\tmoxaCurBaud[port] = 9600L;\n-\t\t\tmoxaDCDState[port] = 0;\n-\t\t\tmoxaTableAddr[port] = baseAddr + Extern_table + Extern_size * i;\n-\t\t\tofsAddr = moxaTableAddr[port];\n+\t\t\tstruct moxa_port *p = &moxa_ports[port];\n+\n+\t\t\tp->chkPort = 1;\n+\t\t\tp->curBaud = 9600L;\n+\t\t\tp->DCDState = 0;\n+\t\t\tp->tableAddr = baseAddr + Extern_table + Extern_size * i;\n+\t\t\tofsAddr = p->tableAddr;\n \t\t\tif (moxa_boards[cardno].numPorts == 8) {\n \t\t\t\twritew(C320p8rx_mask, ofsAddr + RX_mask);\n \t\t\t\twritew(C320p8tx_mask, ofsAddr + TX_mask);\n@@ -2631,7 +2653,7 @@\n \t\t}\n \t\tbreak;\n \t}\n-\tloadstat[cardno] = 1;\n+\tmoxa_boards[cardno].loadstat = 1;\n \treturn (0);\n }\n \n@@ -2705,9 +2727,9 @@\n \t\treturn (-1);\n \t}\n \tmoxaCard = 1;\n-\tmoxaIntNdx[cardno] = baseAddr + IRQindex;\n-\tmoxaIntPend[cardno] = baseAddr + IRQpending;\n-\tmoxaIntTable[cardno] = baseAddr + IRQtable;\n+\tmoxa_boards[cardno].intNdx = baseAddr + IRQindex;\n+\tmoxa_boards[cardno].intPend = baseAddr + IRQpending;\n+\tmoxa_boards[cardno].intTable = baseAddr + IRQtable;\n \treturn (0);\n }\n \n@@ -2800,15 +2822,15 @@\n \tif (readw(baseAddr + Magic_no) != Magic_code)\n \t\treturn (-102);\n \tmoxaCard = 1;\n-\tmoxaIntNdx[cardno] = baseAddr + IRQindex;\n-\tmoxaIntPend[cardno] = baseAddr + IRQpending;\n-\tmoxaIntTable[cardno] = baseAddr + IRQtable;\n+\tmoxa_boards[cardno].intNdx = baseAddr + IRQindex;\n+\tmoxa_boards[cardno].intPend = baseAddr + IRQpending;\n+\tmoxa_boards[cardno].intTable = baseAddr + IRQtable;\n \treturn (0);\n }\n \n static void MoxaSetFifo(int port, int enable)\n {\n-\tvoid __iomem *ofsAddr = moxaTableAddr[port];\n+\tvoid __iomem *ofsAddr = moxa_ports[port].tableAddr;\n \n \tif (!enable) {\n \t\tmoxafunc(ofsAddr, FC_SetRxFIFOTrig, 0);\n"} {"commit":"8f53f37c289b5edbd7d3254b4695420d8778078b","subject":"copied source code into gzfilebuf.h instead of link","message":"copied source code into gzfilebuf.h instead of link\n\ngit-svn-id: f5d636078e73450abf2183305c5e43efec2a5605@888 1f5c12ca-751b-0410-a591-d2e778427230\n","repos":"tofula\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,moses-smt\/mosesdecoder,hychyc07\/mosesdecoder,alvations\/mosesdecoder,alvations\/mosesdecoder,hychyc07\/mosesdecoder,hychyc07\/mosesdecoder,hychyc07\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,pjwilliams\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,pjwilliams\/mosesdecoder,tofula\/mosesdecoder,alvations\/mosesdecoder,emjotde\/mosesdecoder_nmt,KonceptGeek\/mosesdecoder,moses-smt\/mosesdecoder,pjwilliams\/mosesdecoder,alvations\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,pjwilliams\/mosesdecoder,alvations\/mosesdecoder,KonceptGeek\/mosesdecoder,emjotde\/mosesdecoder_nmt,alvations\/mosesdecoder,KonceptGeek\/mosesdecoder,hychyc07\/mosesdecoder,hychyc07\/mosesdecoder,KonceptGeek\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,moses-smt\/mosesdecoder,pjwilliams\/mosesdecoder,hychyc07\/mosesdecoder,emjotde\/mosesdecoder_nmt,alvations\/mosesdecoder,moses-smt\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,KonceptGeek\/mosesdecoder,pjwilliams\/mosesdecoder,KonceptGeek\/mosesdecoder,alvations\/mosesdecoder,tofula\/mosesdecoder,hychyc07\/mosesdecoder,pjwilliams\/mosesdecoder,KonceptGeek\/mosesdecoder,moses-smt\/mosesdecoder,emjotde\/mosesdecoder_nmt,pjwilliams\/mosesdecoder,emjotde\/mosesdecoder_nmt,KonceptGeek\/mosesdecoder,pjwilliams\/mosesdecoder,alvations\/mosesdecoder,emjotde\/mosesdecoder_nmt,emjotde\/mosesdecoder_nmt,emjotde\/mosesdecoder_nmt,tofula\/mosesdecoder,tofula\/mosesdecoder,pjwilliams\/mosesdecoder,KonceptGeek\/mosesdecoder,tofula\/mosesdecoder,tofula\/mosesdecoder,KonceptGeek\/mosesdecoder","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"4e959e935c7d9c845a7fcc5da9362f8668905700","subject":"Cleanup x86_64 specific structures","message":"Cleanup x86_64 specific structures\n","repos":"ice799\/memprof,ice799\/memprof","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/x86_64.h\n+++ ext\/x86_64.h\n@@ -5,7 +5,27 @@\n #include \"arch.h\"\n \n \/*\n- * This is the \"normal\" stage 2 trampoline with a default entry pre-filled\n+ * tramp_st2_entry - stage 2 trampoline entry\n+ *\n+ * This trampoline calls a handler function via the callee saved register %rbx.\n+ * The handler function is stored in the field 'addr'.\n+ *\n+ * A default pre-filled (except addr, of course) version of this trampoline is\n+ * provided so that the opcodes do not need to be filled in every time it is\n+ * used. You only need to set the addr field of default_st2_tramp and you are\n+ * ready to roll.\n+ *\n+ * This trampoline is the assembly code:\n+ *\n+ * push %rbx # save %rbx\n+ * push %rbp # save previous stack frame's %rbp\n+ * mov %rsp, %rbp # update %rbp to be current stack pointer\n+ * andl 0xFFFFFFFFFFFFFFF0, %rsp # align stack pointer as per the ABI\n+ * mov ADDR, %rbx # move address of handler into %rbx\n+ * callq *%rbx # call handler\n+ * pop %rbx # restore %rbx\n+ * leave # restore %rbp, move stack pointer back\n+ * ret # return\n *\/\n static struct tramp_st2_entry {\n unsigned char push_rbx;\n@@ -19,20 +39,69 @@\n unsigned char rbx_restore;\n unsigned char ret;\n } __attribute__((__packed__)) default_st2_tramp = {\n- .push_rbx = 0x53, \/\/ push rbx\n- .push_rbp = 0x55, \/\/ push rbp\n- .save_rsp = {0x48, 0x89, 0xe5}, \/\/ mov rsp, rbp\n- .align_rsp = {0x48, 0x83, 0xe4, 0xf0}, \/\/ andl ~0x1, rsp\n- .mov = {'\\x48', '\\xbb'}, \/\/ mov addr into rbx\n- .addr = 0, \/\/ ^^^\n- .call = {'\\xff', '\\xd3'}, \/\/ call rbx\n- .rbx_restore = 0x5b, \/\/ pop rbx\n- .leave = 0xc9, \/\/ leave\n- .ret = 0xc3, \/\/ ret\n+ .push_rbx = 0x53,\n+ .push_rbp = 0x55,\n+ .save_rsp = {0x48, 0x89, 0xe5},\n+ .align_rsp = {0x48, 0x83, 0xe4, 0xf0},\n+ .mov = {0x48, 0xbb},\n+ .addr = 0,\n+ .call = {0xff, 0xd3},\n+ .rbx_restore = 0x5b,\n+ .leave = 0xc9,\n+ .ret = 0xc3,\n };\n \n \/*\n- * This is the inline stage 2 trampoline with a default entry pre-filled\n+ * inline_tramp_st2_entry - stage 2 inline trampoline entry\n+ *\n+ * This trampoline calls a handler function via the callee saved register %rbx,\n+ * The handler function is stored in the field 'addr'.\n+ *\n+ * The major difference between this trampoline and the one above is that this\n+ * trampoline is intended to be used as the target of an 'inline trampoline',\n+ * that is code is redirected to this and the stack and registers may not be\n+ * 'ready' for a function call.\n+ *\n+ * This trampoline provides space to regenerate the overwritten mov instruction\n+ * and utmost care must be taken in order to recreate the overwritten\n+ * instruction.\n+ *\n+ * This trampoline is hit with a jmp (NOT A CALL), and as such must take care\n+ * to jmp back to resume execution.\n+ *\n+ * Like the above trampoline, this structure comes with a prefilled entry called\n+ * default_inline_st2_tramp that has most of the fields prepopulated.\n+ *\n+ * To use this structure you must fill in:\n+ * - mov_displacement - should be set to the 32bit displacement from the next\n+ * instruction (i.e. frame) to freelist. This is used to recreate the\n+ * overwritten instruction.\n+ *\n+ * - rdi_source_displacement - should be set to the 32bit displacement from\n+ * the next instruction (i.e. push_rbx) to freelist. This is used to load\n+ * freelist as the 1st argument to the handler.\n+ *\n+ * - addr - the address of the handler function to call\n+ *\n+ * - jmp_displacement - should be set to the 32bit displacement from the next\n+ * instruction to the instruction after the stage 1 trampoline. This is\n+ * used to resume execution after the handler has been hit.\n+ *\n+ *\n+ * This structure represents the assembly code:\n+ *\n+ * mov SOURCE_REGISTER, freelist # update the freelist\n+ * push %rdi # save %rdi\n+ * mov freelist, %rdi # move first entry of freelist into %rdi\n+ * push %rbp # save previous %rbp\n+ * mov %rsp, %rbp # update %rbp to be current stack pointer\n+ * andl 0xFFFFFFFFFFFFFFF0, %rsp # align stack pointer as per ABI\n+ * mov ADDR, %rbx # load handler address into %rbx\n+ * callq *%rbx # call handler\n+ * leave # reset stack pointer, restore %rbp\n+ * pop %rbx # restore %rbx\n+ * pop %rdi # restore %rdi\n+ * jmp NEXT_INSN # jmp to instruction after stage 1 tramp\n *\/\n static struct inline_tramp_st2_entry {\n unsigned char rex;\n@@ -66,15 +135,15 @@\n \n .frame = {\n .push_rdi = 0x57,\n- .mov_rdi = {'\\x48', '\\x8b', '\\x3d'},\n+ .mov_rdi = {0x48, 0x8b, 0x3d},\n .rdi_source_displacement = 0,\n .push_rbx = 0x53,\n .push_rbp = 0x55,\n- .save_rsp = {'\\x48', '\\x89', '\\xe5'},\n- .align_rsp = {'\\x48', '\\x83', '\\xe4', '\\xf0'},\n- .mov = {'\\x48', '\\xbb'},\n+ .save_rsp = {0x48, 0x89, 0xe5},\n+ .align_rsp = {0x48, 0x83, 0xe4, 0xf0},\n+ .mov = {0x48, 0xbb},\n .addr = 0,\n- .call = {'\\xff', '\\xd3'},\n+ .call = {0xff, 0xd3},\n .leave = 0xc9,\n .rbx_restore = 0x5b,\n .rdi_restore = 0x5f,\n"} {"commit":"50ba29460a0d77aad43d15d06e3c8f59124df318","subject":"ASoC: wcd9306: Add ability to enable regulator by the codec","message":"ASoC: wcd9306: Add ability to enable regulator by the codec\n\nAdd support in codec driver to enable the regulator\nthat controls the 5V supply to the speaker.\n\nChange-Id: Ifbbf6b2af1cd2534abacbfe5d22c6aed98e38be0\nSigned-off-by: Damir Didjusto <1e09809ba7f2abb6b13ab7644f4e79621a0c1a2c@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"73b29505c36eeb4751eccad41f6aad78562521f8","subject":"ipc: sem_putref() does not need the semaphore lock any more","message":"ipc: sem_putref() does not need the semaphore lock any more\n\nipc_rcu_putref() uses atomics for the refcount, and the games to lock\nand unlock the semaphore just to try to keep the reference counting\nworking are no longer useful.\n\nAcked-by: Davidlohr Bueso <d7ca2ed3e31360a26e5e60317ed1b792bd41becb@hp.com>\nCc: Rik van Riel <a21938f5d463ddf41aa718934c205ca2cce8ebbc@redhat.com>\nCc: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ipc\/sem.c\n+++ ipc\/sem.c\n@@ -329,9 +329,7 @@\n \n static inline void sem_putref(struct sem_array *sma)\n {\n-\tsem_lock_and_putref(sma);\n-\tsem_unlock(sma, -1);\n-\trcu_read_unlock();\n+\tipc_rcu_putref(sma);\n }\n \n static inline void sem_rmid(struct ipc_namespace *ns, struct sem_array *s)\n"} {"commit":"ee72cc5217584da44fa37be36c9fc2019740bf19","subject":"Some changes for porting to Solaris.","message":"Some changes for porting to Solaris.\n","repos":"greg-minshall\/flstats,greg-minshall\/flstats","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- flstats.c\n+++ flstats.c\n@@ -54,11 +54,14 @@\n *\/\n \n static char *rcsid =\n-\t\"$Id: flstats.c,v 1.73 1996\/03\/21 02:51:54 minshall Exp minshall $\";\n+\t\"$Id: flstats.c,v 1.74 1996\/05\/18 01:25:24 minshall Exp minshall $\";\n \n #include <stdio.h>\n #include <stdlib.h>\n #include <string.h>\n+\n+#include <sys\/types.h>\n+#include <netinet\/in.h>\n \n #include <pcap.h>\n #include <tcl.h>\n@@ -407,13 +410,13 @@\n \t\t dport;\n \t u_long seq,\n \t\t ack;\n-\t#if\t(BYTE_ORDER == BIG_ENDIAN)\n+#if\t(BYTE_ORDER == BIG_ENDIAN)\n \t u_char doff:4,\n \t\t resv:4,\n-\t#else\n+#else\n \t u_char resv:4,\n \t\t doff:4,\n-\t#endif\n+#endif\n \t\t flags;\n \t u_short window;\n \t} tcp;\n@@ -450,20 +453,11 @@\n usecs,\n src,\n dst;\n-#if (BYTE_ORDER == BIG_ENDIAN) \/* byte order makes my head hurt... *\/\n- u_char prot,\n- tflags;\n- u_short len,\n- dport, \n- sport; \n-#endif \n-#if (BYTE_ORDER == LITTLE_ENDIAN)\n u_short len;\n u_char prot,\n tflags;\n u_short sport,\n dport;\n-#endif\n };\n \n \/* global variables *\/\n@@ -809,7 +803,7 @@\n }\n \n static void\n-timer_delete(flowentry_p fe)\n+timer_remove(flowentry_p fe)\n {\n if (fe->fe_prev_in_timer) {\n \tfe->fe_prev_in_timer->fe_next_in_timer = fe->fe_next_in_timer;\n@@ -988,7 +982,7 @@\n \n \/* out of timer *\/\n if (fe->fe_prev_in_timer) {\n-\ttimer_delete(fe);\n+\ttimer_remove(fe);\n }\n \n \/* out of bucket *\/\n"} {"commit":"1fe0adb4314009362d28205bbf09f6d758e82002","subject":"Migrated some of the channel verification code back into the driver to keep regulatory consistency in one location.","message":"Migrated some of the channel verification code back into the driver to\nkeep regulatory consistency in one location.\n\nSigned-off-by: James Ketrenos\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ipw2200.c\n+++ drivers\/net\/wireless\/ipw2200.c\n@@ -148,6 +148,12 @@\n \t\t\t\tstruct ipw_supported_rates *prates);\n static void ipw_set_hwcrypto_keys(struct ipw_priv *);\n static void ipw_send_wep_keys(struct ipw_priv *, int);\n+\n+static int ipw_is_valid_channel(struct ieee80211_device *, u8);\n+static int ipw_channel_to_index(struct ieee80211_device *, u8);\n+static u8 ipw_freq_to_channel(struct ieee80211_device *, u32);\n+static int ipw_set_geo(struct ieee80211_device *, const struct ieee80211_geo *);\n+static const struct ieee80211_geo *ipw_get_geo(struct ieee80211_device *);\n \n static int snprint_line(char *buf, size_t count,\n \t\t\tconst u8 * data, u32 len, u32 ofs)\n@@ -1596,7 +1602,7 @@\n \t\t\tbreak;\n \t\t}\n \n-\t\tif (ieee80211_is_valid_channel(priv->ieee, channel))\n+\t\tif (ipw_is_valid_channel(priv->ieee, channel))\n \t\t\tpriv->speed_scan[pos++] = channel;\n \t\telse\n \t\t\tIPW_WARNING(\"Skipping invalid channel request: %d\\n\",\n@@ -2194,7 +2200,7 @@\n \n static int ipw_set_tx_power(struct ipw_priv *priv)\n {\n-\tconst struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);\n+\tconst struct ieee80211_geo *geo = ipw_get_geo(priv->ieee);\n \tstruct ipw_tx_power tx_power;\n \ts8 max_power;\n \tint i;\n@@ -5503,6 +5509,15 @@\n \t\treturn 0;\n \t}\n \n+\t\/* Filter out invalid channel in current GEO *\/\n+\tif (!ipw_is_valid_channel(priv->ieee, network->channel)) {\n+\t\tIPW_DEBUG_ASSOC(\"Network '%s (\" MAC_FMT \")' excluded \"\n+\t\t\t\t\"because of invalid channel in current GEO\\n\",\n+\t\t\t\tescape_essid(network->ssid, network->ssid_len),\n+\t\t\t\tMAC_ARG(network->bssid));\n+\t\treturn 0;\n+\t}\n+\n \t\/* Ensure that the rates supported by the driver are compatible with\n \t * this AP, including verification of basic rates (mandatory) *\/\n \tif (!ipw_compatible_rates(priv, network, &rates)) {\n@@ -5540,7 +5555,7 @@\n static void ipw_adhoc_create(struct ipw_priv *priv,\n \t\t\t struct ieee80211_network *network)\n {\n-\tconst struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);\n+\tconst struct ieee80211_geo *geo = ipw_get_geo(priv->ieee);\n \tint i;\n \n \t\/*\n@@ -5555,10 +5570,10 @@\n \t * FW fatal error.\n \t *\n \t *\/\n-\tswitch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) {\n+\tswitch (ipw_is_valid_channel(priv->ieee, priv->channel)) {\n \tcase IEEE80211_52GHZ_BAND:\n \t\tnetwork->mode = IEEE_A;\n-\t\ti = ieee80211_channel_to_index(priv->ieee, priv->channel);\n+\t\ti = ipw_channel_to_index(priv->ieee, priv->channel);\n \t\tif (i == -1)\n \t\t\tBUG();\n \t\tif (geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY) {\n@@ -5572,6 +5587,13 @@\n \t\t\tnetwork->mode = IEEE_G;\n \t\telse\n \t\t\tnetwork->mode = IEEE_B;\n+\t\ti = ipw_channel_to_index(priv->ieee, priv->channel);\n+\t\tif (i == -1)\n+\t\t\tBUG();\n+\t\tif (geo->bg[i].flags & IEEE80211_CH_PASSIVE_ONLY) {\n+\t\t\tIPW_WARNING(\"Overriding invalid channel\\n\");\n+\t\t\tpriv->channel = geo->bg[0].channel;\n+\t\t}\n \t\tbreak;\n \n \tdefault:\n@@ -5899,7 +5921,7 @@\n \tconst struct ieee80211_geo *geo;\n \tint i;\n \n-\tgeo = ieee80211_get_geo(priv->ieee);\n+\tgeo = ipw_get_geo(priv->ieee);\n \n \tif (priv->ieee->freq_band & IEEE80211_52GHZ_BAND) {\n \t\tint start = channel_index;\n@@ -5909,7 +5931,11 @@\n \t\t\t\tcontinue;\n \t\t\tchannel_index++;\n \t\t\tscan->channels_list[channel_index] = geo->a[i].channel;\n-\t\t\tipw_set_scan_type(scan, channel_index, scan_type);\n+\t\t\tipw_set_scan_type(scan, channel_index,\n+\t\t\t\t\t geo->a[i].\n+\t\t\t\t\t flags & IEEE80211_CH_PASSIVE_ONLY ?\n+\t\t\t\t\t IPW_SCAN_PASSIVE_FULL_DWELL_SCAN :\n+\t\t\t\t\t scan_type);\n \t\t}\n \n \t\tif (start != channel_index) {\n@@ -5922,6 +5948,7 @@\n \tif (priv->ieee->freq_band & IEEE80211_24GHZ_BAND) {\n \t\tint start = channel_index;\n \t\tif (priv->config & CFG_SPEED_SCAN) {\n+\t\t\tint index;\n \t\t\tu8 channels[IEEE80211_24GHZ_CHANNELS] = {\n \t\t\t\t\/* nop out the list *\/\n \t\t\t\t[0] = 0\n@@ -5953,8 +5980,14 @@\n \t\t\t\tpriv->speed_scan_pos++;\n \t\t\t\tchannel_index++;\n \t\t\t\tscan->channels_list[channel_index] = channel;\n+\t\t\t\tindex =\n+\t\t\t\t ipw_channel_to_index(priv->ieee, channel);\n \t\t\t\tipw_set_scan_type(scan, channel_index,\n-\t\t\t\t\t\t scan_type);\n+\t\t\t\t\t\t geo->bg[index].\n+\t\t\t\t\t\t flags &\n+\t\t\t\t\t\t IEEE80211_CH_PASSIVE_ONLY ?\n+\t\t\t\t\t\t IPW_SCAN_PASSIVE_FULL_DWELL_SCAN\n+\t\t\t\t\t\t : scan_type);\n \t\t\t}\n \t\t} else {\n \t\t\tfor (i = 0; i < geo->bg_channels; i++) {\n@@ -5965,7 +5998,11 @@\n \t\t\t\tscan->channels_list[channel_index] =\n \t\t\t\t geo->bg[i].channel;\n \t\t\t\tipw_set_scan_type(scan, channel_index,\n-\t\t\t\t\t\t scan_type);\n+\t\t\t\t\t\t geo->bg[i].\n+\t\t\t\t\t\t flags &\n+\t\t\t\t\t\t IEEE80211_CH_PASSIVE_ONLY ?\n+\t\t\t\t\t\t IPW_SCAN_PASSIVE_FULL_DWELL_SCAN\n+\t\t\t\t\t\t : scan_type);\n \t\t\t}\n \t\t}\n \n@@ -6017,7 +6054,7 @@\n \n \tscan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] =\n \t cpu_to_le16(20);\n-\tscan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(20);\n+\tscan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120);\n \n \tscan.full_scan_index = cpu_to_le32(ieee80211_get_scans(priv->ieee));\n \n@@ -6026,7 +6063,7 @@\n \t\tu8 channel;\n \t\tu8 band = 0;\n \n-\t\tswitch (ieee80211_is_valid_channel(priv->ieee, priv->channel)) {\n+\t\tswitch (ipw_is_valid_channel(priv->ieee, priv->channel)) {\n \t\tcase IEEE80211_52GHZ_BAND:\n \t\t\tband = (u8) (IPW_A_MODE << 6) | 1;\n \t\t\tchannel = priv->channel;\n@@ -8401,10 +8438,11 @@\n \t\t\t union iwreq_data *wrqu, char *extra)\n {\n \tstruct ipw_priv *priv = ieee80211_priv(dev);\n-\tconst struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);\n+\tconst struct ieee80211_geo *geo = ipw_get_geo(priv->ieee);\n \tstruct iw_freq *fwrq = &wrqu->freq;\n \tint ret = 0, i;\n-\tu8 channel;\n+\tu8 channel, flags;\n+\tint band;\n \n \tif (fwrq->m == 0) {\n \t\tIPW_DEBUG_WX(\"SET Freq\/Channel -> any\\n\");\n@@ -8415,20 +8453,23 @@\n \t}\n \t\/* if setting by freq convert to channel *\/\n \tif (fwrq->e == 1) {\n-\t\tchannel = ieee80211_freq_to_channel(priv->ieee, fwrq->m);\n+\t\tchannel = ipw_freq_to_channel(priv->ieee, fwrq->m);\n \t\tif (channel == 0)\n \t\t\treturn -EINVAL;\n \t} else\n \t\tchannel = fwrq->m;\n \n-\tif (!ieee80211_is_valid_channel(priv->ieee, channel))\n+\tif (!(band = ipw_is_valid_channel(priv->ieee, channel)))\n \t\treturn -EINVAL;\n \n-\tif (priv->ieee->iw_mode == IW_MODE_ADHOC && priv->ieee->mode & IEEE_A) {\n-\t\ti = ieee80211_channel_to_index(priv->ieee, channel);\n+\tif (priv->ieee->iw_mode == IW_MODE_ADHOC) {\n+\t\ti = ipw_channel_to_index(priv->ieee, channel);\n \t\tif (i == -1)\n \t\t\treturn -EINVAL;\n-\t\tif (geo->a[i].flags & IEEE80211_CH_PASSIVE_ONLY) {\n+\n+\t\tflags = (band == IEEE80211_24GHZ_BAND) ?\n+\t\t geo->bg[i].flags : geo->a[i].flags;\n+\t\tif (flags & IEEE80211_CH_PASSIVE_ONLY) {\n \t\t\tIPW_DEBUG_WX(\"Invalid Ad-Hoc channel for 802.11a\\n\");\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -8546,7 +8587,7 @@\n {\n \tstruct ipw_priv *priv = ieee80211_priv(dev);\n \tstruct iw_range *range = (struct iw_range *)extra;\n-\tconst struct ieee80211_geo *geo = ieee80211_get_geo(priv->ieee);\n+\tconst struct ieee80211_geo *geo = ipw_get_geo(priv->ieee);\n \tint i = 0, j;\n \n \twrqu->data.length = sizeof(*range);\n@@ -9147,7 +9188,7 @@\n \n \tscan.dwell_time[IPW_SCAN_ACTIVE_BROADCAST_AND_DIRECT_SCAN] =\n \t cpu_to_le16(20);\n-\tscan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(20);\n+\tscan.dwell_time[IPW_SCAN_PASSIVE_FULL_DWELL_SCAN] = cpu_to_le16(120);\n \tscan.dwell_time[IPW_SCAN_ACTIVE_DIRECT_SCAN] = cpu_to_le16(20);\n \n \tscan.full_scan_index = cpu_to_le32(ieee80211_get_scans(priv->ieee));\n@@ -10775,6 +10816,96 @@\n \t }\n };\n \n+\/* GEO code borrowed from ieee80211_geo.c *\/\n+static int ipw_is_valid_channel(struct ieee80211_device *ieee, u8 channel)\n+{\n+\tint i;\n+\n+\t\/* Driver needs to initialize the geography map before using\n+\t * these helper functions *\/\n+\tBUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);\n+\n+\tif (ieee->freq_band & IEEE80211_24GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.bg_channels; i++)\n+\t\t\t\/* NOTE: If G mode is currently supported but\n+\t\t\t * this is a B only channel, we don't see it\n+\t\t\t * as valid. *\/\n+\t\t\tif ((ieee->geo.bg[i].channel == channel) &&\n+\t\t\t (!(ieee->mode & IEEE_G) ||\n+\t\t\t !(ieee->geo.bg[i].flags & IEEE80211_CH_B_ONLY)))\n+\t\t\t\treturn IEEE80211_24GHZ_BAND;\n+\n+\tif (ieee->freq_band & IEEE80211_52GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.a_channels; i++)\n+\t\t\tif (ieee->geo.a[i].channel == channel)\n+\t\t\t\treturn IEEE80211_52GHZ_BAND;\n+\n+\treturn 0;\n+}\n+\n+static int ipw_channel_to_index(struct ieee80211_device *ieee, u8 channel)\n+{\n+\tint i;\n+\n+\t\/* Driver needs to initialize the geography map before using\n+\t * these helper functions *\/\n+\tBUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);\n+\n+\tif (ieee->freq_band & IEEE80211_24GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.bg_channels; i++)\n+\t\t\tif (ieee->geo.bg[i].channel == channel)\n+\t\t\t\treturn i;\n+\n+\tif (ieee->freq_band & IEEE80211_52GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.a_channels; i++)\n+\t\t\tif (ieee->geo.a[i].channel == channel)\n+\t\t\t\treturn i;\n+\n+\treturn -1;\n+}\n+\n+static u8 ipw_freq_to_channel(struct ieee80211_device *ieee, u32 freq)\n+{\n+\tint i;\n+\n+\t\/* Driver needs to initialize the geography map before using\n+\t * these helper functions *\/\n+\tBUG_ON(ieee->geo.bg_channels == 0 && ieee->geo.a_channels == 0);\n+\n+\tfreq \/= 100000;\n+\n+\tif (ieee->freq_band & IEEE80211_24GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.bg_channels; i++)\n+\t\t\tif (ieee->geo.bg[i].freq == freq)\n+\t\t\t\treturn ieee->geo.bg[i].channel;\n+\n+\tif (ieee->freq_band & IEEE80211_52GHZ_BAND)\n+\t\tfor (i = 0; i < ieee->geo.a_channels; i++)\n+\t\t\tif (ieee->geo.a[i].freq == freq)\n+\t\t\t\treturn ieee->geo.a[i].channel;\n+\n+\treturn 0;\n+}\n+\n+static int ipw_set_geo(struct ieee80211_device *ieee,\n+\t\t const struct ieee80211_geo *geo)\n+{\n+\tmemcpy(ieee->geo.name, geo->name, 3);\n+\tieee->geo.name[3] = '\\0';\n+\tieee->geo.bg_channels = geo->bg_channels;\n+\tieee->geo.a_channels = geo->a_channels;\n+\tmemcpy(ieee->geo.bg, geo->bg, geo->bg_channels *\n+\t sizeof(struct ieee80211_channel));\n+\tmemcpy(ieee->geo.a, geo->a, ieee->geo.a_channels *\n+\t sizeof(struct ieee80211_channel));\n+\treturn 0;\n+}\n+\n+static const struct ieee80211_geo *ipw_get_geo(struct ieee80211_device *ieee)\n+{\n+\treturn &ieee->geo;\n+}\n+\n #define MAX_HW_RESTARTS 5\n static int ipw_up(struct ipw_priv *priv)\n {\n@@ -10816,7 +10947,7 @@\n \t\t}\n \t\tif (j == ARRAY_SIZE(ipw_geos))\n \t\t\tj = 0;\n-\t\tif (ieee80211_set_geo(priv->ieee, &ipw_geos[j])) {\n+\t\tif (ipw_set_geo(priv->ieee, &ipw_geos[j])) {\n \t\t\tIPW_WARNING(\"Could not set geography.\");\n \t\t\treturn 0;\n \t\t}\n"} {"commit":"c7c17423b9ea3c5559cfb480a00844f1df9eed06","subject":"[IA64] add platform check to snsc driver init","message":"[IA64] add platform check to snsc driver init\n\nAdd a platform check to the snsc driver init function, to prevent\nloading on non-sn2 systems.\n\nSigned-off-by: Greg Edwards <93694b1f832a5631715c1df8c820c23aeedec2ef@sgi.com>\nSigned-off-by: Tony Luck <e7984595ec0368ff920a7b3521dc7093683f6f26@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/snsc.c\n+++ drivers\/char\/snsc.c\n@@ -374,7 +374,12 @@\n \tstruct sysctl_data_s *scd;\n \tvoid *salbuf;\n \tdev_t first_dev, dev;\n-\tnasid_t event_nasid = ia64_sn_get_console_nasid();\n+\tnasid_t event_nasid;\n+\n+\tif (!ia64_platform_is(\"sn2\"))\n+\t\treturn -ENODEV;\n+\n+\tevent_nasid = ia64_sn_get_console_nasid();\n \n \tif (alloc_chrdev_region(&first_dev, 0, num_cnodes,\n \t\t\t\tSYSCTL_BASENAME) < 0) {\n"} {"commit":"62fe3e73a22b9fbdc11a4ec9b62de2234187b612","subject":"Teste roteador","message":"Teste roteador\n","repos":"victor-accarini\/mc723-p3,victor-accarini\/mc723-p3,victor-accarini\/mc723-p3,victor-accarini\/mc723-p3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- is\/roteador\/roteador.h\n+++ is\/roteador\/roteador.h\n@@ -56,6 +56,7 @@\n req_arrumada = arruma(request, 0);\n response = LOCK_port->transport(*req_arrumada);\n } else {\n+ errs() << \"Request para o Fatorial\\n\";\n req_arrumada = arruma(request, request.addr - 5242888);\n response = F_port->transport(*req_arrumada);\n }\n"} {"commit":"cf17c83c4ac2de13a7b158c1c27fffb30ce109c3","subject":"ASoC: wm_adsp: Use asynchronous I\/O to write firmware and coefficients","message":"ASoC: wm_adsp: Use asynchronous I\/O to write firmware and coefficients\n\nAllow the regmap API to use asynchronous I\/O where supported to minimise\nthe delay between transfers, reducing firmware download times.\n\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"efdc59b43edbe61dc850e91d411ad27beb633ec3","subject":"improve grid rendering","message":"improve grid rendering\n","repos":"hodefoting\/fontile,hodefoting\/fontile,hodefoting\/fontile","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- fontile.c\n+++ fontile.c\n@@ -251,7 +251,7 @@\n int x, y;\n \n x0 -= 1;\n- y0 -= 1;\n+ y0 -= 2;\n \n for (x = x0; x < x1; x ++)\n {\n@@ -296,7 +296,7 @@\n else\n g_string_append_printf (str,\n \" <component base=\\\"%s\\\" xOffset=\\\"%d\\\" yOffset=\\\"%d\\\"\/>\\n\",\n- name, x * SCALE + xtrim * SCALE, y * SCALE); \n+ name, (int)(x * SCALE + xtrim * SCALE), y * SCALE); \n }\n \n void gen_glyph (int glyph_no, int x0, int y0, int x1, int y1)\n@@ -311,6 +311,8 @@\n return;\n char name[8];\n sprintf (name, \"%04X\", uglyphs[glyph_no]);\n+\n+ fprintf (stderr, \"%s: %i %i\\n\", name, y1 - y0 - 1, glyph_height);\n \n if (y1 - y0 - 1> glyph_height)\n {\n"} {"commit":"173223aa62519033e547937c692f5540f59d9025","subject":"vcs-svn: rename check_overflow arguments for clarity","message":"vcs-svn: rename check_overflow arguments for clarity\n\nCode using the argument names a and b just doesn't look right (not\nsure why!). Use more explicit names \"offset\" and \"len\" to make their\ntype and meaning clearer.\n\nAlso rename check_overflow() to check_offset_overflow() to clarify\nthat we are making sure that \"len\" bytes beyond \"offset\" still fits\nthe type to represent an offset.\n\nSigned-off-by: Jonathan Nieder <b57189c5f2fd5b3daf3350a77fde90def1080fa5@gmail.com>\nSigned-off-by: Junio C Hamano <a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- vcs-svn\/sliding_window.c\n+++ vcs-svn\/sliding_window.c\n@@ -31,15 +31,15 @@\n \treturn 0;\n }\n \n-static int check_overflow(off_t a, size_t b)\n+static int check_offset_overflow(off_t offset, size_t len)\n {\n-\tif (b > maximum_signed_value_of_type(off_t))\n+\tif (len > maximum_signed_value_of_type(off_t))\n \t\treturn error(\"unrepresentable length in delta: \"\n-\t\t\t\t\"%\"PRIuMAX\" > OFF_MAX\", (uintmax_t) b);\n-\tif (signed_add_overflows(a, (off_t) b))\n+\t\t\t\t\"%\"PRIuMAX\" > OFF_MAX\", (uintmax_t) len);\n+\tif (signed_add_overflows(offset, (off_t) len))\n \t\treturn error(\"unrepresentable offset in delta: \"\n \t\t\t\t\"%\"PRIuMAX\" + %\"PRIuMAX\" > OFF_MAX\",\n-\t\t\t\t(uintmax_t) a, (uintmax_t) b);\n+\t\t\t\t(uintmax_t) offset, (uintmax_t) len);\n \treturn 0;\n }\n \n@@ -48,9 +48,9 @@\n \toff_t file_offset;\n \tassert(view);\n \tassert(view->width <= view->buf.len);\n-\tassert(!check_overflow(view->off, view->buf.len));\n+\tassert(!check_offset_overflow(view->off, view->buf.len));\n \n-\tif (check_overflow(off, width))\n+\tif (check_offset_overflow(off, width))\n \t\treturn -1;\n \tif (off < view->off || off + width < view->off + view->width)\n \t\treturn error(\"invalid delta: window slides left\");\n"} {"commit":"d2577c4393befab2b825d7eb39120b9e8c8d14a8","subject":"Tiny comment fix.","message":"Tiny comment fix.\n","repos":"googlei18n\/language-resources,google\/language-resources,google\/language-resources,google\/language-resources,googlei18n\/language-resources,googlei18n\/language-resources,google\/language-resources,google\/language-resources,google\/language-resources,googlei18n\/language-resources,googlei18n\/language-resources,googlei18n\/language-resources","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- festus\/arc.h\n+++ festus\/arc.h\n@@ -91,6 +91,6 @@\n StateId nextstate;\n };\n \n-} \/\/ namespace fst\n+} \/\/ namespace festus\n \n #endif \/\/ FESTUS_ARC_H__\n"} {"commit":"33e49fda9635f3daabf912a8781abde0de681fe6","subject":"Fix strict-warnings build","message":"Fix strict-warnings build\n\nThe i2d_SCT_LIST function is declared as __owur, therefore we need to check\nthe result or a --strict-warnings build will fail.\n\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fuzz\/ct.c\n+++ fuzz\/ct.c\n@@ -29,7 +29,9 @@\n SCT_LIST_print(scts, bio, 4, \"\\n\", NULL);\n BIO_free(bio);\n \n- i2d_SCT_LIST(scts, &der);\n+ if (i2d_SCT_LIST(scts, &der)) {\n+ \/* Silence unused result warning *\/\n+ }\n OPENSSL_free(der);\n \n SCT_LIST_free(scts);\n"} {"commit":"ec361538db71b2853608ec01c1f5044fbecbae8c","subject":"Add insertion sort implementation.","message":"Add insertion sort implementation.\n","repos":"laurocaetano\/introduction-to-algorithms,laurocaetano\/introduction-to-algorithms","returncode":1,"stderr":"error: pathspec 'ch-02\/insertion_sort.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- ch-02\/insertion_sort.c\n+++ ch-02\/insertion_sort.c\n@@ -0,0 +1,51 @@\n+#include <stdio.h>\n+\n+void setUnsortedArray(long *array, long size);\n+void printArray(long *array, long size);\n+void sort(long *array, long size);\n+\n+int\n+main() {\n+ long size = 10;\n+ long array[size];\n+\n+ setUnsortedArray(array, size);\n+ printf(\"Unsorted Array:\");\n+ printArray(array, size);\n+\n+ sort(array, size);\n+ printf(\"Sorted Array:\");\n+ printArray(array, size);\n+\n+ return 0;\n+}\n+\n+void sort(long *array, long size) {\n+ for(long j = 1; j < size; j++) {\n+ long key = array[j];\n+ long i = j - 1;\n+\n+ while (i >= 0 && array[i] > key) {\n+ array[i + 1] = array[i];\n+ i = i - 1;\n+ }\n+\n+ array[i + 1] = key;\n+ }\n+}\n+\n+void setUnsortedArray(long *array, long size) {\n+ for (long i = size; i > 0; i--) {\n+ array[size - i] = i;\n+ }\n+}\n+\n+void printArray(long *array, long size) {\n+ printf(\"\\n\");\n+\n+ for (long i = 0; i < size; i++) {\n+ printf(\"%ld \", array[i]);\n+ }\n+\n+ printf(\"\\n\");\n+}\n"} {"commit":"f516dbcd7df76d468be98c343bc22e86ab7207fc","subject":"[PATCH] ipw2200: Mask out the WEP_KEY command dump from debug log for security reason","message":"[PATCH] ipw2200: Mask out the WEP_KEY command dump from debug log for security reason\n\nSigned-off-by: Nick Kralevich <ac583d2edcbf8d8bdb8a945f4e51818824705eff@kralevich.com>\nSigned-off-by: Zhu Yi <c03a0e8263a89cd8dae38df2cca8d3f223dbdca7@intel.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/ipw2200.c\n+++ drivers\/net\/wireless\/ipw2200.c\n@@ -1953,7 +1953,14 @@\n \tIPW_DEBUG_HC(\"%s command (#%d) %d bytes: 0x%08X\\n\",\n \t\t get_cmd_string(cmd->cmd), cmd->cmd, cmd->len,\n \t\t priv->status);\n-\tprintk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);\n+\n+#ifndef DEBUG_CMD_WEP_KEY\n+\tif (cmd->cmd == IPW_CMD_WEP_KEY)\n+\t\tIPW_DEBUG_HC(\"WEP_KEY command masked out for secure.\\n\");\n+\telse\n+#endif\n+\t\tprintk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);\n+\n \n \trc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);\n \tif (rc) {\n"} {"commit":"c9392d80ae0762425314fbf1d9210f68da400e12","subject":"dmaengine: pl330: Remove unused client_data field form pl330_info","message":"dmaengine: pl330: Remove unused client_data field form pl330_info\n\nThe field is completely unused, remove it.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nSigned-off-by: Vinod Koul <5cf69c63beb17bf38d63aa0e923ee8256af0e205@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/dma\/pl330.c\n+++ drivers\/dma\/pl330.c\n@@ -290,8 +290,6 @@\n \tunsigned mcbufsz;\n \t\/* ioremap'ed address of PL330 registers. *\/\n \tvoid __iomem\t*base;\n-\t\/* Client can freely use it. *\/\n-\tvoid\t*client_data;\n \t\/* PL330 core data, Client must not touch it. *\/\n \tvoid\t*pl330_data;\n \t\/* Populated by the PL330 core driver during pl330_add *\/\n"} {"commit":"8361a1279f728770daa0d031f31af5cde9b148a9","subject":"Since this hack is only for MP3, it should be set to the correct value.","message":"Since this hack is only for MP3, it should be set to the correct value.\n\n","repos":"MaddTheSane\/perian,MaddTheSane\/perian,MaddTheSane\/perian,MaddTheSane\/perian,MaddTheSane\/perian,MaddTheSane\/perian","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ff_private.c\n+++ ff_private.c\n@@ -259,7 +259,7 @@\n \tif (!asbd.mFramesPerPacket)\n \t\tasbd.mFramesPerPacket = codec->frame_size;\n \tif (!asbd.mFramesPerPacket && !asbd.mBytesPerPacket && asbd.mFormatID == kAudioFormatMPEGLayer3) \/\/MP3 Decode is broken on some versions of Tiger and the AppleTV\n-\t\tasbd.mFramesPerPacket = 1;\n+\t\tasbd.mFramesPerPacket = 1152;\n \tasbd.mBitsPerChannel = codec->bits_per_coded_sample;\n \t\n \t\/\/ if we don't have mBytesPerPacket, we can't import as CBR. Probably should be VBR, and the codec\n"} {"commit":"554066dafe13a8145963a52f24eeadf4edf32ec8","subject":"isl_ilp.c: set_opt: perform intersection up front","message":"isl_ilp.c: set_opt: perform intersection up front\n\nThe original implementation postpones the intersection until\neach piece in the piecewise affine expression is examined,\nwhile the new implementation does it up front, avoiding\nthe need to carry around the extra domain.\nThe actual intersections performed in both cases are the same.\nThe only difference is that the results of the intersections need\nto be stored throughout the isl_pw_aff_opt_val call\nin the new implementation.\nHowever, it is not clear if this would ever be an issue in practice,\nespecially since there do not appear to be any calls\nto isl_union_set_min_multi_union_pw_aff (the only publicly\nexported caller of set_opt) in the wild.\n\nThe upside is that isl_pw_aff_opt_val can be reused in the next\ncommit to extract out an isl_union_pw_aff_opt_val, which in turn\nwill be used to implement isl_union_pw_aff_{min,max}_val, which\ndon't need the internal intersection.\n\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,PollyLabs\/isl,inducer\/isl-mirror,inducer\/isl-mirror,inducer\/isl-mirror,inducer\/isl-mirror,PollyLabs\/isl,Meinersbur\/isl,PollyLabs\/isl,Meinersbur\/isl,PollyLabs\/isl,PollyLabs\/isl,inducer\/isl-mirror,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_ilp.c\n+++ isl_ilp.c\n@@ -651,15 +651,13 @@\n \treturn NULL;\n }\n \n-\/* Internal data structure for isl_set_opt_pw_aff.\n+\/* Internal data structure for isl_pw_aff_opt_val.\n *\n * \"max\" is set if the maximum should be computed.\n- * \"set\" is the set over which the optimum should be computed.\n * \"res\" contains the current optimum and is initialized to NaN.\n *\/\n-struct isl_set_opt_data {\n+struct isl_pw_aff_opt_data {\n \tint max;\n-\tisl_set *set;\n \n \tisl_val *res;\n };\n@@ -670,10 +668,9 @@\n static isl_stat piece_opt(__isl_take isl_set *set, __isl_take isl_aff *aff,\n \tvoid *user)\n {\n-\tstruct isl_set_opt_data *data = user;\n+\tstruct isl_pw_aff_opt_data *data = user;\n \tisl_val *opt;\n \n-\tset = isl_set_intersect(set, isl_set_copy(data->set));\n \topt = isl_set_opt_val(set, data->max, aff);\n \tisl_set_free(set);\n \tisl_aff_free(aff);\n@@ -686,23 +683,24 @@\n }\n \n \/* Return the minimum (maximum if \"max\" is set) of the integer piecewise affine\n- * expression \"obj\" over the points in \"set\".\n+ * expression \"pa\" over its definition domain.\n *\n * Return infinity or negative infinity if the optimal value is unbounded and\n- * NaN if the intersection of \"set\" with the domain of \"obj\" is empty.\n+ * NaN if the domain of \"pa\" is empty.\n *\n * Initialize the result to NaN and then update it for each of the pieces\n- * in \"obj\".\n- *\/\n-static __isl_give isl_val *isl_set_opt_pw_aff(__isl_keep isl_set *set, int max,\n-\t__isl_keep isl_pw_aff *obj)\n-{\n-\tstruct isl_set_opt_data data = { max, set };\n-\n-\tdata.res = isl_val_nan(isl_set_get_ctx(set));\n-\tif (isl_pw_aff_foreach_piece(obj, &piece_opt, &data) < 0)\n-\t\treturn isl_val_free(data.res);\n-\n+ * in \"pa\".\n+ *\/\n+static __isl_give isl_val *isl_pw_aff_opt_val(__isl_take isl_pw_aff *pa,\n+\tint max)\n+{\n+\tstruct isl_pw_aff_opt_data data = { max };\n+\n+\tdata.res = isl_val_nan(isl_pw_aff_get_ctx(pa));\n+\tif (isl_pw_aff_foreach_piece(pa, &piece_opt, &data) < 0)\n+\t\tdata.res = isl_val_free(data.res);\n+\n+\tisl_pw_aff_free(pa);\n \treturn data.res;\n }\n \n@@ -734,9 +732,8 @@\n \tspace = isl_space_from_domain(space);\n \tspace = isl_space_add_dims(space, isl_dim_out, 1);\n \tpa = isl_union_pw_aff_extract_pw_aff(data->obj, space);\n-\topt = isl_set_opt_pw_aff(set, data->max, pa);\n-\tisl_pw_aff_free(pa);\n-\tisl_set_free(set);\n+\tpa = isl_pw_aff_intersect_domain(pa, set);\n+\topt = isl_pw_aff_opt_val(pa, data->max);\n \n \tdata->res = val_opt(data->res, opt, data->max);\n \tif (!data->res)\n"} {"commit":"0dcead30dc31b8148932c4e33eec0ea5590ca064","subject":"Fix wring condition in liberror","message":"Fix wring condition in liberror\n","repos":"kureuil\/ftrace,kureuil\/ftrace,kureuil\/ftrace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- vendor\/error\/src\/error.c\n+++ vendor\/error\/src\/error.c\n@@ -5,7 +5,7 @@\n ** Login <kureuil@epitech.net>\n ** \n ** Started on Sat Apr 16 17:13:45 2016 Arch Kureuil\n-** Last update Sat Apr 16 17:25:42 2016 Arch Kureuil\n+** Last update Mon Apr 18 12:07:46 2016 Arch Kureuil\n *\/\n \n #include <stdlib.h>\n@@ -58,7 +58,7 @@\n int\n error_handle(const char *prefix)\n {\n- if (g_ctx != NULL)\n+ if (g_ctx == NULL)\n {\n if (fprintf(stderr, \"%s: %s\\n\", prefix, g_error) == -1)\n \treturn (-1);\n"} {"commit":"c30464f4f2cbc654278fa7ca80ebc091e87157f3","subject":"Fix fov_beam and fov_circle and their callbacks","message":"Fix fov_beam and fov_circle and their callbacks\n","repos":"fmoo\/python-libfov,fmoo\/python-libfov","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fov\/fov.c\n+++ fov\/fov.c\n@@ -57,38 +57,14 @@\n * Wrapper for fov_beam\n *\/\n static PyObject *\n-pyfov_beam(pyfov_SettingsObject *self, PyObject *args) {\n- void *map, *src;\n- int source_x, source_y;\n- unsigned radius;\n- struct map_wrapper wrap;\n-\n- if (!PyArg_ParseTuple(args, \"ooiiI\", &map, &src,\n- &source_x, &source_y, &radius))\n- return NULL;\n-\n- \/\/ Initialize wrap to pass as map instead of *map.\n- wrap.orig_map = map;\n- wrap.pyfov_settings = self;\n-\n- fov_beam(self->settings, wrap, src,\n- source_x, source_y, radius);\n-\n- Py_INCREF(Py_None);\n- return Py_None;\n-}\n-\n-\/**\n- * Wrapper for fov_circle\n- *\/\n-static PyObject *\n-pyfov_circle(pyfov_SettingsObject *self, PyObject *args) {\n+pyfov_beam(PyObject *self, PyObject *args) {\n+ pyfov_SettingsObject *settings = (pyfov_SettingsObject *)self;\n void *map, *src;\n int source_x, source_y;\n unsigned radius;\n fov_direction_type direction;\n float angle;\n- struct map_wrapper wrap;\n+ map_wrapper wrap;\n \n if (!PyArg_ParseTuple(args, \"ooiiIIf\", &map, &src,\n &source_x, &source_y, &radius,\n@@ -97,11 +73,37 @@\n \n \/\/ Initialize wrap to pass as map instead of *map.\n wrap.orig_map = map;\n- wrap.pyfov_settings = self;\n-\n- fov_circle(self->settings, wrap, src,\n- source_x, source_y, radius,\n- direction, angle);\n+ wrap.settings = settings;\n+\n+ fov_beam(&settings->settings, &wrap, src,\n+ source_x, source_y, radius,\n+ direction, angle);\n+\n+ Py_INCREF(Py_None);\n+ return Py_None;\n+}\n+\n+\/**\n+ * Wrapper for fov_circle\n+ *\/\n+static PyObject *\n+pyfov_circle(PyObject *self, PyObject *args) {\n+ pyfov_SettingsObject *settings = (pyfov_SettingsObject *)self;\n+ void *map, *src;\n+ int source_x, source_y;\n+ unsigned radius;\n+ map_wrapper wrap;\n+\n+ if (!PyArg_ParseTuple(args, \"ooiiI\", &map, &src,\n+ &source_x, &source_y, &radius))\n+ return NULL;\n+\n+ \/\/ Initialize wrap to pass as map instead of *map.\n+ wrap.orig_map = map;\n+ wrap.settings = settings;\n+\n+ fov_circle(&settings->settings, &wrap, src,\n+ source_x, source_y, radius);\n \n Py_INCREF(Py_None);\n return Py_None;\n@@ -147,25 +149,59 @@\n \n static bool\n _pyfov_opacity_test_function(void *map, int x, int y) {\n+ PyObject *arglist;\n+ PyObject *result;\n map_wrapper *wrap = (map_wrapper *)map;\n-\n- \/\/ TODO call wrap->settings->opacity_test_function()\n- \/\/ with (wrap->orig_map, x, y) as args\n- return false;\n+ bool test_func_result;\n+\n+ \/\/ Pack up the C return values to python objects\n+ arglist = Py_BuildValue(\"(Oii)\", (PyObject *)wrap->orig_map, x, y);\n+ result = PyObject_CallObject(wrap->settings->opacity_test_function,\n+ arglist);\n+\n+ \/\/ decref the O arguments since py_BuildValue() increments refs on these\n+ Py_DECREF((PyObject *)wrap->orig_map);\n+ Py_DECREF(arglist);\n+\n+ \/\/ If the callback threw an exception, we trace back through the C code...\n+ \/\/ We should really stop the execution of additional callbacks, but I'm not\n+ \/\/ sure if this can be done without doing something super gnarly with the\n+ \/\/ raw C settings object.\n+ if (result == NULL)\n+ return false;\n+\n+ test_func_result = (bool)PyInt_AsLong(result);\n+ Py_DECREF(result);\n+\n+ return test_func_result;\n }\n \n static void\n _pyfov_apply_lighting_function(void *map, int x, int y, int dx, int dy,\n void *src) {\n+ PyObject *arglist;\n+ PyObject *result;\n map_wrapper *wrap = (map_wrapper *)map;\n \n- \/\/ fov_circle and fov_beam are called with python objects instead of raw\n- \/\/ c pointers. We'll cast the void * to a PyObject * before injvoking the\n- \/\/ callback\n+ \/\/ Pack up the C return values to python objects\n+ arglist = Py_BuildValue(\"(OiiiiO)\", (PyObject *)wrap->orig_map, x, y,\n+ dx, dy, (PyObject *)src);\n+ result = PyObject_CallObject(wrap->settings->apply_lighting_function,\n+ arglist);\n \n- \/\/ TODO call wrap->settings->apply_lighting_function with\n- \/\/ (wrap->orig_map, x, y, dx, dy, src) as args\n- \/\/\n+ \/\/ decref the O arguments since py_BuildValue() increments refs on these\n+ Py_DECREF((PyObject *)wrap->orig_map);\n+ Py_DECREF((PyObject *)src);\n+ Py_DECREF(arglist);\n+\n+ \/\/ If the callback threw an exception, we trace back through the C code...\n+ \/\/ We should really stop the execution of additional callbacks, but I'm not\n+ \/\/ sure if this can be done without doing something super gnarly with the\n+ \/\/ raw C settings object.\n+ if (result == NULL)\n+ return;\n+\n+ Py_DECREF(result);\n }\n \n static PyMethodDef FovModuleMethods[];\n"} {"commit":"f0d396fce7721cdf6856dbb0f7bc11f37c6ff165","subject":"initial shell for exercise4-1.c","message":"initial shell for exercise4-1.c\n","repos":"nathanhicks\/KRC","returncode":1,"stderr":"error: pathspec 'chapter4\/exercise4-1.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- chapter4\/exercise4-1.c\n+++ chapter4\/exercise4-1.c\n@@ -0,0 +1,19 @@\n+\/* Exercise 4-1. Write the function strrindex(s,t), which returns the position\n+ * of the rightmost occurrence of t in s, or -1 if there is none.\n+ *\/\n+#include<stdio.h>\n+#include<string.h>\n+\n+int strrindex(char s[], char t[]);\n+\n+int main(void)\n+{\n+\n+ return 0;\n+}\n+\n+int strrindex(char s[],char t[])\n+{\n+\n+ return 0;\n+}\n"} {"commit":"c235a1f72cb77fb903d6fd17cce7cf0f76498531","subject":"Added tmpfile name get and comment placeholders","message":"Added tmpfile name get and comment placeholders\n","repos":"afein\/pzcc,afein\/pzcc,afein\/pzcc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- general.c\n+++ general.c\n@@ -46,8 +46,23 @@\n \n struct options_t our_options = { .in_file = NULL, .output_type = OUT_NONE, .output_is_stdout = false, .output_filename = NULL, .opt_flag = 0 };\n \n+\/\/IR dump method.\n+static void dump_ir (char *outfile) {\n+\tif (our_options.output_is_stdout == false) {\n+\t\tchar *err_msg = NULL;\n+\t\tif (LLVMPrintModuleToFile(module, outfile, &err_msg)) {\n+\t\t\tmy_error(ERR_LV_INTERN, \"LLVM module not dumped correctly: %s\", err_msg);\n+\t\t\tLLVMDisposeMessage(err_msg);\n+\t\t}\n+\t} else {\n+\t\tLLVMDumpModule(module);\n+\t}\n+}\n+\n \/\/Entry point.\n int main (int argc, char **argv) {\n+\tchar tmp_f[L_tmpnam];\n+\tint ret = 0;\n \n \t\/\/Parse command-line options.\n \tparse_term_options(argc, argv);\n@@ -72,25 +87,22 @@\n \n \tif (our_options.opt_flag == true) {\n \t\t\/\/...\n+\t\t\/\/Create command-line call for opt and its arguments.\n fprintf(stderr, \"TODO: Must implement optimizations\\n\");\n \t\t\/\/...\n \t}\n \n \tswitch (our_options.output_type) {\n \t\tcase OUT_IR:\n-\/\/*\n-\t\t\tif (our_options.output_is_stdout == false) {\n-\t\t\t\tchar *err_msg = NULL;\n-\t\t\t\tif (LLVMPrintModuleToFile(module, our_options.output_filename, &err_msg)) {\n-\t\t\t\t\tmy_error(ERR_LV_INTERN, \"LLVM module not dumped correctly: %s\", err_msg);\n-\t\t\t\t\tLLVMDisposeMessage(err_msg);\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\tLLVMDumpModule(module);\n-\t\t\t}\n-\/\/*\/\n+\t\t\tdump_ir(our_options.output_filename);\n \t\t\tbreak;\n \t\tcase OUT_ASM:\n+\t\t\tif (tmpnam(tmp_f) == NULL) {\n+\t\t\t\tmy_error(ERR_LV_ERR, \"Could not open temporary file\");\n+\t\t\t\tgoto err_end;\n+\t\t\t}\n+fprintf(stderr, \"TMPNAME is %s\\n\", tmp_f);\n+\t\t\t\/\/Create command-line call for llc and its arguments.\n \t\t\t\/\/...\n fprintf(stderr, \"TODO: Must implement assembly output\\n\");\n \t\t\t\/\/...\n@@ -110,5 +122,9 @@\n \n \tprintf(\"Parsing Complete\\n\");\n \n-\treturn 0;\n+\tgoto ntm_end;\n+err_end:\n+\tret = 1;\n+nrm_end:\n+\treturn ret;\n }\n"} {"commit":"99a79565e6db676bca8c7aeddd9fec44e730965e","subject":"power: ds2782_battery: Simplify the PM hooks","message":"power: ds2782_battery: Simplify the PM hooks\n\nThe SIMPLE_DEV_PM_OPS() macro already takes care of the CONFIG_PM_SLEEP=n case,\nso we can simplify the code a little bit.\n\nSigned-off-by: Fabio Estevam <679188261afeb60eb822cd934fd7b46a48ddd743@freescale.com>\nSigned-off-by: Sebastian Reichel <1ea78bda3cb6d36efdb8fc89aad6555e21b4887e@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/power\/ds2782_battery.c\n+++ drivers\/power\/ds2782_battery.c\n@@ -351,13 +351,9 @@\n \tschedule_delayed_work(&info->bat_work, DS278x_DELAY);\n \treturn 0;\n }\n+#endif \/* CONFIG_PM_SLEEP *\/\n \n static SIMPLE_DEV_PM_OPS(ds278x_battery_pm_ops, ds278x_suspend, ds278x_resume);\n-#define DS278X_BATTERY_PM_OPS (&ds278x_battery_pm_ops)\n-\n-#else\n-#define DS278X_BATTERY_PM_OPS NULL\n-#endif \/* CONFIG_PM_SLEEP *\/\n \n enum ds278x_num_id {\n \tDS2782 = 0,\n@@ -460,7 +456,7 @@\n static struct i2c_driver ds278x_battery_driver = {\n \t.driver \t= {\n \t\t.name\t= \"ds2782-battery\",\n-\t\t.pm\t= DS278X_BATTERY_PM_OPS,\n+\t\t.pm\t= &ds278x_battery_pm_ops,\n \t},\n \t.probe\t\t= ds278x_battery_probe,\n \t.remove\t\t= ds278x_battery_remove,\n"} {"commit":"f15b3fbf6a351007bd07cef497cc86b97c3a0c0e","subject":"drivers\/nble: Take advantage of the new net_buf_pull_u8() helper","message":"drivers\/nble: Take advantage of the new net_buf_pull_u8() helper\n\nChange-Id: Ia1c90c178b385b5bdb2e60a597810aa296c4da3e\nSigned-off-by: Johan Hedberg <628991c7b0a19c384f9b99c21ec330ce952bb838@intel.com>\n","repos":"runchip\/zephyr-cc3200,bboozzoo\/zephyr,holtmann\/zephyr,galak\/zephyr,rsalveti\/zephyr,coldnew\/zephyr-project-fork,nashif\/zephyr,GiulianoFranchetto\/zephyr,sharronliu\/zephyr,bboozzoo\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,explora26\/zephyr,finikorg\/zephyr,mirzak\/zephyr-os,mirzak\/zephyr-os,aceofall\/zephyr-iotos,32bitmicro\/zephyr,galak\/zephyr,nashif\/zephyr,kraj\/zephyr,finikorg\/zephyr,galak\/zephyr,kraj\/zephyr,kraj\/zephyr,mirzak\/zephyr-os,bigdinotech\/zephyr,pklazy\/zephyr,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,erwango\/zephyr,rsalveti\/zephyr,holtmann\/zephyr,mbolivar\/zephyr,ldts\/zephyr,punitvara\/zephyr,pklazy\/zephyr,tidyjiang8\/zephyr-doc,sharronliu\/zephyr,fbsder\/zephyr,fractalclone\/zephyr-riscv,zephyrproject-rtos\/zephyr,rsalveti\/zephyr,mirzak\/zephyr-os,punitvara\/zephyr,tidyjiang8\/zephyr-doc,aceofall\/zephyr-iotos,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,explora26\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,erwango\/zephyr,rsalveti\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,sharronliu\/zephyr,nashif\/zephyr,fbsder\/zephyr,bboozzoo\/zephyr,pklazy\/zephyr,coldnew\/zephyr-project-fork,zephyriot\/zephyr,coldnew\/zephyr-project-fork,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,punitvara\/zephyr,pklazy\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,fbsder\/zephyr,galak\/zephyr,mbolivar\/zephyr,tidyjiang8\/zephyr-doc,tidyjiang8\/zephyr-doc,Vudentz\/zephyr,runchip\/zephyr-cc3200,bboozzoo\/zephyr,galak\/zephyr,zephyriot\/zephyr,ldts\/zephyr,fbsder\/zephyr,zephyriot\/zephyr,runchip\/zephyr-cc3220,mirzak\/zephyr-os,holtmann\/zephyr,runchip\/zephyr-cc3220,ldts\/zephyr,fractalclone\/zephyr-riscv,fractalclone\/zephyr-riscv,nashif\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,fractalclone\/zephyr-riscv,explora26\/zephyr,32bitmicro\/zephyr,32bitmicro\/zephyr,aceofall\/zephyr-iotos,zephyrproject-rtos\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3200,pklazy\/zephyr,explora26\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,coldnew\/zephyr-project-fork,zephyriot\/zephyr,sharronliu\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,kraj\/zephyr,mbolivar\/zephyr,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3220,erwango\/zephyr,aceofall\/zephyr-iotos,punitvara\/zephyr,holtmann\/zephyr,fbsder\/zephyr,Vudentz\/zephyr,nashif\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3200,bboozzoo\/zephyr,runchip\/zephyr-cc3220,kraj\/zephyr,bigdinotech\/zephyr,holtmann\/zephyr,32bitmicro\/zephyr,32bitmicro\/zephyr,coldnew\/zephyr-project-fork,Vudentz\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3220,punitvara\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/nble\/uart.c\n+++ drivers\/nble\/uart.c\n@@ -111,8 +111,7 @@\n \thdr->src_cpu_id = 0;\n \n \twhile (buf->len) {\n-\t\tuart_poll_out(nble_dev, buf->data[0]);\n-\t\tnet_buf_pull(buf, 1);\n+\t\tuart_poll_out(nble_dev, net_buf_pull_u8(buf));\n \t}\n \n \tnet_buf_unref(buf);\n"} {"commit":"0f874bcc590759b70db128d85d4609df65f1981e","subject":"isl_*_eliminate: update comments to reflect recent change","message":"isl_*_eliminate: update comments to reflect recent change\n\nIn particular, since baf22b7 (isl_*_eliminate: perform integer elimination,\nTue Apr 17 12:29:41 2012 +0200), the elimination is no longer performed\nusing Fourier-Motzkin (unless the input is marked rational).\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"epowers\/isl,nicolasvasilache\/isl,UBERTC\/isl,Distrotech\/isl,PollyLabs\/isl,Distrotech\/isl,evaautomation\/isl,inducer\/isl-mirror,jleben\/isl,simbuerg\/isl,Distrotech\/isl,KangDroidSMProject\/ISL,jleben\/isl,pierrotdelalune\/isl,evaautomation\/isl,jleben\/isl,abduld\/isl,KangDroidSMProject\/ISL,pierrotdelalune\/isl,nicolasvasilache\/isl,jleben\/isl,cfx-next\/toolchain_isl-upstream,BenzoSM\/isl,crossbuild\/isl,PollyLabs\/isl,serge-sans-paille\/isl,crossbuild\/isl,nicolasvasilache\/isl,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL,SaberMod\/isl-current,KangDroidSMProject\/ISL,Meinersbur\/isl,tobig\/isl,Meinersbur\/isl,crossbuild\/isl,serge-sans-paille\/isl,epowers\/isl,SaberMod\/isl-current,epowers\/isl,simbuerg\/isl,simbuerg\/isl,VanirLLVM\/toolchain_isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,inducer\/isl-mirror,SaberMod\/isl-current,pierrotdelalune\/isl,VanirLLVM\/toolchain_isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,VanirLLVM\/toolchain_isl,abduld\/isl,UBERTC\/isl,KangDroidSMProject\/ISL,BenzoSM\/isl,BobSaget-Mod\/libisl,abduld\/isl,tobig\/isl,serge-sans-paille\/isl,serge-sans-paille\/isl,Distrotech\/isl,BenzoSM\/isl,cfx-next\/toolchain_isl-upstream,epowers\/isl,evaautomation\/isl,BenzoSM\/isl,simbuerg\/isl,nicolasvasilache\/isl,UBERTC\/isl,jleben\/isl,evaautomation\/isl,serge-sans-paille\/isl,abduld\/isl,SaberMod\/isl-current,BobSaget-Mod\/libisl,PollyLabs\/isl,UBERTC\/isl,Meinersbur\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,tobig\/isl,simbuerg\/isl,VanirLLVM\/toolchain_isl,inducer\/isl-mirror,Meinersbur\/isl,BobSaget-Mod\/libisl,BenzoSM\/isl,epowers\/isl,inducer\/isl-mirror,PollyLabs\/isl,cfx-next\/toolchain_isl-upstream,tobig\/isl,pierrotdelalune\/isl,pierrotdelalune\/isl,cfx-next\/toolchain_isl-upstream,crossbuild\/isl,Distrotech\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -1594,8 +1594,8 @@\n }\n \n \/* Eliminate the specified n dimensions starting at first from the\n- * constraints using Fourier-Motzkin. The dimensions themselves\n- * are not removed.\n+ * constraints, without removing the dimensions from the space.\n+ * If the set is rational, the dimensions are eliminated using Fourier-Motzkin.\n *\/\n __isl_give isl_map *isl_map_eliminate(__isl_take isl_map *map,\n \tenum isl_dim_type type, unsigned first, unsigned n)\n@@ -1623,8 +1623,8 @@\n }\n \n \/* Eliminate the specified n dimensions starting at first from the\n- * constraints using Fourier-Motzkin. The dimensions themselves\n- * are not removed.\n+ * constraints, without removing the dimensions from the space.\n+ * If the set is rational, the dimensions are eliminated using Fourier-Motzkin.\n *\/\n __isl_give isl_set *isl_set_eliminate(__isl_take isl_set *set,\n \tenum isl_dim_type type, unsigned first, unsigned n)\n@@ -1633,8 +1633,8 @@\n }\n \n \/* Eliminate the specified n dimensions starting at first from the\n- * constraints using Fourier-Motzkin. The dimensions themselves\n- * are not removed.\n+ * constraints, without removing the dimensions from the space.\n+ * If the set is rational, the dimensions are eliminated using Fourier-Motzkin.\n *\/\n __isl_give isl_set *isl_set_eliminate_dims(__isl_take isl_set *set,\n \tunsigned first, unsigned n)\n"} {"commit":"b3770cd6dcab590e703d911646fce715d1b71d8c","subject":"Kraken: do not catch dying worker","message":"Kraken: do not catch dying worker\n\nwe stop the service, it's useless to catch the dying worker, the rest\nwill folow quickly\n","repos":"antoine-de\/navitia,TeXitoi\/navitia,VincentCATILLON\/navitia,fueghan\/navitia,pbougue\/navitia,kadhikari\/navitia,antoine-de\/navitia,lrocheWB\/navitia,fueghan\/navitia,lrocheWB\/navitia,TeXitoi\/navitia,antoine-de\/navitia,Tisseo\/navitia,lrocheWB\/navitia,datanel\/navitia,djludo\/navitia,djludo\/navitia,is06\/navitia,xlqian\/navitia,antoine-de\/navitia,ballouche\/navitia,datanel\/navitia,stifoon\/navitia,pbougue\/navitia,francois-vincent\/navitia,xlqian\/navitia,patochectp\/navitia,francois-vincent\/navitia,is06\/navitia,CanalTP\/navitia,djludo\/navitia,thiphariel\/navitia,prhod\/navitia,TeXitoi\/navitia,is06\/navitia,stifoon\/navitia,ballouche\/navitia,kinnou02\/navitia,stifoon\/navitia,datanel\/navitia,patochectp\/navitia,fueghan\/navitia,kadhikari\/navitia,ballouche\/navitia,prhod\/navitia,patochectp\/navitia,francois-vincent\/navitia,thiphariel\/navitia,pbougue\/navitia,stifoon\/navitia,kadhikari\/navitia,fueghan\/navitia,VincentCATILLON\/navitia,CanalTP\/navitia,thiphariel\/navitia,TeXitoi\/navitia,thiphariel\/navitia,pbougue\/navitia,frodrigo\/navitia,xlqian\/navitia,frodrigo\/navitia,kinnou02\/navitia,kinnou02\/navitia,ballouche\/navitia,Tisseo\/navitia,VincentCATILLON\/navitia,kinnou02\/navitia,is06\/navitia,frodrigo\/navitia,CanalTP\/navitia,CanalTP\/navitia,frodrigo\/navitia,kadhikari\/navitia,patochectp\/navitia,xlqian\/navitia,Tisseo\/navitia,Tisseo\/navitia,prhod\/navitia,xlqian\/navitia,VincentCATILLON\/navitia,djludo\/navitia,CanalTP\/navitia,datanel\/navitia,lrocheWB\/navitia,francois-vincent\/navitia,prhod\/navitia,Tisseo\/navitia","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/kraken\/kraken_zmq.h\n+++ source\/kraken\/kraken_zmq.h\n@@ -50,62 +50,59 @@\n namespace pt = boost::posix_time;\n void doWork(zmq::context_t & context, DataManager<navitia::type::Data>& data_manager, navitia::kraken::Configuration conf) {\n auto logger = log4cplus::Logger::getInstance(\"worker\");\n- try{\n- zmq::socket_t socket (context, ZMQ_REP);\n- socket.connect (\"inproc:\/\/workers\");\n- bool run = true;\n- navitia::Worker w(data_manager, conf);\n- while(run) {\n- zmq::message_t request;\n- try{\n- \/\/ Wait for next request from client\n- socket.recv(&request);\n- }catch(zmq::error_t){\n- \/\/on g\u00e9re le cas du sighup durant un recv\n- continue;\n+\n+ zmq::socket_t socket (context, ZMQ_REP);\n+ socket.connect (\"inproc:\/\/workers\");\n+ bool run = true;\n+ navitia::Worker w(data_manager, conf);\n+ while(run) {\n+ zmq::message_t request;\n+ try{\n+ \/\/ Wait for next request from client\n+ socket.recv(&request);\n+ }catch(zmq::error_t){\n+ \/\/on g\u00e9re le cas du sighup durant un recv\n+ continue;\n+ }\n+\n+ pbnavitia::Request pb_req;\n+ pbnavitia::Response result;\n+ pt::ptime start = pt::microsec_clock::local_time();\n+ pbnavitia::API api = pbnavitia::UNKNOWN_API;\n+ if(pb_req.ParseFromArray(request.data(), request.size())){\n+ api = pb_req.requested_api();\n+ if(api != pbnavitia::METADATAS){\n+ LOG4CPLUS_DEBUG(logger, \"receive request: \" << pb_req.DebugString());\n }\n+ try {\n+ result = w.dispatch(pb_req);\n+ if(api != pbnavitia::METADATAS){\n+ LOG4CPLUS_TRACE(logger, \"response: \" << result.DebugString());\n+ }\n+ } catch (const navitia::recoverable_exception& e) {\n+ \/\/on a recoverable an internal server error is returned\n+ LOG4CPLUS_ERROR(logger, \"internal server error: \" << e.what());\n+ LOG4CPLUS_ERROR(logger, \"on query: \" << pb_req.DebugString());\n+ LOG4CPLUS_ERROR(logger, \"backtrace: \" << e.backtrace());\n+ result = make_internal_error(e);\n+ }\n+ }else{\n+ LOG4CPLUS_WARN(logger, \"receive invalid protobuf\");\n+ result.mutable_error()->set_id(\n+ pbnavitia::Error::invalid_protobuf_request);\n+ }\n+ if (! data_manager.get_data()->loaded){\n+ result.set_publication_date(-1);\n+ } else {\n+ result.set_publication_date(navitia::to_posix_timestamp(data_manager.get_data()->meta->publication_date));\n+ }\n+ zmq::message_t reply(result.ByteSize());\n+ result.SerializeToArray(reply.data(), result.ByteSize());\n+ socket.send(reply);\n \n- pbnavitia::Request pb_req;\n- pbnavitia::Response result;\n- pt::ptime start = pt::microsec_clock::local_time();\n- pbnavitia::API api = pbnavitia::UNKNOWN_API;\n- if(pb_req.ParseFromArray(request.data(), request.size())){\n- api = pb_req.requested_api();\n- if(api != pbnavitia::METADATAS){\n- LOG4CPLUS_DEBUG(logger, \"receive request: \" << pb_req.DebugString());\n- }\n- try {\n- result = w.dispatch(pb_req);\n- if(api != pbnavitia::METADATAS){\n- LOG4CPLUS_TRACE(logger, \"response: \" << result.DebugString());\n- }\n- } catch (const navitia::recoverable_exception& e) {\n- \/\/on a recoverable an internal server error is returned\n- LOG4CPLUS_ERROR(logger, \"internal server error: \" << e.what());\n- LOG4CPLUS_ERROR(logger, \"on query: \" << pb_req.DebugString());\n- LOG4CPLUS_ERROR(logger, \"backtrace: \" << e.backtrace());\n- result = make_internal_error(e);\n- }\n- }else{\n- LOG4CPLUS_WARN(logger, \"receive invalid protobuf\");\n- result.mutable_error()->set_id(\n- pbnavitia::Error::invalid_protobuf_request);\n- }\n- if (! data_manager.get_data()->loaded){\n- result.set_publication_date(-1);\n- } else {\n- result.set_publication_date(navitia::to_posix_timestamp(data_manager.get_data()->meta->publication_date));\n- }\n- zmq::message_t reply(result.ByteSize());\n- result.SerializeToArray(reply.data(), result.ByteSize());\n- socket.send(reply);\n-\n- if(api != pbnavitia::METADATAS){\n- LOG4CPLUS_DEBUG(logger, \"processing time : \"\n- << (pt::microsec_clock::local_time() - start).total_milliseconds());\n- }\n+ if(api != pbnavitia::METADATAS){\n+ LOG4CPLUS_DEBUG(logger, \"processing time : \"\n+ << (pt::microsec_clock::local_time() - start).total_milliseconds());\n }\n- }catch(const std::exception& e){\n- LOG4CPLUS_ERROR(logger, \"worker die: \" << e.what());\n }\n }\n"} {"commit":"f4f8ace5f1ddbf66a41527c29ab9060058b29836","subject":"Fix fov method names","message":"Fix fov method names\n","repos":"fmoo\/python-libfov,fmoo\/python-libfov","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fov\/fov.c\n+++ fov\/fov.c\n@@ -238,8 +238,8 @@\n };\n \n static PyMethodDef FovObjectMethods[] = {\n- {\"fov.Settings.beam\", pyfov_beam, 0, NULL},\n- {\"fov.Settings.circle\", pyfov_circle, 0, NULL},\n+ {\"beam\", pyfov_beam, 0, NULL},\n+ {\"circle\", pyfov_circle, 0, NULL},\n {NULL, NULL, 0, NULL} \/* Sentinel *\/\n };\n \n"} {"commit":"c3b058afaea11273835f59694f8645a89915be9c","subject":"[SCSI] qla2xxx: Correct staging of RISC while attempting to pause.","message":"[SCSI] qla2xxx: Correct staging of RISC while attempting to pause.\n\nThere's no need to reset the RISC prior to pausing.\n\nSigned-off-by: Andrew Vasquez <67840a4977006af7f584bdc4c86d7243c1629cad@qlogic.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/qla2xxx\/qla_dbg.c\n+++ drivers\/scsi\/qla2xxx\/qla_dbg.c\n@@ -172,19 +172,16 @@\n \tint rval = QLA_SUCCESS;\n \tuint32_t cnt;\n \n-\tif ((RD_REG_DWORD(®->hccr) & HCCRX_RISC_PAUSE) == 0) {\n-\t\tWRT_REG_DWORD(®->hccr, HCCRX_SET_RISC_RESET |\n-\t\t HCCRX_CLR_HOST_INT);\n-\t\tRD_REG_DWORD(®->hccr);\t\t\/* PCI Posting. *\/\n-\t\tWRT_REG_DWORD(®->hccr, HCCRX_SET_RISC_PAUSE);\n-\t\tfor (cnt = 30000;\n-\t\t (RD_REG_DWORD(®->hccr) & HCCRX_RISC_PAUSE) == 0 &&\n-\t\t rval == QLA_SUCCESS; cnt--) {\n-\t\t\tif (cnt)\n-\t\t\t\tudelay(100);\n-\t\t\telse\n-\t\t\t\trval = QLA_FUNCTION_TIMEOUT;\n-\t\t}\n+\tif (RD_REG_DWORD(®->hccr) & HCCRX_RISC_PAUSE)\n+\t\treturn rval;\n+\n+\tWRT_REG_DWORD(®->hccr, HCCRX_SET_RISC_PAUSE);\n+\tfor (cnt = 30000; (RD_REG_DWORD(®->hccr) & HCCRX_RISC_PAUSE) == 0 &&\n+\t rval == QLA_SUCCESS; cnt--) {\n+\t\tif (cnt)\n+\t\t\tudelay(100);\n+\t\telse\n+\t\t\trval = QLA_FUNCTION_TIMEOUT;\n \t}\n \n \treturn rval;\n"} {"commit":"d4ed95d796e5126bba51466dc07e287cebc8bd19","subject":"r8169: fix wake on lan setting for non-8111E.","message":"r8169: fix wake on lan setting for non-8111E.\n\nOnly 8111E needs enable RxConfig bit 0 ~ 3 when suspending or\nshutdowning for wake on lan.\n\nSigned-off-by: Hayes Wang <2e4abddca5cd1005ec71becebc17a5257b0bced7@realtek.com>\nAcked-by: Francois Romieu <b6456b24ae82a7595be3173ae585c7a827f25f37@fr.zoreil.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/r8169.c\n+++ drivers\/net\/r8169.c\n@@ -3393,8 +3393,10 @@\n \t\trtl_writephy(tp, 0x1f, 0x0000);\n \t\trtl_writephy(tp, MII_BMCR, 0x0000);\n \n-\t\tRTL_W32(RxConfig, RTL_R32(RxConfig) |\n-\t\t\tAcceptBroadcast | AcceptMulticast | AcceptMyPhys);\n+\t\tif (tp->mac_version == RTL_GIGA_MAC_VER_32 ||\n+\t\t tp->mac_version == RTL_GIGA_MAC_VER_33)\n+\t\t\tRTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast |\n+\t\t\t\tAcceptMulticast | AcceptMyPhys);\n \t\treturn;\n \t}\n \n"} {"commit":"b345c4eeea5c1be3a2501ffb2a7e2cc0bdcb6c98","subject":"isl_basic_map_align_params: extract out isl_basic_map_check_space","message":"isl_basic_map_align_params: extract out isl_basic_map_check_space\n\nThis reduces the dependence on the internal representation.\nIt will also be reused in the implementation of\nisl_basic_map_drop_unused_params.\n\nSigned-off-by: Tobias Grosser <059b8b880f8441509ec8a65b50b4c6ae74ebea76@grosser.es>\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"PollyLabs\/isl,inducer\/isl-mirror,inducer\/isl-mirror,PollyLabs\/isl,PollyLabs\/isl,inducer\/isl-mirror,Meinersbur\/isl,inducer\/isl-mirror,Meinersbur\/isl,PollyLabs\/isl,Meinersbur\/isl,Meinersbur\/isl,PollyLabs\/isl,inducer\/isl-mirror","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -1347,6 +1347,14 @@\n isl_stat isl_map_check_named_params(__isl_keep isl_map *map)\n {\n \treturn isl_space_check_named_params(isl_map_peek_space(map));\n+}\n+\n+\/* Check that \"bmap\" has only named parameters, reporting an error\n+ * if it does not.\n+ *\/\n+static isl_stat isl_basic_map_check_named_params(__isl_keep isl_basic_map *bmap)\n+{\n+\treturn isl_space_check_named_params(isl_basic_map_peek_space(bmap));\n }\n \n \/* Check that \"bmap1\" and \"bmap2\" have the same parameters,\n@@ -11760,9 +11768,8 @@\n \tif (!isl_space_has_named_params(model))\n \t\tisl_die(ctx, isl_error_invalid,\n \t\t\t\"model has unnamed parameters\", goto error);\n-\tif (!isl_space_has_named_params(bmap->dim))\n-\t\tisl_die(ctx, isl_error_invalid,\n-\t\t\t\"relation has unnamed parameters\", goto error);\n+\tif (isl_basic_map_check_named_params(bmap) < 0)\n+\t\tgoto error;\n \tequal_params = isl_space_has_equal_params(bmap->dim, model);\n \tif (equal_params < 0)\n \t\tgoto error;\n"} {"commit":"f21524f5bc6c7022928e32e6e5e36985ed4e8bbf","subject":"spi: bitbang: Grammar s\/make to make\/to make\/","message":"spi: bitbang: Grammar s\/make to make\/to make\/\n\nSigned-off-by: Geert Uytterhoeven <a1ff81395f7e6bf5b509fe9aab06bf3419493e1d@linux-m68k.org>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@linaro.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/spi\/spi-bitbang-txrx.h\n+++ drivers\/spi\/spi-bitbang-txrx.h\n@@ -38,7 +38,7 @@\n *\n * Since this is software, the timings may not be exactly what your board's\n * chips need ... there may be several reasons you'd need to tweak timings\n- * in these routines, not just make to make it faster or slower to match a\n+ * in these routines, not just to make it faster or slower to match a\n * particular CPU clock rate.\n *\/\n \n"} {"commit":"13a4d884f02c06b9a0e43cca9e5eac5ab12020cc","subject":"arch: arm: remove un-necessary inclusion of <string.h>","message":"arch: arm: remove un-necessary inclusion of <string.h>\n\nRemove the inclusion of <string.h>, if CONFIG_INIT_STACKS\nis defined, because it is not required anywhere in thread.c.\n\nSigned-off-by: Ioannis Glaropoulos <5921cc8bab7e1d4329f52fd8f6268f9692e3de80@nordicsemi.no>\n","repos":"GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,ldts\/zephyr,punitvara\/zephyr,galak\/zephyr,punitvara\/zephyr,punitvara\/zephyr,explora26\/zephyr,nashif\/zephyr,ldts\/zephyr,Vudentz\/zephyr,galak\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,explora26\/zephyr,finikorg\/zephyr,nashif\/zephyr,galak\/zephyr,finikorg\/zephyr,punitvara\/zephyr,explora26\/zephyr,ldts\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,ldts\/zephyr,explora26\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/core\/thread.c\n+++ arch\/arm\/core\/thread.c\n@@ -15,9 +15,6 @@\n #include <toolchain.h>\n #include <kernel_structs.h>\n #include <wait_q.h>\n-#ifdef CONFIG_INIT_STACKS\n-#include <string.h>\n-#endif \/* CONFIG_INIT_STACKS *\/\n \n #ifdef CONFIG_USERSPACE\n extern u8_t *_k_priv_stack_find(void *obj);\n"} {"commit":"2a41614773eb082cb33662d39a0e09acb2fe70b3","subject":"Fail when metric is not found","message":"Fail when metric is not found\n","repos":"RPI-HPC\/check_ganglia_metric","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- check_ganglia_metric.c\n+++ check_ganglia_metric.c\n@@ -327,6 +327,7 @@\n \n int fetch_value_from_cache(char *hostfile, char *metric, char *result, char *units)\n {\n+\tint retc = -1;\n \tFILE *f;\n \n \tf = fopen(hostfile, \"r\");\n@@ -345,13 +346,15 @@\n \t\t\tstrcpy(units, strtok(NULL, \",\"));\n \t\t\tstrcpy(result, strtok(NULL, \",\"));\n \n+\t\t\tretc = 0;\n+\n \t\t\tbreak;\n \t\t}\n \t}\n \n \tfclose(f);\n \n-\treturn 0;\n+\treturn retc;\n }\n \n int write_xml(char *xml, int xlen, char *xmlfile)\n"} {"commit":"7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3","subject":"r8169: fix printk_ratelimit in the interrupt handler","message":"r8169: fix printk_ratelimit in the interrupt handler\n\nI keep on getting \"printk: N messages suppressed\" messages. We need to test\nnetif_msg_intr() _before_ running printk_ratelimit(), because the latter\nupdates state.\n\nCc: Jeff Garzik <15f615bf7d20c2937c7eb5aa759110fd6768848c@pobox.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Francois Romieu <b6456b24ae82a7595be3173ae585c7a827f25f37@fr.zoreil.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/r8169.c\n+++ drivers\/net\/r8169.c\n@@ -2516,7 +2516,7 @@\n \t} while (boguscnt > 0);\n \n \tif (boguscnt <= 0) {\n-\t\tif (net_ratelimit() && netif_msg_intr(tp)) {\n+\t\tif (netif_msg_intr(tp) && net_ratelimit() ) {\n \t\t\tprintk(KERN_WARNING\n \t\t\t \"%s: Too much work at interrupt!\\n\", dev->name);\n \t\t}\n"} {"commit":"f196e21d25d3dfbd01be8c0de68cb11ec368c219","subject":"","message":"\n\nAdding fuseiso file","repos":"eloquentstore\/appimager,eloquentstore\/appimager","returncode":1,"stderr":"error: pathspec 'fuseiso.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- fuseiso.c\n+++ fuseiso.c\n@@ -0,0 +1,181 @@\n+\/***************************************************************************\n+ * Copyright (c) 2005, 2006 by Dmitry Morozhnikov <dmiceman@mail.ru > *\n+ * Copyright (c) 2004-16 Simon Peter *\n+ * *\n+ * This program is free software; you can redistribute it and\/or modify *\n+ * it under the terms of the GNU General Public License as published by *\n+ * the Free Software Foundation; either version 2 of the License, or *\n+ * (at your option) any later version. *\n+ * *\n+ * This program is distributed in the hope that it will be useful, *\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *\n+ * GNU General Public License for more details. *\n+ * *\n+ * You should have received a copy of the GNU General Public License *\n+ * along with this program; if not, write to the *\n+ * Free Software Foundation, Inc., *\n+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *\n+ ***************************************************************************\/\n+\n+#ifdef HAVE_CONFIG_H\n+#include <config.h>\n+#endif\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <fcntl.h>\n+#include <errno.h>\n+#include <linux\/stat.h>\n+#include <mntent.h>\n+#include <sys\/param.h>\n+#include <linux\/iso_fs.h>\n+\n+#define FUSE_USE_VERSION 22\n+#include <fuse.h>\n+#include \"isofs.h\"\n+\n+#ifdef __GNUC__\n+# define UNUSED(x) x __attribute__((unused))\n+#else\n+# define UNUSED(x) x\n+#endif\n+\n+static char *imagefile = NULL;\n+static char *mount_point = NULL;\n+static int image_fd = -1;\n+\n+int maintain_mount_point = 1;\n+\n+char* iocharset;\n+\n+char* normalize_name(const char* fname) {\n+ char* abs_fname = (char *) malloc(PATH_MAX);\n+ realpath(fname, abs_fname);\n+ \/\/ ignore errors from realpath()\n+ return abs_fname;\n+};\n+\n+int check_mount_point() {\n+ struct stat st;\n+ int rc = lstat(mount_point, &st);\n+ if(rc == -1 && errno == ENOENT) {\n+ \/\/ directory does not exists, createcontext\n+ rc = mkdir(mount_point, 0777); \/\/ let`s underlying filesystem manage permissions\n+ if(rc != 0) {\n+ perror(\"Can't create mount point\");\n+ return -EIO;\n+ };\n+ } else if(rc == -1) {\n+ perror(\"Can't check mount point\");\n+ return -1;\n+ };\n+ return 0;\n+};\n+\n+void del_mount_point() {\n+ int rc = rmdir(mount_point);\n+ if(rc != 0) {\n+ perror(\"Can't delete mount point\");\n+ };\n+};\n+\n+static int isofs_getattr(const char *path, struct stat *stbuf)\n+{\n+ return isofs_real_getattr(path, stbuf);\n+}\n+\n+static int isofs_readlink(const char *path, char *target, size_t size) {\n+ return isofs_real_readlink(path, target, size);\n+};\n+\n+static int isofs_open(const char *path, struct fuse_file_info *UNUSED(fi))\n+{\n+ return isofs_real_open(path);\n+}\n+\n+static int isofs_read(const char *path, char *buf, size_t size,\n+ off_t offset, struct fuse_file_info *UNUSED(fi))\n+{\n+ return isofs_real_read(path, buf, size, offset);\n+}\n+\n+static int isofs_flush(const char *UNUSED(path), struct fuse_file_info *UNUSED(fi)) {\n+ return 0;\n+};\n+\n+static void* isofs_init() {\n+ int rc;\n+ run_when_fuse_fs_mounted();\n+ return isofs_real_init();\n+};\n+\n+static void isofs_destroy(void* param) {\n+ return;\n+};\n+\n+static int isofs_opendir(const char *path, struct fuse_file_info *UNUSED(fi)) {\n+ return isofs_real_opendir(path);\n+};\n+\n+static int isofs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t UNUSED(offset),\n+ struct fuse_file_info *UNUSED(fi)) {\n+ return isofs_real_readdir(path, buf, filler);\n+};\n+\n+static int isofs_statfs(const char *UNUSED(path), struct statfs *stbuf)\n+{\n+ return isofs_real_statfs(stbuf);\n+}\n+\n+static struct fuse_operations isofs_oper = {\n+ .getattr = isofs_getattr,\n+ .readlink = isofs_readlink,\n+ .open = isofs_open,\n+ .read = isofs_read,\n+ .flush = isofs_flush,\n+ .init = isofs_init,\n+ .destroy = isofs_destroy,\n+ .opendir = isofs_opendir,\n+ .readdir = isofs_readdir,\n+ .statfs = isofs_statfs,\n+};\n+\n+int ext2_main(int argc, char *argv[])\n+{ \n+ imagefile = normalize_name(argv[0]);\n+ image_fd = open(imagefile, O_RDONLY);\n+ if(image_fd == -1) {\n+ perror(\"Can't open image file\");\n+ fprintf(stderr, \"Supplied image file name: \\\"%s\\\"\\n\", imagefile);\n+ exit(EXIT_FAILURE);\n+ };\n+ \n+ mount_point = normalize_name(argv[1]);\n+ \n+ if(!iocharset) {\n+ iocharset = \"UTF-8\/\/IGNORE\";\n+ };\n+ \n+ int rc;\n+ if(maintain_mount_point) {\n+ rc = check_mount_point();\n+ if(rc != 0) {\n+ exit(EXIT_FAILURE);\n+ };\n+ };\n+ if(maintain_mount_point) {\n+ rc = atexit(del_mount_point);\n+ if(rc != 0) {\n+ fprintf(stderr, \"Can't set exit function\\n\");\n+ exit(EXIT_FAILURE);\n+ }\n+ };\n+ \n+ \/\/ will exit in case of failure\n+ rc = isofs_real_preinit(imagefile, image_fd);\n+\n+ return fuse_main(argc, argv, &isofs_oper);\n+};\n+\n"} {"commit":"1109b07b7dcb938de7a0d65efc1b4739dc4e9787","subject":"CRED: Wrap task credential accesses in the BFS filesystem","message":"CRED: Wrap task credential accesses in the BFS filesystem\n\nWrap access to task credentials so that they can be separated more easily from\nthe task_struct during the introduction of COW creds.\n\nChange most current->(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().\n\nChange some task->e?[ug]id to task_e?[ug]id(). In some places it makes more\nsense to use RCU directly rather than a convenient wrapper; these will be\naddressed by later patches.\n\nSigned-off-by: David Howells <ebac1d06c1688626821bb0e574a037a7a5354e49@redhat.com>\nReviewed-by: James Morris <10d11de3abc355eabe955bb734f0f8e71da56e16@namei.org>\nAcked-by: Serge Hallyn <dd6cacb2d07f0aa354aa6e74c149a3580e5a1db1@us.ibm.com>\nCc: Tigran A. Aivazian <e11fb3c37265b6695ce64b9d25fb3a9b3357abee@aivazian.fsnet.co.uk>\nSigned-off-by: James Morris <10d11de3abc355eabe955bb734f0f8e71da56e16@namei.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/bfs\/dir.c\n+++ fs\/bfs\/dir.c\n@@ -106,8 +106,8 @@\n \t}\n \tset_bit(ino, info->si_imap);\n \tinfo->si_freei--;\n-\tinode->i_uid = current->fsuid;\n-\tinode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid;\n+\tinode->i_uid = current_fsuid();\n+\tinode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current_fsgid();\n \tinode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;\n \tinode->i_blocks = 0;\n \tinode->i_op = &bfs_file_inops;\n"} {"commit":"145c02804f9ae06e884001b652e750a96e584afe","subject":"fix menu not closing when user clicks outside of menu bounds; introduced in 90661f9f2594ea8aa7e28c528a8b020b111b208f","message":"fix menu not closing when user clicks outside of menu bounds; introduced in 90661f9f2594ea8aa7e28c528a8b020b111b208f\n","repos":"Volkanite\/Push,Volkanite\/Push","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/push[exe]\/GUI\/gui.c\n+++ source\/push[exe]\/GUI\/gui.c\n@@ -99,6 +99,11 @@\n \n GetCursorPos(&pos);\n \n+ \/\/ https:\/\/msdn.microsoft.com\/en-us\/library\/windows\/desktop\/ms648002(v=vs.85).aspx\n+ \/\/ the current window must be the foreground window before the application calls TrackPopupMenu. \n+ \/\/ Otherwise, the menu will not disappear when the user clicks outside of the menu.\n+ SetForegroundWindow(PushMainWindow->Handle);\n+\n TrackPopupMenu(\n hSubMenu,\n 0,\n@@ -167,7 +172,7 @@\n {\n WNDCLASSEX windowClass;\n \n-\tMemory_Clear(&windowClass, sizeof(WNDCLASSEX));\n+ Memory_Clear(&windowClass, sizeof(WNDCLASSEX));\n \n windowClass.Size = sizeof(WNDCLASSEX);\n windowClass.Style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;\n"} {"commit":"b806512fa7de04bd17c619728087aa43093e3ca7","subject":"isl_basic_map_curry: finalize result","message":"isl_basic_map_curry: finalize result\n\nSince isl_basic_map_curry is a public function, its result should be finalized.\n\nSince it does not modify any constraints,\nthere is no need to look for any obviously redundant integer divisions.\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"PollyLabs\/isl,Meinersbur\/isl,Meinersbur\/isl,Distrotech\/isl,nicolasvasilache\/isl,PollyLabs\/isl,UBERTC\/isl,Distrotech\/isl,tobig\/isl,tobig\/isl,PollyLabs\/isl,inducer\/isl-mirror,tobig\/isl,PollyLabs\/isl,UBERTC\/isl,Meinersbur\/isl,tobig\/isl,UBERTC\/isl,nicolasvasilache\/isl,BenzoSM\/isl,inducer\/isl-mirror,Distrotech\/isl,Distrotech\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,PollyLabs\/isl,Distrotech\/isl,BenzoSM\/isl,BenzoSM\/isl,BenzoSM\/isl,nicolasvasilache\/isl,Meinersbur\/isl,inducer\/isl-mirror,UBERTC\/isl,inducer\/isl-mirror,BenzoSM\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -11343,6 +11343,7 @@\n \tbmap->dim = isl_space_curry(bmap->dim);\n \tif (!bmap->dim)\n \t\tgoto error;\n+\tbmap = isl_basic_map_mark_final(bmap);\n \treturn bmap;\n error:\n \tisl_basic_map_free(bmap);\n"} {"commit":"3df5adb23f115a5d2c7ca10fc66a5b9176cedc49","subject":"serial: sc16is7xx: compile I2C when REGMAP_I2C is module","message":"serial: sc16is7xx: compile I2C when REGMAP_I2C is module\n\ndrivers\/tty\/serial\/sc16is7xx.c:1060:12: warning: 'sc16is7xx_probe' defined but not used [-Wunused-function]\n static int sc16is7xx_probe(struct device *dev,\n ^\ndrivers\/tty\/serial\/sc16is7xx.c:1176:12: warning: 'sc16is7xx_remove' defined but not used [-Wunused-function]\n static int sc16is7xx_remove(struct device *dev)\n ^\ndrivers\/tty\/serial\/sc16is7xx.c:1215:29: warning: 'regcfg' defined but not used [-Wunused-variable]\n static struct regmap_config regcfg = {\n ^\n\nFixed these warnings by removing the `#ifdef CONFIG_REGMAP_I2C' around their\ncalls as this driver selects REGMAP_I2C in Kconfig. This part of driver just\ndidn't compile at all when REGMAP_I2C configured as module (CONFIG_REGMAP_I2C\nis not defined, just CONFIG_REGMAP_I2C_MODULE).\n\nSigned-off-by: Jan Moskyto Matejka <efe3c55853f8f74e838dd82088c5614e0cd3c3ae@suse.cz>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/tty\/serial\/sc16is7xx.c\n+++ drivers\/tty\/serial\/sc16is7xx.c\n@@ -1221,7 +1221,6 @@\n \t.precious_reg = sc16is7xx_regmap_precious,\n };\n \n-#ifdef CONFIG_REGMAP_I2C\n static int sc16is7xx_i2c_probe(struct i2c_client *i2c,\n \t\t\t const struct i2c_device_id *id)\n {\n@@ -1273,7 +1272,6 @@\n };\n module_i2c_driver(sc16is7xx_i2c_uart_driver);\n MODULE_ALIAS(\"i2c:sc16is7xx\");\n-#endif\n \n MODULE_LICENSE(\"GPL\");\n MODULE_AUTHOR(\"Jon Ringle <jringle@gridpoint.com>\");\n"} {"commit":"e09793bb9182115e6f5d15fd6571ac2b72d7a08a","subject":"[PATCH] msr.c: use register_hotcpu_notifier()","message":"[PATCH] msr.c: use register_hotcpu_notifier()\n\nregister_cpu_notifier() cannot do anything in a module, in a\n!CONFIG_HOTPLUG_CPU kernel.\n\nCc: Chandra Seetharaman <9b84ef500dca9790587c7d826043d1cf8d6b9436@us.ibm.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/i386\/kernel\/msr.c\n+++ arch\/i386\/kernel\/msr.c\n@@ -251,7 +251,9 @@\n \treturn err;\n }\n \n-static int msr_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)\n+#ifdef CONFIG_HOTPLUG_CPU\n+static int msr_class_cpu_callback(struct notifier_block *nfb,\n+\t\t\t\tunsigned long action, void *hcpu)\n {\n \tunsigned int cpu = (unsigned long)hcpu;\n \n@@ -270,6 +272,7 @@\n {\n \t.notifier_call = msr_class_cpu_callback,\n };\n+#endif\n \n static int __init msr_init(void)\n {\n@@ -292,7 +295,7 @@\n \t\tif (err != 0)\n \t\t\tgoto out_class;\n \t}\n-\tregister_cpu_notifier(&msr_class_cpu_notifier);\n+\tregister_hotcpu_notifier(&msr_class_cpu_notifier);\n \n \terr = 0;\n \tgoto out;\n@@ -315,7 +318,7 @@\n \t\tclass_device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));\n \tclass_destroy(msr_class);\n \tunregister_chrdev(MSR_MAJOR, \"cpu\/msr\");\n-\tunregister_cpu_notifier(&msr_class_cpu_notifier);\n+\tunregister_hotcpu_notifier(&msr_class_cpu_notifier);\n }\n \n module_init(msr_init);\n"} {"commit":"3789fa8a2e534523c896a32a9f27f78d52ad7d82","subject":"PCI: allow pci_alloc_child_bus() to handle a NULL bridge","message":"PCI: allow pci_alloc_child_bus() to handle a NULL bridge\n\nAllow pci_alloc_child_bus() to allocate buses without bridge devices.\nSome SR-IOV devices can occupy more than one bus number, but there is no\nexplicit bridges because that have internal routing mechanism.\n\nSigned-off-by: Yu Zhao <545e6edfff27accb4f359beb5bbd705433fc6d5a@intel.com>\nSigned-off-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pci\/probe.c\n+++ drivers\/pci\/probe.c\n@@ -398,12 +398,10 @@\n \tif (!child)\n \t\treturn NULL;\n \n-\tchild->self = bridge;\n \tchild->parent = parent;\n \tchild->ops = parent->ops;\n \tchild->sysdata = parent->sysdata;\n \tchild->bus_flags = parent->bus_flags;\n-\tchild->bridge = get_device(&bridge->dev);\n \n \t\/* initialize some portions of the bus device, but don't register it\n \t * now as the parent is not properly set up yet. This device will get\n@@ -419,6 +417,12 @@\n \tchild->number = child->secondary = busnr;\n \tchild->primary = parent->secondary;\n \tchild->subordinate = 0xff;\n+\n+\tif (!bridge)\n+\t\treturn child;\n+\n+\tchild->self = bridge;\n+\tchild->bridge = get_device(&bridge->dev);\n \n \t\/* Set up default resource pointers and names.. *\/\n \tfor (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {\n"} {"commit":"282ef828f3ed34ade5aeb37784ea37379add213f","subject":"Remove bad formatting from clang-format","message":"Remove bad formatting from clang-format\n\nclang-format likes making sure commas have spaces after them.\nWe don't need that here. It reads much better without the spaces\nas well as being more compatible for easy copy\/pasting into Redis\ndirectly.\n","repos":"mattsta\/krmt,kmiku7\/krmt,kmiku7\/krmt,mattsta\/krmt,kmiku7\/krmt,mattsta\/krmt","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- geo\/module.c\n+++ geo\/module.c\n@@ -7,7 +7,7 @@\n \/* ====================================================================\n * Bring up \/ Teardown\n * ==================================================================== *\/\n-void *load() { return NULL; }\n+void *load() { return NULL;}\n \n \/* If you reload the module *without* freeing things you allocate in load(),\n * then you *will* introduce memory leaks. *\/\n@@ -26,12 +26,11 @@\n };\n \n struct redisCommand redisCommandTable[] = {\n- { \"geoadd\", geoAddCommand, -5, \"wm\", 0, NULL, 1, 1, 1, 0, 0 },\n- { \"georadius\", geoRadiusCommand, -6, \"r\", 0, NULL, 1, 1, 1, 0, 0 },\n- { \"georadiusbymember\", geoRadiusByMemberCommand, -5, \"r\", 0, NULL, 1, 1, 1,\n- 0, 0 },\n- { \"geoencode\", geoEncodeCommand, -3, \"r\", 0, NULL, 0, 0, 0, 0, 0 },\n- { \"geodecode\", geoDecodeCommand, -2, \"r\", 0, NULL, 0, 0, 0, 0, 0 },\n- { 0 } \/* Always end your command table with {0}\n+ {\"geoadd\",geoAddCommand,-5,\"wm\",0,NULL,1,1,1,0,0},\n+ {\"georadius\",geoRadiusCommand,-6,\"r\",0,NULL,1,1,1,0,0},\n+ {\"georadiusbymember\",geoRadiusByMemberCommand,-5,\"r\",0,NULL,1,1,1,0,0},\n+ {\"geoencode\",geoEncodeCommand,-3,\"r\",0,NULL,0,0,0,0,0},\n+ {\"geodecode\",geoDecodeCommand,-2,\"r\",0,NULL,0,0,0,0,0},\n+ {0} \/* Always end your command table with {0}\n * If you forget, you will be reminded with a segfault on load. *\/\n };\n"} {"commit":"9257c4577a182cdda98ed60674e6fd0b8ae9a458","subject":"Consider a lack of updates a success.","message":"Consider a lack of updates a success.\n","repos":"Steveice10\/FBI,Steveice10\/FBI,Steveice10\/FBI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/ui\/section\/update.c\n+++ source\/ui\/section\/update.c\n@@ -249,7 +249,7 @@\n error_display_res(NULL, NULL, NULL, res, \"Failed to check for update.\");\n }\n } else {\n- prompt_display(\"Failure\", \"No updates available.\", COLOR_TEXT, false, NULL, NULL, NULL, NULL);\n+ prompt_display(\"Success\", \"No updates available.\", COLOR_TEXT, false, NULL, NULL, NULL, NULL);\n }\n \n free(data);\n"} {"commit":"3ca0a39fa9e0fc8e803f76b57c234f8687e0c1a0","subject":"Bug 606378 - gdk doesn't handle non-main thread rendering on Quartz","message":"Bug 606378 - gdk doesn't handle non-main thread rendering on Quartz\n\nDocument that the restrictions on Win32 apply also to Quartz.\n","repos":"ebassi\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,grubersjoe\/adwaita,jadahl\/gtk,Lyude\/gtk-,ahodesuka\/gtk,bratsche\/gtk-,jessevdk\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,ebassi\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,chergert\/gtk,jessevdk\/gtk,jadahl\/gtk,msteinert\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,ebassi\/gtk,Adamovskiy\/gtk,jigpu\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jigpu\/gtk,chergert\/gtk,grubersjoe\/adwaita,jadahl\/gtk,Lyude\/gtk-,jadahl\/gtk,jigpu\/gtk,jigpu\/gtk,ebassi\/gtk,msteinert\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,chergert\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,Lyude\/gtk-,jessevdk\/gtk,chergert\/gtk,jigpu\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,davidgumberg\/gtk,jigpu\/gtk,chergert\/gtk,Distrotech\/gtk2,alexlarsson\/gtk,alexlarsson\/gtk,bratsche\/gtk-,chergert\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jadahl\/gtk,msteinert\/gtk,Lyude\/gtk-,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,bratsche\/gtk-,msteinert\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,jadahl\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,jadahl\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,msteinert\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,Lyude\/gtk-,Lyude\/gtk-,bratsche\/gtk-,davidgumberg\/gtk,Distrotech\/gtk2,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,chergert\/gtk,jigpu\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,jigpu\/gtk,msteinert\/gtk,ahodesuka\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,ebassi\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,chergert\/gtk,ebassi\/gtk,bratsche\/gtk-,jessevdk\/gtk,jessevdk\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk\/gdk.c\n+++ gdk\/gdk.c\n@@ -666,12 +666,12 @@\n * <\/informalexample>\n *\n * Unfortunately, all of the above documentation holds with the X11\n- * backend only. With the Win32 backend, GDK and GTK+ calls should not\n- * be attempted from multiple threads at all. Combining the GDK lock\n- * with other locks such as the Python global interpreter lock can be\n- * complicated.\n- *\n- * For these reason, the threading support has been deprecated in\n+ * backend only. With the Win32 or Quartz backends, GDK and GTK+ calls\n+ * must occur only in the main thread (see below). When using Python,\n+ * even on X11 combining the GDK lock with other locks such as the\n+ * Python global interpreter lock can be complicated.\n+ *\n+ * For these reasons, the threading support has been deprecated in\n * GTK+ 3.6. Instead of calling GTK+ directly from multiple threads,\n * it is recommended to use g_idle_add(), g_main_context_invoke()\n * and similar functions to make these calls from the main thread\n"} {"commit":"0f6713a4e67d761bcf927af988166de20edeedba","subject":"isl_basic_set_preimage: handle divs in input","message":"isl_basic_set_preimage: handle divs in input\n","repos":"serge-sans-paille\/isl,BobSaget-Mod\/libisl,abduld\/isl,BobSaget-Mod\/libisl,jleben\/isl,evaautomation\/isl,BenzoSM\/isl,SaberMod\/isl-current,abduld\/isl,tobig\/isl,serge-sans-paille\/isl,jleben\/isl,serge-sans-paille\/isl,VanirLLVM\/toolchain_isl,inducer\/isl-mirror,epowers\/isl,Distrotech\/isl,nicolasvasilache\/isl,simbuerg\/isl,nicolasvasilache\/isl,UBERTC\/isl,nicolasvasilache\/isl,BobSaget-Mod\/libisl,Distrotech\/isl,serge-sans-paille\/isl,nicolasvasilache\/isl,KangDroidSMProject\/ISL,serge-sans-paille\/isl,BobSaget-Mod\/libisl,BenzoSM\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,Meinersbur\/isl,UBERTC\/isl,pierrotdelalune\/isl,inducer\/isl-mirror,cfx-next\/toolchain_isl-upstream,crossbuild\/isl,BenzoSM\/isl,SaberMod\/isl-current,Distrotech\/isl,Distrotech\/isl,simbuerg\/isl,epowers\/isl,SaberMod\/isl-current,simbuerg\/isl,jleben\/isl,evaautomation\/isl,crossbuild\/isl,VanirLLVM\/toolchain_isl,pierrotdelalune\/isl,PollyLabs\/isl,Meinersbur\/isl,PollyLabs\/isl,simbuerg\/isl,epowers\/isl,cfx-next\/toolchain_isl-upstream,PollyLabs\/isl,pierrotdelalune\/isl,epowers\/isl,evaautomation\/isl,SaberMod\/isl-current,simbuerg\/isl,Meinersbur\/isl,inducer\/isl-mirror,BenzoSM\/isl,inducer\/isl-mirror,VanirLLVM\/toolchain_isl,PollyLabs\/isl,tobig\/isl,jleben\/isl,UBERTC\/isl,inducer\/isl-mirror,abduld\/isl,BobSaget-Mod\/libisl,crossbuild\/isl,crossbuild\/isl,pierrotdelalune\/isl,pierrotdelalune\/isl,KangDroidSMProject\/ISL,KangDroidSMProject\/ISL,tobig\/isl,nicolasvasilache\/isl,KangDroidSMProject\/ISL,cfx-next\/toolchain_isl-upstream,epowers\/isl,VanirLLVM\/toolchain_isl,UBERTC\/isl,jleben\/isl,cfx-next\/toolchain_isl-upstream,abduld\/isl,Meinersbur\/isl,BenzoSM\/isl,tobig\/isl,evaautomation\/isl,KangDroidSMProject\/ISL,Distrotech\/isl,cfx-next\/toolchain_isl-upstream","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_mat.c\n+++ isl_mat.c\n@@ -799,6 +799,45 @@\n \treturn NULL;\n }\n \n+\/* Replace the variables x in the rows q by x' given by x = M x',\n+ * with M the matrix mat.\n+ *\n+ * If the number of new variables is greater than the original\n+ * number of variables, then the rows q have already been\n+ * preextended. If the new number is smaller, then the coefficients\n+ * of the divs, which are not changed, need to be shifted down.\n+ * The row q may be the equalities, the inequalities or the\n+ * div expressions. In the latter case, has_div is true and\n+ * we need to take into account the extra denominator column.\n+ *\/\n+static int preimage(struct isl_ctx *ctx, isl_int **q, unsigned n,\n+\tunsigned n_div, int has_div, struct isl_mat *mat)\n+{\n+\tint i;\n+\tstruct isl_mat *t;\n+\tint e;\n+\n+\tif (mat->n_col >= mat->n_row)\n+\t\te = 0;\n+\telse\n+\t\te = mat->n_row - mat->n_col;\n+\tif (has_div)\n+\t\tfor (i = 0; i < n; ++i)\n+\t\t\tisl_int_mul(q[i][0], q[i][0], mat->row[0][0]);\n+\tt = isl_mat_sub_alloc(ctx, q, 0, n, has_div, mat->n_row);\n+\tt = isl_mat_product(ctx, t, mat);\n+\tif (!t)\n+\t\treturn -1;\n+\tfor (i = 0; i < n; ++i) {\n+\t\tisl_seq_swp_or_cpy(q[i] + has_div, t->row[i], t->n_col);\n+\t\tisl_seq_cpy(q[i] + has_div + t->n_col,\n+\t\t\t q[i] + has_div + t->n_col + e, n_div);\n+\t\tisl_seq_clr(q[i] + has_div + t->n_col + n_div, e);\n+\t}\n+\tisl_mat_free(ctx, t);\n+\treturn 0;\n+}\n+\n \/* Replace the variables x in bset by x' given by x = M x', with\n * M the matrix mat.\n *\n@@ -813,8 +852,6 @@\n \tstruct isl_mat *mat)\n {\n \tstruct isl_ctx *ctx;\n-\tstruct isl_mat *t;\n-\tint i;\n \n \tif (!bset || !mat)\n \t\tgoto error;\n@@ -825,7 +862,6 @@\n \t\tgoto error;\n \n \tisl_assert(ctx, bset->dim->nparam == 0, goto error);\n-\tisl_assert(ctx, bset->n_div == 0, goto error);\n \tisl_assert(ctx, 1+bset->dim->n_out == mat->n_row, goto error);\n \n \tif (mat->n_col > mat->n_row)\n@@ -838,25 +874,16 @@\n \t\tbset->dim->n_out -= mat->n_row - mat->n_col;\n \t}\n \n-\tt = isl_mat_sub_alloc(ctx, bset->eq, 0, bset->n_eq, 0, mat->n_row);\n-\tt = isl_mat_product(ctx, t, isl_mat_copy(ctx, mat));\n-\tif (!t)\n-\t\tgoto error;\n-\tfor (i = 0; i < bset->n_eq; ++i) {\n-\t\tisl_seq_swp_or_cpy(bset->eq[i], t->row[i], t->n_col);\n-\t\tisl_seq_clr(bset->eq[i]+t->n_col, bset->extra);\n-\t}\n-\tisl_mat_free(ctx, t);\n-\n-\tt = isl_mat_sub_alloc(ctx, bset->ineq, 0, bset->n_ineq, 0, mat->n_row);\n-\tt = isl_mat_product(ctx, t, mat);\n-\tif (!t)\n+\tif (preimage(ctx, bset->eq, bset->n_eq, bset->n_div, 0,\n+\t\t\tisl_mat_copy(ctx, mat)) < 0)\n+\t\tgoto error;\n+\n+\tif (preimage(ctx, bset->ineq, bset->n_ineq, bset->n_div, 0,\n+\t\t\tisl_mat_copy(ctx, mat)) < 0)\n+\t\tgoto error;\n+\n+\tif (preimage(ctx, bset->div, bset->n_div, bset->n_div, 1, mat) < 0)\n \t\tgoto error2;\n-\tfor (i = 0; i < bset->n_ineq; ++i) {\n-\t\tisl_seq_swp_or_cpy(bset->ineq[i], t->row[i], t->n_col);\n-\t\tisl_seq_clr(bset->ineq[i]+t->n_col, bset->extra);\n-\t}\n-\tisl_mat_free(ctx, t);\n \n \tISL_F_CLR(bset, ISL_BASIC_SET_NO_IMPLICIT);\n \tISL_F_CLR(bset, ISL_BASIC_SET_NO_REDUNDANT);\n"} {"commit":"f7162e9e1cead8510e371f8273902539102670ac","subject":"usb: gadget: dummy_hcd: don't assign gadget.dev.release directly","message":"usb: gadget: dummy_hcd: don't assign gadget.dev.release directly\n\nudc-core provides a better way to handle release\nmethods, let's use it.\n\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/gadget\/dummy_hcd.c\n+++ drivers\/usb\/gadget\/dummy_hcd.c\n@@ -935,11 +935,6 @@\n \n \/* The gadget structure is stored inside the hcd structure and will be\n * released along with it. *\/\n-static void dummy_gadget_release(struct device *dev)\n-{\n-\treturn;\n-}\n-\n static void init_dummy_udc_hw(struct dummy *dum)\n {\n \tint i;\n@@ -983,7 +978,6 @@\n \tdum->gadget.max_speed = USB_SPEED_SUPER;\n \n \tdum->gadget.dev.parent = &pdev->dev;\n-\tdum->gadget.dev.release = dummy_gadget_release;\n \tinit_dummy_udc_hw(dum);\n \n \trc = usb_add_gadget_udc(&pdev->dev, &dum->gadget);\n"} {"commit":"1dcd775eb302f897865bbab8779ae4165c13cd7e","subject":"[IA64] fix compile error in arch\/ia64\/mm\/extable.c","message":"[IA64] fix compile error in arch\/ia64\/mm\/extable.c\n\nad6561dffa17f17bb68d7207d422c26c381c4313 (\"module: trim exception table on init\nfree.\") put a bogus trim_init_extable() function into ia64 which didn't compile.\n\nSigned-off-by: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\nSigned-off-by: Tony Luck <e7984595ec0368ff920a7b3521dc7093683f6f26@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/ia64\/mm\/extable.c\n+++ arch\/ia64\/mm\/extable.c\n@@ -8,7 +8,7 @@\n #include <linux\/sort.h>\n \n #include <asm\/uaccess.h>\n-#include <asm\/module.h>\n+#include <linux\/module.h>\n \n static int cmp_ex(const void *a, const void *b)\n {\n@@ -55,7 +55,7 @@\n \n static inline unsigned long ex_to_addr(const struct exception_table_entry *x)\n {\n-\treturn (unsigned long)&x->insn + x->insn;\n+\treturn (unsigned long)&x->addr + x->addr;\n }\n \n #ifdef CONFIG_MODULES\n"} {"commit":"a9d9f5276cb3fa08351e8837ab9398bfd8e69a2e","subject":"PCI: show host bridges and root bus resources","message":"PCI: show host bridges and root bus resources\n\nShow the bus number and resources for every root bus we create. This\nwill become more interesting when we supply the correct resources\ninstead of using the defaults (ioport_resource and iomem_resource).\n\nSigned-off-by: Bjorn Helgaas <f10ec01be0c6b54271af5c550cd257810bdf3268@google.com>\nSigned-off-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/pci\/probe.c\n+++ drivers\/pci\/probe.c\n@@ -1525,9 +1525,10 @@\n struct pci_bus * pci_create_bus(struct device *parent,\n \t\tint bus, struct pci_ops *ops, void *sysdata)\n {\n-\tint error;\n+\tint error, i;\n \tstruct pci_bus *b, *b2;\n \tstruct device *dev;\n+\tstruct resource *res;\n \n \tb = pci_alloc_bus();\n \tif (!b)\n@@ -1579,6 +1580,16 @@\n \tb->number = b->secondary = bus;\n \tb->resource[0] = &ioport_resource;\n \tb->resource[1] = &iomem_resource;\n+\n+\tif (parent)\n+\t\tdev_info(parent, \"PCI host bridge to bus %s\\n\", dev_name(&b->dev));\n+\telse\n+\t\tprintk(KERN_INFO \"PCI host bridge to bus %s\\n\", dev_name(&b->dev));\n+\n+\tpci_bus_for_each_resource(b, res, i) {\n+\t\tif (res)\n+\t\t\tdev_info(&b->dev, \"root bus resource %pR\\n\", res);\n+\t}\n \n \treturn b;\n \n"} {"commit":"4d6b5161dba1aa1964e505d2a09bfe4e3a1a7378","subject":"USB: ohci-jz4740: Fix uninitialized variable warning","message":"USB: ohci-jz4740: Fix uninitialized variable warning\n\nThe ret variable is not initialized in all code paths of the\nohci_jz4740_hub_control function. Fix it.\n\nSigned-off-by: Laurent Pinchart <3ded2f39a78f0d7044839546f95841842b4d7c96@ideasonboard.com>\nAcked-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nAcked-by: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/host\/ohci-jz4740.c\n+++ drivers\/usb\/host\/ohci-jz4740.c\n@@ -82,7 +82,7 @@\n \tu16 wIndex, char *buf, u16 wLength)\n {\n \tstruct jz4740_ohci_hcd *jz4740_ohci = hcd_to_jz4740_hcd(hcd);\n-\tint ret;\n+\tint ret = 0;\n \n \tswitch (typeReq) {\n \tcase SetHubFeature:\n"} {"commit":"22d557abf75ce39f8b2264c86058b4bcc7a8f9f0","subject":"s390\/ipl: cleanup bin attr usage","message":"s390\/ipl: cleanup bin attr usage\n\nUse macros wherever applicable and put bin_attributes inside attribute_groups\nto simplify\/remove some code.\n\nReviewed-by: Michael Holzheu <db4757c56f54651f568cc7cda79cd93c781b1605@linux.vnet.ibm.com>\nSigned-off-by: Sebastian Ott <34be3ca399e9e73d80098c083a5b58614c3ca6da@linux.vnet.ibm.com>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b0c057ca7e835b36c6050c7627634b664796c1d6","subject":"vhost: fix a theoretical race in device cleanup","message":"vhost: fix a theoretical race in device cleanup\n\nvhost_zerocopy_callback accesses VQ right after it drops a ubuf\nreference. In theory, this could race with device removal which waits\non the ubuf kref, and crash on use after free.\n\nDo all accesses within rcu read side critical section, and synchronize\non release.\n\nSince callbacks are always invoked from bh, synchronize_rcu_bh seems\nenough and will help release complete a bit faster.\n\nSigned-off-by: Michael S. Tsirkin <255103e50249e3d658441816e0597170ebfc16ef@redhat.com>\nAcked-by: Jason Wang <808efd45667dbd241e4e026b5673172419ecb43e@redhat.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/vhost\/net.c\n+++ drivers\/vhost\/net.c\n@@ -308,6 +308,8 @@\n \tstruct vhost_virtqueue *vq = ubufs->vq;\n \tint cnt;\n \n+\trcu_read_lock_bh();\n+\n \t\/* set len to mark this desc buffers done DMA *\/\n \tvq->heads[ubuf->desc].len = success ?\n \t\tVHOST_DMA_DONE_LEN : VHOST_DMA_FAILED_LEN;\n@@ -322,6 +324,8 @@\n \t *\/\n \tif (cnt <= 1 || !(cnt % 16))\n \t\tvhost_poll_queue(&vq->poll);\n+\n+\trcu_read_unlock_bh();\n }\n \n \/* Expects to be always run from workqueue - which acts as\n@@ -799,6 +803,8 @@\n \t\tfput(tx_sock->file);\n \tif (rx_sock)\n \t\tfput(rx_sock->file);\n+\t\/* Make sure no callbacks are outstanding *\/\n+\tsynchronize_rcu_bh();\n \t\/* We do an extra flush before freeing memory,\n \t * since jobs can re-queue themselves. *\/\n \tvhost_net_flush(n);\n"} {"commit":"4f3e8d263d34e52e75b5adfa14811467d3033d8e","subject":"usb: musb: use DMA mode 1 whenever possible","message":"usb: musb: use DMA mode 1 whenever possible\n\nDo not rely on any hints from gadget drivers and use DMA mode 1\nwhenever we expect data of at least the endpoint's packet size and\nhave not yet received a short packet.\n\nThe last packet if short is always transferred using DMA mode 0.\n\nThis patch fixes USB throughput issues in mass storage mode for\nhost to device transfers.\n\nSigned-off-by: Roger Quadros <eba86029bdfc5762d0419aa8dd4fd0368b2d01d4@ti.com>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/musb\/musb_gadget.c\n+++ drivers\/usb\/musb\/musb_gadget.c\n@@ -707,12 +707,11 @@\n \t\tfifo_count = musb_readw(epio, MUSB_RXCOUNT);\n \n \t\t\/*\n-\t\t * Enable Mode 1 on RX transfers only when short_not_ok flag\n-\t\t * is set. Currently short_not_ok flag is set only from\n-\t\t * file_storage and f_mass_storage drivers\n+\t\t * use mode 1 only if we expect data of at least ep packet_sz\n+\t\t * and have not yet received a short packet\n \t\t *\/\n-\n-\t\tif (request->short_not_ok && fifo_count == musb_ep->packet_sz)\n+\t\tif ((request->length - request->actual >= musb_ep->packet_sz) &&\n+\t\t\t(fifo_count >= musb_ep->packet_sz))\n \t\t\tuse_mode_1 = 1;\n \t\telse\n \t\t\tuse_mode_1 = 0;\n@@ -726,27 +725,6 @@\n \n \t\t\t\tc = musb->dma_controller;\n \t\t\t\tchannel = musb_ep->dma;\n-\n-\t\/* We use DMA Req mode 0 in rx_csr, and DMA controller operates in\n-\t * mode 0 only. So we do not get endpoint interrupts due to DMA\n-\t * completion. We only get interrupts from DMA controller.\n-\t *\n-\t * We could operate in DMA mode 1 if we knew the size of the tranfer\n-\t * in advance. For mass storage class, request->length = what the host\n-\t * sends, so that'd work. But for pretty much everything else,\n-\t * request->length is routinely more than what the host sends. For\n-\t * most these gadgets, end of is signified either by a short packet,\n-\t * or filling the last byte of the buffer. (Sending extra data in\n-\t * that last pckate should trigger an overflow fault.) But in mode 1,\n-\t * we don't get DMA completion interrupt for short packets.\n-\t *\n-\t * Theoretically, we could enable DMAReq irq (MUSB_RXCSR_DMAMODE = 1),\n-\t * to get endpoint interrupt on every DMA req, but that didn't seem\n-\t * to work reliably.\n-\t *\n-\t * REVISIT an updated g_file_storage can set req->short_not_ok, which\n-\t * then becomes usable as a runtime \"use mode 1\" hint...\n-\t *\/\n \n \t\t\t\t\/* Experimental: Mode1 works with mass storage use cases *\/\n \t\t\t\tif (use_mode_1) {\n"} {"commit":"bb4b42ce0ca36af8c113587ab64b138b3cf5459c","subject":"s390: fix gmap_ipte_notifier vs. software dirty pages","message":"s390: fix gmap_ipte_notifier vs. software dirty pages\n\nOn heavy paging load some guest cpus started to loop in gmap_ipte_notify.\nThis was visible as stalled cpus inside the guest. The gmap_ipte_notifier\ntries to map a user page and then made sure that the pte is valid and\nwritable. Turns out that with the software change bit tracking the pte\ncan become read-only (and only software writable) if the page is clean.\nSince we loop in this code, the page would stay clean and, therefore,\nbe never writable again.\nLet us just use fixup_user_fault, that guarantees to call handle_mm_fault.\n\nSigned-off-by: Christian Borntraeger <49712f635b03c16d7f4c43df70e49ec8c565813d@de.ibm.com>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/s390\/mm\/pgtable.c\n+++ arch\/s390\/mm\/pgtable.c\n@@ -677,8 +677,7 @@\n \t\t\tbreak;\n \t\t}\n \t\t\/* Get the page mapped *\/\n-\t\tif (get_user_pages(current, gmap->mm, addr, 1, 1, 0,\n-\t\t\t\t NULL, NULL) != 1) {\n+\t\tif (fixup_user_fault(current, gmap->mm, addr, FAULT_FLAG_WRITE)) {\n \t\t\trc = -EFAULT;\n \t\t\tbreak;\n \t\t}\n"} {"commit":"6c27ad83ace843d339f7893a4af0b65cdfeb130c","subject":"USB: serial: kobil_sct: switch 4 remaining printk() calls to use dev_dbg","message":"USB: serial: kobil_sct: switch 4 remaining printk() calls to use dev_dbg\n\nThese somehow got missed previously (as they weren't calling dbg(), but\nrather printk() directly), so move over to using dev_dbg() as we never\nwant to see startup messages unless debugging is enabled.\n\nCc: Johan Hovold <6a430eed381e126d51a8cce8db662f765ce314bc@gmail.com>\nCc: Alan Stern <75ea6bb7bfc1186f92d26164de5f9268c9a45b59@rowland.harvard.edu>\nCc: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/serial\/kobil_sct.c\n+++ drivers\/usb\/serial\/kobil_sct.c\n@@ -137,17 +137,16 @@\n \n \tswitch (priv->device_type) {\n \tcase KOBIL_ADAPTER_B_PRODUCT_ID:\n-\t\tprintk(KERN_DEBUG \"KOBIL B1 PRO \/ KAAN PRO detected\\n\");\n+\t\tdev_dbg(&serial->dev->dev, \"KOBIL B1 PRO \/ KAAN PRO detected\\n\");\n \t\tbreak;\n \tcase KOBIL_ADAPTER_K_PRODUCT_ID:\n-\t\tprintk(KERN_DEBUG\n-\t\t \"KOBIL KAAN Standard Plus \/ SecOVID Reader Plus detected\\n\");\n+\t\tdev_dbg(&serial->dev->dev, \"KOBIL KAAN Standard Plus \/ SecOVID Reader Plus detected\\n\");\n \t\tbreak;\n \tcase KOBIL_USBTWIN_PRODUCT_ID:\n-\t\tprintk(KERN_DEBUG \"KOBIL USBTWIN detected\\n\");\n+\t\tdev_dbg(&serial->dev->dev, \"KOBIL USBTWIN detected\\n\");\n \t\tbreak;\n \tcase KOBIL_KAAN_SIM_PRODUCT_ID:\n-\t\tprintk(KERN_DEBUG \"KOBIL KAAN SIM detected\\n\");\n+\t\tdev_dbg(&serial->dev->dev, \"KOBIL KAAN SIM detected\\n\");\n \t\tbreak;\n \t}\n \tusb_set_serial_port_data(serial->port[0], priv);\n"} {"commit":"fbc89c952f004fb9191c23605a1428df6dd39a90","subject":"s390\/mm: avoid using pmd_to_page for !USE_SPLIT_PMD_PTLOCKS","message":"s390\/mm: avoid using pmd_to_page for !USE_SPLIT_PMD_PTLOCKS\n\npmd_to_page() is only available if USE_SPLIT_PMD_PTLOCKS is defined.\nThe use of pmd_to_page in the gmap code can cause compile errors if\nNR_CPUS is smaller than SPLIT_PTLOCK_CPUS. Do not use pmd_to_page\noutside of USE_SPLIT_PMD_PTLOCKS sections.\n\nReported-by: Mike Frysinger <8f3f75c74bd5184edcfa6534cab3c13a00a2f794@gentoo.org>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ae5c6a99fb53ef833ba71151197fe46de1176863","subject":"correct ans but exceeding time limit","message":"correct ans but exceeding time limit\n","repos":"zw267\/coding-practice,zw267\/coding-practice,zw267\/coding-practice,zw267\/coding-practice","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- dsalgo\/01-linear-lists\/p0204.c\n+++ dsalgo\/01-linear-lists\/p0204.c\n@@ -37,6 +37,7 @@\n \n scanf(\"%s\", str);\n len = strlen(str);\n+ init(len);\n \n printf(\"Test case #%d\\n\", count++);\n for (i = 2; i <= len; i++) {\n@@ -63,23 +64,26 @@\n int solve(int len) {\n int max = INT_MIN;\n \n- \/\/printf(\"len: %d\", len);\n+ \/\/printf(\"len: %d \", len);\n \/\/ the length of A: [1, len \/ 2]\n int i;\n- for (i = len \/ 2; i >= 1; i++) {\n+ for (i = len \/ 2; i >= 1; i--) {\n \/\/for (i = 1; i <= len; i++) {\n- if (len % i != 0) break;\n+ if (len % i != 0) continue;\n \n \/\/ the possible number of repeations\n int j = len \/ i;\n- if (r[i - 1] > 0) return j * r[i - 1];\n-\n- \/\/printf(\"i: %d, j: %d\", i, j);\n+ \/\/printf(\"i: %d, j: %d \", i, j);\n int tmp = cmp(i, j);\n \/\/printf(\"%d \", tmp);\n- if (tmp > max) {\n- max = tmp;\n- r[len - 1] = max; \n+ \n+ if (tmp > 0) {\n+ if (r[i - 1] > 0) return j * r[i - 1];\n+\n+ if (tmp > max) {\n+ max = tmp;\n+ r[len - 1] = max;\n+ }\n }\n }\n \n"} {"commit":"3ca31911aaaf4914187a71e7e8372d957bc79106","subject":"Unbreak com@ioc probing.","message":"Unbreak com@ioc probing.\n\nok miod@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/sgi\/dev\/com_ioc.c\n+++ arch\/sgi\/dev\/com_ioc.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: com_ioc.c,v 1.2 2008\/05\/01 13:36:08 miod Exp $ *\/\n+\/*\t$OpenBSD: com_ioc.c,v 1.3 2008\/09\/17 01:29:39 jsing Exp $ *\/\n \n \/*\n * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se \/ www.opsycon.com)\n@@ -58,7 +58,7 @@\n \tint rv = 0, console;\n \n \tconsole = iot->bus_base + iaa->iaa_base ==\n-\t sys_config.cons_iot->bus_base + comconsaddr;\n+\t comconsiot->bus_base + comconsaddr;\n \n \t\/* if it's in use as console, it's there. *\/\n \tif (!(console && !comconsattached)) {\n@@ -80,7 +80,7 @@\n \tint console;\n \n \tconsole = iaa->iaa_memt->bus_base + iaa->iaa_base ==\n-\t sys_config.cons_iot->bus_base + comconsaddr;\n+\t comconsiot->bus_base + comconsaddr;\n \n \tsc->sc_hwflags = 0;\n \tsc->sc_swflags = 0;\n"} {"commit":"21823259a70b7a2a21eea1d48c25a6f38896dd11","subject":"sh: Ensure active regions have a backing PMB entry.","message":"sh: Ensure active regions have a backing PMB entry.\n\nIn the NUMA or memory hot-add case where system memory has been\npartitioned up, we immediately run in to a situation where the existing\nPMB entry doesn't cover the new range (primarily as a result of the entry\nsize being shrunk to match the node size early in the initialization). In\norder to fix this up it's necessary to preload a PMB mapping for the new\nrange prior to activation in order to circumvent reset by MMU.\n\nSigned-off-by: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/sh\/kernel\/setup.c\n+++ arch\/sh\/kernel\/setup.c\n@@ -191,13 +191,18 @@\n \t\t\t\t\t\tunsigned long end_pfn)\n {\n \tstruct resource *res = &mem_resources[nid];\n+\tunsigned long start, end;\n \n \tWARN_ON(res->name); \/* max one active range per node for now *\/\n \n+\tstart = start_pfn << PAGE_SHIFT;\n+\tend = end_pfn << PAGE_SHIFT;\n+\n \tres->name = \"System RAM\";\n-\tres->start = start_pfn << PAGE_SHIFT;\n-\tres->end = (end_pfn << PAGE_SHIFT) - 1;\n+\tres->start = start;\n+\tres->end = end - 1;\n \tres->flags = IORESOURCE_MEM | IORESOURCE_BUSY;\n+\n \tif (request_resource(&iomem_resource, res)) {\n \t\tpr_err(\"unable to request memory_resource 0x%lx 0x%lx\\n\",\n \t\t start_pfn, end_pfn);\n@@ -212,6 +217,14 @@\n \trequest_resource(res, &code_resource);\n \trequest_resource(res, &data_resource);\n \trequest_resource(res, &bss_resource);\n+\n+\t\/*\n+\t * Also make sure that there is a PMB mapping that covers this\n+\t * range before we attempt to activate it, to avoid reset by MMU.\n+\t * We can hit this path with NUMA or memory hot-add.\n+\t *\/\n+\tpmb_bolt_mapping((unsigned long)__va(start), start, end - start,\n+\t\t\t PAGE_KERNEL);\n \n \tadd_active_range(nid, start_pfn, end_pfn);\n }\n"} {"commit":"b32d0ff71ea29cede4140f0b031456f99bdb7603","subject":"unified\/x86: fix IAMCU build","message":"unified\/x86: fix IAMCU build\n\nUnified kernel does not provide the _thread_arg_t type, but instead uses\nvoid * directly for its thread entry parameters. _thread_entry_t is\ntypedefed from void * anyway, and only obfuscates the type. So, define\n_thread_entry_t to be a function pointer to a function with three void *\nparameters, and when the unified kernel becomes the only kernel, all the\n_thread_arg_t types will go away.\n\nWith this change, IAMCU runs all the tests sysV x86 is able to run as a\nunified kernel.\n\nChange-Id: I53c8754629a5a0a114a16a775ff1efc1884496ff\nSigned-off-by: Benjamin Walsh <578db18f23ec223e50c404886c947386478a464e@windriver.com>\n","repos":"aceofall\/zephyr-iotos,erwango\/zephyr,erwango\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,punitvara\/zephyr,holtmann\/zephyr,GiulianoFranchetto\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,explora26\/zephyr,sharronliu\/zephyr,runchip\/zephyr-cc3200,tidyjiang8\/zephyr-doc,mbolivar\/zephyr,punitvara\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,nashif\/zephyr,GiulianoFranchetto\/zephyr,bigdinotech\/zephyr,ldts\/zephyr,rsalveti\/zephyr,runchip\/zephyr-cc3220,explora26\/zephyr,aceofall\/zephyr-iotos,zephyriot\/zephyr,tidyjiang8\/zephyr-doc,bboozzoo\/zephyr,galak\/zephyr,finikorg\/zephyr,nashif\/zephyr,zephyriot\/zephyr,fractalclone\/zephyr-riscv,erwango\/zephyr,sharronliu\/zephyr,pklazy\/zephyr,ldts\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,tidyjiang8\/zephyr-doc,mbolivar\/zephyr,runchip\/zephyr-cc3200,explora26\/zephyr,mbolivar\/zephyr,tidyjiang8\/zephyr-doc,holtmann\/zephyr,finikorg\/zephyr,fbsder\/zephyr,Vudentz\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,erwango\/zephyr,nashif\/zephyr,Vudentz\/zephyr,kraj\/zephyr,finikorg\/zephyr,fractalclone\/zephyr-riscv,holtmann\/zephyr,runchip\/zephyr-cc3200,sharronliu\/zephyr,zephyriot\/zephyr,Vudentz\/zephyr,nashif\/zephyr,holtmann\/zephyr,rsalveti\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,pklazy\/zephyr,runchip\/zephyr-cc3220,fractalclone\/zephyr-riscv,punitvara\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,kraj\/zephyr,bboozzoo\/zephyr,holtmann\/zephyr,explora26\/zephyr,kraj\/zephyr,fbsder\/zephyr,pklazy\/zephyr,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos,Vudentz\/zephyr,punitvara\/zephyr,pklazy\/zephyr,sharronliu\/zephyr,nashif\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,fbsder\/zephyr,bboozzoo\/zephyr,rsalveti\/zephyr,rsalveti\/zephyr,kraj\/zephyr,rsalveti\/zephyr,bboozzoo\/zephyr,ldts\/zephyr,zephyriot\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyriot\/zephyr,runchip\/zephyr-cc3220,zephyrproject-rtos\/zephyr,fractalclone\/zephyr-riscv,tidyjiang8\/zephyr-doc,pklazy\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,galak\/zephyr,kraj\/zephyr,sharronliu\/zephyr,aceofall\/zephyr-iotos,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,fbsder\/zephyr,Vudentz\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/core\/thread.c\n+++ arch\/x86\/core\/thread.c\n@@ -45,8 +45,8 @@\n \n #if defined(CONFIG_GDB_INFO) || defined(CONFIG_DEBUG_INFO) \\\n \t|| defined(CONFIG_X86_IAMCU)\n-void _thread_entry_wrapper(_thread_entry_t, _thread_arg_t,\n-\t\t\t _thread_arg_t, _thread_arg_t);\n+void _thread_entry_wrapper(_thread_entry_t, void *,\n+\t\t\t void *, void *);\n #endif\n \n \/**\n"} {"commit":"6a1e008a0915f502eb026fb995ea3e49d5b017f7","subject":"x86: Increase MAX_EARLY_RES; insufficient on 32-bit NUMA","message":"x86: Increase MAX_EARLY_RES; insufficient on 32-bit NUMA\n\nDue to recent changes wakeup and mptable, we run out of early\nreservations on 32-bit NUMA. Thus, adjust the available number.\n\nSigned-off-by: Yinghai Lu <0674548f4d596393408a51d6287a76ebba2f42aa@kernel.org>\nLKML-Reference: <82c48c2cd52963680d1c129c0c477b943408669b@kernel.org>\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/kernel\/e820.c\n+++ arch\/x86\/kernel\/e820.c\n@@ -724,7 +724,7 @@\n \/*\n * Early reserved memory areas.\n *\/\n-#define MAX_EARLY_RES 20\n+#define MAX_EARLY_RES 32\n \n struct early_res {\n \tu64 start, end;\n"} {"commit":"e97e883f8bfbe02cfc2bfff45e68921dfe590c7e","subject":"KVM: x86 emulator: fix 'and AL,imm8' instruction decoding","message":"KVM: x86 emulator: fix 'and AL,imm8' instruction decoding\n\n'and AL,imm8' should be mask as ByteOp, otherwise the dest operand\nlength will no correct and we may fill the full EAX when writeback.\n\nSigned-off-by: Wei Yongjun <f52b9831d10c067ffbc33238e89e1e27651b0884@cn.fujitsu.com>\nSigned-off-by: Avi Kivity <8f920f22884d6fea9df883843c4a8095a2e5ac6f@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kvm\/emulate.c\n+++ arch\/x86\/kvm\/emulate.c\n@@ -123,7 +123,7 @@\n \t\/* 0x20 - 0x27 *\/\n \tByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,\n \tByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,\n-\tDstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,\n+\tByteOp | DstAcc | SrcImmByte, DstAcc | SrcImm, 0, 0,\n \t\/* 0x28 - 0x2F *\/\n \tByteOp | DstMem | SrcReg | ModRM | Lock, DstMem | SrcReg | ModRM | Lock,\n \tByteOp | DstReg | SrcMem | ModRM, DstReg | SrcMem | ModRM,\n"} {"commit":"7af04fc05cc185869271927eb470de3d25064b4a","subject":"KVM: x86 emulator: implement DAS (opcode 2F)","message":"KVM: x86 emulator: implement DAS (opcode 2F)\n\nSigned-off-by: Avi Kivity <8f920f22884d6fea9df883843c4a8095a2e5ac6f@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kvm\/emulate.c\n+++ arch\/x86\/kvm\/emulate.c\n@@ -2175,6 +2175,45 @@\n \treturn X86EMUL_CONTINUE;\n }\n \n+static int em_das(struct x86_emulate_ctxt *ctxt)\n+{\n+\tstruct decode_cache *c = &ctxt->decode;\n+\tu8 al, old_al;\n+\tbool af, cf, old_cf;\n+\n+\tcf = ctxt->eflags & X86_EFLAGS_CF;\n+\tal = c->dst.val;\n+\n+\told_al = al;\n+\told_cf = cf;\n+\tcf = false;\n+\taf = ctxt->eflags & X86_EFLAGS_AF;\n+\tif ((al & 0x0f) > 9 || af) {\n+\t\tal -= 6;\n+\t\tcf = old_cf | (al >= 250);\n+\t\taf = true;\n+\t} else {\n+\t\taf = false;\n+\t}\n+\tif (old_al > 0x99 || old_cf) {\n+\t\tal -= 0x60;\n+\t\tcf = true;\n+\t}\n+\n+\tc->dst.val = al;\n+\t\/* Set PF, ZF, SF *\/\n+\tc->src.type = OP_IMM;\n+\tc->src.val = 0;\n+\tc->src.bytes = 1;\n+\temulate_2op_SrcV(\"or\", c->src, c->dst, ctxt->eflags);\n+\tctxt->eflags &= ~(X86_EFLAGS_AF | X86_EFLAGS_CF);\n+\tif (cf)\n+\t\tctxt->eflags |= X86_EFLAGS_CF;\n+\tif (af)\n+\t\tctxt->eflags |= X86_EFLAGS_AF;\n+\treturn X86EMUL_CONTINUE;\n+}\n+\n #define D(_y) { .flags = (_y) }\n #define N D(0)\n #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }\n@@ -2258,7 +2297,8 @@\n \t\/* 0x28 - 0x2F *\/\n \tD(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),\n \tD(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),\n-\tD(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm), N, N,\n+\tD(ByteOp | DstAcc | SrcImmByte), D(DstAcc | SrcImm),\n+\tN, I(ByteOp | DstAcc | No64, em_das),\n \t\/* 0x30 - 0x37 *\/\n \tD(ByteOp | DstMem | SrcReg | ModRM | Lock), D(DstMem | SrcReg | ModRM | Lock),\n \tD(ByteOp | DstReg | SrcMem | ModRM), D(DstReg | SrcMem | ModRM),\n"} {"commit":"6550e1f165f384f3a46b60a1be9aba4bc3c2adad","subject":"KVM: x86 emulator: add decoding of CMPXCHG8B dst operand","message":"KVM: x86 emulator: add decoding of CMPXCHG8B dst operand\n\nDecode CMPXCHG8B destination operand in decoding stage. Fixes regression\nintroduced by \"If LOCK prefix is used dest arg should be memory\" commit.\nThis commit relies on dst operand be decoded at the beginning of an\ninstruction emulation.\n\nSigned-off-by: Gleb Natapov <03189597947f75187c4136ade35aec34feed9dc1@redhat.com>\nSigned-off-by: Avi Kivity <8f920f22884d6fea9df883843c4a8095a2e5ac6f@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kvm\/emulate.c\n+++ arch\/x86\/kvm\/emulate.c\n@@ -52,6 +52,7 @@\n #define DstMem (3<<1)\t\/* Memory operand. *\/\n #define DstAcc (4<<1) \/* Destination Accumulator *\/\n #define DstDI (5<<1)\t\/* Destination is in ES:(E)DI *\/\n+#define DstMem64 (6<<1)\t\/* 64bit memory operand *\/\n #define DstMask (7<<1)\n \/* Source operand type. *\/\n #define SrcNone (0<<4)\t\/* No source operand. *\/\n@@ -360,7 +361,7 @@\n \tDstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM | Lock,\n \tDstMem | SrcImmByte | ModRM | Lock, DstMem | SrcImmByte | ModRM | Lock,\n \t[Group9*8] =\n-\t0, ImplicitOps | ModRM | Lock, 0, 0, 0, 0, 0, 0,\n+\t0, DstMem64 | ModRM | Lock, 0, 0, 0, 0, 0, 0,\n };\n \n static u32 group2_table[] = {\n@@ -1205,6 +1206,7 @@\n \t\t\t c->twobyte && (c->b == 0xb6 || c->b == 0xb7));\n \t\tbreak;\n \tcase DstMem:\n+\tcase DstMem64:\n \t\tif ((c->d & ModRM) && c->modrm_mod == 3) {\n \t\t\tc->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;\n \t\t\tc->dst.type = OP_REG;\n@@ -1214,7 +1216,10 @@\n \t\t}\n \t\tc->dst.type = OP_MEM;\n \t\tc->dst.ptr = (unsigned long *)c->modrm_ea;\n-\t\tc->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;\n+\t\tif ((c->d & DstMask) == DstMem64)\n+\t\t\tc->dst.bytes = 8;\n+\t\telse\n+\t\t\tc->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;\n \t\tc->dst.val = 0;\n \t\tif (c->d & BitOp) {\n \t\t\tunsigned long mask = ~(c->dst.bytes * 8 - 1);\n@@ -1706,12 +1711,7 @@\n \t\t\t struct x86_emulate_ops *ops)\n {\n \tstruct decode_cache *c = &ctxt->decode;\n-\tu64 old, new;\n-\tint rc;\n-\n-\trc = ops->read_emulated(c->modrm_ea, &old, 8, ctxt->vcpu);\n-\tif (rc != X86EMUL_CONTINUE)\n-\t\treturn rc;\n+\tu64 old = c->dst.orig_val;\n \n \tif (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||\n \t ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {\n@@ -1719,15 +1719,12 @@\n \t\tc->regs[VCPU_REGS_RAX] = (u32) (old >> 0);\n \t\tc->regs[VCPU_REGS_RDX] = (u32) (old >> 32);\n \t\tctxt->eflags &= ~EFLG_ZF;\n-\n \t} else {\n-\t\tnew = ((u64)c->regs[VCPU_REGS_RCX] << 32) |\n+\t\tc->dst.val = ((u64)c->regs[VCPU_REGS_RCX] << 32) |\n \t\t (u32) c->regs[VCPU_REGS_RBX];\n \n-\t\trc = ops->cmpxchg_emulated(c->modrm_ea, &old, &new, 8, ctxt->vcpu);\n-\t\tif (rc != X86EMUL_CONTINUE)\n-\t\t\treturn rc;\n \t\tctxt->eflags |= EFLG_ZF;\n+\t\tc->lock_prefix = 1;\n \t}\n \treturn X86EMUL_CONTINUE;\n }\n@@ -3245,7 +3242,6 @@\n \t\trc = emulate_grp9(ctxt, ops);\n \t\tif (rc != X86EMUL_CONTINUE)\n \t\t\tgoto done;\n-\t\tc->dst.type = OP_NONE;\n \t\tbreak;\n \t}\n \tgoto writeback;\n"} {"commit":"f8da94e9e44b237fa5cc8521faeb714dc2e83b54","subject":"KVM: x86 emulator: Fix segment loading in VM86","message":"KVM: x86 emulator: Fix segment loading in VM86\n\nThis fixes a regression introduced in commit 03ebebeb1 (\"KVM: x86\nemulator: Leave segment limit and attributs alone in real mode\").\n\nThe mentioned commit changed the segment descriptors for both real mode\nand VM86 to only update the segment base instead of creating a\ncompletely new descriptor with limit 0xffff so that unreal mode keeps\nworking across a segment register reload.\n\nThis leads to an invalid segment descriptor in the eyes of VMX, which\nseems to be okay for real mode because KVM will fix it up before the\nnext VM entry or emulate the state, but it doesn't do this if the guest\nis in VM86, so we end up with:\n\n KVM: entry failed, hardware error 0x80000021\n\nFix this by effectively reverting commit 03ebebeb1 for VM86 and leaving\nit only in place for real mode, which is where it's really needed.\n\nSigned-off-by: Kevin Wolf <b75d81c03bd01637475de8fdfe57bd6e8b41a08d@redhat.com>\nSigned-off-by: Gleb Natapov <03189597947f75187c4136ade35aec34feed9dc1@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/kvm\/emulate.c\n+++ arch\/x86\/kvm\/emulate.c\n@@ -1578,11 +1578,20 @@\n \n \tmemset(&seg_desc, 0, sizeof seg_desc);\n \n-\tif ((seg <= VCPU_SREG_GS && ctxt->mode == X86EMUL_MODE_VM86)\n-\t || ctxt->mode == X86EMUL_MODE_REAL) {\n-\t\t\/* set real mode segment descriptor *\/\n+\tif (ctxt->mode == X86EMUL_MODE_REAL) {\n+\t\t\/* set real mode segment descriptor (keep limit etc. for\n+\t\t * unreal mode) *\/\n \t\tctxt->ops->get_segment(ctxt, &dummy, &seg_desc, NULL, seg);\n \t\tset_desc_base(&seg_desc, selector << 4);\n+\t\tgoto load;\n+\t} else if (seg <= VCPU_SREG_GS && ctxt->mode == X86EMUL_MODE_VM86) {\n+\t\t\/* VM86 needs a clean new segment descriptor *\/\n+\t\tset_desc_base(&seg_desc, selector << 4);\n+\t\tset_desc_limit(&seg_desc, 0xffff);\n+\t\tseg_desc.type = 3;\n+\t\tseg_desc.p = 1;\n+\t\tseg_desc.s = 1;\n+\t\tseg_desc.dpl = 3;\n \t\tgoto load;\n \t}\n \n"} {"commit":"62d2dbf789ead6344e930ff1b8eb229a87b23d1d","subject":"CDRIVER-2478 mongoc-stat compile err w\/o counters","message":"CDRIVER-2478 mongoc-stat compile err w\/o counters\n\nIf the driver is built with --disable-shm-counters, mongoc-stat should\nprint a runtime error, rather than fail to build.\n","repos":"acmorrow\/mongo-c-driver,rcsanchez97\/mongo-c-driver,acmorrow\/mongo-c-driver,derickr\/mongo-c-driver,rcsanchez97\/mongo-c-driver,remicollet\/mongo-c-driver,remicollet\/mongo-c-driver,remicollet\/mongo-c-driver,jmikola\/mongo-c-driver,beingmeta\/mongo-c-driver,mongodb\/mongo-c-driver,ajdavis\/mongo-c-driver,beingmeta\/mongo-c-driver,beingmeta\/mongo-c-driver,derickr\/mongo-c-driver,ajdavis\/mongo-c-driver,acmorrow\/mongo-c-driver,acmorrow\/mongo-c-driver,rcsanchez97\/mongo-c-driver,beingmeta\/mongo-c-driver,mongodb\/mongo-c-driver,rcsanchez97\/mongo-c-driver,ajdavis\/mongo-c-driver,mongodb\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,mongodb\/mongo-c-driver,jmikola\/mongo-c-driver,ajdavis\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,acmorrow\/mongo-c-driver,rcsanchez97\/mongo-c-driver,remicollet\/mongo-c-driver,ajdavis\/mongo-c-driver,remicollet\/mongo-c-driver,ajdavis\/mongo-c-driver,remicollet\/mongo-c-driver,mongodb\/mongo-c-driver,jmikola\/mongo-c-driver,derickr\/mongo-c-driver,rcsanchez97\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,beingmeta\/mongo-c-driver,rcsanchez97\/mongo-c-driver,beingmeta\/mongo-c-driver,remicollet\/mongo-c-driver,acmorrow\/mongo-c-driver,derickr\/mongo-c-driver,ajdavis\/mongo-c-driver,beingmeta\/mongo-c-driver,derickr\/mongo-c-driver,derickr\/mongo-c-driver,jmikola\/mongo-c-driver,derickr\/mongo-c-driver,jmikola\/mongo-c-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/tools\/mongoc-stat.c\n+++ src\/tools\/mongoc-stat.c\n@@ -18,7 +18,7 @@\n #include <bson.h>\n \n \n-#ifdef BSON_OS_UNIX\n+#if defined(BSON_OS_UNIX) && defined(MONGOC_ENABLE_SHM_COUNTERS)\n \n \n #include <fcntl.h>\n"} {"commit":"f5b2831d654167d77da8afbef4d2584897b12d0c","subject":"x86: Respect PAT bit when copying pte values between large and normal pages","message":"x86: Respect PAT bit when copying pte values between large and normal pages\n\nThe PAT bit in the ptes is not moved to the correct position when\ncopying page protection attributes between entries of different sized\npages. Translate the ptes according to their page size.\n\nBased-on-patch-by: Stefan Bader <00beb3b1b08625be3b68f3989c75be8de7f2fd89@canonical.com>\nSigned-off-by: Juergen Gross <29bbaec13092d36559e3abc6f27f7d09c395819f@suse.com>\nReviewed-by: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nCc: 00beb3b1b08625be3b68f3989c75be8de7f2fd89@canonical.com\nCc: 196a79ea1bad81d8c954adf793448b0a45442f28@lists.xensource.com\nCc: da3a51b335cef0eb0e2c329c5ef6bcd6acef687a@oracle.com\nCc: cd6e8d405ca90be3a03d5427c5b24fbd2d68dcc4@linux.intel.com\nCc: b9d45bd1f671e508cd8daa63dfc3cabb597562df@citrix.com\nCc: 01de09643e0ae62e116f8bd77de435799874b456@suse.com\nCc: 322b9f75d3806917607539efc168804d71b9503d@hp.com\nCc: 9fc55922e47e21cb004bb878f69efa10ab51cf02@jcrosoft.com\nCc: e1ca4dbb8be1acaf20734fecd2da10ed1d46a9bb@ti.com\nCc: f10ec01be0c6b54271af5c550cd257810bdf3268@google.com\nLink: http:\/\/lkml.kernel.org\/r\/1415019724-4317-17-git-send-email-29bbaec13092d36559e3abc6f27f7d09c395819f@suse.com\nSigned-off-by: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"8780ddb2e19611f59250d0d14fbf6bf34412be2b","subject":"opensc-tool: no unnecessary spaces around \"DF\"","message":"opensc-tool: no unnecessary spaces around \"DF\"\n\nSigned-off-by: Peter Marschall <4b8373d016f277527198385ba72fda0feb5da015@adpm.de>\n","repos":"mouse07410\/OpenSC,fabled\/OpenSC,dirkx\/OpenSC,martinpaljak\/OpenSC,AktivCo\/OpenSC,rickyepoderi\/OpenSC,marschap\/pkg-opensc,velter\/OpenSC,jpki\/OpenSC,0x7678\/myOpenSC,dirkx\/OpenSC.tokend,Jakuje\/OpenSC,philipWendland\/OpenSC,carlhoerberg\/OpenSC,aobaid\/OpenSC,kasparsd\/opensc-latvia-id,financeX\/OpenSC,marschap\/pkg-opensc,nmav\/OpenSC,AktivCo\/OpenSC,velter\/OpenSC,UIKit0\/OpenSC,mtrojnar\/OpenSC,germanblanco\/OpenSC,gemini\/OpenSC,carlhoerberg\/OpenSC,tidatida\/OpenSC,dirkx\/OpenSC,germanblanco\/OpenSC,LudovicRousseau\/OpenSC,0x7678\/OpenSC,Jakuje\/OpenSC,dirkx\/OpenSC.tokend,fabled\/OpenSC,martinpaljak\/OpenSC,velter\/OpenSC,financeX\/OpenSC,nmav\/OpenSC,mouse07410\/OpenSC,germanblanco\/OpenSC,dirkx\/OpenSC,tidatida\/OpenSC,OpenSC\/OpenSC,dirkx\/OpenSC,hongquan\/OpenSC-main,mtrojnar\/OpenSC,tidatida\/OpenSC,mtrojnar\/OpenSC,frankmorgner\/OpenSC,fabled\/OpenSC,jpki\/OpenSC,UIKit0\/OpenSC,metsma\/OpenSC,CardContact\/OpenSC,0x7678\/OpenSC,frankmorgner\/OpenSC,martinpaljak\/OpenSC,jpki\/OpenSC,kasparsd\/opensc-latvia-id,kasparsd\/opensc-latvia-id,gemini\/OpenSC,carlhoerberg\/OpenSC,OpenSC\/OpenSC,CardContact\/OpenSC,dengert\/OpenSC,hhonkanen\/OpenSC,nmav\/OpenSC,marschap\/pkg-opensc,rickyepoderi\/OpenSC,hongquan\/OpenSC-main,financeX\/OpenSC,CardContact\/OpenSC,AktivCo\/OpenSC,viktorTarasov\/OpenSC-SM,philipWendland\/OpenSC,UIKit0\/OpenSC,fabled\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,rickyepoderi\/OpenSC,hhonkanen\/OpenSC,UIKit0\/OpenSC,aobaid\/OpenSC,ieugen\/OpenSC,0x7678\/OpenSC,financeX\/OpenSC,l1k\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,carlhoerberg\/OpenSC,dirkx\/OpenSC.tokend,hhonkanen\/OpenSC,0x7678\/OpenSC,adminmt\/OpenSC,mouse07410\/OpenSC,LudovicRousseau\/OpenSC,LudovicRousseau\/OpenSC,dengert\/OpenSC,dirkx\/OpenSC.tokend,ieugen\/OpenSC,velter\/OpenSC,0x7678\/myOpenSC,gentoo\/OpenSC,metsma\/OpenSC,frankmorgner\/OpenSC,gentoo\/OpenSC,0x7678\/myOpenSC,dirkx\/OpenSC.tokend,dirkx\/OpenSC.tokend,0x7678\/myOpenSC,ieugen\/OpenSC,l1k\/OpenSC,marschap\/pkg-opensc,0x7678\/myOpenSC,financeX\/OpenSC,gentoo\/OpenSC,hongquan\/OpenSC-main,aobaid\/OpenSC,frankmorgner\/OpenSC,kasparsd\/opensc-latvia-id,Jakuje\/OpenSC,l1k\/OpenSC,philipWendland\/OpenSC,tidatida\/OpenSC,adminmt\/OpenSC,metsma\/OpenSC,adminmt\/OpenSC,adminmt\/OpenSC,viktorTarasov\/OpenSC-SM,gemini\/OpenSC,viktorTarasov\/OpenSC-SM,dirkx\/OpenSC,dengert\/OpenSC,OpenSC\/OpenSC,Jakuje\/OpenSC,aobaid\/OpenSC,carlhoerberg\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/opensc-tool.c\n+++ src\/tools\/opensc-tool.c\n@@ -332,13 +332,13 @@\n \t\ttmps = \"iEF\";\n \t\tbreak;\n \tcase SC_FILE_TYPE_DF:\n-\t\ttmps = \" DF\";\n+\t\ttmps = \"DF\";\n \t\tbreak;\n \tdefault:\n \t\ttmps = \"unknown\";\n \t\tbreak;\n \t}\n-\tprintf(\"type: %-3s, \", tmps);\n+\tprintf(\"type: %s, \", tmps);\n \tif (file->type != SC_FILE_TYPE_DF) {\n \t\tconst id2str_t ef_type_name[] = {\n \t\t\t{ SC_FILE_EF_TRANSPARENT, \"transparent\" },\n"} {"commit":"dd2994f619752fb731f21c89ad16536dd6673948","subject":"[PATCH] Add sparse annotations to quiet sparse in arch\/x86_64\/mm\/fault.c","message":"[PATCH] Add sparse annotations to quiet sparse in arch\/x86_64\/mm\/fault.c\n\nFixes\n\nlinux\/arch\/x86_64\/mm\/fault.c:125:7: warning: incorrect type in argument 1 (different address spaces)\nlinux\/arch\/x86_64\/mm\/fault.c:125:7: expected void [noderef] *<noident><asn:1>\nlinux\/arch\/x86_64\/mm\/fault.c:125:7: got unsigned char *[assigned] instr\nlinux\/arch\/x86_64\/mm\/fault.c:163:8: warning: incorrect type in argument 1 (different address spaces)\nlinux\/arch\/x86_64\/mm\/fault.c:163:8: expected void [noderef] *<noident><asn:1>\nlinux\/arch\/x86_64\/mm\/fault.c:163:8: got unsigned char *[assigned] instr\nlinux\/arch\/x86_64\/mm\/fault.c:179:9: warning: incorrect type in argument 1 (different address spaces)\nlinux\/arch\/x86_64\/mm\/fault.c:179:9: expected void [noderef] *<noident><asn:1>\nlinux\/arch\/x86_64\/mm\/fault.c:179:9: got unsigned long *<noident>\n\nSigned-off-by: Andi Kleen <0474aee45985f5ae829f53849df476200e876990@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86_64\/mm\/fault.c\n+++ arch\/x86_64\/mm\/fault.c\n@@ -102,7 +102,7 @@\n static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,\n \t\t\t\tunsigned long error_code)\n { \n-\tunsigned char *instr;\n+\tunsigned char __user *instr;\n \tint scan_more = 1;\n \tint prefetch = 0; \n \tunsigned char *max_instr;\n@@ -111,7 +111,7 @@\n \tif (error_code & PF_INSTR)\n \t\treturn 0;\n \t\n-\tinstr = (unsigned char *)convert_rip_to_linear(current, regs);\n+\tinstr = (unsigned char __user *)convert_rip_to_linear(current, regs);\n \tmax_instr = instr + 15;\n \n \tif (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE)\n@@ -122,7 +122,7 @@\n \t\tunsigned char instr_hi;\n \t\tunsigned char instr_lo;\n \n-\t\tif (__get_user(opcode, instr))\n+\t\tif (__get_user(opcode, (char __user *)instr))\n \t\t\tbreak; \n \n \t\tinstr_hi = opcode & 0xf0; \n@@ -160,7 +160,7 @@\n \t\tcase 0x00:\n \t\t\t\/* Prefetch instruction is 0x0F0D or 0x0F18 *\/\n \t\t\tscan_more = 0;\n-\t\t\tif (__get_user(opcode, instr)) \n+\t\t\tif (__get_user(opcode, (char __user *)instr))\n \t\t\t\tbreak;\n \t\t\tprefetch = (instr_lo == 0xF) &&\n \t\t\t\t(opcode == 0x0D || opcode == 0x18);\n@@ -176,7 +176,7 @@\n static int bad_address(void *p) \n { \n \tunsigned long dummy;\n-\treturn __get_user(dummy, (unsigned long *)p);\n+\treturn __get_user(dummy, (unsigned long __user *)p);\n } \n \n void dump_pagetable(unsigned long address)\n"} {"commit":"da9bae038cbe757ef4c775086335fb7c7c6d4287","subject":"CHanged opt_salt to salt_len","message":"CHanged opt_salt to salt_len\n","repos":"mouse07410\/OpenSC,mouse07410\/OpenSC,mouse07410\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs11-tool.c\n+++ src\/tools\/pkcs11-tool.c\n@@ -327,8 +327,8 @@\n static unsigned long\topt_random_bytes = 0;\n static CK_MECHANISM_TYPE opt_hash_alg = 0;\n static unsigned long\topt_mgf = 0;\n-static unsigned long\topt_salt = 0;\n-static int opt_salt_given = 0; \/* 0 - not given, 1 - given with input parameters *\/\n+static long\t salt_len = 0;\n+static int salt_len_given = 0; \/* 0 - not given, 1 - given with input parameters *\/\n \n static void *module = NULL;\n static CK_FUNCTION_LIST_PTR p11 = NULL;\n@@ -695,8 +695,8 @@\n \t\t\topt_mgf = p11_name_to_mgf(optarg);\n \t\t\tbreak;\n \t\tcase OPT_SALT:\n-\t\t\topt_salt = (CK_ULONG) strtoul(optarg, NULL, 0);\n- opt_salt_given = 1;\n+\t\t\tsalt_len = (CK_ULONG) strtoul(optarg, NULL, 0);\n+ salt_len_given = 1;\n \t\t\tbreak;\n \t\tcase 'o':\n \t\t\topt_output = optarg;\n@@ -1719,8 +1719,8 @@\n \tif (pss_params.hashAlg) {\n \t\tif (opt_mgf != 0)\n \t\t\tpss_params.mgf = opt_mgf;\n- if (opt_salt_given == 1)\n- pss_params.sLen = opt_salt;\n+ if (salt_len_given == 1)\n+ pss_params.sLen = salt_len;\n else\n pss_params.sLen = figure_pss_salt_length(pss_params.hashAlg);\n \t\tmech.pParameter = &pss_params;\n"} {"commit":"3ba80e7595f3e308e5e7135445b513779fc0ba3b","subject":"[PATCH] x86_64: Remove unnecessary include in fault.c","message":"[PATCH] x86_64: Remove unnecessary include in fault.c\n\nSigned-off-by: Andi Kleen <0474aee45985f5ae829f53849df476200e876990@suse.de>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86_64\/mm\/fault.c\n+++ arch\/x86_64\/mm\/fault.c\n@@ -23,7 +23,6 @@\n #include <linux\/vt_kern.h>\t\t\/* For unblank_screen() *\/\n #include <linux\/compiler.h>\n #include <linux\/module.h>\n-#include <linux\/kprobes.h>\n \n #include <asm\/system.h>\n #include <asm\/uaccess.h>\n"} {"commit":"fc424dd15c54edfb59a3b6bdb65f05eafa58d969","subject":"Added preliminary support for RSA-OAEP to pkcs11-tool Fixed CKM names","message":"Added preliminary support for RSA-OAEP to pkcs11-tool\nFixed CKM names\n","repos":"mouse07410\/OpenSC,mouse07410\/OpenSC,mouse07410\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs11-tool.c\n+++ src\/tools\/pkcs11-tool.c\n@@ -1685,7 +1685,7 @@\n \t\tswitch (opt_hash_alg) {\n \t\tcase CKM_SHA_1:\n \t\t\tpss_params.mgf = CKG_MGF1_SHA1;\n-\t\t\tbreak;\n+ break; \n \t\tcase CKM_SHA256:\n \t\t\tpss_params.mgf = CKG_MGF1_SHA256;\n \t\t\tbreak;\n@@ -1840,6 +1840,7 @@\n \tunsigned char\tin_buffer[1024], out_buffer[1024];\n \tCK_MECHANISM\tmech;\n \tCK_RV\t\trv;\n+\tCK_RSA_PKCS_OAEP_PARAMS oaep_params;\n \tCK_ULONG\tin_len, out_len;\n \tint\t\tfd, r;\n \n@@ -1850,6 +1851,11 @@\n \tfprintf(stderr, \"Using decrypt algorithm %s\\n\", p11_mechanism_to_name(opt_mechanism));\n \tmemset(&mech, 0, sizeof(mech));\n \tmech.mechanism = opt_mechanism;\n+\toaep_params.hashAlg = 0;\n+\n+\tif (opt_hash_alg != 0 && opt_mechanism != CKM_RSA_PKCS_OAEP)\n+\t\tutil_fatal(\"The hash-algorithm is applicable only to generic\"\n+ \"RSA-PKCS-OAEP mechanism\"); \n \n \tif (opt_input == NULL)\n \t\tfd = 0;\n@@ -1860,6 +1866,77 @@\n \tif (r < 0)\n \t\tutil_fatal(\"Cannot read from %s: %m\", opt_input);\n \tin_len = r;\n+\n+\t\/* set \"default\" MGF and hash algorithms. We can overwrite MGF later *\/\n+\tswitch (opt_mechanism) {\n+\tcase CKM_RSA_PKCS_OAEP:\n+\t\tswitch (opt_hash_alg) {\n+\t\tcase CKM_SHA_1:\n+\t\t\toaep_params.mgf = CKG_MGF1_SHA1;\n+\t\t\tbreak;\n+\t\tcase CKM_SHA256:\n+\t\t\toaep_params.mgf = CKG_MGF1_SHA256;\n+\t\t\tbreak;\n+\t\tcase CKM_SHA384:\n+\t\t\toaep_params.mgf = CKG_MGF1_SHA384;\n+\t\t\tbreak;\n+\t\tcase CKM_SHA512:\n+\t\t\toaep_params.mgf = CKG_MGF1_SHA512;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tutil_fatal(\"RSA-PKCS-OAEP requires explicit hash mechanism\");\n+\t\t}\n+\t\toaep_params.hashAlg = opt_hash_alg;\n+\t\tbreak;\n+\n+#if 0 \/* we do not have these definitions yet! *\/\n+\tcase CKM_SHA1_RSA_PKCS_OAEP:\n+\t\toaep_params.hashAlg = CKM_SHA_1;\n+\t\toaep_params.mgf = CKG_MGF1_SHA1;\n+\t\tbreak;\n+\n+\tcase CKM_SHA256_RSA_PKCS_OAEP:\n+\t\toaep_params.hashAlg = CKM_SHA256;\n+\t\toaep_params.mgf = CKG_MGF1_SHA256;\n+\t\tbreak;\n+\n+\tcase CKM_SHA384_RSA_PKCS_OAEP:\n+\t\toaep_params.hashAlg = CKM_SHA384;\n+\t\toaep_params.mgf = CKG_MGF1_SHA384;\n+\t\tbreak;\n+\n+\tcase CKM_SHA512_RSA_PKCS_OAEP:\n+\t\toaep_params.hashAlg = CKM_SHA512;\n+\t\toaep_params.mgf = CKG_MGF1_SHA512;\n+\t\tbreak;\n+#endif\n+\tdefault:\n+\t\tutil_fatal(\"Illegal mechanism %s for RSA-OAEP\\n\", p11_mechanism_to_name(opt_mechanism));\n+\t}\n+\n+\n+\t\/* One of RSA-OAEP mechanisms above: They need parameters *\/\n+\tif (oaep_params.hashAlg) {\n+\t\tif (opt_mgf != 0)\n+\t\t\toaep_params.mgf = opt_mgf;\n+\n+\t\toaep_params.pSourceData = in_buffer;\n+\t\toaep_params.ulSourceDataLen = in_len;\n+\n+\t\tmech.pParameter = &oaep_params;\n+\t\tmech.ulParameterLen = sizeof(oaep_params);\n+\n+\t\tfprintf(stderr, \"OAEP parameters: hashAlg=%s, mgf=%s, data_len=%lu\\n\",\n+\t\t\tp11_mechanism_to_name(oaep_params.hashAlg),\n+\t\t\tp11_mgf_to_name(oaep_params.mgf),\n+\t\t\toaep_params.ulSourceDataLen);\n+\n+\t} else {\n+\t\tfprintf(stderr, \"Imporperly set OAEP parameters: hashAlg=%s, mgf=%s, data_len=%lu\\n\",\n+\t\t\tp11_mechanism_to_name(oaep_params.hashAlg),\n+\t\t\tp11_mgf_to_name(oaep_params.mgf),\n+\t\t\toaep_params.ulSourceDataLen);\n+\t}\n \n \trv = p11->C_DecryptInit(session, &mech, key);\n \tif (rv != CKR_OK)\n"} {"commit":"04154504a1340024192d082af03b860f6e00d21c","subject":"Fix compiler warning","message":"Fix compiler warning\n\npkcs15-init.c: In function 'verify_pin':\npkcs15-init.c:2840: warning: declaration of 'r' shadows a previous local\npkcs15-init.c:2836: warning: shadowed declaration is here\n\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@5268 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"philipWendland\/OpenSC,ieugen\/OpenSC,germanblanco\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,viktorTarasov\/OpenSC-SM,nmav\/OpenSC,carlhoerberg\/OpenSC,kasparsd\/opensc-latvia-id,0x7678\/OpenSC,0x7678\/OpenSC,hhonkanen\/OpenSC,CardContact\/OpenSC,dirkx\/OpenSC.tokend,AktivCo\/OpenSC,carlhoerberg\/OpenSC,tidatida\/OpenSC,jpki\/OpenSC,gentoo\/OpenSC,OpenSC\/OpenSC,Jakuje\/OpenSC,dengert\/OpenSC,0x7678\/myOpenSC,LudovicRousseau\/OpenSC,frankmorgner\/OpenSC,tidatida\/OpenSC,gentoo\/OpenSC,gentoo\/OpenSC,Jakuje\/OpenSC,rickyepoderi\/OpenSC,adminmt\/OpenSC,mtrojnar\/OpenSC,aobaid\/OpenSC,l1k\/OpenSC,hongquan\/OpenSC-main,financeX\/OpenSC,dirkx\/OpenSC.tokend,0x7678\/myOpenSC,marschap\/pkg-opensc,viktorTarasov\/OpenSC-SM,adminmt\/OpenSC,financeX\/OpenSC,kasparsd\/opensc-latvia-id,frankmorgner\/OpenSC,martinpaljak\/OpenSC,dirkx\/OpenSC,marschap\/pkg-opensc,l1k\/OpenSC,CardContact\/OpenSC,rickyepoderi\/OpenSC,dirkx\/OpenSC,metsma\/OpenSC,ieugen\/OpenSC,dirkx\/OpenSC,UIKit0\/OpenSC,0x7678\/OpenSC,velter\/OpenSC,dirkx\/OpenSC.tokend,hongquan\/OpenSC-main,gemini\/OpenSC,UIKit0\/OpenSC,martinpaljak\/OpenSC,aobaid\/OpenSC,dirkx\/OpenSC.tokend,germanblanco\/OpenSC,0x7678\/myOpenSC,tidatida\/OpenSC,fabled\/OpenSC,0x7678\/myOpenSC,hhonkanen\/OpenSC,dengert\/OpenSC,dirkx\/OpenSC.tokend,metsma\/OpenSC,marschap\/pkg-opensc,UIKit0\/OpenSC,dengert\/OpenSC,ieugen\/OpenSC,velter\/OpenSC,nmav\/OpenSC,financeX\/OpenSC,fabled\/OpenSC,jpki\/OpenSC,UIKit0\/OpenSC,carlhoerberg\/OpenSC,marschap\/pkg-opensc,hongquan\/OpenSC-main,AktivCo\/OpenSC,aobaid\/OpenSC,kasparsd\/opensc-latvia-id,carlhoerberg\/OpenSC,mouse07410\/OpenSC,Jakuje\/OpenSC,LudovicRousseau\/OpenSC,metsma\/OpenSC,mouse07410\/OpenSC,mouse07410\/OpenSC,0x7678\/OpenSC,philipWendland\/OpenSC,nmav\/OpenSC,dirkx\/OpenSC,AktivCo\/OpenSC,gemini\/OpenSC,carlhoerberg\/OpenSC,0x7678\/myOpenSC,Jakuje\/OpenSC,aobaid\/OpenSC,l1k\/OpenSC,gemini\/OpenSC,jpki\/OpenSC,martinpaljak\/OpenSC,velter\/OpenSC,velter\/OpenSC,adminmt\/OpenSC,rickyepoderi\/OpenSC,LudovicRousseau\/OpenSC,dirkx\/OpenSC.tokend,mtrojnar\/OpenSC,financeX\/OpenSC,OpenSC\/OpenSC,fabled\/OpenSC,ieugen\/OpenSC,mtrojnar\/OpenSC,fabled\/OpenSC,OpenSC\/OpenSC,dirkx\/OpenSC,kasparsd\/opensc-latvia-id,adminmt\/OpenSC,financeX\/OpenSC,viktorTarasov\/OpenSC-SM,gentoo\/OpenSC,frankmorgner\/OpenSC,frankmorgner\/OpenSC,germanblanco\/OpenSC,hhonkanen\/OpenSC,philipWendland\/OpenSC,CardContact\/OpenSC,tidatida\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs15-init.c\n+++ src\/tools\/pkcs15-init.c\n@@ -2837,7 +2837,7 @@\n \n \tif (!auth_id_str) {\n \t struct sc_pkcs15_object *objs[32];\n- \tint r, ii;\n+ \tint ii;\n \t\t\n \t\tr = sc_pkcs15_get_objects(p15card, SC_PKCS15_TYPE_AUTH_PIN, objs, 32);\n \t\tif (r < 0) {\n"} {"commit":"1eaae6526be3340688a8cfbcc1aec314fd613730","subject":"pkcs15-tool: Build with current gcc","message":"pkcs15-tool: Build with current gcc\n\nThe argument to strncpy is not the length of the target buffer,\nbut the source one (excluding the null byte, which will be\ncopied anyway).\n","repos":"fabled\/OpenSC,hongquan\/OpenSC-main,rickyepoderi\/OpenSC,dengert\/OpenSC,hongquan\/OpenSC-main,viktorTarasov\/OpenSC-SM,Jakuje\/OpenSC,dengert\/OpenSC,OpenSC\/OpenSC,LudovicRousseau\/OpenSC,frankmorgner\/OpenSC,mouse07410\/OpenSC,frankmorgner\/OpenSC,philipWendland\/OpenSC,CardContact\/OpenSC,frankmorgner\/OpenSC,frankmorgner\/OpenSC,hhonkanen\/OpenSC,rickyepoderi\/OpenSC,dengert\/OpenSC,philipWendland\/OpenSC,mouse07410\/OpenSC,viktorTarasov\/OpenSC-SM,fabled\/OpenSC,OpenSC\/OpenSC,fabled\/OpenSC,metsma\/OpenSC,Jakuje\/OpenSC,AktivCo\/OpenSC,AktivCo\/OpenSC,hhonkanen\/OpenSC,mouse07410\/OpenSC,LudovicRousseau\/OpenSC,fabled\/OpenSC,Jakuje\/OpenSC,hhonkanen\/OpenSC,AktivCo\/OpenSC,OpenSC\/OpenSC,metsma\/OpenSC,hongquan\/OpenSC-main,CardContact\/OpenSC,CardContact\/OpenSC,viktorTarasov\/OpenSC-SM,LudovicRousseau\/OpenSC,Jakuje\/OpenSC,rickyepoderi\/OpenSC,metsma\/OpenSC,philipWendland\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs15-tool.c\n+++ src\/tools\/pkcs15-tool.c\n@@ -1022,7 +1022,7 @@\n \t\tbuf[1] = 0;\n \t\tbuf[2] = 0;\n \t\tlen = snprintf((char *) buf+4, 20, \"ecdsa-sha2-nistp%d\", n);\n-\t\tstrncpy(alg, (char *) buf+4, 20);\n+\t\tstrncpy(alg, (char *) buf+4, 19);\n \t\tbuf[3] = len;\n \n \t\tlen += 4;\n"} {"commit":"a404370f0cb765119c149d688a4baaa2366e5d0b","subject":"pkcs15-tool: harmonize and align the output of --dump","message":"pkcs15-tool: harmonize and align the output of --dump\n\ngit-svn-id: 444ed946b9c2220da791e84c3dd156a05f92db99@4738 c6295689-39f2-0310-b995-f0e70906c6a9\n","repos":"martinpaljak\/OpenSC,viktorTarasov\/OpenSC-SM,AktivCo\/OpenSC,0x7678\/OpenSC,hongquan\/OpenSC-main,AktivCo\/OpenSC,gentoo\/OpenSC,LudovicRousseau\/OpenSC,UIKit0\/OpenSC,carlhoerberg\/OpenSC,nmav\/OpenSC,financeX\/OpenSC,nmav\/OpenSC,ieugen\/OpenSC,viktorTarasov\/OpenSC-SM,mouse07410\/OpenSC,0x7678\/OpenSC,dirkx\/OpenSC.tokend,AktivCo\/OpenSC,fabled\/OpenSC,ieugen\/OpenSC,UIKit0\/OpenSC,nmav\/OpenSC,mouse07410\/OpenSC,velter\/OpenSC,germanblanco\/OpenSC,0x7678\/myOpenSC,carlhoerberg\/OpenSC,CardContact\/OpenSC,marschap\/pkg-opensc,dirkx\/OpenSC.tokend,adminmt\/OpenSC,gemini\/OpenSC,mtrojnar\/OpenSC,metsma\/OpenSC,dirkx\/OpenSC.tokend,dirkx\/OpenSC,financeX\/OpenSC,Jakuje\/OpenSC,dengert\/OpenSC,aobaid\/OpenSC,kasparsd\/opensc-latvia-id,mouse07410\/OpenSC,martinpaljak\/OpenSC,financeX\/OpenSC,kasparsd\/opensc-latvia-id,hongquan\/OpenSC-main,philipWendland\/OpenSC,marschap\/pkg-opensc,martinpaljak\/OpenSC,kasparsd\/opensc-latvia-id,0x7678\/myOpenSC,hhonkanen\/OpenSC,dirkx\/OpenSC,0x7678\/myOpenSC,Jakuje\/OpenSC,tidatida\/OpenSC,dirkx\/OpenSC.tokend,fabled\/OpenSC,jpki\/OpenSC,0x7678\/myOpenSC,adminmt\/OpenSC,financeX\/OpenSC,gentoo\/OpenSC,dirkx\/OpenSC,marschap\/pkg-opensc,tidatida\/OpenSC,carlhoerberg\/OpenSC,l1k\/OpenSC,0x7678\/OpenSC,ieugen\/OpenSC,fabled\/OpenSC,gentoo\/OpenSC,rickyepoderi\/OpenSC,CardContact\/OpenSC,tidatida\/OpenSC,germanblanco\/OpenSC,velter\/OpenSC,viktorTarasov\/OpenSC-SM,velter\/OpenSC,tidatida\/OpenSC,jpki\/OpenSC,LudovicRousseau\/OpenSC,Jakuje\/OpenSC,carlhoerberg\/OpenSC,aobaid\/OpenSC,rickyepoderi\/OpenSC,OpenSC\/OpenSC,philipWendland\/OpenSC,0x7678\/OpenSC,dirkx\/OpenSC.tokend,Jakuje\/OpenSC,adminmt\/OpenSC,frankmorgner\/OpenSC,jpki\/OpenSC,l1k\/OpenSC,kasparsd\/opensc-latvia-id,dengert\/OpenSC,frankmorgner\/OpenSC,hongquan\/OpenSC-main,LudovicRousseau\/OpenSC,dirkx\/OpenSC,marschap\/pkg-opensc,hhonkanen\/OpenSC,mtrojnar\/OpenSC,gentoo\/OpenSC,OpenSC\/OpenSC,velter\/OpenSC,aobaid\/OpenSC,adminmt\/OpenSC,financeX\/OpenSC,frankmorgner\/OpenSC,OpenSC\/OpenSC,germanblanco\/OpenSC,gemini\/OpenSC,UIKit0\/OpenSC,metsma\/OpenSC,rickyepoderi\/OpenSC,metsma\/OpenSC,0x7678\/myOpenSC,UIKit0\/OpenSC,dirkx\/OpenSC,hhonkanen\/OpenSC,gentoo\/OpenSC,ieugen\/OpenSC,carlhoerberg\/OpenSC,dirkx\/OpenSC.tokend,fabled\/OpenSC,mtrojnar\/OpenSC,ieugen\/OpenSC,l1k\/OpenSC,CardContact\/OpenSC,gemini\/OpenSC,philipWendland\/OpenSC,dengert\/OpenSC,aobaid\/OpenSC,frankmorgner\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/pkcs15-tool.c\n+++ src\/tools\/pkcs15-tool.c\n@@ -193,7 +193,7 @@\n {\n \tconst char *common_flags[] = {\"private\", \"modifiable\"};\n \tunsigned int i;\n-\tprintf(\"\\tFlags : [0x%X]\", obj->flags);\n+\tprintf(\"\\tObject Flags : [0x%X]\", obj->flags);\n \tfor (i = 0; i < NELEMENTS(common_flags); i++) {\n \t\tif (obj->flags & (1 << i)) {\n \t\t\tprintf(\", %s\", common_flags[i]);\n@@ -209,16 +209,16 @@\n \tint rv;\n \n \tprintf(\"X.509 Certificate [%s]\\n\", obj->label);\n-\tprintf(\"\\tFlags : %d\\n\", obj->flags);\n-\tprintf(\"\\tAuthority: %s\\n\", cert_info->authority ? \"yes\" : \"no\");\n-\tprintf(\"\\tPath : %s\\n\", sc_print_path(&cert_info->path));\n-\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&cert_info->id));\n+\tprint_common_flags(obj);\n+\tprintf(\"\\tAuthority : %s\\n\", cert_info->authority ? \"yes\" : \"no\");\n+\tprintf(\"\\tPath : %s\\n\", sc_print_path(&cert_info->path));\n+\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&cert_info->id));\n \n \tprint_access_rules(obj->access_rules, SC_PKCS15_MAX_ACCESS_RULES);\n \n rv = sc_pkcs15_read_certificate(p15card, cert_info, &cert_parsed);\n \tif (rv >= 0 && cert_parsed) {\n-\t\tprintf(\"\\tEncoded serial: %02X %02X \", *(cert_parsed->serial), *(cert_parsed->serial + 1));\n+\t\tprintf(\"\\tEncoded serial : %02X %02X \", *(cert_parsed->serial), *(cert_parsed->serial + 1));\n \t\tutil_hex_dump(stdout, cert_parsed->serial + 2, cert_parsed->serial_len - 2, \"\");\n \t\tprintf(\"\\n\");\n \t\tfree(cert_parsed);\n@@ -486,7 +486,7 @@\n \t\t\"wrap\", \"unwrap\", \"verify\", \"verifyRecover\",\n \t\t\"derive\", \"nonRepudiation\"\n \t};\n-\tconst size_t usage_count = sizeof(usages)\/sizeof(usages[0]);\n+\tconst size_t usage_count = NELEMENTS(usages);\n \tconst char *access_flags[] = {\n \t\t\"sensitive\", \"extract\", \"alwaysSensitive\",\n \t\t\"neverExtract\", \"local\"\n@@ -495,14 +495,14 @@\n \n \tprintf(\"Private %s Key [%s]\\n\", types[3 & obj->type], obj->label);\n \tprint_common_flags(obj);\n-\tprintf(\"\\tUsage : [0x%X]\", prkey->usage);\n+\tprintf(\"\\tUsage : [0x%X]\", prkey->usage);\n \tfor (i = 0; i < usage_count; i++)\n \t\tif (prkey->usage & (1 << i)) {\n \t\t\tprintf(\", %s\", usages[i]);\n \t\t}\n \tprintf(\"\\n\");\n \n-\tprintf(\"\\tAccess Flags: [0x%X]\", prkey->access_flags);\n+\tprintf(\"\\tAccess Flags : [0x%X]\", prkey->access_flags);\n \tfor (i = 0; i < af_count; i++) {\n \t\tif (prkey->access_flags & (1 << i)) {\n \t\t\tprintf(\", %s\", access_flags[i]); \n@@ -512,13 +512,13 @@\n \tprint_access_rules(obj->access_rules, SC_PKCS15_MAX_ACCESS_RULES);\n \n \tprintf(\"\\n\");\n-\tprintf(\"\\tModLength : %lu\\n\", (unsigned long)prkey->modulus_length);\n-\tprintf(\"\\tKey ref : %d\\n\", prkey->key_reference);\n-\tprintf(\"\\tNative : %s\\n\", prkey->native ? \"yes\" : \"no\");\n-\tprintf(\"\\tPath : %s\\n\", sc_print_path(&prkey->path));\n+\tprintf(\"\\tModLength : %lu\\n\", (unsigned long)prkey->modulus_length);\n+\tprintf(\"\\tKey ref : %d\\n\", prkey->key_reference);\n+\tprintf(\"\\tNative : %s\\n\", prkey->native ? \"yes\" : \"no\");\n+\tprintf(\"\\tPath : %s\\n\", sc_print_path(&prkey->path));\n \tif (obj->auth_id.len != 0)\n-\t\tprintf(\"\\tAuth ID : %s\\n\", sc_pkcs15_print_id(&obj->auth_id));\n-\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&prkey->id));\n+\t\tprintf(\"\\tAuth ID : %s\\n\", sc_pkcs15_print_id(&obj->auth_id));\n+\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&prkey->id));\n }\n \n \n@@ -560,14 +560,14 @@\n \n \tprintf(\"Public %s Key [%s]\\n\", types[3 & obj->type], obj->label);\n \tprint_common_flags(obj);\n-\tprintf(\"\\tUsage : [0x%X]\", pubkey->usage);\n+\tprintf(\"\\tUsage : [0x%X]\", pubkey->usage);\n \tfor (i = 0; i < usage_count; i++)\n \t\tif (pubkey->usage & (1 << i)) {\n \t\t\tprintf(\", %s\", usages[i]);\n \t}\n \tprintf(\"\\n\");\n \n-\tprintf(\"\\tAccess Flags: [0x%X]\", pubkey->access_flags);\n+\tprintf(\"\\tAccess Flags : [0x%X]\", pubkey->access_flags);\n \tfor (i = 0; i < af_count; i++) {\n \t\tif (pubkey->access_flags & (1 << i)) {\n \t\t\tprintf(\", %s\", access_flags[i]); \n@@ -577,13 +577,13 @@\n \tprint_access_rules(obj->access_rules, SC_PKCS15_MAX_ACCESS_RULES);\n \n \tprintf(\"\\n\");\n-\tprintf(\"\\tModLength : %lu\\n\", (unsigned long)pubkey->modulus_length);\n-\tprintf(\"\\tKey ref : %d\\n\", pubkey->key_reference);\n-\tprintf(\"\\tNative : %s\\n\", pubkey->native ? \"yes\" : \"no\");\n-\tprintf(\"\\tPath : %s\\n\", sc_print_path(&pubkey->path));\n+\tprintf(\"\\tModLength : %lu\\n\", (unsigned long)pubkey->modulus_length);\n+\tprintf(\"\\tKey ref : %d\\n\", pubkey->key_reference);\n+\tprintf(\"\\tNative : %s\\n\", pubkey->native ? \"yes\" : \"no\");\n+\tprintf(\"\\tPath : %s\\n\", sc_print_path(&pubkey->path));\n \tif (obj->auth_id.len != 0)\n-\t\tprintf(\"\\tAuth ID : %s\\n\", sc_pkcs15_print_id(&obj->auth_id));\n-\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&pubkey->id));\n+\t\tprintf(\"\\tAuth ID : %s\\n\", sc_pkcs15_print_id(&obj->auth_id));\n+\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&pubkey->id));\n }\n \n static int list_public_keys(void)\n@@ -1048,30 +1048,30 @@\n \tconst char *pin_types[] = {\"bcd\", \"ascii-numeric\", \"UTF-8\",\n \t\t\"halfnibble bcd\", \"iso 9664-1\"}; \n \tconst struct sc_pkcs15_pin_info *pin = (const struct sc_pkcs15_pin_info *) obj->data;\n-\tconst size_t pf_count = sizeof(pin_flags)\/sizeof(pin_flags[0]);\n+\tconst size_t pf_count = NELEMENTS(pin_flags);\n \tsize_t i;\n \n \tprintf(\"PIN [%s]\\n\", obj->label);\n \tprint_common_flags(obj);\t\n-\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&pin->auth_id));\n-\tprintf(\"\\tFlags : [0x%02X]\", pin->flags);\n+\tprintf(\"\\tID : %s\\n\", sc_pkcs15_print_id(&pin->auth_id));\n+\tprintf(\"\\tFlags : [0x%02X]\", pin->flags);\n \tfor (i = 0; i < pf_count; i++)\n \t\tif (pin->flags & (1 << i)) {\n \t\t\tprintf(\", %s\", pin_flags[i]);\n \t\t}\n \tprintf(\"\\n\");\n-\tprintf(\"\\tLength : min_len:%lu, max_len:%lu, stored_len:%lu\\n\",\n+\tprintf(\"\\tLength : min_len:%lu, max_len:%lu, stored_len:%lu\\n\",\n \t\t(unsigned long)pin->min_length, (unsigned long)pin->max_length,\n \t\t(unsigned long)pin->stored_length);\n-\tprintf(\"\\tPad char : 0x%02X\\n\", pin->pad_char);\n-\tprintf(\"\\tReference : %d\\n\", pin->reference);\n-\tif (pin->type < sizeof(pin_types)\/sizeof(pin_types[0]))\n-\t\tprintf(\"\\tType : %s\\n\", pin_types[pin->type]);\n+\tprintf(\"\\tPad char : 0x%02X\\n\", pin->pad_char);\n+\tprintf(\"\\tReference : %d\\n\", pin->reference);\n+\tif (pin->type < NELEMENTS(pin_types))\n+\t\tprintf(\"\\tType : %s\\n\", pin_types[pin->type]);\n \telse\n-\t\tprintf(\"\\tType : [encoding %d]\\n\", pin->type);\n-\tprintf(\"\\tPath : %s\\n\", sc_print_path(&pin->path));\n+\t\tprintf(\"\\tType : [encoding %d]\\n\", pin->type);\n+\tprintf(\"\\tPath : %s\\n\", sc_print_path(&pin->path));\n \tif (pin->tries_left >= 0)\n-\t\tprintf(\"\\tTries left: %d\\n\", pin->tries_left);\n+\t\tprintf(\"\\tTries left : %d\\n\", pin->tries_left);\n }\n \n static int list_pins(void)\n"} {"commit":"31ddcb7898b6cc2c291cc52c541c211f54a8f672","subject":"fixed hal devices variable","message":"fixed hal devices variable\n\nsvn path=\/trunk\/; revision=902\n","repos":"outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/trackerd\/trackerd.c\n+++ src\/trackerd\/trackerd.c\n@@ -251,7 +251,7 @@\n {\n \tLibHalContext *ctx;\n \tchar **devices;\n- \tint i, num;\n+ \tint num;\n \tDBusError error;\n \n \tctx = libhal_ctx_new();\n@@ -280,7 +280,7 @@\n \t}\n \n \t\/* there should only be one ac-adaptor so use first one *\/\n-\ttracker->battery_udi = devices[i];\n+\ttracker->battery_udi = devices[0];\n \n \ttracker->pause_battery = !libhal_device_get_property_bool (ctx, tracker->battery_udi, BATTERY_OFF, NULL);\n \n"} {"commit":"f4365c73a28a7618724c1270d9509c81fd645bc0","subject":"Enable probing of VPC disk format type","message":"Enable probing of VPC disk format type\n\nA look at the QEMU source revealed the missing bits of info about\nthe VPC file format, so we can enable this now\n\n* src\/util\/storage_file.c: Enable VPC format, providing version\n and disk size offset fields\n","repos":"foomango\/libvirt,shugaoye\/libvirt,dumbbell\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,shugaoye\/libvirt,dumbbell\/libvirt,wiedi\/libvirt,elmarco\/libvirt,amery\/libvirt-vserver,agx\/libvirt,cbosdo\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,novel\/fbsd-libvirt,libvirt\/libvirt,dumbbell\/libvirt,agx\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,VenkatDatta\/libvirt,taget\/libvirt,foomango\/libvirt,datto\/libvirt,soulxu\/libvirt-xuhj,zippy2\/libvirt,iam-TJ\/libvirt,warewolf\/libvirt,emaste\/libvirt,jfehlig\/libvirt,usc-isi\/libvirt,dumbbell\/libvirt,agx\/libvirt,crobinso\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,amery\/libvirt-vserver,zhlcindy\/libvirt-1.1.4-maintain,zhlcindy\/libvirt-1.1.4-maintain,warewolf\/libvirt,elmarco\/libvirt,elmarco\/libvirt,amery\/libvirt-vserver,zippy2\/libvirt,rlaager\/libvirt,usc-isi\/libvirt,fabianfreyer\/libvirt,leilihh\/libvirt,bjzhang\/libvirt,rbu\/libvirt,rmarwaha\/libvirt,iam-TJ\/libvirt,trainstack\/libvirt,usc-isi\/libvirt,bjzhang\/libvirt,novel\/fbsd-libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,siboulet\/libvirt-openvz,kantai\/libvirt-vfork,rmarwaha\/libvirt,shugaoye\/libvirt,soulxu\/libvirt-xuhj,rmarwaha\/libvirt1,andreabolognani\/libvirt,amery\/libvirt-vserver,rmarwaha\/libvirt,nertpinx\/libvirt,rmarwaha\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,rlaager\/libvirt,rmarwaha\/libvirt1,siboulet\/libvirt-openvz,elmarco\/libvirt,trainstack\/libvirt,VenkatDatta\/libvirt,rmarwaha\/libvirt1,foomango\/libvirt,fabianfreyer\/libvirt,amery\/libvirt-vserver,rbu\/libvirt,rbu\/libvirt,rlaager\/libvirt,novel\/fbsd-libvirt,emaste\/libvirt,rmarwaha\/libvirt1,iam-TJ\/libvirt,VenkatDatta\/libvirt,eskultety\/libvirt,jeckersb\/libvirt,leilihh\/libvirt,emaste\/libvirt,jfehlig\/libvirt,danwent\/libvirt-ovs,eskultety\/libvirt,cbosdo\/libvirt,rmarwaha\/libvirt1,fabianfreyer\/libvirt,emaste\/libvirt,iam-TJ\/libvirt,jardasgit\/libvirt,jeckersb\/libvirt,elmarco\/libvirt,iam-TJ\/libvirt,crobinso\/libvirt,agx\/libvirt,kantai\/libvirt-vfork,andreabolognani\/libvirt,shugaoye\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,iam-TJ\/libvirt,taget\/libvirt,rmarwaha\/libvirt,novel\/fbsd-libvirt,trainstack\/libvirt,warewolf\/libvirt,dumbbell\/libvirt,trainstack\/libvirt,danwent\/libvirt-ovs,agx\/libvirt,VenkatDatta\/libvirt,kantai\/libvirt-vfork,libvirt\/libvirt,eskultety\/libvirt,crobinso\/libvirt,datto\/libvirt,soulxu\/libvirt-xuhj,rbu\/libvirt,jardasgit\/libvirt,novel\/fbsd-libvirt,datto\/libvirt,bjzhang\/libvirt,zippy2\/libvirt,novel\/fbsd-libvirt,wiedi\/libvirt,leilihh\/libvirt,rmarwaha\/libvirt1,wiedi\/libvirt,siboulet\/libvirt-openvz,soulxu\/libvirt-xuhj,zhlcindy\/libvirt-1.1.4-maintain,rlaager\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,jeckersb\/libvirt,danwent\/libvirt-ovs,emaste\/libvirt,rmarwaha\/libvirt,taget\/libvirt,emaste\/libvirt,trainstack\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,crobinso\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,rlaager\/libvirt,shugaoye\/libvirt,andreabolognani\/libvirt,novel\/fbsd-libvirt,emaste\/libvirt,trainstack\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,siboulet\/libvirt-openvz,sshah-solarflare\/Libvirt-PCI-passthrough-,dumbbell\/libvirt,kantai\/libvirt-vfork,fabianfreyer\/libvirt,siboulet\/libvirt-openvz,eskultety\/libvirt,jeckersb\/libvirt,warewolf\/libvirt,rbu\/libvirt,novel\/fbsd-libvirt,bjzhang\/libvirt,eskultety\/libvirt,usc-isi\/libvirt,datto\/libvirt,novel\/fbsd-libvirt,leilihh\/libvirt,taget\/libvirt,libvirt\/libvirt,taget\/libvirt,cbosdo\/libvirt,datto\/libvirt,trainstack\/libvirt,danwent\/libvirt-ovs,foomango\/libvirt,wiedi\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,foomango\/libvirt,wiedi\/libvirt,wiedi\/libvirt,jeckersb\/libvirt,warewolf\/libvirt,usc-isi\/libvirt,cbosdo\/libvirt,warewolf\/libvirt,leilihh\/libvirt,andreabolognani\/libvirt,leilihh\/libvirt,wiedi\/libvirt,danwent\/libvirt-ovs,iam-TJ\/libvirt,VenkatDatta\/libvirt,cbosdo\/libvirt,warewolf\/libvirt,kantai\/libvirt-vfork,jeckersb\/libvirt,jeckersb\/libvirt,bjzhang\/libvirt,soulxu\/libvirt-xuhj","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/storage_file.c\n+++ src\/util\/storage_file.c\n@@ -135,11 +135,9 @@\n LV_LITTLE_ENDIAN, 4, 1,\n 4+4+4, 8, 512, -1, vmdk4GetBackingStore },\n \/* Connectix \/ VirtualPC *\/\n- \/* XXX Untested\n { VIR_STORAGE_FILE_VPC, \"conectix\", NULL,\n- LV_BIG_ENDIAN, -1, 0,\n- -1, 0, 0, -1, NULL},\n- *\/\n+ LV_BIG_ENDIAN, 12, 0x10000,\n+ 8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, -1, NULL},\n };\n \n static int\n"} {"commit":"4a3150de413f701cb08eb42c08a6f8088fcfb343","subject":"libvortex-1.1: * [fix] Fixed lock caused by calling vortex_connection_is_profile_filtered recursively.","message":"libvortex-1.1:\n* [fix] Fixed lock caused by calling vortex_connection_is_profile_filtered\n recursively.\n","repos":"ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1,ASPLes\/libvortex-1.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/vortex_connection.c\n+++ src\/vortex_connection.c\n@@ -320,6 +320,10 @@\n \t * A list of installed masks.\n \t *\/ \n \taxlList * profile_masks;\n+\t\/** \n+\t * Mutex used to protect profile mask mutex.\n+\t *\/\n+\tVortexMutex profile_masks_mutex;\n \n \t\/** \n \t * Channels already created inside the given VortexConnection.\n@@ -530,6 +534,7 @@\n \tvortex_mutex_create (&connection->channel_pool_mutex);\n \tvortex_mutex_create (&connection->pending_errors_mutex);\n \tvortex_mutex_create (&connection->channel_update_mutex);\n+\tvortex_mutex_create (&connection->profile_masks_mutex);\n \n \treturn;\n }\n@@ -3212,6 +3217,7 @@\n \t\/* profile masks *\/\n \taxl_list_free (connection->profile_masks);\n \tconnection->profile_masks = NULL;\n+\tvortex_mutex_destroy (&connection->profile_masks_mutex);\n \n \t\/* do not free features and localize because they are handled\n \t * thourgh the cache *\/\n@@ -3427,13 +3433,13 @@\n \tnode->user_data = user_data;\n \n \t\/* lock during operation *\/\n-\tvortex_mutex_lock (&connection->handlers_mutex);\n+\tvortex_mutex_lock (&connection->profile_masks_mutex);\n \n \t\/* create list on demand *\/\n \tif (connection->profile_masks == NULL) {\n \t\tconnection->profile_masks = axl_list_new (axl_list_always_return_1, axl_free);\n \t\tif (connection->profile_masks == NULL) {\n-\t\t\tvortex_mutex_unlock (&connection->handlers_mutex);\n+\t\t\tvortex_mutex_unlock (&connection->profile_masks_mutex);\n \t\t\treturn -1;\n \t\t} \/* end if *\/\n \t}\n@@ -3442,7 +3448,7 @@\n \taxl_list_append (connection->profile_masks, node);\n \n \t\/* unlock now the item is removed *\/\n-\tvortex_mutex_unlock (&connection->handlers_mutex);\n+\tvortex_mutex_unlock (&connection->profile_masks_mutex);\n \n \t\/* mask created and installed. return the unique id *\/\n \treturn node->mask_id;\n@@ -3505,10 +3511,10 @@\n \t\treturn axl_false;\n \n \t\/* look during the operation *\/\n-\tvortex_mutex_lock (&connection->handlers_mutex);\n+\tvortex_mutex_lock (&connection->profile_masks_mutex);\n \tif (connection->profile_masks == NULL) {\n \t\t\/* check finished *\/\n-\t\tvortex_mutex_unlock (&connection->handlers_mutex);\n+\t\tvortex_mutex_unlock (&connection->profile_masks_mutex);\n \t\treturn axl_false;\n \t} \/* end if *\/\n \n@@ -3519,13 +3525,13 @@\n \t\tnode = axl_list_get_nth (connection->profile_masks, iterator);\n \n \t\t\/* check if the mask filter the provided profile *\/\n+\t\tvortex_mutex_unlock (&connection->profile_masks_mutex);\n \t\tif (node->mask (connection, channel_num, uri, profile_content, encoding, serverName, frame, error_msg, node->user_data)) {\n-\t\t\t\/* check finished *\/\n-\t\t\tvortex_mutex_unlock (&connection->handlers_mutex);\n \n \t\t\t\/* uri filtered, report *\/\n \t\t\treturn axl_true;\n \t\t}\n+\t\tvortex_mutex_lock (&connection->profile_masks_mutex);\n \n \t\t\/* update the iterator *\/\n \t\titerator++;\n@@ -3533,7 +3539,7 @@\n \t} \/* end while *\/\n \n \t\/* check finished *\/\n-\tvortex_mutex_unlock (&connection->handlers_mutex);\n+\tvortex_mutex_unlock (&connection->profile_masks_mutex);\n \n \t\/* no mask have filtered the uri *\/\n \treturn axl_false;\n"} {"commit":"4b71ead42eae6949a99930c47539d669501f2e96","subject":"fixed nasty typo","message":"fixed nasty typo\n","repos":"ZerBea\/hcxtools,RealEnder\/hcxtools,RealEnder\/hcxtools,ZerBea\/hcxtools,RealEnder\/hcxtools,ZerBea\/hcxtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hcxpsktool.c\n+++ hcxpsktool.c\n@@ -1962,10 +1962,10 @@\n static void testzhone(FILE *fhout, uint8_t essidlen, uint8_t *essid)\n {\n static int k;\n-static char *zhone = \"Zhone-\";\n+static char *zhone = \"Zhone_\";\n \n if(essidlen < 6) return;\n-if(memcmp(essid, zhone, 6) == 0) return;\n+if(memcmp(essid, zhone, 6) != 0) return;\n for(k = 0; k < 10000000; k++) fprintf(fhout, \"znid30%07d\\n\", k);\n for(k = 0; k < 10000000; k++) fprintf(fhout, \"znid31%07d\\n\", k);\n return;\n"} {"commit":"b6709f08e30f479d81b0811d338f20b029817662","subject":"added new weak candidate based on wpa-sec analysis","message":"added new weak candidate based on wpa-sec analysis\n","repos":"RealEnder\/hcxtools,ZerBea\/hcxtools,RealEnder\/hcxtools,RealEnder\/hcxtools,ZerBea\/hcxtools,ZerBea\/hcxtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hcxpsktool.c\n+++ hcxpsktool.c\n@@ -144,7 +144,7 @@\n \t\"panda\", \"pant\", \"path\", \"pear\", \"pencil\", \"penguin\", \"phoenix\", \"piano\", \"pineapple\", \"planet\", \"plum\", \"pond\", \"poodle\", \"potato\", \"prairie\",\n \t\"quail\",\n \t\"rabbit\", \"raccoon\", \"raid\", \"rain\", \"raven\", \"river\", \"road\", \"rock\", \"robert\", \"rosebud\", \"ruby\",\n-\t\"sea\", \"seed\", \"shark\", \"sheep\", \"ship\", \"shoe\", \"shore\", \"shrub\", \"side\", \"silver\", \"sitter\", \"skates\", \"skin\", \"sky\", \"snail\", \"snake\", \"socks\", \"spark\", \"sparrow\", \"spider\", \"squash\", \"squirrel\", \"star\", \"stream\", \"street\", \"sun\",\n+\t\"sea\", \"seed\", \"shark\", \"sheep\", \"ship\", \"shoe\", \"shore\", \"shrub\", \"side\", \"silver\", \"sitter\", \"skates\", \"skin\", \"sky\", \"snail\", \"snake\", \"socks\", \"spark\", \"sparrow\", \"spider\", \"squash\", \"squirrel\", \"star\", \"stream\", \"street\", \"studio\", \"sun\",\n \t\"table\", \"teapot\", \"terrain\", \"tiger\", \"toast\", \"tomato\", \"trail\", \"train\", \"tree\", \"truck\", \"trumpet\", \"tuba\", \"tulip\", \"turkey\",\n \t\"umbrella\", \"unicorn\", \"unit\",\n \t\"valley\", \"vase\", \"violet\", \"violin\",\n"} {"commit":"b5ce3eb99fb0d3e80e35637c1f4ba001505649df","subject":"some optimizations","message":"some optimizations\n","repos":"ZerBea\/hcxtools,RealEnder\/hcxtools,ZerBea\/hcxtools,ZerBea\/hcxtools,RealEnder\/hcxtools,RealEnder\/hcxtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hcxpsktool.c\n+++ hcxpsktool.c\n@@ -206,23 +206,44 @@\n \tfor(cs = 0; cs < (sizeof(secondword) \/ sizeof(char *)); cs++)\n \t\t{\n \t\tif(strcmp(firstword[ca], secondword[cs]) == 0) continue;\n-\t\tsnprintf(pskstring, 64, \"%s%s\", firstword[ca], secondword[cs]);\n-\t\tfprintf(fhout,\"%s\\n\", pskstring);\n \t\tfor (cn = 0; cn < 1000; cn++)\n+\t\t\t{\n+\t\t\tsnprintf(pskstring, 64, \"%s%s%03d\", firstword[ca], secondword[cs], cn);\n+\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n+\t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(firstword) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(secondword) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(strcmp(firstword[ca], secondword[cs]) == 0) continue;\n+\t\tfor (cn = 0; cn < 100; cn++)\n+\t\t\t{\n+\t\t\tsnprintf(pskstring, 64, \"%s%s%02d\", firstword[ca], secondword[cs], cn);\n+\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n+\t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(firstword) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(secondword) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(strcmp(firstword[ca], secondword[cs]) == 0) continue;\n+\t\tfor (cn = 0; cn < 10; cn++)\n \t\t\t{\n \t\t\tsnprintf(pskstring, 64, \"%s%s%d\", firstword[ca], secondword[cs], cn);\n \t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\tif(cn < 10)\n-\t\t\t\t{\n-\t\t\t\tsnprintf(pskstring, 64, \"%s%s%02d\", firstword[ca], secondword[cs], cn);\n-\t\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\t\t}\n-\t\t\tif(cn < 100)\n-\t\t\t\t{\n-\t\t\t\tsnprintf(pskstring, 64, \"%s%s%03d\", firstword[ca], secondword[cs], cn);\n-\t\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\t\t}\n \t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(firstword) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(secondword) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(strcmp(firstword[ca], secondword[cs]) == 0) continue;\n+\t\tsnprintf(pskstring, 64, \"%s%s\", firstword[ca], secondword[cs]);\n+\t\tfprintf(fhout,\"%s\\n\", pskstring);\n \t\t}\n \t}\n return;\n@@ -306,23 +327,44 @@\n \tfor(cs = 0; cs < (sizeof(wordlist) \/ sizeof(char *)); cs++)\n \t\t{\n \t\tif(ca == cs) continue;\n-\t\tsnprintf(pskstring, 64, \"%s%s\", wordlist[ca], wordlist[cs]);\n-\t\tfprintf(fhout,\"%s\\n\", pskstring);\n \t\tfor (cn = 0; cn < 1000; cn++)\n+\t\t\t{\n+\t\t\tsnprintf(pskstring, 64, \"%s%s%03d\", wordlist[ca], wordlist[cs], cn);\n+\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n+\t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(wordlist) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(wordlist) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(ca == cs) continue;\n+\t\tfor (cn = 0; cn < 100; cn++)\n+\t\t\t{\n+\t\t\tsnprintf(pskstring, 64, \"%s%s%02d\", wordlist[ca], wordlist[cs], cn);\n+\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n+\t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(wordlist) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(wordlist) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(ca == cs) continue;\n+\t\tfor (cn = 0; cn < 10; cn++)\n \t\t\t{\n \t\t\tsnprintf(pskstring, 64, \"%s%s%d\", wordlist[ca], wordlist[cs], cn);\n \t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\tif(cn < 10)\n-\t\t\t\t{\n-\t\t\t\tsnprintf(pskstring, 64, \"%s%s%02d\", wordlist[ca], wordlist[cs], cn);\n-\t\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\t\t}\n-\t\t\tif(cn < 100)\n-\t\t\t\t{\n-\t\t\t\tsnprintf(pskstring, 64, \"%s%s%03d\", wordlist[ca], wordlist[cs], cn);\n-\t\t\t\tfprintf(fhout,\"%s\\n\", pskstring);\n-\t\t\t\t}\n \t\t\t}\n+\t\t}\n+\t}\n+for(ca = 0; ca < (sizeof(wordlist) \/ sizeof(char *)); ca++)\n+\t{\n+\tfor(cs = 0; cs < (sizeof(wordlist) \/ sizeof(char *)); cs++)\n+\t\t{\n+\t\tif(ca == cs) continue;\n+\t\tsnprintf(pskstring, 64, \"%s%s\", wordlist[ca], wordlist[cs]);\n+\t\tfprintf(fhout,\"%s\\n\", pskstring);\n \t\t}\n \t}\n return;\n"} {"commit":"da962743c0f4073553ec07b896862c4923cf3e56","subject":"add hash.h to Zerocoin.h","message":"add hash.h to Zerocoin.h\n","repos":"NeblioTeam\/neblio,NeblioTeam\/neblio,NeblioTeam\/neblio,NeblioTeam\/neblio,NeblioTeam\/neblio","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/zerocoin\/Zerocoin.h\n+++ src\/zerocoin\/Zerocoin.h\n@@ -49,6 +49,7 @@\n #include \"..\/serialize.h\"\n #include \"..\/bignum.h\"\n #include \"..\/util.h\"\n+#include \"..\/hash.h\"\n #include \"Params.h\"\n #include \"Coin.h\"\n #include \"Commitment.h\"\n"} {"commit":"285172b1a70025d77247c24a8d48b07aff63b6a4","subject":"Fixed typo.","message":"Fixed typo.","repos":"cezarfx\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,28msec\/zorba,28msec\/zorba,cezarfx\/zorba,28msec\/zorba,cezarfx\/zorba,28msec\/zorba,28msec\/zorba,28msec\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,bgarrels\/zorba,bgarrels\/zorba","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/zorbautils\/locale.h\n+++ src\/zorbautils\/locale.h\n@@ -257,7 +257,7 @@\n TZ, \/\/\/< Tanzania\n UA, \/\/\/< Ukraine\n UG, \/\/\/< Uganda\n- UM, \/\/\/< United states Minor Outlying Islands\n+ UM, \/\/\/< United States Minor Outlying Islands\n US, \/\/\/< United States\n UY, \/\/\/< Uruguay\n UZ, \/\/\/< Uzbekistan\n"} {"commit":"211e68a6e80bf2d817b3aeea1523fdefaaa43f2a","subject":"file for using RP GPIO","message":"file for using RP GPIO\n","repos":"jerome2echopen\/Perso_C,jerome2echopen\/Perso_C,jerome2echopen\/Perso_C","returncode":1,"stderr":"error: pathspec 'stepper_api\/test_GPIO.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- stepper_api\/test_GPIO.c\n+++ stepper_api\/test_GPIO.c\n@@ -0,0 +1,33 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <unistd.h>\n+\n+#include \"rp.h\"\n+\n+int main(int argc, char **argv)\n+{\n+\tint i=0;\n+\t\/\/rp_pinState_t state;\n+\n+\t\/\/ Initialization of API\n+\tif (rp_Init() != RP_OK) {\n+\t\tfprintf(stderr, \"Red Pitaya API init failed!\\n\");\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\trp_DpinReset();\n+\t\n+\t\/\/int trig=7;\n+\tprintf(\"RP_DIO7_N=%i\\n\",RP_DIO7_N);\n+\n+\tfor (i=0 ; i<1000 ; i++){\n+\t\trp_DpinSetState(23,RP_HIGH);\n+\t\trp_DpinSetState(RP_DIO7_N,RP_LOW);\n+\t\tusleep(100000);\n+\t}\n+\n+\t\/\/ Releasing resources\n+\trp_Release();\n+\n+\treturn EXIT_SUCCESS;\n+}\n"} {"commit":"c4e9013d51a6ca2469da93ef0abd8c893d283609","subject":"EWMH desktop support bugs","message":"EWMH desktop support bugs\n","repos":"seanpringle\/goomwwm,seanpringle\/goomwwm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- goomwwm.c\n+++ goomwwm.c\n@@ -890,6 +890,33 @@\n \tXChangeProperty(display, root, netatoms[_NET_ACTIVE_WINDOW], XA_WINDOW, 32, PropModeReplace, (unsigned char*)&w, 1);\n }\n \n+\/\/ _NET_DESKTOP stuff, taking _NET_WM_STRUT* into account\n+void ewmh_desktop_list(Window root)\n+{\n+\tint i; XWindowAttributes *attr = window_get_attributes(root);\n+\t\/\/ nine desktops. want more space? buy more monitors and use xinerama :)\n+\tunsigned long desktops = TAGS, area[4*TAGS], geo[2], view[2], desktop;\n+\n+\t\/\/ this will return the full X screen, not Xinerama screen\n+\tworkarea mon; monitor_dimensions_struts(attr->screen, -1, -1, &mon);\n+\n+\tfor (i = 0; i < TAGS; i++)\n+\t{\n+\t\tarea[(i*4)+0] = mon.x; area[(i*4)+1] = mon.y;\n+\t\tarea[(i*4)+2] = mon.w; area[(i*4)+3] = mon.h;\n+\t}\n+\tview[0] = 0; view[1] = 0;\n+\tgeo[0] = DisplayWidth(display, XScreenNumberOfScreen(attr->screen));\n+\tgeo[1] = DisplayHeight(display, XScreenNumberOfScreen(attr->screen));\n+\tdesktop = tag_to_desktop(current_tag);\n+\n+\twindow_set_cardinal_prop(root, netatoms[_NET_NUMBER_OF_DESKTOPS], &desktops, 1);\n+\twindow_set_cardinal_prop(root, netatoms[_NET_DESKTOP_GEOMETRY], geo, 2);\n+\twindow_set_cardinal_prop(root, netatoms[_NET_DESKTOP_VIEWPORT], view, 2);\n+\twindow_set_cardinal_prop(root, netatoms[_NET_WORKAREA], area, TAGS*4);\n+\twindow_set_cardinal_prop(root, netatoms[_NET_CURRENT_DESKTOP], &desktop, 1);\n+}\n+\n \/\/ if a client supports a WM_PROTOCOLS type atom, dispatch an event\n int client_protocol_event(client *c, Atom protocol)\n {\n@@ -2624,9 +2651,6 @@\n void setup_screen(int scr)\n {\n \tint i; Window w, root = RootWindow(display, scr);\n-\n-\tunsigned long desktops = TAGS, desktop = 0;\n-\tunsigned long workarea[4] = { 0, 0, DisplayWidth(display, scr), DisplayHeight(display, scr) };\n \tWindow supporting = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, 0, 0);\n \tunsigned long pid = getpid();\n \n@@ -2639,13 +2663,6 @@\n \tXChangeProperty(display, supporting, netatoms[_NET_WM_NAME], XA_STRING, 8, PropModeReplace, (const unsigned char*)\"GoomwWM\", 6);\n \tXChangeProperty(display, supporting, netatoms[_NET_WM_PID], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&pid, 1);\n \n-\t\/\/ one desktop. want more space? buy more monitors and use xinerama :)\n-\tXChangeProperty(display, root, netatoms[_NET_NUMBER_OF_DESKTOPS], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&desktops, 1);\n-\tXChangeProperty(display, root, netatoms[_NET_CURRENT_DESKTOP], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&desktop, 1);\n-\tXChangeProperty(display, root, netatoms[_NET_DESKTOP_GEOMETRY], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&workarea[2], 2);\n-\tXChangeProperty(display, root, netatoms[_NET_DESKTOP_VIEWPORT], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&workarea, 2);\n-\tXChangeProperty(display, root, netatoms[_NET_WORKAREA], XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&workarea, 4);\n-\n \t\/\/ bind all MODKEY+ combos\n \tXUngrabKey(display, AnyKey, AnyModifier, root);\n \tfor (i = 0; keymap[i]; i++) grab_key(root, keymap[i]);\n@@ -2676,6 +2693,7 @@\n \t\/\/ activate and focus top window\n \twindow_active_client(root, 0);\n \tewmh_client_list(root);\n+\tewmh_desktop_list(root);\n }\n \n int main(int argc, char *argv[])\n"} {"commit":"44c6ac3e71997f6ccac7acc56dc4b274e54fd96f","subject":"Fixed.","message":"Fixed.\n\n","repos":"ueno\/ruby-gpgme,ueno\/ruby-gpgme,ueno\/ruby-gpgme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gpgme_n.c\n+++ gpgme_n.c\n@@ -232,7 +232,6 @@\n size_t size;\n {\n VALUE vcb = (VALUE)handle, vcbs, vhook_value, vbuffer, vnwrite;\n- ssize_t nwrite;\n \n vcbs = RARRAY(vcb)->ptr[0];\n vhook_value = RARRAY(vcb)->ptr[1];\n@@ -240,10 +239,7 @@\n \n vnwrite = rb_funcall (vcbs, rb_intern (\"write\"), 3,\n \t\t\tvhook_value, vbuffer, LONG2NUM(size));\n- nwrite = NUM2LONG(vnwrite);\n- if (nwrite > 0)\n- memcpy (buffer, StringValuePtr(vbuffer), nwrite);\n- return nwrite;\n+ return NUM2LONG(vnwrite);\n }\n \n static off_t\n@@ -268,20 +264,6 @@\n return -1;\n }\n \n-static void\n-release_cb (handle)\n- void *handle;\n-{\n- VALUE vcb = (VALUE)handle, vcbs, vhook_value;\n- ID id_release = rb_intern (\"release\");\n-\n- vcbs = RARRAY(vcb)->ptr[0];\n- vhook_value = RARRAY(vcb)->ptr[1];\n-\n- if (rb_respond_to (vcbs, id_release))\n- rb_funcall (vcbs, id_release, 1, vhook_value);\n-}\n-\n static VALUE\n rb_s_gpgme_data_new_from_cbs (dummy, rdh, vcbs, vhandle)\n VALUE dummy, rdh, vcbs, vhandle;\n@@ -294,7 +276,7 @@\n cbs.read = read_cb;\n cbs.write = write_cb;\n cbs.seek = seek_cb;\n- cbs.release = release_cb;\n+ cbs.release = NULL;\n \n rb_ary_push (vcbs_handle, vcbs);\n rb_ary_push (vcbs_handle, vhandle);\n"} {"commit":"cb4e5140cd812e86ebe7fa94c30b36fdf69b09ce","subject":"use sem_trywait instead of sem_getvalue","message":"use sem_trywait instead of sem_getvalue\n","repos":"kahara\/mjpeg-kinect,kahara\/mjpeg-kinect","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- grabber.c\n+++ grabber.c\n@@ -17,9 +17,8 @@\n void * grabber(void * args)\n {\n struct thread_arg * ta = (struct thread_arg *)args;\n- struct channel * input = ta->input, * output = ta->output;\n+ struct channel * output = ta->output;\n struct timeval tv;\n- int empty_count;\n \n \/\/ The new frame \"ticker\"\n struct sigaction sa;\n@@ -49,17 +48,17 @@\n tv.tv_sec = 0;\n tv.tv_usec = 10000;\n select(0, NULL, NULL, NULL, &tv);\n+ \n if(grab_new_frame) {\n grab_new_frame = 0;\n \n- sem_getvalue(&output->empty, &empty_count);\n- \n- if(empty_count < 1) {\n-\tprintf(\"dropping frame\\n\", empty_count);\t\n+ if(sem_trywait(&output->empty)) {\n+\tprintf(\"grabber dropping frame\\n\");\n } else {\n-\tsem_wait(&output->empty);\n-\tprintf(\"grab new frame\\n\");\n+\tpthread_mutex_lock(&output->lock);\n+\tprintf(\"grabber producing new frame\\n\");\n \tsem_post(&output->full);\n+\tpthread_mutex_unlock(&output->lock);\n }\n \n }\n"} {"commit":"bd81c2c6e7ed2ba8a2abfb5cba834b21ecb5f679","subject":"Groestl hash: remove even more dead code","message":"Groestl hash: remove even more dead code\n","repos":"runn1ng\/trezor-crypto,runn1ng\/trezor-crypto,runn1ng\/trezor-crypto,runn1ng\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto,runn1ng\/trezor-crypto,trezor\/trezor-crypto","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- groestl.c\n+++ groestl.c\n@@ -347,274 +347,6 @@\n \tC32e(0xcb46f6cb), C32e(0xfc1f4bfc), C32e(0xd661dad6), C32e(0x3a4e583a)\n };\n \n-static const sph_u32 T2up[] = {\n-\tC32e(0xa5c6c632), C32e(0x84f8f86f), C32e(0x99eeee5e), C32e(0x8df6f67a),\n-\tC32e(0x0dffffe8), C32e(0xbdd6d60a), C32e(0xb1dede16), C32e(0x5491916d),\n-\tC32e(0x50606090), C32e(0x03020207), C32e(0xa9cece2e), C32e(0x7d5656d1),\n-\tC32e(0x19e7e7cc), C32e(0x62b5b513), C32e(0xe64d4d7c), C32e(0x9aecec59),\n-\tC32e(0x458f8f40), C32e(0x9d1f1fa3), C32e(0x40898949), C32e(0x87fafa68),\n-\tC32e(0x15efefd0), C32e(0xebb2b294), C32e(0xc98e8ece), C32e(0x0bfbfbe6),\n-\tC32e(0xec41416e), C32e(0x67b3b31a), C32e(0xfd5f5f43), C32e(0xea454560),\n-\tC32e(0xbf2323f9), C32e(0xf7535351), C32e(0x96e4e445), C32e(0x5b9b9b76),\n-\tC32e(0xc2757528), C32e(0x1ce1e1c5), C32e(0xae3d3dd4), C32e(0x6a4c4cf2),\n-\tC32e(0x5a6c6c82), C32e(0x417e7ebd), C32e(0x02f5f5f3), C32e(0x4f838352),\n-\tC32e(0x5c68688c), C32e(0xf4515156), C32e(0x34d1d18d), C32e(0x08f9f9e1),\n-\tC32e(0x93e2e24c), C32e(0x73abab3e), C32e(0x53626297), C32e(0x3f2a2a6b),\n-\tC32e(0x0c08081c), C32e(0x52959563), C32e(0x654646e9), C32e(0x5e9d9d7f),\n-\tC32e(0x28303048), C32e(0xa13737cf), C32e(0x0f0a0a1b), C32e(0xb52f2feb),\n-\tC32e(0x090e0e15), C32e(0x3624247e), C32e(0x9b1b1bad), C32e(0x3ddfdf98),\n-\tC32e(0x26cdcda7), C32e(0x694e4ef5), C32e(0xcd7f7f33), C32e(0x9feaea50),\n-\tC32e(0x1b12123f), C32e(0x9e1d1da4), C32e(0x745858c4), C32e(0x2e343446),\n-\tC32e(0x2d363641), C32e(0xb2dcdc11), C32e(0xeeb4b49d), C32e(0xfb5b5b4d),\n-\tC32e(0xf6a4a4a5), C32e(0x4d7676a1), C32e(0x61b7b714), C32e(0xce7d7d34),\n-\tC32e(0x7b5252df), C32e(0x3edddd9f), C32e(0x715e5ecd), C32e(0x971313b1),\n-\tC32e(0xf5a6a6a2), C32e(0x68b9b901), C32e(0x00000000), C32e(0x2cc1c1b5),\n-\tC32e(0x604040e0), C32e(0x1fe3e3c2), C32e(0xc879793a), C32e(0xedb6b69a),\n-\tC32e(0xbed4d40d), C32e(0x468d8d47), C32e(0xd9676717), C32e(0x4b7272af),\n-\tC32e(0xde9494ed), C32e(0xd49898ff), C32e(0xe8b0b093), C32e(0x4a85855b),\n-\tC32e(0x6bbbbb06), C32e(0x2ac5c5bb), C32e(0xe54f4f7b), C32e(0x16ededd7),\n-\tC32e(0xc58686d2), C32e(0xd79a9af8), C32e(0x55666699), C32e(0x941111b6),\n-\tC32e(0xcf8a8ac0), C32e(0x10e9e9d9), C32e(0x0604040e), C32e(0x81fefe66),\n-\tC32e(0xf0a0a0ab), C32e(0x447878b4), C32e(0xba2525f0), C32e(0xe34b4b75),\n-\tC32e(0xf3a2a2ac), C32e(0xfe5d5d44), C32e(0xc08080db), C32e(0x8a050580),\n-\tC32e(0xad3f3fd3), C32e(0xbc2121fe), C32e(0x487070a8), C32e(0x04f1f1fd),\n-\tC32e(0xdf636319), C32e(0xc177772f), C32e(0x75afaf30), C32e(0x634242e7),\n-\tC32e(0x30202070), C32e(0x1ae5e5cb), C32e(0x0efdfdef), C32e(0x6dbfbf08),\n-\tC32e(0x4c818155), C32e(0x14181824), C32e(0x35262679), C32e(0x2fc3c3b2),\n-\tC32e(0xe1bebe86), C32e(0xa23535c8), C32e(0xcc8888c7), C32e(0x392e2e65),\n-\tC32e(0x5793936a), C32e(0xf2555558), C32e(0x82fcfc61), C32e(0x477a7ab3),\n-\tC32e(0xacc8c827), C32e(0xe7baba88), C32e(0x2b32324f), C32e(0x95e6e642),\n-\tC32e(0xa0c0c03b), C32e(0x981919aa), C32e(0xd19e9ef6), C32e(0x7fa3a322),\n-\tC32e(0x664444ee), C32e(0x7e5454d6), C32e(0xab3b3bdd), C32e(0x830b0b95),\n-\tC32e(0xca8c8cc9), C32e(0x29c7c7bc), C32e(0xd36b6b05), C32e(0x3c28286c),\n-\tC32e(0x79a7a72c), C32e(0xe2bcbc81), C32e(0x1d161631), C32e(0x76adad37),\n-\tC32e(0x3bdbdb96), C32e(0x5664649e), C32e(0x4e7474a6), C32e(0x1e141436),\n-\tC32e(0xdb9292e4), C32e(0x0a0c0c12), C32e(0x6c4848fc), C32e(0xe4b8b88f),\n-\tC32e(0x5d9f9f78), C32e(0x6ebdbd0f), C32e(0xef434369), C32e(0xa6c4c435),\n-\tC32e(0xa83939da), C32e(0xa43131c6), C32e(0x37d3d38a), C32e(0x8bf2f274),\n-\tC32e(0x32d5d583), C32e(0x438b8b4e), C32e(0x596e6e85), C32e(0xb7dada18),\n-\tC32e(0x8c01018e), C32e(0x64b1b11d), C32e(0xd29c9cf1), C32e(0xe0494972),\n-\tC32e(0xb4d8d81f), C32e(0xfaacacb9), C32e(0x07f3f3fa), C32e(0x25cfcfa0),\n-\tC32e(0xafcaca20), C32e(0x8ef4f47d), C32e(0xe9474767), C32e(0x18101038),\n-\tC32e(0xd56f6f0b), C32e(0x88f0f073), C32e(0x6f4a4afb), C32e(0x725c5cca),\n-\tC32e(0x24383854), C32e(0xf157575f), C32e(0xc7737321), C32e(0x51979764),\n-\tC32e(0x23cbcbae), C32e(0x7ca1a125), C32e(0x9ce8e857), C32e(0x213e3e5d),\n-\tC32e(0xdd9696ea), C32e(0xdc61611e), C32e(0x860d0d9c), C32e(0x850f0f9b),\n-\tC32e(0x90e0e04b), C32e(0x427c7cba), C32e(0xc4717126), C32e(0xaacccc29),\n-\tC32e(0xd89090e3), C32e(0x05060609), C32e(0x01f7f7f4), C32e(0x121c1c2a),\n-\tC32e(0xa3c2c23c), C32e(0x5f6a6a8b), C32e(0xf9aeaebe), C32e(0xd0696902),\n-\tC32e(0x911717bf), C32e(0x58999971), C32e(0x273a3a53), C32e(0xb92727f7),\n-\tC32e(0x38d9d991), C32e(0x13ebebde), C32e(0xb32b2be5), C32e(0x33222277),\n-\tC32e(0xbbd2d204), C32e(0x70a9a939), C32e(0x89070787), C32e(0xa73333c1),\n-\tC32e(0xb62d2dec), C32e(0x223c3c5a), C32e(0x921515b8), C32e(0x20c9c9a9),\n-\tC32e(0x4987875c), C32e(0xffaaaab0), C32e(0x785050d8), C32e(0x7aa5a52b),\n-\tC32e(0x8f030389), C32e(0xf859594a), C32e(0x80090992), C32e(0x171a1a23),\n-\tC32e(0xda656510), C32e(0x31d7d784), C32e(0xc68484d5), C32e(0xb8d0d003),\n-\tC32e(0xc38282dc), C32e(0xb02929e2), C32e(0x775a5ac3), C32e(0x111e1e2d),\n-\tC32e(0xcb7b7b3d), C32e(0xfca8a8b7), C32e(0xd66d6d0c), C32e(0x3a2c2c62)\n-};\n-\n-static const sph_u32 T2dn[] = {\n-\tC32e(0xf4a5f497), C32e(0x978497eb), C32e(0xb099b0c7), C32e(0x8c8d8cf7),\n-\tC32e(0x170d17e5), C32e(0xdcbddcb7), C32e(0xc8b1c8a7), C32e(0xfc54fc39),\n-\tC32e(0xf050f0c0), C32e(0x05030504), C32e(0xe0a9e087), C32e(0x877d87ac),\n-\tC32e(0x2b192bd5), C32e(0xa662a671), C32e(0x31e6319a), C32e(0xb59ab5c3),\n-\tC32e(0xcf45cf05), C32e(0xbc9dbc3e), C32e(0xc040c009), C32e(0x928792ef),\n-\tC32e(0x3f153fc5), C32e(0x26eb267f), C32e(0x40c94007), C32e(0x1d0b1ded),\n-\tC32e(0x2fec2f82), C32e(0xa967a97d), C32e(0x1cfd1cbe), C32e(0x25ea258a),\n-\tC32e(0xdabfda46), C32e(0x02f702a6), C32e(0xa196a1d3), C32e(0xed5bed2d),\n-\tC32e(0x5dc25dea), C32e(0x241c24d9), C32e(0xe9aee97a), C32e(0xbe6abe98),\n-\tC32e(0xee5aeed8), C32e(0xc341c3fc), C32e(0x060206f1), C32e(0xd14fd11d),\n-\tC32e(0xe45ce4d0), C32e(0x07f407a2), C32e(0x5c345cb9), C32e(0x180818e9),\n-\tC32e(0xae93aedf), C32e(0x9573954d), C32e(0xf553f5c4), C32e(0x413f4154),\n-\tC32e(0x140c1410), C32e(0xf652f631), C32e(0xaf65af8c), C32e(0xe25ee221),\n-\tC32e(0x78287860), C32e(0xf8a1f86e), C32e(0x110f1114), C32e(0xc4b5c45e),\n-\tC32e(0x1b091b1c), C32e(0x5a365a48), C32e(0xb69bb636), C32e(0x473d47a5),\n-\tC32e(0x6a266a81), C32e(0xbb69bb9c), C32e(0x4ccd4cfe), C32e(0xba9fbacf),\n-\tC32e(0x2d1b2d24), C32e(0xb99eb93a), C32e(0x9c749cb0), C32e(0x722e7268),\n-\tC32e(0x772d776c), C32e(0xcdb2cda3), C32e(0x29ee2973), C32e(0x16fb16b6),\n-\tC32e(0x01f60153), C32e(0xd74dd7ec), C32e(0xa361a375), C32e(0x49ce49fa),\n-\tC32e(0x8d7b8da4), C32e(0x423e42a1), C32e(0x937193bc), C32e(0xa297a226),\n-\tC32e(0x04f50457), C32e(0xb868b869), C32e(0x00000000), C32e(0x742c7499),\n-\tC32e(0xa060a080), C32e(0x211f21dd), C32e(0x43c843f2), C32e(0x2ced2c77),\n-\tC32e(0xd9bed9b3), C32e(0xca46ca01), C32e(0x70d970ce), C32e(0xdd4bdde4),\n-\tC32e(0x79de7933), C32e(0x67d4672b), C32e(0x23e8237b), C32e(0xde4ade11),\n-\tC32e(0xbd6bbd6d), C32e(0x7e2a7e91), C32e(0x34e5349e), C32e(0x3a163ac1),\n-\tC32e(0x54c55417), C32e(0x62d7622f), C32e(0xff55ffcc), C32e(0xa794a722),\n-\tC32e(0x4acf4a0f), C32e(0x301030c9), C32e(0x0a060a08), C32e(0x988198e7),\n-\tC32e(0x0bf00b5b), C32e(0xcc44ccf0), C32e(0xd5bad54a), C32e(0x3ee33e96),\n-\tC32e(0x0ef30e5f), C32e(0x19fe19ba), C32e(0x5bc05b1b), C32e(0x858a850a),\n-\tC32e(0xecadec7e), C32e(0xdfbcdf42), C32e(0xd848d8e0), C32e(0x0c040cf9),\n-\tC32e(0x7adf7ac6), C32e(0x58c158ee), C32e(0x9f759f45), C32e(0xa563a584),\n-\tC32e(0x50305040), C32e(0x2e1a2ed1), C32e(0x120e12e1), C32e(0xb76db765),\n-\tC32e(0xd44cd419), C32e(0x3c143c30), C32e(0x5f355f4c), C32e(0x712f719d),\n-\tC32e(0x38e13867), C32e(0xfda2fd6a), C32e(0x4fcc4f0b), C32e(0x4b394b5c),\n-\tC32e(0xf957f93d), C32e(0x0df20daa), C32e(0x9d829de3), C32e(0xc947c9f4),\n-\tC32e(0xefacef8b), C32e(0x32e7326f), C32e(0x7d2b7d64), C32e(0xa495a4d7),\n-\tC32e(0xfba0fb9b), C32e(0xb398b332), C32e(0x68d16827), C32e(0x817f815d),\n-\tC32e(0xaa66aa88), C32e(0x827e82a8), C32e(0xe6abe676), C32e(0x9e839e16),\n-\tC32e(0x45ca4503), C32e(0x7b297b95), C32e(0x6ed36ed6), C32e(0x443c4450),\n-\tC32e(0x8b798b55), C32e(0x3de23d63), C32e(0x271d272c), C32e(0x9a769a41),\n-\tC32e(0x4d3b4dad), C32e(0xfa56fac8), C32e(0xd24ed2e8), C32e(0x221e2228),\n-\tC32e(0x76db763f), C32e(0x1e0a1e18), C32e(0xb46cb490), C32e(0x37e4376b),\n-\tC32e(0xe75de725), C32e(0xb26eb261), C32e(0x2aef2a86), C32e(0xf1a6f193),\n-\tC32e(0xe3a8e372), C32e(0xf7a4f762), C32e(0x593759bd), C32e(0x868b86ff),\n-\tC32e(0x563256b1), C32e(0xc543c50d), C32e(0xeb59ebdc), C32e(0xc2b7c2af),\n-\tC32e(0x8f8c8f02), C32e(0xac64ac79), C32e(0x6dd26d23), C32e(0x3be03b92),\n-\tC32e(0xc7b4c7ab), C32e(0x15fa1543), C32e(0x090709fd), C32e(0x6f256f85),\n-\tC32e(0xeaafea8f), C32e(0x898e89f3), C32e(0x20e9208e), C32e(0x28182820),\n-\tC32e(0x64d564de), C32e(0x838883fb), C32e(0xb16fb194), C32e(0x967296b8),\n-\tC32e(0x6c246c70), C32e(0x08f108ae), C32e(0x52c752e6), C32e(0xf351f335),\n-\tC32e(0x6523658d), C32e(0x847c8459), C32e(0xbf9cbfcb), C32e(0x6321637c),\n-\tC32e(0x7cdd7c37), C32e(0x7fdc7fc2), C32e(0x9186911a), C32e(0x9485941e),\n-\tC32e(0xab90abdb), C32e(0xc642c6f8), C32e(0x57c457e2), C32e(0xe5aae583),\n-\tC32e(0x73d8733b), C32e(0x0f050f0c), C32e(0x030103f5), C32e(0x36123638),\n-\tC32e(0xfea3fe9f), C32e(0xe15fe1d4), C32e(0x10f91047), C32e(0x6bd06bd2),\n-\tC32e(0xa891a82e), C32e(0xe858e829), C32e(0x69276974), C32e(0xd0b9d04e),\n-\tC32e(0x483848a9), C32e(0x351335cd), C32e(0xceb3ce56), C32e(0x55335544),\n-\tC32e(0xd6bbd6bf), C32e(0x90709049), C32e(0x8089800e), C32e(0xf2a7f266),\n-\tC32e(0xc1b6c15a), C32e(0x66226678), C32e(0xad92ad2a), C32e(0x60206089),\n-\tC32e(0xdb49db15), C32e(0x1aff1a4f), C32e(0x887888a0), C32e(0x8e7a8e51),\n-\tC32e(0x8a8f8a06), C32e(0x13f813b2), C32e(0x9b809b12), C32e(0x39173934),\n-\tC32e(0x75da75ca), C32e(0x533153b5), C32e(0x51c65113), C32e(0xd3b8d3bb),\n-\tC32e(0x5ec35e1f), C32e(0xcbb0cb52), C32e(0x997799b4), C32e(0x3311333c),\n-\tC32e(0x46cb46f6), C32e(0x1ffc1f4b), C32e(0x61d661da), C32e(0x4e3a4e58)\n-};\n-\n-static const sph_u32 T3up[] = {\n-\tC32e(0x97a5c6c6), C32e(0xeb84f8f8), C32e(0xc799eeee), C32e(0xf78df6f6),\n-\tC32e(0xe50dffff), C32e(0xb7bdd6d6), C32e(0xa7b1dede), C32e(0x39549191),\n-\tC32e(0xc0506060), C32e(0x04030202), C32e(0x87a9cece), C32e(0xac7d5656),\n-\tC32e(0xd519e7e7), C32e(0x7162b5b5), C32e(0x9ae64d4d), C32e(0xc39aecec),\n-\tC32e(0x05458f8f), C32e(0x3e9d1f1f), C32e(0x09408989), C32e(0xef87fafa),\n-\tC32e(0xc515efef), C32e(0x7febb2b2), C32e(0x07c98e8e), C32e(0xed0bfbfb),\n-\tC32e(0x82ec4141), C32e(0x7d67b3b3), C32e(0xbefd5f5f), C32e(0x8aea4545),\n-\tC32e(0x46bf2323), C32e(0xa6f75353), C32e(0xd396e4e4), C32e(0x2d5b9b9b),\n-\tC32e(0xeac27575), C32e(0xd91ce1e1), C32e(0x7aae3d3d), C32e(0x986a4c4c),\n-\tC32e(0xd85a6c6c), C32e(0xfc417e7e), C32e(0xf102f5f5), C32e(0x1d4f8383),\n-\tC32e(0xd05c6868), C32e(0xa2f45151), C32e(0xb934d1d1), C32e(0xe908f9f9),\n-\tC32e(0xdf93e2e2), C32e(0x4d73abab), C32e(0xc4536262), C32e(0x543f2a2a),\n-\tC32e(0x100c0808), C32e(0x31529595), C32e(0x8c654646), C32e(0x215e9d9d),\n-\tC32e(0x60283030), C32e(0x6ea13737), C32e(0x140f0a0a), C32e(0x5eb52f2f),\n-\tC32e(0x1c090e0e), C32e(0x48362424), C32e(0x369b1b1b), C32e(0xa53ddfdf),\n-\tC32e(0x8126cdcd), C32e(0x9c694e4e), C32e(0xfecd7f7f), C32e(0xcf9feaea),\n-\tC32e(0x241b1212), C32e(0x3a9e1d1d), C32e(0xb0745858), C32e(0x682e3434),\n-\tC32e(0x6c2d3636), C32e(0xa3b2dcdc), C32e(0x73eeb4b4), C32e(0xb6fb5b5b),\n-\tC32e(0x53f6a4a4), C32e(0xec4d7676), C32e(0x7561b7b7), C32e(0xface7d7d),\n-\tC32e(0xa47b5252), C32e(0xa13edddd), C32e(0xbc715e5e), C32e(0x26971313),\n-\tC32e(0x57f5a6a6), C32e(0x6968b9b9), C32e(0x00000000), C32e(0x992cc1c1),\n-\tC32e(0x80604040), C32e(0xdd1fe3e3), C32e(0xf2c87979), C32e(0x77edb6b6),\n-\tC32e(0xb3bed4d4), C32e(0x01468d8d), C32e(0xced96767), C32e(0xe44b7272),\n-\tC32e(0x33de9494), C32e(0x2bd49898), C32e(0x7be8b0b0), C32e(0x114a8585),\n-\tC32e(0x6d6bbbbb), C32e(0x912ac5c5), C32e(0x9ee54f4f), C32e(0xc116eded),\n-\tC32e(0x17c58686), C32e(0x2fd79a9a), C32e(0xcc556666), C32e(0x22941111),\n-\tC32e(0x0fcf8a8a), C32e(0xc910e9e9), C32e(0x08060404), C32e(0xe781fefe),\n-\tC32e(0x5bf0a0a0), C32e(0xf0447878), C32e(0x4aba2525), C32e(0x96e34b4b),\n-\tC32e(0x5ff3a2a2), C32e(0xbafe5d5d), C32e(0x1bc08080), C32e(0x0a8a0505),\n-\tC32e(0x7ead3f3f), C32e(0x42bc2121), C32e(0xe0487070), C32e(0xf904f1f1),\n-\tC32e(0xc6df6363), C32e(0xeec17777), C32e(0x4575afaf), C32e(0x84634242),\n-\tC32e(0x40302020), C32e(0xd11ae5e5), C32e(0xe10efdfd), C32e(0x656dbfbf),\n-\tC32e(0x194c8181), C32e(0x30141818), C32e(0x4c352626), C32e(0x9d2fc3c3),\n-\tC32e(0x67e1bebe), C32e(0x6aa23535), C32e(0x0bcc8888), C32e(0x5c392e2e),\n-\tC32e(0x3d579393), C32e(0xaaf25555), C32e(0xe382fcfc), C32e(0xf4477a7a),\n-\tC32e(0x8bacc8c8), C32e(0x6fe7baba), C32e(0x642b3232), C32e(0xd795e6e6),\n-\tC32e(0x9ba0c0c0), C32e(0x32981919), C32e(0x27d19e9e), C32e(0x5d7fa3a3),\n-\tC32e(0x88664444), C32e(0xa87e5454), C32e(0x76ab3b3b), C32e(0x16830b0b),\n-\tC32e(0x03ca8c8c), C32e(0x9529c7c7), C32e(0xd6d36b6b), C32e(0x503c2828),\n-\tC32e(0x5579a7a7), C32e(0x63e2bcbc), C32e(0x2c1d1616), C32e(0x4176adad),\n-\tC32e(0xad3bdbdb), C32e(0xc8566464), C32e(0xe84e7474), C32e(0x281e1414),\n-\tC32e(0x3fdb9292), C32e(0x180a0c0c), C32e(0x906c4848), C32e(0x6be4b8b8),\n-\tC32e(0x255d9f9f), C32e(0x616ebdbd), C32e(0x86ef4343), C32e(0x93a6c4c4),\n-\tC32e(0x72a83939), C32e(0x62a43131), C32e(0xbd37d3d3), C32e(0xff8bf2f2),\n-\tC32e(0xb132d5d5), C32e(0x0d438b8b), C32e(0xdc596e6e), C32e(0xafb7dada),\n-\tC32e(0x028c0101), C32e(0x7964b1b1), C32e(0x23d29c9c), C32e(0x92e04949),\n-\tC32e(0xabb4d8d8), C32e(0x43faacac), C32e(0xfd07f3f3), C32e(0x8525cfcf),\n-\tC32e(0x8fafcaca), C32e(0xf38ef4f4), C32e(0x8ee94747), C32e(0x20181010),\n-\tC32e(0xded56f6f), C32e(0xfb88f0f0), C32e(0x946f4a4a), C32e(0xb8725c5c),\n-\tC32e(0x70243838), C32e(0xaef15757), C32e(0xe6c77373), C32e(0x35519797),\n-\tC32e(0x8d23cbcb), C32e(0x597ca1a1), C32e(0xcb9ce8e8), C32e(0x7c213e3e),\n-\tC32e(0x37dd9696), C32e(0xc2dc6161), C32e(0x1a860d0d), C32e(0x1e850f0f),\n-\tC32e(0xdb90e0e0), C32e(0xf8427c7c), C32e(0xe2c47171), C32e(0x83aacccc),\n-\tC32e(0x3bd89090), C32e(0x0c050606), C32e(0xf501f7f7), C32e(0x38121c1c),\n-\tC32e(0x9fa3c2c2), C32e(0xd45f6a6a), C32e(0x47f9aeae), C32e(0xd2d06969),\n-\tC32e(0x2e911717), C32e(0x29589999), C32e(0x74273a3a), C32e(0x4eb92727),\n-\tC32e(0xa938d9d9), C32e(0xcd13ebeb), C32e(0x56b32b2b), C32e(0x44332222),\n-\tC32e(0xbfbbd2d2), C32e(0x4970a9a9), C32e(0x0e890707), C32e(0x66a73333),\n-\tC32e(0x5ab62d2d), C32e(0x78223c3c), C32e(0x2a921515), C32e(0x8920c9c9),\n-\tC32e(0x15498787), C32e(0x4fffaaaa), C32e(0xa0785050), C32e(0x517aa5a5),\n-\tC32e(0x068f0303), C32e(0xb2f85959), C32e(0x12800909), C32e(0x34171a1a),\n-\tC32e(0xcada6565), C32e(0xb531d7d7), C32e(0x13c68484), C32e(0xbbb8d0d0),\n-\tC32e(0x1fc38282), C32e(0x52b02929), C32e(0xb4775a5a), C32e(0x3c111e1e),\n-\tC32e(0xf6cb7b7b), C32e(0x4bfca8a8), C32e(0xdad66d6d), C32e(0x583a2c2c)\n-};\n-\n-static const sph_u32 T3dn[] = {\n-\tC32e(0x32f4a5f4), C32e(0x6f978497), C32e(0x5eb099b0), C32e(0x7a8c8d8c),\n-\tC32e(0xe8170d17), C32e(0x0adcbddc), C32e(0x16c8b1c8), C32e(0x6dfc54fc),\n-\tC32e(0x90f050f0), C32e(0x07050305), C32e(0x2ee0a9e0), C32e(0xd1877d87),\n-\tC32e(0xcc2b192b), C32e(0x13a662a6), C32e(0x7c31e631), C32e(0x59b59ab5),\n-\tC32e(0x40cf45cf), C32e(0xa3bc9dbc), C32e(0x49c040c0), C32e(0x68928792),\n-\tC32e(0xd03f153f), C32e(0x9426eb26), C32e(0xce40c940), C32e(0xe61d0b1d),\n-\tC32e(0x6e2fec2f), C32e(0x1aa967a9), C32e(0x431cfd1c), C32e(0x6025ea25),\n-\tC32e(0xf9dabfda), C32e(0x5102f702), C32e(0x45a196a1), C32e(0x76ed5bed),\n-\tC32e(0x285dc25d), C32e(0xc5241c24), C32e(0xd4e9aee9), C32e(0xf2be6abe),\n-\tC32e(0x82ee5aee), C32e(0xbdc341c3), C32e(0xf3060206), C32e(0x52d14fd1),\n-\tC32e(0x8ce45ce4), C32e(0x5607f407), C32e(0x8d5c345c), C32e(0xe1180818),\n-\tC32e(0x4cae93ae), C32e(0x3e957395), C32e(0x97f553f5), C32e(0x6b413f41),\n-\tC32e(0x1c140c14), C32e(0x63f652f6), C32e(0xe9af65af), C32e(0x7fe25ee2),\n-\tC32e(0x48782878), C32e(0xcff8a1f8), C32e(0x1b110f11), C32e(0xebc4b5c4),\n-\tC32e(0x151b091b), C32e(0x7e5a365a), C32e(0xadb69bb6), C32e(0x98473d47),\n-\tC32e(0xa76a266a), C32e(0xf5bb69bb), C32e(0x334ccd4c), C32e(0x50ba9fba),\n-\tC32e(0x3f2d1b2d), C32e(0xa4b99eb9), C32e(0xc49c749c), C32e(0x46722e72),\n-\tC32e(0x41772d77), C32e(0x11cdb2cd), C32e(0x9d29ee29), C32e(0x4d16fb16),\n-\tC32e(0xa501f601), C32e(0xa1d74dd7), C32e(0x14a361a3), C32e(0x3449ce49),\n-\tC32e(0xdf8d7b8d), C32e(0x9f423e42), C32e(0xcd937193), C32e(0xb1a297a2),\n-\tC32e(0xa204f504), C32e(0x01b868b8), C32e(0x00000000), C32e(0xb5742c74),\n-\tC32e(0xe0a060a0), C32e(0xc2211f21), C32e(0x3a43c843), C32e(0x9a2ced2c),\n-\tC32e(0x0dd9bed9), C32e(0x47ca46ca), C32e(0x1770d970), C32e(0xafdd4bdd),\n-\tC32e(0xed79de79), C32e(0xff67d467), C32e(0x9323e823), C32e(0x5bde4ade),\n-\tC32e(0x06bd6bbd), C32e(0xbb7e2a7e), C32e(0x7b34e534), C32e(0xd73a163a),\n-\tC32e(0xd254c554), C32e(0xf862d762), C32e(0x99ff55ff), C32e(0xb6a794a7),\n-\tC32e(0xc04acf4a), C32e(0xd9301030), C32e(0x0e0a060a), C32e(0x66988198),\n-\tC32e(0xab0bf00b), C32e(0xb4cc44cc), C32e(0xf0d5bad5), C32e(0x753ee33e),\n-\tC32e(0xac0ef30e), C32e(0x4419fe19), C32e(0xdb5bc05b), C32e(0x80858a85),\n-\tC32e(0xd3ecadec), C32e(0xfedfbcdf), C32e(0xa8d848d8), C32e(0xfd0c040c),\n-\tC32e(0x197adf7a), C32e(0x2f58c158), C32e(0x309f759f), C32e(0xe7a563a5),\n-\tC32e(0x70503050), C32e(0xcb2e1a2e), C32e(0xef120e12), C32e(0x08b76db7),\n-\tC32e(0x55d44cd4), C32e(0x243c143c), C32e(0x795f355f), C32e(0xb2712f71),\n-\tC32e(0x8638e138), C32e(0xc8fda2fd), C32e(0xc74fcc4f), C32e(0x654b394b),\n-\tC32e(0x6af957f9), C32e(0x580df20d), C32e(0x619d829d), C32e(0xb3c947c9),\n-\tC32e(0x27efacef), C32e(0x8832e732), C32e(0x4f7d2b7d), C32e(0x42a495a4),\n-\tC32e(0x3bfba0fb), C32e(0xaab398b3), C32e(0xf668d168), C32e(0x22817f81),\n-\tC32e(0xeeaa66aa), C32e(0xd6827e82), C32e(0xdde6abe6), C32e(0x959e839e),\n-\tC32e(0xc945ca45), C32e(0xbc7b297b), C32e(0x056ed36e), C32e(0x6c443c44),\n-\tC32e(0x2c8b798b), C32e(0x813de23d), C32e(0x31271d27), C32e(0x379a769a),\n-\tC32e(0x964d3b4d), C32e(0x9efa56fa), C32e(0xa6d24ed2), C32e(0x36221e22),\n-\tC32e(0xe476db76), C32e(0x121e0a1e), C32e(0xfcb46cb4), C32e(0x8f37e437),\n-\tC32e(0x78e75de7), C32e(0x0fb26eb2), C32e(0x692aef2a), C32e(0x35f1a6f1),\n-\tC32e(0xdae3a8e3), C32e(0xc6f7a4f7), C32e(0x8a593759), C32e(0x74868b86),\n-\tC32e(0x83563256), C32e(0x4ec543c5), C32e(0x85eb59eb), C32e(0x18c2b7c2),\n-\tC32e(0x8e8f8c8f), C32e(0x1dac64ac), C32e(0xf16dd26d), C32e(0x723be03b),\n-\tC32e(0x1fc7b4c7), C32e(0xb915fa15), C32e(0xfa090709), C32e(0xa06f256f),\n-\tC32e(0x20eaafea), C32e(0x7d898e89), C32e(0x6720e920), C32e(0x38281828),\n-\tC32e(0x0b64d564), C32e(0x73838883), C32e(0xfbb16fb1), C32e(0xca967296),\n-\tC32e(0x546c246c), C32e(0x5f08f108), C32e(0x2152c752), C32e(0x64f351f3),\n-\tC32e(0xae652365), C32e(0x25847c84), C32e(0x57bf9cbf), C32e(0x5d632163),\n-\tC32e(0xea7cdd7c), C32e(0x1e7fdc7f), C32e(0x9c918691), C32e(0x9b948594),\n-\tC32e(0x4bab90ab), C32e(0xbac642c6), C32e(0x2657c457), C32e(0x29e5aae5),\n-\tC32e(0xe373d873), C32e(0x090f050f), C32e(0xf4030103), C32e(0x2a361236),\n-\tC32e(0x3cfea3fe), C32e(0x8be15fe1), C32e(0xbe10f910), C32e(0x026bd06b),\n-\tC32e(0xbfa891a8), C32e(0x71e858e8), C32e(0x53692769), C32e(0xf7d0b9d0),\n-\tC32e(0x91483848), C32e(0xde351335), C32e(0xe5ceb3ce), C32e(0x77553355),\n-\tC32e(0x04d6bbd6), C32e(0x39907090), C32e(0x87808980), C32e(0xc1f2a7f2),\n-\tC32e(0xecc1b6c1), C32e(0x5a662266), C32e(0xb8ad92ad), C32e(0xa9602060),\n-\tC32e(0x5cdb49db), C32e(0xb01aff1a), C32e(0xd8887888), C32e(0x2b8e7a8e),\n-\tC32e(0x898a8f8a), C32e(0x4a13f813), C32e(0x929b809b), C32e(0x23391739),\n-\tC32e(0x1075da75), C32e(0x84533153), C32e(0xd551c651), C32e(0x03d3b8d3),\n-\tC32e(0xdc5ec35e), C32e(0xe2cbb0cb), C32e(0xc3997799), C32e(0x2d331133),\n-\tC32e(0x3d46cb46), C32e(0xb71ffc1f), C32e(0x0c61d661), C32e(0x624e3a4e)\n-};\n-\n #define DECL_STATE_SMALL \\\n \tsph_u32 H[16];\n \n"} {"commit":"da49c57ade53581fbaca0573b4fa0ca0da516081","subject":"tag rule bug. remove tag_auto_switch default (needs to become config option)","message":"tag rule bug. remove tag_auto_switch default (needs to become config option)\n","repos":"seanpringle\/goomwwm,seanpringle\/goomwwm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- goomwwm.c\n+++ goomwwm.c\n@@ -474,6 +474,14 @@\n \tl->array[l->len++] = w;\n \treturn l->len-1;\n }\n+void winlist_prepend(winlist *l, Window w, void *d)\n+{\n+\twinlist_append(l, None, NULL);\n+\tmemmove(&l->array[1], &l->array[0], sizeof(Window) * (l->len-1));\n+\tmemmove(&l->data[1], &l->data[0], sizeof(void*) * (l->len-1));\n+\tl->array[0] = w;\n+\tl->data[0] = d;\n+}\n void winlist_empty(winlist *l)\n {\n \twhile (l->len > 0) free(l->data[--(l->len)]);\n@@ -3045,7 +3053,7 @@\n \t\t\t\tMAX(m->y, m->y + ((m->h - c->h) \/ 2)), c->w, c->h);\n \t\t}\n \t\t\/\/ apply and rule tags\n-\t\tif (client_rule(c, (TAG1|TAG2|TAG3|TAG4|TAG5|TAG6|TAG7|TAG8|TAG9)))\/\/ && !c->cache->tags)\n+\t\tif (client_rule(c, (TAG1|TAG2|TAG3|TAG4|TAG5|TAG6|TAG7|TAG8|TAG9)))\n \t\t\tc->cache->tags = c->rule->flags & (TAG1|TAG2|TAG3|TAG4|TAG5|TAG6|TAG7|TAG8|TAG9);\n \n \t\t\/\/ default to current tag\n@@ -3070,6 +3078,11 @@\n \t\t\/\/ autoactivate only on current tag\n \t\tif (c->cache->tags & current_tag)\n \t\t\tclient_activate(c, RAISEDEF, WARPDEF);\n+\t\telse\t{\n+\t\t\t\/\/ update focus history order. pretend this window has been activated before\n+\t\t\twinlist_forget(windows_activated, c->window);\n+\t\t\twinlist_prepend(windows_activated, c->window, NULL);\n+\t\t}\n \t\tewmh_client_list(c->xattr.root);\n \t\t\/\/ some gtk windows see to need an extra kick to make them respect expose events...\n \t\t\/\/ something to do with the configurerequest step? this little nudge makes it all work :-|\n@@ -3098,7 +3111,6 @@\n \t\tif (window_is_root(ev->xunmap.event))\n \t\t{\n \t\t\twindow_active_client(ev->xunmap.event, current_tag);\n-\t\t\ttag_auto_switch(ev->xunmap.event);\n \t\t\tewmh_client_list(ev->xunmap.event);\n \t\t}\n \t\telse\n"} {"commit":"82d3caf2cfa4525693777f01ae5f02995d1d1d1f","subject":"(RUBY_GPGME_WORKAROUND_KEYLIST_NEXT): Define. (CHECK_KEYLIST_IN_PROGRESS): New macro. (CHECK_KEYLIST_NOT_IN_PROGRESS): New macro. (SET_KEYLIST_IN_PROGRESS): New macro. (RESET_KEYLIST_IN_PROGRESS): New macro.","message":"(RUBY_GPGME_WORKAROUND_KEYLIST_NEXT): Define.\n(CHECK_KEYLIST_IN_PROGRESS): New macro.\n(CHECK_KEYLIST_NOT_IN_PROGRESS): New macro.\n(SET_KEYLIST_IN_PROGRESS): New macro.\n(RESET_KEYLIST_IN_PROGRESS): New macro.\n\n","repos":"ueno\/ruby-gpgme,ueno\/ruby-gpgme,ueno\/ruby-gpgme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gpgme_n.c\n+++ gpgme_n.c\n@@ -35,6 +35,26 @@\n #include \"ruby.h\"\n #include \"gpgme.h\"\n #include <errno.h>\n+\n+#define RUBY_GPGME_WORKAROUND_KEYLIST_NEXT\n+\n+#ifdef RUBY_GPGME_WORKAROUND_KEYLIST_NEXT\n+#define CHECK_KEYLIST_IN_PROGRESS(vctx)\t\t\t\t\t\\\n+ if (rb_iv_get (vctx, \"ruby_gpgme_keylist_in_progress\") != Qtrue)\t\\\n+ return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE))\n+#define CHECK_KEYLIST_NOT_IN_PROGRESS(vctx)\t\t\t\t\\\n+ if (rb_iv_get (vctx, \"ruby_gpgme_keylist_in_progress\") == Qtrue)\t\\\n+ return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE))\n+#define SET_KEYLIST_IN_PROGRESS(vctx)\t\t\t\t\\\n+ rb_iv_set (vctx, \"ruby_gpgme_keylist_in_progress\", Qtrue)\n+#define RESET_KEYLIST_IN_PROGRESS(vctx)\t\t\t\t\\\n+ rb_iv_set (vctx, \"ruby_gpgme_keylist_in_progress\", Qfalse)\n+#else\n+#define CHECK_KEYLIST_IN_PROGRESS(vctx)\n+#define CHECK_KEYLIST_NOT_IN_PROGRESS(vctx)\n+#define SET_KEYLIST_IN_PROGRESS(vctx)\n+#define RESET_KEYLIST_IN_PROGRESS(vctx)\n+#endif\n \n \/* StringValuePtr is not available in 1.6. *\/\n #ifndef StringValuePtr\n@@ -590,8 +610,7 @@\n gpgme_ctx_t ctx;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -599,7 +618,7 @@\n \t\t\t\tStringValueCStr(vpattern),\n \t\t\t\tNUM2INT(vsecret_only));\n if (gpgme_err_code (err) == GPG_ERR_NO_ERROR)\n- rb_iv_set (vctx, \"gpgme_op_keylist_start\", Qtrue);\n+ SET_KEYLIST_IN_PROGRESS(vctx);\n return LONG2NUM(err);\n }\n \n@@ -611,8 +630,7 @@\n const char **pattern = NULL;\n int i, err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -627,7 +645,7 @@\n \n err = gpgme_op_keylist_ext_start (ctx, pattern, NUM2INT(vsecret_only), 0);\n if (gpgme_err_code (err) == GPG_ERR_NO_ERROR)\n- rb_iv_set (vctx, \"gpgme_op_keylist_start\", Qtrue);\n+ SET_KEYLIST_IN_PROGRESS(vctx);\n if (pattern)\n xfree (pattern);\n return LONG2NUM(err);\n@@ -723,8 +741,7 @@\n gpgme_key_t key;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") != Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -744,13 +761,12 @@\n gpgme_ctx_t ctx;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") != Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n err = gpgme_op_keylist_end (ctx);\n- rb_iv_set (vctx, \"gpgme_op_keylist_start\", Qfalse);\n+ RESET_KEYLIST_IN_PROGRESS(vctx);\n return LONG2NUM(err);\n }\n \n@@ -802,8 +818,7 @@\n gpgme_data_t pubkey = NULL, seckey = NULL;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n if (!NIL_P(vpubkey))\n@@ -823,8 +838,7 @@\n gpgme_data_t pubkey = NULL, seckey = NULL;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n if (!NIL_P(vpubkey))\n@@ -844,8 +858,7 @@\n gpgme_data_t keydata;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vkeydata, keydata);\n@@ -863,8 +876,7 @@\n gpgme_data_t keydata;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vkeydata, keydata);\n@@ -881,8 +893,7 @@\n gpgme_data_t keydata;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vkeydata, keydata);\n@@ -898,8 +909,7 @@\n gpgme_data_t keydata;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vkeydata, keydata);\n@@ -955,8 +965,7 @@\n gpgme_key_t key;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_KEY(vkey, key);\n@@ -973,8 +982,7 @@\n gpgme_key_t key;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_KEY(vkey, key);\n@@ -990,8 +998,7 @@\n gpgme_ctx_t ctx;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n err = gpgme_op_trustlist_start (ctx, StringValueCStr(vpattern),\n@@ -1007,8 +1014,7 @@\n gpgme_error_t err;\n VALUE vitem;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -1035,8 +1041,7 @@\n gpgme_ctx_t ctx;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -1051,8 +1056,7 @@\n gpgme_data_t cipher, plain;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vcipher, cipher);\n@@ -1070,8 +1074,7 @@\n gpgme_data_t cipher, plain;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vcipher, cipher);\n@@ -1107,8 +1110,7 @@\n gpgme_data_t sig, signed_text = NULL, plain = NULL;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vsig, sig);\n@@ -1129,8 +1131,7 @@\n gpgme_data_t sig, signed_text = NULL, plain = NULL;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vsig, sig);\n@@ -1195,8 +1196,7 @@\n gpgme_data_t cipher, plain;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vcipher, cipher);\n@@ -1214,8 +1214,7 @@\n gpgme_data_t cipher, plain;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vcipher, cipher);\n@@ -1271,8 +1270,7 @@\n gpgme_data_t plain, sig;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vplain, plain);\n@@ -1290,8 +1288,7 @@\n gpgme_data_t plain, sig;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n UNWRAP_GPGME_DATA(vplain, plain);\n@@ -1356,8 +1353,7 @@\n gpgme_data_t plain, cipher;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \/* If RECP is `NULL', symmetric rather than public key encryption is\n@@ -1388,8 +1384,7 @@\n gpgme_data_t plain, cipher;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \/* If RECP is `NULL', symmetric rather than public key encryption is\n@@ -1419,8 +1414,7 @@\n gpgme_invalid_key_t invalid_key;\n VALUE vresult, vinvalid_recipients;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \n@@ -1449,8 +1443,7 @@\n gpgme_data_t plain, cipher;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \/* If RECP is `NULL', symmetric rather than public key encryption is\n@@ -1481,8 +1474,7 @@\n gpgme_data_t plain, cipher;\n gpgme_error_t err;\n \n- if (rb_iv_get (vctx, \"gpgme_op_keylist_start\") == Qtrue)\n- return LONG2NUM(gpgme_error (GPG_ERR_INV_STATE));\n+ CHECK_KEYLIST_NOT_IN_PROGRESS(vctx);\n \n UNWRAP_GPGME_CTX(vctx, ctx);\n \/* If RECP is `NULL', symmetric rather than public key encryption is\n"} {"commit":"a2cb6de20d34258a8c9d24271dd94ab3916da235","subject":"Stop printing redundant parenthesis in guard statements","message":"Stop printing redundant parenthesis in guard statements\n\nConditions like 'if (g2 == 0)' were printed as 'if ((g2 == 0))'. Those\nextra parenthesis are only needed if there is more than one comparison\nin the if-condition.\n\nSigned-off-by: Tobias Grosser <059b8b880f8441509ec8a65b50b4c6ae74ebea76@grosser.es>\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"nicolasvasilache\/ppcg,Meinersbur\/ppcg,Meinersbur\/ppcg,nicolasvasilache\/ppcg","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gpucode.c\n+++ gpucode.c\n@@ -160,7 +160,8 @@\n for (i = 0; i < n; ++i) {\n if (i > 0)\n fprintf(info->dst,\" && \");\n- fprintf(info->dst,\"(\");\n+ if (n > 1)\n+ fprintf(info->dst,\"(\");\n print_expr(g->eq[i].LHS, info->dst);\n if (g->eq[i].sign == 0)\n fprintf(info->dst,\" == \");\n@@ -169,7 +170,8 @@\n else\n fprintf(info->dst,\" <= \");\n print_expr(g->eq[i].RHS, info->dst);\n- fprintf(info->dst,\")\");\n+ if (n > 1)\n+ fprintf(info->dst,\")\");\n }\n fprintf(info->dst, \") {\\n\");\n info->indent += 4;\n"} {"commit":"0798c26225c9f26b27564a819a10bd67389c1bac","subject":"Clean up some of the SAF-TE matching code. Add a few missing newlines in printouts.","message":"Clean up some of the SAF-TE matching code. Add\na few missing newlines in printouts.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/cam\/scsi\/scsi_ses.c\n+++ sys\/cam\/scsi\/scsi_ses.c\n@@ -735,12 +735,16 @@\n * handle that too.\n *\/\n \n+#define\tSAFTE_START\t44\n+#define\tSAFTE_END\t50\n+#define\tSAFTE_LEN\tSAFTE_END-SAFTE_START\n+\n static enctyp\n ses_type(void *buf, int buflen)\n {\n \tunsigned char *iqd = buf;\n \n-\tif (buflen < 32)\n+\tif (buflen < 8+SEN_ID_LEN)\n \t\treturn (SES_NONE);\n \n \tif ((iqd[0] & 0x1f) == T_ENCLOSURE) {\n@@ -763,14 +767,16 @@\n \t}\n #endif\n \n-\tif (buflen < 47) {\n+\t\/*\n+\t * The comparison is short for a reason-\n+\t * some vendors were chopping it short.\n+\t *\/\n+\n+\tif (buflen < SAFTE_END - 2) {\n \t\treturn (SES_NONE);\n \t}\n-\t\/*\n-\t * The comparison is short for a reason- some vendors were chopping\n-\t * it short.\n-\t *\/\n-\tif (STRNCMP((char *)&iqd[44], \"SAF-TE\", 4) == 0) {\n+\n+\tif (STRNCMP((char *)&iqd[SAFTE_START], \"SAF-TE\", SAFTE_LEN - 2) == 0) {\n \t\treturn (SES_SAFT);\n \t}\n \treturn (SES_NONE);\n@@ -1101,12 +1107,12 @@\n \tamt = SCSZ - amt;\n \n \tif (ses_cfghdr((uint8_t *) sdata, amt, &cf)) {\n-\t\tSES_LOG(ssc, \"Unable to parse SES Config Header\");\n+\t\tSES_LOG(ssc, \"Unable to parse SES Config Header\\n\");\n \t\tSES_FREE(sdata, SCSZ);\n \t\treturn (EIO);\n \t}\n \tif (amt < SES_ENCHDR_MINLEN) {\n-\t\tSES_LOG(ssc, \"runt enclosure length (%d)\", amt);\n+\t\tSES_LOG(ssc, \"runt enclosure length (%d)\\n\", amt);\n \t\tSES_FREE(sdata, SCSZ);\n \t\treturn (EIO);\n \t}\n@@ -1126,7 +1132,7 @@\n \tfor (ntype = i = 0; i < maxima; i++) {\n \t\tMEMZERO((caddr_t)cdp, sizeof (*cdp));\n \t\tif (ses_enchdr((uint8_t *) sdata, amt, i, &hd)) {\n-\t\t\tSES_LOG(ssc, \"Cannot Extract Enclosure Header %d\", i);\n+\t\t\tSES_LOG(ssc, \"Cannot Extract Enclosure Header %d\\n\", i);\n \t\t\tSES_FREE(sdata, SCSZ);\n \t\t\treturn (EIO);\n \t\t}\n"} {"commit":"4fb1acdda4fddd49f15f5449838d65343cc97d82","subject":"MFC (revision 1.60):","message":"MFC (revision 1.60):\n\nFix possible DMA leak and locking violation especially\nduring suspend <-> resume and module load <-> unload.\n\nPR:\t\tkern\/92764\nApproved by:\tre (scottl)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/sound\/pci\/ich.c\n+++ sys\/dev\/sound\/pci\/ich.c\n@@ -677,7 +677,6 @@\n ich_init(struct sc_info *sc)\n {\n \tu_int32_t stat;\n-\tint sz;\n \n \tich_wr(sc, ICH_REG_GLOB_CNT, ICH_GLOB_CTL_COLD, 4);\n \tDELAY(600000);\n@@ -700,15 +699,6 @@\n \t\treturn ENXIO;\n \tif (sc->hasmic && ich_resetchan(sc, 2))\n \t\treturn ENXIO;\n-\n-\tif (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl, BUS_DMA_NOWAIT, &sc->dtmap))\n-\t\treturn ENOSPC;\n-\n-\tsz = sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3;\n-\tif (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl, sz, ich_setmap, sc, 0)) {\n-\t\tbus_dmamem_free(sc->dmat, (void **)&sc->dtbl, sc->dtmap);\n-\t\treturn ENOSPC;\n-\t}\n \n \treturn 0;\n }\n@@ -828,6 +818,15 @@\n \t\tgoto bad;\n \t}\n \n+\tif (bus_dmamem_alloc(sc->dmat, (void **)&sc->dtbl,\n+\t\t BUS_DMA_NOWAIT, &sc->dtmap))\n+\t\tgoto bad;\n+\n+\tif (bus_dmamap_load(sc->dmat, sc->dtmap, sc->dtbl,\n+\t\t sizeof(struct ich_desc) * ICH_DTBL_LENGTH * 3,\n+\t\t ich_setmap, sc, 0))\n+\t\tgoto bad;\n+\n \tsc->codec = AC97_CREATE(dev, sc, ich_ac97);\n \tif (sc->codec == NULL)\n \t\tgoto bad;\n@@ -895,6 +894,10 @@\n \tif (sc->nabmbar)\n \t\tbus_release_resource(dev, sc->regtype,\n \t\t sc->nabmbarid, sc->nabmbar);\n+\tif (sc->dtmap)\n+\t\tbus_dmamap_unload(sc->dmat, sc->dtmap);\n+\tif (sc->dmat)\n+\t\tbus_dma_tag_destroy(sc->dmat);\n \tif (sc->ich_lock)\n \t\tsnd_mtxfree(sc->ich_lock);\n \tfree(sc, M_DEVBUF);\n@@ -916,6 +919,7 @@\n \tbus_release_resource(dev, SYS_RES_IRQ, sc->irqid, sc->irq);\n \tbus_release_resource(dev, sc->regtype, sc->nambarid, sc->nambar);\n \tbus_release_resource(dev, sc->regtype, sc->nabmbarid, sc->nabmbar);\n+\tbus_dmamap_unload(sc->dmat, sc->dtmap);\n \tbus_dma_tag_destroy(sc->dmat);\n \tsnd_mtxfree(sc->ich_lock);\n \tfree(sc, M_DEVBUF);\n@@ -987,24 +991,21 @@\n \t}\n \t\/* Reinit mixer *\/\n \tich_pci_codec_reset(sc);\n+\tICH_UNLOCK(sc);\n \tac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm);\n \tif (mixer_reinit(dev) == -1) {\n \t\tdevice_printf(dev, \"unable to reinitialize the mixer\\n\");\n-\t\tICH_UNLOCK(sc);\n \t\treturn ENXIO;\n \t}\n \t\/* Re-start DMA engines *\/\n \tfor (i = 0 ; i < 3; i++) {\n \t\tstruct sc_chinfo *ch = &sc->ch[i];\n \t\tif (sc->ch[i].run_save) {\n-\t\t\tICH_UNLOCK(sc);\n \t\t\tichchan_setblocksize(0, ch, ch->blksz);\n \t\t\tichchan_setspeed(0, ch, ch->spd);\n \t\t\tichchan_trigger(0, ch, PCMTRIG_START);\n-\t\t\tICH_LOCK(sc);\n \t\t}\n \t}\n-\tICH_UNLOCK(sc);\n \treturn 0;\n }\n \n"} {"commit":"957ebaefec61501eeae8f983a0386dc11c459aee","subject":"Adjusted to let COLOR_BLACK in (I'm not racist)","message":"Adjusted to let COLOR_BLACK in (I'm not racist)\n","repos":"bobrippling\/uvi,bobrippling\/uvi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gui\/gui.c\n+++ gui\/gui.c\n@@ -78,14 +78,14 @@\n \t\tif(has_colors()){\n \t\t\tstart_color();\n \t\t\tuse_default_colors();\n-\t\t\tinit_pair(COLOR_BLACK, -1, -1);\n-\t\t\tinit_pair(COLOR_GREEN, COLOR_GREEN, -1);\n-\t\t\tinit_pair(COLOR_WHITE, COLOR_WHITE, -1);\n-\t\t\tinit_pair(COLOR_RED, COLOR_RED, -1);\n-\t\t\tinit_pair(COLOR_CYAN, COLOR_CYAN, -1);\n-\t\t\tinit_pair(COLOR_MAGENTA, COLOR_MAGENTA, -1);\n-\t\t\tinit_pair(COLOR_BLUE, COLOR_BLUE, -1);\n-\t\t\tinit_pair(COLOR_YELLOW, COLOR_YELLOW, -1);\n+\t\t\tinit_pair(1 + COLOR_BLACK, COLOR_BLACK, -1);\n+\t\t\tinit_pair(1 + COLOR_GREEN, COLOR_GREEN, -1);\n+\t\t\tinit_pair(1 + COLOR_WHITE, COLOR_WHITE, -1);\n+\t\t\tinit_pair(1 + COLOR_RED, COLOR_RED, -1);\n+\t\t\tinit_pair(1 + COLOR_CYAN, COLOR_CYAN, -1);\n+\t\t\tinit_pair(1 + COLOR_MAGENTA, COLOR_MAGENTA, -1);\n+\t\t\tinit_pair(1 + COLOR_BLUE, COLOR_BLUE, -1);\n+\t\t\tinit_pair(1 + COLOR_YELLOW, COLOR_YELLOW, -1);\n \t\t}\n \t}\n \n@@ -111,22 +111,22 @@\n \t{ \\\n \t\tswitch(a){ \\\n \t\t\tcase GUI_ERR: \\\n-\t\t\t\tfn(COLOR_PAIR(COLOR_RED) | A_BOLD); \\\n+\t\t\t\tfn(COLOR_PAIR(1 + COLOR_RED) | A_BOLD); \\\n \t\t\t\tbreak; \\\n \t\t\tcase GUI_IS_NOT_PRINT: \\\n-\t\t\t\tfn(COLOR_PAIR(COLOR_BLUE)); \\\n+\t\t\t\tfn(COLOR_PAIR(1 + COLOR_BLUE)); \\\n \t\t\t\tbreak; \\\n \t\t\tcase GUI_NONE: \\\n \t\t\t\tbreak; \\\n \t\t\t\t\\\n-\t\t\tcase GUI_COL_BLUE: fn(COLOR_PAIR(COLOR_BLUE)); break; \\\n-\t\t\tcase GUI_COL_BLACK: fn(COLOR_PAIR(COLOR_BLACK)); break; \\\n-\t\t\tcase GUI_COL_GREEN: fn(COLOR_PAIR(COLOR_GREEN)); break; \\\n-\t\t\tcase GUI_COL_WHITE: fn(COLOR_PAIR(COLOR_WHITE)); break; \\\n-\t\t\tcase GUI_COL_RED: fn(COLOR_PAIR(COLOR_RED)); break; \\\n-\t\t\tcase GUI_COL_CYAN: fn(COLOR_PAIR(COLOR_CYAN)); break; \\\n-\t\t\tcase GUI_COL_MAGENTA: fn(COLOR_PAIR(COLOR_MAGENTA)); break; \\\n-\t\t\tcase GUI_COL_YELLOW: fn(COLOR_PAIR(COLOR_YELLOW)); break; \\\n+\t\t\tcase GUI_COL_BLUE: fn(COLOR_PAIR(1 + COLOR_BLUE)); break; \\\n+\t\t\tcase GUI_COL_BLACK: fn(COLOR_PAIR(1 + COLOR_BLACK)); break; \\\n+\t\t\tcase GUI_COL_GREEN: fn(COLOR_PAIR(1 + COLOR_GREEN)); break; \\\n+\t\t\tcase GUI_COL_WHITE: fn(COLOR_PAIR(1 + COLOR_WHITE)); break; \\\n+\t\t\tcase GUI_COL_RED: fn(COLOR_PAIR(1 + COLOR_RED)); break; \\\n+\t\t\tcase GUI_COL_CYAN: fn(COLOR_PAIR(1 + COLOR_CYAN)); break; \\\n+\t\t\tcase GUI_COL_MAGENTA: fn(COLOR_PAIR(1 + COLOR_MAGENTA)); break; \\\n+\t\t\tcase GUI_COL_YELLOW: fn(COLOR_PAIR(1 + COLOR_YELLOW)); break; \\\n \t\t} \\\n \t}\n \n@@ -514,10 +514,10 @@\n \n \tattroff(A_REVERSE);\n \n-\tattron( COLOR_PAIR(COLOR_BLUE) | A_BOLD);\n+\tattron( COLOR_PAIR(1 + COLOR_BLUE) | A_BOLD);\n \tfor(; y < LINES - 1; y++)\n \t\tmvaddstr(y, 0, \"~\\n\");\n-\tattroff(COLOR_PAIR(COLOR_BLUE) | A_BOLD);\n+\tattroff(COLOR_PAIR(1 + COLOR_BLUE) | A_BOLD);\n \tgui_position_cursor(NULL);\n \trefresh();\n }\n@@ -883,13 +883,13 @@\n \n \tmove(y, 0);\n \tif(global_settings.colour)\n-\t\tcoloron(COLOR_BLUE, A_BOLD);\n+\t\tcoloron(1 + COLOR_BLUE, A_BOLD);\n \n \twhile(++y <= LINES)\n \t\taddstr(\"~\\n\");\n \n \tif(global_settings.colour)\n-\t\twcoloroff(COLOR_BLUE, A_BOLD);\n+\t\twcoloroff(1 + COLOR_BLUE, A_BOLD);\n }\n #endif\n \n"} {"commit":"52263e30e21359cd5da37a331b3bee70c87698e6","subject":"Remove cpu_boot() and call efi_reset_system() directly from cpu_reset().","message":"Remove cpu_boot() and call efi_reset_system() directly from\ncpu_reset().\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ia64\/ia64\/machdep.c\n+++ sys\/ia64\/ia64\/machdep.c\n@@ -373,13 +373,6 @@\n SYSINIT(cpu_startup, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);\n \n void\n-cpu_boot(int howto)\n-{\n-\n-\tefi_reset_system();\n-}\n-\n-void\n cpu_flush_dcache(void *ptr, size_t len)\n {\n \tvm_offset_t lim, va;\n@@ -434,7 +427,7 @@\n cpu_reset()\n {\n \n-\tcpu_boot(0);\n+\tefi_reset_system();\n }\n \n void\n"} {"commit":"c2ed61b0e15186644495617da02284bb18116c03","subject":"Fixed i = -1 bug","message":"Fixed i = -1 bug\n","repos":"bobrippling\/uvi,bobrippling\/uvi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gui\/gui.c\n+++ gui\/gui.c\n@@ -260,8 +260,8 @@\n \t\t\tcase CTRL_AND('H'):\n \t\t\tcase 263:\n \t\t\tcase 127:\n-\t\t\t\tif(i --> 0){\n-\t\t\t\t\tchar c = start[i];\n+\t\t\t\tif(i > 0){\n+\t\t\t\t\tchar c = start[i--];\n \n \t\t\t\t\tif(isprint(c))\n \t\t\t\t\t\tmove(y, --x);\n"} {"commit":"fd40ec89dfd21e5a7248621da965231eb46fafba","subject":"Fix race conditions involved in setting IP multicast options. This should fix Dennis Fortin's problem for good, if I've got it figured out right.","message":"Fix race conditions involved in setting IP multicast options. This should\nfix Dennis Fortin's problem for good, if I've got it figured out right.\n\n(The problem was that a `struct ifaddr' could get deleted out from under\nthe current requester, thus leaving him with an invalid interface pointer\nand causing even more bogus accesses.)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_output.c\n+++ sys\/netinet\/ip_output.c\n@@ -31,7 +31,7 @@\n * SUCH DAMAGE.\n *\n *\t@(#)ip_output.c\t8.3 (Berkeley) 1\/21\/94\n- * $Id: ip_output.c,v 1.12 1995\/01\/12 13:06:31 ugen Exp $\n+ * $Id: ip_output.c,v 1.13 1995\/03\/16 18:14:59 bde Exp $\n *\/\n \n #include <sys\/param.h>\n@@ -790,6 +790,7 @@\n \tregister struct ip_moptions *imo = *imop;\n \tstruct route ro;\n \tregister struct sockaddr_in *dst;\n+\tint s;\n \n \tif (imo == NULL) {\n \t\t\/*\n@@ -851,12 +852,14 @@\n \t\t * IP address. Find the interface and confirm that\n \t\t * it supports multicasting.\n \t\t *\/\n+\t\ts = splnet();\n \t\tINADDR_TO_IFP(addr, ifp);\n \t\tif (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {\n \t\t\terror = EADDRNOTAVAIL;\n \t\t\tbreak;\n \t\t}\n \t\timo->imo_multicast_ifp = ifp;\n+\t\tsplx(s);\n \t\tbreak;\n \n \tcase IP_MULTICAST_TTL:\n@@ -897,6 +900,7 @@\n \t\t\terror = EINVAL;\n \t\t\tbreak;\n \t\t}\n+\t\ts = splnet();\n \t\t\/*\n \t\t * If no interface address was provided, use the interface of\n \t\t * the route to the given multicast address.\n@@ -910,6 +914,7 @@\n \t\t\trtalloc(&ro);\n \t\t\tif (ro.ro_rt == NULL) {\n \t\t\t\terror = EADDRNOTAVAIL;\n+\t\t\t\tsplx(s);\n \t\t\t\tbreak;\n \t\t\t}\n \t\t\tifp = ro.ro_rt->rt_ifp;\n@@ -918,12 +923,14 @@\n \t\telse {\n \t\t\tINADDR_TO_IFP(mreq->imr_interface, ifp);\n \t\t}\n+\n \t\t\/*\n \t\t * See if we found an interface, and confirm that it\n \t\t * supports multicast.\n \t\t *\/\n \t\tif (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0) {\n \t\t\terror = EADDRNOTAVAIL;\n+\t\t\tsplx(s);\n \t\t\tbreak;\n \t\t}\n \t\t\/*\n@@ -938,10 +945,12 @@\n \t\t}\n \t\tif (i < imo->imo_num_memberships) {\n \t\t\terror = EADDRINUSE;\n+\t\t\tsplx(s);\n \t\t\tbreak;\n \t\t}\n \t\tif (i == IP_MAX_MEMBERSHIPS) {\n \t\t\terror = ETOOMANYREFS;\n+\t\t\tsplx(s);\n \t\t\tbreak;\n \t\t}\n \t\t\/*\n@@ -951,9 +960,11 @@\n \t\tif ((imo->imo_membership[i] =\n \t\t in_addmulti(&mreq->imr_multiaddr, ifp)) == NULL) {\n \t\t\terror = ENOBUFS;\n+\t\t\tsplx(s);\n \t\t\tbreak;\n \t\t}\n \t\t++imo->imo_num_memberships;\n+\t\tsplx(s);\n \t\tbreak;\n \n \tcase IP_DROP_MEMBERSHIP:\n@@ -970,6 +981,8 @@\n \t\t\terror = EINVAL;\n \t\t\tbreak;\n \t\t}\n+\n+\t\ts = splnet();\n \t\t\/*\n \t\t * If an interface address was specified, get a pointer\n \t\t * to its ifnet structure.\n@@ -980,6 +993,7 @@\n \t\t\tINADDR_TO_IFP(mreq->imr_interface, ifp);\n \t\t\tif (ifp == NULL) {\n \t\t\t\terror = EADDRNOTAVAIL;\n+\t\t\t\tsplx(s);\n \t\t\t\tbreak;\n \t\t\t}\n \t\t}\n@@ -995,6 +1009,7 @@\n \t\t}\n \t\tif (i == imo->imo_num_memberships) {\n \t\t\terror = EADDRNOTAVAIL;\n+\t\t\tsplx(s);\n \t\t\tbreak;\n \t\t}\n \t\t\/*\n@@ -1008,6 +1023,7 @@\n \t\tfor (++i; i < imo->imo_num_memberships; ++i)\n \t\t\timo->imo_membership[i-1] = imo->imo_membership[i];\n \t\t--imo->imo_num_memberships;\n+\t\tsplx(s);\n \t\tbreak;\n \n \tdefault:\n"} {"commit":"51306e741be6a0047d954a0de831054cf3291684","subject":"Added UART initialization at startup and removed not necessary code.","message":"Added UART initialization at startup and removed not necessary code.\n","repos":"prplfoundation\/prpl-hypervisor,prplfoundation\/prpl-hypervisor,prplfoundation\/prpl-hypervisor,prplfoundation\/prpl-hypervisor,prplfoundation\/prpl-hypervisor,prplfoundation\/prpl-hypervisor","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- hal\/hal.c\n+++ hal\/hal.c\n@@ -24,19 +24,21 @@\n \n void* exceptionHandler_addr = exceptionHandler;\n \n+\n \/** C code entry. Called from hal\/$(BOARD)\/boot.S *\/\n-int32_t main(uint32_t start_counter_cp0){\n- \n+int32_t main(char * _edata, char* _data, char* _erodata){\n+ \n+\n \/* Chipset freq config. *\/\n freq_config();\n-\n+ \n \/* UART start *\/\n- init_uart(57600, 8000000);\n- \n+ init_uart(115200, 200000000);\n+ \n+ udelay(3000000);\n+\n \/* First some paranoic checks!! *\/\n \n- printf(\"teste 1\");\n-\n \/* Verify if the processor implements the VZ module *\/\n if(!hasVZ()){\n \/* panic *\/\n@@ -54,8 +56,6 @@\n return -1;\n }\n \n- printf(\"teste 2\");\n- \n \/* This implementation relies on the GuestID field *\/\n if(!hasGuestID()){\n \/* panic *\/\n@@ -69,11 +69,11 @@\n \n \/* Now inialize the hardware *\/\n \/* Processor inicialization *\/\n- printf(\"teste 3\"); \n if(LowLevelProcInit()){\n \/\/panic\n return 1;\n }\n+ \n \n \/* Initialize memory *\/\n \/* Register heap space on the allocator *\/ \n@@ -81,8 +81,6 @@\n return 1;\n }\n \n- \n- \n \/*Initialize processor structure*\/\n if(initProc()){\n return 1;\n@@ -95,11 +93,11 @@\n \/*Initialize vcpus and virtual machines*\/\n initializeMachines();\n \n+ \n if(initializeRTMachines()){\n return 1;\n }\n- \n- printf(\"teste 4\");\n+\n \/* Run scheduler .*\/\n runScheduler(); \n \n@@ -200,7 +198,6 @@\n \thal_sr_rcause(hal_lr_rcause() | CAUSE_IV);\n \thal_sr_intctl(hal_lr_intctl() | (INTCTL_VS << INTCTL_VS_SHIFT));\n \thal_sr_rstatus( (hal_lr_rstatus() & (~STATUS_BEV)));\n- printf(\"LowLevelProcInit\");\n \t\/\/if(hal_lr_rconfig3() & CONFIG3_VEIC){\n \t\t\/* VEIC externally set. VI will not be supported *\/\n \t\t\/* panic *\/\n@@ -228,28 +225,8 @@\n \t\treturn 1;\n \t}\n \t\t\n-#ifdef YAMON_DEBUG\n-\tuint32_t yamon_return = YAMON_FUNC_REGISTER_CPU_ISR(YAMON_DEFAULT_HANDLER, exception_handler_p, NULL, NULL); \n-\t\t\t\n-\tif(yamon_return){\n-\t\tInfo(\"YAMON Interrupt handler registered!\");\n-\t}else{\n-#ifdef DEBUG\n-\t\tWarning(\"Failed to register YAMON Interrupt handler. Code %x !\\n\",yamon_return);\n-#endif\n-\t}\n-\t\n-\tyamon_return = YAMON_FUNC_REGISTER_ESR(YAMON_DEFAULT_HANDLER,exception_handler_p,NULL,NULL);\n-\t\n-\tif(!yamon_return){\n-\t\tInfo(\"YAMON exception handlers registered!\");\n-\t}else{\n-#ifdef DEBUG\n-\t\tWarning(\"Failed to register YAMON exception handler. Code %x !\\n\",yamon_return);\n-#endif\n-\t}\n-\n-#else\n+\n+#ifndef MICROCHIP\n \t\/* Patch the processor interrupt address. *\/\n \thal_patch_exception_vector(0x80000000);\n \thal_patch_exception_vector(0x80000180);\n"} {"commit":"ada79efc07f57a0c0a876be531268fb042460b5c","subject":"Replace memcpy() and ovbcopy() with bcopy(); ditch some caddr_t usage.","message":"Replace memcpy() and ovbcopy() with bcopy(); ditch some caddr_t usage.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_output.c\n+++ sys\/netinet\/ip_output.c\n@@ -1317,12 +1317,12 @@\n \t\tm = n;\n \t\tm->m_len = optlen + sizeof(struct ip);\n \t\tm->m_data += max_linkhdr;\n-\t\t(void)memcpy(mtod(m, void *), ip, sizeof(struct ip));\n+\t\tbcopy(ip, mtod(m, void *), sizeof(struct ip));\n \t} else {\n \t\tm->m_data -= optlen;\n \t\tm->m_len += optlen;\n \t\tm->m_pkthdr.len += optlen;\n-\t\tovbcopy((caddr_t)ip, mtod(m, caddr_t), sizeof(struct ip));\n+\t\tbcopy(ip, mtod(m, void *), sizeof(struct ip));\n \t}\n \tip = mtod(m, struct ip *);\n \tbcopy(p->ipopt_list, ip + 1, optlen);\n@@ -1678,8 +1678,8 @@\n \tcnt = m->m_len;\n \tm->m_len += sizeof(struct in_addr);\n \tcp = mtod(m, u_char *) + sizeof(struct in_addr);\n-\tovbcopy(mtod(m, caddr_t), (caddr_t)cp, (unsigned)cnt);\n-\tbzero(mtod(m, caddr_t), sizeof(struct in_addr));\n+\tbcopy(mtod(m, void *), cp, (unsigned)cnt);\n+\tbzero(mtod(m, void *), sizeof(struct in_addr));\n \n \tfor (; cnt > 0; cnt -= optlen, cp += optlen) {\n \t\topt = cp[IPOPT_OPTVAL];\n@@ -1724,9 +1724,8 @@\n \t\t\t * Then copy rest of options back\n \t\t\t * to close up the deleted entry.\n \t\t\t *\/\n-\t\t\tovbcopy((caddr_t)(&cp[IPOPT_OFFSET+1] +\n-\t\t\t sizeof(struct in_addr)),\n-\t\t\t (caddr_t)&cp[IPOPT_OFFSET+1],\n+\t\t\tbcopy((&cp[IPOPT_OFFSET+1] + sizeof(struct in_addr)),\n+\t\t\t &cp[IPOPT_OFFSET+1],\n \t\t\t (unsigned)cnt + sizeof(struct in_addr));\n \t\t\tbreak;\n \t\t}\n"} {"commit":"7e5e459beb0fa7f41d97455bdc57e0d4a80f12b6","subject":"Removed more vestiges of vfs_ioopt: - rev.1.42 of ffs_readwrite.c added a special case in ffs_read() for reads that are initially at EOF, and rev.1.62 of ufs_readwrite.c fixed timestamp bugs in it. Removal of most of vfs_ioopt made it just and optimization, and removal of the vm object reference calls made it less than an optimization. It was cloned in rev.1.94 of ufs_readwrite.c as part of cloning ffs_extwrite() although it was always less than an optimization in ffs_extwrite(). - some comments, compound statements and vertical whitespace were vestiges of dead code.","message":"Removed more vestiges of vfs_ioopt:\n- rev.1.42 of ffs_readwrite.c added a special case in ffs_read() for reads\n that are initially at EOF, and rev.1.62 of ufs_readwrite.c fixed\n timestamp bugs in it. Removal of most of vfs_ioopt made it just and\n optimization, and removal of the vm object reference calls made it less\n than an optimization. It was cloned in rev.1.94 of ufs_readwrite.c as\n part of cloning ffs_extwrite() although it was always less than an\n optimization in ffs_extwrite().\n- some comments, compound statements and vertical whitespace were vestiges\n of dead code.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ufs\/ffs\/ffs_vnops.c\n+++ sys\/ufs\/ffs\/ffs_vnops.c\n@@ -395,22 +395,9 @@\n \t uio->uio_offset >= fs->fs_maxfilesize)\n \t\treturn (EOVERFLOW);\n \n-\tbytesinfile = ip->i_size - uio->uio_offset;\n-\tif (bytesinfile <= 0) {\n-\t\tif ((vp->v_mount->mnt_flag & MNT_NOATIME) == 0)\n-\t\t\tip->i_flag |= IN_ACCESS;\n-\t\treturn (0);\n-\t}\n-\n-\n-\t\/*\n-\t * Ok so we couldn't do it all in one vm trick...\n-\t * so cycle around trying smaller bites..\n-\t *\/\n \tfor (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {\n \t\tif ((bytesinfile = ip->i_size - uio->uio_offset) <= 0)\n \t\t\tbreak;\n-\n \t\tlbn = lblkno(fs, uio->uio_offset);\n \t\tnextlbn = lbn + 1;\n \n@@ -504,15 +491,8 @@\n \t\t\txfersize = size;\n \t\t}\n \n-\t\t{\n-\t\t\t\/*\n-\t\t\t * otherwise use the general form\n-\t\t\t *\/\n-\t\t\terror =\n-\t\t\t\tuiomove((char *)bp->b_data + blkoffset,\n-\t\t\t\t\t(int)xfersize, uio);\n-\t\t}\n-\n+\t\terror = uiomove((char *)bp->b_data + blkoffset,\n+\t\t (int)xfersize, uio);\n \t\tif (error)\n \t\t\tbreak;\n \n@@ -597,7 +577,6 @@\n \tseqcount = ap->a_ioflag >> IO_SEQSHIFT;\n \tip = VTOI(vp);\n \n-\n #ifdef DIAGNOSTIC\n \tif (uio->uio_rw != UIO_WRITE)\n \t\tpanic(\"ffs_write: mode\");\n@@ -607,9 +586,8 @@\n \tcase VREG:\n \t\tif (ioflag & IO_APPEND)\n \t\t\tuio->uio_offset = ip->i_size;\n-\t\tif ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size) {\n+\t\tif ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size)\n \t\t\treturn (EPERM);\n-\t\t}\n \t\t\/* FALLTHROUGH *\/\n \tcase VLNK:\n \t\tbreak;\n@@ -626,9 +604,8 @@\n \tKASSERT(uio->uio_resid >= 0, (\"ffs_write: uio->uio_resid < 0\"));\n \tKASSERT(uio->uio_offset >= 0, (\"ffs_write: uio->uio_offset < 0\"));\n \tfs = ip->i_fs;\n-\tif ((uoff_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize) {\n+\tif ((uoff_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize)\n \t\treturn (EFBIG);\n-\t}\n \t\/*\n \t * Maybe this should be above the vnode op call, but so long as\n \t * file servers have no limits, I don't think it matters.\n@@ -660,7 +637,6 @@\n \t\txfersize = fs->fs_bsize - blkoffset;\n \t\tif (uio->uio_resid < xfersize)\n \t\t\txfersize = uio->uio_resid;\n-\n \t\tif (uio->uio_offset + xfersize > ip->i_size)\n \t\t\tvnode_pager_setsize(vp, uio->uio_offset + xfersize);\n \n@@ -760,8 +736,6 @@\n \t\t}\n \t} else if (resid > uio->uio_resid && (ioflag & IO_SYNC))\n \t\terror = UFS_UPDATE(vp, 1);\n-\n-\n \treturn (error);\n }\n \n@@ -948,17 +922,9 @@\n \t\treturn (0);\n \tKASSERT(uio->uio_offset >= 0, (\"ffs_extread: uio->uio_offset < 0\"));\n \n-\tbytesinfile = dp->di_extsize - uio->uio_offset;\n-\tif (bytesinfile <= 0) {\n-\t\tif ((vp->v_mount->mnt_flag & MNT_NOATIME) == 0)\n-\t\t\tip->i_flag |= IN_ACCESS;\n-\t\treturn (0);\n-\t}\n-\n \tfor (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {\n \t\tif ((bytesinfile = dp->di_extsize - uio->uio_offset) <= 0)\n \t\t\tbreak;\n-\n \t\tlbn = lblkno(fs, uio->uio_offset);\n \t\tnextlbn = lbn + 1;\n \n"} {"commit":"6d607052330e66dc1e260e8f180de926262e8041","subject":" - It is not legal to access v_data without the vnode lock or interlock held. Grab the vnode interlock if LK_INTERLOCK has not been passed in so that we can inspect v_data in ffs_lock().","message":" - It is not legal to access v_data without the vnode lock or interlock\n held. Grab the vnode interlock if LK_INTERLOCK has not been passed in\n so that we can inspect v_data in ffs_lock().\n\nSponsored by:\tIsilon Systems, Inc.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ufs\/ffs\/ffs_vnops.c\n+++ sys\/ufs\/ffs\/ffs_vnops.c\n@@ -343,7 +343,17 @@\n {\n \tstruct vnode *vp = ap->a_vp;\n \n-\tif ((VTOI(vp)->i_flags & SF_SNAPSHOT) &&\n+\t\/*\n+\t * v_data could be NULL if a thread attempts to lock a\n+\t * vnode that is being recycled. Just hit the normal\n+\t * vnode lock in this case. Grab the interlock so we may\n+\t * safely inspect the vnode.\n+\t *\/\n+\tif ((ap->a_flags & LK_INTERLOCK) == 0) {\n+\t\tVI_LOCK(vp);\n+\t\tap->a_flags |= LK_INTERLOCK;\n+\t}\n+\tif (vp->v_data && (VTOI(vp)->i_flags & SF_SNAPSHOT) &&\n \t ((ap->a_flags & LK_TYPE_MASK) == LK_SHARED)) {\n \t\tap->a_flags &= ~LK_TYPE_MASK;\n \t\tap->a_flags |= LK_EXCLUSIVE;\n"} {"commit":"9c25e3c24e9d5d443522478861808d382b8d9a1f","subject":"Since we have vp and td cached in local variables, use those instead of derefencing the VOP arguments again when calling the UFS code.","message":"Since we have vp and td cached in local variables, use those instead\nof derefencing the VOP arguments again when calling the UFS code.\n\nObtained from:\tTrustedBSD Project\nSponsored by:\tDARPA, NAI Labs\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/ufs\/ufs\/ufs_inode.c\n+++ sys\/ufs\/ufs\/ufs_inode.c\n@@ -93,7 +93,7 @@\n \t\t\t(void)chkiq(ip, -1, NOCRED, FORCE);\n #endif\n #ifdef UFS_EXTATTR\n-\t\tufs_extattr_vnode_inactive(ap->a_vp, ap->a_td);\n+\t\tufs_extattr_vnode_inactive(vp, td);\n #endif\n \t\terror = UFS_TRUNCATE(vp, (off_t)0, IO_EXT | IO_NORMAL,\n \t\t NOCRED, td);\n"} {"commit":"3e8cbd53cf2190d33ef8b8e005e5dcc60b6748de","subject":"Let sds.c figure out where the range stops","message":"Let sds.c figure out where the range stops\n","repos":"redis\/hiredis,jinguoli\/hiredis,tattsun\/hiredis,owent-contrib\/hiredis,hidebug\/hiredis,lxfontes\/hiredis,nherment\/arsenic,nokiddin\/hiredis,jqk6\/hiredis,thomaslee\/hiredis,arinal\/hiredis,xjzhou\/hiredis,Microsoft\/hiredis,tattsun\/hiredis,olgeni\/hiredis,redis\/hiredis,chenlicong0821\/hiredis,texnician\/hiredis-win32,liulingfree\/hiredis,rangan337\/hiredis,charsyam\/hiredis,jinguoli\/hiredis,koenvandesande\/hiredis,thedrow\/hiredis,rangan337\/hiredis,hidebug\/hiredis,jinguoli\/hiredis,badboy\/hiredis-win,yiliaofan\/hiredis,galdor\/hiredis,Yhgenomics\/hiredis,Microsoft\/hiredis,h1048576\/hiredis,olgeni\/hiredis,owent-contrib\/hiredis,thomaslee\/hiredis,Yhgenomics\/hiredis,picrin\/redisSamples,xjzhou\/hiredis,redis\/hiredis,charsyam\/hiredis,galdor\/hiredis,chenlicong0821\/hiredis,liulingfree\/hiredis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hiredis.c\n+++ hiredis.c\n@@ -541,7 +541,7 @@\n \/* Discard part of the buffer when we've consumed at least 1k, to avoid\n * doing unnecessary calls to memmove() in sds.c. *\/\n if (r->pos >= 1024) {\n- r->buf = sdsrange(r->buf,r->pos,r->len);\n+ r->buf = sdsrange(r->buf,r->pos,-1);\n r->pos = 0;\n r->len = sdslen(r->buf);\n }\n"} {"commit":"c8adea4024bbc405d96736c26bd2357c902a1f6b","subject":"redisReply: Fix parent type assertions during double, nil, bool creation","message":"redisReply: Fix parent type assertions during double, nil, bool creation\n\nPer RESP3, push messages are able to contain exactly what array\nmessages can contain (that is, any other type).\n","repos":"redis\/hiredis,redis\/hiredis,redis\/hiredis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hiredis.c\n+++ hiredis.c\n@@ -243,7 +243,8 @@\n parent = task->parent->obj;\n assert(parent->type == REDIS_REPLY_ARRAY ||\n parent->type == REDIS_REPLY_MAP ||\n- parent->type == REDIS_REPLY_SET);\n+ parent->type == REDIS_REPLY_SET ||\n+ parent->type == REDIS_REPLY_PUSH);\n parent->element[task->idx] = r;\n }\n return r;\n@@ -280,7 +281,8 @@\n parent = task->parent->obj;\n assert(parent->type == REDIS_REPLY_ARRAY ||\n parent->type == REDIS_REPLY_MAP ||\n- parent->type == REDIS_REPLY_SET);\n+ parent->type == REDIS_REPLY_SET ||\n+ parent->type == REDIS_REPLY_PUSH);\n parent->element[task->idx] = r;\n }\n return r;\n"} {"commit":"bf7288e5ea4d494ad414e5f4a183ac21c8173546","subject":"wrap threaded test-case in ifdef","message":"wrap threaded test-case in ifdef\n","repos":"open62541\/open62541,open62541\/open62541,StalderT\/open62541,AGIsmail\/open62541,StalderT\/open62541,jpfr\/open62541,JGrothoff\/open62541,StalderT\/open62541,open62541\/open62541,jpfr\/open62541,JGrothoff\/open62541,bostjanv\/open62541,open62541\/open62541,jpfr\/open62541,JGrothoff\/open62541,JGrothoff\/open62541,jpfr\/open62541,bostjanv\/open62541,AGIsmail\/open62541,StalderT\/open62541","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- tests\/check_namespace.c\n+++ tests\/check_namespace.c\n@@ -241,6 +241,11 @@\n }\n END_TEST\n \n+\/************************************\/\n+\/* Performance Profiling Test Cases *\/\n+\/************************************\/\n+\n+#ifdef MULTITHREADING\n struct NamespaceProfileTest {\n \tNamespace *ns;\n \tUA_Int32 min_val;\n@@ -266,6 +271,7 @@\n \t\n \treturn UA_NULL;\n }\n+#endif\n \n START_TEST(profileGetDelete) {\n #ifdef MULTITHREADING\n"} {"commit":"0ece62434bfb7a6f54080d166b4ffd117f2287f3","subject":"Create ht1632c.h","message":"Create ht1632c.h","repos":"amondit\/c-woodstation,amondit\/c-woodstation","returncode":1,"stderr":"error: pathspec 'ht1632c.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- ht1632c.h\n+++ ht1632c.h\n@@ -0,0 +1,42 @@\n+#ifndef HT1632C_H\n+#define HT1632C_H\n+\n+#include <inttypes.h>\n+\n+\n+#define SPI_FREQ 2560000\n+\n+#define HT1632_CMD_8NMOS 0x20\t\/* CMD= 0010-ABxx-x commons options *\/\n+#define HT1632_CMD_16NMOS 0x24\t\/* CMD= 0010-ABxx-x commons options *\/\n+#define HT1632_CMD_8PMOS 0x28\t\/* CMD= 0010-ABxx-x commons options *\/\n+#define HT1632_CMD_16PMOS 0x2C\t\/* CMD= 0010-ABxx-x commons options *\/\n+\n+\n+\n+\/\/\n+\/\/ public functions\n+\/\/\n+\n+\/\/\/ Initializes library and display.\n+\/\/\/ Commons mode is either 8\/16 NMOS\/PMOS (see #define)\n+int ht1632c_init(const uint8_t commonsMode);\n+\n+\/\/\/ Shuts down library.\n+int ht1632c_close();\n+\n+\/\/\/ Sets display brightness.\n+void ht1632c_pwm(const uint8_t value);\n+\n+\/\/\/ Sends frame buffer to display; required to bring any drawing operations to the display.\n+void ht1632c_sendframe();\n+\n+\/\/\/ Clears the whole frame. Also reset clipping area.\n+void ht1632c_clear();\n+\n+\/\/\/ Puts a single value at HT1632 addr, at COM bit index\n+\/\/\/ Note: only sets bit in frame buffer. a call to ht1632_sendframe() is required to update the display.\n+void ht1632c_update_framebuffer(const int addr, const uint8_t bitIndex, const uint8_t bitValue);\n+\n+uint8_t ht1632c_get_framebuffer(const int addr, const uint8_t bitIndex);\n+\n+#endif\n"} {"commit":"e5ed1126b47a5372d76d407f221b24e7f3fec72e","subject":"Change connection data counters to uint64_t.","message":"Change connection data counters to uint64_t.","repos":"wxsBSD\/libhtp,glongo\/libhtp,montekki\/libhtp,glongo\/libhtp,montekki\/libhtp,glongo\/libhtp,montekki\/libhtp,montekki\/libhtp,OISF\/libhtp,glongo\/libhtp,glongo\/libhtp,OISF\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,montekki\/libhtp,wxsBSD\/libhtp,wxsBSD\/libhtp,glongo\/libhtp,wxsBSD\/libhtp,OISF\/libhtp,glongo\/libhtp,OISF\/libhtp,montekki\/libhtp,montekki\/libhtp,wxsBSD\/libhtp,OISF\/libhtp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- htp\/htp.h\n+++ htp\/htp.h\n@@ -94,10 +94,10 @@\n htp_time_t close_timestamp;\n \n \/** Inbound data counter. *\/\n- size_t in_data_counter;\n+ uint64_t in_data_counter;\n \n \/** Outbound data counter. *\/\n- size_t out_data_counter; \n+ uint64_t out_data_counter;\n };\n \n \/**\n"} {"commit":"3eff00bbc82302f626ebc7fafa567f1c2e34c5d8","subject":"Fix #60","message":"Fix #60\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -592,20 +592,18 @@\n \n inline std::string get_remote_addr(socket_t sock) {\n struct sockaddr_storage addr;\n- char ipstr[INET6_ADDRSTRLEN];\n socklen_t len = sizeof(addr);\n- getpeername(sock, (struct sockaddr*)&addr, &len);\n-\n- \/\/ deal with both IPv4 and IPv6:\n- if (addr.ss_family == AF_INET) {\n- auto s = (struct sockaddr_in *)&addr;\n- inet_ntop(AF_INET, &s->sin_addr, ipstr, sizeof(ipstr));\n- } else { \/\/ AF_INET6\n- auto s = (struct sockaddr_in6 *)&addr;\n- inet_ntop(AF_INET6, &s->sin6_addr, ipstr, sizeof(ipstr));\n- }\n-\n- return ipstr;\n+\n+ if (!getpeername(sock, (struct sockaddr*)&addr, &len)) {\n+ char ipstr[NI_MAXHOST];\n+\n+ if (!getnameinfo((struct sockaddr*)&addr, len,\n+ ipstr, sizeof(ipstr), nullptr, 0, NI_NUMERICHOST)) {\n+ return ipstr;\n+ }\n+ }\n+\n+ return std::string();\n }\n \n inline bool is_file(const std::string& path)\n"} {"commit":"ff97b2af8d39fed079e949732fc0b45fa0a6a3a9","subject":"phb3: Increase some timeouts (SW283991)","message":"phb3: Increase some timeouts (SW283991)\n\nThis increase various timeouts as per CQ SW283991 which should help\nwith some external drawers and GPUs.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\n","repos":"ddstreet\/skiboot,open-power\/skiboot,apopple\/skiboot,shenki\/skiboot,qemu\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,mikey\/skiboot,legoater\/skiboot,jk-ozlabs\/skiboot,cyrilbur-ibm\/skiboot,csmart\/skiboot,open-power\/skiboot,jk-ozlabs\/skiboot,ddstreet\/skiboot,ddstreet\/skiboot,apopple\/skiboot,open-power\/skiboot,qemu\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,shenki\/skiboot,shenki\/skiboot,jk-ozlabs\/skiboot,open-power\/skiboot,legoater\/skiboot,cyrilbur-ibm\/skiboot,mikey\/skiboot,neelegup\/skiboot,qemu\/skiboot,legoater\/skiboot,neelegup\/skiboot,cyrilbur-ibm\/skiboot,csmart\/skiboot,open-power\/skiboot,shenki\/skiboot,qemu\/skiboot,mikey\/skiboot,neelegup\/skiboot,stewart-ibm\/skiboot,apopple\/skiboot,csmart\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb3.c\n+++ hw\/phb3.c\n@@ -3615,8 +3615,10 @@\n \t *\/\n \tout_be64(p->regs + UTL_PCIE_TAGS_ALLOC, 0x0800000000000000);\n \n-\t\/* Init_82: PCI Express port control *\/\n-\tout_be64(p->regs + UTL_PCIE_PORT_CONTROL, 0x8588006000000000);\n+\t\/* Init_82: PCI Express port control\n+\t * SW283991: Set Outbound Non-Posted request timeout to 16ms (RTOS).\n+\t *\/\n+\tout_be64(p->regs + UTL_PCIE_PORT_CONTROL, 0x8588007000000000);\n \n \t\/* Init_83..85: Clean & setup port errors *\/\n \tout_be64(p->regs + UTL_PCIE_PORT_STATUS, 0xffdfffffffffffff);\n@@ -3871,8 +3873,10 @@\n \tif (p->rev == PHB3_REV_MURANO_DD20)\n \t\tphb3_write_reg_asb(p, PHB_TCE_WATERMARK,\t0x0003000000030302);\n \n-\t\/* Init_142 - PHB3 - Timeout Control Register 1 *\/\n-\tout_be64(p->regs + PHB_TIMEOUT_CTRL1,\t\t\t0x1713132016200000);\n+\t\/* Init_142 - PHB3 - Timeout Control Register 1\n+\t * SW283991: Increase timeouts\n+\t *\/\n+\tout_be64(p->regs + PHB_TIMEOUT_CTRL1,\t\t\t0x1715152016200000);\n \n \t\/* Init_143 - PHB3 - Timeout Control Register 2 *\/\n \tout_be64(p->regs + PHB_TIMEOUT_CTRL2,\t\t\t0x2320d71600000000);\n"} {"commit":"2d4f3cf4bcfa7cfd6e4dddb0ca5a4cbaedc27a15","subject":"phb4: Fix config space enable bits on DD1","message":"phb4: Fix config space enable bits on DD1\n\nFix enabling config space on DD1.\n\nWithout this PCI devices disappear on kexec.\n\nSigned-off-by: Michael Neuling <7b0ab45a730e48a69239010b5b8fe5fa4e8eaac6@neuling.org>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.vnet.ibm.com>\n","repos":"qemu\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,qemu\/skiboot,qemu\/skiboot,shenki\/skiboot,open-power\/skiboot,mikey\/skiboot,legoater\/skiboot,open-power\/skiboot,shenki\/skiboot,mikey\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,shenki\/skiboot,mikey\/skiboot,shenki\/skiboot,open-power\/skiboot,open-power\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,legoater\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb4.c\n+++ hw\/phb4.c\n@@ -272,6 +272,9 @@\n \t\tbreak;\n \tdefault:\n \t\t\/* XXX Add ASB support ? *\/\n+\t\t\/* Workaround PHB config space enable *\/\n+\t\tif ((p->rev == PHB4_REV_NIMBUS_DD10) && (reg == PCI_CFG_CMD))\n+\t\t\tval |= PCI_CFG_CMD_MEM_EN | PCI_CFG_CMD_BUS_MASTER_EN;\n \t\tout_le32(p->regs + PHB_RC_CONFIG_BASE + reg, val);\n \t}\n \treturn OPAL_SUCCESS;\n"} {"commit":"1e00d546ca29d5eb9c51558250aa37facf8f2afb","subject":"xive: Fix occasional VC checkstops in xive_reset","message":"xive: Fix occasional VC checkstops in xive_reset\n\nThe current workaround for the scrub bug described in\n__xive_cache_scrub() has an issue in that it can leave\ndirty invalid entries in the cache.\n\nWhen cleaning up EQs or VPs during reset, if we then\nremove the underlying indirect page for these entries,\nthe XIVE will checkstop when trying to flush them out\nof the cache.\n\nThis replaces the existing workaround with a new pair of\nworkarounds for VPs and EQs:\n\n - The VP one does the dummy watch on another entry than\nthe one we scrubbed (which does the job of pushing old\nstores out) using an entry that is known to be backed by\na permanent indirect page.\n\n - The EQ one switches to a more efficient workaround\nwhich consists of doing a non-side-effect ESB load from\nthe EQ's ESe control bits.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.vnet.ibm.com>\n","repos":"shenki\/skiboot,open-power\/skiboot,qemu\/skiboot,shenki\/skiboot,legoater\/skiboot,qemu\/skiboot,legoater\/skiboot,open-power\/skiboot,legoater\/skiboot,qemu\/skiboot,legoater\/skiboot,open-power\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,open-power\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot,shenki\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/xive.c\n+++ hw\/xive.c\n@@ -1251,6 +1251,52 @@\n \t\t\t\t void *new_data, bool light_watch,\n \t\t\t\t bool synchronous);\n \n+static void xive_scrub_workaround_vp(struct xive *x, uint32_t block, uint32_t idx __unused)\n+{\n+\t\/* VP variant of the workaround described in __xive_cache_scrub(),\n+\t * we need to be careful to use for that workaround an NVT that\n+\t * sits on the same xive but isn NOT part of a donated indirect\n+\t * entry.\n+\t *\n+\t * The reason is that the dummy cache watch will re-create a\n+\t * dirty entry in the cache, even if the entry is marked\n+\t * invalid.\n+\t *\n+\t * Thus if we are about to dispose of the indirect entry backing\n+\t * it, we'll cause a checkstop later on when trying to write it\n+\t * out.\n+\t *\n+\t * Note: This means the workaround only works for block group\n+\t * mode.\n+\t *\/\n+#ifdef USE_BLOCK_GROUP_MODE\n+\t__xive_cache_watch(x, xive_cache_vpc, block, INITIAL_VP_BASE, 0,\n+\t\t\t 0, NULL, true, false);\n+#else\n+\t\/* WARNING: Some workarounds related to cache scrubs require us to\n+\t * have at least one firmware owned (permanent) indirect entry for\n+\t * each XIVE instance. This currently only happens in block group\n+\t * mode\n+\t *\/\n+#warning Block group mode should not be disabled\n+#endif\n+}\n+\n+static void xive_scrub_workaround_eq(struct xive *x, uint32_t block __unused, uint32_t idx)\n+{\n+\tvoid *mmio;\n+\n+\t\/* EQ variant of the workaround described in __xive_cache_scrub(),\n+\t * a simple non-side effect load from ESn will do\n+\t *\/\n+\tmmio = x->eq_mmio + idx * 0x20000;\n+\n+\t\/* Ensure the above has returned before we do anything else\n+\t * the XIVE store queue is completely empty\n+\t *\/\n+\tload_wait(in_be64(mmio + 0x800));\n+}\n+\n static int64_t __xive_cache_scrub(struct xive *x, enum xive_cache_type ctype,\n \t\t\t\t uint64_t block, uint64_t idx,\n \t\t\t\t bool want_inval, bool want_disable)\n@@ -1270,6 +1316,9 @@\n \t * invalidate, then after the scrub, we do a dummy cache\n \t * watch which will make the HW read the data back, which\n \t * should be ordered behind all the preceding stores.\n+\t *\n+\t * Update: For EQs we can do a non-side effect ESB load instead\n+\t * which is faster.\n \t *\/\n \twant_inval = true;\n \n@@ -1331,9 +1380,11 @@\n \t\/* Workaround for HW bug described above (only applies to\n \t * EQC and VPC\n \t *\/\n-\tif (ctype == xive_cache_eqc || ctype == xive_cache_vpc)\n-\t\t__xive_cache_watch(x, ctype, block, idx, 0, 0, NULL,\n-\t\t\t\t true, false);\n+\tif (ctype == xive_cache_eqc)\n+\t\txive_scrub_workaround_eq(x, block, idx);\n+\telse if (ctype == xive_cache_vpc)\n+\t\txive_scrub_workaround_vp(x, block, idx);\n+\n \treturn 0;\n }\n \n"} {"commit":"2ebc6704a25f8fad0c363b3df8a0568ab4f93bfd","subject":"Yes, it does.","message":"Yes, it does.\n\n\n","repos":"jld\/umx,jld\/umx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- i386\/co.c\n+++ i386\/co.c\n@@ -111,7 +111,7 @@\n \tma = ra_mgetv(ra);\n \tco__cclear();\n \te_cmpri(ma, 0);\n-\te_jcc(g.outl.next, CCz); \/* does this really need to be OOL? *\/\n+\te_jcc(g.outl.next, CCz);\n \tg.c = &g.outl;\n \tco__postwrite(rb, g.znz | ZMASK(ra));\n \tg.c = &g.inl;\n"} {"commit":"10271ce80223b2c404bd30bbbbc464f70edce1d4","subject":"This def conflicts with a Zend VM opcode","message":"This def conflicts with a Zend VM opcode\n\nHarmless because we don't work with the JIT, it's good form not to\ndo this\n","repos":"php\/pecl-database-ibm_db2,php\/pecl-database-ibm_db2","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ibm_db2.c\n+++ ibm_db2.c\n@@ -131,7 +131,7 @@\n #endif\n \n #if PHP_MAJOR_VERSION >= 7 \n-#define ZEND_GET_TYPE(data) (data)->u1.v.type\n+#define IBM_DB2_ZEND_GET_TYPE(data) (data)->u1.v.type\n #define RES_GET_TYPE(zval) (zval)->type\n #endif\n \n@@ -142,7 +142,7 @@\n #endif\n \n #if PHP_MAJOR_VERSION >= 7 \n-#define ZEND_Z_TYPE(entry) ZEND_GET_TYPE(&entry) \n+#define ZEND_Z_TYPE(entry) IBM_DB2_ZEND_GET_TYPE(&entry)\n #else\n #define ZEND_Z_TYPE(entry) Z_TYPE(entry) \n #endif\n@@ -154,7 +154,7 @@\n #endif\n \n #if PHP_MAJOR_VERSION >= 7 \n-#define ZEND_Z_TYPE_P(entry) ZEND_GET_TYPE(entry) \n+#define ZEND_Z_TYPE_P(entry) IBM_DB2_ZEND_GET_TYPE(entry)\n #else\n #define ZEND_Z_TYPE_P(entry) Z_TYPE_P(entry) \n #endif\n"} {"commit":"6e7cede797590210e1688a1af3bef8e23a371e1c","subject":"tests: internal: parser: fix warnings","message":"tests: internal: parser: fix warnings\n\nSigned-off-by: Takahiro Yamashita <8b9f03f78cb27351a99f79113f99e589b65190d5@gmail.com>\n","repos":"fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/internal\/parser.c\n+++ tests\/internal\/parser.c\n@@ -181,7 +181,7 @@\n struct flb_parser *p;\n struct flb_config *config;\n struct time_check *t;\n- struct tm tm;\n+ struct flb_tm tm;\n \n config = flb_config_init();\n \n"} {"commit":"39eac20246fc3b07d768e2a27c4a6612428139e4","subject":"add new ibmfast.c","message":"add new ibmfast.c","repos":"dhanzhang\/pixellib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ibmfast.c\n+++ ibmfast.c\n@@ -547,7 +547,7 @@\n static IFASTCALL void _istore_A8(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n \t\t*pixel++ = (IUINT8)((*values++) >> 24);\r\n@@ -557,7 +557,7 @@\n static IFASTCALL void _istore_G8(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -570,7 +570,7 @@\n static IFASTCALL void _istore_C8(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -582,7 +582,7 @@\n static IFASTCALL void _istore_A2R2G2B2(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -598,7 +598,7 @@\n static IFASTCALL void _istore_A2B2G2R2(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -614,7 +614,7 @@\n static IFASTCALL void _istore_R3G3B2(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -629,7 +629,7 @@\n static IFASTCALL void _istore_B2G3R3(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT8 *pixel = (IUINT8*)pixel + x;\r\n+\tIUINT8 *pixel = (IUINT8*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -644,7 +644,7 @@\n static IFASTCALL void _istore_RGB15(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -659,7 +659,7 @@\n static IFASTCALL void _istore_BGR15(unsigned char *bits, \r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -674,7 +674,7 @@\n static IFASTCALL void _istore_RGB16(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -689,7 +689,7 @@\n static IFASTCALL void _istore_BGR16(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -813,7 +813,7 @@\n static IFASTCALL void _istore_ARGB_4444(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -829,7 +829,7 @@\n static IFASTCALL void _istore_ABGR_4444(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -845,7 +845,7 @@\n static IFASTCALL void _istore_RGBA_4444(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -861,7 +861,7 @@\n static IFASTCALL void _istore_BGRA_4444(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -878,7 +878,7 @@\n static IFASTCALL void _istore_ARGB_1555(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -894,7 +894,7 @@\n static IFASTCALL void _istore_ABGR_1555(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -910,7 +910,7 @@\n static IFASTCALL void _istore_RGBA_5551(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n@@ -926,7 +926,7 @@\n static IFASTCALL void _istore_BGRA_5551(unsigned char *bits,\r\n \tconst IUINT32 *values, int x, int w, const iColorIndex *idx)\r\n {\r\n-\tIUINT16 *pixel = (IUINT16*)pixel + x;\r\n+\tIUINT16 *pixel = (IUINT16*)bits + x;\r\n \tIUINT32 c, a, r, g, b;\r\n \tint i;\r\n \tfor (i = w; i > 0; i--) {\r\n"} {"commit":"d204e2b79c6e7c8e7182eed19a6d79f146d290b5","subject":"Avoid more conversions to double","message":"Avoid more conversions to double\n","repos":"jrmuizel\/qcms","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- iccread.c\n+++ iccread.c\n@@ -502,12 +502,12 @@\n \n static uint16_t float_to_u8Fixed8Number(float a)\n {\n-\tif (a > (255. + 255.\/256))\n+\tif (a > (255.f + 255.f\/256))\n \t\treturn 0xffff;\n-\telse if (a < 0.)\n+\telse if (a < 0.f)\n \t\treturn 0;\n \telse\n-\t\treturn floor(a*256. + .5);\n+\t\treturn floor(a*256.f + .5f);\n }\n \n static struct curveType *curve_from_gamma(float gamma)\n"} {"commit":"0a8a5869b87761db453e68dcf734ac2491d179aa","subject":"add addr_pton() test for dotted-quad IPv4 netmask","message":"add addr_pton() test for dotted-quad IPv4 netmask\n\n\ngit-svn-id: 935794000d934034fad4bb4152be248a7507e5ff@508 0c474577-fa26-0410-a966-bdb198e94e9e\n","repos":"hellais\/libdnet,hellais\/libdnet,hellais\/libdnet,hellais\/libdnet","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- test\/check\/check_addr.c\n+++ test\/check\/check_addr.c\n@@ -195,6 +195,9 @@\n \tfail_unless(addr_pton(\"localhost\", &b) == 0, \"barfed on localhost\");\n \tfail_unless(addr_pton(\"localhost\/24\", &b) == 0,\n \t \"barfed on localhost\/24\");\n+\taddr_pton(\"1.2.3.4\/24\", &a);\n+\taddr_pton(\"1.2.3.4\/255.255.255.0\", &b);\n+\tfail_unless(addr_cmp(&a, &b) == 0, \"bad \/255.255.255.0 handling\");\n \n \tfor (pton = pton_eth; pton->n != NULL; pton++) {\n \t\tres = addr_pton(pton->p, &a);\n"} {"commit":"900ff60b44ca9f857fb20d71fa6632113df5a06b","subject":"tests\/peak_chunk_test.c : Improve read_write_peak_test to find more errors.","message":"tests\/peak_chunk_test.c : Improve read_write_peak_test to find more errors.","repos":"Distrotech\/libsndfile,erikd\/libsndfile,Icenowy\/libsndfile,audiokit\/libsndfile,evpobr\/libsndfile,greearb\/libsndfile-ct,RonNovy\/libsndfile,evpobr\/libsndfile,syb0rg\/libsndfile,Distrotech\/libsndfile,Icenowy\/libsndfile,erikd\/libsndfile,Icenowy\/libsndfile,Icenowy\/libsndfile,erikd\/libsndfile,Distrotech\/libsndfile,libsndfile\/libsndfile,erikd\/libsndfile,libsndfile\/libsndfile,libsndfile\/libsndfile,greearb\/libsndfile-ct,audiokit\/libsndfile,Distrotech\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,RonNovy\/libsndfile,greearb\/libsndfile-ct,greearb\/libsndfile-ct,libsndfile\/libsndfile,audiokit\/libsndfile,Icenowy\/libsndfile,RonNovy\/libsndfile,audiokit\/libsndfile,syb0rg\/libsndfile,evpobr\/libsndfile,evpobr\/libsndfile,greearb\/libsndfile-ct,Distrotech\/libsndfile,RonNovy\/libsndfile,syb0rg\/libsndfile,libsndfile\/libsndfile,syb0rg\/libsndfile","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/peak_chunk_test.c\n+++ tests\/peak_chunk_test.c\n@@ -290,51 +290,59 @@\n \n static\tvoid\n read_write_peak_test (const char *filename, int filetype)\n-{\tSNDFILE\t\t*file ;\n-\tSF_INFO\t\tsfinfo ;\n-\tint\t\t\tk, frames ;\n-\tdouble\t\tmax_peak = 0.0 ;\n+{\tSNDFILE\t*file ;\n+ SF_INFO\tsfinfo ;\n+\n+ double small_data [10] ;\n+ double max_peak = 0.0 ;\n+ unsigned k ;\n \n \tprint_test_name (__func__, filename) ;\n \n-\tsfinfo.samplerate\t= 44100 ;\n-\tsfinfo.format\t\t= filetype ;\n-\tsfinfo.channels\t\t= 1 ;\n-\tsfinfo.frames\t\t= 0 ;\n-\n-\tframes = BUFFER_LEN \/ sfinfo.channels ;\n-\n-\t\/* Create some random data with a peak value of 0.66. *\/\n-\tfor (k = 0 ; k < BUFFER_LEN ; k++)\n-\t\tdata [k] = (rand () % 2000) \/ 3000.0 ;\n-\n-\t\/* Insert a peak at a known position. *\/\n-\tdata [frames \/ 8] = 0.95 ;\n-\n-\t\/* Make sure the file doesn't already exist. *\/\n+ for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)\n+ small_data [k] = 0.1 ;\n+\n+ sfinfo.samplerate\t= 44100 ;\n+ sfinfo.channels\t\t= 2 ;\n+ sfinfo.format\t\t= filetype ;\n+ sfinfo.frames\t\t= 0 ;\n+\n+\t\/* Open the file, add peak chunk and write samples with value 0.1. *\/\n+ file = test_open_file_or_die (filename, SFM_WRITE, &sfinfo, SF_FALSE, __LINE__) ;\n+\n+ sf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ;\n+\n+\ttest_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ;\n+\n+ sf_close (file) ;\n+\n+ \/* Open the fiel RDWR, write sample valied 1.25. *\/\n+ file = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, SF_FALSE, __LINE__) ;\n+\n+ for (k = 0 ; k < ARRAY_LEN (small_data) ; k ++)\n+ small_data [k] = 1.0 ;\n+\n+\ttest_write_double_or_die (file, 0, small_data, ARRAY_LEN (small_data), __LINE__) ;\n+\n+ sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (max_peak)) ;\n+\n+ sf_close (file) ;\n+\n+ exit_if_true (max_peak < 0.1, \"\\n\\nLine %d : max peak (%5.3f) should not be 0.1.\\n\\n\", __LINE__, max_peak) ;\n+\n+ \/* Open the file and test the values written to the PEAK chunk. *\/\n+ file = test_open_file_or_die (filename, SFM_READ, &sfinfo, SF_FALSE, __LINE__) ;\n+\n+\texit_if_true (sfinfo.channels * sfinfo.frames != 2 * ARRAY_LEN (small_data),\n+\t\t\t\"Line %d : frame count is %ld, should be %d\\n\", __LINE__, SF_COUNT_TO_LONG (sfinfo.frames), 2 * ARRAY_LEN (small_data)) ;\n+\n+ sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) ;\n+\n+ sf_close (file) ;\n+\n+ exit_if_true (max_peak < 1.0, \"\\n\\nLine %d : max peak (%5.3f) should be 1.0.\\n\\n\", __LINE__, max_peak) ;\n+\n \tunlink (filename) ;\n-\n-\t\/* Write a file with PEAK chunks. *\/\n-\tfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, 0, __LINE__) ;\n-\n-\tsf_command (file, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_TRUE) ;\n-\n-\ttest_write_double_or_die (file, 0, data, BUFFER_LEN, BUFFER_LEN) ;\n-\n-\tsf_close (file) ;\n-\n-\t\/* Now open the file ... *\/\n-\tfile = test_open_file_or_die (filename, SFM_RDWR, &sfinfo, 0, __LINE__) ;\n-\n-\t\/* ... and check if the PEAK chunk has been written. *\/\n-\tif (sf_command (file, SFC_GET_SIGNAL_MAX, &max_peak, sizeof (double)) == SF_FALSE)\n-\t{\tprintf (\"\\n\\nLine %d : SFC_GET_SIGNAL_MAX failed.\\n\\n\", __LINE__) ;\n-\t\texit (1) ;\n- \t} ;\n-\n-\tsf_close (file) ;\n-\n-\tunlink (filename) ;\n-\tprintf (\"ok\\n\") ;\n+\tputs (\"ok\") ;\n } \/* read_write_peak_test *\/\n \n"} {"commit":"b1d5206f4fab308c24e8db26740bdce428f06485","subject":"qemuxml2xmltest: Set dummy non-hypervisor drivers","message":"qemuxml2xmltest: Set dummy non-hypervisor drivers\n\nWhen parsing domain XML post parse callbacks are run and one of\nthem might try and call API from a non-hypervisor driver (e.g.\njust like qemuDomainDeviceNetDefPostParse() is doing - it calls a\nnetwork API). To avoid this in the test suite, set dummy drivers,\nwhich renders all non-hypervisor APIs return error.\n\nThis mimics what qemuxml2argvtest does.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\nReviewed-by: Daniel P. Berrang\u00e9 <bb938cf255e055ff3507f2627d214e8e62118fcf@redhat.com>\n","repos":"libvirt\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,zippy2\/libvirt,olafhering\/libvirt,crobinso\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,zippy2\/libvirt,libvirt\/libvirt,crobinso\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,nertpinx\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/qemuxml2xmltest.c\n+++ tests\/qemuxml2xmltest.c\n@@ -135,6 +135,7 @@\n char *fakerootdir;\n virQEMUDriverConfigPtr cfg = NULL;\n virHashTablePtr capslatest = NULL;\n+ g_autoptr(virConnect) conn = NULL;\n \n capslatest = testQemuGetLatestCaps();\n if (!capslatest)\n@@ -163,6 +164,16 @@\n \n cfg = virQEMUDriverGetConfig(&driver);\n driver.privileged = true;\n+\n+ if (!(conn = virGetConnect()))\n+ goto cleanup;\n+\n+ virSetConnectInterface(conn);\n+ virSetConnectNetwork(conn);\n+ virSetConnectNWFilter(conn);\n+ virSetConnectNodeDev(conn);\n+ virSetConnectSecret(conn);\n+ virSetConnectStorage(conn);\n \n # define DO_TEST_INTERNAL(_name, suffix, when, ...) \\\n do { \\\n@@ -1471,6 +1482,7 @@\n DO_TEST_CAPS_LATEST(\"virtio-9p-multidevs\");\n DO_TEST(\"downscript\", NONE);\n \n+ cleanup:\n if (getenv(\"LIBVIRT_SKIP_CLEANUP\") == NULL)\n virFileDeleteTree(fakerootdir);\n \n"} {"commit":"26ea78943ead457ad8d6a68469ffa105bd9d1cb1","subject":"Revert \"Fix warning\"","message":"Revert \"Fix warning\"\n\nThis reverts commit 658becf59a74767364ea25f360218e2b2aac41b8.\n","repos":"Convey-Compliance\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,Convey-Compliance\/mongo-c-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/test-mongoc-rpc.c\n+++ tests\/test-mongoc-rpc.c\n@@ -57,7 +57,7 @@\n uint8_t *data;\n mongoc_iovec_t *iov;\n size_t length;\n- size_t off = 0;\n+ off_t off = 0;\n int r;\n int i;\n \n"} {"commit":"a5dae249447037f278ae7f0851a3bc875e72ad8b","subject":"tip_manager: use cool macros","message":"tip_manager: use cool macros\n","repos":"GeneAssembly\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,GeneAssembly\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,sebhtml\/biosal,sebhtml\/biosal,GeneAssembly\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,sebhtml\/biosal","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- genomics\/graph_cleaner\/tip_manager.c\n+++ genomics\/graph_cleaner\/tip_manager.c\n@@ -2,6 +2,8 @@\n #include \"tip_manager.h\"\n \n #include <core\/helpers\/integer.h>\n+\n+#include <core\/structures\/vector.h>\n \n #include <engine\/thorium\/actor.h>\n \n@@ -46,7 +48,10 @@\n \n if (action == ACTION_START) {\n \n- LOG(\"tip manager receives ACTION_START.\\n\");\n+ core_int_unpack(&concrete_self->graph_manager_name, buffer);\n+\n+ LOG(\"tip manager receives ACTION_START, graph manager is %d\\n\",\n+ concrete_self->graph_manager_name);\n \n \/*\n * - Spawn a manager\n@@ -55,7 +60,16 @@\n *\/\n LOG(\"Removed tips !!\");\n \n- thorium_actor_send_reply_empty(self, ACTION_START_REPLY);\n+ SEND_REPLY(ACTION_START_REPLY);\n+\n+ int destination = NAME();\n+ struct core_vector vector;\n+ core_vector_init(&vector, sizeof(int));\n+\n+ SEND(destination, ACTION_TEST, TYPE_INT, 9);\n+ SEND(destination, ACTION_TEST, TYPE_VECTOR, &vector);\n+\n+ core_vector_destroy(&vector);\n \n \/*\n * Also, kill self.\n"} {"commit":"84be44e29364fbb856ad0d645b9b33515116105a","subject":"glib2; Indent","message":"glib2; Indent\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib2\/ext\/glib2\/rbglib2conversions.h\n+++ glib2\/ext\/glib2\/rbglib2conversions.h\n@@ -52,6 +52,6 @@\n #define RVAL2GKEYFILEFLAGS(o) (RVAL2GFLAGS(o, G_TYPE_KEY_FILE_FLAGS))\n #define GKEYFILEFLAGS2RVAL(o) (GFLAGS2RVAL(o, G_TYPE_KEY_FILE_FLAGS))\n \n-#define RVAL2GFORMATSIZEFLAGS(o) (RVAL2GFLAGS(o, G_TYPE_FORMAT_SIZE_FLAGS))\n-#define GFORMATSIZEFLAGS2RVAL(o) (GFLAGS2RVAL(o, G_TYPE_FORMAT_SIZE_FLAGS))\n+#define RVAL2GFORMATSIZEFLAGS(o) (RVAL2GFLAGS(o, G_TYPE_FORMAT_SIZE_FLAGS))\n+#define GFORMATSIZEFLAGS2RVAL(o) (GFLAGS2RVAL(o, G_TYPE_FORMAT_SIZE_FLAGS))\n #endif \/* __GLIB2CONVERSIONS_H__ *\/\n"} {"commit":"dbc14ede1b066f995a3945a4f1315356391a6e1f","subject":"test\/install-fixture: rough documentation of helper functions","message":"test\/install-fixture: rough documentation of helper functions\n\nSigned-off-by: Enrico Joerns <a2e5f936c390f36494e46e71bcfbe365bb1e8c49@pengutronix.de>\n","repos":"jluebbe\/rauc,rauc\/rauc,jluebbe\/rauc,ejoerns\/rauc,ejoerns\/rauc,rauc\/rauc,rauc\/rauc,ejoerns\/rauc,jluebbe\/rauc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/install-fixtures.h\n+++ test\/install-fixtures.h\n@@ -8,14 +8,40 @@\n \tgchar *tmpdir;\n } InstallFixture;\n \n+\/**\n+ * Fixture helper to create a bundle for testing.\n+ *\n+ * @param fixture the test fixture\n+ * @param user_data the test fixture user data\n+ * @param manifest_content String containing the entire manifest\n+ * @param handler If true, the custom handler script\n+ * test\/install-content\/custom_handler.sh will be added to the bundle\n+ * @param hook If true, the hook script\n+ * test\/install-content\/hook.sh will be added to the bundle\n+ *\/\n void fixture_helper_set_up_bundle(InstallFixture *fixture,\n \t\tgconstpointer user_data,\n \t\tconst gchar* manifest_content,\n \t\tgboolean handler,\n \t\tgboolean hook);\n \n+\/**\n+ * Fixture helper to set up a fake target system for testing.\n+ *\n+ * The same as fixture_helper_fixture_set_up_system_user() with user-writable\n+ * slots and a mounted pseudo-active slot.\n+ *\n+ * @param fixture the test fixture\n+ * @param user_data the test fixture user data\n+ *\/\n void fixture_helper_set_up_system(InstallFixture *fixture,\n \t\tgconstpointer user_data);\n \n+\/**\n+ * Fixture helper to set up a fake target system for testing.\n+ *\n+ * @param fixture the test fixture\n+ * @param user_data the test fixture user data\n+ *\/\n void fixture_helper_fixture_set_up_system_user(InstallFixture *fixture,\n \t\tgconstpointer user_data);\n"} {"commit":"675a71dce789eb6aa3ba7e38ba137c9e4c6a5f07","subject":"compositor.c: determine xdg position by window geom","message":"compositor.c: determine xdg position by window geom\n","repos":"ascent12\/wlroots,SirCmpwn\/wlroots,swaywm\/wlroots,ascent12\/wlroots,swaywm\/wlroots","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/compositor.c\n+++ examples\/compositor.c\n@@ -67,6 +67,7 @@\n struct example_xdg_surface_v6 {\n \tstruct wlr_xdg_surface_v6 *surface;\n \n+\t\/\/ position of the wlr_surface in the layout\n \tstruct {\n \t\tint lx;\n \t\tint ly;\n@@ -338,11 +339,14 @@\n \t\twl_list_for_each(xdg_surface, &xdg_client->surfaces, link) {\n \t\t\tstruct example_xdg_surface_v6 *esurface = xdg_surface->data;\n \n-\t\t\tif (sample->cursor->x >= esurface->position.lx &&\n-\t\t\t\t\tsample->cursor->y >= esurface->position.ly &&\n-\t\t\t\t\tsample->cursor->x <= esurface->position.lx +\n+\t\t\tdouble window_x = esurface->position.lx + xdg_surface->geometry->x;\n+\t\t\tdouble window_y = esurface->position.ly + xdg_surface->geometry->y;\n+\n+\t\t\tif (sample->cursor->x >= window_x &&\n+\t\t\t\t\tsample->cursor->y >= window_y &&\n+\t\t\t\t\tsample->cursor->x <= window_x +\n \t\t\t\t\t\txdg_surface->geometry->width &&\n-\t\t\t\t\tsample->cursor->y <= esurface->position.ly +\n+\t\t\t\t\tsample->cursor->y <= window_y +\n \t\t\t\t\t\txdg_surface->geometry->height) {\n \t\t\t\treturn xdg_surface;\n \t\t\t}\n"} {"commit":"538d6dc17804c85637152b3f91c232815364bc9c","subject":"extending MT example to have optional number of iterations","message":"extending MT example to have optional number of iterations\n","repos":"devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/dacloud_mt.c\n+++ examples\/dacloud_mt.c\n@@ -1,5 +1,6 @@\n #include <pthread.h>\n #include <string.h>\n+#include <stdlib.h>\n \n #include \"dacloud.h\"\n \n@@ -7,6 +8,7 @@\n \n struct da_cloud_req {\n struct da_cloud_config cfg;\n+ int iterations;\n int tid;\n };\n \n@@ -16,14 +18,18 @@\n struct da_cloud_property_head phead;\n \tstruct da_cloud_property *p;\n struct da_cloud_req *req = arg;\n+ int i = 0;\n memset(&hhead, 0, sizeof(hhead));\n da_cloud_header_init(&hhead);\n da_cloud_useragent_add(&hhead, \"Dalvik\/1.2.0 (Linux; U; Android 2.2.1; GT-S5830L Build\/FROYO)\");\n- printf(\"thread %d starts\\n\", req->tid);\n- da_cloud_detect(&req->cfg, &hhead, &phead);\n-\tif (da_cloud_property(&phead, \"id\", &p) == 0)\n-\t\tprintf(\"thread %d : id is %ld\\n\", req->tid, p->value.l);\n- printf(\"thread %d ends from %s\\n\", req->tid, phead.cachesource);\n+ for (i = 0; i < req->iterations; i ++) {\n+ printf(\"thread %d (iteration %d) starts\\n\", req->tid, (i + 1));\n+ da_cloud_detect(&req->cfg, &hhead, &phead);\n+ if (da_cloud_property(&phead, \"id\", &p) == 0)\n+ printf(\"thread %d (iteration %d): id is %ld\\n\", req->tid, (i + 1),\n+ p->value.l);\n+ printf(\"thread %d (iteration %d) ends from %s\\n\", req->tid, (i + 1), phead.cachesource);\n+ }\n da_cloud_properties_free(&phead);\n da_cloud_header_free(&hhead);\n return (NULL);\n@@ -35,9 +41,15 @@\n struct da_cloud_req req[THREADS];\n struct da_cloud_config config;\n const char *configpath;\n+ int iterations = 1;\n if (argc < 2)\n return (-1);\n configpath = argv[1];\n+ if (argc > 2) {\n+ iterations = strtol(argv[2], 0, 10);\n+ if (iterations < 1)\n+ iterations = 1;\n+ }\n memset(&config, 0, sizeof(config));\n if (da_cloud_init(&config, configpath) == 0) {\n size_t i = 0;\n@@ -45,6 +57,7 @@\n memset(&req[i], 0, sizeof(req[i]));\n memcpy(&req[i].cfg, &config, sizeof(req[i].cfg));\n req[i].tid = i;\n+ req[i].iterations = iterations;\n pthread_create(&pt[i], NULL, da_cloud_process_req, (void *) &req[i]);\n }\n \n"} {"commit":"a44f082074952ecc25e5deda0301b5f56f5fd7bf","subject":"test\/marpaESLIFTester.c: Fix","message":"test\/marpaESLIFTester.c: Fix\n","repos":"jddurand\/c-marpaESLIF,jddurand\/c-marpaESLIF,jddurand\/c-marpaESLIF,jddurand\/c-marpaESLIF,jddurand\/c-marpaESLIF","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/marpaESLIFTester.c\n+++ test\/marpaESLIFTester.c\n@@ -556,8 +556,6 @@\n short eofb;\n marpaESLIFAlternative_t marpaESLIFAlternative;\n short discardMatchb;\n- char *currentInputs;\n- size_t currentInputl;\n \n (*eventCountip)++;\n \n@@ -569,10 +567,7 @@\n if (! marpaESLIFRecognizer_discard_tryb(marpaESLIFRecognizerp, &discardMatchb)) {\n goto err;\n }\n- if (! marpaESLIFRecognizer_inputb(marpaESLIFRecognizerp, ¤tInputs, ¤tInputl)) {\n- goto err;\n- }\n- GENERICLOGGER_INFOF(genericLoggerp, \"Discard try returned %s, current input is: \\\"%s\\\"\", discardMatchb ? \"true\" : \"false\", currentInputs);\n+ GENERICLOGGER_INFOF(genericLoggerp, \"Discard try returned %s\", discardMatchb ? \"true\" : \"false\");\n \n for (eventArrayIteratorl = 0; eventArrayIteratorl < eventArrayl; eventArrayIteratorl++) {\n switch (eventArrayp[eventArrayIteratorl].type) {\n"} {"commit":"fa6b3ee7c525fc59dba832a4b09582b421ed0cf0","subject":"Fix formatting.","message":"Fix formatting.\n","repos":"bloomberg\/bde_verify,seanlth\/bde_verify,bloomberg\/bde_verify,yahiahisham14\/bde_verify,bloomberg\/bde_verify,yahiahisham14\/bde_verify,bloomberg\/bde_verify,seanlth\/bde_verify,seanlth\/bde_verify,bloomberg\/bde_verify,yahiahisham14\/bde_verify,seanlth\/bde_verify,yahiahisham14\/bde_verify","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/csa\/csabase\/csabase_visitor.h\n+++ groups\/csa\/csabase\/csabase_visitor.h\n@@ -29,13 +29,13 @@\n {\n public:\n #define DECL(CLASS, BASE) \\\n- utils::event<void(clang::CLASS##Decl const*)> on##CLASS##Decl; \\\n+ utils::event<void(clang::CLASS##Decl const*)> on##CLASS##Decl; \\\n void do_visit(clang::CLASS##Decl const*);\n DECL(,)\n #include \"clang\/AST\/DeclNodes.inc\"\n \n #define STMT(CLASS, PARENT) \\\n- utils::event<void(clang::CLASS const*)> on##CLASS; \\\n+ utils::event<void(clang::CLASS const*)> on##CLASS; \\\n void do_visit(clang::CLASS const*);\n STMT(Stmt,)\n #include \"clang\/AST\/StmtNodes.inc\"\n"} {"commit":"ba5a2d162f0d3e417181bb8a90b8dcf91af70b4f","subject":"Fix copy-paste error","message":"Fix copy-paste error\n","repos":"kakaroto\/farstream,kakaroto\/farstream,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2,shadeslayer\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,tieto\/farstream,tieto\/farstream,ahmedammar\/skype_farsight2,shadeslayer\/farstream,tieto\/farstream,shadeslayer\/farstream,tieto\/farstream,kakaroto\/farstream,pexip\/farstream,pexip\/farstream,pexip\/farstream,tieto\/farstream,kakaroto\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-session.c\n+++ gst\/fsrtpconference\/fs-rtp-session.c\n@@ -856,7 +856,7 @@\n self->priv->construction_error = g_error_new (FS_ERROR,\n FS_ERROR_CONSTRUCTION,\n \"Could not link pad %s (%p) with pad %s (%p)\",\n- GST_PAD_NAME (funnel_src_pad), GST_PAD_CAPS (muxer_src_pad),\n+ GST_PAD_NAME (muxer_src_pad), GST_PAD_CAPS (muxer_src_pad),\n GST_PAD_NAME (self->priv->rtpbin_send_rtp_sink),\n GST_PAD_CAPS (self->priv->rtpbin_send_rtp_sink));\n \n"} {"commit":"351cdebcbeb9ebc97df449b2bcb3b372ac87ea14","subject":"tests: drop the external prefix in gu_msg()","message":"tests: drop the external prefix in gu_msg()\n\nThis function is static so drop the prefix.\n\nSigned-off-by: Bartosz Golaszewski <108de5fbc428215dc26df4468b48691526611148@gmail.com>\n","repos":"brgl\/libgpiod,brgl\/libgpiod,brgl\/libgpiod,brgl\/libgpiod","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/unit\/gpiod-unit.c\n+++ tests\/unit\/gpiod-unit.c\n@@ -52,7 +52,7 @@\n \tfputc('\\n', stream);\n }\n \n-static void GU_PRINTF(1, 2) gu_msg(const char *fmt, ...)\n+static void GU_PRINTF(1, 2) msg(const char *fmt, ...)\n {\n \tva_list va;\n \n@@ -163,7 +163,7 @@\n \n static void module_cleanup(void)\n {\n-\tgu_msg(\"cleaning up\");\n+\tmsg(\"cleaning up\");\n \n \tif (mockup_loaded())\n \t\tkmod_module_remove_module(globals.module, 0);\n@@ -180,7 +180,7 @@\n \tconst char *modpath;\n \tint status;\n \n-\tgu_msg(\"checking gpio-mockup availability\");\n+\tmsg(\"checking gpio-mockup availability\");\n \n \tglobals.module_ctx = kmod_new(NULL, NULL);\n \tif (!globals.module_ctx)\n@@ -206,7 +206,7 @@\n \tif (status)\n \t\tdie_perr(\"unable to remove gpio-mockup\");\n \n-\tgu_msg(\"gpio-mockup ok\");\n+\tmsg(\"gpio-mockup ok\");\n }\n \n static void test_load_module(struct _gu_chip_descr *descr)\n@@ -365,18 +365,18 @@\n \n \tatexit(module_cleanup);\n \n-\tgu_msg(\"libgpiod unit-test suite\");\n-\tgu_msg(\"%u tests registered\", globals.num_tests);\n+\tmsg(\"libgpiod unit-test suite\");\n+\tmsg(\"%u tests registered\", globals.num_tests);\n \n \tcheck_gpio_mockup();\n \n-\tgu_msg(\"running tests\");\n+\tmsg(\"running tests\");\n \n \tfor (test = globals.test_list_head; test; test = test->_next) {\n \t\ttest_prepare(&test->chip_descr);\n \n \t\ttest->func();\n-\t\tgu_msg(\"test '%s': %s\", test->name,\n+\t\tmsg(\"test '%s': %s\", test->name,\n \t\t globals.test_ctx.test_failed ? \"FAILED\" : \"OK\");\n \t\tif (globals.test_ctx.test_failed)\n \t\t\tglobals.tests_failed++;\n@@ -385,7 +385,7 @@\n \t}\n \n \tif (!globals.tests_failed)\n-\t\tgu_msg(\"all tests passed\");\n+\t\tmsg(\"all tests passed\");\n \telse\n \t\tgu_err(\"%u out of %u tests failed\",\n \t\t globals.tests_failed, globals.num_tests);\n"} {"commit":"784efcbc5b588a0f3d1253626b494cad73b223b6","subject":"Pass the pad name to the _new_ghost_pad function (not the direction..)","message":"Pass the pad name to the _new_ghost_pad function (not the direction..)\n","repos":"tieto\/farstream,pexip\/farstream,shadeslayer\/farstream,kakaroto\/farstream,tieto\/farstream,shadeslayer\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,ahmedammar\/skype_farsight2,kakaroto\/farstream,tieto\/farstream,ahmedammar\/skype_farsight2,tieto\/farstream,kakaroto\/farstream,shadeslayer\/farstream,kakaroto\/farstream,pexip\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-session.c\n+++ gst\/fsrtpconference\/fs-rtp-session.c\n@@ -1668,13 +1668,14 @@\n \n if (g_list_first (pipeline_factory) == walk)\n \/* if its the first element of the codec bin *\/\n- if (!_create_ghost_pad (current_element, direction_str,\n- codec_bin, error))\n+ if (!_create_ghost_pad (current_element,\n+ is_send ? \"src\" : \"sink\", codec_bin, error))\n goto error;\n \n if (g_list_next (g_list_first (pipeline_factory)) == NULL)\n \/* if its the last element of the codec bin *\/\n- if (!_create_ghost_pad (current_element, direction_str, codec_bin, error))\n+ if (!_create_ghost_pad (current_element,\n+ is_send ? \"sink\" : \"src\" , codec_bin, error))\n goto error;\n \n \n@@ -2067,7 +2068,6 @@\n GstElement *codecbin = NULL;\n gboolean ret = FALSE;\n \n- FS_RTP_SESSION_LOCK (self);\n codec = fs_rtp_session_select_send_codec_locked(self, &blueprint, error);\n \n if (!codec)\n@@ -2115,9 +2115,8 @@\n }\n \n ret = TRUE;\n+\n done:\n-\n- FS_RTP_SESSION_UNLOCK (self);\n \n return ret;\n }\n"} {"commit":"504359bc3622e4a4394dd2be082118bd1c616781","subject":"Fix a bug in the fast progressbar demo","message":"Fix a bug in the fast progressbar demo\n","repos":"suhussai\/progressbar,michael-hartmann\/progressbar,doches\/progressbar,shaunstanislaus\/progressbar,scottcunningham\/progressbar,suhussai\/progressbar,shaunstanislaus\/progressbar,scottcunningham\/progressbar,niosus\/progressbar,michael-hartmann\/progressbar,doches\/progressbar,niosus\/progressbar","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- test\/progressbar_demo.c\n+++ test\/progressbar_demo.c\n@@ -58,8 +58,8 @@\n }\n progressbar_finish(longlabel);\n \n- progressbar *fast = progressbar_new(\"Fast\",100);\n- for(int i=0;i<max\/3;i++) {\n+ progressbar *fast = progressbar_new(\"Fast\",20);\n+ for(int i=0;i<20;i++) {\n usleep(SLEEP_MS);\n progressbar_inc(fast);\n }\n"} {"commit":"b9dba88a898b7c11a61318cb7c7d02197cb36397","subject":"blur: optimize coordinates calculations","message":"blur: optimize coordinates calculations\n\nSave 28 instructions on i915 (mainly redundant MOVs) and gain a 25%\n(roughly measured with videotestsrc and glimagesink sync=false) speed\nbump\n","repos":"mapmapteam\/gst-plugins-gl,mapmapteam\/gst-plugins-gl,ystreet\/gst-plugins-gl,ystreet\/gst-plugins-gl,mapmapteam\/gst-plugins-gl,ystreet\/gst-plugins-gl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/gl\/effects\/gstgleffectssources.c\n+++ gst\/gl\/effects\/gstgleffectssources.c\n@@ -390,17 +390,15 @@\n \"uniform float kernel[9];\"\n \"void main () {\"\n \" vec2 texturecoord[9];\"\n- \" float s = gl_TexCoord[0].s;\"\n- \" float t = gl_TexCoord[0].t;\"\n- \" texturecoord[0] = vec2(s-4.0, t);\"\n- \" texturecoord[1] = vec2(s-3.0, t);\"\n- \" texturecoord[2] = vec2(s-2.0, t);\"\n- \" texturecoord[3] = vec2(s-1.0, t);\"\n- \" texturecoord[4] = vec2(s, t);\"\n- \" texturecoord[5] = vec2(s+1.0, t);\"\n- \" texturecoord[6] = vec2(s+2.0, t);\"\n- \" texturecoord[7] = vec2(s+3.0, t);\"\n- \" texturecoord[8] = vec2(s+4.0, t);\"\n+ \" texturecoord[4] = gl_TexCoord[0].st;\"\n+ \" texturecoord[3] = texturecoord[4] - vec2(1.0, 0.0);\"\n+ \" texturecoord[2] = texturecoord[3] - vec2(1.0, 0.0);\"\n+ \" texturecoord[1] = texturecoord[2] - vec2(1.0, 0.0);\"\n+ \" texturecoord[0] = texturecoord[1] - vec2(1.0, 0.0);\"\n+ \" texturecoord[5] = texturecoord[4] + vec2(1.0, 0.0);\"\n+ \" texturecoord[6] = texturecoord[5] + vec2(1.0, 0.0);\"\n+ \" texturecoord[7] = texturecoord[6] + vec2(1.0, 0.0);\"\n+ \" texturecoord[8] = texturecoord[7] + vec2(1.0, 0.0);\"\n \" int i;\"\n \" vec4 sum = vec4 (0.0);\"\n \" for (i = 0; i < 9; i++) { \"\n@@ -417,22 +415,20 @@\n \"uniform float kernel[9];\"\n \"void main () {\"\n \" vec2 texturecoord[9];\"\n- \" float s = gl_TexCoord[0].s;\"\n- \" float t = gl_TexCoord[0].t;\"\n- \" texturecoord[0] = vec2(s, t-4.0);\"\n- \" texturecoord[1] = vec2(s, t-3.0);\"\n- \" texturecoord[2] = vec2(s, t-2.0);\"\n- \" texturecoord[3] = vec2(s, t-1.0);\"\n- \" texturecoord[4] = vec2(s, t);\"\n- \" texturecoord[5] = vec2(s, t+1.0);\"\n- \" texturecoord[6] = vec2(s, t+2.0);\"\n- \" texturecoord[7] = vec2(s, t+3.0);\"\n- \" texturecoord[8] = vec2(s, t+4.0);\"\n+ \" texturecoord[4] = gl_TexCoord[0].st;\"\n+ \" texturecoord[3] = texturecoord[4] - vec2(0.0, 1.0);\"\n+ \" texturecoord[2] = texturecoord[3] - vec2(0.0, 1.0);\"\n+ \" texturecoord[1] = texturecoord[2] - vec2(0.0, 1.0);\"\n+ \" texturecoord[0] = texturecoord[1] - vec2(0.0, 1.0);\"\n+ \" texturecoord[5] = texturecoord[4] + vec2(0.0, 1.0);\"\n+ \" texturecoord[6] = texturecoord[5] + vec2(0.0, 1.0);\"\n+ \" texturecoord[7] = texturecoord[6] + vec2(0.0, 1.0);\"\n+ \" texturecoord[8] = texturecoord[7] + vec2(0.0, 1.0);\"\n \" int i;\"\n \" vec4 sum = vec4 (0.0);\"\n \" for (i = 0; i < 9; i++) { \"\n \" vec4 neighbor = texture2DRect(tex, texturecoord[i]);\"\n- \" sum += neighbor * kernel[i]; \"\n+ \" sum += neighbor * kernel[i];\"\n \" }\"\n \" gl_FragColor = sum;\"\n \"}\";\n"} {"commit":"7b555d512ce8e7107dbbe004cd1eee0984ce632d","subject":"Word count copy keys, not all data.","message":"Word count copy keys, not all data.\n","repos":"adamwg\/elastic-phoenix,adamwg\/elastic-phoenix,adamwg\/elastic-phoenix","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/word_count\/sort.c\n+++ tests\/word_count\/sort.c\n@@ -116,6 +116,7 @@\n int (*compar)(const void *, const void *))\n {\n final_data_t sort_vals;\n+\tint i;\n \n \/\/ Global variable\n unit_size = width;\n@@ -159,6 +160,9 @@\n \n get_time (&begin);\n \n- memcpy(base, sort_vals.data, sort_vals.length);\n+\tfor(i = 0; i < sort_vals.length \/ unit_size; i++) {\n+\t\tmemcpy((char *)base + i*unit_size, ((keyval_t *)sort_vals.data)[i].key, unit_size);\n+\t}\n+\n \tmap_reduce_cleanup(&map_reduce_args);\n }\n"} {"commit":"7f81747fa9ceb8350243dbb4f2b5d9a1799b32cc","subject":"mcu\/fe310: Fix build error","message":"mcu\/fe310: Fix build error\n\nIntroduction of hal_system_reset_cb() resulted in build error\ndue to missing os\/mynewt.h include.\n","repos":"mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/mcu\/sifive\/fe310\/src\/hal_system.c\n+++ hw\/mcu\/sifive\/fe310\/src\/hal_system.c\n@@ -17,6 +17,7 @@\n * under the License.\n *\/\n \n+#include \"os\/mynewt.h\"\n #include \"hal\/hal_system.h\"\n \n void\n"} {"commit":"93fb6479ceb29546774036b68758f892e943f4ca","subject":"Fixed dependsOn flags in fragments","message":"Fixed dependsOn flags in fragments\n\ngit-svn-id: 33bf1455041ebe448dbaea643fd5b4b7ce02239d@3963 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"felixge\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/gpac\/internal\/isomedia_dev.h\n+++ include\/gpac\/internal\/isomedia_dev.h\n@@ -2038,6 +2038,9 @@\n #define GF_ISOM_GET_FRAG_PAD(flag) ( (flag) >> 17) & 0x7\n #define GF_ISOM_GET_FRAG_SYNC(flag) ( ! ( ( (flag) >> 16) & 0x1))\n #define GF_ISOM_GET_FRAG_DEG(flag)\t(flag) & 0x7FFF\n+\n+#define GF_ISOM_GET_FRAG_DEPEND_FLAGS(lead, depends, depended, redundant) ( (lead<<26) | (depends<<24) | (depended<<22) | (redundant<<20) )\n+#define GF_ISOM_RESET_FRAG_DEPEND_FLAGS(flags) flags = flags & 0xFFFFF\n \n GF_TrackExtendsBox *GetTrex(GF_MovieBox *moov, u32 TrackID);\n #endif\n"} {"commit":"c73996d04110c61d44c8c946f55b98955d5aa394","subject":"Fix all TODO-doc","message":"Fix all TODO-doc\n","repos":"ROCm-Developer-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP,ROCm-Developer-Tools\/HIP,GPUOpen-ProfessionalCompute-Tools\/HIP","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/hcc_detail\/hip_runtime_api.h\n+++ include\/hcc_detail\/hip_runtime_api.h\n@@ -785,16 +785,56 @@\n *\/\n hipError_t hipDeviceCanAccessPeer ( int* canAccessPeer, int device, int peerDevice );\n \n-\/\/ TODO-DOC\n+\n+\n+\/**\n+ * @brief Disables registering memory on peerDevice for direct access from the current device.\n+ *\n+ * If there are any allocations on peerDevice which were registered in the current device using hipPeerRegister() then these allocations will be automatically unregistered.\n+ * Returns hipErrorPeerAccessNotEnabled if direct access to memory on peerDevice has not yet been enabled from the current device.\n+ *\n+ * @param [in] peerDevice\n+ * TODO:cudaErrorPeerAccessNotEnabled and cudaErrorInvalidDevice error not supported in HIP, return hipErrorUnknown\n+ * Returns #hipSuccess, #hipErrorUnknown\n+ *\/\n hipError_t hipDeviceDisablePeerAccess ( int peerDevice );\n \n-\/\/ TODO-DOC\n+\/**\n+ * @brief Enables registering memory on peerDevice for direct access from the current device.\n+ *\n+ * @param [in] peerDevice\n+ * @param [in] flags\n+ *\n+ * TODO:cudaErrorInvalidDevice error not supported in HIP, return hipErrorUnknown\n+ * Returns #hipSuccess, #hipErrorInvalidDevice, #hipErrorInvalidValue, #hipErrorUnknown\n+ *\/\n hipError_t hipDeviceEnablePeerAccess ( int peerDevice, unsigned int flags );\n \n-\/\/ TODO-DOC\n+\/**\n+ * @brief Copies memory from one device to memory on another device.\n+ *\n+ * @param [out] dst - Destination device pointer.\n+ * @param [in] dstDevice - Destination device\n+ * @param [in] src - Source device pointer\n+ * @param [in] srcDevice - Source device\n+ * @param [in] count - Size of memory copy in bytes\n+ *\n+ * Returns #hipSuccess, #hipErrorInvalidValue, #hipErrorInvalidDevice\n+ *\/\n hipError_t hipMemcpyPeer ( void* dst, int dstDevice, const void* src, int srcDevice, size_t sizeBytes );\n \n-\/\/ TODO-DOC\n+\/**\n+ * @brief Copies memory from one device to memory on another device.\n+ *\n+ * @param [out] dst - Destination device pointer.\n+ * @param [in] dstDevice - Destination device\n+ * @param [in] src - Source device pointer\n+ * @param [in] srcDevice - Source device\n+ * @param [in] count - Size of memory copy in bytes\n+ * @param [in] stream - Stream identifier\n+ *\n+ * Returns #hipSuccess, #hipErrorInvalidValue, #hipErrorInvalidDevice\n+ *\/\n hipError_t hipMemcpyPeerAsync ( void* dst, int dstDevice, const void* src, int srcDevice, size_t sizeBytes, hipStream_t stream=0 );\n \/\/ doxygen end PeerToPeer\n \/**\n"} {"commit":"89949e91dda22ff0c0403ee0d4e1ad8840bc97ce","subject":"don't try to decode a vector of thumbnails, it's only one","message":"don't try to decode a vector of thumbnails, it's only one\n","repos":"slowriot\/libtelegram,slowriot\/libtelegram,slowriot\/libtelegram","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/libtelegram\/types\/document.h\n+++ include\/libtelegram\/types\/document.h\n@@ -8,7 +8,7 @@\n struct document {\n \/\/\/ See https:\/\/core.telegram.org\/bots\/api#document\n std::string file_id; \/\/ Unique file identifier\n- std::experimental::optional<std::vector<photosize>> thumb; \/\/ Optional. Document thumbnail as defined by sender\n+ std::experimental::optional<photosize> thumb; \/\/ Optional. Document thumbnail as defined by sender\n std::experimental::optional<std::string> file_name; \/\/ Optional. Original filename as defined by sender\n std::experimental::optional<std::string> mime_type; \/\/ Optional. MIME type of the file as defined by sender\n std::experimental::optional<int_fast32_t> file_size; \/\/ Optional. File size (in bytes)\n"} {"commit":"be94ffcf129f36c5515d807bb39fc3e5a02269f1","subject":"speculatively teach OPC_CheckValueType and OPC_EmitNode to handle MVT::iPTR.","message":"speculatively teach OPC_CheckValueType and OPC_EmitNode to handle\nMVT::iPTR.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@96753 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/DAGISelHeader.h\n+++ include\/llvm\/CodeGen\/DAGISelHeader.h\n@@ -420,11 +420,16 @@\n if (cast<CondCodeSDNode>(N)->get() !=\n (ISD::CondCode)MatcherTable[MatcherIndex++]) break;\n continue;\n- case OPC_CheckValueType:\n- if (cast<VTSDNode>(N)->getVT() !=\n- (MVT::SimpleValueType)MatcherTable[MatcherIndex++]) break;\n- continue;\n-\n+ case OPC_CheckValueType: {\n+ MVT::SimpleValueType VT =\n+ (MVT::SimpleValueType)MatcherTable[MatcherIndex++];\n+ if (cast<VTSDNode>(N)->getVT() != VT) {\n+ \/\/ Handle the case when VT is iPTR.\n+ if (VT != MVT::iPTR || cast<VTSDNode>(N)->getVT() != TLI.getPointerTy())\n+ break;\n+ }\n+ continue;\n+ }\n case OPC_CheckInteger1:\n if (CheckInteger(N, GetInt1(MatcherTable, MatcherIndex))) break;\n continue;\n@@ -643,8 +648,12 @@\n unsigned NumVTs = MatcherTable[MatcherIndex++];\n assert(NumVTs != 0 && \"Invalid node result\");\n SmallVector<EVT, 4> VTs;\n- for (unsigned i = 0; i != NumVTs; ++i)\n- VTs.push_back((MVT::SimpleValueType)MatcherTable[MatcherIndex++]);\n+ for (unsigned i = 0; i != NumVTs; ++i) {\n+ MVT::SimpleValueType VT =\n+ (MVT::SimpleValueType)MatcherTable[MatcherIndex++];\n+ if (VT == MVT::iPTR) VT = TLI.getPointerTy().SimpleTy;\n+ VTs.push_back(VT);\n+ }\n \n \/\/ FIXME: Use faster version for the common 'one VT' case?\n SDVTList VTList = CurDAG->getVTList(VTs.data(), VTs.size());\n"} {"commit":"4e27d3a10ca1094703a3fc979c5417ee4e861d1e","subject":"Fix a problem Duraid noticed, where we weren't removing values from the kills list when doing two-address and phi node lowering during register allocation.","message":"Fix a problem Duraid noticed, where we weren't removing values from the kills\nlist when doing two-address and phi node lowering during register allocation.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@23043 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/LiveVariables.h\n+++ include\/llvm\/CodeGen\/LiveVariables.h\n@@ -213,7 +213,16 @@\n \/\/\/ removeVirtualRegistersKilled - Remove all killed info for the specified\n \/\/\/ instruction.\n void removeVirtualRegistersKilled(MachineInstr *MI) {\n- RegistersKilled.erase(MI);\n+ std::map<MachineInstr*, std::vector<unsigned> >::iterator I = \n+ RegistersKilled.find(MI);\n+ if (I != RegistersKilled.end()) {\n+ std::vector<unsigned> &Regs = I->second;\n+ for (unsigned i = 0, e = Regs.size(); i != e; ++i) {\n+ bool removed = getVarInfo(Regs[i]).removeKill(MI);\n+ assert(removed && \"kill not in register's VarInfo?\");\n+ }\n+ RegistersKilled.erase(I);\n+ }\n }\n \n \/\/\/ addVirtualRegisterDead - Add information about the fact that the specified\n@@ -256,7 +265,16 @@\n \/\/\/ removeVirtualRegistersDead - Remove all of the specified dead\n \/\/\/ registers from the live variable information.\n void removeVirtualRegistersDead(MachineInstr *MI) {\n- RegistersDead.erase(MI);\n+ std::map<MachineInstr*, std::vector<unsigned> >::iterator I = \n+ RegistersDead.find(MI);\n+ if (I != RegistersDead.end()) {\n+ std::vector<unsigned> &Regs = I->second;\n+ for (unsigned i = 0, e = Regs.size(); i != e; ++i) {\n+ bool removed = getVarInfo(Regs[i]).removeKill(MI);\n+ assert(removed && \"kill not in register's VarInfo?\");\n+ }\n+ RegistersDead.erase(I);\n+ }\n }\n \n virtual void getAnalysisUsage(AnalysisUsage &AU) const {\n"} {"commit":"a13ed755d13bec39a5b4f63cbbf10df64b982600","subject":"add missing warn unused (#160)","message":"add missing warn unused (#160)\n\nSigned-off-by: William Woodall <c824fe0afe16857dd6f587aa7c4044d2642d60fb@osrfoundation.org>","repos":"ros2\/c_utilities,ros2\/c_utilities","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/rcutils\/types\/string_array.h\n+++ include\/rcutils\/types\/string_array.h\n@@ -86,6 +86,7 @@\n * ```\n *\/\n RCUTILS_PUBLIC\n+RCUTILS_WARN_UNUSED\n rcutils_ret_t\n rcutils_string_array_init(\n rcutils_string_array_t * string_array,\n"} {"commit":"0974ad9a5d6fd4bcd4cdc6f8679f653c7545b3ca","subject":"AST: Remove some dead code from LayoutConstraint.h","message":"AST: Remove some dead code from LayoutConstraint.h\n","repos":"rudkx\/swift,parkera\/swift,atrick\/swift,parkera\/swift,ahoppen\/swift,atrick\/swift,ahoppen\/swift,gregomni\/swift,roambotics\/swift,glessard\/swift,hooman\/swift,ahoppen\/swift,apple\/swift,atrick\/swift,hooman\/swift,hooman\/swift,glessard\/swift,rudkx\/swift,glessard\/swift,roambotics\/swift,benlangmuir\/swift,rudkx\/swift,glessard\/swift,rudkx\/swift,gregomni\/swift,gregomni\/swift,apple\/swift,benlangmuir\/swift,hooman\/swift,benlangmuir\/swift,parkera\/swift,parkera\/swift,JGiola\/swift,JGiola\/swift,glessard\/swift,apple\/swift,tkremenek\/swift,tkremenek\/swift,roambotics\/swift,rudkx\/swift,xwu\/swift,hooman\/swift,hooman\/swift,roambotics\/swift,tkremenek\/swift,xwu\/swift,xwu\/swift,hooman\/swift,benlangmuir\/swift,tkremenek\/swift,JGiola\/swift,atrick\/swift,parkera\/swift,JGiola\/swift,benlangmuir\/swift,parkera\/swift,parkera\/swift,benlangmuir\/swift,gregomni\/swift,xwu\/swift,roambotics\/swift,tkremenek\/swift,parkera\/swift,xwu\/swift,JGiola\/swift,JGiola\/swift,apple\/swift,tkremenek\/swift,ahoppen\/swift,ahoppen\/swift,apple\/swift,gregomni\/swift,xwu\/swift,ahoppen\/swift,gregomni\/swift,glessard\/swift,tkremenek\/swift,apple\/swift,rudkx\/swift,xwu\/swift,atrick\/swift,atrick\/swift,roambotics\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/AST\/LayoutConstraint.h\n+++ include\/swift\/AST\/LayoutConstraint.h\n@@ -313,12 +313,6 @@\n \n bool isError() const;\n \n- \/\/ FIXME: We generally shouldn't need to build LayoutConstraintLoc without\n- \/\/ a location.\n- static LayoutConstraintLoc withoutLoc(LayoutConstraint Layout) {\n- return LayoutConstraintLoc(Layout, SourceLoc());\n- }\n-\n \/\/\/ Get the representative location of this type, for diagnostic\n \/\/\/ purposes.\n SourceLoc getLoc() const { return Loc; }\n@@ -328,13 +322,7 @@\n bool hasLocation() const { return Loc.isValid(); }\n LayoutConstraint getLayoutConstraint() const { return Layout; }\n \n- void setLayoutConstraint(LayoutConstraint value) {\n- Layout = value;\n- }\n-\n bool isNull() const { return Layout.isNull(); }\n-\n- LayoutConstraintLoc clone(ASTContext &ctx) const { return *this; }\n };\n \n \/\/\/ Checks if ID is a name of a layout constraint and returns this\n"} {"commit":"a7b35a4a058188770ceab958c9b6e7f9d82379b9","subject":"dual sided friction","message":"dual sided friction\n","repos":"yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/taichi\/dynamics\/rigid_body.h\n+++ include\/taichi\/dynamics\/rigid_body.h\n@@ -34,7 +34,7 @@\n \n \/\/ Segment mesh for 2D and thin shell for 3D\n bool codimensional;\n- real friction, restitution;\n+ real frictions[2], restitution;\n MatrixP mesh_to_centroid;\n real mass, inv_mass;\n InertiaType inertia, inv_inertia;\n@@ -56,7 +56,7 @@\n RotationFunctionType rot_func;\n \n TC_IO_DECL {\n- TC_IO(codimensional, friction, restitution, mesh_to_centroid, mass,\n+ TC_IO(codimensional, frictions, restitution, mesh_to_centroid, mass,\n inv_mass);\n TC_IO(inertia, inv_inertia);\n TC_IO(position, velocity, tmp_velocity);\n@@ -79,7 +79,8 @@\n velocity = Vector(0.0f);\n rotation = Rotation<dim>();\n angular_velocity = AngularVelocity<dim>();\n- friction = 0;\n+ frictions[0] = 0;\n+ frictions[1] = 0;\n restitution = 0;\n linear_damping = 0;\n angular_damping = 0;\n"} {"commit":"844737a2f430401f36560e8fe0d75ab85eee23d2","subject":"Added important warning when calling select","message":"Added important warning when calling select\n","repos":"votca\/tools,votca\/tools,votca\/tools,votca\/tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/votca\/tools\/datacollection.h\n+++ include\/votca\/tools\/datacollection.h\n@@ -129,6 +129,10 @@\n \n \/**\n * \\brief select a set of arrays\n+ *\n+ * WARNING If attempting to append to an existing selection you must be\n+ * careful if there exist more than one array with the same name the \n+ * first array name that matches 'strselection' will be appended.\n *\/\n selection *select(string strselection, selection *sel_append = NULL);\n \n"} {"commit":"ccc2784153009e139de9551cb4c734259946c488","subject":"Avoid printf type warning in test-timer-again","message":"Avoid printf type warning in test-timer-again\n","repos":"urbit\/archaeology2,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,urbit\/archaeology2,urbit\/archaeology2,unknownbrackets\/maxcso,urbit\/archaeology2,urbit\/archaeology2,urbit\/archaeology2,unknownbrackets\/maxcso,unknownbrackets\/maxcso,urbit\/archaeology2,urbit\/archaeology2,unknownbrackets\/maxcso,urbit\/archaeology2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/test-timer-again.c\n+++ test\/test-timer-again.c\n@@ -50,7 +50,7 @@\n \n ASSERT(uv_timer_get_repeat(handle) == 50);\n \n- LOGF(\"repeat_1_cb called after %ld ms\\n\", uv_now() - start_time);\n+ LOGF(\"repeat_1_cb called after %ld ms\\n\", (long int)(uv_now() - start_time));\n \n repeat_1_cb_called++;\n \n@@ -72,7 +72,7 @@\n ASSERT(status == 0);\n ASSERT(repeat_2_cb_allowed);\n \n- LOGF(\"repeat_2_cb called after %ld ms\\n\", uv_now() - start_time);\n+ LOGF(\"repeat_2_cb called after %ld ms\\n\", (long int)(uv_now() - start_time));\n \n repeat_2_cb_called++;\n \n@@ -137,8 +137,9 @@\n ASSERT(repeat_2_cb_called == 2);\n ASSERT(close_cb_called == 2);\n \n- LOGF(\"Test took %ld ms (expected ~700 ms)\\n\", uv_now() - start_time);\n+ LOGF(\"Test took %ld ms (expected ~700 ms)\\n\",\n+ (long int)(uv_now() - start_time));\n ASSERT(700 <= uv_now() - start_time);\n \n return 0;\n-}+}\n"} {"commit":"594d67aeb9771e438d51afb11c80e471194560dd","subject":"Use proper size limits for state structures","message":"Use proper size limits for state structures\n","repos":"joostrijneveld\/xmss-reference","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- test\/test_xmssmt_fast.c\n+++ test\/test_xmssmt_fast.c\n@@ -4,7 +4,7 @@\n #include \"..\/xmss_fast.h\"\n \n #define MLEN 3491\n-#define SIGNATURES 1024\n+#define SIGNATURES 4096\n \n \n unsigned char mi[MLEN];\n@@ -17,8 +17,8 @@\n unsigned long long i,j;\n int m = 32;\n int n = 32;\n- int h = 20;\n- int d = 5;\n+ int h = 12;\n+ int d = 2;\n int w = 16;\n int k = 2;\n \n@@ -28,24 +28,27 @@\n return 1;\n }\n \n- unsigned char stack[2*d * (h-k-1)*n];\n- unsigned char stacklevels[2*d * (h-k-1)];\n- unsigned char auth[2*d * h*n];\n- unsigned char keep[2*d * (h >> 1)*n];\n- treehash_inst treehash[2*d * (h-k)];\n- unsigned char th_nodes[2*d * (h-k)*n];\n+ unsigned int tree_h = h \/ d;\n+\n+ \/\/ stack needs to be larger than regular (H-K-1), since we re-use for 'next'\n+ unsigned char stack[2*d * (tree_h + 1)*n];\n+ unsigned char stacklevels[2*d * (tree_h + 1)*n];\n+ unsigned char auth[2*d * tree_h*n];\n+ unsigned char keep[2*d * (tree_h >> 1)*n];\n+ treehash_inst treehash[2*d * (tree_h-k)];\n+ unsigned char th_nodes[2*d * (tree_h-k)*n];\n unsigned char retain[2*d * ((1 << k) - k - 1)*n];\n unsigned char wots_sigs[d * params->xmss_par.wots_par.keysize];\n bds_state states[2*d]; \/\/ first d are 'regular' states, second d are 'next'\n \n for (i = 0; i < 2*d; i++) {\n- for(j=0;j<h-k;j++)\n- treehash[i*(h-k) + j].node = th_nodes + (i*(h-k) + j) * n;\n+ for(j=0;j<tree_h-k;j++)\n+ treehash[i*(tree_h-k) + j].node = th_nodes + (i*(tree_h-k) + j) * n;\n xmss_set_bds_state(states + i,\n- stack + i*(h-k-1)*n, 0, stacklevels + i*(h-k-1),\n- auth + i*h*n,\n- keep + i*(h >> 1)*n,\n- treehash + i*(h-k),\n+ stack + i*(tree_h + 1)*n, 0, stacklevels + i*(tree_h + 1),\n+ auth + i*tree_h*n,\n+ keep + i*(tree_h >> 1)*n,\n+ treehash + i*(tree_h-k),\n retain + i*((1 << k) - k - 1)*n,\n 0\n );\n"} {"commit":"d8b2f93ad221264bb3f8847412dcc1cfd58d0a34","subject":"Use project local usb.h","message":"Use project local usb.h\n","repos":"aethaniel\/CMSIS-DAP,sg-\/DAPLink,mesheven\/CMSIS-DAP-old,ongjohn\/CMSIS-DAP,NordicSemiconductor\/CMSIS-DAP,google\/DAPLink-port,NordicSemiconductor\/CMSIS-DAP,I-SYST\/CMSIS-DAP_IDAP-Link,sg-\/CMSIS-DAP,mesheven\/CMSIS-DAP-old,xiongyihui\/CMSIS-DAP,mesheven\/CMSIS-DAP,cedar-renjun\/CMSIS-DAP,mesheven\/CMSIS-DAP,cedar-renjun\/CMSIS-DAP,linino\/CMSIS-DAP,analogdevicesinc\/CMSIS-DAP,I-SYST\/CMSIS-DAP_IDAP-Link,google\/DAPLink-port,linino\/CMSIS-DAP,aethaniel\/CMSIS-DAP,sg-\/CMSIS-DAP,google\/DAPLink-port,rosterloh\/CMSIS-DAP,sg-\/DAPLink,embeddedartists\/CMSIS-DAP,sg-\/CMSIS-DAP,I-SYST\/CMSIS-DAP_IDAP-Link,0xc0170\/CMSIS-DAP,micromint\/CMSIS-DAP-lpc43xx,stevew817\/CMSIS-DAP,xiongyihui\/CMSIS-DAP,0xc0170\/CMSIS-DAP,ongjohn\/CMSIS-DAP,aethaniel\/CMSIS-DAP,rosterloh\/CMSIS-DAP,google\/DAPLink-port,c1728p9\/CMSIS-DAP,rosterloh\/CMSIS-DAP,NordicSemiconductor\/CMSIS-DAP,flyhung\/CMSIS-DAP,analogdevicesinc\/CMSIS-DAP,sg-\/DAPLink,0xc0170\/CMSIS-DAP,flyhung\/CMSIS-DAP,xiongyihui\/CMSIS-DAP,mesheven\/CMSIS-DAP,embeddedartists\/CMSIS-DAP,mesheven\/CMSIS-DAP-old,stevew817\/CMSIS-DAP,c1728p9\/CMSIS-DAP,cedar-renjun\/CMSIS-DAP,ongjohn\/CMSIS-DAP,micromint\/CMSIS-DAP-lpc43xx,micromint\/CMSIS-DAP-lpc43xx,analogdevicesinc\/CMSIS-DAP,linino\/CMSIS-DAP,stevew817\/CMSIS-DAP,flyhung\/CMSIS-DAP,embeddedartists\/CMSIS-DAP,c1728p9\/CMSIS-DAP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- interface\/Common\/src\/usbd_user_hid.c\n+++ interface\/Common\/src\/usbd_user_hid.c\n@@ -16,7 +16,7 @@\n #include <string.h>\n #include <RTL.h>\n #include <rl_usb.h>\n-#include <..\\..\\RL\\USB\\INC\\usb.h>\n+#include <usb.h>\n #define __NO_USB_LIB_C\n #include \"usb_config.c\"\n #include \"DAP_config.h\"\n"} {"commit":"11487c71b494f720d477ea4c6adb61517b814306","subject":"Rename some global symbols defined by glu's libtess which conflict with the WebKit implementation. #define them with a prefix, as we did with the main entry points.","message":"Rename some global symbols defined by glu's libtess which conflict with the\nWebKit implementation. #define them with a prefix, as we did with the main\nentry points.\n\nReview URL: http:\/\/codereview.appspot.com\/4551079\/\n\n\n","repos":"csulmone\/skia,csulmone\/skia,csulmone\/skia,csulmone\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- third_party\/glu\/gluos.h\n+++ third_party\/glu\/gluos.h\n@@ -54,6 +54,13 @@\n #define gluTessEndContour Sk_gluTessEndContour\n #define gluTessEndPolygon Sk_gluTessEndPolygon\n \n+#define __gl_noBeginData Sk__gl_noBeginData\n+#define __gl_noEdgeFlagData Sk__gl_noEdgeFlagData\n+#define __gl_noVertexData Sk__gl_noVertexData\n+#define __gl_noEndData Sk__gl_noEndData\n+#define __gl_noErrorData Sk__gl_noErrorData\n+#define __gl_noCombineData Sk__gl_noCombineData\n+\n #undef MIN\n #undef MAX\n \n"} {"commit":"c0c152b727eb5cccb0e6ee75fc47ffd18d16d04c","subject":"Reenable adapter validation","message":"Reenable adapter validation\n\nSummary: Partially reenable adapter validation that was temporarily disabled to fix build failures. `less` is excluded from validation because not all adapters\/adapted types provide it.\n\nReviewed By: yfeldblum\n\nDifferential Revision: D31384605\n\nfbshipit-source-id: 0cc4825f973beecb66ad77397374f207800fa69b\n","repos":"facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift,facebook\/fbthrift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- thrift\/lib\/cpp2\/Adapt.h\n+++ thrift\/lib\/cpp2\/Adapt.h\n@@ -258,17 +258,17 @@\n const auto adapted = AdaptedT();\n equal<Adapter>(adapted, adapted);\n not_equal<Adapter>(adapted, adapted);\n- less<Adapter>(adapted, adapted);\n+ \/\/ less and hash are not validated because not all adapters provide it.\n }\n \n template <typename Adapter, typename ThriftT>\n void validateAdapter() {\n- \/\/ validate<Adapter, adapted_t<Adapter, ThriftT>>();\n+ validate<Adapter, adapted_t<Adapter, ThriftT>>();\n }\n \n template <typename Adapter, int16_t FieldID, typename ThriftT, typename Struct>\n void validateFieldAdapter() {\n- \/\/ validate<Adapter, adapted_field_t<Adapter, FieldID, ThriftT, Struct>>();\n+ validate<Adapter, adapted_field_t<Adapter, FieldID, ThriftT, Struct>>();\n }\n \n } \/\/ namespace adapt_detail\n"} {"commit":"8b3b5a3e40717d0a106d649ea84034c1070edf78","subject":"initialize error related variables in grn_ctx.","message":"initialize error related variables in grn_ctx.\n\nReported by @tomotaka_ito. Thanks!!!\n","repos":"myokoym\/groonga,groonga\/groonga,kenhys\/groonga,komainu8\/groonga,redfigure\/groonga,myokoym\/groonga,groonga\/groonga,myokoym\/groonga,cosmo0920\/groonga,redfigure\/groonga,komainu8\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,naoa\/groonga,groonga\/groonga,groonga\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,kenhys\/groonga,komainu8\/groonga,kenhys\/groonga,kenhys\/groonga,redfigure\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,myokoym\/groonga,groonga\/groonga,redfigure\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,kenhys\/groonga,kenhys\/groonga,cosmo0920\/groonga,komainu8\/groonga,komainu8\/groonga,myokoym\/groonga,naoa\/groonga,redfigure\/groonga,groonga\/groonga,naoa\/groonga,cosmo0920\/groonga,redfigure\/groonga,komainu8\/groonga,naoa\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,redfigure\/groonga,cosmo0920\/groonga,myokoym\/groonga,kenhys\/groonga,cosmo0920\/groonga,groonga\/groonga,redfigure\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/ctx.c\n+++ lib\/ctx.c\n@@ -549,6 +549,9 @@\n grn_gctx.next->prev = ctx;\n grn_gctx.next = ctx;\n CRITICAL_SECTION_LEAVE(grn_glock);\n+ ctx->errline = 0;\n+ ctx->errfile = \"\";\n+ ctx->errfunc = \"\";\n ctx->trace[0] = NULL;\n ctx->errbuf[0] = '\\0';\n return ctx->rc;\n"} {"commit":"18d1490b40127149eae55e3b6875772a1cf204d9","subject":"Remove unused variables","message":"Remove unused variables\n","repos":"redfigure\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,cosmo0920\/groonga,groonga\/groonga,kenhys\/groonga,komainu8\/groonga,groonga\/groonga,redfigure\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,kenhys\/groonga,myokoym\/groonga,redfigure\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,naoa\/groonga,komainu8\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,myokoym\/groonga,redfigure\/groonga,myokoym\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,cosmo0920\/groonga,naoa\/groonga,myokoym\/groonga,groonga\/groonga,kenhys\/groonga,redfigure\/groonga,myokoym\/groonga,groonga\/groonga,komainu8\/groonga,kenhys\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,komainu8\/groonga,groonga\/groonga,myokoym\/groonga,cosmo0920\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,kenhys\/groonga,myokoym\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,naoa\/groonga,naoa\/groonga,redfigure\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/geo.c\n+++ lib\/geo.c\n@@ -1993,8 +1993,6 @@\n {\n double distance;\n double slope, intercept, longitude_delta, latitude_delta;\n- double intercept_edge;\n- double first_longitude, first_latitude, third_longitude, third_latitude;\n \n longitude_delta = lng2 - lng1;\n latitude_delta = lat2 - lat1;\n"} {"commit":"2dcb22b346be7b7b7e630a8970d69cf3f1111ec1","subject":"idr: fix backtrack logic in idr_remove_all","message":"idr: fix backtrack logic in idr_remove_all\n\nCurrently idr_remove_all will fail with a use after free error if\nidr::layers is bigger than 2, which on 32 bit systems corresponds to items\nmore than 1024. This is due to stepping back too many levels during\nbacktracking. For simplicity let's assume that IDR_BITS=1 -> we have 2\nnodes at each level below the root node and each leaf node stores two IDs.\n (In reality for 32 bit systems IDR_BITS=5, with 32 nodes at each sub-root\nlevel and 32 IDs in each leaf node). The sequence of freeing the nodes at\nthe moment is as follows:\n\nlayer\n1 -> a(7)\n2 -> b(3) c(5)\n3 -> d(1) e(2) f(4) g(6)\n\nUntil step 4 things go fine, but then node c is freed, whereas node g\nshould be freed first. Since node c contains the pointer to node g we'll\nhave a use after free error at step 6.\n\nHow many levels we step back after visiting the leaf nodes is currently\ndetermined by the msb of the id we are currently visiting:\n\nStep\n1. node d with IDs 0,1 is freed, current ID is advanced to 2.\n msb of the current ID bit 1. This means we need to step back\n 1 level to node b and take the next sibling, node e.\n2-3. node e with IDs 2,3 is freed, current ID is 4, msb is bit 2.\n This means we need to step back 2 levels to node a, freeing\n node b on the way.\n4-5. node f with IDs 4,5 is freed, current ID is 6, msb is still\n bit 2. This means we again need to step back 2 levels to node\n a and free c on the way.\n6. We should visit node g, but its pointer is not available as\n node c was freed.\n\nThe fix changes how we determine the number of levels to step back.\nInstead of deducting this merely from the msb of the current ID, we should\nreally check if advancing the ID causes an overflow to a bit position\ncorresponding to a given layer. In the above example overflow from bit 0\nto bit 1 should mean stepping back 1 level. Overflow from bit 1 to bit 2\nshould mean stepping back 2 levels and so on.\n\nThe fix was tested with IDs up to 1 << 20, which corresponds to 4 layers\non 32 bit systems.\n\nSigned-off-by: Imre Deak <fbd5edba1988036c8923f0cca0cce6ac4811db29@nokia.com>\nReviewed-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nCc: Eric Paris <b0b36e3cd9ea4e5739ff430a3056fabf2fdb0376@redhat.com>\nCc: \"Paul E. McKenney\" <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\t\t[2.6.34.1]\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/idr.c\n+++ lib\/idr.c\n@@ -445,6 +445,7 @@\n void idr_remove_all(struct idr *idp)\n {\n \tint n, id, max;\n+\tint bt_mask;\n \tstruct idr_layer *p;\n \tstruct idr_layer *pa[MAX_LEVEL];\n \tstruct idr_layer **paa = &pa[0];\n@@ -462,8 +463,10 @@\n \t\t\tp = p->ary[(id >> n) & IDR_MASK];\n \t\t}\n \n+\t\tbt_mask = id;\n \t\tid += 1 << n;\n-\t\twhile (n < fls(id)) {\n+\t\t\/* Get the highest bit that the above add changed from 0->1. *\/\n+\t\twhile (n < fls(id ^ bt_mask)) {\n \t\t\tif (p)\n \t\t\t\tfree_layer(p);\n \t\t\tn += IDR_BITS;\n"} {"commit":"e34716cc3f54d3fca1cbd797e8af003cd3a63bc8","subject":"Preserve currentOffset==0 When Possible","message":"Preserve currentOffset==0 When Possible\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.c\n+++ lib\/lz4.c\n@@ -846,7 +846,9 @@\n } else {\n const tableType_t tableType = (sizeof(void*)==8) ? byU32 : byPtr;\n LZ4_resetTable(ctx, inputSize, tableType, noDict);\n- ctx->currentOffset += 64 KB;\n+ if (ctx->currentOffset) {\n+ ctx->currentOffset += 64 KB;\n+ }\n return LZ4_compress_generic(ctx, source, dest, inputSize, 0, notLimited, tableType, noDict, noDictIssue, acceleration);\n }\n } else {\n@@ -861,7 +863,9 @@\n } else {\n const tableType_t tableType = (sizeof(void*)==8) ? byU32 : byPtr;\n LZ4_resetTable(ctx, inputSize, tableType, noDict);\n- ctx->currentOffset += 64 KB;\n+ if (ctx->currentOffset) {\n+ ctx->currentOffset += 64 KB;\n+ }\n return LZ4_compress_generic(ctx, source, dest, inputSize, maxOutputSize, limitedOutput, tableType, noDict, noDictIssue, acceleration);\n }\n }\n"} {"commit":"26e7635a0e3898bafb9e2299b8c95dd571ebe7b1","subject":"Eliminate optimize attribute warning with clang on PPC64LE","message":"Eliminate optimize attribute warning with clang on PPC64LE\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.c\n+++ lib\/lz4.c\n@@ -143,7 +143,7 @@\n * and also LZ4_wildCopy is forcibly inlined, so that the O2 attribute\n * of LZ4_wildCopy does not affect the compression speed.\n *\/\n-#if defined(__PPC64__) && defined(__LITTLE_ENDIAN__) && defined(__GNUC__)\n+#if defined(__PPC64__) && defined(__LITTLE_ENDIAN__) && defined(__GNUC__) && !defined(__clang__)\n # define LZ4_FORCE_O2_GCC_PPC64LE __attribute__((optimize(\"O2\")))\n # define LZ4_FORCE_O2_INLINE_GCC_PPC64LE __attribute__((optimize(\"O2\"))) LZ4_FORCE_INLINE\n #else\n"} {"commit":"06110e5ea0dcd1580ccc748a21b04deba86946ae","subject":"- jbj: remove internal debugging cruft.","message":"- jbj: remove internal debugging cruft.\n","repos":"devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/psm.c\n+++ lib\/psm.c\n@@ -1016,9 +1016,6 @@\n }\n \n \/*@unchecked@*\/\n-static int _jbj = 0;\n-\n-\/*@unchecked@*\/\n static rpmTag _trigger_tag;\n \n \/**\n@@ -1069,9 +1066,6 @@\n }\n arg1 += psm->countCorrection;\n \n-if (_jbj)\n-fprintf(stderr, \"=== handleOneTrigger(%p) source %s trigger %s\\n\", psm, sourceName, triggerName);\n-\n Tds = rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem);\n if (Tds == NULL)\n \tgoto exit;\n@@ -1216,7 +1210,6 @@\n \txx = argvAdd(&psm->Tpats, t);\n }\n keys = argvFree(keys);\n-if (_jbj && psm->Tpats != NULL) argvPrint(\"trigger patterns\", psm->Tpats, NULL);\n return 0;\n }\n \n@@ -1260,8 +1253,6 @@\n \t\/* XXX re-add the pesky trailing '\/' to dirnames. *\/\n \tdepName[nName] = (tagno == RPMTAG_DIRNAMES ? '\/' : '\\0');\n \tdepName[nName+1] = '\\0';\n-if (_jbj) \n-fprintf(stderr, \"*** looking for trigger \\\"%s\\\"\\n\", depName);\n \n \tif (depName[0] == '\/' && psm->Tmires != NULL) {\n \t miRE mire;\n@@ -1276,8 +1267,6 @@\n \t\t}\n \t\tif (mireRegexec(mire, depName, 0) < 0)\n \t\t continue;\n-if (_jbj)\n-fprintf(stderr, \"=== %p[%d] %s matched %s\\n\", psm->Tpats, j, pattern, depName);\n \n \t\t\/* Reset the primary retrieval key to the pattern. *\/\n \t\tdepName = _free(depName);\n@@ -1288,8 +1277,6 @@\n \n \t\/* Retrieve triggered header(s) by key. *\/\n \tmi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, depName, 0);\n-if (_jbj)\n-fprintf(stderr, \"=== runTriggersLoop(%p) sense 0x%x %s depName %s mi %p\\n\", psm, psm->sense, tagName(tagno),depName, mi);\n \n \tnvals = argiCount(instances);\n \tvals = argiData(instances);\n@@ -1471,9 +1458,6 @@\n \t}\n \n \tmi = rpmtsInitIterator(ts, tagno, Name, 0);\n-\n-if (_jbj)\n-fprintf(stderr, \"=== runImmedTriggers(%p) indices[%d] %d sense 0x%x %s N %s mi %p\\n\", psm, i, Ihe->p.ui32p[i], psm->sense, tagName(tagno), Name, mi);\n \n \t\/* Don't retrieve headers that have already been processed. *\/\n \tnvals = argiCount(instances);\n"} {"commit":"0738d9b9063fb953038299911a1a757e89f894dc","subject":"Remove not needed NULL check in sdp_gen_pdu","message":"Remove not needed NULL check in sdp_gen_pdu\n","repos":"silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,mapfau\/bluez,ComputeCycles\/bluez,mapfau\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/sdp.c\n+++ lib\/sdp.c\n@@ -899,7 +899,7 @@\n \t}\n \n \tif (!is_seq && !is_alt) {\n-\t\tif (src && buf && buf->buf_size >= buf->data_size + data_size) {\n+\t\tif (src && buf->buf_size >= buf->data_size + data_size) {\n \t\t\tmemcpy(buf->data + buf->data_size, src, data_size);\n \t\t\tbuf->data_size += data_size;\n \t\t} else if (dtd != SDP_DATA_NIL) {\n"} {"commit":"2ae780b0ab1e9b6ea0377d21e43216495f486ac7","subject":"Fixed a bug in normalize_utf8. missing initialization of a variable.","message":"Fixed a bug in normalize_utf8. missing initialization of a variable.\n","repos":"hiroyuki-sato\/groonga,redfigure\/groonga,komainu8\/groonga,myokoym\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,cosmo0920\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,kenhys\/groonga,redfigure\/groonga,cosmo0920\/groonga,groonga\/groonga,komainu8\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,myokoym\/groonga,naoa\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,naoa\/groonga,kenhys\/groonga,kenhys\/groonga,cosmo0920\/groonga,kenhys\/groonga,redfigure\/groonga,groonga\/groonga,naoa\/groonga,myokoym\/groonga,komainu8\/groonga,komainu8\/groonga,redfigure\/groonga,naoa\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,redfigure\/groonga,myokoym\/groonga,myokoym\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,myokoym\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,myokoym\/groonga,kenhys\/groonga,myokoym\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/str.c\n+++ lib\/str.c\n@@ -450,10 +450,11 @@\n }\n }\n cp = nstr->ctypes;\n+ d = (unsigned char *)nstr->norm;\n de = d + ds;\n+ d_ = NULL;\n e = (unsigned char *)nstr->orig + size;\n- for (s = s_ = (unsigned char *)nstr->orig,\n- d = (unsigned char *)nstr->norm, d_ = NULL; ; s += ls) {\n+ for (s = s_ = (unsigned char *)nstr->orig; ; s += ls) {\n if (!(ls = grn_str_charlen_utf8(ctx, s, e))) {\n break;\n }\n"} {"commit":"b49a931096117f63abb123544b79487b66da17dd","subject":"export grn_atoll","message":"export grn_atoll\n","repos":"myokoym\/groonga,cosmo0920\/groonga,redfigure\/groonga,naoa\/groonga,myokoym\/groonga,naoa\/groonga,redfigure\/groonga,kenhys\/groonga,cosmo0920\/groonga,redfigure\/groonga,myokoym\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,redfigure\/groonga,komainu8\/groonga,kenhys\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,redfigure\/groonga,komainu8\/groonga,naoa\/groonga,redfigure\/groonga,cosmo0920\/groonga,groonga\/groonga,komainu8\/groonga,groonga\/groonga,komainu8\/groonga,myokoym\/groonga,myokoym\/groonga,myokoym\/groonga,komainu8\/groonga,naoa\/groonga,groonga\/groonga,groonga\/groonga,redfigure\/groonga,kenhys\/groonga,kenhys\/groonga,groonga\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,naoa\/groonga,myokoym\/groonga,cosmo0920\/groonga,naoa\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/str.h\n+++ lib\/str.h\n@@ -58,7 +58,7 @@\n GRN_API int grn_atoi(const char *nptr, const char *end, const char **rest);\n GRN_API unsigned int grn_atoui(const char *nptr, const char *end, const char **rest);\n unsigned int grn_htoui(const char *nptr, const char *end, const char **rest);\n-int64_t grn_atoll(const char *nptr, const char *end, const char **rest);\n+GRN_API int64_t grn_atoll(const char *nptr, const char *end, const char **rest);\n grn_rc grn_itoa(int i, char *p, char *end, char **rest);\n grn_rc grn_lltoa(int64_t i, char *p, char *end, char **rest);\n grn_rc grn_ulltoa(uint64_t i, char *p, char *end, char **rest);\n"} {"commit":"3f0bb15929e78b24315eafb554413e6883ad3cbc","subject":"revert API change to zip_open","message":"revert API change to zip_open\n","repos":"det\/libzip,projedi\/libzip,JanX2\/libzip-git,cysp\/libzip,projedi\/libzip,det\/libzip,projedi\/libzip,det\/libzip,projedi\/libzip,cysp\/libzip,det\/libzip,cysp\/libzip,cysp\/libzip,JanX2\/libzip-git","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/zip.h\n+++ lib\/zip.h\n@@ -2,7 +2,7 @@\n #define _HAD_ZIP_H\n \n \/*\n- $NiH: zip.h,v 1.35.4.1 2004\/03\/20 09:54:03 dillo Exp $\n+ $NiH: zip.h,v 1.35.4.2 2004\/03\/23 17:16:02 dillo Exp $\n \n zip.h -- exported declarations.\n Copyright (C) 1999, 2003 Dieter Baron and Thomas Klausner\n@@ -151,7 +151,7 @@\n const char *zip_get_name(struct zip *, int);\n int zip_get_num_files(struct zip *);\n int zip_name_locate(struct zip *, const char *, int);\n-struct zip *zip_open(const char *, int, int *, int *);\n+struct zip *zip_open(const char *, int, int *);\n int zip_rename(struct zip *, int, const char *);\n int zip_replace(struct zip *, int, zip_read_func, void *, int);\n int zip_replace_data(struct zip *, int, const void *, off_t, int);\n"} {"commit":"433f5c460c4402e1b6a036a3eddbb97b56bd46b4","subject":"Remove unnecessary _USE_MINGW_ANSI_STDIO define","message":"Remove unnecessary _USE_MINGW_ANSI_STDIO define\n","repos":"miles-canfield\/Octen,miles-canfield\/Octen","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- library.c\n+++ library.c\n@@ -1,4 +1,3 @@\n-#define __USE_MINGW_ANSI_STDIO 1\n #include <stdio.h>\n #include \"types.h\"\n #include \"os.h\"\n"} {"commit":"5afefa38c43b0f08caf798050e98a284eec34200","subject":"lksmith: skip dependency processing for ignored","message":"lksmith: skip dependency processing for ignored\n\nSigned-off-by: Colin McCabe <3142ce8a0bdba4a38073365893e6b74f72d9c512@alumni.cmu.edu>\n","repos":"cmccabe\/lksmith,cmccabe\/lksmith","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lksmith.c\n+++ lksmith.c\n@@ -978,47 +978,13 @@\n \treturn 0;\n }\n \n-int lksmith_prelock(const void *ptr, int sleeper)\n-{\n+static void lksmith_prelock_process_depends(struct lksmith_tls *tls,\n+\t\t\tstruct lksmith_lock *lk, const void *ptr)\n+{\n+\tunsigned int i;\n \tconst void *held;\n-\tstruct lksmith_lock *lk, *ak;\n-\tstruct lksmith_tls *tls;\n-\tint ret;\n-\tunsigned int i;\n-\tstruct lksmith_holder *holder = NULL;\n-\n-\ttls = get_or_create_tls();\n-\tif (!tls) {\n-\t\tlksmith_error(ENOMEM, \"lksmith_prelock(lock=%p): failed to \"\n-\t\t\t\"allocate thread-local storage.\\n\", ptr);\n-\t\tret = ENOMEM;\n-\t\tgoto done;\n-\t}\n-\tif (!tls->intercept)\n-\t\treturn 0;\n-\tholder = holder_create(tls);\n-\tif (!holder) {\n-\t\tlksmith_error(ENOMEM, \"lksmith_prelock(lock=%p): failed to \"\n-\t\t\t\"allocate lock holder data.\\n\", ptr);\n-\t\tret = ENOMEM;\n-\t\tgoto done;\n-\t}\n-\tr_pthread_mutex_lock(&g_tree_lock);\n-\tlk = lksmith_find(ptr);\n-\tif (!lk) {\n-\t\t\/* If the lock hasn't been explicitly initialized using\n-\t\t * lksmith_optional_init, we allow it to be recursive.\n-\t\t * It might have been statically initialized with\n-\t\t * PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.\n-\t\t *\/\n-\t\tret = lksmith_insert(ptr, 1, sleeper, &lk);\n-\t\tif (ret) {\n-\t\t\tlksmith_error(ret, \"lksmith_prelock(lock=%p, \"\n-\t\t\t\t\"thread=%s): failed to allocate lock data: \"\n-\t\t\t\t\"error %d: %s\\n\", ptr, tls->name, ret, terror(ret));\n-\t\t\tgoto done_unlock;\n-\t\t}\n-\t}\n+\tstruct lksmith_lock *ak;\n+\n \tg_color++;\n \tfor (i = 0; i < tls->num_held; i++) {\n \t\theld = tls->held[i];\n@@ -1038,8 +1004,7 @@\n \t\t\t\tptr, tls->name);\n \t\t\tcontinue;\n \t\t}\n-\t\tret = lksmith_search(ak, ptr);\n-\t\tif (ret) {\n+\t\tif (lksmith_search(ak, ptr)) {\n \t\t\tlksmith_error(EDEADLK, \"lksmith_prelock(lock=%p, \"\n \t\t\t\t\"thread=%s): lock inversion! This lock \"\n \t\t\t\t\"should have been taken before lock %p, which \"\n@@ -1049,7 +1014,76 @@\n \t\t}\n \t\tlk_add_before(lk, ak);\n \t}\n+}\n+\n+\/**\n+ * Returns true if lksmith_prelock should skip dependency processing.\n+ *\n+ * We search the current backtrace for any element that is in the ignore\n+ * list.\n+ *\/\n+static int should_skip_dependency_processing(struct lksmith_holder *holder)\n+{\n+\tint idx = 0;\n+\tchar *match;\n+\n+\twhile (1) {\n+\t\tconst char *frame = holder->bt_frames[idx++];\n+\t\tif (!frame)\n+\t\t\tbreak;\n+\t\tmatch = bsearch(frame, g_ignored_frames, g_num_ignored_frames,\n+\t\t\t\tsizeof(char*), compare_strings);\n+\t\tif (match) {\n+\t\t\treturn 1;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n+int lksmith_prelock(const void *ptr, int sleeper)\n+{\n+\tstruct lksmith_lock *lk;\n+\tstruct lksmith_tls *tls;\n+\tint ret;\n+\tstruct lksmith_holder *holder = NULL;\n+\n+\ttls = get_or_create_tls();\n+\tif (!tls) {\n+\t\tlksmith_error(ENOMEM, \"lksmith_prelock(lock=%p): failed to \"\n+\t\t\t\"allocate thread-local storage.\\n\", ptr);\n+\t\tret = ENOMEM;\n+\t\tgoto done;\n+\t}\n+\tif (!tls->intercept)\n+\t\treturn 0;\n+\tholder = holder_create(tls);\n+\tif (!holder) {\n+\t\tlksmith_error(ENOMEM, \"lksmith_prelock(lock=%p): failed to \"\n+\t\t\t\"allocate lock holder data.\\n\", ptr);\n+\t\tret = ENOMEM;\n+\t\tgoto done;\n+\t}\n+\tr_pthread_mutex_lock(&g_tree_lock);\n+\tlk = lksmith_find(ptr);\n+\tif (!lk) {\n+\t\t\/* If the lock hasn't been explicitly initialized using\n+\t\t * lksmith_optional_init, we allow it to be recursive.\n+\t\t * It might have been statically initialized with\n+\t\t * PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.\n+\t\t *\/\n+\t\tret = lksmith_insert(ptr, 1, sleeper, &lk);\n+\t\tif (ret) {\n+\t\t\tlksmith_error(ret, \"lksmith_prelock(lock=%p, \"\n+\t\t\t\t\"thread=%s): failed to allocate lock data: \"\n+\t\t\t\t\"error %d: %s\\n\", ptr, tls->name, ret, terror(ret));\n+\t\t\tgoto done_unlock;\n+\t\t}\n+\t}\n+\tif (!should_skip_dependency_processing(holder)) {\n+\t\tlksmith_prelock_process_depends(tls, lk, ptr);\n+\t}\n \tlk_holder_add(lk, holder);\n+\n \tholder = NULL;\n \tret = 0;\n done_unlock:\n"} {"commit":"0075c15946ba4dd18c5ca4fd5d2365dfbdda5456","subject":"update comment docs to describe start_timestamp option","message":"update comment docs to describe start_timestamp option\n\ngit-svn-id: d98835ac2581dc8b7b532831eaf73f8a09cb9b7b@675 989093bb-e83e-0410-a25a-9184cbcad8d0\n","repos":"DougFirErickson\/lcm,DougFirErickson\/lcm,kyonifer\/lcm,adeschamps\/lcm,adeschamps\/lcm,vooon\/lcm-vala,adeschamps\/lcm,kyonifer\/lcm,DougFirErickson\/lcm,lcm-proj\/lcm,DougFirErickson\/lcm,adeschamps\/lcm,lcm-proj\/lcm,kyonifer\/lcm,bluesquall\/lcm,bluesquall\/lcm,andybarry\/lcm,lcm-proj\/lcm,andybarry\/lcm,bluesquall\/lcm,lcm-proj\/lcm,vooon\/lcm-vala,vooon\/lcm-vala,andybarry\/lcm,vooon\/lcm-vala,DougFirErickson\/lcm,adeschamps\/lcm,lcm-proj\/lcm,lcm-proj\/lcm,andybarry\/lcm,vooon\/lcm-vala,vooon\/lcm-vala,andybarry\/lcm,andybarry\/lcm,andybarry\/lcm,vooon\/lcm-vala,adeschamps\/lcm,adeschamps\/lcm,DougFirErickson\/lcm,bluesquall\/lcm,lcm-proj\/lcm,kyonifer\/lcm,bluesquall\/lcm,DougFirErickson\/lcm,bluesquall\/lcm,andybarry\/lcm,DougFirErickson\/lcm,lcm-proj\/lcm,kyonifer\/lcm,kyonifer\/lcm,kyonifer\/lcm,adeschamps\/lcm,bluesquall\/lcm,vooon\/lcm-vala","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lcm\/lcm.h\n+++ lcm\/lcm.h\n@@ -147,6 +147,13 @@\n mode = r | w\n Specifies the log file mode. Defaults to 'r'\n \n+ start_timestamp = USEC\n+ Seeks to USEC microseconds in the logfile, where USEC is given in\n+ microseconds since 00:00:00 UTC on 1 January 1970. If USEC is\n+ before the first event, then playback begins at the start of the\n+ log file. If it is after the last event, calls to lcm_handle will\n+ return -1.\n+\n examples:\n \"file:\/\/\/home\/albert\/path\/to\/logfile\"\n Loads the file \"\/home\/albert\/path\/to\/logfile\" as an LCM event\n"} {"commit":"df18b948cc5c43d4626dd61a4b97c4bd72d294a0","subject":"\u589e\u52a0\u65e5\u5fd7\u8bfb\u53d6\u51fd\u6570\u548crelease slot\u5b9e\u73b0","message":"\u589e\u52a0\u65e5\u5fd7\u8bfb\u53d6\u51fd\u6570\u548crelease slot\u5b9e\u73b0\n","repos":"yuanrongxi\/wiredtiger,yuanrongxi\/wiredtiger","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- log\/log.c\n+++ log\/log.c\n@@ -737,5 +737,252 @@\n \treturn ret;\n }\n \n-\n-\n+\/*release\u04bblog\u04e6slot \u023b\u1f6bslot buffer\u0435\u0434\ubd7d\u04e6\u013cpage cache\n+ *\u023b\u013csync\u05be*\/\n+static int __log_release(WT_SESSION_IMPL* session, WT_LOGSLOT* slot, int* freep)\n+{\n+\tWT_CONNECTION_IMPL *conn;\n+\tWT_DECL_RET;\n+\tWT_LOG *log;\n+\tWT_LSN sync_lsn;\n+\tsize_t write_size;\n+\tint locked, yield_count;\n+\tWT_DECL_SPINLOCK_ID(id);\t\n+\n+\tconn = S2C(session);\n+\tlog = conn->log;\n+\tlocked = 0;\n+\tyield_count = 0;\n+\t*freep = 1;\n+\n+\t\/*slot\u013b\u0435log record\u0434\ubd7d\u04e6\u013c*\/\n+\tif(F_ISSET(slot, SLOT_BUFFERED)){\n+\t\twrite_size = (size_t)(slot->slot_end_lsn.offset - slot->slot_start_offset);\n+\t\tWT_ERR(__wt_write(session, slot->slot_fh, slot->slot_start_offset, write_size, slot->slot_buf.mem));\n+\t}\n+\n+\t\/*slot\u04bbdummy slotbuffer\u0775slot,slotslot pool*\/\n+\tif(F_ISSET(slot, SLOT_BUFFERED) && !F_ISSET(slot, SLOT_SYNC | SLOT_SYNC_DIR)){\n+\t\t*freep = 0;\n+\t\tslot->slot_state = WT_LOG_SLOT_WRITTEN;\n+\n+\t\tWT_ERR(__wt_cond_signal(session, conn->log_wrlsn_cond));\n+\n+\t\tgoto done;\n+\t}\n+\n+\t\/*\u07b8\u0373\u03e2*\/\n+\tWT_STAT_FAST_CONN_INCR(session, log_release_write_lsn);\n+\t\/*\u0436write lsn\u01f7\ufd7drelease lsn\u03bb\u00e3\ufd7dwrite_lsn\u0138*\/\n+\twhile (LOG_CMP(&log->write_lsn, &slot->slot_release_lsn) != 0) {\n+\t\tif (++yield_count < 1000)\n+\t\t\t__wt_yield();\n+\t\telse\n+\t\t\tWT_ERR(__wt_cond_wait(session, log->log_write_cond, 200));\n+\t}\n+\n+\tlog->write_lsn = slot->slot_end_lsn;\n+\t\/*log write lsn\u02f8\u00a3\u00f5log_write_cond\u07f3\u00bdwrite lsn\u0436*\/\n+\tWT_ERR(__wt_cond_signal(session, log->log_write_cond));\n+\n+\t\/*slot\u06b9\u0631\u013c\u0131\u02be\u0368\u05aa\u04e6\u0234\u07f3\u033d\u013c\u0631*\/\n+\tif (F_ISSET(slot, SLOT_CLOSEFH))\n+\t\tWT_ERR(__wt_cond_signal(session, conn->log_close_cond));\n+\n+\twhile (F_ISSET(slot, SLOT_SYNC | SLOT_SYNC_DIR)){\n+\t\t\/*syncfile\u0421slot->slot_end_lsn.file\u02beslot\u04e6\u05be\u013c\u00fbsync(\u02e2end_lsn\u04e6\u013c)\u0435\u0234*\/\n+\t\tif (log->sync_lsn.file < slot->slot_end_lsn.file || __wt_spin_trylock(session, &log->log_sync_lock, &id) != 0) {\n+\t\t\t\tWT_ERR(__wt_cond_wait(session, log->log_sync_cond, 10000));\n+\t\t\t\tcontinue;\n+\t\t}\n+\t\t\/*\u03bb\u00e3\u07f3\u033blog_sync_lock,\u053dsync*\/\n+\t\tlocked = 1;\n+\n+\t\tsync_lsn = slot->slot_end_lsn;\n+\n+\t\t\/*\u02e2log dir path\u013c*\/\n+\t\tif (F_ISSET(slot, SLOT_SYNC_DIR) &&(log->sync_dir_lsn.file < sync_lsn.file)) {\n+\t\t\tWT_ASSERT(session, log->log_dir_fh != NULL);\n+\t\t\tWT_ERR(__wt_verbose(session, WT_VERB_LOG, \"log_release: sync directory %s\", log->log_dir_fh->name));\n+\t\t\tWT_ERR(__wt_directory_sync_fh(session, log->log_dir_fh));\n+\t\t\tlog->sync_dir_lsn = sync_lsn;\n+\t\t\tWT_STAT_FAST_CONN_INCR(session, log_sync_dir);\n+\t\t}\n+\n+\t\t\/*\u02e2\u05be\u013c*\/\n+\t\tif (F_ISSET(slot, SLOT_SYNC) && LOG_CMP(&log->sync_lsn, &slot->slot_end_lsn) < 0) {\n+\t\t\tWT_ERR(__wt_verbose(session, WT_VERB_LOG, \"log_release: sync log %s\", log->log_fh->name));\n+\t\t\tWT_STAT_FAST_CONN_INCR(session, log_sync);\n+\t\t\tWT_ERR(__wt_fsync(session, log->log_fh));\n+\t\t\t\/*sync_lsn\u0368\u05aa\u07f3log->sync_lsn\u02f8\u0131\u48ec\u00bd\u0431\u0236\u0436*\/\n+\t\t\tlog->sync_lsn = sync_lsn;\n+\t\t\tWT_ERR(__wt_cond_signal(session, log->log_sync_cond));\n+\t\t}\n+\n+\t\t\/*slotSYNC\u02b6*\/\n+\t\tF_CLR(slot, SLOT_SYNC | SLOT_SYNC_DIR);\n+\t\t\/*\u0377sync spin lock*\/\n+\t\tlocked = 0;\n+\t\t__wt_spin_unlock(session, &log->log_sync_lock);\n+\t\t\/*\u05b9\u07f3\u00b0SLOT_SYNC\u00fb*\/\n+\t\tbreak;\n+\t}\n+err:\n+\tif(locked)\n+\t\t__wt_spin_unlock(session, &log->log_sync_lock);\n+\n+\t\/*err,sloterror\u05b5*\/\n+\tif (ret != 0 && slot->slot_error == 0)\n+\t\tslot->slot_error = ret;\n+\n+done:\n+\treturn ret;\n+}\n+\n+\/*\u03aa\u05besession\u04bb\u00b5\u05be\u013c\u05be\u013c\u0377\u03e2\u0434\ubd7d\u05be\u013c*\/\n+int __wt_log_newfile(WT_SESSION_IMPL *session, int conn_create, int *created)\n+{\n+\tWT_CONNECTION_IMPL *conn;\n+\tWT_DECL_RET;\n+\tWT_LOG *log;\n+\tWT_LSN end_lsn;\n+\tint create_log;\n+\n+\tconn = S2C(session);\n+\tlog = conn->log;\n+\tcreate_log = 1;\n+\t\n+\t\/*\u0234__log_close_server\u07f3\u5eaflog_close_fh\u0139\u0631\u0263\u03aa\u00bd\u00b5\u05be\u013c\u02b9\u00f5\n+\t *\u05be\u013c\u06b1\u0434\u04bb\u04aa\u0234\u0434*\/\n+\twhile(log->log_close_fh != NULL){\n+\t\tWT_STAT_FAST_CONN_INCR(session, log_close_yields);\n+\t\t__wt_yield();\n+\t}\n+\tlog->log_close_fh = log->log_fh;\n+\tlog->fileid++;\n+\n+\tret = 0;\n+\t\/*\u0524\u0237\u04bb\u05be\u013c\u013f\u013f\u01fc\u04ff\u013c\u013d*\/\n+\tif(conn->log_prealloc){\n+\t\tret = __log_alloc_prealloc(session, log->fileid);\n+\t\t\/*\u0635ret = 0, \u02belog->fileid\u04e6\u013c\u047e\u07f3\u0334*\/\n+\t\tif (ret == 0)\n+\t\t\tcreate_log = 0;\n+\n+\t\t\/**\/\n+\t\tif (ret != 0 && ret != WT_NOTFOUND)\n+\t\t\treturn ret;\n+\t}\n+\n+\t\/*\u00fb\u0524\u013c\u00b4\u05be\u013c\u0377\u03e2\u0434\ubd7d\u00bd\u05be\u013c*\/\n+\tif (create_log && (ret = __wt_log_allocfile(session, log->fileid, WT_LOG_FILENAME, 0)) != 0)\n+\t\treturn ret;\n+\n+\t\/*\u00b4\u05be\u013c*\/\n+\tWT_RET(__log_openfile(session, 0, &log->log_fh, WT_LOG_FILENAME, log->fileid));\n+\n+\t\/*\u01f0\u05bealloc_lsn\u03bb*\/\n+\tlog->alloc_lsn.file = log->fileid;\n+\tlog->alloc_lsn.offset = LOG_FIRST_RECORD;\n+\tend_lsn = log->alloc_lsn;\n+\n+\tif (conn_create) {\n+\t\t\/*\u00bd\u05be*\/\n+\t\tWT_RET(__wt_fsync(session, log->log_fh));\n+\t\tlog->sync_lsn = end_lsn;\n+\t\tlog->write_lsn = end_lsn;\n+\t}\n+\n+\tif (created != NULL)\n+\t\t*created = create_log;\n+\n+\treturn 0;\n+}\n+\n+\/*\u05be\u0221\u04bbredo log\u02b1\u02b9*\/\n+int __wt_log_read(WT_SESSION_IMPL *session, WT_ITEM* record, WT_LSN* lsnp, uint32_t flags)\n+{\n+\tWT_DECL_ITEM(uncitem);\n+\tWT_DECL_RET;\n+\tWT_LOG_RECORD *logrec;\n+\tWT_ITEM swap;\n+\n+\tWT_ERR(__log_read_internal(session, record, lsnp, flags));\n+\tlogrec = (WT_LOG_RECORD *)record->mem;\n+\n+\t\/*\u05be\u00bc\u01fe\u0479\u0123\u043d\u0479,\u0479\u05be\u02f8\u043e\u04f0\u05be\u0434\u0427\u02a3wiredtiger\u057c\u00f5CPU\u02b1\u053f\u01fd\u05be\u0479\u0221*\/\n+\tif (F_ISSET(logrec, WT_LOG_RECORD_COMPRESSED)) {\n+\t\tWT_ERR(__log_decompress(session, record, &uncitem));\n+\n+\t\tswap = *record;\n+\t\t*record = *uncitem;\n+\t\t*uncitem = swap;\n+\t}\n+err:\n+\t__wt_scr_free(session, &uncitem);\n+\treturn ret;\n+}\n+\n+\/*\u05be\u013c\u0436\u0221lsnp\u05b8\u01ab\u01b3\u04bb\u05belog record*\/\n+static int __log_read_internal(WT_SESSION_IMPL *session, WT_ITEM *record, WT_LSN *lsnp, uint32_t flags)\n+{\n+\tWT_CONNECTION_IMPL *conn;\n+\tWT_DECL_RET;\n+\tWT_FH *log_fh;\n+\tWT_LOG *log;\n+\tWT_LOG_RECORD *logrec;\n+\tuint32_t cksum, rdup_len, reclen;\n+\n+\tWT_UNUSED(flags);\n+\n+\tif (lsnp == NULL || record == NULL)\n+\t\treturn 0;\n+\n+\tconn = S2C(session);\n+\tlog = conn->log;\n+\n+\t\/*lsnp->offset\u04bblog->allocsize\u02bd*\/\n+\tif (lsnp->offset % log->allocsize != 0 || lsnp->file > log->fileid)\n+\t\treturn WT_NOTFOUND;\n+\n+\t\/*\u05be\u013c*\/\n+\tWT_RET(__log_openfile(session, 0, &log_fh, WT_LOG_FILENAME, lsnp->file));\n+\n+\t\/*\u0221log rec,logrec\u0421\u03bb1log->allocsize*\/\n+\tWT_ERR(__wt_buf_init(session, record, log->allocsize));\n+\tWT_ERR(__wt_read(session, log_fh, lsnp->offset, (size_t)log->allocsize, record->mem));\n+\n+\t\/*log rec\u0133*\/\n+\treclen = *(uint32_t *)record->mem;\n+\tif (reclen == 0) {\n+\t\tret = WT_NOTFOUND;\n+\t\tgoto err;\n+\t}\n+\n+\t\/*\u0221logrec\u02a3\u0cbf*\/\n+\tif (reclen > log->allocsize) {\n+\t\trdup_len = __wt_rduppo2(reclen, log->allocsize);\n+\t\tWT_ERR(__wt_buf_grow(session, record, rdup_len));\n+\t\tWT_ERR(__wt_read(session, log_fh, lsnp->offset, (size_t)rdup_len, record->mem));\n+\t}\n+\n+\tlogrec = (WT_LOG_RECORD *)record->mem;\n+\tcksum = logrec->checksum;\n+\tlogrec->checksum = 0;\n+\t\/*check sum*\/\n+\tlogrec->checksum = __wt_cksum(logrec, logrec->len);\n+\tif (logrec->checksum != cksum)\n+\t\tWT_ERR_MSG(session, WT_ERROR, \"log_read: Bad checksum\");\n+\n+\trecord->size = logrec->len;\n+\tWT_STAT_FAST_CONN_INCR(session, log_reads);\n+\n+err:\n+\tWT_TRET(__wt_close(session, &log_fh));\n+\treturn ret;\n+}\n+\n+\n+\n+\n+\n"} {"commit":"6f5853228e81b19ec82d751b850d1dd4686b9fa5","subject":"Fold a long line","message":"Fold a long line\n","repos":"redfigure\/groonga,cosmo0920\/groonga,groonga\/groonga,redfigure\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,naoa\/groonga,groonga\/groonga,redfigure\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,kenhys\/groonga,groonga\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,kenhys\/groonga,naoa\/groonga,redfigure\/groonga,naoa\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,cosmo0920\/groonga,groonga\/groonga,naoa\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,kenhys\/groonga,redfigure\/groonga,groonga\/groonga,komainu8\/groonga,komainu8\/groonga,groonga\/groonga,groonga\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/com.c\n+++ lib\/com.c\n@@ -858,7 +858,14 @@\n }\n }\n } while (rest);\n- GRN_LOG(ctx, GRN_LOG_INFO, \"recv (%lu,%x,%d,%02x,%02x,%04x)\", ntohl(header->size), header->flags, header->proto, header->qtype, header->level, header->status);\n+ GRN_LOG(ctx, GRN_LOG_INFO,\n+ \"recv (%lu,%x,%d,%02x,%02x,%04x)\",\n+ ntohl(header->size),\n+ header->flags,\n+ header->proto,\n+ header->qtype,\n+ header->level,\n+ header->status);\n {\n uint8_t proto = header->proto;\n size_t value_size = ntohl(header->size);\n"} {"commit":"d45c50940d36b630bed1ad6e5de45fc6001a4635","subject":"minor code\/comment cleanup\/","message":"minor code\/comment cleanup\/\n","repos":"sassoftware\/conary,sassoftware\/conary,sassoftware\/conary,sassoftware\/conary,sassoftware\/conary","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/elf.c\n+++ lib\/elf.c\n@@ -547,15 +547,16 @@\n \t return NULL;\n \t}\n \n-\tif (shdr.sh_type == SHT_NOBITS) {\n-\t \/* this section has no data, skip it *\/\n+\t\/* skip any section that isn't DYNAMIC *\/\n+\tif (shdr.sh_type != SHT_DYNAMIC) {\n \t continue;\n \t}\n \n \telf_getshstrndx(elf, &shstrndx);\n \tname = elf_strptr(elf, shstrndx, shdr.sh_name);\n \n-\t\/* skip any section name that isn't .dynamic *\/\n+\t\/* strange. a DYNAMIC section that isn't named .dynamic.\n+\t better skip it *\/\n \tif (strcmp(name, \".dynamic\"))\n \t continue;\n \n"} {"commit":"3c10891fd9bffcc2b17892be02412611f965707f","subject":"Subtract one from gdt size for gdt limit","message":"Subtract one from gdt size for gdt limit\n","repos":"shockkolate\/shockk-os,shockkolate\/shockk-os,shockkolate\/shockk-os","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/gdt.c\n+++ lib\/gdt.c\n@@ -28,7 +28,7 @@\n \n void gdt_init(void)\n {\n-\tpointer.limit = sizeof(struct gdt_entry) * GDT_NUM_ENTRIES;\n+\tpointer.limit = sizeof(struct gdt_entry) * GDT_NUM_ENTRIES - 1;\n \tpointer.base = (uint32_t)&entries;\n \n \tgdt_set_gate(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);\n"} {"commit":"1400d988243df6727bcd12d1eff2233894036906","subject":"Implement norm function","message":"Implement norm function\n\nSigned-off-by: Tushar Pankaj <514568343cdd6c4d7c6bb94cf636e24b01176284@gmail.com>\n","repos":"tpankaj\/hdc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/hdc.c\n+++ lib\/hdc.c\n@@ -1,6 +1,7 @@\n #include \"hdc.h\"\n #include \"klib\/khash.h\"\n #include <stdio.h>\n+#include <math.h>\n \n \/*\n * to implement as static functions:\n@@ -15,7 +16,7 @@\n *\/\n \n \/**\n- * Calculates dot product of OP1 and OP2.\n+ * Calculates the dot product of OP1 and OP2.\n * @param op1 First operand\n * @param op2 Second operand\n * @param len Length of vectors\n@@ -32,11 +33,21 @@\n }\n \n \/**\n- * Calculates entrywise product of OP1 and OP2, and places it in DEST.\n- * @param dest Destination vector\n- * @param op1 First operand\n- * @param op2 Second operand\n- * @param len Length of vectors\n+ * Calculates the norm of VEC.\n+ * @param vec Input vector\n+ * @param len Length of VEC\n+ *\/\n+static double norm(double vec[], size_t len)\n+{\n+ return sqrt(dot_product(vec, vec, length));\n+}\n+\n+\/**\n+ * Calculates the entrywise product of OP1 and OP2, and places it in DEST.\n+ * @param dest Destination vector\n+ * @param op1 First operand\n+ * @param op2 Second operand\n+ * @param len Length of vectors\n *\/\n static void entrywise_product(double dest[], double op1[], double op2[], size_t len)\n {\n"} {"commit":"3afb69cb5572b3c8c898c00880803cf1a49852c4","subject":"idr: fix overflow bug during maximum ID calculation at maximum height","message":"idr: fix overflow bug during maximum ID calculation at maximum height\n\nidr_replace() open-codes the logic to calculate the maximum valid ID\ngiven the height of the idr tree; unfortunately, the open-coded logic\ndoesn't account for the fact that the top layer may have unused slots\nand over-shifts the limit to zero when the tree is at its maximum\nheight.\n\nThe following test code shows it fails to replace the value for\nid=((1<<27)+42):\n\n static void test5(void)\n {\n int id;\n DEFINE_IDR(test_idr);\n #define TEST5_START ((1<<27)+42) \/* use the highest layer *\/\n\n printk(KERN_INFO \"Start test5\\n\");\n id = idr_alloc(&test_idr, (void *)1, TEST5_START, 0, GFP_KERNEL);\n BUG_ON(id != TEST5_START);\n TEST_BUG_ON(idr_replace(&test_idr, (void *)2, TEST5_START) != (void *)1);\n idr_destroy(&test_idr);\n printk(KERN_INFO \"End of test5\\n\");\n }\n\nFix the bug by using idr_max() which correctly takes into account the\nmaximum allowed shift.\n\nsub_alloc() shares the same problem and may incorrectly fail with\n-EAGAIN; however, this bug doesn't affect correct operation because\nidr_get_empty_slot(), which already uses idr_max(), retries with the\nincreased @id in such cases.\n\n[546b05909706652891a87f7bfe385ae147f61f91@kernel.org: Updated patch description.]\nSigned-off-by: Lai Jiangshan <4c9eb49378914b743bdd32292c04df29b820d73e@cn.fujitsu.com>\nAcked-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/idr.c\n+++ lib\/idr.c\n@@ -249,7 +249,7 @@\n \t\t\tid = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;\n \n \t\t\t\/* if already at the top layer, we need to grow *\/\n-\t\t\tif (id >= 1 << (idp->layers * IDR_BITS)) {\n+\t\t\tif (id > idr_max(idp->layers)) {\n \t\t\t\t*starting_id = id;\n \t\t\t\treturn -EAGAIN;\n \t\t\t}\n@@ -811,12 +811,10 @@\n \tif (!p)\n \t\treturn ERR_PTR(-EINVAL);\n \n-\tn = (p->layer+1) * IDR_BITS;\n-\n-\tif (id >= (1 << n))\n+\tif (id > idr_max(p->layer + 1))\n \t\treturn ERR_PTR(-EINVAL);\n \n-\tn -= IDR_BITS;\n+\tn = p->layer * IDR_BITS;\n \twhile ((n > 0) && p) {\n \t\tp = p->ary[(id >> n) & IDR_MASK];\n \t\tn -= IDR_BITS;\n"} {"commit":"232f1e261fce421542e0cf7549f25e3064006bf0","subject":"decompress_generic: drop partial copy check in fast loop","message":"decompress_generic: drop partial copy check in fast loop\n\nWe've already checked that we are more than FASTLOOP_SAFE_DISTANCE\naway from the end, so this branch can never be true, we will have\nalready jumped to the second decode loop.\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.c\n+++ lib\/lz4.c\n@@ -1632,20 +1632,6 @@\n \n \/* partialDecoding : may not respect endBlock parsing restrictions *\/\n assert(op<=oend);\n- if (partialDecoding && (cpy > oend-MATCH_SAFEGUARD_DISTANCE)) {\n- size_t const mlen = MIN(length, (size_t)(oend-op));\n- const BYTE* const matchEnd = match + mlen;\n- BYTE* const copyEnd = op + mlen;\n- if (matchEnd > op) { \/* overlap copy *\/\n- while (op < copyEnd) *op++ = *match++;\n- } else {\n- memcpy(op, match, mlen);\n- }\n- op = copyEnd;\n- if (op==oend) goto decode_done;\n- continue;\n- }\n-\n if (unlikely(offset<16)) {\n if (offset < 8) {\n op[0] = match[0];\n@@ -1858,7 +1844,6 @@\n }\n op = cpy; \/* wildcopy correction *\/\n }\n- decode_done:\n \n \/* end of decoding *\/\n if (endOnInput)\n"} {"commit":"49e83dc067e81fc877a8d951c9fe6aaebb65aaa4","subject":"pat: add the total max key size check","message":"pat: add the total max key size check\n","repos":"naoa\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,groonga\/groonga,cosmo0920\/groonga,naoa\/groonga,cosmo0920\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,kenhys\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,naoa\/groonga,komainu8\/groonga,komainu8\/groonga,groonga\/groonga,naoa\/groonga,naoa\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,naoa\/groonga,groonga\/groonga,komainu8\/groonga,kenhys\/groonga,kenhys\/groonga,naoa\/groonga,cosmo0920\/groonga,komainu8\/groonga,kenhys\/groonga,komainu8\/groonga,kenhys\/groonga,kenhys\/groonga,cosmo0920\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/pat.c\n+++ lib\/pat.c\n@@ -37,6 +37,8 @@\n \n #define GRN_PAT_BIN_KEY 0x70000\n \n+#define GRN_PAT_MAX_TOTAL_KEY_SIZE UINT32_MAX\n+\n typedef struct {\n grn_id lr[2];\n \/*\n@@ -101,6 +103,22 @@\n };\n \n void grn_p_pat_node(grn_ctx *ctx, grn_pat *pat, pat_node *node);\n+\n+\/* error utilities *\/\n+inline static int\n+grn_pat_name(grn_ctx *ctx, grn_pat *pat, char *buffer, int buffer_size)\n+{\n+ int name_size;\n+\n+ if (DB_OBJ(pat)->id == GRN_ID_NIL) {\n+ grn_strcpy(buffer, buffer_size, \"(anonymous)\");\n+ name_size = strlen(buffer);\n+ } else {\n+ name_size = grn_obj_name(ctx, (grn_obj *)pat, buffer, buffer_size);\n+ }\n+\n+ return name_size;\n+}\n \n \/* bit operation *\/\n \n@@ -196,6 +214,20 @@\n uint32_t res, ts;\n \/\/ if (len >= GRN_PAT_SEGMENT_SIZE) { return 0; \/* error *\/ }\n res = pat->header->curr_key;\n+ if (len > GRN_PAT_MAX_TOTAL_KEY_SIZE - res) {\n+ char name[GRN_TABLE_MAX_KEY_SIZE];\n+ int name_size;\n+ name_size = grn_pat_name(ctx, pat, name, GRN_TABLE_MAX_KEY_SIZE);\n+ ERR(GRN_NOT_ENOUGH_SPACE,\n+ \"[pat][key][put] total key size is over: <%.*s>: \"\n+ \"max=%u: current=%u: new key size=%u\",\n+ name_size, name,\n+ GRN_PAT_MAX_TOTAL_KEY_SIZE,\n+ res,\n+ len);\n+ return 0;\n+ }\n+\n ts = (res + len) >> W_OF_KEY_IN_A_SEGMENT;\n if (res >> W_OF_KEY_IN_A_SEGMENT != ts) {\n res = pat->header->curr_key = ts << W_OF_KEY_IN_A_SEGMENT;\n@@ -203,7 +235,18 @@\n {\n uint8_t *dest;\n KEY_AT(pat, res, dest, GRN_TABLE_ADD);\n- if (!dest) { return 0; }\n+ if (!dest) {\n+ char name[GRN_TABLE_MAX_KEY_SIZE];\n+ int name_size;\n+ name_size = grn_pat_name(ctx, pat, name, GRN_TABLE_MAX_KEY_SIZE);\n+ ERR(GRN_NO_MEMORY_AVAILABLE,\n+ \"[pat][key][put] failed to allocate memory for new key: <%.*s>: \"\n+ \"new offset:%u key size:%u\",\n+ name_size, name,\n+ res,\n+ len);\n+ return 0;\n+ }\n grn_memcpy(dest, key, len);\n }\n pat->header->curr_key += len;\n@@ -233,6 +276,9 @@\n } else {\n PAT_IMD_OFF(n);\n n->key = key_put(ctx, pat, key, len);\n+ if (n->key == 0) {\n+ return ctx->rc;\n+ }\n }\n return GRN_SUCCESS;\n }\n@@ -739,7 +785,11 @@\n pat->header->n_garbages--;\n pat->header->garbages[0] = rn->lr[0];\n } else {\n- if (!(rn = pat_node_new(ctx, pat, &r))) { return 0; }\n+ r = pat->header->curr_rec + 1;\n+ rn = pat_get(ctx, pat, r);\n+ if (!rn) { return 0; }\n+ pat->header->curr_rec = r;\n+ pat->header->n_entries++;\n }\n PAT_IMD_OFF(rn);\n PAT_LEN_SET(rn, size);\n@@ -757,8 +807,12 @@\n PAT_LEN_SET(rn, size);\n grn_memcpy(keybuf, key, size);\n } else {\n- if (!(rn = pat_node_new(ctx, pat, &r))) { return 0; }\n- pat_node_set_key(ctx, pat, rn, key, size);\n+ r = pat->header->curr_rec + 1;\n+ rn = pat_get(ctx, pat, r);\n+ if (!rn) { return 0; }\n+ if (!pat_node_set_key(ctx, pat, rn, key, size)) { return 0; }\n+ pat->header->curr_rec = r;\n+ pat->header->n_entries++;\n }\n *lkey = rn->key;\n }\n@@ -867,6 +921,7 @@\n }\n KEY_ENCODE(pat, keybuf, key, key_size);\n r0 = _grn_pat_add(ctx, pat, (uint8_t *)key, key_size, &new, &lkey);\n+ if (ctx->rc) { return GRN_ID_NIL; }\n if (added) { *added = new; }\n if (r0 && (pat->obj.header.flags & GRN_OBJ_KEY_WITH_SIS) &&\n (*((uint8_t *)key) & 0x80)) { \/\/ todo: refine!!\n"} {"commit":"ad840d99c0e354304a906065a479a049f1a00209","subject":"ABI version bumped","message":"ABI version bumped\n\nSigned-off-by: Martin Sustrik <4dd6061be1198639e8b05ce4fd5ead7a0dcaa0f4@250bpm.com>\n","repos":"lsm\/libmill,dailypips\/libmill,sustrik\/libmill,reqshark\/libmill,reqshark\/libmill,dailypips\/libmill,ebfe\/libmill,reqshark\/libmill,jimjag\/mill,lsm\/libmill,linearregression\/libmill,linearregression\/libmill,jimjag\/mill,ebfe\/libmill,sustrik\/libmill,jimjag\/mill,linearregression\/libmill,dailypips\/libmill,ebfe\/libmill,sustrik\/libmill,lsm\/libmill","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libmill.h\n+++ libmill.h\n@@ -42,7 +42,7 @@\n #define MILL_VERSION_CURRENT 9\n \n \/* The latest revision of the current interface. *\/\n-#define MILL_VERSION_REVISION 0\n+#define MILL_VERSION_REVISION 1\n \n \/* How many past interface versions are still supported. *\/\n #define MILL_VERSION_AGE 2\n"} {"commit":"75d6eadf0244693689e290d754a0a674f6b63280","subject":"vm: List build now copies the values of objects given into new objects.","message":"vm: List build now copies the values of objects given into new objects.\n\nThis was done because not doing it resulted in objects acting like pointers\nwhen it made no sense for them to be doing so. For example:\n\no = [10]\no = [o]\n\nBefore this patch, o would become a circular list consisting of itself. This\nis odd, because the object previously held a list of 10.\n\nAfter this patch, o would be [[10]], which makes sense since o was [10], then\nput inside of another list.\n\nWhat this patch does to make o_build_list make new objects to hold the values\nof objects given to it. This keeps objects being circularly ref'd when they\nshouldn't be.\n\nThis isn't a fix for #24, but it addresses a way that objects could be\nincorrectly circularly referenced.\n","repos":"FascinatedBox\/lily,jesserayadkins\/lily,FascinatedBox\/lily,jesserayadkins\/lily,FascinatedBox\/lily,FascinatedBox\/lily,jesserayadkins\/lily","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lily_vm.c\n+++ lily_vm.c\n@@ -471,21 +471,63 @@\n if (!(storage->flags & S_IS_NIL))\n lily_deref_list_val(storage->sig, storage->value.list);\n \n- if (elem_sig->cls->is_refcounted) {\n- for (j = 0;j < num_elems;j++) {\n- if (!(syms[5+j]->flags & S_IS_NIL)) {\n- lv->values[j] = syms[5+j]->value;\n- lv->values[j].generic->refcount++;\n- lv->val_is_nil[j] = 0;\n+ \/* This could be condensed down, but doing it this way improves speed since\n+ the elem_sig won't change over the loop. *\/\n+ if (elem_sig->cls->id != SYM_CLASS_OBJECT) {\n+ if (elem_sig->cls->is_refcounted) {\n+ for (j = 0;j < num_elems;j++) {\n+ if (!(syms[5+j]->flags & S_IS_NIL)) {\n+ lv->values[j] = syms[5+j]->value;\n+ lv->values[j].generic->refcount++;\n+ lv->val_is_nil[j] = 0;\n+ }\n+ else\n+ lv->val_is_nil[j] = 1;\n }\n- else\n- lv->val_is_nil[j] = 1;\n+ }\n+ else {\n+ for (j = 0;j < num_elems;j++) {\n+ if (!(syms[5+j]->flags & S_IS_NIL)) {\n+ lv->values[j] = syms[5+j]->value;\n+ lv->val_is_nil[j] = 0;\n+ }\n+ else\n+ lv->val_is_nil[j] = 1;\n+ }\n }\n }\n else {\n for (j = 0;j < num_elems;j++) {\n if (!(syms[5+j]->flags & S_IS_NIL)) {\n- lv->values[j] = syms[5+j]->value;\n+ \/* Without copying to a separate object:\n+ object o = 10 o = [o]\n+ (o is now a useless circular reference. What?)\n+\n+ With copying to a separate object:\n+ object o = 10 o = [o]\n+ (o is now a list of object, with [0] being 10. *\/\n+ lily_object_val *oval = lily_try_new_object_val();\n+ if (oval == NULL) {\n+ \/* The inner values must be destroyed here, because the\n+ symtab has no linkage for them. *\/\n+ int k;\n+ for (k = 0;k < j;k++) {\n+ if (lv->val_is_nil[k] == 0)\n+ lily_deref_object_val(lv->values[k].object);\n+ }\n+ lily_free(lv->val_is_nil);\n+ lily_free(lv->values);\n+ lily_free(lv);\n+ lily_raise_nomem(vm->raiser);\n+ }\n+ memcpy(oval, syms[5+j]->value.object, sizeof(lily_object_val));\n+ oval->sig->refcount++;\n+ oval->refcount = 1;\n+\n+ if (oval->sig->cls->is_refcounted)\n+ oval->value.generic->refcount++;\n+\n+ lv->values[j].object = oval;\n lv->val_is_nil[j] = 0;\n }\n else\n"} {"commit":"d24f868bbe36cb7129c668f934ee65d0911aff2d","subject":"backend\/drm: fix cursor hotspot not updated","message":"backend\/drm: fix cursor hotspot not updated\n","repos":"swaywm\/wlroots,ascent12\/wlroots,ascent12\/wlroots,swaywm\/wlroots,SirCmpwn\/wlroots","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- backend\/drm\/drm.c\n+++ backend\/drm\/drm.c\n@@ -602,12 +602,25 @@\n \t\twlr_output_transform_invert(output->transform);\n \twlr_box_transform(&hotspot, transform,\n \t\tplane->surf.width, plane->surf.height, &hotspot);\n-\tplane->cursor_hotspot_x = hotspot.x;\n-\tplane->cursor_hotspot_y = hotspot.y;\n+\n+\tif (plane->cursor_hotspot_x != hotspot.x ||\n+\t\t\tplane->cursor_hotspot_y != hotspot.y) {\n+\t\t\/\/ Update cursor hotspot\n+\t\tconn->cursor_x -= hotspot.x - plane->cursor_hotspot_x;\n+\t\tconn->cursor_y -= hotspot.y - plane->cursor_hotspot_y;\n+\t\tplane->cursor_hotspot_x = hotspot.x;\n+\t\tplane->cursor_hotspot_y = hotspot.y;\n+\n+\t\tif (!drm->iface->crtc_move_cursor(drm, conn->crtc, conn->cursor_x,\n+\t\t\t\tconn->cursor_y)) {\n+\t\t\treturn false;\n+\t\t}\n+\n+\t\twlr_output_update_needs_swap(output);\n+\t}\n \n \tif (!update_pixels) {\n-\t\t\/\/ Only update the cursor hotspot\n-\t\twlr_output_update_needs_swap(output);\n+\t\t\/\/ Don't update cursor image\n \t\treturn true;\n \t}\n \n"} {"commit":"9ce3602828743e2f5decf82adc951ee7cab759ff","subject":"Add missing virtual destructor","message":"Add missing virtual destructor\n\nPersistentCognitoIdentityProvider's destructor is not marked virtual and\nit should be.\n\nsee https:\/\/github.com\/aws\/aws-sdk-cpp\/issues\/771\n","repos":"cedral\/aws-sdk-cpp,awslabs\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,cedral\/aws-sdk-cpp,cedral\/aws-sdk-cpp,jt70471\/aws-sdk-cpp,jt70471\/aws-sdk-cpp,aws\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,jt70471\/aws-sdk-cpp,awslabs\/aws-sdk-cpp,aws\/aws-sdk-cpp,jt70471\/aws-sdk-cpp,aws\/aws-sdk-cpp,aws\/aws-sdk-cpp,jt70471\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,awslabs\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,JoyIfBam5\/aws-sdk-cpp,cedral\/aws-sdk-cpp,aws\/aws-sdk-cpp,cedral\/aws-sdk-cpp,cedral\/aws-sdk-cpp,aws\/aws-sdk-cpp,awslabs\/aws-sdk-cpp,jt70471\/aws-sdk-cpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- aws-cpp-sdk-identity-management\/include\/aws\/identity-management\/auth\/PersistentCognitoIdentityProvider.h\n+++ aws-cpp-sdk-identity-management\/include\/aws\/identity-management\/auth\/PersistentCognitoIdentityProvider.h\n@@ -42,6 +42,7 @@\n class AWS_IDENTITY_MANAGEMENT_API PersistentCognitoIdentityProvider\n {\n public:\n+ virtual ~PersistentCognitoIdentityProvider() = default;\n virtual bool HasIdentityId() const = 0;\n virtual bool HasLogins() const = 0;\n virtual Aws::String GetIdentityId() const = 0;\n@@ -102,4 +103,4 @@\n \n typedef PersistentCognitoIdentityProvider_JsonFileImpl DefaultPersistentCognitoIdentityProvider;\n }\n-}+}\n"} {"commit":"330b427c77435a28eb9ad94446edd89d5ee3a922","subject":"Update table packet_out match field.","message":"Update table packet_out match field.\n","repos":"p4lang\/p4c-behavioral,p4lang\/p4c-behavioral,USC-NSL\/p4c-behavioral,p4lang\/p4c-behavioral,USC-NSL\/p4c-behavioral,USC-NSL\/p4c-behavioral","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- p4c_bm\/plugin\/of\/src\/pd_wrappers.c\n+++ p4c_bm\/plugin\/of\/src\/pd_wrappers.c\n@@ -277,7 +277,7 @@\n \/\/ packet_out unicast\n ${p4_pd_prefix}packet_out_match_spec_t packet_out_ms;\n packet_out_ms.fabric_header_packetType = 5;\n- packet_out_ms.fabric_header_cpu_reserved = 1;\n+ packet_out_ms.fabric_header_cpu_reasonCode = 1;\n status |= ${p4_pd_prefix}packet_out_table_add_with_packet_out_unicast (\n P4_PD_SESSION,\n p4_pd_device,\n@@ -288,7 +288,7 @@\n \n \/\/ packet_out multicast\n packet_out_ms.fabric_header_packetType = 5;\n- packet_out_ms.fabric_header_cpu_reserved = 2;\n+ packet_out_ms.fabric_header_cpu_reasonCode = 2;\n \n static uint8_t port_list[PRE_PORT_MAP_ARRAY_SIZE];\n static uint8_t lag_map[PRE_PORT_MAP_ARRAY_SIZE];\n"} {"commit":"a3c4d4dd4bc4de13a62526700c47bbcf8260fc81","subject":"MFC r197867:","message":"MFC r197867:\n\nProperly mark ZFS properties which are not changeable under FreeBSD.\n\nReviewed by:\tpjd\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cddl\/contrib\/opensolaris\/lib\/libzfs\/common\/libzfs_dataset.c\n+++ cddl\/contrib\/opensolaris\/lib\/libzfs\/common\/libzfs_dataset.c\n@@ -1790,9 +1790,14 @@\n \n \t\/* We don't support those properties on FreeBSD. *\/\n \tswitch (prop) {\n+\tcase ZFS_PROP_DEVICES:\n+\tcase ZFS_PROP_ZONED:\n \tcase ZFS_PROP_SHAREISCSI:\n-\tcase ZFS_PROP_DEVICES:\n \tcase ZFS_PROP_ISCSIOPTIONS:\n+\tcase ZFS_PROP_XATTR:\n+\tcase ZFS_PROP_VSCAN:\n+\tcase ZFS_PROP_NBMAND:\n+\tcase ZFS_PROP_SHARESMB:\n \t\t(void) snprintf(errbuf, sizeof (errbuf),\n \t\t \"property '%s' not supported on FreeBSD\", propname);\n \t\tret = zfs_error(hdl, EZFS_PERM, errbuf);\n"} {"commit":"d8d9de05238bbbaa8d48924d27ed81069778e775","subject":"pjsip: Enable pool debug, reduce memory consumption","message":"pjsip: Enable pool debug, reduce memory consumption\n","repos":"Kakadu\/embox,Kefir0192\/embox,Kefir0192\/embox,mike2390\/embox,gzoom13\/embox,mike2390\/embox,embox\/embox,mike2390\/embox,Kakadu\/embox,mike2390\/embox,mike2390\/embox,Kakadu\/embox,embox\/embox,vrxfile\/embox-trik,gzoom13\/embox,mike2390\/embox,embox\/embox,Kefir0192\/embox,Kakadu\/embox,vrxfile\/embox-trik,mike2390\/embox,embox\/embox,Kakadu\/embox,gzoom13\/embox,gzoom13\/embox,vrxfile\/embox-trik,vrxfile\/embox-trik,Kakadu\/embox,vrxfile\/embox-trik,Kefir0192\/embox,Kefir0192\/embox,gzoom13\/embox,vrxfile\/embox-trik,gzoom13\/embox,Kakadu\/embox,vrxfile\/embox-trik,gzoom13\/embox,Kefir0192\/embox,Kefir0192\/embox,embox\/embox,embox\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- third-party\/pjproject\/config_site.h\n+++ third-party\/pjproject\/config_site.h\n@@ -3,6 +3,9 @@\n #define PJ_LOG_USE_STACK_BUFFER 0\n \n #define PJ_LOG_MAX_LEVEL 6\n+\n+\/* disbale pools *\/\n+#define PJ_POOL_DEBUG 1\n \n \/* make PJSUA slim *\/\n #define PJSUA_MAX_ACC 3\n"} {"commit":"cfd257f7c9c84849c80b56dc459c943842270311","subject":"Toward an android build of sync_unit_tests: OWNERS=evan","message":"Toward an android build of sync_unit_tests: OWNERS=evan\n\n\nBUG=None\nTEST=\n\n\nReview URL: http:\/\/codereview.chromium.org\/9234048\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@119398 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"Fireblend\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,axinging\/chromium-crosswalk,ondra-novak\/chromium.src,hujiajie\/pa-chromium,patrickm\/chromium.src,Just-D\/chromium-1,nacl-webkit\/chrome_deps,markYoungH\/chromium.src,axinging\/chromium-crosswalk,anirudhSK\/chromium,crosswalk-project\/chromium-crosswalk-efl,anirudhSK\/chromium,ChromiumWebApps\/chromium,krieger-od\/nwjs_chromium.src,mogoweb\/chromium-crosswalk,fujunwei\/chromium-crosswalk,M4sse\/chromium.src,keishi\/chromium,anirudhSK\/chromium,dednal\/chromium.src,Jonekee\/chromium.src,hgl888\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,jaruba\/chromium.src,chuan9\/chromium-crosswalk,ondra-novak\/chromium.src,hujiajie\/pa-chromium,crosswalk-project\/chromium-crosswalk-efl,markYoungH\/chromium.src,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,bright-sparks\/chromium-spacewalk,anirudhSK\/chromium,M4sse\/chromium.src,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,timopulkkinen\/BubbleFish,timopulkkinen\/BubbleFish,hgl888\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,jaruba\/chromium.src,hgl888\/chromium-crosswalk,ondra-novak\/chromium.src,robclark\/chromium,rogerwang\/chromium,mogoweb\/chromium-crosswalk,rogerwang\/chromium,anirudhSK\/chromium,nacl-webkit\/chrome_deps,Jonekee\/chromium.src,markYoungH\/chromium.src,markYoungH\/chromium.src,axinging\/chromium-crosswalk,mogoweb\/chromium-crosswalk,keishi\/chromium,hgl888\/chromium-crosswalk-efl,chuan9\/chromium-crosswalk,patrickm\/chromium.src,nacl-webkit\/chrome_deps,anirudhSK\/chromium,dednal\/chromium.src,rogerwang\/chromium,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src,fujunwei\/chromium-crosswalk,Just-D\/chromium-1,timopulkkinen\/BubbleFish,jaruba\/chromium.src,krieger-od\/nwjs_chromium.src,nacl-webkit\/chrome_deps,Chilledheart\/chromium,TheTypoMaster\/chromium-crosswalk,axinging\/chromium-crosswalk,M4sse\/chromium.src,Jonekee\/chromium.src,Chilledheart\/chromium,PeterWangIntel\/chromium-crosswalk,littlstar\/chromium.src,timopulkkinen\/BubbleFish,Jonekee\/chromium.src,dednal\/chromium.src,ChromiumWebApps\/chromium,chuan9\/chromium-crosswalk,chuan9\/chromium-crosswalk,patrickm\/chromium.src,Jonekee\/chromium.src,dednal\/chromium.src,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,zcbenz\/cefode-chromium,krieger-od\/nwjs_chromium.src,Fireblend\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,jaruba\/chromium.src,PeterWangIntel\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,markYoungH\/chromium.src,krieger-od\/nwjs_chromium.src,Chilledheart\/chromium,Jonekee\/chromium.src,bright-sparks\/chromium-spacewalk,ltilve\/chromium,keishi\/chromium,junmin-zhu\/chromium-rivertrail,Pluto-tv\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,chuan9\/chromium-crosswalk,timopulkkinen\/BubbleFish,M4sse\/chromium.src,Just-D\/chromium-1,pozdnyakov\/chromium-crosswalk,zcbenz\/cefode-chromium,Chilledheart\/chromium,ondra-novak\/chromium.src,jaruba\/chromium.src,M4sse\/chromium.src,dednal\/chromium.src,Jonekee\/chromium.src,Jonekee\/chromium.src,Just-D\/chromium-1,rogerwang\/chromium,crosswalk-project\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,nacl-webkit\/chrome_deps,hgl888\/chromium-crosswalk-efl,rogerwang\/chromium,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk,zcbenz\/cefode-chromium,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,Just-D\/chromium-1,PeterWangIntel\/chromium-crosswalk,patrickm\/chromium.src,dushu1203\/chromium.src,TheTypoMaster\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk,robclark\/chromium,pozdnyakov\/chromium-crosswalk,littlstar\/chromium.src,hujiajie\/pa-chromium,ltilve\/chromium,Pluto-tv\/chromium-crosswalk,littlstar\/chromium.src,fujunwei\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,hgl888\/chromium-crosswalk-efl,crosswalk-project\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,robclark\/chromium,mogoweb\/chromium-crosswalk,dednal\/chromium.src,Jonekee\/chromium.src,robclark\/chromium,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,ChromiumWebApps\/chromium,PeterWangIntel\/chromium-crosswalk,hujiajie\/pa-chromium,axinging\/chromium-crosswalk,rogerwang\/chromium,Pluto-tv\/chromium-crosswalk,anirudhSK\/chromium,hujiajie\/pa-chromium,nacl-webkit\/chrome_deps,Just-D\/chromium-1,pozdnyakov\/chromium-crosswalk,littlstar\/chromium.src,ltilve\/chromium,krieger-od\/nwjs_chromium.src,mohamed--abdel-maksoud\/chromium.src,pozdnyakov\/chromium-crosswalk,Just-D\/chromium-1,hgl888\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,keishi\/chromium,timopulkkinen\/BubbleFish,axinging\/chromium-crosswalk,rogerwang\/chromium,TheTypoMaster\/chromium-crosswalk,Just-D\/chromium-1,ChromiumWebApps\/chromium,junmin-zhu\/chromium-rivertrail,mohamed--abdel-maksoud\/chromium.src,Jonekee\/chromium.src,rogerwang\/chromium,ChromiumWebApps\/chromium,dushu1203\/chromium.src,ondra-novak\/chromium.src,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,nacl-webkit\/chrome_deps,pozdnyakov\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,Fireblend\/chromium-crosswalk,hujiajie\/pa-chromium,ltilve\/chromium,junmin-zhu\/chromium-rivertrail,ondra-novak\/chromium.src,mohamed--abdel-maksoud\/chromium.src,krieger-od\/nwjs_chromium.src,jaruba\/chromium.src,Chilledheart\/chromium,TheTypoMaster\/chromium-crosswalk,timopulkkinen\/BubbleFish,keishi\/chromium,jaruba\/chromium.src,fujunwei\/chromium-crosswalk,robclark\/chromium,mogoweb\/chromium-crosswalk,nacl-webkit\/chrome_deps,patrickm\/chromium.src,chuan9\/chromium-crosswalk,hgl888\/chromium-crosswalk,keishi\/chromium,dednal\/chromium.src,nacl-webkit\/chrome_deps,littlstar\/chromium.src,anirudhSK\/chromium,patrickm\/chromium.src,anirudhSK\/chromium,Chilledheart\/chromium,nacl-webkit\/chrome_deps,robclark\/chromium,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk,timopulkkinen\/BubbleFish,patrickm\/chromium.src,M4sse\/chromium.src,pozdnyakov\/chromium-crosswalk,robclark\/chromium,mohamed--abdel-maksoud\/chromium.src,zcbenz\/cefode-chromium,timopulkkinen\/BubbleFish,pozdnyakov\/chromium-crosswalk,littlstar\/chromium.src,dushu1203\/chromium.src,markYoungH\/chromium.src,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,Pluto-tv\/chromium-crosswalk,littlstar\/chromium.src,axinging\/chromium-crosswalk,keishi\/chromium,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,ChromiumWebApps\/chromium,patrickm\/chromium.src,nacl-webkit\/chrome_deps,robclark\/chromium,Chilledheart\/chromium,patrickm\/chromium.src,anirudhSK\/chromium,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src,bright-sparks\/chromium-spacewalk,markYoungH\/chromium.src,M4sse\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,dednal\/chromium.src,mohamed--abdel-maksoud\/chromium.src,mogoweb\/chromium-crosswalk,fujunwei\/chromium-crosswalk,keishi\/chromium,PeterWangIntel\/chromium-crosswalk,dednal\/chromium.src,zcbenz\/cefode-chromium,ltilve\/chromium,mohamed--abdel-maksoud\/chromium.src,timopulkkinen\/BubbleFish,ltilve\/chromium,hujiajie\/pa-chromium,fujunwei\/chromium-crosswalk,ChromiumWebApps\/chromium,axinging\/chromium-crosswalk,Chilledheart\/chromium,dushu1203\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk,robclark\/chromium,keishi\/chromium,Pluto-tv\/chromium-crosswalk,M4sse\/chromium.src,dednal\/chromium.src,littlstar\/chromium.src,fujunwei\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,ltilve\/chromium,dednal\/chromium.src,mogoweb\/chromium-crosswalk,chuan9\/chromium-crosswalk,zcbenz\/cefode-chromium,zcbenz\/cefode-chromium,fujunwei\/chromium-crosswalk,ltilve\/chromium,rogerwang\/chromium,Fireblend\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,fujunwei\/chromium-crosswalk,zcbenz\/cefode-chromium,ChromiumWebApps\/chromium,rogerwang\/chromium,M4sse\/chromium.src,jaruba\/chromium.src,zcbenz\/cefode-chromium,mogoweb\/chromium-crosswalk,axinging\/chromium-crosswalk,robclark\/chromium,markYoungH\/chromium.src,TheTypoMaster\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,bright-sparks\/chromium-spacewalk,ChromiumWebApps\/chromium,Jonekee\/chromium.src,ChromiumWebApps\/chromium,hujiajie\/pa-chromium,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,bright-sparks\/chromium-spacewalk,PeterWangIntel\/chromium-crosswalk,dushu1203\/chromium.src,markYoungH\/chromium.src,bright-sparks\/chromium-spacewalk,anirudhSK\/chromium,Chilledheart\/chromium,dushu1203\/chromium.src,jaruba\/chromium.src,junmin-zhu\/chromium-rivertrail,junmin-zhu\/chromium-rivertrail,markYoungH\/chromium.src,axinging\/chromium-crosswalk,ltilve\/chromium,mohamed--abdel-maksoud\/chromium.src,Fireblend\/chromium-crosswalk,Fireblend\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,ondra-novak\/chromium.src,hgl888\/chromium-crosswalk-efl,anirudhSK\/chromium,hujiajie\/pa-chromium,jaruba\/chromium.src,zcbenz\/cefode-chromium,Fireblend\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,hujiajie\/pa-chromium,TheTypoMaster\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,markYoungH\/chromium.src,junmin-zhu\/chromium-rivertrail,PeterWangIntel\/chromium-crosswalk,Just-D\/chromium-1,chuan9\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,Fireblend\/chromium-crosswalk,jaruba\/chromium.src,M4sse\/chromium.src,junmin-zhu\/chromium-rivertrail,M4sse\/chromium.src,mogoweb\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- third_party\/cld\/base\/build_config.h\n+++ third_party\/cld\/base\/build_config.h\n@@ -1,4 +1,4 @@\n-\/\/ Copyright (c) 2011 The Chromium Authors. All rights reserved.\n+\/\/ Copyright (c) 2012 The Chromium Authors. All rights reserved.\n \/\/ Use of this source code is governed by a BSD-style license that can be\n \/\/ found in the LICENSE file.\n \n@@ -17,6 +17,8 @@\n \/\/ A set of macros to use for platform detection.\n #if defined(__APPLE__)\n #define OS_MACOSX 1\n+#elif defined(ANDROID)\n+#define OS_ANDROID 1\n #elif defined(__linux__)\n #define OS_LINUX 1\n \/\/ Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.\n@@ -45,14 +47,18 @@\n #define TOOLKIT_USES_GTK 1\n #endif\n \n-#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)\n+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \\\n+ defined(OS_ANDROID)\n #define USE_NSS 1 \/\/ Use NSS for crypto.\n+#ifndef OS_ANDROID\n #define USE_X11 1 \/\/ Use X for graphics.\n+#endif\n #endif\n \n \/\/ For access to standard POSIXish features, use OS_POSIX instead of a\n \/\/ more specific macro.\n-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS)\n+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \\\n+ defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID)\n #define OS_POSIX 1\n \/\/ Use base::DataPack for name\/value pairs.\n #define USE_BASE_DATA_PACK 1\n"} {"commit":"eb057a47fddf774fcc5d7e88496a197e1f5f0c4d","subject":"Provide a simpler & more general WAR (const & + const_cast) for the generate_functor problem.","message":"Provide a simpler & more general WAR (const & + const_cast) for the generate_functor problem.\n\nReported by Andrew Corrigan\n\nFixes issue 275\n","repos":"andrewcorrigan\/thrust-multi-permutation-iterator,zhenglaizhang\/thrust,sarvex\/thrust,sarvex\/thrust,thvasilo\/thrust,zhenglaizhang\/thrust,zhenglaizhang\/thrust,thvasilo\/thrust,arnabgho\/thrust,xiongzhanblake\/thrust,egaburov\/thrust,thrust\/thrust,egaburov\/thrust,raygit\/thrust,sdalton1\/thrust,jaredhoberock\/thrust,Ricardo666666\/thrust,xiongzhanblake\/thrust_src,Ricardo666666\/thrust,zeryx\/thrust,GrimDerp\/thrust,xiongzhanblake\/thrust_src,arnabgho\/thrust,raygit\/thrust,jaredhoberock\/thrust,sarvex\/thrust,thrust\/thrust,arnabgho\/thrust,xiongzhanblake\/thrust,mohamed-ali\/thrust,dachziegel\/thrust,raygit\/thrust,egaburov\/thrust,jaredhoberock\/thrust,jaredhoberock\/thrust,marksantos\/thrust,mohamed-ali\/thrust,jaredhoberock\/thrust,thrust\/thrust,marksantos\/thrust,Ricardo666666\/thrust,xiongzhanblake\/thrust,andrewcorrigan\/thrust-multi-permutation-iterator,xiongzhanblake\/thrust_src,thrust\/thrust,zeryx\/thrust,andrewcorrigan\/thrust-multi-permutation-iterator,sdalton1\/thrust,dachziegel\/thrust,dachziegel\/thrust,sdalton1\/thrust,thrust\/thrust,thvasilo\/thrust,GrimDerp\/thrust,zeryx\/thrust,marksantos\/thrust,GrimDerp\/thrust,mohamed-ali\/thrust","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- thrust\/detail\/internal_functional.h\n+++ thrust\/detail\/internal_functional.h\n@@ -176,28 +176,25 @@\n generate_functor(Generator g)\n : gen(g) {}\n \n+ \/\/ operator() does not take an lvalue reference because some iterators\n+ \/\/ produce temporary proxy references when dereferenced. for example,\n+ \/\/ consider the temporary tuple of references produced by zip_iterator.\n+ \/\/ such temporaries cannot bind to an lvalue reference.\n+ \/\/\n+ \/\/ to WAR this, accept a const reference (which is bindable to a temporary),\n+ \/\/ and const_cast in the implementation.\n+ \/\/\n+ \/\/ XXX change to an rvalue reference upon c++0x (which either a named variable\n+ \/\/ or temporary can bind to)\n template<typename T>\n __host__ __device__\n- void operator()(T &x)\n- {\n- x = gen();\n- }\n-\n- \/\/ the above operator() does not work with zip_iterator\n- \/\/ because the tuples it produces upon dereference are\n- \/\/ temporary objects (which cannot bind to lvalue references)\n- \/\/\n- \/\/ to WAR this, overload operator() so that we can generate\n- \/\/ to zip_iterator\n- \/\/\n- \/\/ XXX change this to a single operator() which accepts\n- \/\/ an rvalue reference upon c++0x (which either a named variable\n- \/\/ or temporary can bind to)\n- template<typename HT, typename TT>\n- __host__ __device__\n- void operator()(cons<HT &, TT> x)\n- {\n- x = gen();\n+ void operator()(const T &x)\n+ {\n+ \/\/ we have to be naughty and const_cast this to get it to work\n+ T &lvalue = const_cast<T&>(x);\n+\n+ \/\/ this assigns correctly whether x is a true reference or proxy\n+ lvalue = gen();\n }\n \n Generator gen;\n"} {"commit":"139912b478ae73cdf4863969f5dddb82b05ab793","subject":"Get const-correctness right.","message":"Get const-correctness right.\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@4939 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"YongYang86\/dealii,spco\/dealii,JaeryunYim\/dealii,adamkosik\/dealii,sairajat\/dealii,rrgrove6\/dealii,Arezou-gh\/dealii,naliboff\/dealii,johntfoster\/dealii,YongYang86\/dealii,jperryhouts\/dealii,ESeNonFossiIo\/dealii,spco\/dealii,gpitton\/dealii,Arezou-gh\/dealii,shakirbsm\/dealii,adamkosik\/dealii,andreamola\/dealii,mac-a\/dealii,nicolacavallini\/dealii,jperryhouts\/dealii,danshapero\/dealii,flow123d\/dealii,EGP-CIG-REU\/dealii,msteigemann\/dealii,lue\/dealii,natashasharma\/dealii,Arezou-gh\/dealii,spco\/dealii,kalj\/dealii,ESeNonFossiIo\/dealii,ESeNonFossiIo\/dealii,adamkosik\/dealii,EGP-CIG-REU\/dealii,flow123d\/dealii,sriharisundar\/dealii,pesser\/dealii,mac-a\/dealii,ESeNonFossiIo\/dealii,mtezzele\/dealii,jperryhouts\/dealii,msteigemann\/dealii,rrgrove6\/dealii,Arezou-gh\/dealii,nicolacavallini\/dealii,ibkim11\/dealii,shakirbsm\/dealii,mtezzele\/dealii,mtezzele\/dealii,angelrca\/dealii,shakirbsm\/dealii,spco\/dealii,maieneuro\/dealii,natashasharma\/dealii,mtezzele\/dealii,flow123d\/dealii,JaeryunYim\/dealii,lue\/dealii,maieneuro\/dealii,lpolster\/dealii,angelrca\/dealii,gpitton\/dealii,nicolacavallini\/dealii,andreamola\/dealii,JaeryunYim\/dealii,angelrca\/dealii,kalj\/dealii,maieneuro\/dealii,angelrca\/dealii,natashasharma\/dealii,sairajat\/dealii,nicolacavallini\/dealii,pesser\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,shakirbsm\/dealii,pesser\/dealii,mac-a\/dealii,nicolacavallini\/dealii,sriharisundar\/dealii,mac-a\/dealii,maieneuro\/dealii,angelrca\/dealii,mac-a\/dealii,gpitton\/dealii,sriharisundar\/dealii,jperryhouts\/dealii,lue\/dealii,kalj\/dealii,andreamola\/dealii,sriharisundar\/dealii,andreamola\/dealii,adamkosik\/dealii,lue\/dealii,mac-a\/dealii,andreamola\/dealii,sriharisundar\/dealii,shakirbsm\/dealii,lpolster\/dealii,danshapero\/dealii,johntfoster\/dealii,maieneuro\/dealii,johntfoster\/dealii,naliboff\/dealii,lpolster\/dealii,msteigemann\/dealii,EGP-CIG-REU\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,maieneuro\/dealii,rrgrove6\/dealii,shakirbsm\/dealii,nicolacavallini\/dealii,rrgrove6\/dealii,maieneuro\/dealii,naliboff\/dealii,lpolster\/dealii,YongYang86\/dealii,JaeryunYim\/dealii,nicolacavallini\/dealii,sairajat\/dealii,pesser\/dealii,spco\/dealii,kalj\/dealii,ibkim11\/dealii,ibkim11\/dealii,msteigemann\/dealii,gpitton\/dealii,YongYang86\/dealii,mac-a\/dealii,Arezou-gh\/dealii,lue\/dealii,pesser\/dealii,naliboff\/dealii,rrgrove6\/dealii,ESeNonFossiIo\/dealii,danshapero\/dealii,danshapero\/dealii,YongYang86\/dealii,pesser\/dealii,EGP-CIG-REU\/dealii,angelrca\/dealii,shakirbsm\/dealii,sriharisundar\/dealii,natashasharma\/dealii,adamkosik\/dealii,andreamola\/dealii,Arezou-gh\/dealii,gpitton\/dealii,msteigemann\/dealii,johntfoster\/dealii,adamkosik\/dealii,YongYang86\/dealii,ibkim11\/dealii,sairajat\/dealii,natashasharma\/dealii,danshapero\/dealii,adamkosik\/dealii,gpitton\/dealii,naliboff\/dealii,kalj\/dealii,gpitton\/dealii,johntfoster\/dealii,mtezzele\/dealii,naliboff\/dealii,flow123d\/dealii,sairajat\/dealii,sriharisundar\/dealii,johntfoster\/dealii,danshapero\/dealii,pesser\/dealii,EGP-CIG-REU\/dealii,natashasharma\/dealii,flow123d\/dealii,lpolster\/dealii,jperryhouts\/dealii,flow123d\/dealii,rrgrove6\/dealii,natashasharma\/dealii,flow123d\/dealii,naliboff\/dealii,msteigemann\/dealii,ibkim11\/dealii,spco\/dealii,andreamola\/dealii,EGP-CIG-REU\/dealii,jperryhouts\/dealii,danshapero\/dealii,JaeryunYim\/dealii,johntfoster\/dealii,ESeNonFossiIo\/dealii,mtezzele\/dealii,lue\/dealii,YongYang86\/dealii,kalj\/dealii,msteigemann\/dealii,lpolster\/dealii,angelrca\/dealii,ESeNonFossiIo\/dealii,kalj\/dealii,lue\/dealii,sairajat\/dealii,rrgrove6\/dealii,lpolster\/dealii,JaeryunYim\/dealii,sairajat\/dealii,spco\/dealii,ibkim11\/dealii,mtezzele\/dealii,jperryhouts\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/lac\/include\/lac\/full_matrix.templates.h\n+++ deal.II\/lac\/include\/lac\/full_matrix.templates.h\n@@ -72,8 +72,8 @@\n FullMatrix<number> &\n FullMatrix<number>::operator *= (const double factor)\n {\n- number *p = data();\n- const number *e = data() + n()*m();\n+ number *p = &el(0,0);\n+ const number *e = &el(0,0) + n()*m();\n while (p != e)\n *p++ *= factor;\n \n"} {"commit":"ee3933fe686b21d4e7f43438efe31d98488f86f4","subject":"Frobenius norm","message":"Frobenius norm\n\n\ngit-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@10205 0785d39b-7218-0410-832d-ea1e28bc413d\n","repos":"ibkim11\/dealii,pesser\/dealii,danshapero\/dealii,lpolster\/dealii,sriharisundar\/dealii,angelrca\/dealii,andreamola\/dealii,Arezou-gh\/dealii,naliboff\/dealii,msteigemann\/dealii,EGP-CIG-REU\/dealii,Arezou-gh\/dealii,pesser\/dealii,naliboff\/dealii,rrgrove6\/dealii,msteigemann\/dealii,kalj\/dealii,danshapero\/dealii,angelrca\/dealii,flow123d\/dealii,rrgrove6\/dealii,Arezou-gh\/dealii,johntfoster\/dealii,EGP-CIG-REU\/dealii,gpitton\/dealii,mtezzele\/dealii,ibkim11\/dealii,sairajat\/dealii,JaeryunYim\/dealii,spco\/dealii,JaeryunYim\/dealii,maieneuro\/dealii,naliboff\/dealii,kalj\/dealii,msteigemann\/dealii,lue\/dealii,danshapero\/dealii,sairajat\/dealii,andreamola\/dealii,lpolster\/dealii,johntfoster\/dealii,lue\/dealii,msteigemann\/dealii,jperryhouts\/dealii,natashasharma\/dealii,sriharisundar\/dealii,danshapero\/dealii,adamkosik\/dealii,YongYang86\/dealii,nicolacavallini\/dealii,sriharisundar\/dealii,mac-a\/dealii,johntfoster\/dealii,gpitton\/dealii,lpolster\/dealii,johntfoster\/dealii,YongYang86\/dealii,mac-a\/dealii,kalj\/dealii,msteigemann\/dealii,rrgrove6\/dealii,naliboff\/dealii,adamkosik\/dealii,jperryhouts\/dealii,msteigemann\/dealii,mac-a\/dealii,Arezou-gh\/dealii,rrgrove6\/dealii,naliboff\/dealii,maieneuro\/dealii,shakirbsm\/dealii,andreamola\/dealii,danshapero\/dealii,andreamola\/dealii,EGP-CIG-REU\/dealii,lue\/dealii,shakirbsm\/dealii,angelrca\/dealii,pesser\/dealii,flow123d\/dealii,andreamola\/dealii,lpolster\/dealii,spco\/dealii,lue\/dealii,lpolster\/dealii,sairajat\/dealii,shakirbsm\/dealii,YongYang86\/dealii,Arezou-gh\/dealii,ibkim11\/dealii,mac-a\/dealii,ESeNonFossiIo\/dealii,maieneuro\/dealii,sairajat\/dealii,nicolacavallini\/dealii,andreamola\/dealii,ESeNonFossiIo\/dealii,mac-a\/dealii,mac-a\/dealii,shakirbsm\/dealii,rrgrove6\/dealii,kalj\/dealii,adamkosik\/dealii,ESeNonFossiIo\/dealii,jperryhouts\/dealii,ibkim11\/dealii,sriharisundar\/dealii,ESeNonFossiIo\/dealii,pesser\/dealii,shakirbsm\/dealii,mtezzele\/dealii,shakirbsm\/dealii,maieneuro\/dealii,pesser\/dealii,sriharisundar\/dealii,adamkosik\/dealii,EGP-CIG-REU\/dealii,JaeryunYim\/dealii,gpitton\/dealii,sriharisundar\/dealii,sairajat\/dealii,gpitton\/dealii,kalj\/dealii,kalj\/dealii,mtezzele\/dealii,maieneuro\/dealii,spco\/dealii,johntfoster\/dealii,gpitton\/dealii,lue\/dealii,jperryhouts\/dealii,mtezzele\/dealii,ibkim11\/dealii,spco\/dealii,adamkosik\/dealii,natashasharma\/dealii,gpitton\/dealii,mtezzele\/dealii,naliboff\/dealii,nicolacavallini\/dealii,adamkosik\/dealii,adamkosik\/dealii,kalj\/dealii,JaeryunYim\/dealii,JaeryunYim\/dealii,jperryhouts\/dealii,jperryhouts\/dealii,msteigemann\/dealii,natashasharma\/dealii,flow123d\/dealii,YongYang86\/dealii,nicolacavallini\/dealii,JaeryunYim\/dealii,nicolacavallini\/dealii,maieneuro\/dealii,mtezzele\/dealii,danshapero\/dealii,lpolster\/dealii,flow123d\/dealii,EGP-CIG-REU\/dealii,Arezou-gh\/dealii,naliboff\/dealii,angelrca\/dealii,flow123d\/dealii,lpolster\/dealii,andreamola\/dealii,nicolacavallini\/dealii,spco\/dealii,spco\/dealii,rrgrove6\/dealii,flow123d\/dealii,sairajat\/dealii,flow123d\/dealii,ESeNonFossiIo\/dealii,natashasharma\/dealii,JaeryunYim\/dealii,spco\/dealii,gpitton\/dealii,YongYang86\/dealii,natashasharma\/dealii,YongYang86\/dealii,sairajat\/dealii,mtezzele\/dealii,Arezou-gh\/dealii,ESeNonFossiIo\/dealii,EGP-CIG-REU\/dealii,jperryhouts\/dealii,johntfoster\/dealii,ibkim11\/dealii,ibkim11\/dealii,shakirbsm\/dealii,lue\/dealii,EGP-CIG-REU\/dealii,nicolacavallini\/dealii,pesser\/dealii,rrgrove6\/dealii,angelrca\/dealii,mac-a\/dealii,natashasharma\/dealii,ESeNonFossiIo\/dealii,angelrca\/dealii,johntfoster\/dealii,natashasharma\/dealii,maieneuro\/dealii,angelrca\/dealii,lue\/dealii,YongYang86\/dealii,danshapero\/dealii,pesser\/dealii,sriharisundar\/dealii","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- deal.II\/lac\/include\/lac\/full_matrix.templates.h\n+++ deal.II\/lac\/include\/lac\/full_matrix.templates.h\n@@ -1,4 +1,4 @@\n-\/\/---------------------------- full_matrix.templates.h ---------------------------\n+\/\/---------------------------------------------------------------------------\n \/\/ $Id$\n \/\/ Version: $Name$\n \/\/\n@@ -9,7 +9,7 @@\n \/\/ to the file deal.II\/doc\/license.html for the text and\n \/\/ further information on this license.\n \/\/\n-\/\/---------------------------- full_matrix.templates.h ---------------------------\n+\/\/---------------------------------------------------------------------------\n #ifndef __deal2__full_matrix_templates_h\n #define __deal2__full_matrix_templates_h\n \n@@ -1236,7 +1236,7 @@\n \n template <typename number>\n number\n-FullMatrix<number>::norm2 () const\n+FullMatrix<number>::frobenius_norm () const\n {\n Assert (!this->empty(), ExcEmptyMatrix());\n \n@@ -1244,6 +1244,15 @@\n for (unsigned int i=0; i<this->n_rows()*this->n_cols(); ++i)\n s += this->data()[i]*this->data()[i];\n return std::sqrt(s);\n+}\n+\n+\n+\n+template <typename number>\n+number\n+FullMatrix<number>::norm2 () const\n+{\n+ return frobenius_norm();\n }\n \n \n"} {"commit":"47c260177c4a7d0999e8e9374365d74b370f8b69","subject":"fix window title for rail as it was not being set on initial window creation remove duplicate call to XStoreName when setting window title expand WITH_XEXT #define for rail window rects as extra unecessary work was being done when WITH_XEXT was not defined","message":"fix window title for rail as it was not being set on initial window creation\nremove duplicate call to XStoreName when setting window title\nexpand WITH_XEXT #define for rail window rects as extra unecessary work was being done when WITH_XEXT was not defined\n","repos":"daneshih1125\/FreeRDP,xproax\/FreeRDP,realjiangms\/FreeRDP,RangeeGmbH\/FreeRDP,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,ondrejholy\/FreeRDP,daneshih1125\/FreeRDP,erbth\/FreeRDP,realjiangms\/FreeRDP,massuda-marcelo\/FreeRDP,erbth\/FreeRDP,bjcollins\/FreeRDP,awakecoding\/FreeRDP,eledoux\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,kingland\/FreeRDP,mcnestrb\/FreeRDP,realjiangms\/FreeRDP,briggsbog\/FreeRDP,xproax\/FreeRDP,RangeeGmbH\/FreeRDP,infelt\/FreeRDP,awakecoding\/FreeRDP,nfedera\/FreeRDP,erbth\/FreeRDP,ilammy\/FreeRDP,ilammy\/FreeRDP,mcnestrb\/FreeRDP,xproax\/FreeRDP,nanxiongchao\/FreeRDP,kingland\/FreeRDP,xhaakon\/FreeRDP,MartinHaimberger\/FreeRDP,zavadovsky\/FreeRDP,mcnestrb\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,daneshih1125\/FreeRDP,nanxiongchao\/FreeRDP,realjiangms\/FreeRDP,cloudbase\/FreeRDP-dev,mcnestrb\/FreeRDP,bjcollins\/FreeRDP,colemickens\/FreeRDP,ivan-83\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,cloudbase\/FreeRDP-dev,rjcorrig\/FreeRDP,mfleisz\/FreeRDP,chipitsine\/FreeRDP,MartinHaimberger\/FreeRDP,yurashek\/FreeRDP,chipitsine\/FreeRDP,infelt\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,ondrejholy\/FreeRDP,yurashek\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,colemickens\/FreeRDP,massuda-marcelo\/FreeRDP,massuda-marcelo\/FreeRDP,rjcorrig\/FreeRDP,cloudbase\/FreeRDP-dev,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,daneshih1125\/FreeRDP,colemickens\/FreeRDP,mcnestrb\/FreeRDP,awakecoding\/FreeRDP,nanxiongchao\/FreeRDP,xhaakon\/FreeRDP,MartinHaimberger\/FreeRDP,nfedera\/FreeRDP,infelt\/FreeRDP,ivan-83\/FreeRDP,ivan-83\/FreeRDP,DavBfr\/FreeRDP,zavadovsky\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,ssieb\/FreeRDP,chipitsine\/FreeRDP,MartinHaimberger\/FreeRDP,nfedera\/FreeRDP,ilammy\/FreeRDP,bjcollins\/FreeRDP,zavadovsky\/FreeRDP,akallabeth\/FreeRDP,daneshih1125\/FreeRDP,yurashek\/FreeRDP,rjcorrig\/FreeRDP,DavBfr\/FreeRDP,nfedera\/FreeRDP,zavadovsky\/FreeRDP,oshogbo\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,eledoux\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,daneshih1125\/FreeRDP,cedrozor\/FreeRDP,briggsbog\/FreeRDP,massuda-marcelo\/FreeRDP,colemickens\/FreeRDP,nfedera\/FreeRDP,DavBfr\/FreeRDP,zavadovsky\/FreeRDP,eledoux\/FreeRDP,oshogbo\/FreeRDP,FreeRDP\/FreeRDP,colemickens\/FreeRDP,eledoux\/FreeRDP,ssieb\/FreeRDP,mfleisz\/FreeRDP,bsagal\/FreeRDP,rjcorrig\/FreeRDP,ssieb\/FreeRDP,mcnestrb\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP,erbth\/FreeRDP,kingland\/FreeRDP,Devolutions\/FreeRDP,ondrejholy\/FreeRDP,briggsbog\/FreeRDP,ssieb\/FreeRDP,infelt\/FreeRDP,infelt\/FreeRDP,realjiangms\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,rjcorrig\/FreeRDP,ssieb\/FreeRDP,oshogbo\/FreeRDP,bmiklautz\/FreeRDP,bsagal\/FreeRDP,RangeeGmbH\/FreeRDP,eledoux\/FreeRDP,nanxiongchao\/FreeRDP,ilammy\/FreeRDP,nanxiongchao\/FreeRDP,infelt\/FreeRDP,rjcorrig\/FreeRDP,xproax\/FreeRDP,oshogbo\/FreeRDP,ondrejholy\/FreeRDP,massuda-marcelo\/FreeRDP,ivan-83\/FreeRDP,daneshih1125\/FreeRDP,massuda-marcelo\/FreeRDP,ilammy\/FreeRDP,bsagal\/FreeRDP,mfleisz\/FreeRDP,yurashek\/FreeRDP,cedrozor\/FreeRDP,bjcollins\/FreeRDP,ilammy\/FreeRDP,bsagal\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,xhaakon\/FreeRDP,eledoux\/FreeRDP,kingland\/FreeRDP,yurashek\/FreeRDP,bjcollins\/FreeRDP,kingland\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,mfleisz\/FreeRDP,colemickens\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,akallabeth\/FreeRDP,cedrozor\/FreeRDP,xhaakon\/FreeRDP,briggsbog\/FreeRDP,oshogbo\/FreeRDP,bsagal\/FreeRDP,xhaakon\/FreeRDP,eledoux\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,mfleisz\/FreeRDP,infelt\/FreeRDP,bmiklautz\/FreeRDP,yurashek\/FreeRDP,bmiklautz\/FreeRDP,cloudbase\/FreeRDP-dev,chipitsine\/FreeRDP,bjcollins\/FreeRDP,xproax\/FreeRDP,kingland\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,nfedera\/FreeRDP,xproax\/FreeRDP,briggsbog\/FreeRDP,eledoux\/FreeRDP,daneshih1125\/FreeRDP,Devolutions\/FreeRDP,ondrejholy\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,xproax\/FreeRDP,massuda-marcelo\/FreeRDP,kingland\/FreeRDP,kingland\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,akallabeth\/FreeRDP,nanxiongchao\/FreeRDP,bmiklautz\/FreeRDP,ssieb\/FreeRDP,MartinHaimberger\/FreeRDP,nanxiongchao\/FreeRDP,infelt\/FreeRDP,yurashek\/FreeRDP,akallabeth\/FreeRDP,bsagal\/FreeRDP,massuda-marcelo\/FreeRDP,MartinHaimberger\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,xproax\/FreeRDP,awakecoding\/FreeRDP,ssieb\/FreeRDP,mcnestrb\/FreeRDP,RangeeGmbH\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,colemickens\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,briggsbog\/FreeRDP,realjiangms\/FreeRDP,mfleisz\/FreeRDP,awakecoding\/FreeRDP,rjcorrig\/FreeRDP,cloudbase\/FreeRDP-dev,realjiangms\/FreeRDP,rjcorrig\/FreeRDP,nanxiongchao\/FreeRDP,mcnestrb\/FreeRDP,realjiangms\/FreeRDP,erbth\/FreeRDP,zavadovsky\/FreeRDP,chipitsine\/FreeRDP,MartinHaimberger\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,ondrejholy\/FreeRDP,yurashek\/FreeRDP,bsagal\/FreeRDP,DavBfr\/FreeRDP,MartinHaimberger\/FreeRDP,xhaakon\/FreeRDP,zavadovsky\/FreeRDP,DavBfr\/FreeRDP,briggsbog\/FreeRDP,colemickens\/FreeRDP,ivan-83\/FreeRDP,Devolutions\/FreeRDP,ssieb\/FreeRDP,bjcollins\/FreeRDP,ilammy\/FreeRDP,bmiklautz\/FreeRDP,bmiklautz\/FreeRDP,bsagal\/FreeRDP,Devolutions\/FreeRDP,briggsbog\/FreeRDP,ondrejholy\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- client\/X11\/xf_window.c\n+++ client\/X11\/xf_window.c\n@@ -574,7 +574,6 @@\n \n void xf_SetWindowText(xfContext* xfc, xfAppWindow* appWindow, char* name)\n {\n-\tXStoreName(xfc->display, appWindow->handle, name);\n \tconst size_t i = strlen(name);\n \tXStoreName(xfc->display, appWindow->handle, name);\n \n@@ -702,6 +701,8 @@\n \n \t\/* Move doesn't seem to work until window is mapped. *\/\n \txf_MoveWindow(xfc, appWindow, appWindow->x, appWindow->y, appWindow->width, appWindow->height);\n+\n+\txf_SetWindowText(xfc, appWindow, appWindow->title);\n \n \treturn 1;\n }\n@@ -905,6 +906,7 @@\n \tif (nrects < 1)\n \t\treturn;\n \n+#ifdef WITH_XEXT\n \txrects = (XRectangle*) calloc(nrects, sizeof(XRectangle));\n \n \tfor (i = 0; i < nrects; i++)\n@@ -915,11 +917,10 @@\n \t\txrects[i].height = rects[i].bottom - rects[i].top;\n \t}\n \n-#ifdef WITH_XEXT\n \tXShapeCombineRectangles(xfc->display, appWindow->handle, ShapeBounding, 0, 0, xrects, nrects, ShapeSet, 0);\n+\tfree(xrects);\n #endif\n \n-\tfree(xrects);\n }\n \n void xf_SetWindowVisibilityRects(xfContext* xfc, xfAppWindow* appWindow, RECTANGLE_16* rects, int nrects)\n@@ -930,6 +931,7 @@\n \tif (nrects < 1)\n \t\treturn;\n \n+#ifdef WITH_XEXT\n \txrects = (XRectangle*) calloc(nrects, sizeof(XRectangle));\n \n \tfor (i = 0; i < nrects; i++)\n@@ -940,11 +942,10 @@\n \t\txrects[i].height = rects[i].bottom - rects[i].top;\n \t}\n \n-#ifdef WITH_XEXT\n \tXShapeCombineRectangles(xfc->display, appWindow->handle, ShapeBounding, 0, 0, xrects, nrects, ShapeSet, 0);\n+\tfree(xrects);\n #endif\n \n-\tfree(xrects);\n }\n \n void xf_UpdateWindowArea(xfContext* xfc, xfAppWindow* appWindow, int x, int y, int width, int height)\n"} {"commit":"73aa0f6d88930f139df11b832e9b56a6f27b1699","subject":"Replaced copy initialization that may fail (NoCopy policy) \/ direct construction","message":"Replaced copy initialization that may fail (NoCopy policy) \/ direct construction\n\n\ngit-svn-id: e2e1a767b54e5f731ad8ac18fa5089ee37d5625a@81 7ec92016-0320-0410-acc4-a06ded1c099a\n","repos":"claudiordgz\/Loki,claudiordgz\/Loki,claudiordgz\/Loki","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/RegressionTest\/SmartPtrTest.h\n+++ tools\/RegressionTest\/SmartPtrTest.h\n@@ -71,102 +71,102 @@\n \n bool test1=TestClass::instances == 0;\n \n- { p0 p = new TestClass(); }\n- { p1 p = new TestClass(); }\n-\/\/ { p2 p = new TestClass(); }\n- { p3 p = new TestClass(); }\n- { p4 p = new TestClass(); }\n- { p5 p = new TestClass(); }\n- { p6 p = new TestClass(); }\n- { p7 p = new TestClass(); }\n- { p8 p = new TestClass(); }\n- { p9 p = new TestClass(); }\n-\/\/ { p10 p = new TestClass(); }\n- { p11 p = new TestClass(); }\n- { p12 p = new TestClass(); }\n- { p13 p = new TestClass(); }\n- { p14 p = new TestClass(); }\n- { p15 p = new TestClass(); }\n- { p16 p = new TestClass(); }\n- { p17 p = new TestClass(); }\n-\/\/ { p18 p = new TestClass(); }\n- { p19 p = new TestClass(); }\n- { p20 p = new TestClass(); }\n- { p21 p = new TestClass(); }\n- { p22 p = new TestClass(); }\n- { p23 p = new TestClass(); }\n- { p24 p = new TestClass(); }\n- { p25 p = new TestClass(); }\n-\/\/ { p26 p = new TestClass(); }\n- { p27 p = new TestClass(); }\n- { p28 p = new TestClass(); }\n- { p29 p = new TestClass(); }\n- { p30 p = new TestClass(); }\n- { p31 p = new TestClass(); }\n- { p40 p = new TestClass(); }\n- { p41 p = new TestClass(); }\n-\/\/ { p42 p = new TestClass(); }\n- { p43 p = new TestClass(); }\n- { p44 p = new TestClass(); }\n- { p45 p = new TestClass(); }\n- { p46 p = new TestClass(); }\n- { p47 p = new TestClass(); }\n- { p48 p = new TestClass(); }\n- { p49 p = new TestClass(); }\n-\/\/ { p50 p = new TestClass(); }\n- { p51 p = new TestClass(); }\n- { p52 p = new TestClass(); }\n- { p53 p = new TestClass(); }\n- { p54 p = new TestClass(); }\n- { p55 p = new TestClass(); }\n- { p56 p = new TestClass(); }\n- { p57 p = new TestClass(); }\n-\/\/ { p58 p = new TestClass(); }\n- { p59 p = new TestClass(); }\n- { p60 p = new TestClass(); }\n- { p61 p = new TestClass(); }\n- { p62 p = new TestClass(); }\n- { p63 p = new TestClass(); }\n- { p64 p = new TestClass(); }\n- { p65 p = new TestClass(); }\n-\/\/ { p66 p = new TestClass(); }\n- { p67 p = new TestClass(); }\n- { p68 p = new TestClass(); }\n- { p69 p = new TestClass(); }\n- { p70 p = new TestClass(); }\n- { p71 p = new TestClass(); }\n- { p72 p = new TestClass(); }\n- { p73 p = new TestClass(); }\n-\/\/ { p74 p = new TestClass(); }\n- { p75 p = new TestClass(); }\n- { p76 p = new TestClass(); }\n- { p77 p = new TestClass(); }\n- { p78 p = new TestClass(); }\n- { p79 p = new TestClass(); }\n- { p80 p = new TestClass(); }\n- { p81 p = new TestClass(); }\n-\/\/ { p82 p = new TestClass(); }\n- { p83 p = new TestClass(); }\n- { p84 p = new TestClass(); }\n- { p85 p = new TestClass(); }\n- { p86 p = new TestClass(); }\n- { p87 p = new TestClass(); }\n- { p88 p = new TestClass(); }\n- { p89 p = new TestClass(); }\n-\/\/ { p90 p = new TestClass(); }\n- { p91 p = new TestClass(); }\n- { p92 p = new TestClass(); }\n- { p93 p = new TestClass(); }\n- { p94 p = new TestClass(); }\n- { p95 p = new TestClass(); }\n- { p96 p = new TestClass(); }\n- { p97 p = new TestClass(); }\n-\/\/ { p98 p = new TestClass(); }\n- { p99 p = new TestClass(); }\n- { p100 p = new TestClass(); }\n- { p101 p = new TestClass(); }\n- { p102 p = new TestClass(); }\n- { p103 p = new TestClass(); }\n+ { p0 p(new TestClass); }\n+ { p1 p(new TestClass); }\n+\/\/ { p2 p(new TestClass); }\n+ { p3 p(new TestClass); }\n+ { p4 p(new TestClass); }\n+ { p5 p(new TestClass); }\n+ { p6 p(new TestClass); }\n+ { p7 p(new TestClass); }\n+ { p8 p(new TestClass); }\n+ { p9 p(new TestClass); }\n+\/\/ { p10 p(new TestClass); }\n+ { p11 p(new TestClass); }\n+ { p12 p(new TestClass); }\n+ { p13 p(new TestClass); }\n+ { p14 p(new TestClass); }\n+ { p15 p(new TestClass); }\n+ { p16 p(new TestClass); }\n+ { p17 p(new TestClass); }\n+\/\/ { p18 p(new TestClass); }\n+ { p19 p(new TestClass); }\n+ { p20 p(new TestClass); }\n+ { p21 p(new TestClass); }\n+ { p22 p(new TestClass); }\n+ { p23 p(new TestClass); }\n+ { p24 p(new TestClass); }\n+ { p25 p(new TestClass); }\n+\/\/ { p26 p(new TestClass); }\n+ { p27 p(new TestClass); }\n+ { p28 p(new TestClass); }\n+ { p29 p(new TestClass); }\n+ { p30 p(new TestClass); }\n+ { p31 p(new TestClass); }\n+ { p40 p(new TestClass); }\n+ { p41 p(new TestClass); }\n+\/\/ { p42 p(new TestClass); }\n+ { p43 p(new TestClass); }\n+ { p44 p(new TestClass); }\n+ { p45 p(new TestClass); }\n+ { p46 p(new TestClass); }\n+ { p47 p(new TestClass); }\n+ { p48 p(new TestClass); }\n+ { p49 p(new TestClass); }\n+\/\/ { p50 p(new TestClass); }\n+ { p51 p(new TestClass); }\n+ { p52 p(new TestClass); }\n+ { p53 p(new TestClass); }\n+ { p54 p(new TestClass); }\n+ { p55 p(new TestClass); }\n+ { p56 p(new TestClass); }\n+ { p57 p(new TestClass); }\n+\/\/ { p58 p(new TestClass); }\n+ { p59 p(new TestClass); }\n+ { p60 p(new TestClass); }\n+ { p61 p(new TestClass); }\n+ { p62 p(new TestClass); }\n+ { p63 p(new TestClass); }\n+ { p64 p(new TestClass); }\n+ { p65 p(new TestClass); }\n+\/\/ { p66 p(new TestClass); }\n+ { p67 p(new TestClass); }\n+ { p68 p(new TestClass); }\n+ { p69 p(new TestClass); }\n+ { p70 p(new TestClass); }\n+ { p71 p(new TestClass); }\n+ { p72 p(new TestClass); }\n+ { p73 p(new TestClass); }\n+\/\/ { p74 p(new TestClass); }\n+ { p75 p(new TestClass); }\n+ { p76 p(new TestClass); }\n+ { p77 p(new TestClass); }\n+ { p78 p(new TestClass); }\n+ { p79 p(new TestClass); }\n+ { p80 p(new TestClass); }\n+ { p81 p(new TestClass); }\n+\/\/ { p82 p(new TestClass); }\n+ { p83 p(new TestClass); }\n+ { p84 p(new TestClass); }\n+ { p85 p(new TestClass); }\n+ { p86 p(new TestClass); }\n+ { p87 p(new TestClass); }\n+ { p88 p(new TestClass); }\n+ { p89 p(new TestClass); }\n+\/\/ { p90 p(new TestClass); }\n+ { p91 p(new TestClass); }\n+ { p92 p(new TestClass); }\n+ { p93 p(new TestClass); }\n+ { p94 p(new TestClass); }\n+ { p95 p(new TestClass); }\n+ { p96 p(new TestClass); }\n+ { p97 p(new TestClass); }\n+\/\/ { p98 p(new TestClass); }\n+ { p99 p(new TestClass); }\n+ { p100 p(new TestClass); }\n+ { p101 p(new TestClass); }\n+ { p102 p(new TestClass); }\n+ { p103 p(new TestClass); }\n \n bool test2=TestClass::instances==0;\n \n"} {"commit":"60caaac2cf870fdcdebd5f89f541e196de18f711","subject":"For backward compatibility define a dummy version of ClassImp when the CPP flag _CINT_ is active.","message":"For backward compatibility define a dummy version of ClassImp when the\nCPP flag _CINT_ is active.\n\n\ngit-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@4521 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"buuck\/root,bbockelm\/root,CristinaCristescu\/root,cxx-hep\/root-cern,esakellari\/root,olifre\/root,omazapa\/root,gbitzes\/root,root-mirror\/root,georgtroska\/root,zzxuanyuan\/root-compressor-dummy,sawenzel\/root,Y--\/root,omazapa\/root,zzxuanyuan\/root-compressor-dummy,gganis\/root,buuck\/root,0x0all\/ROOT,karies\/root,buuck\/root,root-mirror\/root,perovic\/root,mattkretz\/root,zzxuanyuan\/root-compressor-dummy,omazapa\/root,Duraznos\/root,simonpf\/root,Duraznos\/root,arch1tect0r\/root,smarinac\/root,mkret2\/root,omazapa\/root-old,vukasinmilosevic\/root,dfunke\/root,gganis\/root,Duraznos\/root,omazapa\/root-old,omazapa\/root-old,agarciamontoro\/root,mattkretz\/root,karies\/root,omazapa\/root-old,mhuwiler\/rootauto,esakellari\/root,perovic\/root,arch1tect0r\/root,omazapa\/root,smarinac\/root,kirbyherm\/root-r-tools,sawenzel\/root,sirinath\/root,thomaskeck\/root,arch1tect0r\/root,tc3t\/qoot,karies\/root,krafczyk\/root,vukasinmilosevic\/root,veprbl\/root,cxx-hep\/root-cern,sirinath\/root,gbitzes\/root,cxx-hep\/root-cern,zzxuanyuan\/root,strykejern\/TTreeReader,evgeny-boger\/root,kirbyherm\/root-r-tools,sbinet\/cxx-root,ffurano\/root5,Duraznos\/root,BerserkerTroll\/root,lgiommi\/root,0x0all\/ROOT,mkret2\/root,Y--\/root,nilqed\/root,esakellari\/root,veprbl\/root,bbockelm\/root,esakellari\/root,Duraznos\/root,davidlt\/root,gbitzes\/root,davidlt\/root,krafczyk\/root,smarinac\/root,vukasinmilosevic\/root,dfunke\/root,perovic\/root,perovic\/root,esakellari\/my_root_for_test,sirinath\/root,agarciamontoro\/root,pspe\/root,tc3t\/qoot,BerserkerTroll\/root,buuck\/root,sbinet\/cxx-root,omazapa\/root,alexschlueter\/cern-root,arch1tect0r\/root,esakellari\/my_root_for_test,sbinet\/cxx-root,esakellari\/root,gganis\/root,CristinaCristescu\/root,Dr15Jones\/root,krafczyk\/root,lgiommi\/root,BerserkerTroll\/root,Dr15Jones\/root,veprbl\/root,simonpf\/root,sirinath\/root,root-mirror\/root,krafczyk\/root,nilqed\/root,beniz\/root,sbinet\/cxx-root,alexschlueter\/cern-root,evgeny-boger\/root,sawenzel\/root,vukasinmilosevic\/root,jrtomps\/root,perovic\/root,krafczyk\/root,ffurano\/root5,zzxuanyuan\/root,lgiommi\/root,buuck\/root,alexschlueter\/cern-root,sbinet\/cxx-root,buuck\/root,esakellari\/root,karies\/root,nilqed\/root,olifre\/root,simonpf\/root,sawenzel\/root,omazapa\/root,abhinavmoudgil95\/root,olifre\/root,perovic\/root,sirinath\/root,jrtomps\/root,sirinath\/root,pspe\/root,Y--\/root,georgtroska\/root,tc3t\/qoot,omazapa\/root-old,bbockelm\/root,BerserkerTroll\/root,0x0all\/ROOT,CristinaCristescu\/root,abhinavmoudgil95\/root,Dr15Jones\/root,veprbl\/root,agarciamontoro\/root,mattkretz\/root,esakellari\/root,jrtomps\/root,bbockelm\/root,Duraznos\/root,vukasinmilosevic\/root,nilqed\/root,mhuwiler\/rootauto,vukasinmilosevic\/root,davidlt\/root,karies\/root,abhinavmoudgil95\/root,vukasinmilosevic\/root,georgtroska\/root,root-mirror\/root,beniz\/root,abhinavmoudgil95\/root,agarciamontoro\/root,kirbyherm\/root-r-tools,thomaskeck\/root,omazapa\/root,vukasinmilosevic\/root,olifre\/root,zzxuanyuan\/root-compressor-dummy,satyarth934\/root,krafczyk\/root,lgiommi\/root,ffurano\/root5,satyarth934\/root,arch1tect0r\/root,jrtomps\/root,jrtomps\/root,pspe\/root,mattkretz\/root,pspe\/root,omazapa\/root,BerserkerTroll\/root,jrtomps\/root,cxx-hep\/root-cern,lgiommi\/root,omazapa\/root-old,mattkretz\/root,sawenzel\/root,zzxuanyuan\/root,beniz\/root,zzxuanyuan\/root,lgiommi\/root,abhinavmoudgil95\/root,veprbl\/root,smarinac\/root,simonpf\/root,Dr15Jones\/root,alexschlueter\/cern-root,jrtomps\/root,olifre\/root,simonpf\/root,jrtomps\/root,veprbl\/root,davidlt\/root,kirbyherm\/root-r-tools,mkret2\/root,CristinaCristescu\/root,0x0all\/ROOT,bbockelm\/root,smarinac\/root,zzxuanyuan\/root-compressor-dummy,buuck\/root,smarinac\/root,krafczyk\/root,Y--\/root,zzxuanyuan\/root,gganis\/root,CristinaCristescu\/root,nilqed\/root,Y--\/root,BerserkerTroll\/root,alexschlueter\/cern-root,lgiommi\/root,Duraznos\/root,tc3t\/qoot,mhuwiler\/rootauto,0x0all\/ROOT,thomaskeck\/root,perovic\/root,pspe\/root,dfunke\/root,georgtroska\/root,mkret2\/root,strykejern\/TTreeReader,abhinavmoudgil95\/root,smarinac\/root,omazapa\/root-old,ffurano\/root5,dfunke\/root,abhinavmoudgil95\/root,davidlt\/root,vukasinmilosevic\/root,abhinavmoudgil95\/root,nilqed\/root,agarciamontoro\/root,tc3t\/qoot,root-mirror\/root,zzxuanyuan\/root,pspe\/root,beniz\/root,thomaskeck\/root,mkret2\/root,lgiommi\/root,arch1tect0r\/root,evgeny-boger\/root,abhinavmoudgil95\/root,kirbyherm\/root-r-tools,gbitzes\/root,zzxuanyuan\/root,0x0all\/ROOT,omazapa\/root-old,esakellari\/my_root_for_test,agarciamontoro\/root,arch1tect0r\/root,Duraznos\/root,CristinaCristescu\/root,root-mirror\/root,BerserkerTroll\/root,buuck\/root,mhuwiler\/rootauto,sawenzel\/root,karies\/root,strykejern\/TTreeReader,veprbl\/root,mattkretz\/root,zzxuanyuan\/root-compressor-dummy,evgeny-boger\/root,sirinath\/root,sbinet\/cxx-root,beniz\/root,zzxuanyuan\/root,omazapa\/root-old,mkret2\/root,satyarth934\/root,buuck\/root,davidlt\/root,veprbl\/root,vukasinmilosevic\/root,strykejern\/TTreeReader,kirbyherm\/root-r-tools,bbockelm\/root,ffurano\/root5,smarinac\/root,smarinac\/root,mhuwiler\/rootauto,esakellari\/my_root_for_test,Dr15Jones\/root,simonpf\/root,esakellari\/my_root_for_test,veprbl\/root,lgiommi\/root,georgtroska\/root,sbinet\/cxx-root,gganis\/root,nilqed\/root,simonpf\/root,satyarth934\/root,zzxuanyuan\/root-compressor-dummy,BerserkerTroll\/root,satyarth934\/root,tc3t\/qoot,zzxuanyuan\/root,georgtroska\/root,cxx-hep\/root-cern,dfunke\/root,mattkretz\/root,perovic\/root,arch1tect0r\/root,satyarth934\/root,mhuwiler\/rootauto,CristinaCristescu\/root,esakellari\/root,davidlt\/root,esakellari\/root,Duraznos\/root,pspe\/root,evgeny-boger\/root,mhuwiler\/rootauto,pspe\/root,gbitzes\/root,gbitzes\/root,gganis\/root,arch1tect0r\/root,ffurano\/root5,gganis\/root,davidlt\/root,georgtroska\/root,0x0all\/ROOT,Y--\/root,strykejern\/TTreeReader,nilqed\/root,gbitzes\/root,zzxuanyuan\/root,esakellari\/root,olifre\/root,pspe\/root,BerserkerTroll\/root,bbockelm\/root,krafczyk\/root,root-mirror\/root,Y--\/root,satyarth934\/root,karies\/root,gbitzes\/root,CristinaCristescu\/root,tc3t\/qoot,kirbyherm\/root-r-tools,alexschlueter\/cern-root,dfunke\/root,evgeny-boger\/root,krafczyk\/root,thomaskeck\/root,dfunke\/root,karies\/root,beniz\/root,alexschlueter\/cern-root,mattkretz\/root,Y--\/root,cxx-hep\/root-cern,buuck\/root,gbitzes\/root,perovic\/root,karies\/root,agarciamontoro\/root,thomaskeck\/root,buuck\/root,gganis\/root,jrtomps\/root,olifre\/root,simonpf\/root,CristinaCristescu\/root,beniz\/root,sawenzel\/root,mattkretz\/root,Dr15Jones\/root,root-mirror\/root,Dr15Jones\/root,esakellari\/my_root_for_test,georgtroska\/root,thomaskeck\/root,dfunke\/root,zzxuanyuan\/root-compressor-dummy,jrtomps\/root,root-mirror\/root,smarinac\/root,gganis\/root,gbitzes\/root,0x0all\/ROOT,agarciamontoro\/root,sirinath\/root,abhinavmoudgil95\/root,satyarth934\/root,evgeny-boger\/root,abhinavmoudgil95\/root,thomaskeck\/root,0x0all\/ROOT,olifre\/root,strykejern\/TTreeReader,mkret2\/root,tc3t\/qoot,zzxuanyuan\/root,pspe\/root,thomaskeck\/root,mkret2\/root,thomaskeck\/root,BerserkerTroll\/root,bbockelm\/root,agarciamontoro\/root,karies\/root,beniz\/root,nilqed\/root,esakellari\/my_root_for_test,mhuwiler\/rootauto,evgeny-boger\/root,mattkretz\/root,omazapa\/root-old,tc3t\/qoot,sirinath\/root,vukasinmilosevic\/root,davidlt\/root,omazapa\/root,mkret2\/root,karies\/root,jrtomps\/root,perovic\/root,mkret2\/root,dfunke\/root,esakellari\/my_root_for_test,pspe\/root,omazapa\/root,georgtroska\/root,mkret2\/root,dfunke\/root,CristinaCristescu\/root,simonpf\/root,BerserkerTroll\/root,dfunke\/root,mattkretz\/root,sirinath\/root,sbinet\/cxx-root,sawenzel\/root,sbinet\/cxx-root,sawenzel\/root,tc3t\/qoot,Duraznos\/root,evgeny-boger\/root,zzxuanyuan\/root-compressor-dummy,gbitzes\/root,olifre\/root,bbockelm\/root,esakellari\/my_root_for_test,arch1tect0r\/root,zzxuanyuan\/root-compressor-dummy,krafczyk\/root,gganis\/root,lgiommi\/root,strykejern\/TTreeReader,gganis\/root,sbinet\/cxx-root,arch1tect0r\/root,omazapa\/root-old,zzxuanyuan\/root,veprbl\/root,simonpf\/root,beniz\/root,olifre\/root,mhuwiler\/rootauto,perovic\/root,ffurano\/root5,evgeny-boger\/root,sbinet\/cxx-root,davidlt\/root,Y--\/root,bbockelm\/root,cxx-hep\/root-cern,georgtroska\/root,esakellari\/root,satyarth934\/root,evgeny-boger\/root,davidlt\/root,agarciamontoro\/root,lgiommi\/root,georgtroska\/root,Y--\/root,satyarth934\/root,beniz\/root,sawenzel\/root,nilqed\/root,sawenzel\/root,sirinath\/root,beniz\/root,agarciamontoro\/root,root-mirror\/root,Y--\/root,nilqed\/root,bbockelm\/root,CristinaCristescu\/root,cxx-hep\/root-cern,esakellari\/my_root_for_test,omazapa\/root,Duraznos\/root,mhuwiler\/rootauto,olifre\/root,zzxuanyuan\/root-compressor-dummy,satyarth934\/root,simonpf\/root,mhuwiler\/rootauto,veprbl\/root,krafczyk\/root,root-mirror\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- base\/inc\/Rtypes.h\n+++ base\/inc\/Rtypes.h\n@@ -1,4 +1,4 @@\n-\/* @(#)root\/base:$Name: $:$Id: Rtypes.h,v 1.19 2002\/05\/09 22:55:12 rdm Exp $ *\/\n+\/* @(#)root\/base:$Name: $:$Id: Rtypes.h,v 1.20 2002\/05\/10 21:32:08 brun Exp $ *\/\n \n \/*************************************************************************\n * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *\n@@ -240,13 +240,16 @@\n #endif\n \n \n+#if defined(__CINT__) && !defined(__MAKECINT__)\n+#define ClassImp(name)\n+#else\n #define ClassImp(name) \\\n namespace ROOT { \\\n TGenericClassInfo *GenerateInitInstance(const name*); \\\n static int _R__UNIQUE_(R__dummyint) = \\\n GenerateInitInstance((name*)0x0)->SetImplFile(__FILE__, __LINE__); \\\n }\n-\n+#endif\n \/\/---- ClassDefT macros for templates with one template argument ---------------\n \/\/ ClassDefT corresponds to ClassDef\n \/\/ ClassDefT2 goes in the same header as ClassDefT but must be\n@@ -255,7 +258,7 @@\n \n \n \/\/ This ClassDefT is stricly redundant and is kept only for\n-\/\/ backward compatibility. Using #define ClassDef ClassDefT in confusing\n+\/\/ backward compatibility. Using #define ClassDef ClassDefT is confusing\n \/\/ the CINT parser.\n #if !defined(R__ACCESS_IN_SYMBOL) || defined(__CINT__)\n \n"} {"commit":"ee71265649a07e2a80cc8d3be27c61f12f4968f2","subject":"Update sparse_vec.h","message":"Update sparse_vec.h\n\nSimple unordered_map-based storage for sparse vector\r\n\r\nProvides basic methods to set \/ query elements.","repos":"malagbek\/yalp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- base\/sparse_vec.h\n+++ base\/sparse_vec.h\n@@ -4,12 +4,14 @@\n #include <unordered_map>\n #include <vector>\n #include <base\/macros.h>\n+#include <base\/sparse_entry.h>\n \n namespace yalp\n {\n \/\/\/ Container for sparse column \/ row\n class sparse_vec_um\n {\n+ \/\/ data storage\n typedef std::unordered_map<int, double> elts_;\n public:\n sparse_vec_um()\n@@ -27,16 +29,23 @@\n return *this;\n }\n \n+ size_t size() const\n+ {\n+ return elts_.size();\n+ }\n+ \n bool is_empty() const\n {\n return elts_.size() == 0;\n }\n \n+ \/\/\/ Checks whether given id is stored in vector\n bool contains(int i) const\n {\n return elts_.count(i) > 0;\n }\n \n+ \/\/\/ Retrives factor for given id or zero if not found\n double get(int i) const\n {\n auto it = elts_.find(i);\n@@ -47,6 +56,29 @@\n else\n {\n return 0.0;\n+ }\n+ }\n+ \n+ \/\/\/ Sets factor for given ID.\n+ \/\/\/\n+ \/\/\/ If v is zero then entry is removed\n+ void set(int i, double v)\n+ {\n+ auto it = elts_.find(i);\n+ if (it != elts_.end())\n+ {\n+ if (v != 0.0)\n+ {\n+ it->second = v;\n+ }\n+ else\n+ {\n+ elts_.erase(it);\n+ }\n+ }\n+ else if (v != 0.0)\n+ {\n+ elts_.insert(std::make_pair(i, v));\n }\n }\n \n@@ -74,22 +106,19 @@\n return it->second;\n }\n \n- \/\/\/ retrieves sorted lists of indices and factors\n- void get(std::vector<int> &indices, std::vector<double> &factors) const\n+ \/\/\/ retrieves sorted lists of non-zero entries\n+ void get_entries(std::vector<sparse_entry_t> &entries) const\n {\n- indices.clear();\n- indices.reserve(elts_.size());\n+ entries.clear();\n+ entries.reserve(elts_.size());\n for (auto it = elts_.begin(); it != elts_.end(); ++it)\n {\n- indices.push_back(it->first);\n+ if (it->second != 0.0)\n+ {\n+ entries.push_back(sparse_entry_t(it->first, it->second));\n+ }\n }\n- std::sort(indices.begin(), indices.end());\n- factors.clear();\n- factors.reserve(elts_.size());\n- for (auto it = indices.begin(); it != indices.end(); ++it)\n- {\n- factors.push_back(elts_[*it]);\n- }\n+ std::sort(entries.begin(), entries.end());\n }\n };\n }\n"} {"commit":"57039838368dd04377ca4dd14dbee5229d26b7b2","subject":"Start work on a ActionScript compiler","message":"Start work on a ActionScript compiler\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec","returncode":1,"stderr":"error: pathspec 'vivified\/code\/compiler.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- vivified\/code\/compiler.c\n+++ vivified\/code\/compiler.c\n@@ -0,0 +1,563 @@\n+#include <glib.h>\n+#include <string.h>\n+\n+typedef enum {\n+ STATUS_FAIL = -1,\n+ STATUS_OK = 0,\n+ STATUS_CANCEL = 1\n+} ParseStatus;\n+\n+enum {\n+ TOKEN_FUNCTION = G_TOKEN_LAST + 1,\n+ TOKEN_PLUSPLUS = G_TOKEN_LAST + 2,\n+ TOKEN_MINUSMINUS = G_TOKEN_LAST + 3,\n+ TOKEN_NEW = G_TOKEN_LAST + 4\n+};\n+\n+typedef enum {\n+ SYMBOL_NONE,\n+ \/\/ top\n+ SYMBOL_SOURCE_ELEMENT,\n+ \/\/ function\n+ SYMBOL_FUNCTION_DECLARATION,\n+ \/\/ statement\n+ SYMBOL_STATEMENT,\n+ SYMBOL_BLOCK,\n+ SYMBOL_VARIABLE_STATEMENT,\n+ SYMBOL_EMPTY_STATEMENT,\n+ SYMBOL_EXPRESSION_STATEMENT,\n+ SYMBOL_IF_STATEMENT,\n+ SYMBOL_ITERATION_STATEMENT,\n+ SYMBOL_CONTINUE_STATEMENT,\n+ SYMBOL_BREAK_STATEMENT,\n+ SYMBOL_RETURN_STATEMENT,\n+ SYMBOL_WITH_STATEMENT,\n+ SYMBOL_LABELLED_STATEMENT,\n+ SYMBOL_SWITCH_STATEMENT,\n+ SYMBOL_THROW_STATEMENT,\n+ SYMBOL_TRY_STATEMENT,\n+ \/\/ expression\n+ SYMBOL_EXPRESSION,\n+ SYMBOL_ASSIGNMENT_EXPRESSION,\n+ SYMBOL_CONDITIONAL_EXPRESSION,\n+ SYMBOL_LEFT_HAND_SIDE_EXPRESSION,\n+ SYMBOL_OPERATOR_EXPRESSION,\n+ SYMBOL_UNARY_EXPRESSION,\n+ SYMBOL_POSTFIX_EXPRESSION,\n+ SYMBOL_NEW_EXPRESSION,\n+ SYMBOL_CALL_EXPRESSION,\n+ SYMBOL_MEMBER_EXPRESSION,\n+ SYMBOL_FUNCTION_EXPRESSION,\n+ SYMBOL_PRIMARY_EXPRESSION,\n+ \/\/ misc\n+ SYMBOL_IDENTIFIER,\n+ SYMBOL_ASSIGNMENT_OPERATOR,\n+ SYMBOL_ARGUMENTS,\n+} ParseSymbol;\n+\n+typedef ParseStatus (*ParseFunction) (GScanner *scanner);\n+\n+static ParseStatus parse (GScanner *scanner, ParseSymbol symbol);\n+static ParseStatus parse_list (GScanner *scanner, ParseSymbol symbol);\n+\n+\/\/ helpers\n+\n+static gboolean\n+check_token (GScanner *scanner, guint token)\n+{\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token != token)\n+ return FALSE;\n+ g_scanner_get_next_token (scanner);\n+ return TRUE;\n+}\n+\n+\/\/ top\n+\n+static ParseStatus\n+parse_source_element (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_FUNCTION_DECLARATION);\n+\n+ if (status == STATUS_CANCEL)\n+ status = parse (scanner, SYMBOL_STATEMENT);\n+\n+ return status;\n+}\n+\n+\/\/ function\n+\n+static ParseStatus\n+parse_function_declaration (GScanner *scanner)\n+{\n+ if (!check_token (scanner, TOKEN_FUNCTION))\n+ return STATUS_CANCEL;\n+\n+ if (parse (scanner, SYMBOL_IDENTIFIER) != STATUS_OK)\n+ return STATUS_FAIL;\n+\n+ if (!check_token (scanner, '('))\n+ return STATUS_FAIL;\n+\n+ if (parse_list (scanner, SYMBOL_IDENTIFIER) == STATUS_FAIL)\n+ return STATUS_FAIL;\n+\n+ if (!check_token (scanner, ')'))\n+ return STATUS_FAIL;\n+\n+ if (!check_token (scanner, '{'))\n+ return STATUS_FAIL;\n+\n+ if (parse_list (scanner, SYMBOL_SOURCE_ELEMENT) == STATUS_FAIL)\n+ return STATUS_FAIL;\n+\n+ if (!check_token (scanner, '}'))\n+ return STATUS_FAIL;\n+\n+ return STATUS_OK;\n+}\n+\n+\/\/ statement\n+\n+static ParseStatus\n+parse_statement (GScanner *scanner)\n+{\n+ int i, status;\n+ ParseSymbol options[] = {\n+ SYMBOL_BLOCK,\n+ SYMBOL_VARIABLE_STATEMENT,\n+ SYMBOL_EMPTY_STATEMENT,\n+ SYMBOL_EXPRESSION_STATEMENT,\n+ SYMBOL_IF_STATEMENT,\n+ SYMBOL_ITERATION_STATEMENT,\n+ SYMBOL_CONTINUE_STATEMENT,\n+ SYMBOL_BREAK_STATEMENT,\n+ SYMBOL_RETURN_STATEMENT,\n+ SYMBOL_WITH_STATEMENT,\n+ SYMBOL_LABELLED_STATEMENT,\n+ SYMBOL_SWITCH_STATEMENT,\n+ SYMBOL_THROW_STATEMENT,\n+ SYMBOL_TRY_STATEMENT,\n+ SYMBOL_NONE\n+ };\n+\n+ for (i = 0; options[i] != SYMBOL_NONE; i++) {\n+ status = parse (scanner, options[i]);\n+ if (status != STATUS_CANCEL)\n+ return status;\n+ }\n+\n+ return STATUS_CANCEL;\n+}\n+\n+static ParseStatus\n+parse_block (GScanner *scanner)\n+{\n+ if (!check_token (scanner, '{'))\n+ return STATUS_CANCEL;\n+\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token != '}') {\n+ if (parse_list (scanner, SYMBOL_STATEMENT) != STATUS_OK)\n+ return STATUS_FAIL;\n+ }\n+\n+ if (!check_token (scanner, '}'))\n+ return STATUS_FAIL;\n+\n+ return STATUS_OK;\n+}\n+\n+static ParseStatus\n+parse_empty_statement (GScanner *scanner)\n+{\n+ if (!check_token (scanner, ';'))\n+ return STATUS_CANCEL;\n+\n+ return STATUS_OK;\n+}\n+\n+static ParseStatus\n+parse_expression_statement (GScanner *scanner)\n+{\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token == '{' || scanner->next_token == TOKEN_FUNCTION)\n+ return STATUS_CANCEL;\n+\n+ return parse (scanner, SYMBOL_EXPRESSION);\n+}\n+\n+\/\/ expression\n+\n+static ParseStatus\n+parse_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_ASSIGNMENT_EXPRESSION);\n+ if (status != STATUS_OK)\n+ return status;\n+\n+ do {\n+ if (!check_token (scanner, ','))\n+ return STATUS_OK;\n+ } while (parse (scanner, SYMBOL_ASSIGNMENT_EXPRESSION) == STATUS_OK);\n+\n+ return STATUS_FAIL;\n+}\n+\n+static ParseStatus\n+parse_assignment_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_LEFT_HAND_SIDE_EXPRESSION);\n+ if (status == STATUS_OK) {\n+ status = parse (scanner, SYMBOL_ASSIGNMENT_OPERATOR);\n+ if (status == STATUS_CANCEL)\n+ return STATUS_OK;\n+ if (status == STATUS_FAIL)\n+ return STATUS_FAIL;\n+ if (parse (scanner, SYMBOL_ASSIGNMENT_EXPRESSION) != STATUS_OK)\n+ return STATUS_FAIL;\n+ return STATUS_OK;\n+ } else if (status == STATUS_CANCEL) {\n+ return parse (scanner, SYMBOL_CONDITIONAL_EXPRESSION);\n+ } else {\n+ return STATUS_FAIL;\n+ }\n+}\n+\n+static ParseStatus\n+parse_conditional_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_OPERATOR_EXPRESSION);\n+ if (status != STATUS_OK)\n+ return status;\n+\n+ if (!check_token (scanner, '?'))\n+ return STATUS_OK;\n+\n+ if (parse (scanner, SYMBOL_ASSIGNMENT_EXPRESSION) != STATUS_OK)\n+ return STATUS_FAIL;\n+\n+ if (!check_token (scanner, ':'))\n+ return STATUS_FAIL;\n+\n+ if (parse (scanner, SYMBOL_ASSIGNMENT_EXPRESSION) != STATUS_OK)\n+ return STATUS_FAIL;\n+\n+ return STATUS_OK;\n+}\n+\n+static ParseStatus\n+parse_operator_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_UNARY_EXPRESSION);\n+ if (status != STATUS_OK)\n+ return status;\n+\n+ do {\n+ if (!check_token (scanner, '+'))\n+ return STATUS_OK;\n+ } while (parse (scanner, SYMBOL_UNARY_EXPRESSION) == STATUS_OK);\n+\n+ return STATUS_FAIL;\n+}\n+\n+static ParseStatus\n+parse_unary_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_POSTFIX_EXPRESSION);\n+ if (status != STATUS_OK)\n+ return status;\n+\n+ do {\n+ if (!check_token (scanner, '!'))\n+ return STATUS_OK;\n+ } while (parse (scanner, SYMBOL_POSTFIX_EXPRESSION) == STATUS_OK);\n+\n+ return STATUS_FAIL;\n+}\n+\n+static ParseStatus\n+parse_postfix_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_LEFT_HAND_SIDE_EXPRESSION);\n+ if (status != STATUS_OK)\n+ return status;\n+\n+ \/\/ don't allow new line here\n+\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token == TOKEN_PLUSPLUS ||\n+ scanner->next_token == TOKEN_MINUSMINUS) {\n+ g_scanner_get_next_token (scanner);\n+ return STATUS_OK;\n+ }\n+\n+ return STATUS_OK;\n+}\n+\n+static ParseStatus\n+parse_left_hand_side_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ status = parse (scanner, SYMBOL_NEW_EXPRESSION);\n+ if (status == STATUS_CANCEL)\n+ status = parse (scanner, SYMBOL_CALL_EXPRESSION);\n+\n+ return status;\n+}\n+\n+static ParseStatus\n+parse_new_expression (GScanner *scanner)\n+{\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token == TOKEN_NEW) {\n+ g_scanner_get_next_token (scanner);\n+ if (parse (scanner, SYMBOL_NEW_EXPRESSION) != STATUS_OK)\n+ return STATUS_FAIL;\n+ return STATUS_OK;\n+ } else {\n+ return parse (scanner, SYMBOL_MEMBER_EXPRESSION);\n+ }\n+}\n+\n+static ParseStatus\n+parse_member_expression (GScanner *scanner)\n+{\n+ ParseStatus status;\n+\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token == TOKEN_NEW) {\n+ g_scanner_get_next_token (scanner);\n+ if (parse (scanner, SYMBOL_MEMBER_EXPRESSION) != STATUS_OK)\n+ return STATUS_FAIL;\n+ if (parse (scanner, SYMBOL_ARGUMENTS) != STATUS_OK)\n+ return STATUS_FAIL;\n+ return STATUS_OK;\n+ }\n+\n+ status = parse (scanner, SYMBOL_PRIMARY_EXPRESSION);\n+ if (status == STATUS_CANCEL)\n+ status = parse (scanner, SYMBOL_FUNCTION_EXPRESSION);\n+\n+ if (status != 0)\n+ return status;\n+\n+ do {\n+ g_scanner_peek_next_token (scanner);\n+ if (scanner->next_token == '[') {\n+ g_scanner_get_next_token (scanner);\n+ if (parse (scanner, SYMBOL_EXPRESSION) != STATUS_OK)\n+\treturn STATUS_FAIL;\n+ if (!check_token (scanner, ']'))\n+\treturn STATUS_FAIL;\n+ } else if (scanner->next_token == '.') {\n+ g_scanner_get_next_token (scanner);\n+ if (parse (scanner, SYMBOL_IDENTIFIER) != STATUS_OK)\n+\treturn STATUS_FAIL;\n+ } else {\n+ return STATUS_OK;\n+ }\n+ } while (TRUE);\n+\n+ g_assert_not_reached ();\n+ return STATUS_FAIL;\n+}\n+\n+static ParseStatus\n+parse_primary_expression (GScanner *scanner)\n+{\n+ return parse (scanner, SYMBOL_IDENTIFIER);\n+}\n+\n+\/\/ misc.\n+\n+static ParseStatus\n+parse_identifier (GScanner *scanner)\n+{\n+ if (!check_token (scanner, G_TOKEN_IDENTIFIER))\n+ return STATUS_CANCEL;\n+\n+ return STATUS_OK;\n+}\n+\n+static ParseStatus\n+parse_assignment_operator (GScanner *scanner)\n+{\n+ if (!check_token (scanner, '='))\n+ return STATUS_CANCEL;\n+\n+ return STATUS_OK;\n+}\n+\n+\/\/ parsing\n+\n+static const struct {\n+ ParseSymbol\t\tid;\n+ const char *\t\tname;\n+ ParseFunction\t\tparse;\n+} symbols[] = {\n+ \/\/ top\n+ { SYMBOL_SOURCE_ELEMENT, \"SourceElement\", parse_source_element },\n+ \/\/ function\n+ { SYMBOL_FUNCTION_DECLARATION, \"FunctionDeclaration\",\n+ parse_function_declaration },\n+ \/\/ statement\n+ { SYMBOL_STATEMENT, \"Statement\", parse_statement },\n+ { SYMBOL_BLOCK, \"Block\", parse_block },\n+ { SYMBOL_EMPTY_STATEMENT, \"EmptyStatement\", parse_empty_statement },\n+ { SYMBOL_EXPRESSION_STATEMENT, \"ExpressionStatement\",\n+ parse_expression_statement },\n+ \/\/ expression\n+ { SYMBOL_EXPRESSION, \"Expression\", parse_expression },\n+ { SYMBOL_ASSIGNMENT_EXPRESSION, \"AssigmentExpression\",\n+ parse_assignment_expression },\n+ { SYMBOL_CONDITIONAL_EXPRESSION, \"ConditionalExpression\",\n+ parse_conditional_expression },\n+ { SYMBOL_OPERATOR_EXPRESSION, \"OperatorExpression\",\n+ parse_operator_expression },\n+ { SYMBOL_UNARY_EXPRESSION, \"UnaryExpression\", parse_unary_expression },\n+ { SYMBOL_POSTFIX_EXPRESSION, \"PostfixExpression\", parse_postfix_expression },\n+ { SYMBOL_LEFT_HAND_SIDE_EXPRESSION, \"LeftHandSideExpression\",\n+ parse_left_hand_side_expression },\n+ { SYMBOL_NEW_EXPRESSION, \"NewExpression\", parse_new_expression },\n+ { SYMBOL_MEMBER_EXPRESSION, \"MemberExpression\", parse_member_expression },\n+ { SYMBOL_PRIMARY_EXPRESSION, \"PrimaryExpression\", parse_primary_expression },\n+ \/\/ misc\n+ { SYMBOL_IDENTIFIER, \"Identifier\", parse_identifier },\n+ { SYMBOL_ASSIGNMENT_OPERATOR, \"AssignmentOperator\",\n+ parse_assignment_operator },\n+ { SYMBOL_NONE, NULL, NULL }\n+};\n+\n+static int\n+parse (GScanner *scanner, ParseSymbol symbol)\n+{\n+ int i;\n+\n+ for (i = 0; symbols[i].id != SYMBOL_NONE; i++) {\n+ if (symbols[i].id == symbol) {\n+ int ret = symbols[i].parse (scanner);\n+ if (ret != 1)\n+\tg_print (\":%i: %s\\n\", ret, symbols[i].name);\n+ return ret;\n+ }\n+ }\n+\n+ \/\/g_assert_not_reached ();\n+ return 1;\n+}\n+\n+static gboolean\n+parse_list (GScanner *scanner, ParseSymbol symbol)\n+{\n+ int ret;\n+\n+ ret = parse (scanner, symbol);\n+ if (ret != 0)\n+ return ret;\n+\n+ do {\n+ ret = parse (scanner, symbol);\n+ if (ret == -1)\n+ return -1;\n+ } while (ret == 0);\n+\n+ return 0;\n+}\n+\n+\/\/ main\n+\n+int\n+main (int argc, char *argv[])\n+{\n+ GScanner *scanner;\n+ char *test_text;\n+ gsize test_text_len;\n+ int ret;\n+\n+ if (argc < 2) {\n+ g_print (\"Usage!\\n\");\n+ return 1;\n+ }\n+\n+ if (!g_file_get_contents (argv[1], &test_text, &test_text_len, NULL)) {\n+ g_printerr (\"Couldn't open file %s\", argv[1]);\n+ return -1;\n+ }\n+\n+ scanner = g_scanner_new (NULL);\n+\n+ scanner->config->numbers_2_int = TRUE;\n+ scanner->config->int_2_float = TRUE;\n+ scanner->config->symbol_2_token = TRUE;\n+\n+ g_scanner_set_scope (scanner, 0);\n+ g_scanner_scope_add_symbol (scanner, 0, \"function\",\n+ GINT_TO_POINTER(TOKEN_FUNCTION));\n+ g_scanner_scope_add_symbol (scanner, 0, \"++\",\n+ GINT_TO_POINTER(TOKEN_PLUSPLUS));\n+ g_scanner_scope_add_symbol (scanner, 0, \"--\",\n+ GINT_TO_POINTER(TOKEN_MINUSMINUS));\n+ g_scanner_scope_add_symbol (scanner, 0, \"new\", GINT_TO_POINTER(TOKEN_NEW));\n+\n+ scanner->input_name = argv[1];\n+ g_scanner_input_text (scanner, test_text, test_text_len);\n+\n+\n+ ret = parse_list (scanner, SYMBOL_SOURCE_ELEMENT);\n+ g_print (\"%i: %i, %i\\n\", ret,\n+ g_scanner_cur_line (scanner), g_scanner_cur_position (scanner));\n+\n+ g_scanner_peek_next_token (scanner);\n+ while (scanner->next_token != G_TOKEN_EOF &&\n+ scanner->next_token != G_TOKEN_ERROR)\n+ {\n+ g_scanner_get_next_token (scanner);\n+ g_print (\":: %i, %i :: \", g_scanner_cur_line (scanner),\n+\tg_scanner_cur_position (scanner));\n+ switch (scanner->token) {\n+ case G_TOKEN_SYMBOL:\n+\tg_print (\"SYMBOL\\n\");\n+\tbreak;\n+ case G_TOKEN_FLOAT:\n+\tg_print (\"Primitive: %f\\n\", scanner->value.v_float);\n+\tbreak;\n+ case G_TOKEN_STRING:\n+\tg_print (\"Primitive: \\\"%s\\\"\\n\", scanner->value.v_string);\n+\tbreak;\n+ case G_TOKEN_NONE:\n+\tg_print (\"NONE\\n\");\n+\tbreak;\n+ case G_TOKEN_IDENTIFIER:\n+\tg_print (\"Identifier: %s\\n\", scanner->value.v_identifier);\n+\tbreak;\n+ default:\n+\tif (scanner->token > 0 && scanner->token < 256) {\n+\t g_print (\"%c\\n\", scanner->token);\n+\t} else {\n+\t g_print (\"TOKEN %i\\n\", scanner->token);\n+\t}\n+\tbreak;\n+ }\n+ g_scanner_peek_next_token (scanner);\n+ }\n+\n+ g_scanner_destroy (scanner);\n+\n+ return 0;\n+}\n"} {"commit":"890f1f10c383b40eaa83dc260624849ee7753bd7","subject":"+ fix linking error in Sandbox module","message":"+ fix linking error in Sandbox module\n","repos":"usakhelo\/FreeCAD,dsbrown\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,jonnor\/FreeCAD,kkoksvik\/FreeCAD,jonnor\/FreeCAD,maurerpe\/FreeCAD,mickele77\/FreeCAD,marcoitur\/Freecad_test,bblacey\/FreeCAD-MacOS-CI,timthelion\/FreeCAD,YuanYouYuan\/FreeCAD,dsbrown\/FreeCAD,mickele77\/FreeCAD,timthelion\/FreeCAD,wood-galaxy\/FreeCAD,maurerpe\/FreeCAD,kkoksvik\/FreeCAD,kkoksvik\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,jonnor\/FreeCAD,marcoitur\/FreeCAD,marcoitur\/Freecad_test,usakhelo\/FreeCAD,YuanYouYuan\/FreeCAD,dsbrown\/FreeCAD,cpollard1001\/FreeCAD_sf_master,chrisjaquet\/FreeCAD,marcoitur\/FreeCAD,usakhelo\/FreeCAD,Fat-Zer\/FreeCAD_sf_master,usakhelo\/FreeCAD,timthelion\/FreeCAD,cpollard1001\/FreeCAD_sf_master,chrisjaquet\/FreeCAD,jonnor\/FreeCAD,YuanYouYuan\/FreeCAD,kkoksvik\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,timthelion\/FreeCAD,marcoitur\/FreeCAD,chrisjaquet\/FreeCAD,wood-galaxy\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,timthelion\/FreeCAD,marcoitur\/Freecad_test,YuanYouYuan\/FreeCAD,chrisjaquet\/FreeCAD,wood-galaxy\/FreeCAD,wood-galaxy\/FreeCAD,Fat-Zer\/FreeCAD_sf_master,wood-galaxy\/FreeCAD,kkoksvik\/FreeCAD,bblacey\/FreeCAD-MacOS-CI,chrisjaquet\/FreeCAD,YuanYouYuan\/FreeCAD,dsbrown\/FreeCAD,mickele77\/FreeCAD,chrisjaquet\/FreeCAD,usakhelo\/FreeCAD,mickele77\/FreeCAD,timthelion\/FreeCAD,cpollard1001\/FreeCAD_sf_master,bblacey\/FreeCAD-MacOS-CI,marcoitur\/FreeCAD,mickele77\/FreeCAD,maurerpe\/FreeCAD,Fat-Zer\/FreeCAD_sf_master,cpollard1001\/FreeCAD_sf_master,Fat-Zer\/FreeCAD_sf_master,marcoitur\/FreeCAD,usakhelo\/FreeCAD,cpollard1001\/FreeCAD_sf_master,chrisjaquet\/FreeCAD,dsbrown\/FreeCAD,wood-galaxy\/FreeCAD,marcoitur\/Freecad_test,jonnor\/FreeCAD,marcoitur\/Freecad_test,usakhelo\/FreeCAD,maurerpe\/FreeCAD,Fat-Zer\/FreeCAD_sf_master,maurerpe\/FreeCAD","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Mod\/Sandbox\/App\/DocumentProtector.h\n+++ src\/Mod\/Sandbox\/App\/DocumentProtector.h\n@@ -49,16 +49,8 @@\n void recompute();\r\n \r\n private:\r\n- \/** Checks if a new document was created *\/\n- void slotCreatedDocument(const App::Document& Doc);\n \/** Checks if the given document is about to be closed *\/\n void slotDeletedDocument(const App::Document& Doc);\n- \/** Checks if a new object was added. *\/\n- void slotCreatedObject(const App::DocumentObject& Obj);\n- \/** Checks if the given object is about to be removed. *\/\n- void slotDeletedObject(const App::DocumentObject& Obj);\n- \/** The property of an observed object has changed *\/\n- void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);\n void validate();\n };\r\n \r\n"} {"commit":"8311b41974e50f2753921ba986bbd188f9bc28a0","subject":"Changes imported from Abseil \"staging\" branch:","message":"Changes imported from Abseil \"staging\" branch:\n\n - bb743d8b2017dc1ac181e9d2a90728b45eef344b Internal change. by Daniel Katz <katzdm@google.com>\n - a884af8e2bd70818168aad693b70b8fe98e96bcb Rearrange file comment. by Alex Strelnikov <strel@google.com>\n - 5ed241ef4d5bdc1ef52f7bca9c6ff42d0448e9f4 Internal change. by Alex Strelnikov <strel@google.com>\n - 04d44c8982d7b3077cae5e6189cb512818ce016b Add experiment documentation for MallocExtension API. by Chris Kennelly <ckennelly@google.com>\n\nGitOrigin-RevId: bb743d8b2017dc1ac181e9d2a90728b45eef344b\nChange-Id: Ia3ac079fc16b421a0f36be7dc0167045b92e417d\n","repos":"abseil\/abseil-cpp,abseil\/abseil-cpp,abseil\/abseil-cpp,firebase\/abseil-cpp,firebase\/abseil-cpp,firebase\/abseil-cpp,abseil\/abseil-cpp,firebase\/abseil-cpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- absl\/numeric\/int128.h\n+++ absl\/numeric\/int128.h\n@@ -17,9 +17,10 @@\n \/\/ File: int128.h\n \/\/ -----------------------------------------------------------------------------\n \/\/\n-\/\/ This header file defines 128-bit integer types. Currently, this file defines\n-\/\/ `uint128`, an unsigned 128-bit integer; a signed 128-bit integer is\n-\/\/ forthcoming.\n+\/\/ This header file defines 128-bit integer types.\n+\/\/\n+\/\/ Currently, this file defines `uint128`, an unsigned 128-bit integer; a signed\n+\/\/ 128-bit integer is forthcoming.\n \n #ifndef ABSL_NUMERIC_INT128_H_\n #define ABSL_NUMERIC_INT128_H_\n@@ -36,6 +37,7 @@\n #include \"absl\/base\/port.h\"\n \n namespace absl {\n+\n \n \/\/ uint128\n \/\/\n"} {"commit":"d425a75a7df26b5605dc3e9fd8ee68cf32e4b322","subject":"sandbox|predemod-sync: adding detection","message":"sandbox|predemod-sync: adding detection\n","repos":"manuts\/liquid-dsp,JayKickliter\/liquid-dsp,JayKickliter\/liquid-dsp,jgaeddert\/liquid-dsp,wangning223\/liquid-dsp,cjcliffe\/liquid-dsp,manuts\/liquid-dsp,cjcliffe\/liquid-dsp,andrepuschmann\/liquid-dsp,manuts\/liquid-dsp,biotrump\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,andrepuschmann\/liquid-dsp,wangning223\/liquid-dsp,biotrump\/liquid-dsp,JayKickliter\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,manuts\/liquid-dsp,biotrump\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,andrepuschmann\/liquid-dsp,wangning223\/liquid-dsp,manuts\/liquid-dsp,cjcliffe\/liquid-dsp,wangning223\/liquid-dsp,cjcliffe\/liquid-dsp,cjcliffe\/liquid-dsp,andrepuschmann\/liquid-dsp,wangning223\/liquid-dsp,jgaeddert\/liquid-dsp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sandbox\/predemod_sync_test.c\n+++ sandbox\/predemod_sync_test.c\n@@ -26,9 +26,9 @@\n int main(int argc, char*argv[]) {\n \/\/ options\n unsigned int k=4; \/\/ filter samples\/symbol\n- unsigned int m=3; \/\/ filter delay (symbols)\n+ unsigned int m=5; \/\/ filter delay (symbols)\n float beta=0.5f; \/\/ bandwidth-time product\n- float dt = 0.2f; \/\/ fractional sample timing offset\n+ float dt = 0.0f; \/\/ fractional sample timing offset\n unsigned int num_data_symbols = 64; \/\/ number of data symbols\n unsigned int npfb=16; \/\/ number of filters in bank\n float SNRdB = 30.0f; \/\/ signal-to-noise ratio [dB]\n@@ -67,12 +67,12 @@\n \/\/ arrays\n float complex x[num_samples]; \/\/ transmitted signal\n float complex y[num_samples]; \/\/ received signal\n- float complex z[num_symbols]; \/\/ decimated output\n- float complex rxy[num_symbols]; \/\/ pre-demod output\n+ float complex z[num_samples]; \/\/ matched filter output\n+ float complex rxy[num_samples]; \/\/ pre-demod output\n \n \/\/ create transmit\/receive interpolator\/decimator\n- interp_crcf interp_tx = interp_crcf_create_rnyquist(LIQUID_RNYQUIST_ARKAISER,k,m,beta,dt);\n- firpfb_crcf decim_rx = firpfb_crcf_create_rnyquist(LIQUID_RNYQUIST_ARKAISER,npfb,k,m,beta);\n+ interp_crcf interp_tx = interp_crcf_create_rnyquist(LIQUID_RNYQUIST_RRC,k,m,beta,dt);\n+ firpfb_crcf decim_rx = firpfb_crcf_create_rnyquist(LIQUID_RNYQUIST_RRC,npfb,k,m,beta);\n \n \/\/ create m-sequence generator\n unsigned int M = liquid_msb_index(g) - 1; \/\/ m-sequence shift register length\n@@ -92,27 +92,28 @@\n for (i=0; i<num_samples; i++)\n y[i] = x[i]*cexpf(_Complex_I*(dphi*i + phi)) + nstd*(randnf() + _Complex_I*randnf())*M_SQRT1_2;\n \n- \/\/ decimate\n+ \/\/ create cross-correlator\n+ bsync_crcf sync = bsync_crcf_create_msequence(g,k);\n+\n+ \/\/ decimate and push through synchronizer\n unsigned int j;\n- for (i=0; i<num_symbols; i++) {\n- for (j=0; j<k; j++) {\n- \/\/ push samples into filterbank\n- firpfb_crcf_push(decim_rx, y[k*i+j]);\n+ float rxy_max = 0.0f;\n+ for (i=0; i<num_samples; i++) {\n+ \/\/ push samples into filterbank\n+ firpfb_crcf_push(decim_rx, y[i]);\n \n- \/\/ compute output\n- if (j==k-1)\n- firpfb_crcf_execute(decim_rx, 0, &z[i]);\n- }\n- }\n- \n- \/\/ create cross-correlator\n- bsync_crcf sync = bsync_crcf_create_msequence(g,1);\n-\n- \/\/ push through synchronizer\n- float rxy_max = 0.0f;\n- for (i=0; i<num_symbols; i++) {\n+ \/\/ compute output\n+ firpfb_crcf_execute(decim_rx, 0, &z[i]);\n+ z[i] \/= (float)k;\n+ \n+ \/\/ correlate\n bsync_crcf_correlate(sync, z[i], &rxy[i]);\n \n+ \/\/ detect...\n+ if (cabsf(rxy[i]) > 0.6f) {\n+ printf(\"****** preamble found, rxy = %12.8f, i=%3u ******\\n\", cabsf(rxy[i]), i);\n+ }\n+ \n \/\/ retain maximum\n if (cabsf(rxy[i]) > rxy_max)\n rxy_max = cabsf(rxy[i]);\n@@ -147,9 +148,9 @@\n fprintf(fid,\"y(%4u) = %12.8f + j*%12.8f;\\n\", i+1, crealf(y[i]), cimagf(y[i]));\n fprintf(fid,\"rxy(%4u) = %12.8f + j*%12.8f;\\n\", i+1, crealf(rxy[i]), cimagf(rxy[i]));\n }\n- fprintf(fid,\"z = zeros(1,num_symbols);\\n\");\n- fprintf(fid,\"rxy = zeros(1,num_symbols);\\n\");\n- for (i=0; i<num_symbols; i++) {\n+ fprintf(fid,\"z = zeros(1,num_samples);\\n\");\n+ fprintf(fid,\"rxy = zeros(1,num_samples);\\n\");\n+ for (i=0; i<num_samples; i++) {\n fprintf(fid,\"z(%4u) = %12.8f + j*%12.8f;\\n\", i+1, crealf(z[i]), cimagf(z[i]));\n fprintf(fid,\"rxy(%4u) = %12.8f + j*%12.8f;\\n\", i+1, crealf(rxy[i]), cimagf(rxy[i]));\n }\n@@ -162,31 +163,30 @@\n fprintf(fid,\"s(%4u:%4u) = %3d;\\n\", k*i+1, k*(i+1), 2*(int)(msequence_advance(ms))-1);\n msequence_destroy(ms);\n \n- fprintf(fid,\"t=[0:(num_symbols-1)]\/k;\\n\");\n+ fprintf(fid,\"t=[0:(num_samples-1)]\/k;\\n\");\n fprintf(fid,\"figure;\\n\");\n fprintf(fid,\"plot(t,abs(rxy));\\n\");\n fprintf(fid,\"xlabel('time');\\n\");\n fprintf(fid,\"ylabel('correlator output');\\n\");\n fprintf(fid,\"grid on;\\n\");\n \n- fprintf(fid,\"return;\\n\");\n-\n \/\/ save...\n fprintf(fid,\"[v i] = max(abs(rxy));\\n\");\n fprintf(fid,\"i0=i-(k*N)+1;\\n\");\n fprintf(fid,\"i1=i;\\n\");\n- fprintf(fid,\"y_hat = y(i0:i1);\\n\");\n+ fprintf(fid,\"z_hat = z(i0:i1);\\n\");\n fprintf(fid,\"figure;\\n\");\n fprintf(fid,\"t_hat=0:(k*N-1);\\n\");\n- fprintf(fid,\"plot(t_hat,real(y_hat),...\\n\");\n- fprintf(fid,\" t_hat,imag(y_hat),...\\n\");\n+ fprintf(fid,\"plot(t_hat,real(z_hat),...\\n\");\n+ fprintf(fid,\" t_hat,imag(z_hat),...\\n\");\n+ fprintf(fid,\" t_hat(1:k:end),real(z_hat(1:k:end)),'x','MarkerSize',2,...\\n\");\n fprintf(fid,\" t_hat,s,'-k');\\n\");\n \n \/\/ run fft for timing recovery\n- fprintf(fid,\"Y_hat = fft(y_hat);\\n\");\n+ fprintf(fid,\"Z_hat = fft(z_hat);\\n\");\n fprintf(fid,\"S = fft(s);\\n\");\n fprintf(fid,\"figure;\\n\");\n- fprintf(fid,\"plot(fftshift(arg(Y_hat.\/S)));\\n\");\n+ fprintf(fid,\"plot(fftshift(arg(Z_hat.\/S)));\\n\");\n \n fclose(fid);\n printf(\"results written to '%s'\\n\", OUTPUT_FILENAME);\n"} {"commit":"ef00960996f425adf2e75e36ff59a0cb7eafe9de","subject":"Fixed compilation warning","message":"Fixed compilation warning\n","repos":"rdebroiz\/medInria-public,NicolasSchnitzler\/medInria-public,aabadie\/medInria-public,rdebroiz\/medInria-public,rdebroiz\/medInria-public,NicolasSchnitzler\/medInria-public,aabadie\/medInria-public,NicolasSchnitzler\/medInria-public,aabadie\/medInria-public","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- itkDataImage\/medITKDataImageMacros.h\n+++ itkDataImage\/medITKDataImageMacros.h\n@@ -44,17 +44,17 @@\n return;\n \n if (singlez)\n- { \n+ {\n typename ImageType::SizeType newSize = size;\n newSize[2] = 1;\n- \n+\n if (VDimension==4)\n newSize[3] = 1;\n- \n+\n typename ImageType::IndexType index;\n index.Fill( 0 );\n index[2] = size[2] \/ 2;\n- typename ImageType::RegionType region = img->GetLargestPossibleRegion(); \n+ typename ImageType::RegionType region = img->GetLargestPossibleRegion();\n region.SetIndex( index );\n region.SetSize( newSize );\n \n@@ -76,7 +76,7 @@\n size = img->GetLargestPossibleRegion().GetSize();\n \t img->DisconnectPipeline();\n }\n- \n+\n \/*\n QTime time;\n time.start();\n@@ -88,7 +88,7 @@\n typedef itk::Image<float, 2> FloatImage2DType;\n \n typedef itk::ExtractImageFilter<ImageType, Image2DType> ExtractFilterType;\n- typename ExtractFilterType::Pointer extractor = ExtractFilterType::New(); \n+ typename ExtractFilterType::Pointer extractor = ExtractFilterType::New();\n \n typename ImageType::RegionType extractionRegion = img->GetLargestPossibleRegion();\n extractionRegion.SetIndex(2, 0);\n@@ -112,14 +112,14 @@\n newSize[1] = xydim;\n \n typename Image2DType::SpacingType sfactor, sigma, variance;\n- \n+\n for (unsigned int i = 0; i < 2; ++i)\n \t{\n \t\tsfactor[i] = (double)size[i] \/ (double)newSize[i];\n \t\tnewSpacing[i] *= sfactor[i];\n \t\tsigma[i] = 0.5 * sfactor[i];\n \t}\n-\t\t\t \n+\n int index\t = size[0] > size[1] ? 0 : 1;\n \tsfactor[!index] = sfactor[index];\n \tvariance[!index] = variance[index];\n@@ -151,7 +151,7 @@\n resampler->SetSize (newSize);\n resampler->SetOutputSpacing (newSpacing);\n resampler->SetOutputOrigin (origin);\n- resampler->SetOutputDirection (extractor->GetOutput()->GetDirection()); \n+ resampler->SetOutputDirection (extractor->GetOutput()->GetDirection());\n \n \/\/ setup color mapping\n typedef itk::RGBPixel<unsigned char> RGBPixelType;\n@@ -165,18 +165,18 @@\n \n if (VDimension==3) {\n \n- for (int slice=0; slice<size[2]; slice++) {\n+ for (unsigned int slice=0; slice<size[2]; slice++) {\n \n extractionRegion.SetIndex(2, slice);\n extractor->SetExtractionRegion (extractionRegion);\n \n extractor->Update();\n \n- typename Image2DType::Pointer img2d = extractor->GetOutput(); \n+ typename Image2DType::Pointer img2d = extractor->GetOutput();\n \n if (size[0] > static_cast<unsigned int>(xydim) ||\n- size[1] > static_cast<unsigned int>(xydim) ) {\t\t\t \n- \n+ size[1] > static_cast<unsigned int>(xydim) ) {\n+\n smoother0->SetInput( extractor->GetOutput() );\n smoother0->Modified();\n \n@@ -207,7 +207,7 @@\n return;\n }\n \n- \/\/ qDebug() << \"Time elapsed: \" << time.elapsed(); \n+ \/\/ qDebug() << \"Time elapsed: \" << time.elapsed();\n \n QImage *qimage = new QImage (newSize[0], newSize[1], QImage::Format_ARGB32);\n uchar *qImageBuffer = qimage->bits();\n@@ -230,8 +230,8 @@\n }\n else if (VDimension==4)\n {\n- for (int volume=0; volume<size[3]; volume++) {\n- for (int slice=0; slice<size[2]; slice++) {\n+ for (unsigned int volume=0; volume<size[3]; volume++) {\n+ for (unsigned int slice=0; slice<size[2]; slice++) {\n \n extractionRegion.SetIndex(2, slice);\n extractionRegion.SetIndex(3, volume);\n@@ -239,11 +239,11 @@\n \n extractor->Update();\n \n- typename Image2DType::Pointer img2d = extractor->GetOutput(); \n+ typename Image2DType::Pointer img2d = extractor->GetOutput();\n \n if (size[0] > static_cast<unsigned int>(xydim) ||\n- size[1] > static_cast<unsigned int>(xydim) ) {\t\t\t \n- \n+ size[1] > static_cast<unsigned int>(xydim) ) {\n+\n smoother0->SetInput( extractor->GetOutput() );\n smoother0->Modified();\n \n@@ -260,7 +260,7 @@\n img2d = resampler->GetOutput();\n \t img2d->DisconnectPipeline();\n }\n- \n+\n rgbfilter->SetInput (img2d);\n rgbfilter->Modified();\n \n@@ -274,7 +274,7 @@\n return;\n }\n \n- \/\/ qDebug() << \"Time elapsed: \" << time.elapsed(); \n+ \/\/ qDebug() << \"Time elapsed: \" << time.elapsed();\n \n QImage *qimage = new QImage (newSize[0], newSize[1], QImage::Format_ARGB32);\n uchar *qImageBuffer = qimage->bits();\n@@ -716,52 +716,52 @@\n Q_UNUSED(key); \\\n Q_UNUSED(value); \\\n } \\\n- \n+\n #endif\n \n \n-\/* \n+\/*\n *\/\n \n-\/\/ if(!image.IsNull()) {\t\t\t\t\t\t\t\n-\/\/ d->image = image;\t\t\t\t\t\t\t\n-\/\/ typedef itk::MinimumMaximumImageCalculator<ImageType> MinMaxCalculatorType; \n-\/\/ MinMaxCalculatorType::Pointer calculator = MinMaxCalculatorType::New(); \n-\/\/ calculator->SetImage ( image );\t\t\t\t\t\n-\/\/ try\t\t\t\t\t\t\t\t\t\n-\/\/ {\t\t\t\t\t\t\t\t\t\n-\/\/ calculator->Compute();\t\t\t\t\t\t\n-\/\/ }\t\t\t\t\t\t\t\t\t\n-\/\/ catch (itk::ExceptionObject &e)\t\t\t\t\t\n-\/\/ {\t\t\t\t\t\t\t\t\t\n-\/\/ std::cerr << e;\t\t\t\t\t\t\t\n-\/\/ return;\t\t\t\t\t\t\t\t\n-\/\/ }\t\t\t\t\t\t\t\t\t\n-\/\/ d->range_min = calculator->GetMinimum();\t\t\t\t\n-\/\/ d->range_max = calculator->GetMaximum();\t\t\t\t\n-\/\/ std::cout << \"Image min\/max: \" << d->range_min << \" \" << d->range_max << std::endl; \n-\/\/ }\t\t\t\t\t\t\t\t\t\n-\n-\/\/typedef itkDataImage##suffix##Private::HistogramGeneratorType HistogramGeneratorType; \n-\/\/HistogramGeneratorType::Pointer histogramGenerator = HistogramGeneratorType::New(); \n-\/\/histogramGenerator->SetInput( image );\t\t\t\t\n-\/\/histogramGenerator->SetNumberOfBins( d->range_max - d->range_min + 1 ); \n-\/\/histogramGenerator->SetMarginalScale( 1.0 );\t\t\t\t\n-\/\/histogramGenerator->SetHistogramMin( d->range_min );\t\t\t\n-\/\/histogramGenerator->SetHistogramMax( d->range_max );\t\t\t\n-\/\/try\t\t\t\t\t\t\t\t\t\n-\/\/{\t\t\t\t\t\t\t\t\t\n-\/\/histogramGenerator->Compute();\t\t\t\t\t\n-\/\/}\t\t\t\t\t\t\t\t\t\n-\/\/catch (itk::ExceptionObject &e)\t\t\t\t\t\n-\/\/{\t\t\t\t\t\t\t\t\t\n-\/\/std::cerr << e;\t\t\t\t\t\t\t\n-\/\/return;\t\t\t\t\t\t\t\t\n-\/\/}\t\t\t\t\t\t\t\t\t\n-\/\/typedef HistogramGeneratorType::HistogramType HistogramType;\t\t\n-\/\/d->histogram = const_cast<HistogramType*>( histogramGenerator->GetOutput() ); \n-\/\/d->histogram_min = d->histogram->GetFrequency( d->range_min, 0 );\t\n-\/\/d->histogram_max = d->histogram->GetFrequency( d->range_max, 0 );\t\n+\/\/ if(!image.IsNull()) {\n+\/\/ d->image = image;\n+\/\/ typedef itk::MinimumMaximumImageCalculator<ImageType> MinMaxCalculatorType;\n+\/\/ MinMaxCalculatorType::Pointer calculator = MinMaxCalculatorType::New();\n+\/\/ calculator->SetImage ( image );\n+\/\/ try\n+\/\/ {\n+\/\/ calculator->Compute();\n+\/\/ }\n+\/\/ catch (itk::ExceptionObject &e)\n+\/\/ {\n+\/\/ std::cerr << e;\n+\/\/ return;\n+\/\/ }\n+\/\/ d->range_min = calculator->GetMinimum();\n+\/\/ d->range_max = calculator->GetMaximum();\n+\/\/ std::cout << \"Image min\/max: \" << d->range_min << \" \" << d->range_max << std::endl;\n+\/\/ }\n+\n+\/\/typedef itkDataImage##suffix##Private::HistogramGeneratorType HistogramGeneratorType;\n+\/\/HistogramGeneratorType::Pointer histogramGenerator = HistogramGeneratorType::New();\n+\/\/histogramGenerator->SetInput( image );\n+\/\/histogramGenerator->SetNumberOfBins( d->range_max - d->range_min + 1 );\n+\/\/histogramGenerator->SetMarginalScale( 1.0 );\n+\/\/histogramGenerator->SetHistogramMin( d->range_min );\n+\/\/histogramGenerator->SetHistogramMax( d->range_max );\n+\/\/try\n+\/\/{\n+\/\/histogramGenerator->Compute();\n+\/\/}\n+\/\/catch (itk::ExceptionObject &e)\n+\/\/{\n+\/\/std::cerr << e;\n+\/\/return;\n+\/\/}\n+\/\/typedef HistogramGeneratorType::HistogramType HistogramType;\n+\/\/d->histogram = const_cast<HistogramType*>( histogramGenerator->GetOutput() );\n+\/\/d->histogram_min = d->histogram->GetFrequency( d->range_min, 0 );\n+\/\/d->histogram_max = d->histogram->GetFrequency( d->range_max, 0 );\n \n \n \n"} {"commit":"3ca849691cf09d4b4e0561f334e9a4247cc9f06a","subject":"fixed a decoder bug","message":"fixed a decoder bug\n\nWhen 8x8 transform is enabled, the decoder does an extra reconstruct\non MBs that are coded using 8x8. This commit fixed the logic around\nthe decoding of mb encoded with 8x8 transform.\n\nChange-Id: I6926557c9ef00eecb375f62946f7e140c660bf6f\n","repos":"kim42083\/webm.libvpx,shacklettbp\/aom,luctrudeau\/aom,luctrudeau\/aom,smarter\/aom,VTCSecureLLC\/libvpx,n4t\/libvpx,mbebenita\/aom,Distrotech\/libvpx,ittiamvpx\/libvpx,charup\/https---github.com-webmproject-libvpx-,felipebetancur\/libvpx,mbebenita\/aom,webmproject\/libvpx,shareefalis\/libvpx,kalli123\/webm.libvpx,ittiamvpx\/libvpx,Suvarna1488\/webm.libvpx,mbebenita\/aom,kleopatra999\/webm.libvpx,smarter\/aom,hsueceumd\/test_hui,pcwalton\/libvpx,zofuthan\/libvpx,running770\/libvpx,GrokImageCompression\/aom,n4t\/libvpx,felipebetancur\/libvpx,mwgoldsmith\/libvpx,turbulenz\/libvpx,Topopiccione\/libvpx,matanbs\/vp982,matanbs\/webm.libvpx,lyx2014\/libvpx_c,mwgoldsmith\/vpx,jdm\/libvpx,kalli123\/webm.libvpx,VTCSecureLLC\/libvpx,zofuthan\/libvpx,Distrotech\/libvpx,ShiftMediaProject\/libvpx,matanbs\/webm.libvpx,mbebenita\/aom,kim42083\/webm.libvpx,matanbs\/vp982,zofuthan\/libvpx,gshORTON\/webm.libvpx,matanbs\/vp982,smarter\/aom,kleopatra999\/webm.libvpx,stewnorriss\/libvpx,openpeer\/libvpx_new,shyamalschandra\/libvpx,sanyaade-teachings\/libvpx,shyamalschandra\/libvpx,gshORTON\/webm.libvpx,pcwalton\/libvpx,cinema6\/libvpx,smarter\/aom,kleopatra999\/webm.libvpx,felipebetancur\/libvpx,Distrotech\/libvpx,reimaginemedia\/webm.libvpx,turbulenz\/libvpx,WebRTC-Labs\/libvpx,pcwalton\/libvpx,Topopiccione\/libvpx,stewnorriss\/libvpx,kim42083\/webm.libvpx,jmvalin\/aom,goodleixiao\/vpx,abwiz0086\/webm.libvpx,kalli123\/webm.libvpx,shareefalis\/libvpx,turbulenz\/libvpx,abwiz0086\/webm.libvpx,Acidburn0zzz\/webm.libvpx,jdm\/libvpx,WebRTC-Labs\/libvpx,kleopatra999\/webm.libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,lyx2014\/libvpx_c,altogother\/webm.libvpx,kalli123\/webm.libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx-1,n4t\/libvpx,cinema6\/libvpx,felipebetancur\/libvpx,felipebetancur\/libvpx,jdm\/libvpx,matanbs\/webm.libvpx,stewnorriss\/libvpx,Topopiccione\/libvpx,hsueceumd\/test_hui,vasilvv\/esvp8,abwiz0086\/webm.libvpx,webmproject\/libvpx,matanbs\/vp982,GrokImageCompression\/aom,sanyaade-teachings\/libvpx,altogother\/webm.libvpx,mwgoldsmith\/vpx,WebRTC-Labs\/libvpx,kim42083\/webm.libvpx,Acidburn0zzz\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,goodleixiao\/vpx,shyamalschandra\/libvpx,running770\/libvpx,Topopiccione\/libvpx,jmvalin\/aom,luctrudeau\/aom,ittiamvpx\/libvpx-1,mwgoldsmith\/vpx,goodleixiao\/vpx,matanbs\/webm.libvpx,jdm\/libvpx,ittiamvpx\/libvpx-1,reimaginemedia\/webm.libvpx,smarter\/aom,Laknot\/libvpx,Acidburn0zzz\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,kalli123\/webm.libvpx,shareefalis\/libvpx,jmvalin\/aom,lyx2014\/libvpx_c,thdav\/aom,kleopatra999\/webm.libvpx,liqianggao\/libvpx,kim42083\/webm.libvpx,Acidburn0zzz\/webm.libvpx,thdav\/aom,Distrotech\/libvpx,stewnorriss\/libvpx,shacklettbp\/aom,gshORTON\/webm.libvpx,ShiftMediaProject\/libvpx,Maria1099\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,GrokImageCompression\/aom,shyamalschandra\/libvpx,thdav\/aom,gshORTON\/webm.libvpx,ShiftMediaProject\/libvpx,altogother\/webm.libvpx,Acidburn0zzz\/webm.libvpx,vasilvv\/esvp8,ittiamvpx\/libvpx,jacklicn\/webm.libvpx,Topopiccione\/libvpx,WebRTC-Labs\/libvpx,hsueceumd\/test_hui,mbebenita\/aom,zofuthan\/libvpx,cinema6\/libvpx,Laknot\/libvpx,hsueceumd\/test_hui,shyamalschandra\/libvpx,openpeer\/libvpx_new,mwgoldsmith\/vpx,jmvalin\/aom,ShiftMediaProject\/libvpx,mbebenita\/aom,pcwalton\/libvpx,turbulenz\/libvpx,Maria1099\/webm.libvpx,jacklicn\/webm.libvpx,Maria1099\/webm.libvpx,WebRTC-Labs\/libvpx,mbebenita\/aom,Distrotech\/libvpx,ShiftMediaProject\/libvpx,shacklettbp\/aom,charup\/https---github.com-webmproject-libvpx-,openpeer\/libvpx_new,turbulenz\/libvpx,charup\/https---github.com-webmproject-libvpx-,pcwalton\/libvpx,VTCSecureLLC\/libvpx,cinema6\/libvpx,altogother\/webm.libvpx,vasilvv\/esvp8,turbulenz\/libvpx,jacklicn\/webm.libvpx,jacklicn\/webm.libvpx,zofuthan\/libvpx,matanbs\/vp982,mwgoldsmith\/vpx,zofuthan\/libvpx,matanbs\/vp982,ittiamvpx\/libvpx-1,shareefalis\/libvpx,gshORTON\/webm.libvpx,Suvarna1488\/webm.libvpx,smarter\/aom,altogother\/webm.libvpx,mbebenita\/aom,jacklicn\/webm.libvpx,luctrudeau\/aom,shareefalis\/libvpx,iniwf\/webm.libvpx,abwiz0086\/webm.libvpx,Laknot\/libvpx,running770\/libvpx,VTCSecureLLC\/libvpx,shyamalschandra\/libvpx,turbulenz\/libvpx,jacklicn\/webm.libvpx,lyx2014\/libvpx_c,turbulenz\/libvpx,ittiamvpx\/libvpx,mbebenita\/aom,goodleixiao\/vpx,vasilvv\/esvp8,Suvarna1488\/webm.libvpx,iniwf\/webm.libvpx,cinema6\/libvpx,vasilvv\/esvp8,running770\/libvpx,VTCSecureLLC\/libvpx,openpeer\/libvpx_new,matanbs\/webm.libvpx,reimaginemedia\/webm.libvpx,Laknot\/libvpx,shareefalis\/libvpx,liqianggao\/libvpx,webmproject\/libvpx,mwgoldsmith\/libvpx,n4t\/libvpx,GrokImageCompression\/aom,thdav\/aom,iniwf\/webm.libvpx,running770\/libvpx,mwgoldsmith\/libvpx,ittiamvpx\/libvpx,openpeer\/libvpx_new,cinema6\/libvpx,Suvarna1488\/webm.libvpx,turbulenz\/libvpx,abwiz0086\/webm.libvpx,shacklettbp\/aom,stewnorriss\/libvpx,Maria1099\/webm.libvpx,VTCSecureLLC\/libvpx,liqianggao\/libvpx,cinema6\/libvpx,pcwalton\/libvpx,thdav\/aom,Acidburn0zzz\/webm.libvpx,Maria1099\/webm.libvpx,hsueceumd\/test_hui,jdm\/libvpx,kleopatra999\/webm.libvpx,mwgoldsmith\/libvpx,Laknot\/libvpx,goodleixiao\/vpx,luctrudeau\/aom,jmvalin\/aom,felipebetancur\/libvpx,kalli123\/webm.libvpx,liqianggao\/libvpx,thdav\/aom,abwiz0086\/webm.libvpx,reimaginemedia\/webm.libvpx,sanyaade-teachings\/libvpx,n4t\/libvpx,Suvarna1488\/webm.libvpx,liqianggao\/libvpx,jdm\/libvpx,matanbs\/vp982,webmproject\/libvpx,Topopiccione\/libvpx,webmproject\/libvpx,reimaginemedia\/webm.libvpx,liqianggao\/libvpx,ittiamvpx\/libvpx-1,lyx2014\/libvpx_c,reimaginemedia\/webm.libvpx,lyx2014\/libvpx_c,Distrotech\/libvpx,shacklettbp\/aom,kim42083\/webm.libvpx,mwgoldsmith\/libvpx,sanyaade-teachings\/libvpx,shacklettbp\/aom,matanbs\/webm.libvpx,gshORTON\/webm.libvpx,running770\/libvpx,vasilvv\/esvp8,jmvalin\/aom,vasilvv\/esvp8,sanyaade-teachings\/libvpx,Laknot\/libvpx,altogother\/webm.libvpx,mwgoldsmith\/vpx,goodleixiao\/vpx,mwgoldsmith\/libvpx,stewnorriss\/libvpx,iniwf\/webm.libvpx,hsueceumd\/test_hui,Maria1099\/webm.libvpx,webmproject\/libvpx,openpeer\/libvpx_new,iniwf\/webm.libvpx,GrokImageCompression\/aom,Suvarna1488\/webm.libvpx,ittiamvpx\/libvpx-1,ittiamvpx\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp8\/decoder\/decodframe.c\n+++ vp8\/decoder\/decodframe.c\n@@ -449,6 +449,7 @@\n \n else\n #endif\n+ {\n if (xd->eobs[24] > 1)\n {\n IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0], b->diff);\n@@ -471,6 +472,7 @@\n (xd->qcoeff, xd->block[0].dequant,\n xd->predictor, xd->dst.y_buffer,\n xd->dst.y_stride, xd->eobs, xd->block[24].diff);\n+ }\n }\n #if CONFIG_T8X8\n if(xd->mode_info_context->mbmi.segment_id >= 2)\n@@ -604,7 +606,7 @@\n }\n \n #ifdef DEC_DEBUG\n- dec_debug = (pc->current_video_frame==5 && mb_row==2 && mb_col==3);\n+ dec_debug = (pc->current_video_frame==0 && mb_row==1 && mb_col==11);\n #endif\n decode_macroblock(pbi, xd, mb_row * pc->mb_cols + mb_col);\n \n"} {"commit":"7de185cfc1b34912049f4df0e95f54520f790e40","subject":"Added SOAP header adding support for service client","message":"Added SOAP header adding support for service client\n\n\ngit-svn-id: fbb392d5347ebc45c06187f72dfd8bab02595dbf@408653 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c,axbannaz\/axis2-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/core\/clientapi\/svc_client.c\n+++ modules\/core\/clientapi\/svc_client.c\n@@ -20,6 +20,7 @@\n #include \"callback_recv.h\"\n #include <axis2_soap_const.h>\n #include <axis2_soap_body.h>\n+#include <axis2_soap_header.h>\n #include \"listener_manager.h\"\n #include <axis2_module_desc.h>\n #include <axis2_array_list.h>\n@@ -1243,6 +1244,34 @@\n return AXIS2_FALSE;\n }\n \n+ if (svc_client_impl->headers)\n+ {\n+ axis2_soap_header_t *soap_header = NULL;\n+ soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(envelope, env);\n+ \n+ if (soap_header)\n+ {\n+ axis2_om_node_t *header_node = NULL;\n+ header_node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env);\n+\n+ if (header_node)\n+ {\n+ int size = 0;\n+ int i = 0;\n+ size = AXIS2_ARRAY_LIST_SIZE(svc_client_impl->headers, env);\n+ for (i = 0; i < size; i++)\n+ {\n+ axis2_om_node_t *node = NULL;\n+ node = AXIS2_ARRAY_LIST_GET(svc_client_impl->headers, env, i);\n+ if (node)\n+ {\n+ AXIS2_OM_NODE_ADD_CHILD(header_node, env, node);\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n if (payload)\n {\n axis2_soap_body_t *soap_body = NULL;\n"} {"commit":"c1a29e9ad630f6bae7b25a379303fa6746f6a99e","subject":"Tweak attribute list to improve test coverage","message":"Tweak attribute list to improve test coverage\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -5082,7 +5082,10 @@\n \" l='12'\"\n \" m='13'\"\n \" n='14'\"\n- \" p='15'>\"\n+ \" p='15'\"\n+ \" q='16'\"\n+ \" r='17'\"\n+ \" s='18'>\"\n \"<\/doc>\";\n int i;\n #define MAX_REALLOC_COUNT 10\n"} {"commit":"b63f534ed3ea9e6fa94b02de8809195772f29c5a","subject":"- C99 features removed","message":"- C99 features removed\n\n[r21913]\n","repos":"davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm,8l\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillbelady3.c\n+++ ir\/be\/bespillbelady3.c\n@@ -559,14 +559,16 @@\n \n \t\/* construct worklist *\/\n \tforeach_block_succ(block, edge) {\n-\t\tir_node *succ_block = get_edge_src_irn(edge);\n-\t\tdouble execfreq = get_block_execfreq(exec_freq, succ_block);\n+\t\tir_node *succ_block = get_edge_src_irn(edge);\n+\t\tdouble execfreq = get_block_execfreq(exec_freq, succ_block);\n+\t\tblock_info_t *block_info;\n+\t\tworklist_t *succ_worklist;\n \n \t\tif (execfreq < best_execfreq)\n \t\t\tcontinue;\n \n-\t\tblock_info_t *block_info = get_block_info(succ_block);\n-\t\tworklist_t *succ_worklist = block_info->start_worklist;\n+\t\tblock_info = get_block_info(succ_block);\n+\t\tsucc_worklist = block_info->start_worklist;\n \n \t\tif (succ_worklist == NULL || succ_worklist->visited >= worklist_visited)\n \t\t\tcontinue;\n@@ -757,15 +759,16 @@\n \n static void push_unused_livethrough(loop_info_t *loop_info, ir_node *value)\n {\n+\tloop_edge_t *edge;\n \t++worklist_visited;\n \n \t\/* add the value to all loop exit and entry blocks *\/\n-\tloop_edge_t *edge = loop_info->exit_edges;\n-\tfor ( ; edge != NULL; edge = edge->next) {\n+\tfor (edge = loop_info->exit_edges; edge != NULL; edge = edge->next) {\n \t\tir_node *block\n \t\t\t= get_Block_cfgpred_block(edge->block, edge->pos);\n \t\tconst block_info_t *info = get_block_info(block);\n \t\tworklist_t *worklist = info->end_worklist;\n+\t\tir_node *reload_point = NULL;\n \n \t\tif (worklist->visited >= worklist_visited)\n \t\t\tcontinue;\n@@ -773,7 +776,6 @@\n \n \t\t\/* TODO: we need a smarter mechanism here, that makes the reloader place\n \t\t * reload nodes on all loop exits... *\/\n-\t\tir_node *reload_point = NULL;\n \n \t\tworklist_append(worklist, value, reload_point, loop_info->loop);\n \t}\n@@ -782,14 +784,15 @@\n \t\tir_node *entry_block = edge->block;\n \t\tconst block_info_t *info = get_block_info(entry_block);\n \t\tworklist_t *worklist = info->start_worklist;\n+\t\tir_node *pred_block;\n+\t\tir_node *reload_point;\n \n \t\tif (worklist->visited >= worklist_visited)\n \t\t\tcontinue;\n \t\tworklist->visited = worklist_visited;\n \n-\t\tir_node *pred_block\n-\t\t\t= get_Block_cfgpred_block(entry_block, edge->pos);\n-\t\tir_node *reload_point = be_get_end_of_block_insertion_point(pred_block);\n+\t\tpred_block = get_Block_cfgpred_block(entry_block, edge->pos);\n+\t\treload_point = be_get_end_of_block_insertion_point(pred_block);\n \n \t\tworklist_append(worklist, value, reload_point, loop_info->loop);\n \t}\n"} {"commit":"c639a5548a5d8414b55202592885449f66ee2f33","subject":"ls-tree: --name-only","message":"ls-tree: --name-only\n\nFingers of some \"git diff\" users are trained to do --name-only\nwhich git-ls-tree unfortunately does not take. With this,\n\n\tcd sub\/directory && git-ls-tree -r --name-only ..\n\nwould show only the names not object names nor modes. I threw\nin another synonym --name-status only for usability, but\nobviously ls-tree does not do any comparison so what it does is\nthe same as --name-only.\n\nSigned-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ls-tree.c\n+++ ls-tree.c\n@@ -12,11 +12,12 @@\n #define LS_RECURSIVE 1\n #define LS_TREE_ONLY 2\n #define LS_SHOW_TREES 4\n+#define LS_NAME_ONLY 8\n static int ls_options = 0;\n const char **pathspec;\n \n static const char ls_tree_usage[] =\n-\t\"git-ls-tree [-d] [-r] [-t] [-z] <tree-ish> [path...]\";\n+\t\"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]\";\n \n static int show_recursive(const char *base, int baselen, const char *pathname)\n {\n@@ -64,7 +65,8 @@\n \telse if (ls_options & LS_TREE_ONLY)\n \t\treturn 0;\n \n-\tprintf(\"%06o %s %s\\t\", mode, type, sha1_to_hex(sha1));\n+\tif (!(ls_options & LS_NAME_ONLY))\n+\t\tprintf(\"%06o %s %s\\t\", mode, type, sha1_to_hex(sha1));\n \twrite_name_quoted(base, baselen, pathname, line_termination, stdout);\n \tputchar(line_termination);\n \treturn retval;\n@@ -92,6 +94,13 @@\n \t\tcase 't':\n \t\t\tls_options |= LS_SHOW_TREES;\n \t\t\tbreak;\n+\t\tcase '-':\n+\t\t\tif (!strcmp(argv[1]+2, \"name-only\") ||\n+\t\t\t !strcmp(argv[1]+2, \"name-status\")) {\n+\t\t\t\tls_options |= LS_NAME_ONLY;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\t\/* otherwise fallthru *\/\n \t\tdefault:\n \t\t\tusage(ls_tree_usage);\n \t\t}\n"} {"commit":"83a54681c34776fe8d503e46bcae5082f17ada3a","subject":"Refactoring : renaming GLC_Collection to GLC_3DViewCollection","message":"Refactoring : renaming GLC_Collection to GLC_3DViewCollection\n","repos":"3drepo\/GLC_lib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sceneGraph\/glc_worldhandle.h\n+++ sceneGraph\/glc_worldhandle.h\n@@ -25,7 +25,7 @@\n #ifndef GLC_WORLDHANDLE_H_\n #define GLC_WORLDHANDLE_H_\n \n-#include \"glc_collection.h\"\n+#include \"glc_3dviewcollection.h\"\n #include \"glc_structoccurence.h\"\n \n #include <QHash>\n@@ -54,7 +54,7 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n public:\n \t\/\/! Return the collection\n-\tinline GLC_Collection* collection()\n+\tinline GLC_3DViewCollection* collection()\n \t{return &m_Collection;}\n \n \t\/\/! Return the number of world associated with this handle\n@@ -126,7 +126,7 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n private:\n \t\/\/! The Collection\n-\tGLC_Collection m_Collection;\n+\tGLC_3DViewCollection m_Collection;\n \n \t\/\/! Number of this world\n \tint m_NumberOfWorld;\n"} {"commit":"6557910ccf36e098b1a0de4841be7c04c4ffd58a","subject":"wx\/utils.h and wx\/clipbrd.h not needed on bitcoind wxbase build","message":"wx\/utils.h and wx\/clipbrd.h not needed on bitcoind wxbase build\n\ngit-svn-id: 9fd741951f3c29832d6eb01aa60ca30847811a52@72 1a98c847-1fd6-4fd8-948a-caf3550aa51b\n","repos":"zixan\/bitcoin,ryanofsky\/bitcoin,robvanmieghem\/clams,Rav3nPL\/polcoin,cryptostorm\/namecoin,jmcorgan\/bitcoin,ccoin-project\/ccoin,micryon\/GPUcoin,Rav3nPL\/PLNcoin,adpg211\/bitcoin-master,fsb4000\/huntercoin,coinkeeper\/2015-06-22_19-10_cannacoin,gavinandresen\/bitcoin-git,kaostao\/bitcoin,compasscoin\/compasscoin,goldmidas\/goldmidas,prusnak\/bitcoin,ahmedbodi\/poscoin,dashpay\/dash,111t8e\/bitcoin,romanornr\/viacoin,ardsu\/bitcoin,Crypto-Currency\/BitBar,fussl\/elements,tropa\/axecoin,gameunits\/gameunits,jn2840\/bitcoin,MarcoFalke\/bitcoin,masterbraz\/dg,phelix\/namecore,MitchellMintCoins\/MortgageCoin,elliotolds\/bitcoin,tobeyrowe\/KitoniaCoin,DigiByte-Team\/digibyte,Bitcoinsulting\/bitcoinxt,diggcoin\/diggcoin,palm12341\/jnc,MoMoneyMonetarism\/ppcoin,parvez3019\/bitcoin,axelxod\/braincoin,millennial83\/bitcoin,Anoncoin\/anoncoin,fanquake\/bitcoin,gfneto\/Peershares,sdaftuar\/bitcoin,ArgonToken\/ArgonToken,jakeva\/bitcoin-pwcheck,welshjf\/bitcoin,litecoin-project\/litecore-litecoin,KibiCoin\/kibicoin,multicoins\/marycoin,diggcoin\/diggcoin,zottejos\/merelcoin,coinkeeper\/2015-06-22_19-10_cannacoin,theuni\/bitcoin,shaulkf\/bitcoin,daeMOn63\/Peershares,djpnewton\/bitcoin,andres-root\/bitcoinxt,razor-coin\/razor,thodg\/ppcoin,bitjson\/hivemind,gades\/novacoin,inkvisit\/sarmacoins,wbchen99\/bitcoin-hnote0,chaincoin\/chaincoin,jonasbits\/namecoin,fflo\/sixeleven,penek\/novacoin,rebroad\/bitcoin,bitcoinplusorg\/xbcwalletsource,yenliangl\/bitcoin,hsavit1\/bitcoin,coinkeeper\/2015-06-22_18-56_megacoin,zottejos\/merelcoin,Kixunil\/keynescoin,dpayne9000\/Rubixz-Coin,174high\/bitcoin,Lucky7Studio\/bitcoin,Ziftr\/Peerunity,andres-root\/bitcoinxt,reorder\/viacoin,bitcoin-hivemind\/hivemind,bitcoinknots\/bitcoin,hasanatkazmi\/bitcoin,fedoracoin-dev\/fedoracoin,marlengit\/BitcoinUnlimited,m0gliE\/fastcoin-cli,initaldk\/bitcoin,bittylicious\/bitcoin,upgradeadvice\/MUE-Src,funkshelper\/woodcore,Xekyo\/bitcoin,BlueMeanie\/PeerShares,som4paul\/BolieC,WorldcoinGlobal\/WorldcoinLegacy,lordsajan\/erupee,pataquets\/namecoin-core,collapsedev\/circlecash,n1bor\/bitcoin,SproutsEx\/SproutsExtreme,bitcoinxt\/bitcoinxt,bitpagar\/bitpagar,jrick\/bitcoin,mockcoin\/mockcoin,domob1812\/namecore,atgreen\/bitcoin,DynamicCoinOrg\/DMC,174high\/bitcoin,misdess\/bitcoin,neutrinofoundation\/neutrino-digital-currency,rnicoll\/dogecoin,deeponion\/deeponion,neureal\/noocoin,ya4-old-c-coder\/yacoin,rsdevgun16e\/energi,vlajos\/bitcoin,paveljanik\/bitcoin,okTurtles\/namecoin,aspanta\/bitcoin,GlobalBoost\/GlobalBoost,TeamBitBean\/bitcoin-core,GroestlCoin\/bitcoin,kleetus\/bitcoinxt,practicalswift\/bitcoin,MazaCoin\/maza,matlongsi\/micropay,peacedevelop\/peacecoin,coinerd\/krugercoin,xuyangcn\/opalcoin,IlfirinIlfirin\/shavercoin,ohac\/sha1coin,elambert2014\/cbx2,TrainMAnB\/vcoincore,1185\/starwels,dscotese\/bitcoin,dopecoin-dev\/DopeCoinGold,tatafiore\/mycoin,wederw\/bitcoin,sdaftuar\/bitcoin,goldcoin\/Goldcoin-GLD,dev1972\/Satellitecoin,bdelzell\/creditcoin-org-creditcoin,putinclassic\/putic,peerdb\/cors,dcousens\/bitcoin,lakepay\/lake,benzmuircroft\/REWIRE.io,unsystemizer\/bitcoin,dgenr8\/bitcoin,supcoin\/supcoin,antcheck\/antcoin,coinkeeper\/2015-06-22_19-13_florincoin,kseistrup\/twister-core,bitcoinsSG\/bitcoin,aciddude\/Feathercoin,micryon\/GPUcoin,wangliu\/bitcoin,ardsu\/bitcoin,error10\/bitcoin,Bushstar\/UFO-Project,josephbisch\/namecoin-core,grumpydevelop\/singularity,cqtenq\/feathercoin_core,wangliu\/bitcoin,tensaix2j\/bananacoin,arnuschky\/bitcoin,ccoin-project\/ccoin,butterflypay\/bitcoin,aspirecoin\/aspire,nathaniel-mahieu\/bitcoin,llluiop\/bitcoin,saydulk\/Feathercoin,CryptArc\/bitcoin,zetacoin\/zetacoin,bmp02050\/ReddcoinUpdates,gandrewstone\/bitcoinxt,valorbit\/valorbit-oss,1185\/starwels,UASF\/bitcoin,okinc\/litecoin,UASF\/bitcoin,spiritlinxl\/BTCGPU,peercoin\/peercoin,talpan\/namecoin,Kefkius\/clams,cmgustavo\/bitcoin,dexX7\/bitcoin,dogecoin\/dogecoin,Rav3nPL\/PLNcoin,jimblasko\/UnbreakableCoin-master,BlockchainTechLLC\/3dcoin,cdecker\/bitcoin,kryptokredyt\/ProjektZespolowyCoin,Kixunil\/keynescoin,kigooz\/smalltest,andreaskern\/bitcoin,cfromknecht\/namecoin-legacy,ingresscoin\/ingresscoin,psionin\/smartcoin,xieta\/mincoin,willwray\/dash,coblee\/litecoin-old,xurantju\/bitcoin,lbrtcoin\/albertcoin,degenorate\/Deftcoin,ivansib\/sibcoin,ahmedbodi\/Bytecoin-MM,BitzenyCoreDevelopers\/bitzeny,gjhiggins\/fuguecoin,BTCfork\/hardfork_prototype_1_mvf-core,upgradeadvice\/MUE-Src,svcop3\/svcop3,BTCfork\/hardfork_prototype_1_mvf-bu,CryptArc\/bitcoin,Infernoman\/crowncoin,Sjors\/bitcoin,themusicgod1\/bitcoin,bankonmecoin\/bitcoin,manuel-zulian\/accumunet,KillerByte\/memorypool,cyrixhero\/bitcoin,coinkeeper\/2015-06-22_18-39_feathercoin,jlopp\/statoshi,starwalkerz\/fincoin-fork,48thct2jtnf\/P,afk11\/bitcoin,fsb4000\/novacoin,Exgibichi\/statusquo,tensaix2j\/bananacoin,genavarov\/ladacoin,FeatherCoin\/Feathercoin,ripper234\/bitcoin,Rav3nPL\/PLNcoin,capitalDIGI\/litecoin,credits-currency\/credits,ixcoinofficialpage\/master,ceptacle\/libcoinqt,whatrye\/twister-core,jeromewu\/bitcoin-opennet,gjhiggins\/vcoin09,coinkeeper\/2015-06-22_18-56_megacoin,Ziftr\/namecoin,ixcoinofficialpage\/master,CodeShark\/bitcoin,Dinarcoin\/dinarcoin,AllanDoensen\/BitcoinUnlimited,richo\/dongcoin,Bluejudy\/worldcoin,shurcoin\/shurcoin,koltcoin\/koltcoin,shaolinfry\/litecoin,GreenParhelia\/bitcoin,gjhiggins\/vcoincore,mitchellcash\/bitcoin,pstratem\/bitcoin,coinkeeper\/anoncoin_20150330_fixes,myriadteam\/myriadcoin,Sjors\/bitcoin,bitcoinclassic\/bitcoinclassic,eXcomm\/namecoin,ColossusCoinXT\/ColossusCoinXT,Jheguy2\/Mercury,emc2foundation\/einsteinium,DSPay\/DSPay,XertroV\/bitcoin-nulldata,domob1812\/bitcoin,bitcoin-hivemind\/hivemind,domob1812\/huntercoin,icook\/vertcoin,TBoehm\/greedynode,ceptacle\/libcoinqt,ShadowMyst\/creativechain-core,BlockchainTechLLC\/3dcoin,SocialCryptoCoin\/SocialCoin,ElementsProject\/elements,GeopaymeEE\/e-goldcoin,riecoin\/riecoin,meighti\/bitcoin,mruddy\/bitcoin,dgarage\/bc3,Earlz\/renamedcoin,Czarcoin\/czarcoin,coinkeeper\/2015-06-22_19-07_digitalcoin,Theshadow4all\/ShadowCoin,elacoin\/elacoin,ShwoognationHQ\/bitcoin,hyperwang\/bitcoin,Jeff88Ho\/bitcoin,privatecoin\/privatecoin,Bloom-Project\/Bloom,CoinBlack\/blackcoin,IOCoin\/DIONS,Kangmo\/bitcoin,zsulocal\/bitcoin,jakeva\/bitcoin-pwcheck,penek\/novacoin,ForceMajeure\/BitPenny-Client-0.4.0.1,zsulocal\/bitcoin,Chancoin-core\/CHANCOIN,barcoin-project\/nothingcoin,lclc\/bitcoin,denverl\/bitcoin,Bluejudy\/worldcoin,qtumproject\/qtum,djtms\/ltc,MonetaryUnit\/MUE-Src,UFOCoins\/ufo,constantine001\/bitcoin,Vector2000\/bitcoin,mastercoin-MSC\/mastercore,NateBrune\/bitcoin-fio,ahmedbodi\/test2,MazaCoin\/mazacoin-new,psionin\/smartcoin,vtafaucet\/virtacoin,phelix\/bitcoin,NateBrune\/bitcoin-nate,cyrixhero\/bitcoin,micryon\/GPUcoin,CoinBlack\/blackcoin,mincoin-project\/mincoin,dexX7\/bitcoin,Mrs-X\/PIVX,bitgoldcoin-project\/bitgoldcoin,jiangyonghang\/bitcoin,digideskio\/namecoin,atgreen\/bitcoin,and2099\/twister-core,jimblasko\/2015_UNB_Wallets,vinced\/namecoin,yacoin\/yacoin,ahmedbodi\/bytecoin,xurantju\/bitcoin,DynamicCoinOrg\/DMC,tecnovert\/particl-core,wbchen99\/bitcoin-hnote0,donaloconnor\/bitcoin,ronpaulcoin\/ronpaulcoin,Earlz\/renamedcoin,vinced\/namecoin,acmeyer\/namecoin,elambert2014\/cbx2,sstone\/bitcoin,alexandrcoin\/vertcoin,itmanagerro\/tresting,jn2840\/bitcoin,ForceMajeure\/BitPenny-Client-0.4.0.1,jlay11\/sharecoin,genavarov\/brcoin,isocolsky\/bitcoinxt,argentumproject\/argentum,rawodb\/bitcoin,tatafiore\/mycoin,JeremyRubin\/bitcoin,jiffe\/cosinecoin,sipsorcery\/bitcoin,wangliu\/bitcoin,SocialCryptoCoin\/SocialCoin,Rav3nPL\/doubloons-0.10,romanornr\/viacoin,bitcoin-hivemind\/hivemind,collapsedev\/cashwatt,jimmysong\/bitcoin,koharjidan\/bitcoin,dannyperez\/bolivarcoin,blackcoinhelp\/blackcoin,Rimbit\/Wallets,metacoin\/florincoin,Mrs-X\/Darknet,wtogami\/bitcoin,vtafaucet\/virtacoin,ForceMajeure\/BitPenny-Client,mockcoin\/mockcoin,CoinBlack\/bitcoin,m0gliE\/fastcoin-cli,gavinandresen\/bitcoin-git,OstlerDev\/florincoin,BTCfork\/hardfork_prototype_1_mvf-core,dgarage\/bc3,zcoinofficial\/zcoin,gazbert\/bitcoin,bcpki\/nonce2testblocks,simonmulser\/bitcoin,monacoinproject\/monacoin,isghe\/bitcoinxt,som4paul\/BolieC,simonmulser\/bitcoin,acid1789\/bitcoin,ekankyesme\/bitcoinxt,FuzzyBearBTC\/Peershares,MitchellMintCoins\/AutoCoin,Xekyo\/bitcoin,coinkeeper\/2015-06-22_18-51_vertcoin,namecoin\/namecoin-core,amaivsimau\/bitcoin,ClusterCoin\/ClusterCoin,namecoin\/namecore,globaltoken\/globaltoken,cqtenq\/Feathercoin,nanocoins\/mycoin,digideskio\/namecoin,coinkeeper\/2015-06-22_18-41_ixcoin,Diapolo\/bitcoin,mrbandrews\/bitcoin,taenaive\/zetacoin,nochowderforyou\/clams,robvanmieghem\/clams,wbchen99\/bitcoin-hnote0,coinkeeper\/2015-06-22_19-10_cannacoin,TGDiamond\/Diamond,sbaks0820\/bitcoin,jaromil\/faircoin2,FuzzyBearBTC\/peercoin,syscoin\/syscoin2,sstone\/bitcoin,florincoin\/florincoin,BigBlueCeiling\/augmentacoin,mapineda\/litecoin,bfroemel\/smallchange,matlongsi\/micropay,rat4\/bitcoin,maraoz\/proofcoin,ahmedbodi\/temp_vert,megacoin\/megacoin,ionomy\/ion,jonasschnelli\/bitcoin,shaulkf\/bitcoin,bitbrazilcoin-project\/bitbrazilcoin,48thct2jtnf\/P,Bitcoin-ABC\/bitcoin-abc,isghe\/bitcoinxt,kigooz\/smalltestnew,DigiByte-Team\/digibyte,gandrewstone\/BitcoinUnlimited,Exceltior\/dogecoin,TheOncomingStorm\/logincoinadvanced,patricklodder\/dogecoin,elcrypto\/Pulse,upgradeadvice\/MUE-Src,jimmykiselak\/lbrycrd,RibbitFROG\/ribbitcoin,Kenwhite23\/litecoin,zsulocal\/bitcoin,willwray\/dash,hyperwang\/bitcoin,josephbisch\/namecoin-core,Enticed87\/Decipher,Horrorcoin\/horrorcoin,okinc\/litecoin,vertcoin\/vertcoin,Paymium\/bitcoin,plankton12345\/litecoin,Bitcoin-ABC\/bitcoin-abc,bitcoinclassic\/bitcoinclassic,ivansib\/sibcoin,stronghands\/stronghands,bfroemel\/smallchange,BTCfork\/hardfork_prototype_1_mvf-bu,bdelzell\/creditcoin-org-creditcoin,yacoin\/yacoin,cryptcoins\/cryptcoin,metacoin\/florincoin,koltcoin\/koltcoin,jonasnick\/bitcoin,oklink-dev\/bitcoin_block,mrtexaznl\/mediterraneancoin,thelazier\/dash,dmrtsvetkov\/flowercoin,ivansib\/sib16,AllanDoensen\/BitcoinUnlimited,brightcoin\/brightcoin,qreatora\/worldcoin-v0.8,vmp32k\/litecoin,botland\/bitcoin,DynamicCoinOrg\/DMC,rnicoll\/bitcoin,kevin-cantwell\/crunchcoin,mmpool\/coiledcoin,Earlz\/renamedcoin,jn2840\/bitcoin,manuel-zulian\/CoMoNet,PandaPayProject\/PandaPay,redfish64\/nomiccoin,DMDcoin\/Diamond,BeirdoMud\/MudCoin,bcpki\/testblocks,Bitcoin-com\/BUcash,LanaCoin\/lanacoin,ZiftrCOIN\/ziftrcoin,syscoin\/syscoin,taenaive\/zetacoin,SartoNess\/BitcoinUnlimited,tjth\/lotterycoin,jrick\/bitcoin,omefire\/bitcoin,senadj\/yacoin,btcdrak\/bitcoin,pinkmagicdev\/SwagBucks,vinced\/namecoin,StarbuckBG\/BTCGPU,ivansib\/sib16,mapineda\/litecoin,Dinarcoin\/dinarcoin,Anfauglith\/iop-hd,Rav3nPL\/polcoin,robvanmieghem\/clams,fsb4000\/huntercoin,practicalswift\/bitcoin,Twyford\/Indigo,pastday\/bitcoinproject,world-bank\/unpay-core,ravenbyron\/phtevencoin,dpayne9000\/Rubixz-Coin,dperel\/bitcoin,etercoin\/etercoin,bespike\/litecoin,Horrorcoin\/horrorcoin,whatrye\/twister-core,rromanchuk\/bitcoinxt,acmeyer\/namecoin,emc2foundation\/einsteinium,senadmd\/coinmarketwatch,habibmasuro\/bitcoinxt,willwray\/dash,eXcomm\/namecoin,iadix\/iadixcoin,rromanchuk\/bitcoinxt,MikeAmy\/bitcoin,cqtenq\/feathercoin_core,torresalyssa\/bitcoin,basicincome\/unpcoin-core,FrictionlessCoin\/iXcoin,tdudz\/elements,dgarage\/bc2,Matoking\/bitcoin,imharrywu\/fastcoin,vmp32k\/litecoin,RongxinZhang\/bitcoinxt,kryptokredyt\/ProjektZespolowyCoin,BitzenyCoreDevelopers\/bitzeny,steakknife\/bitcoin-qt,mapineda\/litecoin,Magicking\/neucoin,coinkeeper\/2015-06-22_18-52_viacoin,majestrate\/twister-core,Mrs-X\/Darknet,brandonrobertz\/namecoin-core,maaku\/bitcoin,zestcoin\/ZESTCOIN,tensaix2j\/bananacoin,funkshelper\/woodcoin-b,npccoin\/npccoin,atgreen\/bitcoin,coinkeeper\/2015-04-19_21-20_litecoindark,coinkeeper\/terracoin_20150327,maraoz\/proofcoin,wekuiz\/wekoin,fanquake\/bitcoin,reorder\/viacoin,keo\/bitcoin,mockcoin\/mockcoin,thesoftwarejedi\/bitcoin,btcdrak\/bitcoin,DGCDev\/argentum,CoinGame\/NuShadowNet,TripleSpeeder\/bitcoin,MazaCoin\/mazacoin-new,domob1812\/crowncoin,zzkt\/solarcoin,jmgilbert2\/energi,dobbscoin\/dobbscoin-source,putinclassic\/putic,DSPay\/DSPay,StarbuckBG\/BTCGPU,sdaftuar\/bitcoin,rat4\/blackcoin,DrCrypto\/darkcoin,borgcoin\/Borgcoin1,wiggi\/huntercoin,shouhuas\/bitcoin,Crypto-Currency\/BitBar,jambolo\/bitcoin,dopecoin-dev\/DopeCoinGold,afk11\/bitcoin,practicalswift\/bitcoin,ardsu\/bitcoin,ya4-old-c-coder\/yacoin,starwels\/starwels,kleetus\/bitcoin,bcpki\/nonce2testblocks,blood2\/bloodcoin-0.9,bootycoin-project\/bootycoin,degenorate\/Deftcoin,pstratem\/elements,coinkeeper\/2015-06-22_18-31_bitcoin,zcoinofficial\/zcoin,Vector2000\/bitcoin,kigooz\/smalltestnew,ohac\/sakuracoin,Gazer022\/bitcoin,destenson\/bitcoin--bitcoin,kirkalx\/bitcoin,joroob\/reddcoin,cotner\/bitcoin,jamesob\/bitcoin,BitcoinHardfork\/bitcoin,bitcoinsSG\/zcash,111t8e\/bitcoin,achow101\/bitcoin,goldcoin\/goldcoin,mrtexaznl\/mediterraneancoin,Peerapps\/ppcoin,nathaniel-mahieu\/bitcoin,KillerByte\/memorypool,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,Erkan-Yilmaz\/twister-core,SmeltFool\/Yippe-Hippe,5mil\/Tradecoin,supcoin\/supcoin,Kenwhite23\/litecoin,roques\/bitcoin,shaolinfry\/litecoin,antcheck\/antcoin,CoinBlack\/bitcoin,micryon\/GPUcoin,alejandromgk\/Lunar,worldbit\/worldbit,Gazer022\/bitcoin,raasakh\/bardcoin.exe,qtumproject\/qtum,DMDcoin\/Diamond,HashUnlimited\/Einsteinium-Unlimited,applecoin-official\/fellatio,chronokings\/huntercoin,awoland\/namecoinq,drwasho\/bitcoinxt,TheBlueMatt\/bitcoin,andreaskern\/bitcoin,instagibbs\/bitcoin,midnightmagic\/bitcoin,hophacker\/bitcoin_malleability,manuel-zulian\/CoMoNet,namecoin\/namecoin,Rav3nPL\/doubloons-08,mb300sd\/bitcoin,octocoin-project\/octocoin,CoinGame\/BCEShadow,lbryio\/lbrycrd,fujicoin\/fujicoin,bmp02050\/ReddcoinUpdates,jimmykiselak\/lbrycrd,renatolage\/wallets-BRCoin,talpan\/namecoin,Justaphf\/BitcoinUnlimited,metacoin\/florincoin,miguelfreitas\/twister-core,KaSt\/ekwicoin,axelxod\/braincoin,MidasPaymentLTD\/midascoin,jambolo\/bitcoin,phelix\/namecore,iadix\/iadixcoin,jamesob\/bitcoin,ALEXIUMCOIN\/alexium,cmgustavo\/bitcoin,greencoin-dev\/digitalcoin,Diapolo\/bitcoin,coinkeeper\/megacoin_20150410_fixes,GIJensen\/bitcoin,Anoncoin\/anoncoin,oleganza\/bitcoin-duo,MidasPaymentLTD\/midascoin,funkshelper\/woodcoin-b,dagurval\/bitcoinxt,shadowoneau\/ozcoin,and2099\/twister-core,gandrewstone\/bitcoinxt,raasakh\/bardcoin.exe,cddjr\/BitcoinUnlimited,thunderrabbit\/clams,elambert2014\/cbx2,sh1nu11bi\/bitcoin,TheoremCrypto\/TheoremCoin,jameshilliard\/bitcoin,isle2983\/bitcoin,MitchellMintCoins\/AutoCoin,nmarley\/dash,Petr-Economissa\/gvidon,jimblasko\/UnbreakableCoin-master,Jcing95\/iop-hd,namecoin\/namecoin-core,benzhi888\/renminbi,koharjidan\/litecoin,omefire\/bitcoin,bitcoin\/bitcoin,MasterX1582\/bitcoin-becoin,magacoin\/magacoin,domob1812\/i0coin,Ziftr\/Peerunity,haraldh\/bitcoin,pelorusjack\/BlockDX,digibyte\/digibyte,neuroidss\/bitcoin,pastday\/bitcoinproject,itmanagerro\/tresting,nbenoit\/bitcoin,cculianu\/bitcoin-abc,coinkeeper\/terracoin_20150327,Kogser\/bitcoin,Exgibichi\/statusquo,ShadowMyst\/creativechain-core,jiffe\/cosinecoin,BTCTaras\/bitcoin,kleetus\/bitcoin,CarpeDiemCoin\/CarpeDiemLaunch,genavarov\/ladacoin,uphold\/bitcoin,SandyCohen\/mincoin,CoinBlack\/bitcoin,destenson\/bitcoin--bitcoin,reddcoin-project\/reddcoin,szlaozhu\/twister-core,yacoin\/yacoin,brandonrobertz\/namecoin-core,particl\/particl-core,putinclassic\/putic,constantine001\/bitcoin,Action-Committee\/Spaceballz,Rav3nPL\/doubloons-08,bcpki\/nonce2testblocks,namecoin\/namecore,nikkitan\/bitcoin,Har01d\/bitcoin,40thoughts\/Coin-QualCoin,jrmithdobbs\/bitcoin,benzhi888\/renminbi,hasanatkazmi\/bitcoin,xeddmc\/twister-core,ya4-old-c-coder\/yacoin,awoland\/namecoinq,Mrs-X\/PIVX,fsb4000\/novacoin,valorbit\/valorbit-oss,truthcoin\/blocksize-market,DGCDev\/digitalcoin,IOCoin\/DIONS,GwangJin\/gwangmoney-core,xawksow\/GroestlCoin,MonetaryUnit\/MUE-Src,koharjidan\/litecoin,tobeyrowe\/smallchange,marcusdiaz\/BitcoinUnlimited,DigitalPandacoin\/pandacoin,Bitcoin-ABC\/bitcoin-abc,NicolasDorier\/bitcoin,acmeyer\/voteid,Kefkius\/clams,rnicoll\/bitcoin,nanocoins\/mycoin,peercoin\/peercoin,svost\/bitcoin,BTCfork\/hardfork_prototype_1_mvf-core,manuel-zulian\/CoMoNet,sirk390\/bitcoin,apoelstra\/bitcoin,jeromewu\/bitcoin-opennet,RibbitFROG\/ribbitcoin,forrestv\/bitcoin,wellenreiter01\/Feathercoin,spiritlinxl\/BTCGPU,vertcoin\/vertcoin,KnCMiner\/bitcoin,mb300sd\/bitcoin,faircoin\/faircoin,benzmuircroft\/REWIRE.io,celebritycoin\/CelebrityCoin,vcoin-project\/vcoincore,daveperkins-github\/bitcoin-dev,oleganza\/bitcoin-duo,reorder\/viacoin,dgarage\/bc3,TBoehm\/greedynode,markf78\/dollarcoin,jaromil\/faircoin2,odemolliens\/bitcoinxt,gwangjin2\/gwangcoin-core,daveperkins-github\/bitcoin-dev,reddink\/reddcoin,rromanchuk\/bitcoinxt,koltcoin\/koltcoin,randy-waterhouse\/bitcoin,xranby\/blackcoin,jtimon\/bitcoin,CryptArc\/bitcoin,nlgcoin\/guldencoin-official,NateBrune\/bitcoin-nate,erikYX\/yxcoin-FIRST,pstratem\/elements,Rav3nPL\/doubloons-08,llamasoft\/ProtoShares_Cycle,langerhans\/dogecoin,Mirobit\/bitcoin,randy-waterhouse\/bitcoin,lbrtcoin\/albertcoin,knolza\/gamblr,wangxinxi\/litecoin,Bitcoin-ABC\/bitcoin-abc,Richcoin-Project\/RichCoin,pouta\/bitcoin,Petr-Economissa\/gvidon,core-bitcoin\/bitcoin,superjudge\/bitcoin,oleganza\/bitcoin-duo,NicolasDorier\/bitcoin,gwangjin2\/gwangcoin-core,Thracky\/monkeycoin,FuzzyBearBTC\/Fuzzyshares,starwels\/starwels,daveperkins-github\/bitcoin-dev,Enticed87\/Decipher,Kixunil\/keynescoin,Chancoin-core\/CHANCOIN,riecoin\/riecoin,tobeyrowe\/KitoniaCoin,ElementsProject\/elements,palm12341\/jnc,eXcomm\/namecoin,prusnak\/bitcoin,KaSt\/equikoin,dperel\/bitcoin,5mil\/Tradecoin,TheoremCrypto\/TheoremCoin,thrasher-\/litecoin,zsulocal\/bitcoin,Flowdalic\/bitcoin,bitcoinec\/bitcoinec,lateminer\/bitcoin,PIVX-Project\/PIVX,biblepay\/biblepay,HashUnlimited\/Einsteinium-Unlimited,elambert2014\/novacoin,coinkeeper\/2015-04-19_21-20_litecoindark,Charlesugwu\/Vintagecoin,biblepay\/biblepay,Vector2000\/bitcoin,kleetus\/bitcoinxt,dan-mi-sun\/bitcoin,phelixbtc\/bitcoin,odemolliens\/bitcoinxt,zander\/bitcoinclassic,welshjf\/bitcoin,FeatherCoin\/Feathercoin,pascalguru\/florincoin,benzhi888\/renminbi,brightcoin\/brightcoin,zemrys\/vertcoin,prodigal-son\/blackcoin,krzysztofwos\/BitcoinUnlimited,ClusterCoin\/ClusterCoin,Vector2000\/bitcoin,coinkeeper\/2015-06-22_18-36_darkcoin,marklai9999\/Taiwancoin,hyperwang\/bitcoin,kevcooper\/bitcoin,destenson\/bitcoin--bitcoin,coinkeeper\/2015-06-22_18-42_litecoin,tuaris\/bitcoin,skaht\/bitcoin,dooglus\/clams,GreenParhelia\/bitcoin,erqan\/twister-core,majestrate\/twister-core,nightlydash\/darkcoin,wiggi\/huntercore,HerkCoin\/herkcoin,ericshawlinux\/bitcoin,bitcoinxt\/bitcoinxt,vericoin\/vericoin-core,dagurval\/bitcoinxt,fussl\/elements,tuaris\/bitcoin,celebritycoin\/investorcoin,destenson\/bitcoin--bitcoin,bitcoin\/bitcoin,kevin-cantwell\/crunchcoin,aspirecoin\/aspire,iosdevzone\/bitcoin,appop\/bitcoin,romanornr\/viacoin,BitcoinHardfork\/bitcoin,BlueMeanie\/PeerShares,Peerunity\/Peerunity,xawksow\/GroestlCoin,keo\/bitcoin,novacoin-project\/novacoin,DigitalPandacoin\/pandacoin,litecoin-project\/litecoin,gades\/novacoin,bitcoin-hivemind\/hivemind,richo\/dongcoin,gjhiggins\/vcoincore,litecoin-project\/bitcoinomg,achow101\/bitcoin,themusicgod1\/bitcoin,untrustbank\/litecoin,thrasher-\/litecoin,bitcoinsSG\/zcash,world-bank\/unpay-core,goldmidas\/goldmidas,sebrandon1\/bitcoin,kevin-cantwell\/crunchcoin,IlfirinCano\/shavercoin,Xekyo\/bitcoin,mitchellcash\/bitcoin,GreenParhelia\/bitcoin,ahmedbodi\/terracoin,SoreGums\/bitcoinxt,capitalDIGI\/litecoin,sebrandon1\/bitcoin,hsavit1\/bitcoin,coinkeeper\/2015-06-22_18-31_bitcoin,OmniLayer\/omnicore,Cocosoft\/bitcoin,brettwittam\/geocoin,Infernoman\/crowncoin,untrustbank\/litecoin,nathan-at-least\/zcash,CarpeDiemCoin\/CarpeDiemLaunch,ediston\/energi,TGDiamond\/Diamond,hg5fm\/nexuscoin,ahmedbodi\/Bytecoin-MM,MazaCoin\/maza,ericshawlinux\/bitcoin,ghostlander\/Feathercoin,phelix\/bitcoin,Flurbos\/Flurbo,CoinGame\/BCEShadow,jonasnick\/bitcoin,Exgibichi\/statusquo,domob1812\/crowncoin,jlay11\/sharecoin,terracoin\/terracoin,fsb4000\/novacoin,IlfirinCano\/shavercoin,worldcoinproject\/worldcoin-v0.8,stamhe\/novacoin,AllanDoensen\/BitcoinUnlimited,CTRoundTable\/Encrypted.Cash,jlay11\/sharecoin,shadowproject\/shadow,matlongsi\/micropay,and2099\/twister-core,bitreserve\/bitcoin,iadix\/iadixcoin,NicolasDorier\/bitcoin,sstone\/bitcoin,dgarage\/bc2,Blackcoin\/blackcoin,GlobalBoost\/GlobalBoost,gandrewstone\/bitcoinxt,cmgustavo\/bitcoin,Bitcoin-ABC\/bitcoin-abc,jashandeep-sohi\/ppcoin,BTCfork\/hardfork_prototype_1_mvf-bu,mruddy\/bitcoin,shelvenzhou\/BTCGPU,internaut-me\/ppcoin,Rav3nPL\/polcoin,haisee\/dogecoin,ALEXIUMCOIN\/alexium,fsb4000\/bitcoin,josephbisch\/namecoin-core,Alonzo-Coeus\/bitcoin,Ziftr\/ppcoin,zenywallet\/bitzeny,kaostao\/bitcoin,bankonmeOS\/namecoin-qt,Rav3nPL\/polcoin,AkioNak\/bitcoin,GlobalBoost\/GlobalBoost,CoinGame\/NuShadowNet,basicincome\/unpcoin-core,indolering\/namecoin-qt,anditto\/bitcoin,jonasnick\/bitcoin,coinkeeper\/2015-06-22_18-46_reddcoin,stamhe\/namecoin,nomnombtc\/bitcoin,andres-root\/bitcoinxt,kigooz\/smalltest,genavarov\/ladacoin,imharrywu\/fastcoin,uphold\/bitcoin,marcusdiaz\/BitcoinUnlimited,pdrobek\/Polcoin-1-3,therealaltcoin\/altcoin,TGDiamond\/Diamond,ppcoin\/ppcoin,roques\/bitcoin,stamhe\/bitcoin,iceinsidefire\/peershare-edit,Charlesugwu\/Vintagecoin,ripper234\/bitcoin,dooglus\/bitcoin,roques\/bitcoin,droark\/bitcoin,ionomy\/ion,wbchen99\/bitcoin-hnote0,jlcurby\/NobleCoin,vcoin-project\/vcoin0.8zeta-dev,janko33bd\/bitcoin,Ziftr\/bitcoin,som4paul\/BolieC,dmrtsvetkov\/flowercoin,Peerunity\/Peerunity,midnight-miner\/LasVegasCoin,zixan\/bitcoin,Metronotes\/bitcoin,capitalDIGI\/DIGI-v-0-10-4,Kore-Core\/kore,Kangmo\/bitcoin,vericoin\/vericoin-core,worldbit\/worldbit,pelorusjack\/BlockDX,coinerd\/krugercoin,collapsedev\/cashwatt,arruah\/ensocoin,IOCoin\/iocoin,bitcoinec\/bitcoinec,blood2\/bloodcoin-0.9,ptschip\/bitcoinxt,CoinGame\/NuShadowNet,wiggi\/fairbrix-0.6.3,shelvenzhou\/BTCGPU,randy-waterhouse\/bitcoin,rawodb\/bitcoin,knolza\/gamblr,kazcw\/bitcoin,jtimon\/elements,KaSt\/equikoin,brishtiteveja\/truthcoin-cpp,sacarlson\/MultiCoin-exp,joulecoin\/joulecoin,krzysztofwos\/BitcoinUnlimited,namecoinq\/namecoinq,shelvenzhou\/BTCGPU,krzysztofwos\/BitcoinUnlimited,xuyangcn\/opalcoin,appop\/bitcoin,Ziftr\/Peerunity,phplaboratory\/psiacoin,Checkcoin\/checkcoin,monacoinproject\/monacoin,RHavar\/bitcoin,parvez3019\/bitcoin,sstone\/bitcoin,ahmedbodi\/temp_vert,Peer3\/homework,Chancoin-core\/CHANCOIN,BTCfork\/hardfork_prototype_1_mvf-bu,keo\/bitcoin,genavarov\/brcoin,wellenreiter01\/Feathercoin,thrasher-\/litecoin,Infernoman\/crowncoin,TGDiamond\/Diamond,elecoin\/elecoin,NunoEdgarGub1\/elements,Richcoin-Project\/RichCoin,Coinfigli\/coinfigli,lclc\/bitcoin,ghostlander\/Testcoin,rjshaver\/bitcoin,VsyncCrypto\/Vsync,arruah\/ensocoin,p2peace\/oliver-twister-core,CoinProjects\/AmsterdamCoin-v4,Vector2000\/bitcoin,GroestlCoin\/GroestlCoin,acmeyer\/voteid,pocopoco\/yacoin,coinkeeper\/2015-06-22_18-31_bitcoin,CoinBlack\/blackcoin,svost\/bitcoin,globaltoken\/globaltoken,DynamicCoinOrg\/DMC,WorldcoinGlobal\/WorldcoinLegacy,jonasnick\/bitcoin,borgcoin\/Borgcoin.rar,ajweiss\/bitcoin,phelix\/namecore,pocopoco\/yacoin,Kenwhite23\/litecoin,netswift\/vertcoin,bitpay\/bitcoin,RyanLucchese\/energi,accraze\/bitcoin,GroestlCoin\/GroestlCoin,NateBrune\/bitcoin-fio,Chancoin-core\/CHANCOIN,arnuschky\/bitcoin,wiggi\/huntercoin,okinc\/bitcoin,hasanatkazmi\/bitcoin,capitalDIGI\/DIGI-v-0-10-4,gravio-net\/graviocoin,pinheadmz\/bitcoin,welshjf\/bitcoin,untrustbank\/litecoin,jtimon\/elements,yenliangl\/bitcoin,Jcing95\/iop-hd,zzkt\/solarcoin,phplaboratory\/psiacoin,IOCoin\/iocoin,FeatherCoin\/Feathercoin,NateBrune\/bitcoin-nate,bitreserve\/bitcoin,syscoin\/syscoin2,coinkeeper\/2015-06-22_18-37_dogecoin,sigmike\/peercoin,rawodb\/bitcoin,5mil\/Bolt,totallylegitbiz\/totallylegitcoin,ahmedbodi\/Bytecoin-MM,coinkeeper\/2015-06-22_18-46_razor,landcoin-ldc\/landcoin,drwasho\/bitcoinxt,XX-net\/twister-core,Tetpay\/bitcoin,cculianu\/bitcoin-abc,midnightmagic\/bitcoin,coinkeeper\/2015-06-22_18-46_reddcoin,riecoin\/riecoin,pouta\/bitcoin,argentumproject\/argentum,blocktrail\/bitcoin,FarhanHaque\/bitcoin,wangxinxi\/litecoin,maaku\/bitcoin,alejandromgk\/Lunar,Dinarcoin\/dinarcoin,Thracky\/monkeycoin,okTurtles\/namecoin,ftrader-bitcoinabc\/bitcoin-abc,deeponion\/deeponion,scippio\/bitcoin,bittylicious\/bitcoin,LanaCoin\/lanacoin,paveljanik\/bitcoin,PandaPayProject\/PandaPay,acmeyer\/namecoin,zetacoin\/zetacoin,Cocosoft\/bitcoin,lordsajan\/erupee,PIVX-Project\/PIVX,lclc\/bitcoin,forrestv\/bitcoin,faircoin\/faircoin,ghostlander\/Orbitcoin,bitcoin\/bitcoin,novaexchange\/EAC,PandaPayProject\/PandaPay,borgcoin\/Borgcoin.rar,deeponion\/deeponion,arnuschky\/bitcoin,amaivsimau\/bitcoin,dopecoin-dev\/DopeCoinGold,5mil\/SuperTurboStake,Someguy123\/novafoil,Metronotes\/bitcoin,11755033isaprimenumber\/Feathercoin,TurboStake\/TurboStake,Kore-Core\/kore,GIJensen\/bitcoin,TierNolan\/bitcoin,okinc\/bitcoin,spiritlinxl\/BTCGPU,blocktrail\/bitcoin,elliotolds\/bitcoin,parvez3019\/bitcoin,aspirecoin\/aspire,sifcoin\/sifcoin,jimblasko\/2015_UNB_Wallets,habibmasuro\/bitcoin,morcos\/bitcoin,Diapolo\/bitcoin,cyrixhero\/bitcoin,cybermatatu\/bitcoin,FeatherCoin\/Feathercoin,AdrianaDinca\/bitcoin,basicincome\/unpcoin-core,Cannacoin-Project\/Cannacoin,GwangJin\/gwangmoney-core,reddcoin-project\/reddcoin,EntropyFactory\/creativechain-core,nikkitan\/bitcoin,ahmedbodi\/test2,GIJensen\/bitcoin,kallewoof\/bitcoin,SmeltFool\/Wonker,syscoin\/syscoin,SartoNess\/BitcoinUnlimited,bankonmecoin\/namecoin-legacy,droark\/elements,forrestv\/bitcoin,renatolage\/wallets-BRCoin,lentza\/SuperTurboStake,vmp32k\/litecoin,faircoin\/faircoin2,jrick\/bitcoin,Mrs-X\/PIVX,Ziftr\/bitcoin,ericshawlinux\/bitcoin,isghe\/bitcoinxt,shapiroisme\/datadollar,memorycoin\/memorycoin,plankton12345\/litecoin,gmaxwell\/bitcoin,capitalDIGI\/DIGI-v-0-10-4,Ziftr\/Peerunity,awemany\/BitcoinUnlimited,coinkeeper\/2015-06-22_18-31_bitcoin,stronghands\/stronghands,coinkeeper\/anoncoin_20150330_fixes,shaolinfry\/litecoin,florincoin\/florincoin,elacoin\/elacoin,elcrypto\/Pulse,LanaCoin\/lanacoin,se3000\/bitcoin,freelion93\/mtucicoin,cryptodev35\/icash,dogecoin\/dogecoin,mycointest\/owncoin,theuni\/bitcoin,and2099\/twister-core,bankonmecoin\/bitcoin,okinc\/bitcoin,wtogami\/bitcoin,CoinGame\/BCEShadowNet,coinkeeper\/2015-06-22_18-30_anoncoin,pinheadmz\/bitcoin,mrbandrews\/bitcoin,marlengit\/BitcoinUnlimited,okinc\/litecoin,bitbrazilcoin-project\/bitbrazilcoin,Rav3nPL\/bitcoin,domob1812\/huntercore,coinkeeper\/2015-06-22_19-19_worldcoin,wiggi\/huntercore,forrestv\/bitcoin,majestrate\/twister-core,Bitcoinsulting\/bitcoinxt,multicoins\/marycoin,akabmikua\/flowcoin,cculianu\/bitcoin-abc,szlaozhu\/twister-core,ryanofsky\/bitcoin,trippysalmon\/bitcoin,btc1\/bitcoin,meighti\/bitcoin,deadalnix\/bitcoin,experiencecoin\/experiencecoin,Lucky7Studio\/bitcoin,haraldh\/bitcoin,CoinGame\/BCEShadowNet,x-kalux\/bitcoin_WiG-B,jnewbery\/bitcoin,greenaddress\/bitcoin,gjhiggins\/vcoincore,cryptoprojects\/ultimateonlinecash,landcoin-ldc\/landcoin,Credit-Currency\/CoinTestComp,imton\/bitcoin,faircoin\/faircoin,botland\/bitcoin,DigitalPandacoin\/pandacoin,truthcoin\/blocksize-market,REAP720801\/bitcoin,redfish64\/nomiccoin,marcusdiaz\/BitcoinUnlimited,ForceMajeure\/BitPenny-Client-0.4.0.1,world-bank\/unpay-core,goku1997\/bitcoin,domob1812\/bitcoin,yenliangl\/bitcoin,bespike\/litecoin,pevernon\/picoin,joroob\/reddcoin,aburan28\/elements,dexX7\/mastercore,kigooz\/smalltest,mycointest\/owncoin,xuyangcn\/opalcoin,PandaPayProject\/PandaPay,ohac\/sakuracoin,jtimon\/bitcoin,TBoehm\/greedynode,HeliumGas\/helium,braydonf\/bitcoin,1185\/starwels,Ziftr\/litecoin,gjhiggins\/vcoincore,sipa\/elements,PandaPayProject\/PandaPay,rustyrussell\/bitcoin,tecnovert\/particl-core,MoMoneyMonetarism\/ppcoin,r8921039\/bitcoin,koltcoin\/koltcoin,isocolsky\/bitcoinxt,rromanchuk\/bitcoinxt,thunderrabbit\/clams,shadowoneau\/ozcoin,tjth\/lotterycoin,slimcoin-project\/Slimcoin,Open-Source-Coins\/EZ,omefire\/bitcoin,bitchip\/bitchip,scmorse\/bitcoin,senadmd\/coinmarketwatch,vericoin\/vericoin-core,CarpeDiemCoin\/CarpeDiemLaunch,Christewart\/bitcoin,Czarcoin\/czarcoin,x-kalux\/bitcoin_WiG-B,koharjidan\/dogecoin,antcheck\/antcoin,d5000\/ppcoin,MasterX1582\/bitcoin-becoin,se3000\/bitcoin,marklai9999\/Taiwancoin,SandyCohen\/mincoin,jamesob\/bitcoin,ZiftrCOIN\/ziftrcoin,AdrianaDinca\/bitcoin,nsacoin\/nsacoin,bankonmeOS\/namecoin-qt,litecoin-project\/litecore-litecoin,MazaCoin\/maza,hyperwang\/bitcoin,senadj\/yacoin,senadj\/yacoin,iceinsidefire\/peershare-edit,ctwiz\/stardust,PRabahy\/bitcoin,XertroV\/bitcoin-nulldata,gcc64\/bitcoin,thunderrabbit\/clams,Flurbos\/Flurbo,dobbscoin\/dobbscoin-source,cryptodev35\/icash,sipa\/bitcoin,JeremyRand\/bitcoin,ingresscoin\/ingresscoin,ronpaulcoin\/ronpaulcoin,leofidus\/glowing-octo-ironman,cainca\/liliucoin,Peer3\/homework,AllanDoensen\/BitcoinUnlimited,bcpki\/bitcoin,keisercoin-official\/keisercoin,n1bor\/bitcoin,amaivsimau\/bitcoin,tdudz\/elements,wangxinxi\/litecoin,bitcoinsSG\/zcash,shaulkf\/bitcoin,nailtaras\/nailcoin,raasakh\/bardcoin.exe,BitzenyCoreDevelopers\/bitzeny,xranby\/blackcoin,shea256\/bitcoin,puticcoin\/putic,gandrewstone\/BitcoinUnlimited,sebrandon1\/bitcoin,jyap808\/jumbucks,DMDcoin\/Diamond,kazcw\/bitcoin,pouta\/bitcoin,ddombrowsky\/radioshares,namecoin\/namecoin-core,jmgilbert2\/energi,bcpki\/nonce2testblocks,segsignal\/bitcoin,mammix2\/ccoin-dev,TheOncomingStorm\/logincoinadvanced,gwangjin2\/gwangcoin-core,dopecoin-dev\/DopeCoinGold,CoinBlack\/bitcoin,mastercoin-MSC\/mastercore,iadix\/iadixcoin,jlopp\/statoshi,irvingruan\/bitcoin,tropa\/axecoin,ptschip\/bitcoinxt,sebrandon1\/bitcoin,Kogser\/bitcoin,ryanxcharles\/bitcoin,KnCMiner\/bitcoin,zotherstupidguy\/bitcoin,martindale\/elements,cfromknecht\/namecoin-legacy,my-first\/octocoin,bdelzell\/creditcoin-org-creditcoin,funkshelper\/woodcoin-b,kseistrup\/twister-core,bitjson\/hivemind,koharjidan\/litecoin,BitcoinPOW\/BitcoinPOW,TheSeven\/ppcoin,ohac\/sha1coin,snakie\/ppcoin,rdqw\/sscoin,qreatora\/worldcoin-v0.8,bitgrowchain\/bitgrow,2XL\/bitcoin,jamesob\/bitcoin,dgenr8\/bitcoinxt,gameunits\/gameunits,funbucks\/notbitcoinxt,domob1812\/bitcoin,jlopp\/statoshi,peerdb\/cors,lateminer\/DopeCoinGold,Crowndev\/crowncoin,domob1812\/namecore,rat4\/bitcoin,scippio\/bitcoin,lbrtcoin\/albertcoin,DMDcoin\/Diamond,Whitecoin-org\/Whitecoin,wangliu\/bitcoin,svcop3\/svcop3,se3000\/bitcoin,m0mchil\/bitcoin,maaku\/bitcoin,FuzzyBearBTC\/peercoin,dexX7\/bitcoin,micryon\/GPUcoin,koharjidan\/dogecoin,bitjson\/hivemind,error10\/bitcoin,superjudge\/bitcoin,RongxinZhang\/bitcoinxt,mruddy\/bitcoin,m0gliE\/fastcoin-cli,ticclassic\/ic,bitpay\/bitcoin,brettwittam\/geocoin,CrimeaCoin\/crimeacoin,MikeAmy\/bitcoin,icook\/vertcoin,ANCompany\/birdcoin-dev,shapiroisme\/datadollar,SproutsEx\/SproutsExtreme,masterbraz\/dg,Flurbos\/Flurbo,bcpki\/bitcoin,VsyncCrypto\/Vsync,CoinProjects\/AmsterdamCoin-v4,joshrabinowitz\/bitcoin,hophacker\/bitcoin_malleability,presstab\/PIVX,AquariusNetwork\/ARCO,jn2840\/bitcoin,cryptohelper\/premine,IlfirinIlfirin\/shavercoin,Diapolo\/bitcoin,cannabiscoindev\/cannabiscoin420,metrocoins\/metrocoin,ivansib\/sib16,zebrains\/Blotter,metacoin\/florincoin,namecoin\/namecoin-core,sipa\/elements,psionin\/smartcoin,dscotese\/bitcoin,Blackcoin\/blackcoin,nanocoins\/mycoin,PIVX-Project\/PIVX,Megacoin2\/Megacoin,khalahan\/namecoin,simonmulser\/bitcoin,worldbit\/worldbit,jaromil\/faircoin2,namecoin-qt\/namecoin-qt,likecoin-dev\/bitcoin,saydulk\/Feathercoin,cculianu\/bitcoin-abc,gwillen\/elements,hg5fm\/nexuscoin,genavarov\/ladacoin,bitpay\/bitcoin,BlockchainTechLLC\/3dcoin,collapsedev\/cashwatt,BitcoinUnlimited\/BitcoinUnlimited,dgarage\/bc2,EthanHeilman\/bitcoin,shadowoneau\/ozcoin,Gazer022\/bitcoin,janko33bd\/bitcoin,KillerByte\/memorypool,DigitalPandacoin\/pandacoin,ekankyesme\/bitcoinxt,Mrs-X\/Darknet,multicoins\/marycoin,KnCMiner\/bitcoin,myriadcoin\/myriadcoin,funbucks\/notbitcoinxt,Ziftr\/ppcoin,Diapolo\/bitcoin,111t8e\/bitcoin,novacoin-project\/novacoin,pinkevich\/dash,iosdevzone\/bitcoin,Electronic-Gulden-Foundation\/egulden,Justaphf\/BitcoinUnlimited,bankonmecoin\/namecoin-legacy,segwit\/atbcoin-insight,midnight-miner\/LasVegasCoin,ClusterCoin\/ClusterCoin,benzhi888\/renminbi,coinkeeper\/2015-06-22_18-36_darkcoin,brishtiteveja\/truthcoin-cpp,MarcoFalke\/bitcoin,gcc64\/bitcoin,phelix\/bitcoin,jaromil\/faircoin2,BTCGPU\/BTCGPU,FuzzyBearBTC\/Peershares2,SmeltFool\/Yippe-Hippe,Friedbaumer\/litecoin,rustyrussell\/bitcoin,FarhanHaque\/bitcoin,Anfauglith\/iop-hd,kazcw\/bitcoin,Kefkius\/clams,kirkalx\/bitcoin,aciddude\/Feathercoin,laudaa\/bitcoin,lateminer\/bitcoin,scamcoinz\/scamcoin,sugruedes\/bitcoin,Credit-Currency\/CoinTestComp,NeuCoin\/neucoin,therealaltcoin\/altcoin,nlgcoin\/guldencoin-official,markf78\/dollarcoin,wcwu\/bitcoin,reddcoin-project\/reddcoin,wangxinxi\/litecoin,miguelfreitas\/twister-core,dakk\/soundcoin,terracoin\/terracoin,Litecoindark\/LTCD,khalahan\/old_namecoin,Kogser\/bitcoin,iQcoin\/iQcoin,wekuiz\/wekoin,Credit-Currency\/CoinTestComp,myriadteam\/myriadcoin,Climbee\/artcoin,keo\/bitcoin,ripper234\/bitcoin,Midar\/namecoin,nikkitan\/bitcoin,apoelstra\/elements,TeamBitBean\/bitcoin-core,GroestlCoin\/bitcoin,TripleSpeeder\/bitcoin,coinkeeper\/2015-06-22_18-36_darkcoin,jrick\/bitcoin,valorbit\/valorbit,BTCTaras\/bitcoin,accraze\/bitcoin,rdqw\/sscoin,iosdevzone\/bitcoin,akabmikua\/flowcoin,Peer3\/homework,ticclassic\/ic,h4x3rotab\/BTCGPU,iadix\/iadixcoin,Bloom-Project\/Bloom,JeremyRand\/namecoin-core,cerebrus29301\/crowncoin,stamhe\/bitcoin,stamhe\/novacoin,biblepay\/biblepay,appop\/bitcoin,jyap808\/jumbucks,nailtaras\/nailcoin,ediston\/energi,ShadowMyst\/creativechain-core,willwray\/dash,odemolliens\/bitcoinxt,cerebrus29301\/crowncoin,millennial83\/bitcoin,Rimbit\/Wallets,hyperwang\/bitcoin,mitchellcash\/bitcoin,initaldk\/bitcoin,awemany\/BitcoinUnlimited,prusnak\/bitcoin,nmarley\/dash,biblepay\/biblepay,JeremyRand\/namecoin-core,acid1789\/bitcoin,oklink-dev\/litecoin_block,freelion93\/mtucicoin,wiggi\/huntercore,balajinandhu\/bitcoin,coblee\/litecoin-old,benzmuircroft\/REWIRE.io,Carrsy\/PoundCoin,isle2983\/bitcoin,cheehieu\/bitcoin,brandonrobertz\/namecoin-core,dooglus\/clams,BitcoinHardfork\/bitcoin,sacarlson\/MultiCoin,nathaniel-mahieu\/bitcoin,shurcoin\/shurcoin,BigBlueCeiling\/augmentacoin,Enticed87\/Decipher,schinzelh\/dash,inkvisit\/sarmacoins,jgarzik\/bitcoin,Czarcoin\/czarcoin,5mil\/Bolt,balajinandhu\/bitcoin,Domer85\/dogecoin,elecoin\/elecoin,Infernoman\/crowncoin,TierNolan\/bitcoin,JeremyRubin\/bitcoin,BTCGPU\/BTCGPU,zestcoin\/ZESTCOIN,byncoin-project\/byncoin,FinalHashLLC\/namecore,Xekyo\/bitcoin,tecnovert\/particl-core,tatafiore\/mycoin,hsavit1\/bitcoin,XX-net\/twister-core,alecalve\/bitcoin,pascalguru\/florincoin,Flowdalic\/bitcoin,kfitzgerald\/titcoin,MonetaryUnit\/MUE-Src,pinkmagicdev\/SwagBucks,oklink-dev\/litecoin_block,cryptostorm\/namecoin,glv2\/peerunity,bitbrazilcoin-project\/bitbrazilcoin,Justaphf\/BitcoinUnlimited,fsb4000\/bitcoin,habibmasuro\/bitcoin,irvingruan\/bitcoin,MOIN\/moin,franko-org\/franko,crowning2\/dash,tmagik\/catcoin,effectsToCause\/vericoin,zotherstupidguy\/bitcoin,Rav3nPL\/doubloons-0.10,rebroad\/bitcoin,elcrypto\/Pulse,ronpaulcoin\/ronpaulcoin,mm-s\/bitcoin,degenorate\/Deftcoin,rat4\/blackcoin,jmgilbert2\/energi,midnightmagic\/bitcoin,cryptcoins\/cryptcoin,elacoin\/elacoin,MikeAmy\/bitcoin,mrbandrews\/bitcoin,isle2983\/bitcoin,pastday\/bitcoinproject,royosherove\/bitcoinxt,bcpki\/testblocks,Thracky\/monkeycoin,crowning-\/dash,nochowderforyou\/clams,nomnombtc\/bitcoin,bitshares\/bitshares-pts,OfficialTitcoin\/titcoin-wallet,coinkeeper\/2015-06-22_18-51_vertcoin,coinkeeper\/2015-06-22_18-42_litecoin,marscoin\/marscoin,greencoin-dev\/digitalcoin,pinkmagicdev\/SwagBucks,Whitecoin-org\/Whitecoin,zcoinofficial\/zcoin,coinkeeper\/anoncoin_20150330_fixes,laudaa\/bitcoin,renatolage\/wallets-BRCoin,donaloconnor\/bitcoin,Ziftr\/bitcoin,lordsajan\/erupee,gazbert\/bitcoin,gavinandresen\/bitcoin-git,cddjr\/BitcoinUnlimited,Geekcoin-Project\/Geekcoin,keesdewit82\/LasVegasCoin,Alonzo-Coeus\/bitcoin,martindale\/elements,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,dpayne9000\/Rubixz-Coin,jlay11\/sharecoin,Action-Committee\/Spaceballz,5mil\/Bolt,millennial83\/bitcoin,goldcoin\/Goldcoin-GLD,ahmedbodi\/poscoin,lakepay\/lake,yacoin\/yacoin,lateminer\/DopeCoinGold,drwasho\/bitcoinxt,cryptodev35\/icash,gfneto\/Peershares,sugruedes\/bitcoinxt,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,Crowndev\/crowncoin,stronghands\/stronghands,joroob\/reddcoin,cannabiscoindev\/cannabiscoin420,111t8e\/bitcoin,HerkCoin\/herkcoin,braydonf\/bitcoin,lordsajan\/erupee,Rav3nPL\/bitcoin,jameshilliard\/bitcoin,CodeShark\/bitcoin,ForceMajeure\/BitPenny-Client,applecoin-official\/applecoin,wcwu\/bitcoin,kseistrup\/twister-core,alexwaters\/Bitcoin-Testing,coinkeeper\/2015-06-22_18-46_reddcoin,greencoin-dev\/greencoin-dev,rsdevgun16e\/energi,vertcoin\/eyeglass,etercoin\/etercoin,mastercoin-MSC\/mastercore,n1bor\/bitcoin,dperel\/bitcoin,iosdevzone\/bitcoin,halfinney\/bitcoin,jul2711\/jucoin,ajtowns\/bitcoin,marlengit\/BitcoinUnlimited,UASF\/bitcoin,brandonrobertz\/namecoin-core,scmorse\/bitcoin,whatrye\/twister-core,goldmidas\/goldmidas,my-first\/octocoin,botland\/bitcoin,netswift\/vertcoin,koharjidan\/litecoin,Peerapps\/ppcoin,EthanHeilman\/bitcoin,oklink-dev\/bitcoin,jamesob\/bitcoin,truthcoin\/truthcoin-cpp,pelorusjack\/BlockDX,nathan-at-least\/zcash,Theshadow4all\/ShadowCoin,Kore-Core\/kore,DogTagRecon\/Still-Leraning,coinkeeper\/2015-06-22_18-41_ixcoin,nlgcoin\/guldencoin-official,riecoin\/riecoin,earthcoinproject\/earthcoin,ahmedbodi\/terracoin,trippysalmon\/bitcoin,isle2983\/bitcoin,etercoin\/etercoin,Metronotes\/bitcoin,Kogser\/bitcoin,kirkalx\/bitcoin,simdeveloper\/bitcoin,5mil\/Tradecoin,myriadcoin\/myriadcoin,jiangyonghang\/bitcoin,WorldLeadCurrency\/WLC,ajweiss\/bitcoin,marscoin\/marscoin,Mrs-X\/PIVX,presstab\/PIVX,RazorLove\/cloaked-octo-spice,kfitzgerald\/titcoin,manuel-zulian\/accumunet,rsackler\/namecoin,torresalyssa\/bitcoin,compasscoin\/compasscoin,sarielsaz\/sarielsaz,devrandom\/bitcoin,JeremyRubin\/bitcoin,namecoinq\/namecoinq,nigeriacoin\/nigeriacoin,drwasho\/bitcoinxt,coinkeeper\/2015-06-22_18-30_anoncoin,se3000\/bitcoin,ronpaulcoin\/ronpaulcoin,kseistrup\/twister-core,ohac\/sha1coin,ahmedbodi\/terracoin,KaSt\/equikoin,tecnovert\/particl-core,alejandromgk\/Lunar,xurantju\/bitcoin,novaexchange\/EAC,thodg\/ppcoin,Mrs-X\/Darknet,earonesty\/bitcoin,neureal\/noocoin,mb300sd\/bitcoin,ivansib\/sib16,shomeser\/bitcoin,dgarage\/bc3,coinkeeper\/2015-06-22_18-39_feathercoin,dakk\/soundcoin,dashpay\/dash,guncoin\/guncoin,deuscoin\/deuscoin,rsdevgun16e\/energi,morcos\/bitcoin,ahmedbodi\/poscoin,mortalvikinglive\/bitcoinclassic,Kogser\/bitcoin,cheehieu\/bitcoin,nlgcoin\/guldencoin-official,experiencecoin\/experiencecoin,misdess\/bitcoin,kigooz\/smalltest,Exgibichi\/statusquo,shadowproject\/shadow,Jcing95\/iop-hd,irvingruan\/bitcoin,XX-net\/twister-core,kallewoof\/elements,shadowproject\/shadow,npccoin\/npccoin,uphold\/bitcoin,wellenreiter01\/Feathercoin,jonasbits\/namecoin,crowning-\/dash,BigBlueCeiling\/augmentacoin,nbenoit\/bitcoin,brishtiteveja\/truthcoin-cpp,scippio\/bitcoin,stevemyers\/bitcoinxt,bitcoin\/bitcoin,jnewbery\/bitcoin,reorder\/viacoin,kaostao\/bitcoin,TheOncomingStorm\/logincoinadvanced,sbellem\/bitcoin,superjudge\/bitcoin,steakknife\/bitcoin-qt,Peer3\/homework,jyap808\/jumbucks,2XL\/bitcoin,senadmd\/coinmarketwatch,ticclassic\/ic,nailtaras\/nailcoin,untrustbank\/litecoin,mm-s\/bitcoin,MazaCoin\/maza,Cancercoin\/Cancercoin,nailtaras\/nailcoin,reddcoin-project\/reddcoin,coinkeeper\/2015-06-22_19-19_worldcoin,gzuser01\/zetacoin-bitcoin,kevcooper\/bitcoin,SartoNess\/BitcoinUnlimited,scamcoinz\/scamcoin,JeremyRand\/namecore,vectorcoindev\/Vector,vertcoin\/eyeglass,redfish64\/nomiccoin,majestrate\/twister-core,safecoin\/safecoin,dgarage\/bc2,dcousens\/bitcoin,nomnombtc\/bitcoin,Rav3nPL\/doubloons-08,TeamBitBean\/bitcoin-core,shadowoneau\/ozcoin,jimblasko\/2015_UNB_Wallets,fujicoin\/fujicoin,truthcoin\/truthcoin-cpp,alecalve\/bitcoin,glv2\/peerunity,ppcoin\/ppcoin,zottejos\/merelcoin,earonesty\/bitcoin,coinkeeper\/2015-06-22_18-46_razor,MidasPaymentLTD\/midascoin,capitalDIGI\/litecoin,cryptocoins4all\/zcoin,mockcoin\/mockcoin,sipsorcery\/bitcoin,bittylicious\/bitcoin,s-matthew-english\/bitcoin,nigeriacoin\/nigeriacoin,phplaboratory\/psiacoin,Dajackal\/Ronpaulcoin,blood2\/bloodcoin-0.9,slingcoin\/sling-market,benzmuircroft\/REWIRE.io,Anoncoin\/anoncoin,KibiCoin\/kibicoin,wbchen99\/bitcoin-hnote0,ripper234\/bitcoin,Bitcoin-ABC\/bitcoin-abc,plncoin\/PLNcoin_Core,Megacoin2\/Megacoin,erqan\/twister-core,sdaftuar\/bitcoin,jul2711\/jucoin,rustyrussell\/bitcoin,vinced\/namecoin,Ziftr\/ppcoin,rawodb\/bitcoin,elambert2014\/cbx2,dan-mi-sun\/bitcoin,joulecoin\/joulecoin,nvmd\/bitcoin,welshjf\/bitcoin,Sjors\/bitcoin,iceinsidefire\/peershare-edit,crowning-\/dash,kallewoof\/elements,isghe\/bitcoinxt,blackcoinhelp\/blackcoin,ionomy\/ion,meighti\/bitcoin,daliwangi\/bitcoin,midnight-miner\/LasVegasCoin,phorensic\/yacoin,Vsync-project\/Vsync,byncoin-project\/byncoin,BTCTaras\/bitcoin,aburan28\/elements,millennial83\/bitcoin,MOIN\/moin,MOIN\/moin,freelion93\/mtucicoin,Adaryian\/E-Currency,domob1812\/huntercore,cinnamoncoin\/Feathercoin,okTurtles\/namecoin,goldcoin\/Goldcoin-GLD,Rav3nPL\/bitcoin,loxal\/zcash,JeremyRand\/bitcoin,m0gliE\/fastcoin-cli,Bushstar\/UFO-Project,cdecker\/bitcoin,TurboStake\/TurboStake,tjth\/lotterycoin,pascalguru\/florincoin,CodeShark\/bitcoin,npccoin\/npccoin,erqan\/twister-core,DGCDev\/digitalcoin,TeamBitBean\/bitcoin-core,oklink-dev\/litecoin_block,cdecker\/bitcoin,xieta\/mincoin,truthcoin\/truthcoin-cpp,mikehearn\/bitcoinxt,Mirobit\/bitcoin,fedoracoin-dev\/fedoracoin,Whitecoin-org\/Whitecoin,ftrader-bitcoinabc\/bitcoin-abc,ptschip\/bitcoin,fullcoins\/fullcoin,ohac\/sakuracoin,benosa\/bitcoin,ericshawlinux\/bitcoin,bcpki\/nonce2,gravio-net\/graviocoin,tuaris\/bitcoin,shaulkf\/bitcoin,alecalve\/bitcoin,gjhiggins\/vcoin0.8zeta-dev,TheOncomingStorm\/logincoinadvanced,domob1812\/huntercore,greencoin-dev\/digitalcoin,KibiCoin\/kibicoin,TheSeven\/ppcoin,IlfirinCano\/shavercoin,Crypto-Currency\/BitBar,skaht\/bitcoin,haisee\/dogecoin,mikehearn\/bitcoinxt,wiggi\/huntercoin,phelix\/bitcoin,barcoin-project\/nothingcoin,se3000\/bitcoin,misdess\/bitcoin,core-bitcoin\/bitcoin,czr5014iph\/bitcoin4e,lbryio\/lbrycrd,MasterX1582\/bitcoin-becoin,aspirecoin\/aspire,syscoin\/syscoin2,MazaCoin\/mazacoin-new,TheBlueMatt\/bitcoin,jlopp\/statoshi,saydulk\/Feathercoin,cainca\/liliucoin,kevcooper\/bitcoin,vectorcoindev\/Vector,grumpydevelop\/singularity,cainca\/liliucoin,KibiCoin\/kibicoin,neutrinofoundation\/neutrino-digital-currency,rat4\/blackcoin,KaSt\/ekwicoin,particl\/particl-core,Bitcoin-com\/BUcash,argentumproject\/argentum,globaltoken\/globaltoken,Adaryian\/E-Currency,FarhanHaque\/bitcoin,osuyuushi\/laughingmancoin,ahmedbodi\/temp_vert,REAP720801\/bitcoin,AquariusNetwork\/ARCO,tobeyrowe\/BitStarCoin,1185\/starwels,ardsu\/bitcoin,lordsajan\/erupee,Midar\/namecoin,namecoin-qt\/namecoin-qt,capitalDIGI\/DIGI-v-0-10-4,Vsync-project\/Vsync,jimmykiselak\/lbrycrd,coinkeeper\/2015-06-22_18-30_anoncoin,BlockchainTechLLC\/3dcoin,BTCTaras\/bitcoin,cmgustavo\/bitcoin,kleetus\/bitcoin,nmarley\/dash,thesoftwarejedi\/bitcoin,butterflypay\/bitcoin,Christewart\/bitcoin,mruddy\/bitcoin,slimcoin-project\/Slimcoin,sbellem\/bitcoin,faircoin\/faircoin2,united-scrypt-coin-project\/unitedscryptcoin,iQcoin\/iQcoin,bitjson\/hivemind,ColossusCoinXT\/ColossusCoinXT,djpnewton\/bitcoin,CoinGame\/BCEShadow,Bloom-Project\/Bloom,itmanagerro\/tresting,jtimon\/elements,Rav3nPL\/PLNcoin,neuroidss\/bitcoin,JeremyRubin\/bitcoin,destenson\/bitcoin--bitcoin,scmorse\/bitcoin,karek314\/bitcoin,masterbraz\/dg,Kangmo\/bitcoin,blackcoinhelp\/blackcoin,lakepay\/lake,prusnak\/bitcoin,globaltoken\/globaltoken,raasakh\/bardcoin,faircoin\/faircoin,ionux\/freicoin,Erkan-Yilmaz\/twister-core,stevemyers\/bitcoinxt,cryptocoins4all\/zcoin,benosa\/bitcoin,namecoin\/namecore,romanornr\/viacoin,azilber\/devcoin,jimmykiselak\/lbrycrd,peercoin\/peercoin,Litecoindark\/LTCD,florincoin\/florincoin,npccoin\/npccoin,ANCompany\/birdcoin-dev,zottejos\/merelcoin,starwels\/starwels,SoreGums\/bitcoinxt,coinkeeper\/2015-06-22_19-07_digitalcoin,theuni\/bitcoin,tmagik\/catcoin,EntropyFactory\/creativechain-core,TrainMAnB\/vcoincore,oklink-dev\/litecoin_block,neuroidss\/bitcoin,thelazier\/dash,wiggi\/fairbrix-0.6.3,phelixbtc\/bitcoin,achow101\/bitcoin,p2peace\/oliver-twister-core,mycointest\/owncoin,fujicoin\/fujicoin,3lambert\/Molecular,xeddmc\/twister-core,lateminer\/bitcoin,MeshCollider\/bitcoin,Ziftr\/litecoin,likecoin-dev\/bitcoin,namecoin\/namecoin-core,brishtiteveja\/truthcoin-cpp,SmeltFool\/Yippe-Hippe,ajtowns\/bitcoin,Paymium\/bitcoin,karek314\/bitcoin,dscotese\/bitcoin,funkshelper\/woodcore,ingresscoin\/ingresscoin,jonghyeopkim\/bitcoinxt,cmgustavo\/bitcoin,dashpay\/dash,RyanLucchese\/energi,karek314\/bitcoin,marlengit\/hardfork_prototype_1_mvf-bu,valorbit\/valorbit,domob1812\/huntercore,BTCDDev\/bitcoin,Midar\/namecoin,error10\/bitcoin,safecoin\/safecoin,CryptArc\/bitcoinxt,goldcoin\/goldcoin,ColossusCoinXT\/ColossusCoinXT,cmgustavo\/bitcoin,viacoin\/viacoin,sipa\/elements,KaSt\/equikoin,killerstorm\/bitcoin,yacoin\/yacoin,syscoin\/syscoin,litecoin-project\/litecoin,jtimon\/elements,okinc\/litecoin,kleetus\/bitcoin,rsackler\/namecoin,GeopaymeEE\/e-goldcoin,gjhiggins\/vcoin09,Tetpay\/bitcoin,thunderrabbit\/clams,XX-net\/twister-core,elecoin\/elecoin,cfromknecht\/namecoin-legacy,HashUnlimited\/Einsteinium-Unlimited,bcpki\/testblocks,KaSt\/ekwicoin,coblee\/litecoin-old,thodg\/ppcoin,RyanLucchese\/energi,MazaCoin\/maza,GroestlCoin\/GroestlCoin,kallewoof\/bitcoin,presstab\/PIVX,zotherstupidguy\/bitcoin,jarymoth\/dogecoin,diggcoin\/diggcoin,FuzzyBearBTC\/Peershares-1,instagibbs\/bitcoin,czr5014iph\/bitcoin4e,AquariusNetwork\/ARCOv2,maraoz\/proofcoin,bitcoinsSG\/bitcoin,djpnewton\/bitcoin,gameunits\/gameunits,coinkeeper\/2015-06-22_19-10_cannacoin,guncoin\/guncoin,capitalDIGI\/litecoin,midnight-miner\/LasVegasCoin,Bitcoin-com\/BUcash,HashUnlimited\/Einsteinium-Unlimited,Infernoman\/crowncoin,truthcoin\/truthcoin-cpp,FuzzyBearBTC\/Peershares-1,antonio-fr\/bitcoin,iadix\/iadixcoin,coinkeeper\/2015-06-22_19-13_florincoin,andres-root\/bitcoinxt,namecoinq\/namecoinq,unsystemizer\/bitcoin,40thoughts\/Coin-QualCoin,isle2983\/bitcoin,MasterX1582\/bitcoin-becoin,jashandeep-sohi\/ppcoin,sugruedes\/bitcoinxt,elliotolds\/bitcoin,jl2012\/litecoin,Mirobit\/bitcoin,jashandeep-sohi\/ppcoin,crowning2\/dash,ahmedbodi\/Bytecoin-MM,majestrate\/twister-core,cryptohelper\/premine,Kabei\/Ippan,Litecoindark\/LTCD,bitshares\/bitshares-pts,reddink\/reddcoin,mortalvikinglive\/bitcoinclassic,riecoin\/riecoin,okinc\/bitcoin,hyperwang\/bitcoin,gwillen\/elements,genavarov\/brcoin,BTCTaras\/bitcoin,lbrtcoin\/albertcoin,peacedevelop\/peacecoin,Michagogo\/bitcoin,EntropyFactory\/creativechain-core,dgenr8\/bitcoinxt,GreenParhelia\/bitcoin,sirk390\/bitcoin,JeremyRand\/namecoin-core,namecoin\/namecoin,slingcoin\/sling-market,nomnombtc\/bitcoin,benzmuircroft\/REWIRE.io,bitpay\/bitcoin,jgarzik\/bitcoin,kryptokredyt\/ProjektZespolowyCoin,GroundRod\/anoncoin,IOCoin\/iocoin,Coinfigli\/coinfigli,WorldLeadCurrency\/WLC,vizidrixfork\/Peershares,Darknet-Crypto\/Darknet,borgcoin\/Borgcoin.rar,mortalvikinglive\/bitcoinlight,RyanLucchese\/energi,AkioNak\/bitcoin,xuyangcn\/opalcoin,OfficialTitcoin\/titcoin-wallet,goldcoin\/goldcoin,Stakemaker\/OMFGcoin,namecoin\/namecoin,Jeff88Ho\/bitcoin,kallewoof\/bitcoin,DogTagRecon\/Still-Leraning,dooglus\/clams,celebritycoin\/CelebrityCoin,genavarov\/lamacoin,jambolo\/bitcoin,shurcoin\/shurcoin,dooglus\/bitcoin,coinkeeper\/2015-06-22_19-19_worldcoin,ArgonToken\/ArgonToken,icook\/vertcoin,stamhe\/novacoin,royosherove\/bitcoinxt,ppcoin\/ppcoin,EntropyFactory\/creativechain-core,madman5844\/poundkoin,superjudge\/bitcoin,ionux\/freicoin,5mil\/Tradecoin,crowning-\/dash,mortalvikinglive\/bitcoinclassic,antonio-fr\/bitcoin,reddink\/reddcoin,viacoin\/viacoin,coinkeeper\/anoncoin_20150330_fixes,cddjr\/BitcoinUnlimited,ravenbyron\/phtevencoin,litecoin-project\/bitcoinomg,thrasher-\/litecoin,adpg211\/bitcoin-master,karek314\/bitcoin,vcoin-project\/vcoincore,jrmithdobbs\/bitcoin,mobicoins\/mobicoin-core,rjshaver\/bitcoin,jonasnick\/bitcoin,cybermatatu\/bitcoin,jlopp\/statoshi,Ziftr\/namecoin,dexX7\/bitcoin,coinkeeper\/2015-06-22_18-37_dogecoin,ArgonToken\/ArgonToken,coinkeeper\/2015-06-22_18-41_ixcoin,bitgoldcoin-project\/bitgoldcoin,ftrader-bitcoinabc\/bitcoin-abc,phelix\/namecore,sugruedes\/bitcoinxt,theuni\/bitcoin,NunoEdgarGub1\/elements,Megacoin2\/Megacoin,coinkeeper\/2015-06-22_18-42_litecoin,1185\/starwels,aciddude\/Feathercoin,ahmedbodi\/bytecoin,BTCGPU\/BTCGPU,djpnewton\/bitcoin,dmrtsvetkov\/flowercoin,apoelstra\/elements,vlajos\/bitcoin,Peershares\/Peershares,RongxinZhang\/bitcoinxt,GroestlCoin\/bitcoin,neureal\/noocoin,bmp02050\/ReddcoinUpdates,daeMOn63\/Peershares,DynamicCoinOrg\/DMC,mmpool\/coiledcoin,crowning2\/dash,ahmedbodi\/test2,simonmulser\/bitcoin,apoelstra\/elements,AkioNak\/bitcoin,Alonzo-Coeus\/bitcoin,DigitalPandacoin\/pandacoin,fujicoin\/fujicoin,dgarage\/bc2,ForceMajeure\/BitPenny-Client-0.4.0.1,Thracky\/monkeycoin,TheBlueMatt\/bitcoin,redfish64\/nomiccoin,cheehieu\/bitcoin,NateBrune\/bitcoin-nate,Credit-Currency\/CoinTestComp,halfinney\/bitcoin,valorbit\/valorbit-oss,Action-Committee\/Spaceballz,blackcoinhelp\/blackcoin,XX-net\/twister-core,bfroemel\/smallchange,DrCrypto\/darkcoin,scamcoinz\/scamcoin,Vsync-project\/Vsync,shea256\/bitcoin,error10\/bitcoin,Ziftr\/litecoin,effectsToCause\/vericoin,Litecoindark\/LTCD,VsyncCrypto\/Vsync,ludbb\/bitcoin,bdelzell\/creditcoin-org-creditcoin,benosa\/bitcoin,ixcoinofficialpage\/master,pataquets\/namecoin-core,Mrs-X\/Darknet,drwasho\/bitcoinxt,joshrabinowitz\/bitcoin,vertcoin\/eyeglass,21E14\/bitcoin,manuel-zulian\/CoMoNet,Anoncoin\/anoncoin,deuscoin\/deuscoin,MeshCollider\/bitcoin,Kabei\/Ippan,svost\/bitcoin,CTRoundTable\/Encrypted.Cash,CoinGame\/NuShadowNet,webdesignll\/coin,gorgoy\/novacoin,Midar\/namecoin,ixcoinofficialpage\/master,zcoinofficial\/zcoin,dperel\/bitcoin,spiritlinxl\/BTCGPU,sipa\/bitcoin,adpg211\/bitcoin-master,shouhuas\/bitcoin,awoland\/namecoinq,monacoinproject\/monacoin,ahmedbodi\/vertcoin,tropa\/axecoin,REAP720801\/bitcoin,pinkevich\/dash,putinclassic\/putic,simonmulser\/bitcoin,wekuiz\/wekoin,cerebrus29301\/crowncoin,shomeser\/bitcoin,akabmikua\/flowcoin,ANCompany\/birdcoin-dev,ahmedbodi\/vertcoin,oklink-dev\/bitcoin_block,ahmedbodi\/temp_vert,Bushstar\/UFO-Project,gzuser01\/zetacoin-bitcoin,Peershares\/Peershares,benma\/bitcoin,gmaxwell\/bitcoin,blocktrail\/bitcoin,irvingruan\/bitcoin,vectorcoindev\/Vector,manuel-zulian\/accumunet,shadowoneau\/ozcoin,imton\/bitcoin,sipa\/bitcoin,MOIN\/moin,GroundRod\/anoncoin,dperel\/bitcoin,pataquets\/namecoin-core,ftrader-bitcoinabc\/bitcoin-abc,llamasoft\/ProtoShares_Cycle,sipsorcery\/bitcoin,ptschip\/bitcoinxt,MikeAmy\/bitcoin,neuroidss\/bitcoin,ghostlander\/Testcoin,gazbert\/bitcoin,Mrs-X\/PIVX,DynamicCoinOrg\/DMC,BitcoinHardfork\/bitcoin,jiangyonghang\/bitcoin,shomeser\/bitcoin,ANCompany\/birdcoin-dev,keesdewit82\/LasVegasCoin,hophacker\/bitcoin_malleability,atgreen\/bitcoin,pinheadmz\/bitcoin,Rav3nPL\/polcoin,oklink-dev\/bitcoin_block,pataquets\/namecoin-core,cyrixhero\/bitcoin,florincoin\/florincoin,r8921039\/bitcoin,jtimon\/bitcoin,miguelfreitas\/twister-core,nbenoit\/bitcoin,vertcoin\/vertcoin,MitchellMintCoins\/AutoCoin,pinkmagicdev\/SwagBucks,lentza\/SuperTurboStake,ftrader-bitcoinabc\/bitcoin-abc,dopecoin-dev\/DopeCoinGold,phelix\/bitcoin,3lambert\/Molecular,WorldcoinGlobal\/WorldcoinLegacy,jeromewu\/bitcoin-opennet,koharjidan\/bitcoin,nathan-at-least\/zcash,rsdevgun16e\/energi,javgh\/bitcoin,ingresscoin\/ingresscoin,palm12341\/jnc,deeponion\/deeponion,peacedevelop\/peacecoin,martindale\/elements,pstratem\/bitcoin,rsackler\/namecoin,shapiroisme\/datadollar,senadmd\/coinmarketwatch,fsb4000\/novacoin,Tetcoin\/tetcoin,sickpig\/BitcoinUnlimited,UFOCoins\/ufo,irvingruan\/bitcoin,Earlz\/dobbscoin-source,marklai9999\/Taiwancoin,brightcoin\/brightcoin,marcusdiaz\/BitcoinUnlimited,gades\/novacoin,Alex-van-der-Peet\/bitcoin,initaldk\/bitcoin,marlengit\/BitcoinUnlimited,alexwaters\/Bitcoin-Testing,gmaxwell\/bitcoin,ftrader-bitcoinabc\/bitcoin-abc,blood2\/bloodcoin-0.9,ptschip\/bitcoinxt,likecoin-dev\/bitcoin,royosherove\/bitcoinxt,pstratem\/elements,freelion93\/mtucicoin,thormuller\/yescoin2,novaexchange\/EAC,ALEXIUMCOIN\/alexium,bcpki\/nonce2,simonmulser\/bitcoin,Kenwhite23\/litecoin,killerstorm\/bitcoin,imton\/bitcoin,lbryio\/lbrycrd,jambolo\/bitcoin,domob1812\/huntercoin,ryanofsky\/bitcoin,hsavit1\/bitcoin,simdeveloper\/bitcoin,langerhans\/dogecoin,haraldh\/bitcoin,UdjinM6\/dash,leofidus\/glowing-octo-ironman,PandaPayProject\/PandaPay,ravenbyron\/phtevencoin,butterflypay\/bitcoin,ticclassic\/ic,HeliumGas\/helium,Adaryian\/E-Currency,HeliumGas\/helium,okcashpro\/okcash,jaromil\/faircoin2,GroestlCoin\/GroestlCoin,kirkalx\/bitcoin,keesdewit82\/LasVegasCoin,jnewbery\/bitcoin,likecoin-dev\/bitcoin,coblee\/litecoin-old,haraldh\/bitcoin,5mil\/Bolt,stevemyers\/bitcoinxt,kaostao\/namecoin,patricklodder\/dogecoin,sacarlson\/MultiCoin,applecoin-official\/applecoin,jmgilbert2\/energi,sbellem\/bitcoin,nsacoin\/nsacoin,apoelstra\/elements,gandrewstone\/BitcoinUnlimited,pastday\/bitcoinproject,reorder\/viacoin,core-bitcoin\/bitcoin,dogecoin\/dogecoin,zzkt\/solarcoin,Open-Source-Coins\/EZ,Bluejudy\/worldcoin,laudaa\/bitcoin,Christewart\/bitcoin,penek\/novacoin,manuel-zulian\/CoMoNet,Dinarcoin\/dinarcoin,SartoNess\/BitcoinUnlimited,BitcoinHardfork\/bitcoin,janko33bd\/bitcoin,coinkeeper\/2015-06-22_18-51_vertcoin,indolering\/namecoin-qt,credits-currency\/credits,shouhuas\/bitcoin,OfficialTitcoin\/titcoin-wallet,Stakemaker\/OMFGcoin,SandyCohen\/mincoin,namecoin\/namecoin-legacy,StarbuckBG\/BTCGPU,wangxinxi\/litecoin,xurantju\/bitcoin,bespike\/litecoin,tjps\/bitcoin,Stakemaker\/OMFGcoin,phelixbtc\/bitcoin,xeddmc\/twister-core,memorycoin\/memorycoin,MitchellMintCoins\/MortgageCoin,vertcoin\/eyeglass,BigBlueCeiling\/augmentacoin,coinkeeper\/2015-06-22_18-52_viacoin,BigBlueCeiling\/augmentacoin,starwels\/starwels,Earlz\/renamedcoin,alecalve\/bitcoin,ajweiss\/bitcoin,GreenParhelia\/bitcoin,nanocoins\/mycoin,2XL\/bitcoin,dev1972\/Satellitecoin,zenywallet\/bitzeny,stamhe\/novacoin,KibiCoin\/kibicoin,CryptArc\/bitcoinxt,sipa\/bitcoin,mincoin-project\/mincoin,ghostlander\/Orbitcoin,compasscoin\/compasscoin,ghostlander\/Orbitcoin,Exceltior\/dogecoin,prark\/bitcoinxt,szlaozhu\/twister-core,wellenreiter01\/Feathercoin,r8921039\/bitcoin,wiggi\/huntercore,leofidus\/glowing-octo-ironman,arruah\/ensocoin,united-scrypt-coin-project\/unitedscryptcoin,lakepay\/lake,bitshares\/bitshares-pts,alexandrcoin\/vertcoin,capitalDIGI\/litecoin,deadalnix\/bitcoin,ghostlander\/Testcoin,zcoinofficial\/zcoin,gravio-net\/graviocoin,coinkeeper\/2015-06-22_18-56_megacoin,plncoin\/PLNcoin_Core,jimmysong\/bitcoin,sbaks0820\/bitcoin,gjhiggins\/vcoincore,greencoin-dev\/greencoin-dev,raasakh\/bardcoin,Michagogo\/bitcoin,krzysztofwos\/BitcoinUnlimited,Vsync-project\/Vsync,mikehearn\/bitcoinxt,segwit\/atbcoin-insight,OmniLayer\/omnicore,Cannacoin-Project\/Cannacoin,fussl\/elements,taenaive\/zetacoin,anditto\/bitcoin,MitchellMintCoins\/MortgageCoin,grumpydevelop\/singularity,jtimon\/elements,Cocosoft\/bitcoin,iadix\/iadixcoin,vcoin-project\/vcoincore,Bloom-Project\/Bloom,prodigal-son\/blackcoin,Petr-Economissa\/gvidon,Krellan\/bitcoin,khalahan\/bitcoin,jn2840\/bitcoin,joulecoin\/joulecoin,shadowproject\/shadow,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,balajinandhu\/bitcoin,Rav3nPL\/bitcoin,valorbit\/valorbit,compasscoin\/compasscoin,oleganza\/bitcoin-duo,pinkevich\/dash,core-bitcoin\/bitcoin,psionin\/smartcoin,tmagik\/catcoin,rebroad\/bitcoin,marlengit\/hardfork_prototype_1_mvf-bu,axelxod\/braincoin,elacoin\/elacoin,gjhiggins\/fuguecoin,leofidus\/glowing-octo-ironman,cddjr\/BitcoinUnlimited,gades\/novacoin,shaolinfry\/litecoin,fussl\/elements,11755033isaprimenumber\/Feathercoin,particl\/particl-core,ingresscoin\/ingresscoin,FuzzyBearBTC\/Peershares-1,cerebrus29301\/crowncoin,randy-waterhouse\/bitcoin,butterflypay\/bitcoin,tatafiore\/mycoin,btc1\/bitcoin,MarcoFalke\/bitcoin,raasakh\/bardcoin,zebrains\/Blotter,brishtiteveja\/truthcoin-cpp,r8921039\/bitcoin,MonetaryUnit\/MUE-Src,jmcorgan\/bitcoin,segsignal\/bitcoin,reddink\/reddcoin,Rav3nPL\/doubloons-0.10,isocolsky\/bitcoinxt,Cloudsy\/bitcoin,ForceMajeure\/BitPenny-Client,FuzzyBearBTC\/Peerunity,schinzelh\/dash,applecoin-official\/fellatio,united-scrypt-coin-project\/unitedscryptcoin,ShwoognationHQ\/bitcoin,KaSt\/ekwicoin,btcdrak\/bitcoin,Stakemaker\/OMFGcoin,acmeyer\/namecoin,qreatora\/worldcoin-v0.8,pouta\/bitcoin,djpnewton\/bitcoin,Theshadow4all\/ShadowCoin,nightlydash\/darkcoin,Jheguy2\/Mercury,core-bitcoin\/bitcoin,ychaim\/smallchange,nomnombtc\/bitcoin,constantine001\/bitcoin,Peer3\/homework,chaincoin\/chaincoin,marlengit\/hardfork_prototype_1_mvf-bu,Lucky7Studio\/bitcoin,funkshelper\/woodcoin-b,jlay11\/sharecoin,fedoracoin-dev\/fedoracoin,majestrate\/twister-core,coinwarp\/dogecoin,isocolsky\/bitcoinxt,AquariusNetwork\/ARCO,AkioNak\/bitcoin,Metronotes\/bitcoin,coinkeeper\/2015-06-22_18-44_namecoin,grumpydevelop\/singularity,welshjf\/bitcoin,nightlydash\/darkcoin,khalahan\/namecoin,coinkeeper\/2015-06-22_18-31_bitcoin,ashleyholman\/bitcoin,zestcoin\/ZESTCOIN,5mil\/SuperTurboStake,rat4\/blackcoin,zixan\/bitcoin,markf78\/dollarcoin,diggcoin\/diggcoin,Thracky\/monkeycoin,spiritlinxl\/BTCGPU,21E14\/bitcoin,stevemyers\/bitcoinxt,FuzzyBearBTC\/Peershares2,haraldh\/bitcoin,franko-org\/franko,NicolasDorier\/bitcoin,bcpki\/nonce2,rebroad\/bitcoin,fussl\/elements,bitchip\/bitchip,TurboStake\/TurboStake,pastday\/bitcoinproject,azilber\/devcoin,s-matthew-english\/bitcoin,OmniLayer\/omnicore,sebrandon1\/bitcoin,WorldLeadCurrency\/WLC,marscoin\/marscoin,goku1997\/bitcoin,zenywallet\/bitzeny,awemany\/BitcoinUnlimited,Rav3nPL\/doubloons-0.10,particl\/particl-core,dobbscoin\/dobbscoin-source,lateminer\/bitcoin,PRabahy\/bitcoin,GIJensen\/bitcoin,mammix2\/ccoin-dev,ajweiss\/bitcoin,masterbraz\/dg,octocoin-project\/octocoin,slimcoin-project\/Slimcoin,okcashpro\/okcash,5mil\/SuperTurboStake,oklink-dev\/bitcoin,bfroemel\/smallchange,DGCDev\/argentum,domob1812\/namecore,cryptostorm\/namecoin,greencoin-dev\/GreenCoinV2,thesoftwarejedi\/bitcoin,celebritycoin\/CelebrityCoin,MeshCollider\/bitcoin,LIMXTEC\/DMDv3,Electronic-Gulden-Foundation\/egulden,gorgoy\/novacoin,kfitzgerald\/titcoin,jrmithdobbs\/bitcoin,CTRoundTable\/Encrypted.Cash,bootycoin-project\/bootycoin,kevcooper\/bitcoin,earonesty\/bitcoin,npccoin\/npccoin,sproutcoin\/sprouts,wtogami\/bitcoin,benosa\/bitcoin,tuaris\/bitcoin,xurantju\/bitcoin,cfromknecht\/namecoin-legacy,chronokings\/huntercoin,tjps\/bitcoin,AsteraCoin\/AsteraCoin,dev1972\/Satellitecoin,StarbuckBG\/BTCGPU,Horrorcoin\/horrorcoin,goku1997\/bitcoin,namecoin\/namecoin-legacy,vbernabe\/freicoin,jimblasko\/UnbreakableCoin-master,chronokings\/huntercoin,vbernabe\/freicoin,tjth\/lotterycoin,nigeriacoin\/nigeriacoin,greencoin-dev\/greencoin-dev,jlcurby\/NobleCoin,blocktrail\/bitcoin,brishtiteveja\/sherlockholmescoin,Enticed87\/Decipher,keesdewit82\/LasVegasCoin,magacoin\/magacoin,cqtenq\/feathercoin_core,ceptacle\/libcoinqt,pevernon\/picoin,vizidrixfork\/Peershares,Carrsy\/PoundCoin,benma\/bitcoin,bmp02050\/ReddcoinUpdates,FinalHashLLC\/namecore,bankonmecoin\/bitcoin,MOIN\/moin,LIMXTEC\/DMDv3,marcusdiaz\/BitcoinUnlimited,Domer85\/dogecoin,Flurbos\/Flurbo,litecoin-project\/litecore-litecoin,dagurval\/bitcoinxt,laanwj\/bitcoin-qt,FinalHashLLC\/namecore,pascalguru\/florincoin,EthanHeilman\/bitcoin,alejandromgk\/Lunar,internaut-me\/ppcoin,Har01d\/bitcoin,kryptokredyt\/ProjektZespolowyCoin,coinkeeper\/2015-06-22_18-37_dogecoin,czr5014iph\/bitcoin4e,dperel\/bitcoin,torresalyssa\/bitcoin,Richcoin-Project\/RichCoin,Cancercoin\/Cancercoin,bitchip\/bitchip,Darknet-Crypto\/Darknet,Geekcoin-Project\/Geekcoin,thrasher-\/litecoin,brishtiteveja\/truthcoin-cpp,zemrys\/vertcoin,dcousens\/bitcoin,CryptArc\/bitcoin,LIMXTEC\/DMDv3,Cocosoft\/bitcoin,coinkeeper\/2015-06-22_18-52_viacoin,Exceltior\/dogecoin,tobeyrowe\/smallchange,AquariusNetwork\/ARCO,degenorate\/Deftcoin,arnuschky\/bitcoin,GroestlCoin\/GroestlCoin,penek\/novacoin,Kabei\/Ippan,genavarov\/lamacoin,Rimbit\/Wallets,kleetus\/bitcoinxt,IlfirinIlfirin\/shavercoin,keisercoin-official\/keisercoin,untrustbank\/litecoin,coinkeeper\/2015-06-22_18-46_razor,puticcoin\/putic,joshrabinowitz\/bitcoin,shomeser\/bitcoin,GeopaymeEE\/e-goldcoin,dcousens\/bitcoin,vbernabe\/freicoin,cotner\/bitcoin,jiffe\/cosinecoin,chrisfranko\/aiden,bitcoinknots\/bitcoin,ctwiz\/stardust,48thct2jtnf\/P,Earlz\/dobbscoin-source,wcwu\/bitcoin,gjhiggins\/vcoin0.8zeta-dev,fanquake\/bitcoin,Ziftr\/bitcoin,BTCDDev\/bitcoin,vericoin\/vericoin-core,xieta\/mincoin,madman5844\/poundkoin,sipa\/elements,Mirobit\/bitcoin,stamhe\/litecoin,FuzzyBearBTC\/Peershares,loxal\/zcash,Diapolo\/bitcoin,goku1997\/bitcoin,webdesignll\/coin,nmarley\/dash,mapineda\/litecoin,therealaltcoin\/altcoin,magacoin\/magacoin,randy-waterhouse\/bitcoin,thormuller\/yescoin2,marscoin\/marscoin,phelix\/namecore,ivansib\/sibcoin,xranby\/blackcoin,penek\/novacoin,metrocoins\/metrocoin,paveljanik\/bitcoin,Bitcoin-ABC\/bitcoin-abc,acmeyer\/voteid,namecoin\/namecoin-legacy,faircoin\/faircoin2,worldbit\/worldbit,tripmode\/pxlcoin,dooglus\/bitcoin,mammix2\/ccoin-dev,chaincoin\/chaincoin,lbrtcoin\/albertcoin,brishtiteveja\/sherlockholmescoin,shadowproject\/shadow,steakknife\/bitcoin-qt,gandrewstone\/BitcoinUnlimited,segwit\/atbcoin-insight,blood2\/bloodcoin-0.9,emc2foundation\/einsteinium,bitcoinec\/bitcoinec,creath\/barcoin,experiencecoin\/experiencecoin,sacarlson\/MultiCoin-exp,domob1812\/huntercoin,cinnamoncoin\/Feathercoin,dan-mi-sun\/bitcoin,Anfauglith\/iop-hd,llluiop\/bitcoin,myriadteam\/myriadcoin,nochowderforyou\/clams,guncoin\/guncoin,howardrya\/AcademicCoin,deadalnix\/bitcoin,snakie\/ppcoin,dakk\/soundcoin,tobeyrowe\/smallchange,qubitcoin-project\/QubitCoinQ2C,jrick\/bitcoin,destenson\/bitcoin--bitcoin,CryptArc\/bitcoinxt,bootycoin-project\/bootycoin,TGDiamond\/Diamond,ticclassic\/ic,ctwiz\/stardust,wcwu\/bitcoin,brishtiteveja\/sherlockcoin,bankonmeOS\/namecoin-qt,kfitzgerald\/titcoin,barcoin-project\/nothingcoin,emc2foundation\/einsteinium,denverl\/bitcoin,pouta\/bitcoin,Rav3nPL\/doubloons-0.10,kseistrup\/twister-core,upgradeadvice\/MUE-Src,octocoin-project\/octocoin,isghe\/bitcoinxt,gzuser01\/zetacoin-bitcoin,sifcoin\/sifcoin,landcoin-ldc\/landcoin,digibyte\/digibyte,okcashpro\/okcash,andres-root\/bitcoinxt,gameunits\/gameunits,IlfirinIlfirin\/shavercoin,tjps\/bitcoin,namecoin\/namecoin,krzysztofwos\/BitcoinUnlimited,goldcoin\/goldcoin,novacoin-project\/novacoin,REAP720801\/bitcoin,argentumproject\/argentum,cybermatatu\/bitcoin,rjshaver\/bitcoin,donaloconnor\/bitcoin,keisercoin-official\/keisercoin,jimblasko\/2015_UNB_Wallets,etercoin\/etercoin,DigiByte-Team\/digibyte,lentza\/SuperTurboStake,ivansib\/sibcoin,bitchip\/bitchip,jameshilliard\/bitcoin,dexX7\/mastercore,bankonmeOS\/namecoin-qt,stronghands\/stronghands,superjudge\/bitcoin,emc2foundation\/einsteinium,litecoin-project\/litecoin,zebrains\/Blotter,bitpagar\/bitpagar,nsacoin\/nsacoin,gorgoy\/novacoin,Theshadow4all\/ShadowCoin,bcpki\/testblocks,ahmedbodi\/Bytecoin-MM,Peershares\/Peershares,MoMoneyMonetarism\/ppcoin,UASF\/bitcoin,gjhiggins\/vcoin0.8zeta-dev,EntropyFactory\/creativechain-core,goku1997\/bitcoin,funbucks\/notbitcoinxt,mikehearn\/bitcoin,jimblasko\/UnbreakableCoin-master,fullcoins\/fullcoin,daeMOn63\/Peershares,LIMXTEC\/DMDv3,erqan\/twister-core,zotherstupidguy\/bitcoin,Mrs-X\/PIVX,puticcoin\/putic,mikehearn\/bitcoin,pdrobek\/Polcoin-1-3,AdrianaDinca\/bitcoin,KillerByte\/memorypool,my-first\/octocoin,RibbitFROG\/ribbitcoin,BeirdoMud\/MudCoin,ryanxcharles\/bitcoin,domob1812\/crowncoin,UASF\/bitcoin,21E14\/bitcoin,cqtenq\/Feathercoin,dgenr8\/bitcoin,Tetpay\/bitcoin,coinkeeper\/2015-06-22_19-00_ziftrcoin,dobbscoin\/dobbscoin-source,manuel-zulian\/CoMoNet,truthcoin\/blocksize-market,tripmode\/pxlcoin,BenjaminsCrypto\/Benjamins-1,BitcoinPOW\/BitcoinPOW,franko-org\/franko,millennial83\/bitcoin,etercoin\/etercoin,haisee\/dogecoin,indolering\/namecoin-qt,ptschip\/bitcoinxt,domob1812\/crowncoin,shaolinfry\/litecoin,prusnak\/bitcoin,pdrobek\/Polcoin-1-3,dannyperez\/bolivarcoin,Gazer022\/bitcoin,nathaniel-mahieu\/bitcoin,aspanta\/bitcoin,PIVX-Project\/PIVX,fsb4000\/novacoin,TurboStake\/TurboStake,h4x3rotab\/BTCGPU,morcos\/bitcoin,chrisfranko\/aiden,RHavar\/bitcoin,prodigal-son\/blackcoin,koharjidan\/bitcoin,FuzzyBearBTC\/Fuzzyshares,jimblasko\/2015_UNB_Wallets,IOCoin\/iocoin,kaostao\/bitcoin,ShadowMyst\/creativechain-core,joroob\/reddcoin,xawksow\/GroestlCoin,worldcoinproject\/worldcoin-v0.8,RyanLucchese\/energi,djtms\/ltc,Jeff88Ho\/bitcoin,Mirobit\/bitcoin,pelorusjack\/BlockDX,nochowderforyou\/clams,bitgoldcoin-project\/bitgoldcoin,GlobalBoost\/GlobalBoost,rdqw\/sscoin,bitcoin-hivemind\/hivemind,genavarov\/brcoin,lateminer\/bitcoin,BTCGPU\/BTCGPU,tmagik\/catcoin,domob1812\/namecore,SmeltFool\/Wonker,andreaskern\/bitcoin,daveperkins-github\/bitcoin-dev,jgarzik\/bitcoin,robvanbentem\/bitcoin,jrmithdobbs\/bitcoin,nailtaras\/nailcoin,CoinBlack\/bitcoin,wederw\/bitcoin,keisercoin-official\/keisercoin,cotner\/bitcoin,collapsedev\/cashwatt,keisercoin-official\/keisercoin,BitcoinUnlimited\/BitcoinUnlimited,marlengit\/hardfork_prototype_1_mvf-bu,5mil\/Tradecoin,antonio-fr\/bitcoin,REAP720801\/bitcoin,greenaddress\/bitcoin,Twyford\/Indigo,Dinarcoin\/dinarcoin,Open-Source-Coins\/EZ,iosdevzone\/bitcoin,cinnamoncoin\/groupcoin-1,kbccoin\/kbc,aniemerg\/zcash,ronpaulcoin\/ronpaulcoin,sipa\/bitcoin,romanornr\/viacoin,OstlerDev\/florincoin,cannabiscoindev\/cannabiscoin420,TeamBitBean\/bitcoin-core,adpg211\/bitcoin-master,koharjidan\/bitcoin,Rimbit\/Wallets,valorbit\/valorbit,som4paul\/BolieC,btc1\/bitcoin,PIVX-Project\/PIVX,osuyuushi\/laughingmancoin,Enticed87\/Decipher,kazcw\/bitcoin,bcpki\/nonce2,devrandom\/bitcoin,HashUnlimited\/Einsteinium-Unlimited,fanquake\/bitcoin,erikYX\/yxcoin-FIRST,petertodd\/bitcoin,bitcoinplusorg\/xbcwalletsource,akabmikua\/flowcoin,jyap808\/jumbucks,ftrader-bitcoinabc\/bitcoin-abc,zcoinofficial\/zcoin,dyne\/Freecoin,Bluejudy\/worldcoin,faircoin\/faircoin2,elambert2014\/novacoin,dexX7\/bitcoin,paveljanik\/bitcoin,collapsedev\/circlecash,FuzzyBearBTC\/Peerunity,shouhuas\/bitcoin,langerhans\/dogecoin,bitbrazilcoin-project\/bitbrazilcoin,mikehearn\/bitcoin,ardsu\/bitcoin,omefire\/bitcoin,marscoin\/marscoin,sugruedes\/bitcoinxt,dyne\/Freecoin,CoinProjects\/AmsterdamCoin-v4,qubitcoin-project\/QubitCoinQ2C,Tetcoin\/tetcoin,zestcoin\/ZESTCOIN,dev1972\/Satellitecoin,ALEXIUMCOIN\/alexium,gwillen\/elements,schinzelh\/dash,parvez3019\/bitcoin,XertroV\/bitcoin-nulldata,koharjidan\/bitcoin,djpnewton\/bitcoin,florincoin\/florincoin,jiangyonghang\/bitcoin,thesoftwarejedi\/bitcoin,DGCDev\/digitalcoin,Jheguy2\/Mercury,oklink-dev\/bitcoin,Rav3nPL\/doubloons-0.10,IOCoin\/DIONS,gades\/novacoin,greencoin-dev\/GreenCoinV2,constantine001\/bitcoin,Kabei\/Ippan,supcoin\/supcoin,dogecoin\/dogecoin,namecoin-qt\/namecoin-qt,cryptcoins\/cryptcoin,40thoughts\/Coin-QualCoin,vcoin-project\/vcoincore,snakie\/ppcoin,axelxod\/braincoin,ShwoognationHQ\/bitcoin,jonasschnelli\/bitcoin,BitcoinPOW\/BitcoinPOW,thelazier\/dash,JeremyRand\/namecoin-core,chrisfranko\/aiden,forrestv\/bitcoin,antcheck\/antcoin,syscoin\/syscoin,Bitcoin-ABC\/bitcoin-abc,terracoin\/terracoin,FarhanHaque\/bitcoin,keesdewit82\/LasVegasCoin,erqan\/twister-core,ColossusCoinXT\/ColossusCoinXT,dexX7\/mastercore,bitshares\/bitshares-pts,Friedbaumer\/litecoin,TeamBitBean\/bitcoin-core,franko-org\/franko,Climbee\/artcoin,brishtiteveja\/sherlockcoin,xawksow\/GroestlCoin,TripleSpeeder\/bitcoin,razor-coin\/razor,schildbach\/bitcoin,imharrywu\/fastcoin,NicolasDorier\/bitcoin,cddjr\/BitcoinUnlimited,kleetus\/bitcoin,mortalvikinglive\/bitcoinlight,coinkeeper\/2015-06-22_19-19_worldcoin,earonesty\/bitcoin,whatrye\/twister-core,shomeser\/bitcoin,Crowndev\/crowncoin,megacoin\/megacoin,lakepay\/lake,mooncoin-project\/mooncoin-landann,wellenreiter01\/Feathercoin,slimcoin-project\/Slimcoin,dscotese\/bitcoin,svcop3\/svcop3,Carrsy\/PoundCoin,MitchellMintCoins\/MortgageCoin,wbchen99\/bitcoin-hnote0,javgh\/bitcoin,lentza\/SuperTurboStake,FuzzyBearBTC\/Peershares,oklink-dev\/bitcoin,Har01d\/bitcoin,thesoftwarejedi\/bitcoin,ryanofsky\/bitcoin,jambolo\/bitcoin,IlfirinCano\/shavercoin,droark\/bitcoin,CarpeDiemCoin\/CarpeDiemLaunch,bickojima\/bitzeny,miguelfreitas\/twister-core,altcoinpro\/addacoin,HerkCoin\/herkcoin,Friedbaumer\/litecoin,Domer85\/dogecoin,Anfauglith\/iop-hd,dgarage\/bc2,morcos\/bitcoin,brettwittam\/geocoin,domob1812\/bitcoin,Coinfigli\/coinfigli,chaincoin\/chaincoin,r8921039\/bitcoin,domob1812\/namecore,khalahan\/namecoin,genavarov\/lamacoin,coinkeeper\/2015-06-22_19-07_digitalcoin,langerhans\/dogecoin,djtms\/ltc,odemolliens\/bitcoinxt,ohac\/sakuracoin,andreaskern\/bitcoin,slingcoin\/sling-market,JeremyRand\/bitcoin,Lucky7Studio\/bitcoin,svost\/bitcoin,Richcoin-Project\/RichCoin,ddombrowsky\/radioshares,janko33bd\/bitcoin,starwalkerz\/fincoin-fork,ludbb\/bitcoin,Climbee\/artcoin,ivansib\/sibcoin,mincoin-project\/mincoin,senadj\/yacoin,GroestlCoin\/bitcoin,sickpig\/BitcoinUnlimited,Open-Source-Coins\/EZ,awemany\/BitcoinUnlimited,Kogser\/bitcoin,tuaris\/bitcoin,neutrinofoundation\/neutrino-digital-currency,jeromewu\/bitcoin-opennet,osuyuushi\/laughingmancoin,simdeveloper\/bitcoin,redfish64\/nomiccoin,andreaskern\/bitcoin,schildbach\/bitcoin,plankton12345\/litecoin,bitcoinclassic\/bitcoinclassic,Jeff88Ho\/bitcoin,braydonf\/bitcoin,accraze\/bitcoin,x-kalux\/bitcoin_WiG-B,majestrate\/twister-core,laanwj\/bitcoin-qt,zetacoin\/zetacoin,Blackcoin\/blackcoin,netswift\/vertcoin,stamhe\/bitcoin,Chancoin-core\/CHANCOIN,phorensic\/yacoin,shaolinfry\/litecoin,BenjaminsCrypto\/Benjamins-1,earthcoinproject\/earthcoin,d5000\/ppcoin,haraldh\/bitcoin,Tetcoin\/tetcoin,jiangyonghang\/bitcoin,andres-root\/bitcoinxt,xieta\/mincoin,Alonzo-Coeus\/bitcoin,Whitecoin-org\/Whitecoin,gjhiggins\/vcoin09,octocoin-project\/octocoin,ColossusCoinXT\/ColossusCoinXT,XertroV\/bitcoin-nulldata,kallewoof\/bitcoin,BitzenyCoreDevelopers\/bitzeny,bitgoldcoin-project\/bitgoldcoin,drwasho\/bitcoinxt,BlueMeanie\/PeerShares,FuzzyBearBTC\/Peershares2,fanquake\/bitcoin,wiggi\/huntercore,bitshares\/bitshares-pts,anditto\/bitcoin,174high\/bitcoin,11755033isaprimenumber\/Feathercoin,jnewbery\/bitcoin,apoelstra\/elements,UdjinM6\/dash,stamhe\/ppcoin,GeopaymeEE\/e-goldcoin,Climbee\/artcoin,robvanmieghem\/clams,djtms\/ltc,redfish64\/nomiccoin,hsavit1\/bitcoin,cerebrus29301\/crowncoin,ionux\/freicoin,vertcoin\/vertcoin,coinkeeper\/2015-06-22_19-00_ziftrcoin,bickojima\/bitzeny,howardrya\/AcademicCoin,zenywallet\/bitzeny,presstab\/PIVX,Blackcoin\/blackcoin,GlobalBoost\/GlobalBoost,funbucks\/notbitcoinxt,ddombrowsky\/radioshares,theuni\/bitcoin,Kogser\/bitcoin,tobeyrowe\/KitoniaCoin,petertodd\/bitcoin,Alex-van-der-Peet\/bitcoin,BTCDDev\/bitcoin,vericoin\/vericoin-core,jl2012\/litecoin,OstlerDev\/florincoin,FuzzyBearBTC\/peercoin,okcashpro\/okcash,ForceMajeure\/BitPenny-Client,lclc\/bitcoin,greencoin-dev\/digitalcoin,coinkeeper\/2015-06-22_18-36_darkcoin,hophacker\/bitcoin_malleability,sbaks0820\/bitcoin,stamhe\/ppcoin,BitzenyCoreDevelopers\/bitzeny,Kogser\/bitcoin,habibmasuro\/bitcoinxt,ahmedbodi\/poscoin,szlaozhu\/twister-core,SocialCryptoCoin\/SocialCoin,ivansib\/sibcoin,bankonmecoin\/namecoin-legacy,privatecoin\/privatecoin,ArgonToken\/ArgonToken,llluiop\/bitcoin,rdqw\/sscoin,bitcoinxt\/bitcoinxt,cryptoprojects\/ultimateonlinecash,ghostlander\/Orbitcoin,matlongsi\/micropay,thodg\/ppcoin,jlcurby\/NobleCoin,zander\/bitcoinclassic,RazorLove\/cloaked-octo-spice,ludbb\/bitcoin,lordsajan\/erupee,initaldk\/bitcoin,genavarov\/lamacoin,rnicoll\/bitcoin,bcpki\/nonce2,janko33bd\/bitcoin,Domer85\/dogecoin,RongxinZhang\/bitcoinxt,elliotolds\/bitcoin,RongxinZhang\/bitcoinxt,alexwaters\/Bitcoin-Testing,MitchellMintCoins\/MortgageCoin,funkshelper\/woodcoin-b,projectinterzone\/ITZ,BTCDDev\/bitcoin,CryptArc\/bitcoin,vertcoin\/vertcoin,achow101\/bitcoin,shouhuas\/bitcoin,novacoin-project\/novacoin,Bitcoin-com\/BUcash,jyap808\/jumbucks,2XL\/bitcoin,gapcoin\/gapcoin,domob1812\/bitcoin,aburan28\/elements,metrocoins\/metrocoin,PIVX-Project\/PIVX,dobbscoin\/dobbscoin-source,elliotolds\/bitcoin,arnuschky\/bitcoin,marklai9999\/Taiwancoin,sproutcoin\/sprouts,zemrys\/vertcoin,Coinfigli\/coinfigli,n1bor\/bitcoin,VsyncCrypto\/Vsync,Vsync-project\/Vsync,petertodd\/bitcoin,Theshadow4all\/ShadowCoin,p2peace\/oliver-twister-core,DGCDev\/argentum,SproutsEx\/SproutsExtreme,sirk390\/bitcoin,bitcoinsSG\/bitcoin,jrmithdobbs\/bitcoin,raasakh\/bardcoin,psionin\/smartcoin,RibbitFROG\/ribbitcoin,fflo\/sixeleven,TierNolan\/bitcoin,dmrtsvetkov\/flowercoin,wiggi\/huntercore,MarcoFalke\/bitcoin,litecoin-project\/bitcoinomg,tobeyrowe\/KitoniaCoin,plncoin\/PLNcoin_Core,nikkitan\/bitcoin,FuzzyBearBTC\/Peerunity,jmcorgan\/bitcoin,bfroemel\/smallchange,jonghyeopkim\/bitcoinxt,MarcoFalke\/bitcoin,Tetcoin\/tetcoin,pataquets\/namecoin-core,terracoin\/terracoin,PRabahy\/bitcoin,gjhiggins\/fuguecoin,Earlz\/dobbscoin-source,Krellan\/bitcoin,madman5844\/poundkoin,ptschip\/bitcoin,experiencecoin\/experiencecoin,prodigal-son\/blackcoin,Cloudsy\/bitcoin,pstratem\/elements,bitcoin-hivemind\/hivemind,BlockchainTechLLC\/3dcoin,coinkeeper\/2015-06-22_19-00_ziftrcoin,dan-mi-sun\/bitcoin,elliotolds\/bitcoin,torresalyssa\/bitcoin,jimblasko\/UnbreakableCoin-master,roques\/bitcoin,meighti\/bitcoin,qubitcoin-project\/QubitCoinQ2C,m0gliE\/fastcoin-cli,phelix\/bitcoin,h4x3rotab\/BTCGPU,mm-s\/bitcoin,mortalvikinglive\/bitcoinlight,haobtc\/bitcoin,my-first\/octocoin,dcousens\/bitcoin,nailtaras\/nailcoin,mm-s\/bitcoin,KibiCoin\/kibicoin,guncoin\/guncoin,keo\/bitcoin,icook\/vertcoin,pinkevich\/dash,GreenParhelia\/bitcoin,segsignal\/bitcoin,tjps\/bitcoin,borgcoin\/Borgcoin1,nlgcoin\/guldencoin-official,truthcoin\/truthcoin-cpp,AllanDoensen\/BitcoinUnlimited,gwangjin2\/gwangcoin-core,kirkalx\/bitcoin,ticclassic\/ic,genavarov\/lamacoin,kevcooper\/bitcoin,jimmysong\/bitcoin,PIVX-Project\/PIVX,21E14\/bitcoin,howardrya\/AcademicCoin,Someguy123\/novafoil,nathan-at-least\/zcash,cotner\/bitcoin,myriadcoin\/myriadcoin,kleetus\/bitcoinxt,haisee\/dogecoin,40thoughts\/Coin-QualCoin,sipa\/elements,cfromknecht\/namecoin-legacy,Friedbaumer\/litecoin,misdess\/bitcoin,landcoin-ldc\/landcoin,segsignal\/bitcoin,kallewoof\/bitcoin,okinc\/bitcoin,wekuiz\/wekoin,ashleyholman\/bitcoin,borgcoin\/Borgcoin1,saydulk\/Feathercoin,mm-s\/bitcoin,aspanta\/bitcoin,hg5fm\/nexuscoin,fedoracoin-dev\/fedoracoin,senadj\/yacoin,PIVX-Project\/PIVX,mikehearn\/bitcoinxt,Mirobit\/bitcoin,accraze\/bitcoin,Bushstar\/UFO-Project,bespike\/litecoin,lordsajan\/erupee,Magicking\/neucoin,coinkeeper\/2015-04-19_21-20_litecoindark,collapsedev\/circlecash,pelorusjack\/BlockDX,Cloudsy\/bitcoin,qtumproject\/qtum,coinkeeper\/2015-06-22_19-00_ziftrcoin,genavarov\/brcoin,habibmasuro\/bitcoinxt,qtumproject\/qtum,Bitcoin-com\/BUcash,dashpay\/dash,jameshilliard\/bitcoin,sarielsaz\/sarielsaz,thesoftwarejedi\/bitcoin,shapiroisme\/datadollar,s-matthew-english\/bitcoin,richo\/dongcoin,coinkeeper\/2015-06-22_18-52_viacoin,dexX7\/bitcoin,ptschip\/bitcoin,sdaftuar\/bitcoin,safecoin\/safecoin,netswift\/vertcoin,gapcoin\/gapcoin,Erkan-Yilmaz\/twister-core,aburan28\/elements,united-scrypt-coin-project\/unitedscryptcoin,scmorse\/bitcoin,Infernoman\/crowncoin,ajtowns\/bitcoin,laudaa\/bitcoin,cryptodev35\/icash,earonesty\/bitcoin,cdecker\/bitcoin,ColossusCoinXT\/ColossusCoinXT,mammix2\/ccoin-dev,arnuschky\/bitcoin,donaloconnor\/bitcoin,gjhiggins\/fuguecoin,mruddy\/bitcoin,Kixunil\/keynescoin,cybermatatu\/bitcoin,dannyperez\/bolivarcoin,laudaa\/bitcoin,ctwiz\/stardust,totallylegitbiz\/totallylegitcoin,Climbee\/artcoin,ravenbyron\/phtevencoin,skaht\/bitcoin,wcwu\/bitcoin,Jheguy2\/Mercury,Kogser\/bitcoin,digideskio\/namecoin,BitcoinPOW\/BitcoinPOW,funkshelper\/woodcore,MeshCollider\/bitcoin,iadix\/iadixcoin,FuzzyBearBTC\/Peershares,vectorcoindev\/Vector,nochowderforyou\/clams,FrictionlessCoin\/iXcoin,okcashpro\/okcash,BitcoinUnlimited\/BitcoinUnlimited,cqtenq\/Feathercoin,and2099\/twister-core,ahmedbodi\/temp_vert,bmp02050\/ReddcoinUpdates,phplaboratory\/psiacoin,mastercoin-MSC\/mastercore,ryanxcharles\/bitcoin,mobicoins\/mobicoin-core,bitreserve\/bitcoin,phplaboratory\/psiacoin,royosherove\/bitcoinxt,pocopoco\/yacoin,scamcoinz\/scamcoin,n1bor\/bitcoin,mapineda\/litecoin,BlueMeanie\/PeerShares,haobtc\/bitcoin,raasakh\/bardcoin.exe,tdudz\/elements,antonio-fr\/bitcoin,SartoNess\/BitcoinUnlimited,jakeva\/bitcoin-pwcheck,erikYX\/yxcoin-FIRST,JeremyRand\/bitcoin,truthcoin\/blocksize-market,Peerunity\/Peerunity,cculianu\/bitcoin-abc,ahmedbodi\/vertcoin,ohac\/sha1coin,RyanLucchese\/energi,maaku\/bitcoin,barcoin-project\/nothingcoin,rustyrussell\/bitcoin,MOIN\/moin,particl\/particl-core,NateBrune\/bitcoin-nate,capitalDIGI\/DIGI-v-0-10-4,maaku\/bitcoin,constantine001\/bitcoin,slingcoin\/sling-market,llamasoft\/ProtoShares_Cycle,ZiftrCOIN\/ziftrcoin,174high\/bitcoin,Kefkius\/clams,GIJensen\/bitcoin,TheBlueMatt\/bitcoin,CrimeaCoin\/crimeacoin,CoinGame\/BCEShadow,worldcoinproject\/worldcoin-v0.8,SmeltFool\/Wonker,parvez3019\/bitcoin,ftrader-bitcoinabc\/bitcoin-abc,gcc64\/bitcoin,SoreGums\/bitcoinxt,syscoin\/syscoin2,Jcing95\/iop-hd,mikehearn\/bitcoinxt,aniemerg\/zcash,puticcoin\/putic,marlengit\/BitcoinUnlimited,jlcurby\/NobleCoin,gandrewstone\/BitcoinUnlimited,gavinandresen\/bitcoin-git,miguelfreitas\/twister-core,DGCDev\/argentum,appop\/bitcoin,rsdevgun16e\/energi,habibmasuro\/bitcoin,DigiByte-Team\/digibyte,Crowndev\/crowncoin,mikehearn\/bitcoin,theuni\/bitcoin,earthcoinproject\/earthcoin,mooncoin-project\/mooncoin-landann,loxal\/zcash,jrmithdobbs\/bitcoin,altcoinpro\/addacoin,zcoinofficial\/zcoin,gameunits\/gameunits,ftrader-bitcoinabc\/bitcoin-abc,nathaniel-mahieu\/bitcoin,ludbb\/bitcoin,brightcoin\/brightcoin,MazaCoin\/mazacoin-new,coinkeeper\/2015-06-22_18-46_razor,degenorate\/Deftcoin,Exceltior\/dogecoin,PRabahy\/bitcoin,greencoin-dev\/GreenCoinV2,AquariusNetwork\/ARCOv2,qreatora\/worldcoin-v0.8,domob1812\/i0coin,OmniLayer\/omnicore,martindale\/elements,knolza\/gamblr,dooglus\/bitcoin,sickpig\/BitcoinUnlimited,aciddude\/Feathercoin,BitcoinUnlimited\/BitcoinUnlimited,rat4\/bitcoin,p2peace\/oliver-twister-core,coinkeeper\/2015-06-22_19-00_ziftrcoin,JeremyRand\/namecore,svost\/bitcoin,bitcoinplusorg\/xbcwalletsource,stamhe\/bitcoin,khalahan\/bitcoin,antonio-fr\/bitcoin,karek314\/bitcoin,coinkeeper\/megacoin_20150410_fixes,sigmike\/peercoin,bitcoinknots\/bitcoin,richo\/dongcoin,gmaxwell\/bitcoin,steakknife\/bitcoin-qt,mobicoins\/mobicoin-core,nvmd\/bitcoin,ALEXIUMCOIN\/alexium,chaincoin\/chaincoin,sacarlson\/MultiCoin,KaSt\/equikoin,borgcoin\/Borgcoin.rar,domob1812\/i0coin,174high\/bitcoin,whatrye\/twister-core,coinkeeper\/2015-06-22_18-45_peercoin,sbellem\/bitcoin,greencoin-dev\/greencoin-dev,jul2711\/jucoin,WorldLeadCurrency\/WLC,Electronic-Gulden-Foundation\/egulden,aspirecoin\/aspire,bitcoinxt\/bitcoinxt,Alonzo-Coeus\/bitcoin,BTCTaras\/bitcoin,imharrywu\/fastcoin,dgarage\/bc3,MarcoFalke\/bitcoin,cculianu\/bitcoin-abc,bitcoinclassic\/bitcoinclassic,nigeriacoin\/nigeriacoin,djtms\/ltc,VsyncCrypto\/Vsync,taenaive\/zetacoin,Bluejudy\/worldcoin,vertcoin\/vertcoin,globaltoken\/globaltoken,dagurval\/bitcoinxt,Crowndev\/crowncoin,Kore-Core\/kore,petertodd\/bitcoin,Ziftr\/ppcoin,wederw\/bitcoin,glv2\/peerunity,Magicking\/neucoin,Tetpay\/bitcoin,mb300sd\/bitcoin,HashUnlimited\/Einsteinium-Unlimited,1185\/starwels,maraoz\/proofcoin,botland\/bitcoin,aniemerg\/zcash,apoelstra\/bitcoin,haobtc\/bitcoin,UdjinM6\/dash,cybermatatu\/bitcoin,qubitcoin-project\/QubitCoinQ2C,puticcoin\/putic,vtafaucet\/virtacoin,gazbert\/bitcoin,alexwaters\/Bitcoin-Testing,koharjidan\/dogecoin,cainca\/liliucoin,KaSt\/ekwicoin,jakeva\/bitcoin-pwcheck,HeliumGas\/helium,byncoin-project\/byncoin,Cloudsy\/bitcoin,bcpki\/bitcoin,bootycoin-project\/bootycoin,bitreserve\/bitcoin,marlengit\/BitcoinUnlimited,afk11\/bitcoin,likecoin-dev\/bitcoin,brishtiteveja\/sherlockholmescoin,mincoin-project\/mincoin,thunderrabbit\/clams,bankonmecoin\/bitcoin,earthcoinproject\/earthcoin,coinkeeper\/2015-06-22_18-52_viacoin,achow101\/bitcoin,wtogami\/bitcoin,coinkeeper\/2015-06-22_18-37_dogecoin,DGCDev\/digitalcoin,cannabiscoindev\/cannabiscoin420,accraze\/bitcoin,WorldLeadCurrency\/WLC,aciddude\/Feathercoin,nvmd\/bitcoin,bitcoinsSG\/zcash,llluiop\/bitcoin,dmrtsvetkov\/flowercoin,gravio-net\/graviocoin,TheBlueMatt\/bitcoin,EthanHeilman\/bitcoin,iadix\/iadixcoin,ediston\/energi,trippysalmon\/bitcoin,globaltoken\/globaltoken,memorycoin\/memorycoin,rnicoll\/dogecoin,AquariusNetwork\/ARCOv2,bickojima\/bitzeny,GIJensen\/bitcoin,coinerd\/krugercoin,vcoin-project\/vcoin0.8zeta-dev,Christewart\/bitcoin,tdudz\/elements,midnightmagic\/bitcoin,dooglus\/bitcoin,xieta\/mincoin,compasscoin\/compasscoin,bitjson\/hivemind,wangliu\/bitcoin,tobeyrowe\/smallchange,Kcoin-project\/kcoin,ravenbyron\/phtevencoin,capitalDIGI\/DIGI-v-0-10-4,shurcoin\/shurcoin,collapsedev\/cashwatt,czr5014iph\/bitcoin4e,bitpagar\/bitpagar,TrainMAnB\/vcoincore,anditto\/bitcoin,inkvisit\/sarmacoins,Kogser\/bitcoin,brightcoin\/brightcoin,sirk390\/bitcoin,grumpydevelop\/singularity,Har01d\/bitcoin,inkvisit\/sarmacoins,stamhe\/bitcoin,Matoking\/bitcoin,namecoin\/namecore,gandrewstone\/bitcoinxt,jakeva\/bitcoin-pwcheck,SmeltFool\/Yippe-Hippe,Carrsy\/PoundCoin,cryptoprojects\/ultimateonlinecash,cqtenq\/Feathercoin,Cloudsy\/bitcoin,litecoin-project\/litecoin,mincoin-project\/mincoin,droark\/bitcoin,shadowproject\/shadow,dexX7\/bitcoin,byncoin-project\/byncoin,upgradeadvice\/MUE-Src,llamasoft\/ProtoShares_Cycle,Xekyo\/bitcoin,Kore-Core\/kore,btc1\/bitcoin,dan-mi-sun\/bitcoin,cryptohelper\/premine,crowning2\/dash,SandyCohen\/mincoin,kallewoof\/bitcoin,domob1812\/huntercore,rdqw\/sscoin,cryptohelper\/premine,thelazier\/dash,scmorse\/bitcoin,lateminer\/bitcoin,jl2012\/litecoin,borgcoin\/Borgcoin.rar,dooglus\/clams,coinkeeper\/anoncoin_20150330_fixes,joulecoin\/joulecoin,bitcoinec\/bitcoinec,denverl\/bitcoin,gravio-net\/graviocoin,svcop3\/svcop3,tjps\/bitcoin,AsteraCoin\/AsteraCoin,peerdb\/cors,syscoin\/syscoin,stamhe\/novacoin,pascalguru\/florincoin,SmeltFool\/Yippe-Hippe,Paymium\/bitcoin,stamhe\/ppcoin,Earlz\/dobbscoin-source,faircoin\/faircoin,hophacker\/bitcoin_malleability,goldcoin\/Goldcoin-GLD,omefire\/bitcoin,kallewoof\/elements,sugruedes\/bitcoin,vlajos\/bitcoin,thormuller\/yescoin2,Geekcoin-Project\/Geekcoin,XertroV\/bitcoin-nulldata,argentumproject\/argentum,ya4-old-c-coder\/yacoin,sigmike\/peercoin,paveljanik\/bitcoin,uphold\/bitcoin,ashleyholman\/bitcoin,oklink-dev\/bitcoin,droark\/elements,novaexchange\/EAC,h4x3rotab\/BTCGPU,romanornr\/viacoin,superjudge\/bitcoin,bitcoinsSG\/bitcoin,TierNolan\/bitcoin,dobbscoin\/dobbscoin-source,tropa\/axecoin,jonghyeopkim\/bitcoinxt,plncoin\/PLNcoin_Core,brishtiteveja\/sherlockcoin,cqtenq\/feathercoin_core,BTCGPU\/BTCGPU,taenaive\/zetacoin,czr5014iph\/bitcoin4e,Peerapps\/ppcoin,Bushstar\/UFO-Project,coinerd\/krugercoin,DrCrypto\/darkcoin,projectinterzone\/ITZ,vmp32k\/litecoin,pstratem\/bitcoin,blackcoinhelp\/blackcoin,bitcoinclassic\/bitcoinclassic,vlajos\/bitcoin,Erkan-Yilmaz\/twister-core,mruddy\/bitcoin,peercoin\/peercoin,patricklodder\/dogecoin,plankton12345\/litecoin,llluiop\/bitcoin,RHavar\/bitcoin,royosherove\/bitcoinxt,pinkevich\/dash,Michagogo\/bitcoin,celebritycoin\/investorcoin,nanocoins\/mycoin,StarbuckBG\/BTCGPU,okinc\/litecoin,WorldcoinGlobal\/WorldcoinLegacy,valorbit\/valorbit-oss,Geekcoin-Project\/Geekcoin,sacarlson\/MultiCoin-exp,ludbb\/bitcoin,brishtiteveja\/sherlockcoin,joshrabinowitz\/bitcoin,greencoin-dev\/GreenCoinV2,ahmedbodi\/test2,phelix\/namecore,slimcoin-project\/Slimcoin,blocktrail\/bitcoin,midnight-miner\/LasVegasCoin,Kcoin-project\/kcoin,rebroad\/bitcoin,iosdevzone\/bitcoin,Cancercoin\/Cancercoin,NateBrune\/bitcoin-fio,GwangJin\/gwangmoney-core,scippio\/bitcoin,Bitcoin-ABC\/bitcoin-abc,ionux\/freicoin,lclc\/bitcoin,rjshaver\/bitcoin,jonasbits\/namecoin,vtafaucet\/virtacoin,netswift\/vertcoin,rawodb\/bitcoin,sipsorcery\/bitcoin,mockcoin\/mockcoin,cainca\/liliucoin,Bitcoin-ABC\/bitcoin-abc,Har01d\/bitcoin,lclc\/bitcoin,xeddmc\/twister-core,vlajos\/bitcoin,shea256\/bitcoin,BeirdoMud\/MudCoin,BitcoinHardfork\/bitcoin,vcoin-project\/vcoin0.8zeta-dev,Kangmo\/bitcoin,tmagik\/catcoin,viacoin\/viacoin,goldcoin\/goldcoin,willwray\/dash,karek314\/bitcoin,keesdewit82\/LasVegasCoin,langerhans\/dogecoin,mmpool\/coiledcoin,jtimon\/elements,IOCoin\/DIONS,elecoin\/elecoin,creath\/barcoin,vizidrixfork\/Peershares,kleetus\/bitcoinxt,metrocoins\/metrocoin,zsulocal\/bitcoin,Kefkius\/clams,jmgilbert2\/energi,stamhe\/namecoin,digideskio\/namecoin,kazcw\/bitcoin,CTRoundTable\/Encrypted.Cash,hsavit1\/bitcoin,bespike\/litecoin,vcoin-project\/vcoincore,kevcooper\/bitcoin,razor-coin\/razor,ajweiss\/bitcoin,vmp32k\/litecoin,Gazer022\/bitcoin,coinkeeper\/2015-06-22_18-56_megacoin,cryptcoins\/cryptcoin,trippysalmon\/bitcoin,ElementsProject\/elements,goldmidas\/goldmidas,gandrewstone\/bitcoinxt,habibmasuro\/bitcoinxt,funkshelper\/woodcore,cryptocoins4all\/zcoin,denverl\/bitcoin,coinkeeper\/2015-06-22_18-46_reddcoin,jtimon\/bitcoin,TheSeven\/ppcoin,pascalguru\/florincoin,donaloconnor\/bitcoin,habibmasuro\/bitcoinxt,ychaim\/smallchange,kaostao\/bitcoin,world-bank\/unpay-core,BTCfork\/hardfork_prototype_1_mvf-core,roques\/bitcoin,Litecoindark\/LTCD,faircoin\/faircoin2,wederw\/bitcoin,ElementsProject\/elements,Alonzo-Coeus\/bitcoin,knolza\/gamblr,internaut-me\/ppcoin,sstone\/bitcoin,borgcoin\/Borgcoin1,vtafaucet\/virtacoin,Kcoin-project\/kcoin,TierNolan\/bitcoin,sarielsaz\/sarielsaz,irvingruan\/bitcoin,pstratem\/elements,pdrobek\/Polcoin-1-3,Twyford\/Indigo,midnight-miner\/LasVegasCoin,domob1812\/i0coin,wangxinxi\/litecoin,skaht\/bitcoin,indolering\/namecoin-qt,zemrys\/vertcoin,bcpki\/bitcoin,nvmd\/bitcoin,bootycoin-project\/bootycoin,TheoremCrypto\/TheoremCoin,ahmedbodi\/vertcoin,hg5fm\/nexuscoin,webdesignll\/coin,viacoin\/viacoin,Darknet-Crypto\/Darknet,aspanta\/bitcoin,Checkcoin\/checkcoin,dpayne9000\/Rubixz-Coin,marcusdiaz\/BitcoinUnlimited,Krellan\/bitcoin,cannabiscoindev\/cannabiscoin420,unsystemizer\/bitcoin,droark\/bitcoin,Kcoin-project\/kcoin,GeekBrony\/ponycoin-old,bitgrowchain\/bitgrow,kbccoin\/kbc,BitcoinPOW\/BitcoinPOW,TheoremCrypto\/TheoremCoin,coinkeeper\/2015-06-22_18-39_feathercoin,marlengit\/hardfork_prototype_1_mvf-bu,joshrabinowitz\/bitcoin,ashleyholman\/bitcoin,altcoinpro\/addacoin,jmgilbert2\/energi,jnewbery\/bitcoin,segwit\/atbcoin-insight,presstab\/PIVX,DigiByte-Team\/digibyte,iadix\/iadixcoin,afk11\/bitcoin,unsystemizer\/bitcoin,21E14\/bitcoin,argentumproject\/argentum,instagibbs\/bitcoin,coinkeeper\/2015-06-22_18-51_vertcoin,Bitcoin-ABC\/bitcoin-abc,OmniLayer\/omnicore,CoinGame\/BCEShadowNet,projectinterzone\/ITZ,genavarov\/ladacoin,oklink-dev\/litecoin_block,awoland\/namecoinq,IlfirinIlfirin\/shavercoin,daeMOn63\/Peershares,psionin\/smartcoin,szlaozhu\/twister-core,mapineda\/litecoin,CoinProjects\/AmsterdamCoin-v4,Carrsy\/PoundCoin,iQcoin\/iQcoin,monacoinproject\/monacoin,imharrywu\/fastcoin,xurantju\/bitcoin,Justaphf\/BitcoinUnlimited,ingresscoin\/ingresscoin,mortalvikinglive\/bitcoinclassic,magacoin\/magacoin,kevin-cantwell\/crunchcoin,rnicoll\/bitcoin,UFOCoins\/ufo,midnightmagic\/bitcoin,tripmode\/pxlcoin,OfficialTitcoin\/titcoin-wallet,celebritycoin\/investorcoin,safecoin\/safecoin,syscoin\/syscoin,celebritycoin\/CelebrityCoin,peacedevelop\/peacecoin,KnCMiner\/bitcoin,khalahan\/bitcoin,coinkeeper\/2015-06-22_18-30_anoncoin,megacoin\/megacoin,terracoin\/terracoin,cdecker\/bitcoin,azilber\/devcoin,peerdb\/cors,mortalvikinglive\/bitcoinlight,atgreen\/bitcoin,xeddmc\/twister-core,174high\/bitcoin,SproutsEx\/SproutsExtreme,Checkcoin\/checkcoin,morcos\/bitcoin,Anfauglith\/iop-hd,domob1812\/bitcoin,safecoin\/safecoin,senadmd\/coinmarketwatch,kigooz\/smalltestnew,kryptokredyt\/ProjektZespolowyCoin,diggcoin\/diggcoin,and2099\/twister-core,NeuCoin\/neucoin,fujicoin\/fujicoin,droark\/bitcoin,jimmysong\/bitcoin,domob1812\/i0coin,marlengit\/hardfork_prototype_1_mvf-bu,Bitcoinsulting\/bitcoinxt,daliwangi\/bitcoin,zander\/bitcoinclassic,adpg211\/bitcoin-master,inkvisit\/sarmacoins,byncoin-project\/byncoin,Rav3nPL\/bitcoin,Erkan-Yilmaz\/twister-core,webdesignll\/coin,gjhiggins\/vcoin0.8zeta-dev,koharjidan\/litecoin,namecoin\/namecoin-legacy,PIVX-Project\/PIVX,haobtc\/bitcoin,anditto\/bitcoin,bitcoinsSG\/zcash,aniemerg\/zcash,earthcoinproject\/earthcoin,laudaa\/bitcoin,SartoNess\/BitcoinUnlimited,arruah\/ensocoin,knolza\/gamblr,imharrywu\/fastcoin,ychaim\/smallchange,xeddmc\/twister-core,stamhe\/litecoin,TheSeven\/ppcoin,cryptoprojects\/ultimateonlinecash,qtumproject\/qtum,dan-mi-sun\/bitcoin,greencoin-dev\/digitalcoin,xawksow\/GroestlCoin,Gazer022\/bitcoin,litecoin-project\/litecore-litecoin,IOCoin\/iocoin,dpayne9000\/Rubixz-Coin,zander\/bitcoinclassic,Blackcoin\/blackcoin,FuzzyBearBTC\/peercoin,UdjinM6\/dash,starwels\/starwels,nathaniel-mahieu\/bitcoin,DigiByte-Team\/digibyte,sipa\/elements,ionux\/freicoin,acid1789\/bitcoin,vcoin-project\/vcoin0.8zeta-dev,Kogser\/bitcoin,benzhi888\/renminbi,nikkitan\/bitcoin,coinkeeper\/2015-06-22_18-46_razor,grumpydevelop\/singularity,TripleSpeeder\/bitcoin,amaivsimau\/bitcoin,cheehieu\/bitcoin,GroundRod\/anoncoin,supcoin\/supcoin,cinnamoncoin\/groupcoin-1,Alex-van-der-Peet\/bitcoin,gapcoin\/gapcoin,coinkeeper\/2015-06-22_19-10_cannacoin,bitcoinknots\/bitcoin,GeekBrony\/ponycoin-old,Whitecoin-org\/Whitecoin,stamhe\/bitcoin,Midar\/namecoin,privatecoin\/privatecoin,Horrorcoin\/horrorcoin,blocktrail\/bitcoin,OstlerDev\/florincoin,erikYX\/yxcoin-FIRST,AquariusNetwork\/ARCOv2,Dajackal\/Ronpaulcoin,ahmedbodi\/bytecoin,pevernon\/picoin,koharjidan\/dogecoin,bcpki\/bitcoin,royosherove\/bitcoinxt,tdudz\/elements,imton\/bitcoin,alexwaters\/Bitcoin-Testing,laanwj\/bitcoin-qt,cryptoprojects\/ultimateonlinecash,tedlz123\/Bitcoin,amiller\/bitcoin,tjth\/lotterycoin,acmeyer\/namecoin,tecnovert\/particl-core,vcoin-project\/vcoin0.8zeta-dev,Jheguy2\/Mercury,pelorusjack\/BlockDX,ashleyholman\/bitcoin,instagibbs\/bitcoin,TheSeven\/ppcoin,Thracky\/monkeycoin,segwit\/atbcoin-insight,NeuCoin\/neucoin,ahmedbodi\/terracoin,tropa\/axecoin,zander\/bitcoinclassic,mrtexaznl\/mediterraneancoin,GeopaymeEE\/e-goldcoin,effectsToCause\/vericoin,TrainMAnB\/vcoincore,gandrewstone\/bitcoinxt,killerstorm\/bitcoin,Dajackal\/Ronpaulcoin,nvmd\/bitcoin,devrandom\/bitcoin,myriadteam\/myriadcoin,vlajos\/bitcoin,coinkeeper\/2015-06-22_18-51_vertcoin,pstratem\/elements,Action-Committee\/Spaceballz,FinalHashLLC\/namecore,deeponion\/deeponion,whatrye\/twister-core,fedoracoin-dev\/fedoracoin,jlay11\/sharecoin,zottejos\/merelcoin,balajinandhu\/bitcoin,wiggi\/fairbrix-0.6.3,Jcing95\/iop-hd,themusicgod1\/bitcoin,isocolsky\/bitcoinxt,npccoin\/npccoin,pataquets\/namecoin-core,Rav3nPL\/bitcoin,denverl\/bitcoin,BitzenyCoreDevelopers\/bitzeny,nathan-at-least\/zcash,BenjaminsCrypto\/Benjamins-1,vericoin\/vericoin-core,haobtc\/bitcoin,Earlz\/dobbscoin-source,Bitcoin-ABC\/bitcoin-abc,misdess\/bitcoin,domob1812\/namecore,CarpeDiemCoin\/CarpeDiemLaunch,sifcoin\/sifcoin,sugruedes\/bitcoin,diggcoin\/diggcoin,multicoins\/marycoin,sacarlson\/MultiCoin-exp,zander\/bitcoinclassic,scippio\/bitcoin,SandyCohen\/mincoin,misdess\/bitcoin,48thct2jtnf\/P,mammix2\/ccoin-dev,raasakh\/bardcoin.exe,jameshilliard\/bitcoin,m0mchil\/bitcoin,sh1nu11bi\/bitcoin,bitpay\/bitcoin,ohac\/sha1coin,tedlz123\/Bitcoin,dexX7\/mastercore,rnicoll\/bitcoin,zetacoin\/zetacoin,palm12341\/jnc,AdrianaDinca\/bitcoin,pinkevich\/dash,Lucky7Studio\/bitcoin,LIMXTEC\/DMDv3,elambert2014\/novacoin,gjhiggins\/fuguecoin,coinkeeper\/megacoin_20150410_fixes,Kangmo\/bitcoin,krzysztofwos\/BitcoinUnlimited,GroundRod\/anoncoin,Cocosoft\/bitcoin,MeshCollider\/bitcoin,ShadowMyst\/creativechain-core,cyrixhero\/bitcoin,deuscoin\/deuscoin,magacoin\/magacoin,effectsToCause\/vericoin,world-bank\/unpay-core,coinwarp\/dogecoin,stamhe\/ppcoin,AkioNak\/bitcoin,KnCMiner\/bitcoin,RazorLove\/cloaked-octo-spice,goldmidas\/goldmidas,biblepay\/biblepay,guncoin\/guncoin,SocialCryptoCoin\/SocialCoin,Peerunity\/Peerunity,axelxod\/braincoin,coinkeeper\/2015-06-22_18-52_viacoin,jgarzik\/bitcoin,jonghyeopkim\/bitcoinxt,Earlz\/dobbscoin-source,bitcoin\/bitcoin,octocoin-project\/octocoin,my-first\/octocoin,gameunits\/gameunits,slimcoin-project\/Slimcoin,bitcoinsSG\/zcash,elcrypto\/Pulse,rnicoll\/dogecoin,afk11\/bitcoin,raasakh\/bardcoin,Checkcoin\/checkcoin,ddombrowsky\/radioshares,rnicoll\/dogecoin,shelvenzhou\/BTCGPU,11755033isaprimenumber\/Feathercoin,magacoin\/magacoin,FuzzyBearBTC\/Fuzzyshares,rebroad\/bitcoin,pocopoco\/yacoin,gzuser01\/zetacoin-bitcoin,ludbb\/bitcoin,pinkmagicdev\/SwagBucks,AdrianaDinca\/bitcoin,Horrorcoin\/horrorcoin,apoelstra\/bitcoin,BitcoinUnlimited\/BitcoinUnlimited,bitjson\/hivemind,fanquake\/bitcoin,shurcoin\/shurcoin,neureal\/noocoin,jakeva\/bitcoin-pwcheck,nigeriacoin\/nigeriacoin,Charlesugwu\/Vintagecoin,CryptArc\/bitcoinxt,dgenr8\/bitcoin,FuzzyBearBTC\/Peershares,bitpay\/bitcoin,valorbit\/valorbit,namecoin-qt\/namecoin-qt,upgradeadvice\/MUE-Src,lbryio\/lbrycrd,parvez3019\/bitcoin,sugruedes\/bitcoinxt,hasanatkazmi\/bitcoin,habibmasuro\/bitcoinxt,lakepay\/lake,48thct2jtnf\/P,Credit-Currency\/CoinTestComp,alexandrcoin\/vertcoin,snakie\/ppcoin,randy-waterhouse\/bitcoin,Megacoin2\/Megacoin,x-kalux\/bitcoin_WiG-B,ryanxcharles\/bitcoin,czr5014iph\/bitcoin4e,okinc\/bitcoin,Tetcoin\/tetcoin,peercoin\/peercoin,RazorLove\/cloaked-octo-spice,joshrabinowitz\/bitcoin,nightlydash\/darkcoin,Electronic-Gulden-Foundation\/egulden,zzkt\/solarcoin,robvanmieghem\/clams,monacoinproject\/monacoin,kallewoof\/elements,Metronotes\/bitcoin,botland\/bitcoin,Ziftr\/namecoin,jaromil\/faircoin2,manuel-zulian\/accumunet,Michagogo\/bitcoin,kallewoof\/elements,supcoin\/supcoin,goldcoin\/Goldcoin-GLD,tobeyrowe\/BitStarCoin,Bitcoinsulting\/bitcoinxt,ionomy\/ion,senadmd\/coinmarketwatch,ahmedbodi\/vertcoin,MitchellMintCoins\/AutoCoin,RibbitFROG\/ribbitcoin,cculianu\/bitcoin-abc,coinkeeper\/2015-04-19_21-20_litecoindark,scippio\/bitcoin,dashpay\/dash,ftrader-bitcoinabc\/bitcoin-abc,DSPay\/DSPay,saydulk\/Feathercoin,enlighter\/Feathercoin,awemany\/BitcoinUnlimited,Justaphf\/BitcoinUnlimited,patricklodder\/dogecoin,aburan28\/elements,josephbisch\/namecoin-core,genavarov\/brcoin,xuyangcn\/opalcoin,SmeltFool\/Wonker,FinalHashLLC\/namecore,cinnamoncoin\/groupcoin-1,Electronic-Gulden-Foundation\/egulden,robvanbentem\/bitcoin,Twyford\/Indigo,alejandromgk\/Lunar,Erkan-Yilmaz\/twister-core,coinkeeper\/megacoin_20150410_fixes,5mil\/SuperTurboStake,bitcoinec\/bitcoinec,kbccoin\/kbc,cdecker\/bitcoin,CoinProjects\/AmsterdamCoin-v4,pinheadmz\/bitcoin,ArgonToken\/ArgonToken,myriadteam\/myriadcoin,florincoin\/florincoin,40thoughts\/Coin-QualCoin,AdrianaDinca\/bitcoin,nmarley\/dash,hasanatkazmi\/bitcoin,schinzelh\/dash,HeliumGas\/helium,ajtowns\/bitcoin,namecoin\/namecore,droark\/elements,rat4\/bitcoin,imton\/bitcoin,IOCoin\/DIONS,sickpig\/BitcoinUnlimited,koharjidan\/dogecoin,appop\/bitcoin,jtimon\/bitcoin,litecoin-project\/litecoin,wellenreiter01\/Feathercoin,cinnamoncoin\/Feathercoin,maaku\/bitcoin,Megacoin2\/Megacoin,DGCDev\/argentum,braydonf\/bitcoin,skaht\/bitcoin,sugruedes\/bitcoinxt,ghostlander\/Feathercoin,rustyrussell\/bitcoin,tuaris\/bitcoin,Christewart\/bitcoin,gades\/novacoin,odemolliens\/bitcoinxt,practicalswift\/bitcoin,sarielsaz\/sarielsaz,stamhe\/litecoin,freelion93\/mtucicoin,Jcing95\/iop-hd,brishtiteveja\/sherlockcoin,goldcoin\/Goldcoin-GLD,dmrtsvetkov\/flowercoin,coinkeeper\/2015-06-22_18-56_megacoin,deadalnix\/bitcoin,dscotese\/bitcoin,JeremyRand\/bitcoin,tripmode\/pxlcoin,yenliangl\/bitcoin,gwillen\/elements,BigBlueCeiling\/augmentacoin,terracoin\/terracoin,deuscoin\/deuscoin,Michagogo\/bitcoin,s-matthew-english\/bitcoin,dgenr8\/bitcoin,bitreserve\/bitcoin,koharjidan\/dogecoin,robvanbentem\/bitcoin,zcoinofficial\/zcoin,mrbandrews\/bitcoin,rat4\/bitcoin,daliwangi\/bitcoin,paveljanik\/bitcoin,benma\/bitcoin,plncoin\/PLNcoin_Core,coinkeeper\/2015-06-22_18-44_namecoin,lateminer\/DopeCoinGold,ajweiss\/bitcoin,llluiop\/bitcoin,glv2\/peerunity,gjhiggins\/vcoin0.8zeta-dev,nikkitan\/bitcoin,mrbandrews\/bitcoin,wederw\/bitcoin,mrbandrews\/bitcoin,benma\/bitcoin,funbucks\/notbitcoinxt,benma\/bitcoin,EthanHeilman\/bitcoin,CodeShark\/bitcoin,internaut-me\/ppcoin,odemolliens\/bitcoinxt,renatolage\/wallets-BRCoin,Rav3nPL\/PLNcoin,okcashpro\/okcash,droark\/elements,rat4\/blackcoin,sproutcoin\/sprouts,Ziftr\/bitcoin,MidasPaymentLTD\/midascoin,ardsu\/bitcoin,vcoin-project\/vcoincore,sarielsaz\/sarielsaz,accraze\/bitcoin,antonio-fr\/bitcoin,UASF\/bitcoin,Dajackal\/Ronpaulcoin,xawksow\/GroestlCoin,kseistrup\/twister-core,aspanta\/bitcoin,bankonmecoin\/namecoin-legacy,united-scrypt-coin-project\/unitedscryptcoin,ionomy\/ion,aburan28\/elements,Czarcoin\/czarcoin,kirkalx\/bitcoin,goku1997\/bitcoin,simdeveloper\/bitcoin,jtimon\/bitcoin,droark\/elements,iceinsidefire\/peershare-edit,bitcoinknots\/bitcoin,coinkeeper\/terracoin_20150327,borgcoin\/Borgcoin1,PRabahy\/bitcoin,apoelstra\/bitcoin,worldcoinproject\/worldcoin-v0.8,Crypto-Currency\/BitBar,elecoin\/elecoin,argentumproject\/argentum,xXDavasXx\/Davascoin,coblee\/litecoin-old,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,bespike\/litecoin,Friedbaumer\/litecoin,applecoin-official\/applecoin,iQcoin\/iQcoin,jarymoth\/dogecoin,phorensic\/yacoin,ddombrowsky\/radioshares,JeremyRand\/namecore,Darknet-Crypto\/Darknet,deeponion\/deeponion,ptschip\/bitcoin,coinkeeper\/2015-04-19_21-20_litecoindark,NunoEdgarGub1\/elements,CoinGame\/BCEShadowNet,pastday\/bitcoinproject,bitcoinxt\/bitcoinxt,p2peace\/oliver-twister-core,slingcoin\/sling-market,itmanagerro\/tresting,GroestlCoin\/GroestlCoin,MitchellMintCoins\/AutoCoin,coinkeeper\/2015-06-22_19-13_florincoin,bitbrazilcoin-project\/bitbrazilcoin,goldcoin\/goldcoin,prark\/bitcoinxt,Exgibichi\/statusquo,madman5844\/poundkoin,genavarov\/lamacoin,mooncoin-project\/mooncoin-landann,coinkeeper\/2015-06-22_18-46_reddcoin,btc1\/bitcoin,ediston\/energi,ClusterCoin\/ClusterCoin,zebrains\/Blotter,coinkeeper\/2015-06-22_18-45_peercoin,coinkeeper\/2015-06-22_19-07_digitalcoin,viacoin\/viacoin,starwalkerz\/fincoin-fork,FrictionlessCoin\/iXcoin,collapsedev\/circlecash,arruah\/ensocoin,domob1812\/huntercoin,ctwiz\/stardust,habibmasuro\/bitcoin,cryptohelper\/premine,capitalDIGI\/litecoin,truthcoin\/truthcoin-cpp,shaulkf\/bitcoin,JeremyRand\/namecoin-core,apoelstra\/elements,bitgrowchain\/bitgrow,fflo\/sixeleven,kazcw\/bitcoin,apoelstra\/bitcoin,mastercoin-MSC\/mastercore,dakk\/soundcoin,shaulkf\/bitcoin,funkshelper\/woodcore,jimmysong\/bitcoin,tdudz\/elements,zetacoin\/zetacoin,CryptArc\/bitcoinxt,x-kalux\/bitcoin_WiG-B,OmniLayer\/omnicore,FeatherCoin\/Feathercoin,coinkeeper\/2015-06-22_18-37_dogecoin,lbryio\/lbrycrd,GwangJin\/gwangmoney-core,mrtexaznl\/mediterraneancoin,coinwarp\/dogecoin,matlongsi\/micropay,scamcoinz\/scamcoin,habibmasuro\/bitcoin,greencoin-dev\/GreenCoinV2,CoinGame\/BCEShadow,fsb4000\/bitcoin,Dajackal\/Ronpaulcoin,greenaddress\/bitcoin,dev1972\/Satellitecoin,48thct2jtnf\/P,h4x3rotab\/BTCGPU,jonasschnelli\/bitcoin,kbccoin\/kbc,enlighter\/Feathercoin,TierNolan\/bitcoin,Alex-van-der-Peet\/bitcoin,stamhe\/namecoin,ZiftrCOIN\/ziftrcoin,error10\/bitcoin,okTurtles\/namecoin,megacoin\/megacoin,jambolo\/bitcoin,manuel-zulian\/accumunet,sbaks0820\/bitcoin,laanwj\/bitcoin-qt,slingcoin\/sling-market,gavinandresen\/bitcoin-git,KillerByte\/memorypool,BitcoinUnlimited\/BitcoinUnlimited,lbryio\/lbrycrd,NateBrune\/bitcoin-nate,yenliangl\/bitcoin,JeremyRubin\/bitcoin,tecnovert\/particl-core,TrainMAnB\/vcoincore,phorensic\/yacoin,renatolage\/wallets-BRCoin,akabmikua\/flowcoin,joulecoin\/joulecoin,XertroV\/bitcoin-nulldata,afk11\/bitcoin,basicincome\/unpcoin-core,cculianu\/bitcoin-abc,bitcoin-hivemind\/hivemind,sickpig\/BitcoinUnlimited,ripper234\/bitcoin,Rimbit\/Wallets,s-matthew-english\/bitcoin,acid1789\/bitcoin,jimmykiselak\/lbrycrd,reddcoin-project\/reddcoin,lbrtcoin\/albertcoin,mb300sd\/bitcoin,sigmike\/peercoin,monacoinproject\/monacoin,Rav3nPL\/polcoin,oklink-dev\/bitcoin_block,TBoehm\/greedynode,sugruedes\/bitcoin,reddink\/reddcoin,mikehearn\/bitcoinxt,Chancoin-core\/CHANCOIN,DogTagRecon\/Still-Leraning,webdesignll\/coin,rustyrussell\/bitcoin,thrasher-\/litecoin,Har01d\/bitcoin,xXDavasXx\/Davascoin,oleganza\/bitcoin-duo,prodigal-son\/blackcoin,bitbrazilcoin-project\/bitbrazilcoin,UFOCoins\/ufo,deadalnix\/bitcoin,untrustbank\/litecoin,litecoin-project\/litecore-litecoin,eXcomm\/namecoin,nomnombtc\/bitcoin,namecoinq\/namecoinq,gcc64\/bitcoin,denverl\/bitcoin,ceptacle\/libcoinqt,spiritlinxl\/BTCGPU,MazaCoin\/maza,mycointest\/owncoin,sebrandon1\/bitcoin,schildbach\/bitcoin,jul2711\/jucoin,ajtowns\/bitcoin,zixan\/bitcoin,daliwangi\/bitcoin,LanaCoin\/lanacoin,d5000\/ppcoin,mockcoin\/mockcoin,worldbit\/worldbit,sifcoin\/sifcoin,gjhiggins\/vcoincore,TrainMAnB\/vcoincore,apoelstra\/bitcoin,haisee\/dogecoin,coinkeeper\/2015-06-22_18-45_peercoin,domob1812\/i0coin,koharjidan\/litecoin,se3000\/bitcoin,Peerapps\/ppcoin,ashleyholman\/bitcoin,basicincome\/unpcoin-core,bcpki\/nonce2testblocks,schinzelh\/dash,willwray\/dash,amiller\/bitcoin,BTCfork\/hardfork_prototype_1_mvf-bu,CoinBlack\/blackcoin,Electronic-Gulden-Foundation\/egulden,Adaryian\/E-Currency,Kcoin-project\/kcoin,error10\/bitcoin,mm-s\/bitcoin,FuzzyBearBTC\/Peershares2,anditto\/bitcoin,gorgoy\/novacoin,nbenoit\/bitcoin,therealaltcoin\/altcoin,CodeShark\/bitcoin,dannyperez\/bolivarcoin,ShadowMyst\/creativechain-core,rromanchuk\/bitcoinxt,s-matthew-english\/bitcoin,octocoin-project\/octocoin,peerdb\/cors,kfitzgerald\/titcoin,bankonmecoin\/bitcoin,inutoshi\/inutoshi,OstlerDev\/florincoin,javgh\/bitcoin,itmanagerro\/tresting,Cancercoin\/Cancercoin,sbaks0820\/bitcoin,FuzzyBearBTC\/Peershares-1,sickpig\/BitcoinUnlimited,Anoncoin\/anoncoin,GroestlCoin\/bitcoin,franko-org\/franko,dgenr8\/bitcoinxt,DMDcoin\/Diamond,ShwoognationHQ\/bitcoin,TheBlueMatt\/bitcoin,BlockchainTechLLC\/3dcoin,pstratem\/bitcoin,petertodd\/namecoin,Darknet-Crypto\/Darknet,josephbisch\/namecoin-core,atgreen\/bitcoin,Jeff88Ho\/bitcoin,schildbach\/bitcoin,bitcoinplusorg\/xbcwalletsource,shouhuas\/bitcoin,ya4-old-c-coder\/yacoin,steakknife\/bitcoin-qt,digibyte\/digibyte,Kenwhite23\/litecoin,NunoEdgarGub1\/elements,experiencecoin\/experiencecoin,cryptodev35\/icash,cinnamoncoin\/groupcoin-1,Lucky7Studio\/bitcoin,coinkeeper\/terracoin_20150327,coinkeeper\/2015-06-22_18-44_namecoin,gjhiggins\/vcoin09,jlopp\/statoshi,EthanHeilman\/bitcoin,Cancercoin\/Cancercoin,BeirdoMud\/MudCoin,puticcoin\/putic,coinkeeper\/2015-06-22_19-07_digitalcoin,Sjors\/bitcoin,syscoin\/syscoin2,dagurval\/bitcoinxt,MikeAmy\/bitcoin,lbrtcoin\/albertcoin,CrimeaCoin\/crimeacoin,jeromewu\/bitcoin-opennet,zixan\/bitcoin,myriadcoin\/myriadcoin,DogTagRecon\/Still-Leraning,initaldk\/bitcoin,sigmike\/peercoin,JeremyRand\/namecore,acmeyer\/voteid,pstratem\/bitcoin,CrimeaCoin\/crimeacoin,jmcorgan\/bitcoin,biblepay\/biblepay,sipsorcery\/bitcoin,worldbit\/worldbit,kallewoof\/elements,pinheadmz\/bitcoin,CoinBlack\/bitcoin,rsackler\/namecoin,fullcoins\/fullcoin,nbenoit\/bitcoin,Cannacoin-Project\/Cannacoin,sbaks0820\/bitcoin,coinkeeper\/2015-06-22_18-41_ixcoin,chronokings\/huntercoin,Justaphf\/BitcoinUnlimited,inutoshi\/inutoshi,tjth\/lotterycoin,wiggi\/huntercoin,zebrains\/Blotter,ahmedbodi\/test2,Kore-Core\/kore,btc1\/bitcoin,dogecoin\/dogecoin,shelvenzhou\/BTCGPU,111t8e\/bitcoin,elacoin\/elacoin,AquariusNetwork\/ARCO,greenaddress\/bitcoin,Kabei\/Ippan,SoreGums\/bitcoinxt,fsb4000\/huntercoin,dev1972\/Satellitecoin,millennial83\/bitcoin,FarhanHaque\/bitcoin,sacarlson\/MultiCoin-exp,peerdb\/cors,kleetus\/bitcoin,raasakh\/bardcoin,Sjors\/bitcoin,bdelzell\/creditcoin-org-creditcoin,ravenbyron\/phtevencoin,jiangyonghang\/bitcoin,ivansib\/sib16,iadix\/iadixcoin,RibbitFROG\/ribbitcoin,kigooz\/smalltestnew,ericshawlinux\/bitcoin,gzuser01\/zetacoin-bitcoin,isle2983\/bitcoin,zemrys\/vertcoin,zotherstupidguy\/bitcoin,fsb4000\/huntercoin,Charlesugwu\/Vintagecoin,Petr-Economissa\/gvidon,litecoin-project\/bitcoinomg,TheoremCrypto\/TheoremCoin,balajinandhu\/bitcoin,nightlydash\/darkcoin,lordsajan\/erupee,RongxinZhang\/bitcoinxt,nlgcoin\/guldencoin-official,celebritycoin\/investorcoin,RHavar\/bitcoin,oklink-dev\/bitcoin_block,111t8e\/bitcoin,Tetpay\/bitcoin,cheehieu\/bitcoin,elambert2014\/cbx2,raasakh\/bardcoin.exe,bitcoinplusorg\/xbcwalletsource,marscoin\/marscoin,chaincoin\/chaincoin,cinnamoncoin\/Feathercoin,zestcoin\/ZESTCOIN,alecalve\/bitcoin,40thoughts\/Coin-QualCoin,cinnamoncoin\/Feathercoin,jl2012\/litecoin,UFOCoins\/ufo,coinkeeper\/megacoin_20150410_fixes,constantine001\/bitcoin,shapiroisme\/datadollar,richo\/dongcoin,tjps\/bitcoin,freelion93\/mtucicoin,nathan-at-least\/zcash,axelxod\/braincoin,welshjf\/bitcoin,cryptostorm\/namecoin,jonasbits\/namecoin,BTCDDev\/bitcoin,amaivsimau\/bitcoin,Vsync-project\/Vsync,wcwu\/bitcoin,Mrs-X\/Darknet,MoMoneyMonetarism\/ppcoin,cryptcoins\/cryptcoin,namecoinq\/namecoinq,vbernabe\/freicoin,manuel-zulian\/accumunet,jonasschnelli\/bitcoin,applecoin-official\/fellatio,Bushstar\/UFO-Project,CoinGame\/NuShadowNet,FuzzyBearBTC\/Peerunity,brettwittam\/geocoin,TripleSpeeder\/bitcoin,BTCDDev\/bitcoin,netswift\/vertcoin,matlongsi\/micropay,Crowndev\/crowncoin,ahmedbodi\/poscoin,gorgoy\/novacoin,CryptArc\/bitcoinxt,shelvenzhou\/BTCGPU,MazaCoin\/mazacoin-new,jonghyeopkim\/bitcoinxt,crowning-\/dash,mmpool\/coiledcoin,jamesob\/bitcoin,coinkeeper\/2015-06-22_18-39_feathercoin,jarymoth\/dogecoin,lbryio\/lbrycrd,projectinterzone\/ITZ,bitcoin\/bitcoin,vizidrixfork\/Peershares,jl2012\/litecoin,worldcoinproject\/worldcoin-v0.8,bitgoldcoin-project\/bitgoldcoin,memorycoin\/memorycoin,digibyte\/digibyte,Adaryian\/E-Currency,Theshadow4all\/ShadowCoin,initaldk\/bitcoin,Flurbos\/Flurbo,droark\/elements,landcoin-ldc\/landcoin,instagibbs\/bitcoin,IlfirinCano\/shavercoin,brishtiteveja\/sherlockholmescoin,ekankyesme\/bitcoinxt,leofidus\/glowing-octo-ironman,Peershares\/Peershares,penek\/novacoin,CodeShark\/bitcoin,dogecoin\/dogecoin,gwillen\/elements,sarielsaz\/sarielsaz,trippysalmon\/bitcoin,chrisfranko\/aiden,Kenwhite23\/litecoin,dakk\/soundcoin,Richcoin-Project\/RichCoin,experiencecoin\/experiencecoin,ryanofsky\/bitcoin,zzkt\/solarcoin,themusicgod1\/bitcoin,SocialCryptoCoin\/SocialCoin,bcpki\/testblocks,mrtexaznl\/mediterraneancoin,sipsorcery\/bitcoin,pdrobek\/Polcoin-1-3,koharjidan\/bitcoin,pouta\/bitcoin,RHavar\/bitcoin,namecoin\/namecore,daveperkins-github\/bitcoin-dev,ixcoinofficialpage\/master,ElementsProject\/elements,benzmuircroft\/REWIRE.io,Ziftr\/litecoin,celebritycoin\/CelebrityCoin,zetacoin\/zetacoin,dpayne9000\/Rubixz-Coin,GroundRod\/anoncoin,mobicoins\/mobicoin-core,ftrader-bitcoinunlimited\/hardfork_prototype_1_mvf-bu,elecoin\/elecoin,my-first\/octocoin,ivansib\/sib16,starwalkerz\/fincoin-fork,fullcoins\/fullcoin,dgarage\/bc3,credits-currency\/credits,khalahan\/old_namecoin,gcc64\/bitcoin,DSPay\/DSPay,greenaddress\/bitcoin,dooglus\/clams,loxal\/zcash,DMDcoin\/Diamond,BTCfork\/hardfork_prototype_1_mvf-core,mincoin-project\/mincoin,celebritycoin\/investorcoin,coinkeeper\/2015-06-22_19-13_florincoin,ediston\/energi,razor-coin\/razor,jarymoth\/dogecoin,GlobalBoost\/GlobalBoost,enlighter\/Feathercoin,putinclassic\/putic,coinwarp\/dogecoin,cqtenq\/feathercoin_core,Alex-van-der-Peet\/bitcoin,jl2012\/litecoin,phelixbtc\/bitcoin,domob1812\/huntercore,sdaftuar\/bitcoin,wiggi\/fairbrix-0.6.3,ekankyesme\/bitcoinxt,sirk390\/bitcoin,vectorcoindev\/Vector,achow101\/bitcoin,ForceMajeure\/BitPenny-Client-0.4.0.1,joulecoin\/joulecoin,vmp32k\/litecoin,balajinandhu\/bitcoin,ychaim\/smallchange,HerkCoin\/herkcoin,AquariusNetwork\/ARCOv2,ahmedbodi\/terracoin,segwit\/atbcoin-insight,Flowdalic\/bitcoin,FarhanHaque\/bitcoin,indolering\/namecoin-qt,jimmysong\/bitcoin,DogTagRecon\/Still-Leraning,Someguy123\/novafoil,BenjaminsCrypto\/Benjamins-1,gjhiggins\/vcoin09,p2peace\/oliver-twister-core,FuzzyBearBTC\/Fuzzyshares,x-kalux\/bitcoin_WiG-B,ghostlander\/Feathercoin,rjshaver\/bitcoin,jgarzik\/bitcoin,jimmykiselak\/lbrycrd,elambert2014\/novacoin,peercoin\/peercoin,Rav3nPL\/doubloons-08,rsackler\/namecoin,butterflypay\/bitcoin,dgenr8\/bitcoin,mortalvikinglive\/bitcoinlight,MoMoneyMonetarism\/ppcoin,mmpool\/coiledcoin,Magicking\/neucoin,xXDavasXx\/Davascoin,qtumproject\/qtum,MazaCoin\/mazacoin-new,cinnamoncoin\/groupcoin-1,Ziftr\/litecoin,Xekyo\/bitcoin,acid1789\/bitcoin,Erkan-Yilmaz\/twister-core,ahmedbodi\/bytecoin,acid1789\/bitcoin,tropa\/axecoin,isocolsky\/bitcoinxt,coinkeeper\/2015-06-22_18-42_litecoin,FrictionlessCoin\/iXcoin,markf78\/dollarcoin,gzuser01\/zetacoin-bitcoin,particl\/particl-core,ryanxcharles\/bitcoin,khalahan\/old_namecoin,btcdrak\/bitcoin,MeshCollider\/bitcoin,osuyuushi\/laughingmancoin,mooncoin-project\/mooncoin-landann,oklink-dev\/bitcoin,Paymium\/bitcoin,cqtenq\/Feathercoin,masterbraz\/dg,isghe\/bitcoinxt,UdjinM6\/dash,ptschip\/bitcoin,prark\/bitcoinxt,alejandromgk\/Lunar,KnCMiner\/bitcoin,gwangjin2\/gwangcoin-core,zixan\/bitcoin,gwillen\/elements,WorldcoinGlobal\/WorldcoinLegacy,coinkeeper\/2015-06-22_18-39_feathercoin,gmaxwell\/bitcoin,multicoins\/marycoin,PRabahy\/bitcoin,crowning-\/dash,dgenr8\/bitcoinxt,digideskio\/namecoin,namecoin\/namecoin-legacy,NateBrune\/bitcoin-fio,andreaskern\/bitcoin,syscoin\/syscoin,neutrinofoundation\/neutrino-digital-currency,aspirecoin\/aspire,jonasbits\/namecoin,daveperkins-github\/bitcoin-dev,h4x3rotab\/BTCGPU,rjshaver\/bitcoin,enlighter\/Feathercoin,Cannacoin-Project\/Cannacoin,GeekBrony\/ponycoin-old,sbellem\/bitcoin,DrCrypto\/darkcoin,prusnak\/bitcoin,benosa\/bitcoin,antcheck\/antcoin,mortalvikinglive\/bitcoinclassic,NeuCoin\/neucoin,Kixunil\/keynescoin,mooncoin-project\/mooncoin-landann,Bitcoin-com\/BUcash,ghostlander\/Feathercoin,torresalyssa\/bitcoin,btcdrak\/bitcoin,SoreGums\/bitcoinxt,kaostao\/namecoin,applecoin-official\/applecoin,starwels\/starwels,tedlz123\/Bitcoin,ixcoinofficialpage\/master,supcoin\/supcoin,ryanxcharles\/bitcoin,cerebrus29301\/crowncoin,presstab\/PIVX,ZiftrCOIN\/ziftrcoin,nsacoin\/nsacoin,petertodd\/namecoin,Flowdalic\/bitcoin,tedlz123\/Bitcoin,eXcomm\/namecoin,howardrya\/AcademicCoin,NunoEdgarGub1\/elements,hg5fm\/nexuscoin,jameshilliard\/bitcoin,practicalswift\/bitcoin,JeremyRubin\/bitcoin,syscoin\/syscoin2,rsdevgun16e\/energi,uphold\/bitcoin,brishtiteveja\/sherlockholmescoin,xranby\/blackcoin,jashandeep-sohi\/ppcoin,GroestlCoin\/bitcoin,ryanofsky\/bitcoin,bitcoinclassic\/bitcoinclassic,ericshawlinux\/bitcoin,braydonf\/bitcoin,prark\/bitcoinxt,aniemerg\/zcash,ghostlander\/Testcoin,Matoking\/bitcoin,Kcoin-project\/kcoin,digibyte\/digibyte,antcheck\/antcoin,nsacoin\/nsacoin,projectinterzone\/ITZ,thelazier\/dash,lbrtcoin\/albertcoin,ptschip\/bitcoin,SartoNess\/BitcoinUnlimited,NunoEdgarGub1\/elements,GeekBrony\/ponycoin-old,jonasschnelli\/bitcoin,Bitcoinsulting\/bitcoinxt,aniemerg\/zcash,simdeveloper\/bitcoin,brettwittam\/geocoin,adpg211\/bitcoin-master,rdqw\/sscoin,peacedevelop\/peacecoin,coinwarp\/dogecoin,amaivsimau\/bitcoin,wederw\/bitcoin,xuyangcn\/opalcoin,bitjson\/hivemind,memorycoin\/memorycoin,ahmedbodi\/bytecoin,keo\/bitcoin,Bitcoinsulting\/bitcoinxt,HeliumGas\/helium,core-bitcoin\/bitcoin,MasterX1582\/bitcoin-becoin,deadalnix\/bitcoin,wekuiz\/wekoin,neuroidss\/bitcoin,pocopoco\/yacoin,daliwangi\/bitcoin,Kogser\/bitcoin,loxal\/zcash,Cocosoft\/bitcoin,erqan\/twister-core,schildbach\/bitcoin,robvanbentem\/bitcoin,BlueMeanie\/PeerShares,coinkeeper\/terracoin_20150327,collapsedev\/circlecash,instagibbs\/bitcoin,phelixbtc\/bitcoin,janko33bd\/bitcoin,gazbert\/bitcoin,DigitalPandacoin\/pandacoin,Krellan\/bitcoin,rromanchuk\/bitcoinxt,creath\/barcoin,IOCoin\/DIONS,valorbit\/valorbit-oss,Jeff88Ho\/bitcoin,SoreGums\/bitcoinxt,zcoinofficial\/zcoin,qubitcoin-project\/QubitCoinQ2C,bitcoinxt\/bitcoinxt,putinclassic\/putic,bitcoinplusorg\/xbcwalletsource,Michagogo\/bitcoin,gravio-net\/graviocoin,mycointest\/owncoin,mitchellcash\/bitcoin,trippysalmon\/bitcoin,kaostao\/namecoin,AkioNak\/bitcoin,m0gliE\/fastcoin-cli,ppcoin\/ppcoin,Petr-Economissa\/gvidon,GlobalBoost\/GlobalBoost,bittylicious\/bitcoin,bdelzell\/creditcoin-org-creditcoin,Kangmo\/bitcoin,robvanbentem\/bitcoin,genavarov\/ladacoin,biblepay\/biblepay,DGCDev\/digitalcoin,guncoin\/guncoin,AsteraCoin\/AsteraCoin,lbrtcoin\/albertcoin,applecoin-official\/fellatio,rat4\/bitcoin,metacoin\/florincoin,2XL\/bitcoin,LIMXTEC\/DMDv3,Rav3nPL\/PLNcoin,litecoin-project\/litecoin,biblepay\/biblepay,ekankyesme\/bitcoinxt,pinheadmz\/bitcoin,Vector2000\/bitcoin,alexandrcoin\/vertcoin,ClusterCoin\/ClusterCoin,segsignal\/bitcoin,wtogami\/bitcoin,NateBrune\/bitcoin-fio,n1bor\/bitcoin,Exceltior\/dogecoin,coinkeeper\/2015-06-22_18-30_anoncoin,CryptArc\/bitcoin,metacoin\/florincoin,shea256\/bitcoin,sacarlson\/MultiCoin-exp,FuzzyBearBTC\/Peershares-1,pevernon\/picoin,Bitcoin-ABC\/bitcoin-abc,crowning2\/dash,NateBrune\/bitcoin-fio,stevemyers\/bitcoinxt,FuzzyBearBTC\/Peershares2,ccoin-project\/ccoin,novacoin-project\/novacoin,JeremyRand\/namecore,dannyperez\/bolivarcoin,NicolasDorier\/bitcoin,qtumproject\/qtum,zotherstupidguy\/bitcoin,omefire\/bitcoin,Open-Source-Coins\/EZ,2XL\/bitcoin,bittylicious\/bitcoin,novaexchange\/EAC,EntropyFactory\/creativechain-core,ediston\/energi,SmeltFool\/Wonker,CoinProjects\/AmsterdamCoin-v4,arruah\/ensocoin,IOCoin\/DIONS,cybermatatu\/bitcoin,coinkeeper\/2015-06-22_18-36_darkcoin,jmcorgan\/bitcoin,cinnamoncoin\/groupcoin-1,dagurval\/bitcoinxt,gapcoin\/gapcoin,talpan\/namecoin,funbucks\/notbitcoinxt,enlighter\/Feathercoin,kleetus\/bitcoinxt,ahmedbodi\/test2,r8921039\/bitcoin,applecoin-official\/fellatio,killerstorm\/bitcoin,gandrewstone\/BitcoinUnlimited,ghostlander\/Orbitcoin,braydonf\/bitcoin,cannabiscoindev\/cannabiscoin420,BitcoinPOW\/BitcoinPOW,osuyuushi\/laughingmancoin,namecoin\/namecoin,ahmedbodi\/vertcoin,barcoin-project\/nothingcoin,earonesty\/bitcoin,zsulocal\/bitcoin,unsystemizer\/bitcoin,3lambert\/Molecular,cheehieu\/bitcoin,credits-currency\/credits,thormuller\/yescoin2,mikehearn\/bitcoin,loxal\/zcash,MonetaryUnit\/MUE-Src,vbernabe\/freicoin,faircoin\/faircoin2,petertodd\/bitcoin,dscotese\/bitcoin,tobeyrowe\/BitStarCoin,appop\/bitcoin,jn2840\/bitcoin,kevin-cantwell\/crunchcoin,nbenoit\/bitcoin,MikeAmy\/bitcoin,stevemyers\/bitcoinxt,coinkeeper\/2015-06-22_19-19_worldcoin,som4paul\/BolieC,ANCompany\/birdcoin-dev,Bloom-Project\/Bloom,martindale\/elements,privatecoin\/privatecoin,ShwoognationHQ\/bitcoin,RazorLove\/cloaked-octo-spice,sbellem\/bitcoin,BTCfork\/hardfork_prototype_1_mvf-core,fsb4000\/bitcoin,hasanatkazmi\/bitcoin,ekankyesme\/bitcoinxt,domob1812\/crowncoin,inkvisit\/sarmacoins,Cannacoin-Project\/Cannacoin,totallylegitbiz\/totallylegitcoin,phplaboratory\/psiacoin,rawodb\/bitcoin,Someguy123\/novafoil,butterflypay\/bitcoin,oklink-dev\/bitcoin_block,lateminer\/DopeCoinGold,javgh\/bitcoin,fullcoins\/fullcoin,howardrya\/AcademicCoin,rnicoll\/bitcoin,oleganza\/bitcoin-duo,lateminer\/DopeCoinGold,FrictionlessCoin\/iXcoin,Earlz\/renamedcoin,DSPay\/DSPay,AllanDoensen\/BitcoinUnlimited,Darknet-Crypto\/Darknet,bitreserve\/bitcoin,jmcorgan\/bitcoin,tensaix2j\/bananacoin,koltcoin\/koltcoin,javgh\/bitcoin,mitchellcash\/bitcoin,awemany\/BitcoinUnlimited,greencoin-dev\/greencoin-dev,Petr-Economissa\/gvidon,itmanagerro\/tresting,BTCGPU\/BTCGPU,gmaxwell\/bitcoin,sproutcoin\/sprouts,bankonmecoin\/namecoin-legacy,ahmedbodi\/temp_vert,unsystemizer\/bitcoin,gavinandresen\/bitcoin-git,daeMOn63\/Peershares,droark\/bitcoin,domob1812\/crowncoin,MidasPaymentLTD\/midascoin,joroob\/reddcoin,litecoin-project\/litecore-litecoin,CTRoundTable\/Encrypted.Cash,CrimeaCoin\/crimeacoin,vtafaucet\/virtacoin,morcos\/bitcoin,mb300sd\/bitcoin,Krellan\/bitcoin,ElementsProject\/elements,ArgonToken\/ArgonToken,nmarley\/dash,dcousens\/bitcoin,effectsToCause\/vericoin,bitcoinsSG\/bitcoin,Flowdalic\/bitcoin,totallylegitbiz\/totallylegitcoin,Coinfigli\/coinfigli,iQcoin\/iQcoin,digibyte\/digibyte,tatafiore\/mycoin,Ziftr\/ppcoin,StarbuckBG\/BTCGPU,emc2foundation\/einsteinium,meighti\/bitcoin,okTurtles\/namecoin,manuel-zulian\/accumunet,mycointest\/owncoin,OfficialTitcoin\/titcoin-wallet,Friedbaumer\/litecoin,deuscoin\/deuscoin,phorensic\/yacoin,reorder\/viacoin,zottejos\/merelcoin,Exgibichi\/statusquo,prark\/bitcoinxt,elambert2014\/novacoin,zcoinofficial\/zcoin,bitpagar\/bitpagar,sugruedes\/bitcoin,totallylegitbiz\/totallylegitcoin,inutoshi\/inutoshi,CTRoundTable\/Encrypted.Cash,viacoin\/viacoin,gfneto\/Peershares,shea256\/bitcoin,11755033isaprimenumber\/Feathercoin,BTCfork\/hardfork_prototype_1_mvf-bu,HerkCoin\/herkcoin,plncoin\/PLNcoin_Core,manuel-zulian\/CoMoNet,Czarcoin\/czarcoin,ccoin-project\/ccoin,multicoins\/marycoin,truthcoin\/blocksize-market,d5000\/ppcoin,simdeveloper\/bitcoin,themusicgod1\/bitcoin,thodg\/ppcoin,bittylicious\/bitcoin,svost\/bitcoin,midnightmagic\/bitcoin,schinzelh\/dash,stamhe\/litecoin,novacoin-project\/novacoin,cryptocoins4all\/zcoin,WorldLeadCurrency\/WLC,cyrixhero\/bitcoin,zenywallet\/bitzeny,tensaix2j\/bananacoin,razor-coin\/razor,habibmasuro\/bitcoin,fsb4000\/bitcoin,myriadteam\/myriadcoin,palm12341\/jnc,Bloom-Project\/Bloom,haobtc\/bitcoin,bitgrowchain\/bitgrow,3lambert\/Molecular,coinkeeper\/2015-06-22_18-41_ixcoin,brandonrobertz\/namecoin-core,langerhans\/dogecoin,bitcoinsSG\/bitcoin,svcop3\/svcop3,fedoracoin-dev\/fedoracoin,Christewart\/bitcoin,inutoshi\/inutoshi,ohac\/sakuracoin,prark\/bitcoinxt,ghostlander\/Feathercoin,privatecoin\/privatecoin,bitcoinec\/bitcoinec,pstratem\/bitcoin,yenliangl\/bitcoin,cotner\/bitcoin,markf78\/dollarcoin,ionomy\/ion,practicalswift\/bitcoin,ionux\/freicoin,petertodd\/namecoin,elambert2014\/novacoin,zemrys\/vertcoin,byncoin-project\/byncoin,josephbisch\/namecoin-core,altcoinpro\/addacoin,AsteraCoin\/AsteraCoin,ahmedbodi\/terracoin,coinkeeper\/2015-06-22_19-13_florincoin,lentza\/SuperTurboStake,qreatora\/worldcoin-v0.8,Flurbos\/Flurbo,Flowdalic\/bitcoin,vertcoin\/eyeglass,therealaltcoin\/altcoin,wiggi\/fairbrix-0.6.3,fujicoin\/fujicoin,coinkeeper\/2015-06-22_18-31_bitcoin,chrisfranko\/aiden,Cloudsy\/bitcoin,dannyperez\/bolivarcoin,memorycoin\/memorycoin,Matoking\/bitcoin,ctwiz\/stardust,syscoin\/syscoin,megacoin\/megacoin,lbrtcoin\/albertcoin,CoinBlack\/blackcoin,bickojima\/bitzeny,scmorse\/bitcoin,torresalyssa\/bitcoin,MonetaryUnit\/MUE-Src,gfneto\/Peershares,mitchellcash\/bitcoin,IOCoin\/DIONS,cryptostorm\/namecoin,meighti\/bitcoin,UFOCoins\/ufo,cryptoprojects\/ultimateonlinecash,RHavar\/bitcoin,reddcoin-project\/reddcoin,aspanta\/bitcoin,fsb4000\/novacoin,fussl\/elements,coinkeeper\/2015-06-22_18-45_peercoin,Checkcoin\/checkcoin,segsignal\/bitcoin,metrocoins\/metrocoin,21E14\/bitcoin,alecalve\/bitcoin,franko-org\/franko,brandonrobertz\/namecoin-core,daliwangi\/bitcoin,MasterX1582\/bitcoin-becoin,myriadcoin\/myriadcoin,XX-net\/twister-core,plankton12345\/litecoin,xXDavasXx\/Davascoin,lbrtcoin\/albertcoin,tobeyrowe\/BitStarCoin,nvmd\/bitcoin,myriadcoin\/myriadcoin,icook\/vertcoin,kbccoin\/kbc,sifcoin\/sifcoin,fsb4000\/bitcoin,sstone\/bitcoin,Anfauglith\/iop-hd,patricklodder\/dogecoin,roques\/bitcoin,uphold\/bitcoin,creath\/barcoin,xieta\/mincoin,martindale\/elements,ShwoognationHQ\/bitcoin,knolza\/gamblr,jlcurby\/NobleCoin,jonghyeopkim\/bitcoinxt,REAP720801\/bitcoin,jrick\/bitcoin,credits-currency\/credits,mobicoins\/mobicoin-core,robvanbentem\/bitcoin,applecoin-official\/applecoin,namecoin-qt\/namecoin-qt,LanaCoin\/lanacoin,maraoz\/proofcoin,cryptocoins4all\/zcoin,sugruedes\/bitcoin,bankonmecoin\/bitcoin,bickojima\/bitzeny,truthcoin\/blocksize-market,fflo\/sixeleven,ptschip\/bitcoinxt,pevernon\/picoin,jarymoth\/dogecoin,ajtowns\/bitcoin,botland\/bitcoin,btcdrak\/bitcoin,CoinGame\/BCEShadowNet,gazbert\/bitcoin,FeatherCoin\/Feathercoin,OstlerDev\/florincoin,donaloconnor\/bitcoin,cddjr\/BitcoinUnlimited,awoland\/namecoinq,tedlz123\/Bitcoin,jiffe\/cosinecoin,JeremyRand\/bitcoin,lbrtcoin\/albertcoin,vbernabe\/freicoin,rnicoll\/dogecoin,fullcoins\/fullcoin,neuroidss\/bitcoin,faircoin\/faircoin,nmarley\/dash,Krellan\/bitcoin,Alex-van-der-Peet\/bitcoin,namecoin\/namecoin-core,tripmode\/pxlcoin,thormuller\/yescoin2,szlaozhu\/twister-core","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- headers.h\n+++ headers.h\n@@ -19,11 +19,11 @@\n #define WIN32_LEAN_AND_MEAN 1\r\n #define __STDC_LIMIT_MACROS \/\/ to enable UINT64_MAX from stdint.h\r\n #include <wx\/wx.h>\r\n+#include <wx\/stdpaths.h>\r\n+#include <wx\/snglinst.h>\r\n+#if wxUSE_GUI\r\n+#include <wx\/utils.h>\r\n #include <wx\/clipbrd.h>\r\n-#include <wx\/snglinst.h>\r\n-#include <wx\/stdpaths.h>\r\n-#include <wx\/utils.h>\r\n-#if wxUSE_GUI\r\n #include <wx\/taskbar.h>\r\n #endif\r\n #include <openssl\/ecdsa.h>\r\n"} {"commit":"6993d81816b27e87198e93d88cc7533b74bb4fed","subject":"adding mkdir for windows (now with header)","message":"adding mkdir for windows (now with header)\n","repos":"samdmarshall\/OniLevelTool,samdmarshall\/OniLevelTool","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- headers.h\n+++ headers.h\n@@ -16,4 +16,8 @@\n #include <vector>\n \n #include <sys\/stat.h>\n-#include <sys\/types.h>+#include <sys\/types.h>\n+\n+#ifdef _WIN32\n+#include <direct.h>\n+#endif"} {"commit":"831280b2c3587c4a8cabbf1657438805fdc7005d","subject":"use a better option","message":"use a better option\n","repos":"ssbl\/heatmap","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- heatmap.c\n+++ heatmap.c\n@@ -13,16 +13,17 @@\n char *dir;\n enum comparison_type cmp_type = NOW; \/* default to now *\/\n \n- while ((opt = getopt(argc, argv, \"n;;r;;\")) != -1) {\n+ while ((opt = getopt(argc, argv, \"n;;m;;l;;\")) != -1) {\n switch (opt) {\n case 'n':\n cmp_type = NOW;\n break;\n- case 'r':\n+ case 'm':\n+ case 'l'\n cmp_type = MOST_RECENT;\n break;\n default:\n- fprintf(stderr, \"Usage: .\/hm [-nr] [DIR]\\n\");\n+ fprintf(stderr, \"Usage: .\/hm [-nm] [DIR]\\n\");\n exit(EXIT_FAILURE);\n }\n }\n"} {"commit":"a86c7d6001dfc1f0c7102ab7af69303c009c1fcf","subject":"Skip empty strings.","message":"Skip empty strings.\n","repos":"katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- examples\/words\/main.c\n+++ examples\/words\/main.c\n@@ -112,6 +112,10 @@\n \n \t\ts[strcspn(s, \"\\n\")] = '\\0';\n \n+\t\tif (*s == '\\0') {\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tif (-1 == clock_gettime(CLOCK_MONOTONIC, &pre)) {\n \t\t\tperror(\"clock_gettime\");\n \t\t\texit(EXIT_FAILURE);\n"} {"commit":"b94281379a4ab8d136fde8761c43d2876147bc8a","subject":"Fix zephir_get_doubleval_ex in operators.c","message":"Fix zephir_get_doubleval_ex in operators.c\n","repos":"patrick-zippenfenig\/zephir,patrick-zippenfenig\/zephir,sjinks\/zephir,steffengy\/zephir,aaam\/zephir,KorsaR-ZN\/zephir,karakurihiden\/zephir,joeyhub\/zephir,phalcon\/zephir,sergeyklay\/zephir,sjinks\/zephir,carlmcdade\/zephir,fezfez\/zephir,dreamsxin\/zephir,zephir-lang\/zephir,karakurihiden\/zephir,ovr\/zephir,sergeyklay\/zephir,karakurihiden\/zephir,steffengy\/zephir,sergeyklay\/zephir,janusnic\/zephir,patrick-zippenfenig\/zephir,cesarmarinhorj\/zephir,dreamsxin\/zephir,zephir-lang\/zephir,steffengy\/zephir,KorsaR-ZN\/zephir,steffengy\/zephir,gsouf\/zephir,KorsaR-ZN\/zephir,joeyhub\/zephir,carlmcdade\/zephir,gsouf\/zephir,karakurihiden\/zephir,sjinks\/zephir,karakurihiden\/zephir,cesarmarinhorj\/zephir,vpg\/zephir,sergeyklay\/zephir,gsouf\/zephir,cesarmarinhorj\/zephir,karakurihiden\/zephir,cesarmarinhorj\/zephir,vpg\/zephir,zephir-lang\/zephir,joeyhub\/zephir,carlmcdade\/zephir,zephir-lang\/zephir,sjinks\/zephir,KorsaR-ZN\/zephir,cesarmarinhorj\/zephir,janusnic\/zephir,janusnic\/zephir,janusnic\/zephir,carlmcdade\/zephir,janusnic\/zephir,dreamsxin\/zephir,vpg\/zephir,phalcon\/zephir,sjinks\/zephir,fezfez\/zephir,joeyhub\/zephir,phalcon\/zephir,aaam\/zephir,dreamsxin\/zephir,KorsaR-ZN\/zephir,fezfez\/zephir,vpg\/zephir,janusnic\/zephir,phalcon\/zephir,fezfez\/zephir,dreamsxin\/zephir,sjinks\/zephir,ovr\/zephir,KorsaR-ZN\/zephir,patrick-zippenfenig\/zephir,gsouf\/zephir,fezfez\/zephir,sergeyklay\/zephir,vpg\/zephir,zephir-lang\/zephir,patrick-zippenfenig\/zephir,ovr\/zephir,vpg\/zephir,dreamsxin\/zephir,patrick-zippenfenig\/zephir,carlmcdade\/zephir,ovr\/zephir,phalcon\/zephir,steffengy\/zephir,aaam\/zephir,joeyhub\/zephir,gsouf\/zephir,steffengy\/zephir,carlmcdade\/zephir,phalcon\/zephir,cesarmarinhorj\/zephir,sergeyklay\/zephir,joeyhub\/zephir,gsouf\/zephir,aaam\/zephir,aaam\/zephir,aaam\/zephir,fezfez\/zephir","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/kernel\/operators.c\n+++ ext\/kernel\/operators.c\n@@ -441,6 +441,15 @@\n \tdouble double_value = 0;\n \n \tswitch (Z_TYPE_P(op)) {\n+ case IS_ARRAY:\n+ return zend_hash_num_elements(Z_ARRVAL_P(op)) ? (double) 1 : 0;\n+ break;\n+#if PHP_VERSION_ID > 50400\n+\t case IS_CALLABLE:\n+#endif\n+\t case IS_RESOURCE:\n+\t case IS_OBJECT:\n+\t return (double) 1;\n \t\tcase IS_LONG:\n \t\t\treturn (double) Z_LVAL_P(op);\n \t\tcase IS_BOOL:\n"} {"commit":"798dc2391dfc2dd547418a7f77587854e322ea9b","subject":"Make Magic::new accept an array of paths from which to load the Magic database.","message":"Make Magic::new accept an array of paths from which to load the Magic database.\n\nSigned-off-by: Krzysztof Wilczynski <9bf091559fc98493329f7d619638c79e91ccf029@linux.com>\n","repos":"kwilczynski\/ruby-magic,kwilczynski\/ruby-magic","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ext\/magic\/ruby-magic.c\n+++ ext\/magic\/ruby-magic.c\n@@ -103,6 +103,7 @@\n ma.file.path = NULL;\n \n rb_ivar_set(object, id_at_flags, INT2NUM(ma.flags));\n+ rb_mgc_load(object, arguments);\n \n if (!RARRAY_EMPTY_P(arguments)) {\n rb_mgc_load(object, arguments);\n"} {"commit":"9c967d1cb75cdbe516b6019256f64abd98e8d83d","subject":"fix(lmdb): build","message":"fix(lmdb): build\n","repos":"LWJGL\/lwjgl3,code-disaster\/lwjgl3,code-disaster\/lwjgl3,LWJGL-CI\/lwjgl3,TheMrMilchmann\/lwjgl3,TheMrMilchmann\/lwjgl3,code-disaster\/lwjgl3,LWJGL\/lwjgl3,LWJGL-CI\/lwjgl3,LWJGL\/lwjgl3,TheMrMilchmann\/lwjgl3,LWJGL-CI\/lwjgl3,LWJGL-CI\/lwjgl3,code-disaster\/lwjgl3,LWJGL\/lwjgl3,TheMrMilchmann\/lwjgl3","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/lwjgl\/lmdb\/src\/main\/c\/mdb.c\n+++ modules\/lwjgl\/lmdb\/src\/main\/c\/mdb.c\n@@ -32,14 +32,6 @@\n * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF\n * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n *\/\n-#include \"lwjgl_malloc.h\"\n-#define LMDB_MALLOC(sz) org_lwjgl_malloc(sz)\n-#define LMDB_CALLOC(n,sz) org_lwjgl_calloc(n,sz)\n-#define LMDB_REALLOC(p,sz) org_lwjgl_realloc(p,sz)\n-#define LMDB_FREE(p) org_lwjgl_free(p)\n-#define LMDB_ALIGNED_ALLOC(al,sz) org_lwjgl_aligned_alloc(al,sz)\n-#define LMDB_ALIGNED_FREE(p) org_lwjgl_aligned_free(p)\n-\n #ifndef _GNU_SOURCE\n #define _GNU_SOURCE 1\n #endif\n@@ -144,6 +136,14 @@\n #include <stdlib.h>\n #include <string.h>\n #include <time.h>\n+\n+#include \"lwjgl_malloc.h\"\n+#define LMDB_MALLOC(sz) org_lwjgl_malloc(sz)\n+#define LMDB_CALLOC(n,sz) org_lwjgl_calloc(n,sz)\n+#define LMDB_REALLOC(p,sz) org_lwjgl_realloc(p,sz)\n+#define LMDB_FREE(p) org_lwjgl_free(p)\n+#define LMDB_ALIGNED_ALLOC(al,sz) org_lwjgl_aligned_alloc(al,sz)\n+#define LMDB_ALIGNED_FREE(p) org_lwjgl_aligned_free(p)\n \n #ifdef _MSC_VER\n #include <io.h>\n"} {"commit":"5864c961deb0cbf5127bf312777491d7c6ceadb7","subject":"use a default sample rate, reset level when max voices is set","message":"use a default sample rate, reset level when max voices is set\n","repos":"hodefoting\/lyd,hodefoting\/lyd,hodefoting\/lyd","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lyd\/lyd.c\n+++ lyd\/lyd.c\n@@ -641,6 +641,7 @@\n #endif\n \n lyd_add_pre_cb (lyd, (void*)lyd_midi_iterate, NULL);\n+ lyd_set_sample_rate (lyd, 48000);\n lyd_set_voice_count (lyd, 5);\n \n \/*\n@@ -858,6 +859,7 @@\n {\n lyd->voice_count = voice_count;\n lyd->i_voice_count = 1.0 \/ voice_count;\n+ lyd->level = 0.0;\n }\n \n int lyd_get_voice_count (Lyd *lyd)\n"} {"commit":"4f430cca936188c9de6dc2193774aeff4b2415ff","subject":"Adjust documentation for baltzo_zoneinfo","message":"Adjust documentation for baltzo_zoneinfo\n","repos":"bloomberg\/bde,bloomberg\/bde,che2\/bde,bloomberg\/bde,che2\/bde,bloomberg\/bde,che2\/bde,bloomberg\/bde,che2\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bal\/baltzo\/baltzo_zoneinfo.h\n+++ groups\/bal\/baltzo\/baltzo_zoneinfo.h\n@@ -571,7 +571,7 @@\n \/\/ Return an iterator providing non-modifiable access to the transition\n \/\/ that holds the local-time descriptor associated with the specified\n \/\/ 'utcTime'. The behavior is undefined unless 'numTransitions() > 0'\n- \/\/ and 'utcTime' is later than the transition returned by\n+ \/\/ and 'utcTime' is at or after the transition returned by\n \/\/ 'firstTransition'.\n \n const ZoneinfoTransition& firstTransition() const;\n"} {"commit":"d9e325dd05256a9eeea05770dd81a4ede855a1e1","subject":"Stub out getpass() in keytool on Win32 systems","message":"Stub out getpass() in keytool on Win32 systems\n","repos":"rweather\/noise-c,rweather\/noise-c,rweather\/noise-c,rweather\/noise-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/keytool\/keytool.c\n+++ tools\/keytool\/keytool.c\n@@ -92,6 +92,10 @@\n \n char *ask_for_passphrase(int confirm)\n {\n+#if defined(__WIN32__) || defined(WIN32)\n+ \/* TODO *\/\n+ return 0;\n+#else\n char *pp = getpass(\"Passphrase: \");\n char *np;\n if (!pp) {\n@@ -115,4 +119,5 @@\n }\n noise_clean(np, strlen(np));\n return passphrase;\n+#endif\n }\n"} {"commit":"8620e64f1d61af17a252980e1e454954aa7743fe","subject":"bdlb_randomdevice: fixes typo in component doc","message":"bdlb_randomdevice: fixes typo in component doc\n","repos":"dharesign\/bde,apaprocki\/bde,osubboo\/bde,che2\/bde,che2\/bde,bloomberg\/bde,osubboo\/bde,bloomberg\/bde,apaprocki\/bde,osubboo\/bde,che2\/bde,apaprocki\/bde,apaprocki\/bde,bloomberg\/bde,dharesign\/bde,bloomberg\/bde,bowlofstew\/bde,bowlofstew\/bde,saxena84\/bde,saxena84\/bde,bowlofstew\/bde,apaprocki\/bde,dharesign\/bde,saxena84\/bde,saxena84\/bde,che2\/bde,dharesign\/bde,bloomberg\/bde,osubboo\/bde,bowlofstew\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bdl\/bdlb\/bdlb_randomdevice.h\n+++ groups\/bdl\/bdlb\/bdlb_randomdevice.h\n@@ -23,7 +23,7 @@\n \/\/ these calls is strongly dependent on the underlying system. On UNIX-like\n \/\/ platforms 'genRandomBytes()' reads from '\/dev\/random' and\n \/\/ 'genRandonBytesNonBlocking()' reads from '\/dev\/urandom'. On Windows both\n-\/\/ methods use 'CrypGenRandom'.\n+\/\/ methods use 'CryptGenRandom'.\n \/\/\n \/\/ Note that it is not appropriate to use these functions to generate many\n \/\/ random numbers, because they are likely to exhaust available entropy and\n"} {"commit":"e8f16c37a8640e7d73ded9abaa393734bf03e5b8","subject":"Adopt commit 38c63ae from master: Merge pull request #185 from dgoffred\/managedptr-elementtype-drqs-78683245","message":"Adopt commit 38c63ae from master: Merge pull request #185 from dgoffred\/managedptr-elementtype-drqs-78683245\n\ncommit 38c63ae83d3ee88e04351ce83450fcf7fe9ee1cf\nMerge: 4afe985 3140686\nAuthor: Henry Verschell <hverschell@bloomberg.net>\nDate: Wed Mar 23 16:55:59 2016 -0400\n\n Merge pull request #185 from dgoffred\/managedptr-elementtype-drqs-78683245\n\n Added element_type typedef to bslma::ManagedPtr DRQS 78683245\n\ncommit 31406863f26ad7138a80aba74a0eb818f5d3b22b\nAuthor: David Goffredo <dgoffredo@bloomberg.net>\nDate: Tue Feb 23 15:24:15 2016 -0500\n\n Added element_type typedef to bslma::ManagedPtr\n\n - More in line with std::auto_ptr, bsl::shared_ptr, and std::unique_ptr\n - Better allows C++03 traits to be used to to get the type of *ptr for\n arbitrary pointer types, as is done in googlemock\n - See DRQS 78683245\n","repos":"apaprocki\/bde,bowlofstew\/bde,dharesign\/bde,bowlofstew\/bde,apaprocki\/bde,bloomberg\/bde,bloomberg\/bde,che2\/bde,apaprocki\/bde,che2\/bde,apaprocki\/bde,bloomberg\/bde,bowlofstew\/bde,dharesign\/bde,dharesign\/bde,bloomberg\/bde,che2\/bde,dharesign\/bde,apaprocki\/bde,che2\/bde,bowlofstew\/bde,bloomberg\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bsl\/bslma\/bslma_managedptr.h\n+++ groups\/bsl\/bslma\/bslma_managedptr.h\n@@ -823,6 +823,14 @@\n \/\/ Alias for a function-pointer type for functions used to destroy the\n \/\/ object managed by a 'ManagedPtr' object.\n \n+ typedef TARGET_TYPE element_type;\n+ \/\/ Alias to the 'TARGET_TYPE' template parameter.\n+ \/\/ Note that 'element_type' refers to the same type as 'ElementType'.\n+ \n+ typedef TARGET_TYPE ElementType;\n+ \/\/ Alias to the 'TARGET_TYPE' template parameter.\n+ \/\/ Note that 'ElementType' refers to the same type as 'element_type'.\n+\n private:\n \/\/ PRIVATE TYPES\n typedef typename bsls::UnspecifiedBool<ManagedPtr>::BoolType BoolType;\n"} {"commit":"3f1d086ce876cf545dfc5d90e49c6bef57e1e0bd","subject":"Rubinius does not have T_ZOMBIE defined, nor its semantics","message":"Rubinius does not have T_ZOMBIE defined, nor its semantics\n","repos":"arthurdandrea\/rbuv,arthurdandrea\/rbuv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/rbuv\/rbuv_handle.c\n+++ ext\/rbuv\/rbuv_handle.c\n@@ -54,12 +54,18 @@\n RBUV_DEBUG_LOG_DETAIL(\"rbuv_handle: %p, uv_handle: %p\", rbuv_handle, rbuv_handle->uv_handle);\n if ((TYPE(rbuv_handle->loop) != T_NONE) && (rbuv_handle->loop != Qnil)) {\n \n+#ifdef RBUV_RBX\n+ rbuv_loop_t *rbuv_loop;\n+ rbuv_loop = (rbuv_loop_t*)DATA_PTR(rbuv_handle->loop);\n+ rbuv_loop_unregister_handle(rbuv_loop, rbuv_handle);\n+#else\n \/\/ dont call if the loop is about to be GC'd\n if (TYPE(rbuv_handle->loop) != T_ZOMBIE) {\n rbuv_loop_t *rbuv_loop;\n rbuv_loop = (rbuv_loop_t*)DATA_PTR(rbuv_handle->loop);\n rbuv_loop_unregister_handle(rbuv_loop, rbuv_handle);\n }\n+#endif\n if (rbuv_handle->uv_handle != NULL) {\n if (_rbuv_handle_is_closing(rbuv_handle)) {\n rb_warn(\"The GC freed the Rbuv::Handle before #close completed.Consider using Rbuv::Loop#dispose\\n\");\n"} {"commit":"2619d62799ec8537c7992c372726bd6dce46a32f","subject":"droidcamsrc: fix the if condition in gst_droidcamsrc_dev_compressed_image_callback","message":"droidcamsrc: fix the if condition in gst_droidcamsrc_dev_compressed_image_callback\n\nI got the if condition wrong which lead to ignoring the data in compressed_image_cb() so fix it\n","repos":"foolab\/gst-droid,sailfishos\/gst-droid,mlehtima\/gst-droid,mlehtima\/gst-droid,foolab\/gst-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/droidcamsrc\/gstdroidcamsrcdev.c\n+++ gst\/droidcamsrc\/gstdroidcamsrcdev.c\n@@ -178,37 +178,38 @@\n if (!data) {\n GST_ERROR_OBJECT (src, \"invalid memory from camera hal\");\n return;\n-\n- \/* TODO: research a way to get rid of the memcpy *\/\n- d = g_malloc (size);\n- memcpy (d, data, size);\n- buffer = gst_buffer_new_wrapped (d, size);\n- if (!dev->img->image_preview_sent) {\n- gst_droidcamsrc_post_message (src,\n-\t\t\t\t gst_structure_new_empty (GST_DROIDCAMSRC_CAPTURE_END));\n- \/* TODO: generate and send preview if we don't get it from HAL *\/\n- dev->img->image_preview_sent = TRUE;\n- }\n-\n- gst_droidcamsrc_timestamp (src, buffer);\n-\n- tags = gst_droidcamsrc_exif_tags_from_jpeg_data (d, size);\n- if (tags) {\n- GST_INFO_OBJECT (src, \"pushing tags %\" GST_PTR_FORMAT, tags);\n- event = gst_event_new_tag (tags);\n- }\n-\n- g_mutex_lock (&dev->imgsrc->queue_lock);\n-\n- if (event) {\n- src->imgsrc->pending_events =\n-\tg_list_append (src->imgsrc->pending_events, event);\n- }\n-\n- g_queue_push_tail (dev->imgsrc->queue, buffer);\n- g_cond_signal (&dev->imgsrc->cond);\n- g_mutex_unlock (&dev->imgsrc->queue_lock);\n- }\n+ }\n+\n+ \/* TODO: research a way to get rid of the memcpy *\/\n+ d = g_malloc (size);\n+ memcpy (d, data, size);\n+ buffer = gst_buffer_new_wrapped (d, size);\n+ if (!dev->img->image_preview_sent) {\n+ gst_droidcamsrc_post_message (src,\n+\t\t\t\t gst_structure_new_empty (GST_DROIDCAMSRC_CAPTURE_END));\n+ \/* TODO: generate and send preview if we don't get it from HAL *\/\n+ dev->img->image_preview_sent = TRUE;\n+ }\n+\n+ gst_droidcamsrc_timestamp (src, buffer);\n+\n+ tags = gst_droidcamsrc_exif_tags_from_jpeg_data (d, size);\n+ if (tags) {\n+ GST_INFO_OBJECT (src, \"pushing tags %\" GST_PTR_FORMAT, tags);\n+ event = gst_event_new_tag (tags);\n+ }\n+\n+ g_mutex_lock (&dev->imgsrc->queue_lock);\n+\n+ \/\/ TODO: get the correct lock\n+ if (event) {\n+ src->imgsrc->pending_events =\n+ g_list_append (src->imgsrc->pending_events, event);\n+ }\n+\n+ g_queue_push_tail (dev->imgsrc->queue, buffer);\n+ g_cond_signal (&dev->imgsrc->cond);\n+ g_mutex_unlock (&dev->imgsrc->queue_lock);\n \n \/* we need to start restart the preview\n * android demands this but GStreamer does not know about it.\n"} {"commit":"87452d67f56ea67eceab9313e326ab8081594e3a","subject":"Fix memory leak (#312)","message":"Fix memory leak (#312)\n\n`AcquireExceptionInfo()` allocates the memory area for handling exception in ImageMagick.\r\nHowever, Ruby's GC does not manage its memory area.\r\nSo, `rmagick` must release them after handling exception by using `DestroyExceptionInfo()`.\r\n\r\n* Before\r\n```\r\n$ ruby rmagick.rb\r\nProcess: 76636: RSS = 133 MB\r\n```\r\n\r\n* After\r\n```\r\n$ ruby rmagick.rb\r\nProcess: 77939: RSS = 10 MB\r\n```\r\n\r\n* Test code\r\n```ruby\r\nrequire 'rmagick'\r\n\r\nimage = Magick::Image.new(20, 20)\r\nsource = Magick::Image.new(20, 20)\r\n\r\n100000.times do |i|\r\n image.gray?\r\n image.sparse_color(Magick::VoronoiColorInterpolate, 0, 0, 'red')\r\n Magick::Image.combine(image, source)\r\n\r\n GC.start\r\nend\r\n\r\nrss = `ps -o rss= -p #{Process.pid}`.to_i \/ 1024\r\nputs \"Process: #{Process.pid}: RSS = #{rss} MB\"\r\n```","repos":"rmagick\/rmagick,rmagick\/rmagick,rmagick\/rmagick","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/RMagick\/rmimage.c\n+++ ext\/RMagick\/rmimage.c\n@@ -3163,6 +3163,7 @@\n ReverseImageList(&images);\n new_image = CombineImages(images, channel, exception);\n rm_check_exception(exception, images, RetainOnError);\n+ (void) DestroyExceptionInfo(exception);\n rm_split(images);\n \n rm_ensure_result(new_image);\n@@ -7239,6 +7240,7 @@\n \n r = (attr_test)(image, exception);\n CHECK_EXCEPTION()\n+ (void) DestroyExceptionInfo(exception);\n \n return r ? Qtrue : Qfalse;\n }\n@@ -12813,6 +12815,7 @@\n new_image = SparseColorImage(image, channels, method, nargs, args, exception);\n xfree(args);\n CHECK_EXCEPTION();\n+ (void) DestroyExceptionInfo(exception);\n rm_ensure_result(new_image);\n \n RB_GC_GUARD(args);\n"} {"commit":"504765403fa7d9104d386311f36d5e7fea35d186","subject":"Fixed bug returning nonclipped x\/y, though clipped x\/y were used to blit.","message":"Fixed bug returning nonclipped x\/y, though clipped x\/y were used to blit.\n\n","repos":"singpolyma\/rubygame,singpolyma\/rubygame,Dami-coding\/rubygame,rubygame\/rubygame,firstval\/rubygame","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/rubygame\/surface.c\n+++ ext\/rubygame\/surface.c\n@@ -296,7 +296,7 @@\n \tSDL_BlitSurface(src,src_rect,dest,blit_rect);\n \n \treturnrect = rb_funcall(cRect,rb_intern(\"new\"),4,\n-\t\tINT2NUM(blit_x),INT2NUM(blit_y),\\\n+\t\tINT2NUM(left),INT2NUM(top),\\\n \t\tINT2NUM(blit_w),INT2NUM(blit_h));\n \n \tfree(blit_rect);\n"} {"commit":"c7832c355239b00aec476729e35987825db6ebf3","subject":"Update RhoThreadImpl.h","message":"Update RhoThreadImpl.h\n\nAdding critical section to avoid race condition for Waitthread delete in wait() and terminate in stopwait() function.\n","repos":"louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes,louisatome\/rhodes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platform\/shared\/qt\/rhodes\/impl\/RhoThreadImpl.h\n+++ platform\/shared\/qt\/rhodes\/impl\/RhoThreadImpl.h\n@@ -62,7 +62,8 @@\n QThread* m_waitThread;\n #if defined(OS_WINDOWS_DESKTOP)\n \tCRITICAL_SECTION gCS;\n-\t#endif\n+\tCRITICAL_SECTION gCSstopwait;\n+ #endif\n };\n \n }\n"} {"commit":"9532788959b35778fc15ea5f3c91275ee6214658","subject":"Add job list to machine","message":"Add job list to machine\n","repos":"mattportas\/yejong","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- machine.h\n+++ machine.h\n@@ -2,6 +2,9 @@\n #define __MACHINE_H__\n \n #include <string>\n+#include <vector>\n+\n+#include \"job.h\"\n \n class Machine\n {\n@@ -10,6 +13,7 @@\n const std::string& get_name() const;\n private:\n std::string name;\n+ std::vector<Job> jobs;\n };\n \n #endif \/* __MACHINE_H__ *\/\n"} {"commit":"7529cdce2d5a32c5d53b9e6d4cdd5c757e77c940","subject":"rawconference: Set initial valve drop settings after creation.","message":"rawconference: Set initial valve drop settings after creation.\n","repos":"kakaroto\/farstream,tieto\/farstream,tieto\/farstream,kakaroto\/farstream,shadeslayer\/farstream,kakaroto\/farstream,pexip\/farstream,shadeslayer\/farstream,tieto\/farstream,tieto\/farstream,shadeslayer\/farstream,pexip\/farstream,pexip\/farstream,tieto\/farstream,kakaroto\/farstream,pexip\/farstream,shadeslayer\/farstream","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrawconference\/fs-raw-stream.c\n+++ gst\/fsrawconference\/fs-raw-stream.c\n@@ -629,6 +629,13 @@\n return;\n }\n \n+ if (self->priv->recv_valve)\n+ g_object_set (self->priv->recv_valve, \"drop\",\n+ (self->priv->direction & FS_DIRECTION_RECV) ? FALSE : TRUE, NULL);\n+ if (self->priv->session->valve)\n+ g_object_set (self->priv->session->valve, \"drop\",\n+ (self->priv->direction & FS_DIRECTION_SEND) ? FALSE : TRUE, NULL);\n+\n if (G_OBJECT_CLASS (fs_raw_stream_parent_class)->constructed)\n G_OBJECT_CLASS (fs_raw_stream_parent_class)->constructed (object);\n }\n"} {"commit":"03997fc3203025aa5f22ea3025a08db250f0cbb8","subject":"Update a bit of documentation for conn.encrypted? and conn.secure?","message":"Update a bit of documentation for conn.encrypted? and conn.secure?\n\nSigned-off-by: Chris Lalancette <60b62644009db6b194cc0445b64e9b27bb26433a@redhat.com>\n","repos":"libvirt\/ruby-libvirt,libvirt\/ruby-libvirt,libvirt\/ruby-libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/libvirt\/connect.c\n+++ ext\/libvirt\/connect.c\n@@ -294,7 +294,7 @@\n * call-seq:\n * conn.encrypted?\n *\n- * Return +true+ if the connection is encrypted, +false+ if it is not\n+ * Call +virConnectIsEncrypted+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virConnectIsEncrypted]\n *\/\n static VALUE libvirt_conn_encrypted_p(VALUE s) {\n gen_call_truefalse(virConnectIsEncrypted, conn(s), connect_get(s));\n@@ -306,7 +306,7 @@\n * call-seq:\n * conn.secure?\n *\n- * Return +true+ if the connection is secure, +false+ if it is not\n+ * Call +virConnectIsEncrypted+[http:\/\/www.libvirt.org\/html\/libvirt-libvirt.html#virConnectIsEncrypted]\n *\/\n static VALUE libvirt_conn_secure_p(VALUE s) {\n gen_call_truefalse(virConnectIsSecure, conn(s), connect_get(s));\n"} {"commit":"21e6a054bf6be068a25e07b25ec94541ec9b85c2","subject":"tidy","message":"tidy\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@23945 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -933,17 +933,20 @@\n \tbml->bml_flags |= BML_BMI;\n \n \tif (rw == SL_WRITE) {\n-\t\t\/* Drop the lock prior to doing disk and possibly network\n-\t\t * I\/O.\n+\t\t\/*\n+\t\t * Drop the lock prior to doing disk and possibly\n+\t\t * network I\/O.\n \t\t *\/\n \t\tb->bcm_flags |= BMAP_IONASSIGN;\n \n-\t\t\/* For any given chain of leases, the bmi_[readers|writers]\n-\t\t * value may only be 1rd or 1wr. In the case where 2\n-\t\t * wtrs are present, the value is 1wr. Mixed readers and\n-\t\t * wtrs == 1wtr. 1-N rdrs, 1rd.\n-\t\t * Only increment writers if this is the first\n-\t\t * write lease from the respective client.\n+\t\t\/*\n+\t\t * For any given chain of leases, the\n+\t\t * bmi_[readers|writers] value may only be 1rd or 1wr.\n+\t\t * In the case where 2 wtrs are present, the value is\n+\t\t * 1wr. Mixed readers and wtrs == 1wtr. 1-N rdrs, 1rd.\n+\t\t *\n+\t\t * Only increment writers if this is the first write\n+\t\t * lease from the respective client.\n \t\t *\/\n \t\tif (!wlease) {\n \t\t\t\/* This is the first write from the client. *\/\n@@ -967,7 +970,8 @@\n \t\t\trc = mds_bmap_ios_restart(bml);\n \n \t\t} else if (!wlease && bmi->bmi_writers == 1) {\n-\t\t\t\/* No duplicate lease detected and this client\n+\t\t\t\/*\n+\t\t\t * No duplicate lease detected and this client\n \t\t\t * is the first writer.\n \t\t\t *\/\n \t\t\tpsc_assert(!bmi->bmi_wr_ion);\n@@ -1299,7 +1303,7 @@\n \t\tsbd = &mq->sbd[i];\n \n \t\tfg.fg_fid = sbd->sbd_fg.fg_fid;\n-\t\tfg.fg_gen = 0;\n+\t\tfg.fg_gen = 0; \/\/ XXX FGEN_ANY\n \n \t\tif (slm_fcmh_get(&fg, &f))\n \t\t\tcontinue;\n"} {"commit":"486343f7a4d156615f7b0b9ba7984743e4c2765c","subject":"Oops, emit_by_name doesnt take a separate detail argument","message":"Oops, emit_by_name doesnt take a separate detail argument\n","repos":"pexip\/farstream,kakaroto\/farstream,tieto\/farstream,kakaroto\/farstream,kakaroto\/farstream,shadeslayer\/farstream,tieto\/farstream,shadeslayer\/farstream,ahmedammar\/skype_farsight2,pexip\/farstream,tieto\/farstream,tieto\/farstream,tieto\/farstream,pexip\/farstream,shadeslayer\/farstream,pexip\/farstream,ahmedammar\/skype_farsight2,shadeslayer\/farstream,kakaroto\/farstream,ahmedammar\/skype_farsight2,ahmedammar\/skype_farsight2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/fsrtpconference\/fs-rtp-stream.c\n+++ gst\/fsrtpconference\/fs-rtp-stream.c\n@@ -481,7 +481,7 @@\n {\n FsRtpStream *self = FS_RTP_STREAM (user_data);\n \n- g_signal_emit_by_name (self, \"local-candidates-prepared\", 0);\n+ g_signal_emit_by_name (self, \"local-candidates-prepared\");\n }\n \n \n@@ -494,7 +494,7 @@\n {\n FsRtpStream *self = FS_RTP_STREAM (user_data);\n \n- g_signal_emit_by_name (self, \"new-active-candidate-pair\", 0,\n+ g_signal_emit_by_name (self, \"new-active-candidate-pair\",\n candidate1, candidate2);\n }\n \n@@ -507,7 +507,7 @@\n {\n FsRtpStream *self = FS_RTP_STREAM (user_data);\n \n- g_signal_emit_by_name (self, \"new-local-candidate\", 0, candidate);\n+ g_signal_emit_by_name (self, \"new-local-candidate\", candidate);\n }\n \n static void\n@@ -520,7 +520,7 @@\n {\n FsRtpStream *self = FS_RTP_STREAM (user_data);\n \n- g_signal_emit_by_name (self, \"error\", 0, errorno, error_msg, debug_msg);\n+ g_signal_emit_by_name (self, \"error\", errorno, error_msg, debug_msg);\n }\n \n \n"} {"commit":"3a54cc92067875f0bc04e6877b36f4f15fc0d6ef","subject":"_getTable() optimization","message":"_getTable() optimization\n","repos":"Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,Zaszczyk\/cphalcon,Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ext\/mvc\/model\/query.c\n+++ ext\/mvc\/model\/query.c\n@@ -1221,31 +1221,27 @@\n PHP_METHOD(Phalcon_Mvc_Model_Query, _getTable){\n \n \tzval *manager, *qualified_name, *model_name;\n-\tzval *model, *source, *schema, *complete_source;\n+\tzval *model, *source, *schema;\n \n \tPHALCON_MM_GROW();\n \n \tphalcon_fetch_params(1, 2, 0, &manager, &qualified_name);\n \t\n-\tif (phalcon_array_isset_string(qualified_name, SS(\"name\"))) {\n-\t\n-\t\tPHALCON_OBS_VAR(model_name);\n-\t\tphalcon_array_fetch_string(&model_name, qualified_name, SL(\"name\"), PH_NOISY);\n-\t\n-\t\tPHALCON_INIT_VAR(model);\n-\t\tphalcon_call_method_p1(model, manager, \"load\", model_name);\n-\t\n-\t\tPHALCON_INIT_VAR(source);\n-\t\tphalcon_call_method(source, model, \"getsource\");\n-\t\n-\t\tPHALCON_INIT_VAR(schema);\n-\t\tphalcon_call_method(schema, model, \"getschema\");\n+\tif (phalcon_array_isset_string_fetch(&model_name, qualified_name, SS(\"name\"))) {\n+\t\n+\t\tPHALCON_OBS_VAR(model);\n+\t\tphalcon_call_method_p1_ex(model, &model, manager, \"load\", model_name);\n+\t\n+\t\tPHALCON_OBS_VAR(source);\n+\t\tphalcon_call_method_p0_ex(source, &source, model, \"getsource\");\n+\t\n+\t\tPHALCON_OBS_VAR(schema);\n+\t\tphalcon_call_method_p0_ex(schema, &schema, model, \"getschema\");\n \t\tif (zend_is_true(schema)) {\n-\t\t\tPHALCON_INIT_VAR(complete_source);\n-\t\t\tarray_init_size(complete_source, 2);\n-\t\t\tphalcon_array_append(&complete_source, schema, PH_SEPARATE);\n-\t\t\tphalcon_array_append(&complete_source, source, PH_SEPARATE);\n-\t\t\tRETURN_CTOR(complete_source);\n+\t\t\tarray_init_size(return_value, 2);\n+\t\t\tphalcon_array_append(&return_value, schema, 0);\n+\t\t\tphalcon_array_append(&return_value, source, 0);\n+\t\t\tRETURN_MM();\n \t\t}\n \t\n \t\tRETURN_CCTOR(source);\n"} {"commit":"06a9242b6ebcea6ace339a2f486b7395255734a3","subject":"Oops, barrier should be a macro","message":"Oops, barrier should be a macro\n","repos":"bowlofstew\/sv6,aclements\/sv6,aclements\/sv6,aclements\/sv6,aclements\/sv6,aclements\/sv6,bowlofstew\/sv6,bowlofstew\/sv6,bowlofstew\/sv6,bowlofstew\/sv6","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- compiler.h\n+++ compiler.h\n@@ -1,9 +1,4 @@\n #define __padout__ char __padout[0] __attribute__((aligned(CACHELINE)))\n #define __mpalign__ __attribute__((aligned(CACHELINE)))\n #define __noret__ __attribute__((noreturn))\n-\n-static inline void\n-barrier(void)\n-{\n- __asm volatile(\"\" ::: \"memory\");\n-}\n+#define barrier() __asm volatile(\"\" ::: \"memory\")\n"} {"commit":"c99a7ddd5601085dbc872d3f4bee5f9a90fbf633","subject":"Remember the number of IOS to contact.","message":"Remember the number of IOS to contact.\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -2054,13 +2054,17 @@\n \tstruct fidc_membh *f;\n \tstruct bmap *b;\n \tsl_bmapno_t i;\n+\tstruct fcmh_mds_info *fmi;\n \n \tf = wk->f;\n+\tfmi = fcmh_2_fmi(f);\n \n \tbrepls_init(tract, -1);\n \ttract[BREPLST_VALID] = BREPLST_TRUNCPNDG;\n \n+\t\/* get the number of replies we expect *\/\n \tios_list.nios = 0;\n+\tfmi->fmi_ptrunc_nios = 0;\n \n \ti = fcmh_2_fsz(f) \/ SLASH_BMAP_SIZE;\n \tif (fcmh_2_fsz(f) % SLASH_BMAP_SIZE) {\n@@ -2072,14 +2076,17 @@\n \t\t\tBMAP_ULOCK(b);\n \t\t\tmds_repl_bmap_walkcb(b, tract, NULL, 0,\n \t\t\t ptrunc_tally_ios, &ios_list);\n-\t\t\tmds_bmap_write_repls_rel(b);\n-\n-\t\t\t\/*\n-\t\t\t * Queue work immediately instead of waiting for\n-\t\t\t * it to be causally paged to reduce latency to\n-\t\t\t * the client.\n-\t\t\t *\/\n-\t\t\tupsch_enqueue(bmap_2_upd(b));\n+\t\t\tfmi->fmi_ptrunc_nios = ios_list.nios;\n+\t\t\tif (fmi->fmi_ptrunc_nios) {\n+\t\t\t\tmds_bmap_write_repls_rel(b);\n+\t\t\t\t\/*\n+\t\t\t\t * Queue work immediately instead \n+\t\t\t\t * of waiting for it to be causally \n+\t\t\t\t * paged to reduce latency to the \n+\t\t\t\t * client.\n+\t\t\t\t *\/\n+\t\t\t\tupsch_enqueue(bmap_2_upd(b));\n+\t\t\t}\n \t\t}\n \t\ti++;\n \t} else {\n"} {"commit":"68a9209408c51d822d2a28239a86d6311a4bbd22","subject":"rtpjitterbuffer: Keep the DTS estimate if we got no DTS after a jitterbuffer reset","message":"rtpjitterbuffer: Keep the DTS estimate if we got no DTS after a jitterbuffer reset\n\nOtherwise we will just output buffers without timestamps after a reset if no\ntimestamps are provided by upstream, e.g. when using RTSP over TCP.\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=749536\n","repos":"rawoul\/gst-plugins-good,GStreamer\/gst-plugins-good,sebras\/gst-plugins-good,StreamUtils\/gst-plugins-good,StreamUtils\/gst-plugins-good,pexip\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,sebras\/gst-plugins-good,Kurento\/gst-plugins-good,pexip\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,GStreamer\/gst-plugins-good,stfl\/gst-plugins-good,Kurento\/gst-plugins-good,hizukiayaka\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,stfl\/gst-plugins-good,Kurento\/gst-plugins-good,StreamUtils\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,hizukiayaka\/gst-plugins-good,hizukiayaka\/gst-plugins-good,sebras\/gst-plugins-good,rawoul\/gst-plugins-good,stfl\/gst-plugins-good,rawoul\/gst-plugins-good,pexip\/gst-plugins-good,sebras\/gst-plugins-good,Kurento\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,hizukiayaka\/gst-plugins-good,StreamUtils\/gst-plugins-good,stfl\/gst-plugins-good,rawoul\/gst-plugins-good,Kurento\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -2402,7 +2402,13 @@\n * clock now to have something to calculate with in the future. *\/\n dts = get_current_running_time (jitterbuffer);\n pts = dts;\n- estimated_dts = TRUE;\n+\n+ \/* Remember that we estimated the DTS if we are running already\n+ * and this is not our first packet (or first packet after a reset).\n+ * If it's the first packet, we somehow must generate a timestamp for\n+ * everything, otherwise we can't calculate any times\n+ *\/\n+ estimated_dts = (priv->next_in_seqnum != -1);\n } else {\n \/* take the DTS of the buffer. This is the time when the packet was\n * received and is used to calculate jitter and clock skew. We will adjust\n"} {"commit":"eb1f1f7abe1f8fd995ee4bcafe66dc163716acd9","subject":"Fix card layer icons to be alpha blended.","message":"Fix card layer icons to be alpha blended.\n","repos":"youtux\/pebblejs,Scoutski\/pebblejs,youtux\/PebbleShows,arekom\/pebble-github,bkbilly\/Tvheadend-EPG,sunshineyyy\/CatchOneBus,gwijsman\/OpenRemotePebble,stephanpavlovic\/pebble-kicker-app,carlo-colombo\/dublin-bus-pebble,youtux\/pebblejs,stephanpavlovic\/pebble-kicker-app,pebble\/pebblejs,fletchto99\/pebblejs,effata\/pebblejs,youtux\/pebblejs,bkbilly\/Tvheadend-EPG,demophoon\/Trimet-Tracker,frizzr\/CatchOneBus,tbloncar\/pebble-sitestatus,dhpark\/pebblejs,lavinjj\/pebblejs,effata\/pebblejs,pebble\/pebblejs,dhpark\/pebblejs,gwijsman\/OpenRemotePebble,zanesalvatore\/transit-watcher,jiangege\/pebblejs-project,pebble\/pebblejs,sunshineyyy\/CatchOneBus,sunshineyyy\/CatchOneBus,lavinjj\/pebblejs,bkbilly\/Tvheadend-EPG,lavinjj\/pebblejs,zanesalvatore\/transit-watcher,jiangege\/pebblejs-project,pebble\/pebblejs,fletchto99\/pebblejs,Scoutski\/pebblejs,demophoon\/Trimet-Tracker,gwijsman\/OpenRemotePebble,fletchto99\/pebblejs,zanesalvatore\/transit-watcher,zanesalvatore\/transit-watcher,lavinjj\/pebblejs,jsfi\/pebblejs,pebble\/pebblejs,daduke\/LMSController,dhpark\/pebblejs,stephanpavlovic\/pebble-kicker-app,gwijsman\/OpenRemotePebble,stephanpavlovic\/pebble-kicker-app,carlo-colombo\/dublin-bus-pebble,fletchto99\/pebblejs,arekom\/pebble-github,bkbilly\/Tvheadend-EPG,stephanpavlovic\/pebble-kicker-app,carlo-colombo\/dublin-bus-pebble,ishepard\/TransmissionTorrent,ishepard\/TransmissionTorrent,sunshineyyy\/CatchOneBus,ento\/pebblejs,jiangege\/pebblejs-project,effata\/pebblejs,effata\/pebblejs,tbloncar\/pebble-sitestatus,Scoutski\/pebblejs,arekom\/pebble-github,frizzr\/CatchOneBus,ento\/pebblejs,youtux\/PebbleShows,carlo-colombo\/dublin-bus-pebble,dhpark\/pebblejs,jsfi\/pebblejs,youtux\/PebbleShows,frizzr\/CatchOneBus,tbloncar\/pebble-sitestatus,Scoutski\/pebblejs,ento\/pebblejs,dhpark\/pebblejs,lavinjj\/pebblejs,daduke\/LMSController,youtux\/pebblejs,carlo-colombo\/dublin-bus-pebble,tbloncar\/pebble-sitestatus,Scoutski\/pebblejs,zanesalvatore\/transit-watcher,arekom\/pebble-github,effata\/pebblejs,jsfi\/pebblejs,ishepard\/TransmissionTorrent,fletchto99\/pebblejs,frizzr\/CatchOneBus,daduke\/LMSController,jsfi\/pebblejs,ishepard\/TransmissionTorrent,youtux\/PebbleShows,jiangege\/pebblejs-project,daduke\/LMSController,bkbilly\/Tvheadend-EPG,arekom\/pebble-github,gwijsman\/OpenRemotePebble,sunshineyyy\/CatchOneBus,tbloncar\/pebble-sitestatus,ishepard\/TransmissionTorrent,daduke\/LMSController,jsfi\/pebblejs,ento\/pebblejs,demophoon\/Trimet-Tracker,jiangege\/pebblejs-project,ento\/pebblejs,demophoon\/Trimet-Tracker,youtux\/pebblejs,demophoon\/Trimet-Tracker","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/simply\/simply_ui.c\n+++ src\/simply\/simply_ui.c\n@@ -246,6 +246,7 @@\n .origin = { margin_x, title_pos.y + image_offset_y },\n .size = { title_icon_bounds.size.w, title_size.h }\n };\n+ graphics_context_set_alpha_blended(ctx, true);\n graphics_draw_bitmap_centered(ctx, title_icon->bitmap, icon_frame);\n }\n if (has_title) {\n@@ -260,6 +261,7 @@\n .origin = { margin_x, subtitle_pos.y + image_offset_y },\n .size = { subtitle_icon_bounds.size.w, subtitle_size.h }\n };\n+ graphics_context_set_alpha_blended(ctx, true);\n graphics_draw_bitmap_centered(ctx, subtitle_icon->bitmap, subicon_frame);\n }\n if (has_subtitle) {\n@@ -274,6 +276,7 @@\n .origin = { 0, image_pos.y + image_offset_y },\n .size = { window_frame.size.w, body_image_bounds.size.h }\n };\n+ graphics_context_set_alpha_blended(ctx, true);\n graphics_draw_bitmap_centered(ctx, body_image->bitmap, image_frame);\n }\n if (has_body) {\n"} {"commit":"e074f514f30749afc2809976eefefdbc2fc43089","subject":"Ruby 1.9 compatibility","message":"Ruby 1.9 compatibility","repos":"pcaprub\/pcaprub,pcaprub\/pcaprub","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/pcaprub\/pcaprub.c\n+++ ext\/pcaprub\/pcaprub.c\n@@ -100,7 +100,7 @@\n \tVALUE list;\n \t\n Check_Type(dev, T_STRING);\n- if (pcap_lookupnet(STR2CSTR(dev), &net, &mask, eb) == -1) {\n+ if (pcap_lookupnet(StringValuePtr(dev), &net, &mask, eb) == -1) {\n \t\trb_raise(rb_eRuntimeError, \"%s\", eb);\n }\n \n"} {"commit":"8efa409c5063aeafa50446642621b51d42429cac","subject":"fix a really serious math problem in replication traffic calculation","message":"fix a really serious math problem in replication traffic calculation\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@25535 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -109,9 +109,15 @@\n \t\tlastbno--;\n \n \tif (fcmh_2_fsz(f)) {\n-\t\tlastslvr = (fcmh_2_fsz(f) % SLASH_BMAP_SIZE) \/\n-\t\t SLASH_SLVR_SIZE;\n+\t\toff_t bmapsize;\n+\n+\t\tbmapsize = fcmh_2_fsz(f) % SLASH_BMAP_SIZE;\n+\t\tif (bmapsize == 0)\n+\t\t\tbmapsize = SLASH_BMAP_SIZE;\n+\t\tlastslvr = (bmapsize - 1) \/ SLASH_SLVR_SIZE;\n \t\tlastsize = fcmh_2_fsz(f) % SLASH_SLVR_SIZE;\n+\t\tif (lastsize == 0)\n+\t\t\tlastsize = SLASH_SLVR_SIZE;\n \t} else {\n \t\tlastslvr = 0;\n \t\tlastsize = 0;\n"} {"commit":"6ba4402086c088d4c2b5e3b6fb03eb37f8277631","subject":"drop support for explicit unaligned memory accesses","message":"drop support for explicit unaligned memory accesses\n\nIt's unlikely anyone defined this anymore, so we'll rely on the\ncompiler for performance here. If need be, we can look at some\nhelpers like memcpy or byteswap.\n","repos":"valgur\/ncompress,valgur\/ncompress","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- compress.c\n+++ compress.c\n@@ -255,10 +255,6 @@\n #\tdefine\tBYTEORDER\t0000\n #endif\n \n-#ifndef\tNOALLIGN\n-#\tdefine\tNOALLIGN\t0\n-#endif\n-\n \/*\n * machine variants which require cc -Dmachine: pdp11, z8000, DOS\n *\/\n@@ -284,8 +280,6 @@\n #\tendif\n #\tundef\tBYTEORDER\n #\tdefine\tBYTEORDER \t4321\n-#\tundef\tNOALLIGN\n-#\tdefine\tNOALLIGN\t1\n #endif \/* DOS *\/\n \n #ifndef\tO_BINARY\n@@ -393,12 +387,6 @@\n #endif\n \t} bytes;\n } ;\n-#if BYTEORDER == 4321 && NOALLIGN == 1\n-#define\toutput(b,o,c,n)\t{\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t*(long *)&((b)[(o)>>3]) |= ((long)(c))<<((o)&0x7);\\\n-\t\t\t\t\t\t\t(o) += (n);\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t}\n-#else\n #ifdef BYTEORDER\n #define\toutput(b,o,c,n)\t{\tchar_type\t*p = &(b)[(o)>>3];\t\t\t\t\t\\\n \t\t\t\t\t\t\tunion bytes i;\t\t\t\t\t\t\t\t\t\\\n@@ -417,19 +405,11 @@\n \t\t\t\t\t\t\t(o) += (n);\t\t\t\t\t\t\t\t\t\t\\\n \t\t\t\t\t\t}\n #endif\n-#endif\n-#if BYTEORDER == 4321 && NOALLIGN == 1\n-#define\tinput(b,o,c,n,m){\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t(c) = (*(long *)(&(b)[(o)>>3])>>((o)&0x7))&(m);\t\\\n-\t\t\t\t\t\t\t(o) += (n);\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t\t\t}\n-#else\n #define\tinput(b,o,c,n,m){\tchar_type \t\t*p = &(b)[(o)>>3];\t\t\t\t\\\n \t\t\t\t\t\t\t(c) = ((((long)(p[0]))|((long)(p[1])<<8)|\t\t\\\n \t\t\t\t\t\t\t\t\t ((long)(p[2])<<16))>>((o)&0x7))&(m);\t\\\n \t\t\t\t\t\t\t(o) += (n);\t\t\t\t\t\t\t\t\t\t\\\n \t\t\t\t\t\t}\n-#endif\n \n char\t\t\t*progname;\t\t\t\/* Program name\t\t\t\t\t\t\t\t\t*\/\n int \t\t\tsilent = 0;\t\t\t\/* don't tell me about errors\t\t\t\t\t*\/\n@@ -1761,9 +1741,6 @@\n \t{\n \t\tprintf(\"Compress version: %s\\n\", version_id);\n \t\tprintf(\"Compile options:\\n \");\n-#if BYTEORDER == 4321 && NOALLIGN == 1\n-\t\tprintf(\"USE_BYTEORDER, \");\n-#endif\n #ifdef FAST\n \t\tprintf(\"FAST, \");\n #endif\n"} {"commit":"6c93f05a66e1f522b8f9ec96a4660423f1f20e13","subject":"Bug#31605: mysql_upgrade relies on Linux \/proc filesystem when not \\ \trunning on Windows","message":"Bug#31605: mysql_upgrade relies on Linux \/proc filesystem when not \\\n\trunning on Windows\n\nWe used two OS-specific methods of looking up the executable \nname, which don't work outside of those two kinds of OSes \n(Linux+Solaris and Windows).\n\nWe assume that if the user ran this program with a certain \nname, we can run the other sibling programs with a similar name.\n\n(re-patch in bzr)\n","repos":"ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,slanterns\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- client\/mysql_upgrade.c\n+++ client\/mysql_upgrade.c\n@@ -259,6 +259,10 @@\n }\n \n \n+\/**\n+ Run a command using the shell, storing its output in the supplied dynamic\n+ string.\n+*\/\n static int run_command(char* cmd,\n DYNAMIC_STRING *ds_res)\n {\n@@ -331,36 +335,16 @@\n }\n \n \n-\/*\n- Try to get the full path to this exceutable\n-\n- Return 0 if path found\n-\n-*\/\n-\n-static my_bool get_full_path_to_executable(char* path)\n-{\n- my_bool ret;\n- DBUG_ENTER(\"get_full_path_to_executable\");\n-#ifdef __WIN__\n- ret= (GetModuleFileName(NULL, path, FN_REFLEN) == 0);\n-#else\n- \/* my_readlink returns 0 if a symlink was read *\/\n- ret= (my_readlink(path, \"\/proc\/self\/exe\", MYF(0)) != 0);\n- \/* Might also want to try with \/proc\/$$\/exe if the above fails *\/\n-#endif\n- DBUG_PRINT(\"exit\", (\"path: %s\", path));\n- DBUG_RETURN(ret);\n-}\n-\n-\n-\/*\n- Look for the tool in the same directory as mysql_upgrade.\n-*\/\n-\n-static void find_tool(char *tool_path, const char *tool_name)\n-{\n- char path[FN_REFLEN];\n+\/**\n+ Look for the filename of given tool, with the presumption that it is in the\n+ same directory as mysql_upgrade and that the same executable-searching \n+ mechanism will be used when we run our sub-shells with popen() later.\n+*\/\n+static void find_tool(char *tool_executable_name, const char *tool_name, \n+ const char *self_name)\n+{\n+ char *last_fn_libchar;\n+\n DYNAMIC_STRING ds_tmp;\n DBUG_ENTER(\"find_tool\");\n DBUG_PRINT(\"enter\", (\"progname: %s\", my_progname));\n@@ -368,77 +352,57 @@\n if (init_dynamic_string(&ds_tmp, \"\", 32, 32))\n die(\"Out of memory\");\n \n- \/* Initialize path with the full path to this program *\/\n- if (get_full_path_to_executable(path))\n+ last_fn_libchar= strrchr(self_name, FN_LIBCHAR);\n+\n+ if (last_fn_libchar == NULL)\n {\n \/*\n- Easy way to get full executable path failed, try\n- other methods\n+ mysql_upgrade was found by the shell searching the path. A sibling\n+ next to us should be found the same way.\n *\/\n- if (my_progname[0] == FN_LIBCHAR)\n+ strncpy(tool_executable_name, tool_name, FN_REFLEN);\n+ }\n+ else\n+ {\n+ \/* \n+ mysql_upgrade was run absolutely or relatively. We can find a sibling\n+ by replacing our name after the LIBCHAR with the new tool name.\n+ *\/\n+\n+ \/*\n+ When running in a not yet installed build and using libtool,\n+ the program(mysql_upgrade) will be in .libs\/ and executed\n+ through a libtool wrapper in order to use the dynamic libraries\n+ from this build. The same must be done for the tools(mysql and\n+ mysqlcheck). Thus if path ends in .libs\/, step up one directory\n+ and execute the tools from there\n+ *\/\n+ if (((last_fn_libchar - 6) >= self_name) &&\n+ (strncmp(last_fn_libchar - 5, \".libs\", 5) == 0) &&\n+ (*(last_fn_libchar - 6) == FN_LIBCHAR))\n {\n- \/* 1. my_progname contains full path *\/\n- strmake(path, my_progname, FN_REFLEN);\n+ DBUG_PRINT(\"info\", (\"Chopping off \\\".libs\\\" from end of path\"));\n+ last_fn_libchar -= 6;\n }\n- else if (my_progname[0] == '.')\n- {\n- \/* 2. my_progname contains relative path, prepend wd *\/\n- char buf[FN_REFLEN];\n- my_getwd(buf, FN_REFLEN, MYF(0));\n- my_snprintf(path, FN_REFLEN, \"%s%s\", buf, my_progname);\n- }\n- else\n- {\n- \/* 3. Just go for it and hope tool is in path *\/\n- path[0]= 0;\n- }\n- }\n-\n- DBUG_PRINT(\"info\", (\"path: '%s'\", path));\n-\n- \/* Chop off binary name (i.e mysql-upgrade) from path *\/\n- dirname_part(path, path);\n-\n- \/*\n- When running in a not yet installed build and using libtool,\n- the program(mysql_upgrade) will be in .libs\/ and executed\n- through a libtool wrapper in order to use the dynamic libraries\n- from this build. The same must be done for the tools(mysql and\n- mysqlcheck). Thus if path ends in .libs\/, step up one directory\n- and execute the tools from there\n- *\/\n- path[max((strlen(path)-1), 0)]= 0; \/* Chop off last \/ *\/\n- if (strncmp(path + dirname_length(path), \".libs\", 5) == 0)\n- {\n- DBUG_PRINT(\"info\", (\"Chopping off .libs from '%s'\", path));\n-\n- \/* Chop off .libs *\/\n- dirname_part(path, path);\n- }\n-\n-\n- DBUG_PRINT(\"info\", (\"path: '%s'\", path));\n-\n- \/* Format name of the tool to search for *\/\n- fn_format(tool_path, tool_name,\n- path, \"\", MYF(MY_REPLACE_DIR));\n-\n- verbose(\"Looking for '%s' in: %s\", tool_name, tool_path);\n-\n- \/* Make sure the tool exists *\/\n- if (my_access(tool_path, F_OK) != 0)\n- die(\"Can't find '%s'\", tool_path);\n+\n+ my_snprintf(tool_executable_name, FN_REFLEN, \"%.*s%c%s\",\n+ (last_fn_libchar - self_name), self_name, \n+ FN_LIBCHAR,\n+ tool_name);\n+ }\n+\n+ verbose(\"Looking for '%s' as: %s\", tool_name, tool_executable_name);\n \n \/*\n Make sure it can be executed\n *\/\n- if (run_tool(tool_path,\n+ if (run_tool(tool_executable_name,\n &ds_tmp, \/* Get output from command, discard*\/\n \"--help\",\n \"2>&1\",\n IF_WIN(\"> NUL\", \"> \/dev\/null\"),\n NULL))\n- die(\"Can't execute '%s'\", tool_path);\n+ die(\"Can't execute '%s'\", tool_executable_name);\n \n dynstr_free(&ds_tmp);\n \n@@ -748,10 +712,19 @@\n \n int main(int argc, char **argv)\n {\n+ char self_name[FN_REFLEN];\n+\n MY_INIT(argv[0]);\n #ifdef __NETWARE__\n setscreenmode(SCR_AUTOCLOSE_ON_EXIT);\n #endif\n+\n+#if __WIN__\n+ if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0)\n+#endif\n+ {\n+ strncpy(self_name, argv[0], FN_REFLEN);\n+ }\n \n if (init_dynamic_string(&ds_args, \"\", 512, 256))\n die(\"Out of memory\");\n@@ -774,10 +747,10 @@\n dynstr_append(&ds_args, \" \");\n \n \/* Find mysql *\/\n- find_tool(mysql_path, IF_WIN(\"mysql.exe\", \"mysql\"));\n+ find_tool(mysql_path, IF_WIN(\"mysql.exe\", \"mysql\"), self_name);\n \n \/* Find mysqlcheck *\/\n- find_tool(mysqlcheck_path, IF_WIN(\"mysqlcheck.exe\", \"mysqlcheck\"));\n+ find_tool(mysqlcheck_path, IF_WIN(\"mysqlcheck.exe\", \"mysqlcheck\"), self_name);\n \n \/*\n Read the mysql_upgrade_info file to check if mysql_upgrade\n"} {"commit":"d97dedace33465c13b4324c9a0c42cc92fa1d6a7","subject":"Completion: more robust get_selected_proposal()","message":"Completion: more robust get_selected_proposal()\n\nThe header can't be selected, normally. But when proposals are\nremoved\/inserted by the model, it can occur. In this case, the function\nshould return false to mean that no proposal is selected.\n","repos":"GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcecompletion.c\n+++ gtksourceview\/gtksourcecompletion.c\n@@ -192,6 +192,11 @@\n \n \tif (gtk_tree_selection_get_selected (selection, NULL, &piter))\n \t{\n+\t\tif (gtk_source_completion_model_iter_is_header (completion->priv->model_proposals, &piter))\n+\t\t{\n+\t\t\treturn FALSE;\n+\t\t}\n+\n \t\tmodel = GTK_TREE_MODEL (completion->priv->model_proposals);\n \n \t\tif (proposal)\n"} {"commit":"59a7e68aeea2372e1f0d8cba59e0c8f2a3ae68d1","subject":"Fix structure layout.","message":"Fix structure layout.\n","repos":"hongbinz\/rtpproxy,dsanders11\/rtpproxy,synety-jdebp\/rtpproxy,Vocalocity\/rtpproxy-pre,hongbinz\/rtpproxy,kiryu\/rtpproxy,hongbinz\/rtpproxy,mab-netdev\/rtpproxy,sippy\/rtpproxy,miconda\/rtpproxy,synety-jdebp\/rtpproxy,Vocalocity\/rtpproxy-pre,viraptor\/RTPproxy,jevonearth\/rtpproxy,hongbinz\/rtpproxy,jevonearth\/rtpproxy,miconda\/rtpproxy,mab-netdev\/rtpproxy,kiryu\/rtpproxy,DrumTechnologiesLtd\/rtpproxy,dsanders11\/rtpproxy,gtkiller\/rtpproxyd,Vocalocity\/rtpproxy-pre,dsanders11\/rtpproxy,sippy\/rtpproxy,miconda\/rtpproxy,gtkiller\/rtpproxyd,DrumTechnologiesLtd\/rtpproxy,synety-jdebp\/rtpproxy,mab-netdev\/rtpproxy,sippy\/rtpproxy,synety-jdebp\/rtpproxy,jevonearth\/rtpproxy,kiryu\/rtpproxy,DrumTechnologiesLtd\/rtpproxy,viraptor\/RTPproxy,Vocalocity\/rtpproxy-pre,jevonearth\/rtpproxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- makeann.c\n+++ makeann.c\n@@ -23,7 +23,7 @@\n * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n * SUCH DAMAGE.\n *\n- * $Id: makeann.c,v 1.2 2006\/12\/04 22:29:55 sobomax Exp $\n+ * $Id: makeann.c,v 1.3 2006\/12\/04 22:49:20 sobomax Exp $\n *\n *\/\n \n@@ -71,8 +71,8 @@\n struct efile {\n FILE *f;\n rtp_type_t pt;\n+ int enabled;\n char path[PATH_MAX + 1];\n- int enabled;\n };\n \n int main(int argc, char **argv)\n"} {"commit":"f8927caae38aee554be19b5416aa1e1df5548caf","subject":"document","message":"document\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -446,7 +446,8 @@\n \tnr = fcmh_2_nrepls(f);\n \tFCMH_ULOCK(f);\n \n-\tif (nr >= SL_DEF_REPLICAS)\n+\t\/* XXX if CRC check fails, we could end up with NULL inoh_extras *\/\n+\tif (nr > SL_DEF_REPLICAS)\n \t\tmds_inox_ensure_loaded(fcmh_2_inoh(f));\n \n \tfor (i = 0, off = 0; i < nr; i++, off += SL_BITS_PER_REPLICA) {\n"} {"commit":"a74c91c9c4dcabb02b275d25d8fbfc7c2fccd3ff","subject":"SIPMediaStream: grouped the boolean properties to 1 bit fields","message":"SIPMediaStream: grouped the boolean properties to 1 bit fields\n\n\n20070709164330-5b6ca-09d4e915bcee8c933fb76640c9c955522c470535.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia,freedesktop-unofficial-mirror\/telepathy__telepathy-rakia","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sip-media-stream.c\n+++ src\/sip-media-stream.c\n@@ -92,11 +92,6 @@\n \n gchar *stream_sdp; \/** SDP description of the stream *\/\n \n- gboolean ready_received; \/** our ready method has been called *\/\n- gboolean native_cands_prepared; \/** all candidates discovered *\/\n- gboolean native_codecs_prepared; \/** all codecs discovered *\/\n- gboolean playing; \/** stream set to playing *\/\n- gboolean sending; \/** stream set to sending *\/\n \n GValue native_codecs; \/** intersected codec list *\/\n GValue native_candidates;\n@@ -109,9 +104,14 @@\n \n gchar *native_candidate_id;\n \n- gboolean push_remote_requested;\n-\n- gboolean dispose_has_run;\n+ gboolean ready_received : 1; \/** our ready method has been called *\/\n+ gboolean playing : 1; \/** stream set to playing *\/\n+ gboolean sending : 1; \/** stream set to sending *\/\n+ gboolean native_cands_prepared : 1; \/** all candidates discovered *\/\n+ gboolean native_codecs_prepared : 1; \/** all codecs discovered *\/\n+ gboolean push_remote_requested : 1; \/** remote info signals are pending *\/\n+ gboolean codec_intersect_pending : 1; \/** codec intersection is pending *\/\n+ gboolean dispose_has_run : 1;\n };\n \n #define SIP_MEDIA_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIP_TYPE_MEDIA_STREAM, SIPMediaStreamPrivate))\n"} {"commit":"7aafa61af93e496d08b92853b439b894d6f08ee1","subject":"remove one more use of leftjoin.","message":"remove one more use of leftjoin.\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- monetdb5\/optimizer\/opt_mergetable.c\n+++ monetdb5\/optimizer\/opt_mergetable.c\n@@ -1294,7 +1294,7 @@\n \t\tfor(k=1; k < mat[attr].mi->argc; k++) {\n \t\t\tInstrPtr q = newInstruction(mb, ASSIGNsymbol);\n \t\t\tsetModuleId(q, algebraRef);\n-\t\t\tsetFunctionId(q, leftjoinRef);\n+\t\t\tsetFunctionId(q, leftfetchjoinRef);\n \t\t\tgetArg(q, 0) = newTmpVariable(mb, tpe);\n \n \t\t\tq = pushArgument(mb, q, getArg(slc, k));\n"} {"commit":"9b46914ae1eb3a7efb724f0a6aebd94405d0a8a8","subject":"@2260272 Defining dummy fib_router_iter_impl ( fib_route_iter() returns unsupported here ) so that we are consistent wrt eos\/fib.h in what we publish on github and whats implemented in 4.14.5 onwards.","message":"@2260272 Defining dummy fib_router_iter_impl ( fib_route_iter() returns unsupported here ) so that we are consistent wrt eos\/fib.h in what we publish on github and whats implemented in 4.14.5 onwards.\n","repos":"aristanetworks\/EosSdk,tsuna\/EosSdk,leopoul\/EosSdk,aristanetworks\/EosSdk,aristanetworks\/EosSdk,tsuna\/EosSdk,aristanetworks\/EosSdk,tsuna\/EosSdk,leopoul\/EosSdk,leopoul\/EosSdk,tsuna\/EosSdk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- eos\/fib.h\n+++ eos\/fib.h\n@@ -30,9 +30,8 @@\n \n class fib_route_iter_impl;\n \n-class EOS_SDK_PUBLIC fib_route_iter_t {\n- \/\/ Uncomment when Iterator is defined.\n- \/\/ : public iter_base<fib_route_t, fib_route_iter_impl> {\n+class EOS_SDK_PUBLIC fib_route_iter_t\n+ : public iter_base<fib_route_t, fib_route_iter_impl> {\n \n private:\n friend class fib_route_iter_impl;\n@@ -41,9 +40,8 @@\n \n class fib_fec_iter_impl;\n \n-class EOS_SDK_PUBLIC fib_fec_iter_t {\n- \/\/ Uncomment when Iterator is defined.\n- \/\/ : public iter_base<fib_fec_t, fib_fec_iter_impl> {\n+class EOS_SDK_PUBLIC fib_fec_iter_t\n+ : public iter_base<fib_fec_t, fib_fec_iter_impl> {\n \n private:\n friend class fib_fec_iter_impl;\n"} {"commit":"7f0bd0dbbd589d0de62aec531109cc0548b07223","subject":"add adi vid","message":"add adi vid\n","repos":"analogdevicesinc\/m1k-fw,analogdevicesinc\/m1k-fw,analogdevicesinc\/m1k-fw,analogdevicesinc\/m1k-fw","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- conf_usb.h\n+++ conf_usb.h\n@@ -53,7 +53,7 @@\n *\/\n \n \/\/! Device definition (mandatory)\n-#define USB_DEVICE_VENDOR_ID 0x59e3\n+#define USB_DEVICE_VENDOR_ID 0x0456\n #define USB_DEVICE_PRODUCT_ID 0xf000\n #define USB_DEVICE_MAJOR_VERSION 1\n #define USB_DEVICE_MINOR_VERSION 0\n"} {"commit":"7bb231f49c10973a385d4ea463a0341069a660fe","subject":"add a comment to explain why we enqueue work in one place but not others","message":"add a comment to explain why we enqueue work in one place but not others\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -1726,11 +1726,11 @@\n \tint rc, bflags;\n \n \t\/*\n- \t * Reject any bmap request at or beyond the truncation point.\n- \t * It is up to the client to either retry or bail out. The\n- \t * MDS does NOT provide any notification upon completion,\n- \t * which may never happen in the worst case.\n- \t *\/\n+\t * Reject any bmap request at or beyond the truncation point.\n+\t * It is up to the client to either retry or bail out. The MDS\n+\t * does NOT provide any notification upon completion, which may\n+\t * never happen in the worst case.\n+\t *\/\n \tFCMH_LOCK(f);\n \tif ((f->fcmh_flags & FCMH_MDS_IN_PTRUNC) &&\n \t (bmapno >= fcmh_2_fsz(f) \/ SLASH_BMAP_SIZE)) {\n@@ -2073,6 +2073,12 @@\n \t\t\tmds_repl_bmap_walkcb(b, tract, NULL, 0,\n \t\t\t ptrunc_tally_ios, &ios_list);\n \t\t\tmds_bmap_write_repls_rel(b);\n+\n+\t\t\t\/*\n+\t\t\t * Queue work immediately instead of waiting for\n+\t\t\t * it to be causally paged to reduce latency to\n+\t\t\t * the client.\n+\t\t\t *\/\n \t\t\tupsch_enqueue(bmap_2_upd(b));\n \t\t}\n \t\ti++;\n@@ -2145,7 +2151,7 @@\n \t\t\tcsvc = slm_getclcsvc(bml->bml_exp);\n \t\t\tif (csvc == NULL)\n \t\t\t\tcontinue;\n-\t\t\trc = SL_RSX_NEWREQ(csvc, SRMT_RELEASEBMAP, \n+\t\t\trc = SL_RSX_NEWREQ(csvc, SRMT_RELEASEBMAP,\n \t\t\t\trq, mq, mp);\n \t\t\tif (!rc) {\n \t\t\t\tmq->sbd[0].sbd_fg.fg_fid = fcmh_2_fid(f);\n"} {"commit":"8ac6ed5857c8d583e0dc2ab2165966ab143930ad","subject":"ipc: implement MSG_COPY as a new receive mode","message":"ipc: implement MSG_COPY as a new receive mode\n\nTeach the helper routines about MSG_COPY so that msgtyp is preserved as\nthe message number to copy.\n\nThe security functions affected by this change were audited and no\nadditional changes are necessary.\n\nSigned-off-by: Peter Hurley <4b8373d016f277527198385ba72fda0feb5da015@hurleysoftware.com>\nAcked-by: Stanislav Kinsbursky <43b28e187c4fe6e53d7ab0bb71957481e322f182@parallels.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ipc\/msg.c\n+++ ipc\/msg.c\n@@ -66,6 +66,7 @@\n #define SEARCH_EQUAL\t\t2\n #define SEARCH_NOTEQUAL\t\t3\n #define SEARCH_LESSEQUAL\t4\n+#define SEARCH_NUMBER\t\t5\n \n #define msg_ids(ns)\t((ns)->ids[IPC_MSG_IDS])\n \n@@ -583,6 +584,7 @@\n \tswitch(mode)\n \t{\n \t\tcase SEARCH_ANY:\n+\t\tcase SEARCH_NUMBER:\n \t\t\treturn 1;\n \t\tcase SEARCH_LESSEQUAL:\n \t\t\tif (msg->m_type <=type)\n@@ -738,6 +740,8 @@\n \n static inline int convert_mode(long *msgtyp, int msgflg)\n {\n+\tif (msgflg & MSG_COPY)\n+\t\treturn SEARCH_NUMBER;\n \t\/*\n \t * find message of correct type.\n \t * msgtyp = 0 => get first.\n@@ -774,14 +778,10 @@\n * This function creates new kernel message structure, large enough to store\n * bufsz message bytes.\n *\/\n-static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz,\n-\t\t\t\t\t int msgflg, long *msgtyp,\n-\t\t\t\t\t unsigned long *copy_number)\n+static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz)\n {\n \tstruct msg_msg *copy;\n \n-\t*copy_number = *msgtyp;\n-\t*msgtyp = 0;\n \t\/*\n \t * Create dummy message to copy real message to.\n \t *\/\n@@ -797,9 +797,7 @@\n \t\tfree_msg(copy);\n }\n #else\n-static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz,\n-\t\t\t\t\t int msgflg, long *msgtyp,\n-\t\t\t\t\t unsigned long *copy_number)\n+static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz)\n {\n \treturn ERR_PTR(-ENOSYS);\n }\n@@ -818,15 +816,13 @@\n \tint mode;\n \tstruct ipc_namespace *ns;\n \tstruct msg_msg *copy = NULL;\n-\tunsigned long copy_number = 0;\n \n \tns = current->nsproxy->ipc_ns;\n \n \tif (msqid < 0 || (long) bufsz < 0)\n \t\treturn -EINVAL;\n \tif (msgflg & MSG_COPY) {\n-\t\tcopy = prepare_copy(buf, min_t(size_t, bufsz, ns->msg_ctlmax),\n-\t\t\t\t msgflg, &msgtyp, ©_number);\n+\t\tcopy = prepare_copy(buf, min_t(size_t, bufsz, ns->msg_ctlmax));\n \t\tif (IS_ERR(copy))\n \t\t\treturn PTR_ERR(copy);\n \t}\n@@ -861,8 +857,8 @@\n \t\t\t\tif (mode == SEARCH_LESSEQUAL &&\n \t\t\t\t\t\twalk_msg->m_type != 1) {\n \t\t\t\t\tmsgtyp = walk_msg->m_type - 1;\n-\t\t\t\t} else if (msgflg & MSG_COPY) {\n-\t\t\t\t\tif (copy_number == msg_counter)\n+\t\t\t\t} else if (mode == SEARCH_NUMBER) {\n+\t\t\t\t\tif (msgtyp == msg_counter)\n \t\t\t\t\t\tbreak;\n \t\t\t\t\tmsg = ERR_PTR(-EAGAIN);\n \t\t\t\t} else\n"} {"commit":"09d7af198d4802c026eb11de82faf7c7ae94bc29","subject":"Code cleanup","message":"Code cleanup\n","repos":"DeforaOS\/libc,DeforaOS\/libc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/socket\/arpa\/inet.c\n+++ src\/socket\/arpa\/inet.c\n@@ -145,8 +145,6 @@\n \tfor(i = 0, pos = 0;; i++)\n \t\tif(i == sizeof(in->s_addr))\n \t\t\tbreak;\n-\t\telse if(i > sizeof(in->s_addr))\n-\t\t\treturn NULL;\n \t\telse if((p = snprintf(&dst[pos], size - pos, \"%s%u\",\n \t\t\t\t\t\t(i > 0) ? \".\" : \"\", b[i]))\n \t\t\t\t>= size - pos)\n"} {"commit":"a77b0646ed6386846f566ad98b02f11e42197a7f","subject":"revert","message":"revert\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@15294 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/rmm.c\n+++ slashd\/rmm.c\n@@ -43,11 +43,6 @@\n \n #include \"zfs-fuse\/zfs_slashlib.h\"\n \n-\/*\n- * Propagating namespace updates from peers is not quite like redo after a system \n- * crash. The difference is that the receiving MDS is already up and serving clients. \n- * Therefore we must work from the fcmh layer, instead of just the ZFS layer.\n- *\/\n int\n slm_rmm_apply_update(struct srt_update_entry *entryp)\n {\n@@ -55,29 +50,6 @@\n \tstruct slmds_jent_namespace sjnm;\n \tint rc;\n \n-\tswitch (entryp->op) {\n-\t case NS_OP_CREATE:\n-\t\tbreak;\n-\t case NS_OP_LINK:\n-\t\tbreak;\n-\t case NS_OP_MKDIR:\n-\t\tbreak;\n-\t case NS_OP_RENAME:\n-\t\tbreak;\n-\t case NS_OP_RMDIR:\n-\t\tbreak;\n-\t case NS_OP_SETSIZE:\n-\t\tbreak;\n-\t case NS_OP_SETATTR:\n-\t\tbreak;\n-\t case NS_OP_SYMLINK:\n-\t\tbreak;\n-\t case NS_OP_UNLINK:\n-\t\tbreak;\n-\t default:\n-\t\t\/* what can I do to make it right? *\/\n-\t\tbreak;\n-\t}\n \tmemset(&sjnm, 0, sizeof(sjnm));\n \tsjnm.sjnm_op = entryp->op;\n \tsjnm.sjnm_uid = entryp->uid;\n@@ -101,10 +73,10 @@\n \trc = mds_redo_namespace(&sjnm);\n \tif (rc)\n \t\tpsc_atomic32_inc(&localinfo->sp_stats.ns_stats[NS_DIR_RECV]\n-\t\t [entryp->op][NS_SUM_FAIL]);\n+\t\t [sjnm.sjnm_op][NS_SUM_FAIL]);\n \telse\n \t\tpsc_atomic32_inc(&localinfo->sp_stats.ns_stats[NS_DIR_RECV]\n-\t\t [entryp->op][NS_SUM_SUCC]);\n+\t\t [sjnm.sjnm_op][NS_SUM_SUCC]);\n \treturn (rc);\n }\n \n"} {"commit":"e622d0fb72108ba6344e40382fb2cc4e3978b501","subject":"fix test-pattern-hab to not abort if the input file cannot be opened and instead just exit","message":"fix test-pattern-hab to not abort if the input file cannot be opened and instead just exit\n","repos":"ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hab\/test-pattern\/test-pattern-hab.c\n+++ hab\/test-pattern\/test-pattern-hab.c\n@@ -247,6 +247,7 @@\n yyin = fopen(file_name, \"r\");\n if (yyin == NULL) {\n g_log(\"\", G_LOG_LEVEL_ERROR, \"unable to open file '%s': %s\", file_name, strerror(errno));\n+\texit(1);\n }\n yyrestart(yyin);\n yyparse();\n"} {"commit":"73cada66db21f69277fc37ce548f584d856011a3","subject":"Remove redundant override keyword from getNode() overloads","message":"Remove redundant override keyword from getNode() overloads\n","repos":"hanw\/p4c,p4lang\/p4c,hanw\/p4c,mbudiu-vmw\/p4c-clone,p4lang\/p4c,p4lang\/p4c,mbudiu-vmw\/p4c-clone,p4lang\/p4c,p4lang\/p4c,mbudiu-vmw\/p4c-clone,hanw\/p4c,hanw\/p4c,mbudiu-vmw\/p4c-clone","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ir\/node.h\n+++ ir\/node.h\n@@ -90,8 +90,8 @@\n virtual Node *clone() const = 0;\n void dbprint(std::ostream &out) const override;\n virtual void dump_fields(std::ostream &) const { }\n- const Node* getNode() const override final { return this; }\n- Node* getNode() override final { return this; }\n+ const Node* getNode() const final { return this; }\n+ Node* getNode() final { return this; }\n Util::SourceInfo getSourceInfo() const override { return srcInfo; }\n cstring node_type_name() const override { return \"Node\"; }\n static cstring static_type_name() { return \"Node\"; }\n"} {"commit":"b77d1e4ce75ca803c046b846b45ac31cdebad649","subject":"missing lock","message":"missing lock\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@22143 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- sliod\/slvr.c\n+++ sliod\/slvr.c\n@@ -652,7 +652,9 @@\n \t\tif (rc > 0 && nblks == SLASH_BLKS_PER_SLVR) {\n \t\t\tint crc_rc;\n \n+\t\t\tSLVR_LOCK(s);\n \t\t\tcrc_rc = slvr_do_crc(s);\n+\t\t\tSLVR_ULOCK(s);\n \t\t\tif (crc_rc == SLERR_BADCRC)\n \t\t\t\tDEBUG_SLVR(PLL_ERROR, s,\n \t\t\t\t \"bad crc blks=%d off=%zu\",\n"} {"commit":"aa4415e94a19327e1f0427c11d4b1ea1432d7349","subject":"a little more minor trudging","message":"a little more minor trudging\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@7370 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- sliod\/slvr.c\n+++ sliod\/slvr.c\n@@ -35,7 +35,7 @@\n slvr_lru_requeue(const struct slvr_ref *s)\n {\n \tif (LIST_CACHE_TRYLOCK(&lruSlvrs)) {\n-\t\tlc_requeue(&lruSlvrs, s);\n+\t\tlc_move2tail(&lruSlvrs, s);\n \t\tLIST_CACHE_ULOCK(&lruSlvrs);\n \t}\n }\n@@ -474,7 +474,7 @@\n \t\ts->slvr_flags &= ~SLVR_LRU;\n \t\tSLVR_ULOCK(s);\n \n-\t\tlc_queue(rpcqSlvrs, s);\n+\t\tlc_queue(&rpcqSlvrs, s);\n \n \t} else\n \t\tSLVR_ULOCK(s);\n@@ -570,7 +570,7 @@\n \t * no pending writes. This section directly below may race \n \t * with slvr_wio_done().\n \t *\/\n-\tif (psc_atomic16_read(s->slvr_pndgwrts) > 0) {\n+\tif (psc_atomic16_read(&s->slvr_pndgwrts) > 0) {\n \t\tif (!LIST_CACHE_TRYLOCK(&lruSlvrs)) {\n \t\t\t\/* Don't deadlock, take the locks in the \n \t\t\t * correct order.\n@@ -584,10 +584,10 @@\n \t\t}\n \t\t\/* Guaranteed to have both locks.\n \t\t *\/\n-\t\tif (psc_atomic16_read(s->slvr_pndgwrts) > 0) {\n+\t\tif (psc_atomic16_read(&s->slvr_pndgwrts) > 0) {\n \t\t\ts->slvr_flags &= ~SLVR_RPCPNDG;\n \t\t\ts->slvr_flags |= SLVR_LRU;\n-\t\t\tlc_queue(&lruSlvrs, s);\n+\t\t\tlc_addqueue(&lruSlvrs, s);\n \t\t\tSLVR_ULOCK(s);\n \t\t\tLIST_CACHE_ULOCK(&lruSlvrs);\n \t\t\tgoto start;\n"} {"commit":"e457b9e5d1b6ab1c180e328003fce6c666ec3d39","subject":"input: synaptics_fw_update: Change permissions on lockdown sysfs entry","message":"input: synaptics_fw_update: Change permissions on lockdown sysfs entry\n\nPermissions should be set to 0664 instead of 0777 for sysfs\nentries. Change them to pass CTS test.\n\nChange-Id: I50237eaa917303efda0ad049649611bf1b6d9c31\nSigned-off-by: Amy Maloche <136dbe9eae95bbc401d4b86e6123e55b94e20cff@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/input\/touchscreen\/synaptics_fw_update.c\n+++ drivers\/input\/touchscreen\/synaptics_fw_update.c\n@@ -2060,7 +2060,7 @@\n \t__ATTR(writeconfig, S_IRUGO | S_IWUSR | S_IWGRP,\n \t\t\tsynaptics_rmi4_show_error,\n \t\t\tfwu_sysfs_write_config_store),\n-\t__ATTR(writelockdown, S_IWUGO,\n+\t__ATTR(writelockdown, S_IRUGO | S_IWUSR | S_IWGRP,\n \t\t\tsynaptics_rmi4_show_error,\n \t\t\tfwu_sysfs_write_lockdown_store),\n \t__ATTR(readconfig, S_IRUGO | S_IWUSR | S_IWGRP,\n"} {"commit":"03b31c346e202ea3edba5bb624b2e437c299c7d1","subject":"more typo","message":"more typo\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@8934 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- sliod\/slvr.c\n+++ sliod\/slvr.c\n@@ -683,7 +683,7 @@\n \t\tpsc_assert(s->slvr_slab);\n \n \t\tif (slvr_lru_slab_freeable(s)) {\n-\t\t\t\/* At this point we know that the slb can be \n+\t\t\t\/* At this point we know that the slab can be \n \t\t\t * reclaimed, however the slvr itself may \n \t\t\t * have to stay.\n \t\t\t *\/\n@@ -707,7 +707,7 @@\n \t\t\tpsc_assert(!(s->slvr_flags & SLVR_FREEING));\n \t\t\tpsc_assert(s->slvr_slab);\n \n-\t\t\tDEBUG_SLVR(PLL_WARN, s, \"freeing slvr slb=%p\", s->slvr_slb);\n+\t\t\tDEBUG_SLVR(PLL_WARN, s, \"freeing slvr slab=%p\", s->slvr_slab);\n \t\t\ts->slvr_flags &= ~SLVR_SLBFREEING;\n \t\t\tpsc_pool_return(m, s->slvr_slab);\n \t\t\ts->slvr_slab = NULL;\n"} {"commit":"3a083735266214286f4cc90c6ab5b2b7412e51ee","subject":"Fix the broken data channel","message":"Fix the broken data channel\n","repos":"awslabs\/amazon-kinesis-video-streams-webrtc-sdk-c,awslabs\/amazon-kinesis-video-streams-webrtc-sdk-c,awslabs\/amazon-kinesis-video-streams-webrtc-sdk-c,awslabs\/amazon-kinesis-video-streams-webrtc-sdk-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/source\/Dtls\/Dtls.c\n+++ src\/source\/Dtls\/Dtls.c\n@@ -508,7 +508,7 @@\n LOG_OPENSSL_ERROR(\"SSL_read\");\n }\n \n- if (ATOMIC_LOAD_BOOL(&pDtlsSession->sslInitFinished)) {\n+ if (!ATOMIC_LOAD_BOOL(&pDtlsSession->sslInitFinished)) {\n CHK_STATUS(dtlsCheckOutgoingDataBuffer(pDtlsSession));\n } else {\n \/\/ if dtls handshake is done, and SSL_read did not fail, then sslRet and number of sctp bytes read\n"} {"commit":"975f5766be048fb65eae6dbf423db129cd641124","subject":"V4L\/DVB (11271): usbvision: Remove buffer type checks from enum_fmt_vid_cap, XXXbuf","message":"V4L\/DVB (11271): usbvision: Remove buffer type checks from enum_fmt_vid_cap, XXXbuf\n\nThe v4l2-ioctl core only allows buffer types for which the corresponding\n->vidioc_try_fmt_xxx() methods are defined to be used with\nvidioc_(q|dq|query)buf() and vidioc_reqbufs().\n\nSince this driver only defines ->vidioc_try_fmt_vid_cap() the checks can be\nremoved from vidioc_reqbufs(), vidioc_qbuf(), and vidioc_dqbuf().\n\nThe ->vidioc_(s|g|try|enum)_fmt_vid_cap() methods are only called on\nVIDEO_CAPTURE buffers. Thus, there is no need to check or set the buffer's\n'type' field since it must already be set to VIDEO_CAPTURE. So setting the\nbuffer type in vidioc_enum_fmt_vid_cap() can be removed.\n\nSigned-off-by: Trent Piepho <ab69db8315af7de6e673a6ddf128d415157a7c3f@speakeasy.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/usbvision\/usbvision-video.c\n+++ drivers\/media\/video\/usbvision\/usbvision-video.c\n@@ -757,8 +757,7 @@\n \n \t\/* Check input validity:\n \t the user must do a VIDEO CAPTURE and MMAP method. *\/\n-\tif((vr->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||\n-\t (vr->memory != V4L2_MEMORY_MMAP))\n+\tif (vr->memory != V4L2_MEMORY_MMAP)\n \t\treturn -EINVAL;\n \n \tif(usbvision->streaming == Stream_On) {\n@@ -816,9 +815,6 @@\n \tunsigned long lock_flags;\n \n \t\/* FIXME : works only on VIDEO_CAPTURE MODE, MMAP. *\/\n-\tif(vb->type != V4L2_CAP_VIDEO_CAPTURE) {\n-\t\treturn -EINVAL;\n-\t}\n \tif(vb->index>=usbvision->num_frames) {\n \t\treturn -EINVAL;\n \t}\n@@ -852,9 +848,6 @@\n \tint ret;\n \tstruct usbvision_frame *f;\n \tunsigned long lock_flags;\n-\n-\tif (vb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)\n-\t\treturn -EINVAL;\n \n \tif (list_empty(&(usbvision->outqueue))) {\n \t\tif (usbvision->streaming == Stream_Idle)\n@@ -921,7 +914,6 @@\n \tif(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {\n \t\treturn -EINVAL;\n \t}\n-\tvfd->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;\n \tstrcpy(vfd->description,usbvision_v4l2_format[vfd->index].desc);\n \tvfd->pixelformat = usbvision_v4l2_format[vfd->index].format;\n \treturn 0;\n"} {"commit":"a1006d45e36e5099a9c2b138307dcb90e9fde3c5","subject":"server: for the case a backend does not fill the value","message":"server: for the case a backend does not fill the value\n\nso start with a 0\n","repos":"marcelhollerbach\/spawny,marcelhollerbach\/spawny","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/sp-daemon\/server.c\n+++ src\/sp-daemon\/server.c\n@@ -187,7 +187,7 @@\n Spawny__Server__User **user;\n Spawny__Server__Session **sessions;\n Spawny__Server__SessionTemplate **templates;\n- unsigned int number;\n+ unsigned int number = 0;\n unsigned int offset = 0;\n \n number = user_db_users_iterate(&usernames);\n"} {"commit":"89d27a3c0ad7d5f2ce9ece055b3c7c619dc42f6c","subject":"ixgbe: dcb: check setup_tc return codes","message":"ixgbe: dcb: check setup_tc return codes\n\ndcb netlink code calls setup_tc to init hardware traffic classes\nto use for DCB. At some call sites the return values are not\nchecked for errors and in one case may return -EINVAL back to\nthe net\/dcbnl.c caller which is expecting a u8.\n\nThis fixes some smatch hits and although failures are never\nseen in practive its best to check return codes.\n\nReported-by: Dan Carenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: John Fastabend <06228589568acf528fa1984e09626513a30b66ed@intel.com>\nTested-by: Ross Brattain <ddebe0db9486ace8e4376a8be8a0aaa0090ac511@intel.com>\nSigned-off-by: Jeff Kirsher <87e35f5be20bb3e67f4ba6b86f5f6be3085b1b3a@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/intel\/ixgbe\/ixgbe_dcb_nl.c\n+++ drivers\/net\/ethernet\/intel\/ixgbe\/ixgbe_dcb_nl.c\n@@ -111,7 +111,7 @@\n \n static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)\n {\n-\tu8 err = 0;\n+\tint err = 0;\n \tu8 prio_tc[MAX_USER_PRIORITY] = {0};\n \tint i;\n \tstruct ixgbe_adapter *adapter = netdev_priv(netdev);\n@@ -122,7 +122,7 @@\n \n \t\/* verify there is something to do, if not then exit *\/\n \tif (!!state != !(adapter->flags & IXGBE_FLAG_DCB_ENABLED))\n-\t\treturn err;\n+\t\tgoto out;\n \n \tif (state > 0) {\n \t\terr = ixgbe_setup_tc(netdev, adapter->dcb_cfg.num_tcs.pg_tcs);\n@@ -131,10 +131,14 @@\n \t\terr = ixgbe_setup_tc(netdev, 0);\n \t}\n \n+\tif (err)\n+\t\tgoto out;\n+\n \tfor (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)\n \t\tnetdev_set_prio_tc_map(netdev, i, prio_tc[i]);\n \n-\treturn err;\n+out:\n+\treturn err ? 1 : 0;\n }\n \n static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,\n@@ -581,7 +585,7 @@\n {\n \tstruct ixgbe_adapter *adapter = netdev_priv(dev);\n \tint max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;\n-\tint i;\n+\tint i, err = 0;\n \t__u8 max_tc = 0;\n \n \tif (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))\n@@ -608,12 +612,17 @@\n \t\treturn -EINVAL;\n \n \tif (max_tc != netdev_get_num_tc(dev))\n-\t\tixgbe_setup_tc(dev, max_tc);\n+\t\terr = ixgbe_setup_tc(dev, max_tc);\n+\n+\tif (err)\n+\t\tgoto err_out;\n \n \tfor (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)\n \t\tnetdev_set_prio_tc_map(dev, i, ets->prio_tc[i]);\n \n-\treturn ixgbe_dcb_hw_ets(&adapter->hw, ets, max_frame);\n+\terr = ixgbe_dcb_hw_ets(&adapter->hw, ets, max_frame);\n+err_out:\n+\treturn err;\n }\n \n static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,\n@@ -726,6 +735,7 @@\n \tstruct ixgbe_adapter *adapter = netdev_priv(dev);\n \tstruct ieee_ets ets = {0};\n \tstruct ieee_pfc pfc = {0};\n+\tint err = 0;\n \n \t\/* no support for LLD_MANAGED modes or CEE+IEEE *\/\n \tif ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||\n@@ -756,10 +766,10 @@\n \t\t *\/\n \t\tixgbe_dcbnl_ieee_setets(dev, &ets);\n \t\tixgbe_dcbnl_ieee_setpfc(dev, &pfc);\n-\t\tixgbe_setup_tc(dev, 0);\n-\t}\n-\n-\treturn 0;\n+\t\terr = ixgbe_setup_tc(dev, 0);\n+\t}\n+\n+\treturn err ? 1 : 0;\n }\n \n const struct dcbnl_rtnl_ops dcbnl_ops = {\n"} {"commit":"fb6e0883f2e7ee2c2330a12bac3604c79a97f35e","subject":"qlge: Fix ethtool statistics","message":"qlge: Fix ethtool statistics\n\no Receive mac error stat was getting overwritten by other stats.\n\nSigned-off-by: Jitendra Kalsaria <c4f4e272f8d41a0305b1542acaa5e2b88e138f06@qlogic.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/qlogic\/qlge\/qlge_ethtool.c\n+++ drivers\/net\/ethernet\/qlogic\/qlge\/qlge_ethtool.c\n@@ -181,6 +181,7 @@\n };\n #define QLGE_TEST_LEN (sizeof(ql_gstrings_test) \/ ETH_GSTRING_LEN)\n #define QLGE_STATS_LEN ARRAY_SIZE(ql_gstrings_stats)\n+#define QLGE_RCV_MAC_ERR_STATS\t7\n \n static int ql_update_ring_coalescing(struct ql_adapter *qdev)\n {\n@@ -280,6 +281,9 @@\n \t\titer++;\n \t}\n \n+\t\/* Update receive mac error statistics *\/\n+\titer += QLGE_RCV_MAC_ERR_STATS;\n+\n \t\/*\n \t * Get Per-priority TX pause frame counter statistics.\n \t *\/\n"} {"commit":"dbf967537dce72872f3cf7b59d87ae244f199400","subject":"brcmfmac: remove chipinfo debugfs entry","message":"brcmfmac: remove chipinfo debugfs entry\n\nThe information provided by chipinfo is also provided by the\nrevinfo debugfs entry. Removing it from debugfs.\n\nReviewed-by: Hante Meuleman <31ca5aa57e9f47a38c33f2797b138069dfa82656@broadcom.com>\nReviewed-by: Pieter-Paul Giesberts <d101f7ec36e185d305862a92a05a9a0c1b62aa38@broadcom.com>\nSigned-off-by: Arend van Spriel <06447fbe43693466d3293d0b5eaeeb2efd3d7d3a@broadcom.com>\nSigned-off-by: Kalle Valo <7081a7d99b8c74c0698a728df19e3915a995d7e1@codeaurora.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/brcm80211\/brcmfmac\/debug.c\n+++ drivers\/net\/wireless\/brcm80211\/brcmfmac\/debug.c\n@@ -41,15 +41,6 @@\n \troot_folder = NULL;\n }\n \n-static int brcmf_debugfs_chipinfo_read(struct seq_file *seq, void *data)\n-{\n-\tstruct brcmf_bus *bus = dev_get_drvdata(seq->private);\n-\n-\tseq_printf(seq, \"chip: %x(%u) rev %u\\n\",\n-\t\t bus->chip, bus->chip, bus->chiprev);\n-\treturn 0;\n-}\n-\n int brcmf_debugfs_attach(struct brcmf_pub *drvr)\n {\n \tstruct device *dev = drvr->bus_if->dev;\n@@ -58,7 +49,6 @@\n \t\treturn -ENODEV;\n \n \tdrvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder);\n-\tbrcmf_debugfs_add_entry(drvr, \"chipinfo\", brcmf_debugfs_chipinfo_read);\n \n \treturn PTR_ERR_OR_ZERO(drvr->dbgfs_dir);\n }\n"} {"commit":"ced4160d056c657afd21132b9ab3cab70cef8c83","subject":"add http status code 201 to show the right status message in return headers (#402)","message":"add http status code 201 to show the right status message in return headers (#402)\n\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -1599,6 +1599,7 @@\n switch (status) {\n case 100: return \"Continue\";\n case 200: return \"OK\";\n+ case 201: return \"Created\";\n case 202: return \"Accepted\";\n case 204: return \"No Content\";\n case 206: return \"Partial Content\";\n"} {"commit":"71893bb077a61c7b590bf7780422407a01a409c0","subject":"staging: comedi: addi_apci_1564: remove null check of devpriv in apci1564_detach()","message":"staging: comedi: addi_apci_1564: remove null check of devpriv in apci1564_detach()\n\nThere is no need to test whether devpriv is null in this function. The\ncheck looks left over and we can just remove it.\n\nSigned-off-by: Chase Southwood <a63925e3ab29e90ed35149cfe020cfe5d57dbd06@gmail.com>\nReviewed-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/drivers\/addi_apci_1564.c\n+++ drivers\/staging\/comedi\/drivers\/addi_apci_1564.c\n@@ -433,14 +433,10 @@\n \n static void apci1564_detach(struct comedi_device *dev)\n {\n-\tstruct apci1564_private *devpriv = dev->private;\n-\n-\tif (devpriv) {\n-\t\tif (dev->iobase)\n-\t\t\tapci1564_reset(dev);\n-\t\tif (dev->irq)\n-\t\t\tfree_irq(dev->irq, dev);\n-\t}\n+\tif (dev->iobase)\n+\t\tapci1564_reset(dev);\n+\tif (dev->irq)\n+\t\tfree_irq(dev->irq, dev);\n \tcomedi_pci_disable(dev);\n }\n \n"} {"commit":"f42a76778ba30f081159cda629061a9712cb9967","subject":"Fixes the documentation of semaphore release method. (#678)","message":"Fixes the documentation of semaphore release method. (#678)\n\nBackport of https:\/\/github.com\/hazelcast\/hazelcast\/pull\/17823","repos":"hazelcast\/hazelcast-cpp-client,hazelcast\/hazelcast-cpp-client,hazelcast\/hazelcast-cpp-client,hazelcast\/hazelcast-cpp-client","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hazelcast\/include\/hazelcast\/cp\/cp.h\n+++ hazelcast\/include\/hazelcast\/cp\/cp.h\n@@ -951,7 +951,7 @@\n * one, when a caller makes its very first \\acquire call, it starts\n * a new CP session with the underlying CP group. Then, liveliness of the\n * caller is tracked via this CP session. When the caller fails, permits\n- * acquired by this caller are automatically and safely released. However,\n+ * acquired by this HazelcastInstance are automatically and safely released. However,\n * the session-aware version comes with a limitation, that is,\n * a HazelcastInstance cannot release permits before acquiring them\n * first. In other words, a Hazelcast client can release only\n@@ -967,7 +967,7 @@\n * <li>\n * The second impl is sessionless. This impl\n * does not perform auto-cleanup of acquired permits on failures. Acquired\n- * permits are not bound to threads and permits can be released without\n+ * permits are not bound to HazelcastInstance and permits can be released without\n * acquiring first. However, you need to handle failed permit owners on your own. If a Hazelcast\n * server or a client fails while holding some permits, they will not be\n * automatically released. You can use the sessionless CP \\counting_semaphore\n@@ -1031,14 +1031,14 @@\n * of them will unblock by acquiring the permit released by this call.\n * <p>\n * If the underlying \\counting_semaphore is configured as non-JDK compatible\n- * via server side SemaphoreConfig then a thread can only release a permit which\n- * it has acquired before. In other words, a thread cannot release a permit\n+ * via server side SemaphoreConfig then a HazelcastInstance can only release a permit which\n+ * it has acquired before. In other words, a HazelcastInstance cannot release a permit\n * without acquiring it first.\n * <p>\n * Otherwise, which means the underlying impl is the JDK compatible\n * Semaphore is configured via server side SemaphoreConfig, there is no requirement\n- * that a thread that releases a permit must have acquired that permit by\n- * calling one of the \\acquire methods. A thread can freely\n+ * that a HazelcastInstance that releases a permit must have acquired that permit by\n+ * calling one of the \\acquire methods. A HazelcastInstance can freely\n * release a permit without acquiring it first. In this case, correct usage\n * of a semaphore is established by programming convention in the application.\n *\n"} {"commit":"c1f00be048c10763c7fad230bc6141b3538ef2d6","subject":"staging: comedi: addi_apci_1710: separate from addi_common.h","message":"staging: comedi: addi_apci_1710: separate from addi_common.h\n\nMove the necessary bits from addi_common.h to remove it's dependency\nand make this driver standalone.\n\nSigned-off-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nReviewed-by: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/drivers\/addi_apci_1710.c\n+++ drivers\/staging\/comedi\/drivers\/addi_apci_1710.c\n@@ -1,5 +1,6 @@\n #include <linux\/module.h>\n #include <linux\/pci.h>\n+#include <linux\/interrupt.h>\n \n #include <asm\/i387.h>\n \n@@ -7,7 +8,146 @@\n #include \"comedi_fc.h\"\n #include \"amcc_s5933.h\"\n \n-#include \"addi-data\/addi_common.h\"\n+#define APCI1710_SAVE_INTERRUPT\t1\n+\n+union str_ModuleInfo {\n+\t\/* Incremental counter infos *\/\n+\tstruct {\n+\t\tunion {\n+\t\t\tstruct {\n+\t\t\t\tunsigned char b_ModeRegister1;\n+\t\t\t\tunsigned char b_ModeRegister2;\n+\t\t\t\tunsigned char b_ModeRegister3;\n+\t\t\t\tunsigned char b_ModeRegister4;\n+\t\t\t} s_ByteModeRegister;\n+\t\t\tunsigned int dw_ModeRegister1_2_3_4;\n+\t\t} s_ModeRegister;\n+\n+\t\tstruct {\n+\t\t\tunsigned int b_IndexInit:1;\n+\t\t\tunsigned int b_CounterInit:1;\n+\t\t\tunsigned int b_ReferenceInit:1;\n+\t\t\tunsigned int b_IndexInterruptOccur:1;\n+\t\t\tunsigned int b_CompareLogicInit:1;\n+\t\t\tunsigned int b_FrequencyMeasurementInit:1;\n+\t\t\tunsigned int b_FrequencyMeasurementEnable:1;\n+\t\t} s_InitFlag;\n+\n+\t} s_SiemensCounterInfo;\n+\n+\t\/* SSI infos *\/\n+\tstruct {\n+\t\tunsigned char b_SSIProfile;\n+\t\tunsigned char b_PositionTurnLength;\n+\t\tunsigned char b_TurnCptLength;\n+\t\tunsigned char b_SSIInit;\n+\t} s_SSICounterInfo;\n+\n+\t\/* TTL I\/O infos *\/\n+\tstruct {\n+\t\tunsigned char b_TTLInit;\n+\t\tunsigned char b_PortConfiguration[4];\n+\t} s_TTLIOInfo;\n+\n+\t\/* Digital I\/O infos *\/\n+\tstruct {\n+\t\tunsigned char b_DigitalInit;\n+\t\tunsigned char b_ChannelAMode;\n+\t\tunsigned char b_ChannelBMode;\n+\t\tunsigned char b_OutputMemoryEnabled;\n+\t\tunsigned int dw_OutputMemory;\n+\t} s_DigitalIOInfo;\n+\n+\t\/* 82X54 timer infos *\/\n+\tstruct {\n+\t\tstruct {\n+\t\t\tunsigned char b_82X54Init;\n+\t\t\tunsigned char b_InputClockSelection;\n+\t\t\tunsigned char b_InputClockLevel;\n+\t\t\tunsigned char b_OutputLevel;\n+\t\t\tunsigned char b_HardwareGateLevel;\n+\t\t\tunsigned int dw_ConfigurationWord;\n+\t\t} s_82X54TimerInfo[3];\n+\t\tunsigned char b_InterruptMask;\n+\t} s_82X54ModuleInfo;\n+\n+\t\/* Chronometer infos *\/\n+\tstruct {\n+\t\tunsigned char b_ChronoInit;\n+\t\tunsigned char b_InterruptMask;\n+\t\tunsigned char b_PCIInputClock;\n+\t\tunsigned char b_TimingUnit;\n+\t\tunsigned char b_CycleMode;\n+\t\tdouble d_TimingInterval;\n+\t\tunsigned int dw_ConfigReg;\n+\t} s_ChronoModuleInfo;\n+\n+\t\/* Pulse encoder infos *\/\n+\tstruct {\n+\t\tstruct {\n+\t\t\tunsigned char b_PulseEncoderInit;\n+\t\t} s_PulseEncoderInfo[4];\n+\t\tunsigned int dw_SetRegister;\n+\t\tunsigned int dw_ControlRegister;\n+\t\tunsigned int dw_StatusRegister;\n+\t} s_PulseEncoderModuleInfo;\n+\n+\t\/* Tor conter infos *\/\n+\tstruct {\n+\t\tstruct {\n+\t\t\tunsigned char b_TorCounterInit;\n+\t\t\tunsigned char b_TimingUnit;\n+\t\t\tunsigned char b_InterruptEnable;\n+\t\t\tdouble d_TimingInterval;\n+\t\t\tunsigned int ul_RealTimingInterval;\n+\t\t} s_TorCounterInfo[2];\n+\t\tunsigned char b_PCIInputClock;\n+\t} s_TorCounterModuleInfo;\n+\n+\t\/* PWM infos *\/\n+\tstruct {\n+\t\tstruct {\n+\t\t\tunsigned char b_PWMInit;\n+\t\t\tunsigned char b_TimingUnit;\n+\t\t\tunsigned char b_InterruptEnable;\n+\t\t\tdouble d_LowTiming;\n+\t\t\tdouble d_HighTiming;\n+\t\t\tunsigned int ul_RealLowTiming;\n+\t\t\tunsigned int ul_RealHighTiming;\n+\t\t} s_PWMInfo[2];\n+\t\tunsigned char b_ClockSelection;\n+\t} s_PWMModuleInfo;\n+\n+\t\/* CDA infos *\/\n+\tstruct {\n+\t\tunsigned char b_CDAEnable;\n+\t\tunsigned char b_FctSelection;\n+\t} s_CDAModuleInfo;\n+};\n+\n+struct addi_private {\n+\t\/* Pointer to the current process *\/\n+\tstruct task_struct *tsk_Current;\n+\n+\tstruct {\n+\t\tunsigned int ui_Address;\n+\t\tunsigned char b_BoardVersion;\n+\t\tunsigned int dw_MolduleConfiguration[4];\n+\t} s_BoardInfos;\n+\n+\tstruct {\n+\t\tunsigned int ul_InterruptOccur;\n+\t\tunsigned int ui_Read;\n+\t\tunsigned int ui_Write;\n+\t\tstruct {\n+\t\t\tunsigned char b_OldModuleMask;\n+\t\t\tunsigned int ul_OldInterruptMask;\n+\t\t\tunsigned int ul_OldCounterLatchValue;\n+\t\t} s_FIFOInterruptParameters[APCI1710_SAVE_INTERRUPT];\n+\t} s_InterruptParameters;\n+\n+\tunion str_ModuleInfo s_ModuleInfo[4];\n+};\n \n static void fpu_begin(void)\n {\n"} {"commit":"20409f7fefb63641476e1ea639daad782fa10bc9","subject":"Only hunt for clones for clonable paths","message":"Only hunt for clones for clonable paths\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/touchd.c\n+++ mudlib\/mud\/home\/System\/sys\/touchd.c\n@@ -73,6 +73,18 @@\n \trlimits(0; -1) {\n \t\tcall_touch(find_object(path));\n \n+\t\tif (!sscanf(path, \"%*s\" + CLONABLE_SUBDIR)) {\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (sscanf(path, \"%*s\" + LIGHTWEIGHT_SUBDIR)) {\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tif (sscanf(path, \"%*s\" + INHERITABLE_SUBDIR)) {\n+\t\t\treturn;\n+\t\t}\n+\n \t\tcinfo = CLONED->query_clone_info(status(path, O_INDEX));\n \n \t\tif (!cinfo) {\n"} {"commit":"cf11088242f0f73cb616ab66fb16c2da3d626fff","subject":"staging: comedi: addi_apci_2032: cleanup the subdevice init","message":"staging: comedi: addi_apci_2032: cleanup the subdevice init\n\nFor aesthetic reasons, add some whitespace to the subdevice init.\n\nSigned-off-by: H Hartley Sweeten <382ff55d8e07d1082d179e669636cd1552da4f36@visionengravers.com>\nCc: Ian Abbott <9e6ba6483b6a3e14d61f7c987e72ecb5b46122d6@mev.co.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/comedi\/drivers\/addi_apci_2032.c\n+++ drivers\/staging\/comedi\/drivers\/addi_apci_2032.c\n@@ -266,25 +266,25 @@\n \n \t\/* Initialize the digital output subdevice *\/\n \ts = &dev->subdevices[0];\n-\ts->type = COMEDI_SUBD_DO;\n-\ts->subdev_flags = SDF_WRITEABLE;\n-\ts->n_chan = 32;\n-\ts->maxdata = 1;\n-\ts->range_table = &range_digital;\n-\ts->insn_config = i_APCI2032_ConfigDigitalOutput;\n-\ts->insn_bits = apci2032_do_insn_bits;\n-\ts->insn_read = i_APCI2032_ReadInterruptStatus;\n+\ts->type\t\t= COMEDI_SUBD_DO;\n+\ts->subdev_flags\t= SDF_WRITEABLE;\n+\ts->n_chan\t= 32;\n+\ts->maxdata\t= 1;\n+\ts->range_table\t= &range_digital;\n+\ts->insn_config\t= i_APCI2032_ConfigDigitalOutput;\n+\ts->insn_bits\t= apci2032_do_insn_bits;\n+\ts->insn_read\t= i_APCI2032_ReadInterruptStatus;\n \n \t\/* Initialize the watchdog subdevice *\/\n \ts = &dev->subdevices[1];\n-\ts->type = COMEDI_SUBD_TIMER;\n-\ts->subdev_flags = SDF_WRITEABLE;\n-\ts->n_chan = 1;\n-\ts->maxdata = 0xff;\n-\ts->range_table = &range_digital;\n-\ts->insn_write = apci2032_wdog_insn_write;\n-\ts->insn_read = apci2032_wdog_insn_read;\n-\ts->insn_config = apci2032_wdog_insn_config;\n+\ts->type\t\t= COMEDI_SUBD_TIMER;\n+\ts->subdev_flags\t= SDF_WRITEABLE;\n+\ts->n_chan\t= 1;\n+\ts->maxdata\t= 0xff;\n+\ts->range_table\t= &range_digital;\n+\ts->insn_write\t= apci2032_wdog_insn_write;\n+\ts->insn_read\t= apci2032_wdog_insn_read;\n+\ts->insn_config\t= apci2032_wdog_insn_config;\n \n \tapci2032_reset(dev);\n \treturn 0;\n"} {"commit":"a55e0f44cf360a2f466b4599ec107fae4bafae64","subject":"staging\/lustre\/osc: Check return code for lu_kmem_init","message":"staging\/lustre\/osc: Check return code for lu_kmem_init\n\nlu_kmem_init can fail and returns has a return code.\nCheck for this return code in lu_kmem_init.\n\nThis issue was found during 2gb VM Racer testing\n\nIntel-bug-id: https:\/\/jira.hpdd.intel.com\/browse\/LU-3063\nLustre-change: http:\/\/review.whamcloud.com\/6514\nSigned-off-by: Keith Mannthey <6bc117627277bfba37b935f61d1f088bf417023d@intel.com>\nReviewed-by: Mike Pershin <bf38e5389dd082230b8c724ca6a74731b7958479@intel.com>\nReviewed-by: Nathaniel Clark <eddb3f9ee33f94482f12ee6e2865fe85d1ea4312@intel.com>\nReviewed-by: Bob Glossman <67e548fbeaf191ffde66fc5ef46cd49dbf7d7d6a@intel.com>\nReviewed-by: Oleg Drokin <65b2ca07820e940f66d8901813c729ec10a548f5@intel.com>\nSigned-off-by: Peng Tao <4fb2b5cc20694ed9d470f738b651303a1e636b2d@emc.com>\nSigned-off-by: Andreas Dilger <fb9bfcd2d82414390637ce05921b7d9f9341a408@intel.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/lustre\/lustre\/osc\/osc_request.c\n+++ drivers\/staging\/lustre\/lustre\/osc\/osc_request.c\n@@ -3681,6 +3681,8 @@\n \tCDEBUG(D_INFO, \"Lustre OSC module (%p).\\n\", &osc_caches);\n \n \trc = lu_kmem_init(osc_caches);\n+\tif (rc)\n+\t\tRETURN(rc);\n \n \tlprocfs_osc_init_vars(&lvars);\n \n"} {"commit":"0c8b059fac6e495bc5c588aae6d76533442ca821","subject":"replay: Free spice server to detect leaks","message":"replay: Free spice server to detect leaks\n\nSigned-off-by: Frediano Ziglio <55d48b080b2e443e395cde84d2c83b135a4ff48e@redhat.com>\nAcked-by: Pavel Grunt <fbda40b445316123f12a5a6bd7556918ea74f4bc@redhat.com>\nAcked-by: Jonathon Jongsma <c7254805a17bd5c41e24c3a278fcbf3afcdfb0fa@redhat.com>\n","repos":"fgouget\/spice,fgouget\/spice,fgouget\/spice,fgouget\/spice","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- server\/tests\/replay.c\n+++ server\/tests\/replay.c\n@@ -221,7 +221,6 @@\n kill(client_pid, SIGINT);\n waitpid(client_pid, &child_status, 0);\n }\n- exit(0);\n }\n \n static void release_resource(QXLInstance *qin, struct QXLReleaseInfoExt release_info)\n@@ -440,6 +439,7 @@\n if (print_count)\n g_print(\"Counted %d commands\\n\", ncommands);\n \n+ spice_server_destroy(server);\n end_replay();\n g_async_queue_unref(display_queue);\n g_async_queue_unref(cursor_queue);\n"} {"commit":"522eb5726a1766f0f15330c90749587a2f8d30aa","subject":"PHB3: Wait 1s, not 100ms, for PCIe electricals to train","message":"PHB3: Wait 1s, not 100ms, for PCIe electricals to train\n\nThe comment says 1s but we are really only waiting for 100ms and this\nisn't enough for some Altera FPGA cards it seems.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\n","repos":"legoater\/skiboot,legoater\/skiboot,csmart\/skiboot,apopple\/skiboot,mikey\/skiboot,qemu\/skiboot,open-power\/skiboot,ddstreet\/skiboot,stewart-ibm\/skiboot,ddstreet\/skiboot,qemu\/skiboot,shenki\/skiboot,csmart\/skiboot,mikey\/skiboot,legoater\/skiboot,open-power\/skiboot,qemu\/skiboot,shenki\/skiboot,qemu\/skiboot,csmart\/skiboot,apopple\/skiboot,shenki\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,ddstreet\/skiboot,mikey\/skiboot,open-power\/skiboot,apopple\/skiboot,legoater\/skiboot,open-power\/skiboot,open-power\/skiboot,shenki\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,legoater\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb3.c\n+++ hw\/phb3.c\n@@ -2043,7 +2043,7 @@\n \t *\/\n \tp->retries = PHB3_LINK_ELECTRICAL_RETRIES;\n \tp->state = PHB3_STATE_WAIT_LINK_ELECTRICAL;\n-\treturn phb3_set_sm_timeout(p, msecs_to_tb(100));\n+\treturn phb3_set_sm_timeout(p, msecs_to_tb(1000));\n }\n \n static int64_t phb3_sm_hot_reset(struct phb3 *p)\n"} {"commit":"a5f8cb05e55e3f11bfcc64580bfd2f30f3ce59a9","subject":"isl_basic_set_solve_ilp: handle obviously empty sets","message":"isl_basic_set_solve_ilp: handle obviously empty sets\n","repos":"inducer\/isl-mirror,PollyLabs\/isl,KangDroidSMProject\/ISL,UBERTC\/isl,evaautomation\/isl,evaautomation\/isl,inducer\/isl-mirror,Meinersbur\/isl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,Meinersbur\/isl,simbuerg\/isl,crossbuild\/isl,cfx-next\/toolchain_isl-upstream,Distrotech\/isl,Distrotech\/isl,simbuerg\/isl,VanirLLVM\/toolchain_isl,serge-sans-paille\/isl,Distrotech\/isl,simbuerg\/isl,KangDroidSMProject\/ISL,SaberMod\/isl-current,PollyLabs\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,BenzoSM\/isl,pierrotdelalune\/isl,KangDroidSMProject\/ISL,pierrotdelalune\/isl,cfx-next\/toolchain_isl-upstream,abduld\/isl,epowers\/isl,crossbuild\/isl,nicolasvasilache\/isl,pierrotdelalune\/isl,VanirLLVM\/toolchain_isl,crossbuild\/isl,jleben\/isl,UBERTC\/isl,jleben\/isl,abduld\/isl,serge-sans-paille\/isl,Distrotech\/isl,KangDroidSMProject\/ISL,Meinersbur\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,BenzoSM\/isl,evaautomation\/isl,tobig\/isl,BenzoSM\/isl,serge-sans-paille\/isl,BenzoSM\/isl,simbuerg\/isl,PollyLabs\/isl,SaberMod\/isl-current,PollyLabs\/isl,pierrotdelalune\/isl,evaautomation\/isl,BenzoSM\/isl,UBERTC\/isl,VanirLLVM\/toolchain_isl,epowers\/isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,UBERTC\/isl,crossbuild\/isl,epowers\/isl,inducer\/isl-mirror,PollyLabs\/isl,Meinersbur\/isl,SaberMod\/isl-current,inducer\/isl-mirror,KangDroidSMProject\/ISL,tobig\/isl,jleben\/isl,simbuerg\/isl,tobig\/isl,epowers\/isl,serge-sans-paille\/isl,SaberMod\/isl-current,nicolasvasilache\/isl,pierrotdelalune\/isl,jleben\/isl,Distrotech\/isl,epowers\/isl,cfx-next\/toolchain_isl-upstream,inducer\/isl-mirror,BobSaget-Mod\/libisl,tobig\/isl,cfx-next\/toolchain_isl-upstream,jleben\/isl,cfx-next\/toolchain_isl-upstream,nicolasvasilache\/isl,abduld\/isl,abduld\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_ilp.c\n+++ isl_ilp.c\n@@ -298,6 +298,9 @@\n \n \tisl_assert(bset->ctx, isl_basic_set_n_param(bset) == 0, goto error);\n \n+\tif (isl_basic_set_fast_is_empty(bset))\n+\t\treturn isl_lp_empty;\n+\n \tif (bset->n_eq)\n \t\treturn solve_ilp_with_eq(bset, max, f, opt, sol_p);\n \n"} {"commit":"bdb310a013a4bb766e4befeadb3780b2fabd36c1","subject":"Added Latch class for single threaded mode.","message":"Added Latch class for single threaded mode.","repos":"28msec\/zorba,28msec\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,28msec\/zorba,28msec\/zorba,bgarrels\/zorba,28msec\/zorba,cezarfx\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,28msec\/zorba,bgarrels\/zorba,bgarrels\/zorba,cezarfx\/zorba,28msec\/zorba,cezarfx\/zorba,28msec\/zorba","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/store\/util\/latch.h\n+++ src\/store\/util\/latch.h\n@@ -84,6 +84,17 @@\n }\n };\n \n+#else\n+class Latch\n+{\n+ void rlock() {}\n+ void wlock() {}\n+\n+ void unlock() {}\n+};\n+class AutoLatch\n+{\n+};\n #endif \/\/ ZORBA_FOR_ONE_THREAD_ONLY\n \n } \/\/ namespace store\n"} {"commit":"0aa9072a763bc73d24f0eab14cb04b5993597d10","subject":"Transformation: Change access rights of EventType(s)","message":"Transformation: Change access rights of EventType(s)\n","repos":"steup\/ASEIA,steup\/ASEIA","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/aseia_base\/include\/Transformation.h\n+++ src\/aseia_base\/include\/Transformation.h\n@@ -20,7 +20,7 @@\n public:\n using EventTypes = std::list<const EventType*>;\n using Events = std::list<const MetaEvent*>;\n- private:\n+ protected:\n const EventType& mOut;\n const EventTypes mIn;\n public:\n@@ -54,7 +54,7 @@\n \n public:\n Transformation(const EventID& out, const EventIDs& in);\n- virtual ~Transformation() = delete;\n+ virtual ~Transformation() = default;\n std::size_t arity() const { return mIn.size(); };\n const EventIDs& in() const { return mIn; }\n const EventID& out() const { return mOut; }\n"} {"commit":"32a506858d2c33a0a37043a4fee6aad09eb17c57","subject":"Refactor code","message":"Refactor code\n","repos":"MaxRoecker\/core-algorithms-c,MaxRoecker\/core-algorithms-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/structures\/array.c\n+++ src\/structures\/array.c\n@@ -1,15 +1,4 @@\n #include \"array.h\"\n-\n-\/**\n- * Create a array with the given lenght, allocating memory.\n- *\/\n-Array _array_create(size_t length) {\n- Array array = ((Array) memory_alloc(sizeof(ArrayStruct)));\n- void **elements = ((void *) memory_alloc(sizeof(void *) * length));\n- array->_elements = elements;\n- array->_length = length;\n- return array;\n-}\n \n \/**\n * Create a array of NULL with the given lenght.\n@@ -209,3 +198,14 @@\n }\n return copy;\n }\n+\n+\/**\n+ * Create a array with the given lenght, allocating memory.\n+ *\/\n+Array _array_create(size_t length) {\n+ Array array = ((Array) memory_alloc(sizeof(ArrayStruct)));\n+ void **elements = ((void *) memory_alloc(sizeof(void *) * length));\n+ array->_elements = elements;\n+ array->_length = length;\n+ return array;\n+}\n"} {"commit":"21fa18c812d3a7ed31585403696076aeb1d7be18","subject":"clarified some text in example.c and removed a duplicated piece of information","message":"clarified some text in example.c and removed a duplicated piece of information\n","repos":"deoxxa\/libmcnet,deoxxa\/libmcnet","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- example.c\n+++ example.c\n@@ -3,7 +3,7 @@\n \n #include <mcnet.h>\n \n-#define PACKET(id, code) case 0x##id: { mcnet_packet_##id##_t* tmp = (mcnet_packet_##id##_t*)packet; printf(\"Packet ID: %d\\n\", tmp->pid); code break; };\n+#define PACKET(id, code) case 0x##id: { mcnet_packet_##id##_t* tmp = (mcnet_packet_##id##_t*)packet; printf(\"Packet ID: 0x%02x\\n\", tmp->pid); code break; };\n \n #define BYTE(name) printf(\" [byte] %d\\n\", tmp->name);\n #define UBYTE(name) printf(\" [ubyte] %u\\n\", tmp->name);\n@@ -16,7 +16,10 @@\n #define METADATA(name) printf(\" [metadata] %d\\n\", tmp->name##_len);\n \n void on_packet(mcnet_parser_t* parser, mcnet_packet_t* packet) {\n- printf(\"[%p] packet type: %02x\\n\", parser->data, packet->pid);\n+ \/\/ This gets around the unused variable warning. Most of the time, you'd keep\n+ \/\/ something inside the \"data\" field of this object, allowing you to tie the\n+ \/\/ packets back to a client or stream.\n+ (void)parser;\n \n switch(packet->pid) {\n PACKETS\n"} {"commit":"7402000238a3eccf30248a31ad9eb5e281d175c1","subject":"tcp_connection.h","message":"tcp_connection.h\n","repos":"haojin2\/peloton,prashasthip\/peloton,malin1993ml\/peloton,eric-haibin-lin\/peloton-1,PauloAmora\/peloton,AllisonWang\/peloton,AngLi-Leon\/peloton,ShuxinLin\/peloton,vittvolt\/15721-peloton,AngLi-Leon\/peloton,vittvolt\/peloton,haojin2\/peloton,apavlo\/peloton,prashasthip\/peloton,apavlo\/peloton,ShuxinLin\/peloton,AllisonWang\/peloton,malin1993ml\/peloton,prashasthip\/peloton,eric-haibin-lin\/peloton-1,cmu-db\/peloton,prashasthip\/peloton,jessesleeping\/iso_peloton,ShuxinLin\/peloton,phisiart\/peloton-p3,yingjunwu\/peloton,cmu-db\/peloton,PauloAmora\/peloton,wangziqi2016\/peloton,apavlo\/peloton,seojungmin\/peloton,PauloAmora\/peloton,wangziqi2016\/peloton,phisiart\/peloton-p3,ShuxinLin\/peloton,seojungmin\/peloton,eric-haibin-lin\/peloton-1,seojungmin\/peloton,vittvolt\/15721-peloton,phisiart\/peloton-p3,malin1993ml\/peloton,jessesleeping\/iso_peloton,PauloAmora\/peloton,cmu-db\/peloton,AngLi-Leon\/peloton,phisiart\/peloton-p3,jessesleeping\/iso_peloton,vittvolt\/peloton,jessesleeping\/iso_peloton,AllisonWang\/peloton,seojungmin\/peloton,cmu-db\/peloton,haojin2\/peloton,PauloAmora\/peloton,PauloAmora\/peloton,vittvolt\/15721-peloton,cmu-db\/peloton,yingjunwu\/peloton,malin1993ml\/peloton,eric-haibin-lin\/peloton-1,vittvolt\/peloton,malin1993ml\/peloton,seojungmin\/peloton,ShuxinLin\/peloton,eric-haibin-lin\/peloton-1,ShuxinLin\/peloton,AngLi-Leon\/peloton,vittvolt\/15721-peloton,eric-haibin-lin\/peloton-1,apavlo\/peloton,cmu-db\/peloton,yingjunwu\/peloton,AllisonWang\/peloton,vittvolt\/peloton,yingjunwu\/peloton,jessesleeping\/iso_peloton,yingjunwu\/peloton,vittvolt\/peloton,seojungmin\/peloton,AllisonWang\/peloton,AngLi-Leon\/peloton,vittvolt\/peloton,haojin2\/peloton,vittvolt\/15721-peloton,phisiart\/peloton-p3,haojin2\/peloton,wangziqi2016\/peloton,vittvolt\/15721-peloton,AngLi-Leon\/peloton,wangziqi2016\/peloton,jessesleeping\/iso_peloton,haojin2\/peloton,apavlo\/peloton,yingjunwu\/peloton,malin1993ml\/peloton,prashasthip\/peloton,jessesleeping\/iso_peloton,AllisonWang\/peloton,wangziqi2016\/peloton,wangziqi2016\/peloton,prashasthip\/peloton,apavlo\/peloton,phisiart\/peloton-p3","returncode":1,"stderr":"error: pathspec 'src\/backend\/networking\/tcp_connection.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/networking\/tcp_connection.h\n+++ src\/backend\/networking\/tcp_connection.h\n@@ -0,0 +1,126 @@\n+\/\/===----------------------------------------------------------------------===\/\/\n+\/\/\n+\/\/ PelotonDB\n+\/\/\n+\/\/ rpc_connection.h\n+\/\/\n+\/\/ Identification: \/peloton\/src\/backend\/networking\/tcp_connection.h\n+\/\/\n+\/\/ Copyright (c) 2015, Carnegie Mellon University Database Group\n+\/\/\n+\/\/===----------------------------------------------------------------------===\/\/\n+\n+#pragma once\n+\n+#include \"backend\/common\/logger.h\"\n+#include \"rpc_server.h\"\n+#include \"rpc_channel.h\"\n+#include \"rpc_controller.h\"\n+#include \"tcp_address.h\"\n+\n+#include <event2\/bufferevent.h>\n+#include <event2\/buffer.h>\n+#include <event2\/listener.h>\n+#include <event2\/util.h>\n+#include <event2\/event.h>\n+\n+#include <memory>\n+\n+namespace peloton {\n+namespace networking {\n+\n+#define HEADERLEN 4 \/\/ the length should be equal with sizeof uint32_t\n+#define OPCODELEN 8 \/\/ the length should be equal with sizeof uint64_t\n+\n+class Connection {\n+\n+public:\n+\n+ \/*\n+ * @brief A connection has its own evenbase.\n+ * @param fd is the socket\n+ * If a connection is created by server, fd(socket) is passed by listener\n+ * If a connection is created by client, fd(socket) is -1.\n+ * arg is used to pass the rpc_server pointer\n+ *\/\n+ Connection(int fd, void* arg);\n+ ~Connection();\n+\n+ static void Dispatch(std::shared_ptr<Connection> conn);\n+\n+ static void ServerReadCb(struct bufferevent *bev, void *ctx);\n+ static void ClientReadCb(struct bufferevent *bev, void *ctx);\n+ static void ServerEventCb(struct bufferevent *bev, short events, void *ctx);\n+ static void ClientEventCb(struct bufferevent *bev, short events, void *ctx);\n+\n+ RpcServer* GetRpcServer();\n+\/\/ RpcChannel* GetRpcClient();\n+\n+ \/*\n+ * @brief After a connection is created, you can use this function to connect to\n+ * any server with the given address\n+ *\/\n+ bool Connect(const NetworkAddress& addr);\n+\n+ \/*\n+ * @brief a rpc will be closed by client after it recvs the response by server\n+ * close frees the socket event\n+ *\/\n+ void Close();\n+\n+ \/*\n+ * This is used by client to execute callback function\n+ *\/\n+ void SetMethodName(std::string name);\n+\n+ \/*\n+ * This is used by client to execute callback function\n+ *\/\n+ const char* GetMethodName();\n+\n+ \/\/ Get the readable length of the read buf\n+ int GetReadBufferLen();\n+\n+ \/*\n+ * Get the len data from read buf and then save them in the give buffer\n+ * If the data in read buf are less than len, get all of the data\n+ * Return the length of moved data\n+ * Note: the len data are deleted from read buf after this operation\n+ *\/\n+ int GetReadData(char *buffer, int len);\n+\n+ \/*\n+ * copy data (len) from read buf into the given buffer,\n+ * if the total data is less than len, then copy all of the data\n+ * return the length of the copied data\n+ * the data still exist in the read buf after this operation\n+ *\/\n+ int CopyReadBuffer(char *buffer, int len);\n+\n+ \/\/ Get the lengh a write buf\n+ int GetWriteBufferLen();\n+\n+ \/*\n+ * Add data to write buff,\n+ * return true on success, false on failure.\n+ *\/\n+ bool AddToWriteBuffer(char *buffer, int len);\n+\n+ \/\/ Forward data in read buf into write buf\n+ void MoveBufferData();\n+\n+private:\n+\n+ int socket_;\n+ bool close_;\n+\n+ RpcServer* rpc_server_;\n+\n+ bufferevent* bev_;\n+ event_base* base_;\n+\n+ std::string method_name_;\n+};\n+\n+} \/\/ namespace networking\n+} \/\/ namespace peloton\n"} {"commit":"6c9b6519b4a87715c18dd4bbc9918790aee95bb0","subject":"Fix code style","message":"Fix code style\n","repos":"cawka\/packaging-ndn-cpp,cawka\/packaging-ndn-cpp,cawka\/packaging-ndn-cpp-dev,cawka\/packaging-ndn-cpp-dev,cawka\/packaging-ndn-cpp,cawka\/packaging-ndn-cpp-dev,cawka\/packaging-ndn-cpp,cawka\/packaging-ndn-cpp-dev","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ndn-cpp\/encoding\/BinaryXMLDecoder.h\n+++ ndn-cpp\/encoding\/BinaryXMLDecoder.h\n@@ -17,7 +17,8 @@\n unsigned int offset;\n };\n \n-static inline void ndn_BinaryXMLDecoder_init(struct ndn_BinaryXMLDecoder *self, const unsigned char *input, unsigned int inputLength) {\n+static inline void ndn_BinaryXMLDecoder_init(struct ndn_BinaryXMLDecoder *self, const unsigned char *input, unsigned int inputLength) \n+{\n self->input = input;\n self->inputLength = inputLength;\n self->offset = 0;\n@@ -31,7 +32,8 @@\n * @param self pointer to the ndn_BinaryXMLDecoder struct\n * @param offset the new offset\n *\/\n-static inline void ndn_BinaryXMLDecoder_seek(struct ndn_BinaryXMLDecoder *self, unsigned int offset) {\n+static inline void ndn_BinaryXMLDecoder_seek(struct ndn_BinaryXMLDecoder *self, unsigned int offset) \n+{\n self->offset = offset;\n }\n \n"} {"commit":"1ec686313f0230d1de89cd8e6c48198ccf409260","subject":"Remove the following States from HttpProxyClientSocket:","message":"Remove the following States from HttpProxyClientSocket:\n\n- STATE_RESOLVE_CANONICAL_NAME,\n- STATE_RESOLVE_CANONICAL_NAME_COMPLETE,\n\nThey appear to be totally unused.\n\nBUG=none\nTEST=none\n\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@55276 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"crosswalk-project\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,Fireblend\/chromium-crosswalk,dednal\/chromium.src,dednal\/chromium.src,Chilledheart\/chromium,dushu1203\/chromium.src,fujunwei\/chromium-crosswalk,littlstar\/chromium.src,Jonekee\/chromium.src,M4sse\/chromium.src,nacl-webkit\/chrome_deps,dushu1203\/chromium.src,PeterWangIntel\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,ondra-novak\/chromium.src,timopulkkinen\/BubbleFish,PeterWangIntel\/chromium-crosswalk,mogoweb\/chromium-crosswalk,Fireblend\/chromium-crosswalk,hujiajie\/pa-chromium,patrickm\/chromium.src,rogerwang\/chromium,hgl888\/chromium-crosswalk-efl,Jonekee\/chromium.src,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk-efl,jaruba\/chromium.src,keishi\/chromium,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,robclark\/chromium,krieger-od\/nwjs_chromium.src,dednal\/chromium.src,zcbenz\/cefode-chromium,crosswalk-project\/chromium-crosswalk-efl,littlstar\/chromium.src,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,hujiajie\/pa-chromium,littlstar\/chromium.src,mohamed--abdel-maksoud\/chromium.src,robclark\/chromium,chuan9\/chromium-crosswalk,keishi\/chromium,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,anirudhSK\/chromium,Fireblend\/chromium-crosswalk,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,hujiajie\/pa-chromium,ltilve\/chromium,axinging\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,anirudhSK\/chromium,TheTypoMaster\/chromium-crosswalk,mogoweb\/chromium-crosswalk,rogerwang\/chromium,pozdnyakov\/chromium-crosswalk,jaruba\/chromium.src,hujiajie\/pa-chromium,M4sse\/chromium.src,hgl888\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,anirudhSK\/chromium,jaruba\/chromium.src,junmin-zhu\/chromium-rivertrail,Just-D\/chromium-1,hujiajie\/pa-chromium,markYoungH\/chromium.src,TheTypoMaster\/chromium-crosswalk,mogoweb\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,ondra-novak\/chromium.src,junmin-zhu\/chromium-rivertrail,mogoweb\/chromium-crosswalk,ltilve\/chromium,pozdnyakov\/chromium-crosswalk,keishi\/chromium,bright-sparks\/chromium-spacewalk,pozdnyakov\/chromium-crosswalk,dednal\/chromium.src,dednal\/chromium.src,Pluto-tv\/chromium-crosswalk,zcbenz\/cefode-chromium,anirudhSK\/chromium,dednal\/chromium.src,Fireblend\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,Jonekee\/chromium.src,nacl-webkit\/chrome_deps,timopulkkinen\/BubbleFish,rogerwang\/chromium,PeterWangIntel\/chromium-crosswalk,rogerwang\/chromium,keishi\/chromium,crosswalk-project\/chromium-crosswalk-efl,dednal\/chromium.src,Jonekee\/chromium.src,ChromiumWebApps\/chromium,robclark\/chromium,jaruba\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,jaruba\/chromium.src,zcbenz\/cefode-chromium,ltilve\/chromium,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,junmin-zhu\/chromium-rivertrail,markYoungH\/chromium.src,littlstar\/chromium.src,krieger-od\/nwjs_chromium.src,zcbenz\/cefode-chromium,M4sse\/chromium.src,junmin-zhu\/chromium-rivertrail,junmin-zhu\/chromium-rivertrail,nacl-webkit\/chrome_deps,anirudhSK\/chromium,mohamed--abdel-maksoud\/chromium.src,jaruba\/chromium.src,anirudhSK\/chromium,robclark\/chromium,mohamed--abdel-maksoud\/chromium.src,krieger-od\/nwjs_chromium.src,junmin-zhu\/chromium-rivertrail,bright-sparks\/chromium-spacewalk,junmin-zhu\/chromium-rivertrail,chuan9\/chromium-crosswalk,M4sse\/chromium.src,chuan9\/chromium-crosswalk,ltilve\/chromium,TheTypoMaster\/chromium-crosswalk,fujunwei\/chromium-crosswalk,rogerwang\/chromium,rogerwang\/chromium,dushu1203\/chromium.src,patrickm\/chromium.src,dushu1203\/chromium.src,markYoungH\/chromium.src,Jonekee\/chromium.src,bright-sparks\/chromium-spacewalk,ChromiumWebApps\/chromium,zcbenz\/cefode-chromium,robclark\/chromium,mogoweb\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,dushu1203\/chromium.src,dushu1203\/chromium.src,mogoweb\/chromium-crosswalk,ltilve\/chromium,littlstar\/chromium.src,Just-D\/chromium-1,dushu1203\/chromium.src,fujunwei\/chromium-crosswalk,Jonekee\/chromium.src,ondra-novak\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,PeterWangIntel\/chromium-crosswalk,keishi\/chromium,patrickm\/chromium.src,dednal\/chromium.src,Chilledheart\/chromium,chuan9\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,ondra-novak\/chromium.src,axinging\/chromium-crosswalk,axinging\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,ChromiumWebApps\/chromium,littlstar\/chromium.src,hgl888\/chromium-crosswalk-efl,Pluto-tv\/chromium-crosswalk,zcbenz\/cefode-chromium,robclark\/chromium,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk,fujunwei\/chromium-crosswalk,Just-D\/chromium-1,ondra-novak\/chromium.src,ChromiumWebApps\/chromium,ChromiumWebApps\/chromium,krieger-od\/nwjs_chromium.src,Jonekee\/chromium.src,bright-sparks\/chromium-spacewalk,rogerwang\/chromium,keishi\/chromium,PeterWangIntel\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,Just-D\/chromium-1,timopulkkinen\/BubbleFish,Fireblend\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,mogoweb\/chromium-crosswalk,M4sse\/chromium.src,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,ltilve\/chromium,mohamed--abdel-maksoud\/chromium.src,ondra-novak\/chromium.src,Chilledheart\/chromium,dushu1203\/chromium.src,zcbenz\/cefode-chromium,anirudhSK\/chromium,hgl888\/chromium-crosswalk,timopulkkinen\/BubbleFish,Chilledheart\/chromium,Jonekee\/chromium.src,Pluto-tv\/chromium-crosswalk,dushu1203\/chromium.src,krieger-od\/nwjs_chromium.src,rogerwang\/chromium,mohamed--abdel-maksoud\/chromium.src,patrickm\/chromium.src,timopulkkinen\/BubbleFish,M4sse\/chromium.src,rogerwang\/chromium,timopulkkinen\/BubbleFish,Just-D\/chromium-1,junmin-zhu\/chromium-rivertrail,jaruba\/chromium.src,hgl888\/chromium-crosswalk-efl,ltilve\/chromium,patrickm\/chromium.src,hujiajie\/pa-chromium,zcbenz\/cefode-chromium,chuan9\/chromium-crosswalk,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,dednal\/chromium.src,TheTypoMaster\/chromium-crosswalk,jaruba\/chromium.src,hgl888\/chromium-crosswalk,ondra-novak\/chromium.src,Chilledheart\/chromium,Just-D\/chromium-1,Jonekee\/chromium.src,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,crosswalk-project\/chromium-crosswalk-efl,fujunwei\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,robclark\/chromium,axinging\/chromium-crosswalk,timopulkkinen\/BubbleFish,Pluto-tv\/chromium-crosswalk,anirudhSK\/chromium,Chilledheart\/chromium,nacl-webkit\/chrome_deps,hgl888\/chromium-crosswalk-efl,TheTypoMaster\/chromium-crosswalk,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,jaruba\/chromium.src,patrickm\/chromium.src,timopulkkinen\/BubbleFish,timopulkkinen\/BubbleFish,ChromiumWebApps\/chromium,keishi\/chromium,ChromiumWebApps\/chromium,bright-sparks\/chromium-spacewalk,nacl-webkit\/chrome_deps,junmin-zhu\/chromium-rivertrail,krieger-od\/nwjs_chromium.src,Pluto-tv\/chromium-crosswalk,Chilledheart\/chromium,fujunwei\/chromium-crosswalk,timopulkkinen\/BubbleFish,hgl888\/chromium-crosswalk-efl,M4sse\/chromium.src,axinging\/chromium-crosswalk,keishi\/chromium,bright-sparks\/chromium-spacewalk,M4sse\/chromium.src,ltilve\/chromium,Jonekee\/chromium.src,axinging\/chromium-crosswalk,nacl-webkit\/chrome_deps,keishi\/chromium,Fireblend\/chromium-crosswalk,nacl-webkit\/chrome_deps,bright-sparks\/chromium-spacewalk,junmin-zhu\/chromium-rivertrail,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk,littlstar\/chromium.src,timopulkkinen\/BubbleFish,Chilledheart\/chromium,hgl888\/chromium-crosswalk-efl,mogoweb\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,anirudhSK\/chromium,Fireblend\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,patrickm\/chromium.src,robclark\/chromium,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk-efl,pozdnyakov\/chromium-crosswalk,markYoungH\/chromium.src,mohamed--abdel-maksoud\/chromium.src,markYoungH\/chromium.src,jaruba\/chromium.src,hujiajie\/pa-chromium,markYoungH\/chromium.src,hujiajie\/pa-chromium,pozdnyakov\/chromium-crosswalk,ondra-novak\/chromium.src,nacl-webkit\/chrome_deps,pozdnyakov\/chromium-crosswalk,ChromiumWebApps\/chromium,PeterWangIntel\/chromium-crosswalk,anirudhSK\/chromium,Just-D\/chromium-1,rogerwang\/chromium,crosswalk-project\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,Just-D\/chromium-1,patrickm\/chromium.src,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,dednal\/chromium.src,M4sse\/chromium.src,robclark\/chromium,PeterWangIntel\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,Chilledheart\/chromium,krieger-od\/nwjs_chromium.src,littlstar\/chromium.src,markYoungH\/chromium.src,chuan9\/chromium-crosswalk,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,Fireblend\/chromium-crosswalk,anirudhSK\/chromium,ondra-novak\/chromium.src,robclark\/chromium,dednal\/chromium.src,mohamed--abdel-maksoud\/chromium.src,bright-sparks\/chromium-spacewalk,M4sse\/chromium.src,Pluto-tv\/chromium-crosswalk,Jonekee\/chromium.src,pozdnyakov\/chromium-crosswalk,jaruba\/chromium.src,bright-sparks\/chromium-spacewalk,nacl-webkit\/chrome_deps,Just-D\/chromium-1,mogoweb\/chromium-crosswalk,chuan9\/chromium-crosswalk,hujiajie\/pa-chromium,zcbenz\/cefode-chromium,anirudhSK\/chromium,keishi\/chromium,hgl888\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,patrickm\/chromium.src,ltilve\/chromium,fujunwei\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,keishi\/chromium,markYoungH\/chromium.src,krieger-od\/nwjs_chromium.src","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- net\/http\/http_proxy_client_socket.h\n+++ net\/http\/http_proxy_client_socket.h\n@@ -82,8 +82,6 @@\n STATE_SEND_REQUEST_COMPLETE,\n STATE_READ_HEADERS,\n STATE_READ_HEADERS_COMPLETE,\n- STATE_RESOLVE_CANONICAL_NAME,\n- STATE_RESOLVE_CANONICAL_NAME_COMPLETE,\n STATE_DRAIN_BODY,\n STATE_DRAIN_BODY_COMPLETE,\n STATE_TCP_RESTART,\n"} {"commit":"3bfd45f93c8bca7a5dc955235ff083602d95aa43","subject":"netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert()","message":"netfilter: nf_conntrack: one less atomic op in nf_ct_expect_insert()\n\nInstead of doing atomic_inc(&exp->use) twice,\ncall atomic_add(2, &exp->use);\n\nSigned-off-by: Eric Dumazet <a0baddf32b28d2f9429941ed4af2fe636e210591@gmail.com>\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/netfilter\/nf_conntrack_expect.c\n+++ net\/netfilter\/nf_conntrack_expect.c\n@@ -323,7 +323,8 @@\n \tconst struct nf_conntrack_expect_policy *p;\n \tunsigned int h = nf_ct_expect_dst_hash(&exp->tuple);\n \n-\tatomic_inc(&exp->use);\n+\t\/* two references : one for hash insert, one for the timer *\/\n+\tatomic_add(2, &exp->use);\n \n \tif (master_help) {\n \t\thlist_add_head(&exp->lnode, &master_help->expectations);\n@@ -345,7 +346,6 @@\n \t}\n \tadd_timer(&exp->timeout);\n \n-\tatomic_inc(&exp->use);\n \tNF_CT_STAT_INC(net, expect_create);\n }\n \n"} {"commit":"9b2e416106c5df120be8b089a0a7a7806cdea184","subject":"Add a TODO.","message":"Add a TODO.\n","repos":"TeskaLabs\/SeaCat.io-Agent,TeskaLabs\/SeaCat.io-Agent","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/svr\/connectivity.c\n+++ src\/svr\/connectivity.c\n@@ -1,4 +1,6 @@\n #include \"all.h\"\n+\n+\/\/TODO: Consider auto-adding an 'bad connection' detector - it means that if there is e.g. NAT that disconnect the agent frequently, shorten the keepalive interval accordingly\n \n static void sca_connectivity_on_keepalive(struct ev_loop * loop, ev_timer * w, int revents);\n static void sca_connectivity_on_connecting(struct ev_loop * loop, ev_timer * w, int revents);\n"} {"commit":"51fb93fd45167027adfdf2ae12b50d1561afefe1","subject":"extract handling responses to a generic method, in preparation for pipelining","message":"extract handling responses to a generic method, in preparation for pipelining\n","repos":"willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sync_to_protocol.h\n+++ src\/sync_to_protocol.h\n@@ -87,7 +87,8 @@\n \n \t\tTableJob table_job(table);\n \n-\t\testablish_range(table_job);\n+\t\tif (worker.verbose > 1) cout << timestamp() << \" <- range \" << table_job.table.name << endl;\n+\t\tsend_command(output, Commands::RANGE, table_job.table.name);\n \n \t\twhile (true) {\n \t\t\tsync_queue.check_aborted(); \/\/ check each iteration, rather than wait until the end of the current table\n@@ -95,6 +96,9 @@\n \t\t\tif (worker.progress) {\n \t\t\t\tcout << \".\" << flush; \/\/ simple progress meter\n \t\t\t}\n+\n+\t\t\t\/\/ now read and act on their response to the last command\n+\t\t\thandle_response(table_job, row_replacer);\n \n \t\t\tif (!table_job.ranges_to_retrieve.empty()) {\n \t\t\t\tColumnValues prev_key, last_key;\n@@ -105,9 +109,6 @@\n \t\t\t\tif (worker.verbose > 1) cout << timestamp() << \" <- rows \" << table_job.table.name << ' ' << values_list(client, table_job.table, prev_key) << ' ' << values_list(client, table_job.table, last_key) << endl;\n \t\t\t\tsend_command(output, Commands::ROWS, table_job.table.name, prev_key, last_key);\n \t\t\t\trows_commands++;\n-\n-\t\t\t\texpect_verb(Commands::ROWS);\n-\t\t\t\thandle_rows_command(table, row_replacer);\n \n \t\t\t} else if (!table_job.ranges_to_check.empty()) {\n \t\t\t\tColumnValues prev_key, last_key;\n@@ -126,10 +127,6 @@\n \t\t\t\tworker.client.retrieve_rows(hasher, table, prev_key, last_key, rows_to_hash);\n \t\t\t\ttable_job.ranges_hashed.push_back(HashResult(prev_key, last_key, estimated_rows_in_range, hasher.row_count, hasher.size, hasher.finish().to_string(), hasher.last_key));\n \n-\t\t\t\t\/\/ now read their response\n-\t\t\t\texpect_verb(Commands::HASH);\n-\t\t\t\thandle_hash_command(table_job);\n-\n \t\t\t} else {\n \t\t\t\tbreak;\n \t\t\t}\n@@ -153,19 +150,29 @@\n \t\t}\n \t}\n \n-\tvoid expect_verb(verb_t expected) {\n+\tinline void handle_response(TableJob &table_job, RowReplacer<DatabaseClient> &row_replacer) {\n \t\tverb_t verb;\n \t\tinput >> verb;\n-\t\tif (verb != expected) {\n-\t\t\tthrow command_error(\"Expected command \" + to_string(verb) + \" but received \" + to_string(verb));\n-\t\t}\n-\t}\n-\n-\tvoid establish_range(TableJob &table_job) {\n-\t\tsend_command(output, Commands::RANGE, table_job.table.name);\n-\t\tif (worker.verbose > 1) cout << timestamp() << \" <- range \" << table_job.table.name << endl;\n-\t\texpect_verb(Commands::RANGE);\n-\n+\n+\t\tswitch (verb) {\n+\t\t\tcase Commands::HASH:\n+\t\t\t\thandle_hash_response(table_job);\n+\t\t\t\tbreak;\n+\n+\t\t\tcase Commands::ROWS:\n+\t\t\t\thandle_rows_response(table_job.table, row_replacer);\n+\t\t\t\tbreak;\n+\n+\t\t\tcase Commands::RANGE:\n+\t\t\t\thandle_range_response(table_job);\n+\t\t\t\tbreak;\n+\n+\t\t\tdefault:\n+\t\t\t\tthrow command_error(\"Unexpected command \" + to_string(verb));\n+\t\t}\n+\t}\n+\n+\tvoid handle_range_response(TableJob &table_job) {\n \t\tstring _table_name;\n \t\tColumnValues their_first_key, their_last_key;\n \t\tread_all_arguments(input, _table_name, their_first_key, their_last_key);\n@@ -199,13 +206,13 @@\n \t\t}\n \t}\n \n-\tvoid handle_rows_command(const Table &table, RowReplacer<DatabaseClient> &row_replacer) {\n+\tvoid handle_rows_response(const Table &table, RowReplacer<DatabaseClient> &row_replacer) {\n \t\t\/\/ we're being sent a range of rows; apply them to our end. we do this in-context to\n \t\t\/\/ provide flow control - if we buffered and used a separate apply thread, we would\n \t\t\/\/ bloat up if this end couldn't write to disk as quickly as the other end sent data.\n-\t\tstring _table_name;\n+\t\tstring table_name;\n \t\tColumnValues prev_key, last_key;\n-\t\tread_array(input, _table_name, prev_key, last_key); \/\/ the first array gives the range arguments, which is followed by one array for each row\n+\t\tread_array(input, table_name, prev_key, last_key); \/\/ the first array gives the range arguments, which is followed by one array for each row\n \t\tif (worker.verbose > 1) cout << timestamp() << \" -> rows \" << table.name << ' ' << values_list(client, table, prev_key) << ' ' << values_list(client, table, last_key) << endl;\n \n \t\tRowRangeApplier<DatabaseClient>(row_replacer, table, prev_key, last_key).stream_from_input(input);\n@@ -220,7 +227,7 @@\n \t\tthrow command_error(\"Haven't issued a hash command for \" + table_job.table.name + \" \" + values_list(client, table_job.table, prev_key) + \" \" + values_list(client, table_job.table, last_key));\n \t}\n \n-\tvoid handle_hash_command(TableJob &table_job) {\n+\tvoid handle_hash_response(TableJob &table_job) {\n \t\tsize_t rows_to_hash, their_row_count;\n \t\tstring their_hash;\n \t\tstring table_name;\n"} {"commit":"f3375d5afc9bece6d6dd66650d346383d0bfde5e","subject":"more refactoring to make the queue less stateful","message":"more refactoring to make the queue less stateful\n","repos":"willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync,willbryant\/kitchen_sync","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sync_to_protocol.h\n+++ src\/sync_to_protocol.h\n@@ -22,8 +22,7 @@\n \t\toutput(worker.output),\n \t\thash_algorithm(worker.configured_hash_algorithm),\n \t\ttarget_minimum_block_size(1),\n-\t\ttarget_maximum_block_size(DEFAULT_MAXIMUM_BLOCK_SIZE),\n-\t\trows_to_scan_forward_next(1) {\n+\t\ttarget_maximum_block_size(DEFAULT_MAXIMUM_BLOCK_SIZE) {\n \t}\n \n \tvoid negotiate_target_minimum_block_size() {\n@@ -134,17 +133,7 @@\n \t\t\t\t\t\/\/ the rest of the table); queue it to be scanned\n \t\t\t\t\tif (estimated_rows_in_range == UNKNOWN_ROW_COUNT) {\n \t\t\t\t\t\t\/\/ we're scanning forward, do that last\n-\t\t\t\t\t\tif (match) {\n-\t\t\t\t\t\t\t\/\/ on the next iteration, scan more rows per iteration, to reduce the impact of latency between the ends -\n-\t\t\t\t\t\t\t\/\/ up to a point, after which the cost of re-work when we finally run into a mismatch outweights the\n-\t\t\t\t\t\t\t\/\/ benefit of the latency savings\n-\t\t\t\t\t\t\tincrease_scan_size(hasher);\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\t\/\/ on the next iteration, scan fewer rows per iteration, to reduce the cost of re-work (down to a point)\n-\t\t\t\t\t\t\tdecrease_scan_size(hasher);\n-\t\t\t\t\t\t}\n-\n-\t\t\t\t\t\ttable_job.ranges_to_check.push_back(make_tuple(hasher.last_key, last_key, UNKNOWN_ROW_COUNT, rows_to_scan_forward_next));\n+\t\t\t\t\t\ttable_job.ranges_to_check.push_back(make_tuple(hasher.last_key, last_key, UNKNOWN_ROW_COUNT, rows_to_scan_forward_next(rows_to_hash, match, hasher)));\n \t\t\t\t\t} else {\n \t\t\t\t\t\t\/\/ we're hunting errors, do that first\n \t\t\t\t\t\tsize_t rows_remaining = estimated_rows_in_range - hasher.row_count;\n@@ -249,33 +238,33 @@\n \t\t}\n \t}\n \n-\tinline size_t decide_rows_to_hash(size_t estimated_rows_in_range) {\n-\t\tif (estimated_rows_in_range == UNKNOWN_ROW_COUNT) {\n-\t\t\t\/\/ scan forward\n-\t\t\treturn rows_to_scan_forward_next;\n-\t\t} else if (estimated_rows_in_range > 3) {\n+\tinline size_t decide_rows_to_hash(size_t rows_in_range) {\n+\t\tif (rows_in_range > 3) {\n \t\t\t\/\/ break the range into two\n-\t\t\treturn estimated_rows_in_range\/2;\n+\t\t\treturn rows_in_range\/2;\n \t\t} else {\n \t\t\t\/\/ down to single-row territory already\n \t\t\treturn 1;\n \t\t}\n \t}\n \n-\tinline void increase_scan_size(const RowHasher &hasher) {\n-\t\tif (hasher.size <= target_maximum_block_size\/2) {\n-\t\t\trows_to_scan_forward_next = hasher.row_count*2;\n+\tinline size_t rows_to_scan_forward_next(size_t rows_scanned, bool match, const RowHasher &hasher) {\n+\t\tif (match) {\n+\t\t\t\/\/ on the next iteration, scan more rows per iteration, to reduce the impact of latency between the ends -\n+\t\t\t\/\/ up to a point, after which the cost of re-work when we finally run into a mismatch outweights the\n+\t\t\t\/\/ benefit of the latency savings\n+\t\t\tif (hasher.size <= target_maximum_block_size\/2) {\n+\t\t\t\treturn hasher.row_count*2;\n+\t\t\t} else {\n+\t\t\t\treturn max<size_t>(hasher.row_count*target_maximum_block_size\/hasher.size, 1);\n+\t\t\t}\n \t\t} else {\n-\t\t\trows_to_scan_forward_next = max<size_t>(hasher.row_count*target_maximum_block_size\/hasher.size, 1);\n-\t\t}\n-\t}\n-\n-\tinline void decrease_scan_size(const RowHasher &hasher) {\n-\t\t\/\/ on the next iteration, scan fewer rows per iteration, to reduce the cost of re-work (down to a point)\n-\t\tif (hasher.size >= target_minimum_block_size*2) {\n-\t\t\trows_to_scan_forward_next = max<size_t>(hasher.row_count\/2, 1);\n-\t\t} else {\n-\t\t\trows_to_scan_forward_next = max<size_t>(hasher.row_count*target_minimum_block_size\/hasher.size, 1);\n+\t\t\t\/\/ on the next iteration, scan fewer rows per iteration, to reduce the cost of re-work (down to a point)\n+\t\t\tif (hasher.size >= target_minimum_block_size*2) {\n+\t\t\t\treturn max<size_t>(hasher.row_count\/2, 1);\n+\t\t\t} else {\n+\t\t\t\treturn max<size_t>(hasher.row_count*target_minimum_block_size\/hasher.size, 1);\n+\t\t\t}\n \t\t}\n \t}\n \n@@ -287,5 +276,4 @@\n \tHashAlgorithm hash_algorithm;\n \tsize_t target_minimum_block_size;\n \tsize_t target_maximum_block_size;\n-\tsize_t rows_to_scan_forward_next;\n };\n"} {"commit":"963c840c98dbdcd7b27ea37890fd2352630fd568","subject":"fixed unix build","message":"fixed unix build\n","repos":"Totopolis\/dataserver,Totopolis\/dataserver,Totopolis\/dataserver,Totopolis\/dataserver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/system\/maketable.h\n+++ src\/system\/maketable.h\n@@ -258,11 +258,11 @@\n >;\r\n \r\n template<class T>\r\n- ret_expr<T, operator_::OR> && operator | (T const &) {\r\n+ ret_expr<T, operator_::OR> operator | (T const &) {\r\n return {};\r\n }\r\n template<class T>\r\n- ret_expr<T, operator_::AND> && operator && (T const &) {\r\n+ ret_expr<T, operator_::AND> operator && (T const &) {\r\n return {};\r\n }\r\n record_range VALUES() {\r\n@@ -281,11 +281,11 @@\n >;\r\n public:\r\n template<class T>\r\n- ret_expr<T, operator_::OR> && operator | (T const &) {\r\n+ ret_expr<T, operator_::OR> operator | (T const &) {\r\n return {};\r\n }\r\n template<class T>\r\n- ret_expr<T, operator_::AND> && operator && (T const &) {\r\n+ ret_expr<T, operator_::AND> operator && (T const &) {\r\n return {};\r\n }\r\n };\r\n"} {"commit":"7381e40933180cbaa2328aacbfe5ca6b439791dd","subject":"Pass all regression tests","message":"Pass all regression tests\n","repos":"unisys12\/phalcon-hhvm,Zaszczyk\/cphalcon,Zaszczyk\/cphalcon,Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,Zaszczyk\/cphalcon,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm,unisys12\/phalcon-hhvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ext\/tag.c\n+++ ext\/tag.c\n@@ -371,15 +371,7 @@\n \t\t\tPHALCON_OBS_NVAR(value);\n \t\t\tphalcon_array_fetch(&value, _POST, name, PH_NOISY);\n \t\t} else {\n-\t\t\t\/**\n-\t\t\t * Check if there is a parameter with the 'value'\n-\t\t\t *\/\n-\t\t\tif (phalcon_array_isset_string(params, SS(\"value\"))) {\n-\t\t\t\tPHALCON_OBS_NVAR(value);\n-\t\t\t\tphalcon_array_fetch_string(&value, params, SL(\"value\"), PH_NOISY);\n-\t\t\t} else {\n-\t\t\t\tRETURN_MM_NULL();\n-\t\t\t}\n+\t\t\tRETURN_MM_NULL();\n \t\t}\n \t}\n \n"} {"commit":"6947b1b35999e7937eaed427fdbe8221526a27d5","subject":"Handle windows path separator","message":"Handle windows path separator\n","repos":"burke\/matcher","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- matcher.c\n+++ matcher.c\n@@ -21,6 +21,12 @@\n int never_show_dot_files; \/\/ boolean\n } matchinfo_t;\n \n+#ifdef _WIN32\n+#define IS_PATHSEP(c) (c == '\\\\' || c == '\/')\n+#else\n+#define IS_PATHSEP(c) (c == '\\\\')\n+#endif\n+\n double recursive_match(matchinfo_t *m, \/\/ sharable meta-data\n long str_idx, \/\/ where in the path string to start\n long abbrev_idx, \/\/ where in the search string to start\n@@ -41,7 +47,7 @@\n for (j = str_idx; j < m->str_len; j++, str_idx++) {\n char d = m->str_p[j];\n if (d == '.') {\n- if (j == 0 || m->str_p[j - 1] == '\/') {\n+ if (j == 0 || IS_PATHSEP(m->str_p[j - 1])) {\n m->dot_file = 1; \/\/ this is a dot-file\n if (dot_search) \/\/ and we are searching for a dot\n dot_file_match = 1; \/\/ so this must be a match\n@@ -60,7 +66,7 @@\n double factor = 1.0;\n char last = m->str_p[j - 1];\n char curr = m->str_p[j]; \/\/ case matters, so get again\n- if (last == '\/')\n+ if (IS_PATHSEP(last))\n factor = 0.9;\n else if (last == '-' ||\n last == '_' ||\n@@ -124,7 +130,7 @@\n if (!m.always_show_dot_files) {\n for (i = 0; i < m.str_len; i++) {\n char c = m.str_p[i];\n- if (c == '.' && (i == 0 || m.str_p[i - 1] == '\/')) {\n+ if (c == '.' && (i == 0 || IS_PATHSEP(m.str_p[i - 1]))) {\n score = 0.0;\n break;\n }\n"} {"commit":"c314b0b643dfcffd3c99f9c8c7368296d8a94182","subject":"Fix crash when built with the latest versions of gcc and clang","message":"Fix crash when built with the latest versions of gcc and clang\n","repos":"Davidebyzero\/RegexMathEngine,Davidebyzero\/RegexMathEngine","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- matcher.h\n+++ matcher.h\n@@ -13,6 +13,8 @@\n \r\n #pragma warning(push)\r\n #pragma warning(disable : 4355)\r\n+\r\n+#pragma pack( push, 1 )\r\n \r\n extern RegexPattern *nullAlternative;\r\n extern RegexSymbol *nullSymbol;\r\n@@ -1484,4 +1486,6 @@\n }\r\n }\r\n \r\n+#pragma pack( pop )\r\n+\r\n #pragma warning(pop)\r\n"} {"commit":"62a1e706a94d329ea2f4247770fe338898ca2c4e","subject":"extopts: Fix for initial emptying no-argument parameters.","message":"extopts: Fix for initial emptying no-argument parameters.\n","repos":"githaff\/embox,githaff\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- extopts.c\n+++ extopts.c\n@@ -314,7 +314,7 @@\n break;\n \n if (opts[i].arg_type == EXTOPT_ARGTYPE_NO_ARG)\n- *opts[i].arg.flag_addr = 1;\n+ *opts[i].arg.flag_addr = 0;\n \n i++;\n }\n"} {"commit":"d75596554d1bc4030993bab03ac612ad8a9af914","subject":"Added write species functionality to extract.","message":"Added write species functionality to extract.\n","repos":"mzemp\/manipulationtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extract.c\n+++ extract.c\n@@ -17,7 +17,7 @@\n void usage(void);\n \n int main(int argc, char **argv) {\n-\n+\t\n int i;\n int shift, delta;\n int minint, maxint;\n@@ -25,6 +25,7 @@\n int txtoutput, tsoutput, arrayfile;\n int positionprecision;\n int integerindex, floatindex, doubleindex, index;\n+\tint writegas, writedark, writestar, ID;\n double min, max;\n char outname[100], tempname1[100], tempname2[100], arrayfilename[100];\n TIPSY_HEADER thin, thout;\n@@ -53,6 +54,9 @@\n positionprecision = 0;\n shift = 0;\n delta = 1;\n+\twritegas = 1;\n+\twritedark = 1;\n+\twritestar = 1;\n fin1 = NULL;\n fin2 = NULL;\n fout1 = NULL;\n@@ -70,69 +74,73 @@\n positionprecision = 1;\n i++;\n }\n-\telse if (strcmp(argv[i],\"-shift\") == 0) {\n-\t i++;\n-\t if (i >= argc) {\n-\t\tusage();\n-\t\t}\n-\t shift = atoi(argv[i]);\n-\t i++;\n-\t }\n-\telse if (strcmp(argv[i],\"-delta\") == 0) {\n-\t i++;\n-\t if (i >= argc) {\n-\t\tusage();\n-\t\t}\n-\t delta = atoi(argv[i]);\n-\t i++;\n-\t }\n-\telse if (strcmp(argv[i],\"-min\") == 0) {\n-\t i++;\n-\t if (i >= argc) {\n-\t\tusage();\n-\t\t}\n-\t min = atof(argv[i]);\n-\t i++;\n-\t }\n-\telse if (strcmp(argv[i],\"-max\") == 0) {\n-\t i++;\n-\t if (i >= argc) {\n-\t\tusage();\n-\t\t}\n-\t max = atof(argv[i]);\n-\t i++;\n-\t }\n-\telse if (strcmp(argv[i],\"-format\") == 0) {\n-\t i++;\n-\t if (i >= argc) {\n-\t\tusage();\n-\t\t}\n-\t if (strcmp(argv[i],\"txt\") == 0) {\n-\t\ttxtoutput = 1;\n-\t\ttsoutput = 0;\n-\t\t}\n-\t else if (strcmp(argv[i],\"ts\") == 0) {\n-\t\ttxtoutput = 0;\n-\t\ttsoutput = 1;\n-\t\t}\n-\t else {\n-\t\tusage();\n-\t\t}\n-\t i++;\n-\t }\n+\t\telse if (strcmp(argv[i],\"-writegas\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\twritegas = atoi(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-writedark\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\twritedark = atoi(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-writestar\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\twritestar = atoi(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-shift\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\tshift = atoi(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-delta\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\tdelta = atoi(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-min\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\tmin = atof(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-max\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\tmax = atof(argv[i]);\n+\t\t\ti++;\n+\t\t\t}\n+\t\telse if (strcmp(argv[i],\"-format\") == 0) {\n+\t\t\ti++;\n+\t\t\tif (i >= argc) usage();\n+\t\t\tif (strcmp(argv[i],\"txt\") == 0) {\n+\t\t\t\ttxtoutput = 1;\n+\t\t\t\ttsoutput = 0;\n+\t\t\t\t}\n+\t\t\telse if (strcmp(argv[i],\"ts\") == 0) {\n+\t\t\t\ttxtoutput = 0;\n+\t\t\t\ttsoutput = 1;\n+\t\t\t\t}\n+\t\t\telse {\n+\t\t\t\tusage();\n+\t\t\t\t}\n+\t\t\ti++;\n+\t\t\t}\n else if (strcmp(argv[i],\"-o\") == 0) {\n i++;\n- if (i >= argc) {\n- usage();\n- }\n+ if (i >= argc) usage();\n strcpy(outname,argv[i]);\n i++;\n }\n else if (strcmp(argv[i],\"-index\") == 0) {\n i++;\n- if (i >= argc) {\n- usage();\n- }\n+ if (i >= argc) usage();\n if (strcmp(argv[i],\"i\") == 0) {\n integerindex = 1;\n }\n@@ -146,322 +154,324 @@\n usage();\n }\n i++;\n- if (i >= argc) {\n- usage();\n- }\n+ if (i >= argc) usage();\n index = atoi(argv[i])-1;\n i++;\n }\n else if (strcmp(argv[i],\"-array\") == 0) {\n i++;\n- if (i >= argc) {\n- usage();\n- }\n+ if (i >= argc) usage();\n arrayfile = 1;\n strcpy(arrayfilename,argv[i]);\n i++;\n }\n-\telse if ((strcmp(argv[i],\"-h\") == 0) || (strcmp(argv[i],\"-help\") == 0)) {\n-\t usage();\n-\t }\n-\telse {\n-\t usage();\n-\t }\n-\t}\n+\t\telse if ((strcmp(argv[i],\"-h\") == 0) || (strcmp(argv[i],\"-help\") == 0)) {\n+\t\t\tusage();\n+\t\t\t}\n+\t\telse {\n+\t\t\tusage();\n+\t\t\t}\n+\t\t}\n if (integerindex == 1) {\n-\tminint = (int) min;\n-\tmaxint = (int) max;\n-\t}\n+\t\tminint = (int) min;\n+\t\tmaxint = (int) max;\n+\t\t}\n+\n \/*\n ** Read & write particles\n *\/\n+\n xdrstdio_create(&xdrsin1,stdin,XDR_DECODE);\n read_tipsy_xdr_header(&xdrsin1,&thin);\n if (txtoutput == 1) {\n-\tsprintf(tempname1,\"%s.extract.txt\",outname);\n-\tfout1 = fopen(tempname1,\"w\");\n-\tassert(fout1 != NULL);\n-\tthout.ngas = 0;\n-\tthout.ndark = 0;\n-\tthout.nstar = 0;\n-\t}\n+\t\tsprintf(tempname1,\"%s.extract.txt\",outname);\n+\t\tfout1 = fopen(tempname1,\"w\");\n+\t\tassert(fout1 != NULL);\n+\t\tfprintf(fout1,\"#ID rx ry rz vx vy vz\\n\");\n+\t\tthout.time = thin.time;\n+\t\tthout.ntotal = 0;\n+\t\tthout.ndim = thin.ndim;\n+\t\tthout.ngas = 0;\n+\t\tthout.ndark = 0;\n+\t\tthout.nstar = 0;\n+\t\t}\n else if (tsoutput == 1) {\n-\t\/*\n-\t** Write out temporary file to be replaced later\n-\t*\/\n-\tsprintf(tempname1,\"tf1_%s\",outname);\n-\tfout1 = fopen(tempname1,\"w\");\n-\tassert(fout1 != NULL);\n-\txdrstdio_create(&xdrsout1,fout1,XDR_ENCODE);\n-\tthout.time = thin.time;\n-\tthout.ntotal = 0;\n-\tthout.ndim = thin.ndim;\n-\tthout.ngas = 0;\n-\tthout.ndark = 0;\n-\tthout.nstar = 0;\n-\twrite_tipsy_xdr_header(&xdrsout1,&thin);\n-\t}\n+\t\t\/*\n+\t\t** Write out temporary file to be replaced later\n+\t\t*\/\n+\t\tsprintf(tempname1,\"tf1_%s\",outname);\n+\t\tfout1 = fopen(tempname1,\"w\");\n+\t\tassert(fout1 != NULL);\n+\t\txdrstdio_create(&xdrsout1,fout1,XDR_ENCODE);\n+\t\tthout.time = thin.time;\n+\t\tthout.ntotal = 0;\n+\t\tthout.ndim = thin.ndim;\n+\t\tthout.ngas = 0;\n+\t\tthout.ndark = 0;\n+\t\tthout.nstar = 0;\n+\t\twrite_tipsy_xdr_header(&xdrsout1,&thin);\n+\t\t}\n if (arrayfile == 1) {\n fin2 = fopen(arrayfilename,\"r\");\n assert(fin2 != NULL);\n xdrstdio_create(&xdrsin2,fin2,XDR_DECODE);\n read_array_xdr_header(&xdrsin2,&ahin);\n-\tassert(ahin.N[0] == thin.ntotal);\n-\t\/*\n-\t** Write out temporary file to be replaced later\n-\t*\/\n-\tsprintf(tempname2,\"tf2_%s\",outname);\n-\tfout2 = fopen(tempname2,\"w\");\n-\tassert(fout2 != NULL);\n-\txdrstdio_create(&xdrsout2,fout2,XDR_ENCODE);\n-\tahout.N[0] = 0;\n-\tahout.N[1] = ahin.N[1];\n-\tahout.N[2] = ahin.N[2];\n-\tahout.N[3] = ahin.N[3];\n-\tallocate_array_particle(&ahout,&ap);\n-\twrite_array_xdr_header(&xdrsout2,&ahout);\n-\t}\n+\t\tassert(ahin.N[0] == thin.ntotal);\n+\t\t\/*\n+\t\t** Write out temporary file to be replaced later\n+\t\t*\/\n+\t\tsprintf(tempname2,\"tf2_%s\",outname);\n+\t\tfout2 = fopen(tempname2,\"w\");\n+\t\tassert(fout2 != NULL);\n+\t\txdrstdio_create(&xdrsout2,fout2,XDR_ENCODE);\n+\t\tahout.N[0] = 0;\n+\t\tahout.N[1] = ahin.N[1];\n+\t\tahout.N[2] = ahin.N[2];\n+\t\tahout.N[3] = ahin.N[3];\n+\t\tallocate_array_particle(&ahout,&ap);\n+\t\twrite_array_xdr_header(&xdrsout2,&ahout);\n+\t\t}\n if (positionprecision == 0) {\n-\tfor (i = 0; i < thin.ngas; i++) {\n-\t read_tipsy_xdr_gas(&xdrsin1,&gp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\tfor (i = 0; i < thin.ngas; i++) {\n+\t\t\tread_tipsy_xdr_gas(&xdrsin1,&gp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writegas) {\n+\t\t\t\tthout.ngas++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.6e %+.6e %+.6e %+.6e %+.6e %+.6e\\n\",ID,gp.pos[0],gp.pos[1],gp.pos[2],gp.vel[0],gp.vel[1],gp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_gas(&xdrsout1,&gp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\tfor (i = 0; i < thin.ndark; i++) {\n+\t\t\tread_tipsy_xdr_dark(&xdrsin1,&dp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writedark) {\n+\t\t\t\tthout.ndark++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas + thout.ndark;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.6e %+.6e %+.6e %+.6e %+.6e %+.6e\\n\",ID,dp.pos[0],dp.pos[1],dp.pos[2],dp.vel[0],dp.vel[1],dp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_dark(&xdrsout1,&dp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\tfor (i = 0; i < thin.nstar; i++) {\n+\t\t\tread_tipsy_xdr_star(&xdrsin1,&sp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.ngas++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.6e %+.6e %+.6e %+.6e %+.6e %+.6e \",gp.pos[0],gp.pos[1],gp.pos[2],gp.vel[0],gp.vel[1],gp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_gas(&xdrsout1,&gp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\tfor (i = 0; i < thin.ndark; i++) {\n-\t read_tipsy_xdr_dark(&xdrsin1,&dp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writestar) {\n+\t\t\t\tthout.nstar++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas + thout.ndark + thout.nstar;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.6e %+.6e %+.6e %+.6e %+.6e %+.6e\\n\",ID,sp.pos[0],sp.pos[1],sp.pos[2],sp.vel[0],sp.vel[1],sp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_star(&xdrsout1,&sp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+ else if (positionprecision == 1) {\n+\t\tfor (i = 0; i < thin.ngas; i++) {\n+\t\t\tread_tipsy_xdr_gas_dpp(&xdrsin1,&gpdpp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writegas) {\n+\t\t\t\tthout.ngas++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.14e %+.14e %+.14e %+.6e %+.6e %+.6e\\n\",ID,gpdpp.pos[0],gpdpp.pos[1],gpdpp.pos[2],gpdpp.vel[0],gpdpp.vel[1],gpdpp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_gas_dpp(&xdrsout1,&gpdpp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\tfor (i = 0; i < thin.ndark; i++) {\n+\t\t\tread_tipsy_xdr_dark_dpp(&xdrsin1,&dpdpp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writedark) {\n+\t\t\t\tthout.ndark++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas + thout.ndark;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.14e %+.14e %+.14e %+.6e %+.6e %+.6e\\n\",ID,dpdpp.pos[0],dpdpp.pos[1],dpdpp.pos[2],dpdpp.vel[0],dpdpp.vel[1],dpdpp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_dark_dpp(&xdrsout1,&dpdpp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\tfor (i = 0; i < thin.nstar; i++) {\n+\t\t\tread_tipsy_xdr_star_dpp(&xdrsin1,&spdpp);\n \t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.ndark++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.6e %+.6e %+.6e %+.6e %+.6e %+.6e \",dp.pos[0],dp.pos[1],dp.pos[2],dp.vel[0],dp.vel[1],dp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_dark(&xdrsout1,&dp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\tfor (i = 0; i < thin.nstar; i++) {\n-\t read_tipsy_xdr_star(&xdrsin1,&sp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.nstar++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.6e %+.6e %+.6e %+.6e %+.6e %+.6e \",sp.pos[0],sp.pos[1],sp.pos[2],sp.vel[0],sp.vel[1],sp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_star(&xdrsout1,&sp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\t}\n- else if (positionprecision == 1) {\n-\tfor (i = 0; i < thin.ngas; i++) {\n-\t read_tipsy_xdr_gas_dpp(&xdrsin1,&gpdpp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.ngas++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.14e %+.14e %+.14e %+.6e %+.6e %+.6e \",gpdpp.pos[0],gpdpp.pos[1],gpdpp.pos[2],gpdpp.vel[0],gpdpp.vel[1],gpdpp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_gas_dpp(&xdrsout1,&gpdpp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\tfor (i = 0; i < thin.ndark; i++) {\n-\t read_tipsy_xdr_dark_dpp(&xdrsin1,&dpdpp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.ndark++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.14e %+.14e %+.14e %+.6e %+.6e %+.6e \",dpdpp.pos[0],dpdpp.pos[1],dpdpp.pos[2],dpdpp.vel[0],dpdpp.vel[1],dpdpp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_dark_dpp(&xdrsout1,&dpdpp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\tfor (i = 0; i < thin.nstar; i++) {\n-\t read_tipsy_xdr_star_dpp(&xdrsin1,&spdpp);\n-\t arrayselection = 1;\n-\t if (arrayfile == 1) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n-\t\tarrayselection = 0;\n-\t\tif (integerindex == 1) {\n-\t\t if ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (floatindex == 1) {\n-\t\t if ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\telse if (doubleindex == 1) {\n-\t\t if ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n-\t\t\tarrayselection = 1;\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t if (((i+1-shift)%delta == 0) && arrayselection) {\n-\t\tthout.nstar++;\n-\t\tif (txtoutput == 1) {\n-\t\t fprintf(fout1,\"%+.14e %+.14e %+.14e %+.6e %+.6e %+.6e \",spdpp.pos[0],spdpp.pos[1],spdpp.pos[2],spdpp.vel[0],spdpp.vel[1],spdpp.vel[2]);\n-\t\t fprintf(fout1,\"\\n\");\n-\t\t }\n-\t\telse if (tsoutput == 1) {\n-\t\t write_tipsy_xdr_star_dpp(&xdrsout1,&spdpp);\n-\t\t if (arrayfile == 1) {\n-\t\t\tahout.N[0]++;\n-\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t\t}\n-\t\t }\n-\t\t}\n-\t }\n-\t}\n+\t\t\tif (arrayfile == 1) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahin,&ap);\n+\t\t\t\tarrayselection = 0;\n+\t\t\t\tif (integerindex == 1) {\n+\t\t\t\t\tif ((ap.ia[index] <= maxint) && (ap.ia[index] >= minint)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (floatindex == 1) {\n+\t\t\t\t\tif ((ap.fa[index] <= max) && (ap.fa[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\telse if (doubleindex == 1) {\n+\t\t\t\t\tif ((ap.da[index] <= max) && (ap.da[index] >= min)) {\n+\t\t\t\t\t\tarrayselection = 1;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\tif (((i+1-shift)%delta == 0) && arrayselection && writestar) {\n+\t\t\t\tthout.nstar++;\n+\t\t\t\tif (txtoutput == 1) {\n+\t\t\t\t\tID = thout.ngas + thout.ndark + thout.nstar;\n+\t\t\t\t\tfprintf(fout1,\"%d %+.14e %+.14e %+.14e %+.6e %+.6e %+.6e\\n\",ID,spdpp.pos[0],spdpp.pos[1],spdpp.pos[2],spdpp.vel[0],spdpp.vel[1],spdpp.vel[2]);\n+\t\t\t\t\t}\n+\t\t\t\telse if (tsoutput == 1) {\n+\t\t\t\t\twrite_tipsy_xdr_star_dpp(&xdrsout1,&spdpp);\n+\t\t\t\t\tif (arrayfile == 1) {\n+\t\t\t\t\t\tahout.N[0]++;\n+\t\t\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n thout.ntotal = thout.ngas + thout.ndark + thout.nstar;\n xdr_destroy(&xdrsin1);\n if (txtoutput == 1) {\n-\tfclose(fout1);\n-\t}\n+\t\tfclose(fout1);\n+\t\t}\n else if (tsoutput == 1) {\n-\txdr_destroy(&xdrsout1);\n-\t}\n+\t\txdr_destroy(&xdrsout1);\n+\t\t}\n if (arrayfile == 1) {\n-\tassert(thout.ntotal == ahout.N[0]);\n-\txdr_destroy(&xdrsin2);\n-\tif (tsoutput == 1) {\n-\t xdr_destroy(&xdrsout2);\n-\t }\n-\t}\n+\t\tassert(thout.ntotal == ahout.N[0]);\n+\t\txdr_destroy(&xdrsin2);\n+\t\tif (tsoutput == 1) {\n+\t\t\txdr_destroy(&xdrsout2);\n+\t\t\t}\n+\t\t}\n \/*\n ** Give some output\n *\/\n@@ -472,79 +482,82 @@\n ** Now read temporary files again and correct header for tipsy standard output\n *\/\n if (tsoutput == 1) {\n-\tfin1 = fopen(tempname1,\"r\");\n-\tassert(fin1 != NULL);\n-\txdrstdio_create(&xdrsin1,fin1,XDR_DECODE);\n-\tsprintf(tempname1,\"%s.extract.std\",outname);\n-\tfout1 = fopen(tempname1,\"w\");\n-\tassert(fout1 != NULL);\n-\txdrstdio_create(&xdrsout1,fout1,XDR_ENCODE);\n-\tread_tipsy_xdr_header(&xdrsin1,&thin);\n-\twrite_tipsy_xdr_header(&xdrsout1,&thout);\n-\tfor (i = 0; i < thout.ngas; i++) { \n-\t read_tipsy_xdr_gas(&xdrsin1,&gp);\n-\t write_tipsy_xdr_gas(&xdrsout1,&gp);\n-\t }\n-\tfor (i = 0; i < thout.ndark; i++) {\n-\t read_tipsy_xdr_dark(&xdrsin1,&dp);\n-\t write_tipsy_xdr_dark(&xdrsout1,&dp);\n-\t }\n-\tfor (i = 0; i < thout.nstar; i++) {\n-\t read_tipsy_xdr_star(&xdrsin1,&sp);\n-\t write_tipsy_xdr_star(&xdrsout1,&sp);\n-\t }\n-\txdr_destroy(&xdrsin1);\n-\txdr_destroy(&xdrsout1);\n-\tfclose(fin1);\n-\tfclose(fout1);\n-\tif (arrayfile == 1) {\n-\t fin2 = fopen(tempname2,\"r\");\n-\t assert(fin2 != NULL);\n-\t xdrstdio_create(&xdrsin2,fin2,XDR_DECODE);\n-\t sprintf(tempname2,\"%s.extract.array.std\",outname);\n-\t fout2 = fopen(tempname2,\"w\");\n-\t assert(fout2 != NULL);\n-\t xdrstdio_create(&xdrsout2,fout2,XDR_ENCODE);\n-\t read_array_xdr_header(&xdrsin2,&ahin);\n-\t write_array_xdr_header(&xdrsout2,&ahout);\n-\t for (i = 0; i < thout.ngas; i++) { \n-\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n-\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t}\n-\t for (i = 0; i < thout.ndark; i++) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n-\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t}\n-\t for (i = 0; i < thout.nstar; i++) {\n-\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n-\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n-\t\t}\n-\t xdr_destroy(&xdrsin2);\n-\t xdr_destroy(&xdrsout2);\n-\t fclose(fin2);\n-\t fclose(fout2);\n-\t }\n-\t}\n+\t\tfin1 = fopen(tempname1,\"r\");\n+\t\tassert(fin1 != NULL);\n+\t\txdrstdio_create(&xdrsin1,fin1,XDR_DECODE);\n+\t\tsprintf(tempname1,\"%s.extract.std\",outname);\n+\t\tfout1 = fopen(tempname1,\"w\");\n+\t\tassert(fout1 != NULL);\n+\t\txdrstdio_create(&xdrsout1,fout1,XDR_ENCODE);\n+\t\tread_tipsy_xdr_header(&xdrsin1,&thin);\n+\t\twrite_tipsy_xdr_header(&xdrsout1,&thout);\n+\t\tfor (i = 0; i < thout.ngas; i++) { \n+\t\t\tread_tipsy_xdr_gas(&xdrsin1,&gp);\n+\t\t\twrite_tipsy_xdr_gas(&xdrsout1,&gp);\n+\t\t\t}\n+\t\tfor (i = 0; i < thout.ndark; i++) {\n+\t\t\tread_tipsy_xdr_dark(&xdrsin1,&dp);\n+\t\t\twrite_tipsy_xdr_dark(&xdrsout1,&dp);\n+\t\t\t}\n+\t\tfor (i = 0; i < thout.nstar; i++) {\n+\t\t\tread_tipsy_xdr_star(&xdrsin1,&sp);\n+\t\t\twrite_tipsy_xdr_star(&xdrsout1,&sp);\n+\t\t\t}\n+\t\txdr_destroy(&xdrsin1);\n+\t\txdr_destroy(&xdrsout1);\n+\t\tfclose(fin1);\n+\t\tfclose(fout1);\n+\t\tif (arrayfile == 1) {\n+\t\t\tfin2 = fopen(tempname2,\"r\");\n+\t\t\tassert(fin2 != NULL);\n+\t\t\txdrstdio_create(&xdrsin2,fin2,XDR_DECODE);\n+\t\t\tsprintf(tempname2,\"%s.extract.array.std\",outname);\n+\t\t\tfout2 = fopen(tempname2,\"w\");\n+\t\t\tassert(fout2 != NULL);\n+\t\t\txdrstdio_create(&xdrsout2,fout2,XDR_ENCODE);\n+\t\t\tread_array_xdr_header(&xdrsin2,&ahin);\n+\t\t\twrite_array_xdr_header(&xdrsout2,&ahout);\n+\t\t\tfor (i = 0; i < thout.ngas; i++) { \n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n+\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t}\n+\t\t\tfor (i = 0; i < thout.ndark; i++) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n+\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t}\n+\t\t\tfor (i = 0; i < thout.nstar; i++) {\n+\t\t\t\tread_array_xdr_particle(&xdrsin2,&ahout,&ap);\n+\t\t\t\twrite_array_xdr_particle(&xdrsout2,&ahout,&ap);\n+\t\t\t\t}\n+\t\t\txdr_destroy(&xdrsin2);\n+\t\t\txdr_destroy(&xdrsout2);\n+\t\t\tfclose(fin2);\n+\t\t\tfclose(fout2);\n+\t\t\t}\n+\t\t}\n exit(0);\n }\n \n void usage(void) {\n \n- fprintf(stderr,\"\\n\");\n- fprintf(stderr,\"Program extracts particles if the index i satisfies (i+shift) mod delta == 0\\n\");\n- fprintf(stderr,\"and (optional) if the array value v of the particle satisfies: min <= v <= max.\\n\\n\");\n- fprintf(stderr,\"You can specify the following arguments:\\n\\n\");\n- fprintf(stderr,\"-spp : set this flag if input and output file have single precision positions (default)\\n\");\n- fprintf(stderr,\"-dpp : set this flag if input and output file have double precision positions\\n\");\n- fprintf(stderr,\"-shift <value> : index shift (default: 0)\\n\");\n- fprintf(stderr,\"-delta <value> : index delta (default: 1)\\n\");\n- fprintf(stderr,\"-array <name> : array file\\n\");\n- fprintf(stderr,\"-index <type><n> : <type>: i (int), f (float) or d (double), <n> array index\\n\");\n- fprintf(stderr,\"-min <value> : min array value (default: 0)\\n\");\t \n- fprintf(stderr,\"-max <value> : max array value (default: 0)\\n\");\t \n- fprintf(stderr,\"-format <type> : output format <type>: txt or ts (default)\\n\");\t \n- fprintf(stderr,\"-o <name> : output file name base\\n\");\t \n- fprintf(stderr,\"< <name> : input file in tipsy standard binary format\\n\");\n- fprintf(stderr,\"\\n\");\n- exit(1);\n+\tfprintf(stderr,\"\\n\");\n+\tfprintf(stderr,\"Program extracts particles if the index i satisfies (i+shift) mod delta == 0\\n\");\n+\tfprintf(stderr,\"and (optional) if the array value v of the particle satisfies: min <= v <= max.\\n\\n\");\n+\tfprintf(stderr,\"You can specify the following arguments:\\n\\n\");\n+\tfprintf(stderr,\"-spp : set this flag if input and output file have single precision positions (default)\\n\");\n+\tfprintf(stderr,\"-dpp : set this flag if input and output file have double precision positions\\n\");\n+\tfprintf(stderr,\"-writegas <value> : 0 = don't write out gas \/ 1 = write out gas (default: 1)\\n\");\n+\tfprintf(stderr,\"-writedark <value> : 0 = don't write out dark matter \/ 1 = write out dark matter (default: 1)\\n\");\n+\tfprintf(stderr,\"-writestar <value> : 0 = don't write out stars \/ 1 = write out stars (default: 1)\\n\");\n+\tfprintf(stderr,\"-shift <value> : index shift (default: 0)\\n\");\n+\tfprintf(stderr,\"-delta <value> : index delta (default: 1)\\n\");\n+\tfprintf(stderr,\"-array <name> : array file\\n\");\n+\tfprintf(stderr,\"-index <type><n> : <type>: i (int), f (float) or d (double), <n> array index\\n\");\n+\tfprintf(stderr,\"-min <value> : min array value (default: 0)\\n\");\t \n+\tfprintf(stderr,\"-max <value> : max array value (default: 0)\\n\");\t \n+\tfprintf(stderr,\"-format <type> : output format <type>: txt or ts (default)\\n\");\t \n+\tfprintf(stderr,\"-o <name> : output file name base\\n\");\t \n+\tfprintf(stderr,\"< <name> : input file in tipsy standard binary format\\n\");\n+\tfprintf(stderr,\"\\n\");\n+\texit(1);\n }\n"} {"commit":"ed0ac568e3df92d4df9e89d1280da6f2a8ab5f43","subject":"Add C implementation of insertion sort.","message":"Add C implementation of insertion sort.\n","repos":"lorenzo-stoakes\/algoholic","returncode":1,"stderr":"error: pathspec 'sort\/isort.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- sort\/isort.c\n+++ sort\/isort.c\n@@ -0,0 +1,38 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+\n+const int N = 1e4;\n+\n+void\n+isort(int *ns, int n)\n+{\n+ int i, j, key;\n+\n+ for(i = 1; i < n; i++) {\n+ key = ns[i];\n+ for(j = i-1; j >= 0 && key < ns[j]; j--)\n+ ns[j+1] = ns[j];\n+ ns[j+1] = key;\n+ }\n+}\n+\n+int\n+main(void)\n+{\n+ int i;\n+ int *ns = malloc(sizeof(int)*N);\n+ for(i = 0; i < N; i++) {\n+ ns[i] = N-i;\n+ }\n+\n+ isort(ns, N);\n+\n+ for(i = 0; i < N; i++) {\n+ if(ns[i] != i+1) {\n+ fprintf(stderr, \"Index %d is %d, expected %d.\\n\", i, ns[i], i+1);\n+ exit(EXIT_FAILURE);\n+ }\n+ }\n+\n+ return EXIT_SUCCESS;\n+}\n"} {"commit":"c295738af040753dd9a5deaa30b0aaf0fa089e9e","subject":"BLE ctlr - Use updated host rx data API.","message":"BLE ctlr - Use updated host rx data API.\n\nX-Original-Commit: 83d62d26542621eb6061b371e7ad61272c0a0966\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_conn.c\n+++ nimble\/controller\/src\/ble_ll_conn.c\n@@ -104,7 +104,7 @@\n *\/\n \n \/* XXX: this does not belong here! Move to transport? *\/\n-extern int ble_hs_rx_data(struct os_mbuf **om);\n+extern int ble_hs_rx_data(struct os_mbuf *om);\n \n \/*\n * The amount of time that we will wait to hear the start of a receive\n@@ -2569,7 +2569,7 @@\n acl_hdr = (acl_hdr << 12) | connsm->conn_handle;\n htole16(rxbuf, acl_hdr);\n htole16(rxbuf + 2, acl_len);\n- ble_hs_rx_data(&rxpdu);\n+ ble_hs_rx_data(rxpdu);\n }\n \n \/* NOTE: we dont free the mbuf since we handed it off! *\/\n"} {"commit":"ac194b23d85e256de23b9d99536701ca3d62edc4","subject":"Use GtkApplication menu functions instead of ige-mac-menu.","message":"Use GtkApplication menu functions instead of ige-mac-menu.","repos":"sharoonthomas\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,GNOME\/gtk-mac-integration,jralls\/gtk-mac-integration,jralls\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,jralls\/gtk-mac-integration,GNOME\/gtk-mac-integration,GNOME\/gtk-mac-integration","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/test-integration.c\n+++ src\/test-integration.c\n@@ -56,7 +56,8 @@\n #include <gtk\/gtk.h>\n #include <stdio.h>\n \n-#include \"ige-mac-menu.h\"\n+\/\/#include \"ige-mac-menu.h\"\n+#include \"gtkapplication.h\"\n #include \"ige-mac-dock.h\"\n #include \"ige-mac-bundle.h\"\n #include <config.h>\n@@ -245,10 +246,12 @@\n GtkWidget\t *window;\n GtkWidget *vbox;\n GtkWidget *menubar;\n- IgeMacMenuGroup *group;\n+\/\/ IgeMacMenuGroup *group;\n+ GtkApplicationMenuGroup *group;\n GtkWidget *bbox;\n GtkWidget *button;\n MenuItems *items = menu_items_new();\n+ GtkApplication *theApp = g_object_new(GTK_TYPE_APPLICATION, NULL);\n \n window = gtk_window_new (GTK_WINDOW_TOPLEVEL);\n if (title)\n@@ -299,18 +302,17 @@\n \n gtk_widget_hide (menubar);\n \n- ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));\n- ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (items->quit_item));\n-\n- group = ige_mac_menu_add_app_menu_group ();\n- ige_mac_menu_add_app_menu_item (group,\n- GTK_MENU_ITEM (items->about_item), \n- NULL);\n-\n- group = ige_mac_menu_add_app_menu_group ();\n- ige_mac_menu_add_app_menu_item (group,\n- GTK_MENU_ITEM (items->preferences_item), \n- NULL);\n+\/\/ ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));\n+\/\/ ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (items->quit_item));\n+ gtk_application_set_menu_bar(theApp, GTK_MENU_SHELL(menubar));\n+\/\/ group = ige_mac_menu_add_app_menu_group ();\n+ group = gtk_application_add_app_menu_group (theApp);\n+ gtk_application_add_app_menu_item (theApp, group,\n+\t\t\t\t GTK_MENU_ITEM (items->about_item));\n+\n+ group = gtk_application_add_app_menu_group (theApp);\n+ gtk_application_add_app_menu_item (theApp, group,\n+\t\t\t\t GTK_MENU_ITEM (items->preferences_item));\n if (!menu_items_quark)\n menu_items_quark = g_quark_from_static_string(\"MenuItem\");\n g_object_set_qdata_full(G_OBJECT(window), menu_items_quark, \n@@ -322,15 +324,17 @@\n int\n main (int argc, char **argv)\n {\n- GtkWidget *window1, *window2;\n+ GtkWidget *window1;\/\/, *window2;\n+\/\/ int err;\n IgeMacDock *dock;\n-\n+ GtkApplication *theApp;\n gtk_init (&argc, &argv);\n-\n+ theApp = g_object_new(GTK_TYPE_APPLICATION, NULL);\n dock = ige_mac_dock_get_default ();\n \n+\/\/ err = gtk_application_init(theApp);\n window1 = create_window(dock, \"Test Integration Window 1\"); \n- window2 = create_window(dock, \"Test Integration Window 2\"); \n+ \/\/window2 = create_window(dock, \"Test Integration Window 2\"); \n dock = ige_mac_dock_new ();\n g_signal_connect (dock,\n \"clicked\",\n@@ -343,5 +347,6 @@\n \n gtk_main ();\n \n+ g_object_unref(theApp);\n return 0;\n }\n"} {"commit":"4b650d3fdcddd930a71507fdee1cf7398583be40","subject":"mcu\/fe310: Fix hal timer","message":"mcu\/fe310: Fix hal timer\n\nHal timer was not correctly setting up compare timer resulting\nin interrupts firing at wrong time.\nProblem was hidden if hal timer operated at high frequencies.\nFor low hal_timer frequencies variable ticks is often low\nand it this low value was put in CMP1 comparator while\ncounter was already past this value resulting in immediate\ntrigger of interrupt.\nIn CMP1 interrupt pattern was repeated.\nNow CMP1 is set to value that is greater then PWMS, if it would\nbe grater then CMP0 (which is maximum value of counter) it is not\nset at the moment of check, it will be set in CMP0 interrupt.\n","repos":"mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/mcu\/sifive\/fe310\/src\/hal_timer.c\n+++ hw\/mcu\/sifive\/fe310\/src\/hal_timer.c\n@@ -30,7 +30,8 @@\n \n struct fe310_hal_tmr {\n void *pwm_regs; \/* Pointer to timer registers *\/\n- uint32_t value; \/* Acumulated timer value, incremented on CMP0 *\/\n+ uint32_t value; \/* Accumulated timer value, incremented on CMP0 *\/\n+ uint16_t pwms; \/* Value of register pwms taken when value was set *\/\n uint8_t max_scale; \/* Max value for pwmcfg.pwmscale 7 (for PMW0) or 15 (for PWM1\/2) *\/\n uint8_t pwmxcmp0_int; \/* PWMxCMP0 interrupt number *\/\n TAILQ_HEAD(hal_timer_qhead, hal_timer) sht_timers;\n@@ -38,17 +39,23 @@\n \n #if MYNEWT_VAL(TIMER_0)\n struct fe310_hal_tmr fe310_pwm2 = {\n- (uint32_t *) PWM2_CTRL_ADDR, 0, 15, INT_PWM2_BASE\n+ .pwm_regs = (uint32_t *)PWM2_CTRL_ADDR,\n+ .max_scale = 15,\n+ .pwmxcmp0_int = INT_PWM2_BASE,\n };\n #endif\n #if MYNEWT_VAL(TIMER_1)\n struct fe310_hal_tmr fe310_pwm1 = {\n- (uint32_t *) PWM1_CTRL_ADDR, 0, 15, INT_PWM1_BASE\n+ .pwm_regs = (uint32_t *)PWM1_CTRL_ADDR,\n+ .max_scale = 15,\n+ .pwmxcmp0_int = INT_PWM1_BASE,\n };\n #endif\n #if MYNEWT_VAL(TIMER_2)\n struct fe310_hal_tmr fe310_pwm0 = {\n- (uint32_t *) PWM0_CTRL_ADDR, 0, 7, INT_PWM0_BASE\n+ .pwm_regs = (uint32_t *)PWM0_CTRL_ADDR,\n+ .max_scale = 7,\n+ .pwmxcmp0_int = INT_PWM0_BASE,\n };\n #endif\n \n@@ -80,7 +87,8 @@\n uint32_t regs = (uint32_t) tmr->pwm_regs;\n \n __HAL_DISABLE_INTERRUPTS(sr);\n- cnt = _REG32(regs, PWM_S) + tmr->value;\n+ tmr->pwms = _REG32(regs, PWM_S);\n+ cnt = tmr->pwms + tmr->value;\n \/* Check if just overflowed *\/\n if (_REG32(regs, PWM_CFG) & PWM_CMP0) {\n cnt += _REG32(regs, PWM_CMP0) + 1;\n@@ -94,13 +102,18 @@\n fe310_tmr_check_first(struct fe310_hal_tmr *tmr)\n {\n struct hal_timer *ht;\n+ uint32_t cnt;\n+ int32_t ticks;\n \n ht = TAILQ_FIRST(&tmr->sht_timers);\n if (ht) {\n- uint32_t cnt = hal_timer_cnt(tmr);\n- int32_t ticks = (int32_t)(ht->expiry - cnt);\n- if (ticks < _REG32(tmr->pwm_regs, PWM_CMP0)) {\n- _REG32(tmr->pwm_regs, PWM_CMP1) = ticks;\n+ cnt = hal_timer_cnt(tmr);\n+ ticks = (int32_t)(ht->expiry - cnt);\n+ \/*\n+ * Setup CMP1 only when it would need to fire before CMP0.\n+ *\/\n+ if (tmr->pwms + ticks < _REG32(tmr->pwm_regs, PWM_CMP0)) {\n+ _REG32(tmr->pwm_regs, PWM_CMP1) = tmr->pwms + ticks;\n plic_enable_interrupt(tmr->pwmxcmp0_int + 1);\n return;\n }\n@@ -138,7 +151,7 @@\n int pwm_num = (num - INT_PWM0_BASE) >> 2;\n int timer_num = pwm_to_timer[pwm_num];\n struct fe310_hal_tmr *tmr = fe310_tmr_devs[timer_num];\n- \/* Turn of CMPxIP *\/\n+ \/* Clear interrupt flag CMP0IP *\/\n _REG32(tmr->pwm_regs, PWM_CFG) &= ~PWM_CFG_CMP0IP;\n tmr->value += _REG32(tmr->pwm_regs, PWM_CMP0) + 1;\n fe310_tmr_cbs(tmr);\n@@ -150,7 +163,8 @@\n int pwm_num = (num - INT_PWM0_BASE) >> 2;\n int timer_num = pwm_to_timer[pwm_num];\n struct fe310_hal_tmr *tmr = fe310_tmr_devs[timer_num];\n- \/* Turn of CMPxIP *\/\n+ \/* Clear interrupt flag CMP1IP *\/\n+ _REG32(tmr->pwm_regs, PWM_CMP1) = _REG32(tmr->pwm_regs, PWM_CMP0);\n _REG32(tmr->pwm_regs, PWM_CFG) &= ~PWM_CFG_CMP1IP;\n fe310_tmr_cbs(tmr);\n }\n@@ -168,10 +182,9 @@\n int\n hal_timer_init(int timer_num, void *cfg)\n {\n- struct fe310_hal_tmr *tmr;\n-\n- if (timer_num >= FE310_HAL_TIMER_MAX || !(tmr = fe310_tmr_devs[timer_num]) ||\n- (cfg == NULL)) {\n+ (void)cfg;\n+\n+ if (timer_num >= FE310_HAL_TIMER_MAX || (fe310_tmr_devs[timer_num] == NULL)) {\n return -1;\n }\n \n"} {"commit":"357db4d668b6cef3603c4b7d84a8e1d60af688ef","subject":"nimble\/ll: Improve handling BLE_LL_EXT_ADV_AUX_PTR_CNT = 0","message":"nimble\/ll: Improve handling BLE_LL_EXT_ADV_AUX_PTR_CNT = 0\n\nThis patch makes sure that when BLE_LL_EXT_ADV_AUX_PTR_CNT = 0\nthen related membuf is NULL.\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_scan.c\n+++ nimble\/controller\/src\/ble_ll_scan.c\n@@ -147,10 +147,14 @@\n g_ble_ll_scan_dup_advs[MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS)];\n \n #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)\n+#if MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT) != 0\n static os_membuf_t ext_adv_mem[ OS_MEMPOOL_SIZE(\n MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT),\n sizeof (struct ble_ll_aux_data))\n ];\n+#else\n+#define ext_adv_mem NULL\n+#endif\n \n static struct os_mempool ext_adv_pool;\n \n"} {"commit":"1cfe01482349650511348c1084cc78cc01ab022f","subject":"Synchronize sdmc_dir_t with libctru","message":"Synchronize sdmc_dir_t with libctru\n","repos":"chaoskagami\/ftpde,chaoskagami\/ftpde,chaoskagami\/ftpde","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- source\/ftp.c\n+++ source\/ftp.c\n@@ -1567,44 +1567,74 @@\n \/\/ if (strcmp(dent->d_name, \".\") == 0 || strcmp(dent->d_name, \"..\") == 0)\n \/\/ return LOOP_CONTINUE;\n \n- \/* check if this was a NLST *\/\n- if (session->flags & SESSION_NLST) {\n- \/* NLST gives the whole path name *\/\n- session->buffersize = 0;\n- if (build_path(session, session->lwd, dent->d_name) == 0) {\n- \/* encode \\n in path *\/\n- len = strlen(session->buffer);\n- buffer = encode_path(session->buffer, &len, false);\n- if (buffer != NULL) {\n- \/* copy to the session buffer to send *\/\n- memcpy(session->buffer, buffer, len);\n- free(buffer);\n- session->buffer[len++] = '\\r';\n- session->buffer[len++] = '\\n';\n- session->buffersize = len;\n- }\n- }\n- } else {\n+ \/* check if this was a NLST *\/\n+ if(session->flags & SESSION_NLST)\n+ {\n+ \/* NLST gives the whole path name *\/\n+ session->buffersize = 0;\n+ if(build_path(session, session->lwd, dent->d_name) == 0)\n+ {\n+ \/* encode \\n in path *\/\n+ len = strlen(session->buffer);\n+ buffer = encode_path(session->buffer, &len, false);\n+ if(buffer != NULL)\n+ {\n+ \/* copy to the session buffer to send *\/\n+ memcpy(session->buffer, buffer, len);\n+ free(buffer);\n+ session->buffer[len++] = '\\r';\n+ session->buffer[len++] = '\\n';\n+ session->buffersize = len;\n+ }\n+ }\n+ }\n+ else\n+ {\n #ifdef _3DS\n- \/* the sdmc directory entry already has the type and size, so no\n- * need to do a slow stat *\/\n- sdmc_dir_t *dir = (sdmc_dir_t *)session->dp->dirData->dirStruct;\n-\n- if (dir->entry_data.attributes & FS_ATTRIBUTE_DIRECTORY)\n- st.st_mode = S_IFDIR;\n- else\n- st.st_mode = S_IFREG;\n-\n- st.st_size = dir->entry_data.fileSize;\n-\n- if ((rc = build_path(session, session->lwd, dent->d_name)) != 0)\n- console_print(RED \"build_path: %d %s\\n\" RESET, errno,\n- strerror(errno));\n- else if ((rc = sdmc_getmtime(session->buffer, &mtime)) != 0) {\n- console_print(RED \"sdmc_getmtime '%s': 0x%x\\n\" RESET,\n- session->buffer, rc);\n- mtime = 0;\n- }\n+ \/* the sdmc directory entry already has the type and size, so no need to do a slow stat *\/\n+ u32 magic = *(u32*)session->dp->dirData->dirStruct;\n+\n+ if(magic == SDMC_DIRITER_MAGIC)\n+ {\n+ sdmc_dir_t *dir = (sdmc_dir_t*)session->dp->dirData->dirStruct;\n+ FS_DirectoryEntry *entry = &dir->entry_data[dir->index];\n+\n+ if(entry->attributes & FS_ATTRIBUTE_DIRECTORY)\n+ st.st_mode = S_IFDIR | S_IRUSR | S_IRGRP | S_IROTH;\n+ else\n+ st.st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH;\n+\n+ if(!(entry->attributes & FS_ATTRIBUTE_READ_ONLY))\n+ st.st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;\n+\n+ st.st_size = entry->fileSize;\n+\n+ if((rc = build_path(session, session->lwd, dent->d_name)) != 0)\n+ console_print(RED \"build_path: %d %s\\n\" RESET, errno, strerror(errno));\n+ else if((rc = sdmc_getmtime(session->buffer, &mtime)) != 0)\n+ {\n+ console_print(RED \"sdmc_getmtime '%s': 0x%x\\n\" RESET, session->buffer, rc);\n+ mtime = 0;\n+ }\n+ }\n+ else\n+ {\n+ \/* lstat the entry *\/\n+ if((rc = build_path(session, session->lwd, dent->d_name)) != 0)\n+ console_print(RED \"build_path: %d %s\\n\" RESET, errno, strerror(errno));\n+ else if((rc = lstat(session->buffer, &st)) != 0)\n+ console_print(RED \"stat '%s': %d %s\\n\" RESET, session->buffer, errno, strerror(errno));\n+\n+ if(rc != 0)\n+ {\n+ \/* an error occurred *\/\n+ ftp_session_set_state(session, COMMAND_STATE, CLOSE_PASV | CLOSE_DATA);\n+ ftp_send_response(session, 550, \"unavailable\\r\\n\");\n+ return LOOP_EXIT;\n+ }\n+\n+ mtime = st.st_mtime;\n+ }\n #else\n \/* lstat the entry *\/\n if ((rc = build_path(session, session->lwd, dent->d_name)) != 0)\n@@ -1629,16 +1659,26 @@\n buffer = encode_path(dent->d_name, &len, false);\n if (buffer != NULL) {\n \/* copy to the session buffer to send *\/\n- session->buffersize = sprintf(\n- session->buffer, \"%crwxrwxrwx 1 ftp ftp %lld \",\n- S_ISREG(st.st_mode) ? '-' :\n- S_ISDIR(st.st_mode) ? 'd' :\n- S_ISLNK(st.st_mode) ? 'l' :\n- S_ISCHR(st.st_mode) ? 'c' :\n- S_ISBLK(st.st_mode) ? 'b' :\n+ session->buffersize =\n+ sprintf(session->buffer,\n+ \"%c%c%c%c%c%c%c%c%c%c 1 ftp ftp %lld \",\n+ S_ISREG(st.st_mode) ? '-' :\n+ S_ISDIR(st.st_mode) ? 'd' :\n+ S_ISLNK(st.st_mode) ? 'l' :\n+ S_ISCHR(st.st_mode) ? 'c' :\n+ S_ISBLK(st.st_mode) ? 'b' :\n S_ISFIFO(st.st_mode) ? 'p' :\n S_ISSOCK(st.st_mode) ? 's' : '?',\n- (signed long long)st.st_size);\n+ st.st_mode & S_IRUSR ? 'r' : '-',\n+ st.st_mode & S_IWUSR ? 'w' : '-',\n+ st.st_mode & S_IXUSR ? 'x' : '-',\n+ st.st_mode & S_IRGRP ? 'r' : '-',\n+ st.st_mode & S_IWGRP ? 'w' : '-',\n+ st.st_mode & S_IXGRP ? 'x' : '-',\n+ st.st_mode & S_IROTH ? 'r' : '-',\n+ st.st_mode & S_IWOTH ? 'w' : '-',\n+ st.st_mode & S_IXOTH ? 'x' : '-',\n+ (signed long long)st.st_size);\n t_mtime = mtime;\n tm = gmtime(&t_mtime);\n if (tm != NULL) {\n"} {"commit":"a377487a1b5300654d1604d78a1d4cae49efe4ed","subject":"Fix compile error with IGE_MAC_INTEGRATION defined.","message":"Fix compile error with IGE_MAC_INTEGRATION defined.","repos":"GNOME\/gtk-mac-integration,jralls\/gtk-mac-integration,jralls\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,GNOME\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,jralls\/gtk-mac-integration,GNOME\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration,sharoonthomas\/gtk-mac-integration","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/test-integration.c\n+++ src\/test-integration.c\n@@ -212,7 +212,7 @@\n {\"VerticalAction\", NULL, \"_Vertical\", NULL, NULL, 0},\n };\n #else \/\/not BUILT_UI\n-#if !defined QUARTZ_HANDLERS \n+#if !defined QUARTZ_HANDLERS && defined GTKOSXAPPLICATION\n \n \/* This is needed as a callback to enable accelerators when not using\n * the Quartz event handling path and using GtkMenuItems instead of\n"} {"commit":"fc95abd9f2b84304edabdb423e64e91cab675de3","subject":"allow -l to LIST current directory","message":"allow -l to LIST current directory\n\nsome clients, including Chrome, use LIST -l and expect to obtain a file listing. Fixes #64\n","repos":"mtheall\/ftbrony","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- source\/ftp.c\n+++ source\/ftp.c\n@@ -2415,8 +2415,7 @@\n \/* work around broken clients that think LIST -a is a thing *\/\n if(workaround && mode == XFER_DIR_LIST)\n {\n- if(args[0] == '-' && args[1] == 'a')\n- {\n+ if(args[0] == '-' && (args[1] == 'a' || args[1] == 'l')) {\n if(args[2] == 0)\n buffer = strdup(args+2);\n else\n"} {"commit":"2ef67ec2e563f739553e4a3dcce6bbb2092d7448","subject":"ws fix","message":"ws fix\n","repos":"ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,slanterns\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sql\/events.h\n+++ sql\/events.h\n@@ -34,6 +34,7 @@\n OP_LOAD_ERROR,\n OP_ALREADY_EXISTS\n };\n+\n \n int\n sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);\n"} {"commit":"278e2b22ce54ea88e5ea49039528634bf0ee8263","subject":"enums added.","message":"enums added.","repos":"nintaitrading-eu\/ledgerplot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ledgerplot.c\n+++ ledgerplot.c\n@@ -13,6 +13,26 @@\n #define CMD_GNUPLOT \"gnuplot -persist\"\n #define FILE_DATA_TMP \"lp_data.tmp\"\n #define FILE_BARCHART \"\/usr\/local\/share\/ledgerplot\/gnuplot\/gp_barchart.gnu\"\n+\/\/ TODO: I don't think I can define another GENERATE_ENUM here again.\n+\/\/ Combine the below with the insert from modules\/income_vs_expenses.c\n+#define FOREACH_PLOT(PLOT) \\\n+ PLOT(income_vs_expenses)\n+ \n+#define GENERATE_ENUM(ENUM) ENUM,\n+#define GENERATE_STRING(STRING) #STRING,\n+\n+enum PLOT_ENUM {\n+ FOREACH_PLOT(GENERATE_ENUM)\n+};\n+\n+static const char *PLOT_STRING[] = {\n+ FOREACH_FRUIT(GENERATE_STRING)\n+};\n+\/\/ END enum stuff for plot type\n+\n+enum PLOT_TYPE_ENUM {\n+ yearly, monthly\n+};\n \n static int write_to_gnuplot(char a_gnu_command[OUTPUT_ARRAY_MAX][INPUT_LINE_MAX]);\n static int get_lines_from_file(\n"} {"commit":"87f2d2a29c919dd3b904124f43540c3dd1a0b449","subject":"Export libffi type symbols.","message":"Export libffi type symbols.\n","repos":"pfalcon\/squirrel-modules,pfalcon\/squirrel-modules,pfalcon\/squirrel-modules","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ffi\/ffi.c\n+++ ffi\/ffi.c\n@@ -158,6 +158,27 @@\n {NULL}\n };\n \n+struct FFI_type_name {\n+ const char* name;\n+ ffi_type *type;\n+};\n+\n+static struct FFI_type_name ffi_types_wrap[] = {\n+ {\"void\", &ffi_type_void},\n+ {\"schar\", &ffi_type_schar},\n+ {\"uchar\", &ffi_type_uchar},\n+ {\"sshort\", &ffi_type_sshort},\n+ {\"ushort\", &ffi_type_ushort},\n+ {\"sint\", &ffi_type_sint},\n+ {\"uint\", &ffi_type_uint},\n+ {\"slong\", &ffi_type_slong},\n+ {\"ulong\", &ffi_type_ulong},\n+ {\"float\", &ffi_type_float},\n+ {\"double\", &ffi_type_double},\n+ {\"pointer\", &ffi_type_pointer},\n+ {NULL}\n+};\n+\n SQRESULT MODULE_INIT(HSQUIRRELVM v, HSQAPI api)\n {\n printf(\"in sqmodule_load\\n\");\n@@ -165,6 +186,14 @@\n INIT_SQAPI(v, api);\n \n sq_register_funcs(v, funcs);\n+\n+ int i;\n+ for (i = 0; ffi_types_wrap[i].name != 0; i++) {\n+ struct FFI_type_name *e = &ffi_types_wrap[i];\n+ sq_pushstring(v, e->name, -1);\n+ sq_pushuserpointer(v, e->type);\n+ sq_newslot(v, -3, SQFalse);\n+ }\n \n sq_newtable(v);\n sq_register_funcs(v, methods);\n"} {"commit":"7cca1a3e1e8df89d1be485b0b80c4099543d250f","subject":"change how files are named","message":"change how files are named\n","repos":"martelletto\/filegen","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- filegen.c\n+++ filegen.c\n@@ -63,7 +63,7 @@\n mkpath(int n)\n {\n \tsize_t len = sizeof(path) - 1;\n-\tint r = snprintf(path, len, \"%s%x\", prefix, n);\n+\tint r = snprintf(path, len, \"%sf%04x\", prefix, n);\n \tif (r < 0 || (size_t)r >= len)\n \t\terrx(1, \"snprintf\");\n }\n"} {"commit":"80376379418df8476c37e4bc2e84727efc0acfa5","subject":"test_driver: implement virDomainFSFreeze","message":"test_driver: implement virDomainFSFreeze\n\nOn success update the domain-private data. Consider \/ and \/boot to be\nthe only mountpoints avaiable in order to be consistent with the other\nFS-related calls.\n\nSigned-off-by: Ilias Stamatis <3ef66acc2700f2eb6746a592b321628ebd41accf@gmail.com>\nReviewed-by: Erik Skultety <2c14d38fa47c8799f1b9c16280abe27f8edfec6e@redhat.com>\n","repos":"zippy2\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,olafhering\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,libvirt\/libvirt,libvirt\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/test\/test_driver.c\n+++ src\/test\/test_driver.c\n@@ -390,6 +390,8 @@\n typedef testDomainObjPrivate *testDomainObjPrivatePtr;\n struct _testDomainObjPrivate {\n testDriverPtr driver;\n+\n+ bool frozen[2]; \/* used by file system related calls *\/\n };\n \n \n@@ -402,6 +404,7 @@\n return NULL;\n \n priv->driver = opaque;\n+ priv->frozen[0] = priv->frozen[1] = false;\n \n return priv;\n }\n@@ -4070,6 +4073,67 @@\n return testDomainUndefineFlags(domain, 0);\n }\n \n+\n+static int\n+testDomainFSFreeze(virDomainPtr dom,\n+ const char **mountpoints,\n+ unsigned int nmountpoints,\n+ unsigned int flags)\n+{\n+ virDomainObjPtr vm;\n+ testDomainObjPrivatePtr priv;\n+ size_t i;\n+ int ret = -1;\n+\n+ virCheckFlags(0, -1);\n+\n+ if (!(vm = testDomObjFromDomain(dom)))\n+ goto cleanup;\n+\n+ if (virDomainObjCheckActive(vm) < 0)\n+ goto cleanup;\n+\n+ priv = vm->privateData;\n+\n+ if (nmountpoints == 0) {\n+ ret = 2 - (priv->frozen[0] + priv->frozen[1]);\n+ priv->frozen[0] = priv->frozen[1] = true;\n+ } else {\n+ int nfreeze = 0;\n+ bool freeze[2];\n+\n+ memcpy(&freeze, priv->frozen, 2);\n+\n+ for (i = 0; i < nmountpoints; i++) {\n+ if (STREQ(mountpoints[i], \"\/\")) {\n+ if (!freeze[0]) {\n+ freeze[0] = true;\n+ nfreeze++;\n+ }\n+ } else if (STREQ(mountpoints[i], \"\/boot\")) {\n+ if (!freeze[1]) {\n+ freeze[1] = true;\n+ nfreeze++;\n+ }\n+ } else {\n+ virReportError(VIR_ERR_OPERATION_INVALID,\n+ _(\"mount point not found: %s\"),\n+ mountpoints[i]);\n+ goto cleanup;\n+ }\n+ }\n+\n+ \/* steal the helper copy *\/\n+ memcpy(priv->frozen, &freeze, 2);\n+ ret = nfreeze;\n+ }\n+\n+ cleanup:\n+ virDomainObjEndAPI(&vm);\n+ return ret;\n+}\n+\n+\n static int testDomainGetAutostart(virDomainPtr domain,\n int *autostart)\n {\n@@ -8771,6 +8835,7 @@\n .domainDefineXMLFlags = testDomainDefineXMLFlags, \/* 1.2.12 *\/\n .domainUndefine = testDomainUndefine, \/* 0.1.11 *\/\n .domainUndefineFlags = testDomainUndefineFlags, \/* 0.9.4 *\/\n+ .domainFSFreeze = testDomainFSFreeze, \/* 5.7.0 *\/\n .domainGetAutostart = testDomainGetAutostart, \/* 0.3.2 *\/\n .domainSetAutostart = testDomainSetAutostart, \/* 0.3.2 *\/\n .domainGetDiskErrors = testDomainGetDiskErrors, \/* 5.4.0 *\/\n"} {"commit":"d551725953070b479a5ea00b5941b7743ac8f586","subject":"format","message":"format\n","repos":"credativ\/linux-ftools,credativ\/linux-ftools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fincore.c\n+++ fincore.c\n@@ -9,7 +9,7 @@\n #include <math.h>\n #include <errno.h>\n \n-char STR_FORMAT[] = \"%-80s %15s %15s %15s %15s %15s %15s %15s\\n\";\n+char STR_FORMAT[] = \"%-80s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s %15s\\n\";\n char DATA_FORMAT[] = \"%-80s %15ld %15d %15d %15d %15f %15d %15d %15d %15d %15d %15d %15d %15d %15d %15d\\n\";\n \n struct fincore_result \n"} {"commit":"5df1d0d417a3a3ec51ee5bd437fb05d6def4c551","subject":"test: Use consistent variable names for network test driver APIs","message":"test: Use consistent variable names for network test driver APIs\n\nA virNetworkObjPtr will be an 'obj'.\n\nA virNetworkPtr will be a 'net'.\n\nSigned-off-by: John Ferlan <87558058f6f829e5ec976c8ef960720af4ff9c7d@redhat.com>\n","repos":"jfehlig\/libvirt,eskultety\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,datto\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,datto\/libvirt,olafhering\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,crobinso\/libvirt,eskultety\/libvirt,datto\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,datto\/libvirt,jfehlig\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/test\/test_driver.c\n+++ src\/test\/test_driver.c\n@@ -3213,17 +3213,17 @@\n testNetworkObjFindByUUID(testDriverPtr privconn,\n const unsigned char *uuid)\n {\n- virNetworkObjPtr net;\n+ virNetworkObjPtr obj;\n char uuidstr[VIR_UUID_STRING_BUFLEN];\n \n- if (!(net = virNetworkObjFindByUUID(privconn->networks, uuid))) {\n+ if (!(obj = virNetworkObjFindByUUID(privconn->networks, uuid))) {\n virUUIDFormat(uuid, uuidstr);\n virReportError(VIR_ERR_NO_NETWORK,\n _(\"no network with matching uuid '%s'\"),\n uuidstr);\n }\n \n- return net;\n+ return obj;\n }\n \n \n@@ -3232,17 +3232,17 @@\n const unsigned char *uuid)\n {\n testDriverPtr privconn = conn->privateData;\n- virNetworkObjPtr net;\n- virNetworkPtr ret = NULL;\n-\n- if (!(net = testNetworkObjFindByUUID(privconn, uuid)))\n- goto cleanup;\n-\n- ret = virGetNetwork(conn, net->def->name, net->def->uuid);\n-\n- cleanup:\n- virNetworkObjEndAPI(&net);\n- return ret;\n+ virNetworkObjPtr obj;\n+ virNetworkPtr net = NULL;\n+\n+ if (!(obj = testNetworkObjFindByUUID(privconn, uuid)))\n+ goto cleanup;\n+\n+ net = virGetNetwork(conn, obj->def->name, obj->def->uuid);\n+\n+ cleanup:\n+ virNetworkObjEndAPI(&obj);\n+ return net;\n }\n \n \n@@ -3250,14 +3250,14 @@\n testNetworkObjFindByName(testDriverPtr privconn,\n const char *name)\n {\n- virNetworkObjPtr net;\n-\n- if (!(net = virNetworkObjFindByName(privconn->networks, name)))\n+ virNetworkObjPtr obj;\n+\n+ if (!(obj = virNetworkObjFindByName(privconn->networks, name)))\n virReportError(VIR_ERR_NO_NETWORK,\n _(\"no network with matching name '%s'\"),\n name);\n \n- return net;\n+ return obj;\n }\n \n \n@@ -3266,17 +3266,17 @@\n const char *name)\n {\n testDriverPtr privconn = conn->privateData;\n- virNetworkObjPtr net;\n- virNetworkPtr ret = NULL;\n-\n- if (!(net = testNetworkObjFindByName(privconn, name)))\n- goto cleanup;\n-\n- ret = virGetNetwork(conn, net->def->name, net->def->uuid);\n-\n- cleanup:\n- virNetworkObjEndAPI(&net);\n- return ret;\n+ virNetworkObjPtr obj;\n+ virNetworkPtr net = NULL;\n+\n+ if (!(obj = testNetworkObjFindByName(privconn, name)))\n+ goto cleanup;\n+\n+ net = virGetNetwork(conn, obj->def->name, obj->def->uuid);\n+\n+ cleanup:\n+ virNetworkObjEndAPI(&obj);\n+ return net;\n }\n \n \n@@ -3386,31 +3386,31 @@\n {\n testDriverPtr privconn = conn->privateData;\n virNetworkDefPtr def;\n- virNetworkObjPtr net = NULL;\n- virNetworkPtr ret = NULL;\n+ virNetworkObjPtr obj = NULL;\n+ virNetworkPtr net = NULL;\n virObjectEventPtr event = NULL;\n \n if ((def = virNetworkDefParseString(xml)) == NULL)\n goto cleanup;\n \n- if (!(net = virNetworkObjAssignDef(privconn->networks, def,\n+ if (!(obj = virNetworkObjAssignDef(privconn->networks, def,\n VIR_NETWORK_OBJ_LIST_ADD_LIVE |\n VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE)))\n goto cleanup;\n def = NULL;\n- net->active = 1;\n-\n- event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid,\n+ obj->active = 1;\n+\n+ event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,\n VIR_NETWORK_EVENT_STARTED,\n 0);\n \n- ret = virGetNetwork(conn, net->def->name, net->def->uuid);\n+ net = virGetNetwork(conn, obj->def->name, obj->def->uuid);\n \n cleanup:\n virNetworkDefFree(def);\n testObjectEventQueue(privconn, event);\n- virNetworkObjEndAPI(&net);\n- return ret;\n+ virNetworkObjEndAPI(&obj);\n+ return net;\n }\n \n \n@@ -3420,58 +3420,58 @@\n {\n testDriverPtr privconn = conn->privateData;\n virNetworkDefPtr def;\n- virNetworkObjPtr net = NULL;\n- virNetworkPtr ret = NULL;\n+ virNetworkObjPtr obj = NULL;\n+ virNetworkPtr net = NULL;\n virObjectEventPtr event = NULL;\n \n if ((def = virNetworkDefParseString(xml)) == NULL)\n goto cleanup;\n \n- if (!(net = virNetworkObjAssignDef(privconn->networks, def, 0)))\n+ if (!(obj = virNetworkObjAssignDef(privconn->networks, def, 0)))\n goto cleanup;\n def = NULL;\n \n- event = virNetworkEventLifecycleNew(net->def->name, net->def->uuid,\n+ event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,\n VIR_NETWORK_EVENT_DEFINED,\n 0);\n \n- ret = virGetNetwork(conn, net->def->name, net->def->uuid);\n+ net = virGetNetwork(conn, obj->def->name, obj->def->uuid);\n \n cleanup:\n virNetworkDefFree(def);\n testObjectEventQueue(privconn, event);\n- virNetworkObjEndAPI(&net);\n- return ret;\n-}\n-\n-\n-static int\n-testNetworkUndefine(virNetworkPtr network)\n-{\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ virNetworkObjEndAPI(&obj);\n+ return net;\n+}\n+\n+\n+static int\n+testNetworkUndefine(virNetworkPtr net)\n+{\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n int ret = -1;\n virObjectEventPtr event = NULL;\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- if (virNetworkObjIsActive(privnet)) {\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ if (virNetworkObjIsActive(obj)) {\n virReportError(VIR_ERR_OPERATION_INVALID,\n- _(\"Network '%s' is still running\"), network->name);\n- goto cleanup;\n- }\n-\n- event = virNetworkEventLifecycleNew(network->name, network->uuid,\n+ _(\"Network '%s' is still running\"), net->name);\n+ goto cleanup;\n+ }\n+\n+ event = virNetworkEventLifecycleNew(net->name, net->uuid,\n VIR_NETWORK_EVENT_UNDEFINED,\n 0);\n \n- virNetworkObjRemoveInactive(privconn->networks, privnet);\n+ virNetworkObjRemoveInactive(privconn->networks, obj);\n ret = 0;\n \n cleanup:\n testObjectEventQueue(privconn, event);\n- virNetworkObjEndAPI(&privnet);\n+ virNetworkObjEndAPI(&obj);\n return ret;\n }\n \n@@ -3485,20 +3485,20 @@\n unsigned int flags)\n {\n testDriverPtr privconn = net->conn->privateData;\n- virNetworkObjPtr network = NULL;\n+ virNetworkObjPtr obj = NULL;\n int isActive, ret = -1;\n \n virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE |\n VIR_NETWORK_UPDATE_AFFECT_CONFIG,\n -1);\n \n- if (!(network = testNetworkObjFindByUUID(privconn, net->uuid)))\n+ if (!(obj = testNetworkObjFindByUUID(privconn, net->uuid)))\n goto cleanup;\n \n \/* VIR_NETWORK_UPDATE_AFFECT_CURRENT means \"change LIVE if network\n * is active, else change CONFIG\n *\/\n- isActive = virNetworkObjIsActive(network);\n+ isActive = virNetworkObjIsActive(obj);\n if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE\n | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) ==\n VIR_NETWORK_UPDATE_AFFECT_CURRENT) {\n@@ -3509,155 +3509,155 @@\n }\n \n \/* update the network config in memory\/on disk *\/\n- if (virNetworkObjUpdate(network, command, section, parentIndex, xml, flags) < 0)\n+ if (virNetworkObjUpdate(obj, command, section, parentIndex, xml, flags) < 0)\n goto cleanup;\n \n ret = 0;\n cleanup:\n- virNetworkObjEndAPI(&network);\n- return ret;\n-}\n-\n-\n-static int\n-testNetworkCreate(virNetworkPtr network)\n-{\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ virNetworkObjEndAPI(&obj);\n+ return ret;\n+}\n+\n+\n+static int\n+testNetworkCreate(virNetworkPtr net)\n+{\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n int ret = -1;\n virObjectEventPtr event = NULL;\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- if (virNetworkObjIsActive(privnet)) {\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ if (virNetworkObjIsActive(obj)) {\n virReportError(VIR_ERR_OPERATION_INVALID,\n- _(\"Network '%s' is already running\"), network->name);\n- goto cleanup;\n- }\n-\n- privnet->active = 1;\n- event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid,\n+ _(\"Network '%s' is already running\"), net->name);\n+ goto cleanup;\n+ }\n+\n+ obj->active = 1;\n+ event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,\n VIR_NETWORK_EVENT_STARTED,\n 0);\n ret = 0;\n \n cleanup:\n testObjectEventQueue(privconn, event);\n- virNetworkObjEndAPI(&privnet);\n- return ret;\n-}\n-\n-\n-static int\n-testNetworkDestroy(virNetworkPtr network)\n-{\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ virNetworkObjEndAPI(&obj);\n+ return ret;\n+}\n+\n+\n+static int\n+testNetworkDestroy(virNetworkPtr net)\n+{\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n int ret = -1;\n virObjectEventPtr event = NULL;\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- privnet->active = 0;\n- event = virNetworkEventLifecycleNew(privnet->def->name, privnet->def->uuid,\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ obj->active = 0;\n+ event = virNetworkEventLifecycleNew(obj->def->name, obj->def->uuid,\n VIR_NETWORK_EVENT_STOPPED,\n 0);\n- if (!privnet->persistent)\n- virNetworkObjRemoveInactive(privconn->networks, privnet);\n+ if (!obj->persistent)\n+ virNetworkObjRemoveInactive(privconn->networks, obj);\n \n ret = 0;\n \n cleanup:\n testObjectEventQueue(privconn, event);\n- virNetworkObjEndAPI(&privnet);\n+ virNetworkObjEndAPI(&obj);\n return ret;\n }\n \n \n static char *\n-testNetworkGetXMLDesc(virNetworkPtr network,\n+testNetworkGetXMLDesc(virNetworkPtr net,\n unsigned int flags)\n {\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n char *ret = NULL;\n \n virCheckFlags(0, NULL);\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- ret = virNetworkDefFormat(privnet->def, flags);\n-\n- cleanup:\n- virNetworkObjEndAPI(&privnet);\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ ret = virNetworkDefFormat(obj->def, flags);\n+\n+ cleanup:\n+ virNetworkObjEndAPI(&obj);\n return ret;\n }\n \n \n static char *\n-testNetworkGetBridgeName(virNetworkPtr network)\n-{\n- testDriverPtr privconn = network->conn->privateData;\n+testNetworkGetBridgeName(virNetworkPtr net)\n+{\n+ testDriverPtr privconn = net->conn->privateData;\n char *bridge = NULL;\n- virNetworkObjPtr privnet;\n-\n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- if (!(privnet->def->bridge)) {\n+ virNetworkObjPtr obj;\n+\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ if (!(obj->def->bridge)) {\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"network '%s' does not have a bridge name.\"),\n- privnet->def->name);\n- goto cleanup;\n- }\n-\n- ignore_value(VIR_STRDUP(bridge, privnet->def->bridge));\n-\n- cleanup:\n- virNetworkObjEndAPI(&privnet);\n+ obj->def->name);\n+ goto cleanup;\n+ }\n+\n+ ignore_value(VIR_STRDUP(bridge, obj->def->bridge));\n+\n+ cleanup:\n+ virNetworkObjEndAPI(&obj);\n return bridge;\n }\n \n \n static int\n-testNetworkGetAutostart(virNetworkPtr network,\n+testNetworkGetAutostart(virNetworkPtr net,\n int *autostart)\n {\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n int ret = -1;\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- *autostart = privnet->autostart;\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ *autostart = obj->autostart;\n ret = 0;\n \n cleanup:\n- virNetworkObjEndAPI(&privnet);\n- return ret;\n-}\n-\n-\n-static int\n-testNetworkSetAutostart(virNetworkPtr network,\n+ virNetworkObjEndAPI(&obj);\n+ return ret;\n+}\n+\n+\n+static int\n+testNetworkSetAutostart(virNetworkPtr net,\n int autostart)\n {\n- testDriverPtr privconn = network->conn->privateData;\n- virNetworkObjPtr privnet;\n+ testDriverPtr privconn = net->conn->privateData;\n+ virNetworkObjPtr obj;\n int ret = -1;\n \n- if (!(privnet = testNetworkObjFindByName(privconn, network->name)))\n- goto cleanup;\n-\n- privnet->autostart = autostart ? 1 : 0;\n+ if (!(obj = testNetworkObjFindByName(privconn, net->name)))\n+ goto cleanup;\n+\n+ obj->autostart = autostart ? 1 : 0;\n ret = 0;\n \n cleanup:\n- virNetworkObjEndAPI(&privnet);\n+ virNetworkObjEndAPI(&obj);\n return ret;\n }\n \n"} {"commit":"a9cdc96dea36b6a14d6b25f70b061575ceae4f22","subject":"added add() function","message":"added add() function\n","repos":"dburggie\/libbigint","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/BigInt.c\n+++ src\/BigInt.c\n@@ -182,7 +182,7 @@\n \t\n }\n \n-\/*\n+\n \n BigInt * add(BigInt * self, BigInt * arg)\n {\n@@ -196,11 +196,135 @@\n \t\treturn NULL;\n \t}\n \t\n-\t\n-\t\n-}\n-\n-*\/\n+\t\/* \n+\t * This is a pain in the ass. We need to iterate through each of the BigInts\n+\t * and add arg to self, while watching for overflows so we can carry. \n+\t * \n+\t * Things we need to watch out for:\n+\t * * Chunks that are not full\n+\t * * Self is shorter than arg and needs to be extended.\n+\t * * arg is shorter than self and we have a trailing carry.\n+\t * \n+\t * Carry detection is accomplished by watching for a sum that is less than\n+\t * either addend\n+\t *\/\n+\t\n+\t\n+\t\n+\tunsigned int sum, carry = 0;\n+\tint li = 0, ri = 0; \/\/ left index, right index\n+\tChunk * lc = self->first; \/\/left chunk\n+\tChunk * rc = arg->first; \/\/ right chunk\n+\t\n+\tif (!lc)\n+\t{\n+\t\tappend(self, newChunk());\n+\t\tlc = self->first;\n+\t\tlc->value[0] = 0;\n+\t\tlc->length++;\n+\t}\n+\t\n+\t\/\/get first index\n+\twhile (li >= lc->length) lc = lc->next;\n+\twhile (ri >= rc->length) rc = rc->next;\n+\t\n+\twhile (rc)\n+\t{\n+\t\tfor (ri = 0; ri < rc->length; ri++)\n+\t\t{\n+\t\t\t\n+\t\t\tsum = carry + lc->value[li] + rc->value[ri];\n+\t\t\tif (sum < lc->value[li] || sum < rc->value[ri]) carry = 1;\n+\t\t\telse carry = 0;\n+\t\t\t\n+\t\t\t\/\/increment left index\n+\t\t\tli++;\n+\t\t\tif (li == lc->length) \/\/ end of this chunk?\n+\t\t\t{\n+\t\t\t\tif (lc->next) \/\/ is there a next chunk?\n+\t\t\t\t{\n+\t\t\t\t\tli = 0;\n+\t\t\t\t\tlc = lc->next;\n+\t\t\t\t\t#ifdef BIGINT_DEBUG\n+\t\t\t\t\tif (li == lc->length);\n+\t\t\t\t\t{\n+\t\t\t\t\t\tprintf(\"empty chunk in add()\\n\");\n+\t\t\t\t\t\treturn NULL;\n+\t\t\t\t\t}\n+\t\t\t\t\t#endif\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\telse if (lc->length < CHUNKSIZE)\n+\t\t\t\t{\n+\t\t\t\t\tlc->value[li] = 0; lc->length++;\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\telse\n+\t\t\t\t{\n+\t\t\t\t\tlc = newChunk();\n+\t\t\t\t\tappend(self,lc);\n+\t\t\t\t\tlc->value[0] = 0; lc->length++;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t\t\n+\t\t\/\/increment right chunk\n+\t\tdo {\n+\t\t\trc = rc->next;\n+\t\t} while (rc && rc->length);\n+\t\t\n+\t}\n+\t\n+\twhile (carry)\n+\t{\n+\t\tsum = lc->value[li] + carry;\n+\t\tif (sum != 0)\n+\t\t{\n+\t\t\tcarry = 0;\n+\t\t}\n+\t\t\n+\t\telse \/\/increment left index\n+\t\t{\n+\t\t\t\n+\t\t\tli++;\n+\t\t\tif (li == lc->length) \/\/ end of this chunk?\n+\t\t\t{\n+\t\t\t\tif (lc->next) \/\/ is there a next chunk?\n+\t\t\t\t{\n+\t\t\t\t\tli = 0;\n+\t\t\t\t\tlc = lc->next;\n+\t\t\t\t\t#ifdef BIGINT_DEBUG\n+\t\t\t\t\tif (!lc->length);\n+\t\t\t\t\t{\n+\t\t\t\t\t\tprintf(\"empty chunk in add()\\n\");\n+\t\t\t\t\t\treturn NULL;\n+\t\t\t\t\t}\n+\t\t\t\t\t#endif\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\telse if (lc->length < CHUNKSIZE)\n+\t\t\t\t{\n+\t\t\t\t\tlc->value[li] = 0; lc->length++;\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\telse\n+\t\t\t\t{\n+\t\t\t\t\tlc = newChunk();\n+\t\t\t\t\tappend(self,lc);\n+\t\t\t\t\tlc->value[0] = 0; lc->length++;\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t} \/\/ done finding next real chunk\n+\t\t\t\n+\t\t} \/\/done incrementing\n+\t\t\n+\t} \/\/ done doing final carry\n+\t\n+\t\/\/ finally done for good\n+\treturn self;\n+}\n+\n+\n \n \/* ##### private member definitions ##### *\/\n \n"} {"commit":"cb41db3c2c65106c57c9ccada51dcda400e40f7d","subject":"case failure info logging enabled","message":"case failure info logging enabled\n","repos":"mer-tools\/testrunner-lite,mer-tools\/testrunner-lite","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/testresultlogger.c\n+++ src\/testresultlogger.c\n@@ -297,14 +297,13 @@\n \t\t\n \t\tgoto err_out;\n \n-#if 0\n \tif (c->failure_info) {\n \t\tif (xmlTextWriterWriteAttribute (writer, \n \t\t\t\t\t\t BAD_CAST \"failure_info\", \n \t\t\t\t\t\t c->failure_info) < 0)\n \t\t\tgoto err_out;\n \t}\n-#endif\n+\n \tif (c->subfeature)\n \t\tif (xmlTextWriterWriteAttribute (writer, \n \t\t\t\t\t\t BAD_CAST \"subfeature\", \n"} {"commit":"dc6f29bf085c01ebb0a3d9c67403b4244085d1b0","subject":"Removed old cruft from documentation.","message":"Removed old cruft from documentation.\n","repos":"MiUishadow\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum,DerThorsten\/magnum,DerThorsten\/magnum,DerThorsten\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,DerThorsten\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,DerThorsten\/magnum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Camera.h\n+++ src\/Camera.h\n@@ -49,7 +49,7 @@\n * @param parent Parent object\n *\n * Sets orthographic projection to the default OpenGL cube (range\n- * @f$ [-1; 1] @f$ in all directions) and clear color to black.\n+ * @f$ [-1; 1] @f$ in all directions).\n * @see setOrthographic(), setPerspective()\n *\/\n Camera(Object* parent = nullptr);\n"} {"commit":"a17e18790a8c47113a73139d54a375dc9ccd8f08","subject":"fs\/exec.c: fix initial stack reservation","message":"fs\/exec.c: fix initial stack reservation\n\n803bf5ec259941936262d10ecc84511b76a20921 (\"fs\/exec.c: restrict initial\nstack space expansion to rlimit\") attempts to limit the initial stack to\n20*PAGE_SIZE. Unfortunately, in attempting ensure the stack is not\nreduced in size, we ended up not changing the stack at all.\n\nThis size reduction check is not necessary as the expand_stack call does\nthis already.\n\nThis caused a regression in UML resulting in most guest processes being\nkilled.\n\nSigned-off-by: Michael Neuling <7b0ab45a730e48a69239010b5b8fe5fa4e8eaac6@neuling.org>\nReviewed-by: KOSAKI Motohiro <70a1d3ef3e17a2bb0f09a1b2e6c86f607ed1d6d9@jp.fujitsu.com>\nAcked-by: WANG Cong <0f114804888b88d50037b04b42e57b858d851b87@gmail.com>\nCc: Anton Blanchard <14deb5e5e417133e888bf47bb6a3555c9bb7d81c@samba.org>\nCc: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@redhat.com>\nCc: James Morris <10d11de3abc355eabe955bb734f0f8e71da56e16@namei.org>\nCc: Serge Hallyn <dd6cacb2d07f0aa354aa6e74c149a3580e5a1db1@us.ibm.com>\nCc: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\nCc: Jouni Malinen <5c2dd944dde9e08881bef0894fe7b22a5c9c4b06@w1.fi>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/exec.c\n+++ fs\/exec.c\n@@ -637,7 +637,6 @@\n \t * will align it up.\n \t *\/\n \trlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;\n-\trlim_stack = min(rlim_stack, stack_size);\n #ifdef CONFIG_STACK_GROWSUP\n \tif (stack_size + stack_expand > rlim_stack)\n \t\tstack_base = vma->vm_start + rlim_stack;\n"} {"commit":"a4279b515b4fa48c3277c13eaca1119e159b427a","subject":"fixes the cgsnapshot problem with pfile permisssions","message":"fixes the cgsnapshot problem with pfile permisssions\n\ncgpconfigparser changes the permissions of all files. That's why to test whether the variable file is writable, there have to be used the variable file from the root group.\n\n CHANGELOG:\n\t* add the information why root group is used for finding which variable is writable\n\nSigned-off-by: Ivana Hutarova Varekova<2e3918a0a366ea7e658a2062ab582c898a7e1b1b@redhat.com>\nSigned-off-by: Jan Safranek <a7f4b96ffdd515ecef00f117294da18555749b0b@redhat.com>\n","repos":"rafalmiel\/libcg,rafalmiel\/libcg,jrfastab\/Linux-cgdcbxd,rafalmiel\/libcg,jrfastab\/Linux-cgdcbxd,jrfastab\/Linux-cgdcbxd,rafalmiel\/libcg,jrfastab\/Linux-cgdcbxd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tools\/cgsnapshot.c\n+++ src\/tools\/cgsnapshot.c\n@@ -273,7 +273,7 @@\n \n static int display_cgroup_data(struct cgroup *group,\n \t\tchar controller[CG_CONTROLLER_MAX][FILENAME_MAX],\n-\t\tconst char *group_path, int first,\n+\t\tconst char *group_path, int root_path_len, int first,\n \t\tconst char *program_name)\n {\n \tint i = 0, j;\n@@ -315,8 +315,14 @@\n \t\tfor (j = 0; j < nr_var; j++) {\n \t\t\tname = cgroup_get_value_name(group_controller, j);\n \n-\t\t\t\/* test whether the variable file is writable *\/\n-\t\t\tstrncpy(var_path, group_path, FILENAME_MAX);\n+\t\t\t\/* For the non-root groups cgconfigparser set\n+\t\t\t permissions of variable files to 777. Thus\n+\t\t\t It is necessary to test the permissions of\n+\t\t\t variable files in the root group to find out\n+\t\t\t whether the variable is writable.\n+\t\t\t *\/\n+\t\t\tstrncpy(var_path, group_path, root_path_len);\n+\t\t\tvar_path[root_path_len] = '\\0';\n \t\t\tstrncat(var_path, \"\/\", FILENAME_MAX);\n \t\t\tvar_path[FILENAME_MAX-1] = '\\0';\n \t\t\tstrncat(var_path, name, FILENAME_MAX);\n@@ -450,7 +456,7 @@\n \t\t\t}\n \n \t\t\tdisplay_cgroup_data(group, controller, info.full_path,\n-\t\t\t\tfirst, program_name);\n+\t\t\t\tprefix_len, first, program_name);\n \t\t\tfirst = 0;\n \t\t}\n \t}\n"} {"commit":"9ac9b8474c39c3ae2c2b37d8e1f08db8a9146124","subject":"[PATCH] r\/o bind mounts: write counts for truncate()","message":"[PATCH] r\/o bind mounts: write counts for truncate()\n\nAcked-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@ZenIV.linux.org.uk>\nSigned-off-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@lst.de>\nSigned-off-by: Dave Hansen <e169c2064f54e292652f83bb35eed10e1aa33f38@us.ibm.com>\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/open.c\n+++ fs\/open.c\n@@ -244,21 +244,21 @@\n \tif (!S_ISREG(inode->i_mode))\n \t\tgoto dput_and_out;\n \n+\terror = mnt_want_write(nd.path.mnt);\n+\tif (error)\n+\t\tgoto dput_and_out;\n+\n \terror = vfs_permission(&nd, MAY_WRITE);\n \tif (error)\n-\t\tgoto dput_and_out;\n-\n-\terror = -EROFS;\n-\tif (IS_RDONLY(inode))\n-\t\tgoto dput_and_out;\n+\t\tgoto mnt_drop_write_and_out;\n \n \terror = -EPERM;\n \tif (IS_IMMUTABLE(inode) || IS_APPEND(inode))\n-\t\tgoto dput_and_out;\n+\t\tgoto mnt_drop_write_and_out;\n \n \terror = get_write_access(inode);\n \tif (error)\n-\t\tgoto dput_and_out;\n+\t\tgoto mnt_drop_write_and_out;\n \n \t\/*\n \t * Make sure that there are no leases. get_write_access() protects\n@@ -276,6 +276,8 @@\n \n put_write_and_out:\n \tput_write_access(inode);\n+mnt_drop_write_and_out:\n+\tmnt_drop_write(nd.path.mnt);\n dput_and_out:\n \tpath_put(&nd.path);\n out:\n"} {"commit":"9f0aceece5e332d9d45536a76865819ab1b4de78","subject":"fix freeing cpuset on solaris","message":"fix freeing cpuset on solaris\n\nThis commit was SVN r1415.\n","repos":"ggouaillardet\/hwloc,shekkbuilder\/hwloc,ggouaillardet\/hwloc,ggouaillardet\/hwloc,ggouaillardet\/hwloc,shekkbuilder\/hwloc,shekkbuilder\/hwloc,shekkbuilder\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/topology-solaris.c\n+++ src\/topology-solaris.c\n@@ -353,7 +353,7 @@\n hwloc_look_kstat(topology, &nbprocs, online_cpuset);\n #endif \/* HAVE_LIBKSTAT *\/\n hwloc_setup_proc_level(topology, nbprocs, online_cpuset);\n- free(online_cpuset);\n+ hwloc_cpuset_free(online_cpuset);\n }\n \n void\n"} {"commit":"30896fc653d56d1e289e51f8d0cf30b113012c94","subject":"Unlink audio stream before releasing it too","message":"Unlink audio stream before releasing it too\n\n\n20080422193608-3e2dc-312b671a0653559b4f35271aa002d654137b8e16.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-farsight,freedesktop-unofficial-mirror\/telepathy__telepathy-farstream,freedesktop-unofficial-mirror\/telepathy__telepathy-farstream,freedesktop-unofficial-mirror\/telepathy__telepathy-farstream,freedesktop-unofficial-mirror\/telepathy__telepathy-farsight,freedesktop-unofficial-mirror\/telepathy__telepathy-farsight","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tp-stream-engine.c\n+++ src\/tp-stream-engine.c\n@@ -588,14 +588,20 @@\n {\n TpStreamEngineVideoStream *videostream =\n (TpStreamEngineVideoStream *) sestream;\n- GstPad *pad, *peer;\n \n g_mutex_lock (self->priv->mutex);\n self->priv->output_sinks = g_list_remove (self->priv->output_sinks,\n videostream);\n g_mutex_unlock (self->priv->mutex);\n \n- g_object_get (videostream, \"pad\", &pad, NULL);\n+ }\n+\n+ if (TP_STREAM_ENGINE_IS_VIDEO_STREAM (sestream) ||\n+ TP_STREAM_ENGINE_IS_AUDIO_STREAM (sestream))\n+ {\n+ GstPad *pad, *peer;\n+\n+ g_object_get (sestream, \"pad\", &pad, NULL);\n \n \n \/* Take the stream lock to make sure nothing is flowing through the\n@@ -610,12 +616,16 @@\n gst_pad_unlink (pad, peer);\n gst_object_unref (peer);\n }\n- \/\/gst_element_release_request_pad (self->priv->tee, pad);\n+ \/*\n+ if (TP_STREAM_ENGINE_IS_VIDEO_STREAM (sestream))\n+ gst_element_release_request_pad (self->priv->videotee, pad);\n+ else if (TP_STREAM_ENGINE_IS_AUDIO_STREAM (sestream))\n+ gst_element_release_request_pad (self->priv->audiotee, pad);\n+ *\/\n GST_PAD_STREAM_UNLOCK(pad);\n \n gst_object_unref (pad);\n }\n-\n g_object_unref (sestream);\n }\n }\n"} {"commit":"78f23f8f84828140fe8ef0302530670f61b63db9","subject":"Added rvalue push_back to vector.","message":"Added rvalue push_back to vector.\n","repos":"RAttab\/reflect,jkhoogland\/reflect,Remotion\/reflect,RAttab\/reflect,jkhoogland\/reflect,Remotion\/reflect","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/types\/std\/vector.h\n+++ src\/types\/std\/vector.h\n@@ -24,10 +24,7 @@\n struct Reflect< std::vector<T> >\n {\n typedef std::vector<T> T_;\n- static std::string id()\n- {\n- return \"std::vector<\" + typeId<T>() + \">\";\n- }\n+ static std::string id() { return \"std::vector<\" + typeId<T>() + \">\"; }\n \n reflectTemplateLoader()\n \n@@ -40,6 +37,7 @@\n \n reflectFn(size);\n reflectFnTyped(push_back, void (T_::*) (const T&));\n+ reflectFnTyped(push_back, void (T_::*) (T&&));\n \n reflectCustom(operator[]) (const T_& value, size_t i) -> const T& {\n return value[i];\n"} {"commit":"c67c56a97b96400161440b7ca54e189b47a6abf9","subject":"fixed uint\/size_t issue x86_64 (issue #1)","message":"fixed uint\/size_t issue x86_64 (issue #1)\n","repos":"VladimirTyrin\/libev-examples,SproutOrc\/libev-examples,DD-L\/libev-examples,coolaj86\/libev-examples,VladimirTyrin\/libev-examples,wusuopubupt\/libev-examples,coolaj86\/libev-examples,VladimirTyrin\/libev-examples,DD-L\/libev-examples,SproutOrc\/libev-examples,coolaj86\/libev-examples,DD-L\/libev-examples,wusuopubupt\/libev-examples,SproutOrc\/libev-examples,wusuopubupt\/libev-examples","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/unix-echo-client.c\n+++ src\/unix-echo-client.c\n@@ -18,7 +18,7 @@\n ev_io send_w;\n int remote_fd;\n char* line = NULL;\n-uint len = 0;\n+size_t len = 0;\n \n static void send_cb (EV_P_ ev_io *w, int revents)\n {\n"} {"commit":"38b2d885eb892c08f1f09c3f19d1226ceda26c10","subject":"Convert level to upper case to make it more user-friendly","message":"Convert level to upper case to make it more user-friendly\n","repos":"rackerlabs\/openstack-guest-agents-unix,coreos\/openstack-guest-agents-unix,prometheanfire\/openstack-guest-agents-unix,rackerlabs\/openstack-guest-agents-unix,coreos\/openstack-guest-agents-unix,joejulian\/openstack-guest-agents-unix,prometheanfire\/openstack-guest-agents-unix,coreos\/openstack-guest-agents-unix,rackerlabs\/openstack-guest-agents-unix,coreos\/openstack-guest-agents-unix,joejulian\/openstack-guest-agents-unix,prometheanfire\/openstack-guest-agents-unix,joejulian\/openstack-guest-agents-unix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/unix\/src\/logging.c\n+++ src\/unix\/src\/logging.c\n@@ -78,13 +78,26 @@\n \n if (level)\n {\n- PyObject *value = PyObject_GetAttrString(logging, level);\n+ char *buf = strdup(level);\n+ if (!buf)\n+ {\n+ PyErr_NoMemory();\n+ goto err_value;\n+ }\n+\n+ char *p;\n+ for (p = buf; *p; p++)\n+ *p = toupper(*p);\n+\n+ PyObject *value = PyObject_GetAttrString(logging, buf);\n+ free(buf);\n if (!value)\n goto err_value;\n \n if (!PyInt_Check(value))\n {\n Py_DECREF(value);\n+ PyErr_Format(PyExc_ValueError, \"logging level must resolve to integer\");\n goto err_value;\n }\n \n"} {"commit":"1b9c53e849aa65776d4f611d99aa09f856518dad","subject":"lib\/rbtree.c: fix typo in comment of __rb_insert()","message":"lib\/rbtree.c: fix typo in comment of __rb_insert()\n\nIn case 1, it passes down the BLACK color from G to p and u, and maintains\nthe color of n. By doing so, it maintains the black height of the\nsub-tree.\n\nWhile in the comment, it marks the color of n to BLACK. This is a typo\nand not consistents with the code.\n\nThis patch fixs this typo in comment.\n\nSigned-off-by: Wei Yang <acbca9fda1bd78fcd284ddae8b872fb12de49b82@linux.vnet.ibm.com>\nAcked-by: Michel Lespinasse <6a4cf9207bb95b1a4cf1be22c2e93f8b38036f65@google.com>\nCc: Xiao Guangrong <1e0036c3819c78880ef9e9a8457e99783a5661e3@linux.vnet.ibm.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/rbtree.c\n+++ lib\/rbtree.c\n@@ -101,7 +101,7 @@\n \t\t\t\t * \/ \\ \/ \\\n \t\t\t\t * p u --> P U\n \t\t\t\t * \/ \/\n-\t\t\t\t * n N\n+\t\t\t\t * n n\n \t\t\t\t *\n \t\t\t\t * However, since g's parent might be red, and\n \t\t\t\t * 4) does not allow this, we need to recurse\n"} {"commit":"525ac6885b508759f8618f136f04554c95138ae8","subject":"vircgroup: introduce virCgroupV2SetOwner","message":"vircgroup: introduce virCgroupV2SetOwner\n\nSigned-off-by: Pavel Hrdina <d4772d05997b8abf035041e3b4f4996380ea7e7a@redhat.com>\n","repos":"nertpinx\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,eskultety\/libvirt,crobinso\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,zippy2\/libvirt,olafhering\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/vircgroupv2.c\n+++ src\/util\/vircgroupv2.c\n@@ -494,6 +494,32 @@\n }\n \n \n+static int\n+virCgroupV2SetOwner(virCgroupPtr cgroup,\n+ uid_t uid,\n+ gid_t gid,\n+ int controllers ATTRIBUTE_UNUSED)\n+{\n+ VIR_AUTOFREE(char *) base = NULL;\n+\n+ if (virAsprintf(&base, \"%s%s\", cgroup->unified.mountPoint,\n+ cgroup->unified.placement) < 0) {\n+ return -1;\n+ }\n+\n+ if (virFileChownFiles(base, uid, gid) < 0)\n+ return -1;\n+\n+ if (chown(base, uid, gid) < 0) {\n+ virReportSystemError(errno, _(\"cannot chown '%s' to (%u, %u)\"),\n+ base, uid, gid);\n+ return -1;\n+ }\n+\n+ return 0;\n+}\n+\n+\n virCgroupBackend virCgroupV2Backend = {\n .type = VIR_CGROUP_BACKEND_TYPE_V2,\n \n@@ -514,6 +540,7 @@\n .addTask = virCgroupV2AddTask,\n .hasEmptyTasks = virCgroupV2HasEmptyTasks,\n .bindMount = virCgroupV2BindMount,\n+ .setOwner = virCgroupV2SetOwner,\n };\n \n \n"} {"commit":"fb27b7b9be14ea589035fa0c038de8edc04107be","subject":"virfdstream: Use autoptr for virFDStreamMsg","message":"virfdstream: Use autoptr for virFDStreamMsg\n\nA cleanup function can be declared for virFDStreamMsg type so\nthat the structure doesn't have to be freed explicitly.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\nReviewed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"libvirt\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,zippy2\/libvirt,olafhering\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,zippy2\/libvirt,crobinso\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virfdstream.c\n+++ src\/util\/virfdstream.c\n@@ -208,6 +208,8 @@\n VIR_FREE(msg);\n }\n \n+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFDStreamMsg, virFDStreamMsgFree);\n+\n \n static void\n virFDStreamMsgQueueFree(virFDStreamMsgPtr *queue)\n@@ -428,7 +430,7 @@\n size_t *dataLen,\n size_t buflen)\n {\n- virFDStreamMsgPtr msg = NULL;\n+ g_autoptr(virFDStreamMsg) msg = NULL;\n int inData = 0;\n long long sectionLen = 0;\n g_autofree char *buf = NULL;\n@@ -494,7 +496,6 @@\n return got;\n \n error:\n- virFDStreamMsgFree(msg);\n return -1;\n }\n \n@@ -761,7 +762,7 @@\n static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)\n {\n virFDStreamDataPtr fdst = st->privateData;\n- virFDStreamMsgPtr msg = NULL;\n+ g_autoptr(virFDStreamMsg) msg = NULL;\n int ret = -1;\n \n if (nbytes > INT_MAX) {\n@@ -838,7 +839,6 @@\n \n cleanup:\n virObjectUnlock(fdst);\n- virFDStreamMsgFree(msg);\n return ret;\n }\n \n@@ -960,7 +960,7 @@\n unsigned int flags)\n {\n virFDStreamDataPtr fdst = st->privateData;\n- virFDStreamMsgPtr msg = NULL;\n+ g_autoptr(virFDStreamMsg) msg = NULL;\n off_t off;\n int ret = -1;\n \n@@ -1028,7 +1028,6 @@\n ret = 0;\n cleanup:\n virObjectUnlock(fdst);\n- virFDStreamMsgFree(msg);\n return ret;\n }\n \n"} {"commit":"c1e1b231a6744923fef61934402202e6a27ad7b8","subject":"removed move_on_copy, causing errors in msvc","message":"removed move_on_copy, causing errors in msvc\n","repos":"flipcoder\/kit,flipcoder\/kit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kit\/kit.h\n+++ kit\/kit.h\n@@ -76,51 +76,51 @@\n \/\/{\n \/\/}\n \n- template<class T>\n- struct move_on_copy\n- {\n- public:\n- move_on_copy() = default;\n+ \/\/template<class T>\n+ \/\/struct move_on_copy\n+ \/\/{\n+ \/\/ public:\n+ \/\/ move_on_copy() = default;\n \n- move_on_copy(T&& rhs):\n- m_Data(std::forward<T>(rhs)) {}\n+ \/\/ move_on_copy(T&& rhs):\n+ \/\/ m_Data(std::forward<T>(rhs)) {}\n \n- move_on_copy(move_on_copy&& rhs):\n- m_Data(std::forward<T>(rhs.m_Data)) {}\n+ \/\/ move_on_copy(move_on_copy&& rhs):\n+ \/\/ m_Data(std::forward<T>(rhs.m_Data)) {}\n \n- move_on_copy(move_on_copy& rhs):\n- m_Data(std::move(rhs.m_Data)) {}\n-\n- move_on_copy& operator=(move_on_copy&& rhs){\n- m_Data = rhs.m_Data;\n- return *this;\n- }\n-\n- T& get() const {\n- return m_Data;\n- }\n- \/\/const T& get() const {\n- \/\/ return m_Data;\n- \/\/}\n+ \/\/ move_on_copy(move_on_copy& rhs):\n+ \/\/ m_Data(std::move(rhs.m_Data)) {}\n+\n+ \/\/ move_on_copy& operator=(move_on_copy&& rhs){\n+ \/\/ m_Data = rhs.m_Data;\n+ \/\/ return *this;\n+ \/\/ }\n+\n+ \/\/ T& get() const {\n+ \/\/ return m_Data;\n+ \/\/ }\n+ \/\/ \/\/const T& get() const {\n+ \/\/ \/\/ return m_Data;\n+ \/\/ \/\/}\n \n- T&& move() {\n- return std::move(m_Data);\n- }\n-\n- const T& operator*() const {\n- return m_Data;\n- }\n- T& operator*() {\n- return m_Data;\n- }\n-\n- operator T() const {\n- return m_Data;\n- }\n-\n- private:\n- mutable T m_Data;\n- };\n+ \/\/ T&& move() {\n+ \/\/ return std::move(m_Data);\n+ \/\/ }\n+\n+ \/\/ const T& operator*() const {\n+ \/\/ return m_Data;\n+ \/\/ }\n+ \/\/ T& operator*() {\n+ \/\/ return m_Data;\n+ \/\/ }\n+\n+ \/\/ operator T() const {\n+ \/\/ return m_Data;\n+ \/\/ }\n+\n+ \/\/ private:\n+ \/\/ mutable T m_Data;\n+ \/\/};\n \n struct dummy_mutex\n {\n"} {"commit":"833130500789497fb59f623224c1120d283a7e5b","subject":"gitShit","message":"gitShit\n","repos":"mat0pad\/smartPark","returncode":1,"stderr":"error: pathspec 'gitShit.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- gitShit.c\n+++ gitShit.c\n@@ -0,0 +1 @@\n+WHAT THE FUCK ARE YOU DOING"} {"commit":"ca42addc3e8c3464d7268bfb4ca496847f879eab","subject":"kmsloop: Protect object against race conditions","message":"kmsloop: Protect object against race conditions\n\nChange-Id: If948d9f3c0b9027c0639150bbd547167c44d3250\n","repos":"TribeMedia\/kms-elements,shelsonjava\/kms-elements,Kurento\/kms-elements,shelsonjava\/kms-elements,Kurento\/kms-elements,TribeMedia\/kms-elements,shelsonjava\/kms-elements,TribeMedia\/kms-elements,Kurento\/kms-elements","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- kmsloop.c\n+++ kmsloop.c\n@@ -36,15 +36,22 @@\n KmsLoopPrivate \\\n ) \\\n )\n+\n struct _KmsLoopPrivate\n {\n GThread *thread;\n+ GRecMutex rmutex;\n GMainLoop *loop;\n GMainContext *context;\n gboolean stopping;\n GMutex mutex;\n };\n \n+#define KMS_LOOP_LOCK(elem) \\\n+ (g_rec_mutex_lock (&KMS_LOOP ((elem))->priv->rmutex))\n+#define KMS_LOOP_UNLOCK(elem) \\\n+ (g_rec_mutex_unlock (&KMS_LOOP ((elem))->priv->rmutex))\n+\n \/* Object properties *\/\n enum\n {\n@@ -72,10 +79,12 @@\n GMainLoop *loop;\n GMainContext *context;\n \n+ KMS_LOOP_LOCK (self);\n self->priv->context = g_main_context_new ();\n context = self->priv->context;\n self->priv->loop = g_main_loop_new (context, FALSE);\n loop = self->priv->loop;\n+ KMS_LOOP_UNLOCK (self);\n \n \/* unlock main process because context is already initialized *\/\n g_mutex_unlock (&self->priv->mutex);\n@@ -88,8 +97,11 @@\n GST_DEBUG (\"Running main loop\");\n g_main_loop_run (loop);\n \n- if (KMS_IS_LOOP (self))\n+ if (KMS_IS_LOOP (self)) {\n+ KMS_LOOP_LOCK (self);\n self->priv->stopping = TRUE;\n+ KMS_LOOP_UNLOCK (self);\n+ }\n \n end:\n GST_DEBUG (\"Thread finished\");\n@@ -105,6 +117,8 @@\n GParamSpec * pspec)\n {\n KmsLoop *self = KMS_LOOP (object);\n+\n+ KMS_LOOP_LOCK (self);\n \n switch (property_id) {\n case PROP_CONTEXT:\n@@ -114,6 +128,8 @@\n G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n break;\n }\n+\n+ KMS_LOOP_UNLOCK (self);\n }\n \n static void\n@@ -122,6 +138,8 @@\n KmsLoop *self = KMS_LOOP (obj);\n \n GST_DEBUG_OBJECT (obj, \"Dispose\");\n+\n+ KMS_LOOP_LOCK (self);\n \n if (!self->priv->stopping) {\n kms_loop_idle_add (self, (GSourceFunc) quit_main_loop, self->priv->loop);\n@@ -129,12 +147,17 @@\n }\n \n if (self->priv->thread != NULL) {\n- if (g_thread_self () != self->priv->thread)\n+ if (g_thread_self () != self->priv->thread) {\n+ KMS_LOOP_UNLOCK (self);\n g_thread_join (self->priv->thread);\n+ KMS_LOOP_LOCK (self);\n+ }\n \n g_thread_unref (self->priv->thread);\n self->priv->thread = NULL;\n }\n+\n+ KMS_LOOP_UNLOCK (self);\n \n G_OBJECT_CLASS (kms_loop_parent_class)->dispose (obj);\n }\n@@ -176,8 +199,9 @@\n kms_loop_init (KmsLoop * self)\n {\n self->priv = KMS_LOOP_GET_PRIVATE (self);\n-\n+ g_rec_mutex_init (&self->priv->rmutex);\n g_mutex_init (&self->priv->mutex);\n+\n g_mutex_lock (&self->priv->mutex);\n \n self->priv->thread = g_thread_new (\"KmsLoop\", loop_thread_init, self);\n@@ -202,10 +226,19 @@\n {\n guint id;\n \n+ KMS_LOOP_LOCK (self);\n+\n+ if (self->priv->stopping) {\n+ KMS_LOOP_UNLOCK (self);\n+ return 0;\n+ }\n+\n g_source_set_priority (source, priority);\n g_source_set_callback (source, function, data, notify);\n id = g_source_attach (source, self->priv->context);\n \n+ KMS_LOOP_UNLOCK (self);\n+\n return id;\n }\n \n@@ -216,7 +249,7 @@\n GSource *source;\n guint id;\n \n- if (!KMS_IS_LOOP (self) || self->priv->stopping)\n+ if (!KMS_IS_LOOP (self))\n return 0;\n \n source = g_idle_source_new ();\n@@ -240,7 +273,7 @@\n GSource *source;\n guint id;\n \n- if (!KMS_IS_LOOP (self) || self->priv->stopping)\n+ if (!KMS_IS_LOOP (self))\n return 0;\n \n source = g_timeout_source_new (interval);\n"} {"commit":"548b4a64f21f88a231f8b09280f105f4794e7c46","subject":"Added http rate limiter to config when not present","message":"Added http rate limiter to config when not present\n","repos":"aymanelyaagoubi\/gpac,emmanouil\/gpac,rauf\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,emmanouil\/gpac,rauf\/gpac,rauf\/gpac,emmanouil\/gpac,aymanelyaagoubi\/gpac,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,ARSekkat\/gpac,aymanelyaagoubi\/gpac,rauf\/gpac,ARSekkat\/gpac,nguyen-viet-thanh-trung\/gpac,RodolpheFouquet\/gpac,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,gpac\/gpac,porcelijn\/gpac,porcelijn\/gpac,rbouqueau\/gpac_brew_travis,ARSekkat\/gpac,rbouqueau\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,rauf\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,emmanouil\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac_brew_travis,gpac\/gpac,aymanelyaagoubi\/gpac,nguyen-viet-thanh-trung\/gpac,nguyen-viet-thanh-trung\/gpac,porcelijn\/gpac,porcelijn\/gpac,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,porcelijn\/gpac,rauf\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,ARSekkat\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,RodolpheFouquet\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/utils\/downloader.c\n+++ src\/utils\/downloader.c\n@@ -1753,7 +1753,11 @@\n \n \topt = cfg ? gf_cfg_get_key(cfg, \"Downloader\", \"MaxRate\") : NULL;\n \t\/*use it in in BYTES per second*\/\n-\tif (opt) dm->limit_data_rate = 1000 * atoi(opt) \/ 8;\n+\tif (opt)\n+\t\tdm->limit_data_rate = 1000 * atoi(opt) \/ 8;\n+\telse\n+\t\tgf_cfg_set_key(cfg, \"Downloader\", \"MaxRate\", \"0\");\n+\t\n \n \tdm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;\n \t\/\/when rate is limited, use smaller smaller read size\n"} {"commit":"0fb6d232e28b6e930599269ee2afefae31c6ca52","subject":"Added tabs","message":"Added tabs\n","repos":"Mihail-K\/Sptifire-Kernel,Mihail-K\/Sptifire-Kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kscreen.c\n+++ kscreen.c\n@@ -59,6 +59,12 @@\n \tif(ch == '\\n') {\r\n \t\txpos = 0;\r\n \t\typos++;\r\n+\t} else if(ch == '\\t') {\r\n+\t\txpos = 8 - xpos % 8;\r\n+\t\tif(xpos >= ylim) {\r\n+\t\t\txpos = 0;\r\n+\t\t\typos++;\r\n+\t\t}\r\n \t} else {\r\n \t\tint pos = xpos + ypos * xlim;\r\n \t\tvram_data *data = &vram[pos];\r\n"} {"commit":"ab2a6b7b1a75b86700c288b656ea8767d8e8f62f","subject":"add: add STM32F4x5 STM32F4x7","message":"add: add STM32F4x5 STM32F4x7\n","repos":"dmitrystu\/libusb_stm32","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- inc\/usb.h\n+++ inc\/usb.h\n@@ -70,7 +70,10 @@\n #define usbd_hw usbd_otgfs\n #endif\n \n-#elif defined(STM32F429xx)\n+#elif defined(STM32F405xx) || defined(STM32F415xx) || \\\n+ defined(STM32F407xx) || defined(STM32F417xx) || \\\n+ defined(STM32F427xx) || defined(STM32F437xx) || \\\n+ defined(STM32F429xx) || defined(STM32F439xx)\n \n #define USBD_STM32F429\n \n"} {"commit":"a04d3e66485bbeb94f451e6a5ed64edf8757e2a8","subject":"* Change extern inline to static inline. This improves compiling without optimization.","message":"* Change extern inline to static inline. This improves compiling without optimization.\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@461 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libav\/avio.h\n+++ libav\/avio.h\n@@ -112,13 +112,13 @@\n unsigned int get_be32(ByteIOContext *s);\n UINT64 get_be64(ByteIOContext *s);\n \n-extern inline int url_is_streamed(ByteIOContext *s)\n+static inline int url_is_streamed(ByteIOContext *s)\n {\n return s->is_streamed;\n }\n \/* get the prefered packet size of the device. All I\/Os should be done\n by multiple of this size *\/\n-extern inline int url_get_packet_size(ByteIOContext *s)\n+static inline int url_get_packet_size(ByteIOContext *s)\n {\n return s->packet_size;\n }\n"} {"commit":"955ee038c3bf0dde5381fbac86c84d1f94f94a0a","subject":"Follow spec of \"alg\" claim being case-sensitive","message":"Follow spec of \"alg\" claim being case-sensitive\n\nAccording to https:\/\/tools.ietf.org\/html\/rfc7515#section-4.1.1 the \"alg\" claim is case sensitive and should be treated as such.","repos":"benmcollins\/libjwt","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- libjwt\/jwt.c\n+++ libjwt\/jwt.c\n@@ -108,25 +108,25 @@\n \tif (alg == NULL)\n \t\treturn JWT_ALG_INVAL;\n \n-\tif (!strcasecmp(alg, \"none\"))\n+\tif (!strcmp(alg, \"none\"))\n \t\treturn JWT_ALG_NONE;\n-\telse if (!strcasecmp(alg, \"HS256\"))\n+\telse if (!strcmp(alg, \"HS256\"))\n \t\treturn JWT_ALG_HS256;\n-\telse if (!strcasecmp(alg, \"HS384\"))\n+\telse if (!strcmp(alg, \"HS384\"))\n \t\treturn JWT_ALG_HS384;\n-\telse if (!strcasecmp(alg, \"HS512\"))\n+\telse if (!strcmp(alg, \"HS512\"))\n \t\treturn JWT_ALG_HS512;\n-\telse if (!strcasecmp(alg, \"RS256\"))\n+\telse if (!strcmp(alg, \"RS256\"))\n \t\treturn JWT_ALG_RS256;\n-\telse if (!strcasecmp(alg, \"RS384\"))\n+\telse if (!strcmp(alg, \"RS384\"))\n \t\treturn JWT_ALG_RS384;\n-\telse if (!strcasecmp(alg, \"RS512\"))\n+\telse if (!strcmp(alg, \"RS512\"))\n \t\treturn JWT_ALG_RS512;\n-\telse if (!strcasecmp(alg, \"ES256\"))\n+\telse if (!strcmp(alg, \"ES256\"))\n \t\treturn JWT_ALG_ES256;\n-\telse if (!strcasecmp(alg, \"ES384\"))\n+\telse if (!strcmp(alg, \"ES384\"))\n \t\treturn JWT_ALG_ES384;\n-\telse if (!strcasecmp(alg, \"ES512\"))\n+\telse if (!strcmp(alg, \"ES512\"))\n \t\treturn JWT_ALG_ES512;\n \n \treturn JWT_ALG_INVAL;\n"} {"commit":"503bd97c2bd8de8a759ab5d34a4182a02d0b4404","subject":"don't check modifer state during EnterNotify events","message":"don't check modifer state during EnterNotify events\n","repos":"seanpringle\/goomwwm,seanpringle\/goomwwm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- goomwwm.c\n+++ goomwwm.c\n@@ -2847,7 +2847,7 @@\n \t\/\/ only care about the sloppy modes here\n \tif (config_focus_mode == FOCUSCLICK) return;\n \t\/\/ ensure it's a proper enter event without keys or buttons down\n-\tif (ev->xcrossing.type != EnterNotify || ev->xcrossing.state) return;\n+\tif (ev->xcrossing.type != EnterNotify) return;\n \t\/\/ prevent focus flicker if mouse is moving through multiple windows fast\n \twhile(XCheckTypedEvent(display, EnterNotify, ev));\n \n"} {"commit":"81b23b8fdb9d899602c3915048e6a70f06f05afc","subject":"Added memory allocation. Tested and works successfully for 8 processes.","message":"Added memory allocation. Tested and works successfully for 8 processes.\n","repos":"shreyaspotnis\/gpe3d_mpi,shreyaspotnis\/gpe3d_mpi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- gpe_mpi.c\n+++ gpe_mpi.c\n@@ -7,9 +7,9 @@\n #include <mpi.h>\n #include <fftw3-mpi.h>\n \n-#define Nx 16\n-#define Ny 16\n-#define Nz 16\n+#define NX 256\n+#define NY 16\n+#define NZ 16\n \n int main(int argc, char **argv) {\n \n@@ -22,8 +22,41 @@\n MPI_Comm_size(MPI_COMM_WORLD, &size);\n MPI_Comm_rank(MPI_COMM_WORLD, &rank);\n \n- printf(\"Hello, from task %d of %d!\\n\", rank, size);\n+ \/\/ The MPI implementation of fftw splits up the 3d grid into blocks\n+ \/\/ where each node has only a subsection of grid in the X direction\n+ \/\/ and the entire grid in the other two dimensions. Here NX_local will give\n+ \/\/ us the number of elements in the x direction on our local process and\n+ \/\/ x_start_local will give us the start index on the local process.\n+ \/\/ alloc_local gives the amount of memory we need to allocate on the local\n+ \/\/ process.\n+ ptrdiff_t alloc_local, NX_local, x_start_local; \n \n+ alloc_local = fftw_mpi_local_size_3d(NX, NY, NZ, MPI_COMM_WORLD,\n+ &NX_local, &x_start_local);\n+ fftw_complex *psi_local;\n+ fftw_plan p_fwd, p_bwd;\n+ \n+ psi_local = fftw_alloc_complex(alloc_local);\n+ create_plans(&p_fwd, &p_bwd, psi_local);\n+ \n+ printf(\"task %d\/%d!. x_s:%d\\n\", rank, size, x_start_local);\n+\n+\n+ \/\/ clean up\n+ fftw_destroy_plan(p_fwd);\n+ fftw_destroy_plan(p_bwd);\n+ fftw_free(psi_local);\n MPI_Finalize();\n+\n return 0;\n }\n+\n+int create_plans(fftw_plan *p_fwd, fftw_plan *p_bwd, fftw_complex *psi_local) {\n+\n+ *p_fwd = fftw_mpi_plan_dft_3d(NX, NY, NZ, psi_local, psi_local,\n+ MPI_COMM_WORLD, FFTW_FORWARD, FFTW_MEASURE);\n+ *p_bwd = fftw_mpi_plan_dft_3d(NX, NY, NZ, psi_local, psi_local,\n+ MPI_COMM_WORLD, FFTW_BACKWARD,\n+ FFTW_MEASURE);\n+ return 0;\n+}\n"} {"commit":"2bea0e636f87839ce68939ac51352b1edbd3b108","subject":"We explicitly don't know how to handle 1 and 4 bpp pixel formats.","message":"We explicitly don't know how to handle 1 and 4 bpp pixel formats.\n","repos":"aduros\/SDL,aduros\/SDL,aduros\/SDL,aduros\/SDL,aduros\/SDL","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/video\/SDL_pixels.c\n+++ src\/video\/SDL_pixels.c\n@@ -241,6 +241,10 @@\n Uint32 Amask)\n {\n switch (bpp) {\n+ case 1:\n+ case 4:\n+ \/* Can't tell if this is LSB or MSB bitmap ordering... *\/\n+ break;\n case 8:\n if (Rmask == 0) {\n return SDL_PIXELFORMAT_INDEX8;\n"} {"commit":"19658c990b9514b4e42e9a6aeb93116a6213c148","subject":"bfd: remove source IP check from session add","message":"bfd: remove source IP check from session add\n\nChecking for existence of source address on interface prevents creating\nsession before assigning address to said interface. Removing this check\nallows more flexibility when configuring BFD feature.\n\nType: improvement\nSigned-off-by: Klement Sekera <e142cc48b4b76dcd76b0aac57013c9dea9c2e536@gmail.com>\nChange-Id: Ia57960e29b5dbdb758a7a64193c28f21482f229e\n","repos":"chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,FDio\/vpp,FDio\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vnet\/bfd\/bfd_udp.c\n+++ src\/vnet\/bfd\/bfd_udp.c\n@@ -601,8 +601,6 @@\n bfd_udp_main_t *bum = &bfd_udp_main;\n vnet_sw_interface_t *sw_if =\n vnet_get_sw_interface_or_null (bfd_udp_main.vnet_main, sw_if_index);\n- u8 local_ip_valid = 0;\n- ip_interface_address_t *ia = NULL;\n if (!sw_if)\n {\n vlib_log_err (bum->log_class,\n@@ -618,21 +616,6 @@\n \t\t\t\"IP family mismatch (local is ipv4, peer is ipv6)\");\n \t return VNET_API_ERROR_INVALID_ARGUMENT;\n \t}\n- ip4_main_t *im = &ip4_main;\n-\n- \/* *INDENT-OFF* *\/\n- foreach_ip_interface_address (\n- &im->lookup_main, ia, sw_if_index, 0 \/* honor unnumbered *\/, ({\n- ip4_address_t *x =\n- ip_interface_address_get_address (&im->lookup_main, ia);\n- if (x->as_u32 == local_addr->ip4.as_u32)\n- {\n- \/* valid address for this interface *\/\n- local_ip_valid = 1;\n- break;\n- }\n- }));\n- \/* *INDENT-ON* *\/\n }\n else\n {\n@@ -642,44 +625,6 @@\n \t\t\t\"IP family mismatch (local is ipv6, peer is ipv4)\");\n \t return VNET_API_ERROR_INVALID_ARGUMENT;\n \t}\n-\n- if (ip6_address_is_link_local_unicast (&local_addr->ip6))\n-\t{\n-\t const ip6_address_t *ll_addr;\n-\t ll_addr = ip6_get_link_local_address (sw_if_index);\n-\t if (ll_addr && ip6_address_is_equal (ll_addr, &local_addr->ip6))\n-\t {\n-\t \/* valid address for this interface *\/\n-\t local_ip_valid = 1;\n-\t }\n-\t}\n- else\n-\t{\n-\t ip6_main_t *im = &ip6_main;\n-\t \/* *INDENT-OFF* *\/\n-\t foreach_ip_interface_address (\n-\t &im->lookup_main, ia, sw_if_index, 0 \/* honor unnumbered *\/, ({\n-\t ip6_address_t *x =\n-\t ip_interface_address_get_address (&im->lookup_main, ia);\n-\t if (local_addr->ip6.as_u64[0] == x->as_u64[0] &&\n-\t local_addr->ip6.as_u64[1] == x->as_u64[1])\n-\t {\n-\t \/* valid address for this interface *\/\n-\t local_ip_valid = 1;\n-\t break;\n-\t }\n-\t }));\n-\t \/* *INDENT-ON* *\/\n-\t}\n- }\n-\n- if (!local_ip_valid)\n- {\n- vlib_log_err (bum->log_class,\n-\t\t \"local address %U not found on interface with index %u\",\n-\t\t format_ip46_address, local_addr, IP46_TYPE_ANY,\n-\t\t sw_if_index);\n- return VNET_API_ERROR_ADDRESS_NOT_FOUND_FOR_INTERFACE;\n }\n \n return 0;\n"} {"commit":"cf261c81b61b95670f14ad18ccea12799a6304f4","subject":"Minor GTK3 code cleanups from attempt at fixing combobox event order.","message":"Minor GTK3 code cleanups from attempt at fixing combobox event order.\n\n","repos":"OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gtk3\/dw.c\n+++ gtk3\/dw.c\n@@ -1329,10 +1329,9 @@\n static gint _combobox_select_event(GtkWidget *widget, gpointer data)\n {\n SignalHandler work = _get_signal_handler(widget, data);\n- static int _dw_recursing = 0;\n int retval = FALSE;\n \n- if(_dw_recursing)\n+ if(g_object_get_data(G_OBJECT(widget), \"_dw_recursing\"))\n return FALSE;\n \n if(work.window && GTK_IS_COMBO_BOX(widget))\n@@ -1344,7 +1343,7 @@\n GtkTreeIter iter;\n GtkTreePath *path;\n \n- _dw_recursing = 1;\n+ g_object_set_data(G_OBJECT(widget), \"_dw_recursing\", GINT_TO_POINTER(1));\n \n if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))\n {\n@@ -1364,7 +1363,7 @@\n }\n }\n \n- _dw_recursing = 0;\n+ g_object_set_data(G_OBJECT(widget), \"_dw_recursing\", NULL);\n }\n }\n return retval;\n@@ -4403,7 +4402,7 @@\n *\/\n char *dw_window_get_text(HWND handle)\n {\n- const char *possible = \"\";\n+ const char *possible = NULL;\n int _locked_by_me = FALSE;\n \n DW_MUTEX_LOCK;\n@@ -4413,7 +4412,7 @@\n possible = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))));\n \n DW_MUTEX_UNLOCK;\n- return strdup(possible);\n+ return strdup(possible ? possible : \"\");\n }\n \n \/*\n"} {"commit":"acfce46e428cc084b4bd0164e1b019261a8dbeda","subject":"Fix Windows build.","message":"Fix Windows build.\n","repos":"sctplab\/usrsctp,sctplab\/usrsctp,weinrank\/usrsctp,weinrank\/usrsctp,sctplab\/usrsctp,weinrank\/usrsctp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usrsctplib\/netinet\/sctp_userspace.c\n+++ usrsctplib\/netinet\/sctp_userspace.c\n@@ -182,7 +182,7 @@\n \t\tif ((Err = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &AdapterAddrsSize)) != 0) {\n \t\t\tif ((Err != ERROR_BUFFER_OVERFLOW) && (Err != ERROR_INSUFFICIENT_BUFFER)) {\n \t\t\t\tSCTPDBG(SCTP_DEBUG_USR, \"GetAdaptersAddresses() sizing failed with error code %d, AdapterAddrsSize = %d\\n\", Err, AdapterAddrsSize);\n-\t\t\t\tret = -1;\n+\t\t\t\tmtu = -1;\n \t\t\t\tgoto cleanup;\n \t\t\t}\n \t\t}\n"} {"commit":"aa57c166acc0e20b8406767099774c2681f18c4f","subject":"Added gravity obstacle support for GTK 3.4 and later.","message":"Added gravity obstacle support for GTK 3.4 and later.\n\n","repos":"OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows,OS2World\/LIB-DynamicWindows","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- gtk3\/dw.c\n+++ gtk3\/dw.c\n@@ -8834,6 +8834,32 @@\n newy += ((gdk_screen_height() \/ 2) - (height \/ 2));\n else if((vert & 0xf) == DW_GRAV_BOTTOM)\n newy = gdk_screen_height() - height - y;\n+\n+#if GTK_CHECK_VERSION(3,4,0) \n+ \/* Adjust the values to avoid Gnome bar if requested *\/\n+ if((horz | vert) & DW_GRAV_OBSTACLES)\n+ {\n+ GdkRectangle rect;\n+ GdkScreen *screen = gdk_screen_get_default();\n+ \n+ gdk_screen_get_monitor_workarea(screen, 0, &rect);\n+ \n+ if(horz & DW_GRAV_OBSTACLES)\n+ {\n+ if((horz & 0xf) == DW_GRAV_LEFT)\n+ newx += rect.x;\n+ else if((horz & 0xf) == DW_GRAV_RIGHT)\n+ newx -= dw_screen_width() - (rect.x + rect.width);\n+ }\n+ if(vert & DW_GRAV_OBSTACLES)\n+ {\n+ if((vert & 0xf) == DW_GRAV_TOP)\n+ newy += rect.y;\n+ else if((vert & 0xf) == DW_GRAV_BOTTOM)\n+ newy -= dw_screen_height() - (rect.y + rect.height);\n+ }\n+ }\n+#endif \n } \n \/* Finally move the window into place *\/\n gtk_window_move(GTK_WINDOW(handle), newx, newy);\n"} {"commit":"a6dd78b474396cafea95f4baa7a43328d72611bd","subject":"[TableGen] Use CHAR_BIT instead of hardcoded 8 with sizeof. NFC","message":"[TableGen] Use CHAR_BIT instead of hardcoded 8 with sizeof. NFC\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@313860 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- utils\/TableGen\/CodeGenDAGPatterns.h\n+++ utils\/TableGen\/CodeGenDAGPatterns.h\n@@ -52,7 +52,7 @@\n \"Change uint8_t here to the SimpleValueType's type\");\n static unsigned constexpr Capacity = std::numeric_limits<uint8_t>::max()+1;\n using WordType = uint64_t;\n- static unsigned constexpr WordWidth = 8*sizeof(WordType);\n+ static unsigned constexpr WordWidth = CHAR_BIT*sizeof(WordType);\n static unsigned constexpr NumWords = Capacity\/WordWidth;\n static_assert(NumWords*WordWidth == Capacity,\n \"Capacity should be a multiple of WordWidth\");\n"} {"commit":"d1717cc5217f98ebbf3d381fc1312836c0203a10","subject":"[xzero] HugeBuffer: adds isBuffered()","message":"[xzero] HugeBuffer: adds isBuffered()\n","repos":"christianparpart\/x0,christianparpart\/x0,xzero\/x0,xzero\/x0,xzero\/x0,xzero\/x0,xzero\/x0,christianparpart\/x0,christianparpart\/x0,christianparpart\/x0,xzero\/x0,christianparpart\/x0,christianparpart\/x0","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/xzero\/HugeBuffer.h\n+++ src\/xzero\/HugeBuffer.h\n@@ -61,6 +61,11 @@\n bool isFile() const noexcept { return fd_.isOpen(); }\n \n \/**\n+ * Tests whether this HugeBuffer is buffered in-memory.\n+ *\/\n+ bool isBuffered() const noexcept { return !buffer_.empty(); }\n+\n+ \/**\n * Retrieves a caller-owned InputStream to read out this HugeBuffer.\n *\/\n std::unique_ptr<InputStream> getInputStream();\n"} {"commit":"b67af752be30e60666542f0bf0d81a0cfdfb453a","subject":"test \u547d\u4ee4\u4e2d\u52a0\u5165\u4e00\u4e9b\u65f6\u95f4\u76f8\u5173\u64cd\u4f5c.","message":"test \u547d\u4ee4\u4e2d\u52a0\u5165\u4e00\u4e9b\u65f6\u95f4\u76f8\u5173\u64cd\u4f5c.\n","repos":"hy0kl\/event-json-rpc,hy0kl\/event-json-rpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- handler.c\n+++ handler.c\n@@ -66,19 +66,25 @@\n char *wday[] = {\"Sun\", \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\"};\n time_t timep;\n struct tm *tp;\n+ struct timeval tv;\n \n time(&timep); \/* \u83b7\u53d6 time_t \u7c7b\u578b\u5f53\u524d\u65f6\u95f4 *\/\n \/\/tp = gmtime(&timep); \/* \u8f6c\u6362\u4e3a struct tm \u7ed3\u6784\u7684UTC\u65f6\u95f4 *\/\n+ \/** \u8c37\u6b4c\u540e\u5f97\u77e5: localtime() \u8fd4\u56de\u7684\u662f\u9759\u6001\u6307\u9488,\u4e0d\u9700\u8981 free() *\/\n tp = localtime(&timep); \/* \u8f6c\u6362\u4e3a struct tm \u7ed3\u6784\u7684\u5f53\u5730\u65f6\u95f4 *\/\n+ gettimeofday(&tv, NULL);\n \n snprintf(test, 1024, \"Just for test. [timestamp: %ld] [%d\/%02d\/%02d %s %02d:%02d:%02d]\",\n- time(NULL),\n+ GETSTIME(tv),\n 1900 + tp->tm_year, 1 + tp->tm_mon, tp->tm_mday,\n wday[tp->tm_wday],\n tp->tm_hour, tp->tm_min, tp->tm_sec);\n \n cJSON_AddItemToObject(json, RES_DATA, data);\n- cJSON_AddItemToObject(data, \"test\", cJSON_CreateString(test));\n+ cJSON_AddItemToObject(data, \"test\", cJSON_CreateString(test));\n+ cJSON_AddItemToObject(data, \"timestamp\", cJSON_CreateNumber(GETSTIME(tv)));\n+ cJSON_AddItemToObject(data, \"millisecond\", cJSON_CreateNumber(GETMTIME(tv)));\n+ cJSON_AddItemToObject(data, \"microsecond\", cJSON_CreateNumber(GETUTIME(tv)));\n \n return;\n }\n"} {"commit":"08e9ea7768b002c50f8fd4e096da3c87549249cc","subject":"version 1.4","message":"version 1.4\n\nNew parameter \"-E\" allows set maximum address in memory until the input file will be processed (e.g. max address in MCU Flash memory). For STM32 family it is: Base Address (0x08000000) + Flash memory size (for 2048k Flash it is 0x200000). The default value is preset to 0x08200000 which is STM32 MCU with 2Mb (e.g. STM32F429xI).","repos":"encedo\/hex2dfu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- hex2dfu.c\n+++ hex2dfu.c\n@@ -24,7 +24,7 @@\n void print_help(void);\n int hex2bin(unsigned char *obuf, const char *ibuf, int len);\n int check_checksum(unsigned char *inbuf, int len);\n-unsigned char *ihex2bin_buf(unsigned int *start_address, int *dst_len, FILE *inFile);\n+unsigned char *ihex2bin_buf(unsigned int *start_address, int *dst_len, FILE *inFile, unsigned int max_address);\n \n uint32_t crc32(uint32_t crc, const void *buf, size_t size);\n \n@@ -34,6 +34,7 @@\n char *tar0 = NULL, *tar0_lab = NULL, *out_fn = NULL;\n FILE *inFile, *outFile;\n unsigned char json_output = 0;\n+ unsigned int max_address = 0x08200000;\t\n \n #ifdef ED25519_SUPPORT \n unsigned char hash_buf[64];\n@@ -52,7 +53,7 @@\n unsigned int crc = 0, tmp, add_crc32 = 0;\n \n opterr = 0;\n- while ((c = getopt (argc, argv, \"hv:p:d:i:l:o:c:S:P:eJ\")) != -1) {\n+ while ((c = getopt (argc, argv, \"hv:p:d:i:l:o:c:S:P:eJE:\")) != -1) {\n switch (c) {\n case 'J': \n json_output = 1;\n@@ -75,6 +76,9 @@\n case 'c': \/\/place crc32 at this address\n add_crc32 = strtol (optarg, NULL, 16);\n break;\n+ case 'E': \/\/max address\n+ max_address = strtol (optarg, NULL, 16);\n+ break;\t\t \n case 'S': \/\/ED25519 secret (signing key), hex\n #ifndef ED25519_SUPPORT\n fprintf (stderr, \"Code signing not supported!\\n\");\n@@ -146,7 +150,7 @@\n #endif\n \n inFile = fopen ( tar0, \"r\"); \n- tar0_buf = ihex2bin_buf(&tar0_start_address, &tar0_len, inFile);\n+ tar0_buf = ihex2bin_buf(&tar0_start_address, &tar0_len, inFile, max_address);\n \n fclose (inFile);\n if (tar0_buf && (tar0_len > 0)) {\n@@ -331,8 +335,8 @@\n }\n \n void print_help(void) {\n- printf(\"STM32 hex2dfu version 1.3\\r\\n\");\n- printf(\"(c) Encedo Ltd 2013-2015\\r\\n\");\n+ printf(\"STM32 hex2dfu version 1.4\\r\\n\");\n+ printf(\"(c) Encedo Ltd 2013-2020\\r\\n\");\n \tprintf(\"Options:\\r\\n\");\n \tprintf(\"-J - output in JSON structure except errors (optional)\\r\\n\");\n \tprintf(\"-c - place CRC23 under this addres (optional)\\r\\n\");\n@@ -346,6 +350,7 @@\n \tprintf(\"-e - add Publisher ED25519 based on 'secret' or the one form -P (if given)\\r\\n\");\n \tprintf(\"-p - USB Pid (optional, default: 0xDF11)\\r\\n\");\n \tprintf(\"-v - USB Vid (optional, default: 0x0483)\\r\\n\");\n+\tprintf(\"-E - Maximum possible address\\r\\n\");\n \tprintf(\"Example: hex2dfu -i infile.hex -i outfile.dfu\\r\\n\");\n }\n \n@@ -390,7 +395,7 @@\n \n \n \/\/ more details: http:\/\/en.wikipedia.org\/wiki\/Intel_HEX\n-unsigned char *ihex2bin_buf(unsigned int *start_address, int *dst_len, FILE *inFile) {\n+unsigned char *ihex2bin_buf(unsigned int *start_address, int *dst_len, FILE *inFile, unsigned int max_address) {\n unsigned int lines = 0, total = 0, oneline_len, elar = 0, pos, cnt;\n unsigned char oneline [512], raw[256], start_set = 0, *dst = NULL;\n \n@@ -419,6 +424,10 @@\n if (start_set==0) {\n *start_address = pos; \/\/set it as new start addres - only possible for first data record\n start_set = 1; \/\/only once - this is start address of thye binary data\n+ }\n+ if (pos >= max_address) {\n+ *dst_len = total; \/\/max address limit has been reached\n+ return dst; \/\/stop processing and return what's done \n }\n pos -= *start_address;\n cnt = raw[0]; \/\/get chunk size\/length\n"} {"commit":"4b5f030d4fa41156390b38d6db8842de78f19dba","subject":"integer memory leak fixed, thanks to Amit Bakshi for both reporting and providing a patch","message":"integer memory leak fixed, thanks to Amit Bakshi for both reporting and providing a patch\n","repos":"xjzhou\/hiredis,owent-contrib\/hiredis,tattsun\/hiredis,nherment\/arsenic,liulingfree\/hiredis,redis\/hiredis,rangan337\/hiredis,redis\/hiredis,thomaslee\/hiredis,charsyam\/hiredis,tattsun\/hiredis,xjzhou\/hiredis,hidebug\/hiredis,olgeni\/hiredis,jinguoli\/hiredis,picrin\/redisSamples,jinguoli\/hiredis,chenlicong0821\/hiredis,arinal\/hiredis,thedrow\/hiredis,texnician\/hiredis-win32,charsyam\/hiredis,Microsoft\/hiredis,Yhgenomics\/hiredis,galdor\/hiredis,nokiddin\/hiredis,jinguoli\/hiredis,rangan337\/hiredis,badboy\/hiredis-win,olgeni\/hiredis,liulingfree\/hiredis,h1048576\/hiredis,koenvandesande\/hiredis,jqk6\/hiredis,lxfontes\/hiredis,owent-contrib\/hiredis,galdor\/hiredis,yiliaofan\/hiredis,Microsoft\/hiredis,hidebug\/hiredis,Yhgenomics\/hiredis,redis\/hiredis,chenlicong0821\/hiredis,thomaslee\/hiredis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hiredis.c\n+++ hiredis.c\n@@ -129,6 +129,7 @@\n if (buf == NULL) return redisIOError();\n r->type = REDIS_REPLY_INTEGER;\n r->integer = strtoll(buf,NULL,10);\n+ sdsfree(buf);\n return r;\n }\n \n"} {"commit":"b09c5646129ab41b071817cc06a430b5ee8ea2dc","subject":"union_find : inherit constructors from base class","message":"union_find : inherit constructors from base class\n","repos":"goffersoft\/algs4cc,goffersoft\/algs4cc,goffersoft\/algs4cc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/edu\/princeton\/cs\/algs4\/union_find.h\n+++ src\/edu\/princeton\/cs\/algs4\/union_find.h\n@@ -235,8 +235,7 @@\n \n class union_find : public union_find_t<> {\n public :\n- union_find(size_t num_sites) :\n- union_find_t<>(num_sites) {}\n+ using union_find_t<>::union_find_t;\n };\n \n \n"} {"commit":"1f904e0327cb38d77e2132663f4c705f905ec96b","subject":"CA-38105: remove some unused variables from C stubs","message":"CA-38105: remove some unused variables from C stubs\n\nSigned-off-by: David Scott <63c9eb0ea83039690fefa11afe17873ba8278a56@eu.citrix.com>\n","repos":"xapi-project\/message-switch,xapi-project\/message-switch,xapi-project\/message-switch,johnelse\/forkexecd,djs55\/forkexecd","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- stdext\/unixext_stubs.c\n+++ stdext\/unixext_stubs.c\n@@ -294,8 +294,6 @@\n int ret, cv_flags, cfd;\n long numbytes;\n char iobuf[UNIX_BUFFER_SIZE];\n- value path;\n- int pathlen;\n char buf[CMSG_SPACE(sizeof(cfd))];\n \n cfd = Int_val(fd);\n"} {"commit":"d6d763663ac1fe233fb83e60f89cac781a156e16","subject":"fixed \"maybe uninitialized\" warnings in optional<> which have been pestering users for years","message":"fixed \"maybe uninitialized\" warnings in optional<> which have been pestering users for years\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- stingraykit\/optional.h\n+++ stingraykit\/optional.h\n@@ -32,13 +32,13 @@\n \n \n \tpublic:\n-\t\toptional() : _initialized(false)\n+\t\toptional() : _value(), _initialized(false)\n \t\t{ }\n-\t\toptional(const NullPtrType&) : _initialized(false)\n+\t\toptional(const NullPtrType&) : _value(), _initialized(false)\n \t\t{ }\n-\t\toptional(ConstParamType value): _initialized(false)\n+\t\toptional(ConstParamType value): _value(), _initialized(false)\n \t\t{ assign(value); }\n-\t\toptional(const optional& other): _initialized(false)\n+\t\toptional(const optional& other): _value(), _initialized(false)\n \t\t{ assign(other); }\n \n \t\t~optional()\t\t\t\t\t\t\t\t\t{ reset(); }\n"} {"commit":"24ea3ebc4a4b851d827d7a4b3aa36ed2414bf7ea","subject":"lehttpd\/seccomp: Add some extra seccomp allow rules","message":"lehttpd\/seccomp: Add some extra seccomp allow rules\n\nWe already allow open(2) however starting with glibc 2.26, it now calls\nopenat(2) so we need to allow that also.\n\nThrow in fstat64\/newfstatat for good measure in case these start getting\nused under the hood also...\n\nSigned-off-by: Andrew Clayton <02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@digital-domain.net>\n","repos":"ac000\/lehttpd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lehttpd.c\n+++ lehttpd.c\n@@ -51,11 +51,15 @@\n \tif (ctx == NULL)\n \t\tgoto no_seccomp;\n \n-\t\/* Restrict open() to read only *\/\n+\t\/* Restrict open{at}() to read only *\/\n \tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 1,\n+\t\t\tSCMP_CMP(1, SCMP_CMP_MASKED_EQ, O_WRONLY | O_RDWR, 0));\n+\tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 1,\n \t\t\tSCMP_CMP(1, SCMP_CMP_MASKED_EQ, O_WRONLY | O_RDWR, 0));\n \tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0);\n \tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 0);\n+\tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstatat64), 0);\n+\tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0);\n \n \tseccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 1,\n \t\t\tSCMP_CMP(0, SCMP_CMP_EQ, STDOUT_FILENO));\n"} {"commit":"baeb53ad2c9561b6efd66a94f4abed8de115f6d9","subject":"ctx: add null check for ctx->impl->expr_vars","message":"ctx: add null check for ctx->impl->expr_vars\n","repos":"kenhys\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,kenhys\/groonga,komainu8\/groonga,groonga\/groonga,kenhys\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,groonga\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,groonga\/groonga,naoa\/groonga,komainu8\/groonga,groonga\/groonga,komainu8\/groonga,naoa\/groonga,cosmo0920\/groonga,komainu8\/groonga,groonga\/groonga,groonga\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,naoa\/groonga,naoa\/groonga,groonga\/groonga,naoa\/groonga,kenhys\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/ctx.c\n+++ lib\/ctx.c\n@@ -492,7 +492,7 @@\n GRN_OBJ_FIN(ctx, &ctx->impl->output.names);\n GRN_OBJ_FIN(ctx, &ctx->impl->output.levels);\n rc = grn_obj_close(ctx, ctx->impl->output.buf);\n- {\n+ if (ctx->impl->expr_vars) {\n grn_hash **vp;\n grn_obj *value;\n GRN_HASH_EACH(ctx, ctx->impl->expr_vars, eid, NULL, NULL, &vp, {\n@@ -503,8 +503,8 @@\n }\n grn_hash_close(ctx, *vp);\n });\n- }\n- grn_hash_close(ctx, ctx->impl->expr_vars);\n+ grn_hash_close(ctx, ctx->impl->expr_vars);\n+ }\n if (ctx->impl->db && ctx->flags & GRN_CTX_PER_DB) {\n grn_obj *db = ctx->impl->db;\n ctx->impl->db = NULL;\n"} {"commit":"d25803b8cb4c13e136352f52e0d0fd2950619f52","subject":"geo: rewrite calculation logic by eliminating needless splitting regions","message":"geo: rewrite calculation logic by eliminating needless splitting regions\n","repos":"hiroyuki-sato\/groonga,kenhys\/groonga,komainu8\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,myokoym\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,naoa\/groonga,redfigure\/groonga,myokoym\/groonga,cosmo0920\/groonga,naoa\/groonga,cosmo0920\/groonga,komainu8\/groonga,myokoym\/groonga,myokoym\/groonga,kenhys\/groonga,kenhys\/groonga,komainu8\/groonga,komainu8\/groonga,kenhys\/groonga,myokoym\/groonga,kenhys\/groonga,cosmo0920\/groonga,redfigure\/groonga,redfigure\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,naoa\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,groonga\/groonga,naoa\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,naoa\/groonga,myokoym\/groonga,redfigure\/groonga,myokoym\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,cosmo0920\/groonga,groonga\/groonga,naoa\/groonga,groonga\/groonga,redfigure\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,redfigure\/groonga,naoa\/groonga,groonga\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,komainu8\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/geo.c\n+++ lib\/geo.c\n@@ -2047,14 +2047,10 @@\n distance = sqrt(distance * distance) * GRN_GEO_RADIUS;\n }\n } else {\n- slope = latitude_delta \/ longitude_delta;\n- intercept = lat1 - slope * lng1;\n- distance = geo_distance_rectangle_twin_quadrant(lng1,\n- lat1,\n- 0,\n- intercept,\n- lng2,\n- lat2);\n+ distance = geo_distance_rectangle_square_root(lng1,\n+ lat1,\n+ lng2,\n+ lat2) * GRN_GEO_RADIUS;\n }\n return distance;\n }\n@@ -2067,160 +2063,71 @@\n #define M_2PI 6.28318530717958647692\n \n double distance;\n- double slope, intercept, longitude_delta, latitude_delta;\n- double intercept_edge;\n- double north_distance, south_distance, intermediate_distance;\n- double first_longitude, first_latitude, third_longitude, third_latitude;\n- double middle1_longitude, middle1_latitude, middle2_longitude, middle2_latitude;\n- double on_equator;\n \n if (quad_type == QUADRANT_1ST_TO_2ND ||\n quad_type == QUADRANT_4TH_TO_3RD) {\n- longitude_delta = lng2 + M_2PI - lng1;\n- latitude_delta = lat2 - lat1;\n- slope = latitude_delta \/ longitude_delta;\n- intercept = lat1 - slope * lng1;\n- intercept_edge = slope * M_PI + intercept;\n- distance = geo_distance_rectangle_twin_quadrant(lng1,\n+ if (lat1 > lat2) {\n+ distance = geo_distance_rectangle_square_root(lng2 + M_2PI,\n+ lat2,\n+ lng1,\n+ lat1) * GRN_GEO_RADIUS;\n+ } else {\n+ distance = geo_distance_rectangle_square_root(lng1,\n lat1,\n- M_PI,\n- intercept_edge,\n- -lng2,\n- lat2);\n+ lng2 + M_2PI,\n+ lat2) * GRN_GEO_RADIUS;\n+ }\n } else if (quad_type == QUADRANT_2ND_TO_1ST ||\n quad_type == QUADRANT_3RD_TO_4TH) {\n- longitude_delta = lng1 + M_2PI - lng2;\n- latitude_delta = lat1 - lat2;\n- slope = latitude_delta \/ longitude_delta;\n- intercept = lat2 - slope * lng2;\n- intercept_edge = slope * M_PI + intercept;\n- distance = geo_distance_rectangle_twin_quadrant(lng2,\n+ if (lat1 > lat2) {\n+ distance = geo_distance_rectangle_square_root(lng2,\n lat2,\n- M_PI,\n- intercept_edge,\n- -lng1,\n- lat1);\n+ lng1 + M_2PI,\n+ lat1) * GRN_GEO_RADIUS;\n+ } else {\n+ distance = geo_distance_rectangle_square_root(lng1 + M_2PI,\n+ lat1,\n+ lng2,\n+ lat2) * GRN_GEO_RADIUS;\n+ }\n } else if (quad_type == QUADRANT_1ST_TO_3RD ||\n quad_type == QUADRANT_3RD_TO_1ST) {\n- first_longitude = quad_type == QUADRANT_1ST_TO_3RD ? lng1 : lng2;\n- first_latitude = quad_type == QUADRANT_1ST_TO_3RD ? lat1 : lat2;\n- third_longitude = quad_type == QUADRANT_1ST_TO_3RD ? lng2 : lng1;\n- third_latitude = quad_type == QUADRANT_1ST_TO_3RD ? lat2 : lat1;\n- longitude_delta = third_longitude + M_2PI - first_longitude;\n- latitude_delta = third_latitude - first_latitude;\n- slope = latitude_delta \/ longitude_delta;\n- intercept = first_latitude - slope * first_longitude;\n- intercept_edge = slope * M_PI + intercept;\n- if (intercept_edge > 0) {\n- on_equator = M_2PI - (-intercept \/ slope);\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- M_PI,\n- intercept_edge);\n- intermediate_distance = geo_distance_rectangle_square_root(M_PI,\n- intercept_edge,\n- on_equator,\n- 0);\n- south_distance = geo_distance_rectangle_square_root(-third_longitude,\n- third_latitude,\n- on_equator,\n- 0);\n- distance = (north_distance + intermediate_distance +\n- south_distance) * GRN_GEO_RADIUS;\n- } else if (intercept_edge < 0) {\n- on_equator = -intercept \/ slope;\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- on_equator,\n- 0);\n- intermediate_distance = geo_distance_rectangle_square_root(on_equator,\n- 0,\n- M_PI,\n- intercept_edge);\n- south_distance = geo_distance_rectangle_square_root(-M_PI,\n- intercept_edge,\n- third_longitude,\n- third_latitude);\n- distance = (north_distance + intermediate_distance +\n- south_distance) * GRN_GEO_RADIUS;\n+ if (lng1 > lng2) {\n+ distance = geo_distance_rectangle_square_root(lng2 + M_2PI,\n+ lat2,\n+ lng1,\n+ lat1) * GRN_GEO_RADIUS;\n } else {\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- M_PI,\n- 0);\n- south_distance = geo_distance_rectangle_square_root(-M_PI,\n- 0,\n- third_longitude,\n- third_latitude);\n- distance = (north_distance + south_distance) * GRN_GEO_RADIUS;\n+ distance = geo_distance_rectangle_square_root(lng1 + M_2PI,\n+ lat1,\n+ lng2,\n+ lat2) * GRN_GEO_RADIUS;\n }\n } else if (quad_type == QUADRANT_2ND_TO_4TH ||\n quad_type == QUADRANT_4TH_TO_2ND) {\n- first_longitude = quad_type == QUADRANT_2ND_TO_4TH ? lng2 : lng1;\n- first_latitude = quad_type == QUADRANT_2ND_TO_4TH ? lat2 : lat1;\n- third_longitude = quad_type == QUADRANT_2ND_TO_4TH ? lng1 : lng2;\n- third_latitude = quad_type == QUADRANT_2ND_TO_4TH ? lat1 : lat2;\n- longitude_delta = third_longitude + M_2PI - first_longitude;\n- latitude_delta = third_latitude - first_latitude;\n- slope = latitude_delta \/ longitude_delta;\n- intercept = first_latitude - slope * first_longitude;\n- intercept_edge = slope * M_PI + intercept;\n- if (intercept_edge > 0) {\n- on_equator = M_2PI - (-intercept \/ slope);\n- middle1_longitude = on_equator;\n- middle1_latitude = 0;\n- middle2_longitude = M_PI;\n- middle2_latitude = intercept_edge;\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- middle1_longitude,\n- middle1_latitude);\n- intermediate_distance = geo_distance_rectangle_square_root(middle1_longitude,\n- middle1_latitude,\n- middle2_longitude,\n- middle2_latitude);\n- south_distance = geo_distance_rectangle_square_root(middle2_longitude,\n- middle2_latitude,\n- -third_longitude,\n- third_latitude);\n- distance = (north_distance + intermediate_distance +\n- south_distance) * GRN_GEO_RADIUS;\n- } else if (intercept_edge < 0) {\n- on_equator = -intercept \/ slope;\n- middle1_longitude = M_PI;\n- middle1_latitude = intercept_edge;\n- middle2_longitude = M_2PI - on_equator;\n- middle2_latitude = 0;\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- middle1_longitude,\n- middle1_latitude);\n- intermediate_distance = geo_distance_rectangle_square_root(middle1_longitude,\n- middle1_latitude,\n- middle2_longitude,\n- middle2_latitude);\n- south_distance = geo_distance_rectangle_square_root(middle2_longitude,\n- middle2_latitude,\n- -third_longitude,\n- third_latitude);\n- distance = (north_distance + intermediate_distance +\n- south_distance) * GRN_GEO_RADIUS;\n+ if (lng1 > lng2) {\n+ distance = geo_distance_rectangle_square_root(lng1,\n+ lat1,\n+ lng2 + M_2PI,\n+ lat2) * GRN_GEO_RADIUS;\n } else {\n- north_distance = geo_distance_rectangle_square_root(first_longitude,\n- first_latitude,\n- M_PI,\n- 0);\n- south_distance = geo_distance_rectangle_square_root(-M_PI,\n- 0,\n- third_longitude,\n- third_latitude);\n- distance = (north_distance + south_distance) * GRN_GEO_RADIUS;\n+ distance = geo_distance_rectangle_square_root(lng2,\n+ lat2,\n+ lng1 + M_2PI,\n+ lat1) * GRN_GEO_RADIUS;\n }\n } else {\n- distance = geo_distance_rectangle_square_root(lng1,\n- lat1,\n- lng2,\n- lat2) * GRN_GEO_RADIUS;\n+ if (lng1 > lng2) {\n+ distance = geo_distance_rectangle_square_root(lng1,\n+ lat1,\n+ lng2 + M_2PI,\n+ lat2) * GRN_GEO_RADIUS;\n+ } else {\n+ distance = geo_distance_rectangle_square_root(lng2,\n+ lat2,\n+ lng1 + M_2PI,\n+ lat1) * GRN_GEO_RADIUS;\n+ }\n }\n return distance;\n #undef M_2PI\n"} {"commit":"6cdae7416a1c45c2ce105a78187d9b7e8feb9e24","subject":"idr: fix a subtle bug in idr_get_next()","message":"idr: fix a subtle bug in idr_get_next()\n\nThe iteration logic of idr_get_next() is borrowed mostly verbatim from\nidr_for_each(). It walks down the tree looking for the slot matching\nthe current ID. If the matching slot is not found, the ID is\nincremented by the distance of single slot at the given level and\nrepeats.\n\nThe implementation assumes that during the whole iteration id is aligned\nto the layer boundaries of the level closest to the leaf, which is true\nfor all iterations starting from zero or an existing element and thus is\nfine for idr_for_each().\n\nHowever, idr_get_next() may be given any point and if the starting id\nhits in the middle of a non-existent layer, increment to the next layer\nwill end up skipping the same offset into it. For example, an IDR with\nIDs filled between [64, 127] would look like the following.\n\n [ 0 64 ... ]\n \/----\/ |\n | |\n NULL [ 64 ... 127 ]\n\nIf idr_get_next() is called with 63 as the starting point, it will try\nto follow down the pointer from 0. As it is NULL, it will then try to\nproceed to the next slot in the same level by adding the slot distance\nat that level which is 64 - making the next try 127. It goes around the\nloop and finds and returns 127 skipping [64, 126].\n\nNote that this bug also triggers in idr_for_each_entry() loop which\ndeletes during iteration as deletions can make layers go away leaving\nthe iteration with unaligned ID into missing layers.\n\nFix it by ensuring proceeding to the next slot doesn't carry over the\nunaligned offset - ie. use round_up(id + 1, slot_distance) instead of\nid += slot_distance.\n\nSigned-off-by: Tejun Heo <546b05909706652891a87f7bfe385ae147f61f91@kernel.org>\nReported-by: David Teigland <cf7ba74ea50525d3d47fcd7a6d69b51121a9f873@redhat.com>\nCc: KAMEZAWA Hiroyuki <634f508bd7c47cf0ee4126243675c3e598920fbc@jp.fujitsu.com>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/idr.c\n+++ lib\/idr.c\n@@ -625,7 +625,14 @@\n \t\t\treturn p;\n \t\t}\n \n-\t\tid += 1 << n;\n+\t\t\/*\n+\t\t * Proceed to the next layer at the current level. Unlike\n+\t\t * idr_for_each(), @id isn't guaranteed to be aligned to\n+\t\t * layer boundary at this point and adding 1 << n may\n+\t\t * incorrectly skip IDs. Make sure we jump to the\n+\t\t * beginning of the next layer using round_up().\n+\t\t *\/\n+\t\tid = round_up(id + 1, 1 << n);\n \t\twhile (n < fls(id)) {\n \t\t\tn += IDR_BITS;\n \t\t\tp = *--paa;\n"} {"commit":"d96f0712c561fbf7b31c6171aac15c7e8757f358","subject":"include config.h in the KCN header file.","message":"include config.h in the KCN header file.\n","repos":"ohmori7\/kcn,ohmori7\/kcn,ohmori7\/kcn","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/kcn.h\n+++ lib\/kcn.h\n@@ -1,5 +1,8 @@\n+#ifdef HAVE_CONFIG_H\n+#include \"config.h\"\n+#endif \/* HAVE_CONFIG_H_ *\/\n+\n enum kcn_loc_type {\n \tKCN_LOC_TYPE_DOMAINNAME,\n \tKCN_LOC_TYPE_URI\n };\n-\n"} {"commit":"0f8c89e8d5955e305bdf3d6b303f46aff7b97d59","subject":"log: va_end not called after va_start","message":"log: va_end not called after va_start\n\nThe bail when level is not higher than message\nlevel never called va_end, just check the level\nfirst, before calling va_start.\n\nSigned-off-by: William Roberts <60148e894dabf0b83bde1d460768794cd453c455@intel.com>\n","repos":"martinezjavier\/tpm2-tools,martinezjavier\/tpm2-tools,martinezjavier\/tpm2-tools,martinezjavier\/tpm2-tools,01org\/tpm2.0-tools,01org\/tpm2.0-tools,01org\/tpm2.0-tools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/log.c\n+++ lib\/log.c\n@@ -44,12 +44,13 @@\n void\n _log (log_level level, const char *file, unsigned lineno, const char *fmt, ...)\n {\n- va_list argptr;\n- va_start(argptr, fmt);\n \n \/* Skip printing messages outside of the log level *\/\n if (level > current_log_level)\n return;\n+\n+ va_list argptr;\n+ va_start(argptr, fmt);\n \n \/* Verbose output prints file and line on error *\/\n if (current_log_level >= log_level_verbose)\n"} {"commit":"59332a3026eaff40e4c6d3c627bdb51bfd26fea1","subject":"decompress_generic: Optimize literal copies","message":"decompress_generic: Optimize literal copies\n\nUse LZ4_wildCopy16 for variable-length literals. For literal counts that\nfit in the flag byte, copy directly. We can also omit oend checks for\nroughly the same reason as the previous shortcut: We check once that both\nmatch length and literal length fit in FASTLOOP_SAFE_DISTANCE, including\nwildcopy distance.\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.c\n+++ lib\/lz4.c\n@@ -1545,22 +1545,31 @@\n \n \/* decode literal length *\/\n if (length == RUN_MASK) {\n- variable_length_error error = ok;\n- length += read_variable_length(&ip, iend-RUN_MASK, endOnInput, endOnInput, &error);\n- if (error == initial_error) goto _output_error;\n+ variable_length_error error = ok;\n+ length += read_variable_length(&ip, iend-RUN_MASK, endOnInput, endOnInput, &error);\n+ if (error == initial_error) goto _output_error;\n if ((safeDecode) && unlikely((uptrval)(op)+length<(uptrval)(op))) goto _output_error; \/* overflow detection *\/\n if ((safeDecode) && unlikely((uptrval)(ip)+length<(uptrval)(ip))) goto _output_error; \/* overflow detection *\/\n- }\n-\n- \/* copy literals *\/\n- cpy = op+length;\n- LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH);\n- if ( ((endOnInput) && ((cpy>oend-FASTLOOP_SAFE_DISTANCE) || (ip+length>iend-(2+1+LASTLITERALS))) )\n- || ((!endOnInput) && (cpy>oend-FASTLOOP_SAFE_DISTANCE)) )\n- {\n- goto safe_literal_copy;\n+\n+ \/* copy literals *\/\n+ cpy = op+length;\n+ LZ4_STATIC_ASSERT(MFLIMIT >= WILDCOPYLENGTH);\n+ if ( ((endOnInput) && ((cpy>oend-FASTLOOP_SAFE_DISTANCE) || (ip+length>iend-(2+1+LASTLITERALS))) )\n+ || ((!endOnInput) && (cpy>oend-FASTLOOP_SAFE_DISTANCE)) )\n+ {\n+ goto safe_literal_copy;\n+ }\n+ LZ4_wildCopy16(op, ip, cpy);\n+ ip += length; op = cpy;\n } else {\n- LZ4_wildCopy(op, ip, cpy); \/* may overwrite up to WILDCOPYLENGTH beyond cpy *\/\n+ cpy = op+length;\n+ \/* We don't need to check oend, since we check it once for each loop below *\/\n+ if ( ((endOnInput) && (ip+16>iend-(2+1+LASTLITERALS))))\n+ {\n+ goto safe_literal_copy;\n+ }\n+ \/* Literals can only be 14, but hope compilers optimize if we copy by a register size *\/\n+ memcpy(op, ip, 16);\n ip += length; op = cpy;\n }\n \n"} {"commit":"25b243588585b06a2d947372284cbfe00da930e9","subject":"Export deprecated symbols","message":"Export deprecated symbols\n\nDeprecated symbols are still a part of ABI and have to be exported,\nso mark them with LZ4LIB_API attribute.\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.h\n+++ lib\/lz4.h\n@@ -435,12 +435,12 @@\n #endif \/* LZ4_DISABLE_DEPRECATE_WARNINGS *\/\n \n \/* Obsolete compression functions *\/\n-LZ4_DEPRECATED(\"use LZ4_compress_default() instead\") int LZ4_compress (const char* source, char* dest, int sourceSize);\n-LZ4_DEPRECATED(\"use LZ4_compress_default() instead\") int LZ4_compress_limitedOutput (const char* source, char* dest, int sourceSize, int maxOutputSize);\n-LZ4_DEPRECATED(\"use LZ4_compress_fast_extState() instead\") int LZ4_compress_withState (void* state, const char* source, char* dest, int inputSize);\n-LZ4_DEPRECATED(\"use LZ4_compress_fast_extState() instead\") int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);\n-LZ4_DEPRECATED(\"use LZ4_compress_fast_continue() instead\") int LZ4_compress_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);\n-LZ4_DEPRECATED(\"use LZ4_compress_fast_continue() instead\") int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_default() instead\") int LZ4_compress (const char* source, char* dest, int sourceSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_default() instead\") int LZ4_compress_limitedOutput (const char* source, char* dest, int sourceSize, int maxOutputSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_fast_extState() instead\") int LZ4_compress_withState (void* state, const char* source, char* dest, int inputSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_fast_extState() instead\") int LZ4_compress_limitedOutput_withState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_fast_continue() instead\") int LZ4_compress_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_compress_fast_continue() instead\") int LZ4_compress_limitedOutput_continue (LZ4_stream_t* LZ4_streamPtr, const char* source, char* dest, int inputSize, int maxOutputSize);\n \n \/* Obsolete decompression functions *\/\n \/* These function names are completely deprecated and must no longer be used.\n@@ -453,14 +453,14 @@\n \/* int LZ4_uncompress_unknownOutputSize (const char* source, char* dest, int isize, int maxOutputSize); *\/\n \n \/* Obsolete streaming functions; use new streaming interface whenever possible *\/\n-LZ4_DEPRECATED(\"use LZ4_createStream() instead\") void* LZ4_create (char* inputBuffer);\n-LZ4_DEPRECATED(\"use LZ4_createStream() instead\") int LZ4_sizeofStreamState(void);\n-LZ4_DEPRECATED(\"use LZ4_resetStream() instead\") int LZ4_resetStreamState(void* state, char* inputBuffer);\n-LZ4_DEPRECATED(\"use LZ4_saveDict() instead\") char* LZ4_slideInputBuffer (void* state);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_createStream() instead\") void* LZ4_create (char* inputBuffer);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_createStream() instead\") int LZ4_sizeofStreamState(void);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_resetStream() instead\") int LZ4_resetStreamState(void* state, char* inputBuffer);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_saveDict() instead\") char* LZ4_slideInputBuffer (void* state);\n \n \/* Obsolete streaming decoding functions *\/\n-LZ4_DEPRECATED(\"use LZ4_decompress_safe_usingDict() instead\") int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);\n-LZ4_DEPRECATED(\"use LZ4_decompress_fast_usingDict() instead\") int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_decompress_safe_usingDict() instead\") int LZ4_decompress_safe_withPrefix64k (const char* src, char* dst, int compressedSize, int maxDstSize);\n+LZ4LIB_API LZ4_DEPRECATED(\"use LZ4_decompress_fast_usingDict() instead\") int LZ4_decompress_fast_withPrefix64k (const char* src, char* dst, int originalSize);\n \n \n #if defined (__cplusplus)\n"} {"commit":"149cd50cbd3141cc094f8b6c0a611d9b1da9b435","subject":"Fix check value","message":"Fix check value\n","repos":"komainu8\/groonga,kenhys\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,komainu8\/groonga,groonga\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,kenhys\/groonga,kenhys\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,cosmo0920\/groonga,naoa\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,cosmo0920\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,kenhys\/groonga,kenhys\/groonga,cosmo0920\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/obj.c\n+++ lib\/obj.c\n@@ -192,7 +192,7 @@\n return GRN_FALSE;\n }\n \n- return GRN_TYPE_IS_TEXT_FAMILY(obj->header.type);\n+ return GRN_TYPE_IS_TEXT_FAMILY(grn_obj_id(ctx, obj));\n }\n \n grn_bool\n"} {"commit":"6af7025ba153246569970a2b2cb0b6788c1e6ef4","subject":"splint fiddles.","message":"splint fiddles.\n","repos":"devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/psm.c\n+++ lib\/psm.c\n@@ -680,8 +680,11 @@\n \t\txx = Fclose (out);\n \t if (sfdno > STDERR_FILENO)\n \t\txx = Fclose (scriptFd);\n-\t else\n+\t else {\n+\/*@-usereleased@*\/\n \t\txx = Fclose(out);\n+\/*@=usereleased@*\/\n+\t }\n \t}\n \n \t{ const char *ipath = rpmExpand(\"PATH=%{_install_script_path}\", NULL);\n"} {"commit":"b57f18e9f8c99670ce2d3625cd8e164f30722251","subject":"Correct numerous small bugs in new coupling engine","message":"Correct numerous small bugs in new coupling engine\n\n\nsvn path=\/trunk\/vorbis\/; revision=16950\n","repos":"youfearm3\/vorbis,youfearm3\/vorbis,ksophocleous\/vorbis,mwgoldsmith\/vorbis,nicolaichuk\/vorbis,ShiftMediaProject\/vorbis,ShiftMediaProject\/vorbis,eidy\/vorbis,felipebetancur\/vorbis,emscripten-ports\/Vorbis,erikd\/vorbis,ksophocleous\/vorbis,eidy\/vorbis,ksophocleous\/vorbis,mwgoldsmith\/vorbis,ksophocleous\/vorbis,felipebetancur\/vorbis,erikd\/vorbis,ShiftMediaProject\/vorbis,mwgoldsmith\/vorbis,ShiftMediaProject\/vorbis,nicolaichuk\/vorbis,erikd\/vorbis,emscripten-ports\/Vorbis,youfearm3\/vorbis,emscripten-ports\/Vorbis,erikd\/vorbis,nicolaichuk\/vorbis,ShiftMediaProject\/vorbis,youfearm3\/vorbis,eidy\/vorbis,felipebetancur\/vorbis,felipebetancur\/vorbis,eidy\/vorbis,nicolaichuk\/vorbis,mwgoldsmith\/vorbis,ShiftMediaProject\/vorbis,emscripten-ports\/Vorbis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/psy.c\n+++ lib\/psy.c\n@@ -1062,7 +1062,7 @@\n int k,j,jn = partition > n-i ? n-i : partition;\n int step,track = 0;\n \n- memcpy(nz,nonzero,sizeof(nz));\n+ memcpy(nz,nonzero,sizeof(*nz)*ch);\n \n \/* prefill *\/\n memset(flag[0],0,ch*partition*sizeof(**flag));\n@@ -1077,7 +1077,7 @@\n \n for(j=0;j<jn;j++){\n quant[k][j] = raw[k][j] = mdct[k][i+j]*mdct[k][i+j];\n- if(mdct[k][i+j]<0) raw[k][j]*=-1.f;\n+ if(mdct[k][i+j]<0.f) raw[k][j]*=-1.f;\n floor[k][j]*=floor[k][j];\n }\n \n@@ -1085,7 +1085,7 @@\n \n }else{\n for(j=0;j<jn;j++){\n- floor[k][j] = 0.f;\n+ floor[k][j] = 1e-10f;\n raw[k][j] = 0.f;\n quant[k][j] = 0.f;\n flag[k][j] = 0;\n@@ -1129,19 +1129,23 @@\n int A = iM[j];\n int B = iA[j];\n \n- iA[j]=(A>abs(B)||B>abs(A) ? A-B : B-A);\n- if(abs(B)>abs(A))iM[j]=B;\n+ if(abs(A)>abs(B)){\n+ iA[j]=(A>0?A-B:B-A);\n+ }else{\n+ iA[j]=(B>0?A-B:B-A);\n+ iM[j]=B;\n+ }\n \n \/* collapse two equivalent tuples to one *\/\n- if(abs(iM[j])*2==iA[j]){\n+ if(iA[j]>=abs(iM[j])*2){\n iA[j]= -iA[j];\n iM[j]= -iM[j];\n }\n+\n }\n \n }else{\n \/* lossy (point) coupling *\/\n-\n if(j<limit-i){\n \/* dipole *\/\n reM[j] += reA[j];\n@@ -1175,4 +1179,14 @@\n }\n }\n }\n-}\n+\n+ for(i=0;i<vi->coupling_steps;i++){\n+ \/* make sure coupling a zero and a nonzero channel results in two\n+ nonzero channels. *\/\n+ if(nonzero[vi->coupling_mag[i]] ||\n+ nonzero[vi->coupling_ang[i]]){\n+ nonzero[vi->coupling_mag[i]]=1;\n+ nonzero[vi->coupling_ang[i]]=1;\n+ }\n+ }\n+}\n"} {"commit":"024c00954eb43ab383a3bf7036e6775e272947a2","subject":"Added Row::raw_size(), as a shortcut for Row::at().size().","message":"Added Row::raw_size(), as a shortcut for Row::at().size().\n\n\ngit-svn-id: 1a57124bbb9aca193a920d0ffd753d488afb922b@1591 5946f024-35f4-0310-b1b3-9a3be3380cfb\n","repos":"veprbl\/mysqlpp,veprbl\/mysqlpp,veprbl\/mysqlpp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/row.h\n+++ lib\/row.h\n@@ -158,6 +158,12 @@\n \tconst char* raw_data(int i) const\n \t{\n \t\treturn data_[i].data();\n+\t}\n+\n+\t\/\/\/ \\brief Return the size of a field's raw data given its index.\n+\tstd::string::size_type raw_size(int i) const\n+\t{\n+\t\treturn data_[i].length();\n \t}\n \n \t\/\/\/ \\brief Return the value of a field as a C++ string given its\n"} {"commit":"bbabc6792ceec9894f9f67f2fa72c61f91b2f5e0","subject":"lib: Validate DTDs when parsing BluetoothProfileDescriptorList","message":"lib: Validate DTDs when parsing BluetoothProfileDescriptorList\n\nThe \"seq->val.dataseq != NULL\" check is also removed from the for()\nstatement because it should be done after verifying that the data\nelement is a sequence (inside the \"if (SDP_IS_SEQ(...))\" block.)\n","repos":"pkarasev3\/bluez,ComputeCycles\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,mapfau\/bluez,mapfau\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/sdp.c\n+++ lib\/sdp.c\n@@ -2078,11 +2078,15 @@\n \n \t*profDescSeq = NULL;\n \tsdpdata = sdp_data_get(rec, SDP_ATTR_PFILE_DESC_LIST);\n-\tif (!sdpdata || !sdpdata->val.dataseq) {\n+\tif (sdpdata == NULL) {\n \t\terrno = ENODATA;\n \t\treturn -1;\n \t}\n-\tfor (seq = sdpdata->val.dataseq; seq && seq->val.dataseq; seq = seq->next) {\n+\n+\tif (!SDP_IS_SEQ(sdpdata->dtd) || sdpdata->val.dataseq == NULL)\n+\t\tgoto invalid;\n+\n+\tfor (seq = sdpdata->val.dataseq; seq; seq = seq->next) {\n \t\tuuid_t *uuid = NULL;\n \t\tuint16_t version = 0x100;\n \n@@ -2094,13 +2098,21 @@\n \t\t\t\tseq = next;\n \t\t\t}\n \t\t} else if (SDP_IS_SEQ(seq->dtd)) {\n-\t\t\tsdp_data_t *puuid = seq->val.dataseq;\n-\t\t\tsdp_data_t *pVnum = seq->val.dataseq->next;\n-\t\t\tif (puuid && pVnum) {\n-\t\t\t\tuuid = &puuid->val.uuid;\n-\t\t\t\tversion = pVnum->val.uint16;\n-\t\t\t}\n-\t\t}\n+\t\t\tsdp_data_t *puuid, *pVnum;\n+\n+\t\t\tpuuid = seq->val.dataseq;\n+\t\t\tif (puuid == NULL || !SDP_IS_UUID(puuid->dtd))\n+\t\t\t\tgoto invalid;\n+\n+\t\t\tuuid = &puuid->val.uuid;\n+\n+\t\t\tpVnum = puuid->next;\n+\t\t\tif (pVnum == NULL || pVnum->dtd != SDP_UINT16)\n+\t\t\t\tgoto invalid;\n+\n+\t\t\tversion = pVnum->val.uint16;\n+\t\t} else\n+\t\t\tgoto invalid;\n \n \t\tif (uuid != NULL) {\n \t\t\tprofDesc = malloc(sizeof(sdp_profile_desc_t));\n@@ -2119,6 +2131,13 @@\n \t\t}\n \t}\n \treturn 0;\n+\n+invalid:\n+\tsdp_list_free(*profDescSeq, free);\n+\t*profDescSeq = NULL;\n+\terrno = EINVAL;\n+\n+\treturn -1;\n }\n \n int sdp_get_server_ver(const sdp_record_t *rec, sdp_list_t **u16)\n"} {"commit":"106f1b040555a71340394b26956517e3867ab59d","subject":"Use size_t","message":"Use size_t\n","repos":"groonga\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,groonga\/groonga,kenhys\/groonga,naoa\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,groonga\/groonga,naoa\/groonga,kenhys\/groonga,kenhys\/groonga,komainu8\/groonga,groonga\/groonga,komainu8\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,kenhys\/groonga,groonga\/groonga,naoa\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,komainu8\/groonga,komainu8\/groonga,komainu8\/groonga,naoa\/groonga,kenhys\/groonga,naoa\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/str.c\n+++ lib\/str.c\n@@ -2110,7 +2110,7 @@\n char *curr = GRN_BULK_CURR(buf);\n char *tail = GRN_BULK_TAIL(buf);\n if (grn_lltoa(i, curr, tail, &curr)) {\n- unsigned int new_size;\n+ size_t new_size;\n new_size = grn_bulk_compute_new_size(ctx,\n buf,\n GRN_BULK_WSIZE(buf) + UNIT_SIZE);\n"} {"commit":"8a24fb15d10ad892fcdb8e3d19dc10b1a49b0617","subject":"hygiene, fixup sunday in __ywd_get_jan01_wday() in hang fixup branch","message":"hygiene, fixup sunday in __ywd_get_jan01_wday() in hang fixup branch\n","repos":"rudimeier\/dateutils,rudimeier\/dateutils,rudimeier\/dateutils","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/ywd.c\n+++ lib\/ywd.c\n@@ -72,10 +72,10 @@\n \tint res;\n \n \tassert(d.hang >= -3 && d.hang <= 3);\n-\tif (UNLIKELY((res = 1 - d.hang) < 0)) {\n+\tif (UNLIKELY((res = 1 - d.hang) <= 0)) {\n \t\tres += GREG_DAYS_P_WEEK;\n \t}\n-\treturn (dt_dow_t)(res ?: DT_SUNDAY);\n+\treturn (dt_dow_t)res;\n }\n \n static int\n"} {"commit":"1b6452ed156aa0a38b4d13850e99c12c79dddea3","subject":"ABI version bumped","message":"ABI version bumped\n\nSigned-off-by: Martin Sustrik <4dd6061be1198639e8b05ce4fd5ead7a0dcaa0f4@250bpm.com>\n","repos":"pskocik\/libdill,sustrik\/libdill,sustrik\/libdill,sustrik\/libdill,sustrik\/libdill,pskocik\/libdill,pskocik\/libdill","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libdill.h\n+++ libdill.h\n@@ -47,7 +47,7 @@\n #define DILL_VERSION_REVISION 0\n \n \/* How many past interface versions are still supported. *\/\n-#define DILL_VERSION_AGE 0\n+#define DILL_VERSION_AGE 1\n \n \/******************************************************************************\/\n \/* Symbol visibility *\/\n"} {"commit":"9aeb98c316530d033a558fe0719aae8d9f9e9bd2","subject":"sync","message":"sync\n\n\ngit-svn-id: be7a9f1a1fc095f35e91e84c5b42dcddbbc723e4@964 5f5bf4bb-3343-0410-8278-4fa8eb3319dc\n","repos":"sativa\/daisy-model,sativa\/daisy-model,sativa\/daisy-model,sativa\/daisy-model,sativa\/daisy-model,sativa\/daisy-model","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- library.h\n+++ library.h\n@@ -23,6 +23,7 @@\n #ifndef LIBRARY_H\n #define LIBRARY_H\n \n+#include <string>\n #include <vector>\n using namespace std;\n \n"} {"commit":"0109b4710615d55155b4ef85a599a86769dc0325","subject":"NULL ptr check","message":"NULL ptr check\n","repos":"mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,adobe\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/shader\/slang\/slang_codegen.c\n+++ src\/mesa\/shader\/slang\/slang_codegen.c\n@@ -1348,7 +1348,7 @@\n * Try adapting the parameters.\n *\/\n fun = _slang_first_function(A->space.funcs, name);\n- if (!_slang_adapt_call(oper, fun, &A->space, A->atoms, A->log)) {\n+ if (!fun || !_slang_adapt_call(oper, fun, &A->space, A->atoms, A->log)) {\n slang_info_log_error(A->log, \"Function '%s' not found (check argument types)\", name);\n return NULL;\n }\n"} {"commit":"b0575e83ee5c7b12c2f48f74553dcafc82f60e53","subject":"combo: use std::shared_ptr instead of boost.","message":"combo: use std::shared_ptr instead of boost.\n\nMaybe this will help with bug \nhttps:\/\/bugs.launchpad.net\/opencog\/+bug\/898243\n","repos":"AmeBel\/opencog,rodsol\/opencog,eddiemonroe\/atomspace,rodsol\/atomspace,andre-senna\/opencog,sanuj\/opencog,eddiemonroe\/opencog,eddiemonroe\/opencog,MarcosPividori\/atomspace,prateeksaxena2809\/opencog,inflector\/opencog,AmeBel\/atomspace,Allend575\/opencog,misgeatgit\/atomspace,Allend575\/opencog,williampma\/opencog,ruiting\/opencog,rohit12\/atomspace,prateeksaxena2809\/opencog,inflector\/atomspace,kinoc\/opencog,prateeksaxena2809\/opencog,rohit12\/opencog,ruiting\/opencog,roselleebarle04\/opencog,anitzkin\/opencog,rTreutlein\/atomspace,Allend575\/opencog,cosmoharrigan\/opencog,tim777z\/opencog,AmeBel\/opencog,kinoc\/opencog,ArvinPan\/atomspace,inflector\/atomspace,shujingke\/opencog,sanuj\/opencog,Allend575\/opencog,gaapt\/opencog,misgeatgit\/opencog,ArvinPan\/opencog,virneo\/opencog,sanuj\/opencog,Selameab\/atomspace,roselleebarle04\/opencog,jlegendary\/opencog,cosmoharrigan\/atomspace,virneo\/atomspace,kim135797531\/opencog,anitzkin\/opencog,Selameab\/atomspace,TheNameIsNigel\/opencog,AmeBel\/opencog,shujingke\/opencog,UIKit0\/atomspace,MarcosPividori\/atomspace,jlegendary\/opencog,zhaozengguang\/opencog,tim777z\/opencog,inflector\/opencog,ArvinPan\/opencog,kinoc\/opencog,shujingke\/opencog,kinoc\/opencog,UIKit0\/atomspace,sumitsourabh\/opencog,zhaozengguang\/opencog,shujingke\/opencog,rohit12\/atomspace,anitzkin\/opencog,gavrieltal\/opencog,iAMr00t\/opencog,iAMr00t\/opencog,printedheart\/atomspace,virneo\/atomspace,AmeBel\/opencog,ArvinPan\/atomspace,gavrieltal\/opencog,williampma\/atomspace,eddiemonroe\/opencog,printedheart\/opencog,rTreutlein\/atomspace,Selameab\/atomspace,misgeatgit\/opencog,eddiemonroe\/opencog,zhaozengguang\/opencog,virneo\/opencog,misgeatgit\/opencog,ruiting\/opencog,ruiting\/opencog,Tiggels\/opencog,rohit12\/opencog,roselleebarle04\/opencog,misgeatgit\/atomspace,ArvinPan\/atomspace,gaapt\/opencog,rohit12\/opencog,Tiggels\/opencog,printedheart\/opencog,misgeatgit\/opencog,jswiergo\/atomspace,misgeatgit\/opencog,misgeatgit\/atomspace,MarcosPividori\/atomspace,virneo\/opencog,yantrabuddhi\/opencog,sumitsourabh\/opencog,inflector\/atomspace,williampma\/opencog,rohit12\/opencog,misgeatgit\/atomspace,virneo\/opencog,shujingke\/opencog,cosmoharrigan\/opencog,sumitsourabh\/opencog,rohit12\/atomspace,Allend575\/opencog,gaapt\/opencog,zhaozengguang\/opencog,yantrabuddhi\/atomspace,yantrabuddhi\/atomspace,roselleebarle04\/opencog,virneo\/atomspace,williampma\/atomspace,williampma\/opencog,zhaozengguang\/opencog,Selameab\/opencog,sumitsourabh\/opencog,williampma\/atomspace,tim777z\/opencog,ceefour\/atomspace,eddiemonroe\/atomspace,AmeBel\/atomspace,eddiemonroe\/opencog,TheNameIsNigel\/opencog,eddiemonroe\/atomspace,yantrabuddhi\/atomspace,inflector\/opencog,ArvinPan\/opencog,rodsol\/atomspace,Selameab\/atomspace,Tiggels\/opencog,TheNameIsNigel\/opencog,ceefour\/opencog,Allend575\/opencog,kim135797531\/opencog,printedheart\/opencog,UIKit0\/atomspace,ArvinPan\/opencog,Selameab\/opencog,kim135797531\/opencog,ceefour\/atomspace,jlegendary\/opencog,anitzkin\/opencog,eddiemonroe\/opencog,shujingke\/opencog,inflector\/atomspace,iAMr00t\/opencog,cosmoharrigan\/opencog,ceefour\/opencog,printedheart\/opencog,prateeksaxena2809\/opencog,kim135797531\/opencog,gaapt\/opencog,kim135797531\/opencog,AmeBel\/atomspace,kinoc\/opencog,eddiemonroe\/atomspace,printedheart\/atomspace,yantrabuddhi\/opencog,rodsol\/opencog,roselleebarle04\/opencog,prateeksaxena2809\/opencog,yantrabuddhi\/atomspace,rodsol\/atomspace,gaapt\/opencog,williampma\/atomspace,jswiergo\/atomspace,rodsol\/opencog,kim135797531\/opencog,misgeatgit\/atomspace,jswiergo\/atomspace,jswiergo\/atomspace,gavrieltal\/opencog,ArvinPan\/atomspace,misgeatgit\/opencog,ArvinPan\/opencog,sumitsourabh\/opencog,andre-senna\/opencog,AmeBel\/opencog,andre-senna\/opencog,rTreutlein\/atomspace,tim777z\/opencog,zhaozengguang\/opencog,inflector\/opencog,andre-senna\/opencog,anitzkin\/opencog,ceefour\/opencog,yantrabuddhi\/opencog,ruiting\/opencog,jlegendary\/opencog,kim135797531\/opencog,prateeksaxena2809\/opencog,kinoc\/opencog,jlegendary\/opencog,sanuj\/opencog,ceefour\/opencog,williampma\/opencog,inflector\/opencog,inflector\/atomspace,iAMr00t\/opencog,virneo\/opencog,yantrabuddhi\/opencog,AmeBel\/opencog,inflector\/opencog,yantrabuddhi\/opencog,ceefour\/atomspace,ceefour\/opencog,misgeatgit\/opencog,printedheart\/opencog,ruiting\/opencog,cosmoharrigan\/opencog,Tiggels\/opencog,ceefour\/atomspace,rodsol\/atomspace,anitzkin\/opencog,eddiemonroe\/opencog,tim777z\/opencog,gavrieltal\/opencog,andre-senna\/opencog,Selameab\/opencog,iAMr00t\/opencog,UIKit0\/atomspace,virneo\/opencog,ArvinPan\/opencog,cosmoharrigan\/opencog,rohit12\/opencog,rTreutlein\/atomspace,yantrabuddhi\/atomspace,williampma\/opencog,tim777z\/opencog,andre-senna\/opencog,rodsol\/opencog,roselleebarle04\/opencog,rohit12\/opencog,gavrieltal\/opencog,rodsol\/opencog,jlegendary\/opencog,Allend575\/opencog,AmeBel\/atomspace,eddiemonroe\/atomspace,yantrabuddhi\/opencog,gavrieltal\/opencog,roselleebarle04\/opencog,rTreutlein\/atomspace,printedheart\/opencog,williampma\/opencog,prateeksaxena2809\/opencog,printedheart\/atomspace,cosmoharrigan\/opencog,Selameab\/opencog,ceefour\/opencog,yantrabuddhi\/opencog,rohit12\/atomspace,jlegendary\/opencog,virneo\/atomspace,AmeBel\/opencog,gaapt\/opencog,MarcosPividori\/atomspace,printedheart\/atomspace,TheNameIsNigel\/opencog,misgeatgit\/opencog,sumitsourabh\/opencog,misgeatgit\/opencog,sanuj\/opencog,gaapt\/opencog,cosmoharrigan\/atomspace,cosmoharrigan\/atomspace,Selameab\/opencog,inflector\/opencog,ceefour\/opencog,shujingke\/opencog,sumitsourabh\/opencog,virneo\/opencog,kinoc\/opencog,andre-senna\/opencog,TheNameIsNigel\/opencog,inflector\/opencog,AmeBel\/atomspace,sanuj\/opencog,TheNameIsNigel\/opencog,ruiting\/opencog,iAMr00t\/opencog,Tiggels\/opencog,gavrieltal\/opencog,rodsol\/opencog,Selameab\/opencog,Tiggels\/opencog,anitzkin\/opencog,cosmoharrigan\/atomspace","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/comboreduct\/reduct\/using.h\n+++ opencog\/comboreduct\/reduct\/using.h\n@@ -28,7 +28,6 @@\n \/\/#include <boost\/bind.hpp>\n #include <boost\/iterator\/counting_iterator.hpp>\n #include <boost\/iterator\/indirect_iterator.hpp>\n-#include <boost\/shared_ptr.hpp>\n #include <boost\/ptr_container\/ptr_vector.hpp>\n \n #include <opencog\/comboreduct\/combo\/vertex.h>\n@@ -46,11 +45,11 @@\n using boost::make_counting_iterator;\n using boost::make_indirect_iterator;\n using boost::apply_visitor;\n-using boost::shared_ptr;\n using boost::ptr_vector;\n using std::find_if;\n using std::distance;\n using std::make_pair; \n+using std::shared_ptr;\n \n } \/\/ ~namespace reduct\n } \/\/ ~namespace opencog\n"} {"commit":"18122f5441fa14693a25170788642b4477b1cff0","subject":"Convert volume filter to floating point.","message":"Convert volume filter to floating point.\n\nExcept in the case of normalise=1, which is rather deprecated in favor\nof dynamic_loudness.\n","repos":"siddharudh\/mlt,j-b-m\/mlt,siddharudh\/mlt,j-b-m\/mlt,siddharudh\/mlt,siddharudh\/mlt,siddharudh\/mlt,xzhavilla\/mlt,mltframework\/mlt,j-b-m\/mlt,j-b-m\/mlt,xzhavilla\/mlt,xzhavilla\/mlt,mltframework\/mlt,xzhavilla\/mlt,mltframework\/mlt,siddharudh\/mlt,xzhavilla\/mlt,mltframework\/mlt,xzhavilla\/mlt,xzhavilla\/mlt,xzhavilla\/mlt,xzhavilla\/mlt,j-b-m\/mlt,j-b-m\/mlt,mltframework\/mlt,mltframework\/mlt,mltframework\/mlt,mltframework\/mlt,siddharudh\/mlt,siddharudh\/mlt,j-b-m\/mlt,j-b-m\/mlt,siddharudh\/mlt,j-b-m\/mlt,j-b-m\/mlt,mltframework\/mlt,mltframework\/mlt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/modules\/normalize\/filter_volume.c\n+++ src\/modules\/normalize\/filter_volume.c\n@@ -1,6 +1,6 @@\n \/*\n * filter_volume.c -- adjust audio volume\n- * Copyright (C) 2003-2015 Meltytech, LLC\n+ * Copyright (C) 2003-2016 Meltytech, LLC\n *\n * This program is free software; you can redistribute it and\/or modify\n * it under the terms of the GNU General Public License as published by\n@@ -109,7 +109,7 @@\n \tint bytes_per_samp = (samp_width - 1) \/ 8 + 1;\n \tint16_t max = (1 << (bytes_per_samp * 8 - 1)) - 1;\n \tint16_t min = -max - 1;\n-\t\n+\n \tdouble *sums = (double *) calloc( channels, sizeof(double) );\n \tint c, i;\n \tint16_t sample;\n@@ -178,7 +178,7 @@\n \tint i, j;\n \tdouble sample;\n \tint16_t peak;\n-\t\n+\n \t\/\/ Use animated value for gain if \"level\" property is set \n \tchar* level_property = mlt_properties_get( filter_props, \"level\" );\n \tif ( level_property != NULL )\n@@ -193,13 +193,8 @@\n \t\tlimiter_level = mlt_properties_get_double( instance_props, \"limiter\" );\n \t\n \t\/\/ Get the producer's audio\n-\t*format = mlt_audio_s16;\n+\t*format = normalise? mlt_audio_s16 : mlt_audio_f32le;\n \tmlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );\n-\n-\t\/\/ Determine numeric limits\n-\tint bytes_per_samp = (samp_width - 1) \/ 8 + 1;\n-\tint samplemax = (1 << (bytes_per_samp * 8 - 1)) - 1;\n-\tint samplemin = -samplemax - 1;\n \n \tmlt_service_lock( MLT_FILTER_SERVICE( filter ) );\n \n@@ -225,7 +220,7 @@\n \t\t}\n \t\telse\n \t\t{\n-\t\t\tgain *= amplitude \/ signal_max_power( (int16_t*) *buffer, *channels, *samples, &peak );\n+\t\t\tgain *= amplitude \/ signal_max_power( *buffer, *channels, *samples, &peak );\n \t\t}\n \t}\n \n@@ -254,33 +249,35 @@\n \t\/\/ Ramp from the previous gain to the current\n \tgain = previous_gain;\n \n-\tint16_t *p = (int16_t*) *buffer;\n-\n \t\/\/ Apply the gain\n-\tfor ( i = 0; i < *samples; i++ )\n-\t{\n-\t\tfor ( j = 0; j < *channels; j++ )\n-\t\t{\n-\t\t\tsample = *p * gain;\n-\t\t\t*p = ROUND( sample );\n-\t\t\n-\t\t\tif ( gain > 1.0 )\n-\t\t\t{\n-\t\t\t\t\/* use limiter function instead of clipping *\/\n-\t\t\t\tif ( normalise )\n+\tif ( normalise )\n+\t{\n+\t\tint16_t *p = *buffer;\n+\t\t\/\/ Determine numeric limits\n+\t\tint bytes_per_samp = (samp_width - 1) \/ 8 + 1;\n+\t\tint samplemax = (1 << (bytes_per_samp * 8 - 1)) - 1;\n+\n+\t\tfor ( i = 0; i < *samples; i++, gain += gain_step ) {\n+\t\t\tfor ( j = 0; j < *channels; j++ ) {\n+\t\t\t\tsample = *p * gain;\n+\t\t\t\t*p = ROUND( sample );\n+\t\t\t\tif ( gain > 1.0 && normalise ) {\n+\t\t\t\t\t\/* use limiter function instead of clipping *\/\n \t\t\t\t\t*p = ROUND( samplemax * limiter( sample \/ (double) samplemax, limiter_level ) );\n-\t\t\t\t\n-\t\t\t\t\/* perform clipping *\/\n-\t\t\t\telse if ( sample > samplemax )\n-\t\t\t\t\t*p = samplemax;\n-\t\t\t\telse if ( sample < samplemin )\n-\t\t\t\t\t*p = samplemin;\n+\t\t\t\t}\n+\t\t\t\tp++;\n \t\t\t}\n-\t\t\tp++;\n-\t\t}\n-\t\tgain += gain_step;\n-\t}\n-\t\n+\t\t}\n+\t}\n+\telse\n+\t{\n+\t\tfloat *p = *buffer;\n+\t\tfor ( i = 0; i < *samples; i++, gain += gain_step ) {\n+\t\t\tfor ( j = 0; j < *channels; j++, p++ ) {\n+\t\t\t\tp[0] *= gain;\n+\t\t\t}\n+\t\t}\n+\t}\n \treturn 0;\n }\n \n"} {"commit":"467f00e9162fcaf4840517809c6e1a6b138a985b","subject":"added comment in Rule.h about default false value of overrideInputFilter arg","message":"added comment in Rule.h about default false value of overrideInputFilter arg\n","repos":"yantrabuddhi\/opencog,ruiting\/opencog,ceefour\/opencog,inflector\/atomspace,sanuj\/opencog,tim777z\/opencog,yantrabuddhi\/atomspace,eddiemonroe\/atomspace,rodsol\/atomspace,rTreutlein\/atomspace,ceefour\/opencog,printedheart\/opencog,sumitsourabh\/opencog,kinoc\/opencog,rohit12\/atomspace,gavrieltal\/opencog,Selameab\/opencog,kinoc\/opencog,sumitsourabh\/opencog,Selameab\/atomspace,kim135797531\/opencog,prateeksaxena2809\/opencog,eddiemonroe\/opencog,roselleebarle04\/opencog,Selameab\/opencog,prateeksaxena2809\/opencog,printedheart\/atomspace,jswiergo\/atomspace,gaapt\/opencog,Allend575\/opencog,kinoc\/opencog,sanuj\/opencog,misgeatgit\/atomspace,UIKit0\/atomspace,inflector\/opencog,AmeBel\/opencog,misgeatgit\/atomspace,Selameab\/opencog,zhaozengguang\/opencog,prateeksaxena2809\/opencog,yantrabuddhi\/atomspace,AmeBel\/opencog,eddiemonroe\/opencog,yantrabuddhi\/atomspace,printedheart\/atomspace,tim777z\/opencog,shujingke\/opencog,ArvinPan\/atomspace,MarcosPividori\/atomspace,eddiemonroe\/opencog,rohit12\/atomspace,jswiergo\/atomspace,virneo\/opencog,gavrieltal\/opencog,eddiemonroe\/opencog,ruiting\/opencog,virneo\/opencog,ceefour\/opencog,cosmoharrigan\/opencog,anitzkin\/opencog,kinoc\/opencog,ceefour\/atomspace,MarcosPividori\/atomspace,MarcosPividori\/atomspace,Allend575\/opencog,jswiergo\/atomspace,Selameab\/opencog,prateeksaxena2809\/opencog,anitzkin\/opencog,kim135797531\/opencog,rTreutlein\/atomspace,williampma\/atomspace,TheNameIsNigel\/opencog,misgeatgit\/opencog,Tiggels\/opencog,tim777z\/opencog,eddiemonroe\/opencog,zhaozengguang\/opencog,rohit12\/opencog,gavrieltal\/opencog,yantrabuddhi\/opencog,sumitsourabh\/opencog,ceefour\/atomspace,yantrabuddhi\/opencog,ruiting\/opencog,virneo\/atomspace,Allend575\/opencog,rodsol\/opencog,printedheart\/atomspace,gaapt\/opencog,shujingke\/opencog,ArvinPan\/atomspace,cosmoharrigan\/opencog,gaapt\/opencog,Tiggels\/opencog,williampma\/opencog,AmeBel\/opencog,eddiemonroe\/atomspace,AmeBel\/opencog,sanuj\/opencog,shujingke\/opencog,inflector\/opencog,Tiggels\/opencog,williampma\/opencog,inflector\/opencog,printedheart\/opencog,TheNameIsNigel\/opencog,MarcosPividori\/atomspace,roselleebarle04\/opencog,Allend575\/opencog,Tiggels\/opencog,inflector\/opencog,shujingke\/opencog,andre-senna\/opencog,inflector\/atomspace,jlegendary\/opencog,yantrabuddhi\/opencog,ceefour\/opencog,eddiemonroe\/atomspace,inflector\/atomspace,misgeatgit\/opencog,rohit12\/opencog,cosmoharrigan\/opencog,ArvinPan\/opencog,yantrabuddhi\/opencog,gaapt\/opencog,williampma\/atomspace,andre-senna\/opencog,UIKit0\/atomspace,rodsol\/atomspace,ruiting\/opencog,Selameab\/atomspace,ceefour\/opencog,cosmoharrigan\/atomspace,cosmoharrigan\/opencog,TheNameIsNigel\/opencog,TheNameIsNigel\/opencog,cosmoharrigan\/opencog,jswiergo\/atomspace,rodsol\/opencog,cosmoharrigan\/atomspace,ceefour\/atomspace,andre-senna\/opencog,sumitsourabh\/opencog,ruiting\/opencog,sanuj\/opencog,sumitsourabh\/opencog,kim135797531\/opencog,sanuj\/opencog,printedheart\/atomspace,AmeBel\/atomspace,AmeBel\/atomspace,roselleebarle04\/opencog,rodsol\/opencog,cosmoharrigan\/atomspace,roselleebarle04\/opencog,rodsol\/atomspace,williampma\/atomspace,zhaozengguang\/opencog,inflector\/atomspace,virneo\/atomspace,rodsol\/opencog,anitzkin\/opencog,rohit12\/opencog,gaapt\/opencog,kinoc\/opencog,misgeatgit\/opencog,yantrabuddhi\/opencog,andre-senna\/opencog,virneo\/opencog,misgeatgit\/opencog,yantrabuddhi\/opencog,iAMr00t\/opencog,inflector\/opencog,misgeatgit\/opencog,gavrieltal\/opencog,ArvinPan\/atomspace,rohit12\/opencog,rodsol\/opencog,printedheart\/opencog,Tiggels\/opencog,williampma\/opencog,jlegendary\/opencog,ArvinPan\/opencog,virneo\/atomspace,sumitsourabh\/opencog,iAMr00t\/opencog,kim135797531\/opencog,TheNameIsNigel\/opencog,shujingke\/opencog,misgeatgit\/opencog,eddiemonroe\/opencog,ArvinPan\/atomspace,roselleebarle04\/opencog,zhaozengguang\/opencog,ceefour\/atomspace,kinoc\/opencog,roselleebarle04\/opencog,Allend575\/opencog,kim135797531\/opencog,Selameab\/atomspace,gaapt\/opencog,shujingke\/opencog,virneo\/opencog,rodsol\/atomspace,printedheart\/opencog,AmeBel\/atomspace,anitzkin\/opencog,rohit12\/opencog,kim135797531\/opencog,ruiting\/opencog,jlegendary\/opencog,gavrieltal\/opencog,williampma\/opencog,andre-senna\/opencog,ArvinPan\/opencog,UIKit0\/atomspace,misgeatgit\/atomspace,ArvinPan\/opencog,ruiting\/opencog,kim135797531\/opencog,printedheart\/opencog,inflector\/opencog,cosmoharrigan\/opencog,iAMr00t\/opencog,rodsol\/opencog,jlegendary\/opencog,rTreutlein\/atomspace,printedheart\/opencog,jlegendary\/opencog,yantrabuddhi\/atomspace,sanuj\/opencog,UIKit0\/atomspace,Tiggels\/opencog,yantrabuddhi\/atomspace,rohit12\/opencog,williampma\/atomspace,gavrieltal\/opencog,rTreutlein\/atomspace,eddiemonroe\/atomspace,misgeatgit\/atomspace,Selameab\/opencog,Allend575\/opencog,rohit12\/atomspace,prateeksaxena2809\/opencog,AmeBel\/opencog,misgeatgit\/opencog,zhaozengguang\/opencog,andre-senna\/opencog,prateeksaxena2809\/opencog,Allend575\/opencog,gavrieltal\/opencog,kinoc\/opencog,virneo\/opencog,iAMr00t\/opencog,anitzkin\/opencog,rohit12\/atomspace,prateeksaxena2809\/opencog,Selameab\/atomspace,gaapt\/opencog,AmeBel\/opencog,ceefour\/opencog,AmeBel\/atomspace,tim777z\/opencog,rTreutlein\/atomspace,cosmoharrigan\/atomspace,anitzkin\/opencog,sumitsourabh\/opencog,AmeBel\/atomspace,tim777z\/opencog,virneo\/opencog,shujingke\/opencog,Selameab\/opencog,inflector\/opencog,eddiemonroe\/atomspace,inflector\/atomspace,roselleebarle04\/opencog,misgeatgit\/opencog,inflector\/opencog,williampma\/opencog,anitzkin\/opencog,iAMr00t\/opencog,zhaozengguang\/opencog,misgeatgit\/opencog,williampma\/opencog,jlegendary\/opencog,tim777z\/opencog,virneo\/opencog,virneo\/atomspace,eddiemonroe\/opencog,andre-senna\/opencog,TheNameIsNigel\/opencog,misgeatgit\/atomspace,AmeBel\/opencog,jlegendary\/opencog,ArvinPan\/opencog,ArvinPan\/opencog,iAMr00t\/opencog,ceefour\/opencog","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/reasoning\/pln\/rules\/Rule.h\n+++ opencog\/reasoning\/pln\/rules\/Rule.h\n@@ -94,6 +94,7 @@\n *\n * @param outh ???\n * @param overrideInputFilter Whether the method overrides inputFilter.\n+ * if it is unchanged then it is considered false\n * @return The extra requirements filter.\n *\/\n virtual setOfMPs o2iMetaExtra(meta outh, bool& overrideInputFilter) const=0;\n"} {"commit":"27ff8a91d953a1ca491288d86d153e30f2270311","subject":"added instructions in case the sequence header is in two packets and the frame rate is needed","message":"added instructions in case the sequence header is in two packets and the frame rate is needed\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -323,7 +323,13 @@\n stcontext.need_gop = -1;\n }\n if (stcontext.need_seq != -1) {\n- \n+ memcpy(data_buf + k, pkt.data, stcontext.need_seq);\n+ tc.fps = get_frame_rate(st, &pkt);\n+ printf(\"fps %d\\n\", tc.fps);\n+ if (!tc.fps){\n+ printf(\"Frame rate could not be found\\n\");\n+ return -1;\n+ }\n }\n for (i = 0; i < pkt.size; i++) {\n Index *idx = &stcontext.index[stcontext.frame_num];\n"} {"commit":"df5b83dfc71a1ec491f1e4a38fb9b4700afb3f56","subject":"Increase packet limit in jitter buffer.","message":"Increase packet limit in jitter buffer.\n\nEspecially the VP9 codec currently may overshoot bitrate target at sudden picture changes, resulting in frames over 800 packets.\nThis limit should be reduced again once the codec behaves.\n\nBUG=webrtc:4889\n\nReview URL: https:\/\/codereview.webrtc.org\/1266353003\n\nCr-Original-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#9675}\nCr-Mirrored-From: https:\/\/chromium.googlesource.com\/external\/webrtc\nCr-Mirrored-Commit: 907dcfd0e13b3ea82d8a2b042a1e9a266ef047d0\n","repos":"sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc,sippet\/webrtc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/video_coding\/main\/source\/jitter_buffer_common.h\n+++ modules\/video_coding\/main\/source\/jitter_buffer_common.h\n@@ -26,11 +26,13 @@\n enum { kFastConvergeThreshold = 5};\n \n enum VCMJitterBufferEnum {\n- kMaxConsecutiveOldFrames = 60,\n- kMaxConsecutiveOldPackets = 300,\n- kMaxPacketsInSession = 800,\n- kBufferIncStepSizeBytes = 30000, \/\/ >20 packets.\n- kMaxJBFrameSizeBytes = 4000000 \/\/ sanity don't go above 4Mbyte.\n+ kMaxConsecutiveOldFrames = 60,\n+ kMaxConsecutiveOldPackets = 300,\n+ \/\/ TODO(sprang): Reduce this limit once codecs don't sometimes wildly\n+ \/\/ overshoot bitrate target.\n+ kMaxPacketsInSession = 1400, \/\/ Allows ~2MB frames.\n+ kBufferIncStepSizeBytes = 30000, \/\/ >20 packets.\n+ kMaxJBFrameSizeBytes = 4000000 \/\/ sanity don't go above 4Mbyte.\n };\n \n enum VCMFrameBufferEnum {\n"} {"commit":"3e93b8dfd9dd8735152e59913a2bde226f83d43e","subject":"BTRFS: Don't include disk-io.h twice in check-integrity.c","message":"BTRFS: Don't include disk-io.h twice in check-integrity.c\n\nOnce should be enough.\n\nSigned-off-by: Jesper Juhl <7323a5431d1c31072983a6a5bf23745b655ddf59@chaosbits.net>\nSigned-off-by: Jiri Kosina <ed58f755cc8caaf10c3e8c731a8b86fb8f13d6cb@suse.cz>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/check-integrity.c\n+++ fs\/btrfs\/check-integrity.c\n@@ -89,7 +89,6 @@\n #include \"disk-io.h\"\n #include \"transaction.h\"\n #include \"extent_io.h\"\n-#include \"disk-io.h\"\n #include \"volumes.h\"\n #include \"print-tree.h\"\n #include \"locking.h\"\n"} {"commit":"a90e8ed44202d044cccf46bc795f655cb6bb0a31","subject":"Refactor:\tPfNav should now work correctly with ClusterJuggler.","message":"Refactor:\tPfNav should now work correctly with ClusterJuggler.\n\nWARNING: This has not been fuly tested due to the current crashing bug in\npfNav.\n\n\ngit-svn-id: 769d22dfa2d22aad706b9a451492fb87c0735f19@9908 08b38cba-cd3b-11de-854e-f91c5b6e4272\n","repos":"MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,LiuKeHua\/vrjuggler,godbyk\/vrjuggler-upstream-old,godbyk\/vrjuggler-upstream-old,vrjuggler\/vrjuggler,vrjuggler\/vrjuggler,vancegroup-mirrors\/vrjuggler,MichaelMcDonnell\/vrjuggler,LiuKeHua\/vrjuggler,vancegroup-mirrors\/vrjuggler,vancegroup-mirrors\/vrjuggler,LiuKeHua\/vrjuggler,vancegroup-mirrors\/vrjuggler,vrjuggler\/vrjuggler,MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,LiuKeHua\/vrjuggler,vancegroup-mirrors\/vrjuggler,godbyk\/vrjuggler-upstream-old,MichaelMcDonnell\/vrjuggler,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,LiuKeHua\/vrjuggler,vrjuggler\/vrjuggler,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,godbyk\/vrjuggler-upstream-old,vancegroup-mirrors\/vrjuggler,godbyk\/vrjuggler-upstream-old,godbyk\/vrjuggler-upstream-old","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/vrjuggler\/samples\/Pf\/advanced\/nav\/velocityNav.h\n+++ modules\/vrjuggler\/samples\/Pf\/advanced\/nav\/velocityNav.h\n@@ -37,7 +37,8 @@\n #include <navigator.h>\n #include <collider.h>\n #include <vector>\n-#include \"StopWatch.h\"\n+#include <vpr\/Util\/Interval.h>\n+\/\/#include \"StopWatch.h\"\n \n class velocityNav : public navigator\n {\n@@ -155,10 +156,11 @@\n bool mStopping;\n bool mResetting;\n \n-\n+ float mTimeDelta;\n+ vpr::Interval mLastTimeStamp;\n \n Units mUnits;\n- StopWatch stopWatch;\n+ \/\/StopWatch stopWatch;\n navMode mMode;\n int mTimeHack;\n };\n@@ -171,11 +173,12 @@\n mAcceleration(10.0f),\n mUnits( velocityNav::FEET ),\n mMode( velocityNav::DRIVE ),\n- mTimeHack(0)\n+ mTimeHack(0),\n+ mLastTimeStamp(0,vpr::Interval::Base)\n {\n stop();\n- stopWatch.start();\n- stopWatch.stop();\n+ \/\/stopWatch.start();\n+ \/\/stopWatch.stop();\n \n setNavPosControl(\"VJWand\"); \/\/ Initialize wand device\n \n@@ -292,20 +295,32 @@\n \n inline void velocityNav::update()\n {\n- stopWatch.stop();\n- stopWatch.start();\n-\n- if(stopWatch.timeInstant > 2.0f) \/\/ If the time is greater than 2 seconds ( 1\/2 fps)\n+ \/\/stopWatch.stop();\n+ \/\/stopWatch.start();\n+ \n+ vpr::Interval cur_time = mNavWand->getTimeStamp();\n+ vpr::Interval diff_time(cur_time-mLastTimeStamp);\n+ \n+ mTimeDelta = diff_time.secf();\n+\n+ std::cout << \"READANDWRITE Delta: \" << diff_time.getBaseVal() << std::endl;\n+ std::cout << \"READANDWRITE Current: \" << cur_time.getBaseVal() << \"Last: \" << mLastTimeStamp.getBaseVal() << \"\\n\" << std::endl;\n+ \n+ mLastTimeStamp = cur_time;\n+\n+\n+\n+ if(mTimeDelta > 2.0f) \/\/ If the time is greater than 2 seconds ( 1\/2 fps)\n {\n vprDEBUG(vprDBG_ALL,0)\n << clrOutNORM(clrCYAN,\"VelNav: timeInstant to large: \")\n- << stopWatch.timeInstant << std::endl << vprDEBUG_FLUSH;\n- stopWatch.stop(); \/\/ Get a REALLY small delta time\n- stopWatch.start();\n+ << mTimeDelta << std::endl << vprDEBUG_FLUSH;\n+ \/\/stopWatch.stop(); \/\/ Get a REALLY small delta time\n+ \/\/stopWatch.start();\n }\n \n \/\/vprDEBUG_BEGIN(vprDBG_ALL,0) << \"VelNav: ----- Update ----\\n\" << vprDEBUG_FLUSH;\n- \/\/vprDEBUG(vprDBG_ALL,0) << \"VelNav: timeInstant: \" << stopWatch.timeInstant << std::endl << vprDEBUG_FLUSH;\n+ \/\/vprDEBUG(vprDBG_ALL,0) << \"VelNav: timeInstant: \" << mTimeDelta << std::endl << vprDEBUG_FLUSH;\n \n \/\/ If we are not supposed to be active, then don't run\n if(!this->isActive())\n@@ -373,7 +388,9 @@\n \n \/\/ recalculate the current downward velocity from gravity.\n \/\/ this vector then is accumulated with the rest of the velocity vectors each frame.\n- mVelocityFromGravityAccumulator += (gravity * stopWatch.timeInstant);\n+ \n+ \/\/mVelocityFromGravityAccumulator += (gravity * mTimeDelta);\n+ mVelocityFromGravityAccumulator += (gravity * mTimeDelta);\n \n \/\/vprDEBUG_CONT(vprDBG_ALL,0) << \" new vel: \" << velocityAccumulator\n \/\/ << \" new grav: \" << mVelocityFromGravityAccumulator << endl << vprDEBUG_FLUSH;\n@@ -392,9 +409,9 @@\n \/\/ navigation just calculated navigator's next velocity\n \/\/ now convert accumulated velocity to distance traveled this frame (by cancelling out time)\n \/\/ NOTE: this is not the final distance, since we still have to do collision correction.\n- gmtl::Vec3f distanceToMove = velocityAccumulator * stopWatch.timeInstant;\n-\n- \/\/vprDEBUG(vprDBG_ALL,0) << \"velNav: distToMove = velAcum * instant: \" << velocityAccumulator << \" * \" << stopWatch.timeInstant << endl << vprDEBUG_FLUSH;\n+ gmtl::Vec3f distanceToMove = velocityAccumulator * mTimeDelta;\n+\n+ \/\/vprDEBUG(vprDBG_ALL,0) << \"velNav: distToMove = velAcum * instant: \" << velocityAccumulator << \" * \" << mTimeDelta << endl << vprDEBUG_FLUSH;\n \n \/\/ --- TRANSLATION and COLLISION DETECTION --- \/\/\n bool did_collide; \/\/ Did we collide with anything\n@@ -447,7 +464,7 @@\n {\n if(gmtl::length(mVelocity) < mMaxVelocity)\n {\n- mVelocity += (accel * stopWatch.timeInstant);\n+ mVelocity += (accel * mTimeDelta);\n }\n }\n \n@@ -469,8 +486,8 @@\n mVelocityFromGravityAccumulator.set( 0,0,0 );\n gmtl::identity(mRotationalAcceleration);\n navigator::reset();\n- stopWatch.start(); \/\/ Reset the stop watch\n- stopWatch.stop();\n+ \/\/stopWatch.start(); \/\/ Reset the stop watch\n+ \/\/stopWatch.stop();\n }\n \n \n"} {"commit":"e4ef0828b097eb52afc20d3accd675e5a0ab650a","subject":"Ignore SIGPIPE","message":"Ignore SIGPIPE\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -815,6 +815,9 @@\n inline Server::Server()\n : svr_sock_(-1)\n {\n+#ifndef _MSC_VER\n+ signal(SIGPIPE, SIG_IGN);\n+#endif\n }\n \n inline Server::~Server()\n"} {"commit":"05bf14adcac188f573e22f72734fd0e2fab71aec","subject":"NFSv4.1: Use session max response size for GETDEVICEINFO gdia_maxcount","message":"NFSv4.1: Use session max response size for GETDEVICEINFO gdia_maxcount\n\nWe prepare for the largest possible GETDEVICEINFO response, which\ncan not be greater than the negotiated session maximum response size.\n\nSigned-off-by: Andy Adamson <354e29cfbea2f74d5ce81a3b79d7f0264830cb78@netapp.com>\nSigned-off-by: Trond Myklebust <6a1f9db795c9fc44be97d66ab114c53193bd3d13@netapp.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/nfs\/nfs4filelayoutdev.c\n+++ fs\/nfs\/nfs4filelayoutdev.c\n@@ -728,7 +728,7 @@\n \tpdev->layout_type = LAYOUT_NFSV4_1_FILES;\n \tpdev->pages = pages;\n \tpdev->pgbase = 0;\n-\tpdev->pglen = PAGE_SIZE * max_pages;\n+\tpdev->pglen = max_resp_sz;\n \tpdev->mincount = 0;\n \n \trc = nfs4_proc_getdeviceinfo(server, pdev);\n"} {"commit":"b893d5681fb2092ccfe7b49aa46a02a9a3cd8c15","subject":"Old pointers of sibling were not cleared","message":"Old pointers of sibling were not cleared\n\nWhen adding sibling at the head of linked list, the head if pointing\nto something in linked list was not updated, hence a loop was formed\nin linked list\n\nElement0 - First addition to linked list\nElement1 - Has higher delay hence added to back\n0 ->(next) 1\nElement2 - Delay is same as Element0, hence should be sibling of 0\n Shall be added at head\n\nExpected:\n2 ------------->(next) 1\n|(sibling)\n0\n\nBug: (Resolved with this)\n2 ------------->(next) 1\n|(sibling)\n0 ------------->(next) 1\n\nIf we add more elements and next pointer of sibling is updated, old\nreferences will cause issues\nElement3 added\n\nExpected:\n2 ------------->(next) 3 ------------->(next) 1\n|(sibling)\n0\n\nBug: (Resolved with this)\n2 ------------->(next) 3 ------------->(next) 1\n|(sibling)\n0 ------------->(next) 1\n***Both siblings here point to different next***\n","repos":"kjbracey-arm\/mbed,kjbracey-arm\/mbed,kjbracey-arm\/mbed,andcor02\/mbed-os,mbedmicro\/mbed,kjbracey-arm\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed,mbedmicro\/mbed,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,mbedmicro\/mbed","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- events\/equeue\/equeue.c\n+++ events\/equeue\/equeue.c\n@@ -239,8 +239,8 @@\n if (e->next) {\n e->next->ref = &e->next;\n }\n-\n e->sibling = *p;\n+ e->sibling->next = 0;\n e->sibling->ref = &e->sibling;\n } else {\n e->next = *p;\n"} {"commit":"129e2f00b861377216b7212caf6c6cca0427f46c","subject":"Removed unnecessary noexcept","message":"Removed unnecessary noexcept\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -884,7 +884,7 @@\n \n long get_openssl_verify_result() const;\n \n- SSL_CTX *ssl_context() const noexcept;\n+ SSL_CTX *ssl_context() const;\n \n private:\n bool process_and_close_socket(\n@@ -4768,7 +4768,7 @@\n return verify_result_;\n }\n \n-inline SSL_CTX *SSLClient::ssl_context() const noexcept { return ctx_; }\n+inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; }\n \n inline bool SSLClient::process_and_close_socket(\n socket_t sock, size_t request_count,\n"} {"commit":"26a83480d7c4ceaded6a4c547b2aee6d54b66a5a","subject":"Remove double declarations in npymath headers.","message":"Remove double declarations in npymath headers.\n\ngit-svn-id: 77a43f9646713b91fea7788fad5dfbf67e151ece@7658 94b884b6-d6fd-0310-90d3-974f1d3f35e1\n","repos":"teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,Ademan\/NumPy-GSoC,teoliphant\/numpy-refactor,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,Ademan\/NumPy-GSoC,jasonmccampbell\/numpy-refactor-sprint,teoliphant\/numpy-refactor,teoliphant\/numpy-refactor,Ademan\/NumPy-GSoC,Ademan\/NumPy-GSoC,jasonmccampbell\/numpy-refactor-sprint","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/include\/numpy\/npy_math.h\n+++ numpy\/core\/include\/numpy\/npy_math.h\n@@ -337,15 +337,6 @@\n double npy_cabs(npy_cdouble z);\n double npy_carg(npy_cdouble z);\n \n-npy_cdouble npy_cexp(npy_cdouble z);\n-npy_cdouble npy_clog(npy_cdouble z);\n-npy_cdouble npy_cpow(npy_cdouble x, npy_cdouble y);\n-\n-npy_cdouble npy_csqrt(npy_cdouble z);\n-\n-npy_cdouble npy_ccos(npy_cdouble z);\n-npy_cdouble npy_csin(npy_cdouble z);\n-\n \/*\n * Single precision complex functions\n *\/\n@@ -368,15 +359,6 @@\n float npy_cabsf(npy_cfloat z);\n float npy_cargf(npy_cfloat z);\n \n-npy_cfloat npy_cexpf(npy_cfloat z);\n-npy_cfloat npy_clogf(npy_cfloat z);\n-npy_cfloat npy_cpowf(npy_cfloat x, npy_cfloat y);\n-\n-npy_cfloat npy_csqrtf(npy_cfloat z);\n-\n-npy_cfloat npy_ccosf(npy_cfloat z);\n-npy_cfloat npy_csinf(npy_cfloat z);\n-\n \/*\n * Extended precision complex functions\n *\/\n@@ -394,18 +376,4 @@\n npy_clongdouble npy_ccosl(npy_clongdouble z);\n npy_clongdouble npy_csinl(npy_clongdouble z);\n \n-npy_longdouble npy_creall(npy_clongdouble z);\n-npy_longdouble npy_cimagl(npy_clongdouble z);\n-npy_longdouble npy_cabsl(npy_clongdouble z);\n-npy_longdouble npy_cargl(npy_clongdouble z);\n-\n-npy_clongdouble npy_cexpl(npy_clongdouble z);\n-npy_clongdouble npy_clogl(npy_clongdouble z);\n-npy_clongdouble npy_cpowl(npy_clongdouble x, npy_clongdouble y);\n-\n-npy_clongdouble npy_csqrtl(npy_clongdouble z);\n-\n-npy_clongdouble npy_ccosl(npy_clongdouble z);\n-npy_clongdouble npy_csinl(npy_clongdouble z);\n-\n-#endif\n+#endif\n"} {"commit":"696239d6e1fa93d5a5ea8b37fac1a55c2da162fc","subject":"Link Windows crypto libs only when CPPHTTPLIB_OPENSSL_SUPPORT is set (#1254)","message":"Link Windows crypto libs only when CPPHTTPLIB_OPENSSL_SUPPORT is set (#1254)\n\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -144,8 +144,6 @@\n \n #include <io.h>\n #include <winsock2.h>\n-\n-#include <wincrypt.h>\n #include <ws2tcpip.h>\n \n #ifndef WSA_FLAG_NO_HANDLE_INHERIT\n@@ -154,8 +152,6 @@\n \n #ifdef _MSC_VER\n #pragma comment(lib, \"ws2_32.lib\")\n-#pragma comment(lib, \"crypt32.lib\")\n-#pragma comment(lib, \"cryptui.lib\")\n #endif\n \n #ifndef strcasecmp\n@@ -220,14 +216,20 @@\n #include <thread>\n \n #ifdef CPPHTTPLIB_OPENSSL_SUPPORT\n-\/\/ these are defined in wincrypt.h and it breaks compilation if BoringSSL is\n-\/\/ used\n #ifdef _WIN32\n+#include <wincrypt.h>\n+\n+\/\/ these are defined in wincrypt.h and it breaks compilation if BoringSSL is used\n #undef X509_NAME\n #undef X509_CERT_PAIR\n #undef X509_EXTENSIONS\n #undef PKCS7_SIGNER_INFO\n-#endif\n+\n+#ifdef _MSC_VER\n+#pragma comment(lib, \"crypt32.lib\")\n+#pragma comment(lib, \"cryptui.lib\")\n+#endif\n+#endif \/\/_WIN32\n \n #include <openssl\/err.h>\n #include <openssl\/evp.h>\n"} {"commit":"4bc65576d00984642572e043a6736ae2dbf7a458","subject":"BUG: Do not ignore subspace unless it is true 0-d","message":"BUG: Do not ignore subspace unless it is true 0-d\n\nThis is more important when allowing newaxis, but already before\nlead to successful indexing when it should not be suspected.\nAlso some maintenance.\n","repos":"Dapid\/numpy,ESSS\/numpy,jorisvandenbossche\/numpy,tacaswell\/numpy,sigma-random\/numpy,Anwesh43\/numpy,pyparallel\/numpy,chiffa\/numpy,sinhrks\/numpy,ssanderson\/numpy,madphysicist\/numpy,sinhrks\/numpy,jorisvandenbossche\/numpy,rhythmsosad\/numpy,kirillzhuravlev\/numpy,pbrod\/numpy,SiccarPoint\/numpy,stuarteberg\/numpy,bertrand-l\/numpy,jschueller\/numpy,Yusa95\/numpy,dch312\/numpy,Yusa95\/numpy,kirillzhuravlev\/numpy,BMJHayward\/numpy,NextThought\/pypy-numpy,rudimeier\/numpy,KaelChen\/numpy,ahaldane\/numpy,shoyer\/numpy,rmcgibbo\/numpy,anntzer\/numpy,ahaldane\/numpy,bertrand-l\/numpy,dwillmer\/numpy,KaelChen\/numpy,mindw\/numpy,yiakwy\/numpy,brandon-rhodes\/numpy,mathdd\/numpy,groutr\/numpy,utke1\/numpy,mingwpy\/numpy,dato-code\/numpy,moreati\/numpy,leifdenby\/numpy,trankmichael\/numpy,nbeaver\/numpy,musically-ut\/numpy,ogrisel\/numpy,shoyer\/numpy,GaZ3ll3\/numpy,yiakwy\/numpy,CMartelLML\/numpy,grlee77\/numpy,simongibbons\/numpy,kirillzhuravlev\/numpy,chatcannon\/numpy,tynn\/numpy,BabeNovelty\/numpy,cowlicks\/numpy,skwbc\/numpy,maniteja123\/numpy,gmcastil\/numpy,MichaelAquilina\/numpy,abalkin\/numpy,bmorris3\/numpy,AustereCuriosity\/numpy,ESSS\/numpy,Srisai85\/numpy,dimasad\/numpy,immerrr\/numpy,seberg\/numpy,mhvk\/numpy,CMartelLML\/numpy,MaPePeR\/numpy,ChristopherHogan\/numpy,SunghanKim\/numpy,joferkington\/numpy,larsmans\/numpy,chiffa\/numpy,hainm\/numpy,MSeifert04\/numpy,WarrenWeckesser\/numpy,GrimDerp\/numpy,ajdawson\/numpy,cowlicks\/numpy,jorisvandenbossche\/numpy,MaPePeR\/numpy,pdebuyl\/numpy,Srisai85\/numpy,mathdd\/numpy,b-carter\/numpy,larsmans\/numpy,joferkington\/numpy,solarjoe\/numpy,rherault-insa\/numpy,KaelChen\/numpy,shoyer\/numpy,BMJHayward\/numpy,musically-ut\/numpy,Dapid\/numpy,skwbc\/numpy,grlee77\/numpy,NextThought\/pypy-numpy,dimasad\/numpy,musically-ut\/numpy,GaZ3ll3\/numpy,leifdenby\/numpy,brandon-rhodes\/numpy,jorisvandenbossche\/numpy,dwillmer\/numpy,BabeNovelty\/numpy,shoyer\/numpy,pbrod\/numpy,mattip\/numpy,BMJHayward\/numpy,KaelChen\/numpy,MSeifert04\/numpy,moreati\/numpy,nguyentu1602\/numpy,SunghanKim\/numpy,rajathkumarmp\/numpy,GaZ3ll3\/numpy,Eric89GXL\/numpy,githubmlai\/numpy,rajathkumarmp\/numpy,pbrod\/numpy,dato-code\/numpy,Linkid\/numpy,njase\/numpy,ddasilva\/numpy,jonathanunderwood\/numpy,tacaswell\/numpy,embray\/numpy,ContinuumIO\/numpy,trankmichael\/numpy,felipebetancur\/numpy,ogrisel\/numpy,empeeu\/numpy,stuarteberg\/numpy,utke1\/numpy,argriffing\/numpy,Linkid\/numpy,hainm\/numpy,ChanderG\/numpy,numpy\/numpy,ViralLeadership\/numpy,larsmans\/numpy,ViralLeadership\/numpy,dato-code\/numpy,AustereCuriosity\/numpy,nguyentu1602\/numpy,SiccarPoint\/numpy,bmorris3\/numpy,rudimeier\/numpy,kiwifb\/numpy,njase\/numpy,githubmlai\/numpy,Linkid\/numpy,dch312\/numpy,pizzathief\/numpy,mattip\/numpy,anntzer\/numpy,embray\/numpy,GrimDerp\/numpy,ekalosak\/numpy,jankoslavic\/numpy,mwiebe\/numpy,charris\/numpy,endolith\/numpy,MaPePeR\/numpy,ChristopherHogan\/numpy,rajathkumarmp\/numpy,seberg\/numpy,MichaelAquilina\/numpy,BabeNovelty\/numpy,mhvk\/numpy,cjermain\/numpy,yiakwy\/numpy,sonnyhu\/numpy,Eric89GXL\/numpy,bertrand-l\/numpy,abalkin\/numpy,pizzathief\/numpy,endolith\/numpy,endolith\/numpy,ChristopherHogan\/numpy,rgommers\/numpy,pdebuyl\/numpy,rmcgibbo\/numpy,seberg\/numpy,ogrisel\/numpy,andsor\/numpy,mortada\/numpy,mortada\/numpy,NextThought\/pypy-numpy,SunghanKim\/numpy,nbeaver\/numpy,ahaldane\/numpy,bringingheavendown\/numpy,charris\/numpy,gmcastil\/numpy,Srisai85\/numpy,trankmichael\/numpy,Yusa95\/numpy,rhythmsosad\/numpy,mingwpy\/numpy,madphysicist\/numpy,empeeu\/numpy,NextThought\/pypy-numpy,pdebuyl\/numpy,Anwesh43\/numpy,numpy\/numpy,WillieMaddox\/numpy,mathdd\/numpy,dwillmer\/numpy,rhythmsosad\/numpy,Dapid\/numpy,sonnyhu\/numpy,Srisai85\/numpy,pbrod\/numpy,anntzer\/numpy,stuarteberg\/numpy,tdsmith\/numpy,kiwifb\/numpy,brandon-rhodes\/numpy,pbrod\/numpy,andsor\/numpy,dimasad\/numpy,embray\/numpy,rgommers\/numpy,has2k1\/numpy,mindw\/numpy,simongibbons\/numpy,gmcastil\/numpy,grlee77\/numpy,githubmlai\/numpy,drasmuss\/numpy,felipebetancur\/numpy,numpy\/numpy,Yusa95\/numpy,Eric89GXL\/numpy,groutr\/numpy,kiwifb\/numpy,mingwpy\/numpy,jschueller\/numpy,ekalosak\/numpy,b-carter\/numpy,skymanaditya1\/numpy,ChanderG\/numpy,bringingheavendown\/numpy,hainm\/numpy,bmorris3\/numpy,MichaelAquilina\/numpy,maniteja123\/numpy,jankoslavic\/numpy,mortada\/numpy,drasmuss\/numpy,jakirkham\/numpy,sigma-random\/numpy,Anwesh43\/numpy,ChristopherHogan\/numpy,jankoslavic\/numpy,gfyoung\/numpy,nguyentu1602\/numpy,mingwpy\/numpy,sigma-random\/numpy,joferkington\/numpy,skymanaditya1\/numpy,AustereCuriosity\/numpy,rmcgibbo\/numpy,tdsmith\/numpy,jschueller\/numpy,immerrr\/numpy,pizzathief\/numpy,numpy\/numpy,anntzer\/numpy,ekalosak\/numpy,tdsmith\/numpy,rgommers\/numpy,ogrisel\/numpy,charris\/numpy,njase\/numpy,simongibbons\/numpy,MSeifert04\/numpy,solarjoe\/numpy,jorisvandenbossche\/numpy,ahaldane\/numpy,naritta\/numpy,sonnyhu\/numpy,GrimDerp\/numpy,mortada\/numpy,Anwesh43\/numpy,endolith\/numpy,gfyoung\/numpy,bmorris3\/numpy,ChanderG\/numpy,mathdd\/numpy,larsmans\/numpy,jonathanunderwood\/numpy,tacaswell\/numpy,moreati\/numpy,WarrenWeckesser\/numpy,MichaelAquilina\/numpy,ajdawson\/numpy,MSeifert04\/numpy,tynn\/numpy,grlee77\/numpy,ssanderson\/numpy,chatcannon\/numpy,rhythmsosad\/numpy,cjermain\/numpy,behzadnouri\/numpy,BabeNovelty\/numpy,andsor\/numpy,cjermain\/numpy,mindw\/numpy,naritta\/numpy,cowlicks\/numpy,WillieMaddox\/numpy,ContinuumIO\/numpy,GrimDerp\/numpy,groutr\/numpy,WillieMaddox\/numpy,ogrisel\/numpy,empeeu\/numpy,yiakwy\/numpy,ssanderson\/numpy,chiffa\/numpy,ajdawson\/numpy,mhvk\/numpy,WarrenWeckesser\/numpy,seberg\/numpy,mattip\/numpy,githubmlai\/numpy,simongibbons\/numpy,jakirkham\/numpy,pizzathief\/numpy,maniteja123\/numpy,mattip\/numpy,pdebuyl\/numpy,behzadnouri\/numpy,leifdenby\/numpy,immerrr\/numpy,CMartelLML\/numpy,dwillmer\/numpy,ddasilva\/numpy,ViralLeadership\/numpy,simongibbons\/numpy,rudimeier\/numpy,sinhrks\/numpy,empeeu\/numpy,ajdawson\/numpy,dato-code\/numpy,chatcannon\/numpy,BMJHayward\/numpy,mhvk\/numpy,CMartelLML\/numpy,mwiebe\/numpy,has2k1\/numpy,ContinuumIO\/numpy,argriffing\/numpy,WarrenWeckesser\/numpy,jankoslavic\/numpy,felipebetancur\/numpy,naritta\/numpy,cowlicks\/numpy,Linkid\/numpy,dch312\/numpy,madphysicist\/numpy,skwbc\/numpy,bringingheavendown\/numpy,b-carter\/numpy,skymanaditya1\/numpy,mwiebe\/numpy,MaPePeR\/numpy,naritta\/numpy,joferkington\/numpy,argriffing\/numpy,rudimeier\/numpy,charris\/numpy,SiccarPoint\/numpy,has2k1\/numpy,brandon-rhodes\/numpy,cjermain\/numpy,skymanaditya1\/numpy,sonnyhu\/numpy,stuarteberg\/numpy,rmcgibbo\/numpy,sigma-random\/numpy,ekalosak\/numpy,nbeaver\/numpy,utke1\/numpy,rajathkumarmp\/numpy,madphysicist\/numpy,jakirkham\/numpy,immerrr\/numpy,pyparallel\/numpy,gfyoung\/numpy,dimasad\/numpy,shoyer\/numpy,rherault-insa\/numpy,rgommers\/numpy,felipebetancur\/numpy,Eric89GXL\/numpy,ahaldane\/numpy,tynn\/numpy,embray\/numpy,GaZ3ll3\/numpy,jakirkham\/numpy,SunghanKim\/numpy,madphysicist\/numpy,ChanderG\/numpy,mindw\/numpy,musically-ut\/numpy,jonathanunderwood\/numpy,ESSS\/numpy,jakirkham\/numpy,pizzathief\/numpy,abalkin\/numpy,trankmichael\/numpy,andsor\/numpy,dch312\/numpy,jschueller\/numpy,nguyentu1602\/numpy,pyparallel\/numpy,hainm\/numpy,tdsmith\/numpy,kirillzhuravlev\/numpy,rherault-insa\/numpy,embray\/numpy,mhvk\/numpy,grlee77\/numpy,solarjoe\/numpy,WarrenWeckesser\/numpy,ddasilva\/numpy,MSeifert04\/numpy,drasmuss\/numpy,behzadnouri\/numpy,has2k1\/numpy,sinhrks\/numpy,SiccarPoint\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/multiarray\/mapping.c\n+++ numpy\/core\/src\/multiarray\/mapping.c\n@@ -1809,7 +1809,7 @@\n {\n int subnd;\n PyObject *sub, *obj = NULL;\n- int i, j, n, curraxis, ellipexp, noellip, subdim, newaxes;\n+ int i, j, n, curraxis, ellipexp, noellip, newaxes;\n PyArrayIterObject *it;\n npy_intp dimsize;\n npy_intp *indptr;\n@@ -1824,14 +1824,6 @@\n mit->ait = (PyArrayIterObject *)PyArray_IterNew((PyObject *)arr);\n if (mit->ait == NULL) {\n goto fail;\n- }\n- \/* no subspace iteration needed. Finish up and Return *\/\n- if (subnd == 0) {\n- n = PyArray_NDIM(arr);\n- for (i = 0; i < n; i++) {\n- mit->iteraxes[i] = i;\n- }\n- goto finish;\n }\n \n \/*\n@@ -1859,26 +1851,36 @@\n if (sub == NULL) {\n goto fail;\n }\n+\n+ subnd = PyArray_NDIM(sub);\n+ \/* no subspace iteration needed. Finish up and Return *\/\n+ if (subnd == 0) {\n+ n = PyArray_NDIM(arr);\n+ for (i = 0; i < n; i++) {\n+ mit->iteraxes[i] = i;\n+ }\n+ goto finish;\n+ }\n+\n mit->subspace = (PyArrayIterObject *)PyArray_IterNew(sub);\n Py_DECREF(sub);\n if (mit->subspace == NULL) {\n goto fail;\n }\n \n- subdim = PyArray_NDIM(mit->subspace->ao);\n- if (mit->nd + subdim > NPY_MAXDIMS) {\n+ if (mit->nd + subnd > NPY_MAXDIMS) {\n PyErr_Format(PyExc_ValueError,\n \"number of dimensions must be within [0, %d], \"\n \"indexed array has %d\",\n- NPY_MAXDIMS, mit->nd + subdim);\n+ NPY_MAXDIMS, mit->nd + subnd);\n goto fail;\n }\n \n \/* Expand dimensions of result *\/\n- for (i = 0; i < subdim; i++) {\n+ for (i = 0; i < subnd; i++) {\n mit->dimensions[mit->nd+i] = PyArray_DIMS(mit->subspace->ao)[i];\n }\n- mit->nd += subdim;\n+ mit->nd += subnd;\n \n \/*\n * Now, we still need to interpret the ellipsis, slice and None\n@@ -1887,7 +1889,7 @@\n *\/\n n = PyTuple_GET_SIZE(mit->indexobj);\n \/* The number of dimensions an ellipsis takes up *\/\n- newaxes = subdim - (PyArray_NDIM(arr) - mit->numiter);\n+ newaxes = subnd - (PyArray_NDIM(arr) - mit->numiter);\n ellipexp = PyArray_NDIM(arr) + newaxes - n + 1;\n \/*\n * Now fill in iteraxes -- remember indexing arrays have been\n"} {"commit":"803ebe1e20bb2d377e89ab829cfed1e882dcf876","subject":"Typos fixed (#474)","message":"Typos fixed (#474)\n\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -241,18 +241,18 @@\n using MultipartReader = std::function<bool(MultipartContentHeader header,\n ContentReceiver receiver)>;\n \n- ContentReader(Reader reader, MultipartReader muitlpart_reader)\n- : reader_(reader), muitlpart_reader_(muitlpart_reader) {}\n+ ContentReader(Reader reader, MultipartReader multipart_reader)\n+ : reader_(reader), multipart_reader_(multipart_reader) {}\n \n bool operator()(MultipartContentHeader header,\n ContentReceiver receiver) const {\n- return muitlpart_reader_(header, receiver);\n+ return multipart_reader_(header, receiver);\n }\n \n bool operator()(ContentReceiver receiver) const { return reader_(receiver); }\n \n Reader reader_;\n- MultipartReader muitlpart_reader_;\n+ MultipartReader multipart_reader_;\n };\n \n using Range = std::pair<ssize_t, ssize_t>;\n"} {"commit":"0a8f15a1923b686238b4cd3db253bdd8b5d54270","subject":"Cleanup ufunc_object.c. Remove trailing whitespace. Remove hard tabs.","message":"Cleanup ufunc_object.c.\nRemove trailing whitespace.\nRemove hard tabs.\n\ngit-svn-id: 77a43f9646713b91fea7788fad5dfbf67e151ece@7569 94b884b6-d6fd-0310-90d3-974f1d3f35e1\n","repos":"jasonmccampbell\/numpy-refactor-sprint,jasonmccampbell\/numpy-refactor-sprint,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,teoliphant\/numpy-refactor,Ademan\/NumPy-GSoC,jasonmccampbell\/numpy-refactor-sprint,teoliphant\/numpy-refactor,Ademan\/NumPy-GSoC,teoliphant\/numpy-refactor,teoliphant\/numpy-refactor,Ademan\/NumPy-GSoC,Ademan\/NumPy-GSoC","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -600,7 +600,7 @@\n for(i = 0; i < self->nin; i++) {\n if (PyTypeNum_ISUSERDEF(arg_types[i])) {\n userdef = arg_types[i];\n-\t\tuserdef_ind = i;\n+ userdef_ind = i;\n break;\n }\n }\n@@ -615,40 +615,40 @@\n int ret = -1;\n obj = NULL;\n \n-\t\/*\n+ \/*\n * Look through all the registered loops for all the user-defined\n-\t * types to find a match.\n-\t *\/\n-\twhile (ret == -1) {\n-\t if (userdef_ind >= self->nin) {\n+ * types to find a match.\n+ *\/\n+ while (ret == -1) {\n+ if (userdef_ind >= self->nin) {\n break;\n }\n-\t userdef = arg_types[userdef_ind++];\n-\t if (!(PyTypeNum_ISUSERDEF(userdef))) {\n+ userdef = arg_types[userdef_ind++];\n+ if (!(PyTypeNum_ISUSERDEF(userdef))) {\n continue;\n }\n-\t key = PyInt_FromLong((long) userdef);\n-\t if (key == NULL) {\n+ key = PyInt_FromLong((long) userdef);\n+ if (key == NULL) {\n return -1;\n }\n-\t obj = PyDict_GetItem(self->userloops, key);\n-\t Py_DECREF(key);\n-\t if (obj == NULL) {\n+ obj = PyDict_GetItem(self->userloops, key);\n+ Py_DECREF(key);\n+ if (obj == NULL) {\n continue;\n }\n-\t \/*\n+ \/*\n * extract the correct function\n-\t * data and argtypes for this user-defined type.\n-\t *\/\n-\t ret = _find_matching_userloop(obj, arg_types, scalars,\n-\t\t\t\t\t function, data, self->nargs,\n-\t\t\t\t\t self->nin);\n-\t}\n-\tif (ret == 0) {\n+ * data and argtypes for this user-defined type.\n+ *\/\n+ ret = _find_matching_userloop(obj, arg_types, scalars,\n+ function, data, self->nargs,\n+ self->nin);\n+ }\n+ if (ret == 0) {\n return ret;\n }\n-\tPyErr_SetString(PyExc_TypeError, _types_msg);\n-\treturn ret;\n+ PyErr_SetString(PyExc_TypeError, _types_msg);\n+ return ret;\n }\n \n start_type = arg_types[0];\n@@ -933,8 +933,8 @@\n char *parse_error = NULL;\n \n if (signature == NULL) {\n-\tPyErr_SetString(PyExc_RuntimeError,\n-\t\t\t\"_parse_signature with NULL signature\");\n+ PyErr_SetString(PyExc_RuntimeError,\n+ \"_parse_signature with NULL signature\");\n return -1;\n }\n \n@@ -984,49 +984,49 @@\n i = _next_non_white_space(signature, i + 1);\n while (signature[i] != ')') {\n \/* loop over core dimensions *\/\n-\t int j = 0;\n+ int j = 0;\n if (!_is_alpha_underscore(signature[i])) {\n-\t\tparse_error = \"expect dimension name\";\n-\t\tgoto fail;\n- }\n-\t while (j < self->core_num_dim_ix) {\n-\t\tif (_is_same_name(signature+i, var_names[j])) {\n+ parse_error = \"expect dimension name\";\n+ goto fail;\n+ }\n+ while (j < self->core_num_dim_ix) {\n+ if (_is_same_name(signature+i, var_names[j])) {\n break;\n }\n-\t\tj++;\n-\t }\n-\t if (j >= self->core_num_dim_ix) {\n-\t\tvar_names[j] = signature+i;\n-\t\tself->core_num_dim_ix++;\n-\t }\n-\t self->core_dim_ixs[cur_core_dim] = j;\n-\t cur_core_dim++;\n-\t nd++;\n-\t i = _get_end_of_name(signature, i);\n-\t i = _next_non_white_space(signature, i);\n-\t if (signature[i] != ',' && signature[i] != ')') {\n-\t\tparse_error = \"expect ',' or ')'\";\n-\t\tgoto fail;\n-\t }\n-\t if (signature[i] == ',')\n-\t {\n-\t\ti = _next_non_white_space(signature, i + 1);\n-\t\tif (signature[i] == ')') {\n-\t\t parse_error = \"',' must not be followed by ')'\";\n-\t\t goto fail;\n-\t\t}\n-\t }\n- }\n-\tself->core_num_dims[cur_arg] = nd;\n-\tself->core_offsets[cur_arg] = cur_core_dim-nd;\n-\tcur_arg++;\n-\tnd = 0;\n-\n-\ti = _next_non_white_space(signature, i + 1);\n+ j++;\n+ }\n+ if (j >= self->core_num_dim_ix) {\n+ var_names[j] = signature+i;\n+ self->core_num_dim_ix++;\n+ }\n+ self->core_dim_ixs[cur_core_dim] = j;\n+ cur_core_dim++;\n+ nd++;\n+ i = _get_end_of_name(signature, i);\n+ i = _next_non_white_space(signature, i);\n+ if (signature[i] != ',' && signature[i] != ')') {\n+ parse_error = \"expect ',' or ')'\";\n+ goto fail;\n+ }\n+ if (signature[i] == ',')\n+ {\n+ i = _next_non_white_space(signature, i + 1);\n+ if (signature[i] == ')') {\n+ parse_error = \"',' must not be followed by ')'\";\n+ goto fail;\n+ }\n+ }\n+ }\n+ self->core_num_dims[cur_arg] = nd;\n+ self->core_offsets[cur_arg] = cur_core_dim-nd;\n+ cur_arg++;\n+ nd = 0;\n+\n+ i = _next_non_white_space(signature, i + 1);\n if (cur_arg != self->nin && cur_arg != self->nargs) {\n-\t \/*\n+ \/*\n * The list of input arguments (or output arguments) was\n-\t * only read partially\n+ * only read partially\n *\/\n if (signature[i] != ',') {\n parse_error = \"expect ','\";\n@@ -1036,7 +1036,7 @@\n }\n }\n if (cur_arg != self->nargs) {\n-\tparse_error = \"incomplete signature: not all arguments found\";\n+ parse_error = \"incomplete signature: not all arguments found\";\n goto fail;\n }\n self->core_dim_ixs = _pya_realloc(self->core_dim_ixs,\n@@ -1051,16 +1051,16 @@\n fail:\n _pya_free((void*)var_names);\n if (parse_error) {\n-\tchar *buf = _pya_malloc(sizeof(char) * (len + 200));\n-\tif (buf) {\n-\t sprintf(buf, \"%s at position %d in \\\"%s\\\"\",\n-\t\t parse_error, i, signature);\n-\t PyErr_SetString(PyExc_ValueError, signature);\n-\t _pya_free(buf);\n-\t}\n-\telse {\n-\t PyErr_NoMemory();\n-\t}\n+ char *buf = _pya_malloc(sizeof(char) * (len + 200));\n+ if (buf) {\n+ sprintf(buf, \"%s at position %d in \\\"%s\\\"\",\n+ parse_error, i, signature);\n+ PyErr_SetString(PyExc_ValueError, signature);\n+ _pya_free(buf);\n+ }\n+ else {\n+ PyErr_NoMemory();\n+ }\n }\n return -1;\n }\n@@ -1072,7 +1072,7 @@\n *\/\n static npy_intp*\n _compute_output_dims(PyUFuncLoopObject *loop, int iarg,\n-\t\t int *out_nd, npy_intp *tmp_dims)\n+ int *out_nd, npy_intp *tmp_dims)\n {\n int i;\n PyUFuncObject *ufunc = loop->ufunc;\n@@ -1109,19 +1109,19 @@\n int k = PyArray_NDIM(mps[i]) - ufunc->core_num_dims[i];\n int ind;\n for (ind = 0; ind < ufunc->core_num_dims[i]; ind++, j++, k++) {\n-\tnpy_intp dim = k < 0 ? 1 : PyArray_DIM(mps[i], k);\n-\t\/* First element of core_dim_sizes will be used for looping *\/\n-\tint dim_ix = ufunc->core_dim_ixs[j] + 1;\n-\tif (loop->core_dim_sizes[dim_ix] == 1) {\n-\t \/* broadcast core dimension *\/\n-\t loop->core_dim_sizes[dim_ix] = dim;\n-\t}\n-\telse if (dim != 1 && dim != loop->core_dim_sizes[dim_ix]) {\n-\t PyErr_SetString(PyExc_ValueError, \"core dimensions mismatch\");\n-\t return -1;\n-\t}\n+ npy_intp dim = k < 0 ? 1 : PyArray_DIM(mps[i], k);\n+ \/* First element of core_dim_sizes will be used for looping *\/\n+ int dim_ix = ufunc->core_dim_ixs[j] + 1;\n+ if (loop->core_dim_sizes[dim_ix] == 1) {\n+ \/* broadcast core dimension *\/\n+ loop->core_dim_sizes[dim_ix] = dim;\n+ }\n+ else if (dim != 1 && dim != loop->core_dim_sizes[dim_ix]) {\n+ PyErr_SetString(PyExc_ValueError, \"core dimensions mismatch\");\n+ return -1;\n+ }\n \/* First ufunc->nargs elements will be used for looping *\/\n-\tloop->core_strides[ufunc->nargs + j] =\n+ loop->core_strides[ufunc->nargs + j] =\n dim == 1 ? 0 : PyArray_STRIDE(mps[i], k);\n }\n return 0;\n@@ -1236,8 +1236,8 @@\n \n \/* We don't do strings *\/\n if (flexible && !object) {\n-\tloop->notimplemented = 1;\n-\treturn nargs;\n+ loop->notimplemented = 1;\n+ return nargs;\n }\n \n \/*\n@@ -1265,8 +1265,8 @@\n && (loop->ufunc->nin==2) && (loop->ufunc->nout == 1)) {\n PyObject *_obj = PyTuple_GET_ITEM(args, 1);\n if (!PyArray_CheckExact(_obj)\n-\t \/* If both are same subtype of object arrays, then proceed *\/\n-\t && !(_obj->ob_type == (PyTuple_GET_ITEM(args, 0))->ob_type)\n+ \/* If both are same subtype of object arrays, then proceed *\/\n+ && !(_obj->ob_type == (PyTuple_GET_ITEM(args, 0))->ob_type)\n && PyObject_HasAttrString(_obj, \"__array_priority__\")\n && _has_reflected_op(_obj, loop->ufunc->name)) {\n loop->notimplemented = 1;\n@@ -1290,8 +1290,8 @@\n for (i = 0; i < self->nin; i++) {\n PyArrayObject *ao;\n \n-\t if (_compute_dimension_size(loop, mps, i) < 0) {\n-\t\treturn -1;\n+ if (_compute_dimension_size(loop, mps, i) < 0) {\n+ return -1;\n }\n ao = _trunc_coredim(mps[i], self->core_num_dims[i]);\n if (ao == NULL) {\n@@ -1356,8 +1356,8 @@\n return -1;\n }\n }\n-\tout_dims = _compute_output_dims(loop, i, &out_nd, temp_dims);\n-\tif (!out_dims) {\n+ out_dims = _compute_output_dims(loop, i, &out_nd, temp_dims);\n+ if (!out_dims) {\n return -1;\n }\n if (mps[i]->nd != out_nd\n@@ -1380,8 +1380,8 @@\n PyArray_Descr *ntype;\n \n if (mps[i] == NULL) {\n-\t out_dims = _compute_output_dims(loop, i, &out_nd, temp_dims);\n-\t if (!out_dims) {\n+ out_dims = _compute_output_dims(loop, i, &out_nd, temp_dims);\n+ if (!out_dims) {\n return -1;\n }\n mps[i] = (PyArrayObject *)PyArray_New(subtype,\n@@ -1549,9 +1549,9 @@\n }\n \n if (self->core_enabled && (loop->obj & UFUNC_OBJ_ISOBJECT)) {\n-\tPyErr_SetString(PyExc_TypeError,\n-\t\t\t\"Object type not allowed in ufunc with signature\");\n-\treturn -1;\n+ PyErr_SetString(PyExc_TypeError,\n+ \"Object type not allowed in ufunc with signature\");\n+ return -1;\n }\n if (loop->meth == NO_UFUNCLOOP) {\n loop->meth = ONE_UFUNCLOOP;\n@@ -1582,7 +1582,7 @@\n \n \/* Fill in steps *\/\n if (loop->meth == SIGNATURE_NOBUFFER_UFUNCLOOP && loop->nd == 0) {\n-\t\/* Use default core_strides *\/\n+ \/* Use default core_strides *\/\n }\n else if (loop->meth != ONE_UFUNCLOOP) {\n int ldim;\n@@ -1826,11 +1826,11 @@\n int i;\n \n if (self->ufunc != NULL) {\n-\tif (self->core_dim_sizes) {\n-\t _pya_free(self->core_dim_sizes);\n- }\n-\tif (self->core_strides) {\n-\t _pya_free(self->core_strides);\n+ if (self->core_dim_sizes) {\n+ _pya_free(self->core_dim_sizes);\n+ }\n+ if (self->core_strides) {\n+ _pya_free(self->core_strides);\n }\n for (i = 0; i < self->ufunc->nargs; i++) {\n Py_XDECREF(self->iters[i]);\n@@ -1877,18 +1877,18 @@\n loop->core_strides = NULL;\n \n if (self->core_enabled) {\n-\tint num_dim_ix = 1 + self->core_num_dim_ix;\n-\tint nstrides = self->nargs + self->core_offsets[self->nargs - 1]\n+ int num_dim_ix = 1 + self->core_num_dim_ix;\n+ int nstrides = self->nargs + self->core_offsets[self->nargs - 1]\n + self->core_num_dims[self->nargs - 1];\n-\tloop->core_dim_sizes = _pya_malloc(sizeof(npy_intp)*num_dim_ix);\n-\tloop->core_strides = _pya_malloc(sizeof(npy_intp)*nstrides);\n-\tif (loop->core_dim_sizes == NULL || loop->core_strides == NULL) {\n-\t PyErr_NoMemory();\n-\t goto fail;\n-\t}\n-\tmemset(loop->core_strides, 0, sizeof(npy_intp) * nstrides);\n-\tfor (i = 0; i < num_dim_ix; i++) {\n-\t loop->core_dim_sizes[i] = 1;\n+ loop->core_dim_sizes = _pya_malloc(sizeof(npy_intp)*num_dim_ix);\n+ loop->core_strides = _pya_malloc(sizeof(npy_intp)*nstrides);\n+ if (loop->core_dim_sizes == NULL || loop->core_strides == NULL) {\n+ PyErr_NoMemory();\n+ goto fail;\n+ }\n+ memset(loop->core_strides, 0, sizeof(npy_intp) * nstrides);\n+ for (i = 0; i < num_dim_ix; i++) {\n+ loop->core_dim_sizes[i] = 1;\n }\n }\n name = self->name ? self->name : \"\";\n@@ -2036,9 +2036,9 @@\n return -2;\n }\n if (self->core_enabled && loop->meth != SIGNATURE_NOBUFFER_UFUNCLOOP) {\n-\tPyErr_SetString(PyExc_RuntimeError,\n-\t\t\t\"illegal loop method for ufunc with signature\");\n-\tgoto fail;\n+ PyErr_SetString(PyExc_RuntimeError,\n+ \"illegal loop method for ufunc with signature\");\n+ goto fail;\n }\n \n NPY_LOOP_BEGIN_THREADS;\n@@ -3470,9 +3470,9 @@\n * PyErr_SetString(PyExc_TypeError,\"\");\n * return NULL;\n *\/\n-\t \/* This is expected by at least the ndarray rich_comparisons\n-\t to allow for additional handling for strings. \n-\t *\/\n+ \/* This is expected by at least the ndarray rich_comparisons\n+ to allow for additional handling for strings.\n+ *\/\n Py_INCREF(Py_NotImplemented);\n return Py_NotImplemented;\n }\n@@ -3756,7 +3756,7 @@\n self->core_signature = NULL;\n if (signature != NULL) {\n if (_parse_signature(self, signature) != 0) {\n-\t return NULL;\n+ return NULL;\n }\n }\n return (PyObject *)self;\n"} {"commit":"22e0830cefacb0ee2666c241772d4b4d456dc23d","subject":"Added documentation fixes and comment changes.","message":"Added documentation fixes and comment changes.\n\n\ngit-svn-id: 77a43f9646713b91fea7788fad5dfbf67e151ece@864 94b884b6-d6fd-0310-90d3-974f1d3f35e1\n","repos":"teoliphant\/numpy-refactor,illume\/numpy3k,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,teoliphant\/numpy-refactor,chadnetzer\/numpy-gaurdro,chadnetzer\/numpy-gaurdro,jasonmccampbell\/numpy-refactor-sprint,illume\/numpy3k,chadnetzer\/numpy-gaurdro,Ademan\/NumPy-GSoC,Ademan\/NumPy-GSoC,illume\/numpy3k,jasonmccampbell\/numpy-refactor-sprint,Ademan\/NumPy-GSoC,illume\/numpy3k,efiring\/numpy-work,teoliphant\/numpy-refactor,efiring\/numpy-work,teoliphant\/numpy-refactor,jasonmccampbell\/numpy-refactor-sprint,efiring\/numpy-work,chadnetzer\/numpy-gaurdro,efiring\/numpy-work,Ademan\/NumPy-GSoC","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- scipy_base\/fastumathmodule.c\n+++ scipy_base\/fastumathmodule.c\n@@ -12,7 +12,9 @@\n Also allows comparison operations on complex numbers (just compares\n the real part) and logical operations.\n \n- All logical operations return UBYTE arrays.\n+ All logical operations return UBYTE arrays except for \n+ logical_and, logical_or, and logical_xor\n+ which return their type so that reduce works correctly on them....\n *\/\n \n #if defined _ISOC99_SOURCE || defined _XOPEN_SOURCE_EXTENDED \\\n"} {"commit":"528cacdc0d2ad201b3cd3e172cced187564e3177","subject":"Changed CPPHTTPLIB_THREAD_POOL_COUNT back to 8. (#454)","message":"Changed CPPHTTPLIB_THREAD_POOL_COUNT back to 8. (#454)\n","repos":"yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib,yhirose\/cpp-httplib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- httplib.h\n+++ httplib.h\n@@ -50,7 +50,7 @@\n \n #ifndef CPPHTTPLIB_THREAD_POOL_COUNT\n #define CPPHTTPLIB_THREAD_POOL_COUNT \\\n- ((std::max)(1u, std::thread::hardware_concurrency() - 1))\n+ ((std::max)(8u, std::thread::hardware_concurrency() - 1))\n #endif\n \n \/*\n"} {"commit":"44ee4e28fbca8f3319a3d2fd928b5b62e06a613f","subject":"Update xmemck.c","message":"Update xmemck.c","repos":"endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xmemck\/xmemck.c\n+++ xmemck\/xmemck.c\n@@ -1,6 +1,5 @@\n \/* \n-** Send buffer from stdin to specified service,\n-** i.e. using SRVCNM.\n+** Memory leak tracker\n **\n ** @file xmemck.c\n ** \n"} {"commit":"6539acb2c019f5d82750df040a429a1d113de7a8","subject":"Update systimer.h documentation","message":"Update systimer.h documentation\n","repos":"kmertol\/msp430-evm,kmertol\/msp430-evm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- evm\/include\/systimer.h\n+++ evm\/include\/systimer.h\n@@ -48,6 +48,7 @@\n bool _systimer_new_isr(u16 timeout_ms, tcb_noid_t callback, int id);\n bool _systimer_renew(u16 timeout_ms, tcb_noid_t callback, int id);\n \n+\/***************************** READ FIRST ***********************************\/\n \/* - These functions will return False if they fail to create a new\n * timer instance.\n * - What makes each timer instance unique is their function pointer and\n@@ -60,9 +61,14 @@\n * - The task callbacks should return the next timeout value, returning 0 will\n * end(delete) the task. This is also the only way the tasks should change\n * their timeout inside the callback, they shouldn't use renew on themselves.\n+ * - Generalizing the last sentence above, no timer callback should use renew\n+ * on themselves. For tcb_noid_t, you should use new; for tcb_id_t, you should\n+ * change your return value.\n+ * - Maximum value you should use as a timeout is 30 seconds.\n * - Only systimer_new_isr and systimer_new_task_isr can be called from an isr,\n * systimer_renew and systimer_delete can not.\n *\/\n+\/****************************************************************************\/\n \n \/* Creates a new timer instance, use the isr version when calling this from an isr *\/\n static inline bool systimer_new(u16 timeout_ms, tcb_noid_t callback)\n"} {"commit":"396de731b044578233b7f2f977c876971586e1c0","subject":"PHB3: Remove unnecessary message in phb3_sm_fundamental_reset()","message":"PHB3: Remove unnecessary message in phb3_sm_fundamental_reset()\n\nThis removes below unnecessary message in phb3_sm_fundamental_reset()\nas there already has on subsequent message indicating the situation.\n\n Performing PERST...\n\nAlso, this decreases the outputing level of all messages in this\nfunction to DEBUG.\n\nSigned-off-by: Gavin Shan <0398910e4f4970259b451f0f9d0686cc5e961b81@linux.vnet.ibm.com>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.vnet.ibm.com>\n","repos":"legoater\/skiboot,qemu\/skiboot,open-power\/skiboot,qemu\/skiboot,open-power\/skiboot,legoater\/skiboot,legoater\/skiboot,mikey\/skiboot,csmart\/skiboot,stewart-ibm\/skiboot,legoater\/skiboot,open-power\/skiboot,shenki\/skiboot,csmart\/skiboot,stewart-ibm\/skiboot,csmart\/skiboot,shenki\/skiboot,qemu\/skiboot,qemu\/skiboot,legoater\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,open-power\/skiboot,shenki\/skiboot,mikey\/skiboot,open-power\/skiboot,shenki\/skiboot,shenki\/skiboot,mikey\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb3.c\n+++ hw\/phb3.c\n@@ -2151,7 +2151,7 @@\n \n \t\/* Handle boot time skipping of reset *\/\n \tif (p->skip_perst && p->state == PHB3_STATE_FUNCTIONAL) {\n-\t\tPHBINF(p, \"Cold boot, skipping PERST assertion\\n\");\n+\t\tPHBDBG(p, \"Cold boot, skipping PERST assertion\\n\");\n \t\tp->state = PHB3_STATE_FRESET_ASSERT_DELAY;\n \t\t\/* PERST skipping happens only once *\/\n \t\tp->skip_perst = false;\n@@ -2169,7 +2169,6 @@\n \t\t}\n \n \t\t\/* Assert PERST *\/\n-\t\tPHBINF(p, \"Performing PERST...\\n\");\n \t\treg = in_be64(p->regs + PHB_RESET);\n \t\treg &= ~0x2000000000000000ul;\n \t\tout_be64(p->regs + PHB_RESET, reg);\n"} {"commit":"0f7868260709928e331e428995ffaf5dd9567b69","subject":"phb4: Re-factor phb4_fenced() and introduce phb4_dump_pec_err_regs()","message":"phb4: Re-factor phb4_fenced() and introduce phb4_dump_pec_err_regs()\n\nCouple of places in 'phb4.c' where we may want to dump the PEC's error\nregisters. Hence we introduce a phb4_dump_pec_err_regs() that dumps\nall the PEC error registers and also update phb4->nfir_cache &\nphb4->pfir_cache for later use.\n\nSigned-off-by: Vaibhav Jain <e78384dfaa97bf0f3945c4da4075af8ac33ade0a@linux.ibm.com>\nReviewed-by: Oliver O'Halloran <3dfaff8fa6ae977f042064a112a6aac576279b9b@gmail.com>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.ibm.com>\n","repos":"shenki\/skiboot,shenki\/skiboot,open-power\/skiboot,open-power\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,legoater\/skiboot,qemu\/skiboot,qemu\/skiboot,qemu\/skiboot,open-power\/skiboot,stewart-ibm\/skiboot,stewart-ibm\/skiboot,legoater\/skiboot,qemu\/skiboot,shenki\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot,legoater\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/phb4.c\n+++ hw\/phb4.c\n@@ -2477,54 +2477,18 @@\n \tPHBERR(p, \"%s\\n\", s);\n }\n \n-static void phb4_dump_capp_err_regs(struct phb4 *p)\n-{\n-\tuint64_t fir, apc_master_err, snoop_err, transport_err;\n-\tuint64_t tlbi_err, capp_err_status;\n-\tuint64_t offset = PHB4_CAPP_REG_OFFSET(p);\n-\n-\txscom_read(p->chip_id, CAPP_FIR + offset, &fir);\n-\txscom_read(p->chip_id, CAPP_APC_MASTER_ERR_RPT + offset,\n-\t\t &apc_master_err);\n-\txscom_read(p->chip_id, CAPP_SNOOP_ERR_RTP + offset, &snoop_err);\n-\txscom_read(p->chip_id, CAPP_TRANSPORT_ERR_RPT + offset, &transport_err);\n-\txscom_read(p->chip_id, CAPP_TLBI_ERR_RPT + offset, &tlbi_err);\n-\txscom_read(p->chip_id, CAPP_ERR_STATUS_CTRL + offset, &capp_err_status);\n-\n-\tPHBERR(p, \" CAPP FIR=%016llx\\n\", fir);\n-\tPHBERR(p, \"CAPP APC MASTER ERR=%016llx\\n\", apc_master_err);\n-\tPHBERR(p, \" CAPP SNOOP ERR=%016llx\\n\", snoop_err);\n-\tPHBERR(p, \" CAPP TRANSPORT ERR=%016llx\\n\", transport_err);\n-\tPHBERR(p, \" CAPP TLBI ERR=%016llx\\n\", tlbi_err);\n-\tPHBERR(p, \" CAPP ERR STATUS=%016llx\\n\", capp_err_status);\n-}\n-\n-\/* Check if AIB is fenced via PBCQ NFIR *\/\n-static bool phb4_fenced(struct phb4 *p)\n-{\n-\tuint64_t nfir_p, nfir_p_wof, nfir_n, nfir_n_wof, err_aib;\n+static void phb4_dump_pec_err_regs(struct phb4 *p)\n+{\n+\tuint64_t nfir_p_wof, nfir_n_wof, err_aib;\n \tuint64_t err_rpt0, err_rpt1;\n \n-\t\/* Already fenced ? *\/\n-\tif (p->flags & PHB4_AIB_FENCED)\n-\t\treturn true;\n-\n-\t\/*\n-\t * An all 1's from the PHB indicates a PHB freeze\/fence. We\n-\t * don't really differenciate them at this point.\n-\t *\/\n-\tif (in_be64(p->regs + PHB_CPU_LOADSTORE_STATUS)!= 0xfffffffffffffffful)\n-\t\treturn false;\n-\n-\tPHBERR(p, \"PHB Freeze\/Fence detected !\\n\");\n-\n-\t\/* We read the PCI and NEST FIRs and dump them *\/\n+\t\/* Read the PCI and NEST FIRs and dump them. Also cache PCI\/NEST FIRs *\/\n \txscom_read(p->chip_id,\n-\t\t p->pci_stk_xscom + XPEC_PCI_STK_PCI_FIR, &nfir_p);\n+\t\t p->pci_stk_xscom + XPEC_PCI_STK_PCI_FIR, &p->pfir_cache);\n \txscom_read(p->chip_id,\n \t\t p->pci_stk_xscom + XPEC_PCI_STK_PCI_FIR_WOF, &nfir_p_wof);\n \txscom_read(p->chip_id,\n-\t\t p->pe_stk_xscom + XPEC_NEST_STK_PCI_NFIR, &nfir_n);\n+\t\t p->pe_stk_xscom + XPEC_NEST_STK_PCI_NFIR, &p->nfir_cache);\n \txscom_read(p->chip_id,\n \t\t p->pe_stk_xscom + XPEC_NEST_STK_PCI_NFIR_WOF, &nfir_n_wof);\n \txscom_read(p->chip_id,\n@@ -2534,19 +2498,63 @@\n \txscom_read(p->chip_id,\n \t\t p->pci_stk_xscom + XPEC_PCI_STK_PBAIB_ERR_REPORT, &err_aib);\n \n-\tPHBERR(p, \" PCI FIR=%016llx\\n\", nfir_p);\n+\tPHBERR(p, \" PCI FIR=%016llx\\n\", p->pfir_cache);\n \tPHBERR(p, \" PCI FIR WOF=%016llx\\n\", nfir_p_wof);\n-\tPHBERR(p, \" NEST FIR=%016llx\\n\", nfir_n);\n+\tPHBERR(p, \" NEST FIR=%016llx\\n\", p->nfir_cache);\n \tPHBERR(p, \" NEST FIR WOF=%016llx\\n\", nfir_n_wof);\n \tPHBERR(p, \" ERR RPT0=%016llx\\n\", err_rpt0);\n \tPHBERR(p, \" ERR RPT1=%016llx\\n\", err_rpt1);\n \tPHBERR(p, \" AIB ERR=%016llx\\n\", err_aib);\n+}\n+\n+static void phb4_dump_capp_err_regs(struct phb4 *p)\n+{\n+\tuint64_t fir, apc_master_err, snoop_err, transport_err;\n+\tuint64_t tlbi_err, capp_err_status;\n+\tuint64_t offset = PHB4_CAPP_REG_OFFSET(p);\n+\n+\txscom_read(p->chip_id, CAPP_FIR + offset, &fir);\n+\txscom_read(p->chip_id, CAPP_APC_MASTER_ERR_RPT + offset,\n+\t\t &apc_master_err);\n+\txscom_read(p->chip_id, CAPP_SNOOP_ERR_RTP + offset, &snoop_err);\n+\txscom_read(p->chip_id, CAPP_TRANSPORT_ERR_RPT + offset, &transport_err);\n+\txscom_read(p->chip_id, CAPP_TLBI_ERR_RPT + offset, &tlbi_err);\n+\txscom_read(p->chip_id, CAPP_ERR_STATUS_CTRL + offset, &capp_err_status);\n+\n+\tPHBERR(p, \" CAPP FIR=%016llx\\n\", fir);\n+\tPHBERR(p, \"CAPP APC MASTER ERR=%016llx\\n\", apc_master_err);\n+\tPHBERR(p, \" CAPP SNOOP ERR=%016llx\\n\", snoop_err);\n+\tPHBERR(p, \" CAPP TRANSPORT ERR=%016llx\\n\", transport_err);\n+\tPHBERR(p, \" CAPP TLBI ERR=%016llx\\n\", tlbi_err);\n+\tPHBERR(p, \" CAPP ERR STATUS=%016llx\\n\", capp_err_status);\n+}\n+\n+\/* Check if AIB is fenced via PBCQ NFIR *\/\n+static bool phb4_fenced(struct phb4 *p)\n+{\n+\n+\t\/* Already fenced ? *\/\n+\tif (p->flags & PHB4_AIB_FENCED)\n+\t\treturn true;\n+\n+\t\/*\n+\t * An all 1's from the PHB indicates a PHB freeze\/fence. We\n+\t * don't really differenciate them at this point.\n+\t *\/\n+\tif (in_be64(p->regs + PHB_CPU_LOADSTORE_STATUS)!= 0xfffffffffffffffful)\n+\t\treturn false;\n \n \t\/* Mark ourselves fenced *\/\n \tp->flags |= PHB4_AIB_FENCED;\n \n-\t\/* dump capp error registers in case phb was fenced due to capp *\/\n-\tif (nfir_n & XPEC_NEST_STK_PCI_NFIR_CXA_PE_CAPP)\n+\tPHBERR(p, \"PHB Freeze\/Fence detected !\\n\");\n+\tphb4_dump_pec_err_regs(p);\n+\n+\t\/*\n+\t * dump capp error registers in case phb was fenced due to capp.\n+\t * Expect p->nfir_cache already updated in phb4_dump_pec_err_regs()\n+\t *\/\n+\tif (p->nfir_cache & XPEC_NEST_STK_PCI_NFIR_CXA_PE_CAPP)\n \t\tphb4_dump_capp_err_regs(p);\n \n \tphb4_eeh_dump_regs(p);\n"} {"commit":"bd417cec2c62f72a3a0e6a54e34a62af90842e9f","subject":"TM: Included Connect.h","message":"TM: Included Connect.h\n","repos":"eyyu\/5yearplan,eyyu\/5yearplan","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 5yearplan\/Command.h\n+++ 5yearplan\/Command.h\n@@ -2,11 +2,13 @@\n #include <windows.h>\n #include <stdio.h>\n #include \"winmenu2.h\"\n+#include \"Connect.h\"\n+\n \n char Name[] = \"Wireless communication portal\";\n LPCSTR\tlpszCommName = \"COM5\";\n char comPort[10];\/\/Currently selected COMM PORT\n-HANDLE hComm;\n+\/\/HANDLE hComm;\n char str[80] = \"\";\n bool connected = false;\n OPENFILENAME ofn;\/\/ Structure that contains attachment file info\n@@ -17,9 +19,9 @@\n \/\/Function prototypes\n void generateViews(HINSTANCE, int);\n LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);\n-void selectCommPort(HANDLE, LPCSTR, HWND, bool&);\n-void connect(HANDLE&, LPCSTR, bool&);\n-void disconnect(HANDLE&, bool&, LPCSTR);\n+\/\/void selectCommPort(HANDLE, LPCSTR, HWND, bool&);\n+\/\/void connect(HANDLE&, LPCSTR, bool&);\n+\/\/void disconnect(HANDLE&, bool&, LPCSTR);\n void createUIWindows(HWND);\n void attach(void);\n void availableCOM(HWND);\n@@ -37,20 +39,24 @@\n static const DWORD USERINPUT_TEXTBOX_START_Y = 10;\n static const DWORD READINPUT_TEXTBOX_START_X = 240;\n static const DWORD READINPUT_TEXTBOX_START_Y = 220;\n+static const DWORD STATS_TEXTBOX_START_X = 20;\n+static const DWORD STATS_TEXTBOX_START_Y = 160;\n static const DWORD BUTTON_WIDTH = 100;\n static const DWORD BUTTON_HEIGHT = 30;\n static const DWORD CONNECT_BUTTON_X = 50;\n-static const DWORD CONNECT_BUTTON_Y = 150;\n+static const DWORD CONNECT_BUTTON_Y = 20;\n static const DWORD DISCONNECT_BUTTON_X = 50;\n-static const DWORD DISCONNECT_BUTTON_Y = 250;\n+static const DWORD DISCONNECT_BUTTON_Y = 60;\n static const DWORD ATTACH_BUTTON_X = 50;\n-static const DWORD ATTACH_BUTTON_Y = 350;\n+static const DWORD ATTACH_BUTTON_Y = 100;\n+\n \n \n HDC hdc;\n TEXTMETRIC tm;\n HWND userInputTextBox;\n HWND readInputTextBox;\n+HWND statsTextBox;\n HWND hConnectButton;\n HWND hDisconnectButton;\n-HWND browse;\n+HWND browseButton;\n"} {"commit":"69e617a1bd9beb6ec9751d53a9a91d4c658aae1b","subject":"xive: Don't try to EOI a masked source","message":"xive: Don't try to EOI a masked source\n\nIt will just generate spurious powerbus traffic and ESB state\nchanges.\n\nSigned-off-by: Benjamin Herrenschmidt <a7089bb6e7e92505d88aaff006cbdd60cc9120b6@kernel.crashing.org>\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.vnet.ibm.com>\n","repos":"legoater\/skiboot,shenki\/skiboot,mikey\/skiboot,open-power\/skiboot,open-power\/skiboot,open-power\/skiboot,legoater\/skiboot,qemu\/skiboot,mikey\/skiboot,open-power\/skiboot,shenki\/skiboot,legoater\/skiboot,qemu\/skiboot,legoater\/skiboot,qemu\/skiboot,qemu\/skiboot,shenki\/skiboot,shenki\/skiboot,open-power\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,legoater\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,mikey\/skiboot,stewart-ibm\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/xive.c\n+++ hw\/xive.c\n@@ -1563,9 +1563,21 @@\n {\n \tstruct xive_src *s = container_of(is, struct xive_src, is);\n \tuint32_t idx = isn - s->esb_base;\n+\tstruct xive_ive *ive;\n \tvoid *mmio_base;\n \tuint64_t eoi_val;\n \n+\t\/* Grab the IVE *\/\n+\tive = s->xive->ivt_base;\n+\tif (!ive)\n+\t\treturn;\n+\tive += \tGIRQ_TO_IDX(isn);\n+\n+\t\/* If it's invalid or masked, don't do anything *\/\n+\tif ((ive->w & IVE_MASKED) || !(ive->w & IVE_VALID))\n+\t\treturn;\n+\n+\t\/* Grab MMIO control address for that ESB *\/\n \tmmio_base = s->esb_mmio + (1ull << s->esb_shift) * idx;\n \n \t\/* If the XIVE supports the new \"store EOI facility, use it *\/\n"} {"commit":"8dec0f65b4b2c29729959feabc053c38e6922efc","subject":"btio: Do RFCOMM peer address lookup only when really necessary","message":"btio: Do RFCOMM peer address lookup only when really necessary\n","repos":"mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,mapfau\/bluez,silent-snowman\/bluez,mapfau\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- btio\/btio.c\n+++ btio\/btio.c\n@@ -1196,13 +1196,13 @@\n {\n \tBtIOOption opt = opt1;\n \tstruct sockaddr_rc src, dst;\n+\tgboolean have_dst = FALSE;\n \tint flags;\n \tsocklen_t len;\n \tuint8_t dev_class[3];\n \tuint16_t handle;\n \n-\tif (!get_peers(sock, (struct sockaddr *) &src,\n-\t\t\t\t(struct sockaddr *) &dst, sizeof(src), err))\n+\tif (!get_src(sock, &src, sizeof(src), err))\n \t\treturn FALSE;\n \n \twhile (opt != BT_IO_OPT_INVALID) {\n@@ -1214,9 +1214,19 @@\n \t\t\tbacpy(va_arg(args, bdaddr_t *), &src.rc_bdaddr);\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_DEST:\n+\t\t\tif (!have_dst)\n+\t\t\t\thave_dst = get_dst(sock, &dst, sizeof(dst),\n+\t\t\t\t\t\t\t\t\terr);\n+\t\t\tif (!have_dst)\n+\t\t\t\treturn FALSE;\n \t\t\tba2str(&dst.rc_bdaddr, va_arg(args, char *));\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_DEST_BDADDR:\n+\t\t\tif (!have_dst)\n+\t\t\t\thave_dst = get_dst(sock, &dst, sizeof(dst),\n+\t\t\t\t\t\t\t\t\terr);\n+\t\t\tif (!have_dst)\n+\t\t\t\treturn FALSE;\n \t\t\tbacpy(va_arg(args, bdaddr_t *), &dst.rc_bdaddr);\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_DEFER_TIMEOUT:\n@@ -1234,13 +1244,29 @@\n \t\t\t\treturn FALSE;\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_CHANNEL:\n-\t\t\t*(va_arg(args, uint8_t *)) = src.rc_channel ?\n-\t\t\t\t\tsrc.rc_channel : dst.rc_channel;\n+\t\t\tif (src.rc_channel) {\n+\t\t\t\t*(va_arg(args, uint8_t *)) = src.rc_channel;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\tif (!have_dst)\n+\t\t\t\thave_dst = get_dst(sock, &dst, sizeof(dst),\n+\t\t\t\t\t\t\t\t\terr);\n+\t\t\tif (!have_dst)\n+\t\t\t\treturn FALSE;\n+\n+\t\t\t*(va_arg(args, uint8_t *)) = dst.rc_channel;\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_SOURCE_CHANNEL:\n \t\t\t*(va_arg(args, uint8_t *)) = src.rc_channel;\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_DEST_CHANNEL:\n+\t\t\tif (!have_dst)\n+\t\t\t\thave_dst = get_dst(sock, &dst, sizeof(dst),\n+\t\t\t\t\t\t\t\t\terr);\n+\t\t\tif (!have_dst)\n+\t\t\t\treturn FALSE;\n+\n \t\t\t*(va_arg(args, uint8_t *)) = dst.rc_channel;\n \t\t\tbreak;\n \t\tcase BT_IO_OPT_MASTER:\n"} {"commit":"4730ea9bd524fba47f736c9508f42947f6068b66","subject":"Some cosmetics","message":"Some cosmetics\n","repos":"bgirard\/Ben-s-qcms-fork","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- iccread.c\n+++ iccread.c\n@@ -344,7 +344,8 @@\n #define LUT_MBA_TYPE\t\t0x6d424120 \/\/ 'mBA '\n #define CHROMATIC_TYPE\t\t0x73663332 \/\/ 'sf32'\n \n-static struct matrix read_tag_s15Fixed16ArrayType(struct mem_source *src, struct tag_index index, uint32_t tag_id) {\n+static struct matrix read_tag_s15Fixed16ArrayType(struct mem_source *src, struct tag_index index, uint32_t tag_id)\n+{\n \tstruct tag *tag = find_tag(index, tag_id);\n \tstruct matrix matrix;\n \tif (tag) {\n@@ -859,8 +860,6 @@\n \n static void qcms_profile_fini(qcms_profile *profile)\n {\n-\t\/\/ REVIEW: This is called when some of these values are NULL.\n-\t\/\/ Is free()-ing NULL safe? I was told it was not safe on all platforms.\n \tfree(profile->redTRC);\n \tfree(profile->blueTRC);\n \tfree(profile->greenTRC);\n"} {"commit":"e5596d94b6cc100fc1433b2c100bf75743459da3","subject":"DoublyLinkedList","message":"DoublyLinkedList\n","repos":"iiitv\/algos,iiitv\/algos,iiitv\/algos,iiitv\/algos,iiitv\/algos,iiitv\/algos,iiitv\/algos,iiitv\/algos","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- doubleLinkedList\/doubleLinkedList.c\n+++ doubleLinkedList\/doubleLinkedList.c\n@@ -12,7 +12,7 @@\n \n struct node *createNode(int key)\n {\n-\thead = (struct node *)malloc(sizeof(struct node));\n+\thead = (struct node *)malloc(sizeof(struct node)); \/\/allocate the required space to *node variable\n \thead->data = key;\n \thead->next = NULL;\n \thead->prev = NULL;\n@@ -20,20 +20,19 @@\n \treturn head;\n }\n \n-struct node *additionOfNodeAtBeginning( int key)\n+struct node *additionOfNodeAtBeginning(int key) \/\/adding at the beginning of the linked list\n {\n \tstruct node *temp;\n \ttemp = (struct node *)malloc(sizeof(struct node));\n \ttemp->data = key;\n-\ttemp->next = NULL;\n-\ttemp->next = head;\n-\ttemp->prev = NULL;\n+\ttemp->next = head; \/\/making temp variable point to head of the linked list\n+\ttemp->prev = NULL; \/\/pointing the prev of temp to NULL pointer\n \thead->prev = temp;\n \thead = temp;\n \treturn head;\n }\n \n-struct node *additionOfNodeAtEnding( int key)\n+struct node *additionOfNodeAtEnding(int key) \/\/adding the element at the last of the linked list\n {\n \tstruct node *temp;\n \ttemp = (struct node *)malloc(sizeof(struct node));\n@@ -46,15 +45,20 @@\n \treturn last;\n }\n \n-struct node *additionOfNodeAtRandomeIndex( int key, int index)\n+struct node *additionOfNodeAtRandomeIndex(int key, int index) \/\/adding the element at the given index\n {\n \tstruct node *temp;\n \ttemp = (struct node *)malloc(sizeof(struct node));\n \ttemp->data = key;\n \ttemp->next = NULL;\n-\tstruct node *temp1, *temp2, previous;\n+\tif (index == 0)\n+\t{\n+\t\treturn additionOfNodeAtBeginning(key);\n+\t}\n+\tstruct node *temp1, *temp2;\n \ttemp1 = head;\n \tint i = 0;\n+\t\/\/iterating through the list till the iterator variable is index or list is empty\n \twhile (i < index - 1 && temp1->next != NULL)\n \t{\n \t\ttemp1 = temp1->next;\n@@ -72,52 +76,62 @@\n \treturn head;\n }\n \n-struct node *deletingFromBeginning()\n+struct node *deletingFromBeginning() \/\/deleting the element at head\n {\n \tstruct node *temp;\n \ttemp = head;\n-\thead = head->next;\n+\thead = head->next; \/\/making the head pointer to point the element next to it\n \thead->prev = NULL;\n-\tfree(temp);\n+\tfree(temp); \/\/free the space occupied by former head pointer\n \treturn head;\n }\n \n-struct node *deletingFromEnding()\n+struct node *deletingFromEnding() \/\/deleting the element from the ending\n {\n \tstruct node *temp, *temp2;\n-\ttemp=last->prev;\n-\ttemp2=last;\n-\ttemp->next=NULL;\n-\tlast=temp;\n+\ttemp = last->prev; \/\/temp pointer pointing to the second last element of linked list\n+\ttemp2 = last;\t \/\/temp2 pointing to last element\n+\ttemp->next = NULL;\n+\tlast = temp; \/\/make second last pointer as last element\n \tfree(temp2);\n \treturn head;\n }\n \n-struct node *deletingFromRandomIndex(int index)\n+struct node *deletingFromRandomIndex(int index) \/\/deleting the element from given index\n {\n \tstruct node *temp, *temp2;\n \ttemp = head;\n \tint i = 0;\n-\twhile (i < index - 1)\n+\twhile (temp != NULL && i < index)\n \t{\n \t\ti++;\n \t\ttemp = temp->next;\n \t}\n-\tif (temp->next == NULL)\n+\tif (index == 0)\n+\t{\n+\t\treturn deletingFromBeginning();\n+\t}\n+\telse if (temp == last)\n \t{\n \t\treturn deletingFromEnding();\n \t}\n-\ttemp2 = temp->next;\n-\ttemp2->next->prev = temp;\n-\ttemp->next = temp->next->next;\n-\tfree(temp2);\n+\telse if (temp != NULL) \/\/if temp is NULL the index is out of Bound\n+\t{\n+\t\ttemp->prev->next = temp->next;\n+\t\ttemp->next->prev = temp->prev;\n+\t\tfree(temp);\n+\t}\n+\telse\n+\t{\n+\t\tprintf(\"Index Out Of Bound\\n\"); \/\/index is out of bound\n+\t}\n \treturn head;\n }\n \n-void displayInReverse()\n+void displayInReverse() \/\/display the linked list in reverse order\n {\n \tprintf(\"the Linked List in Reverse Order is \");\n-\tstruct node *temp = last;\n+\tstruct node *temp = last; \/\/creating iterator pointing to the last element\n \twhile (temp != NULL)\n \t{\n \t\tprintf(\"%d \", temp->data);\n@@ -126,10 +140,10 @@\n \tprintf(\"\\n\\n\");\n }\n \n-void display()\n+void display() \/\/display the linked list\n {\n \tprintf(\"the Linked List is \");\n-\tstruct node *temp = head;\n+\tstruct node *temp = head; \/\/creating iterator pointing to the head\n \twhile (temp != NULL)\n \t{\n \t\tprintf(\"%d \", temp->data);\n@@ -141,31 +155,31 @@\n int main()\n {\n \tstruct node *root = NULL;\n+\troot = createNode(4); \/\/ creating the list\n \n-\troot = createNode( 4);\n-\n-\tadditionOfNodeAtBeginning(6);\n-\tadditionOfNodeAtEnding(90);\n+\tadditionOfNodeAtBeginning(6); \/\/adding the value 6 at beginning\n+\tadditionOfNodeAtEnding(90);\t \/\/adding value 90 at last\n \tprintf(\"After adding 90 at last ,\");\n-\tdisplay();\n-\tadditionOfNodeAtRandomeIndex(12,1);\n+\tdisplay(); \/\/display the list\n+\t\/\/index are starting from 0\n+\tadditionOfNodeAtRandomeIndex(12, 1); \/\/adding 12 at index 1\n \tprintf(\"After adding 12 at index 1 ,\");\n \tdisplay();\n \tadditionOfNodeAtBeginning(1);\n \tadditionOfNodeAtEnding(2);\n \tadditionOfNodeAtBeginning(5);\n \tadditionOfNodeAtEnding(98);\n-\tadditionOfNodeAtRandomeIndex(122,2);\n+\tadditionOfNodeAtRandomeIndex(122, 2); \/\/index are starting from 0\n \tdisplay();\n-\tdeletingFromBeginning();\n+\tdeletingFromBeginning(); \/\/deleting the head element\n \tprintf(\"After Deletion from beginning, \");\n \tdisplay();\n-\tdeletingFromEnding();\n+\tdeletingFromEnding(); \/\/deleting the last element from the list\n \tprintf(\"After deleting from end, \");\n \tdisplay();\n-\tdeletingFromRandomIndex(3);\n+\tdeletingFromRandomIndex(3); \/\/deleting the element at index 3(0 is starting index)\n \tprintf(\"After deleting from index 3 ,\");\n \tdisplay();\n \n-\tdisplayInReverse();\n+\tdisplayInReverse(); \/\/display the linked list in reverse order\n }\n"} {"commit":"045d317b9b455b243142d2da0758155e06e9e4c7","subject":"net\/dhcpv4: Use BROADCAST and UNICAST appropriately.","message":"net\/dhcpv4: Use BROADCAST and UNICAST appropriately.\n\nRFC2131 places explict requirements on a client w.r.t which messages\nare broadcast and which are unicast directly to a server. Notable\nrules as they apply to the current dhcpv4 implementation are that\nDISCOVER and a REQUEST in response to an OFFER are broadcast. A\nREQUEST in state RENEWAL is unicast. There are further rules relevant\nto the REBINDING state which is not yet implementated.\n\nAdjust the current implementation that always uses broadcast to use\nunicast as required by RFC2131\n\nChange-Id: I6edef4241bcd74623a804a73415888cd679888d0\nSigned-off-by: Marcus Shawcroft <cf6354583ee83038f2010cbcbe1b1f2adb85107d@arm.com>\n","repos":"fractalclone\/zephyr-riscv,erwango\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,pklazy\/zephyr,aceofall\/zephyr-iotos,holtmann\/zephyr,nashif\/zephyr,galak\/zephyr,galak\/zephyr,runchip\/zephyr-cc3220,galak\/zephyr,zephyriot\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,explora26\/zephyr,aceofall\/zephyr-iotos,holtmann\/zephyr,GiulianoFranchetto\/zephyr,fbsder\/zephyr,erwango\/zephyr,zephyriot\/zephyr,fbsder\/zephyr,mbolivar\/zephyr,finikorg\/zephyr,rsalveti\/zephyr,kraj\/zephyr,erwango\/zephyr,kraj\/zephyr,fbsder\/zephyr,sharronliu\/zephyr,mbolivar\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,holtmann\/zephyr,runchip\/zephyr-cc3200,finikorg\/zephyr,zephyrproject-rtos\/zephyr,fbsder\/zephyr,bboozzoo\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,sharronliu\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,fractalclone\/zephyr-riscv,GiulianoFranchetto\/zephyr,explora26\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,fractalclone\/zephyr-riscv,zephyrproject-rtos\/zephyr,aceofall\/zephyr-iotos,GiulianoFranchetto\/zephyr,punitvara\/zephyr,zephyriot\/zephyr,mbolivar\/zephyr,nashif\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,aceofall\/zephyr-iotos,mbolivar\/zephyr,explora26\/zephyr,explora26\/zephyr,rsalveti\/zephyr,pklazy\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3200,runchip\/zephyr-cc3220,Vudentz\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,sharronliu\/zephyr,ldts\/zephyr,punitvara\/zephyr,nashif\/zephyr,bboozzoo\/zephyr,mbolivar\/zephyr,kraj\/zephyr,sharronliu\/zephyr,rsalveti\/zephyr,fractalclone\/zephyr-riscv,holtmann\/zephyr,rsalveti\/zephyr,galak\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,galak\/zephyr,ldts\/zephyr,nashif\/zephyr,ldts\/zephyr,erwango\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,zephyriot\/zephyr,punitvara\/zephyr,kraj\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3220,bboozzoo\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220,rsalveti\/zephyr,sharronliu\/zephyr,pklazy\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,pklazy\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,bboozzoo\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,pklazy\/zephyr,holtmann\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/net\/ip\/dhcpv4.c\n+++ subsys\/net\/ip\/dhcpv4.c\n@@ -251,7 +251,7 @@\n }\n \n \/* Setup IPv4 + UDP header *\/\n-static void setup_header(struct net_buf *buf)\n+static void setup_header(struct net_buf *buf, const struct in_addr *server_addr)\n {\n \tstruct net_ipv4_hdr *ipv4;\n \tstruct net_udp_hdr *udp;\n@@ -272,7 +272,7 @@\n \tipv4->len[1] = (uint8_t)len;\n \tipv4->chksum = ~net_calc_chksum_ipv4(buf);\n \n-\tnet_ipaddr_copy(&ipv4->dst, net_ipv4_broadcast_address());\n+\tnet_ipaddr_copy(&ipv4->dst, server_addr);\n \n \tlen -= NET_IPV4H_LEN;\n \t\/* Setup UDP header *\/\n@@ -353,6 +353,7 @@\n {\n \tstruct net_buf *buf;\n \tuint32_t timeout;\n+\tconst struct in_addr *server_addr = net_ipv4_broadcast_address();\n \n \tiface->dhcpv4.xid++;\n \n@@ -377,6 +378,9 @@\n \n \t\tbreak;\n \tcase NET_DHCPV4_RENEWING:\n+\t\t\/* UNICAST the DHCPREQUEST *\/\n+\t\tserver_addr = &iface->dhcpv4.server_id;\n+\n \t\t\/* RFC2131 4.4.5 Client MUST NOT include server\n \t\t * identifier in the DHCPREQUEST.\n \t\t *\/\n@@ -388,7 +392,7 @@\n \t\tgoto fail;\n \t}\n \n-\tsetup_header(buf);\n+\tsetup_header(buf, server_addr);\n \n \tif (net_send_data(buf) < 0) {\n \t\tgoto fail;\n@@ -432,7 +436,7 @@\n \t\tgoto fail;\n \t}\n \n-\tsetup_header(buf);\n+\tsetup_header(buf, net_ipv4_broadcast_address());\n \n \tif (net_send_data(buf) < 0) {\n \t\tgoto fail;\n"} {"commit":"e46c8f27ed05f1e76d9d6f08defbeb7f9f6e5ac7","subject":"net: if: Don't check NET_IF_UP in net_if_prepare_events","message":"net: if: Don't check NET_IF_UP in net_if_prepare_events\n\nNET_IF_UP may change during the lifetime of k_pool which means we would\nhave to reconfigure everytime the flag changes but NET_IF_UP is already\nchecked during net_if_send_data thus it should never reach the queue in\nthe first place making this check unnecessary.\n\nJira: ZEP-1888\n\nChange-Id: Iaa8471bee886a6f7e701a1dd243fb199def26589\nSigned-off-by: Luiz Augusto von Dentz <8530c5ea66a1bdbc08f98bfcf183c8be901b5990@intel.com>\n","repos":"Vudentz\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,kraj\/zephyr,fractalclone\/zephyr-riscv,fractalclone\/zephyr-riscv,explora26\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,galak\/zephyr,kraj\/zephyr,ldts\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,mbolivar\/zephyr,aceofall\/zephyr-iotos,explora26\/zephyr,finikorg\/zephyr,nashif\/zephyr,nashif\/zephyr,nashif\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,fractalclone\/zephyr-riscv,rsalveti\/zephyr,Vudentz\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos,ldts\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,bboozzoo\/zephyr,Vudentz\/zephyr,pklazy\/zephyr,pklazy\/zephyr,zephyriot\/zephyr,galak\/zephyr,punitvara\/zephyr,galak\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,pklazy\/zephyr,Vudentz\/zephyr,holtmann\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3200,explora26\/zephyr,punitvara\/zephyr,punitvara\/zephyr,erwango\/zephyr,explora26\/zephyr,finikorg\/zephyr,kraj\/zephyr,zephyrproject-rtos\/zephyr,zephyriot\/zephyr,aceofall\/zephyr-iotos,pklazy\/zephyr,fbsder\/zephyr,fractalclone\/zephyr-riscv,erwango\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,fbsder\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,holtmann\/zephyr,holtmann\/zephyr,bboozzoo\/zephyr,erwango\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,pklazy\/zephyr,galak\/zephyr,bboozzoo\/zephyr,bboozzoo\/zephyr,fractalclone\/zephyr-riscv,nashif\/zephyr,aceofall\/zephyr-iotos,bigdinotech\/zephyr,GiulianoFranchetto\/zephyr,ldts\/zephyr,rsalveti\/zephyr,runchip\/zephyr-cc3220,holtmann\/zephyr,mbolivar\/zephyr,sharronliu\/zephyr,bboozzoo\/zephyr,nashif\/zephyr,rsalveti\/zephyr,aceofall\/zephyr-iotos,GiulianoFranchetto\/zephyr,mbolivar\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,sharronliu\/zephyr,holtmann\/zephyr,runchip\/zephyr-cc3200,runchip\/zephyr-cc3220,erwango\/zephyr,runchip\/zephyr-cc3200,finikorg\/zephyr,fbsder\/zephyr,sharronliu\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,bigdinotech\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,ldts\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3220,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/net\/ip\/net_if.c\n+++ subsys\/net\/ip\/net_if.c\n@@ -176,10 +176,6 @@\n \tint ev_count = 0;\n \n \tfor (iface = __net_if_start; iface != __net_if_end; iface++) {\n-\t\tif (!atomic_test_bit(iface->flags, NET_IF_UP)) {\n-\t\t\tcontinue;\n-\t\t}\n-\n \t\tk_poll_event_init(&__net_if_event_start[ev_count],\n \t\t\t\t K_POLL_TYPE_FIFO_DATA_AVAILABLE,\n \t\t\t\t K_POLL_MODE_NOTIFY_ONLY,\n"} {"commit":"85448aef371d2b78b23d78a4e563f7d0f5ca66a9","subject":"https:\/\/pt.stackoverflow.com\/q\/542576\/101","message":"https:\/\/pt.stackoverflow.com\/q\/542576\/101","repos":"maniero\/SOpt,maniero\/SOpt,maniero\/SOpt,maniero\/SOpt,bigown\/SOpt,bigown\/SOpt,bigown\/SOpt,maniero\/SOpt,maniero\/SOpt,maniero\/SOpt,bigown\/SOpt,bigown\/SOpt,maniero\/SOpt,bigown\/SOpt,maniero\/SOpt,maniero\/SOpt,bigown\/SOpt,maniero\/SOpt,maniero\/SOpt,maniero\/SOpt,bigown\/SOpt,maniero\/SOpt,maniero\/SOpt,maniero\/SOpt,bigown\/SOpt,bigown\/SOpt","returncode":1,"stderr":"error: pathspec 'C\/Pointer\/Copy.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- C\/Pointer\/Copy.c\n+++ C\/Pointer\/Copy.c\n@@ -0,0 +1,10 @@\n+#include <stdio.h>\n+\n+int main() {\n+ int p1 = 10;\n+ int *p2 = &p1;\n+ int *ptr = p2;\n+ printf(\"%i\\n%i\\n%i\\n%p\", *p2, *ptr, p1, (void *)p2);\n+}\n+\n+\/\/https:\/\/pt.stackoverflow.com\/q\/542576\/101\n"} {"commit":"65e219dde300cecd50ca5e343ccd98750c05fb35","subject":"Fix a warning. > webkit_support_gfx.h:41:8: warning: extra tokens at end of #endif directive","message":"Fix a warning.\n> webkit_support_gfx.h:41:8: warning: extra tokens at end of #endif directive\n\nBUG=none\nTEST=none\nReview URL: http:\/\/codereview.chromium.org\/3303026\n\ngit-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@59307 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n","repos":"wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- webkit\/support\/webkit_support_gfx.h\n+++ webkit\/support\/webkit_support_gfx.h\n@@ -38,4 +38,4 @@\n \n } \/\/ namespace webkit_support\n \n-#endif WEBKIT_SUPPORT_WEBKIT_SUPPORT_GFX_H_\n+#endif \/\/ WEBKIT_SUPPORT_WEBKIT_SUPPORT_GFX_H_\n"} {"commit":"13386c1fd34834b6c9d46d36c43616b623736a93","subject":"tools: add the missing s390\/s390x support to scmp_bpf_disasm","message":"tools: add the missing s390\/s390x support to scmp_bpf_disasm\n\nSigned-off-by: Paul Moore <88a1d58bf22a647dce58dd91f9595600dceabba9@redhat.com>\n","repos":"seccomp\/libseccomp,seccomp\/libseccomp,seccomp\/libseccomp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/scmp_bpf_disasm.c\n+++ tools\/scmp_bpf_disasm.c\n@@ -492,6 +492,10 @@\n \t\t\t\tarch = AUDIT_ARCH_PPC64LE;\n \t\t\telse if (strcmp(optarg, \"ppc\") == 0)\n \t\t\t\tarch = AUDIT_ARCH_PPC;\n+\t\t\telse if (strcmp(optarg, \"s390\") == 0)\n+\t\t\t\tarch = AUDIT_ARCH_S390;\n+\t\t\telse if (strcmp(optarg, \"s390x\") == 0)\n+\t\t\t\tarch = AUDIT_ARCH_S390X;\n \t\t\telse\n \t\t\t\texit_usage(argv[0]);\n \t\t\tbreak;\n"} {"commit":"e062813b7d5df9d605bc349d8fdf36230508e040","subject":"edited test uart code initialization to be more detailed.","message":"edited test uart code initialization to be more detailed.\n","repos":"hsean\/ECE-411-Practicum,hsean\/ECE-411-Practicum,hsean\/ECE-411-Practicum,hsean\/ECE-411-Practicum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Code\/test_uart.c\n+++ Code\/test_uart.c\n@@ -16,10 +16,10 @@\n \twhile (1) {\n \t\t\/\/PORTD |= (1<<PORTD1); \/\/ drive PD1 high\n \t\tUSARTservoPos(1250,0x05);\n-\t\t_delay_ms(500); \/\/ delay 10 ms\n+\t\t_delay_ms(500); \/\/ delay 500 ms\n \t\t\/\/PORTD &= ~(1<<PORTD1); \/\/ drive PD1 low\n \t\tUSARTservoPos(1750,0x05);\n-\t\t_delay_ms(500); \/\/ delay 10 ms\n+\t\t_delay_ms(500); \/\/ delay 500 ms\n \t}\n }\n \n@@ -43,12 +43,21 @@\n \tUBRR0H = (unsigned char) (myubrr>>8); \/\/get most significant byte\n \tUBRR0L = (unsigned char) myubrr; \/\/get least significant byte\n \t\n-\t\/\/enable transmitter\n-\tUCSR0B = (1 << TXEN0) | (0 << RXEN0); \/\/write 1 to tx enable bit, 0 to rx enable bit, in usart control and status register b\n+\t\/\/USART control and status register: enable transmitter, disable receiver, write character size bit 2 to 0 (for 8 bit character size)\n+\tUCSR0B = (1 << TXEN0) | \/\/write 1 to tx enable bit (enable it)\n+ (0 << RXEN0) | \/\/0 to rx enable bit (disable it)\n+ (0 << UCSZ02); \/\/character size bit 2 = 0;\n \t\n-\t\/\/set frame format: 8 data, 1 stop bit\n-\tUCSR0C = (0 << USBS0) | (3 << UCSZ00) | (0 << UPM00) | (0 << UPM01); \/\/write 0 into stop bit select bit (1 stop bit), 3 into character size bits (8-bit data size)\n-\t\n+\t\/\/set frame format: 8 data, 1 stop bit, parity mode disabled, asynchronous usart\n+\tUCSR0C = (0 << USBS0) | \/\/write 0 int stop bit select bit (1 stop bit)\n+ (1 << UCSZ00) | \/\/0x03 into character size bits (8-bit data size) bit 0 = 1\n+ (1 << UCSZ01) | \/\/ bit 1 = 1\n+ (0 << UPM00) | \/\/parity mode disabled: bit 0 = 0\n+ (0 << UPM01) | \/\/parity mode disabled: bit 1 = 0\n+\t (0 << UMSEL01) | \/\/asynchronous USART mode of operation for USART bit 1 = 0\n+ (0 << UMSEL00) | \/\/ bit 0 = 0\n+ (0 << UCPOL0); \/\/write 0 to clock parity bit (0 when asynchronous mode is used)\n+\n \treturn;\n }\n \n"} {"commit":"32508ee82576f871ba74ab5082124398adc02a30","subject":"Drop an unused variable","message":"Drop an unused variable\n","repos":"chergert\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,Lyude\/gtk-,ebassi\/gtk,jessevdk\/gtk,jadahl\/gtk,ahodesuka\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,ahodesuka\/gtk,chergert\/gtk,alexlarsson\/gtk,jadahl\/gtk,msteinert\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,jigpu\/gtk,jadahl\/gtk,ahodesuka\/gtk,jessevdk\/gtk,jessevdk\/gtk,alexlarsson\/gtk,chergert\/gtk,Lyude\/gtk-,ebassi\/gtk,alexlarsson\/gtk,davidt\/gtk,jigpu\/gtk,bratsche\/gtk-,alexlarsson\/gtk,davidt\/gtk,Adamovskiy\/gtk,jadahl\/gtk,Distrotech\/gtk2,bratsche\/gtk-,Lyude\/gtk-,Lyude\/gtk-,Distrotech\/gtk2,Adamovskiy\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,davidgumberg\/gtk,jadahl\/gtk,jigpu\/gtk,Distrotech\/gtk2,Lyude\/gtk-,davidt\/gtk,chergert\/gtk,alexlarsson\/gtk,chergert\/gtk,jessevdk\/gtk,davidgumberg\/gtk,bratsche\/gtk-,grubersjoe\/adwaita,jigpu\/gtk,ahodesuka\/gtk,jigpu\/gtk,Lyude\/gtk-,jadahl\/gtk,ahodesuka\/gtk,jadahl\/gtk,davidt\/gtk,Adamovskiy\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,ebassi\/gtk,chergert\/gtk,Adamovskiy\/gtk,ebassi\/gtk,jadahl\/gtk,grubersjoe\/adwaita,msteinert\/gtk,jigpu\/gtk,msteinert\/gtk,grubersjoe\/adwaita,jigpu\/gtk,Sidnioulz\/SandboxGtk,davidt\/gtk,jigpu\/gtk,davidt\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,davidgumberg\/gtk,grubersjoe\/adwaita,chergert\/gtk,jessevdk\/gtk,bratsche\/gtk-,bratsche\/gtk-,Sidnioulz\/SandboxGtk,msteinert\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,ebassi\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,Distrotech\/gtk2,ahodesuka\/gtk,davidgumberg\/gtk,msteinert\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,chergert\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,bratsche\/gtk-,jessevdk\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/bloatpad.c\n+++ examples\/bloatpad.c\n@@ -50,7 +50,6 @@\n GFile *file)\n {\n GtkWidget *window, *button, *grid, *scrolled, *view;\n- GtkWidget *menu;\n \n window = gtk_application_window_new (GTK_APPLICATION (app));\n g_action_map_add_action_entries (G_ACTION_MAP (window), win_entries, G_N_ELEMENTS (win_entries), window);\n@@ -220,7 +219,7 @@\n static void\n bloat_pad_class_init (BloatPadClass *class)\n {\n- G_OBJECT_CLASS (class)->finalize= bloat_pad_finalize;\n+ G_OBJECT_CLASS (class)->finalize = bloat_pad_finalize;\n \n G_APPLICATION_CLASS (class)->activate = bloat_pad_activate;\n G_APPLICATION_CLASS (class)->open = bloat_pad_open;\n"} {"commit":"7b4cc9bbfda949f198e6050f0e9341eda09a9aff","subject":"Fix memory leak","message":"Fix memory leak\n","repos":"GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg,GNOME\/librsvg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk-pixbuf-loader\/io-svg.c\n+++ gdk-pixbuf-loader\/io-svg.c\n@@ -131,6 +131,7 @@\n }\n \n if (!rsvg_handle_write (context->handle, buf, size, error)) {\n+ g_clear_pointer(error, g_error_free);\n rsvg_propagate_error (error, _(\"Error writing\"), ERROR_WRITING);\n return FALSE;\n }\n"} {"commit":"8ec0cfd571da29b02dbdd3464cd9508ebec4cac1","subject":"bloatpad: adjust to G(tk)Application 'quit' change","message":"bloatpad: adjust to G(tk)Application 'quit' change\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=670485\n","repos":"grubersjoe\/adwaita,Adamovskiy\/gtk,msteinert\/gtk,Adamovskiy\/gtk,jadahl\/gtk,davidt\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,davidt\/gtk,jessevdk\/gtk,chergert\/gtk,chergert\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,alexlarsson\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,jadahl\/gtk,Distrotech\/gtk2,bratsche\/gtk-,chergert\/gtk,jadahl\/gtk,jigpu\/gtk,bratsche\/gtk-,alexlarsson\/gtk,Distrotech\/gtk2,davidt\/gtk,Distrotech\/gtk2,Lyude\/gtk-,davidgumberg\/gtk,jadahl\/gtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,jigpu\/gtk,grubersjoe\/adwaita,Distrotech\/gtk2,jigpu\/gtk,Adamovskiy\/gtk,davidt\/gtk,davidgumberg\/gtk,Lyude\/gtk-,jigpu\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,jigpu\/gtk,ebassi\/gtk,Adamovskiy\/gtk,chergert\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,ebassi\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,chergert\/gtk,Lyude\/gtk-,ebassi\/gtk,davidgumberg\/gtk,jessevdk\/gtk,bratsche\/gtk-,bratsche\/gtk-,ebassi\/gtk,jigpu\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,Lyude\/gtk-,jigpu\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,grubersjoe\/adwaita,msteinert\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jessevdk\/gtk,chergert\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,jessevdk\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,ebassi\/gtk,jadahl\/gtk,jigpu\/gtk,jadahl\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,ebassi\/gtk,bratsche\/gtk-,Lyude\/gtk-,ahodesuka\/gtk,msteinert\/gtk,Lyude\/gtk-,jadahl\/gtk,bratsche\/gtk-,Lyude\/gtk-,ahodesuka\/gtk,msteinert\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,chergert\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,davidt\/gtk,jessevdk\/gtk,chergert\/gtk,grubersjoe\/adwaita,davidt\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/bloatpad.c\n+++ examples\/bloatpad.c\n@@ -225,33 +225,13 @@\n }\n \n static void\n-quit_app (GtkApplication *app)\n-{\n- GList *list, *next;\n- GtkWindow *win;\n-\n- g_print (\"Going down...\\n\");\n-\n- list = gtk_application_get_windows (app);\n- while (list)\n- {\n- win = list->data;\n- next = list->next;\n-\n- gtk_widget_destroy (GTK_WIDGET (win));\n-\n- list = next;\n- }\n-}\n-\n-static void\n quit_activated (GSimpleAction *action,\n GVariant *parameter,\n gpointer user_data)\n {\n- GtkApplication *app = user_data;\n-\n- quit_app (app);\n+ GApplication *app = user_data;\n+\n+ g_application_quit (app);\n }\n \n static GActionEntry app_entries[] = {\n@@ -347,14 +327,6 @@\n \n }\n \n-static void\n-quit_cb (GtkApplication *app)\n-{\n- g_print (\"Session manager to us to quit\\n\");\n-\n- quit_app (app);\n-}\n-\n BloatPad *\n bloat_pad_new (void)\n {\n@@ -371,8 +343,6 @@\n \"register-session\", TRUE,\n NULL);\n \n- g_signal_connect (bloat_pad, \"quit\", G_CALLBACK (quit_cb), NULL);\n-\n return bloat_pad;\n }\n \n"} {"commit":"1f61b30a1f217fd560906d462b87a27b2b6655c8","subject":"gdk-pixbuf-io: treat application\/gzip like text\/plain","message":"gdk-pixbuf-io: treat application\/gzip like text\/plain\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=648815\n","repos":"GNOME\/gdk-pixbuf,Distrotech\/gdk-pixbuf,GNOME\/gdk-pixbuf,Distrotech\/gdk-pixbuf,GNOME\/gdk-pixbuf,Distrotech\/gdk-pixbuf,Distrotech\/gdk-pixbuf,GNOME\/gdk-pixbuf,Distrotech\/gdk-pixbuf","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk-pixbuf\/gdk-pixbuf-io.c\n+++ gdk-pixbuf\/gdk-pixbuf-io.c\n@@ -894,7 +894,7 @@\n gboolean uncertain;\n \n mime_type = g_content_type_guess (NULL, buffer, size, &uncertain);\n- if ((uncertain || g_str_equal (mime_type, \"text\/plain\")) && filename != NULL) {\n+ if ((uncertain || g_str_equal (mime_type, \"text\/plain\") || g_str_equal (mime_type, \"application\/gzip\")) && filename != NULL) {\n g_free (mime_type);\n mime_type = g_content_type_guess (filename, buffer, size, NULL);\n }\n"} {"commit":"afc666462b67bb43075fe3b34c8855ae3869ad07","subject":"Enable static compilation of Netty TCNative","message":"Enable static compilation of Netty TCNative\n\nMotivation:\n\nJava8 Allows for rolling multiple JNI modules into a single blob\nby using a namespace after JNI_Onload. This was done for\nnetty-tcnative in cf8d01b1ec6872c5ae2530cc40cecdd2caa37ff8.\n\nHowever, in the recent commit to make it shading aware, this\nfunctionality was lost.\n\nModifications:\nThis PR reintroduces the ability to load netty-tcnative.\nAdditionally, since loading native code this way can be done\nwithout shading, the preprocessor define `TCN_NOT_DYNAMIC` is\nadded to disable the `dlopen` calls to find the true name.\n\nResult:\nJava8 compilation continues to work.\n","repos":"netty\/netty-tcnative,netty\/netty-tcnative,netty\/netty-tcnative,netty\/netty-tcnative","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- openssl-dynamic\/src\/main\/c\/jnilib.c\n+++ openssl-dynamic\/src\/main\/c\/jnilib.c\n@@ -357,12 +357,14 @@\n netty_internal_tcnative_SSLContext_JNI_OnUnLoad(env);\n }\n \n-jint JNI_OnLoad(JavaVM* vm, void* reserved) {\n+\/\/ JNI Wrapper for statically built Java 8 deps\n+jint JNI_OnLoad_netty_tcnative(JavaVM* vm, void* reserved) {\n JNIEnv* env;\n if ((*vm)->GetEnv(vm, (void**) &env, TCN_JNI_VERSION) != JNI_OK) {\n return JNI_ERR;\n }\n \n+#ifndef TCN_NOT_DYNAMIC\n jint status = 0;\n const char* name = NULL;\n #ifndef WIN32\n@@ -408,8 +410,12 @@\n fprintf(stderr, \"FATAL: netty-tcnative encountered unexpected library path: %s\\n\", name);\n return JNI_ERR;\n }\n+#else\n+ (void)parsePackagePrefix;\n+ char* packagePrefix = NULL;\n+#endif\n+\n tcn_global_vm = vm;\n-\n jint ret = netty_internal_tcnative_Library_JNI_OnLoad(env, packagePrefix);\n \n if (packagePrefix != NULL) {\n@@ -420,7 +426,11 @@\n return ret;\n }\n \n-void JNI_OnUnload(JavaVM* vm, void* reserved) {\n+jint JNI_OnLoad(JavaVM* vm, void* reserved) {\n+ return JNI_OnLoad_netty_tcnative(vm, reserved);\n+}\n+\n+void JNI_OnUnload_netty_tcnative(JavaVM* vm, void* reserved) {\n JNIEnv* env;\n if ((*vm)->GetEnv(vm, (void**) &env, TCN_JNI_VERSION) != JNI_OK) {\n \/\/ Something is wrong but nothing we can do about this :(\n@@ -428,3 +438,7 @@\n }\n netty_internal_tcnative_Library_JNI_OnUnLoad(env);\n }\n+\n+void JNI_OnUnload(JavaVM* vm, void* reserved) {\n+ JNI_OnUnload_netty_tcnative(vm, reserved);\n+}\n"} {"commit":"8d60a2090474236bf8afa0ab3e47003908359568","subject":"[support] Minor formatting changes.","message":"[support] Minor formatting changes.\n","repos":"mono\/Embeddinator-4000,mono\/Embeddinator-4000,mono\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,mono\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,mono\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000,mono\/Embeddinator-4000,mono\/Embeddinator-4000,jonathanpeppers\/Embeddinator-4000","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- support\/mono-support.h\n+++ support\/mono-support.h\n@@ -77,6 +77,9 @@\n typedef void * gpointer;\n typedef uint16_t gunichar2;\n \n+typedef struct _GArray GArray;\n+typedef struct _GString GString;\n+\n \/* This is copied from mono's header files *\/\n \n \/* utils\/mono-publib.h *\/\n@@ -90,10 +93,6 @@\n typedef struct _MonoAssembly MonoAssembly;\n typedef struct _MonoAssemblyName MonoAssemblyName;\n typedef struct _MonoImage MonoImage;\n-\n-\n-typedef struct _GArray GArray;\n-typedef struct _GString GString;\n \n \/* metadata\/metadata.h *\/\n typedef struct _MonoClass MonoClass;\n@@ -116,13 +115,13 @@\n typedef MonoMethodDesc* (*_mono_method_desc_new_fptr) (const char *name, mono_bool include_namespace);\n typedef void (*_mono_method_desc_free_fptr) (MonoMethodDesc *desc);\n typedef MonoMethod* (*_mono_method_desc_search_in_class_fptr) (MonoMethodDesc *desc, MonoClass *klass);\n-typedef void (*_mono_jit_cleanup_fptr) (MonoDomain *domain);\n-typedef MonoAssembly* (*_mono_domain_assembly_open_fptr) (MonoDomain *domain, const char *name);\n+typedef void (*_mono_jit_cleanup_fptr) (MonoDomain *domain);\n+typedef MonoAssembly* (*_mono_domain_assembly_open_fptr) (MonoDomain *domain, const char *name);\n typedef int (*_mono_string_length_fptr) (MonoString *s);\n-typedef mono_unichar2* (*_mono_string_chars_fptr) (MonoString *s);\n+typedef mono_unichar2* (*_mono_string_chars_fptr) (MonoString *s);\n typedef MonoObject* (*_mono_field_get_value_object_fptr) (MonoDomain *domain, MonoClassField *field, MonoObject *obj);\n typedef void (*_mono_field_set_value_fptr) (MonoObject *obj, MonoClassField *field, void *value);\n-typedef MonoVTable* (*_mono_class_vtable_fptr) (MonoDomain *domain, MonoClass *klass);\n+typedef MonoVTable* (*_mono_class_vtable_fptr) (MonoDomain *domain, MonoClass *klass);\n typedef void (*_mono_field_static_set_value_fptr) (MonoVTable *vt, MonoClassField *field, void *value);\n typedef MonoString* (*_mono_object_to_string_fptr) (MonoObject *obj, MonoObject **exc);\n typedef MonoClass* (*_mono_class_get_fptr) (MonoImage *image, uint32_t type_token);\n"} {"commit":"1d16cfb3aeba71bc6ecf2d19ccbabed0426e5c22","subject":"clocksource: tegra20: use the device_node pointer passed to init","message":"clocksource: tegra20: use the device_node pointer passed to init\n\nWe've already matched the node, so use the node pointer passed in. The rtc\ninit was intermingled with the timer init, so split this out to a separate\ninit function.\n\nSigned-off-by: Rob Herring <rob.herring@calxeda.com>\n\nCc: John Stultz <2dbbc9a029f6af74f2c2786ce8fa25d932fcaf8c@us.ibm.com>\nCc: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nReviewed-by: Stephen Warren <5ef2a23ba3aff51d1cfc8c113c1ec34b608b3b13@nvidia.com>\nTested-by: Stephen Warren <5ef2a23ba3aff51d1cfc8c113c1ec34b608b3b13@nvidia.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/clocksource\/tegra20_timer.c\n+++ drivers\/clocksource\/tegra20_timer.c\n@@ -154,27 +154,11 @@\n \t.dev_id\t\t= &tegra_clockevent,\n };\n \n-static const struct of_device_id timer_match[] __initconst = {\n-\t{ .compatible = \"nvidia,tegra20-timer\" },\n-\t{}\n-};\n-\n-static const struct of_device_id rtc_match[] __initconst = {\n-\t{ .compatible = \"nvidia,tegra20-rtc\" },\n-\t{}\n-};\n-\n static void __init tegra20_init_timer(struct device_node *np)\n {\n \tstruct clk *clk;\n \tunsigned long rate;\n \tint ret;\n-\n-\tnp = of_find_matching_node(NULL, timer_match);\n-\tif (!np) {\n-\t\tpr_err(\"Failed to find timer DT node\\n\");\n-\t\tBUG();\n-\t}\n \n \ttimer_reg_base = of_iomap(np, 0);\n \tif (!timer_reg_base) {\n@@ -199,11 +183,50 @@\n \n \tof_node_put(np);\n \n-\tnp = of_find_matching_node(NULL, rtc_match);\n-\tif (!np) {\n-\t\tpr_err(\"Failed to find RTC DT node\\n\");\n-\t\tBUG();\n-\t}\n+\tswitch (rate) {\n+\tcase 12000000:\n+\t\ttimer_writel(0x000b, TIMERUS_USEC_CFG);\n+\t\tbreak;\n+\tcase 13000000:\n+\t\ttimer_writel(0x000c, TIMERUS_USEC_CFG);\n+\t\tbreak;\n+\tcase 19200000:\n+\t\ttimer_writel(0x045f, TIMERUS_USEC_CFG);\n+\t\tbreak;\n+\tcase 26000000:\n+\t\ttimer_writel(0x0019, TIMERUS_USEC_CFG);\n+\t\tbreak;\n+\tdefault:\n+\t\tWARN(1, \"Unknown clock rate\");\n+\t}\n+\n+\tsetup_sched_clock(tegra_read_sched_clock, 32, 1000000);\n+\n+\tif (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,\n+\t\t\"timer_us\", 1000000, 300, 32, clocksource_mmio_readl_up)) {\n+\t\tpr_err(\"Failed to register clocksource\\n\");\n+\t\tBUG();\n+\t}\n+\n+\tret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);\n+\tif (ret) {\n+\t\tpr_err(\"Failed to register timer IRQ: %d\\n\", ret);\n+\t\tBUG();\n+\t}\n+\n+\ttegra_clockevent.cpumask = cpu_all_mask;\n+\ttegra_clockevent.irq = tegra_timer_irq.irq;\n+\tclockevents_config_and_register(&tegra_clockevent, 1000000,\n+\t\t\t\t\t0x1, 0x1fffffff);\n+#ifdef CONFIG_HAVE_ARM_TWD\n+\ttwd_local_timer_of_register();\n+#endif\n+}\n+CLOCKSOURCE_OF_DECLARE(tegra20_timer, \"nvidia,tegra20-timer\", tegra20_init_timer);\n+\n+static void __init tegra20_init_rtc(struct device_node *np)\n+{\n+\tstruct clk *clk;\n \n \trtc_base = of_iomap(np, 0);\n \tif (!rtc_base) {\n@@ -223,47 +246,9 @@\n \n \tof_node_put(np);\n \n-\tswitch (rate) {\n-\tcase 12000000:\n-\t\ttimer_writel(0x000b, TIMERUS_USEC_CFG);\n-\t\tbreak;\n-\tcase 13000000:\n-\t\ttimer_writel(0x000c, TIMERUS_USEC_CFG);\n-\t\tbreak;\n-\tcase 19200000:\n-\t\ttimer_writel(0x045f, TIMERUS_USEC_CFG);\n-\t\tbreak;\n-\tcase 26000000:\n-\t\ttimer_writel(0x0019, TIMERUS_USEC_CFG);\n-\t\tbreak;\n-\tdefault:\n-\t\tWARN(1, \"Unknown clock rate\");\n-\t}\n-\n-\tsetup_sched_clock(tegra_read_sched_clock, 32, 1000000);\n-\n-\tif (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,\n-\t\t\"timer_us\", 1000000, 300, 32, clocksource_mmio_readl_up)) {\n-\t\tpr_err(\"Failed to register clocksource\\n\");\n-\t\tBUG();\n-\t}\n-\n-\tret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);\n-\tif (ret) {\n-\t\tpr_err(\"Failed to register timer IRQ: %d\\n\", ret);\n-\t\tBUG();\n-\t}\n-\n-\ttegra_clockevent.cpumask = cpu_all_mask;\n-\ttegra_clockevent.irq = tegra_timer_irq.irq;\n-\tclockevents_config_and_register(&tegra_clockevent, 1000000,\n-\t\t\t\t\t0x1, 0x1fffffff);\n-#ifdef CONFIG_HAVE_ARM_TWD\n-\ttwd_local_timer_of_register();\n-#endif\n \tregister_persistent_clock(NULL, tegra_read_persistent_clock);\n }\n-CLOCKSOURCE_OF_DECLARE(tegra20, \"nvidia,tegra20-timer\", tegra20_init_timer);\n+CLOCKSOURCE_OF_DECLARE(tegra20_rtc, \"nvidia,tegra20-rtc\", tegra20_init_rtc);\n \n #ifdef CONFIG_PM\n static u32 usec_config;\n"} {"commit":"bc90aa197d277fe3117f7f594433210b1535f986","subject":"dummyradio: always receives KA in every slot","message":"dummyradio: always receives KA in every slot\n","repos":"herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old,herrfz\/RIOT-old","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/dummyradio\/dummyradio_spi.c\n+++ drivers\/dummyradio\/dummyradio_spi.c\n@@ -68,7 +68,7 @@\n if (fifopointer > sizeof(beacon)) fifopointer = 0;\n memcpy(data, &beacon[fifopointer], length);\n bccount--;\n- } else if (rxcount%29 == 0 || rxcount%29==1) { \/\/ receives KA only after 29 counts \n+ } else if (rxcount%2 == 0 || rxcount%2==1) { \/\/ ALWAYS receive KA in every slot\n if (fifopointer > sizeof(fifo_reg)) fifopointer = 0;\n memcpy(data, &fifo_reg[fifopointer], length);\n }\n"} {"commit":"22c59960d9fe72f3fbd28de69cc43c5522dd5fe6","subject":"drm\/i915: fix i915_interrupt_info on BDW","message":"drm\/i915: fix i915_interrupt_info on BDW\n\nCurrently, if the machine is runtime suspended an you read the file,\nyou will get an \"Unclaimed register\" error message.\n\nTestcase: igt\/pm_rpm\/debugfs-read\nSigned-off-by: Paulo Zanoni <cc0e04a2103c45cd195651d976f79813d0f66bdf@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"6a994761806388ad99f581d2063e3308d8d77f01","subject":"drm\/i915: Remove stale code","message":"drm\/i915: Remove stale code\n\nLooks like a some remnant from a rebase.\n\nSigned-off-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/i915_gem_gtt.c\n+++ drivers\/gpu\/drm\/i915\/i915_gem_gtt.c\n@@ -815,7 +815,6 @@\n {\n \tstruct drm_i915_private *dev_priv = dev->dev_private;\n \tstruct i915_gtt *gtt = &dev_priv->gtt;\n-\tunsigned long gtt_size;\n \tint ret;\n \n \tif (INTEL_INFO(dev)->gen <= 5) {\n@@ -832,8 +831,6 @@\n \t\t\t\t >t->mappable_end);\n \tif (ret)\n \t\treturn ret;\n-\n-\tgtt_size = (dev_priv->gtt.total >> PAGE_SHIFT) * sizeof(gen6_gtt_pte_t);\n \n \t\/* GMADR is the PCI mmio aperture into the global GTT. *\/\n \tDRM_INFO(\"Memory usable by graphics device = %zdM\\n\",\n"} {"commit":"b2f21b4dfdd1e7396a99312c35092c8bb486a699","subject":"drm\/i915: Use gtt shortform where possible","message":"drm\/i915: Use gtt shortform where possible\n\nJust for compactness.\n\nSigned-off-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ac45146733b03a1c8e3a6a33720bdc42804cc09b","subject":"drm\/msm: fix msm_gem_prime_get_sg_table()","message":"drm\/msm: fix msm_gem_prime_get_sg_table()\n\nWe need to return a new sgt, since the caller takes ownership of it.\n\nReported-by: Stanimir Varbanov <206603b259d5f0940c1312177521fd3e249de984@mm-sol.com>\nSigned-off-by: Rob Clark <915c10c999604870200b6defbe633d857c856ca0@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2dea2e29b9fad48c759aa406b5ea426bff4339af","subject":"drm\/kms\/radeon\/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info","message":"drm\/kms\/radeon\/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info\n\nFirst call drm_agp_acquire to check if agp has been acquired.\nSecond call drm_agp_info to fill in the info data struct, including aper_size.\nFinally do the check to see if the aper_size makes sense.\n\nSigned-off-by: John Kacur <dae4bd386fd4c6474c13eecbb94aa6e9e7589534@redhat.com>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/radeon_agp.c\n+++ drivers\/gpu\/drm\/radeon\/radeon_agp.c\n@@ -133,13 +133,6 @@\n \tbool is_v3;\n \tint ret;\n \n-\tif (rdev->ddev->agp->agp_info.aper_size < 32) {\n-\t\tdev_warn(rdev->dev, \"AGP aperture too small (%zuM) \"\n-\t\t\t\"need at least 32M, disabling AGP\\n\",\n-\t\t\trdev->ddev->agp->agp_info.aper_size);\n-\t\treturn -EINVAL;\n-\t}\n-\n \t\/* Acquire AGP. *\/\n \tif (!rdev->ddev->agp->acquired) {\n \t\tret = drm_agp_acquire(rdev->ddev);\n@@ -154,6 +147,14 @@\n \t\tDRM_ERROR(\"Unable to get AGP info: %d\\n\", ret);\n \t\treturn ret;\n \t}\n+\n+\tif (rdev->ddev->agp->agp_info.aper_size < 32) {\n+\t\tdev_warn(rdev->dev, \"AGP aperture too small (%zuM) \"\n+\t\t\t\"need at least 32M, disabling AGP\\n\",\n+\t\t\trdev->ddev->agp->agp_info.aper_size);\n+\t\treturn -EINVAL;\n+\t}\n+\n \tmode.mode = info.mode;\n \tagp_status = (RREG32(RADEON_AGP_STATUS) | RADEON_AGPv3_MODE) & mode.mode;\n \tis_v3 = !!(agp_status & RADEON_AGPv3_MODE);\n"} {"commit":"e38e7b3fd98b21eaeefaae075cb1fe174f0689b5","subject":"gpu: ion: check return value from gen_pool_add","message":"gpu: ion: check return value from gen_pool_add\n\nCheck the return value from gen_pool_add and handle\nany error gracefully.\n\nChange-Id: I648f3aaafde66f484195024b5c21ef2c6a20b95a\nSigned-off-by: Laura Abbott <e7b4910f4742918f5926c991d8a2cd122ac7e295@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/ion\/ion_carveout_heap.c\n+++ drivers\/gpu\/ion\/ion_carveout_heap.c\n@@ -132,6 +132,7 @@\n struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data)\n {\n \tstruct ion_carveout_heap *carveout_heap;\n+\tint ret;\n \n \tcarveout_heap = kzalloc(sizeof(struct ion_carveout_heap), GFP_KERNEL);\n \tif (!carveout_heap)\n@@ -143,8 +144,12 @@\n \t\treturn ERR_PTR(-ENOMEM);\n \t}\n \tcarveout_heap->base = heap_data->base;\n-\tgen_pool_add(carveout_heap->pool, carveout_heap->base, heap_data->size,\n-\t\t -1);\n+\tret = gen_pool_add(carveout_heap->pool, carveout_heap->base,\n+\t\t\theap_data->size, -1);\n+\tif (ret < 0) {\n+\t\tkfree(carveout_heap);\n+\t\treturn ERR_PTR(-EINVAL);\n+\t}\n \tcarveout_heap->heap.ops = &carveout_heap_ops;\n \tcarveout_heap->heap.type = ION_HEAP_TYPE_CARVEOUT;\n \n"} {"commit":"af437469d14e91e8b4273606cac4c08f05bf056e","subject":"iommu\/vt-d: Fix race setting IRQ CPU affinity while freeing IRQ","message":"iommu\/vt-d: Fix race setting IRQ CPU affinity while freeing IRQ\n\nA user process setting the CPU affinity of an IRQ for a KVM\ndirect-assigned device via \/proc\/irq\/<IRQ#>\/smp_affinity can race with\nthe IRQ being released by QEMU, resulting in a NULL iommu pointer\ndereference in get_irte(), causing this crash:\n\n BUG: unable to handle kernel NULL pointer dereference at 0000000000000090\n IP: [<ffffffff8190a652>] intel_ioapic_set_affinity+0x82\/0x1b0\n PGD 99172e067 PUD 1026979067 PMD 0\n Oops: 0000 [#1] SMP\n Modules linked in:\n CPU: 1 PID: 3354 Comm: affin Not tainted 3.16.0-rc7-00007-g31dab71 #1\n Hardware name: Supermicro SYS-F617R2-RT+\/X9DRFR, BIOS 3.0a 01\/29\/2014\n task: ffff881025b0e720 ti: ffff88099173c000 task.ti: ffff88099173c000\n RIP: 0010:[<ffffffff8190a652>] [<ffffffff8190a652>] intel_ioapic_set_affinity+0x82\/0x1b0\n RSP: 0018:ffff88099173fdb0 EFLAGS: 00010046\n RAX: 0000000000000082 RBX: ffff880a36294600 RCX: 0000000000000082\n RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffff8266af00\n RBP: ffff88099173fdf8 R08: 0000000000000000 R09: ffff88103ec00490\n R10: 0000000000000000 R11: 0000000000000000 R12: ffff88099173fe90\n R13: 000000000000005f R14: ffff880faa38fe80 R15: ffff880faa38fe80\n FS: 00007f7161f05740(0000) GS:ffff88107fc40000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n CR2: 0000000000000090 CR3: 000000099140d000 CR4: 00000000001427e0\n Stack:\n ffffffff81c44740 ffff88099173fdc8 ffffffff00000000 00000000c991fd3b\n ffff880a36294600 ffff88099173fe90 ffff88099173fe90 0000000000000000\n 0000000000000286 ffff88099173fe08 ffffffff8190aac5 ffff88099173fe28\n Call Trace:\n [<ffffffff8190aac5>] set_remapped_irq_affinity+0x25\/0x40\n [<ffffffff811322dc>] irq_do_set_affinity+0x1c\/0x50\n [<ffffffff81132458>] irq_set_affinity_locked+0x98\/0xd0\n [<ffffffff811324d6>] __irq_set_affinity+0x46\/0x70\n [<ffffffff811362dc>] write_irq_affinity.isra.6+0xdc\/0x100\n [<ffffffff8113631c>] irq_affinity_list_proc_write+0x1c\/0x20\n [<ffffffff8129f30d>] proc_reg_write+0x3d\/0x80\n [<ffffffff812384a7>] vfs_write+0xb7\/0x1f0\n [<ffffffff81243619>] ? putname+0x29\/0x40\n [<ffffffff812390c5>] SyS_write+0x55\/0xd0\n [<ffffffff81adc729>] system_call_fastpath+0x16\/0x1b\n Code: ff 48 85 d2 74 68 4c 8b 7a 30 4d 85 ff 74 5f 48 c7 c7 00 af 66 82 e8 9e 1b 1d 00 49 8b 57 20 41 0f b7 77 28 48 c7 c7 00 af 66 82 <48> 8b 8a 90 00 00 00 41 0f b7 57 2a 01 f2 48 89 c6 48 63 d2 48\n RIP [<ffffffff8190a652>] intel_ioapic_set_affinity+0x82\/0x1b0\n RSP <ffff88099173fdb0>\n CR2: 0000000000000090\n\nSigned-off-by: Greg Edwards <76a97a7e43a361705d43570d8f9c961067d4a993@ddn.com>\nSigned-off-by: Joerg Roedel <61aff96566804ea1da8a65de5bcc892ce07caceb@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"285a4f6c8e518f03758c7b085bda13bb3795df0a","subject":"V4L\/DVB (8673): gspca: Bad frame scanning again and bad init in pac7311.","message":"V4L\/DVB (8673): gspca: Bad frame scanning again and bad init in pac7311.\n\nSigned-off-by: Jean-Francois Moine <e5394ce9c4b9ae7d2c4686830c5ac5f3b9028b6a@free.fr>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/pac7311.c\n+++ drivers\/media\/video\/gspca\/pac7311.c\n@@ -220,6 +220,7 @@\n };\n static const __u8 start_7302[] = {\n \/*\tindex, len, [value]* *\/\n+\t0xff, 1,\t0x00,\t\t\/* page 0 *\/\n \t0x00, 12,\t0x01, 0x40, 0x40, 0x40, 0x01, 0xe0, 0x02, 0x80,\n \t\t\t0x00, 0x00, 0x00, 0x00,\n \t0x0d, 24,\t0x03, 0x01, 0x00, 0xb5, 0x07, 0xcb, 0x00, 0x00,\n@@ -249,7 +250,7 @@\n \t0xd1, 11,\t0x01, 0x30, 0x49, 0x5e, 0x6f, 0x7f, 0x8e, 0xa9,\n \t\t\t0xc1, 0xd7, 0xec,\n \t0xdc, 1,\t0x01,\n-\t0xff, 1,\t0x01,\n+\t0xff, 1,\t0x01,\t\t\/* page 1 *\/\n \t0x12, 3,\t0x02, 0x00, 0x01,\n \t0x3e, 2,\t0x00, 0x00,\n \t0x76, 5,\t0x01, 0x20, 0x40, 0x00, 0xf2,\n@@ -257,26 +258,26 @@\n \t0x7f, 10,\t0x4b, 0x0f, 0x01, 0x2c, 0x02, 0x58, 0x03, 0x20,\n \t\t\t0x02, 0x00,\n \t0x96, 5,\t0x01, 0x10, 0x04, 0x01, 0x04,\n-\t0xc8, 17,\t0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,\n+\t0xc8, 14,\t0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00,\n \t\t\t0x07, 0x00, 0x01, 0x07, 0x04, 0x01,\n-\t\t\t0x01,\n+\t0xd8, 1,\t0x01,\n \t0xdb, 2,\t0x00, 0x01,\n-\t0xde, 8,\t0x00, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00,\n+\t0xde, 7,\t0x00, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00,\n \t0xe6, 4,\t0x00, 0x00, 0x00, 0x01,\n \t0xeb, 1,\t0x00,\n-\t0xff, 1,\t0x02,\n+\t0xff, 1,\t0x02,\t\t\/* page 2 *\/\n \t0x22, 1,\t0x00,\n-\t0xff, 1,\t0x03,\n+\t0xff, 1,\t0x03,\t\t\/* page 3 *\/\n \t0x00, 255,\t\t\t\/* load the page 3 *\/\n \t0x11, 1,\t0x01,\n-\t0xff, 1,\t0x02,\n+\t0xff, 1,\t0x02,\t\t\/* page 2 *\/\n \t0x13, 1,\t0x00,\n \t0x22, 4,\t0x1f, 0xa4, 0xf0, 0x96,\n \t0x27, 2,\t0x14, 0x0c,\n \t0x2a, 5,\t0xc8, 0x00, 0x18, 0x12, 0x22,\n \t0x64, 8,\t0x00, 0x00, 0xf0, 0x01, 0x14, 0x44, 0x44, 0x44,\n \t0x6e, 1,\t0x08,\n-\t0xff, 1,\t0x03,\n+\t0xff, 1,\t0x03,\t\t\/* page 1 *\/\n \t0x78, 1,\t0x00,\n \t0, 0\t\t\t\t\/* end of sequence *\/\n };\n@@ -321,14 +322,14 @@\n \n static const __u8 start_7311[] = {\n \/*\tindex, len, [value]* *\/\n-\t0xff, 1,\t0x01,\n-\t0x02, 53,\t0x48, 0x0a, 0x40, 0x08, 0x00, 0x00, 0x08, 0x00,\n+\t0xff, 1,\t0x01,\t\t\/* page 1 *\/\n+\t0x02, 43,\t0x48, 0x0a, 0x40, 0x08, 0x00, 0x00, 0x08, 0x00,\n \t\t\t0x06, 0xff, 0x11, 0xff, 0x5a, 0x30, 0x90, 0x4c,\n \t\t\t0x00, 0x07, 0x00, 0x0a, 0x10, 0x00, 0xa0, 0x10,\n \t\t\t0x02, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x01, 0x00,\n \t\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t\t0x00, 0x00, 0x00,\n-\t0x3e, 52,\t0x00, 0x00, 0x78, 0x52, 0x4a, 0x52, 0x78, 0x6e,\n+\t0x3e, 42,\t0x00, 0x00, 0x78, 0x52, 0x4a, 0x52, 0x78, 0x6e,\n \t\t\t0x48, 0x46, 0x48, 0x6e, 0x5f, 0x49, 0x42, 0x49,\n \t\t\t0x5f, 0x5f, 0x49, 0x42, 0x49, 0x5f, 0x6e, 0x48,\n \t\t\t0x46, 0x48, 0x6e, 0x78, 0x52, 0x4a, 0x52, 0x78,\n@@ -342,7 +343,7 @@\n \t0xa0, 4,\t0x44, 0x44, 0x44, 0x04,\n \t0xf0, 13,\t0x01, 0x00, 0x00, 0x00, 0x22, 0x00, 0x20, 0x00,\n \t\t\t0x3f, 0x00, 0x0a, 0x01, 0x00,\n-\t0xff, 1,\t0x04,\n+\t0xff, 1,\t0x04,\t\t\/* page 4 *\/\n \t0x00, 254,\t\t\t\/* load the page 4 *\/\n \t0x11, 1,\t0x01,\n \t0, 0\t\t\t\t\/* end of sequence *\/\n@@ -738,6 +739,24 @@\n #define INTER_FRAME 0x53\t\/* eof + inter frame + sof *\/\n #define LUM_OFFSET 0x1e\t\t\/* reverse offset \/ start of frame *\/\n \n+\/*fixme:test+*\/\n+\/* dump the packet *\/\n+\tif (gspca_debug & 0x200) {\n+\t\tstatic char tmp[50];\n+\n+\t\tPDEBUG(0x200, \"pkt_scan\");\n+\t\ttmp[0] = 0;\n+\t\tfor (i = 0; i < len; i++) {\n+\t\t\tif (i % 16 == 0 && i != 0) {\n+\t\t\t\tPDEBUG(0x200, \"%s\", tmp);\n+\t\t\t\ttmp[0] = 0;\n+\t\t\t}\n+\t\t\tsprintf(&tmp[(i % 16) * 3], \"%02x \", data[i]);\n+\t\t}\n+\t\tif (tmp[0] != 0)\n+\t\t\tPDEBUG(0x200, \"%s\", tmp);\n+\t}\n+\/*fixme:test-*\/\n \t\/*\n \t * inside a frame, there may be:\n \t *\tescaped ff ('ff 00')\n@@ -819,6 +838,25 @@\n \t\t\tput_jpeg_head(gspca_dev, frame);\n \t\t\tbreak;\n \t\tcase 0xff:\t\t\/* 'ff ff ff xx' *\/\n+\/*fixme:test+*\/\n+\/* is there a start of frame ? *\/\n+\t\t\tif (data[i + 2] == 0x00) {\n+\t\t\t\tstatic __u8 ffd9[2] = {0xff, 0xd9};\n+\n+\t\t\t\tgspca_frame_add(gspca_dev,\n+\t\t\t\t\t\tINTER_PACKET,\n+\t\t\t\t\t\tframe, data,\n+\t\t\t\t\t\t\ti + 7 - INTER_FRAME);\n+\t\t\t\tframe = gspca_frame_add(gspca_dev,\n+\t\t\t\t\t\t\tLAST_PACKET,\n+\t\t\t\t\t\t\tframe, ffd9, 2);\n+\t\t\t\tdata += i + 7;\n+\t\t\t\tlen -= i + 7;\n+\t\t\t\ti = 0;\n+\t\t\t\tput_jpeg_head(gspca_dev, frame);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\/*fixme:test-*\/\n \t\t\tgspca_frame_add(gspca_dev, INTER_PACKET,\n \t\t\t\t\tframe, data, i);\n \t\t\tdata += i + 4;\n"} {"commit":"0fc23d20699a6a3b7e34b3be2cc5e60317ba7849","subject":"V4L\/DVB (8873): gspca: Bad image offset with rev012a of spca561 and adjust exposure.","message":"V4L\/DVB (8873): gspca: Bad image offset with rev012a of spca561 and adjust exposure.\n\n-Make raw bayer header size change from 20 to 16 affect rev072a only, my 2\n rev012a cams both have a header size of 20\n-While testing this I also tested the new exposure setting (good work on\n finding the register JF), and after quite a bit of testing have found out the\n exact meaning of the register, this patch modifies setexposure to control\n the exposure over a much wider range.\n\nSigned-off-by: Hans de Goede <fb8d0494a9e27cd2eb05a840cc9c91dc67195d23@hhs.nl>\nSigned-off-by: Jean-Francois Moine <e5394ce9c4b9ae7d2c4686830c5ac5f3b9028b6a@free.fr>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/spca561.c\n+++ drivers\/media\/video\/gspca\/spca561.c\n@@ -38,9 +38,9 @@\n #define CONTRAST_MAX 0x3fff\n \n \t__u16 exposure;\t\t\t\/* rev12a only *\/\n-#define EXPOSURE_MIN 0\n+#define EXPOSURE_MIN 1\n #define EXPOSURE_DEF 200\n-#define EXPOSURE_MAX 762\n+#define EXPOSURE_MAX (4095 - 900) \/* see set_exposure *\/\n \n \t__u8 brightness;\t\t\/* rev72a only *\/\n #define BRIGHTNESS_MIN 0\n@@ -648,9 +648,31 @@\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tint expo;\n+\tint clock_divider;\n \t__u8 data[2];\n \n-\texpo = sd->exposure + 0x20a8;\t\/* from test *\/\n+\t\/* Register 0x8309 controls exposure for the spca561,\n+\t the basic exposure setting goes from 1-2047, where 1 is completely\n+\t dark and 2047 is very bright. It not only influences exposure but\n+\t also the framerate (to allow for longer exposure) from 1 - 300 it\n+\t only raises the exposure time then from 300 - 600 it halves the\n+\t framerate to be able to further raise the exposure time and for every\n+\t 300 more it halves the framerate again. This allows for a maximum\n+\t exposure time of circa 0.2 - 0.25 seconds (30 \/ (2000\/3000) fps).\n+\t Sometimes this is not enough, the 1-2047 uses bits 0-10, bits 11-12\n+\t configure a divider for the base framerate which us used at the\n+\t exposure setting of 1-300. These bits configure the base framerate\n+\t according to the following formula: fps = 60 \/ (value + 2) *\/\n+\tif (sd->exposure < 2048) {\n+\t\texpo = sd->exposure;\n+\t\tclock_divider = 0;\n+\t} else {\n+\t\t\/* Add 900 to make the 0 setting of the second part of the\n+\t\t exposure equal to the 2047 setting of the first part. *\/\n+\t\texpo = (sd->exposure - 2048) + 900;\n+\t\tclock_divider = 3;\n+\t}\n+\texpo |= clock_divider << 11;\n \tdata[0] = expo;\n \tdata[1] = expo >> 8;\n \treg_w_buf(gspca_dev, 0x8309, data, 2);\n@@ -680,23 +702,11 @@\n static void sd_start_12a(struct gspca_dev *gspca_dev)\n {\n \tstruct usb_device *dev = gspca_dev->dev;\n-\tint Clck;\n+\tint Clck = 0x8a; \/* lower 0x8X values lead to fps > 30 *\/\n \t__u8 Reg8307[] = { 0xaa, 0x00 };\n \tint mode;\n \n \tmode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;\n-\tswitch (mode) {\n-\tcase 0:\n-\tcase 1:\n-\t\tClck = 0x8a;\n-\t\tbreak;\n-\tcase 2:\n-\t\tClck = 0x85;\n-\t\tbreak;\n-\tdefault:\n-\t\tClck = 0x83;\n-\t\tbreak;\n-\t}\n \tif (mode <= 1) {\n \t\t\/* Use compression on 320x240 and above *\/\n \t\treg_w_val(dev, 0x8500, 0x10 | mode);\n@@ -714,6 +724,7 @@\n \tsetcontrast(gspca_dev);\n \tsetwhite(gspca_dev);\n \tsetautogain(gspca_dev);\n+\tsetexposure(gspca_dev);\n }\n static void sd_start_72a(struct gspca_dev *gspca_dev)\n {\n@@ -849,6 +860,8 @@\n \t\t\t__u8 *data,\t\t\/* isoc packet *\/\n \t\t\tint len)\t\t\/* iso packet length *\/\n {\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\n \tswitch (data[0]) {\n \tcase 0:\t\t\/* start of frame *\/\n \t\tframe = gspca_frame_add(gspca_dev, LAST_PACKET, frame,\n@@ -861,9 +874,13 @@\n \t\t\t\t\tframe, data, len);\n \t\t} else {\n \t\t\t\/* raw bayer (with a header, which we skip) *\/\n-\/*fixme: is this specific to the rev012a? *\/\n-\t\t\tdata += 16;\n-\t\t\tlen -= 16;\n+\t\t\tif (sd->chip_revision == Rev012A) {\n+\t\t\t\tdata += 20;\n+\t\t\t\tlen -= 20;\n+\t\t\t} else {\n+\t\t\t\tdata += 16;\n+\t\t\t\tlen -= 16;\n+\t\t\t}\n \t\t\tgspca_frame_add(gspca_dev, FIRST_PACKET,\n \t\t\t\t\t\tframe, data, len);\n \t\t}\n"} {"commit":"564b84978df2bf83d334940f1a1190702579f79f","subject":"mtd: cfi_cmdset_0002: do not fail on no extended query table as they are both optional","message":"mtd: cfi_cmdset_0002: do not fail on no extended query table as they are both optional\n\nAfter looking at AMD's CFI specification [1], both of the extended query\ntables are optional. Thus, it looks like relying that at least one of\nthose tables exist is a bug in cfi_cmdset_0002.\n\nThis patch inverts the logic and checks for unlock function pointers before\nexiting on error. This approach leaves place to add a call to a fixup\nfunction to try to handle chips compatible with the early AMD specification\nfrom 1995 [2].\n\n[1] http:\/\/www.amd.com\/us-en\/assets\/content_type\/DownloadableAssets\/cfi_r20.pdf\n[2] http:\/\/noel.feld.cvut.cz\/hw\/amd\/20158a.pdf\n\nSigned-off-by: Guillaume LECERF <52a6d65542b6cc074ecaa7849f64873c4c101661@gmail.com>\nReviewed-by: Wolfram Sang <3883f8aab0424a154a3bcb43ff874b819786efbe@pengutronix.de>\nSigned-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/mtd\/chips\/cfi_cmdset_0002.c\n+++ drivers\/mtd\/chips\/cfi_cmdset_0002.c\n@@ -357,65 +357,66 @@\n \n \tif (cfi->cfi_mode==CFI_MODE_CFI){\n \t\tunsigned char bootloc;\n-\t\t\/*\n-\t\t * It's a real CFI chip, not one for which the probe\n-\t\t * routine faked a CFI structure. So we read the feature\n-\t\t * table from it.\n-\t\t *\/\n \t\t__u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;\n \t\tstruct cfi_pri_amdstd *extp;\n \n \t\textp = (struct cfi_pri_amdstd*)cfi_read_pri(map, adr, sizeof(*extp), \"Amd\/Fujitsu\");\n-\t\tif (!extp) {\n+\t\tif (extp) {\n+\t\t\t\/*\n+\t\t\t * It's a real CFI chip, not one for which the probe\n+\t\t\t * routine faked a CFI structure.\n+\t\t\t *\/\n+\t\t\tcfi_fixup_major_minor(cfi, extp);\n+\n+\t\t\tif (extp->MajorVersion != '1' ||\n+\t\t\t (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {\n+\t\t\t\tprintk(KERN_ERR \" Unknown Amd\/Fujitsu Extended Query \"\n+\t\t\t\t \"version %c.%c.\\n\", extp->MajorVersion,\n+\t\t\t\t extp->MinorVersion);\n+\t\t\t\tkfree(extp);\n+\t\t\t\tkfree(mtd);\n+\t\t\t\treturn NULL;\n+\t\t\t}\n+\n+\t\t\t\/* Install our own private info structure *\/\n+\t\t\tcfi->cmdset_priv = extp;\n+\n+\t\t\t\/* Apply cfi device specific fixups *\/\n+\t\t\tcfi_fixup(mtd, cfi_fixup_table);\n+\n+#ifdef DEBUG_CFI_FEATURES\n+\t\t\t\/* Tell the user about it in lots of lovely detail *\/\n+\t\t\tcfi_tell_features(extp);\n+#endif\n+\n+\t\t\tbootloc = extp->TopBottom;\n+\t\t\tif ((bootloc != 2) && (bootloc != 3)) {\n+\t\t\t\tprintk(KERN_WARNING \"%s: CFI does not contain boot \"\n+\t\t\t\t \"bank location. Assuming top.\\n\", map->name);\n+\t\t\t\tbootloc = 2;\n+\t\t\t}\n+\n+\t\t\tif (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) {\n+\t\t\t\tprintk(KERN_WARNING \"%s: Swapping erase regions for broken CFI table.\\n\", map->name);\n+\n+\t\t\t\tfor (i=0; i<cfi->cfiq->NumEraseRegions \/ 2; i++) {\n+\t\t\t\t\tint j = (cfi->cfiq->NumEraseRegions-1)-i;\n+\t\t\t\t\t__u32 swap;\n+\n+\t\t\t\t\tswap = cfi->cfiq->EraseRegionInfo[i];\n+\t\t\t\t\tcfi->cfiq->EraseRegionInfo[i] = cfi->cfiq->EraseRegionInfo[j];\n+\t\t\t\t\tcfi->cfiq->EraseRegionInfo[j] = swap;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\t\/* Set the default CFI lock\/unlock addresses *\/\n+\t\t\tcfi->addr_unlock1 = 0x555;\n+\t\t\tcfi->addr_unlock2 = 0x2aa;\n+\t\t}\n+\n+\t\tif (!cfi->addr_unlock1 || !cfi->addr_unlock2) {\n \t\t\tkfree(mtd);\n \t\t\treturn NULL;\n \t\t}\n-\n-\t\tcfi_fixup_major_minor(cfi, extp);\n-\n-\t\tif (extp->MajorVersion != '1' ||\n-\t\t (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {\n-\t\t\tprintk(KERN_ERR \" Unknown Amd\/Fujitsu Extended Query \"\n-\t\t\t \"version %c.%c.\\n\", extp->MajorVersion,\n-\t\t\t extp->MinorVersion);\n-\t\t\tkfree(extp);\n-\t\t\tkfree(mtd);\n-\t\t\treturn NULL;\n-\t\t}\n-\n-\t\t\/* Install our own private info structure *\/\n-\t\tcfi->cmdset_priv = extp;\n-\n-\t\t\/* Apply cfi device specific fixups *\/\n-\t\tcfi_fixup(mtd, cfi_fixup_table);\n-\n-#ifdef DEBUG_CFI_FEATURES\n-\t\t\/* Tell the user about it in lots of lovely detail *\/\n-\t\tcfi_tell_features(extp);\n-#endif\n-\n-\t\tbootloc = extp->TopBottom;\n-\t\tif ((bootloc != 2) && (bootloc != 3)) {\n-\t\t\tprintk(KERN_WARNING \"%s: CFI does not contain boot \"\n-\t\t\t \"bank location. Assuming top.\\n\", map->name);\n-\t\t\tbootloc = 2;\n-\t\t}\n-\n-\t\tif (bootloc == 3 && cfi->cfiq->NumEraseRegions > 1) {\n-\t\t\tprintk(KERN_WARNING \"%s: Swapping erase regions for broken CFI table.\\n\", map->name);\n-\n-\t\t\tfor (i=0; i<cfi->cfiq->NumEraseRegions \/ 2; i++) {\n-\t\t\t\tint j = (cfi->cfiq->NumEraseRegions-1)-i;\n-\t\t\t\t__u32 swap;\n-\n-\t\t\t\tswap = cfi->cfiq->EraseRegionInfo[i];\n-\t\t\t\tcfi->cfiq->EraseRegionInfo[i] = cfi->cfiq->EraseRegionInfo[j];\n-\t\t\t\tcfi->cfiq->EraseRegionInfo[j] = swap;\n-\t\t\t}\n-\t\t}\n-\t\t\/* Set the default CFI lock\/unlock addresses *\/\n-\t\tcfi->addr_unlock1 = 0x555;\n-\t\tcfi->addr_unlock2 = 0x2aa;\n \n \t} \/* CFI mode *\/\n \telse if (cfi->cfi_mode == CFI_MODE_JEDEC) {\n"} {"commit":"d0249e44432aa0ffcf710b64449b8eaa3722547e","subject":"skge: check for PCI dma mapping errors","message":"skge: check for PCI dma mapping errors\n\nDriver should check for mapping errors.\nMachines with limited DMA maps may return an error when a PCI map is\nrequested (not an issue on standard x86).\n\nAlso use upper\/lower 32 bits macros for clarity.\n\nSigned-off-by: Stephen Hemminger <a072e933f45880fe04500ea083d5c7f6e81a06f0@vyatta.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ethernet\/marvell\/skge.c\n+++ drivers\/net\/ethernet\/marvell\/skge.c\n@@ -931,17 +931,20 @@\n }\n \n \/* Allocate and setup a new buffer for receiving *\/\n-static void skge_rx_setup(struct skge_port *skge, struct skge_element *e,\n-\t\t\t struct sk_buff *skb, unsigned int bufsize)\n+static int skge_rx_setup(struct pci_dev *pdev,\n+\t\t\t struct skge_element *e,\n+\t\t\t struct sk_buff *skb, unsigned int bufsize)\n {\n \tstruct skge_rx_desc *rd = e->desc;\n-\tu64 map;\n-\n-\tmap = pci_map_single(skge->hw->pdev, skb->data, bufsize,\n+\tdma_addr_t map;\n+\n+\tmap = pci_map_single(pdev, skb->data, bufsize,\n \t\t\t PCI_DMA_FROMDEVICE);\n-\n-\trd->dma_lo = map;\n-\trd->dma_hi = map >> 32;\n+\tif (pci_dma_mapping_error(pdev, map))\n+\t\tgoto mapping_error;\n+\n+\trd->dma_lo = lower_32_bits(map);\n+\trd->dma_hi = upper_32_bits(map);\n \te->skb = skb;\n \trd->csum1_start = ETH_HLEN;\n \trd->csum2_start = ETH_HLEN;\n@@ -953,6 +956,13 @@\n \trd->control = BMU_OWN | BMU_STF | BMU_IRQ_EOF | BMU_TCP_CHECK | bufsize;\n \tdma_unmap_addr_set(e, mapaddr, map);\n \tdma_unmap_len_set(e, maplen, bufsize);\n+\treturn 0;\n+\n+mapping_error:\n+\tif (net_ratelimit())\n+\t\tdev_warn(&pdev->dev, \"%s: rx mapping error\\n\",\n+\t\t\t skb->dev->name);\n+\treturn -EIO;\n }\n \n \/* Resume receiving using existing skb,\n@@ -1014,7 +1024,11 @@\n \t\t\treturn -ENOMEM;\n \n \t\tskb_reserve(skb, NET_IP_ALIGN);\n-\t\tskge_rx_setup(skge, e, skb, skge->rx_buf_size);\n+\t\tif (skge_rx_setup(skge->hw->pdev, e, skb, skge->rx_buf_size)) {\n+\t\t\tkfree_skb(skb);\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\n \t} while ((e = e->next) != ring->start);\n \n \tring->to_clean = ring->start;\n@@ -2729,7 +2743,7 @@\n \tstruct skge_tx_desc *td;\n \tint i;\n \tu32 control, len;\n-\tu64 map;\n+\tdma_addr_t map;\n \n \tif (skb_padto(skb, ETH_ZLEN))\n \t\treturn NETDEV_TX_OK;\n@@ -2743,11 +2757,14 @@\n \te->skb = skb;\n \tlen = skb_headlen(skb);\n \tmap = pci_map_single(hw->pdev, skb->data, len, PCI_DMA_TODEVICE);\n+\tif (pci_dma_mapping_error(hw->pdev, map))\n+\t\tgoto mapping_error;\n+\n \tdma_unmap_addr_set(e, mapaddr, map);\n \tdma_unmap_len_set(e, maplen, len);\n \n-\ttd->dma_lo = map;\n-\ttd->dma_hi = map >> 32;\n+\ttd->dma_lo = lower_32_bits(map);\n+\ttd->dma_hi = upper_32_bits(map);\n \n \tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n \t\tconst int offset = skb_checksum_start_offset(skb);\n@@ -2778,14 +2795,16 @@\n \n \t\t\tmap = skb_frag_dma_map(&hw->pdev->dev, frag, 0,\n \t\t\t\t\t skb_frag_size(frag), DMA_TO_DEVICE);\n+\t\t\tif (dma_mapping_error(&hw->pdev->dev, map))\n+\t\t\t\tgoto mapping_unwind;\n \n \t\t\te = e->next;\n \t\t\te->skb = skb;\n \t\t\ttf = e->desc;\n \t\t\tBUG_ON(tf->control & BMU_OWN);\n \n-\t\t\ttf->dma_lo = map;\n-\t\t\ttf->dma_hi = (u64) map >> 32;\n+\t\t\ttf->dma_lo = lower_32_bits(map);\n+\t\t\ttf->dma_hi = upper_32_bits(map);\n \t\t\tdma_unmap_addr_set(e, mapaddr, map);\n \t\t\tdma_unmap_len_set(e, maplen, skb_frag_size(frag));\n \n@@ -2812,6 +2831,28 @@\n \t\tnetif_stop_queue(dev);\n \t}\n \n+\treturn NETDEV_TX_OK;\n+\n+mapping_unwind:\n+\t\/* unroll any pages that were already mapped. *\/\n+\tif (e != skge->tx_ring.to_use) {\n+\t\tstruct skge_element *u;\n+\n+\t\tfor (u = skge->tx_ring.to_use->next; u != e; u = u->next)\n+\t\t\tpci_unmap_page(hw->pdev, dma_unmap_addr(u, mapaddr),\n+\t\t\t\t dma_unmap_len(u, maplen),\n+\t\t\t\t PCI_DMA_TODEVICE);\n+\t\te = skge->tx_ring.to_use;\n+\t}\n+\t\/* undo the mapping for the skb header *\/\n+\tpci_unmap_single(hw->pdev, dma_unmap_addr(e, mapaddr),\n+\t\t\t dma_unmap_len(e, maplen),\n+\t\t\t PCI_DMA_TODEVICE);\n+mapping_error:\n+\t\/* mapping error causes error message and packet to be discarded. *\/\n+\tif (net_ratelimit())\n+\t\tdev_warn(&hw->pdev->dev, \"%s: tx mapping error\\n\", dev->name);\n+\tdev_kfree_skb(skb);\n \treturn NETDEV_TX_OK;\n }\n \n@@ -3060,13 +3101,17 @@\n \t\tif (!nskb)\n \t\t\tgoto resubmit;\n \n+\t\tif (unlikely(skge_rx_setup(skge->hw->pdev, e, nskb, skge->rx_buf_size))) {\n+\t\t\tdev_kfree_skb(nskb);\n+\t\t\tgoto resubmit;\n+\t\t}\n+\n \t\tpci_unmap_single(skge->hw->pdev,\n \t\t\t\t dma_unmap_addr(e, mapaddr),\n \t\t\t\t dma_unmap_len(e, maplen),\n \t\t\t\t PCI_DMA_FROMDEVICE);\n \t\tskb = e->skb;\n \t\tprefetch(skb->data);\n-\t\tskge_rx_setup(skge, e, nskb, skge->rx_buf_size);\n \t}\n \n \tskb_put(skb, len);\n"} {"commit":"f3910f7f7019c163348a734beeeb3ee040aa718e","subject":"don't open files O_EXCL","message":"don't open files O_EXCL\n","repos":"devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5,devzero2000\/RPM5","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- install.c\n+++ install.c\n@@ -48,7 +48,7 @@\n if (installFlags & INSTALL_TEST) \n \tmode = O_RDONLY;\n else\n-\tmode = O_RDWR | O_EXCL;\n+\tmode = O_RDWR;\n \n if (interfaceFlags & RPMINSTALL_PERCENT)\n \tfn = printPercent;\n@@ -57,14 +57,10 @@\n else\n \tfn = NULL;\n \t\n- if (!rpmdbOpen(prefix, &db, mode, 0644)) {\n-\t\/* try opening it O_CREAT *\/\n-\tmode |= O_CREAT;\n-\tif (!rpmdbOpen(prefix, &db, mode, 0644)) {\n-\t fprintf(stderr, \"error: cannot open %s\/var\/lib\/rpm\/packages.rpm\\n\", \n-\t\t\tprefix);\n-\t exit(1);\n-\t}\n+ if (!rpmdbOpen(prefix, &db, mode | O_CREAT, 0644)) {\n+\tfprintf(stderr, \"error: cannot open %s\/var\/lib\/rpm\/packages.rpm\\n\", \n+\t\t prefix);\n+\texit(1);\n }\n \n message(MESS_DEBUG, \"installing %s\\n\", arg);\n"} {"commit":"5d834926034f311caf3eabc685691cb9cb803f32","subject":"net\/ice: fix input set of VLAN item","message":"net\/ice: fix input set of VLAN item\n\nThe input set for inner type of vlan item should\nbe ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER.\nThis mac vlan filter is also part of DCF switch filter.\n\nFixes: 47d460d63233 (\"net\/ice: rework switch filter\")\nCc: stable@dpdk.org\n\nSigned-off-by: Wei Zhao <55941fd0e75edbdf274af2cfac8f147525678f08@intel.com>\nAcked-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ice\/ice_switch_filter.c\n+++ drivers\/net\/ice\/ice_switch_filter.c\n@@ -911,7 +911,7 @@\n \t\t\t\t\t\tvlan_spec->inner_type;\n \t\t\t\t\tlist[t].m_u.vlan_hdr.type =\n \t\t\t\t\t\tvlan_mask->inner_type;\n-\t\t\t\t\tinput_set |= ICE_INSET_VLAN_OUTER;\n+\t\t\t\t\tinput_set |= ICE_INSET_ETHERTYPE;\n \t\t\t\t}\n \t\t\t\tt++;\n \t\t\t}\n"} {"commit":"77c553900c58c3e4f475e233ad4ff6aeb282deb4","subject":"netxen: fix warning in ioaddr for NX3031 chip","message":"netxen: fix warning in ioaddr for NX3031 chip\n\nSigned-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>\n\ncrb_intr_mask\/crb_sts_consumer is predefined for NX2031 not for\nNX3031. For NX3031, these values get defined in rx context creation.\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/netxen\/netxen_nic_ctx.c\n+++ drivers\/net\/netxen\/netxen_nic_ctx.c\n@@ -669,13 +669,15 @@\n \t\t}\n \t\tsds_ring->desc_head = (struct status_desc *)addr;\n \n-\t\tsds_ring->crb_sts_consumer =\n-\t\t\tnetxen_get_ioaddr(adapter,\n-\t\t\trecv_crb_registers[port].crb_sts_consumer[ring]);\n-\n-\t\tsds_ring->crb_intr_mask =\n-\t\t\tnetxen_get_ioaddr(adapter,\n-\t\t\trecv_crb_registers[port].sw_int_mask[ring]);\n+\t\tif (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {\n+\t\t\tsds_ring->crb_sts_consumer =\n+\t\t\t\tnetxen_get_ioaddr(adapter,\n+\t\t\t\trecv_crb_registers[port].crb_sts_consumer[ring]);\n+\n+\t\t\tsds_ring->crb_intr_mask =\n+\t\t\t\tnetxen_get_ioaddr(adapter,\n+\t\t\t\trecv_crb_registers[port].sw_int_mask[ring]);\n+\t\t}\n \t}\n \n \n"} {"commit":"ee1e81266e87a38f711bb47bcc3c4b390647c9e5","subject":"net\/octeontx2: fix PTP enable via Rx offload flags","message":"net\/octeontx2: fix PTP enable via Rx offload flags\n\nEarlier implementation for enabling ptp via RX offload flag was\ncausing segmentation fault as it was getting executed in the\ndevice configuration stage where RX and TX queues were not\nconfigured. As in the ptp enable process rx queues are used for\nmbuf setup while tx queues are used for send descriptor setup.\nMoving the logic in dev start as all the resources will be\nconfigured.\n\nFixes: b5dc3140448e (\"net\/octeontx2: support base PTP\")\n\nSigned-off-by: Harman Kalra <568a3484dfecf16d6b30cd214c570848bb408570@marvell.com>\nAcked-by: Jerin Jacob <352c4d4f9291b869992ddb67daa45ddc149fed30@marvell.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/octeontx2\/otx2_ethdev.c\n+++ drivers\/net\/octeontx2\/otx2_ethdev.c\n@@ -624,6 +624,9 @@\n \n \tif (conf & DEV_TX_OFFLOAD_MULTI_SEGS)\n \t\tflags |= NIX_TX_MULTI_SEG_F;\n+\n+\tif ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP))\n+\t\tflags |= NIX_TX_OFFLOAD_TSTAMP_F;\n \n \treturn flags;\n }\n@@ -1333,16 +1336,6 @@\n \t\tgoto q_irq_fini;\n \t}\n \n-\t\/* Enable PTP if it was requested by the app or if it is already\n-\t * enabled in PF owning this VF\n-\t *\/\n-\tmemset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info));\n-\tif ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) ||\n-\t otx2_ethdev_is_ptp_en(dev))\n-\t\totx2_nix_timesync_enable(eth_dev);\n-\telse\n-\t\totx2_nix_timesync_disable(eth_dev);\n-\n \t\/*\n \t * Restore queue config when reconfigure followed by\n \t * reconfigure and no queue configure invoked from application case.\n@@ -1550,6 +1543,16 @@\n \t\totx2_err(\"Failed to update flow ctrl mode %d\", rc);\n \t\treturn rc;\n \t}\n+\n+\t\/* Enable PTP if it was requested by the app or if it is already\n+\t * enabled in PF owning this VF\n+\t *\/\n+\tmemset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info));\n+\tif ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) ||\n+\t otx2_ethdev_is_ptp_en(dev))\n+\t\totx2_nix_timesync_enable(eth_dev);\n+\telse\n+\t\totx2_nix_timesync_disable(eth_dev);\n \n \trc = npc_rx_enable(dev);\n \tif (rc) {\n"} {"commit":"ec83903e67f9d1e8398568c77dc4fdd333531e96","subject":"ath9k_hw: add the AR9300 SREV hw name print","message":"ath9k_hw: add the AR9300 SREV hw name print\n\nSigned-off-by: Luis R. Rodriguez <79e6b8107a8aa3944e09fad43634662ac3b91a0b@atheros.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.c\n@@ -2689,6 +2689,7 @@\n \t{ AR_SREV_VERSION_9285,\t\t\"9285\" },\n \t{ AR_SREV_VERSION_9287, \"9287\" },\n \t{ AR_SREV_VERSION_9271, \"9271\" },\n+\t{ AR_SREV_VERSION_9300, \"9300\" },\n };\n \n \/* For devices with external radios *\/\n"} {"commit":"19eddca67628e5fb722e4ebbbba8c307a884d0e8","subject":"ath9k: Remove bogus break after return","message":"ath9k: Remove bogus break after return\n\nSigned-off-by: Vasanthakumar Thiagarajan <1f9b907e684cdf06e2f9d7218724ac8143aa73aa@atheros.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.c\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.c\n@@ -1617,11 +1617,9 @@\n \tswitch (type) {\n \tcase ATH9K_RESET_POWER_ON:\n \t\treturn ath9k_hw_set_reset_power_on(ah);\n-\t\tbreak;\n \tcase ATH9K_RESET_WARM:\n \tcase ATH9K_RESET_COLD:\n \t\treturn ath9k_hw_set_reset(ah, type);\n-\t\tbreak;\n \tdefault:\n \t\treturn false;\n \t}\n"} {"commit":"a6ced7e2162b7f0119fbcd0489f0ed5c7f87c583","subject":"MFi386 1.422 & 1.423: lock page queues in pmap_insert_entry().","message":"MFi386 1.422 & 1.423: lock page queues in pmap_insert_entry().\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/amd64\/amd64\/pmap.c\n+++ sys\/amd64\/amd64\/pmap.c\n@@ -1467,10 +1467,12 @@\n \tpv->pv_pmap = pmap;\n \tpv->pv_ptem = mpte;\n \n+\tvm_page_lock_queues();\n \tTAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);\n \tTAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);\n \tm->md.pv_list_count++;\n \n+\tvm_page_unlock_queues();\n \tsplx(s);\n }\n \n"} {"commit":"b123377935bb62990e426d0386360476890d8e63","subject":"ath9k: define DEVID for QCA955x","message":"ath9k: define DEVID for QCA955x\n\nSigned-off-by: Gabor Juhos <0b85b0feb94c9a44e8676965f48a70291ba74edb@openwrt.org>\nAcked-by: Luis R. Rodriguez <d4fa18192c5a479e564d29c2300c2e15afd1d8d7@qca.qualcomm.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/ath\/ath9k\/hw.h\n+++ drivers\/net\/wireless\/ath\/ath9k\/hw.h\n@@ -48,6 +48,7 @@\n #define AR9300_DEVID_AR9580\t0x0033\n #define AR9300_DEVID_AR9462\t0x0034\n #define AR9300_DEVID_AR9330\t0x0035\n+#define AR9300_DEVID_QCA955X\t0x0038\n \n #define AR5416_AR9100_DEVID\t0x000b\n \n"} {"commit":"b6b87fa7fcaa50a3ed2fb54a44202ad16d1a2c20","subject":"MFC rev. 1.226: correct EasyMP3 EM732X usb 2.0 flash mp3 player revision.","message":"MFC rev. 1.226: correct EasyMP3 EM732X usb 2.0 flash mp3 player revision.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/cam\/scsi\/scsi_da.c\n+++ sys\/cam\/scsi\/scsi_da.c\n@@ -473,7 +473,7 @@\n \t\t * PR: usb\/96546\n \t\t *\/\n \t\t{T_DIRECT, SIP_MEDIA_REMOVABLE, \"EM732X\", \"MP3 Player*\",\n-\t\t\"1.0\"}, \/*quirks*\/ DA_Q_NO_SYNC_CACHE\n+\t\t\"1.00\"}, \/*quirks*\/ DA_Q_NO_SYNC_CACHE\n \t},\n };\n \n"} {"commit":"96d46d5d792d96f80e9bd274ab6d433b8a3c22bc","subject":"libertas : Remove unused variable warning for \"old_channel\" from cmd.c","message":"libertas : Remove unused variable warning for \"old_channel\" from cmd.c\n\nBelow patch removes the following warning during compilation.\n\ndrivers\/net\/wireless\/libertas\/cmd.c:826: warning: unused variable 'old_channel'\n\nSigned-off-by : Manish Katiyar <mkatiyar@gmail.com>\nAcked-by: Dan Williams <aeade43d0f8ae14e7c44fa81fe17c1635ae376fe@redhat.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/libertas\/cmd.c\n+++ drivers\/net\/wireless\/libertas\/cmd.c\n@@ -823,7 +823,9 @@\n int lbs_set_channel(struct lbs_private *priv, u8 channel)\n {\n \tstruct cmd_ds_802_11_rf_channel cmd;\n+#ifdef DEBUG\n \tu8 old_channel = priv->curbssparams.channel;\n+#endif\n \tint ret = 0;\n \n \tlbs_deb_enter(LBS_DEB_CMD);\n"} {"commit":"26970c9c791ab555bc2f362878b47f880d5e9643","subject":"invoker: Do not raise SIGSTOP if a SIGCONT was already received.","message":"invoker: Do not raise SIGSTOP if a SIGCONT was already received.\n","repos":"backtrace-labs\/invoker","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- invoker.c\n+++ invoker.c\n@@ -29,6 +29,8 @@\n \tchar *tracer;\n \tchar **args;\n };\n+\n+static sig_atomic_t continued = 0;\n \n static void\n usage(FILE *fp)\n@@ -72,6 +74,16 @@\n }\n \n static void\n+continue_handler(int unused)\n+{\n+\n+\t(void)unused;\n+\n+\tcontinued = 1;\n+\treturn;\n+}\n+\n+static void\n inv_log_syslog(int level, const char *fmt, ...)\n {\n \tva_list ap;\n@@ -353,6 +365,9 @@\n \tint n = 0;\n \tbool suspend = false;\n \tbool use_ats_compatibility = true;\n+\n+\t\/* Establish SIGCONT handler as early as lazily possible. *\/\n+\t(void)signal(SIGCONT, continue_handler);\n \n \topenlog(\"invoker\", LOG_PID, LOG_DAEMON);\n \tconfig.log = inv_log_syslog;\n@@ -456,9 +471,11 @@\n \t\t\tconfig.log(LOG_ERR, \"failed to set death signal: %s\\n\",\n \t\t\t strerror(errno));\n \t\t}\n-\n #endif \/* __linux__ && PR_SET_PDEATHSIG *\/\n-\t\traise(SIGSTOP);\n+\n+\t\t\/* Raise signal only if continue signal wasn't received. *\/\n+\t\tif (continued == 0)\n+\t\t\traise(SIGSTOP);\n \t}\n \n \tif (config.target == 0) {\n"} {"commit":"f96bc0932a6b8cc433756c45de86b963304877b5","subject":"Dont call ata_finish in ad_dump as that is no longer needed and causes panic. Dont try to enable read\/write caching on devices that doesn't support it, this reduces the noise from ATA on flash devices and the like.","message":"Dont call ata_finish in ad_dump as that is no longer needed and causes panic.\nDont try to enable read\/write caching on devices that doesn't support it,\nthis reduces the noise from ATA on flash devices and the like.\n\nApproved by: re@ (scottl)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/ata\/ata-disk.c\n+++ sys\/dev\/ata\/ata-disk.c\n@@ -203,8 +203,7 @@\n struct ata_channel *ch = device_get_softc(device_get_parent(dev));\n struct ata_device *atadev = device_get_softc(dev);\n \n- \/* if detach pending flag set, return error *\/\n-\n+ \/* if detach pending, return error *\/\n if (((atadev->unit == ATA_MASTER) && !(ch->devices & ATA_ATA_MASTER)) ||\n \t((atadev->unit == ATA_SLAVE) && !(ch->devices & ATA_ATA_SLAVE))) {\n \treturn 1;\n@@ -327,7 +326,6 @@\n \tdo {\n \t DELAY(20);\n \t} while (ch->hw.end_transaction(&request) == ATA_OP_CONTINUES);\n-\tata_finish(&request);\n }\n if (request.status & ATA_S_ERROR)\n \treturn EIO;\n@@ -341,14 +339,17 @@\n \n ATA_SETMODE(device_get_parent(dev), dev);\n \n- \/* enable read caching *\/\n- ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_RCACHE, 0, 0);\n-\n- \/* enable write caching if enabled *\/\n- if (ata_wc)\n-\tata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_WCACHE, 0, 0);\n- else\n-\tata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_DIS_WCACHE, 0, 0);\n+ \/* enable readahead caching *\/\n+ if (atadev->param.support.command1 & ATA_SUPPORT_LOOKAHEAD)\n+\tata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_RCACHE, 0, 0);\n+\n+ \/* enable write caching if supported and configured *\/\n+ if (atadev->param.support.command1 & ATA_SUPPORT_WRITECACHE) {\n+\tif (ata_wc)\n+\t ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_ENAB_WCACHE, 0, 0);\n+\telse\n+\t ata_controlcmd(dev, ATA_SETFEATURES, ATA_SF_DIS_WCACHE, 0, 0);\n+ }\n \n \/* use multiple sectors\/interrupt if device supports it *\/\n if (ad_version(atadev->param.version_major)) {\n"} {"commit":"07bf1e6e7811c4f7a9cad11a4d662cbba2c7d27f","subject":"color2: Switched all includes to letmecreate.h for testing purposes","message":"color2: Switched all includes to letmecreate.h for testing purposes\n","repos":"CreatorDev\/LetMeCreateIoT,CreatorDev\/LetMeCreateIoT,mtusnio\/LetMeCreateIoT,mtusnio\/LetMeCreateIoT,CreatorDev\/LetMeCreateIoT,CreatorDev\/LetMeCreateIoT,mtusnio\/LetMeCreateIoT,mtusnio\/LetMeCreateIoT","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/color2\/main.c\n+++ examples\/color2\/main.c\n@@ -1,12 +1,11 @@\n+\n #include <stdio.h>\n \n #include <contiki.h>\n \n #include <sys\/clock.h>\n \n-#include \"letmecreate\/click\/color2.h\"\n-#include \"letmecreate\/core\/i2c.h\"\n-#include \"letmecreate\/core\/debug.h\"\n+#include \"letmecreate\/letmecreate.h\"\n \n PROCESS(main_process, \"Main process\");\n AUTOSTART_PROCESSES(&main_process);\n"} {"commit":"813abbbaa3750c561f8ed7560664e652997be3dc","subject":"xen-netback: make ops structs const","message":"xen-netback: make ops structs const\n\nAll tables of function pointers should be const to make hacks\nmore difficult. Compile tested only.\n\nSigned-off-by: Stephen Hemminger <a072e933f45880fe04500ea083d5c7f6e81a06f0@vyatta.com>\nAcked-by: Ian Campbell <9be92b3dbbd6611e3e4c9209fb3d04b4919e7cca@citrix.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/xen-netback\/interface.c\n+++ drivers\/net\/xen-netback\/interface.c\n@@ -223,7 +223,7 @@\n \t}\n }\n \n-static struct ethtool_ops xenvif_ethtool_ops = {\n+static const struct ethtool_ops xenvif_ethtool_ops = {\n \t.get_link\t= ethtool_op_get_link,\n \n \t.get_sset_count = xenvif_get_sset_count,\n@@ -231,7 +231,7 @@\n \t.get_strings = xenvif_get_strings,\n };\n \n-static struct net_device_ops xenvif_netdev_ops = {\n+static const struct net_device_ops xenvif_netdev_ops = {\n \t.ndo_start_xmit\t= xenvif_start_xmit,\n \t.ndo_get_stats\t= xenvif_get_stats,\n \t.ndo_open\t= xenvif_open,\n"} {"commit":"ed3e2dff4b8015f6b024c7e85202510ca35c93cd","subject":"Increase CISS_MAX_PHYSTGT to 256 so that it matches what the controller might give us. Without this, certain data structures get sized incorrectly, leading to a panic on certain cards that want to use high-value target numbers.","message":"Increase CISS_MAX_PHYSTGT to 256 so that it matches what the controller might\ngive us. Without this, certain data structures get sized incorrectly, leading\nto a panic on certain cards that want to use high-value target numbers.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/ciss\/cissvar.h\n+++ sys\/dev\/ciss\/cissvar.h\n@@ -176,7 +176,7 @@\n \n #define CISS_PHYSICAL_SHIFT\t5\n #define CISS_PHYSICAL_BASE\t(1 << CISS_PHYSICAL_SHIFT)\n-#define CISS_MAX_PHYSTGT\t15\n+#define CISS_MAX_PHYSTGT\t256\n \n #define CISS_IS_PHYSICAL(bus)\t(bus >= CISS_PHYSICAL_BASE)\n #define CISS_CAM_TO_PBUS(bus)\t(bus - CISS_PHYSICAL_BASE)\n"} {"commit":"1a7d7eac6f651c00e954023dd2542f0c65ef66b7","subject":"[SCSI] mpt2sas: Bump version 05.100.00.00","message":"[SCSI] mpt2sas: Bump version 05.100.00.00\n\nUpgraded version string.\n\nSigned-off-by: Kashyap Desai <5c76991d5e6936969ae71bb8255acf4ae2e4f8da@lsi.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@suse.de>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/mpt2sas\/mpt2sas_base.h\n+++ drivers\/scsi\/mpt2sas\/mpt2sas_base.h\n@@ -69,11 +69,11 @@\n #define MPT2SAS_DRIVER_NAME\t\t\"mpt2sas\"\n #define MPT2SAS_AUTHOR\t\"LSI Corporation <DL-MPTFusionLinux@lsi.com>\"\n #define MPT2SAS_DESCRIPTION\t\"LSI MPT Fusion SAS 2.0 Device Driver\"\n-#define MPT2SAS_DRIVER_VERSION\t\t\"04.100.01.02\"\n-#define MPT2SAS_MAJOR_VERSION\t\t04\n+#define MPT2SAS_DRIVER_VERSION\t\t\"05.100.00.00\"\n+#define MPT2SAS_MAJOR_VERSION\t\t05\n #define MPT2SAS_MINOR_VERSION\t\t100\n-#define MPT2SAS_BUILD_VERSION\t\t01\n-#define MPT2SAS_RELEASE_VERSION\t\t02\n+#define MPT2SAS_BUILD_VERSION\t\t00\n+#define MPT2SAS_RELEASE_VERSION\t\t00\n \n \/*\n * Set MPT2SAS_SG_DEPTH value based on user input.\n"} {"commit":"1a9de3115dce9f5efd9554a1517e54690eef1821","subject":"PersistentStore: expose deinit() as a static function","message":"PersistentStore: expose deinit() as a static function\n\nThis is needed (publicly) in the test suite. I considered hiding this behind\nan #ifdef, but we still need that function (privately) in the main app.\n\nThis way, we can call\n PersistentStore::deinit();\ndirectly instead of\n PersistentStore::instance().deinit();\nwhich would create a new PersistentStore if we didn't already have one.\n","repos":"shinnok\/tarsnap-gui,shinnok\/tarsnap-gui,shinnok\/tarsnap-gui,shinnok\/tarsnap-gui,Tarsnap\/tarsnap-gui,Tarsnap\/tarsnap-gui,Tarsnap\/tarsnap-gui,shinnok\/tarsnap-gui,Tarsnap\/tarsnap-gui,Tarsnap\/tarsnap-gui","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/persistentmodel\/persistentstore.h\n+++ src\/persistentmodel\/persistentstore.h\n@@ -34,6 +34,10 @@\n \/\/! Removes the existing database if it is initialized. Does not lock.\n void purge();\n \n+ \/\/! Closes the database connection (if it exists). Normally not used by\n+ \/\/! external classes, with the possible exception of the test suite.\n+ static void deinit();\n+\n public slots:\n \/\/! Locks the database and runs a query.\n bool runQuery(QSqlQuery query);\n@@ -55,8 +59,6 @@\n void operator=(PersistentStore const &);\n \/\/ Locks, upgrades the version if it is old, creates a new one otherwise.\n bool init();\n- \/\/ Locks, then closes the database connection.\n- void deinit();\n \n static bool _initialized;\n static QMutex _mutex;\n"} {"commit":"c138b43f21961dbc95d48117d8a6dbdf2c6c90cf","subject":"Use m_collapse(9) to collapse mbuf chains instead of relying on shortest possible chain of mbufs of m_defrag(9). What we want is chains of mbufs that can be safely stored to a Tx descriptor which can have up to STGE_MAXTXSEGS mbufs. The ethernet controller does not need to align Tx buffers on 32bit boundary. So the use of m_defrag(9) was waste of time.","message":"Use m_collapse(9) to collapse mbuf chains instead of relying on\nshortest possible chain of mbufs of m_defrag(9). What we want is\nchains of mbufs that can be safely stored to a Tx descriptor which\ncan have up to STGE_MAXTXSEGS mbufs. The ethernet controller does\nnot need to align Tx buffers on 32bit boundary. So the use of\nm_defrag(9) was waste of time.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/stge\/if_stge.c\n+++ sys\/dev\/stge\/if_stge.c\n@@ -1229,7 +1229,7 @@\n \terror = bus_dmamap_load_mbuf_sg(sc->sc_cdata.stge_tx_tag,\n \t txd->tx_dmamap, *m_head, txsegs, &nsegs, 0);\n \tif (error == EFBIG) {\n-\t\tm = m_defrag(*m_head, M_DONTWAIT);\n+\t\tm = m_collapse(*m_head, M_DONTWAIT, STGE_MAXTXSEGS);\n \t\tif (m == NULL) {\n \t\t\tm_freem(*m_head);\n \t\t\t*m_head = NULL;\n"} {"commit":"d6c6dae1401e1487fd53001cae46425bf54d3d5b","subject":"added comment","message":"added comment\n","repos":"spetroce\/mio,spetroce\/mio,spetroce\/mio,spetroce\/mio","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ipc\/sem.h\n+++ ipc\/sem.h\n@@ -28,6 +28,9 @@\n EXP_CHK(Uninit() == true, return)\n }\n \n+ \/\/If kTryCreate is true and kMustCreate is false, Init will attempt\n+ \/\/to create the semaphore (no error thrown if it already exists).\n+ \/\/If kTryCreate and kMustCreate are true, Init will throw an error if the semaphore already exists in the system.\n bool Init(const std::string kSemName, const unsigned int kInitialSemValue = 0,\n const bool kTryCreate = true, const bool kMustCreate = false){\n EXP_CHK(!is_init_, return(true))\n"} {"commit":"790f39a2d5f03623b027f340b945f135d006ceba","subject":"[SCSI] iscsi: support mutiple daemons","message":"[SCSI] iscsi: support mutiple daemons\n\nPatch from david.somayajulu@qlogic.com and cleaned up by Tomo.\n\nqla4xxx is going to have a different daemon so this patch\njust routes the events to the right daemon.\n\nSigned-off-by: Mike Christie <6fe105eefab41990d7ec714c6c25ade3095cdb48@cs.wisc.edu>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/scsi_transport_iscsi.c\n+++ drivers\/scsi\/scsi_transport_iscsi.c\n@@ -36,6 +36,7 @@\n #define ISCSI_HOST_ATTRS 0\n \n struct iscsi_internal {\n+\tint daemon_pid;\n \tstruct scsi_transport_template t;\n \tstruct iscsi_transport *iscsi_transport;\n \tstruct list_head list;\n@@ -145,7 +146,6 @@\n \t\t\t NULL);\n \n static struct sock *nls;\n-static int daemon_pid;\n static DEFINE_MUTEX(rx_queue_mutex);\n \n struct mempool_zone {\n@@ -572,13 +572,13 @@\n }\n \n static int\n-iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb)\n+iscsi_unicast_skb(struct mempool_zone *zone, struct sk_buff *skb, int pid)\n {\n \tunsigned long flags;\n \tint rc;\n \n \tskb_get(skb);\n-\trc = netlink_unicast(nls, skb, daemon_pid, MSG_DONTWAIT);\n+\trc = netlink_unicast(nls, skb, pid, MSG_DONTWAIT);\n \tif (rc < 0) {\n \t\tmempool_free(skb, zone->pool);\n \t\tprintk(KERN_ERR \"iscsi: can not unicast skb (%d)\\n\", rc);\n@@ -600,8 +600,13 @@\n \tstruct sk_buff *skb;\n \tstruct iscsi_uevent *ev;\n \tchar *pdu;\n+\tstruct iscsi_internal *priv;\n \tint len = NLMSG_SPACE(sizeof(*ev) + sizeof(struct iscsi_hdr) +\n \t\t\t data_size);\n+\n+\tpriv = iscsi_if_transport_lookup(conn->transport);\n+\tif (!priv)\n+\t\treturn -EINVAL;\n \n \tmempool_zone_complete(conn->z_pdu);\n \n@@ -613,7 +618,7 @@\n \t\treturn -ENOMEM;\n \t}\n \n-\tnlh = __nlmsg_put(skb, daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);\n+\tnlh = __nlmsg_put(skb, priv->daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);\n \tev = NLMSG_DATA(nlh);\n \tmemset(ev, 0, sizeof(*ev));\n \tev->transport_handle = iscsi_handle(conn->transport);\n@@ -626,7 +631,7 @@\n \tmemcpy(pdu, hdr, sizeof(struct iscsi_hdr));\n \tmemcpy(pdu + sizeof(struct iscsi_hdr), data, data_size);\n \n-\treturn iscsi_unicast_skb(conn->z_pdu, skb);\n+\treturn iscsi_unicast_skb(conn->z_pdu, skb, priv->daemon_pid);\n }\n EXPORT_SYMBOL_GPL(iscsi_recv_pdu);\n \n@@ -635,7 +640,12 @@\n \tstruct nlmsghdr\t*nlh;\n \tstruct sk_buff\t*skb;\n \tstruct iscsi_uevent *ev;\n+\tstruct iscsi_internal *priv;\n \tint len = NLMSG_SPACE(sizeof(*ev));\n+\n+\tpriv = iscsi_if_transport_lookup(conn->transport);\n+\tif (!priv)\n+\t\treturn;\n \n \tmempool_zone_complete(conn->z_error);\n \n@@ -646,7 +656,7 @@\n \t\treturn;\n \t}\n \n-\tnlh = __nlmsg_put(skb, daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);\n+\tnlh = __nlmsg_put(skb, priv->daemon_pid, 0, 0, (len - sizeof(*nlh)), 0);\n \tev = NLMSG_DATA(nlh);\n \tev->transport_handle = iscsi_handle(conn->transport);\n \tev->type = ISCSI_KEVENT_CONN_ERROR;\n@@ -656,7 +666,7 @@\n \tev->r.connerror.cid = conn->cid;\n \tev->r.connerror.sid = iscsi_conn_get_sid(conn);\n \n-\tiscsi_unicast_skb(conn->z_error, skb);\n+\tiscsi_unicast_skb(conn->z_error, skb, priv->daemon_pid);\n \n \tdev_printk(KERN_INFO, &conn->dev, \"iscsi: detected conn error (%d)\\n\",\n \t\t error);\n@@ -686,7 +696,7 @@\n \tnlh = __nlmsg_put(skb, pid, seq, t, (len - sizeof(*nlh)), 0);\n \tnlh->nlmsg_flags = flags;\n \tmemcpy(NLMSG_DATA(nlh), payload, size);\n-\treturn iscsi_unicast_skb(z_reply, skb);\n+\treturn iscsi_unicast_skb(z_reply, skb, pid);\n }\n \n static int\n@@ -698,11 +708,16 @@\n \tstruct iscsi_cls_conn *conn;\n \tstruct nlmsghdr\t*nlhstat;\n \tstruct iscsi_uevent *evstat;\n+\tstruct iscsi_internal *priv;\n \tint len = NLMSG_SPACE(sizeof(*ev) +\n \t\t\t sizeof(struct iscsi_stats) +\n \t\t\t sizeof(struct iscsi_stats_custom) *\n \t\t\t ISCSI_STATS_CUSTOM_MAX);\n \tint err = 0;\n+\n+\tpriv = iscsi_if_transport_lookup(transport);\n+\tif (!priv)\n+\t\treturn -EINVAL;\n \n \tconn = iscsi_conn_lookup(ev->u.get_stats.sid, ev->u.get_stats.cid);\n \tif (!conn)\n@@ -720,7 +735,7 @@\n \t\t\treturn -ENOMEM;\n \t\t}\n \n-\t\tnlhstat = __nlmsg_put(skbstat, daemon_pid, 0, 0,\n+\t\tnlhstat = __nlmsg_put(skbstat, priv->daemon_pid, 0, 0,\n \t\t\t\t (len - sizeof(*nlhstat)), 0);\n \t\tevstat = NLMSG_DATA(nlhstat);\n \t\tmemset(evstat, 0, sizeof(*evstat));\n@@ -746,7 +761,7 @@\n \t\tskb_trim(skbstat, NLMSG_ALIGN(actual_size));\n \t\tnlhstat->nlmsg_len = actual_size;\n \n-\t\terr = iscsi_unicast_skb(conn->z_pdu, skbstat);\n+\t\terr = iscsi_unicast_skb(conn->z_pdu, skbstat, priv->daemon_pid);\n \t} while (err < 0 && err != -ECONNREFUSED);\n \n \treturn err;\n@@ -981,6 +996,8 @@\n \tif (!try_module_get(transport->owner))\n \t\treturn -EINVAL;\n \n+\tpriv->daemon_pid = NETLINK_CREDS(skb)->pid;\n+\n \tswitch (nlh->nlmsg_type) {\n \tcase ISCSI_UEVENT_CREATE_SESSION:\n \t\terr = iscsi_if_create_session(priv, ev);\n@@ -1073,7 +1090,6 @@\n \t\t\tskb_pull(skb, skb->len);\n \t\t\tgoto free_skb;\n \t\t}\n-\t\tdaemon_pid = NETLINK_CREDS(skb)->pid;\n \n \t\twhile (skb->len >= NLMSG_SPACE(0)) {\n \t\t\tint err;\n"} {"commit":"6a8e7132e063d4db83cb7e5eea5ae00234aee259","subject":"Update main.c","message":"Update main.c","repos":"PhillyNJ\/SAMD21,PhillyNJ\/SAMD21,PhillyNJ\/SAMD21,PhillyNJ\/SAMD21,PhillyNJ\/SAMD21","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/ds1302\/main.c\n+++ examples\/ds1302\/main.c\n@@ -1,12 +1,12 @@\n \/**\n * Example DS1302 with SAMD21 xplained pro\n- *\tPin Out - To change pinout to different pins, see ds1302.h\n- *\tCE ->\tPORT_PB00\n- * DATA -> PORT_PB01\n+ * Pin Out - To change pinout to different pins, see ds1302.h\n+ * CE ->\tPORT_PB00\n+ * DATA ->\tPORT_PB01\n * SCLK->\tPORT_PB06\n- * If you change the pins to differnt port\/group a, you need to update any register calls \n- * Notes\n- * SAMD21 by defaults rund at 8mhz\n+ * If you change the pins to different port\/group, you need to update any register calls \n+ * \n+ * SAMD21 by default runs at 8mhz\n *\/\n #include <asf.h>\n #include \"conf_usart.h\"\n"} {"commit":"396c897903751067764288f77f4ab3a1f194ddb7","subject":"Fixed refreshs of input lines.","message":"Fixed refreshs of input lines.\n","repos":"chrender\/libpixelif","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pixel_interface\/pixel_interface.c\n+++ src\/pixel_interface\/pixel_interface.c\n@@ -2078,8 +2078,30 @@\n }\n \n \n+static void clear_input_line() {\n+ int i;\n+\n+ \/\/ Fill first input line.\n+ screen_pixel_interface->fill_area(\n+ *current_input_x,\n+ *current_input_y,\n+ z_windows[0]->xsize - z_windows[0]->rightmargin - *current_input_x + 2,\n+ line_height,\n+ z_to_rgb_colour(z_windows[0]->output_background_colour));\n+\n+ for (i=1; i<nof_input_lines; i++) {\n+ screen_pixel_interface->fill_area(\n+ z_windows[0]->xpos + z_windows[0]->leftmargin,\n+ *current_input_y + i*line_height,\n+ z_windows[0]->xsize - z_windows[0]->leftmargin\n+ - z_windows[0]->rightmargin,\n+ line_height,\n+ z_to_rgb_colour(z_windows[0]->output_background_colour));\n+ }\n+}\n+\n+\n static void refresh_input_line(bool display_cursor) {\n- int i;\n int nof_line_breaks, nof_new_input_lines;\n int last_active_z_window_id = -1;\n if (input_line_on_screen == false)\n@@ -2106,23 +2128,7 @@\n \n z_windows[0]->ycursorpos = *current_input_y - z_windows[0]->ypos;\n \n- \/\/ Fill first input line.\n- screen_pixel_interface->fill_area(\n- *current_input_x,\n- *current_input_y,\n- z_windows[0]->xsize - z_windows[0]->rightmargin - *current_input_x + 2,\n- line_height,\n- z_to_rgb_colour(z_windows[0]->output_background_colour));\n-\n- for (i=1; i<nof_input_lines; i++) {\n- screen_pixel_interface->fill_area(\n- z_windows[0]->xpos + z_windows[0]->leftmargin,\n- *current_input_y + i*line_height,\n- z_windows[0]->xsize - z_windows[0]->leftmargin\n- - z_windows[0]->rightmargin,\n- line_height,\n- z_to_rgb_colour(z_windows[0]->output_background_colour));\n- }\n+ clear_input_line();\n \n nof_line_breaks = draw_glyph_string(current_input_buffer, 0, bold_font);\n TRACE_LOG(\"nof_line_breaks: %d\\n\", nof_line_breaks);\n@@ -3354,8 +3360,13 @@\n \/\/refresh_cursor(active_z_window_id);\n *\/\n \n- refresh_input_line(false);\n- break_line(0);\n+ \/\/refresh_input_line(false);\n+ clear_input_line();\n+\n+ z_windows[0]->ycursorpos = *current_input_y - z_windows[0]->ypos;\n+ z_windows[0]->xcursorpos = *current_input_x - z_windows[0]->xpos\n+ - z_windows[i]->leftmargin;\n+\n input_line_on_screen = false;\n nof_input_lines = 0;\n \n@@ -3721,7 +3732,7 @@\n \n \n static bool input_must_be_repeated_by_story() {\n- return false;\n+ return true;\n }\n \n \n"} {"commit":"cbdd72f58e2edfa4f9e871e9c43bf2144bd54e78","subject":"style nit in r188815","message":"style nit in r188815\n\nPointed out by:\tjhb, rpaulo\nApproved by:\tjhb (mentor)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/fs\/udf\/udf_vnops.c\n+++ sys\/fs\/udf\/udf_vnops.c\n@@ -839,7 +839,7 @@\n \t*a->a_eofflag = uiodir.eofflag;\n \tuio->uio_offset = ds->offset + ds->off;\n \n-\tif(error < 0)\n+\tif (error < 0)\n \t\terror = 0;\n \tif (!error)\n \t\terror = ds->error;\n"} {"commit":"ad57625663826182270c97ce9155edfe19689015","subject":"","message":"\n\ngit-svn-id: svn:\/\/localhost\/ira\/trunk@16 9740f23c-95bd-2145-a747-490f655ec538\n","repos":"swojtasiak\/fcml-lib,swojtasiak\/fcml-lib,swojtasiak\/fcml-lib","returncode":1,"stderr":"error: pathspec 'ira_int.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- ira_int.h\n+++ ira_int.h\n@@ -0,0 +1,103 @@\n+#ifndef IRA_INT_H_INCLUDED\r\n+#define IRA_INT_H_INCLUDED\r\n+\r\n+#include <stdint.h>\n+#include <stdio.h>\n+#include \"ira.h\"\n+\r\n+\/* Internal description of instructions' details. *\/\n+\r\n+struct opcode_details {\r\n+ uint16_t allowed_prefixes; \/* Flags describing prefixes, that are allowed for specified opcode. *\/\r\n+ uint32_t opcode_flags; \/* Flags describing some details about instruction opcodes. *\/\r\n+ uint8_t **opcode_part_pos; \/* Overrides the standard location of opcode fields. *\/\r\n+\tuint8_t opcodes[4]; \/* 1,2 or 3 byte of available opcodes *\/\r\n+};\r\n+\r\n+struct instruction_details {\r\n+ char mnemonic[20]; \/* Instruction mnemonic. *\/\r\n+ struct opcode_details** opcodes; \/* Description of all available instruction's opcodes. *\/\r\n+};\n+\n+\/* Structures used to store information about memory. *\/\n+\n+struct memory_stream {\n+ void *base_address; \/* Base address of memory. *\/\n+ uint32_t offset; \/* Offset. *\/\n+ uint32_t size; \/* Size. *\/\n+};\n+\n+\/* Methods used for streaming. *\/\n+\n+enum seek_type {\n+ START = 0,\n+ END,\n+ CURRENT\n+};\n+\n+void stream_seek( struct memory_stream *stream, uint32_t offset, enum seek_type type );\n+\n+uint8_t stream_read( struct memory_stream *stream, int *result );\n+\n+uint8_t stream_peek( struct memory_stream *stream, int *result );\n+\n+\/* Disassemblation context. *\/\n+\n+enum prefix_types {\n+ GROUP_1 = 1,\n+ GROUP_2,\n+ GROUP_3,\n+ GROUP_4,\n+ REX\n+};\n+\n+struct instruction_prefix {\n+ uint8_t prefix; \/* Prefix itself. *\/\n+ uint8_t prefix_type; \/* Type of prefix, see enumeration above. *\/\n+ uint8_t mandatory_prefix; \/* 1 if prefix can be treated as mendatory one. *\/\n+};\n+\n+struct diss_context {\n+ enum operation_mode mode; \/* Architecture. *\/\n+ uint16_t operand_size_attribute; \/* Operand size attribute. *\/\n+ uint16_t address_size_attribute; \/* Address size attribute. *\/\n+ struct instruction_prefix prefixes[12]; \/* Identified prefixes. *\/\n+ uint8_t instruction_prefix_count; \/* Number of prefixes identified for instruction. *\/\n+ struct memory_stream *stream; \/* Stream. *\/\n+};\n+\n+\/* Structures used to build disassemblation arrays. *\/\r\n+\n+typedef int arguments_decoder( struct diss_context* );\n+\n+\/* Internal representation of decoding tree. *\/\r\n+\r\n+struct decoding_option {\r\n+ uint8_t option_type; \/* Option type: Opcode, Prefix, Escape etc. *\/\r\n+ uint8_t data; \/* Data used by disassembler to check if this is a appropriate option. *\/\r\n+};\r\n+\r\n+struct decoding_options {\r\n+ int count;\r\n+ struct decoding_option **decoding_option;\r\n+};\n+\n+struct primary_opcode_details {\n+ int escape_bytes_count;\n+ uint8_t escape_bytes[3];\n+ uint8_t mandatory_prefix;\n+};\n+\n+struct primary_opcode_decoding {\n+ void *decoding_details;\n+ arguments_decoder *decoder;\n+};\n+\n+struct primary_opcode_def {\n+ uint8_t opcode_details_count;\n+ struct primary_opcode_details opcode_details[20];\n+};\n+\n+void identify_prefixes( struct diss_context *context );\n+\r\n+#endif \/\/ IRA_INT_H_INCLUDED\r\n"} {"commit":"da1e4faf4de7bd26bef9568bc3bc29781ddf6b47","subject":"Staging: bcm: Fix white space issues in InterfaceInit.h","message":"Staging: bcm: Fix white space issues in InterfaceInit.h\n\nThis patch fixes white space issue in InterfaceInit.h\nas reported by checkpatch.pl.\n\nSigned-off-by: Kevin McKinney <276c5fcfd53a88c2e5d996063a97c91e0154f2a8@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/bcm\/InterfaceInit.h\n+++ drivers\/staging\/bcm\/InterfaceInit.h\n@@ -1,21 +1,20 @@\n #ifndef _INTERFACE_INIT_H\n #define _INTERFACE_INIT_H\n \n-#define BCM_USB_VENDOR_ID_T3 \t0x198f\n-#define BCM_USB_VENDOR_ID_FOXCONN 0x0489\n-#define BCM_USB_VENDOR_ID_ZTE 0x19d2\n+#define BCM_USB_VENDOR_ID_T3\t0x198f\n+#define BCM_USB_VENDOR_ID_FOXCONN\t0x0489\n+#define BCM_USB_VENDOR_ID_ZTE\t0x19d2\n \n-#define BCM_USB_PRODUCT_ID_T3 \t0x0300\n-#define BCM_USB_PRODUCT_ID_T3B \t0x0210\n-#define BCM_USB_PRODUCT_ID_T3L \t0x0220\n-#define BCM_USB_PRODUCT_ID_SM250 \t0xbccd\n-#define BCM_USB_PRODUCT_ID_SYM 0x15E\n-#define BCM_USB_PRODUCT_ID_1901 0xe017\n-#define BCM_USB_PRODUCT_ID_226 0x0132\n-#define BCM_USB_PRODUCT_ID_ZTE_TU25 0x0007\n+#define BCM_USB_PRODUCT_ID_T3\t0x0300\n+#define BCM_USB_PRODUCT_ID_T3B\t0x0210\n+#define BCM_USB_PRODUCT_ID_T3L\t0x0220\n+#define BCM_USB_PRODUCT_ID_SM250\t0xbccd\n+#define BCM_USB_PRODUCT_ID_SYM\t0x15E\n+#define BCM_USB_PRODUCT_ID_1901\t0xe017\n+#define BCM_USB_PRODUCT_ID_226\t0x0132\n+#define BCM_USB_PRODUCT_ID_ZTE_TU25\t0x0007\n \n-#define BCM_USB_MINOR_BASE \t\t192\n-\n+#define BCM_USB_MINOR_BASE\t192\n \n INT InterfaceInitialize(void);\n \n@@ -24,4 +23,3 @@\n INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter);\n \n #endif\n-\n"} {"commit":"4bde44c9915d8d2eac3766919d62ee4453a27f99","subject":"runtime\/cgo: fix build on freebsd\/arm","message":"runtime\/cgo: fix build on freebsd\/arm\n\nThis CL is in preparation to make cgo work on freebsd\/arm.\n\nLGTM=iant\nR=iant\nCC=golang-codereviews\nhttps:\/\/codereview.appspot.com\/60500044\n","repos":"apparentlymart\/golang,apparentlymart\/golang,apparentlymart\/golang,apparentlymart\/golang,apparentlymart\/golang,apparentlymart\/golang,apparentlymart\/golang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pkg\/runtime\/cgo\/gcc_freebsd_arm.c\n+++ src\/pkg\/runtime\/cgo\/gcc_freebsd_arm.c\n@@ -4,6 +4,7 @@\n \n #include <sys\/types.h>\n #include <machine\/sysarch.h>\n+#include <sys\/signalvar.h>\n #include <pthread.h>\n #include <signal.h>\n #include <string.h>\n"} {"commit":"e766447f75dfe03b1309fe38ab75e68c0d567ba6","subject":"Attempt to work around problems caused by spurious interrupts and uninitialised interrupts in the APIC. This seems to fix the problems being seen on systems using the RCC chipsets, eg. Dell PowerEdge 24x0.","message":"Attempt to work around problems caused by spurious interrupts and\nuninitialised interrupts in the APIC. This seems to fix the problems\nbeing seen on systems using the RCC chipsets, eg. Dell PowerEdge 24x0.\n\nThe actual nature of the problem probably needs further investigation,\nbut this patch allows us to actually function on these systems.\n\nSubmitted by:\tDrew Eckhardt <drew@Poohsticks.Org>\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/i386\/i386\/mpapic.c\n+++ sys\/i386\/i386\/mpapic.c\n@@ -167,6 +167,27 @@\n \t\n \tfor (pin = 0; pin < maxpin; ++pin) {\n \t\tint bus, bustype, irq;\n+\t\t\n+\t\tselect = pin * 2 + IOAPIC_REDTBL0;\t\/* register *\/\n+\t\t\/* \n+\t\t * Always disable interrupts, and by default map\n+\t\t * pin X to IRQX because the disable doesn't stick\n+\t\t * and the uninitialize vector will get translated \n+\t\t * into a panic.\n+\t\t *\n+\t\t * This is correct for IRQs 1 and 3-15. In the other cases, \n+\t\t * any robust driver will handle the spurious interrupt, and \n+\t\t * the effective NOP beats a panic.\n+\t\t *\n+\t\t * A dedicated \"bogus interrupt\" entry in the IDT would\n+\t\t * be a nicer hack, although some one should find out \n+\t\t * why some systems are generating interrupts when they\n+\t\t * shouldn't and stop the carnage.\n+\t\t *\/\n+\t\tvector = NRSVIDT + pin;\t\t\t\/* IDT vec *\/\n+\t\tio_apic_write(apic, select,\n+\t\t\t (io_apic_read(apic, select) & ~IOART_INTMASK \n+\t\t\t & ~0xff)|IOART_INTMSET|vector);\n \t\t\n \t\t\/* we only deal with vectored INTs here *\/\n \t\tif (apic_int_type(apic, pin) != 0)\n@@ -209,7 +230,6 @@\n \t\tif (apic != 0 || pin != irq)\n \t\t\tprintf(\"IOAPIC #%d intpin %d -> irq %d\\n\",\n \t\t\t apic, pin, irq);\n-\t\tselect = pin * 2 + IOAPIC_REDTBL0;\t\/* register *\/\n \t\tvector = NRSVIDT + irq;\t\t\t\/* IDT vec *\/\n \t\tio_apic_write(apic, select, flags | vector);\n \t\tio_apic_write(apic, select + 1, target);\n"} {"commit":"9e412a0a581e07cf1551bbd9b4ae69654e474a3c","subject":"staging\/gdm72xx: sdio_boot: replace firmware upgrade API","message":"staging\/gdm72xx: sdio_boot: replace firmware upgrade API\n\nReplace firmware upgrade API in download_image().\n\nSigned-off-by: Macpaul Lin <6a93d8531d959e1750a07b0644436ded08a589a1@gmail.com>\nCc: Macpaul Lin <36727fb51abe17ad607f8f6bb2e8c1f935e6588e@gmail.com>\nCc: Paul Stewart <3c7b6905653b79322a22957b2a611e2638095229@chromium.org>\nCc: Ben Chan <cbf05950e17ecad3ef3493de163419467bf3e151@chromium.org>\nCc: Sage Ahn <7c1fec5f6af70da0b39100d0af7d6a4fc69d539a@gctsemi.com>\nCc: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\nCc: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/gdm72xx\/sdio_boot.c\n+++ drivers\/staging\/gdm72xx\/sdio_boot.c\n@@ -24,15 +24,18 @@\n #include <linux\/mmc\/card.h>\n #include <linux\/mmc\/sdio_func.h>\n \n+#include <linux\/firmware.h>\n+\n #include \"gdm_sdio.h\"\n \n #define TYPE_A_HEADER_SIZE\t4\n #define TYPE_A_LOOKAHEAD_SIZE 16\n-#define YMEM0_SIZE\t\t\t0x8000\t\/* 32kbytes *\/\n+#define YMEM0_SIZE\t\t0x8000\t\/* 32kbytes *\/\n #define DOWNLOAD_SIZE\t\t(YMEM0_SIZE - TYPE_A_HEADER_SIZE)\n \n-#define KRN_PATH\t\"\/lib\/firmware\/gdm72xx\/gdmskrn.bin\"\n-#define RFS_PATH\t\"\/lib\/firmware\/gdm72xx\/gdmsrfs.bin\"\n+#define FW_DIR\t\t\t\"gdm72xx\/\"\n+#define FW_KRN\t\t\t\"gdmskrn.bin\"\n+#define FW_RFS\t\t\t\"gdmsrfs.bin\"\n \n static u8 *tx_buf;\n \n@@ -52,57 +55,57 @@\n \treturn 0;\n }\n \n-static int download_image(struct sdio_func *func, char *img_name)\n+static int download_image(struct sdio_func *func, const char *img_name)\n {\n-\tint ret = 0, len, size, pno;\n-\tstruct file *filp = NULL;\n-\tstruct inode *inode = NULL;\n+\tint ret = 0, len, pno;\n \tu8 *buf = tx_buf;\n \tloff_t pos = 0;\n+\tint img_len;\n+\tconst struct firmware *firm;\n \n-\tfilp = filp_open(img_name, O_RDONLY | O_LARGEFILE, 0);\n-\tif (IS_ERR(filp)) {\n-\t\tprintk(KERN_ERR \"Can't find %s.\\n\", img_name);\n-\t\treturn -ENOENT;\n+\tret = request_firmware(&firm, img_name, &func->dev);\n+\tif (ret < 0) {\n+\t\tprintk(KERN_ERR\n+\t\t \"requesting firmware %s failed with error %d\\n\",\n+\t\t\timg_name, ret);\n+\t\treturn ret;\n \t}\n \n-\tinode = filp->f_dentry->d_inode;\n-\tif (!S_ISREG(inode->i_mode)) {\n-\t\tprintk(KERN_ERR \"Invalid file type: %s\\n\", img_name);\n-\t\tret = -EINVAL;\n-\t\tgoto out;\n+\tbuf = kmalloc(DOWNLOAD_SIZE + TYPE_A_HEADER_SIZE, GFP_KERNEL);\n+\tif (buf == NULL) {\n+\t\tprintk(KERN_ERR \"Error: kmalloc\\n\");\n+\t\treturn -ENOMEM;\n \t}\n \n-\tsize = i_size_read(inode->i_mapping->host);\n-\tif (size <= 0) {\n-\t\tprintk(KERN_ERR \"Unable to find file size: %s\\n\", img_name);\n-\t\tret = size;\n+\timg_len = firm->size;\n+\n+\tif (img_len <= 0) {\n+\t\tret = -1;\n \t\tgoto out;\n \t}\n \n \tpno = 0;\n-\twhile ((len = filp->f_op->read(filp, buf + TYPE_A_HEADER_SIZE,\n-\t\t\t\t\tDOWNLOAD_SIZE, &pos))) {\n-\t\tif (len < 0) {\n-\t\t\tret = -1;\n-\t\t\tgoto out;\n+\twhile (img_len > 0) {\n+\t\tif (img_len > DOWNLOAD_SIZE) {\n+\t\t\tlen = DOWNLOAD_SIZE;\n+\t\t\tbuf[3] = 0;\n+\t\t} else {\n+\t\t\tlen = img_len; \/* the last packet *\/\n+\t\t\tbuf[3] = 2;\n \t\t}\n \n \t\tbuf[0] = len & 0xff;\n \t\tbuf[1] = (len >> 8) & 0xff;\n \t\tbuf[2] = (len >> 16) & 0xff;\n \n-\t\tif (pos >= size)\t\/* The last packet *\/\n-\t\t\tbuf[3] = 2;\n-\t\telse\n-\t\t\tbuf[3] = 0;\n-\n+\t\tmemcpy(buf+TYPE_A_HEADER_SIZE, firm->data + pos, len);\n \t\tret = sdio_memcpy_toio(func, 0, buf, len + TYPE_A_HEADER_SIZE);\n \t\tif (ret < 0) {\n \t\t\tprintk(KERN_ERR \"gdmwm: send image error: \"\n \t\t\t\t\"packet number = %d ret = %d\\n\", pno, ret);\n \t\t\tgoto out;\n \t\t}\n+\n \t\tif (buf[3] == 2)\t\/* The last packet *\/\n \t\t\tbreak;\n \t\tif (!ack_ready(func)) {\n@@ -119,17 +122,21 @@\n \t\tsdio_writeb(func, 0x01, 0x13, &ret);\n \t\tsdio_writeb(func, 0x00, 0x10, &ret);\t\/* PCRRT *\/\n \n+\t\timg_len -= DOWNLOAD_SIZE;\n+\t\tpos += DOWNLOAD_SIZE;\n \t\tpno++;\n \t}\n+\n out:\n-\tfilp_close(filp, NULL);\n+\tkfree(buf);\n \treturn ret;\n }\n \n int sdio_boot(struct sdio_func *func)\n {\n-\tstatic mm_segment_t fs;\n \tint ret;\n+\tconst char *krn_name = FW_DIR FW_KRN;\n+\tconst char *rfs_name = FW_DIR FW_RFS;\n \n \ttx_buf = kmalloc(YMEM0_SIZE, GFP_KERNEL);\n \tif (tx_buf == NULL) {\n@@ -137,21 +144,17 @@\n \t\treturn -ENOMEM;\n \t}\n \n-\tfs = get_fs();\n-\tset_fs(get_ds());\n-\n-\tret = download_image(func, KRN_PATH);\n+\tret = download_image(func, krn_name);\n \tif (ret)\n \t\tgoto restore_fs;\n \tprintk(KERN_INFO \"GCT: Kernel download success.\\n\");\n \n-\tret = download_image(func, RFS_PATH);\n+\tret = download_image(func, rfs_name);\n \tif (ret)\n \t\tgoto restore_fs;\n \tprintk(KERN_INFO \"GCT: Filesystem download success.\\n\");\n \n restore_fs:\n-\tset_fs(fs);\n \tkfree(tx_buf);\n \treturn ret;\n }\n"} {"commit":"62f633a6317fb334880e39a0350fe02889a17ab0","subject":"Add the attempted DMA address to the 'DMA beyond end of ISA' message so that we can see if it's a small distance beyond the end, or way out. This may give some clues as to whether it is being caused by something coalescing the transfers in spite of the bounce buffers, or simply because of buffer corruption. (The BT driver seems to occasionally get hit by from this too, except that it does not trap the transfer, and the system panics later with vm_bounce_page_free.) This \"event\" usually happens to me during a savecore (on the rare occasion that a kernel coredump is actually taken after a crash - the lack of kernel core dumps is another problem...).","message":"Add the attempted DMA address to the 'DMA beyond end of ISA' message so that\nwe can see if it's a small distance beyond the end, or way out. This may\ngive some clues as to whether it is being caused by something coalescing\nthe transfers in spite of the bounce buffers, or simply because of buffer\ncorruption. (The BT driver seems to occasionally get hit by from this too,\nexcept that it does not trap the transfer, and the system panics later\nwith vm_bounce_page_free.) This \"event\" usually happens to me during a\nsavecore (on the rare occasion that a kernel coredump is actually taken\nafter a crash - the lack of kernel core dumps is another problem...).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/i386\/isa\/aha1542.c\n+++ sys\/i386\/isa\/aha1542.c\n@@ -12,7 +12,7 @@\n * on the understanding that TFS is not responsible for the correct\n * functioning of this software in any circumstances.\n *\n- * $Id: aha1542.c,v 1.52 1995\/12\/07 12:45:53 davidg Exp $\n+ * $Id: aha1542.c,v 1.53 1995\/12\/15 00:11:26 bde Exp $\n *\/\n \n \/*\n@@ -1565,7 +1565,8 @@\n \t\t\t\t\tif (thisphys > 0xFFFFFF)\n \t\t\t\t\t{\n \t\t\t\t\t\tprintf(\"aha%d: DMA beyond\"\n-\t\t\t\t\t\t\t\" end Of ISA\\n\", unit);\n+\t\t\t\t\t\t\t\" end Of ISA: 0x%x\\n\",\n+\t\t\t\t\t\t\tunit, thisphys);\n \t\t\t\t\t\txs->error = XS_DRIVER_STUFFUP;\n \t\t\t\t\t\taha_free_ccb(unit, ccb, flags);\n \t\t\t\t\t\treturn (HAD_ERROR);\n"} {"commit":"e981c794c83a592e53971f95eca75a6aa0e89d5d","subject":"isl_aff_insert_dims: drop unused local variable","message":"isl_aff_insert_dims: drop unused local variable\n\nAdditionally, plug in the assigned value where it could have been used.\n\nReported-by: Michael Kruse <e37bdc670d6573b8890bd5bd5b982b09bd5220e8@meinersbur.de>\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_aff.c\n+++ isl_aff.c\n@@ -2666,12 +2666,10 @@\n __isl_give isl_aff *isl_aff_insert_dims(__isl_take isl_aff *aff,\n \tenum isl_dim_type type, unsigned first, unsigned n)\n {\n-\tisl_ctx *ctx;\n-\n \tif (!aff)\n \t\treturn NULL;\n \tif (type == isl_dim_out)\n-\t\tisl_die(aff->v->ctx, isl_error_invalid,\n+\t\tisl_die(isl_aff_get_ctx(aff), isl_error_invalid,\n \t\t\t\"cannot insert output\/set dimensions\",\n \t\t\treturn isl_aff_free(aff));\n \tif (type == isl_dim_in)\n@@ -2679,7 +2677,6 @@\n \tif (n == 0 && !isl_local_space_is_named_or_nested(aff->ls, type))\n \t\treturn aff;\n \n-\tctx = isl_aff_get_ctx(aff);\n \tif (isl_local_space_check_range(aff->ls, type, first, 0) < 0)\n \t\treturn isl_aff_free(aff);\n \n"} {"commit":"74533af4b6867bd4cc38bffec4e8ff7247dd89c8","subject":"staging:vt6655:device_cfg: Whitespace cleanups","message":"staging:vt6655:device_cfg: Whitespace cleanups\n\nNeatening only.\ngit diff -w shows no differences.\n\nSigned-off-by: Joe Perches <16a9a54ddf4259952e3c118c763138e83693d7fd@perches.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/staging\/vt6655\/device_cfg.h\n+++ drivers\/staging\/vt6655\/device_cfg.h\n@@ -34,9 +34,9 @@\n \n typedef\n struct _version {\n- unsigned char major;\n- unsigned char minor;\n- unsigned char build;\n+\tunsigned char major;\n+\tunsigned char minor;\n+\tunsigned char build;\n } version_t, *pversion_t;\n \n #define VID_TABLE_SIZE 64\n@@ -76,20 +76,20 @@\n \n \n \n-typedef enum _chip_type{\n- VT3253=1\n+typedef enum _chip_type {\n+\tVT3253 = 1\n } CHIP_TYPE, *PCHIP_TYPE;\n \n \n \n #ifdef VIAWET_DEBUG\n-#define ASSERT(x) { \\\n- if (!(x)) { \\\n- printk(KERN_ERR \"assertion %s failed: file %s line %d\\n\", #x,\\\n- __FUNCTION__, __LINE__);\\\n- *(int*) 0=0;\\\n- }\\\n-}\n+#define ASSERT(x) {\t\t\t\t\t\t\t\\\n+\t\tif (!(x)) {\t\t\t\t\t\t\\\n+\t\t\tprintk(KERN_ERR \"assertion %s failed: file %s line %d\\n\", #x, \\\n+\t\t\t __FUNCTION__, __LINE__);\t\t\t\\\n+\t\t\t*(int *)0 = 0;\t\t\t\t\t\\\n+\t\t}\t\t\t\t\t\t\t\\\n+\t}\n #define DBG_PORT80(value) outb(value, 0x80)\n #else\n #define ASSERT(x)\n"} {"commit":"08bcb681d2e1e3a0707624ad288cb81cd79bed89","subject":"Make cpusetobj_strprint() prepare the string in order to print the least significant cpuset_t word at the outmost right part of the string (more far from the beginning of it). This follows the natural build of bits rappresentation in the words.","message":"Make cpusetobj_strprint() prepare the string in order to print the\nleast significant cpuset_t word at the outmost right part of the string\n(more far from the beginning of it). This follows the natural build of\nbits rappresentation in the words.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/kern_cpuset.c\n+++ sys\/kern\/kern_cpuset.c\n@@ -650,12 +650,12 @@\n \tbytesp = 0;\n \tbufsiz = CPUSETBUFSIZ;\n \n-\tfor (i = 0; i < (_NCPUWORDS - 1); i++) {\n+\tfor (i = _NCPUWORDS - 1; i > 0; i--) {\n \t\tbytesp = snprintf(tbuf, bufsiz, \"%lx, \", set->__bits[i]);\n \t\tbufsiz -= bytesp;\n \t\ttbuf += bytesp;\n \t}\n-\tsnprintf(tbuf, bufsiz, \"%lx\", set->__bits[_NCPUWORDS - 1]);\n+\tsnprintf(tbuf, bufsiz, \"%lx\", set->__bits[0]);\n \treturn (buf);\n }\n \n"} {"commit":"5981455164595fd936ba4386f3e38bdda4ddf2e7","subject":"log: Replace use of 'index' with 'strchr'.","message":"log: Replace use of 'index' with 'strchr'.\n\nPOSIX.1-2001 classified 'index' as LEGACY and POSIX.1-2008 removes it\ncompletely. It was replaced by strchr and so using that instead is best.\n\nSigned-off-by: Philip Tricca <fd418754d31777cf39b16b99b0350486ab840079@intel.com>\n","repos":"01org\/TPM2.0-TSS,01org\/TPM2.0-TSS,tpm2-software\/tpm2-tss,01org\/TPM2.0-TSS,tpm2-software\/tpm2-tss,tpm2-software\/tpm2-tss,01org\/tpm2-tss,01org\/TPM2.0-TSS,01org\/tpm2-tss,01org\/tpm2-tss","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- log\/log.c\n+++ log\/log.c\n@@ -98,7 +98,7 @@\n char *i = envlevel;\n if (envlevel == NULL)\n return loglevel;\n- while ((i = index(i, '+')) != NULL) {\n+ while ((i = strchr(i, '+')) != NULL) {\n if ((envlevel <= i - strlen(\"all\") && strncasecmp(i - 3, \"all\", 3) == 0) ||\n (envlevel <= i - strlen(module) &&\n strncasecmp(i - strlen(module), module, strlen(module)) == 0)) {\n"} {"commit":"51dd5741d36c260fcc88ea081fe405142c652789","subject":"Tighten up easypng params.","message":"Tighten up easypng params.\n","repos":"silky\/frequensea,silky\/frequensea,fdb\/frequensea,fdb\/frequensea,silky\/frequensea,fdb\/frequensea,fdb\/frequensea,silky\/frequensea,silky\/frequensea,fdb\/frequensea","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/easypng.h\n+++ c\/easypng.h\n@@ -3,7 +3,7 @@\n #include <png.h>\n \n \/\/ Write a grayscale PNG image.\n-static void write_gray_png(char *fname, int width, int height, uint8_t *buffer) {\n+static void write_gray_png(const char *fname, const int width, const int height, uint8_t *buffer) {\n png_structp png_ptr = NULL;\n png_infop info_ptr = NULL;\n png_bytepp row_pointers;\n"} {"commit":"46347635c853d82102f478032442063c371c1201","subject":"Fix building example6 with C89 compilers","message":"Fix building example6 with C89 compilers\n","repos":"richgel999\/miniz,richgel999\/miniz,richgel999\/miniz","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/example6.c\n+++ examples\/example6.c\n@@ -25,6 +25,7 @@\n \n static void hsv_to_rgb(int hue, int min, int max, rgb_t *p)\n {\n+ double h, c, X;\n const int invert = 0;\n const int saturation = 1;\n const int color_rotate = 0;\n@@ -35,9 +36,9 @@\n p->r = p->g = p->b = 255 * (max - hue) \/ (max - min);\n return;\n }\n- double h = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) \/ (max - min), 6);\n- double c = 255.0f * saturation;\n- double X = c * (1 - fabs(fmod(h, 2) - 1));\n+ h = fmod(color_rotate + 1e-4 + 4.0 * (hue - min) \/ (max - min), 6);\n+ c = 255.0f * saturation;\n+ X = c * (1 - fabs(fmod(h, 2) - 1));\n \n p->r = p->g = p->b = 0;\n \n@@ -53,8 +54,6 @@\n \n int main(int argc, char *argv[])\n {\n- (void)argc, (void)argv;\n-\n \/\/ Image resolution\n const int iXmax = 4096;\n const int iYmax = 4096;\n@@ -88,6 +87,8 @@\n double Cx,Cy;\n \n int MinIter = 9999, MaxIter = 0;\n+\n+ (void)argc, (void)argv;\n \n for(iY = 0; iY < iYmax; iY++)\n {\n"} {"commit":"c669450126111b91311b58ae751e72055bc849ab","subject":"mmapstorage: cleanup mmap size calculation","message":"mmapstorage: cleanup mmap size calculation\n","repos":"ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/mmapstorage\/mmapstorage.c\n+++ src\/plugins\/mmapstorage\/mmapstorage.c\n@@ -430,15 +430,15 @@\n \tKey * cur;\n \tksRewind (returned);\n \tsize_t dataBlocksSize = 0;\t\/\/ sum of keyName and keyValue sizes\n-\tsize_t numKeySets = 3;\t\t \/\/ include the magic, global and main keyset\n-\tsize_t ksAlloc = returned->alloc; \/\/ sum of allocation sizes for all meta-keysets\n+\tmmapMetaData->numKeySets = 3;\t\t \/\/ include the magic, global and main keyset\n+\tmmapMetaData->ksAlloc = returned->alloc; \/\/ sum of allocation sizes for all meta-keysets\n \twhile ((cur = ksNext (returned)) != 0)\n \t{\n \t\tdataBlocksSize += (cur->keySize + cur->keyUSize + cur->dataSize);\n \n \t\tif (cur->meta)\n \t\t{\n-\t\t\t++numKeySets;\n+\t\t\t++mmapMetaData->numKeySets;\n \n \t\t\tKey * curMeta;\n \t\t\tksRewind (cur->meta);\n@@ -450,7 +450,7 @@\n \t\t\t\t\tdataBlocksSize += (curMeta->keySize + curMeta->keyUSize + curMeta->dataSize);\n \t\t\t\t}\n \t\t\t}\n-\t\t\tksAlloc += (cur->meta->alloc);\n+\t\t\tmmapMetaData->ksAlloc += (cur->meta->alloc);\n \t\t}\n \t}\n \n@@ -458,7 +458,7 @@\n \tif (global)\n \t{\n \t\tELEKTRA_LOG_WARNING (\"calculate global keyset into size\");\n-\t\tksAlloc += global->alloc;\n+\t\tmmapMetaData->ksAlloc += global->alloc;\n \t\tmmapMetaData->numKeys += global->size;\n \n \t\tKey * tsKey;\n@@ -470,16 +470,14 @@\n \t}\n \n \tsize_t keyArraySize = mmapMetaData->numKeys * SIZEOF_KEY;\n-\tsize_t allocSize = (SIZEOF_KEYSET * numKeySets) + keyArraySize + dataBlocksSize + (ksAlloc * SIZEOF_KEY_PTR);\n-\tmmapHeader->cksumSize = allocSize + (SIZEOF_MMAPMETADATA * 2); \/\/ cksumSize now contains size of all critical data\n-\n-\tsize_t padding = sizeof (uint64_t) - (allocSize % sizeof (uint64_t)); \/\/ alignment for MMAP Footer at end of mapping\n-\tallocSize += SIZEOF_MMAPHEADER + (SIZEOF_MMAPMETADATA * 2) + SIZEOF_MMAPFOOTER + padding;\n-\n-\tmmapMetaData->numKeys = mmapMetaData->numKeys - 1;\t\t\/\/ don't include magic Key\n-\tmmapMetaData->numKeySets = numKeySets - 1;\t\/\/ don't include magic KeySet\n-\tmmapMetaData->ksAlloc = ksAlloc;\n-\tmmapHeader->allocSize = allocSize;\n+\tmmapHeader->allocSize = (SIZEOF_KEYSET * mmapMetaData->numKeySets) + keyArraySize + dataBlocksSize + (mmapMetaData->ksAlloc * SIZEOF_KEY_PTR);\n+\tmmapHeader->cksumSize = mmapHeader->allocSize + (SIZEOF_MMAPMETADATA * 2); \/\/ cksumSize now contains size of all critical data\n+\n+\tsize_t padding = sizeof (uint64_t) - (mmapHeader->allocSize % sizeof (uint64_t)); \/\/ alignment for MMAP Footer at end of mapping\n+\tmmapHeader->allocSize += SIZEOF_MMAPHEADER + (SIZEOF_MMAPMETADATA * 2) + SIZEOF_MMAPFOOTER + padding;\n+\n+\tmmapMetaData->numKeys--;\t\/\/ don't include magic Key\n+\tmmapMetaData->numKeySets--;\t\/\/ don't include magic KeySet\n }\n \n \/**\n@@ -762,7 +760,7 @@\n \treturned->flags = KS_FLAG_MMAP_ARRAY;\n \t\/\/ we intentionally do not change the KeySet->opmphm here!\n \n-\tif (mode == MODE_GLOBALCACHE) \/\/ TODO: code duplication here\n+\tif (mode == MODE_GLOBALCACHE) \/\/ TODO: remove code duplication here\n \t{\n \t\tKeySet * global = elektraPluginGetGlobalKeySet (handle);\n \t\tksClose (global); \/\/ TODO: if we have a global keyset, maybe use ksAppend?\n"} {"commit":"71dc4a21f70acd260d300ad27c0647d136bc0831","subject":"Clean up generated User model","message":"Clean up generated User model\n","repos":"hyperoslo\/NSManagedObject-HYPPropertyMapper,hyperoslo\/NSManagedObject-HYPPropertyMapper,nbarnold01\/NSManagedObject-HYPPropertyMapper,markosankovic\/NSManagedObject-HYPPropertyMapper,isghe\/NSManagedObject-HYPPropertyMapper","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Pod\/Tests\/User.h\n+++ Pod\/Tests\/User.h\n@@ -1,28 +1,28 @@\n-#import <Foundation\/Foundation.h>\n-#import <CoreData\/CoreData.h>\n+@import Foundation;\n+@import CoreData;\n \n @class Company, Note;\n \n @interface User : NSManagedObject\n \n-@property (nonatomic, retain) NSNumber *age;\n-@property (nonatomic, retain) NSDate *birthDate;\n-@property (nonatomic, retain) NSNumber *contractID;\n-@property (nonatomic, retain) NSDate *createdAt;\n-@property (nonatomic, retain) NSString *driverIdentifier;\n-@property (nonatomic, retain) NSData *expenses;\n-@property (nonatomic, retain) NSString *firstName;\n-@property (nonatomic, retain) NSData *hobbies;\n-@property (nonatomic, retain) NSString *ignoredParameter;\n-@property (nonatomic, retain) NSString *lastName;\n-@property (nonatomic, retain) NSNumber *numberOfAttendes;\n-@property (nonatomic, retain) NSNumber *remoteID;\n-@property (nonatomic, retain) NSDate *updatedAt;\n-@property (nonatomic, retain) NSString *userDescription;\n-@property (nonatomic, retain) NSString *userType;\n-@property (nonatomic, retain) id ignoreTransformable;\n-@property (nonatomic, retain) Company *company;\n-@property (nonatomic, retain) NSSet *notes;\n+@property (nonatomic) NSNumber *age;\n+@property (nonatomic) NSDate *birthDate;\n+@property (nonatomic) NSNumber *contractID;\n+@property (nonatomic) NSDate *createdAt;\n+@property (nonatomic) NSString *driverIdentifier;\n+@property (nonatomic) NSData *expenses;\n+@property (nonatomic) NSString *firstName;\n+@property (nonatomic) NSData *hobbies;\n+@property (nonatomic) NSString *ignoredParameter;\n+@property (nonatomic) NSString *lastName;\n+@property (nonatomic) NSNumber *numberOfAttendes;\n+@property (nonatomic) NSNumber *remoteID;\n+@property (nonatomic) NSDate *updatedAt;\n+@property (nonatomic) NSString *userDescription;\n+@property (nonatomic) NSString *userType;\n+@property (nonatomic) id ignoreTransformable;\n+@property (nonatomic) Company *company;\n+@property (nonatomic) NSSet *notes;\n @end\n \n @interface User (CoreDataGeneratedAccessors)\n"} {"commit":"107d13c76f46a3b96decac828ac09a1a87e07014","subject":"usb: gadget: amd5536udc: use udc-core's reset notifier","message":"usb: gadget: amd5536udc: use udc-core's reset notifier\n\nReplace usb_gadget_driver's disconnect with udc-core's reset notifier at\nbus reset handler.\n\nSigned-off-by: Peter Chen <c01a8c815a4ad165fff2d1c0d35ddf5b16bd3d7b@freescale.com>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/gadget\/udc\/amd5536udc.c\n+++ drivers\/usb\/gadget\/udc\/amd5536udc.c\n@@ -2871,7 +2871,7 @@\n \t\t\tdev->driver->resume(&dev->gadget);\n \t\t\tdev->sys_suspended = 0;\n \t\t}\n-\t\tdev->driver->disconnect(&dev->gadget);\n+\t\tusb_gadget_udc_reset(&dev->gadget, dev->driver);\n \t\tspin_lock(&dev->lock);\n \n \t\t\/* disable ep0 to empty req queue *\/\n"} {"commit":"2ea45f625c2b61e06304100499021308bc97eef9","subject":"- Fix style further by adding parentheses around return values so that they look like: \treturn (val); instead of: return val;","message":"- Fix style further by adding parentheses around return values so that\n they look like:\n\treturn (val); instead of: return val;\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/kern_module.c\n+++ sys\/kern\/kern_module.c\n@@ -63,7 +63,7 @@\n static int\n modevent_nop(module_t mod, int what, void *arg)\n {\n-\treturn 0;\n+\treturn (0);\n }\n \n \n@@ -119,12 +119,12 @@\n \tif (newmod != NULL) {\n \t\tprintf(\"module_register: module %s already exists!\\n\", \n \t\t data->name);\n-\t\treturn EEXIST;\n+\t\treturn (EEXIST);\n \t}\n \tnamelen = strlen(data->name) + 1;\n \tnewmod = malloc(sizeof(struct module) + namelen, M_MODULE, M_WAITOK);\n \tif (newmod == NULL)\n-\t\treturn ENOMEM;\n+\t\treturn (ENOMEM);\n \tnewmod->refs = 1;\n \tnewmod->id = nextid++;\n \tnewmod->name = (char *)(newmod + 1);\n@@ -137,7 +137,7 @@\n \tif (container)\n \t\tTAILQ_INSERT_TAIL(&container->modules, newmod, flink);\n \tnewmod->file = container;\n-\treturn 0;\n+\treturn (0);\n }\n \n void\n@@ -175,42 +175,42 @@\n \tTAILQ_FOREACH(mod, &modules, link) {\n \t\terr = strcmp(mod->name, name);\n \t\tif (err == 0)\n-\t\t\treturn mod;\n-\t}\n-\treturn 0;\n+\t\t\treturn (mod);\n+\t}\n+\treturn (NULL);\n }\n \n module_t\n module_lookupbyid(int modid)\n {\n-\tmodule_t mod;\n+\tmodule_t mod;\n \n \tTAILQ_FOREACH(mod, &modules, link) {\n \t\tif (mod->id == modid)\n-\t\t\treturn mod;\n-\t}\n-\treturn 0;\n+\t\t\treturn (mod);\n+\t}\n+\treturn (NULL);\n }\n \n int\n module_unload(module_t mod)\n {\n \n-\treturn MOD_EVENT(mod, MOD_UNLOAD);\n+\treturn (MOD_EVENT(mod, MOD_UNLOAD));\n }\n \n int\n module_getid(module_t mod)\n {\n \n-\treturn mod->id;\n+\treturn (mod->id);\n }\n \n module_t\n module_getfnext(module_t mod)\n {\n \n-\treturn TAILQ_NEXT(mod, flink);\n+\treturn (TAILQ_NEXT(mod, flink));\n }\n \n void\n@@ -344,7 +344,7 @@\n \ttd->td_retval[0] = 0;\n out:\n \tmtx_unlock(&Giant);\n-\treturn error;\n+\treturn (error);\n }\n \n \/*\n@@ -368,5 +368,5 @@\n \t\ttd->td_retval[0] = mod->id;\n \tmtx_unlock(&Giant);\n out:\n-\treturn error;\n-}\n+\treturn (error);\n+}\n"} {"commit":"edf97b6c52c1db2de2285fb512786878349ef53f","subject":"gfs needs a positive error from plock_get if there's a conflict","message":"gfs needs a positive error from plock_get if there's a conflict\n","repos":"stevenraspudic\/resource-agents,asp24\/resource-agents,stevenraspudic\/resource-agents,stevenraspudic\/resource-agents,asp24\/resource-agents,asp24\/resource-agents","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gfs-kernel\/src\/dlm\/plock.c\n+++ gfs-kernel\/src\/dlm\/plock.c\n@@ -935,6 +935,8 @@\n \n \t\/* check query results for blocking locks *\/\n \n+\terror = 0;\n+\n \tfor (s = 0; s < qinfo.gqi_lockcount; s++) {\n \n \t\tlki = &qinfo.gqi_lockinfo[s];\n@@ -1011,6 +1013,11 @@\n \t}\n \n \terror = get_conflict_global(dlm, name, owner, start, end, ex, rowner);\n+\tif (error == -EAGAIN) {\n+\t\tlog_debug(\"pl get global conflict %\"PRIx64\"-%\"PRIx64\" %d %lu\",\n+\t\t\t *start, *end, *ex, *rowner);\n+\t\terror = 1;\n+\t}\n out:\n \treturn error;\n }\n"} {"commit":"a242d1ecfe9d5d16f0d965e20a708133c1b77dfc","subject":"example: don't include rdkey","message":"example: don't include rdkey\n","repos":"cnlohr\/rawdraw,cnlohr\/rawdraw","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/fontsize.c\n+++ examples\/fontsize.c\n@@ -2,8 +2,6 @@\n #include <stdlib.h>\n #include <math.h>\n \n-\n-#include \"..\/RDKey.h\"\n #define CNFG_IMPLEMENTATION\n #include \"..\/CNFG.h\"\n #include \"..\/os_generic.h\"\n@@ -66,7 +64,7 @@\n \t\t\t\tCNFGDrawText( tw, i );\n \t\t\t}\n \t\t}\n-\t\t\n+\n \t\tCNFGPenX = 20;\n \t\tCNFGPenY = 300;\n \t\tfor( i = 1; i < 7; i++) {\n"} {"commit":"7e45484bc21981b4488973ac436fb55d5bd9cfd9","subject":"virtual: Implement required new methods.","message":"virtual: Implement required new methods.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/virtual\/virtual-storage.c\n+++ src\/plugins\/virtual\/virtual-storage.c\n@@ -298,6 +298,15 @@\n \treturn -1;\n }\n \n+static int\n+virtual_mailbox_get_guid(struct mailbox *box,\n+\t\t\t uint8_t guid[MAIL_GUID_128_SIZE] ATTR_UNUSED)\n+{\n+\tmail_storage_set_error(box->storage, MAIL_ERROR_NOTPOSSIBLE,\n+\t\t\t \"Virtual mailboxes have no GUIDs\");\n+\treturn -1;\n+}\n+\n static void virtual_notify_changes(struct mailbox *box ATTR_UNUSED)\n {\n \t\/* FIXME: maybe some day *\/\n@@ -445,13 +454,13 @@\n \t\tindex_storage_mailbox_enable,\n \t\tvirtual_mailbox_open,\n \t\tvirtual_mailbox_close,\n-\t\tNULL,\n+\t\tindex_storage_mailbox_free,\n \t\tvirtual_mailbox_create,\n \t\tvirtual_mailbox_update,\n \t\tindex_storage_mailbox_delete,\n \t\tindex_storage_mailbox_rename,\n \t\tindex_storage_get_status,\n-\t\tNULL,\n+\t\tvirtual_mailbox_get_guid,\n \t\tNULL,\n \t\tNULL,\n \t\tvirtual_storage_sync_init,\n"} {"commit":"8e5e655cb2857d9bd98541379cf2db8c73676deb","subject":"isl_basic_map_extend_dim: keep hold of sample if dimension doesn't change","message":"isl_basic_map_extend_dim: keep hold of sample if dimension doesn't change\n","repos":"abduld\/isl,VanirLLVM\/toolchain_isl,serge-sans-paille\/isl,KangDroidSMProject\/ISL,jleben\/isl,pierrotdelalune\/isl,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL,simbuerg\/isl,jleben\/isl,Distrotech\/isl,crossbuild\/isl,KangDroidSMProject\/ISL,jleben\/isl,VanirLLVM\/toolchain_isl,Distrotech\/isl,evaautomation\/isl,UBERTC\/isl,pierrotdelalune\/isl,Meinersbur\/isl,BobSaget-Mod\/libisl,BobSaget-Mod\/libisl,evaautomation\/isl,BenzoSM\/isl,tobig\/isl,BenzoSM\/isl,crossbuild\/isl,nicolasvasilache\/isl,abduld\/isl,inducer\/isl-mirror,PollyLabs\/isl,epowers\/isl,simbuerg\/isl,Distrotech\/isl,BenzoSM\/isl,simbuerg\/isl,tobig\/isl,pierrotdelalune\/isl,epowers\/isl,BobSaget-Mod\/libisl,PollyLabs\/isl,tobig\/isl,pierrotdelalune\/isl,SaberMod\/isl-current,Distrotech\/isl,simbuerg\/isl,cfx-next\/toolchain_isl-upstream,nicolasvasilache\/isl,evaautomation\/isl,KangDroidSMProject\/ISL,BenzoSM\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,PollyLabs\/isl,SaberMod\/isl-current,cfx-next\/toolchain_isl-upstream,nicolasvasilache\/isl,inducer\/isl-mirror,epowers\/isl,abduld\/isl,serge-sans-paille\/isl,inducer\/isl-mirror,inducer\/isl-mirror,crossbuild\/isl,BobSaget-Mod\/libisl,serge-sans-paille\/isl,evaautomation\/isl,crossbuild\/isl,abduld\/isl,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL,pierrotdelalune\/isl,BobSaget-Mod\/libisl,Meinersbur\/isl,jleben\/isl,simbuerg\/isl,Meinersbur\/isl,Meinersbur\/isl,UBERTC\/isl,epowers\/isl,serge-sans-paille\/isl,BenzoSM\/isl,VanirLLVM\/toolchain_isl,Distrotech\/isl,tobig\/isl,UBERTC\/isl,cfx-next\/toolchain_isl-upstream,inducer\/isl-mirror,jleben\/isl,serge-sans-paille\/isl,PollyLabs\/isl,SaberMod\/isl-current,UBERTC\/isl,SaberMod\/isl-current,epowers\/isl,PollyLabs\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -872,6 +872,8 @@\n \tif (!ext)\n \t\tgoto error;\n \n+\tif (dims_ok)\n+\t\text->sample = isl_vec_copy(base->sample);\n \tflags = base->flags;\n \text = add_constraints(ext, base, 0, 0);\n \tif (ext) {\n"} {"commit":"8153830aecc9d643bce5b87aac005ed48ecff932","subject":"Remove unnecessary local variable.","message":"Remove unnecessary local variable.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Python\/compile.c\n+++ Python\/compile.c\n@@ -2701,7 +2701,7 @@\n static int\n compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)\n {\n-\tint op, scope, r, arg;\n+\tint op, scope, arg;\n \tenum { OP_FAST, OP_GLOBAL, OP_DEREF, OP_NAME } optype;\n \n PyObject *dict = c->u->u_names;\n@@ -2811,9 +2811,8 @@\n \targ = compiler_add_o(c, dict, mangled);\n \tif (arg < 0)\n \t\treturn 0;\n-\tr = compiler_addop_i(c, op, arg);\n \tPy_DECREF(mangled);\n-\treturn r;\n+\treturn compiler_addop_i(c, op, arg);\n }\n \n static int\n"} {"commit":"890c865dcff99aec8227610af427901ad973cb96","subject":"Remove PIOLLHUP from the flags used to test for to set exceptfsd fd_set bits in select(2). It seems that historical behaviour is to not reporting exception on EOF, and several applications are broken.","message":"Remove PIOLLHUP from the flags used to test for to set exceptfsd\nfd_set bits in select(2). It seems that historical behaviour is to not\nreporting exception on EOF, and several applications are broken.\n\nReported by:\tYoshihiko Sarumaru <ysarumaru gmail com>\nDiscussed with:\tbde\nPR:\tports\/140934\nMFC after:\t2 weeks\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/sys_generic.c\n+++ sys\/kern\/sys_generic.c\n@@ -996,7 +996,7 @@\n static int select_flags[3] = {\n POLLRDNORM | POLLHUP | POLLERR,\n POLLWRNORM | POLLHUP | POLLERR,\n- POLLRDBAND | POLLHUP | POLLERR\n+ POLLRDBAND | POLLERR\n };\n \n \/*\n"} {"commit":"2b8e5b08d862f6de5104057157d7d0abd150e7f3","subject":"YAML CPP: Simplify testing code","message":"YAML CPP: Simplify testing code\n","repos":"ElektraInitiative\/libelektra,petermax2\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,e1528532\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,petermax2\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,petermax2\/libelektra,petermax2\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,petermax2\/libelektra,e1528532\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,e1528532\/libelektra,e1528532\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,BernhardDenner\/libelektra,mpranj\/libelektra,e1528532\/libelektra,BernhardDenner\/libelektra,petermax2\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/yamlcpp\/testmod_yamlcpp.c\n+++ src\/plugins\/yamlcpp\/testmod_yamlcpp.c\n@@ -18,12 +18,19 @@\n \n \/\/ -- Macros -------------------------------------------------------------------------------------------------------------------------------\n \n-#define INIT_PLUGIN(parent, filepath, errorMessage) \\\n+#define INIT_PLUGIN(parent, filepath) \\\n \tKey * parentKey = keyNew (parent, KEY_VALUE, filepath, KEY_END); \\\n \tKeySet * conf = ksNew (0, KS_END); \\\n-\tPLUGIN_OPEN (\"yamlcpp\"); \\\n+\tPLUGIN_OPEN (\"yamlcpp\")\n+\n+#define INIT_PLUGIN_GET(parent, filepath, errorMessage) \\\n+\tINIT_PLUGIN (parent, filepath); \\\n \tKeySet * keySet = ksNew (0, KS_END); \\\n \tsucceed_if (plugin->kdbGet (plugin, keySet, parentKey) == ELEKTRA_PLUGIN_STATUS_SUCCESS, errorMessage)\n+\n+#define INIT_PLUGIN_SET(parent, filepath, errorMessage) \\\n+\tINIT_PLUGIN (parent, filepath); \\\n+\tsucceed_if (plugin->kdbSet (plugin, keySet, parentKey) == ELEKTRA_PLUGIN_STATUS_SUCCESS, errorMessage)\n \n #define CLOSE_PLUGIN() \\\n \tkeyDel (parentKey); \\\n@@ -39,7 +46,7 @@\n {\n \tprintf (\"\u2022 Retrieve plugin contract\\n\");\n \n-\tINIT_PLUGIN (\"system\/elektra\/modules\/yamlcpp\", \"\", \"Could not retrieve plugin contract\");\n+\tINIT_PLUGIN_GET (\"system\/elektra\/modules\/yamlcpp\", \"\", \"Could not retrieve plugin contract\");\n \tCLOSE_PLUGIN ();\n }\n \n@@ -50,7 +57,7 @@\n {\n \tprintf (\"\u2022 Retrieve data from file \u201c%s\u201d\\n\", filepath);\n \n-\tINIT_PLUGIN (\"user\/examples\/yamlcpp\", srcdir_file (filepath), \"Unable to open or parse file\");\n+\tINIT_PLUGIN_GET (\"user\/examples\/yamlcpp\", srcdir_file (filepath), \"Unable to open or parse file\");\n \n \tcompare_keyset (keySet, expected);\n \n@@ -64,10 +71,7 @@\n {\n \tprintf (\"\u2022 Write data and compare result with \u201c%s\u201d\\n\", filepath);\n \n-\tKey * parentKey = keyNew (\"user\/examples\/yamlcpp\", KEY_VALUE, elektraFilename (), KEY_END);\n-\tKeySet * conf = ksNew (0, KS_END);\n-\tPLUGIN_OPEN (\"yamlcpp\");\n-\tsucceed_if (plugin->kdbSet (plugin, keySet, parentKey) == ELEKTRA_PLUGIN_STATUS_SUCCESS, \"Unable to write to file\");\n+\tINIT_PLUGIN_SET (\"user\/examples\/yamlcpp\", elektraFilename (), \"Unable to write to file\");\n \n \tsucceed_if (compare_line_files (srcdir_file (filepath), keyString (parentKey)),\n \t\t \"Output of plugin does not match the expected output\");\n"} {"commit":"49f1525546532139e0260ae19ab8012a2bfbd1f3","subject":"USB: sisusb: Push down the BKL","message":"USB: sisusb: Push down the BKL\n\nThis is another case where the lock_kernel appears to be unneccessary and\ncould be removed with a bit more investigative work\n\nSigned-off-by: Alan Cox <91e38e63b890fbb214c8914809fde03c73e7f24d@redhat.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/misc\/sisusbvga\/sisusb.c\n+++ drivers\/usb\/misc\/sisusbvga\/sisusb.c\n@@ -2982,9 +2982,8 @@\n \treturn retval;\n }\n \n-static int\n-sisusb_ioctl(struct inode *inode, struct file *file, unsigned int cmd,\n-\t\t\t\t\t\t\tunsigned long arg)\n+static long\n+sisusb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)\n {\n \tstruct sisusb_usb_data *sisusb;\n \tstruct sisusb_info x;\n@@ -2995,6 +2994,7 @@\n \tif (!(sisusb = (struct sisusb_usb_data *)file->private_data))\n \t\treturn -ENODEV;\n \n+\tlock_kernel();\n \tmutex_lock(&sisusb->lock);\n \n \t\/* Sanity check *\/\n@@ -3053,6 +3053,7 @@\n \n err_out:\n \tmutex_unlock(&sisusb->lock);\n+\tunlock_kernel();\n \treturn retval;\n }\n \n@@ -3066,9 +3067,7 @@\n \t\tcase SISUSB_GET_CONFIG_SIZE:\n \t\tcase SISUSB_GET_CONFIG:\n \t\tcase SISUSB_COMMAND:\n-\t\t\tlock_kernel();\n-\t\t\tretval = sisusb_ioctl(f->f_path.dentry->d_inode, f, cmd, arg);\n-\t\t\tunlock_kernel();\n+\t\t\tretval = sisusb_ioctl(f, cmd, arg);\n \t\t\treturn retval;\n \n \t\tdefault:\n@@ -3087,7 +3086,7 @@\n #ifdef SISUSB_NEW_CONFIG_COMPAT\n \t.compat_ioctl = sisusb_compat_ioctl,\n #endif\n-\t.ioctl =\tsisusb_ioctl\n+\t.unlocked_ioctl = sisusb_ioctl\n };\n \n static struct usb_class_driver usb_sisusb_class = {\n"} {"commit":"48786251b25c319dc3cef1ada2a58c1ba30e1477","subject":"Fix r243627 by testing against the head socket instead of the socket just created.","message":"Fix r243627 by testing against the head socket instead of the socket\njust created.\n\nMFC after:\t1 week\nX-MFC-with:\tr243627\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/uipc_socket.c\n+++ sys\/kern\/uipc_socket.c\n@@ -556,7 +556,7 @@\n \t * The accept socket may be tearing down but we just\n \t * won a race on the ACCEPT_LOCK.\n \t *\/\n-\tif (!(so->so_options & SO_ACCEPTCONN)) {\n+\tif (!(head->so_options & SO_ACCEPTCONN)) {\n \t\tSOCK_LOCK(so);\n \t\tso->so_head = NULL;\n \t\tsofree(so);\t\t\/* NB: returns ACCEPT_UNLOCK'ed. *\/\n"} {"commit":"8d60cf7dd5f573af2bbfe2a99149dfdf30a09774","subject":"examples\/kni: new parameters","message":"examples\/kni: new parameters\n\nSigned-off-by: Intel\n","repos":"phermansson\/dpdk,phermansson\/dpdk,phermansson\/dpdk,phermansson\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/kni\/main.c\n+++ examples\/kni\/main.c\n@@ -109,8 +109,23 @@\n #define KNI_US_PER_SECOND 1000000\n #define KNI_SECOND_PER_DAY 86400\n \n+#define KNI_MAX_KTHREAD 32\n \/*\n- * RX and TX Prefetch, Host, and Write-back threshold values should be\n+ * Structure of port parameters\n+ *\/\n+struct kni_port_params {\n+\tuint8_t port_id;\/* Port ID *\/\n+\tunsigned lcore_rx; \/* lcore ID for RX *\/\n+\tunsigned lcore_tx; \/* lcore ID for TX *\/\n+\tuint32_t nb_lcore_k; \/* Number of lcores for KNI multi kernel threads *\/\n+\tuint32_t nb_kni; \/* Number of KNI devices to be created *\/\n+\tunsigned lcore_k[KNI_MAX_KTHREAD]; \/* lcore ID list for kthreads *\/\n+\tstruct rte_kni *kni[KNI_MAX_KTHREAD]; \/* KNI context pointers *\/\n+} __rte_cache_aligned;\n+\n+static struct kni_port_params *kni_port_params_array[RTE_MAX_ETHPORTS];\n+\n+\/* RX and TX Prefetch, Host, and Write-back threshold values should be\n * carefully set for optimal performance. Consult the network\n * controller's datasheet and supporting DPDK documentation for guidance\n * on how these parameters should be set.\n@@ -160,12 +175,8 @@\n \n \/* Mask of enabled ports *\/\n static uint32_t ports_mask = 0;\n-\n-\/* Mask of cores that read from NIC and write to tap *\/\n-static uint32_t input_cores_mask = 0;\n-\n-\/* Mask of cores that read from tap and write to NIC *\/\n-static uint32_t output_cores_mask = 0;\n+\/* Ports set in promiscuous mode off by default. *\/\n+static int promiscuous_on = 0;\n \n \/* Structure type for recording kni interface specific stats *\/\n struct kni_interface_stats {\n@@ -182,34 +193,11 @@\n \tuint64_t tx_dropped;\n };\n \n-\/* Structure type for recording port specific information *\/\n-struct kni_port_info_t {\n-\t\/* lcore id for ingress *\/\n-\tunsigned lcore_id_ingress;\n-\n-\t\/* lcore id for egress *\/\n-\tunsigned lcore_id_egress;\n-\n-\t\/* pointer to kni interface *\/\n-\tstruct rte_kni *kni;\n-};\n-\n-\/* kni port specific information array*\/\n-static struct kni_port_info_t kni_port_info[RTE_MAX_ETHPORTS];\n-\n \/* kni device statistics array *\/\n static struct kni_interface_stats kni_stats[RTE_MAX_ETHPORTS];\n \n-\/* Get the pointer to kni interface *\/\n-static struct rte_kni * kni_lcore_to_kni(unsigned lcore_id);\n-\n static int kni_change_mtu(uint8_t port_id, unsigned new_mtu);\n static int kni_config_network_interface(uint8_t port_id, uint8_t if_up);\n-\n-static struct rte_kni_ops kni_ops = {\n-\t.change_mtu = kni_change_mtu,\n-\t.config_network_if = kni_config_network_interface,\n-};\n \n static rte_atomic32_t kni_stop = RTE_ATOMIC32_INIT(0);\n \n@@ -224,13 +212,13 @@\n \t \" Port Lcore(RX\/TX) rx_packets rx_dropped tx_packets tx_dropped\\n\"\n \t \"------ -------------- ------------ ------------ ------------ ------------\\n\");\n \tfor (i = 0; i < RTE_MAX_ETHPORTS; i++) {\n-\t\tif (kni_port_info[i].kni == NULL)\n+\t\tif (!kni_port_params_array[i])\n \t\t\tcontinue;\n \n \t\tprintf(\"%7d %10u\/%2u %13\"PRIu64\" %13\"PRIu64\" %13\"PRIu64\" \"\n \t\t\t\t\t\t\t\"%13\"PRIu64\"\\n\", i,\n-\t\t\t\t\tkni_port_info[i].lcore_id_ingress,\n-\t\t\t\t\tkni_port_info[i].lcore_id_egress,\n+\t\t\t\t\tkni_port_params_array[i]->lcore_rx,\n+\t\t\t\t\tkni_port_params_array[i]->lcore_tx,\n \t\t\t\t\t\tkni_stats[i].rx_packets,\n \t\t\t\t\t\tkni_stats[i].rx_dropped,\n \t\t\t\t\t\tkni_stats[i].tx_packets,\n@@ -282,31 +270,35 @@\n * Interface to burst rx and enqueue mbufs into rx_q\n *\/\n static void\n-kni_ingress(struct rte_kni *kni)\n-{\n-\tuint8_t port_id = rte_kni_get_port_id(kni);\n+kni_ingress(struct kni_port_params *p)\n+{\n+\tuint8_t i, port_id;\n \tunsigned nb_rx, num;\n+\tuint32_t nb_kni;\n \tstruct rte_mbuf *pkts_burst[PKT_BURST_SZ];\n \n-\tif (kni == NULL || port_id >= RTE_MAX_ETHPORTS)\n+\tif (p == NULL)\n \t\treturn;\n \n-\t\/* Burst rx from eth *\/\n-\tnb_rx = rte_eth_rx_burst(port_id, 0, pkts_burst, PKT_BURST_SZ);\n-\tif (nb_rx > PKT_BURST_SZ) {\n-\t\tRTE_LOG(ERR, APP, \"Error receiving from eth\\n\");\n-\t\treturn;\n-\t}\n-\n-\t\/* Burst tx to kni *\/\n-\tnum = rte_kni_tx_burst(kni, pkts_burst, nb_rx);\n-\tkni_stats[port_id].rx_packets += num;\n-\n-\trte_kni_handle_request(kni);\n-\tif (unlikely(num < nb_rx)) {\n-\t\t\/* Free mbufs not tx to kni interface *\/\n-\t\tkni_burst_free_mbufs(&pkts_burst[num], nb_rx - num);\n-\t\tkni_stats[port_id].rx_dropped += nb_rx - num;\n+\tnb_kni = p->nb_kni;\n+\tport_id = p->port_id;\n+\tfor (i = 0; i < nb_kni; i++) {\n+\t\t\/* Burst rx from eth *\/\n+\t\tnb_rx = rte_eth_rx_burst(port_id, 0, pkts_burst, PKT_BURST_SZ);\n+\t\tif (unlikely(nb_rx > PKT_BURST_SZ)) {\n+\t\t\tRTE_LOG(ERR, APP, \"Error receiving from eth\\n\");\n+\t\t\treturn;\n+\t\t}\n+\t\t\/* Burst tx to kni *\/\n+\t\tnum = rte_kni_tx_burst(p->kni[i], pkts_burst, nb_rx);\n+\t\tkni_stats[port_id].rx_packets += num;\n+\n+\t\trte_kni_handle_request(p->kni[i]);\n+\t\tif (unlikely(num < nb_rx)) {\n+\t\t\t\/* Free mbufs not tx to kni interface *\/\n+\t\t\tkni_burst_free_mbufs(&pkts_burst[num], nb_rx - num);\n+\t\t\tkni_stats[port_id].rx_dropped += nb_rx - num;\n+\t\t}\n \t}\n }\n \n@@ -314,80 +306,87 @@\n * Interface to dequeue mbufs from tx_q and burst tx\n *\/\n static void\n-kni_egress(struct rte_kni *kni)\n-{\n-\tuint8_t port_id = rte_kni_get_port_id(kni);;\n+kni_egress(struct kni_port_params *p)\n+{\n+\tuint8_t i, port_id;\n \tunsigned nb_tx, num;\n+\tuint32_t nb_kni;\n \tstruct rte_mbuf *pkts_burst[PKT_BURST_SZ];\n \n-\tif (kni == NULL || port_id >= RTE_MAX_ETHPORTS)\n+\tif (p == NULL)\n \t\treturn;\n \n-\t\/* Burst rx from kni *\/\n-\tnum = rte_kni_rx_burst(kni, pkts_burst, PKT_BURST_SZ);\n-\tif (num > PKT_BURST_SZ) {\n-\t\tRTE_LOG(ERR, APP, \"Error receiving from KNI\\n\");\n-\t\treturn;\n-\t}\n-\n-\t\/* Burst tx to eth *\/\n-\tnb_tx = rte_eth_tx_burst(port_id, 0, pkts_burst, (uint16_t)num);\n-\tkni_stats[port_id].tx_packets += nb_tx;\n-\n-\tif (unlikely(nb_tx < num)) {\n-\t\t\/* Free mbufs not tx to NIC *\/\n-\t\tkni_burst_free_mbufs(&pkts_burst[nb_tx], num - nb_tx);\n-\t\tkni_stats[port_id].tx_dropped += num - nb_tx;\n-\t}\n-}\n-\n-\/* Main processing loop *\/\n+\tnb_kni = p->nb_kni;\n+\tport_id = p->port_id;\n+\tfor (i = 0; i < nb_kni; i++) {\n+\t\t\/* Burst rx from kni *\/\n+\t\tnum = rte_kni_rx_burst(p->kni[i], pkts_burst, PKT_BURST_SZ);\n+\t\tif (unlikely(num > PKT_BURST_SZ)) {\n+\t\t\tRTE_LOG(ERR, APP, \"Error receiving from KNI\\n\");\n+\t\t\treturn;\n+\t\t}\n+\t\t\/* Burst tx to eth *\/\n+\t\tnb_tx = rte_eth_tx_burst(port_id, 0, pkts_burst, (uint16_t)num);\n+\t\tkni_stats[port_id].tx_packets += nb_tx;\n+\t\tif (unlikely(nb_tx < num)) {\n+\t\t\t\/* Free mbufs not tx to NIC *\/\n+\t\t\tkni_burst_free_mbufs(&pkts_burst[nb_tx], num - nb_tx);\n+\t\t\tkni_stats[port_id].tx_dropped += num - nb_tx;\n+\t\t}\n+\t}\n+}\n+\n static int\n main_loop(__rte_unused void *arg)\n {\n-\tuint8_t pid;\n+\tuint8_t i, nb_ports = rte_eth_dev_count();\n+\tint32_t f_stop;\n \tconst unsigned lcore_id = rte_lcore_id();\n-\tstruct rte_kni *kni = kni_lcore_to_kni(lcore_id);\n-\n-\tif (kni != NULL) {\n-\t\tpid = rte_kni_get_port_id(kni);\n-\t\tif (pid >= RTE_MAX_ETHPORTS)\n-\t\t\trte_exit(EXIT_FAILURE, \"Failure: port id >= %d\\n\",\n-\t\t\t\t\t\t\tRTE_MAX_ETHPORTS);\n-\n-\t\tif (kni_port_info[pid].lcore_id_ingress == lcore_id) {\n-\t\t\t\/* Running on lcores for input packets *\/\n-\t\t\tRTE_LOG(INFO, APP, \"Lcore %u is reading from \"\n-\t\t\t\t\t\t\"port %d\\n\", lcore_id, pid);\n-\t\t\tfflush(stdout);\n-\n-\t\t\t\/* rx loop *\/\n-\t\t\twhile (1) {\n-\t\t\t\tint32_t flag = rte_atomic32_read(&kni_stop);\n-\n-\t\t\t\tif (flag)\n-\t\t\t\t\tbreak;\n-\t\t\t\tkni_ingress(kni);\n-\t\t\t}\n-\t\t} else if (kni_port_info[pid].lcore_id_egress == lcore_id) {\n-\t\t\t\/* Running on lcores for output packets *\/\n-\t\t\tRTE_LOG(INFO, APP, \"Lcore %u is writing to port %d\\n\",\n-\t\t\t\t\t\t\tlcore_id, pid);\n-\t\t\tfflush(stdout);\n-\n-\t\t\t\/* tx loop *\/\n-\t\t\twhile (1) {\n-\t\t\t\tint32_t flag = rte_atomic32_read(&kni_stop);\n-\n-\t\t\t\tif (flag)\n-\t\t\t\t\tbreak;\n-\t\t\t\tkni_egress(kni);\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t\/* fallthrough to here if we don't have any work *\/\n-\tRTE_LOG(INFO, APP, \"Lcore %u has nothing to do\\n\", lcore_id);\n+\tenum lcore_rxtx {\n+\t\tLCORE_NONE,\n+\t\tLCORE_RX,\n+\t\tLCORE_TX,\n+\t\tLCORE_MAX\n+\t};\n+\tenum lcore_rxtx flag = LCORE_NONE;\n+\n+\tnb_ports = (uint8_t)(nb_ports < RTE_MAX_ETHPORTS ?\n+\t\t\t\tnb_ports : RTE_MAX_ETHPORTS);\n+\tfor (i = 0; i < nb_ports; i++) {\n+\t\tif (!kni_port_params_array[i])\n+\t\t\tcontinue;\n+\t\tif (kni_port_params_array[i]->lcore_rx == (uint8_t)lcore_id) {\n+\t\t\tflag = LCORE_RX;\n+\t\t\tbreak;\n+\t\t} else if (kni_port_params_array[i]->lcore_tx ==\n+\t\t\t\t\t\t(uint8_t)lcore_id) {\n+\t\t\tflag = LCORE_TX;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (flag == LCORE_RX) {\n+\t\tRTE_LOG(INFO, APP, \"Lcore %u is reading from port %d\\n\",\n+\t\t\t\t\tkni_port_params_array[i]->lcore_rx,\n+\t\t\t\t\tkni_port_params_array[i]->port_id);\n+\t\twhile (1) {\n+\t\t\tf_stop = rte_atomic32_read(&kni_stop);\n+\t\t\tif (f_stop)\n+\t\t\t\tbreak;\n+\t\t\tkni_ingress(kni_port_params_array[i]);\n+\t\t}\n+\t} else if (flag == LCORE_TX) {\n+\t\tRTE_LOG(INFO, APP, \"Lcore %u is writing to port %d\\n\",\n+\t\t\t\t\tkni_port_params_array[i]->lcore_tx,\n+\t\t\t\t\tkni_port_params_array[i]->port_id);\n+\t\twhile (1) {\n+\t\t\tf_stop = rte_atomic32_read(&kni_stop);\n+\t\t\tif (f_stop)\n+\t\t\t\tbreak;\n+\t\t\tkni_egress(kni_port_params_array[i]);\n+\t\t}\n+\t} else\n+\t\tRTE_LOG(INFO, APP, \"Lcore %u has nothing to do\\n\", lcore_id);\n \n \treturn 0;\n }\n@@ -396,13 +395,13 @@\n static void\n print_usage(const char *prgname)\n {\n-\tRTE_LOG(INFO, APP, \"\\nUsage: %s [EAL options] -- -p PORTMASK \"\n-\t\t\t\t\t\"-i IN_CORES -o OUT_CORES\\n\"\n+\tRTE_LOG(INFO, APP, \"\\nUsage: %s [EAL options] -- -p PORTMASK -P \"\n+\t\t \"[--config (port,lcore_rx,lcore_tx,lcore_kthread...)\"\n+\t\t \"[,(port,lcore_rx,lcore_tx,lcore_kthread...)]]\\n\"\n \t\t \" -p PORTMASK: hex bitmask of ports to use\\n\"\n-\t\t \" -i IN_CORES: hex bitmask of cores which read \"\n-\t\t \"from NIC\\n\"\n-\t\t \" -o OUT_CORES: hex bitmask of cores which write \"\n-\t\t \"to NIC\\n\",\n+\t\t \" -P : enable promiscuous mode\\n\"\n+\t\t \" --config (port,lcore_rx,lcore_tx,lcore_kthread...): \"\n+\t\t \"port and lcore configurations\\n\",\n \t prgname);\n }\n \n@@ -420,137 +419,201 @@\n \treturn (uint32_t)num;\n }\n \n+static void\n+print_config(void)\n+{\n+\tuint32_t i, j;\n+\tstruct kni_port_params **p = kni_port_params_array;\n+\n+\tfor (i = 0; i < RTE_MAX_ETHPORTS; i++) {\n+\t\tif (!p[i])\n+\t\t\tcontinue;\n+\t\tRTE_LOG(DEBUG, APP, \"Port ID: %d\\n\", p[i]->port_id);\n+\t\tRTE_LOG(DEBUG, APP, \"Rx lcore ID: %u, Tx lcore ID: %u\\n\",\n+\t\t\t\t\tp[i]->lcore_rx, p[i]->lcore_tx);\n+\t\tfor (j = 0; j < p[i]->nb_lcore_k; j++)\n+\t\t\tRTE_LOG(DEBUG, APP, \"Kernel thread lcore ID: %u\\n\",\n+\t\t\t\t\t\t\tp[i]->lcore_k[j]);\n+\t}\n+}\n+\n static int\n-kni_setup_port_affinities(uint8_t nb_port)\n-{\n-\tunsigned i;\n-\tuint32_t in_lcore, out_lcore;\n-\tuint8_t rx_port = 0, tx_port = 0;\n-\tuint8_t pid;\n-\n-\tif (nb_port > RTE_MAX_ETHPORTS) {\n-\t\tRTE_LOG(ERR, APP, \"The number of ports exceeds the maximum \"\n-\t\t\t\t\t\"number of 0x%x\\n\", RTE_MAX_ETHPORTS);\n+parse_config(const char *arg)\n+{\n+\tconst char *p, *p0 = arg;\n+\tchar s[256], *end;\n+\tunsigned size;\n+\tenum fieldnames {\n+\t\tFLD_PORT = 0,\n+\t\tFLD_LCORE_RX,\n+\t\tFLD_LCORE_TX,\n+\t\t_NUM_FLD = KNI_MAX_KTHREAD + 3,\n+\t};\n+\tint i, j, nb_token;\n+\tchar *str_fld[_NUM_FLD];\n+\tunsigned long int_fld[_NUM_FLD];\n+\tuint8_t port_id, nb_kni_port_params = 0;\n+\n+\tmemset(&kni_port_params_array, 0, sizeof(kni_port_params_array));\n+\twhile (((p = strchr(p0, '(')) != NULL) &&\n+\t\tnb_kni_port_params < RTE_MAX_ETHPORTS) {\n+\t\tp++;\n+\t\tif ((p0 = strchr(p, ')')) == NULL)\n+\t\t\tgoto fail;\n+\t\tsize = p0 - p;\n+\t\tif (size >= sizeof(s)) {\n+\t\t\tprintf(\"Invalid config parameters\\n\");\n+\t\t\tgoto fail;\n+\t\t}\n+\t\trte_snprintf(s, sizeof(s), \"%.*s\", size, p);\n+\t\tnb_token = rte_strsplit(s, sizeof(s), str_fld, _NUM_FLD, ',');\n+\t\tif (nb_token <= FLD_LCORE_TX) {\n+\t\t\tprintf(\"Invalid config parameters\\n\");\n+\t\t\tgoto fail;\n+\t\t}\n+\t\tfor (i = 0; i < nb_token; i++) {\n+\t\t\terrno = 0;\n+\t\t\tint_fld[i] = strtoul(str_fld[i], &end, 0);\n+\t\t\tif (errno != 0 || end == str_fld[i]) {\n+\t\t\t\tprintf(\"Invalid config parameters\\n\");\n+\t\t\t\tgoto fail;\n+\t\t\t}\n+\t\t}\n+\n+\t\ti = 0;\n+\t\tport_id = (uint8_t)int_fld[i++];\n+\t\tif (port_id >= RTE_MAX_ETHPORTS) {\n+\t\t\tprintf(\"Port ID %d could not exceed the maximum %d\\n\",\n+\t\t\t\t\t\tport_id, RTE_MAX_ETHPORTS);\n+\t\t\tgoto fail;\n+\t\t}\n+\t\tif (kni_port_params_array[port_id]) {\n+\t\t\tprintf(\"Port %d has been configured\\n\", port_id);\n+\t\t\tgoto fail;\n+\t\t}\n+\t\tkni_port_params_array[port_id] = \n+\t\t\t(struct kni_port_params*)rte_zmalloc(\"KNI_port_params\",\n+\t\t\tsizeof(struct kni_port_params), CACHE_LINE_SIZE);\n+\t\tkni_port_params_array[port_id]->port_id = port_id;\n+\t\tkni_port_params_array[port_id]->lcore_rx =\n+\t\t\t\t\t(uint8_t)int_fld[i++];\n+\t\tkni_port_params_array[port_id]->lcore_tx =\n+\t\t\t\t\t(uint8_t)int_fld[i++];\n+\t\tif (kni_port_params_array[port_id]->lcore_rx >= RTE_MAX_LCORE ||\n+\t\tkni_port_params_array[port_id]->lcore_tx >= RTE_MAX_LCORE) {\n+\t\t\tprintf(\"lcore_rx %u or lcore_tx %u ID could not \"\n+\t\t\t\t\t\t\"exceed the maximum %u\\n\",\n+\t\t\t\tkni_port_params_array[port_id]->lcore_rx,\n+\t\t\t\tkni_port_params_array[port_id]->lcore_tx,\n+\t\t\t\t\t\t(unsigned)RTE_MAX_LCORE);\n+\t\t\tgoto fail;\n+\t\t}\n+\t\tfor (j = 0; i < nb_token && j < KNI_MAX_KTHREAD; i++, j++)\n+\t\t\tkni_port_params_array[port_id]->lcore_k[j] =\n+\t\t\t\t\t\t(uint8_t)int_fld[i];\n+\t\tkni_port_params_array[port_id]->nb_lcore_k = j;\n+\t}\n+\tprint_config();\n+\n+\treturn 0;\n+\n+fail:\n+\tfor (i = 0; i < RTE_MAX_ETHPORTS; i++) {\n+\t\tif (kni_port_params_array[i]) {\n+\t\t\trte_free(kni_port_params_array[i]);\n+\t\t\tkni_port_params_array[i] = NULL;\n+\t\t}\n+\t}\n+\n+\treturn -1;\n+}\n+\n+static int\n+validate_parameters(uint32_t portmask)\n+{\n+\tuint32_t i;\n+\n+\tif (!portmask) {\n+\t\tprintf(\"No port configured in port mask\\n\");\n \t\treturn -1;\n \t}\n \n-\tRTE_LCORE_FOREACH(i) {\n-\t\tin_lcore = input_cores_mask & (1 << i);\n-\t\tout_lcore = output_cores_mask & (1 << i);\n-\n-\t\t\/* Check if it is in input lcore or output lcore mask *\/\n-\t\tif (in_lcore == 0 && out_lcore == 0)\n-\t\t\tcontinue;\n-\n-\t\t\/* Check if it is in both input lcore and output lcore mask *\/\n-\t\tif (in_lcore != 0 && out_lcore != 0) {\n-\t\t\tRTE_LOG(ERR, APP, \"Lcore 0x%x can not be used in both \"\n-\t\t\t\t\"input lcore and output lcore mask\\n\", i);\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\t\/* Check if the lcore is enabled or not *\/\n-\t\tif (rte_lcore_is_enabled(i) == 0) {\n-\t\t\tRTE_LOG(ERR, APP, \"Lcore 0x%x is not enabled\\n\", i);\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\tif (in_lcore != 0) {\n-\t\t\t\/* It is for packet receiving *\/\n-\t\t\twhile ((rx_port < nb_port) &&\n-\t\t\t\t\t((ports_mask & (1 << rx_port)) == 0))\n-\t\t\t\trx_port++;\n-\n-\t\t\tif (rx_port >= nb_port) {\n-\t\t\t\tRTE_LOG(ERR, APP, \"There is no enough ports \"\n-\t\t\t\t\t\t\"for ingress lcores\\n\");\n-\t\t\t\treturn -1;\n-\t\t\t}\n-\t\t\tkni_port_info[rx_port].lcore_id_ingress = i;\n-\t\t\trx_port++;\n-\t\t} else {\n-\t\t\t\/* It is for packet transmitting *\/\n-\t\t\twhile ((tx_port < nb_port) &&\n-\t\t\t\t\t((ports_mask & (1 << tx_port)) == 0))\n-\t\t\t\ttx_port++;\n-\n-\t\t\tif (tx_port >= nb_port) {\n-\t\t\t\tRTE_LOG(ERR, APP, \"There is no enough ports \"\n-\t\t\t\t\t\t\"for engree lcores\\n\");\n-\t\t\t\treturn -1;\n-\t\t\t}\n-\t\t\tkni_port_info[tx_port].lcore_id_egress = i;\n-\t\t\ttx_port++;\n-\t\t}\n-\t}\n-\n-\t\/* Display all the port\/lcore affinity *\/\n-\tfor (pid = 0; pid < nb_port; pid++) {\n-\t\tRTE_LOG(INFO, APP, \"Port%d, ingress lcore id: %u, \"\n-\t\t\t\t\t\t\"egress lcore id: %u\\n\", pid,\n-\t\t\t\tkni_port_info[pid].lcore_id_ingress,\n-\t\t\t\tkni_port_info[pid].lcore_id_egress);\n+\tfor (i = 0; i < RTE_MAX_ETHPORTS; i++) {\n+\t\tif (((portmask & (1 << i)) && !kni_port_params_array[i]) ||\n+\t\t\t(!(portmask & (1 << i)) && kni_port_params_array[i]))\n+\t\t\trte_exit(EXIT_FAILURE, \"portmask is not consistent \"\n+\t\t\t\t\"to port ids specified in --config\\n\");\n+\n+\t\tif (kni_port_params_array[i] && !rte_lcore_is_enabled(\\\n+\t\t\t(unsigned)(kni_port_params_array[i]->lcore_rx)))\n+\t\t\trte_exit(EXIT_FAILURE, \"lcore id %u for \"\n+\t\t\t\t\t\"port %d receiving not enabled\\n\",\n+\t\t\t\t\tkni_port_params_array[i]->lcore_rx,\n+\t\t\t\t\tkni_port_params_array[i]->port_id);\n+\n+\t\tif (kni_port_params_array[i] && !rte_lcore_is_enabled(\\\n+\t\t\t(unsigned)(kni_port_params_array[i]->lcore_tx)))\n+\t\t\trte_exit(EXIT_FAILURE, \"lcore id %u for \"\n+\t\t\t\t\t\"port %d transmitting not enabled\\n\",\n+\t\t\t\t\tkni_port_params_array[i]->lcore_tx,\n+\t\t\t\t\tkni_port_params_array[i]->port_id);\n+\t\t\t\n \t}\n \n \treturn 0;\n }\n \n-static struct rte_kni *\n-kni_lcore_to_kni(unsigned lcore_id)\n-{\n-\tuint8_t pid;\n-\tstruct kni_port_info_t *p = kni_port_info;\n-\n-\tfor (pid = 0; pid < RTE_MAX_ETHPORTS; pid++) {\n-\t\tif (p[pid].kni != NULL && (p[pid].lcore_id_ingress == lcore_id\n-\t\t\t\t\t|| p[pid].lcore_id_egress == lcore_id))\n-\t\t\treturn p[pid].kni;\n-\t}\n-\n-\treturn NULL;\n-}\n+#define CMDLINE_OPT_CONFIG \"config\"\n \n \/* Parse the arguments given in the command line of the application *\/\n-static void\n+static int\n parse_args(int argc, char **argv)\n {\n-\tint opt;\n+\tint opt, longindex, ret = 0;\n \tconst char *prgname = argv[0];\n+\tstatic struct option longopts[] = {\n+\t\t{CMDLINE_OPT_CONFIG, required_argument, NULL, 0},\n+\t\t{NULL, 0, NULL, 0}\n+\t};\n \n \t\/* Disable printing messages within getopt() *\/\n \topterr = 0;\n \n \t\/* Parse command line *\/\n-\twhile ((opt = getopt(argc, argv, \"i:o:p:\")) != EOF) {\n+\twhile ((opt = getopt_long(argc, argv, \"p:P\", longopts,\n+\t\t\t\t\t\t&longindex)) != EOF) {\n \t\tswitch (opt) {\n-\t\tcase 'i':\n-\t\t\tinput_cores_mask = parse_unsigned(optarg);\n-\t\t\tbreak;\n-\t\tcase 'o':\n-\t\t\toutput_cores_mask = parse_unsigned(optarg);\n-\t\t\tbreak;\n \t\tcase 'p':\n \t\t\tports_mask = parse_unsigned(optarg);\n \t\t\tbreak;\n+\t\tcase 'P':\n+\t\t\tpromiscuous_on = 1;\n+\t\t\tbreak;\n+\t\tcase 0:\n+\t\t\tif (!strncmp(longopts[longindex].name,\n+\t\t\t\t CMDLINE_OPT_CONFIG,\n+\t\t\t\t sizeof(CMDLINE_OPT_CONFIG))) {\n+\t\t\t\tret = parse_config(optarg);\n+\t\t\t\tif (ret) {\n+\t\t\t\t\tprintf(\"Invalid config\\n\");\n+\t\t\t\t\tprint_usage(prgname);\n+\t\t\t\t\treturn -1;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tprint_usage(prgname);\n-\t\t\trte_exit(EXIT_FAILURE, \"Invalid option specified\");\n+\t\t\trte_exit(EXIT_FAILURE, \"Invalid option specified\\n\");\n \t\t}\n \t}\n \n \t\/* Check that options were parsed ok *\/\n-\tif (input_cores_mask == 0) {\n+\tif (validate_parameters(ports_mask) < 0) {\n \t\tprint_usage(prgname);\n-\t\trte_exit(EXIT_FAILURE, \"IN_CORES not specified correctly\");\n-\t}\n-\tif (output_cores_mask == 0) {\n-\t\tprint_usage(prgname);\n-\t\trte_exit(EXIT_FAILURE, \"OUT_CORES not specified correctly\");\n-\t}\n-\tif (ports_mask == 0) {\n-\t\tprint_usage(prgname);\n-\t\trte_exit(EXIT_FAILURE, \"PORTMASK not specified correctly\");\n-\t}\n+\t\trte_exit(EXIT_FAILURE, \"Invalid parameters\\n\");\n+\t}\n+\n+\treturn ret;\n }\n \n \/* Initialise a single port on an Ethernet device *\/\n@@ -564,27 +627,28 @@\n \tfflush(stdout);\n \tret = rte_eth_dev_configure(port, 1, 1, &port_conf);\n \tif (ret < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Could not configure port%u (%d)\",\n+\t\trte_exit(EXIT_FAILURE, \"Could not configure port%u (%d)\\n\",\n \t\t (unsigned)port, ret);\n \n-\tret = rte_eth_rx_queue_setup(port, 0, NB_RXD, rte_eth_dev_socket_id(port),\n- &rx_conf, pktmbuf_pool);\n+\tret = rte_eth_rx_queue_setup(port, 0, NB_RXD,\n+\t\trte_eth_dev_socket_id(port), &rx_conf, pktmbuf_pool);\n \tif (ret < 0)\n \t\trte_exit(EXIT_FAILURE, \"Could not setup up RX queue for \"\n-\t\t\t\t\t\"port%u (%d)\", (unsigned)port, ret);\n-\n-\tret = rte_eth_tx_queue_setup(port, 0, NB_TXD, rte_eth_dev_socket_id(port),\n- &tx_conf);\n+\t\t\t\t\"port%u (%d)\\n\", (unsigned)port, ret);\n+\n+\tret = rte_eth_tx_queue_setup(port, 0, NB_TXD,\n+\t\trte_eth_dev_socket_id(port), &tx_conf);\n \tif (ret < 0)\n \t\trte_exit(EXIT_FAILURE, \"Could not setup up TX queue for \"\n-\t\t\t\t\t\"port%u (%d)\", (unsigned)port, ret);\n+\t\t\t\t\"port%u (%d)\\n\", (unsigned)port, ret);\n \n \tret = rte_eth_dev_start(port);\n \tif (ret < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Could not start port%u (%d)\",\n+\t\trte_exit(EXIT_FAILURE, \"Could not start port%u (%d)\\n\",\n \t\t\t\t\t\t(unsigned)port, ret);\n \n-\trte_eth_promiscuous_enable(port);\n+\tif (promiscuous_on)\n+\t\trte_eth_promiscuous_enable(port);\n }\n \n \/* Check the link status of all ports in up to 9s, and print them finally *\/\n@@ -596,7 +660,7 @@\n \tuint8_t portid, count, all_ports_up, print_flag = 0;\n \tstruct rte_eth_link link;\n \n-\tprintf(\"\\nChecking link status\");\n+\tprintf(\"\\nChecking link status\\n\");\n \tfflush(stdout);\n \tfor (count = 0; count <= MAX_CHECK_TIME; count++) {\n \t\tall_ports_up = 1;\n@@ -711,13 +775,90 @@\n \treturn ret;\n }\n \n+static int\n+kni_alloc(uint8_t port_id)\n+{\n+\tuint8_t i;\n+\tstruct rte_kni *kni;\n+\tstruct rte_kni_conf conf;\n+\tstruct kni_port_params **params = kni_port_params_array;\n+\n+\tif (port_id >= RTE_MAX_ETHPORTS || !params[port_id])\n+\t\treturn -1;\n+\n+\tparams[port_id]->nb_kni = params[port_id]->nb_lcore_k ?\n+\t\t\t\tparams[port_id]->nb_lcore_k : 1;\n+\n+\tfor (i = 0; i < params[port_id]->nb_kni; i++) {\n+\t\t\/* Clear conf at first *\/\n+\t\tmemset(&conf, 0, sizeof(conf));\n+\t\tif (params[port_id]->nb_lcore_k) {\n+\t\t\trte_snprintf(conf.name, RTE_KNI_NAMESIZE,\n+\t\t\t\t\t\"vEth%u_%u\", port_id, i);\n+\t\t\tconf.core_id = params[port_id]->lcore_k[i];\n+\t\t\tconf.force_bind = 1;\n+\t\t} else\n+\t\t\trte_snprintf(conf.name, RTE_KNI_NAMESIZE,\n+\t\t\t\t\t\t\"vEth%u\", port_id);\n+\t\tconf.group_id = (uint16_t)port_id;\n+\t\tconf.mbuf_size = MAX_PACKET_SZ;\n+\t\t\/*\n+\t\t * The first KNI device associated to a port\n+\t\t * is the master, for multiple kernel thread\n+\t\t * environment.\n+\t\t *\/\n+\t\tif (i == 0) {\n+\t\t\tstruct rte_kni_ops ops;\n+\t\t\tstruct rte_eth_dev_info dev_info;\n+\n+\t\t\tmemset(&dev_info, 0, sizeof(dev_info));\n+\t\t\trte_eth_dev_info_get(port_id, &dev_info);\n+\t\t\tconf.addr = dev_info.pci_dev->addr;\n+\t\t\tconf.id = dev_info.pci_dev->id;\n+\n+\t\t\tmemset(&ops, 0, sizeof(ops));\n+\t\t\tops.port_id = port_id;\n+\t\t\tops.change_mtu = kni_change_mtu;\n+\t\t\tops.config_network_if = kni_config_network_interface;\n+\n+\t\t\tkni = rte_kni_alloc(pktmbuf_pool, &conf, &ops);\n+\t\t} else\n+\t\t\tkni = rte_kni_alloc(pktmbuf_pool, &conf, NULL);\n+\n+\t\tif (!kni)\n+\t\t\trte_exit(EXIT_FAILURE, \"Fail to create kni for \"\n+\t\t\t\t\t\t\"port: %d\\n\", port_id);\n+\t\tparams[port_id]->kni[i] = kni;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+kni_free_kni(uint8_t port_id)\n+{\n+\tuint8_t i;\n+\tstruct kni_port_params **p = kni_port_params_array;\n+\n+\tif (port_id >= RTE_MAX_ETHPORTS || !p[port_id])\n+\t\treturn -1;\n+\n+\tfor (i = 0; i < p[i]->nb_kni; i++) {\n+\t\trte_kni_release(p[i]->kni[i]);\n+\t\tp[i]->kni[i] = NULL;\n+\t}\n+\trte_eth_dev_stop(port_id);\n+\n+\treturn 0;\n+}\n+\n \/* Initialise ports\/queues etc. and start main loop on each core *\/\n int\n main(int argc, char** argv)\n {\n \tint ret;\n-\tunsigned i, cfg_ports = 0;\n \tuint8_t nb_sys_ports, port;\n+\tunsigned i;\n \n \t\/* Associate signal_hanlder function with USR signals *\/\n \tsignal(SIGUSR1, signal_handler);\n@@ -727,12 +868,14 @@\n \t\/* Initialise EAL *\/\n \tret = rte_eal_init(argc, argv);\n \tif (ret < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Could not initialise EAL (%d)\", ret);\n+\t\trte_exit(EXIT_FAILURE, \"Could not initialise EAL (%d)\\n\", ret);\n \targc -= ret;\n \targv += ret;\n \n \t\/* Parse application arguments (after the EAL ones) *\/\n-\tparse_args(argc, argv);\n+\tret = parse_args(argc, argv);\n+\tif (ret < 0)\n+\t\trte_exit(EXIT_FAILURE, \"Could not parse input parameters\\n\");\n \n \t\/* Create the mbuf pool *\/\n \tpktmbuf_pool = rte_mempool_create(\"mbuf_pool\", NB_MBUF, MBUF_SZ,\n@@ -741,57 +884,45 @@\n \t\t\trte_pktmbuf_pool_init, NULL, rte_pktmbuf_init, NULL,\n \t\t\trte_socket_id(), 0);\n \tif (pktmbuf_pool == NULL) {\n-\t\trte_exit(EXIT_FAILURE, \"Could not initialise mbuf pool\");\n+\t\trte_exit(EXIT_FAILURE, \"Could not initialise mbuf pool\\n\");\n \t\treturn -1;\n \t}\n \n \t\/* Initialise PMD driver(s) *\/\n \tret = rte_pmd_init_all();\n \tif (ret < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Could not initialise PMD (%d)\", ret);\n+\t\trte_exit(EXIT_FAILURE, \"Could not initialise PMD (%d)\\n\", ret);\n \n \t\/* Scan PCI bus for recognised devices *\/\n \tret = rte_eal_pci_probe();\n \tif (ret < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Could not probe PCI (%d)\", ret);\n+\t\trte_exit(EXIT_FAILURE, \"Could not probe PCI (%d)\\n\", ret);\n \n \t\/* Get number of ports found in scan *\/\n \tnb_sys_ports = rte_eth_dev_count();\n \tif (nb_sys_ports == 0)\n \t\trte_exit(EXIT_FAILURE, \"No supported Ethernet devices found - \"\n \t\t\t\"check that CONFIG_RTE_LIBRTE_IGB_PMD=y and\/or \"\n-\t\t\t\"CONFIG_RTE_LIBRTE_IXGBE_PMD=y in the config file\");\n-\t\/* Find the number of configured ports in the port mask *\/\n-\tfor (i = 0; i < sizeof(ports_mask) * 8; i++)\n-\t\tcfg_ports += !! (ports_mask & (1 << i));\n-\n-\tif (cfg_ports > nb_sys_ports)\n-\t\trte_exit(EXIT_FAILURE, \"Port mask requires more ports than \"\n-\t\t\t\t\t\t\t\t\"available\");\n-\n-\tif (kni_setup_port_affinities(nb_sys_ports) < 0)\n-\t\trte_exit(EXIT_FAILURE, \"Fail to setup port affinities\\n\");\t\n+\t\t\t\"CONFIG_RTE_LIBRTE_IXGBE_PMD=y in the config file\\n\");\n+\n+\t\/* Check if the configured port ID is valid *\/\n+\tfor (i = 0; i < RTE_MAX_ETHPORTS; i++)\n+\t\tif (kni_port_params_array[i] && i >= nb_sys_ports)\n+\t\t\trte_exit(EXIT_FAILURE, \"Configured invalid \"\n+\t\t\t\t\t\t\"port ID %u\\n\", i);\n \n \t\/* Initialise each port *\/\n \tfor (port = 0; port < nb_sys_ports; port++) {\n-\t\tstruct rte_kni *kni;\n-\n \t\t\/* Skip ports that are not enabled *\/\n-\t\tif ((ports_mask & (1 << port)) == 0) {\n+\t\tif (!(ports_mask & (1 << port)))\n \t\t\tcontinue;\n-\t\t}\n \t\tinit_port(port);\n \n \t\tif (port >= RTE_MAX_ETHPORTS)\n \t\t\trte_exit(EXIT_FAILURE, \"Can not use more than \"\n \t\t\t\t\"%d ports for kni\\n\", RTE_MAX_ETHPORTS);\n \n-\t\tkni = rte_kni_create(port, MAX_PACKET_SZ, pktmbuf_pool,\n-\t\t\t\t\t\t\t\t&kni_ops);\n-\t\tif (kni == NULL)\n-\t\t\trte_exit(EXIT_FAILURE, \"Fail to create kni dev \"\n-\t\t\t\t\t\t\"for port: %d\\n\", port);\n-\t\tkni_port_info[port].kni = kni;\n+\t\tkni_alloc(port);\n \t}\n \tcheck_all_ports_link_status(nb_sys_ports, ports_mask);\n \n@@ -802,12 +933,17 @@\n \t\t\treturn -1;\n \t}\n \n+\t\/* Release resources *\/\n \tfor (port = 0; port < nb_sys_ports; port++) {\n-\t\tstruct rte_kni *kni = kni_port_info[port].kni;\n-\n-\t\tif (kni != NULL)\n-\t\t\trte_kni_release(kni);\n-\t}\n+\t\tif (!(ports_mask & (1 << port)))\n+\t\t\tcontinue;\n+\t\tkni_free_kni(port);\n+\t}\n+\tfor (i = 0; i < RTE_MAX_ETHPORTS; i++)\n+\t\tif (kni_port_params_array[i]) {\n+\t\t\trte_free(kni_port_params_array[i]);\n+\t\t\tkni_port_params_array[i] = NULL;\n+\t\t}\n \n \treturn 0;\n }\n"} {"commit":"0f7e7273803aa03ad7a0e210461a3db9d35e7abb","subject":"backlight: switch to da903x driver to dev_pm_ops","message":"backlight: switch to da903x driver to dev_pm_ops\n\nSigned-off-by: Mike Rapoport <a17fed27eaa842282862ff7c1b9c8395a26ac320@compulab.co.il>\nSigned-off-by: Richard Purdie <a03894c799ea916bd571ce8f12ed88f6fb3400f7@linux.intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/backlight\/da903x_bl.c\n+++ drivers\/video\/backlight\/da903x_bl.c\n@@ -153,35 +153,35 @@\n \treturn 0;\n }\n \n-#ifdef CONFIG_PM\n-static int da903x_backlight_suspend(struct platform_device *pdev,\n-\t\t\t\t pm_message_t state)\n-{\n+static int da903x_backlight_suspend(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n \tstruct backlight_device *bl = platform_get_drvdata(pdev);\n \treturn da903x_backlight_set(bl, 0);\n }\n \n-static int da903x_backlight_resume(struct platform_device *pdev)\n-{\n+static int da903x_backlight_resume(struct device *dev)\n+{\n+\tstruct platform_device *pdev = to_platform_device(dev);\n \tstruct backlight_device *bl = platform_get_drvdata(pdev);\n \n \tbacklight_update_status(bl);\n \treturn 0;\n }\n-#else\n-#define da903x_backlight_suspend\tNULL\n-#define da903x_backlight_resume\t\tNULL\n-#endif\n+\n+static struct dev_pm_ops da903x_backlight_pm_ops = {\n+\t.suspend\t= da903x_backlight_suspend,\n+\t.resume\t\t= da903x_backlight_resume,\n+};\n \n static struct platform_driver da903x_backlight_driver = {\n \t.driver\t\t= {\n \t\t.name\t= \"da903x-backlight\",\n \t\t.owner\t= THIS_MODULE,\n+\t\t.pm\t= &da903x_backlight_pm_ops,\n \t},\n \t.probe\t\t= da903x_backlight_probe,\n \t.remove\t\t= da903x_backlight_remove,\n-\t.suspend\t= da903x_backlight_suspend,\n-\t.resume\t\t= da903x_backlight_resume,\n };\n \n static int __init da903x_backlight_init(void)\n"} {"commit":"50b95531088e6ceb1c4c00df18aeea4574e3d204","subject":"isl_obj.c: directly include required header","message":"isl_obj.c: directly include required header\n\nDo so instead of relying on the header getting included indirectly.\n\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,PollyLabs\/isl,inducer\/isl-mirror,Meinersbur\/isl,PollyLabs\/isl,Meinersbur\/isl,Meinersbur\/isl,nicolasvasilache\/isl,PollyLabs\/isl,inducer\/isl-mirror,PollyLabs\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,PollyLabs\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_obj.c\n+++ isl_obj.c\n@@ -13,6 +13,7 @@\n * B.P. 105 - 78153 Le Chesnay, France\n *\/\n \n+#include <isl\/val.h>\n #include <isl\/aff.h>\n #include <isl\/set.h>\n #include <isl\/map.h>\n"} {"commit":"7ac0169fa1f717c83984b9fa052b6b0bac06cd4a","subject":"Always acquire the UNIX domain socket subsystem lock (UNP lock) before dereferencing sotounpcb() and checking its value, as so_pcb is protected by protocol locking, not subsystem locking. This prevents races during close() by one thread and use of ths socket in another.","message":"Always acquire the UNIX domain socket subsystem lock (UNP lock)\nbefore dereferencing sotounpcb() and checking its value, as so_pcb\nis protected by protocol locking, not subsystem locking. This\nprevents races during close() by one thread and use of ths socket\nin another.\n\nunp_bind() now assert the UNP lock, and uipc_bind() now acquires\nthe lock around calls to unp_bind().\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/kern\/uipc_usrreq.c\n+++ sys\/kern\/uipc_usrreq.c\n@@ -128,11 +128,14 @@\n static int\n uipc_abort(struct socket *so)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n-\n-\tif (unp == NULL)\n+\tstruct unpcb *unp;\n+\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \tunp_drop(unp, ECONNABORTED);\n \tunp_detach(unp);\t\/* NB: unlocks *\/\n \tSOCK_LOCK(so);\n@@ -143,11 +146,8 @@\n static int\n uipc_accept(struct socket *so, struct sockaddr **nam)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tconst struct sockaddr *sa;\n-\n-\tif (unp == NULL)\n-\t\treturn (EINVAL);\n \n \t\/*\n \t * Pass back name of connected socket,\n@@ -156,6 +156,13 @@\n \t *\/\n \t*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);\n \tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n+\t\tfree(*nam, M_SONAME);\n+\t\t*nam = NULL;\n+\t\treturn (EINVAL);\n+\t}\n \tif (unp->unp_conn != NULL && unp->unp_conn->unp_addr != NULL)\n \t\tsa = (struct sockaddr *) unp->unp_conn->unp_addr;\n \telse\n@@ -178,30 +185,35 @@\n static int\n uipc_bind(struct socket *so, struct sockaddr *nam, struct thread *td)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n-\n-\tif (unp == NULL)\n-\t\treturn (EINVAL);\n-\n-\treturn (unp_bind(unp, nam, td));\n-}\n-\n-static int\n-uipc_connect(struct socket *so, struct sockaddr *nam, struct thread *td)\n-{\n \tstruct unpcb *unp;\n \tint error;\n-\n-\tKASSERT(td == curthread, (\"uipc_connect: td != curthread\"));\n \n \tUNP_LOCK();\n \tunp = sotounpcb(so);\n \tif (unp == NULL) {\n-\t\terror = EINVAL;\n-\t\tgoto out;\n+\t\tUNP_UNLOCK();\n+\t\treturn (EINVAL);\n+\t}\n+\terror = unp_bind(unp, nam, td);\n+\tUNP_UNLOCK();\n+\treturn (error);\n+}\n+\n+static int\n+uipc_connect(struct socket *so, struct sockaddr *nam, struct thread *td)\n+{\n+\tstruct unpcb *unp;\n+\tint error;\n+\n+\tKASSERT(td == curthread, (\"uipc_connect: td != curthread\"));\n+\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n+\t\treturn (EINVAL);\n \t}\n \terror = unp_connect(so, nam, td);\n-out:\n \tUNP_UNLOCK();\n \treturn (error);\n }\n@@ -209,13 +221,15 @@\n int\n uipc_connect2(struct socket *so1, struct socket *so2)\n {\n-\tstruct unpcb *unp = sotounpcb(so1);\n+\tstruct unpcb *unp;\n \tint error;\n \n-\tif (unp == NULL)\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so1);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\n-\tUNP_LOCK();\n+\t}\n \terror = unp_connect2(so1, so2);\n \tUNP_UNLOCK();\n \treturn (error);\n@@ -226,12 +240,14 @@\n static int\n uipc_detach(struct socket *so)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n-\n-\tif (unp == NULL)\n+\tstruct unpcb *unp;\n+\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\n-\tUNP_LOCK();\n+\t}\n \tunp_detach(unp);\t\/* NB: unlocks unp *\/\n \treturn (0);\n }\n@@ -239,11 +255,14 @@\n static int\n uipc_disconnect(struct socket *so)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n-\n-\tif (unp == NULL)\n+\tstruct unpcb *unp;\n+\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \tunp_disconnect(unp);\n \tUNP_UNLOCK();\n \treturn (0);\n@@ -252,12 +271,15 @@\n static int\n uipc_listen(struct socket *so, struct thread *td)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tint error;\n \n-\tif (unp == NULL || unp->unp_vnode == NULL)\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL || unp->unp_vnode == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \terror = unp_listen(unp, td);\n \tUNP_UNLOCK();\n \treturn (error);\n@@ -266,13 +288,18 @@\n static int\n uipc_peeraddr(struct socket *so, struct sockaddr **nam)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tconst struct sockaddr *sa;\n \n-\tif (unp == NULL)\n+\t*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n+\t\tfree(*nam, M_SONAME);\n+\t\t*nam = NULL;\n \t\treturn (EINVAL);\n-\t*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);\n-\tUNP_LOCK();\n+\t}\n \tif (unp->unp_conn != NULL && unp->unp_conn->unp_addr!= NULL)\n \t\tsa = (struct sockaddr *) unp->unp_conn->unp_addr;\n \telse {\n@@ -291,13 +318,16 @@\n static int\n uipc_rcvd(struct socket *so, int flags)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tstruct socket *so2;\n \tu_long newhiwat;\n \n-\tif (unp == NULL)\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \tswitch (so->so_type) {\n \tcase SOCK_DGRAM:\n \t\tpanic(\"uipc_rcvd DGRAM?\");\n@@ -338,10 +368,11 @@\n \t struct mbuf *control, struct thread *td)\n {\n \tint error = 0;\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tstruct socket *so2;\n \tu_long newhiwat;\n \n+\tunp = sotounpcb(so);\n \tif (unp == NULL) {\n \t\terror = EINVAL;\n \t\tgoto release;\n@@ -355,6 +386,13 @@\n \t\tgoto release;\n \n \tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n+\t\terror = EINVAL;\n+\t\tgoto dispose_release;\n+\t}\n+\n \tswitch (so->so_type) {\n \tcase SOCK_DGRAM:\n \t{\n@@ -455,6 +493,7 @@\n \t}\n \tUNP_UNLOCK();\n \n+dispose_release:\n \tif (control != NULL && error != 0)\n \t\tunp_dispose(control);\n \n@@ -469,12 +508,15 @@\n static int\n uipc_sense(struct socket *so, struct stat *sb)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tstruct socket *so2;\n \n-\tif (unp == NULL)\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \tsb->st_blksize = so->so_snd.sb_hiwat;\n \tif (so->so_type == SOCK_STREAM && unp->unp_conn != NULL) {\n \t\tso2 = unp->unp_conn->unp_socket;\n@@ -491,11 +533,14 @@\n static int\n uipc_shutdown(struct socket *so)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n-\n-\tif (unp == NULL)\n+\tstruct unpcb *unp;\n+\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n \t\treturn (EINVAL);\n-\tUNP_LOCK();\n+\t}\n \tsocantsendmore(so);\n \tunp_shutdown(unp);\n \tUNP_UNLOCK();\n@@ -505,13 +550,18 @@\n static int\n uipc_sockaddr(struct socket *so, struct sockaddr **nam)\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tconst struct sockaddr *sa;\n \n-\tif (unp == NULL)\n+\t*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);\n+\tUNP_LOCK();\n+\tunp = sotounpcb(so);\n+\tif (unp == NULL) {\n+\t\tUNP_UNLOCK();\n+\t\tfree(*nam, M_SONAME);\n+\t\t*nam = NULL;\n \t\treturn (EINVAL);\n-\t*nam = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);\n-\tUNP_LOCK();\n+\t}\n \tif (unp->unp_addr != NULL)\n \t\tsa = (struct sockaddr *) unp->unp_addr;\n \telse\n@@ -534,7 +584,7 @@\n \tstruct socket *so;\n \tstruct sockopt *sopt;\n {\n-\tstruct unpcb *unp = sotounpcb(so);\n+\tstruct unpcb *unp;\n \tstruct xucred xu;\n \tint error;\n \n@@ -544,6 +594,12 @@\n \t\tcase LOCAL_PEERCRED:\n \t\t\terror = 0;\n \t\t\tUNP_LOCK();\n+\t\t\tunp = sotounpcb(so);\n+\t\t\tif (unp == NULL) {\n+\t\t\t\tUNP_UNLOCK();\n+\t\t\t\terror = EINVAL;\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t\tif (unp->unp_flags & UNP_HAVEPC)\n \t\t\t\txu = unp->unp_peercred;\n \t\t\telse {\n@@ -636,9 +692,9 @@\n \tunp_count++;\n \tLIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead\n \t\t\t : &unp_shead, unp, unp_link);\n-\tUNP_UNLOCK();\n-\n \tso->so_pcb = unp;\n+\tUNP_UNLOCK();\n+\n \treturn (0);\n }\n \n@@ -705,6 +761,8 @@\n \tstruct nameidata nd;\n \tchar *buf;\n \n+\tUNP_LOCK_ASSERT();\n+\n \t\/*\n \t * XXXRW: This test-and-set of unp_vnode is non-atomic; the\n \t * unlocked read here is fine, but the value of unp_vnode needs\n@@ -717,6 +775,8 @@\n \tnamelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);\n \tif (namelen <= 0)\n \t\treturn (EINVAL);\n+\n+\tUNP_UNLOCK();\n \n \tbuf = malloc(namelen + 1, M_TEMP, M_WAITOK);\n \tstrlcpy(buf, soun->sun_path, namelen + 1);\n@@ -775,6 +835,7 @@\n done:\n \tmtx_unlock(&Giant);\n \tfree(buf, M_TEMP);\n+\tUNP_LOCK();\n \treturn (error);\n }\n \n"} {"commit":"744acfba16603d3dea06070078be55fa946e6368","subject":"lintje","message":"lintje\n\n","repos":"NLnetLabs\/ldns,NLnetLabs\/ldns,threatstack\/libldns,gegenschall\/ldns,threatstack\/libldns,threatstack\/libldns,benlaurie\/ldns,benlaurie\/ldns,benlaurie\/ldns,gegenschall\/ldns,NLnetLabs\/ldns,gegenschall\/ldns,threatstack\/libldns,NLnetLabs\/ldns,gegenschall\/ldns,benlaurie\/ldns,threatstack\/libldns","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/ldns-dpa.c\n+++ examples\/ldns-dpa.c\n@@ -2186,11 +2186,11 @@\n \t\t\t\t\tif (verbosity >= 5) {\n \t\t\t\t\t\tfor (ip_len = 0; ip_len < len - data_offset; ip_len++) {\n \t\t\t\t\t\t\tif (ip_len > 0 && ip_len % 20 == 0) {\n-\t\t\t\t\t\t\t\tprintf(\"\\t; %u - %u\\n\", ip_len - 19, ip_len);\n+\t\t\t\t\t\t\t\tprintf(\"\\t; %u - %u\\n\", (unsigned int) ip_len - 19, (unsigned int) ip_len);\n \t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\tprintf(\"%02x \", dnspkt[ip_len]);\n+\t\t\t\t\t\t\tprintf(\"%02x \", (unsigned int) dnspkt[ip_len]);\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tprintf(\"\\t; ??? - %u\\n\", ip_len);\n+\t\t\t\t\t\tprintf(\"\\t; ??? - %u\\n\", (unsigned int) ip_len);\n \t\t\t\t\t\t\n \t\t\t\t\t}\n \t\t\t\t\tbad_dns_packets++;\n"} {"commit":"2636ff6b0df904cf1c982f580860204a386d177f","subject":"vmlfb: use list_move_tail instead of list_del\/list_add_tail","message":"vmlfb: use list_move_tail instead of list_del\/list_add_tail\n\nUsing list_move_tail() instead of list_del() + list_add_tail().\n\nspatch with a semantic match is used to found this problem.\n(http:\/\/coccinelle.lip6.fr\/)\n\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: Florian Tobias Schandinat <9843642cd7809d7c6d8c25ac9e4b0e2f1b5283bf@gmx.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/vermilion\/vermilion.c\n+++ drivers\/video\/vermilion\/vermilion.c\n@@ -1168,8 +1168,7 @@\n \tlist_for_each_entry_safe(entry, next, &global_has_mode, head) {\n \t\tprintk(KERN_DEBUG MODULE_NAME \": subsys disable pipe\\n\");\n \t\tvmlfb_disable_pipe(entry);\n-\t\tlist_del(&entry->head);\n-\t\tlist_add_tail(&entry->head, &global_no_mode);\n+\t\tlist_move_tail(&entry->head, &global_no_mode);\n \t}\n \tmutex_unlock(&vml_mutex);\n }\n"} {"commit":"44897a4bf030654946d11c8271faa39aec7cb894","subject":"Instead of direct manipulation on queue and worklist mutexes, bring macros for doing this job. This change will make it easy to migrate from using spinning locks to adaptive ones.","message":"Instead of direct manipulation on queue and worklist mutexes, bring macros\nfor doing this job. This change will make it easy to migrate from using\nspinning locks to adaptive ones.\n\nReviewed by:\tglebius, julian\nApproved by:\tcognet (mentor)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netgraph\/ng_base.c\n+++ sys\/netgraph\/ng_base.c\n@@ -227,6 +227,19 @@\n \tMALLOC(hook, hook_p, sizeof(*hook), M_NETGRAPH_HOOK, M_NOWAIT | M_ZERO)\n #define _NG_ALLOC_NODE(node) \\\n \tMALLOC(node, node_p, sizeof(*node), M_NETGRAPH_NODE, M_NOWAIT | M_ZERO)\n+\n+#define\tNG_QUEUE_LOCK_INIT(n)\t\t\t\\\n+\tmtx_init(&(n)->q_mtx, \"ng_node\", NULL, MTX_SPIN)\n+#define\tNG_QUEUE_LOCK(n)\t\t\t\\\n+\tmtx_lock_spin(&(n)->q_mtx)\n+#define\tNG_QUEUE_UNLOCK(n)\t\t\t\\\n+\tmtx_unlock_spin(&(n)->q_mtx)\n+#define\tNG_WORKLIST_LOCK_INIT()\t\t\t\\\n+\tmtx_init(&ng_worklist_mtx, \"ng_worklist\", NULL, MTX_SPIN)\n+#define\tNG_WORKLIST_LOCK()\t\t\t\\\n+\tmtx_lock_spin(&ng_worklist_mtx)\n+#define\tNG_WORKLIST_UNLOCK()\t\t\t\\\n+\tmtx_unlock_spin(&ng_worklist_mtx)\n \n #ifdef NETGRAPH_DEBUG \/*----------------------------------------------*\/\n \/*\n@@ -605,7 +618,7 @@\n \tNG_NODE_REF(node);\t\t\t\t\/* note reference *\/\n \ttype->refs++;\n \n-\tmtx_init(&node->nd_input_queue.q_mtx, \"ng_node\", NULL, MTX_SPIN);\n+\tNG_QUEUE_LOCK_INIT(&node->nd_input_queue);\n \tnode->nd_input_queue.queue = NULL;\n \tnode->nd_input_queue.last = &node->nd_input_queue.queue;\n \tnode->nd_input_queue.q_flags = 0;\n@@ -2039,7 +2052,7 @@\n \tatomic_subtract_long(&ngq->q_flags, READER_INCREMENT);\n \n \t\/* ######### End Hack alert ######### *\/\n-\tmtx_lock_spin((&ngq->q_mtx));\n+\tNG_QUEUE_LOCK(ngq);\n \t\/*\n \t * Try again. Another processor (or interrupt for that matter) may\n \t * have removed the last queued item that was stopping us from\n@@ -2050,7 +2063,7 @@\n \t *\/\n \tif ((ngq->q_flags & NGQ_RMASK) == 0) {\n \t\tatomic_add_long(&ngq->q_flags, READER_INCREMENT);\n-\t\tmtx_unlock_spin((&ngq->q_mtx));\n+\t\tNG_QUEUE_UNLOCK(ngq);\n \t\tCTR4(KTR_NET, \"%20s: node [%x] (%p) slow acquired item %p\",\n \t\t __func__, ngq->q_node->nd_ID, ngq->q_node, item);\n \t\treturn (item);\n@@ -2060,7 +2073,7 @@\n \t * and queue the request for later.\n \t *\/\n \tng_queue_rw(ngq, item, NGQRW_R);\n-\tmtx_unlock_spin(&(ngq->q_mtx));\n+\tNG_QUEUE_UNLOCK(ngq);\n \n \treturn (NULL);\n }\n@@ -2072,7 +2085,7 @@\n \t (\"%s: working on deadnode\", __func__));\n \n restart:\n-\tmtx_lock_spin(&(ngq->q_mtx));\n+\tNG_QUEUE_LOCK(ngq);\n \t\/*\n \t * If there are no readers, no writer, and no pending packets, then\n \t * we can just go ahead. In all other situations we need to queue the\n@@ -2081,7 +2094,7 @@\n \tif ((ngq->q_flags & NGQ_WMASK) == 0) {\n \t\t\/* collision could happen *HERE* *\/\n \t\tatomic_add_long(&ngq->q_flags, WRITER_ACTIVE);\n-\t\tmtx_unlock_spin((&ngq->q_mtx));\n+\t\tNG_QUEUE_UNLOCK(ngq);\n \t\tif (ngq->q_flags & READER_MASK) {\n \t\t\t\/* Collision with fast-track reader *\/\n \t\t\tatomic_subtract_long(&ngq->q_flags, WRITER_ACTIVE);\n@@ -2096,7 +2109,7 @@\n \t * and queue the request for later.\n \t *\/\n \tng_queue_rw(ngq, item, NGQRW_W);\n-\tmtx_unlock_spin(&(ngq->q_mtx));\n+\tNG_QUEUE_UNLOCK(ngq);\n \n \treturn (NULL);\n }\n@@ -2192,7 +2205,7 @@\n {\n \titem_p item;\n \n-\tmtx_lock_spin(&ngq->q_mtx);\n+\tNG_QUEUE_LOCK(ngq);\n \twhile (ngq->queue) {\n \t\titem = ngq->queue;\n \t\tngq->queue = item->el_next;\n@@ -2200,7 +2213,7 @@\n \t\t\tngq->last = &(ngq->queue);\n \t\t\tatomic_add_long(&ngq->q_flags, -OP_PENDING);\n \t\t}\n-\t\tmtx_unlock_spin(&ngq->q_mtx);\n+\t\tNG_QUEUE_UNLOCK(ngq);\n \n \t\t\/* If the item is supplying a callback, call it with an error *\/\n \t\tif (item->apply != NULL) {\n@@ -2208,14 +2221,14 @@\n \t\t\titem->apply = NULL;\n \t\t}\n \t\tNG_FREE_ITEM(item);\n-\t\tmtx_lock_spin(&ngq->q_mtx);\n+\t\tNG_QUEUE_LOCK(ngq);\n \t}\n \t\/*\n \t * Take us off the work queue if we are there.\n \t * We definately have no work to be done.\n \t *\/\n \tng_worklist_remove(ngq->q_node);\n-\tmtx_unlock_spin(&ngq->q_mtx);\n+\tNG_QUEUE_UNLOCK(ngq);\n }\n \n \/***********************************************************************\n@@ -2339,9 +2352,9 @@\n #ifdef\tNETGRAPH_DEBUG\n \t\t_ngi_check(item, __FILE__, __LINE__);\n #endif\n-\t\tmtx_lock_spin(&(ngq->q_mtx));\n+\t\tNG_QUEUE_LOCK(ngq);\n \t\tng_queue_rw(ngq, item, rw);\n-\t\tmtx_unlock_spin(&(ngq->q_mtx));\n+\t\tNG_QUEUE_UNLOCK(ngq);\n \n \t\tif (flags & NG_PROGRESS)\n \t\t\treturn (EINPROGRESS);\n@@ -2384,10 +2397,10 @@\n \t\treturn (error);\n \t}\n \n-\tmtx_lock_spin(&(ngq->q_mtx));\n+\tNG_QUEUE_LOCK(ngq);\n \tif (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq))\n \t\tng_setisr(ngq->q_node);\n-\tmtx_unlock_spin(&(ngq->q_mtx));\n+\tNG_QUEUE_UNLOCK(ngq);\n \n \treturn (error);\n }\n@@ -3140,7 +3153,7 @@\n \tswitch (event) {\n \tcase MOD_LOAD:\n \t\t\/* Initialize everything. *\/\n-\t\tmtx_init(&ng_worklist_mtx, \"ng_worklist\", NULL, MTX_SPIN);\n+\t\tNG_WORKLIST_LOCK_INIT();\n \t\tmtx_init(&ng_typelist_mtx, \"netgraph types mutex\", NULL,\n \t\t MTX_DEF);\n \t\tmtx_init(&ng_nodelist_mtx, \"netgraph nodelist mutex\", NULL,\n@@ -3318,15 +3331,15 @@\n \tnode_p node = NULL;\n \n \tfor (;;) {\n-\t\tmtx_lock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_LOCK();\n \t\tnode = TAILQ_FIRST(&ng_worklist);\n \t\tif (!node) {\n-\t\t\tmtx_unlock_spin(&ng_worklist_mtx);\n+\t\t\tNG_WORKLIST_UNLOCK();\n \t\t\tbreak;\n \t\t}\n \t\tnode->nd_flags &= ~NGF_WORKQ;\t\n \t\tTAILQ_REMOVE(&ng_worklist, node, nd_work);\n-\t\tmtx_unlock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_UNLOCK();\n \t\tCTR3(KTR_NET, \"%20s: node [%x] (%p) taken off worklist\",\n \t\t __func__, node->nd_ID, node);\n \t\t\/*\n@@ -3345,13 +3358,13 @@\n \t\tfor (;;) {\n \t\t\tint rw;\n \n-\t\t\tmtx_lock_spin(&node->nd_input_queue.q_mtx);\n+\t\t\tNG_QUEUE_LOCK(&node->nd_input_queue);\n \t\t\titem = ng_dequeue(&node->nd_input_queue, &rw);\n \t\t\tif (item == NULL) {\n-\t\t\t\tmtx_unlock_spin(&node->nd_input_queue.q_mtx);\n+\t\t\t\tNG_QUEUE_UNLOCK(&node->nd_input_queue);\n \t\t\t\tbreak; \/* go look for another node *\/\n \t\t\t} else {\n-\t\t\t\tmtx_unlock_spin(&node->nd_input_queue.q_mtx);\n+\t\t\t\tNG_QUEUE_UNLOCK(&node->nd_input_queue);\n \t\t\t\tNGI_GET_NODE(item, node); \/* zaps stored node *\/\n \t\t\t\tng_apply_item(node, item, rw);\n \t\t\t\tNG_NODE_UNREF(node);\n@@ -3366,16 +3379,16 @@\n {\n \tmtx_assert(&node->nd_input_queue.q_mtx, MA_OWNED);\n \n-\tmtx_lock_spin(&ng_worklist_mtx);\n+\tNG_WORKLIST_LOCK();\n \tif (node->nd_flags & NGF_WORKQ) {\n \t\tnode->nd_flags &= ~NGF_WORKQ;\n \t\tTAILQ_REMOVE(&ng_worklist, node, nd_work);\n-\t\tmtx_unlock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_UNLOCK();\n \t\tNG_NODE_UNREF(node);\n \t\tCTR3(KTR_NET, \"%20s: node [%x] (%p) removed from worklist\",\n \t\t __func__, node->nd_ID, node);\n \t} else {\n-\t\tmtx_unlock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_UNLOCK();\n \t}\n }\n \n@@ -3396,9 +3409,9 @@\n \t\t * then put us on.\n \t\t *\/\n \t\tnode->nd_flags |= NGF_WORKQ;\n-\t\tmtx_lock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_LOCK();\n \t\tTAILQ_INSERT_TAIL(&ng_worklist, node, nd_work);\n-\t\tmtx_unlock_spin(&ng_worklist_mtx);\n+\t\tNG_WORKLIST_UNLOCK();\n \t\tNG_NODE_REF(node); \/* XXX fafe in mutex? *\/\n \t\tCTR3(KTR_NET, \"%20s: node [%x] (%p) put on worklist\", __func__,\n \t\t node->nd_ID, node);\n"} {"commit":"e40fc31bb36bbdecd8456a731a371d7263d5446b","subject":"fix time printf warning for 32bit linux","message":"fix time printf warning for 32bit linux\n","repos":"alejandrodau\/jobexec,alejandrodau\/jobexec","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- jobexec.c\n+++ jobexec.c\n@@ -133,7 +133,7 @@\n }\n \/\/ create timestamp dir\n l = strlen(dir);\n- snprintf(&dir[l], sizeof(dir) - l, \"\/%zu\", time(NULL));\n+ snprintf(&dir[l], sizeof(dir) - l, \"\/%zu\", (size_t) time(NULL));\n if (access(dir, F_OK) == -1) {\n \t\/\/ create dir\n \tassertnlog2(!mkdir(dir, 00755), \"mkdir dir\", dir);\n"} {"commit":"0894db9cb4eb2fa9db62e35cd70af7f0268a6d7d","subject":"MFC r181824","message":"MFC r181824\n\n Fix ARP in bridging scenarios where the bridge shares its\n MAC address with one of its members.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/if_ether.c\n+++ sys\/netinet\/if_ether.c\n@@ -605,13 +605,15 @@\n \tu_int8_t *enaddr = NULL;\n \tint op, rif_len;\n \tint req_len;\n-\tint bridged = 0;\n+\tint bridged = 0, is_bridge = 0;\n #ifdef DEV_CARP\n \tint carp_match = 0;\n #endif\n \n \tif (do_bridge || ifp->if_bridge)\n \t\tbridged = 1;\n+\tif (ifp->if_type == IFT_BRIDGE)\n+\t\tis_bridge = 1;\n \n \treq_len = arphdr_len2(ifp->if_addrlen, sizeof(struct in_addr));\n \tif (m->m_len < req_len && (m = m_pullup(m, req_len)) == NULL) {\n@@ -652,6 +654,27 @@\n \t\t (ia->ia_ifp == ifp)) &&\n \t\t isaddr.s_addr == ia->ia_addr.sin_addr.s_addr)\n \t\t\tgoto match;\n+\n+#define BDG_MEMBER_MATCHES_ARP(addr, ifp, ia)\t\t\t\t\\\n+ (ia->ia_ifp->if_bridge == ifp->if_softc &&\t\t\t\t\\\n+ !bcmp(IF_LLADDR(ia->ia_ifp), IF_LLADDR(ifp), ifp->if_addrlen) &&\t\\\n+ addr == ia->ia_addr.sin_addr.s_addr)\n+\t\/*\n+\t * Check the case when bridge shares its MAC address with\n+\t * some of its children, so packets are claimed by bridge\n+\t * itself (bridge_input() does it first), but they are really\n+\t * meant to be destined to the bridge member.\n+\t *\/\n+\tif (is_bridge) {\n+\t\tLIST_FOREACH(ia, INADDR_HASH(itaddr.s_addr), ia_hash) {\n+\t\t\tif (BDG_MEMBER_MATCHES_ARP(itaddr.s_addr, ifp, ia)) {\n+\t\t\t\tifp = ia->ia_ifp;\n+\t\t\t\tgoto match;\n+\t\t\t}\n+\t\t}\n+\t}\n+#undef BDG_MEMBER_MATCHES_ARP\n+\n \t\/*\n \t * No match, use the first inet address on the receive interface\n \t * as a dummy address for the rest of the function.\n"} {"commit":"d4e1f6671cae4c787f38549449a6ac0661eacdcd","subject":"Slightly reword comment and remove typos.","message":"Slightly reword comment and remove typos.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/if_ether.c\n+++ sys\/netinet\/if_ether.c\n@@ -398,9 +398,9 @@\n \t\t\/*\n \t\t * We enter this block if rt0 was NULL,\n \t\t * or if rt found by in_rt_check() didn't have llinfo.\n-\t\t * we should get a cloned route, which since it should\n-\t\t * come from the local interface should have a ll entry.\n-\t\t * if may be incoplete but that's ok.\n+\t\t * We should get a cloned route from the local interface,\n+\t\t * so it should have an ll entry.\n+\t\t * It may be incomplete but that's ok.\n \t\t * XXXMRT if we haven't found a fibnum is that OK?\n \t\t *\/\n \t\trt = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0, fibnum);\n"} {"commit":"c66f2c8434def0cf16f5889a43b65710e958952d","subject":"Append missing newline to log() message for permanent ARP modification attempt warning, which was added in rev 1.48 .","message":"Append missing newline to log() message for permanent ARP modification\nattempt warning, which was added in rev 1.48 .\n\nPR:\t14371\nSubmitted by:\tsec@pi.musin.de (Stefan `Sec` Zehl)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/if_ether.c\n+++ sys\/netinet\/if_ether.c\n@@ -558,7 +558,7 @@\n \t\t\t\tac->ac_if.if_name, ac->ac_if.if_unit);\n \t\t\telse {\n \t\t\t log(LOG_ERR,\n-\t\t\t\t\"arp: %6D attempts to modify permanent entry for %s on %s%d\",\n+\t\t\t\t\"arp: %6D attempts to modify permanent entry for %s on %s%d\\n\",\n \t\t\t\tea->arp_sha, \":\", inet_ntoa(isaddr),\n \t\t\t\tac->ac_if.if_name, ac->ac_if.if_unit);\n \t\t\t goto reply;\n"} {"commit":"7399e6761f3227c3fd6f0633849fbfe57341b055","subject":"Remove spl() calls from ip_slowtimo(), as IP fragment queue locking was merged several years ago.","message":"Remove spl() calls from ip_slowtimo(), as IP fragment queue locking was\nmerged several years ago.\n\nSubmitted by:\tgnn\nMFC after:\t1 day\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_input.c\n+++ sys\/netinet\/ip_input.c\n@@ -1125,7 +1125,6 @@\n ip_slowtimo()\n {\n \tregister struct ipq *fp;\n-\tint s = splnet();\n \tint i;\n \n \tIPQ_LOCK();\n@@ -1156,7 +1155,6 @@\n \t\t}\n \t}\n \tIPQ_UNLOCK();\n-\tsplx(s);\n }\n \n \/*\n"} {"commit":"c520fb317ac85d578a5a3446d54309d13ba10ad2","subject":"Introduce support for Mandatory Access Control and extensible kernel access control.","message":"Introduce support for Mandatory Access Control and extensible\nkernel access control.\n\nInstrument the code managing IP fragment reassembly queues (struct ipq)\nto invoke appropriate MAC entry points to maintain a MAC label on\neach queue. Permit MAC policies to associate information with a queue\nbased on the mbuf that caused it to be created, update that information\nbased on further mbufs accepted by the queue, influence the decision\nmaking process by which mbufs are accepted to the queue, and set the\nlabel of the mbuf holding the reassembled datagram following reassembly\ncompletetion.\n\nObtained from:\tTrustedBSD Project\nSponsored by:\tDARPA, NAI Labs\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/netinet\/ip_input.c\n+++ sys\/netinet\/ip_input.c\n@@ -43,11 +43,13 @@\n #include \"opt_ipfilter.h\"\n #include \"opt_ipstealth.h\"\n #include \"opt_ipsec.h\"\n+#include \"opt_mac.h\"\n #include \"opt_pfil_hooks.h\"\n #include \"opt_random_ip_id.h\"\n \n #include <sys\/param.h>\n #include <sys\/systm.h>\n+#include <sys\/mac.h>\n #include <sys\/mbuf.h>\n #include <sys\/malloc.h>\n #include <sys\/domain.h>\n@@ -693,6 +695,9 @@\n \t\t\tif (ip->ip_id == fp->ipq_id &&\n \t\t\t ip->ip_src.s_addr == fp->ipq_src.s_addr &&\n \t\t\t ip->ip_dst.s_addr == fp->ipq_dst.s_addr &&\n+#ifdef MAC\n+\t\t\t mac_fragment_match(m, fp) &&\n+#endif\n \t\t\t ip->ip_p == fp->ipq_p)\n \t\t\t\tgoto found;\n \n@@ -902,6 +907,10 @@\n \t\tif ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL)\n \t\t\tgoto dropfrag;\n \t\tfp = mtod(t, struct ipq *);\n+#ifdef MAC\n+\t\tmac_init_ipq(fp);\n+\t\tmac_create_ipq(m, fp);\n+#endif\n \t\tTAILQ_INSERT_HEAD(head, fp, ipq_list);\n \t\tnipq++;\n \t\tfp->ipq_ttl = IPFRAGTTL;\n@@ -916,6 +925,10 @@\n \t\tfp->ipq_div_cookie = 0;\n #endif\n \t\tgoto inserted;\n+\t} else {\n+#ifdef MAC\n+\t\tmac_update_ipq(m, fp);\n+#endif\n \t}\n \n #define GETIP(m)\t((struct ip*)((m)->m_pkthdr.header))\n@@ -1028,6 +1041,10 @@\n \t\tm->m_pkthdr.csum_data += q->m_pkthdr.csum_data;\n \t\tm_cat(m, q);\n \t}\n+#ifdef MAC\n+\tmac_create_datagram_from_ipq(fp, m);\n+\tmac_destroy_ipq(fp);\n+#endif\n \n #ifdef IPDIVERT\n \t\/*\n"} {"commit":"03c4879eb747fb5e14652ec04d6315aa8518e665","subject":"Drop a duplicated test in rmc-test","message":"Drop a duplicated test in rmc-test\n","repos":"msullivan\/rmc-compiler,msullivan\/rmc-compiler,msullivan\/rmc-compiler,msullivan\/rmc-compiler,msullivan\/rmc-compiler,msullivan\/rmc-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/rmc-test.c\n+++ examples\/rmc-test.c\n@@ -56,15 +56,3 @@\n \n return r;\n }\n-\n-\/\/ How about something provably impossible\n-int bogus_ctrl_dep4() {\n- XEDGE(read, write);\n-\n- L(read, int r = global_p);\n- if (r || 1) {\n- L(write, global_q = 1);\n- }\n-\n- return r;\n-}\n"} {"commit":"2e86adafd00892a1f0b05e62be161cd5379dbbac","subject":"declare nanoseconds for other architectures","message":"declare nanoseconds for other architectures\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/sys\/lock_profile.h\n+++ sys\/sys\/lock_profile.h\n@@ -39,7 +39,11 @@\n #ifndef LPROF_HASH_SIZE\n #define LPROF_HASH_SIZE\t\t4096\n #define LPROF_HASH_MASK\t\t(LPROF_HASH_SIZE - 1)\n+\n+#ifndef USE_CPU_NANOSECONDS\n+u_int64_t nanoseconds(void);\n #endif\n+\n struct lock_prof {\n \tconst char\t*name;\n \tconst char\t*file;\n"} {"commit":"7633e99995f0d90d3edd825d71a5e12b2bede278","subject":"Work around a strange issue where XNextEvent() blocks on the last event until a newer one is received.","message":"Work around a strange issue where XNextEvent() blocks on the\nlast event until a newer one is received.\n\nAny X expert who can explain the error to me?\n","repos":"kevleyski\/DirectFB-1,kevleyski\/directfb,kevleyski\/directfb,jcdubois\/DirectFB,jcdubois\/DirectFB,sklnet\/DirectFB,sklnet\/DirectFB,Distrotech\/DirectFB,kaostao\/directfb,DirectFB\/directfb,jcdubois\/DirectFB,kevleyski\/directfb,sklnet\/DirectFB,mtsekm\/test,deniskropp\/DirectFB,Distrotech\/DirectFB,mtsekm\/test,kevleyski\/DirectFB-1,lancebaiyouview\/DirectFB,dfbdok\/DirectFB1,deniskropp\/DirectFB,DirectFB\/directfb,djbclark\/directfb-core-DirectFB,lancebaiyouview\/DirectFB,mtsekm\/test,deniskropp\/DirectFB,kaostao\/directfb,lancebaiyouview\/DirectFB,kevleyski\/DirectFB-1,sklnet\/DirectFB,kevleyski\/DirectFB-1,kevleyski\/directfb,DirectFB\/directfb,dfbdok\/DirectFB1,Distrotech\/DirectFB,deniskropp\/DirectFB,djbclark\/directfb-core-DirectFB,kaostao\/directfb,djbclark\/directfb-core-DirectFB,djbclark\/directfb-core-DirectFB,dfbdok\/DirectFB1,lancebaiyouview\/DirectFB","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- systems\/x11\/x11input.c\n+++ systems\/x11\/x11input.c\n@@ -449,6 +449,9 @@\n XEvent xEvent; \n DFBInputEvent dfbEvent;\n \n+ \/* FIXME: Detect key repeats, we're receiving KeyPress, KeyRelease, KeyPress, KeyRelease... !!?? *\/\n+\n+#ifdef ___HELP___WHY_DOES_THIS_ALWAYS_BLOCK_THE_LAST_EVENT___HELP___\n XNextEvent( dfb_x11->display, &xEvent );\n \n do {\n@@ -476,7 +479,35 @@\n break;\n }\n } while (XCheckMaskEvent( dfb_x11->display, ~0, &xEvent ));\n-\n+#else\n+ usleep(10000);\n+\n+ while (XCheckMaskEvent( dfb_x11->display, ~0, &xEvent )) {\n+ switch (xEvent.type) {\n+ case ButtonPress:\n+ case ButtonRelease:\n+ motion_realize( data );\n+ case MotionNotify:\n+ handleMouseEvent( &xEvent, data ); \/\/ crash ???\n+ break;\n+\n+ case KeyPress:\n+ case KeyRelease: {\n+ motion_realize( data );\n+\n+ dfbEvent.type = (xEvent.type == KeyPress) ? DIET_KEYPRESS : DIET_KEYRELEASE;\n+ dfbEvent.flags = DIEF_KEYCODE;\n+ dfbEvent.key_code = xEvent.xkey.keycode;\n+\n+ dfb_input_dispatch( data->device, &dfbEvent );\n+ break;\n+ }\n+\n+ default:\n+ break;\n+ }\n+ }\n+#endif\n motion_realize( data );\n \n direct_thread_testcancel( thread );\n"} {"commit":"73130a8c355ab9c17d2db5788a7b0f2ed9cc2dcb","subject":"removing hash storage optimisation check from test_env","message":"removing hash storage optimisation check from test_env\n","repos":"mkfifo\/plot,mkfifo\/plot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- t\/component\/test_env.c\n+++ t\/component\/test_env.c\n@@ -27,7 +27,8 @@\n fail_unless( plot_env_define(e, &s, &v) );\n fail_unless( &v == plot_env_get(e, &s) );\n \n- ck_assert_msg( 0 != s.hash, \"Hash should have been set\");\n+ \/* FIXME hash storage optimisation has been crippled *\/\n+ \/\/ck_assert_msg( 0 != s.hash, \"Hash should have been set\");\n \n puts(\"\\tTesting define mutation\");\n fail_unless( plot_env_define(e, &s, 0) );\n"} {"commit":"e4400614aed17995e91eba0e336c59ff901597c4","subject":"Init: tests a complex for expression","message":"Init: tests a complex for expression\n","repos":"DeadDork\/learning_c,DeadDork\/learning_c","returncode":1,"stderr":"error: pathspec 'experiments\/for_1.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- experiments\/for_1.c\n+++ experiments\/for_1.c\n@@ -0,0 +1,23 @@\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ Comments\n+\n+\/\/ Experiments with a complex for loop.\n+\n+\/\/ Prints the number of 'on' bits.\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ Libraries\n+\n+#include <stdio.h>\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+int main( void )\n+{\n+\tint e; \/\/ Element\n+\tunsigned x = 15;\n+\n+\tfor( e = 1; x > 0; ( x &= x - 1 ) && ++e );\n+\tprintf( \"x has %d 'on' bits\\n\", e - 1 );\n+\n+\treturn 0;\n+}\n"} {"commit":"bd22bde4c8a5abddb5d0b662d5eeccb3392a8d59","subject":"final cleanup","message":"final cleanup\n","repos":"Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- h5_test\/tst_h_dimscales1.c\n+++ h5_test\/tst_h_dimscales1.c\n@@ -77,8 +77,8 @@\n H5Dclose(var3_datasetid) < 0 ||\n H5Sclose(var1_spaceid) < 0 ||\n H5Sclose(var3_spaceid) < 0 ||\n- H5Sclose(dimscale_spaceid) < 0) ERR;\n- if (H5Gclose(grpid) < 0 ||\n+ H5Sclose(dimscale_spaceid) < 0 ||\n+\t H5Gclose(grpid) < 0 ||\n H5Fclose(fileid) < 0) ERR;\n }\n SUMMARIZE_ERR;\n"} {"commit":"eec9e4ffc06f1eb40fa4a69d50c41bb9556c0e1a","subject":"arith: add elementwise operator definitions","message":"arith: add elementwise operator definitions\n","repos":"arrayfire\/arrayfire-rb,arrayfire\/arrayfire-rb,prasunanand\/arrayfire-rb,prasunanand\/arrayfire-rb,arrayfire\/arrayfire-rb,prasunanand\/arrayfire-rb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ext\/mri\/arrayfire.c\n+++ ext\/mri\/arrayfire.c\n@@ -168,9 +168,16 @@\n \n static size_t* interpret_shape(VALUE arg, size_t* dim);\n \n-#define DEF_ELEMENTWISE_RUBY_ACCESSOR(oper, name) \\\n-static VALUE arf_ew_##name(VALUE left_val, VALUE right_val) { \\\n- return elementwise_op(arf::EW_##oper, left_val, right_val); \\\n+#define DEF_ELEMENTWISE_RUBY_ACCESSOR(name, oper) \\\n+static VALUE arf_ew_##name(VALUE left_val, VALUE right_val) { \\\n+ afstruct* left; \\\n+ afstruct* right; \\\n+ afstruct* result = ALLOC(afstruct); \\\n+ Data_Get_Struct(left_val, afstruct, left); \\\n+ Data_Get_Struct(right_val, afstruct, right); \\\n+ af_##oper(&result->carray, left->carray, right->carray, true); \\\n+ af_print_array(result->carray); \\\n+ return Data_Wrap_Struct(CLASS_OF(left_val), NULL, arf_free, result); \\\n }\n \n #define DECL_ELEMENTWISE_RUBY_ACCESSOR(name) static VALUE arf_ew_##name(VALUE left_val, VALUE right_val);\n@@ -445,6 +452,11 @@\n return Qtrue;\n }\n \n+DEF_ELEMENTWISE_RUBY_ACCESSOR(add, add)\n+DEF_ELEMENTWISE_RUBY_ACCESSOR(subtract, sub)\n+DEF_ELEMENTWISE_RUBY_ACCESSOR(multiply, mul)\n+DEF_ELEMENTWISE_RUBY_ACCESSOR(divide, div)\n+\n \/\/ Algorithm\n \n static VALUE arf_sum(VALUE self){\n"} {"commit":"dd5f5635545f12abf7be654be47a2033079ffec6","subject":"make sure we respect application_timezone for DateTime values as well","message":"make sure we respect application_timezone for DateTime values as well\n","repos":"kamipo\/mysql2,marshall-lee\/mysql2,webdev1001\/mysql2,sodabrew\/mysql2,JonathonMA\/mysql2,JonathonMA\/mysql2,zBMNForks\/mysql2,jeremy\/mysql2,zmack\/mysql2,marshall-lee\/mysql2,jeremy\/mysql2,bloopletech\/mysql2,yui-knk\/mysql2,bloopletech\/mysql2,neovintage\/mysql2,sodabrew\/mysql2,tamird\/mysql2,brianmario\/mysql2,modulexcite\/mysql2,blaind\/mysql2,marshall-lee\/mysql2,modulexcite\/mysql2,dylanahsmith\/mysql2,zmack\/mysql2,sodabrew\/mysql2,tamird\/mysql2,PipelineDeals\/mysql2,mkdynamic\/mysql2,blaind\/mysql2,jconroy77\/mysql2,brianmario\/mysql2,webdev1001\/mysql2,jconroy77\/mysql2,mkdynamic\/mysql2,bigcartel\/mysql2,webdev1001\/mysql2,zBMNForks\/mysql2,zmack\/mysql2,tamird\/mysql2,modulexcite\/mysql2,PipelineDeals\/mysql2,neovintage\/mysql2,zBMNForks\/mysql2,jconroy77\/mysql2,mkdynamic\/mysql2,marshall-lee\/mysql2,yui-knk\/mysql2,tamird\/mysql2,dylanahsmith\/mysql2,PipelineDeals\/mysql2,kamipo\/mysql2,PipelineDeals\/mysql2,mkdynamic\/mysql2,webdev1001\/mysql2,zBMNForks\/mysql2,yui-knk\/mysql2,yui-knk\/mysql2,coupa\/mysql2,jconroy77\/mysql2,kamipo\/mysql2,bigcartel\/mysql2,coupa\/mysql2,bigcartel\/mysql2,kamipo\/mysql2,jeremy\/mysql2,zmack\/mysql2,bigcartel\/mysql2,modulexcite\/mysql2,brianmario\/mysql2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/mysql2\/result.c\n+++ ext\/mysql2\/result.c\n@@ -6,11 +6,11 @@\n \n VALUE cMysql2Result;\n VALUE cBigDecimal, cDate, cDateTime;\n-VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month;\n+VALUE opt_decimal_zero, opt_float_zero, opt_time_year, opt_time_month, opt_utc_offset;\n extern VALUE mMysql2, cMysql2Client, cMysql2Error;\n static VALUE intern_encoding_from_charset;\n static ID intern_new, intern_utc, intern_local, intern_encoding_from_charset_code,\n- intern_localtime, intern_local_offset, intern_civil;\n+ intern_localtime, intern_local_offset, intern_civil, intern_new_offset;\n static ID sym_symbolize_keys, sym_as, sym_array, sym_database_timezone, sym_application_timezone,\n sym_local, sym_utc, sym_cast_booleans;\n static ID intern_merge;\n@@ -193,9 +193,17 @@\n if (year < 1902 || year+month+day > 2058) { \/\/ use DateTime instead\n VALUE offset = INT2NUM(0);\n if (db_timezone == intern_local) {\n- offset = rb_funcall(cMysql2Client, rb_intern(\"local_offset\"), 0);\n+ offset = rb_funcall(cMysql2Client, intern_local_offset, 0);\n }\n val = rb_funcall(cDateTime, intern_civil, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), offset);\n+ if (!NIL_P(app_timezone)) {\n+ if (app_timezone == intern_local) {\n+ offset = rb_funcall(cMysql2Client, intern_local_offset, 0);\n+ val = rb_funcall(val, intern_new_offset, 1, offset);\n+ } else { \/\/ utc\n+ val = rb_funcall(val, intern_new_offset, 1, opt_utc_offset);\n+ }\n+ }\n } else {\n val = rb_funcall(rb_cTime, db_timezone, 6, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec));\n if (!NIL_P(app_timezone)) {\n@@ -435,6 +443,7 @@\n intern_localtime = rb_intern(\"localtime\");\n intern_local_offset = rb_intern(\"local_offset\");\n intern_civil = rb_intern(\"civil\");\n+ intern_new_offset = rb_intern(\"new_offset\");\n \n sym_symbolize_keys = ID2SYM(rb_intern(\"symbolize_keys\"));\n sym_as = ID2SYM(rb_intern(\"as\"));\n@@ -451,6 +460,7 @@\n opt_float_zero = rb_float_new((double)0);\n opt_time_year = INT2NUM(2000);\n opt_time_month = INT2NUM(1);\n+ opt_utc_offset = INT2NUM(0);\n \n #ifdef HAVE_RUBY_ENCODING_H\n binaryEncoding = rb_enc_find(\"binary\");\n"} {"commit":"4114fb21a9ce6acc6b69e1e7ce434375fee2af98","subject":"php_vm_reset_status","message":"php_vm_reset_status\n","repos":"yoshida-eth0\/ruby-php_vm,yoshida-eth0\/ruby-php_vm,yoshida-eth0\/ruby-php_vm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/php_vm\/php_vm.c\n+++ ext\/php_vm\/php_vm.c\n@@ -73,6 +73,13 @@\n \tEG(exception) = NULL;\n }\n \n+static void php_vm_reset_status(TSRMLS_D)\n+{\n+\tEG(exit_status) = 0;\n+\tEG(exception) = NULL;\n+\trb_cv_set(rb_mPHPVM, \"@@last_error_reporting\", Qnil);\n+}\n+\n \n \/\/ PHP\n \n@@ -80,6 +87,9 @@\n {\n \tint syntax_error = 0;\n \tzval retval;\n+\n+\t\/\/ reset\n+\tphp_vm_reset_status(TSRMLS_C);\n \n \t\/\/ eval\n \tzend_try {\n@@ -362,6 +372,9 @@\n int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int argc, VALUE *v_argv, zval **retval_ptr TSRMLS_DC)\n {\n \tint result = FAILURE;\n+\n+\t\/\/ reset\n+\tphp_vm_reset_status(TSRMLS_C);\n \n \t\/\/ call info\n \tzend_fcall_info fci;\n"} {"commit":"5f72214c308e5d68a409cf594828246a5dd7e09e","subject":"Add missing incref","message":"Add missing incref\n","repos":"mrkn\/pycall.rb,mrkn\/pycall.rb,mrkn\/pycall,mrkn\/pycall,mrkn\/pycall.rb,mrkn\/pycall,mrkn\/pycall.rb,mrkn\/pycall","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/pycall\/pycall.c\n+++ ext\/pycall\/pycall.c\n@@ -1251,7 +1251,7 @@\n return pycall_pystring_to_ruby(pyobj);\n \n Py_API(Py_IncRef)(pyobj);\n-\n+ Py_API(Py_IncRef)(pyobj->ob_type);\n cls = pycall_python_type_mapping_get_mapped_class(pycall_pytypeptr_new((PyObject *)pyobj->ob_type));\n if (NIL_P(cls)) {\n rb_warning(\"Currentry do not support to convert %s to Ruby object\", Py_TYPE(pyobj)->tp_name);\n"} {"commit":"7085e5d65dc945f7bc6989541918a8c035a45a93","subject":"support no other #define","message":"support no other #define\n","repos":"kui\/revdev,kui\/revdev","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/revdev\/revdev.c\n+++ ext\/revdev\/revdev.c\n@@ -885,10 +885,18 @@\n rb_define_const(module_revdev, \"SW_LINEOUT_INSERT\", INT2NUM(SW_LINEOUT_INSERT));\/* set = inserted *\/\n rb_define_const(module_revdev, \"SW_JACK_PHYSICAL_INSERT\", INT2NUM(SW_JACK_PHYSICAL_INSERT));\/* set = mechanical switch set *\/\n rb_define_const(module_revdev, \"SW_VIDEOOUT_INSERT\", INT2NUM(SW_VIDEOOUT_INSERT));\/* set = inserted *\/\n+#ifdef SW_CAMERA_LENS_COVER\n rb_define_const(module_revdev, \"SW_CAMERA_LENS_COVER\", INT2NUM(SW_CAMERA_LENS_COVER));\/* set = lens covered *\/\n+#endif\n+#ifdef SW_KEYPAD_SLIDE\n rb_define_const(module_revdev, \"SW_KEYPAD_SLIDE\", INT2NUM(SW_KEYPAD_SLIDE));\/* set = keypad slide out *\/\n+#endif\n+#ifdef SW_FRONT_PROXIMITY\n rb_define_const(module_revdev, \"SW_FRONT_PROXIMITY\", INT2NUM(SW_FRONT_PROXIMITY));\/* set = front proximity sensor active *\/\n+#endif\n+#ifdef SW_ROTATE_LOCK\n rb_define_const(module_revdev, \"SW_ROTATE_LOCK\", INT2NUM(SW_ROTATE_LOCK));\/* set = rotate locked\/disabled *\/\n+#endif\n rb_define_const(module_revdev, \"SW_MAX\", INT2NUM(SW_MAX));\n rb_define_const(module_revdev, \"SW_CNT\", INT2NUM(SW_CNT));\n \n@@ -929,7 +937,9 @@\n rb_define_const(module_revdev, \"REP_DELAY\", INT2NUM(REP_DELAY));\n rb_define_const(module_revdev, \"REP_PERIOD\", INT2NUM(REP_PERIOD));\n rb_define_const(module_revdev, \"REP_MAX\", INT2NUM(REP_MAX));\n+#ifdef REP_CNT\n rb_define_const(module_revdev, \"REP_CNT\", INT2NUM(REP_CNT));\n+#endif\n \n \/*\n * Sounds\n@@ -969,14 +979,18 @@\n rb_define_const(module_revdev, \"BUS_HOST\", INT2NUM(BUS_HOST));\n rb_define_const(module_revdev, \"BUS_GSC\", INT2NUM(BUS_GSC));\n rb_define_const(module_revdev, \"BUS_ATARI\", INT2NUM(BUS_ATARI));\n+#ifdef BUS_SPI\n rb_define_const(module_revdev, \"BUS_SPI\", INT2NUM(BUS_SPI));\n+#endif\n \n \/*\n * MT_TOOL types\n *\/\n rb_define_const(module_revdev, \"MT_TOOL_FINGER\", INT2NUM(MT_TOOL_FINGER));\n rb_define_const(module_revdev, \"MT_TOOL_PEN\", INT2NUM(MT_TOOL_PEN));\n+#ifdef MT_TOOL\n rb_define_const(module_revdev, \"MT_TOOL_MAX\", INT2NUM(MT_TOOL_MAX));\n+#endif\n \n \/*\n * Values describing the status of a force-feedback effect\n"} {"commit":"788889d308003f2ad51ce92f742875597d9fbfc0","subject":"Oops, I'm an idiot","message":"Oops, I'm an idiot\n","repos":"ice799\/memprof,ice799\/memprof","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/tracers\/mysql.c\n+++ ext\/tracers\/mysql.c\n@@ -17,8 +17,8 @@\n size_t query_calls;\n uint32_t query_time;\n \n- size_t query_calls_by_type[sql_UNKNOWN];\n- uint32_t query_time_by_type[sql_UNKNOWN];\n+ size_t query_calls_by_type[sql_UNKNOWN+1];\n+ uint32_t query_time_by_type[sql_UNKNOWN+1];\n };\n \n static struct tracer tracer;\n"} {"commit":"585585ebcc06b5944d118830f274fafb96e5da57","subject":"Add simple test for regexp expansion","message":"Add simple test for regexp expansion\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- extensions\/addons.c\n+++ extensions\/addons.c\n@@ -1892,6 +1892,8 @@\n { \"*\", \"^.*\" },\n { \"http:\/\/\", \"^http:\/\/\" },\n { \"https:\/\/\", \"^https:\/\/\" },\n+ { \"http*:\/\/\", \"^http:\/\/\" },\n+ { \"http*:\/\/\", \"^https:\/\/\" },\n { \"about:blank\", \"^about:blank\" },\n { \"file:\/\/\", \"^file:\/\/\" },\n { \"ftp:\/\/\", \"^ftp:\/\/\" },\n"} {"commit":"67420de4f4faa214de853dc70ef307d3571bfc28","subject":"extmod\/modusocket: Allow setting timeout on unbound sockets.","message":"extmod\/modusocket: Allow setting timeout on unbound sockets.\n\nFor an extended state socket, if settimeout() is called before a NIC is\nbound, save the timeout until the NIC is bound.\n","repos":"adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- extmod\/modusocket.c\n+++ extmod\/modusocket.c\n@@ -85,6 +85,13 @@\n if (self->nic_type->socket(self, &_errno) != 0) {\n mp_raise_OSError(_errno);\n }\n+\n+ #if MICROPY_PY_USOCKET_EXTENDED_STATE\n+ \/\/ if a timeout was set before binding a NIC, call settimeout to reset it\n+ if (self->timeout != 0 && self->nic_type->settimeout(self, self->timeout, &_errno) != 0) {\n+ mp_raise_OSError(_errno);\n+ }\n+ #endif\n }\n }\n \n@@ -317,10 +324,6 @@\n \/\/ otherwise, timeout is in seconds\n STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {\n mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);\n- if (self->nic == MP_OBJ_NULL) {\n- \/\/ not connected\n- mp_raise_OSError(MP_ENOTCONN);\n- }\n mp_uint_t timeout;\n if (timeout_in == mp_const_none) {\n timeout = -1;\n@@ -331,9 +334,19 @@\n timeout = 1000 * mp_obj_get_int(timeout_in);\n #endif\n }\n- int _errno;\n- if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {\n- mp_raise_OSError(_errno);\n+ if (self->nic == MP_OBJ_NULL) {\n+ #if MICROPY_PY_USOCKET_EXTENDED_STATE\n+ \/\/ store the timeout in the socket state until a NIC is bound\n+ self->timeout = timeout;\n+ #else\n+ \/\/ not connected\n+ mp_raise_OSError(MP_ENOTCONN);\n+ #endif\n+ } else {\n+ int _errno;\n+ if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {\n+ mp_raise_OSError(_errno);\n+ }\n }\n return mp_const_none;\n }\n"} {"commit":"bb1b451f138271089cc19a296692a9514344cc68","subject":"remove obsolete staff to debug the driver","message":"remove obsolete staff to debug the driver\n","repos":"RWTH-OS\/HermitCore,stlankes\/HermitCore,stlankes\/HermitCore,RWTH-OS\/HermitCore,stlankes\/HermitCore,stlankes\/HermitCore,RWTH-OS\/HermitCore,stlankes\/HermitCore,RWTH-OS\/HermitCore,RWTH-OS\/HermitCore,RWTH-OS\/HermitCore,stlankes\/HermitCore","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hermit\/drivers\/net\/mmnif.c\n+++ hermit\/drivers\/net\/mmnif.c\n@@ -502,9 +502,6 @@\n \t\ti += q->len;\n \t}\n \n-\tif (i != p->tot_len)\n-\t\tkprintf(\"%d != %d\\n\", i, p->tot_len);\n-\n \tif (mmnif_commit_packet(dest_ip, write_address))\n \t{\n \t\tDEBUGPRINTF(\"mmnif_tx(): packet somehow lost during commit\\n\");\n"} {"commit":"f473c95ab7695451923c7ab23f24c9f5d057ae21","subject":"fix output formatting bug - use %f rather than %d in print statements where required","message":"fix output formatting bug - use %f rather than %d in print statements where required\n\n\ngit-svn-id: 0ef30dc7da0b07cedfa074587325a6c153c0ae55@7768 fdbf22ae-c210-0410-be80-ca943da6b8f8\n","repos":"NOAA-PMEL\/Ferret,NOAA-PMEL\/Ferret,NOAA-PMEL\/PyFerret,NOAA-PMEL\/Ferret,NOAA-PMEL\/PyFerret,NOAA-PMEL\/PyFerret,NOAA-PMEL\/Ferret,NOAA-PMEL\/PyFerret,NOAA-PMEL\/Ferret,NOAA-PMEL\/PyFerret","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- fer\/ccr\/fermain_c.c\n+++ fer\/ccr\/fermain_c.c\n@@ -109,6 +109,9 @@\n * save_ppl_memory_size so the size is available via common to \n * Fortran routines. New declaration of save_ppl_memory_size \n * in ferret.h\n+* 10\/19\/01 *kob* fix output formatting bug which was printing memory size\n+* (in Mwords) divided by float 1.E6 as a decimal, rather than\n+* a float value - changed in three places\n *\/\n \n #include <unistd.h>\n@@ -313,12 +316,12 @@\n free ( (void *) *memory );\n *memory = (float *) malloc(mem_size*sizeof(float));\n if ( *memory == 0 ) {\n-\tprintf(\"Unable to allocate %d Mwords of memory.\\n\",mem_size\/1.E6 );\n+\tprintf(\"Unable to allocate %f Mwords of memory.\\n\",mem_size\/1.E6 );\n \tmem_blk_size = old_mem_blk_size;\n \tmem_size = mem_blk_size * max_mem_blks;\n \t*memory = (float *) malloc(mem_size*sizeof(float));\n \tif ( *memory == (float *)0 ) {\n-\t printf(\"Unable to reallocate previous memory of %d Mwords.\\n\",mem_size\/1.E6 );\n+\t printf(\"Unable to reallocate previous memory of %f Mwords.\\n\",mem_size\/1.E6 );\n \t exit(0);\n \t} else {\n \t printf(\"Restoring previous memory of %f Mwords.\\n\",mem_size\/1.E6 );\n"} {"commit":"eea1d6184dad5b5ce6dd4ef363a85a79498d836d","subject":"bugfix: json_request was not released","message":"bugfix: json_request was not released\n","repos":"pijyoi\/jsonrpc,pijyoi\/jsonrpc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- jsonrpc.c\n+++ jsonrpc.c\n@@ -248,7 +248,10 @@\n \t} else {\n \t\tjson_response = jsonrpc_handle_request_single(json_request, method_table);\n \t}\n-\t\n+\n+\tif (json_request)\n+\t\tjson_decref(json_request);\n+\n \tif (json_response)\n \t\toutput = json_dumps(json_response, JSON_INDENT(2));\n \treturn output;\n"} {"commit":"6fa0097d9ea62cc009bc365d1c12e5310c8127b3","subject":"Silence GCC warning.","message":"Silence GCC warning.\n","repos":"earthling42\/mujs,ccxvii\/mujs,BOGY\/mujs,guiquanz\/mujs,evanlabs\/mujs,ccxvii\/mujs,thurday\/mujs,Frky\/mujs,lsm\/mujs,ccxvii\/mujs,ccxvii\/mujs","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- jsvalue.c\n+++ jsvalue.c\n@@ -5,7 +5,7 @@\n #include \"utf.h\"\n \n #define JSV_ISSTRING(v) (v->type==JS_TSHRSTR || v->type==JS_TMEMSTR || v->type==JS_TLITSTR)\n-#define JSV_TOSTRING(v) (v->type==JS_TSHRSTR ? v->u.shrstr : v->type==JS_TLITSTR ? v->u.litstr : v->type==JS_TMEMSTR ? v->u.memstr->p : NULL)\n+#define JSV_TOSTRING(v) (v->type==JS_TSHRSTR ? v->u.shrstr : v->type==JS_TLITSTR ? v->u.litstr : v->type==JS_TMEMSTR ? v->u.memstr->p : \"\")\n \n double jsV_numbertointeger(double n)\n {\n"} {"commit":"863e09db9ac54f313952cca140c7fbdd65cc667f","subject":"add test code for kevent","message":"add test code for kevent\n","repos":"ytakano\/lab,ytakano\/lab","returncode":1,"stderr":"error: pathspec 'kev\/kev.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- kev\/kev.c\n+++ kev\/kev.c\n@@ -0,0 +1,59 @@\n+#include <sys\/types.h>\n+#include <sys\/event.h>\n+#include <sys\/time.h>\n+#include <sys\/uio.h>\n+#include <unistd.h>\n+\n+#include <stdlib.h>\n+#include <stdio.h>\n+#include <string.h>\n+\n+int\n+main(int argc, char **argv)\n+{\n+\n+ int kq;\n+\n+ if ((kq = kqueue()) == -1) {\n+ perror(\"kqueue()\");\n+ exit(-1);\n+ }\n+\n+ struct kevent kev[2], change[2];\n+\n+ EV_SET(&kev[0], STDIN_FILENO, EVFILT_READ, EV_ADD | EV_ENABLE | EV_ONESHOT, 0, 0, 0);\n+ EV_SET(&kev[1], -1, EVFILT_TIMER, EV_ADD | EV_ENABLE | EV_ONESHOT, 0, 5000, 0);\n+\n+ kevent(kq, kev, 2, NULL, 0, NULL);\n+\n+ for (;;) {\n+ int nev = kevent(kq, NULL, 0, change, 2, NULL);\n+ if (nev < 0) {\n+ perror(\"kevent()\");\n+ exit(-1);\n+ }\n+\n+ for (int i = 0; i < nev; i++) {\n+ if (change[i].flags & EV_ERROR) { \/* report any error *\/\n+ fprintf(stderr, \"EV_ERROR: %s\\n\", strerror(change[i].data));\n+ exit(-1);\n+ }\n+\n+ if (change[i].ident == STDIN_FILENO) {\n+ char *buf = malloc(change[i].data + 1);\n+ int n = read(STDIN_FILENO, buf, change[i].data);\n+\n+ buf[change[i].data - 1] = '\\0';\n+ printf(\"stdin!: buf = %s\\n\", buf);\n+ free(buf);\n+ } else if (change[i].ident == -1) {\n+ printf(\"timeout!\\n\");\n+ } else {\n+ fprintf(stderr, \"not reach here\\n\");\n+ exit(-1);\n+ }\n+ }\n+ }\n+ \n+ return 0;\n+}\n"} {"commit":"d7f4eee8cf30107070630851fd15f4403fa69ea3","subject":"add tegra","message":"add tegra\n","repos":"ds-hwang\/gbm_es2_demo,ds-hwang\/gbm_es2_demo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kmscube.c\n+++ kmscube.c\n@@ -73,7 +73,7 @@\n static int init_drm(void)\n {\n \tstatic const char *modules[] = {\n-\t\t\t\"i915\", \"radeon\", \"nouveau\", \"vmwgfx\", \"omapdrm\", \"exynos\", \"msm\"\n+\t\t\t\"i915\", \"radeon\", \"nouveau\", \"vmwgfx\", \"omapdrm\", \"exynos\", \"msm\", \"tegra\"\n \t};\n \tdrmModeRes *resources;\n \tdrmModeConnector *connector = NULL;\n"} {"commit":"006c71ecbb402bde5dd1b59345e2c871fa30fe1b","subject":"Cleanup code path for acl and count number of acl entries so we only save real acls.","message":"Cleanup code path for acl and count number of acl entries so we only save real acls.\n","repos":"rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- bacula\/src\/filed\/acl.c\n+++ bacula\/src\/filed\/acl.c\n@@ -515,6 +515,36 @@\n return ostype;\n }\n \n+static int acl_count_entries(acl_t acl)\n+{\n+ int count = 0;\n+#if defined(HAVE_FREEBSD_OS) || \\\n+ defined(HAVE_LINUX_OS)\n+ acl_entry_t ace;\n+ int entry_available;\n+\n+ entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);\n+ while (entry_available == 1) {\n+ count++;\n+ entry_available = acl_get_entry(acl, ACL_NEXT_ENTRY, &ace);\n+ }\n+#elif defined(HAVE_IRIX_OS)\n+ count = acl->acl_cnt;\n+#elif defined(HAVE_OSF1_OS)\n+ count = acl->acl_num;\n+#elif defined(HAVE_DARWIN_OS)\n+ acl_entry_t ace;\n+ int entry_available;\n+\n+ entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);\n+ while (entry_available == 0) {\n+ count++;\n+ entry_available = acl_get_entry(acl, ACL_NEXT_ENTRY, &ace);\n+ }\n+#endif\n+ return count;\n+}\n+\n #if !defined(HAVE_DARWIN_OS)\n \/**\n * See if an acl is a trivial one (e.g. just the stat bits encoded as acl.)\n@@ -606,30 +636,23 @@\n acl_type_t ostype;\n char *acl_text;\n berrno be;\n+ bacl_exit_code retval = bacl_exit_ok;\n \n ostype = bac_to_os_acltype(acltype);\n acl = acl_get_file(jcr->last_fname, ostype);\n if (acl) {\n-#if defined(HAVE_IRIX_OS)\n \/**\n * From observation, IRIX's acl_get_file() seems to return a\n * non-NULL acl with a count field of -1 when a file has no ACL\n * defined, while IRIX's acl_to_text() returns NULL when presented\n * with such an ACL. \n *\n- * Checking the count in the acl structure before calling\n- * acl_to_text() lets us avoid error messages about files\n- * with no ACLs, without modifying the flow of the code used for \n- * other operating systems, and it saves making some calls\n- * to acl_to_text() besides.\n- *\/\n- if (acl->acl_cnt <= 0) {\n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- acl_free(acl);\n- return bacl_exit_ok;\n- }\n-#endif\n+ * For all other implmentations we check if there are more then\n+ * zero entries in the acl returned.\n+ *\/\n+ if (acl_count_entries(acl) <= 0) {\n+ goto bail_out;\n+ }\n \n \/**\n * Make sure this is not just a trivial ACL.\n@@ -640,10 +663,7 @@\n * The ACLs simply reflect the (already known) standard permissions\n * So we don't send an ACL stream to the SD.\n *\/\n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- acl_free(acl);\n- return bacl_exit_ok;\n+ goto bail_out;\n }\n #endif\n #if defined(HAVE_FREEBSD_OS) && defined(_PC_ACL_NFS4)\n@@ -655,15 +675,15 @@\n * The ACLs simply reflect the (already known) standard permissions\n * So we don't send an ACL stream to the SD.\n *\/\n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- acl_free(acl);\n- return bacl_exit_ok;\n+ goto bail_out;\n }\n }\n }\n #endif\n \n+ \/**\n+ * Convert the internal acl representation into an text representation.\n+ *\/\n if ((acl_text = acl_to_text(acl, NULL)) != NULL) {\n jcr->acl_data->content_length = pm_strcpy(jcr->acl_data->content, acl_text);\n acl_free(acl);\n@@ -676,10 +696,8 @@\n Dmsg2(100, \"acl_to_text error file=%s ERR=%s\\n\", \n jcr->last_fname, be.bstrerror());\n \n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- acl_free(acl);\n- return bacl_exit_error;\n+ retval = bacl_exit_error;\n+ goto bail_out;\n } else {\n \/**\n * Handle errors gracefully.\n@@ -694,14 +712,10 @@\n * when we change from one filesystem to an other.\n *\/\n jcr->acl_data->flags &= ~BACL_FLAG_SAVE_NATIVE;\n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- return bacl_exit_ok;\n+ goto bail_out;\n #endif\n case ENOENT:\n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- return bacl_exit_ok;\n+ goto bail_out;\n default:\n \/* Some real error *\/\n Mmsg2(jcr->errmsg, _(\"acl_get_file error on file \\\"%s\\\": ERR=%s\\n\"),\n@@ -709,11 +723,18 @@\n Dmsg2(100, \"acl_get_file error file=%s ERR=%s\\n\", \n jcr->last_fname, be.bstrerror());\n \n- pm_strcpy(jcr->acl_data->content, \"\");\n- jcr->acl_data->content_length = 0;\n- return bacl_exit_error;\n- }\n- }\n+ retval = bacl_exit_error;\n+ goto bail_out;\n+ }\n+ }\n+\n+bail_out:\n+ if (acl) {\n+ acl_free(acl);\n+ }\n+ pm_strcpy(jcr->acl_data->content, \"\");\n+ jcr->acl_data->content_length = 0;\n+ return retval;\n }\n \n \/**\n"} {"commit":"e8677644a83e3005bcb2482c0819c366cc7087ce","subject":"Add crc32 test program","message":"Add crc32 test program\n","repos":"rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula,rkorzeniewski\/bacula","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- bacula\/src\/lib\/crc32.c\n+++ bacula\/src\/lib\/crc32.c\n@@ -31,7 +31,6 @@\n * By Kern Sibbald, January 2001\n *\n *\/\n-\n \n #ifdef GENERATE_STATIC_CRC_TABLE\n \/*\n@@ -138,3 +137,60 @@\n }\n return crc ^ 0xFFFFFFFFL;\n }\n+\n+\n+\n+#ifdef CRC32_SUM\n+\n+static void usage()\n+{\n+ fprintf(stderr,\n+\"\\n\"\n+\"Usage: crc32 <data-file>\\n\"\n+\" -? print this message.\\n\"\n+\"\\n\\n\");\n+\n+ exit(1);\n+}\n+\n+\/*\n+ * Reads a single ASCII file and prints the HEX md5 sum.\n+ *\/\n+#include <stdio.h>\n+int main(int argc, char *argv[]) \n+{\n+ FILE *fd;\n+ char buf[5000];\n+ int ch;\n+\n+ while ((ch = getopt(argc, argv, \"h?\")) != -1) {\n+ switch (ch) {\n+ case 'h':\n+ case '?':\n+ default:\n+ usage();\n+ }\n+ }\n+\n+ argc -= optind;\n+ argv += optind;\n+\n+ if (argc < 1) {\n+ printf(\"Must have filename\\n\");\n+ exit(1);\n+ }\n+\n+ fd = fopen(argv[0], \"rb\");\n+ if (!fd) {\n+ printf(\"Could not open %s: ERR=%s\\n\", argv[0], strerror(errno));\n+ exit(1);\n+ }\n+ uint32_t res;\n+ while (fgets(buf, sizeof(buf), fd)) {\n+ res = bcrc32((unsigned char *)buf, strlen(buf));\n+ printf(\"%02x\\n\", res); \n+ }\n+ printf(\" %s (old)\\n\", argv[0]);\n+ fclose(fd);\n+}\n+#endif\n"} {"commit":"edff4de3de90792a8cc8523cab91a76485368695","subject":"add line break","message":"add line break\n","repos":"sunzeboy\/realm-cocoa,imjerrybao\/realm-cocoa,bestwpw\/realm-cocoa,yuuki1224\/realm-cocoa,duk42111\/realm-cocoa,zilaiyedaren\/realm-cocoa,iOS--wsl--victor\/realm-cocoa,ul7290\/realm-cocoa,ul7290\/realm-cocoa,duk42111\/realm-cocoa,ChenJian345\/realm-cocoa,tenebreux\/realm-cocoa,vuchau\/realm-cocoa,lumoslabs\/realm-cocoa,brasbug\/realm-cocoa,amuramoto\/realm-objc,ul7290\/realm-cocoa,xmartlabs\/realm-cocoa,AlexanderMazaletskiy\/realm-cocoa,isaacroldan\/realm-cocoa,brasbug\/realm-cocoa,yuuki1224\/realm-cocoa,thdtjsdn\/realm-cocoa,bugix\/realm-cocoa,HuylensHu\/realm-cocoa,bestwpw\/realm-cocoa,ChenJian345\/realm-cocoa,xmartlabs\/realm-cocoa,codyDu\/realm-cocoa,lumoslabs\/realm-cocoa,sunzeboy\/realm-cocoa,kylebshr\/realm-cocoa,AlexanderMazaletskiy\/realm-cocoa,bugix\/realm-cocoa,codyDu\/realm-cocoa,zilaiyedaren\/realm-cocoa,iOS--wsl--victor\/realm-cocoa,tenebreux\/realm-cocoa,codyDu\/realm-cocoa,vuchau\/realm-cocoa,nathankot\/realm-cocoa,nathankot\/realm-cocoa,Palleas\/realm-cocoa,Havi4\/realm-cocoa,brasbug\/realm-cocoa,imjerrybao\/realm-cocoa,kevinmlong\/realm-cocoa,iOSCowboy\/realm-cocoa,dilizarov\/realm-cocoa,hejunbinlan\/realm-cocoa,neonichu\/realm-cocoa,bestwpw\/realm-cocoa,isaacroldan\/realm-cocoa,thdtjsdn\/realm-cocoa,hejunbinlan\/realm-cocoa,duk42111\/realm-cocoa,tenebreux\/realm-cocoa,kevinmlong\/realm-cocoa,neonichu\/realm-cocoa,Palleas\/realm-cocoa,bugix\/realm-cocoa,tenebreux\/realm-cocoa,neonichu\/realm-cocoa,ChenJian345\/realm-cocoa,xmartlabs\/realm-cocoa,neonichu\/realm-cocoa,nathankot\/realm-cocoa,sunfei\/realm-cocoa,sunfei\/realm-cocoa,iOS--wsl--victor\/realm-cocoa,bugix\/realm-cocoa,vuchau\/realm-cocoa,dilizarov\/realm-cocoa,Palleas\/realm-cocoa,Palleas\/realm-cocoa,imjerrybao\/realm-cocoa,lumoslabs\/realm-cocoa,ChenJian345\/realm-cocoa,dilizarov\/realm-cocoa,codyDu\/realm-cocoa,kevinmlong\/realm-cocoa,isaacroldan\/realm-cocoa,brasbug\/realm-cocoa,Havi4\/realm-cocoa,hejunbinlan\/realm-cocoa,bestwpw\/realm-cocoa,sunzeboy\/realm-cocoa,bugix\/realm-cocoa,kylebshr\/realm-cocoa,AlexanderMazaletskiy\/realm-cocoa,Havi4\/realm-cocoa,amuramoto\/realm-objc,lumoslabs\/realm-cocoa,AlexanderMazaletskiy\/realm-cocoa,codyDu\/realm-cocoa,isaacroldan\/realm-cocoa,xmartlabs\/realm-cocoa,kylebshr\/realm-cocoa,neonichu\/realm-cocoa,yuuki1224\/realm-cocoa,iOSCowboy\/realm-cocoa,vuchau\/realm-cocoa,HuylensHu\/realm-cocoa,amuramoto\/realm-objc,sunfei\/realm-cocoa,brasbug\/realm-cocoa,imjerrybao\/realm-cocoa,nathankot\/realm-cocoa,duk42111\/realm-cocoa,kevinmlong\/realm-cocoa,AlexanderMazaletskiy\/realm-cocoa,amuramoto\/realm-objc,yuuki1224\/realm-cocoa,bestwpw\/realm-cocoa,hejunbinlan\/realm-cocoa,zilaiyedaren\/realm-cocoa,HuylensHu\/realm-cocoa,thdtjsdn\/realm-cocoa,duk42111\/realm-cocoa,sunfei\/realm-cocoa,dilizarov\/realm-cocoa,iOS--wsl--victor\/realm-cocoa,imjerrybao\/realm-cocoa,Havi4\/realm-cocoa,iOSCowboy\/realm-cocoa,thdtjsdn\/realm-cocoa,kevinmlong\/realm-cocoa,isaacroldan\/realm-cocoa,HuylensHu\/realm-cocoa,ul7290\/realm-cocoa,yuuki1224\/realm-cocoa,ul7290\/realm-cocoa,dilizarov\/realm-cocoa,Palleas\/realm-cocoa,thdtjsdn\/realm-cocoa,iOSCowboy\/realm-cocoa,iOSCowboy\/realm-cocoa,HuylensHu\/realm-cocoa,zilaiyedaren\/realm-cocoa,nathankot\/realm-cocoa,kylebshr\/realm-cocoa,hejunbinlan\/realm-cocoa,sunfei\/realm-cocoa,Havi4\/realm-cocoa,tenebreux\/realm-cocoa,vuchau\/realm-cocoa,iOS--wsl--victor\/realm-cocoa,zilaiyedaren\/realm-cocoa,xmartlabs\/realm-cocoa,ChenJian345\/realm-cocoa,sunzeboy\/realm-cocoa,kylebshr\/realm-cocoa,sunzeboy\/realm-cocoa,lumoslabs\/realm-cocoa,amuramoto\/realm-objc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- examples\/swift\/RealmSwiftSimpleExample\/RealmSwiftSimpleExample\/RealmSwiftSimpleExample-Bridging-Header.h\n+++ examples\/swift\/RealmSwiftSimpleExample\/RealmSwiftSimpleExample\/RealmSwiftSimpleExample-Bridging-Header.h\n@@ -20,4 +20,4 @@\n \/\/ Use this file to import your target's public headers that you would like to expose to Swift.\n \/\/\n \n-#import \"Objects.h\"+#import \"Objects.h\"\n"} {"commit":"790b5ed43e41ee249a8f9da3ef8a11ed5404b2f8","subject":"updates to scene_bezier_curves.h","message":"updates to scene_bezier_curves.h\n","repos":"embree\/embree,embree\/embree,embree\/embree,embree\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/common\/scene_bezier_curves.h\n+++ kernels\/common\/scene_bezier_curves.h\n@@ -155,27 +155,35 @@\n return enlarge(b,Vec3fa(max(r0,r1,r2,r3)));\n }\n \n+ \/*! check if the i'th primitive is valid at the itime'th timestep *\/\n+ __forceinline bool valid(size_t i, size_t itime) const {\n+ return valid(i, make_range(itime, itime));\n+ }\n+\n \/*! check if the i'th primitive is valid at the itime'th time step *\/\n- __forceinline bool valid(size_t i, size_t itime) const\n+ __forceinline bool valid(size_t i, const range<size_t>& itime_range) const\n {\n const unsigned int index = curve(i);\n if (index+3 >= numVertices()) return false;\n \n- const float r0 = radius(index+0,itime);\n- const float r1 = radius(index+1,itime);\n- const float r2 = radius(index+2,itime);\n- const float r3 = radius(index+3,itime);\n- if (!isvalid(r0) || !isvalid(r1) || !isvalid(r2) || !isvalid(r3))\n- return false;\n- if (min(r0,r1,r2,r3) < 0.0f)\n- return false;\n-\n- const Vec3fa v0 = vertex(index+0,itime);\n- const Vec3fa v1 = vertex(index+1,itime);\n- const Vec3fa v2 = vertex(index+2,itime);\n- const Vec3fa v3 = vertex(index+3,itime);\n- if (!isvalid(v0) || !isvalid(v1) || !isvalid(v2) || !isvalid(v3))\n- return false;\n+ for (size_t itime = itime_range.begin(); itime <= itime_range.end(); itime++)\n+ {\n+ const float r0 = radius(index+0,itime);\n+ const float r1 = radius(index+1,itime);\n+ const float r2 = radius(index+2,itime);\n+ const float r3 = radius(index+3,itime);\n+ if (!isvalid(r0) || !isvalid(r1) || !isvalid(r2) || !isvalid(r3))\n+ return false;\n+ if (min(r0,r1,r2,r3) < 0.0f)\n+ return false;\n+ \n+ const Vec3fa v0 = vertex(index+0,itime);\n+ const Vec3fa v1 = vertex(index+1,itime);\n+ const Vec3fa v2 = vertex(index+2,itime);\n+ const Vec3fa v3 = vertex(index+3,itime);\n+ if (!isvalid(v0) || !isvalid(v1) || !isvalid(v2) || !isvalid(v3))\n+ return false;\n+ }\n \n return true;\n }\n@@ -192,6 +200,16 @@\n {\n return Geometry::linearBounds([&] (size_t itime) { return bounds(space, i, itime); },\n itimeGlobal, numTimeStepsGlobal, numTimeSteps);\n+ }\n+\n+ \/*! calculates the linear bounds of the i'th primitive for the specified time range *\/\n+ __forceinline LBBox3fa linearBounds(size_t primID, const BBox1f& time_range) const {\n+ return Geometry::linearBounds([&] (size_t itime) { return bounds(primID, itime); }, time_range, fnumTimeSegments);\n+ }\n+\n+ \/*! calculates the linear bounds of the i'th primitive for the specified time range *\/\n+ __forceinline LBBox3fa linearBounds(const AffineSpace3fa& space, size_t primID, const BBox1f& time_range) const {\n+ return Geometry::linearBounds([&] (size_t itime) { return bounds(space, primID, itime); }, time_range, fnumTimeSegments);\n }\n \n \/*! calculates the build bounds of the i'th primitive, if it's valid *\/\n@@ -258,6 +276,13 @@\n return true;\n }\n \n+ \/*! calculates the linear bounds of the i'th primitive for the specified time range *\/\n+ __forceinline bool linearBounds(size_t i, const BBox1f& time_range, LBBox3fa& bbox) const {\n+ if (!valid(i, getTimeSegmentRange(time_range, fnumTimeSegments))) return false;\n+ bbox = linearBounds(i, time_range);\n+ return true;\n+ }\n+\n public:\n APIBuffer<unsigned int> curves; \/\/!< array of curve indices\n BufferRefT<Vec3fa> vertices0; \/\/!< fast access to first vertex buffer\n"} {"commit":"c7b57aac67fe4eb0b5cb27a8e4409e3857e1dc62","subject":"bugfix in stitching","message":"bugfix in stitching\n","repos":"embree\/embree,Sjoerdie\/embree,embree\/embree,Sjoerdie\/embree,embree\/embree,embree\/embree,Sjoerdie\/embree,Sjoerdie\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/common\/subdiv\/tessellation.h\n+++ kernels\/common\/subdiv\/tessellation.h\n@@ -41,10 +41,10 @@\n #if 1\n const float inv_low_rate = rcp((float)(low_rate-1));\n for (size_t x=x0; x<=x1; x++) {\n- uv_array[x*uv_array_step] = float(stitch(x,high_rate-1,low_rate-1))*inv_low_rate;\n+ uv_array[(x-x0)*uv_array_step] = float(stitch(x,high_rate-1,low_rate-1))*inv_low_rate;\n }\n if (unlikely(x1 == high_rate-1))\n- uv_array[x1*uv_array_step] = 1.0f;\n+ uv_array[(x1-x0)*uv_array_step] = 1.0f;\n #else\n assert(low_rate < high_rate);\n assert(high_rate >= 2);\n"} {"commit":"90b43bd1d9176b2a8c0072834c282bf8e5de4796","subject":"Close tabs in the Tab Panel with a middle click","message":"Close tabs in the Tab Panel with a middle click\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- extensions\/tab-panel.c\n+++ extensions\/tab-panel.c\n@@ -187,11 +187,13 @@\n \n gtk_tree_model_get (model, &iter, 0, &view, -1);\n \n- if (event->button != 3)\n+ if (event->button == 1)\n {\n MidoriBrowser* browser = midori_browser_get_for_widget (widget);\n midori_browser_set_current_tab (browser, view);\n }\n+ else if (event->button == 2)\n+ gtk_widget_destroy (view);\n else\n midori_extension_popup (widget, event, view, extension);\n \n"} {"commit":"f8c99058dcc97aec35d33f16dd1cc932390ed942","subject":"update snmp_parser.c","message":"update snmp_parser.c\n","repos":"gescheit\/fastsnmp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fastsnmp\/snmp_parser.c\n+++ fastsnmp\/snmp_parser.c\n@@ -1,11 +1,9 @@\n-\/* Generated by Cython 0.25.1 *\/\n+\/* Generated by Cython 0.25.2 *\/\n \n \/* BEGIN: Cython Metadata\n {\n \"distutils\": {\n- \"libraries\": [\n- \"netsnmp\"\n- ]\n+ \"depends\": []\n },\n \"module_name\": \"fastsnmp\/snmp_parser\"\n }\n@@ -18,7 +16,7 @@\n #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03020000)\n #error Cython requires Python 2.6+ or Python 3.2+.\n #else\n-#define CYTHON_ABI \"0_25_1\"\n+#define CYTHON_ABI \"0_25_2\"\n #include <stddef.h>\n #ifndef offsetof\n #define offsetof(type, member) ( (size_t) & ((type*)0) -> member )\n@@ -201,7 +199,7 @@\n #endif\n #if CYTHON_FAST_PYCCALL\n #define __Pyx_PyFastCFunction_Check(func)\\\n- ((PyCFunction_Check(func) && METH_FASTCALL == PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST)))\n+ ((PyCFunction_Check(func) && (METH_FASTCALL == (PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST)))))\n #else\n #define __Pyx_PyFastCFunction_Check(func) 0\n #endif\n@@ -354,71 +352,6 @@\n #define CYTHON_RESTRICT\n #endif\n #endif\n-#define __Pyx_void_to_None(void_result) ((void)(void_result), Py_INCREF(Py_None), Py_None)\n-\n-#ifndef CYTHON_INLINE\n- #if defined(__GNUC__)\n- #define CYTHON_INLINE __inline__\n- #elif defined(_MSC_VER)\n- #define CYTHON_INLINE __inline\n- #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n- #define CYTHON_INLINE inline\n- #else\n- #define CYTHON_INLINE\n- #endif\n-#endif\n-\n-#if defined(WIN32) || defined(MS_WINDOWS)\n- #define _USE_MATH_DEFINES\n-#endif\n-#include <math.h>\n-#ifdef NAN\n-#define __PYX_NAN() ((float) NAN)\n-#else\n-static CYTHON_INLINE float __PYX_NAN() {\n- float value;\n- memset(&value, 0xFF, sizeof(value));\n- return value;\n-}\n-#endif\n-#if defined(__CYGWIN__) && defined(_LDBL_EQ_DBL)\n-#define __Pyx_truncl trunc\n-#else\n-#define __Pyx_truncl truncl\n-#endif\n-\n-\n-#define __PYX_ERR(f_index, lineno, Ln_error) \\\n-{ \\\n- __pyx_filename = __pyx_f[f_index]; __pyx_lineno = lineno; __pyx_clineno = __LINE__; goto Ln_error; \\\n-}\n-\n-#if PY_MAJOR_VERSION >= 3\n- #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n-#else\n- #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n-#endif\n-\n-#ifndef __PYX_EXTERN_C\n- #ifdef __cplusplus\n- #define __PYX_EXTERN_C extern \"C\"\n- #else\n- #define __PYX_EXTERN_C extern\n- #endif\n-#endif\n-\n-#define __PYX_HAVE__fastsnmp__snmp_parser\n-#define __PYX_HAVE_API__fastsnmp__snmp_parser\n-#ifdef _OPENMP\n-#include <omp.h>\n-#endif \/* _OPENMP *\/\n-\n-#ifdef PYREX_WITHOUT_ASSERTIONS\n-#define CYTHON_WITHOUT_ASSERTIONS\n-#endif\n-\n #ifndef CYTHON_UNUSED\n # if defined(__GNUC__)\n # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))\n@@ -432,6 +365,13 @@\n # define CYTHON_UNUSED\n # endif\n #endif\n+#ifndef CYTHON_MAYBE_UNUSED_VAR\n+# if defined(__cplusplus)\n+ template<class T> void CYTHON_MAYBE_UNUSED_VAR( const T& ) { }\n+# else\n+# define CYTHON_MAYBE_UNUSED_VAR(x) (void)(x)\n+# endif\n+#endif\n #ifndef CYTHON_NCP_UNUSED\n # if CYTHON_COMPILING_IN_CPYTHON\n # define CYTHON_NCP_UNUSED\n@@ -439,14 +379,84 @@\n # define CYTHON_NCP_UNUSED CYTHON_UNUSED\n # endif\n #endif\n+#define __Pyx_void_to_None(void_result) ((void)(void_result), Py_INCREF(Py_None), Py_None)\n+\n+#ifndef CYTHON_INLINE\n+ #if defined(__clang__)\n+ #define CYTHON_INLINE __inline__ __attribute__ ((__unused__))\n+ #elif defined(__GNUC__)\n+ #define CYTHON_INLINE __inline__\n+ #elif defined(_MSC_VER)\n+ #define CYTHON_INLINE __inline\n+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L\n+ #define CYTHON_INLINE inline\n+ #else\n+ #define CYTHON_INLINE\n+ #endif\n+#endif\n+\n+#if defined(WIN32) || defined(MS_WINDOWS)\n+ #define _USE_MATH_DEFINES\n+#endif\n+#include <math.h>\n+#ifdef NAN\n+#define __PYX_NAN() ((float) NAN)\n+#else\n+static CYTHON_INLINE float __PYX_NAN() {\n+ float value;\n+ memset(&value, 0xFF, sizeof(value));\n+ return value;\n+}\n+#endif\n+#if defined(__CYGWIN__) && defined(_LDBL_EQ_DBL)\n+#define __Pyx_truncl trunc\n+#else\n+#define __Pyx_truncl truncl\n+#endif\n+\n+\n+#define __PYX_ERR(f_index, lineno, Ln_error) \\\n+{ \\\n+ __pyx_filename = __pyx_f[f_index]; __pyx_lineno = lineno; __pyx_clineno = __LINE__; goto Ln_error; \\\n+}\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n+#else\n+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n+#endif\n+\n+#ifndef __PYX_EXTERN_C\n+ #ifdef __cplusplus\n+ #define __PYX_EXTERN_C extern \"C\"\n+ #else\n+ #define __PYX_EXTERN_C extern\n+ #endif\n+#endif\n+\n+#define __PYX_HAVE__fastsnmp__snmp_parser\n+#define __PYX_HAVE_API__fastsnmp__snmp_parser\n+#include <string.h>\n+#include <stdio.h>\n+#include <stdint.h>\n+#ifdef _OPENMP\n+#include <omp.h>\n+#endif \/* _OPENMP *\/\n+\n+#ifdef PYREX_WITHOUT_ASSERTIONS\n+#define CYTHON_WITHOUT_ASSERTIONS\n+#endif\n+\n typedef struct {PyObject **p; const char *s; const Py_ssize_t n; const char* encoding;\n const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry;\n \n-#define __PYX_DEFAULT_STRING_ENCODING_IS_ASCII 0\n+#define __PYX_DEFAULT_STRING_ENCODING_IS_ASCII 1\n #define __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT 0\n-#define __PYX_DEFAULT_STRING_ENCODING \"\"\n-#define __Pyx_PyObject_FromString __Pyx_PyBytes_FromString\n-#define __Pyx_PyObject_FromStringAndSize __Pyx_PyBytes_FromStringAndSize\n+#define __PYX_DEFAULT_STRING_ENCODING \"ascii\"\n+#define __Pyx_PyObject_FromString __Pyx_PyStr_FromString\n+#define __Pyx_PyObject_FromStringAndSize __Pyx_PyStr_FromStringAndSize\n #define __Pyx_uchar_cast(c) ((unsigned char)c)\n #define __Pyx_long_cast(x) ((long)x)\n #define __Pyx_fits_Py_ssize_t(v, type, is_signed) (\\\n@@ -627,42 +637,49 @@\n \n static const char *__pyx_f[] = {\n \"fastsnmp\/snmp_parser.pyx\",\n+ \"type.pxd\",\n };\n \n \/*--- Type declarations ---*\/\n-struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind;\n-struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr;\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n- *\/\n-struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind {\n- PyObject_HEAD\n- PyObject *__pyx_v_last_seen_index;\n- PyObject *__pyx_v_orig_main_oids;\n- PyObject *__pyx_v_rest_oids_positions;\n+struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti;\n+struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t;\n+struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode;\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":78\n+ * # sub id 1 and 2 bytes\n+ * # int\n+ * cdef struct SID12_ti: # <<<<<<<<<<<<<<\n+ * uint64_t SID1\n+ * uint64_t SID2\n+ *\/\n+struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti {\n+ uint64_t SID1;\n+ uint64_t SID2;\n };\n \n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":594\n- * else:\n- * next_oids = tuple(\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions) # <<<<<<<<<<<<<<\n- * \n- * return result, next_oids\n- *\/\n-struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr {\n- PyObject_HEAD\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *__pyx_outer_scope;\n- PyObject *__pyx_v_p;\n- PyObject *__pyx_t_0;\n- Py_ssize_t __pyx_t_1;\n+\/* \"fastsnmp\/snmp_parser.pyx\":83\n+ * \n+ * # str\n+ * cdef struct SID12_t: # <<<<<<<<<<<<<<\n+ * size_t strlen\n+ * char *str\n+ *\/\n+struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t {\n+ size_t strlen;\n+ char *str;\n };\n \n+\/* \"fastsnmp\/snmp_parser.pyx\":298\n+ * return <bytes>result[:object_len]\n+ * \n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1): # <<<<<<<<<<<<<<\n+ * cdef object ret\n+ * if auto_str:\n+ *\/\n+struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode {\n+ int __pyx_n;\n+ int auto_str;\n+};\n \n \/* --- Runtime support code (head) --- *\/\n \/* Refnanny.proto *\/\n@@ -747,41 +764,207 @@\n \/* GetBuiltinName.proto *\/\n static PyObject *__Pyx_GetBuiltinName(PyObject *name);\n \n-\/* GetModuleGlobalName.proto *\/\n-static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name);\n-\n-\/* PyCFunctionFastCall.proto *\/\n-#if CYTHON_FAST_PYCCALL\n-static CYTHON_INLINE PyObject *__Pyx_PyCFunction_FastCall(PyObject *func, PyObject **args, Py_ssize_t nargs);\n+\/* Profile.proto *\/\n+#ifndef CYTHON_PROFILE\n+#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON\n+ #define CYTHON_PROFILE 0\n #else\n-#define __Pyx_PyCFunction_FastCall(func, args, nargs) (assert(0), NULL)\n-#endif\n-\n-\/* PyFunctionFastCall.proto *\/\n-#if CYTHON_FAST_PYCALL\n-#define __Pyx_PyFunction_FastCall(func, args, nargs)\\\n- __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL)\n-#if 1 || PY_VERSION_HEX < 0x030600B1\n-static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, int nargs, PyObject *kwargs);\n+ #define CYTHON_PROFILE 1\n+#endif\n+#endif\n+#ifndef CYTHON_TRACE_NOGIL\n+ #define CYTHON_TRACE_NOGIL 0\n #else\n-#define __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs) _PyFunction_FastCallDict(func, args, nargs, kwargs)\n-#endif\n-#endif\n-\n-\/* PyObjectCall.proto *\/\n-#if CYTHON_COMPILING_IN_CPYTHON\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw);\n+ #if CYTHON_TRACE_NOGIL && !defined(CYTHON_TRACE)\n+ #define CYTHON_TRACE 1\n+ #endif\n+#endif\n+#ifndef CYTHON_TRACE\n+ #define CYTHON_TRACE 0\n+#endif\n+#if CYTHON_TRACE\n+ #undef CYTHON_PROFILE_REUSE_FRAME\n+#endif\n+#ifndef CYTHON_PROFILE_REUSE_FRAME\n+ #define CYTHON_PROFILE_REUSE_FRAME 0\n+#endif\n+#if CYTHON_PROFILE || CYTHON_TRACE\n+ #include \"compile.h\"\n+ #include \"frameobject.h\"\n+ #include \"traceback.h\"\n+ #if CYTHON_PROFILE_REUSE_FRAME\n+ #define CYTHON_FRAME_MODIFIER static\n+ #define CYTHON_FRAME_DEL(frame)\n+ #else\n+ #define CYTHON_FRAME_MODIFIER\n+ #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame)\n+ #endif\n+ #define __Pyx_TraceDeclarations\\\n+ static PyCodeObject *__pyx_frame_code = NULL;\\\n+ CYTHON_FRAME_MODIFIER PyFrameObject *__pyx_frame = NULL;\\\n+ int __Pyx_use_tracing = 0;\n+ #define __Pyx_TraceFrameInit(codeobj)\\\n+ if (codeobj) __pyx_frame_code = (PyCodeObject*) codeobj;\n+ #ifdef WITH_THREAD\n+ #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)\\\n+ if (nogil) {\\\n+ if (CYTHON_TRACE_NOGIL) {\\\n+ PyThreadState *tstate;\\\n+ PyGILState_STATE state = PyGILState_Ensure();\\\n+ tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing) && !tstate->tracing &&\\\n+ (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {\\\n+ __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&__pyx_frame_code, &__pyx_frame, funcname, srcfile, firstlineno);\\\n+ }\\\n+ PyGILState_Release(state);\\\n+ if (unlikely(__Pyx_use_tracing < 0)) goto_error;\\\n+ }\\\n+ } else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing) && !tstate->tracing &&\\\n+ (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {\\\n+ __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&__pyx_frame_code, &__pyx_frame, funcname, srcfile, firstlineno);\\\n+ if (unlikely(__Pyx_use_tracing < 0)) goto_error;\\\n+ }\\\n+ }\n+ #else\n+ #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)\\\n+ { PyThreadState* tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing) && !tstate->tracing &&\\\n+ (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {\\\n+ __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&__pyx_frame_code, &__pyx_frame, funcname, srcfile, firstlineno);\\\n+ if (unlikely(__Pyx_use_tracing < 0)) goto_error;\\\n+ }\\\n+ }\n+ #endif\n+ #define __Pyx_TraceException()\\\n+ if (likely(!__Pyx_use_tracing)); else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (tstate->use_tracing &&\\\n+ (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {\\\n+ tstate->tracing++;\\\n+ tstate->use_tracing = 0;\\\n+ PyObject *exc_info = __Pyx_GetExceptionTuple(tstate);\\\n+ if (exc_info) {\\\n+ if (CYTHON_TRACE && tstate->c_tracefunc)\\\n+ tstate->c_tracefunc(\\\n+ tstate->c_traceobj, __pyx_frame, PyTrace_EXCEPTION, exc_info);\\\n+ tstate->c_profilefunc(\\\n+ tstate->c_profileobj, __pyx_frame, PyTrace_EXCEPTION, exc_info);\\\n+ Py_DECREF(exc_info);\\\n+ }\\\n+ tstate->use_tracing = 1;\\\n+ tstate->tracing--;\\\n+ }\\\n+ }\n+ static void __Pyx_call_return_trace_func(PyThreadState *tstate, PyFrameObject *frame, PyObject *result) {\n+ PyObject *type, *value, *traceback;\n+ PyErr_Fetch(&type, &value, &traceback);\n+ tstate->tracing++;\n+ tstate->use_tracing = 0;\n+ if (CYTHON_TRACE && tstate->c_tracefunc)\n+ tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result);\n+ if (tstate->c_profilefunc)\n+ tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result);\n+ CYTHON_FRAME_DEL(frame);\n+ tstate->use_tracing = 1;\n+ tstate->tracing--;\n+ PyErr_Restore(type, value, traceback);\n+ }\n+ #ifdef WITH_THREAD\n+ #define __Pyx_TraceReturn(result, nogil)\\\n+ if (likely(!__Pyx_use_tracing)); else {\\\n+ if (nogil) {\\\n+ if (CYTHON_TRACE_NOGIL) {\\\n+ PyThreadState *tstate;\\\n+ PyGILState_STATE state = PyGILState_Ensure();\\\n+ tstate = PyThreadState_GET();\\\n+ if (tstate->use_tracing) {\\\n+ __Pyx_call_return_trace_func(tstate, __pyx_frame, (PyObject*)result);\\\n+ }\\\n+ PyGILState_Release(state);\\\n+ }\\\n+ } else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (tstate->use_tracing) {\\\n+ __Pyx_call_return_trace_func(tstate, __pyx_frame, (PyObject*)result);\\\n+ }\\\n+ }\\\n+ }\n+ #else\n+ #define __Pyx_TraceReturn(result, nogil)\\\n+ if (likely(!__Pyx_use_tracing)); else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (tstate->use_tracing) {\\\n+ __Pyx_call_return_trace_func(tstate, __pyx_frame, (PyObject*)result);\\\n+ }\\\n+ }\n+ #endif\n+ static PyCodeObject *__Pyx_createFrameCodeObject(const char *funcname, const char *srcfile, int firstlineno);\n+ static int __Pyx_TraceSetupAndCall(PyCodeObject** code, PyFrameObject** frame, const char *funcname, const char *srcfile, int firstlineno);\n #else\n-#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw)\n-#endif\n-\n-\/* PyObjectCallMethO.proto *\/\n-#if CYTHON_COMPILING_IN_CPYTHON\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg);\n-#endif\n-\n-\/* PyObjectCallOneArg.proto *\/\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg);\n+ #define __Pyx_TraceDeclarations\n+ #define __Pyx_TraceFrameInit(codeobj)\n+ #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error) if (1); else goto_error;\n+ #define __Pyx_TraceException()\n+ #define __Pyx_TraceReturn(result, nogil)\n+#endif\n+#if CYTHON_TRACE\n+ static int __Pyx_call_line_trace_func(PyThreadState *tstate, PyFrameObject *frame, int lineno) {\n+ int ret;\n+ PyObject *type, *value, *traceback;\n+ PyErr_Fetch(&type, &value, &traceback);\n+ __Pyx_PyFrame_SetLineNumber(frame, lineno);\n+ tstate->tracing++;\n+ tstate->use_tracing = 0;\n+ ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL);\n+ tstate->use_tracing = 1;\n+ tstate->tracing--;\n+ if (likely(!ret)) {\n+ PyErr_Restore(type, value, traceback);\n+ } else {\n+ Py_XDECREF(type);\n+ Py_XDECREF(value);\n+ Py_XDECREF(traceback);\n+ }\n+ return ret;\n+ }\n+ #ifdef WITH_THREAD\n+ #define __Pyx_TraceLine(lineno, nogil, goto_error)\\\n+ if (likely(!__Pyx_use_tracing)); else {\\\n+ if (nogil) {\\\n+ if (CYTHON_TRACE_NOGIL) {\\\n+ int ret = 0;\\\n+ PyThreadState *tstate;\\\n+ PyGILState_STATE state = PyGILState_Ensure();\\\n+ tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing && tstate->c_tracefunc)) {\\\n+ ret = __Pyx_call_line_trace_func(tstate, __pyx_frame, lineno);\\\n+ }\\\n+ PyGILState_Release(state);\\\n+ if (unlikely(ret)) goto_error;\\\n+ }\\\n+ } else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing && tstate->c_tracefunc)) {\\\n+ int ret = __Pyx_call_line_trace_func(tstate, __pyx_frame, lineno);\\\n+ if (unlikely(ret)) goto_error;\\\n+ }\\\n+ }\\\n+ }\n+ #else\n+ #define __Pyx_TraceLine(lineno, nogil, goto_error)\\\n+ if (likely(!__Pyx_use_tracing)); else {\\\n+ PyThreadState* tstate = PyThreadState_GET();\\\n+ if (unlikely(tstate->use_tracing && tstate->c_tracefunc)) {\\\n+ int ret = __Pyx_call_line_trace_func(tstate, __pyx_frame, lineno);\\\n+ if (unlikely(ret)) goto_error;\\\n+ }\\\n+ }\n+ #endif\n+#else\n+ #define __Pyx_TraceLine(lineno, nogil, goto_error) if (1); else goto_error;\n+#endif\n \n \/* PyThreadStateGet.proto *\/\n #if CYTHON_FAST_THREAD_STATE\n@@ -807,36 +990,36 @@\n #define __Pyx_ErrFetch(type, value, tb) PyErr_Fetch(type, value, tb)\n #endif\n \n+\/* WriteUnraisableException.proto *\/\n+static void __Pyx_WriteUnraisable(const char *name, int clineno,\n+ int lineno, const char *filename,\n+ int full_traceback, int nogil);\n+\n+\/* PyObjectCall.proto *\/\n+#if CYTHON_COMPILING_IN_CPYTHON\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw);\n+#else\n+#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw)\n+#endif\n+\n \/* RaiseException.proto *\/\n static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);\n \n-\/* PySequenceContains.proto *\/\n-static CYTHON_INLINE int __Pyx_PySequence_ContainsTF(PyObject* item, PyObject* seq, int eq) {\n- int result = PySequence_Contains(seq, item);\n- return unlikely(result < 0) ? result : (result == (eq == Py_EQ));\n-}\n-\n-\/* GetItemInt.proto *\/\n-#define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\\\n- (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\\\n- __Pyx_GetItemInt_Fast(o, (Py_ssize_t)i, is_list, wraparound, boundscheck) :\\\n- (is_list ? (PyErr_SetString(PyExc_IndexError, \"list index out of range\"), (PyObject*)NULL) :\\\n- __Pyx_GetItemInt_Generic(o, to_py_func(i))))\n-#define __Pyx_GetItemInt_List(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\\\n- (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\\\n- __Pyx_GetItemInt_List_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) :\\\n- (PyErr_SetString(PyExc_IndexError, \"list index out of range\"), (PyObject*)NULL))\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i,\n- int wraparound, int boundscheck);\n-#define __Pyx_GetItemInt_Tuple(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck)\\\n- (__Pyx_fits_Py_ssize_t(i, type, is_signed) ?\\\n- __Pyx_GetItemInt_Tuple_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) :\\\n- (PyErr_SetString(PyExc_IndexError, \"tuple index out of range\"), (PyObject*)NULL))\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i,\n- int wraparound, int boundscheck);\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j);\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i,\n- int is_list, int wraparound, int boundscheck);\n+\/* RaiseDoubleKeywords.proto *\/\n+static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name);\n+\n+\/* ParseKeywords.proto *\/\n+static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],\\\n+ PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,\\\n+ const char* function_name);\n+\n+\/* RaiseArgTupleInvalid.proto *\/\n+static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,\n+ Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found);\n+\n+\/* ArgTypeTest.proto *\/\n+static CYTHON_INLINE int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact);\n \n \/* ListAppend.proto *\/\n #if CYTHON_USE_PYLIST_INTERNALS && CYTHON_ASSUME_SAFE_MACROS\n@@ -855,26 +1038,47 @@\n #define __Pyx_PyList_Append(L,x) PyList_Append(L,x)\n #endif\n \n-\/* PyObjectCallMethod1.proto *\/\n-static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg);\n-\n-\/* append.proto *\/\n-static CYTHON_INLINE int __Pyx_PyObject_Append(PyObject* L, PyObject* x);\n+\/* GetModuleGlobalName.proto *\/\n+static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name);\n+\n+\/* PySequenceContains.proto *\/\n+static CYTHON_INLINE int __Pyx_PySequence_ContainsTF(PyObject* item, PyObject* seq, int eq) {\n+ int result = PySequence_Contains(seq, item);\n+ return unlikely(result < 0) ? result : (result == (eq == Py_EQ));\n+}\n \n \/* PyIntBinop.proto *\/\n #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_FloorDivideObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n+static PyObject* __Pyx_PyInt_AndObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n #else\n-#define __Pyx_PyInt_FloorDivideObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceFloorDivide(op1, op2) : PyNumber_FloorDivide(op1, op2))\n+#define __Pyx_PyInt_AndObjC(op1, op2, intval, inplace)\\\n+ (inplace ? PyNumber_InPlaceAnd(op1, op2) : PyNumber_And(op1, op2))\n+#endif\n+\n+\/* PyFunctionFastCall.proto *\/\n+#if CYTHON_FAST_PYCALL\n+#define __Pyx_PyFunction_FastCall(func, args, nargs)\\\n+ __Pyx_PyFunction_FastCallDict((func), (args), (nargs), NULL)\n+#if 1 || PY_VERSION_HEX < 0x030600B1\n+static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, int nargs, PyObject *kwargs);\n+#else\n+#define __Pyx_PyFunction_FastCallDict(func, args, nargs, kwargs) _PyFunction_FastCallDict(func, args, nargs, kwargs)\n+#endif\n+#endif\n+\n+\/* PyCFunctionFastCall.proto *\/\n+#if CYTHON_FAST_PYCCALL\n+static CYTHON_INLINE PyObject *__Pyx_PyCFunction_FastCall(PyObject *func, PyObject **args, Py_ssize_t nargs);\n+#else\n+#define __Pyx_PyCFunction_FastCall(func, args, nargs) (assert(0), NULL)\n #endif\n \n \/* PyIntBinop.proto *\/\n #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_RemainderObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n+static PyObject* __Pyx_PyInt_RshiftObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n #else\n-#define __Pyx_PyInt_RemainderObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceRemainder(op1, op2) : PyNumber_Remainder(op1, op2))\n+#define __Pyx_PyInt_RshiftObjC(op1, op2, intval, inplace)\\\n+ (inplace ? PyNumber_InPlaceRshift(op1, op2) : PyNumber_Rshift(op1, op2))\n #endif\n \n \/* PyIntBinop.proto *\/\n@@ -887,27 +1091,37 @@\n \n \/* PyIntBinop.proto *\/\n #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_EqObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n+static PyObject* __Pyx_PyInt_OrObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n #else\n-#define __Pyx_PyInt_EqObjC(op1, op2, intval, inplace)\\\n- PyObject_RichCompare(op1, op2, Py_EQ)\n- #endif\n-\n-\/* PyIntBinop.proto *\/\n-#if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_AndObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n-#else\n-#define __Pyx_PyInt_AndObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceAnd(op1, op2) : PyNumber_And(op1, op2))\n-#endif\n-\n-\/* PyIntBinop.proto *\/\n-#if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_LshiftObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n-#else\n-#define __Pyx_PyInt_LshiftObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceLshift(op1, op2) : PyNumber_Lshift(op1, op2))\n-#endif\n+#define __Pyx_PyInt_OrObjC(op1, op2, intval, inplace)\\\n+ (inplace ? PyNumber_InPlaceOr(op1, op2) : PyNumber_Or(op1, op2))\n+#endif\n+\n+\/* PyObjectCallMethO.proto *\/\n+#if CYTHON_COMPILING_IN_CPYTHON\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg);\n+#endif\n+\n+\/* PyObjectCallOneArg.proto *\/\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg);\n+\n+\/* PyObjectCallMethod1.proto *\/\n+static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg);\n+\n+\/* ByteArrayAppend.proto *\/\n+static CYTHON_INLINE int __Pyx_PyByteArray_Append(PyObject* bytearray, int value);\n+\n+\/* ByteArrayAppendObject.proto *\/\n+static CYTHON_INLINE int __Pyx_PyByteArray_AppendObject(PyObject* bytearray, PyObject* value);\n+\n+\/* IncludeStringH.proto *\/\n+#include <string.h>\n+\n+\/* BytesEquals.proto *\/\n+static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals);\n+\n+\/* UnicodeEquals.proto *\/\n+static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals);\n \n \/* PyObjectCallNoArg.proto *\/\n #if CYTHON_COMPILING_IN_CPYTHON\n@@ -916,46 +1130,40 @@\n #define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL)\n #endif\n \n-\/* PyObjectCallMethod0.proto *\/\n-static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name);\n-\n-\/* pop.proto *\/\n-static CYTHON_INLINE PyObject* __Pyx__PyObject_Pop(PyObject* L);\n+\/* RaiseTooManyValuesToUnpack.proto *\/\n+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected);\n+\n+\/* RaiseNeedMoreValuesToUnpack.proto *\/\n+static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);\n+\n+\/* IterFinish.proto *\/\n+static CYTHON_INLINE int __Pyx_IterFinish(void);\n+\n+\/* UnpackItemEndCheck.proto *\/\n+static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected);\n+\n+\/* None.proto *\/\n+static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname);\n+\n+\/* RaiseNoneIterError.proto *\/\n+static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);\n+\n+\/* ListCompAppend.proto *\/\n #if CYTHON_USE_PYLIST_INTERNALS && CYTHON_ASSUME_SAFE_MACROS\n-static CYTHON_INLINE PyObject* __Pyx_PyList_Pop(PyObject* L);\n-#define __Pyx_PyObject_Pop(L) (likely(PyList_CheckExact(L)) ?\\\n- __Pyx_PyList_Pop(L) : __Pyx__PyObject_Pop(L))\n+static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) {\n+ PyListObject* L = (PyListObject*) list;\n+ Py_ssize_t len = Py_SIZE(list);\n+ if (likely(L->allocated > len)) {\n+ Py_INCREF(x);\n+ PyList_SET_ITEM(list, len, x);\n+ Py_SIZE(list) = len+1;\n+ return 0;\n+ }\n+ return PyList_Append(list, x);\n+}\n #else\n-#define __Pyx_PyList_Pop(L) __Pyx__PyObject_Pop(L)\n-#define __Pyx_PyObject_Pop(L) __Pyx__PyObject_Pop(L)\n-#endif\n-\n-\/* UnpackUnboundCMethod.proto *\/\n-typedef struct {\n- PyObject *type;\n- PyObject **method_name;\n- PyCFunction func;\n- PyObject *method;\n- int flag;\n-} __Pyx_CachedCFunction;\n-\n-\/* CallUnboundCMethod0.proto *\/\n-static PyObject* __Pyx__CallUnboundCMethod0(__Pyx_CachedCFunction* cfunc, PyObject* self);\n-#if CYTHON_COMPILING_IN_CPYTHON\n-#define __Pyx_CallUnboundCMethod0(cfunc, self)\\\n- ((likely((cfunc)->func)) ?\\\n- (likely((cfunc)->flag == METH_NOARGS) ? (*((cfunc)->func))(self, NULL) :\\\n- (likely((cfunc)->flag == (METH_VARARGS | METH_KEYWORDS)) ? ((*(PyCFunctionWithKeywords)(cfunc)->func)(self, __pyx_empty_tuple, NULL)) :\\\n- ((cfunc)->flag == METH_VARARGS ? (*((cfunc)->func))(self, __pyx_empty_tuple) :\\\n- (PY_VERSION_HEX >= 0x030600B1 && (cfunc)->flag == METH_FASTCALL ? (*(__Pyx_PyCFunctionFast)(cfunc)->func)(self, &PyTuple_GET_ITEM(__pyx_empty_tuple, 0), 0, NULL) :\\\n- __Pyx__CallUnboundCMethod0(cfunc, self))))) :\\\n- __Pyx__CallUnboundCMethod0(cfunc, self))\n-#else\n-#define __Pyx_CallUnboundCMethod0(cfunc, self) __Pyx__CallUnboundCMethod0(cfunc, self)\n-#endif\n-\n-\/* ByteArrayAppend.proto *\/\n-static CYTHON_INLINE int __Pyx_PyByteArray_Append(PyObject* bytearray, int value);\n+#define __Pyx_ListComp_Append(L,x) PyList_Append(L,x)\n+#endif\n \n \/* SaveResetException.proto *\/\n #if CYTHON_FAST_THREAD_STATE\n@@ -984,78 +1192,31 @@\n static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb);\n #endif\n \n-\/* RaiseTooManyValuesToUnpack.proto *\/\n-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected);\n-\n-\/* RaiseNeedMoreValuesToUnpack.proto *\/\n-static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);\n-\n-\/* IterFinish.proto *\/\n-static CYTHON_INLINE int __Pyx_IterFinish(void);\n-\n-\/* UnpackItemEndCheck.proto *\/\n-static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected);\n-\n-\/* SliceObject.proto *\/\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_GetSlice(\n- PyObject* obj, Py_ssize_t cstart, Py_ssize_t cstop,\n- PyObject** py_start, PyObject** py_stop, PyObject** py_slice,\n- int has_cstart, int has_cstop, int wraparound);\n-\n-\/* PyIntBinop.proto *\/\n-#if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_RshiftObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n+\/* SwapException.proto *\/\n+#if CYTHON_FAST_THREAD_STATE\n+#define __Pyx_ExceptionSwap(type, value, tb) __Pyx__ExceptionSwap(__pyx_tstate, type, value, tb)\n+static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);\n #else\n-#define __Pyx_PyInt_RshiftObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceRshift(op1, op2) : PyNumber_Rshift(op1, op2))\n-#endif\n-\n-\/* PyIntBinop.proto *\/\n-#if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_OrObjC(PyObject *op1, PyObject *op2, long intval, int inplace);\n-#else\n-#define __Pyx_PyInt_OrObjC(op1, op2, intval, inplace)\\\n- (inplace ? PyNumber_InPlaceOr(op1, op2) : PyNumber_Or(op1, op2))\n-#endif\n-\n-\/* UnicodeAsUCS4.proto *\/\n-static CYTHON_INLINE Py_UCS4 __Pyx_PyUnicode_AsPy_UCS4(PyObject*);\n-\n-\/* object_ord.proto *\/\n-#if PY_MAJOR_VERSION >= 3\n-#define __Pyx_PyObject_Ord(c)\\\n- (likely(PyUnicode_Check(c)) ? (long)__Pyx_PyUnicode_AsPy_UCS4(c) : __Pyx__PyObject_Ord(c))\n-#else\n-#define __Pyx_PyObject_Ord(c) __Pyx__PyObject_Ord(c)\n-#endif\n-static long __Pyx__PyObject_Ord(PyObject* c);\n-\n-\/* RaiseArgTupleInvalid.proto *\/\n-static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,\n- Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found);\n-\n-\/* RaiseDoubleKeywords.proto *\/\n-static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name);\n-\n-\/* ParseKeywords.proto *\/\n-static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],\\\n- PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,\\\n- const char* function_name);\n-\n-\/* ByteArrayAppendObject.proto *\/\n-static CYTHON_INLINE int __Pyx_PyByteArray_AppendObject(PyObject* bytearray, PyObject* value);\n-\n-\/* IncludeStringH.proto *\/\n-#include <string.h>\n-\n-\/* BytesEquals.proto *\/\n-static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals);\n-\n-\/* UnicodeEquals.proto *\/\n-static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals);\n-\n-\/* None.proto *\/\n-static CYTHON_INLINE void __Pyx_RaiseClosureNameError(const char *varname);\n+static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb);\n+#endif\n+\n+\/* IterNext.proto *\/\n+#define __Pyx_PyIter_Next(obj) __Pyx_PyIter_Next2(obj, NULL)\n+static CYTHON_INLINE PyObject *__Pyx_PyIter_Next2(PyObject *, PyObject *);\n+\n+\/* PyDictContains.proto *\/\n+static CYTHON_INLINE int __Pyx_PyDict_ContainsTF(PyObject* item, PyObject* dict, int eq) {\n+ int result = PyDict_Contains(dict, item);\n+ return unlikely(result < 0) ? result : (result == (eq == Py_EQ));\n+}\n+\n+\/* unicode_tailmatch.proto *\/\n+static int __Pyx_PyUnicode_Tailmatch(PyObject* s, PyObject* substr,\n+ Py_ssize_t start, Py_ssize_t end, int direction);\n+\n+\/* PyUnicode_Substring.proto *\/\n+static CYTHON_INLINE PyObject* __Pyx_PyUnicode_Substring(\n+ PyObject* text, Py_ssize_t start, Py_ssize_t stop);\n \n \/* DictGetItem.proto *\/\n #if PY_MAJOR_VERSION >= 3 && !CYTHON_COMPILING_IN_PYPY\n@@ -1078,41 +1239,6 @@\n #define __Pyx_PyDict_GetItem(d, key) PyObject_GetItem(d, key)\n #endif\n \n-\/* ListCompAppend.proto *\/\n-#if CYTHON_USE_PYLIST_INTERNALS && CYTHON_ASSUME_SAFE_MACROS\n-static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) {\n- PyListObject* L = (PyListObject*) list;\n- Py_ssize_t len = Py_SIZE(list);\n- if (likely(L->allocated > len)) {\n- Py_INCREF(x);\n- PyList_SET_ITEM(list, len, x);\n- Py_SIZE(list) = len+1;\n- return 0;\n- }\n- return PyList_Append(list, x);\n-}\n-#else\n-#define __Pyx_ListComp_Append(L,x) PyList_Append(L,x)\n-#endif\n-\n-\/* SwapException.proto *\/\n-#if CYTHON_FAST_THREAD_STATE\n-#define __Pyx_ExceptionSwap(type, value, tb) __Pyx__ExceptionSwap(__pyx_tstate, type, value, tb)\n-static CYTHON_INLINE void __Pyx__ExceptionSwap(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb);\n-#else\n-static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb);\n-#endif\n-\n-\/* IterNext.proto *\/\n-#define __Pyx_PyIter_Next(obj) __Pyx_PyIter_Next2(obj, NULL)\n-static CYTHON_INLINE PyObject *__Pyx_PyIter_Next2(PyObject *, PyObject *);\n-\n-\/* PyDictContains.proto *\/\n-static CYTHON_INLINE int __Pyx_PyDict_ContainsTF(PyObject* item, PyObject* dict, int eq) {\n- int result = PyDict_Contains(dict, item);\n- return unlikely(result < 0) ? result : (result == (eq == Py_EQ));\n-}\n-\n \/* Import.proto *\/\n static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);\n \n@@ -1137,63 +1263,6 @@\n static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v);\n static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v,\n int is_list, int wraparound, int boundscheck);\n-\n-\/* FetchCommonType.proto *\/\n-static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type);\n-\n-\/* CythonFunction.proto *\/\n-#define __Pyx_CyFunction_USED 1\n-#include <structmember.h>\n-#define __Pyx_CYFUNCTION_STATICMETHOD 0x01\n-#define __Pyx_CYFUNCTION_CLASSMETHOD 0x02\n-#define __Pyx_CYFUNCTION_CCLASS 0x04\n-#define __Pyx_CyFunction_GetClosure(f)\\\n- (((__pyx_CyFunctionObject *) (f))->func_closure)\n-#define __Pyx_CyFunction_GetClassObj(f)\\\n- (((__pyx_CyFunctionObject *) (f))->func_classobj)\n-#define __Pyx_CyFunction_Defaults(type, f)\\\n- ((type *)(((__pyx_CyFunctionObject *) (f))->defaults))\n-#define __Pyx_CyFunction_SetDefaultsGetter(f, g)\\\n- ((__pyx_CyFunctionObject *) (f))->defaults_getter = (g)\n-typedef struct {\n- PyCFunctionObject func;\n-#if PY_VERSION_HEX < 0x030500A0\n- PyObject *func_weakreflist;\n-#endif\n- PyObject *func_dict;\n- PyObject *func_name;\n- PyObject *func_qualname;\n- PyObject *func_doc;\n- PyObject *func_globals;\n- PyObject *func_code;\n- PyObject *func_closure;\n- PyObject *func_classobj;\n- void *defaults;\n- int defaults_pyobjects;\n- int flags;\n- PyObject *defaults_tuple;\n- PyObject *defaults_kwdict;\n- PyObject *(*defaults_getter)(PyObject *);\n- PyObject *func_annotations;\n-} __pyx_CyFunctionObject;\n-static PyTypeObject *__pyx_CyFunctionType = 0;\n-#define __Pyx_CyFunction_NewEx(ml, flags, qualname, self, module, globals, code)\\\n- __Pyx_CyFunction_New(__pyx_CyFunctionType, ml, flags, qualname, self, module, globals, code)\n-static PyObject *__Pyx_CyFunction_New(PyTypeObject *, PyMethodDef *ml,\n- int flags, PyObject* qualname,\n- PyObject *self,\n- PyObject *module, PyObject *globals,\n- PyObject* code);\n-static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *m,\n- size_t size,\n- int pyobjects);\n-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsTuple(PyObject *m,\n- PyObject *tuple);\n-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsKwDict(PyObject *m,\n- PyObject *dict);\n-static CYTHON_INLINE void __Pyx_CyFunction_SetAnnotationsDict(PyObject *m,\n- PyObject *dict);\n-static int __pyx_CyFunction_init(void);\n \n \/* CodeObjectCache.proto *\/\n typedef struct {\n@@ -1218,129 +1287,133 @@\n static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);\n \n \/* CIntToPy.proto *\/\n-static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value);\n+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint32_t(uint32_t value);\n+\n+\/* CIntToPy.proto *\/\n+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint64_t(uint64_t value);\n \n \/* CIntFromPy.proto *\/\n-static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *);\n+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);\n+\n+\/* CIntFromPy.proto *\/\n+static CYTHON_INLINE uint64_t __Pyx_PyInt_As_uint64_t(PyObject *);\n+\n+\/* CIntFromPy.proto *\/\n+static CYTHON_INLINE size_t __Pyx_PyInt_As_size_t(PyObject *);\n+\n+\/* CIntFromPy.proto *\/\n+static CYTHON_INLINE uint8_t __Pyx_PyInt_As_uint8_t(PyObject *);\n \n \/* CIntFromPy.proto *\/\n static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *);\n \n-\/* CIntFromPy.proto *\/\n-static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);\n-\n-\/* CoroutineBase.proto *\/\n-typedef PyObject *(*__pyx_coroutine_body_t)(PyObject *, PyObject *);\n-typedef struct {\n- PyObject_HEAD\n- __pyx_coroutine_body_t body;\n- PyObject *closure;\n- PyObject *exc_type;\n- PyObject *exc_value;\n- PyObject *exc_traceback;\n- PyObject *gi_weakreflist;\n- PyObject *classobj;\n- PyObject *yieldfrom;\n- PyObject *gi_name;\n- PyObject *gi_qualname;\n- PyObject *gi_modulename;\n- int resume_label;\n- char is_running;\n-} __pyx_CoroutineObject;\n-static __pyx_CoroutineObject *__Pyx__Coroutine_New(\n- PyTypeObject *type, __pyx_coroutine_body_t body, PyObject *closure,\n- PyObject *name, PyObject *qualname, PyObject *module_name);\n-static int __Pyx_Coroutine_clear(PyObject *self);\n-#if 1 || PY_VERSION_HEX < 0x030300B0\n-static int __Pyx_PyGen_FetchStopIterationValue(PyObject **pvalue);\n-#else\n-#define __Pyx_PyGen_FetchStopIterationValue(pvalue) PyGen_FetchStopIterationValue(pvalue)\n-#endif\n-\n-\/* PatchModuleWithCoroutine.proto *\/\n-static PyObject* __Pyx_Coroutine_patch_module(PyObject* module, const char* py_code);\n-\n-\/* PatchGeneratorABC.proto *\/\n-static int __Pyx_patch_abc(void);\n-\n-\/* Generator.proto *\/\n-#define __Pyx_Generator_USED\n-static PyTypeObject *__pyx_GeneratorType = 0;\n-#define __Pyx_Generator_CheckExact(obj) (Py_TYPE(obj) == __pyx_GeneratorType)\n-#define __Pyx_Generator_New(body, closure, name, qualname, module_name)\\\n- __Pyx__Coroutine_New(__pyx_GeneratorType, body, closure, name, qualname, module_name)\n-static PyObject *__Pyx_Generator_Next(PyObject *self);\n-static int __pyx_Generator_init(void);\n-\n \/* CheckBinaryVersion.proto *\/\n static int __Pyx_check_binary_version(void);\n \n+\/* PyIdentifierFromString.proto *\/\n+#if !defined(__Pyx_PyIdentifier_FromString)\n+#if PY_MAJOR_VERSION < 3\n+ #define __Pyx_PyIdentifier_FromString(s) PyString_FromString(s)\n+#else\n+ #define __Pyx_PyIdentifier_FromString(s) PyUnicode_FromString(s)\n+#endif\n+#endif\n+\n+\/* ModuleImport.proto *\/\n+static PyObject *__Pyx_ImportModule(const char *name);\n+\n+\/* TypeImport.proto *\/\n+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, size_t size, int strict);\n+\n \/* InitStrings.proto *\/\n static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);\n \n \n+\/* Module declarations from 'cython' *\/\n+\n+\/* Module declarations from 'libc.string' *\/\n+\n+\/* Module declarations from 'libc.stdio' *\/\n+\n+\/* Module declarations from '__builtin__' *\/\n+\n+\/* Module declarations from 'cpython.type' *\/\n+static PyTypeObject *__pyx_ptype_7cpython_4type_type = 0;\n+\n+\/* Module declarations from 'cpython' *\/\n+\n+\/* Module declarations from 'cpython.object' *\/\n+\n+\/* Module declarations from 'cpython.tuple' *\/\n+\n+\/* Module declarations from 'cpython.int' *\/\n+\n+\/* Module declarations from 'cpython.ref' *\/\n+\n+\/* Module declarations from 'libc.stdint' *\/\n+\n \/* Module declarations from 'fastsnmp.snmp_parser' *\/\n-static PyTypeObject *__pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind = 0;\n-static PyTypeObject *__pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr = 0;\n+static struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti *__pyx_v_8fastsnmp_11snmp_parser_sid12i;\n+static struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t *__pyx_v_8fastsnmp_11snmp_parser_sid12s;\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_primitive_decode(char *, size_t, uint64_t *, size_t *); \/*proto*\/\n+static CYTHON_INLINE PyObject *__pyx_f_8fastsnmp_11snmp_parser_objectid_decode_str(char *, size_t); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_objectid_decode_c(char *, size_t, uint64_t *, size_t *); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_primitive_encode(uint64_t *, char *); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_objectid_encode_array(uint64_t *, uint32_t, char *, size_t *); \/*proto*\/\n+static CYTHON_INLINE PyObject *__pyx_f_8fastsnmp_11snmp_parser_c_octetstring_decode(char *, size_t, struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode *__pyx_optional_args); \/*proto*\/\n+static CYTHON_INLINE size_t __pyx_f_8fastsnmp_11snmp_parser_ber_encode_integer_size(int64_t const ); \/*proto*\/\n+static CYTHON_INLINE uint64_t __pyx_f_8fastsnmp_11snmp_parser_integer_decode_c(char *, size_t *); \/*proto*\/\n+static PyObject *__pyx_f_8fastsnmp_11snmp_parser_sequence_decode_c(char *, size_t); \/*proto*\/\n+static int __pyx_f_8fastsnmp_11snmp_parser_length_decode_c(char *, size_t *, size_t *); \/*proto*\/\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_tag_decode_c(char *, uint64_t *, size_t *); \/*proto*\/\n #define __Pyx_MODULE_NAME \"fastsnmp.snmp_parser\"\n int __pyx_module_is_main_fastsnmp__snmp_parser = 0;\n \n \/* Implementation of 'fastsnmp.snmp_parser' *\/\n-static PyObject *__pyx_builtin_ValueError;\n-static PyObject *__pyx_builtin_map;\n-static PyObject *__pyx_builtin_UnicodeDecodeError;\n static PyObject *__pyx_builtin_range;\n static PyObject *__pyx_builtin_NotImplementedError;\n+static PyObject *__pyx_builtin_ValueError;\n static PyObject *__pyx_builtin_TypeError;\n-static const char __pyx_k_[] = \"\";\n static const char __pyx_k_e[] = \"e\";\n static const char __pyx_k_i[] = \"i\";\n-static const char __pyx_k_n[] = \"n\";\n static const char __pyx_k__4[] = \".\";\n static const char __pyx_k_Get[] = \"Get\";\n static const char __pyx_k_Set[] = \"Set\";\n-static const char __pyx_k__13[] = \"\\000\";\n-static const char __pyx_k__14[] = \"\\001\";\n-static const char __pyx_k_big[] = \"big\";\n+static const char __pyx_k__23[] = \"\";\n+static const char __pyx_k__34[] = \"\\000\";\n+static const char __pyx_k__35[] = \"\\001\";\n static const char __pyx_k_doc[] = \"__doc__\";\n-static const char __pyx_k_map[] = \"map\";\n static const char __pyx_k_oid[] = \"oid\";\n static const char __pyx_k_pdu[] = \"pdu\";\n-static const char __pyx_k_pop[] = \"pop\";\n static const char __pyx_k_pos[] = \"pos\";\n static const char __pyx_k_res[] = \"res\";\n-static const char __pyx_k_run[] = \"run\";\n+static const char __pyx_k_ret[] = \"ret\";\n static const char __pyx_k_s_s[] = \"%s.%s\";\n+static const char __pyx_k_str[] = \"str\";\n static const char __pyx_k_tag[] = \"tag\";\n-static const char __pyx_k_val[] = \"val\";\n static const char __pyx_k_Null[] = \"Null\";\n+static const char __pyx_k_SID1[] = \"SID1\";\n+static const char __pyx_k_SID2[] = \"SID2\";\n static const char __pyx_k_Trap[] = \"Trap\";\n-static const char __pyx_k_args[] = \"args\";\n-static const char __pyx_k_byte[] = \"byte\";\n static const char __pyx_k_data[] = \"data\";\n static const char __pyx_k_item[] = \"item\";\n static const char __pyx_k_main[] = \"__main__\";\n-static const char __pyx_k_send[] = \"send\";\n+static const char __pyx_k_slen[] = \"slen\";\n static const char __pyx_k_test[] = \"__test__\";\n-static const char __pyx_k_DEBUG[] = \"DEBUG\";\n static const char __pyx_k_Guage[] = \"Guage\";\n static const char __pyx_k_ascii[] = \"ascii\";\n-static const char __pyx_k_close[] = \"close\";\n static const char __pyx_k_cycle[] = \"cycle\";\n static const char __pyx_k_range[] = \"range\";\n static const char __pyx_k_split[] = \"split\";\n static const char __pyx_k_strip[] = \"strip\";\n static const char __pyx_k_subid[] = \"subid\";\n-static const char __pyx_k_throw[] = \"throw\";\n static const char __pyx_k_value[] = \"value\";\n static const char __pyx_k_Opaque[] = \"Opaque\";\n static const char __pyx_k_append[] = \"append\";\n-static const char __pyx_k_decode[] = \"decode\";\n static const char __pyx_k_encode[] = \"encode\";\n static const char __pyx_k_idlist[] = \"idlist\";\n static const char __pyx_k_import[] = \"__import__\";\n static const char __pyx_k_insert[] = \"insert\";\n-static const char __pyx_k_lambda[] = \"<lambda>\";\n static const char __pyx_k_length[] = \"length\";\n static const char __pyx_k_module[] = \"__module__\";\n static const char __pyx_k_number[] = \"number\";\n@@ -1348,37 +1421,29 @@\n static const char __pyx_k_pdu_id[] = \"pdu_id\";\n static const char __pyx_k_req_id[] = \"req_id\";\n static const char __pyx_k_result[] = \"result\";\n-static const char __pyx_k_signed[] = \"signed\";\n static const char __pyx_k_stream[] = \"stream\";\n static const char __pyx_k_string[] = \"string\";\n-static const char __pyx_k_subid1[] = \"subid1\";\n+static const char __pyx_k_strlen[] = \"strlen\";\n static const char __pyx_k_CONTEXT[] = \"CONTEXT\";\n static const char __pyx_k_Counter[] = \"Counter\";\n static const char __pyx_k_GetBulk[] = \"GetBulk\";\n static const char __pyx_k_GetNext[] = \"GetNext\";\n static const char __pyx_k_Integer[] = \"Integer\";\n static const char __pyx_k_PRIVATE[] = \"PRIVATE\";\n-static const char __pyx_k_genexpr[] = \"genexpr\";\n-static const char __pyx_k_hexlify[] = \"hexlify\";\n static const char __pyx_k_integer[] = \"integer\";\n-static const char __pyx_k_objects[] = \"objects\";\n static const char __pyx_k_pdu_len[] = \"pdu_len\";\n static const char __pyx_k_prepare[] = \"__prepare__\";\n static const char __pyx_k_seq_tag[] = \"seq_tag\";\n-static const char __pyx_k_subid_c[] = \"subid_c\";\n static const char __pyx_k_varbind[] = \"varbind\";\n static const char __pyx_k_version[] = \"version\";\n static const char __pyx_k_ObjectID[] = \"ObjectID\";\n static const char __pyx_k_Response[] = \"Response\";\n static const char __pyx_k_Sequence[] = \"Sequence\";\n-static const char __pyx_k_binascii[] = \"binascii\";\n-static const char __pyx_k_id_cache[] = \"id_cache\";\n+static const char __pyx_k_auto_str[] = \"auto_str\";\n static const char __pyx_k_main_oid[] = \"main_oid\";\n static const char __pyx_k_msg_type[] = \"msg_type\";\n-static const char __pyx_k_position[] = \"position\";\n static const char __pyx_k_qualname[] = \"__qualname__\";\n static const char __pyx_k_snmp_ver[] = \"snmp_ver\";\n-static const char __pyx_k_to_bytes[] = \"to_bytes\";\n static const char __pyx_k_varbinds[] = \"varbinds\";\n static const char __pyx_k_ASN_TYPES[] = \"ASN_TYPES\";\n static const char __pyx_k_IPAddress[] = \"IPAddress\";\n@@ -1386,8 +1451,6 @@\n static const char __pyx_k_TimeTicks[] = \"TimeTicks\";\n static const char __pyx_k_TypeError[] = \"TypeError\";\n static const char __pyx_k_UNIVERSAL[] = \"UNIVERSAL\";\n-static const char __pyx_k_byteorder[] = \"byteorder\";\n-static const char __pyx_k_bytes_len[] = \"bytes_len\";\n static const char __pyx_k_community[] = \"community\";\n static const char __pyx_k_itertools[] = \"itertools\";\n static const char __pyx_k_metaclass[] = \"__metaclass__\";\n@@ -1397,29 +1460,31 @@\n static const char __pyx_k_obj_value[] = \"obj_value\";\n static const char __pyx_k_requestID[] = \"requestID\";\n static const char __pyx_k_subidlist[] = \"subidlist\";\n-static const char __pyx_k_tag_cache[] = \"tag_cache\";\n static const char __pyx_k_ValueError[] = \"ValueError\";\n-static const char __pyx_k_bit_length[] = \"bit_length\";\n-static const char __pyx_k_from_bytes[] = \"from_bytes\";\n static const char __pyx_k_index_part[] = \"index_part\";\n static const char __pyx_k_msg_decode[] = \"msg_decode\";\n static const char __pyx_k_msg_encode[] = \"msg_encode\";\n static const char __pyx_k_obj_id_len[] = \"obj_id_len\";\n-static const char __pyx_k_objectData[] = \"objectData\";\n+static const char __pyx_k_object_len[] = \"object_len\";\n static const char __pyx_k_resultlist[] = \"resultlist\";\n-static const char __pyx_k_startswith[] = \"startswith\";\n+static const char __pyx_k_stream_len[] = \"stream_len\";\n+static const char __pyx_k_stream_ptr[] = \"stream_ptr\";\n static const char __pyx_k_tag_decode[] = \"tag_decode\";\n static const char __pyx_k_tag_encode[] = \"tag_encode\";\n static const char __pyx_k_value_type[] = \"value_type\";\n static const char __pyx_k_version_id[] = \"version_id\";\n+static const char __pyx_k_wrong_SID1[] = \"wrong SID1\";\n+static const char __pyx_k_wrong_SID2[] = \"wrong SID2\";\n static const char __pyx_k_APPLICATION[] = \"APPLICATION\";\n static const char __pyx_k_CONSTRUCTED[] = \"CONSTRUCTED\";\n static const char __pyx_k_OctetString[] = \"OctetString\";\n static const char __pyx_k_error_index[] = \"error_index\";\n static const char __pyx_k_skip_column[] = \"skip_column\";\n+static const char __pyx_k_stream_char[] = \"stream_char\";\n static const char __pyx_k_varbind_enc[] = \"varbind_enc\";\n static const char __pyx_k_varbinds_id[] = \"varbinds_id\";\n static const char __pyx_k_version_len[] = \"version_len\";\n+static const char __pyx_k_bad_objectid[] = \"bad objectid\";\n static const char __pyx_k_community_id[] = \"community_id\";\n static const char __pyx_k_error_status[] = \"error_status\";\n static const char __pyx_k_length_cache[] = \"length_cache\";\n@@ -1438,6 +1503,7 @@\n static const char __pyx_k_asnTagFormats[] = \"asnTagFormats\";\n static const char __pyx_k_asn_tag_class[] = \"asn_tag_class\";\n static const char __pyx_k_community_len[] = \"community_len\";\n+static const char __pyx_k_encode_length[] = \"encode_length\";\n static const char __pyx_k_length_decode[] = \"length_decode\";\n static const char __pyx_k_length_encode[] = \"length_encode\";\n static const char __pyx_k_main_oids_len[] = \"main_oids_len\";\n@@ -1446,7 +1512,6 @@\n static const char __pyx_k_obj_value_len[] = \"obj_value_len\";\n static const char __pyx_k_parse_varbind[] = \"parse_varbind\";\n static const char __pyx_k_requestID_len[] = \"requestID_len\";\n-static const char __pyx_k_tagDecodeDict[] = \"tagDecodeDict\";\n static const char __pyx_k_var_bind_list[] = \"var_bind_list\";\n static const char __pyx_k_varbinds_data[] = \"varbinds_data\";\n static const char __pyx_k_asn_tag_format[] = \"asn_tag_format\";\n@@ -1457,7 +1522,6 @@\n static const char __pyx_k_integer_encode[] = \"integer_encode\";\n static const char __pyx_k_maxRepetitions[] = \"maxRepetitions\";\n static const char __pyx_k_orig_main_oids[] = \"orig_main_oids\";\n-static const char __pyx_k_sequence_cache[] = \"sequence_cache\";\n static const char __pyx_k_error_index_len[] = \"error_index_len\";\n static const char __pyx_k_error_status_id[] = \"error_status_id\";\n static const char __pyx_k_last_seen_index[] = \"last_seen_index\";\n@@ -1471,36 +1535,29 @@\n static const char __pyx_k_nonRepeaters_len[] = \"nonRepeaters_len\";\n static const char __pyx_k_snmp_message_len[] = \"snmp_message_len\";\n static const char __pyx_k_maxRepetitions_id[] = \"maxRepetitions_id\";\n-static const char __pyx_k_parsed_objectData[] = \"parsed_objectData\";\n static const char __pyx_k_var_bind_list_len[] = \"var_bind_list_len\";\n static const char __pyx_k_ASN_SNMP_MSG_TYPES[] = \"ASN_SNMP_MSG_TYPES\";\n static const char __pyx_k_Exception_s_item_s[] = \"Exception='%s' item=%s\";\n-static const char __pyx_k_SubID_out_of_range[] = \"SubID out of range\";\n-static const char __pyx_k_UnicodeDecodeError[] = \"UnicodeDecodeError\";\n static const char __pyx_k_maxRepetitions_len[] = \"maxRepetitions_len\";\n static const char __pyx_k_octetstring_decode[] = \"octetstring_decode\";\n static const char __pyx_k_octetstring_encode[] = \"octetstring_encode\";\n+static const char __pyx_k_orig_main_oids_len[] = \"orig_main_oids_len\";\n static const char __pyx_k_NotImplementedError[] = \"NotImplementedError\";\n-static const char __pyx_k_bad_value_in_s_at_s[] = \"bad value in %s at %s\";\n static const char __pyx_k_main_oids_positions[] = \"main_oids_positions\";\n-static const char __pyx_k_pdu_response_decode[] = \"pdu_response_decode\";\n static const char __pyx_k_rest_oids_positions[] = \"rest_oids_positions\";\n static const char __pyx_k_snmp_message_seq_id[] = \"snmp_message_seq_id\";\n static const char __pyx_k_varbinds_encode_tlv[] = \"varbinds_encode_tlv\";\n static const char __pyx_k_ASN_SNMP_APPLICATION[] = \"ASN_SNMP_APPLICATION\";\n static const char __pyx_k_fastsnmp_snmp_parser[] = \"fastsnmp.snmp_parser\";\n-static const char __pyx_k_integer_decode_cache[] = \"integer_decode_cache\";\n-static const char __pyx_k_integer_encode_cache[] = \"integer_encode_cache\";\n+static const char __pyx_k_orig_main_oids_doted[] = \"orig_main_oids_doted\";\n static const char __pyx_k_VarBindUnpackException[] = \"VarBindUnpackException\";\n static const char __pyx_k_VarBindContentException[] = \"VarBindContentException\";\n-static const char __pyx_k_stream_of_zero_length_in[] = \"stream of zero length in\";\n static const char __pyx_k_expected_oid_in_str_got_r[] = \"expected oid in str. got %r\";\n static const char __pyx_k_not_implement_coder_for_s[] = \"not implement coder for %s\";\n-static const char __pyx_k_parse_varbind_locals_genexpr[] = \"parse_varbind.<locals>.genexpr\";\n+static const char __pyx_k_long_SID1_is_not_supported[] = \"long SID1 is not supported\";\n static const char __pyx_k_home_gescheit_workspace_fastsnm[] = \"\/home\/gescheit\/workspace\/fastsnmp\/fastsnmp\/snmp_parser.pyx\";\n-static const char __pyx_k_stream_of_zero_length_in_objecti[] = \"stream of zero length in objectid_decode()\";\n+static const char __pyx_k_max_repetitions_must_be_higher_t[] = \"max_repetitions must be higher than 0\";\n static const char __pyx_k_value_must_be_None_for_Null_type[] = \"value must be None for Null type!\";\n-static PyObject *__pyx_kp_b_;\n static PyObject *__pyx_n_u_APPLICATION;\n static PyObject *__pyx_n_s_ASN_SNMP_APPLICATION;\n static PyObject *__pyx_n_s_ASN_SNMP_MSG_TYPES;\n@@ -1508,7 +1565,6 @@\n static PyObject *__pyx_n_u_CONSTRUCTED;\n static PyObject *__pyx_n_u_CONTEXT;\n static PyObject *__pyx_n_u_Counter;\n-static PyObject *__pyx_n_s_DEBUG;\n static PyObject *__pyx_kp_u_Exception_s_item_s;\n static PyObject *__pyx_n_u_Get;\n static PyObject *__pyx_n_u_GetBulk;\n@@ -1524,46 +1580,40 @@\n static PyObject *__pyx_n_u_PRIMITIVE;\n static PyObject *__pyx_n_u_PRIVATE;\n static PyObject *__pyx_n_u_Response;\n+static PyObject *__pyx_n_u_SID1;\n+static PyObject *__pyx_n_u_SID2;\n static PyObject *__pyx_n_s_SNMPException;\n static PyObject *__pyx_n_u_Sequence;\n static PyObject *__pyx_n_u_Set;\n-static PyObject *__pyx_kp_u_SubID_out_of_range;\n static PyObject *__pyx_n_u_TimeTicks;\n static PyObject *__pyx_n_u_Trap;\n static PyObject *__pyx_n_s_TypeError;\n static PyObject *__pyx_n_u_UNIVERSAL;\n-static PyObject *__pyx_n_s_UnicodeDecodeError;\n static PyObject *__pyx_n_s_ValueError;\n static PyObject *__pyx_n_s_VarBindContentException;\n static PyObject *__pyx_n_s_VarBindUnpackException;\n-static PyObject *__pyx_kp_b__13;\n-static PyObject *__pyx_kp_b__14;\n+static PyObject *__pyx_kp_b__23;\n+static PyObject *__pyx_kp_b__34;\n+static PyObject *__pyx_kp_b__35;\n static PyObject *__pyx_kp_u__4;\n static PyObject *__pyx_n_s_append;\n-static PyObject *__pyx_n_s_args;\n static PyObject *__pyx_n_u_ascii;\n static PyObject *__pyx_n_s_asnTagClasses;\n static PyObject *__pyx_n_s_asnTagFormats;\n static PyObject *__pyx_n_s_asn_tag_class;\n static PyObject *__pyx_n_s_asn_tag_format;\n static PyObject *__pyx_n_s_asn_tag_number;\n-static PyObject *__pyx_kp_u_bad_value_in_s_at_s;\n-static PyObject *__pyx_n_u_big;\n-static PyObject *__pyx_n_s_binascii;\n-static PyObject *__pyx_n_s_bit_length;\n-static PyObject *__pyx_n_s_byte;\n-static PyObject *__pyx_n_s_byteorder;\n-static PyObject *__pyx_n_s_bytes_len;\n-static PyObject *__pyx_n_s_close;\n+static PyObject *__pyx_n_s_auto_str;\n+static PyObject *__pyx_kp_u_bad_objectid;\n static PyObject *__pyx_n_s_community;\n static PyObject *__pyx_n_s_community_id;\n static PyObject *__pyx_n_s_community_len;\n static PyObject *__pyx_n_s_cycle;\n static PyObject *__pyx_n_s_data;\n-static PyObject *__pyx_n_s_decode;\n static PyObject *__pyx_n_s_doc;\n static PyObject *__pyx_n_s_e;\n static PyObject *__pyx_n_s_encode;\n+static PyObject *__pyx_n_s_encode_length;\n static PyObject *__pyx_n_s_encode_varbind;\n static PyObject *__pyx_n_s_error_index;\n static PyObject *__pyx_n_s_error_index_id;\n@@ -1573,45 +1623,38 @@\n static PyObject *__pyx_n_s_error_status_len;\n static PyObject *__pyx_kp_u_expected_oid_in_str_got_r;\n static PyObject *__pyx_n_s_fastsnmp_snmp_parser;\n-static PyObject *__pyx_n_s_from_bytes;\n-static PyObject *__pyx_n_s_genexpr;\n-static PyObject *__pyx_n_s_hexlify;\n static PyObject *__pyx_kp_s_home_gescheit_workspace_fastsnm;\n static PyObject *__pyx_n_s_i;\n-static PyObject *__pyx_n_s_id_cache;\n static PyObject *__pyx_n_s_idlist;\n static PyObject *__pyx_n_s_import;\n static PyObject *__pyx_n_s_index_part;\n static PyObject *__pyx_n_s_insert;\n static PyObject *__pyx_n_s_integer;\n static PyObject *__pyx_n_s_integer_decode;\n-static PyObject *__pyx_n_s_integer_decode_cache;\n static PyObject *__pyx_n_s_integer_encode;\n-static PyObject *__pyx_n_s_integer_encode_cache;\n static PyObject *__pyx_n_s_item;\n static PyObject *__pyx_n_s_itertools;\n-static PyObject *__pyx_n_s_lambda;\n static PyObject *__pyx_n_s_last_seen_index;\n static PyObject *__pyx_n_s_length;\n static PyObject *__pyx_n_s_length_cache;\n static PyObject *__pyx_n_s_length_decode;\n static PyObject *__pyx_n_s_length_encode;\n+static PyObject *__pyx_kp_u_long_SID1_is_not_supported;\n static PyObject *__pyx_n_s_main;\n static PyObject *__pyx_n_s_main_oid;\n static PyObject *__pyx_n_s_main_oids_len;\n static PyObject *__pyx_n_s_main_oids_pos;\n static PyObject *__pyx_n_s_main_oids_positions;\n-static PyObject *__pyx_n_s_map;\n static PyObject *__pyx_n_s_maxRepetitions;\n static PyObject *__pyx_n_s_maxRepetitions_id;\n static PyObject *__pyx_n_s_maxRepetitions_len;\n static PyObject *__pyx_n_s_max_repetitions;\n+static PyObject *__pyx_kp_u_max_repetitions_must_be_higher_t;\n static PyObject *__pyx_n_s_metaclass;\n static PyObject *__pyx_n_s_module;\n static PyObject *__pyx_n_s_msg_decode;\n static PyObject *__pyx_n_s_msg_encode;\n static PyObject *__pyx_n_s_msg_type;\n-static PyObject *__pyx_n_s_n;\n static PyObject *__pyx_n_s_next_oids;\n static PyObject *__pyx_n_s_nonRepeaters;\n static PyObject *__pyx_n_s_nonRepeaters_id;\n@@ -1626,25 +1669,21 @@\n static PyObject *__pyx_n_s_obj_value;\n static PyObject *__pyx_n_s_obj_value_id;\n static PyObject *__pyx_n_s_obj_value_len;\n-static PyObject *__pyx_n_s_objectData;\n+static PyObject *__pyx_n_s_object_len;\n static PyObject *__pyx_n_s_objectid_decode;\n static PyObject *__pyx_n_s_objectid_encode;\n-static PyObject *__pyx_n_s_objects;\n static PyObject *__pyx_n_s_octetstring_decode;\n static PyObject *__pyx_n_s_octetstring_encode;\n static PyObject *__pyx_n_s_oid;\n static PyObject *__pyx_n_s_oids_to_poll;\n static PyObject *__pyx_n_s_orig_main_oids;\n+static PyObject *__pyx_n_s_orig_main_oids_doted;\n+static PyObject *__pyx_n_s_orig_main_oids_len;\n static PyObject *__pyx_n_s_parse_varbind;\n-static PyObject *__pyx_n_s_parse_varbind_locals_genexpr;\n-static PyObject *__pyx_n_s_parsed_objectData;\n static PyObject *__pyx_n_s_pdu;\n static PyObject *__pyx_n_s_pdu_id;\n static PyObject *__pyx_n_s_pdu_len;\n-static PyObject *__pyx_n_s_pdu_response_decode;\n-static PyObject *__pyx_n_s_pop;\n static PyObject *__pyx_n_s_pos;\n-static PyObject *__pyx_n_s_position;\n static PyObject *__pyx_n_s_prepare;\n static PyObject *__pyx_n_s_qualname;\n static PyObject *__pyx_n_s_range;\n@@ -1656,38 +1695,31 @@\n static PyObject *__pyx_n_s_rest_oids_positions;\n static PyObject *__pyx_n_s_result;\n static PyObject *__pyx_n_s_resultlist;\n-static PyObject *__pyx_n_s_run;\n+static PyObject *__pyx_n_s_ret;\n static PyObject *__pyx_kp_u_s_s;\n-static PyObject *__pyx_n_s_send;\n static PyObject *__pyx_n_s_seq_tag;\n-static PyObject *__pyx_n_s_sequence_cache;\n static PyObject *__pyx_n_s_sequence_decode;\n-static PyObject *__pyx_n_s_signed;\n static PyObject *__pyx_n_s_skip_column;\n+static PyObject *__pyx_n_s_slen;\n static PyObject *__pyx_n_s_snmp_message;\n static PyObject *__pyx_n_s_snmp_message_len;\n static PyObject *__pyx_n_s_snmp_message_seq_id;\n static PyObject *__pyx_n_s_snmp_ver;\n static PyObject *__pyx_n_s_split;\n-static PyObject *__pyx_n_s_startswith;\n+static PyObject *__pyx_n_u_str;\n static PyObject *__pyx_n_s_stream;\n-static PyObject *__pyx_kp_u_stream_of_zero_length_in;\n-static PyObject *__pyx_kp_u_stream_of_zero_length_in_objecti;\n+static PyObject *__pyx_n_s_stream_char;\n+static PyObject *__pyx_n_s_stream_len;\n+static PyObject *__pyx_n_s_stream_ptr;\n static PyObject *__pyx_n_s_string;\n static PyObject *__pyx_n_s_strip;\n+static PyObject *__pyx_n_u_strlen;\n static PyObject *__pyx_n_s_subid;\n-static PyObject *__pyx_n_s_subid1;\n-static PyObject *__pyx_n_s_subid_c;\n static PyObject *__pyx_n_s_subidlist;\n static PyObject *__pyx_n_s_tag;\n-static PyObject *__pyx_n_s_tagDecodeDict;\n-static PyObject *__pyx_n_s_tag_cache;\n static PyObject *__pyx_n_s_tag_decode;\n static PyObject *__pyx_n_s_tag_encode;\n static PyObject *__pyx_n_s_test;\n-static PyObject *__pyx_n_s_throw;\n-static PyObject *__pyx_n_s_to_bytes;\n-static PyObject *__pyx_n_s_val;\n static PyObject *__pyx_n_s_value;\n static PyObject *__pyx_n_s_value_encode;\n static PyObject *__pyx_kp_u_value_must_be_None_for_Null_type;\n@@ -1708,19 +1740,17 @@\n static PyObject *__pyx_n_s_version;\n static PyObject *__pyx_n_s_version_id;\n static PyObject *__pyx_n_s_version_len;\n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x); \/* proto *\/\n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda1(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x); \/* proto *\/\n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda2(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x); \/* proto *\/\n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda3(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_pdu_response_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_2objectid_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_4objectid_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_oid); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_6octetstring_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_8octetstring_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_string); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_10integer_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_integer); \/* proto *\/\n+static PyObject *__pyx_kp_u_wrong_SID1;\n+static PyObject *__pyx_kp_u_wrong_SID2;\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_objectid_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_2objectid_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_oid); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_4octetstring_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream, int __pyx_v_auto_str); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_6octetstring_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_string); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_8integer_encode(CYTHON_UNUSED PyObject *__pyx_self, uint64_t __pyx_v_value); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_10integer_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_12integer_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_14sequence_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_16length_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_16length_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_data); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_18length_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_length); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_20tag_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_22tag_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_asn_tag_class, PyObject *__pyx_v_asn_tag_format, PyObject *__pyx_v_asn_tag_number); \/* proto *\/\n@@ -1730,11 +1760,7 @@\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_30varbinds_encode_tlv(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_varbinds); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_32msg_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_req_id, PyObject *__pyx_v_community, PyObject *__pyx_v_varbinds, PyObject *__pyx_v_msg_type, PyObject *__pyx_v_max_repetitions, PyObject *__pyx_v_non_repeaters); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_34msg_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream); \/* proto *\/\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_13parse_varbind_genexpr(PyObject *__pyx_self); \/* proto *\/\n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_36parse_varbind(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_var_bind_list, PyObject *__pyx_v_orig_main_oids, PyObject *__pyx_v_oids_to_poll); \/* proto *\/\n-static PyObject *__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(PyTypeObject *t, PyObject *a, PyObject *k); \/*proto*\/\n-static PyObject *__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); \/*proto*\/\n-static __Pyx_CachedCFunction __pyx_umethod_PyList_Type_pop = {0, &__pyx_n_s_pop, 0, 0, 0};\n static PyObject *__pyx_int_0;\n static PyObject *__pyx_int_1;\n static PyObject *__pyx_int_2;\n@@ -1742,1515 +1768,2269 @@\n static PyObject *__pyx_int_4;\n static PyObject *__pyx_int_5;\n static PyObject *__pyx_int_6;\n-static PyObject *__pyx_int_7;\n static PyObject *__pyx_int_8;\n static PyObject *__pyx_int_10;\n static PyObject *__pyx_int_16;\n static PyObject *__pyx_int_31;\n static PyObject *__pyx_int_32;\n-static PyObject *__pyx_int_40;\n-static PyObject *__pyx_int_48;\n static PyObject *__pyx_int_64;\n-static PyObject *__pyx_int_65;\n-static PyObject *__pyx_int_66;\n-static PyObject *__pyx_int_67;\n-static PyObject *__pyx_int_70;\n static PyObject *__pyx_int_127;\n static PyObject *__pyx_int_128;\n-static PyObject *__pyx_int_129;\n-static PyObject *__pyx_int_130;\n-static PyObject *__pyx_int_162;\n static PyObject *__pyx_int_192;\n static PyObject *__pyx_int_255;\n static PyObject *__pyx_int_neg_1;\n-static PyObject *__pyx_tuple__2;\n-static PyObject *__pyx_tuple__3;\n+static PyObject *__pyx_tuple_;\n static PyObject *__pyx_tuple__5;\n static PyObject *__pyx_tuple__6;\n static PyObject *__pyx_tuple__7;\n static PyObject *__pyx_tuple__8;\n static PyObject *__pyx_tuple__9;\n-static PyObject *__pyx_tuple__10;\n-static PyObject *__pyx_tuple__11;\n static PyObject *__pyx_tuple__12;\n-static PyObject *__pyx_tuple__15;\n-static PyObject *__pyx_tuple__17;\n-static PyObject *__pyx_tuple__19;\n-static PyObject *__pyx_tuple__21;\n-static PyObject *__pyx_tuple__23;\n-static PyObject *__pyx_tuple__25;\n-static PyObject *__pyx_tuple__27;\n+static PyObject *__pyx_tuple__22;\n+static PyObject *__pyx_tuple__28;\n static PyObject *__pyx_tuple__29;\n+static PyObject *__pyx_tuple__30;\n static PyObject *__pyx_tuple__31;\n-static PyObject *__pyx_tuple__33;\n-static PyObject *__pyx_tuple__35;\n+static PyObject *__pyx_tuple__36;\n static PyObject *__pyx_tuple__37;\n+static PyObject *__pyx_tuple__38;\n static PyObject *__pyx_tuple__39;\n+static PyObject *__pyx_tuple__40;\n static PyObject *__pyx_tuple__41;\n+static PyObject *__pyx_tuple__42;\n static PyObject *__pyx_tuple__43;\n+static PyObject *__pyx_tuple__44;\n static PyObject *__pyx_tuple__45;\n+static PyObject *__pyx_tuple__46;\n static PyObject *__pyx_tuple__47;\n+static PyObject *__pyx_tuple__48;\n static PyObject *__pyx_tuple__49;\n+static PyObject *__pyx_tuple__50;\n static PyObject *__pyx_tuple__51;\n+static PyObject *__pyx_tuple__52;\n+static PyObject *__pyx_tuple__53;\n+static PyObject *__pyx_tuple__54;\n+static PyObject *__pyx_codeobj__2;\n+static PyObject *__pyx_codeobj__3;\n+static PyObject *__pyx_codeobj__10;\n+static PyObject *__pyx_codeobj__11;\n+static PyObject *__pyx_codeobj__13;\n+static PyObject *__pyx_codeobj__14;\n+static PyObject *__pyx_codeobj__15;\n static PyObject *__pyx_codeobj__16;\n+static PyObject *__pyx_codeobj__17;\n static PyObject *__pyx_codeobj__18;\n+static PyObject *__pyx_codeobj__19;\n static PyObject *__pyx_codeobj__20;\n-static PyObject *__pyx_codeobj__22;\n+static PyObject *__pyx_codeobj__21;\n static PyObject *__pyx_codeobj__24;\n+static PyObject *__pyx_codeobj__25;\n static PyObject *__pyx_codeobj__26;\n-static PyObject *__pyx_codeobj__28;\n-static PyObject *__pyx_codeobj__30;\n+static PyObject *__pyx_codeobj__27;\n static PyObject *__pyx_codeobj__32;\n-static PyObject *__pyx_codeobj__34;\n-static PyObject *__pyx_codeobj__36;\n-static PyObject *__pyx_codeobj__38;\n-static PyObject *__pyx_codeobj__40;\n-static PyObject *__pyx_codeobj__42;\n-static PyObject *__pyx_codeobj__44;\n-static PyObject *__pyx_codeobj__46;\n-static PyObject *__pyx_codeobj__48;\n-static PyObject *__pyx_codeobj__50;\n-static PyObject *__pyx_codeobj__52;\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":259\n- * 0x02: integer_decode,\n- * 0x04: octetstring_decode,\n- * 0x05: lambda x: b'', # <<<<<<<<<<<<<<\n- * 0x06: objectid_decode,\n- * 0x30: sequence_decode,\n+static PyObject *__pyx_codeobj__33;\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":90\n+ * cdef SID12_t *sid12s = [{'str': b'0.0\\x00', 'strlen': 3},{'str': b'0.1\\x00', 'strlen': 3},{'str': b'0.2\\x00', 'strlen': 3},{'str': b'0.3\\x00', 'strlen': 3},{'str': b'0.4\\x00', 'strlen': 3},{'str': b'0.5\\x00', 'strlen': 3},{'str': b'0.6\\x00', 'strlen': 3},{'str': b'0.7\\x00', 'strlen': 3},{'str': b'0.8\\x00', 'strlen': 3},{'str': b'0.9\\x00', 'strlen': 3},{'str': b'0.10', 'strlen': 4},{'str': b'0.11', 'strlen': 4},{'str': b'0.12', 'strlen': 4},{'str': b'0.13', 'strlen': 4},{'str': b'0.14', 'strlen': 4},{'str': b'0.15', 'strlen': 4},{'str': b'0.16', 'strlen': 4},{'str': b'0.17', 'strlen': 4},{'str': b'0.18', 'strlen': 4},{'str': b'0.19', 'strlen': 4},{'str': b'0.20', 'strlen': 4},{'str': b'0.21', 'strlen': 4},{'str': b'0.22', 'strlen': 4},{'str': b'0.23', 'strlen': 4},{'str': b'0.24', 'strlen': 4},{'str': b'0.25', 'strlen': 4},{'str': b'0.26', 'strlen': 4},{'str': b'0.27', 'strlen': 4},{'str': b'0.28', 'strlen': 4},{'str': b'0.29', 'strlen': 4},{'str': b'0.30', 'strlen': 4},{'str': b'0.31', 'strlen': 4},{'str': b'0.32', 'strlen': 4},{'str': b'0.33', 'strlen': 4},{'str': b'0.34', 'strlen': 4},{'str': b'0.35', 'strlen': 4},{'str': b'0.36', 'strlen': 4},{'str': b'0.37', 'strlen': 4},{'str': b'0.38', 'strlen': 4},{'str': b'0.39', 'strlen': 4},{'str': b'1.0\\x00', 'strlen': 3},{'str': b'1.1\\x00', 'strlen': 3},{'str': b'1.2\\x00', 'strlen': 3},{'str': b'1.3\\x00', 'strlen': 3},{'str': b'1.4\\x00', 'strlen': 3},{'str': b'1.5\\x00', 'strlen': 3},{'str': b'1.6\\x00', 'strlen': 3},{'str': b'1.7\\x00', 'strlen': 3},{'str': b'1.8\\x00', 'strlen': 3},{'str': b'1.9\\x00', 'strlen': 3},{'str': b'1.10', 'strlen': 4},{'str': b'1.11', 'strlen': 4},{'str': b'1.12', 'strlen': 4},{'str': b'1.13', 'strlen': 4},{'str': b'1.14', 'strlen': 4},{'str': b'1.15', 'strlen': 4},{'str': b'1.16', 'strlen': 4},{'str': b'1.17', 'strlen': 4},{'str': b'1.18', 'strlen': 4},{'str': b'1.19', 'strlen': 4},{'str': b'1.20', 'strlen': 4},{'str': b'1.21', 'strlen': 4},{'str': b'1.22', 'strlen': 4},{'str': b'1.23', 'strlen': 4},{'str': b'1.24', 'strlen': 4},{'str': b'1.25', 'strlen': 4},{'str': b'1.26', 'strlen': 4},{'str': b'1.27', 'strlen': 4},{'str': b'1.28', 'strlen': 4},{'str': b'1.29', 'strlen': 4},{'str': b'1.30', 'strlen': 4},{'str': b'1.31', 'strlen': 4},{'str': b'1.32', 'strlen': 4},{'str': b'1.33', 'strlen': 4},{'str': b'1.34', 'strlen': 4},{'str': b'1.35', 'strlen': 4},{'str': b'1.36', 'strlen': 4},{'str': b'1.37', 'strlen': 4},{'str': b'1.38', 'strlen': 4},{'str': b'1.39', 'strlen': 4},{'str': b'2.0\\x00', 'strlen': 3},{'str': b'2.1\\x00', 'strlen': 3},{'str': b'2.2\\x00', 'strlen': 3},{'str': b'2.3\\x00', 'strlen': 3},{'str': b'2.4\\x00', 'strlen': 3},{'str': b'2.5\\x00', 'strlen': 3},{'str': b'2.6\\x00', 'strlen': 3},{'str': b'2.7\\x00', 'strlen': 3},{'str': b'2.8\\x00', 'strlen': 3},{'str': b'2.9\\x00', 'strlen': 3},{'str': b'2.10', 'strlen': 4},{'str': b'2.11', 'strlen': 4},{'str': b'2.12', 'strlen': 4},{'str': b'2.13', 'strlen': 4},{'str': b'2.14', 'strlen': 4},{'str': b'2.15', 'strlen': 4},{'str': b'2.16', 'strlen': 4},{'str': b'2.17', 'strlen': 4},{'str': b'2.18', 'strlen': 4},{'str': b'2.19', 'strlen': 4},{'str': b'2.20', 'strlen': 4},{'str': b'2.21', 'strlen': 4},{'str': b'2.22', 'strlen': 4},{'str': b'2.23', 'strlen': 4},{'str': b'2.24', 'strlen': 4},{'str': b'2.25', 'strlen': 4},{'str': b'2.26', 'strlen': 4},{'str': b'2.27', 'strlen': 4},{'str': b'2.28', 'strlen': 4},{'str': b'2.29', 'strlen': 4},{'str': b'2.30', 'strlen': 4},{'str': b'2.31', 'strlen': 4},{'str': b'2.32', 'strlen': 4},{'str': b'2.33', 'strlen': 4},{'str': b'2.34', 'strlen': 4},{'str': b'2.35', 'strlen': 4},{'str': b'2.36', 'strlen': 4},{'str': b'2.37', 'strlen': 4},{'str': b'2.38', 'strlen': 4},{'str': b'2.39', 'strlen': 4},]\n+ * \n+ * cdef inline int primitive_decode(char *stream, size_t stream_len, uint64_t *result, size_t *result_len): # <<<<<<<<<<<<<<\n+ * cdef size_t i\n+ * cdef uint8_t sid\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_primitive_decode(char *__pyx_v_stream, size_t __pyx_v_stream_len, uint64_t *__pyx_v_result, size_t *__pyx_v_result_len) {\n+ size_t __pyx_v_i;\n+ uint8_t __pyx_v_sid;\n+ int __pyx_v_retval;\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ size_t __pyx_t_1;\n+ size_t __pyx_t_2;\n+ size_t __pyx_t_3;\n+ int __pyx_t_4;\n+ long __pyx_t_5;\n+ __Pyx_RefNannySetupContext(\"primitive_decode\", 0);\n+ __Pyx_TraceCall(\"primitive_decode\", __pyx_f[0], 90, 0, __PYX_ERR(0, 90, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":93\n+ * cdef size_t i\n+ * cdef uint8_t sid\n+ * cdef int retval = 0 # <<<<<<<<<<<<<<\n+ * result_len[0] = 0\n+ * result[0] = 0\n+ *\/\n+ __pyx_v_retval = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":94\n+ * cdef uint8_t sid\n+ * cdef int retval = 0\n+ * result_len[0] = 0 # <<<<<<<<<<<<<<\n+ * result[0] = 0\n+ * \n+ *\/\n+ (__pyx_v_result_len[0]) = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":95\n+ * cdef int retval = 0\n+ * result_len[0] = 0\n+ * result[0] = 0 # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(stream_len):\n+ *\/\n+ (__pyx_v_result[0]) = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":97\n+ * result[0] = 0\n+ * \n+ * for i in range(stream_len): # <<<<<<<<<<<<<<\n+ * result[result_len[0]] <<= 7\n+ * sid = <uint8_t>stream[i]\n+ *\/\n+ __pyx_t_1 = __pyx_v_stream_len;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":98\n+ * \n+ * for i in range(stream_len):\n+ * result[result_len[0]] <<= 7 # <<<<<<<<<<<<<<\n+ * sid = <uint8_t>stream[i]\n+ * result[result_len[0]] |= sid & 0x7f\n+ *\/\n+ __pyx_t_3 = (__pyx_v_result_len[0]);\n+ (__pyx_v_result[__pyx_t_3]) = ((__pyx_v_result[__pyx_t_3]) << 7);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":99\n+ * for i in range(stream_len):\n+ * result[result_len[0]] <<= 7\n+ * sid = <uint8_t>stream[i] # <<<<<<<<<<<<<<\n+ * result[result_len[0]] |= sid & 0x7f\n+ * if sid & 0x80 == 0:\n+ *\/\n+ __pyx_v_sid = ((uint8_t)(__pyx_v_stream[__pyx_v_i]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":100\n+ * result[result_len[0]] <<= 7\n+ * sid = <uint8_t>stream[i]\n+ * result[result_len[0]] |= sid & 0x7f # <<<<<<<<<<<<<<\n+ * if sid & 0x80 == 0:\n+ * result_len[0] +=1\n+ *\/\n+ __pyx_t_3 = (__pyx_v_result_len[0]);\n+ (__pyx_v_result[__pyx_t_3]) = ((__pyx_v_result[__pyx_t_3]) | (__pyx_v_sid & 0x7f));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":101\n+ * sid = <uint8_t>stream[i]\n+ * result[result_len[0]] |= sid & 0x7f\n+ * if sid & 0x80 == 0: # <<<<<<<<<<<<<<\n+ * result_len[0] +=1\n+ * result[result_len[0]] = 0\n+ *\/\n+ __pyx_t_4 = (((__pyx_v_sid & 0x80) == 0) != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":102\n+ * result[result_len[0]] |= sid & 0x7f\n+ * if sid & 0x80 == 0:\n+ * result_len[0] +=1 # <<<<<<<<<<<<<<\n+ * result[result_len[0]] = 0\n+ * \n+ *\/\n+ __pyx_t_5 = 0;\n+ (__pyx_v_result_len[__pyx_t_5]) = ((__pyx_v_result_len[__pyx_t_5]) + 1);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":103\n+ * if sid & 0x80 == 0:\n+ * result_len[0] +=1\n+ * result[result_len[0]] = 0 # <<<<<<<<<<<<<<\n+ * \n+ * return retval\n+ *\/\n+ (__pyx_v_result[(__pyx_v_result_len[0])]) = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":101\n+ * sid = <uint8_t>stream[i]\n+ * result[result_len[0]] |= sid & 0x7f\n+ * if sid & 0x80 == 0: # <<<<<<<<<<<<<<\n+ * result_len[0] +=1\n+ * result[result_len[0]] = 0\n+ *\/\n+ }\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":105\n+ * result[result_len[0]] = 0\n+ * \n+ * return retval # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = __pyx_v_retval;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":90\n+ * cdef SID12_t *sid12s = [{'str': b'0.0\\x00', 'strlen': 3},{'str': b'0.1\\x00', 'strlen': 3},{'str': b'0.2\\x00', 'strlen': 3},{'str': b'0.3\\x00', 'strlen': 3},{'str': b'0.4\\x00', 'strlen': 3},{'str': b'0.5\\x00', 'strlen': 3},{'str': b'0.6\\x00', 'strlen': 3},{'str': b'0.7\\x00', 'strlen': 3},{'str': b'0.8\\x00', 'strlen': 3},{'str': b'0.9\\x00', 'strlen': 3},{'str': b'0.10', 'strlen': 4},{'str': b'0.11', 'strlen': 4},{'str': b'0.12', 'strlen': 4},{'str': b'0.13', 'strlen': 4},{'str': b'0.14', 'strlen': 4},{'str': b'0.15', 'strlen': 4},{'str': b'0.16', 'strlen': 4},{'str': b'0.17', 'strlen': 4},{'str': b'0.18', 'strlen': 4},{'str': b'0.19', 'strlen': 4},{'str': b'0.20', 'strlen': 4},{'str': b'0.21', 'strlen': 4},{'str': b'0.22', 'strlen': 4},{'str': b'0.23', 'strlen': 4},{'str': b'0.24', 'strlen': 4},{'str': b'0.25', 'strlen': 4},{'str': b'0.26', 'strlen': 4},{'str': b'0.27', 'strlen': 4},{'str': b'0.28', 'strlen': 4},{'str': b'0.29', 'strlen': 4},{'str': b'0.30', 'strlen': 4},{'str': b'0.31', 'strlen': 4},{'str': b'0.32', 'strlen': 4},{'str': b'0.33', 'strlen': 4},{'str': b'0.34', 'strlen': 4},{'str': b'0.35', 'strlen': 4},{'str': b'0.36', 'strlen': 4},{'str': b'0.37', 'strlen': 4},{'str': b'0.38', 'strlen': 4},{'str': b'0.39', 'strlen': 4},{'str': b'1.0\\x00', 'strlen': 3},{'str': b'1.1\\x00', 'strlen': 3},{'str': b'1.2\\x00', 'strlen': 3},{'str': b'1.3\\x00', 'strlen': 3},{'str': b'1.4\\x00', 'strlen': 3},{'str': b'1.5\\x00', 'strlen': 3},{'str': b'1.6\\x00', 'strlen': 3},{'str': b'1.7\\x00', 'strlen': 3},{'str': b'1.8\\x00', 'strlen': 3},{'str': b'1.9\\x00', 'strlen': 3},{'str': b'1.10', 'strlen': 4},{'str': b'1.11', 'strlen': 4},{'str': b'1.12', 'strlen': 4},{'str': b'1.13', 'strlen': 4},{'str': b'1.14', 'strlen': 4},{'str': b'1.15', 'strlen': 4},{'str': b'1.16', 'strlen': 4},{'str': b'1.17', 'strlen': 4},{'str': b'1.18', 'strlen': 4},{'str': b'1.19', 'strlen': 4},{'str': b'1.20', 'strlen': 4},{'str': b'1.21', 'strlen': 4},{'str': b'1.22', 'strlen': 4},{'str': b'1.23', 'strlen': 4},{'str': b'1.24', 'strlen': 4},{'str': b'1.25', 'strlen': 4},{'str': b'1.26', 'strlen': 4},{'str': b'1.27', 'strlen': 4},{'str': b'1.28', 'strlen': 4},{'str': b'1.29', 'strlen': 4},{'str': b'1.30', 'strlen': 4},{'str': b'1.31', 'strlen': 4},{'str': b'1.32', 'strlen': 4},{'str': b'1.33', 'strlen': 4},{'str': b'1.34', 'strlen': 4},{'str': b'1.35', 'strlen': 4},{'str': b'1.36', 'strlen': 4},{'str': b'1.37', 'strlen': 4},{'str': b'1.38', 'strlen': 4},{'str': b'1.39', 'strlen': 4},{'str': b'2.0\\x00', 'strlen': 3},{'str': b'2.1\\x00', 'strlen': 3},{'str': b'2.2\\x00', 'strlen': 3},{'str': b'2.3\\x00', 'strlen': 3},{'str': b'2.4\\x00', 'strlen': 3},{'str': b'2.5\\x00', 'strlen': 3},{'str': b'2.6\\x00', 'strlen': 3},{'str': b'2.7\\x00', 'strlen': 3},{'str': b'2.8\\x00', 'strlen': 3},{'str': b'2.9\\x00', 'strlen': 3},{'str': b'2.10', 'strlen': 4},{'str': b'2.11', 'strlen': 4},{'str': b'2.12', 'strlen': 4},{'str': b'2.13', 'strlen': 4},{'str': b'2.14', 'strlen': 4},{'str': b'2.15', 'strlen': 4},{'str': b'2.16', 'strlen': 4},{'str': b'2.17', 'strlen': 4},{'str': b'2.18', 'strlen': 4},{'str': b'2.19', 'strlen': 4},{'str': b'2.20', 'strlen': 4},{'str': b'2.21', 'strlen': 4},{'str': b'2.22', 'strlen': 4},{'str': b'2.23', 'strlen': 4},{'str': b'2.24', 'strlen': 4},{'str': b'2.25', 'strlen': 4},{'str': b'2.26', 'strlen': 4},{'str': b'2.27', 'strlen': 4},{'str': b'2.28', 'strlen': 4},{'str': b'2.29', 'strlen': 4},{'str': b'2.30', 'strlen': 4},{'str': b'2.31', 'strlen': 4},{'str': b'2.32', 'strlen': 4},{'str': b'2.33', 'strlen': 4},{'str': b'2.34', 'strlen': 4},{'str': b'2.35', 'strlen': 4},{'str': b'2.36', 'strlen': 4},{'str': b'2.37', 'strlen': 4},{'str': b'2.38', 'strlen': 4},{'str': b'2.39', 'strlen': 4},]\n+ * \n+ * cdef inline int primitive_decode(char *stream, size_t stream_len, uint64_t *result, size_t *result_len): # <<<<<<<<<<<<<<\n+ * cdef size_t i\n+ * cdef uint8_t sid\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.primitive_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":108\n+ * \n+ * \n+ * cdef inline objectid_decode_str(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n+ * cdef uint64_t result[122]\n+ * cdef char result_str[MAX_OID_LEN_STR]\n+ *\/\n+\n+static CYTHON_INLINE PyObject *__pyx_f_8fastsnmp_11snmp_parser_objectid_decode_str(char *__pyx_v_stream, size_t __pyx_v_stream_len) {\n+ uint64_t __pyx_v_result[0x7A];\n+ char __pyx_v_result_str[0x1F4];\n+ char *__pyx_v_result_str_ptr;\n+ size_t __pyx_v_n;\n+ size_t __pyx_v_sid12_enc_len;\n+ size_t __pyx_v_result_len;\n+ size_t __pyx_v_out_len;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_v_tmp_sid;\n+ size_t __pyx_v_i;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ PyObject *__pyx_t_2 = NULL;\n+ size_t __pyx_t_3;\n+ size_t __pyx_t_4;\n+ __Pyx_RefNannySetupContext(\"objectid_decode_str\", 0);\n+ __Pyx_TraceCall(\"objectid_decode_str\", __pyx_f[0], 108, 0, __PYX_ERR(0, 108, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":111\n+ * cdef uint64_t result[122]\n+ * cdef char result_str[MAX_OID_LEN_STR]\n+ * cdef char *result_str_ptr = result_str # <<<<<<<<<<<<<<\n+ * cdef size_t n, ret_len, sid12_enc_len, result_len=0, out_len\n+ * cdef SID12_t tmp_sid\n+ *\/\n+ __pyx_v_result_str_ptr = __pyx_v_result_str;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":112\n+ * cdef char result_str[MAX_OID_LEN_STR]\n+ * cdef char *result_str_ptr = result_str\n+ * cdef size_t n, ret_len, sid12_enc_len, result_len=0, out_len # <<<<<<<<<<<<<<\n+ * cdef SID12_t tmp_sid\n+ * \n+ *\/\n+ __pyx_v_result_len = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":115\n+ * cdef SID12_t tmp_sid\n+ * \n+ * if <size_t>stream[0] > 127: # <<<<<<<<<<<<<<\n+ * raise Exception(\"bad objectid\")\n+ * \n+ *\/\n+ __pyx_t_1 = ((((size_t)(__pyx_v_stream[0])) > 0x7F) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":116\n+ * \n+ * if <size_t>stream[0] > 127:\n+ * raise Exception(\"bad objectid\") # <<<<<<<<<<<<<<\n+ * \n+ * tmp_sid = sid12s[<size_t>stream[0]]\n+ *\/\n+ __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_Raise(__pyx_t_2, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __PYX_ERR(0, 116, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":115\n+ * cdef SID12_t tmp_sid\n+ * \n+ * if <size_t>stream[0] > 127: # <<<<<<<<<<<<<<\n+ * raise Exception(\"bad objectid\")\n+ * \n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":118\n+ * raise Exception(\"bad objectid\")\n+ * \n+ * tmp_sid = sid12s[<size_t>stream[0]] # <<<<<<<<<<<<<<\n+ * \n+ * sid12_enc_len = tmp_sid.strlen\n+ *\/\n+ __pyx_v_tmp_sid = (__pyx_v_8fastsnmp_11snmp_parser_sid12s[((size_t)(__pyx_v_stream[0]))]);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":120\n+ * tmp_sid = sid12s[<size_t>stream[0]]\n+ * \n+ * sid12_enc_len = tmp_sid.strlen # <<<<<<<<<<<<<<\n+ * \n+ * memcpy(result_str_ptr, tmp_sid.str, sid12_enc_len)\n+ *\/\n+ __pyx_t_3 = __pyx_v_tmp_sid.strlen;\n+ __pyx_v_sid12_enc_len = __pyx_t_3;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":122\n+ * sid12_enc_len = tmp_sid.strlen\n+ * \n+ * memcpy(result_str_ptr, tmp_sid.str, sid12_enc_len) # <<<<<<<<<<<<<<\n+ * result_str_ptr += sid12_enc_len\n+ * out_len = sid12_enc_len\n+ *\/\n+ memcpy(__pyx_v_result_str_ptr, __pyx_v_tmp_sid.str, __pyx_v_sid12_enc_len);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":123\n+ * \n+ * memcpy(result_str_ptr, tmp_sid.str, sid12_enc_len)\n+ * result_str_ptr += sid12_enc_len # <<<<<<<<<<<<<<\n+ * out_len = sid12_enc_len\n+ * \n+ *\/\n+ __pyx_v_result_str_ptr = (__pyx_v_result_str_ptr + __pyx_v_sid12_enc_len);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":124\n+ * memcpy(result_str_ptr, tmp_sid.str, sid12_enc_len)\n+ * result_str_ptr += sid12_enc_len\n+ * out_len = sid12_enc_len # <<<<<<<<<<<<<<\n+ * \n+ * primitive_decode((<char *>stream)+1, stream_len-1, result, &result_len)\n+ *\/\n+ __pyx_v_out_len = __pyx_v_sid12_enc_len;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":126\n+ * out_len = sid12_enc_len\n+ * \n+ * primitive_decode((<char *>stream)+1, stream_len-1, result, &result_len) # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(result_len):\n+ *\/\n+ __pyx_f_8fastsnmp_11snmp_parser_primitive_decode((((char *)__pyx_v_stream) + 1), (__pyx_v_stream_len - 1), __pyx_v_result, (&__pyx_v_result_len));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":128\n+ * primitive_decode((<char *>stream)+1, stream_len-1, result, &result_len)\n+ * \n+ * for i in range(result_len): # <<<<<<<<<<<<<<\n+ * n = sprintf(result_str_ptr, \".%ld\", result[i])\n+ * result_str_ptr += n\n+ *\/\n+ __pyx_t_3 = __pyx_v_result_len;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":129\n+ * \n+ * for i in range(result_len):\n+ * n = sprintf(result_str_ptr, \".%ld\", result[i]) # <<<<<<<<<<<<<<\n+ * result_str_ptr += n\n+ * out_len+=n\n+ *\/\n+ __pyx_v_n = sprintf(__pyx_v_result_str_ptr, ((char const *)\".%ld\"), (__pyx_v_result[__pyx_v_i]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":130\n+ * for i in range(result_len):\n+ * n = sprintf(result_str_ptr, \".%ld\", result[i])\n+ * result_str_ptr += n # <<<<<<<<<<<<<<\n+ * out_len+=n\n+ * \n+ *\/\n+ __pyx_v_result_str_ptr = (__pyx_v_result_str_ptr + __pyx_v_n);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":131\n+ * n = sprintf(result_str_ptr, \".%ld\", result[i])\n+ * result_str_ptr += n\n+ * out_len+=n # <<<<<<<<<<<<<<\n+ * \n+ * return result_str[:out_len]\n+ *\/\n+ __pyx_v_out_len = (__pyx_v_out_len + __pyx_v_n);\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":133\n+ * out_len+=n\n+ * \n+ * return result_str[:out_len] # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_2 = __Pyx_PyStr_FromStringAndSize(((const char*)__pyx_v_result_str) + 0, __pyx_v_out_len - 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_r = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":108\n+ * \n+ * \n+ * cdef inline objectid_decode_str(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n+ * cdef uint64_t result[122]\n+ * cdef char result_str[MAX_OID_LEN_STR]\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_decode_str\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":136\n+ * \n+ * \n+ * def objectid_decode(stream): # <<<<<<<<<<<<<<\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n *\/\n \n \/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_38lambda(PyObject *__pyx_self, PyObject *__pyx_v_x); \/*proto*\/\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_38lambda = {\"lambda\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_38lambda, METH_O, 0};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_38lambda(PyObject *__pyx_self, PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_1objectid_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_1objectid_decode = {\"objectid_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_1objectid_decode, METH_O, 0};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_1objectid_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda (wrapper)\", 0);\n- __pyx_r = __pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda(__pyx_self, ((PyObject *)__pyx_v_x));\n+ __Pyx_RefNannySetupContext(\"objectid_decode (wrapper)\", 0);\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_objectid_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n \n \/* function exit code *\/\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_objectid_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ char *__pyx_v_stream_char;\n+ size_t __pyx_v_stream_len;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda\", 0);\n+ char *__pyx_t_1;\n+ Py_ssize_t __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__2)\n+ __Pyx_RefNannySetupContext(\"objectid_decode\", 0);\n+ __Pyx_TraceCall(\"objectid_decode\", __pyx_f[0], 136, 0, __PYX_ERR(0, 136, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":137\n+ * \n+ * def objectid_decode(stream):\n+ * cdef char *stream_char = stream # <<<<<<<<<<<<<<\n+ * cdef size_t stream_len = len(stream)\n+ * return objectid_decode_str(stream_char, stream_len)\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 137, __pyx_L1_error)\n+ __pyx_v_stream_char = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":138\n+ * def objectid_decode(stream):\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream) # <<<<<<<<<<<<<<\n+ * return objectid_decode_str(stream_char, stream_len)\n+ * \n+ *\/\n+ __pyx_t_2 = PyObject_Length(__pyx_v_stream); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 138, __pyx_L1_error)\n+ __pyx_v_stream_len = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":139\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ * return objectid_decode_str(stream_char, stream_len) # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(__pyx_kp_b_);\n- __pyx_r = __pyx_kp_b_;\n+ __pyx_t_3 = __pyx_f_8fastsnmp_11snmp_parser_objectid_decode_str(__pyx_v_stream_char, __pyx_v_stream_len); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 139, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_r = __pyx_t_3;\n+ __pyx_t_3 = 0;\n goto __pyx_L0;\n \n+ \/* \"fastsnmp\/snmp_parser.pyx\":136\n+ * \n+ * \n+ * def objectid_decode(stream): # <<<<<<<<<<<<<<\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+\n \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n __pyx_L0:;\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":271\n- * \n- * 0xa2: pdu_response_decode,\n- * 0x80: lambda x: None, # NoSuchObject_TAG # <<<<<<<<<<<<<<\n- * 0x81: lambda x: None, # NoSuchInstance_TAG\n- * 0x82: lambda x: None, # EndOfMibView_TAG\n+\/* \"fastsnmp\/snmp_parser.pyx\":142\n+ * \n+ * \n+ * cdef inline tuple objectid_decode_tuple(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n+ * cdef size_t result_len=0\n+ * cdef uint64_t result[120]\n+ *\/\n+\n+static CYTHON_INLINE PyObject *__pyx_f_8fastsnmp_11snmp_parser_objectid_decode_tuple(char *__pyx_v_stream, size_t __pyx_v_stream_len) {\n+ size_t __pyx_v_result_len;\n+ uint64_t __pyx_v_result[0x78];\n+ PyObject *__pyx_v_ret = NULL;\n+ size_t __pyx_v_i;\n+ PyObject *__pyx_v_val = NULL;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ PyObject *__pyx_t_1 = NULL;\n+ size_t __pyx_t_2;\n+ size_t __pyx_t_3;\n+ __Pyx_RefNannySetupContext(\"objectid_decode_tuple\", 0);\n+ __Pyx_TraceCall(\"objectid_decode_tuple\", __pyx_f[0], 142, 0, __PYX_ERR(0, 142, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":143\n+ * \n+ * cdef inline tuple objectid_decode_tuple(char *stream, size_t stream_len):\n+ * cdef size_t result_len=0 # <<<<<<<<<<<<<<\n+ * cdef uint64_t result[120]\n+ * \n+ *\/\n+ __pyx_v_result_len = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":146\n+ * cdef uint64_t result[120]\n+ * \n+ * objectid_decode_c(stream, stream_len, result, &result_len) # <<<<<<<<<<<<<<\n+ * ret = PyTuple_New(result_len)\n+ * \n+ *\/\n+ __pyx_f_8fastsnmp_11snmp_parser_objectid_decode_c(__pyx_v_stream, __pyx_v_stream_len, __pyx_v_result, (&__pyx_v_result_len));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":147\n+ * \n+ * objectid_decode_c(stream, stream_len, result, &result_len)\n+ * ret = PyTuple_New(result_len) # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(result_len):\n+ *\/\n+ __pyx_t_1 = PyTuple_New(__pyx_v_result_len); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 147, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_v_ret = ((PyObject*)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":149\n+ * ret = PyTuple_New(result_len)\n+ * \n+ * for i in range(result_len): # <<<<<<<<<<<<<<\n+ * val = PyInt_FromLong(result[i])\n+ * Py_INCREF(val)\n+ *\/\n+ __pyx_t_2 = __pyx_v_result_len;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":150\n+ * \n+ * for i in range(result_len):\n+ * val = PyInt_FromLong(result[i]) # <<<<<<<<<<<<<<\n+ * Py_INCREF(val)\n+ * PyTuple_SET_ITEM(ret, i, val)\n+ *\/\n+ __pyx_t_1 = PyInt_FromLong((__pyx_v_result[__pyx_v_i])); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 150, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_XDECREF_SET(__pyx_v_val, __pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":151\n+ * for i in range(result_len):\n+ * val = PyInt_FromLong(result[i])\n+ * Py_INCREF(val) # <<<<<<<<<<<<<<\n+ * PyTuple_SET_ITEM(ret, i, val)\n+ * return ret\n+ *\/\n+ Py_INCREF(__pyx_v_val);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":152\n+ * val = PyInt_FromLong(result[i])\n+ * Py_INCREF(val)\n+ * PyTuple_SET_ITEM(ret, i, val) # <<<<<<<<<<<<<<\n+ * return ret\n+ * \n+ *\/\n+ PyTuple_SET_ITEM(__pyx_v_ret, __pyx_v_i, __pyx_v_val);\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":153\n+ * Py_INCREF(val)\n+ * PyTuple_SET_ITEM(ret, i, val)\n+ * return ret # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline int objectid_decode_c(char *stream, size_t stream_len, uint64_t *result, size_t *result_len):\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(__pyx_v_ret);\n+ __pyx_r = __pyx_v_ret;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":142\n+ * \n+ * \n+ * cdef inline tuple objectid_decode_tuple(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n+ * cdef size_t result_len=0\n+ * cdef uint64_t result[120]\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_decode_tuple\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XDECREF(__pyx_v_ret);\n+ __Pyx_XDECREF(__pyx_v_val);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":155\n+ * return ret\n+ * \n+ * cdef inline int objectid_decode_c(char *stream, size_t stream_len, uint64_t *result, size_t *result_len): # <<<<<<<<<<<<<<\n+ * cdef object value\n+ * cdef SID12_ti *sid12_ptr\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_objectid_decode_c(char *__pyx_v_stream, size_t __pyx_v_stream_len, uint64_t *__pyx_v_result, size_t *__pyx_v_result_len) {\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti *__pyx_v_sid12_ptr;\n+ size_t __pyx_v_enc_len;\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ uint64_t __pyx_t_1;\n+ int __pyx_t_2;\n+ long __pyx_t_3;\n+ __Pyx_RefNannySetupContext(\"objectid_decode_c\", 0);\n+ __Pyx_TraceCall(\"objectid_decode_c\", __pyx_f[0], 155, 0, __PYX_ERR(0, 155, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":158\n+ * cdef object value\n+ * cdef SID12_ti *sid12_ptr\n+ * cdef size_t i, enc_len=0 # <<<<<<<<<<<<<<\n+ * cdef tuple ret\n+ * sid12_ptr = &sid12i[<size_t>stream[0]]\n+ *\/\n+ __pyx_v_enc_len = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":160\n+ * cdef size_t i, enc_len=0\n+ * cdef tuple ret\n+ * sid12_ptr = &sid12i[<size_t>stream[0]] # <<<<<<<<<<<<<<\n+ * result[0] = sid12_ptr.SID1\n+ * result[1] = sid12_ptr.SID2\n+ *\/\n+ __pyx_v_sid12_ptr = (&(__pyx_v_8fastsnmp_11snmp_parser_sid12i[((size_t)(__pyx_v_stream[0]))]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":161\n+ * cdef tuple ret\n+ * sid12_ptr = &sid12i[<size_t>stream[0]]\n+ * result[0] = sid12_ptr.SID1 # <<<<<<<<<<<<<<\n+ * result[1] = sid12_ptr.SID2\n+ * result_len[0] = 2\n+ *\/\n+ __pyx_t_1 = __pyx_v_sid12_ptr->SID1;\n+ (__pyx_v_result[0]) = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":162\n+ * sid12_ptr = &sid12i[<size_t>stream[0]]\n+ * result[0] = sid12_ptr.SID1\n+ * result[1] = sid12_ptr.SID2 # <<<<<<<<<<<<<<\n+ * result_len[0] = 2\n+ * \n+ *\/\n+ __pyx_t_1 = __pyx_v_sid12_ptr->SID2;\n+ (__pyx_v_result[1]) = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":163\n+ * result[0] = sid12_ptr.SID1\n+ * result[1] = sid12_ptr.SID2\n+ * result_len[0] = 2 # <<<<<<<<<<<<<<\n+ * \n+ * if stream_len > 1:\n+ *\/\n+ (__pyx_v_result_len[0]) = 2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":165\n+ * result_len[0] = 2\n+ * \n+ * if stream_len > 1: # <<<<<<<<<<<<<<\n+ * primitive_decode(stream+1, stream_len-1, result+2, &enc_len)\n+ * result_len[0] += enc_len\n+ *\/\n+ __pyx_t_2 = ((__pyx_v_stream_len > 1) != 0);\n+ if (__pyx_t_2) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":166\n+ * \n+ * if stream_len > 1:\n+ * primitive_decode(stream+1, stream_len-1, result+2, &enc_len) # <<<<<<<<<<<<<<\n+ * result_len[0] += enc_len\n+ * \n+ *\/\n+ __pyx_f_8fastsnmp_11snmp_parser_primitive_decode((__pyx_v_stream + 1), (__pyx_v_stream_len - 1), (__pyx_v_result + 2), (&__pyx_v_enc_len));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":167\n+ * if stream_len > 1:\n+ * primitive_decode(stream+1, stream_len-1, result+2, &enc_len)\n+ * result_len[0] += enc_len # <<<<<<<<<<<<<<\n+ * \n+ * return 0\n+ *\/\n+ __pyx_t_3 = 0;\n+ (__pyx_v_result_len[__pyx_t_3]) = ((__pyx_v_result_len[__pyx_t_3]) + __pyx_v_enc_len);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":165\n+ * result_len[0] = 2\n+ * \n+ * if stream_len > 1: # <<<<<<<<<<<<<<\n+ * primitive_decode(stream+1, stream_len-1, result+2, &enc_len)\n+ * result_len[0] += enc_len\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":169\n+ * result_len[0] += enc_len\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * @cython.cdivision(True)\n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":155\n+ * return ret\n+ * \n+ * cdef inline int objectid_decode_c(char *stream, size_t stream_len, uint64_t *result, size_t *result_len): # <<<<<<<<<<<<<<\n+ * cdef object value\n+ * cdef SID12_ti *sid12_ptr\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.objectid_decode_c\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":172\n+ * \n+ * @cython.cdivision(True)\n+ * cdef inline int primitive_encode(uint64_t *value, char *result_ptr) except -1: # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Primitive encoding\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_primitive_encode(uint64_t *__pyx_v_value, char *__pyx_v_result_ptr) {\n+ unsigned int __pyx_v_size;\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"primitive_encode\", 0);\n+ __Pyx_TraceCall(\"primitive_encode\", __pyx_f[0], 172, 0, __PYX_ERR(0, 172, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":176\n+ * Primitive encoding\n+ * \"\"\"\n+ * cdef unsigned int size = 0 # <<<<<<<<<<<<<<\n+ * \n+ * if value[0] < <uint64_t>0x80: # 7 bit\n+ *\/\n+ __pyx_v_size = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":178\n+ * cdef unsigned int size = 0\n+ * \n+ * if value[0] < <uint64_t>0x80: # 7 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0]\n+ * size = 1\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x80)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":179\n+ * \n+ * if value[0] < <uint64_t>0x80: # 7 bit\n+ * result_ptr[0] = value[0] # <<<<<<<<<<<<<<\n+ * size = 1\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit\n+ *\/\n+ (__pyx_v_result_ptr[0]) = (__pyx_v_value[0]);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":180\n+ * if value[0] < <uint64_t>0x80: # 7 bit\n+ * result_ptr[0] = value[0]\n+ * size = 1 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit\n+ * result_ptr[0] = value[0] >> 7 | 0x80\n+ *\/\n+ __pyx_v_size = 1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":178\n+ * cdef unsigned int size = 0\n+ * \n+ * if value[0] < <uint64_t>0x80: # 7 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0]\n+ * size = 1\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":181\n+ * result_ptr[0] = value[0]\n+ * size = 1\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 7 | 0x80\n+ * result_ptr[1] = value[0] & 0x7f\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x4000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":182\n+ * size = 1\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit\n+ * result_ptr[0] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] & 0x7f\n+ * size = 2\n+ *\/\n+ (__pyx_v_result_ptr[0]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":183\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit\n+ * result_ptr[0] = value[0] >> 7 | 0x80\n+ * result_ptr[1] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 2\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":184\n+ * result_ptr[0] = value[0] >> 7 | 0x80\n+ * result_ptr[1] = value[0] & 0x7f\n+ * size = 2 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":181\n+ * result_ptr[0] = value[0]\n+ * size = 1\n+ * elif value[0] < <uint64_t>0x4000: # 14 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 7 | 0x80\n+ * result_ptr[1] = value[0] & 0x7f\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":185\n+ * result_ptr[1] = value[0] & 0x7f\n+ * size = 2\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 7 | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x200000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":186\n+ * size = 2\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 7 | 0x80\n+ * result_ptr[2] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":187\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] & 0x7f\n+ * size = 3\n+ *\/\n+ (__pyx_v_result_ptr[1]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":188\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 7 | 0x80\n+ * result_ptr[2] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 3\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit\n+ *\/\n+ (__pyx_v_result_ptr[2]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":189\n+ * result_ptr[1] = value[0] >> 7 | 0x80\n+ * result_ptr[2] = value[0] & 0x7f\n+ * size = 3 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 3;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":185\n+ * result_ptr[1] = value[0] & 0x7f\n+ * size = 2\n+ * elif value[0] < <uint64_t>0x200000: # 21 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 7 | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":190\n+ * result_ptr[2] = value[0] & 0x7f\n+ * size = 3\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x10000000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":191\n+ * size = 3\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 7 | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 21) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":192\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] >> 7 | 0x80\n+ * result_ptr[3] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":193\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[3] = value[0] & 0x7f\n+ * size = 4\n+ *\/\n+ (__pyx_v_result_ptr[2]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":194\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 7 | 0x80\n+ * result_ptr[3] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 4\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit\n+ *\/\n+ (__pyx_v_result_ptr[3]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":195\n+ * result_ptr[2] = value[0] >> 7 | 0x80\n+ * result_ptr[3] = value[0] & 0x7f\n+ * size = 4 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 4;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":190\n+ * result_ptr[2] = value[0] & 0x7f\n+ * size = 3\n+ * elif value[0] < <uint64_t>0x10000000: # 28 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":196\n+ * result_ptr[3] = value[0] & 0x7f\n+ * size = 4\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x800000000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":197\n+ * size = 4\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 28) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":198\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 7 | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((((__pyx_v_value[0]) >> 21) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":199\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[3] = value[0] >> 7 | 0x80\n+ * result_ptr[4] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[2]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":200\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[4] = value[0] & 0x7f\n+ * size = 5\n+ *\/\n+ (__pyx_v_result_ptr[3]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":201\n+ * result_ptr[2] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 7 | 0x80\n+ * result_ptr[4] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 5\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit\n+ *\/\n+ (__pyx_v_result_ptr[4]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":202\n+ * result_ptr[3] = value[0] >> 7 | 0x80\n+ * result_ptr[4] = value[0] & 0x7f\n+ * size = 5 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 5;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":196\n+ * result_ptr[3] = value[0] & 0x7f\n+ * size = 4\n+ * elif value[0] < <uint64_t>0x800000000: # 35 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":203\n+ * result_ptr[4] = value[0] & 0x7f\n+ * size = 5\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x40000000000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":204\n+ * size = 5\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 35) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":205\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((((__pyx_v_value[0]) >> 28) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":206\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 21 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[3] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 7 | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[2]) = ((((__pyx_v_value[0]) >> 21) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":207\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[4] = value[0] >> 7 | 0x80\n+ * result_ptr[5] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[3]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":208\n+ * result_ptr[2] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[5] = value[0] & 0x7f\n+ * size = 6\n+ *\/\n+ (__pyx_v_result_ptr[4]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":209\n+ * result_ptr[3] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 7 | 0x80\n+ * result_ptr[5] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 6\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit\n+ *\/\n+ (__pyx_v_result_ptr[5]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":210\n+ * result_ptr[4] = value[0] >> 7 | 0x80\n+ * result_ptr[5] = value[0] & 0x7f\n+ * size = 6 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 6;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":203\n+ * result_ptr[4] = value[0] & 0x7f\n+ * size = 5\n+ * elif value[0] < <uint64_t>0x40000000000: # 42 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 28 & 0x7f | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":211\n+ * result_ptr[5] = value[0] & 0x7f\n+ * size = 6\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x2000000000000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":212\n+ * size = 6\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 28 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 42) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":213\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((((__pyx_v_value[0]) >> 35) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":214\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 28 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[3] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[2]) = ((((__pyx_v_value[0]) >> 28) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":215\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 21 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[4] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 7 | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[3]) = ((((__pyx_v_value[0]) >> 21) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":216\n+ * result_ptr[2] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[5] = value[0] >> 7 | 0x80\n+ * result_ptr[6] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[4]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":217\n+ * result_ptr[3] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[6] = value[0] & 0x7f\n+ * size = 7\n+ *\/\n+ (__pyx_v_result_ptr[5]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":218\n+ * result_ptr[4] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 7 | 0x80\n+ * result_ptr[6] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 7\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit\n+ *\/\n+ (__pyx_v_result_ptr[6]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":219\n+ * result_ptr[5] = value[0] >> 7 | 0x80\n+ * result_ptr[6] = value[0] & 0x7f\n+ * size = 7 # <<<<<<<<<<<<<<\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80\n+ *\/\n+ __pyx_v_size = 7;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":211\n+ * result_ptr[5] = value[0] & 0x7f\n+ * size = 6\n+ * elif value[0] < <uint64_t>0x2000000000000: # 49 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 35 & 0x7f | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":220\n+ * result_ptr[6] = value[0] & 0x7f\n+ * size = 7\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80\n+ *\/\n+ __pyx_t_1 = (((__pyx_v_value[0]) < ((uint64_t)0x100000000000000)) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":221\n+ * size = 7\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 35 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[0]) = ((((__pyx_v_value[0]) >> 49) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":222\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[2] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 28 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[1]) = ((((__pyx_v_value[0]) >> 42) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":223\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 35 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[3] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 21 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[2]) = ((((__pyx_v_value[0]) >> 35) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":224\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80\n+ * result_ptr[2] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 28 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[4] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 14 & 0x7f | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[3]) = ((((__pyx_v_value[0]) >> 28) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":225\n+ * result_ptr[2] = value[0] >> 35 & 0x7f | 0x80\n+ * result_ptr[3] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 21 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[5] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[6] = value[0] >> 7 | 0x80\n+ *\/\n+ (__pyx_v_result_ptr[4]) = ((((__pyx_v_value[0]) >> 21) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":226\n+ * result_ptr[3] = value[0] >> 28 & 0x7f | 0x80\n+ * result_ptr[4] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 14 & 0x7f | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[6] = value[0] >> 7 | 0x80\n+ * result_ptr[7] = value[0] & 0x7f\n+ *\/\n+ (__pyx_v_result_ptr[5]) = ((((__pyx_v_value[0]) >> 14) & 0x7f) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":227\n+ * result_ptr[4] = value[0] >> 21 & 0x7f | 0x80\n+ * result_ptr[5] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[6] = value[0] >> 7 | 0x80 # <<<<<<<<<<<<<<\n+ * result_ptr[7] = value[0] & 0x7f\n+ * size = 7\n+ *\/\n+ (__pyx_v_result_ptr[6]) = (((__pyx_v_value[0]) >> 7) | 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":228\n+ * result_ptr[5] = value[0] >> 14 & 0x7f | 0x80\n+ * result_ptr[6] = value[0] >> 7 | 0x80\n+ * result_ptr[7] = value[0] & 0x7f # <<<<<<<<<<<<<<\n+ * size = 7\n+ * else:\n+ *\/\n+ (__pyx_v_result_ptr[7]) = ((__pyx_v_value[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":229\n+ * result_ptr[6] = value[0] >> 7 | 0x80\n+ * result_ptr[7] = value[0] & 0x7f\n+ * size = 7 # <<<<<<<<<<<<<<\n+ * else:\n+ * # TODO: implement iterative calculation\n+ *\/\n+ __pyx_v_size = 7;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":220\n+ * result_ptr[6] = value[0] & 0x7f\n+ * size = 7\n+ * elif value[0] < <uint64_t>0x100000000000000: # 56 bit # <<<<<<<<<<<<<<\n+ * result_ptr[0] = value[0] >> 49 & 0x7f | 0x80\n+ * result_ptr[1] = value[0] >> 42 & 0x7f | 0x80\n+ *\/\n+ goto __pyx_L3;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":232\n+ * else:\n+ * # TODO: implement iterative calculation\n+ * return -1 # <<<<<<<<<<<<<<\n+ * \n+ * return size\n+ *\/\n+ \/*else*\/ {\n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+ }\n+ __pyx_L3:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":234\n+ * return -1\n+ * \n+ * return size # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = __pyx_v_size;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":172\n+ * \n+ * @cython.cdivision(True)\n+ * cdef inline int primitive_encode(uint64_t *value, char *result_ptr) except -1: # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Primitive encoding\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.primitive_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":238\n+ * \n+ * @cython.cdivision(True)\n+ * cdef inline int objectid_encode_array(uint64_t *subids, uint32_t subids_len, # <<<<<<<<<<<<<<\n+ * char *result, size_t *object_len):\n+ * cdef uint32_t clen\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_objectid_encode_array(uint64_t *__pyx_v_subids, uint32_t __pyx_v_subids_len, char *__pyx_v_result, size_t *__pyx_v_object_len) {\n+ uint64_t __pyx_v_subid;\n+ size_t __pyx_v_i;\n+ int __pyx_v_retval;\n+ size_t __pyx_v_sid_len;\n+ char *__pyx_v_result_ptr;\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ uint32_t __pyx_t_3;\n+ size_t __pyx_t_4;\n+ int __pyx_t_5;\n+ long __pyx_t_6;\n+ __Pyx_RefNannySetupContext(\"objectid_encode_array\", 0);\n+ __Pyx_TraceCall(\"objectid_encode_array\", __pyx_f[0], 238, 0, __PYX_ERR(0, 238, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":243\n+ * cdef uint64_t subid\n+ * cdef size_t i\n+ * cdef int retval = 0 # <<<<<<<<<<<<<<\n+ * cdef size_t sid_len = 0\n+ * cdef char *result_ptr\n+ *\/\n+ __pyx_v_retval = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":244\n+ * cdef size_t i\n+ * cdef int retval = 0\n+ * cdef size_t sid_len = 0 # <<<<<<<<<<<<<<\n+ * cdef char *result_ptr\n+ * \n+ *\/\n+ __pyx_v_sid_len = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":247\n+ * cdef char *result_ptr\n+ * \n+ * if subids[0] == 2 and subids[1] > 39: # <<<<<<<<<<<<<<\n+ * return -3 # long SID1 is not supported\n+ * \n+ *\/\n+ __pyx_t_2 = (((__pyx_v_subids[0]) == 2) != 0);\n+ if (__pyx_t_2) {\n+ } else {\n+ __pyx_t_1 = __pyx_t_2;\n+ goto __pyx_L4_bool_binop_done;\n+ }\n+ __pyx_t_2 = (((__pyx_v_subids[1]) > 39) != 0);\n+ __pyx_t_1 = __pyx_t_2;\n+ __pyx_L4_bool_binop_done:;\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":248\n+ * \n+ * if subids[0] == 2 and subids[1] > 39:\n+ * return -3 # long SID1 is not supported # <<<<<<<<<<<<<<\n+ * \n+ * if subids[0] > 2:\n+ *\/\n+ __pyx_r = -3;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":247\n+ * cdef char *result_ptr\n+ * \n+ * if subids[0] == 2 and subids[1] > 39: # <<<<<<<<<<<<<<\n+ * return -3 # long SID1 is not supported\n+ * \n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":250\n+ * return -3 # long SID1 is not supported\n+ * \n+ * if subids[0] > 2: # <<<<<<<<<<<<<<\n+ * return -1 # wrong SID1\n+ * \n+ *\/\n+ __pyx_t_1 = (((__pyx_v_subids[0]) > 2) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":251\n+ * \n+ * if subids[0] > 2:\n+ * return -1 # wrong SID1 # <<<<<<<<<<<<<<\n+ * \n+ * if subids[1] > 39:\n+ *\/\n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":250\n+ * return -3 # long SID1 is not supported\n+ * \n+ * if subids[0] > 2: # <<<<<<<<<<<<<<\n+ * return -1 # wrong SID1\n+ * \n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":253\n+ * return -1 # wrong SID1\n+ * \n+ * if subids[1] > 39: # <<<<<<<<<<<<<<\n+ * return -2 # wrong SID2\n+ * \n+ *\/\n+ __pyx_t_1 = (((__pyx_v_subids[1]) > 39) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":254\n+ * \n+ * if subids[1] > 39:\n+ * return -2 # wrong SID2 # <<<<<<<<<<<<<<\n+ * \n+ * result[0] = subids[0]*40 + subids[1]\n+ *\/\n+ __pyx_r = -2;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":253\n+ * return -1 # wrong SID1\n+ * \n+ * if subids[1] > 39: # <<<<<<<<<<<<<<\n+ * return -2 # wrong SID2\n+ * \n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":256\n+ * return -2 # wrong SID2\n+ * \n+ * result[0] = subids[0]*40 + subids[1] # <<<<<<<<<<<<<<\n+ * object_len[0] = 1\n+ * result_ptr = result+1\n+ *\/\n+ (__pyx_v_result[0]) = (((__pyx_v_subids[0]) * 40) + (__pyx_v_subids[1]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":257\n+ * \n+ * result[0] = subids[0]*40 + subids[1]\n+ * object_len[0] = 1 # <<<<<<<<<<<<<<\n+ * result_ptr = result+1\n+ * \n+ *\/\n+ (__pyx_v_object_len[0]) = 1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":258\n+ * result[0] = subids[0]*40 + subids[1]\n+ * object_len[0] = 1\n+ * result_ptr = result+1 # <<<<<<<<<<<<<<\n+ * \n+ * for i in range(2, subids_len):\n+ *\/\n+ __pyx_v_result_ptr = (__pyx_v_result + 1);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":260\n+ * result_ptr = result+1\n+ * \n+ * for i in range(2, subids_len): # <<<<<<<<<<<<<<\n+ * subid = subids[i]\n+ * sid_len = primitive_encode(&subid, result_ptr)\n+ *\/\n+ __pyx_t_3 = __pyx_v_subids_len;\n+ for (__pyx_t_4 = 2; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":261\n+ * \n+ * for i in range(2, subids_len):\n+ * subid = subids[i] # <<<<<<<<<<<<<<\n+ * sid_len = primitive_encode(&subid, result_ptr)\n+ * object_len[0] += sid_len\n+ *\/\n+ __pyx_v_subid = (__pyx_v_subids[__pyx_v_i]);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":262\n+ * for i in range(2, subids_len):\n+ * subid = subids[i]\n+ * sid_len = primitive_encode(&subid, result_ptr) # <<<<<<<<<<<<<<\n+ * object_len[0] += sid_len\n+ * result_ptr = result_ptr+sid_len\n+ *\/\n+ __pyx_t_5 = __pyx_f_8fastsnmp_11snmp_parser_primitive_encode((&__pyx_v_subid), __pyx_v_result_ptr); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 262, __pyx_L1_error)\n+ __pyx_v_sid_len = __pyx_t_5;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":263\n+ * subid = subids[i]\n+ * sid_len = primitive_encode(&subid, result_ptr)\n+ * object_len[0] += sid_len # <<<<<<<<<<<<<<\n+ * result_ptr = result_ptr+sid_len\n+ * return retval\n+ *\/\n+ __pyx_t_6 = 0;\n+ (__pyx_v_object_len[__pyx_t_6]) = ((__pyx_v_object_len[__pyx_t_6]) + __pyx_v_sid_len);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":264\n+ * sid_len = primitive_encode(&subid, result_ptr)\n+ * object_len[0] += sid_len\n+ * result_ptr = result_ptr+sid_len # <<<<<<<<<<<<<<\n+ * return retval\n+ * \n+ *\/\n+ __pyx_v_result_ptr = (__pyx_v_result_ptr + __pyx_v_sid_len);\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":265\n+ * object_len[0] += sid_len\n+ * result_ptr = result_ptr+sid_len\n+ * return retval # <<<<<<<<<<<<<<\n+ * \n+ * def objectid_encode(oid):\n+ *\/\n+ __pyx_r = __pyx_v_retval;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":238\n+ * \n+ * @cython.cdivision(True)\n+ * cdef inline int objectid_encode_array(uint64_t *subids, uint32_t subids_len, # <<<<<<<<<<<<<<\n+ * char *result, size_t *object_len):\n+ * cdef uint32_t clen\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.objectid_encode_array\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":267\n+ * return retval\n+ * \n+ * def objectid_encode(oid): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * encode an ObjectID into stream\n *\/\n \n \/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_39lambda1(PyObject *__pyx_self, PyObject *__pyx_v_x); \/*proto*\/\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_39lambda1 = {\"lambda1\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_39lambda1, METH_O, 0};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_39lambda1(PyObject *__pyx_self, PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_3objectid_encode(PyObject *__pyx_self, PyObject *__pyx_v_oid); \/*proto*\/\n+static char __pyx_doc_8fastsnmp_11snmp_parser_2objectid_encode[] = \"\\n encode an ObjectID into stream\\n X.690, chapter 8.19\\n :param oid: OID\\n :type oid: str\\n :returns: stream\\n :rtype: bytearray\\n \";\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_3objectid_encode = {\"objectid_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_3objectid_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_2objectid_encode};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_3objectid_encode(PyObject *__pyx_self, PyObject *__pyx_v_oid) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda1 (wrapper)\", 0);\n- __pyx_r = __pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda1(__pyx_self, ((PyObject *)__pyx_v_x));\n+ __Pyx_RefNannySetupContext(\"objectid_encode (wrapper)\", 0);\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_2objectid_encode(__pyx_self, ((PyObject *)__pyx_v_oid));\n \n \/* function exit code *\/\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda1(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_2objectid_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_oid) {\n+ uint64_t __pyx_v_idlist[0x80];\n+ size_t __pyx_v_pos;\n+ size_t __pyx_v_object_len;\n+ char __pyx_v_result[0x100];\n+ PyObject *__pyx_v_subid = 0;\n+ int __pyx_v_ret;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda1\", 0);\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ Py_ssize_t __pyx_t_3;\n+ PyObject *(*__pyx_t_4)(PyObject *);\n+ uint64_t __pyx_t_5;\n+ int __pyx_t_6;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__3)\n+ __Pyx_RefNannySetupContext(\"objectid_encode\", 0);\n+ __Pyx_TraceCall(\"objectid_encode\", __pyx_f[0], 267, 0, __PYX_ERR(0, 267, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":279\n+ * cdef uint64_t idlist[128]\n+ * cdef list subidlist\n+ * cdef size_t pos = 0 # <<<<<<<<<<<<<<\n+ * cdef size_t object_len = 0\n+ * cdef char result[256]\n+ *\/\n+ __pyx_v_pos = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":280\n+ * cdef list subidlist\n+ * cdef size_t pos = 0\n+ * cdef size_t object_len = 0 # <<<<<<<<<<<<<<\n+ * cdef char result[256]\n+ * cdef str subid\n+ *\/\n+ __pyx_v_object_len = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":283\n+ * cdef char result[256]\n+ * cdef str subid\n+ * for subid in oid.strip('.').split('.'): # <<<<<<<<<<<<<<\n+ * idlist[pos] = int(subid)\n+ * pos += 1\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_oid, __pyx_n_s_strip); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_split); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (likely(PyList_CheckExact(__pyx_t_2)) || PyTuple_CheckExact(__pyx_t_2)) {\n+ __pyx_t_1 = __pyx_t_2; __Pyx_INCREF(__pyx_t_1); __pyx_t_3 = 0;\n+ __pyx_t_4 = NULL;\n+ } else {\n+ __pyx_t_3 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ }\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ for (;;) {\n+ if (likely(!__pyx_t_4)) {\n+ if (likely(PyList_CheckExact(__pyx_t_1))) {\n+ if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_1)) break;\n+ #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n+ __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ #else\n+ __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ #endif\n+ } else {\n+ if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_1)) break;\n+ #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n+ __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ #else\n+ __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ #endif\n+ }\n+ } else {\n+ __pyx_t_2 = __pyx_t_4(__pyx_t_1);\n+ if (unlikely(!__pyx_t_2)) {\n+ PyObject* exc_type = PyErr_Occurred();\n+ if (exc_type) {\n+ if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();\n+ else __PYX_ERR(0, 283, __pyx_L1_error)\n+ }\n+ break;\n+ }\n+ __Pyx_GOTREF(__pyx_t_2);\n+ }\n+ if (!(likely(PyUnicode_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"unicode\", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 283, __pyx_L1_error)\n+ __Pyx_XDECREF_SET(__pyx_v_subid, ((PyObject*)__pyx_t_2));\n+ __pyx_t_2 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":284\n+ * cdef str subid\n+ * for subid in oid.strip('.').split('.'):\n+ * idlist[pos] = int(subid) # <<<<<<<<<<<<<<\n+ * pos += 1\n+ * ret = objectid_encode_array(idlist, pos, result, &object_len)\n+ *\/\n+ __pyx_t_2 = __Pyx_PyNumber_Int(__pyx_v_subid); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 284, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_5 = __Pyx_PyInt_As_uint64_t(__pyx_t_2); if (unlikely((__pyx_t_5 == ((uint64_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 284, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ (__pyx_v_idlist[__pyx_v_pos]) = __pyx_t_5;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":285\n+ * for subid in oid.strip('.').split('.'):\n+ * idlist[pos] = int(subid)\n+ * pos += 1 # <<<<<<<<<<<<<<\n+ * ret = objectid_encode_array(idlist, pos, result, &object_len)\n+ * \n+ *\/\n+ __pyx_v_pos = (__pyx_v_pos + 1);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":283\n+ * cdef char result[256]\n+ * cdef str subid\n+ * for subid in oid.strip('.').split('.'): # <<<<<<<<<<<<<<\n+ * idlist[pos] = int(subid)\n+ * pos += 1\n+ *\/\n+ }\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":286\n+ * idlist[pos] = int(subid)\n+ * pos += 1\n+ * ret = objectid_encode_array(idlist, pos, result, &object_len) # <<<<<<<<<<<<<<\n+ * \n+ * if ret != 0:\n+ *\/\n+ __pyx_v_ret = __pyx_f_8fastsnmp_11snmp_parser_objectid_encode_array(__pyx_v_idlist, __pyx_v_pos, __pyx_v_result, (&__pyx_v_object_len));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":288\n+ * ret = objectid_encode_array(idlist, pos, result, &object_len)\n+ * \n+ * if ret != 0: # <<<<<<<<<<<<<<\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\")\n+ *\/\n+ __pyx_t_6 = ((__pyx_v_ret != 0) != 0);\n+ if (__pyx_t_6) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":289\n+ * \n+ * if ret != 0:\n+ * if ret == -1: # <<<<<<<<<<<<<<\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2:\n+ *\/\n+ switch (__pyx_v_ret) {\n+ case -1L:\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":290\n+ * if ret != 0:\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\") # <<<<<<<<<<<<<<\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\")\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 290, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __PYX_ERR(0, 290, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":289\n+ * \n+ * if ret != 0:\n+ * if ret == -1: # <<<<<<<<<<<<<<\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2:\n+ *\/\n+ break;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":291\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2: # <<<<<<<<<<<<<<\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3:\n+ *\/\n+ case -2L:\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":292\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\") # <<<<<<<<<<<<<<\n+ * elif ret == -3:\n+ * raise Exception(\"long SID1 is not supported\")\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 292, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __PYX_ERR(0, 292, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":291\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2: # <<<<<<<<<<<<<<\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3:\n+ *\/\n+ break;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":293\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3: # <<<<<<<<<<<<<<\n+ * raise Exception(\"long SID1 is not supported\")\n+ * \n+ *\/\n+ case -3L:\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":294\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3:\n+ * raise Exception(\"long SID1 is not supported\") # <<<<<<<<<<<<<<\n+ * \n+ * return <bytes>result[:object_len]\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 294, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __PYX_ERR(0, 294, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":293\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3: # <<<<<<<<<<<<<<\n+ * raise Exception(\"long SID1 is not supported\")\n+ * \n+ *\/\n+ break;\n+ default: break;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":288\n+ * ret = objectid_encode_array(idlist, pos, result, &object_len)\n+ * \n+ * if ret != 0: # <<<<<<<<<<<<<<\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\")\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":296\n+ * raise Exception(\"long SID1 is not supported\")\n+ * \n+ * return <bytes>result[:object_len] # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1):\n+ *\/\n __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(Py_None);\n- __pyx_r = Py_None;\n+ __pyx_t_1 = __Pyx_PyBytes_FromStringAndSize(((const char*)__pyx_v_result) + 0, __pyx_v_object_len - 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 296, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(((PyObject*)__pyx_t_1));\n+ __pyx_r = __pyx_t_1;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n goto __pyx_L0;\n \n+ \/* \"fastsnmp\/snmp_parser.pyx\":267\n+ * return retval\n+ * \n+ * def objectid_encode(oid): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * encode an ObjectID into stream\n+ *\/\n+\n \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n __pyx_L0:;\n+ __Pyx_XDECREF(__pyx_v_subid);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":272\n- * 0xa2: pdu_response_decode,\n- * 0x80: lambda x: None, # NoSuchObject_TAG\n- * 0x81: lambda x: None, # NoSuchInstance_TAG # <<<<<<<<<<<<<<\n- * 0x82: lambda x: None, # EndOfMibView_TAG\n- * }\n+\/* \"fastsnmp\/snmp_parser.pyx\":298\n+ * return <bytes>result[:object_len]\n+ * \n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1): # <<<<<<<<<<<<<<\n+ * cdef object ret\n+ * if auto_str:\n+ *\/\n+\n+static CYTHON_INLINE PyObject *__pyx_f_8fastsnmp_11snmp_parser_c_octetstring_decode(char *__pyx_v_data, size_t __pyx_v_data_len, struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode *__pyx_optional_args) {\n+ int __pyx_v_auto_str = ((int)1);\n+ size_t __pyx_v_i;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ size_t __pyx_t_2;\n+ size_t __pyx_t_3;\n+ PyObject *__pyx_t_4 = NULL;\n+ __Pyx_RefNannySetupContext(\"c_octetstring_decode\", 0);\n+ __Pyx_TraceCall(\"c_octetstring_decode\", __pyx_f[0], 298, 0, __PYX_ERR(0, 298, __pyx_L1_error));\n+ if (__pyx_optional_args) {\n+ if (__pyx_optional_args->__pyx_n > 0) {\n+ __pyx_v_auto_str = __pyx_optional_args->auto_str;\n+ }\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":300\n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1):\n+ * cdef object ret\n+ * if auto_str: # <<<<<<<<<<<<<<\n+ * for i in range(data_len):\n+ * if <uint8_t>data[i] > 127:\n+ *\/\n+ __pyx_t_1 = (__pyx_v_auto_str != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":301\n+ * cdef object ret\n+ * if auto_str:\n+ * for i in range(data_len): # <<<<<<<<<<<<<<\n+ * if <uint8_t>data[i] > 127:\n+ * return <bytes> data[:data_len]\n+ *\/\n+ __pyx_t_2 = __pyx_v_data_len;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_i = __pyx_t_3;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":302\n+ * if auto_str:\n+ * for i in range(data_len):\n+ * if <uint8_t>data[i] > 127: # <<<<<<<<<<<<<<\n+ * return <bytes> data[:data_len]\n+ * return data[:data_len]\n+ *\/\n+ __pyx_t_1 = ((((uint8_t)(__pyx_v_data[__pyx_v_i])) > 0x7F) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":303\n+ * for i in range(data_len):\n+ * if <uint8_t>data[i] > 127:\n+ * return <bytes> data[:data_len] # <<<<<<<<<<<<<<\n+ * return data[:data_len]\n+ * else:\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_4 = __Pyx_PyBytes_FromStringAndSize(__pyx_v_data + 0, __pyx_v_data_len - 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 303, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_INCREF(((PyObject*)__pyx_t_4));\n+ __pyx_r = __pyx_t_4;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":302\n+ * if auto_str:\n+ * for i in range(data_len):\n+ * if <uint8_t>data[i] > 127: # <<<<<<<<<<<<<<\n+ * return <bytes> data[:data_len]\n+ * return data[:data_len]\n+ *\/\n+ }\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":304\n+ * if <uint8_t>data[i] > 127:\n+ * return <bytes> data[:data_len]\n+ * return data[:data_len] # <<<<<<<<<<<<<<\n+ * else:\n+ * return <bytes> data[:data_len]\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_4 = __Pyx_PyStr_FromStringAndSize(__pyx_v_data + 0, __pyx_v_data_len - 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 304, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_r = __pyx_t_4;\n+ __pyx_t_4 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":300\n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1):\n+ * cdef object ret\n+ * if auto_str: # <<<<<<<<<<<<<<\n+ * for i in range(data_len):\n+ * if <uint8_t>data[i] > 127:\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":306\n+ * return data[:data_len]\n+ * else:\n+ * return <bytes> data[:data_len] # <<<<<<<<<<<<<<\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1):\n+ *\/\n+ \/*else*\/ {\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_4 = __Pyx_PyBytes_FromStringAndSize(__pyx_v_data + 0, __pyx_v_data_len - 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 306, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_INCREF(((PyObject*)__pyx_t_4));\n+ __pyx_r = __pyx_t_4;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ goto __pyx_L0;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":298\n+ * return <bytes>result[:object_len]\n+ * \n+ * cdef inline object c_octetstring_decode(char *data, size_t data_len, bint auto_str=1): # <<<<<<<<<<<<<<\n+ * cdef object ret\n+ * if auto_str:\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.c_octetstring_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":308\n+ * return <bytes> data[:data_len]\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1): # <<<<<<<<<<<<<<\n+ * return c_octetstring_decode(stream, len(stream), auto_str)\n+ * \n *\/\n \n \/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_40lambda2(PyObject *__pyx_self, PyObject *__pyx_v_x); \/*proto*\/\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_40lambda2 = {\"lambda2\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_40lambda2, METH_O, 0};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_40lambda2(PyObject *__pyx_self, PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_5octetstring_decode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_5octetstring_decode = {\"octetstring_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_5octetstring_decode, METH_VARARGS|METH_KEYWORDS, 0};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_5octetstring_decode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_stream = 0;\n+ int __pyx_v_auto_str;\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda2 (wrapper)\", 0);\n- __pyx_r = __pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda2(__pyx_self, ((PyObject *)__pyx_v_x));\n+ __Pyx_RefNannySetupContext(\"octetstring_decode (wrapper)\", 0);\n+ {\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_stream,&__pyx_n_s_auto_str,0};\n+ PyObject* values[2] = {0,0};\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args;\n+ const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);\n+ switch (pos_args) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ kw_args = PyDict_Size(__pyx_kwds);\n+ switch (pos_args) {\n+ case 0:\n+ if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_stream)) != 0)) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ if (kw_args > 0) {\n+ PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_auto_str);\n+ if (value) { values[1] = value; kw_args--; }\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"octetstring_decode\") < 0)) __PYX_ERR(0, 308, __pyx_L3_error)\n+ }\n+ } else {\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ }\n+ __pyx_v_stream = ((PyObject*)values[0]);\n+ if (values[1]) {\n+ __pyx_v_auto_str = __Pyx_PyInt_As_int(values[1]); if (unlikely((__pyx_v_auto_str == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 308, __pyx_L3_error)\n+ } else {\n+ __pyx_v_auto_str = ((int)1);\n+ }\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"octetstring_decode\", 0, 1, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 308, __pyx_L3_error)\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.octetstring_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_RefNannyFinishContext();\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_stream), (&PyBytes_Type), 0, \"stream\", 1))) __PYX_ERR(0, 308, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_4octetstring_decode(__pyx_self, __pyx_v_stream, __pyx_v_auto_str);\n+\n+ \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_4octetstring_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream, int __pyx_v_auto_str) {\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ char *__pyx_t_1;\n+ Py_ssize_t __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode __pyx_t_4;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__10)\n+ __Pyx_RefNannySetupContext(\"octetstring_decode\", 0);\n+ __Pyx_TraceCall(\"octetstring_decode\", __pyx_f[0], 308, 0, __PYX_ERR(0, 308, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":309\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1):\n+ * return c_octetstring_decode(stream, len(stream), auto_str) # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 309, __pyx_L1_error)\n+ __pyx_t_2 = PyBytes_GET_SIZE(__pyx_v_stream); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 309, __pyx_L1_error)\n+ __pyx_t_4.__pyx_n = 1;\n+ __pyx_t_4.auto_str = __pyx_v_auto_str;\n+ __pyx_t_3 = __pyx_f_8fastsnmp_11snmp_parser_c_octetstring_decode(__pyx_t_1, __pyx_t_2, &__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 309, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_r = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":308\n+ * return <bytes> data[:data_len]\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1): # <<<<<<<<<<<<<<\n+ * return c_octetstring_decode(stream, len(stream), auto_str)\n+ * \n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.octetstring_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":312\n+ * \n+ * \n+ * def octetstring_encode(string): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * encode an octetstring into string\n+ *\/\n+\n+\/* Python wrapper *\/\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_encode(PyObject *__pyx_self, PyObject *__pyx_v_string); \/*proto*\/\n+static char __pyx_doc_8fastsnmp_11snmp_parser_6octetstring_encode[] = \"\\n encode an octetstring into string\\n\\n :param string: string\\n :type string: string\\n :returns: string\\n :rtype: bytes\\n \";\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_7octetstring_encode = {\"octetstring_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_6octetstring_encode};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_encode(PyObject *__pyx_self, PyObject *__pyx_v_string) {\n+ PyObject *__pyx_r = 0;\n+ __Pyx_RefNannyDeclarations\n+ __Pyx_RefNannySetupContext(\"octetstring_encode (wrapper)\", 0);\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_6octetstring_encode(__pyx_self, ((PyObject *)__pyx_v_string));\n \n \/* function exit code *\/\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda2(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x) {\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_6octetstring_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_string) {\n PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda2\", 0);\n- __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(Py_None);\n- __pyx_r = Py_None;\n- goto __pyx_L0;\n-\n- \/* function exit code *\/\n- __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":273\n- * 0x80: lambda x: None, # NoSuchObject_TAG\n- * 0x81: lambda x: None, # NoSuchInstance_TAG\n- * 0x82: lambda x: None, # EndOfMibView_TAG # <<<<<<<<<<<<<<\n- * }\n- * \n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_41lambda3(PyObject *__pyx_self, PyObject *__pyx_v_x); \/*proto*\/\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_41lambda3 = {\"lambda3\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_41lambda3, METH_O, 0};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_41lambda3(PyObject *__pyx_self, PyObject *__pyx_v_x) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda3 (wrapper)\", 0);\n- __pyx_r = __pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda3(__pyx_self, ((PyObject *)__pyx_v_x));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_lambda_funcdef_8fastsnmp_11snmp_parser_lambda3(CYTHON_UNUSED PyObject *__pyx_self, CYTHON_UNUSED PyObject *__pyx_v_x) {\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"lambda3\", 0);\n- __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(Py_None);\n- __pyx_r = Py_None;\n- goto __pyx_L0;\n-\n- \/* function exit code *\/\n- __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":74\n- * \n- * \n- * def pdu_response_decode(stream): # <<<<<<<<<<<<<<\n- * return sequence_decode(stream)\n- * \n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_1pdu_response_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_pdu_response_decode[] = \"pdu_response_decode(stream)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_1pdu_response_decode = {\"pdu_response_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_1pdu_response_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_pdu_response_decode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_1pdu_response_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"pdu_response_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_pdu_response_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_pdu_response_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- __Pyx_RefNannySetupContext(\"pdu_response_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":75\n- * \n- * def pdu_response_decode(stream):\n- * return sequence_decode(stream) # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_sequence_decode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) {\n- __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2);\n- if (likely(__pyx_t_3)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_2, function);\n- }\n- }\n- if (!__pyx_t_3) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_stream); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_2)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_4, 0+1, __pyx_v_stream);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 75, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_r = __pyx_t_1;\n- __pyx_t_1 = 0;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":74\n- * \n- * \n- * def pdu_response_decode(stream): # <<<<<<<<<<<<<<\n- * return sequence_decode(stream)\n- * \n- *\/\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.pdu_response_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":78\n- * \n- * \n- * def objectid_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"Decode a stream into an ObjectID.\n- * \n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_3objectid_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_2objectid_decode[] = \"objectid_decode(stream)\\nDecode a stream into an ObjectID.\\n\\n :param stream: stream with OID\\n :type stream: bytes\\n :returns: OID\\n :rtype: str\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_3objectid_decode = {\"objectid_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_3objectid_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_2objectid_decode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_3objectid_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"objectid_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_2objectid_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_2objectid_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_v_value = NULL;\n- PyObject *__pyx_v_n = NULL;\n- Py_ssize_t __pyx_v_bytes_len;\n- PyObject *__pyx_v_subid = NULL;\n- PyObject *__pyx_v_val = NULL;\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- int __pyx_t_1;\n- int __pyx_t_2;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- int __pyx_t_5;\n- Py_ssize_t __pyx_t_6;\n- PyObject *__pyx_t_7 = NULL;\n- __Pyx_RefNannySetupContext(\"objectid_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":86\n- * :rtype: str\n- * \"\"\"\n- * if not stream: # <<<<<<<<<<<<<<\n- * raise ValueError('stream of zero length in')\n- * if stream in id_cache:\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_stream); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 86, __pyx_L1_error)\n- __pyx_t_2 = ((!__pyx_t_1) != 0);\n- if (__pyx_t_2) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":87\n- * \"\"\"\n- * if not stream:\n- * raise ValueError('stream of zero length in') # <<<<<<<<<<<<<<\n- * if stream in id_cache:\n- * return id_cache[stream]\n- *\/\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 87, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_Raise(__pyx_t_3, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __PYX_ERR(0, 87, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":86\n- * :rtype: str\n- * \"\"\"\n- * if not stream: # <<<<<<<<<<<<<<\n- * raise ValueError('stream of zero length in')\n- * if stream in id_cache:\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":88\n- * if not stream:\n- * raise ValueError('stream of zero length in')\n- * if stream in id_cache: # <<<<<<<<<<<<<<\n- * return id_cache[stream]\n- * value = list()\n- *\/\n- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_id_cache); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 88, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_v_stream, __pyx_t_3, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 88, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_1 = (__pyx_t_2 != 0);\n- if (__pyx_t_1) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":89\n- * raise ValueError('stream of zero length in')\n- * if stream in id_cache:\n- * return id_cache[stream] # <<<<<<<<<<<<<<\n- * value = list()\n- * # #\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_id_cache); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 89, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyObject_GetItem(__pyx_t_3, __pyx_v_stream); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 89, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":88\n- * if not stream:\n- * raise ValueError('stream of zero length in')\n- * if stream in id_cache: # <<<<<<<<<<<<<<\n- * return id_cache[stream]\n- * value = list()\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":90\n- * if stream in id_cache:\n- * return id_cache[stream]\n- * value = list() # <<<<<<<<<<<<<<\n- * # #\n- * # # Do the funky decode of the first octet\n- *\/\n- __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 90, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_v_value = __pyx_t_4;\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":95\n- * # #\n- * \n- * if stream[0] < 128: # <<<<<<<<<<<<<<\n- * value.append(stream[0] \/\/ 40)\n- * value.append(stream[0] % 40)\n- *\/\n- __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_stream, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 95, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_int_128, Py_LT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 95, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 95, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- if (__pyx_t_1) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":96\n- * \n- * if stream[0] < 128:\n- * value.append(stream[0] \/\/ 40) # <<<<<<<<<<<<<<\n- * value.append(stream[0] % 40)\n- * else:\n- *\/\n- __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_stream, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 96, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_PyInt_FloorDivideObjC(__pyx_t_3, __pyx_int_40, 40, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 96, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_value, __pyx_t_4); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 96, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":97\n- * if stream[0] < 128:\n- * value.append(stream[0] \/\/ 40)\n- * value.append(stream[0] % 40) # <<<<<<<<<<<<<<\n- * else:\n- * # # I haven't bothered putting in the convoluted logic here\n- *\/\n- __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_stream, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = __Pyx_PyInt_RemainderObjC(__pyx_t_4, __pyx_int_40, 40, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_value, __pyx_t_3); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 97, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":95\n- * # #\n- * \n- * if stream[0] < 128: # <<<<<<<<<<<<<<\n- * value.append(stream[0] \/\/ 40)\n- * value.append(stream[0] % 40)\n- *\/\n- goto __pyx_L5;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":106\n- * # # this first octet, are a real PITA later on. So yeah,\n- * # # stuff it, we'll just raise an exception.\n- * raise ValueError('stream of zero length in objectid_decode()') # <<<<<<<<<<<<<<\n- * # #\n- * # # Decode the rest of the octets\n- *\/\n- \/*else*\/ {\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_Raise(__pyx_t_3, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __PYX_ERR(0, 106, __pyx_L1_error)\n- }\n- __pyx_L5:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":110\n- * # # Decode the rest of the octets\n- * # #\n- * n = 1 # <<<<<<<<<<<<<<\n- * bytes_len = len(stream)\n- * while n < bytes_len:\n- *\/\n- __Pyx_INCREF(__pyx_int_1);\n- __pyx_v_n = __pyx_int_1;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":111\n- * # #\n- * n = 1\n- * bytes_len = len(stream) # <<<<<<<<<<<<<<\n- * while n < bytes_len:\n- * subid = stream[n]\n- *\/\n- __pyx_t_6 = PyObject_Length(__pyx_v_stream); if (unlikely(__pyx_t_6 == -1)) __PYX_ERR(0, 111, __pyx_L1_error)\n- __pyx_v_bytes_len = __pyx_t_6;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":112\n- * n = 1\n- * bytes_len = len(stream)\n- * while n < bytes_len: # <<<<<<<<<<<<<<\n- * subid = stream[n]\n- * n += 1\n- *\/\n- while (1) {\n- __pyx_t_3 = PyInt_FromSsize_t(__pyx_v_bytes_len); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyObject_RichCompare(__pyx_v_n, __pyx_t_3, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 112, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 112, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (!__pyx_t_1) break;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":113\n- * bytes_len = len(stream)\n- * while n < bytes_len:\n- * subid = stream[n] # <<<<<<<<<<<<<<\n- * n += 1\n- * # #\n- *\/\n- __pyx_t_4 = PyObject_GetItem(__pyx_v_stream, __pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 113, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_XDECREF_SET(__pyx_v_subid, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":114\n- * while n < bytes_len:\n- * subid = stream[n]\n- * n += 1 # <<<<<<<<<<<<<<\n- * # #\n- * # # If bit 8 is not set, this is the last octet of this subid\n- *\/\n- __pyx_t_4 = __Pyx_PyInt_AddObjC(__pyx_v_n, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF_SET(__pyx_v_n, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":120\n- * # # afterwards, up until bit 8 isn't set.\n- * # #\n- * if subid & 0x80 == 0x80: # <<<<<<<<<<<<<<\n- * val = subid & 0x7f\n- * while (subid & 0x80) == 0x80:\n- *\/\n- __pyx_t_4 = __Pyx_PyInt_AndObjC(__pyx_v_subid, __pyx_int_128, 0x80, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 120, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = __Pyx_PyInt_EqObjC(__pyx_t_4, __pyx_int_128, 0x80, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 120, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- if (__pyx_t_1) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":121\n- * # #\n- * if subid & 0x80 == 0x80:\n- * val = subid & 0x7f # <<<<<<<<<<<<<<\n- * while (subid & 0x80) == 0x80:\n- * subid = stream[n]\n- *\/\n- __pyx_t_3 = __Pyx_PyInt_AndObjC(__pyx_v_subid, __pyx_int_127, 0x7f, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_XDECREF_SET(__pyx_v_val, __pyx_t_3);\n- __pyx_t_3 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":122\n- * if subid & 0x80 == 0x80:\n- * val = subid & 0x7f\n- * while (subid & 0x80) == 0x80: # <<<<<<<<<<<<<<\n- * subid = stream[n]\n- * n += 1\n- *\/\n- while (1) {\n- __pyx_t_3 = __Pyx_PyInt_AndObjC(__pyx_v_subid, __pyx_int_128, 0x80, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 122, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_PyInt_EqObjC(__pyx_t_3, __pyx_int_128, 0x80, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 122, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 122, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (!__pyx_t_1) break;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":123\n- * val = subid & 0x7f\n- * while (subid & 0x80) == 0x80:\n- * subid = stream[n] # <<<<<<<<<<<<<<\n- * n += 1\n- * val = (val << 7) | (subid & 0x7f)\n- *\/\n- __pyx_t_4 = PyObject_GetItem(__pyx_v_stream, __pyx_v_n); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 123, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF_SET(__pyx_v_subid, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":124\n- * while (subid & 0x80) == 0x80:\n- * subid = stream[n]\n- * n += 1 # <<<<<<<<<<<<<<\n- * val = (val << 7) | (subid & 0x7f)\n- * value.append(val)\n- *\/\n- __pyx_t_4 = __Pyx_PyInt_AddObjC(__pyx_v_n, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 124, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF_SET(__pyx_v_n, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":125\n- * subid = stream[n]\n- * n += 1\n- * val = (val << 7) | (subid & 0x7f) # <<<<<<<<<<<<<<\n- * value.append(val)\n- * else:\n- *\/\n- __pyx_t_4 = __Pyx_PyInt_LshiftObjC(__pyx_v_val, __pyx_int_7, 7, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 125, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = __Pyx_PyInt_AndObjC(__pyx_v_subid, __pyx_int_127, 0x7f, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_7 = PyNumber_Or(__pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 125, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF_SET(__pyx_v_val, __pyx_t_7);\n- __pyx_t_7 = 0;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":126\n- * n += 1\n- * val = (val << 7) | (subid & 0x7f)\n- * value.append(val) # <<<<<<<<<<<<<<\n- * else:\n- * value.append(subid)\n- *\/\n- __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_value, __pyx_v_val); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 126, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":120\n- * # # afterwards, up until bit 8 isn't set.\n- * # #\n- * if subid & 0x80 == 0x80: # <<<<<<<<<<<<<<\n- * val = subid & 0x7f\n- * while (subid & 0x80) == 0x80:\n- *\/\n- goto __pyx_L8;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":128\n- * value.append(val)\n- * else:\n- * value.append(subid) # <<<<<<<<<<<<<<\n- * value = \".\".join(map(str, value))\n- * id_cache[stream] = value\n- *\/\n- \/*else*\/ {\n- __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_value, __pyx_v_subid); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 128, __pyx_L1_error)\n- }\n- __pyx_L8:;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":129\n- * else:\n- * value.append(subid)\n- * value = \".\".join(map(str, value)) # <<<<<<<<<<<<<<\n- * id_cache[stream] = value\n- * return value\n- *\/\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 129, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_INCREF(((PyObject *)(&PyUnicode_Type)));\n- __Pyx_GIVEREF(((PyObject *)(&PyUnicode_Type)));\n- PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)(&PyUnicode_Type)));\n- __Pyx_INCREF(__pyx_v_value);\n- __Pyx_GIVEREF(__pyx_v_value);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_v_value);\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_map, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 129, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = PyUnicode_Join(__pyx_kp_u__4, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 129, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF_SET(__pyx_v_value, __pyx_t_7);\n- __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":130\n- * value.append(subid)\n- * value = \".\".join(map(str, value))\n- * id_cache[stream] = value # <<<<<<<<<<<<<<\n- * return value\n- * \n- *\/\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_id_cache); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 130, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- if (unlikely(PyObject_SetItem(__pyx_t_7, __pyx_v_stream, __pyx_v_value) < 0)) __PYX_ERR(0, 130, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":131\n- * value = \".\".join(map(str, value))\n- * id_cache[stream] = value\n- * return value # <<<<<<<<<<<<<<\n- * \n- * def objectid_encode(oid):\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(__pyx_v_value);\n- __pyx_r = __pyx_v_value;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":78\n- * \n- * \n- * def objectid_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"Decode a stream into an ObjectID.\n- * \n- *\/\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_7);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_value);\n- __Pyx_XDECREF(__pyx_v_n);\n- __Pyx_XDECREF(__pyx_v_subid);\n- __Pyx_XDECREF(__pyx_v_val);\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":133\n- * return value\n- * \n- * def objectid_encode(oid): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an ObjectID into stream\n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_5objectid_encode(PyObject *__pyx_self, PyObject *__pyx_v_oid); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_4objectid_encode[] = \"objectid_encode(oid)\\n\\n encode an ObjectID into stream\\n\\n :param oid: OID\\n :type oid: str\\n :returns: stream\\n :rtype: bytearray\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_5objectid_encode = {\"objectid_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_5objectid_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_4objectid_encode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_5objectid_encode(PyObject *__pyx_self, PyObject *__pyx_v_oid) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"objectid_encode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_4objectid_encode(__pyx_self, ((PyObject *)__pyx_v_oid));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_4objectid_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_oid) {\n- unsigned int __pyx_v_number;\n- unsigned int __pyx_v_subid;\n- PyObject *__pyx_v_subid_c = 0;\n- PyObject *__pyx_v_idlist = 0;\n- PyObject *__pyx_v_subidlist = 0;\n- PyObject *__pyx_v_result = NULL;\n- PyObject *__pyx_v_subid1 = NULL;\n- Py_ssize_t __pyx_v_position;\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- PyObject *__pyx_t_2 = NULL;\n- Py_ssize_t __pyx_t_3;\n- unsigned int __pyx_t_4;\n- int __pyx_t_5;\n- int __pyx_t_6;\n- int __pyx_t_7;\n- PyObject *__pyx_t_8 = NULL;\n- Py_ssize_t __pyx_t_9;\n- PyObject *__pyx_t_10 = NULL;\n- PyObject *__pyx_t_11 = NULL;\n- PyObject *__pyx_t_12 = NULL;\n- int __pyx_t_13;\n- PyObject *__pyx_t_14 = NULL;\n- __Pyx_RefNannySetupContext(\"objectid_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":145\n- * cdef unsigned int subid\n- * cdef str subid_c\n- * cdef list idlist = [] # <<<<<<<<<<<<<<\n- * cdef list subidlist\n- * subidlist = oid.strip('.').split('.')\n- *\/\n- __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 145, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_v_idlist = ((PyObject*)__pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":147\n- * cdef list idlist = []\n- * cdef list subidlist\n- * subidlist = oid.strip('.').split('.') # <<<<<<<<<<<<<<\n- * # asn_parse_objid(bufp, Length, &ASNType, objid, &PDU->enterprise_length);\n- * for subid_c in subidlist:\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_oid, __pyx_n_s_strip); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 147, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 147, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_split); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 147, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__6, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 147, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (!(likely(PyList_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"list\", Py_TYPE(__pyx_t_2)->tp_name), 0))) __PYX_ERR(0, 147, __pyx_L1_error)\n- __pyx_v_subidlist = ((PyObject*)__pyx_t_2);\n- __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":149\n- * subidlist = oid.strip('.').split('.')\n- * # asn_parse_objid(bufp, Length, &ASNType, objid, &PDU->enterprise_length);\n- * for subid_c in subidlist: # <<<<<<<<<<<<<<\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF:\n- *\/\n- if (unlikely(__pyx_v_subidlist == Py_None)) {\n- PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n- __PYX_ERR(0, 149, __pyx_L1_error)\n- }\n- __pyx_t_2 = __pyx_v_subidlist; __Pyx_INCREF(__pyx_t_2); __pyx_t_3 = 0;\n- for (;;) {\n- if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_2)) break;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 149, __pyx_L1_error)\n- #else\n- __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 149, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- #endif\n- if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"unicode\", Py_TYPE(__pyx_t_1)->tp_name), 0))) __PYX_ERR(0, 149, __pyx_L1_error)\n- __Pyx_XDECREF_SET(__pyx_v_subid_c, ((PyObject*)__pyx_t_1));\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":150\n- * # asn_parse_objid(bufp, Length, &ASNType, objid, &PDU->enterprise_length);\n- * for subid_c in subidlist:\n- * number = int(subid_c) # <<<<<<<<<<<<<<\n- * if number < 0 or number > 0x7FFFFFFF:\n- * raise ValueError(\"SubID out of range\")\n- *\/\n- __pyx_t_1 = __Pyx_PyNumber_Int(__pyx_v_subid_c); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 150, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = __Pyx_PyInt_As_unsigned_int(__pyx_t_1); if (unlikely((__pyx_t_4 == (unsigned int)-1) && PyErr_Occurred())) __PYX_ERR(0, 150, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_v_number = __pyx_t_4;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":151\n- * for subid_c in subidlist:\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF: # <<<<<<<<<<<<<<\n- * raise ValueError(\"SubID out of range\")\n- * idlist.append(number)\n- *\/\n- __pyx_t_6 = ((__pyx_v_number < 0) != 0);\n- if (!__pyx_t_6) {\n- } else {\n- __pyx_t_5 = __pyx_t_6;\n- goto __pyx_L6_bool_binop_done;\n- }\n- __pyx_t_6 = ((__pyx_v_number > 0x7FFFFFFF) != 0);\n- __pyx_t_5 = __pyx_t_6;\n- __pyx_L6_bool_binop_done:;\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":152\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF:\n- * raise ValueError(\"SubID out of range\") # <<<<<<<<<<<<<<\n- * idlist.append(number)\n- * \n- *\/\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 152, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __PYX_ERR(0, 152, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":151\n- * for subid_c in subidlist:\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF: # <<<<<<<<<<<<<<\n- * raise ValueError(\"SubID out of range\")\n- * idlist.append(number)\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":153\n- * if number < 0 or number > 0x7FFFFFFF:\n- * raise ValueError(\"SubID out of range\")\n- * idlist.append(number) # <<<<<<<<<<<<<<\n- * \n- * result = bytearray()\n- *\/\n- __pyx_t_1 = __Pyx_PyInt_From_unsigned_int(__pyx_v_number); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 153, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_idlist, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 153, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":149\n- * subidlist = oid.strip('.').split('.')\n- * # asn_parse_objid(bufp, Length, &ASNType, objid, &PDU->enterprise_length);\n- * for subid_c in subidlist: # <<<<<<<<<<<<<<\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF:\n- *\/\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":155\n- * idlist.append(number)\n- * \n- * result = bytearray() # <<<<<<<<<<<<<<\n- * \n- * # Do the bit with the first 2 subids\n- *\/\n- __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 155, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_v_result = ((PyObject*)__pyx_t_2);\n- __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":159\n- * # Do the bit with the first 2 subids\n- * # section 22.4 of X.209\n- * idlist.reverse() # <<<<<<<<<<<<<<\n- * subid1 = (idlist.pop() * 40) + idlist.pop()\n- * idlist.reverse()\n- *\/\n- __pyx_t_7 = PyList_Reverse(__pyx_v_idlist); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 159, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":160\n- * # section 22.4 of X.209\n- * idlist.reverse()\n- * subid1 = (idlist.pop() * 40) + idlist.pop() # <<<<<<<<<<<<<<\n- * idlist.reverse()\n- * idlist.insert(0, subid1)\n- *\/\n- __pyx_t_2 = __Pyx_PyList_Pop(__pyx_v_idlist); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 160, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = PyNumber_Multiply(__pyx_t_2, __pyx_int_40); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 160, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_2 = __Pyx_PyList_Pop(__pyx_v_idlist); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 160, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_8 = PyNumber_Add(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 160, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_8);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_v_subid1 = __pyx_t_8;\n- __pyx_t_8 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":161\n- * idlist.reverse()\n- * subid1 = (idlist.pop() * 40) + idlist.pop()\n- * idlist.reverse() # <<<<<<<<<<<<<<\n- * idlist.insert(0, subid1)\n- * \n- *\/\n- __pyx_t_7 = PyList_Reverse(__pyx_v_idlist); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 161, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":162\n- * subid1 = (idlist.pop() * 40) + idlist.pop()\n- * idlist.reverse()\n- * idlist.insert(0, subid1) # <<<<<<<<<<<<<<\n- * \n- * for subid in idlist:\n- *\/\n- __pyx_t_7 = PyList_Insert(__pyx_v_idlist, 0, __pyx_v_subid1); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 162, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":164\n- * idlist.insert(0, subid1)\n- * \n- * for subid in idlist: # <<<<<<<<<<<<<<\n- * if subid < 128:\n- * result.append(subid & 0x7f)\n- *\/\n- __pyx_t_8 = __pyx_v_idlist; __Pyx_INCREF(__pyx_t_8); __pyx_t_3 = 0;\n- for (;;) {\n- if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_8)) break;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_2 = PyList_GET_ITEM(__pyx_t_8, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) __PYX_ERR(0, 164, __pyx_L1_error)\n- #else\n- __pyx_t_2 = PySequence_ITEM(__pyx_t_8, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 164, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- #endif\n- __pyx_t_4 = __Pyx_PyInt_As_unsigned_int(__pyx_t_2); if (unlikely((__pyx_t_4 == (unsigned int)-1) && PyErr_Occurred())) __PYX_ERR(0, 164, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_v_subid = __pyx_t_4;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":165\n- * \n- * for subid in idlist:\n- * if subid < 128: # <<<<<<<<<<<<<<\n- * result.append(subid & 0x7f)\n- * else:\n- *\/\n- __pyx_t_5 = ((__pyx_v_subid < 0x80) != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":166\n- * for subid in idlist:\n- * if subid < 128:\n- * result.append(subid & 0x7f) # <<<<<<<<<<<<<<\n- * else:\n- * position = len(result)\n- *\/\n- __pyx_t_7 = __Pyx_PyByteArray_Append(__pyx_v_result, (__pyx_v_subid & 0x7f)); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 166, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":165\n- * \n- * for subid in idlist:\n- * if subid < 128: # <<<<<<<<<<<<<<\n- * result.append(subid & 0x7f)\n- * else:\n- *\/\n- goto __pyx_L10;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":168\n- * result.append(subid & 0x7f)\n- * else:\n- * position = len(result) # <<<<<<<<<<<<<<\n- * result.append(subid & 0x7f)\n- * \n- *\/\n- \/*else*\/ {\n- __pyx_t_9 = PyObject_Length(__pyx_v_result); if (unlikely(__pyx_t_9 == -1)) __PYX_ERR(0, 168, __pyx_L1_error)\n- __pyx_v_position = __pyx_t_9;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":169\n- * else:\n- * position = len(result)\n- * result.append(subid & 0x7f) # <<<<<<<<<<<<<<\n- * \n- * subid >>= 7\n- *\/\n- __pyx_t_7 = __Pyx_PyByteArray_Append(__pyx_v_result, (__pyx_v_subid & 0x7f)); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 169, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":171\n- * result.append(subid & 0x7f)\n- * \n- * subid >>= 7 # <<<<<<<<<<<<<<\n- * while subid > 0:\n- * result.insert(position, 0x80 | (subid & 0x7f))\n- *\/\n- __pyx_v_subid = (__pyx_v_subid >> 7);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":172\n- * \n- * subid >>= 7\n- * while subid > 0: # <<<<<<<<<<<<<<\n- * result.insert(position, 0x80 | (subid & 0x7f))\n- * subid >>= 7\n- *\/\n- while (1) {\n- __pyx_t_5 = ((__pyx_v_subid > 0) != 0);\n- if (!__pyx_t_5) break;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":173\n- * subid >>= 7\n- * while subid > 0:\n- * result.insert(position, 0x80 | (subid & 0x7f)) # <<<<<<<<<<<<<<\n- * subid >>= 7\n- * \n- *\/\n- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_result, __pyx_n_s_insert); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_10 = PyInt_FromSsize_t(__pyx_v_position); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_10);\n- __pyx_t_11 = __Pyx_PyInt_From_long((0x80 | (__pyx_v_subid & 0x7f))); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_11);\n- __pyx_t_12 = NULL;\n- __pyx_t_13 = 0;\n- if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) {\n- __pyx_t_12 = PyMethod_GET_SELF(__pyx_t_1);\n- if (likely(__pyx_t_12)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);\n- __Pyx_INCREF(__pyx_t_12);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_1, function);\n- __pyx_t_13 = 1;\n- }\n- }\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[3] = {__pyx_t_12, __pyx_t_10, __pyx_t_11};\n- __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_13, 2+__pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[3] = {__pyx_t_12, __pyx_t_10, __pyx_t_11};\n- __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_13, 2+__pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- } else\n- #endif\n- {\n- __pyx_t_14 = PyTuple_New(2+__pyx_t_13); if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_14);\n- if (__pyx_t_12) {\n- __Pyx_GIVEREF(__pyx_t_12); PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_12); __pyx_t_12 = NULL;\n- }\n- __Pyx_GIVEREF(__pyx_t_10);\n- PyTuple_SET_ITEM(__pyx_t_14, 0+__pyx_t_13, __pyx_t_10);\n- __Pyx_GIVEREF(__pyx_t_11);\n- PyTuple_SET_ITEM(__pyx_t_14, 1+__pyx_t_13, __pyx_t_11);\n- __pyx_t_10 = 0;\n- __pyx_t_11 = 0;\n- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_14, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 173, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;\n- }\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":174\n- * while subid > 0:\n- * result.insert(position, 0x80 | (subid & 0x7f))\n- * subid >>= 7 # <<<<<<<<<<<<<<\n- * \n- * return result\n- *\/\n- __pyx_v_subid = (__pyx_v_subid >> 7);\n- }\n- }\n- __pyx_L10:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":164\n- * idlist.insert(0, subid1)\n- * \n- * for subid in idlist: # <<<<<<<<<<<<<<\n- * if subid < 128:\n- * result.append(subid & 0x7f)\n- *\/\n- }\n- __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":176\n- * subid >>= 7\n- * \n- * return result # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(__pyx_v_result);\n- __pyx_r = __pyx_v_result;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":133\n- * return value\n- * \n- * def objectid_encode(oid): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an ObjectID into stream\n- *\/\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_8);\n- __Pyx_XDECREF(__pyx_t_10);\n- __Pyx_XDECREF(__pyx_t_11);\n- __Pyx_XDECREF(__pyx_t_12);\n- __Pyx_XDECREF(__pyx_t_14);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.objectid_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_subid_c);\n- __Pyx_XDECREF(__pyx_v_idlist);\n- __Pyx_XDECREF(__pyx_v_subidlist);\n- __Pyx_XDECREF(__pyx_v_result);\n- __Pyx_XDECREF(__pyx_v_subid1);\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":179\n- * \n- * \n- * def octetstring_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * decode an octetstring into string\n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_6octetstring_decode[] = \"octetstring_decode(stream)\\n\\n decode an octetstring into string\\n\\n :param stream: stream\\n :type stream: bytes\\n :returns: string\\n :rtype: string\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_7octetstring_decode = {\"octetstring_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_6octetstring_decode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_7octetstring_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"octetstring_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_6octetstring_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_6octetstring_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- PyObject *__pyx_t_5 = NULL;\n- PyObject *__pyx_t_6 = NULL;\n- int __pyx_t_7;\n- PyObject *__pyx_t_8 = NULL;\n- PyObject *__pyx_t_9 = NULL;\n- PyObject *__pyx_t_10 = NULL;\n- PyObject *__pyx_t_11 = NULL;\n- __Pyx_RefNannySetupContext(\"octetstring_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":188\n- * :rtype: string\n- * \"\"\"\n- * try: # <<<<<<<<<<<<<<\n- * return stream.decode()\n- * except UnicodeDecodeError:\n- *\/\n- {\n- __Pyx_PyThreadState_declare\n- __Pyx_PyThreadState_assign\n- __Pyx_ExceptionSave(&__pyx_t_1, &__pyx_t_2, &__pyx_t_3);\n- __Pyx_XGOTREF(__pyx_t_1);\n- __Pyx_XGOTREF(__pyx_t_2);\n- __Pyx_XGOTREF(__pyx_t_3);\n- \/*try:*\/ {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":189\n- * \"\"\"\n- * try:\n- * return stream.decode() # <<<<<<<<<<<<<<\n- * except UnicodeDecodeError:\n- * return binascii.hexlify(stream)\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_stream, __pyx_n_s_decode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 189, __pyx_L3_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_6 = NULL;\n- if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) {\n- __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5);\n- if (likely(__pyx_t_6)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);\n- __Pyx_INCREF(__pyx_t_6);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_5, function);\n- }\n- }\n- if (__pyx_t_6) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 189, __pyx_L3_error)\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- } else {\n- __pyx_t_4 = __Pyx_PyObject_CallNoArg(__pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 189, __pyx_L3_error)\n- }\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n- goto __pyx_L7_try_return;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":188\n- * :rtype: string\n- * \"\"\"\n- * try: # <<<<<<<<<<<<<<\n- * return stream.decode()\n- * except UnicodeDecodeError:\n- *\/\n- }\n- __pyx_L3_error:;\n- __Pyx_PyThreadState_assign\n- __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":190\n- * try:\n- * return stream.decode()\n- * except UnicodeDecodeError: # <<<<<<<<<<<<<<\n- * return binascii.hexlify(stream)\n- * \n- *\/\n- __pyx_t_7 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_UnicodeDecodeError);\n- if (__pyx_t_7) {\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.octetstring_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6) < 0) __PYX_ERR(0, 190, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_GOTREF(__pyx_t_6);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":191\n- * return stream.decode()\n- * except UnicodeDecodeError:\n- * return binascii.hexlify(stream) # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_binascii); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_hexlify); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_10);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_9 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_10))) {\n- __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_10);\n- if (likely(__pyx_t_9)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_10);\n- __Pyx_INCREF(__pyx_t_9);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_10, function);\n- }\n- }\n- if (!__pyx_t_9) {\n- __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_t_10, __pyx_v_stream); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_8);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_10)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_v_stream};\n- __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_10, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __Pyx_GOTREF(__pyx_t_8);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_10)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_v_stream};\n- __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_10, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __Pyx_GOTREF(__pyx_t_8);\n- } else\n- #endif\n- {\n- __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_11);\n- __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_9); __pyx_t_9 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_v_stream);\n- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_t_11, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 191, __pyx_L5_except_error)\n- __Pyx_GOTREF(__pyx_t_8);\n- __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_r = __pyx_t_8;\n- __pyx_t_8 = 0;\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- goto __pyx_L6_except_return;\n- }\n- goto __pyx_L5_except_error;\n- __pyx_L5_except_error:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":188\n- * :rtype: string\n- * \"\"\"\n- * try: # <<<<<<<<<<<<<<\n- * return stream.decode()\n- * except UnicodeDecodeError:\n- *\/\n- __Pyx_PyThreadState_assign\n- __Pyx_XGIVEREF(__pyx_t_1);\n- __Pyx_XGIVEREF(__pyx_t_2);\n- __Pyx_XGIVEREF(__pyx_t_3);\n- __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3);\n- goto __pyx_L1_error;\n- __pyx_L7_try_return:;\n- __Pyx_PyThreadState_assign\n- __Pyx_XGIVEREF(__pyx_t_1);\n- __Pyx_XGIVEREF(__pyx_t_2);\n- __Pyx_XGIVEREF(__pyx_t_3);\n- __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3);\n- goto __pyx_L0;\n- __pyx_L6_except_return:;\n- __Pyx_PyThreadState_assign\n- __Pyx_XGIVEREF(__pyx_t_1);\n- __Pyx_XGIVEREF(__pyx_t_2);\n- __Pyx_XGIVEREF(__pyx_t_3);\n- __Pyx_ExceptionReset(__pyx_t_1, __pyx_t_2, __pyx_t_3);\n- goto __pyx_L0;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":179\n- * \n- * \n- * def octetstring_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * decode an octetstring into string\n- *\/\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_XDECREF(__pyx_t_6);\n- __Pyx_XDECREF(__pyx_t_8);\n- __Pyx_XDECREF(__pyx_t_9);\n- __Pyx_XDECREF(__pyx_t_10);\n- __Pyx_XDECREF(__pyx_t_11);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.octetstring_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":194\n- * \n- * \n- * def octetstring_encode(string): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an octetstring into string\n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_9octetstring_encode(PyObject *__pyx_self, PyObject *__pyx_v_string); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_8octetstring_encode[] = \"octetstring_encode(string)\\n\\n encode an octetstring into string\\n\\n :param string: string\\n :type string: string\\n :returns: string\\n :rtype: bytes\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_9octetstring_encode = {\"octetstring_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_9octetstring_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_8octetstring_encode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_9octetstring_encode(PyObject *__pyx_self, PyObject *__pyx_v_string) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"octetstring_encode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_8octetstring_encode(__pyx_self, ((PyObject *)__pyx_v_string));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_8octetstring_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_string) {\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- PyObject *__pyx_t_2 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__11)\n __Pyx_RefNannySetupContext(\"octetstring_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":203\n+ __Pyx_TraceCall(\"octetstring_encode\", __pyx_f[0], 312, 0, __PYX_ERR(0, 312, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":321\n * :rtype: bytes\n * \"\"\"\n * return bytes(string.encode('ascii')) # <<<<<<<<<<<<<<\n@@ -3258,24 +4038,24 @@\n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_string, __pyx_n_s_encode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 203, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_string, __pyx_n_s_encode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 321, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 203, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 203, __pyx_L1_error)\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 321, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 203, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 321, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_r = __pyx_t_2;\n __pyx_t_2 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":194\n+ \/* \"fastsnmp\/snmp_parser.pyx\":312\n * \n * \n * def octetstring_encode(string): # <<<<<<<<<<<<<<\n@@ -3291,695 +4071,1144 @@\n __pyx_r = NULL;\n __pyx_L0:;\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":206\n- * \n- * \n- * def integer_encode(integer): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an integer\n+\/* \"fastsnmp\/snmp_parser.pyx\":324\n+ * \n+ * \n+ * cdef inline size_t ber_encode_integer_size(const int64_t value): # <<<<<<<<<<<<<<\n+ * cdef size_t len = 1\n+ * cdef int64_t tmp = value\n+ *\/\n+\n+static CYTHON_INLINE size_t __pyx_f_8fastsnmp_11snmp_parser_ber_encode_integer_size(int64_t const __pyx_v_value) {\n+ size_t __pyx_v_len;\n+ int64_t __pyx_v_tmp;\n+ int __pyx_v_is_most_sig_set;\n+ size_t __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"ber_encode_integer_size\", 0);\n+ __Pyx_TraceCall(\"ber_encode_integer_size\", __pyx_f[0], 324, 0, __PYX_ERR(0, 324, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":325\n+ * \n+ * cdef inline size_t ber_encode_integer_size(const int64_t value):\n+ * cdef size_t len = 1 # <<<<<<<<<<<<<<\n+ * cdef int64_t tmp = value\n+ * cdef bint is_most_sig_set = tmp & 0x80\n+ *\/\n+ __pyx_v_len = 1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":326\n+ * cdef inline size_t ber_encode_integer_size(const int64_t value):\n+ * cdef size_t len = 1\n+ * cdef int64_t tmp = value # <<<<<<<<<<<<<<\n+ * cdef bint is_most_sig_set = tmp & 0x80\n+ * tmp >>= 8\n+ *\/\n+ __pyx_v_tmp = __pyx_v_value;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":327\n+ * cdef size_t len = 1\n+ * cdef int64_t tmp = value\n+ * cdef bint is_most_sig_set = tmp & 0x80 # <<<<<<<<<<<<<<\n+ * tmp >>= 8\n+ * # how many bytes are used in value\n+ *\/\n+ __pyx_v_is_most_sig_set = (__pyx_v_tmp & 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":328\n+ * cdef int64_t tmp = value\n+ * cdef bint is_most_sig_set = tmp & 0x80\n+ * tmp >>= 8 # <<<<<<<<<<<<<<\n+ * # how many bytes are used in value\n+ * while tmp != 0:\n+ *\/\n+ __pyx_v_tmp = (__pyx_v_tmp >> 8);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":330\n+ * tmp >>= 8\n+ * # how many bytes are used in value\n+ * while tmp != 0: # <<<<<<<<<<<<<<\n+ * len += 1\n+ * is_most_sig_set = tmp & 0x80\n+ *\/\n+ while (1) {\n+ __pyx_t_1 = ((__pyx_v_tmp != 0) != 0);\n+ if (!__pyx_t_1) break;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":331\n+ * # how many bytes are used in value\n+ * while tmp != 0:\n+ * len += 1 # <<<<<<<<<<<<<<\n+ * is_most_sig_set = tmp & 0x80\n+ * tmp >>= 8\n+ *\/\n+ __pyx_v_len = (__pyx_v_len + 1);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":332\n+ * while tmp != 0:\n+ * len += 1\n+ * is_most_sig_set = tmp & 0x80 # <<<<<<<<<<<<<<\n+ * tmp >>= 8\n+ * # in unsigned number most significant bit must be not set\n+ *\/\n+ __pyx_v_is_most_sig_set = (__pyx_v_tmp & 0x80);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":333\n+ * len += 1\n+ * is_most_sig_set = tmp & 0x80\n+ * tmp >>= 8 # <<<<<<<<<<<<<<\n+ * # in unsigned number most significant bit must be not set\n+ * if is_most_sig_set:\n+ *\/\n+ __pyx_v_tmp = (__pyx_v_tmp >> 8);\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":335\n+ * tmp >>= 8\n+ * # in unsigned number most significant bit must be not set\n+ * if is_most_sig_set: # <<<<<<<<<<<<<<\n+ * return len + 1\n+ * else:\n+ *\/\n+ __pyx_t_1 = (__pyx_v_is_most_sig_set != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":336\n+ * # in unsigned number most significant bit must be not set\n+ * if is_most_sig_set:\n+ * return len + 1 # <<<<<<<<<<<<<<\n+ * else:\n+ * return len\n+ *\/\n+ __pyx_r = (__pyx_v_len + 1);\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":335\n+ * tmp >>= 8\n+ * # in unsigned number most significant bit must be not set\n+ * if is_most_sig_set: # <<<<<<<<<<<<<<\n+ * return len + 1\n+ * else:\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":338\n+ * return len + 1\n+ * else:\n+ * return len # <<<<<<<<<<<<<<\n+ * \n+ * def integer_encode(const uint64_t value):\n+ *\/\n+ \/*else*\/ {\n+ __pyx_r = __pyx_v_len;\n+ goto __pyx_L0;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":324\n+ * \n+ * \n+ * cdef inline size_t ber_encode_integer_size(const int64_t value): # <<<<<<<<<<<<<<\n+ * cdef size_t len = 1\n+ * cdef int64_t tmp = value\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.ber_encode_integer_size\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":340\n+ * return len\n+ * \n+ * def integer_encode(const uint64_t value): # <<<<<<<<<<<<<<\n+ * # little -> big\n+ * cdef size_t slen, i\n *\/\n \n \/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_11integer_encode(PyObject *__pyx_self, PyObject *__pyx_v_integer); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_10integer_encode[] = \"integer_encode(integer)\\n\\n encode an integer\\n\\n :param integer: target integer\\n :type integer: int\\n :returns: integer\\n :rtype: bytes\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_11integer_encode = {\"integer_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_11integer_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_10integer_encode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_11integer_encode(PyObject *__pyx_self, PyObject *__pyx_v_integer) {\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_9integer_encode(PyObject *__pyx_self, PyObject *__pyx_arg_value); \/*proto*\/\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_9integer_encode = {\"integer_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_9integer_encode, METH_O, 0};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_9integer_encode(PyObject *__pyx_self, PyObject *__pyx_arg_value) {\n+ uint64_t __pyx_v_value;\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"integer_encode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_10integer_encode(__pyx_self, ((PyObject *)__pyx_v_integer));\n+ assert(__pyx_arg_value); {\n+ __pyx_v_value = __Pyx_PyInt_As_uint64_t(__pyx_arg_value); if (unlikely((__pyx_v_value == ((uint64_t)-1)) && PyErr_Occurred())) __PYX_ERR(0, 340, __pyx_L3_error)\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.integer_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __Pyx_RefNannyFinishContext();\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_8integer_encode(__pyx_self, ((uint64_t)__pyx_v_value));\n \n \/* function exit code *\/\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_10integer_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_integer) {\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_8integer_encode(CYTHON_UNUSED PyObject *__pyx_self, uint64_t __pyx_v_value) {\n+ size_t __pyx_v_slen;\n+ size_t __pyx_v_i;\n+ char __pyx_v_res[8];\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- int __pyx_t_2;\n- int __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n- PyObject *__pyx_t_5 = NULL;\n- PyObject *__pyx_t_6 = NULL;\n+ size_t __pyx_t_1;\n+ size_t __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__13)\n __Pyx_RefNannySetupContext(\"integer_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":215\n- * :rtype: bytes\n- * \"\"\"\n- * if integer in integer_encode_cache: # <<<<<<<<<<<<<<\n- * return integer_encode_cache[integer]\n- * elif integer > 0:\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 215, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_v_integer, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 215, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_3 = (__pyx_t_2 != 0);\n- if (__pyx_t_3) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":216\n- * \"\"\"\n- * if integer in integer_encode_cache:\n- * return integer_encode_cache[integer] # <<<<<<<<<<<<<<\n- * elif integer > 0:\n- * return integer.to_bytes(integer.bit_length() \/\/ 8 + 1, byteorder='big', signed=True)\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 216, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_integer); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 216, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":215\n- * :rtype: bytes\n- * \"\"\"\n- * if integer in integer_encode_cache: # <<<<<<<<<<<<<<\n- * return integer_encode_cache[integer]\n- * elif integer > 0:\n- *\/\n+ __Pyx_TraceCall(\"integer_encode\", __pyx_f[0], 340, 0, __PYX_ERR(0, 340, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":344\n+ * cdef size_t slen, i\n+ * cdef char[8] res\n+ * slen = ber_encode_integer_size(value) # <<<<<<<<<<<<<<\n+ * \n+ * # copy the bytes from value to data backwards\n+ *\/\n+ __pyx_v_slen = __pyx_f_8fastsnmp_11snmp_parser_ber_encode_integer_size(__pyx_v_value);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":347\n+ * \n+ * # copy the bytes from value to data backwards\n+ * for i in range(0, slen): # <<<<<<<<<<<<<<\n+ * res[slen-i-1] = (<char *> &value)[i]\n+ * return <bytes> res[:slen]\n+ *\/\n+ __pyx_t_1 = __pyx_v_slen;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":348\n+ * # copy the bytes from value to data backwards\n+ * for i in range(0, slen):\n+ * res[slen-i-1] = (<char *> &value)[i] # <<<<<<<<<<<<<<\n+ * return <bytes> res[:slen]\n+ * \n+ *\/\n+ (__pyx_v_res[((__pyx_v_slen - __pyx_v_i) - 1)]) = (((char *)(&__pyx_v_value))[__pyx_v_i]);\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":217\n- * if integer in integer_encode_cache:\n- * return integer_encode_cache[integer]\n- * elif integer > 0: # <<<<<<<<<<<<<<\n- * return integer.to_bytes(integer.bit_length() \/\/ 8 + 1, byteorder='big', signed=True)\n- * \n- *\/\n- __pyx_t_4 = PyObject_RichCompare(__pyx_v_integer, __pyx_int_0, Py_GT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 217, __pyx_L1_error)\n- __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 217, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (__pyx_t_3) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":218\n- * return integer_encode_cache[integer]\n- * elif integer > 0:\n- * return integer.to_bytes(integer.bit_length() \/\/ 8 + 1, byteorder='big', signed=True) # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_integer, __pyx_n_s_to_bytes); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_integer, __pyx_n_s_bit_length); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_6 = NULL;\n- if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_5))) {\n- __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5);\n- if (likely(__pyx_t_6)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);\n- __Pyx_INCREF(__pyx_t_6);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_5, function);\n- }\n- }\n- if (__pyx_t_6) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- } else {\n- __pyx_t_1 = __Pyx_PyObject_CallNoArg(__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)\n- }\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = __Pyx_PyInt_FloorDivideObjC(__pyx_t_1, __pyx_int_8, 8, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_PyInt_AddObjC(__pyx_t_5, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_byteorder, __pyx_n_u_big) < 0) __PYX_ERR(0, 218, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_signed, Py_True) < 0) __PYX_ERR(0, 218, __pyx_L1_error)\n- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 218, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_r = __pyx_t_6;\n- __pyx_t_6 = 0;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":217\n- * if integer in integer_encode_cache:\n- * return integer_encode_cache[integer]\n- * elif integer > 0: # <<<<<<<<<<<<<<\n- * return integer.to_bytes(integer.bit_length() \/\/ 8 + 1, byteorder='big', signed=True)\n- * \n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":206\n- * \n- * \n- * def integer_encode(integer): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an integer\n+ \/* \"fastsnmp\/snmp_parser.pyx\":349\n+ * for i in range(0, slen):\n+ * res[slen-i-1] = (<char *> &value)[i]\n+ * return <bytes> res[:slen] # <<<<<<<<<<<<<<\n+ * \n+ * def integer_decode(bytes stream not None):\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_3 = __Pyx_PyBytes_FromStringAndSize(((const char*)__pyx_v_res) + 0, __pyx_v_slen - 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 349, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject*)__pyx_t_3));\n+ __pyx_r = __pyx_t_3;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":340\n+ * return len\n+ * \n+ * def integer_encode(const uint64_t value): # <<<<<<<<<<<<<<\n+ * # little -> big\n+ * cdef size_t slen, i\n *\/\n \n \/* function exit code *\/\n- __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n- goto __pyx_L0;\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_XDECREF(__pyx_t_6);\n+ __Pyx_XDECREF(__pyx_t_3);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.integer_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":221\n- * \n- * \n- * def integer_decode(stream): # <<<<<<<<<<<<<<\n+\/* \"fastsnmp\/snmp_parser.pyx\":351\n+ * return <bytes> res[:slen]\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n * \"\"\"\n * Decode input stream into a integer\n *\/\n \n \/* Python wrapper *\/\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_11integer_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n+static char __pyx_doc_8fastsnmp_11snmp_parser_10integer_decode[] = \"\\n Decode input stream into a integer\\n\\n :param stream: encoded integer\\n :type stream: bytes\\n :returns: decoded integer\\n :rtype: int\\n \";\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_11integer_decode = {\"integer_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_11integer_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_10integer_decode};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_11integer_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ PyObject *__pyx_r = 0;\n+ __Pyx_RefNannyDeclarations\n+ __Pyx_RefNannySetupContext(\"integer_decode (wrapper)\", 0);\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_stream), (&PyBytes_Type), 0, \"stream\", 1))) __PYX_ERR(0, 351, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_10integer_decode(__pyx_self, ((PyObject*)__pyx_v_stream));\n+\n+ \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_10integer_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ uint64_t __pyx_v_value;\n+ uint8_t __pyx_v_i;\n+ size_t __pyx_v_stream_len;\n+ char *__pyx_v_stream_char;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ Py_ssize_t __pyx_t_1;\n+ char *__pyx_t_2;\n+ size_t __pyx_t_3;\n+ uint8_t __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__14)\n+ __Pyx_RefNannySetupContext(\"integer_decode\", 0);\n+ __Pyx_TraceCall(\"integer_decode\", __pyx_f[0], 351, 0, __PYX_ERR(0, 351, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":360\n+ * :rtype: int\n+ * \"\"\"\n+ * cdef uint64_t value = 0 # <<<<<<<<<<<<<<\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_v_value = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":362\n+ * cdef uint64_t value = 0\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream) # <<<<<<<<<<<<<<\n+ * cdef char *stream_char = stream\n+ * for i in range(stream_len):\n+ *\/\n+ __pyx_t_1 = PyBytes_GET_SIZE(__pyx_v_stream); if (unlikely(__pyx_t_1 == -1)) __PYX_ERR(0, 362, __pyx_L1_error)\n+ __pyx_v_stream_len = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":363\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream)\n+ * cdef char *stream_char = stream # <<<<<<<<<<<<<<\n+ * for i in range(stream_len):\n+ * value <<= 8\n+ *\/\n+ __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) __PYX_ERR(0, 363, __pyx_L1_error)\n+ __pyx_v_stream_char = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":364\n+ * cdef size_t stream_len = len(stream)\n+ * cdef char *stream_char = stream\n+ * for i in range(stream_len): # <<<<<<<<<<<<<<\n+ * value <<= 8\n+ * value |= <uint8_t>stream_char[i]\n+ *\/\n+ __pyx_t_3 = __pyx_v_stream_len;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_i = __pyx_t_4;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":365\n+ * cdef char *stream_char = stream\n+ * for i in range(stream_len):\n+ * value <<= 8 # <<<<<<<<<<<<<<\n+ * value |= <uint8_t>stream_char[i]\n+ * return value\n+ *\/\n+ __pyx_v_value = (__pyx_v_value << 8);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":366\n+ * for i in range(stream_len):\n+ * value <<= 8\n+ * value |= <uint8_t>stream_char[i] # <<<<<<<<<<<<<<\n+ * return value\n+ * \n+ *\/\n+ __pyx_v_value = (__pyx_v_value | ((uint8_t)(__pyx_v_stream_char[__pyx_v_i])));\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":367\n+ * value <<= 8\n+ * value |= <uint8_t>stream_char[i]\n+ * return value # <<<<<<<<<<<<<<\n+ * \n+ * def integer_decode(bytes stream not None):\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_5 = __Pyx_PyInt_From_uint64_t(__pyx_v_value); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 367, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_r = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":351\n+ * return <bytes> res[:slen]\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Decode input stream into a integer\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.integer_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":369\n+ * return value\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Decode input stream into a integer\n+ *\/\n+\n+\/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_13integer_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_12integer_decode[] = \"integer_decode(stream)\\n\\n Decode input stream into a integer\\n\\n :param stream: encoded integer\\n :type stream: bytes\\n :returns: decoded integer\\n :rtype: int\\n \";\n+static char __pyx_doc_8fastsnmp_11snmp_parser_12integer_decode[] = \"\\n Decode input stream into a integer\\n\\n :param stream: encoded integer\\n :type stream: bytes\\n :returns: decoded integer\\n :rtype: int\\n \";\n static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_13integer_decode = {\"integer_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_13integer_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_12integer_decode};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_13integer_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"integer_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_12integer_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_stream), (&PyBytes_Type), 0, \"stream\", 1))) __PYX_ERR(0, 369, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_12integer_decode(__pyx_self, ((PyObject*)__pyx_v_stream));\n \n \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_12integer_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ CYTHON_UNUSED uint64_t __pyx_v_value;\n+ size_t __pyx_v_stream_len;\n+ char *__pyx_v_stream_char;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ Py_ssize_t __pyx_t_1;\n+ char *__pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__15)\n+ __Pyx_RefNannySetupContext(\"integer_decode\", 0);\n+ __Pyx_TraceCall(\"integer_decode\", __pyx_f[0], 369, 0, __PYX_ERR(0, 369, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":378\n+ * :rtype: int\n+ * \"\"\"\n+ * cdef uint64_t value = 0 # <<<<<<<<<<<<<<\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_v_value = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":380\n+ * cdef uint64_t value = 0\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream) # <<<<<<<<<<<<<<\n+ * cdef char *stream_char = stream\n+ * return integer_decode_c(stream_char, &stream_len)\n+ *\/\n+ __pyx_t_1 = PyBytes_GET_SIZE(__pyx_v_stream); if (unlikely(__pyx_t_1 == -1)) __PYX_ERR(0, 380, __pyx_L1_error)\n+ __pyx_v_stream_len = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":381\n+ * cdef uint8_t i\n+ * cdef size_t stream_len = len(stream)\n+ * cdef char *stream_char = stream # <<<<<<<<<<<<<<\n+ * return integer_decode_c(stream_char, &stream_len)\n+ * \n+ *\/\n+ __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) __PYX_ERR(0, 381, __pyx_L1_error)\n+ __pyx_v_stream_char = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":382\n+ * cdef size_t stream_len = len(stream)\n+ * cdef char *stream_char = stream\n+ * return integer_decode_c(stream_char, &stream_len) # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline uint64_t integer_decode_c(char *stream, size_t *stream_len):\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_3 = __Pyx_PyInt_From_uint64_t(__pyx_f_8fastsnmp_11snmp_parser_integer_decode_c(__pyx_v_stream_char, (&__pyx_v_stream_len))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_r = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":369\n+ * return value\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Decode input stream into a integer\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.integer_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":384\n+ * return integer_decode_c(stream_char, &stream_len)\n+ * \n+ * cdef inline uint64_t integer_decode_c(char *stream, size_t *stream_len): # <<<<<<<<<<<<<<\n+ * cdef uint64_t value = 0\n+ * cdef uint8_t i\n+ *\/\n+\n+static CYTHON_INLINE uint64_t __pyx_f_8fastsnmp_11snmp_parser_integer_decode_c(char *__pyx_v_stream, size_t *__pyx_v_stream_len) {\n+ uint64_t __pyx_v_value;\n+ uint8_t __pyx_v_i;\n+ uint64_t __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ size_t __pyx_t_1;\n+ uint8_t __pyx_t_2;\n+ __Pyx_RefNannySetupContext(\"integer_decode_c\", 0);\n+ __Pyx_TraceCall(\"integer_decode_c\", __pyx_f[0], 384, 0, __PYX_ERR(0, 384, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":385\n+ * \n+ * cdef inline uint64_t integer_decode_c(char *stream, size_t *stream_len):\n+ * cdef uint64_t value = 0 # <<<<<<<<<<<<<<\n+ * cdef uint8_t i\n+ * for i in range(stream_len[0]):\n+ *\/\n+ __pyx_v_value = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":387\n+ * cdef uint64_t value = 0\n+ * cdef uint8_t i\n+ * for i in range(stream_len[0]): # <<<<<<<<<<<<<<\n+ * value <<= 8\n+ * value |= <uint8_t>stream[i]\n+ *\/\n+ __pyx_t_1 = (__pyx_v_stream_len[0]);\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":388\n+ * cdef uint8_t i\n+ * for i in range(stream_len[0]):\n+ * value <<= 8 # <<<<<<<<<<<<<<\n+ * value |= <uint8_t>stream[i]\n+ * return value\n+ *\/\n+ __pyx_v_value = (__pyx_v_value << 8);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":389\n+ * for i in range(stream_len[0]):\n+ * value <<= 8\n+ * value |= <uint8_t>stream[i] # <<<<<<<<<<<<<<\n+ * return value\n+ * \n+ *\/\n+ __pyx_v_value = (__pyx_v_value | ((uint8_t)(__pyx_v_stream[__pyx_v_i])));\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":390\n+ * value <<= 8\n+ * value |= <uint8_t>stream[i]\n+ * return value # <<<<<<<<<<<<<<\n+ * \n+ * def sequence_decode(bytes stream not None) -> list:\n+ *\/\n+ __pyx_r = __pyx_v_value;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":384\n+ * return integer_decode_c(stream_char, &stream_len)\n+ * \n+ * cdef inline uint64_t integer_decode_c(char *stream, size_t *stream_len): # <<<<<<<<<<<<<<\n+ * cdef uint64_t value = 0\n+ * cdef uint8_t i\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.integer_decode_c\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":392\n+ * return value\n+ * \n+ * def sequence_decode(bytes stream not None) -> list: # <<<<<<<<<<<<<<\n+ * cdef char * stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+\n+\/* Python wrapper *\/\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_15sequence_decode = {\"sequence_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode, METH_O, 0};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ PyObject *__pyx_r = 0;\n+ __Pyx_RefNannyDeclarations\n+ __Pyx_RefNannySetupContext(\"sequence_decode (wrapper)\", 0);\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_stream), (&PyBytes_Type), 0, \"stream\", 1))) __PYX_ERR(0, 392, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_14sequence_decode(__pyx_self, ((PyObject*)__pyx_v_stream));\n+\n+ \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_14sequence_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+ char *__pyx_v_stream_char;\n+ size_t __pyx_v_stream_len;\n+ PyObject *__pyx_v_ret = 0;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ char *__pyx_t_1;\n+ Py_ssize_t __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__16)\n+ __Pyx_RefNannySetupContext(\"sequence_decode\", 0);\n+ __Pyx_TraceCall(\"sequence_decode\", __pyx_f[0], 392, 0, __PYX_ERR(0, 392, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":393\n+ * \n+ * def sequence_decode(bytes stream not None) -> list:\n+ * cdef char * stream_char = stream # <<<<<<<<<<<<<<\n+ * cdef size_t stream_len = len(stream)\n+ * cdef list ret\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 393, __pyx_L1_error)\n+ __pyx_v_stream_char = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":394\n+ * def sequence_decode(bytes stream not None) -> list:\n+ * cdef char * stream_char = stream\n+ * cdef size_t stream_len = len(stream) # <<<<<<<<<<<<<<\n+ * cdef list ret\n+ * ret = sequence_decode_c(stream_char, stream_len)\n+ *\/\n+ __pyx_t_2 = PyBytes_GET_SIZE(__pyx_v_stream); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 394, __pyx_L1_error)\n+ __pyx_v_stream_len = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":396\n+ * cdef size_t stream_len = len(stream)\n+ * cdef list ret\n+ * ret = sequence_decode_c(stream_char, stream_len) # <<<<<<<<<<<<<<\n+ * return ret\n+ * \n+ *\/\n+ __pyx_t_3 = __pyx_f_8fastsnmp_11snmp_parser_sequence_decode_c(__pyx_v_stream_char, __pyx_v_stream_len); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 396, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_v_ret = ((PyObject*)__pyx_t_3);\n+ __pyx_t_3 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":397\n+ * cdef list ret\n+ * ret = sequence_decode_c(stream_char, stream_len)\n+ * return ret # <<<<<<<<<<<<<<\n+ * \n+ * cdef list sequence_decode_c(char *stream, size_t stream_len):\n+ *\/\n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(__pyx_v_ret);\n+ __pyx_r = __pyx_v_ret;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":392\n+ * return value\n+ * \n+ * def sequence_decode(bytes stream not None) -> list: # <<<<<<<<<<<<<<\n+ * cdef char * stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.sequence_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_XDECREF(__pyx_v_ret);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":399\n+ * return ret\n+ * \n+ * cdef list sequence_decode_c(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * Decode input stream into as sequence\n+ *\/\n+\n+static PyObject *__pyx_f_8fastsnmp_11snmp_parser_sequence_decode_c(char *__pyx_v_stream, size_t __pyx_v_stream_len) {\n+ uint64_t __pyx_v_tag;\n+ uint64_t __pyx_v_tmp_int_val;\n+ size_t __pyx_v_encode_length;\n+ size_t __pyx_v_length;\n+ size_t __pyx_v_offset;\n+ PyObject *__pyx_v_str_val = 0;\n+ char *__pyx_v_stream_char;\n+ PyObject *__pyx_v_objects = 0;\n+ PyObject *__pyx_v_tmp_list_val = 0;\n+ PyObject *__pyx_v_tmp_objectid = 0;\n+ PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n int __pyx_t_2;\n int __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n- PyObject *__pyx_t_5 = NULL;\n- PyObject *__pyx_t_6 = NULL;\n- __Pyx_RefNannySetupContext(\"integer_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":230\n- * :rtype: int\n- * \"\"\"\n- * if stream in integer_encode_cache: # <<<<<<<<<<<<<<\n- * return integer_decode_cache[stream]\n- * else:\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 230, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_v_stream, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 230, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_3 = (__pyx_t_2 != 0);\n- if (__pyx_t_3) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":231\n- * \"\"\"\n- * if stream in integer_encode_cache:\n- * return integer_decode_cache[stream] # <<<<<<<<<<<<<<\n- * else:\n- * return int.from_bytes(stream, byteorder='big', signed=True)\n- *\/\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 231, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_stream); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 231, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n- goto __pyx_L0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":230\n- * :rtype: int\n- * \"\"\"\n- * if stream in integer_encode_cache: # <<<<<<<<<<<<<<\n- * return integer_decode_cache[stream]\n- * else:\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":233\n- * return integer_decode_cache[stream]\n- * else:\n- * return int.from_bytes(stream, byteorder='big', signed=True) # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- \/*else*\/ {\n- __Pyx_XDECREF(__pyx_r);\n- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)(&PyInt_Type)), __pyx_n_s_from_bytes); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 233, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 233, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_stream);\n- __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 233, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_byteorder, __pyx_n_u_big) < 0) __PYX_ERR(0, 233, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_signed, Py_True) < 0) __PYX_ERR(0, 233, __pyx_L1_error)\n- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 233, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_r = __pyx_t_6;\n- __pyx_t_6 = 0;\n- goto __pyx_L0;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":221\n- * \n- * \n- * def integer_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode input stream into a integer\n- *\/\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_XDECREF(__pyx_t_6);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.integer_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __pyx_L0:;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":236\n- * \n- * \n- * def sequence_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode input stream into as sequence\n- *\/\n-\n-\/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_14sequence_decode[] = \"sequence_decode(stream)\\n\\n Decode input stream into as sequence\\n\\n :param stream: sequence\\n :type stream: bytes\\n :returns: decoded sequence\\n :rtype: list\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_15sequence_decode = {\"sequence_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_14sequence_decode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_15sequence_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_r = 0;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"sequence_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_14sequence_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n-\n- \/* function exit code *\/\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_14sequence_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_v_objects = NULL;\n- PyObject *__pyx_v_tag = NULL;\n- PyObject *__pyx_v_length = NULL;\n- PyObject *__pyx_v_objectData = NULL;\n- PyObject *__pyx_v_parsed_objectData = NULL;\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- int __pyx_t_2;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- PyObject *__pyx_t_5 = NULL;\n- PyObject *(*__pyx_t_6)(PyObject *);\n- int __pyx_t_7;\n- __Pyx_RefNannySetupContext(\"sequence_decode\", 0);\n- __Pyx_INCREF(__pyx_v_stream);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":245\n+ int __pyx_t_4;\n+ int __pyx_t_5;\n+ struct __pyx_opt_args_8fastsnmp_11snmp_parser_c_octetstring_decode __pyx_t_6;\n+ PyObject *__pyx_t_7 = NULL;\n+ __Pyx_RefNannySetupContext(\"sequence_decode_c\", 0);\n+ __Pyx_TraceCall(\"sequence_decode_c\", __pyx_f[0], 399, 0, __PYX_ERR(0, 399, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":408\n * :rtype: list\n * \"\"\"\n- * objects = [] # <<<<<<<<<<<<<<\n- * while stream:\n- * (tag, stream) = tag_decode(stream)\n- *\/\n- __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 245, __pyx_L1_error)\n+ * cdef uint64_t tag=0, tmp_int_val # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length, offset=0\n+ * cdef object str_val\n+ *\/\n+ __pyx_v_tag = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":409\n+ * \"\"\"\n+ * cdef uint64_t tag=0, tmp_int_val\n+ * cdef size_t encode_length, length, offset=0 # <<<<<<<<<<<<<<\n+ * cdef object str_val\n+ * cdef char * stream_char = stream\n+ *\/\n+ __pyx_v_offset = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":411\n+ * cdef size_t encode_length, length, offset=0\n+ * cdef object str_val\n+ * cdef char * stream_char = stream # <<<<<<<<<<<<<<\n+ * cdef list objects=[], tmp_list_val\n+ * cdef tuple tmp_tuple_val\n+ *\/\n+ __pyx_v_stream_char = __pyx_v_stream;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":412\n+ * cdef object str_val\n+ * cdef char * stream_char = stream\n+ * cdef list objects=[], tmp_list_val # <<<<<<<<<<<<<<\n+ * cdef tuple tmp_tuple_val\n+ * cdef str tmp_objectid\n+ *\/\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 412, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_objects = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":246\n- * \"\"\"\n- * objects = []\n- * while stream: # <<<<<<<<<<<<<<\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":416\n+ * cdef str tmp_objectid\n+ * \n+ * while offset<stream_len: # <<<<<<<<<<<<<<\n+ * tag_decode_c(stream_char, &tag, &encode_length)\n+ * stream_char += encode_length\n *\/\n while (1) {\n- __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_stream); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 246, __pyx_L1_error)\n+ __pyx_t_2 = ((__pyx_v_offset < __pyx_v_stream_len) != 0);\n if (!__pyx_t_2) break;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":247\n- * objects = []\n- * while stream:\n- * (tag, stream) = tag_decode(stream) # <<<<<<<<<<<<<<\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length]\n- *\/\n- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_decode); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) {\n- __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_3);\n- if (likely(__pyx_t_4)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);\n- __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_3, function);\n- }\n- }\n- if (!__pyx_t_4) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_stream); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 247, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":417\n+ * \n+ * while offset<stream_len:\n+ * tag_decode_c(stream_char, &tag, &encode_length) # <<<<<<<<<<<<<<\n+ * stream_char += encode_length\n+ * offset += encode_length\n+ *\/\n+ __pyx_t_3 = __pyx_f_8fastsnmp_11snmp_parser_tag_decode_c(__pyx_v_stream_char, (&__pyx_v_tag), (&__pyx_v_encode_length)); if (unlikely(__pyx_t_3 == -1)) __PYX_ERR(0, 417, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":418\n+ * while offset<stream_len:\n+ * tag_decode_c(stream_char, &tag, &encode_length)\n+ * stream_char += encode_length # <<<<<<<<<<<<<<\n+ * offset += encode_length\n+ * \n+ *\/\n+ __pyx_v_stream_char = (__pyx_v_stream_char + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":419\n+ * tag_decode_c(stream_char, &tag, &encode_length)\n+ * stream_char += encode_length\n+ * offset += encode_length # <<<<<<<<<<<<<<\n+ * \n+ * length_decode_c(stream_char, &length, &encode_length)\n+ *\/\n+ __pyx_v_offset = (__pyx_v_offset + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":421\n+ * offset += encode_length\n+ * \n+ * length_decode_c(stream_char, &length, &encode_length) # <<<<<<<<<<<<<<\n+ * stream_char+=encode_length\n+ * offset += encode_length\n+ *\/\n+ __pyx_f_8fastsnmp_11snmp_parser_length_decode_c(__pyx_v_stream_char, (&__pyx_v_length), (&__pyx_v_encode_length));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":422\n+ * \n+ * length_decode_c(stream_char, &length, &encode_length)\n+ * stream_char+=encode_length # <<<<<<<<<<<<<<\n+ * offset += encode_length\n+ * \n+ *\/\n+ __pyx_v_stream_char = (__pyx_v_stream_char + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":423\n+ * length_decode_c(stream_char, &length, &encode_length)\n+ * stream_char+=encode_length\n+ * offset += encode_length # <<<<<<<<<<<<<<\n+ * \n+ * if tag in [0x02, 0x40, 0x41, 0x42, 0x46, 0x43]:\n+ *\/\n+ __pyx_v_offset = (__pyx_v_offset + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":425\n+ * offset += encode_length\n+ * \n+ * if tag in [0x02, 0x40, 0x41, 0x42, 0x46, 0x43]: # <<<<<<<<<<<<<<\n+ * tmp_int_val = integer_decode_c(stream_char, &length)\n+ * objects.append(tmp_int_val)\n+ *\/\n+ switch (__pyx_v_tag) {\n+ case 0x02:\n+ case 0x40:\n+ case 0x41:\n+ case 0x42:\n+ case 0x46:\n+ case 0x43:\n+ __pyx_t_2 = 1;\n+ break;\n+ default:\n+ __pyx_t_2 = 0;\n+ break;\n+ }\n+ __pyx_t_4 = (__pyx_t_2 != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":426\n+ * \n+ * if tag in [0x02, 0x40, 0x41, 0x42, 0x46, 0x43]:\n+ * tmp_int_val = integer_decode_c(stream_char, &length) # <<<<<<<<<<<<<<\n+ * objects.append(tmp_int_val)\n+ * elif tag == 0x06:\n+ *\/\n+ __pyx_v_tmp_int_val = __pyx_f_8fastsnmp_11snmp_parser_integer_decode_c(__pyx_v_stream_char, (&__pyx_v_length));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":427\n+ * if tag in [0x02, 0x40, 0x41, 0x42, 0x46, 0x43]:\n+ * tmp_int_val = integer_decode_c(stream_char, &length)\n+ * objects.append(tmp_int_val) # <<<<<<<<<<<<<<\n+ * elif tag == 0x06:\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ *\/\n+ __pyx_t_1 = __Pyx_PyInt_From_uint64_t(__pyx_v_tmp_int_val); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 427, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_3)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4); __pyx_t_4 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_v_stream);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) {\n- PyObject* sequence = __pyx_t_1;\n- #if !CYTHON_COMPILING_IN_PYPY\n- Py_ssize_t size = Py_SIZE(sequence);\n- #else\n- Py_ssize_t size = PySequence_Size(sequence);\n- #endif\n- if (unlikely(size != 2)) {\n- if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n- else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 247, __pyx_L1_error)\n- }\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_3 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_5 = PyTuple_GET_ITEM(sequence, 1); \n- } else {\n- __pyx_t_3 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_5 = PyList_GET_ITEM(sequence, 1); \n- }\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(__pyx_t_5);\n- #else\n- __pyx_t_3 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- #endif\n+ __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_objects, __pyx_t_1); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 427, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- } else {\n- Py_ssize_t index = -1;\n- __pyx_t_4 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 247, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":425\n+ * offset += encode_length\n+ * \n+ * if tag in [0x02, 0x40, 0x41, 0x42, 0x46, 0x43]: # <<<<<<<<<<<<<<\n+ * tmp_int_val = integer_decode_c(stream_char, &length)\n+ * objects.append(tmp_int_val)\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":428\n+ * tmp_int_val = integer_decode_c(stream_char, &length)\n+ * objects.append(tmp_int_val)\n+ * elif tag == 0x06: # <<<<<<<<<<<<<<\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ * objects.append(tmp_objectid)\n+ *\/\n+ __pyx_t_4 = ((__pyx_v_tag == 0x06) != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":429\n+ * objects.append(tmp_int_val)\n+ * elif tag == 0x06:\n+ * tmp_objectid = objectid_decode_str(stream_char, length) # <<<<<<<<<<<<<<\n+ * objects.append(tmp_objectid)\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]:\n+ *\/\n+ __pyx_t_1 = __pyx_f_8fastsnmp_11snmp_parser_objectid_decode_str(__pyx_v_stream_char, __pyx_v_length); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"unicode\", Py_TYPE(__pyx_t_1)->tp_name), 0))) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __Pyx_XDECREF_SET(__pyx_v_tmp_objectid, ((PyObject*)__pyx_t_1));\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":430\n+ * elif tag == 0x06:\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ * objects.append(tmp_objectid) # <<<<<<<<<<<<<<\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]:\n+ * objects.append(None)\n+ *\/\n+ __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_objects, __pyx_v_tmp_objectid); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 430, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":428\n+ * tmp_int_val = integer_decode_c(stream_char, &length)\n+ * objects.append(tmp_int_val)\n+ * elif tag == 0x06: # <<<<<<<<<<<<<<\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ * objects.append(tmp_objectid)\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":431\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ * objects.append(tmp_objectid)\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]: # <<<<<<<<<<<<<<\n+ * objects.append(None)\n+ * elif tag in [0x30, 0xa2, 0xa5]:\n+ *\/\n+ switch (__pyx_v_tag) {\n+ case 0x80:\n+ case 0x81:\n+ case 0x82:\n+ case 0x05:\n+ __pyx_t_4 = 1;\n+ break;\n+ default:\n+ __pyx_t_4 = 0;\n+ break;\n+ }\n+ __pyx_t_2 = (__pyx_t_4 != 0);\n+ if (__pyx_t_2) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":432\n+ * objects.append(tmp_objectid)\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]:\n+ * objects.append(None) # <<<<<<<<<<<<<<\n+ * elif tag in [0x30, 0xa2, 0xa5]:\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ *\/\n+ __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_objects, Py_None); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 432, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":431\n+ * tmp_objectid = objectid_decode_str(stream_char, length)\n+ * objects.append(tmp_objectid)\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]: # <<<<<<<<<<<<<<\n+ * objects.append(None)\n+ * elif tag in [0x30, 0xa2, 0xa5]:\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":433\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]:\n+ * objects.append(None)\n+ * elif tag in [0x30, 0xa2, 0xa5]: # <<<<<<<<<<<<<<\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ * objects.append(tmp_list_val)\n+ *\/\n+ switch (__pyx_v_tag) {\n+ case 0x30:\n+ case 0xa2:\n+ case 0xa5:\n+ __pyx_t_2 = 1;\n+ break;\n+ default:\n+ __pyx_t_2 = 0;\n+ break;\n+ }\n+ __pyx_t_4 = (__pyx_t_2 != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":434\n+ * objects.append(None)\n+ * elif tag in [0x30, 0xa2, 0xa5]:\n+ * tmp_list_val = sequence_decode_c(stream_char, length) # <<<<<<<<<<<<<<\n+ * objects.append(tmp_list_val)\n+ * elif tag in [0x04, 0x40]:\n+ *\/\n+ __pyx_t_1 = __pyx_f_8fastsnmp_11snmp_parser_sequence_decode_c(__pyx_v_stream_char, __pyx_v_length); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 434, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_XDECREF_SET(__pyx_v_tmp_list_val, ((PyObject*)__pyx_t_1));\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":435\n+ * elif tag in [0x30, 0xa2, 0xa5]:\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ * objects.append(tmp_list_val) # <<<<<<<<<<<<<<\n+ * elif tag in [0x04, 0x40]:\n+ * str_val = c_octetstring_decode(stream_char, length, 1)\n+ *\/\n+ __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_objects, __pyx_v_tmp_list_val); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 435, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":433\n+ * elif tag in [0x80, 0x81, 0x82, 0x05]:\n+ * objects.append(None)\n+ * elif tag in [0x30, 0xa2, 0xa5]: # <<<<<<<<<<<<<<\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ * objects.append(tmp_list_val)\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":436\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ * objects.append(tmp_list_val)\n+ * elif tag in [0x04, 0x40]: # <<<<<<<<<<<<<<\n+ * str_val = c_octetstring_decode(stream_char, length, 1)\n+ * objects.append(str_val)\n+ *\/\n+ switch (__pyx_v_tag) {\n+ case 0x04:\n+ case 0x40:\n+ __pyx_t_4 = 1;\n+ break;\n+ default:\n+ __pyx_t_4 = 0;\n+ break;\n+ }\n+ __pyx_t_2 = (__pyx_t_4 != 0);\n+ if (__pyx_t_2) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":437\n+ * objects.append(tmp_list_val)\n+ * elif tag in [0x04, 0x40]:\n+ * str_val = c_octetstring_decode(stream_char, length, 1) # <<<<<<<<<<<<<<\n+ * objects.append(str_val)\n+ * else:\n+ *\/\n+ __pyx_t_6.__pyx_n = 1;\n+ __pyx_t_6.auto_str = 1;\n+ __pyx_t_1 = __pyx_f_8fastsnmp_11snmp_parser_c_octetstring_decode(__pyx_v_stream_char, __pyx_v_length, &__pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 437, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_XDECREF_SET(__pyx_v_str_val, __pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":438\n+ * elif tag in [0x04, 0x40]:\n+ * str_val = c_octetstring_decode(stream_char, length, 1)\n+ * objects.append(str_val) # <<<<<<<<<<<<<<\n+ * else:\n+ * raise NotImplementedError(tag)\n+ *\/\n+ __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_objects, __pyx_v_str_val); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 438, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":436\n+ * tmp_list_val = sequence_decode_c(stream_char, length)\n+ * objects.append(tmp_list_val)\n+ * elif tag in [0x04, 0x40]: # <<<<<<<<<<<<<<\n+ * str_val = c_octetstring_decode(stream_char, length, 1)\n+ * objects.append(str_val)\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":440\n+ * objects.append(str_val)\n+ * else:\n+ * raise NotImplementedError(tag) # <<<<<<<<<<<<<<\n+ * \n+ * offset += length\n+ *\/\n+ \/*else*\/ {\n+ __pyx_t_1 = __Pyx_PyInt_From_uint64_t(__pyx_v_tag); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_NotImplementedError, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_6 = Py_TYPE(__pyx_t_4)->tp_iternext;\n- index = 0; __pyx_t_3 = __pyx_t_6(__pyx_t_4); if (unlikely(!__pyx_t_3)) goto __pyx_L5_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_3);\n- index = 1; __pyx_t_5 = __pyx_t_6(__pyx_t_4); if (unlikely(!__pyx_t_5)) goto __pyx_L5_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_5);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_4), 2) < 0) __PYX_ERR(0, 247, __pyx_L1_error)\n- __pyx_t_6 = NULL;\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- goto __pyx_L6_unpacking_done;\n- __pyx_L5_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_6 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 247, __pyx_L1_error)\n- __pyx_L6_unpacking_done:;\n- }\n- __Pyx_XDECREF_SET(__pyx_v_tag, __pyx_t_3);\n- __pyx_t_3 = 0;\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_5);\n- __pyx_t_5 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":248\n- * while stream:\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream) # <<<<<<<<<<<<<<\n- * objectData = stream[:length]\n- * stream = stream[length:]\n- *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_decode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_3 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n- __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);\n- if (likely(__pyx_t_3)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_5, function);\n- }\n- }\n- if (!__pyx_t_3) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_stream); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_5)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_4, 0+1, __pyx_v_stream);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) {\n- PyObject* sequence = __pyx_t_1;\n- #if !CYTHON_COMPILING_IN_PYPY\n- Py_ssize_t size = Py_SIZE(sequence);\n- #else\n- Py_ssize_t size = PySequence_Size(sequence);\n- #endif\n- if (unlikely(size != 2)) {\n- if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n- else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 248, __pyx_L1_error)\n- }\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_5 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 1); \n- } else {\n- __pyx_t_5 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyList_GET_ITEM(sequence, 1); \n- }\n- __Pyx_INCREF(__pyx_t_5);\n- __Pyx_INCREF(__pyx_t_4);\n- #else\n- __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- #endif\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- } else {\n- Py_ssize_t index = -1;\n- __pyx_t_3 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 248, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_6 = Py_TYPE(__pyx_t_3)->tp_iternext;\n- index = 0; __pyx_t_5 = __pyx_t_6(__pyx_t_3); if (unlikely(!__pyx_t_5)) goto __pyx_L7_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_5);\n- index = 1; __pyx_t_4 = __pyx_t_6(__pyx_t_3); if (unlikely(!__pyx_t_4)) goto __pyx_L7_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_6(__pyx_t_3), 2) < 0) __PYX_ERR(0, 248, __pyx_L1_error)\n- __pyx_t_6 = NULL;\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- goto __pyx_L8_unpacking_done;\n- __pyx_L7_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_6 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 248, __pyx_L1_error)\n- __pyx_L8_unpacking_done:;\n- }\n- __Pyx_XDECREF_SET(__pyx_v_length, __pyx_t_5);\n- __pyx_t_5 = 0;\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":249\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length] # <<<<<<<<<<<<<<\n- * stream = stream[length:]\n- * parsed_objectData = tagDecodeDict[tag](objectData)\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, NULL, &__pyx_v_length, NULL, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 249, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_XDECREF_SET(__pyx_v_objectData, __pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":250\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length]\n- * stream = stream[length:] # <<<<<<<<<<<<<<\n- * parsed_objectData = tagDecodeDict[tag](objectData)\n- * # print(tag, length, objectData,parsed_objectData)\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, &__pyx_v_length, NULL, NULL, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 250, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":251\n- * objectData = stream[:length]\n- * stream = stream[length:]\n- * parsed_objectData = tagDecodeDict[tag](objectData) # <<<<<<<<<<<<<<\n- * # print(tag, length, objectData,parsed_objectData)\n- * objects.append(parsed_objectData)\n- *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tagDecodeDict); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetItem(__pyx_t_4, __pyx_v_tag); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n- __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_5);\n- if (likely(__pyx_t_4)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);\n- __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_5, function);\n- }\n- }\n- if (!__pyx_t_4) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_objectData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_5)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_v_objectData};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_v_objectData};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4); __pyx_t_4 = NULL;\n- __Pyx_INCREF(__pyx_v_objectData);\n- __Pyx_GIVEREF(__pyx_v_objectData);\n- PyTuple_SET_ITEM(__pyx_t_3, 0+1, __pyx_v_objectData);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 251, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __Pyx_XDECREF_SET(__pyx_v_parsed_objectData, __pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":253\n- * parsed_objectData = tagDecodeDict[tag](objectData)\n- * # print(tag, length, objectData,parsed_objectData)\n- * objects.append(parsed_objectData) # <<<<<<<<<<<<<<\n+ __PYX_ERR(0, 440, __pyx_L1_error)\n+ }\n+ __pyx_L5:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":442\n+ * raise NotImplementedError(tag)\n+ * \n+ * offset += length # <<<<<<<<<<<<<<\n+ * stream_char += length\n * return objects\n- * \n- *\/\n- __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_objects, __pyx_v_parsed_objectData); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 253, __pyx_L1_error)\n+ *\/\n+ __pyx_v_offset = (__pyx_v_offset + __pyx_v_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":443\n+ * \n+ * offset += length\n+ * stream_char += length # <<<<<<<<<<<<<<\n+ * return objects\n+ * \n+ *\/\n+ __pyx_v_stream_char = (__pyx_v_stream_char + __pyx_v_length);\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":254\n- * # print(tag, length, objectData,parsed_objectData)\n- * objects.append(parsed_objectData)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":444\n+ * offset += length\n+ * stream_char += length\n * return objects # <<<<<<<<<<<<<<\n * \n- * tagDecodeDict = {\n+ * \n *\/\n __Pyx_XDECREF(__pyx_r);\n __Pyx_INCREF(__pyx_v_objects);\n __pyx_r = __pyx_v_objects;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":236\n- * \n- * \n- * def sequence_decode(stream): # <<<<<<<<<<<<<<\n+ \/* \"fastsnmp\/snmp_parser.pyx\":399\n+ * return ret\n+ * \n+ * cdef list sequence_decode_c(char *stream, size_t stream_len): # <<<<<<<<<<<<<<\n * \"\"\"\n * Decode input stream into as sequence\n *\/\n@@ -3987,275 +5216,228 @@\n \/* function exit code *\/\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.sequence_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n+ __Pyx_XDECREF(__pyx_t_7);\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.sequence_decode_c\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = 0;\n __pyx_L0:;\n+ __Pyx_XDECREF(__pyx_v_str_val);\n __Pyx_XDECREF(__pyx_v_objects);\n- __Pyx_XDECREF(__pyx_v_tag);\n- __Pyx_XDECREF(__pyx_v_length);\n- __Pyx_XDECREF(__pyx_v_objectData);\n- __Pyx_XDECREF(__pyx_v_parsed_objectData);\n- __Pyx_XDECREF(__pyx_v_stream);\n+ __Pyx_XDECREF(__pyx_v_tmp_list_val);\n+ __Pyx_XDECREF(__pyx_v_tmp_objectid);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":277\n- * \n- * \n- * def length_decode(stream): # <<<<<<<<<<<<<<\n+\/* \"fastsnmp\/snmp_parser.pyx\":447\n+ * \n+ * \n+ * cdef int length_decode_c(char *stream, size_t *length, size_t *enc_len): # <<<<<<<<<<<<<<\n * \"\"\"\n- * Decode a BER length field, returing the length and the\n+ * X.690 8,1,3\n+ *\/\n+\n+static int __pyx_f_8fastsnmp_11snmp_parser_length_decode_c(char *__pyx_v_stream, size_t *__pyx_v_length, size_t *__pyx_v_enc_len) {\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ long __pyx_t_2;\n+ __Pyx_RefNannySetupContext(\"length_decode_c\", 0);\n+ __Pyx_TraceCall(\"length_decode_c\", __pyx_f[0], 447, 0, __PYX_ERR(0, 447, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":451\n+ * X.690 8,1,3\n+ * \"\"\"\n+ * length[0] = <uint8_t>stream[0] # <<<<<<<<<<<<<<\n+ * enc_len[0] = 1\n+ * \n+ *\/\n+ (__pyx_v_length[0]) = ((uint8_t)(__pyx_v_stream[0]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":452\n+ * \"\"\"\n+ * length[0] = <uint8_t>stream[0]\n+ * enc_len[0] = 1 # <<<<<<<<<<<<<<\n+ * \n+ * if length[0] & 0x80 == 0x80: # 8.1.3.5\n+ *\/\n+ (__pyx_v_enc_len[0]) = 1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":454\n+ * enc_len[0] = 1\n+ * \n+ * if length[0] & 0x80 == 0x80: # 8.1.3.5 # <<<<<<<<<<<<<<\n+ * enc_len[0] = length[0] & 0x7f\n+ * length[0] = integer_decode_c(stream+1, enc_len)\n+ *\/\n+ __pyx_t_1 = ((((__pyx_v_length[0]) & 0x80) == 0x80) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":455\n+ * \n+ * if length[0] & 0x80 == 0x80: # 8.1.3.5\n+ * enc_len[0] = length[0] & 0x7f # <<<<<<<<<<<<<<\n+ * length[0] = integer_decode_c(stream+1, enc_len)\n+ * enc_len[0] += 1\n+ *\/\n+ (__pyx_v_enc_len[0]) = ((__pyx_v_length[0]) & 0x7f);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":456\n+ * if length[0] & 0x80 == 0x80: # 8.1.3.5\n+ * enc_len[0] = length[0] & 0x7f\n+ * length[0] = integer_decode_c(stream+1, enc_len) # <<<<<<<<<<<<<<\n+ * enc_len[0] += 1\n+ * \n+ *\/\n+ (__pyx_v_length[0]) = __pyx_f_8fastsnmp_11snmp_parser_integer_decode_c((__pyx_v_stream + 1), __pyx_v_enc_len);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":457\n+ * enc_len[0] = length[0] & 0x7f\n+ * length[0] = integer_decode_c(stream+1, enc_len)\n+ * enc_len[0] += 1 # <<<<<<<<<<<<<<\n+ * \n+ * return 0\n+ *\/\n+ __pyx_t_2 = 0;\n+ (__pyx_v_enc_len[__pyx_t_2]) = ((__pyx_v_enc_len[__pyx_t_2]) + 1);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":454\n+ * enc_len[0] = 1\n+ * \n+ * if length[0] & 0x80 == 0x80: # 8.1.3.5 # <<<<<<<<<<<<<<\n+ * enc_len[0] = length[0] & 0x7f\n+ * length[0] = integer_decode_c(stream+1, enc_len)\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":459\n+ * enc_len[0] += 1\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * \n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":447\n+ * \n+ * \n+ * cdef int length_decode_c(char *stream, size_t *length, size_t *enc_len): # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * X.690 8,1,3\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_WriteUnraisable(\"fastsnmp.snmp_parser.length_decode_c\", __pyx_clineno, __pyx_lineno, __pyx_filename, 0, 0);\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":462\n+ * \n+ * \n+ * def length_decode(bytes data): # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length)\n *\/\n \n \/* Python wrapper *\/\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_17length_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_16length_decode[] = \"length_decode(stream)\\n\\n Decode a BER length field, returing the length and the\\n remainder of the stream\\n\\n :param stream: sequence\\n :type stream: bytes\\n :returns: (length, remaining stream)\\n :rtype: tuple\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_17length_decode = {\"length_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_17length_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_16length_decode};\n-static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_17length_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_17length_decode(PyObject *__pyx_self, PyObject *__pyx_v_data); \/*proto*\/\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_17length_decode = {\"length_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_17length_decode, METH_O, 0};\n+static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_17length_decode(PyObject *__pyx_self, PyObject *__pyx_v_data) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"length_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_16length_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_data), (&PyBytes_Type), 1, \"data\", 1))) __PYX_ERR(0, 462, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_16length_decode(__pyx_self, ((PyObject*)__pyx_v_data));\n \n \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_16length_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_v_length = NULL;\n- PyObject *__pyx_v_n = NULL;\n- PyObject *__pyx_v_run = NULL;\n- CYTHON_UNUSED PyObject *__pyx_v_i = NULL;\n+static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_16length_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_data) {\n+ size_t __pyx_v_encode_length;\n+ size_t __pyx_v_length;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- int __pyx_t_2;\n+ char *__pyx_t_1;\n+ PyObject *__pyx_t_2 = NULL;\n PyObject *__pyx_t_3 = NULL;\n- Py_ssize_t __pyx_t_4;\n- PyObject *(*__pyx_t_5)(PyObject *);\n- PyObject *__pyx_t_6 = NULL;\n- PyObject *__pyx_t_7 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__17)\n __Pyx_RefNannySetupContext(\"length_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":287\n- * :rtype: tuple\n- * \"\"\"\n- * length = stream[0] # <<<<<<<<<<<<<<\n- * n = 1\n- * if length & 0x80:\n- *\/\n- __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_stream, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 287, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_v_length = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":288\n- * \"\"\"\n- * length = stream[0]\n- * n = 1 # <<<<<<<<<<<<<<\n- * if length & 0x80:\n- * # Multi-Octet length encoding. The first octet\n- *\/\n- __Pyx_INCREF(__pyx_int_1);\n- __pyx_v_n = __pyx_int_1;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":289\n- * length = stream[0]\n- * n = 1\n- * if length & 0x80: # <<<<<<<<<<<<<<\n- * # Multi-Octet length encoding. The first octet\n- * # represents the run-length (the number of octets used to\n- *\/\n- __pyx_t_1 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_128, 0x80, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 289, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 289, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (__pyx_t_2) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":293\n- * # represents the run-length (the number of octets used to\n- * # build the length)\n- * run = length & 0x7F # <<<<<<<<<<<<<<\n- * length = 0\n- * for i in range(run):\n- *\/\n- __pyx_t_1 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_127, 0x7F, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 293, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_v_run = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":294\n- * # build the length)\n- * run = length & 0x7F\n- * length = 0 # <<<<<<<<<<<<<<\n- * for i in range(run):\n- * length = (length << 8) | stream[n]\n- *\/\n- __Pyx_INCREF(__pyx_int_0);\n- __Pyx_DECREF_SET(__pyx_v_length, __pyx_int_0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":295\n- * run = length & 0x7F\n- * length = 0\n- * for i in range(run): # <<<<<<<<<<<<<<\n- * length = (length << 8) | stream[n]\n- * n += 1\n- *\/\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 295, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_INCREF(__pyx_v_run);\n- __Pyx_GIVEREF(__pyx_v_run);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_run);\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 295, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (likely(PyList_CheckExact(__pyx_t_3)) || PyTuple_CheckExact(__pyx_t_3)) {\n- __pyx_t_1 = __pyx_t_3; __Pyx_INCREF(__pyx_t_1); __pyx_t_4 = 0;\n- __pyx_t_5 = NULL;\n- } else {\n- __pyx_t_4 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 295, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 295, __pyx_L1_error)\n- }\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- for (;;) {\n- if (likely(!__pyx_t_5)) {\n- if (likely(PyList_CheckExact(__pyx_t_1))) {\n- if (__pyx_t_4 >= PyList_GET_SIZE(__pyx_t_1)) break;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_3 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely(0 < 0)) __PYX_ERR(0, 295, __pyx_L1_error)\n- #else\n- __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 295, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- #endif\n- } else {\n- if (__pyx_t_4 >= PyTuple_GET_SIZE(__pyx_t_1)) break;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_4); __Pyx_INCREF(__pyx_t_3); __pyx_t_4++; if (unlikely(0 < 0)) __PYX_ERR(0, 295, __pyx_L1_error)\n- #else\n- __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_4); __pyx_t_4++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 295, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- #endif\n- }\n- } else {\n- __pyx_t_3 = __pyx_t_5(__pyx_t_1);\n- if (unlikely(!__pyx_t_3)) {\n- PyObject* exc_type = PyErr_Occurred();\n- if (exc_type) {\n- if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();\n- else __PYX_ERR(0, 295, __pyx_L1_error)\n- }\n- break;\n- }\n- __Pyx_GOTREF(__pyx_t_3);\n- }\n- __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_3);\n- __pyx_t_3 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":296\n- * length = 0\n- * for i in range(run):\n- * length = (length << 8) | stream[n] # <<<<<<<<<<<<<<\n- * n += 1\n- * return length, stream[n:]\n- *\/\n- __pyx_t_3 = __Pyx_PyInt_LshiftObjC(__pyx_v_length, __pyx_int_8, 8, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 296, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_6 = PyObject_GetItem(__pyx_v_stream, __pyx_v_n); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 296, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_7 = PyNumber_Or(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 296, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_DECREF_SET(__pyx_v_length, __pyx_t_7);\n- __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":297\n- * for i in range(run):\n- * length = (length << 8) | stream[n]\n- * n += 1 # <<<<<<<<<<<<<<\n- * return length, stream[n:]\n- * \n- *\/\n- __pyx_t_7 = __Pyx_PyInt_AddObjC(__pyx_v_n, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 297, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF_SET(__pyx_v_n, __pyx_t_7);\n- __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":295\n- * run = length & 0x7F\n- * length = 0\n- * for i in range(run): # <<<<<<<<<<<<<<\n- * length = (length << 8) | stream[n]\n- * n += 1\n- *\/\n- }\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":289\n- * length = stream[0]\n- * n = 1\n- * if length & 0x80: # <<<<<<<<<<<<<<\n- * # Multi-Octet length encoding. The first octet\n- * # represents the run-length (the number of octets used to\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":298\n- * length = (length << 8) | stream[n]\n- * n += 1\n- * return length, stream[n:] # <<<<<<<<<<<<<<\n+ __Pyx_TraceCall(\"length_decode\", __pyx_f[0], 462, 0, __PYX_ERR(0, 462, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":464\n+ * def length_decode(bytes data):\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length) # <<<<<<<<<<<<<<\n+ * return length, encode_length\n+ * \n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_data); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 464, __pyx_L1_error)\n+ __pyx_f_8fastsnmp_11snmp_parser_length_decode_c(__pyx_t_1, (&__pyx_v_length), (&__pyx_v_encode_length));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":465\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length)\n+ * return length, encode_length # <<<<<<<<<<<<<<\n * \n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, &__pyx_v_n, NULL, NULL, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 298, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 298, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_INCREF(__pyx_v_length);\n- __Pyx_GIVEREF(__pyx_v_length);\n- PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_length);\n- __Pyx_GIVEREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_1);\n- __pyx_t_1 = 0;\n- __pyx_r = __pyx_t_7;\n- __pyx_t_7 = 0;\n+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_length); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 465, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_encode_length); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 465, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 465, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);\n+ __pyx_t_2 = 0;\n+ __pyx_t_3 = 0;\n+ __pyx_r = __pyx_t_4;\n+ __pyx_t_4 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":277\n- * \n- * \n- * def length_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER length field, returing the length and the\n+ \/* \"fastsnmp\/snmp_parser.pyx\":462\n+ * \n+ * \n+ * def length_decode(bytes data): # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length)\n *\/\n \n \/* function exit code *\/\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_6);\n- __Pyx_XDECREF(__pyx_t_7);\n+ __Pyx_XDECREF(__pyx_t_4);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.length_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_length);\n- __Pyx_XDECREF(__pyx_v_n);\n- __Pyx_XDECREF(__pyx_v_run);\n- __Pyx_XDECREF(__pyx_v_i);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":301\n+\/* \"fastsnmp\/snmp_parser.pyx\":468\n * \n * \n * def length_encode(length): # <<<<<<<<<<<<<<\n@@ -4265,7 +5447,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_19length_encode(PyObject *__pyx_self, PyObject *__pyx_v_length); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_18length_encode[] = \"length_encode(length)\\n\\n Function takes the length of the contents and\\n produces the encoding for that length. Section 6.3 of\\n ITU-T-X.209\\n\\n :param length: length\\n :type length: int\\n :returns: encoded length\\n :rtype: bytes\\n \";\n+static char __pyx_doc_8fastsnmp_11snmp_parser_18length_encode[] = \"\\n Function takes the length of the contents and\\n produces the encoding for that length. Section 6.3 of\\n ITU-T-X.209\\n\\n :param length: length\\n :type length: int\\n :returns: encoded length\\n :rtype: bytes\\n \";\n static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_19length_encode = {\"length_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_19length_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_18length_encode};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_19length_encode(PyObject *__pyx_self, PyObject *__pyx_v_length) {\n PyObject *__pyx_r = 0;\n@@ -4283,6 +5465,7 @@\n PyObject *__pyx_v_resultlist = NULL;\n PyObject *__pyx_v_numOctets = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n int __pyx_t_2;\n@@ -4292,24 +5475,26 @@\n PyObject *__pyx_t_6 = NULL;\n int __pyx_t_7;\n PyObject *__pyx_t_8 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__18)\n __Pyx_RefNannySetupContext(\"length_encode\", 0);\n+ __Pyx_TraceCall(\"length_encode\", __pyx_f[0], 468, 0, __PYX_ERR(0, 468, __pyx_L1_error));\n __Pyx_INCREF(__pyx_v_length);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":312\n+ \/* \"fastsnmp\/snmp_parser.pyx\":479\n * :rtype: bytes\n * \"\"\"\n * if length in length_cache: # <<<<<<<<<<<<<<\n * return length_cache[length]\n * \n *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 312, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 479, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_v_length, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 312, __pyx_L1_error)\n+ __pyx_t_2 = (__Pyx_PySequence_ContainsTF(__pyx_v_length, __pyx_t_1, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 479, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_t_3 = (__pyx_t_2 != 0);\n if (__pyx_t_3) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":313\n+ \/* \"fastsnmp\/snmp_parser.pyx\":480\n * \"\"\"\n * if length in length_cache:\n * return length_cache[length] # <<<<<<<<<<<<<<\n@@ -4317,16 +5502,16 @@\n * if length < 127:\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 313, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 480, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_length); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 313, __pyx_L1_error)\n+ __pyx_t_4 = PyObject_GetItem(__pyx_t_1, __pyx_v_length); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 480, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_r = __pyx_t_4;\n __pyx_t_4 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":312\n+ \/* \"fastsnmp\/snmp_parser.pyx\":479\n * :rtype: bytes\n * \"\"\"\n * if length in length_cache: # <<<<<<<<<<<<<<\n@@ -4335,44 +5520,44 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":315\n+ \/* \"fastsnmp\/snmp_parser.pyx\":482\n * return length_cache[length]\n * \n * if length < 127: # <<<<<<<<<<<<<<\n * result = bytes([length & 0xff])\n * else:\n *\/\n- __pyx_t_4 = PyObject_RichCompare(__pyx_v_length, __pyx_int_127, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 315, __pyx_L1_error)\n- __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 315, __pyx_L1_error)\n+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_length, __pyx_int_127, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 482, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 482, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n if (__pyx_t_3) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":316\n+ \/* \"fastsnmp\/snmp_parser.pyx\":483\n * \n * if length < 127:\n * result = bytes([length & 0xff]) # <<<<<<<<<<<<<<\n * else:\n * # Long form - Octet one is the number of octets used to\n *\/\n- __pyx_t_4 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 316, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 483, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 316, __pyx_L1_error)\n+ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 483, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_4);\n PyList_SET_ITEM(__pyx_t_1, 0, __pyx_t_4);\n __pyx_t_4 = 0;\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 316, __pyx_L1_error)\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 483, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);\n __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 316, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 483, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_v_result = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":315\n+ \/* \"fastsnmp\/snmp_parser.pyx\":482\n * return length_cache[length]\n * \n * if length < 127: # <<<<<<<<<<<<<<\n@@ -4382,7 +5567,7 @@\n goto __pyx_L4;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":324\n+ \/* \"fastsnmp\/snmp_parser.pyx\":491\n * # 8 bits to encode the length\n * \n * resultlist = bytearray() # <<<<<<<<<<<<<<\n@@ -4390,12 +5575,12 @@\n * while length > 0:\n *\/\n \/*else*\/ {\n- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 324, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 491, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_resultlist = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":325\n+ \/* \"fastsnmp\/snmp_parser.pyx\":492\n * \n * resultlist = bytearray()\n * numOctets = 0 # <<<<<<<<<<<<<<\n@@ -4405,7 +5590,7 @@\n __Pyx_INCREF(__pyx_int_0);\n __pyx_v_numOctets = __pyx_int_0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":326\n+ \/* \"fastsnmp\/snmp_parser.pyx\":493\n * resultlist = bytearray()\n * numOctets = 0\n * while length > 0: # <<<<<<<<<<<<<<\n@@ -4413,21 +5598,21 @@\n * length >>= 8\n *\/\n while (1) {\n- __pyx_t_1 = PyObject_RichCompare(__pyx_v_length, __pyx_int_0, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 326, __pyx_L1_error)\n- __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 326, __pyx_L1_error)\n+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_length, __pyx_int_0, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 493, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 493, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n if (!__pyx_t_3) break;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":327\n+ \/* \"fastsnmp\/snmp_parser.pyx\":494\n * numOctets = 0\n * while length > 0:\n * resultlist.insert(0, length & 0xff) # <<<<<<<<<<<<<<\n * length >>= 8\n * numOctets += 1\n *\/\n- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_resultlist, __pyx_n_s_insert); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_resultlist, __pyx_n_s_insert); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyInt_AndObjC(__pyx_v_length, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_6 = NULL;\n __pyx_t_7 = 0;\n@@ -4444,7 +5629,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_int_0, __pyx_t_5};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n@@ -4453,14 +5638,14 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_6, __pyx_int_0, __pyx_t_5};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n if (__pyx_t_6) {\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_6); __pyx_t_6 = NULL;\n@@ -4471,60 +5656,60 @@\n __Pyx_GIVEREF(__pyx_t_5);\n PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_7, __pyx_t_5);\n __pyx_t_5 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 327, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 494, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":328\n+ \/* \"fastsnmp\/snmp_parser.pyx\":495\n * while length > 0:\n * resultlist.insert(0, length & 0xff)\n * length >>= 8 # <<<<<<<<<<<<<<\n * numOctets += 1\n * # Add a 1 to the front of the octet\n *\/\n- __pyx_t_1 = __Pyx_PyInt_RshiftObjC(__pyx_v_length, __pyx_int_8, 8, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 328, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyInt_RshiftObjC(__pyx_v_length, __pyx_int_8, 8, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 495, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF_SET(__pyx_v_length, __pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":329\n+ \/* \"fastsnmp\/snmp_parser.pyx\":496\n * resultlist.insert(0, length & 0xff)\n * length >>= 8\n * numOctets += 1 # <<<<<<<<<<<<<<\n * # Add a 1 to the front of the octet\n * numOctets |= 0x80\n *\/\n- __pyx_t_1 = __Pyx_PyInt_AddObjC(__pyx_v_numOctets, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 329, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyInt_AddObjC(__pyx_v_numOctets, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 496, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF_SET(__pyx_v_numOctets, __pyx_t_1);\n __pyx_t_1 = 0;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":331\n+ \/* \"fastsnmp\/snmp_parser.pyx\":498\n * numOctets += 1\n * # Add a 1 to the front of the octet\n * numOctets |= 0x80 # <<<<<<<<<<<<<<\n * resultlist.insert(0, numOctets & 0xff)\n * result = resultlist\n *\/\n- __pyx_t_1 = __Pyx_PyInt_OrObjC(__pyx_v_numOctets, __pyx_int_128, 0x80, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 331, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyInt_OrObjC(__pyx_v_numOctets, __pyx_int_128, 0x80, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 498, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF_SET(__pyx_v_numOctets, __pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":332\n+ \/* \"fastsnmp\/snmp_parser.pyx\":499\n * # Add a 1 to the front of the octet\n * numOctets |= 0x80\n * resultlist.insert(0, numOctets & 0xff) # <<<<<<<<<<<<<<\n * result = resultlist\n * return result\n *\/\n- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_resultlist, __pyx_n_s_insert); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_resultlist, __pyx_n_s_insert); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_8 = __Pyx_PyInt_AndObjC(__pyx_v_numOctets, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_PyInt_AndObjC(__pyx_v_numOctets, __pyx_int_255, 0xff, 0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __pyx_t_5 = NULL;\n __pyx_t_7 = 0;\n@@ -4541,7 +5726,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_int_0, __pyx_t_8};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -4550,14 +5735,14 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_int_0, __pyx_t_8};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_7, 2+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(2+__pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n if (__pyx_t_5) {\n __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __pyx_t_5 = NULL;\n@@ -4568,14 +5753,14 @@\n __Pyx_GIVEREF(__pyx_t_8);\n PyTuple_SET_ITEM(__pyx_t_6, 1+__pyx_t_7, __pyx_t_8);\n __pyx_t_8 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 332, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 499, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":333\n+ \/* \"fastsnmp\/snmp_parser.pyx\":500\n * numOctets |= 0x80\n * resultlist.insert(0, numOctets & 0xff)\n * result = resultlist # <<<<<<<<<<<<<<\n@@ -4587,19 +5772,19 @@\n }\n __pyx_L4:;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":334\n+ \/* \"fastsnmp\/snmp_parser.pyx\":501\n * resultlist.insert(0, numOctets & 0xff)\n * result = resultlist\n * return result # <<<<<<<<<<<<<<\n * \n- * \n+ * cdef inline int tag_decode_c(char *stream, uint64_t *tag, size_t *enc_len) except -1:\n *\/\n __Pyx_XDECREF(__pyx_r);\n __Pyx_INCREF(__pyx_v_result);\n __pyx_r = __pyx_v_result;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":301\n+ \/* \"fastsnmp\/snmp_parser.pyx\":468\n * \n * \n * def length_encode(length): # <<<<<<<<<<<<<<\n@@ -4622,231 +5807,210 @@\n __Pyx_XDECREF(__pyx_v_numOctets);\n __Pyx_XDECREF(__pyx_v_length);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":337\n- * \n- * \n- * def tag_decode(stream): # <<<<<<<<<<<<<<\n+\/* \"fastsnmp\/snmp_parser.pyx\":503\n+ * return result\n+ * \n+ * cdef inline int tag_decode_c(char *stream, uint64_t *tag, size_t *enc_len) except -1: # <<<<<<<<<<<<<<\n * \"\"\"\n- * Decode a BER tag field, returning the tag and the remainder\n+ * X.690 8.1.2\n+ *\/\n+\n+static CYTHON_INLINE int __pyx_f_8fastsnmp_11snmp_parser_tag_decode_c(char *__pyx_v_stream, uint64_t *__pyx_v_tag, size_t *__pyx_v_enc_len) {\n+ int __pyx_r;\n+ __Pyx_TraceDeclarations\n+ __Pyx_RefNannyDeclarations\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"tag_decode_c\", 0);\n+ __Pyx_TraceCall(\"tag_decode_c\", __pyx_f[0], 503, 0, __PYX_ERR(0, 503, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":511\n+ * \"\"\"\n+ * \n+ * tag[0] = <uint8_t>stream[0] # low-tag-number form # <<<<<<<<<<<<<<\n+ * enc_len[0] = 1\n+ * if tag[0] & 0x1F == 0x1F: # high-tag-number form\n+ *\/\n+ (__pyx_v_tag[0]) = ((uint8_t)(__pyx_v_stream[0]));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":512\n+ * \n+ * tag[0] = <uint8_t>stream[0] # low-tag-number form\n+ * enc_len[0] = 1 # <<<<<<<<<<<<<<\n+ * if tag[0] & 0x1F == 0x1F: # high-tag-number form\n+ * return -1\n+ *\/\n+ (__pyx_v_enc_len[0]) = 1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":513\n+ * tag[0] = <uint8_t>stream[0] # low-tag-number form\n+ * enc_len[0] = 1\n+ * if tag[0] & 0x1F == 0x1F: # high-tag-number form # <<<<<<<<<<<<<<\n+ * return -1\n+ * \n+ *\/\n+ __pyx_t_1 = ((((__pyx_v_tag[0]) & 0x1F) == 0x1F) != 0);\n+ if (__pyx_t_1) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":514\n+ * enc_len[0] = 1\n+ * if tag[0] & 0x1F == 0x1F: # high-tag-number form\n+ * return -1 # <<<<<<<<<<<<<<\n+ * \n+ * return 0\n+ *\/\n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":513\n+ * tag[0] = <uint8_t>stream[0] # low-tag-number form\n+ * enc_len[0] = 1\n+ * if tag[0] & 0x1F == 0x1F: # high-tag-number form # <<<<<<<<<<<<<<\n+ * return -1\n+ * \n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":516\n+ * return -1\n+ * \n+ * return 0 # <<<<<<<<<<<<<<\n+ * \n+ * def tag_decode(bytes stream not None):\n+ *\/\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":503\n+ * return result\n+ * \n+ * cdef inline int tag_decode_c(char *stream, uint64_t *tag, size_t *enc_len) except -1: # <<<<<<<<<<<<<<\n+ * \"\"\"\n+ * X.690 8.1.2\n+ *\/\n+\n+ \/* function exit code *\/\n+ __pyx_L1_error:;\n+ __Pyx_AddTraceback(\"fastsnmp.snmp_parser.tag_decode_c\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n+ __pyx_r = -1;\n+ __pyx_L0:;\n+ __Pyx_TraceReturn(Py_None, 0);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\/* \"fastsnmp\/snmp_parser.pyx\":518\n+ * return 0\n+ * \n+ * def tag_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length\n *\/\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_21tag_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_20tag_decode[] = \"tag_decode(stream)\\n\\n Decode a BER tag field, returning the tag and the remainder\\n of the stream\\n\\n :param stream: stream\\n :type stream: bytes\\n :returns: (tag, remaining stream)\\n :rtype: tuple\\n \";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_21tag_decode = {\"tag_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_21tag_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_20tag_decode};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_21tag_decode = {\"tag_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_21tag_decode, METH_O, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_21tag_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"tag_decode (wrapper)\", 0);\n- __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_20tag_decode(__pyx_self, ((PyObject *)__pyx_v_stream));\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_stream), (&PyBytes_Type), 0, \"stream\", 1))) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_20tag_decode(__pyx_self, ((PyObject*)__pyx_v_stream));\n \n \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_20tag_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_v_tag = NULL;\n- PyObject *__pyx_v_n = NULL;\n- long __pyx_v_byte;\n+ uint64_t __pyx_v_tag;\n+ size_t __pyx_v_encode_length;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- PyObject *__pyx_t_2 = NULL;\n- int __pyx_t_3;\n- long __pyx_t_4;\n+ char *__pyx_t_1;\n+ int __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n PyObject *__pyx_t_5 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__19)\n __Pyx_RefNannySetupContext(\"tag_decode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":347\n- * :rtype: tuple\n- * \"\"\"\n- * tag = stream[0] # <<<<<<<<<<<<<<\n- * n = 1\n- * if tag & 0x1F == 0x1F:\n- *\/\n- __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_stream, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 347, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_v_tag = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":348\n- * \"\"\"\n- * tag = stream[0]\n- * n = 1 # <<<<<<<<<<<<<<\n- * if tag & 0x1F == 0x1F:\n- * \n- *\/\n- __Pyx_INCREF(__pyx_int_1);\n- __pyx_v_n = __pyx_int_1;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":349\n- * tag = stream[0]\n- * n = 1\n- * if tag & 0x1F == 0x1F: # <<<<<<<<<<<<<<\n- * \n- * # # A large tag is encoded using concatenated 7-bit values\n- *\/\n- __pyx_t_1 = __Pyx_PyInt_AndObjC(__pyx_v_tag, __pyx_int_31, 0x1F, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 349, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_1, __pyx_int_31, 0x1F, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 349, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) __PYX_ERR(0, 349, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- if (__pyx_t_3) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":356\n- * # # follow-on.\n- * \n- * tag = 0 # <<<<<<<<<<<<<<\n- * while 1:\n- * byte = ord(stream[n])\n- *\/\n- __Pyx_INCREF(__pyx_int_0);\n- __Pyx_DECREF_SET(__pyx_v_tag, __pyx_int_0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":357\n- * \n- * tag = 0\n- * while 1: # <<<<<<<<<<<<<<\n- * byte = ord(stream[n])\n- * tag = (tag << 7) | (byte & 0x7F)\n- *\/\n- while (1) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":358\n- * tag = 0\n- * while 1:\n- * byte = ord(stream[n]) # <<<<<<<<<<<<<<\n- * tag = (tag << 7) | (byte & 0x7F)\n- * n += 1\n- *\/\n- __pyx_t_2 = PyObject_GetItem(__pyx_v_stream, __pyx_v_n); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 358, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_4 = __Pyx_PyObject_Ord(__pyx_t_2); if (unlikely(__pyx_t_4 == (long)(Py_UCS4)-1)) __PYX_ERR(0, 358, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_v_byte = __pyx_t_4;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":359\n- * while 1:\n- * byte = ord(stream[n])\n- * tag = (tag << 7) | (byte & 0x7F) # <<<<<<<<<<<<<<\n- * n += 1\n- * if not byte & 0x80:\n- *\/\n- __pyx_t_2 = __Pyx_PyInt_LshiftObjC(__pyx_v_tag, __pyx_int_7, 7, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 359, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = __Pyx_PyInt_From_long((__pyx_v_byte & 0x7F)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 359, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_5 = PyNumber_Or(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 359, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_DECREF_SET(__pyx_v_tag, __pyx_t_5);\n- __pyx_t_5 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":360\n- * byte = ord(stream[n])\n- * tag = (tag << 7) | (byte & 0x7F)\n- * n += 1 # <<<<<<<<<<<<<<\n- * if not byte & 0x80:\n- * break\n- *\/\n- __pyx_t_5 = __Pyx_PyInt_AddObjC(__pyx_v_n, __pyx_int_1, 1, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 360, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_DECREF_SET(__pyx_v_n, __pyx_t_5);\n- __pyx_t_5 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":361\n- * tag = (tag << 7) | (byte & 0x7F)\n- * n += 1\n- * if not byte & 0x80: # <<<<<<<<<<<<<<\n- * break\n- * \n- *\/\n- __pyx_t_3 = ((!((__pyx_v_byte & 0x80) != 0)) != 0);\n- if (__pyx_t_3) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":362\n- * n += 1\n- * if not byte & 0x80:\n- * break # <<<<<<<<<<<<<<\n- * \n- * return tag, stream[n:]\n- *\/\n- goto __pyx_L5_break;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":361\n- * tag = (tag << 7) | (byte & 0x7F)\n- * n += 1\n- * if not byte & 0x80: # <<<<<<<<<<<<<<\n- * break\n- * \n- *\/\n- }\n- }\n- __pyx_L5_break:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":349\n- * tag = stream[0]\n- * n = 1\n- * if tag & 0x1F == 0x1F: # <<<<<<<<<<<<<<\n- * \n- * # # A large tag is encoded using concatenated 7-bit values\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":364\n- * break\n- * \n- * return tag, stream[n:] # <<<<<<<<<<<<<<\n+ __Pyx_TraceCall(\"tag_decode\", __pyx_f[0], 518, 0, __PYX_ERR(0, 518, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":519\n+ * \n+ * def tag_decode(bytes stream not None):\n+ * cdef uint64_t tag=0 # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length\n+ * tag_decode_c(stream, &tag, &encode_length)\n+ *\/\n+ __pyx_v_tag = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":521\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length\n+ * tag_decode_c(stream, &tag, &encode_length) # <<<<<<<<<<<<<<\n+ * return tag, encode_length\n+ * \n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_2 = __pyx_f_8fastsnmp_11snmp_parser_tag_decode_c(__pyx_t_1, (&__pyx_v_tag), (&__pyx_v_encode_length)); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 521, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":522\n+ * cdef size_t encode_length\n+ * tag_decode_c(stream, &tag, &encode_length)\n+ * return tag, encode_length # <<<<<<<<<<<<<<\n * \n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_5 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, &__pyx_v_n, NULL, NULL, 0, 0, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 364, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyInt_From_uint64_t(__pyx_v_tag); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_4 = __Pyx_PyInt_FromSize_t(__pyx_v_encode_length); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 522, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 364, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_INCREF(__pyx_v_tag);\n- __Pyx_GIVEREF(__pyx_v_tag);\n- PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_tag);\n- __Pyx_GIVEREF(__pyx_t_5);\n- PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_4);\n+ __pyx_t_3 = 0;\n+ __pyx_t_4 = 0;\n+ __pyx_r = __pyx_t_5;\n __pyx_t_5 = 0;\n- __pyx_r = __pyx_t_1;\n- __pyx_t_1 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":337\n- * \n- * \n- * def tag_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER tag field, returning the tag and the remainder\n+ \/* \"fastsnmp\/snmp_parser.pyx\":518\n+ * return 0\n+ * \n+ * def tag_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length\n *\/\n \n \/* function exit code *\/\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n __Pyx_XDECREF(__pyx_t_5);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.tag_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_tag);\n- __Pyx_XDECREF(__pyx_v_n);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":367\n+\/* \"fastsnmp\/snmp_parser.pyx\":525\n * \n * \n * def tag_encode(asn_tag_class, asn_tag_format, asn_tag_number): # <<<<<<<<<<<<<<\n@@ -4856,7 +6020,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_23tag_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_22tag_encode[] = \"tag_encode(asn_tag_class, asn_tag_format, asn_tag_number)\\n\\n Returns encoded identifier octets for\\n this object. Section 6.3 of ITU-T-X.209\\n\\n :param asn_tag_class: asn tag class\\n :type asn_tag_class: int\\n :param asn_tag_format: asn tag format\\n :type asn_tag_format: int\\n :param asn_tag_number: asn tag number\\n :type asn_tag_number: int\\n :returns: tag\\n :rtype: bytes\\n \";\n+static char __pyx_doc_8fastsnmp_11snmp_parser_22tag_encode[] = \"\\n Returns encoded identifier octets for\\n this object. Section 6.3 of ITU-T-X.209\\n\\n :param asn_tag_class: asn tag class\\n :type asn_tag_class: int\\n :param asn_tag_format: asn tag format\\n :type asn_tag_format: int\\n :param asn_tag_number: asn tag number\\n :type asn_tag_number: int\\n :returns: tag\\n :rtype: bytes\\n \";\n static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_23tag_encode = {\"tag_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_23tag_encode, METH_VARARGS|METH_KEYWORDS, __pyx_doc_8fastsnmp_11snmp_parser_22tag_encode};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_23tag_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_asn_tag_class = 0;\n@@ -4886,16 +6050,16 @@\n case 1:\n if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_asn_tag_format)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, 1); __PYX_ERR(0, 367, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, 1); __PYX_ERR(0, 525, __pyx_L3_error)\n }\n case 2:\n if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_asn_tag_number)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, 2); __PYX_ERR(0, 367, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, 2); __PYX_ERR(0, 525, __pyx_L3_error)\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"tag_encode\") < 0)) __PYX_ERR(0, 367, __pyx_L3_error)\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"tag_encode\") < 0)) __PYX_ERR(0, 525, __pyx_L3_error)\n }\n } else if (PyTuple_GET_SIZE(__pyx_args) != 3) {\n goto __pyx_L5_argtuple_error;\n@@ -4910,7 +6074,7 @@\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 367, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"tag_encode\", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 525, __pyx_L3_error)\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.tag_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -4928,54 +6092,57 @@\n PyObject *__pyx_v_resultlist = NULL;\n PyObject *__pyx_v_integer = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n int __pyx_t_2;\n PyObject *__pyx_t_3 = NULL;\n int __pyx_t_4;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__20)\n __Pyx_RefNannySetupContext(\"tag_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":381\n+ __Pyx_TraceCall(\"tag_encode\", __pyx_f[0], 525, 0, __PYX_ERR(0, 525, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":539\n * :rtype: bytes\n * \"\"\"\n * if asn_tag_number < 0x1F: # <<<<<<<<<<<<<<\n * result = bytes([asn_tag_class | asn_tag_format | asn_tag_number])\n * else:\n *\/\n- __pyx_t_1 = PyObject_RichCompare(__pyx_v_asn_tag_number, __pyx_int_31, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 381, __pyx_L1_error)\n- __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 381, __pyx_L1_error)\n+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_asn_tag_number, __pyx_int_31, Py_LT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 539, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 539, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":382\n+ \/* \"fastsnmp\/snmp_parser.pyx\":540\n * \"\"\"\n * if asn_tag_number < 0x1F:\n * result = bytes([asn_tag_class | asn_tag_format | asn_tag_number]) # <<<<<<<<<<<<<<\n * else:\n * # # Encode each number of the asnTagNumber from 31 upwards\n *\/\n- __pyx_t_1 = PyNumber_Or(__pyx_v_asn_tag_class, __pyx_v_asn_tag_format); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __pyx_t_1 = PyNumber_Or(__pyx_v_asn_tag_class, __pyx_v_asn_tag_format); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 540, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = PyNumber_Or(__pyx_t_1, __pyx_v_asn_tag_number); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __pyx_t_3 = PyNumber_Or(__pyx_t_1, __pyx_v_asn_tag_number); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 540, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 540, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_3);\n PyList_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n __pyx_t_3 = 0;\n- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 540, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_GIVEREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 382, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyBytes_Type)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 540, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __pyx_v_result = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":381\n+ \/* \"fastsnmp\/snmp_parser.pyx\":539\n * :rtype: bytes\n * \"\"\"\n * if asn_tag_number < 0x1F: # <<<<<<<<<<<<<<\n@@ -4985,7 +6152,7 @@\n goto __pyx_L3;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":389\n+ \/* \"fastsnmp\/snmp_parser.pyx\":547\n * # # last octet of the Identifier octets\n * # encode the first octet\n * resultlist = bytearray() # <<<<<<<<<<<<<<\n@@ -4993,27 +6160,27 @@\n * \n *\/\n \/*else*\/ {\n- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 389, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 547, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_resultlist = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":390\n+ \/* \"fastsnmp\/snmp_parser.pyx\":548\n * # encode the first octet\n * resultlist = bytearray()\n * resultlist.append(asn_tag_class | asn_tag_format | 0x1F) # <<<<<<<<<<<<<<\n * \n * # encode each subsequent octet\n *\/\n- __pyx_t_1 = PyNumber_Or(__pyx_v_asn_tag_class, __pyx_v_asn_tag_format); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 390, __pyx_L1_error)\n+ __pyx_t_1 = PyNumber_Or(__pyx_v_asn_tag_class, __pyx_v_asn_tag_format); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 548, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = __Pyx_PyInt_OrObjC(__pyx_t_1, __pyx_int_31, 0x1F, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 390, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyInt_OrObjC(__pyx_t_1, __pyx_int_31, 0x1F, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 548, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_4 = __Pyx_PyByteArray_AppendObject(__pyx_v_resultlist, __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) __PYX_ERR(0, 390, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyByteArray_AppendObject(__pyx_v_resultlist, __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) __PYX_ERR(0, 548, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":393\n+ \/* \"fastsnmp\/snmp_parser.pyx\":551\n * \n * # encode each subsequent octet\n * integer = asn_tag_number # <<<<<<<<<<<<<<\n@@ -5023,7 +6190,7 @@\n __Pyx_INCREF(__pyx_v_asn_tag_number);\n __pyx_v_integer = __pyx_v_asn_tag_number;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":394\n+ \/* \"fastsnmp\/snmp_parser.pyx\":552\n * # encode each subsequent octet\n * integer = asn_tag_number\n * while integer != -1: # <<<<<<<<<<<<<<\n@@ -5031,37 +6198,37 @@\n * integer >>= 8\n *\/\n while (1) {\n- __pyx_t_3 = PyObject_RichCompare(__pyx_v_integer, __pyx_int_neg_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 394, __pyx_L1_error)\n- __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 394, __pyx_L1_error)\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_integer, __pyx_int_neg_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 552, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 552, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n if (!__pyx_t_2) break;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":395\n+ \/* \"fastsnmp\/snmp_parser.pyx\":553\n * integer = asn_tag_number\n * while integer != -1:\n * resultlist.append(integer & 0xFF) # <<<<<<<<<<<<<<\n * integer >>= 8\n * result = resultlist\n *\/\n- __pyx_t_3 = __Pyx_PyInt_AndObjC(__pyx_v_integer, __pyx_int_255, 0xFF, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 395, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyInt_AndObjC(__pyx_v_integer, __pyx_int_255, 0xFF, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 553, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_PyByteArray_AppendObject(__pyx_v_resultlist, __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) __PYX_ERR(0, 395, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyByteArray_AppendObject(__pyx_v_resultlist, __pyx_t_3); if (unlikely(__pyx_t_4 == -1)) __PYX_ERR(0, 553, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":396\n+ \/* \"fastsnmp\/snmp_parser.pyx\":554\n * while integer != -1:\n * resultlist.append(integer & 0xFF)\n * integer >>= 8 # <<<<<<<<<<<<<<\n * result = resultlist\n * return result\n *\/\n- __pyx_t_3 = __Pyx_PyInt_RshiftObjC(__pyx_v_integer, __pyx_int_8, 8, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 396, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyInt_RshiftObjC(__pyx_v_integer, __pyx_int_8, 8, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 554, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF_SET(__pyx_v_integer, __pyx_t_3);\n __pyx_t_3 = 0;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":397\n+ \/* \"fastsnmp\/snmp_parser.pyx\":555\n * resultlist.append(integer & 0xFF)\n * integer >>= 8\n * result = resultlist # <<<<<<<<<<<<<<\n@@ -5073,7 +6240,7 @@\n }\n __pyx_L3:;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":398\n+ \/* \"fastsnmp\/snmp_parser.pyx\":556\n * integer >>= 8\n * result = resultlist\n * return result # <<<<<<<<<<<<<<\n@@ -5085,7 +6252,7 @@\n __pyx_r = __pyx_v_result;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":367\n+ \/* \"fastsnmp\/snmp_parser.pyx\":525\n * \n * \n * def tag_encode(asn_tag_class, asn_tag_format, asn_tag_number): # <<<<<<<<<<<<<<\n@@ -5104,11 +6271,12 @@\n __Pyx_XDECREF(__pyx_v_resultlist);\n __Pyx_XDECREF(__pyx_v_integer);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":402\n+\/* \"fastsnmp\/snmp_parser.pyx\":560\n * \n * # TODO: implement more encoders\n * def value_encode(value=None, value_type='Null'): # <<<<<<<<<<<<<<\n@@ -5118,7 +6286,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_25value_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_24value_encode[] = \"value_encode(value=None, value_type=u'Null')\\n\\n Encoded value by ASN.1\\n \";\n+static char __pyx_doc_8fastsnmp_11snmp_parser_24value_encode[] = \"\\n Encoded value by ASN.1\\n \";\n static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_25value_encode = {\"value_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_25value_encode, METH_VARARGS|METH_KEYWORDS, __pyx_doc_8fastsnmp_11snmp_parser_24value_encode};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_25value_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_value = 0;\n@@ -5154,7 +6322,7 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"value_encode\") < 0)) __PYX_ERR(0, 402, __pyx_L3_error)\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"value_encode\") < 0)) __PYX_ERR(0, 560, __pyx_L3_error)\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -5169,7 +6337,7 @@\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"value_encode\", 0, 0, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 402, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"value_encode\", 0, 0, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 560, __pyx_L3_error)\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.value_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -5184,6 +6352,7 @@\n \n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_24value_encode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_value, PyObject *__pyx_v_value_type) {\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n@@ -5191,19 +6360,21 @@\n PyObject *__pyx_t_4 = NULL;\n PyObject *__pyx_t_5 = NULL;\n PyObject *__pyx_t_6 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__21)\n __Pyx_RefNannySetupContext(\"value_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":406\n+ __Pyx_TraceCall(\"value_encode\", __pyx_f[0], 560, 0, __PYX_ERR(0, 560, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":564\n * Encoded value by ASN.1\n * \"\"\"\n * if value_type == 'Null': # <<<<<<<<<<<<<<\n * if value is not None:\n * raise Exception('value must be None for Null type!')\n *\/\n- __pyx_t_1 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_Null, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 406, __pyx_L1_error)\n+ __pyx_t_1 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_Null, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 564, __pyx_L1_error)\n if (__pyx_t_1) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":407\n+ \/* \"fastsnmp\/snmp_parser.pyx\":565\n * \"\"\"\n * if value_type == 'Null':\n * if value is not None: # <<<<<<<<<<<<<<\n@@ -5214,20 +6385,20 @@\n __pyx_t_2 = (__pyx_t_1 != 0);\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":408\n+ \/* \"fastsnmp\/snmp_parser.pyx\":566\n * if value_type == 'Null':\n * if value is not None:\n * raise Exception('value must be None for Null type!') # <<<<<<<<<<<<<<\n * return b''\n * elif value_type == \"Integer\":\n *\/\n- __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 408, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__22, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 566, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_Raise(__pyx_t_3, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __PYX_ERR(0, 408, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":407\n+ __PYX_ERR(0, 566, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":565\n * \"\"\"\n * if value_type == 'Null':\n * if value is not None: # <<<<<<<<<<<<<<\n@@ -5236,7 +6407,7 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":409\n+ \/* \"fastsnmp\/snmp_parser.pyx\":567\n * if value is not None:\n * raise Exception('value must be None for Null type!')\n * return b'' # <<<<<<<<<<<<<<\n@@ -5244,11 +6415,11 @@\n * return integer_encode(value)\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __Pyx_INCREF(__pyx_kp_b_);\n- __pyx_r = __pyx_kp_b_;\n+ __Pyx_INCREF(__pyx_kp_b__23);\n+ __pyx_r = __pyx_kp_b__23;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":406\n+ \/* \"fastsnmp\/snmp_parser.pyx\":564\n * Encoded value by ASN.1\n * \"\"\"\n * if value_type == 'Null': # <<<<<<<<<<<<<<\n@@ -5257,17 +6428,17 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":410\n+ \/* \"fastsnmp\/snmp_parser.pyx\":568\n * raise Exception('value must be None for Null type!')\n * return b''\n * elif value_type == \"Integer\": # <<<<<<<<<<<<<<\n * return integer_encode(value)\n * elif value_type == \"OctetString\":\n *\/\n- __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_Integer, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 410, __pyx_L1_error)\n+ __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_Integer, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 568, __pyx_L1_error)\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":411\n+ \/* \"fastsnmp\/snmp_parser.pyx\":569\n * return b''\n * elif value_type == \"Integer\":\n * return integer_encode(value) # <<<<<<<<<<<<<<\n@@ -5275,7 +6446,7 @@\n * return value.encode()\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_5 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -5288,13 +6459,13 @@\n }\n }\n if (!__pyx_t_5) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_value); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_value); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_v_value};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n@@ -5302,19 +6473,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_v_value};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __pyx_t_5 = NULL;\n __Pyx_INCREF(__pyx_v_value);\n __Pyx_GIVEREF(__pyx_v_value);\n PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_value);\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 411, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 569, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -5324,7 +6495,7 @@\n __pyx_t_3 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":410\n+ \/* \"fastsnmp\/snmp_parser.pyx\":568\n * raise Exception('value must be None for Null type!')\n * return b''\n * elif value_type == \"Integer\": # <<<<<<<<<<<<<<\n@@ -5333,17 +6504,17 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":412\n+ \/* \"fastsnmp\/snmp_parser.pyx\":570\n * elif value_type == \"Integer\":\n * return integer_encode(value)\n * elif value_type == \"OctetString\": # <<<<<<<<<<<<<<\n * return value.encode()\n * else:\n *\/\n- __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_OctetString, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 412, __pyx_L1_error)\n+ __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_value_type, __pyx_n_u_OctetString, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 570, __pyx_L1_error)\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":413\n+ \/* \"fastsnmp\/snmp_parser.pyx\":571\n * return integer_encode(value)\n * elif value_type == \"OctetString\":\n * return value.encode() # <<<<<<<<<<<<<<\n@@ -5351,7 +6522,7 @@\n * raise NotImplementedError('not implement coder for %s' % type(value))\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_value, __pyx_n_s_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 413, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_value, __pyx_n_s_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 571, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_4))) {\n@@ -5364,10 +6535,10 @@\n }\n }\n if (__pyx_t_6) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 413, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 571, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n } else {\n- __pyx_t_3 = __Pyx_PyObject_CallNoArg(__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 413, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallNoArg(__pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 571, __pyx_L1_error)\n }\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n@@ -5375,7 +6546,7 @@\n __pyx_t_3 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":412\n+ \/* \"fastsnmp\/snmp_parser.pyx\":570\n * elif value_type == \"Integer\":\n * return integer_encode(value)\n * elif value_type == \"OctetString\": # <<<<<<<<<<<<<<\n@@ -5384,7 +6555,7 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":415\n+ \/* \"fastsnmp\/snmp_parser.pyx\":573\n * return value.encode()\n * else:\n * raise NotImplementedError('not implement coder for %s' % type(value)) # <<<<<<<<<<<<<<\n@@ -5392,22 +6563,22 @@\n * \n *\/\n \/*else*\/ {\n- __pyx_t_3 = PyUnicode_Format(__pyx_kp_u_not_implement_coder_for_s, ((PyObject *)Py_TYPE(__pyx_v_value))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 415, __pyx_L1_error)\n+ __pyx_t_3 = PyUnicode_Format(__pyx_kp_u_not_implement_coder_for_s, ((PyObject *)Py_TYPE(__pyx_v_value))); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 573, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 415, __pyx_L1_error)\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 573, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_3);\n PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);\n __pyx_t_3 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_NotImplementedError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 415, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_NotImplementedError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 573, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_Raise(__pyx_t_3, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __PYX_ERR(0, 415, __pyx_L1_error)\n+ __PYX_ERR(0, 573, __pyx_L1_error)\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":402\n+ \/* \"fastsnmp\/snmp_parser.pyx\":560\n * \n * # TODO: implement more encoders\n * def value_encode(value=None, value_type='Null'): # <<<<<<<<<<<<<<\n@@ -5425,11 +6596,12 @@\n __pyx_r = NULL;\n __pyx_L0:;\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":418\n+\/* \"fastsnmp\/snmp_parser.pyx\":576\n * \n * \n * def encode_varbind(oid, value_type='Null', value=None): # <<<<<<<<<<<<<<\n@@ -5439,8 +6611,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_27encode_varbind(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_26encode_varbind[] = \"encode_varbind(oid, value_type=u'Null', value=None)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_27encode_varbind = {\"encode_varbind\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_27encode_varbind, METH_VARARGS|METH_KEYWORDS, __pyx_doc_8fastsnmp_11snmp_parser_26encode_varbind};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_27encode_varbind = {\"encode_varbind\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_27encode_varbind, METH_VARARGS|METH_KEYWORDS, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_27encode_varbind(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_oid = 0;\n PyObject *__pyx_v_value_type = 0;\n@@ -5480,7 +6651,7 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"encode_varbind\") < 0)) __PYX_ERR(0, 418, __pyx_L3_error)\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"encode_varbind\") < 0)) __PYX_ERR(0, 576, __pyx_L3_error)\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -5497,7 +6668,7 @@\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"encode_varbind\", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 418, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"encode_varbind\", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 576, __pyx_L3_error)\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.encode_varbind\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -5521,6 +6692,7 @@\n PyObject *__pyx_v_seq_tag = NULL;\n PyObject *__pyx_v_varbind_enc = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n@@ -5533,10 +6705,12 @@\n int __pyx_t_9;\n PyObject *__pyx_t_10 = NULL;\n Py_ssize_t __pyx_t_11;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__24)\n __Pyx_RefNannySetupContext(\"encode_varbind\", 0);\n+ __Pyx_TraceCall(\"encode_varbind\", __pyx_f[0], 576, 0, __PYX_ERR(0, 576, __pyx_L1_error));\n __Pyx_INCREF(__pyx_v_value_type);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":419\n+ \/* \"fastsnmp\/snmp_parser.pyx\":577\n * \n * def encode_varbind(oid, value_type='Null', value=None):\n * if value is None: # <<<<<<<<<<<<<<\n@@ -5547,7 +6721,7 @@\n __pyx_t_2 = (__pyx_t_1 != 0);\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":420\n+ \/* \"fastsnmp\/snmp_parser.pyx\":578\n * def encode_varbind(oid, value_type='Null', value=None):\n * if value is None:\n * value_type = 'Null' # <<<<<<<<<<<<<<\n@@ -5557,7 +6731,7 @@\n __Pyx_INCREF(__pyx_n_u_Null);\n __Pyx_DECREF_SET(__pyx_v_value_type, __pyx_n_u_Null);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":419\n+ \/* \"fastsnmp\/snmp_parser.pyx\":577\n * \n * def encode_varbind(oid, value_type='Null', value=None):\n * if value is None: # <<<<<<<<<<<<<<\n@@ -5566,14 +6740,14 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":421\n+ \/* \"fastsnmp\/snmp_parser.pyx\":579\n * if value is None:\n * value_type = 'Null'\n * obj_id = objectid_encode(oid) # <<<<<<<<<<<<<<\n * obj_id_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['ObjectID'])\n * obj_id_len = length_encode(len(obj_id))\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_objectid_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_objectid_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_5 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -5586,13 +6760,13 @@\n }\n }\n if (!__pyx_t_5) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_oid); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_oid); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_v_oid};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n@@ -5600,19 +6774,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_v_oid};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); __pyx_t_5 = NULL;\n __Pyx_INCREF(__pyx_v_oid);\n __Pyx_GIVEREF(__pyx_v_oid);\n PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_v_oid);\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 421, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 579, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -5621,28 +6795,28 @@\n __pyx_v_obj_id = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":422\n+ \/* \"fastsnmp\/snmp_parser.pyx\":580\n * value_type = 'Null'\n * obj_id = objectid_encode(oid)\n * obj_id_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['ObjectID']) # <<<<<<<<<<<<<<\n * obj_id_len = length_encode(len(obj_id))\n * \n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_5 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_5 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_ObjectID); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_ObjectID); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __pyx_t_6 = NULL;\n@@ -5660,7 +6834,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_5, __pyx_t_7, __pyx_t_8};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n@@ -5671,7 +6845,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_5, __pyx_t_7, __pyx_t_8};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n@@ -5680,7 +6854,7 @@\n } else\n #endif\n {\n- __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n if (__pyx_t_6) {\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_6); __pyx_t_6 = NULL;\n@@ -5694,7 +6868,7 @@\n __pyx_t_5 = 0;\n __pyx_t_7 = 0;\n __pyx_t_8 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 422, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 580, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n }\n@@ -5702,17 +6876,17 @@\n __pyx_v_obj_id_id = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":423\n+ \/* \"fastsnmp\/snmp_parser.pyx\":581\n * obj_id = objectid_encode(oid)\n * obj_id_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['ObjectID'])\n * obj_id_len = length_encode(len(obj_id)) # <<<<<<<<<<<<<<\n * \n * obj_value = value_encode(value, value_type)\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_11 = PyObject_Length(__pyx_v_obj_id); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 423, __pyx_L1_error)\n- __pyx_t_10 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_Length(__pyx_v_obj_id); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 581, __pyx_L1_error)\n+ __pyx_t_10 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n __pyx_t_8 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -5725,14 +6899,14 @@\n }\n }\n if (!__pyx_t_8) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_t_10};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n@@ -5741,20 +6915,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_t_10};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_8); __pyx_t_8 = NULL;\n __Pyx_GIVEREF(__pyx_t_10);\n PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_10);\n __pyx_t_10 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 423, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 581, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -5763,14 +6937,14 @@\n __pyx_v_obj_id_len = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":425\n+ \/* \"fastsnmp\/snmp_parser.pyx\":583\n * obj_id_len = length_encode(len(obj_id))\n * \n * obj_value = value_encode(value, value_type) # <<<<<<<<<<<<<<\n * obj_value_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES[value_type])\n * obj_value_len = length_encode(len(obj_value))\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_value_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 425, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_value_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 583, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __pyx_t_7 = NULL;\n __pyx_t_9 = 0;\n@@ -5787,7 +6961,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_value, __pyx_v_value_type};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 425, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 583, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n@@ -5795,13 +6969,13 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[3] = {__pyx_t_7, __pyx_v_value, __pyx_v_value_type};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 425, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 583, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else\n #endif\n {\n- __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 425, __pyx_L1_error)\n+ __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 583, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n if (__pyx_t_7) {\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_7); __pyx_t_7 = NULL;\n@@ -5812,7 +6986,7 @@\n __Pyx_INCREF(__pyx_v_value_type);\n __Pyx_GIVEREF(__pyx_v_value_type);\n PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_9, __pyx_v_value_type);\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 425, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 583, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n }\n@@ -5820,28 +6994,28 @@\n __pyx_v_obj_value = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":426\n+ \/* \"fastsnmp\/snmp_parser.pyx\":584\n * \n * obj_value = value_encode(value, value_type)\n * obj_value_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES[value_type]) # <<<<<<<<<<<<<<\n * obj_value_len = length_encode(len(obj_value))\n * \n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_10, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_10, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_10, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_10, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n- __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_10 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n- __pyx_t_5 = PyObject_GetItem(__pyx_t_10, __pyx_v_value_type); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_5 = PyObject_GetItem(__pyx_t_10, __pyx_v_value_type); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n __pyx_t_10 = NULL;\n@@ -5859,7 +7033,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_10, __pyx_t_7, __pyx_t_8, __pyx_t_5};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -5870,7 +7044,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_10, __pyx_t_7, __pyx_t_8, __pyx_t_5};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -5879,7 +7053,7 @@\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n if (__pyx_t_10) {\n __Pyx_GIVEREF(__pyx_t_10); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_10); __pyx_t_10 = NULL;\n@@ -5893,7 +7067,7 @@\n __pyx_t_7 = 0;\n __pyx_t_8 = 0;\n __pyx_t_5 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 426, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 584, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -5901,17 +7075,17 @@\n __pyx_v_obj_value_id = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":427\n+ \/* \"fastsnmp\/snmp_parser.pyx\":585\n * obj_value = value_encode(value, value_type)\n * obj_value_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES[value_type])\n * obj_value_len = length_encode(len(obj_value)) # <<<<<<<<<<<<<<\n * \n * varbinds_obj = obj_id_id + obj_id_len + obj_id + obj_value_id + obj_value_len + obj_value\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_11 = PyObject_Length(__pyx_v_obj_value); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 427, __pyx_L1_error)\n- __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_Length(__pyx_v_obj_value); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 585, __pyx_L1_error)\n+ __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __pyx_t_5 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -5924,14 +7098,14 @@\n }\n }\n if (!__pyx_t_5) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_t_6};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -5940,20 +7114,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_5, __pyx_t_6};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_5); __pyx_t_5 = NULL;\n __Pyx_GIVEREF(__pyx_t_6);\n PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_6);\n __pyx_t_6 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 427, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 585, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -5962,52 +7136,52 @@\n __pyx_v_obj_value_len = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":429\n+ \/* \"fastsnmp\/snmp_parser.pyx\":587\n * obj_value_len = length_encode(len(obj_value))\n * \n * varbinds_obj = obj_id_id + obj_id_len + obj_id + obj_value_id + obj_value_len + obj_value # <<<<<<<<<<<<<<\n * \n * seq_tag = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n *\/\n- __pyx_t_3 = PyNumber_Add(__pyx_v_obj_id_id, __pyx_v_obj_id_len); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __pyx_t_3 = PyNumber_Add(__pyx_v_obj_id_id, __pyx_v_obj_id_len); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 587, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_v_obj_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_v_obj_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 587, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_obj_value_id); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_obj_value_id); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 587, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_v_obj_value_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_v_obj_value_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 587, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_obj_value); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 429, __pyx_L1_error)\n+ __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_obj_value); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 587, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_v_varbinds_obj = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":431\n+ \/* \"fastsnmp\/snmp_parser.pyx\":589\n * varbinds_obj = obj_id_id + obj_id_len + obj_id + obj_value_id + obj_value_len + obj_value\n * \n * seq_tag = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence']) # <<<<<<<<<<<<<<\n * varbind_enc = seq_tag + length_encode(len(varbinds_obj)) + varbinds_obj\n * return varbind_enc\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_5 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_5 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __pyx_t_8 = NULL;\n@@ -6025,7 +7199,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_6, __pyx_t_5, __pyx_t_7};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -6036,7 +7210,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_6, __pyx_t_5, __pyx_t_7};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 3+__pyx_t_9); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -6045,7 +7219,7 @@\n } else\n #endif\n {\n- __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_10 = PyTuple_New(3+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n if (__pyx_t_8) {\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __pyx_t_8 = NULL;\n@@ -6059,7 +7233,7 @@\n __pyx_t_6 = 0;\n __pyx_t_5 = 0;\n __pyx_t_7 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 431, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 589, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n }\n@@ -6067,17 +7241,17 @@\n __pyx_v_seq_tag = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":432\n+ \/* \"fastsnmp\/snmp_parser.pyx\":590\n * \n * seq_tag = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * varbind_enc = seq_tag + length_encode(len(varbinds_obj)) + varbinds_obj # <<<<<<<<<<<<<<\n * return varbind_enc\n * \n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_11 = PyObject_Length(__pyx_v_varbinds_obj); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 432, __pyx_L1_error)\n- __pyx_t_10 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_Length(__pyx_v_varbinds_obj); if (unlikely(__pyx_t_11 == -1)) __PYX_ERR(0, 590, __pyx_L1_error)\n+ __pyx_t_10 = PyInt_FromSsize_t(__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_10);\n __pyx_t_7 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -6090,14 +7264,14 @@\n }\n }\n if (!__pyx_t_7) {\n- __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_10); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_10};\n- __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n@@ -6106,35 +7280,35 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_10};\n- __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n } else\n #endif\n {\n- __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_7); __pyx_t_7 = NULL;\n __Pyx_GIVEREF(__pyx_t_10);\n PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_10);\n __pyx_t_10 = 0;\n- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n }\n }\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_v_seq_tag, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_v_seq_tag, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_varbinds_obj); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 432, __pyx_L1_error)\n+ __pyx_t_3 = PyNumber_Add(__pyx_t_4, __pyx_v_varbinds_obj); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 590, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_v_varbind_enc = __pyx_t_3;\n __pyx_t_3 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":433\n+ \/* \"fastsnmp\/snmp_parser.pyx\":591\n * seq_tag = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * varbind_enc = seq_tag + length_encode(len(varbinds_obj)) + varbinds_obj\n * return varbind_enc # <<<<<<<<<<<<<<\n@@ -6146,7 +7320,7 @@\n __pyx_r = __pyx_v_varbind_enc;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":418\n+ \/* \"fastsnmp\/snmp_parser.pyx\":576\n * \n * \n * def encode_varbind(oid, value_type='Null', value=None): # <<<<<<<<<<<<<<\n@@ -6177,11 +7351,12 @@\n __Pyx_XDECREF(__pyx_v_varbind_enc);\n __Pyx_XDECREF(__pyx_v_value_type);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":436\n+\/* \"fastsnmp\/snmp_parser.pyx\":594\n * \n * \n * def varbinds_encode(varbinds): # <<<<<<<<<<<<<<\n@@ -6191,8 +7366,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_29varbinds_encode(PyObject *__pyx_self, PyObject *__pyx_v_varbinds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_28varbinds_encode[] = \"varbinds_encode(varbinds)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_29varbinds_encode = {\"varbinds_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_29varbinds_encode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_28varbinds_encode};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_29varbinds_encode = {\"varbinds_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_29varbinds_encode, METH_O, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_29varbinds_encode(PyObject *__pyx_self, PyObject *__pyx_v_varbinds) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -6208,66 +7382,70 @@\n PyObject *__pyx_v_res = NULL;\n PyObject *__pyx_v_varbind = NULL;\n PyObject *__pyx_v_oid = NULL;\n+ PyObject *__pyx_v_value = NULL;\n PyObject *__pyx_v_value_type = NULL;\n- PyObject *__pyx_v_value = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n Py_ssize_t __pyx_t_2;\n PyObject *(*__pyx_t_3)(PyObject *);\n PyObject *__pyx_t_4 = NULL;\n- Py_ssize_t __pyx_t_5;\n+ int __pyx_t_5;\n int __pyx_t_6;\n- PyObject *__pyx_t_7 = NULL;\n+ Py_ssize_t __pyx_t_7;\n PyObject *__pyx_t_8 = NULL;\n PyObject *__pyx_t_9 = NULL;\n- PyObject *(*__pyx_t_10)(PyObject *);\n- int __pyx_t_11;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyObject *(*__pyx_t_11)(PyObject *);\n+ int __pyx_t_12;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__25)\n __Pyx_RefNannySetupContext(\"varbinds_encode\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":437\n+ __Pyx_TraceCall(\"varbinds_encode\", __pyx_f[0], 594, 0, __PYX_ERR(0, 594, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":595\n * \n * def varbinds_encode(varbinds):\n * res = bytearray() # <<<<<<<<<<<<<<\n * for varbind in varbinds:\n- * if len(varbind) == 3:\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 437, __pyx_L1_error)\n+ * if isinstance(varbind, str):\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)(&PyByteArray_Type)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 595, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_res = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":438\n+ \/* \"fastsnmp\/snmp_parser.pyx\":596\n * def varbinds_encode(varbinds):\n * res = bytearray()\n * for varbind in varbinds: # <<<<<<<<<<<<<<\n- * if len(varbind) == 3:\n- * oid, value_type, value = varbind\n+ * if isinstance(varbind, str):\n+ * oid = varbind\n *\/\n if (likely(PyList_CheckExact(__pyx_v_varbinds)) || PyTuple_CheckExact(__pyx_v_varbinds)) {\n __pyx_t_1 = __pyx_v_varbinds; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;\n __pyx_t_3 = NULL;\n } else {\n- __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_varbinds); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_varbinds); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 596, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_3 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 596, __pyx_L1_error)\n }\n for (;;) {\n if (likely(!__pyx_t_3)) {\n if (likely(PyList_CheckExact(__pyx_t_1))) {\n if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 596, __pyx_L1_error)\n #else\n- __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 596, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n #endif\n } else {\n if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 596, __pyx_L1_error)\n #else\n- __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 438, __pyx_L1_error)\n+ __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 596, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n #endif\n }\n@@ -6277,7 +7455,7 @@\n PyObject* exc_type = PyErr_Occurred();\n if (exc_type) {\n if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();\n- else __PYX_ERR(0, 438, __pyx_L1_error)\n+ else __PYX_ERR(0, 596, __pyx_L1_error)\n }\n break;\n }\n@@ -6286,20 +7464,71 @@\n __Pyx_XDECREF_SET(__pyx_v_varbind, __pyx_t_4);\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":439\n+ \/* \"fastsnmp\/snmp_parser.pyx\":597\n * res = bytearray()\n * for varbind in varbinds:\n- * if len(varbind) == 3: # <<<<<<<<<<<<<<\n+ * if isinstance(varbind, str): # <<<<<<<<<<<<<<\n+ * oid = varbind\n+ * value = None\n+ *\/\n+ __pyx_t_5 = PyUnicode_Check(__pyx_v_varbind); \n+ __pyx_t_6 = (__pyx_t_5 != 0);\n+ if (__pyx_t_6) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":598\n+ * for varbind in varbinds:\n+ * if isinstance(varbind, str):\n+ * oid = varbind # <<<<<<<<<<<<<<\n+ * value = None\n+ * value_type = \"Null\"\n+ *\/\n+ __Pyx_INCREF(__pyx_v_varbind);\n+ __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_v_varbind);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":599\n+ * if isinstance(varbind, str):\n+ * oid = varbind\n+ * value = None # <<<<<<<<<<<<<<\n+ * value_type = \"Null\"\n+ * elif len(varbind) == 3:\n+ *\/\n+ __Pyx_INCREF(Py_None);\n+ __Pyx_XDECREF_SET(__pyx_v_value, Py_None);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":600\n+ * oid = varbind\n+ * value = None\n+ * value_type = \"Null\" # <<<<<<<<<<<<<<\n+ * elif len(varbind) == 3:\n+ * oid, value_type, value = varbind\n+ *\/\n+ __Pyx_INCREF(__pyx_n_u_Null);\n+ __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_n_u_Null);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":597\n+ * res = bytearray()\n+ * for varbind in varbinds:\n+ * if isinstance(varbind, str): # <<<<<<<<<<<<<<\n+ * oid = varbind\n+ * value = None\n+ *\/\n+ goto __pyx_L5;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":601\n+ * value = None\n+ * value_type = \"Null\"\n+ * elif len(varbind) == 3: # <<<<<<<<<<<<<<\n * oid, value_type, value = varbind\n * elif len(varbind) == 2:\n *\/\n- __pyx_t_5 = PyObject_Length(__pyx_v_varbind); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 439, __pyx_L1_error)\n- __pyx_t_6 = ((__pyx_t_5 == 3) != 0);\n+ __pyx_t_7 = PyObject_Length(__pyx_v_varbind); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 601, __pyx_L1_error)\n+ __pyx_t_6 = ((__pyx_t_7 == 3) != 0);\n if (__pyx_t_6) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":440\n- * for varbind in varbinds:\n- * if len(varbind) == 3:\n+ \/* \"fastsnmp\/snmp_parser.pyx\":602\n+ * value_type = \"Null\"\n+ * elif len(varbind) == 3:\n * oid, value_type, value = varbind # <<<<<<<<<<<<<<\n * elif len(varbind) == 2:\n * oid, value_type = varbind\n@@ -6314,85 +7543,85 @@\n if (unlikely(size != 3)) {\n if (size > 3) __Pyx_RaiseTooManyValuesError(3);\n else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 440, __pyx_L1_error)\n+ __PYX_ERR(0, 602, __pyx_L1_error)\n }\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n if (likely(PyTuple_CheckExact(sequence))) {\n __pyx_t_4 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_7 = PyTuple_GET_ITEM(sequence, 1); \n- __pyx_t_8 = PyTuple_GET_ITEM(sequence, 2); \n+ __pyx_t_8 = PyTuple_GET_ITEM(sequence, 1); \n+ __pyx_t_9 = PyTuple_GET_ITEM(sequence, 2); \n } else {\n __pyx_t_4 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_7 = PyList_GET_ITEM(sequence, 1); \n- __pyx_t_8 = PyList_GET_ITEM(sequence, 2); \n+ __pyx_t_8 = PyList_GET_ITEM(sequence, 1); \n+ __pyx_t_9 = PyList_GET_ITEM(sequence, 2); \n }\n __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_7);\n __Pyx_INCREF(__pyx_t_8);\n+ __Pyx_INCREF(__pyx_t_9);\n #else\n- __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 602, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 440, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_8 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __pyx_t_8 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 602, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_9 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 602, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_9);\n #endif\n } else {\n Py_ssize_t index = -1;\n- __pyx_t_9 = PyObject_GetIter(__pyx_v_varbind); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __pyx_t_10 = PyObject_GetIter(__pyx_v_varbind); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 602, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_10);\n+ __pyx_t_11 = Py_TYPE(__pyx_t_10)->tp_iternext;\n+ index = 0; __pyx_t_4 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_4)) goto __pyx_L6_unpacking_failed;\n+ __Pyx_GOTREF(__pyx_t_4);\n+ index = 1; __pyx_t_8 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_8)) goto __pyx_L6_unpacking_failed;\n+ __Pyx_GOTREF(__pyx_t_8);\n+ index = 2; __pyx_t_9 = __pyx_t_11(__pyx_t_10); if (unlikely(!__pyx_t_9)) goto __pyx_L6_unpacking_failed;\n __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_10 = Py_TYPE(__pyx_t_9)->tp_iternext;\n- index = 0; __pyx_t_4 = __pyx_t_10(__pyx_t_9); if (unlikely(!__pyx_t_4)) goto __pyx_L6_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- index = 1; __pyx_t_7 = __pyx_t_10(__pyx_t_9); if (unlikely(!__pyx_t_7)) goto __pyx_L6_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_7);\n- index = 2; __pyx_t_8 = __pyx_t_10(__pyx_t_9); if (unlikely(!__pyx_t_8)) goto __pyx_L6_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_8);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_10(__pyx_t_9), 3) < 0) __PYX_ERR(0, 440, __pyx_L1_error)\n- __pyx_t_10 = NULL;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+ if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_10), 3) < 0) __PYX_ERR(0, 602, __pyx_L1_error)\n+ __pyx_t_11 = NULL;\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n goto __pyx_L7_unpacking_done;\n __pyx_L6_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_10 = NULL;\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n+ __pyx_t_11 = NULL;\n if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 440, __pyx_L1_error)\n+ __PYX_ERR(0, 602, __pyx_L1_error)\n __pyx_L7_unpacking_done:;\n }\n __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_t_4);\n __pyx_t_4 = 0;\n- __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_t_7);\n- __pyx_t_7 = 0;\n- __Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_8);\n+ __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_t_8);\n __pyx_t_8 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":439\n- * res = bytearray()\n- * for varbind in varbinds:\n- * if len(varbind) == 3: # <<<<<<<<<<<<<<\n+ __Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_9);\n+ __pyx_t_9 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":601\n+ * value = None\n+ * value_type = \"Null\"\n+ * elif len(varbind) == 3: # <<<<<<<<<<<<<<\n * oid, value_type, value = varbind\n * elif len(varbind) == 2:\n *\/\n goto __pyx_L5;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":441\n- * if len(varbind) == 3:\n+ \/* \"fastsnmp\/snmp_parser.pyx\":603\n+ * elif len(varbind) == 3:\n * oid, value_type, value = varbind\n * elif len(varbind) == 2: # <<<<<<<<<<<<<<\n * oid, value_type = varbind\n * value = None\n *\/\n- __pyx_t_5 = PyObject_Length(__pyx_v_varbind); if (unlikely(__pyx_t_5 == -1)) __PYX_ERR(0, 441, __pyx_L1_error)\n- __pyx_t_6 = ((__pyx_t_5 == 2) != 0);\n+ __pyx_t_7 = PyObject_Length(__pyx_v_varbind); if (unlikely(__pyx_t_7 == -1)) __PYX_ERR(0, 603, __pyx_L1_error)\n+ __pyx_t_6 = ((__pyx_t_7 == 2) != 0);\n if (__pyx_t_6) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":442\n+ \/* \"fastsnmp\/snmp_parser.pyx\":604\n * oid, value_type, value = varbind\n * elif len(varbind) == 2:\n * oid, value_type = varbind # <<<<<<<<<<<<<<\n * value = None\n- * else:\n+ * res += encode_varbind(oid, value_type, value)\n *\/\n if ((likely(PyTuple_CheckExact(__pyx_v_varbind))) || (PyList_CheckExact(__pyx_v_varbind))) {\n PyObject* sequence = __pyx_v_varbind;\n@@ -6404,177 +7633,147 @@\n if (unlikely(size != 2)) {\n if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 442, __pyx_L1_error)\n+ __PYX_ERR(0, 604, __pyx_L1_error)\n }\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_8 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_7 = PyTuple_GET_ITEM(sequence, 1); \n+ __pyx_t_9 = PyTuple_GET_ITEM(sequence, 0); \n+ __pyx_t_8 = PyTuple_GET_ITEM(sequence, 1); \n } else {\n- __pyx_t_8 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_7 = PyList_GET_ITEM(sequence, 1); \n+ __pyx_t_9 = PyList_GET_ITEM(sequence, 0); \n+ __pyx_t_8 = PyList_GET_ITEM(sequence, 1); \n }\n+ __Pyx_INCREF(__pyx_t_9);\n __Pyx_INCREF(__pyx_t_8);\n- __Pyx_INCREF(__pyx_t_7);\n #else\n- __pyx_t_8 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 442, __pyx_L1_error)\n+ __pyx_t_9 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 604, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_8 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 604, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_7 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 442, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n #endif\n } else {\n Py_ssize_t index = -1;\n- __pyx_t_4 = PyObject_GetIter(__pyx_v_varbind); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 442, __pyx_L1_error)\n+ __pyx_t_4 = PyObject_GetIter(__pyx_v_varbind); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 604, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_10 = Py_TYPE(__pyx_t_4)->tp_iternext;\n- index = 0; __pyx_t_8 = __pyx_t_10(__pyx_t_4); if (unlikely(!__pyx_t_8)) goto __pyx_L8_unpacking_failed;\n+ __pyx_t_11 = Py_TYPE(__pyx_t_4)->tp_iternext;\n+ index = 0; __pyx_t_9 = __pyx_t_11(__pyx_t_4); if (unlikely(!__pyx_t_9)) goto __pyx_L8_unpacking_failed;\n+ __Pyx_GOTREF(__pyx_t_9);\n+ index = 1; __pyx_t_8 = __pyx_t_11(__pyx_t_4); if (unlikely(!__pyx_t_8)) goto __pyx_L8_unpacking_failed;\n __Pyx_GOTREF(__pyx_t_8);\n- index = 1; __pyx_t_7 = __pyx_t_10(__pyx_t_4); if (unlikely(!__pyx_t_7)) goto __pyx_L8_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_7);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_10(__pyx_t_4), 2) < 0) __PYX_ERR(0, 442, __pyx_L1_error)\n- __pyx_t_10 = NULL;\n+ if (__Pyx_IternextUnpackEndCheck(__pyx_t_11(__pyx_t_4), 2) < 0) __PYX_ERR(0, 604, __pyx_L1_error)\n+ __pyx_t_11 = NULL;\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n goto __pyx_L9_unpacking_done;\n __pyx_L8_unpacking_failed:;\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_10 = NULL;\n+ __pyx_t_11 = NULL;\n if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 442, __pyx_L1_error)\n+ __PYX_ERR(0, 604, __pyx_L1_error)\n __pyx_L9_unpacking_done:;\n }\n- __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_t_8);\n+ __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_t_9);\n+ __pyx_t_9 = 0;\n+ __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_t_8);\n __pyx_t_8 = 0;\n- __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_t_7);\n- __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":443\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":605\n * elif len(varbind) == 2:\n * oid, value_type = varbind\n * value = None # <<<<<<<<<<<<<<\n- * else:\n- * oid = varbind\n+ * res += encode_varbind(oid, value_type, value)\n+ * return res\n *\/\n __Pyx_INCREF(Py_None);\n __Pyx_XDECREF_SET(__pyx_v_value, Py_None);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":441\n- * if len(varbind) == 3:\n+ \/* \"fastsnmp\/snmp_parser.pyx\":603\n+ * elif len(varbind) == 3:\n * oid, value_type, value = varbind\n * elif len(varbind) == 2: # <<<<<<<<<<<<<<\n * oid, value_type = varbind\n * value = None\n *\/\n- goto __pyx_L5;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":445\n+ }\n+ __pyx_L5:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":606\n+ * oid, value_type = varbind\n * value = None\n- * else:\n- * oid = varbind # <<<<<<<<<<<<<<\n- * value = None\n- * value_type = \"Null\"\n- *\/\n- \/*else*\/ {\n- __Pyx_INCREF(__pyx_v_varbind);\n- __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_v_varbind);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":446\n- * else:\n- * oid = varbind\n- * value = None # <<<<<<<<<<<<<<\n- * value_type = \"Null\"\n- * res += encode_varbind(oid, value_type, value)\n- *\/\n- __Pyx_INCREF(Py_None);\n- __Pyx_XDECREF_SET(__pyx_v_value, Py_None);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":447\n- * oid = varbind\n- * value = None\n- * value_type = \"Null\" # <<<<<<<<<<<<<<\n- * res += encode_varbind(oid, value_type, value)\n- * return res\n- *\/\n- __Pyx_INCREF(__pyx_n_u_Null);\n- __Pyx_XDECREF_SET(__pyx_v_value_type, __pyx_n_u_Null);\n- }\n- __pyx_L5:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":448\n- * value = None\n- * value_type = \"Null\"\n * res += encode_varbind(oid, value_type, value) # <<<<<<<<<<<<<<\n * return res\n * \n *\/\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_encode_varbind); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 448, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_encode_varbind); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 606, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_9);\n+ if (unlikely(!__pyx_v_oid)) { __Pyx_RaiseUnboundLocalError(\"oid\"); __PYX_ERR(0, 606, __pyx_L1_error) }\n+ if (unlikely(!__pyx_v_value_type)) { __Pyx_RaiseUnboundLocalError(\"value_type\"); __PYX_ERR(0, 606, __pyx_L1_error) }\n+ if (unlikely(!__pyx_v_value)) { __Pyx_RaiseUnboundLocalError(\"value\"); __PYX_ERR(0, 606, __pyx_L1_error) }\n __pyx_t_4 = NULL;\n- __pyx_t_11 = 0;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_8))) {\n- __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_8);\n+ __pyx_t_12 = 0;\n+ if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_9))) {\n+ __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_9);\n if (likely(__pyx_t_4)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);\n+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_9);\n __Pyx_INCREF(__pyx_t_4);\n __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_8, function);\n- __pyx_t_11 = 1;\n+ __Pyx_DECREF_SET(__pyx_t_9, function);\n+ __pyx_t_12 = 1;\n }\n }\n #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_8)) {\n+ if (PyFunction_Check(__pyx_t_9)) {\n PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_v_oid, __pyx_v_value_type, __pyx_v_value};\n- __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_11, 3+__pyx_t_11); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 448, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_12, 3+__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 606, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_GOTREF(__pyx_t_8);\n } else\n #endif\n #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_8)) {\n+ if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) {\n PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_v_oid, __pyx_v_value_type, __pyx_v_value};\n- __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_8, __pyx_temp+1-__pyx_t_11, 3+__pyx_t_11); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 448, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_12, 3+__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 606, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_GOTREF(__pyx_t_8);\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(3+__pyx_t_11); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 448, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_10 = PyTuple_New(3+__pyx_t_12); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 606, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_10);\n if (__pyx_t_4) {\n- __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_4); __pyx_t_4 = NULL;\n+ __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_4); __pyx_t_4 = NULL;\n }\n __Pyx_INCREF(__pyx_v_oid);\n __Pyx_GIVEREF(__pyx_v_oid);\n- PyTuple_SET_ITEM(__pyx_t_9, 0+__pyx_t_11, __pyx_v_oid);\n+ PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_12, __pyx_v_oid);\n __Pyx_INCREF(__pyx_v_value_type);\n __Pyx_GIVEREF(__pyx_v_value_type);\n- PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_11, __pyx_v_value_type);\n+ PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_12, __pyx_v_value_type);\n __Pyx_INCREF(__pyx_v_value);\n __Pyx_GIVEREF(__pyx_v_value);\n- PyTuple_SET_ITEM(__pyx_t_9, 2+__pyx_t_11, __pyx_v_value);\n- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_9, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 448, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- }\n+ PyTuple_SET_ITEM(__pyx_t_10, 2+__pyx_t_12, __pyx_v_value);\n+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_10, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 606, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n+ }\n+ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+ __pyx_t_9 = PyNumber_InPlaceAdd(__pyx_v_res, __pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 606, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = PyNumber_InPlaceAdd(__pyx_v_res, __pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 448, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_8);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __Pyx_DECREF_SET(__pyx_v_res, __pyx_t_8);\n- __pyx_t_8 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":438\n+ __Pyx_DECREF_SET(__pyx_v_res, __pyx_t_9);\n+ __pyx_t_9 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":596\n * def varbinds_encode(varbinds):\n * res = bytearray()\n * for varbind in varbinds: # <<<<<<<<<<<<<<\n- * if len(varbind) == 3:\n- * oid, value_type, value = varbind\n+ * if isinstance(varbind, str):\n+ * oid = varbind\n *\/\n }\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":449\n- * value_type = \"Null\"\n+ \/* \"fastsnmp\/snmp_parser.pyx\":607\n+ * value = None\n * res += encode_varbind(oid, value_type, value)\n * return res # <<<<<<<<<<<<<<\n * \n@@ -6585,7 +7784,7 @@\n __pyx_r = __pyx_v_res;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":436\n+ \/* \"fastsnmp\/snmp_parser.pyx\":594\n * \n * \n * def varbinds_encode(varbinds): # <<<<<<<<<<<<<<\n@@ -6597,23 +7796,24 @@\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_1);\n __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_7);\n __Pyx_XDECREF(__pyx_t_8);\n __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_XDECREF(__pyx_t_10);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.varbinds_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n __Pyx_XDECREF(__pyx_v_res);\n __Pyx_XDECREF(__pyx_v_varbind);\n __Pyx_XDECREF(__pyx_v_oid);\n+ __Pyx_XDECREF(__pyx_v_value);\n __Pyx_XDECREF(__pyx_v_value_type);\n- __Pyx_XDECREF(__pyx_v_value);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":452\n+\/* \"fastsnmp\/snmp_parser.pyx\":610\n * \n * \n * def varbinds_encode_tlv(varbinds): # <<<<<<<<<<<<<<\n@@ -6623,8 +7823,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_31varbinds_encode_tlv(PyObject *__pyx_self, PyObject *__pyx_v_varbinds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_30varbinds_encode_tlv[] = \"varbinds_encode_tlv(varbinds)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_31varbinds_encode_tlv = {\"varbinds_encode_tlv\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_31varbinds_encode_tlv, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_30varbinds_encode_tlv};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_31varbinds_encode_tlv = {\"varbinds_encode_tlv\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_31varbinds_encode_tlv, METH_O, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_31varbinds_encode_tlv(PyObject *__pyx_self, PyObject *__pyx_v_varbinds) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -6641,6 +7840,7 @@\n PyObject *__pyx_v_varbinds_id = NULL;\n PyObject *__pyx_v_varbinds_len = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n PyObject *__pyx_t_2 = NULL;\n@@ -6651,16 +7851,18 @@\n int __pyx_t_7;\n PyObject *__pyx_t_8 = NULL;\n Py_ssize_t __pyx_t_9;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__26)\n __Pyx_RefNannySetupContext(\"varbinds_encode_tlv\", 0);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":453\n+ __Pyx_TraceCall(\"varbinds_encode_tlv\", __pyx_f[0], 610, 0, __PYX_ERR(0, 610, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":611\n * \n * def varbinds_encode_tlv(varbinds):\n * varbinds_data = varbinds_encode(varbinds) # <<<<<<<<<<<<<<\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * varbinds_len = length_encode(len(varbinds_data))\n *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_varbinds_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_varbinds_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __pyx_t_3 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) {\n@@ -6673,13 +7875,13 @@\n }\n }\n if (!__pyx_t_3) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_varbinds); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_varbinds); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_varbinds};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n } else\n@@ -6687,19 +7889,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_varbinds};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n } else\n #endif\n {\n- __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL;\n __Pyx_INCREF(__pyx_v_varbinds);\n __Pyx_GIVEREF(__pyx_v_varbinds);\n PyTuple_SET_ITEM(__pyx_t_4, 0+1, __pyx_v_varbinds);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 453, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 611, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n }\n@@ -6708,28 +7910,28 @@\n __pyx_v_varbinds_data = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":454\n+ \/* \"fastsnmp\/snmp_parser.pyx\":612\n * def varbinds_encode_tlv(varbinds):\n * varbinds_data = varbinds_encode(varbinds)\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence']) # <<<<<<<<<<<<<<\n * varbinds_len = length_encode(len(varbinds_data))\n * return varbinds_id + varbinds_len + varbinds_data\n *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_3 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_5 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_4, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_t_4 = NULL;\n@@ -6747,7 +7949,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_t_3, __pyx_t_5, __pyx_t_6};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n@@ -6758,7 +7960,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[4] = {__pyx_t_4, __pyx_t_3, __pyx_t_5, __pyx_t_6};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_7, 3+__pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n@@ -6767,7 +7969,7 @@\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(3+__pyx_t_7); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n if (__pyx_t_4) {\n __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_4); __pyx_t_4 = NULL;\n@@ -6781,7 +7983,7 @@\n __pyx_t_3 = 0;\n __pyx_t_5 = 0;\n __pyx_t_6 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 454, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_8, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 612, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -6789,17 +7991,17 @@\n __pyx_v_varbinds_id = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":455\n+ \/* \"fastsnmp\/snmp_parser.pyx\":613\n * varbinds_data = varbinds_encode(varbinds)\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * varbinds_len = length_encode(len(varbinds_data)) # <<<<<<<<<<<<<<\n * return varbinds_id + varbinds_len + varbinds_data\n * \n *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_9 = PyObject_Length(__pyx_v_varbinds_data); if (unlikely(__pyx_t_9 == -1)) __PYX_ERR(0, 455, __pyx_L1_error)\n- __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_Length(__pyx_v_varbinds_data); if (unlikely(__pyx_t_9 == -1)) __PYX_ERR(0, 613, __pyx_L1_error)\n+ __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) {\n@@ -6812,14 +8014,14 @@\n }\n }\n if (!__pyx_t_6) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_8};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -6828,20 +8030,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_8};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n } else\n #endif\n {\n- __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_5 = PyTuple_New(1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_6); __pyx_t_6 = NULL;\n __Pyx_GIVEREF(__pyx_t_8);\n PyTuple_SET_ITEM(__pyx_t_5, 0+1, __pyx_t_8);\n __pyx_t_8 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 455, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 613, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n }\n@@ -6850,7 +8052,7 @@\n __pyx_v_varbinds_len = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":456\n+ \/* \"fastsnmp\/snmp_parser.pyx\":614\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * varbinds_len = length_encode(len(varbinds_data))\n * return varbinds_id + varbinds_len + varbinds_data # <<<<<<<<<<<<<<\n@@ -6858,16 +8060,16 @@\n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_1 = PyNumber_Add(__pyx_v_varbinds_id, __pyx_v_varbinds_len); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 456, __pyx_L1_error)\n+ __pyx_t_1 = PyNumber_Add(__pyx_v_varbinds_id, __pyx_v_varbinds_len); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 614, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyNumber_Add(__pyx_t_1, __pyx_v_varbinds_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 456, __pyx_L1_error)\n+ __pyx_t_2 = PyNumber_Add(__pyx_t_1, __pyx_v_varbinds_data); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 614, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __pyx_r = __pyx_t_2;\n __pyx_t_2 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":452\n+ \/* \"fastsnmp\/snmp_parser.pyx\":610\n * \n * \n * def varbinds_encode_tlv(varbinds): # <<<<<<<<<<<<<<\n@@ -6891,11 +8093,12 @@\n __Pyx_XDECREF(__pyx_v_varbinds_id);\n __Pyx_XDECREF(__pyx_v_varbinds_len);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":459\n+\/* \"fastsnmp\/snmp_parser.pyx\":617\n * \n * \n * def msg_encode(req_id, community, varbinds, msg_type=\"GetBulk\", max_repetitions=10, non_repeaters=0): # <<<<<<<<<<<<<<\n@@ -6905,7 +8108,7 @@\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_33msg_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_32msg_encode[] = \"msg_encode(req_id, community, varbinds, msg_type=u'GetBulk', max_repetitions=10, non_repeaters=0)\\n\\n Build SNMP-message\\n\\n :param req_id: request identifier\\n :type req_id: int\\n :param community: snmp community\\n :type community: string\\n :param varbinds: list of oid to encode or bytes if encoded\\n :type varbinds: tuple\\n :param msg_type: index of ASN_SNMP_MSG_TYPES\\n :type msg_type: str\\n :param max_repetitions: max repetitions\\n :type community: int\\n :param non_repeaters: non repeaters\\n :type varbinds: int\\n :returns: encoded message\\n :rtype: bytes\\n \";\n+static char __pyx_doc_8fastsnmp_11snmp_parser_32msg_encode[] = \"\\n Build SNMP-message\\n\\n :param req_id: request identifier\\n :type req_id: int\\n :param community: snmp community\\n :type community: string\\n :param varbinds: list of oid to encode or bytes if encoded\\n :type varbinds: tuple\\n :param msg_type: index of ASN_SNMP_MSG_TYPES\\n :type msg_type: str\\n :param max_repetitions: max repetitions\\n :type community: int\\n :param non_repeaters: non repeaters\\n :type varbinds: int\\n :returns: encoded message\\n :rtype: bytes\\n \";\n static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_33msg_encode = {\"msg_encode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_33msg_encode, METH_VARARGS|METH_KEYWORDS, __pyx_doc_8fastsnmp_11snmp_parser_32msg_encode};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_33msg_encode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_req_id = 0;\n@@ -6944,12 +8147,12 @@\n case 1:\n if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_community)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, 1); __PYX_ERR(0, 459, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, 1); __PYX_ERR(0, 617, __pyx_L3_error)\n }\n case 2:\n if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_varbinds)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, 2); __PYX_ERR(0, 459, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, 2); __PYX_ERR(0, 617, __pyx_L3_error)\n }\n case 3:\n if (kw_args > 0) {\n@@ -6968,7 +8171,7 @@\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"msg_encode\") < 0)) __PYX_ERR(0, 459, __pyx_L3_error)\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"msg_encode\") < 0)) __PYX_ERR(0, 617, __pyx_L3_error)\n }\n } else {\n switch (PyTuple_GET_SIZE(__pyx_args)) {\n@@ -6991,7 +8194,7 @@\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 459, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"msg_encode\", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 617, __pyx_L3_error)\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.msg_encode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n@@ -7033,6 +8236,7 @@\n PyObject *__pyx_v_snmp_message_len = NULL;\n PyObject *__pyx_v_snmp_message = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n int __pyx_t_1;\n int __pyx_t_2;\n@@ -7046,10 +8250,12 @@\n int __pyx_t_10;\n PyObject *__pyx_t_11 = NULL;\n Py_ssize_t __pyx_t_12;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__27)\n __Pyx_RefNannySetupContext(\"msg_encode\", 0);\n+ __Pyx_TraceCall(\"msg_encode\", __pyx_f[0], 617, 0, __PYX_ERR(0, 617, __pyx_L1_error));\n __Pyx_INCREF(__pyx_v_community);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":478\n+ \/* \"fastsnmp\/snmp_parser.pyx\":636\n * :rtype: bytes\n * \"\"\"\n * if isinstance(varbinds, (list, tuple)): # <<<<<<<<<<<<<<\n@@ -7070,14 +8276,14 @@\n __pyx_t_2 = (__pyx_t_1 != 0);\n if (__pyx_t_2) {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":479\n+ \/* \"fastsnmp\/snmp_parser.pyx\":637\n * \"\"\"\n * if isinstance(varbinds, (list, tuple)):\n * varbinds_tlv = varbinds_encode_tlv(varbinds) # <<<<<<<<<<<<<<\n * else:\n * varbinds_tlv = varbinds\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_varbinds_encode_tlv); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_varbinds_encode_tlv); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7090,13 +8296,13 @@\n }\n }\n if (!__pyx_t_6) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_varbinds); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_varbinds); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_v_varbinds};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n@@ -7104,19 +8310,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_v_varbinds};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL;\n __Pyx_INCREF(__pyx_v_varbinds);\n __Pyx_GIVEREF(__pyx_v_varbinds);\n PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_varbinds);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 479, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 637, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -7125,7 +8331,7 @@\n __pyx_v_varbinds_tlv = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":478\n+ \/* \"fastsnmp\/snmp_parser.pyx\":636\n * :rtype: bytes\n * \"\"\"\n * if isinstance(varbinds, (list, tuple)): # <<<<<<<<<<<<<<\n@@ -7135,7 +8341,7 @@\n goto __pyx_L3;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":481\n+ \/* \"fastsnmp\/snmp_parser.pyx\":639\n * varbinds_tlv = varbinds_encode_tlv(varbinds)\n * else:\n * varbinds_tlv = varbinds # <<<<<<<<<<<<<<\n@@ -7148,28 +8354,28 @@\n }\n __pyx_L3:;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":483\n+ \/* \"fastsnmp\/snmp_parser.pyx\":641\n * varbinds_tlv = varbinds\n * \n * requestID_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * requestID = integer_encode(req_id)\n * requestID_len = length_encode(len(requestID))\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __pyx_t_7 = NULL;\n@@ -7187,7 +8393,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_6, __pyx_t_8, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -7198,7 +8404,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_6, __pyx_t_8, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -7207,7 +8413,7 @@\n } else\n #endif\n {\n- __pyx_t_11 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_11 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n if (__pyx_t_7) {\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_7); __pyx_t_7 = NULL;\n@@ -7221,7 +8427,7 @@\n __pyx_t_6 = 0;\n __pyx_t_8 = 0;\n __pyx_t_9 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 483, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 641, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n }\n@@ -7229,14 +8435,14 @@\n __pyx_v_requestID_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":484\n+ \/* \"fastsnmp\/snmp_parser.pyx\":642\n * \n * requestID_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * requestID = integer_encode(req_id) # <<<<<<<<<<<<<<\n * requestID_len = length_encode(len(requestID))\n * \n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_11 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7249,13 +8455,13 @@\n }\n }\n if (!__pyx_t_11) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_req_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_req_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_v_req_id};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n@@ -7263,19 +8469,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_v_req_id};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_11); __pyx_t_11 = NULL;\n __Pyx_INCREF(__pyx_v_req_id);\n __Pyx_GIVEREF(__pyx_v_req_id);\n PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_v_req_id);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 484, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 642, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n }\n@@ -7284,17 +8490,17 @@\n __pyx_v_requestID = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":485\n+ \/* \"fastsnmp\/snmp_parser.pyx\":643\n * requestID_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * requestID = integer_encode(req_id)\n * requestID_len = length_encode(len(requestID)) # <<<<<<<<<<<<<<\n * \n * \n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_requestID); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 485, __pyx_L1_error)\n- __pyx_t_9 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_requestID); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 643, __pyx_L1_error)\n+ __pyx_t_9 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __pyx_t_11 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7307,14 +8513,14 @@\n }\n }\n if (!__pyx_t_11) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -7323,20 +8529,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_11); __pyx_t_11 = NULL;\n __Pyx_GIVEREF(__pyx_t_9);\n PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_9);\n __pyx_t_9 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 485, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 643, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -7345,24 +8551,58 @@\n __pyx_v_requestID_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":489\n+ \/* \"fastsnmp\/snmp_parser.pyx\":647\n * \n * \n * if msg_type == \"GetBulk\": # <<<<<<<<<<<<<<\n+ * if max_repetitions < 1:\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n+ *\/\n+ __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_msg_type, __pyx_n_u_GetBulk, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 647, __pyx_L1_error)\n+ if (__pyx_t_2) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":648\n+ * \n+ * if msg_type == \"GetBulk\":\n+ * if max_repetitions < 1: # <<<<<<<<<<<<<<\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n+ * nonRepeaters = integer_encode(non_repeaters)\n+ *\/\n+ __pyx_t_4 = PyObject_RichCompare(__pyx_v_max_repetitions, __pyx_int_1, Py_LT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 648, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 648, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (__pyx_t_2) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":649\n+ * if msg_type == \"GetBulk\":\n+ * if max_repetitions < 1:\n+ * raise Exception(\"max_repetitions must be higher than 0\") # <<<<<<<<<<<<<<\n * nonRepeaters = integer_encode(non_repeaters)\n * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n *\/\n- __pyx_t_2 = (__Pyx_PyUnicode_Equals(__pyx_v_msg_type, __pyx_n_u_GetBulk, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 489, __pyx_L1_error)\n- if (__pyx_t_2) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":490\n+ __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])), __pyx_tuple__28, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 649, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_Raise(__pyx_t_4, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __PYX_ERR(0, 649, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":648\n * \n * if msg_type == \"GetBulk\":\n+ * if max_repetitions < 1: # <<<<<<<<<<<<<<\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n+ * nonRepeaters = integer_encode(non_repeaters)\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":650\n+ * if max_repetitions < 1:\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n * nonRepeaters = integer_encode(non_repeaters) # <<<<<<<<<<<<<<\n * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * nonRepeaters_len = length_encode(len(nonRepeaters))\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_8 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7375,13 +8615,13 @@\n }\n }\n if (!__pyx_t_8) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_non_repeaters); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_non_repeaters); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_v_non_repeaters};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n@@ -7389,19 +8629,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_v_non_repeaters};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_8); __pyx_t_8 = NULL;\n __Pyx_INCREF(__pyx_v_non_repeaters);\n __Pyx_GIVEREF(__pyx_v_non_repeaters);\n PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_v_non_repeaters);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 490, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 650, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n }\n@@ -7410,28 +8650,28 @@\n __pyx_v_nonRepeaters = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":491\n- * if msg_type == \"GetBulk\":\n+ \/* \"fastsnmp\/snmp_parser.pyx\":651\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n * nonRepeaters = integer_encode(non_repeaters)\n * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * nonRepeaters_len = length_encode(len(nonRepeaters))\n * \n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_9 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_Integer); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_9, __pyx_n_u_Integer); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n __pyx_t_9 = NULL;\n@@ -7449,7 +8689,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_9, __pyx_t_8, __pyx_t_11, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -7460,7 +8700,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_9, __pyx_t_8, __pyx_t_11, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -7469,7 +8709,7 @@\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n if (__pyx_t_9) {\n __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_9); __pyx_t_9 = NULL;\n@@ -7483,7 +8723,7 @@\n __pyx_t_8 = 0;\n __pyx_t_11 = 0;\n __pyx_t_6 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 491, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 651, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -7491,17 +8731,17 @@\n __pyx_v_nonRepeaters_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":492\n+ \/* \"fastsnmp\/snmp_parser.pyx\":652\n * nonRepeaters = integer_encode(non_repeaters)\n * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * nonRepeaters_len = length_encode(len(nonRepeaters)) # <<<<<<<<<<<<<<\n * \n * maxRepetitions = integer_encode(max_repetitions)\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_nonRepeaters); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 492, __pyx_L1_error)\n- __pyx_t_7 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_nonRepeaters); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 652, __pyx_L1_error)\n+ __pyx_t_7 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7514,14 +8754,14 @@\n }\n }\n if (!__pyx_t_6) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_7};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -7530,20 +8770,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_7};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n } else\n #endif\n {\n- __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_6); __pyx_t_6 = NULL;\n __Pyx_GIVEREF(__pyx_t_7);\n PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_7);\n __pyx_t_7 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 492, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 652, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n }\n@@ -7552,14 +8792,14 @@\n __pyx_v_nonRepeaters_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":494\n+ \/* \"fastsnmp\/snmp_parser.pyx\":654\n * nonRepeaters_len = length_encode(len(nonRepeaters))\n * \n * maxRepetitions = integer_encode(max_repetitions) # <<<<<<<<<<<<<<\n * maxRepetitions_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * maxRepetitions_len = length_encode(len(maxRepetitions))\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_11 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7572,13 +8812,13 @@\n }\n }\n if (!__pyx_t_11) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_max_repetitions); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_max_repetitions); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_v_max_repetitions};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n@@ -7586,19 +8826,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_v_max_repetitions};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_11); __pyx_t_11 = NULL;\n __Pyx_INCREF(__pyx_v_max_repetitions);\n __Pyx_GIVEREF(__pyx_v_max_repetitions);\n PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_max_repetitions);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 494, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 654, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -7607,28 +8847,28 @@\n __pyx_v_maxRepetitions = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":495\n+ \/* \"fastsnmp\/snmp_parser.pyx\":655\n * \n * maxRepetitions = integer_encode(max_repetitions)\n * maxRepetitions_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * maxRepetitions_len = length_encode(len(maxRepetitions))\n * pdu = requestID_id + requestID_len + requestID + \\\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __pyx_t_7 = NULL;\n@@ -7646,7 +8886,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_11, __pyx_t_6, __pyx_t_8};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -7657,7 +8897,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_11, __pyx_t_6, __pyx_t_8};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -7666,7 +8906,7 @@\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_9 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n if (__pyx_t_7) {\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7); __pyx_t_7 = NULL;\n@@ -7680,7 +8920,7 @@\n __pyx_t_11 = 0;\n __pyx_t_6 = 0;\n __pyx_t_8 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 495, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 655, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n }\n@@ -7688,17 +8928,17 @@\n __pyx_v_maxRepetitions_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":496\n+ \/* \"fastsnmp\/snmp_parser.pyx\":656\n * maxRepetitions = integer_encode(max_repetitions)\n * maxRepetitions_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * maxRepetitions_len = length_encode(len(maxRepetitions)) # <<<<<<<<<<<<<<\n * pdu = requestID_id + requestID_len + requestID + \\\n * nonRepeaters_id + nonRepeaters_len + nonRepeaters + \\\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_maxRepetitions); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 496, __pyx_L1_error)\n- __pyx_t_9 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_maxRepetitions); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 656, __pyx_L1_error)\n+ __pyx_t_9 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __pyx_t_8 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -7711,14 +8951,14 @@\n }\n }\n if (!__pyx_t_8) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_9); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -7727,20 +8967,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_8, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8); __pyx_t_8 = NULL;\n __Pyx_GIVEREF(__pyx_t_9);\n PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_9);\n __pyx_t_9 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 496, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 656, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -7749,77 +8989,77 @@\n __pyx_v_maxRepetitions_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":497\n+ \/* \"fastsnmp\/snmp_parser.pyx\":657\n * maxRepetitions_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * maxRepetitions_len = length_encode(len(maxRepetitions))\n * pdu = requestID_id + requestID_len + requestID + \\ # <<<<<<<<<<<<<<\n * nonRepeaters_id + nonRepeaters_len + nonRepeaters + \\\n * maxRepetitions_id + maxRepetitions_len + maxRepetitions + \\\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_v_requestID_id, __pyx_v_requestID_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 497, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_v_requestID_id, __pyx_v_requestID_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 657, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_requestID); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 497, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_requestID); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 657, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":498\n+ \/* \"fastsnmp\/snmp_parser.pyx\":658\n * maxRepetitions_len = length_encode(len(maxRepetitions))\n * pdu = requestID_id + requestID_len + requestID + \\\n * nonRepeaters_id + nonRepeaters_len + nonRepeaters + \\ # <<<<<<<<<<<<<<\n * maxRepetitions_id + maxRepetitions_len + maxRepetitions + \\\n * varbinds_tlv\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_nonRepeaters_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 497, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_nonRepeaters_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 657, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_nonRepeaters_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 498, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_nonRepeaters_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 658, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_nonRepeaters); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 498, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_nonRepeaters); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 658, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":499\n+ \/* \"fastsnmp\/snmp_parser.pyx\":659\n * pdu = requestID_id + requestID_len + requestID + \\\n * nonRepeaters_id + nonRepeaters_len + nonRepeaters + \\\n * maxRepetitions_id + maxRepetitions_len + maxRepetitions + \\ # <<<<<<<<<<<<<<\n * varbinds_tlv\n * else:\n *\/\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_maxRepetitions_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 498, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_maxRepetitions_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 658, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_maxRepetitions_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 499, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_maxRepetitions_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 659, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_maxRepetitions); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 499, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_maxRepetitions); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 659, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":500\n+ \/* \"fastsnmp\/snmp_parser.pyx\":660\n * nonRepeaters_id + nonRepeaters_len + nonRepeaters + \\\n * maxRepetitions_id + maxRepetitions_len + maxRepetitions + \\\n * varbinds_tlv # <<<<<<<<<<<<<<\n * else:\n * error_status = integer_encode(0)\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_varbinds_tlv); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 499, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_varbinds_tlv); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 659, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_v_pdu = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":489\n+ \/* \"fastsnmp\/snmp_parser.pyx\":647\n * \n * \n * if msg_type == \"GetBulk\": # <<<<<<<<<<<<<<\n- * nonRepeaters = integer_encode(non_repeaters)\n- * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n+ * if max_repetitions < 1:\n+ * raise Exception(\"max_repetitions must be higher than 0\")\n *\/\n goto __pyx_L6;\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":502\n+ \/* \"fastsnmp\/snmp_parser.pyx\":662\n * varbinds_tlv\n * else:\n * error_status = integer_encode(0) # <<<<<<<<<<<<<<\n@@ -7827,36 +9067,36 @@\n * error_status_len = length_encode(len(error_status))\n *\/\n \/*else*\/ {\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 502, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 662, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_tuple__10, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 502, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_tuple__29, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 662, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_v_error_status = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":503\n+ \/* \"fastsnmp\/snmp_parser.pyx\":663\n * else:\n * error_status = integer_encode(0)\n * error_status_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * error_status_len = length_encode(len(error_status))\n * error_index = integer_encode(0)\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_Integer); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_Integer); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __pyx_t_6 = NULL;\n@@ -7874,7 +9114,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_9, __pyx_t_8, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -7885,7 +9125,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_9, __pyx_t_8, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -7894,7 +9134,7 @@\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n if (__pyx_t_6) {\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL;\n@@ -7908,7 +9148,7 @@\n __pyx_t_9 = 0;\n __pyx_t_8 = 0;\n __pyx_t_11 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 503, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 663, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -7916,17 +9156,17 @@\n __pyx_v_error_status_id = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":504\n+ \/* \"fastsnmp\/snmp_parser.pyx\":664\n * error_status = integer_encode(0)\n * error_status_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_status_len = length_encode(len(error_status)) # <<<<<<<<<<<<<<\n * error_index = integer_encode(0)\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_12 = PyObject_Length(__pyx_v_error_status); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 504, __pyx_L1_error)\n- __pyx_t_7 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_error_status); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 664, __pyx_L1_error)\n+ __pyx_t_7 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __pyx_t_11 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -7939,14 +9179,14 @@\n }\n }\n if (!__pyx_t_11) {\n- __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_7); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_t_7};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -7955,20 +9195,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_11, __pyx_t_7};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_11); __pyx_t_11 = NULL;\n __Pyx_GIVEREF(__pyx_t_7);\n PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_t_7);\n __pyx_t_7 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 504, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 664, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -7977,43 +9217,43 @@\n __pyx_v_error_status_len = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":505\n+ \/* \"fastsnmp\/snmp_parser.pyx\":665\n * error_status_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_status_len = length_encode(len(error_status))\n * error_index = integer_encode(0) # <<<<<<<<<<<<<<\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_index_len = length_encode(len(error_index))\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 505, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 665, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_tuple__11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 505, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_tuple__30, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 665, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_v_error_index = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":506\n+ \/* \"fastsnmp\/snmp_parser.pyx\":666\n * error_status_len = length_encode(len(error_status))\n * error_index = integer_encode(0)\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * error_index_len = length_encode(len(error_index))\n * pdu = requestID_id + requestID_len + requestID + \\\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __pyx_t_8 = NULL;\n@@ -8031,7 +9271,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_7, __pyx_t_11, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -8042,7 +9282,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_7, __pyx_t_11, __pyx_t_9};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n@@ -8051,7 +9291,7 @@\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n if (__pyx_t_8) {\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_8); __pyx_t_8 = NULL;\n@@ -8065,7 +9305,7 @@\n __pyx_t_7 = 0;\n __pyx_t_11 = 0;\n __pyx_t_9 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 506, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 666, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -8073,17 +9313,17 @@\n __pyx_v_error_index_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":507\n+ \/* \"fastsnmp\/snmp_parser.pyx\":667\n * error_index = integer_encode(0)\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_index_len = length_encode(len(error_index)) # <<<<<<<<<<<<<<\n * pdu = requestID_id + requestID_len + requestID + \\\n * error_status_id + error_status_len + error_status + \\\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_error_index); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 507, __pyx_L1_error)\n- __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_error_index); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 667, __pyx_L1_error)\n+ __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __pyx_t_9 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -8096,14 +9336,14 @@\n }\n }\n if (!__pyx_t_9) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -8112,20 +9352,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n } else\n #endif\n {\n- __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_11 = PyTuple_New(1+1); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_9); __pyx_t_9 = NULL;\n __Pyx_GIVEREF(__pyx_t_6);\n PyTuple_SET_ITEM(__pyx_t_11, 0+1, __pyx_t_6);\n __pyx_t_6 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 507, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 667, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n }\n@@ -8134,61 +9374,61 @@\n __pyx_v_error_index_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":508\n+ \/* \"fastsnmp\/snmp_parser.pyx\":668\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_index_len = length_encode(len(error_index))\n * pdu = requestID_id + requestID_len + requestID + \\ # <<<<<<<<<<<<<<\n * error_status_id + error_status_len + error_status + \\\n * error_index_id + error_index_len + error_index + \\\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_v_requestID_id, __pyx_v_requestID_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 508, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_v_requestID_id, __pyx_v_requestID_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 668, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_requestID); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 508, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_requestID); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 668, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":509\n+ \/* \"fastsnmp\/snmp_parser.pyx\":669\n * error_index_len = length_encode(len(error_index))\n * pdu = requestID_id + requestID_len + requestID + \\\n * error_status_id + error_status_len + error_status + \\ # <<<<<<<<<<<<<<\n * error_index_id + error_index_len + error_index + \\\n * varbinds_tlv\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_status_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 508, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_status_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 668, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_status_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 509, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_status_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 669, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_status); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 509, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_status); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 669, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":510\n+ \/* \"fastsnmp\/snmp_parser.pyx\":670\n * pdu = requestID_id + requestID_len + requestID + \\\n * error_status_id + error_status_len + error_status + \\\n * error_index_id + error_index_len + error_index + \\ # <<<<<<<<<<<<<<\n * varbinds_tlv\n * \n *\/\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_index_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 509, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_index_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 669, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_index_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 510, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_error_index_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 670, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 510, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_error_index); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 670, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":511\n+ \/* \"fastsnmp\/snmp_parser.pyx\":671\n * error_status_id + error_status_len + error_status + \\\n * error_index_id + error_index_len + error_index + \\\n * varbinds_tlv # <<<<<<<<<<<<<<\n * \n * pdu_id = tag_encode(asnTagClasses['CONTEXT'], asnTagFormats['CONSTRUCTED'], ASN_SNMP_MSG_TYPES[msg_type])\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_varbinds_tlv); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 510, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_varbinds_tlv); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 670, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_v_pdu = __pyx_t_4;\n@@ -8196,28 +9436,28 @@\n }\n __pyx_L6:;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":513\n+ \/* \"fastsnmp\/snmp_parser.pyx\":673\n * varbinds_tlv\n * \n * pdu_id = tag_encode(asnTagClasses['CONTEXT'], asnTagFormats['CONSTRUCTED'], ASN_SNMP_MSG_TYPES[msg_type]) # <<<<<<<<<<<<<<\n * pdu_len = length_encode(len(pdu))\n * \n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_11, __pyx_n_u_CONTEXT); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_11, __pyx_n_u_CONTEXT); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_11, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_11, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_SNMP_MSG_TYPES); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_SNMP_MSG_TYPES); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_11, __pyx_v_msg_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_11, __pyx_v_msg_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n __pyx_t_11 = NULL;\n@@ -8235,7 +9475,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_11, __pyx_t_6, __pyx_t_9, __pyx_t_7};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -8246,7 +9486,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_11, __pyx_t_6, __pyx_t_9, __pyx_t_7};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n@@ -8255,7 +9495,7 @@\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n if (__pyx_t_11) {\n __Pyx_GIVEREF(__pyx_t_11); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_11); __pyx_t_11 = NULL;\n@@ -8269,7 +9509,7 @@\n __pyx_t_6 = 0;\n __pyx_t_9 = 0;\n __pyx_t_7 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 513, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 673, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -8277,17 +9517,17 @@\n __pyx_v_pdu_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":514\n+ \/* \"fastsnmp\/snmp_parser.pyx\":674\n * \n * pdu_id = tag_encode(asnTagClasses['CONTEXT'], asnTagFormats['CONSTRUCTED'], ASN_SNMP_MSG_TYPES[msg_type])\n * pdu_len = length_encode(len(pdu)) # <<<<<<<<<<<<<<\n * \n * community = octetstring_encode(community)\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_pdu); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 514, __pyx_L1_error)\n- __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_pdu); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 674, __pyx_L1_error)\n+ __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __pyx_t_7 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -8300,14 +9540,14 @@\n }\n }\n if (!__pyx_t_7) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_8); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_8};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -8316,20 +9556,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_8};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7); __pyx_t_7 = NULL;\n __Pyx_GIVEREF(__pyx_t_8);\n PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_t_8);\n __pyx_t_8 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 514, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 674, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n }\n@@ -8338,14 +9578,14 @@\n __pyx_v_pdu_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":516\n+ \/* \"fastsnmp\/snmp_parser.pyx\":676\n * pdu_len = length_encode(len(pdu))\n * \n * community = octetstring_encode(community) # <<<<<<<<<<<<<<\n * community_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['OctetString'])\n * community_len = length_encode(len(community))\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_octetstring_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_octetstring_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_9 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -8358,13 +9598,13 @@\n }\n }\n if (!__pyx_t_9) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_community); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_community); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_v_community};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n@@ -8372,19 +9612,19 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_v_community};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(1+1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_9); __pyx_t_9 = NULL;\n __Pyx_INCREF(__pyx_v_community);\n __Pyx_GIVEREF(__pyx_v_community);\n PyTuple_SET_ITEM(__pyx_t_8, 0+1, __pyx_v_community);\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 516, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_8, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 676, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -8393,28 +9633,28 @@\n __Pyx_DECREF_SET(__pyx_v_community, __pyx_t_4);\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":517\n+ \/* \"fastsnmp\/snmp_parser.pyx\":677\n * \n * community = octetstring_encode(community)\n * community_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['OctetString']) # <<<<<<<<<<<<<<\n * community_len = length_encode(len(community))\n * \n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_7 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_OctetString); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_8, __pyx_n_u_OctetString); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __pyx_t_8 = NULL;\n@@ -8432,7 +9672,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_9, __pyx_t_7, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -8443,7 +9683,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[4] = {__pyx_t_8, __pyx_t_9, __pyx_t_7, __pyx_t_6};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n@@ -8452,7 +9692,7 @@\n } else\n #endif\n {\n- __pyx_t_11 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_11 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n if (__pyx_t_8) {\n __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_8); __pyx_t_8 = NULL;\n@@ -8466,7 +9706,7 @@\n __pyx_t_9 = 0;\n __pyx_t_7 = 0;\n __pyx_t_6 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 517, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_11, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 677, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n }\n@@ -8474,17 +9714,17 @@\n __pyx_v_community_id = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":518\n+ \/* \"fastsnmp\/snmp_parser.pyx\":678\n * community = octetstring_encode(community)\n * community_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['OctetString'])\n * community_len = length_encode(len(community)) # <<<<<<<<<<<<<<\n * \n * version = integer_encode(1)\n *\/\n- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_12 = PyObject_Length(__pyx_v_community); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 518, __pyx_L1_error)\n- __pyx_t_11 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_community); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 678, __pyx_L1_error)\n+ __pyx_t_11 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n@@ -8497,14 +9737,14 @@\n }\n }\n if (!__pyx_t_6) {\n- __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_11); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_11};\n- __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -8513,20 +9753,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_11};\n- __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL;\n __Pyx_GIVEREF(__pyx_t_11);\n PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_11);\n __pyx_t_11 = 0;\n- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 678, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -8535,43 +9775,43 @@\n __pyx_v_community_len = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":520\n+ \/* \"fastsnmp\/snmp_parser.pyx\":680\n * community_len = length_encode(len(community))\n * \n * version = integer_encode(1) # <<<<<<<<<<<<<<\n * version_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * version_len = length_encode(len(version))\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 520, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 680, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 520, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_tuple__31, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 680, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __pyx_v_version = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":521\n+ \/* \"fastsnmp\/snmp_parser.pyx\":681\n * \n * version = integer_encode(1)\n * version_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer']) # <<<<<<<<<<<<<<\n * version_len = length_encode(len(version))\n * \n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_6 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_PRIMITIVE); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_7, __pyx_n_u_Integer); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n __pyx_t_7 = NULL;\n@@ -8589,7 +9829,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_11, __pyx_t_6, __pyx_t_9};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -8600,7 +9840,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_7, __pyx_t_11, __pyx_t_6, __pyx_t_9};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -8609,7 +9849,7 @@\n } else\n #endif\n {\n- __pyx_t_8 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_8 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n if (__pyx_t_7) {\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_7); __pyx_t_7 = NULL;\n@@ -8623,7 +9863,7 @@\n __pyx_t_11 = 0;\n __pyx_t_6 = 0;\n __pyx_t_9 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 521, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_8, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 681, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n }\n@@ -8631,17 +9871,17 @@\n __pyx_v_version_id = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":522\n+ \/* \"fastsnmp\/snmp_parser.pyx\":682\n * version = integer_encode(1)\n * version_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * version_len = length_encode(len(version)) # <<<<<<<<<<<<<<\n * \n * snmp_message_seq_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_12 = PyObject_Length(__pyx_v_version); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 522, __pyx_L1_error)\n- __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_v_version); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 682, __pyx_L1_error)\n+ __pyx_t_8 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __pyx_t_9 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -8654,14 +9894,14 @@\n }\n }\n if (!__pyx_t_9) {\n- __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_t_8};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -8670,20 +9910,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_9, __pyx_t_8};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n __Pyx_GIVEREF(__pyx_t_9); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_9); __pyx_t_9 = NULL;\n __Pyx_GIVEREF(__pyx_t_8);\n PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_8);\n __pyx_t_8 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 522, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 682, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n }\n@@ -8692,28 +9932,28 @@\n __pyx_v_version_len = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":524\n+ \/* \"fastsnmp\/snmp_parser.pyx\":684\n * version_len = length_encode(len(version))\n * \n * snmp_message_seq_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence']) # <<<<<<<<<<<<<<\n * snmp_message_len = length_encode(len(version_id + version_len + version + \\\n * community_id + community_len + community + \\\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagClasses); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_8 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_UNIVERSAL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_8);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_asnTagFormats); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_9 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_9 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_CONSTRUCTED); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_ASN_TYPES); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_11 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_11 = PyObject_GetItem(__pyx_t_6, __pyx_n_u_Sequence); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n __pyx_t_6 = NULL;\n@@ -8731,7 +9971,7 @@\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_8, __pyx_t_9, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -8742,7 +9982,7 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[4] = {__pyx_t_6, __pyx_t_8, __pyx_t_9, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_10, 3+__pyx_t_10); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n@@ -8751,7 +9991,7 @@\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(3+__pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n if (__pyx_t_6) {\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL;\n@@ -8765,7 +10005,7 @@\n __pyx_t_8 = 0;\n __pyx_t_9 = 0;\n __pyx_t_11 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 524, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 684, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n@@ -8773,65 +10013,65 @@\n __pyx_v_snmp_message_seq_id = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":525\n+ \/* \"fastsnmp\/snmp_parser.pyx\":685\n * \n * snmp_message_seq_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * snmp_message_len = length_encode(len(version_id + version_len + version + \\ # <<<<<<<<<<<<<<\n * community_id + community_len + community + \\\n * pdu_id + pdu_len + pdu))\n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_encode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyNumber_Add(__pyx_v_version_id, __pyx_v_version_len); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_7 = PyNumber_Add(__pyx_v_version_id, __pyx_v_version_len); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_version); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_version); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":526\n+ \/* \"fastsnmp\/snmp_parser.pyx\":686\n * snmp_message_seq_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * snmp_message_len = length_encode(len(version_id + version_len + version + \\\n * community_id + community_len + community + \\ # <<<<<<<<<<<<<<\n * pdu_id + pdu_len + pdu))\n * \n *\/\n- __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_community_id); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_community_id); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_community_len); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 526, __pyx_L1_error)\n+ __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_community_len); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 686, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_community); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 526, __pyx_L1_error)\n+ __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_community); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 686, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":527\n+ \/* \"fastsnmp\/snmp_parser.pyx\":687\n * snmp_message_len = length_encode(len(version_id + version_len + version + \\\n * community_id + community_len + community + \\\n * pdu_id + pdu_len + pdu)) # <<<<<<<<<<<<<<\n * \n * snmp_message = snmp_message_seq_id + snmp_message_len + version_id + version_len + version + \\\n *\/\n- __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_pdu_id); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 526, __pyx_L1_error)\n+ __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_pdu_id); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 686, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_pdu_len); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 527, __pyx_L1_error)\n+ __pyx_t_7 = PyNumber_Add(__pyx_t_11, __pyx_v_pdu_len); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 687, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_pdu); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 527, __pyx_L1_error)\n+ __pyx_t_11 = PyNumber_Add(__pyx_t_7, __pyx_v_pdu); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 687, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":525\n+ \/* \"fastsnmp\/snmp_parser.pyx\":685\n * \n * snmp_message_seq_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n * snmp_message_len = length_encode(len(version_id + version_len + version + \\ # <<<<<<<<<<<<<<\n * community_id + community_len + community + \\\n * pdu_id + pdu_len + pdu))\n *\/\n- __pyx_t_12 = PyObject_Length(__pyx_t_11); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_12 = PyObject_Length(__pyx_t_11); if (unlikely(__pyx_t_12 == -1)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __pyx_t_11 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_11 = PyInt_FromSsize_t(__pyx_t_12); if (unlikely(!__pyx_t_11)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_11);\n __pyx_t_7 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n@@ -8844,14 +10084,14 @@\n }\n }\n if (!__pyx_t_7) {\n- __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_11); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_11); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n@@ -8860,20 +10100,20 @@\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_11};\n- __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n } else\n #endif\n {\n- __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_9);\n __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_7); __pyx_t_7 = NULL;\n __Pyx_GIVEREF(__pyx_t_11);\n PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_t_11);\n __pyx_t_11 = 0;\n- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 685, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n }\n@@ -8882,62 +10122,62 @@\n __pyx_v_snmp_message_len = __pyx_t_5;\n __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":529\n+ \/* \"fastsnmp\/snmp_parser.pyx\":689\n * pdu_id + pdu_len + pdu))\n * \n * snmp_message = snmp_message_seq_id + snmp_message_len + version_id + version_len + version + \\ # <<<<<<<<<<<<<<\n * community_id + community_len + community + \\\n * pdu_id + pdu_len + pdu\n *\/\n- __pyx_t_5 = PyNumber_Add(__pyx_v_snmp_message_seq_id, __pyx_v_snmp_message_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 529, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_v_snmp_message_seq_id, __pyx_v_snmp_message_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 689, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_version_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 529, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_version_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 689, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_version_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 529, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_version_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 689, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_version); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 529, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_version); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 689, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":530\n+ \/* \"fastsnmp\/snmp_parser.pyx\":690\n * \n * snmp_message = snmp_message_seq_id + snmp_message_len + version_id + version_len + version + \\\n * community_id + community_len + community + \\ # <<<<<<<<<<<<<<\n * pdu_id + pdu_len + pdu\n * \n *\/\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_community_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 529, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_community_id); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 689, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_community_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 530, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_community_len); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 690, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_community); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 530, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_community); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 690, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":531\n+ \/* \"fastsnmp\/snmp_parser.pyx\":691\n * snmp_message = snmp_message_seq_id + snmp_message_len + version_id + version_len + version + \\\n * community_id + community_len + community + \\\n * pdu_id + pdu_len + pdu # <<<<<<<<<<<<<<\n * \n * return snmp_message\n *\/\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_pdu_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 530, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_pdu_id); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 690, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_pdu_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 531, __pyx_L1_error)\n+ __pyx_t_5 = PyNumber_Add(__pyx_t_4, __pyx_v_pdu_len); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 691, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_5);\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_pdu); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 531, __pyx_L1_error)\n+ __pyx_t_4 = PyNumber_Add(__pyx_t_5, __pyx_v_pdu); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 691, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_v_snmp_message = __pyx_t_4;\n __pyx_t_4 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":533\n+ \/* \"fastsnmp\/snmp_parser.pyx\":693\n * pdu_id + pdu_len + pdu\n * \n * return snmp_message # <<<<<<<<<<<<<<\n@@ -8949,7 +10189,7 @@\n __pyx_r = __pyx_v_snmp_message;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":459\n+ \/* \"fastsnmp\/snmp_parser.pyx\":617\n * \n * \n * def msg_encode(req_id, community, varbinds, msg_type=\"GetBulk\", max_repetitions=10, non_repeaters=0): # <<<<<<<<<<<<<<\n@@ -8998,22 +10238,22 @@\n __Pyx_XDECREF(__pyx_v_snmp_message);\n __Pyx_XDECREF(__pyx_v_community);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":536\n+\/* \"fastsnmp\/snmp_parser.pyx\":696\n * \n * \n * def msg_decode(stream): # <<<<<<<<<<<<<<\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length, length\n *\/\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_35msg_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_34msg_decode[] = \"msg_decode(stream)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_35msg_decode = {\"msg_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_35msg_decode, METH_O, __pyx_doc_8fastsnmp_11snmp_parser_34msg_decode};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_35msg_decode = {\"msg_decode\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_35msg_decode, METH_O, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_35msg_decode(PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n PyObject *__pyx_r = 0;\n __Pyx_RefNannyDeclarations\n@@ -9026,322 +10266,118 @@\n }\n \n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_34msg_decode(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_stream) {\n- PyObject *__pyx_v_tag = NULL;\n- PyObject *__pyx_v_length = NULL;\n- PyObject *__pyx_v_objectData = NULL;\n+ uint64_t __pyx_v_tag;\n+ size_t __pyx_v_encode_length;\n+ size_t __pyx_v_length;\n+ char *__pyx_v_stream_char;\n+ char *__pyx_v_stream_ptr;\n+ CYTHON_UNUSED size_t __pyx_v_stream_len;\n+ PyObject *__pyx_v_data = 0;\n CYTHON_UNUSED PyObject *__pyx_v_snmp_ver = NULL;\n CYTHON_UNUSED PyObject *__pyx_v_community = NULL;\n- PyObject *__pyx_v_data = NULL;\n PyObject *__pyx_v_req_id = NULL;\n PyObject *__pyx_v_error_status = NULL;\n PyObject *__pyx_v_error_index = NULL;\n PyObject *__pyx_v_varbinds = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n- PyObject *__pyx_t_1 = NULL;\n- PyObject *__pyx_t_2 = NULL;\n- PyObject *__pyx_t_3 = NULL;\n+ char *__pyx_t_1;\n+ Py_ssize_t __pyx_t_2;\n+ int __pyx_t_3;\n PyObject *__pyx_t_4 = NULL;\n- PyObject *(*__pyx_t_5)(PyObject *);\n+ PyObject *__pyx_t_5 = NULL;\n PyObject *__pyx_t_6 = NULL;\n+ PyObject *__pyx_t_7 = NULL;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__32)\n __Pyx_RefNannySetupContext(\"msg_decode\", 0);\n- __Pyx_INCREF(__pyx_v_stream);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":537\n+ __Pyx_TraceCall(\"msg_decode\", __pyx_f[0], 696, 0, __PYX_ERR(0, 696, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":697\n * \n * def msg_decode(stream):\n- * (tag, stream) = tag_decode(stream) # <<<<<<<<<<<<<<\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length]\n- *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_tag_decode); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) {\n- __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2);\n- if (likely(__pyx_t_3)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_2, function);\n- }\n- }\n- if (!__pyx_t_3) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_v_stream); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_2)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_4, 0+1, __pyx_v_stream);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) {\n- PyObject* sequence = __pyx_t_1;\n- #if !CYTHON_COMPILING_IN_PYPY\n- Py_ssize_t size = Py_SIZE(sequence);\n- #else\n- Py_ssize_t size = PySequence_Size(sequence);\n- #endif\n- if (unlikely(size != 2)) {\n- if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n- else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 537, __pyx_L1_error)\n- }\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_2 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 1); \n- } else {\n- __pyx_t_2 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyList_GET_ITEM(sequence, 1); \n- }\n- __Pyx_INCREF(__pyx_t_2);\n- __Pyx_INCREF(__pyx_t_4);\n- #else\n- __pyx_t_2 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- #endif\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- } else {\n- Py_ssize_t index = -1;\n- __pyx_t_3 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 537, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_5 = Py_TYPE(__pyx_t_3)->tp_iternext;\n- index = 0; __pyx_t_2 = __pyx_t_5(__pyx_t_3); if (unlikely(!__pyx_t_2)) goto __pyx_L3_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_2);\n- index = 1; __pyx_t_4 = __pyx_t_5(__pyx_t_3); if (unlikely(!__pyx_t_4)) goto __pyx_L3_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_5(__pyx_t_3), 2) < 0) __PYX_ERR(0, 537, __pyx_L1_error)\n- __pyx_t_5 = NULL;\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- goto __pyx_L4_unpacking_done;\n- __pyx_L3_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_5 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 537, __pyx_L1_error)\n- __pyx_L4_unpacking_done:;\n- }\n- __pyx_v_tag = __pyx_t_2;\n- __pyx_t_2 = 0;\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":538\n- * def msg_decode(stream):\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream) # <<<<<<<<<<<<<<\n- * objectData = stream[:length]\n- * stream = stream[length:]\n- *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_decode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n- __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_4);\n- if (likely(__pyx_t_2)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_2);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_4, function);\n- }\n- }\n- if (!__pyx_t_2) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_stream); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_2, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_2, __pyx_v_stream};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_3 = PyTuple_New(1+1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __pyx_t_2 = NULL;\n- __Pyx_INCREF(__pyx_v_stream);\n- __Pyx_GIVEREF(__pyx_v_stream);\n- PyTuple_SET_ITEM(__pyx_t_3, 0+1, __pyx_v_stream);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) {\n- PyObject* sequence = __pyx_t_1;\n- #if !CYTHON_COMPILING_IN_PYPY\n- Py_ssize_t size = Py_SIZE(sequence);\n- #else\n- Py_ssize_t size = PySequence_Size(sequence);\n- #endif\n- if (unlikely(size != 2)) {\n- if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n- else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 538, __pyx_L1_error)\n- }\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); \n- } else {\n- __pyx_t_4 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_3 = PyList_GET_ITEM(sequence, 1); \n- }\n- __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_3);\n- #else\n- __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_3 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- #endif\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- } else {\n- Py_ssize_t index = -1;\n- __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 538, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_5 = Py_TYPE(__pyx_t_2)->tp_iternext;\n- index = 0; __pyx_t_4 = __pyx_t_5(__pyx_t_2); if (unlikely(!__pyx_t_4)) goto __pyx_L5_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- index = 1; __pyx_t_3 = __pyx_t_5(__pyx_t_2); if (unlikely(!__pyx_t_3)) goto __pyx_L5_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_3);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_5(__pyx_t_2), 2) < 0) __PYX_ERR(0, 538, __pyx_L1_error)\n- __pyx_t_5 = NULL;\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- goto __pyx_L6_unpacking_done;\n- __pyx_L5_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- __pyx_t_5 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 538, __pyx_L1_error)\n- __pyx_L6_unpacking_done:;\n- }\n- __pyx_v_length = __pyx_t_4;\n- __pyx_t_4 = 0;\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_3);\n- __pyx_t_3 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":539\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length] # <<<<<<<<<<<<<<\n- * stream = stream[length:]\n- * snmp_ver, community, data = tagDecodeDict[tag](objectData)\n- *\/\n- __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, NULL, &__pyx_v_length, NULL, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 539, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_v_objectData = __pyx_t_1;\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":540\n- * (length, stream) = length_decode(stream)\n- * objectData = stream[:length]\n- * stream = stream[length:] # <<<<<<<<<<<<<<\n- * snmp_ver, community, data = tagDecodeDict[tag](objectData)\n+ * cdef uint64_t tag=0 # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length\n+ * cdef char* stream_char = stream\n+ *\/\n+ __pyx_v_tag = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":699\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length, length\n+ * cdef char* stream_char = stream # <<<<<<<<<<<<<<\n+ * cdef char* stream_ptr = stream_char\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_t_1 = __Pyx_PyObject_AsString(__pyx_v_stream); if (unlikely((!__pyx_t_1) && PyErr_Occurred())) __PYX_ERR(0, 699, __pyx_L1_error)\n+ __pyx_v_stream_char = __pyx_t_1;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":700\n+ * cdef size_t encode_length, length\n+ * cdef char* stream_char = stream\n+ * cdef char* stream_ptr = stream_char # <<<<<<<<<<<<<<\n+ * cdef size_t stream_len = len(stream)\n+ * cdef list data\n+ *\/\n+ __pyx_v_stream_ptr = __pyx_v_stream_char;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":701\n+ * cdef char* stream_char = stream\n+ * cdef char* stream_ptr = stream_char\n+ * cdef size_t stream_len = len(stream) # <<<<<<<<<<<<<<\n+ * cdef list data\n+ * \n+ *\/\n+ __pyx_t_2 = PyObject_Length(__pyx_v_stream); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 701, __pyx_L1_error)\n+ __pyx_v_stream_len = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":704\n+ * cdef list data\n+ * \n+ * tag_decode_c(stream_ptr, &tag, &encode_length) # <<<<<<<<<<<<<<\n+ * stream_ptr += encode_length\n+ * length_decode_c(stream_ptr, &length, &encode_length)\n+ *\/\n+ __pyx_t_3 = __pyx_f_8fastsnmp_11snmp_parser_tag_decode_c(__pyx_v_stream_ptr, (&__pyx_v_tag), (&__pyx_v_encode_length)); if (unlikely(__pyx_t_3 == -1)) __PYX_ERR(0, 704, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":705\n+ * \n+ * tag_decode_c(stream_ptr, &tag, &encode_length)\n+ * stream_ptr += encode_length # <<<<<<<<<<<<<<\n+ * length_decode_c(stream_ptr, &length, &encode_length)\n+ * stream_ptr += encode_length\n+ *\/\n+ __pyx_v_stream_ptr = (__pyx_v_stream_ptr + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":706\n+ * tag_decode_c(stream_ptr, &tag, &encode_length)\n+ * stream_ptr += encode_length\n+ * length_decode_c(stream_ptr, &length, &encode_length) # <<<<<<<<<<<<<<\n+ * stream_ptr += encode_length\n+ * snmp_ver, community, data = sequence_decode_c(stream_ptr, length)\n+ *\/\n+ __pyx_f_8fastsnmp_11snmp_parser_length_decode_c(__pyx_v_stream_ptr, (&__pyx_v_length), (&__pyx_v_encode_length));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":707\n+ * stream_ptr += encode_length\n+ * length_decode_c(stream_ptr, &length, &encode_length)\n+ * stream_ptr += encode_length # <<<<<<<<<<<<<<\n+ * snmp_ver, community, data = sequence_decode_c(stream_ptr, length)\n * req_id, error_status, error_index, varbinds = data\n *\/\n- __pyx_t_1 = __Pyx_PyObject_GetSlice(__pyx_v_stream, 0, 0, &__pyx_v_length, NULL, NULL, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 540, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF_SET(__pyx_v_stream, __pyx_t_1);\n- __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":541\n- * objectData = stream[:length]\n- * stream = stream[length:]\n- * snmp_ver, community, data = tagDecodeDict[tag](objectData) # <<<<<<<<<<<<<<\n+ __pyx_v_stream_ptr = (__pyx_v_stream_ptr + __pyx_v_encode_length);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":708\n+ * length_decode_c(stream_ptr, &length, &encode_length)\n+ * stream_ptr += encode_length\n+ * snmp_ver, community, data = sequence_decode_c(stream_ptr, length) # <<<<<<<<<<<<<<\n * req_id, error_status, error_index, varbinds = data\n * return req_id, error_status, error_index, varbinds\n *\/\n- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_tagDecodeDict); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = PyObject_GetItem(__pyx_t_3, __pyx_v_tag); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 541, __pyx_L1_error)\n+ __pyx_t_4 = __pyx_f_8fastsnmp_11snmp_parser_sequence_decode_c(__pyx_v_stream_ptr, __pyx_v_length); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 708, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __pyx_t_3 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n- __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_4);\n- if (likely(__pyx_t_3)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_4, function);\n- }\n- }\n- if (!__pyx_t_3) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_v_objectData); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_objectData};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_v_objectData};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else\n- #endif\n- {\n- __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3); __pyx_t_3 = NULL;\n- __Pyx_INCREF(__pyx_v_objectData);\n- __Pyx_GIVEREF(__pyx_v_objectData);\n- PyTuple_SET_ITEM(__pyx_t_2, 0+1, __pyx_v_objectData);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if ((likely(PyTuple_CheckExact(__pyx_t_1))) || (PyList_CheckExact(__pyx_t_1))) {\n- PyObject* sequence = __pyx_t_1;\n+ if (likely(__pyx_t_4 != Py_None)) {\n+ PyObject* sequence = __pyx_t_4;\n #if !CYTHON_COMPILING_IN_PYPY\n Py_ssize_t size = Py_SIZE(sequence);\n #else\n@@ -9350,68 +10386,43 @@\n if (unlikely(size != 3)) {\n if (size > 3) __Pyx_RaiseTooManyValuesError(3);\n else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 541, __pyx_L1_error)\n+ __PYX_ERR(0, 708, __pyx_L1_error)\n }\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_2 = PyTuple_GET_ITEM(sequence, 1); \n- __pyx_t_3 = PyTuple_GET_ITEM(sequence, 2); \n- } else {\n- __pyx_t_4 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_2 = PyList_GET_ITEM(sequence, 1); \n- __pyx_t_3 = PyList_GET_ITEM(sequence, 2); \n- }\n- __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_2);\n- __Pyx_INCREF(__pyx_t_3);\n+ __pyx_t_5 = PyList_GET_ITEM(sequence, 0); \n+ __pyx_t_6 = PyList_GET_ITEM(sequence, 1); \n+ __pyx_t_7 = PyList_GET_ITEM(sequence, 2); \n+ __Pyx_INCREF(__pyx_t_5);\n+ __Pyx_INCREF(__pyx_t_6);\n+ __Pyx_INCREF(__pyx_t_7);\n #else\n- __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_2 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 708, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 708, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_7 = PySequence_ITEM(sequence, 2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 708, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n #endif\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n } else {\n- Py_ssize_t index = -1;\n- __pyx_t_6 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 541, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_5 = Py_TYPE(__pyx_t_6)->tp_iternext;\n- index = 0; __pyx_t_4 = __pyx_t_5(__pyx_t_6); if (unlikely(!__pyx_t_4)) goto __pyx_L7_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- index = 1; __pyx_t_2 = __pyx_t_5(__pyx_t_6); if (unlikely(!__pyx_t_2)) goto __pyx_L7_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_2);\n- index = 2; __pyx_t_3 = __pyx_t_5(__pyx_t_6); if (unlikely(!__pyx_t_3)) goto __pyx_L7_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_3);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_5(__pyx_t_6), 3) < 0) __PYX_ERR(0, 541, __pyx_L1_error)\n- __pyx_t_5 = NULL;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- goto __pyx_L8_unpacking_done;\n- __pyx_L7_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_5 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 541, __pyx_L1_error)\n- __pyx_L8_unpacking_done:;\n+ __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 708, __pyx_L1_error)\n }\n- __pyx_v_snmp_ver = __pyx_t_4;\n- __pyx_t_4 = 0;\n- __pyx_v_community = __pyx_t_2;\n- __pyx_t_2 = 0;\n- __pyx_v_data = __pyx_t_3;\n- __pyx_t_3 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":542\n- * stream = stream[length:]\n- * snmp_ver, community, data = tagDecodeDict[tag](objectData)\n+ if (!(likely(PyList_CheckExact(__pyx_t_7))||((__pyx_t_7) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"list\", Py_TYPE(__pyx_t_7)->tp_name), 0))) __PYX_ERR(0, 708, __pyx_L1_error)\n+ __pyx_v_snmp_ver = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+ __pyx_v_community = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+ __pyx_v_data = ((PyObject*)__pyx_t_7);\n+ __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":709\n+ * stream_ptr += encode_length\n+ * snmp_ver, community, data = sequence_decode_c(stream_ptr, length)\n * req_id, error_status, error_index, varbinds = data # <<<<<<<<<<<<<<\n * return req_id, error_status, error_index, varbinds\n * \n *\/\n- if ((likely(PyTuple_CheckExact(__pyx_v_data))) || (PyList_CheckExact(__pyx_v_data))) {\n+ if (likely(__pyx_v_data != Py_None)) {\n PyObject* sequence = __pyx_v_data;\n #if !CYTHON_COMPILING_IN_PYPY\n Py_ssize_t size = Py_SIZE(sequence);\n@@ -9421,138 +10432,107 @@\n if (unlikely(size != 4)) {\n if (size > 4) __Pyx_RaiseTooManyValuesError(4);\n else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 542, __pyx_L1_error)\n+ __PYX_ERR(0, 709, __pyx_L1_error)\n }\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_3 = PyTuple_GET_ITEM(sequence, 1); \n- __pyx_t_2 = PyTuple_GET_ITEM(sequence, 2); \n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 3); \n- } else {\n- __pyx_t_1 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_3 = PyList_GET_ITEM(sequence, 1); \n- __pyx_t_2 = PyList_GET_ITEM(sequence, 2); \n- __pyx_t_4 = PyList_GET_ITEM(sequence, 3); \n- }\n- __Pyx_INCREF(__pyx_t_1);\n- __Pyx_INCREF(__pyx_t_3);\n- __Pyx_INCREF(__pyx_t_2);\n+ __pyx_t_4 = PyList_GET_ITEM(sequence, 0); \n+ __pyx_t_7 = PyList_GET_ITEM(sequence, 1); \n+ __pyx_t_6 = PyList_GET_ITEM(sequence, 2); \n+ __pyx_t_5 = PyList_GET_ITEM(sequence, 3); \n __Pyx_INCREF(__pyx_t_4);\n+ __Pyx_INCREF(__pyx_t_7);\n+ __Pyx_INCREF(__pyx_t_6);\n+ __Pyx_INCREF(__pyx_t_5);\n #else\n {\n Py_ssize_t i;\n- PyObject** temps[4] = {&__pyx_t_1,&__pyx_t_3,&__pyx_t_2,&__pyx_t_4};\n+ PyObject** temps[4] = {&__pyx_t_4,&__pyx_t_7,&__pyx_t_6,&__pyx_t_5};\n for (i=0; i < 4; i++) {\n- PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) __PYX_ERR(0, 542, __pyx_L1_error)\n+ PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) __PYX_ERR(0, 709, __pyx_L1_error)\n __Pyx_GOTREF(item);\n *(temps[i]) = item;\n }\n }\n #endif\n } else {\n- Py_ssize_t index = -1;\n- PyObject** temps[4] = {&__pyx_t_1,&__pyx_t_3,&__pyx_t_2,&__pyx_t_4};\n- __pyx_t_6 = PyObject_GetIter(__pyx_v_data); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 542, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_5 = Py_TYPE(__pyx_t_6)->tp_iternext;\n- for (index=0; index < 4; index++) {\n- PyObject* item = __pyx_t_5(__pyx_t_6); if (unlikely(!item)) goto __pyx_L9_unpacking_failed;\n- __Pyx_GOTREF(item);\n- *(temps[index]) = item;\n- }\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_5(__pyx_t_6), 4) < 0) __PYX_ERR(0, 542, __pyx_L1_error)\n- __pyx_t_5 = NULL;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- goto __pyx_L10_unpacking_done;\n- __pyx_L9_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_5 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 542, __pyx_L1_error)\n- __pyx_L10_unpacking_done:;\n+ __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 709, __pyx_L1_error)\n }\n- __pyx_v_req_id = __pyx_t_1;\n- __pyx_t_1 = 0;\n- __pyx_v_error_status = __pyx_t_3;\n- __pyx_t_3 = 0;\n- __pyx_v_error_index = __pyx_t_2;\n- __pyx_t_2 = 0;\n- __pyx_v_varbinds = __pyx_t_4;\n+ __pyx_v_req_id = __pyx_t_4;\n __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":543\n- * snmp_ver, community, data = tagDecodeDict[tag](objectData)\n+ __pyx_v_error_status = __pyx_t_7;\n+ __pyx_t_7 = 0;\n+ __pyx_v_error_index = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+ __pyx_v_varbinds = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":710\n+ * snmp_ver, community, data = sequence_decode_c(stream_ptr, length)\n * req_id, error_status, error_index, varbinds = data\n * return req_id, error_status, error_index, varbinds # <<<<<<<<<<<<<<\n * \n * \n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_4 = PyTuple_New(4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 543, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyTuple_New(4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 710, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n __Pyx_INCREF(__pyx_v_req_id);\n __Pyx_GIVEREF(__pyx_v_req_id);\n- PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_req_id);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_req_id);\n __Pyx_INCREF(__pyx_v_error_status);\n __Pyx_GIVEREF(__pyx_v_error_status);\n- PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_v_error_status);\n+ PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_v_error_status);\n __Pyx_INCREF(__pyx_v_error_index);\n __Pyx_GIVEREF(__pyx_v_error_index);\n- PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_v_error_index);\n+ PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_v_error_index);\n __Pyx_INCREF(__pyx_v_varbinds);\n __Pyx_GIVEREF(__pyx_v_varbinds);\n- PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_v_varbinds);\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n+ PyTuple_SET_ITEM(__pyx_t_5, 3, __pyx_v_varbinds);\n+ __pyx_r = __pyx_t_5;\n+ __pyx_t_5 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":536\n+ \/* \"fastsnmp\/snmp_parser.pyx\":696\n * \n * \n * def msg_decode(stream): # <<<<<<<<<<<<<<\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length, length\n *\/\n \n \/* function exit code *\/\n __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_2);\n- __Pyx_XDECREF(__pyx_t_3);\n __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n __Pyx_XDECREF(__pyx_t_6);\n+ __Pyx_XDECREF(__pyx_t_7);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.msg_decode\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n- __Pyx_XDECREF(__pyx_v_tag);\n- __Pyx_XDECREF(__pyx_v_length);\n- __Pyx_XDECREF(__pyx_v_objectData);\n+ __Pyx_XDECREF(__pyx_v_data);\n __Pyx_XDECREF(__pyx_v_snmp_ver);\n __Pyx_XDECREF(__pyx_v_community);\n- __Pyx_XDECREF(__pyx_v_data);\n __Pyx_XDECREF(__pyx_v_req_id);\n __Pyx_XDECREF(__pyx_v_error_status);\n __Pyx_XDECREF(__pyx_v_error_index);\n __Pyx_XDECREF(__pyx_v_varbinds);\n- __Pyx_XDECREF(__pyx_v_stream);\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n \n-\/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n+\/* \"fastsnmp\/snmp_parser.pyx\":713\n+ * \n+ * \n+ * def parse_varbind(list var_bind_list not None, tuple orig_main_oids not None, tuple oids_to_poll not None): # <<<<<<<<<<<<<<\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item\n *\/\n \n \/* Python wrapper *\/\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_37parse_varbind(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \/*proto*\/\n-static char __pyx_doc_8fastsnmp_11snmp_parser_36parse_varbind[] = \"parse_varbind(var_bind_list, orig_main_oids, oids_to_poll)\";\n-static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_37parse_varbind = {\"parse_varbind\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_37parse_varbind, METH_VARARGS|METH_KEYWORDS, __pyx_doc_8fastsnmp_11snmp_parser_36parse_varbind};\n+static PyMethodDef __pyx_mdef_8fastsnmp_11snmp_parser_37parse_varbind = {\"parse_varbind\", (PyCFunction)__pyx_pw_8fastsnmp_11snmp_parser_37parse_varbind, METH_VARARGS|METH_KEYWORDS, 0};\n static PyObject *__pyx_pw_8fastsnmp_11snmp_parser_37parse_varbind(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n PyObject *__pyx_v_var_bind_list = 0;\n PyObject *__pyx_v_orig_main_oids = 0;\n@@ -9581,16 +10561,16 @@\n case 1:\n if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_orig_main_oids)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, 1); __PYX_ERR(0, 546, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, 1); __PYX_ERR(0, 713, __pyx_L3_error)\n }\n case 2:\n if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_oids_to_poll)) != 0)) kw_args--;\n else {\n- __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, 2); __PYX_ERR(0, 546, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, 2); __PYX_ERR(0, 713, __pyx_L3_error)\n }\n }\n if (unlikely(kw_args > 0)) {\n- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"parse_varbind\") < 0)) __PYX_ERR(0, 546, __pyx_L3_error)\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, \"parse_varbind\") < 0)) __PYX_ERR(0, 713, __pyx_L3_error)\n }\n } else if (PyTuple_GET_SIZE(__pyx_args) != 3) {\n goto __pyx_L5_argtuple_error;\n@@ -9599,507 +10579,340 @@\n values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n values[2] = PyTuple_GET_ITEM(__pyx_args, 2);\n }\n- __pyx_v_var_bind_list = values[0];\n- __pyx_v_orig_main_oids = values[1];\n- __pyx_v_oids_to_poll = values[2];\n+ __pyx_v_var_bind_list = ((PyObject*)values[0]);\n+ __pyx_v_orig_main_oids = ((PyObject*)values[1]);\n+ __pyx_v_oids_to_poll = ((PyObject*)values[2]);\n }\n goto __pyx_L4_argument_unpacking_done;\n __pyx_L5_argtuple_error:;\n- __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 546, __pyx_L3_error)\n+ __Pyx_RaiseArgtupleInvalid(\"parse_varbind\", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 713, __pyx_L3_error)\n __pyx_L3_error:;\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.parse_varbind\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __Pyx_RefNannyFinishContext();\n return NULL;\n __pyx_L4_argument_unpacking_done:;\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_var_bind_list), (&PyList_Type), 0, \"var_bind_list\", 1))) __PYX_ERR(0, 713, __pyx_L1_error)\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_orig_main_oids), (&PyTuple_Type), 0, \"orig_main_oids\", 1))) __PYX_ERR(0, 713, __pyx_L1_error)\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_oids_to_poll), (&PyTuple_Type), 0, \"oids_to_poll\", 1))) __PYX_ERR(0, 713, __pyx_L1_error)\n __pyx_r = __pyx_pf_8fastsnmp_11snmp_parser_36parse_varbind(__pyx_self, __pyx_v_var_bind_list, __pyx_v_orig_main_oids, __pyx_v_oids_to_poll);\n \n \/* function exit code *\/\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n-static PyObject *__pyx_gb_8fastsnmp_11snmp_parser_13parse_varbind_2generator(__pyx_CoroutineObject *__pyx_generator, PyObject *__pyx_sent_value); \/* proto *\/\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":594\n- * else:\n- * next_oids = tuple(\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions) # <<<<<<<<<<<<<<\n- * \n- * return result, next_oids\n- *\/\n-\n-static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_13parse_varbind_genexpr(PyObject *__pyx_self) {\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *__pyx_cur_scope;\n- PyObject *__pyx_r = NULL;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"genexpr\", 0);\n- __pyx_cur_scope = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(__pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr, __pyx_empty_tuple, NULL);\n- if (unlikely(!__pyx_cur_scope)) {\n- __pyx_cur_scope = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)Py_None);\n- __Pyx_INCREF(Py_None);\n- __PYX_ERR(0, 594, __pyx_L1_error)\n- } else {\n- __Pyx_GOTREF(__pyx_cur_scope);\n- }\n- __pyx_cur_scope->__pyx_outer_scope = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *) __pyx_self;\n- __Pyx_INCREF(((PyObject *)__pyx_cur_scope->__pyx_outer_scope));\n- __Pyx_GIVEREF(__pyx_cur_scope->__pyx_outer_scope);\n- {\n- __pyx_CoroutineObject *gen = __Pyx_Generator_New((__pyx_coroutine_body_t) __pyx_gb_8fastsnmp_11snmp_parser_13parse_varbind_2generator, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_parse_varbind_locals_genexpr, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!gen)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_cur_scope);\n- __Pyx_RefNannyFinishContext();\n- return (PyObject *) gen;\n- }\n-\n- \/* function exit code *\/\n- __pyx_L1_error:;\n- __Pyx_AddTraceback(\"fastsnmp.snmp_parser.parse_varbind.genexpr\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_r = NULL;\n- __Pyx_DECREF(((PyObject *)__pyx_cur_scope));\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-static PyObject *__pyx_gb_8fastsnmp_11snmp_parser_13parse_varbind_2generator(__pyx_CoroutineObject *__pyx_generator, PyObject *__pyx_sent_value) \/* generator body *\/\n-{\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *__pyx_cur_scope = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)__pyx_generator->closure);\n- PyObject *__pyx_r = NULL;\n- PyObject *__pyx_t_1 = NULL;\n- Py_ssize_t __pyx_t_2;\n- PyObject *__pyx_t_3 = NULL;\n- PyObject *__pyx_t_4 = NULL;\n- PyObject *__pyx_t_5 = NULL;\n- __Pyx_RefNannyDeclarations\n- __Pyx_RefNannySetupContext(\"None\", 0);\n- switch (__pyx_generator->resume_label) {\n- case 0: goto __pyx_L3_first_run;\n- case 1: goto __pyx_L6_resume_from_yield;\n- default: \/* CPython raises the right error here *\/\n- __Pyx_RefNannyFinishContext();\n- return NULL;\n- }\n- __pyx_L3_first_run:;\n- if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 594, __pyx_L1_error)\n- if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_rest_oids_positions)) { __Pyx_RaiseClosureNameError(\"rest_oids_positions\"); __PYX_ERR(0, 594, __pyx_L1_error) }\n- if (unlikely(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_rest_oids_positions == Py_None)) {\n- PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n- __PYX_ERR(0, 594, __pyx_L1_error)\n- }\n- __pyx_t_1 = __pyx_cur_scope->__pyx_outer_scope->__pyx_v_rest_oids_positions; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;\n- for (;;) {\n- if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_3 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_3); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 594, __pyx_L1_error)\n- #else\n- __pyx_t_3 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- #endif\n- __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_p);\n- __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_p, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_3);\n- __pyx_t_3 = 0;\n- if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_orig_main_oids)) { __Pyx_RaiseClosureNameError(\"orig_main_oids\"); __PYX_ERR(0, 594, __pyx_L1_error) }\n- __pyx_t_3 = PyObject_GetItem(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_orig_main_oids, __pyx_cur_scope->__pyx_v_p); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_3);\n- if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_last_seen_index)) { __Pyx_RaiseClosureNameError(\"last_seen_index\"); __PYX_ERR(0, 594, __pyx_L1_error) }\n- if (unlikely(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_last_seen_index == Py_None)) {\n- PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not subscriptable\");\n- __PYX_ERR(0, 594, __pyx_L1_error)\n- }\n- __pyx_t_4 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_last_seen_index, __pyx_cur_scope->__pyx_v_p); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_5);\n- __Pyx_GIVEREF(__pyx_t_3);\n- PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_4);\n- __pyx_t_3 = 0;\n- __pyx_t_4 = 0;\n- __pyx_t_4 = PyUnicode_Format(__pyx_kp_u_s_s, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n- __pyx_r = __pyx_t_4;\n- __pyx_t_4 = 0;\n- __Pyx_XGIVEREF(__pyx_t_1);\n- __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;\n- __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;\n- __Pyx_XGIVEREF(__pyx_r);\n- __Pyx_RefNannyFinishContext();\n- \/* return from generator, yielding value *\/\n- __pyx_generator->resume_label = 1;\n- return __pyx_r;\n- __pyx_L6_resume_from_yield:;\n- __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;\n- __pyx_cur_scope->__pyx_t_0 = 0;\n- __Pyx_XGOTREF(__pyx_t_1);\n- __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;\n- if (unlikely(!__pyx_sent_value)) __PYX_ERR(0, 594, __pyx_L1_error)\n- }\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (1); else __pyx_cur_scope = __pyx_cur_scope;\n-\n- \/* function exit code *\/\n- PyErr_SetNone(PyExc_StopIteration);\n- goto __pyx_L0;\n- __pyx_L1_error:;\n- __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_3);\n- __Pyx_XDECREF(__pyx_t_4);\n- __Pyx_XDECREF(__pyx_t_5);\n- __Pyx_AddTraceback(\"genexpr\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- __pyx_L0:;\n- __Pyx_XDECREF(__pyx_r); __pyx_r = 0;\n- __pyx_generator->resume_label = -1;\n- __Pyx_Coroutine_clear((PyObject*)__pyx_generator);\n- __Pyx_RefNannyFinishContext();\n- return __pyx_r;\n-}\n-\n-\/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n- *\/\n \n static PyObject *__pyx_pf_8fastsnmp_11snmp_parser_36parse_varbind(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_var_bind_list, PyObject *__pyx_v_orig_main_oids, PyObject *__pyx_v_oids_to_poll) {\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *__pyx_cur_scope;\n- PyObject *__pyx_v_result = NULL;\n- PyObject *__pyx_v_next_oids = NULL;\n+ PyObject *__pyx_v_oid = 0;\n+ PyObject *__pyx_v_main_oid = 0;\n+ PyObject *__pyx_v_index_part = 0;\n+ PyObject *__pyx_v_result = 0;\n+ PyObject *__pyx_v_item = 0;\n+ PyObject *__pyx_v_next_oids = 0;\n+ PyObject *__pyx_v_orig_main_oids_doted = 0;\n+ PyObject *__pyx_v_orig_main_oids_len = 0;\n+ PyObject *__pyx_v_value = 0;\n+ PyObject *__pyx_v_rest_oids_positions = NULL;\n Py_ssize_t __pyx_v_main_oids_len;\n PyObject *__pyx_v_main_oids_positions = NULL;\n Py_ssize_t __pyx_v_var_bind_list_len;\n+ PyObject *__pyx_v_i = NULL;\n PyObject *__pyx_v_skip_column = NULL;\n+ PyObject *__pyx_v_last_seen_index = NULL;\n Py_ssize_t __pyx_v_var_bind_pos;\n- PyObject *__pyx_v_item = NULL;\n- PyObject *__pyx_v_oid = NULL;\n- PyObject *__pyx_v_value = NULL;\n PyObject *__pyx_v_e = NULL;\n PyObject *__pyx_v_main_oids_pos = NULL;\n- PyObject *__pyx_v_main_oid = NULL;\n- PyObject *__pyx_v_index_part = NULL;\n PyObject *__pyx_v_pos = NULL;\n PyObject *__pyx_r = NULL;\n+ __Pyx_TraceDeclarations\n __Pyx_RefNannyDeclarations\n PyObject *__pyx_t_1 = NULL;\n Py_ssize_t __pyx_t_2;\n Py_ssize_t __pyx_t_3;\n- PyObject *__pyx_t_4 = NULL;\n- int __pyx_t_5;\n+ int __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n PyObject *__pyx_t_6 = NULL;\n PyObject *__pyx_t_7 = NULL;\n int __pyx_t_8;\n PyObject *__pyx_t_9 = NULL;\n PyObject *__pyx_t_10 = NULL;\n PyObject *__pyx_t_11 = NULL;\n- PyObject *__pyx_t_12 = NULL;\n- PyObject *(*__pyx_t_13)(PyObject *);\n- int __pyx_t_14;\n+ int __pyx_t_12;\n+ PyObject *__pyx_t_13 = NULL;\n+ PyObject *__pyx_t_14 = NULL;\n PyObject *__pyx_t_15 = NULL;\n PyObject *__pyx_t_16 = NULL;\n- PyObject *__pyx_t_17 = NULL;\n- int __pyx_t_18;\n- char const *__pyx_t_19;\n+ int __pyx_t_17;\n+ char const *__pyx_t_18;\n+ PyObject *__pyx_t_19 = NULL;\n PyObject *__pyx_t_20 = NULL;\n PyObject *__pyx_t_21 = NULL;\n PyObject *__pyx_t_22 = NULL;\n PyObject *__pyx_t_23 = NULL;\n PyObject *__pyx_t_24 = NULL;\n- PyObject *__pyx_t_25 = NULL;\n+ int __pyx_t_25;\n Py_ssize_t __pyx_t_26;\n- int __pyx_t_27;\n+ __Pyx_TraceFrameInit(__pyx_codeobj__33)\n __Pyx_RefNannySetupContext(\"parse_varbind\", 0);\n- __pyx_cur_scope = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(__pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind, __pyx_empty_tuple, NULL);\n- if (unlikely(!__pyx_cur_scope)) {\n- __pyx_cur_scope = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)Py_None);\n- __Pyx_INCREF(Py_None);\n- __PYX_ERR(0, 546, __pyx_L1_error)\n- } else {\n- __Pyx_GOTREF(__pyx_cur_scope);\n- }\n- __pyx_cur_scope->__pyx_v_orig_main_oids = __pyx_v_orig_main_oids;\n- __Pyx_INCREF(__pyx_cur_scope->__pyx_v_orig_main_oids);\n- __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_orig_main_oids);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":547\n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll):\n- * result = [] # <<<<<<<<<<<<<<\n- * next_oids = None\n- * rest_oids_positions = [x for x in range(len(oids_to_poll)) if oids_to_poll[x]]\n- *\/\n- __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 547, __pyx_L1_error)\n+ __Pyx_TraceCall(\"parse_varbind\", __pyx_f[0], 713, 0, __PYX_ERR(0, 713, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":715\n+ * def parse_varbind(list var_bind_list not None, tuple orig_main_oids not None, tuple oids_to_poll not None):\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item # <<<<<<<<<<<<<<\n+ * cdef list next_oids = list()\n+ * cdef list orig_main_oids_doted = list()\n+ *\/\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 715, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_result = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":548\n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll):\n- * result = []\n- * next_oids = None # <<<<<<<<<<<<<<\n+ \/* \"fastsnmp\/snmp_parser.pyx\":716\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item\n+ * cdef list next_oids = list() # <<<<<<<<<<<<<<\n+ * cdef list orig_main_oids_doted = list()\n+ * cdef list orig_main_oids_len = list()\n+ *\/\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 716, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_v_next_oids = ((PyObject*)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":717\n+ * cdef list result = [], item\n+ * cdef list next_oids = list()\n+ * cdef list orig_main_oids_doted = list() # <<<<<<<<<<<<<<\n+ * cdef list orig_main_oids_len = list()\n+ * cdef object value\n+ *\/\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 717, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_v_orig_main_oids_doted = ((PyObject*)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":718\n+ * cdef list next_oids = list()\n+ * cdef list orig_main_oids_doted = list()\n+ * cdef list orig_main_oids_len = list() # <<<<<<<<<<<<<<\n+ * cdef object value\n * rest_oids_positions = [x for x in range(len(oids_to_poll)) if oids_to_poll[x]]\n- * main_oids_len = len(rest_oids_positions)\n- *\/\n- __Pyx_INCREF(Py_None);\n- __pyx_v_next_oids = Py_None;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":549\n- * result = []\n- * next_oids = None\n+ *\/\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 718, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_v_orig_main_oids_len = ((PyObject*)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":720\n+ * cdef list orig_main_oids_len = list()\n+ * cdef object value\n * rest_oids_positions = [x for x in range(len(oids_to_poll)) if oids_to_poll[x]] # <<<<<<<<<<<<<<\n * main_oids_len = len(rest_oids_positions)\n * main_oids_positions = cycle(rest_oids_positions)\n *\/\n { \/* enter inner scope *\/\n Py_ssize_t __pyx_7genexpr__pyx_v_x;\n- __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 549, __pyx_L1_error)\n+ __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 720, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_Length(__pyx_v_oids_to_poll); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 549, __pyx_L1_error)\n+ __pyx_t_2 = PyTuple_GET_SIZE(__pyx_v_oids_to_poll); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 720, __pyx_L1_error)\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_7genexpr__pyx_v_x = __pyx_t_3;\n- __pyx_t_4 = __Pyx_GetItemInt(__pyx_v_oids_to_poll, __pyx_7genexpr__pyx_v_x, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 1, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 549, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 549, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- if (__pyx_t_5) {\n- __pyx_t_4 = PyInt_FromSsize_t(__pyx_7genexpr__pyx_v_x); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 549, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_4))) __PYX_ERR(0, 549, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(PyTuple_GET_ITEM(__pyx_v_oids_to_poll, __pyx_7genexpr__pyx_v_x)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 720, __pyx_L1_error)\n+ if (__pyx_t_4) {\n+ __pyx_t_5 = PyInt_FromSsize_t(__pyx_7genexpr__pyx_v_x); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 720, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ if (unlikely(__Pyx_ListComp_Append(__pyx_t_1, (PyObject*)__pyx_t_5))) __PYX_ERR(0, 720, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n }\n }\n } \/* exit inner scope *\/\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_cur_scope->__pyx_v_rest_oids_positions = ((PyObject*)__pyx_t_1);\n+ __pyx_v_rest_oids_positions = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":550\n- * next_oids = None\n+ \/* \"fastsnmp\/snmp_parser.pyx\":721\n+ * cdef object value\n * rest_oids_positions = [x for x in range(len(oids_to_poll)) if oids_to_poll[x]]\n * main_oids_len = len(rest_oids_positions) # <<<<<<<<<<<<<<\n * main_oids_positions = cycle(rest_oids_positions)\n * var_bind_list_len = len(var_bind_list)\n *\/\n- __pyx_t_1 = __pyx_cur_scope->__pyx_v_rest_oids_positions;\n- __Pyx_INCREF(__pyx_t_1);\n- if (unlikely(__pyx_t_1 == Py_None)) {\n- PyErr_SetString(PyExc_TypeError, \"object of type 'NoneType' has no len()\");\n- __PYX_ERR(0, 550, __pyx_L1_error)\n- }\n- __pyx_t_2 = PyList_GET_SIZE(__pyx_t_1); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 550, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_2 = PyList_GET_SIZE(__pyx_v_rest_oids_positions); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 721, __pyx_L1_error)\n __pyx_v_main_oids_len = __pyx_t_2;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":551\n+ \/* \"fastsnmp\/snmp_parser.pyx\":722\n * rest_oids_positions = [x for x in range(len(oids_to_poll)) if oids_to_poll[x]]\n * main_oids_len = len(rest_oids_positions)\n * main_oids_positions = cycle(rest_oids_positions) # <<<<<<<<<<<<<<\n * var_bind_list_len = len(var_bind_list)\n * \n *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_cycle); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 551, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_cycle); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 722, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n __pyx_t_6 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n- __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4);\n+ if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) {\n+ __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5);\n if (likely(__pyx_t_6)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);\n+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);\n __Pyx_INCREF(__pyx_t_6);\n __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_4, function);\n+ __Pyx_DECREF_SET(__pyx_t_5, function);\n }\n }\n if (!__pyx_t_6) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_cur_scope->__pyx_v_rest_oids_positions); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 551, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_v_rest_oids_positions); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 722, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n } else {\n #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_cur_scope->__pyx_v_rest_oids_positions};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 551, __pyx_L1_error)\n+ if (PyFunction_Check(__pyx_t_5)) {\n+ PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_v_rest_oids_positions};\n+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 722, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n } else\n #endif\n #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_cur_scope->__pyx_v_rest_oids_positions};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 551, __pyx_L1_error)\n+ if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {\n+ PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_v_rest_oids_positions};\n+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 722, __pyx_L1_error)\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_GOTREF(__pyx_t_1);\n } else\n #endif\n {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 551, __pyx_L1_error)\n+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 722, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6); __pyx_t_6 = NULL;\n- __Pyx_INCREF(__pyx_cur_scope->__pyx_v_rest_oids_positions);\n- __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_rest_oids_positions);\n- PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_cur_scope->__pyx_v_rest_oids_positions);\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 551, __pyx_L1_error)\n+ __Pyx_INCREF(__pyx_v_rest_oids_positions);\n+ __Pyx_GIVEREF(__pyx_v_rest_oids_positions);\n+ PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_v_rest_oids_positions);\n+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_7, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 722, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n }\n }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n __pyx_v_main_oids_positions = __pyx_t_1;\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":552\n+ \/* \"fastsnmp\/snmp_parser.pyx\":723\n * main_oids_len = len(rest_oids_positions)\n * main_oids_positions = cycle(rest_oids_positions)\n * var_bind_list_len = len(var_bind_list) # <<<<<<<<<<<<<<\n * \n+ * for i in orig_main_oids:\n+ *\/\n+ __pyx_t_2 = PyList_GET_SIZE(__pyx_v_var_bind_list); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 723, __pyx_L1_error)\n+ __pyx_v_var_bind_list_len = __pyx_t_2;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":725\n+ * var_bind_list_len = len(var_bind_list)\n+ * \n+ * for i in orig_main_oids: # <<<<<<<<<<<<<<\n+ * orig_main_oids_doted.append(i + \".\")\n+ * orig_main_oids_len.append(len(i))\n+ *\/\n+ __pyx_t_1 = __pyx_v_orig_main_oids; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;\n+ for (;;) {\n+ if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;\n+ #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n+ __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_5); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 725, __pyx_L1_error)\n+ #else\n+ __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 725, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ #endif\n+ __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":726\n+ * \n+ * for i in orig_main_oids:\n+ * orig_main_oids_doted.append(i + \".\") # <<<<<<<<<<<<<<\n+ * orig_main_oids_len.append(len(i))\n+ * \n+ *\/\n+ __pyx_t_5 = PyNumber_Add(__pyx_v_i, __pyx_kp_u__4); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 726, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_orig_main_oids_doted, __pyx_t_5); if (unlikely(__pyx_t_8 == -1)) __PYX_ERR(0, 726, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":727\n+ * for i in orig_main_oids:\n+ * orig_main_oids_doted.append(i + \".\")\n+ * orig_main_oids_len.append(len(i)) # <<<<<<<<<<<<<<\n+ * \n * skip_column = {}\n *\/\n- __pyx_t_2 = PyObject_Length(__pyx_v_var_bind_list); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 552, __pyx_L1_error)\n- __pyx_v_var_bind_list_len = __pyx_t_2;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":554\n+ __pyx_t_3 = PyObject_Length(__pyx_v_i); if (unlikely(__pyx_t_3 == -1)) __PYX_ERR(0, 727, __pyx_L1_error)\n+ __pyx_t_5 = PyInt_FromSsize_t(__pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 727, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_orig_main_oids_len, __pyx_t_5); if (unlikely(__pyx_t_8 == -1)) __PYX_ERR(0, 727, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":725\n * var_bind_list_len = len(var_bind_list)\n+ * \n+ * for i in orig_main_oids: # <<<<<<<<<<<<<<\n+ * orig_main_oids_doted.append(i + \".\")\n+ * orig_main_oids_len.append(len(i))\n+ *\/\n+ }\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":729\n+ * orig_main_oids_len.append(len(i))\n * \n * skip_column = {} # <<<<<<<<<<<<<<\n * # if some oid in requested oids is not supported, column with it is index will\n * # be filled with another oid. need to skip\n *\/\n- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 554, __pyx_L1_error)\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 729, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __pyx_v_skip_column = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":557\n+ \/* \"fastsnmp\/snmp_parser.pyx\":732\n * # if some oid in requested oids is not supported, column with it is index will\n * # be filled with another oid. need to skip\n * last_seen_index = {} # <<<<<<<<<<<<<<\n * \n * for var_bind_pos in range(var_bind_list_len):\n *\/\n- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 557, __pyx_L1_error)\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 732, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_1);\n- __pyx_cur_scope->__pyx_v_last_seen_index = ((PyObject*)__pyx_t_1);\n+ __pyx_v_last_seen_index = ((PyObject*)__pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":559\n+ \/* \"fastsnmp\/snmp_parser.pyx\":734\n * last_seen_index = {}\n * \n * for var_bind_pos in range(var_bind_list_len): # <<<<<<<<<<<<<<\n * item = var_bind_list[var_bind_pos]\n- * if item is None:\n+ * # if item is None:\n *\/\n __pyx_t_2 = __pyx_v_var_bind_list_len;\n for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n __pyx_v_var_bind_pos = __pyx_t_3;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":560\n+ \/* \"fastsnmp\/snmp_parser.pyx\":735\n * \n * for var_bind_pos in range(var_bind_list_len):\n * item = var_bind_list[var_bind_pos] # <<<<<<<<<<<<<<\n- * if item is None:\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n- *\/\n- __pyx_t_1 = __Pyx_GetItemInt(__pyx_v_var_bind_list, __pyx_v_var_bind_pos, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 560, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_XDECREF_SET(__pyx_v_item, __pyx_t_1);\n+ * # if item is None:\n+ * # raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n+ *\/\n+ if (!(likely(PyList_CheckExact(PyList_GET_ITEM(__pyx_v_var_bind_list, __pyx_v_var_bind_pos)))||((PyList_GET_ITEM(__pyx_v_var_bind_list, __pyx_v_var_bind_pos)) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"list\", Py_TYPE(PyList_GET_ITEM(__pyx_v_var_bind_list, __pyx_v_var_bind_pos))->tp_name), 0))) __PYX_ERR(0, 735, __pyx_L1_error)\n+ __pyx_t_1 = PyList_GET_ITEM(__pyx_v_var_bind_list, __pyx_v_var_bind_pos);\n+ __Pyx_INCREF(__pyx_t_1);\n+ __Pyx_XDECREF_SET(__pyx_v_item, ((PyObject*)__pyx_t_1));\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":561\n- * for var_bind_pos in range(var_bind_list_len):\n- * item = var_bind_list[var_bind_pos]\n- * if item is None: # <<<<<<<<<<<<<<\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n- * try:\n- *\/\n- __pyx_t_5 = (__pyx_v_item == Py_None);\n- __pyx_t_8 = (__pyx_t_5 != 0);\n- if (__pyx_t_8) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":562\n- * item = var_bind_list[var_bind_pos]\n- * if item is None:\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos)) # <<<<<<<<<<<<<<\n- * try:\n- * oid, value = item\n- *\/\n- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_VarBindUnpackException); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = PyInt_FromSsize_t(__pyx_v_var_bind_pos); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_INCREF(__pyx_v_var_bind_list);\n- __Pyx_GIVEREF(__pyx_v_var_bind_list);\n- PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_var_bind_list);\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);\n- __pyx_t_7 = 0;\n- __pyx_t_7 = PyUnicode_Format(__pyx_kp_u_bad_value_in_s_at_s, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __pyx_t_6 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) {\n- __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4);\n- if (likely(__pyx_t_6)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4);\n- __Pyx_INCREF(__pyx_t_6);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_4, function);\n- }\n- }\n- if (!__pyx_t_6) {\n- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_7); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_7};\n- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_7};\n- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- } else\n- #endif\n- {\n- __pyx_t_9 = PyTuple_New(1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_6); __pyx_t_6 = NULL;\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_9, 0+1, __pyx_t_7);\n- __pyx_t_7 = 0;\n- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 562, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_Raise(__pyx_t_1, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __PYX_ERR(0, 562, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":561\n- * for var_bind_pos in range(var_bind_list_len):\n- * item = var_bind_list[var_bind_pos]\n- * if item is None: # <<<<<<<<<<<<<<\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n- * try:\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":563\n- * if item is None:\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n+ \/* \"fastsnmp\/snmp_parser.pyx\":738\n+ * # if item is None:\n+ * # raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n * try: # <<<<<<<<<<<<<<\n * oid, value = item\n * except (ValueError, TypeError) as e:\n@@ -10107,20 +10920,20 @@\n {\n __Pyx_PyThreadState_declare\n __Pyx_PyThreadState_assign\n- __Pyx_ExceptionSave(&__pyx_t_10, &__pyx_t_11, &__pyx_t_12);\n+ __Pyx_ExceptionSave(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n+ __Pyx_XGOTREF(__pyx_t_9);\n __Pyx_XGOTREF(__pyx_t_10);\n __Pyx_XGOTREF(__pyx_t_11);\n- __Pyx_XGOTREF(__pyx_t_12);\n \/*try:*\/ {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":564\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n+ \/* \"fastsnmp\/snmp_parser.pyx\":739\n+ * # raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n * try:\n * oid, value = item # <<<<<<<<<<<<<<\n * except (ValueError, TypeError) as e:\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item))\n *\/\n- if ((likely(PyTuple_CheckExact(__pyx_v_item))) || (PyList_CheckExact(__pyx_v_item))) {\n+ if (likely(__pyx_v_item != Py_None)) {\n PyObject* sequence = __pyx_v_item;\n #if !CYTHON_COMPILING_IN_PYPY\n Py_ssize_t size = Py_SIZE(sequence);\n@@ -10130,159 +10943,137 @@\n if (unlikely(size != 2)) {\n if (size > 2) __Pyx_RaiseTooManyValuesError(2);\n else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);\n- __PYX_ERR(0, 564, __pyx_L9_error)\n+ __PYX_ERR(0, 739, __pyx_L10_error)\n }\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (likely(PyTuple_CheckExact(sequence))) {\n- __pyx_t_1 = PyTuple_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyTuple_GET_ITEM(sequence, 1); \n- } else {\n- __pyx_t_1 = PyList_GET_ITEM(sequence, 0); \n- __pyx_t_4 = PyList_GET_ITEM(sequence, 1); \n- }\n+ __pyx_t_1 = PyList_GET_ITEM(sequence, 0); \n+ __pyx_t_5 = PyList_GET_ITEM(sequence, 1); \n __Pyx_INCREF(__pyx_t_1);\n- __Pyx_INCREF(__pyx_t_4);\n+ __Pyx_INCREF(__pyx_t_5);\n #else\n- __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 564, __pyx_L9_error)\n+ __pyx_t_1 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 739, __pyx_L10_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 564, __pyx_L9_error)\n- __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 739, __pyx_L10_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n #endif\n } else {\n- Py_ssize_t index = -1;\n- __pyx_t_9 = PyObject_GetIter(__pyx_v_item); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 564, __pyx_L9_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_13 = Py_TYPE(__pyx_t_9)->tp_iternext;\n- index = 0; __pyx_t_1 = __pyx_t_13(__pyx_t_9); if (unlikely(!__pyx_t_1)) goto __pyx_L17_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_1);\n- index = 1; __pyx_t_4 = __pyx_t_13(__pyx_t_9); if (unlikely(!__pyx_t_4)) goto __pyx_L17_unpacking_failed;\n- __Pyx_GOTREF(__pyx_t_4);\n- if (__Pyx_IternextUnpackEndCheck(__pyx_t_13(__pyx_t_9), 2) < 0) __PYX_ERR(0, 564, __pyx_L9_error)\n- __pyx_t_13 = NULL;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- goto __pyx_L18_unpacking_done;\n- __pyx_L17_unpacking_failed:;\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __pyx_t_13 = NULL;\n- if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);\n- __PYX_ERR(0, 564, __pyx_L9_error)\n- __pyx_L18_unpacking_done:;\n+ __Pyx_RaiseNoneNotIterableError(); __PYX_ERR(0, 739, __pyx_L10_error)\n }\n- __Pyx_XDECREF_SET(__pyx_v_oid, __pyx_t_1);\n+ if (!(likely(PyUnicode_CheckExact(__pyx_t_1))||((__pyx_t_1) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"unicode\", Py_TYPE(__pyx_t_1)->tp_name), 0))) __PYX_ERR(0, 739, __pyx_L10_error)\n+ __Pyx_XDECREF_SET(__pyx_v_oid, ((PyObject*)__pyx_t_1));\n __pyx_t_1 = 0;\n- __Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_4);\n- __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":563\n- * if item is None:\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n+ __Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":738\n+ * # if item is None:\n+ * # raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n * try: # <<<<<<<<<<<<<<\n * oid, value = item\n * except (ValueError, TypeError) as e:\n *\/\n }\n+ __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;\n __Pyx_XDECREF(__pyx_t_11); __pyx_t_11 = 0;\n- __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;\n- goto __pyx_L16_try_end;\n- __pyx_L9_error:;\n+ goto __pyx_L17_try_end;\n+ __pyx_L10_error:;\n __Pyx_PyThreadState_assign\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0;\n __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":565\n+ __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":740\n * try:\n * oid, value = item\n * except (ValueError, TypeError) as e: # <<<<<<<<<<<<<<\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item))\n * if not isinstance(oid, str):\n *\/\n- __pyx_t_14 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_ValueError) || __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError);\n- if (__pyx_t_14) {\n+ __pyx_t_12 = __Pyx_PyErr_ExceptionMatches(__pyx_builtin_ValueError) || __Pyx_PyErr_ExceptionMatches(__pyx_builtin_TypeError);\n+ if (__pyx_t_12) {\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.parse_varbind\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n- if (__Pyx_GetException(&__pyx_t_4, &__pyx_t_1, &__pyx_t_9) < 0) __PYX_ERR(0, 565, __pyx_L11_except_error)\n- __Pyx_GOTREF(__pyx_t_4);\n+ if (__Pyx_GetException(&__pyx_t_5, &__pyx_t_1, &__pyx_t_7) < 0) __PYX_ERR(0, 740, __pyx_L12_except_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n __Pyx_GOTREF(__pyx_t_1);\n- __Pyx_GOTREF(__pyx_t_9);\n+ __Pyx_GOTREF(__pyx_t_7);\n __Pyx_INCREF(__pyx_t_1);\n __pyx_v_e = __pyx_t_1;\n \/*try:*\/ {\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":566\n+ \/* \"fastsnmp\/snmp_parser.pyx\":741\n * oid, value = item\n * except (ValueError, TypeError) as e:\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item)) # <<<<<<<<<<<<<<\n * if not isinstance(oid, str):\n * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n *\/\n- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_VarBindUnpackException); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_15 = PyTuple_New(2); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_GOTREF(__pyx_t_15);\n+ __pyx_t_13 = __Pyx_GetModuleGlobalName(__pyx_n_s_VarBindUnpackException); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_GOTREF(__pyx_t_13);\n+ __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_GOTREF(__pyx_t_14);\n __Pyx_INCREF(__pyx_v_e);\n __Pyx_GIVEREF(__pyx_v_e);\n- PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_v_e);\n+ PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_v_e);\n __Pyx_INCREF(__pyx_v_item);\n __Pyx_GIVEREF(__pyx_v_item);\n- PyTuple_SET_ITEM(__pyx_t_15, 1, __pyx_v_item);\n- __pyx_t_16 = PyUnicode_Format(__pyx_kp_u_Exception_s_item_s, __pyx_t_15); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_GOTREF(__pyx_t_16);\n- __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;\n- __pyx_t_15 = NULL;\n- if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) {\n- __pyx_t_15 = PyMethod_GET_SELF(__pyx_t_6);\n- if (likely(__pyx_t_15)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6);\n- __Pyx_INCREF(__pyx_t_15);\n+ PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_v_item);\n+ __pyx_t_15 = PyUnicode_Format(__pyx_kp_u_Exception_s_item_s, __pyx_t_14); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_GOTREF(__pyx_t_15);\n+ __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;\n+ __pyx_t_14 = NULL;\n+ if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_13))) {\n+ __pyx_t_14 = PyMethod_GET_SELF(__pyx_t_13);\n+ if (likely(__pyx_t_14)) {\n+ PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_13);\n+ __Pyx_INCREF(__pyx_t_14);\n __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_6, function);\n+ __Pyx_DECREF_SET(__pyx_t_13, function);\n }\n }\n- if (!__pyx_t_15) {\n- __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_16); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;\n- __Pyx_GOTREF(__pyx_t_7);\n+ if (!__pyx_t_14) {\n+ __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_13, __pyx_t_15); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;\n+ __Pyx_GOTREF(__pyx_t_6);\n } else {\n #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_6)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_15, __pyx_t_16};\n- __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0;\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;\n+ if (PyFunction_Check(__pyx_t_13)) {\n+ PyObject *__pyx_temp[2] = {__pyx_t_14, __pyx_t_15};\n+ __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_13, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0;\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;\n } else\n #endif\n #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_15, __pyx_t_16};\n- __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0;\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;\n+ if (__Pyx_PyFastCFunction_Check(__pyx_t_13)) {\n+ PyObject *__pyx_temp[2] = {__pyx_t_14, __pyx_t_15};\n+ __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_13, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0;\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;\n } else\n #endif\n {\n- __pyx_t_17 = PyTuple_New(1+1); if (unlikely(!__pyx_t_17)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_GOTREF(__pyx_t_17);\n- __Pyx_GIVEREF(__pyx_t_15); PyTuple_SET_ITEM(__pyx_t_17, 0, __pyx_t_15); __pyx_t_15 = NULL;\n- __Pyx_GIVEREF(__pyx_t_16);\n- PyTuple_SET_ITEM(__pyx_t_17, 0+1, __pyx_t_16);\n- __pyx_t_16 = 0;\n- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_17, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 566, __pyx_L24_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_17); __pyx_t_17 = 0;\n+ __pyx_t_16 = PyTuple_New(1+1); if (unlikely(!__pyx_t_16)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_GOTREF(__pyx_t_16);\n+ __Pyx_GIVEREF(__pyx_t_14); PyTuple_SET_ITEM(__pyx_t_16, 0, __pyx_t_14); __pyx_t_14 = NULL;\n+ __Pyx_GIVEREF(__pyx_t_15);\n+ PyTuple_SET_ITEM(__pyx_t_16, 0+1, __pyx_t_15);\n+ __pyx_t_15 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_13, __pyx_t_16, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 741, __pyx_L23_error)\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;\n }\n }\n+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;\n+ __Pyx_Raise(__pyx_t_6, 0, 0, 0);\n __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_Raise(__pyx_t_7, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __PYX_ERR(0, 566, __pyx_L24_error)\n+ __PYX_ERR(0, 741, __pyx_L23_error)\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":565\n+ \/* \"fastsnmp\/snmp_parser.pyx\":740\n * try:\n * oid, value = item\n * except (ValueError, TypeError) as e: # <<<<<<<<<<<<<<\n@@ -10292,178 +11083,178 @@\n \/*finally:*\/ {\n \/*exception exit:*\/{\n __Pyx_PyThreadState_declare\n- __pyx_L24_error:;\n- __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; __pyx_t_23 = 0; __pyx_t_24 = 0; __pyx_t_25 = 0;\n+ __pyx_L23_error:;\n+ __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; __pyx_t_23 = 0; __pyx_t_24 = 0;\n __Pyx_PyThreadState_assign\n+ __Pyx_XDECREF(__pyx_t_14); __pyx_t_14 = 0;\n __Pyx_XDECREF(__pyx_t_15); __pyx_t_15 = 0;\n __Pyx_XDECREF(__pyx_t_16); __pyx_t_16 = 0;\n- __Pyx_XDECREF(__pyx_t_17); __pyx_t_17 = 0;\n+ __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;\n __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n- if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_23, &__pyx_t_24, &__pyx_t_25);\n- if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22) < 0)) __Pyx_ErrFetch(&__pyx_t_20, &__pyx_t_21, &__pyx_t_22);\n+ if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_22, &__pyx_t_23, &__pyx_t_24);\n+ if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_19, &__pyx_t_20, &__pyx_t_21) < 0)) __Pyx_ErrFetch(&__pyx_t_19, &__pyx_t_20, &__pyx_t_21);\n+ __Pyx_XGOTREF(__pyx_t_19);\n __Pyx_XGOTREF(__pyx_t_20);\n __Pyx_XGOTREF(__pyx_t_21);\n __Pyx_XGOTREF(__pyx_t_22);\n __Pyx_XGOTREF(__pyx_t_23);\n __Pyx_XGOTREF(__pyx_t_24);\n- __Pyx_XGOTREF(__pyx_t_25);\n- __pyx_t_14 = __pyx_lineno; __pyx_t_18 = __pyx_clineno; __pyx_t_19 = __pyx_filename;\n+ __pyx_t_12 = __pyx_lineno; __pyx_t_17 = __pyx_clineno; __pyx_t_18 = __pyx_filename;\n {\n __Pyx_DECREF(__pyx_v_e);\n __pyx_v_e = NULL;\n }\n __Pyx_PyThreadState_assign\n if (PY_MAJOR_VERSION >= 3) {\n+ __Pyx_XGIVEREF(__pyx_t_22);\n __Pyx_XGIVEREF(__pyx_t_23);\n __Pyx_XGIVEREF(__pyx_t_24);\n- __Pyx_XGIVEREF(__pyx_t_25);\n- __Pyx_ExceptionReset(__pyx_t_23, __pyx_t_24, __pyx_t_25);\n+ __Pyx_ExceptionReset(__pyx_t_22, __pyx_t_23, __pyx_t_24);\n }\n+ __Pyx_XGIVEREF(__pyx_t_19);\n __Pyx_XGIVEREF(__pyx_t_20);\n __Pyx_XGIVEREF(__pyx_t_21);\n- __Pyx_XGIVEREF(__pyx_t_22);\n- __Pyx_ErrRestore(__pyx_t_20, __pyx_t_21, __pyx_t_22);\n- __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; __pyx_t_23 = 0; __pyx_t_24 = 0; __pyx_t_25 = 0;\n- __pyx_lineno = __pyx_t_14; __pyx_clineno = __pyx_t_18; __pyx_filename = __pyx_t_19;\n- goto __pyx_L11_except_error;\n+ __Pyx_ErrRestore(__pyx_t_19, __pyx_t_20, __pyx_t_21);\n+ __pyx_t_19 = 0; __pyx_t_20 = 0; __pyx_t_21 = 0; __pyx_t_22 = 0; __pyx_t_23 = 0; __pyx_t_24 = 0;\n+ __pyx_lineno = __pyx_t_12; __pyx_clineno = __pyx_t_17; __pyx_filename = __pyx_t_18;\n+ goto __pyx_L12_except_error;\n }\n }\n }\n- goto __pyx_L11_except_error;\n- __pyx_L11_except_error:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":563\n- * if item is None:\n- * raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n+ goto __pyx_L12_except_error;\n+ __pyx_L12_except_error:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":738\n+ * # if item is None:\n+ * # raise VarBindUnpackException(\"bad value in %s at %s\" % (var_bind_list, var_bind_pos))\n * try: # <<<<<<<<<<<<<<\n * oid, value = item\n * except (ValueError, TypeError) as e:\n *\/\n __Pyx_PyThreadState_assign\n+ __Pyx_XGIVEREF(__pyx_t_9);\n __Pyx_XGIVEREF(__pyx_t_10);\n __Pyx_XGIVEREF(__pyx_t_11);\n- __Pyx_XGIVEREF(__pyx_t_12);\n- __Pyx_ExceptionReset(__pyx_t_10, __pyx_t_11, __pyx_t_12);\n+ __Pyx_ExceptionReset(__pyx_t_9, __pyx_t_10, __pyx_t_11);\n goto __pyx_L1_error;\n- __pyx_L16_try_end:;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":567\n+ __pyx_L17_try_end:;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":742\n * except (ValueError, TypeError) as e:\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item))\n * if not isinstance(oid, str): # <<<<<<<<<<<<<<\n * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n- * # oids in received var_bind_list in round-robin order respectively query\n- *\/\n- __pyx_t_8 = PyUnicode_Check(__pyx_v_oid); \n- __pyx_t_5 = ((!(__pyx_t_8 != 0)) != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":568\n+ * main_oids_pos = next(main_oids_positions)\n+ *\/\n+ __pyx_t_4 = PyUnicode_Check(__pyx_v_oid); \n+ __pyx_t_25 = ((!(__pyx_t_4 != 0)) != 0);\n+ if (__pyx_t_25) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":743\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item))\n * if not isinstance(oid, str):\n * raise VarBindContentException(\"expected oid in str. got %r\" % oid) # <<<<<<<<<<<<<<\n- * # oids in received var_bind_list in round-robin order respectively query\n * main_oids_pos = next(main_oids_positions)\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_VarBindContentException); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 568, __pyx_L1_error)\n+ * if value is None:\n+ *\/\n+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_VarBindContentException); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 743, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_4 = PyUnicode_Format(__pyx_kp_u_expected_oid_in_str_got_r, __pyx_v_oid); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_4);\n- __pyx_t_7 = NULL;\n+ __pyx_t_5 = PyUnicode_Format(__pyx_kp_u_expected_oid_in_str_got_r, __pyx_v_oid); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = NULL;\n if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) {\n- __pyx_t_7 = PyMethod_GET_SELF(__pyx_t_1);\n- if (likely(__pyx_t_7)) {\n+ __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_1);\n+ if (likely(__pyx_t_6)) {\n PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);\n- __Pyx_INCREF(__pyx_t_7);\n+ __Pyx_INCREF(__pyx_t_6);\n __Pyx_INCREF(function);\n __Pyx_DECREF_SET(__pyx_t_1, function);\n }\n }\n- if (!__pyx_t_7) {\n- __pyx_t_9 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n+ if (!__pyx_t_6) {\n+ __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_5); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_GOTREF(__pyx_t_7);\n } else {\n #if CYTHON_FAST_PYCALL\n if (PyFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_4};\n- __pyx_t_9 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_5};\n+ __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n } else\n #endif\n #if CYTHON_FAST_PYCCALL\n if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_7, __pyx_t_4};\n- __pyx_t_9 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ PyObject *__pyx_temp[2] = {__pyx_t_6, __pyx_t_5};\n+ __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n } else\n #endif\n {\n- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __Pyx_GIVEREF(__pyx_t_7); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7); __pyx_t_7 = NULL;\n- __Pyx_GIVEREF(__pyx_t_4);\n- PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_4);\n- __pyx_t_4 = 0;\n- __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 568, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_13 = PyTuple_New(1+1); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_13);\n+ __Pyx_GIVEREF(__pyx_t_6); PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_6); __pyx_t_6 = NULL;\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_13, 0+1, __pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_13, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 743, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;\n }\n }\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __Pyx_Raise(__pyx_t_9, 0, 0, 0);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __PYX_ERR(0, 568, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":567\n+ __Pyx_Raise(__pyx_t_7, 0, 0, 0);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __PYX_ERR(0, 743, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":742\n * except (ValueError, TypeError) as e:\n * raise VarBindUnpackException(\"Exception='%s' item=%s\" % (e, item))\n * if not isinstance(oid, str): # <<<<<<<<<<<<<<\n * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n- * # oids in received var_bind_list in round-robin order respectively query\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":570\n+ * main_oids_pos = next(main_oids_positions)\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":744\n+ * if not isinstance(oid, str):\n * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n- * # oids in received var_bind_list in round-robin order respectively query\n * main_oids_pos = next(main_oids_positions) # <<<<<<<<<<<<<<\n * if value is None:\n * skip_column[main_oids_pos] = True\n *\/\n- __pyx_t_9 = __Pyx_PyIter_Next(__pyx_v_main_oids_positions); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 570, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_XDECREF_SET(__pyx_v_main_oids_pos, __pyx_t_9);\n- __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":571\n- * # oids in received var_bind_list in round-robin order respectively query\n+ __pyx_t_7 = __Pyx_PyIter_Next(__pyx_v_main_oids_positions); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 744, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_XDECREF_SET(__pyx_v_main_oids_pos, __pyx_t_7);\n+ __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":745\n+ * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n * main_oids_pos = next(main_oids_positions)\n * if value is None: # <<<<<<<<<<<<<<\n * skip_column[main_oids_pos] = True\n * if main_oids_pos in skip_column:\n *\/\n- __pyx_t_5 = (__pyx_v_value == Py_None);\n- __pyx_t_8 = (__pyx_t_5 != 0);\n- if (__pyx_t_8) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":572\n+ __pyx_t_25 = (__pyx_v_value == Py_None);\n+ __pyx_t_4 = (__pyx_t_25 != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":746\n * main_oids_pos = next(main_oids_positions)\n * if value is None:\n * skip_column[main_oids_pos] = True # <<<<<<<<<<<<<<\n * if main_oids_pos in skip_column:\n * continue\n *\/\n- if (unlikely(PyDict_SetItem(__pyx_v_skip_column, __pyx_v_main_oids_pos, Py_True) < 0)) __PYX_ERR(0, 572, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":571\n- * # oids in received var_bind_list in round-robin order respectively query\n+ if (unlikely(PyDict_SetItem(__pyx_v_skip_column, __pyx_v_main_oids_pos, Py_True) < 0)) __PYX_ERR(0, 746, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":745\n+ * raise VarBindContentException(\"expected oid in str. got %r\" % oid)\n * main_oids_pos = next(main_oids_positions)\n * if value is None: # <<<<<<<<<<<<<<\n * skip_column[main_oids_pos] = True\n@@ -10471,192 +11262,158 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":573\n+ \/* \"fastsnmp\/snmp_parser.pyx\":747\n * if value is None:\n * skip_column[main_oids_pos] = True\n * if main_oids_pos in skip_column: # <<<<<<<<<<<<<<\n * continue\n- * main_oid = orig_main_oids[main_oids_pos]\n- *\/\n- __pyx_t_8 = (__Pyx_PyDict_ContainsTF(__pyx_v_main_oids_pos, __pyx_v_skip_column, Py_EQ)); if (unlikely(__pyx_t_8 < 0)) __PYX_ERR(0, 573, __pyx_L1_error)\n- __pyx_t_5 = (__pyx_t_8 != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":574\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ *\/\n+ __pyx_t_4 = (__Pyx_PyDict_ContainsTF(__pyx_v_main_oids_pos, __pyx_v_skip_column, Py_EQ)); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 747, __pyx_L1_error)\n+ __pyx_t_25 = (__pyx_t_4 != 0);\n+ if (__pyx_t_25) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":748\n * skip_column[main_oids_pos] = True\n * if main_oids_pos in skip_column:\n * continue # <<<<<<<<<<<<<<\n- * main_oid = orig_main_oids[main_oids_pos]\n- * if oid.startswith(main_oid + '.'):\n- *\/\n- goto __pyx_L6_continue;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":573\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ * if oid.startswith(main_oid):\n+ *\/\n+ goto __pyx_L8_continue;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":747\n * if value is None:\n * skip_column[main_oids_pos] = True\n * if main_oids_pos in skip_column: # <<<<<<<<<<<<<<\n * continue\n- * main_oid = orig_main_oids[main_oids_pos]\n- *\/\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":575\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ *\/\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":749\n * if main_oids_pos in skip_column:\n * continue\n- * main_oid = orig_main_oids[main_oids_pos] # <<<<<<<<<<<<<<\n- * if oid.startswith(main_oid + '.'):\n- * index_part = oid[len(main_oid) + 1:]\n- *\/\n- __pyx_t_9 = PyObject_GetItem(__pyx_cur_scope->__pyx_v_orig_main_oids, __pyx_v_main_oids_pos); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 575, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_XDECREF_SET(__pyx_v_main_oid, __pyx_t_9);\n- __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":576\n+ * main_oid = orig_main_oids_doted[main_oids_pos] # <<<<<<<<<<<<<<\n+ * if oid.startswith(main_oid):\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:]\n+ *\/\n+ __pyx_t_7 = PyObject_GetItem(__pyx_v_orig_main_oids_doted, __pyx_v_main_oids_pos); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 749, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ if (!(likely(PyUnicode_CheckExact(__pyx_t_7))||((__pyx_t_7) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected %.16s, got %.200s\", \"unicode\", Py_TYPE(__pyx_t_7)->tp_name), 0))) __PYX_ERR(0, 749, __pyx_L1_error)\n+ __Pyx_XDECREF_SET(__pyx_v_main_oid, ((PyObject*)__pyx_t_7));\n+ __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":750\n * continue\n- * main_oid = orig_main_oids[main_oids_pos]\n- * if oid.startswith(main_oid + '.'): # <<<<<<<<<<<<<<\n- * index_part = oid[len(main_oid) + 1:]\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ * if oid.startswith(main_oid): # <<<<<<<<<<<<<<\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:]\n * last_seen_index[main_oids_pos] = index_part\n *\/\n- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_oid, __pyx_n_s_startswith); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_6 = PyNumber_Add(__pyx_v_main_oid, __pyx_kp_u__4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n- __pyx_t_4 = NULL;\n- if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_1))) {\n- __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_1);\n- if (likely(__pyx_t_4)) {\n- PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1);\n- __Pyx_INCREF(__pyx_t_4);\n- __Pyx_INCREF(function);\n- __Pyx_DECREF_SET(__pyx_t_1, function);\n+ if (unlikely(__pyx_v_oid == Py_None)) {\n+ PyErr_Format(PyExc_AttributeError, \"'NoneType' object has no attribute '%s'\", \"startswith\");\n+ __PYX_ERR(0, 750, __pyx_L1_error)\n+ }\n+ __pyx_t_25 = __Pyx_PyUnicode_Tailmatch(__pyx_v_oid, __pyx_v_main_oid, 0, PY_SSIZE_T_MAX, -1); if (unlikely(__pyx_t_25 == -1)) __PYX_ERR(0, 750, __pyx_L1_error)\n+ if ((__pyx_t_25 != 0)) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":751\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ * if oid.startswith(main_oid):\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:] # <<<<<<<<<<<<<<\n+ * last_seen_index[main_oids_pos] = index_part\n+ * result.append([orig_main_oids[main_oids_pos], index_part, value])\n+ *\/\n+ if (unlikely(__pyx_v_oid == Py_None)) {\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not subscriptable\");\n+ __PYX_ERR(0, 751, __pyx_L1_error)\n }\n- }\n- if (!__pyx_t_4) {\n- __pyx_t_9 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_6); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n- } else {\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_t_6};\n- __pyx_t_9 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- } else\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) {\n- PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_t_6};\n- __pyx_t_9 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- } else\n- #endif\n- {\n- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); __pyx_t_4 = NULL;\n- __Pyx_GIVEREF(__pyx_t_6);\n- PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_6);\n- __pyx_t_6 = 0;\n- __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_7, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n- }\n- }\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 576, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":577\n- * main_oid = orig_main_oids[main_oids_pos]\n- * if oid.startswith(main_oid + '.'):\n- * index_part = oid[len(main_oid) + 1:] # <<<<<<<<<<<<<<\n+ __pyx_t_7 = PyObject_GetItem(__pyx_v_orig_main_oids_len, __pyx_v_main_oids_pos); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 751, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_1 = __Pyx_PyInt_AddObjC(__pyx_t_7, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 751, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __pyx_t_26 = __Pyx_PyIndex_AsSsize_t(__pyx_t_1); if (unlikely((__pyx_t_26 == (Py_ssize_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 751, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = __Pyx_PyUnicode_Substring(__pyx_v_oid, __pyx_t_26, PY_SSIZE_T_MAX); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 751, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_XDECREF_SET(__pyx_v_index_part, ((PyObject*)__pyx_t_1));\n+ __pyx_t_1 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":752\n+ * if oid.startswith(main_oid):\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:]\n+ * last_seen_index[main_oids_pos] = index_part # <<<<<<<<<<<<<<\n+ * result.append([orig_main_oids[main_oids_pos], index_part, value])\n+ * else:\n+ *\/\n+ if (unlikely(PyDict_SetItem(__pyx_v_last_seen_index, __pyx_v_main_oids_pos, __pyx_v_index_part) < 0)) __PYX_ERR(0, 752, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":753\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:]\n * last_seen_index[main_oids_pos] = index_part\n- * result.append([main_oid, index_part, value])\n- *\/\n- __pyx_t_26 = PyObject_Length(__pyx_v_main_oid); if (unlikely(__pyx_t_26 == -1)) __PYX_ERR(0, 577, __pyx_L1_error)\n- __pyx_t_9 = __Pyx_PyObject_GetSlice(__pyx_v_oid, (__pyx_t_26 + 1), 0, NULL, NULL, NULL, 1, 0, 1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 577, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_XDECREF_SET(__pyx_v_index_part, __pyx_t_9);\n- __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":578\n- * if oid.startswith(main_oid + '.'):\n- * index_part = oid[len(main_oid) + 1:]\n- * last_seen_index[main_oids_pos] = index_part # <<<<<<<<<<<<<<\n- * result.append([main_oid, index_part, value])\n- * else:\n- *\/\n- if (unlikely(PyDict_SetItem(__pyx_cur_scope->__pyx_v_last_seen_index, __pyx_v_main_oids_pos, __pyx_v_index_part) < 0)) __PYX_ERR(0, 578, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":579\n- * index_part = oid[len(main_oid) + 1:]\n- * last_seen_index[main_oids_pos] = index_part\n- * result.append([main_oid, index_part, value]) # <<<<<<<<<<<<<<\n+ * result.append([orig_main_oids[main_oids_pos], index_part, value]) # <<<<<<<<<<<<<<\n * else:\n * skip_column[main_oids_pos] = True\n *\/\n- __pyx_t_9 = PyList_New(3); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 579, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_INCREF(__pyx_v_main_oid);\n- __Pyx_GIVEREF(__pyx_v_main_oid);\n- PyList_SET_ITEM(__pyx_t_9, 0, __pyx_v_main_oid);\n+ __pyx_t_1 = PyObject_GetItem(__pyx_v_orig_main_oids, __pyx_v_main_oids_pos); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 753, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_7 = PyList_New(3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 753, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyList_SET_ITEM(__pyx_t_7, 0, __pyx_t_1);\n __Pyx_INCREF(__pyx_v_index_part);\n __Pyx_GIVEREF(__pyx_v_index_part);\n- PyList_SET_ITEM(__pyx_t_9, 1, __pyx_v_index_part);\n+ PyList_SET_ITEM(__pyx_t_7, 1, __pyx_v_index_part);\n __Pyx_INCREF(__pyx_v_value);\n __Pyx_GIVEREF(__pyx_v_value);\n- PyList_SET_ITEM(__pyx_t_9, 2, __pyx_v_value);\n- __pyx_t_27 = __Pyx_PyList_Append(__pyx_v_result, __pyx_t_9); if (unlikely(__pyx_t_27 == -1)) __PYX_ERR(0, 579, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":576\n+ PyList_SET_ITEM(__pyx_t_7, 2, __pyx_v_value);\n+ __pyx_t_1 = 0;\n+ __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_result, __pyx_t_7); if (unlikely(__pyx_t_8 == -1)) __PYX_ERR(0, 753, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":750\n * continue\n- * main_oid = orig_main_oids[main_oids_pos]\n- * if oid.startswith(main_oid + '.'): # <<<<<<<<<<<<<<\n- * index_part = oid[len(main_oid) + 1:]\n+ * main_oid = orig_main_oids_doted[main_oids_pos]\n+ * if oid.startswith(main_oid): # <<<<<<<<<<<<<<\n+ * index_part = oid[orig_main_oids_len[main_oids_pos]+1:]\n * last_seen_index[main_oids_pos] = index_part\n *\/\n- goto __pyx_L33;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":581\n- * result.append([main_oid, index_part, value])\n+ goto __pyx_L32;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":755\n+ * result.append([orig_main_oids[main_oids_pos], index_part, value])\n * else:\n * skip_column[main_oids_pos] = True # <<<<<<<<<<<<<<\n * if len(skip_column) == var_bind_list_len:\n * break\n *\/\n \/*else*\/ {\n- if (unlikely(PyDict_SetItem(__pyx_v_skip_column, __pyx_v_main_oids_pos, Py_True) < 0)) __PYX_ERR(0, 581, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":582\n+ if (unlikely(PyDict_SetItem(__pyx_v_skip_column, __pyx_v_main_oids_pos, Py_True) < 0)) __PYX_ERR(0, 755, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":756\n * else:\n * skip_column[main_oids_pos] = True\n * if len(skip_column) == var_bind_list_len: # <<<<<<<<<<<<<<\n * break\n * if len(skip_column) < main_oids_len:\n *\/\n- __pyx_t_26 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_26 == -1)) __PYX_ERR(0, 582, __pyx_L1_error)\n- __pyx_t_5 = ((__pyx_t_26 == __pyx_v_var_bind_list_len) != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":583\n+ __pyx_t_26 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_26 == -1)) __PYX_ERR(0, 756, __pyx_L1_error)\n+ __pyx_t_25 = ((__pyx_t_26 == __pyx_v_var_bind_list_len) != 0);\n+ if (__pyx_t_25) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":757\n * skip_column[main_oids_pos] = True\n * if len(skip_column) == var_bind_list_len:\n * break # <<<<<<<<<<<<<<\n * if len(skip_column) < main_oids_len:\n * if len(skip_column):\n *\/\n- goto __pyx_L7_break;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":582\n+ goto __pyx_L9_break;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":756\n * else:\n * skip_column[main_oids_pos] = True\n * if len(skip_column) == var_bind_list_len: # <<<<<<<<<<<<<<\n@@ -10665,97 +11422,94 @@\n *\/\n }\n }\n- __pyx_L33:;\n- __pyx_L6_continue:;\n+ __pyx_L32:;\n+ __pyx_L8_continue:;\n }\n- __pyx_L7_break:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":584\n+ __pyx_L9_break:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":758\n * if len(skip_column) == var_bind_list_len:\n * break\n * if len(skip_column) < main_oids_len: # <<<<<<<<<<<<<<\n * if len(skip_column):\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n- *\/\n- __pyx_t_2 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 584, __pyx_L1_error)\n- __pyx_t_5 = ((__pyx_t_2 < __pyx_v_main_oids_len) != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":585\n+ * next_oids = [None,] * len(orig_main_oids)\n+ *\/\n+ __pyx_t_2 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 758, __pyx_L1_error)\n+ __pyx_t_25 = ((__pyx_t_2 < __pyx_v_main_oids_len) != 0);\n+ if (__pyx_t_25) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":759\n * break\n * if len(skip_column) < main_oids_len:\n * if len(skip_column): # <<<<<<<<<<<<<<\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions:\n *\/\n- __pyx_t_2 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 585, __pyx_L1_error)\n- __pyx_t_5 = (__pyx_t_2 != 0);\n- if (__pyx_t_5) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":586\n+ __pyx_t_2 = PyDict_Size(__pyx_v_skip_column); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 759, __pyx_L1_error)\n+ __pyx_t_25 = (__pyx_t_2 != 0);\n+ if (__pyx_t_25) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":760\n * if len(skip_column) < main_oids_len:\n * if len(skip_column):\n- * next_oids = [None for _ in range(len(orig_main_oids))] # <<<<<<<<<<<<<<\n+ * next_oids = [None,] * len(orig_main_oids) # <<<<<<<<<<<<<<\n * for pos in rest_oids_positions:\n * if pos in skip_column:\n *\/\n- { \/* enter inner scope *\/\n- CYTHON_UNUSED Py_ssize_t __pyx_8genexpr1__pyx_v__;\n- __pyx_t_9 = PyList_New(0); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 586, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __pyx_t_1 = __pyx_cur_scope->__pyx_v_orig_main_oids;\n- __Pyx_INCREF(__pyx_t_1);\n- __pyx_t_2 = PyObject_Length(__pyx_t_1); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 586, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n- __pyx_8genexpr1__pyx_v__ = __pyx_t_3;\n- if (unlikely(__Pyx_ListComp_Append(__pyx_t_9, (PyObject*)Py_None))) __PYX_ERR(0, 586, __pyx_L1_error)\n+ __pyx_t_2 = PyTuple_GET_SIZE(__pyx_v_orig_main_oids); if (unlikely(__pyx_t_2 == -1)) __PYX_ERR(0, 760, __pyx_L1_error)\n+ __pyx_t_7 = PyList_New(1 * ((__pyx_t_2<0) ? 0:__pyx_t_2)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 760, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+ { Py_ssize_t __pyx_temp;\n+ for (__pyx_temp=0; __pyx_temp < __pyx_t_2; __pyx_temp++) {\n+ __Pyx_INCREF(Py_None);\n+ __Pyx_GIVEREF(Py_None);\n+ PyList_SET_ITEM(__pyx_t_7, __pyx_temp, Py_None);\n }\n- } \/* exit inner scope *\/\n- __Pyx_DECREF_SET(__pyx_v_next_oids, __pyx_t_9);\n- __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":587\n+ }\n+ __Pyx_DECREF_SET(__pyx_v_next_oids, ((PyObject*)__pyx_t_7));\n+ __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":761\n * if len(skip_column):\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions: # <<<<<<<<<<<<<<\n * if pos in skip_column:\n * continue\n *\/\n- __pyx_t_9 = __pyx_cur_scope->__pyx_v_rest_oids_positions; __Pyx_INCREF(__pyx_t_9); __pyx_t_2 = 0;\n+ __pyx_t_7 = __pyx_v_rest_oids_positions; __Pyx_INCREF(__pyx_t_7); __pyx_t_2 = 0;\n for (;;) {\n- if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_9)) break;\n+ if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_7)) break;\n #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- __pyx_t_1 = PyList_GET_ITEM(__pyx_t_9, __pyx_t_2); __Pyx_INCREF(__pyx_t_1); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 587, __pyx_L1_error)\n+ __pyx_t_1 = PyList_GET_ITEM(__pyx_t_7, __pyx_t_2); __Pyx_INCREF(__pyx_t_1); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 761, __pyx_L1_error)\n #else\n- __pyx_t_1 = PySequence_ITEM(__pyx_t_9, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 587, __pyx_L1_error)\n+ __pyx_t_1 = PySequence_ITEM(__pyx_t_7, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 761, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n #endif\n __Pyx_XDECREF_SET(__pyx_v_pos, __pyx_t_1);\n __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":588\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ \/* \"fastsnmp\/snmp_parser.pyx\":762\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions:\n * if pos in skip_column: # <<<<<<<<<<<<<<\n * continue\n * next_oids[pos] = \"%s.%s\" % (orig_main_oids[pos], last_seen_index[pos])\n *\/\n- __pyx_t_5 = (__Pyx_PyDict_ContainsTF(__pyx_v_pos, __pyx_v_skip_column, Py_EQ)); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 588, __pyx_L1_error)\n- __pyx_t_8 = (__pyx_t_5 != 0);\n- if (__pyx_t_8) {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":589\n+ __pyx_t_25 = (__Pyx_PyDict_ContainsTF(__pyx_v_pos, __pyx_v_skip_column, Py_EQ)); if (unlikely(__pyx_t_25 < 0)) __PYX_ERR(0, 762, __pyx_L1_error)\n+ __pyx_t_4 = (__pyx_t_25 != 0);\n+ if (__pyx_t_4) {\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":763\n * for pos in rest_oids_positions:\n * if pos in skip_column:\n * continue # <<<<<<<<<<<<<<\n * next_oids[pos] = \"%s.%s\" % (orig_main_oids[pos], last_seen_index[pos])\n- * next_oids = tuple(next_oids)\n- *\/\n- goto __pyx_L39_continue;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":588\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * else:\n+ *\/\n+ goto __pyx_L36_continue;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":762\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions:\n * if pos in skip_column: # <<<<<<<<<<<<<<\n * continue\n@@ -10763,399 +11517,186 @@\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":590\n+ \/* \"fastsnmp\/snmp_parser.pyx\":764\n * if pos in skip_column:\n * continue\n * next_oids[pos] = \"%s.%s\" % (orig_main_oids[pos], last_seen_index[pos]) # <<<<<<<<<<<<<<\n- * next_oids = tuple(next_oids)\n * else:\n- *\/\n- __pyx_t_1 = PyObject_GetItem(__pyx_cur_scope->__pyx_v_orig_main_oids, __pyx_v_pos); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 590, __pyx_L1_error)\n+ * next_oids = [\n+ *\/\n+ __pyx_t_1 = PyObject_GetItem(__pyx_v_orig_main_oids, __pyx_v_pos); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 764, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_7 = __Pyx_PyDict_GetItem(__pyx_cur_scope->__pyx_v_last_seen_index, __pyx_v_pos); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 590, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 590, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_13 = __Pyx_PyDict_GetItem(__pyx_v_last_seen_index, __pyx_v_pos); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 764, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_13);\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 764, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n __Pyx_GIVEREF(__pyx_t_1);\n- PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_1);\n- __Pyx_GIVEREF(__pyx_t_7);\n- PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_13);\n+ PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_13);\n __pyx_t_1 = 0;\n- __pyx_t_7 = 0;\n- __pyx_t_7 = PyUnicode_Format(__pyx_kp_u_s_s, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 590, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n- if (unlikely(PyObject_SetItem(__pyx_v_next_oids, __pyx_v_pos, __pyx_t_7) < 0)) __PYX_ERR(0, 590, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":587\n+ __pyx_t_13 = 0;\n+ __pyx_t_13 = PyUnicode_Format(__pyx_kp_u_s_s, __pyx_t_5); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 764, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_13);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (unlikely(PyObject_SetItem(__pyx_v_next_oids, __pyx_v_pos, __pyx_t_13) < 0)) __PYX_ERR(0, 764, __pyx_L1_error)\n+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":761\n * if len(skip_column):\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions: # <<<<<<<<<<<<<<\n * if pos in skip_column:\n * continue\n *\/\n- __pyx_L39_continue:;\n+ __pyx_L36_continue:;\n }\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":591\n- * continue\n- * next_oids[pos] = \"%s.%s\" % (orig_main_oids[pos], last_seen_index[pos])\n- * next_oids = tuple(next_oids) # <<<<<<<<<<<<<<\n- * else:\n- * next_oids = tuple(\n- *\/\n- __pyx_t_9 = PySequence_Tuple(__pyx_v_next_oids); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 591, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n- __Pyx_DECREF_SET(__pyx_v_next_oids, __pyx_t_9);\n- __pyx_t_9 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":585\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":759\n * break\n * if len(skip_column) < main_oids_len:\n * if len(skip_column): # <<<<<<<<<<<<<<\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * next_oids = [None,] * len(orig_main_oids)\n * for pos in rest_oids_positions:\n *\/\n- goto __pyx_L36;\n- }\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":593\n- * next_oids = tuple(next_oids)\n+ goto __pyx_L35;\n+ }\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":766\n+ * next_oids[pos] = \"%s.%s\" % (orig_main_oids[pos], last_seen_index[pos])\n * else:\n- * next_oids = tuple( # <<<<<<<<<<<<<<\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions)\n+ * next_oids = [ # <<<<<<<<<<<<<<\n+ * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions]\n * \n *\/\n \/*else*\/ {\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":594\n+ { \/* enter inner scope *\/\n+ PyObject *__pyx_8genexpr1__pyx_v_p = NULL;\n+ __pyx_t_7 = PyList_New(0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 766, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_7);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":767\n * else:\n- * next_oids = tuple(\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions) # <<<<<<<<<<<<<<\n- * \n- * return result, next_oids\n- *\/\n- __pyx_t_9 = __pyx_pf_8fastsnmp_11snmp_parser_13parse_varbind_genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 594, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_9);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":593\n- * next_oids = tuple(next_oids)\n- * else:\n- * next_oids = tuple( # <<<<<<<<<<<<<<\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions)\n- * \n- *\/\n- __pyx_t_7 = PySequence_Tuple(__pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 593, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_7);\n- __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n- __Pyx_DECREF_SET(__pyx_v_next_oids, __pyx_t_7);\n+ * next_oids = [\n+ * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions] # <<<<<<<<<<<<<<\n+ * \n+ * return result, tuple(next_oids)\n+ *\/\n+ __pyx_t_13 = __pyx_v_rest_oids_positions; __Pyx_INCREF(__pyx_t_13); __pyx_t_2 = 0;\n+ for (;;) {\n+ if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_13)) break;\n+ #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n+ __pyx_t_5 = PyList_GET_ITEM(__pyx_t_13, __pyx_t_2); __Pyx_INCREF(__pyx_t_5); __pyx_t_2++; if (unlikely(0 < 0)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ #else\n+ __pyx_t_5 = PySequence_ITEM(__pyx_t_13, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ #endif\n+ __Pyx_XDECREF_SET(__pyx_8genexpr1__pyx_v_p, __pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_GetItem(__pyx_v_orig_main_oids, __pyx_8genexpr1__pyx_v_p); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_1 = __Pyx_PyDict_GetItem(__pyx_v_last_seen_index, __pyx_8genexpr1__pyx_v_p); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_1);\n+ __pyx_t_5 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyUnicode_Format(__pyx_kp_u_s_s, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 767, __pyx_L41_error)\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ if (unlikely(__Pyx_ListComp_Append(__pyx_t_7, (PyObject*)__pyx_t_1))) __PYX_ERR(0, 766, __pyx_L41_error)\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ }\n+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;\n+ __Pyx_XDECREF(__pyx_8genexpr1__pyx_v_p);\n+ goto __pyx_L44_exit_scope;\n+ __pyx_L41_error:;\n+ __Pyx_XDECREF(__pyx_8genexpr1__pyx_v_p);\n+ goto __pyx_L1_error;\n+ __pyx_L44_exit_scope:;\n+ } \/* exit inner scope *\/\n+ __Pyx_DECREF_SET(__pyx_v_next_oids, ((PyObject*)__pyx_t_7));\n __pyx_t_7 = 0;\n }\n- __pyx_L36:;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":584\n+ __pyx_L35:;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":758\n * if len(skip_column) == var_bind_list_len:\n * break\n * if len(skip_column) < main_oids_len: # <<<<<<<<<<<<<<\n * if len(skip_column):\n- * next_oids = [None for _ in range(len(orig_main_oids))]\n+ * next_oids = [None,] * len(orig_main_oids)\n *\/\n }\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":596\n- * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions)\n- * \n- * return result, next_oids # <<<<<<<<<<<<<<\n+ \/* \"fastsnmp\/snmp_parser.pyx\":769\n+ * \"%s.%s\" % (orig_main_oids[p], last_seen_index[p]) for p in rest_oids_positions]\n+ * \n+ * return result, tuple(next_oids) # <<<<<<<<<<<<<<\n *\/\n __Pyx_XDECREF(__pyx_r);\n- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 596, __pyx_L1_error)\n+ __pyx_t_7 = PyList_AsTuple(__pyx_v_next_oids); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 769, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_7);\n+ __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) __PYX_ERR(0, 769, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_t_13);\n __Pyx_INCREF(__pyx_v_result);\n __Pyx_GIVEREF(__pyx_v_result);\n- PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_result);\n- __Pyx_INCREF(__pyx_v_next_oids);\n- __Pyx_GIVEREF(__pyx_v_next_oids);\n- PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_v_next_oids);\n- __pyx_r = __pyx_t_7;\n+ PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_v_result);\n+ __Pyx_GIVEREF(__pyx_t_7);\n+ PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_t_7);\n __pyx_t_7 = 0;\n+ __pyx_r = __pyx_t_13;\n+ __pyx_t_13 = 0;\n goto __pyx_L0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n+ \/* \"fastsnmp\/snmp_parser.pyx\":713\n+ * \n+ * \n+ * def parse_varbind(list var_bind_list not None, tuple orig_main_oids not None, tuple oids_to_poll not None): # <<<<<<<<<<<<<<\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item\n *\/\n \n \/* function exit code *\/\n __pyx_L1_error:;\n __Pyx_XDECREF(__pyx_t_1);\n- __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n __Pyx_XDECREF(__pyx_t_6);\n __Pyx_XDECREF(__pyx_t_7);\n- __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_XDECREF(__pyx_t_13);\n+ __Pyx_XDECREF(__pyx_t_14);\n __Pyx_XDECREF(__pyx_t_15);\n __Pyx_XDECREF(__pyx_t_16);\n- __Pyx_XDECREF(__pyx_t_17);\n __Pyx_AddTraceback(\"fastsnmp.snmp_parser.parse_varbind\", __pyx_clineno, __pyx_lineno, __pyx_filename);\n __pyx_r = NULL;\n __pyx_L0:;\n+ __Pyx_XDECREF(__pyx_v_oid);\n+ __Pyx_XDECREF(__pyx_v_main_oid);\n+ __Pyx_XDECREF(__pyx_v_index_part);\n __Pyx_XDECREF(__pyx_v_result);\n+ __Pyx_XDECREF(__pyx_v_item);\n __Pyx_XDECREF(__pyx_v_next_oids);\n+ __Pyx_XDECREF(__pyx_v_orig_main_oids_doted);\n+ __Pyx_XDECREF(__pyx_v_orig_main_oids_len);\n+ __Pyx_XDECREF(__pyx_v_value);\n+ __Pyx_XDECREF(__pyx_v_rest_oids_positions);\n __Pyx_XDECREF(__pyx_v_main_oids_positions);\n+ __Pyx_XDECREF(__pyx_v_i);\n __Pyx_XDECREF(__pyx_v_skip_column);\n- __Pyx_XDECREF(__pyx_v_item);\n- __Pyx_XDECREF(__pyx_v_oid);\n- __Pyx_XDECREF(__pyx_v_value);\n+ __Pyx_XDECREF(__pyx_v_last_seen_index);\n __Pyx_XDECREF(__pyx_v_e);\n __Pyx_XDECREF(__pyx_v_main_oids_pos);\n- __Pyx_XDECREF(__pyx_v_main_oid);\n- __Pyx_XDECREF(__pyx_v_index_part);\n __Pyx_XDECREF(__pyx_v_pos);\n- __Pyx_DECREF(((PyObject *)__pyx_cur_scope));\n __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_TraceReturn(__pyx_r, 0);\n __Pyx_RefNannyFinishContext();\n return __pyx_r;\n }\n-\n-static struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *__pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind[8];\n-static int __pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind = 0;\n-\n-static PyObject *__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {\n- PyObject *o;\n- if (CYTHON_COMPILING_IN_CPYTHON && likely((__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind)))) {\n- o = (PyObject*)__pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind[--__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind];\n- memset(o, 0, sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind));\n- (void) PyObject_INIT(o, t);\n- PyObject_GC_Track(o);\n- } else {\n- o = (*t->tp_alloc)(t, 0);\n- if (unlikely(!o)) return 0;\n- }\n- return o;\n-}\n-\n-static void __pyx_tp_dealloc_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(PyObject *o) {\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)o;\n- PyObject_GC_UnTrack(o);\n- Py_CLEAR(p->__pyx_v_last_seen_index);\n- Py_CLEAR(p->__pyx_v_orig_main_oids);\n- Py_CLEAR(p->__pyx_v_rest_oids_positions);\n- if (CYTHON_COMPILING_IN_CPYTHON && ((__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind)))) {\n- __pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind[__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind++] = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)o);\n- } else {\n- (*Py_TYPE(o)->tp_free)(o);\n- }\n-}\n-\n-static int __pyx_tp_traverse_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(PyObject *o, visitproc v, void *a) {\n- int e;\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)o;\n- if (p->__pyx_v_last_seen_index) {\n- e = (*v)(p->__pyx_v_last_seen_index, a); if (e) return e;\n- }\n- if (p->__pyx_v_orig_main_oids) {\n- e = (*v)(p->__pyx_v_orig_main_oids, a); if (e) return e;\n- }\n- if (p->__pyx_v_rest_oids_positions) {\n- e = (*v)(p->__pyx_v_rest_oids_positions, a); if (e) return e;\n- }\n- return 0;\n-}\n-\n-static int __pyx_tp_clear_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind(PyObject *o) {\n- PyObject* tmp;\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)o;\n- tmp = ((PyObject*)p->__pyx_v_last_seen_index);\n- p->__pyx_v_last_seen_index = ((PyObject*)Py_None); Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- tmp = ((PyObject*)p->__pyx_v_orig_main_oids);\n- p->__pyx_v_orig_main_oids = Py_None; Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- tmp = ((PyObject*)p->__pyx_v_rest_oids_positions);\n- p->__pyx_v_rest_oids_positions = ((PyObject*)Py_None); Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-\n-static PyTypeObject __pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind = {\n- PyVarObject_HEAD_INIT(0, 0)\n- \"fastsnmp.snmp_parser.__pyx_scope_struct__parse_varbind\", \/*tp_name*\/\n- sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind), \/*tp_basicsize*\/\n- 0, \/*tp_itemsize*\/\n- __pyx_tp_dealloc_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind, \/*tp_dealloc*\/\n- 0, \/*tp_print*\/\n- 0, \/*tp_getattr*\/\n- 0, \/*tp_setattr*\/\n- #if PY_MAJOR_VERSION < 3\n- 0, \/*tp_compare*\/\n- #endif\n- #if PY_MAJOR_VERSION >= 3\n- 0, \/*tp_as_async*\/\n- #endif\n- 0, \/*tp_repr*\/\n- 0, \/*tp_as_number*\/\n- 0, \/*tp_as_sequence*\/\n- 0, \/*tp_as_mapping*\/\n- 0, \/*tp_hash*\/\n- 0, \/*tp_call*\/\n- 0, \/*tp_str*\/\n- 0, \/*tp_getattro*\/\n- 0, \/*tp_setattro*\/\n- 0, \/*tp_as_buffer*\/\n- Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, \/*tp_flags*\/\n- 0, \/*tp_doc*\/\n- __pyx_tp_traverse_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind, \/*tp_traverse*\/\n- __pyx_tp_clear_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind, \/*tp_clear*\/\n- 0, \/*tp_richcompare*\/\n- 0, \/*tp_weaklistoffset*\/\n- 0, \/*tp_iter*\/\n- 0, \/*tp_iternext*\/\n- 0, \/*tp_methods*\/\n- 0, \/*tp_members*\/\n- 0, \/*tp_getset*\/\n- 0, \/*tp_base*\/\n- 0, \/*tp_dict*\/\n- 0, \/*tp_descr_get*\/\n- 0, \/*tp_descr_set*\/\n- 0, \/*tp_dictoffset*\/\n- 0, \/*tp_init*\/\n- 0, \/*tp_alloc*\/\n- __pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind, \/*tp_new*\/\n- 0, \/*tp_free*\/\n- 0, \/*tp_is_gc*\/\n- 0, \/*tp_bases*\/\n- 0, \/*tp_mro*\/\n- 0, \/*tp_cache*\/\n- 0, \/*tp_subclasses*\/\n- 0, \/*tp_weaklist*\/\n- 0, \/*tp_del*\/\n- 0, \/*tp_version_tag*\/\n- #if PY_VERSION_HEX >= 0x030400a1\n- 0, \/*tp_finalize*\/\n- #endif\n-};\n-\n-static struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *__pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr[8];\n-static int __pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr = 0;\n-\n-static PyObject *__pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {\n- PyObject *o;\n- if (CYTHON_COMPILING_IN_CPYTHON && likely((__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr)))) {\n- o = (PyObject*)__pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr[--__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr];\n- memset(o, 0, sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr));\n- (void) PyObject_INIT(o, t);\n- PyObject_GC_Track(o);\n- } else {\n- o = (*t->tp_alloc)(t, 0);\n- if (unlikely(!o)) return 0;\n- }\n- return o;\n-}\n-\n-static void __pyx_tp_dealloc_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(PyObject *o) {\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)o;\n- PyObject_GC_UnTrack(o);\n- Py_CLEAR(p->__pyx_outer_scope);\n- Py_CLEAR(p->__pyx_v_p);\n- Py_CLEAR(p->__pyx_t_0);\n- if (CYTHON_COMPILING_IN_CPYTHON && ((__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr)))) {\n- __pyx_freelist_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr[__pyx_freecount_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr++] = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)o);\n- } else {\n- (*Py_TYPE(o)->tp_free)(o);\n- }\n-}\n-\n-static int __pyx_tp_traverse_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(PyObject *o, visitproc v, void *a) {\n- int e;\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)o;\n- if (p->__pyx_outer_scope) {\n- e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;\n- }\n- if (p->__pyx_v_p) {\n- e = (*v)(p->__pyx_v_p, a); if (e) return e;\n- }\n- if (p->__pyx_t_0) {\n- e = (*v)(p->__pyx_t_0, a); if (e) return e;\n- }\n- return 0;\n-}\n-\n-static int __pyx_tp_clear_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr(PyObject *o) {\n- PyObject* tmp;\n- struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *p = (struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr *)o;\n- tmp = ((PyObject*)p->__pyx_outer_scope);\n- p->__pyx_outer_scope = ((struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind *)Py_None); Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- tmp = ((PyObject*)p->__pyx_v_p);\n- p->__pyx_v_p = Py_None; Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- tmp = ((PyObject*)p->__pyx_t_0);\n- p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-\n-static PyTypeObject __pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr = {\n- PyVarObject_HEAD_INIT(0, 0)\n- \"fastsnmp.snmp_parser.__pyx_scope_struct_1_genexpr\", \/*tp_name*\/\n- sizeof(struct __pyx_obj_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr), \/*tp_basicsize*\/\n- 0, \/*tp_itemsize*\/\n- __pyx_tp_dealloc_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr, \/*tp_dealloc*\/\n- 0, \/*tp_print*\/\n- 0, \/*tp_getattr*\/\n- 0, \/*tp_setattr*\/\n- #if PY_MAJOR_VERSION < 3\n- 0, \/*tp_compare*\/\n- #endif\n- #if PY_MAJOR_VERSION >= 3\n- 0, \/*tp_as_async*\/\n- #endif\n- 0, \/*tp_repr*\/\n- 0, \/*tp_as_number*\/\n- 0, \/*tp_as_sequence*\/\n- 0, \/*tp_as_mapping*\/\n- 0, \/*tp_hash*\/\n- 0, \/*tp_call*\/\n- 0, \/*tp_str*\/\n- 0, \/*tp_getattro*\/\n- 0, \/*tp_setattro*\/\n- 0, \/*tp_as_buffer*\/\n- Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, \/*tp_flags*\/\n- 0, \/*tp_doc*\/\n- __pyx_tp_traverse_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr, \/*tp_traverse*\/\n- __pyx_tp_clear_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr, \/*tp_clear*\/\n- 0, \/*tp_richcompare*\/\n- 0, \/*tp_weaklistoffset*\/\n- 0, \/*tp_iter*\/\n- 0, \/*tp_iternext*\/\n- 0, \/*tp_methods*\/\n- 0, \/*tp_members*\/\n- 0, \/*tp_getset*\/\n- 0, \/*tp_base*\/\n- 0, \/*tp_dict*\/\n- 0, \/*tp_descr_get*\/\n- 0, \/*tp_descr_set*\/\n- 0, \/*tp_dictoffset*\/\n- 0, \/*tp_init*\/\n- 0, \/*tp_alloc*\/\n- __pyx_tp_new_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr, \/*tp_new*\/\n- 0, \/*tp_free*\/\n- 0, \/*tp_is_gc*\/\n- 0, \/*tp_bases*\/\n- 0, \/*tp_mro*\/\n- 0, \/*tp_cache*\/\n- 0, \/*tp_subclasses*\/\n- 0, \/*tp_weaklist*\/\n- 0, \/*tp_del*\/\n- 0, \/*tp_version_tag*\/\n- #if PY_VERSION_HEX >= 0x030400a1\n- 0, \/*tp_finalize*\/\n- #endif\n-};\n \n static PyMethodDef __pyx_methods[] = {\n {0, 0, 0, 0}\n@@ -11180,7 +11721,6 @@\n #endif\n \n static __Pyx_StringTabEntry __pyx_string_tab[] = {\n- {&__pyx_kp_b_, __pyx_k_, sizeof(__pyx_k_), 0, 0, 0, 0},\n {&__pyx_n_u_APPLICATION, __pyx_k_APPLICATION, sizeof(__pyx_k_APPLICATION), 0, 1, 0, 1},\n {&__pyx_n_s_ASN_SNMP_APPLICATION, __pyx_k_ASN_SNMP_APPLICATION, sizeof(__pyx_k_ASN_SNMP_APPLICATION), 0, 0, 1, 1},\n {&__pyx_n_s_ASN_SNMP_MSG_TYPES, __pyx_k_ASN_SNMP_MSG_TYPES, sizeof(__pyx_k_ASN_SNMP_MSG_TYPES), 0, 0, 1, 1},\n@@ -11188,7 +11728,6 @@\n {&__pyx_n_u_CONSTRUCTED, __pyx_k_CONSTRUCTED, sizeof(__pyx_k_CONSTRUCTED), 0, 1, 0, 1},\n {&__pyx_n_u_CONTEXT, __pyx_k_CONTEXT, sizeof(__pyx_k_CONTEXT), 0, 1, 0, 1},\n {&__pyx_n_u_Counter, __pyx_k_Counter, sizeof(__pyx_k_Counter), 0, 1, 0, 1},\n- {&__pyx_n_s_DEBUG, __pyx_k_DEBUG, sizeof(__pyx_k_DEBUG), 0, 0, 1, 1},\n {&__pyx_kp_u_Exception_s_item_s, __pyx_k_Exception_s_item_s, sizeof(__pyx_k_Exception_s_item_s), 0, 1, 0, 0},\n {&__pyx_n_u_Get, __pyx_k_Get, sizeof(__pyx_k_Get), 0, 1, 0, 1},\n {&__pyx_n_u_GetBulk, __pyx_k_GetBulk, sizeof(__pyx_k_GetBulk), 0, 1, 0, 1},\n@@ -11204,46 +11743,40 @@\n {&__pyx_n_u_PRIMITIVE, __pyx_k_PRIMITIVE, sizeof(__pyx_k_PRIMITIVE), 0, 1, 0, 1},\n {&__pyx_n_u_PRIVATE, __pyx_k_PRIVATE, sizeof(__pyx_k_PRIVATE), 0, 1, 0, 1},\n {&__pyx_n_u_Response, __pyx_k_Response, sizeof(__pyx_k_Response), 0, 1, 0, 1},\n+ {&__pyx_n_u_SID1, __pyx_k_SID1, sizeof(__pyx_k_SID1), 0, 1, 0, 1},\n+ {&__pyx_n_u_SID2, __pyx_k_SID2, sizeof(__pyx_k_SID2), 0, 1, 0, 1},\n {&__pyx_n_s_SNMPException, __pyx_k_SNMPException, sizeof(__pyx_k_SNMPException), 0, 0, 1, 1},\n {&__pyx_n_u_Sequence, __pyx_k_Sequence, sizeof(__pyx_k_Sequence), 0, 1, 0, 1},\n {&__pyx_n_u_Set, __pyx_k_Set, sizeof(__pyx_k_Set), 0, 1, 0, 1},\n- {&__pyx_kp_u_SubID_out_of_range, __pyx_k_SubID_out_of_range, sizeof(__pyx_k_SubID_out_of_range), 0, 1, 0, 0},\n {&__pyx_n_u_TimeTicks, __pyx_k_TimeTicks, sizeof(__pyx_k_TimeTicks), 0, 1, 0, 1},\n {&__pyx_n_u_Trap, __pyx_k_Trap, sizeof(__pyx_k_Trap), 0, 1, 0, 1},\n {&__pyx_n_s_TypeError, __pyx_k_TypeError, sizeof(__pyx_k_TypeError), 0, 0, 1, 1},\n {&__pyx_n_u_UNIVERSAL, __pyx_k_UNIVERSAL, sizeof(__pyx_k_UNIVERSAL), 0, 1, 0, 1},\n- {&__pyx_n_s_UnicodeDecodeError, __pyx_k_UnicodeDecodeError, sizeof(__pyx_k_UnicodeDecodeError), 0, 0, 1, 1},\n {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},\n {&__pyx_n_s_VarBindContentException, __pyx_k_VarBindContentException, sizeof(__pyx_k_VarBindContentException), 0, 0, 1, 1},\n {&__pyx_n_s_VarBindUnpackException, __pyx_k_VarBindUnpackException, sizeof(__pyx_k_VarBindUnpackException), 0, 0, 1, 1},\n- {&__pyx_kp_b__13, __pyx_k__13, sizeof(__pyx_k__13), 0, 0, 0, 0},\n- {&__pyx_kp_b__14, __pyx_k__14, sizeof(__pyx_k__14), 0, 0, 0, 0},\n+ {&__pyx_kp_b__23, __pyx_k__23, sizeof(__pyx_k__23), 0, 0, 0, 0},\n+ {&__pyx_kp_b__34, __pyx_k__34, sizeof(__pyx_k__34), 0, 0, 0, 0},\n+ {&__pyx_kp_b__35, __pyx_k__35, sizeof(__pyx_k__35), 0, 0, 0, 0},\n {&__pyx_kp_u__4, __pyx_k__4, sizeof(__pyx_k__4), 0, 1, 0, 0},\n {&__pyx_n_s_append, __pyx_k_append, sizeof(__pyx_k_append), 0, 0, 1, 1},\n- {&__pyx_n_s_args, __pyx_k_args, sizeof(__pyx_k_args), 0, 0, 1, 1},\n {&__pyx_n_u_ascii, __pyx_k_ascii, sizeof(__pyx_k_ascii), 0, 1, 0, 1},\n {&__pyx_n_s_asnTagClasses, __pyx_k_asnTagClasses, sizeof(__pyx_k_asnTagClasses), 0, 0, 1, 1},\n {&__pyx_n_s_asnTagFormats, __pyx_k_asnTagFormats, sizeof(__pyx_k_asnTagFormats), 0, 0, 1, 1},\n {&__pyx_n_s_asn_tag_class, __pyx_k_asn_tag_class, sizeof(__pyx_k_asn_tag_class), 0, 0, 1, 1},\n {&__pyx_n_s_asn_tag_format, __pyx_k_asn_tag_format, sizeof(__pyx_k_asn_tag_format), 0, 0, 1, 1},\n {&__pyx_n_s_asn_tag_number, __pyx_k_asn_tag_number, sizeof(__pyx_k_asn_tag_number), 0, 0, 1, 1},\n- {&__pyx_kp_u_bad_value_in_s_at_s, __pyx_k_bad_value_in_s_at_s, sizeof(__pyx_k_bad_value_in_s_at_s), 0, 1, 0, 0},\n- {&__pyx_n_u_big, __pyx_k_big, sizeof(__pyx_k_big), 0, 1, 0, 1},\n- {&__pyx_n_s_binascii, __pyx_k_binascii, sizeof(__pyx_k_binascii), 0, 0, 1, 1},\n- {&__pyx_n_s_bit_length, __pyx_k_bit_length, sizeof(__pyx_k_bit_length), 0, 0, 1, 1},\n- {&__pyx_n_s_byte, __pyx_k_byte, sizeof(__pyx_k_byte), 0, 0, 1, 1},\n- {&__pyx_n_s_byteorder, __pyx_k_byteorder, sizeof(__pyx_k_byteorder), 0, 0, 1, 1},\n- {&__pyx_n_s_bytes_len, __pyx_k_bytes_len, sizeof(__pyx_k_bytes_len), 0, 0, 1, 1},\n- {&__pyx_n_s_close, __pyx_k_close, sizeof(__pyx_k_close), 0, 0, 1, 1},\n+ {&__pyx_n_s_auto_str, __pyx_k_auto_str, sizeof(__pyx_k_auto_str), 0, 0, 1, 1},\n+ {&__pyx_kp_u_bad_objectid, __pyx_k_bad_objectid, sizeof(__pyx_k_bad_objectid), 0, 1, 0, 0},\n {&__pyx_n_s_community, __pyx_k_community, sizeof(__pyx_k_community), 0, 0, 1, 1},\n {&__pyx_n_s_community_id, __pyx_k_community_id, sizeof(__pyx_k_community_id), 0, 0, 1, 1},\n {&__pyx_n_s_community_len, __pyx_k_community_len, sizeof(__pyx_k_community_len), 0, 0, 1, 1},\n {&__pyx_n_s_cycle, __pyx_k_cycle, sizeof(__pyx_k_cycle), 0, 0, 1, 1},\n {&__pyx_n_s_data, __pyx_k_data, sizeof(__pyx_k_data), 0, 0, 1, 1},\n- {&__pyx_n_s_decode, __pyx_k_decode, sizeof(__pyx_k_decode), 0, 0, 1, 1},\n {&__pyx_n_s_doc, __pyx_k_doc, sizeof(__pyx_k_doc), 0, 0, 1, 1},\n {&__pyx_n_s_e, __pyx_k_e, sizeof(__pyx_k_e), 0, 0, 1, 1},\n {&__pyx_n_s_encode, __pyx_k_encode, sizeof(__pyx_k_encode), 0, 0, 1, 1},\n+ {&__pyx_n_s_encode_length, __pyx_k_encode_length, sizeof(__pyx_k_encode_length), 0, 0, 1, 1},\n {&__pyx_n_s_encode_varbind, __pyx_k_encode_varbind, sizeof(__pyx_k_encode_varbind), 0, 0, 1, 1},\n {&__pyx_n_s_error_index, __pyx_k_error_index, sizeof(__pyx_k_error_index), 0, 0, 1, 1},\n {&__pyx_n_s_error_index_id, __pyx_k_error_index_id, sizeof(__pyx_k_error_index_id), 0, 0, 1, 1},\n@@ -11253,45 +11786,38 @@\n {&__pyx_n_s_error_status_len, __pyx_k_error_status_len, sizeof(__pyx_k_error_status_len), 0, 0, 1, 1},\n {&__pyx_kp_u_expected_oid_in_str_got_r, __pyx_k_expected_oid_in_str_got_r, sizeof(__pyx_k_expected_oid_in_str_got_r), 0, 1, 0, 0},\n {&__pyx_n_s_fastsnmp_snmp_parser, __pyx_k_fastsnmp_snmp_parser, sizeof(__pyx_k_fastsnmp_snmp_parser), 0, 0, 1, 1},\n- {&__pyx_n_s_from_bytes, __pyx_k_from_bytes, sizeof(__pyx_k_from_bytes), 0, 0, 1, 1},\n- {&__pyx_n_s_genexpr, __pyx_k_genexpr, sizeof(__pyx_k_genexpr), 0, 0, 1, 1},\n- {&__pyx_n_s_hexlify, __pyx_k_hexlify, sizeof(__pyx_k_hexlify), 0, 0, 1, 1},\n {&__pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_k_home_gescheit_workspace_fastsnm, sizeof(__pyx_k_home_gescheit_workspace_fastsnm), 0, 0, 1, 0},\n {&__pyx_n_s_i, __pyx_k_i, sizeof(__pyx_k_i), 0, 0, 1, 1},\n- {&__pyx_n_s_id_cache, __pyx_k_id_cache, sizeof(__pyx_k_id_cache), 0, 0, 1, 1},\n {&__pyx_n_s_idlist, __pyx_k_idlist, sizeof(__pyx_k_idlist), 0, 0, 1, 1},\n {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1},\n {&__pyx_n_s_index_part, __pyx_k_index_part, sizeof(__pyx_k_index_part), 0, 0, 1, 1},\n {&__pyx_n_s_insert, __pyx_k_insert, sizeof(__pyx_k_insert), 0, 0, 1, 1},\n {&__pyx_n_s_integer, __pyx_k_integer, sizeof(__pyx_k_integer), 0, 0, 1, 1},\n {&__pyx_n_s_integer_decode, __pyx_k_integer_decode, sizeof(__pyx_k_integer_decode), 0, 0, 1, 1},\n- {&__pyx_n_s_integer_decode_cache, __pyx_k_integer_decode_cache, sizeof(__pyx_k_integer_decode_cache), 0, 0, 1, 1},\n {&__pyx_n_s_integer_encode, __pyx_k_integer_encode, sizeof(__pyx_k_integer_encode), 0, 0, 1, 1},\n- {&__pyx_n_s_integer_encode_cache, __pyx_k_integer_encode_cache, sizeof(__pyx_k_integer_encode_cache), 0, 0, 1, 1},\n {&__pyx_n_s_item, __pyx_k_item, sizeof(__pyx_k_item), 0, 0, 1, 1},\n {&__pyx_n_s_itertools, __pyx_k_itertools, sizeof(__pyx_k_itertools), 0, 0, 1, 1},\n- {&__pyx_n_s_lambda, __pyx_k_lambda, sizeof(__pyx_k_lambda), 0, 0, 1, 1},\n {&__pyx_n_s_last_seen_index, __pyx_k_last_seen_index, sizeof(__pyx_k_last_seen_index), 0, 0, 1, 1},\n {&__pyx_n_s_length, __pyx_k_length, sizeof(__pyx_k_length), 0, 0, 1, 1},\n {&__pyx_n_s_length_cache, __pyx_k_length_cache, sizeof(__pyx_k_length_cache), 0, 0, 1, 1},\n {&__pyx_n_s_length_decode, __pyx_k_length_decode, sizeof(__pyx_k_length_decode), 0, 0, 1, 1},\n {&__pyx_n_s_length_encode, __pyx_k_length_encode, sizeof(__pyx_k_length_encode), 0, 0, 1, 1},\n+ {&__pyx_kp_u_long_SID1_is_not_supported, __pyx_k_long_SID1_is_not_supported, sizeof(__pyx_k_long_SID1_is_not_supported), 0, 1, 0, 0},\n {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1},\n {&__pyx_n_s_main_oid, __pyx_k_main_oid, sizeof(__pyx_k_main_oid), 0, 0, 1, 1},\n {&__pyx_n_s_main_oids_len, __pyx_k_main_oids_len, sizeof(__pyx_k_main_oids_len), 0, 0, 1, 1},\n {&__pyx_n_s_main_oids_pos, __pyx_k_main_oids_pos, sizeof(__pyx_k_main_oids_pos), 0, 0, 1, 1},\n {&__pyx_n_s_main_oids_positions, __pyx_k_main_oids_positions, sizeof(__pyx_k_main_oids_positions), 0, 0, 1, 1},\n- {&__pyx_n_s_map, __pyx_k_map, sizeof(__pyx_k_map), 0, 0, 1, 1},\n {&__pyx_n_s_maxRepetitions, __pyx_k_maxRepetitions, sizeof(__pyx_k_maxRepetitions), 0, 0, 1, 1},\n {&__pyx_n_s_maxRepetitions_id, __pyx_k_maxRepetitions_id, sizeof(__pyx_k_maxRepetitions_id), 0, 0, 1, 1},\n {&__pyx_n_s_maxRepetitions_len, __pyx_k_maxRepetitions_len, sizeof(__pyx_k_maxRepetitions_len), 0, 0, 1, 1},\n {&__pyx_n_s_max_repetitions, __pyx_k_max_repetitions, sizeof(__pyx_k_max_repetitions), 0, 0, 1, 1},\n+ {&__pyx_kp_u_max_repetitions_must_be_higher_t, __pyx_k_max_repetitions_must_be_higher_t, sizeof(__pyx_k_max_repetitions_must_be_higher_t), 0, 1, 0, 0},\n {&__pyx_n_s_metaclass, __pyx_k_metaclass, sizeof(__pyx_k_metaclass), 0, 0, 1, 1},\n {&__pyx_n_s_module, __pyx_k_module, sizeof(__pyx_k_module), 0, 0, 1, 1},\n {&__pyx_n_s_msg_decode, __pyx_k_msg_decode, sizeof(__pyx_k_msg_decode), 0, 0, 1, 1},\n {&__pyx_n_s_msg_encode, __pyx_k_msg_encode, sizeof(__pyx_k_msg_encode), 0, 0, 1, 1},\n {&__pyx_n_s_msg_type, __pyx_k_msg_type, sizeof(__pyx_k_msg_type), 0, 0, 1, 1},\n- {&__pyx_n_s_n, __pyx_k_n, sizeof(__pyx_k_n), 0, 0, 1, 1},\n {&__pyx_n_s_next_oids, __pyx_k_next_oids, sizeof(__pyx_k_next_oids), 0, 0, 1, 1},\n {&__pyx_n_s_nonRepeaters, __pyx_k_nonRepeaters, sizeof(__pyx_k_nonRepeaters), 0, 0, 1, 1},\n {&__pyx_n_s_nonRepeaters_id, __pyx_k_nonRepeaters_id, sizeof(__pyx_k_nonRepeaters_id), 0, 0, 1, 1},\n@@ -11306,25 +11832,21 @@\n {&__pyx_n_s_obj_value, __pyx_k_obj_value, sizeof(__pyx_k_obj_value), 0, 0, 1, 1},\n {&__pyx_n_s_obj_value_id, __pyx_k_obj_value_id, sizeof(__pyx_k_obj_value_id), 0, 0, 1, 1},\n {&__pyx_n_s_obj_value_len, __pyx_k_obj_value_len, sizeof(__pyx_k_obj_value_len), 0, 0, 1, 1},\n- {&__pyx_n_s_objectData, __pyx_k_objectData, sizeof(__pyx_k_objectData), 0, 0, 1, 1},\n+ {&__pyx_n_s_object_len, __pyx_k_object_len, sizeof(__pyx_k_object_len), 0, 0, 1, 1},\n {&__pyx_n_s_objectid_decode, __pyx_k_objectid_decode, sizeof(__pyx_k_objectid_decode), 0, 0, 1, 1},\n {&__pyx_n_s_objectid_encode, __pyx_k_objectid_encode, sizeof(__pyx_k_objectid_encode), 0, 0, 1, 1},\n- {&__pyx_n_s_objects, __pyx_k_objects, sizeof(__pyx_k_objects), 0, 0, 1, 1},\n {&__pyx_n_s_octetstring_decode, __pyx_k_octetstring_decode, sizeof(__pyx_k_octetstring_decode), 0, 0, 1, 1},\n {&__pyx_n_s_octetstring_encode, __pyx_k_octetstring_encode, sizeof(__pyx_k_octetstring_encode), 0, 0, 1, 1},\n {&__pyx_n_s_oid, __pyx_k_oid, sizeof(__pyx_k_oid), 0, 0, 1, 1},\n {&__pyx_n_s_oids_to_poll, __pyx_k_oids_to_poll, sizeof(__pyx_k_oids_to_poll), 0, 0, 1, 1},\n {&__pyx_n_s_orig_main_oids, __pyx_k_orig_main_oids, sizeof(__pyx_k_orig_main_oids), 0, 0, 1, 1},\n+ {&__pyx_n_s_orig_main_oids_doted, __pyx_k_orig_main_oids_doted, sizeof(__pyx_k_orig_main_oids_doted), 0, 0, 1, 1},\n+ {&__pyx_n_s_orig_main_oids_len, __pyx_k_orig_main_oids_len, sizeof(__pyx_k_orig_main_oids_len), 0, 0, 1, 1},\n {&__pyx_n_s_parse_varbind, __pyx_k_parse_varbind, sizeof(__pyx_k_parse_varbind), 0, 0, 1, 1},\n- {&__pyx_n_s_parse_varbind_locals_genexpr, __pyx_k_parse_varbind_locals_genexpr, sizeof(__pyx_k_parse_varbind_locals_genexpr), 0, 0, 1, 1},\n- {&__pyx_n_s_parsed_objectData, __pyx_k_parsed_objectData, sizeof(__pyx_k_parsed_objectData), 0, 0, 1, 1},\n {&__pyx_n_s_pdu, __pyx_k_pdu, sizeof(__pyx_k_pdu), 0, 0, 1, 1},\n {&__pyx_n_s_pdu_id, __pyx_k_pdu_id, sizeof(__pyx_k_pdu_id), 0, 0, 1, 1},\n {&__pyx_n_s_pdu_len, __pyx_k_pdu_len, sizeof(__pyx_k_pdu_len), 0, 0, 1, 1},\n- {&__pyx_n_s_pdu_response_decode, __pyx_k_pdu_response_decode, sizeof(__pyx_k_pdu_response_decode), 0, 0, 1, 1},\n- {&__pyx_n_s_pop, __pyx_k_pop, sizeof(__pyx_k_pop), 0, 0, 1, 1},\n {&__pyx_n_s_pos, __pyx_k_pos, sizeof(__pyx_k_pos), 0, 0, 1, 1},\n- {&__pyx_n_s_position, __pyx_k_position, sizeof(__pyx_k_position), 0, 0, 1, 1},\n {&__pyx_n_s_prepare, __pyx_k_prepare, sizeof(__pyx_k_prepare), 0, 0, 1, 1},\n {&__pyx_n_s_qualname, __pyx_k_qualname, sizeof(__pyx_k_qualname), 0, 0, 1, 1},\n {&__pyx_n_s_range, __pyx_k_range, sizeof(__pyx_k_range), 0, 0, 1, 1},\n@@ -11336,38 +11858,31 @@\n {&__pyx_n_s_rest_oids_positions, __pyx_k_rest_oids_positions, sizeof(__pyx_k_rest_oids_positions), 0, 0, 1, 1},\n {&__pyx_n_s_result, __pyx_k_result, sizeof(__pyx_k_result), 0, 0, 1, 1},\n {&__pyx_n_s_resultlist, __pyx_k_resultlist, sizeof(__pyx_k_resultlist), 0, 0, 1, 1},\n- {&__pyx_n_s_run, __pyx_k_run, sizeof(__pyx_k_run), 0, 0, 1, 1},\n+ {&__pyx_n_s_ret, __pyx_k_ret, sizeof(__pyx_k_ret), 0, 0, 1, 1},\n {&__pyx_kp_u_s_s, __pyx_k_s_s, sizeof(__pyx_k_s_s), 0, 1, 0, 0},\n- {&__pyx_n_s_send, __pyx_k_send, sizeof(__pyx_k_send), 0, 0, 1, 1},\n {&__pyx_n_s_seq_tag, __pyx_k_seq_tag, sizeof(__pyx_k_seq_tag), 0, 0, 1, 1},\n- {&__pyx_n_s_sequence_cache, __pyx_k_sequence_cache, sizeof(__pyx_k_sequence_cache), 0, 0, 1, 1},\n {&__pyx_n_s_sequence_decode, __pyx_k_sequence_decode, sizeof(__pyx_k_sequence_decode), 0, 0, 1, 1},\n- {&__pyx_n_s_signed, __pyx_k_signed, sizeof(__pyx_k_signed), 0, 0, 1, 1},\n {&__pyx_n_s_skip_column, __pyx_k_skip_column, sizeof(__pyx_k_skip_column), 0, 0, 1, 1},\n+ {&__pyx_n_s_slen, __pyx_k_slen, sizeof(__pyx_k_slen), 0, 0, 1, 1},\n {&__pyx_n_s_snmp_message, __pyx_k_snmp_message, sizeof(__pyx_k_snmp_message), 0, 0, 1, 1},\n {&__pyx_n_s_snmp_message_len, __pyx_k_snmp_message_len, sizeof(__pyx_k_snmp_message_len), 0, 0, 1, 1},\n {&__pyx_n_s_snmp_message_seq_id, __pyx_k_snmp_message_seq_id, sizeof(__pyx_k_snmp_message_seq_id), 0, 0, 1, 1},\n {&__pyx_n_s_snmp_ver, __pyx_k_snmp_ver, sizeof(__pyx_k_snmp_ver), 0, 0, 1, 1},\n {&__pyx_n_s_split, __pyx_k_split, sizeof(__pyx_k_split), 0, 0, 1, 1},\n- {&__pyx_n_s_startswith, __pyx_k_startswith, sizeof(__pyx_k_startswith), 0, 0, 1, 1},\n+ {&__pyx_n_u_str, __pyx_k_str, sizeof(__pyx_k_str), 0, 1, 0, 1},\n {&__pyx_n_s_stream, __pyx_k_stream, sizeof(__pyx_k_stream), 0, 0, 1, 1},\n- {&__pyx_kp_u_stream_of_zero_length_in, __pyx_k_stream_of_zero_length_in, sizeof(__pyx_k_stream_of_zero_length_in), 0, 1, 0, 0},\n- {&__pyx_kp_u_stream_of_zero_length_in_objecti, __pyx_k_stream_of_zero_length_in_objecti, sizeof(__pyx_k_stream_of_zero_length_in_objecti), 0, 1, 0, 0},\n+ {&__pyx_n_s_stream_char, __pyx_k_stream_char, sizeof(__pyx_k_stream_char), 0, 0, 1, 1},\n+ {&__pyx_n_s_stream_len, __pyx_k_stream_len, sizeof(__pyx_k_stream_len), 0, 0, 1, 1},\n+ {&__pyx_n_s_stream_ptr, __pyx_k_stream_ptr, sizeof(__pyx_k_stream_ptr), 0, 0, 1, 1},\n {&__pyx_n_s_string, __pyx_k_string, sizeof(__pyx_k_string), 0, 0, 1, 1},\n {&__pyx_n_s_strip, __pyx_k_strip, sizeof(__pyx_k_strip), 0, 0, 1, 1},\n+ {&__pyx_n_u_strlen, __pyx_k_strlen, sizeof(__pyx_k_strlen), 0, 1, 0, 1},\n {&__pyx_n_s_subid, __pyx_k_subid, sizeof(__pyx_k_subid), 0, 0, 1, 1},\n- {&__pyx_n_s_subid1, __pyx_k_subid1, sizeof(__pyx_k_subid1), 0, 0, 1, 1},\n- {&__pyx_n_s_subid_c, __pyx_k_subid_c, sizeof(__pyx_k_subid_c), 0, 0, 1, 1},\n {&__pyx_n_s_subidlist, __pyx_k_subidlist, sizeof(__pyx_k_subidlist), 0, 0, 1, 1},\n {&__pyx_n_s_tag, __pyx_k_tag, sizeof(__pyx_k_tag), 0, 0, 1, 1},\n- {&__pyx_n_s_tagDecodeDict, __pyx_k_tagDecodeDict, sizeof(__pyx_k_tagDecodeDict), 0, 0, 1, 1},\n- {&__pyx_n_s_tag_cache, __pyx_k_tag_cache, sizeof(__pyx_k_tag_cache), 0, 0, 1, 1},\n {&__pyx_n_s_tag_decode, __pyx_k_tag_decode, sizeof(__pyx_k_tag_decode), 0, 0, 1, 1},\n {&__pyx_n_s_tag_encode, __pyx_k_tag_encode, sizeof(__pyx_k_tag_encode), 0, 0, 1, 1},\n {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},\n- {&__pyx_n_s_throw, __pyx_k_throw, sizeof(__pyx_k_throw), 0, 0, 1, 1},\n- {&__pyx_n_s_to_bytes, __pyx_k_to_bytes, sizeof(__pyx_k_to_bytes), 0, 0, 1, 1},\n- {&__pyx_n_s_val, __pyx_k_val, sizeof(__pyx_k_val), 0, 0, 1, 1},\n {&__pyx_n_s_value, __pyx_k_value, sizeof(__pyx_k_value), 0, 0, 1, 1},\n {&__pyx_n_s_value_encode, __pyx_k_value_encode, sizeof(__pyx_k_value_encode), 0, 0, 1, 1},\n {&__pyx_kp_u_value_must_be_None_for_Null_type, __pyx_k_value_must_be_None_for_Null_type, sizeof(__pyx_k_value_must_be_None_for_Null_type), 0, 1, 0, 0},\n@@ -11388,15 +11903,15 @@\n {&__pyx_n_s_version, __pyx_k_version, sizeof(__pyx_k_version), 0, 0, 1, 1},\n {&__pyx_n_s_version_id, __pyx_k_version_id, sizeof(__pyx_k_version_id), 0, 0, 1, 1},\n {&__pyx_n_s_version_len, __pyx_k_version_len, sizeof(__pyx_k_version_len), 0, 0, 1, 1},\n+ {&__pyx_kp_u_wrong_SID1, __pyx_k_wrong_SID1, sizeof(__pyx_k_wrong_SID1), 0, 1, 0, 0},\n+ {&__pyx_kp_u_wrong_SID2, __pyx_k_wrong_SID2, sizeof(__pyx_k_wrong_SID2), 0, 1, 0, 0},\n {0, 0, 0, 0, 0, 0, 0}\n };\n static int __Pyx_InitCachedBuiltins(void) {\n- __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 87, __pyx_L1_error)\n- __pyx_builtin_map = __Pyx_GetBuiltinName(__pyx_n_s_map); if (!__pyx_builtin_map) __PYX_ERR(0, 129, __pyx_L1_error)\n- __pyx_builtin_UnicodeDecodeError = __Pyx_GetBuiltinName(__pyx_n_s_UnicodeDecodeError); if (!__pyx_builtin_UnicodeDecodeError) __PYX_ERR(0, 190, __pyx_L1_error)\n- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 295, __pyx_L1_error)\n- __pyx_builtin_NotImplementedError = __Pyx_GetBuiltinName(__pyx_n_s_NotImplementedError); if (!__pyx_builtin_NotImplementedError) __PYX_ERR(0, 415, __pyx_L1_error)\n- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 565, __pyx_L1_error)\n+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 97, __pyx_L1_error)\n+ __pyx_builtin_NotImplementedError = __Pyx_GetBuiltinName(__pyx_n_s_NotImplementedError); if (!__pyx_builtin_NotImplementedError) __PYX_ERR(0, 440, __pyx_L1_error)\n+ __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(0, 740, __pyx_L1_error)\n+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 740, __pyx_L1_error)\n return 0;\n __pyx_L1_error:;\n return -1;\n@@ -11406,335 +11921,357 @@\n __Pyx_RefNannyDeclarations\n __Pyx_RefNannySetupContext(\"__Pyx_InitCachedConstants\", 0);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":87\n- * \"\"\"\n- * if not stream:\n- * raise ValueError('stream of zero length in') # <<<<<<<<<<<<<<\n- * if stream in id_cache:\n- * return id_cache[stream]\n- *\/\n- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_u_stream_of_zero_length_in); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 87, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__2);\n- __Pyx_GIVEREF(__pyx_tuple__2);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":106\n- * # # this first octet, are a real PITA later on. So yeah,\n- * # # stuff it, we'll just raise an exception.\n- * raise ValueError('stream of zero length in objectid_decode()') # <<<<<<<<<<<<<<\n- * # #\n- * # # Decode the rest of the octets\n- *\/\n- __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_u_stream_of_zero_length_in_objecti); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 106, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__3);\n- __Pyx_GIVEREF(__pyx_tuple__3);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":147\n- * cdef list idlist = []\n- * cdef list subidlist\n- * subidlist = oid.strip('.').split('.') # <<<<<<<<<<<<<<\n- * # asn_parse_objid(bufp, Length, &ASNType, objid, &PDU->enterprise_length);\n- * for subid_c in subidlist:\n- *\/\n- __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_u__4); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 147, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":116\n+ * \n+ * if <size_t>stream[0] > 127:\n+ * raise Exception(\"bad objectid\") # <<<<<<<<<<<<<<\n+ * \n+ * tmp_sid = sid12s[<size_t>stream[0]]\n+ *\/\n+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_u_bad_objectid); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 116, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple_);\n+ __Pyx_GIVEREF(__pyx_tuple_);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":283\n+ * cdef char result[256]\n+ * cdef str subid\n+ * for subid in oid.strip('.').split('.'): # <<<<<<<<<<<<<<\n+ * idlist[pos] = int(subid)\n+ * pos += 1\n+ *\/\n+ __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_u__4); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 283, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_tuple__5);\n __Pyx_GIVEREF(__pyx_tuple__5);\n- __pyx_tuple__6 = PyTuple_Pack(1, __pyx_kp_u__4); if (unlikely(!__pyx_tuple__6)) __PYX_ERR(0, 147, __pyx_L1_error)\n+ __pyx_tuple__6 = PyTuple_Pack(1, __pyx_kp_u__4); if (unlikely(!__pyx_tuple__6)) __PYX_ERR(0, 283, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_tuple__6);\n __Pyx_GIVEREF(__pyx_tuple__6);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":152\n- * number = int(subid_c)\n- * if number < 0 or number > 0x7FFFFFFF:\n- * raise ValueError(\"SubID out of range\") # <<<<<<<<<<<<<<\n- * idlist.append(number)\n- * \n- *\/\n- __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_u_SubID_out_of_range); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 152, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":290\n+ * if ret != 0:\n+ * if ret == -1:\n+ * raise Exception(\"wrong SID1\") # <<<<<<<<<<<<<<\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\")\n+ *\/\n+ __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_u_wrong_SID1); if (unlikely(!__pyx_tuple__7)) __PYX_ERR(0, 290, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_tuple__7);\n __Pyx_GIVEREF(__pyx_tuple__7);\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":203\n+ \/* \"fastsnmp\/snmp_parser.pyx\":292\n+ * raise Exception(\"wrong SID1\")\n+ * elif ret == -2:\n+ * raise Exception(\"wrong SID2\") # <<<<<<<<<<<<<<\n+ * elif ret == -3:\n+ * raise Exception(\"long SID1 is not supported\")\n+ *\/\n+ __pyx_tuple__8 = PyTuple_Pack(1, __pyx_kp_u_wrong_SID2); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 292, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__8);\n+ __Pyx_GIVEREF(__pyx_tuple__8);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":294\n+ * raise Exception(\"wrong SID2\")\n+ * elif ret == -3:\n+ * raise Exception(\"long SID1 is not supported\") # <<<<<<<<<<<<<<\n+ * \n+ * return <bytes>result[:object_len]\n+ *\/\n+ __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_u_long_SID1_is_not_supported); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 294, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__9);\n+ __Pyx_GIVEREF(__pyx_tuple__9);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":321\n * :rtype: bytes\n * \"\"\"\n * return bytes(string.encode('ascii')) # <<<<<<<<<<<<<<\n * \n * \n *\/\n- __pyx_tuple__8 = PyTuple_Pack(1, __pyx_n_u_ascii); if (unlikely(!__pyx_tuple__8)) __PYX_ERR(0, 203, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__8);\n- __Pyx_GIVEREF(__pyx_tuple__8);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":408\n+ __pyx_tuple__12 = PyTuple_Pack(1, __pyx_n_u_ascii); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 321, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__12);\n+ __Pyx_GIVEREF(__pyx_tuple__12);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":566\n * if value_type == 'Null':\n * if value is not None:\n * raise Exception('value must be None for Null type!') # <<<<<<<<<<<<<<\n * return b''\n * elif value_type == \"Integer\":\n *\/\n- __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_u_value_must_be_None_for_Null_type); if (unlikely(!__pyx_tuple__9)) __PYX_ERR(0, 408, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__9);\n- __Pyx_GIVEREF(__pyx_tuple__9);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":502\n+ __pyx_tuple__22 = PyTuple_Pack(1, __pyx_kp_u_value_must_be_None_for_Null_type); if (unlikely(!__pyx_tuple__22)) __PYX_ERR(0, 566, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__22);\n+ __Pyx_GIVEREF(__pyx_tuple__22);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":649\n+ * if msg_type == \"GetBulk\":\n+ * if max_repetitions < 1:\n+ * raise Exception(\"max_repetitions must be higher than 0\") # <<<<<<<<<<<<<<\n+ * nonRepeaters = integer_encode(non_repeaters)\n+ * nonRepeaters_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n+ *\/\n+ __pyx_tuple__28 = PyTuple_Pack(1, __pyx_kp_u_max_repetitions_must_be_higher_t); if (unlikely(!__pyx_tuple__28)) __PYX_ERR(0, 649, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__28);\n+ __Pyx_GIVEREF(__pyx_tuple__28);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":662\n * varbinds_tlv\n * else:\n * error_status = integer_encode(0) # <<<<<<<<<<<<<<\n * error_status_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_status_len = length_encode(len(error_status))\n *\/\n- __pyx_tuple__10 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__10)) __PYX_ERR(0, 502, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__10);\n- __Pyx_GIVEREF(__pyx_tuple__10);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":505\n+ __pyx_tuple__29 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__29)) __PYX_ERR(0, 662, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__29);\n+ __Pyx_GIVEREF(__pyx_tuple__29);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":665\n * error_status_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_status_len = length_encode(len(error_status))\n * error_index = integer_encode(0) # <<<<<<<<<<<<<<\n * error_index_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * error_index_len = length_encode(len(error_index))\n *\/\n- __pyx_tuple__11 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__11)) __PYX_ERR(0, 505, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__11);\n- __Pyx_GIVEREF(__pyx_tuple__11);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":520\n+ __pyx_tuple__30 = PyTuple_Pack(1, __pyx_int_0); if (unlikely(!__pyx_tuple__30)) __PYX_ERR(0, 665, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__30);\n+ __Pyx_GIVEREF(__pyx_tuple__30);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":680\n * community_len = length_encode(len(community))\n * \n * version = integer_encode(1) # <<<<<<<<<<<<<<\n * version_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['PRIMITIVE'], ASN_TYPES['Integer'])\n * version_len = length_encode(len(version))\n *\/\n- __pyx_tuple__12 = PyTuple_Pack(1, __pyx_int_1); if (unlikely(!__pyx_tuple__12)) __PYX_ERR(0, 520, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__12);\n- __Pyx_GIVEREF(__pyx_tuple__12);\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":74\n- * \n- * \n- * def pdu_response_decode(stream): # <<<<<<<<<<<<<<\n- * return sequence_decode(stream)\n- * \n- *\/\n- __pyx_tuple__15 = PyTuple_Pack(1, __pyx_n_s_stream); if (unlikely(!__pyx_tuple__15)) __PYX_ERR(0, 74, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__15);\n- __Pyx_GIVEREF(__pyx_tuple__15);\n- __pyx_codeobj__16 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__15, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_pdu_response_decode, 74, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__16)) __PYX_ERR(0, 74, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":78\n+ __pyx_tuple__31 = PyTuple_Pack(1, __pyx_int_1); if (unlikely(!__pyx_tuple__31)) __PYX_ERR(0, 680, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__31);\n+ __Pyx_GIVEREF(__pyx_tuple__31);\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":136\n * \n * \n * def objectid_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"Decode a stream into an ObjectID.\n- * \n- *\/\n- __pyx_tuple__17 = PyTuple_Pack(6, __pyx_n_s_stream, __pyx_n_s_value, __pyx_n_s_n, __pyx_n_s_bytes_len, __pyx_n_s_subid, __pyx_n_s_val); if (unlikely(!__pyx_tuple__17)) __PYX_ERR(0, 78, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__17);\n- __Pyx_GIVEREF(__pyx_tuple__17);\n- __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(1, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__17, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_objectid_decode, 78, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 78, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":133\n- * return value\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_tuple__36 = PyTuple_Pack(3, __pyx_n_s_stream, __pyx_n_s_stream_char, __pyx_n_s_stream_len); if (unlikely(!__pyx_tuple__36)) __PYX_ERR(0, 136, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__36);\n+ __Pyx_GIVEREF(__pyx_tuple__36);\n+ __pyx_codeobj__2 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__36, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_objectid_decode, 136, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__2)) __PYX_ERR(0, 136, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":267\n+ * return retval\n * \n * def objectid_encode(oid): # <<<<<<<<<<<<<<\n * \"\"\"\n * encode an ObjectID into stream\n *\/\n- __pyx_tuple__19 = PyTuple_Pack(9, __pyx_n_s_oid, __pyx_n_s_number, __pyx_n_s_subid, __pyx_n_s_subid_c, __pyx_n_s_idlist, __pyx_n_s_subidlist, __pyx_n_s_result, __pyx_n_s_subid1, __pyx_n_s_position); if (unlikely(!__pyx_tuple__19)) __PYX_ERR(0, 133, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__19);\n- __Pyx_GIVEREF(__pyx_tuple__19);\n- __pyx_codeobj__20 = (PyObject*)__Pyx_PyCode_New(1, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__19, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_objectid_encode, 133, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__20)) __PYX_ERR(0, 133, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":179\n- * \n- * \n- * def octetstring_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * decode an octetstring into string\n- *\/\n- __pyx_tuple__21 = PyTuple_Pack(1, __pyx_n_s_stream); if (unlikely(!__pyx_tuple__21)) __PYX_ERR(0, 179, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__21);\n- __Pyx_GIVEREF(__pyx_tuple__21);\n- __pyx_codeobj__22 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__21, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_octetstring_decode, 179, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__22)) __PYX_ERR(0, 179, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":194\n+ __pyx_tuple__37 = PyTuple_Pack(9, __pyx_n_s_oid, __pyx_n_s_number, __pyx_n_s_idlist, __pyx_n_s_subidlist, __pyx_n_s_pos, __pyx_n_s_object_len, __pyx_n_s_result, __pyx_n_s_subid, __pyx_n_s_ret); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 267, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__37);\n+ __Pyx_GIVEREF(__pyx_tuple__37);\n+ __pyx_codeobj__3 = (PyObject*)__Pyx_PyCode_New(1, 0, 9, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__37, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_objectid_encode, 267, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__3)) __PYX_ERR(0, 267, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":308\n+ * return <bytes> data[:data_len]\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1): # <<<<<<<<<<<<<<\n+ * return c_octetstring_decode(stream, len(stream), auto_str)\n+ * \n+ *\/\n+ __pyx_tuple__38 = PyTuple_Pack(2, __pyx_n_s_stream, __pyx_n_s_auto_str); if (unlikely(!__pyx_tuple__38)) __PYX_ERR(0, 308, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__38);\n+ __Pyx_GIVEREF(__pyx_tuple__38);\n+ __pyx_codeobj__10 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__38, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_octetstring_decode, 308, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__10)) __PYX_ERR(0, 308, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":312\n * \n * \n * def octetstring_encode(string): # <<<<<<<<<<<<<<\n * \"\"\"\n * encode an octetstring into string\n *\/\n- __pyx_tuple__23 = PyTuple_Pack(1, __pyx_n_s_string); if (unlikely(!__pyx_tuple__23)) __PYX_ERR(0, 194, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__23);\n- __Pyx_GIVEREF(__pyx_tuple__23);\n- __pyx_codeobj__24 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__23, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_octetstring_encode, 194, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__24)) __PYX_ERR(0, 194, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":206\n- * \n- * \n- * def integer_encode(integer): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an integer\n- *\/\n- __pyx_tuple__25 = PyTuple_Pack(1, __pyx_n_s_integer); if (unlikely(!__pyx_tuple__25)) __PYX_ERR(0, 206, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__25);\n- __Pyx_GIVEREF(__pyx_tuple__25);\n- __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__25, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_integer_encode, 206, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 206, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":221\n- * \n- * \n- * def integer_decode(stream): # <<<<<<<<<<<<<<\n+ __pyx_tuple__39 = PyTuple_Pack(1, __pyx_n_s_string); if (unlikely(!__pyx_tuple__39)) __PYX_ERR(0, 312, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__39);\n+ __Pyx_GIVEREF(__pyx_tuple__39);\n+ __pyx_codeobj__11 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__39, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_octetstring_encode, 312, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__11)) __PYX_ERR(0, 312, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":340\n+ * return len\n+ * \n+ * def integer_encode(const uint64_t value): # <<<<<<<<<<<<<<\n+ * # little -> big\n+ * cdef size_t slen, i\n+ *\/\n+ __pyx_tuple__40 = PyTuple_Pack(5, __pyx_n_s_value, __pyx_n_s_value, __pyx_n_s_slen, __pyx_n_s_i, __pyx_n_s_res); if (unlikely(!__pyx_tuple__40)) __PYX_ERR(0, 340, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__40);\n+ __Pyx_GIVEREF(__pyx_tuple__40);\n+ __pyx_codeobj__13 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__40, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_integer_encode, 340, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__13)) __PYX_ERR(0, 340, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":351\n+ * return <bytes> res[:slen]\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n * \"\"\"\n * Decode input stream into a integer\n *\/\n- __pyx_tuple__27 = PyTuple_Pack(1, __pyx_n_s_stream); if (unlikely(!__pyx_tuple__27)) __PYX_ERR(0, 221, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__27);\n- __Pyx_GIVEREF(__pyx_tuple__27);\n- __pyx_codeobj__28 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__27, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_integer_decode, 221, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__28)) __PYX_ERR(0, 221, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":236\n- * \n- * \n- * def sequence_decode(stream): # <<<<<<<<<<<<<<\n+ __pyx_tuple__41 = PyTuple_Pack(5, __pyx_n_s_stream, __pyx_n_s_value, __pyx_n_s_i, __pyx_n_s_stream_len, __pyx_n_s_stream_char); if (unlikely(!__pyx_tuple__41)) __PYX_ERR(0, 351, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__41);\n+ __Pyx_GIVEREF(__pyx_tuple__41);\n+ __pyx_codeobj__14 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__41, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_integer_decode, 351, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__14)) __PYX_ERR(0, 351, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":369\n+ * return value\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n * \"\"\"\n- * Decode input stream into as sequence\n- *\/\n- __pyx_tuple__29 = PyTuple_Pack(6, __pyx_n_s_stream, __pyx_n_s_objects, __pyx_n_s_tag, __pyx_n_s_length, __pyx_n_s_objectData, __pyx_n_s_parsed_objectData); if (unlikely(!__pyx_tuple__29)) __PYX_ERR(0, 236, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__29);\n- __Pyx_GIVEREF(__pyx_tuple__29);\n- __pyx_codeobj__30 = (PyObject*)__Pyx_PyCode_New(1, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__29, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_sequence_decode, 236, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__30)) __PYX_ERR(0, 236, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":277\n- * \n- * \n- * def length_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER length field, returing the length and the\n- *\/\n- __pyx_tuple__31 = PyTuple_Pack(5, __pyx_n_s_stream, __pyx_n_s_length, __pyx_n_s_n, __pyx_n_s_run, __pyx_n_s_i); if (unlikely(!__pyx_tuple__31)) __PYX_ERR(0, 277, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__31);\n- __Pyx_GIVEREF(__pyx_tuple__31);\n- __pyx_codeobj__32 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__31, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_length_decode, 277, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) __PYX_ERR(0, 277, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":301\n+ * Decode input stream into a integer\n+ *\/\n+ __pyx_tuple__42 = PyTuple_Pack(5, __pyx_n_s_stream, __pyx_n_s_value, __pyx_n_s_i, __pyx_n_s_stream_len, __pyx_n_s_stream_char); if (unlikely(!__pyx_tuple__42)) __PYX_ERR(0, 369, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__42);\n+ __Pyx_GIVEREF(__pyx_tuple__42);\n+ __pyx_codeobj__15 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__42, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_integer_decode, 369, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__15)) __PYX_ERR(0, 369, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":392\n+ * return value\n+ * \n+ * def sequence_decode(bytes stream not None) -> list: # <<<<<<<<<<<<<<\n+ * cdef char * stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_tuple__43 = PyTuple_Pack(4, __pyx_n_s_stream, __pyx_n_s_stream_char, __pyx_n_s_stream_len, __pyx_n_s_ret); if (unlikely(!__pyx_tuple__43)) __PYX_ERR(0, 392, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__43);\n+ __Pyx_GIVEREF(__pyx_tuple__43);\n+ __pyx_codeobj__16 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__43, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_sequence_decode, 392, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__16)) __PYX_ERR(0, 392, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":462\n+ * \n+ * \n+ * def length_decode(bytes data): # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length)\n+ *\/\n+ __pyx_tuple__44 = PyTuple_Pack(3, __pyx_n_s_data, __pyx_n_s_encode_length, __pyx_n_s_length); if (unlikely(!__pyx_tuple__44)) __PYX_ERR(0, 462, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__44);\n+ __Pyx_GIVEREF(__pyx_tuple__44);\n+ __pyx_codeobj__17 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__44, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_length_decode, 462, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__17)) __PYX_ERR(0, 462, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":468\n * \n * \n * def length_encode(length): # <<<<<<<<<<<<<<\n * \"\"\"\n * Function takes the length of the contents and\n *\/\n- __pyx_tuple__33 = PyTuple_Pack(4, __pyx_n_s_length, __pyx_n_s_result, __pyx_n_s_resultlist, __pyx_n_s_numOctets); if (unlikely(!__pyx_tuple__33)) __PYX_ERR(0, 301, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__33);\n- __Pyx_GIVEREF(__pyx_tuple__33);\n- __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_length_encode, 301, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) __PYX_ERR(0, 301, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":337\n- * \n- * \n- * def tag_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER tag field, returning the tag and the remainder\n- *\/\n- __pyx_tuple__35 = PyTuple_Pack(4, __pyx_n_s_stream, __pyx_n_s_tag, __pyx_n_s_n, __pyx_n_s_byte); if (unlikely(!__pyx_tuple__35)) __PYX_ERR(0, 337, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__35);\n- __Pyx_GIVEREF(__pyx_tuple__35);\n- __pyx_codeobj__36 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_tag_decode, 337, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__36)) __PYX_ERR(0, 337, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":367\n+ __pyx_tuple__45 = PyTuple_Pack(4, __pyx_n_s_length, __pyx_n_s_result, __pyx_n_s_resultlist, __pyx_n_s_numOctets); if (unlikely(!__pyx_tuple__45)) __PYX_ERR(0, 468, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__45);\n+ __Pyx_GIVEREF(__pyx_tuple__45);\n+ __pyx_codeobj__18 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__45, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_length_encode, 468, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__18)) __PYX_ERR(0, 468, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":518\n+ * return 0\n+ * \n+ * def tag_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length\n+ *\/\n+ __pyx_tuple__46 = PyTuple_Pack(3, __pyx_n_s_stream, __pyx_n_s_tag, __pyx_n_s_encode_length); if (unlikely(!__pyx_tuple__46)) __PYX_ERR(0, 518, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__46);\n+ __Pyx_GIVEREF(__pyx_tuple__46);\n+ __pyx_codeobj__19 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__46, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_tag_decode, 518, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__19)) __PYX_ERR(0, 518, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":525\n * \n * \n * def tag_encode(asn_tag_class, asn_tag_format, asn_tag_number): # <<<<<<<<<<<<<<\n * \"\"\"\n * Returns encoded identifier octets for\n *\/\n- __pyx_tuple__37 = PyTuple_Pack(6, __pyx_n_s_asn_tag_class, __pyx_n_s_asn_tag_format, __pyx_n_s_asn_tag_number, __pyx_n_s_result, __pyx_n_s_resultlist, __pyx_n_s_integer); if (unlikely(!__pyx_tuple__37)) __PYX_ERR(0, 367, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__37);\n- __Pyx_GIVEREF(__pyx_tuple__37);\n- __pyx_codeobj__38 = (PyObject*)__Pyx_PyCode_New(3, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__37, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_tag_encode, 367, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__38)) __PYX_ERR(0, 367, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":402\n+ __pyx_tuple__47 = PyTuple_Pack(6, __pyx_n_s_asn_tag_class, __pyx_n_s_asn_tag_format, __pyx_n_s_asn_tag_number, __pyx_n_s_result, __pyx_n_s_resultlist, __pyx_n_s_integer); if (unlikely(!__pyx_tuple__47)) __PYX_ERR(0, 525, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__47);\n+ __Pyx_GIVEREF(__pyx_tuple__47);\n+ __pyx_codeobj__20 = (PyObject*)__Pyx_PyCode_New(3, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__47, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_tag_encode, 525, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__20)) __PYX_ERR(0, 525, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":560\n * \n * # TODO: implement more encoders\n * def value_encode(value=None, value_type='Null'): # <<<<<<<<<<<<<<\n * \"\"\"\n * Encoded value by ASN.1\n *\/\n- __pyx_tuple__39 = PyTuple_Pack(2, __pyx_n_s_value, __pyx_n_s_value_type); if (unlikely(!__pyx_tuple__39)) __PYX_ERR(0, 402, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__39);\n- __Pyx_GIVEREF(__pyx_tuple__39);\n- __pyx_codeobj__40 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__39, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_value_encode, 402, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__40)) __PYX_ERR(0, 402, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":418\n+ __pyx_tuple__48 = PyTuple_Pack(2, __pyx_n_s_value, __pyx_n_s_value_type); if (unlikely(!__pyx_tuple__48)) __PYX_ERR(0, 560, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__48);\n+ __Pyx_GIVEREF(__pyx_tuple__48);\n+ __pyx_codeobj__21 = (PyObject*)__Pyx_PyCode_New(2, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__48, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_value_encode, 560, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__21)) __PYX_ERR(0, 560, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":576\n * \n * \n * def encode_varbind(oid, value_type='Null', value=None): # <<<<<<<<<<<<<<\n * if value is None:\n * value_type = 'Null'\n *\/\n- __pyx_tuple__41 = PyTuple_Pack(12, __pyx_n_s_oid, __pyx_n_s_value_type, __pyx_n_s_value, __pyx_n_s_obj_id, __pyx_n_s_obj_id_id, __pyx_n_s_obj_id_len, __pyx_n_s_obj_value, __pyx_n_s_obj_value_id, __pyx_n_s_obj_value_len, __pyx_n_s_varbinds_obj, __pyx_n_s_seq_tag, __pyx_n_s_varbind_enc); if (unlikely(!__pyx_tuple__41)) __PYX_ERR(0, 418, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__41);\n- __Pyx_GIVEREF(__pyx_tuple__41);\n- __pyx_codeobj__42 = (PyObject*)__Pyx_PyCode_New(3, 0, 12, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__41, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_encode_varbind, 418, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__42)) __PYX_ERR(0, 418, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":436\n+ __pyx_tuple__49 = PyTuple_Pack(12, __pyx_n_s_oid, __pyx_n_s_value_type, __pyx_n_s_value, __pyx_n_s_obj_id, __pyx_n_s_obj_id_id, __pyx_n_s_obj_id_len, __pyx_n_s_obj_value, __pyx_n_s_obj_value_id, __pyx_n_s_obj_value_len, __pyx_n_s_varbinds_obj, __pyx_n_s_seq_tag, __pyx_n_s_varbind_enc); if (unlikely(!__pyx_tuple__49)) __PYX_ERR(0, 576, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__49);\n+ __Pyx_GIVEREF(__pyx_tuple__49);\n+ __pyx_codeobj__24 = (PyObject*)__Pyx_PyCode_New(3, 0, 12, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__49, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_encode_varbind, 576, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__24)) __PYX_ERR(0, 576, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":594\n * \n * \n * def varbinds_encode(varbinds): # <<<<<<<<<<<<<<\n * res = bytearray()\n * for varbind in varbinds:\n *\/\n- __pyx_tuple__43 = PyTuple_Pack(6, __pyx_n_s_varbinds, __pyx_n_s_res, __pyx_n_s_varbind, __pyx_n_s_oid, __pyx_n_s_value_type, __pyx_n_s_value); if (unlikely(!__pyx_tuple__43)) __PYX_ERR(0, 436, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__43);\n- __Pyx_GIVEREF(__pyx_tuple__43);\n- __pyx_codeobj__44 = (PyObject*)__Pyx_PyCode_New(1, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__43, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_varbinds_encode, 436, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__44)) __PYX_ERR(0, 436, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":452\n+ __pyx_tuple__50 = PyTuple_Pack(6, __pyx_n_s_varbinds, __pyx_n_s_res, __pyx_n_s_varbind, __pyx_n_s_oid, __pyx_n_s_value, __pyx_n_s_value_type); if (unlikely(!__pyx_tuple__50)) __PYX_ERR(0, 594, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__50);\n+ __Pyx_GIVEREF(__pyx_tuple__50);\n+ __pyx_codeobj__25 = (PyObject*)__Pyx_PyCode_New(1, 0, 6, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__50, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_varbinds_encode, 594, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__25)) __PYX_ERR(0, 594, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":610\n * \n * \n * def varbinds_encode_tlv(varbinds): # <<<<<<<<<<<<<<\n * varbinds_data = varbinds_encode(varbinds)\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n *\/\n- __pyx_tuple__45 = PyTuple_Pack(4, __pyx_n_s_varbinds, __pyx_n_s_varbinds_data, __pyx_n_s_varbinds_id, __pyx_n_s_varbinds_len); if (unlikely(!__pyx_tuple__45)) __PYX_ERR(0, 452, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__45);\n- __Pyx_GIVEREF(__pyx_tuple__45);\n- __pyx_codeobj__46 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__45, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_varbinds_encode_tlv, 452, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__46)) __PYX_ERR(0, 452, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":459\n+ __pyx_tuple__51 = PyTuple_Pack(4, __pyx_n_s_varbinds, __pyx_n_s_varbinds_data, __pyx_n_s_varbinds_id, __pyx_n_s_varbinds_len); if (unlikely(!__pyx_tuple__51)) __PYX_ERR(0, 610, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__51);\n+ __Pyx_GIVEREF(__pyx_tuple__51);\n+ __pyx_codeobj__26 = (PyObject*)__Pyx_PyCode_New(1, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__51, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_varbinds_encode_tlv, 610, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__26)) __PYX_ERR(0, 610, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":617\n * \n * \n * def msg_encode(req_id, community, varbinds, msg_type=\"GetBulk\", max_repetitions=10, non_repeaters=0): # <<<<<<<<<<<<<<\n * \"\"\"\n * Build SNMP-message\n *\/\n- __pyx_tuple__47 = PyTuple_Pack(33, __pyx_n_s_req_id, __pyx_n_s_community, __pyx_n_s_varbinds, __pyx_n_s_msg_type, __pyx_n_s_max_repetitions, __pyx_n_s_non_repeaters, __pyx_n_s_varbinds_tlv, __pyx_n_s_requestID_id, __pyx_n_s_requestID, __pyx_n_s_requestID_len, __pyx_n_s_nonRepeaters, __pyx_n_s_nonRepeaters_id, __pyx_n_s_nonRepeaters_len, __pyx_n_s_maxRepetitions, __pyx_n_s_maxRepetitions_id, __pyx_n_s_maxRepetitions_len, __pyx_n_s_pdu, __pyx_n_s_error_status, __pyx_n_s_error_status_id, __pyx_n_s_error_status_len, __pyx_n_s_error_index, __pyx_n_s_error_index_id, __pyx_n_s_error_index_len, __pyx_n_s_pdu_id, __pyx_n_s_pdu_len, __pyx_n_s_community_id, __pyx_n_s_community_len, __pyx_n_s_version, __pyx_n_s_version_id, __pyx_n_s_version_len, __pyx_n_s_snmp_message_seq_id, __pyx_n_s_snmp_message_len, __pyx_n_s_snmp_message); if (unlikely(!__pyx_tuple__47)) __PYX_ERR(0, 459, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__47);\n- __Pyx_GIVEREF(__pyx_tuple__47);\n- __pyx_codeobj__48 = (PyObject*)__Pyx_PyCode_New(6, 0, 33, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__47, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_msg_encode, 459, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__48)) __PYX_ERR(0, 459, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":536\n+ __pyx_tuple__52 = PyTuple_Pack(33, __pyx_n_s_req_id, __pyx_n_s_community, __pyx_n_s_varbinds, __pyx_n_s_msg_type, __pyx_n_s_max_repetitions, __pyx_n_s_non_repeaters, __pyx_n_s_varbinds_tlv, __pyx_n_s_requestID_id, __pyx_n_s_requestID, __pyx_n_s_requestID_len, __pyx_n_s_nonRepeaters, __pyx_n_s_nonRepeaters_id, __pyx_n_s_nonRepeaters_len, __pyx_n_s_maxRepetitions, __pyx_n_s_maxRepetitions_id, __pyx_n_s_maxRepetitions_len, __pyx_n_s_pdu, __pyx_n_s_error_status, __pyx_n_s_error_status_id, __pyx_n_s_error_status_len, __pyx_n_s_error_index, __pyx_n_s_error_index_id, __pyx_n_s_error_index_len, __pyx_n_s_pdu_id, __pyx_n_s_pdu_len, __pyx_n_s_community_id, __pyx_n_s_community_len, __pyx_n_s_version, __pyx_n_s_version_id, __pyx_n_s_version_len, __pyx_n_s_snmp_message_seq_id, __pyx_n_s_snmp_message_len, __pyx_n_s_snmp_message); if (unlikely(!__pyx_tuple__52)) __PYX_ERR(0, 617, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__52);\n+ __Pyx_GIVEREF(__pyx_tuple__52);\n+ __pyx_codeobj__27 = (PyObject*)__Pyx_PyCode_New(6, 0, 33, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__52, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_msg_encode, 617, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__27)) __PYX_ERR(0, 617, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":696\n * \n * \n * def msg_decode(stream): # <<<<<<<<<<<<<<\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n- *\/\n- __pyx_tuple__49 = PyTuple_Pack(11, __pyx_n_s_stream, __pyx_n_s_tag, __pyx_n_s_length, __pyx_n_s_objectData, __pyx_n_s_snmp_ver, __pyx_n_s_community, __pyx_n_s_data, __pyx_n_s_req_id, __pyx_n_s_error_status, __pyx_n_s_error_index, __pyx_n_s_varbinds); if (unlikely(!__pyx_tuple__49)) __PYX_ERR(0, 536, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__49);\n- __Pyx_GIVEREF(__pyx_tuple__49);\n- __pyx_codeobj__50 = (PyObject*)__Pyx_PyCode_New(1, 0, 11, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__49, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_msg_decode, 536, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__50)) __PYX_ERR(0, 536, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n- *\/\n- __pyx_tuple__51 = PyTuple_Pack(22, __pyx_n_s_var_bind_list, __pyx_n_s_orig_main_oids, __pyx_n_s_oids_to_poll, __pyx_n_s_result, __pyx_n_s_next_oids, __pyx_n_s_rest_oids_positions, __pyx_n_s_main_oids_len, __pyx_n_s_main_oids_positions, __pyx_n_s_var_bind_list_len, __pyx_n_s_skip_column, __pyx_n_s_last_seen_index, __pyx_n_s_var_bind_pos, __pyx_n_s_item, __pyx_n_s_oid, __pyx_n_s_value, __pyx_n_s_e, __pyx_n_s_main_oids_pos, __pyx_n_s_main_oid, __pyx_n_s_index_part, __pyx_n_s_pos, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__51)) __PYX_ERR(0, 546, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_tuple__51);\n- __Pyx_GIVEREF(__pyx_tuple__51);\n- __pyx_codeobj__52 = (PyObject*)__Pyx_PyCode_New(3, 0, 22, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__51, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_parse_varbind, 546, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__52)) __PYX_ERR(0, 546, __pyx_L1_error)\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length, length\n+ *\/\n+ __pyx_tuple__53 = PyTuple_Pack(14, __pyx_n_s_stream, __pyx_n_s_tag, __pyx_n_s_encode_length, __pyx_n_s_length, __pyx_n_s_stream_char, __pyx_n_s_stream_ptr, __pyx_n_s_stream_len, __pyx_n_s_data, __pyx_n_s_snmp_ver, __pyx_n_s_community, __pyx_n_s_req_id, __pyx_n_s_error_status, __pyx_n_s_error_index, __pyx_n_s_varbinds); if (unlikely(!__pyx_tuple__53)) __PYX_ERR(0, 696, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__53);\n+ __Pyx_GIVEREF(__pyx_tuple__53);\n+ __pyx_codeobj__32 = (PyObject*)__Pyx_PyCode_New(1, 0, 14, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__53, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_msg_decode, 696, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) __PYX_ERR(0, 696, __pyx_L1_error)\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":713\n+ * \n+ * \n+ * def parse_varbind(list var_bind_list not None, tuple orig_main_oids not None, tuple oids_to_poll not None): # <<<<<<<<<<<<<<\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item\n+ *\/\n+ __pyx_tuple__54 = PyTuple_Pack(23, __pyx_n_s_var_bind_list, __pyx_n_s_orig_main_oids, __pyx_n_s_oids_to_poll, __pyx_n_s_oid, __pyx_n_s_main_oid, __pyx_n_s_index_part, __pyx_n_s_result, __pyx_n_s_item, __pyx_n_s_next_oids, __pyx_n_s_orig_main_oids_doted, __pyx_n_s_orig_main_oids_len, __pyx_n_s_value, __pyx_n_s_rest_oids_positions, __pyx_n_s_main_oids_len, __pyx_n_s_main_oids_positions, __pyx_n_s_var_bind_list_len, __pyx_n_s_i, __pyx_n_s_skip_column, __pyx_n_s_last_seen_index, __pyx_n_s_var_bind_pos, __pyx_n_s_e, __pyx_n_s_main_oids_pos, __pyx_n_s_pos); if (unlikely(!__pyx_tuple__54)) __PYX_ERR(0, 713, __pyx_L1_error)\n+ __Pyx_GOTREF(__pyx_tuple__54);\n+ __Pyx_GIVEREF(__pyx_tuple__54);\n+ __pyx_codeobj__33 = (PyObject*)__Pyx_PyCode_New(3, 0, 23, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__54, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_home_gescheit_workspace_fastsnm, __pyx_n_s_parse_varbind, 713, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__33)) __PYX_ERR(0, 713, __pyx_L1_error)\n __Pyx_RefNannyFinishContext();\n return 0;\n __pyx_L1_error:;\n@@ -11743,7 +12280,6 @@\n }\n \n static int __Pyx_InitGlobals(void) {\n- __pyx_umethod_PyList_Type_pop.type = (PyObject*)&PyList_Type;\n if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error);\n __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) __PYX_ERR(0, 1, __pyx_L1_error)\n@@ -11752,24 +12288,14 @@\n __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_5 = PyInt_FromLong(5); if (unlikely(!__pyx_int_5)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_7 = PyInt_FromLong(7); if (unlikely(!__pyx_int_7)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_8 = PyInt_FromLong(8); if (unlikely(!__pyx_int_8)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_10 = PyInt_FromLong(10); if (unlikely(!__pyx_int_10)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_16 = PyInt_FromLong(16); if (unlikely(!__pyx_int_16)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_31 = PyInt_FromLong(31); if (unlikely(!__pyx_int_31)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_32 = PyInt_FromLong(32); if (unlikely(!__pyx_int_32)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_40 = PyInt_FromLong(40); if (unlikely(!__pyx_int_40)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_48 = PyInt_FromLong(48); if (unlikely(!__pyx_int_48)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_64 = PyInt_FromLong(64); if (unlikely(!__pyx_int_64)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_65 = PyInt_FromLong(65); if (unlikely(!__pyx_int_65)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_66 = PyInt_FromLong(66); if (unlikely(!__pyx_int_66)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_67 = PyInt_FromLong(67); if (unlikely(!__pyx_int_67)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_70 = PyInt_FromLong(70); if (unlikely(!__pyx_int_70)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_127 = PyInt_FromLong(127); if (unlikely(!__pyx_int_127)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_128 = PyInt_FromLong(128); if (unlikely(!__pyx_int_128)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_129 = PyInt_FromLong(129); if (unlikely(!__pyx_int_129)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_130 = PyInt_FromLong(130); if (unlikely(!__pyx_int_130)) __PYX_ERR(0, 1, __pyx_L1_error)\n- __pyx_int_162 = PyInt_FromLong(162); if (unlikely(!__pyx_int_162)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_192 = PyInt_FromLong(192); if (unlikely(!__pyx_int_192)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_255 = PyInt_FromLong(255); if (unlikely(!__pyx_int_255)) __PYX_ERR(0, 1, __pyx_L1_error)\n __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) __PYX_ERR(0, 1, __pyx_L1_error)\n@@ -11786,10 +12312,253 @@\n PyMODINIT_FUNC PyInit_snmp_parser(void)\n #endif\n {\n+ __Pyx_TraceDeclarations\n PyObject *__pyx_t_1 = NULL;\n PyObject *__pyx_t_2 = NULL;\n PyObject *__pyx_t_3 = NULL;\n PyObject *__pyx_t_4 = NULL;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_5;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_6;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_7;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_8;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_9;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_10;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_11;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_12;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_13;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_14;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_15;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_16;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_17;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_18;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_19;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_20;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_21;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_22;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_23;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_24;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_25;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_26;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_27;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_28;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_29;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_30;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_31;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_32;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_33;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_34;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_35;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_36;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_37;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_38;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_39;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_40;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_41;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_42;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_43;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_44;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_45;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_46;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_47;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_48;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_49;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_50;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_51;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_52;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_53;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_54;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_55;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_56;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_57;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_58;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_59;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_60;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_61;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_62;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_63;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_64;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_65;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_66;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_67;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_68;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_69;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_70;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_71;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_72;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_73;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_74;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_75;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_76;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_77;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_78;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_79;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_80;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_81;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_82;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_83;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_84;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_85;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_86;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_87;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_88;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_89;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_90;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_91;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_92;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_93;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_94;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_95;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_96;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_97;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_98;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_99;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_100;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_101;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_102;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_103;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_104;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_105;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_106;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_107;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_108;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_109;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_110;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_111;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_112;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_113;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_114;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_115;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_116;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_117;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_118;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_119;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_120;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_121;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_122;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_123;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_124;\n+ static struct __pyx_t_8fastsnmp_11snmp_parser_SID12_ti __pyx_t_125[120];\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_126;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_127;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_128;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_129;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_130;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_131;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_132;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_133;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_134;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_135;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_136;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_137;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_138;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_139;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_140;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_141;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_142;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_143;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_144;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_145;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_146;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_147;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_148;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_149;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_150;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_151;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_152;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_153;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_154;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_155;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_156;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_157;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_158;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_159;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_160;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_161;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_162;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_163;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_164;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_165;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_166;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_167;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_168;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_169;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_170;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_171;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_172;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_173;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_174;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_175;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_176;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_177;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_178;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_179;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_180;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_181;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_182;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_183;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_184;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_185;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_186;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_187;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_188;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_189;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_190;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_191;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_192;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_193;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_194;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_195;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_196;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_197;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_198;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_199;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_200;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_201;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_202;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_203;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_204;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_205;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_206;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_207;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_208;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_209;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_210;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_211;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_212;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_213;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_214;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_215;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_216;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_217;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_218;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_219;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_220;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_221;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_222;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_223;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_224;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_225;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_226;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_227;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_228;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_229;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_230;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_231;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_232;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_233;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_234;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_235;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_236;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_237;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_238;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_239;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_240;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_241;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_242;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_243;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_244;\n+ struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_245;\n+ static struct __pyx_t_8fastsnmp_11snmp_parser_SID12_t __pyx_t_246[120];\n __Pyx_RefNannyDeclarations\n #if CYTHON_REFNANNY\n __Pyx_RefNanny = __Pyx_RefNannyImportAPI(\"refnanny\");\n@@ -11865,729 +12634,1213 @@\n \/*--- Variable export code ---*\/\n \/*--- Function export code ---*\/\n \/*--- Type init code ---*\/\n- if (PyType_Ready(&__pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind) < 0) __PYX_ERR(0, 546, __pyx_L1_error)\n- __pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind.tp_print = 0;\n- __pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind = &__pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct__parse_varbind;\n- if (PyType_Ready(&__pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr) < 0) __PYX_ERR(0, 594, __pyx_L1_error)\n- __pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr.tp_print = 0;\n- __pyx_ptype_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr = &__pyx_type_8fastsnmp_11snmp_parser___pyx_scope_struct_1_genexpr;\n \/*--- Type import code ---*\/\n+ __pyx_ptype_7cpython_4type_type = __Pyx_ImportType(__Pyx_BUILTIN_MODULE_NAME, \"type\", \n+ #if CYTHON_COMPILING_IN_PYPY\n+ sizeof(PyTypeObject),\n+ #else\n+ sizeof(PyHeapTypeObject),\n+ #endif\n+ 0); if (unlikely(!__pyx_ptype_7cpython_4type_type)) __PYX_ERR(1, 9, __pyx_L1_error)\n \/*--- Variable import code ---*\/\n \/*--- Function import code ---*\/\n \/*--- Execution code ---*\/\n #if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)\n if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)\n #endif\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":6\n- * # -*- coding: utf-8 -*-\n- * # based on https:\/\/pypi.python.org\/pypi\/libsnmp\/\n- * import binascii # <<<<<<<<<<<<<<\n- * from itertools import cycle\n- * DEBUG = True\n- *\/\n- __pyx_t_1 = __Pyx_Import(__pyx_n_s_binascii, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 6, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_binascii, __pyx_t_1) < 0) __PYX_ERR(0, 6, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":7\n- * # based on https:\/\/pypi.python.org\/pypi\/libsnmp\/\n- * import binascii\n+ __Pyx_TraceCall(\"PyMODINIT_FUNC PyInit_snmp_parser(void)\", __pyx_f[0], 1, 0, __PYX_ERR(0, 1, __pyx_L1_error));\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":17\n+ * from libc.stdio cimport sprintf\n+ * from libc.string cimport memcpy\n * from itertools import cycle # <<<<<<<<<<<<<<\n- * DEBUG = True\n- * \n- *\/\n- __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 7, __pyx_L1_error)\n+ * from libc.stdint cimport uint64_t, int64_t, uint32_t, uint8_t\n+ * \n+ *\/\n+ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_INCREF(__pyx_n_s_cycle);\n __Pyx_GIVEREF(__pyx_n_s_cycle);\n PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_cycle);\n- __pyx_t_2 = __Pyx_Import(__pyx_n_s_itertools, __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 7, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_Import(__pyx_n_s_itertools, __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 17, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_cycle); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 7, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_cycle); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 17, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_cycle, __pyx_t_1) < 0) __PYX_ERR(0, 7, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_cycle, __pyx_t_1) < 0) __PYX_ERR(0, 17, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":8\n- * import binascii\n- * from itertools import cycle\n- * DEBUG = True # <<<<<<<<<<<<<<\n- * \n- * \n- *\/\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_DEBUG, Py_True) < 0) __PYX_ERR(0, 8, __pyx_L1_error)\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":11\n- * \n+ \/* \"fastsnmp\/snmp_parser.pyx\":22\n+ * DEF MAX_OID_LEN_STR=500\n * \n * class SNMPException(Exception): # <<<<<<<<<<<<<<\n * pass\n * \n *\/\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error)\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 22, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_INCREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));\n __Pyx_GIVEREF(((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));\n PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)(&((PyTypeObject*)PyExc_Exception)[0])));\n- __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 11, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 22, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_SNMPException, __pyx_n_s_SNMPException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 11, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_SNMPException, __pyx_n_s_SNMPException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 22, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_SNMPException, __pyx_t_2, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 11, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_SNMPException, __pyx_t_2, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 22, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_SNMPException, __pyx_t_4) < 0) __PYX_ERR(0, 11, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_SNMPException, __pyx_t_4) < 0) __PYX_ERR(0, 22, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":15\n+ \/* \"fastsnmp\/snmp_parser.pyx\":26\n * \n * \n * class VarBindUnpackException(SNMPException): # <<<<<<<<<<<<<<\n * pass\n * \n *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_SNMPException); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 15, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_SNMPException); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 15, __pyx_L1_error)\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n __Pyx_GIVEREF(__pyx_t_2);\n PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);\n __pyx_t_2 = 0;\n- __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 15, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_VarBindUnpackException, __pyx_n_s_VarBindUnpackException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 15, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_1, __pyx_n_s_VarBindUnpackException, __pyx_n_s_VarBindUnpackException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_VarBindUnpackException, __pyx_t_1, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 15, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_VarBindUnpackException, __pyx_t_1, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_VarBindUnpackException, __pyx_t_4) < 0) __PYX_ERR(0, 15, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_VarBindUnpackException, __pyx_t_4) < 0) __PYX_ERR(0, 26, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":19\n+ \/* \"fastsnmp\/snmp_parser.pyx\":30\n * \n * \n * class VarBindContentException(SNMPException): # <<<<<<<<<<<<<<\n * pass\n * \n *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_SNMPException); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_SNMPException); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 19, __pyx_L1_error)\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n __Pyx_GIVEREF(__pyx_t_1);\n PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n __pyx_t_1 = 0;\n- __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 19, __pyx_L1_error)\n+ __pyx_t_1 = __Pyx_CalculateMetaclass(NULL, __pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_1);\n- __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_VarBindContentException, __pyx_n_s_VarBindContentException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 19, __pyx_L1_error)\n+ __pyx_t_3 = __Pyx_Py3MetaclassPrepare(__pyx_t_1, __pyx_t_2, __pyx_n_s_VarBindContentException, __pyx_n_s_VarBindContentException, (PyObject *) NULL, __pyx_n_s_fastsnmp_snmp_parser, (PyObject *) NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_3);\n- __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_VarBindContentException, __pyx_t_2, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 19, __pyx_L1_error)\n+ __pyx_t_4 = __Pyx_Py3ClassCreate(__pyx_t_1, __pyx_n_s_VarBindContentException, __pyx_t_2, __pyx_t_3, NULL, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_4);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_VarBindContentException, __pyx_t_4) < 0) __PYX_ERR(0, 19, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_VarBindContentException, __pyx_t_4) < 0) __PYX_ERR(0, 30, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":26\n+ \/* \"fastsnmp\/snmp_parser.pyx\":35\n * \n * asnTagClasses = {\n * 'UNIVERSAL': 0x00, # <<<<<<<<<<<<<<\n * 'APPLICATION': 0x40,\n * 'CONTEXT': 0x80,\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 26, __pyx_L1_error)\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 35, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_UNIVERSAL, __pyx_int_0) < 0) __PYX_ERR(0, 26, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_APPLICATION, __pyx_int_64) < 0) __PYX_ERR(0, 26, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_CONTEXT, __pyx_int_128) < 0) __PYX_ERR(0, 26, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_PRIVATE, __pyx_int_192) < 0) __PYX_ERR(0, 26, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_asnTagClasses, __pyx_t_2) < 0) __PYX_ERR(0, 25, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_UNIVERSAL, __pyx_int_0) < 0) __PYX_ERR(0, 35, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_APPLICATION, __pyx_int_64) < 0) __PYX_ERR(0, 35, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_CONTEXT, __pyx_int_128) < 0) __PYX_ERR(0, 35, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_PRIVATE, __pyx_int_192) < 0) __PYX_ERR(0, 35, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_asnTagClasses, __pyx_t_2) < 0) __PYX_ERR(0, 34, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":33\n+ \/* \"fastsnmp\/snmp_parser.pyx\":42\n * \n * asnTagFormats = {\n * 'PRIMITIVE': 0x00, # <<<<<<<<<<<<<<\n * 'CONSTRUCTED': 0x20\n * }\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 33, __pyx_L1_error)\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 42, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_PRIMITIVE, __pyx_int_0) < 0) __PYX_ERR(0, 33, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_CONSTRUCTED, __pyx_int_32) < 0) __PYX_ERR(0, 33, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_asnTagFormats, __pyx_t_2) < 0) __PYX_ERR(0, 32, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_PRIMITIVE, __pyx_int_0) < 0) __PYX_ERR(0, 42, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_CONSTRUCTED, __pyx_int_32) < 0) __PYX_ERR(0, 42, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_asnTagFormats, __pyx_t_2) < 0) __PYX_ERR(0, 41, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":38\n+ \/* \"fastsnmp\/snmp_parser.pyx\":47\n * \n * ASN_TYPES = {\n * 'Integer': 0x02, # <<<<<<<<<<<<<<\n * 'OctetString': 0x04,\n * 'Null': 0x05,\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 38, __pyx_L1_error)\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 47, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Integer, __pyx_int_2) < 0) __PYX_ERR(0, 38, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_OctetString, __pyx_int_4) < 0) __PYX_ERR(0, 38, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Null, __pyx_int_5) < 0) __PYX_ERR(0, 38, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_ObjectID, __pyx_int_6) < 0) __PYX_ERR(0, 38, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Sequence, __pyx_int_16) < 0) __PYX_ERR(0, 38, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_TYPES, __pyx_t_2) < 0) __PYX_ERR(0, 37, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Integer, __pyx_int_2) < 0) __PYX_ERR(0, 47, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_OctetString, __pyx_int_4) < 0) __PYX_ERR(0, 47, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Null, __pyx_int_5) < 0) __PYX_ERR(0, 47, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_ObjectID, __pyx_int_6) < 0) __PYX_ERR(0, 47, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Sequence, __pyx_int_16) < 0) __PYX_ERR(0, 47, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_TYPES, __pyx_t_2) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":46\n+ \/* \"fastsnmp\/snmp_parser.pyx\":55\n * \n * ASN_SNMP_APPLICATION = {\n * 'IPAddress': 0x00, # <<<<<<<<<<<<<<\n * 'Counter': 0x01,\n * 'Guage': 0x02,\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 46, __pyx_L1_error)\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 55, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_IPAddress, __pyx_int_0) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Counter, __pyx_int_1) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Guage, __pyx_int_2) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_TimeTicks, __pyx_int_3) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Opaque, __pyx_int_4) < 0) __PYX_ERR(0, 46, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_SNMP_APPLICATION, __pyx_t_2) < 0) __PYX_ERR(0, 45, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_IPAddress, __pyx_int_0) < 0) __PYX_ERR(0, 55, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Counter, __pyx_int_1) < 0) __PYX_ERR(0, 55, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Guage, __pyx_int_2) < 0) __PYX_ERR(0, 55, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_TimeTicks, __pyx_int_3) < 0) __PYX_ERR(0, 55, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Opaque, __pyx_int_4) < 0) __PYX_ERR(0, 55, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_SNMP_APPLICATION, __pyx_t_2) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":54\n+ \/* \"fastsnmp\/snmp_parser.pyx\":63\n * \n * ASN_SNMP_MSG_TYPES ={\n * 'Get': 0x00, # <<<<<<<<<<<<<<\n * 'GetNext': 0x01,\n * 'Response': 0x02,\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 54, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Get, __pyx_int_0) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_GetNext, __pyx_int_1) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Response, __pyx_int_2) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Set, __pyx_int_3) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Trap, __pyx_int_4) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_GetBulk, __pyx_int_5) < 0) __PYX_ERR(0, 54, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_SNMP_MSG_TYPES, __pyx_t_2) < 0) __PYX_ERR(0, 53, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":63\n- * \n- * # caches\n- * id_cache = {} # <<<<<<<<<<<<<<\n- * tag_cache = {}\n- * integer_decode_cache = {b'\\x00': 0, b'\\x01': 1}\n- *\/\n __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 63, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_id_cache, __pyx_t_2) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Get, __pyx_int_0) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_GetNext, __pyx_int_1) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Response, __pyx_int_2) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Set, __pyx_int_3) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_Trap, __pyx_int_4) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_u_GetBulk, __pyx_int_5) < 0) __PYX_ERR(0, 63, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_ASN_SNMP_MSG_TYPES, __pyx_t_2) < 0) __PYX_ERR(0, 62, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":64\n+ \/* \"fastsnmp\/snmp_parser.pyx\":72\n+ * \n * # caches\n- * id_cache = {}\n- * tag_cache = {} # <<<<<<<<<<<<<<\n- * integer_decode_cache = {b'\\x00': 0, b'\\x01': 1}\n- * integer_encode_cache = {0: b'\\x00', 1: b'\\x01'}\n- *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 64, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_tag_cache, __pyx_t_2) < 0) __PYX_ERR(0, 64, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":65\n- * id_cache = {}\n- * tag_cache = {}\n- * integer_decode_cache = {b'\\x00': 0, b'\\x01': 1} # <<<<<<<<<<<<<<\n- * integer_encode_cache = {0: b'\\x00', 1: b'\\x01'}\n- * sequence_cache = {}\n- *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 65, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_kp_b__13, __pyx_int_0) < 0) __PYX_ERR(0, 65, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_kp_b__14, __pyx_int_1) < 0) __PYX_ERR(0, 65, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_decode_cache, __pyx_t_2) < 0) __PYX_ERR(0, 65, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":66\n- * tag_cache = {}\n- * integer_decode_cache = {b'\\x00': 0, b'\\x01': 1}\n- * integer_encode_cache = {0: b'\\x00', 1: b'\\x01'} # <<<<<<<<<<<<<<\n- * sequence_cache = {}\n- * \n- *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 66, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_0, __pyx_kp_b__13) < 0) __PYX_ERR(0, 66, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_1, __pyx_kp_b__14) < 0) __PYX_ERR(0, 66, __pyx_L1_error)\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_encode_cache, __pyx_t_2) < 0) __PYX_ERR(0, 66, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":67\n- * integer_decode_cache = {b'\\x00': 0, b'\\x01': 1}\n- * integer_encode_cache = {0: b'\\x00', 1: b'\\x01'}\n- * sequence_cache = {} # <<<<<<<<<<<<<<\n- * \n- * length_cache = {}\n- *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 67, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_sequence_cache, __pyx_t_2) < 0) __PYX_ERR(0, 67, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":69\n- * sequence_cache = {}\n- * \n * length_cache = {} # <<<<<<<<<<<<<<\n * length_cache[0] = b'\\x00'\n * length_cache[1] = b'\\x01'\n *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 69, __pyx_L1_error)\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 72, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_cache, __pyx_t_2) < 0) __PYX_ERR(0, 69, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_cache, __pyx_t_2) < 0) __PYX_ERR(0, 72, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":70\n- * \n+ \/* \"fastsnmp\/snmp_parser.pyx\":73\n+ * # caches\n * length_cache = {}\n * length_cache[0] = b'\\x00' # <<<<<<<<<<<<<<\n * length_cache[1] = b'\\x01'\n * \n *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 73, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (unlikely(__Pyx_SetItemInt(__pyx_t_2, 0, __pyx_kp_b__13, long, 1, __Pyx_PyInt_From_long, 0, 0, 1) < 0)) __PYX_ERR(0, 70, __pyx_L1_error)\n+ if (unlikely(__Pyx_SetItemInt(__pyx_t_2, 0, __pyx_kp_b__34, long, 1, __Pyx_PyInt_From_long, 0, 0, 0) < 0)) __PYX_ERR(0, 73, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":71\n+ \/* \"fastsnmp\/snmp_parser.pyx\":74\n * length_cache = {}\n * length_cache[0] = b'\\x00'\n * length_cache[1] = b'\\x01' # <<<<<<<<<<<<<<\n * \n- * \n- *\/\n- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 71, __pyx_L1_error)\n+ * # sub id 1 and 2 bytes\n+ *\/\n+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_length_cache); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (unlikely(__Pyx_SetItemInt(__pyx_t_2, 1, __pyx_kp_b__14, long, 1, __Pyx_PyInt_From_long, 0, 0, 1) < 0)) __PYX_ERR(0, 71, __pyx_L1_error)\n+ if (unlikely(__Pyx_SetItemInt(__pyx_t_2, 1, __pyx_kp_b__35, long, 1, __Pyx_PyInt_From_long, 0, 0, 0) < 0)) __PYX_ERR(0, 74, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":74\n- * \n- * \n- * def pdu_response_decode(stream): # <<<<<<<<<<<<<<\n- * return sequence_decode(stream)\n- * \n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_1pdu_response_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 74, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":87\n+ * char *str\n+ * \n+ * cdef SID12_ti *sid12i = [{'SID1': 0, 'SID2': 0},{'SID1': 0, 'SID2': 1},{'SID1': 0, 'SID2': 2},{'SID1': 0, 'SID2': 3},{'SID1': 0, 'SID2': 4},{'SID1': 0, 'SID2': 5},{'SID1': 0, 'SID2': 6},{'SID1': 0, 'SID2': 7},{'SID1': 0, 'SID2': 8},{'SID1': 0, 'SID2': 9},{'SID1': 0, 'SID2': 10},{'SID1': 0, 'SID2': 11},{'SID1': 0, 'SID2': 12},{'SID1': 0, 'SID2': 13},{'SID1': 0, 'SID2': 14},{'SID1': 0, 'SID2': 15},{'SID1': 0, 'SID2': 16},{'SID1': 0, 'SID2': 17},{'SID1': 0, 'SID2': 18},{'SID1': 0, 'SID2': 19},{'SID1': 0, 'SID2': 20},{'SID1': 0, 'SID2': 21},{'SID1': 0, 'SID2': 22},{'SID1': 0, 'SID2': 23},{'SID1': 0, 'SID2': 24},{'SID1': 0, 'SID2': 25},{'SID1': 0, 'SID2': 26},{'SID1': 0, 'SID2': 27},{'SID1': 0, 'SID2': 28},{'SID1': 0, 'SID2': 29},{'SID1': 0, 'SID2': 30},{'SID1': 0, 'SID2': 31},{'SID1': 0, 'SID2': 32},{'SID1': 0, 'SID2': 33},{'SID1': 0, 'SID2': 34},{'SID1': 0, 'SID2': 35},{'SID1': 0, 'SID2': 36},{'SID1': 0, 'SID2': 37},{'SID1': 0, 'SID2': 38},{'SID1': 0, 'SID2': 39},{'SID1': 1, 'SID2': 0},{'SID1': 1, 'SID2': 1},{'SID1': 1, 'SID2': 2},{'SID1': 1, 'SID2': 3},{'SID1': 1, 'SID2': 4},{'SID1': 1, 'SID2': 5},{'SID1': 1, 'SID2': 6},{'SID1': 1, 'SID2': 7},{'SID1': 1, 'SID2': 8},{'SID1': 1, 'SID2': 9},{'SID1': 1, 'SID2': 10},{'SID1': 1, 'SID2': 11},{'SID1': 1, 'SID2': 12},{'SID1': 1, 'SID2': 13},{'SID1': 1, 'SID2': 14},{'SID1': 1, 'SID2': 15},{'SID1': 1, 'SID2': 16},{'SID1': 1, 'SID2': 17},{'SID1': 1, 'SID2': 18},{'SID1': 1, 'SID2': 19},{'SID1': 1, 'SID2': 20},{'SID1': 1, 'SID2': 21},{'SID1': 1, 'SID2': 22},{'SID1': 1, 'SID2': 23},{'SID1': 1, 'SID2': 24},{'SID1': 1, 'SID2': 25},{'SID1': 1, 'SID2': 26},{'SID1': 1, 'SID2': 27},{'SID1': 1, 'SID2': 28},{'SID1': 1, 'SID2': 29},{'SID1': 1, 'SID2': 30},{'SID1': 1, 'SID2': 31},{'SID1': 1, 'SID2': 32},{'SID1': 1, 'SID2': 33},{'SID1': 1, 'SID2': 34},{'SID1': 1, 'SID2': 35},{'SID1': 1, 'SID2': 36},{'SID1': 1, 'SID2': 37},{'SID1': 1, 'SID2': 38},{'SID1': 1, 'SID2': 39},{'SID1': 2, 'SID2': 0},{'SID1': 2, 'SID2': 1},{'SID1': 2, 'SID2': 2},{'SID1': 2, 'SID2': 3},{'SID1': 2, 'SID2': 4},{'SID1': 2, 'SID2': 5},{'SID1': 2, 'SID2': 6},{'SID1': 2, 'SID2': 7},{'SID1': 2, 'SID2': 8},{'SID1': 2, 'SID2': 9},{'SID1': 2, 'SID2': 10},{'SID1': 2, 'SID2': 11},{'SID1': 2, 'SID2': 12},{'SID1': 2, 'SID2': 13},{'SID1': 2, 'SID2': 14},{'SID1': 2, 'SID2': 15},{'SID1': 2, 'SID2': 16},{'SID1': 2, 'SID2': 17},{'SID1': 2, 'SID2': 18},{'SID1': 2, 'SID2': 19},{'SID1': 2, 'SID2': 20},{'SID1': 2, 'SID2': 21},{'SID1': 2, 'SID2': 22},{'SID1': 2, 'SID2': 23},{'SID1': 2, 'SID2': 24},{'SID1': 2, 'SID2': 25},{'SID1': 2, 'SID2': 26},{'SID1': 2, 'SID2': 27},{'SID1': 2, 'SID2': 28},{'SID1': 2, 'SID2': 29},{'SID1': 2, 'SID2': 30},{'SID1': 2, 'SID2': 31},{'SID1': 2, 'SID2': 32},{'SID1': 2, 'SID2': 33},{'SID1': 2, 'SID2': 34},{'SID1': 2, 'SID2': 35},{'SID1': 2, 'SID2': 36},{'SID1': 2, 'SID2': 37},{'SID1': 2, 'SID2': 38},{'SID1': 2, 'SID2': 39}] # <<<<<<<<<<<<<<\n+ * cdef SID12_t *sid12s = [{'str': b'0.0\\x00', 'strlen': 3},{'str': b'0.1\\x00', 'strlen': 3},{'str': b'0.2\\x00', 'strlen': 3},{'str': b'0.3\\x00', 'strlen': 3},{'str': b'0.4\\x00', 'strlen': 3},{'str': b'0.5\\x00', 'strlen': 3},{'str': b'0.6\\x00', 'strlen': 3},{'str': b'0.7\\x00', 'strlen': 3},{'str': b'0.8\\x00', 'strlen': 3},{'str': b'0.9\\x00', 'strlen': 3},{'str': b'0.10', 'strlen': 4},{'str': b'0.11', 'strlen': 4},{'str': b'0.12', 'strlen': 4},{'str': b'0.13', 'strlen': 4},{'str': b'0.14', 'strlen': 4},{'str': b'0.15', 'strlen': 4},{'str': b'0.16', 'strlen': 4},{'str': b'0.17', 'strlen': 4},{'str': b'0.18', 'strlen': 4},{'str': b'0.19', 'strlen': 4},{'str': b'0.20', 'strlen': 4},{'str': b'0.21', 'strlen': 4},{'str': b'0.22', 'strlen': 4},{'str': b'0.23', 'strlen': 4},{'str': b'0.24', 'strlen': 4},{'str': b'0.25', 'strlen': 4},{'str': b'0.26', 'strlen': 4},{'str': b'0.27', 'strlen': 4},{'str': b'0.28', 'strlen': 4},{'str': b'0.29', 'strlen': 4},{'str': b'0.30', 'strlen': 4},{'str': b'0.31', 'strlen': 4},{'str': b'0.32', 'strlen': 4},{'str': b'0.33', 'strlen': 4},{'str': b'0.34', 'strlen': 4},{'str': b'0.35', 'strlen': 4},{'str': b'0.36', 'strlen': 4},{'str': b'0.37', 'strlen': 4},{'str': b'0.38', 'strlen': 4},{'str': b'0.39', 'strlen': 4},{'str': b'1.0\\x00', 'strlen': 3},{'str': b'1.1\\x00', 'strlen': 3},{'str': b'1.2\\x00', 'strlen': 3},{'str': b'1.3\\x00', 'strlen': 3},{'str': b'1.4\\x00', 'strlen': 3},{'str': b'1.5\\x00', 'strlen': 3},{'str': b'1.6\\x00', 'strlen': 3},{'str': b'1.7\\x00', 'strlen': 3},{'str': b'1.8\\x00', 'strlen': 3},{'str': b'1.9\\x00', 'strlen': 3},{'str': b'1.10', 'strlen': 4},{'str': b'1.11', 'strlen': 4},{'str': b'1.12', 'strlen': 4},{'str': b'1.13', 'strlen': 4},{'str': b'1.14', 'strlen': 4},{'str': b'1.15', 'strlen': 4},{'str': b'1.16', 'strlen': 4},{'str': b'1.17', 'strlen': 4},{'str': b'1.18', 'strlen': 4},{'str': b'1.19', 'strlen': 4},{'str': b'1.20', 'strlen': 4},{'str': b'1.21', 'strlen': 4},{'str': b'1.22', 'strlen': 4},{'str': b'1.23', 'strlen': 4},{'str': b'1.24', 'strlen': 4},{'str': b'1.25', 'strlen': 4},{'str': b'1.26', 'strlen': 4},{'str': b'1.27', 'strlen': 4},{'str': b'1.28', 'strlen': 4},{'str': b'1.29', 'strlen': 4},{'str': b'1.30', 'strlen': 4},{'str': b'1.31', 'strlen': 4},{'str': b'1.32', 'strlen': 4},{'str': b'1.33', 'strlen': 4},{'str': b'1.34', 'strlen': 4},{'str': b'1.35', 'strlen': 4},{'str': b'1.36', 'strlen': 4},{'str': b'1.37', 'strlen': 4},{'str': b'1.38', 'strlen': 4},{'str': b'1.39', 'strlen': 4},{'str': b'2.0\\x00', 'strlen': 3},{'str': b'2.1\\x00', 'strlen': 3},{'str': b'2.2\\x00', 'strlen': 3},{'str': b'2.3\\x00', 'strlen': 3},{'str': b'2.4\\x00', 'strlen': 3},{'str': b'2.5\\x00', 'strlen': 3},{'str': b'2.6\\x00', 'strlen': 3},{'str': b'2.7\\x00', 'strlen': 3},{'str': b'2.8\\x00', 'strlen': 3},{'str': b'2.9\\x00', 'strlen': 3},{'str': b'2.10', 'strlen': 4},{'str': b'2.11', 'strlen': 4},{'str': b'2.12', 'strlen': 4},{'str': b'2.13', 'strlen': 4},{'str': b'2.14', 'strlen': 4},{'str': b'2.15', 'strlen': 4},{'str': b'2.16', 'strlen': 4},{'str': b'2.17', 'strlen': 4},{'str': b'2.18', 'strlen': 4},{'str': b'2.19', 'strlen': 4},{'str': b'2.20', 'strlen': 4},{'str': b'2.21', 'strlen': 4},{'str': b'2.22', 'strlen': 4},{'str': b'2.23', 'strlen': 4},{'str': b'2.24', 'strlen': 4},{'str': b'2.25', 'strlen': 4},{'str': b'2.26', 'strlen': 4},{'str': b'2.27', 'strlen': 4},{'str': b'2.28', 'strlen': 4},{'str': b'2.29', 'strlen': 4},{'str': b'2.30', 'strlen': 4},{'str': b'2.31', 'strlen': 4},{'str': b'2.32', 'strlen': 4},{'str': b'2.33', 'strlen': 4},{'str': b'2.34', 'strlen': 4},{'str': b'2.35', 'strlen': 4},{'str': b'2.36', 'strlen': 4},{'str': b'2.37', 'strlen': 4},{'str': b'2.38', 'strlen': 4},{'str': b'2.39', 'strlen': 4},]\n+ * \n+ *\/\n+ __pyx_t_5.SID1 = 0;\n+ __pyx_t_5.SID2 = 0;\n+ __pyx_t_6.SID1 = 0;\n+ __pyx_t_6.SID2 = 1;\n+ __pyx_t_7.SID1 = 0;\n+ __pyx_t_7.SID2 = 2;\n+ __pyx_t_8.SID1 = 0;\n+ __pyx_t_8.SID2 = 3;\n+ __pyx_t_9.SID1 = 0;\n+ __pyx_t_9.SID2 = 4;\n+ __pyx_t_10.SID1 = 0;\n+ __pyx_t_10.SID2 = 5;\n+ __pyx_t_11.SID1 = 0;\n+ __pyx_t_11.SID2 = 6;\n+ __pyx_t_12.SID1 = 0;\n+ __pyx_t_12.SID2 = 7;\n+ __pyx_t_13.SID1 = 0;\n+ __pyx_t_13.SID2 = 8;\n+ __pyx_t_14.SID1 = 0;\n+ __pyx_t_14.SID2 = 9;\n+ __pyx_t_15.SID1 = 0;\n+ __pyx_t_15.SID2 = 10;\n+ __pyx_t_16.SID1 = 0;\n+ __pyx_t_16.SID2 = 11;\n+ __pyx_t_17.SID1 = 0;\n+ __pyx_t_17.SID2 = 12;\n+ __pyx_t_18.SID1 = 0;\n+ __pyx_t_18.SID2 = 13;\n+ __pyx_t_19.SID1 = 0;\n+ __pyx_t_19.SID2 = 14;\n+ __pyx_t_20.SID1 = 0;\n+ __pyx_t_20.SID2 = 15;\n+ __pyx_t_21.SID1 = 0;\n+ __pyx_t_21.SID2 = 16;\n+ __pyx_t_22.SID1 = 0;\n+ __pyx_t_22.SID2 = 17;\n+ __pyx_t_23.SID1 = 0;\n+ __pyx_t_23.SID2 = 18;\n+ __pyx_t_24.SID1 = 0;\n+ __pyx_t_24.SID2 = 19;\n+ __pyx_t_25.SID1 = 0;\n+ __pyx_t_25.SID2 = 20;\n+ __pyx_t_26.SID1 = 0;\n+ __pyx_t_26.SID2 = 21;\n+ __pyx_t_27.SID1 = 0;\n+ __pyx_t_27.SID2 = 22;\n+ __pyx_t_28.SID1 = 0;\n+ __pyx_t_28.SID2 = 23;\n+ __pyx_t_29.SID1 = 0;\n+ __pyx_t_29.SID2 = 24;\n+ __pyx_t_30.SID1 = 0;\n+ __pyx_t_30.SID2 = 25;\n+ __pyx_t_31.SID1 = 0;\n+ __pyx_t_31.SID2 = 26;\n+ __pyx_t_32.SID1 = 0;\n+ __pyx_t_32.SID2 = 27;\n+ __pyx_t_33.SID1 = 0;\n+ __pyx_t_33.SID2 = 28;\n+ __pyx_t_34.SID1 = 0;\n+ __pyx_t_34.SID2 = 29;\n+ __pyx_t_35.SID1 = 0;\n+ __pyx_t_35.SID2 = 30;\n+ __pyx_t_36.SID1 = 0;\n+ __pyx_t_36.SID2 = 31;\n+ __pyx_t_37.SID1 = 0;\n+ __pyx_t_37.SID2 = 32;\n+ __pyx_t_38.SID1 = 0;\n+ __pyx_t_38.SID2 = 33;\n+ __pyx_t_39.SID1 = 0;\n+ __pyx_t_39.SID2 = 34;\n+ __pyx_t_40.SID1 = 0;\n+ __pyx_t_40.SID2 = 35;\n+ __pyx_t_41.SID1 = 0;\n+ __pyx_t_41.SID2 = 36;\n+ __pyx_t_42.SID1 = 0;\n+ __pyx_t_42.SID2 = 37;\n+ __pyx_t_43.SID1 = 0;\n+ __pyx_t_43.SID2 = 38;\n+ __pyx_t_44.SID1 = 0;\n+ __pyx_t_44.SID2 = 39;\n+ __pyx_t_45.SID1 = 1;\n+ __pyx_t_45.SID2 = 0;\n+ __pyx_t_46.SID1 = 1;\n+ __pyx_t_46.SID2 = 1;\n+ __pyx_t_47.SID1 = 1;\n+ __pyx_t_47.SID2 = 2;\n+ __pyx_t_48.SID1 = 1;\n+ __pyx_t_48.SID2 = 3;\n+ __pyx_t_49.SID1 = 1;\n+ __pyx_t_49.SID2 = 4;\n+ __pyx_t_50.SID1 = 1;\n+ __pyx_t_50.SID2 = 5;\n+ __pyx_t_51.SID1 = 1;\n+ __pyx_t_51.SID2 = 6;\n+ __pyx_t_52.SID1 = 1;\n+ __pyx_t_52.SID2 = 7;\n+ __pyx_t_53.SID1 = 1;\n+ __pyx_t_53.SID2 = 8;\n+ __pyx_t_54.SID1 = 1;\n+ __pyx_t_54.SID2 = 9;\n+ __pyx_t_55.SID1 = 1;\n+ __pyx_t_55.SID2 = 10;\n+ __pyx_t_56.SID1 = 1;\n+ __pyx_t_56.SID2 = 11;\n+ __pyx_t_57.SID1 = 1;\n+ __pyx_t_57.SID2 = 12;\n+ __pyx_t_58.SID1 = 1;\n+ __pyx_t_58.SID2 = 13;\n+ __pyx_t_59.SID1 = 1;\n+ __pyx_t_59.SID2 = 14;\n+ __pyx_t_60.SID1 = 1;\n+ __pyx_t_60.SID2 = 15;\n+ __pyx_t_61.SID1 = 1;\n+ __pyx_t_61.SID2 = 16;\n+ __pyx_t_62.SID1 = 1;\n+ __pyx_t_62.SID2 = 17;\n+ __pyx_t_63.SID1 = 1;\n+ __pyx_t_63.SID2 = 18;\n+ __pyx_t_64.SID1 = 1;\n+ __pyx_t_64.SID2 = 19;\n+ __pyx_t_65.SID1 = 1;\n+ __pyx_t_65.SID2 = 20;\n+ __pyx_t_66.SID1 = 1;\n+ __pyx_t_66.SID2 = 21;\n+ __pyx_t_67.SID1 = 1;\n+ __pyx_t_67.SID2 = 22;\n+ __pyx_t_68.SID1 = 1;\n+ __pyx_t_68.SID2 = 23;\n+ __pyx_t_69.SID1 = 1;\n+ __pyx_t_69.SID2 = 24;\n+ __pyx_t_70.SID1 = 1;\n+ __pyx_t_70.SID2 = 25;\n+ __pyx_t_71.SID1 = 1;\n+ __pyx_t_71.SID2 = 26;\n+ __pyx_t_72.SID1 = 1;\n+ __pyx_t_72.SID2 = 27;\n+ __pyx_t_73.SID1 = 1;\n+ __pyx_t_73.SID2 = 28;\n+ __pyx_t_74.SID1 = 1;\n+ __pyx_t_74.SID2 = 29;\n+ __pyx_t_75.SID1 = 1;\n+ __pyx_t_75.SID2 = 30;\n+ __pyx_t_76.SID1 = 1;\n+ __pyx_t_76.SID2 = 31;\n+ __pyx_t_77.SID1 = 1;\n+ __pyx_t_77.SID2 = 32;\n+ __pyx_t_78.SID1 = 1;\n+ __pyx_t_78.SID2 = 33;\n+ __pyx_t_79.SID1 = 1;\n+ __pyx_t_79.SID2 = 34;\n+ __pyx_t_80.SID1 = 1;\n+ __pyx_t_80.SID2 = 35;\n+ __pyx_t_81.SID1 = 1;\n+ __pyx_t_81.SID2 = 36;\n+ __pyx_t_82.SID1 = 1;\n+ __pyx_t_82.SID2 = 37;\n+ __pyx_t_83.SID1 = 1;\n+ __pyx_t_83.SID2 = 38;\n+ __pyx_t_84.SID1 = 1;\n+ __pyx_t_84.SID2 = 39;\n+ __pyx_t_85.SID1 = 2;\n+ __pyx_t_85.SID2 = 0;\n+ __pyx_t_86.SID1 = 2;\n+ __pyx_t_86.SID2 = 1;\n+ __pyx_t_87.SID1 = 2;\n+ __pyx_t_87.SID2 = 2;\n+ __pyx_t_88.SID1 = 2;\n+ __pyx_t_88.SID2 = 3;\n+ __pyx_t_89.SID1 = 2;\n+ __pyx_t_89.SID2 = 4;\n+ __pyx_t_90.SID1 = 2;\n+ __pyx_t_90.SID2 = 5;\n+ __pyx_t_91.SID1 = 2;\n+ __pyx_t_91.SID2 = 6;\n+ __pyx_t_92.SID1 = 2;\n+ __pyx_t_92.SID2 = 7;\n+ __pyx_t_93.SID1 = 2;\n+ __pyx_t_93.SID2 = 8;\n+ __pyx_t_94.SID1 = 2;\n+ __pyx_t_94.SID2 = 9;\n+ __pyx_t_95.SID1 = 2;\n+ __pyx_t_95.SID2 = 10;\n+ __pyx_t_96.SID1 = 2;\n+ __pyx_t_96.SID2 = 11;\n+ __pyx_t_97.SID1 = 2;\n+ __pyx_t_97.SID2 = 12;\n+ __pyx_t_98.SID1 = 2;\n+ __pyx_t_98.SID2 = 13;\n+ __pyx_t_99.SID1 = 2;\n+ __pyx_t_99.SID2 = 14;\n+ __pyx_t_100.SID1 = 2;\n+ __pyx_t_100.SID2 = 15;\n+ __pyx_t_101.SID1 = 2;\n+ __pyx_t_101.SID2 = 16;\n+ __pyx_t_102.SID1 = 2;\n+ __pyx_t_102.SID2 = 17;\n+ __pyx_t_103.SID1 = 2;\n+ __pyx_t_103.SID2 = 18;\n+ __pyx_t_104.SID1 = 2;\n+ __pyx_t_104.SID2 = 19;\n+ __pyx_t_105.SID1 = 2;\n+ __pyx_t_105.SID2 = 20;\n+ __pyx_t_106.SID1 = 2;\n+ __pyx_t_106.SID2 = 21;\n+ __pyx_t_107.SID1 = 2;\n+ __pyx_t_107.SID2 = 22;\n+ __pyx_t_108.SID1 = 2;\n+ __pyx_t_108.SID2 = 23;\n+ __pyx_t_109.SID1 = 2;\n+ __pyx_t_109.SID2 = 24;\n+ __pyx_t_110.SID1 = 2;\n+ __pyx_t_110.SID2 = 25;\n+ __pyx_t_111.SID1 = 2;\n+ __pyx_t_111.SID2 = 26;\n+ __pyx_t_112.SID1 = 2;\n+ __pyx_t_112.SID2 = 27;\n+ __pyx_t_113.SID1 = 2;\n+ __pyx_t_113.SID2 = 28;\n+ __pyx_t_114.SID1 = 2;\n+ __pyx_t_114.SID2 = 29;\n+ __pyx_t_115.SID1 = 2;\n+ __pyx_t_115.SID2 = 30;\n+ __pyx_t_116.SID1 = 2;\n+ __pyx_t_116.SID2 = 31;\n+ __pyx_t_117.SID1 = 2;\n+ __pyx_t_117.SID2 = 32;\n+ __pyx_t_118.SID1 = 2;\n+ __pyx_t_118.SID2 = 33;\n+ __pyx_t_119.SID1 = 2;\n+ __pyx_t_119.SID2 = 34;\n+ __pyx_t_120.SID1 = 2;\n+ __pyx_t_120.SID2 = 35;\n+ __pyx_t_121.SID1 = 2;\n+ __pyx_t_121.SID2 = 36;\n+ __pyx_t_122.SID1 = 2;\n+ __pyx_t_122.SID2 = 37;\n+ __pyx_t_123.SID1 = 2;\n+ __pyx_t_123.SID2 = 38;\n+ __pyx_t_124.SID1 = 2;\n+ __pyx_t_124.SID2 = 39;\n+ __pyx_t_125[0] = __pyx_t_5;\n+ __pyx_t_125[1] = __pyx_t_6;\n+ __pyx_t_125[2] = __pyx_t_7;\n+ __pyx_t_125[3] = __pyx_t_8;\n+ __pyx_t_125[4] = __pyx_t_9;\n+ __pyx_t_125[5] = __pyx_t_10;\n+ __pyx_t_125[6] = __pyx_t_11;\n+ __pyx_t_125[7] = __pyx_t_12;\n+ __pyx_t_125[8] = __pyx_t_13;\n+ __pyx_t_125[9] = __pyx_t_14;\n+ __pyx_t_125[10] = __pyx_t_15;\n+ __pyx_t_125[11] = __pyx_t_16;\n+ __pyx_t_125[12] = __pyx_t_17;\n+ __pyx_t_125[13] = __pyx_t_18;\n+ __pyx_t_125[14] = __pyx_t_19;\n+ __pyx_t_125[15] = __pyx_t_20;\n+ __pyx_t_125[16] = __pyx_t_21;\n+ __pyx_t_125[17] = __pyx_t_22;\n+ __pyx_t_125[18] = __pyx_t_23;\n+ __pyx_t_125[19] = __pyx_t_24;\n+ __pyx_t_125[20] = __pyx_t_25;\n+ __pyx_t_125[21] = __pyx_t_26;\n+ __pyx_t_125[22] = __pyx_t_27;\n+ __pyx_t_125[23] = __pyx_t_28;\n+ __pyx_t_125[24] = __pyx_t_29;\n+ __pyx_t_125[25] = __pyx_t_30;\n+ __pyx_t_125[26] = __pyx_t_31;\n+ __pyx_t_125[27] = __pyx_t_32;\n+ __pyx_t_125[28] = __pyx_t_33;\n+ __pyx_t_125[29] = __pyx_t_34;\n+ __pyx_t_125[30] = __pyx_t_35;\n+ __pyx_t_125[31] = __pyx_t_36;\n+ __pyx_t_125[32] = __pyx_t_37;\n+ __pyx_t_125[33] = __pyx_t_38;\n+ __pyx_t_125[34] = __pyx_t_39;\n+ __pyx_t_125[35] = __pyx_t_40;\n+ __pyx_t_125[36] = __pyx_t_41;\n+ __pyx_t_125[37] = __pyx_t_42;\n+ __pyx_t_125[38] = __pyx_t_43;\n+ __pyx_t_125[39] = __pyx_t_44;\n+ __pyx_t_125[40] = __pyx_t_45;\n+ __pyx_t_125[41] = __pyx_t_46;\n+ __pyx_t_125[42] = __pyx_t_47;\n+ __pyx_t_125[43] = __pyx_t_48;\n+ __pyx_t_125[44] = __pyx_t_49;\n+ __pyx_t_125[45] = __pyx_t_50;\n+ __pyx_t_125[46] = __pyx_t_51;\n+ __pyx_t_125[47] = __pyx_t_52;\n+ __pyx_t_125[48] = __pyx_t_53;\n+ __pyx_t_125[49] = __pyx_t_54;\n+ __pyx_t_125[50] = __pyx_t_55;\n+ __pyx_t_125[51] = __pyx_t_56;\n+ __pyx_t_125[52] = __pyx_t_57;\n+ __pyx_t_125[53] = __pyx_t_58;\n+ __pyx_t_125[54] = __pyx_t_59;\n+ __pyx_t_125[55] = __pyx_t_60;\n+ __pyx_t_125[56] = __pyx_t_61;\n+ __pyx_t_125[57] = __pyx_t_62;\n+ __pyx_t_125[58] = __pyx_t_63;\n+ __pyx_t_125[59] = __pyx_t_64;\n+ __pyx_t_125[60] = __pyx_t_65;\n+ __pyx_t_125[61] = __pyx_t_66;\n+ __pyx_t_125[62] = __pyx_t_67;\n+ __pyx_t_125[63] = __pyx_t_68;\n+ __pyx_t_125[64] = __pyx_t_69;\n+ __pyx_t_125[65] = __pyx_t_70;\n+ __pyx_t_125[66] = __pyx_t_71;\n+ __pyx_t_125[67] = __pyx_t_72;\n+ __pyx_t_125[68] = __pyx_t_73;\n+ __pyx_t_125[69] = __pyx_t_74;\n+ __pyx_t_125[70] = __pyx_t_75;\n+ __pyx_t_125[71] = __pyx_t_76;\n+ __pyx_t_125[72] = __pyx_t_77;\n+ __pyx_t_125[73] = __pyx_t_78;\n+ __pyx_t_125[74] = __pyx_t_79;\n+ __pyx_t_125[75] = __pyx_t_80;\n+ __pyx_t_125[76] = __pyx_t_81;\n+ __pyx_t_125[77] = __pyx_t_82;\n+ __pyx_t_125[78] = __pyx_t_83;\n+ __pyx_t_125[79] = __pyx_t_84;\n+ __pyx_t_125[80] = __pyx_t_85;\n+ __pyx_t_125[81] = __pyx_t_86;\n+ __pyx_t_125[82] = __pyx_t_87;\n+ __pyx_t_125[83] = __pyx_t_88;\n+ __pyx_t_125[84] = __pyx_t_89;\n+ __pyx_t_125[85] = __pyx_t_90;\n+ __pyx_t_125[86] = __pyx_t_91;\n+ __pyx_t_125[87] = __pyx_t_92;\n+ __pyx_t_125[88] = __pyx_t_93;\n+ __pyx_t_125[89] = __pyx_t_94;\n+ __pyx_t_125[90] = __pyx_t_95;\n+ __pyx_t_125[91] = __pyx_t_96;\n+ __pyx_t_125[92] = __pyx_t_97;\n+ __pyx_t_125[93] = __pyx_t_98;\n+ __pyx_t_125[94] = __pyx_t_99;\n+ __pyx_t_125[95] = __pyx_t_100;\n+ __pyx_t_125[96] = __pyx_t_101;\n+ __pyx_t_125[97] = __pyx_t_102;\n+ __pyx_t_125[98] = __pyx_t_103;\n+ __pyx_t_125[99] = __pyx_t_104;\n+ __pyx_t_125[100] = __pyx_t_105;\n+ __pyx_t_125[101] = __pyx_t_106;\n+ __pyx_t_125[102] = __pyx_t_107;\n+ __pyx_t_125[103] = __pyx_t_108;\n+ __pyx_t_125[104] = __pyx_t_109;\n+ __pyx_t_125[105] = __pyx_t_110;\n+ __pyx_t_125[106] = __pyx_t_111;\n+ __pyx_t_125[107] = __pyx_t_112;\n+ __pyx_t_125[108] = __pyx_t_113;\n+ __pyx_t_125[109] = __pyx_t_114;\n+ __pyx_t_125[110] = __pyx_t_115;\n+ __pyx_t_125[111] = __pyx_t_116;\n+ __pyx_t_125[112] = __pyx_t_117;\n+ __pyx_t_125[113] = __pyx_t_118;\n+ __pyx_t_125[114] = __pyx_t_119;\n+ __pyx_t_125[115] = __pyx_t_120;\n+ __pyx_t_125[116] = __pyx_t_121;\n+ __pyx_t_125[117] = __pyx_t_122;\n+ __pyx_t_125[118] = __pyx_t_123;\n+ __pyx_t_125[119] = __pyx_t_124;\n+ __pyx_v_8fastsnmp_11snmp_parser_sid12i = __pyx_t_125;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":88\n+ * \n+ * cdef SID12_ti *sid12i = [{'SID1': 0, 'SID2': 0},{'SID1': 0, 'SID2': 1},{'SID1': 0, 'SID2': 2},{'SID1': 0, 'SID2': 3},{'SID1': 0, 'SID2': 4},{'SID1': 0, 'SID2': 5},{'SID1': 0, 'SID2': 6},{'SID1': 0, 'SID2': 7},{'SID1': 0, 'SID2': 8},{'SID1': 0, 'SID2': 9},{'SID1': 0, 'SID2': 10},{'SID1': 0, 'SID2': 11},{'SID1': 0, 'SID2': 12},{'SID1': 0, 'SID2': 13},{'SID1': 0, 'SID2': 14},{'SID1': 0, 'SID2': 15},{'SID1': 0, 'SID2': 16},{'SID1': 0, 'SID2': 17},{'SID1': 0, 'SID2': 18},{'SID1': 0, 'SID2': 19},{'SID1': 0, 'SID2': 20},{'SID1': 0, 'SID2': 21},{'SID1': 0, 'SID2': 22},{'SID1': 0, 'SID2': 23},{'SID1': 0, 'SID2': 24},{'SID1': 0, 'SID2': 25},{'SID1': 0, 'SID2': 26},{'SID1': 0, 'SID2': 27},{'SID1': 0, 'SID2': 28},{'SID1': 0, 'SID2': 29},{'SID1': 0, 'SID2': 30},{'SID1': 0, 'SID2': 31},{'SID1': 0, 'SID2': 32},{'SID1': 0, 'SID2': 33},{'SID1': 0, 'SID2': 34},{'SID1': 0, 'SID2': 35},{'SID1': 0, 'SID2': 36},{'SID1': 0, 'SID2': 37},{'SID1': 0, 'SID2': 38},{'SID1': 0, 'SID2': 39},{'SID1': 1, 'SID2': 0},{'SID1': 1, 'SID2': 1},{'SID1': 1, 'SID2': 2},{'SID1': 1, 'SID2': 3},{'SID1': 1, 'SID2': 4},{'SID1': 1, 'SID2': 5},{'SID1': 1, 'SID2': 6},{'SID1': 1, 'SID2': 7},{'SID1': 1, 'SID2': 8},{'SID1': 1, 'SID2': 9},{'SID1': 1, 'SID2': 10},{'SID1': 1, 'SID2': 11},{'SID1': 1, 'SID2': 12},{'SID1': 1, 'SID2': 13},{'SID1': 1, 'SID2': 14},{'SID1': 1, 'SID2': 15},{'SID1': 1, 'SID2': 16},{'SID1': 1, 'SID2': 17},{'SID1': 1, 'SID2': 18},{'SID1': 1, 'SID2': 19},{'SID1': 1, 'SID2': 20},{'SID1': 1, 'SID2': 21},{'SID1': 1, 'SID2': 22},{'SID1': 1, 'SID2': 23},{'SID1': 1, 'SID2': 24},{'SID1': 1, 'SID2': 25},{'SID1': 1, 'SID2': 26},{'SID1': 1, 'SID2': 27},{'SID1': 1, 'SID2': 28},{'SID1': 1, 'SID2': 29},{'SID1': 1, 'SID2': 30},{'SID1': 1, 'SID2': 31},{'SID1': 1, 'SID2': 32},{'SID1': 1, 'SID2': 33},{'SID1': 1, 'SID2': 34},{'SID1': 1, 'SID2': 35},{'SID1': 1, 'SID2': 36},{'SID1': 1, 'SID2': 37},{'SID1': 1, 'SID2': 38},{'SID1': 1, 'SID2': 39},{'SID1': 2, 'SID2': 0},{'SID1': 2, 'SID2': 1},{'SID1': 2, 'SID2': 2},{'SID1': 2, 'SID2': 3},{'SID1': 2, 'SID2': 4},{'SID1': 2, 'SID2': 5},{'SID1': 2, 'SID2': 6},{'SID1': 2, 'SID2': 7},{'SID1': 2, 'SID2': 8},{'SID1': 2, 'SID2': 9},{'SID1': 2, 'SID2': 10},{'SID1': 2, 'SID2': 11},{'SID1': 2, 'SID2': 12},{'SID1': 2, 'SID2': 13},{'SID1': 2, 'SID2': 14},{'SID1': 2, 'SID2': 15},{'SID1': 2, 'SID2': 16},{'SID1': 2, 'SID2': 17},{'SID1': 2, 'SID2': 18},{'SID1': 2, 'SID2': 19},{'SID1': 2, 'SID2': 20},{'SID1': 2, 'SID2': 21},{'SID1': 2, 'SID2': 22},{'SID1': 2, 'SID2': 23},{'SID1': 2, 'SID2': 24},{'SID1': 2, 'SID2': 25},{'SID1': 2, 'SID2': 26},{'SID1': 2, 'SID2': 27},{'SID1': 2, 'SID2': 28},{'SID1': 2, 'SID2': 29},{'SID1': 2, 'SID2': 30},{'SID1': 2, 'SID2': 31},{'SID1': 2, 'SID2': 32},{'SID1': 2, 'SID2': 33},{'SID1': 2, 'SID2': 34},{'SID1': 2, 'SID2': 35},{'SID1': 2, 'SID2': 36},{'SID1': 2, 'SID2': 37},{'SID1': 2, 'SID2': 38},{'SID1': 2, 'SID2': 39}]\n+ * cdef SID12_t *sid12s = [{'str': b'0.0\\x00', 'strlen': 3},{'str': b'0.1\\x00', 'strlen': 3},{'str': b'0.2\\x00', 'strlen': 3},{'str': b'0.3\\x00', 'strlen': 3},{'str': b'0.4\\x00', 'strlen': 3},{'str': b'0.5\\x00', 'strlen': 3},{'str': b'0.6\\x00', 'strlen': 3},{'str': b'0.7\\x00', 'strlen': 3},{'str': b'0.8\\x00', 'strlen': 3},{'str': b'0.9\\x00', 'strlen': 3},{'str': b'0.10', 'strlen': 4},{'str': b'0.11', 'strlen': 4},{'str': b'0.12', 'strlen': 4},{'str': b'0.13', 'strlen': 4},{'str': b'0.14', 'strlen': 4},{'str': b'0.15', 'strlen': 4},{'str': b'0.16', 'strlen': 4},{'str': b'0.17', 'strlen': 4},{'str': b'0.18', 'strlen': 4},{'str': b'0.19', 'strlen': 4},{'str': b'0.20', 'strlen': 4},{'str': b'0.21', 'strlen': 4},{'str': b'0.22', 'strlen': 4},{'str': b'0.23', 'strlen': 4},{'str': b'0.24', 'strlen': 4},{'str': b'0.25', 'strlen': 4},{'str': b'0.26', 'strlen': 4},{'str': b'0.27', 'strlen': 4},{'str': b'0.28', 'strlen': 4},{'str': b'0.29', 'strlen': 4},{'str': b'0.30', 'strlen': 4},{'str': b'0.31', 'strlen': 4},{'str': b'0.32', 'strlen': 4},{'str': b'0.33', 'strlen': 4},{'str': b'0.34', 'strlen': 4},{'str': b'0.35', 'strlen': 4},{'str': b'0.36', 'strlen': 4},{'str': b'0.37', 'strlen': 4},{'str': b'0.38', 'strlen': 4},{'str': b'0.39', 'strlen': 4},{'str': b'1.0\\x00', 'strlen': 3},{'str': b'1.1\\x00', 'strlen': 3},{'str': b'1.2\\x00', 'strlen': 3},{'str': b'1.3\\x00', 'strlen': 3},{'str': b'1.4\\x00', 'strlen': 3},{'str': b'1.5\\x00', 'strlen': 3},{'str': b'1.6\\x00', 'strlen': 3},{'str': b'1.7\\x00', 'strlen': 3},{'str': b'1.8\\x00', 'strlen': 3},{'str': b'1.9\\x00', 'strlen': 3},{'str': b'1.10', 'strlen': 4},{'str': b'1.11', 'strlen': 4},{'str': b'1.12', 'strlen': 4},{'str': b'1.13', 'strlen': 4},{'str': b'1.14', 'strlen': 4},{'str': b'1.15', 'strlen': 4},{'str': b'1.16', 'strlen': 4},{'str': b'1.17', 'strlen': 4},{'str': b'1.18', 'strlen': 4},{'str': b'1.19', 'strlen': 4},{'str': b'1.20', 'strlen': 4},{'str': b'1.21', 'strlen': 4},{'str': b'1.22', 'strlen': 4},{'str': b'1.23', 'strlen': 4},{'str': b'1.24', 'strlen': 4},{'str': b'1.25', 'strlen': 4},{'str': b'1.26', 'strlen': 4},{'str': b'1.27', 'strlen': 4},{'str': b'1.28', 'strlen': 4},{'str': b'1.29', 'strlen': 4},{'str': b'1.30', 'strlen': 4},{'str': b'1.31', 'strlen': 4},{'str': b'1.32', 'strlen': 4},{'str': b'1.33', 'strlen': 4},{'str': b'1.34', 'strlen': 4},{'str': b'1.35', 'strlen': 4},{'str': b'1.36', 'strlen': 4},{'str': b'1.37', 'strlen': 4},{'str': b'1.38', 'strlen': 4},{'str': b'1.39', 'strlen': 4},{'str': b'2.0\\x00', 'strlen': 3},{'str': b'2.1\\x00', 'strlen': 3},{'str': b'2.2\\x00', 'strlen': 3},{'str': b'2.3\\x00', 'strlen': 3},{'str': b'2.4\\x00', 'strlen': 3},{'str': b'2.5\\x00', 'strlen': 3},{'str': b'2.6\\x00', 'strlen': 3},{'str': b'2.7\\x00', 'strlen': 3},{'str': b'2.8\\x00', 'strlen': 3},{'str': b'2.9\\x00', 'strlen': 3},{'str': b'2.10', 'strlen': 4},{'str': b'2.11', 'strlen': 4},{'str': b'2.12', 'strlen': 4},{'str': b'2.13', 'strlen': 4},{'str': b'2.14', 'strlen': 4},{'str': b'2.15', 'strlen': 4},{'str': b'2.16', 'strlen': 4},{'str': b'2.17', 'strlen': 4},{'str': b'2.18', 'strlen': 4},{'str': b'2.19', 'strlen': 4},{'str': b'2.20', 'strlen': 4},{'str': b'2.21', 'strlen': 4},{'str': b'2.22', 'strlen': 4},{'str': b'2.23', 'strlen': 4},{'str': b'2.24', 'strlen': 4},{'str': b'2.25', 'strlen': 4},{'str': b'2.26', 'strlen': 4},{'str': b'2.27', 'strlen': 4},{'str': b'2.28', 'strlen': 4},{'str': b'2.29', 'strlen': 4},{'str': b'2.30', 'strlen': 4},{'str': b'2.31', 'strlen': 4},{'str': b'2.32', 'strlen': 4},{'str': b'2.33', 'strlen': 4},{'str': b'2.34', 'strlen': 4},{'str': b'2.35', 'strlen': 4},{'str': b'2.36', 'strlen': 4},{'str': b'2.37', 'strlen': 4},{'str': b'2.38', 'strlen': 4},{'str': b'2.39', 'strlen': 4},] # <<<<<<<<<<<<<<\n+ * \n+ * cdef inline int primitive_decode(char *stream, size_t stream_len, uint64_t *result, size_t *result_len):\n+ *\/\n+ __pyx_t_126.str = ((char *)\"0.0\\000\");\n+ __pyx_t_126.strlen = 3;\n+ __pyx_t_127.str = ((char *)\"0.1\\000\");\n+ __pyx_t_127.strlen = 3;\n+ __pyx_t_128.str = ((char *)\"0.2\\000\");\n+ __pyx_t_128.strlen = 3;\n+ __pyx_t_129.str = ((char *)\"0.3\\000\");\n+ __pyx_t_129.strlen = 3;\n+ __pyx_t_130.str = ((char *)\"0.4\\000\");\n+ __pyx_t_130.strlen = 3;\n+ __pyx_t_131.str = ((char *)\"0.5\\000\");\n+ __pyx_t_131.strlen = 3;\n+ __pyx_t_132.str = ((char *)\"0.6\\000\");\n+ __pyx_t_132.strlen = 3;\n+ __pyx_t_133.str = ((char *)\"0.7\\000\");\n+ __pyx_t_133.strlen = 3;\n+ __pyx_t_134.str = ((char *)\"0.8\\000\");\n+ __pyx_t_134.strlen = 3;\n+ __pyx_t_135.str = ((char *)\"0.9\\000\");\n+ __pyx_t_135.strlen = 3;\n+ __pyx_t_136.str = ((char *)\"0.10\");\n+ __pyx_t_136.strlen = 4;\n+ __pyx_t_137.str = ((char *)\"0.11\");\n+ __pyx_t_137.strlen = 4;\n+ __pyx_t_138.str = ((char *)\"0.12\");\n+ __pyx_t_138.strlen = 4;\n+ __pyx_t_139.str = ((char *)\"0.13\");\n+ __pyx_t_139.strlen = 4;\n+ __pyx_t_140.str = ((char *)\"0.14\");\n+ __pyx_t_140.strlen = 4;\n+ __pyx_t_141.str = ((char *)\"0.15\");\n+ __pyx_t_141.strlen = 4;\n+ __pyx_t_142.str = ((char *)\"0.16\");\n+ __pyx_t_142.strlen = 4;\n+ __pyx_t_143.str = ((char *)\"0.17\");\n+ __pyx_t_143.strlen = 4;\n+ __pyx_t_144.str = ((char *)\"0.18\");\n+ __pyx_t_144.strlen = 4;\n+ __pyx_t_145.str = ((char *)\"0.19\");\n+ __pyx_t_145.strlen = 4;\n+ __pyx_t_146.str = ((char *)\"0.20\");\n+ __pyx_t_146.strlen = 4;\n+ __pyx_t_147.str = ((char *)\"0.21\");\n+ __pyx_t_147.strlen = 4;\n+ __pyx_t_148.str = ((char *)\"0.22\");\n+ __pyx_t_148.strlen = 4;\n+ __pyx_t_149.str = ((char *)\"0.23\");\n+ __pyx_t_149.strlen = 4;\n+ __pyx_t_150.str = ((char *)\"0.24\");\n+ __pyx_t_150.strlen = 4;\n+ __pyx_t_151.str = ((char *)\"0.25\");\n+ __pyx_t_151.strlen = 4;\n+ __pyx_t_152.str = ((char *)\"0.26\");\n+ __pyx_t_152.strlen = 4;\n+ __pyx_t_153.str = ((char *)\"0.27\");\n+ __pyx_t_153.strlen = 4;\n+ __pyx_t_154.str = ((char *)\"0.28\");\n+ __pyx_t_154.strlen = 4;\n+ __pyx_t_155.str = ((char *)\"0.29\");\n+ __pyx_t_155.strlen = 4;\n+ __pyx_t_156.str = ((char *)\"0.30\");\n+ __pyx_t_156.strlen = 4;\n+ __pyx_t_157.str = ((char *)\"0.31\");\n+ __pyx_t_157.strlen = 4;\n+ __pyx_t_158.str = ((char *)\"0.32\");\n+ __pyx_t_158.strlen = 4;\n+ __pyx_t_159.str = ((char *)\"0.33\");\n+ __pyx_t_159.strlen = 4;\n+ __pyx_t_160.str = ((char *)\"0.34\");\n+ __pyx_t_160.strlen = 4;\n+ __pyx_t_161.str = ((char *)\"0.35\");\n+ __pyx_t_161.strlen = 4;\n+ __pyx_t_162.str = ((char *)\"0.36\");\n+ __pyx_t_162.strlen = 4;\n+ __pyx_t_163.str = ((char *)\"0.37\");\n+ __pyx_t_163.strlen = 4;\n+ __pyx_t_164.str = ((char *)\"0.38\");\n+ __pyx_t_164.strlen = 4;\n+ __pyx_t_165.str = ((char *)\"0.39\");\n+ __pyx_t_165.strlen = 4;\n+ __pyx_t_166.str = ((char *)\"1.0\\000\");\n+ __pyx_t_166.strlen = 3;\n+ __pyx_t_167.str = ((char *)\"1.1\\000\");\n+ __pyx_t_167.strlen = 3;\n+ __pyx_t_168.str = ((char *)\"1.2\\000\");\n+ __pyx_t_168.strlen = 3;\n+ __pyx_t_169.str = ((char *)\"1.3\\000\");\n+ __pyx_t_169.strlen = 3;\n+ __pyx_t_170.str = ((char *)\"1.4\\000\");\n+ __pyx_t_170.strlen = 3;\n+ __pyx_t_171.str = ((char *)\"1.5\\000\");\n+ __pyx_t_171.strlen = 3;\n+ __pyx_t_172.str = ((char *)\"1.6\\000\");\n+ __pyx_t_172.strlen = 3;\n+ __pyx_t_173.str = ((char *)\"1.7\\000\");\n+ __pyx_t_173.strlen = 3;\n+ __pyx_t_174.str = ((char *)\"1.8\\000\");\n+ __pyx_t_174.strlen = 3;\n+ __pyx_t_175.str = ((char *)\"1.9\\000\");\n+ __pyx_t_175.strlen = 3;\n+ __pyx_t_176.str = ((char *)\"1.10\");\n+ __pyx_t_176.strlen = 4;\n+ __pyx_t_177.str = ((char *)\"1.11\");\n+ __pyx_t_177.strlen = 4;\n+ __pyx_t_178.str = ((char *)\"1.12\");\n+ __pyx_t_178.strlen = 4;\n+ __pyx_t_179.str = ((char *)\"1.13\");\n+ __pyx_t_179.strlen = 4;\n+ __pyx_t_180.str = ((char *)\"1.14\");\n+ __pyx_t_180.strlen = 4;\n+ __pyx_t_181.str = ((char *)\"1.15\");\n+ __pyx_t_181.strlen = 4;\n+ __pyx_t_182.str = ((char *)\"1.16\");\n+ __pyx_t_182.strlen = 4;\n+ __pyx_t_183.str = ((char *)\"1.17\");\n+ __pyx_t_183.strlen = 4;\n+ __pyx_t_184.str = ((char *)\"1.18\");\n+ __pyx_t_184.strlen = 4;\n+ __pyx_t_185.str = ((char *)\"1.19\");\n+ __pyx_t_185.strlen = 4;\n+ __pyx_t_186.str = ((char *)\"1.20\");\n+ __pyx_t_186.strlen = 4;\n+ __pyx_t_187.str = ((char *)\"1.21\");\n+ __pyx_t_187.strlen = 4;\n+ __pyx_t_188.str = ((char *)\"1.22\");\n+ __pyx_t_188.strlen = 4;\n+ __pyx_t_189.str = ((char *)\"1.23\");\n+ __pyx_t_189.strlen = 4;\n+ __pyx_t_190.str = ((char *)\"1.24\");\n+ __pyx_t_190.strlen = 4;\n+ __pyx_t_191.str = ((char *)\"1.25\");\n+ __pyx_t_191.strlen = 4;\n+ __pyx_t_192.str = ((char *)\"1.26\");\n+ __pyx_t_192.strlen = 4;\n+ __pyx_t_193.str = ((char *)\"1.27\");\n+ __pyx_t_193.strlen = 4;\n+ __pyx_t_194.str = ((char *)\"1.28\");\n+ __pyx_t_194.strlen = 4;\n+ __pyx_t_195.str = ((char *)\"1.29\");\n+ __pyx_t_195.strlen = 4;\n+ __pyx_t_196.str = ((char *)\"1.30\");\n+ __pyx_t_196.strlen = 4;\n+ __pyx_t_197.str = ((char *)\"1.31\");\n+ __pyx_t_197.strlen = 4;\n+ __pyx_t_198.str = ((char *)\"1.32\");\n+ __pyx_t_198.strlen = 4;\n+ __pyx_t_199.str = ((char *)\"1.33\");\n+ __pyx_t_199.strlen = 4;\n+ __pyx_t_200.str = ((char *)\"1.34\");\n+ __pyx_t_200.strlen = 4;\n+ __pyx_t_201.str = ((char *)\"1.35\");\n+ __pyx_t_201.strlen = 4;\n+ __pyx_t_202.str = ((char *)\"1.36\");\n+ __pyx_t_202.strlen = 4;\n+ __pyx_t_203.str = ((char *)\"1.37\");\n+ __pyx_t_203.strlen = 4;\n+ __pyx_t_204.str = ((char *)\"1.38\");\n+ __pyx_t_204.strlen = 4;\n+ __pyx_t_205.str = ((char *)\"1.39\");\n+ __pyx_t_205.strlen = 4;\n+ __pyx_t_206.str = ((char *)\"2.0\\000\");\n+ __pyx_t_206.strlen = 3;\n+ __pyx_t_207.str = ((char *)\"2.1\\000\");\n+ __pyx_t_207.strlen = 3;\n+ __pyx_t_208.str = ((char *)\"2.2\\000\");\n+ __pyx_t_208.strlen = 3;\n+ __pyx_t_209.str = ((char *)\"2.3\\000\");\n+ __pyx_t_209.strlen = 3;\n+ __pyx_t_210.str = ((char *)\"2.4\\000\");\n+ __pyx_t_210.strlen = 3;\n+ __pyx_t_211.str = ((char *)\"2.5\\000\");\n+ __pyx_t_211.strlen = 3;\n+ __pyx_t_212.str = ((char *)\"2.6\\000\");\n+ __pyx_t_212.strlen = 3;\n+ __pyx_t_213.str = ((char *)\"2.7\\000\");\n+ __pyx_t_213.strlen = 3;\n+ __pyx_t_214.str = ((char *)\"2.8\\000\");\n+ __pyx_t_214.strlen = 3;\n+ __pyx_t_215.str = ((char *)\"2.9\\000\");\n+ __pyx_t_215.strlen = 3;\n+ __pyx_t_216.str = ((char *)\"2.10\");\n+ __pyx_t_216.strlen = 4;\n+ __pyx_t_217.str = ((char *)\"2.11\");\n+ __pyx_t_217.strlen = 4;\n+ __pyx_t_218.str = ((char *)\"2.12\");\n+ __pyx_t_218.strlen = 4;\n+ __pyx_t_219.str = ((char *)\"2.13\");\n+ __pyx_t_219.strlen = 4;\n+ __pyx_t_220.str = ((char *)\"2.14\");\n+ __pyx_t_220.strlen = 4;\n+ __pyx_t_221.str = ((char *)\"2.15\");\n+ __pyx_t_221.strlen = 4;\n+ __pyx_t_222.str = ((char *)\"2.16\");\n+ __pyx_t_222.strlen = 4;\n+ __pyx_t_223.str = ((char *)\"2.17\");\n+ __pyx_t_223.strlen = 4;\n+ __pyx_t_224.str = ((char *)\"2.18\");\n+ __pyx_t_224.strlen = 4;\n+ __pyx_t_225.str = ((char *)\"2.19\");\n+ __pyx_t_225.strlen = 4;\n+ __pyx_t_226.str = ((char *)\"2.20\");\n+ __pyx_t_226.strlen = 4;\n+ __pyx_t_227.str = ((char *)\"2.21\");\n+ __pyx_t_227.strlen = 4;\n+ __pyx_t_228.str = ((char *)\"2.22\");\n+ __pyx_t_228.strlen = 4;\n+ __pyx_t_229.str = ((char *)\"2.23\");\n+ __pyx_t_229.strlen = 4;\n+ __pyx_t_230.str = ((char *)\"2.24\");\n+ __pyx_t_230.strlen = 4;\n+ __pyx_t_231.str = ((char *)\"2.25\");\n+ __pyx_t_231.strlen = 4;\n+ __pyx_t_232.str = ((char *)\"2.26\");\n+ __pyx_t_232.strlen = 4;\n+ __pyx_t_233.str = ((char *)\"2.27\");\n+ __pyx_t_233.strlen = 4;\n+ __pyx_t_234.str = ((char *)\"2.28\");\n+ __pyx_t_234.strlen = 4;\n+ __pyx_t_235.str = ((char *)\"2.29\");\n+ __pyx_t_235.strlen = 4;\n+ __pyx_t_236.str = ((char *)\"2.30\");\n+ __pyx_t_236.strlen = 4;\n+ __pyx_t_237.str = ((char *)\"2.31\");\n+ __pyx_t_237.strlen = 4;\n+ __pyx_t_238.str = ((char *)\"2.32\");\n+ __pyx_t_238.strlen = 4;\n+ __pyx_t_239.str = ((char *)\"2.33\");\n+ __pyx_t_239.strlen = 4;\n+ __pyx_t_240.str = ((char *)\"2.34\");\n+ __pyx_t_240.strlen = 4;\n+ __pyx_t_241.str = ((char *)\"2.35\");\n+ __pyx_t_241.strlen = 4;\n+ __pyx_t_242.str = ((char *)\"2.36\");\n+ __pyx_t_242.strlen = 4;\n+ __pyx_t_243.str = ((char *)\"2.37\");\n+ __pyx_t_243.strlen = 4;\n+ __pyx_t_244.str = ((char *)\"2.38\");\n+ __pyx_t_244.strlen = 4;\n+ __pyx_t_245.str = ((char *)\"2.39\");\n+ __pyx_t_245.strlen = 4;\n+ __pyx_t_246[0] = __pyx_t_126;\n+ __pyx_t_246[1] = __pyx_t_127;\n+ __pyx_t_246[2] = __pyx_t_128;\n+ __pyx_t_246[3] = __pyx_t_129;\n+ __pyx_t_246[4] = __pyx_t_130;\n+ __pyx_t_246[5] = __pyx_t_131;\n+ __pyx_t_246[6] = __pyx_t_132;\n+ __pyx_t_246[7] = __pyx_t_133;\n+ __pyx_t_246[8] = __pyx_t_134;\n+ __pyx_t_246[9] = __pyx_t_135;\n+ __pyx_t_246[10] = __pyx_t_136;\n+ __pyx_t_246[11] = __pyx_t_137;\n+ __pyx_t_246[12] = __pyx_t_138;\n+ __pyx_t_246[13] = __pyx_t_139;\n+ __pyx_t_246[14] = __pyx_t_140;\n+ __pyx_t_246[15] = __pyx_t_141;\n+ __pyx_t_246[16] = __pyx_t_142;\n+ __pyx_t_246[17] = __pyx_t_143;\n+ __pyx_t_246[18] = __pyx_t_144;\n+ __pyx_t_246[19] = __pyx_t_145;\n+ __pyx_t_246[20] = __pyx_t_146;\n+ __pyx_t_246[21] = __pyx_t_147;\n+ __pyx_t_246[22] = __pyx_t_148;\n+ __pyx_t_246[23] = __pyx_t_149;\n+ __pyx_t_246[24] = __pyx_t_150;\n+ __pyx_t_246[25] = __pyx_t_151;\n+ __pyx_t_246[26] = __pyx_t_152;\n+ __pyx_t_246[27] = __pyx_t_153;\n+ __pyx_t_246[28] = __pyx_t_154;\n+ __pyx_t_246[29] = __pyx_t_155;\n+ __pyx_t_246[30] = __pyx_t_156;\n+ __pyx_t_246[31] = __pyx_t_157;\n+ __pyx_t_246[32] = __pyx_t_158;\n+ __pyx_t_246[33] = __pyx_t_159;\n+ __pyx_t_246[34] = __pyx_t_160;\n+ __pyx_t_246[35] = __pyx_t_161;\n+ __pyx_t_246[36] = __pyx_t_162;\n+ __pyx_t_246[37] = __pyx_t_163;\n+ __pyx_t_246[38] = __pyx_t_164;\n+ __pyx_t_246[39] = __pyx_t_165;\n+ __pyx_t_246[40] = __pyx_t_166;\n+ __pyx_t_246[41] = __pyx_t_167;\n+ __pyx_t_246[42] = __pyx_t_168;\n+ __pyx_t_246[43] = __pyx_t_169;\n+ __pyx_t_246[44] = __pyx_t_170;\n+ __pyx_t_246[45] = __pyx_t_171;\n+ __pyx_t_246[46] = __pyx_t_172;\n+ __pyx_t_246[47] = __pyx_t_173;\n+ __pyx_t_246[48] = __pyx_t_174;\n+ __pyx_t_246[49] = __pyx_t_175;\n+ __pyx_t_246[50] = __pyx_t_176;\n+ __pyx_t_246[51] = __pyx_t_177;\n+ __pyx_t_246[52] = __pyx_t_178;\n+ __pyx_t_246[53] = __pyx_t_179;\n+ __pyx_t_246[54] = __pyx_t_180;\n+ __pyx_t_246[55] = __pyx_t_181;\n+ __pyx_t_246[56] = __pyx_t_182;\n+ __pyx_t_246[57] = __pyx_t_183;\n+ __pyx_t_246[58] = __pyx_t_184;\n+ __pyx_t_246[59] = __pyx_t_185;\n+ __pyx_t_246[60] = __pyx_t_186;\n+ __pyx_t_246[61] = __pyx_t_187;\n+ __pyx_t_246[62] = __pyx_t_188;\n+ __pyx_t_246[63] = __pyx_t_189;\n+ __pyx_t_246[64] = __pyx_t_190;\n+ __pyx_t_246[65] = __pyx_t_191;\n+ __pyx_t_246[66] = __pyx_t_192;\n+ __pyx_t_246[67] = __pyx_t_193;\n+ __pyx_t_246[68] = __pyx_t_194;\n+ __pyx_t_246[69] = __pyx_t_195;\n+ __pyx_t_246[70] = __pyx_t_196;\n+ __pyx_t_246[71] = __pyx_t_197;\n+ __pyx_t_246[72] = __pyx_t_198;\n+ __pyx_t_246[73] = __pyx_t_199;\n+ __pyx_t_246[74] = __pyx_t_200;\n+ __pyx_t_246[75] = __pyx_t_201;\n+ __pyx_t_246[76] = __pyx_t_202;\n+ __pyx_t_246[77] = __pyx_t_203;\n+ __pyx_t_246[78] = __pyx_t_204;\n+ __pyx_t_246[79] = __pyx_t_205;\n+ __pyx_t_246[80] = __pyx_t_206;\n+ __pyx_t_246[81] = __pyx_t_207;\n+ __pyx_t_246[82] = __pyx_t_208;\n+ __pyx_t_246[83] = __pyx_t_209;\n+ __pyx_t_246[84] = __pyx_t_210;\n+ __pyx_t_246[85] = __pyx_t_211;\n+ __pyx_t_246[86] = __pyx_t_212;\n+ __pyx_t_246[87] = __pyx_t_213;\n+ __pyx_t_246[88] = __pyx_t_214;\n+ __pyx_t_246[89] = __pyx_t_215;\n+ __pyx_t_246[90] = __pyx_t_216;\n+ __pyx_t_246[91] = __pyx_t_217;\n+ __pyx_t_246[92] = __pyx_t_218;\n+ __pyx_t_246[93] = __pyx_t_219;\n+ __pyx_t_246[94] = __pyx_t_220;\n+ __pyx_t_246[95] = __pyx_t_221;\n+ __pyx_t_246[96] = __pyx_t_222;\n+ __pyx_t_246[97] = __pyx_t_223;\n+ __pyx_t_246[98] = __pyx_t_224;\n+ __pyx_t_246[99] = __pyx_t_225;\n+ __pyx_t_246[100] = __pyx_t_226;\n+ __pyx_t_246[101] = __pyx_t_227;\n+ __pyx_t_246[102] = __pyx_t_228;\n+ __pyx_t_246[103] = __pyx_t_229;\n+ __pyx_t_246[104] = __pyx_t_230;\n+ __pyx_t_246[105] = __pyx_t_231;\n+ __pyx_t_246[106] = __pyx_t_232;\n+ __pyx_t_246[107] = __pyx_t_233;\n+ __pyx_t_246[108] = __pyx_t_234;\n+ __pyx_t_246[109] = __pyx_t_235;\n+ __pyx_t_246[110] = __pyx_t_236;\n+ __pyx_t_246[111] = __pyx_t_237;\n+ __pyx_t_246[112] = __pyx_t_238;\n+ __pyx_t_246[113] = __pyx_t_239;\n+ __pyx_t_246[114] = __pyx_t_240;\n+ __pyx_t_246[115] = __pyx_t_241;\n+ __pyx_t_246[116] = __pyx_t_242;\n+ __pyx_t_246[117] = __pyx_t_243;\n+ __pyx_t_246[118] = __pyx_t_244;\n+ __pyx_t_246[119] = __pyx_t_245;\n+ __pyx_v_8fastsnmp_11snmp_parser_sid12s = __pyx_t_246;\n+\n+ \/* \"fastsnmp\/snmp_parser.pyx\":136\n+ * \n+ * \n+ * def objectid_decode(stream): # <<<<<<<<<<<<<<\n+ * cdef char *stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_1objectid_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_pdu_response_decode, __pyx_t_2) < 0) __PYX_ERR(0, 74, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_objectid_decode, __pyx_t_2) < 0) __PYX_ERR(0, 136, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":78\n- * \n- * \n- * def objectid_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"Decode a stream into an ObjectID.\n- * \n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_3objectid_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 78, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_objectid_decode, __pyx_t_2) < 0) __PYX_ERR(0, 78, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":133\n- * return value\n+ \/* \"fastsnmp\/snmp_parser.pyx\":267\n+ * return retval\n * \n * def objectid_encode(oid): # <<<<<<<<<<<<<<\n * \"\"\"\n * encode an ObjectID into stream\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_5objectid_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_3objectid_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 267, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_objectid_encode, __pyx_t_2) < 0) __PYX_ERR(0, 133, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_objectid_encode, __pyx_t_2) < 0) __PYX_ERR(0, 267, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":179\n- * \n- * \n- * def octetstring_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * decode an octetstring into string\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_7octetstring_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 179, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":308\n+ * return <bytes> data[:data_len]\n+ * \n+ * def octetstring_decode(bytes stream not None, int auto_str=1): # <<<<<<<<<<<<<<\n+ * return c_octetstring_decode(stream, len(stream), auto_str)\n+ * \n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_5octetstring_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 308, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_octetstring_decode, __pyx_t_2) < 0) __PYX_ERR(0, 179, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_octetstring_decode, __pyx_t_2) < 0) __PYX_ERR(0, 308, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":194\n+ \/* \"fastsnmp\/snmp_parser.pyx\":312\n * \n * \n * def octetstring_encode(string): # <<<<<<<<<<<<<<\n * \"\"\"\n * encode an octetstring into string\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_9octetstring_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 194, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_7octetstring_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 312, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_octetstring_encode, __pyx_t_2) < 0) __PYX_ERR(0, 194, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_octetstring_encode, __pyx_t_2) < 0) __PYX_ERR(0, 312, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":206\n- * \n- * \n- * def integer_encode(integer): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * encode an integer\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_11integer_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 206, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":340\n+ * return len\n+ * \n+ * def integer_encode(const uint64_t value): # <<<<<<<<<<<<<<\n+ * # little -> big\n+ * cdef size_t slen, i\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_9integer_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 340, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_encode, __pyx_t_2) < 0) __PYX_ERR(0, 206, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_encode, __pyx_t_2) < 0) __PYX_ERR(0, 340, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":221\n- * \n- * \n- * def integer_decode(stream): # <<<<<<<<<<<<<<\n+ \/* \"fastsnmp\/snmp_parser.pyx\":351\n+ * return <bytes> res[:slen]\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n * \"\"\"\n * Decode input stream into a integer\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_13integer_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 221, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_11integer_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 351, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_decode, __pyx_t_2) < 0) __PYX_ERR(0, 221, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_decode, __pyx_t_2) < 0) __PYX_ERR(0, 351, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":236\n- * \n- * \n- * def sequence_decode(stream): # <<<<<<<<<<<<<<\n+ \/* \"fastsnmp\/snmp_parser.pyx\":369\n+ * return value\n+ * \n+ * def integer_decode(bytes stream not None): # <<<<<<<<<<<<<<\n * \"\"\"\n- * Decode input stream into as sequence\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_15sequence_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 236, __pyx_L1_error)\n+ * Decode input stream into a integer\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_13integer_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 369, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_sequence_decode, __pyx_t_2) < 0) __PYX_ERR(0, 236, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_integer_decode, __pyx_t_2) < 0) __PYX_ERR(0, 369, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":257\n- * \n- * tagDecodeDict = {\n- * 0x02: integer_decode, # <<<<<<<<<<<<<<\n- * 0x04: octetstring_decode,\n- * 0x05: lambda x: b'',\n- *\/\n- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 257, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":392\n+ * return value\n+ * \n+ * def sequence_decode(bytes stream not None) -> list: # <<<<<<<<<<<<<<\n+ * cdef char * stream_char = stream\n+ * cdef size_t stream_len = len(stream)\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_15sequence_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 392, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_2, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":258\n- * tagDecodeDict = {\n- * 0x02: integer_decode,\n- * 0x04: octetstring_decode, # <<<<<<<<<<<<<<\n- * 0x05: lambda x: b'',\n- * 0x06: objectid_decode,\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_octetstring_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 258, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_4, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":259\n- * 0x02: integer_decode,\n- * 0x04: octetstring_decode,\n- * 0x05: lambda x: b'', # <<<<<<<<<<<<<<\n- * 0x06: objectid_decode,\n- * 0x30: sequence_decode,\n- *\/\n- __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_38lambda, 0, __pyx_n_s_lambda, NULL, __pyx_n_s_fastsnmp_snmp_parser, __pyx_d, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 259, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_5, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":260\n- * 0x04: octetstring_decode,\n- * 0x05: lambda x: b'',\n- * 0x06: objectid_decode, # <<<<<<<<<<<<<<\n- * 0x30: sequence_decode,\n- * \n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_objectid_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 260, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_6, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":261\n- * 0x05: lambda x: b'',\n- * 0x06: objectid_decode,\n- * 0x30: sequence_decode, # <<<<<<<<<<<<<<\n- * \n- * # Application types\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_sequence_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 261, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_48, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":264\n- * \n- * # Application types\n- * 0x40: octetstring_decode, # IPAddress, # <<<<<<<<<<<<<<\n- * 0x41: integer_decode, # Counter\n- * 0x42: integer_decode, # Gauge\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_octetstring_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 264, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_64, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":265\n- * # Application types\n- * 0x40: octetstring_decode, # IPAddress,\n- * 0x41: integer_decode, # Counter # <<<<<<<<<<<<<<\n- * 0x42: integer_decode, # Gauge\n- * 0x46: integer_decode, # Counter64\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 265, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_65, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":266\n- * 0x40: octetstring_decode, # IPAddress,\n- * 0x41: integer_decode, # Counter\n- * 0x42: integer_decode, # Gauge # <<<<<<<<<<<<<<\n- * 0x46: integer_decode, # Counter64\n- * 0x43: integer_decode, # TimeTicks,\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 266, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_66, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":267\n- * 0x41: integer_decode, # Counter\n- * 0x42: integer_decode, # Gauge\n- * 0x46: integer_decode, # Counter64 # <<<<<<<<<<<<<<\n- * 0x43: integer_decode, # TimeTicks,\n- * \n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 267, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_70, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":268\n- * 0x42: integer_decode, # Gauge\n- * 0x46: integer_decode, # Counter64\n- * 0x43: integer_decode, # TimeTicks, # <<<<<<<<<<<<<<\n- * \n- * 0xa2: pdu_response_decode,\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_integer_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 268, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_67, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":270\n- * 0x43: integer_decode, # TimeTicks,\n- * \n- * 0xa2: pdu_response_decode, # <<<<<<<<<<<<<<\n- * 0x80: lambda x: None, # NoSuchObject_TAG\n- * 0x81: lambda x: None, # NoSuchInstance_TAG\n- *\/\n- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_pdu_response_decode); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 270, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_162, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":271\n- * \n- * 0xa2: pdu_response_decode,\n- * 0x80: lambda x: None, # NoSuchObject_TAG # <<<<<<<<<<<<<<\n- * 0x81: lambda x: None, # NoSuchInstance_TAG\n- * 0x82: lambda x: None, # EndOfMibView_TAG\n- *\/\n- __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_39lambda1, 0, __pyx_n_s_lambda, NULL, __pyx_n_s_fastsnmp_snmp_parser, __pyx_d, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 271, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_128, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":272\n- * 0xa2: pdu_response_decode,\n- * 0x80: lambda x: None, # NoSuchObject_TAG\n- * 0x81: lambda x: None, # NoSuchInstance_TAG # <<<<<<<<<<<<<<\n- * 0x82: lambda x: None, # EndOfMibView_TAG\n- * }\n- *\/\n- __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_40lambda2, 0, __pyx_n_s_lambda, NULL, __pyx_n_s_fastsnmp_snmp_parser, __pyx_d, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 272, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_129, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n-\n- \/* \"fastsnmp\/snmp_parser.pyx\":273\n- * 0x80: lambda x: None, # NoSuchObject_TAG\n- * 0x81: lambda x: None, # NoSuchInstance_TAG\n- * 0x82: lambda x: None, # EndOfMibView_TAG # <<<<<<<<<<<<<<\n- * }\n- * \n- *\/\n- __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_41lambda3, 0, __pyx_n_s_lambda, NULL, __pyx_n_s_fastsnmp_snmp_parser, __pyx_d, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 273, __pyx_L1_error)\n- __Pyx_GOTREF(__pyx_t_1);\n- if (PyDict_SetItem(__pyx_t_2, __pyx_int_130, __pyx_t_1) < 0) __PYX_ERR(0, 257, __pyx_L1_error)\n- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_tagDecodeDict, __pyx_t_2) < 0) __PYX_ERR(0, 256, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_sequence_decode, __pyx_t_2) < 0) __PYX_ERR(0, 392, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":277\n- * \n- * \n- * def length_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER length field, returing the length and the\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_17length_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 277, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":462\n+ * \n+ * \n+ * def length_decode(bytes data): # <<<<<<<<<<<<<<\n+ * cdef size_t encode_length, length\n+ * length_decode_c(data, &length, &encode_length)\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_17length_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 462, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_decode, __pyx_t_2) < 0) __PYX_ERR(0, 277, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_decode, __pyx_t_2) < 0) __PYX_ERR(0, 462, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":301\n+ \/* \"fastsnmp\/snmp_parser.pyx\":468\n * \n * \n * def length_encode(length): # <<<<<<<<<<<<<<\n * \"\"\"\n * Function takes the length of the contents and\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_19length_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 301, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_19length_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 468, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_encode, __pyx_t_2) < 0) __PYX_ERR(0, 301, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_length_encode, __pyx_t_2) < 0) __PYX_ERR(0, 468, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":337\n- * \n- * \n- * def tag_decode(stream): # <<<<<<<<<<<<<<\n- * \"\"\"\n- * Decode a BER tag field, returning the tag and the remainder\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_21tag_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 337, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":518\n+ * return 0\n+ * \n+ * def tag_decode(bytes stream not None): # <<<<<<<<<<<<<<\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_21tag_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 518, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_tag_decode, __pyx_t_2) < 0) __PYX_ERR(0, 337, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_tag_decode, __pyx_t_2) < 0) __PYX_ERR(0, 518, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":367\n+ \/* \"fastsnmp\/snmp_parser.pyx\":525\n * \n * \n * def tag_encode(asn_tag_class, asn_tag_format, asn_tag_number): # <<<<<<<<<<<<<<\n * \"\"\"\n * Returns encoded identifier octets for\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_23tag_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 367, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_23tag_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 525, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_tag_encode, __pyx_t_2) < 0) __PYX_ERR(0, 367, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_tag_encode, __pyx_t_2) < 0) __PYX_ERR(0, 525, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":402\n+ \/* \"fastsnmp\/snmp_parser.pyx\":560\n * \n * # TODO: implement more encoders\n * def value_encode(value=None, value_type='Null'): # <<<<<<<<<<<<<<\n * \"\"\"\n * Encoded value by ASN.1\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_25value_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 402, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_25value_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 560, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_value_encode, __pyx_t_2) < 0) __PYX_ERR(0, 402, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_value_encode, __pyx_t_2) < 0) __PYX_ERR(0, 560, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":418\n+ \/* \"fastsnmp\/snmp_parser.pyx\":576\n * \n * \n * def encode_varbind(oid, value_type='Null', value=None): # <<<<<<<<<<<<<<\n * if value is None:\n * value_type = 'Null'\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_27encode_varbind, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 418, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_27encode_varbind, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 576, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_encode_varbind, __pyx_t_2) < 0) __PYX_ERR(0, 418, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_encode_varbind, __pyx_t_2) < 0) __PYX_ERR(0, 576, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":436\n+ \/* \"fastsnmp\/snmp_parser.pyx\":594\n * \n * \n * def varbinds_encode(varbinds): # <<<<<<<<<<<<<<\n * res = bytearray()\n * for varbind in varbinds:\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_29varbinds_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 436, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_29varbinds_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 594, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_varbinds_encode, __pyx_t_2) < 0) __PYX_ERR(0, 436, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_varbinds_encode, __pyx_t_2) < 0) __PYX_ERR(0, 594, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":452\n+ \/* \"fastsnmp\/snmp_parser.pyx\":610\n * \n * \n * def varbinds_encode_tlv(varbinds): # <<<<<<<<<<<<<<\n * varbinds_data = varbinds_encode(varbinds)\n * varbinds_id = tag_encode(asnTagClasses['UNIVERSAL'], asnTagFormats['CONSTRUCTED'], ASN_TYPES['Sequence'])\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_31varbinds_encode_tlv, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 452, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_31varbinds_encode_tlv, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 610, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_varbinds_encode_tlv, __pyx_t_2) < 0) __PYX_ERR(0, 452, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_varbinds_encode_tlv, __pyx_t_2) < 0) __PYX_ERR(0, 610, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":459\n+ \/* \"fastsnmp\/snmp_parser.pyx\":617\n * \n * \n * def msg_encode(req_id, community, varbinds, msg_type=\"GetBulk\", max_repetitions=10, non_repeaters=0): # <<<<<<<<<<<<<<\n * \"\"\"\n * Build SNMP-message\n *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_33msg_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 459, __pyx_L1_error)\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_33msg_encode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 617, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_msg_encode, __pyx_t_2) < 0) __PYX_ERR(0, 459, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_msg_encode, __pyx_t_2) < 0) __PYX_ERR(0, 617, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":536\n+ \/* \"fastsnmp\/snmp_parser.pyx\":696\n * \n * \n * def msg_decode(stream): # <<<<<<<<<<<<<<\n- * (tag, stream) = tag_decode(stream)\n- * (length, stream) = length_decode(stream)\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_35msg_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 536, __pyx_L1_error)\n+ * cdef uint64_t tag=0\n+ * cdef size_t encode_length, length\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_35msg_decode, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 696, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_msg_decode, __pyx_t_2) < 0) __PYX_ERR(0, 536, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_msg_decode, __pyx_t_2) < 0) __PYX_ERR(0, 696, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n- \/* \"fastsnmp\/snmp_parser.pyx\":546\n- * \n- * \n- * def parse_varbind(var_bind_list, orig_main_oids, oids_to_poll): # <<<<<<<<<<<<<<\n- * result = []\n- * next_oids = None\n- *\/\n- __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_37parse_varbind, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 546, __pyx_L1_error)\n+ \/* \"fastsnmp\/snmp_parser.pyx\":713\n+ * \n+ * \n+ * def parse_varbind(list var_bind_list not None, tuple orig_main_oids not None, tuple oids_to_poll not None): # <<<<<<<<<<<<<<\n+ * cdef str oid, main_oid, index_part\n+ * cdef list result = [], item\n+ *\/\n+ __pyx_t_2 = PyCFunction_NewEx(&__pyx_mdef_8fastsnmp_11snmp_parser_37parse_varbind, NULL, __pyx_n_s_fastsnmp_snmp_parser); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 713, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n- if (PyDict_SetItem(__pyx_d, __pyx_n_s_parse_varbind, __pyx_t_2) < 0) __PYX_ERR(0, 546, __pyx_L1_error)\n+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_parse_varbind, __pyx_t_2) < 0) __PYX_ERR(0, 713, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n \n \/* \"fastsnmp\/snmp_parser.pyx\":1\n- * # cython: embedsignature=True # <<<<<<<<<<<<<<\n- * # cython: language_level=3\n- * # adds doc-strings for sphinx\n+ * # cython: nonecheck=False, boundscheck=False, wraparound=False, language_level=3 # <<<<<<<<<<<<<<\n+ * # cython: c_string_type=str, c_string_encoding=ascii\n+ * # cython: profile=True\n *\/\n __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1, __pyx_L1_error)\n __Pyx_GOTREF(__pyx_t_2);\n if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_2) < 0) __PYX_ERR(0, 1, __pyx_L1_error)\n __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_TraceReturn(Py_None, 0);\n \n \/*--- Wrapped vars code ---*\/\n \n@@ -12646,250 +13899,101 @@\n return result;\n }\n \n-\/* GetModuleGlobalName *\/\n-static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name) {\n- PyObject *result;\n-#if !CYTHON_AVOID_BORROWED_REFS\n- result = PyDict_GetItem(__pyx_d, name);\n- if (likely(result)) {\n- Py_INCREF(result);\n+\/* Profile *\/\n+#if CYTHON_PROFILE\n+static int __Pyx_TraceSetupAndCall(PyCodeObject** code,\n+ PyFrameObject** frame,\n+ const char *funcname,\n+ const char *srcfile,\n+ int firstlineno) {\n+ PyObject *type, *value, *traceback;\n+ int retval;\n+ PyThreadState* tstate = PyThreadState_GET();\n+ if (*frame == NULL || !CYTHON_PROFILE_REUSE_FRAME) {\n+ if (*code == NULL) {\n+ *code = __Pyx_createFrameCodeObject(funcname, srcfile, firstlineno);\n+ if (*code == NULL) return 0;\n+ }\n+ *frame = PyFrame_New(\n+ tstate, \/*PyThreadState *tstate*\/\n+ *code, \/*PyCodeObject *code*\/\n+ __pyx_d, \/*PyObject *globals*\/\n+ 0 \/*PyObject *locals*\/\n+ );\n+ if (*frame == NULL) return 0;\n+ if (CYTHON_TRACE && (*frame)->f_trace == NULL) {\n+ Py_INCREF(Py_None);\n+ (*frame)->f_trace = Py_None;\n+ }\n+#if PY_VERSION_HEX < 0x030400B1\n } else {\n-#else\n- result = PyObject_GetItem(__pyx_d, name);\n- if (!result) {\n- PyErr_Clear();\n-#endif\n- result = __Pyx_GetBuiltinName(name);\n- }\n- return result;\n+ (*frame)->f_tstate = tstate;\n+#endif\n+ }\n+ __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);\n+ retval = 1;\n+ tstate->tracing++;\n+ tstate->use_tracing = 0;\n+ PyErr_Fetch(&type, &value, &traceback);\n+ #if CYTHON_TRACE\n+ if (tstate->c_tracefunc)\n+ retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0;\n+ if (retval && tstate->c_profilefunc)\n+ #endif\n+ retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0;\n+ tstate->use_tracing = (tstate->c_profilefunc ||\n+ (CYTHON_TRACE && tstate->c_tracefunc));\n+ tstate->tracing--;\n+ if (retval) {\n+ PyErr_Restore(type, value, traceback);\n+ return tstate->use_tracing && retval;\n+ } else {\n+ Py_XDECREF(type);\n+ Py_XDECREF(value);\n+ Py_XDECREF(traceback);\n+ return -1;\n+ }\n }\n-\n-\/* PyCFunctionFastCall *\/\n- #if CYTHON_FAST_PYCCALL\n-static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, PyObject **args, Py_ssize_t nargs) {\n- PyCFunctionObject *func = (PyCFunctionObject*)func_obj;\n- PyCFunction meth = PyCFunction_GET_FUNCTION(func);\n- PyObject *self = PyCFunction_GET_SELF(func);\n- PyObject *result;\n- int flags;\n- assert(PyCFunction_Check(func));\n- assert(METH_FASTCALL == PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST));\n- assert(nargs >= 0);\n- assert(nargs == 0 || args != NULL);\n- \/* _PyCFunction_FastCallDict() must not be called with an exception set,\n- because it may clear it (directly or indirectly) and so the\n- caller loses its exception *\/\n- assert(!PyErr_Occurred());\n- return (*((__Pyx_PyCFunctionFast)meth)) (self, args, nargs, NULL);\n+static PyCodeObject *__Pyx_createFrameCodeObject(const char *funcname, const char *srcfile, int firstlineno) {\n+ PyObject *py_srcfile = 0;\n+ PyObject *py_funcname = 0;\n+ PyCodeObject *py_code = 0;\n+ #if PY_MAJOR_VERSION < 3\n+ py_funcname = PyString_FromString(funcname);\n+ py_srcfile = PyString_FromString(srcfile);\n+ #else\n+ py_funcname = PyUnicode_FromString(funcname);\n+ py_srcfile = PyUnicode_FromString(srcfile);\n+ #endif\n+ if (!py_funcname | !py_srcfile) goto bad;\n+ py_code = PyCode_New(\n+ 0,\n+ #if PY_MAJOR_VERSION >= 3\n+ 0,\n+ #endif\n+ 0,\n+ 0,\n+ 0,\n+ __pyx_empty_bytes, \/*PyObject *code,*\/\n+ __pyx_empty_tuple, \/*PyObject *consts,*\/\n+ __pyx_empty_tuple, \/*PyObject *names,*\/\n+ __pyx_empty_tuple, \/*PyObject *varnames,*\/\n+ __pyx_empty_tuple, \/*PyObject *freevars,*\/\n+ __pyx_empty_tuple, \/*PyObject *cellvars,*\/\n+ py_srcfile, \/*PyObject *filename,*\/\n+ py_funcname, \/*PyObject *name,*\/\n+ firstlineno,\n+ __pyx_empty_bytes \/*PyObject *lnotab*\/\n+ );\n+bad:\n+ Py_XDECREF(py_srcfile);\n+ Py_XDECREF(py_funcname);\n+ return py_code;\n }\n-#endif \/\/ CYTHON_FAST_PYCCALL\n-\n-\/* PyFunctionFastCall *\/\n- #if CYTHON_FAST_PYCALL\n-#include \"frameobject.h\"\n-static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na,\n- PyObject *globals) {\n- PyFrameObject *f;\n- PyThreadState *tstate = PyThreadState_GET();\n- PyObject **fastlocals;\n- Py_ssize_t i;\n- PyObject *result;\n- assert(globals != NULL);\n- \/* XXX Perhaps we should create a specialized\n- PyFrame_New() that doesn't take locals, but does\n- take builtins without sanity checking them.\n- *\/\n- assert(tstate != NULL);\n- f = PyFrame_New(tstate, co, globals, NULL);\n- if (f == NULL) {\n- return NULL;\n- }\n- fastlocals = f->f_localsplus;\n- for (i = 0; i < na; i++) {\n- Py_INCREF(*args);\n- fastlocals[i] = *args++;\n- }\n- result = PyEval_EvalFrameEx(f,0);\n- ++tstate->recursion_depth;\n- Py_DECREF(f);\n- --tstate->recursion_depth;\n- return result;\n-}\n-#if 1 || PY_VERSION_HEX < 0x030600B1\n-static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, int nargs, PyObject *kwargs) {\n- PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);\n- PyObject *globals = PyFunction_GET_GLOBALS(func);\n- PyObject *argdefs = PyFunction_GET_DEFAULTS(func);\n- PyObject *closure;\n-#if PY_MAJOR_VERSION >= 3\n- PyObject *kwdefs;\n-#endif\n- PyObject *kwtuple, **k;\n- PyObject **d;\n- Py_ssize_t nd;\n- Py_ssize_t nk;\n- PyObject *result;\n- assert(kwargs == NULL || PyDict_Check(kwargs));\n- nk = kwargs ? PyDict_Size(kwargs) : 0;\n- if (Py_EnterRecursiveCall((char*)\" while calling a Python object\")) {\n- return NULL;\n- }\n- if (\n-#if PY_MAJOR_VERSION >= 3\n- co->co_kwonlyargcount == 0 &&\n-#endif\n- likely(kwargs == NULL || nk == 0) &&\n- co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) {\n- if (argdefs == NULL && co->co_argcount == nargs) {\n- result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals);\n- goto done;\n- }\n- else if (nargs == 0 && argdefs != NULL\n- && co->co_argcount == Py_SIZE(argdefs)) {\n- \/* function called with no arguments, but all parameters have\n- a default value: use default values as arguments .*\/\n- args = &PyTuple_GET_ITEM(argdefs, 0);\n- result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals);\n- goto done;\n- }\n- }\n- if (kwargs != NULL) {\n- Py_ssize_t pos, i;\n- kwtuple = PyTuple_New(2 * nk);\n- if (kwtuple == NULL) {\n- result = NULL;\n- goto done;\n- }\n- k = &PyTuple_GET_ITEM(kwtuple, 0);\n- pos = i = 0;\n- while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) {\n- Py_INCREF(k[i]);\n- Py_INCREF(k[i+1]);\n- i += 2;\n- }\n- nk = i \/ 2;\n- }\n- else {\n- kwtuple = NULL;\n- k = NULL;\n- }\n- closure = PyFunction_GET_CLOSURE(func);\n-#if PY_MAJOR_VERSION >= 3\n- kwdefs = PyFunction_GET_KW_DEFAULTS(func);\n-#endif\n- if (argdefs != NULL) {\n- d = &PyTuple_GET_ITEM(argdefs, 0);\n- nd = Py_SIZE(argdefs);\n- }\n- else {\n- d = NULL;\n- nd = 0;\n- }\n-#if PY_MAJOR_VERSION >= 3\n- result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL,\n- args, nargs,\n- k, (int)nk,\n- d, (int)nd, kwdefs, closure);\n-#else\n- result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL,\n- args, nargs,\n- k, (int)nk,\n- d, (int)nd, closure);\n-#endif\n- Py_XDECREF(kwtuple);\n-done:\n- Py_LeaveRecursiveCall();\n- return result;\n-}\n-#endif \/\/ CPython < 3.6\n-#endif \/\/ CYTHON_FAST_PYCALL\n-\n-\/* PyObjectCall *\/\n- #if CYTHON_COMPILING_IN_CPYTHON\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {\n- PyObject *result;\n- ternaryfunc call = func->ob_type->tp_call;\n- if (unlikely(!call))\n- return PyObject_Call(func, arg, kw);\n- if (unlikely(Py_EnterRecursiveCall((char*)\" while calling a Python object\")))\n- return NULL;\n- result = (*call)(func, arg, kw);\n- Py_LeaveRecursiveCall();\n- if (unlikely(!result) && unlikely(!PyErr_Occurred())) {\n- PyErr_SetString(\n- PyExc_SystemError,\n- \"NULL result without error in PyObject_Call\");\n- }\n- return result;\n-}\n-#endif\n-\n-\/* PyObjectCallMethO *\/\n- #if CYTHON_COMPILING_IN_CPYTHON\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) {\n- PyObject *self, *result;\n- PyCFunction cfunc;\n- cfunc = PyCFunction_GET_FUNCTION(func);\n- self = PyCFunction_GET_SELF(func);\n- if (unlikely(Py_EnterRecursiveCall((char*)\" while calling a Python object\")))\n- return NULL;\n- result = cfunc(self, arg);\n- Py_LeaveRecursiveCall();\n- if (unlikely(!result) && unlikely(!PyErr_Occurred())) {\n- PyErr_SetString(\n- PyExc_SystemError,\n- \"NULL result without error in PyObject_Call\");\n- }\n- return result;\n-}\n-#endif\n-\n-\/* PyObjectCallOneArg *\/\n- #if CYTHON_COMPILING_IN_CPYTHON\n-static PyObject* __Pyx__PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n- PyObject *result;\n- PyObject *args = PyTuple_New(1);\n- if (unlikely(!args)) return NULL;\n- Py_INCREF(arg);\n- PyTuple_SET_ITEM(args, 0, arg);\n- result = __Pyx_PyObject_Call(func, args, NULL);\n- Py_DECREF(args);\n- return result;\n-}\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n-#if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(func)) {\n- return __Pyx_PyFunction_FastCall(func, &arg, 1);\n- }\n-#endif\n-#ifdef __Pyx_CyFunction_USED\n- if (likely(PyCFunction_Check(func) || PyObject_TypeCheck(func, __pyx_CyFunctionType))) {\n-#else\n- if (likely(PyCFunction_Check(func))) {\n-#endif\n- if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) {\n- return __Pyx_PyObject_CallMethO(func, arg);\n-#if CYTHON_FAST_PYCCALL\n- } else if (PyCFunction_GET_FLAGS(func) & METH_FASTCALL) {\n- return __Pyx_PyCFunction_FastCall(func, &arg, 1);\n-#endif\n- }\n- }\n- return __Pyx__PyObject_CallOneArg(func, arg);\n-}\n-#else\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n- PyObject *result;\n- PyObject *args = PyTuple_Pack(1, arg);\n- if (unlikely(!args)) return NULL;\n- result = __Pyx_PyObject_Call(func, args, NULL);\n- Py_DECREF(args);\n- return result;\n-}\n #endif\n \n \/* PyErrFetchRestore *\/\n- #if CYTHON_FAST_THREAD_STATE\n+#if CYTHON_FAST_THREAD_STATE\n static CYTHON_INLINE void __Pyx_ErrRestoreInState(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {\n PyObject *tmp_type, *tmp_value, *tmp_tb;\n tmp_type = tstate->curexc_type;\n@@ -12912,8 +14016,70 @@\n }\n #endif\n \n+\/* WriteUnraisableException *\/\n+static void __Pyx_WriteUnraisable(const char *name, CYTHON_UNUSED int clineno,\n+ CYTHON_UNUSED int lineno, CYTHON_UNUSED const char *filename,\n+ int full_traceback, CYTHON_UNUSED int nogil) {\n+ PyObject *old_exc, *old_val, *old_tb;\n+ PyObject *ctx;\n+ __Pyx_PyThreadState_declare\n+#ifdef WITH_THREAD\n+ PyGILState_STATE state;\n+ if (nogil)\n+ state = PyGILState_Ensure();\n+#ifdef _MSC_VER\n+ else state = (PyGILState_STATE)-1;\n+#endif\n+#endif\n+ __Pyx_PyThreadState_assign\n+ __Pyx_ErrFetch(&old_exc, &old_val, &old_tb);\n+ if (full_traceback) {\n+ Py_XINCREF(old_exc);\n+ Py_XINCREF(old_val);\n+ Py_XINCREF(old_tb);\n+ __Pyx_ErrRestore(old_exc, old_val, old_tb);\n+ PyErr_PrintEx(1);\n+ }\n+ #if PY_MAJOR_VERSION < 3\n+ ctx = PyString_FromString(name);\n+ #else\n+ ctx = PyUnicode_FromString(name);\n+ #endif\n+ __Pyx_ErrRestore(old_exc, old_val, old_tb);\n+ if (!ctx) {\n+ PyErr_WriteUnraisable(Py_None);\n+ } else {\n+ PyErr_WriteUnraisable(ctx);\n+ Py_DECREF(ctx);\n+ }\n+#ifdef WITH_THREAD\n+ if (nogil)\n+ PyGILState_Release(state);\n+#endif\n+}\n+\n+\/* PyObjectCall *\/\n+#if CYTHON_COMPILING_IN_CPYTHON\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {\n+ PyObject *result;\n+ ternaryfunc call = func->ob_type->tp_call;\n+ if (unlikely(!call))\n+ return PyObject_Call(func, arg, kw);\n+ if (unlikely(Py_EnterRecursiveCall((char*)\" while calling a Python object\")))\n+ return NULL;\n+ result = (*call)(func, arg, kw);\n+ Py_LeaveRecursiveCall();\n+ if (unlikely(!result) && unlikely(!PyErr_Occurred())) {\n+ PyErr_SetString(\n+ PyExc_SystemError,\n+ \"NULL result without error in PyObject_Call\");\n+ }\n+ return result;\n+}\n+#endif\n+\n \/* RaiseException *\/\n- #if PY_MAJOR_VERSION < 3\n+#if PY_MAJOR_VERSION < 3\n static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb,\n CYTHON_UNUSED PyObject *cause) {\n __Pyx_PyThreadState_declare\n@@ -13075,1470 +14241,8 @@\n }\n #endif\n \n-\/* GetItemInt *\/\n- static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {\n- PyObject *r;\n- if (!j) return NULL;\n- r = PyObject_GetItem(o, j);\n- Py_DECREF(j);\n- return r;\n-}\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i,\n- CYTHON_NCP_UNUSED int wraparound,\n- CYTHON_NCP_UNUSED int boundscheck) {\n-#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (wraparound & unlikely(i < 0)) i += PyList_GET_SIZE(o);\n- if ((!boundscheck) || likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {\n- PyObject *r = PyList_GET_ITEM(o, i);\n- Py_INCREF(r);\n- return r;\n- }\n- return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n-#else\n- return PySequence_GetItem(o, i);\n-#endif\n-}\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i,\n- CYTHON_NCP_UNUSED int wraparound,\n- CYTHON_NCP_UNUSED int boundscheck) {\n-#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- if (wraparound & unlikely(i < 0)) i += PyTuple_GET_SIZE(o);\n- if ((!boundscheck) || likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {\n- PyObject *r = PyTuple_GET_ITEM(o, i);\n- Py_INCREF(r);\n- return r;\n- }\n- return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n-#else\n- return PySequence_GetItem(o, i);\n-#endif\n-}\n-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int is_list,\n- CYTHON_NCP_UNUSED int wraparound,\n- CYTHON_NCP_UNUSED int boundscheck) {\n-#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS && CYTHON_USE_TYPE_SLOTS\n- if (is_list || PyList_CheckExact(o)) {\n- Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyList_GET_SIZE(o);\n- if ((!boundscheck) || (likely((n >= 0) & (n < PyList_GET_SIZE(o))))) {\n- PyObject *r = PyList_GET_ITEM(o, n);\n- Py_INCREF(r);\n- return r;\n- }\n- }\n- else if (PyTuple_CheckExact(o)) {\n- Py_ssize_t n = ((!wraparound) | likely(i >= 0)) ? i : i + PyTuple_GET_SIZE(o);\n- if ((!boundscheck) || likely((n >= 0) & (n < PyTuple_GET_SIZE(o)))) {\n- PyObject *r = PyTuple_GET_ITEM(o, n);\n- Py_INCREF(r);\n- return r;\n- }\n- } else {\n- PySequenceMethods *m = Py_TYPE(o)->tp_as_sequence;\n- if (likely(m && m->sq_item)) {\n- if (wraparound && unlikely(i < 0) && likely(m->sq_length)) {\n- Py_ssize_t l = m->sq_length(o);\n- if (likely(l >= 0)) {\n- i += l;\n- } else {\n- if (!PyErr_ExceptionMatches(PyExc_OverflowError))\n- return NULL;\n- PyErr_Clear();\n- }\n- }\n- return m->sq_item(o, i);\n- }\n- }\n-#else\n- if (is_list || PySequence_Check(o)) {\n- return PySequence_GetItem(o, i);\n- }\n-#endif\n- return __Pyx_GetItemInt_Generic(o, PyInt_FromSsize_t(i));\n-}\n-\n-\/* PyObjectCallMethod1 *\/\n- static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg) {\n- PyObject *method, *result = NULL;\n- method = __Pyx_PyObject_GetAttrStr(obj, method_name);\n- if (unlikely(!method)) goto done;\n-#if CYTHON_UNPACK_METHODS\n- if (likely(PyMethod_Check(method))) {\n- PyObject *self = PyMethod_GET_SELF(method);\n- if (likely(self)) {\n- PyObject *args;\n- PyObject *function = PyMethod_GET_FUNCTION(method);\n- #if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(function)) {\n- PyObject *args[2] = {self, arg};\n- result = __Pyx_PyFunction_FastCall(function, args, 2);\n- goto done;\n- }\n- #endif\n- #if CYTHON_FAST_PYCCALL\n- if (__Pyx_PyFastCFunction_Check(function)) {\n- PyObject *args[2] = {self, arg};\n- result = __Pyx_PyCFunction_FastCall(function, args, 2);\n- goto done;\n- }\n- #endif\n- args = PyTuple_New(2);\n- if (unlikely(!args)) goto done;\n- Py_INCREF(self);\n- PyTuple_SET_ITEM(args, 0, self);\n- Py_INCREF(arg);\n- PyTuple_SET_ITEM(args, 1, arg);\n- Py_INCREF(function);\n- Py_DECREF(method); method = NULL;\n- result = __Pyx_PyObject_Call(function, args, NULL);\n- Py_DECREF(args);\n- Py_DECREF(function);\n- return result;\n- }\n- }\n-#endif\n- result = __Pyx_PyObject_CallOneArg(method, arg);\n-done:\n- Py_XDECREF(method);\n- return result;\n-}\n-\n-\/* append *\/\n- static CYTHON_INLINE int __Pyx_PyObject_Append(PyObject* L, PyObject* x) {\n- if (likely(PyList_CheckExact(L))) {\n- if (unlikely(__Pyx_PyList_Append(L, x) < 0)) return -1;\n- } else {\n- PyObject* retval = __Pyx_PyObject_CallMethod1(L, __pyx_n_s_append, x);\n- if (unlikely(!retval))\n- return -1;\n- Py_DECREF(retval);\n- }\n- return 0;\n-}\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_FloorDivideObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long x;\n- long a = PyInt_AS_LONG(op1);\n- if (unlikely(b == -1 && ((unsigned long)a) == 0-(unsigned long)a))\n- return PyInt_Type.tp_as_number->nb_floor_divide(op1, op2);\n- else {\n- long q, r;\n- q = a \/ b;\n- r = a - q*b;\n- q -= ((r != 0) & ((r ^ b) < 0));\n- x = q;\n- }\n- return PyInt_FromLong(x);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_floor_divide(op1, op2);\n- }\n- }\n- {\n- long q, r;\n- q = a \/ b;\n- r = a - q*b;\n- q -= ((r != 0) & ((r ^ b) < 0));\n- x = q;\n- }\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- {\n- PY_LONG_LONG q, r;\n- q = lla \/ llb;\n- r = lla - q*llb;\n- q -= ((r != 0) & ((r ^ llb) < 0));\n- llx = q;\n- }\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceFloorDivide : PyNumber_FloorDivide)(op1, op2);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_RemainderObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long x;\n- long a = PyInt_AS_LONG(op1);\n- x = a % b;\n- x += ((x != 0) & ((x ^ b) < 0)) * b;\n- return PyInt_FromLong(x);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_remainder(op1, op2);\n- }\n- }\n- x = a % b;\n- x += ((x != 0) & ((x ^ b) < 0)) * b;\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla % llb;\n- llx += ((llx != 0) & ((llx ^ llb) < 0)) * llb;\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceRemainder : PyNumber_Remainder)(op1, op2);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_AddObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long x;\n- long a = PyInt_AS_LONG(op1);\n- x = (long)((unsigned long)a + b);\n- if (likely((x^a) >= 0 || (x^b) >= 0))\n- return PyInt_FromLong(x);\n- return PyLong_Type.tp_as_number->nb_add(op1, op2);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_add(op1, op2);\n- }\n- }\n- x = a + b;\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla + llb;\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- if (PyFloat_CheckExact(op1)) {\n- const long b = intval;\n- double a = PyFloat_AS_DOUBLE(op1);\n- double result;\n- PyFPE_START_PROTECT(\"add\", return NULL)\n- result = ((double)a) + (double)b;\n- PyFPE_END_PROTECT(result)\n- return PyFloat_FromDouble(result);\n- }\n- return (inplace ? PyNumber_InPlaceAdd : PyNumber_Add)(op1, op2);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_EqObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- if (op1 == op2) {\n- Py_RETURN_TRUE;\n- }\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long a = PyInt_AS_LONG(op1);\n- if (a == b) {\n- Py_RETURN_TRUE;\n- } else {\n- Py_RETURN_FALSE;\n- }\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a;\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n- }\n- #if PyLong_SHIFT < 30 && PyLong_SHIFT != 15\n- default: return PyLong_Type.tp_richcompare(op1, op2, Py_EQ);\n- #else\n- default: Py_RETURN_FALSE;\n- #endif\n- }\n- }\n- if (a == b) {\n- Py_RETURN_TRUE;\n- } else {\n- Py_RETURN_FALSE;\n- }\n- }\n- #endif\n- if (PyFloat_CheckExact(op1)) {\n- const long b = intval;\n- double a = PyFloat_AS_DOUBLE(op1);\n- if ((double)a == (double)b) {\n- Py_RETURN_TRUE;\n- } else {\n- Py_RETURN_FALSE;\n- }\n- }\n- return PyObject_RichCompare(op1, op2, Py_EQ);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_AndObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long a = PyInt_AS_LONG(op1);\n- return PyInt_FromLong(a & b);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_and(op1, op2);\n- }\n- }\n- x = a & b;\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla & llb;\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceAnd : PyNumber_And)(op1, op2);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_LshiftObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long a = PyInt_AS_LONG(op1);\n- if (likely(a == (a << b) >> b)) {\n- return PyInt_FromLong(a << b);\n- }\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_lshift(op1, op2);\n- }\n- }\n- x = a << b;\n-#ifdef HAVE_LONG_LONG\n- if (unlikely(a != x >> b)) {\n- lla = a;\n- goto long_long;\n- }\n-#else\n- if (likely(a == x >> b))\n-#endif\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla << llb;\n- if (likely(lla == llx >> llb))\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceLshift : PyNumber_Lshift)(op1, op2);\n-}\n-#endif\n-\n-\/* PyObjectCallNoArg *\/\n- #if CYTHON_COMPILING_IN_CPYTHON\n-static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) {\n-#if CYTHON_FAST_PYCALL\n- if (PyFunction_Check(func)) {\n- return __Pyx_PyFunction_FastCall(func, NULL, 0);\n- }\n-#endif\n-#ifdef __Pyx_CyFunction_USED\n- if (likely(PyCFunction_Check(func) || PyObject_TypeCheck(func, __pyx_CyFunctionType))) {\n-#else\n- if (likely(PyCFunction_Check(func))) {\n-#endif\n- if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) {\n- return __Pyx_PyObject_CallMethO(func, NULL);\n- }\n- }\n- return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL);\n-}\n-#endif\n-\n-\/* PyObjectCallMethod0 *\/\n- static PyObject* __Pyx_PyObject_CallMethod0(PyObject* obj, PyObject* method_name) {\n- PyObject *method, *result = NULL;\n- method = __Pyx_PyObject_GetAttrStr(obj, method_name);\n- if (unlikely(!method)) goto bad;\n-#if CYTHON_UNPACK_METHODS\n- if (likely(PyMethod_Check(method))) {\n- PyObject *self = PyMethod_GET_SELF(method);\n- if (likely(self)) {\n- PyObject *function = PyMethod_GET_FUNCTION(method);\n- result = __Pyx_PyObject_CallOneArg(function, self);\n- Py_DECREF(method);\n- return result;\n- }\n- }\n-#endif\n- result = __Pyx_PyObject_CallNoArg(method);\n- Py_DECREF(method);\n-bad:\n- return result;\n-}\n-\n-\/* UnpackUnboundCMethod *\/\n- static int __Pyx_TryUnpackUnboundCMethod(__Pyx_CachedCFunction* target) {\n- PyObject *method;\n- method = __Pyx_PyObject_GetAttrStr(target->type, *target->method_name);\n- if (unlikely(!method))\n- return -1;\n- target->method = method;\n-#if CYTHON_COMPILING_IN_CPYTHON\n- #if PY_MAJOR_VERSION >= 3\n- if (likely(PyObject_TypeCheck(method, &PyMethodDescr_Type)))\n- #endif\n- {\n- PyMethodDescrObject *descr = (PyMethodDescrObject*) method;\n- target->func = descr->d_method->ml_meth;\n- target->flag = descr->d_method->ml_flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST);\n- }\n-#endif\n- return 0;\n-}\n-\n-\/* CallUnboundCMethod0 *\/\n- static PyObject* __Pyx__CallUnboundCMethod0(__Pyx_CachedCFunction* cfunc, PyObject* self) {\n- PyObject *args, *result = NULL;\n- if (unlikely(!cfunc->method) && unlikely(__Pyx_TryUnpackUnboundCMethod(cfunc) < 0)) return NULL;\n-#if CYTHON_ASSUME_SAFE_MACROS\n- args = PyTuple_New(1);\n- if (unlikely(!args)) goto bad;\n- Py_INCREF(self);\n- PyTuple_SET_ITEM(args, 0, self);\n-#else\n- args = PyTuple_Pack(1, self);\n- if (unlikely(!args)) goto bad;\n-#endif\n- result = __Pyx_PyObject_Call(cfunc->method, args, NULL);\n- Py_DECREF(args);\n-bad:\n- return result;\n-}\n-\n-\/* pop *\/\n- static CYTHON_INLINE PyObject* __Pyx__PyObject_Pop(PyObject* L) {\n- if (Py_TYPE(L) == &PySet_Type) {\n- return PySet_Pop(L);\n- }\n- return __Pyx_PyObject_CallMethod0(L, __pyx_n_s_pop);\n-}\n-#if CYTHON_USE_PYLIST_INTERNALS && CYTHON_ASSUME_SAFE_MACROS\n-static CYTHON_INLINE PyObject* __Pyx_PyList_Pop(PyObject* L) {\n- if (likely(PyList_GET_SIZE(L) > (((PyListObject*)L)->allocated >> 1))) {\n- Py_SIZE(L) -= 1;\n- return PyList_GET_ITEM(L, PyList_GET_SIZE(L));\n- }\n- return __Pyx_CallUnboundCMethod0(&__pyx_umethod_PyList_Type_pop, L);\n-}\n-#endif\n-\n-\/* ByteArrayAppend *\/\n- static CYTHON_INLINE int __Pyx_PyByteArray_Append(PyObject* bytearray, int value) {\n- PyObject *pyval, *retval;\n-#if CYTHON_COMPILING_IN_CPYTHON\n- if (likely((value >= 0) & (value <= 255))) {\n- Py_ssize_t n = Py_SIZE(bytearray);\n- if (likely(n != PY_SSIZE_T_MAX)) {\n- if (unlikely(PyByteArray_Resize(bytearray, n + 1) < 0))\n- return -1;\n- PyByteArray_AS_STRING(bytearray)[n] = value;\n- return 0;\n- }\n- } else {\n- PyErr_SetString(PyExc_ValueError, \"byte must be in range(0, 256)\");\n- return -1;\n- }\n-#endif\n- pyval = PyInt_FromLong(value);\n- if (unlikely(!pyval))\n- return -1;\n- retval = __Pyx_PyObject_CallMethod1(bytearray, __pyx_n_s_append, pyval);\n- Py_DECREF(pyval);\n- if (unlikely(!retval))\n- return -1;\n- Py_DECREF(retval);\n- return 0;\n-}\n-\n-\/* SaveResetException *\/\n- #if CYTHON_FAST_THREAD_STATE\n-static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {\n- *type = tstate->exc_type;\n- *value = tstate->exc_value;\n- *tb = tstate->exc_traceback;\n- Py_XINCREF(*type);\n- Py_XINCREF(*value);\n- Py_XINCREF(*tb);\n-}\n-static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {\n- PyObject *tmp_type, *tmp_value, *tmp_tb;\n- tmp_type = tstate->exc_type;\n- tmp_value = tstate->exc_value;\n- tmp_tb = tstate->exc_traceback;\n- tstate->exc_type = type;\n- tstate->exc_value = value;\n- tstate->exc_traceback = tb;\n- Py_XDECREF(tmp_type);\n- Py_XDECREF(tmp_value);\n- Py_XDECREF(tmp_tb);\n-}\n-#endif\n-\n-\/* PyErrExceptionMatches *\/\n- #if CYTHON_FAST_THREAD_STATE\n-static CYTHON_INLINE int __Pyx_PyErr_ExceptionMatchesInState(PyThreadState* tstate, PyObject* err) {\n- PyObject *exc_type = tstate->curexc_type;\n- if (exc_type == err) return 1;\n- if (unlikely(!exc_type)) return 0;\n- return PyErr_GivenExceptionMatches(exc_type, err);\n-}\n-#endif\n-\n-\/* GetException *\/\n- #if CYTHON_FAST_THREAD_STATE\n-static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {\n-#else\n-static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {\n-#endif\n- PyObject *local_type, *local_value, *local_tb;\n-#if CYTHON_FAST_THREAD_STATE\n- PyObject *tmp_type, *tmp_value, *tmp_tb;\n- local_type = tstate->curexc_type;\n- local_value = tstate->curexc_value;\n- local_tb = tstate->curexc_traceback;\n- tstate->curexc_type = 0;\n- tstate->curexc_value = 0;\n- tstate->curexc_traceback = 0;\n-#else\n- PyErr_Fetch(&local_type, &local_value, &local_tb);\n-#endif\n- PyErr_NormalizeException(&local_type, &local_value, &local_tb);\n-#if CYTHON_FAST_THREAD_STATE\n- if (unlikely(tstate->curexc_type))\n-#else\n- if (unlikely(PyErr_Occurred()))\n-#endif\n- goto bad;\n- #if PY_MAJOR_VERSION >= 3\n- if (local_tb) {\n- if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))\n- goto bad;\n- }\n- #endif\n- Py_XINCREF(local_tb);\n- Py_XINCREF(local_type);\n- Py_XINCREF(local_value);\n- *type = local_type;\n- *value = local_value;\n- *tb = local_tb;\n-#if CYTHON_FAST_THREAD_STATE\n- tmp_type = tstate->exc_type;\n- tmp_value = tstate->exc_value;\n- tmp_tb = tstate->exc_traceback;\n- tstate->exc_type = local_type;\n- tstate->exc_value = local_value;\n- tstate->exc_traceback = local_tb;\n- Py_XDECREF(tmp_type);\n- Py_XDECREF(tmp_value);\n- Py_XDECREF(tmp_tb);\n-#else\n- PyErr_SetExcInfo(local_type, local_value, local_tb);\n-#endif\n- return 0;\n-bad:\n- *type = 0;\n- *value = 0;\n- *tb = 0;\n- Py_XDECREF(local_type);\n- Py_XDECREF(local_value);\n- Py_XDECREF(local_tb);\n- return -1;\n-}\n-\n-\/* RaiseTooManyValuesToUnpack *\/\n- static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {\n- PyErr_Format(PyExc_ValueError,\n- \"too many values to unpack (expected %\" CYTHON_FORMAT_SSIZE_T \"d)\", expected);\n-}\n-\n-\/* RaiseNeedMoreValuesToUnpack *\/\n- static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {\n- PyErr_Format(PyExc_ValueError,\n- \"need more than %\" CYTHON_FORMAT_SSIZE_T \"d value%.1s to unpack\",\n- index, (index == 1) ? \"\" : \"s\");\n-}\n-\n-\/* IterFinish *\/\n- static CYTHON_INLINE int __Pyx_IterFinish(void) {\n-#if CYTHON_FAST_THREAD_STATE\n- PyThreadState *tstate = PyThreadState_GET();\n- PyObject* exc_type = tstate->curexc_type;\n- if (unlikely(exc_type)) {\n- if (likely(exc_type == PyExc_StopIteration) || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)) {\n- PyObject *exc_value, *exc_tb;\n- exc_value = tstate->curexc_value;\n- exc_tb = tstate->curexc_traceback;\n- tstate->curexc_type = 0;\n- tstate->curexc_value = 0;\n- tstate->curexc_traceback = 0;\n- Py_DECREF(exc_type);\n- Py_XDECREF(exc_value);\n- Py_XDECREF(exc_tb);\n- return 0;\n- } else {\n- return -1;\n- }\n- }\n- return 0;\n-#else\n- if (unlikely(PyErr_Occurred())) {\n- if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) {\n- PyErr_Clear();\n- return 0;\n- } else {\n- return -1;\n- }\n- }\n- return 0;\n-#endif\n-}\n-\n-\/* UnpackItemEndCheck *\/\n- static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) {\n- if (unlikely(retval)) {\n- Py_DECREF(retval);\n- __Pyx_RaiseTooManyValuesError(expected);\n- return -1;\n- } else {\n- return __Pyx_IterFinish();\n- }\n- return 0;\n-}\n-\n-\/* SliceObject *\/\n- static CYTHON_INLINE PyObject* __Pyx_PyObject_GetSlice(PyObject* obj,\n- Py_ssize_t cstart, Py_ssize_t cstop,\n- PyObject** _py_start, PyObject** _py_stop, PyObject** _py_slice,\n- int has_cstart, int has_cstop, CYTHON_UNUSED int wraparound) {\n-#if CYTHON_USE_TYPE_SLOTS\n- PyMappingMethods* mp;\n-#if PY_MAJOR_VERSION < 3\n- PySequenceMethods* ms = Py_TYPE(obj)->tp_as_sequence;\n- if (likely(ms && ms->sq_slice)) {\n- if (!has_cstart) {\n- if (_py_start && (*_py_start != Py_None)) {\n- cstart = __Pyx_PyIndex_AsSsize_t(*_py_start);\n- if ((cstart == (Py_ssize_t)-1) && PyErr_Occurred()) goto bad;\n- } else\n- cstart = 0;\n- }\n- if (!has_cstop) {\n- if (_py_stop && (*_py_stop != Py_None)) {\n- cstop = __Pyx_PyIndex_AsSsize_t(*_py_stop);\n- if ((cstop == (Py_ssize_t)-1) && PyErr_Occurred()) goto bad;\n- } else\n- cstop = PY_SSIZE_T_MAX;\n- }\n- if (wraparound && unlikely((cstart < 0) | (cstop < 0)) && likely(ms->sq_length)) {\n- Py_ssize_t l = ms->sq_length(obj);\n- if (likely(l >= 0)) {\n- if (cstop < 0) {\n- cstop += l;\n- if (cstop < 0) cstop = 0;\n- }\n- if (cstart < 0) {\n- cstart += l;\n- if (cstart < 0) cstart = 0;\n- }\n- } else {\n- if (!PyErr_ExceptionMatches(PyExc_OverflowError))\n- goto bad;\n- PyErr_Clear();\n- }\n- }\n- return ms->sq_slice(obj, cstart, cstop);\n- }\n-#endif\n- mp = Py_TYPE(obj)->tp_as_mapping;\n- if (likely(mp && mp->mp_subscript))\n-#endif\n- {\n- PyObject* result;\n- PyObject *py_slice, *py_start, *py_stop;\n- if (_py_slice) {\n- py_slice = *_py_slice;\n- } else {\n- PyObject* owned_start = NULL;\n- PyObject* owned_stop = NULL;\n- if (_py_start) {\n- py_start = *_py_start;\n- } else {\n- if (has_cstart) {\n- owned_start = py_start = PyInt_FromSsize_t(cstart);\n- if (unlikely(!py_start)) goto bad;\n- } else\n- py_start = Py_None;\n- }\n- if (_py_stop) {\n- py_stop = *_py_stop;\n- } else {\n- if (has_cstop) {\n- owned_stop = py_stop = PyInt_FromSsize_t(cstop);\n- if (unlikely(!py_stop)) {\n- Py_XDECREF(owned_start);\n- goto bad;\n- }\n- } else\n- py_stop = Py_None;\n- }\n- py_slice = PySlice_New(py_start, py_stop, Py_None);\n- Py_XDECREF(owned_start);\n- Py_XDECREF(owned_stop);\n- if (unlikely(!py_slice)) goto bad;\n- }\n-#if CYTHON_USE_TYPE_SLOTS\n- result = mp->mp_subscript(obj, py_slice);\n-#else\n- result = PyObject_GetItem(obj, py_slice);\n-#endif\n- if (!_py_slice) {\n- Py_DECREF(py_slice);\n- }\n- return result;\n- }\n- PyErr_Format(PyExc_TypeError,\n- \"'%.200s' object is unsliceable\", Py_TYPE(obj)->tp_name);\n-bad:\n- return NULL;\n-}\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_RshiftObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long a = PyInt_AS_LONG(op1);\n- return PyInt_FromLong(a >> b);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_rshift(op1, op2);\n- }\n- }\n- x = a >> b;\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla >> llb;\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceRshift : PyNumber_Rshift)(op1, op2);\n-}\n-#endif\n-\n-\/* PyIntBinop *\/\n- #if !CYTHON_COMPILING_IN_PYPY\n-static PyObject* __Pyx_PyInt_OrObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n- #if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_CheckExact(op1))) {\n- const long b = intval;\n- long a = PyInt_AS_LONG(op1);\n- return PyInt_FromLong(a | b);\n- }\n- #endif\n- #if CYTHON_USE_PYLONG_INTERNALS\n- if (likely(PyLong_CheckExact(op1))) {\n- const long b = intval;\n- long a, x;\n-#ifdef HAVE_LONG_LONG\n- const PY_LONG_LONG llb = intval;\n- PY_LONG_LONG lla, llx;\n-#endif\n- const digit* digits = ((PyLongObject*)op1)->ob_digit;\n- const Py_ssize_t size = Py_SIZE(op1);\n- if (likely(__Pyx_sst_abs(size) <= 1)) {\n- a = likely(size) ? digits[0] : 0;\n- if (size == -1) a = -a;\n- } else {\n- switch (size) {\n- case -2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 2:\n- if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n- a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 3:\n- if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n- a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case -4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- case 4:\n- if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n- a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n- break;\n-#ifdef HAVE_LONG_LONG\n- } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n- lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n- goto long_long;\n-#endif\n- }\n- default: return PyLong_Type.tp_as_number->nb_or(op1, op2);\n- }\n- }\n- x = a | b;\n- return PyLong_FromLong(x);\n-#ifdef HAVE_LONG_LONG\n- long_long:\n- llx = lla | llb;\n- return PyLong_FromLongLong(llx);\n-#endif\n- \n- \n- }\n- #endif\n- return (inplace ? PyNumber_InPlaceOr : PyNumber_Or)(op1, op2);\n-}\n-#endif\n-\n-\/* UnicodeAsUCS4 *\/\n- static CYTHON_INLINE Py_UCS4 __Pyx_PyUnicode_AsPy_UCS4(PyObject* x) {\n- Py_ssize_t length;\n- #if CYTHON_PEP393_ENABLED\n- length = PyUnicode_GET_LENGTH(x);\n- if (likely(length == 1)) {\n- return PyUnicode_READ_CHAR(x, 0);\n- }\n- #else\n- length = PyUnicode_GET_SIZE(x);\n- if (likely(length == 1)) {\n- return PyUnicode_AS_UNICODE(x)[0];\n- }\n- #if Py_UNICODE_SIZE == 2\n- else if (PyUnicode_GET_SIZE(x) == 2) {\n- Py_UCS4 high_val = PyUnicode_AS_UNICODE(x)[0];\n- if (high_val >= 0xD800 && high_val <= 0xDBFF) {\n- Py_UCS4 low_val = PyUnicode_AS_UNICODE(x)[1];\n- if (low_val >= 0xDC00 && low_val <= 0xDFFF) {\n- return 0x10000 + (((high_val & ((1<<10)-1)) << 10) | (low_val & ((1<<10)-1)));\n- }\n- }\n- }\n- #endif\n- #endif\n- PyErr_Format(PyExc_ValueError,\n- \"only single character unicode strings can be converted to Py_UCS4, \"\n- \"got length %\" CYTHON_FORMAT_SSIZE_T \"d\", length);\n- return (Py_UCS4)-1;\n-}\n-\n-\/* object_ord *\/\n- static long __Pyx__PyObject_Ord(PyObject* c) {\n- Py_ssize_t size;\n- if (PyBytes_Check(c)) {\n- size = PyBytes_GET_SIZE(c);\n- if (likely(size == 1)) {\n- return (unsigned char) PyBytes_AS_STRING(c)[0];\n- }\n-#if PY_MAJOR_VERSION < 3\n- } else if (PyUnicode_Check(c)) {\n- return (long)__Pyx_PyUnicode_AsPy_UCS4(c);\n-#endif\n-#if (!CYTHON_COMPILING_IN_PYPY) || (defined(PyByteArray_AS_STRING) && defined(PyByteArray_GET_SIZE))\n- } else if (PyByteArray_Check(c)) {\n- size = PyByteArray_GET_SIZE(c);\n- if (likely(size == 1)) {\n- return (unsigned char) PyByteArray_AS_STRING(c)[0];\n- }\n-#endif\n- } else {\n- PyErr_Format(PyExc_TypeError,\n- \"ord() expected string of length 1, but %.200s found\", c->ob_type->tp_name);\n- return (long)(Py_UCS4)-1;\n- }\n- PyErr_Format(PyExc_TypeError,\n- \"ord() expected a character, but string of length %zd found\", size);\n- return (long)(Py_UCS4)-1;\n-}\n-\n-\/* RaiseArgTupleInvalid *\/\n- static void __Pyx_RaiseArgtupleInvalid(\n- const char* func_name,\n- int exact,\n- Py_ssize_t num_min,\n- Py_ssize_t num_max,\n- Py_ssize_t num_found)\n-{\n- Py_ssize_t num_expected;\n- const char *more_or_less;\n- if (num_found < num_min) {\n- num_expected = num_min;\n- more_or_less = \"at least\";\n- } else {\n- num_expected = num_max;\n- more_or_less = \"at most\";\n- }\n- if (exact) {\n- more_or_less = \"exactly\";\n- }\n- PyErr_Format(PyExc_TypeError,\n- \"%.200s() takes %.8s %\" CYTHON_FORMAT_SSIZE_T \"d positional argument%.1s (%\" CYTHON_FORMAT_SSIZE_T \"d given)\",\n- func_name, more_or_less, num_expected,\n- (num_expected == 1) ? \"\" : \"s\", num_found);\n-}\n-\n \/* RaiseDoubleKeywords *\/\n- static void __Pyx_RaiseDoubleKeywordsError(\n+ static void __Pyx_RaiseDoubleKeywordsError(\n const char* func_name,\n PyObject* kw_name)\n {\n@@ -14552,7 +14256,7 @@\n }\n \n \/* ParseKeywords *\/\n- static int __Pyx_ParseOptionalKeywords(\n+ static int __Pyx_ParseOptionalKeywords(\n PyObject *kwds,\n PyObject **argnames[],\n PyObject *kwds2,\n@@ -14653,8 +14357,780 @@\n return -1;\n }\n \n+\/* RaiseArgTupleInvalid *\/\n+ static void __Pyx_RaiseArgtupleInvalid(\n+ const char* func_name,\n+ int exact,\n+ Py_ssize_t num_min,\n+ Py_ssize_t num_max,\n+ Py_ssize_t num_found)\n+{\n+ Py_ssize_t num_expected;\n+ const char *more_or_less;\n+ if (num_found < num_min) {\n+ num_expected = num_min;\n+ more_or_less = \"at least\";\n+ } else {\n+ num_expected = num_max;\n+ more_or_less = \"at most\";\n+ }\n+ if (exact) {\n+ more_or_less = \"exactly\";\n+ }\n+ PyErr_Format(PyExc_TypeError,\n+ \"%.200s() takes %.8s %\" CYTHON_FORMAT_SSIZE_T \"d positional argument%.1s (%\" CYTHON_FORMAT_SSIZE_T \"d given)\",\n+ func_name, more_or_less, num_expected,\n+ (num_expected == 1) ? \"\" : \"s\", num_found);\n+}\n+\n+\/* ArgTypeTest *\/\n+ static void __Pyx_RaiseArgumentTypeInvalid(const char* name, PyObject *obj, PyTypeObject *type) {\n+ PyErr_Format(PyExc_TypeError,\n+ \"Argument '%.200s' has incorrect type (expected %.200s, got %.200s)\",\n+ name, type->tp_name, Py_TYPE(obj)->tp_name);\n+}\n+static CYTHON_INLINE int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact)\n+{\n+ if (unlikely(!type)) {\n+ PyErr_SetString(PyExc_SystemError, \"Missing type object\");\n+ return 0;\n+ }\n+ if (none_allowed && obj == Py_None) return 1;\n+ else if (exact) {\n+ if (likely(Py_TYPE(obj) == type)) return 1;\n+ #if PY_MAJOR_VERSION == 2\n+ else if ((type == &PyBaseString_Type) && likely(__Pyx_PyBaseString_CheckExact(obj))) return 1;\n+ #endif\n+ }\n+ else {\n+ if (likely(PyObject_TypeCheck(obj, type))) return 1;\n+ }\n+ __Pyx_RaiseArgumentTypeInvalid(name, obj, type);\n+ return 0;\n+}\n+\n+\/* GetModuleGlobalName *\/\n+ static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name) {\n+ PyObject *result;\n+#if !CYTHON_AVOID_BORROWED_REFS\n+ result = PyDict_GetItem(__pyx_d, name);\n+ if (likely(result)) {\n+ Py_INCREF(result);\n+ } else {\n+#else\n+ result = PyObject_GetItem(__pyx_d, name);\n+ if (!result) {\n+ PyErr_Clear();\n+#endif\n+ result = __Pyx_GetBuiltinName(name);\n+ }\n+ return result;\n+}\n+\n+\/* PyIntBinop *\/\n+ #if !CYTHON_COMPILING_IN_PYPY\n+static PyObject* __Pyx_PyInt_AndObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_CheckExact(op1))) {\n+ const long b = intval;\n+ long a = PyInt_AS_LONG(op1);\n+ return PyInt_FromLong(a & b);\n+ }\n+ #endif\n+ #if CYTHON_USE_PYLONG_INTERNALS\n+ if (likely(PyLong_CheckExact(op1))) {\n+ const long b = intval;\n+ long a, x;\n+#ifdef HAVE_LONG_LONG\n+ const PY_LONG_LONG llb = intval;\n+ PY_LONG_LONG lla, llx;\n+#endif\n+ const digit* digits = ((PyLongObject*)op1)->ob_digit;\n+ const Py_ssize_t size = Py_SIZE(op1);\n+ if (likely(__Pyx_sst_abs(size) <= 1)) {\n+ a = likely(size) ? digits[0] : 0;\n+ if (size == -1) a = -a;\n+ } else {\n+ switch (size) {\n+ case -2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ default: return PyLong_Type.tp_as_number->nb_and(op1, op2);\n+ }\n+ }\n+ x = a & b;\n+ return PyLong_FromLong(x);\n+#ifdef HAVE_LONG_LONG\n+ long_long:\n+ llx = lla & llb;\n+ return PyLong_FromLongLong(llx);\n+#endif\n+ \n+ \n+ }\n+ #endif\n+ return (inplace ? PyNumber_InPlaceAnd : PyNumber_And)(op1, op2);\n+}\n+#endif\n+\n+\/* PyFunctionFastCall *\/\n+ #if CYTHON_FAST_PYCALL\n+#include \"frameobject.h\"\n+static PyObject* __Pyx_PyFunction_FastCallNoKw(PyCodeObject *co, PyObject **args, Py_ssize_t na,\n+ PyObject *globals) {\n+ PyFrameObject *f;\n+ PyThreadState *tstate = PyThreadState_GET();\n+ PyObject **fastlocals;\n+ Py_ssize_t i;\n+ PyObject *result;\n+ assert(globals != NULL);\n+ \/* XXX Perhaps we should create a specialized\n+ PyFrame_New() that doesn't take locals, but does\n+ take builtins without sanity checking them.\n+ *\/\n+ assert(tstate != NULL);\n+ f = PyFrame_New(tstate, co, globals, NULL);\n+ if (f == NULL) {\n+ return NULL;\n+ }\n+ fastlocals = f->f_localsplus;\n+ for (i = 0; i < na; i++) {\n+ Py_INCREF(*args);\n+ fastlocals[i] = *args++;\n+ }\n+ result = PyEval_EvalFrameEx(f,0);\n+ ++tstate->recursion_depth;\n+ Py_DECREF(f);\n+ --tstate->recursion_depth;\n+ return result;\n+}\n+#if 1 || PY_VERSION_HEX < 0x030600B1\n+static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args, int nargs, PyObject *kwargs) {\n+ PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func);\n+ PyObject *globals = PyFunction_GET_GLOBALS(func);\n+ PyObject *argdefs = PyFunction_GET_DEFAULTS(func);\n+ PyObject *closure;\n+#if PY_MAJOR_VERSION >= 3\n+ PyObject *kwdefs;\n+#endif\n+ PyObject *kwtuple, **k;\n+ PyObject **d;\n+ Py_ssize_t nd;\n+ Py_ssize_t nk;\n+ PyObject *result;\n+ assert(kwargs == NULL || PyDict_Check(kwargs));\n+ nk = kwargs ? PyDict_Size(kwargs) : 0;\n+ if (Py_EnterRecursiveCall((char*)\" while calling a Python object\")) {\n+ return NULL;\n+ }\n+ if (\n+#if PY_MAJOR_VERSION >= 3\n+ co->co_kwonlyargcount == 0 &&\n+#endif\n+ likely(kwargs == NULL || nk == 0) &&\n+ co->co_flags == (CO_OPTIMIZED | CO_NEWLOCALS | CO_NOFREE)) {\n+ if (argdefs == NULL && co->co_argcount == nargs) {\n+ result = __Pyx_PyFunction_FastCallNoKw(co, args, nargs, globals);\n+ goto done;\n+ }\n+ else if (nargs == 0 && argdefs != NULL\n+ && co->co_argcount == Py_SIZE(argdefs)) {\n+ \/* function called with no arguments, but all parameters have\n+ a default value: use default values as arguments .*\/\n+ args = &PyTuple_GET_ITEM(argdefs, 0);\n+ result =__Pyx_PyFunction_FastCallNoKw(co, args, Py_SIZE(argdefs), globals);\n+ goto done;\n+ }\n+ }\n+ if (kwargs != NULL) {\n+ Py_ssize_t pos, i;\n+ kwtuple = PyTuple_New(2 * nk);\n+ if (kwtuple == NULL) {\n+ result = NULL;\n+ goto done;\n+ }\n+ k = &PyTuple_GET_ITEM(kwtuple, 0);\n+ pos = i = 0;\n+ while (PyDict_Next(kwargs, &pos, &k[i], &k[i+1])) {\n+ Py_INCREF(k[i]);\n+ Py_INCREF(k[i+1]);\n+ i += 2;\n+ }\n+ nk = i \/ 2;\n+ }\n+ else {\n+ kwtuple = NULL;\n+ k = NULL;\n+ }\n+ closure = PyFunction_GET_CLOSURE(func);\n+#if PY_MAJOR_VERSION >= 3\n+ kwdefs = PyFunction_GET_KW_DEFAULTS(func);\n+#endif\n+ if (argdefs != NULL) {\n+ d = &PyTuple_GET_ITEM(argdefs, 0);\n+ nd = Py_SIZE(argdefs);\n+ }\n+ else {\n+ d = NULL;\n+ nd = 0;\n+ }\n+#if PY_MAJOR_VERSION >= 3\n+ result = PyEval_EvalCodeEx((PyObject*)co, globals, (PyObject *)NULL,\n+ args, nargs,\n+ k, (int)nk,\n+ d, (int)nd, kwdefs, closure);\n+#else\n+ result = PyEval_EvalCodeEx(co, globals, (PyObject *)NULL,\n+ args, nargs,\n+ k, (int)nk,\n+ d, (int)nd, closure);\n+#endif\n+ Py_XDECREF(kwtuple);\n+done:\n+ Py_LeaveRecursiveCall();\n+ return result;\n+}\n+#endif \/\/ CPython < 3.6\n+#endif \/\/ CYTHON_FAST_PYCALL\n+\n+\/* PyCFunctionFastCall *\/\n+ #if CYTHON_FAST_PYCCALL\n+static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, PyObject **args, Py_ssize_t nargs) {\n+ PyCFunctionObject *func = (PyCFunctionObject*)func_obj;\n+ PyCFunction meth = PyCFunction_GET_FUNCTION(func);\n+ PyObject *self = PyCFunction_GET_SELF(func);\n+ assert(PyCFunction_Check(func));\n+ assert(METH_FASTCALL == (PyCFunction_GET_FLAGS(func) & ~(METH_CLASS | METH_STATIC | METH_COEXIST)));\n+ assert(nargs >= 0);\n+ assert(nargs == 0 || args != NULL);\n+ \/* _PyCFunction_FastCallDict() must not be called with an exception set,\n+ because it may clear it (directly or indirectly) and so the\n+ caller loses its exception *\/\n+ assert(!PyErr_Occurred());\n+ return (*((__Pyx_PyCFunctionFast)meth)) (self, args, nargs, NULL);\n+}\n+#endif \/\/ CYTHON_FAST_PYCCALL\n+\n+\/* PyIntBinop *\/\n+ #if !CYTHON_COMPILING_IN_PYPY\n+static PyObject* __Pyx_PyInt_RshiftObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_CheckExact(op1))) {\n+ const long b = intval;\n+ long a = PyInt_AS_LONG(op1);\n+ return PyInt_FromLong(a >> b);\n+ }\n+ #endif\n+ #if CYTHON_USE_PYLONG_INTERNALS\n+ if (likely(PyLong_CheckExact(op1))) {\n+ const long b = intval;\n+ long a, x;\n+#ifdef HAVE_LONG_LONG\n+ const PY_LONG_LONG llb = intval;\n+ PY_LONG_LONG lla, llx;\n+#endif\n+ const digit* digits = ((PyLongObject*)op1)->ob_digit;\n+ const Py_ssize_t size = Py_SIZE(op1);\n+ if (likely(__Pyx_sst_abs(size) <= 1)) {\n+ a = likely(size) ? digits[0] : 0;\n+ if (size == -1) a = -a;\n+ } else {\n+ switch (size) {\n+ case -2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ default: return PyLong_Type.tp_as_number->nb_rshift(op1, op2);\n+ }\n+ }\n+ x = a >> b;\n+ return PyLong_FromLong(x);\n+#ifdef HAVE_LONG_LONG\n+ long_long:\n+ llx = lla >> llb;\n+ return PyLong_FromLongLong(llx);\n+#endif\n+ \n+ \n+ }\n+ #endif\n+ return (inplace ? PyNumber_InPlaceRshift : PyNumber_Rshift)(op1, op2);\n+}\n+#endif\n+\n+\/* PyIntBinop *\/\n+ #if !CYTHON_COMPILING_IN_PYPY\n+static PyObject* __Pyx_PyInt_AddObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_CheckExact(op1))) {\n+ const long b = intval;\n+ long x;\n+ long a = PyInt_AS_LONG(op1);\n+ x = (long)((unsigned long)a + b);\n+ if (likely((x^a) >= 0 || (x^b) >= 0))\n+ return PyInt_FromLong(x);\n+ return PyLong_Type.tp_as_number->nb_add(op1, op2);\n+ }\n+ #endif\n+ #if CYTHON_USE_PYLONG_INTERNALS\n+ if (likely(PyLong_CheckExact(op1))) {\n+ const long b = intval;\n+ long a, x;\n+#ifdef HAVE_LONG_LONG\n+ const PY_LONG_LONG llb = intval;\n+ PY_LONG_LONG lla, llx;\n+#endif\n+ const digit* digits = ((PyLongObject*)op1)->ob_digit;\n+ const Py_ssize_t size = Py_SIZE(op1);\n+ if (likely(__Pyx_sst_abs(size) <= 1)) {\n+ a = likely(size) ? digits[0] : 0;\n+ if (size == -1) a = -a;\n+ } else {\n+ switch (size) {\n+ case -2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ default: return PyLong_Type.tp_as_number->nb_add(op1, op2);\n+ }\n+ }\n+ x = a + b;\n+ return PyLong_FromLong(x);\n+#ifdef HAVE_LONG_LONG\n+ long_long:\n+ llx = lla + llb;\n+ return PyLong_FromLongLong(llx);\n+#endif\n+ \n+ \n+ }\n+ #endif\n+ if (PyFloat_CheckExact(op1)) {\n+ const long b = intval;\n+ double a = PyFloat_AS_DOUBLE(op1);\n+ double result;\n+ PyFPE_START_PROTECT(\"add\", return NULL)\n+ result = ((double)a) + (double)b;\n+ PyFPE_END_PROTECT(result)\n+ return PyFloat_FromDouble(result);\n+ }\n+ return (inplace ? PyNumber_InPlaceAdd : PyNumber_Add)(op1, op2);\n+}\n+#endif\n+\n+\/* PyIntBinop *\/\n+ #if !CYTHON_COMPILING_IN_PYPY\n+static PyObject* __Pyx_PyInt_OrObjC(PyObject *op1, PyObject *op2, CYTHON_UNUSED long intval, CYTHON_UNUSED int inplace) {\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_CheckExact(op1))) {\n+ const long b = intval;\n+ long a = PyInt_AS_LONG(op1);\n+ return PyInt_FromLong(a | b);\n+ }\n+ #endif\n+ #if CYTHON_USE_PYLONG_INTERNALS\n+ if (likely(PyLong_CheckExact(op1))) {\n+ const long b = intval;\n+ long a, x;\n+#ifdef HAVE_LONG_LONG\n+ const PY_LONG_LONG llb = intval;\n+ PY_LONG_LONG lla, llx;\n+#endif\n+ const digit* digits = ((PyLongObject*)op1)->ob_digit;\n+ const Py_ssize_t size = Py_SIZE(op1);\n+ if (likely(__Pyx_sst_abs(size) <= 1)) {\n+ a = likely(size) ? digits[0] : 0;\n+ if (size == -1) a = -a;\n+ } else {\n+ switch (size) {\n+ case -2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 2:\n+ if (8 * sizeof(long) - 1 > 2 * PyLong_SHIFT) {\n+ a = (long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 2 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 3:\n+ if (8 * sizeof(long) - 1 > 3 * PyLong_SHIFT) {\n+ a = (long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 3 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case -4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = -(PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ case 4:\n+ if (8 * sizeof(long) - 1 > 4 * PyLong_SHIFT) {\n+ a = (long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0]));\n+ break;\n+#ifdef HAVE_LONG_LONG\n+ } else if (8 * sizeof(PY_LONG_LONG) - 1 > 4 * PyLong_SHIFT) {\n+ lla = (PY_LONG_LONG) (((((((((unsigned PY_LONG_LONG)digits[3]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[2]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[1]) << PyLong_SHIFT) | (unsigned PY_LONG_LONG)digits[0]));\n+ goto long_long;\n+#endif\n+ }\n+ default: return PyLong_Type.tp_as_number->nb_or(op1, op2);\n+ }\n+ }\n+ x = a | b;\n+ return PyLong_FromLong(x);\n+#ifdef HAVE_LONG_LONG\n+ long_long:\n+ llx = lla | llb;\n+ return PyLong_FromLongLong(llx);\n+#endif\n+ \n+ \n+ }\n+ #endif\n+ return (inplace ? PyNumber_InPlaceOr : PyNumber_Or)(op1, op2);\n+}\n+#endif\n+\n+\/* PyObjectCallMethO *\/\n+ #if CYTHON_COMPILING_IN_CPYTHON\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallMethO(PyObject *func, PyObject *arg) {\n+ PyObject *self, *result;\n+ PyCFunction cfunc;\n+ cfunc = PyCFunction_GET_FUNCTION(func);\n+ self = PyCFunction_GET_SELF(func);\n+ if (unlikely(Py_EnterRecursiveCall((char*)\" while calling a Python object\")))\n+ return NULL;\n+ result = cfunc(self, arg);\n+ Py_LeaveRecursiveCall();\n+ if (unlikely(!result) && unlikely(!PyErr_Occurred())) {\n+ PyErr_SetString(\n+ PyExc_SystemError,\n+ \"NULL result without error in PyObject_Call\");\n+ }\n+ return result;\n+}\n+#endif\n+\n+\/* PyObjectCallOneArg *\/\n+ #if CYTHON_COMPILING_IN_CPYTHON\n+static PyObject* __Pyx__PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n+ PyObject *result;\n+ PyObject *args = PyTuple_New(1);\n+ if (unlikely(!args)) return NULL;\n+ Py_INCREF(arg);\n+ PyTuple_SET_ITEM(args, 0, arg);\n+ result = __Pyx_PyObject_Call(func, args, NULL);\n+ Py_DECREF(args);\n+ return result;\n+}\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n+#if CYTHON_FAST_PYCALL\n+ if (PyFunction_Check(func)) {\n+ return __Pyx_PyFunction_FastCall(func, &arg, 1);\n+ }\n+#endif\n+#ifdef __Pyx_CyFunction_USED\n+ if (likely(PyCFunction_Check(func) || PyObject_TypeCheck(func, __pyx_CyFunctionType))) {\n+#else\n+ if (likely(PyCFunction_Check(func))) {\n+#endif\n+ if (likely(PyCFunction_GET_FLAGS(func) & METH_O)) {\n+ return __Pyx_PyObject_CallMethO(func, arg);\n+#if CYTHON_FAST_PYCCALL\n+ } else if (PyCFunction_GET_FLAGS(func) & METH_FASTCALL) {\n+ return __Pyx_PyCFunction_FastCall(func, &arg, 1);\n+#endif\n+ }\n+ }\n+ return __Pyx__PyObject_CallOneArg(func, arg);\n+}\n+#else\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallOneArg(PyObject *func, PyObject *arg) {\n+ PyObject *result;\n+ PyObject *args = PyTuple_Pack(1, arg);\n+ if (unlikely(!args)) return NULL;\n+ result = __Pyx_PyObject_Call(func, args, NULL);\n+ Py_DECREF(args);\n+ return result;\n+}\n+#endif\n+\n+\/* PyObjectCallMethod1 *\/\n+ static PyObject* __Pyx_PyObject_CallMethod1(PyObject* obj, PyObject* method_name, PyObject* arg) {\n+ PyObject *method, *result = NULL;\n+ method = __Pyx_PyObject_GetAttrStr(obj, method_name);\n+ if (unlikely(!method)) goto done;\n+#if CYTHON_UNPACK_METHODS\n+ if (likely(PyMethod_Check(method))) {\n+ PyObject *self = PyMethod_GET_SELF(method);\n+ if (likely(self)) {\n+ PyObject *args;\n+ PyObject *function = PyMethod_GET_FUNCTION(method);\n+ #if CYTHON_FAST_PYCALL\n+ if (PyFunction_Check(function)) {\n+ PyObject *args[2] = {self, arg};\n+ result = __Pyx_PyFunction_FastCall(function, args, 2);\n+ goto done;\n+ }\n+ #endif\n+ #if CYTHON_FAST_PYCCALL\n+ if (__Pyx_PyFastCFunction_Check(function)) {\n+ PyObject *args[2] = {self, arg};\n+ result = __Pyx_PyCFunction_FastCall(function, args, 2);\n+ goto done;\n+ }\n+ #endif\n+ args = PyTuple_New(2);\n+ if (unlikely(!args)) goto done;\n+ Py_INCREF(self);\n+ PyTuple_SET_ITEM(args, 0, self);\n+ Py_INCREF(arg);\n+ PyTuple_SET_ITEM(args, 1, arg);\n+ Py_INCREF(function);\n+ Py_DECREF(method); method = NULL;\n+ result = __Pyx_PyObject_Call(function, args, NULL);\n+ Py_DECREF(args);\n+ Py_DECREF(function);\n+ return result;\n+ }\n+ }\n+#endif\n+ result = __Pyx_PyObject_CallOneArg(method, arg);\n+done:\n+ Py_XDECREF(method);\n+ return result;\n+}\n+\n+\/* ByteArrayAppend *\/\n+ static CYTHON_INLINE int __Pyx_PyByteArray_Append(PyObject* bytearray, int value) {\n+ PyObject *pyval, *retval;\n+#if CYTHON_COMPILING_IN_CPYTHON\n+ if (likely((value >= 0) & (value <= 255))) {\n+ Py_ssize_t n = Py_SIZE(bytearray);\n+ if (likely(n != PY_SSIZE_T_MAX)) {\n+ if (unlikely(PyByteArray_Resize(bytearray, n + 1) < 0))\n+ return -1;\n+ PyByteArray_AS_STRING(bytearray)[n] = value;\n+ return 0;\n+ }\n+ } else {\n+ PyErr_SetString(PyExc_ValueError, \"byte must be in range(0, 256)\");\n+ return -1;\n+ }\n+#endif\n+ pyval = PyInt_FromLong(value);\n+ if (unlikely(!pyval))\n+ return -1;\n+ retval = __Pyx_PyObject_CallMethod1(bytearray, __pyx_n_s_append, pyval);\n+ Py_DECREF(pyval);\n+ if (unlikely(!retval))\n+ return -1;\n+ Py_DECREF(retval);\n+ return 0;\n+}\n+\n \/* ByteArrayAppendObject *\/\n- static CYTHON_INLINE int __Pyx_PyByteArray_AppendObject(PyObject* bytearray, PyObject* value) {\n+ static CYTHON_INLINE int __Pyx_PyByteArray_AppendObject(PyObject* bytearray, PyObject* value) {\n Py_ssize_t ival;\n #if PY_MAJOR_VERSION < 3\n if (unlikely(PyString_Check(value))) {\n@@ -14690,7 +15166,7 @@\n }\n \n \/* BytesEquals *\/\n- static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals) {\n+ static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals) {\n #if CYTHON_COMPILING_IN_PYPY\n return PyObject_RichCompareBool(s1, s2, equals);\n #else\n@@ -14728,7 +15204,7 @@\n }\n \n \/* UnicodeEquals *\/\n- static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals) {\n+ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals) {\n #if CYTHON_COMPILING_IN_PYPY\n return PyObject_RichCompareBool(s1, s2, equals);\n #else\n@@ -14811,9 +15287,190 @@\n #endif\n }\n \n+\/* PyObjectCallNoArg *\/\n+ #if CYTHON_COMPILING_IN_CPYTHON\n+static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) {\n+#if CYTHON_FAST_PYCALL\n+ if (PyFunction_Check(func)) {\n+ return __Pyx_PyFunction_FastCall(func, NULL, 0);\n+ }\n+#endif\n+#ifdef __Pyx_CyFunction_USED\n+ if (likely(PyCFunction_Check(func) || PyObject_TypeCheck(func, __pyx_CyFunctionType))) {\n+#else\n+ if (likely(PyCFunction_Check(func))) {\n+#endif\n+ if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) {\n+ return __Pyx_PyObject_CallMethO(func, NULL);\n+ }\n+ }\n+ return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL);\n+}\n+#endif\n+\n+\/* RaiseTooManyValuesToUnpack *\/\n+ static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"too many values to unpack (expected %\" CYTHON_FORMAT_SSIZE_T \"d)\", expected);\n+}\n+\n+\/* RaiseNeedMoreValuesToUnpack *\/\n+ static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"need more than %\" CYTHON_FORMAT_SSIZE_T \"d value%.1s to unpack\",\n+ index, (index == 1) ? \"\" : \"s\");\n+}\n+\n+\/* IterFinish *\/\n+ static CYTHON_INLINE int __Pyx_IterFinish(void) {\n+#if CYTHON_FAST_THREAD_STATE\n+ PyThreadState *tstate = PyThreadState_GET();\n+ PyObject* exc_type = tstate->curexc_type;\n+ if (unlikely(exc_type)) {\n+ if (likely(exc_type == PyExc_StopIteration) || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration)) {\n+ PyObject *exc_value, *exc_tb;\n+ exc_value = tstate->curexc_value;\n+ exc_tb = tstate->curexc_traceback;\n+ tstate->curexc_type = 0;\n+ tstate->curexc_value = 0;\n+ tstate->curexc_traceback = 0;\n+ Py_DECREF(exc_type);\n+ Py_XDECREF(exc_value);\n+ Py_XDECREF(exc_tb);\n+ return 0;\n+ } else {\n+ return -1;\n+ }\n+ }\n+ return 0;\n+#else\n+ if (unlikely(PyErr_Occurred())) {\n+ if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) {\n+ PyErr_Clear();\n+ return 0;\n+ } else {\n+ return -1;\n+ }\n+ }\n+ return 0;\n+#endif\n+}\n+\n+\/* UnpackItemEndCheck *\/\n+ static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected) {\n+ if (unlikely(retval)) {\n+ Py_DECREF(retval);\n+ __Pyx_RaiseTooManyValuesError(expected);\n+ return -1;\n+ } else {\n+ return __Pyx_IterFinish();\n+ }\n+ return 0;\n+}\n+\n \/* None *\/\n- static CYTHON_INLINE void __Pyx_RaiseClosureNameError(const char *varname) {\n- PyErr_Format(PyExc_NameError, \"free variable '%s' referenced before assignment in enclosing scope\", varname);\n+ static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname) {\n+ PyErr_Format(PyExc_UnboundLocalError, \"local variable '%s' referenced before assignment\", varname);\n+}\n+\n+\/* RaiseNoneIterError *\/\n+ static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void) {\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n+}\n+\n+\/* SaveResetException *\/\n+ #if CYTHON_FAST_THREAD_STATE\n+static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {\n+ *type = tstate->exc_type;\n+ *value = tstate->exc_value;\n+ *tb = tstate->exc_traceback;\n+ Py_XINCREF(*type);\n+ Py_XINCREF(*value);\n+ Py_XINCREF(*tb);\n+}\n+static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject *type, PyObject *value, PyObject *tb) {\n+ PyObject *tmp_type, *tmp_value, *tmp_tb;\n+ tmp_type = tstate->exc_type;\n+ tmp_value = tstate->exc_value;\n+ tmp_tb = tstate->exc_traceback;\n+ tstate->exc_type = type;\n+ tstate->exc_value = value;\n+ tstate->exc_traceback = tb;\n+ Py_XDECREF(tmp_type);\n+ Py_XDECREF(tmp_value);\n+ Py_XDECREF(tmp_tb);\n+}\n+#endif\n+\n+\/* PyErrExceptionMatches *\/\n+ #if CYTHON_FAST_THREAD_STATE\n+static CYTHON_INLINE int __Pyx_PyErr_ExceptionMatchesInState(PyThreadState* tstate, PyObject* err) {\n+ PyObject *exc_type = tstate->curexc_type;\n+ if (exc_type == err) return 1;\n+ if (unlikely(!exc_type)) return 0;\n+ return PyErr_GivenExceptionMatches(exc_type, err);\n+}\n+#endif\n+\n+\/* GetException *\/\n+ #if CYTHON_FAST_THREAD_STATE\n+static int __Pyx__GetException(PyThreadState *tstate, PyObject **type, PyObject **value, PyObject **tb) {\n+#else\n+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {\n+#endif\n+ PyObject *local_type, *local_value, *local_tb;\n+#if CYTHON_FAST_THREAD_STATE\n+ PyObject *tmp_type, *tmp_value, *tmp_tb;\n+ local_type = tstate->curexc_type;\n+ local_value = tstate->curexc_value;\n+ local_tb = tstate->curexc_traceback;\n+ tstate->curexc_type = 0;\n+ tstate->curexc_value = 0;\n+ tstate->curexc_traceback = 0;\n+#else\n+ PyErr_Fetch(&local_type, &local_value, &local_tb);\n+#endif\n+ PyErr_NormalizeException(&local_type, &local_value, &local_tb);\n+#if CYTHON_FAST_THREAD_STATE\n+ if (unlikely(tstate->curexc_type))\n+#else\n+ if (unlikely(PyErr_Occurred()))\n+#endif\n+ goto bad;\n+ #if PY_MAJOR_VERSION >= 3\n+ if (local_tb) {\n+ if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))\n+ goto bad;\n+ }\n+ #endif\n+ Py_XINCREF(local_tb);\n+ Py_XINCREF(local_type);\n+ Py_XINCREF(local_value);\n+ *type = local_type;\n+ *value = local_value;\n+ *tb = local_tb;\n+#if CYTHON_FAST_THREAD_STATE\n+ tmp_type = tstate->exc_type;\n+ tmp_value = tstate->exc_value;\n+ tmp_tb = tstate->exc_traceback;\n+ tstate->exc_type = local_type;\n+ tstate->exc_value = local_value;\n+ tstate->exc_traceback = local_tb;\n+ Py_XDECREF(tmp_type);\n+ Py_XDECREF(tmp_value);\n+ Py_XDECREF(tmp_tb);\n+#else\n+ PyErr_SetExcInfo(local_type, local_value, local_tb);\n+#endif\n+ return 0;\n+bad:\n+ *type = 0;\n+ *value = 0;\n+ *tb = 0;\n+ Py_XDECREF(local_type);\n+ Py_XDECREF(local_value);\n+ Py_XDECREF(local_tb);\n+ return -1;\n }\n \n \/* SwapException *\/\n@@ -14877,6 +15534,57 @@\n if (!PyErr_Occurred())\n PyErr_SetNone(PyExc_StopIteration);\n return NULL;\n+}\n+\n+\/* unicode_tailmatch *\/\n+ static int __Pyx_PyUnicode_Tailmatch(PyObject* s, PyObject* substr,\n+ Py_ssize_t start, Py_ssize_t end, int direction) {\n+ if (unlikely(PyTuple_Check(substr))) {\n+ Py_ssize_t i, count = PyTuple_GET_SIZE(substr);\n+ for (i = 0; i < count; i++) {\n+ Py_ssize_t result;\n+#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n+ result = PyUnicode_Tailmatch(s, PyTuple_GET_ITEM(substr, i),\n+ start, end, direction);\n+#else\n+ PyObject* sub = PySequence_ITEM(substr, i);\n+ if (unlikely(!sub)) return -1;\n+ result = PyUnicode_Tailmatch(s, sub, start, end, direction);\n+ Py_DECREF(sub);\n+#endif\n+ if (result) {\n+ return (int) result;\n+ }\n+ }\n+ return 0;\n+ }\n+ return (int) PyUnicode_Tailmatch(s, substr, start, end, direction);\n+}\n+\n+\/* PyUnicode_Substring *\/\n+ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_Substring(\n+ PyObject* text, Py_ssize_t start, Py_ssize_t stop) {\n+ Py_ssize_t length;\n+ if (unlikely(__Pyx_PyUnicode_READY(text) == -1)) return NULL;\n+ length = __Pyx_PyUnicode_GET_LENGTH(text);\n+ if (start < 0) {\n+ start += length;\n+ if (start < 0)\n+ start = 0;\n+ }\n+ if (stop < 0)\n+ stop += length;\n+ else if (stop > length)\n+ stop = length;\n+ length = stop - start;\n+ if (length <= 0)\n+ return PyUnicode_FromUnicode(NULL, 0);\n+#if CYTHON_PEP393_ENABLED\n+ return PyUnicode_FromKindAndData(PyUnicode_KIND(text),\n+ PyUnicode_1BYTE_DATA(text) + start*PyUnicode_KIND(text), stop-start);\n+#else\n+ return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(text)+start, stop-start);\n+#endif\n }\n \n \/* Import *\/\n@@ -15121,630 +15829,8 @@\n return __Pyx_SetItemInt_Generic(o, PyInt_FromSsize_t(i), v);\n }\n \n-\/* FetchCommonType *\/\n- static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type) {\n- PyObject* fake_module;\n- PyTypeObject* cached_type = NULL;\n- fake_module = PyImport_AddModule((char*) \"_cython_\" CYTHON_ABI);\n- if (!fake_module) return NULL;\n- Py_INCREF(fake_module);\n- cached_type = (PyTypeObject*) PyObject_GetAttrString(fake_module, type->tp_name);\n- if (cached_type) {\n- if (!PyType_Check((PyObject*)cached_type)) {\n- PyErr_Format(PyExc_TypeError,\n- \"Shared Cython type %.200s is not a type object\",\n- type->tp_name);\n- goto bad;\n- }\n- if (cached_type->tp_basicsize != type->tp_basicsize) {\n- PyErr_Format(PyExc_TypeError,\n- \"Shared Cython type %.200s has the wrong size, try recompiling\",\n- type->tp_name);\n- goto bad;\n- }\n- } else {\n- if (!PyErr_ExceptionMatches(PyExc_AttributeError)) goto bad;\n- PyErr_Clear();\n- if (PyType_Ready(type) < 0) goto bad;\n- if (PyObject_SetAttrString(fake_module, type->tp_name, (PyObject*) type) < 0)\n- goto bad;\n- Py_INCREF(type);\n- cached_type = type;\n- }\n-done:\n- Py_DECREF(fake_module);\n- return cached_type;\n-bad:\n- Py_XDECREF(cached_type);\n- cached_type = NULL;\n- goto done;\n-}\n-\n-\/* CythonFunction *\/\n- static PyObject *\n-__Pyx_CyFunction_get_doc(__pyx_CyFunctionObject *op, CYTHON_UNUSED void *closure)\n-{\n- if (unlikely(op->func_doc == NULL)) {\n- if (op->func.m_ml->ml_doc) {\n-#if PY_MAJOR_VERSION >= 3\n- op->func_doc = PyUnicode_FromString(op->func.m_ml->ml_doc);\n-#else\n- op->func_doc = PyString_FromString(op->func.m_ml->ml_doc);\n-#endif\n- if (unlikely(op->func_doc == NULL))\n- return NULL;\n- } else {\n- Py_INCREF(Py_None);\n- return Py_None;\n- }\n- }\n- Py_INCREF(op->func_doc);\n- return op->func_doc;\n-}\n-static int\n-__Pyx_CyFunction_set_doc(__pyx_CyFunctionObject *op, PyObject *value)\n-{\n- PyObject *tmp = op->func_doc;\n- if (value == NULL) {\n- value = Py_None;\n- }\n- Py_INCREF(value);\n- op->func_doc = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_name(__pyx_CyFunctionObject *op)\n-{\n- if (unlikely(op->func_name == NULL)) {\n-#if PY_MAJOR_VERSION >= 3\n- op->func_name = PyUnicode_InternFromString(op->func.m_ml->ml_name);\n-#else\n- op->func_name = PyString_InternFromString(op->func.m_ml->ml_name);\n-#endif\n- if (unlikely(op->func_name == NULL))\n- return NULL;\n- }\n- Py_INCREF(op->func_name);\n- return op->func_name;\n-}\n-static int\n-__Pyx_CyFunction_set_name(__pyx_CyFunctionObject *op, PyObject *value)\n-{\n- PyObject *tmp;\n-#if PY_MAJOR_VERSION >= 3\n- if (unlikely(value == NULL || !PyUnicode_Check(value))) {\n-#else\n- if (unlikely(value == NULL || !PyString_Check(value))) {\n-#endif\n- PyErr_SetString(PyExc_TypeError,\n- \"__name__ must be set to a string object\");\n- return -1;\n- }\n- tmp = op->func_name;\n- Py_INCREF(value);\n- op->func_name = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_qualname(__pyx_CyFunctionObject *op)\n-{\n- Py_INCREF(op->func_qualname);\n- return op->func_qualname;\n-}\n-static int\n-__Pyx_CyFunction_set_qualname(__pyx_CyFunctionObject *op, PyObject *value)\n-{\n- PyObject *tmp;\n-#if PY_MAJOR_VERSION >= 3\n- if (unlikely(value == NULL || !PyUnicode_Check(value))) {\n-#else\n- if (unlikely(value == NULL || !PyString_Check(value))) {\n-#endif\n- PyErr_SetString(PyExc_TypeError,\n- \"__qualname__ must be set to a string object\");\n- return -1;\n- }\n- tmp = op->func_qualname;\n- Py_INCREF(value);\n- op->func_qualname = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_self(__pyx_CyFunctionObject *m, CYTHON_UNUSED void *closure)\n-{\n- PyObject *self;\n- self = m->func_closure;\n- if (self == NULL)\n- self = Py_None;\n- Py_INCREF(self);\n- return self;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_dict(__pyx_CyFunctionObject *op)\n-{\n- if (unlikely(op->func_dict == NULL)) {\n- op->func_dict = PyDict_New();\n- if (unlikely(op->func_dict == NULL))\n- return NULL;\n- }\n- Py_INCREF(op->func_dict);\n- return op->func_dict;\n-}\n-static int\n-__Pyx_CyFunction_set_dict(__pyx_CyFunctionObject *op, PyObject *value)\n-{\n- PyObject *tmp;\n- if (unlikely(value == NULL)) {\n- PyErr_SetString(PyExc_TypeError,\n- \"function's dictionary may not be deleted\");\n- return -1;\n- }\n- if (unlikely(!PyDict_Check(value))) {\n- PyErr_SetString(PyExc_TypeError,\n- \"setting function's dictionary to a non-dict\");\n- return -1;\n- }\n- tmp = op->func_dict;\n- Py_INCREF(value);\n- op->func_dict = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_globals(__pyx_CyFunctionObject *op)\n-{\n- Py_INCREF(op->func_globals);\n- return op->func_globals;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_closure(CYTHON_UNUSED __pyx_CyFunctionObject *op)\n-{\n- Py_INCREF(Py_None);\n- return Py_None;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_code(__pyx_CyFunctionObject *op)\n-{\n- PyObject* result = (op->func_code) ? op->func_code : Py_None;\n- Py_INCREF(result);\n- return result;\n-}\n-static int\n-__Pyx_CyFunction_init_defaults(__pyx_CyFunctionObject *op) {\n- int result = 0;\n- PyObject *res = op->defaults_getter((PyObject *) op);\n- if (unlikely(!res))\n- return -1;\n- #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- op->defaults_tuple = PyTuple_GET_ITEM(res, 0);\n- Py_INCREF(op->defaults_tuple);\n- op->defaults_kwdict = PyTuple_GET_ITEM(res, 1);\n- Py_INCREF(op->defaults_kwdict);\n- #else\n- op->defaults_tuple = PySequence_ITEM(res, 0);\n- if (unlikely(!op->defaults_tuple)) result = -1;\n- else {\n- op->defaults_kwdict = PySequence_ITEM(res, 1);\n- if (unlikely(!op->defaults_kwdict)) result = -1;\n- }\n- #endif\n- Py_DECREF(res);\n- return result;\n-}\n-static int\n-__Pyx_CyFunction_set_defaults(__pyx_CyFunctionObject *op, PyObject* value) {\n- PyObject* tmp;\n- if (!value) {\n- value = Py_None;\n- } else if (value != Py_None && !PyTuple_Check(value)) {\n- PyErr_SetString(PyExc_TypeError,\n- \"__defaults__ must be set to a tuple object\");\n- return -1;\n- }\n- Py_INCREF(value);\n- tmp = op->defaults_tuple;\n- op->defaults_tuple = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_defaults(__pyx_CyFunctionObject *op) {\n- PyObject* result = op->defaults_tuple;\n- if (unlikely(!result)) {\n- if (op->defaults_getter) {\n- if (__Pyx_CyFunction_init_defaults(op) < 0) return NULL;\n- result = op->defaults_tuple;\n- } else {\n- result = Py_None;\n- }\n- }\n- Py_INCREF(result);\n- return result;\n-}\n-static int\n-__Pyx_CyFunction_set_kwdefaults(__pyx_CyFunctionObject *op, PyObject* value) {\n- PyObject* tmp;\n- if (!value) {\n- value = Py_None;\n- } else if (value != Py_None && !PyDict_Check(value)) {\n- PyErr_SetString(PyExc_TypeError,\n- \"__kwdefaults__ must be set to a dict object\");\n- return -1;\n- }\n- Py_INCREF(value);\n- tmp = op->defaults_kwdict;\n- op->defaults_kwdict = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_kwdefaults(__pyx_CyFunctionObject *op) {\n- PyObject* result = op->defaults_kwdict;\n- if (unlikely(!result)) {\n- if (op->defaults_getter) {\n- if (__Pyx_CyFunction_init_defaults(op) < 0) return NULL;\n- result = op->defaults_kwdict;\n- } else {\n- result = Py_None;\n- }\n- }\n- Py_INCREF(result);\n- return result;\n-}\n-static int\n-__Pyx_CyFunction_set_annotations(__pyx_CyFunctionObject *op, PyObject* value) {\n- PyObject* tmp;\n- if (!value || value == Py_None) {\n- value = NULL;\n- } else if (!PyDict_Check(value)) {\n- PyErr_SetString(PyExc_TypeError,\n- \"__annotations__ must be set to a dict object\");\n- return -1;\n- }\n- Py_XINCREF(value);\n- tmp = op->func_annotations;\n- op->func_annotations = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_CyFunction_get_annotations(__pyx_CyFunctionObject *op) {\n- PyObject* result = op->func_annotations;\n- if (unlikely(!result)) {\n- result = PyDict_New();\n- if (unlikely(!result)) return NULL;\n- op->func_annotations = result;\n- }\n- Py_INCREF(result);\n- return result;\n-}\n-static PyGetSetDef __pyx_CyFunction_getsets[] = {\n- {(char *) \"func_doc\", (getter)__Pyx_CyFunction_get_doc, (setter)__Pyx_CyFunction_set_doc, 0, 0},\n- {(char *) \"__doc__\", (getter)__Pyx_CyFunction_get_doc, (setter)__Pyx_CyFunction_set_doc, 0, 0},\n- {(char *) \"func_name\", (getter)__Pyx_CyFunction_get_name, (setter)__Pyx_CyFunction_set_name, 0, 0},\n- {(char *) \"__name__\", (getter)__Pyx_CyFunction_get_name, (setter)__Pyx_CyFunction_set_name, 0, 0},\n- {(char *) \"__qualname__\", (getter)__Pyx_CyFunction_get_qualname, (setter)__Pyx_CyFunction_set_qualname, 0, 0},\n- {(char *) \"__self__\", (getter)__Pyx_CyFunction_get_self, 0, 0, 0},\n- {(char *) \"func_dict\", (getter)__Pyx_CyFunction_get_dict, (setter)__Pyx_CyFunction_set_dict, 0, 0},\n- {(char *) \"__dict__\", (getter)__Pyx_CyFunction_get_dict, (setter)__Pyx_CyFunction_set_dict, 0, 0},\n- {(char *) \"func_globals\", (getter)__Pyx_CyFunction_get_globals, 0, 0, 0},\n- {(char *) \"__globals__\", (getter)__Pyx_CyFunction_get_globals, 0, 0, 0},\n- {(char *) \"func_closure\", (getter)__Pyx_CyFunction_get_closure, 0, 0, 0},\n- {(char *) \"__closure__\", (getter)__Pyx_CyFunction_get_closure, 0, 0, 0},\n- {(char *) \"func_code\", (getter)__Pyx_CyFunction_get_code, 0, 0, 0},\n- {(char *) \"__code__\", (getter)__Pyx_CyFunction_get_code, 0, 0, 0},\n- {(char *) \"func_defaults\", (getter)__Pyx_CyFunction_get_defaults, (setter)__Pyx_CyFunction_set_defaults, 0, 0},\n- {(char *) \"__defaults__\", (getter)__Pyx_CyFunction_get_defaults, (setter)__Pyx_CyFunction_set_defaults, 0, 0},\n- {(char *) \"__kwdefaults__\", (getter)__Pyx_CyFunction_get_kwdefaults, (setter)__Pyx_CyFunction_set_kwdefaults, 0, 0},\n- {(char *) \"__annotations__\", (getter)__Pyx_CyFunction_get_annotations, (setter)__Pyx_CyFunction_set_annotations, 0, 0},\n- {0, 0, 0, 0, 0}\n-};\n-static PyMemberDef __pyx_CyFunction_members[] = {\n- {(char *) \"__module__\", T_OBJECT, offsetof(__pyx_CyFunctionObject, func.m_module), PY_WRITE_RESTRICTED, 0},\n- {0, 0, 0, 0, 0}\n-};\n-static PyObject *\n-__Pyx_CyFunction_reduce(__pyx_CyFunctionObject *m, CYTHON_UNUSED PyObject *args)\n-{\n-#if PY_MAJOR_VERSION >= 3\n- return PyUnicode_FromString(m->func.m_ml->ml_name);\n-#else\n- return PyString_FromString(m->func.m_ml->ml_name);\n-#endif\n-}\n-static PyMethodDef __pyx_CyFunction_methods[] = {\n- {\"__reduce__\", (PyCFunction)__Pyx_CyFunction_reduce, METH_VARARGS, 0},\n- {0, 0, 0, 0}\n-};\n-#if PY_VERSION_HEX < 0x030500A0\n-#define __Pyx_CyFunction_weakreflist(cyfunc) ((cyfunc)->func_weakreflist)\n-#else\n-#define __Pyx_CyFunction_weakreflist(cyfunc) ((cyfunc)->func.m_weakreflist)\n-#endif\n-static PyObject *__Pyx_CyFunction_New(PyTypeObject *type, PyMethodDef *ml, int flags, PyObject* qualname,\n- PyObject *closure, PyObject *module, PyObject* globals, PyObject* code) {\n- __pyx_CyFunctionObject *op = PyObject_GC_New(__pyx_CyFunctionObject, type);\n- if (op == NULL)\n- return NULL;\n- op->flags = flags;\n- __Pyx_CyFunction_weakreflist(op) = NULL;\n- op->func.m_ml = ml;\n- op->func.m_self = (PyObject *) op;\n- Py_XINCREF(closure);\n- op->func_closure = closure;\n- Py_XINCREF(module);\n- op->func.m_module = module;\n- op->func_dict = NULL;\n- op->func_name = NULL;\n- Py_INCREF(qualname);\n- op->func_qualname = qualname;\n- op->func_doc = NULL;\n- op->func_classobj = NULL;\n- op->func_globals = globals;\n- Py_INCREF(op->func_globals);\n- Py_XINCREF(code);\n- op->func_code = code;\n- op->defaults_pyobjects = 0;\n- op->defaults = NULL;\n- op->defaults_tuple = NULL;\n- op->defaults_kwdict = NULL;\n- op->defaults_getter = NULL;\n- op->func_annotations = NULL;\n- PyObject_GC_Track(op);\n- return (PyObject *) op;\n-}\n-static int\n-__Pyx_CyFunction_clear(__pyx_CyFunctionObject *m)\n-{\n- Py_CLEAR(m->func_closure);\n- Py_CLEAR(m->func.m_module);\n- Py_CLEAR(m->func_dict);\n- Py_CLEAR(m->func_name);\n- Py_CLEAR(m->func_qualname);\n- Py_CLEAR(m->func_doc);\n- Py_CLEAR(m->func_globals);\n- Py_CLEAR(m->func_code);\n- Py_CLEAR(m->func_classobj);\n- Py_CLEAR(m->defaults_tuple);\n- Py_CLEAR(m->defaults_kwdict);\n- Py_CLEAR(m->func_annotations);\n- if (m->defaults) {\n- PyObject **pydefaults = __Pyx_CyFunction_Defaults(PyObject *, m);\n- int i;\n- for (i = 0; i < m->defaults_pyobjects; i++)\n- Py_XDECREF(pydefaults[i]);\n- PyObject_Free(m->defaults);\n- m->defaults = NULL;\n- }\n- return 0;\n-}\n-static void __Pyx_CyFunction_dealloc(__pyx_CyFunctionObject *m)\n-{\n- PyObject_GC_UnTrack(m);\n- if (__Pyx_CyFunction_weakreflist(m) != NULL)\n- PyObject_ClearWeakRefs((PyObject *) m);\n- __Pyx_CyFunction_clear(m);\n- PyObject_GC_Del(m);\n-}\n-static int __Pyx_CyFunction_traverse(__pyx_CyFunctionObject *m, visitproc visit, void *arg)\n-{\n- Py_VISIT(m->func_closure);\n- Py_VISIT(m->func.m_module);\n- Py_VISIT(m->func_dict);\n- Py_VISIT(m->func_name);\n- Py_VISIT(m->func_qualname);\n- Py_VISIT(m->func_doc);\n- Py_VISIT(m->func_globals);\n- Py_VISIT(m->func_code);\n- Py_VISIT(m->func_classobj);\n- Py_VISIT(m->defaults_tuple);\n- Py_VISIT(m->defaults_kwdict);\n- if (m->defaults) {\n- PyObject **pydefaults = __Pyx_CyFunction_Defaults(PyObject *, m);\n- int i;\n- for (i = 0; i < m->defaults_pyobjects; i++)\n- Py_VISIT(pydefaults[i]);\n- }\n- return 0;\n-}\n-static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObject *type)\n-{\n- __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;\n- if (m->flags & __Pyx_CYFUNCTION_STATICMETHOD) {\n- Py_INCREF(func);\n- return func;\n- }\n- if (m->flags & __Pyx_CYFUNCTION_CLASSMETHOD) {\n- if (type == NULL)\n- type = (PyObject *)(Py_TYPE(obj));\n- return __Pyx_PyMethod_New(func, type, (PyObject *)(Py_TYPE(type)));\n- }\n- if (obj == Py_None)\n- obj = NULL;\n- return __Pyx_PyMethod_New(func, obj, type);\n-}\n-static PyObject*\n-__Pyx_CyFunction_repr(__pyx_CyFunctionObject *op)\n-{\n-#if PY_MAJOR_VERSION >= 3\n- return PyUnicode_FromFormat(\"<cyfunction %U at %p>\",\n- op->func_qualname, (void *)op);\n-#else\n- return PyString_FromFormat(\"<cyfunction %s at %p>\",\n- PyString_AsString(op->func_qualname), (void *)op);\n-#endif\n-}\n-static PyObject * __Pyx_CyFunction_CallMethod(PyObject *func, PyObject *self, PyObject *arg, PyObject *kw) {\n- PyCFunctionObject* f = (PyCFunctionObject*)func;\n- PyCFunction meth = f->m_ml->ml_meth;\n- Py_ssize_t size;\n- switch (f->m_ml->ml_flags & (METH_VARARGS | METH_KEYWORDS | METH_NOARGS | METH_O)) {\n- case METH_VARARGS:\n- if (likely(kw == NULL || PyDict_Size(kw) == 0))\n- return (*meth)(self, arg);\n- break;\n- case METH_VARARGS | METH_KEYWORDS:\n- return (*(PyCFunctionWithKeywords)meth)(self, arg, kw);\n- case METH_NOARGS:\n- if (likely(kw == NULL || PyDict_Size(kw) == 0)) {\n- size = PyTuple_GET_SIZE(arg);\n- if (likely(size == 0))\n- return (*meth)(self, NULL);\n- PyErr_Format(PyExc_TypeError,\n- \"%.200s() takes no arguments (%\" CYTHON_FORMAT_SSIZE_T \"d given)\",\n- f->m_ml->ml_name, size);\n- return NULL;\n- }\n- break;\n- case METH_O:\n- if (likely(kw == NULL || PyDict_Size(kw) == 0)) {\n- size = PyTuple_GET_SIZE(arg);\n- if (likely(size == 1)) {\n- PyObject *result, *arg0 = PySequence_ITEM(arg, 0);\n- if (unlikely(!arg0)) return NULL;\n- result = (*meth)(self, arg0);\n- Py_DECREF(arg0);\n- return result;\n- }\n- PyErr_Format(PyExc_TypeError,\n- \"%.200s() takes exactly one argument (%\" CYTHON_FORMAT_SSIZE_T \"d given)\",\n- f->m_ml->ml_name, size);\n- return NULL;\n- }\n- break;\n- default:\n- PyErr_SetString(PyExc_SystemError, \"Bad call flags in \"\n- \"__Pyx_CyFunction_Call. METH_OLDARGS is no \"\n- \"longer supported!\");\n- return NULL;\n- }\n- PyErr_Format(PyExc_TypeError, \"%.200s() takes no keyword arguments\",\n- f->m_ml->ml_name);\n- return NULL;\n-}\n-static CYTHON_INLINE PyObject *__Pyx_CyFunction_Call(PyObject *func, PyObject *arg, PyObject *kw) {\n- return __Pyx_CyFunction_CallMethod(func, ((PyCFunctionObject*)func)->m_self, arg, kw);\n-}\n-static PyObject *__Pyx_CyFunction_CallAsMethod(PyObject *func, PyObject *args, PyObject *kw) {\n- PyObject *result;\n- __pyx_CyFunctionObject *cyfunc = (__pyx_CyFunctionObject *) func;\n- if ((cyfunc->flags & __Pyx_CYFUNCTION_CCLASS) && !(cyfunc->flags & __Pyx_CYFUNCTION_STATICMETHOD)) {\n- Py_ssize_t argc;\n- PyObject *new_args;\n- PyObject *self;\n- argc = PyTuple_GET_SIZE(args);\n- new_args = PyTuple_GetSlice(args, 1, argc);\n- if (unlikely(!new_args))\n- return NULL;\n- self = PyTuple_GetItem(args, 0);\n- if (unlikely(!self)) {\n- Py_DECREF(new_args);\n- return NULL;\n- }\n- result = __Pyx_CyFunction_CallMethod(func, self, new_args, kw);\n- Py_DECREF(new_args);\n- } else {\n- result = __Pyx_CyFunction_Call(func, args, kw);\n- }\n- return result;\n-}\n-static PyTypeObject __pyx_CyFunctionType_type = {\n- PyVarObject_HEAD_INIT(0, 0)\n- \"cython_function_or_method\",\n- sizeof(__pyx_CyFunctionObject),\n- 0,\n- (destructor) __Pyx_CyFunction_dealloc,\n- 0,\n- 0,\n- 0,\n-#if PY_MAJOR_VERSION < 3\n- 0,\n-#else\n- 0,\n-#endif\n- (reprfunc) __Pyx_CyFunction_repr,\n- 0,\n- 0,\n- 0,\n- 0,\n- __Pyx_CyFunction_CallAsMethod,\n- 0,\n- 0,\n- 0,\n- 0,\n- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,\n- 0,\n- (traverseproc) __Pyx_CyFunction_traverse,\n- (inquiry) __Pyx_CyFunction_clear,\n- 0,\n-#if PY_VERSION_HEX < 0x030500A0\n- offsetof(__pyx_CyFunctionObject, func_weakreflist),\n-#else\n- offsetof(PyCFunctionObject, m_weakreflist),\n-#endif\n- 0,\n- 0,\n- __pyx_CyFunction_methods,\n- __pyx_CyFunction_members,\n- __pyx_CyFunction_getsets,\n- 0,\n- 0,\n- __Pyx_CyFunction_descr_get,\n- 0,\n- offsetof(__pyx_CyFunctionObject, func_dict),\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n-#if PY_VERSION_HEX >= 0x030400a1\n- 0,\n-#endif\n-};\n-static int __pyx_CyFunction_init(void) {\n- __pyx_CyFunctionType = __Pyx_FetchCommonType(&__pyx_CyFunctionType_type);\n- if (__pyx_CyFunctionType == NULL) {\n- return -1;\n- }\n- return 0;\n-}\n-static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *func, size_t size, int pyobjects) {\n- __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;\n- m->defaults = PyObject_Malloc(size);\n- if (!m->defaults)\n- return PyErr_NoMemory();\n- memset(m->defaults, 0, size);\n- m->defaults_pyobjects = pyobjects;\n- return m->defaults;\n-}\n-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsTuple(PyObject *func, PyObject *tuple) {\n- __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;\n- m->defaults_tuple = tuple;\n- Py_INCREF(tuple);\n-}\n-static CYTHON_INLINE void __Pyx_CyFunction_SetDefaultsKwDict(PyObject *func, PyObject *dict) {\n- __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;\n- m->defaults_kwdict = dict;\n- Py_INCREF(dict);\n-}\n-static CYTHON_INLINE void __Pyx_CyFunction_SetAnnotationsDict(PyObject *func, PyObject *dict) {\n- __pyx_CyFunctionObject *m = (__pyx_CyFunctionObject *) func;\n- m->func_annotations = dict;\n- Py_INCREF(dict);\n-}\n-\n \/* CodeObjectCache *\/\n- static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line) {\n+ static int __pyx_bisect_code_objects(__Pyx_CodeObjectCacheEntry* entries, int count, int code_line) {\n int start = 0, mid = 0, end = count - 1;\n if (end >= 0 && code_line > entries[end].code_line) {\n return count;\n@@ -15824,7 +15910,7 @@\n }\n \n \/* AddTraceback *\/\n- #include \"compile.h\"\n+ #include \"compile.h\"\n #include \"frameobject.h\"\n #include \"traceback.h\"\n static PyCodeObject* __Pyx_CreateCodeObjectForTraceback(\n@@ -15905,7 +15991,7 @@\n }\n \n \/* CIntToPy *\/\n- static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {\n+ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {\n const long neg_one = (long) -1, const_zero = (long) 0;\n const int is_unsigned = neg_one > const_zero;\n if (is_unsigned) {\n@@ -15936,7 +16022,7 @@\n }\n \n \/* CIntFromPyVerify *\/\n- #define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\\\n+ #define __PYX_VERIFY_RETURN_INT(target_type, func_type, func_value)\\\n __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 0)\n #define __PYX_VERIFY_RETURN_INT_EXC(target_type, func_type, func_value)\\\n __PYX__VERIFY_RETURN_INT(target_type, func_type, func_value, 1)\n@@ -15958,24 +16044,24 @@\n }\n \n \/* CIntToPy *\/\n- static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) {\n- const unsigned int neg_one = (unsigned int) -1, const_zero = (unsigned int) 0;\n+ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint32_t(uint32_t value) {\n+ const uint32_t neg_one = (uint32_t) -1, const_zero = (uint32_t) 0;\n const int is_unsigned = neg_one > const_zero;\n if (is_unsigned) {\n- if (sizeof(unsigned int) < sizeof(long)) {\n+ if (sizeof(uint32_t) < sizeof(long)) {\n return PyInt_FromLong((long) value);\n- } else if (sizeof(unsigned int) <= sizeof(unsigned long)) {\n+ } else if (sizeof(uint32_t) <= sizeof(unsigned long)) {\n return PyLong_FromUnsignedLong((unsigned long) value);\n #ifdef HAVE_LONG_LONG\n- } else if (sizeof(unsigned int) <= sizeof(unsigned PY_LONG_LONG)) {\n+ } else if (sizeof(uint32_t) <= sizeof(unsigned PY_LONG_LONG)) {\n return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);\n #endif\n }\n } else {\n- if (sizeof(unsigned int) <= sizeof(long)) {\n+ if (sizeof(uint32_t) <= sizeof(long)) {\n return PyInt_FromLong((long) value);\n #ifdef HAVE_LONG_LONG\n- } else if (sizeof(unsigned int) <= sizeof(PY_LONG_LONG)) {\n+ } else if (sizeof(uint32_t) <= sizeof(PY_LONG_LONG)) {\n return PyLong_FromLongLong((PY_LONG_LONG) value);\n #endif\n }\n@@ -15983,25 +16069,56 @@\n {\n int one = 1; int little = (int)*(unsigned char *)&one;\n unsigned char *bytes = (unsigned char *)&value;\n- return _PyLong_FromByteArray(bytes, sizeof(unsigned int),\n+ return _PyLong_FromByteArray(bytes, sizeof(uint32_t),\n little, !is_unsigned);\n }\n }\n \n+\/* CIntToPy *\/\n+ static CYTHON_INLINE PyObject* __Pyx_PyInt_From_uint64_t(uint64_t value) {\n+ const uint64_t neg_one = (uint64_t) -1, const_zero = (uint64_t) 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (is_unsigned) {\n+ if (sizeof(uint64_t) < sizeof(long)) {\n+ return PyInt_FromLong((long) value);\n+ } else if (sizeof(uint64_t) <= sizeof(unsigned long)) {\n+ return PyLong_FromUnsignedLong((unsigned long) value);\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint64_t) <= sizeof(unsigned PY_LONG_LONG)) {\n+ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG) value);\n+#endif\n+ }\n+ } else {\n+ if (sizeof(uint64_t) <= sizeof(long)) {\n+ return PyInt_FromLong((long) value);\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint64_t) <= sizeof(PY_LONG_LONG)) {\n+ return PyLong_FromLongLong((PY_LONG_LONG) value);\n+#endif\n+ }\n+ }\n+ {\n+ int one = 1; int little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&value;\n+ return _PyLong_FromByteArray(bytes, sizeof(uint64_t),\n+ little, !is_unsigned);\n+ }\n+}\n+\n \/* CIntFromPy *\/\n- static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *x) {\n- const unsigned int neg_one = (unsigned int) -1, const_zero = (unsigned int) 0;\n+ static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {\n+ const int neg_one = (int) -1, const_zero = (int) 0;\n const int is_unsigned = neg_one > const_zero;\n #if PY_MAJOR_VERSION < 3\n if (likely(PyInt_Check(x))) {\n- if (sizeof(unsigned int) < sizeof(long)) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, long, PyInt_AS_LONG(x))\n+ if (sizeof(int) < sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))\n } else {\n long val = PyInt_AS_LONG(x);\n if (is_unsigned && unlikely(val < 0)) {\n goto raise_neg_overflow;\n }\n- return (unsigned int) val;\n+ return (int) val;\n }\n } else\n #endif\n@@ -16010,32 +16127,32 @@\n #if CYTHON_USE_PYLONG_INTERNALS\n const digit* digits = ((PyLongObject*)x)->ob_digit;\n switch (Py_SIZE(x)) {\n- case 0: return (unsigned int) 0;\n- case 1: __PYX_VERIFY_RETURN_INT(unsigned int, digit, digits[0])\n+ case 0: return (int) 0;\n+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, digits[0])\n case 2:\n- if (8 * sizeof(unsigned int) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) >= 2 * PyLong_SHIFT) {\n- return (unsigned int) (((((unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0]));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) >= 2 * PyLong_SHIFT) {\n+ return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n }\n }\n break;\n case 3:\n- if (8 * sizeof(unsigned int) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) >= 3 * PyLong_SHIFT) {\n- return (unsigned int) (((((((unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0]));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) >= 3 * PyLong_SHIFT) {\n+ return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n }\n }\n break;\n case 4:\n- if (8 * sizeof(unsigned int) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) >= 4 * PyLong_SHIFT) {\n- return (unsigned int) (((((((((unsigned int)digits[3]) << PyLong_SHIFT) | (unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0]));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) >= 4 * PyLong_SHIFT) {\n+ return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n }\n }\n break;\n@@ -16049,86 +16166,86 @@\n {\n int result = PyObject_RichCompareBool(x, Py_False, Py_LT);\n if (unlikely(result < 0))\n- return (unsigned int) -1;\n+ return (int) -1;\n if (unlikely(result == 1))\n goto raise_neg_overflow;\n }\n #endif\n- if (sizeof(unsigned int) <= sizeof(unsigned long)) {\n- __PYX_VERIFY_RETURN_INT_EXC(unsigned int, unsigned long, PyLong_AsUnsignedLong(x))\n+ if (sizeof(int) <= sizeof(unsigned long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))\n #ifdef HAVE_LONG_LONG\n- } else if (sizeof(unsigned int) <= sizeof(unsigned PY_LONG_LONG)) {\n- __PYX_VERIFY_RETURN_INT_EXC(unsigned int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n+ } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n #endif\n }\n } else {\n #if CYTHON_USE_PYLONG_INTERNALS\n const digit* digits = ((PyLongObject*)x)->ob_digit;\n switch (Py_SIZE(x)) {\n- case 0: return (unsigned int) 0;\n- case -1: __PYX_VERIFY_RETURN_INT(unsigned int, sdigit, (sdigit) (-(sdigit)digits[0]))\n- case 1: __PYX_VERIFY_RETURN_INT(unsigned int, digit, +digits[0])\n+ case 0: return (int) 0;\n+ case -1: __PYX_VERIFY_RETURN_INT(int, sdigit, (sdigit) (-(sdigit)digits[0]))\n+ case 1: __PYX_VERIFY_RETURN_INT(int, digit, +digits[0])\n case -2:\n- if (8 * sizeof(unsigned int) - 1 > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) - 1 > 1 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 2 * PyLong_SHIFT) {\n- return (unsigned int) (((unsigned int)-1)*(((((unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n+ return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n case 2:\n- if (8 * sizeof(unsigned int) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 1 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 2 * PyLong_SHIFT) {\n- return (unsigned int) ((((((unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n+ return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n case -3:\n- if (8 * sizeof(unsigned int) - 1 > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 3 * PyLong_SHIFT) {\n- return (unsigned int) (((unsigned int)-1)*(((((((unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n+ return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n case 3:\n- if (8 * sizeof(unsigned int) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 2 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 3 * PyLong_SHIFT) {\n- return (unsigned int) ((((((((unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n+ return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n case -4:\n- if (8 * sizeof(unsigned int) - 1 > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 4 * PyLong_SHIFT) {\n- return (unsigned int) (((unsigned int)-1)*(((((((((unsigned int)digits[3]) << PyLong_SHIFT) | (unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {\n+ return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n case 4:\n- if (8 * sizeof(unsigned int) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(int) > 3 * PyLong_SHIFT) {\n if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(unsigned int) - 1 > 4 * PyLong_SHIFT) {\n- return (unsigned int) ((((((((((unsigned int)digits[3]) << PyLong_SHIFT) | (unsigned int)digits[2]) << PyLong_SHIFT) | (unsigned int)digits[1]) << PyLong_SHIFT) | (unsigned int)digits[0])));\n+ __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {\n+ return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n }\n }\n break;\n }\n #endif\n- if (sizeof(unsigned int) <= sizeof(long)) {\n- __PYX_VERIFY_RETURN_INT_EXC(unsigned int, long, PyLong_AsLong(x))\n+ if (sizeof(int) <= sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))\n #ifdef HAVE_LONG_LONG\n- } else if (sizeof(unsigned int) <= sizeof(PY_LONG_LONG)) {\n- __PYX_VERIFY_RETURN_INT_EXC(unsigned int, PY_LONG_LONG, PyLong_AsLongLong(x))\n+ } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))\n #endif\n }\n }\n@@ -16137,7 +16254,7 @@\n PyErr_SetString(PyExc_RuntimeError,\n \"_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers\");\n #else\n- unsigned int val;\n+ int val;\n PyObject *v = __Pyx_PyNumber_IntOrLong(x);\n #if PY_MAJOR_VERSION < 3\n if (likely(v) && !PyLong_Check(v)) {\n@@ -16157,28 +16274,595 @@\n return val;\n }\n #endif\n- return (unsigned int) -1;\n+ return (int) -1;\n }\n } else {\n- unsigned int val;\n+ int val;\n PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);\n- if (!tmp) return (unsigned int) -1;\n- val = __Pyx_PyInt_As_unsigned_int(tmp);\n+ if (!tmp) return (int) -1;\n+ val = __Pyx_PyInt_As_int(tmp);\n Py_DECREF(tmp);\n return val;\n }\n raise_overflow:\n PyErr_SetString(PyExc_OverflowError,\n- \"value too large to convert to unsigned int\");\n- return (unsigned int) -1;\n+ \"value too large to convert to int\");\n+ return (int) -1;\n raise_neg_overflow:\n PyErr_SetString(PyExc_OverflowError,\n- \"can't convert negative value to unsigned int\");\n- return (unsigned int) -1;\n+ \"can't convert negative value to int\");\n+ return (int) -1;\n }\n \n \/* CIntFromPy *\/\n- static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {\n+ static CYTHON_INLINE uint64_t __Pyx_PyInt_As_uint64_t(PyObject *x) {\n+ const uint64_t neg_one = (uint64_t) -1, const_zero = (uint64_t) 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_Check(x))) {\n+ if (sizeof(uint64_t) < sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, long, PyInt_AS_LONG(x))\n+ } else {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+ return (uint64_t) val;\n+ }\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (uint64_t) 0;\n+ case 1: __PYX_VERIFY_RETURN_INT(uint64_t, digit, digits[0])\n+ case 2:\n+ if (8 * sizeof(uint64_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) >= 2 * PyLong_SHIFT) {\n+ return (uint64_t) (((((uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(uint64_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) >= 3 * PyLong_SHIFT) {\n+ return (uint64_t) (((((((uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(uint64_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) >= 4 * PyLong_SHIFT) {\n+ return (uint64_t) (((((((((uint64_t)digits[3]) << PyLong_SHIFT) | (uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0]));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+#if CYTHON_COMPILING_IN_CPYTHON\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+#else\n+ {\n+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);\n+ if (unlikely(result < 0))\n+ return (uint64_t) -1;\n+ if (unlikely(result == 1))\n+ goto raise_neg_overflow;\n+ }\n+#endif\n+ if (sizeof(uint64_t) <= sizeof(unsigned long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint64_t, unsigned long, PyLong_AsUnsignedLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint64_t) <= sizeof(unsigned PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint64_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n+#endif\n+ }\n+ } else {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (uint64_t) 0;\n+ case -1: __PYX_VERIFY_RETURN_INT(uint64_t, sdigit, (sdigit) (-(sdigit)digits[0]))\n+ case 1: __PYX_VERIFY_RETURN_INT(uint64_t, digit, +digits[0])\n+ case -2:\n+ if (8 * sizeof(uint64_t) - 1 > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (uint64_t) (((uint64_t)-1)*(((((uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 2:\n+ if (8 * sizeof(uint64_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (uint64_t) ((((((uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -3:\n+ if (8 * sizeof(uint64_t) - 1 > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (uint64_t) (((uint64_t)-1)*(((((((uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(uint64_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (uint64_t) ((((((((uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -4:\n+ if (8 * sizeof(uint64_t) - 1 > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (uint64_t) (((uint64_t)-1)*(((((((((uint64_t)digits[3]) << PyLong_SHIFT) | (uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(uint64_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint64_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint64_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (uint64_t) ((((((((((uint64_t)digits[3]) << PyLong_SHIFT) | (uint64_t)digits[2]) << PyLong_SHIFT) | (uint64_t)digits[1]) << PyLong_SHIFT) | (uint64_t)digits[0])));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+ if (sizeof(uint64_t) <= sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint64_t, long, PyLong_AsLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint64_t) <= sizeof(PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint64_t, PY_LONG_LONG, PyLong_AsLongLong(x))\n+#endif\n+ }\n+ }\n+ {\n+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)\n+ PyErr_SetString(PyExc_RuntimeError,\n+ \"_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers\");\n+#else\n+ uint64_t val;\n+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(v) && !PyLong_Check(v)) {\n+ PyObject *tmp = v;\n+ v = PyNumber_Long(tmp);\n+ Py_DECREF(tmp);\n+ }\n+ #endif\n+ if (likely(v)) {\n+ int one = 1; int is_little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ int ret = _PyLong_AsByteArray((PyLongObject *)v,\n+ bytes, sizeof(val),\n+ is_little, !is_unsigned);\n+ Py_DECREF(v);\n+ if (likely(!ret))\n+ return val;\n+ }\n+#endif\n+ return (uint64_t) -1;\n+ }\n+ } else {\n+ uint64_t val;\n+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);\n+ if (!tmp) return (uint64_t) -1;\n+ val = __Pyx_PyInt_As_uint64_t(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+raise_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"value too large to convert to uint64_t\");\n+ return (uint64_t) -1;\n+raise_neg_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to uint64_t\");\n+ return (uint64_t) -1;\n+}\n+\n+\/* CIntFromPy *\/\n+ static CYTHON_INLINE size_t __Pyx_PyInt_As_size_t(PyObject *x) {\n+ const size_t neg_one = (size_t) -1, const_zero = (size_t) 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_Check(x))) {\n+ if (sizeof(size_t) < sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT(size_t, long, PyInt_AS_LONG(x))\n+ } else {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+ return (size_t) val;\n+ }\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (size_t) 0;\n+ case 1: __PYX_VERIFY_RETURN_INT(size_t, digit, digits[0])\n+ case 2:\n+ if (8 * sizeof(size_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) >= 2 * PyLong_SHIFT) {\n+ return (size_t) (((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(size_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) >= 3 * PyLong_SHIFT) {\n+ return (size_t) (((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(size_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) >= 4 * PyLong_SHIFT) {\n+ return (size_t) (((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0]));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+#if CYTHON_COMPILING_IN_CPYTHON\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+#else\n+ {\n+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);\n+ if (unlikely(result < 0))\n+ return (size_t) -1;\n+ if (unlikely(result == 1))\n+ goto raise_neg_overflow;\n+ }\n+#endif\n+ if (sizeof(size_t) <= sizeof(unsigned long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned long, PyLong_AsUnsignedLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(size_t) <= sizeof(unsigned PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(size_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n+#endif\n+ }\n+ } else {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (size_t) 0;\n+ case -1: __PYX_VERIFY_RETURN_INT(size_t, sdigit, (sdigit) (-(sdigit)digits[0]))\n+ case 1: __PYX_VERIFY_RETURN_INT(size_t, digit, +digits[0])\n+ case -2:\n+ if (8 * sizeof(size_t) - 1 > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (size_t) (((size_t)-1)*(((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 2:\n+ if (8 * sizeof(size_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (size_t) ((((((size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -3:\n+ if (8 * sizeof(size_t) - 1 > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (size_t) (((size_t)-1)*(((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(size_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (size_t) ((((((((size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -4:\n+ if (8 * sizeof(size_t) - 1 > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (size_t) (((size_t)-1)*(((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(size_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(size_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(size_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (size_t) ((((((((((size_t)digits[3]) << PyLong_SHIFT) | (size_t)digits[2]) << PyLong_SHIFT) | (size_t)digits[1]) << PyLong_SHIFT) | (size_t)digits[0])));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+ if (sizeof(size_t) <= sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(size_t, long, PyLong_AsLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(size_t) <= sizeof(PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(size_t, PY_LONG_LONG, PyLong_AsLongLong(x))\n+#endif\n+ }\n+ }\n+ {\n+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)\n+ PyErr_SetString(PyExc_RuntimeError,\n+ \"_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers\");\n+#else\n+ size_t val;\n+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(v) && !PyLong_Check(v)) {\n+ PyObject *tmp = v;\n+ v = PyNumber_Long(tmp);\n+ Py_DECREF(tmp);\n+ }\n+ #endif\n+ if (likely(v)) {\n+ int one = 1; int is_little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ int ret = _PyLong_AsByteArray((PyLongObject *)v,\n+ bytes, sizeof(val),\n+ is_little, !is_unsigned);\n+ Py_DECREF(v);\n+ if (likely(!ret))\n+ return val;\n+ }\n+#endif\n+ return (size_t) -1;\n+ }\n+ } else {\n+ size_t val;\n+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);\n+ if (!tmp) return (size_t) -1;\n+ val = __Pyx_PyInt_As_size_t(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+raise_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"value too large to convert to size_t\");\n+ return (size_t) -1;\n+raise_neg_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to size_t\");\n+ return (size_t) -1;\n+}\n+\n+\/* CIntFromPy *\/\n+ static CYTHON_INLINE uint8_t __Pyx_PyInt_As_uint8_t(PyObject *x) {\n+ const uint8_t neg_one = (uint8_t) -1, const_zero = (uint8_t) 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_MAJOR_VERSION < 3\n+ if (likely(PyInt_Check(x))) {\n+ if (sizeof(uint8_t) < sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, long, PyInt_AS_LONG(x))\n+ } else {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+ return (uint8_t) val;\n+ }\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (uint8_t) 0;\n+ case 1: __PYX_VERIFY_RETURN_INT(uint8_t, digit, digits[0])\n+ case 2:\n+ if (8 * sizeof(uint8_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) >= 2 * PyLong_SHIFT) {\n+ return (uint8_t) (((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(uint8_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) >= 3 * PyLong_SHIFT) {\n+ return (uint8_t) (((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(uint8_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) >= 4 * PyLong_SHIFT) {\n+ return (uint8_t) (((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0]));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+#if CYTHON_COMPILING_IN_CPYTHON\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ goto raise_neg_overflow;\n+ }\n+#else\n+ {\n+ int result = PyObject_RichCompareBool(x, Py_False, Py_LT);\n+ if (unlikely(result < 0))\n+ return (uint8_t) -1;\n+ if (unlikely(result == 1))\n+ goto raise_neg_overflow;\n+ }\n+#endif\n+ if (sizeof(uint8_t) <= sizeof(unsigned long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned long, PyLong_AsUnsignedLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint8_t) <= sizeof(unsigned PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint8_t, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n+#endif\n+ }\n+ } else {\n+#if CYTHON_USE_PYLONG_INTERNALS\n+ const digit* digits = ((PyLongObject*)x)->ob_digit;\n+ switch (Py_SIZE(x)) {\n+ case 0: return (uint8_t) 0;\n+ case -1: __PYX_VERIFY_RETURN_INT(uint8_t, sdigit, (sdigit) (-(sdigit)digits[0]))\n+ case 1: __PYX_VERIFY_RETURN_INT(uint8_t, digit, +digits[0])\n+ case -2:\n+ if (8 * sizeof(uint8_t) - 1 > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (uint8_t) (((uint8_t)-1)*(((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 2:\n+ if (8 * sizeof(uint8_t) > 1 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT) {\n+ return (uint8_t) ((((((uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -3:\n+ if (8 * sizeof(uint8_t) - 1 > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (uint8_t) (((uint8_t)-1)*(((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 3:\n+ if (8 * sizeof(uint8_t) > 2 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT) {\n+ return (uint8_t) ((((((((uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case -4:\n+ if (8 * sizeof(uint8_t) - 1 > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (uint8_t) (((uint8_t)-1)*(((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ case 4:\n+ if (8 * sizeof(uint8_t) > 3 * PyLong_SHIFT) {\n+ if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n+ __PYX_VERIFY_RETURN_INT(uint8_t, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n+ } else if (8 * sizeof(uint8_t) - 1 > 4 * PyLong_SHIFT) {\n+ return (uint8_t) ((((((((((uint8_t)digits[3]) << PyLong_SHIFT) | (uint8_t)digits[2]) << PyLong_SHIFT) | (uint8_t)digits[1]) << PyLong_SHIFT) | (uint8_t)digits[0])));\n+ }\n+ }\n+ break;\n+ }\n+#endif\n+ if (sizeof(uint8_t) <= sizeof(long)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint8_t, long, PyLong_AsLong(x))\n+#ifdef HAVE_LONG_LONG\n+ } else if (sizeof(uint8_t) <= sizeof(PY_LONG_LONG)) {\n+ __PYX_VERIFY_RETURN_INT_EXC(uint8_t, PY_LONG_LONG, PyLong_AsLongLong(x))\n+#endif\n+ }\n+ }\n+ {\n+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)\n+ PyErr_SetString(PyExc_RuntimeError,\n+ \"_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers\");\n+#else\n+ uint8_t val;\n+ PyObject *v = __Pyx_PyNumber_IntOrLong(x);\n+ #if PY_MAJOR_VERSION < 3\n+ if (likely(v) && !PyLong_Check(v)) {\n+ PyObject *tmp = v;\n+ v = PyNumber_Long(tmp);\n+ Py_DECREF(tmp);\n+ }\n+ #endif\n+ if (likely(v)) {\n+ int one = 1; int is_little = (int)*(unsigned char *)&one;\n+ unsigned char *bytes = (unsigned char *)&val;\n+ int ret = _PyLong_AsByteArray((PyLongObject *)v,\n+ bytes, sizeof(val),\n+ is_little, !is_unsigned);\n+ Py_DECREF(v);\n+ if (likely(!ret))\n+ return val;\n+ }\n+#endif\n+ return (uint8_t) -1;\n+ }\n+ } else {\n+ uint8_t val;\n+ PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);\n+ if (!tmp) return (uint8_t) -1;\n+ val = __Pyx_PyInt_As_uint8_t(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+raise_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"value too large to convert to uint8_t\");\n+ return (uint8_t) -1;\n+raise_neg_overflow:\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to uint8_t\");\n+ return (uint8_t) -1;\n+}\n+\n+\/* CIntFromPy *\/\n+ static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {\n const long neg_one = (long) -1, const_zero = (long) 0;\n const int is_unsigned = neg_one > const_zero;\n #if PY_MAJOR_VERSION < 3\n@@ -16366,913 +17050,8 @@\n return (long) -1;\n }\n \n-\/* CIntFromPy *\/\n- static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {\n- const int neg_one = (int) -1, const_zero = (int) 0;\n- const int is_unsigned = neg_one > const_zero;\n-#if PY_MAJOR_VERSION < 3\n- if (likely(PyInt_Check(x))) {\n- if (sizeof(int) < sizeof(long)) {\n- __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG(x))\n- } else {\n- long val = PyInt_AS_LONG(x);\n- if (is_unsigned && unlikely(val < 0)) {\n- goto raise_neg_overflow;\n- }\n- return (int) val;\n- }\n- } else\n-#endif\n- if (likely(PyLong_Check(x))) {\n- if (is_unsigned) {\n-#if CYTHON_USE_PYLONG_INTERNALS\n- const digit* digits = ((PyLongObject*)x)->ob_digit;\n- switch (Py_SIZE(x)) {\n- case 0: return (int) 0;\n- case 1: __PYX_VERIFY_RETURN_INT(int, digit, digits[0])\n- case 2:\n- if (8 * sizeof(int) > 1 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) >= 2 * PyLong_SHIFT) {\n- return (int) (((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n- }\n- }\n- break;\n- case 3:\n- if (8 * sizeof(int) > 2 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) >= 3 * PyLong_SHIFT) {\n- return (int) (((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n- }\n- }\n- break;\n- case 4:\n- if (8 * sizeof(int) > 3 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) >= 4 * PyLong_SHIFT) {\n- return (int) (((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0]));\n- }\n- }\n- break;\n- }\n-#endif\n-#if CYTHON_COMPILING_IN_CPYTHON\n- if (unlikely(Py_SIZE(x) < 0)) {\n- goto raise_neg_overflow;\n- }\n-#else\n- {\n- int result = PyObject_RichCompareBool(x, Py_False, Py_LT);\n- if (unlikely(result < 0))\n- return (int) -1;\n- if (unlikely(result == 1))\n- goto raise_neg_overflow;\n- }\n-#endif\n- if (sizeof(int) <= sizeof(unsigned long)) {\n- __PYX_VERIFY_RETURN_INT_EXC(int, unsigned long, PyLong_AsUnsignedLong(x))\n-#ifdef HAVE_LONG_LONG\n- } else if (sizeof(int) <= sizeof(unsigned PY_LONG_LONG)) {\n- __PYX_VERIFY_RETURN_INT_EXC(int, unsigned PY_LONG_LONG, PyLong_AsUnsignedLongLong(x))\n-#endif\n- }\n- } else {\n-#if CYTHON_USE_PYLONG_INTERNALS\n- const digit* digits = ((PyLongObject*)x)->ob_digit;\n- switch (Py_SIZE(x)) {\n- case 0: return (int) 0;\n- case -1: __PYX_VERIFY_RETURN_INT(int, sdigit, (sdigit) (-(sdigit)digits[0]))\n- case 1: __PYX_VERIFY_RETURN_INT(int, digit, +digits[0])\n- case -2:\n- if (8 * sizeof(int) - 1 > 1 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n- return (int) (((int)-1)*(((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- case 2:\n- if (8 * sizeof(int) > 1 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 2 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n- return (int) ((((((int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- case -3:\n- if (8 * sizeof(int) - 1 > 2 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n- return (int) (((int)-1)*(((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- case 3:\n- if (8 * sizeof(int) > 2 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 3 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n- return (int) ((((((((int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- case -4:\n- if (8 * sizeof(int) - 1 > 3 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, long, -(long) (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {\n- return (int) (((int)-1)*(((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- case 4:\n- if (8 * sizeof(int) > 3 * PyLong_SHIFT) {\n- if (8 * sizeof(unsigned long) > 4 * PyLong_SHIFT) {\n- __PYX_VERIFY_RETURN_INT(int, unsigned long, (((((((((unsigned long)digits[3]) << PyLong_SHIFT) | (unsigned long)digits[2]) << PyLong_SHIFT) | (unsigned long)digits[1]) << PyLong_SHIFT) | (unsigned long)digits[0])))\n- } else if (8 * sizeof(int) - 1 > 4 * PyLong_SHIFT) {\n- return (int) ((((((((((int)digits[3]) << PyLong_SHIFT) | (int)digits[2]) << PyLong_SHIFT) | (int)digits[1]) << PyLong_SHIFT) | (int)digits[0])));\n- }\n- }\n- break;\n- }\n-#endif\n- if (sizeof(int) <= sizeof(long)) {\n- __PYX_VERIFY_RETURN_INT_EXC(int, long, PyLong_AsLong(x))\n-#ifdef HAVE_LONG_LONG\n- } else if (sizeof(int) <= sizeof(PY_LONG_LONG)) {\n- __PYX_VERIFY_RETURN_INT_EXC(int, PY_LONG_LONG, PyLong_AsLongLong(x))\n-#endif\n- }\n- }\n- {\n-#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)\n- PyErr_SetString(PyExc_RuntimeError,\n- \"_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers\");\n-#else\n- int val;\n- PyObject *v = __Pyx_PyNumber_IntOrLong(x);\n- #if PY_MAJOR_VERSION < 3\n- if (likely(v) && !PyLong_Check(v)) {\n- PyObject *tmp = v;\n- v = PyNumber_Long(tmp);\n- Py_DECREF(tmp);\n- }\n- #endif\n- if (likely(v)) {\n- int one = 1; int is_little = (int)*(unsigned char *)&one;\n- unsigned char *bytes = (unsigned char *)&val;\n- int ret = _PyLong_AsByteArray((PyLongObject *)v,\n- bytes, sizeof(val),\n- is_little, !is_unsigned);\n- Py_DECREF(v);\n- if (likely(!ret))\n- return val;\n- }\n-#endif\n- return (int) -1;\n- }\n- } else {\n- int val;\n- PyObject *tmp = __Pyx_PyNumber_IntOrLong(x);\n- if (!tmp) return (int) -1;\n- val = __Pyx_PyInt_As_int(tmp);\n- Py_DECREF(tmp);\n- return val;\n- }\n-raise_overflow:\n- PyErr_SetString(PyExc_OverflowError,\n- \"value too large to convert to int\");\n- return (int) -1;\n-raise_neg_overflow:\n- PyErr_SetString(PyExc_OverflowError,\n- \"can't convert negative value to int\");\n- return (int) -1;\n-}\n-\n-\/* CoroutineBase *\/\n- #include <structmember.h>\n-#include <frameobject.h>\n-static PyObject *__Pyx_Coroutine_Send(PyObject *self, PyObject *value);\n-static PyObject *__Pyx_Coroutine_Close(PyObject *self);\n-static PyObject *__Pyx_Coroutine_Throw(PyObject *gen, PyObject *args);\n-#define __Pyx_Coroutine_Undelegate(gen) Py_CLEAR((gen)->yieldfrom)\n-#if 1 || PY_VERSION_HEX < 0x030300B0\n-static int __Pyx_PyGen_FetchStopIterationValue(PyObject **pvalue) {\n- PyObject *et, *ev, *tb;\n- PyObject *value = NULL;\n- __Pyx_PyThreadState_declare\n- __Pyx_PyThreadState_assign\n- __Pyx_ErrFetch(&et, &ev, &tb);\n- if (!et) {\n- Py_XDECREF(tb);\n- Py_XDECREF(ev);\n- Py_INCREF(Py_None);\n- *pvalue = Py_None;\n- return 0;\n- }\n- if (likely(et == PyExc_StopIteration)) {\n- if (!ev) {\n- Py_INCREF(Py_None);\n- value = Py_None;\n- }\n-#if PY_VERSION_HEX >= 0x030300A0\n- else if (Py_TYPE(ev) == (PyTypeObject*)PyExc_StopIteration) {\n- value = ((PyStopIterationObject *)ev)->value;\n- Py_INCREF(value);\n- Py_DECREF(ev);\n- }\n-#endif\n- else if (unlikely(PyTuple_Check(ev))) {\n- if (PyTuple_GET_SIZE(ev) >= 1) {\n-#if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS\n- value = PyTuple_GET_ITEM(ev, 0);\n- Py_INCREF(value);\n-#else\n- value = PySequence_ITEM(ev, 0);\n-#endif\n- } else {\n- Py_INCREF(Py_None);\n- value = Py_None;\n- }\n- Py_DECREF(ev);\n- }\n- else if (!PyObject_TypeCheck(ev, (PyTypeObject*)PyExc_StopIteration)) {\n- value = ev;\n- }\n- if (likely(value)) {\n- Py_XDECREF(tb);\n- Py_DECREF(et);\n- *pvalue = value;\n- return 0;\n- }\n- } else if (!PyErr_GivenExceptionMatches(et, PyExc_StopIteration)) {\n- __Pyx_ErrRestore(et, ev, tb);\n- return -1;\n- }\n- PyErr_NormalizeException(&et, &ev, &tb);\n- if (unlikely(!PyObject_TypeCheck(ev, (PyTypeObject*)PyExc_StopIteration))) {\n- __Pyx_ErrRestore(et, ev, tb);\n- return -1;\n- }\n- Py_XDECREF(tb);\n- Py_DECREF(et);\n-#if PY_VERSION_HEX >= 0x030300A0\n- value = ((PyStopIterationObject *)ev)->value;\n- Py_INCREF(value);\n- Py_DECREF(ev);\n-#else\n- {\n- PyObject* args = __Pyx_PyObject_GetAttrStr(ev, __pyx_n_s_args);\n- Py_DECREF(ev);\n- if (likely(args)) {\n- value = PySequence_GetItem(args, 0);\n- Py_DECREF(args);\n- }\n- if (unlikely(!value)) {\n- __Pyx_ErrRestore(NULL, NULL, NULL);\n- Py_INCREF(Py_None);\n- value = Py_None;\n- }\n- }\n-#endif\n- *pvalue = value;\n- return 0;\n-}\n-#endif\n-static CYTHON_INLINE\n-void __Pyx_Coroutine_ExceptionClear(__pyx_CoroutineObject *self) {\n- PyObject *exc_type = self->exc_type;\n- PyObject *exc_value = self->exc_value;\n- PyObject *exc_traceback = self->exc_traceback;\n- self->exc_type = NULL;\n- self->exc_value = NULL;\n- self->exc_traceback = NULL;\n- Py_XDECREF(exc_type);\n- Py_XDECREF(exc_value);\n- Py_XDECREF(exc_traceback);\n-}\n-static CYTHON_INLINE\n-int __Pyx_Coroutine_CheckRunning(__pyx_CoroutineObject *gen) {\n- if (unlikely(gen->is_running)) {\n- PyErr_SetString(PyExc_ValueError,\n- \"generator already executing\");\n- return 1;\n- }\n- return 0;\n-}\n-static CYTHON_INLINE\n-PyObject *__Pyx_Coroutine_SendEx(__pyx_CoroutineObject *self, PyObject *value) {\n- PyObject *retval;\n- __Pyx_PyThreadState_declare\n- assert(!self->is_running);\n- if (unlikely(self->resume_label == 0)) {\n- if (unlikely(value && value != Py_None)) {\n- PyErr_SetString(PyExc_TypeError,\n- \"can't send non-None value to a \"\n- \"just-started generator\");\n- return NULL;\n- }\n- }\n- if (unlikely(self->resume_label == -1)) {\n- PyErr_SetNone(PyExc_StopIteration);\n- return NULL;\n- }\n- __Pyx_PyThreadState_assign\n- if (value) {\n-#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON\n-#else\n- if (self->exc_traceback) {\n- PyTracebackObject *tb = (PyTracebackObject *) self->exc_traceback;\n- PyFrameObject *f = tb->tb_frame;\n- Py_XINCREF(__pyx_tstate->frame);\n- assert(f->f_back == NULL);\n- f->f_back = __pyx_tstate->frame;\n- }\n-#endif\n- __Pyx_ExceptionSwap(&self->exc_type, &self->exc_value,\n- &self->exc_traceback);\n- } else {\n- __Pyx_Coroutine_ExceptionClear(self);\n- }\n- self->is_running = 1;\n- retval = self->body((PyObject *) self, value);\n- self->is_running = 0;\n- if (retval) {\n- __Pyx_ExceptionSwap(&self->exc_type, &self->exc_value,\n- &self->exc_traceback);\n-#if CYTHON_COMPILING_IN_PYPY || CYTHON_COMPILING_IN_PYSTON\n-#else\n- if (self->exc_traceback) {\n- PyTracebackObject *tb = (PyTracebackObject *) self->exc_traceback;\n- PyFrameObject *f = tb->tb_frame;\n- Py_CLEAR(f->f_back);\n- }\n-#endif\n- } else {\n- __Pyx_Coroutine_ExceptionClear(self);\n- }\n- return retval;\n-}\n-static CYTHON_INLINE\n-PyObject *__Pyx_Coroutine_MethodReturn(PyObject *retval) {\n- if (unlikely(!retval && !PyErr_Occurred())) {\n- PyErr_SetNone(PyExc_StopIteration);\n- }\n- return retval;\n-}\n-static CYTHON_INLINE\n-PyObject *__Pyx_Coroutine_FinishDelegation(__pyx_CoroutineObject *gen) {\n- PyObject *ret;\n- PyObject *val = NULL;\n- __Pyx_Coroutine_Undelegate(gen);\n- __Pyx_PyGen_FetchStopIterationValue(&val);\n- ret = __Pyx_Coroutine_SendEx(gen, val);\n- Py_XDECREF(val);\n- return ret;\n-}\n-static PyObject *__Pyx_Coroutine_Send(PyObject *self, PyObject *value) {\n- PyObject *retval;\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject*) self;\n- PyObject *yf = gen->yieldfrom;\n- if (unlikely(__Pyx_Coroutine_CheckRunning(gen)))\n- return NULL;\n- if (yf) {\n- PyObject *ret;\n- gen->is_running = 1;\n- #ifdef __Pyx_Generator_USED\n- if (__Pyx_Generator_CheckExact(yf)) {\n- ret = __Pyx_Coroutine_Send(yf, value);\n- } else\n- #endif\n- #ifdef __Pyx_Coroutine_USED\n- if (__Pyx_Coroutine_CheckExact(yf)) {\n- ret = __Pyx_Coroutine_Send(yf, value);\n- } else\n- #endif\n- {\n- if (value == Py_None)\n- ret = Py_TYPE(yf)->tp_iternext(yf);\n- else\n- ret = __Pyx_PyObject_CallMethod1(yf, __pyx_n_s_send, value);\n- }\n- gen->is_running = 0;\n- if (likely(ret)) {\n- return ret;\n- }\n- retval = __Pyx_Coroutine_FinishDelegation(gen);\n- } else {\n- retval = __Pyx_Coroutine_SendEx(gen, value);\n- }\n- return __Pyx_Coroutine_MethodReturn(retval);\n-}\n-static int __Pyx_Coroutine_CloseIter(__pyx_CoroutineObject *gen, PyObject *yf) {\n- PyObject *retval = NULL;\n- int err = 0;\n- #ifdef __Pyx_Generator_USED\n- if (__Pyx_Generator_CheckExact(yf)) {\n- retval = __Pyx_Coroutine_Close(yf);\n- if (!retval)\n- return -1;\n- } else\n- #endif\n- #ifdef __Pyx_Coroutine_USED\n- if (__Pyx_Coroutine_CheckExact(yf)) {\n- retval = __Pyx_Coroutine_Close(yf);\n- if (!retval)\n- return -1;\n- } else\n- #endif\n- {\n- PyObject *meth;\n- gen->is_running = 1;\n- meth = __Pyx_PyObject_GetAttrStr(yf, __pyx_n_s_close);\n- if (unlikely(!meth)) {\n- if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {\n- PyErr_WriteUnraisable(yf);\n- }\n- PyErr_Clear();\n- } else {\n- retval = PyObject_CallFunction(meth, NULL);\n- Py_DECREF(meth);\n- if (!retval)\n- err = -1;\n- }\n- gen->is_running = 0;\n- }\n- Py_XDECREF(retval);\n- return err;\n-}\n-static PyObject *__Pyx_Generator_Next(PyObject *self) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject*) self;\n- PyObject *yf = gen->yieldfrom;\n- if (unlikely(__Pyx_Coroutine_CheckRunning(gen)))\n- return NULL;\n- if (yf) {\n- PyObject *ret;\n- gen->is_running = 1;\n- #ifdef __Pyx_Generator_USED\n- if (__Pyx_Generator_CheckExact(yf)) {\n- ret = __Pyx_Generator_Next(yf);\n- } else\n- #endif\n- ret = Py_TYPE(yf)->tp_iternext(yf);\n- gen->is_running = 0;\n- if (likely(ret)) {\n- return ret;\n- }\n- return __Pyx_Coroutine_FinishDelegation(gen);\n- }\n- return __Pyx_Coroutine_SendEx(gen, Py_None);\n-}\n-static PyObject *__Pyx_Coroutine_Close(PyObject *self) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- PyObject *retval, *raised_exception;\n- PyObject *yf = gen->yieldfrom;\n- int err = 0;\n- if (unlikely(__Pyx_Coroutine_CheckRunning(gen)))\n- return NULL;\n- if (yf) {\n- Py_INCREF(yf);\n- err = __Pyx_Coroutine_CloseIter(gen, yf);\n- __Pyx_Coroutine_Undelegate(gen);\n- Py_DECREF(yf);\n- }\n- if (err == 0)\n- PyErr_SetNone(PyExc_GeneratorExit);\n- retval = __Pyx_Coroutine_SendEx(gen, NULL);\n- if (retval) {\n- Py_DECREF(retval);\n- PyErr_SetString(PyExc_RuntimeError,\n- \"generator ignored GeneratorExit\");\n- return NULL;\n- }\n- raised_exception = PyErr_Occurred();\n- if (!raised_exception\n- || raised_exception == PyExc_StopIteration\n- || raised_exception == PyExc_GeneratorExit\n- || PyErr_GivenExceptionMatches(raised_exception, PyExc_GeneratorExit)\n- || PyErr_GivenExceptionMatches(raised_exception, PyExc_StopIteration))\n- {\n- if (raised_exception) PyErr_Clear();\n- Py_INCREF(Py_None);\n- return Py_None;\n- }\n- return NULL;\n-}\n-static PyObject *__Pyx_Coroutine_Throw(PyObject *self, PyObject *args) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- PyObject *typ;\n- PyObject *tb = NULL;\n- PyObject *val = NULL;\n- PyObject *yf = gen->yieldfrom;\n- if (!PyArg_UnpackTuple(args, (char *)\"throw\", 1, 3, &typ, &val, &tb))\n- return NULL;\n- if (unlikely(__Pyx_Coroutine_CheckRunning(gen)))\n- return NULL;\n- if (yf) {\n- PyObject *ret;\n- Py_INCREF(yf);\n- if (PyErr_GivenExceptionMatches(typ, PyExc_GeneratorExit)) {\n- int err = __Pyx_Coroutine_CloseIter(gen, yf);\n- Py_DECREF(yf);\n- __Pyx_Coroutine_Undelegate(gen);\n- if (err < 0)\n- return __Pyx_Coroutine_MethodReturn(__Pyx_Coroutine_SendEx(gen, NULL));\n- goto throw_here;\n- }\n- gen->is_running = 1;\n- #ifdef __Pyx_Generator_USED\n- if (__Pyx_Generator_CheckExact(yf)) {\n- ret = __Pyx_Coroutine_Throw(yf, args);\n- } else\n- #endif\n- #ifdef __Pyx_Coroutine_USED\n- if (__Pyx_Coroutine_CheckExact(yf)) {\n- ret = __Pyx_Coroutine_Throw(yf, args);\n- } else\n- #endif\n- {\n- PyObject *meth = __Pyx_PyObject_GetAttrStr(yf, __pyx_n_s_throw);\n- if (unlikely(!meth)) {\n- Py_DECREF(yf);\n- if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {\n- gen->is_running = 0;\n- return NULL;\n- }\n- PyErr_Clear();\n- __Pyx_Coroutine_Undelegate(gen);\n- gen->is_running = 0;\n- goto throw_here;\n- }\n- ret = PyObject_CallObject(meth, args);\n- Py_DECREF(meth);\n- }\n- gen->is_running = 0;\n- Py_DECREF(yf);\n- if (!ret) {\n- ret = __Pyx_Coroutine_FinishDelegation(gen);\n- }\n- return __Pyx_Coroutine_MethodReturn(ret);\n- }\n-throw_here:\n- __Pyx_Raise(typ, val, tb, NULL);\n- return __Pyx_Coroutine_MethodReturn(__Pyx_Coroutine_SendEx(gen, NULL));\n-}\n-static int __Pyx_Coroutine_traverse(PyObject *self, visitproc visit, void *arg) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- Py_VISIT(gen->closure);\n- Py_VISIT(gen->classobj);\n- Py_VISIT(gen->yieldfrom);\n- Py_VISIT(gen->exc_type);\n- Py_VISIT(gen->exc_value);\n- Py_VISIT(gen->exc_traceback);\n- return 0;\n-}\n-static int __Pyx_Coroutine_clear(PyObject *self) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- Py_CLEAR(gen->closure);\n- Py_CLEAR(gen->classobj);\n- Py_CLEAR(gen->yieldfrom);\n- Py_CLEAR(gen->exc_type);\n- Py_CLEAR(gen->exc_value);\n- Py_CLEAR(gen->exc_traceback);\n- Py_CLEAR(gen->gi_name);\n- Py_CLEAR(gen->gi_qualname);\n- return 0;\n-}\n-static void __Pyx_Coroutine_dealloc(PyObject *self) {\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- PyObject_GC_UnTrack(gen);\n- if (gen->gi_weakreflist != NULL)\n- PyObject_ClearWeakRefs(self);\n- if (gen->resume_label > 0) {\n- PyObject_GC_Track(self);\n-#if PY_VERSION_HEX >= 0x030400a1\n- if (PyObject_CallFinalizerFromDealloc(self))\n-#else\n- Py_TYPE(gen)->tp_del(self);\n- if (self->ob_refcnt > 0)\n-#endif\n- {\n- return;\n- }\n- PyObject_GC_UnTrack(self);\n- }\n- __Pyx_Coroutine_clear(self);\n- PyObject_GC_Del(gen);\n-}\n-static void __Pyx_Coroutine_del(PyObject *self) {\n- PyObject *res;\n- PyObject *error_type, *error_value, *error_traceback;\n- __pyx_CoroutineObject *gen = (__pyx_CoroutineObject *) self;\n- __Pyx_PyThreadState_declare\n- if (gen->resume_label <= 0)\n- return ;\n-#if PY_VERSION_HEX < 0x030400a1\n- assert(self->ob_refcnt == 0);\n- self->ob_refcnt = 1;\n-#endif\n- __Pyx_PyThreadState_assign\n- __Pyx_ErrFetch(&error_type, &error_value, &error_traceback);\n- res = __Pyx_Coroutine_Close(self);\n- if (res == NULL)\n- PyErr_WriteUnraisable(self);\n- else\n- Py_DECREF(res);\n- __Pyx_ErrRestore(error_type, error_value, error_traceback);\n-#if PY_VERSION_HEX < 0x030400a1\n- assert(self->ob_refcnt > 0);\n- if (--self->ob_refcnt == 0) {\n- return;\n- }\n- {\n- Py_ssize_t refcnt = self->ob_refcnt;\n- _Py_NewReference(self);\n- self->ob_refcnt = refcnt;\n- }\n-#if CYTHON_COMPILING_IN_CPYTHON\n- assert(PyType_IS_GC(self->ob_type) &&\n- _Py_AS_GC(self)->gc.gc_refs != _PyGC_REFS_UNTRACKED);\n- _Py_DEC_REFTOTAL;\n-#endif\n-#ifdef COUNT_ALLOCS\n- --Py_TYPE(self)->tp_frees;\n- --Py_TYPE(self)->tp_allocs;\n-#endif\n-#endif\n-}\n-static PyObject *\n-__Pyx_Coroutine_get_name(__pyx_CoroutineObject *self)\n-{\n- PyObject *name = self->gi_name;\n- if (unlikely(!name)) name = Py_None;\n- Py_INCREF(name);\n- return name;\n-}\n-static int\n-__Pyx_Coroutine_set_name(__pyx_CoroutineObject *self, PyObject *value)\n-{\n- PyObject *tmp;\n-#if PY_MAJOR_VERSION >= 3\n- if (unlikely(value == NULL || !PyUnicode_Check(value))) {\n-#else\n- if (unlikely(value == NULL || !PyString_Check(value))) {\n-#endif\n- PyErr_SetString(PyExc_TypeError,\n- \"__name__ must be set to a string object\");\n- return -1;\n- }\n- tmp = self->gi_name;\n- Py_INCREF(value);\n- self->gi_name = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static PyObject *\n-__Pyx_Coroutine_get_qualname(__pyx_CoroutineObject *self)\n-{\n- PyObject *name = self->gi_qualname;\n- if (unlikely(!name)) name = Py_None;\n- Py_INCREF(name);\n- return name;\n-}\n-static int\n-__Pyx_Coroutine_set_qualname(__pyx_CoroutineObject *self, PyObject *value)\n-{\n- PyObject *tmp;\n-#if PY_MAJOR_VERSION >= 3\n- if (unlikely(value == NULL || !PyUnicode_Check(value))) {\n-#else\n- if (unlikely(value == NULL || !PyString_Check(value))) {\n-#endif\n- PyErr_SetString(PyExc_TypeError,\n- \"__qualname__ must be set to a string object\");\n- return -1;\n- }\n- tmp = self->gi_qualname;\n- Py_INCREF(value);\n- self->gi_qualname = value;\n- Py_XDECREF(tmp);\n- return 0;\n-}\n-static __pyx_CoroutineObject *__Pyx__Coroutine_New(\n- PyTypeObject* type, __pyx_coroutine_body_t body, PyObject *closure,\n- PyObject *name, PyObject *qualname, PyObject *module_name) {\n- __pyx_CoroutineObject *gen = PyObject_GC_New(__pyx_CoroutineObject, type);\n- if (gen == NULL)\n- return NULL;\n- gen->body = body;\n- gen->closure = closure;\n- Py_XINCREF(closure);\n- gen->is_running = 0;\n- gen->resume_label = 0;\n- gen->classobj = NULL;\n- gen->yieldfrom = NULL;\n- gen->exc_type = NULL;\n- gen->exc_value = NULL;\n- gen->exc_traceback = NULL;\n- gen->gi_weakreflist = NULL;\n- Py_XINCREF(qualname);\n- gen->gi_qualname = qualname;\n- Py_XINCREF(name);\n- gen->gi_name = name;\n- Py_XINCREF(module_name);\n- gen->gi_modulename = module_name;\n- PyObject_GC_Track(gen);\n- return gen;\n-}\n-\n-\/* PatchModuleWithCoroutine *\/\n- static PyObject* __Pyx_Coroutine_patch_module(PyObject* module, const char* py_code) {\n-#if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)\n- int result;\n- PyObject *globals, *result_obj;\n- globals = PyDict_New(); if (unlikely(!globals)) goto ignore;\n- result = PyDict_SetItemString(globals, \"_cython_coroutine_type\",\n- #ifdef __Pyx_Coroutine_USED\n- (PyObject*)__pyx_CoroutineType);\n- #else\n- Py_None);\n- #endif\n- if (unlikely(result < 0)) goto ignore;\n- result = PyDict_SetItemString(globals, \"_cython_generator_type\",\n- #ifdef __Pyx_Generator_USED\n- (PyObject*)__pyx_GeneratorType);\n- #else\n- Py_None);\n- #endif\n- if (unlikely(result < 0)) goto ignore;\n- if (unlikely(PyDict_SetItemString(globals, \"_module\", module) < 0)) goto ignore;\n- if (unlikely(PyDict_SetItemString(globals, \"__builtins__\", __pyx_b) < 0)) goto ignore;\n- result_obj = PyRun_String(py_code, Py_file_input, globals, globals);\n- if (unlikely(!result_obj)) goto ignore;\n- Py_DECREF(result_obj);\n- Py_DECREF(globals);\n- return module;\n-ignore:\n- Py_XDECREF(globals);\n- PyErr_WriteUnraisable(module);\n- if (unlikely(PyErr_WarnEx(PyExc_RuntimeWarning, \"Cython module failed to patch module with custom type\", 1) < 0)) {\n- Py_DECREF(module);\n- module = NULL;\n- }\n-#else\n- py_code++;\n-#endif\n- return module;\n-}\n-\n-\/* PatchGeneratorABC *\/\n- #if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)\n-static PyObject* __Pyx_patch_abc_module(PyObject *module);\n-static PyObject* __Pyx_patch_abc_module(PyObject *module) {\n- module = __Pyx_Coroutine_patch_module(\n- module, \"\"\n-\"if _cython_generator_type is not None:\\n\"\n-\" try: Generator = _module.Generator\\n\"\n-\" except AttributeError: pass\\n\"\n-\" else: Generator.register(_cython_generator_type)\\n\"\n-\"if _cython_coroutine_type is not None:\\n\"\n-\" try: Coroutine = _module.Coroutine\\n\"\n-\" except AttributeError: pass\\n\"\n-\" else: Coroutine.register(_cython_coroutine_type)\\n\"\n- );\n- return module;\n-}\n-#endif\n-static int __Pyx_patch_abc(void) {\n-#if defined(__Pyx_Generator_USED) || defined(__Pyx_Coroutine_USED)\n- static int abc_patched = 0;\n- if (!abc_patched) {\n- PyObject *module;\n- module = PyImport_ImportModule((PY_VERSION_HEX >= 0x03030000) ? \"collections.abc\" : \"collections\");\n- if (!module) {\n- PyErr_WriteUnraisable(NULL);\n- if (unlikely(PyErr_WarnEx(PyExc_RuntimeWarning,\n- ((PY_VERSION_HEX >= 0x03030000) ?\n- \"Cython module failed to register with collections.abc module\" :\n- \"Cython module failed to register with collections module\"), 1) < 0)) {\n- return -1;\n- }\n- } else {\n- module = __Pyx_patch_abc_module(module);\n- abc_patched = 1;\n- if (unlikely(!module))\n- return -1;\n- Py_DECREF(module);\n- }\n- module = PyImport_ImportModule(\"backports_abc\");\n- if (module) {\n- module = __Pyx_patch_abc_module(module);\n- Py_XDECREF(module);\n- }\n- if (!module) {\n- PyErr_Clear();\n- }\n- }\n-#else\n- if (0) __Pyx_Coroutine_patch_module(NULL, NULL);\n-#endif\n- return 0;\n-}\n-\n-\/* Generator *\/\n- static PyMethodDef __pyx_Generator_methods[] = {\n- {\"send\", (PyCFunction) __Pyx_Coroutine_Send, METH_O,\n- (char*) PyDoc_STR(\"send(arg) -> send 'arg' into generator,\\nreturn next yielded value or raise StopIteration.\")},\n- {\"throw\", (PyCFunction) __Pyx_Coroutine_Throw, METH_VARARGS,\n- (char*) PyDoc_STR(\"throw(typ[,val[,tb]]) -> raise exception in generator,\\nreturn next yielded value or raise StopIteration.\")},\n- {\"close\", (PyCFunction) __Pyx_Coroutine_Close, METH_NOARGS,\n- (char*) PyDoc_STR(\"close() -> raise GeneratorExit inside generator.\")},\n- {0, 0, 0, 0}\n-};\n-static PyMemberDef __pyx_Generator_memberlist[] = {\n- {(char *) \"gi_running\", T_BOOL, offsetof(__pyx_CoroutineObject, is_running), READONLY, NULL},\n- {(char*) \"gi_yieldfrom\", T_OBJECT, offsetof(__pyx_CoroutineObject, yieldfrom), READONLY,\n- (char*) PyDoc_STR(\"object being iterated by 'yield from', or None\")},\n- {0, 0, 0, 0, 0}\n-};\n-static PyGetSetDef __pyx_Generator_getsets[] = {\n- {(char *) \"__name__\", (getter)__Pyx_Coroutine_get_name, (setter)__Pyx_Coroutine_set_name,\n- (char*) PyDoc_STR(\"name of the generator\"), 0},\n- {(char *) \"__qualname__\", (getter)__Pyx_Coroutine_get_qualname, (setter)__Pyx_Coroutine_set_qualname,\n- (char*) PyDoc_STR(\"qualified name of the generator\"), 0},\n- {0, 0, 0, 0, 0}\n-};\n-static PyTypeObject __pyx_GeneratorType_type = {\n- PyVarObject_HEAD_INIT(0, 0)\n- \"generator\",\n- sizeof(__pyx_CoroutineObject),\n- 0,\n- (destructor) __Pyx_Coroutine_dealloc,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_FINALIZE,\n- 0,\n- (traverseproc) __Pyx_Coroutine_traverse,\n- 0,\n- 0,\n- offsetof(__pyx_CoroutineObject, gi_weakreflist),\n- 0,\n- (iternextfunc) __Pyx_Generator_Next,\n- __pyx_Generator_methods,\n- __pyx_Generator_memberlist,\n- __pyx_Generator_getsets,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n- 0,\n-#if PY_VERSION_HEX >= 0x030400a1\n- 0,\n-#else\n- __Pyx_Coroutine_del,\n-#endif\n- 0,\n-#if PY_VERSION_HEX >= 0x030400a1\n- __Pyx_Coroutine_del,\n-#endif\n-};\n-static int __pyx_Generator_init(void) {\n- __pyx_GeneratorType_type.tp_getattro = PyObject_GenericGetAttr;\n- __pyx_GeneratorType_type.tp_iter = PyObject_SelfIter;\n- __pyx_GeneratorType = __Pyx_FetchCommonType(&__pyx_GeneratorType_type);\n- if (unlikely(!__pyx_GeneratorType)) {\n- return -1;\n- }\n- return 0;\n-}\n-\n \/* CheckBinaryVersion *\/\n- static int __Pyx_check_binary_version(void) {\n+ static int __Pyx_check_binary_version(void) {\n char ctversion[4], rtversion[4];\n PyOS_snprintf(ctversion, 4, \"%d.%d\", PY_MAJOR_VERSION, PY_MINOR_VERSION);\n PyOS_snprintf(rtversion, 4, \"%s\", Py_GetVersion());\n@@ -17287,8 +17066,91 @@\n return 0;\n }\n \n+\/* ModuleImport *\/\n+ #ifndef __PYX_HAVE_RT_ImportModule\n+#define __PYX_HAVE_RT_ImportModule\n+static PyObject *__Pyx_ImportModule(const char *name) {\n+ PyObject *py_name = 0;\n+ PyObject *py_module = 0;\n+ py_name = __Pyx_PyIdentifier_FromString(name);\n+ if (!py_name)\n+ goto bad;\n+ py_module = PyImport_Import(py_name);\n+ Py_DECREF(py_name);\n+ return py_module;\n+bad:\n+ Py_XDECREF(py_name);\n+ return 0;\n+}\n+#endif\n+\n+\/* TypeImport *\/\n+ #ifndef __PYX_HAVE_RT_ImportType\n+#define __PYX_HAVE_RT_ImportType\n+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,\n+ size_t size, int strict)\n+{\n+ PyObject *py_module = 0;\n+ PyObject *result = 0;\n+ PyObject *py_name = 0;\n+ char warning[200];\n+ Py_ssize_t basicsize;\n+#ifdef Py_LIMITED_API\n+ PyObject *py_basicsize;\n+#endif\n+ py_module = __Pyx_ImportModule(module_name);\n+ if (!py_module)\n+ goto bad;\n+ py_name = __Pyx_PyIdentifier_FromString(class_name);\n+ if (!py_name)\n+ goto bad;\n+ result = PyObject_GetAttr(py_module, py_name);\n+ Py_DECREF(py_name);\n+ py_name = 0;\n+ Py_DECREF(py_module);\n+ py_module = 0;\n+ if (!result)\n+ goto bad;\n+ if (!PyType_Check(result)) {\n+ PyErr_Format(PyExc_TypeError,\n+ \"%.200s.%.200s is not a type object\",\n+ module_name, class_name);\n+ goto bad;\n+ }\n+#ifndef Py_LIMITED_API\n+ basicsize = ((PyTypeObject *)result)->tp_basicsize;\n+#else\n+ py_basicsize = PyObject_GetAttrString(result, \"__basicsize__\");\n+ if (!py_basicsize)\n+ goto bad;\n+ basicsize = PyLong_AsSsize_t(py_basicsize);\n+ Py_DECREF(py_basicsize);\n+ py_basicsize = 0;\n+ if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())\n+ goto bad;\n+#endif\n+ if (!strict && (size_t)basicsize > size) {\n+ PyOS_snprintf(warning, sizeof(warning),\n+ \"%s.%s size changed, may indicate binary incompatibility. Expected %zd, got %zd\",\n+ module_name, class_name, basicsize, size);\n+ if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;\n+ }\n+ else if ((size_t)basicsize != size) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"%.200s.%.200s has the wrong size, try recompiling. Expected %zd, got %zd\",\n+ module_name, class_name, basicsize, size);\n+ goto bad;\n+ }\n+ return (PyTypeObject *)result;\n+bad:\n+ Py_XDECREF(py_module);\n+ Py_XDECREF(result);\n+ return NULL;\n+}\n+#endif\n+\n \/* InitStrings *\/\n- static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {\n+ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {\n while (t->p) {\n #if PY_MAJOR_VERSION < 3\n if (t->is_unicode) {\n"} {"commit":"ebaee63a76b0c3117d72bcb7bf8cb3bf03a83361","subject":"Patch from M. R. Brown to fix 'make defconfig'","message":"Patch from M. R. Brown to fix 'make defconfig'\n","repos":"ChickenRunjyd\/klee-uclibc,kraj\/uClibc,groundwater\/uClibc,mephi42\/uClibc,OpenInkpot-archive\/iplinux-uclibc,m-labs\/uclibc-lm32,ffainelli\/uClibc,hjl-tools\/uClibc,mephi42\/uClibc,ysat0\/uClibc,OpenInkpot-archive\/iplinux-uclibc,kraj\/uClibc,ffainelli\/uClibc,ffainelli\/uClibc,ddcc\/klee-uclibc-0.9.33.2,m-labs\/uclibc-lm32,hjl-tools\/uClibc,waweber\/uclibc-clang,kraj\/uclibc-ng,groundwater\/uClibc,skristiansson\/uClibc-or1k,foss-for-synopsys-dwc-arc-processors\/uClibc,ndmsystems\/uClibc,m-labs\/uclibc-lm32,atgreen\/uClibc-moxie,brgl\/uclibc-ng,mephi42\/uClibc,ndmsystems\/uClibc,hwoarang\/uClibc,hjl-tools\/uClibc,kraj\/uClibc,foss-xtensa\/uClibc,brgl\/uclibc-ng,gittup\/uClibc,waweber\/uclibc-clang,brgl\/uclibc-ng,m-labs\/uclibc-lm32,wbx-github\/uclibc-ng,majek\/uclibc-vx32,gittup\/uClibc,ysat0\/uClibc,OpenInkpot-archive\/iplinux-uclibc,ddcc\/klee-uclibc-0.9.33.2,ffainelli\/uClibc,majek\/uclibc-vx32,hwoarang\/uClibc,atgreen\/uClibc-moxie,foss-for-synopsys-dwc-arc-processors\/uClibc,groundwater\/uClibc,kraj\/uclibc-ng,groundwater\/uClibc,waweber\/uclibc-clang,wbx-github\/uclibc-ng,ffainelli\/uClibc,kraj\/uClibc,groundwater\/uClibc,czankel\/xtensa-uclibc,ndmsystems\/uClibc,klee\/klee-uclibc,ddcc\/klee-uclibc-0.9.33.2,ndmsystems\/uClibc,OpenInkpot-archive\/iplinux-uclibc,foss-xtensa\/uClibc,klee\/klee-uclibc,skristiansson\/uClibc-or1k,wbx-github\/uclibc-ng,ysat0\/uClibc,hjl-tools\/uClibc,ChickenRunjyd\/klee-uclibc,czankel\/xtensa-uclibc,foss-for-synopsys-dwc-arc-processors\/uClibc,skristiansson\/uClibc-or1k,waweber\/uclibc-clang,hwoarang\/uClibc,gittup\/uClibc,klee\/klee-uclibc,majek\/uclibc-vx32,skristiansson\/uClibc-or1k,brgl\/uclibc-ng,ChickenRunjyd\/klee-uclibc,czankel\/xtensa-uclibc,foss-for-synopsys-dwc-arc-processors\/uClibc,czankel\/xtensa-uclibc,hjl-tools\/uClibc,foss-xtensa\/uClibc,majek\/uclibc-vx32,wbx-github\/uclibc-ng,mephi42\/uClibc,gittup\/uClibc,hwoarang\/uClibc,atgreen\/uClibc-moxie,kraj\/uclibc-ng,kraj\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,atgreen\/uClibc-moxie,ChickenRunjyd\/klee-uclibc,klee\/klee-uclibc,foss-xtensa\/uClibc,ysat0\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- extra\/config\/symbol.c\n+++ extra\/config\/symbol.c\n@@ -79,6 +79,13 @@\n \tsym->type = S_STRING;\n \tsym->flags |= SYMBOL_AUTO;\n \tsym_add_default(sym, uts.release);\n+\n+\tsym = sym_lookup(\"TARGET_ARCH\", 0);\n+\tsym->type = S_STRING;\n+\tsym->flags |= SYMBOL_AUTO;\n+\tp = getenv(\"TARGET_ARCH\");\n+\tif (p)\n+\t\tsym_add_default(sym, p);\n }\n \n int sym_get_type(struct symbol *sym)\n"} {"commit":"a4eace16c52d77ae80e33938c27b6ca7c5266b9c","subject":"More doc updates.","message":"More doc updates.\n","repos":"yuchi\/HAL,formalin14\/HAL,yuchi\/HAL,formalin14\/HAL,formalin14\/HAL,yuchi\/HAL","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/JavaScriptCoreCPP\/JSValue.h\n+++ include\/JavaScriptCoreCPP\/JSValue.h\n@@ -31,7 +31,7 @@\n property). An instance of JSValue may only be passed as an argument to\n methods on instances of JSValue and JSContext that belong to the same\n JSVirtualMachine - passing a JSValue to a method on an object originating\n- from a different JSVirtualMachine will result in an Objective-C exception\n+ from a different JSVirtualMachine will result in an C++ exception\n being raised.\n *\/\n class JSValue final : public std::enable_shared_from_this<JSValue> {\n@@ -234,7 +234,7 @@\n The property <code>length<\/code> is read from the object, converted to an unsigned\n integer, and an NSArray of this size is allocated. Properties corresponding\n to indicies within the array bounds will be copied to the array, with\n- JSValues converted to equivalent Objective-C objects as specified.\n+ JSValues converted to equivalent C++ objects as specified.\n @result The NSArray containing the recursively converted contents of the\n converted JavaScript array.\n *\/\n@@ -246,7 +246,7 @@\n @discussion If the value is <code>null<\/code> or <code>undefined<\/code> then <code>nil<\/code> is returned.\n If the value is not an object then a JavaScript TypeError will be thrown.\n All enumerable properties of the object are copied to the dictionary, with\n- JSValues converted to equivalent Objective-C objects as specified.\n+ JSValues converted to equivalent C++ objects as specified.\n @result The NSDictionary containing the recursively converted contents of\n the converted JavaScript object.\n *\/\n"} {"commit":"21b3f5d822e6973e6e66d5116badf8859141812f","subject":"feature: Improve flow, by making state as PRODUCT_SELECTION when has no product on stock, or not enough money","message":"feature: Improve flow, by making state as PRODUCT_SELECTION when has no product on stock, or not enough money","repos":"marceloboeira\/unisinos-microprocessors","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- exercises\/007-sm-arm.c\n+++ exercises\/007-sm-arm.c\n@@ -46,7 +46,7 @@\n Product PRODUCTS[PRODUCTS_AMOUNT];\n int SELECTED_PRODUCT = 0;\n \n-int CURRENT_VALUE = 10;\n+int CURRENT_VALUE = 0;\n \n void delay(int time) {\n int i = 0;\n@@ -136,8 +136,6 @@\n setCurrentStateTo(PURCHASE_CONFIRMATION_HANDLER);\n }\n \n-\n-\n void keyboardHandler() {\n btnLeft = btnRight = btnUp = btnDown = 0;\n btnRight = (GPIOPinRead(PORT_E, PIN_0) & 0x01) != 0x01;\n@@ -195,24 +193,27 @@\n \n if (newValue < 0) {\n \tdisplayUpdateCurrentMessage(\"Not enough money\");\n+\tsetCurrentStateTo(PRODUCT_SELECTION_HANDLER);\n }\n else if (!hasProductOnInventory(SELECTED_PRODUCT)){\n \tdisplayUpdateCurrentMessage(\"Out of stock\");\n+\tsetCurrentStateTo(PRODUCT_SELECTION_HANDLER);\n }\n else {\n-\tCURRENT_VALUE = newValue;\n-\tPRODUCTS[SELECTED_PRODUCT].amount = PRODUCTS[SELECTED_PRODUCT].amount - 1;\n \tdisplayUpdateCurrentMessage(\"Thanks!\");\n \tdelay(5);\n-\n+\tPRODUCTS[SELECTED_PRODUCT].amount = PRODUCTS[SELECTED_PRODUCT].amount - 1;\n+\n+\tCURRENT_VALUE = newValue;\n \tunsigned char buffer[10];\n \tsprintf(buffer, \"Change: $ %i\", CURRENT_VALUE);\n \tdisplayUpdateCurrentMessage(buffer);\n \tCURRENT_VALUE = 0;\n+\n+\tsetCurrentStateTo(MONEY_WAITING_HANDLER);\n }\n \n delay(10);\n- setCurrentStateTo(MONEY_WAITING_HANDLER);\n }\n \n void bootHandler() {\n@@ -230,7 +231,6 @@\n case MONEY_WAITING_HANDLER: moneyWaitingHandler(); break;\n case PRODUCT_SELECTION_HANDLER: productionSelectionHandler(); break;\n case PURCHASE_CONFIRMATION_HANDLER: purchaseConfirmationHandler(); break;\n- \/\/ case OPERATION_CANCELING_HANDLER: cancelOperaionHandler(); break;\n default: setCurrentStateTo(BOOT_HANDLER); break;\n }\n }\n"} {"commit":"e5bcc811f78f294e7be8a0721b3fb513028c5af4","subject":"ACPICA: Fixed a problem with Index references passed as method arguments","message":"ACPICA: Fixed a problem with Index references passed as method arguments\n\nReferences passed as arguments to control methods were dereferenced\nimmediately (before control was passed to the called method). The\nreferences are now correctly passed directly to the called\nmethod.\n\nhttp:\/\/bugzilla.kernel.org\/show_bug.cgi?id=5389\n\nSigned-off-by: Lin Ming <d6f051473f553588884d51874952f6fb19ae8261@intel.com>\nSigned-off-by: Bob Moore <861d61e839a6c9cacf88c3a26b10371d2c9b211f@intel.com>\nSigned-off-by: Alexey Starikovskiy <c33843565b6d94c5e69f3cc5eb985600cb9e786e@suse.de>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/acpi\/executer\/exresolv.c\n+++ drivers\/acpi\/executer\/exresolv.c\n@@ -193,6 +193,12 @@\n \t\t\t\tbreak;\n \n \t\t\tcase ACPI_TYPE_PACKAGE:\n+\n+\t\t\t\t\/* If method call - leave the Reference on the stack *\/\n+\n+\t\t\t\tif (walk_state->opcode == AML_INT_METHODCALL_OP) {\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n \n \t\t\t\tobj_desc = *stack_desc->reference.where;\n \t\t\t\tif (obj_desc) {\n@@ -210,7 +216,7 @@\n \t\t\t\t\t * the package, can't dereference it\n \t\t\t\t\t *\/\n \t\t\t\t\tACPI_ERROR((AE_INFO,\n-\t\t\t\t\t\t \"Attempt to deref an Index to NULL pkg element Idx=%p\",\n+\t\t\t\t\t\t \"Attempt to dereference an Index to NULL package element Idx=%p\",\n \t\t\t\t\t\t stack_desc));\n \t\t\t\t\tstatus = AE_AML_UNINITIALIZED_ELEMENT;\n \t\t\t\t}\n@@ -221,7 +227,7 @@\n \t\t\t\t\/* Invalid reference object *\/\n \n \t\t\t\tACPI_ERROR((AE_INFO,\n-\t\t\t\t\t \"Unknown TargetType %X in Index\/Reference obj %p\",\n+\t\t\t\t\t \"Unknown TargetType %X in Index\/Reference object %p\",\n \t\t\t\t\t stack_desc->reference.target_type,\n \t\t\t\t\t stack_desc));\n \t\t\t\tstatus = AE_AML_INTERNAL;\n"} {"commit":"ac000e11ae0086be8f2e40e4c125d24574241e5e","subject":"msvc warnings--","message":"msvc warnings--\n","repos":"KDE\/phonon-gstreamer,KDE\/phonon-xine,KDE\/phonon-directshow,KDE\/phonon-quicktime,KDE\/phonon-xine,KDE\/phonon-xine,KDE\/phonon-gstreamer,shadeslayer\/phonon-gstreamer,shadeslayer\/phonon-gstreamer,KDE\/phonon-directshow,KDE\/phonon-mmf,shadeslayer\/phonon-gstreamer,KDE\/phonon-waveout","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- phonon\/experimental\/packetpool_p.h\n+++ phonon\/experimental\/packetpool_p.h\n@@ -27,7 +27,7 @@\n namespace Phonon\n {\n \n-class PacketPrivate;\n+struct PacketPrivate;\n class PacketPoolPrivate\n {\n friend class PacketPool;\n"} {"commit":"d37dee8258ec2a10f5825694376cc27bc43b8f93","subject":"Improve clutter_text_get_chars doc","message":"Improve clutter_text_get_chars doc\n\nExplicitly explain that end_pos is not included with the resulting\nstring\n\nhttp:\/\/bugzilla.clutter-project.org\/show_bug.cgi?id=2081\n","repos":"jigpu\/clutter,GNOME\/clutter,rkudiyarov\/clutter_osx,djdeath\/clutter-multithreaded,collects\/clutter,spatulasnout\/clutter,collects\/clutter,dlespiau\/clutter,dlespiau\/clutter,djdeath\/clutter-multithreaded,jigpu\/clutter,dlespiau\/clutter,heysion\/clutter-clone,jigpu\/clutter,djdeath\/clutter,Distrotech\/clutter,jigpu\/clutter,djdeath\/clutter,djdeath\/clutter-android,collects\/clutter,ebassi\/clutter,kerrickstaley\/clutter-vala,djdeath\/clutter,kerrickstaley\/clutter-vala,nobled\/clutter,rkudiyarov\/clutter_osx,heysion\/clutter-clone,djdeath\/clutter-android,jigpu\/clutter,jigpu\/clutter,GNOME\/clutter,GNOME\/clutter,djdeath\/clutter,djdeath\/clutter-multithreaded,Distrotech\/clutter,ebassi\/clutter,spatulasnout\/clutter,collects\/clutter,djdeath\/clutter-android,GNOME\/clutter,nobled\/clutter,kerrickstaley\/clutter-vala,djdeath\/clutter-android,heysion\/clutter-clone,nobled\/clutter,heysion\/clutter-clone,rkudiyarov\/clutter_osx,spatulasnout\/clutter,ebassi\/clutter,djdeath\/clutter,Distrotech\/clutter,Distrotech\/clutter,kerrickstaley\/clutter-vala,spatulasnout\/clutter,djdeath\/clutter-multithreaded,ebassi\/clutter,Distrotech\/clutter,heysion\/clutter-clone,rkudiyarov\/clutter_osx,djdeath\/clutter-android,spatulasnout\/clutter,collects\/clutter,GNOME\/clutter,ebassi\/clutter,Distrotech\/clutter,djdeath\/clutter","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- clutter\/clutter-text.c\n+++ clutter\/clutter-text.c\n@@ -4800,7 +4800,7 @@\n * @end_pos: end of text, in characters\n *\n * Retrieves the contents of the #ClutterText actor between\n- * @start_pos and @end_pos.\n+ * @start_pos and @end_pos, but not including @end_pos.\n *\n * The positions are specified in characters, not in bytes.\n *\n"} {"commit":"3238c448c6e26d7c26d2e9b070ef149d066cb6c2","subject":"[ARM] 3173\/1: Fix to allow 2.6.15-rc2 to compile for IOP3xx boards","message":"[ARM] 3173\/1: Fix to allow 2.6.15-rc2 to compile for IOP3xx boards\n\nPatch from Adam Brooks\n\nFixes an issue in 2.6.15-rc2 that prevented compilation of kernels for IOP3xx boards.\n\nSigned-off-by: Adam Brooks <09361c82a05d8914f37dd480ca8e6220ace11550@intel.com>\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/asm-arm\/arch-iop3xx\/timex.h\n+++ include\/asm-arm\/arch-iop3xx\/timex.h\n@@ -4,7 +4,7 @@\n * IOP3xx architecture timex specifications\n *\/\n #include <linux\/config.h>\n-\n+#include <asm\/hardware.h>\n \n #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244)\n \n"} {"commit":"6b18f24844437b8006e84bfcb59488c0d58ca6c9","subject":"Add unit tests for TAP logging setup functions","message":"Add unit tests for TAP logging setup functions\n\ngit-svn-id: caee63afe878fe2ec7dbba394a86c9654d9110ca@886 64e312b2-a51f-0410-8e61-82d0ca0eb02a\n","repos":"svn2github\/check,svn2github\/check,dashaomai\/check-code,svn2github\/check,dashaomai\/check-code,svn2github\/check,dashaomai\/check-code,svn2github\/check,dashaomai\/check-code","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/check_check_log.c\n+++ tests\/check_check_log.c\n@@ -180,15 +180,91 @@\n }\n END_TEST\n \n+START_TEST(test_set_tap)\n+{\n+ Suite *s = suite_create(\"Suite\");\n+ SRunner *sr = srunner_create(s);\n+\n+ srunner_set_tap (sr, \"test_log.tap\");\n+\n+ ck_assert_msg (srunner_has_tap (sr), \"SRunner not logging TAP\");\n+ ck_assert_msg (strcmp(srunner_tap_fname(sr), \"test_log.tap\") == 0,\n+\t \"Bad file name returned\");\n+\n+ srunner_free(sr);\n+}\n+END_TEST\n+\n+#if HAVE_WORKING_SETENV\n+\/* Test enabling TAP logging via environment variable *\/\n+START_TEST(test_set_tap_env)\n+{\n+ const char *old_val;\n+ Suite *s = suite_create(\"Suite\");\n+ SRunner *sr = srunner_create(s);\n+\n+ \/* check that setting XML log file via environment variable works *\/\n+ ck_assert_msg(save_set_env(\"CK_TAP_LOG_FILE_NAME\", \"test_log.tap\", &old_val) == 0,\n+ \"Failed to set environment variable\");\n+\n+ ck_assert_msg (srunner_has_tap (sr), \"SRunner not logging TAP\");\n+ ck_assert_msg (strcmp(srunner_tap_fname(sr), \"test_log.tap\") == 0,\n+\t \"Bad file name returned\");\n+\n+ \/* check that explicit call to srunner_set_tap()\n+ overrides environment variable *\/\n+ srunner_set_tap (sr, \"test2_log.tap\");\n+\n+ ck_assert_msg (srunner_has_tap (sr), \"SRunner not logging TAP\");\n+ ck_assert_msg (strcmp(srunner_tap_fname(sr), \"test2_log.tap\") == 0,\n+\t \"Bad file name returned\");\n+\n+ \/* restore old environment *\/\n+ ck_assert_msg(restore_env(\"CK_TAP_LOG_FILE_NAME\", old_val) == 0,\n+ \"Failed to restore environment variable\");\n+\n+ srunner_free(sr);\n+}\n+END_TEST\n+#endif \/* HAVE_WORKING_SETENV *\/\n+\n+START_TEST(test_no_set_tap)\n+{\n+ Suite *s = suite_create(\"Suite\");\n+ SRunner *sr = srunner_create(s);\n+\n+ ck_assert_msg (!srunner_has_tap (sr), \"SRunner not logging TAP\");\n+ ck_assert_msg (srunner_tap_fname(sr) == NULL, \"Bad file name returned\");\n+\n+ srunner_free(sr);\n+}\n+END_TEST\n+\n+START_TEST(test_double_set_tap)\n+{\n+ Suite *s = suite_create(\"Suite\");\n+ SRunner *sr = srunner_create(s);\n+\n+ srunner_set_tap (sr, \"test_log.tap\");\n+ srunner_set_tap (sr, \"test2_log.tap\");\n+\n+ ck_assert_msg(strcmp(srunner_tap_fname(sr), \"test_log.tap\") == 0,\n+\t \"TAP Log file is initialize only and shouldn't be changeable once set\");\n+\n+ srunner_free(sr);\n+}\n+END_TEST\n+\n Suite *make_log_suite(void)\n {\n \n Suite *s;\n- TCase *tc_core, *tc_core_xml;\n+ TCase *tc_core, *tc_core_xml, *tc_core_tap;\n \n s = suite_create(\"Log\");\n tc_core = tcase_create(\"Core\");\n tc_core_xml = tcase_create(\"Core XML\");\n+ tc_core_tap = tcase_create(\"Core TAP\");\n \n suite_add_tcase(s, tc_core);\n tcase_add_test(tc_core, test_set_log);\n@@ -206,6 +282,14 @@\n tcase_add_test(tc_core_xml, test_no_set_xml);\n tcase_add_test(tc_core_xml, test_double_set_xml);\n \n+ suite_add_tcase(s, tc_core_tap);\n+ tcase_add_test(tc_core_tap, test_set_tap);\n+#if HAVE_WORKING_SETENV\n+ tcase_add_test(tc_core_tap, test_set_tap_env);\n+#endif \/* HAVE_WORKING_SETENV *\/\n+ tcase_add_test(tc_core_tap, test_no_set_tap);\n+ tcase_add_test(tc_core_tap, test_double_set_tap);\n+\n return s;\n }\n \n"} {"commit":"d130754a100810c90a4d8e5174478b7dbf5da2a1","subject":"Avoid generating zero byte chunks at the end of files","message":"Avoid generating zero byte chunks at the end of files\n","repos":"ionelmc\/borg,RonnyPfannschmidt\/borg,pombredanne\/attic,RonnyPfannschmidt\/borg,RonnyPfannschmidt\/borg,Teino1978-Corp\/Teino1978-Corp-attic,Teino1978-Corp\/Teino1978-Corp-attic,edgewood\/borg,edgewood\/borg,edgimar\/borg,mhubig\/borg,level323\/borg,level323\/borg,pombredanne\/attic,edgimar\/borg,mhubig\/borg,edgimar\/borg,ionelmc\/borg,edgimar\/borg,level323\/borg,raxenak\/borg,mhubig\/borg,ionelmc\/borg,RonnyPfannschmidt\/borg,jborg\/attic,edgewood\/borg,raxenak\/borg,raxenak\/borg,raxenak\/borg,edgewood\/borg,RonnyPfannschmidt\/borg,jborg\/attic","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- darc\/_speedups.c\n+++ darc\/_speedups.c\n@@ -86,7 +86,13 @@\n }\n if(c->remaining < c->window_size) {\n c->done = 1;\n- return PyBuffer_FromMemory(c->data + c->position, c->remaining);\n+ if(c->remaining) {\n+ return PyBuffer_FromMemory(c->data + c->position, c->remaining);\n+ }\n+ else {\n+ PyErr_SetNone(PyExc_StopIteration);\n+ return NULL;\n+ }\n }\n sum = checksum(c->data + c->position, c->window_size, 0);\n c->remaining -= c->window_size;\n"} {"commit":"26f490e0cc1375d0a8d73af00d0296e68c1ef4eb","subject":"Make the conversion routines handle network byte order, not host byte order.","message":"Make the conversion routines handle network byte order, not host byte order.\n","repos":"ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/util\/utf8.c\n+++ security\/nss\/lib\/util\/utf8.c\n@@ -65,29 +65,38 @@\n * W2 = 110111xxxxxxxxxx\n *\/\n \n-#if !defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN)\n-#error \"NSPR should be defining IS_BIG_ENDIAN or IS_LITTLE_ENDIAN\"\n-#endif\n-\n-#if IS_BIG_ENDIAN\n+\/*\n+ * This code is assuming NETWORK BYTE ORDER for the 16- and 32-bit\n+ * character values. If you wish to use this code for working with\n+ * host byte order values, define the following:\n+ *\n+ * #if IS_BIG_ENDIAN\n+ * #define L_0 0\n+ * #define L_1 1\n+ * #define L_2 2\n+ * #define L_3 3\n+ * #define H_0 0\n+ * #define H_1 1\n+ * #else \/ * not everyone has elif * \/\n+ * #if IS_LITTLE_ENDIAN\n+ * #define L_0 3\n+ * #define L_1 2\n+ * #define L_2 1\n+ * #define L_3 0\n+ * #define H_0 1\n+ * #define H_1 0\n+ * #else\n+ * #error \"PDP and NUXI support deferred\"\n+ * #endif \/ * IS_LITTLE_ENDIAN * \/\n+ * #endif \/ * IS_BIG_ENDIAN * \/\n+ *\/\n+\n #define L_0 0\n #define L_1 1\n #define L_2 2\n #define L_3 3\n #define H_0 0\n #define H_1 1\n-#else \/* not everyone has elif *\/\n-#if IS_LITTLE_ENDIAN\n-#define L_0 3\n-#define L_1 2\n-#define L_2 1\n-#define L_3 0\n-#define H_0 1\n-#define H_1 0\n-#else\n-#error \"PDP and NUXI support deferred\"\n-#endif \/* IS_LITTLE_ENDIAN *\/\n-#endif \/* IS_BIG_ENDIAN *\/\n \n PR_IMPLEMENT(PRBool)\n sec_port_ucs4_utf8_conversion_function\n@@ -539,6 +548,7 @@\n #include <stdio.h>\n #include <string.h>\n #include <stdlib.h>\n+#include <netinet\/in.h> \/* for htonl and htons *\/\n \n \/*\n * UCS-4 vectors\n@@ -1984,6 +1994,45 @@\n return result;\n }\n \n+void\n+byte_order\n+(\n+ void\n+)\n+{\n+ \/*\n+ * The implementation (now) expects the 16- and 32-bit characters\n+ * to be in network byte order, not host byte order. Therefore I\n+ * have to byteswap all those test vectors above. hton[ls] may be\n+ * functions, so I have to do this dynamically. If you want to \n+ * use this code to do host byte order conversions, just remove\n+ * the call in main() to this function.\n+ *\/\n+\n+ int i;\n+\n+ for( i = 0; i < sizeof(ucs4)\/sizeof(ucs4[0]); i++ ) {\n+ struct ucs4 *e = &ucs4[i];\n+ e->c = htonl(e->c);\n+ }\n+\n+ for( i = 0; i < sizeof(ucs2)\/sizeof(ucs2[0]); i++ ) {\n+ struct ucs2 *e = &ucs2[i];\n+ e->c = htons(e->c);\n+ }\n+\n+#ifdef UTF16\n+ for( i = 0; i < sizeof(utf16)\/sizeof(utf16[0]); i++ ) {\n+ struct utf16 *e = &utf16[i];\n+ e->c = htonl(e->c);\n+ e->w[0] = htons(e->w[0]);\n+ e->w[1] = htons(e->w[1]);\n+ }\n+#endif \/* UTF16 *\/\n+\n+ return;\n+}\n+\n int\n main\n (\n@@ -1991,6 +2040,8 @@\n char *argv[]\n )\n {\n+ byte_order();\n+\n if( test_ucs4_chars() &&\n test_ucs2_chars() &&\n #ifdef UTF16\n"} {"commit":"29ff2368245d3d7d7e4494a9685e45b183df1a86","subject":"fixed compile error","message":"fixed compile error\n","repos":"embree\/embree,Sjoerdie\/embree,embree\/embree,embree\/embree,Sjoerdie\/embree,Sjoerdie\/embree,Sjoerdie\/embree,embree\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/builders\/heuristic_binning.h\n+++ kernels\/builders\/heuristic_binning.h\n@@ -73,6 +73,7 @@\n return Vec3ia(floori((vfloat4(p)-ofs)*scale));\n }\n \n+ template<typename PrimRef>\n __forceinline bool bin_unsafe(const PrimRef &ref,\n const vint4 vSplitPos,\n const vbool4 splitDimMask) const\n"} {"commit":"70cd3eda382002f31f7c4385111154fbd09e3921","subject":"test\/media: test subitems parsing failure","message":"test\/media: test subitems parsing failure\n","repos":"xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/libvlc\/media.c\n+++ test\/libvlc\/media.c\n@@ -131,7 +131,8 @@\n #undef FILE_SEPARATOR\n }\n \n-static void test_media_subitems_media(libvlc_media_t *media, bool play)\n+static void test_media_subitems_media(libvlc_media_t *media, bool play,\n+ bool b_items_expected)\n {\n libvlc_media_add_option(media, \":ignore-filetypes= \");\n \n@@ -166,6 +167,9 @@\n \n vlc_sem_destroy (&sem);\n \n+ if (!b_items_expected)\n+ return;\n+\n for (unsigned i = 0; i < TEST_SUBITEMS_COUNT; ++i)\n {\n log (\"test if %s was added\\n\", test_media_subitems_list[i].file);\n@@ -184,7 +188,7 @@\n log (\"Testing media_subitems: path: '%s'\\n\", subitems_path);\n media = libvlc_media_new_path (vlc, subitems_path);\n assert (media != NULL);\n- test_media_subitems_media (media, false);\n+ test_media_subitems_media (media, false, true);\n libvlc_media_release (media);\n \n #define NB_LOCATIONS 2\n@@ -198,7 +202,7 @@\n log (\"Testing media_subitems: location: '%s'\\n\", location);\n media = libvlc_media_new_location (vlc, location);\n assert (media != NULL);\n- test_media_subitems_media (media, false);\n+ test_media_subitems_media (media, false, true);\n free (location);\n libvlc_media_release (media);\n }\n@@ -211,12 +215,18 @@\n assert (fd >= 0);\n media = libvlc_media_new_fd (vlc, fd);\n assert (media != NULL);\n- test_media_subitems_media (media, true);\n+ test_media_subitems_media (media, true, true);\n libvlc_media_release (media);\n close (fd);\n #else\n #warning not testing subitems list via a fd location\n #endif\n+\n+ log (\"Testing media_subitems failure\\n\");\n+ media = libvlc_media_new_location (vlc, \"wrongfile:\/\/test\");\n+ assert (media != NULL);\n+ test_media_subitems_media (media, false, false);\n+ libvlc_media_release (media);\n \n libvlc_release (vlc);\n }\n"} {"commit":"206d6bb0a59cf59d55e6c6b6f44c7d9ee91e1921","subject":"started implementing aftershow daemon","message":"started implementing aftershow daemon\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libAfterImage\/aftershow\/aftershow.c\n+++ libAfterImage\/aftershow\/aftershow.c\n@@ -82,6 +82,19 @@\n \t\n }AfterShowContext;\n \n+Bool InitContext (AfterShowContext *context, int argc, char **argv);\n+Bool ConnectGUI (AfterShowContext *context);\n+Bool CheckInstance (AfterShowContext *context);\n+Bool SetupComms (AfterShowContext *context);\n+void HandleEvents (AfterShowContext *context);\n+\n+void show_usage (Bool short_form)\n+{\n+\t\n+\n+}\n+\n+\n int \n main (int argc, char **argv)\n {\n@@ -125,8 +138,71 @@\n }\n \n \tHandleEvents(&context);\n-}\n-\n+ \treturn EXIT_SUCCESS;\n+}\n+\n+\/**********************************************************************************\n+ * Implementation : \n+ **********************************************************************************\/\n+Bool InitContext (AfterShowContext *context, int argc, char **argv)\n+{\n+\tint i;\n+\tfor (i = 1 ; i < argc ; ++i) \n+\t{\n+\t\tif (argv[i][0] == '-')\n+\t\t{\n+\t\t\tif (argv[i][1] != '-') \/* short option *\/\n+\t\t\t{\n+\t\t\t\tif (argv[i][2] == '\\0')\n+\t\t\t\t\tswitch (argv[i][1])\n+\t\t\t\t\t{\n+\t\t\t\t\t\tcase 'h': show_usage(False); return False;\n+\t\t\t\t\t\tdefault :\n+\t\t\t\t\t\t\tshow_error (\"unrecognized option \\\"%s\\\"\", argv[i]);\n+\t\t\t\t\t\t\tshow_usage(False); \n+\t\t\t\t\t\t\treturn False;\n+\t\t\t\t\t}\n+\t\t\t}else \/* long option *\/\n+\t\t\t{\n+\t\t\t\tif (strcmp(&(argv[i][2]), \"help\") == 0)\n+\t\t\t\t{ \n+\t\t\t\t\tshow_usage(False); return False; \n+\t\t\t\t}else\n+\t\t\t\t{\n+\t\t\t\t\tshow_error (\"unrecognized option \\\"%s\\\"\", argv[i]);\n+\t\t\t\t\tshow_usage(False); \n+\t\t\t\t\treturn False;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn True;\n+}\n+\n+Bool ConnectGUI (AfterShowContext *context)\n+{\n+\n+\treturn True;\n+\n+}\n+\n+Bool CheckInstance (AfterShowContext *context)\n+{\n+\n+\treturn True;\n+\n+}\n+\n+Bool SetupComms (AfterShowContext *context)\n+{\n+\n+\treturn True;\n+}\n+\n+void HandleEvents (AfterShowContext *context)\n+{\n+\n+}\n \n \/* ********************************************************************************\/\n \/* The end !!!! \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t *\/\n"} {"commit":"8ca6d9bcc8d33c592c0855b4b1481bc723ac7e85","subject":"PM \/ Sleep: Simplify generic system suspend callbacks","message":"PM \/ Sleep: Simplify generic system suspend callbacks\n\nThe pm_runtime_suspended() check in __pm_generic_call() doesn't\nreally help and may cause problems to happen, because in some cases\nthe system suspend callbacks need to be called even if the given\ndevice has been suspended by runtime PM. For example, if the device\ngenerally supports remote wakeup and is not enabled to wake up\nthe system from sleep, it should be prevented from generating wakeup\nsignals during system suspend and that has to be done by the\nsuspend callbacks that the pm_runtime_suspended() check prevents from\nbeing executed.\n\nSimilarly, it may not be a good idea to unconditionally change\nthe runtime PM status of the device to 'active' in\n__pm_generic_resume(), because the driver may want to leave the\ndevice in the 'suspended' state, depending on what happened to it\nbefore the system suspend and whether or not it is enabled to\nwake up the system.\n\nFor the above reasons, remove the pm_runtime_suspended()\ncheck from __pm_generic_call() and remove the code changing the\ndevice's runtime PM status from __pm_generic_resume().\n\nSigned-off-by: Rafael J. Wysocki <a11f87183a953ab11f50fbafff689c5a7fa3506c@sisk.pl>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/base\/power\/generic_ops.c\n+++ drivers\/base\/power\/generic_ops.c\n@@ -97,16 +97,16 @@\n * @event: PM transition of the system under way.\n * @bool: Whether or not this is the \"noirq\" stage.\n *\n- * If the device has not been suspended at run time, execute the\n- * suspend\/freeze\/poweroff\/thaw callback provided by its driver, if defined, and\n- * return its error code. Otherwise, return zero.\n+ * Execute the suspend\/freeze\/poweroff\/thaw callback provided by the driver of\n+ * @dev, if defined, and return its error code. Return 0 if the callback is\n+ * not present.\n *\/\n static int __pm_generic_call(struct device *dev, int event, bool noirq)\n {\n \tconst struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;\n \tint (*callback)(struct device *);\n \n-\tif (!pm || pm_runtime_suspended(dev))\n+\tif (!pm)\n \t\treturn 0;\n \n \tswitch (event) {\n@@ -217,14 +217,12 @@\n * @bool: Whether or not this is the \"noirq\" stage.\n *\n * Execute the resume\/resotre callback provided by the @dev's driver, if\n- * defined. If it returns 0, change the device's runtime PM status to 'active'.\n- * Return the callback's error code.\n+ * defined, and return its error code. Return 0 if the callback is not present.\n *\/\n static int __pm_generic_resume(struct device *dev, int event, bool noirq)\n {\n \tconst struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL;\n \tint (*callback)(struct device *);\n-\tint ret;\n \n \tif (!pm)\n \t\treturn 0;\n@@ -241,17 +239,7 @@\n \t\tbreak;\n \t}\n \n-\tif (!callback)\n-\t\treturn 0;\n-\n-\tret = callback(dev);\n-\tif (!ret && !noirq && pm_runtime_enabled(dev)) {\n-\t\tpm_runtime_disable(dev);\n-\t\tpm_runtime_set_active(dev);\n-\t\tpm_runtime_enable(dev);\n-\t}\n-\n-\treturn ret;\n+\treturn callback ? callback(dev) : 0;\n }\n \n \/**\n"} {"commit":"b9d8895ee228afb9d98005492df0ce09c5bdea41","subject":"Do some cleanup in lvledit","message":"Do some cleanup in lvledit\n","repos":"llbit\/gravazoid,llbit\/gravazoid","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lvledit.c\n+++ lvledit.c\n@@ -96,6 +96,7 @@\n \t}\n \n \twrite_level(out);\n+\tfree_blocks();\n \treturn 0;\n }\n \n"} {"commit":"c4ad755fcc00cbcbd0aae041bbf8d3b00512fc85","subject":"Minor doxygen comment update","message":"Minor doxygen comment update\n","repos":"pnp-software\/cordetfw,pnp-software\/cordetfw,pnp-software\/cordetfw","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- tests\/config\/CrFwTime.c\n+++ tests\/config\/CrFwTime.c\n@@ -33,7 +33,7 @@\n #include \"CrFwConstants.h\"\n #include \"CrFwTime.h\"\n \n-\/** The <code>::CrFwGetCurrentTime<\/code> increments this counter and then returns its value *\/\n+\/** The <code>::CrFwGetCurrentTimeStamp<\/code> function increments this counter and then returns its value *\/\n static CrFwTimeStamp_t dummyTime = 0;\n \n \/*-----------------------------------------------------------------------------------------*\/\n"} {"commit":"a1cffcb4eae798e6ae05f261233b0fbc77f6c4be","subject":"Test parsing a PI with a failing allocator","message":"Test parsing a PI with a failing allocator\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -3751,6 +3751,44 @@\n {\n basic_teardown();\n }\n+\n+\n+\/* Test the effects of allocation failures on a straightforward parse *\/\n+START_TEST(test_alloc_parse)\n+{\n+ const char *text =\n+ \"<?xml version='1.0' encoding='utf-8'?>\\n\"\n+ \"<?pi unknown?>\\n\"\n+ \"<doc>Hello, world<\/doc>\";\n+ int i;\n+ int repeat = 0;\n+#define MAX_ALLOC_COUNT 10\n+\n+ for (i = 0; i < MAX_ALLOC_COUNT; i++) {\n+ allocation_count = i;\n+ \/* Repeat some counts because of cached memory *\/\n+ if (i == 2 && repeat == 2) {\n+ i -= 2;\n+ repeat++;\n+ } else if ((i == 1 && repeat < 2) ||\n+ (i == 1 && repeat > 2 && repeat < 5)) {\n+ i--;\n+ repeat++;\n+ }\n+ XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);\n+ if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n+ XML_TRUE) != XML_STATUS_ERROR)\n+ break;\n+ XML_ParserReset(parser, NULL);\n+ }\n+ if (i == 0)\n+ fail(\"Parse succeeded despite failing allocator\");\n+ if (i == MAX_ALLOC_COUNT)\n+ fail(\"Parse failed with max allocations\");\n+#undef MAX_ALLOC_COUNT\n+}\n+END_TEST\n+\n \n static int XMLCALL\n external_entity_duff_loader(XML_Parser parser,\n@@ -4357,6 +4395,7 @@\n \n suite_add_tcase(s, tc_alloc);\n tcase_add_checked_fixture(tc_alloc, alloc_setup, alloc_teardown);\n+ tcase_add_test(tc_alloc, test_alloc_parse);\n tcase_add_test(tc_alloc, test_alloc_create_external_parser);\n tcase_add_test(tc_alloc, test_alloc_run_external_parser);\n tcase_add_test(tc_alloc, test_alloc_dtd_copy_default_atts);\n"} {"commit":"d8210d5a83faa345046648e520d82b54ea724e35","subject":"Make changes on the make_unsigned type trait (#5136)","message":"Make changes on the make_unsigned type trait (#5136)\n\nFix a typo in the static assert message in `make_unsigned`\r\n\r\nSupport more specifications for `make_unsigned`","repos":"hgl888\/flatbuffers,stewartmiles\/flatbuffers,royalharsh\/flatbuffers,royalharsh\/flatbuffers,google\/flatbuffers,alexames\/flatbuffers,google\/flatbuffers,google\/flatbuffers,stewartmiles\/flatbuffers,evolutional\/flatbuffers,stewartmiles\/flatbuffers,pjulien\/flatbuffers,google\/flatbuffers,stewartmiles\/flatbuffers,pjulien\/flatbuffers,alexames\/flatbuffers,DavadDi\/flatbuffers,hgl888\/flatbuffers,evolutional\/flatbuffers,google\/flatbuffers,google\/flatbuffers,alexames\/flatbuffers,alexames\/flatbuffers,stewartmiles\/flatbuffers,hgl888\/flatbuffers,hgl888\/flatbuffers,evolutional\/flatbuffers,DavadDi\/flatbuffers,alexames\/flatbuffers,pjulien\/flatbuffers,alexames\/flatbuffers,royalharsh\/flatbuffers,DavadDi\/flatbuffers,stewartmiles\/flatbuffers,stewartmiles\/flatbuffers,pjulien\/flatbuffers,google\/flatbuffers,google\/flatbuffers,google\/flatbuffers,evolutional\/flatbuffers,evolutional\/flatbuffers,evolutional\/flatbuffers,stewartmiles\/flatbuffers,evolutional\/flatbuffers,google\/flatbuffers,alexames\/flatbuffers,google\/flatbuffers,evolutional\/flatbuffers,pjulien\/flatbuffers,evolutional\/flatbuffers,royalharsh\/flatbuffers,alexames\/flatbuffers,hgl888\/flatbuffers,stewartmiles\/flatbuffers,google\/flatbuffers,royalharsh\/flatbuffers,hgl888\/flatbuffers,pjulien\/flatbuffers,stewartmiles\/flatbuffers,alexames\/flatbuffers,DavadDi\/flatbuffers,evolutional\/flatbuffers,alexames\/flatbuffers,royalharsh\/flatbuffers,alexames\/flatbuffers,google\/flatbuffers,evolutional\/flatbuffers,evolutional\/flatbuffers,royalharsh\/flatbuffers,DavadDi\/flatbuffers,pjulien\/flatbuffers,stewartmiles\/flatbuffers,royalharsh\/flatbuffers,royalharsh\/flatbuffers,pjulien\/flatbuffers,stewartmiles\/flatbuffers,DavadDi\/flatbuffers,google\/flatbuffers,alexames\/flatbuffers,stewartmiles\/flatbuffers,google\/flatbuffers,pjulien\/flatbuffers,pjulien\/flatbuffers,alexames\/flatbuffers,royalharsh\/flatbuffers,alexames\/flatbuffers,pjulien\/flatbuffers,alexames\/flatbuffers,pjulien\/flatbuffers,evolutional\/flatbuffers","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/flatbuffers\/stl_emulation.h\n+++ include\/flatbuffers\/stl_emulation.h\n@@ -148,11 +148,15 @@\n template <typename T> using is_unsigned = std::tr1::is_unsigned<T>;\n \/\/ Android NDK doesn't have std::make_unsigned or std::tr1::make_unsigned.\n template<typename T> struct make_unsigned {\n- static_assert(is_unsigned<T>::value, \"Specialization not impelented!\");\n+ static_assert(is_unsigned<T>::value, \"Specialization not implemented!\");\n using type = T;\n };\n template<> struct make_unsigned<char> { using type = unsigned char; };\n- template<> struct make_unsigned<int> { using type = unsigned int; };\n+ template<> struct make_unsigned<short> { using type = unsigned short; };\n+ template<> struct make_unsigned<int> { using type = unsigned int; };\n+ template<> struct make_unsigned<long> { using type = unsigned long; };\n+ template<>\n+ struct make_unsigned<long long> { using type = unsigned long long; };\n #endif \/\/ !FLATBUFFERS_CPP98_STL\n #else\n \/\/ MSVC 2010 doesn't support C++11 aliases.\n"} {"commit":"df3eed70164806942564f8a9e4eccf4173ecfc35","subject":"we dont need to loop calling abort() because abort() already loops for us","message":"we dont need to loop calling abort() because abort() already loops for us\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/misc\/internals\/__uClibc_main.c\n+++ libc\/misc\/internals\/__uClibc_main.c\n@@ -96,9 +96,7 @@\n \t\t(st.st_rdev != makedev(1, 3)))\n \t{\n \t \/* Somebody is trying some trickery here... *\/\n-\t while (1) {\n \t\tabort();\n-\t }\n \t}\n }\n }\n"} {"commit":"fa7df37b588f48a1ff6ef005187f3c5c2281df95","subject":"ipmi: info leak in compat_ipmi_ioctl()","message":"ipmi: info leak in compat_ipmi_ioctl()\n\nOn x86_64 there is a 4 byte hole between ->recv_type and ->addr.\n\nSigned-off-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: Corey Minyard <97c9634d4bed2779ee3e53c0495565ccc28c2363@mvista.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_devintf.c\n+++ drivers\/char\/ipmi\/ipmi_devintf.c\n@@ -810,6 +810,7 @@\n \t\tstruct ipmi_recv __user *precv64;\n \t\tstruct ipmi_recv recv64;\n \n+\t\tmemset(&recv64, 0, sizeof(recv64));\n \t\tif (get_compat_ipmi_recv(&recv64, compat_ptr(arg)))\n \t\t\treturn -EFAULT;\n \n"} {"commit":"5307b6c097561f660660c5680a069b1a7165db8a","subject":"Add stable sort for array","message":"Add stable sort for array\n","repos":"P-p-H-d\/mlib,P-p-H-d\/mlib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- m-array.h\n+++ m-array.h\n@@ -622,7 +622,96 @@\n func_void = (int (*)(const void*, const void*))func_type; \\\n qsort (l->ptr, l->size, sizeof(type), func_void); \\\n } \\\n- ,) \/* IF CMP oplist *\/\t\t\t\t\t\t\\\n+ \\\n+ M_IF_METHOD(SWAP, oplist)( \\\n+ static inline void \\\n+ M_C(name, _special_stable_sort_noalloc) (type tab[], size_t size, type tmp[]) \\\n+ { \\\n+ size_t th = 4; \\\n+ M_IF_DEBUG(type *org_tab = tab;) \\\n+ M_ASSUME (size > 1); \\\n+ \/* Let's select the threshold of the pass 1 to be sure \\\n+ the final result is in tab.*\/ \\\n+ if (m_core_clz(size-1) & 1) \\\n+ th += th; \\\n+ \\\n+ \/* Pass 1: insertion sort (stable) *\/ \\\n+ for(size_t k = 0 ; k < size; ) { \\\n+ size_t max = size - k < 2*th ? size - k : th; \\\n+ M_ASSUME(max >= th); \\\n+ for(size_t i = 1; i < max; i++) { \\\n+ size_t j = i; \\\n+ while (j > 0 && M_GET_CMP oplist (tab[k+j-1], tab[k+j]) > 0) { \\\n+ M_GET_SWAP oplist (tab[k+j-1], tab[k+j]); \\\n+ j = j - 1; \\\n+ } \\\n+ } \\\n+ k += max; \\\n+ } \\\n+ \\\n+ \/* N Pass of merge *\/ \\\n+ while (th < size) { \\\n+ type *dest = tmp; \\\n+ \/* Pass n: Merge *\/ \\\n+ for(size_t k = 0 ; k < size; ) { \\\n+ type *el1 = &tab[k]; \\\n+ type *el2 = &tab[k+th]; \\\n+ size_t n1 = th; \\\n+ size_t n2 = size-k <= 3*th ? size-k-th : th; \\\n+ assert (size-k > th); \\\n+ assert (0 < n1 && n1 <= size); \\\n+ assert (0 < n2 && n2 <= size); \\\n+ k += n1+n2; \\\n+ for (;;) { \\\n+ if (M_GET_CMP oplist (*el1, *el2) <= 0) { \\\n+ M_GET_SET oplist (*dest, *el1); \\\n+ dest++; \\\n+ el1++; \\\n+ if (-- n1 == 0) { \\\n+ if (n2 > 0) { \\\n+ memcpy (dest, el2, n2 * sizeof (type)); \\\n+ dest += n2; \\\n+ } \\\n+ break; \\\n+ } \\\n+ } else { \\\n+ M_GET_SET oplist (*dest, *el2); \\\n+ dest++; \\\n+ el2++; \\\n+ if (-- n2 == 0) { \\\n+ if (n1 > 0) { \\\n+ memcpy (dest, el1, n1 * sizeof (type)); \\\n+ dest += n1; \\\n+ } \\\n+ break; \\\n+ } \\\n+ } \\\n+ } \\\n+ } \\\n+ \/* Swap t & tab *\/ \\\n+ M_SWAP(type *, tab, tmp); \\\n+ \/* Increase th for next pass *\/ \\\n+ th += th; \\\n+ } \\\n+ assert (org_tab == tab); \\\n+ } \\\n+ \\\n+ static inline void \\\n+ M_C(name, _special_stable_sort)(array_t l) \\\n+ { \\\n+ if (M_UNLIKELY (l->size < 2)) \\\n+ return; \\\n+ type *temp = M_GET_REALLOC oplist (type, NULL, l->size); \\\n+ if (temp == NULL) { \\\n+ M_MEMORY_FULL(sizeof (type) * l->size); \\\n+ return ; \\\n+ } \\\n+ M_C(name, _special_stable_sort_noalloc)(l->ptr, l->size, temp); \\\n+ M_GET_FREE oplist(temp); \\\n+ } \\\n+ ,) \/* IF SWAP method *\/ \\\n+ \\\n+ ,) \/* IF CMP oplist *\/ \\\n \t\t\t\t\t\t\t\t\t\\\n M_IF_METHOD(GET_STR, oplist)( \\\n static inline void \\\n"} {"commit":"9b1a9dd7901dfd499afdfd1322d2a82a6951a538","subject":"Test PI with a target of \"xnl\"","message":"Test PI with a target of \"xnl\"\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -5280,6 +5280,22 @@\n {\n const char *text = \"<?yml something like data?><doc\/>\";\n const XML_Char *expected = \"yml: something like data\\n\";\n+ CharData storage;\n+\n+ CharData_Init(&storage);\n+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);\n+ XML_SetUserData(parser, &storage);\n+ if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n+ XML_TRUE) == XML_STATUS_ERROR)\n+ xml_failure(parser);\n+ CharData_CheckXMLChars(&storage, expected);\n+}\n+END_TEST\n+\n+START_TEST(test_pi_xnl)\n+{\n+ const char *text = \"<?xnl nothing like data?><doc\/>\";\n+ const XML_Char *expected = \"xnl: nothing like data\\n\";\n CharData storage;\n \n CharData_Init(&storage);\n@@ -11226,6 +11242,7 @@\n tcase_add_test(tc_basic, test_pi_handled_in_default);\n tcase_add_test(tc_basic, test_comment_handled_in_default);\n tcase_add_test(tc_basic, test_pi_yml);\n+ tcase_add_test(tc_basic, test_pi_xnl);\n tcase_add_test(tc_basic, test_missing_encoding_conversion_fn);\n tcase_add_test(tc_basic, test_failing_encoding_conversion_fn);\n tcase_add_test(tc_basic, test_unknown_encoding_success);\n"} {"commit":"c73cc13ed3bef430ede1f7c7e05b2c0cf69b90cc","subject":"duplicate header, other copy is in ..\/dhash","message":"duplicate header, other copy is in ..\/dhash\n","repos":"weidezhang\/dht,sit\/dht,weidezhang\/dht,sit\/dht,sit\/dht,weidezhang\/dht,weidezhang\/dht,weidezhang\/dht,sit\/dht,sit\/dht","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lsd\/vsc.h\n+++ lsd\/vsc.h\n@@ -1,100 +0,0 @@\n-\n-template<class KEY, class VALUE>\n-class vs_cache {\n- struct cache_entry {\n- vs_cache *c;\n- KEY k;\n- VALUE v;\n-\n- ihash_entry<cache_entry> fhlink;\n- tailq_entry<cache_entry> lrulink;\n-\n- cache_entry (vs_cache<KEY, VALUE> *cc,\n-\t KEY &kk, VALUE *vv)\n- : c (cc), k (kk)\n- { v = *vv;\n- c->lrulist.insert_tail (this);\n- c->entries.insert (this);\n- c->num_cache_entries++;\n- while (c->num_cache_entries > implicit_cast<u_int> (c->max_cache_entries)) {\n- if (c->fcb) (c->fcb) (c->lrulist.first->k, c->lrulist.first->v);\n- delete c->lrulist.first;\n- }\n- }\n-\n- ~cache_entry ()\n- {\n- c->lrulist.remove (this);\n- c->entries.remove (this);\n- c->num_cache_entries--;\n- }\n-\n- void touch ()\n- {\n- c->lrulist.remove (this);\n- c->lrulist.insert_tail (this);\n- }\n- };\n-\n- typedef callback<void, KEY, VALUE>::ptr flushcb_t;\n- \n-private:\n- friend class cache_entry; \/\/XXX hashid is a hack that ruins the generic nature of the cache\n- ihash<KEY, cache_entry, &cache_entry::k, &cache_entry::fhlink, hashID> entries;\n- u_int num_cache_entries;\n- tailq<cache_entry, &cache_entry::lrulink> lrulist;\n- u_int max_cache_entries;\n- flushcb_t fcb;\n-public:\n- vs_cache (u_int max_entries = 250) : num_cache_entries (0), \n- max_cache_entries (max_entries), \n- fcb (NULL) { };\n-\n- ~vs_cache () { entries.deleteall (); }\n- void flush () { entries.deleteall (); }\n- void enter ( KEY& kk, VALUE *vv)\n- {\n- cache_entry *ad = entries[kk];\n- if (!ad)\n-\tvNew cache_entry (this, kk, vv);\n- else \n-\tad->touch ();\n- }\n- \n- void remove (KEY& k) \n- { \n- entries.remove(entries[k]);\n- }\n-\n- VALUE *lookup (KEY& kk)\n- {\n- cache_entry *ad = entries[kk];\n- if (ad) {\n-\tad->touch ();\n-\treturn &ad->v;\n- }\n- return NULL;\n- }\n- \n- void traverse (callback<void, KEY>::ref cb ) \n- {\n- cache_entry *e = entries.first ();\n- while (e) \n-\t {\n-\t cb (e->k);\n-\t e = entries.next (e);\n-\t }\n- }\n-\n- VALUE *peek (KEY& k) {\n- cache_entry *ad = entries[k];\n- if (ad) {\n- return &ad->v;\n- }\n- return NULL;\n- }\n- \n- void set_flushcb (flushcb_t cb ) {\n- fcb = cb;\n- }\n-};\n"} {"commit":"a5e5ba5e38da9f78734df0094992c49c4a220560","subject":"Call move() by qualified name (::testing::internal::move() or just internal::move()).","message":"Call move() by qualified name (::testing::internal::move() or just internal::move()).\n","repos":"opensourceDA\/googletest,opensourceDA\/googletest,opensourceDA\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -1319,7 +1319,7 @@\n \n #if GTEST_HAS_STD_MOVE_\n using std::move;\n-#else \/\/ GTEST_LANG_CXX11\n+#else \/\/ GTEST_HAS_STD_MOVE_\n template <typename T>\n const T& move(const T& t) {\n return t;\n@@ -1347,7 +1347,7 @@\n \/\/ similar functions users may have (e.g., implicit_cast). The internal\n \/\/ namespace alone is not enough because the function can be found by ADL.\n template<typename To>\n-inline To ImplicitCast_(To x) { return move(x); }\n+inline To ImplicitCast_(To x) { return ::testing::internal::move(x); }\n \n \/\/ When you upcast (that is, cast a pointer from type Foo to type\n \/\/ SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts\n"} {"commit":"8b6643eeb2b42676b295575d0caa59300fefd3ad","subject":"Wire up vmsplice, splice and tee for arm.","message":"Wire up vmsplice, splice and tee for arm.\n","repos":"mephi42\/uClibc,ddcc\/klee-uclibc-0.9.33.2,foss-xtensa\/uClibc,hjl-tools\/uClibc,mephi42\/uClibc,hjl-tools\/uClibc,gittup\/uClibc,czankel\/xtensa-uclibc,foss-xtensa\/uClibc,ysat0\/uClibc,majek\/uclibc-vx32,foss-xtensa\/uClibc,kraj\/uclibc-ng,czankel\/xtensa-uclibc,brgl\/uclibc-ng,kraj\/uClibc,skristiansson\/uClibc-or1k,ddcc\/klee-uclibc-0.9.33.2,skristiansson\/uClibc-or1k,brgl\/uclibc-ng,gittup\/uClibc,ndmsystems\/uClibc,ffainelli\/uClibc,ysat0\/uClibc,foss-xtensa\/uClibc,kraj\/uclibc-ng,mephi42\/uClibc,majek\/uclibc-vx32,OpenInkpot-archive\/iplinux-uclibc,hwoarang\/uClibc,ndmsystems\/uClibc,ysat0\/uClibc,hjl-tools\/uClibc,ffainelli\/uClibc,brgl\/uclibc-ng,ndmsystems\/uClibc,majek\/uclibc-vx32,skristiansson\/uClibc-or1k,atgreen\/uClibc-moxie,ddcc\/klee-uclibc-0.9.33.2,ysat0\/uClibc,ffainelli\/uClibc,ndmsystems\/uClibc,kraj\/uclibc-ng,waweber\/uclibc-clang,wbx-github\/uclibc-ng,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,ffainelli\/uClibc,czankel\/xtensa-uclibc,gittup\/uClibc,brgl\/uclibc-ng,kraj\/uClibc,czankel\/xtensa-uclibc,ffainelli\/uClibc,kraj\/uClibc,kraj\/uclibc-ng,gittup\/uClibc,m-labs\/uclibc-lm32,wbx-github\/uclibc-ng,atgreen\/uClibc-moxie,groundwater\/uClibc,OpenInkpot-archive\/iplinux-uclibc,hwoarang\/uClibc,atgreen\/uClibc-moxie,ddcc\/klee-uclibc-0.9.33.2,foss-for-synopsys-dwc-arc-processors\/uClibc,m-labs\/uclibc-lm32,OpenInkpot-archive\/iplinux-uclibc,m-labs\/uclibc-lm32,foss-for-synopsys-dwc-arc-processors\/uClibc,OpenInkpot-archive\/iplinux-uclibc,majek\/uclibc-vx32,waweber\/uclibc-clang,atgreen\/uClibc-moxie,hjl-tools\/uClibc,hwoarang\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,skristiansson\/uClibc-or1k,groundwater\/uClibc,waweber\/uclibc-clang,mephi42\/uClibc,wbx-github\/uclibc-ng,waweber\/uclibc-clang,hjl-tools\/uClibc,m-labs\/uclibc-lm32,wbx-github\/uclibc-ng,groundwater\/uClibc,hwoarang\/uClibc,kraj\/uClibc,groundwater\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/arm\/bits\/fcntl.h\n+++ libc\/sysdeps\/linux\/arm\/bits\/fcntl.h\n@@ -1,5 +1,6 @@\n \/* O_*, F_*, FD_* bit values for Linux.\n- Copyright (C) 1995-1998, 2000, 2004, 2006 Free Software Foundation, Inc.\n+ Copyright (C) 1995-1998, 2000, 2004, 2006, 2007, 2008\n+ Free Software Foundation, Inc.\n This file is part of the GNU C Library.\n \n The GNU C Library is free software; you can redistribute it and\/or\n@@ -49,6 +50,7 @@\n # define O_NOFOLLOW\t0100000\t\/* Do not follow links.\t *\/\n # define O_DIRECT\t0200000\t\/* Direct disk access.\t*\/\n # define O_NOATIME 01000000 \/* Do not set atime. *\/\n+# define O_CLOEXEC 02000000 \/* Set close_on_exec. *\/\n #endif\n \n \/* For now Linux has synchronisity options for data and read operations.\n@@ -96,9 +98,11 @@\n # define F_SETLEASE\t1024\t\/* Set a lease.\t *\/\n # define F_GETLEASE\t1025\t\/* Enquire what lease is active. *\/\n # define F_NOTIFY\t1026\t\/* Request notfications on a directory.\t *\/\n-#endif\n-\n-\/* For F_[GET|SET]FL. *\/\n+# define F_DUPFD_CLOEXEC 1030\t\/* Duplicate file descriptor with\n+\t\t\t\t close-on-exit set. *\/\n+#endif\n+\n+\/* For F_[GET|SET]FD. *\/\n #define FD_CLOEXEC\t1\t\/* actually anything with low bit set goes *\/\n \n \/* For posix fcntl() and `l_type' field of a `struct flock' for lockf(). *\/\n@@ -212,25 +216,24 @@\n extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)\n __THROW;\n \n-\n #if 0\n \/* Selective file content synch'ing. *\/\n extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,\n \t\t\t unsigned int __flags);\n-\n+#endif\n \n \/* Splice address range into a pipe. *\/\n-extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,\n-\t\t unsigned int __flags);\n+extern ssize_t vmsplice (int __fdout, const struct iovec *__iov,\n+\t\t\t size_t __count, unsigned int __flags);\n \n \/* Splice two files together. *\/\n-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)\n- __THROW;\n+extern ssize_t splice (int __fdin, __off64_t *__offin, int __fdout,\n+\t\t __off64_t *__offout, size_t __len,\n+\t\t unsigned int __flags);\n \n \/* In-kernel implementation of tee for pipe buffers. *\/\n-extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags)\n- __THROW;\n-#endif\n+extern ssize_t tee (int __fdin, int __fdout, size_t __len,\n+\t\t unsigned int __flags);\n \n #endif\n \n"} {"commit":"f18475d0ac781f22c7c1d90dc5a0846773284b2b","subject":"Better warp mode on SDL2 SimEvo","message":"Better warp mode on SDL2 SimEvo\n","repos":"michaelcmartin\/bumbershoot,michaelcmartin\/bumbershoot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sim_evo\/simevo_sdl2.c\n+++ sim_evo\/simevo_sdl2.c\n@@ -41,6 +41,7 @@\n SDL_Renderer *renderer;\n evo_state_t state;\n int64_t seed;\n+ Uint32 start;\n int done = 0, warp = 0, garden = 1;\n \n if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) {\n@@ -76,12 +77,12 @@\n SDL_SetWindowTitle(window, \"Simulated Evolution\");\n SDL_RenderSetLogicalSize(renderer, 150, 100);\n \n+ start = SDL_GetTicks();\n while (!done) {\n SDL_Event event;\n SDL_Rect r;\n int i, x, y;\n- Uint32 start, end;\n- start = SDL_GetTicks();\n+ Uint32 end;\n while (SDL_PollEvent(&event)) {\n if (event.type == SDL_QUIT) {\n done = 1;\n@@ -130,10 +131,18 @@\n SDL_RenderFillRect(renderer, &r);\n }\n \/* Send the display out *\/\n- SDL_RenderPresent(renderer);\n- end = SDL_GetTicks();\n- if (!warp && end - start < 20) {\n- SDL_Delay(20 - (end - start));\n+ if (warp) {\n+ if (SDL_GetTicks() - start >= 20) {\n+ SDL_RenderPresent(renderer);\n+ start = SDL_GetTicks();\n+ }\n+ } else {\n+ SDL_RenderPresent(renderer);\n+ end = SDL_GetTicks();\n+ if (end - start < 20) {\n+ SDL_Delay(20 - (end - start));\n+ }\n+ start = SDL_GetTicks();\n }\n }\n \n"} {"commit":"6368087e851e697679af059b4247aca33a69cef3","subject":"ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex","message":"ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex\n\nWhen a 32 bit version of ipmitool is used on a 64 bit kernel, the\nipmi_devintf code fails to correctly acquire ipmi_mutex. This results in\nincomplete data being retrieved in some cases, or other possible failures.\nAdd a wrapper around compat_ipmi_ioctl() to take ipmi_mutex to fix this.\n\nSigned-off-by: Benjamin LaHaise <b05c66fa21e46731bb89a779db663748f3df8f6a@kvack.org>\nSigned-off-by: Corey Minyard <97c9634d4bed2779ee3e53c0495565ccc28c2363@mvista.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_devintf.c\n+++ drivers\/char\/ipmi\/ipmi_devintf.c\n@@ -837,13 +837,25 @@\n \t\treturn ipmi_ioctl(filep, cmd, arg);\n \t}\n }\n+\n+static long unlocked_compat_ipmi_ioctl(struct file *filep, unsigned int cmd,\n+\t\t\t\t unsigned long arg)\n+{\n+\tint ret;\n+\n+\tmutex_lock(&ipmi_mutex);\n+\tret = compat_ipmi_ioctl(filep, cmd, arg);\n+\tmutex_unlock(&ipmi_mutex);\n+\n+\treturn ret;\n+}\n #endif\n \n static const struct file_operations ipmi_fops = {\n \t.owner\t\t= THIS_MODULE,\n \t.unlocked_ioctl\t= ipmi_unlocked_ioctl,\n #ifdef CONFIG_COMPAT\n-\t.compat_ioctl = compat_ipmi_ioctl,\n+\t.compat_ioctl = unlocked_compat_ipmi_ioctl,\n #endif\n \t.open\t\t= ipmi_open,\n \t.release\t= ipmi_release,\n"} {"commit":"041a25378720304d52669d063ea67c4480aade4b","subject":"Delete madRace.h","message":"Delete madRace.h","repos":"howhowlin\/posd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- madRace.h\n+++ madRace.h\n@@ -1,29 +0,0 @@\n-#ifndef MADRACE_H\r\n-#define MADRACE_H\r\n-\r\n-class MadCar {\r\n-public:\r\n- MadCar (int iniSpeed): _speed(iniSpeed){}\r\n- int speed() const {return _speed;}\r\n- void boom(int incSpeed) {_speed+=incSpeed;}\r\n-private:\r\n- int _speed;\r\n-};\r\n-\r\n-class MadBike {\r\n-public:\r\n- MadBike (int iniSpeed, int inc, int maxSpeed): _speed(iniSpeed), _inc(inc), _maxSpeed(maxSpeed){}\r\n- int speed() const {return _speed;}\r\n- void boom() {\r\n- if (_speed +_inc >= _maxSpeed)\r\n- throw std::string(\"MadBike speeding\");\r\n- else\r\n- _speed += _inc;\r\n- }\r\n-private:\r\n- int _speed;\r\n- int _inc;\r\n- int _maxSpeed;\r\n-};\r\n-\r\n-#endif\r\n"} {"commit":"21481e66fca4d4d0a701664e94c9794733dd4b6b","subject":"tracker-miner-fs: Removed all .* file\/dir ignores, this is done by default","message":"tracker-miner-fs: Removed all .* file\/dir ignores, this is done by default\n","repos":"outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tracker-miner-fs\/tracker-config.c\n+++ src\/tracker-miner-fs\/tracker-config.c\n@@ -681,7 +681,7 @@\n \t\t\t\tg_strfreev (string_list);\n \t\t\t} else if (g_strcmp0 (conversions[i].property, \"ignored-directories\") == 0) {\n \t\t\t\tconst gchar *string_list[] = {\n-\t\t\t\t\t\"po\", \"CVS\", \".svn\", \".git\", \"core-dumps\", \"lost+found\",\n+\t\t\t\t\t\"po\", \"CVS\", \"core-dumps\", \"lost+found\",\n \t\t\t\t\tNULL\n \t\t\t\t};\n \n@@ -703,12 +703,12 @@\n \t\t\t\t G_N_ELEMENTS (string_list));\n \t\t\t} else if (g_strcmp0 (conversions[i].property, \"ignored-files\") == 0) {\n \t\t\t\tconst gchar *string_list[] = {\n-\t\t\t\t\t\"*~\", \".*.swp\" \".*.swo\" \"*.o\", \"*.la\", \"*.lo\", \"*.loT\", \"*.in\",\n+\t\t\t\t\t\"*~\", \"*.o\", \"*.la\", \"*.lo\", \"*.loT\", \"*.in\",\n \t\t\t\t\t\"*.csproj\", \"*.m4\", \"*.rej\", \"*.gmo\", \"*.orig\",\n-\t\t\t\t\t\"*.pc\", \"*.omf\", \"*.aux\", \"*.tmp\", \"*.po\",\n+\t\t\t\t\t\"*.pc\", \"*.omf\", \"*.aux\", \"*.tmp\", \"*.po\",\n \t\t\t\t\t\"*.vmdk\", \"*.vm*\", \"*.nvram\", \"*.part\",\n \t\t\t\t\t\"*.rcore\", \"lzo\", \"autom4te\", \"conftest\",\n-\t\t\t\t\t\"confstat\", \"Makefile\", \"SCCS\", \"litmain.sh\",\n+\t\t\t\t\t\"confstat\", \"Makefile\", \"SCCS\", \"litmain.sh\",\n \t\t\t\t\t\"libtool\", \"config.status\", \"confdefs.h\",\n \t\t\t\t\tNULL\n \t\t\t\t};\n"} {"commit":"c231c04f8d22b3b6a46fa49c7da5f7a829380a02","subject":"Add limit to the number of errors","message":"Add limit to the number of errors\n\nThis limit helps in the case of inifinite errors, and after 10\nerrors nobody read more.\n","repos":"k0gaMSX\/scc,8l\/scc,k0gaMSX\/kcc,8l\/scc,8l\/scc,k0gaMSX\/scc,k0gaMSX\/kcc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- cc1\/error.c\n+++ cc1\/error.c\n@@ -7,7 +7,10 @@\n #include \"..\/inc\/cc.h\"\n #include \"cc1.h\"\n \n+#define MAXERRNUM 10\n+\n extern uint8_t failure;\n+static uint8_t nerrors;\n \n static void\n warn_helper(int8_t flag, char *fmt, va_list va)\n@@ -18,6 +21,10 @@\n \t\t(flag < 0) ? \"error\" : \"warning\", filename(), fileline());\n \tvfprintf(stderr, fmt, va);\n \tputc('\\n', stderr);\n+\tif (flag < 0 && nerrors++ == MAXERRNUM) {\n+\t\tfputs(\"too many errors\\n\", stderr);\n+\t\texit(-1);\n+\t}\n }\n \n void\n"} {"commit":"cfacfa35aa260d6a2e838ae5041b92a202ec8307","subject":"bugfix : use nocolliding flag only at mainposition","message":"bugfix : use nocolliding flag only at mainposition\n","repos":"cloudwu\/lua-conf,sdgdsffdsfff\/lua-conf,yksalun\/lua-conf","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- luaconf.c\n+++ luaconf.c\n@@ -476,6 +476,8 @@\n static struct node *\n lookup_key(struct table *tbl, uint32_t keyhash, int key, int keytype, const char *str, size_t sz) {\n \tstruct node *n = &tbl->hash[keyhash % tbl->sizehash];\n+\tif (keyhash != n->keyhash && n->nocolliding == 0)\n+\t\treturn NULL;\n \tfor (;;) {\n \t\tif (keyhash == n->keyhash) {\n \t\t\tif (n->keytype == KEYTYPE_INTEGER) {\n@@ -493,7 +495,7 @@\n \t\t\t\t}\n \t\t\t}\n \t\t}\n-\t\tif (n->next < 0 || n->nocolliding == 0) {\n+\t\tif (n->next < 0) {\n \t\t\treturn NULL;\n \t\t}\n \t\tn = &tbl->hash[n->next];\t\t\n"} {"commit":"0208279021b93783f651c7d5e75ad55380fec860","subject":"wocky_data_forms_field_new: set the description","message":"wocky_data_forms_field_new: set the description\n","repos":"noonien-d\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky,freedesktop-unofficial-mirror\/wocky","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- wocky\/wocky-data-forms.c\n+++ wocky\/wocky-data-forms.c\n@@ -102,6 +102,7 @@\n field->type = type;\n field->var = g_strdup (var);\n field->label = g_strdup (label);\n+ field->desc = g_strdup (desc);\n field->required = required;\n if (default_value != NULL)\n field->default_value = wocky_g_value_slice_dup (default_value);\n@@ -120,6 +121,7 @@\n \n g_free (field->var);\n g_free (field->label);\n+ g_free (field->desc);\n \n if (field->default_value != NULL)\n wocky_g_value_slice_free (field->default_value);\n"} {"commit":"083326894e079f1c449734bb9094d7bc82cb667a","subject":"Add the new tests to the right TCase object.","message":"Add the new tests to the right TCase object.\n","repos":"libexpat\/libexpat,tiran\/expat,libexpat\/libexpat,libexpat\/libexpat,tiran\/expat,tiran\/expat,libexpat\/libexpat,libexpat\/libexpat,tiran\/expat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -340,10 +340,10 @@\n \/* Regression test for SF bug #491986. *\/\n tcase_add_test(tc_chars, test_danish_latin1);\n \/* Regression test for SF bug #514281. *\/\n- tcase_add_test(tc_attrs, test_french_charref_hexidecimal);\n- tcase_add_test(tc_attrs, test_french_charref_decimal);\n- tcase_add_test(tc_attrs, test_french_latin1);\n- tcase_add_test(tc_attrs, test_french_utf8);\n+ tcase_add_test(tc_chars, test_french_charref_hexidecimal);\n+ tcase_add_test(tc_chars, test_french_charref_decimal);\n+ tcase_add_test(tc_chars, test_french_latin1);\n+ tcase_add_test(tc_chars, test_french_utf8);\n \n suite_add_tcase(s, tc_attrs);\n tcase_add_checked_fixture(tc_attrs, basic_setup, basic_teardown);\n"} {"commit":"db8ba6614177c49901748d317b137c17fedee043","subject":"Fix build regression with old (Xcode 5.1) clangs.","message":"Fix build regression with old (Xcode 5.1) clangs.\n\n\ngit-svn-id: 2c9a99be47d0e569b9832cc4192b2d4c0ac487c7@704 861a406c-534a-0410-8894-cb66d6ee9925\n","repos":"liquid-mirror\/googletest,r12f\/googletest,svn2github\/chromium-gtest,svn2github\/googletest,Luxoft\/gtest,svn2github\/gtest,svn2github\/googletest,grumpycoders\/googletest,liquid-mirror\/googletest,stp\/googletest,svn2github\/gtest,inexor-game\/googletest,svn2github\/gtest,scudette\/gtest,stp\/googletest,dreamer-dead\/google-test,svn2github\/chromium-gtest,dreamer-dead\/google-test,liquid-mirror\/googletest,svn2github\/gtest,svn2github\/chromium-gtest,stp\/googletest,svn2github\/chromium-gtest,dreamer-dead\/google-test,scudette\/gtest,scudette\/gtest,grumpycoders\/googletest,inexor-game\/googletest,Luxoft\/gtest,Luxoft\/gtest,stp\/googletest,dreamer-dead\/google-test,r12f\/googletest,inexor-game\/googletest,grumpycoders\/googletest,svn2github\/googletest,grumpycoders\/googletest,r12f\/googletest,svn2github\/googletest,inexor-game\/googletest,liquid-mirror\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -499,10 +499,14 @@\n # endif \/\/ _HAS_EXCEPTIONS\n # define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS\n # elif defined(__clang__)\n-\/\/ __EXCEPTIONS determines if cleanups are enabled. In Obj-C++ files, there can\n-\/\/ be cleanups for ObjC exceptions, but C++ exceptions might still be disabled.\n-\/\/ So use a __has_feature check for C++ exceptions instead.\n-# define GTEST_HAS_EXCEPTIONS __has_feature(cxx_exceptions)\n+\/\/ clang defines __EXCEPTIONS iff exceptions are enabled before clang 220714,\n+\/\/ but iff cleanups are enabled after that. In Obj-C++ files, there can be\n+\/\/ cleanups for ObjC exceptions which also need cleanups, even if C++ exceptions\n+\/\/ are disabled. clang has __has_feature(cxx_exceptions) which checks for C++\n+\/\/ exceptions starting at clang r206352, but which checked for cleanups prior to\n+\/\/ that. To reliably check for C++ exception availability with clang, check for\n+\/\/ __EXCEPTIONS && __has_feature(cxx_exceptions).\n+# define GTEST_HAS_EXCEPTIONS __EXCEPTIONS && __has_feature(cxx_exceptions)\n # elif defined(__GNUC__) && __EXCEPTIONS\n \/\/ gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.\n # define GTEST_HAS_EXCEPTIONS 1\n"} {"commit":"5c7d0f39be1407076e8aba626c7aa11ad1aed7ec","subject":"fix compiling and touchup style","message":"fix compiling and touchup style\n","repos":"gittup\/uClibc,kraj\/uclibc-ng,kraj\/uclibc-ng,OpenInkpot-archive\/iplinux-uclibc,skristiansson\/uClibc-or1k,kraj\/uclibc-ng,brgl\/uclibc-ng,kraj\/uClibc,klee\/klee-uclibc,kraj\/uClibc,kraj\/uclibc-ng,groundwater\/uClibc,ysat0\/uClibc,OpenInkpot-archive\/iplinux-uclibc,atgreen\/uClibc-moxie,hwoarang\/uClibc,gittup\/uClibc,ChickenRunjyd\/klee-uclibc,majek\/uclibc-vx32,ysat0\/uClibc,ndmsystems\/uClibc,foss-xtensa\/uClibc,brgl\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,m-labs\/uclibc-lm32,czankel\/xtensa-uclibc,waweber\/uclibc-clang,czankel\/xtensa-uclibc,foss-xtensa\/uClibc,ddcc\/klee-uclibc-0.9.33.2,kraj\/uClibc,m-labs\/uclibc-lm32,foss-for-synopsys-dwc-arc-processors\/uClibc,wbx-github\/uclibc-ng,majek\/uclibc-vx32,brgl\/uclibc-ng,ndmsystems\/uClibc,ysat0\/uClibc,wbx-github\/uclibc-ng,skristiansson\/uClibc-or1k,gittup\/uClibc,atgreen\/uClibc-moxie,ndmsystems\/uClibc,skristiansson\/uClibc-or1k,waweber\/uclibc-clang,ChickenRunjyd\/klee-uclibc,waweber\/uclibc-clang,foss-xtensa\/uClibc,klee\/klee-uclibc,klee\/klee-uclibc,OpenInkpot-archive\/iplinux-uclibc,ffainelli\/uClibc,brgl\/uclibc-ng,groundwater\/uClibc,majek\/uclibc-vx32,ChickenRunjyd\/klee-uclibc,skristiansson\/uClibc-or1k,mephi42\/uClibc,OpenInkpot-archive\/iplinux-uclibc,groundwater\/uClibc,gittup\/uClibc,ddcc\/klee-uclibc-0.9.33.2,ysat0\/uClibc,hjl-tools\/uClibc,kraj\/uClibc,groundwater\/uClibc,ffainelli\/uClibc,majek\/uclibc-vx32,hwoarang\/uClibc,hjl-tools\/uClibc,hjl-tools\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,atgreen\/uClibc-moxie,hjl-tools\/uClibc,wbx-github\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,klee\/klee-uclibc,hwoarang\/uClibc,hjl-tools\/uClibc,ffainelli\/uClibc,hwoarang\/uClibc,m-labs\/uclibc-lm32,groundwater\/uClibc,ChickenRunjyd\/klee-uclibc,ffainelli\/uClibc,ndmsystems\/uClibc,waweber\/uclibc-clang,wbx-github\/uclibc-ng,czankel\/xtensa-uclibc,czankel\/xtensa-uclibc,foss-xtensa\/uClibc,m-labs\/uclibc-lm32,ddcc\/klee-uclibc-0.9.33.2,foss-for-synopsys-dwc-arc-processors\/uClibc,ffainelli\/uClibc,mephi42\/uClibc,mephi42\/uClibc,mephi42\/uClibc,atgreen\/uClibc-moxie","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/sh\/pread_write.c\n+++ libc\/sysdeps\/linux\/sh\/pread_write.c\n@@ -1,12 +1,13 @@\n-\/* vi: set sw=4 ts=4:\n- *\n+\/* vi: set sw=4 ts=4: *\/\n+\/*\n * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>\n *\n * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.\n *\/\n-\/* Based in part on the files\n+\/*\n+ * Based in part on the files\n *\t\t.\/sysdeps\/unix\/sysv\/linux\/pwrite.c,\n- *\t\t.\/sysdeps\/unix\/sysv\/linux\/pread.c, \n+ *\t\t.\/sysdeps\/unix\/sysv\/linux\/pread.c,\n *\t\tsysdeps\/posix\/pread.c\n *\t\tsysdeps\/posix\/pwrite.c\n * from GNU libc 2.2.5, but reworked considerably...\n@@ -15,6 +16,7 @@\n #include <sys\/syscall.h>\n #include <unistd.h>\n #include <stdint.h>\n+#include <endian.h>\n \n #ifdef __NR_pread64 \/* Newer kernels renamed but it's the same. *\/\n # ifdef __NR_pread\n@@ -25,20 +27,20 @@\n \n #ifdef __NR_pread\n extern __typeof(pread) __libc_pread;\n-# define __NR___syscall_pread __NR_pread \n-static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf, \n+# define __NR___syscall_pread __NR_pread\n+static inline _syscall6(ssize_t, __syscall_pread, int, fd, void *, buf,\n \t\tsize_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo);\n \n ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset)\n-{ \n+{\n \treturn(__syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR((off_t)0,offset)));\n }\n weak_alias(__libc_pread,pread)\n \n-# ifdef __UCLIBC_HAS_LFS__ \n+# ifdef __UCLIBC_HAS_LFS__\n extern __typeof(pread64) __libc_pread64;\n ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset)\n-{ \n+{\n uint32_t low = offset & 0xffffffff;\n uint32_t high = offset >> 32;\n \treturn(__syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR (high, low)));\n@@ -58,20 +60,20 @@\n \n #ifdef __NR_pwrite\n extern __typeof(pwrite) __libc_pwrite;\n-# define __NR___syscall_pwrite __NR_pwrite \n-static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf, \n+# define __NR___syscall_pwrite __NR_pwrite\n+static inline _syscall6(ssize_t, __syscall_pwrite, int, fd, const void *, buf,\n \t\tsize_t, count, int, dummy, off_t, offset_hi, off_t, offset_lo);\n \n ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset)\n-{ \n+{\n \treturn(__syscall_pwrite(fd,buf,count,0,__LONG_LONG_PAIR((off_t)0,offset)));\n }\n weak_alias(__libc_pwrite,pwrite)\n \n-# ifdef __UCLIBC_HAS_LFS__ \n+# ifdef __UCLIBC_HAS_LFS__\n extern __typeof(pwrite64) __libc_pwrite64;\n ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset)\n-{ \n+{\n uint32_t low = offset & 0xffffffff;\n uint32_t high = offset >> 32;\n \treturn(__syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR (high, low)));\n"} {"commit":"d8cc5267b802003e2c67ac5254788044852ccfa9","subject":"ipmi: only register one si per bmc","message":"ipmi: only register one si per bmc\n\nOnly register one si per bmc. Use any user-provided devices first,\nfollowed by the first device with an irq, followed by the first device\ndiscovered.\n\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\nSigned-off-by: Corey Minyard <97c9634d4bed2779ee3e53c0495565ccc28c2363@mvista.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/char\/ipmi\/ipmi_si_intf.c\n+++ drivers\/char\/ipmi\/ipmi_si_intf.c\n@@ -3298,6 +3298,14 @@\n \n \thardcode_find_bmc();\n \n+\t\/* If the user gave us a device, they presumably want us to use it *\/\n+\tmutex_lock(&smi_infos_lock);\n+\tif (!list_empty(&smi_infos)) {\n+\t\tmutex_unlock(&smi_infos_lock);\n+\t\treturn 0;\n+\t}\n+\tmutex_unlock(&smi_infos_lock);\n+\n #ifdef CONFIG_DMI\n \tdmi_find_bmc();\n #endif\n@@ -3321,10 +3329,27 @@\n \tof_register_platform_driver(&ipmi_of_platform_driver);\n #endif\n \n+\t\/* Try to register something with interrupts first *\/\n+\n \tmutex_lock(&smi_infos_lock);\n \tlist_for_each_entry(e, &smi_infos, link) {\n-\t\tif (!e->si_sm)\n-\t\t\ttry_smi_init(e);\n+\t\tif (e->irq) {\n+\t\t\tif (!try_smi_init(e)) {\n+\t\t\t\tmutex_unlock(&smi_infos_lock);\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\t\/* Fall back to the preferred device *\/\n+\n+\tlist_for_each_entry(e, &smi_infos, link) {\n+\t\tif (!e->irq) {\n+\t\t\tif (!try_smi_init(e)) {\n+\t\t\t\tmutex_unlock(&smi_infos_lock);\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t}\n \t}\n \tmutex_unlock(&smi_infos_lock);\n \n"} {"commit":"ab534390603806b78d3d5e54a60a50fc0a6de3b5","subject":"Ensure unparsed entity handler gets set","message":"Ensure unparsed entity handler gets set\n\nRevise dummy handlers to flag when they are executed, and ensure\nthat they are executed in the test. Add XML to get the deprecated\nunparsed entity handler executed, and ensure that the allocation\ncheck fails each possible allocator in sequence despite the\ncaching of some allocations in the parser object.\n\nNOTE that this commit does not pass check because of an allocation\nbug.\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -127,6 +127,23 @@\n \/* Dummy handlers for when we need to set a handler to tickle a bug,\n but it doesn't need to do anything.\n *\/\n+static unsigned long dummy_handler_flags = 0;\n+\n+#define DUMMY_START_DOCTYPE_HANDLER_FLAG (1UL << 0)\n+#define DUMMY_END_DOCTYPE_HANDLER_FLAG (1UL << 1)\n+#define DUMMY_ENTITY_DECL_HANDLER_FLAG (1UL << 2)\n+#define DUMMY_NOTATION_DECL_HANDLER_FLAG (1UL << 3)\n+#define DUMMY_ELEMENT_DECL_HANDLER_FLAG (1UL << 4)\n+#define DUMMY_ATTLIST_DECL_HANDLER_FLAG (1UL << 5)\n+#define DUMMY_COMMENT_HANDLER_FLAG (1UL << 6)\n+#define DUMMY_PI_HANDLER_FLAG (1UL << 7)\n+#define DUMMY_START_ELEMENT_HANDLER_FLAG (1UL << 8)\n+#define DUMMY_START_CDATA_HANDLER_FLAG (1UL << 9)\n+#define DUMMY_END_CDATA_HANDLER_FLAG (1UL << 10)\n+#define DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG (1UL << 11)\n+#define DUMMY_START_NS_DECL_HANDLER_FLAG (1UL << 12)\n+#define DUMMY_END_NS_DECL_HANDLER_FLAG (1UL << 13)\n+\n \n static void XMLCALL\n dummy_start_doctype_handler(void *UNUSED_P(userData),\n@@ -134,11 +151,15 @@\n const XML_Char *UNUSED_P(sysid),\n const XML_Char *UNUSED_P(pubid),\n int UNUSED_P(has_internal_subset))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_START_DOCTYPE_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_end_doctype_handler(void *UNUSED_P(userData))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_END_DOCTYPE_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_entity_decl_handler(void *UNUSED_P(userData),\n@@ -150,7 +171,9 @@\n const XML_Char *UNUSED_P(systemId),\n const XML_Char *UNUSED_P(publicId),\n const XML_Char *UNUSED_P(notationName))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_ENTITY_DECL_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_notation_decl_handler(void *UNUSED_P(userData),\n@@ -158,7 +181,9 @@\n const XML_Char *UNUSED_P(base),\n const XML_Char *UNUSED_P(systemId),\n const XML_Char *UNUSED_P(publicId))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_NOTATION_DECL_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_element_decl_handler(void *UNUSED_P(userData),\n@@ -170,6 +195,7 @@\n * with other handlers that require other userData.\n *\/\n XML_FreeContentModel(parser, model);\n+ dummy_handler_flags |= DUMMY_ELEMENT_DECL_HANDLER_FLAG;\n }\n \n static void XMLCALL\n@@ -179,20 +205,28 @@\n const XML_Char *UNUSED_P(att_type),\n const XML_Char *UNUSED_P(dflt),\n int UNUSED_P(isrequired))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_ATTLIST_DECL_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_comment_handler(void *UNUSED_P(userData), const XML_Char *UNUSED_P(data))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_COMMENT_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_pi_handler(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target), const XML_Char *UNUSED_P(data))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_PI_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_start_element(void *UNUSED_P(userData),\n const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_START_ELEMENT_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_end_element(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name))\n@@ -200,11 +234,15 @@\n \n static void XMLCALL\n dummy_start_cdata_handler(void *UNUSED_P(userData))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_START_CDATA_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_end_cdata_handler(void *UNUSED_P(userData))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_END_CDATA_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_cdata_handler(void *UNUSED_P(userData),\n@@ -216,12 +254,16 @@\n dummy_start_namespace_decl_handler(void *UNUSED_P(userData),\n const XML_Char *UNUSED_P(prefix),\n const XML_Char *UNUSED_P(uri))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_START_NS_DECL_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_end_namespace_decl_handler(void *UNUSED_P(userData),\n const XML_Char *UNUSED_P(prefix))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_END_NS_DECL_HANDLER_FLAG;\n+}\n \n \/* This handler is obsolete, but while the code exists we should\n * ensure that dealing with the handler is covered by tests.\n@@ -233,7 +275,9 @@\n const XML_Char *UNUSED_P(systemId),\n const XML_Char *UNUSED_P(publicId),\n const XML_Char *UNUSED_P(notationName))\n-{}\n+{\n+ dummy_handler_flags |= DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG;\n+}\n \n static void XMLCALL\n dummy_default_handler(void *UNUSED_P(userData),\n@@ -3551,6 +3595,10 @@\n dummy_end_namespace_decl_handler);\n triplet_start_flag = XML_FALSE;\n triplet_end_flag = XML_FALSE;\n+ XML_SetNamespaceDeclHandler(parser,\n+ dummy_start_namespace_decl_handler,\n+ dummy_end_namespace_decl_handler);\n+ dummy_handler_flags = 0;\n if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n XML_FALSE) == XML_STATUS_ERROR)\n xml_failure(parser);\n@@ -3563,6 +3611,9 @@\n xml_failure(parser);\n if (!triplet_end_flag)\n fail(\"triplet_end_checker not invoked\");\n+ if (dummy_handler_flags != (DUMMY_START_NS_DECL_HANDLER_FLAG |\n+ DUMMY_END_NS_DECL_HANDLER_FLAG))\n+ fail(\"Namespace handlers not called\");\n }\n END_TEST\n \n@@ -4722,24 +4773,30 @@\n \"<!DOCTYPE doc [\\n\"\n \"<!ENTITY e SYSTEM 'http:\/\/xml.libexpat.org\/e'>\\n\"\n \"<!NOTATION n SYSTEM 'http:\/\/xml.libexpat.org\/n'>\\n\"\n- \"<!ELEMENT doc EMPTY>\\n\"\n+ \"<!ENTITY e1 SYSTEM 'http:\/\/xml.libexpat.org\/e' NDATA n>\\n\"\n+ \"<!ELEMENT doc (#PCDATA)>\\n\"\n \"<!ATTLIST doc a CDATA #IMPLIED>\\n\"\n \"<?pi in dtd?>\\n\"\n \"<!--comment in dtd-->\\n\"\n- \"]><doc\/>\";\n- const char *expected = \"\\n\\n\\n\\n\\n\\n\\n<doc\/>\";\n+ \"]>\\n\"\n+ \"<doc><![CDATA[text in doc]]><\/doc>\";\n+ const char *expected = \"\\n\\n\\n\\n\\n\\n\\n\\n\\n<doc>text in doc<\/doc>\";\n CharData storage;\n int i;\n+#define MAX_ALLOC_COUNT 15\n int repeat = 0;\n \n- for (i = 0; i < 10; i++) {\n+ for (i = 0; i < MAX_ALLOC_COUNT; i++) {\n \/* Repeat some counts to catch cached allocations *\/\n if ((repeat < 4 && i == 2) ||\n- (repeat == 4 && i == 3)) {\n+ (repeat == 4 && i == 4) ||\n+ (repeat == 5 && i == 5) ||\n+ (repeat == 6 && i == 8)) {\n i--;\n repeat++;\n }\n allocation_count = i;\n+ dummy_handler_flags = 0;\n XML_SetDefaultHandler(parser, accumulate_characters);\n XML_SetDoctypeDeclHandler(parser,\n dummy_start_doctype_handler,\n@@ -4764,14 +4821,25 @@\n break;\n XML_ParserReset(parser, NULL);\n }\n- if (i == 0) {\n+ if (i == 0)\n fail(\"Default DTD parsed despite allocation failures\");\n- } else if (i == 10) {\n- fail(\"Default DTD not parsed with alloc count 10\");\n- } else {\n- CharData_CheckXMLChars(&storage, expected);\n- }\n-}\n+ if (i == MAX_ALLOC_COUNT)\n+ fail(\"Default DTD not parsed with maximum alloc count\");\n+ CharData_CheckXMLChars(&storage, expected);\n+ if (dummy_handler_flags != (DUMMY_START_DOCTYPE_HANDLER_FLAG |\n+ DUMMY_END_DOCTYPE_HANDLER_FLAG |\n+ DUMMY_ENTITY_DECL_HANDLER_FLAG |\n+ DUMMY_NOTATION_DECL_HANDLER_FLAG |\n+ DUMMY_ELEMENT_DECL_HANDLER_FLAG |\n+ DUMMY_ATTLIST_DECL_HANDLER_FLAG |\n+ DUMMY_COMMENT_HANDLER_FLAG |\n+ DUMMY_PI_HANDLER_FLAG |\n+ DUMMY_START_CDATA_HANDLER_FLAG |\n+ DUMMY_END_CDATA_HANDLER_FLAG |\n+ DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG))\n+ fail(\"Not all handlers were called\");\n+}\n+#undef MAX_ALLOC_COUNT\n END_TEST\n \n \/* Test robustness of XML_SetEncoding() with a failing allocator *\/\n"} {"commit":"e391423b415ea591dfd9c306508330e4d2be5484","subject":"Don't leak paths","message":"Don't leak paths\n","repos":"Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-log-window.c\n+++ libempathy-gtk\/empathy-log-window.c\n@@ -1010,6 +1010,7 @@\n \n *dates = g_list_append (*dates, date);\n }\n+ g_list_free_full (paths, (GDestroyNotify) gtk_tree_path_free);\n }\n \n if (event_mask != NULL)\n"} {"commit":"186a1de625cec649745e296698f1c3b435ddfd0a","subject":"common\/iavf: clean up compatibility layer","message":"common\/iavf: clean up compatibility layer\n\nRemove the unused definitions, rewrite the IO data read\/write helpers,\nand put the common definitions related to RTE defines under the macro\n__INTEL_NET_BASE_OSDEP__, so it works like OS(RTE) dependency.\n\nSigned-off-by: Haiyue Wang <037d5f2d0d83548aebdad8ba0c69c0b30ec44c86@intel.com>\nAcked-by: Xiaolong Ye <c7d6fc2f7e22da80deb234d523238b510a8c0f08@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/common\/iavf\/iavf_osdep.h\n+++ drivers\/common\/iavf\/iavf_osdep.h\n@@ -21,24 +21,20 @@\n #include <rte_log.h>\n #include <rte_io.h>\n \n+#ifndef __INTEL_NET_BASE_OSDEP__\n+#define __INTEL_NET_BASE_OSDEP__\n+\n #define INLINE inline\n #define STATIC static\n \n typedef uint8_t u8;\n typedef int8_t s8;\n typedef uint16_t u16;\n+typedef int16_t s16;\n typedef uint32_t u32;\n typedef int32_t s32;\n typedef uint64_t u64;\n-\n-#define __iomem\n-#define hw_dbg(hw, S, A...) do {} while (0)\n-#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16))\n-#define lower_32_bits(n) ((u32)(n))\n-\n-#ifndef ETH_ADDR_LEN\n-#define ETH_ADDR_LEN 6\n-#endif\n+typedef uint64_t s64;\n \n #ifndef __le16\n #define __le16 uint16_t\n@@ -59,16 +55,11 @@\n #define __be64 uint64_t\n #endif\n \n-#define FALSE 0\n-#define TRUE 1\n-#define false 0\n-#define true 1\n+#define min(a, b) RTE_MIN(a, b)\n+#define max(a, b) RTE_MAX(a, b)\n \n-#define min(a,b) RTE_MIN(a,b)\n-#define max(a,b) RTE_MAX(a,b)\n-\n-#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))\n-#define ASSERT(x) if(!(x)) rte_panic(\"IAVF: x\")\n+#define FIELD_SIZEOF(t, f) RTE_SIZEOF_FIELD(t, f)\n+#define ARRAY_SIZE(arr) RTE_DIM(arr)\n \n #define CPU_TO_LE16(o) rte_cpu_to_le_16(o)\n #define CPU_TO_LE32(s) rte_cpu_to_le_32(s)\n@@ -77,12 +68,51 @@\n #define LE32_TO_CPU(c) rte_le_to_cpu_32(c)\n #define LE64_TO_CPU(k) rte_le_to_cpu_64(k)\n \n-#define cpu_to_le16(o) rte_cpu_to_le_16(o)\n-#define cpu_to_le32(s) rte_cpu_to_le_32(s)\n-#define cpu_to_le64(h) rte_cpu_to_le_64(h)\n-#define le16_to_cpu(a) rte_le_to_cpu_16(a)\n-#define le32_to_cpu(c) rte_le_to_cpu_32(c)\n-#define le64_to_cpu(k) rte_le_to_cpu_64(k)\n+#define CPU_TO_BE16(o) rte_cpu_to_be_16(o)\n+#define CPU_TO_BE32(o) rte_cpu_to_be_32(o)\n+#define CPU_TO_BE64(o) rte_cpu_to_be_64(o)\n+\n+#define NTOHS(a) rte_be_to_cpu_16(a)\n+#define NTOHL(a) rte_be_to_cpu_32(a)\n+#define HTONS(a) rte_cpu_to_be_16(a)\n+#define HTONL(a) rte_cpu_to_be_32(a)\n+\n+static __rte_always_inline uint32_t\n+readl(volatile void *addr)\n+{\n+\treturn rte_le_to_cpu_32(rte_read32(addr));\n+}\n+\n+static __rte_always_inline void\n+writel(uint32_t value, volatile void *addr)\n+{\n+\trte_write32(rte_cpu_to_le_32(value), addr);\n+}\n+\n+static __rte_always_inline void\n+writel_relaxed(uint32_t value, volatile void *addr)\n+{\n+\trte_write32_relaxed(rte_cpu_to_le_32(value), addr);\n+}\n+\n+static __rte_always_inline uint64_t\n+readq(volatile void *addr)\n+{\n+\treturn rte_le_to_cpu_64(rte_read64(addr));\n+}\n+\n+static __rte_always_inline void\n+writeq(uint64_t value, volatile void *addr)\n+{\n+\trte_write64(rte_cpu_to_le_64(value), addr);\n+}\n+\n+#define wr32(a, reg, value) writel((value), (a)->hw_addr + (reg))\n+#define rd32(a, reg) readl((a)->hw_addr + (reg))\n+#define wr64(a, reg, value) writeq((value), (a)->hw_addr + (reg))\n+#define rd64(a, reg) readq((a)->hw_addr + (reg))\n+\n+#endif \/* __INTEL_NET_BASE_OSDEP__ *\/\n \n #define iavf_memset(a, b, c, d) memset((a), (b), (c))\n #define iavf_memcpy(a, b, c, d) rte_memcpy((a), (b), (c))\n@@ -90,32 +120,13 @@\n #define iavf_usec_delay(x) rte_delay_us_sleep(x)\n #define iavf_msec_delay(x) iavf_usec_delay(1000 * (x))\n \n-#define IAVF_PCI_REG(reg)\t\trte_read32(reg)\n-#define IAVF_PCI_REG_ADDR(a, reg) \\\n-\t((volatile uint32_t *)((char *)(a)->hw_addr + (reg)))\n+#define IAVF_PCI_REG_WRITE(reg, value) writel(value, reg)\n+#define IAVF_PCI_REG_WRITE_RELAXED(reg, value) writel_relaxed(value, reg)\n \n-#define IAVF_PCI_REG_WRITE(reg, value)\t\t\\\n-\trte_write32((rte_cpu_to_le_32(value)), reg)\n-#define IAVF_PCI_REG_WRITE_RELAXED(reg, value)\t\\\n-\trte_write32_relaxed((rte_cpu_to_le_32(value)), reg)\n-static inline\n-uint32_t iavf_read_addr(volatile void *addr)\n-{\n-\treturn rte_le_to_cpu_32(IAVF_PCI_REG(addr));\n-}\n+#define IAVF_READ_REG(hw, reg) rd32(hw, reg)\n+#define IAVF_WRITE_REG(hw, reg, value) wr32(hw, reg, value)\n \n-#define IAVF_READ_REG(hw, reg) \\\n-\tiavf_read_addr(IAVF_PCI_REG_ADDR((hw), (reg)))\n-#define IAVF_WRITE_REG(hw, reg, value) \\\n-\tIAVF_PCI_REG_WRITE(IAVF_PCI_REG_ADDR((hw), (reg)), (value))\n-#define IAVF_WRITE_FLUSH(a) \\\n-\tIAVF_READ_REG(a, IAVF_VFGEN_RSTAT)\n-\n-#define rd32(a, reg) iavf_read_addr(IAVF_PCI_REG_ADDR((a), (reg)))\n-#define wr32(a, reg, value) \\\n-\tIAVF_PCI_REG_WRITE(IAVF_PCI_REG_ADDR((a), (reg)), (value))\n-\n-#define ARRAY_SIZE(arr) (sizeof(arr)\/sizeof(arr[0]))\n+#define IAVF_WRITE_FLUSH(a) IAVF_READ_REG(a, IAVF_VFGEN_RSTAT)\n \n extern int iavf_common_logger;\n \n"} {"commit":"b6b53fe875f140605edc141b94b8ede4c244c0c2","subject":"Fix for hostname","message":"Fix for hostname\n","repos":"dm\/gearmand,beeksiwaais\/gearmand,dm\/gearmand,dm\/gearmand,beeksiwaais\/gearmand,dm\/gearmand,beeksiwaais\/gearmand,beeksiwaais\/gearmand","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libgearman-server\/struct\/gearmand.h\n+++ libgearman-server\/struct\/gearmand.h\n@@ -93,7 +93,7 @@\n thread_add_next(NULL),\n free_dcon_list(NULL)\n {\n- if (host)\n+ if (host_)\n {\n host= strdup(host_);\n }\n"} {"commit":"9640d19a1f1f6687d37ff7ffc18ff11aeb762e5e","subject":"Default module name is \".MAIN.\".","message":"Default module name is \".MAIN.\".\n","repos":"Rhialto\/macro11,Rhialto\/macro11,Rhialto\/macro11","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- macro11.c\n+++ macro11.c\n@@ -300,7 +300,7 @@\n \n text_init(&tr, NULL, 0);\n \n- module_name = memcheck(strdup(\"\"));\n+ module_name = memcheck(strdup(\".MAIN.\"));\n \n xfer_address = new_ex_lit(1); \/* The undefined transfer address *\/\n \n"} {"commit":"312432fe6b5a40c01c4626e80af1be6518771af1","subject":"Fix build of Objective-C++ files with new clang versions.","message":"Fix build of Objective-C++ files with new clang versions.\n","repos":"osamu0329nakamura\/googletest,old8xp\/googletest-from-google,Perfexion\/googletest,Perfexion\/googletest,osamu0329nakamura\/googletest,old8xp\/googletest-from-google,gclone\/googletest,osamu0329nakamura\/googletest,old8xp\/googletest-from-google,BeeswaxIO\/googletest,gclone\/googletest,dpull\/googletest,dpull\/googletest,gclone\/googletest,BeeswaxIO\/googletest,BeeswaxIO\/googletest,Perfexion\/googletest,dpull\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -498,6 +498,11 @@\n # define _HAS_EXCEPTIONS 1\n # endif \/\/ _HAS_EXCEPTIONS\n # define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS\n+# elif defined(__clang__)\n+\/\/ __EXCEPTIONS determines if cleanups are enabled. In Obj-C++ files, there can\n+\/\/ be cleanups for ObjC exceptions, but C++ exceptions might still be disabled.\n+\/\/ So use a __has_feature check for C++ exceptions instead.\n+# define GTEST_HAS_EXCEPTIONS __has_feature(cxx_exceptions)\n # elif defined(__GNUC__) && __EXCEPTIONS\n \/\/ gcc defines __EXCEPTIONS to 1 iff exceptions are enabled.\n # define GTEST_HAS_EXCEPTIONS 1\n"} {"commit":"5e88bb0da2524866d46912042fe4c802ce6349bf","subject":"Math: less strict precision for comparing floats.","message":"Math: less strict precision for comparing floats.\n\nNow the viewer example is usable again.\n","repos":"MiUishadow\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,DerThorsten\/magnum,DerThorsten\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,DerThorsten\/magnum,MiUishadow\/magnum,DerThorsten\/magnum,ashimidashajia\/magnum,DerThorsten\/magnum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Magnum\/Math\/TypeTraits.h\n+++ src\/Magnum\/Math\/TypeTraits.h\n@@ -35,7 +35,7 @@\n \n \/** @brief Precision when testing floats for equality *\/\n #ifndef FLOAT_EQUALITY_PRECISION\n-#define FLOAT_EQUALITY_PRECISION 1.0e-6f\n+#define FLOAT_EQUALITY_PRECISION 1.0e-5f\n #endif\n \n \/** @brief Precision when testing doubles for equality *\/\n"} {"commit":"4dbde83d47db992ad06cd8c3ad672c0d725b142a","subject":"invalid_area\u6210\u5458\u6539\u7528LCUI_RectQueue\u7c7b\u578b","message":"invalid_area\u6210\u5458\u6539\u7528LCUI_RectQueue\u7c7b\u578b\n","repos":"lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/LCUI\/LCUI_Widget.h\n+++ include\/LCUI\/LCUI_Widget.h\n@@ -152,7 +152,7 @@\n \tLCUI_Queue child;\t\t\/* \u5b50\u90e8\u4ef6\u96c6 *\/\r\n \tLCUI_Queue event;\t\t\/* \u4fdd\u5b58\u90e8\u4ef6\u7684\u4e8b\u4ef6\u5173\u8054\u7684\u6570\u636e *\/\r\n \tLCUI_Queue update_buff;\t\t\/* \u8bb0\u5f55\u5b50\u90e8\u4ef6\u9700\u8981\u8fdb\u884c\u66f4\u65b0\u7684\u6570\u636e *\/ \r\n-\tLCUI_Queue invalid_area;\t\/* \u8bb0\u5f55\u65e0\u6548\u533a\u57df *\/\r\n+\tLCUI_RectQueue invalid_area;\t\/* \u8bb0\u5f55\u65e0\u6548\u533a\u57df *\/\r\n \t\r\n \tWIDGET_STATE state;\t\/* \u90e8\u4ef6\u5f53\u524d\u72b6\u6001 *\/\r\n \tint valid_state;\t\/* \u5bf9\u90e8\u4ef6\u6709\u6548\u7684\u72b6\u6001 *\/\r\n@@ -201,6 +201,10 @@\n LCUI_EXPORT(LCUI_Queue*)\r\n Widget_GetChildList( LCUI_Widget *widget );\r\n \r\n+\/* \u83b7\u53d6\u90e8\u4ef6\u7684\u77e9\u5f62\u533a\u57df\u961f\u5217 *\/\r\n+LCUI_EXPORT(LCUI_RectQueue*)\r\n+Widget_GetInvalidAreaQueue( LCUI_Widget *widget );\r\n+\r\n LCUI_EXPORT(LCUI_Size)\r\n Widget_GetSize(LCUI_Widget *widget);\r\n \/* \u529f\u80fd\uff1a\u83b7\u53d6\u90e8\u4ef6\u7684\u5c3a\u5bf8 *\/ \r\n"} {"commit":"330647a9501fe8f93a8ae9361417e51ee0bebd7e","subject":"cpuidle: Ignore interval prediction result when timer is shorter","message":"cpuidle: Ignore interval prediction result when timer is shorter\n\nThis patch prevents cpuidle menu governor from using repeating interval\nprediction result if the idle period predicted is longer than the one\nallowed by shortest running timer.\n\nSigned-off-by: Tuukka Tikkanen <43fc4de20078a3cb47bd11cd83c602ec6b51a993@linaro.org>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpuidle\/governors\/menu.c\n+++ drivers\/cpuidle\/governors\/menu.c\n@@ -238,10 +238,13 @@\n \t *\n \t * The typical interval is obtained when standard deviation is small\n \t * or standard deviation is small compared to the average interval.\n+\t *\n+\t * Use this result only if there is no timer to wake us up sooner.\n \t *\/\n \tif (((avg > stddev * 6) && (divisor * 4 >= INTERVALS * 3))\n \t\t\t\t\t\t\t|| stddev <= 20) {\n-\t\tdata->predicted_us = avg;\n+\t\tif (data->expected_us > avg)\n+\t\t\tdata->predicted_us = avg;\n \t\treturn;\n \n \t} else if ((divisor * 4) > INTERVALS * 3) {\n"} {"commit":"50d59d0d44ec9ed4a8f5a80ec4cdf5958bd44b18","subject":"Make test_alloc_realloc_nested_groups() robust vs allocation changes","message":"Make test_alloc_realloc_nested_groups() robust vs allocation changes\n","repos":"libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat,libexpat\/libexpat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- expat\/tests\/runtests.c\n+++ expat\/tests\/runtests.c\n@@ -9406,7 +9406,9 @@\n if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),\n XML_TRUE) != XML_STATUS_ERROR)\n break;\n- XML_ParserReset(parser, NULL);\n+ \/* See comment in test_alloc_parse_xdecl() *\/\n+ alloc_teardown();\n+ alloc_setup();\n }\n \n if (i == 0)\n"} {"commit":"1535bb1c6406efc6bfafe6dadb6a2c692e5912c5","subject":"tab -> spaces","message":"tab -> spaces\n","repos":"cention-nazri\/monit,Nejuf\/monit,Metaswitch\/clearwater-monit,cention-nazri\/monit,DmitryMyadzelets\/monit,skynet\/monit,AsydSolutions\/monit,AsydSolutions\/monit,GaiaMagic\/monit,Nejuf\/monit,Metaswitch\/clearwater-monit,DmitryMyadzelets\/monit,ClearwaterCore\/clearwater-monit,cention-nazri\/monit,DmitryMyadzelets\/monit,kemadz\/monit,GaiaMagic\/monit,skynet\/monit,ClearwaterCore\/clearwater-monit,AsydSolutions\/monit,ClearwaterCore\/clearwater-monit,Nejuf\/monit,kemadz\/monit,kemadz\/monit,GaiaMagic\/monit,Metaswitch\/clearwater-monit,skynet\/monit","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- libmonit\/src\/system\/NetStatistics.c\n+++ libmonit\/src\/system\/NetStatistics.c\n@@ -548,7 +548,7 @@\n const char *interface = S->resolve(S->object);\n perfstat_id_t id;\n perfstat_netinterface_t buf;\n-\tsnprintf(id.name, sizeof(id.name), interface);\n+ snprintf(id.name, sizeof(id.name), interface);\n if (perfstat_netinterface(&id, &buf, sizeof(buf), 1) != 1)\n THROW(AssertException, \"Cannot get perfstat data for %s -- %s\", interface, System_getError(errno));\n S->ipackets.last = S->ipackets.now;\n"} {"commit":"49c611b5900fbc1a88b7dd59eb42458c090b25d0","subject":"tests\/gem_reset_stats: run non hw context tests also on older gens","message":"tests\/gem_reset_stats: run non hw context tests also on older gens\n\nTo gain more coverage on interface, default context and banning.\nAs there is no proper reset support for gen <= 3, we only\ndo limited interface testing on those.\n\nSigned-off-by: Mika Kuoppala <cd221c71e765d1ce593d15b204fee351fb09fd98@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"erikarn\/intel-gpu-tools,mv0\/intel-gpu-tools,mv0\/intel-gpu-tools,tiagovignatti\/intel-gpu-tools,tiagovignatti\/intel-gpu-tools,mv0\/intel-gpu-tools,dlespiau\/checkmate-test-igt,mv0\/intel-gpu-tools,rib\/intel-gpu-tools,tiagovignatti\/intel-gpu-tools,yipdw\/intel-gpu-tools,chenxianqin\/intel-gpu-tools,chenxianqin\/intel-gpu-tools,yipdw\/intel-gpu-tools,erikarn\/intel-gpu-tools,rib\/intel-gpu-tools,chenxianqin\/intel-gpu-tools,dlespiau\/checkmate-test-igt,tiagovignatti\/intel-gpu-tools,yipdw\/intel-gpu-tools,rib\/intel-gpu-tools,erikarn\/intel-gpu-tools,rib\/intel-gpu-tools,dlespiau\/checkmate-test-igt,dlespiau\/checkmate-test-igt,yipdw\/intel-gpu-tools,erikarn\/intel-gpu-tools,chenxianqin\/intel-gpu-tools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/gem_reset_stats.c\n+++ tests\/gem_reset_stats.c\n@@ -52,6 +52,9 @@\n #define RS_BATCH_PENDING (1 << 1)\n #define RS_UNKNOWN (1 << 2)\n \n+static uint32_t devid;\n+static bool hw_contexts;\n+\n struct local_drm_i915_reset_stats {\n \t__u32 ctx_id;\n \t__u32 flags;\n@@ -102,6 +105,9 @@\n \n static bool has_context(const struct target_ring *ring)\n {\n+\tif (!hw_contexts)\n+\t\treturn false;\n+\n \tif(ring->exec == I915_EXEC_RENDER)\n \t\treturn true;\n \n@@ -278,7 +284,7 @@\n \n \tsrandom(time(NULL));\n \n-\tif (intel_gen(intel_get_drm_devid(fd)) >= 8)\n+\tif (intel_gen(devid) >= 8)\n \t\tcmd_len = 3;\n \n \tbuf = malloc(BUFSIZE);\n@@ -961,7 +967,7 @@\n \n typedef enum { root = 0, user } cap_t;\n \n-static void test_param_ctx(const int fd, const int ctx, const cap_t cap)\n+static void _check_param_ctx(const int fd, const int ctx, const cap_t cap)\n {\n \tconst uint32_t bad = rand() + 1;\n \n@@ -982,8 +988,7 @@\n \tigt_assert(ioctl(fd, GET_RESET_STATS_IOCTL, 0) == -1);\n \tigt_assert(_test_params(fd, 0xbadbad, 0, 0) == -ENOENT);\n \n-\ttest_param_ctx(fd, 0, cap);\n-\ttest_param_ctx(fd, ctx, cap);\n+\t_check_param_ctx(fd, ctx, cap);\n }\n \n static void _test_param(const int fd, const int ctx)\n@@ -1003,7 +1008,7 @@\n \tigt_waitchildren();\n }\n \n-static void test_params(void)\n+static void test_params_ctx(void)\n {\n \tint fd, ctx;\n \n@@ -1016,29 +1021,76 @@\n \tclose(fd);\n }\n \n-#define RING_HAS_CONTEXTS current_ring->contexts(current_ring)\n+static void test_params(void)\n+{\n+\tint fd;\n+\n+\tfd = drm_open_any();\n+\tigt_assert(fd >= 0);\n+\n+\t_test_param(fd, 0);\n+\n+\tclose(fd);\n+\n+}\n+\n+static bool gem_has_hw_contexts(int fd)\n+{\n+\tstruct local_drm_i915_gem_context_create create;\n+\tint ret;\n+\n+\tmemset(&create, 0, sizeof(create));\n+\tret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create);\n+\n+\tif (ret == 0) {\n+\t\tdrmIoctl(fd, CONTEXT_DESTROY_IOCTL, &create);\n+\t\treturn true;\n+\t}\n+\n+\treturn false;\n+}\n+\n+static bool gem_has_reset_stats(int fd)\n+{\n+\tstruct local_drm_i915_reset_stats rs;\n+\tint ret;\n+\n+\t\/* Carefully set flags and pad to zero, otherwise\n+\t we get -EINVAL\n+\t*\/\n+\tmemset(&rs, 0, sizeof(rs));\n+\n+\tret = drmIoctl(fd, GET_RESET_STATS_IOCTL, &rs);\n+\tif (ret == 0)\n+\t\treturn true;\n+\n+\t\/* If we get EPERM, we have support but did not\n+\t have CAP_SYSADM *\/\n+\tif (ret == -1 && errno == EPERM)\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n+#define RING_HAS_CONTEXTS (current_ring->contexts(current_ring))\n #define RUN_CTX_TEST(...) do { igt_skip_on(RING_HAS_CONTEXTS == false); __VA_ARGS__; } while (0)\n \n-int fd;\n+static int fd;\n \n igt_main\n {\n-\tstruct local_drm_i915_gem_context_create create;\n-\tuint32_t devid;\n-\tint ret;\n-\n \tigt_skip_on_simulation();\n \n \tigt_fixture {\n+\t\tbool has_reset_stats;\n \t\tfd = drm_open_any();\n \t\tdevid = intel_get_drm_devid(fd);\n-\t\tigt_require_f(intel_gen(devid) >= 4,\n-\t\t\t \"Architecture %d too old\\n\", intel_gen(devid));\n-\n-\t\tret = drmIoctl(fd, CONTEXT_CREATE_IOCTL, &create);\n-\t\tigt_skip_on_f(ret != 0 && (errno == ENODEV || errno == EINVAL),\n-\t\t\t \"Kernel is too old, or contexts not supported: %s\\n\",\n-\t\t\t strerror(errno));\n+\n+\t\thw_contexts = gem_has_hw_contexts(fd);\n+\t\thas_reset_stats = gem_has_reset_stats(fd);\n+\n+\t\tigt_require_f(has_reset_stats,\n+\t\t\t \"No reset stats ioctl support. Too old kernel?\\n\");\n \t}\n \n \tigt_subtest(\"params\")\n@@ -1052,6 +1104,13 @@\n \n \t\tigt_fixture\n \t\t\tgem_require_ring(fd, current_ring->exec);\n+\n+\t\tigt_fixture\n+\t\t\tigt_require_f(intel_gen(devid) >= 4,\n+\t\t\t\t \"gen %d doesn't support reset\\n\", intel_gen(devid));\n+\n+\t\tigt_subtest_f(\"params-ctx-%s\", name)\n+\t\t\tRUN_CTX_TEST(test_params_ctx());\n \n \t\tigt_subtest_f(\"reset-stats-%s\", name)\n \t\t\ttest_rs(4, 1, 0);\n"} {"commit":"3174bc5ccfea34717a8dac2175c1951239a4985d","subject":"mailmap: avoid out-of-bounds memory access","message":"mailmap: avoid out-of-bounds memory access\n\nAddressSanitizer (http:\/\/clang.llvm.org\/docs\/AddressSanitizer.html)\ncomplains of a one-byte buffer underflow in parse_name_and_email() while\nrunning the test suite. And indeed, if one of the lines in the mailmap\nbegins with '<', we dereference the address just before the beginning of\nthe buffer when looking for whitespace to remove, before checking that\nwe aren't going too far.\n\nSo reverse the order of the tests to make sure that we don't read\noutside the buffer.\n\nSigned-off-by: Romain Francoise <b8aabb4b95c817d9df69b6be95b2b94d6b1efe17@orebokech.com>\nSigned-off-by: Jeff King <696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mailmap.c\n+++ mailmap.c\n@@ -118,7 +118,7 @@\n \twhile (isspace(*nstart) && nstart < left)\n \t\t++nstart;\n \tnend = left-1;\n-\twhile (isspace(*nend) && nend > nstart)\n+\twhile (nend > nstart && isspace(*nend))\n \t\t--nend;\n \n \t*name = (nstart < nend ? nstart : NULL);\n"} {"commit":"4e4bbc792cdccebcfb30ce2df8ee6f39b2818aca","subject":"Rename ClassifyExpression -> ClassifyExpr","message":"Rename ClassifyExpression -> ClassifyExpr\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@10591 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Analysis\/Expressions.h\n+++ include\/llvm\/Analysis\/Expressions.h\n@@ -9,8 +9,8 @@\n \/\/\n \/\/ This file defines a package of expression analysis utilties:\n \/\/\n-\/\/ ClassifyExpression: Analyze an expression to determine the complexity of the\n-\/\/ expression, and which other variables it depends on. \n+\/\/ ClassifyExpr: Analyze an expression to determine the complexity of the\n+\/\/ expression, and which other variables it depends on.\n \/\/ \n \/\/===----------------------------------------------------------------------===\/\/\n \n@@ -25,10 +25,10 @@\n \n struct ExprType;\n \n-\/\/ ClassifyExpression: Analyze an expression to determine the complexity of the\n-\/\/ expression, and which other values it depends on. \n-\/\/\n-ExprType ClassifyExpression(Value *Expr);\n+\/\/\/ ClassifyExpr: Analyze an expression to determine the complexity of the\n+\/\/\/ expression, and which other values it depends on.\n+\/\/\/\n+ExprType ClassifyExpr(Value *Expr);\n \n \/\/ ExprType - Represent an expression of the form CONST*VAR+CONST\n \/\/ or simpler. The expression form that yields the least information about the\n"} {"commit":"e09f043f4b6669c17e8d86a904035fc51bca2858","subject":"missing =0 on flags","message":"missing =0 on flags\n","repos":"CopernicaMarketingSoftware\/AMQP-CPP,CopernicaMarketingSoftware\/AMQP-CPP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/amqpcpp\/reliable.h\n+++ include\/amqpcpp\/reliable.h\n@@ -250,7 +250,7 @@\n * @param size size of the message\n * @param flags optional flags\n *\/\n- DeferredPublish &publish(const std::string &exchange, const std::string &routingKey, const Envelope &envelope, int flags)\n+ DeferredPublish &publish(const std::string &exchange, const std::string &routingKey, const Envelope &envelope, int flags = 0)\n {\n \/\/ publish the entire thing, and remember if it failed at any point\n uint64_t tag = BASE::publish(exchange, routingKey, envelope, flags);\n"} {"commit":"939e33b7fcd4980f21ff4c9558eb27fe81d16cdb","subject":"cpuidle: Fix menu_device->intervals type","message":"cpuidle: Fix menu_device->intervals type\n\nStruct menu_device member intervals is declared as u32, but the value\nstored is (unsigned) int. The type is changed to match the value being\nstored.\n\nSigned-off-by: Tuukka Tikkanen <43fc4de20078a3cb47bd11cd83c602ec6b51a993@linaro.org>\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/cpuidle\/governors\/menu.c\n+++ drivers\/cpuidle\/governors\/menu.c\n@@ -118,7 +118,7 @@\n \tunsigned int\texit_us;\n \tunsigned int\tbucket;\n \tu64\t\tcorrection_factor[BUCKETS];\n-\tu32\t\tintervals[INTERVALS];\n+\tunsigned int\tintervals[INTERVALS];\n \tint\t\tinterval_ptr;\n };\n \n"} {"commit":"8b60428b0f20eff15e3c7529f3830d174a412c7c","subject":"Standardize name of global variable","message":"Standardize name of global variable\n","repos":"renatocf\/MAC0438-EP1","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/Omnium.c\n+++ src\/Omnium.c\n@@ -40,7 +40,7 @@\n \n int g_distance, g_num_cyclists, g_uniform;\n \n-pthread_barrier_t barrier;\n+pthread_barrier_t g_barrier;\n \n unsigned int g_turn = 0;\n \n@@ -100,11 +100,11 @@\n printf(\"thread[%d]: initial position = [%d,%d]!\\n\", id, position, place);\n \n \/* Start run! *\/\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n \n while (TRUE) {\n \/* Simulator processment *\/\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n \n \/* Exit conditions *\/\n if (g_turn == MAX_TURNS) break;\n@@ -113,7 +113,7 @@\n printf(\"thread[%d]: old position = %d!\\n\", id, position);\n position = speedway_advance_cyclist(g_speedway, id, position);\n printf(\"thread[%d]: new position = %d!\\n\", id, position);\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n }\n \n \/** End *********************************************************************\/\n@@ -131,7 +131,7 @@\n \/* Speedway *\/\n g_speedway = speedway_create(g_distance, CYCLISTS_PER_POSITION);\n \n- pthread_barrier_init (&barrier, NULL, g_num_cyclists + 1);\n+ pthread_barrier_init (&g_barrier, NULL, g_num_cyclists + 1);\n \n \/* Threads and barriers *\/\n threads = pthread_array_create(g_num_cyclists, perform_work, NULL);\n@@ -140,13 +140,13 @@\n \n \/* Start run! *\/\n printf(YELLOW \"race control:\" BLUE \" starting race!\" RES \"\\n\");\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n \n while (TRUE) {\n \/* Simulator processment *\/\n g_turn++;\n printf(YELLOW \"race control:\" RES \" turn %d\\n\", g_turn);\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n \n \/* Exit conditions *\/\n if (g_turn == MAX_TURNS) {\n@@ -155,7 +155,7 @@\n }\n \n \/* Cyclist processment *\/\n- pthread_barrier_wait(&barrier);\n+ pthread_barrier_wait(&g_barrier);\n }\n \n pthread_array_join(threads);\n"} {"commit":"6cac1a006cf6ffea9c2b28a416b232aae87876f5","subject":"Uses warnings instead of asserts to debug some error conditions","message":"Uses warnings instead of asserts to debug some error conditions\n\nin FileteaNode.\n","repos":"elima\/FileTea,elima\/FileTea","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- filetea\/filetea-node.c\n+++ filetea\/filetea-node.c\n@@ -541,7 +541,6 @@\n JsonNode *node;\n JsonArray *args;\n guint status;\n- gboolean notification_result;\n \n file_transfer_get_status (transfer, &status, NULL, NULL);\n \n@@ -552,23 +551,25 @@\n json_array_add_string_element (args, transfer->id);\n json_array_add_int_element (args, status);\n \n- notification_result =\n- evd_jsonrpc_send_notification (self->priv->rpc,\n- \"transfer-finished\",\n- node,\n- transfer->source->peer,\n- NULL);\n- g_assert (notification_result);\n-\n- if (transfer->target_peer != NULL)\n- {\n- notification_result =\n- evd_jsonrpc_send_notification (self->priv->rpc,\n+ if (! evd_jsonrpc_send_notification (self->priv->rpc,\n \"transfer-finished\",\n node,\n- transfer->target_peer,\n- NULL);\n- g_assert (notification_result);\n+ transfer->source->peer,\n+ NULL))\n+ {\n+ g_warning (\"Failed to send 'transfer-finished' notification to peer\");\n+ }\n+\n+ if (transfer->target_peer != NULL)\n+ {\n+ if (! evd_jsonrpc_send_notification (self->priv->rpc,\n+ \"transfer-finished\",\n+ node,\n+ transfer->target_peer,\n+ NULL))\n+ {\n+ g_warning (\"Failed to send 'transfer-finished' notification to peer\");\n+ }\n }\n \n json_array_unref (args);\n@@ -666,15 +667,14 @@\n \n if (json_array_get_length (args) > 0)\n {\n- gboolean notification_result;\n-\n- notification_result =\n- evd_jsonrpc_send_notification (self->priv->rpc,\n- \"transfer-status\",\n- node,\n- peer,\n- NULL);\n- g_assert (notification_result);\n+ if (! evd_jsonrpc_send_notification (self->priv->rpc,\n+ \"transfer-status\",\n+ node,\n+ peer,\n+ NULL))\n+ {\n+ g_warning (\"Failed to send 'transfer-status' notification to peer\");\n+ }\n }\n \n json_array_unref (args);\n@@ -784,7 +784,6 @@\n {\n JsonNode *node;\n JsonArray *args;\n- gboolean notification_result;\n \n file_transfer_set_source_conn (transfer, conn);\n file_transfer_start (transfer);\n@@ -804,13 +803,14 @@\n json_array_add_boolean_element (args, TRUE);\n \n \/* notify target *\/\n- notification_result =\n- evd_jsonrpc_send_notification (self->priv->rpc,\n- \"transfer-started\",\n- node,\n- transfer->target_peer,\n- NULL);\n- g_assert (notification_result);\n+ if (! evd_jsonrpc_send_notification (self->priv->rpc,\n+ \"transfer-started\",\n+ node,\n+ transfer->target_peer,\n+ NULL))\n+ {\n+ g_warning (\"Failed to send 'transfer-started' notification to peer\");\n+ }\n \n json_array_unref (args);\n json_node_free (node);\n"} {"commit":"56107b9be07ac9f4442c8b99c894023513b7d5e5","subject":"Fixed error handling that caused refcount on ret to be wrong (0 or -1).","message":"Fixed error handling that caused refcount on ret to be wrong (0 or -1).\n","repos":"numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libndarray\/src\/npy_item_selection.c\n+++ libndarray\/src\/npy_item_selection.c\n@@ -28,7 +28,8 @@\n }\n indices = NpyArray_ContiguousFromArray(indices0, NPY_INTP);\n if (indices == NULL) {\n- goto fail;\n+ Npy_XDECREF(self);\n+ return NULL;\n }\n n = m = chunk = 1;\n nd = self->nd + indices->nd - 1;\n"} {"commit":"35f4cf0474fd7346a34e5d2ccd73681832ce0cc5","subject":"Fixed some dependencies in RegAllocPBQP.h . Thanks to Borja Ferrer for pointing out this issue.","message":"Fixed some dependencies in RegAllocPBQP.h . Thanks to Borja Ferrer for pointing out this issue.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@121292 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,chubbymaggie\/asap,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/RegAllocPBQP.h\n+++ include\/llvm\/CodeGen\/RegAllocPBQP.h\n@@ -22,10 +22,11 @@\n #include \"llvm\/CodeGen\/PBQP\/Solution.h\"\n \n #include <map>\n+#include <set>\n \n namespace llvm {\n \n- class LiveInterval;\n+ class LiveIntervals;\n class MachineFunction;\n class MachineLoopInfo;\n \n"} {"commit":"5f5cd8fd60c71ce47d2ce4e60e7ccbc306e91c64","subject":"x86: add debug of invalid per_cpu map accesses","message":"x86: add debug of invalid per_cpu map accesses\n\ndont crash survivable situations.\n\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\nSigned-off-by: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-x86\/topology.h\n+++ include\/asm-x86\/topology.h\n@@ -66,14 +66,15 @@\n \n static inline int cpu_to_node(int cpu)\n {\n-#ifdef\tCONFIG_DEBUG_PER_CPU_MAPS\n-\tif(x86_cpu_to_node_map_early_ptr) {\n+#ifdef CONFIG_DEBUG_PER_CPU_MAPS\n+\tif (x86_cpu_to_node_map_early_ptr) {\n \t\tprintk(\"KERN_NOTICE cpu_to_node(%d): usage too early!\\n\",\n \t\t\t(int)cpu);\n-\t\tBUG();\n+\t\tdump_stack();\n+\t\treturn ((int *)x86_cpu_to_node_map_early_ptr)[cpu];\n \t}\n #endif\n-\tif(per_cpu_offset(cpu))\n+\tif (per_cpu_offset(cpu))\n \t\treturn per_cpu(x86_cpu_to_node_map, cpu);\n \telse\n \t\treturn NUMA_NO_NODE;\n"} {"commit":"2604951989faac3b8e7186da87e6382f5d99bc82","subject":"drivers: flash: Use dts to configure STM32 OSPI manager clock","message":"drivers: flash: Use dts to configure STM32 OSPI manager clock\n\nInstead of calling __HAL_RCC_OSPIM_CLK_ENABLE() to enable the OSPI\nmanager clock, we now use a new clock binding in the dts.\n\nIn order to avoid confusion between the different clocks, the driver\nis modified to select the clock based on their names instead of indexes.\n\nSigned-off-by: Guillaume Gautier <e28e80dbfe775b004d795f1da419a83f9db15384@st.com>\n","repos":"zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/flash\/flash_stm32_ospi.c\n+++ drivers\/flash\/flash_stm32_ospi.c\n@@ -80,10 +80,17 @@\n \n typedef void (*irq_config_func_t)(const struct device *dev);\n \n+#define STM32_OSPI_NODE DT_INST_PARENT(0)\n+\n struct flash_stm32_ospi_config {\n \tOCTOSPI_TypeDef *regs;\n-\tconst struct stm32_pclken *pclken; \/* clock subsystem *\/\n-\tsize_t pclk_len; \/* number of clock subsystems *\/\n+\tconst struct stm32_pclken pclken; \/* clock subsystem *\/\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_ker)\n+\tconst struct stm32_pclken pclken_ker; \/* clock subsystem *\/\n+#endif\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_mgr)\n+\tconst struct stm32_pclken pclken_mgr; \/* clock subsystem *\/\n+#endif\n \tirq_config_func_t irq_config;\n \tsize_t flash_size;\n \tuint32_t max_frequency;\n@@ -1720,32 +1727,39 @@\n \n \t\/* Clock configuration *\/\n \tif (clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n-\t\t\t (clock_control_subsys_t) &dev_cfg->pclken[0]) != 0) {\n+\t\t\t (clock_control_subsys_t) &dev_cfg->pclken) != 0) {\n \t\tLOG_ERR(\"Could not enable OSPI clock\");\n \t\treturn -EIO;\n \t}\n \t\/* Alternate clock config for peripheral if any *\/\n-\tif (dev_cfg->pclk_len > 1) {\n-\t\tif (clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n-\t\t\t\t\t(clock_control_subsys_t) &dev_cfg->pclken[1],\n-\t\t\t\t\tNULL) != 0) {\n-\t\t\tLOG_ERR(\"Could not select OSPI domain clock pclk[1]\");\n-\t\t\treturn -EIO;\n-\t\t}\n-\t\tif (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n-\t\t\t\t\t (clock_control_subsys_t) &dev_cfg->pclken[1],\n-\t\t\t\t\t &ahb_clock_freq) < 0) {\n-\t\t\tLOG_ERR(\"Failed call clock_control_get_rate(pclk[1])\");\n-\t\t\treturn -EIO;\n-\t\t}\n-\t} else {\n-\t\tif (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n-\t\t\t\t\t (clock_control_subsys_t) &dev_cfg->pclken[0],\n-\t\t\t\t\t &ahb_clock_freq) < 0) {\n-\t\t\tLOG_ERR(\"Failed call clock_control_get_rate(pclk[0])\");\n-\t\t\treturn -EIO;\n-\t\t}\n-\t}\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_ker)\n+\tif (clock_control_configure(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n+\t\t\t\t(clock_control_subsys_t) &dev_cfg->pclken_ker,\n+\t\t\t\tNULL) != 0) {\n+\t\tLOG_ERR(\"Could not select OSPI domain clock\");\n+\t\treturn -EIO;\n+\t}\n+\tif (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n+\t\t\t\t\t(clock_control_subsys_t) &dev_cfg->pclken_ker,\n+\t\t\t\t\t&ahb_clock_freq) < 0) {\n+\t\tLOG_ERR(\"Failed call clock_control_get_rate(pclken_ker)\");\n+\t\treturn -EIO;\n+\t}\n+#else\n+\tif (clock_control_get_rate(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n+\t\t\t\t\t(clock_control_subsys_t) &dev_cfg->pclken,\n+\t\t\t\t\t&ahb_clock_freq) < 0) {\n+\t\tLOG_ERR(\"Failed call clock_control_get_rate(pclken)\");\n+\t\treturn -EIO;\n+\t}\n+#endif\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_mgr)\n+\tif (clock_control_on(DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE),\n+\t\t\t (clock_control_subsys_t) &dev_cfg->pclken_mgr) != 0) {\n+\t\tLOG_ERR(\"Could not enable OSPI Manager clock\");\n+\t\treturn -EIO;\n+\t}\n+#endif\n \n \tfor (; prescaler <= STM32_OSPI_CLOCK_PRESCALER_MAX; prescaler++) {\n \t\tuint32_t clk = ahb_clock_freq \/ (prescaler + 1);\n@@ -1787,7 +1801,6 @@\n \t\/* OCTOSPI I\/O manager init Function *\/\n \tOSPIM_CfgTypeDef ospi_mgr_cfg = {0};\n \n-\t__HAL_RCC_OSPIM_CLK_ENABLE();\n \tif (dev_data->hospi.Instance == OCTOSPI1) {\n \t\tospi_mgr_cfg.ClkPort = 1;\n \t\tospi_mgr_cfg.DQSPort = 1;\n@@ -1962,16 +1975,20 @@\n \n static void flash_stm32_ospi_irq_config_func(const struct device *dev);\n \n-#define STM32_OSPI_NODE DT_INST_PARENT(0)\n-\n PINCTRL_DT_DEFINE(STM32_OSPI_NODE);\n-\n-static const struct stm32_pclken pclken_id[] = STM32_DT_CLOCKS(STM32_OSPI_NODE);\n \n static const struct flash_stm32_ospi_config flash_stm32_ospi_cfg = {\n \t.regs = (OCTOSPI_TypeDef *)DT_REG_ADDR(STM32_OSPI_NODE),\n-\t.pclken = pclken_id,\n-\t.pclk_len = DT_NUM_CLOCKS(STM32_OSPI_NODE),\n+\t.pclken = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospix, bus),\n+\t\t .enr = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospix, bits)},\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_ker)\n+\t.pclken_ker = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospi_ker, bus),\n+\t\t .enr = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospi_ker, bits)},\n+#endif\n+#if DT_CLOCKS_HAS_NAME(STM32_OSPI_NODE, ospi_mgr)\n+\t.pclken_mgr = {.bus = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospi_mgr, bus),\n+\t\t .enr = DT_CLOCKS_CELL_BY_NAME(STM32_OSPI_NODE, ospi_mgr, bits)},\n+#endif\n \t.irq_config = flash_stm32_ospi_irq_config_func,\n \t.flash_size = DT_INST_PROP(0, size) \/ 8U,\n \t.max_frequency = DT_INST_PROP(0, ospi_max_frequency),\n"} {"commit":"cc2c2ddf6c9183ee4aa158d2de743785d162c486","subject":"Improving comment.","message":"Improving comment.","repos":"benedictpaten\/marginPhase,benedictpaten\/marginPhase,benedictpaten\/marginPhase","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/marginPhaseTest.c\n+++ tests\/marginPhaseTest.c\n@@ -103,7 +103,7 @@\n }\n }\n \n- fprintf(fH, \"Avg. identity between profile sequences: %f measured at %\" PRIi64 \" overlapping sites\\n\",\n+ fprintf(fH, \"Avg. pairwise identity between profile sequences: %f measured at %\" PRIi64 \" overlapping sites\\n\",\n totalExpectedMatches\/totalAlignedPositions, totalAlignedPositions);\n }\n \n"} {"commit":"e54d3dbd7a8eb485eb8917d2b2a6809116052ff3","subject":"Updated platform status again","message":"Updated platform status again\n","repos":"f1nalspace\/final_game_tech,f1nalspace\/final_game_tech,f1nalspace\/final_game_tech","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"0059dd4dd1b567c79c05d781363e28da17088f0a","subject":"[PBQP] Remove a spurious 'typename' keyword. This was causing an error on MSVC.","message":"[PBQP] Remove a spurious 'typename' keyword. This was causing an error on MSVC.\n\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@220690 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/CodeGen\/RegAllocPBQP.h\n+++ include\/llvm\/CodeGen\/RegAllocPBQP.h\n@@ -137,7 +137,7 @@\n typedef ValuePool<AllowedRegVector> AllowedRegVecPool;\n public:\n \n- typedef typename AllowedRegVecPool::PoolRef AllowedRegVecRef;\n+ typedef AllowedRegVecPool::PoolRef AllowedRegVecRef;\n \n GraphMetadata(MachineFunction &MF,\n LiveIntervals &LIS,\n"} {"commit":"17117f306a4961da0928983789ba89650c3906c5","subject":"Bluetooth: Pre-allocated RFCOMM Channels","message":"Bluetooth: Pre-allocated RFCOMM Channels\n\nLimited number of RFCOMM channels(1-31). Pre-allocated\nfor profile use and to avoid conflicts.\n\nChange-Id: Ibd081435cf927aa7386161710e48b7371d20af24\nSigned-off-by: Sukumar Ghorai <9ac9eb0affa03a874cd76c24c336d23a89bf788c@intel.com>\n","repos":"mbolivar\/zephyr,ldts\/zephyr,rsalveti\/zephyr,erwango\/zephyr,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,pklazy\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,erwango\/zephyr,mbolivar\/zephyr,holtmann\/zephyr,Vudentz\/zephyr,zephyriot\/zephyr,sharronliu\/zephyr,erwango\/zephyr,runchip\/zephyr-cc3200,tidyjiang8\/zephyr-doc,bboozzoo\/zephyr,galak\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3220,galak\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,fbsder\/zephyr,holtmann\/zephyr,Vudentz\/zephyr,ldts\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,aceofall\/zephyr-iotos,aceofall\/zephyr-iotos,fractalclone\/zephyr-riscv,zephyrproject-rtos\/zephyr,holtmann\/zephyr,pklazy\/zephyr,ldts\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,finikorg\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,runchip\/zephyr-cc3220,rsalveti\/zephyr,finikorg\/zephyr,zephyriot\/zephyr,sharronliu\/zephyr,ldts\/zephyr,runchip\/zephyr-cc3220,bigdinotech\/zephyr,mbolivar\/zephyr,erwango\/zephyr,sharronliu\/zephyr,Vudentz\/zephyr,pklazy\/zephyr,fractalclone\/zephyr-riscv,bboozzoo\/zephyr,fractalclone\/zephyr-riscv,kraj\/zephyr,zephyriot\/zephyr,mbolivar\/zephyr,kraj\/zephyr,rsalveti\/zephyr,tidyjiang8\/zephyr-doc,fractalclone\/zephyr-riscv,finikorg\/zephyr,erwango\/zephyr,runchip\/zephyr-cc3220,punitvara\/zephyr,explora26\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,punitvara\/zephyr,bboozzoo\/zephyr,sharronliu\/zephyr,mbolivar\/zephyr,aceofall\/zephyr-iotos,nashif\/zephyr,nashif\/zephyr,pklazy\/zephyr,tidyjiang8\/zephyr-doc,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3200,kraj\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,zephyriot\/zephyr,fractalclone\/zephyr-riscv,galak\/zephyr,finikorg\/zephyr,nashif\/zephyr,nashif\/zephyr,fbsder\/zephyr,kraj\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,zephyriot\/zephyr,aceofall\/zephyr-iotos,fbsder\/zephyr,explora26\/zephyr,pklazy\/zephyr,holtmann\/zephyr,holtmann\/zephyr,bboozzoo\/zephyr,punitvara\/zephyr,sharronliu\/zephyr,GiulianoFranchetto\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,tidyjiang8\/zephyr-doc,zephyrproject-rtos\/zephyr,galak\/zephyr,explora26\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3200,nashif\/zephyr,galak\/zephyr,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/bluetooth\/rfcomm.h\n+++ include\/bluetooth\/rfcomm.h\n@@ -48,6 +48,14 @@\n #include <bluetooth\/log.h>\n #include <bluetooth\/buf.h>\n #include <bluetooth\/conn.h>\n+\n+\/* RFCOMM channels (1-31): pre-allocated for profiles to avoid conflicts *\/\n+enum {\n+\tBT_RFCOMM_CHAN_HFP_HF = 1,\n+\tBT_RFCOMM_CHAN_HFP_AG,\n+\tBT_RFCOMM_CHAN_HSP_AG,\n+\tBT_RFCOMM_CHAN_HSP_HS,\n+};\n \n struct bt_rfcomm_dlc;\n \n"} {"commit":"2ecad3e067a803ca6eb73447adc1eddf33dac5ed","subject":"Add complex type to Dump method","message":"Add complex type to Dump method\n","repos":"go-ski\/pbdADIOS,go-ski\/pbdADIOS,RBigData\/pbdADIOS,YupingLu\/pbdADIOS,RBigData\/pbdADIOS,YupingLu\/pbdADIOS,RBigData\/pbdADIOS,go-ski\/pbdADIOS,YupingLu\/pbdADIOS,RBigData\/pbdADIOS","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/R_dump.c\n+++ src\/R_dump.c\n@@ -222,27 +222,56 @@\n \/\/ Allocate R memory for the variable values\n switch(vi->type) {\n case adios_unsigned_byte:\n+ out = PROTECT(allocVector(INTSXP, nelems));\n+ break;\n case adios_byte:\n+ out = PROTECT(allocVector(INTSXP, nelems));\n+ break;\n+\n case adios_string:\n out = PROTECT(allocVector(STRSXP, nelems));\n break;\n+ case adios_string_array:\n+ \/\/ we expect one elemet of the array here\n+ out = PROTECT(allocVector(STRSXP, nelems));\n+ break;\n \n case adios_unsigned_short: \n+ out = PROTECT(allocVector(INTSXP, nelems));\n+ break;\n case adios_short:\n+ out = PROTECT(allocVector(INTSXP, nelems));\n+ break;\n+\n case adios_unsigned_integer:\n+ out = PROTECT(allocVector(INTSXP, nelems));\n+ break;\n case adios_integer: \n out = PROTECT(allocVector(INTSXP, nelems));\n break;\n \n case adios_unsigned_long:\n- case adios_long: \n+ out = PROTECT(allocVector(REALSXP, nelems));\n+ break;\n+ case adios_long:\n+ out = PROTECT(allocVector(REALSXP, nelems));\n+ break; \n+\n case adios_real:\n+ out = PROTECT(allocVector(REALSXP, nelems));\n+ break;\n case adios_double:\n out = PROTECT(allocVector(REALSXP, nelems));\n break;\n \n- \/\/case adios_complex: \n- \/\/case adios_double_complex:\n+ case adios_complex: \n+ out = PROTECT(allocVector(REALSXP, 2*nelems));\n+ break;\n+\n+ case adios_double_complex:\n+ out = PROTECT(allocVector(REALSXP, 2*nelems));\n+ break;\n+\n \/\/case adios_long_double: \/\/ do not know how to print\n \n default:\n@@ -338,41 +367,98 @@\n item = 0; \/\/ index to *data \n \/\/ loop through each data item and print value\n \n- switch(vi->type) {\n+ switch(vi->type) {\n case adios_unsigned_byte:\n+ while (item < steps) {\n+ INTEGER(out)[pos++] = ((uint8_t *)data)[item++];\n+ }\n+ break;\n case adios_byte:\n+ while (item < steps) {\n+ INTEGER(out)[pos++] = ((int8_t *)data)[item++];\n+ }\n+ break;\n+\n case adios_string:\n while (item < steps) {\n SET_STRING_ELT(out, pos++, mkChar((char *)data + item));\n item++;\n }\n break;\n+ case adios_string_array:\n+ \/\/ we expect one elemet of the array here\n+ while (item < steps) {\n+ SET_STRING_ELT(out, pos++, mkChar(*((char **)data + item)));\n+ item++;\n+ }\n+ break;\n \n case adios_unsigned_short: \n+ while (item < steps) {\n+ INTEGER(out)[pos++] = ((uint16_t *)data)[item++];\n+ }\n+ break;\n case adios_short:\n+ while (item < steps) {\n+ INTEGER(out)[pos++] = ((int16_t *)data)[item++];\n+ }\n+ break;\n+\n case adios_unsigned_integer:\n+ while (item < steps) {\n+ INTEGER(out)[pos++] = ((uint32_t *)data)[item++];\n+ }\n+ break;\n case adios_integer: \n while (item < steps) {\n- INTEGER(out)[pos++] = ((int *)data)[item++];\n+ INTEGER(out)[pos++] = ((int32_t *)data)[item++];\n }\n break;\n \n case adios_unsigned_long:\n- case adios_long: \n+ while (item < steps) {\n+ REAL(out)[pos++] = ((uint64_t *)data)[item++];\n+ }\n+ break;\n+ case adios_long:\n+ while (item < steps) {\n+ REAL(out)[pos++] = ((int64_t *)data)[item++];\n+ }\n+ break; \n+\n case adios_real:\n+ while (item < steps) {\n+ REAL(out)[pos++] = ((float *)data)[item++];\n+ }\n+ break;\n case adios_double:\n while (item < steps) {\n REAL(out)[pos++] = ((double *)data)[item++];\n }\n break;\n \n- \/\/case adios_complex: \n- \/\/case adios_double_complex:\n+ case adios_complex: \n+ while (item < steps) {\n+ REAL(out)[pos++] = ((float *)data)[item++];\n+ REAL(out)[pos++] = ((float *)data)[item++];\n+ }\n+ \/\/Rprintf(\"(%g,i%g)\", ((float *) data)[2*item], ((float *) data)[2*item+1]);\n+ break;\n+\n+ case adios_double_complex:\n+ while (item < steps) {\n+ REAL(out)[pos++] = ((double *)data)[item++];\n+ REAL(out)[pos++] = ((double *)data)[item++];\n+ }\n+ \/\/Rprintf(\"(%g,i%g)\", ((double *) data)[2*item], ((double *) data)[2*item+1]);\n+ break;\n+\n \/\/case adios_long_double: \/\/ do not know how to print\n \n default:\n break;\n }\n+\n \/**\n * end copying data to R memory\n *\/\n"} {"commit":"d439157d4f4fb5e37ff54f2644858881abfcd6c7","subject":"Linux compile fix with template specialization","message":"Linux compile fix with template specialization\n","repos":"OpenSpace\/OpenSpace,OpenSpace\/OpenSpace,OpenSpace\/OpenSpace,OpenSpace\/OpenSpace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/openspace\/util\/syncbuffer.h\n+++ include\/openspace\/util\/syncbuffer.h\n@@ -35,7 +35,18 @@\n \n \tSyncBuffer(size_t n);\n \n-\ttemplate<typename T>\n+ void encode(const std::string& s) {\n+ const size_t size = sizeof(char) * s.size() + sizeof(int32_t);\n+ assert(_encodeOffset + size < _n);\n+\n+ int32_t length = static_cast<int32_t>(s.length());\n+ memcpy(_dataStream.data() + _encodeOffset, reinterpret_cast<const char*>(&length), sizeof(int32_t));\n+ _encodeOffset += sizeof(int32_t);\n+ memcpy(_dataStream.data() + _encodeOffset, s.c_str(), length);\n+ _encodeOffset += length;\n+ }\n+\n+\ttemplate <typename T>\n \tvoid encode(const T& v) {\n \t\tconst size_t size = sizeof(T);\n \t\tassert(_encodeOffset + size < _n);\n@@ -44,19 +55,20 @@\n \t\t_encodeOffset += size;\n \t}\n \n-\ttemplate<>\n-\tvoid encode(const std::string& s) {\n-\t\tconst size_t size = sizeof(char) * s.size() + sizeof(int32_t);\n-\t\tassert(_encodeOffset + size < _n);\n+ std::string decode() {\n+ int32_t length;\n+ memcpy(reinterpret_cast<char*>(&length), _dataStream.data() + _decodeOffset, sizeof(int32_t));\n+ char* tmp = new char[length + 1];\n+ _decodeOffset += sizeof(int32_t);\n+ memcpy(tmp, _dataStream.data() + _decodeOffset, length);\n+ _decodeOffset += length;\n+ tmp[length] = '\\0';\n+ std::string ret(tmp);\n+ delete[] tmp;\n+ return ret;\n+ }\n \n-\t\tint32_t length = s.length();\n-\t\tmemcpy(_dataStream.data() + _encodeOffset, reinterpret_cast<const char*>(&length), sizeof(int32_t));\n-\t\t_encodeOffset += sizeof(int32_t);\n-\t\tmemcpy(_dataStream.data() + _encodeOffset, s.c_str(), length);\n-\t\t_encodeOffset += length;\n-\t}\n-\n-\ttemplate<typename T>\n+\ttemplate <typename T>\n \tT decode() {\n \t\tconst size_t size = sizeof(T);\n \t\tassert(_decodeOffset + size < _n);\n@@ -66,21 +78,11 @@\n \t\treturn value;\n \t}\n \n-\ttemplate<>\n-\tstd::string decode() {\n-\t\tint32_t length;\n-\t\tmemcpy(reinterpret_cast<char*>(&length), _dataStream.data() + _decodeOffset, sizeof(int32_t));\n-\t\tchar* tmp = new char[length + 1];\n-\t\t_decodeOffset += sizeof(int32_t);\n-\t\tmemcpy(tmp, _dataStream.data() + _decodeOffset, length);\n-\t\t_decodeOffset += length;\n-\t\ttmp[length] = '\\0';\n-\t\tstd::string ret(tmp);\n-\t\tdelete[] tmp;\n-\t\treturn ret;\n-\t}\n+ void decode(std::string& s) {\n+ s = decode<std::string>();\n+ }\n \n-\ttemplate<typename T>\n+\ttemplate <typename T>\n \tvoid decode(T& value) {\n \t\tconst size_t size = sizeof(T);\n \t\tassert(_decodeOffset + size < _n);\n@@ -88,12 +90,7 @@\n \t\t_decodeOffset += size;\n \t}\n \n-\ttemplate<>\n-\tvoid decode(std::string &s) {\n-\t\ts = decode<std::string>();\n-\t}\n-\n-\tvoid write();\n+ void write();\n \n \tvoid read();\n \n"} {"commit":"c4a26e7985bf58177407c75f733c45261e273bc8","subject":"fix a variable scope typo","message":"fix a variable scope typo\n","repos":"jacksondebuhr\/dashmm,jacksondebuhr\/dashmm,jacksondebuhr\/dashmm,jacksondebuhr\/dashmm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/builtins\/laplace.h\n+++ include\/builtins\/laplace.h\n@@ -1036,7 +1036,6 @@\n if (op == Operation::MtoI) {\n weight = 6;\n } else if (op == Operation::ItoI) {\n- int weight = 0;\n int dx = s.x() - 2 * t.x();\n int dy = s.y() - 2 * t.y();\n int dz = s.z() - 2 * t.z();\n"} {"commit":"5b5cdd43293c9258ce871fbd132cdc5a5a783ad7","subject":"Update TouchSenser.c","message":"Update TouchSenser.c","repos":"tamagosan\/Rubiks-Cube,tamagosan\/Rubiks-Cube","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- firmware\/TouchSenser.c\n+++ firmware\/TouchSenser.c\n@@ -1,3 +1,4 @@\n+\/\/PIC16F1827\n #include <xc.h>\n \n #define _XTAL_FREQ 32000000\n"} {"commit":"af3765c764ec1b3ce532d412be8843581bb94338","subject":"drm\/gma500: Code cleanup - removal of centralized exiting of function","message":"drm\/gma500: Code cleanup - removal of centralized exiting of function\n\nRemoved centralized exiting of function (goto statement), since it was\nthe only used in one single location with only a return statement.\n\nSigned-off-by: Arthur Borsboom <44950660ccca8c866b1866946ff6396eb5fc4781@gmail.com>\nSigned-off-by: Patrik Jakobsson <008fb8753319724d898adb107588b90fcdd891c6@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/gma500\/psb_drv.c\n+++ drivers\/gpu\/drm\/gma500\/psb_drv.c\n@@ -113,12 +113,9 @@\n \n \tuint32_t stolen_gtt;\n \n-\tint ret = -ENOMEM;\n-\n \tif (pg->mmu_gatt_start & 0x0FFFFFFF) {\n \t\tdev_err(dev->dev, \"Gatt must be 256M aligned. This is a bug.\\n\");\n-\t\tret = -EINVAL;\n-\t\tgoto out_err;\n+\t\treturn -EINVAL;\n \t}\n \n \n@@ -149,8 +146,6 @@\n \tPSB_RSGX32(PSB_CR_BIF_TWOD_REQ_BASE); \/* Post *\/\n \n \treturn 0;\n-out_err:\n-\treturn ret;\n }\n \n static int psb_driver_unload(struct drm_device *dev)\n"} {"commit":"eb0659d9036d4653ec65b4b9d0a898b39b248e91","subject":"update comm method","message":"update comm method\n","repos":"RBigData\/pbdADIOS,RBigData\/pbdADIOS,go-ski\/pbdADIOS,YupingLu\/pbdADIOS,RBigData\/pbdADIOS,RBigData\/pbdADIOS,YupingLu\/pbdADIOS,go-ski\/pbdADIOS,YupingLu\/pbdADIOS,go-ski\/pbdADIOS","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/R_read.c\n+++ src\/R_read.c\n@@ -361,7 +361,7 @@\n \/\/ get local istart and icount values\n uint64_t N = icount[tidx]; \/\/ total number to read in the largest dim\n uint64_t pos = 0; \/\/ the largest dim index\n- uint64_t load, base, rem, chunk, begin, ps;\n+ uint64_t load, base, rem, chunk, begin, p;\n \n for (j=1; j<(*vi)->ndim; j++) {\n if(N < icount[j+tidx]) {\n@@ -392,7 +392,7 @@\n }\n }else {\n load = 3;\n- ps = N \/ load;\n+ p = N \/ load;\n rem = N % p;\n \n if(rank < rem) {\n"} {"commit":"864c336978e975a038f04a8c16993108a77504fc","subject":"qp: use std::map instead of std::list for sparse arrays","message":"qp: use std::map instead of std::list for sparse arrays\n","repos":"chatziko\/libqif,chatziko\/libqif,chatziko\/libqif,chatziko\/libqif","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/qif_bits\/QuadraticProgram.h\n+++ include\/qif_bits\/QuadraticProgram.h\n@@ -2,7 +2,9 @@\n \n using std::string;\n \n-template<typename eT> using ME = std::tuple<uint,uint,eT>;\t\t\/\/ <row, col, val>\n+\/\/ Use a map <col, row> => value for sparse arrays. Put column first so that\n+\/\/ the lexicographic order used by map is top-to-bottom\/left-to-right\n+template<typename eT> using Sparse = std::map<std::pair<uint,uint>,eT>;\n \n enum class Status { OPTIMAL, INFEASIBLE, ERROR };\n enum class Method { ADDM };\n@@ -72,8 +74,8 @@\n \t\t\t n_con = 0;\t\t\t\t\t\t\t\/\/ number of constraints\n \n \t\tstd::vector<c_float> obj_coeff_lin;\t\t\/\/ coefficients for the objective function, linear part\n-\t\tstd::list<ME<eT>> obj_coeff_quad;\t\t\/\/ coefficients for the objective function, quadratic part\n-\t\tstd::list<ME<eT>> con_coeff;\t\t\t\/\/ coefficients for the constraints\n+\t\tSparse<eT> obj_coeff_quad;\t\t\t\t\/\/ coefficients for the objective function, quadratic part\n+\t\tSparse<eT> con_coeff;\t\t\t\t\t\/\/ coefficients for the constraints\n \t\tstd::vector<c_float> con_lb, con_ub;\t\/\/ constraints lower\/upper\n \n \t\tbool osqp();\n@@ -133,15 +135,11 @@\n \tif(equal<eT>(coeff, eT(0)))\n \t\treturn;\n \n-\tif(add) {\n-\t\t\/\/ SLOW\n-\t\tfor(auto& [row, col, val] : obj_coeff_quad)\n-\t\t\tif(row == var1 && col == var2) {\n-\t\t\t\tval += coeff;\n-\t\t\t\treturn;\n-\t\t\t}\n-\t}\n-\tobj_coeff_quad.push_back(std::tuple(var1, var2, coeff));\n+\tauto key = std::pair(var2, var1);\t\t\/\/ <col, row>\n+\tif(add && obj_coeff_quad.count(key))\n+\t\tobj_coeff_quad[key] += coeff;\n+\telse\n+\t\tobj_coeff_quad[key] = coeff;\n }\n \n template<typename eT>\n@@ -150,15 +148,11 @@\n \tif(equal<eT>(coeff, eT(0)))\n \t\treturn;\n \n-\tif(add) {\n-\t\t\/\/ SLOW\n-\t\tfor(auto& [row, col, val] : con_coeff)\n-\t\t\tif(row == con && col == var) {\n-\t\t\t\tval += coeff;\n-\t\t\t\treturn;\n-\t\t\t}\n-\t}\n-\tcon_coeff.push_back(std::tuple(con, var, coeff));\n+\tauto key = std::pair(var, con);\t\/\/ <col, row>\n+\tif(add && con_coeff.count(key))\n+\t\tcon_coeff[key] += coeff;\n+\telse\n+\t\tcon_coeff[key] = coeff;\n }\n \n template<typename eT>\n@@ -211,7 +205,7 @@\n }\n \n template<typename eT>\n-csc* to_csc(uint n_rows, uint n_cols, const std::list<ME<eT>>& entries) {\n+csc* to_csc(uint n_rows, uint n_cols, const Sparse<eT>& entries) {\n \t\/\/ Compressed Sparse Column (CSC) format.\n \t\/\/ https:\/\/en.wikipedia.org\/wiki\/Sparse_matrix#Compressed_sparse_column_(CSC_or_CCS)\n \t\/\/ val: array of non-zero values, in top-to-bottom, left-to-right order\n@@ -225,18 +219,11 @@\n \tc_int* row_ind = (c_int*) malloc(sizeof(c_int) * n_nonzero);\n \tc_int* col_ptr = (c_int*) malloc(sizeof(c_int) * n_cols + 1);\n \n-\t\/\/ put entries in a vector, to sort them to-to-bottom \/ left-to-right\n-\tstd::vector<ME<eT>> sorted(entries.begin(), entries.end());\n-\tstd::sort(sorted.begin(), sorted.end(), [](auto& a, auto& b) -> bool {\n-\t\tauto& [arow, acol, aval] = a;\n-\t\tauto& [brow, bcol, bval] = b;\n-\t\t(void)aval; (void)bval; \/\/ silence\n-\t\treturn (acol < bcol) || (acol == bcol && arow < brow);\n-\t}); \n-\n \tuint cur_col = 0;\n \tuint cnt = 0;\t\t\/\/ next to update\n-\tfor(auto& [row, col, value] : sorted) {\n+\tfor(auto& [key, value] : entries) {\n+\t\tauto& [col, row] = key;\n+\n \t\t\/\/ first time we see a column, update col_ptr\n \t\tfor(; cur_col <= col; cur_col++)\t\/\/ possibly update previous empty columns\n \t\t\tcol_ptr[cur_col] = cnt;\n"} {"commit":"94513be061ce4723cf23df878a761690c6baafad","subject":"formatter small cleanup","message":"formatter small cleanup\n","repos":"mihadyuk\/spdlog,hunter-packages\/spdlog,icylord\/spdlog,ksophocleous\/spdlog,GreatFruitOmsk\/spdlog,hunter-packages\/spdlog,hunter-packages\/spdlog,godbyk\/spdlog,icylord\/spdlog,mihadyuk\/spdlog,fcoulombe\/spdlog,icylord\/spdlog,gregoire-astruc\/spdlog,COMBINE-lab\/spdlog,simonhang\/spdlog,GamePad64\/spdlog,COMBINE-lab\/spdlog,godbyk\/spdlog,chenyu2202863\/spdlog,gnzlbg\/spdlog,mihadyuk\/spdlog,gnzlbg\/spdlog,gregoire-astruc\/spdlog,chenyu2202863\/spdlog,GamePad64\/spdlog,fcoulombe\/spdlog,GreatFruitOmsk\/spdlog,ksophocleous\/spdlog,godbyk\/spdlog,simonhang\/spdlog,COMBINE-lab\/spdlog","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/c11log\/formatter.h\n+++ include\/c11log\/formatter.h\n@@ -20,11 +20,7 @@\n \n class formatter\n {\n-public:\n- formatter() = default;\n- virtual ~formatter() = default;\n-\tformatter(const formatter&) = delete;\n-\tformatter& operator=(const formatter&) = delete;\n+public: \n virtual void format_header(const std::string& logger_name, level::level_enum level, const log_clock::time_point& tp, std::ostream& dest) = 0;\n };\n \n"} {"commit":"3d51278af91f8e96077dad3a4c1cc0b19fa8ca25","subject":"drm\/i915: Make ddi_clock_gate() HSW\/BDW specific","message":"drm\/i915: Make ddi_clock_gate() HSW\/BDW specific\n\nTurns out we were again way too naive and optimistic, of course things\nwill change.\n\nSigned-off-by: Damien Lespiau <64bd3cb94f359c1a3ce68dae5e26b40578526277@intel.com>\nSigned-off-by: Daniel Vetter <c1b6782c4af8f0673da8923a0702a1832e5940f4@ffwll.ch>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/i915\/intel_ddi.c\n+++ drivers\/gpu\/drm\/i915\/intel_ddi.c\n@@ -587,8 +587,8 @@\n \treturn (refclk * n * 100) \/ (p * r);\n }\n \n-void intel_ddi_clock_get(struct intel_encoder *encoder,\n-\t\t\t struct intel_crtc_config *pipe_config)\n+static void hsw_ddi_clock_get(struct intel_encoder *encoder,\n+\t\t\t struct intel_crtc_config *pipe_config)\n {\n \tstruct drm_i915_private *dev_priv = encoder->base.dev->dev_private;\n \tint link_clock = 0;\n@@ -641,6 +641,12 @@\n \t\t\t\t\t\t &pipe_config->dp_m_n);\n \telse\n \t\tpipe_config->adjusted_mode.crtc_clock = pipe_config->port_clock;\n+}\n+\n+void intel_ddi_clock_get(struct intel_encoder *encoder,\n+\t\t\t struct intel_crtc_config *pipe_config)\n+{\n+\thsw_ddi_clock_get(encoder, pipe_config);\n }\n \n static void\n@@ -1480,7 +1486,7 @@\n \t\tdev_priv->vbt.edp_bpp = pipe_config->pipe_bpp;\n \t}\n \n-\tintel_ddi_clock_get(encoder, pipe_config);\n+\thsw_ddi_clock_get(encoder, pipe_config);\n }\n \n static void intel_ddi_destroy(struct drm_encoder *encoder)\n"} {"commit":"afc6f4c62953a5c41fb1b264496c8ecd38d02459","subject":"Replacing a void * with cpUserDataPointer.","message":"Replacing a void * with cpUserDataPointer.\n","repos":"TukekeSoft\/Chipmunk2D,xuanloctn\/chipmunk-physics,TheCodez\/Chipmunk2D,slembcke\/Chipmunk2D,ycaihua\/Chipmunk2D,ewmailing\/Chipmunk2D,AntonioModer\/Chipmunk2D,spacelan\/Chipmunk2D,dipankar-das\/Chipmunk2D,DNESS\/Chipmunk2D,TukekeSoft\/Chipmunk2D,ycaihua\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,dipankar-das\/Chipmunk2D,viblo\/Chipmunk2D,spacelan\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,spacelan\/Chipmunk2D,dipankar-das\/Chipmunk2D,TukekeSoft\/Chipmunk2D,ycaihua\/Chipmunk2D,TheCodez\/Chipmunk2D,ycaihua\/Chipmunk2D,viblo\/Chipmunk2D,slembcke\/Chipmunk2D,ycaihua\/Chipmunk2D,xuanloctn\/chipmunk-physics,spacelan\/Chipmunk2D,dipankar-das\/Chipmunk2D,TheCodez\/Chipmunk2D,DNESS\/Chipmunk2D,xuanloctn\/chipmunk-physics,TheCodez\/Chipmunk2D,spacelan\/Chipmunk2D,DNESS\/Chipmunk2D,AntonioModer\/Chipmunk2D,lqefn\/Chipmunk2D,AntonioModer\/Chipmunk2D,lqefn\/Chipmunk2D,xuanloctn\/chipmunk-physics,kennethdmiller3\/Chipmunk-Physics,AntonioModer\/Chipmunk2D,ewmailing\/Chipmunk2D,AntonioModer\/Chipmunk2D,dipankar-das\/Chipmunk2D,viblo\/Chipmunk2D,TukekeSoft\/Chipmunk2D,xuanloctn\/chipmunk-physics,lqefn\/Chipmunk2D,ewmailing\/Chipmunk2D,slembcke\/Chipmunk2D,ewmailing\/Chipmunk2D,viblo\/Chipmunk2D,lqefn\/Chipmunk2D,DNESS\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,DNESS\/Chipmunk2D","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/chipmunk\/cpSpace.h\n+++ include\/chipmunk\/cpSpace.h\n@@ -30,14 +30,14 @@\n \/\/\/ Collision begin event function callback type.\n \/\/\/ Returning false from a begin callback causes the collision to be ignored until\n \/\/\/ the the separate callback is called when the objects stop colliding.\n-typedef cpBool (*cpCollisionBeginFunc)(cpArbiter *arb, cpSpace *space, void *data);\n+typedef cpBool (*cpCollisionBeginFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);\n \/\/\/ Collision pre-solve event function callback type.\n \/\/\/ Returning false from a pre-step callback causes the collision to be ignored until the next step.\n-typedef cpBool (*cpCollisionPreSolveFunc)(cpArbiter *arb, cpSpace *space, void *data);\n+typedef cpBool (*cpCollisionPreSolveFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);\n \/\/\/ Collision post-solve event function callback type.\n-typedef void (*cpCollisionPostSolveFunc)(cpArbiter *arb, cpSpace *space, void *data);\n+typedef void (*cpCollisionPostSolveFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);\n \/\/\/ Collision separate event function callback type.\n-typedef void (*cpCollisionSeparateFunc)(cpArbiter *arb, cpSpace *space, void *data);\n+typedef void (*cpCollisionSeparateFunc)(cpArbiter *arb, cpSpace *space, cpDataPointer userData);\n \n struct cpCollisionHandler {\n \tconst cpCollisionType typeA, typeB;\n@@ -45,7 +45,7 @@\n \tcpCollisionPreSolveFunc preSolveFunc;\n \tcpCollisionPostSolveFunc postSolveFunc;\n \tcpCollisionSeparateFunc separateFunc;\n-\tvoid *userData;\n+\tcpDataPointer userData;\n };\n \n \/\/\/ Basic Unit of Simulation in Chipmunk\n"} {"commit":"887a104dd098813d2dff4077462d0f31daa7c5e8","subject":"Fixed clang-tidy warning","message":"Fixed clang-tidy warning\n","repos":"hunter-packages\/spdlog,hunter-packages\/spdlog,hunter-packages\/spdlog","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/spdlog\/sinks\/ostream_sink.h\n+++ include\/spdlog\/sinks\/ostream_sink.h\n@@ -32,7 +32,9 @@\n sink::formatter_->format(msg, formatted);\n ostream_.write(formatted.data(), static_cast<std::streamsize>(formatted.size()));\n if (force_flush_)\n+ {\n ostream_.flush();\n+ }\n }\n \n void flush_() override\n"} {"commit":"7087e16286913b41ba9a5186360645b57b8508dd","subject":"drm\/radeon\/kms: preface warning printk with driver name","message":"drm\/radeon\/kms: preface warning printk with driver name\n\nThis just adds a little more info to the warning for old -ati\/mesa\nuserspaces.\n\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/r600_cs.c\n+++ drivers\/gpu\/drm\/radeon\/r600_cs.c\n@@ -562,7 +562,7 @@\n \t\t\t\t\t\treturn -EINVAL;\n \t\t\t\t\t}\n \t\t\t\t\tib[idx+1+i] = track->cb_color0_base_last;\n-\t\t\t\t\tprintk_once(KERN_WARNING \"You have old & broken userspace \"\n+\t\t\t\t\tprintk_once(KERN_WARNING \"radeon: You have old & broken userspace \"\n \t\t\t\t\t\t\"please consider updating mesa & xf86-video-ati\\n\");\n \t\t\t\t} else {\n \t\t\t\t\tr = r600_cs_packet_next_reloc(p, &reloc);\n"} {"commit":"3c1072d02776352e5c7c810bdb49eb3da3c639c0","subject":"use __BYTE_ORDER__ macro to detect endianness when available","message":"use __BYTE_ORDER__ macro to detect endianness when available\n\nBUG=skia:\n\nChange-Id: Iff27097c248a643319e930a6212c5a7155bd0064\nReviewed-on: https:\/\/skia-review.googlesource.com\/5280\nReviewed-by: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@chromium.org>\nCommit-Queue: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@chromium.org>\n","repos":"Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,rubenvb\/skia,google\/skia,google\/skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,google\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,google\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,HalCanary\/skia-hc,rubenvb\/skia,HalCanary\/skia-hc,google\/skia,google\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/core\/SkPreConfig.h\n+++ include\/core\/SkPreConfig.h\n@@ -72,7 +72,11 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)\n- #if defined(__sparc) || defined(__sparc__) || \\\n+ #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)\n+ #define SK_CPU_BENDIAN\n+ #elif defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)\n+ #define SK_CPU_LENDIAN\n+ #elif defined(__sparc) || defined(__sparc__) || \\\n defined(_POWER) || defined(__powerpc__) || \\\n defined(__ppc__) || defined(__hppa) || \\\n defined(__PPC__) || defined(__PPC64__) || \\\n"} {"commit":"110bdd93c8edb387a037156e0074f7f5241f1fe0","subject":"Fixed stdout_sinks","message":"Fixed stdout_sinks\n","repos":"hunter-packages\/spdlog,hunter-packages\/spdlog,hunter-packages\/spdlog","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/spdlog\/sinks\/stdout_sinks.h\n+++ include\/spdlog\/sinks\/stdout_sinks.h\n@@ -61,24 +61,24 @@\n template<typename Factory = default_factory>\n inline std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name)\n {\n- return Factory::template create<stdout_color_sink_mt>(logger_name);\n+ return Factory::template create<sinks::stdout_sink_mt>(logger_name);\n }\n \n template<typename Factory = default_factory>\n inline std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name)\n {\n- return Factory::template create<stdout_color_sink_mt>(logger_name);\n+ return Factory::template create<sinks::stdout_sink_st>(logger_name);\n }\n \n template<typename Factory = default_factory>\n inline std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name)\n {\n- return Factory::template create<stderr_color_sink_mt>(logger_name);\n+ return Factory::template create<sinks::stderr_sink_mt>(logger_name);\n }\n \n template<typename Factory = default_factory>\n inline std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name)\n {\n- return Factory::template create<stderr_logger_sink_mt>(logger_name);\n+ return Factory::template create<sinks::stderr_sink_st>(logger_name);\n }\n } \/\/ namespace spdlog\n"} {"commit":"541b6a7a69fadda82f313bd2176e7756db2b5b43","subject":"i2c-nforce2: The nForce2 can do block transactions","message":"i2c-nforce2: The nForce2 can do block transactions\n\nMy guess is that all the chips supported by this driver support block\ntransactions and reset, but for now we play it safe and only list the\nones for which this was actually tested.\n\nSigned-off-by: Jean Delvare <49ad6a9f5aa17024c23048df346d55bda6837e01@linux-fr.org>\nCc: Oleg Ryjkov <5c731ce51aa0c3c9c4bcca97fa0072a284cacaad@olegr.ca>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/i2c\/busses\/i2c-nforce2.c\n+++ drivers\/i2c\/busses\/i2c-nforce2.c\n@@ -351,6 +351,7 @@\n \tpci_set_drvdata(dev, smbuses);\n \n \tswitch(dev->device) {\n+\tcase PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS:\n \tcase PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SMBUS:\n \tcase PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS:\n \t\tsmbuses[0].blockops = 1;\n"} {"commit":"47e88218af1f25334d6a40df0d423994cdfe6b92","subject":"added include contact.h","message":"added include contact.h\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@2322 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/csphyzik\/phyziks.h\n+++ include\/csphyzik\/phyziks.h\n@@ -8,4 +8,4 @@\n #include \"csphyzik\/articula.h\"\n #include \"csphyzik\/linklist.h\"\n #include \"csphyzik\/ik.h\"\n-\n+#include \"csphyzik\/contact.h\"\n"} {"commit":"69ca2d771e4e709c5ae1125858e1246e77ef8b86","subject":"iio: adis16400: Report pressure channel scale","message":"iio: adis16400: Report pressure channel scale\n\nAdd the scale for the pressure channel, which is currently missing.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nFixes: 76ada52f7f5d (\"iio:adis16400: Add support for the adis16448\")\nCc: <d96e5b2dd07c1733b2b013bd82922c22baade37d@vger.kernel.org>\nSigned-off-by: Jonathan Cameron <09f65b71b7655725897b2fd41a09a0cefe2e1ace@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/iio\/imu\/adis16400_core.c\n+++ drivers\/iio\/imu\/adis16400_core.c\n@@ -404,6 +404,11 @@\n \t\tcase IIO_TEMP:\n \t\t\t*val = st->variant->temp_scale_nano \/ 1000000;\n \t\t\t*val2 = (st->variant->temp_scale_nano % 1000000);\n+\t\t\treturn IIO_VAL_INT_PLUS_MICRO;\n+\t\tcase IIO_PRESSURE:\n+\t\t\t\/* 20 uBar = 0.002kPascal *\/\n+\t\t\t*val = 0;\n+\t\t\t*val2 = 2000;\n \t\t\treturn IIO_VAL_INT_PLUS_MICRO;\n \t\tdefault:\n \t\t\treturn -EINVAL;\n"} {"commit":"714a5e0d0713162008f1894e5d5449ae3fdf794f","subject":"added <fishsound\/decode.h> to repo","message":"added <fishsound\/decode.h> to repo\n\n\ngit-svn-id: cffa15b480e6f0d86abcf9d30fc65d52a4d7b9f9@285 8158c8cd-e7e1-0310-9fa4-c5954c97daef\n","repos":"kfish\/libfishsound,kfish\/libfishsound","returncode":1,"stderr":"error: pathspec 'include\/fishsound\/decode.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- include\/fishsound\/decode.h\n+++ include\/fishsound\/decode.h\n@@ -0,0 +1,259 @@\n+\/*\n+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research\n+ Organisation (CSIRO) Australia\n+\n+ Redistribution and use in source and binary forms, with or without\n+ modification, are permitted provided that the following conditions\n+ are met:\n+\n+ - Redistributions of source code must retain the above copyright\n+ notice, this list of conditions and the following disclaimer.\n+\n+ - Redistributions in binary form must reproduce the above copyright\n+ notice, this list of conditions and the following disclaimer in the\n+ documentation and\/or other materials provided with the distribution.\n+\n+ - Neither the name of CSIRO Australia nor the names of its\n+ contributors may be used to endorse or promote products derived from\n+ this software without specific prior written permission.\n+\n+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\n+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR\n+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+*\/\n+\n+#ifndef __FISH_SOUND_DECODE_H__\n+#define __FISH_SOUND_DECODE_H__\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as non-interleaved shorts.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_Short) (FishSound * fsound, short * pcm[],\n+\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as interleaved shorts.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_ShortIlv) (FishSound * fsound, short ** pcm,\n+\t\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as non-interleaved ints.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_Int) (FishSound * fsound, int * pcm[],\n+\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as interleaved ints.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_IntIlv) (FishSound * fsound, int ** pcm,\n+\t\t\t\t\tlong frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as non-interleaved floats.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_Float) (FishSound * fsound, float * pcm[],\n+\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as interleaved floats.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_FloatIlv) (FishSound * fsound, float ** pcm,\n+\t\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as non-interleaved doubles.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_Double) (FishSound * fsound, double * pcm[],\n+\t\t\t\t\tlong frames, void * user_data);\n+\n+\/**\n+ * Signature of a callback for libfishsound to call when it has decoded\n+ * PCM audio data, and you want this provided as interleaved doubles.\n+ * \\param fsound The FishSound* handle\n+ * \\param pcm The decoded audio\n+ * \\param frames The count of frames decoded\n+ * \\param user_data Arbitrary user data\n+ * \\retval 0 to continue\n+ * \\retval non-zero to stop decoding immediately and\n+ * return control to the fish_sound_decode() caller\n+ *\/\n+typedef int (*FishSoundDecoded_DoubleIlv) (FishSound * fsound, double ** pcm,\n+\t\t\t\t\t long frames, void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as non-interleaved shorts.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_short (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_Short decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as interleaved shorts.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_short_ilv (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_ShortIlv decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as non-interleaved ints.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_int (FishSound * fsound,\n+\t\t\t\tFishSoundDecoded_Int decoded,\n+\t\t\t\tvoid * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as interleaved ints.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_int_ilv (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_IntIlv decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as non-interleaved floats.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_float (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_Float decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as interleaved floats.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_float_ilv (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_FloatIlv decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as non-interleaved doubles.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_double (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_Double decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Set the callback for libfishsound to call when it has a block of decoded\n+ * PCM audio ready, and you want this provided as interleaved doubles.\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param decoded The callback to call\n+ * \\param user_data Arbitrary user data to pass to the callback\n+ * \\returns 0 on success, -1 on failure\n+ *\/\n+int fish_sound_set_decoded_double_ilv (FishSound * fsound,\n+\t\t\t\t FishSoundDecoded_DoubleIlv decoded,\n+\t\t\t\t void * user_data);\n+\n+\/**\n+ * Decode a block of data\n+ * \\param fsound A FishSound* handle (created with mode FISH_SOUND_DECODE)\n+ * \\param buf A buffer of data\n+ * \\param bytes A count of bytes to decode (ie. the length of buf)\n+ * \\returns The number of bytes consumed\n+ *\/\n+long fish_sound_decode (FishSound * fsound, unsigned char * buf, long bytes);\n+\n+\/* The following defines provide source compatability for applications\n+ * written for libfishsound < 0.7. These interface names are deprecated.\n+ *\/\n+#define FishSoundDecoded FishSoundDecoded_Float\n+#define fish_sound_set_decoded_callback fish_sound_set_decoded_float\n+\n+#endif \/* __FISH_SOUND_DECODE_H__ *\/\n"} {"commit":"77fc46ca5b331df3fc0ffef24012ba0d51d601b3","subject":"Input: gamecon - handle errors from input_register_device()","message":"Input: gamecon - handle errors from input_register_device()\n\nAlso gc_remove shouldn't be marked __exit as it is also called from\n__init code.\n\nSigned-off-by: Dmitry Torokhov <10a8c465cefc9bdd6c925e26964d23c90f1141cc@mail.ru>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/input\/joystick\/gamecon.c\n+++ drivers\/input\/joystick\/gamecon.c\n@@ -706,9 +706,11 @@\n \t\tsprintf(gc->phys[i], \"%s\/input%d\", gc->pd->port->name, i);\n \t\terr = gc_setup_pad(gc, i, pads[i]);\n \t\tif (err)\n-\t\t\tgoto err_free_devs;\n-\n-\t\tinput_register_device(gc->dev[i]);\n+\t\t\tgoto err_unreg_devs;\n+\n+\t\terr = input_register_device(gc->dev[i]);\n+\t\tif (err)\n+\t\t\tgoto err_free_dev;\n \t}\n \n \tif (!gc->pads[0]) {\n@@ -720,9 +722,12 @@\n \tparport_put_port(pp);\n \treturn gc;\n \n- err_free_devs:\n+ err_free_dev:\n+\tinput_free_device(gc->dev[i]);\n+ err_unreg_devs:\n \twhile (--i >= 0)\n-\t\tinput_unregister_device(gc->dev[i]);\n+\t\tif (gc->dev[i])\n+\t\t\tinput_unregister_device(gc->dev[i]);\n err_free_gc:\n \tkfree(gc);\n err_unreg_pardev:\n@@ -733,7 +738,7 @@\n \treturn ERR_PTR(err);\n }\n \n-static void __exit gc_remove(struct gc *gc)\n+static void gc_remove(struct gc *gc)\n {\n \tint i;\n \n@@ -771,7 +776,8 @@\n \n \tif (err) {\n \t\twhile (--i >= 0)\n-\t\t\tgc_remove(gc_base[i]);\n+\t\t\tif (gc_base[i])\n+\t\t\t\tgc_remove(gc_base[i]);\n \t\treturn err;\n \t}\n \n"} {"commit":"704d32e0e19683235212148a7aa3378eb19c272e","subject":"Fixed meta::tuple to make it compile under linux as well","message":"Fixed meta::tuple to make it compile under linux as well\n","repos":"Abc-Arbitrage\/fixpp,Abc-Arbitrage\/fixpp,Abc-Arbitrage\/fixpp,Abc-Arbitrage\/fixpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/fixpp\/meta\/tuple.h\n+++ include\/fixpp\/meta\/tuple.h\n@@ -21,6 +21,18 @@\n #define FIXPP_META_TUPLE_CONSTEXPR\n #endif\n \n+\/\/ For some reason, MSVC is choking on the get<I> return type, so\n+\/\/ we fallback on decltype(auto)\n+#ifdef _MSC_VER\n+# define FIXPP_META_TUPLE_GET_RETURN_CREF(Ts) decltype(auto)\n+# define FIXPP_META_TUPLE_GET_RETURN_REF(Ts) decltype(auto)\n+# define FIXPP_META_TUPLE_GET_RETURN_RREF(Ts) decltype(auto)\n+#else\n+# define FIXPP_META_TUPLE_GET_RETURN_CREF(Ts) const seq::type_by_index_t< I, Ts... >&\n+# define FIXPP_META_TUPLE_GET_RETURN_REF(Ts) seq::type_by_index_t< I, Ts... >&\n+# define FIXPP_META_TUPLE_GET_RETURN_RREF(Ts) seq::type_by_index_t< I, Ts... >&&\n+#endif\n+\n namespace meta\n {\n template< typename... Ts >\n@@ -40,15 +52,15 @@\n \n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( const tuple< Ts... >& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_CREF(Ts) get( const tuple< Ts... >& ) noexcept;\n \n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( tuple< Ts... >& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_REF(Ts) get( tuple< Ts... >& ) noexcept;\n \n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( const tuple< Ts... >&& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_RREF(Ts) get( tuple< Ts... >&& ) noexcept;\n \n namespace impl\n {\n@@ -63,48 +75,48 @@\n template< bool B, typename T = void >\n using enable_if_t = typename std::enable_if< B, T >::type;\n \n-\ttemplate<typename __T, typename __U>\n-\tclass __is_swappable_test {\n-\n-\t\tstruct __swap_not_found_type {};\n-\n-\t\ttemplate<typename __V1, typename __V2>\n-\t\tstatic auto __test(__V1&& __v1, __V2&& __v2) -> decltype(swap(std::forward<__V1>(__v1), std::forward<__V2>(__v2)));\n-\n-\t\ttemplate<typename __V1, typename __V2>\n-\t\tstatic auto __test(...)->__swap_not_found_type;\n-\n-\t\tusing __test_type_tu = decltype(__test<__T, __U>(std::declval<__T>(), std::declval<__U>()));\n-\t\tusing __test_type_ut = decltype(__test<__U, __T>(std::declval<__U>(), std::declval<__T>()));\n-\n-\tpublic:\n-\t\tstatic constexpr bool __value =\n-\t\t\t!std::is_same<__test_type_tu, __swap_not_found_type>::value &&\n-\t\t\t!std::is_same<__test_type_ut, __swap_not_found_type>::value;\n-\t};\n-\n-\tusing std::swap;\n-\n-\t\/\/ http:\/\/www.open-std.org\/jtc1\/sc22\/wg21\/docs\/papers\/2013\/n3619.html\n-\n-\ttemplate<bool, typename __T, typename __U>\n-\tstruct __is_nothrow_swappable_test :\n-\t\tstd::conditional<\n-\t\tnoexcept(swap(std::declval<__T>(), std::declval<__U>())),\n-\t\tstd::true_type, std::false_type>::type {};\n-\n-\ttemplate<typename __T, typename __U>\n-\tstruct __is_nothrow_swappable_test<false, __T, __U> :\n-\t\tstd::false_type {};\n-\n-\ttemplate<typename __T, typename __U = __T>\n-\tstruct is_swappable :\n-\t\tstd::conditional<__is_swappable_test<__T, __U>::__value,\n-\t\tstd::true_type, std::false_type>::type {};\n-\n-\ttemplate<typename __T, typename __U = __T>\n-\tstruct is_nothrow_swappable :\n-\t\t__is_nothrow_swappable_test<is_swappable<__T, __U>::value, __T, __U> {};\n+ \/\/ http:\/\/www.open-std.org\/jtc1\/sc22\/wg21\/docs\/papers\/2013\/n3619.html\n+\n+ template<typename __T, typename __U>\n+ class __is_swappable_test {\n+\n+ struct __swap_not_found_type {};\n+\n+ template<typename __V1, typename __V2>\n+ static auto __test(__V1&& __v1, __V2&& __v2) -> decltype(swap(std::forward<__V1>(__v1), std::forward<__V2>(__v2)));\n+\n+ template<typename __V1, typename __V2>\n+ static auto __test(...)->__swap_not_found_type;\n+\n+ using __test_type_tu = decltype(__test<__T, __U>(std::declval<__T>(), std::declval<__U>()));\n+ using __test_type_ut = decltype(__test<__U, __T>(std::declval<__U>(), std::declval<__T>()));\n+\n+ public:\n+ static constexpr bool __value =\n+ !std::is_same<__test_type_tu, __swap_not_found_type>::value &&\n+ !std::is_same<__test_type_ut, __swap_not_found_type>::value;\n+ };\n+\n+ using std::swap;\n+\n+ template<bool, typename __T, typename __U>\n+ struct __is_nothrow_swappable_test :\n+ std::conditional<\n+ noexcept(swap(std::declval<__T>(), std::declval<__U>())),\n+ std::true_type, std::false_type>::type {};\n+\n+ template<typename __T, typename __U>\n+ struct __is_nothrow_swappable_test<false, __T, __U> :\n+ std::false_type {};\n+\n+ template<typename __T, typename __U = __T>\n+ struct is_swappable :\n+ std::conditional<__is_swappable_test<__T, __U>::__value,\n+ std::true_type, std::false_type>::type {};\n+\n+ template<typename __T, typename __U = __T>\n+ struct is_nothrow_swappable :\n+ __is_nothrow_swappable_test<is_swappable<__T, __U>::value, __T, __U> {};\n \n #if __cplusplus >= 201402L\n template< typename T >\n@@ -195,7 +207,7 @@\n }\n \n void swap( tuple_value& v )\n-\t\t noexcept(is_nothrow_swappable< T >::value)\n+ noexcept( is_nothrow_swappable< T >::value )\n {\n using std::swap;\n swap( value, v.value );\n@@ -274,7 +286,7 @@\n }\n \n void swap( tuple_value& v )\n-\t\t noexcept(is_nothrow_swappable< T >::value)\n+ noexcept( is_nothrow_swappable< T >::value )\n {\n using std::swap;\n swap( *this, v );\n@@ -346,7 +358,7 @@\n #ifdef FIXPP_META_FOLD_EXPRESSIONS\n ( tuple_value< Is, Ts >::operator=( get< Is >( v ) ), ... );\n #else\n- (void)swallow{ ( tuple_value< Is, Ts >::operator=( meta::get< Is >( v ) ), true )..., true };\n+ (void)swallow{ ( tuple_value< Is, Ts >::operator=( get< Is >( v ) ), true )..., true };\n #endif\n return *this;\n }\n@@ -358,13 +370,13 @@\n #ifdef FIXPP_META_FOLD_EXPRESSIONS\n ( tuple_value< Is, Ts >::operator=( get< Is >( std::move( v ) ) ), ... );\n #else\n- (void)swallow{ ( tuple_value< Is, Ts >::operator=( meta::get< Is >( std::move( v ) ) ), true )..., true };\n+ (void)swallow{ ( tuple_value< Is, Ts >::operator=( get< Is >( std::move( v ) ) ), true )..., true };\n #endif\n return *this;\n }\n \n void swap( tuple_base& v )\n-\t\t noexcept(seq::is_all< impl::is_nothrow_swappable< Ts >::value... >::value)\n+ noexcept( seq::is_all< impl::is_nothrow_swappable< Ts >::value... >::value )\n {\n #ifdef FIXPP_META_FOLD_EXPRESSIONS\n ( static_cast< tuple_value< Is, Ts >& >( *this ).swap( static_cast< tuple_value< Is, Ts >& >( v ) ), ... );\n@@ -387,15 +399,15 @@\n \n template< std::size_t I, typename... Us >\n friend FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( const tuple< Us... >& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_CREF(Us) get( const tuple< Us... >& ) noexcept;\n \n template< std::size_t I, typename... Us >\n friend FIXPP_META_TUPLE_CONSTEXPR\n-\t\tdecltype(auto) get( tuple< Us... >& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_REF(Us) get( tuple< Us... >& ) noexcept;\n \n template< std::size_t I, typename... Us >\n friend FIXPP_META_TUPLE_CONSTEXPR\n-\t\tdecltype(auto) get( tuple< Us... >&& ) noexcept;\n+ FIXPP_META_TUPLE_GET_RETURN_RREF(Us) get( tuple< Us... >&& ) noexcept;\n \n public:\n \/\/ 20.4.2.1 Construction [tuple.cnstr]\n@@ -625,21 +637,21 @@\n \/\/ get<I>\n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( const tuple< Ts... >& v ) noexcept\n+ FIXPP_META_TUPLE_GET_RETURN_CREF(Ts) get( const tuple< Ts... >& v ) noexcept\n {\n return static_cast< const impl::tuple_value< I, seq::type_by_index_t< I, Ts... > >& >( v.base ).get();\n }\n \n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( tuple< Ts... >& v ) noexcept\n+ FIXPP_META_TUPLE_GET_RETURN_REF(Ts) get( tuple< Ts... >& v ) noexcept\n {\n return static_cast< impl::tuple_value< I, seq::type_by_index_t< I, Ts... > >& >( v.base ).get();\n }\n \n template< std::size_t I, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( tuple< Ts... >&& v ) noexcept\n+ FIXPP_META_TUPLE_GET_RETURN_RREF(Ts) get( tuple< Ts... >&& v ) noexcept\n {\n using type = seq::type_by_index_t< I, Ts... >;\n return static_cast< type&& >( static_cast< impl::tuple_value< I, type >& >( v.base ).get() );\n@@ -669,21 +681,21 @@\n \/\/ get<T>\n template< typename T, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( const tuple< Ts... >& v ) noexcept\n+ const T& get( const tuple< Ts... >& v ) noexcept\n {\n return get< impl::index_of< T, Ts... >::value >( v );\n }\n \n template< typename T, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( tuple< Ts... >& v ) noexcept\n+ T& get( tuple< Ts... >& v ) noexcept\n {\n return get< impl::index_of< T, Ts... >::value >( v );\n }\n \n template< typename T, typename... Ts >\n FIXPP_META_TUPLE_CONSTEXPR\n- decltype(auto) get( tuple< Ts... >&& v ) noexcept\n+ T&& get( tuple< Ts... >&& v ) noexcept\n {\n return get< impl::index_of< T, Ts... >::value >( std::move( v ) );\n }\n"} {"commit":"4c21f3c26ecc25c5520628eef8e900a36e6c6ab4","subject":"irqchip: GICv3: ITS: DT probing and initialization","message":"irqchip: GICv3: ITS: DT probing and initialization\n\nAdd the code that probes the ITS from the device tree,\nand initialize it.\n\nSigned-off-by: Marc Zyngier <a16cc0c82647c52d401177f8e50567df5499e36c@arm.com>\nLink: https:\/\/lkml.kernel.org\/r\/1416839720-18400-11-git-send-email-a16cc0c82647c52d401177f8e50567df5499e36c@arm.com\nSigned-off-by: Jason Cooper <68c46a606457643eab92053c1c05574abb26f861@lakedaemon.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/irqchip\/irq-gic-v3-its.c\n+++ drivers\/irqchip\/irq-gic-v3-its.c\n@@ -1231,3 +1231,172 @@\n \t.alloc\t\t\t= its_irq_domain_alloc,\n \t.free\t\t\t= its_irq_domain_free,\n };\n+\n+static int its_probe(struct device_node *node, struct irq_domain *parent)\n+{\n+\tstruct resource res;\n+\tstruct its_node *its;\n+\tvoid __iomem *its_base;\n+\tu32 val;\n+\tu64 baser, tmp;\n+\tint err;\n+\n+\terr = of_address_to_resource(node, 0, &res);\n+\tif (err) {\n+\t\tpr_warn(\"%s: no regs?\\n\", node->full_name);\n+\t\treturn -ENXIO;\n+\t}\n+\n+\tits_base = ioremap(res.start, resource_size(&res));\n+\tif (!its_base) {\n+\t\tpr_warn(\"%s: unable to map registers\\n\", node->full_name);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tval = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;\n+\tif (val != 0x30 && val != 0x40) {\n+\t\tpr_warn(\"%s: no ITS detected, giving up\\n\", node->full_name);\n+\t\terr = -ENODEV;\n+\t\tgoto out_unmap;\n+\t}\n+\n+\tpr_info(\"ITS: %s\\n\", node->full_name);\n+\n+\tits = kzalloc(sizeof(*its), GFP_KERNEL);\n+\tif (!its) {\n+\t\terr = -ENOMEM;\n+\t\tgoto out_unmap;\n+\t}\n+\n+\traw_spin_lock_init(&its->lock);\n+\tINIT_LIST_HEAD(&its->entry);\n+\tINIT_LIST_HEAD(&its->its_device_list);\n+\tits->base = its_base;\n+\tits->phys_base = res.start;\n+\tits->msi_chip.of_node = node;\n+\tits->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1;\n+\n+\tits->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL);\n+\tif (!its->cmd_base) {\n+\t\terr = -ENOMEM;\n+\t\tgoto out_free_its;\n+\t}\n+\tits->cmd_write = its->cmd_base;\n+\n+\terr = its_alloc_tables(its);\n+\tif (err)\n+\t\tgoto out_free_cmd;\n+\n+\terr = its_alloc_collections(its);\n+\tif (err)\n+\t\tgoto out_free_tables;\n+\n+\tbaser = (virt_to_phys(its->cmd_base)\t|\n+\t\t GITS_CBASER_WaWb\t\t|\n+\t\t GITS_CBASER_InnerShareable\t|\n+\t\t (ITS_CMD_QUEUE_SZ \/ SZ_4K - 1)\t|\n+\t\t GITS_CBASER_VALID);\n+\n+\twriteq_relaxed(baser, its->base + GITS_CBASER);\n+\ttmp = readq_relaxed(its->base + GITS_CBASER);\n+\twriteq_relaxed(0, its->base + GITS_CWRITER);\n+\twritel_relaxed(1, its->base + GITS_CTLR);\n+\n+\tif ((tmp ^ baser) & GITS_BASER_SHAREABILITY_MASK) {\n+\t\tpr_info(\"ITS: using cache flushing for cmd queue\\n\");\n+\t\tits->flags |= ITS_FLAGS_CMDQ_NEEDS_FLUSHING;\n+\t}\n+\n+\tif (of_property_read_bool(its->msi_chip.of_node, \"msi-controller\")) {\n+\t\tits->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);\n+\t\tif (!its->domain) {\n+\t\t\terr = -ENOMEM;\n+\t\t\tgoto out_free_tables;\n+\t\t}\n+\n+\t\tits->domain->parent = parent;\n+\n+\t\tits->msi_chip.domain = pci_msi_create_irq_domain(node,\n+\t\t\t\t\t\t\t\t &its_pci_msi_domain_info,\n+\t\t\t\t\t\t\t\t its->domain);\n+\t\tif (!its->msi_chip.domain) {\n+\t\t\terr = -ENOMEM;\n+\t\t\tgoto out_free_domains;\n+\t\t}\n+\n+\t\terr = of_pci_msi_chip_add(&its->msi_chip);\n+\t\tif (err)\n+\t\t\tgoto out_free_domains;\n+\t}\n+\n+\tspin_lock(&its_lock);\n+\tlist_add(&its->entry, &its_nodes);\n+\tspin_unlock(&its_lock);\n+\n+\treturn 0;\n+\n+out_free_domains:\n+\tif (its->msi_chip.domain)\n+\t\tirq_domain_remove(its->msi_chip.domain);\n+\tif (its->domain)\n+\t\tirq_domain_remove(its->domain);\n+out_free_tables:\n+\tits_free_tables(its);\n+out_free_cmd:\n+\tkfree(its->cmd_base);\n+out_free_its:\n+\tkfree(its);\n+out_unmap:\n+\tiounmap(its_base);\n+\tpr_err(\"ITS: failed probing %s (%d)\\n\", node->full_name, err);\n+\treturn err;\n+}\n+\n+static bool gic_rdists_supports_plpis(void)\n+{\n+\treturn !!(readl_relaxed(gic_data_rdist_rd_base() + GICR_TYPER) & GICR_TYPER_PLPIS);\n+}\n+\n+int its_cpu_init(void)\n+{\n+\tif (!gic_rdists_supports_plpis()) {\n+\t\tpr_info(\"CPU%d: LPIs not supported\\n\", smp_processor_id());\n+\t\treturn -ENXIO;\n+\t}\n+\n+\tif (!list_empty(&its_nodes)) {\n+\t\tits_cpu_init_lpis();\n+\t\tits_cpu_init_collection();\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static struct of_device_id its_device_id[] = {\n+\t{\t.compatible\t= \"arm,gic-v3-its\",\t},\n+\t{},\n+};\n+\n+int its_init(struct device_node *node, struct rdists *rdists,\n+\t struct irq_domain *parent_domain)\n+{\n+\tstruct device_node *np;\n+\n+\tfor (np = of_find_matching_node(node, its_device_id); np;\n+\t np = of_find_matching_node(np, its_device_id)) {\n+\t\tits_probe(np, parent_domain);\n+\t}\n+\n+\tif (list_empty(&its_nodes)) {\n+\t\tpr_warn(\"ITS: No ITS available, not enabling LPIs\\n\");\n+\t\treturn -ENXIO;\n+\t}\n+\n+\tgic_rdists = rdists;\n+\tgic_root_node = node;\n+\n+\tits_alloc_lpi_tables();\n+\tits_lpi_init(rdists->id_bits);\n+\n+\treturn 0;\n+}\n"} {"commit":"b2c08b6ceeacd4b18dfd349ec5eef184c094c04f","subject":"Remove old and GL-specific defines from GrUserConfig.h comments","message":"Remove old and GL-specific defines from GrUserConfig.h comments\n\n\n","repos":"csulmone\/skia,csulmone\/skia,csulmone\/skia,csulmone\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gpu\/GrUserConfig.h\n+++ include\/gpu\/GrUserConfig.h\n@@ -22,25 +22,10 @@\n #endif\n \n \/*\n- * The default 32bit pixel config for texture upload is GL_RGBA on all\n- * platforms except on Windows where it is GL_BGRA. If your bitmaps map to a\n- * different GL enum, specify that with this define. For portability use\n- * GR_BGRA rather than GL_BGRA for platforms where this format is an\n- * extension.\n- *\/\n-\/\/#define GR_GL_32BPP_COLOR_FORMAT GL_RGBA\n-\n-\/*\n * To diagnose texture cache performance, define this to 1 if you want to see\n * a log statement everytime we upload an image to create a texture.\n *\/\n \/\/#define GR_DUMP_TEXTURE_UPLOAD 1\n-\n-\/*\n- * To log all GL calls define this. Can be turned on and off at runtime by\n- * gPrintGL global variable.\n- *\/\n-\/\/#define GR_GL_LOG_CALLS 1\n \n \/*\n * When drawing rects this causes Ganesh to use a vertex buffer containing\n@@ -64,11 +49,6 @@\n \/\/#define GR_GEOM_BUFFER_LOCK_THRESHOLD (1<<15)\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\/*\n- * temporary flags (may go away soon)\n- *\/\n-\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ Decide Ganesh types\n \n #define GR_SCALAR_IS_FIXED 0\n"} {"commit":"d3aab99096bb8f81600437682398235c17084d22","subject":"test: replace calls to individual detach functions with one call to main detach","message":"test: replace calls to individual detach functions with one call to main detach\n\nThe individual qemuDomainDetach*Device() functions will soon be \"less\nfunctional\", since some of the code that is duplicated in 10 of the 12\ndetach functions is going to be moved into the common\nqemuDomainDetachDeviceLive(), which calls them all.\n\nqemuhotplugtest.c is the only place any of these individual functions\nis called other than qemuDomainDetachDeviceLive() itself. Fortunately,\nqemuDomainDetachDeviceLive() provides exactly the functionality needed\nby the test driver (except that it supports detach of more device\ntypes than the test driver has tests for).\n\nThis patch replaces the calls to\nqemuDomainDetach(Chr|Shmen|Watchdog|Disk)Device with a single call to\nthe higher level function, allowing us to shift functionality between\nthe lower level functions without breaking the tests.\n\nSigned-off-by: Laine Stump <c23361c43fbf79fed83e8b76173707b083d6caf5@laine.org>\nACKed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,eskultety\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,eskultety\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/qemuhotplugtest.c\n+++ tests\/qemuhotplugtest.c\n@@ -147,16 +147,10 @@\n \n switch (dev->type) {\n case VIR_DOMAIN_DEVICE_DISK:\n- ret = qemuDomainDetachDeviceDiskLive(&driver, vm, dev, async);\n- break;\n case VIR_DOMAIN_DEVICE_CHR:\n- ret = qemuDomainDetachChrDevice(&driver, vm, dev->data.chr, async);\n- break;\n case VIR_DOMAIN_DEVICE_SHMEM:\n- ret = qemuDomainDetachShmemDevice(&driver, vm, dev->data.shmem, async);\n- break;\n case VIR_DOMAIN_DEVICE_WATCHDOG:\n- ret = qemuDomainDetachWatchdog(&driver, vm, dev->data.watchdog, async);\n+ ret = qemuDomainDetachDeviceLive(vm, dev, &driver, async);\n break;\n default:\n VIR_TEST_VERBOSE(\"device type '%s' cannot be detached\\n\",\n"} {"commit":"54f4e11ae3051ff7a921494be5106788db19dcf7","subject":"[media] a800: get rid of on-stack dma buffers","message":"[media] a800: get rid of on-stack dma buffers\n\nusb_control_msg initiates (and waits for completion of) a dma transfer using\nthe supplied buffer. That buffer thus has to be seperately allocated on\nthe heap.\n\nIn lib\/dma_debug.c the function check_for_stack even warns about it:\n\tWARNING: at lib\/dma-debug.c:866 check_for_stack\n\nNote: This change is tested to compile only, as I don't have the hardware.\n\nSigned-off-by: Florian Mickler <73262ad0334ab37227b2f7a0205f51db1e606681@mickler.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/a800.c\n+++ drivers\/media\/dvb\/dvb-usb\/a800.c\n@@ -78,17 +78,26 @@\n \n static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)\n {\n-\tu8 key[5];\n+\tint ret;\n+\tu8 *key = kmalloc(5, GFP_KERNEL);\n+\tif (!key)\n+\t\treturn -ENOMEM;\n+\n \tif (usb_control_msg(d->udev,usb_rcvctrlpipe(d->udev,0),\n \t\t\t\t0x04, USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, key, 5,\n-\t\t\t\t2000) != 5)\n-\t\treturn -ENODEV;\n+\t\t\t\t2000) != 5) {\n+\t\tret = -ENODEV;\n+\t\tgoto out;\n+\t}\n \n \t\/* call the universal NEC remote processor, to find out the key's state and event *\/\n \tdvb_usb_nec_rc_key_to_event(d,key,event,state);\n \tif (key[0] != 0)\n \t\tdeb_rc(\"key: %x %x %x %x %x\\n\",key[0],key[1],key[2],key[3],key[4]);\n-\treturn 0;\n+\tret = 0;\n+out:\n+\tkfree(key);\n+\treturn ret;\n }\n \n \/* USB Driver stuff *\/\n"} {"commit":"0b67f5c568c545cb36f88e9f418af2df1cc58589","subject":"V4L\/DVB (6237): Oops in pwc v4l driver","message":"V4L\/DVB (6237): Oops in pwc v4l driver\n\nThe pwc driver is defficient in locking, which can trigger an oops\nwhen disconnecting.\n\nSigned-off-by: Oliver Neukum <bfee72d94d376f4e00f72b756466867d7f9eb24e@suse.de>\nCC: Luc Saillard <5dc35fa9b5181cf374d77ada02f42716f255ae42@saillard.org>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@infradead.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/pwc\/pwc-if.c\n+++ drivers\/media\/video\/pwc\/pwc-if.c\n@@ -907,31 +907,49 @@\n \treturn 0;\n }\n \n+static void pwc_iso_stop(struct pwc_device *pdev)\n+{\n+\tint i;\n+\n+\t\/* Unlinking ISOC buffers one by one *\/\n+\tfor (i = 0; i < MAX_ISO_BUFS; i++) {\n+\t\tstruct urb *urb;\n+\n+\t\turb = pdev->sbuf[i].urb;\n+\t\tif (urb != 0) {\n+\t\t\tPWC_DEBUG_MEMORY(\"Unlinking URB %p\\n\", urb);\n+\t\t\tusb_kill_urb(urb);\n+\t\t}\n+\t}\n+}\n+\n+static void pwc_iso_free(struct pwc_device *pdev)\n+{\n+\tint i;\n+\n+\t\/* Freeing ISOC buffers one by one *\/\n+\tfor (i = 0; i < MAX_ISO_BUFS; i++) {\n+\t\tstruct urb *urb;\n+\n+\t\turb = pdev->sbuf[i].urb;\n+\t\tif (urb != 0) {\n+\t\t\tPWC_DEBUG_MEMORY(\"Freeing URB\\n\");\n+\t\t\tusb_free_urb(urb);\n+\t\t\tpdev->sbuf[i].urb = NULL;\n+\t\t}\n+\t}\n+}\n+\n void pwc_isoc_cleanup(struct pwc_device *pdev)\n {\n-\tint i;\n-\n \tPWC_DEBUG_OPEN(\">> pwc_isoc_cleanup()\\n\");\n \tif (pdev == NULL)\n \t\treturn;\n \tif (pdev->iso_init == 0)\n \t\treturn;\n \n-\t\/* Unlinking ISOC buffers one by one *\/\n-\tfor (i = 0; i < MAX_ISO_BUFS; i++) {\n-\t\tstruct urb *urb;\n-\n-\t\turb = pdev->sbuf[i].urb;\n-\t\tif (urb != 0) {\n-\t\t\tif (pdev->iso_init) {\n-\t\t\t\tPWC_DEBUG_MEMORY(\"Unlinking URB %p\\n\", urb);\n-\t\t\t\tusb_kill_urb(urb);\n-\t\t\t}\n-\t\t\tPWC_DEBUG_MEMORY(\"Freeing URB\\n\");\n-\t\t\tusb_free_urb(urb);\n-\t\t\tpdev->sbuf[i].urb = NULL;\n-\t\t}\n-\t}\n+\tpwc_iso_stop(pdev);\n+\tpwc_iso_free(pdev);\n \n \t\/* Stop camera, but only if we are sure the camera is still there (unplug\n \t is signalled by EPIPE)\n@@ -1211,6 +1229,7 @@\n \n \tPWC_DEBUG_OPEN(\">> video_close called(vdev = 0x%p).\\n\", vdev);\n \n+\tlock_kernel();\n \tpdev = (struct pwc_device *)vdev->priv;\n \tif (pdev->vopen == 0)\n \t\tPWC_DEBUG_MODULE(\"video_close() called on closed device?\\n\");\n@@ -1230,7 +1249,6 @@\n \tpwc_isoc_cleanup(pdev);\n \tpwc_free_buffers(pdev);\n \n-\tlock_kernel();\n \t\/* Turn off LEDS and power down camera, but only when not unplugged *\/\n \tif (!pdev->unplugged) {\n \t\t\/* Turn LEDs off *\/\n@@ -1276,7 +1294,7 @@\n \tstruct pwc_device *pdev;\n \tint noblock = file->f_flags & O_NONBLOCK;\n \tDECLARE_WAITQUEUE(wait, current);\n-\tint bytes_to_read;\n+\tint bytes_to_read, rv = 0;\n \tvoid *image_buffer_addr;\n \n \tPWC_DEBUG_READ(\"pwc_video_read(vdev=0x%p, buf=%p, count=%zd) called.\\n\",\n@@ -1286,8 +1304,12 @@\n \tpdev = vdev->priv;\n \tif (pdev == NULL)\n \t\treturn -EFAULT;\n-\tif (pdev->error_status)\n-\t\treturn -pdev->error_status; \/* Something happened, report what. *\/\n+\n+\tmutex_lock(&pdev->modlock);\n+\tif (pdev->error_status) {\n+\t\trv = -pdev->error_status; \/* Something happened, report what. *\/\n+\t\tgoto err_out;\n+\t}\n \n \t\/* In case we're doing partial reads, we don't have to wait for a frame *\/\n \tif (pdev->image_read_pos == 0) {\n@@ -1298,17 +1320,20 @@\n \t\t\tif (pdev->error_status) {\n \t\t\t\tremove_wait_queue(&pdev->frameq, &wait);\n \t\t\t\tset_current_state(TASK_RUNNING);\n-\t\t\t\treturn -pdev->error_status ;\n+\t\t\t\trv = -pdev->error_status ;\n+\t\t\t\tgoto err_out;\n \t\t\t}\n \t\t\tif (noblock) {\n \t\t\t\tremove_wait_queue(&pdev->frameq, &wait);\n \t\t\t\tset_current_state(TASK_RUNNING);\n-\t\t\t\treturn -EWOULDBLOCK;\n+\t\t\t\trv = -EWOULDBLOCK;\n+\t\t\t\tgoto err_out;\n \t\t\t}\n \t\t\tif (signal_pending(current)) {\n \t\t\t\tremove_wait_queue(&pdev->frameq, &wait);\n \t\t\t\tset_current_state(TASK_RUNNING);\n-\t\t\t\treturn -ERESTARTSYS;\n+\t\t\t\trv = -ERESTARTSYS;\n+\t\t\t\tgoto err_out;\n \t\t\t}\n \t\t\tschedule();\n \t\t\tset_current_state(TASK_INTERRUPTIBLE);\n@@ -1317,8 +1342,10 @@\n \t\tset_current_state(TASK_RUNNING);\n \n \t\t\/* Decompress and release frame *\/\n-\t\tif (pwc_handle_frame(pdev))\n-\t\t\treturn -EFAULT;\n+\t\tif (pwc_handle_frame(pdev)) {\n+\t\t\trv = -EFAULT;\n+\t\t\tgoto err_out;\n+\t\t}\n \t}\n \n \tPWC_DEBUG_READ(\"Copying data to user space.\\n\");\n@@ -1333,14 +1360,20 @@\n \timage_buffer_addr = pdev->image_data;\n \timage_buffer_addr += pdev->images[pdev->fill_image].offset;\n \timage_buffer_addr += pdev->image_read_pos;\n-\tif (copy_to_user(buf, image_buffer_addr, count))\n-\t\treturn -EFAULT;\n+\tif (copy_to_user(buf, image_buffer_addr, count)) {\n+\t\trv = -EFAULT;\n+\t\tgoto err_out;\n+\t}\n \tpdev->image_read_pos += count;\n \tif (pdev->image_read_pos >= bytes_to_read) { \/* All data has been read *\/\n \t\tpdev->image_read_pos = 0;\n \t\tpwc_next_image(pdev);\n \t}\n+\tmutex_unlock(&pdev->modlock);\n \treturn count;\n+err_out:\n+\tmutex_unlock(&pdev->modlock);\n+\treturn rv;\n }\n \n static unsigned int pwc_video_poll(struct file *file, poll_table *wait)\n@@ -1366,7 +1399,20 @@\n static int pwc_video_ioctl(struct inode *inode, struct file *file,\n \t\t\t unsigned int cmd, unsigned long arg)\n {\n-\treturn video_usercopy(inode, file, cmd, arg, pwc_video_do_ioctl);\n+\tstruct video_device *vdev = file->private_data;\n+\tstruct pwc_device *pdev;\n+\tint r = -ENODEV;\n+\n+\tif (!vdev)\n+\t\tgoto out;\n+\tpdev = vdev->priv;\n+\n+\tmutex_lock(&pdev->modlock);\n+\tif (!pdev->unplugged)\n+\t\tr = video_usercopy(inode, file, cmd, arg, pwc_video_do_ioctl);\n+\tmutex_unlock(&pdev->modlock);\n+out:\n+\treturn r;\n }\n \n static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)\n@@ -1809,7 +1855,10 @@\n \twake_up_interruptible(&pdev->frameq);\n \t\/* Wait until device is closed *\/\n \tif(pdev->vopen) {\n+\t\tmutex_lock(&pdev->modlock);\n \t\tpdev->unplugged = 1;\n+\t\tmutex_unlock(&pdev->modlock);\n+\t\tpwc_iso_stop(pdev);\n \t} else {\n \t\t\/* Device is closed, so we can safely unregister it *\/\n \t\tPWC_DEBUG_PROBE(\"Unregistering video device in disconnect().\\n\");\n@@ -1826,7 +1875,6 @@\n \n \tunlock_kernel();\n }\n-\n \n \/* *grunt* We have to do atoi ourselves :-( *\/\n static int pwc_atoi(const char *s)\n"} {"commit":"e86b54b50ed094c0c89c523d214130733e728afe","subject":"I hope nobody reads asm - embarrassing code ;)","message":"I hope nobody reads asm - embarrassing code ;)","repos":"ps4dev\/libps4-boilerplate","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- include\/internal\/resolve.h\n+++ include\/internal\/resolve.h\n@@ -103,13 +103,7 @@\n \t\t\t\tmovabs $\"#libName\", %rdx \\n \\\n \t\t\t\tmovabs $\"#fnName\", %rcx \\n \\\n \t\t\t\txor %rax, %rax \\n \\\n-\t\t\t\tcall resolveModuleAndSymbol \\n \\\n-\t\t\t\tcmp $-1, %rax \\n \\\n-\t\t\t\tje .L\"#fn\"ResolveError \\n \\\n-\t\t\t\tmov $0, %rax \\n \\\n-\t\t\t\tret \\n \\\n-\t\t\t.L\"#fn\"ResolveError: \\n \\\n-\t\t\t\tret \\n \\\n+\t\t\t\tjmp resolveModuleAndSymbol \\n \\\n \t\t\t.size \"#fn\"Resolve, .-\"#fn\"Resolve \\n \\\n \t\t\t.popsection \\n \\\n \t\t\");\n"} {"commit":"75b4c260fa93d99979a8b5bec5a621daff469398","subject":"V4L\/DVB (11364): tuner: remove i2c legacy code.","message":"V4L\/DVB (11364): tuner: remove i2c legacy code.\n\nAll drivers that use the tuner module now use v4l2_subdev, so we can remove the\nlegacy code from this module.\n\nNote that TUNER_SET_CONFIG is still called by tuner-simple.c, so we have\nto handle it via a .command callback. There must be a better way to do this,\nbut for now this will work.\n\nSigned-off-by: Hans Verkuil <f625be9dbdcbbd12a043857af148e8fb895d9a1d@xs4all.nl>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/tuner-core.c\n+++ drivers\/media\/video\/tuner-core.c\n@@ -15,12 +15,12 @@\n #include <linux\/i2c.h>\n #include <linux\/types.h>\n #include <linux\/init.h>\n-#include <linux\/videodev.h>\n+#include <linux\/videodev2.h>\n #include <media\/tuner.h>\n #include <media\/tuner-types.h>\n #include <media\/v4l2-device.h>\n #include <media\/v4l2-ioctl.h>\n-#include <media\/v4l2-i2c-drv-legacy.h>\n+#include <media\/v4l2-i2c-drv.h>\n #include \"mt20xx.h\"\n #include \"tda8290.h\"\n #include \"tea5761.h\"\n@@ -101,18 +101,6 @@\n \treturn container_of(sd, struct tuner, sd);\n }\n \n-\/* standard i2c insmod options *\/\n-static unsigned short normal_i2c[] = {\n-#if defined(CONFIG_MEDIA_TUNER_TEA5761) || (defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) && defined(MODULE))\n-\t0x10,\n-#endif\n-\t0x42, 0x43, 0x4a, 0x4b,\t\t\t\/* tda8290 *\/\n-\t0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,\n-\t0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,\n-\tI2C_CLIENT_END\n-};\n-\n-I2C_CLIENT_INSMOD;\n \n \/* insmod options used at init time => read\/only *\/\n static unsigned int addr;\n@@ -951,11 +939,6 @@\n \treturn 0;\n }\n \n-static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg)\n-{\n-\treturn v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);\n-}\n-\n static int tuner_suspend(struct i2c_client *c, pm_message_t state)\n {\n \tstruct tuner *t = to_tuner(i2c_get_clientdata(c));\n@@ -978,6 +961,20 @@\n \t\t\tset_freq(c, t->tv_freq);\n \t}\n \treturn 0;\n+}\n+\n+static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg)\n+{\n+\tstruct v4l2_subdev *sd = i2c_get_clientdata(client);\n+\n+\t\/* TUNER_SET_CONFIG is still called by tuner-simple.c, so we have\n+\t to handle it here.\n+\t There must be a better way of doing this... *\/\n+\tswitch (cmd) {\n+\tcase TUNER_SET_CONFIG:\n+\t\treturn tuner_s_config(sd, arg);\n+\t}\n+\treturn -ENOIOCTLCMD;\n }\n \n \/* ----------------------------------------------------------------------- *\/\n@@ -1167,39 +1164,6 @@\n \treturn 0;\n }\n \n-static int tuner_legacy_probe(struct i2c_adapter *adap)\n-{\n-\tif (0 != addr) {\n-\t\tnormal_i2c[0] = addr;\n-\t\tnormal_i2c[1] = I2C_CLIENT_END;\n-\t}\n-\n-\tif ((adap->class & I2C_CLASS_TV_ANALOG) == 0)\n-\t\treturn 0;\n-\n-\t\/* HACK: Ignore 0x6b and 0x6f on cx88 boards.\n-\t * FusionHDTV5 RT Gold has an ir receiver at 0x6b\n-\t * and an RTC at 0x6f which can get corrupted if probed.\n-\t *\/\n-\tif ((adap->id == I2C_HW_B_CX2388x) ||\n-\t (adap->id == I2C_HW_B_CX23885)) {\n-\t\tunsigned int i = 0;\n-\n-\t\twhile (i < I2C_CLIENT_MAX_OPTS && ignore[i] != I2C_CLIENT_END)\n-\t\t\ti += 2;\n-\t\tif (i + 4 < I2C_CLIENT_MAX_OPTS) {\n-\t\t\tignore[i+0] = adap->nr;\n-\t\t\tignore[i+1] = 0x6b;\n-\t\t\tignore[i+2] = adap->nr;\n-\t\t\tignore[i+3] = 0x6f;\n-\t\t\tignore[i+4] = I2C_CLIENT_END;\n-\t\t} else\n-\t\t\tprintk(KERN_WARNING \"tuner: \"\n-\t\t\t \"too many options specified \"\n-\t\t\t \"in i2c probe ignore list!\\n\");\n-\t}\n-\treturn 1;\n-}\n \n static int tuner_remove(struct i2c_client *client)\n {\n@@ -1227,13 +1191,11 @@\n \n static struct v4l2_i2c_driver_data v4l2_i2c_data = {\n \t.name = \"tuner\",\n-\t.driverid = I2C_DRIVERID_TUNER,\n-\t.command = tuner_command,\n \t.probe = tuner_probe,\n \t.remove = tuner_remove,\n+\t.command = tuner_command,\n \t.suspend = tuner_suspend,\n \t.resume = tuner_resume,\n-\t.legacy_probe = tuner_legacy_probe,\n \t.id_table = tuner_id,\n };\n \n"} {"commit":"6ad69d3e1000574038ff9a6bf9a037c311e90493","subject":"vsdg: add a structure for the jive_anchor_node","message":"vsdg: add a structure for the jive_anchor_node\n\nLet jive_anchor_node be its own structure rather than alias for\njive_node.\n\nSigned-off-by: Helge Bahmann <c5618920f622561f9c0ec5c42219c4c08180149f@chaoticmind.net>\n","repos":"phate\/jive,phate\/jive,phate\/jive","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/jive\/vsdg\/anchor.h\n+++ include\/jive\/vsdg\/anchor.h\n@@ -1,5 +1,5 @@\n \/*\n- * Copyright 2012 Nico Rei\u00dfmann <nico.reissmann@gmail.com>\n+ * Copyright 2012 2013 Nico Rei\u00dfmann <nico.reissmann@gmail.com>\n * See COPYING for terms of redistribution.\n *\/\n \n@@ -8,9 +8,16 @@\n \n #include <jive\/vsdg\/node.h>\n \n-\/* node class *\/\n+\/* anchor node *\/\n \n-extern const jive_node_class JIVE_ANCHOR_NODE;\n+typedef struct jive_anchor_node jive_anchor_node;\n+typedef struct jive_node_class jive_anchor_node_class;\n+\n+extern const jive_anchor_node_class JIVE_ANCHOR_NODE;\n+\n+struct jive_anchor_node {\n+\tjive_node base;\n+};\n \n \/* node class inheritable methods *\/\n \n"} {"commit":"ef492f11efed9a6a1686bf914fb74468df59385c","subject":"sfc: Correctly initialise reset_method in siena_test_chip()","message":"sfc: Correctly initialise reset_method in siena_test_chip()\n\nSigned-off-by: Ben Hutchings <0672176982fbc629cc374f31a7a45ae1671abf90@solarflare.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/ethernet\/sfc\/siena.c\n+++ drivers\/net\/ethernet\/sfc\/siena.c\n@@ -170,7 +170,7 @@\n \n static int siena_test_chip(struct efx_nic *efx, struct efx_self_tests *tests)\n {\n-\tenum reset_type reset_method = reset_method;\n+\tenum reset_type reset_method = RESET_TYPE_ALL;\n \tint rc, rc2;\n \n \tefx_reset_down(efx, reset_method);\n"} {"commit":"491681ed63d52706b4840b7379dcff2be9333203","subject":"net\/ixgbe: fix LSC interrupt","message":"net\/ixgbe: fix LSC interrupt\n\nThere is a bug in previous fix for lsc interrupt.\nlsc interrupt is not disabled before delayed handler,\nthat cause the delayed handler be re-entered.\n\nFixes: 9b667210700e (\"net\/ixgbe: fix blocked interrupts\")\nCc: stable@dpdk.org\n\nSigned-off-by: Qi Zhang <9e9e58ffa71a29bb7b87766b362515be648fcbe0@intel.com>\nAcked-by: Wenzhuo Lu <58cb9036bdff9a5412edc3b9f70e105ccf59954f@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ixgbe\/ixgbe_ethdev.c\n+++ drivers\/net\/ixgbe\/ixgbe_ethdev.c\n@@ -4107,14 +4107,15 @@\n \t\t\ttimeout = IXGBE_LINK_DOWN_CHECK_TIMEOUT;\n \n \t\tixgbe_dev_link_status_print(dev);\n-\t\tintr->mask_original = intr->mask;\n-\t\t\/* only disable lsc interrupt *\/\n-\t\tintr->mask &= ~IXGBE_EIMS_LSC;\n \t\tif (rte_eal_alarm_set(timeout * 1000,\n \t\t\t\t ixgbe_dev_interrupt_delayed_handler, (void *)dev) < 0)\n \t\t\tPMD_DRV_LOG(ERR, \"Error setting alarm\");\n-\t\telse\n-\t\t\tintr->mask = intr->mask_original;\n+\t\telse {\n+\t\t\t\/* remember original mask *\/\n+\t\t\tintr->mask_original = intr->mask;\n+\t\t\t\/* only disable lsc interrupt *\/\n+\t\t\tintr->mask &= ~IXGBE_EIMS_LSC;\n+\t\t}\n \t}\n \n \tPMD_DRV_LOG(DEBUG, \"enable intr immediately\");\n"} {"commit":"917d539d842009f17e38c493afcbe15a290a5f27","subject":"fix a cpplint error","message":"fix a cpplint error\n","repos":"plenluno\/libj,tempbottle\/libj,plenluno\/libj,tempbottle\/libj","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/libj\/debug_print.h\n+++ include\/libj\/debug_print.h\n@@ -1,7 +1,7 @@\n \/\/ Copyright (c) 2013 Plenluno All rights reserved.\n \n-#ifndef LIBJ_DEBUG_H_\n-#define LIBJ_DEBUG_H_\n+#ifndef LIBJ_DEBUG_PRINT_H_\n+#define LIBJ_DEBUG_PRINT_H_\n \n #include <libj\/console.h>\n \n@@ -15,4 +15,4 @@\n # define LIBJ_DEBUG_PRINT(FMT, ...)\n #endif\n \n-#endif \/\/ LIBJ_DEBUG_H_\n+#endif \/\/ LIBJ_DEBUG_PRINT_H_\n"} {"commit":"377d65147082727ff2a91b65051de27306ab4809","subject":"- add some streaminfo","message":"- add some streaminfo\n\nOriginal commit message from CVS:\n- add some streaminfo\n- sort of add buttoninfo\n- loop to get func\n- fixup seek\/flush a bit (still have a52dec problems though)\n- add action signals for dvd menu button interaction\n- misc cleanups\n","repos":"freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,Lachann\/gst-plugins-ugly,sebras\/gst-plugins-ugly,ylatuya\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,ylatuya\/gst-plugins-ugly,sebras\/gst-plugins-ugly,collects\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,collects\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,Lachann\/gst-plugins-ugly,jahrome\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,Kurento\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly,alessandrod\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,PPCDroid\/external-gst-plugins-ugly,knuesel\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,cablelabs\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,fluendo\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,prajnashi\/gst-plugins-ugly,alessandrod\/gst-plugins-ugly,ylatuya\/gst-plugins-ugly,jpakkane\/gstreamer-plugins-ugly,krieger-od\/gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly,jpakkane\/gstreamer-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,fluendo\/gst-plugins-ugly,GrokImageCompression\/gst-plugins-ugly,collects\/gst-plugins-ugly,sebras\/gst-plugins-ugly,prajnashi\/gst-plugins-ugly,collects\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-ugly,matsu\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,alessandrod\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,GStreamer\/gst-plugins-ugly,PPCDroid\/external-gst-plugins-ugly,GrokImageCompression\/gst-plugins-ugly,cablelabs\/gst-plugins-ugly,PPCDroid\/external-gst-plugins-ugly,cablelabs\/gst-plugins-ugly,Kurento\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,matsu\/gst-plugins-ugly,jahrome\/gst-plugins-ugly,jar1karp\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,ahmedammar\/platform_external_gst_plugins_ugly,GrokImageCompression\/gst-plugins-ugly,knuesel\/gst-plugins-ugly,prajnashi\/gst-plugins-ugly,Distrotech\/gst-plugins-ugly,reynaldo-samsung\/gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,jpakkane\/gstreamer-plugins-ugly,matsu\/gst-plugins-ugly,krieger-od\/gst-plugins-ugly,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-ugly,fluendo\/gst-plugins-ugly,jahrome\/gst-plugins-ugly,StreamUtils\/gst-plugins-ugly,shelsonjava\/gst-plugins-ugly,matsu\/gst-plugins-ugly,Lachann\/gst-plugins-ugly,surround-io\/gst-plugins-ugly,knuesel\/gst-plugins-ugly,Kurento\/gst-plugins-ugly","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ext\/dvdnav\/dvdnavsrc.c\n+++ ext\/dvdnav\/dvdnavsrc.c\n@@ -29,6 +29,7 @@\n #include \"config.h\"\n \n #include <dvdnav\/dvdnav.h>\n+#include <dvdread\/nav_print.h>\n \n #define GST_TYPE_DVDNAVSRC \\\n (dvdnavsrc_get_type())\n@@ -49,18 +50,27 @@\n \n \/* pads *\/\n GstPad *srcpad;\n+ GstCaps *streaminfo;\n \n \/* location *\/\n gchar *location;\n- gboolean new_seek;\n+\n+ gboolean did_seek;\n+ gboolean need_flush;\n GstBufferPool *bufferpool;\n \n int title, chapter, angle;\n dvdnav_t *dvdnav;\n+\n+ GstCaps *buttoninfo;\n };\n \n struct _DVDNavSrcClass {\n GstElementClass parent_class;\n+\n+ void (*button_pressed) (DVDNavSrc *src, int button);\n+ void (*pointer_select) (DVDNavSrc *src, int x, int y);\n+ void (*pointer_activate) (DVDNavSrc *src, int x, int y);\n };\n \n \/* elementfactory information *\/\n@@ -77,13 +87,17 @@\n \n \/* DVDNavSrc signals and args *\/\n enum {\n- \/* FILL ME *\/\n+ BUTTON_PRESSED_SIGNAL,\n+ POINTER_SELECT_SIGNAL,\n+ POINTER_ACTIVATE_SIGNAL,\n LAST_SIGNAL\n };\n \n enum {\n ARG_0,\n ARG_LOCATION,\n+ ARG_STREAMINFO,\n+ ARG_BUTTONINFO,\n ARG_TITLE_STRING,\n ARG_TITLE,\n ARG_CHAPTER,\n@@ -104,8 +118,7 @@\n static void \t\tdvdnavsrc_set_property\t\t(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);\n static void \t\tdvdnavsrc_get_property\t\t(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);\n \n-\/*static GstBuffer *\tdvdnavsrc_get\t\t(GstPad *pad); *\/\n-static void \tdvdnavsrc_loop\t\t(GstElement *element);\n+static GstBuffer *\tdvdnavsrc_get\t\t(GstPad *pad);\n \/*static GstBuffer *\tdvdnavsrc_get_region\t(GstPad *pad,gulong offset,gulong size); *\/\n static gboolean \tdvdnavsrc_event \t\t(GstPad *pad, GstEvent *event);\n static const GstEventMask*\n@@ -122,15 +135,21 @@\n static const GstQueryType*\n \t\t\tdvdnavsrc_get_query_types \t(GstPad *pad);\n \n-static gboolean \tdvdnavsrc_close\t\t(DVDNavSrc *src);\n-static gboolean \tdvdnavsrc_open\t\t(DVDNavSrc *src);\n-static void dvdnavsrc_print_event (DVDNavSrc *src, guint8 *data, int event, int len);\n+static gboolean\t\tdvdnavsrc_close\t\t(DVDNavSrc *src);\n+static gboolean\t\tdvdnavsrc_open\t\t(DVDNavSrc *src);\n+static gboolean\t\tdvdnavsrc_is_open\t(DVDNavSrc *src);\n+static void\t\tdvdnavsrc_print_event\t(DVDNavSrc *src, guint8 *data, int event, int len);\n+static void\t\tdvdnavsrc_update_streaminfo (DVDNavSrc *src);\n+static void\t\tdvdnavsrc_update_buttoninfo (DVDNavSrc *src);\n+static void\t\tdvdnavsrc_button_pressed (DVDNavSrc *src, int button);\n+static void\t\tdvdnavsrc_pointer_select (DVDNavSrc *src, int x, int y);\n+static void\t\tdvdnavsrc_pointer_activate (DVDNavSrc *src, int x, int y);\n \n static GstElementStateReturn \tdvdnavsrc_change_state \t(GstElement *element);\n \n \n static GstElementClass *parent_class = NULL;\n-\/*static guint dvdnavsrc_signals[LAST_SIGNAL] = { 0 }; *\/\n+static guint dvdnavsrc_signals[LAST_SIGNAL] = { 0 };\n \n static GstFormat sector_format;\n static GstFormat title_format;\n@@ -174,21 +193,61 @@\n \n parent_class = g_type_class_ref (GST_TYPE_ELEMENT);\n \n- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_LOCATION,\n- g_param_spec_string(\"location\",\"location\",\"location\",\n+ dvdnavsrc_signals[BUTTON_PRESSED_SIGNAL] =\n+ g_signal_new (\"button_pressed\",\n+ G_TYPE_FROM_CLASS (klass),\n+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,\n+ G_STRUCT_OFFSET (DVDNavSrcClass, button_pressed),\n+ NULL, NULL,\n+ gst_marshal_VOID__INT,\n+ G_TYPE_NONE, 1,\n+ G_TYPE_INT);\n+\n+ dvdnavsrc_signals[POINTER_SELECT_SIGNAL] =\n+ g_signal_new (\"pointer_select\",\n+ G_TYPE_FROM_CLASS (klass),\n+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,\n+ G_STRUCT_OFFSET (DVDNavSrcClass, pointer_select),\n+ NULL, NULL,\n+ gst_marshal_VOID__INT_INT,\n+ G_TYPE_NONE, 2,\n+ G_TYPE_INT, G_TYPE_INT);\n+\n+ dvdnavsrc_signals[POINTER_ACTIVATE_SIGNAL] =\n+ g_signal_new (\"pointer_activate\",\n+ G_TYPE_FROM_CLASS (klass),\n+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,\n+ G_STRUCT_OFFSET (DVDNavSrcClass, pointer_activate),\n+ NULL, NULL,\n+ gst_marshal_VOID__INT_INT,\n+ G_TYPE_NONE, 2,\n+ G_TYPE_INT, G_TYPE_INT);\n+\n+ klass->button_pressed = dvdnavsrc_button_pressed;\n+ klass->pointer_select = dvdnavsrc_pointer_select;\n+ klass->pointer_activate = dvdnavsrc_pointer_activate;\n+ \n+ g_object_class_install_property(gobject_class, ARG_LOCATION,\n+ g_param_spec_string(\"location\", \"location\", \"location\",\n NULL, G_PARAM_READWRITE));\n- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TITLE_STRING,\n- g_param_spec_string(\"title_string\",\"title string\",\"DVD title string\",\n+ g_object_class_install_property(gobject_class, ARG_TITLE_STRING,\n+ g_param_spec_string(\"title_string\", \"title string\", \"DVD title string\",\n NULL, G_PARAM_READABLE));\n- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_TITLE,\n- g_param_spec_int(\"title\",\"title\",\"title\",\n+ g_object_class_install_property(gobject_class, ARG_TITLE,\n+ g_param_spec_int(\"title\", \"title\", \"title\",\n 0,99,1,G_PARAM_READWRITE));\n- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CHAPTER,\n- g_param_spec_int(\"chapter\",\"chapter\",\"chapter\",\n+ g_object_class_install_property(gobject_class, ARG_CHAPTER,\n+ g_param_spec_int(\"chapter\", \"chapter\", \"chapter\",\n 1,999,1,G_PARAM_READWRITE));\n- g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ANGLE,\n- g_param_spec_int(\"angle\",\"angle\",\"angle\",\n+ g_object_class_install_property(gobject_class, ARG_ANGLE,\n+ g_param_spec_int(\"angle\", \"angle\", \"angle\",\n 1,9,1,G_PARAM_READWRITE));\n+ g_object_class_install_property(gobject_class, ARG_STREAMINFO,\n+ g_param_spec_boxed(\"streaminfo\", \"streaminfo\", \"streaminfo\",\n+ GST_TYPE_CAPS, G_PARAM_READABLE));\n+ g_object_class_install_property(gobject_class, ARG_BUTTONINFO,\n+ g_param_spec_boxed(\"buttoninfo\", \"buttoninfo\", \"buttoninfo\",\n+ GST_TYPE_CAPS, G_PARAM_READABLE));\n \n gobject_class->set_property = GST_DEBUG_FUNCPTR(dvdnavsrc_set_property);\n gobject_class->get_property = GST_DEBUG_FUNCPTR(dvdnavsrc_get_property);\n@@ -197,29 +256,30 @@\n }\n \n static void \n-dvdnavsrc_init (DVDNavSrc *dvdnavsrc) \n-{\n- gst_element_set_loop_function (GST_ELEMENT(dvdnavsrc), GST_DEBUG_FUNCPTR(dvdnavsrc_loop));\n-\n- dvdnavsrc->srcpad = gst_pad_new (\"src\", GST_PAD_SRC);\n-\n- \/\/gst_pad_set_get_function (dvdnavsrc->srcpad, dvdnavsrc_get);\n- gst_pad_set_event_function (dvdnavsrc->srcpad, dvdnavsrc_event);\n- gst_pad_set_event_mask_function (dvdnavsrc->srcpad, dvdnavsrc_get_event_mask);\n- \/*gst_pad_set_convert_function (dvdnavsrc->srcpad, dvdnavsrc_convert);*\/\n- gst_pad_set_query_function (dvdnavsrc->srcpad, dvdnavsrc_query);\n- gst_pad_set_query_type_function (dvdnavsrc->srcpad, dvdnavsrc_get_query_types);\n- gst_pad_set_formats_function (dvdnavsrc->srcpad, dvdnavsrc_get_formats);\n-\n- gst_element_add_pad (GST_ELEMENT (dvdnavsrc), dvdnavsrc->srcpad);\n-\n- dvdnavsrc->bufferpool = gst_buffer_pool_get_default (DVD_VIDEO_LB_LEN, 2);\n-\n- dvdnavsrc->location = g_strdup(\"\/dev\/dvd\");\n- dvdnavsrc->new_seek = FALSE;\n- dvdnavsrc->title = 0;\n- dvdnavsrc->chapter = 0;\n- dvdnavsrc->angle = 1;\n+dvdnavsrc_init (DVDNavSrc *src) \n+{\n+ src->srcpad = gst_pad_new (\"src\", GST_PAD_SRC);\n+\n+ gst_pad_set_get_function (src->srcpad, dvdnavsrc_get);\n+ gst_pad_set_event_function (src->srcpad, dvdnavsrc_event);\n+ gst_pad_set_event_mask_function (src->srcpad, dvdnavsrc_get_event_mask);\n+ \/*gst_pad_set_convert_function (src->srcpad, dvdnavsrc_convert);*\/\n+ gst_pad_set_query_function (src->srcpad, dvdnavsrc_query);\n+ gst_pad_set_query_type_function (src->srcpad, dvdnavsrc_get_query_types);\n+ gst_pad_set_formats_function (src->srcpad, dvdnavsrc_get_formats);\n+\n+ gst_element_add_pad (GST_ELEMENT (src), src->srcpad);\n+\n+ src->bufferpool = gst_buffer_pool_get_default (DVD_VIDEO_LB_LEN, 2);\n+\n+ src->location = g_strdup(\"\/dev\/dvd\");\n+ src->did_seek = FALSE;\n+ src->need_flush = FALSE;\n+ src->title = 0;\n+ src->chapter = 0;\n+ src->angle = 1;\n+ src->streaminfo = NULL;\n+ src->buttoninfo = NULL;\n }\n \n \/* FIXME: this code is not being used *\/\n@@ -268,11 +328,11 @@\n break;\n case ARG_TITLE:\n src->title = g_value_get_int (value);\n- src->new_seek = TRUE;\n+ src->did_seek = TRUE;\n break;\n case ARG_CHAPTER:\n src->chapter = g_value_get_int (value);\n- src->new_seek = TRUE;\n+ src->did_seek = TRUE;\n break;\n case ARG_ANGLE:\n src->angle = g_value_get_int (value);\n@@ -299,9 +359,18 @@\n case ARG_LOCATION:\n g_value_set_string (value, src->location);\n break;\n+ case ARG_STREAMINFO:\n+ g_value_set_boxed (value, src->streaminfo);\n+ break;\n+ case ARG_BUTTONINFO:\n+ g_value_set_boxed (value, src->buttoninfo);\n+ break;\n case ARG_TITLE_STRING:\n- if (dvdnav_get_title_string(src->dvdnav, &title_string) != DVDNAV_STATUS_OK) {\n- g_value_set_string (value, \"[error getting DVD title]\");\n+ if (!dvdnavsrc_is_open(src)) {\n+ g_value_set_string (value, \"\");\n+ } else if (dvdnav_get_title_string(src->dvdnav, &title_string) !=\n+ DVDNAV_STATUS_OK) {\n+ g_value_set_string (value, \"UNKNOWN\");\n } else {\n g_value_set_string (value, title_string);\n }\n@@ -417,15 +486,105 @@\n }\n *\/\n \n+ src->did_seek = TRUE;\n+\n return TRUE;\n }\n \n-\/*\n static void\n-dvdnavsrc_event (GstPad *pad, GstElement *element)\n-{\n-}\n-*\/\n+dvdnavsrc_update_streaminfo (DVDNavSrc *src)\n+{\n+ GstCaps *caps;\n+ GstProps *props;\n+ GstPropsEntry *entry;\n+ gint64 value;\n+\n+ props = gst_props_empty_new ();\n+\n+ \/*\n+ entry = gst_props_entry_new (\"title_string\", GST_PROPS_STRING (\"\"));\n+ gst_props_add_entry (props, entry);\n+ *\/\n+\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_TOTAL, &title_format, &value)) {\n+ entry = gst_props_entry_new (\"titles\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_POSITION, &title_format, &value)) {\n+ entry = gst_props_entry_new (\"title\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_TOTAL, &chapter_format, &value)) {\n+ entry = gst_props_entry_new (\"chapters\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_POSITION, &chapter_format, &value)) {\n+ entry = gst_props_entry_new (\"chapter\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_TOTAL, &angle_format, &value)) {\n+ entry = gst_props_entry_new (\"angles\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+ if (dvdnavsrc_query(src->srcpad, GST_QUERY_POSITION, &angle_format, &value)) {\n+ entry = gst_props_entry_new (\"angle\", GST_PROPS_INT (value));\n+ gst_props_add_entry (props, entry);\n+ }\n+\n+ caps = gst_caps_new (\"dvdnavsrc_streaminfo\",\n+ \"application\/x-gst-streaminfo\",\n+ props);\n+ if (src->streaminfo) {\n+ gst_caps_unref (src->streaminfo);\n+ }\n+ src->streaminfo = caps;\n+ g_object_notify (G_OBJECT (src), \"streaminfo\");\n+}\n+\n+static void\n+dvdnavsrc_update_buttoninfo (DVDNavSrc *src)\n+{\n+ GstCaps *caps;\n+ GstProps *props;\n+ GstPropsEntry *entry;\n+ pci_t *pci;\n+\n+ pci = dvdnav_get_current_nav_pci(src->dvdnav);\n+ fprintf(stderr, \"update button info total:%d\\n\", pci->hli.hl_gi.btn_ns);\n+\n+ props = gst_props_empty_new ();\n+\n+ entry = gst_props_entry_new (\"total\", GST_PROPS_INT (pci->hli.hl_gi.btn_ns));\n+ gst_props_add_entry (props, entry);\n+\n+ caps = gst_caps_new (\"dvdnavsrc_buttoninfo\",\n+ \"application\/x-gst-dvdnavsrc-buttoninfo\",\n+ props);\n+ if (src->buttoninfo) {\n+ gst_caps_unref (src->buttoninfo);\n+ }\n+ src->buttoninfo = caps;\n+ g_object_notify (G_OBJECT (src), \"buttoninfo\");\n+}\n+\n+static void\n+dvdnavsrc_button_pressed (DVDNavSrc *src, int button)\n+{\n+}\n+\n+static void\n+dvdnavsrc_pointer_select (DVDNavSrc *src, int x, int y)\n+{\n+ dvdnav_mouse_select(src->dvdnav, x, y);\n+}\n+\n+static void\n+dvdnavsrc_pointer_activate (DVDNavSrc *src, int x, int y)\n+{\n+ dvdnav_mouse_activate(src->dvdnav, x, y);\n+}\n \n static gchar *\n dvdnav_get_event_name(int event)\n@@ -513,8 +672,20 @@\n case DVDNAV_NAV_PACKET:\n {\n dvdnav_nav_packet_event_t *event = (dvdnav_nav_packet_event_t *)data;\n+ pci_t *pci;\n+ dsi_t *dsi;\n+ \/*\n+ pci = event->pci;\n+ dsi = event->dsi;\n+ *\/\n+ pci = dvdnav_get_current_nav_pci(src->dvdnav);\n+ dsi = dvdnav_get_current_nav_dsi(src->dvdnav);\n fprintf (stderr, \" pci: %p\\n\", event->pci);\n fprintf (stderr, \" dsi: %p\\n\", event->dsi);\n+ \/*\n+ navPrint_PCI(pci);\n+ navPrint_DSI(dsi);\n+ *\/\n }\n break;\n case DVDNAV_STOP:\n@@ -545,137 +716,100 @@\n }\n }\n \n-static void\n-dvdnavsrc_loop (GstElement *element)\n+static GstBuffer *\n+dvdnavsrc_get (GstPad *pad) \n {\n DVDNavSrc *src;\n- int done;\n-\n- g_return_if_fail (element != NULL);\n- g_return_if_fail (GST_IS_DVDNAVSRC (element));\n-\n- src = DVDNAVSRC (element);\n- g_return_if_fail (dvdnavsrc_is_open (src));\n-\n- done = 0;\n-\n- while (!done) {\n- int event, len;\n- GstBuffer *buf;\n- guint8 *data;\n-\n+ int event, len;\n+ GstBuffer *buf;\n+ guint8 *data;\n+ gboolean have_buf;\n+\n+ g_return_val_if_fail (pad != NULL, NULL);\n+ g_return_val_if_fail (GST_IS_PAD (pad), NULL);\n+\n+ src = DVDNAVSRC (gst_pad_get_parent (pad));\n+ g_return_val_if_fail (dvdnavsrc_is_open (src), NULL);\n+\n+ if (src->did_seek) {\n+ GstEvent *event;\n+\n+ src->did_seek = FALSE;\n+ GST_DEBUG (GST_CAT_EVENT, \"dvdnavsrc sending discont\");\n+ event = gst_event_new_discontinuous (FALSE, 0);\n+ src->need_flush = FALSE;\n+ return GST_BUFFER (event);\n+ }\n+ if (src->need_flush) {\n+ src->need_flush = FALSE;\n+ GST_DEBUG (GST_CAT_EVENT, \"dvdnavsrc sending flush\");\n+ return GST_BUFFER (gst_event_new_flush());\n+ }\n+\n+ \/* loop processing blocks until data is pushed *\/\n+ have_buf = FALSE;\n+ while (!have_buf) {\n \/* allocate a pool for the buffer data *\/\n \/* FIXME: mem leak on non BLOCK_OK events *\/\n buf = gst_buffer_new_from_pool (src->bufferpool, DVD_VIDEO_LB_LEN, 0);\n if (!buf) {\n- gst_element_error (GST_ELEMENT(src),\n- \"Failed to create a new GstBuffer\");\n- return;\n+ gst_element_error (GST_ELEMENT (src), \"Failed to create a new GstBuffer\");\n+ return NULL;\n }\n data = GST_BUFFER_DATA(buf);\n \n- if (dvdnav_get_next_block (src->dvdnav, data, &event, &len) != DVDNAV_STATUS_OK) {\n- fprintf (stderr, \"dvdnav_get_next_block error: %s\\n\", dvdnav_err_to_string(src->dvdnav));\n- return;\n+ if (dvdnav_get_next_block (src->dvdnav, data, &event, &len) !=\n+ DVDNAV_STATUS_OK) {\n+ gst_element_error (GST_ELEMENT (src), \"dvdnav_get_next_block error: %s\\n\",\n+ dvdnav_err_to_string(src->dvdnav));\n+ return NULL;\n }\n \n switch (event) {\n+ case DVDNAV_NOP:\n+ break;\n case DVDNAV_BLOCK_OK:\n- g_return_if_fail (GST_BUFFER_DATA(buf) != NULL);\n- g_return_if_fail (GST_BUFFER_SIZE(buf) == DVD_VIDEO_LB_LEN);\n- gst_pad_push (src->srcpad, buf);\n- break;\n- case DVDNAV_NOP:\n- dvdnavsrc_print_event (src, data, event, len);\n+ g_return_val_if_fail (GST_BUFFER_DATA(buf) != NULL, NULL);\n+ g_return_val_if_fail (GST_BUFFER_SIZE(buf) == DVD_VIDEO_LB_LEN, NULL);\n+ have_buf = TRUE;\n break;\n case DVDNAV_STILL_FRAME:\n- \/* FIXME: we should pause for event->length seconds before dvdnav_still_skip *\/\n+ \/* FIXME: we should pause for event->length seconds before\n+ * dvdnav_still_skip *\/\n dvdnavsrc_print_event (src, data, event, len);\n if (dvdnav_still_skip (src->dvdnav) != DVDNAV_STATUS_OK) {\n- fprintf (stderr, \"dvdnav_still_skip error: %s\\n\", dvdnav_err_to_string(src->dvdnav));\n+ gst_element_error (GST_ELEMENT (src), \"dvdnav_still_skip error: %s\\n\",\n+ dvdnav_err_to_string(src->dvdnav));\n \/* FIXME: close the stream??? *\/\n }\n break;\n- case DVDNAV_SPU_STREAM_CHANGE:\n- dvdnavsrc_print_event (src, data, event, len);\n+ case DVDNAV_STOP:\n+ GST_DEBUG (GST_CAT_EVENT, \"dvdnavsrc sending eos\");\n+ gst_element_set_eos (GST_ELEMENT (src));\n+ dvdnavsrc_close(src);\n+ buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));\n+ have_buf = TRUE;\n break;\n- case DVDNAV_AUDIO_STREAM_CHANGE:\n- dvdnavsrc_print_event (src, data, event, len);\n+ case DVDNAV_CELL_CHANGE:\n+ dvdnavsrc_update_streaminfo (src);\n+ break;\n+ case DVDNAV_NAV_PACKET:\n+ if (0) dvdnavsrc_update_buttoninfo (src);\n break;\n case DVDNAV_VTS_CHANGE:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n- case DVDNAV_CELL_CHANGE:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n- case DVDNAV_NAV_PACKET:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n- case DVDNAV_STOP:\n- done = 1;\n- gst_element_set_eos (GST_ELEMENT (src));\n- dvdnavsrc_close(src);\n- break;\n+ case DVDNAV_SPU_STREAM_CHANGE:\n+ case DVDNAV_AUDIO_STREAM_CHANGE:\n case DVDNAV_HIGHLIGHT:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n case DVDNAV_SPU_CLUT_CHANGE:\n- \/* ignore the change events. I'm dont know what I'm meant to do with them *\/\n- \/* and there's no struct for it *\/\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n case DVDNAV_SEEK_DONE:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n case DVDNAV_HOP_CHANNEL:\n- dvdnavsrc_print_event (src, data, event, len);\n- break;\n default:\n dvdnavsrc_print_event (src, data, event, len);\n break;\n }\n }\n-}\n-\n-#if 0\n- static GstBuffer *\n-dvdnavsrc_get (GstPad *pad) \n-{\n- DVDNavSrc *src;\n- GstBuffer *buf;\n-\n- g_return_val_if_fail (pad != NULL, NULL);\n- g_return_val_if_fail (GST_IS_PAD (pad), NULL);\n-\n- src = DVDNAVSRC (gst_pad_get_parent (pad));\n- g_return_val_if_fail (gstdvdnav_is_open (src), NULL);\n-\n- \/* create the buffer *\/\n- \/* FIXME: should eventually use a bufferpool for this *\/\n- buf = gst_buffer_new ();\n- g_return_val_if_fail (buf, NULL);\n-\n- \/* allocate the space for the buffer data *\/\n- GST_BUFFER_DATA (buf) = g_malloc (1024 * DVD_VIDEO_LB_LEN);\n- g_return_val_if_fail (GST_BUFFER_DATA (buf) != NULL, NULL);\n-\n- if (src->new_seek) {\n- _seek(src, src->titleid, src->chapid, src->angle);\n- }\n-\n- \/* read it in from the file *\/\n- if (_read (src, src->angle, src->new_seek, buf)) {\n- gst_element_signal_eos (GST_ELEMENT (src));\n- return NULL;\n- }\n-\n- if (src->new_seek) {\n- src->new_seek = FALSE;\n- }\n-\n return buf;\n }\n-#endif\n \n \/* open the file, necessary to go to RUNNING state *\/\n static gboolean \n@@ -775,6 +909,7 @@\n return GST_STATE_FAILURE;\n }\n }\n+ src->streaminfo = NULL;\n break;\n case GST_STATE_PAUSED_TO_PLAYING:\n break;\n@@ -888,7 +1023,6 @@\n default:\n goto error;\n }\n- g_message(\"seek->chap %d->%d\", part, new_part);\n \/*if (dvdnav_part_search(src->dvdnav, new_part) !=*\/\n if (dvdnav_part_play(src->dvdnav, title, new_part) !=\n DVDNAV_STATUS_OK) {\n@@ -898,8 +1032,6 @@\n DVDNAV_STATUS_OK) {\n goto error;\n }\n- g_message(\"seek->chap after:%d\", part);\n- g_message(\"seek->chap->cur done\");\n } else if (format == angle_format) {\n switch (GST_EVENT_SEEK_METHOD (event)) {\n case GST_SEEK_METHOD_SET:\n@@ -926,8 +1058,13 @@\n goto error;\n }\n }\n+ src->did_seek = TRUE;\n+ src->need_flush = GST_EVENT_SEEK_FLAGS(event) & GST_SEEK_FLAG_FLUSH;\n break;\n }\n+ case GST_EVENT_FLUSH:\n+ src->need_flush = TRUE;\n+ break;\n default:\n goto error;\n }\n"} {"commit":"1daf30a70db9701073a6ac874ae5d063177076af","subject":"All tests pass. Thank god.","message":"All tests pass. Thank god.\n","repos":"jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/sandbox\/sandbox.h\n+++ tests\/sandbox\/sandbox.h\n@@ -266,6 +266,8 @@\n \/\/ Setup the sandbox\n stoke::Sandbox sb;\n stoke::CpuState tc;\n+ stoke::StateGen sg(&sb);\n+ sg.get(tc);\n \n sb.set_max_jumps(100);\n sb.insert_input(tc);\n@@ -298,9 +300,12 @@\n \/\/ Setup the sandbox\n stoke::Sandbox sb;\n stoke::CpuState tc;\n+ stoke::StateGen sg(&sb);\n+ sg.get(tc);\n \n sb.set_max_jumps(17);\n sb.insert_input(tc);\n+\tsb.set_abi_check(false);\n \n \/\/ Run it\n sb.run({c, x64asm::RegSet::empty(), x64asm::RegSet::empty()});\n@@ -328,9 +333,12 @@\n \/\/ Setup the sandbox\n stoke::Sandbox sb;\n stoke::CpuState tc;\n+ stoke::StateGen sg(&sb);\n+ sg.get(tc);\n \n sb.set_max_jumps(16);\n sb.insert_input(tc);\n+\tsb.set_abi_check(false);\n \n \/\/ Run it\n sb.run({c, x64asm::RegSet::empty(), x64asm::RegSet::empty()});\n"} {"commit":"ae256f50d5c4aef5d701342058b80194454409f5","subject":"Update rs.h","message":"Update rs.h","repos":"IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/librealsense2\/rs.h\n+++ include\/librealsense2\/rs.h\n@@ -83,8 +83,10 @@\n void rs2_reset_logger( rs2_error ** error);\n \n \/**\n-* Enable rolling log file upon reaching max size.\n-* Must have permissions of removing\/renaming files in log file directory.\n+* Enable rolling log file when used with rs2_log_to_file:\n+* Upon reaching (max_size\/2) bytes, the log will be renamed with an \".old\" suffix and a new log created. Any\n+* previous .old file will be erased.\n+* Must have permissions to remove\/rename files in log file directory.\n * \\param[in] max_size max file size in bytes\n * \\param[out] error if non-null, receives any error that occurs during this call, otherwise, errors are ignored\n *\/\n"} {"commit":"fb716a56c0a72018d62bda3db3a131cc49994579","subject":"add a reminder comment","message":"add a reminder comment\n\ngit-svn-id: 756506b3b0ea8c31733a8f0a5bb416c7e269da3d@221 28bd50df-7adb-d945-0439-6e466c6a13cc\n","repos":"vehar\/velociraptor8,Uni-\/notepad2-mod,roukaour\/notepad2-mod,bluenlive\/notepad2-mod,bluenlive\/notepad2-mod,vehar\/velociraptor8,vehar\/velociraptor8,capturePointer\/notepad2-mod,Uni-\/notepad2-mod,vehar\/velociraptor8,XhmikosR\/notepad2-mod,XhmikosR\/notepad2-mod,roukaour\/notepad2-mod,Uni-\/notepad2-mod,vehar\/velociraptor8,capturePointer\/notepad2-mod,capturePointer\/notepad2-mod,bluenlive\/notepad2-mod,capturePointer\/notepad2-mod,Uni-\/notepad2-mod,bluenlive\/notepad2-mod,vehar\/velociraptor8,capturePointer\/notepad2-mod,roukaour\/notepad2-mod,Uni-\/notepad2-mod,Uni-\/notepad2-mod,capturePointer\/notepad2-mod,roukaour\/notepad2-mod,XhmikosR\/notepad2-mod,roukaour\/notepad2-mod,roukaour\/notepad2-mod,bluenlive\/notepad2-mod,XhmikosR\/notepad2-mod,XhmikosR\/notepad2-mod,XhmikosR\/notepad2-mod","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/Styles.c\n+++ src\/Styles.c\n@@ -1451,6 +1451,8 @@\n \r\n \r\n \/\/ This array holds all the lexers...\r\n+\/\/ Don't forget to change the number in Style_SetHTMLLexer and Style_SetXMLLexer\r\n+\/\/ if you change this array\r\n PEDITLEXER pLexArray[NUMLEXERS] =\r\n {\r\n &lexDefault,\r\n"} {"commit":"4c17cdf5ecd4647f6ab145ea4c2c45eed0a90c26","subject":"Fixing extra TSRMLS_CC","message":"Fixing extra TSRMLS_CC\n","repos":"sjinks\/zephir,zephir-lang\/zephir,sergeyklay\/zephir,dreamsxin\/zephir,janusnic\/zephir,patrick-zippenfenig\/zephir,dreamsxin\/zephir,gsouf\/zephir,cesarmarinhorj\/zephir,vpg\/zephir,sjinks\/zephir,KorsaR-ZN\/zephir,janusnic\/zephir,phalcon\/zephir,sergeyklay\/zephir,cesarmarinhorj\/zephir,zephir-lang\/zephir,KorsaR-ZN\/zephir,carlmcdade\/zephir,fezfez\/zephir,ovr\/zephir,phalcon\/zephir,janusnic\/zephir,karakurihiden\/zephir,ovr\/zephir,phalcon\/zephir,cesarmarinhorj\/zephir,fezfez\/zephir,phalcon\/zephir,steffengy\/zephir,carlmcdade\/zephir,phalcon\/zephir,steffengy\/zephir,KorsaR-ZN\/zephir,gsouf\/zephir,karakurihiden\/zephir,joeyhub\/zephir,dreamsxin\/zephir,sergeyklay\/zephir,sjinks\/zephir,aaam\/zephir,aaam\/zephir,sjinks\/zephir,fezfez\/zephir,steffengy\/zephir,vpg\/zephir,steffengy\/zephir,aaam\/zephir,KorsaR-ZN\/zephir,sjinks\/zephir,zephir-lang\/zephir,patrick-zippenfenig\/zephir,zephir-lang\/zephir,phalcon\/zephir,joeyhub\/zephir,dreamsxin\/zephir,janusnic\/zephir,karakurihiden\/zephir,joeyhub\/zephir,carlmcdade\/zephir,sergeyklay\/zephir,joeyhub\/zephir,KorsaR-ZN\/zephir,dreamsxin\/zephir,ovr\/zephir,cesarmarinhorj\/zephir,gsouf\/zephir,aaam\/zephir,cesarmarinhorj\/zephir,aaam\/zephir,aaam\/zephir,steffengy\/zephir,janusnic\/zephir,patrick-zippenfenig\/zephir,cesarmarinhorj\/zephir,vpg\/zephir,sergeyklay\/zephir,fezfez\/zephir,vpg\/zephir,fezfez\/zephir,fezfez\/zephir,dreamsxin\/zephir,gsouf\/zephir,karakurihiden\/zephir,janusnic\/zephir,ovr\/zephir,gsouf\/zephir,patrick-zippenfenig\/zephir,patrick-zippenfenig\/zephir,carlmcdade\/zephir,sergeyklay\/zephir,carlmcdade\/zephir,zephir-lang\/zephir,patrick-zippenfenig\/zephir,vpg\/zephir,karakurihiden\/zephir,carlmcdade\/zephir,steffengy\/zephir,karakurihiden\/zephir,KorsaR-ZN\/zephir,joeyhub\/zephir,sjinks\/zephir,vpg\/zephir,joeyhub\/zephir,gsouf\/zephir","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/kernel\/operators.h\n+++ ext\/kernel\/operators.h\n@@ -83,11 +83,11 @@\n void zephir_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);\n \n #if PHP_VERSION_ID < 50400\n-#define zephir_sub_function(result, left, right) sub_function(result, left, right)\n+#define zephir_sub_function(result, left, right) sub_function(result, left, right TSRMLS_CC)\n #define zephir_add_function(result, left, right) zephir_add_function_ex(result, left, right TSRMLS_CC)\n #else\n-#define zephir_add_function(result, left, right) fast_add_function(result, left, right)\n-#define zephir_sub_function(result, left, right) fast_sub_function(result, left, right)\n+#define zephir_add_function(result, left, right) fast_add_function(result, left, right TSRMLS_CC)\n+#define zephir_sub_function(result, left, right) fast_sub_function(result, left, right TSRMLS_CC)\n #endif\n \n \/** Operator functions *\/\n@@ -162,7 +162,7 @@\n \t\t\tif (Z_TYPE_P(z) == IS_LONG && Z_TYPE_P(v) == IS_DOUBLE) { \\\n \t\t\t\tZ_LVAL_P(z) += Z_DVAL_P(v); \\\n \t\t\t} else { \\\n-\t\t\t\tzephir_add_function(&tmp, z, v TSRMLS_CC); \\\n+\t\t\t\tzephir_add_function(&tmp, z, v); \\\n \t\t\t\tif (Z_TYPE(tmp) == IS_LONG) { \\\n \t\t\t\t\tZ_LVAL_P(z) = Z_LVAL(tmp); \\\n \t\t\t\t} else { \\\n@@ -184,7 +184,7 @@\n \t\t\tif (Z_TYPE_P(z) == IS_LONG && Z_TYPE_P(v) == IS_DOUBLE) { \\\n \t\t\t\tZ_LVAL_P(z) -= Z_DVAL_P(v); \\\n \t\t\t} else { \\\n-\t\t\t\tsub_function(&tmp, z, v TSRMLS_CC); \\\n+\t\t\t\tzephir_sub_function(&tmp, z, v); \\\n \t\t\t\tif (Z_TYPE(tmp) == IS_LONG) { \\\n \t\t\t\t\tZ_LVAL_P(z) = Z_LVAL(tmp); \\\n \t\t\t\t} else { \\\n@@ -224,7 +224,7 @@\n \t{ \\\n \t\tzval tmp; \\\n \t\tZEPHIR_SEPARATE(z); \\\n-\t\tzephir_add_function(&tmp, z, v TSRMLS_CC); \\\n+\t\tzephir_add_function(&tmp, z, v); \\\n \t\tif (Z_TYPE(tmp) == IS_LONG) { \\\n \t\t\tZ_LVAL_P(z) = Z_LVAL(tmp); \\\n \t\t} else { \\\n@@ -238,7 +238,7 @@\n \t{ \\\n \t\tzval tmp; \\\n \t\tZEPHIR_SEPARATE(z); \\\n-\t\tsub_function(&tmp, z, v TSRMLS_CC); \\\n+\t\tzephir_sub_function(&tmp, z, v); \\\n \t\tif (Z_TYPE(tmp) == IS_LONG) { \\\n \t\t\tZ_LVAL_P(z) = Z_LVAL(tmp); \\\n \t\t} else { \\\n"} {"commit":"a2589f7699f2838d790a7d419d35c52d4cbc8d31","subject":"LAHF\/SAHF test.","message":"LAHF\/SAHF test.\n","repos":"jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc,jyi\/abc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/sandbox\/sandbox.h\n+++ tests\/sandbox\/sandbox.h\n@@ -348,3 +348,30 @@\n \n }\n \n+TEST(SandboxTest, LahfSahfOkay) {\n+\n+ x64asm::Code c;\n+ std::stringstream ss;\n+\n+ \/\/ Here's the input program\n+ ss << \"xorq %rax, %rax\" << std::endl;\n+\tss << \"lahf\" << std::endl;\n+\tss << \"sahf\" << std::endl;\n+ ss << \"retq\" << std::endl;\n+\n+ ss >> c;\n+\n+ \/\/ Setup the sandbox\n+ stoke::Sandbox sb;\n+ stoke::CpuState tc;\n+ stoke::StateGen sg(&sb);\n+ sg.get(tc);\n+\n+\tsb.insert_input(tc);\n+\n+ \/\/ Run it\n+ sb.run({c, x64asm::RegSet::empty(), x64asm::RegSet::empty()});\n+ ASSERT_EQ(stoke::ErrorCode::NORMAL, sb.result_begin()->code);\n+\n+\n+}\n"} {"commit":"227875448575d55a037408234c9d3e304f4d9b07","subject":"net\/ixgbe: fix e-tag definition","message":"net\/ixgbe: fix e-tag definition\n\ne_tag_ether_type has been wrongly defined as bool type which introduces\na bug for etag\/etag_strip for x550 NIC. Fixes it by defining it as\nuint16_t.\n\nFixes: ad43b7bce95b (\"net\/ixgbe: avoid multiple definitions of bool\")\nCc: stable@dpdk.org\n\nSigned-off-by: Wei Zhao <55941fd0e75edbdf274af2cfac8f147525678f08@intel.com>\nAcked-by: Xiaolong Ye <c7d6fc2f7e22da80deb234d523238b510a8c0f08@intel.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/ixgbe\/ixgbe_ethdev.h\n+++ drivers\/net\/ixgbe\/ixgbe_ethdev.h\n@@ -358,7 +358,7 @@\n \tstruct rte_hash *hash_handle;\n \tbool e_tag_en; \/* e-tag enabled *\/\n \tbool e_tag_fwd_en; \/* e-tag based forwarding enabled *\/\n-\tbool e_tag_ether_type; \/* ether type for e-tag *\/\n+\tuint16_t e_tag_ether_type; \/* ether type for e-tag *\/\n };\n \n struct rte_flow {\n"} {"commit":"118af321b24529d546cad1c4b6fccf02cd838384","subject":"[MTD] Delete unused header file linux\/mtd\/iflash.h.","message":"[MTD] Delete unused header file linux\/mtd\/iflash.h.\n\nDelete the unreferenced header file include\/linux\/mtd\/iflash.h.\n\nSigned-off-by: Robert P. J. Day <01aa5cd9a29907856ec6ddeebcb643ede4c45b8b@mindspring.com>\nSigned-off-by: David Woodhouse <97b3379caa91f4ee97e44013ae4dc6350540fa9d@infradead.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/mtd\/iflash.h\n+++ include\/linux\/mtd\/iflash.h\n@@ -1,98 +0,0 @@\n-\/* $Id: iflash.h,v 1.2 2000\/11\/13 18:01:54 dwmw2 Exp $ *\/\n-\n-#ifndef __MTD_IFLASH_H__\n-#define __MTD_IFLASH_H__\n-\n-\/* Extended CIS registers for Series 2 and 2+ cards *\/\n-\/* The registers are all offsets from 0x4000 *\/\n-#define CISREG_CSR\t\t0x0100\n-#define CISREG_WP\t\t0x0104\n-#define CISREG_RDYBSY\t\t0x0140\n-\n-\/* Extended CIS registers for Series 2 cards *\/\n-#define CISREG_SLEEP\t\t0x0118\n-#define CISREG_RDY_MASK\t\t0x0120\n-#define CISREG_RDY_STATUS\t0x0130\n-\n-\/* Extended CIS registers for Series 2+ cards *\/\n-#define CISREG_VCR\t\t0x010c\n-\n-\/* Card Status Register *\/\n-#define CSR_SRESET\t\t0x20\t\/* Soft reset *\/\n-#define CSR_CMWP\t\t0x10\t\/* Common memory write protect *\/\n-#define CSR_PWRDOWN\t\t0x08\t\/* Power down status *\/\n-#define CSR_CISWP\t\t0x04\t\/* Common memory CIS WP *\/\n-#define CSR_WP\t\t\t0x02\t\/* Mechanical write protect *\/\n-#define CSR_READY\t\t0x01\t\/* Ready\/busy status *\/\n-\n-\/* Write Protection Register *\/\n-#define WP_BLKEN\t\t0x04\t\/* Enable block locking *\/\n-#define WP_CMWP\t\t\t0x02\t\/* Common memory write protect *\/\n-#define WP_CISWP\t\t0x01\t\/* Common memory CIS WP *\/\n-\n-\/* Voltage Control Register *\/\n-#define VCR_VCC_LEVEL\t\t0x80\t\/* 0 = 5V, 1 = 3.3V *\/\n-#define VCR_VPP_VALID\t\t0x02\t\/* Vpp Valid *\/\n-#define VCR_VPP_GEN\t\t0x01\t\/* Integrated Vpp generator *\/\n-\n-\/* Ready\/Busy Mode Register *\/\n-#define RDYBSY_RACK\t\t0x02\t\/* Ready acknowledge *\/\n-#define RDYBSY_MODE\t\t0x01\t\/* 1 = high performance *\/\n-\n-#define LOW(x) ((x) & 0xff)\n-\n-\/* 28F008SA-Compatible Command Set *\/\n-#define IF_READ_ARRAY\t\t0xffff\n-#define IF_INTEL_ID\t\t0x9090\n-#define IF_READ_CSR\t\t0x7070\n-#define IF_CLEAR_CSR\t\t0x5050\n-#define IF_WRITE\t\t0x4040\n-#define IF_BLOCK_ERASE\t\t0x2020\n-#define IF_ERASE_SUSPEND\t0xb0b0\n-#define IF_CONFIRM\t\t0xd0d0\n-\n-\/* 28F016SA Performance Enhancement Commands *\/\n-#define IF_READ_PAGE\t\t0x7575\n-#define IF_PAGE_SWAP\t\t0x7272\n-#define IF_SINGLE_LOAD\t\t0x7474\n-#define IF_SEQ_LOAD\t\t0xe0e0\n-#define IF_PAGE_WRITE\t\t0x0c0c\n-#define IF_RDY_MODE\t\t0x9696\n-#define IF_RDY_LEVEL\t\t0x0101\n-#define IF_RDY_PULSE_WRITE\t0x0202\n-#define IF_RDY_PULSE_ERASE\t0x0303\n-#define IF_RDY_DISABLE\t\t0x0404\n-#define IF_LOCK_BLOCK\t\t0x7777\n-#define IF_UPLOAD_STATUS\t0x9797\n-#define IF_READ_ESR\t\t0x7171\n-#define IF_ERASE_UNLOCKED\t0xa7a7\n-#define IF_SLEEP\t\t0xf0f0\n-#define IF_ABORT\t\t0x8080\n-#define IF_UPLOAD_DEVINFO\t0x9999\n-\n-\/* Definitions for Compatible Status Register *\/\n-#define CSR_WR_READY\t\t0x8080\t\/* Write state machine status *\/\n-#define CSR_ERA_SUSPEND\t\t0x4040\t\/* Erase suspend status *\/\n-#define CSR_ERA_ERR\t\t0x2020\t\/* Erase status *\/\n-#define CSR_WR_ERR\t\t0x1010\t\/* Data write status *\/\n-#define CSR_VPP_LOW\t\t0x0808\t\/* Vpp status *\/\n-\n-\/* Definitions for Global Status Register *\/\n-#define GSR_WR_READY\t\t0x8080\t\/* Write state machine status *\/\n-#define GSR_OP_SUSPEND\t\t0x4040\t\/* Operation suspend status *\/\n-#define GSR_OP_ERR\t\t0x2020\t\/* Device operation status *\/\n-#define GSR_SLEEP\t\t0x1010\t\/* Device sleep status *\/\n-#define GSR_QUEUE_FULL\t\t0x0808\t\/* Queue status *\/\n-#define GSR_PAGE_AVAIL\t\t0x0404\t\/* Page buffer available status *\/\n-#define GSR_PAGE_READY\t\t0x0202\t\/* Page buffer status *\/\n-#define GSR_PAGE_SELECT\t\t0x0101\t\/* Page buffer select status *\/\n-\n-\/* Definitions for Block Status Register *\/\n-#define BSR_READY\t\t0x8080\t\/* Block status *\/\n-#define BSR_UNLOCK\t\t0x4040\t\/* Block lock status *\/\n-#define BSR_FAILED\t\t0x2020\t\/* Block operation status *\/\n-#define BSR_ABORTED\t\t0x1010\t\/* Operation abort status *\/\n-#define BSR_QUEUE_FULL\t\t0x0808\t\/* Queue status *\/\n-#define BSR_VPP_LOW\t\t0x0404\t\/* Vpp status *\/\n-\n-#endif \/* __MTD_IFLASH_H__ *\/\n"} {"commit":"97bb7c7541465b26a005b5a2f1c0a25003b6586c","subject":"17 0.1.2 Test number of callback calls","message":"17 0.1.2 Test number of callback calls\n\nmade from rm_rx_insert_nonoverlapping_ch_ch_ref\n","repos":"spinlockirqsave\/rsyncme,spinlockirqsave\/rsyncme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/src\/test_rm4.c\n+++ test\/src\/test_rm4.c\n@@ -235,7 +235,7 @@\n \t\tj = 0;\n \t\tfor (; j < RM_TEST_L_BLOCKS_SIZE; ++j) {\n \t\t\tL = rm_test_L_blocks[j];\n-\t\t\tRM_LOG_INFO(\"Validating testing of hashing of non-overlapping blocks: file [%s], size [%zu], block size L [%zu]\", fname, file_sz, L);\n+\t\t\tRM_LOG_INFO(\"Validating number of callback calls from rm_rx_insert_nonoverlapping_ch_ch_ref: file [%s], size [%zu], block size L [%zu]\", fname, file_sz, L);\n \t\t\tif (0 == L) {\n \t\t\t\tRM_LOG_INFO(\"Block size [%zu] is too small for this test (should be > [%zu]), skipping file [%s]\", L, 0, fname);\n \t\t\t\tcontinue;\n@@ -245,7 +245,7 @@\n \t\t\t\tcontinue;\n \t\t\t}\n \t\n-\t\t\tRM_LOG_INFO(\"Testing of splitting file into non-overlapping blocks: file [%s], size [%zu], block size L [%zu], buffer\"\n+\t\t\tRM_LOG_INFO(\"Testing number of callback calls from rm_rx_insert_nonoverlapping_ch_ch_ref: file [%s], size [%zu], block size L [%zu], buffer\"\n \" [%zu]\", fname, file_sz, L, RM_TEST_L_MAX);\n \t\t\tblocks_n = file_sz \/ L + (file_sz % L ? 1 : 0);\n f_tx_ch_ch_ref_2_callback_count = 0; \/* reset callback counter *\/\n@@ -261,7 +261,7 @@\n }\n assert_int_equal(entries_n, blocks_n);\n \t\t\t\n-\t\t\tRM_LOG_INFO(\"PASSED test of hashing of non-overlapping blocks, file [%s], size [%zu], L [%zu]\", fname, file_sz, L);\n+\t\t\tRM_LOG_INFO(\"PASSED test of number of callback calls from rm_rx_insert_nonoverlapping_ch_ch_ref, file [%s], size [%zu], L [%zu]\", fname, file_sz, L);\n \t\t\trewind(f);\n \t\t}\n \t\tfclose(f);\n"} {"commit":"fcb96c295a3ca0a90820732948f050fdeec90261","subject":"Clean up type definitions","message":"Clean up type definitions\n\nSigned-off-by: Krzysztof Wilczy\u0144ski <5f1c0be89013f8fde969a8dcb2fa1d522e94ee00@linux.com>\n","repos":"kwilczynski\/ruby-magic,kwilczynski\/ruby-magic","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ext\/magic\/ruby-magic.h\n+++ ext\/magic\/ruby-magic.h\n@@ -93,10 +93,6 @@\n \tE_FLAG_INVALID_TYPE\n };\n \n-typedef struct magic_object rb_mgc_object_t;\n-typedef struct magic_arguments rb_mgc_arguments_t;\n-typedef struct magic_error rb_mgc_error_t;\n-\n struct parameter {\n \tint tag;\n \tsize_t value;\n@@ -113,14 +109,14 @@\n \tvoid **pointers;\n };\n \n-struct magic_object {\n+typedef struct magic_object {\n \tmagic_t cookie;\n \tVALUE mutex;\n \tunsigned int database_loaded:1;\n \tunsigned int stop_on_errors:1;\n-};\n-\n-struct magic_arguments {\n+} rb_mgc_object_t;\n+\n+typedef struct magic_arguments {\n \trb_mgc_object_t *magic_object;\n \tunion {\n \t\tstruct parameter parameter;\n@@ -130,13 +126,13 @@\n \tconst char *result;\n \tint status;\n \tint flags;\n-};\n-\n-struct magic_error {\n+} rb_mgc_arguments_t;\n+\n+typedef struct magic_error {\n \tconst char *magic_error;\n \tVALUE klass;\n \tint magic_errno;\n-};\n+} rb_mgc_error_t;\n \n static const char *ruby_magic_errors[] = {\n \t[E_UNKNOWN]\t\t\t= \"an unknown error has occurred\",\n"} {"commit":"e7138723692e43b7d43578746ad21bf194847527","subject":"[PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access","message":"[PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access\n\nCurrent SHPCHP driver doesn't take care of RsvdP\/RsvdZ[*] bits in\ncontroller SERR-INT register. This might cause unpredicable\nresults. This patch fixes this bug.\n\n[*] RsvdP and RsvdZ are defined in SHPC spec as follows:\n\n RsvdP - Reserved and Preserved. Register bits of this type are\n reserved for future use as R\/W bits. The value read is\n undefined. Writes are ignored. Software must follow These rules\n when accessing RsvdP bits:\n\n\t- Software must ignore RsvdP bits when testing values read\n from these registers.\n\t- Software must not depend on RsvdP bit's ability to retain\n information when written\n\t- Software must always write back the value read in the RsvdP\n\t bits when writing one of these registers.\n\n RsvdZ - Reserved and Zero. Register bits of this type are reserved\n for future use as R\/WC bits. The value read is undefined. Writes\n are ignored. Software must follow these rules when accessing RsvdZ\n bits:\n\n - Software must ignore RsvdZ bits when testing values read\n\t from these registers.\n\t- Software must not depends on a RsvdZ bit's ability to retain\n\t information when written.\n\t- Software must always write 0 to RsvdZ bits when writing one\n\t of these register.\n\nSigned-off-by: Kenji Kaneshige <06fb390d28d4d3a1c65b19c7f623121e2bb09dfc@jp.fujitsu.com>\nCc: Kristen Accardi <a2bec03b708747d8f8ec0ab8d19ca0546db65231@intel.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/pci\/hotplug\/shpchp_hpc.c\n+++ drivers\/pci\/hotplug\/shpchp_hpc.c\n@@ -89,6 +89,17 @@\n #define\tUPDOWN\t\t\t0x20000000\n #define\tMRLSENSOR\t\t0x40000000\n #define ATTN_BUTTON\t\t0x80000000\n+\n+\/*\n+ * Controller SERR-INT Register\n+ *\/\n+#define GLOBAL_INTR_MASK\t(1 << 0)\n+#define GLOBAL_SERR_MASK\t(1 << 1)\n+#define COMMAND_INTR_MASK\t(1 << 2)\n+#define ARBITER_SERR_MASK\t(1 << 3)\n+#define COMMAND_DETECTED\t(1 << 16)\n+#define ARBITER_DETECTED\t(1 << 17)\n+#define SERR_INTR_RSVDZ_MASK\t0xfffc0000\n \n \/*\n * Logical Slot Register definitions\n@@ -1047,7 +1058,8 @@\n \t\t\/* Mask Global Interrupt Mask - see implementation note on p. 139 *\/\n \t\t\/* of SHPC spec rev 1.0*\/\n \t\ttemp_dword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n-\t\ttemp_dword |= 0x00000001;\n+\t\ttemp_dword |= GLOBAL_INTR_MASK;\n+\t\ttemp_dword &= ~SERR_INTR_RSVDZ_MASK;\n \t\tshpc_writel(ctrl, SERR_INTR_ENABLE, temp_dword);\n \n \t\tintr_loc2 = shpc_readl(ctrl, INTR_LOC);\n@@ -1061,7 +1073,7 @@\n \t\t * Detect bit in Controller SERR-INT register\n \t\t *\/\n \t\ttemp_dword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n-\t\ttemp_dword &= 0xfffdffff;\n+\t\ttemp_dword &= ~SERR_INTR_RSVDZ_MASK;\n \t\tshpc_writel(ctrl, SERR_INTR_ENABLE, temp_dword);\n \t\tctrl->cmd_busy = 0;\n \t\twake_up_interruptible(&ctrl->queue);\n@@ -1105,7 +1117,7 @@\n \tif (!shpchp_poll_mode) {\n \t\t\/* Unmask Global Interrupt Mask *\/\n \t\ttemp_dword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n-\t\ttemp_dword &= 0xfffffffe;\n+\t\ttemp_dword &= ~(GLOBAL_INTR_MASK | SERR_INTR_RSVDZ_MASK);\n \t\tshpc_writel(ctrl, SERR_INTR_ENABLE, temp_dword);\n \t}\n \t\n@@ -1374,7 +1386,9 @@\n \t\/* Mask Global Interrupt Mask & Command Complete Interrupt Mask *\/\n \ttempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n \tdbg(\"%s: SERR_INTR_ENABLE = %x\\n\", __FUNCTION__, tempdword);\n-\ttempdword = 0x0003000f; \n+\ttempdword |= (GLOBAL_INTR_MASK | GLOBAL_SERR_MASK |\n+\t\t COMMAND_INTR_MASK | ARBITER_SERR_MASK);\n+\ttempdword &= ~SERR_INTR_RSVDZ_MASK;\n \tshpc_writel(ctrl, SERR_INTR_ENABLE, tempdword);\n \ttempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n \tdbg(\"%s: SERR_INTR_ENABLE = %x\\n\", __FUNCTION__, tempdword);\n@@ -1452,7 +1466,8 @@\n \tif (!shpchp_poll_mode) {\n \t\t\/* Unmask all general input interrupts and SERR *\/\n \t\ttempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n-\t\ttempdword = 0x0000000a;\n+\t\ttempdword &= ~(GLOBAL_INTR_MASK | COMMAND_INTR_MASK |\n+\t\t\t SERR_INTR_RSVDZ_MASK);\n \t\tshpc_writel(ctrl, SERR_INTR_ENABLE, tempdword);\n \t\ttempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);\n \t\tdbg(\"%s: SERR_INTR_ENABLE = %x\\n\", __FUNCTION__, tempdword);\n"} {"commit":"131a5da7d8be3dc45cb24e135e88cb7d6b31c915","subject":"Add LLDB_LIBDIR_SUFFIX to Config.h to unbreak the Xcode project","message":"Add LLDB_LIBDIR_SUFFIX to Config.h to unbreak the Xcode project\n\ngit-svn-id: 4c4cc70b1ef44ba2b7963015e681894188cea27e@357115 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/lldb,apple\/swift-lldb,llvm-mirror\/lldb,apple\/swift-lldb,apple\/swift-lldb,apple\/swift-lldb,llvm-mirror\/lldb,apple\/swift-lldb,llvm-mirror\/lldb,apple\/swift-lldb,llvm-mirror\/lldb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/lldb\/Host\/Config.h\n+++ include\/lldb\/Host\/Config.h\n@@ -13,6 +13,8 @@\n \n \/\/ This block of code only exists to keep the Xcode project working in the\n \/\/ absence of a configuration step.\n+#define LLDB_LIBDIR_SUFFIX \"\"\n+\n #define LLDB_CONFIG_TERMIOS_SUPPORTED 1\n \n #define LLDB_EDITLINE_USE_WCHAR 1\n"} {"commit":"0a633d3d2438e147bc39ba91ebee3398d73add44","subject":"123 0.1.2 Valgrindize test suite 5","message":"123 0.1.2 Valgrindize test suite 5\n\nUse flags --tool=memcheck --leak-check=full --show-leak-kinds=all\n","repos":"spinlockirqsave\/rsyncme,spinlockirqsave\/rsyncme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/src\/test_rm5.c\n+++ test\/src\/test_rm5.c\n@@ -206,11 +206,10 @@\n for (; i < RM_TEST_FNAMES_N; ++i) {\n f = fopen(rm_test_fnames[i], \"wb+\");\n if (f == NULL) {\n- RM_LOG_ERR(\"Can't open file [%s]\",\n- rm_test_fnames[i]);\t\n+ RM_LOG_ERR(\"Can't open file [%s]\", rm_test_fnames[i]);\t\n } else {\n- RM_LOG_INFO(\"Removing file [%s]\",\n- rm_test_fnames[i]);\n+ RM_LOG_INFO(\"Removing file [%s]\", rm_test_fnames[i]);\n+ fclose(f);\n remove(rm_test_fnames[i]);\n }\n }\n"} {"commit":"a2e84581b9bcaad7a7f464b097a98bdde2511e0f","subject":"Fix data type for RSTRING_LEN","message":"Fix data type for RSTRING_LEN\n","repos":"jeremy\/mysql2,yui-knk\/mysql2,yui-knk\/mysql2,jconroy77\/mysql2,bigcartel\/mysql2,jeremy\/mysql2,bigcartel\/mysql2,jconroy77\/mysql2,sodabrew\/mysql2,brianmario\/mysql2,jeremy\/mysql2,tamird\/mysql2,sodabrew\/mysql2,tamird\/mysql2,brianmario\/mysql2,bigcartel\/mysql2,yui-knk\/mysql2,kamipo\/mysql2,sodabrew\/mysql2,jconroy77\/mysql2,brianmario\/mysql2,bigcartel\/mysql2,tamird\/mysql2,tamird\/mysql2,kamipo\/mysql2,kamipo\/mysql2,jconroy77\/mysql2,kamipo\/mysql2,yui-knk\/mysql2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/mysql2\/statement.c\n+++ ext\/mysql2\/statement.c\n@@ -178,7 +178,7 @@\n }\n \n static void set_buffer_for_string(MYSQL_BIND* bind_buffer, unsigned long *length_buffer, VALUE string) {\n- int length;\n+ unsigned long length;\n \n bind_buffer->buffer_type = MYSQL_TYPE_STRING;\n bind_buffer->buffer = RSTRING_PTR(string);\n"} {"commit":"0d00f00a1077ae89fb0ecbbba8da4c2c6bc93446","subject":"sh-pfc: Merge sh_pfc_reconfig_pin() into sh_pfc_gpio_set_direction()","message":"sh-pfc: Merge sh_pfc_reconfig_pin() into sh_pfc_gpio_set_direction()\n\nThe sh_pfc_reconfig_pin() is only called from a single location. Merge\nit into its call site to make the code easier to follow.\n\nSigned-off-by: Laurent Pinchart <ae960578cc5eca7b9b1dbc37d9caa6cb634f35e0@ideasonboard.com>\nAcked-by: Linus Walleij <9cd9d802d23c0ed5e224beabf4ae4a5c478746ef@linaro.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pinctrl\/sh-pfc\/pinctrl.c\n+++ drivers\/pinctrl\/sh-pfc\/pinctrl.c\n@@ -135,10 +135,52 @@\n {\n }\n \n-static int sh_pfc_reconfig_pin(struct sh_pfc_pinctrl *pmx, unsigned offset,\n-\t\t\t int new_type)\n-{\n+static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,\n+\t\t\t\t struct pinctrl_gpio_range *range,\n+\t\t\t\t unsigned offset)\n+{\n+\tstruct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);\n \tstruct sh_pfc *pfc = pmx->pfc;\n+\tint idx = sh_pfc_get_pin_index(pfc, offset);\n+\tstruct sh_pfc_pin_config *cfg = &pmx->configs[idx];\n+\tunsigned long flags;\n+\tint ret;\n+\n+\tspin_lock_irqsave(&pfc->lock, flags);\n+\n+\tswitch (cfg->type) {\n+\tcase PINMUX_TYPE_GPIO:\n+\tcase PINMUX_TYPE_INPUT:\n+\tcase PINMUX_TYPE_OUTPUT:\n+\t\tbreak;\n+\tcase PINMUX_TYPE_FUNCTION:\n+\tdefault:\n+\t\tpr_err(\"Unsupported mux type (%d), bailing...\\n\", cfg->type);\n+\t\tret = -ENOTSUPP;\n+\t\tgoto err;\n+\t}\n+\n+\tret = 0;\n+\n+err:\n+\tspin_unlock_irqrestore(&pfc->lock, flags);\n+\n+\treturn ret;\n+}\n+\n+static void sh_pfc_gpio_disable_free(struct pinctrl_dev *pctldev,\n+\t\t\t\t struct pinctrl_gpio_range *range,\n+\t\t\t\t unsigned offset)\n+{\n+}\n+\n+static int sh_pfc_gpio_set_direction(struct pinctrl_dev *pctldev,\n+\t\t\t\t struct pinctrl_gpio_range *range,\n+\t\t\t\t unsigned offset, bool input)\n+{\n+\tstruct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);\n+\tstruct sh_pfc *pfc = pmx->pfc;\n+\tint new_type = input ? PINMUX_TYPE_INPUT : PINMUX_TYPE_OUTPUT;\n \tint idx = sh_pfc_get_pin_index(pfc, offset);\n \tstruct sh_pfc_pin_config *cfg = &pmx->configs[idx];\n \tconst struct sh_pfc_pin *pin = &pfc->info->pins[idx];\n@@ -172,55 +214,6 @@\n \treturn ret;\n }\n \n-static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,\n-\t\t\t\t struct pinctrl_gpio_range *range,\n-\t\t\t\t unsigned offset)\n-{\n-\tstruct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);\n-\tstruct sh_pfc *pfc = pmx->pfc;\n-\tint idx = sh_pfc_get_pin_index(pfc, offset);\n-\tstruct sh_pfc_pin_config *cfg = &pmx->configs[idx];\n-\tunsigned long flags;\n-\tint ret;\n-\n-\tspin_lock_irqsave(&pfc->lock, flags);\n-\n-\tswitch (cfg->type) {\n-\tcase PINMUX_TYPE_GPIO:\n-\tcase PINMUX_TYPE_INPUT:\n-\tcase PINMUX_TYPE_OUTPUT:\n-\t\tbreak;\n-\tcase PINMUX_TYPE_FUNCTION:\n-\tdefault:\n-\t\tpr_err(\"Unsupported mux type (%d), bailing...\\n\", cfg->type);\n-\t\tret = -ENOTSUPP;\n-\t\tgoto err;\n-\t}\n-\n-\tret = 0;\n-\n-err:\n-\tspin_unlock_irqrestore(&pfc->lock, flags);\n-\n-\treturn ret;\n-}\n-\n-static void sh_pfc_gpio_disable_free(struct pinctrl_dev *pctldev,\n-\t\t\t\t struct pinctrl_gpio_range *range,\n-\t\t\t\t unsigned offset)\n-{\n-}\n-\n-static int sh_pfc_gpio_set_direction(struct pinctrl_dev *pctldev,\n-\t\t\t\t struct pinctrl_gpio_range *range,\n-\t\t\t\t unsigned offset, bool input)\n-{\n-\tstruct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev);\n-\tint type = input ? PINMUX_TYPE_INPUT : PINMUX_TYPE_OUTPUT;\n-\n-\treturn sh_pfc_reconfig_pin(pmx, offset, type);\n-}\n-\n static const struct pinmux_ops sh_pfc_pinmux_ops = {\n \t.get_functions_count\t= sh_pfc_get_functions_count,\n \t.get_function_name\t= sh_pfc_get_function_name,\n"} {"commit":"3d5761e1a92cd0382e08b17598b241b2c6700371","subject":"Fix typo in static_assert message. NFC","message":"Fix typo in static_assert message. NFC\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@300179 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/IR\/Metadata.h\n+++ include\/llvm\/IR\/Metadata.h\n@@ -78,7 +78,7 @@\n protected:\n Metadata(unsigned ID, StorageType Storage)\n : SubclassID(ID), Storage(Storage), SubclassData16(0), SubclassData32(0) {\n- static_assert(sizeof(*this) == 8, \"Metdata fields poorly packed\");\n+ static_assert(sizeof(*this) == 8, \"Metadata fields poorly packed\");\n }\n \n ~Metadata() = default;\n"} {"commit":"1cfffb95ebf49a8342d4799e68ecc0009300cb2f","subject":"hud: fix Windows build break","message":"hud: fix Windows build break\n\nProtect signal-related code with PIPE_OS_UNIX test.\n\nReviewed-by: Jose Fonseca <61b5a29db2c0650f7c8510f93eece059c1b09320@vmware.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/hud\/hud_context.c\n+++ src\/gallium\/auxiliary\/hud\/hud_context.c\n@@ -98,11 +98,13 @@\n } text, bg, whitelines;\n };\n \n+#ifdef PIPE_OS_UNIX\n static void\n signal_visible_handler(int sig, siginfo_t *siginfo, void *context)\n {\n huds_visible = !huds_visible;\n }\n+#endif\n \n static void\n hud_draw_colored_prims(struct hud_context *hud, unsigned prim,\n@@ -1137,8 +1139,10 @@\n unsigned i;\n const char *env = debug_get_option(\"GALLIUM_HUD\", NULL);\n unsigned signo = debug_get_num_option(\"GALLIUM_HUD_TOGGLE_SIGNAL\", 0);\n+#ifdef PIPE_OS_UNIX\n static boolean sig_handled = FALSE;\n struct sigaction action = {};\n+#endif\n huds_visible = debug_get_bool_option(\"GALLIUM_HUD_VISIBLE\", TRUE);\n \n if (!env || !*env)\n@@ -1283,6 +1287,7 @@\n LIST_INITHEAD(&hud->pane_list);\n \n \/* setup sig handler once for all hud contexts *\/\n+#ifdef PIPE_OS_UNIX\n if (!sig_handled && signo != 0) {\n action.sa_sigaction = &signal_visible_handler;\n action.sa_flags = SA_SIGINFO;\n@@ -1295,6 +1300,7 @@\n \n sig_handled = TRUE;\n }\n+#endif\n \n hud_parse_env_var(hud, env);\n return hud;\n"} {"commit":"0fbea50971bb3fa2484878e39477ed3c6249f2c3","subject":"removed readline handler callback","message":"removed readline handler callback\n","repos":"cydream\/telegram_rb,platphorm\/telegram_rb,mystand\/telegram_rb,cydream\/telegram_rb,platphorm\/telegram_rb,mystand\/telegram_rb,cydream\/telegram_rb,platphorm\/telegram_rb,mystand\/telegram_rb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/telegram_rb\/loop.c\n+++ ext\/telegram_rb\/loop.c\n@@ -93,7 +93,6 @@\n connections_poll_result (fds + cc, x - cc);\n if (safe_quit && !queries_num) {\n printf (\"All done. Exit\\n\");\n- rl_callback_handler_remove ();\n exit (0);\n }\n if (unknown_user_list_pos) {\n"} {"commit":"006e7ffb260314f4867745fbef37f95813553bdd","subject":"ac_str: Fix some -Wconversion warnings","message":"ac_str: Fix some -Wconversion warnings\n\nIf compiling with -Wconversion the following was thrown against ac_net.c\n\nac_str.c: In function \u2018ac_str_split\u2019:\nac_str.c:79:43: warning: conversion to \u2018long unsigned int\u2019 from \u2018int\u2019 may change the sign of the result [-Wsign-conversion]\n 79 | fields = realloc(fields, sizeof(char *) * i);\n | ^\nac_str.c:84:42: warning: conversion to \u2018long unsigned int\u2019 from \u2018int\u2019 may change the sign of the result [-Wsign-conversion]\n 84 | fields = realloc(fields, sizeof(char *) * i);\n | ^\nac_str.c: In function \u2018ac_str_levenshtein\u2019:\nac_str.c:183:11: warning: conversion from \u2018size_t\u2019 {aka \u2018long unsigned int\u2019} to \u2018int\u2019 may change value [-Wconversion]\n 183 | v0[i] = i;\n | ^\nac_str.c:188:11: warning: conversion from \u2018size_t\u2019 {aka \u2018long unsigned int\u2019} to \u2018int\u2019 may change value [-Wconversion]\n 188 | v1[0] = i + 1;\n | ^\n\nThey are likely harmless in general, however the first two can be\nproperly fixed by making i an unsigned int.\n\nThe second two we really just silence the warnings...\n\nSigned-off-by: Andrew Clayton <02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@digital-domain.net>\n","repos":"ac000\/libac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/ac_str.c\n+++ src\/ac_str.c\n@@ -56,7 +56,7 @@\n \tchar *p;\n \tchar **fields;\n \tchar *tok;\n-\tint i = 1;\n+\tunsigned int i = 1;\n \n \t\/* Check for unknown flags *\/\n \tif (flags & ~(AC_STR_SPLIT_STRICT)) {\n@@ -180,12 +180,12 @@\n \tv1 = malloc((tlen + 1) * sizeof(int));\n \n \tfor (i = 0; i < tlen + 1; i++)\n-\t\tv0[i] = i;\n+\t\tv0[i] = (int)i;\n \n \tfor (i = 0; i < slen; i++) {\n \t\tsize_t j;\n \n-\t\tv1[0] = i + 1;\n+\t\tv1[0] = (int)i + 1;\n \n \t\tfor (j = 0; j < tlen; j++) {\n \t\t\tint cost = (s[i] == t[j]) ? 0 : 1;\n"} {"commit":"c55d995dd3cebffdeb2b7eff8acc813c56d62c97","subject":"eeepc-wmi: refine quirks handling","message":"eeepc-wmi: refine quirks handling\n\nSigned-off-by: Corentin Chary <4153b5fcec9d8639b77e759711dc8338f0db8708@gmail.com>\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/platform\/x86\/eeepc-wmi.c\n+++ drivers\/platform\/x86\/eeepc-wmi.c\n@@ -49,7 +49,6 @@\n \n MODULE_ALIAS(\"wmi:\"EEEPC_WMI_EVENT_GUID);\n \n-static struct quirk_entry *quirks;\n static bool hotplug_wireless;\n \n module_param(hotplug_wireless, bool, 0444);\n@@ -108,6 +107,8 @@\n \t.store_backlight_power = true,\n };\n \n+static struct quirk_entry *quirks;\n+\n static int dmi_matched(const struct dmi_system_id *dmi)\n {\n \tchar *model;\n@@ -209,12 +210,14 @@\n \n static void eeepc_wmi_quirks(struct asus_wmi_driver *driver)\n {\n+\tquirks = &quirk_asus_unknown;\n+\tquirks->hotplug_wireless = hotplug_wireless;\n+\n+\tdmi_check_system(asus_quirks);\n+\n+\tdriver->quirks = quirks;\n+\tdriver->quirks->wapf = -1;\n \tdriver->panel_power = FB_BLANK_UNBLANK;\n-\tdriver->quirks = &quirk_asus_unknown;\n-\tdriver->quirks->hotplug_wireless = hotplug_wireless;\n-\tdriver->quirks->wapf = -1;\n-\tdmi_check_system(asus_quirks);\n-\tdriver->quirks = quirks;\n }\n \n static struct asus_wmi_driver asus_wmi_driver = {\n"} {"commit":"73eb64c4308fcd0bd7738514a0bbe68b31f476e8","subject":"TestHelpers::Temp{File,Dir}: avoid duplicate slashes in paths","message":"TestHelpers::Temp{File,Dir}: avoid duplicate slashes in paths\n","repos":"der-lyse\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,newsboat\/newsboat,newsboat\/newsboat,newsboat\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,newsboat\/newsboat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/test-helpers.h\n+++ test\/test-helpers.h\n@@ -110,7 +110,7 @@\n \t\t\t\/\/ Catch doesn't let us run tests in multiple threads\n \t\t\t\/\/ anyway.\n \t\t\tstd::string filename = std::to_string(rand());\n-\t\t\tfilepath = tempdir.getPath() + \"\/\" + filename;\n+\t\t\tfilepath = tempdir.getPath() + filename;\n \n \t\t\tstruct stat buffer;\n \t\t\tif (lstat(filepath.c_str(), &buffer) != 0) {\n@@ -158,7 +158,7 @@\n \t\t\t\/\/ Catch doesn't let us run tests in multiple threads\n \t\t\t\/\/ anyway.\n \t\t\tstd::string dirname = std::to_string(rand());\n-\t\t\tdirpath = tempdir.getPath() + \"\/\" + dirname;\n+\t\t\tdirpath = tempdir.getPath() + dirname;\n \n \t\t\tint status = mkdir(dirpath.c_str(), S_IRWXU);\n \t\t\tif (status == 0) {\n"} {"commit":"be4f75c12f9ee37eea8d836909fe04841567210b","subject":"Add additional comments to platform setup\/teardown functions","message":"Add additional comments to platform setup\/teardown functions\n","repos":"Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/mbedtls\/platform.h\n+++ include\/mbedtls\/platform.h\n@@ -312,7 +312,13 @@\n *\n * \\return 0 if successful\n *\n- * \\note This function should be called before any other library function\n+ * \\note This function is intended to allow platform specific initialisation,\n+ * and should be called before any other library functions. Its\n+ * implementation is platform specific, and by default, unless platform\n+ * specific code is provided, it does nothing.\n+ *\n+ * Its use and whether its necessary to be called is dependent on the\n+ * platform.\n *\/\n int mbedtls_platform_setup( mbedtls_platform_context *ctx );\n \/**\n@@ -322,8 +328,13 @@\n *\n * \\return 0 if successful\n *\n- * \\note This function should be after every other mbed TLS module has been\n- * correctly freed using the appropriate free function.\n+ * \\note This function should be called after every other mbed TLS module has\n+ * been correctly freed using the appropriate free function.\n+ * Its implementation is platform specific, and by default, unless\n+ * platform specific code is provided, it does nothing.\n+ *\n+ * Its use and whether its necessary to be called is dependent on the\n+ * platform.\n *\/\n void mbedtls_platform_teardown( mbedtls_platform_context *ctx );\n \n"} {"commit":"fd65122a900a5779393faa0ede6737fafcb95a27","subject":"gallium\/ttn: add support for system values","message":"gallium\/ttn: add support for system values\n\nSo far just the system values that freedreno supports, so we may add\nmore later.\n\nSigned-off-by: Rob Clark <6f78cdb10adbe0a7fbbf4098125a51f401c77a5f@freedesktop.org>\nReviewed-by: Eric Anholt <96f164ad4d9b2b0dacf8ebee2bb1eeb3aa69adf1@anholt.net>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/nir\/tgsi_to_nir.c\n+++ src\/gallium\/auxiliary\/nir\/tgsi_to_nir.c\n@@ -153,6 +153,8 @@\n } else if (file == TGSI_FILE_ADDRESS) {\n c->addr_reg = nir_local_reg_create(b->impl);\n c->addr_reg->num_components = 4;\n+ } else if (file == TGSI_FILE_SYSTEM_VALUE) {\n+ \/* Nothing to record for system values. *\/\n } else if (file == TGSI_FILE_SAMPLER) {\n \/* Nothing to record for samplers. *\/\n } else {\n@@ -323,6 +325,38 @@\n src = nir_src_for_ssa(c->imm_defs[index]);\n assert(!indirect);\n break;\n+\n+ case TGSI_FILE_SYSTEM_VALUE: {\n+ nir_intrinsic_instr *load;\n+ nir_intrinsic_op op;\n+ unsigned ncomp = 1;\n+\n+ switch (c->scan->system_value_semantic_name[index]) {\n+ case TGSI_SEMANTIC_VERTEXID_NOBASE:\n+ op = nir_intrinsic_load_vertex_id_zero_base;\n+ break;\n+ case TGSI_SEMANTIC_VERTEXID:\n+ op = nir_intrinsic_load_vertex_id;\n+ break;\n+ case TGSI_SEMANTIC_BASEVERTEX:\n+ op = nir_intrinsic_load_base_vertex;\n+ break;\n+ case TGSI_SEMANTIC_INSTANCEID:\n+ op = nir_intrinsic_load_instance_id;\n+ break;\n+ default:\n+ unreachable(\"bad system value\");\n+ }\n+\n+ load = nir_intrinsic_instr_create(b->shader, op);\n+ load->num_components = ncomp;\n+\n+ nir_ssa_dest_init(&load->instr, &load->dest, ncomp, NULL);\n+ nir_instr_insert_after_cf_list(b->cf_node_list, &load->instr);\n+\n+ src = nir_src_for_ssa(&load->dest.ssa);\n+ break;\n+ }\n \n case TGSI_FILE_INPUT:\n case TGSI_FILE_CONSTANT: {\n"} {"commit":"bef60ba63f5159f7642e30a76ea5230df1b8fa21","subject":"Optimize the code","message":"Optimize the code\n","repos":"longxinH\/xhprof-apm,longxinH\/xhprof-apm,longxinH\/xhprof-apm,longxinH\/xhprof-apm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- extension\/xhprof_apm.c\n+++ extension\/xhprof_apm.c\n@@ -375,7 +375,7 @@\n * @return total size of the function name returned in result_buf\n * @author veeve\n *\/\n-static size_t hp_get_entry_name(hp_entry_t *entry, char *result_buf, result_len) {\n+static size_t hp_get_entry_name(hp_entry_t *entry, char *result_buf, size_t result_len) {\n \t\/* Validate result_len *\/\n \tif (result_len <= 1) {\n \t\t\/* Insufficient result_bug. Bail! *\/\n@@ -647,37 +647,6 @@\n }\n \n \/**\n- * Looksup the hash table for the given symbol\n- * Initializes a new array() if symbol is not present\n- *\n- * @author kannan, veeve\n- *\/\n-zval * hp_hash_lookup(char *symbol TSRMLS_DC) {\n-\tHashTable *ht;\n-\tvoid *data;\n-\tzval *counts = (zval *) 0;\n-\n-\t\/* Bail if something is goofy *\/\n-\tif (!APM_G(stats_count) || !(ht = HASH_OF(APM_G(stats_count)))) {\n-\t\treturn (zval *) 0;\n-\t}\n-\n-\t\/* Lookup our hash table *\/\n-\tif (zend_hash_find(ht, symbol, strlen(symbol) + 1, &data) == SUCCESS) {\n-\t\t\/* Symbol already exists *\/\n-\t\tcounts = *(zval **) data;\n-\t}\n-\telse {\n-\t\t\/* Add symbol to hash table *\/\n-\t\tMAKE_STD_ZVAL(counts);\n-\t\tarray_init(counts);\n-\t\tadd_assoc_zval(APM_G(stats_count), symbol, counts);\n-\t}\n-\n-\treturn counts;\n-}\n-\n-\/**\n * Truncates the given timeval to the nearest slot begin, where\n * the slot size is determined by intr\n *\n@@ -1072,70 +1041,65 @@\n *\/\n \n \/**\n- * XHPROF shared end function callback\n+ * XHPROF_MODE_HIERARCHICAL's end function callback\n *\n * @author kannan\n *\/\n-zval * hp_mode_shared_endfn_cb(hp_entry_t *top, char *symbol TSRMLS_DC) {\n-\tzval *counts;\n-\tuint64 tsc_end;\n-\n-\t\/* Get end tsc counter *\/\n-\ttsc_end = cycle_timer();\n-\n-\t\/* Get the stat array *\/\n-\tif (!(counts = hp_hash_lookup(symbol TSRMLS_CC))) {\n-\t\treturn (zval *) 0;\n-\t}\n-\n-\t\/* Bump stats in the counts hashtable *\/\n-\thp_inc_count(counts, \"ct\", 1 TSRMLS_CC);\n-\n-\thp_inc_count(counts, \"wt\", get_us_from_tsc(tsc_end - top->tsc_start,\n-\t\t\t\t\t\t\t\t\t\t\t APM_G(cpu_frequencies[APM_G(cur_cpu_id)])) TSRMLS_CC);\n-\treturn counts;\n-}\n-\n-\/**\n- * XHPROF_MODE_HIERARCHICAL's end function callback\n- *\n- * @author kannan\n- *\/\n-void hp_mode_hier_endfn_cb(hp_entry_t **entries TSRMLS_DC) {\n-\thp_entry_t *top = (*entries);\n-\tzval *counts;\n-\tstruct rusage ru_end;\n-\tchar symbol[SCRATCH_BUF_LEN];\n-\tlong int mu_end;\n-\tlong int pmu_end;\n-\n-\t\/* Get the stat array *\/\n-\thp_get_function_stack(top, 2, symbol, sizeof(symbol));\n-\tif (!(counts = hp_mode_shared_endfn_cb(top, symbol TSRMLS_CC))) {\n-\t\treturn;\n-\t}\n-\n-\tif (APM_G(xhprof_flags) & XHPROF_FLAGS_CPU) {\n-\t\t\/* Get CPU usage *\/\n-\t\tgetrusage(RUSAGE_SELF, &ru_end);\n-\n-\t\t\/* Bump CPU stats in the counts hashtable *\/\n-\t\thp_inc_count(counts, \"cpu\", (get_us_interval(&(top->ru_start_hprof.ru_utime),\n-\t\t\t\t\t\t\t\t\t\t\t\t\t &(ru_end.ru_utime)) +\n-\t\t\t\t\t\t\t\t\t get_us_interval(&(top->ru_start_hprof.ru_stime),\n-\t\t\t\t\t\t\t\t\t\t\t\t\t &(ru_end.ru_stime)))\n-\t\t\t\t\t TSRMLS_CC);\n-\t}\n-\n-\tif (APM_G(xhprof_flags) & XHPROF_FLAGS_MEMORY) {\n-\t\t\/* Get Memory usage *\/\n-\t\tmu_end = zend_memory_usage(0 TSRMLS_CC);\n-\t\tpmu_end = zend_memory_peak_usage(0 TSRMLS_CC);\n-\n-\t\t\/* Bump Memory stats in the counts hashtable *\/\n-\t\thp_inc_count(counts, \"mu\", mu_end - top->mu_start_hprof TSRMLS_CC);\n-\t\thp_inc_count(counts, \"pmu\", pmu_end - top->pmu_start_hprof TSRMLS_CC);\n-\t}\n+void hp_mode_hier_endfn_cb(hp_entry_t **entries TSRMLS_DC) {\n+\thp_entry_t *top = (*entries);\n+ HashTable *ht;\n+\tzval *counts;\n+\tstruct rusage ru_end;\n+\tchar symbol[SCRATCH_BUF_LEN];\n+\tlong int mu_end;\n+\tlong int pmu_end;\n+ uint64 tsc_end;\n+ double wt;\n+ void *data;\n+\n+ \/* Get end tsc counter *\/\n+ tsc_end = cycle_timer();\n+ wt = get_us_from_tsc(tsc_end - top->tsc_start, APM_G(cpu_frequencies[APM_G(cur_cpu_id)]));\n+\n+ ht = Z_ARRVAL_P(APM_G(stats_count));\n+ \/* Get the stat array *\/\n+ hp_get_function_stack(top, 2, symbol, sizeof(symbol));\n+\n+ \/* Lookup our hash table *\/\n+ if (zend_hash_find(ht, symbol, strlen(symbol) + 1, &data) == SUCCESS) {\n+ \/* Symbol already exists *\/\n+ counts = *(zval **) data;\n+ } else {\n+ \/* Add symbol to hash table *\/\n+ MAKE_STD_ZVAL(counts);\n+ array_init(counts);\n+ add_assoc_zval(APM_G(stats_count), symbol, counts);\n+ }\n+\n+ \/* Bump stats in the counts hashtable *\/\n+ hp_inc_count(counts, \"ct\", 1 TSRMLS_CC);\n+ hp_inc_count(counts, \"wt\", wt TSRMLS_CC);\n+\n+ if (APM_G(xhprof_flags) & XHPROF_FLAGS_CPU) {\n+ \/* Get CPU usage *\/\n+ getrusage(RUSAGE_SELF, &ru_end);\n+\n+ \/* Bump CPU stats in the counts hashtable *\/\n+ hp_inc_count(counts, \"cpu\", (get_us_interval(&(top->ru_start_hprof.ru_utime),\n+ &(ru_end.ru_utime)) +\n+ get_us_interval(&(top->ru_start_hprof.ru_stime),\n+ &(ru_end.ru_stime))) TSRMLS_CC);\n+ }\n+\n+ if (APM_G(xhprof_flags) & XHPROF_FLAGS_MEMORY) {\n+ \/* Get Memory usage *\/\n+ mu_end = zend_memory_usage(0 TSRMLS_CC);\n+ pmu_end = zend_memory_peak_usage(0 TSRMLS_CC);\n+\n+ \/* Bump Memory stats in the counts hashtable *\/\n+ hp_inc_count(counts, \"mu\", mu_end - top->mu_start_hprof TSRMLS_CC);\n+ hp_inc_count(counts, \"pmu\", pmu_end - top->pmu_start_hprof TSRMLS_CC);\n+ }\n }\n \n \/**\n@@ -1798,7 +1762,7 @@\n \n static char* hp_trace_callback_curl_exec(char *symbol, zend_execute_data *data TSRMLS_DC) {\n char *result;\n- zval *func, *option, **ppzval, *retval = NULL;\n+ zval *func, **ppzval, *retval = NULL;\n zval *arg = hp_get_execute_argument(data, 1);\n \n if (arg == NULL || Z_TYPE_P(arg) != IS_RESOURCE) {\n"} {"commit":"5b2639d59afe0a30e1b955b23c52ee9099888058","subject":"[SCSI] cxgb3i: call ddp release function directly","message":"[SCSI] cxgb3i: call ddp release function directly\n\ncxgb3i_ddp_cleanup just calls ddp_release directly so there is\nno reason for the wrapper. This patch just renames ddp_release\nto cxgb3i_ddp_cleanup and removes the old wrapper function.\n\nSigned-off-by: Mike Christie <6fe105eefab41990d7ec714c6c25ade3095cdb48@cs.wisc.edu>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@HansenPartnership.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/cxgb3i\/cxgb3i_ddp.c\n+++ drivers\/scsi\/cxgb3i\/cxgb3i_ddp.c\n@@ -587,12 +587,12 @@\n }\n \n \/**\n- * ddp_release - release the cxgb3 adapter's ddp resource\n+ * cxgb3i_ddp_cleanup - release the cxgb3 adapter's ddp resource\n * @tdev: t3cdev adapter\n * release all the resource held by the ddp pagepod manager for a given\n * adapter if needed\n *\/\n-static void ddp_release(struct t3cdev *tdev)\n+void cxgb3i_ddp_cleanup(struct t3cdev *tdev)\n {\n \tint i = 0;\n \tstruct cxgb3i_ddp_info *ddp = (struct cxgb3i_ddp_info *)tdev->ulp_iscsi;\n@@ -714,11 +714,3 @@\n \t}\n \tddp_init(tdev);\n }\n-\n-\/**\n- * cxgb3i_ddp_cleaup - clean up ddp function\n- *\/\n-void cxgb3i_ddp_cleanup(struct t3cdev *tdev)\n-{\n-\tddp_release(tdev);\n-}\n"} {"commit":"7a9b81c05572b7b62192db12ca2d5a1f95ebb046","subject":"Make TempFile go along if temporary dir exists","message":"Make TempFile go along if temporary dir exists\n\nSometimes during development tests fail not as they should, but with\na SIGSEGV. In this case, temporary files won't be deleted, and so won't\nbe the temporary directory TempFile created. Previous version of\nTempFile would complain about that and force the developer to go delete\nthe directory before any tests can be run. But the directory is totally\nfine! (Save for a few files that now reside in it and won't be deleted\nautomatically.) So we now accept existing directory as normal, as long\nas we can write into it.\n","repos":"der-lyse\/newsboat,newsboat\/newsboat,x4121\/newsbeuter,newsboat\/newsboat,x4121\/newsbeuter,x4121\/newsbeuter,der-lyse\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,newsboat\/newsboat,x4121\/newsbeuter,newsboat\/newsboat,newsboat\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test\/test-helpers.h\n+++ test\/test-helpers.h\n@@ -55,12 +55,31 @@\n \t\t\t\t\ttempdir = \"\/tmp\/\";\n \t\t\t\t}\n \n-\t\t\t\ttempdir += \"\/newsbeuter\/\";\n+\t\t\t\ttempdir += \"\/newsbeuter-tests\/\";\n \n-\t\t\t\tmode_t mode = S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH;\n-\t\t\t\tint status = mkdir(tempdir.c_str(), mode);\n+\t\t\t\tint status = mkdir(tempdir.c_str(), S_IRWXU);\n \t\t\t\tif (status != 0) {\n-\t\t\t\t\tthrow tempfileexception(strerror(errno));\n+\t\t\t\t\t\/\/ The directory already exists. That's fine, though, but\n+\t\t\t\t\t\/\/ only as long as it has all the properties we need.\n+\n+\t\t\t\t\tint saved_errno = errno;\n+\t\t\t\t\tbool success = false;\n+\n+\t\t\t\t\tif (saved_errno == EEXIST) {\n+\t\t\t\t\t\tstruct stat buffer;\n+\t\t\t\t\t\tif (lstat(filepath.c_str(), &buffer) == 0) {\n+\t\t\t\t\t\t\tif ( buffer.st_mode & S_IRUSR\n+\t\t\t\t\t\t\t\t&& buffer.st_mode & S_IWUSR\n+\t\t\t\t\t\t\t\t&& buffer.st_mode & S_IXUSR)\n+\t\t\t\t\t\t\t{\n+\t\t\t\t\t\t\t\tsuccess = true;\n+\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tif (!success) {\n+\t\t\t\t\t\tthrow tempfileexception(strerror(saved_errno));\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t};\n \n@@ -86,7 +105,7 @@\n \t\t\t\t} while (!success && tries < 10);\n \n \t\t\t\tif (!success) {\n-\t\t\t\t\tthrow tempfileexception(\"couldn't find a non-existent filename\");\n+\t\t\t\t\tthrow tempfileexception(\"failed to generate unique filename\");\n \t\t\t\t}\n \t\t\t}\n \n"} {"commit":"e6281a285012d76cf60fb8639838c369cf4d438f","subject":"util\/u_pstipple.c: copy immediates during transformation","message":"util\/u_pstipple.c: copy immediates during transformation\n\nApparently, nobody has combined stippling with a fragment shader\ncontaining immediates in almost five years...\n\nFixes a bug in Kodi with radeonsi reported by Christian K\u00f6nig.\n\nCc: \"11.0 11.1\" <59f39c0db42d4479a46b02d4d2bc11120e37bb44@lists.freedesktop.org>\nTested-by: Christian K\u00f6nig <c7ea837d7a46effe4232b086213468b8b31643bf@amd.com>\nReviewed-by: Marek Ol\u0161\u00e1k <8c7344a1abdb103e79ecfd488098373070c3c70e@amd.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/util\/u_pstipple.c\n+++ src\/gallium\/auxiliary\/util\/u_pstipple.c\n@@ -230,6 +230,7 @@\n struct pstip_transform_context *pctx =\n (struct pstip_transform_context *) ctx;\n pctx->numImmed++;\n+ ctx->emit_immediate(ctx, immed);\n }\n \n \n"} {"commit":"2393998910e203d10b3be2d6a23e4f3b8e79b667","subject":"move from old gcc structure field assignments to modern new ones","message":"move from old gcc structure field assignments to modern new ones\n","repos":"Juniper\/libslax,Juniper\/libslax,Juniper\/libslax","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- extensions\/os\/ext_os.c\n+++ extensions\/os\/ext_os.c\n@@ -60,321 +60,321 @@\n \n errno_map_t errno_map[] = {\n #ifdef EPERM\n- { err_no: EPERM, err_name: \"EPERM\" },\n+ { .err_no = EPERM, .err_name = \"EPERM\" },\n #endif \/* EPERM *\/\n #ifdef ENOENT\n- { err_no: ENOENT, err_name: \"ENOENT\" },\n+ { .err_no = ENOENT, .err_name = \"ENOENT\" },\n #endif \/* ENOENT *\/\n #ifdef ESRCH\n- { err_no: ESRCH, err_name: \"ESRCH\" },\n+ { .err_no = ESRCH, .err_name = \"ESRCH\" },\n #endif \/* ESRCH *\/\n #ifdef EINTR\n- { err_no: EINTR, err_name: \"EINTR\" },\n+ { .err_no = EINTR, .err_name = \"EINTR\" },\n #endif \/* EINTR *\/\n #ifdef EIO\n- { err_no: EIO, err_name: \"EIO\" },\n+ { .err_no = EIO, .err_name = \"EIO\" },\n #endif \/* EIO *\/\n #ifdef ENXIO\n- { err_no: ENXIO, err_name: \"ENXIO\" },\n+ { .err_no = ENXIO, .err_name = \"ENXIO\" },\n #endif \/* ENXIO *\/\n #ifdef E2BIG\n- { err_no: E2BIG, err_name: \"E2BIG\" },\n+ { .err_no = E2BIG, .err_name = \"E2BIG\" },\n #endif \/* E2BIG *\/\n #ifdef ENOEXEC\n- { err_no: ENOEXEC, err_name: \"ENOEXEC\" },\n+ { .err_no = ENOEXEC, .err_name = \"ENOEXEC\" },\n #endif \/* ENOEXEC *\/\n #ifdef EBADF\n- { err_no: EBADF, err_name: \"EBADF\" },\n+ { .err_no = EBADF, .err_name = \"EBADF\" },\n #endif \/* EBADF *\/\n #ifdef ECHILD\n- { err_no: ECHILD, err_name: \"ECHILD\" },\n+ { .err_no = ECHILD, .err_name = \"ECHILD\" },\n #endif \/* ECHILD *\/\n #ifdef EDEADLK\n- { err_no: EDEADLK, err_name: \"EDEADLK\" },\n+ { .err_no = EDEADLK, .err_name = \"EDEADLK\" },\n #endif \/* EDEADLK *\/\n #ifdef ENOMEM\n- { err_no: ENOMEM, err_name: \"ENOMEM\" },\n+ { .err_no = ENOMEM, .err_name = \"ENOMEM\" },\n #endif \/* ENOMEM *\/\n #ifdef EACCES\n- { err_no: EACCES, err_name: \"EACCES\" },\n+ { .err_no = EACCES, .err_name = \"EACCES\" },\n #endif \/* EACCES *\/\n #ifdef EFAULT\n- { err_no: EFAULT, err_name: \"EFAULT\" },\n+ { .err_no = EFAULT, .err_name = \"EFAULT\" },\n #endif \/* EFAULT *\/\n #ifdef ENOTBLK\n- { err_no: ENOTBLK, err_name: \"ENOTBLK\" },\n+ { .err_no = ENOTBLK, .err_name = \"ENOTBLK\" },\n #endif \/* ENOTBLK *\/\n #ifdef EBUSY\n- { err_no: EBUSY, err_name: \"EBUSY\" },\n+ { .err_no = EBUSY, .err_name = \"EBUSY\" },\n #endif \/* EBUSY *\/\n #ifdef EEXIST\n- { err_no: EEXIST, err_name: \"EEXIST\" },\n+ { .err_no = EEXIST, .err_name = \"EEXIST\" },\n #endif \/* EEXIST *\/\n #ifdef EXDEV\n- { err_no: EXDEV, err_name: \"EXDEV\" },\n+ { .err_no = EXDEV, .err_name = \"EXDEV\" },\n #endif \/* EXDEV *\/\n #ifdef ENODEV\n- { err_no: ENODEV, err_name: \"ENODEV\" },\n+ { .err_no = ENODEV, .err_name = \"ENODEV\" },\n #endif \/* ENODEV *\/\n #ifdef ENOTDIR\n- { err_no: ENOTDIR, err_name: \"ENOTDIR\" },\n+ { .err_no = ENOTDIR, .err_name = \"ENOTDIR\" },\n #endif \/* ENOTDIR *\/\n #ifdef EISDIR\n- { err_no: EISDIR, err_name: \"EISDIR\" },\n+ { .err_no = EISDIR, .err_name = \"EISDIR\" },\n #endif \/* EISDIR *\/\n #ifdef EINVAL\n- { err_no: EINVAL, err_name: \"EINVAL\" },\n+ { .err_no = EINVAL, .err_name = \"EINVAL\" },\n #endif \/* EINVAL *\/\n #ifdef ENFILE\n- { err_no: ENFILE, err_name: \"ENFILE\" },\n+ { .err_no = ENFILE, .err_name = \"ENFILE\" },\n #endif \/* ENFILE *\/\n #ifdef EMFILE\n- { err_no: EMFILE, err_name: \"EMFILE\" },\n+ { .err_no = EMFILE, .err_name = \"EMFILE\" },\n #endif \/* EMFILE *\/\n #ifdef ENOTTY\n- { err_no: ENOTTY, err_name: \"ENOTTY\" },\n+ { .err_no = ENOTTY, .err_name = \"ENOTTY\" },\n #endif \/* ENOTTY *\/\n #ifdef ETXTBSY\n- { err_no: ETXTBSY, err_name: \"ETXTBSY\" },\n+ { .err_no = ETXTBSY, .err_name = \"ETXTBSY\" },\n #endif \/* ETXTBSY *\/\n #ifdef EFBIG\n- { err_no: EFBIG, err_name: \"EFBIG\" },\n+ { .err_no = EFBIG, .err_name = \"EFBIG\" },\n #endif \/* EFBIG *\/\n #ifdef ENOSPC\n- { err_no: ENOSPC, err_name: \"ENOSPC\" },\n+ { .err_no = ENOSPC, .err_name = \"ENOSPC\" },\n #endif \/* ENOSPC *\/\n #ifdef ESPIPE\n- { err_no: ESPIPE, err_name: \"ESPIPE\" },\n+ { .err_no = ESPIPE, .err_name = \"ESPIPE\" },\n #endif \/* ESPIPE *\/\n #ifdef EROFS\n- { err_no: EROFS, err_name: \"EROFS\" },\n+ { .err_no = EROFS, .err_name = \"EROFS\" },\n #endif \/* EROFS *\/\n #ifdef EMLINK\n- { err_no: EMLINK, err_name: \"EMLINK\" },\n+ { .err_no = EMLINK, .err_name = \"EMLINK\" },\n #endif \/* EMLINK *\/\n #ifdef EPIPE\n- { err_no: EPIPE, err_name: \"EPIPE\" },\n+ { .err_no = EPIPE, .err_name = \"EPIPE\" },\n #endif \/* EPIPE *\/\n #ifdef EDOM\n- { err_no: EDOM, err_name: \"EDOM\" },\n+ { .err_no = EDOM, .err_name = \"EDOM\" },\n #endif \/* EDOM *\/\n #ifdef ERANGE\n- { err_no: ERANGE, err_name: \"ERANGE\" },\n+ { .err_no = ERANGE, .err_name = \"ERANGE\" },\n #endif \/* ERANGE *\/\n #ifdef EAGAIN\n- { err_no: EAGAIN, err_name: \"EAGAIN\" },\n+ { .err_no = EAGAIN, .err_name = \"EAGAIN\" },\n #endif \/* EAGAIN *\/\n #ifdef EWOULDBLOCK\n- { err_no: EWOULDBLOCK, err_name: \"EWOULDBLOCK\" },\n+ { .err_no = EWOULDBLOCK, .err_name = \"EWOULDBLOCK\" },\n #endif \/* EWOULDBLOCK *\/\n #ifdef EINPROGRESS\n- { err_no: EINPROGRESS, err_name: \"EINPROGRESS\" },\n+ { .err_no = EINPROGRESS, .err_name = \"EINPROGRESS\" },\n #endif \/* EINPROGRESS *\/\n #ifdef EALREADY\n- { err_no: EALREADY, err_name: \"EALREADY\" },\n+ { .err_no = EALREADY, .err_name = \"EALREADY\" },\n #endif \/* EALREADY *\/\n #ifdef ENOTSOCK\n- { err_no: ENOTSOCK, err_name: \"ENOTSOCK\" },\n+ { .err_no = ENOTSOCK, .err_name = \"ENOTSOCK\" },\n #endif \/* ENOTSOCK *\/\n #ifdef EDESTADDRREQ\n- { err_no: EDESTADDRREQ, err_name: \"EDESTADDRREQ\" },\n+ { .err_no = EDESTADDRREQ, .err_name = \"EDESTADDRREQ\" },\n #endif \/* EDESTADDRREQ *\/\n #ifdef EMSGSIZE\n- { err_no: EMSGSIZE, err_name: \"EMSGSIZE\" },\n+ { .err_no = EMSGSIZE, .err_name = \"EMSGSIZE\" },\n #endif \/* EMSGSIZE *\/\n #ifdef EPROTOTYPE\n- { err_no: EPROTOTYPE, err_name: \"EPROTOTYPE\" },\n+ { .err_no = EPROTOTYPE, .err_name = \"EPROTOTYPE\" },\n #endif \/* EPROTOTYPE *\/\n #ifdef ENOPROTOOPT\n- { err_no: ENOPROTOOPT, err_name: \"ENOPROTOOPT\" },\n+ { .err_no = ENOPROTOOPT, .err_name = \"ENOPROTOOPT\" },\n #endif \/* ENOPROTOOPT *\/\n #ifdef EPROTONOSUPPORT\n- { err_no: EPROTONOSUPPORT, err_name: \"EPROTONOSUPPORT\" },\n+ { .err_no = EPROTONOSUPPORT, .err_name = \"EPROTONOSUPPORT\" },\n #endif \/* EPROTONOSUPPORT *\/\n #ifdef ESOCKTNOSUPPORT\n- { err_no: ESOCKTNOSUPPORT, err_name: \"ESOCKTNOSUPPORT\" },\n+ { .err_no = ESOCKTNOSUPPORT, .err_name = \"ESOCKTNOSUPPORT\" },\n #endif \/* ESOCKTNOSUPPORT *\/\n #ifdef ENOTSUP\n- { err_no: ENOTSUP, err_name: \"ENOTSUP\" },\n+ { .err_no = ENOTSUP, .err_name = \"ENOTSUP\" },\n #endif \/* ENOTSUP *\/\n #ifdef EOPNOTSUPP\n- { err_no: EOPNOTSUPP, err_name: \"EOPNOTSUPP\" },\n+ { .err_no = EOPNOTSUPP, .err_name = \"EOPNOTSUPP\" },\n #endif \/* EOPNOTSUPP *\/\n #ifdef EPFNOSUPPORT\n- { err_no: EPFNOSUPPORT, err_name: \"EPFNOSUPPORT\" },\n+ { .err_no = EPFNOSUPPORT, .err_name = \"EPFNOSUPPORT\" },\n #endif \/* EPFNOSUPPORT *\/\n #ifdef EAFNOSUPPORT\n- { err_no: EAFNOSUPPORT, err_name: \"EAFNOSUPPORT\" },\n+ { .err_no = EAFNOSUPPORT, .err_name = \"EAFNOSUPPORT\" },\n #endif \/* EAFNOSUPPORT *\/\n #ifdef EADDRINUSE\n- { err_no: EADDRINUSE, err_name: \"EADDRINUSE\" },\n+ { .err_no = EADDRINUSE, .err_name = \"EADDRINUSE\" },\n #endif \/* EADDRINUSE *\/\n #ifdef EADDRNOTAVAIL\n- { err_no: EADDRNOTAVAIL, err_name: \"EADDRNOTAVAIL\" },\n+ { .err_no = EADDRNOTAVAIL, .err_name = \"EADDRNOTAVAIL\" },\n #endif \/* EADDRNOTAVAIL *\/\n #ifdef ENETDOWN\n- { err_no: ENETDOWN, err_name: \"ENETDOWN\" },\n+ { .err_no = ENETDOWN, .err_name = \"ENETDOWN\" },\n #endif \/* ENETDOWN *\/\n #ifdef ENETUNREACH\n- { err_no: ENETUNREACH, err_name: \"ENETUNREACH\" },\n+ { .err_no = ENETUNREACH, .err_name = \"ENETUNREACH\" },\n #endif \/* ENETUNREACH *\/\n #ifdef ENETRESET\n- { err_no: ENETRESET, err_name: \"ENETRESET\" },\n+ { .err_no = ENETRESET, .err_name = \"ENETRESET\" },\n #endif \/* ENETRESET *\/\n #ifdef ECONNABORTED\n- { err_no: ECONNABORTED, err_name: \"ECONNABORTED\" },\n+ { .err_no = ECONNABORTED, .err_name = \"ECONNABORTED\" },\n #endif \/* ECONNABORTED *\/\n #ifdef ECONNRESET\n- { err_no: ECONNRESET, err_name: \"ECONNRESET\" },\n+ { .err_no = ECONNRESET, .err_name = \"ECONNRESET\" },\n #endif \/* ECONNRESET *\/\n #ifdef ENOBUFS\n- { err_no: ENOBUFS, err_name: \"ENOBUFS\" },\n+ { .err_no = ENOBUFS, .err_name = \"ENOBUFS\" },\n #endif \/* ENOBUFS *\/\n #ifdef EISCONN\n- { err_no: EISCONN, err_name: \"EISCONN\" },\n+ { .err_no = EISCONN, .err_name = \"EISCONN\" },\n #endif \/* EISCONN *\/\n #ifdef ENOTCONN\n- { err_no: ENOTCONN, err_name: \"ENOTCONN\" },\n+ { .err_no = ENOTCONN, .err_name = \"ENOTCONN\" },\n #endif \/* ENOTCONN *\/\n #ifdef ESHUTDOWN\n- { err_no: ESHUTDOWN, err_name: \"ESHUTDOWN\" },\n+ { .err_no = ESHUTDOWN, .err_name = \"ESHUTDOWN\" },\n #endif \/* ESHUTDOWN *\/\n #ifdef ETOOMANYREFS\n- { err_no: ETOOMANYREFS, err_name: \"ETOOMANYREFS\" },\n+ { .err_no = ETOOMANYREFS, .err_name = \"ETOOMANYREFS\" },\n #endif \/* ETOOMANYREFS *\/\n #ifdef ETIMEDOUT\n- { err_no: ETIMEDOUT, err_name: \"ETIMEDOUT\" },\n+ { .err_no = ETIMEDOUT, .err_name = \"ETIMEDOUT\" },\n #endif \/* ETIMEDOUT *\/\n #ifdef ECONNREFUSED\n- { err_no: ECONNREFUSED, err_name: \"ECONNREFUSED\" },\n+ { .err_no = ECONNREFUSED, .err_name = \"ECONNREFUSED\" },\n #endif \/* ECONNREFUSED *\/\n #ifdef ELOOP\n- { err_no: ELOOP, err_name: \"ELOOP\" },\n+ { .err_no = ELOOP, .err_name = \"ELOOP\" },\n #endif \/* ELOOP *\/\n #ifdef ENAMETOOLONG\n- { err_no: ENAMETOOLONG, err_name: \"ENAMETOOLONG\" },\n+ { .err_no = ENAMETOOLONG, .err_name = \"ENAMETOOLONG\" },\n #endif \/* ENAMETOOLONG *\/\n #ifdef EHOSTDOWN\n- { err_no: EHOSTDOWN, err_name: \"EHOSTDOWN\" },\n+ { .err_no = EHOSTDOWN, .err_name = \"EHOSTDOWN\" },\n #endif \/* EHOSTDOWN *\/\n #ifdef EHOSTUNREACH\n- { err_no: EHOSTUNREACH, err_name: \"EHOSTUNREACH\" },\n+ { .err_no = EHOSTUNREACH, .err_name = \"EHOSTUNREACH\" },\n #endif \/* EHOSTUNREACH *\/\n #ifdef ENOTEMPTY\n- { err_no: ENOTEMPTY, err_name: \"ENOTEMPTY\" },\n+ { .err_no = ENOTEMPTY, .err_name = \"ENOTEMPTY\" },\n #endif \/* ENOTEMPTY *\/\n #ifdef EPROCLIM\n- { err_no: EPROCLIM, err_name: \"EPROCLIM\" },\n+ { .err_no = EPROCLIM, .err_name = \"EPROCLIM\" },\n #endif \/* EPROCLIM *\/\n #ifdef EUSERS\n- { err_no: EUSERS, err_name: \"EUSERS\" },\n+ { .err_no = EUSERS, .err_name = \"EUSERS\" },\n #endif \/* EUSERS *\/\n #ifdef EDQUOT\n- { err_no: EDQUOT, err_name: \"EDQUOT\" },\n+ { .err_no = EDQUOT, .err_name = \"EDQUOT\" },\n #endif \/* EDQUOT *\/\n #ifdef ESTALE\n- { err_no: ESTALE, err_name: \"ESTALE\" },\n+ { .err_no = ESTALE, .err_name = \"ESTALE\" },\n #endif \/* ESTALE *\/\n #ifdef EREMOTE\n- { err_no: EREMOTE, err_name: \"EREMOTE\" },\n+ { .err_no = EREMOTE, .err_name = \"EREMOTE\" },\n #endif \/* EREMOTE *\/\n #ifdef EBADRPC\n- { err_no: EBADRPC, err_name: \"EBADRPC\" },\n+ { .err_no = EBADRPC, .err_name = \"EBADRPC\" },\n #endif \/* EBADRPC *\/\n #ifdef ERPCMISMATCH\n- { err_no: ERPCMISMATCH, err_name: \"ERPCMISMATCH\" },\n+ { .err_no = ERPCMISMATCH, .err_name = \"ERPCMISMATCH\" },\n #endif \/* ERPCMISMATCH *\/\n #ifdef EPROGUNAVAIL\n- { err_no: EPROGUNAVAIL, err_name: \"EPROGUNAVAIL\" },\n+ { .err_no = EPROGUNAVAIL, .err_name = \"EPROGUNAVAIL\" },\n #endif \/* EPROGUNAVAIL *\/\n #ifdef EPROGMISMATCH\n- { err_no: EPROGMISMATCH, err_name: \"EPROGMISMATCH\" },\n+ { .err_no = EPROGMISMATCH, .err_name = \"EPROGMISMATCH\" },\n #endif \/* EPROGMISMATCH *\/\n #ifdef EPROCUNAVAIL\n- { err_no: EPROCUNAVAIL, err_name: \"EPROCUNAVAIL\" },\n+ { .err_no = EPROCUNAVAIL, .err_name = \"EPROCUNAVAIL\" },\n #endif \/* EPROCUNAVAIL *\/\n #ifdef ENOLCK\n- { err_no: ENOLCK, err_name: \"ENOLCK\" },\n+ { .err_no = ENOLCK, .err_name = \"ENOLCK\" },\n #endif \/* ENOLCK *\/\n #ifdef ENOSYS\n- { err_no: ENOSYS, err_name: \"ENOSYS\" },\n+ { .err_no = ENOSYS, .err_name = \"ENOSYS\" },\n #endif \/* ENOSYS *\/\n #ifdef EFTYPE\n- { err_no: EFTYPE, err_name: \"EFTYPE\" },\n+ { .err_no = EFTYPE, .err_name = \"EFTYPE\" },\n #endif \/* EFTYPE *\/\n #ifdef EAUTH\n- { err_no: EAUTH, err_name: \"EAUTH\" },\n+ { .err_no = EAUTH, .err_name = \"EAUTH\" },\n #endif \/* EAUTH *\/\n #ifdef ENEEDAUTH\n- { err_no: ENEEDAUTH, err_name: \"ENEEDAUTH\" },\n+ { .err_no = ENEEDAUTH, .err_name = \"ENEEDAUTH\" },\n #endif \/* ENEEDAUTH *\/\n #ifdef EPWROFF\n- { err_no: EPWROFF, err_name: \"EPWROFF\" },\n+ { .err_no = EPWROFF, .err_name = \"EPWROFF\" },\n #endif \/* EPWROFF *\/\n #ifdef EDEVERR\n- { err_no: EDEVERR, err_name: \"EDEVERR\" },\n+ { .err_no = EDEVERR, .err_name = \"EDEVERR\" },\n #endif \/* EDEVERR *\/\n #ifdef EOVERFLOW\n- { err_no: EOVERFLOW, err_name: \"EOVERFLOW\" },\n+ { .err_no = EOVERFLOW, .err_name = \"EOVERFLOW\" },\n #endif \/* EOVERFLOW *\/\n #ifdef EBADEXEC\n- { err_no: EBADEXEC, err_name: \"EBADEXEC\" },\n+ { .err_no = EBADEXEC, .err_name = \"EBADEXEC\" },\n #endif \/* EBADEXEC *\/\n #ifdef EBADARCH\n- { err_no: EBADARCH, err_name: \"EBADARCH\" },\n+ { .err_no = EBADARCH, .err_name = \"EBADARCH\" },\n #endif \/* EBADARCH *\/\n #ifdef ESHLIBVERS\n- { err_no: ESHLIBVERS, err_name: \"ESHLIBVERS\" },\n+ { .err_no = ESHLIBVERS, .err_name = \"ESHLIBVERS\" },\n #endif \/* ESHLIBVERS *\/\n #ifdef EBADMACHO\n- { err_no: EBADMACHO, err_name: \"EBADMACHO\" },\n+ { .err_no = EBADMACHO, .err_name = \"EBADMACHO\" },\n #endif \/* EBADMACHO *\/\n #ifdef ECANCELED\n- { err_no: ECANCELED, err_name: \"ECANCELED\" },\n+ { .err_no = ECANCELED, .err_name = \"ECANCELED\" },\n #endif \/* ECANCELED *\/\n #ifdef EIDRM\n- { err_no: EIDRM, err_name: \"EIDRM\" },\n+ { .err_no = EIDRM, .err_name = \"EIDRM\" },\n #endif \/* EIDRM *\/\n #ifdef ENOMSG\n- { err_no: ENOMSG, err_name: \"ENOMSG\" },\n+ { .err_no = ENOMSG, .err_name = \"ENOMSG\" },\n #endif \/* ENOMSG *\/\n #ifdef EILSEQ\n- { err_no: EILSEQ, err_name: \"EILSEQ\" },\n+ { .err_no = EILSEQ, .err_name = \"EILSEQ\" },\n #endif \/* EILSEQ *\/\n #ifdef ENOATTR\n- { err_no: ENOATTR, err_name: \"ENOATTR\" },\n+ { .err_no = ENOATTR, .err_name = \"ENOATTR\" },\n #endif \/* ENOATTR *\/\n #ifdef EBADMSG\n- { err_no: EBADMSG, err_name: \"EBADMSG\" },\n+ { .err_no = EBADMSG, .err_name = \"EBADMSG\" },\n #endif \/* EBADMSG *\/\n #ifdef EMULTIHOP\n- { err_no: EMULTIHOP, err_name: \"EMULTIHOP\" },\n+ { .err_no = EMULTIHOP, .err_name = \"EMULTIHOP\" },\n #endif \/* EMULTIHOP *\/\n #ifdef ENODATA\n- { err_no: ENODATA, err_name: \"ENODATA\" },\n+ { .err_no = ENODATA, .err_name = \"ENODATA\" },\n #endif \/* ENODATA *\/\n #ifdef ENOLINK\n- { err_no: ENOLINK, err_name: \"ENOLINK\" },\n+ { .err_no = ENOLINK, .err_name = \"ENOLINK\" },\n #endif \/* ENOLINK *\/\n #ifdef ENOSR\n- { err_no: ENOSR, err_name: \"ENOSR\" },\n+ { .err_no = ENOSR, .err_name = \"ENOSR\" },\n #endif \/* ENOSR *\/\n #ifdef ENOSTR\n- { err_no: ENOSTR, err_name: \"ENOSTR\" },\n+ { .err_no = ENOSTR, .err_name = \"ENOSTR\" },\n #endif \/* ENOSTR *\/\n #ifdef EPROTO\n- { err_no: EPROTO, err_name: \"EPROTO\" },\n+ { .err_no = EPROTO, .err_name = \"EPROTO\" },\n #endif \/* EPROTO *\/\n #ifdef ETIME\n- { err_no: ETIME, err_name: \"ETIME\" },\n+ { .err_no = ETIME, .err_name = \"ETIME\" },\n #endif \/* ETIME *\/\n #ifdef EOPNOTSUPP\n- { err_no: EOPNOTSUPP, err_name: \"EOPNOTSUPP\" },\n+ { .err_no = EOPNOTSUPP, .err_name = \"EOPNOTSUPP\" },\n #endif \/* EOPNOTSUPP *\/\n #ifdef ENOPOLICY\n- { err_no: ENOPOLICY, err_name: \"ENOPOLICY\" },\n+ { .err_no = ENOPOLICY, .err_name = \"ENOPOLICY\" },\n #endif \/* ENOPOLICY *\/\n- { err_no: 0, err_name: NULL },\n+ { .err_no = 0, .err_name = NULL },\n };\n \n static const char *\n"} {"commit":"be042f240a8528b8f6b741a484cdbbf515698388","subject":"[SCSI] ibmvscsi eh locking","message":"[SCSI] ibmvscsi eh locking\n\nWith the removal of the spinlocking around eh calls, we need to add a\nlittle more locking back in, otherwise we do some naked list\nmanipulation.\n\nSigned-off-by: Dave Boutcher <375f348aa924245771a029ae10c50487d64f917b@us.ibm.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/ibmvscsi\/ibmvscsi.c\n+++ drivers\/scsi\/ibmvscsi\/ibmvscsi.c\n@@ -826,11 +826,13 @@\n \tstruct srp_event_struct *tmp_evt, *found_evt;\n \tunion viosrp_iu srp_rsp;\n \tint rsp_rc;\n+\tunsigned long flags;\n \tu16 lun = lun_from_dev(cmd->device);\n \n \t\/* First, find this command in our sent list so we can figure\n \t * out the correct tag\n \t *\/\n+\tspin_lock_irqsave(hostdata->host->host_lock, flags);\n \tfound_evt = NULL;\n \tlist_for_each_entry(tmp_evt, &hostdata->sent, list) {\n \t\tif (tmp_evt->cmnd == cmd) {\n@@ -839,11 +841,14 @@\n \t\t}\n \t}\n \n-\tif (!found_evt) \n+\tif (!found_evt) {\n+\t\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \t\treturn FAILED;\n+\t}\n \n \tevt = get_event_struct(&hostdata->pool);\n \tif (evt == NULL) {\n+\t\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \t\tprintk(KERN_ERR \"ibmvscsi: failed to allocate abort event\\n\");\n \t\treturn FAILED;\n \t}\n@@ -867,7 +872,9 @@\n \n \tevt->sync_srp = &srp_rsp;\n \tinit_completion(&evt->comp);\n-\tif (ibmvscsi_send_srp_event(evt, hostdata) != 0) {\n+\trsp_rc = ibmvscsi_send_srp_event(evt, hostdata);\n+\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n+\tif (rsp_rc != 0) {\n \t\tprintk(KERN_ERR \"ibmvscsi: failed to send abort() event\\n\");\n \t\treturn FAILED;\n \t}\n@@ -901,6 +908,7 @@\n \t * The event is no longer in our list. Make sure it didn't\n \t * complete while we were aborting\n \t *\/\n+\tspin_lock_irqsave(hostdata->host->host_lock, flags);\n \tfound_evt = NULL;\n \tlist_for_each_entry(tmp_evt, &hostdata->sent, list) {\n \t\tif (tmp_evt->cmnd == cmd) {\n@@ -910,6 +918,7 @@\n \t}\n \n \tif (found_evt == NULL) {\n+\t\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \t\tprintk(KERN_INFO\n \t\t \"ibmvscsi: aborted task tag 0x%lx completed\\n\",\n \t\t tsk_mgmt->managed_task_tag);\n@@ -924,6 +933,7 @@\n \tlist_del(&found_evt->list);\n \tunmap_cmd_data(&found_evt->iu.srp.cmd, found_evt->hostdata->dev);\n \tfree_event_struct(&found_evt->hostdata->pool, found_evt);\n+\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \tatomic_inc(&hostdata->request_limit);\n \treturn SUCCESS;\n }\n@@ -943,10 +953,13 @@\n \tstruct srp_event_struct *tmp_evt, *pos;\n \tunion viosrp_iu srp_rsp;\n \tint rsp_rc;\n+\tunsigned long flags;\n \tu16 lun = lun_from_dev(cmd->device);\n \n+\tspin_lock_irqsave(hostdata->host->host_lock, flags);\n \tevt = get_event_struct(&hostdata->pool);\n \tif (evt == NULL) {\n+\t\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \t\tprintk(KERN_ERR \"ibmvscsi: failed to allocate reset event\\n\");\n \t\treturn FAILED;\n \t}\n@@ -969,7 +982,9 @@\n \n \tevt->sync_srp = &srp_rsp;\n \tinit_completion(&evt->comp);\n-\tif (ibmvscsi_send_srp_event(evt, hostdata) != 0) {\n+\trsp_rc = ibmvscsi_send_srp_event(evt, hostdata);\n+\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n+\tif (rsp_rc != 0) {\n \t\tprintk(KERN_ERR \"ibmvscsi: failed to send reset event\\n\");\n \t\treturn FAILED;\n \t}\n@@ -1002,6 +1017,7 @@\n \t\/* We need to find all commands for this LUN that have not yet been\n \t * responded to, and fail them with DID_RESET\n \t *\/\n+\tspin_lock_irqsave(hostdata->host->host_lock, flags);\n \tlist_for_each_entry_safe(tmp_evt, pos, &hostdata->sent, list) {\n \t\tif ((tmp_evt->cmnd) && (tmp_evt->cmnd->device == cmd->device)) {\n \t\t\tif (tmp_evt->cmnd)\n@@ -1017,6 +1033,7 @@\n \t\t\t\ttmp_evt->done(tmp_evt);\n \t\t}\n \t}\n+\tspin_unlock_irqrestore(hostdata->host->host_lock, flags);\n \treturn SUCCESS;\n }\n \n"} {"commit":"fb4e7b141a3be6a3dcc2256c2e8a209d548d92df","subject":"Re-activate the filling of the displayed image for the test","message":"Re-activate the filling of the displayed image for the test\n","repos":"twitwi\/ClGaussianPyramid,twitwi\/ClGaussianPyramid","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- test\/test-pyramid.c\n+++ test\/test-pyramid.c\n@@ -80,11 +80,11 @@\n \n maxscale = clgp_maxscale(width, height);\n \n- for (scale = 2; scale < maxscale; scale++) {\n+ for (scale = 2; scale < maxscale; scale+=2) {\n cvRectangle(\n ipl_pyramid,\n- cvPoint(SCALE_ORIGIN_X(scale, width, height) + width\/(1<<scale),\n- SCALE_ORIGIN_Y(scale, width, height)),\n+ cvPoint(SCALE_ORIGIN_X(scale, width, height),\n+ height\/(1<<(scale\/2))*2),\n cvPoint(width*3, height),\n cvScalar(0, 0, 0, 0),\n CV_FILLED,\n@@ -255,7 +255,7 @@\n \n \/* Show results *\/\n \/* Fill outside of the pyramid with black, more displayable *\/\n- \/*fill_pyramid(ipl_pyramid, ipl_input->width, ipl_input->height);*\/\n+ fill_pyramid(ipl_pyramid, ipl_input->width, ipl_input->height);\n \/* Display *\/\n cvNamedWindow(\"gaussian pyramid\", CV_WINDOW_AUTOSIZE);\n cvShowImage(\"gaussian pyramid\", ipl_pyramid);\n"} {"commit":"0ce0f6d5abda77cae610cba4b7c5ca35b5dd9604","subject":"update SkNx allTrue\/anyTrue","message":"update SkNx allTrue\/anyTrue\n\nThere's an _mm_movemask_ps() intrinsic that gets at the movmskps\ninstruction, which grabs the top (sign) bit of each float directly\nwithout needing to reinterpret them as bytes.\n\nI wouldn't really have done this but I think Chrome's clang is\nmiscompiling the version at head that uses _mm_movemask_epi8(). The\nSkNx<2,float> `!(a+b == a*b).anyTrue()` test case fails when I use that\ncompiler, and spooky things like adding SkDebugf() make it pass again.\n\nChange-Id: Idd0698d46ccfe9a00909faca1c6693a70e91157a\nReviewed-on: https:\/\/skia-review.googlesource.com\/c\/skia\/+\/314860\nAuto-Submit: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@google.com>\nCommit-Queue: Herb Derby <9e12a3d2bbf73546e47cc9958f6ba8f3215b7eaf@google.com>\nReviewed-by: Herb Derby <9e12a3d2bbf73546e47cc9958f6ba8f3215b7eaf@google.com>\n","repos":"google\/skia,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,google\/skia,aosp-mirror\/platform_external_skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/private\/SkNx_sse.h\n+++ include\/private\/SkNx_sse.h\n@@ -109,8 +109,8 @@\n return pun.fs[k&1];\n }\n \n- AI bool allTrue() const { return 0xff == (_mm_movemask_epi8(_mm_castps_si128(fVec)) & 0xff); }\n- AI bool anyTrue() const { return 0x00 != (_mm_movemask_epi8(_mm_castps_si128(fVec)) & 0xff); }\n+ AI bool allTrue() const { return 0b11 == (_mm_movemask_ps(fVec) & 0b11); }\n+ AI bool anyTrue() const { return 0b00 != (_mm_movemask_ps(fVec) & 0b11); }\n \n AI SkNx thenElse(const SkNx& t, const SkNx& e) const {\n #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41\n@@ -214,8 +214,8 @@\n return max[0];\n }\n \n- AI bool allTrue() const { return 0xffff == _mm_movemask_epi8(_mm_castps_si128(fVec)); }\n- AI bool anyTrue() const { return 0x0000 != _mm_movemask_epi8(_mm_castps_si128(fVec)); }\n+ AI bool allTrue() const { return 0b1111 == _mm_movemask_ps(fVec); }\n+ AI bool anyTrue() const { return 0b0000 != _mm_movemask_ps(fVec); }\n \n AI SkNx thenElse(const SkNx& t, const SkNx& e) const {\n #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41\n"} {"commit":"b132265f50bc405d1ca31bcf2bcf3190b7d4f0f1","subject":"util: Remove unnecessary header.","message":"util: Remove unnecessary header.\n","repos":"bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/util\/u_resource.c\n+++ src\/gallium\/auxiliary\/util\/u_resource.c\n@@ -1,7 +1,6 @@\n \n \n #include \"util\/u_inlines.h\"\n-#include \"util\/u_memory.h\"\n #include \"util\/u_transfer.h\"\n \n static INLINE struct u_resource *\n"} {"commit":"e3678a0c4c207d2d0104d69bffbe37c965d4e87d","subject":"ibmvscsi: display default value for max_id, max_lun and max_channel.","message":"ibmvscsi: display default value for max_id, max_lun and max_channel.\n\nAs devices with values greater than that are silently ignored,\nthis gives some hints to the sys admin to know why he doesn't see\nhis devices...\n\nSigned-off-by: Laurent Vivier <240b731be4efaffb85b5d13af681c07e7ef8ddcb@redhat.com>\nSigned-off-by: Martin K. Petersen <0384aaef27f06874adbdb09a807bb339f4aff9fd@oracle.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/ibmvscsi\/ibmvscsi.c\n+++ drivers\/scsi\/ibmvscsi\/ibmvscsi.c\n@@ -106,9 +106,9 @@\n MODULE_VERSION(IBMVSCSI_VERSION);\n \n module_param_named(max_id, max_id, int, S_IRUGO | S_IWUSR);\n-MODULE_PARM_DESC(max_id, \"Largest ID value for each channel\");\n+MODULE_PARM_DESC(max_id, \"Largest ID value for each channel [Default=64]\");\n module_param_named(max_channel, max_channel, int, S_IRUGO | S_IWUSR);\n-MODULE_PARM_DESC(max_channel, \"Largest channel value\");\n+MODULE_PARM_DESC(max_channel, \"Largest channel value [Default=3]\");\n module_param_named(init_timeout, init_timeout, int, S_IRUGO | S_IWUSR);\n MODULE_PARM_DESC(init_timeout, \"Initialization timeout in seconds\");\n module_param_named(max_requests, max_requests, int, S_IRUGO);\n@@ -2294,6 +2294,10 @@\n \thost->max_channel = max_channel;\n \thost->max_cmd_len = 16;\n \n+\tdev_info(dev,\n+\t\t \"Maximum ID: %d Maximum LUN: %llu Maximum Channel: %d\\n\",\n+\t\t host->max_id, host->max_lun, host->max_channel);\n+\n \tif (scsi_add_host(hostdata->host, hostdata->dev))\n \t\tgoto add_host_failed;\n \n"} {"commit":"b333dcc2e76b8ccad3bdbf93ec55494de0f984d8","subject":"[test] Add a bunch of tests","message":"[test] Add a bunch of tests\n","repos":"mmalecki\/saneopt","returncode":1,"stderr":"error: pathspec 'test\/test-saneopt.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- test\/test-saneopt.c\n+++ test\/test-saneopt.c\n@@ -0,0 +1,53 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <assert.h>\n+\n+#include <saneopt.h>\n+\n+void test_no_arg() {\n+ char** argv;\n+\n+ saneopt_t* opt = saneopt_init(0, argv);\n+ assert(saneopt_get(opt, \"no-option\") == NULL);\n+\n+ free(opt);\n+}\n+\n+void test_no_value() {\n+ char** argv = malloc(1 * sizeof(char*));\n+\n+ argv[0] = \"--option\";\n+\n+ saneopt_t* opt = saneopt_init(1, argv);\n+ assert(strcmp(saneopt_get(opt, \"option\"), \"\") == 0);\n+\n+ free(argv);\n+ free(opt);\n+}\n+\n+void test_value() {\n+ char** argv = malloc(4 * sizeof(char*));\n+\n+ argv[0] = \"--option\";\n+ argv[1] = \"value\";\n+ argv[2] = \"--next-option\";\n+ argv[3] = \"--third-option\";\n+\n+ saneopt_t* opt = saneopt_init(4, argv);\n+ assert(strcmp(saneopt_get(opt, \"option\"), \"value\") == 0);\n+ assert(strcmp(saneopt_get(opt, \"next-option\"), \"\") == 0);\n+ assert(strcmp(saneopt_get(opt, \"third-option\"), \"\") == 0);\n+\n+ free(argv);\n+ free(opt);\n+}\n+\n+\n+int main(int argc, char** argv) {\n+ test_no_arg();\n+ test_no_value();\n+ test_value();\n+\n+ return 0;\n+}\n"} {"commit":"b3c5ceef0f1cd94d3b84db839b918d52432901d0","subject":"Optimise sin and cos on rotation","message":"Optimise sin and cos on rotation\n","repos":"jacquesrott\/merriment,jacquesrott\/merriment,jacquesrott\/merriment","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/almath.c\n+++ src\/almath.c\n@@ -198,11 +198,17 @@\n \n \n mat4 m4_rotate(const vec3* v) {\n- mat4 m = {\n- {\n- {cos(v->y)*cos(v->z), cos(v->z)*sin(v->x)*sin(v->y) - cos(v->x)*sin(v->z), cos(v->x)*cos(v->z)*sin(v->y) + sin(v->x)*sin(v->z), 0},\n- {cos(v->y)*sin(v->z), cos(v->x)*cos(v->z) + sin(v->x)*sin(v->y)*sin(v->z), -cos(v->z)*sin(v->x) + cos(v->x)*sin(v->y)*sin(v->z), 0},\n- {-sin(v->y), cos(v->y)*sin(v->x), cos(v->x)*cos(v->y), 0},\n+ float cx = cos(v->x);\n+ float sx = sin(v->x);\n+ float cy = cos(v->y);\n+ float sy = sin(v->y);\n+ float cz = cos(v->z);\n+ float sz = sin(v->z);\n+ mat4 m = {\n+ {\n+ {cy*cz, cz*sx*sy - cx*sz, cx*cz*sy + sx*sz, 0},\n+ {cy*sz, cx*cz + sx*sy*sz, -cz*sx + cx*sy*sz, 0},\n+ {-sy, cy*sx, cx*cy, 0},\n {0, 0, 0, 1}\n }\n };\n@@ -211,11 +217,13 @@\n \n \n mat4 m4_rotatex(float x) {\n+ float cx = cos(x);\n+ float sx = sin(x);\n mat4 m = {\n {\n {1, 0, 0, 0},\n- {0, cos(x), -sin(x), 0},\n- {0, sin(x), cos(x), 0},\n+ {0, cx, -sx, 0},\n+ {0, sx, cx, 0},\n {0, 0, 0, 1}\n }\n };\n@@ -224,11 +232,13 @@\n \n \n mat4 m4_rotatey(float y) {\n- mat4 m = {\n- {\n- {cos(y), 0, sin(y), 0},\n+ float cy = cos(y);\n+ float sy = sin(y);\n+ mat4 m = {\n+ {\n+ {cy, 0, sy, 0},\n {0, 1, 0, 0},\n- {-sin(y), 0, cos(y), 0},\n+ {-sy, 0, cy, 0},\n {0, 0, 0, 1}\n }\n };\n@@ -238,10 +248,12 @@\n \n \n mat4 m4_rotatez(float z) {\n- mat4 m = {\n- {\n- {cos(z), -sin(z), 0, 0},\n- {sin(z), cos(z), 0, 0},\n+ float cz = cos(z);\n+ float sz = sin(z);\n+ mat4 m = {\n+ {\n+ {cz, -sz, 0, 0},\n+ {sz, cz, 0, 0},\n {0, 0, 1, 0},\n {0, 0, 0, 1}\n }\n"} {"commit":"bcbe6baac37915563bc120ad558cd930bc1ddec1","subject":"nv50: hacks for stuff I don't really get yet","message":"nv50: hacks for stuff I don't really get yet\n","repos":"benaadams\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,zz85\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/nv50\/nv50_program.c\n+++ src\/gallium\/drivers\/nv50\/nv50_program.c\n@@ -1592,7 +1592,7 @@\n \tso_method(so, tesla, 0x16b8, 1);\n \tso_data (so, p->cfg.high_result);\n \tso_method(so, tesla, 0x16ac, 2);\n-\tso_data (so, 8);\n+\tso_data (so, p->cfg.high_result); \/\/8);\n \tso_data (so, p->cfg.high_temp);\n \tso_method(so, tesla, 0x140c, 1);\n \tso_data (so, 0); \/* program start offset *\/\n@@ -1632,7 +1632,7 @@\n \tso_data (so, 0x07060504);\n \tso_data (so, 0x0b0a0908);\n \tso_method(so, tesla, 0x1988, 2);\n-\tso_data (so, 0x08040404); \/* p: 0x0f000401 *\/\n+\tso_data (so, 0x08080408); \/\/0x08040404); \/* p: 0x0f000401 *\/\n \tso_data (so, p->cfg.high_temp);\n \tso_method(so, tesla, 0x1414, 1);\n \tso_data (so, 0); \/* program start offset *\/\n"} {"commit":"4f9d81203cfbb3c982e6575cba6e99fda0e6d26a","subject":"Add rRecursp sugar","message":"Add rRecursp sugar\n","repos":"fundamental\/rtosc,fundamental\/rtosc,fundamental\/rtosc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/rtosc\/port-sugar.h\n+++ include\/rtosc\/port-sugar.h\n@@ -135,6 +135,12 @@\n &decltype(spice(rObject::name))::ports, \\\n rRecurpCb(name)}\n \n+\/\/Technically this is a pointer pointer method...\n+#define rRecursp(name, length, ...) \\\n+ {STRINGIFY(name)\"#\" STRINGIFY(length) \"\/\", DOC(__VA_ARGS__), \\\n+ &decltype(spice(rObject::name[0]))::ports, \\\n+ rRecurspCb(name)}\n+\n \/\/{STRINGIFY(name) \":\", rProp(internal), NULL, rRecurPtrCb(name)}\n \n \/\/Misc\n@@ -257,6 +263,12 @@\n decltype(spice(rObject::name))::ports.dispatch(msg, data); \\\n rBOIL_END\n \n+#define rRecurspCb(name) rBOILS_BEGIN \\\n+ data.obj = obj->name[idx]; \\\n+ SNIP \\\n+ decltype(spice(rObject::name[0]))::ports.dispatch(msg, data); \\\n+ rBOILS_END\n+\n #define rActionCb(name) rBOIL_BEGIN obj->name(); rBOIL_END\n #define rActioniCb(name) rBOIL_BEGIN \\\n obj->name(rtosc_argument(msg,0).i); rBOIL_END\n"} {"commit":"4983ce0c6ba23473919ffc13077604bc6480ca77","subject":"[SCSI] lpfc 8.3.33: Update lpfc version for 8.3.33 driver release","message":"[SCSI] lpfc 8.3.33: Update lpfc version for 8.3.33 driver release\n\nSigned-off-by: James Smart <2b041da073ece526f0738329b43a4ebfc495c725@emulex.com>\nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Parallels.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/lpfc\/lpfc_version.h\n+++ drivers\/scsi\/lpfc\/lpfc_version.h\n@@ -18,7 +18,7 @@\n * included with this package. *\n *******************************************************************\/\n \n-#define LPFC_DRIVER_VERSION \"8.3.32\"\n+#define LPFC_DRIVER_VERSION \"8.3.33\"\n #define LPFC_DRIVER_NAME\t\t\"lpfc\"\n \n \/* Used for SLI 2\/3 *\/\n"} {"commit":"b8e6b2a2c93c34b0b848dd2c28ce35d5caa8e40d","subject":"clarify","message":"clarify","repos":"vergecurrency\/VERGE,vergecurrency\/VERGE,vergecurrency\/VERGE,vergecurrency\/VERGE,vergecurrency\/VERGE,vergecurrency\/VERGE","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/amount.h\n+++ src\/amount.h\n@@ -25,7 +25,7 @@\n * currently happens to be less than 16,555,000,000 XVG for various reasons, but\n * rather a sanity check. As this sanity check is used by consensus-critical\n * validation code, the exact value of the MAX_MONEY constant is consensus\n- * critical; in unusual circumstances like a(nother) overflow bug that allowed\n+ * critical; in unusual circumstances like a(nother) overflow bug (on the bitcoin blockchain) that allowed\n * for the creation of coins out of thin air modification could lead to a fork.\n * *\/\n static const CAmount MAX_MONEY = 16555000000 * COIN;\n"} {"commit":"b5ddad265556e8c6b039f51fc492a47f1216870e","subject":"Cleanly close the connection when the cancel button of the greeter is pressed","message":"Cleanly close the connection when the cancel button of the greeter is pressed\n\nIn this patch, we close cleanly the connection by initiating a close sequence\nin RDP. This prevent a message in mstsc saying the connection was broken.\n","repos":"vworkspace\/FreeRDS,awakecoding\/FreeRDS,vworkspace\/FreeRDS,awakecoding\/FreeRDS,vworkspace\/FreeRDS,awakecoding\/FreeRDS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- freerds\/core\/process.c\n+++ freerds\/core\/process.c\n@@ -409,6 +409,9 @@\n \tstruct rds_notification_msg_logoff *notification = (struct rds_notification_msg_logoff *)message->wParam;\n \tfreerds_connector_free(connection->connector);\n \tconnection->connector = NULL;\n+\n+\tconnection->client->Close(connection->client);\n+\n \terror = freerds_icp_sendResponse(notification->tag, message->id, 0, TRUE);\n \tfree(notification);\n \treturn FALSE;\n"} {"commit":"0328e838c2803cb730bad04155cb92f070560df0","subject":"r300-gallium: Fix register count.","message":"r300-gallium: Fix register count.\n","repos":"djreep81\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_surface.c\n+++ src\/gallium\/drivers\/r300\/r300_surface.c\n@@ -237,7 +237,7 @@\n r300_emit_fragment_shader(r300, &r300_passthrough_fragment_shader);\n }\n \n- BEGIN_CS(8 + (caps->has_tcl ? 20 : 2));\n+ BEGIN_CS(7 + (caps->has_tcl ? 21 : 2));\n OUT_CS_REG_SEQ(R300_US_OUT_FMT_0, 4);\n OUT_CS(R300_C0_SEL_B | R300_C1_SEL_G | R300_C2_SEL_R | R300_C3_SEL_A);\n OUT_CS(R300_US_OUT_FMT_UNUSED);\n"} {"commit":"bb5e8592a9323383fb67e9df04e7a667501a4ba0","subject":"error: implicit instantiation of undefined std::string hostname_","message":"error: implicit instantiation of undefined std::string hostname_\n","repos":"fpagliughi\/sockpp,fpagliughi\/sockpp,fpagliughi\/sockpp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/sockpp\/exception.h\n+++ include\/sockpp\/exception.h\n@@ -48,6 +48,7 @@\n #define __sockpp_exception_h\n \n #include <stdexcept>\n+#include <string>\n \n namespace sockpp {\n \n"} {"commit":"bd7b7a6423795bd2f8b458b24f774a909fc17492","subject":"drivers: sensors: fdc2x1x: removed unused fdc2x1x_data","message":"drivers: sensors: fdc2x1x: removed unused fdc2x1x_data\n\nRemoving two unused \"struct fdc2x1x_data\" to fix warnings\nwhen compiling with PM_DEVICE=y.\n\nSigned-off-by: Igor Knippenberg <1b3ee8a16ebf75090566d4e1923e5b457ea35a54@gmail.com>","repos":"zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/sensor\/fdc2x1x\/fdc2x1x.c\n+++ drivers\/sensor\/fdc2x1x\/fdc2x1x.c\n@@ -485,7 +485,6 @@\n \t\t\t\t enum pm_device_action action)\n {\n \tint ret;\n-\tstruct fdc2x1x_data *data = dev->data;\n \tconst struct fdc2x1x_config *cfg = dev->config;\n \tenum pm_device_state curr_state;\n \n@@ -613,7 +612,6 @@\n \t\t\t\tenum sensor_channel chan)\n {\n #ifdef CONFIG_PM_DEVICE\n-\tstruct fdc2x1x_data *data = dev->data;\n \tenum pm_device_state state;\n \n \t(void)pm_device_state_get(dev, &state);\n"} {"commit":"732684bf9cac6255fb200f9853841c95d40e8fdd","subject":"Update amount.h","message":"Update amount.h","repos":"gzuser01\/zetacoin-bitcoin,gzuser01\/zetacoin-bitcoin,gzuser01\/zetacoin-bitcoin,gzuser01\/zetacoin-bitcoin,gzuser01\/zetacoin-bitcoin,gzuser01\/zetacoin-bitcoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/amount.h\n+++ src\/amount.h\n@@ -28,7 +28,7 @@\n * critical; in unusual circumstances like a(nother) overflow bug that allowed\n * for the creation of coins out of thin air modification could lead to a fork.\n * *\/\n-static const CAmount MAX_MONEY = 21000000 * COIN;\n+static const CAmount MAX_MONEY = 200000000 * COIN;\n inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }\n \n \/**\n"} {"commit":"962d2e678f4da6ffef4f21f2fa9b062747bfbb85","subject":"r300: Clean up PVS upload emits.","message":"r300: Clean up PVS upload emits.\n","repos":"metora\/MesaGLSLCompiler,adobe\/glsl2agal,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_surface.c\n+++ src\/gallium\/drivers\/r300\/r300_surface.c\n@@ -184,66 +184,6 @@\n OUT_CS_REG(0x43E8, 0x00000000);\n R300_PACIFY;\n OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000406);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x3F800000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000400);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000401);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000402);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000403);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000404);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x43E8, 0x00000000);\n-R300_PACIFY;\n-OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000405);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00000000);\n OUT_CS_REG(0x2150, 0x21030003);\n OUT_CS_REG(0x4BC0, 0x00000000);\n OUT_CS_REG(R300_VAP_PROG_STREAM_CNTL_EXT_0, 0xF688F688);\n@@ -290,7 +230,6 @@\n OUT_CS_REG(0x46C0, 0x1C000000);\n OUT_CS_REG(0x49C0, 0x00040889);\n OUT_CS_REG(0x47C0, 0x01000000);\n-OUT_CS_REG(0x2284, 0x00000000);\n \/* XXX these magic numbers should be explained when\n * this becomes a cached state object *\/\n OUT_CS_REG(R300_VAP_CNTL, 0xA | (0x5 << R300_PVS_NUM_CNTLRS_SHIFT) |\n@@ -301,16 +240,17 @@\n OUT_CS_REG(0x43E8, 0x00000000);\n R300_PACIFY;\n OUT_CS_REG(0x43E8, 0x00FFFFFF);\n-OUT_CS_REG(0x2284, 0x00000001);\n-OUT_CS_REG(0x2200, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00F00203);\n-OUT_CS_REG(0x2208, 0x00D10001);\n-OUT_CS_REG(0x2208, 0x01248001);\n-OUT_CS_REG(0x2208, 0x00000000);\n-OUT_CS_REG(0x2208, 0x00F02203);\n-OUT_CS_REG(0x2208, 0x00D10021);\n-OUT_CS_REG(0x2208, 0x01248021);\n-OUT_CS_REG(0x2208, 0x00000000);\n+\/* XXX translate these back into normal instructions *\/\n+OUT_CS_REG(R300_VAP_PVS_STATE_FLUSH_REG, 0x1);\n+OUT_CS_REG(R300_VAP_PVS_VECTOR_INDX_REG, 0x0);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0xF00203);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0xD10001);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0x1248001);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0x0);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0xF02203);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0xD10021);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0x1248021);\n+OUT_CS_REG(R300_VAP_PVS_UPLOAD_DATA, 0x0);\n \n r300_emit_dsa_state(r300, &dsa_clear_state);\n \n"} {"commit":"1001fb810b1295d0600c0c6bdcb17889460470a5","subject":"ALSA: seq: increase the maximum number of queues","message":"ALSA: seq: increase the maximum number of queues\n\nQueues are used both for scheduling playback events and for assigning\ntimestamps to recorded events, so it is easy to need quite a lot of\nthem, especially on a multi-user system. Additionally, the actual\nqueue objects are allocated dynamically, so it does not really make\nsense to have a low limit. Increase it to something still sane.\n\nSigned-off-by: Clemens Ladisch <9f57ef5ff1095f40b1ee8b7caa363908baef59d7@ladisch.de>\nSigned-off-by: Takashi Iwai <4596b3305151c7ee743192a95d394341e3d3b644@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/sound\/seq_kernel.h\n+++ include\/sound\/seq_kernel.h\n@@ -28,7 +28,7 @@\n typedef union snd_seq_timestamp snd_seq_timestamp_t;\n \n \/* maximum number of queues *\/\n-#define SNDRV_SEQ_MAX_QUEUES\t\t8\n+#define SNDRV_SEQ_MAX_QUEUES\t\t32\n \n \/* max number of concurrent clients *\/\n #define SNDRV_SEQ_MAX_CLIENTS \t\t192\n"} {"commit":"1c1dd2a06d9ce42007a499745f4b1cc2468f2bc9","subject":"Staging:dgnc: Fixed else not following close brace error","message":"Staging:dgnc: Fixed else not following close brace error\n\nFix checkpatch.pl warning - else should follow close brace.\n\nSigned-off-by: Iulia Manda <80e86c6595d2e20a4677fac041731491bdb892c6@gmail.com>\nAcked-by: Paul E. McKenney <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nSigned-off-by: Peter P Waskiewicz Jr <019ca817bcedb2fce0c539efa1b71c24f7a6c1c1@intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/dgnc\/dgnc_mgmt.c\n+++ drivers\/staging\/dgnc\/dgnc_mgmt.c\n@@ -77,8 +77,7 @@\n \t\t\treturn -EBUSY;\n \t\t}\n \t\tdgnc_mgmt_in_use[minor]++;\n-\t}\n-\telse {\n+\t} else {\n \t\tDGNC_UNLOCK(dgnc_global_lock, lock_flags);\n \t\treturn -ENXIO;\n \t}\n"} {"commit":"f7c85fd3c4315c9baccacbcc3752fb8b08cfcada","subject":"Add CFeeRate += operator","message":"Add CFeeRate += operator\n\n- backports bitcoin@241d6078ba26db4d3a36227d3275be2ee34625a6","repos":"PIVX-Project\/PIVX,PIVX-Project\/PIVX,PIVX-Project\/PIVX,Darknet-Crypto\/Darknet,Darknet-Crypto\/Darknet,Darknet-Crypto\/Darknet,Darknet-Crypto\/Darknet,Darknet-Crypto\/Darknet,PIVX-Project\/PIVX,PIVX-Project\/PIVX,Darknet-Crypto\/Darknet,PIVX-Project\/PIVX,PIVX-Project\/PIVX,PIVX-Project\/PIVX,PIVX-Project\/PIVX","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/amount.h\n+++ src\/amount.h\n@@ -41,6 +41,7 @@\n friend bool operator==(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK == b.nSatoshisPerK; }\n friend bool operator<=(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK <= b.nSatoshisPerK; }\n friend bool operator>=(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK >= b.nSatoshisPerK; }\n+ CFeeRate& operator+=(const CFeeRate& a) { nSatoshisPerK += a.nSatoshisPerK; return *this; }\n std::string ToString() const;\n \n ADD_SERIALIZE_METHODS;\n"} {"commit":"c2df759cd73e281c4698c717e0ab89757a7affd5","subject":"r300g: fix redefining mipmaps and fetching from them","message":"r300g: fix redefining mipmaps and fetching from them\n","repos":"benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r300\/r300_texture.c\n+++ src\/gallium\/drivers\/r300\/r300_texture.c\n@@ -36,8 +36,9 @@\n state->format0 = R300_TX_WIDTH((pt->width[0] - 1) & 0x7ff) |\n R300_TX_HEIGHT((pt->height[0] - 1) & 0x7ff) |\n R300_TX_DEPTH(util_logbase2(pt->depth[0]) & 0xf) |\n- R300_TX_NUM_LEVELS(pt->last_level & 0xf) |\n- R300_TX_PITCH_EN;\n+ R300_TX_NUM_LEVELS(pt->last_level & 0xf);\/* |\n+ R300_TX_PITCH_EN;*\/\n+ \/* XXX TX_PITCH_EN breaks rendering mipmap levels > 0, weard *\/\n \n \/* XXX *\/\n state->format1 = r300_translate_texformat(pt->format);\n@@ -194,6 +195,10 @@\n surface->height = texture->height[level];\n surface->offset = offset;\n surface->usage = flags;\n+ surface->zslice = zslice;\n+ surface->texture = texture;\n+ surface->face = face;\n+ surface->level = level;\n }\n \n return surface;\n"} {"commit":"c0332f1c2913ffa83428adff539da75c6d7a2300","subject":"small doc update","message":"small doc update\n\nSigned-off-by: Denis Zalevskiy <43c40921ef02e9bb53daac07eb9ed16452640d88@jollamobile.com>\n","repos":"android-808\/statefs,android-808\/statefs,android-808\/statefs,android-808\/statefs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/statefs\/provider.h\n+++ include\/statefs\/provider.h\n@@ -114,7 +114,8 @@\n * property changing in some discrete intervals so each change can be\n * tracked through event. Continuous property is changing continuously\n * (or maybe, also, very frequently to use events to track it) in time\n- * so it should be requested only explicitely\n+ * so it should be requested only explicitely. Access to property is\n+ * serialized.\n *\/\n struct statefs_property\n {\n"} {"commit":"61eaffc91d375e02bc12c2c831478841f5ce4757","subject":"Staging: hv: storvsc: Consolidate the request structure","message":"Staging: hv: storvsc: Consolidate the request structure\n\nConsolidate the request structure by getting rid of struct hv_storvsc_request.\n\nSigned-off-by: K. Y. Srinivasan <bcbf172338421f26297a2592698edf8cc84ecbef@microsoft.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/hv\/storvsc_drv.c\n+++ drivers\/staging\/hv\/storvsc_drv.c\n@@ -236,17 +236,20 @@\n #define SRB_STATUS_ERROR\t0x04\n \n \n-\n-struct hv_storvsc_request {\n+struct storvsc_cmd_request {\n+\tstruct list_head entry;\n+\tstruct scsi_cmnd *cmd;\n+\n+\tunsigned int bounce_sgl_count;\n+\tstruct scatterlist *bounce_sgl;\n+\n \tstruct hv_device *device;\n \n \t\/* Synchronize the request\/response if needed *\/\n \tstruct completion wait_event;\n \n \tunsigned char *sense_buffer;\n-\tstruct storvsc_cmd_request *cmd;\n \tstruct hv_multipage_buffer data_buffer;\n-\n \tstruct vstor_packet vstor_packet;\n };\n \n@@ -272,8 +275,8 @@\n \tunsigned char target_id;\n \n \t\/* Used for vsc\/vsp channel reset process *\/\n-\tstruct hv_storvsc_request init_request;\n-\tstruct hv_storvsc_request reset_request;\n+\tstruct storvsc_cmd_request init_request;\n+\tstruct storvsc_cmd_request reset_request;\n };\n \n struct stor_mem_pools {\n@@ -286,16 +289,6 @@\n \tunsigned int port;\n \tunsigned char path;\n \tunsigned char target;\n-};\n-\n-struct storvsc_cmd_request {\n-\tstruct list_head entry;\n-\tstruct scsi_cmnd *cmd;\n-\n-\tunsigned int bounce_sgl_count;\n-\tstruct scatterlist *bounce_sgl;\n-\n-\tstruct hv_storvsc_request request;\n };\n \n struct storvsc_scan_work {\n@@ -628,7 +621,7 @@\n static int storvsc_channel_init(struct hv_device *device)\n {\n \tstruct storvsc_device *stor_device;\n-\tstruct hv_storvsc_request *request;\n+\tstruct storvsc_cmd_request *request;\n \tstruct vstor_packet *vstor_packet;\n \tint ret, t;\n \n@@ -643,7 +636,7 @@\n \t * Now, initiate the vsc\/vsp initialization protocol on the open\n \t * channel\n \t *\/\n-\tmemset(request, 0, sizeof(struct hv_storvsc_request));\n+\tmemset(request, 0, sizeof(struct storvsc_cmd_request));\n \tinit_completion(&request->wait_event);\n \tvstor_packet->operation = VSTOR_OPERATION_BEGIN_INITIALIZATION;\n \tvstor_packet->flags = REQUEST_COMPLETION_FLAG;\n@@ -757,9 +750,8 @@\n }\n \n \n-static void storvsc_command_completion(struct hv_storvsc_request *request)\n-{\n-\tstruct storvsc_cmd_request *cmd_request = request->cmd;\n+static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)\n+{\n \tstruct scsi_cmnd *scmnd = cmd_request->cmd;\n \tstruct hv_host_device *host_dev = shost_priv(scmnd->device->host);\n \tvoid (*scsi_done_fn)(struct scsi_cmnd *);\n@@ -768,7 +760,7 @@\n \tstruct storvsc_scan_work *wrk;\n \tstruct stor_mem_pools *memp = scmnd->device->hostdata;\n \n-\tvm_srb = &request->vstor_packet.vm_srb;\n+\tvm_srb = &cmd_request->vstor_packet.vm_srb;\n \tif (cmd_request->bounce_sgl_count) {\n \t\tif (vm_srb->data_in == READ_TYPE)\n \t\t\tcopy_from_bounce_buffer(scsi_sglist(scmnd),\n@@ -819,7 +811,7 @@\n \t}\n \n \tscsi_set_resid(scmnd,\n-\t\trequest->data_buffer.len -\n+\t\tcmd_request->data_buffer.len -\n \t\tvm_srb->data_transfer_length);\n \n \tscsi_done_fn = scmnd->scsi_done;\n@@ -834,7 +826,7 @@\n \n static void storvsc_on_io_completion(struct hv_device *device,\n \t\t\t\t struct vstor_packet *vstor_packet,\n-\t\t\t\t struct hv_storvsc_request *request)\n+\t\t\t\t struct storvsc_cmd_request *request)\n {\n \tstruct storvsc_device *stor_device;\n \tstruct vstor_packet *stor_pkt;\n@@ -906,7 +898,7 @@\n \n static void storvsc_on_receive(struct hv_device *device,\n \t\t\t struct vstor_packet *vstor_packet,\n-\t\t\t struct hv_storvsc_request *request)\n+\t\t\t struct storvsc_cmd_request *request)\n {\n \tstruct storvsc_scan_work *work;\n \tstruct storvsc_device *stor_device;\n@@ -940,7 +932,7 @@\n \tu32 bytes_recvd;\n \tu64 request_id;\n \tunsigned char packet[ALIGN(sizeof(struct vstor_packet), 8)];\n-\tstruct hv_storvsc_request *request;\n+\tstruct storvsc_cmd_request *request;\n \tint ret;\n \n \n@@ -954,7 +946,7 @@\n \t\t\t\t &bytes_recvd, &request_id);\n \t\tif (ret == 0 && bytes_recvd > 0) {\n \n-\t\t\trequest = (struct hv_storvsc_request *)\n+\t\t\trequest = (struct storvsc_cmd_request *)\n \t\t\t\t\t(unsigned long)request_id;\n \n \t\t\tif ((request == &stor_device->init_request) ||\n@@ -1036,7 +1028,7 @@\n }\n \n static int storvsc_do_io(struct hv_device *device,\n-\t\t\t struct hv_storvsc_request *request)\n+\t\t\t struct storvsc_cmd_request *request)\n {\n \tstruct storvsc_device *stor_device;\n \tstruct vstor_packet *vstor_packet;\n@@ -1174,7 +1166,7 @@\n \tstruct hv_device *device = host_dev->dev;\n \n \tstruct storvsc_device *stor_device;\n-\tstruct hv_storvsc_request *request;\n+\tstruct storvsc_cmd_request *request;\n \tstruct vstor_packet *vstor_packet;\n \tint ret, t;\n \n@@ -1238,7 +1230,6 @@\n \tint ret;\n \tstruct hv_host_device *host_dev = shost_priv(host);\n \tstruct hv_device *dev = host_dev->dev;\n-\tstruct hv_storvsc_request *request;\n \tstruct storvsc_cmd_request *cmd_request;\n \tunsigned int request_size = 0;\n \tint i;\n@@ -1271,8 +1262,7 @@\n \n \tscmnd->host_scribble = (unsigned char *)cmd_request;\n \n-\trequest = &cmd_request->request;\n-\tvm_srb = &request->vstor_packet.vm_srb;\n+\tvm_srb = &cmd_request->vstor_packet.vm_srb;\n \n \n \t\/* Build the SRB *\/\n@@ -1288,7 +1278,6 @@\n \t\tbreak;\n \t}\n \n-\trequest->cmd = cmd_request;\n \n \tvm_srb->port_number = host_dev->port;\n \tvm_srb->path_id = scmnd->device->channel;\n@@ -1299,10 +1288,10 @@\n \n \tmemcpy(vm_srb->cdb, scmnd->cmnd, vm_srb->cdb_length);\n \n-\trequest->sense_buffer = scmnd->sense_buffer;\n-\n-\n-\trequest->data_buffer.len = scsi_bufflen(scmnd);\n+\tcmd_request->sense_buffer = scmnd->sense_buffer;\n+\n+\n+\tcmd_request->data_buffer.len = scsi_bufflen(scmnd);\n \tif (scsi_sg_count(scmnd)) {\n \t\tsgl = (struct scatterlist *)scsi_sglist(scmnd);\n \t\tsg_count = scsi_sg_count(scmnd);\n@@ -1331,21 +1320,21 @@\n \t\t\tsg_count = cmd_request->bounce_sgl_count;\n \t\t}\n \n-\t\trequest->data_buffer.offset = sgl[0].offset;\n+\t\tcmd_request->data_buffer.offset = sgl[0].offset;\n \n \t\tfor (i = 0; i < sg_count; i++)\n-\t\t\trequest->data_buffer.pfn_array[i] =\n+\t\t\tcmd_request->data_buffer.pfn_array[i] =\n \t\t\t\tpage_to_pfn(sg_page((&sgl[i])));\n \n \t} else if (scsi_sglist(scmnd)) {\n-\t\trequest->data_buffer.offset =\n+\t\tcmd_request->data_buffer.offset =\n \t\t\tvirt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);\n-\t\trequest->data_buffer.pfn_array[0] =\n+\t\tcmd_request->data_buffer.pfn_array[0] =\n \t\t\tvirt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;\n \t}\n \n \t\/* Invokes the vsc to start an IO *\/\n-\tret = storvsc_do_io(dev, &cmd_request->request);\n+\tret = storvsc_do_io(dev, cmd_request);\n \n \tif (ret == -EAGAIN) {\n \t\t\/* no more space *\/\n"} {"commit":"fb016854bc4327151e9eee3b7b08d0499976631a","subject":"r600g: add support for subsampled rgb formats","message":"r600g: add support for subsampled rgb formats\n\nv2: r600 formats are msb first!\n\nSigned-off-by: Christian K\u00f6nig <6000eae0bbe6bd1545a6e60916fedb2a5946bdd4@vodafone.de>\n","repos":"zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r600\/r600_texture.c\n+++ src\/gallium\/drivers\/r600\/r600_texture.c\n@@ -1135,6 +1135,21 @@\n \t\t}\n \t}\n \n+\tif (desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED) {\n+\t\tswitch (format) {\n+\t\tcase PIPE_FORMAT_R8G8_B8G8_UNORM:\n+\t\tcase PIPE_FORMAT_G8R8_B8R8_UNORM:\n+\t\t\tresult = FMT_GB_GR;\n+\t\t\tgoto out_word4;\n+\t\tcase PIPE_FORMAT_G8R8_G8B8_UNORM:\n+\t\tcase PIPE_FORMAT_R8G8_R8B8_UNORM:\n+\t\t\tresult = FMT_BG_RG;\n+\t\t\tgoto out_word4;\n+\t\tdefault:\n+\t\t\tgoto out_unknown;\n+\t\t}\n+\t}\n+\n \tif (format == PIPE_FORMAT_R9G9B9E5_FLOAT) {\n \t\tresult = FMT_5_9_9_9_SHAREDEXP;\n \t\tgoto out_word4;\n"} {"commit":"4e44b6852e03c915618ca6776b6697b436246b00","subject":"Get rid of path_lookup in autofs4","message":"Get rid of path_lookup in autofs4\n\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/autofs4\/dev-ioctl.c\n+++ fs\/autofs4\/dev-ioctl.c\n@@ -192,77 +192,42 @@\n \treturn 0;\n }\n \n-\/*\n- * Walk down the mount stack looking for an autofs mount that\n- * has the requested device number (aka. new_encode_dev(sb->s_dev).\n- *\/\n-static int autofs_dev_ioctl_find_super(struct nameidata *nd, dev_t devno)\n-{\n-\tstruct dentry *dentry;\n-\tstruct inode *inode;\n-\tstruct super_block *sb;\n-\tdev_t s_dev;\n-\tunsigned int err;\n-\n+static int find_autofs_mount(const char *pathname,\n+\t\t\t struct path *res,\n+\t\t\t int test(struct path *path, void *data),\n+\t\t\t void *data)\n+{\n+\tstruct path path;\n+\tint err = kern_path(pathname, 0, &path);\n+\tif (err)\n+\t\treturn err;\n \terr = -ENOENT;\n-\n-\t\/* Lookup the dentry name at the base of our mount point *\/\n-\tdentry = d_lookup(nd->path.dentry, &nd->last);\n-\tif (!dentry)\n-\t\tgoto out;\n-\n-\tdput(nd->path.dentry);\n-\tnd->path.dentry = dentry;\n-\n-\t\/* And follow the mount stack looking for our autofs mount *\/\n-\twhile (follow_down(&nd->path.mnt, &nd->path.dentry)) {\n-\t\tinode = nd->path.dentry->d_inode;\n-\t\tif (!inode)\n+\twhile (path.dentry == path.mnt->mnt_root) {\n+\t\tif (path.mnt->mnt_sb->s_magic == AUTOFS_SUPER_MAGIC) {\n+\t\t\tif (test(&path, data)) {\n+\t\t\t\tpath_get(&path);\n+\t\t\t\tif (!err) \/* already found some *\/\n+\t\t\t\t\tpath_put(res);\n+\t\t\t\t*res = path;\n+\t\t\t\terr = 0;\n+\t\t\t}\n+\t\t}\n+\t\tif (!follow_up(&path.mnt, &path.dentry))\n \t\t\tbreak;\n-\n-\t\tsb = inode->i_sb;\n-\t\ts_dev = new_encode_dev(sb->s_dev);\n-\t\tif (devno == s_dev) {\n-\t\t\tif (sb->s_magic == AUTOFS_SUPER_MAGIC) {\n-\t\t\t\terr = 0;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\t}\n-out:\n-\treturn err;\n-}\n-\n-\/*\n- * Walk down the mount stack looking for an autofs mount that\n- * has the requested mount type (ie. indirect, direct or offset).\n- *\/\n-static int autofs_dev_ioctl_find_sbi_type(struct nameidata *nd, unsigned int type)\n-{\n-\tstruct dentry *dentry;\n-\tstruct autofs_info *ino;\n-\tunsigned int err;\n-\n-\terr = -ENOENT;\n-\n-\t\/* Lookup the dentry name at the base of our mount point *\/\n-\tdentry = d_lookup(nd->path.dentry, &nd->last);\n-\tif (!dentry)\n-\t\tgoto out;\n-\n-\tdput(nd->path.dentry);\n-\tnd->path.dentry = dentry;\n-\n-\t\/* And follow the mount stack looking for our autofs mount *\/\n-\twhile (follow_down(&nd->path.mnt, &nd->path.dentry)) {\n-\t\tino = autofs4_dentry_ino(nd->path.dentry);\n-\t\tif (ino && ino->sbi->type & type) {\n-\t\t\terr = 0;\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-out:\n-\treturn err;\n+\t}\n+\tpath_put(&path);\n+\treturn err;\n+}\n+\n+static int test_by_dev(struct path *path, void *p)\n+{\n+\treturn path->mnt->mnt_sb->s_dev == *(dev_t *)p;\n+}\n+\n+static int test_by_type(struct path *path, void *p)\n+{\n+\tstruct autofs_info *ino = autofs4_dentry_ino(path->dentry);\n+\treturn ino && ino->sbi->type & *(unsigned *)p;\n }\n \n static void autofs_dev_ioctl_fd_install(unsigned int fd, struct file *file)\n@@ -283,31 +248,25 @@\n * Open a file descriptor on the autofs mount point corresponding\n * to the given path and device number (aka. new_encode_dev(sb->s_dev)).\n *\/\n-static int autofs_dev_ioctl_open_mountpoint(const char *path, dev_t devid)\n-{\n-\tstruct file *filp;\n-\tstruct nameidata nd;\n+static int autofs_dev_ioctl_open_mountpoint(const char *name, dev_t devid)\n+{\n \tint err, fd;\n \n \tfd = get_unused_fd();\n \tif (likely(fd >= 0)) {\n-\t\t\/* Get nameidata of the parent directory *\/\n-\t\terr = path_lookup(path, LOOKUP_PARENT, &nd);\n+\t\tstruct file *filp;\n+\t\tstruct path path;\n+\n+\t\terr = find_autofs_mount(name, &path, test_by_dev, &devid);\n \t\tif (err)\n \t\t\tgoto out;\n \n \t\t\/*\n-\t\t * Search down, within the parent, looking for an\n-\t\t * autofs super block that has the device number\n+\t\t * Find autofs super block that has the device number\n \t\t * corresponding to the autofs fs we want to open.\n \t\t *\/\n-\t\terr = autofs_dev_ioctl_find_super(&nd, devid);\n-\t\tif (err) {\n-\t\t\tpath_put(&nd.path);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tfilp = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY,\n+\n+\t\tfilp = dentry_open(path.dentry, path.mnt, O_RDONLY,\n \t\t\t\t current_cred());\n \t\tif (IS_ERR(filp)) {\n \t\t\terr = PTR_ERR(filp);\n@@ -340,7 +299,7 @@\n \tparam->ioctlfd = -1;\n \n \tpath = param->path;\n-\tdevid = param->openmount.devid;\n+\tdevid = new_decode_dev(param->openmount.devid);\n \n \terr = 0;\n \tfd = autofs_dev_ioctl_open_mountpoint(path, devid);\n@@ -475,8 +434,7 @@\n \t\t\t\t struct autofs_dev_ioctl *param)\n {\n \tstruct autofs_info *ino;\n-\tstruct nameidata nd;\n-\tconst char *path;\n+\tstruct path path;\n \tdev_t devid;\n \tint err = -ENOENT;\n \n@@ -485,32 +443,24 @@\n \t\tgoto out;\n \t}\n \n-\tpath = param->path;\n-\tdevid = new_encode_dev(sbi->sb->s_dev);\n+\tdevid = sbi->sb->s_dev;\n \n \tparam->requester.uid = param->requester.gid = -1;\n \n-\t\/* Get nameidata of the parent directory *\/\n-\terr = path_lookup(path, LOOKUP_PARENT, &nd);\n+\terr = find_autofs_mount(param->path, &path, test_by_dev, &devid);\n \tif (err)\n \t\tgoto out;\n \n-\terr = autofs_dev_ioctl_find_super(&nd, devid);\n-\tif (err)\n-\t\tgoto out_release;\n-\n-\tino = autofs4_dentry_ino(nd.path.dentry);\n+\tino = autofs4_dentry_ino(path.dentry);\n \tif (ino) {\n \t\terr = 0;\n-\t\tautofs4_expire_wait(nd.path.dentry);\n+\t\tautofs4_expire_wait(path.dentry);\n \t\tspin_lock(&sbi->fs_lock);\n \t\tparam->requester.uid = ino->uid;\n \t\tparam->requester.gid = ino->gid;\n \t\tspin_unlock(&sbi->fs_lock);\n \t}\n-\n-out_release:\n-\tpath_put(&nd.path);\n+\tpath_put(&path);\n out:\n \treturn err;\n }\n@@ -569,8 +519,8 @@\n \t\t\t\t\t struct autofs_sb_info *sbi,\n \t\t\t\t\t struct autofs_dev_ioctl *param)\n {\n-\tstruct nameidata nd;\n-\tconst char *path;\n+\tstruct path path;\n+\tconst char *name;\n \tunsigned int type;\n \tunsigned int devid, magic;\n \tint err = -ENOENT;\n@@ -580,71 +530,46 @@\n \t\tgoto out;\n \t}\n \n-\tpath = param->path;\n+\tname = param->path;\n \ttype = param->ismountpoint.in.type;\n \n \tparam->ismountpoint.out.devid = devid = 0;\n \tparam->ismountpoint.out.magic = magic = 0;\n \n \tif (!fp || param->ioctlfd == -1) {\n-\t\tif (autofs_type_any(type)) {\n-\t\t\tstruct super_block *sb;\n-\n-\t\t\terr = path_lookup(path, LOOKUP_FOLLOW, &nd);\n-\t\t\tif (err)\n-\t\t\t\tgoto out;\n-\n-\t\t\tsb = nd.path.dentry->d_sb;\n-\t\t\tdevid = new_encode_dev(sb->s_dev);\n-\t\t} else {\n-\t\t\tstruct autofs_info *ino;\n-\n-\t\t\terr = path_lookup(path, LOOKUP_PARENT, &nd);\n-\t\t\tif (err)\n-\t\t\t\tgoto out;\n-\n-\t\t\terr = autofs_dev_ioctl_find_sbi_type(&nd, type);\n-\t\t\tif (err)\n-\t\t\t\tgoto out_release;\n-\n-\t\t\tino = autofs4_dentry_ino(nd.path.dentry);\n-\t\t\tdevid = autofs4_get_dev(ino->sbi);\n-\t\t}\n-\n+\t\tif (autofs_type_any(type))\n+\t\t\terr = kern_path(name, LOOKUP_FOLLOW, &path);\n+\t\telse\n+\t\t\terr = find_autofs_mount(name, &path, test_by_type, &type);\n+\t\tif (err)\n+\t\t\tgoto out;\n+\t\tdevid = new_encode_dev(path.mnt->mnt_sb->s_dev);\n \t\terr = 0;\n-\t\tif (nd.path.dentry->d_inode &&\n-\t\t nd.path.mnt->mnt_root == nd.path.dentry) {\n+\t\tif (path.dentry->d_inode &&\n+\t\t path.mnt->mnt_root == path.dentry) {\n \t\t\terr = 1;\n-\t\t\tmagic = nd.path.dentry->d_inode->i_sb->s_magic;\n+\t\t\tmagic = path.dentry->d_inode->i_sb->s_magic;\n \t\t}\n \t} else {\n-\t\tdev_t dev = autofs4_get_dev(sbi);\n-\n-\t\terr = path_lookup(path, LOOKUP_PARENT, &nd);\n+\t\tdev_t dev = sbi->sb->s_dev;\n+\n+\t\terr = find_autofs_mount(name, &path, test_by_dev, &dev);\n \t\tif (err)\n \t\t\tgoto out;\n \n-\t\terr = autofs_dev_ioctl_find_super(&nd, dev);\n-\t\tif (err)\n-\t\t\tgoto out_release;\n-\n-\t\tdevid = dev;\n-\n-\t\terr = have_submounts(nd.path.dentry);\n-\n-\t\tif (nd.path.mnt->mnt_mountpoint != nd.path.mnt->mnt_root) {\n-\t\t\tif (follow_down(&nd.path.mnt, &nd.path.dentry)) {\n-\t\t\t\tstruct inode *inode = nd.path.dentry->d_inode;\n-\t\t\t\tmagic = inode->i_sb->s_magic;\n-\t\t\t}\n+\t\tdevid = new_encode_dev(dev);\n+\n+\t\terr = have_submounts(path.dentry);\n+\n+\t\tif (path.mnt->mnt_mountpoint != path.mnt->mnt_root) {\n+\t\t\tif (follow_down(&path.mnt, &path.dentry))\n+\t\t\t\tmagic = path.mnt->mnt_sb->s_magic;\n \t\t}\n \t}\n \n \tparam->ismountpoint.out.devid = devid;\n \tparam->ismountpoint.out.magic = magic;\n-\n-out_release:\n-\tpath_put(&nd.path);\n+\tpath_put(&path);\n out:\n \treturn err;\n }\n"} {"commit":"f1a61a8888afb9c21bb7efdd25f2755b01f065d3","subject":"staging:iio:dac:ad5791: Convert attributes to new naming spec","message":"staging:iio:dac:ad5791: Convert attributes to new naming spec\n\nAdd the missing \"voltage\" chan_type to the powerdown attributes.\n\nSigned-off-by: Lars-Peter Clausen <3318dc5ce3e4fb7c28a0b841b6801c884e1d0896@metafoo.de>\nAcked-by: Jonathan Cameron <09f65b71b7655725897b2fd41a09a0cefe2e1ace@cam.ac.uk>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/iio\/dac\/ad5791.c\n+++ drivers\/staging\/iio\/dac\/ad5791.c\n@@ -158,24 +158,24 @@\n \treturn ret ? ret : len;\n }\n \n-static IIO_DEVICE_ATTR(out_powerdown_mode, S_IRUGO |\n+static IIO_DEVICE_ATTR(out_voltage_powerdown_mode, S_IRUGO |\n \t\t\tS_IWUSR, ad5791_read_powerdown_mode,\n \t\t\tad5791_write_powerdown_mode, 0);\n \n-static IIO_CONST_ATTR(out_powerdown_mode_available,\n+static IIO_CONST_ATTR(out_voltage_powerdown_mode_available,\n \t\t\t\"6kohm_to_gnd three_state\");\n \n #define IIO_DEV_ATTR_DAC_POWERDOWN(_num, _show, _store, _addr)\t\t\\\n-\tIIO_DEVICE_ATTR(out##_num##_powerdown,\t\t\t\t\\\n+\tIIO_DEVICE_ATTR(out_voltage##_num##_powerdown,\t\t\t\\\n \t\t\tS_IRUGO | S_IWUSR, _show, _store, _addr)\n \n static IIO_DEV_ATTR_DAC_POWERDOWN(0, ad5791_read_dac_powerdown,\n \t\t\t\t ad5791_write_dac_powerdown, 0);\n \n static struct attribute *ad5791_attributes[] = {\n-\t&iio_dev_attr_out0_powerdown.dev_attr.attr,\n-\t&iio_dev_attr_out_powerdown_mode.dev_attr.attr,\n-\t&iio_const_attr_out_powerdown_mode_available.dev_attr.attr,\n+\t&iio_dev_attr_out_voltage0_powerdown.dev_attr.attr,\n+\t&iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,\n+\t&iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,\n \tNULL,\n };\n \n"} {"commit":"7f956dadbe0b534af41db27fa653fb494381a93f","subject":"applet.c: Type whitespace","message":"applet.c: Type whitespace\n","repos":"lanoxx\/window-picker-applet,lanoxx\/window-picker-applet","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/applet.c\n+++ src\/applet.c\n@@ -337,12 +337,12 @@\n \n #if (GTK_MAJOR_VERSION == 2)\n static void display_about_dialog (\n- BonoboUIComponent *component, \n+ BonoboUIComponent *component,\n gpointer user_data, \n const gchar *verb) \n #elif (GTK_MAJOR_VERSION == 3)\n static void display_about_dialog (\n- GtkAction* action,\n+ GtkAction *action,\n gpointer user_data)\n #endif\n {\n"} {"commit":"f2bae9456f141f8c1104ef2a0aab31f6190ae5f0","subject":"r600g: interpret integer texture types as ints.","message":"r600g: interpret integer texture types as ints.\n\nFor signed\/unsigned with no normalisation or srgb, assume its an INT\ntype texture.\n\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/r600\/r600_texture.c\n+++ src\/gallium\/drivers\/r600\/r600_texture.c\n@@ -1049,10 +1049,15 @@\n \tswitch (desc->channel[i].type) {\n \tcase UTIL_FORMAT_TYPE_UNSIGNED:\n \tcase UTIL_FORMAT_TYPE_SIGNED:\n+#if 0\n \t\tif (!desc->channel[i].normalized &&\n \t\t desc->colorspace != UTIL_FORMAT_COLORSPACE_SRGB) {\n \t\t\tgoto out_unknown;\n \t\t}\n+#endif\n+\t\tif (desc->colorspace != UTIL_FORMAT_COLORSPACE_SRGB &&\n+\t\t !desc->channel[i].normalized)\n+\t\t\tword4 |= S_038010_NUM_FORMAT_ALL(V_038010_SQ_NUM_FORMAT_INT);\n \n \t\tswitch (desc->channel[i].size) {\n \t\tcase 4:\n"} {"commit":"67b7859e9bfa0dcee5a8256932e393e98739be1b","subject":"btrfs: handle ENOMEM in btrfs_alloc_tree_block","message":"btrfs: handle ENOMEM in btrfs_alloc_tree_block\n\nThis is one of the first places to give out when memory is tight. Handle\nit properly rather than with a BUG_ON.\n\nAlso fix the comment about the return value, which is an ERR_PTR, not\nNULL, on error.\n\nSigned-off-by: Omar Sandoval <888fed946b7dbf3db82157abfe4a5af66080e99e@osandov.com>\nReviewed-by: David Sterba <a2ce9d316ca04d17b520237d2846a218b8284e52@suse.cz>\nSigned-off-by: Chris Mason <e2e8c5702d8ed5f565988a1cf5bb35c9ce199e5e@fb.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -7546,7 +7546,7 @@\n * returns the key for the extent through ins, and a tree buffer for\n * the first block of the extent through buf.\n *\n- * returns the tree buffer or NULL.\n+ * returns the tree buffer or an ERR_PTR on error.\n *\/\n struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,\n \t\t\t\t\tstruct btrfs_root *root,\n@@ -7557,6 +7557,7 @@\n \tstruct btrfs_key ins;\n \tstruct btrfs_block_rsv *block_rsv;\n \tstruct extent_buffer *buf;\n+\tstruct btrfs_delayed_extent_op *extent_op;\n \tu64 flags = 0;\n \tint ret;\n \tu32 blocksize = root->nodesize;\n@@ -7577,13 +7578,14 @@\n \n \tret = btrfs_reserve_extent(root, blocksize, blocksize,\n \t\t\t\t empty_size, hint, &ins, 0, 0);\n-\tif (ret) {\n-\t\tunuse_block_rsv(root->fs_info, block_rsv, blocksize);\n-\t\treturn ERR_PTR(ret);\n-\t}\n+\tif (ret)\n+\t\tgoto out_unuse;\n \n \tbuf = btrfs_init_new_buffer(trans, root, ins.objectid, level);\n-\tBUG_ON(IS_ERR(buf)); \/* -ENOMEM *\/\n+\tif (IS_ERR(buf)) {\n+\t\tret = PTR_ERR(buf);\n+\t\tgoto out_free_reserved;\n+\t}\n \n \tif (root_objectid == BTRFS_TREE_RELOC_OBJECTID) {\n \t\tif (parent == 0)\n@@ -7593,9 +7595,11 @@\n \t\tBUG_ON(parent > 0);\n \n \tif (root_objectid != BTRFS_TREE_LOG_OBJECTID) {\n-\t\tstruct btrfs_delayed_extent_op *extent_op;\n \t\textent_op = btrfs_alloc_delayed_extent_op();\n-\t\tBUG_ON(!extent_op); \/* -ENOMEM *\/\n+\t\tif (!extent_op) {\n+\t\t\tret = -ENOMEM;\n+\t\t\tgoto out_free_buf;\n+\t\t}\n \t\tif (key)\n \t\t\tmemcpy(&extent_op->key, key, sizeof(extent_op->key));\n \t\telse\n@@ -7610,13 +7614,24 @@\n \t\textent_op->level = level;\n \n \t\tret = btrfs_add_delayed_tree_ref(root->fs_info, trans,\n-\t\t\t\t\tins.objectid,\n-\t\t\t\t\tins.offset, parent, root_objectid,\n-\t\t\t\t\tlevel, BTRFS_ADD_DELAYED_EXTENT,\n-\t\t\t\t\textent_op, 0);\n-\t\tBUG_ON(ret); \/* -ENOMEM *\/\n+\t\t\t\t\t\t ins.objectid, ins.offset,\n+\t\t\t\t\t\t parent, root_objectid, level,\n+\t\t\t\t\t\t BTRFS_ADD_DELAYED_EXTENT,\n+\t\t\t\t\t\t extent_op, 0);\n+\t\tif (ret)\n+\t\t\tgoto out_free_delayed;\n \t}\n \treturn buf;\n+\n+out_free_delayed:\n+\tbtrfs_free_delayed_extent_op(extent_op);\n+out_free_buf:\n+\tfree_extent_buffer(buf);\n+out_free_reserved:\n+\tbtrfs_free_reserved_extent(root, ins.objectid, ins.offset, 0);\n+out_unuse:\n+\tunuse_block_rsv(root->fs_info, block_rsv, blocksize);\n+\treturn ERR_PTR(ret);\n }\n \n struct walk_control {\n"} {"commit":"1629f2d9e09aa850c59baa180465eb0e33394e33","subject":"#ifdef to MSVC","message":"#ifdef to MSVC\n","repos":"vinniefalco\/VFLib,spthaolt\/VFLib,vinniefalco\/VFLib,spthaolt\/VFLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/vf\/vf_MurmurHash.h\n+++ include\/vf\/vf_MurmurHash.h\n@@ -2,6 +2,8 @@\n \/\/ This file is released under the MIT License:\r\n \/\/ http:\/\/www.opensource.org\/licenses\/mit-license.php\r\n \/\/ From http:\/\/code.google.com\/p\/smhasher\/\r\n+\r\n+#ifdef _MSC_VER\r\n \r\n #ifndef __VF_MURMURHASH_VFHEADER__\r\n #define __VF_MURMURHASH_VFHEADER__\r\n@@ -75,3 +77,5 @@\n }\r\n \r\n #endif\r\n+\r\n+#endif\r\n"} {"commit":"e5851cf64ed2219e776bffda233f1c7f38c98e9b","subject":"Staging: vt6655: removed redundant comments from IEEE11h.h","message":"Staging: vt6655: removed redundant comments from IEEE11h.h\n\nRemoved redundant comments from IEEE11h.h header file.\n\nSigned-off-by: Igor Bezukh <438b45a7046e30bb4e98b1d0c468955eae55b909@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/vt6655\/IEEE11h.h\n+++ drivers\/staging\/vt6655\/IEEE11h.h\n@@ -35,16 +35,6 @@\n #include \"80211hdr.h\"\n #include \"80211mgr.h\"\n \n-\/*--------------------- Export Definitions -------------------------*\/\n-\n-\/*--------------------- Export Classes ----------------------------*\/\n-\n-\/*--------------------- Export Variables --------------------------*\/\n-\n-\/*--------------------- Export Types ------------------------------*\/\n-\n-\/*--------------------- Export Functions --------------------------*\/\n-\n bool IEEE11hbMSRRepTx(\n \tvoid *pMgmtHandle\n );\n"} {"commit":"143d0314723e549d5cee5e994eecaf31e4c30915","subject":"Use correct uint32_t type for IPv4 addresses","message":"Use correct uint32_t type for IPv4 addresses\n","repos":"sebschrader\/python-arpreq,sebschrader\/python-arpreq,sebschrader\/python-arpreq,sebschrader\/python-arpreq","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/arpreq.c\n+++ src\/arpreq.c\n@@ -76,7 +76,8 @@\n PyErr_Format(PyExc_ValueError, \"Invalid IPv4 address %s\", addr_str);\n return NULL;\n }\n- int addr = sin->sin_addr.s_addr;\n+\n+ uint32_t addr = sin->sin_addr.s_addr;\n \n struct ifaddrs * head_ifa;\n if (getifaddrs(&head_ifa) == -1) {\n@@ -90,8 +91,8 @@\n continue;\n if (ifa->ifa_flags & IFF_POINTOPOINT)\n continue;\n- int ifaddr = ((struct sockaddr_in *) ifa->ifa_addr)->sin_addr.s_addr;\n- int netmask = ((struct sockaddr_in *) ifa->ifa_netmask)->sin_addr.s_addr;\n+ uint32_t ifaddr = ((struct sockaddr_in *) ifa->ifa_addr)->sin_addr.s_addr;\n+ uint32_t netmask = ((struct sockaddr_in *) ifa->ifa_netmask)->sin_addr.s_addr;\n if ((ifaddr & netmask) == (addr & netmask)) {\n if (ifaddr == addr) {\n struct ifreq ifreq;\n"} {"commit":"3e81b8eedd48bb80900522bceebf6f81c6a00312","subject":"radeon\/uvd: save the aligned width & height","message":"radeon\/uvd: save the aligned width & height\n\nFixes: https:\/\/bugs.freedesktop.org\/show_bug.cgi?id=68845\n\nSigned-off-by: Christian K\u00f6nig <c7ea837d7a46effe4232b086213468b8b31643bf@amd.com>\n","repos":"jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/radeon\/radeon_uvd.c\n+++ src\/gallium\/drivers\/radeon\/radeon_uvd.c\n@@ -854,6 +854,8 @@\n \n \tdec->base = *templ;\n \tdec->base.context = context;\n+\tdec->base.width = width;\n+\tdec->base.height = height;\n \n \tdec->base.destroy = ruvd_destroy;\n \tdec->base.begin_frame = ruvd_begin_frame;\n"} {"commit":"adbc98bcb1ee26d48bfa8a9ce4fc1f43450e54d8","subject":"FIX mapping allocation","message":"FIX mapping allocation\n","repos":"dhruvvyas90\/libmodbus,vb2685\/modbus,stephane\/libmodbus,wysman\/libmodbus,wablair\/libmodbus,charlie-x\/libmodbus,sdwuyawen\/libmodbus,marinbek\/libmodbus,hmoraes\/libmodbus,OliverDDS\/libmodbus,xtypebee\/libmodbus,vb2685\/modbus,vb2685\/modbus,sstiller\/libmodbus,wysman\/libmodbus,sstiller\/libmodbus,OliverDDS\/libmodbus,sureforce\/new,sdwuyawen\/libmodbus,sureforce\/new,giangdo\/modbusMSim,sstiller\/libmodbus,charlie-x\/libmodbus,hmoraes\/libmodbus,sureforce\/new,killdaclick\/libmodbus,cmcmurrough\/libmodbus,SystemTera\/libmodbus,chenzhouneng\/libmodbus,itiserik\/libmodbus,wysman\/libmodbus,cmcmurrough\/libmodbus,mhei\/libmodbus,stephane\/libmodbus,cukier\/libmodbus,poulacou\/libmodbus,dhruvvyas90\/libmodbus,poulacou\/libmodbus,cukier\/libmodbus,xtypebee\/libmodbus,marinbek\/libmodbus,dhruvvyas90\/libmodbus,chenzhouneng\/libmodbus,sdwuyawen\/libmodbus,mhei\/libmodbus,itiserik\/libmodbus,killdaclick\/libmodbus,OliverDDS\/libmodbus,poulacou\/libmodbus,SystemTera\/libmodbus,wablair\/libmodbus,itiserik\/libmodbus,mhei\/libmodbus,wablair\/libmodbus,killdaclick\/libmodbus,charlie-x\/libmodbus,stephane\/libmodbus,marinbek\/libmodbus,cmcmurrough\/libmodbus,xtypebee\/libmodbus,SystemTera\/libmodbus,cukier\/libmodbus,hmoraes\/libmodbus,chenzhouneng\/libmodbus","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/unit-test-slave.c\n+++ tests\/unit-test-slave.c\n@@ -40,7 +40,7 @@\n UT_COIL_STATUS_ADDRESS + UT_COIL_STATUS_NB_POINTS,\n UT_INPUT_STATUS_ADDRESS + UT_INPUT_STATUS_NB_POINTS,\n UT_HOLDING_REGISTERS_ADDRESS + UT_HOLDING_REGISTERS_NB_POINTS,\n- UT_INPUT_STATUS_ADDRESS + UT_INPUT_REGISTERS_NB_POINTS);\n+ UT_INPUT_REGISTERS_ADDRESS + UT_INPUT_REGISTERS_NB_POINTS);\n if (ret == FALSE) {\n printf(\"Memory allocation failed\\n\");\n exit(1);\n"} {"commit":"13a0db5a53f56d1f77e8902dd23258c99c2154b8","subject":"Btrfs: find_free_extent: Do not erroneously skip LOOP_CACHING_WAIT state","message":"Btrfs: find_free_extent: Do not erroneously skip LOOP_CACHING_WAIT state\n\nWhen executing generic\/001 in a loop on a ppc64 machine (with both sectorsize\nand nodesize set to 64k), the following call trace is observed,\n\nWARNING: at \/root\/repos\/linux\/fs\/btrfs\/locking.c:253\nModules linked in:\nCPU: 2 PID: 8353 Comm: umount Not tainted 4.3.0-rc5-13676-ga5e681d #54\ntask: c0000000f2b1f560 ti: c0000000f6008000 task.ti: c0000000f6008000\nNIP: c000000000520c88 LR: c0000000004a3b34 CTR: 0000000000000000\nREGS: c0000000f600a820 TRAP: 0700 Not tainted (4.3.0-rc5-13676-ga5e681d)\nMSR: 8000000102029032 <SF,VEC,EE,ME,IR,DR,RI> CR: 24444884 XER: 00000000\nCFAR: c0000000004a3b30 SOFTE: 1\nGPR00: c0000000004a3b34 c0000000f600aaa0 c00000000108ac00 c0000000f5a808c0\nGPR04: 0000000000000000 c0000000f600ae60 0000000000000000 0000000000000005\nGPR08: 00000000000020a1 0000000000000001 c0000000f2b1f560 0000000000000030\nGPR12: 0000000084842882 c00000000fdc0900 c0000000f600ae60 c0000000f070b800\nGPR16: 0000000000000000 c0000000f3c8a000 0000000000000000 0000000000000049\nGPR20: 0000000000000001 0000000000000001 c0000000f5aa01f8 0000000000000000\nGPR24: 0f83e0f83e0f83e1 c0000000f5a808c0 c0000000f3c8d000 c000000000000000\nGPR28: c0000000f600ae74 0000000000000001 c0000000f3c8d000 c0000000f5a808c0\nNIP [c000000000520c88] .btrfs_tree_lock+0x48\/0x2a0\nLR [c0000000004a3b34] .btrfs_lock_root_node+0x44\/0x80\nCall Trace:\n[c0000000f600aaa0] [c0000000f600ab80] 0xc0000000f600ab80 (unreliable)\n[c0000000f600ab80] [c0000000004a3b34] .btrfs_lock_root_node+0x44\/0x80\n[c0000000f600ac00] [c0000000004a99dc] .btrfs_search_slot+0xa8c\/0xc00\n[c0000000f600ad40] [c0000000004ab878] .btrfs_insert_empty_items+0x98\/0x120\n[c0000000f600adf0] [c00000000050da44] .btrfs_finish_chunk_alloc+0x1d4\/0x620\n[c0000000f600af20] [c0000000004be854] .btrfs_create_pending_block_groups+0x1d4\/0x2c0\n[c0000000f600b020] [c0000000004bf188] .do_chunk_alloc+0x3c8\/0x420\n[c0000000f600b100] [c0000000004c27cc] .find_free_extent+0xbfc\/0x1030\n[c0000000f600b260] [c0000000004c2ce8] .btrfs_reserve_extent+0xe8\/0x250\n[c0000000f600b330] [c0000000004c2f90] .btrfs_alloc_tree_block+0x140\/0x590\n[c0000000f600b440] [c0000000004a47b4] .__btrfs_cow_block+0x124\/0x780\n[c0000000f600b530] [c0000000004a4fc0] .btrfs_cow_block+0xf0\/0x250\n[c0000000f600b5e0] [c0000000004a917c] .btrfs_search_slot+0x22c\/0xc00\n[c0000000f600b720] [c00000000050aa40] .btrfs_remove_chunk+0x1b0\/0x9f0\n[c0000000f600b850] [c0000000004c4e04] .btrfs_delete_unused_bgs+0x434\/0x570\n[c0000000f600b950] [c0000000004d3cb8] .close_ctree+0x2e8\/0x3b0\n[c0000000f600ba20] [c00000000049d178] .btrfs_put_super+0x18\/0x30\n[c0000000f600ba90] [c000000000243cd4] .generic_shutdown_super+0xa4\/0x1a0\n[c0000000f600bb10] [c0000000002441d8] .kill_anon_super+0x18\/0x30\n[c0000000f600bb90] [c00000000049c898] .btrfs_kill_super+0x18\/0xc0\n[c0000000f600bc10] [c0000000002444f8] .deactivate_locked_super+0x98\/0xe0\n[c0000000f600bc90] [c000000000269f94] .cleanup_mnt+0x54\/0xa0\n[c0000000f600bd10] [c0000000000bd744] .task_work_run+0xc4\/0x100\n[c0000000f600bdb0] [c000000000016334] .do_notify_resume+0x74\/0x80\n[c0000000f600be30] [c0000000000098b8] .ret_from_except_lite+0x64\/0x68\nInstruction dump:\nfba1ffe8 fbc1fff0 fbe1fff8 7c791b78 f8010010 f821ff21 e94d0290 81030040\n812a04e8 7d094a78 7d290034 5529d97e <0b090000> 3b400000 3be30050 3bc3004c\n\nThe above call trace is seen even on x86_64; albeit very rarely and that too\nwith nodesize set to 64k and with nospace_cache mount option being used.\n\nThe reason for the above call trace is,\nbtrfs_remove_chunk\n check_system_chunk\n Allocate chunk if required\n For each physical stripe on underlying device,\n btrfs_free_dev_extent\n ...\n Take lock on Device tree's root node\n btrfs_cow_block(\"dev tree's root node\");\n btrfs_reserve_extent\n find_free_extent\n\t index = BTRFS_RAID_DUP;\n\t have_caching_bg = false;\n\n When in LOOP_CACHING_NOWAIT state, Assume we find a block group\n\t which is being cached; Hence have_caching_bg is set to true\n\n When repeating the search for the next RAID index, we set\n\t have_caching_bg to false.\n\nHence right after completing the LOOP_CACHING_NOWAIT state, we incorrectly\nskip LOOP_CACHING_WAIT state and move to LOOP_ALLOC_CHUNK state where we\nallocate a chunk and try to add entries corresponding to the chunk's physical\nstripe into the device tree. When doing so the task deadlocks itself waiting\nfor the blocking lock on the root node of the device tree.\n\nThis commit fixes the issue by introducing a new local variable to help\nindicate as to whether a block group of any RAID type is being cached.\n\nSigned-off-by: Chandan Rajendra <5b09eece4a5b11d5d0125c0f7eca424d593874ed@linux.vnet.ibm.com>\nReviewed-by: Josef Bacik <631dfb3d07694fdcf26abc7aac2c6c2b641f8bde@fb.com>\nSigned-off-by: Chris Mason <e2e8c5702d8ed5f565988a1cf5bb35c9ce199e5e@fb.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -7029,6 +7029,7 @@\n \tbool failed_alloc = false;\n \tbool use_cluster = true;\n \tbool have_caching_bg = false;\n+\tbool orig_have_caching_bg = false;\n \tbool full_search = false;\n \n \tWARN_ON(num_bytes < root->sectorsize);\n@@ -7378,6 +7379,10 @@\n \t}\n \tup_read(&space_info->groups_sem);\n \n+\tif ((loop == LOOP_CACHING_NOWAIT) && have_caching_bg\n+\t\t&& !orig_have_caching_bg)\n+\t\torig_have_caching_bg = true;\n+\n \tif (!ins->objectid && loop >= LOOP_CACHING_WAIT && have_caching_bg)\n \t\tgoto search;\n \n@@ -7400,7 +7405,7 @@\n \t\t\t * don't have any unached bgs and we've alrelady done a\n \t\t\t * full search through.\n \t\t\t *\/\n-\t\t\tif (have_caching_bg || !full_search)\n+\t\t\tif (orig_have_caching_bg || !full_search)\n \t\t\t\tloop = LOOP_CACHING_WAIT;\n \t\t\telse\n \t\t\t\tloop = LOOP_ALLOC_CHUNK;\n"} {"commit":"cf1fb64d81ce211639de8efa69b4ba5c2bbed115","subject":"Changed ctp logger to xtp logger by altering the macro","message":"Changed ctp logger to xtp logger by altering the macro\n","repos":"votca\/xtp,votca\/xtp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/votca\/xtp\/logger.h\n+++ include\/votca\/xtp\/logger.h\n@@ -29,13 +29,13 @@\n enum TLogLevel {logERROR, logWARNING, logINFO, logDEBUG};\n \n \/*\n- * Macros to use the Logger: CTP_LOG(level,logger) << message\n+ * Macros to use the Logger: XTP_LOG(level,logger) << message\n *\/\n-#define CTP_LOG(level, log) \\\n+#define XTP_LOG(level, log) \\\n if ( &log != NULL && level > (log).getReportLevel() ) ; \\\n else (log)(level)\n \n-#define CTP_LOG_SAVE(level, log) \\\n+#define XTP_LOG_SAVE(level, log) \\\n if ( level > (log).getReportLevel() ) ; \\\n else (log)(level)\n \n@@ -154,10 +154,10 @@\n * Example: \n *\n * \\code\n-* #include <votca\/ctp\/logger.h>\n+* #include <votca\/xtp\/logger.h>\n * Logger* log = new Logger(); \/\/ create a logger object\n * log->setReportLevel(logDEBUG); \/\/ output only log messages starting from a DEBUG level\n-* CTP_LOG(logERROR,*log) << \"Error detected\" << flush; \/\/ write to the logger at an ERROR level\n+* XTP_LOG(logERROR,*log) << \"Error detected\" << flush; \/\/ write to the logger at an ERROR level\n * cout << log; \/\/ output logger content to standard output\n * \\endcode\n *\n"} {"commit":"247b4b68b1cb65a2c2051f34415b455020fa8c10","subject":"staging: vt6656: s_nsInterruptUsbIoCompleteRead set intBuf.bInUse to true","message":"staging: vt6656: s_nsInterruptUsbIoCompleteRead set intBuf.bInUse to true\n\nintBuf.bInUse is set to false set back to true on successful usb_submit_urb\n\nSigned-off-by: Malcolm Priestley <123fd39c698f702285d09eaebae85efdff081c95@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/vt6656\/usbpipe.c\n+++ drivers\/staging\/vt6656\/usbpipe.c\n@@ -400,9 +400,12 @@\n \t\t pDevice);\n \n \tntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC);\n-\tif (ntStatus != 0) {\n-\t DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO\"Submit int URB failed %d\\n\", ntStatus);\n- }\n+\tif (ntStatus) {\n+\t\tDBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO\n+\t\t\t\"Submit int URB failed %d\\n\", ntStatus);\n+\t} else {\n+\t\tpDevice->intBuf.bInUse = true;\n+\t}\n }\n \/\/\n \/\/ We return STATUS_MORE_PROCESSING_REQUIRED so that the completion\n"} {"commit":"70bc43acdb487c7a38faab4f4aa864afe9cbfc84","subject":"gallium\/tests: fix the translate test","message":"gallium\/tests: fix the translate test\n","repos":"zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/tests\/unit\/translate_test.c\n+++ src\/gallium\/tests\/unit\/translate_test.c\n@@ -260,13 +260,13 @@\n buffer[0] = byte_buffer;\n \n translate[0]->set_buffer(translate[0], 0, buffer[0], input_format_size, count - 1);\n- translate[0]->run_elts(translate[0], elts, count, 0, buffer[1]);\n+ translate[0]->run_elts(translate[0], elts, count, 0, 0, buffer[1]);\n translate[1]->set_buffer(translate[1], 0, buffer[1], output_format_size, count - 1);\n- translate[1]->run_elts(translate[1], elts, count, 0, buffer[2]);\n+ translate[1]->run_elts(translate[1], elts, count, 0, 0, buffer[2]);\n translate[0]->set_buffer(translate[0], 0, buffer[2], input_format_size, count - 1);\n- translate[0]->run_elts(translate[0], elts, count, 0, buffer[3]);\n+ translate[0]->run_elts(translate[0], elts, count, 0, 0, buffer[3]);\n translate[1]->set_buffer(translate[1], 0, buffer[3], output_format_size, count - 1);\n- translate[1]->run_elts(translate[1], elts, count, 0, buffer[4]);\n+ translate[1]->run_elts(translate[1], elts, count, 0, 0, buffer[4]);\n \n for (i = 0; i < count; ++i)\n {\n"} {"commit":"5efb7d74e144b40a993d3ea5f825d21a31c1ecc9","subject":"* augrun.c (cmd_errors): include the path where an error happened if there is one","message":"* augrun.c (cmd_errors): include the path where an error happened if there is one\n","repos":"lutter\/augeas,kunkku\/augeas,mlichvar\/augeas,mchf\/augeas,mchf\/augeas,pevalme\/augeas,kunkku\/augeas,pevalme\/augeas,hercules-team\/augeas,hercules-team\/augeas,ptoscano\/augeas,kunkku\/augeas,lutter\/augeas,lutter\/augeas,ptoscano\/augeas,mlichvar\/augeas,manandbytes\/augeas,manandbytes\/augeas,pevalme\/augeas,ptoscano\/augeas,mlichvar\/augeas","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/augrun.c\n+++ src\/augrun.c\n@@ -1225,6 +1225,7 @@\n const char *last = err_get(aug, match, \"lens\/last_matched\");\n const char *next = err_get(aug, match, \"lens\/next_not_matched\");\n const char *msg = err_get(aug, match, \"message\");\n+ const char *path = err_get(aug, match, \"path\");\n const char *kind = NULL;\n \n aug_get(aug, match, &kind);\n@@ -1239,6 +1240,8 @@\n if (line != NULL) {\n fprintf(cmd->out, \"Error in %s:%s.%s (%s)\\n\",\n filename, line, char_pos, kind);\n+ } else if (path != NULL) {\n+ fprintf(cmd->out, \"Error in %s at node %s (%s)\\n\", filename, path, kind);\n } else {\n fprintf(cmd->out, \"Error in %s (%s)\\n\", filename, kind);\n }\n"} {"commit":"4d3fa1fb2bd9466d17778bcef6bdcd657fd56a8a","subject":"Warning free clang compilation #40","message":"Warning free clang compilation #40\n","repos":"varnamproject\/libvarnam,varnamproject\/libvarnam,varnamproject\/libvarnam","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- tests\/vst-compilation.c\n+++ tests\/vst-compilation.c\n@@ -186,9 +186,9 @@\n value2[i] = 'a';\n }\n \n- pattern[VARNAM_SYMBOL_MAX + 2] = '\\0';\n- value1[VARNAM_SYMBOL_MAX + 2] = '\\0';\n- value2[VARNAM_SYMBOL_MAX + 2] = '\\0';\n+ pattern[VARNAM_SYMBOL_MAX + 1] = '\\0';\n+ value1[VARNAM_SYMBOL_MAX + 1] = '\\0';\n+ value2[VARNAM_SYMBOL_MAX + 1] = '\\0';\n \n rc = varnam_create_token(varnam_instance, pattern, value1, value2, \"\", \"value3\", VARNAM_TOKEN_VOWEL, VARNAM_MATCH_EXACT, 0, 0, 0);\n if (rc != VARNAM_ARGS_ERROR)\n"} {"commit":"51bf5f0bc4d132a3646ce36061e83fdc8b77f302","subject":"Btrfs: only exclude supers in the range of our block group","message":"Btrfs: only exclude supers in the range of our block group\n\nIf we fail to load block groups halfway through we can leave extent_state's on\nthe excluded tree. This is because we just lookup the supers and add them to\nthe excluded tree regardless of which block group we are looking at currently.\nThis is a problem because we remove the excluded extents for the range of the\nblock group only, so if we don't ever load a block group for one of the excluded\nextents we won't ever free it. This fixes the problem by only adding excluded\nextents if it falls in the block group range we care about. With this patch\nwe're no longer leaking space when we fail to read all of the block groups.\nThanks,\n\nSigned-off-by: Josef Bacik <631dfb3d07694fdcf26abc7aac2c6c2b641f8bde@fusionio.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -270,9 +270,27 @@\n \t\t\treturn ret;\n \n \t\twhile (nr--) {\n-\t\t\tcache->bytes_super += stripe_len;\n-\t\t\tret = add_excluded_extent(root, logical[nr],\n-\t\t\t\t\t\t stripe_len);\n+\t\t\tu64 start, len;\n+\n+\t\t\tif (logical[nr] > cache->key.objectid +\n+\t\t\t cache->key.offset)\n+\t\t\t\tcontinue;\n+\n+\t\t\tif (logical[nr] + stripe_len <= cache->key.objectid)\n+\t\t\t\tcontinue;\n+\n+\t\t\tstart = logical[nr];\n+\t\t\tif (start < cache->key.objectid) {\n+\t\t\t\tstart = cache->key.objectid;\n+\t\t\t\tlen = (logical[nr] + stripe_len) - start;\n+\t\t\t} else {\n+\t\t\t\tlen = min_t(u64, stripe_len,\n+\t\t\t\t\t cache->key.objectid +\n+\t\t\t\t\t cache->key.offset - start);\n+\t\t\t}\n+\n+\t\t\tcache->bytes_super += len;\n+\t\t\tret = add_excluded_extent(root, start, len);\n \t\t\tif (ret) {\n \t\t\t\tkfree(logical);\n \t\t\t\treturn ret;\n"} {"commit":"56b4c049273f3d4ad6d5c71a1569d3fbb4028840","subject":"staging: vt6656: remove RX complete locking.","message":"staging: vt6656: remove RX complete locking.\n\nThe lock in vnt_submit_rx_urb_complete is blocked by TX activity.\n\nThe lock comes from a time when RX needed to be synchronized with\nother parts of the driver because the WLAN API was in driver.\n\nSince this is now dealt with in mac80211 the lock is unnecessary.\n\nSigned-off-by: Malcolm Priestley <123fd39c698f702285d09eaebae85efdff081c95@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/vt6656\/usbpipe.c\n+++ drivers\/staging\/vt6656\/usbpipe.c\n@@ -168,7 +168,6 @@\n {\n \tstruct vnt_rcb *rcb = urb->context;\n \tstruct vnt_private *priv = rcb->priv;\n-\tunsigned long flags;\n \n \tswitch (urb->status) {\n \tcase 0:\n@@ -184,8 +183,6 @@\n \t}\n \n \tif (urb->actual_length) {\n-\t\tspin_lock_irqsave(&priv->lock, flags);\n-\n \t\tif (vnt_rx_data(priv, rcb, urb->actual_length)) {\n \t\t\trcb->skb = dev_alloc_skb(priv->rx_buf_sz);\n \t\t\tif (!rcb->skb) {\n@@ -193,7 +190,6 @@\n \t\t\t\t\t\"Failed to re-alloc rx skb\\n\");\n \n \t\t\t\trcb->in_use = false;\n-\t\t\t\tspin_unlock_irqrestore(&priv->lock, flags);\n \t\t\t\treturn;\n \t\t\t}\n \t\t} else {\n@@ -203,8 +199,6 @@\n \n \t\turb->transfer_buffer = skb_put(rcb->skb,\n \t\t\t\t\t\tskb_tailroom(rcb->skb));\n-\n-\t\tspin_unlock_irqrestore(&priv->lock, flags);\n \t}\n \n \tif (usb_submit_urb(urb, GFP_ATOMIC)) {\n"} {"commit":"93afa779453e69951b168e8ecb7b6ddef53eb8b0","subject":"cell: fix build breakage","message":"cell: fix build breakage\n","repos":"KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/winsys\/xlib\/xm_winsys_aub.c\n+++ src\/gallium\/winsys\/xlib\/xm_winsys_aub.c\n@@ -560,6 +560,9 @@\n struct pipe_context *\n xmesa_create_i965simple( struct pipe_winsys *winsys )\n {\n+#ifdef GALLIUM_CELL\n+ return NULL;\n+#else\n struct aub_brw_winsys *iws = CALLOC_STRUCT( aub_brw_winsys );\n struct pipe_screen *screen = brw_create_screen(winsys, 0\/* XXX pci_id *\/);\n \n@@ -583,4 +586,5 @@\n return brw_create( screen,\n \t\t &iws->winsys,\n \t\t 0 );\n-}\n+#endif\n+}\n"} {"commit":"d97863468bb55146b574c2c2d6c8b94735141a61","subject":"Cleanup.","message":"Cleanup.\n","repos":"kondrak\/bgfx,emoon\/bgfx,fluffyfreak\/bgfx,0-wiz-0\/bgfx,marco-we\/bgfx,jdryg\/bgfx,v3n\/bgfx,aonorin\/bgfx,fluffyfreak\/bgfx,bkaradzic\/bgfx,Synxis\/bgfx,LWJGL-CI\/bgfx,jdryg\/bgfx,marco-we\/bgfx,andr3wmac\/bgfx,mendsley\/bgfx,mendsley\/bgfx,jdryg\/bgfx,aonorin\/bgfx,attilaz\/bgfx,kondrak\/bgfx,Synxis\/bgfx,LWJGL-CI\/bgfx,mmicko\/bgfx,elmindreda\/bgfx,MikePopoloski\/bgfx,v3n\/bgfx,elmindreda\/bgfx,aonorin\/bgfx,LWJGL-CI\/bgfx,andr3wmac\/bgfx,fluffyfreak\/bgfx,kondrak\/bgfx,jpcy\/bgfx,jpcy\/bgfx,jpcy\/bgfx,attilaz\/bgfx,MikePopoloski\/bgfx,0-wiz-0\/bgfx,LWJGL-CI\/bgfx,jdryg\/bgfx,Synxis\/bgfx,bkaradzic\/bgfx,MikePopoloski\/bgfx,0-wiz-0\/bgfx,andr3wmac\/bgfx,bkaradzic\/bgfx,septag\/bgfx,septag\/bgfx,mmicko\/bgfx,jpcy\/bgfx,attilaz\/bgfx,septag\/bgfx,bkaradzic\/bgfx,emoon\/bgfx,fluffyfreak\/bgfx,v3n\/bgfx,mmicko\/bgfx,marco-we\/bgfx,emoon\/bgfx,elmindreda\/bgfx,mendsley\/bgfx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bgfx_p.h\n+++ src\/bgfx_p.h\n@@ -573,8 +573,14 @@\n \tconst char* getPredefinedUniformName(PredefinedUniform::Enum _enum);\n \tPredefinedUniform::Enum nameToPredefinedUniformEnum(const char* _name);\n \n-\tstruct CommandBuffer\n+\tclass CommandBuffer\n \t{\n+\t\tBX_CLASS(CommandBuffer\n+\t\t\t, NO_COPY\n+\t\t\t, NO_ASSIGNMENT\n+\t\t\t);\n+\n+\tpublic:\n \t\tCommandBuffer()\n \t\t\t: m_pos(0)\n \t\t\t, m_size(BGFX_CONFIG_MAX_COMMAND_BUFFER_SIZE)\n@@ -690,10 +696,6 @@\n \t\tuint32_t m_pos;\n \t\tuint32_t m_size;\n \t\tuint8_t m_buffer[BGFX_CONFIG_MAX_COMMAND_BUFFER_SIZE];\n-\n-\tprivate:\n-\t\tCommandBuffer(const CommandBuffer&);\n-\t\tvoid operator=(const CommandBuffer&);\n \t};\n \n #define SORT_KEY_NUM_BITS_TRANS 2\n"} {"commit":"3e560d24a40fa27f00b41197bf995f45eba0b655","subject":"Made emitter noncopyable, which should fix any auto_ptr warnings","message":"Made emitter noncopyable, which should fix any auto_ptr warnings\n","repos":"Astron\/yaml-cpp,nebirhos\/yaml-cpp,bref\/yaml-cpp,Astron\/yaml-cpp,vadz\/yaml-cpp,gradecam\/yaml-cpp,oftc\/yaml-cpp,gradecam\/yaml-cpp,nebirhos\/yaml-cpp,bref\/yaml-cpp,vadz\/yaml-cpp,gradecam\/yaml-cpp,gradecam\/yaml-cpp,Astron\/yaml-cpp,Astron\/yaml-cpp,oftc\/yaml-cpp,vadz\/yaml-cpp,oftc\/yaml-cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/yaml-cpp\/emitter.h\n+++ include\/yaml-cpp\/emitter.h\n@@ -6,6 +6,7 @@\n \n #include \"yaml-cpp\/emittermanip.h\"\n #include \"yaml-cpp\/ostream.h\"\n+#include \"yaml-cpp\/noncopyable.h\"\n #include \"yaml-cpp\/null.h\"\n #include <memory>\n #include <string>\n@@ -15,7 +16,7 @@\n {\n \tclass EmitterState;\n \t\n-\tclass Emitter\n+\tclass Emitter: private noncopyable\n \t{\n \tpublic:\n \t\tEmitter();\n"} {"commit":"dc7c1fa1df176789b321a2a0940ebb9a3d542f88","subject":"Reset the viewport since we're stretching to the entire window.","message":"Reset the viewport since we're stretching to the entire window.\n","repos":"aduros\/SDL,aduros\/SDL,aduros\/SDL,aduros\/SDL,aduros\/SDL","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/testoverlay2.c\n+++ test\/testoverlay2.c\n@@ -537,6 +537,7 @@\n switch (event.type) {\n case SDL_WINDOWEVENT:\n if (event.window.event == SDL_WINDOWEVENT_RESIZED) {\n+ SDL_RenderSetViewport(renderer, NULL);\n displayrect.w = window_w = event.window.data1;\n displayrect.h = window_h = event.window.data2;\n }\n"} {"commit":"e209db7ace281ca347b1ac699bf1fb222eac03fe","subject":"Btrfs: set journal_info in async trans commit worker","message":"Btrfs: set journal_info in async trans commit worker\n\nWe expect current->journal_info to point to the trans handle we are\ncommitting.\n\nSigned-off-by: Sage Weil <6dd34506bbd5e58221bbb3e4732d97c91f02277b@inktank.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/btrfs\/transaction.c\n+++ fs\/btrfs\/transaction.c\n@@ -1237,6 +1237,8 @@\n \t\t&ac->root->fs_info->sb->s_writers.lock_map[SB_FREEZE_FS-1],\n \t\t0, 1, _THIS_IP_);\n \n+\tcurrent->journal_info = ac->newtrans;\n+\n \tbtrfs_commit_transaction(ac->newtrans, ac->root);\n \tkfree(ac);\n }\n"} {"commit":"6f15667e21e40ef14005699610723a13cfb26155","subject":"target: Remove useless if statement","message":"target: Remove useless if statement\n\nWe do the same thing no matter which way the test goes, so just remove\nthe test and do what we're going to do.\n\nThe debug messages printed the wrong value of CMD_T_ACTIVE and don't\nseem particularly useful, remove them too.\n\nSigned-off-by: Roland Dreier <0d270388f2f92757a5de0f4bd891d3b392c44c4f@purestorage.com>\nSigned-off-by: Nicholas Bellinger <978acd1567d5598152161fdf8bf3ca568f950c9b@linux-iscsi.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/target\/target_core_tmr.c\n+++ drivers\/target\/target_core_tmr.c\n@@ -331,18 +331,6 @@\n \n \t\tfe_count = atomic_read(&cmd->t_fe_count);\n \n-\t\tif (!(cmd->transport_state & CMD_T_ACTIVE)) {\n-\t\t\tpr_debug(\"LUN_RESET: got CMD_T_ACTIVE for\"\n-\t\t\t\t\" cdb: %p, t_fe_count: %d dev: %p\\n\", cmd,\n-\t\t\t\tfe_count, dev);\n-\t\t\tcmd->transport_state |= CMD_T_ABORTED;\n-\t\t\tspin_unlock_irqrestore(&cmd->t_state_lock, flags);\n-\n-\t\t\tcore_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);\n-\t\t\tcontinue;\n-\t\t}\n-\t\tpr_debug(\"LUN_RESET: Got !CMD_T_ACTIVE for cdb: %p,\"\n-\t\t\t\" t_fe_count: %d dev: %p\\n\", cmd, fe_count, dev);\n \t\tcmd->transport_state |= CMD_T_ABORTED;\n \t\tspin_unlock_irqrestore(&cmd->t_state_lock, flags);\n \n"} {"commit":"06f1f7843778de2f04a2608f0e96760f08e63574","subject":"HTTP\/2: fixed header block size calculation.","message":"HTTP\/2: fixed header block size calculation.\n","repos":"firebase\/nginx,firebase\/nginx,firebase\/nginx,firebase\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/v2\/ngx_http_v2_filter_module.c\n+++ src\/http\/v2\/ngx_http_v2_filter_module.c\n@@ -222,7 +222,7 @@\n }\n \n if (r->headers_out.content_type.len) {\n- len += NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len;\n+ len += 1 + NGX_HTTP_V2_INT_OCTETS + r->headers_out.content_type.len;\n \n if (r->headers_out.content_type_len == r->headers_out.content_type.len\n && r->headers_out.charset.len)\n"} {"commit":"b16cf71e85f39c5ef33fdb8fc98e201bf77ad3dd","subject":"cast to size_t to fix gcc warning about comparison","message":"cast to size_t to fix gcc warning about comparison\n","repos":"RRZE-HPC\/GHOST,RRZE-HPC\/GHOST,RRZE-HPC\/GHOST,RRZE-HPC\/GHOST","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/bincrs.c\n+++ src\/bincrs.c\n@@ -54,7 +54,7 @@\n if (swapReq) {\n int64_t *tmp;\n GHOST_CALL_RETURN(ghost_malloc((void **)&tmp,(header.nrows+1)*8));\n- if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -63,7 +63,7 @@\n }\n free(tmp);\n } else {\n- if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -79,7 +79,7 @@\n if (swapReq) {\n int64_t *tmp;\n GHOST_CALL_RETURN(ghost_malloc((void **)&tmp,header.nnz*8));\n- if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, header.nnz,filed)) != header.nnz){\n+ if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, header.nnz,filed)) != (size_t)(header.nnz)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -88,7 +88,7 @@\n }\n free(tmp);\n } else {\n- if ((ret = fread(col_raw, GHOST_BINCRS_SIZE_COL_EL, header.nnz,filed)) != header.nnz){\n+ if ((ret = fread(col_raw, GHOST_BINCRS_SIZE_COL_EL, header.nnz,filed)) != (size_t)(header.nnz)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -204,7 +204,7 @@\n if (swapReq) {\n int64_t *tmp;\n GHOST_CALL_RETURN(ghost_malloc((void **)&tmp,(header.nrows+1)*8));\n- if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -213,7 +213,7 @@\n }\n free(tmp);\n } else {\n- if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -401,7 +401,7 @@\n if (swapReq) {\n int64_t *tmp;\n GHOST_CALL_RETURN(ghost_malloc((void **)&tmp,(header.nrows+1)*8));\n- if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(tmp, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n@@ -410,7 +410,7 @@\n }\n free(tmp);\n } else {\n- if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != header.nrows+1){\n+ if ((ret = fread(rpt_raw, GHOST_BINCRS_SIZE_RPT_EL, (header.nrows+1),filed)) != (size_t)(header.nrows+1)){\n ERROR_LOG(\"fread failed: %s (%zu)\",strerror(errno),ret);\n return GHOST_ERR_IO;\n }\n"} {"commit":"ec2a4f32b0e1c897f72f4b541a153969b62c2164","subject":"dwc3: dwc3-keystone: remove duplicate check on resource","message":"dwc3: dwc3-keystone: remove duplicate check on resource\n\nSanity check on resource happening with devm_ioremap_resource().\n\nSigned-off-by: Varka Bhadram <2af78e27b8c15f3929acd171eee40b9b9bcbd73c@cdac.in>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/dwc3\/dwc3-keystone.c\n+++ drivers\/usb\/dwc3\/dwc3-keystone.c\n@@ -104,11 +104,6 @@\n \tkdwc->dev = dev;\n \n \tres = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n-\tif (!res) {\n-\t\tdev_err(dev, \"missing usbss resource\\n\");\n-\t\treturn -EINVAL;\n-\t}\n-\n \tkdwc->usbss = devm_ioremap_resource(dev, res);\n \tif (IS_ERR(kdwc->usbss))\n \t\treturn PTR_ERR(kdwc->usbss);\n"} {"commit":"9126e56298db804fbf586c064df021c8881e7b02","subject":"Win32: fixed build after cf3e75cfa951.","message":"Win32: fixed build after cf3e75cfa951.\n","repos":"firebase\/nginx,firebase\/nginx,firebase\/nginx,firebase\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/v2\/ngx_http_v2_filter_module.c\n+++ src\/http\/v2\/ngx_http_v2_filter_module.c\n@@ -231,6 +231,10 @@\n \n server_tokens = clcf->server_tokens;\n \n+#if (NGX_SUPPRESS_WARN)\n+ ngx_str_null(&tokens);\n+#endif\n+\n if (r->headers_out.server == NULL) {\n \n if (server_tokens == 0) {\n"} {"commit":"871383be592ba7e819d27556591e315a0df38cee","subject":"btrfs: add missing unlocks to transaction abort paths","message":"btrfs: add missing unlocks to transaction abort paths\n\nAdded in commit 49b25e0540904be0bf558b84475c69d72e4de66e\n(\"btrfs: enhance transaction abort infrastructure\")\n\nReported-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nSigned-off-by: David Sterba <a2ce9d316ca04d17b520237d2846a218b8284e52@suse.cz>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/transaction.c\n+++ fs\/btrfs\/transaction.c\n@@ -73,8 +73,10 @@\n \n \tcur_trans = root->fs_info->running_transaction;\n \tif (cur_trans) {\n-\t\tif (cur_trans->aborted)\n+\t\tif (cur_trans->aborted) {\n+\t\t\tspin_unlock(&root->fs_info->trans_lock);\n \t\t\treturn cur_trans->aborted;\n+\t\t}\n \t\tatomic_inc(&cur_trans->use_count);\n \t\tatomic_inc(&cur_trans->num_writers);\n \t\tcur_trans->num_joined++;\n@@ -1400,6 +1402,7 @@\n \tret = commit_fs_roots(trans, root);\n \tif (ret) {\n \t\tmutex_unlock(&root->fs_info->tree_log_mutex);\n+\t\tmutex_unlock(&root->fs_info->reloc_mutex);\n \t\tgoto cleanup_transaction;\n \t}\n \n@@ -1411,6 +1414,7 @@\n \tret = commit_cowonly_roots(trans, root);\n \tif (ret) {\n \t\tmutex_unlock(&root->fs_info->tree_log_mutex);\n+\t\tmutex_unlock(&root->fs_info->reloc_mutex);\n \t\tgoto cleanup_transaction;\n \t}\n \n"} {"commit":"94570f39d308dad027812e4913264c3953dd6be9","subject":"only set _WIN32_WINNT when it hasn't been set by the environment","message":"only set _WIN32_WINNT when it hasn't been set by the environment\n","repos":"bkaradzic\/bnet,mendsley\/bnet,bkaradzic\/bnet,mendsley\/bnet","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bnet_p.h\n+++ src\/bnet_p.h\n@@ -52,7 +52,9 @@\n \r\n #if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360\r\n #\tif BX_PLATFORM_WINDOWS\r\n-#\t\tdefine _WIN32_WINNT 0x0501\r\n+#\t\tif !defined(_WIN32_WINNT)\r\n+#\t\t\tdefine _WIN32_WINNT 0x0501\r\n+#\t\tendif\r\n #\t\tinclude <winsock2.h>\r\n #\t\tinclude <ws2tcpip.h>\r\n #\telif BX_PLATFORM_XBOX360\r\n"} {"commit":"155149e6724435eff47e0c6427b271b23815b40e","subject":"usb: gadget: bcm63xx_udc: don't touch gadget.dev.driver","message":"usb: gadget: bcm63xx_udc: don't touch gadget.dev.driver\n\nudc-core now handles that for us, which means\nwe can remove it from our driver.\n\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/usb\/gadget\/bcm63xx_udc.c\n+++ drivers\/usb\/gadget\/bcm63xx_udc.c\n@@ -1819,7 +1819,6 @@\n \n \tudc->driver = driver;\n \tdriver->driver.bus = NULL;\n-\tudc->gadget.dev.driver = &driver->driver;\n \tudc->gadget.dev.of_node = udc->dev->of_node;\n \n \tspin_unlock_irqrestore(&udc->lock, flags);\n@@ -1841,7 +1840,6 @@\n \tspin_lock_irqsave(&udc->lock, flags);\n \n \tudc->driver = NULL;\n-\tudc->gadget.dev.driver = NULL;\n \n \t\/*\n \t * If we switch the PHY too abruptly after dropping D+, the host\n"} {"commit":"d418b92cdcc869c39eff75d90e62182352d6978e","subject":"HTTP\/2: improved the ngx_http_v2_integer_octets(v) macro.","message":"HTTP\/2: improved the ngx_http_v2_integer_octets(v) macro.\n\nPreviously, it didn't work well for 0, 127, and 128, returning less than needed.\n","repos":"hy0kl\/nginx,hy0kl\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/v2\/ngx_http_v2_filter_module.c\n+++ src\/http\/v2\/ngx_http_v2_filter_module.c\n@@ -12,7 +12,12 @@\n #include <ngx_http_v2_module.h>\n \n \n-#define ngx_http_v2_integer_octets(v) (((v) + 127) \/ 128)\n+\/*\n+ * This returns precise number of octets for values in range 0..253\n+ * and estimate number for the rest, but not smaller than required.\n+ *\/\n+\n+#define ngx_http_v2_integer_octets(v) (1 + (v) \/ 127)\n \n #define ngx_http_v2_literal_size(h) \\\n (ngx_http_v2_integer_octets(sizeof(h) - 1) + sizeof(h) - 1)\n"} {"commit":"365009d3d74f617a21671679e29526258bfea58f","subject":"Include sljitLir.h before the first use of SLJIT_VERBOSE.","message":"Include sljitLir.h before the first use of SLJIT_VERBOSE.\n","repos":"alnsn\/bpfjit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bpfjit.c\n+++ src\/bpfjit.c\n@@ -60,11 +60,11 @@\n #include <sys\/queue.h>\n #include <sys\/types.h>\n \n+#include <sljitLir.h>\n+\n #if !defined(_KERNEL) && defined(SLJIT_VERBOSE) && SLJIT_VERBOSE\n #include <stdio.h> \/* for stderr *\/\n #endif\n-\n-#include <sljitLir.h>\n \n \n #define BPFJIT_A\tSLJIT_TEMPORARY_REG1\n@@ -869,7 +869,7 @@\n \tif (compiler == NULL)\n \t\tgoto fail;\n \n-#if defined(SLJIT_VERBOSE) && SLJIT_VERBOSE\n+#if !defined(_KERNEL) && defined(SLJIT_VERBOSE) && SLJIT_VERBOSE\n \tsljit_compiler_verbose(compiler, stderr);\n #endif\n \n"} {"commit":"6897d4b2bafe189863b2fe448c4afde37844cdbf","subject":"usb: gadget: udc: net2280: Declare allow_status_338x as inline","message":"usb: gadget: udc: net2280: Declare allow_status_338x as inline\n\nThe function is very simple, does not declare any variable and it is\ncalled in the irq path.\n\nThe counterpart for net228x is already declared as inline.\n\nSigned-off-by: Ricardo Ribalda Delgado <39bb74b16720293e1449e36465485b27216fbd6d@gmail.com>\nSigned-off-by: Felipe Balbi <94dddeeef08b001e003cce128ddc162a4e2c6cd2@ti.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"72c1a73993cfa3572e45e1a878ff7acf31d14fc8","subject":"xfs: xfs_shift_file_space can be static","message":"xfs: xfs_shift_file_space can be static\n\nSigned-off-by: Fengguang Wu <24f7fe9d205c8a9f6ade0c2894e14303ca16087f@intel.com>\nReviewed-by: Dave Chinner <4d9e23a041ac966f5316a7481300d4ae12e806fe@redhat.com>\nSigned-off-by: Dave Chinner <aa743a0aaec8f7d7a1f01442503957f4d7a2d634@fromorbit.com>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/xfs\/xfs_bmap_util.c\n+++ fs\/xfs\/xfs_bmap_util.c\n@@ -1383,7 +1383,7 @@\n * If we are shifting right, we will start with last extent inside file space\n * and continue until we reach the block corresponding to offset.\n *\/\n-int\n+static int\n xfs_shift_file_space(\n \tstruct xfs_inode *ip,\n \txfs_off_t offset,\n"} {"commit":"bd6ce8830f699f890e20faa4c16e24106ee59506","subject":"Fix unicode binary writing.","message":"Fix unicode binary writing.\n","repos":"Tatsh\/libplist,libimobiledevice-win32\/libplist,libimobiledevice-win32\/libplist,libimobiledevice-win32\/libplist,libimobiledevice\/libplist,Tatsh\/libplist,libimobiledevice-win32\/libplist,Tatsh\/libplist,Tatsh\/libplist,libimobiledevice\/libplist,libimobiledevice\/libplist","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bplist.c\n+++ src\/bplist.c\n@@ -25,6 +25,7 @@\n #include <string.h>\n \n #include <libxml\/encoding.h>\n+#include <ctype.h>\n \n #include <plist\/plist.h>\n #include \"plist.h\"\n@@ -732,6 +733,8 @@\n g_byte_array_append(bplist, int_buff->data, int_buff->len);\n g_byte_array_free(int_buff, TRUE);\n }\n+ \/\/stupid unicode buffer length\n+ if (BPLIST_UNICODE==mark) size *= 2;\n buff = (uint8_t *) malloc(size);\n memcpy(buff, val, size);\n g_byte_array_append(bplist, buff, size);\n@@ -757,7 +760,7 @@\n memcpy(buff, val, size2);\n for (i = 0; i < size; i++)\n byte_convert(buff + i * sizeof(gunichar2), sizeof(gunichar2));\n- write_raw_data(bplist, BPLIST_STRING, buff, size2);\n+ write_raw_data(bplist, BPLIST_UNICODE, buff, size);\n }\n \n static void write_array(GByteArray * bplist, GNode * node, GHashTable * ref_table, uint8_t dict_param_size)\n@@ -840,6 +843,20 @@\n g_byte_array_append(bplist, buff, size * 2 * dict_param_size);\n free(buff);\n \n+}\n+\n+static int is_ascii_string(char* s, int len)\n+{\n+ int ret = 1, i = 0;\n+ for(i = 0; i < len; i++)\n+ {\n+ if ( !isascii( s[i] ) )\n+ {\n+ ret = 0;\n+ break;\n+ }\n+ }\n+ return ret;\n }\n \n void plist_to_bin(plist_t plist, char **plist_bin, uint32_t * length)\n@@ -922,16 +939,15 @@\n case PLIST_KEY:\n case PLIST_STRING:\n len = strlen(data->strval);\n- type = xmlDetectCharEncoding((const unsigned char *)data->strval, len);\n- if (XML_CHAR_ENCODING_UTF8 == type)\n+ if ( is_ascii_string(data->strval, len) )\n+ {\n+ write_string(bplist_buff, data->strval);\n+ }\n+ else\n {\n unicodestr = g_utf8_to_utf16(data->strval, len, &items_read, &items_written, &error);\n write_unicode(bplist_buff, unicodestr, items_written);\n g_free(unicodestr);\n- }\n- else if (XML_CHAR_ENCODING_ASCII == type || XML_CHAR_ENCODING_NONE == type)\n- {\n- write_string(bplist_buff, data->strval);\n }\n break;\n case PLIST_DATA:\n"} {"commit":"7282bdb224658b25b445f2b1b3f6cab93cbef961","subject":"USB: fsl-mph-dr-of: cleanup clock API use","message":"USB: fsl-mph-dr-of: cleanup clock API use\n\nuse devm_get_clk() for automatic put upon device release, check for and\npropagate errors when enabling clocks, must prepare clocks before they\ncan get enabled, unprepare after disable\n\nneed to use the _parent_ of the platform device for clock lookup, since\nthis one is associated with the respective device tree node; this change\nremains neutral as long as a \"globally\" provided \"usb%d_clk\" item gets\nprovided by either the PPC_CLOCK implementation or clkdev_register'ed\naliases, using the correct devide and thus referencing the right DT node\nbecomes essential when clock lookup will become based on device tree\nwhen common clock support will get introduced\n\nSigned-off-by: Gerhard Sittig <c9b3437932eed090edbebd577212b9961ce000fb@denx.de>\nSigned-off-by: Anatolij Gustschin <f79f5d5f0b8928b7f49f0262a90d53ad98a87c22@denx.de>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/host\/fsl-mph-dr-of.c\n+++ drivers\/usb\/host\/fsl-mph-dr-of.c\n@@ -260,6 +260,7 @@\n {\n \tstruct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;\n \tstruct clk *clk;\n+\tint err;\n \tchar clk_name[10];\n \tint base, clk_num;\n \n@@ -272,13 +273,16 @@\n \t\treturn -ENODEV;\n \n \tsnprintf(clk_name, sizeof(clk_name), \"usb%d_clk\", clk_num);\n-\tclk = clk_get(&pdev->dev, clk_name);\n+\tclk = devm_clk_get(pdev->dev.parent, clk_name);\n \tif (IS_ERR(clk)) {\n \t\tdev_err(&pdev->dev, \"failed to get clk\\n\");\n \t\treturn PTR_ERR(clk);\n \t}\n-\n-\tclk_enable(clk);\n+\terr = clk_prepare_enable(clk);\n+\tif (err) {\n+\t\tdev_err(&pdev->dev, \"failed to enable clk\\n\");\n+\t\treturn err;\n+\t}\n \tpdata->clk = clk;\n \n \tif (pdata->phy_mode == FSL_USB2_PHY_UTMI_WIDE) {\n@@ -302,10 +306,8 @@\n \n \tpdata->regs = NULL;\n \n-\tif (pdata->clk) {\n-\t\tclk_disable(pdata->clk);\n-\t\tclk_put(pdata->clk);\n-\t}\n+\tif (pdata->clk)\n+\t\tclk_disable_unprepare(pdata->clk);\n }\n \n static struct fsl_usb2_platform_data fsl_usb2_mpc5121_pd = {\n"} {"commit":"5bd7ac029efc86fe8048060c88f03f2a9486d8d8","subject":"interface: Take interface status into account when starting and destroying","message":"interface: Take interface status into account when starting and destroying\n\nhttps:\/\/bugzilla.redhat.com\/show_bug.cgi?id=956994\n\nCurrently, it is possible to start an interface that is already running:\n\n # virsh iface-start eth2\n Interface eth2 started\n\n # echo $?\n 0\n\n # virsh iface-start eth2\n Interface eth2 started\n\n # echo $?\n 0\n\n # virsh iface-start eth2\n Interface eth2 started\n\n # echo $?\n 0\n\nSame applies for destroying a dead interface. We should not allow such\nstate transitions.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\n","repos":"jfehlig\/libvirt,andreabolognani\/libvirt,taget\/libvirt,shugaoye\/libvirt,jfehlig\/libvirt,rlaager\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,elmarco\/libvirt,eskultety\/libvirt,eskultety\/libvirt,crobinso\/libvirt,eskultety\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,shugaoye\/libvirt,nertpinx\/libvirt,datto\/libvirt,elmarco\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,taget\/libvirt,andreabolognani\/libvirt,elmarco\/libvirt,datto\/libvirt,elmarco\/libvirt,shugaoye\/libvirt,eskultety\/libvirt,datto\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,shugaoye\/libvirt,libvirt\/libvirt,rlaager\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,rlaager\/libvirt,eskultety\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,rlaager\/libvirt,agx\/libvirt,agx\/libvirt,rlaager\/libvirt,libvirt\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,datto\/libvirt,agx\/libvirt,jardasgit\/libvirt,VenkatDatta\/libvirt,datto\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,fabianfreyer\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,shugaoye\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,agx\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,elmarco\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/interface\/interface_backend_netcf.c\n+++ src\/interface\/interface_backend_netcf.c\n@@ -944,6 +944,7 @@\n struct netcf_if *iface = NULL;\n virInterfaceDefPtr def = NULL;\n int ret = -1;\n+ bool active;\n \n virCheckFlags(0, -1);\n \n@@ -961,6 +962,15 @@\n \n if (virInterfaceCreateEnsureACL(ifinfo->conn, def) < 0)\n goto cleanup;\n+\n+ if (netcfInterfaceObjIsActive(iface, &active) < 0)\n+ goto cleanup;\n+\n+ if (active) {\n+ virReportError(VIR_ERR_OPERATION_INVALID, \"%s\",\n+ _(\"interface is already running\"));\n+ goto cleanup;\n+ }\n \n ret = ncf_if_up(iface);\n if (ret < 0) {\n@@ -987,6 +997,7 @@\n struct netcf_if *iface = NULL;\n virInterfaceDefPtr def = NULL;\n int ret = -1;\n+ bool active;\n \n virCheckFlags(0, -1);\n \n@@ -1004,6 +1015,15 @@\n \n if (virInterfaceDestroyEnsureACL(ifinfo->conn, def) < 0)\n goto cleanup;\n+\n+ if (netcfInterfaceObjIsActive(iface, &active) < 0)\n+ goto cleanup;\n+\n+ if (!active) {\n+ virReportError(VIR_ERR_OPERATION_INVALID, \"%s\",\n+ _(\"interface is not running\"));\n+ goto cleanup;\n+ }\n \n ret = ncf_if_down(iface);\n if (ret < 0) {\n"} {"commit":"c0d861afa5c986f7fe23647fbe411cd300f7c927","subject":"drivers\/video\/backlight\/da903x.c: introduce missing kfree","message":"drivers\/video\/backlight\/da903x.c: introduce missing kfree\n\nError handling code following a kzalloc should free the allocated data.\n\nThe semantic match that finds the problem is as follows:\n(http:\/\/www.emn.fr\/x-info\/coccinelle\/)\n\n\/\/ <smpl>\n@r exists@\nlocal idexpression x;\nstatement S;\nexpression E;\nidentifier f,l;\nposition p1,p2;\nexpression *ptr != NULL;\n@@\n\n(\nif ((x@p1 = \\(kmalloc\\|kzalloc\\|kcalloc\\)(...)) == NULL) S\n|\nx@p1 = \\(kmalloc\\|kzalloc\\|kcalloc\\)(...);\n...\nif (x == NULL) S\n)\n<... when != x\n when != if (...) { <+...x...+> }\nx->f = E\n...>\n(\n return \\(0\\|<+...x...+>\\|ptr\\);\n|\n return@p2 ...;\n)\n\n@script:python@\np1 << r.p1;\np2 << r.p2;\n@@\n\nprint \"* file: %s kmalloc %s return %s\" % (p1[0].file,p1[0].line,p2[0].line)\n\/\/ <\/smpl>\n\nSigned-off-by: Julia Lawall <b43b0ad1e8108e7ab870d7a54feac93ae8b8600e@diku.dk>\nCc: Mike Rapoport <a17fed27eaa842282862ff7c1b9c8395a26ac320@compulab.co.il>\nCc: Richard Purdie <a03894c799ea916bd571ce8f12ed88f6fb3400f7@linux.intel.com>\nCc: Eric Miao <e9e0335ae43eee51396737d09983d9b25d00e51e@marvell.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/video\/backlight\/da903x.c\n+++ drivers\/video\/backlight\/da903x.c\n@@ -119,6 +119,7 @@\n \tdefault:\n \t\tdev_err(&pdev->dev, \"invalid backlight device ID(%d)\\n\",\n \t\t\t\tpdev->id);\n+\t\tkfree(data);\n \t\treturn -EINVAL;\n \t}\n \n"} {"commit":"e4108a3b334b6a8a9b40825f7753e1a4bb19f273","subject":"Fixed an off-by-one error.","message":"Fixed an off-by-one error.\n","repos":"glance-\/libdivecomputer,venkateshshukla\/libdivecomputer,henrik242\/libdivecomputer,Poltsi\/libdivecomputer-vms,andysan\/libdivecomputer,josh-wambua\/libdivecomputer,venkateshshukla\/libdivecomputer,josh-wambua\/libdivecomputer,glance-\/libdivecomputer,henrik242\/libdivecomputer,andysan\/libdivecomputer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/buffer.c\n+++ src\/buffer.c\n@@ -237,7 +237,7 @@\n \tif (buffer == NULL)\n \t\treturn 0;\n \n-\tif (offset + size >= buffer->size)\n+\tif (offset + size > buffer->size)\n \t\treturn 0;\n \n \tbuffer->offset += offset;\n"} {"commit":"117fde2d1745c64c514db697b126350f7acf61a6","subject":"Minor ecpg tweak: the return value of calloc() is guaranteed to be NULL or zero-filled; therefore zero-filling it via memset() is pointless. (I think setting `errno' is probably a waste of cycles as well, but I haven't changed that.)","message":"Minor ecpg tweak: the return value of calloc() is guaranteed to be NULL\nor zero-filled; therefore zero-filling it via memset() is pointless.\n(I think setting `errno' is probably a waste of cycles as well, but I\nhaven't changed that.)\n","repos":"jmcatamney\/gpdb,zaksoup\/gpdb,oberstet\/postgres-xl,adam8157\/gpdb,edespino\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,snaga\/postgres-xl,zeroae\/postgres-xl,lintzc\/gpdb,Quikling\/gpdb,0x0FFF\/gpdb,rubikloud\/gpdb,greenplum-db\/gpdb,rubikloud\/gpdb,adam8157\/gpdb,50wu\/gpdb,lpetrov-pivotal\/gpdb,snaga\/postgres-xl,greenplum-db\/gpdb,randomtask1155\/gpdb,atris\/gpdb,xuegang\/gpdb,rubikloud\/gpdb,0x0FFF\/gpdb,lpetrov-pivotal\/gpdb,chrishajas\/gpdb,xinzweb\/gpdb,0x0FFF\/gpdb,snaga\/postgres-xl,snaga\/postgres-xl,kmjungersen\/PostgresXL,rvs\/gpdb,arcivanov\/postgres-xl,royc1\/gpdb,Quikling\/gpdb,xinzweb\/gpdb,foyzur\/gpdb,adam8157\/gpdb,oberstet\/postgres-xl,foyzur\/gpdb,oberstet\/postgres-xl,rvs\/gpdb,edespino\/gpdb,edespino\/gpdb,rvs\/gpdb,lpetrov-pivotal\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,xuegang\/gpdb,50wu\/gpdb,royc1\/gpdb,rvs\/gpdb,ashwinstar\/gpdb,rvs\/gpdb,CraigHarris\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,kaknikhil\/gpdb,CraigHarris\/gpdb,lpetrov-pivotal\/gpdb,royc1\/gpdb,xinzweb\/gpdb,xuegang\/gpdb,xuegang\/gpdb,xuegang\/gpdb,yuanzhao\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,oberstet\/postgres-xl,rvs\/gpdb,kmjungersen\/PostgresXL,kmjungersen\/PostgresXL,adam8157\/gpdb,lintzc\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,CraigHarris\/gpdb,lintzc\/gpdb,Quikling\/gpdb,royc1\/gpdb,50wu\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,arcivanov\/postgres-xl,Quikling\/gpdb,janebeckman\/gpdb,yazun\/postgres-xl,kmjungersen\/PostgresXL,snaga\/postgres-xl,tangp3\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,tangp3\/gpdb,chrishajas\/gpdb,arcivanov\/postgres-xl,cjcjameson\/gpdb,jmcatamney\/gpdb,chrishajas\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,adam8157\/gpdb,cjcjameson\/gpdb,chrishajas\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,lisakowen\/gpdb,oberstet\/postgres-xl,zaksoup\/gpdb,zeroae\/postgres-xl,ashwinstar\/gpdb,Quikling\/gpdb,atris\/gpdb,techdragon\/Postgres-XL,lintzc\/gpdb,atris\/gpdb,ovr\/postgres-xl,pavanvd\/postgres-xl,lisakowen\/gpdb,xuegang\/gpdb,yazun\/postgres-xl,foyzur\/gpdb,postmind-net\/postgres-xl,rubikloud\/gpdb,rubikloud\/gpdb,50wu\/gpdb,randomtask1155\/gpdb,xuegang\/gpdb,yuanzhao\/gpdb,CraigHarris\/gpdb,greenplum-db\/gpdb,atris\/gpdb,adam8157\/gpdb,ovr\/postgres-xl,jmcatamney\/gpdb,techdragon\/Postgres-XL,zaksoup\/gpdb,ahachete\/gpdb,greenplum-db\/gpdb,randomtask1155\/gpdb,yuanzhao\/gpdb,randomtask1155\/gpdb,foyzur\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,yuanzhao\/gpdb,tangp3\/gpdb,atris\/gpdb,tangp3\/gpdb,chrishajas\/gpdb,zaksoup\/gpdb,tpostgres-projects\/tPostgres,yuanzhao\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,rvs\/gpdb,50wu\/gpdb,lintzc\/gpdb,techdragon\/Postgres-XL,randomtask1155\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,cjcjameson\/gpdb,edespino\/gpdb,lpetrov-pivotal\/gpdb,ovr\/postgres-xl,tpostgres-projects\/tPostgres,Chibin\/gpdb,ahachete\/gpdb,postmind-net\/postgres-xl,tangp3\/gpdb,50wu\/gpdb,Chibin\/gpdb,edespino\/gpdb,rubikloud\/gpdb,tangp3\/gpdb,tpostgres-projects\/tPostgres,lisakowen\/gpdb,xinzweb\/gpdb,yazun\/postgres-xl,yazun\/postgres-xl,janebeckman\/gpdb,CraigHarris\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,rvs\/gpdb,royc1\/gpdb,kaknikhil\/gpdb,Postgres-XL\/Postgres-XL,CraigHarris\/gpdb,lisakowen\/gpdb,arcivanov\/postgres-xl,Quikling\/gpdb,janebeckman\/gpdb,atris\/gpdb,jmcatamney\/gpdb,lintzc\/gpdb,zaksoup\/gpdb,Chibin\/gpdb,royc1\/gpdb,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,edespino\/gpdb,janebeckman\/gpdb,foyzur\/gpdb,Postgres-XL\/Postgres-XL,royc1\/gpdb,ashwinstar\/gpdb,ahachete\/gpdb,lisakowen\/gpdb,Postgres-XL\/Postgres-XL,foyzur\/gpdb,pavanvd\/postgres-xl,atris\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,zeroae\/postgres-xl,ashwinstar\/gpdb,rubikloud\/gpdb,ahachete\/gpdb,zaksoup\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,Chibin\/gpdb,techdragon\/Postgres-XL,ashwinstar\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,edespino\/gpdb,0x0FFF\/gpdb,Postgres-XL\/Postgres-XL,janebeckman\/gpdb,Chibin\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,zeroae\/postgres-xl,pavanvd\/postgres-xl,yuanzhao\/gpdb,zaksoup\/gpdb,0x0FFF\/gpdb,Quikling\/gpdb,atris\/gpdb,techdragon\/Postgres-XL,greenplum-db\/gpdb,lintzc\/gpdb,rvs\/gpdb,ovr\/postgres-xl,edespino\/gpdb,tangp3\/gpdb,pavanvd\/postgres-xl,chrishajas\/gpdb,greenplum-db\/gpdb,randomtask1155\/gpdb,lintzc\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,edespino\/gpdb,lintzc\/gpdb,ahachete\/gpdb,foyzur\/gpdb,lpetrov-pivotal\/gpdb,tpostgres-projects\/tPostgres,pavanvd\/postgres-xl,janebeckman\/gpdb,xuegang\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,tpostgres-projects\/tPostgres,xuegang\/gpdb,rvs\/gpdb,postmind-net\/postgres-xl,kaknikhil\/gpdb,yuanzhao\/gpdb,postmind-net\/postgres-xl,ahachete\/gpdb,lpetrov-pivotal\/gpdb,cjcjameson\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,yazun\/postgres-xl,postmind-net\/postgres-xl,adam8157\/gpdb,0x0FFF\/gpdb,greenplum-db\/gpdb,chrishajas\/gpdb,kmjungersen\/PostgresXL,ovr\/postgres-xl,cjcjameson\/gpdb,ahachete\/gpdb,arcivanov\/postgres-xl,yuanzhao\/gpdb,janebeckman\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/interfaces\/ecpg\/pgtypeslib\/common.c\n+++ src\/interfaces\/ecpg\/pgtypeslib\/common.c\n@@ -2,18 +2,14 @@\n \n #include \"extern.h\"\n \n+\/* Return value is zero-filled. *\/\n char *\n pgtypes_alloc(long size)\n {\n \tchar\t *new = (char *) calloc(1L, size);\n \n \tif (!new)\n-\t{\n \t\terrno = ENOMEM;\n-\t\treturn NULL;\n-\t}\n-\n-\tmemset(new, '\\0', size);\n \treturn (new);\n }\n \n"} {"commit":"9366fafec4bbb445207cb02422eb2881cabf87e7","subject":"msm: mdss: remove unnecessary blank event notification","message":"msm: mdss: remove unnecessary blank event notification\n\nFB blank notification is not needed because the event is already\nbeing generated in core fb driver. This change avoids sending the\nsame notification twice.\n\nChange-Id: I8c05424e6675d35958cfeedfb4428812728a8399\nCRs-Fixed: 482340\nSigned-off-by: Shalabh Jain <d6d6439cde201528af4f40886945084b2554470c@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/video\/msm\/mdss\/mdss_fb.c\n+++ drivers\/video\/msm\/mdss\/mdss_fb.c\n@@ -627,12 +627,7 @@\n static int mdss_fb_blank(int blank_mode, struct fb_info *info)\n {\n \tstruct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;\n-\tif (blank_mode == FB_BLANK_POWERDOWN) {\n-\t\tstruct fb_event event;\n-\t\tevent.info = info;\n-\t\tevent.data = &blank_mode;\n-\t\tfb_notifier_call_chain(FB_EVENT_BLANK, &event);\n-\t}\n+\n \tmdss_fb_pan_idle(mfd);\n \tif (mfd->op_enable == 0) {\n \t\tif (blank_mode == FB_BLANK_UNBLANK)\n"} {"commit":"1cc47cb8722bd5fcc22b28108f0679d70105b8ea","subject":"Adding class ElasticNode","message":"Adding class ElasticNode\n","repos":"wangziqi2013\/BwTree,wangziqi2013\/BwTree,wangziqi2013\/BwTree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bwtree.h\n+++ src\/bwtree.h\n@@ -909,6 +909,27 @@\n return;\n }\n };\n+ \n+ \/*\n+ * class ElasticNode - The base class for elastic node types, i.e. InnerNode\n+ * and LeafNode\n+ *\n+ * Since for InnerNode and LeafNode, the number of elements is not a compile\n+ * time known constant. However, for efficient tree traversal we must inline\n+ * all elements to reduce cache misses with workload that's less predictable\n+ *\/\n+ template <typename ElementType>\n+ class ElasticNode : public BaseNode {\n+ public:\n+ \n+ \/\/ This is the end of the elastic array\n+ \/\/ We explicitly store it here to avoid calculating the end of the array\n+ \/\/ everytime\n+ ElementType *end;\n+ \n+ \/\/ This is the starting point\n+ ElementType start[0]; \n+ };\n \n \/*\n * class DeltaNode - Common element in a delta node\n"} {"commit":"20ad38b4269d79e38df1203bb0a3242af9e9be55","subject":"code cleanup","message":"code cleanup","repos":"markusressel\/Watchface-No.-2,markusressel\/Watchface-No.-2,markusressel\/Watchface-No.-2,markusressel\/Watchface-No.-2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/c\/date.c\n+++ src\/c\/date.c\n@@ -6,25 +6,23 @@\n \n static ClaySettings *s_settings;\n \n+\/\/ Date DottedTextLayer\n static DottedTextLayer *s_dotted_text_layer;\n-\n-\/\/ Date TextLayer\n-static TextLayer *s_date_layer;\n \n void update_date() {\n \/\/ Get a tm structure\n time_t temp = time(NULL);\n struct tm *tick_time = localtime(&temp);\n \n- \/\/ Write the current hours and minutes into a buffer\n+ \/\/ Write the current day, month and year into a buffer\n static char s_buffer[16];\n strftime(s_buffer, \n sizeof(s_buffer),\n- \"%a, %d.%m\",\n+ \"%d.%m.%y\",\n tick_time);\n \n- \/\/ Display this time on the TextLayer\n- text_layer_set_text(s_date_layer, s_buffer);\n+ \/\/ Display this date on the DottedTextLayer\n+ dotted_text_layer_set_text(s_dotted_text_layer, s_buffer);\n }\n \n \/\/ creates the date layer\n@@ -43,29 +41,18 @@\n \n GRect layer_bounds = GRect(offsetX, offsetY, width, height);\n \n- \/\/ Create the TextLayer with specific bounds\n- s_date_layer = text_layer_create(layer_bounds);\n- \n- \/\/ Improve the layout to be more like a watchface\n- text_layer_set_background_color(s_date_layer, GColorClear);\n- \/\/text_layer_set_background_color(s_date_layer, theme_get_theme()->BackgroundColor);\n- text_layer_set_text_color(s_date_layer, theme_get_theme()->DateTextColor);\n- text_layer_set_font(s_date_layer, theme_get_theme()->DateFont);\n- text_layer_set_text_alignment(s_date_layer, GTextAlignmentCenter);\n- \n s_dotted_text_layer = dotted_text_layer_create(layer_bounds);\n- dotted_text_layer_set_text(s_dotted_text_layer, \"14.01.17\");\n+ \/\/dotted_text_layer_set_text(s_dotted_text_layer, \"14.01.17\");\n dotted_text_layer_set_color(s_dotted_text_layer, GColorBlack);\n+ \/\/dotted_text_layer_set_text_alignment(s_date_layer, GTextAlignmentCenter);\n \n update_date();\n \n \/\/ Add it as a child layer to the Window's root layer\n- \/\/layer_add_child(window_layer, text_layer_get_layer(s_date_layer));\n layer_add_child(window_layer, s_dotted_text_layer);\n }\n \n \/\/ destroys the date layer\n void destroy_date_layer() {\n- text_layer_destroy(s_date_layer);\n dotted_text_layer_destroy(s_dotted_text_layer);\n }"} {"commit":"66ec62e4733c6838b078f57acc3aab70b865a823","subject":"Rename draw functions","message":"Rename draw functions","repos":"clach04\/watchface_rota_minute,clach04\/watchface_rota_minute,clach04\/watchface_rota_minute","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/c\/main.c\n+++ src\/c\/main.c\n@@ -47,7 +47,7 @@\n return wrote_config;\n }\n \n-void hour_display_update_proc(Layer *layer, GContext* ctx, struct tm *t, GRect bounds)\n+void digits_display_update_proc(Layer *layer, GContext* ctx, struct tm *t, GRect bounds)\n {\n char hour_str[3]=\"12\";\n GPoint center = grect_center_point(&bounds);\n@@ -99,7 +99,7 @@\n #endif \/* NO_DATE *\/\n }\n \n-void minute_display_update_proc(Layer *layer, GContext* ctx, struct tm *t, GRect bounds, int angle)\n+void draw_arc_display_update_proc(Layer *layer, GContext* ctx, struct tm *t, GRect bounds, int angle)\n {\n \/\/ https:\/\/developer.pebble.com\/docs\/c\/Graphics\/Graphics_Context\/\n \/\/graphics_context_set_antialiased(ctx, true);\n@@ -128,8 +128,8 @@\n #endif\n GRect bounds = layer_get_unobstructed_bounds(layer);\n \n- hour_display_update_proc(layer, ctx, t, bounds);\n- minute_display_update_proc(layer, ctx, t, bounds, angle);\n+ digits_display_update_proc(layer, ctx, t, bounds);\n+ draw_arc_display_update_proc(layer, ctx, t, bounds, angle);\n }\n \n void update_time()\n"} {"commit":"6b3cf170632186e8fe0772c8f41d56a5350e4bc7","subject":"ASSOC, MEMBER: Don't evaluate arguments again.","message":"ASSOC, MEMBER: Don't evaluate arguments again.\n","repos":"SvenMichaelKlose\/tre,SvenMichaelKlose\/tre,SvenMichaelKlose\/tre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- interpreter\/builtin_list.c\n+++ interpreter\/builtin_list.c\n@@ -139,6 +139,19 @@\n return treptr_t;\n }\n \n+treptr\n+treeval_noargs (treptr efunc, treptr fake)\n+{\n+ if (TREPTR_IS_FUNCTION(efunc))\n+ return treeval_funcall (efunc, fake, FALSE);\n+ else if (TREPTR_IS_BUILTIN(efunc))\n+ return treeval_xlat_function (treeval_xlat_builtin, efunc, fake, FALSE);\n+ else if (TREPTR_IS_SPECIAL(efunc))\n+ return trespecial (efunc, fake);\n+ else\n+ return treerror (efunc, \"function expected\");\n+}\n+\n #ifdef TRE_BUILTIN_ASSOC\n \n treptr\n@@ -147,6 +160,7 @@\n \ttreptr key;\n \ttreptr list;\n \ttreptr test;\n+\ttreptr etest;\n \ttreptr res;\n \ttreptr fake;\n \ttreptr elm;\n@@ -160,30 +174,38 @@\n \t\ttest = CADDDR(args);\n \t}\n \n+\tetest = treeval (test);\n+\ttregc_push (etest);\n \tlist = CADR(args);\n \twhile (list != treptr_nil) {\n \t\telm = CAR(list);\n \t\telmkey = CAR(elm);\n \t\tif (test == trelist_builtin_eq_symbol && elmkey == key)\n-\t\t\treturn elm;\n+\t\t\tgoto got_it;\n \t\tif (test == treptr_nil) {\n \t\t\tif (treatom_eql (elmkey, key) != treptr_nil)\n-\t\t\t\treturn elm;\n+\t\t\t\tgoto got_it;\n \t\t} else {\n- \t\tfake = CONS(test, CONS(key, CONS(elmkey, treptr_nil)));\n+ \t\tfake = CONS(etest, CONS(key, CONS(elmkey, treptr_nil)));\n \t\ttregc_push (fake);\n \n- \t\tres = treeval (fake);\n+\t\t\tres = treeval_noargs (etest, fake);\n \n \t\ttregc_pop ();\n \t\tTRELIST_FREE_EARLY(fake);\n \t\t\tif (res != treptr_nil)\n-\t\t\t\treturn elm;\n+\t\t\t\tgoto got_it;\n \t\t}\n \n \t\tlist = CDR(list);\n \t}\n+\n+\ttregc_pop ();\n \treturn treptr_nil;\n+\n+got_it:\n+\ttregc_pop ();\n+\treturn elm;\n }\n #endif \/* #ifdef TRE_BUILTIN_ASSOC *\/\n \n@@ -197,6 +219,7 @@\n \ttreptr listend;\n \ttreptr sublist;\n \ttreptr test = treptr_nil;\n+\ttreptr etest;\n \ttreptr l;\n \ttreptr fake;\n \ttreptr res;\n@@ -212,6 +235,8 @@\n \t\tl = CDR(l);\n \t}\n \n+\tetest = treeval (test);\n+\ttregc_push (etest);\n \twhile (list != treptr_nil && list != listend) {\n \t\tsublist = CAR(list);\n \t\tif (sublist == trelist_builtin_test_symbol)\n@@ -219,24 +244,30 @@\n \t\twhile (sublist != treptr_nil) {\n \t\t\tif (test == treptr_nil) {\n \t\t\t\tif (treatom_eql (CAR(sublist), key) != treptr_nil)\n-\t\t\t\t\treturn treptr_t;\n+\t\t\t\t\tgoto got_t;\n \t\t\t} else {\n- \t\t\tfake = CONS(test, CONS(key, CONS(CAR(sublist), treptr_nil)));\n+ \t\t\tfake = CONS(etest, CONS(key, CONS(CAR(sublist), treptr_nil)));\n \t\t\ttregc_push (fake);\n \n- \t\t\tres = treeval (fake);\n+\t\t\t\tres = treeval_noargs (etest, fake);\n \n \t\t\ttregc_pop ();\n \t\t\tTRELIST_FREE_EARLY(fake);\n \t\t\t\tif (res != treptr_nil)\n-\t\t\t\t\treturn treptr_t;\n+\t\t\t\t\tgoto got_t;\n \t\t\t}\n \n \t\t\tsublist = CDR(sublist);\n \t\t}\n \t\tlist = CDR(list);\n \t}\n+\n+\ttregc_pop ();\n \treturn treptr_nil;\n+\n+got_t:\n+\ttregc_pop ();\n+\treturn treptr_t;\n }\n \n #endif \/* #ifdef TRE_BUILTIN_MEMBER *\/\n"} {"commit":"d082ea586391834dbeeceb1241d9345b5a5dba21","subject":"Interface of the world reader plugin","message":"Interface of the world reader plugin\n","repos":"3drepo\/GLC_lib","returncode":1,"stderr":"error: pathspec 'io\/glc_worldreaderplugin.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- io\/glc_worldreaderplugin.h\n+++ io\/glc_worldreaderplugin.h\n@@ -0,0 +1,49 @@\n+\/****************************************************************************\n+\n+ This file is part of the GLC-lib library.\n+ Copyright (C) 2005-2008 Laurent Ribon (laumaya@users.sourceforge.net)\n+ Version 2.0.0, packaged on July 2010.\n+\n+ http:\/\/glc-lib.sourceforge.net\n+\n+ GLC-lib is free software; you can redistribute it and\/or modify\n+ it under the terms of the GNU Lesser General Public License as published by\n+ the Free Software Foundation; either version 3 of the License, or\n+ (at your option) any later version.\n+\n+ GLC-lib is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public License\n+ along with GLC-lib; if not, write to the Free Software\n+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n+\n+*****************************************************************************\/\n+\n+\/\/! \\file glc_worldreaderplugin.h interface for reading world from 3D model\n+\n+#ifndef GLC_WORLDREADERPLUGIN_H_\n+#define GLC_WORLDREADERPLUGIN_H_\n+\n+#include <QObject>\n+#include <QStringList>\n+\n+#include \"glc_worldreaderhandler.h\"\n+\n+class GLC_WorldReaderPlugin\n+{\n+public:\n+\tvirtual ~GLC_WorldReaderPlugin() {}\n+\n+\t\/\/! Return the list of 3D model keys this plugin support\n+\tvirtual QStringList keys() const =0;\n+\n+\t\/\/! Return a reader handler\n+\tvirtual GLC_WorldReaderHandler* readerHandler()= 0;\n+};\n+\n+Q_DECLARE_INTERFACE(GLC_WorldReaderPlugin, \"com.GLC_lib.GLC_WorldReaderPlugin\")\n+\n+#endif \/* GLC_WORLDREADERPLUGIN_H_ *\/\n"} {"commit":"a06a7ce775405139d15ac199f9554fe93e67857d","subject":"Fix a couple signed\/unsigned warnings","message":"Fix a couple signed\/unsigned warnings\n","repos":"stevegrubb\/libcap-ng,stevegrubb\/libcap-ng,stevegrubb\/libcap-ng","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/cap-ng.c\n+++ src\/cap-ng.c\n@@ -628,7 +628,7 @@\n \t\tif (CAPNG_INHERITABLE & type)\n \t\t\tv1_update(action, capability, &m.data.v1.inheritable);\n \t} else {\n-\t\tint idx;\n+\t\tunsigned int idx;\n \n \t\tif (capability > 31) {\n \t\t\tidx = capability>>5;\n@@ -697,7 +697,7 @@\n \t\tmemcpy(&state, &m, sizeof(state)); \/* save state *\/\n \t\tcapng_get_caps_process();\n \t\tif (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {\n-\t\t\tint i;\n+\t\t\tunsigned int i;\n \t\t\tmemcpy(&m, &state, sizeof(m)); \/* restore state *\/\n \t\t\trc = 0;\n \t\t\tfor (i=0; i <= last_cap && rc == 0; i++)\n@@ -714,8 +714,7 @@\n \t}\n \tif (set & CAPNG_SELECT_AMBIENT) {\n #ifdef PR_CAP_AMBIENT\n-\t\tint i;\n-\t\trc = 0;\n+\t\tunsigned int i;\n \t\tif (capng_have_capabilities(CAPNG_SELECT_AMBIENT) ==\n \t\t\t\t\t\t\t\tCAPNG_NONE) {\n \t\t\trc = prctl(PR_CAP_AMBIENT,\n@@ -791,7 +790,7 @@\n #ifndef VFS_CAP_U32\n \treturn -1;\n #else\n-\tint rc, size;\n+\tint rc, size = 0;\n #ifdef VFS_CAP_REVISION_3\n \tstruct vfs_ns_cap_data filedata;\n #else\n"} {"commit":"07e5e6470c6a9384d0d32b8cf255581c65ff76fc","subject":"more golang work: added rough record => struct compilation","message":"more golang work: added rough record => struct compilation\n","repos":"lojikil\/carML,lojikil\/carML,lojikil\/29,lojikil\/29,lojikil\/carML,lojikil\/29,lojikil\/carML,lojikil\/carML","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/carmlc.c\n+++ src\/carmlc.c\n@@ -6834,9 +6834,9 @@\n * for the initial go-around in C...\n *\/\n if(head->value[0] == 0) {\n- printf(\"1\"); \n+ printf(\"true\"); \n } else {\n- printf(\"0\");\n+ printf(\"false\");\n }\n break;\n case TCHAR:\n@@ -6904,58 +6904,39 @@\n * or just track the length every\n * where?\n *\/\n- printf(\"char *\");\n+ printf(\"string\");\n break;\n case TSTRING:\n printf(\"\\\"%s\\\"\", head->value);\n break;\n case TRECORD:\n- printf(\"typedef struct %s %s;\\nstruct %s {\\n\", head->value, head->value, head->value);\n+ printf(\"type %s struct {\\n\", head->value);\n for(int i = 0; i < head->lenchildren; i++) {\n gwalk(head->children[i], level + 1);\n if(i < (head->lenchildren - 1)) {\n printf(\"\\n\");\n }\n }\n- printf(\"\\n};\");\n+ printf(\"\\n}\");\n break;\n case TRECDEF:\n if(head->lenchildren == 2) {\n gwalk(head->children[1], 0);\n } else {\n- printf(\"void *\");\n+ printf(\"interface{}\");\n }\n printf(\" \");\n gwalk(head->children[0], 0);\n printf(\";\");\n break;\n case TBEGIN:\n- \/\/ TODO: this code is super ugly & can be cleaned up\n- \/\/ clean up idea could be that there doesn't _really_\n- \/\/ need to be a special case for *0*, but rather only\n- \/\/ if we're final == YES and we're at the last member\n- \/\/ (which for a 1-ary BEGIN, that would be 0)\n- \/\/ TODO: I think we need to majorly refactor what's\n- \/\/ going on here. Instead of handling \"return\" and\n- \/\/ co. within the individual forms, we should rather\n- \/\/ eat the cycles in an extra call to gwalk, and allow\n- \/\/ the value forms to decide if it's a return or the\n- \/\/ like instead. Furthermore, this will allow us to\n- \/\/ just track some simple state here in each of the\n- \/\/ syntactic forms, rather than now where they are\n- \/\/ all rats nests of if's\n for(idx = 0; idx < head->lenchildren; idx++) {\n if(idx == (head->lenchildren - 1) && final) {\n llgwalk(head->children[idx], level, YES);\n } else {\n llgwalk(head->children[idx], level, NO);\n }\n-\n- if(issyntacticform(head->children[idx]->tag)) {\n- printf(\"\\n\");\n- } else {\n- printf(\";\\n\");\n- }\n+ printf(\"\\n\");\n }\n break;\n case TSEMI:\n"} {"commit":"f7fd5532df3a15af4d9aa507f830e27b1b3e50bc","subject":"whoops, removed one debug printf","message":"whoops, removed one debug printf\n","repos":"lojikil\/29,lojikil\/29,lojikil\/carML,lojikil\/carML,lojikil\/carML,lojikil\/carML,lojikil\/29,lojikil\/carML","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/carmlc.c\n+++ src\/carmlc.c\n@@ -646,7 +646,6 @@\n pushf = 1;\n break;\n case TINTT:\n- printf(\"here?\\n\");\n typeval = \"int\";\n breakflag = 1;\n pushf = 1;\n"} {"commit":"03ec25720d1e040c3fe51f4577e49c1b39914c80","subject":"Add cast to satisfy the C++ warning gods.","message":"Add cast to satisfy the C++ warning gods.\n","repos":"munificent\/wren,munificent\/wren,munificent\/wren,munificent\/wren,munificent\/wren,munificent\/wren","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cli\/vm.c\n+++ src\/cli\/vm.c\n@@ -356,7 +356,8 @@\n \n WrenInterpretResult runRepl()\n {\n- rootDirectory = \".\";\n+ \/\/ This cast is safe since we don't try to free the string later.\n+ rootDirectory = (char*)\".\";\n initVM();\n \n printf(\"\\\\\\\\\/\\\"-\\n\");\n"} {"commit":"83688ab93811b14df9d1ab1dfc60883fdf9eca22","subject":"windows reader thread improvements","message":"windows reader thread improvements\n","repos":"don-johnny\/vpn-ws,XHidamariSketchX\/vpn-ws,faint32\/vpn-ws,unbit\/vpn-ws,don-johnny\/vpn-ws,XHidamariSketchX\/vpn-ws,nsdown\/vpn-ws,nsdown\/vpn-ws,faint32\/vpn-ws,don-johnny\/vpn-ws,faint32\/vpn-ws,unbit\/vpn-ws,XHidamariSketchX\/vpn-ws,unbit\/vpn-ws,nsdown\/vpn-ws","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -339,12 +339,25 @@\n }\n \n #ifdef __WIN32__\n+static void _vpn_ws_mutex_lock(HANDLE mutex) {\n+\tDWORD ret = WaitForSingleObject(mutex, INFINITE);\n+\tif (ret != WAIT_OBJECT_0) {\n+\t\tvpn_ws_error(\"_vpn_ws_mutex_lock()\/WaitForSingleObject()\");\n+\t\tvpn_ws_exit(1);\n+\t}\n+}\n static DWORD WINAPI _vpn_ws_tuntap_reader(LPVOID lp_args) {\n \n \tvoid **args = (void **) lp_args;\n \tHANDLE tuntap_fd = (HANDLE) args[0];\n \tvpn_ws_peer *peer = (vpn_ws_peer *) args[1];\n \tHANDLE mutex = (HANDLE) args[2];\n+\n+\tuint8_t mask[4];\n+\tmask[0] = rand();\n+\tmask[1] = rand();\n+\tmask[2] = rand();\n+\tmask[3] = rand();\n \n \tfor(;;) {\n \t\t\/\/ 2 byte header + 2 byte size + 4 bytes masking + mtu\n@@ -366,20 +379,26 @@\n if (rlen < 126) {\n mtu[2] = 0x82;\n mtu[3] = rlen | 0x80;\n+\t\t\t\t_vpn_ws_mutex_lock(mutex);\n if (vpn_ws_client_write(peer, mtu + 2, rlen + 6)) {\n vpn_ws_client_destroy(peer);\n+\t\t\t\t\tReleaseMutex(mutex);\n \t\t\t\t\treturn -1;\n }\n+\t\t\t\tReleaseMutex(mutex);\n }\n else {\n mtu[0] = 0x82;\n mtu[1] = 126 | 0x80;\n mtu[2] = (uint8_t) ((rlen >> 8) & 0xff);\n mtu[3] = (uint8_t) (rlen & 0xff);\n+\t\t\t\t_vpn_ws_mutex_lock(mutex);\n if (vpn_ws_client_write(peer, mtu, rlen + 8)) {\n vpn_ws_client_destroy(peer);\n+\t\t\t\t\tReleaseMutex(mutex);\n \t\t\t\t\treturn -1;\n }\n+\t\t\t\tReleaseMutex(mutex);\n }\n \t}\n \t\n@@ -471,12 +490,12 @@\n goto reconnect;\n \t}\n \n+#ifndef __WIN32__\n \tuint8_t mask[4];\n \tmask[0] = rand();\n \tmask[1] = rand();\n \tmask[2] = rand();\n \tmask[3] = rand();\n-#ifndef __WIN32__\n \tfd_set rset;\n \t\/\/ find the highest fd\n \tint max_fd = peer->fd;\n@@ -518,7 +537,7 @@\n \t\t\t}\t\t\t\n \t\t}\n #else\n-\t\tDWORD ret = WaitForSingleObjects(ev FALSE, 17000);\n+\t\tDWORD ret = WaitForSingleObject(ev, 17000);\n \t\tif (ret == WAIT_FAILED) {\n \t\t\tvpn_ws_error(\"main()\/WaitForMultipleObjects()\");\n \t\t\tvpn_ws_exit(1);\n"} {"commit":"f801a7260b79d7cad45ff5f074f66501abfe7277","subject":"Fail gracefully if no arguments are given","message":"Fail gracefully if no arguments are given\n","repos":"ruiafonsopereira\/mysql-c-api-exploration","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -7,6 +7,13 @@\n \n int main(int argc, char **argv)\n {\n+ \/\/ Skip the program name\n+ (argc)--;\n+ if (argc == 0) {\n+ printf(\"Usage: %s \\\"<mysql-statement>\\\"\\n\", argv[0]);\n+ exit(EXIT_FAILURE);\n+ }\n+\n MYSQL *con = mysql_init(NULL);\n if (con == NULL) {\n fprintf(stderr, \"%s\\n\", mysql_error(con));\n"} {"commit":"73efb4c7c97f329d556c4f835fb73ab881fb1549","subject":"add exception comments for `Client` interface","message":"add exception comments for `Client` interface\n","repos":"SJTU-DDST\/nvds,SJTU-DDST\/nvds,SJTU-DDST\/nvds","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.h\n+++ src\/client.h\n@@ -15,14 +15,17 @@\n DISALLOW_COPY_AND_ASSIGN(Client);\n \n \/\/ Get value by the key, return empty string if error occurs.\n+ \/\/ Throw: TransportException\n std::string Get(const std::string& key);\n std::string Get(const char* key, size_t key_len);\n \n \/\/ Store key\/value pair to the cluster, return if operation succeed.\n+ \/\/ Throw: TransportException\n bool Put(const std::string& key, const std::string& val);\n bool Put(const char* key, size_t ley_len, const char* val, size_t val_len);\n- \n+\n \/\/ Delete item indexed by the key, return if operation succeed.\n+ \/\/ Throw: TransportException\n bool Del(const std::string& key);\n bool Del(const char* key, size_t key_len);\n \n"} {"commit":"09d4ca7d7d67a16ca2493808f35357f408c6f6fc","subject":"Added code for adding coarse.links.base.index when a coarse database is initialized.","message":"Added code for adding coarse.links.base.index when a coarse database is initialized.\n","repos":"BergerLab\/CAST,BergerLab\/CAST","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/coarse.c\n+++ src\/coarse.c\n@@ -36,6 +36,7 @@\n coarse_db->file_fasta = file_fasta;\n coarse_db->file_seeds = file_seeds;\n coarse_db->file_links = file_links;\n+ coarse_db->file_links_base_index = file_links_base_index;\n coarse_db->file_fasta_index = file_fasta_index;\n coarse_db->file_fasta_base_index = file_fasta_base_index;\n coarse_db->file_links_index = file_links_index;\n"} {"commit":"34075e0aa32c2878ba59107d873c4bebc0838c9a","subject":"coldet.h: replace 0 pointer value with NULL","message":"coldet.h: replace 0 pointer value with NULL\n","repos":"fougue\/claudette,fougue\/claudette","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/coldet.h\n+++ src\/coldet.h\n@@ -34,6 +34,8 @@\n #define EXPORT\r\n #endif\r\n \r\n+#include <cstddef>\r\n+\r\n \/** Collision Model. Will represent the mesh to be tested for\r\n collisions. It has to be notified of all triangles, via\r\n addTriangle()\r\n@@ -92,7 +94,7 @@\n virtual bool collision(CollisionModel3D* other,\r\n int accuracyDepth = -1,\r\n int maxProcessingTime = 0,\r\n- float* otherTransform = 0) = 0;\r\n+ float* otherTransform = NULL) = 0;\r\n \r\n \/** Search option of rayCollision() for the colliding triangle *\/\r\n enum RayCollisionSearch\r\n"} {"commit":"89886291ef0e422a67ee8a4594b550236025f462","subject":"Calling copy with -R instead of -r","message":"Calling copy with -R instead of -r\n","repos":"DeforaOS\/Browser,DeforaOS\/Browser","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/common.c\n+++ src\/common.c\n@@ -48,7 +48,7 @@\n #else\n \tselection = g_list_append(selection, dest);\n \tif(context->suggested_action == GDK_ACTION_COPY)\n-\t\tret = _common_exec(\"copy\", \"-ir\", selection);\n+\t\tret = _common_exec(\"copy\", \"-iR\", selection);\n \telse if(context->suggested_action == GDK_ACTION_MOVE)\n \t\tret = _common_exec(\"move\", \"-i\", selection);\n #endif\n"} {"commit":"4edd09847e8f8c5a20912bae28f064aef16c4a81","subject":"travis ci test","message":"travis ci test\n\nits compiler successful on my raspberry pi, but get \"undefined\nreference to `pthread_create'\" on travis-ci\n","repos":"cocoahuke\/coBlue,cocoahuke\/coBlue","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/common.h\n+++ src\/common.h\n@@ -21,6 +21,7 @@\n #include <sys\/types.h>\n #include <stdbool.h>\n #include <pthread.h>\n+#include <pthread\/pthread.h>\n #include <sys\/timeb.h>\n #include <pwd.h>\n \n"} {"commit":"b938f797f3c13219d6fdc37d31315cfc966ffd2a","subject":"add head file for time","message":"add head file for time\n","repos":"qinchao0525\/MiniFTP,qinchao0525\/MiniFTP","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/common.h\n+++ src\/common.h\n@@ -13,6 +13,11 @@\n #include <ctype.h>\n #include <shadow.h>\n #include <crypt.h>\n+\n+#include <time.h>\n+#include <sys\/stat.h>\n+#include <dirent.h>\n+#include <sys\/time.h>\n \n #include <stdio.h>\n #include <stdlib.h>\n"} {"commit":"a69053c715f1e1780766201ffa9d720f91aa5736","subject":"Convert config.c to LF","message":"Convert config.c to LF\n\nSigned-off-by: Carlos Mart\u00edn Nieto <eecb638c0e60875b4a70118790d5be43bb59c2d6@elego.de>\n","repos":"stewid\/libgit2,Snazz2001\/libgit2,amyvmiwei\/libgit2,KTXSoftware\/libgit2,linquize\/libgit2,skabel\/manguse,maxiaoqian\/libgit2,dleehr\/libgit2,amyvmiwei\/libgit2,maxiaoqian\/libgit2,skabel\/manguse,swisspol\/DEMO-libgit2,yongthecoder\/libgit2,mrksrm\/Mingijura,Aorjoa\/libgit2_maked_lib,MrHacky\/libgit2,rcorre\/libgit2,ardumont\/libgit2,saurabhsuniljain\/libgit2,yongthecoder\/libgit2,Tousiph\/Demo1,mcanthony\/libgit2,mrksrm\/Mingijura,spraints\/libgit2,MrHacky\/libgit2,nacho\/libgit2,yosefhackmon\/libgit2,magnus98\/TEST,amyvmiwei\/libgit2,maxiaoqian\/libgit2,MrHacky\/libgit2,swisspol\/DEMO-libgit2,leoyanggit\/libgit2,claudelee\/libgit2,chiayolin\/libgit2,mhp\/libgit2,chiayolin\/libgit2,iankronquist\/libgit2,iankronquist\/libgit2,since2014\/libgit2,leoyanggit\/libgit2,whoisj\/libgit2,rcorre\/libgit2,nokiddin\/libgit2,jeffhostetler\/public_libgit2,yosefhackmon\/libgit2,skabel\/manguse,maxiaoqian\/libgit2,kenprice\/libgit2,dleehr\/libgit2,rcorre\/libgit2,sygool\/libgit2,MrHacky\/libgit2,Corillian\/libgit2,dleehr\/libgit2,kissthink\/libgit2,since2014\/libgit2,Corillian\/libgit2,JIghtuse\/libgit2,swisspol\/DEMO-libgit2,stewid\/libgit2,MrHacky\/libgit2,saurabhsuniljain\/libgit2,chiayolin\/libgit2,jeffhostetler\/public_libgit2,kissthink\/libgit2,leoyanggit\/libgit2,mingyaaaa\/libgit2,nokiddin\/libgit2,jflesch\/libgit2-mariadb,mhp\/libgit2,nokiddin\/libgit2,skabel\/manguse,sim0629\/libgit2,spraints\/libgit2,oaastest\/libgit2,mingyaaaa\/libgit2,spraints\/libgit2,jeffhostetler\/public_libgit2,kissthink\/libgit2,oaastest\/libgit2,t0xicCode\/libgit2,Tousiph\/Demo1,whoisj\/libgit2,nokiddin\/libgit2,rcorre\/libgit2,stewid\/libgit2,KTXSoftware\/libgit2,iankronquist\/libgit2,mhp\/libgit2,Aorjoa\/libgit2_maked_lib,mrksrm\/Mingijura,joshtriplett\/libgit2,yongthecoder\/libgit2,sygool\/libgit2,yosefhackmon\/libgit2,mhp\/libgit2,ardumont\/libgit2,t0xicCode\/libgit2,Corillian\/libgit2,maxiaoqian\/libgit2,Aorjoa\/libgit2_maked_lib,yosefhackmon\/libgit2,kenprice\/libgit2,evhan\/libgit2,kissthink\/libgit2,joshtriplett\/libgit2,since2014\/libgit2,Snazz2001\/libgit2,jeffhostetler\/public_libgit2,nacho\/libgit2,JIghtuse\/libgit2,t0xicCode\/libgit2,raybrad\/libit2,stewid\/libgit2,ardumont\/libgit2,ardumont\/libgit2,claudelee\/libgit2,chiayolin\/libgit2,kissthink\/libgit2,mingyaaaa\/libgit2,kenprice\/libgit2,spraints\/libgit2,KTXSoftware\/libgit2,mcanthony\/libgit2,sim0629\/libgit2,mrksrm\/Mingijura,claudelee\/libgit2,linquize\/libgit2,kenprice\/libgit2,mrksrm\/Mingijura,yongthecoder\/libgit2,magnus98\/TEST,Snazz2001\/libgit2,Aorjoa\/libgit2_maked_lib,JIghtuse\/libgit2,whoisj\/libgit2,saurabhsuniljain\/libgit2,mhp\/libgit2,raybrad\/libit2,mcanthony\/libgit2,JIghtuse\/libgit2,whoisj\/libgit2,joshtriplett\/libgit2,zodiac\/libgit2.js,nacho\/libgit2,chiayolin\/libgit2,sim0629\/libgit2,falqas\/libgit2,KTXSoftware\/libgit2,skabel\/manguse,Corillian\/libgit2,zodiac\/libgit2.js,Aorjoa\/libgit2_maked_lib,linquize\/libgit2,leoyanggit\/libgit2,raybrad\/libit2,falqas\/libgit2,since2014\/libgit2,JIghtuse\/libgit2,t0xicCode\/libgit2,magnus98\/TEST,claudelee\/libgit2,chiayolin\/libgit2,amyvmiwei\/libgit2,Tousiph\/Demo1,JIghtuse\/libgit2,Corillian\/libgit2,linquize\/libgit2,Tousiph\/Demo1,jamieleecool\/ptest,falqas\/libgit2,zodiac\/libgit2.js,whoisj\/libgit2,yongthecoder\/libgit2,Corillian\/libgit2,mingyaaaa\/libgit2,joshtriplett\/libgit2,mhp\/libgit2,linquize\/libgit2,mingyaaaa\/libgit2,iankronquist\/libgit2,skabel\/manguse,nacho\/libgit2,sygool\/libgit2,dleehr\/libgit2,claudelee\/libgit2,dleehr\/libgit2,jamieleecool\/ptest,leoyanggit\/libgit2,rcorre\/libgit2,nokiddin\/libgit2,whoisj\/libgit2,joshtriplett\/libgit2,maxiaoqian\/libgit2,sygool\/libgit2,Tousiph\/Demo1,yongthecoder\/libgit2,evhan\/libgit2,jflesch\/libgit2-mariadb,amyvmiwei\/libgit2,oaastest\/libgit2,stewid\/libgit2,magnus98\/TEST,oaastest\/libgit2,spraints\/libgit2,Snazz2001\/libgit2,spraints\/libgit2,Snazz2001\/libgit2,t0xicCode\/libgit2,mcanthony\/libgit2,kenprice\/libgit2,evhan\/libgit2,mingyaaaa\/libgit2,KTXSoftware\/libgit2,Snazz2001\/libgit2,saurabhsuniljain\/libgit2,iankronquist\/libgit2,mrksrm\/Mingijura,rcorre\/libgit2,jflesch\/libgit2-mariadb,oaastest\/libgit2,claudelee\/libgit2,jeffhostetler\/public_libgit2,MrHacky\/libgit2,stewid\/libgit2,sim0629\/libgit2,jamieleecool\/ptest,raybrad\/libit2,falqas\/libgit2,jamieleecool\/ptest,swisspol\/DEMO-libgit2,joshtriplett\/libgit2,amyvmiwei\/libgit2,saurabhsuniljain\/libgit2,sygool\/libgit2,t0xicCode\/libgit2,yosefhackmon\/libgit2,raybrad\/libit2,jflesch\/libgit2-mariadb,sim0629\/libgit2,evhan\/libgit2,Tousiph\/Demo1,oaastest\/libgit2,swisspol\/DEMO-libgit2,kissthink\/libgit2,sygool\/libgit2,sim0629\/libgit2,zodiac\/libgit2.js,kenprice\/libgit2,jeffhostetler\/public_libgit2,leoyanggit\/libgit2,zodiac\/libgit2.js,falqas\/libgit2,mcanthony\/libgit2,falqas\/libgit2,KTXSoftware\/libgit2,magnus98\/TEST,dleehr\/libgit2,mcanthony\/libgit2,jflesch\/libgit2-mariadb,jflesch\/libgit2-mariadb,swisspol\/DEMO-libgit2,linquize\/libgit2,iankronquist\/libgit2,ardumont\/libgit2,ardumont\/libgit2,since2014\/libgit2,magnus98\/TEST,saurabhsuniljain\/libgit2,nokiddin\/libgit2,since2014\/libgit2,yosefhackmon\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -1,388 +1,388 @@\n-\/*\r\n- * This file is free software; you can redistribute it and\/or modify\r\n- * it under the terms of the GNU General Public License, version 2,\r\n- * as published by the Free Software Foundation.\r\n- *\r\n- * In addition to the permissions in the GNU General Public License,\r\n- * the authors give you unlimited permission to link the compiled\r\n- * version of this file into combinations with other programs,\r\n- * and to distribute those combinations without any restriction\r\n- * coming from the use of this file. (The General Public License\r\n- * restrictions do apply in other respects; for example, they cover\r\n- * modification of the file, and distribution when not linked into\r\n- * a combined executable.)\r\n- *\r\n- * This file is distributed in the hope that it will be useful, but\r\n- * WITHOUT ANY WARRANTY; without even the implied warranty of\r\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r\n- * General Public License for more details.\r\n- *\r\n- * You should have received a copy of the GNU General Public License\r\n- * along with this program; see the file COPYING. If not, write to\r\n- * the Free Software Foundation, 51 Franklin Street, Fifth Floor,\r\n- * Boston, MA 02110-1301, USA.\r\n- *\/\r\n-\r\n-#include \"common.h\"\r\n-#include \"fileops.h\"\r\n-#include \"hashtable.h\"\r\n-#include \"config.h\"\r\n-\r\n-#include <ctype.h>\r\n-\r\n-\r\n-uint32_t config_table_hash(const void *key)\r\n-{\r\n-\tconst char *var_name = (char *)key;\r\n-\treturn git__hash(key, strlen(var_name), 0x5273eae3);\r\n-}\r\n-\r\n-int config_table_haskey(void *object, const void *key)\r\n-{\r\n-\tgit_config_var *var = (git_config_var *)object;\r\n-\tconst char *var_name = (const char *)key;\r\n-\r\n-\treturn (strcmp(var->name, var_name) == 0);\r\n-}\r\n-\r\n-int git_config_open(git_config **cfg_out, const char *path)\r\n-{\r\n-\tgit_config *cfg;\r\n-\r\n-\tassert(cfg_out && path);\r\n-\r\n-\tcfg = git__malloc(sizeof(git_config));\r\n-\tif (cfg == NULL)\r\n-\t\treturn GIT_ENOMEM;\r\n-\r\n-\tmemset(cfg, 0x0, sizeof(git_config));\r\n-\r\n-\tcfg->file_path = git__strdup(path);\r\n-\tif (cfg->file_path == NULL)\r\n-\t\treturn GIT_ENOMEM;\r\n-\r\n-\tcfg->vars = git_hashtable_alloc(16, config_table_hash, config_table_haskey);\r\n-\tif (cfg->vars == NULL)\r\n-\t\treturn GIT_ENOMEM;\r\n-\r\n-\t*cfg_out = cfg;\r\n-\treturn GIT_SUCCESS;\r\n-}\r\n-\r\n-void git_config_free(git_config *cfg)\r\n-{\r\n-\tif (cfg == NULL)\r\n-\t\treturn;\r\n-\r\n-\tfree(cfg->file_path);\r\n-\tgit_hashtable_free(cfg->vars);\r\n-\tgitfo_free_buf(&cfg->reader.buffer);\r\n-\r\n-\tfree(cfg);\r\n-}\r\n-\r\n-static int cfg_getchar_raw(git_config *cfg)\r\n-{\r\n-\tint c;\r\n-\r\n-\tc = *cfg->reader.read_ptr++;\r\n-\r\n-\t\/*\r\n-\tWin 32 line breaks: if we find a \\r\\n sequence,\r\n-\treturn only the \\n as a newline\r\n-\t*\/\r\n-\tif (c == '\\r' && *cfg->reader.read_ptr == '\\n') {\r\n-\t\tcfg->reader.read_ptr++;\r\n-\t\tc = '\\n';\r\n-\t}\r\n-\r\n-\tif (c == '\\n')\r\n-\t\tcfg->reader.line_number++;\r\n-\r\n-\tif (c == 0) {\r\n-\t\tcfg->reader.eof = 1;\r\n-\t\tc = '\\n';\r\n-\t}\r\n-\r\n-\treturn c;\r\n-}\r\n-\r\n-#define SKIP_WHITESPACE (1 << 1)\r\n-#define SKIP_COMMENTS (1 << 2)\r\n-\r\n-static int cfg_getchar(git_config *cfg_file, int flags)\r\n-{\r\n-\tconst int skip_whitespace = (flags & SKIP_WHITESPACE);\r\n-\tconst int skip_comments = (flags & SKIP_COMMENTS);\r\n-\tint c;\r\n-\r\n-\tassert(cfg_file->reader.read_ptr);\r\n-\r\n-\tdo c = cfg_getchar_raw(cfg_file);\r\n-\twhile (skip_whitespace && isspace(c));\r\n-\r\n-\tif (skip_comments && (c == '#' || c == ';')) {\r\n- \tdo c = cfg_getchar_raw(cfg_file);\r\n- \twhile (c != '\\n');\r\n-\t}\r\n-\r\n-\treturn c;\r\n-}\r\n-\r\n-static const char *LINEBREAK_UNIX = \"\\\\\\n\";\r\n-static const char *LINEBREAK_WIN32 = \"\\\\\\r\\n\";\r\n-\r\n-static int is_linebreak(const char *pos)\r\n-{\r\n-\treturn\tmemcmp(pos - 1, LINEBREAK_UNIX, sizeof(LINEBREAK_UNIX)) == 0 ||\r\n-\t\t\tmemcmp(pos - 2, LINEBREAK_WIN32, sizeof(LINEBREAK_WIN32)) == 0;\r\n-}\r\n-\r\n-static char *cfg_readline(git_config *cfg)\r\n-{\r\n-\tchar *line = NULL;\r\n-\tchar *line_src, *line_end;\r\n-\tint line_len;\r\n-\r\n-\tline_src = cfg->reader.read_ptr;\r\n- line_end = strchr(line_src, '\\n');\r\n-\r\n-\twhile (is_linebreak(line_end))\r\n-\t\tline_end = strchr(line_end + 1, '\\n');\r\n-\r\n- \/* no newline at EOF *\/\r\n-\tif (line_end == NULL)\r\n-\t\tline_end = strchr(line_src, 0);\r\n-\r\n-\twhile (line_src < line_end && isspace(*line_src))\r\n-\t\tline_src++;\r\n-\r\n-\tline = (char *)git__malloc((size_t)(line_end - line_src) + 1);\r\n-\tif (line == NULL)\r\n-\t\treturn NULL;\r\n-\r\n-\tline_len = 0;\r\n-\twhile (line_src < line_end) {\r\n-\r\n-\t\tif (memcmp(line_src, LINEBREAK_UNIX, sizeof(LINEBREAK_UNIX)) == 0) {\r\n-\t\t\tline_src += sizeof(LINEBREAK_UNIX);\r\n-\t\t\tcontinue;\r\n-\t\t}\r\n-\r\n-\t\tif (memcmp(line_src, LINEBREAK_WIN32, sizeof(LINEBREAK_WIN32)) == 0) {\r\n-\t\t\tline_src += sizeof(LINEBREAK_WIN32);\r\n-\t\t\tcontinue;\r\n-\t\t}\r\n-\r\n-\t\tline[line_len++] = *line_src++;\r\n-\t}\r\n-\r\n-\tline[line_len] = '\\0';\r\n-\r\n-\twhile (--line_len >= 0 && isspace(line[line_len]))\r\n-\t\tline[line_len] = '\\0';\r\n-\r\n-\tif (*line_end == '\\n')\r\n-\t\tline_end++;\r\n-\r\n-\tif (*line_end == '\\0')\r\n-\t\tcfg->reader.eof = 1;\r\n-\r\n-\tcfg->reader.line_number++;\r\n-\tcfg->reader.read_ptr = line_end;\r\n-\r\n-\treturn line;\r\n-}\r\n-\r\n-static inline int config_keychar(int c)\r\n-{\r\n-\treturn isalnum(c) || c == '-';\r\n-}\r\n-\r\n-static char *parse_section_header_ext(char *base_name, git_config *cfg)\r\n-{\r\n-\treturn base_name;\r\n-}\r\n-\r\n-static int parse_section_header(char **section_out, const char *line)\r\n-{\r\n-\tchar *name, *name_start, *name_end;\r\n-\tint name_length, c;\r\n-\r\n-\t\/* find the end of the variable's name *\/\r\n-\tname_end = strchr(name_start, ']');\r\n-\tif (name_end == NULL)\r\n-\t\treturn NULL;\r\n-\r\n-\tname = (char *)git__malloc((size_t)(name_end - name_start) + 1);\r\n-\tif (name == NULL)\r\n-\t\treturn NULL;\r\n-\r\n-\tname_length = 0;\r\n-\tc = cfg_getchar(cfg, SKIP_WHITESPACE | SKIP_COMMENTS);\r\n-\r\n-\tdo {\r\n-\t\tif (cfg->reader.eof)\r\n-\t\t\tgoto error;\r\n-\r\n-\t\tif (isspace(c))\r\n-\t\t\treturn parse_section_name_ext(name, cfg);\r\n-\r\n-\t\tif (!config_keychar(c) && c != '.')\r\n-\t\t\tgoto error;\r\n-\r\n-\t\tname[name_length++] = tolower(c);\r\n-\r\n-\t} while ((c = cfg_getchar(cfg, SKIP_COMMENTS)) != ']');\r\n-\t\r\n-\tname[name_length] = 0;\r\n-\treturn name;\r\n-\r\n-error:\r\n-\tfree(name);\r\n-\treturn NULL;\r\n-}\r\n-\r\n-static int skip_bom(git_config *cfg)\r\n-{\r\n-\tstatic const unsigned char *utf8_bom = \"\\xef\\xbb\\xbf\";\r\n-\r\n-\tif (memcmp(cfg->reader.read_ptr, utf8_bom, sizeof(utf8_bom)) == 0)\r\n-\t\tcfg->reader.read_ptr += sizeof(utf8_bom);\r\n-\r\n-\t\/* TODO: the reference implementation does pretty stupid\r\n-\t\tshit with the BoM\r\n-\t*\/\r\n-\r\n-\treturn GIT_SUCCESS;\r\n-}\r\n-\r\n-\/*\r\n-\t(* basic types *)\r\n-\tdigit = \"0\"..\"9\"\r\n-\tinteger = digit { digit }\r\n-\talphabet = \"a\"..\"z\" + \"A\" .. \"Z\"\r\n-\r\n-\tsection_char = alphabet | \".\" | \"-\"\r\n-\textension_char = (* any character except newline *)\r\n-\tany_char = (* any character *)\r\n-\tvariable_char = \"alphabet\" | \"-\"\r\n-\r\n-\r\n-\t(* actual grammar *)\r\n-\tconfig = { section }\r\n-\r\n-\tsection = header { definition }\r\n-\r\n-\theader = \"[\" section [subsection | subsection_ext] \"]\"\r\n-\r\n-\tsubsection = \".\" section\r\n-\tsubsection_ext = \"\\\"\" extension \"\\\"\"\r\n-\r\n-\tsection = section_char { section_char }\r\n-\textension = extension_char { extension_char }\r\n-\r\n-\tdefinition = variable_name [\"=\" variable_value] \"\\n\"\r\n-\r\n-\tvariable_name = variable_char { variable_char }\r\n-\tvariable_value = string | boolean | integer\r\n-\r\n-\tstring = quoted_string | plain_string\r\n-\tquoted_string = \"\\\"\" plain_string \"\\\"\"\r\n-\tplain_string = { any_char }\r\n-\r\n-\tboolean = boolean_true | boolean_false\r\n-\tboolean_true = \"yes\" | \"1\" | \"true\" | \"on\"\r\n-\tboolean_false = \"no\" | \"0\" | \"false\" | \"off\"\r\n-*\/\r\n-\r\n-static void strip_comments(char *line)\r\n-{\r\n-\tint quote_count = 0;\r\n-\tchar *ptr;\r\n-\r\n-\tfor (ptr = line; *ptr; ++ptr) {\r\n-\t\tif (ptr[0] == '\"' && ptr > line && ptr[-1] != '\\\\')\r\n-\t\t\tquote_count++;\r\n-\r\n-\t\tif ((ptr[0] == ';' || ptr[0] == '#') && (quote_count % 2) == 0) {\r\n-\t\t\tptr[0] = '\\0';\r\n-\t\t\tbreak;\r\n-\t\t}\r\n-\t}\r\n-\r\n-\tif (isspace(ptr[-1])) {\r\n-\t\t\/* TODO skip whitespace *\/\r\n-\t}\r\n-}\r\n-\r\n-static int config_parse(git_config *cfg_file)\r\n-{\r\n-\tint error = GIT_SUCCESS;\r\n-\tchar *current_section = NULL;\r\n-\r\n-\tskip_bom(cfg_file);\r\n-\r\n-\twhile (error == GIT_SUCCESS && !cfg_file->reader.eof) {\r\n-\r\n-\t\tchar *line = cfg_readline(cfg_file);\r\n-\r\n-\t\t\/* not enough memory to allocate line *\/\r\n-\t\tif (line == NULL)\r\n-\t\t\treturn GIT_ENOMEM;\r\n-\r\n-\t\tstrip_comments(line);\r\n-\r\n-\t\tswitch (line[0]) {\r\n-\t\tcase '\\0': \/* empty line (only whitespace) *\/\r\n-\t\t\tbreak;\r\n-\r\n-\t\tcase '[': \/* section header, new section begins *\/\r\n-\t\t\terror = parse_section_header(¤t_section, line);\r\n-\t\t\tbreak;\r\n-\r\n-\t\tdefault: \/* assume variable declaration *\/\r\n-\t\t\terror = parse_variable(cfg_file, current_section, line);\r\n-\t\t\tbreak;\r\n-\t\t}\r\n-\r\n-\t\tfree(line);\r\n-\t}\r\n-\t\r\n-\treturn error;\r\n-}\r\n-\r\n-static int parse_variable(git_config *cfg, const char *section_name, const char *line)\r\n-{\r\n-\tint error;\r\n-\tint has_value = 1;\r\n-\r\n-\tconst char *var_end = NULL;\r\n-\tconst char *value_start = NULL;\r\n-\r\n-\tvar_end = strchr(line, '=');\r\n-\r\n-\tif (var_end == NULL)\r\n-\t\tvar_end = strchr(line, '\\0');\r\n-\telse\r\n-\t\tvalue_start = var_end + 1;\r\n-\r\n-\tif (isspace(var_end[-1])) {\r\n-\t\tdo var_end--;\r\n-\t\twhile (isspace(var_end[0]));\r\n-\t}\r\n-\r\n-\tif (value_start != NULL) {\r\n-\r\n-\t\twhile (isspace(value_start[0]))\r\n-\t\t\tvalue_start++;\r\n-\r\n-\t\tif (value_start[0] == '\\0')\r\n-\t\t\tgoto error;\r\n-\t}\r\n-\r\n-\treturn GIT_SUCCESS;\r\n-\r\n-error:\r\n-\treturn GIT_EOBJCORRUPTED;\r\n-}\r\n+\/*\n+ * This file is free software; you can redistribute it and\/or modify\n+ * it under the terms of the GNU General Public License, version 2,\n+ * as published by the Free Software Foundation.\n+ *\n+ * In addition to the permissions in the GNU General Public License,\n+ * the authors give you unlimited permission to link the compiled\n+ * version of this file into combinations with other programs,\n+ * and to distribute those combinations without any restriction\n+ * coming from the use of this file. (The General Public License\n+ * restrictions do apply in other respects; for example, they cover\n+ * modification of the file, and distribution when not linked into\n+ * a combined executable.)\n+ *\n+ * This file is distributed in the hope that it will be useful, but\n+ * WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU General Public License\n+ * along with this program; see the file COPYING. If not, write to\n+ * the Free Software Foundation, 51 Franklin Street, Fifth Floor,\n+ * Boston, MA 02110-1301, USA.\n+ *\/\n+\n+#include \"common.h\"\n+#include \"fileops.h\"\n+#include \"hashtable.h\"\n+#include \"config.h\"\n+\n+#include <ctype.h>\n+\n+\n+uint32_t config_table_hash(const void *key)\n+{\n+\tconst char *var_name = (char *)key;\n+\treturn git__hash(key, strlen(var_name), 0x5273eae3);\n+}\n+\n+int config_table_haskey(void *object, const void *key)\n+{\n+\tgit_config_var *var = (git_config_var *)object;\n+\tconst char *var_name = (const char *)key;\n+\n+\treturn (strcmp(var->name, var_name) == 0);\n+}\n+\n+int git_config_open(git_config **cfg_out, const char *path)\n+{\n+\tgit_config *cfg;\n+\n+\tassert(cfg_out && path);\n+\n+\tcfg = git__malloc(sizeof(git_config));\n+\tif (cfg == NULL)\n+\t\treturn GIT_ENOMEM;\n+\n+\tmemset(cfg, 0x0, sizeof(git_config));\n+\n+\tcfg->file_path = git__strdup(path);\n+\tif (cfg->file_path == NULL)\n+\t\treturn GIT_ENOMEM;\n+\n+\tcfg->vars = git_hashtable_alloc(16, config_table_hash, config_table_haskey);\n+\tif (cfg->vars == NULL)\n+\t\treturn GIT_ENOMEM;\n+\n+\t*cfg_out = cfg;\n+\treturn GIT_SUCCESS;\n+}\n+\n+void git_config_free(git_config *cfg)\n+{\n+\tif (cfg == NULL)\n+\t\treturn;\n+\n+\tfree(cfg->file_path);\n+\tgit_hashtable_free(cfg->vars);\n+\tgitfo_free_buf(&cfg->reader.buffer);\n+\n+\tfree(cfg);\n+}\n+\n+static int cfg_getchar_raw(git_config *cfg)\n+{\n+\tint c;\n+\n+\tc = *cfg->reader.read_ptr++;\n+\n+\t\/*\n+\tWin 32 line breaks: if we find a \\r\\n sequence,\n+\treturn only the \\n as a newline\n+\t*\/\n+\tif (c == '\\r' && *cfg->reader.read_ptr == '\\n') {\n+\t\tcfg->reader.read_ptr++;\n+\t\tc = '\\n';\n+\t}\n+\n+\tif (c == '\\n')\n+\t\tcfg->reader.line_number++;\n+\n+\tif (c == 0) {\n+\t\tcfg->reader.eof = 1;\n+\t\tc = '\\n';\n+\t}\n+\n+\treturn c;\n+}\n+\n+#define SKIP_WHITESPACE (1 << 1)\n+#define SKIP_COMMENTS (1 << 2)\n+\n+static int cfg_getchar(git_config *cfg_file, int flags)\n+{\n+\tconst int skip_whitespace = (flags & SKIP_WHITESPACE);\n+\tconst int skip_comments = (flags & SKIP_COMMENTS);\n+\tint c;\n+\n+\tassert(cfg_file->reader.read_ptr);\n+\n+\tdo c = cfg_getchar_raw(cfg_file);\n+\twhile (skip_whitespace && isspace(c));\n+\n+\tif (skip_comments && (c == '#' || c == ';')) {\n+\t\tdo c = cfg_getchar_raw(cfg_file);\n+\t\twhile (c != '\\n');\n+\t}\n+\n+\treturn c;\n+}\n+\n+static const char *LINEBREAK_UNIX = \"\\\\\\n\";\n+static const char *LINEBREAK_WIN32 = \"\\\\\\r\\n\";\n+\n+static int is_linebreak(const char *pos)\n+{\n+\treturn\tmemcmp(pos - 1, LINEBREAK_UNIX, sizeof(LINEBREAK_UNIX)) == 0 ||\n+\t\t\tmemcmp(pos - 2, LINEBREAK_WIN32, sizeof(LINEBREAK_WIN32)) == 0;\n+}\n+\n+static char *cfg_readline(git_config *cfg)\n+{\n+\tchar *line = NULL;\n+\tchar *line_src, *line_end;\n+\tint line_len;\n+\n+\tline_src = cfg->reader.read_ptr;\n+ line_end = strchr(line_src, '\\n');\n+\n+\twhile (is_linebreak(line_end))\n+\t\tline_end = strchr(line_end + 1, '\\n');\n+\n+ \/* no newline at EOF *\/\n+\tif (line_end == NULL)\n+\t\tline_end = strchr(line_src, 0);\n+\n+\twhile (line_src < line_end && isspace(*line_src))\n+\t\tline_src++;\n+\n+\tline = (char *)git__malloc((size_t)(line_end - line_src) + 1);\n+\tif (line == NULL)\n+\t\treturn NULL;\n+\n+\tline_len = 0;\n+\twhile (line_src < line_end) {\n+\n+\t\tif (memcmp(line_src, LINEBREAK_UNIX, sizeof(LINEBREAK_UNIX)) == 0) {\n+\t\t\tline_src += sizeof(LINEBREAK_UNIX);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tif (memcmp(line_src, LINEBREAK_WIN32, sizeof(LINEBREAK_WIN32)) == 0) {\n+\t\t\tline_src += sizeof(LINEBREAK_WIN32);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tline[line_len++] = *line_src++;\n+\t}\n+\n+\tline[line_len] = '\\0';\n+\n+\twhile (--line_len >= 0 && isspace(line[line_len]))\n+\t\tline[line_len] = '\\0';\n+\n+\tif (*line_end == '\\n')\n+\t\tline_end++;\n+\n+\tif (*line_end == '\\0')\n+\t\tcfg->reader.eof = 1;\n+\n+\tcfg->reader.line_number++;\n+\tcfg->reader.read_ptr = line_end;\n+\n+\treturn line;\n+}\n+\n+static inline int config_keychar(int c)\n+{\n+\treturn isalnum(c) || c == '-';\n+}\n+\n+static char *parse_section_header_ext(char *base_name, git_config *cfg)\n+{\n+\treturn base_name;\n+}\n+\n+static int parse_section_header(char **section_out, const char *line)\n+{\n+\tchar *name, *name_start, *name_end;\n+\tint name_length, c;\n+\n+\t\/* find the end of the variable's name *\/\n+\tname_end = strchr(name_start, ']');\n+\tif (name_end == NULL)\n+\t\treturn NULL;\n+\n+\tname = (char *)git__malloc((size_t)(name_end - name_start) + 1);\n+\tif (name == NULL)\n+\t\treturn NULL;\n+\n+\tname_length = 0;\n+\tc = cfg_getchar(cfg, SKIP_WHITESPACE | SKIP_COMMENTS);\n+\n+\tdo {\n+\t\tif (cfg->reader.eof)\n+\t\t\tgoto error;\n+\n+\t\tif (isspace(c))\n+\t\t\treturn parse_section_name_ext(name, cfg);\n+\n+\t\tif (!config_keychar(c) && c != '.')\n+\t\t\tgoto error;\n+\n+\t\tname[name_length++] = tolower(c);\n+\n+\t} while ((c = cfg_getchar(cfg, SKIP_COMMENTS)) != ']');\n+\n+\tname[name_length] = 0;\n+\treturn name;\n+\n+error:\n+\tfree(name);\n+\treturn NULL;\n+}\n+\n+static int skip_bom(git_config *cfg)\n+{\n+\tstatic const unsigned char *utf8_bom = \"\\xef\\xbb\\xbf\";\n+\n+\tif (memcmp(cfg->reader.read_ptr, utf8_bom, sizeof(utf8_bom)) == 0)\n+\t\tcfg->reader.read_ptr += sizeof(utf8_bom);\n+\n+\t\/* TODO: the reference implementation does pretty stupid\n+\t\tshit with the BoM\n+\t*\/\n+\n+\treturn GIT_SUCCESS;\n+}\n+\n+\/*\n+\t(* basic types *)\n+\tdigit = \"0\"..\"9\"\n+\tinteger = digit { digit }\n+\talphabet = \"a\"..\"z\" + \"A\" .. \"Z\"\n+\n+\tsection_char = alphabet | \".\" | \"-\"\n+\textension_char = (* any character except newline *)\n+\tany_char = (* any character *)\n+\tvariable_char = \"alphabet\" | \"-\"\n+\n+\n+\t(* actual grammar *)\n+\tconfig = { section }\n+\n+\tsection = header { definition }\n+\n+\theader = \"[\" section [subsection | subsection_ext] \"]\"\n+\n+\tsubsection = \".\" section\n+\tsubsection_ext = \"\\\"\" extension \"\\\"\"\n+\n+\tsection = section_char { section_char }\n+\textension = extension_char { extension_char }\n+\n+\tdefinition = variable_name [\"=\" variable_value] \"\\n\"\n+\n+\tvariable_name = variable_char { variable_char }\n+\tvariable_value = string | boolean | integer\n+\n+\tstring = quoted_string | plain_string\n+\tquoted_string = \"\\\"\" plain_string \"\\\"\"\n+\tplain_string = { any_char }\n+\n+\tboolean = boolean_true | boolean_false\n+\tboolean_true = \"yes\" | \"1\" | \"true\" | \"on\"\n+\tboolean_false = \"no\" | \"0\" | \"false\" | \"off\"\n+*\/\n+\n+static void strip_comments(char *line)\n+{\n+\tint quote_count = 0;\n+\tchar *ptr;\n+\n+\tfor (ptr = line; *ptr; ++ptr) {\n+\t\tif (ptr[0] == '\"' && ptr > line && ptr[-1] != '\\\\')\n+\t\t\tquote_count++;\n+\n+\t\tif ((ptr[0] == ';' || ptr[0] == '#') && (quote_count % 2) == 0) {\n+\t\t\tptr[0] = '\\0';\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (isspace(ptr[-1])) {\n+\t\t\/* TODO skip whitespace *\/\n+\t}\n+}\n+\n+static int config_parse(git_config *cfg_file)\n+{\n+\tint error = GIT_SUCCESS;\n+\tchar *current_section = NULL;\n+\n+\tskip_bom(cfg_file);\n+\n+\twhile (error == GIT_SUCCESS && !cfg_file->reader.eof) {\n+\n+\t\tchar *line = cfg_readline(cfg_file);\n+\n+\t\t\/* not enough memory to allocate line *\/\n+\t\tif (line == NULL)\n+\t\t\treturn GIT_ENOMEM;\n+\n+\t\tstrip_comments(line);\n+\n+\t\tswitch (line[0]) {\n+\t\tcase '\\0': \/* empty line (only whitespace) *\/\n+\t\t\tbreak;\n+\n+\t\tcase '[': \/* section header, new section begins *\/\n+\t\t\terror = parse_section_header(¤t_section, line);\n+\t\t\tbreak;\n+\n+\t\tdefault: \/* assume variable declaration *\/\n+\t\t\terror = parse_variable(cfg_file, current_section, line);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tfree(line);\n+\t}\n+\n+\treturn error;\n+}\n+\n+static int parse_variable(git_config *cfg, const char *section_name, const char *line)\n+{\n+\tint error;\n+\tint has_value = 1;\n+\n+\tconst char *var_end = NULL;\n+\tconst char *value_start = NULL;\n+\n+\tvar_end = strchr(line, '=');\n+\n+\tif (var_end == NULL)\n+\t\tvar_end = strchr(line, '\\0');\n+\telse\n+\t\tvalue_start = var_end + 1;\n+\n+\tif (isspace(var_end[-1])) {\n+\t\tdo var_end--;\n+\t\twhile (isspace(var_end[0]));\n+\t}\n+\n+\tif (value_start != NULL) {\n+\n+\t\twhile (isspace(value_start[0]))\n+\t\t\tvalue_start++;\n+\n+\t\tif (value_start[0] == '\\0')\n+\t\t\tgoto error;\n+\t}\n+\n+\treturn GIT_SUCCESS;\n+\n+error:\n+\treturn GIT_EOBJCORRUPTED;\n+}\n"} {"commit":"be7b4641539b8963edc80d2f71a0bb8b99cdba64","subject":"CONFIG SET\/GET support for loglevel","message":"CONFIG SET\/GET support for loglevel\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -483,6 +483,18 @@\n } else if (!strcasecmp(c->argv[2]->ptr,\"slowlog-max-len\")) {\n if (getLongLongFromObject(o,&ll) == REDIS_ERR || ll < 0) goto badfmt;\n server.slowlog_max_len = (unsigned)ll;\n+ } else if (!strcasecmp(c->argv[2]->ptr,\"loglevel\")) {\n+ if (!strcasecmp(o->ptr,\"warning\")) {\n+ server.verbosity = REDIS_WARNING;\n+ } else if (!strcasecmp(o->ptr,\"notice\")) {\n+ server.verbosity = REDIS_NOTICE;\n+ } else if (!strcasecmp(o->ptr,\"verbose\")) {\n+ server.verbosity = REDIS_VERBOSE;\n+ } else if (!strcasecmp(o->ptr,\"debug\")) {\n+ server.verbosity = REDIS_DEBUG;\n+ } else {\n+ goto badfmt;\n+ }\n } else {\n addReplyErrorFormat(c,\"Unsupported CONFIG parameter: %s\",\n (char*)c->argv[2]->ptr);\n@@ -666,6 +678,20 @@\n if (stringmatch(pattern,\"slowlog-max-len\",0)) {\n addReplyBulkCString(c,\"slowlog-max-len\");\n addReplyBulkLongLong(c,server.slowlog_max_len);\n+ matches++;\n+ }\n+ if (stringmatch(pattern,\"loglevel\",0)) {\n+ char *s;\n+\n+ switch(server.verbosity) {\n+ case REDIS_WARNING: s = \"warning\"; break;\n+ case REDIS_VERBOSE: s = \"verbose\"; break;\n+ case REDIS_NOTICE: s = \"notice\"; break;\n+ case REDIS_DEBUG: s = \"debug\"; break;\n+ default: s = \"unknown\"; break; \/* too harmless to panic *\/\n+ }\n+ addReplyBulkCString(c,\"loglevel\");\n+ addReplyBulkCString(c,s);\n matches++;\n }\n setDeferredMultiBulkLength(c,replylen,matches*2);\n"} {"commit":"88ed372ea07b7d2707a32ab17aa6e5be8c294c18","subject":"Fix line numbering, make a bad token in config only give a warning.","message":"Fix line numbering, make a bad token in config only give a warning.\n","repos":"kukrimate\/epoch,Subsentient\/epoch,Subsentient\/epoch,kukrimate\/epoch","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -46,7 +46,7 @@\n \tchar *ConfigStream = NULL, *Worker = NULL;\n \tObjTable *CurObj = NULL;\n \tchar DelimCurr[MAX_LINE_SIZE];\n-\tunsigned long LineNum = 0;\n+\tunsigned long LineNum = 1;\n \t\n \t\/*Get the file size of the config file.*\/\n \tif (stat(CONFIGDIR CONF_NAME, &FileStat) != 0)\n@@ -318,12 +318,12 @@\n \t\t\tcontinue;\n \t\t}\n \t\telse\n-\t\t{\n+\t\t{ \/*No big deal.*\/\n \t\t\tchar TmpBuf[1024];\n \t\t\tsnprintf(TmpBuf, 1024, \"Unidentified attribute in epoch.conf on line %lu.\", LineNum);\n-\t\t\tSpitError(TmpBuf);\n-\t\t\t\n-\t\t\treturn FAILURE;\n+\t\t\tSpitWarning(TmpBuf);\n+\t\t\t\n+\t\t\tcontinue;\n \t\t}\n \t} while (++LineNum, (Worker = NextLine(Worker)));\n \t\n"} {"commit":"f548eef9d3e485e67d01328aaad1a9ca96d9232a","subject":"config.c: remove trailing spaces, trim comments to 80 cols.","message":"config.c: remove trailing spaces, trim comments to 80 cols.\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -105,7 +105,7 @@\n {1024*1024*32, 1024*1024*8, 60} \/* pubsub *\/\n };\n \n-\/* Configuration values that require no special handling to set, get, load or \n+\/* Configuration values that require no special handling to set, get, load or\n * rewrite. *\/\n typedef struct boolConfigData {\n int *config; \/* The pointer to the server config this value is stored in *\/\n@@ -113,11 +113,10 @@\n } boolConfigData;\n \n typedef struct stringConfigData {\n- char **config; \/* The pointer to the server config this value is stored in *\/\n- const char *default_value; \/* The default value of the config on rewrite *\/\n- int convert_empty_to_null; \/* A boolean indicating if empty strings should \n+ char **config; \/* Pointer to the server config this value is stored in. *\/\n+ const char *default_value; \/* Default value of the config on rewrite. *\/\n+ int convert_empty_to_null; \/* Boolean indicating if empty strings should\n be stored as a NULL value. *\/\n- \n } stringConfigData;\n \n typedef struct enumConfigData {\n@@ -127,9 +126,9 @@\n } enumConfigData;\n \n typedef enum numericType {\n- NUMERIC_TYPE_INT, \n- NUMERIC_TYPE_LONG_LONG, \n- NUMERIC_TYPE_UNSIGNED_LONG, \n+ NUMERIC_TYPE_INT,\n+ NUMERIC_TYPE_LONG_LONG,\n+ NUMERIC_TYPE_UNSIGNED_LONG,\n NUMERIC_TYPE_SIZE_T\n } numericType;\n \n@@ -137,7 +136,7 @@\n union {\n int *i;\n long long *ll;\n- unsigned long *ul; \n+ unsigned long *ul;\n size_t *st;\n } config; \/* The pointer to the numeric config this value is stored in *\/\n int is_memory; \/* Indicates if this value can be loaded as a memory value *\/\n@@ -156,9 +155,9 @@\n \n typedef struct typeInterface {\n \/* Called on server start, should return 1 on success, 0 on error and should set err *\/\n- int (*load)(typeData data, sds *argc, int argv, char **err); \n+ int (*load)(typeData data, sds *argc, int argv, char **err);\n \/* Called on CONFIG SET, returns 1 on success, 0 on error *\/\n- int (*set)(typeData data, sds value); \n+ int (*set)(typeData data, sds value);\n \/* Called on CONFIG GET, required to add output to the client *\/\n void (*get)(client *c, typeData data);\n \/* Called on CONFIG REWRITE, required to rewrite the config state *\/\n@@ -282,7 +281,7 @@\n int match = 0;\n for (standardConfig *config = configs; config->name != NULL; config++) {\n if ((!strcasecmp(argv[0],config->name) ||\n- (config->alias && !strcasecmp(argv[0],config->alias)))) \n+ (config->alias && !strcasecmp(argv[0],config->alias))))\n {\n if (!config->interface.load(config->data, argv, argc, &err)) {\n goto loaderr;\n@@ -679,7 +678,7 @@\n \/* Iterate the configs that are standard *\/\n for (standardConfig *config = configs; config->name != NULL; config++) {\n if(config->modifiable && (!strcasecmp(c->argv[2]->ptr,config->name) ||\n- (config->alias && !strcasecmp(c->argv[2]->ptr,config->alias)))) \n+ (config->alias && !strcasecmp(c->argv[2]->ptr,config->alias))))\n {\n if (!config->interface.set(config->data,o->ptr)) {\n goto badfmt;\n@@ -1874,18 +1873,18 @@\n .rewrite = (rewritefn) \\\n },\n \n-\/* \n- * What follows is the generic config types that are supported. To add a new\n+\/* What follows is the generic config types that are supported. To add a new\n * config with one of these types, add it to the standardConfig table with\n * the creation macro for each type.\n- * \n+ *\n * Each type contains the following:\n * * A function defining how to load this type on startup.\n * * A function defining how to update this type on CONFIG SET.\n * * A function defining how to serialize this type on CONFIG SET.\n * * A function defining how to rewrite this type on CONFIG REWRITE.\n- * * A Macro defining how to create this type. \n+ * * A Macro defining how to create this type.\n *\/\n+\n \/* Bool Configs *\/\n static int boolConfigLoad(typeData data, sds *argv, int argc, char **err) {\n if (argc != 2) {\n@@ -2040,19 +2039,19 @@\n if (memerr || ll < 0) {\n *err = \"argument must be a memory value\";\n return 0;\n- } \n+ }\n } else {\n if (!string2ll(argv[1], sdslen(argv[1]),&ll)) {\n *err = \"argument couldn't be parsed into an integer\" ;\n- return 0; \n+ return 0;\n }\n }\n \n if (ll > data.numeric.upper_bound ||\n ll < data.numeric.lower_bound) {\n- snprintf(loadbuf, LOADBUF_SIZE, \n- \"argument must be between %lld and %lld inclusive\", \n- data.numeric.lower_bound, \n+ snprintf(loadbuf, LOADBUF_SIZE,\n+ \"argument must be between %lld and %lld inclusive\",\n+ data.numeric.lower_bound,\n data.numeric.upper_bound);\n *err = loadbuf;\n return 0;\n@@ -2178,103 +2177,103 @@\n \n standardConfig configs[] = {\n \/* Bool configs *\/\n- createBoolConfig(\"rdbchecksum\", NULL, IMMUTABLE_CONFIG, server.rdb_checksum, CONFIG_DEFAULT_RDB_CHECKSUM), \n+ createBoolConfig(\"rdbchecksum\", NULL, IMMUTABLE_CONFIG, server.rdb_checksum, CONFIG_DEFAULT_RDB_CHECKSUM),\n createBoolConfig(\"daemonize\", NULL, IMMUTABLE_CONFIG, server.daemonize, 0), \n createBoolConfig(\"io-threads-do-reads\", NULL, IMMUTABLE_CONFIG, server.io_threads_do_reads, CONFIG_DEFAULT_IO_THREADS_DO_READS),\n createBoolConfig(\"lua-replicate-commands\", NULL, IMMUTABLE_CONFIG, server.lua_always_replicate_commands, 1),\n- createBoolConfig(\"always-show-logo\", NULL, IMMUTABLE_CONFIG, server.always_show_logo, CONFIG_DEFAULT_ALWAYS_SHOW_LOGO), \n- createBoolConfig(\"protected-mode\", NULL, MODIFIABLE_CONFIG, server.protected_mode, CONFIG_DEFAULT_PROTECTED_MODE), \n- createBoolConfig(\"rdbcompression\", NULL, MODIFIABLE_CONFIG, server.rdb_compression, CONFIG_DEFAULT_RDB_COMPRESSION), \n- createBoolConfig(\"activerehashing\", NULL, MODIFIABLE_CONFIG, server.activerehashing, CONFIG_DEFAULT_ACTIVE_REHASHING), \n- createBoolConfig(\"stop-writes-on-bgsave-error\", NULL, MODIFIABLE_CONFIG, server.stop_writes_on_bgsave_err, CONFIG_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR), \n- createBoolConfig(\"dynamic-hz\", NULL, MODIFIABLE_CONFIG, server.dynamic_hz, CONFIG_DEFAULT_DYNAMIC_HZ), \n- createBoolConfig(\"lazyfree-lazy-eviction\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_eviction, CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION), \n- createBoolConfig(\"lazyfree-lazy-expire\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_expire, CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE), \n- createBoolConfig(\"lazyfree-lazy-server-del\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_server_del, CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL), \n- createBoolConfig(\"repl-disable-tcp-nodelay\", NULL, MODIFIABLE_CONFIG, server.repl_disable_tcp_nodelay, CONFIG_DEFAULT_REPL_DISABLE_TCP_NODELAY), \n- createBoolConfig(\"repl-diskless-sync\", NULL, MODIFIABLE_CONFIG, server.repl_diskless_sync, CONFIG_DEFAULT_REPL_DISKLESS_SYNC), \n- createBoolConfig(\"gopher-enabled\", NULL, MODIFIABLE_CONFIG, server.gopher_enabled, CONFIG_DEFAULT_GOPHER_ENABLED), \n- createBoolConfig(\"aof-rewrite-incremental-fsync\", NULL, MODIFIABLE_CONFIG, server.aof_rewrite_incremental_fsync, CONFIG_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC), \n- createBoolConfig(\"no-appendfsync-on-rewrite\", NULL, MODIFIABLE_CONFIG, server.aof_no_fsync_on_rewrite, CONFIG_DEFAULT_AOF_NO_FSYNC_ON_REWRITE), \n- createBoolConfig(\"cluster-require-full-coverage\", NULL, MODIFIABLE_CONFIG, server.cluster_require_full_coverage, CLUSTER_DEFAULT_REQUIRE_FULL_COVERAGE), \n- createBoolConfig(\"rdb-save-incremental-fsync\", NULL, MODIFIABLE_CONFIG, server.rdb_save_incremental_fsync, CONFIG_DEFAULT_RDB_SAVE_INCREMENTAL_FSYNC), \n- createBoolConfig(\"aof-load-truncated\", NULL, MODIFIABLE_CONFIG, server.aof_load_truncated, CONFIG_DEFAULT_AOF_LOAD_TRUNCATED), \n- createBoolConfig(\"aof-use-rdb-preamble\", NULL, MODIFIABLE_CONFIG, server.aof_use_rdb_preamble, CONFIG_DEFAULT_AOF_USE_RDB_PREAMBLE), \n- createBoolConfig(\"cluster-replica-no-failover\", \"cluster-slave-no-failover\", MODIFIABLE_CONFIG, server.cluster_slave_no_failover, CLUSTER_DEFAULT_SLAVE_NO_FAILOVER), \n- createBoolConfig(\"replica-lazy-flush\", \"slave-lazy-flush\", MODIFIABLE_CONFIG, server.repl_slave_lazy_flush, CONFIG_DEFAULT_SLAVE_LAZY_FLUSH), \n- createBoolConfig(\"replica-serve-stale-data\", \"slave-serve-stale-data\", MODIFIABLE_CONFIG, server.repl_serve_stale_data, CONFIG_DEFAULT_SLAVE_SERVE_STALE_DATA), \n- createBoolConfig(\"replica-read-only\", \"slave-read-only\", MODIFIABLE_CONFIG, server.repl_slave_ro, CONFIG_DEFAULT_SLAVE_READ_ONLY), \n- createBoolConfig(\"replica-ignore-maxmemory\", \"slave-ignore-maxmemory\", MODIFIABLE_CONFIG, server.repl_slave_ignore_maxmemory, CONFIG_DEFAULT_SLAVE_IGNORE_MAXMEMORY), \n- createBoolConfig(\"jemalloc-bg-thread\", NULL, MODIFIABLE_CONFIG, server.jemalloc_bg_thread, 1), \n+ createBoolConfig(\"always-show-logo\", NULL, IMMUTABLE_CONFIG, server.always_show_logo, CONFIG_DEFAULT_ALWAYS_SHOW_LOGO),\n+ createBoolConfig(\"protected-mode\", NULL, MODIFIABLE_CONFIG, server.protected_mode, CONFIG_DEFAULT_PROTECTED_MODE),\n+ createBoolConfig(\"rdbcompression\", NULL, MODIFIABLE_CONFIG, server.rdb_compression, CONFIG_DEFAULT_RDB_COMPRESSION),\n+ createBoolConfig(\"activerehashing\", NULL, MODIFIABLE_CONFIG, server.activerehashing, CONFIG_DEFAULT_ACTIVE_REHASHING),\n+ createBoolConfig(\"stop-writes-on-bgsave-error\", NULL, MODIFIABLE_CONFIG, server.stop_writes_on_bgsave_err, CONFIG_DEFAULT_STOP_WRITES_ON_BGSAVE_ERROR),\n+ createBoolConfig(\"dynamic-hz\", NULL, MODIFIABLE_CONFIG, server.dynamic_hz, CONFIG_DEFAULT_DYNAMIC_HZ),\n+ createBoolConfig(\"lazyfree-lazy-eviction\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_eviction, CONFIG_DEFAULT_LAZYFREE_LAZY_EVICTION),\n+ createBoolConfig(\"lazyfree-lazy-expire\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_expire, CONFIG_DEFAULT_LAZYFREE_LAZY_EXPIRE),\n+ createBoolConfig(\"lazyfree-lazy-server-del\", NULL, MODIFIABLE_CONFIG, server.lazyfree_lazy_server_del, CONFIG_DEFAULT_LAZYFREE_LAZY_SERVER_DEL),\n+ createBoolConfig(\"repl-disable-tcp-nodelay\", NULL, MODIFIABLE_CONFIG, server.repl_disable_tcp_nodelay, CONFIG_DEFAULT_REPL_DISABLE_TCP_NODELAY),\n+ createBoolConfig(\"repl-diskless-sync\", NULL, MODIFIABLE_CONFIG, server.repl_diskless_sync, CONFIG_DEFAULT_REPL_DISKLESS_SYNC),\n+ createBoolConfig(\"gopher-enabled\", NULL, MODIFIABLE_CONFIG, server.gopher_enabled, CONFIG_DEFAULT_GOPHER_ENABLED),\n+ createBoolConfig(\"aof-rewrite-incremental-fsync\", NULL, MODIFIABLE_CONFIG, server.aof_rewrite_incremental_fsync, CONFIG_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC),\n+ createBoolConfig(\"no-appendfsync-on-rewrite\", NULL, MODIFIABLE_CONFIG, server.aof_no_fsync_on_rewrite, CONFIG_DEFAULT_AOF_NO_FSYNC_ON_REWRITE),\n+ createBoolConfig(\"cluster-require-full-coverage\", NULL, MODIFIABLE_CONFIG, server.cluster_require_full_coverage, CLUSTER_DEFAULT_REQUIRE_FULL_COVERAGE),\n+ createBoolConfig(\"rdb-save-incremental-fsync\", NULL, MODIFIABLE_CONFIG, server.rdb_save_incremental_fsync, CONFIG_DEFAULT_RDB_SAVE_INCREMENTAL_FSYNC),\n+ createBoolConfig(\"aof-load-truncated\", NULL, MODIFIABLE_CONFIG, server.aof_load_truncated, CONFIG_DEFAULT_AOF_LOAD_TRUNCATED),\n+ createBoolConfig(\"aof-use-rdb-preamble\", NULL, MODIFIABLE_CONFIG, server.aof_use_rdb_preamble, CONFIG_DEFAULT_AOF_USE_RDB_PREAMBLE),\n+ createBoolConfig(\"cluster-replica-no-failover\", \"cluster-slave-no-failover\", MODIFIABLE_CONFIG, server.cluster_slave_no_failover, CLUSTER_DEFAULT_SLAVE_NO_FAILOVER),\n+ createBoolConfig(\"replica-lazy-flush\", \"slave-lazy-flush\", MODIFIABLE_CONFIG, server.repl_slave_lazy_flush, CONFIG_DEFAULT_SLAVE_LAZY_FLUSH),\n+ createBoolConfig(\"replica-serve-stale-data\", \"slave-serve-stale-data\", MODIFIABLE_CONFIG, server.repl_serve_stale_data, CONFIG_DEFAULT_SLAVE_SERVE_STALE_DATA),\n+ createBoolConfig(\"replica-read-only\", \"slave-read-only\", MODIFIABLE_CONFIG, server.repl_slave_ro, CONFIG_DEFAULT_SLAVE_READ_ONLY),\n+ createBoolConfig(\"replica-ignore-maxmemory\", \"slave-ignore-maxmemory\", MODIFIABLE_CONFIG, server.repl_slave_ignore_maxmemory, CONFIG_DEFAULT_SLAVE_IGNORE_MAXMEMORY),\n+ createBoolConfig(\"jemalloc-bg-thread\", NULL, MODIFIABLE_CONFIG, server.jemalloc_bg_thread, 1),\n \n \/* String Configs *\/\n- createStringConfig(\"aclfile\", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.acl_filename, CONFIG_DEFAULT_ACL_FILENAME), \n- createStringConfig(\"unixsocket\", NULL, IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.unixsocket, NULL), \n- createStringConfig(\"pidfile\", NULL, IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.pidfile, CONFIG_DEFAULT_PID_FILE), \n- createStringConfig(\"replica-announce-ip\", \"slave-announce-ip\", MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.slave_announce_ip, CONFIG_DEFAULT_SLAVE_ANNOUNCE_IP), \n- createStringConfig(\"masteruser\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.masteruser, NULL), \n- createStringConfig(\"masterauth\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.masterauth, NULL), \n- createStringConfig(\"cluster-announce-ip\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.cluster_announce_ip, NULL), \n+ createStringConfig(\"aclfile\", NULL, IMMUTABLE_CONFIG, ALLOW_EMPTY_STRING, server.acl_filename, CONFIG_DEFAULT_ACL_FILENAME),\n+ createStringConfig(\"unixsocket\", NULL, IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.unixsocket, NULL),\n+ createStringConfig(\"pidfile\", NULL, IMMUTABLE_CONFIG, EMPTY_STRING_IS_NULL, server.pidfile, CONFIG_DEFAULT_PID_FILE),\n+ createStringConfig(\"replica-announce-ip\", \"slave-announce-ip\", MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.slave_announce_ip, CONFIG_DEFAULT_SLAVE_ANNOUNCE_IP),\n+ createStringConfig(\"masteruser\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.masteruser, NULL),\n+ createStringConfig(\"masterauth\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.masterauth, NULL),\n+ createStringConfig(\"cluster-announce-ip\", NULL, MODIFIABLE_CONFIG, EMPTY_STRING_IS_NULL, server.cluster_announce_ip, NULL),\n \n \/* Enum Configs *\/\n- createEnumConfig(\"supervised\", NULL, IMMUTABLE_CONFIG, supervised_mode_enum, server.supervised_mode, SUPERVISED_NONE), \n- createEnumConfig(\"syslog-facility\", NULL, IMMUTABLE_CONFIG, syslog_facility_enum, server.syslog_facility, LOG_LOCAL0), \n- createEnumConfig(\"repl-diskless-load\", NULL, MODIFIABLE_CONFIG, repl_diskless_load_enum, server.repl_diskless_load, CONFIG_DEFAULT_REPL_DISKLESS_LOAD), \n- createEnumConfig(\"loglevel\", NULL, MODIFIABLE_CONFIG, loglevel_enum, server.verbosity, CONFIG_DEFAULT_VERBOSITY), \n- createEnumConfig(\"maxmemory-policy\", NULL, MODIFIABLE_CONFIG, maxmemory_policy_enum, server.maxmemory_policy, CONFIG_DEFAULT_MAXMEMORY_POLICY), \n- createEnumConfig(\"appendfsync\", NULL, MODIFIABLE_CONFIG, aof_fsync_enum, server.aof_fsync, CONFIG_DEFAULT_AOF_FSYNC), \n+ createEnumConfig(\"supervised\", NULL, IMMUTABLE_CONFIG, supervised_mode_enum, server.supervised_mode, SUPERVISED_NONE),\n+ createEnumConfig(\"syslog-facility\", NULL, IMMUTABLE_CONFIG, syslog_facility_enum, server.syslog_facility, LOG_LOCAL0),\n+ createEnumConfig(\"repl-diskless-load\", NULL, MODIFIABLE_CONFIG, repl_diskless_load_enum, server.repl_diskless_load, CONFIG_DEFAULT_REPL_DISKLESS_LOAD),\n+ createEnumConfig(\"loglevel\", NULL, MODIFIABLE_CONFIG, loglevel_enum, server.verbosity, CONFIG_DEFAULT_VERBOSITY),\n+ createEnumConfig(\"maxmemory-policy\", NULL, MODIFIABLE_CONFIG, maxmemory_policy_enum, server.maxmemory_policy, CONFIG_DEFAULT_MAXMEMORY_POLICY),\n+ createEnumConfig(\"appendfsync\", NULL, MODIFIABLE_CONFIG, aof_fsync_enum, server.aof_fsync, CONFIG_DEFAULT_AOF_FSYNC),\n \n \/* Integer configs *\/\n- createIntConfig(\"databases\", NULL, IMMUTABLE_CONFIG, 1, INT_MAX, server.dbnum, CONFIG_DEFAULT_DBNUM, INTEGER_CONFIG), \n- createIntConfig(\"port\", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, CONFIG_DEFAULT_SERVER_PORT, INTEGER_CONFIG), \n- createIntConfig(\"io-threads\", NULL, IMMUTABLE_CONFIG, 1, 512, server.io_threads_num, CONFIG_DEFAULT_IO_THREADS_NUM, INTEGER_CONFIG), \n- createIntConfig(\"auto-aof-rewrite-percentage\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.aof_rewrite_perc, AOF_REWRITE_PERC, INTEGER_CONFIG), \n- createIntConfig(\"cluster-replica-validity-factor\", \"cluster-slave-validity-factor\", MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_slave_validity_factor, CLUSTER_DEFAULT_SLAVE_VALIDITY, INTEGER_CONFIG), \n- createIntConfig(\"list-max-ziplist-size\", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, server.list_max_ziplist_size, OBJ_LIST_MAX_ZIPLIST_SIZE, INTEGER_CONFIG), \n- createIntConfig(\"tcp-keepalive\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.tcpkeepalive, CONFIG_DEFAULT_TCP_KEEPALIVE, INTEGER_CONFIG), \n- createIntConfig(\"cluster-migration-barrier\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_migration_barrier, CLUSTER_DEFAULT_MIGRATION_BARRIER, INTEGER_CONFIG), \n- createIntConfig(\"active-defrag-cycle-min\", NULL, MODIFIABLE_CONFIG, 1, 99, server.active_defrag_cycle_min, CONFIG_DEFAULT_DEFRAG_CYCLE_MIN, INTEGER_CONFIG), \n- createIntConfig(\"active-defrag-cycle-max\", NULL, MODIFIABLE_CONFIG, 1, 99, server.active_defrag_cycle_max, CONFIG_DEFAULT_DEFRAG_CYCLE_MAX, INTEGER_CONFIG), \n- createIntConfig(\"active-defrag-threshold-lower\", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_lower, CONFIG_DEFAULT_DEFRAG_THRESHOLD_LOWER, INTEGER_CONFIG), \n- createIntConfig(\"active-defrag-threshold-upper\", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_upper, CONFIG_DEFAULT_DEFRAG_THRESHOLD_UPPER, INTEGER_CONFIG), \n- createIntConfig(\"lfu-log-factor\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_log_factor, CONFIG_DEFAULT_LFU_LOG_FACTOR, INTEGER_CONFIG), \n- createIntConfig(\"lfu-decay-time\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_decay_time, CONFIG_DEFAULT_LFU_DECAY_TIME, INTEGER_CONFIG), \n- createIntConfig(\"replica-priority\", \"slave-priority\", MODIFIABLE_CONFIG, 0, INT_MAX, server.slave_priority, CONFIG_DEFAULT_SLAVE_PRIORITY, INTEGER_CONFIG), \n- createIntConfig(\"repl-diskless-sync-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_diskless_sync_delay, CONFIG_DEFAULT_REPL_DISKLESS_SYNC_DELAY, INTEGER_CONFIG), \n- createIntConfig(\"maxmemory-samples\", NULL, MODIFIABLE_CONFIG, 1, INT_MAX, server.maxmemory_samples, CONFIG_DEFAULT_MAXMEMORY_SAMPLES, INTEGER_CONFIG), \n- createIntConfig(\"timeout\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.maxidletime, CONFIG_DEFAULT_CLIENT_TIMEOUT, INTEGER_CONFIG), \n- createIntConfig(\"replica-announce-port\", \"slave-announce-port\", MODIFIABLE_CONFIG, 0, 65535, server.slave_announce_port, CONFIG_DEFAULT_SLAVE_ANNOUNCE_PORT, INTEGER_CONFIG), \n- createIntConfig(\"tcp-backlog\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.tcp_backlog, CONFIG_DEFAULT_TCP_BACKLOG, INTEGER_CONFIG), \n- createIntConfig(\"cluster-announce-bus-port\", NULL, MODIFIABLE_CONFIG, 0, 65535, server.cluster_announce_bus_port, CONFIG_DEFAULT_CLUSTER_ANNOUNCE_BUS_PORT, INTEGER_CONFIG), \n- createIntConfig(\"cluster-announce-port\", NULL, MODIFIABLE_CONFIG, 0, 65535, server.cluster_announce_port, CONFIG_DEFAULT_CLUSTER_ANNOUNCE_PORT, INTEGER_CONFIG), \n- createIntConfig(\"repl-timeout\", NULL, MODIFIABLE_CONFIG, 1, INT_MAX, server.repl_timeout, CONFIG_DEFAULT_REPL_TIMEOUT, INTEGER_CONFIG), \n- createIntConfig(\"repl-ping-replica-period\", \"repl-ping-slave-period\", MODIFIABLE_CONFIG, 1, INT_MAX, server.repl_ping_slave_period, CONFIG_DEFAULT_REPL_PING_SLAVE_PERIOD, INTEGER_CONFIG), \n- createIntConfig(\"list-compress-depth\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.list_compress_depth, OBJ_LIST_COMPRESS_DEPTH, INTEGER_CONFIG), \n- createIntConfig(\"rdb-key-save-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.rdb_key_save_delay, CONFIG_DEFAULT_RDB_KEY_SAVE_DELAY, INTEGER_CONFIG), \n- createIntConfig(\"key-load-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.key_load_delay, CONFIG_DEFAULT_KEY_LOAD_DELAY, INTEGER_CONFIG), \n- createIntConfig(\"tracking-table-max-fill\", NULL, MODIFIABLE_CONFIG, 0, 100, server.tracking_table_max_fill, CONFIG_DEFAULT_TRACKING_TABLE_MAX_FILL, INTEGER_CONFIG), \n+ createIntConfig(\"databases\", NULL, IMMUTABLE_CONFIG, 1, INT_MAX, server.dbnum, CONFIG_DEFAULT_DBNUM, INTEGER_CONFIG),\n+ createIntConfig(\"port\", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, CONFIG_DEFAULT_SERVER_PORT, INTEGER_CONFIG),\n+ createIntConfig(\"io-threads\", NULL, IMMUTABLE_CONFIG, 1, 512, server.io_threads_num, CONFIG_DEFAULT_IO_THREADS_NUM, INTEGER_CONFIG),\n+ createIntConfig(\"auto-aof-rewrite-percentage\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.aof_rewrite_perc, AOF_REWRITE_PERC, INTEGER_CONFIG),\n+ createIntConfig(\"cluster-replica-validity-factor\", \"cluster-slave-validity-factor\", MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_slave_validity_factor, CLUSTER_DEFAULT_SLAVE_VALIDITY, INTEGER_CONFIG),\n+ createIntConfig(\"list-max-ziplist-size\", NULL, MODIFIABLE_CONFIG, INT_MIN, INT_MAX, server.list_max_ziplist_size, OBJ_LIST_MAX_ZIPLIST_SIZE, INTEGER_CONFIG),\n+ createIntConfig(\"tcp-keepalive\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.tcpkeepalive, CONFIG_DEFAULT_TCP_KEEPALIVE, INTEGER_CONFIG),\n+ createIntConfig(\"cluster-migration-barrier\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_migration_barrier, CLUSTER_DEFAULT_MIGRATION_BARRIER, INTEGER_CONFIG),\n+ createIntConfig(\"active-defrag-cycle-min\", NULL, MODIFIABLE_CONFIG, 1, 99, server.active_defrag_cycle_min, CONFIG_DEFAULT_DEFRAG_CYCLE_MIN, INTEGER_CONFIG),\n+ createIntConfig(\"active-defrag-cycle-max\", NULL, MODIFIABLE_CONFIG, 1, 99, server.active_defrag_cycle_max, CONFIG_DEFAULT_DEFRAG_CYCLE_MAX, INTEGER_CONFIG),\n+ createIntConfig(\"active-defrag-threshold-lower\", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_lower, CONFIG_DEFAULT_DEFRAG_THRESHOLD_LOWER, INTEGER_CONFIG),\n+ createIntConfig(\"active-defrag-threshold-upper\", NULL, MODIFIABLE_CONFIG, 0, 1000, server.active_defrag_threshold_upper, CONFIG_DEFAULT_DEFRAG_THRESHOLD_UPPER, INTEGER_CONFIG),\n+ createIntConfig(\"lfu-log-factor\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_log_factor, CONFIG_DEFAULT_LFU_LOG_FACTOR, INTEGER_CONFIG),\n+ createIntConfig(\"lfu-decay-time\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.lfu_decay_time, CONFIG_DEFAULT_LFU_DECAY_TIME, INTEGER_CONFIG),\n+ createIntConfig(\"replica-priority\", \"slave-priority\", MODIFIABLE_CONFIG, 0, INT_MAX, server.slave_priority, CONFIG_DEFAULT_SLAVE_PRIORITY, INTEGER_CONFIG),\n+ createIntConfig(\"repl-diskless-sync-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_diskless_sync_delay, CONFIG_DEFAULT_REPL_DISKLESS_SYNC_DELAY, INTEGER_CONFIG),\n+ createIntConfig(\"maxmemory-samples\", NULL, MODIFIABLE_CONFIG, 1, INT_MAX, server.maxmemory_samples, CONFIG_DEFAULT_MAXMEMORY_SAMPLES, INTEGER_CONFIG),\n+ createIntConfig(\"timeout\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.maxidletime, CONFIG_DEFAULT_CLIENT_TIMEOUT, INTEGER_CONFIG),\n+ createIntConfig(\"replica-announce-port\", \"slave-announce-port\", MODIFIABLE_CONFIG, 0, 65535, server.slave_announce_port, CONFIG_DEFAULT_SLAVE_ANNOUNCE_PORT, INTEGER_CONFIG),\n+ createIntConfig(\"tcp-backlog\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.tcp_backlog, CONFIG_DEFAULT_TCP_BACKLOG, INTEGER_CONFIG),\n+ createIntConfig(\"cluster-announce-bus-port\", NULL, MODIFIABLE_CONFIG, 0, 65535, server.cluster_announce_bus_port, CONFIG_DEFAULT_CLUSTER_ANNOUNCE_BUS_PORT, INTEGER_CONFIG),\n+ createIntConfig(\"cluster-announce-port\", NULL, MODIFIABLE_CONFIG, 0, 65535, server.cluster_announce_port, CONFIG_DEFAULT_CLUSTER_ANNOUNCE_PORT, INTEGER_CONFIG),\n+ createIntConfig(\"repl-timeout\", NULL, MODIFIABLE_CONFIG, 1, INT_MAX, server.repl_timeout, CONFIG_DEFAULT_REPL_TIMEOUT, INTEGER_CONFIG),\n+ createIntConfig(\"repl-ping-replica-period\", \"repl-ping-slave-period\", MODIFIABLE_CONFIG, 1, INT_MAX, server.repl_ping_slave_period, CONFIG_DEFAULT_REPL_PING_SLAVE_PERIOD, INTEGER_CONFIG),\n+ createIntConfig(\"list-compress-depth\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.list_compress_depth, OBJ_LIST_COMPRESS_DEPTH, INTEGER_CONFIG),\n+ createIntConfig(\"rdb-key-save-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.rdb_key_save_delay, CONFIG_DEFAULT_RDB_KEY_SAVE_DELAY, INTEGER_CONFIG),\n+ createIntConfig(\"key-load-delay\", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.key_load_delay, CONFIG_DEFAULT_KEY_LOAD_DELAY, INTEGER_CONFIG),\n+ createIntConfig(\"tracking-table-max-fill\", NULL, MODIFIABLE_CONFIG, 0, 100, server.tracking_table_max_fill, CONFIG_DEFAULT_TRACKING_TABLE_MAX_FILL, INTEGER_CONFIG),\n createIntConfig(\"active-expire-effort\", NULL, MODIFIABLE_CONFIG, 1, 10, server.active_expire_effort, CONFIG_DEFAULT_ACTIVE_EXPIRE_EFFORT, INTEGER_CONFIG),\n \n \/* Unsigned Long configs *\/\n- createUnsignedLongConfig(\"active-defrag-max-scan-fields\", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, server.active_defrag_max_scan_fields, CONFIG_DEFAULT_DEFRAG_MAX_SCAN_FIELDS, INTEGER_CONFIG), \n- createUnsignedLongConfig(\"slowlog-max-len\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.slowlog_max_len, CONFIG_DEFAULT_SLOWLOG_MAX_LEN, INTEGER_CONFIG), \n+ createUnsignedLongConfig(\"active-defrag-max-scan-fields\", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, server.active_defrag_max_scan_fields, CONFIG_DEFAULT_DEFRAG_MAX_SCAN_FIELDS, INTEGER_CONFIG),\n+ createUnsignedLongConfig(\"slowlog-max-len\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.slowlog_max_len, CONFIG_DEFAULT_SLOWLOG_MAX_LEN, INTEGER_CONFIG),\n \n \/* Long Long configs *\/\n- createLongLongConfig(\"lua-time-limit\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.lua_time_limit, LUA_SCRIPT_TIME_LIMIT, INTEGER_CONFIG), \n- createLongLongConfig(\"cluster-node-timeout\", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.cluster_node_timeout, CLUSTER_DEFAULT_NODE_TIMEOUT, INTEGER_CONFIG), \n- createLongLongConfig(\"slowlog-log-slower-than\", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.slowlog_log_slower_than, CONFIG_DEFAULT_SLOWLOG_LOG_SLOWER_THAN, INTEGER_CONFIG), \n- createLongLongConfig(\"latency-monitor-threshold\", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.latency_monitor_threshold, CONFIG_DEFAULT_LATENCY_MONITOR_THRESHOLD, INTEGER_CONFIG), \n- createLongLongConfig(\"proto-max-bulk-len\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.proto_max_bulk_len, CONFIG_DEFAULT_PROTO_MAX_BULK_LEN, MEMORY_CONFIG), \n+ createLongLongConfig(\"lua-time-limit\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.lua_time_limit, LUA_SCRIPT_TIME_LIMIT, INTEGER_CONFIG),\n+ createLongLongConfig(\"cluster-node-timeout\", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.cluster_node_timeout, CLUSTER_DEFAULT_NODE_TIMEOUT, INTEGER_CONFIG),\n+ createLongLongConfig(\"slowlog-log-slower-than\", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.slowlog_log_slower_than, CONFIG_DEFAULT_SLOWLOG_LOG_SLOWER_THAN, INTEGER_CONFIG),\n+ createLongLongConfig(\"latency-monitor-threshold\", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.latency_monitor_threshold, CONFIG_DEFAULT_LATENCY_MONITOR_THRESHOLD, INTEGER_CONFIG),\n+ createLongLongConfig(\"proto-max-bulk-len\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.proto_max_bulk_len, CONFIG_DEFAULT_PROTO_MAX_BULK_LEN, MEMORY_CONFIG),\n \n \/* Size_t configs *\/\n- createSizeTConfig(\"hash-max-ziplist-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_ziplist_entries, OBJ_HASH_MAX_ZIPLIST_ENTRIES, INTEGER_CONFIG), \n- createSizeTConfig(\"set-max-intset-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.set_max_intset_entries, OBJ_SET_MAX_INTSET_ENTRIES, INTEGER_CONFIG), \n- createSizeTConfig(\"zset-max-ziplist-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.zset_max_ziplist_entries, OBJ_ZSET_MAX_ZIPLIST_ENTRIES, INTEGER_CONFIG), \n- createSizeTConfig(\"active-defrag-ignore-bytes\", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, server.active_defrag_ignore_bytes, CONFIG_DEFAULT_DEFRAG_IGNORE_BYTES, MEMORY_CONFIG), \n- createSizeTConfig(\"hash-max-ziplist-value\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_ziplist_value, OBJ_HASH_MAX_ZIPLIST_VALUE, MEMORY_CONFIG), \n- createSizeTConfig(\"stream-node-max-bytes\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.stream_node_max_bytes, OBJ_STREAM_NODE_MAX_BYTES, MEMORY_CONFIG), \n- createSizeTConfig(\"zset-max-ziplist-value\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.zset_max_ziplist_value, OBJ_ZSET_MAX_ZIPLIST_VALUE, MEMORY_CONFIG), \n- createSizeTConfig(\"hll-sparse-max-bytes\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hll_sparse_max_bytes, CONFIG_DEFAULT_HLL_SPARSE_MAX_BYTES, MEMORY_CONFIG), \n+ createSizeTConfig(\"hash-max-ziplist-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_ziplist_entries, OBJ_HASH_MAX_ZIPLIST_ENTRIES, INTEGER_CONFIG),\n+ createSizeTConfig(\"set-max-intset-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.set_max_intset_entries, OBJ_SET_MAX_INTSET_ENTRIES, INTEGER_CONFIG),\n+ createSizeTConfig(\"zset-max-ziplist-entries\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.zset_max_ziplist_entries, OBJ_ZSET_MAX_ZIPLIST_ENTRIES, INTEGER_CONFIG),\n+ createSizeTConfig(\"active-defrag-ignore-bytes\", NULL, MODIFIABLE_CONFIG, 1, LONG_MAX, server.active_defrag_ignore_bytes, CONFIG_DEFAULT_DEFRAG_IGNORE_BYTES, MEMORY_CONFIG),\n+ createSizeTConfig(\"hash-max-ziplist-value\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hash_max_ziplist_value, OBJ_HASH_MAX_ZIPLIST_VALUE, MEMORY_CONFIG),\n+ createSizeTConfig(\"stream-node-max-bytes\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.stream_node_max_bytes, OBJ_STREAM_NODE_MAX_BYTES, MEMORY_CONFIG),\n+ createSizeTConfig(\"zset-max-ziplist-value\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.zset_max_ziplist_value, OBJ_ZSET_MAX_ZIPLIST_VALUE, MEMORY_CONFIG),\n+ createSizeTConfig(\"hll-sparse-max-bytes\", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX, server.hll_sparse_max_bytes, CONFIG_DEFAULT_HLL_SPARSE_MAX_BYTES, MEMORY_CONFIG),\n \n \/* NULL Terminator *\/\n {NULL}\n"} {"commit":"7da17a899dc3c2b342b7e2a122be33ef2af4ead2","subject":"free allocated memory","message":"free allocated memory\n","repos":"endaaman\/tym,endaaman\/tym","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -48,14 +48,12 @@\n return g_strdup(TYM_FALL_BACK_SHELL);\n }\n \n-char* default_theme_path;\n GList* config_fields = NULL;\n unsigned config_fields_len = 0;\n \n-\n __attribute__((constructor))\n static void initialize() {\n- default_theme_path = g_build_path(\n+ char* default_theme_path = g_build_path(\n G_DIR_SEPARATOR_S,\n g_get_user_config_dir(),\n TYM_CONFIG_DIR_NAME,\n@@ -77,7 +75,7 @@\n \n \/\/ name, short, type, group, flag, default, desc\n ConfigField c[] = {\n- { \"theme\", 't', T_STR, F_NONE, dup(default_theme_path), \"<path>\", \"<path> to theme file. Set '\" TYM_SYMBOL_NONE \"' to start without loading theme.\", NULL, },\n+ { \"theme\", 't', T_STR, F_NONE, default_theme_path, \"<path>\", \"<path> to theme file. Set '\" TYM_SYMBOL_NONE \"' to start without loading theme.\", NULL, },\n { \"shell\", 'e', T_STR, F_NONE, get_default_shell(), \"<shell path>\", \"Shell to be used\", NULL, },\n { \"title\", 0, T_STR, F_NONE, dup(TYM_DEFAULT_TITLE), \"\", \"Window title\", NULL, },\n { \"font\", 0, T_STR, F_NONE, dup(\"\"), \"\", \"Font to render(e.g. 'Ubuntu Mono 12')\", NULL, },\n@@ -121,12 +119,12 @@\n \n static void free_data(void* data, void* user_data) {\n UNUSED(user_data);\n+ g_free(((ConfigField*)data)->default_value);\n g_free(data);\n }\n \n __attribute__((destructor))\n static void finalize() {\n- g_free(default_theme_path);\n g_list_foreach(config_fields, free_data, NULL);\n g_list_free(config_fields);\n }\n"} {"commit":"b6a2878aa536c476264bf8903a6ac9daef9cfd1a","subject":"CONFIG SET: accept slave-priority zero, it is valid.","message":"CONFIG SET: accept slave-priority zero, it is valid.\n","repos":"july2993\/redis,seppo0010\/rlite-server,gilala\/hredis,ReadCode\/redis-3.0-annotated,4396\/redis,ofirluzon\/redis,splitice\/redis,taoguan\/redis,tjschuck\/redis,pkdevbox\/redis,taoguan\/redis,adamweixuan\/redis-3.0-annotated,ouyangkongtong\/redis,hgl888\/redis,Markgorden\/redis,Sciumo\/redis,NBSW\/redis,190235047\/redis,ramonsnir\/redis,PradheepShrinivasan\/redis,supasate\/redis,healerkx\/redis,huyuezheng\/redis,ytjiang\/redis,qiyang0221\/redis,nnog\/redis,StevenTsai\/redis,jacklee0810\/redis-3.0-annotated,YuraLukashik\/redis,mingyaaaa\/redis,iandyh\/redis,izhoujie\/redis,roth1002\/redis,vincent-vivian-liu\/redis,arijitvt\/redis,Wangyao14cyy\/redis,yuzhangjob\/redis-3.0-annotated-unstable,narma\/redis,zhaobo1023\/redis-3.0-annotated,shreesundara\/redis,huangz1990\/redis-3.0-annotated,itugs\/redis,YuanZhewei\/redis,jbochi\/redis,Hailei\/redis,alenslan\/redis,magastzheng\/redis-3.0-annotated,dongqifan2\/redis-3.0-annotated,zy416548283\/redis-3.0-annotated,seandsky\/redis,ctripcorp\/redis,tanghaodong25\/redis,antirez\/redis,devaos\/redis,Markgorden\/redis,gilala\/hbjredis,HouKangkang\/redis-3.0-annotated,ipmobiletech\/redis,HeartSaVioR\/redis,OmarQunsul\/graph-redis,RepmujNetsik\/redis,shining-yang\/redis,ofirluzon\/redis,shining-yang\/redis,ipmobiletech\/redis,csuhawk\/redis,GrimDerp\/redis,atreeyang\/redis,spearhead-ea\/redis,h0x91b\/redis,JoeWoo\/redis,ttuna\/msot-redis,ytjiang\/redis,Sciumo\/redis,devaos\/redis,harrisonfeng\/redis,onlymellb\/redis-3.0-annotated,ofirluzon\/redis,mengyou0304\/redis,dayuoba\/redis,linfangrong\/redis,cusspvz\/redis,aim-for-better\/redis,drinkthere\/redis-3.0-annotated,kensou97\/redis,gechong\/redis-3.0-annotated,ksarch-saas\/redis,supasate\/redis,mverrilli\/redis,abhiklodh\/redis,weizijun\/redis,seandsky\/redis,ncopa\/redis,pcarrier\/redis,xujunhai1991\/redis,xuzhezhaozhao\/redis_reading,soloestoy\/redis,gilala\/bjredis,dreamquster\/redis,unasm\/redis-3.0-annotated,jxwr\/redis,huangz1990\/experiment-redis,xuzhezhaozhao\/redis_reading,gilala\/hredis,Aliceljm1\/redis,spinlock\/redis,rogerlz\/redis,hornen\/redis,Aliceljm1\/redis-3.0-annotated,xlzhan\/redis,ReadCode\/redis-3.0-annotated,ketor\/redis,unasm\/redis-3.0-annotated,ituncle\/redis,atreeyang\/redis,fengshao0907\/redis-3.0-annotated,cnbin\/redis,nilyang\/redis-tdd-annotation,hedisdb\/hedis,rouzier\/redis,CodeJuan\/redis,zczhuohuo\/redis,zguangyu\/redis,soveran\/redis,flashbuckets\/redis,AplayER\/redis,citusdata\/redis,HeartSaVioR\/redis,0x55\/redis-3.0-annotated,gilala\/hredis,supasate\/redis,gilala\/hbjredis,wbailey5\/redis,ofirluzon\/redis,cloudrain21\/redis,wuyu201321060203\/redis-3.0-annotated,RepmujNetsik\/redis,yybirdcf\/learn-redis,0x55\/redis-3.0-annotated,simplestbest\/redis,idning\/redis,ramonsnir\/redis,jingjidejuren\/redis,magastzheng\/redis-3.0-annotated,zhcy\/redis,louisliangjun\/redis,OmarQunsul\/graph-redis,yybirdcf\/learn-redis,universsky\/redis,gilala\/bjredis,ErikDubbelboer\/redis,devaos\/redis,mverrilli\/redis,wbailey5\/redis,YuanZhewei\/redis,honestme\/redis,Markgorden\/redis,wenxueliu\/redis_comment,fankeke\/redis-3.0-annotated,MasahikoSawada\/redis,kensou97\/redis,holstvoogd\/redis,yuhc\/redis-benchmark-enhanced,xujunhai1991\/redis,july2993\/redis,mumingv\/redis-3.0-annotated,josiahcarlson\/redis,xuguruogu\/redis,nilyang\/redis-tdd-annotation,qiyang0221\/redis,wangyikai\/redis,moonbingbing\/redis-3.0-annotated,weizijun\/redis,mgk\/redis,sunheehnus\/redis,saisai\/redis,mumingv\/redis-3.0-annotated,soloestoy\/redis,gaoxianglong\/redis,pkdevbox\/redis,HouKangkang\/redis-3.0-annotated,itamarhaber\/redis,idning\/redis,soloestoy\/redis,huyuezheng\/redis,Aaron1992\/redis,flashbuckets\/redis,AALEKH\/redis,miaoyc1989\/redis-3.0-annotated,cloudrain21\/redis,neomantra\/redis,antirez\/redis,hedisdb\/hedis,seppo0010\/redis,MSOpenTech\/redis,kmiku7\/redis,nuxeh\/redis,0x55\/redis-3.0-annotated,jackyan\/redis,JoeWoo\/redis,huangz1990\/experiment-redis,zczhuohuo\/redis,zguangyu\/redis,ytjiang\/redis,h0x91b\/redis,YuraLukashik\/redis,gaoxianglong\/redis,francischan714\/redis,modulexcite\/redis,antirez\/redis,citusdata\/redis,Aliceljm1\/redis,ipmobiletech\/redis,honestme\/redis,saisai\/redis,StevenTsai\/redis,zczhuohuo\/redis,miaoyc1989\/redis-3.0-annotated,Markgorden\/redis,Hailei\/redis,AALEKH\/redis,allengaller\/redis,slfs007\/mk-redis,CodeJuan\/redis,moonbingbing\/redis-3.0-annotated,splitice\/redis,haima-zju\/redis-3.0-annotated,ituncle\/redis,ramonsnir\/redis,qiyang0221\/redis,linfangrong\/redis,JoeWoo\/redis,AplayER\/redis,mengzhejin\/RedisStudy,tanghaodong25\/redis,mengzhejin\/RedisStudy,davidradunz\/redis,csuhawk\/redis,izhoujie\/redis,riyan8250\/redis,shshlzh\/redis-3.0-annotated,aim-for-better\/redis,j0hnma\/hszredis,a-pavlov\/redis,ipmobiletech\/redis,CodeJuan\/redis,zhcy\/redis,jingjidejuren\/redis,MasahikoSawada\/redis,xlzhan\/redis,charsyam\/redis,pcarrier\/redis,holstvoogd\/redis,programmecat\/redis,shshlzh\/redis-3.0-annotated,duanx\/redis,jasonkying\/redis,Soledad89\/redis,GitHubMota\/redis,rrsean\/redis-3.0-annotated,adamweixuan\/redis-3.0-annotated,SyntaxStacks\/redis,rouzier\/redis,yuhc\/redis-benchmark-enhanced,190235047\/redis,ctripcorp\/redis,gechong\/redis-3.0-annotated,valdsJohn\/redis,jbochi\/parallel_redis,pedigree\/redis,h0x91b\/redis,timothyohare\/3rdPartySrc-redis,rogerlz\/redis,a-pavlov\/redis,tjschuck\/redis,modulexcite\/redis,xuguruogu\/redis,slfs007\/mk-redis,yybirdcf\/learn-redis,ncopa\/redis,sunlianqiang\/redis-3.0-annotated,msn217\/redis-3.0-annotated,mcanthony\/redis,zguangyu\/redis,simplestbest\/redis,ttuna\/msot-redis,SummonY\/redis,atreeyang\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,izhoujie\/redis,pietern\/redis,kaushik94\/redis,4396\/redis,Hailei\/redis,pietern\/redis,miaoyc1989\/redis-3.0-annotated,huyuezheng\/redis,ksarch-saas\/redis,tzq668766\/redis-3.0-annotated,healerkx\/redis,hedisdb\/hedis,twskipper\/redis,mumingv\/redis-3.0-annotated,yossigo\/redis,a-pavlov\/redis,aim-for-better\/redis,twskipper\/redis,iandyh\/redis,holstvoogd\/redis,HeartSaVioR\/redis,mingyaaaa\/redis,OmarQunsul\/graph-redis,jacklee0810\/redis-3.0-annotated,Soledad89\/redis,jxwr\/redis,gongice\/redis-3.0-annotated,MasahikoSawada\/redis,gilala\/redis,brg-liuwei\/redis,seppo0010\/rlite-server,sunlianqiang\/redis-3.0-annotated,PradheepShrinivasan\/redis,PradheepShrinivasan\/redis,ouyangkongtong\/redis,gaoxianglong\/redis,july2993\/redis,NBSW\/redis,MasahikoSawada\/redis,vincent-vivian-liu\/redis,CodeJuan\/redis,alenslan\/redis,SyntaxStacks\/redis,Aliceljm1\/redis-3.0-annotated,HunanTV\/redis,ErikDubbelboer\/redis,fengshao0907\/redis,universsky\/redis,OmarQunsul\/graph-redis,elkingtonmcb\/redis,badboy\/redis,mengyou0304\/redis,wuyu201321060203\/redis-3.0-annotated,badboy\/redis,ituncle\/redis,yossigo\/redis,seppo0010\/redis,j0hnma\/szredis,GitHubMota\/redis,LongXQ\/redis,darksideofthemoo\/redis-histogram,AplayER\/redis,linfangrong\/redis,hawkchch\/redis,maodeyi\/redis_lua,ctripcorp\/redis,AplayER\/redis,programmecat\/redis,modulexcite\/redis,sunheehnus\/redis,mcanthony\/redis,MOON-CLJ\/redis,0x55\/redis-3.0-annotated,valdsJohn\/redis,JoeWoo\/redis,vincent-vivian-liu\/redis,hedisdb\/hedis,cusspvz\/redis,zguangyu\/redis,pmem\/redis,YongMan\/redis,zhiliaoniu\/redis,ketor\/redis,xujunhai1991\/redis,MSOpenTech\/redis,qiyang0221\/redis,hornen\/redis,kmiku7\/redis,ksarch-saas\/redis,kensou97\/redis,ErikDubbelboer\/redis,devaos\/redis,xlzhan\/redis,brg-liuwei\/redis,mgk\/redis,Aliceljm1\/redis-3.0-annotated,jxwr\/redis,shreesundara\/redis,Aaron1992\/redis,kaushik94\/redis,LongXQ\/redis,riyan8250\/redis,seppo0010\/redis,PKRoma\/redis,kmiku7\/redis,mcanthony\/redis,ouyangkongtong\/redis,sunheehnus\/redis,weizijun\/redis,LongXQ\/redis,HunanTV\/redis,Aliceljm1\/redis,GrimDerp\/redis,h0x91b\/redis,ituncle\/redis,GrimDerp\/redis,nnog\/redis,YongMan\/redis,Soledad89\/redis,francischan714\/redis,wenxueliu\/redis_comment,wangyikai\/redis,ton31337\/redis,190235047\/redis,zy416548283\/redis-3.0-annotated,ctripcorp\/redis,aim-for-better\/redis,shining-yang\/redis,tellapart\/redis,huyuezheng\/redis,valdsJohn\/redis,rogerchina\/redis,mattsta\/redis,netroby\/redis,ttuna\/msot-redis,riyan8250\/redis,miaoyc1989\/redis-3.0-annotated,darksideofthemoo\/redis-histogram,duanx\/redis,YuanZhewei\/redis,hornen\/redis,netroby\/redis,elkingtonmcb\/redis,drinkthere\/redis-3.0-annotated,4396\/redis,4396\/redis,ofirluzon\/redis,hornen\/redis,programmecat\/redis,tellapart\/redis,mengzhejin\/RedisStudy,shining-yang\/redis,splitice\/redis,soloestoy\/redis,soveran\/redis,twskipper\/redis,pkdevbox\/redis,idning\/redis,wprice\/redis,linfangrong\/redis,alenslan\/redis,roth1002\/redis,kensou97\/redis,Wangyao14cyy\/redis,badboy\/redis,tanghaodong25\/redis,jbochi\/redis,ketor\/redis,gilala\/bjredis,YuraLukashik\/redis,dreamquster\/redis,guker\/redis,ton31337\/redis,xuzhezhaozhao\/redis_reading,pedigree\/redis,duanx\/redis,ttuna\/msot-redis,hawkchch\/redis,MOON-CLJ\/redis,clamoriniere1A\/redis,SyntaxStacks\/redis,xujunhai1991\/redis,gechong\/redis-3.0-annotated,jacklee0810\/redis-3.0-annotated,jasonkying\/redis,rogerlz\/redis,brg-liuwei\/redis,gilala\/redis,elkingtonmcb\/redis,z-fork\/redis,ErikDubbelboer\/redis,oranagra\/redis,charsyam\/redis,flashbuckets\/redis,janekmi\/redis,modulexcite\/redis,blackmady\/redis,jasonkying\/redis,rouzier\/redis,nuxeh\/redis,xuguruogu\/redis,z-fork\/redis,SyntaxStacks\/redis,citusdata\/redis,neomantra\/redis,allengaller\/redis,haima-zju\/redis-3.0-annotated,harrisonfeng\/redis,soveran\/redis,mengyou0304\/redis,rrsean\/redis-3.0-annotated,pcarrier\/redis,mattsta\/redis,nnog\/redis,mingyaaaa\/redis,timothyohare\/3rdPartySrc-redis,PKRoma\/redis,xuguruogu\/redis,jasonkying\/redis,mumingv\/redis,janekmi\/redis,colstrom\/redis,kaushik94\/redis,ReadCode\/redis-3.0-annotated,itugs\/redis,GrimDerp\/redis,mengyou0304\/redis,neomantra\/redis,blackmady\/redis,LongXQ\/redis,seppo0010\/rlite-server,RepmujNetsik\/redis,xuzhezhaozhao\/redis_reading,dongqifan2\/redis-3.0-annotated,jackyan\/redis,unasm\/redis-3.0-annotated,takeshineshiro\/redis,zhoudayang\/redis,GitHubMota\/redis,MOON-CLJ\/redis,Aaron1992\/redis,gilala\/hredis,badboy\/redis,nuxeh\/redis,idning\/redis,rrsean\/redis-3.0-annotated,oranagra\/redis,honestme\/redis,whille\/redis-3.0-annotated,msn217\/redis-3.0-annotated,jackyan\/redis,oranagra\/redis,cnbin\/redis,cnbin\/redis,gaoxianglong\/redis,StevenTsai\/redis,zhoudayang\/redis,rogerchina\/redis,cusspvz\/redis,yuzhangjob\/redis-3.0-annotated-unstable,gilala\/redis,yossigo\/redis,blackmady\/redis,wprice\/redis,honestme\/redis,NBSW\/redis,mverrilli\/redis,iandyh\/redis,francischan714\/redis,citusdata\/redis,yuzhangjob\/redis-3.0-annotated-unstable,gilala\/hbjredis,neomantra\/redis,soveran\/redis,itugs\/redis,ncopa\/redis,msn217\/redis-3.0-annotated,mumingv\/redis,wujf\/redis,supasate\/redis,rogerlz\/redis,clamoriniere1A\/redis,GitHubMota\/redis,fengshao0907\/redis,AALEKH\/redis,StevenTsai\/redis,ouyangkongtong\/redis,ytjiang\/redis,j0hnma\/hszredis,jbochi\/redis,zhaobo1023\/redis-3.0-annotated,tzq668766\/redis-3.0-annotated,SummonY\/redis,sunheehnus\/redis,charsyam\/redis,tellapart\/redis,yybirdcf\/learn-redis,mgk\/redis,whille\/redis-3.0-annotated,wangyikai\/redis,fengshao0907\/redis,Hailei\/redis,a-pavlov\/redis,Aaron1992\/redis,zy416548283\/redis-3.0-annotated,190235047\/redis,soloestoy\/redis,nnog\/redis,drinkthere\/redis-3.0-annotated,weizijun\/redis,pkdevbox\/redis,HouKangkang\/redis-3.0-annotated,rouzier\/redis,jbochi\/parallel_redis,takeshineshiro\/redis,zhoudayang\/redis,netroby\/redis,twskipper\/redis,tellapart\/redis,tzq668766\/redis-3.0-annotated,wuyu201321060203\/redis-3.0-annotated,j0hnma\/hszredis,PradheepShrinivasan\/redis,wuyu201321060203\/redis-3.0-annotated,mgk\/redis,dreamquster\/redis,dayuoba\/redis,guker\/redis,davidradunz\/redis,thomasdarimont\/redis,rogerchina\/redis,buobao\/redis-3.0-annotated,pietern\/redis,mumingv\/redis,janekmi\/redis,huangz1990\/experiment-redis,xlzhan\/redis,z-fork\/redis,holstvoogd\/redis,YuanZhewei\/redis,wenxueliu\/redis_comment,mingyaaaa\/redis,josiahcarlson\/redis,colstrom\/redis,nuxeh\/redis,zczhuohuo\/redis,ton31337\/redis,cloudrain21\/redis,louisliangjun\/redis,alenslan\/redis,davidradunz\/redis,zhaobo1023\/redis-3.0-annotated,kaushik94\/redis,taoguan\/redis,yossigo\/redis,spinlock\/redis,dongqifan2\/redis-3.0-annotated,pmem\/redis,elkingtonmcb\/redis,buobao\/redis-3.0-annotated,davidradunz\/redis,NBSW\/redis,arijitvt\/redis,j0hnma\/szredis,roth1002\/redis,seppo0010\/redis,itamarhaber\/redis,spearhead-ea\/redis,universsky\/redis,clamoriniere1A\/redis,shreesundara\/redis,shreesundara\/redis,zhoudayang\/redis,wprice\/redis,huangz1990\/redis-3.0-annotated,simplestbest\/redis,cusspvz\/redis,jackyan\/redis,charsyam\/redis,wujf\/redis,jingjidejuren\/redis,wangyikai\/redis,wbailey5\/redis,harrisonfeng\/redis,mverrilli\/redis,pmem\/redis,HunanTV\/redis,whille\/redis-3.0-annotated,HunanTV\/redis,pedigree\/redis,saisai\/redis,programmecat\/redis,zhiliaoniu\/redis,j0hnma\/szredis,fengshao0907\/redis-3.0-annotated,himoca\/redis,kmiku7\/redis,tjschuck\/redis,pcarrier\/redis,atreeyang\/redis,thomasdarimont\/redis,jingjidejuren\/redis,YuraLukashik\/redis,louisliangjun\/redis,healerkx\/redis,roth1002\/redis,vincent-vivian-liu\/redis,shshlzh\/redis-3.0-annotated,dreamquster\/redis,j0hnma\/szredis,wujf\/redis,rogerchina\/redis,dayuoba\/redis,Sciumo\/redis,guker\/redis,mcanthony\/redis,zhiliaoniu\/redis,PKRoma\/redis,nilyang\/redis-tdd-annotation,magastzheng\/redis-3.0-annotated,huangz1990\/experiment-redis,haima-zju\/redis-3.0-annotated,itamarhaber\/redis,Wangyao14cyy\/redis,YongMan\/redis,MSOpenTech\/redis,gilala\/redis,dayuoba\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,clamoriniere1A\/redis,fengshao0907\/redis,csuhawk\/redis,splitice\/redis,narma\/redis,wenxueliu\/redis_comment,takeshineshiro\/redis,yuhc\/redis-benchmark-enhanced,mengzhejin\/RedisStudy,wujf\/redis,pmem\/redis,timothyohare\/3rdPartySrc-redis,PKRoma\/redis,josiahcarlson\/redis,cloudrain21\/redis,iandyh\/redis,abhiklodh\/redis,colstrom\/redis,Aliceljm1\/redis,colstrom\/redis,valdsJohn\/redis,zhcy\/redis,flashbuckets\/redis,seppo0010\/rlite-server,j0hnma\/hszredis,RepmujNetsik\/redis,allengaller\/redis,josiahcarlson\/redis,spinlock\/redis,seandsky\/redis,slfs007\/mk-redis,abhiklodh\/redis,oranagra\/redis,maodeyi\/redis_lua,zhiliaoniu\/redis,maodeyi\/redis_lua,francischan714\/redis,mattsta\/redis,fengshao0907\/redis-3.0-annotated,pietern\/redis,seandsky\/redis,neomantra\/redis,taoguan\/redis,moonbingbing\/redis-3.0-annotated,buobao\/redis-3.0-annotated,thomasdarimont\/redis,zhcy\/redis,himoca\/redis,ncopa\/redis,MSOpenTech\/redis,ksarch-saas\/redis,spearhead-ea\/redis,universsky\/redis,duanx\/redis,hgl888\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,onlymellb\/redis-3.0-annotated,thomasdarimont\/redis,blackmady\/redis,izhoujie\/redis,pedigree\/redis,healerkx\/redis,brg-liuwei\/redis,darksideofthemoo\/redis-histogram,gilala\/bjredis,harrisonfeng\/redis,SummonY\/redis,SummonY\/redis,YongMan\/redis,PKRoma\/redis,AALEKH\/redis,cnbin\/redis,darksideofthemoo\/redis-histogram,arijitvt\/redis,himoca\/redis,shshlzh\/redis-3.0-annotated,gilala\/hbjredis,netroby\/redis,guker\/redis,takeshineshiro\/redis,spinlock\/redis,riyan8250\/redis,hgl888\/redis,tanghaodong25\/redis,oranagra\/redis,gongice\/redis-3.0-annotated,charsyam\/redis,hgl888\/redis,wbailey5\/redis,huangz1990\/redis-3.0-annotated,simplestbest\/redis,july2993\/redis,tjschuck\/redis,hawkchch\/redis,allengaller\/redis,onlymellb\/redis-3.0-annotated,wprice\/redis,csuhawk\/redis,Sciumo\/redis,antirez\/redis,itugs\/redis,arijitvt\/redis,gongice\/redis-3.0-annotated,adamweixuan\/redis-3.0-annotated,janekmi\/redis,ton31337\/redis,ttuna\/msot-redis,sunlianqiang\/redis-3.0-annotated,MSOpenTech\/redis,narma\/redis,Wangyao14cyy\/redis,mumingv\/redis,fankeke\/redis-3.0-annotated,HeartSaVioR\/redis,saisai\/redis,yossigo\/redis,abhiklodh\/redis,louisliangjun\/redis,itamarhaber\/redis,fankeke\/redis-3.0-annotated,timothyohare\/3rdPartySrc-redis,hawkchch\/redis,yuhc\/redis-benchmark-enhanced,Soledad89\/redis,nilyang\/redis-tdd-annotation,jbochi\/parallel_redis,z-fork\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -809,7 +809,7 @@\n server.repl_disable_tcp_nodelay = yn;\n } else if (!strcasecmp(c->argv[2]->ptr,\"slave-priority\")) {\n if (getLongLongFromObject(o,&ll) == REDIS_ERR ||\n- ll <= 0) goto badfmt;\n+ ll < 0) goto badfmt;\n server.slave_priority = ll;\n } else if (!strcasecmp(c->argv[2]->ptr,\"min-slaves-to-write\")) {\n if (getLongLongFromObject(o,&ll) == REDIS_ERR ||\n"} {"commit":"9900f051a52d5e22be1b2bdeb557ca1060206e88","subject":"Fix type error","message":"Fix type error\n","repos":"yuyuyu101\/wheatserver,yuyuyu101\/wheatserver,yuyuyu101\/wheatserver","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -29,9 +29,9 @@\n &Workers[0], ENUM_FORMAT},\n {\"logfile\", 2, stringValidator, {.ptr=NULL},\n NULL, STRING_FORMAT},\n- {\"logfile-level\", 2, enumValidator, {.enum_ptr=&Verbose[0]},\n+ {\"logfile-level\", 2, enumValidator, {.enum_ptr=&Verbose[2]},\n &Verbose[0], ENUM_FORMAT},\n- {\"daemon\", 2, boolValidator, {.val=WHEAT_NOTICE},\n+ {\"daemon\", 2, boolValidator, {.val=0},\n NULL, BOOL_FORMAT},\n {\"pidfile\", 2, stringValidator, {.ptr=NULL},\n NULL, STRING_FORMAT},\n"} {"commit":"db7cb850dd9a7b40a47fe46fcfedb2a847fa1daf","subject":"Back to -dev","message":"Back to -dev\n","repos":"gnowxilef\/pianobar,gnowxilef\/pianobar,gnowxilef\/pianobar,gnowxilef\/pianobar,gnowxilef\/pianobar,gnowxilef\/pianobar","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config.h\n+++ src\/config.h\n@@ -3,7 +3,7 @@\n \/* package name *\/\n #define PACKAGE \"pianobar\"\n \n-#define VERSION \"2019.02.14\"\n+#define VERSION \"2019.02.14-dev\"\n \n \/* glibc feature test macros, define _before_ including other files *\/\n #define _POSIX_C_SOURCE 200809L\n"} {"commit":"c2974e96d41bb9a2a0ad8a92d388374acf70d24e","subject":"Android default is GLES 3.0.","message":"Android default is GLES 3.0.\n","repos":"emoon\/bgfx,jdryg\/bgfx,bkaradzic\/bgfx,bkaradzic\/bgfx,jdryg\/bgfx,emoon\/bgfx,LWJGL-CI\/bgfx,jdryg\/bgfx,LWJGL-CI\/bgfx,LWJGL-CI\/bgfx,emoon\/bgfx,bkaradzic\/bgfx,bkaradzic\/bgfx,LWJGL-CI\/bgfx,jdryg\/bgfx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/config.h\n+++ src\/config.h\n@@ -86,7 +86,9 @@\n #\tendif \/\/ BGFX_CONFIG_RENDERER_OPENGL\n \n #\tifndef BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION\n-#\t\tdefine BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION 1\n+#\t\tdefine BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION (0 \\\n+\t\t\t\t\t|| BX_PLATFORM_ANDROID \\\n+\t\t\t\t\t? 30 : 1)\n #\tendif \/\/ BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION\n \n #\tifndef BGFX_CONFIG_RENDERER_OPENGLES\n"} {"commit":"9791a1a05ffc309e8bf21e023456cfeebd516235","subject":"The HandyTech date time processor should be cleared before it's called else they can't be chained. (dm)","message":"The HandyTech date time processor should be cleared before it's called else they can't be chained. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@5520 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -1078,7 +1078,7 @@\n }\n \n static int\n-compareAndMaybeSetDateTime (BrailleDisplay *brl, const HT_DateTime *dateTime) {\n+synchronizeDateTime (BrailleDisplay *brl, const HT_DateTime *dateTime) {\n struct tm t0 = {\n .tm_year = getBigEndian(dateTime->year) - 1900,\n .tm_mon = dateTime->month - 1,\n@@ -1165,7 +1165,7 @@\n \n if (setTime) {\n if (model->identifier == HT_MODEL_ActiveBraille) {\n- requestDateTime(brl, compareAndMaybeSetDateTime);\n+ requestDateTime(brl, synchronizeDateTime);\n } else {\n logMessage(LOG_INFO, \"%s does not support setting the clock\", model->name);\n }\n@@ -1453,16 +1453,16 @@\n \n case HT_EXTPKT_GetRTC: {\n const HT_DateTime *const payload = (HT_DateTime *)bytes;\n- int ok = 0;\n-\n- if (dateTimeProcessor) {\n- ok = dateTimeProcessor(brl, payload);\n- dateTimeProcessor = NULL;\n+ DateTimeProcessor *processor = dateTimeProcessor;\n+ dateTimeProcessor = NULL;\n+\n+ if (processor) {\n+ if (!processor(brl, payload)) {\n+ break;\n+ }\n }\n \n- if (ok) continue;\n-\n- break;\n+ continue;\n }\n \n case HT_EXTPKT_AtcInfo: {\n"} {"commit":"d3c02aa8ccad8dca4d61e2a82476abab2d1cc230","subject":"Update version string.","message":"Update version string.\n","repos":"pariahsoft\/TsunagariC,pariahsoft\/TsunagariC,pmer\/TsunagariC,pariahsoft\/Tsunagari,pariahsoft\/Tsunagari,pmer\/TsunagariC,pariahsoft\/TsunagariC,pariahsoft\/Tsunagari,pariahsoft\/Tsunagari,pmer\/TsunagariC","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config.h\n+++ src\/config.h\n@@ -7,7 +7,7 @@\n #ifndef CONFIG_H\n #define CONFIG_H\n \n-#define TSUNAGARI_RELEASE_VERSION \"Tsunagari Tile Engine AlphaP1 Revision 6\"\n+#define TSUNAGARI_RELEASE_VERSION \"Tsunagari Tile Engine AlphaP2 Revision 1\"\n \n \/\/ === Default Configuration Settings ===\n \t\/* Tsunagari config file. *\/\n"} {"commit":"8dfe2f44e717f6ac5cd8af8ee47d4da945f5c4b8","subject":"Implement Basic Braille key rotation. (ml,dm)","message":"Implement Basic Braille key rotation. (ml,dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@7088 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -256,6 +256,7 @@\n typedef int (OrientationSetter) (BrailleDisplay *brl, BrailleOrientation setting);\n static BrailleOrientation orientation = BRL_ORIENTATION_NORMAL;\n static OrientationSetter setOrientation;\n+static KeyRotator rotateBasicBrailleKey;\n \n typedef struct {\n const char *name;\n@@ -266,6 +267,7 @@\n FirmnessSetter *setFirmness;\n SensitivitySetter *setSensitivity;\n OrientationSetter *setOrientation;\n+ KeyRotator *rotateKey;\n \n const unsigned char *sessionEndAddress;\n \n@@ -404,7 +406,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(bb),\\\n .interpretByte = interpretByte_key, \\\n .writeCells = writeCells_Evolution, \\\n- .setOrientation = setOrientation \\\n+ .setOrientation = setOrientation, \\\n+ .rotateKey = rotateBasicBrailleKey \\\n }\n HT_BASIC_BRAILLE(16),\n HT_BASIC_BRAILLE(20),\n@@ -1200,6 +1203,7 @@\n brl->setFirmness = model->setFirmness;\n brl->setSensitivity = model->setSensitivity;\n brl->setOrientation = model->setOrientation;\n+ brl->rotateKey = model->rotateKey;\n \n if (!reallocateBuffer(&rawData, brl->textColumns*brl->textRows)) return 0;\n if (!reallocateBuffer(&prevData, brl->textColumns*brl->textRows)) return 0;\n@@ -1480,6 +1484,27 @@\n return updateCells(brl);\n }\n \n+static void\n+rotateBasicBrailleKey (BrailleDisplay *brl, unsigned char *set, unsigned char *key) {\n+ switch (*set) {\n+ case HT_SET_NavigationKeys:\n+ switch (*key) {\n+ case HT_KEY_B2: *key = HT_KEY_B5; break;\n+ case HT_KEY_B3: *key = HT_KEY_B6; break;\n+ case HT_KEY_B4: *key = HT_KEY_B7; break;\n+ case HT_KEY_B5: *key = HT_KEY_B2; break;\n+ case HT_KEY_B6: *key = HT_KEY_B3; break;\n+ case HT_KEY_B7: *key = HT_KEY_B4; break;\n+ default: logMessage(LOG_ERR, \"unable to rotate key: %d\", *key);\n+ }\n+ break;\n+\n+ case HT_SET_RoutingKeys:\n+ *key = brl->textColumns - *key - 1;\n+ break;\n+ }\n+}\n+\n static int\n brl_writeWindow (BrailleDisplay *brl, const wchar_t *text) {\n const size_t cellCount = model->textCells;\n@@ -1514,9 +1539,7 @@\n \n if ((byte >= HT_KEY_ROUTING) &&\n (byte < (HT_KEY_ROUTING + model->textCells))) {\n- unsigned char key = byte - HT_KEY_ROUTING;\n- if (orientation == BRL_ORIENTATION_ROTATED) key = model->textCells - key - 1;\n- return enqueueKeyEvent(HT_SET_RoutingKeys, key, !release);\n+ return enqueueKeyEvent(HT_SET_RoutingKeys, byte - HT_KEY_ROUTING, !release);\n }\n \n if ((byte >= HT_KEY_STATUS) &&\n"} {"commit":"81183000c422d1aedad38ae1ea2c0a3b54bab3cd","subject":"minor update consrc (format)","message":"minor update consrc (format)\n","repos":"thi-ng\/c-thing,thi-ng\/c-thing,thi-ng\/c-thing,thi-ng\/c-thing,thi-ng\/c-thing","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/consrc.c\n+++ src\/consrc.c\n@@ -55,8 +55,12 @@\n static void ct_object_free_nop(const CT_Ref *ref) {\n }\n \n+\/\/ clang-format off\n static CT_Object CT_NIL = {\n- .atom = {.p = NULL}, .tag = {.tag = 0}, .rc = {ct_object_free_nop, 1}};\n+ .atom = {.p = NULL},\n+ .tag = {.tag = 0},\n+ .rc = {ct_object_free_nop, 1}};\n+\/\/ clang-format off\n \n void ct_object_print(CT_Object *o) {\n switch (o->tag.type) {\n"} {"commit":"9388f3bf76bf29c490087d72de453fa040af476e","subject":"dbox crashfix","message":"dbox crashfix\n\n--HG--\nbranch : HEAD\n","repos":"jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/index\/dbox\/dbox-index.c\n+++ src\/lib-storage\/index\/dbox\/dbox-index.c\n@@ -774,7 +774,12 @@\n \tconst char *pop3_uidl = NULL, *const *changes;\n \tunsigned int i, count;\n \n-\tchanges = array_get(&file->metadata_changes, &count);\n+\tif (array_is_created(&file->metadata_changes))\n+\t\tchanges = array_get(&file->metadata_changes, &count);\n+\telse {\n+\t\tchanges = NULL;\n+\t\tcount = 0;\n+\t}\n \tfor (i = 0; i < count; i++) {\n \t\tif (*changes[i] == DBOX_METADATA_POP3_UIDL) {\n \t\t\tpop3_uidl = changes[i] + 1;\n"} {"commit":"0cdb03cb93405f3400f37c8c2cfaa3289450b8d1","subject":"Remove an unnecessary memcpy(). (ml)","message":"Remove an unnecessary memcpy(). (ml)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@4640 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -811,11 +811,7 @@\n \n static int\n writeEvolutionCells (BrailleDisplay *brl) {\n- unsigned char buffer[model->textCells];\n-\n- memcpy(buffer, rawData, model->textCells);\n-\n- return writeExtendedPacket(brl, HT_EXTPKT_Braille, buffer, sizeof(buffer));\n+ return writeExtendedPacket(brl, HT_EXTPKT_Braille, rawData, model->textCells);\n }\n \n static int\n"} {"commit":"8ff987fb272fbac5094f07493cc76f1376eedcb8","subject":"CONTEXT=SEARCH: Handle correctly if the same mail is added and removed (or removed and added) before next sync.","message":"CONTEXT=SEARCH: Handle correctly if the same mail is added and removed (or\nremoved and added) before next sync.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-storage\/mailbox-search-result.c\n+++ src\/lib-storage\/mailbox-search-result.c\n@@ -110,16 +110,20 @@\n \t\treturn;\n \n \tseq_range_array_add(&result->uids, 0, uid);\n-\tif (array_is_created(&result->added_uids))\n+\tif (array_is_created(&result->added_uids)) {\n \t\tseq_range_array_add(&result->added_uids, 0, uid);\n+\t\tseq_range_array_remove(&result->removed_uids, uid);\n+\t}\n }\n \n void mailbox_search_result_remove(struct mail_search_result *result,\n \t\t\t\t uint32_t uid)\n {\n \tif (seq_range_array_remove(&result->uids, uid)) {\n-\t\tif (array_is_created(&result->removed_uids))\n+\t\tif (array_is_created(&result->removed_uids)) {\n \t\t\tseq_range_array_add(&result->removed_uids, 0, uid);\n+\t\t\tseq_range_array_remove(&result->added_uids, uid);\n+\t\t}\n \t}\n }\n \n"} {"commit":"d2425123bd6380777247b80d239fa3918cb5a844","subject":"Minor changes to the HandyTech driver. (dm)","message":"Minor changes to the HandyTech driver. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@8137 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/HandyTech\/braille.c\n+++ Drivers\/Braille\/HandyTech\/braille.c\n@@ -236,7 +236,7 @@\n END_KEY_TABLE_LIST\n \n static int\n-endBookwormSession(BrailleDisplay *brl) {\n+endSession_Bookworm (BrailleDisplay *brl) {\n static const unsigned char sessionEnd[] = {0X05, 0X07};\n return writeBraillePacket(brl, NULL, sessionEnd, sizeof(sessionEnd));\n }\n@@ -281,8 +281,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(mdlr),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_Modular40,\n .name = \"Modular 40+4\",\n .textCells = 40,\n@@ -290,8 +290,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(mdlr),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_Modular80,\n .name = \"Modular 80+4\",\n .textCells = 80,\n@@ -299,8 +299,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(mdlr),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_ModularEvolution64,\n .name = \"Modular Evolution 64\",\n .textCells = 64,\n@@ -310,8 +310,8 @@\n .writeCells = writeCells_Evolution,\n .setSensitivity = setSensitivity_Evolution,\n .hasATC = 1\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_ModularEvolution88,\n .name = \"Modular Evolution 88\",\n .textCells = 88,\n@@ -321,8 +321,8 @@\n .writeCells = writeCells_Evolution,\n .setSensitivity = setSensitivity_Evolution,\n .hasATC = 1\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_BrailleWave,\n .name = \"Braille Wave\",\n .textCells = 40,\n@@ -330,8 +330,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(wave),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_Bookworm,\n .name = \"Bookworm\",\n .textCells = 8,\n@@ -339,9 +339,9 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(bkwm),\n .interpretByte = interpretByte_Bookworm,\n .writeCells = writeCells_Bookworm,\n- .sessionEnder = endBookwormSession\n- }\n- ,\n+ .sessionEnder = endSession_Bookworm\n+ },\n+\n { .identifier = HT_MODEL_Braillino,\n .name = \"Braillino\",\n .textCells = 20,\n@@ -349,8 +349,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(bs40),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_BrailleStar40,\n .name = \"Braille Star 40\",\n .textCells = 40,\n@@ -358,8 +358,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(bs40),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_BrailleStar80,\n .name = \"Braille Star 80\",\n .textCells = 80,\n@@ -367,8 +367,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(bs80),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_EasyBraille,\n .name = \"Easy Braille\",\n .textCells = 40,\n@@ -376,8 +376,8 @@\n .keyTableDefinition = &KEY_TABLE_DEFINITION(easy),\n .interpretByte = interpretByte_key,\n .writeCells = writeCells_statusAndText\n- }\n- ,\n+ },\n+\n { .identifier = HT_MODEL_ActiveBraille,\n .name = \"Active Braille\",\n .textCells = 40,\n@@ -388,8 +388,8 @@\n .setFirmness = setFirmness,\n .setSensitivity = setSensitivity_ActiveBraille,\n .hasATC = 1\n- }\n- ,\n+ },\n+\n #define HT_BASIC_BRAILLE(cells) \\\n { .identifier = HT_MODEL_BasicBraille##cells, \\\n .name = \"Basic Braille \" STRINGIFY(cells), \\\n@@ -406,15 +406,14 @@\n HT_BASIC_BRAILLE(48),\n HT_BASIC_BRAILLE(64),\n HT_BASIC_BRAILLE(80),\n- HT_BASIC_BRAILLE(160)\n+ HT_BASIC_BRAILLE(160),\n #undef HT_BASIC_BRAILLE\n- ,\n+\n { \/* end of table *\/\n .name = NULL\n }\n };\n \n-#define BRLROWS 1\n #define MAXIMUM_TEXT_CELLS 160\n #define MAXIMUM_STATUS_CELLS 4\n \n@@ -425,13 +424,17 @@\n } BrailleDisplayState;\n \n struct BrailleDataStruct {\n+ const ModelEntry *model; \/* points to terminal model config struct *\/\n+\n unsigned char rawData[MAXIMUM_TEXT_CELLS]; \/* translated data to send to Braille *\/\n unsigned char prevData[MAXIMUM_TEXT_CELLS]; \/* previously sent raw data *\/\n+\n unsigned char rawStatus[MAXIMUM_STATUS_CELLS]; \/* to hold status info *\/\n unsigned char prevStatus[MAXIMUM_STATUS_CELLS]; \/* to hold previous status *\/\n- const ModelEntry *model; \/* points to terminal model config struct *\/\n+\n BrailleDisplayState currentState;\n TimePeriod statePeriod;\n+\n unsigned int retryCount;\n unsigned char updateRequired;\n };\n@@ -467,12 +470,12 @@\n #define hidInputBuffer (&hidInputReport[2])\n static unsigned char hidInputOffset;\n \n-static int\n+static ssize_t\n getHidReport (\n UsbDevice *device, const UsbChannelDefinition *definition,\n- unsigned char number, unsigned char *buffer, int size\n+ unsigned char number, unsigned char *buffer, uint16_t size\n ) {\n- int result = usbHidGetReport(device, definition->interface,\n+ ssize_t result = usbHidGetReport(device, definition->interface,\n number, buffer, size, HT_HID_REPORT_TIMEOUT);\n if (result > 0 && buffer[0] != number) {\n logMessage(LOG_WARNING, \"unexpected HID report number: expected %02X, received %02X\",\n@@ -517,8 +520,8 @@\n \n if (hidReportSize_OutVersion) {\n unsigned char report[hidReportSize_OutVersion];\n- int result = gioGetHidReport(brl->gioEndpoint,\n- HT_HID_RPT_OutVersion, report, sizeof(report));\n+ ssize_t result = gioGetHidReport(brl->gioEndpoint,\n+ HT_HID_RPT_OutVersion, report, sizeof(report));\n \n if (result > 0) {\n hidFirmwareVersion = (report[1] << 8) | report[2];\n@@ -574,8 +577,8 @@\n startTimePeriod(&period, milliseconds);\n \n while (1) {\n- int result = getHidReport(device, definition, HT_HID_RPT_OutData, hidInputReport,\n- hidReportSize_OutData);\n+ ssize_t result = getHidReport(device, definition, HT_HID_RPT_OutData,\n+ hidInputReport, hidReportSize_OutData);\n \n if (result == -1) return 0;\n hidInputOffset = 0;\n@@ -832,7 +835,7 @@\n brl->data->model->statusCells, (brl->data->model->statusCells == 1)? \"cell\": \"cells\");\n \n brl->textColumns = brl->data->model->textCells; \/* initialise size of display *\/\n- brl->textRows = BRLROWS;\n+ brl->textRows = 1;\n brl->statusColumns = brl->data->model->statusCells;\n brl->statusRows = 1;\n \n@@ -1000,96 +1003,96 @@\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .serial = &serialParameters\n- }\n- ,\n+ },\n+\n { \/* FTDI chip *\/\n .vendor=0X0403, .product=0X6001,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=2,\n .serial = &serialParameters\n- }\n- ,\n+ },\n+\n { \/* Easy Braille (HID) *\/\n .vendor=0X1FE4, .product=0X0044,\n .configuration=1, .interface=0, .alternative=0,\n .data=&usbOperations2\n- }\n- ,\n+ },\n+\n { \/* Braille Star 40 (HID) *\/\n .vendor=0X1FE4, .product=0X0074,\n .configuration=1, .interface=0, .alternative=0,\n .data=&usbOperations2\n- }\n- ,\n+ },\n+\n { \/* USB-HID adapter *\/\n .vendor=0X1FE4, .product=0X0003,\n .configuration=1, .interface=0, .alternative=0,\n .data=&usbOperations2\n- }\n- ,\n+ },\n+\n { \/* Active Braille *\/\n .vendor=0X1FE4, .product=0X0054,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 16 *\/\n .vendor=0X1FE4, .product=0X0081,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 20 *\/\n .vendor=0X1FE4, .product=0X0082,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 32 *\/\n .vendor=0X1FE4, .product=0X0083,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 40 *\/\n .vendor=0X1FE4, .product=0X0084,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 48 *\/\n .vendor=0X1FE4, .product=0X008A,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 64 *\/\n .vendor=0X1FE4, .product=0X0086,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 80 *\/\n .vendor=0X1FE4, .product=0X0087,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { \/* Basic Braille 160 *\/\n .vendor=0X1FE4, .product=0X008B,\n .configuration=1, .interface=0, .alternative=0,\n .inputEndpoint=1, .outputEndpoint=1,\n .data=&usbOperations3\n- }\n- ,\n+ },\n+\n { .vendor=0 }\n };\n \n"} {"commit":"d2edd66ff5805fc9e219e11662336228347391ed","subject":"Remove unused member of ModuleLoader","message":"Remove unused member of ModuleLoader\n\nm_validItemPropertyNamesPerItem is not used anywhere.\n\nChange-Id: Ib81575e5937013dfc9436231df510c1afe50e90c\nReviewed-by: Christian Kandeler <3aa99dcdd3f0cac61fb81c2a11771c0cc2497607@qt.io>\n","repos":"qt-labs\/qbs,qt-labs\/qbs,qtproject\/qt-labs-qbs,qtproject\/qt-labs-qbs,qtproject\/qt-labs-qbs,qt-labs\/qbs,qtproject\/qt-labs-qbs,qt-labs\/qbs,qtproject\/qt-labs-qbs,qtproject\/qt-labs-qbs,qt-labs\/qbs,qtproject\/qt-labs-qbs,qt-labs\/qbs,qt-labs\/qbs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/corelib\/language\/moduleloader.h\n+++ src\/lib\/corelib\/language\/moduleloader.h\n@@ -284,7 +284,6 @@\n QStringList m_moduleSearchPaths;\n QMap<QString, QStringList> m_moduleDirListCache;\n ModuleItemCache m_modulePrototypeItemCache;\n- QHash<Item *, Set<QString>> m_validItemPropertyNamesPerItem;\n Set<Item *> m_disabledItems;\n QStack<bool> m_requiredChain;\n \n"} {"commit":"6b72efe5ee5a0637953a08789f31ab20493fdcb1","subject":"Use C89 prototype.","message":"Use C89 prototype.\n\nBy: Brett Nash (c89-is-18-years-old-lets-use-it.patch)\n\n\ngit-svn-id: de1cbd220ac9a29ed59a7cc342d87cbce0beeb96@31695 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"antognolli\/Evas,antognolli\/Evas,antognolli\/Evas,antognolli\/Evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/engines\/common\/evas_draw_main.c\n+++ src\/lib\/engines\/common\/evas_draw_main.c\n@@ -1,7 +1,7 @@\n #include \"evas_common.h\"\n \n EAPI Cutout_Rects*\n-evas_common_draw_context_cutouts_new()\n+evas_common_draw_context_cutouts_new(void)\n {\n Cutout_Rects *rects;\n \n"} {"commit":"6c7456f46ab54674b352c1ce91cd805274e37879","subject":"\t* evas: make WORD\/METRIC cache work with pipe rendering.","message":"\t* evas: make WORD\/METRIC cache work with pipe rendering.\n\n\ngit-svn-id: 24a995eca3b83137dd7eab3408044d7832e202f7@50381 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"antognolli\/Evas,antognolli\/Evas,antognolli\/Evas,antognolli\/Evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/engines\/common\/evas_font_draw.c\n+++ src\/lib\/engines\/common\/evas_font_draw.c\n@@ -44,7 +44,7 @@\n };\n \n \n-\n+LK(lock_words); \/\/ for word cache call\n static Eina_Inlist *words = NULL;\n static struct prword *evas_font_word_prerender(RGBA_Draw_Context *dc, const char *text, int len, RGBA_Font *fn, RGBA_Font_Int *fi,int use_kerning);\n \n@@ -511,7 +511,9 @@\n \tLKL(fi->ft_mutex);\n if (fi->src->current_size != fi->size)\n {\n+\t FTLOCK();\n FT_Activate_Size(fi->ft.size);\n+\t FTUNLOCK();\n fi->src->current_size = fi->size;\n }\n \t\/* hmmm kerning means i can't sanely do my own cached metric tables! *\/\n@@ -794,14 +796,17 @@\n \n const char *in_ss = eina_stringshare_add(in_text);\n \n+ LKL(lock_words);\n EINA_INLIST_FOREACH(words,w){\n \tif (w->len == len && w->font == fn && fi->size == w->size &&\n \t (w->str == in_ss)){\n \t words = eina_inlist_promote(words, EINA_INLIST_GET(w));\n \t eina_stringshare_del(in_ss);\n+\t LKU(lock_words);\n \t return w;\n \t}\n }\n+ LKU(lock_words);\n \n #ifdef INTERNATIONAL_SUPPORT\n \/*FIXME: should get the direction by parmater *\/\n@@ -828,9 +833,12 @@\n \tci->gl = evas_common_font_utf8_get_next((unsigned char *)text, &chr);\n \tif (ci->gl == 0) break;\n \tci->index = evas_common_font_glyph_search(fn, &fi, ci->gl);\n+\tLKL(fi->ft_mutex);\n \tif (fi->src->current_size != fi->size)\n \t {\n+\t FTLOCK();\n \t FT_Activate_Size(fi->ft.size);\n+\t FTUNLOCK();\n fi->src->current_size = fi->size;\n }\n \tif (use_kerning && char_index && (pface == fi->src->ft.face))\n@@ -841,6 +849,7 @@\n \t }\n pface = fi->src->ft.face;\n ci->fg = evas_common_font_int_cache_glyph_get(fi, ci->index);\n+ LKU(fi->ft_mutex);\n if (!ci->fg) continue;\n if (gl){\n \t ci->fg->ext_dat =dc->font_ext.func.gl_new(dc->font_ext.data,ci->fg);\n@@ -893,6 +902,7 @@\n save->roww = width;\n save->height = height;\n save->baseline = baseline;\n+ LKL(lock_words);\n words = eina_inlist_prepend(words, EINA_INLIST_GET(save));\n \n \/* Clean up if too long *\/\n@@ -904,6 +914,7 @@\n \twords = eina_inlist_remove(words,EINA_INLIST_GET(last));\n \tfree(last);\n }\n+ LKU(lock_words);\n \n #ifdef INTERNATIONAL_SUPPORT\n if (level_list) free(level_list);\n"} {"commit":"d5d2c97babe10fc695f8273dee64527fd5e95e15","subject":"CBSE-3717: Disable assertions for dropping connections with rbytes>0","message":"CBSE-3717: Disable assertions for dropping connections with rbytes>0\n\nDisabling the assertion allows the connection to be closed and\nserver to continue to operate.\n\nIt does however _NOT_ solve the reason _why_ the connection\nisn't found in the list (The logging added in the previous\npatch may sched some light on that)\n\nChange-Id: Ie8ea56d2390a49ec674d7d03d58b910ca728f64c\nReviewed-on: http:\/\/review.couchbase.org\/77931\nTested-by: Build Bot <80754af91bfb6d1073585b046fe0a474ce868509@couchbase.com>\nReviewed-by: Dave Rigby <a09264da4832c7ff1d3bf1608a19f4b870f93750@couchbase.com>\n","repos":"couchbase\/moxi,membase\/moxi,couchbase\/moxi,couchbase\/moxi,couchbase\/moxi,membase\/moxi,membase\/moxi,membase\/moxi,membase\/moxi,membase\/moxi,couchbase\/moxi,couchbase\/moxi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cproxy.c\n+++ src\/cproxy.c\n@@ -2219,29 +2219,22 @@\n if (!d || c->rbytes > 0) {\n zstored_downstream_conns *conns;\n \n- if (settings.verbose) {\n- moxi_log_write(\"%d: Closed the downstream since got\"\n- \"an event on downstream or extra data on downstream\\n\",\n- c->sfd);\n- }\n+ moxi_log_write(\"%d: Closed the downstream since got\"\n+ \"an event on downstream or extra data on downstream.\"\n+ \" (rbytes: %u)\\n\", c->sfd, c->rbytes);\n \n conns = zstored_get_downstream_conns(c->thread, c->host_ident);\n if (conns) {\n bool found = false;\n conns->dc = conn_list_remove(conns->dc, NULL, c, &found);\n if (!found) {\n- cb_assert(0);\n- if (settings.verbose) {\n- moxi_log_write(\"<%d Not able to find in zstore conns\\n\",\n- c->sfd);\n- }\n+ moxi_log_write(\"<%d: %s:%s Not able to find connection\"\n+ \" in zstore conns\\n\",\n+ c->sfd, __FILE__, __LINE__);\n }\n } else {\n- cb_assert(0);\n- if (settings.verbose) {\n- moxi_log_write(\"<%d Not able to find zstore conns\\n\",\n- c->sfd);\n- }\n+ moxi_log_write(\"<%d %s:%s Not able to find zstore conns\\n\",\n+ c->sfd, __FILE__, __LINE__);\n }\n cproxy_close_conn(c);\n return;\n"} {"commit":"152b65fb39c4f2a6b907ef35884ef8d4df90138f","subject":"use explicit Block\/VectorBlock xprs to make sure that compile-time known sizes are used","message":"use explicit Block\/VectorBlock xprs to make sure that compile-time known sizes are used\n","repos":"robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/Householder\/Householder.h\n+++ Eigen\/src\/Householder\/Householder.h\n@@ -50,7 +50,8 @@\n Scalar sign = coeff(0) \/ ei_abs(coeff(0));\n c0 = coeff(0) + sign * ei_sqrt(_squaredNorm);\n }\n- *essential = end(size()-1) \/ c0; \/\/ FIXME take advantage of fixed size\n+ VectorBlock<Derived, EssentialPart::SizeAtCompileTime> tail(derived(), 1, size()-1);\n+ *essential = tail \/ c0;\n const RealScalar c0abs2 = ei_abs2(c0);\n *beta = RealScalar(2) * c0abs2 \/ (c0abs2 + _squaredNorm - ei_abs2(coeff(0)));\n }\n@@ -62,12 +63,10 @@\n const RealScalar& beta)\n {\n Matrix<Scalar, 1, ColsAtCompileTime, PlainMatrixType::Options, 1, MaxColsAtCompileTime> tmp(cols());\n- tmp = row(0) + essential.adjoint() * block(1,0,rows()-1,cols());\n- \/\/ FIXME take advantage of fixed size\n- \/\/ FIXME play with lazy()\n- \/\/ FIXME maybe not a good idea to use matrix product\n+ Block<Derived, EssentialPart::SizeAtCompileTime, Derived::ColsAtCompileTime> bottom(derived(), 1, 0, rows()-1, cols());\n+ tmp = row(0) + essential.adjoint() * bottom;\n row(0) -= beta * tmp;\n- block(1,0,rows()-1,cols()) -= beta * essential * tmp;\n+ bottom -= beta * essential * tmp;\n }\n \n template<typename Derived>\n@@ -77,12 +76,10 @@\n const RealScalar& beta)\n {\n Matrix<Scalar, RowsAtCompileTime, 1, PlainMatrixType::Options, MaxRowsAtCompileTime, 1> tmp(rows());\n- tmp = col(0) + block(0,1,rows(),cols()-1) * essential.conjugate();\n- \/\/ FIXME take advantage of fixed size\n- \/\/ FIXME play with lazy()\n- \/\/ FIXME maybe not a good idea to use matrix product\n+ Block<Derived, Derived::RowsAtCompileTime, EssentialPart::SizeAtCompileTime> right(derived(), 0, 1, rows(), cols()-1);\n+ tmp = col(0) + right * essential.conjugate();\n col(0) -= beta * tmp;\n- block(0,1,rows(),cols()-1) -= beta * tmp * essential.transpose();\n+ right -= beta * tmp * essential.transpose();\n }\n \n #endif \/\/ EIGEN_HOUSEHOLDER_H\n"} {"commit":"601a75dd490b740cc42e5bbd2370333354b714b6","subject":"fix unbound bitfield access","message":"fix unbound bitfield access\n\nThis commit was SVN r2507.\n","repos":"ggouaillardet\/hwloc,ggouaillardet\/hwloc,shekkbuilder\/hwloc,shekkbuilder\/hwloc,shekkbuilder\/hwloc,ggouaillardet\/hwloc,ggouaillardet\/hwloc,shekkbuilder\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cpuset.c\n+++ src\/cpuset.c\n@@ -925,8 +925,8 @@\n \t\tunsigned long w1 = HWLOC_CPUSUBSET_READULONG(set1, i);\n \t\tunsigned long w2 = HWLOC_CPUSUBSET_READULONG(set2, i);\n \t\tif (w1 || w2) {\n-\t\t\tint _ffs1 = hwloc_ffsl(set1->ulongs[i]);\n-\t\t\tint _ffs2 = hwloc_ffsl(set2->ulongs[i]);\n+\t\t\tint _ffs1 = hwloc_ffsl(w1);\n+\t\t\tint _ffs2 = hwloc_ffsl(w2);\n \t\t\t\/* if both have a bit set, compare for real *\/\n \t\t\tif (_ffs1 && _ffs2)\n \t\t\t\treturn _ffs1-_ffs2;\n"} {"commit":"45d165bf958cf92e6801987bb174dffe72f377bb","subject":"Fix bug 678: vectors of row and columns transpositions were not properly resized in FullPivQR (grafted from 23694613ae7ec72e969ae2f282cd84f5f9655d56)","message":"Fix bug 678: vectors of row and columns transpositions were not properly resized in FullPivQR\n(grafted from 23694613ae7ec72e969ae2f282cd84f5f9655d56)\n\n--HG--\nbranch : 3.2\n","repos":"robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen,robustrobotics\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/QR\/FullPivHouseholderQR.h\n+++ Eigen\/src\/QR\/FullPivHouseholderQR.h\n@@ -418,8 +418,8 @@\n \n m_precision = NumTraits<Scalar>::epsilon() * size;\n \n- m_rows_transpositions.resize(matrix.rows());\n- m_cols_transpositions.resize(matrix.cols());\n+ m_rows_transpositions.resize(size);\n+ m_cols_transpositions.resize(size);\n Index number_of_transpositions = 0;\n \n RealScalar biggest(0);\n"} {"commit":"1f6efcd964a1ce2affc35010964c847a9702557c","subject":"Bug 1048: fix unused variable warning","message":"Bug 1048: fix unused variable warning\n","repos":"TSC21\/Eigen,ROCmSoftwarePlatform\/hipeigen,ROCmSoftwarePlatform\/hipeigen,TSC21\/Eigen,ritsu1228\/eigen,ROCmSoftwarePlatform\/hipeigen,pasuka\/eigen,ritsu1228\/eigen,pasuka\/eigen,ritsu1228\/eigen,TSC21\/Eigen,ROCmSoftwarePlatform\/hipeigen,pasuka\/eigen,pasuka\/eigen,ritsu1228\/eigen,pasuka\/eigen,TSC21\/Eigen,ritsu1228\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/SparseCore\/SparseVector.h\n+++ Eigen\/src\/SparseCore\/SparseVector.h\n@@ -170,6 +170,7 @@\n \n Index inner = IsColVector ? row : col;\n Index outer = IsColVector ? col : row;\n+ EIGEN_ONLY_USED_FOR_DEBUG(outer);\n eigen_assert(outer==0);\n return insert(inner);\n }\n"} {"commit":"bc86f4cb335deebc4bd7e59db33ad503b04a827d","subject":"daemon: only wait for immediate child YAZ-704","message":"daemon: only wait for immediate child YAZ-704\n\nrather than all children.\n","repos":"dcrossleyau\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/daemon.c\n+++ src\/daemon.c\n@@ -127,7 +127,7 @@\n \/* enable signalling in kill_child_handler *\/\n child_pid = p;\n \n- p1 = wait(&status);\n+ p1 = waitpid(p, &status, 0);\n \n \/* disable signalling in kill_child_handler *\/\n child_pid = 0;\n"} {"commit":"fa13d40db3b3e9865df90ce56ad179efb6b8f198","subject":"libtracker-miner: Fallback to URN querying on UPDATE events and API requests","message":"libtracker-miner: Fallback to URN querying on UPDATE events and API requests\n\nOtherwise the item is mistaken as new, which trigger warnings due to\nthe duplicate insert.\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=729708\n","repos":"outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libtracker-miner\/tracker-miner-fs.c\n+++ src\/libtracker-miner\/tracker-miner-fs.c\n@@ -2560,18 +2560,27 @@\n }\n \n static void\n-miner_fs_queue_file (TrackerMinerFS *fs,\n-\t\t TrackerPriorityQueue *item_queue,\n-\t\t GFile *file)\n+miner_fs_cache_file_urn (TrackerMinerFS *fs,\n+ GFile *file,\n+ gboolean query_urn)\n {\n \tconst gchar *urn;\n-\tgint priority;\n \n \t\/* Store urn as qdata *\/\n-\turn = tracker_file_notifier_get_file_iri (fs->priv->file_notifier, file, FALSE);\n+\turn = tracker_file_notifier_get_file_iri (fs->priv->file_notifier, file, query_urn);\n \tg_object_set_qdata_full (G_OBJECT (file), quark_file_iri,\n \t g_strdup (urn), (GDestroyNotify) g_free);\n-\n+}\n+\n+static void\n+miner_fs_queue_file (TrackerMinerFS *fs,\n+ TrackerPriorityQueue *item_queue,\n+ GFile *file,\n+ gboolean query_urn)\n+{\n+\tgint priority;\n+\n+\tminer_fs_cache_file_urn (fs, file, query_urn);\n \tpriority = miner_fs_get_queue_priority (fs, file);\n \ttracker_priority_queue_add (item_queue, g_object_ref (file), priority);\n }\n@@ -2702,7 +2711,7 @@\n \t\t\t *\/\n \t\t\tg_debug (\" Found matching unhandled CREATED event \"\n \t\t\t \"for source file, merging both events together\");\n-\t\t\tminer_fs_queue_file (fs, fs->priv->items_created, other_file);\n+\t\t\tminer_fs_queue_file (fs, fs->priv->items_created, other_file, FALSE);\n \n \t\t\treturn FALSE;\n \t\t}\n@@ -2737,7 +2746,7 @@\n \tTrackerMinerFS *fs = user_data;\n \n \tif (check_item_queues (fs, QUEUE_CREATED, file, NULL)) {\n-\t\tminer_fs_queue_file (fs, fs->priv->items_created, file);\n+\t\tminer_fs_queue_file (fs, fs->priv->items_created, file, FALSE);\n \t\titem_queue_handlers_set_up (fs);\n \t}\n }\n@@ -2750,7 +2759,7 @@\n \tTrackerMinerFS *fs = user_data;\n \n \tif (check_item_queues (fs, QUEUE_DELETED, file, NULL)) {\n-\t\tminer_fs_queue_file (fs, fs->priv->items_deleted, file);\n+\t\tminer_fs_queue_file (fs, fs->priv->items_deleted, file, FALSE);\n \t\titem_queue_handlers_set_up (fs);\n \t}\n }\n@@ -2781,7 +2790,7 @@\n \t\t\t GINT_TO_POINTER (TRUE));\n \t\t}\n \n-\t\tminer_fs_queue_file (fs, fs->priv->items_updated, file);\n+\t\tminer_fs_queue_file (fs, fs->priv->items_updated, file, TRUE);\n \t\titem_queue_handlers_set_up (fs);\n \t}\n }\n@@ -3104,7 +3113,7 @@\n \t\t\t * to preserve remove_full() semantics.\n \t\t\t *\/\n \t\t\ttrace_eq_push_tail (\"DELETED\", file, \"on remove full\");\n-\t\t\tminer_fs_queue_file (fs, fs->priv->items_deleted, file);\n+\t\t\tminer_fs_queue_file (fs, fs->priv->items_deleted, file, FALSE);\n \t\t\titem_queue_handlers_set_up (fs);\n \t\t}\n \n@@ -3148,7 +3157,7 @@\n \n \tfor (p = parents; p; p = p->next) {\n \t\ttrace_eq_push_tail (\"UPDATED\", p->data, \"checking file parents\");\n-\t\tminer_fs_queue_file (fs, fs->priv->items_updated, p->data);\n+\t\tminer_fs_queue_file (fs, fs->priv->items_updated, p->data, TRUE);\n \t\tg_object_unref (p->data);\n \t}\n \n@@ -3199,6 +3208,7 @@\n \t\t}\n \n \t\ttrace_eq_push_tail (\"UPDATED\", file, \"Requested by application\");\n+\t\tminer_fs_cache_file_urn (fs, file, TRUE);\n \t\ttracker_priority_queue_add (fs->priv->items_updated,\n \t\t g_object_ref (file),\n \t\t priority);\n"} {"commit":"515e2f928979d57356dd1a2e6b87211b7c1e8c73","subject":"libtracker-miner: fix deprecation comment format","message":"libtracker-miner: fix deprecation comment format\n","repos":"outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libtracker-miner\/tracker-miner-fs.c\n+++ src\/libtracker-miner\/tracker-miner-fs.c\n@@ -452,7 +452,7 @@\n \t *\n \t * Since: 0.8\n \t *\n-\t * Deprecated since: 0.12\n+\t * Deprecated: 0.12\n \t **\/\n \tsignals[IGNORE_NEXT_UPDATE_FILE] =\n \t\tg_signal_new (\"ignore-next-update-file\",\n"} {"commit":"d12aa59e7b0a87604a3f26d283e6279746a1ff6a","subject":"Return proper error replies to DiscoverServices","message":"Return proper error replies to DiscoverServices\n","repos":"mapfau\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/device.c\n+++ src\/device.c\n@@ -1021,11 +1021,26 @@\n \tbuff->data_size += len;\n }\n \n-static void discover_device_reply(struct browse_req *req, sdp_list_t *recs)\n+static void discover_services_reply(struct browse_req *req, int err,\n+\t\t\t\t\t\t\tsdp_list_t *recs)\n {\n \tDBusMessage *reply;\n \tDBusMessageIter iter, dict;\n \tsdp_list_t *seq;\n+\n+\tif (err) {\n+\t\tconst char *err_if;\n+\n+\t\tif (err == -EHOSTDOWN)\n+\t\t\terr_if = ERROR_INTERFACE \".ConnectionAttemptFailed\";\n+\t\telse\n+\t\t\terr_if = ERROR_INTERFACE \".Failed\";\n+\n+\t\treply = dbus_message_new_error(req->msg, err_if,\n+\t\t\t\t\t\t\tstrerror(-err));\n+\t\tg_dbus_send_message(req->conn, reply);\n+\t\treturn;\n+\t}\n \n \treply = dbus_message_new_method_return(req->msg);\n \tif (!reply)\n@@ -1258,7 +1273,7 @@\n \n \tif (dbus_message_is_method_call(req->msg, DEVICE_INTERFACE,\n \t\t\t\t\t\"DiscoverServices\")) {\n-\t\tdiscover_device_reply(req, req->records);\n+\t\tdiscover_services_reply(req, err, req->records);\n \t\tgoto cleanup;\n \t}\n \n"} {"commit":"7167f81d9b5705e1f97d08c9b0d59603c6daf3d5","subject":"libtracker-miner: Revert deletion of original resource on update","message":"libtracker-miner: Revert deletion of original resource on update\n\nThis reverts commit cb0c4c59e60294a455be8f4263dc1fafdc27527c. The real\nbug was in IRI cache invalidation, which is now fixed. File update\nshould not trigger a complete resource deletion, it should only delete\nembedded metadata.\n","repos":"outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libtracker-miner\/tracker-miner-fs.c\n+++ src\/libtracker-miner\/tracker-miner-fs.c\n@@ -64,7 +64,6 @@\n \tgchar *parent_urn;\n \tGCancellable *cancellable;\n \tTrackerSparqlBuilder *builder;\n-\tgboolean update;\n } ProcessData;\n \n typedef struct {\n@@ -562,11 +561,10 @@\n \n static ProcessData *\n process_data_new (GFile *file,\n- const gchar *urn,\n- const gchar *parent_urn,\n+\t\t const gchar *urn,\n+\t\t const gchar *parent_urn,\n GCancellable *cancellable,\n- TrackerSparqlBuilder *builder,\n- gboolean update)\n+ TrackerSparqlBuilder *builder)\n {\n \tProcessData *data;\n \n@@ -574,7 +572,6 @@\n \tdata->file = g_object_ref (file);\n \tdata->urn = g_strdup (urn);\n \tdata->parent_urn = g_strdup (parent_urn);\n-\tdata->update = update;\n \n \tif (cancellable) {\n \t\tdata->cancellable = g_object_ref (cancellable);\n@@ -1365,13 +1362,8 @@\n \n \t\tg_debug (\"Adding item '%s'\", uri);\n \n-\t\tif (data->update) {\n-\t\t\tfull_sparql = g_strdup_printf (\"DELETE { ?res a rdfs:Resource } WHERE { ?res nie:url \\\"%s\\\" } %s\",\n-\t\t\t uri, tracker_sparql_builder_get_result (data->builder));\n-\t\t} else {\n-\t\t\tfull_sparql = g_strdup_printf (\"DROP GRAPH <%s> %s\",\n-\t\t\t uri, tracker_sparql_builder_get_result (data->builder));\n-\t\t}\n+\t\tfull_sparql = g_strdup_printf (\"DROP GRAPH <%s> %s\",\n+\t\t uri, tracker_sparql_builder_get_result (data->builder));\n \n \t\ttracker_miner_execute_batch_update (TRACKER_MINER (fs),\n \t\t full_sparql,\n@@ -1386,8 +1378,7 @@\n \n static gboolean\n item_add_or_update (TrackerMinerFS *fs,\n- GFile *file,\n- gboolean update)\n+ GFile *file)\n {\n \tTrackerMinerFSPrivate *priv;\n \tTrackerSparqlBuilder *sparql;\n@@ -1436,7 +1427,7 @@\n \n \turn = iri_cache_lookup (fs, file);\n \n-\tdata = process_data_new (file, urn, parent_urn, cancellable, sparql, update);\n+\tdata = process_data_new (file, urn, parent_urn, cancellable, sparql);\n \tpriv->processing_pool = g_list_prepend (priv->processing_pool, data);\n \n \tif (do_process_file (fs, data)) {\n@@ -1505,7 +1496,7 @@\n \t \"}\",\n \t uri);\n \n-\tdata = process_data_new (file, NULL, NULL, NULL, NULL, FALSE);\n+\tdata = process_data_new (file, NULL, NULL, NULL, NULL);\n \tfs->private->processing_pool = g_list_prepend (fs->private->processing_pool, data);\n \n \ttracker_miner_execute_batch_update (TRACKER_MINER (fs),\n@@ -1750,7 +1741,7 @@\n \t\t\ttracker_miner_fs_directory_add_internal (fs, file);\n \t\t\tretval = TRUE;\n \t\t} else {\n-\t\t\tretval = item_add_or_update (fs, file, FALSE);\n+\t\t\tretval = item_add_or_update (fs, file);\n \t\t}\n \n \t\tg_free (source_uri);\n@@ -1815,7 +1806,7 @@\n \n \tg_main_loop_unref (move_data.main_loop);\n \n-\tdata = process_data_new (file, NULL, NULL, NULL, NULL, FALSE);\n+\tdata = process_data_new (file, NULL, NULL, NULL, NULL);\n \tfs->private->processing_pool = g_list_prepend (fs->private->processing_pool, data);\n \n \ttracker_miner_execute_batch_update (TRACKER_MINER (fs),\n@@ -2154,10 +2145,8 @@\n \t\tkeep_processing = item_remove (fs, file);\n \t\tbreak;\n \tcase QUEUE_CREATED:\n-\t\tkeep_processing = item_add_or_update (fs, file, FALSE);\n-\t\tbreak;\n \tcase QUEUE_UPDATED:\n-\t\tkeep_processing = item_add_or_update (fs, file, TRUE);\n+\t\tkeep_processing = item_add_or_update (fs, file);\n \t\tbreak;\n \tcase QUEUE_IGNORE_NEXT_UPDATE:\n \t\tkeep_processing = item_ignore_next_update (fs, file, source_file);\n"} {"commit":"ff613f4665eda3a498a23493e75d2cacad02f5c6","subject":"Use SSL_OP_CIPHER_SERVER_PREFERENCE by default.","message":"Use SSL_OP_CIPHER_SERVER_PREFERENCE by default.\n","repos":"korusdipl\/kore,bonifaido\/kore,bonifaido\/kore,zhcy\/kore,fourdollars\/kore,hhua\/kore,hhua\/kore,hhua\/kore,bonifaido\/kore,jorisvink\/kore,jorisvink\/kore,sinemetu1\/kore","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/domain.c\n+++ src\/domain.c\n@@ -83,9 +83,12 @@\n \t\tSSL_CTX_set_options(dom->ssl_ctx, SSL_OP_NO_COMPRESSION);\n \n \tSSL_CTX_set_mode(dom->ssl_ctx, SSL_MODE_RELEASE_BUFFERS);\n+\tSSL_CTX_set_mode(dom->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);\n+\n+\tSSL_CTX_set_options(dom->ssl_ctx, SSL_OP_NO_SSLv2);\n+\tSSL_CTX_set_options(dom->ssl_ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);\n \tSSL_CTX_set_cipher_list(dom->ssl_ctx, kore_ssl_cipher_list);\n-\tSSL_CTX_set_mode(dom->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);\n-\tSSL_CTX_set_options(dom->ssl_ctx, SSL_OP_NO_SSLv2);\n+\n \tSSL_CTX_set_tlsext_servername_callback(dom->ssl_ctx, kore_ssl_sni_cb);\n \tSSL_CTX_set_next_protos_advertised_cb(dom->ssl_ctx,\n \t kore_ssl_npn_cb, NULL);\n"} {"commit":"7bdbd1fb59199f8971e5d02c490f4e269a7271e9","subject":"[update] updated the posix_layer to print errno value whenever it fails to connect","message":"[update] updated the posix_layer to print errno value whenever it fails to connect\n","repos":"foss-for-synopsys-dwc-arc-processors\/libxively,foss-for-synopsys-dwc-arc-processors\/libxively","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libxively\/io\/posix\/posix_io_layer.c\n+++ src\/libxively\/io\/posix\/posix_io_layer.c\n@@ -249,6 +249,7 @@\n \n if( connect( posix_data->socket_fd, ( struct sockaddr* ) &name, sizeof( struct sockaddr ) ) == -1 )\n {\n+ xi_debug_format( \"errno: %d\", errno );\n xi_debug_logger( \"Connecting to the endpoint [failed]\" );\n xi_set_err( XI_SOCKET_CONNECTION_ERROR );\n goto err_handling;\n"} {"commit":"fea1b5fdc844e13a0479c2e9974b5b23bcd0889b","subject":"Some functional code","message":"Some functional code\n","repos":"scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres,scvalencia\/ROBOCOL_desastres","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/driver.c\n+++ src\/driver.c\n@@ -4,6 +4,7 @@\n #include <ctype.h>\n #include <string.h>\n #include <math.h>\n+#include <pthread.h>\n #include \"robocol_queue.h\"\n #include \"robocol_list.h\"\n #include \"command.h\"\n"} {"commit":"a8f3ef6354a31981d98821dbd3b8f20bff19863e","subject":"local-metadata: Fixes to video_sanitise_string non-alnum handling","message":"local-metadata: Fixes to video_sanitise_string non-alnum handling\n\n- Extract loop condition into a helper function\n- Use g_utf8_get_char to properly convert to unichar\n- Be more defensive about g_utf8_find_prev_char returning NULL\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=748604\n","repos":"MikePetullo\/grilo-plugins,MikePetullo\/grilo-plugins,MikePetullo\/grilo-plugins,jasuarez\/grilo-plugins,jasuarez\/grilo-plugins,grilofw\/grilo-plugins,GNOME\/grilo-plugins,grilofw\/grilo-plugins,GNOME\/grilo-plugins","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/local-metadata\/grl-local-metadata.c\n+++ src\/local-metadata\/grl-local-metadata.c\n@@ -242,6 +242,28 @@\n \n \/* ======================= Utilities ==================== *\/\n \n+static gboolean\n+is_nonalnum (const gchar *str)\n+{\n+ gunichar uchar;\n+\n+ if (str == NULL) {\n+ return FALSE;\n+ }\n+\n+ uchar = g_utf8_get_char (str);\n+\n+ if (g_unichar_isalnum (uchar)) {\n+ return FALSE;\n+ }\n+\n+ if (uchar == '!' || uchar == '?' || uchar == '.') {\n+ return FALSE;\n+ }\n+\n+ return TRUE;\n+}\n+\n static gchar *\n video_sanitise_string (const gchar *str)\n {\n@@ -270,22 +292,17 @@\n }\n \n if (*line_end != '\\0') {\n- line_end = g_utf8_find_prev_char (line, line_end);\n-\n+ \/* After removing substring with blacklisted word, ignore non alpha-numeric\n+ * char in the end of the sanitised string *\/\n+ do {\n+ line_end = g_utf8_find_prev_char (line, line_end);\n+ } while (is_nonalnum (line_end));\n \n \/* If everything in the string is blacklisted, just ignore\n * the blackisting logic.\n *\/\n- if (line_end == NULL)\n+ if (line_end == NULL) {\n return g_strdup (str);\n-\n- \/* After removing substring with blacklisted word, ignore non alpha-numeric\n- * char in the end of the sanitised string *\/\n- while (g_unichar_isalnum (*line_end) == FALSE &&\n- *line_end != '!' &&\n- *line_end != '?' &&\n- *line_end != '.') {\n- line_end = g_utf8_find_prev_char (line, line_end);\n }\n \n return g_strndup (line, line_end - line);\n"} {"commit":"644344b29e3705ab1535a40136e908fb13bab212","subject":"Fixed newly placed notes not being selected.","message":"Fixed newly placed notes not being selected.","repos":"vmoll\/editor-on-fire,mrbungle73\/editor-on-fire,vmoll\/editor-on-fire,vmoll\/editor-on-fire,vmoll\/editor-on-fire,mrbungle73\/editor-on-fire,mrbungle73\/editor-on-fire,mrbungle73\/editor-on-fire,mrbungle73\/editor-on-fire,vmoll\/editor-on-fire","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/editor.c\n+++ src\/editor.c\n@@ -1325,7 +1325,7 @@\n \t\t\t\t\t\t\t\teof_selection.track = eof_selected_track;\n \t\t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\t\teof_selection.multi[eof_selection.current] = 1;\n \t\t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n@@ -1376,7 +1376,7 @@\n \t\t\t\t\t\t\t\teof_selection.track = eof_selected_track;\n \t\t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\t\teof_selection.multi[eof_selection.current] = 1;\n \t\t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n@@ -1427,7 +1427,7 @@\n \t\t\t\t\t\t\t\teof_selection.track = eof_selected_track;\n \t\t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\t\teof_selection.multi[eof_selection.current] = 1;\n \t\t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n@@ -1478,7 +1478,7 @@\n \t\t\t\t\t\t\t\teof_selection.track = eof_selected_track;\n \t\t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\t\teof_selection.multi[eof_selection.current] = 1;\n \t\t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n@@ -1529,7 +1529,7 @@\n \t\t\t\t\t\t\t\teof_selection.track = eof_selected_track;\n \t\t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\t\teof_selection.multi[eof_selection.current] = 1;\n \t\t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n@@ -2939,7 +2939,7 @@\n \t\t\t\t\t\t\teof_selection.range_pos_2 = eof_selection.current_pos;\n \t\t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\t\teof_detect_difficulties(eof_song);\n \t\t\t\t\t\t}\n@@ -2961,7 +2961,7 @@\n \t\t\t\t\t\teof_selection.range_pos_2 = eof_selection.current_pos;\n \t\t\t\t\t\tmemset(eof_selection.multi, 0, sizeof(char) * EOF_MAX_NOTES);\n \t\t\t\t\t\teof_track_sort_notes(eof_song->track[eof_selected_track]);\n-\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 1);\n+\t\t\t\t\t\teof_track_fixup_notes(eof_song->track[eof_selected_track], 0);\n \t\t\t\t\t\teof_determine_hopos();\n \t\t\t\t\t\teof_detect_difficulties(eof_song);\n \t\t\t\t\t}\n"} {"commit":"c86fe4e7d007c75384861d29e9a87de8a3f90aa2","subject":"Fix for issue 41. I was forgetting that pen_lyric.pos is set to the note position if we are hovering over a note.","message":"Fix for issue 41. I was forgetting that pen_lyric.pos is set to the note position if we are hovering over a note.","repos":"m0j0hn\/editor-on-fire,m0j0hn\/editor-on-fire,destroyer07\/editor-on-fire,destroyer07\/editor-on-fire,destroyer07\/editor-on-fire,m0j0hn\/editor-on-fire,m0j0hn\/editor-on-fire,destroyer07\/editor-on-fire","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/editor.c\n+++ src\/editor.c\n@@ -3600,9 +3600,11 @@\n \t\t{\n \t\t\tint pos = eof_music_pos \/ eof_zoom;\n \t\t\tint lpos = pos < 300 ? (mouse_x - 20) * eof_zoom : ((pos - 300) + mouse_x - 20) * eof_zoom;\n+\t\t\tint rpos = 0; \/\/ place to store pen_lyric.pos in case we are hovering over a note and need the original position before it was changed to the note location\n \t\t\teof_snap_logic(&eof_snap, lpos);\n \t\t\teof_snap_length_logic(&eof_snap);\n \t\t\teof_pen_lyric.pos = eof_snap.pos;\n+\t\t\trpos = eof_pen_lyric.pos;\n \t\t\teof_pen_lyric.length = eof_snap.length;\n \t\t\teof_pen_lyric.note = eof_vocals_offset + (EOF_EDITOR_RENDER_OFFSET + 35 + eof_screen_layout.vocal_y - mouse_y) \/ eof_screen_layout.vocal_tail_size;\n \t\t\tif(eof_pen_lyric.note < eof_vocals_offset || eof_pen_lyric.note >= eof_vocals_offset + eof_screen_layout.vocal_view_size)\n@@ -3695,7 +3697,7 @@\n \t\t\t\t\t}\n \t\t\t\t\teof_pegged_note = eof_selection.current;\n \t\t\t\t\teof_peg_x = eof_song->vocal_track->lyric[eof_pegged_note]->pos - eof_pen_lyric.pos;\n-\t\t\t\t\teof_last_pen_pos = eof_pen_lyric.pos;\n+\t\t\t\t\teof_last_pen_pos = rpos;\n \t\t\t\t\tif(!KEY_EITHER_CTRL)\n \t\t\t\t\t{\n \n@@ -3896,7 +3898,7 @@\n \t\t\t\t\tif(eof_snap_mode != EOF_SNAP_OFF && !KEY_EITHER_CTRL)\n \t\t\t\t\t{\n \t\t\t\t\t\tmove_offset = eof_pen_lyric.pos - eof_last_pen_pos;\n-\t\t\t\t\t\teof_last_pen_pos = eof_pen_lyric.pos;\n+\t\t\t\t\t\teof_last_pen_pos = rpos;\n \t\t\t\t\t}\n \t\t\t\t\tif(!eof_undo_toggle && (move_offset != 0 || eof_snap_mode == EOF_SNAP_OFF || KEY_EITHER_CTRL))\n \t\t\t\t\t{\n"} {"commit":"bc692a0bc4cc0650111f778edc137992c05ff36d","subject":"editor: better placement when deleting rows and swapping with empty row when deleting last line","message":"editor: better placement when deleting rows and swapping with empty row when deleting last line\n","repos":"jonruttan\/e,hellerve\/e,hellerve\/e,jonruttan\/e","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- src\/editor.c\n+++ src\/editor.c\n@@ -490,10 +490,12 @@\n return new;\n }\n case 'h': {\n- if (ctx->nrows < 2) return ctx;\n e_context* new = e_context_copy(ctx);\n new->history = ctx;\n e_clipboard_copy(new->row[new->cy].str);\n+ if (new->nrows == 1) {\n+ e_insert_row(new, 1, (char*) \"\", 0);\n+ }\n e_del_row(new, new->cy);\n return new;\n }\n@@ -789,6 +791,7 @@\n for (i = at; i <= ctx->nrows-1; i++) ctx->row[i].idx--;\n ctx->nrows--;\n if (ctx->cy >= ctx->nrows) ctx->cy--;\n+ if (ctx->cx >= ctx->row[ctx->cy].size) ctx->cx = ctx->row[ctx->cy].size;\n ctx->dirty = 1;\n }\n \n"} {"commit":"d8bb95a940fc5352ca2b21dafcce06eb0a164d1a","subject":"Do not add test data to output","message":"Do not add test data to output\n","repos":"ndim\/erlusb,ndim\/erlusb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/erlusb.c\n+++ src\/erlusb.c\n@@ -92,10 +92,6 @@\n }\n \n if (wb->index > wb_empty_index) {\n- CHECK_EI(ei_x_encode_tuple_header(wb, 2));\n- CHECK_EI(ei_x_encode_atom(wb, \"moo\"));\n- CHECK_EI(ei_x_encode_long(wb, (long) 13));\n-\n log_printf(\"writing message: wb->buffsz=%d wb->index=%d\\n\", wb->buffsz, wb->index);\n log_data(wb->buff, wb->index);\n write_cmd(wb->buff, wb->index);\n"} {"commit":"06f58f16f5c5a241320b35ee629e98c87231f080","subject":"ptc's last patch used interp incorrectly. In this case, interp was a local variable, not the interp passed in. Reverted the patch, and moved interp's scope closer so that it doesn't accidentally happen again.","message":"ptc's last patch used interp incorrectly. In this case, interp was a local variable, not the interp passed in. Reverted the patch, and moved interp's scope closer so that it doesn't accidentally happen again.\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@19449 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"gitster\/parrot,gitster\/parrot,fernandobrito\/parrot,fernandobrito\/parrot,tewk\/parrot-select,youprofit\/parrot,tewk\/parrot-select,FROGGS\/parrot,FROGGS\/parrot,parrot\/parrot,FROGGS\/parrot,parrot\/parrot,tkob\/parrot,tewk\/parrot-select,FROGGS\/parrot,youprofit\/parrot,tewk\/parrot-select,gagern\/parrot,youprofit\/parrot,tkob\/parrot,fernandobrito\/parrot,tkob\/parrot,gagern\/parrot,gagern\/parrot,tkob\/parrot,fernandobrito\/parrot,fernandobrito\/parrot,gitster\/parrot,tewk\/parrot-select,FROGGS\/parrot,gitster\/parrot,parrot\/parrot,gitster\/parrot,tkob\/parrot,gagern\/parrot,tewk\/parrot-select,FROGGS\/parrot,parrot\/parrot,youprofit\/parrot,youprofit\/parrot,gitster\/parrot,tewk\/parrot-select,tkob\/parrot,FROGGS\/parrot,youprofit\/parrot,tkob\/parrot,fernandobrito\/parrot,gagern\/parrot,FROGGS\/parrot,youprofit\/parrot,parrot\/parrot,gitster\/parrot,gagern\/parrot,gagern\/parrot,tkob\/parrot,fernandobrito\/parrot,youprofit\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/events.c\n+++ src\/events.c\n@@ -242,7 +242,7 @@\n * s. p6i: \"event.c - of signals and pipes\"\n *\/\n if (pipe(pipe_fds))\n- real_exception(interp, NULL, 1, \"Couldn't create message pipe\");\n+ internal_exception(1, \"Couldn't create message pipe\");\n #endif\n \/*\n * now set some sig handlers before any thread is started, so\n@@ -550,7 +550,6 @@\n void\n Parrot_schedule_broadcast_qentry(struct QUEUE_ENTRY *entry)\n {\n- Interp *interp;\n parrot_event * const event = (parrot_event *)entry->data;\n \n switch (event->type) {\n@@ -572,6 +571,8 @@\n switch (event->u.signal) {\n case SIGHUP:\n case SIGINT:\n+ {\n+ Interp *interp;\n if (n_interpreters) {\n size_t i;\n LOCK(interpreter_array_mutex);\n@@ -587,6 +588,7 @@\n interp = interpreter_array[0];\n Parrot_schedule_interp_qentry(interp, entry);\n edebug((stderr, \"deliver SIGINT to 0\\n\"));\n+ }\n break;\n default:\n mem_sys_free(entry);\n@@ -596,7 +598,7 @@\n default:\n mem_sys_free(entry);\n mem_sys_free(event);\n- real_exception(interp, NULL, 1, \"Unknown event to broadcast\");\n+ internal_exception(1, \"Unknown event to broadcast\");\n break;\n }\n }\n@@ -820,7 +822,7 @@\n buf.ev = event;\n #ifndef WIN32\n if (write(PIPE_WRITE_FD, &buf, sizeof(buf)) != sizeof(buf))\n- real_exception(interp, NULL, 1, \"msg pipe write failed\");\n+ internal_exception(1, \"msg pipe write failed\");\n #endif\n }\n \n"} {"commit":"94a09ee14e50928c5663eb4d700025610362f7f2","subject":"Make -xy help output consistent, output an empty line before and after.","message":"Make -xy help output consistent, output an empty line before and after.\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@5108 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/libpostproc\/postprocess.c\n+++ libavcodec\/libpostproc\/postprocess.c\n@@ -759,6 +759,7 @@\n \"vb:a\/hb:a\/lb de,-vb\\n\"\n \"more examples:\\n\"\n \"tn:64:128:256\\n\"\n+\"\\n\"\n ;\n \n pp_mode_t *pp_get_mode_by_name_and_quality(char *name, int quality)\n"} {"commit":"f90c72a0238e6e0fecb94810572db92d28724854","subject":"Fix fcntl64 when UCLIBC_HAS_LFS is enabled, but __NR_fcntl64 is not defined.","message":"Fix fcntl64 when UCLIBC_HAS_LFS is enabled, but __NR_fcntl64\nis not defined.\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/common\/syscalls.c\n+++ libc\/sysdeps\/linux\/common\/syscalls.c\n@@ -1970,7 +1970,7 @@\n \n \/\/#define __NR_stat64 195\n #ifdef L___syscall_stat64\n-#if defined __NR_stat64 && defined __UCLIBC_HAS_LFS__\n+#if defined __UCLIBC_HAS_LFS__ && defined __NR_stat64\n #define __NR___syscall_stat64 __NR_stat64\n #include <unistd.h>\n #include <sys\/stat.h>\n@@ -1992,7 +1992,7 @@\n \n \/\/#define __NR_lstat64 196\n #ifdef L___syscall_lstat64\n-#if defined __NR_lstat64 && defined __UCLIBC_HAS_LFS__\n+#if defined __UCLIBC_HAS_LFS__ && defined __NR_lstat64\n #define __NR___syscall_lstat64 __NR_lstat64\n #include <unistd.h>\n #include <sys\/stat.h>\n@@ -2014,7 +2014,7 @@\n \n \/\/#define __NR_fstat64 197\n #ifdef L___syscall_fstat64\n-#if defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__\n+#if defined __UCLIBC_HAS_LFS__ && defined __NR_fstat64\n #define __NR___syscall_fstat64 __NR_fstat64\n #include <unistd.h>\n #include <sys\/stat.h>\n@@ -2078,7 +2078,7 @@\n #ifdef L___syscall_fcntl64\n #include <stdarg.h>\n #include <fcntl.h>\n-#ifdef __UCLIBC_HAS_LFS__\n+#if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64\n #define __NR___syscall_fcntl64 __NR_fcntl64\n static inline\n _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg);\n"} {"commit":"364c52f89d31a2784b4185320c15536bbd3867ec","subject":"sparc\/sigaction: revert change. These semantics are needed for nptl","message":"sparc\/sigaction: revert change. These semantics are needed for nptl\n\nSigned-off-by: Austin Foxley <65462a1d10372f5df6b6641242ca623823c369f3@cetoncorp.com>\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/sparc\/sigaction.c\n+++ libc\/sysdeps\/linux\/sparc\/sigaction.c\n@@ -34,8 +34,7 @@\n static void __rt_sigreturn_stub(void);\n static void __sigreturn_stub(void);\n \n-libc_hidden_proto(sigaction)\n-int sigaction(int sig, const struct sigaction *act, struct sigaction *oact)\n+int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact)\n {\n \tint ret;\n \tstruct sigaction kact, koact;\n@@ -66,8 +65,10 @@\n \treturn ret;\n }\n \n-libc_hidden_def(sigaction)\n-weak_alias(sigaction,__libc_sigaction)\n+#ifndef LIBC_SIGACTION\n+weak_alias(__libc_sigaction,sigaction)\n+libc_hidden_weak(sigaction)\n+#endif\n \n static void\n __rt_sigreturn_stub(void)\n"} {"commit":"8159c9cf091d3474702df58b04dcd11783109ab7","subject":"Cancel the creation thread in dispose()","message":"Cancel the creation thread in dispose()\n","repos":"GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy\/empathy-account-manager.c\n+++ libempathy\/empathy-account-manager.c\n@@ -299,6 +299,7 @@\n \n g_simple_async_result_complete (priv->create_result);\n g_object_unref (priv->create_result);\n+ priv->create_result = NULL;\n }\n \n g_signal_emit (manager, signals[ACCOUNT_CREATED], 0, account);\n@@ -478,6 +479,16 @@\n return;\n \n priv->dispose_run = TRUE;\n+\n+ if (priv->create_result != NULL)\n+ {\n+ g_simple_async_result_set_error (priv->create_result, G_IO_ERROR,\n+ G_IO_ERROR_CANCELLED, \"The account manager was disposed while \"\n+ \"creating the account\");\n+ g_simple_async_result_complete (priv->create_result);\n+ g_object_unref (priv->create_result);\n+ priv->create_result = NULL;\n+ }\n \n tp_dbus_daemon_cancel_name_owner_watch (priv->dbus,\n TP_ACCOUNT_MANAGER_BUS_NAME, account_manager_name_owner_cb, manager);\n"} {"commit":"966dbdf236b6aa3a43348b6108bc1893849ef9b9","subject":"primitives: Fix compilation with VS 2010","message":"primitives: Fix compilation with VS 2010\n","repos":"awakecoding\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,rjcorrig\/FreeRDP,bjcollins\/FreeRDP,Devolutions\/FreeRDP,oshogbo\/FreeRDP,mfleisz\/FreeRDP,erbth\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,ilammy\/FreeRDP,cloudbase\/FreeRDP-dev,akallabeth\/FreeRDP,nfedera\/FreeRDP,eledoux\/FreeRDP,ondrejholy\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,cloudbase\/FreeRDP-dev,bjcollins\/FreeRDP,akallabeth\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,yurashek\/FreeRDP,awakecoding\/FreeRDP,ondrejholy\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,ilammy\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,RangeeGmbH\/FreeRDP,oshogbo\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,mfleisz\/FreeRDP,ondrejholy\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,rjcorrig\/FreeRDP,oshogbo\/FreeRDP,bjcollins\/FreeRDP,DavBfr\/FreeRDP,ondrejholy\/FreeRDP,Devolutions\/FreeRDP,bmiklautz\/FreeRDP,rjcorrig\/FreeRDP,cedrozor\/FreeRDP,akallabeth\/FreeRDP,yurashek\/FreeRDP,chipitsine\/FreeRDP,bmiklautz\/FreeRDP,ondrejholy\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,cedrozor\/FreeRDP,ilammy\/FreeRDP,yurashek\/FreeRDP,eledoux\/FreeRDP,ivan-83\/FreeRDP,nfedera\/FreeRDP,chipitsine\/FreeRDP,nfedera\/FreeRDP,oshogbo\/FreeRDP,eledoux\/FreeRDP,ilammy\/FreeRDP,cloudbase\/FreeRDP-dev,eledoux\/FreeRDP,RangeeGmbH\/FreeRDP,oshogbo\/FreeRDP,oshogbo\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,ilammy\/FreeRDP,chipitsine\/FreeRDP,bjcollins\/FreeRDP,erbth\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,ondrejholy\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,cedrozor\/FreeRDP,yurashek\/FreeRDP,rjcorrig\/FreeRDP,eledoux\/FreeRDP,rjcorrig\/FreeRDP,awakecoding\/FreeRDP,bmiklautz\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,rjcorrig\/FreeRDP,ilammy\/FreeRDP,bjcollins\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,oshogbo\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,bmiklautz\/FreeRDP,yurashek\/FreeRDP,rjcorrig\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,rjcorrig\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,akallabeth\/FreeRDP,eledoux\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,nfedera\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,chipitsine\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,FreeRDP\/FreeRDP,cloudbase\/FreeRDP-dev,yurashek\/FreeRDP,Devolutions\/FreeRDP,ilammy\/FreeRDP,erbth\/FreeRDP,mfleisz\/FreeRDP,ilammy\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,awakecoding\/FreeRDP,akallabeth\/FreeRDP,ondrejholy\/FreeRDP,mfleisz\/FreeRDP,eledoux\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,ondrejholy\/FreeRDP,bjcollins\/FreeRDP,bmiklautz\/FreeRDP,erbth\/FreeRDP,eledoux\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/primitives\/prim_YUV_opt.c\n+++ libfreerdp\/primitives\/prim_YUV_opt.c\n@@ -361,6 +361,8 @@\n \n static __m128i* ssse3_YUV444Pixel(__m128i* dst, __m128i Yraw, __m128i Uraw, __m128i Vraw, UINT8 pos)\n {\n+\t\/* Visual Studio 2010 doesn't like _mm_set_epi32 in array initializer list *\/\n+#if !defined(_MSC_VER) || (_MSC_VER > 1600)\n \tconst __m128i mapY[] =\n \t{\n \t\t_mm_set_epi32(0x80800380, 0x80800280, 0x80800180, 0x80800080),\n@@ -381,6 +383,28 @@\n \t\t_mm_set_epi32(0x80800380, 0x80800280, 0x80800180, 0x80800080),\n \t\t_mm_set_epi32(0x80808003, 0x80808002, 0x80808001, 0x80808000)\n \t};\n+#else\n+\tconst __m128i mapY[] =\n+\t{\n+\t\t{ 0x80, 0x80, 0x03, 0x80, 0x80, 0x80, 0x02, 0x80, 0x80, 0x80, 0x01, 0x80, 0x80, 0x80, 0x00, 0x80},\n+\t\t{ 0x80, 0x80, 0x07, 0x80, 0x80, 0x80, 0x06, 0x80, 0x80, 0x80, 0x05, 0x80, 0x80, 0x80, 0x04, 0x80},\n+\t\t{ 0x80, 0x80, 0x0B, 0x80, 0x80, 0x80, 0x0A, 0x80, 0x80, 0x80, 0x09, 0x80, 0x80, 0x80, 0x08, 0x80},\n+\t\t{ 0x80, 0x80, 0x0F, 0x80, 0x80, 0x80, 0x0E, 0x80, 0x80, 0x80, 0x0D, 0x80, 0x80, 0x80, 0x0C, 0x80}\n+\t};\n+\tconst __m128i mapUV[] =\n+\t{\n+\t\t{ 0x80, 0x03, 0x80, 0x02, 0x80, 0x01, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},\n+\t\t{ 0x80, 0x07, 0x80, 0x06, 0x80, 0x05, 0x80, 0x04, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},\n+\t\t{ 0x80, 0x0B, 0x80, 0x0A, 0x80, 0x09, 0x80, 0x08, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},\n+\t\t{ 0x80, 0x0F, 0x80, 0x0E, 0x80, 0x0D, 0x80, 0x0C, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80}\n+\t};\n+\tconst __m128i mask[] =\n+\t{\n+\t\t{ 0x80, 0x03, 0x80, 0x80, 0x80, 0x02, 0x80, 0x80, 0x80, 0x01, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80},\n+\t\t{ 0x80, 0x80, 0x03, 0x80, 0x80, 0x80, 0x02, 0x80, 0x80, 0x80, 0x01, 0x80, 0x80, 0x80, 0x00, 0x80},\n+\t\t{ 0x80, 0x80, 0x80, 0x03, 0x80, 0x80, 0x80, 0x02, 0x80, 0x80, 0x80, 0x01, 0x80, 0x80, 0x80, 0x00}\n+\t};\n+#endif\n \tconst __m128i c128 = _mm_set1_epi16(128);\n \t__m128i BGRX = _mm_set_epi32(0xFF000000, 0xFF000000, 0xFF000000, 0xFF000000);\n \t{\n"} {"commit":"50a9ce90dc7b1810544ee826882e7fc7176f6d89","subject":"ggit-rebase-operation.c: Fix return annotations","message":"ggit-rebase-operation.c: Fix return annotations\n\nAdd (nullable) as needed.\n","repos":"GNOME\/libgit2-glib,GNOME\/libgit2-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libgit2-glib\/ggit-rebase-operation.c\n+++ libgit2-glib\/ggit-rebase-operation.c\n@@ -58,7 +58,7 @@\n * Atomically increments the reference count of @rebase_operation by one.\n * This function is MT-safe and may be called from any thread.\n *\n- * Returns: (transfer none): a newly allocated #GgitRebaseOperation.\n+ * Returns: (transfer none) (nullable): a newly allocated #GgitRebaseOperation or %NULL.\n *\/\n GgitRebaseOperation *\n ggit_rebase_operation_ref (GgitRebaseOperation *rebase_operation)\n@@ -111,7 +111,7 @@\n * Gets the commit ID being cherry-picked. This will be populated for\n * all operations except those of type @GGIT_REBASE_OPERATION_EXEC.\n *\n- * Returns: (transfer full): the commit ID being cherry-picked.\n+ * Returns: (transfer full) (nullable): the commit ID being cherry-picked or %NULL.\n *\/\n GgitOId *\n ggit_rebase_operation_get_id (GgitRebaseOperation *rebase_operation)\n@@ -128,7 +128,7 @@\n * Gets the executable the user has requested be run. This will only\n * be populated for operations of type @GGIT_REBASE_OPERATION_EXEC.\n *\n- * Returns: the executable the user has requested be run.\n+ * Returns: (transfer none) (nullable): the executable the user has requested be run or %NULL.\n *\/\n const gchar *\n ggit_rebase_operation_get_exec (GgitRebaseOperation *rebase_operation)\n"} {"commit":"ae21ffca1e85980dbb747bf57a194a65821e436b","subject":"use opstat","message":"use opstat\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/up_sched_res.c\n+++ slashd\/up_sched_res.c\n@@ -1128,8 +1128,6 @@\n * (e.g. SCHED -> QUEUED).\n *\/\n \n-static long slm_upsch_revert_cb_count;\n-\n int\n slm_upsch_revert_cb(struct slm_sth *sth, __unusedx void *p)\n {\n@@ -1139,7 +1137,7 @@\n \tstruct sl_fidgen fg;\n \tsl_bmapno_t bno;\n \n-\tslm_upsch_revert_cb_count++;\n+\tOPSTAT_INCR(\"revert-cb\");\n \n \tfg.fg_fid = sqlite3_column_int64(sth->sth_sth, 0);\n \tfg.fg_gen = FGEN_ANY;\n"} {"commit":"a4d5a89883d2bd1921ed7bc9d306eb21690934d0","subject":"Enhanced timing output.","message":"Enhanced timing output.\n","repos":"000Justin000\/water,dbindel\/water,dbindel\/water,000Justin000\/water,000Justin000\/water,dbindel\/water","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ldriver.c\n+++ ldriver.c\n@@ -215,32 +215,35 @@\n central2d_t* sim = central2d_init(w,h, nx,ny,\n 3, shallow2d_flux, shallow2d_speed, cfl);\n lua_init_sim(L,sim);\n-\n printf(\"%g %g %d %d %g %d %g\\n\", w, h, nx, ny, cfl, frames, ftime);\n FILE* viz = viz_open(fname, sim);\n solution_check(sim);\n viz_frame(viz, sim);\n+\n+ double tcompute = 0;\n for (int i = 0; i < frames; ++i) {\n #ifdef _OPENMP\n double t0 = omp_get_wtime();\n int nstep = central2d_run(sim, ftime);\n double t1 = omp_get_wtime();\n double elapsed = t1-t0;\n- printf(\"Time: %e (%e for %d steps)\\n\", elapsed, elapsed\/nstep, nstep);\n #elif defined SYSTIME\n struct timeval t0, t1;\n gettimeofday(&t0, NULL);\n int nstep = central2d_run(sim, ftime);\n gettimeofday(&t1, NULL);\n double elapsed = (t1.tv_sec-t0.tv_sec) + (t1.tv_usec-t0.tv_usec)*1e-6;\n- printf(\"Time: %e (%e for %d steps)\\n\", elapsed, elapsed\/nstep, nstep);\n #else\n int nstep = central2d_run(sim, ftime);\n- printf(\"Took %d steps\\n\", nstep);\n+ double elapsed = 0;\n #endif\n solution_check(sim);\n+ tcompute += elapsed;\n+ printf(\" Time: %e (%e for %d steps)\\n\", elapsed, elapsed\/nstep, nstep);\n viz_frame(viz, sim);\n }\n+ printf(\"Total compute time: %e\\n\", tcompute);\n+\n central2d_free(sim);\n return 0;\n }\n"} {"commit":"c4afd068ff622d5176f4ba041b729db6a3a9c563","subject":"Fix indent","message":"Fix indent\n","repos":"naoa\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,redfigure\/groonga,komainu8\/groonga,groonga\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,redfigure\/groonga,naoa\/groonga,kenhys\/groonga,naoa\/groonga,komainu8\/groonga,redfigure\/groonga,redfigure\/groonga,myokoym\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,redfigure\/groonga,groonga\/groonga,naoa\/groonga,groonga\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,kenhys\/groonga,komainu8\/groonga,kenhys\/groonga,komainu8\/groonga,cosmo0920\/groonga,myokoym\/groonga,naoa\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,cosmo0920\/groonga,myokoym\/groonga,cosmo0920\/groonga,redfigure\/groonga,redfigure\/groonga,kenhys\/groonga,groonga\/groonga,kenhys\/groonga,komainu8\/groonga,komainu8\/groonga,groonga\/groonga,myokoym\/groonga,myokoym\/groonga,myokoym\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,myokoym\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/geo.c\n+++ lib\/geo.c\n@@ -1882,10 +1882,10 @@\n grn_geo_in_rectangle_raw(grn_ctx *ctx, grn_geo_point *point,\n grn_geo_point *top_left, grn_geo_point *bottom_right)\n {\n- return ((top_left->longitude <= point->longitude) &&\n- (point->longitude <= bottom_right->longitude) &&\n- (bottom_right->latitude <= point->latitude) &&\n- (point->latitude <= top_left->latitude));\n+ return ((top_left->longitude <= point->longitude) &&\n+ (point->longitude <= bottom_right->longitude) &&\n+ (bottom_right->latitude <= point->latitude) &&\n+ (point->latitude <= top_left->latitude));\n }\n \n grn_bool\n"} {"commit":"6e0e2095dbe920b1cceee16ba43a46d96ea1ea43","subject":"","message":"\n\nFix a divide by zero in noise_hybridmp due to faulty spectrum wrapping\naround Bark 0.\n\n\ngit-svn-id: 03f0f1727258f1959b7b485b30a676bafdb78148@4018 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"libninjam\/libvorbis,Rillke\/vorbis,OffByOneStudios\/vorbis,pcwalton\/vorbis,ShiftMediaProject\/vorbis,wighawag\/vorbis,brion\/vorbis,libninjam\/libvorbis,wighawag\/vorbis,Distrotech\/libvorbis,wighawag\/vorbis,KTXSoftware\/vorbis,wighawag\/vorbis,pcwalton\/vorbis,TitaniumEagle\/libvorbis,Rillke\/vorbis,ShiftMediaProject\/vorbis,KTXSoftware\/vorbis,libninjam\/libvorbis,jdm\/vorbis,ShiftMediaProject\/vorbis,Distrotech\/libvorbis,brion\/vorbis,pcwalton\/vorbis,ShiftMediaProject\/vorbis,OffByOneStudios\/vorbis,Distrotech\/libvorbis,Rillke\/vorbis,KTXSoftware\/vorbis,Rillke\/vorbis,jdm\/vorbis,ShiftMediaProject\/vorbis,Distrotech\/libvorbis,jdm\/vorbis,OffByOneStudios\/vorbis,jdm\/vorbis,pcwalton\/vorbis,TitaniumEagle\/libvorbis,ShiftMediaProject\/vorbis,brion\/vorbis,jdm\/vorbis,brion\/vorbis,OffByOneStudios\/vorbis,libninjam\/libvorbis,TitaniumEagle\/libvorbis,pcwalton\/vorbis,TitaniumEagle\/libvorbis,KTXSoftware\/vorbis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/psy.c\n+++ lib\/psy.c\n@@ -11,7 +11,7 @@\n ********************************************************************\n \n function: psychoacoustics not including preecho\n- last mod: $Id: psy.c,v 1.77 2002\/10\/11 07:44:28 xiphmont Exp $\n+ last mod: $Id: psy.c,v 1.78 2002\/10\/17 04:41:39 xiphmont Exp $\n \n ********************************************************************\/\n \n@@ -630,10 +630,10 @@\n lo = hi - fixed;\n \n tN = N[hi] + N[-lo];\n- tX = X[hi] - X[-lo];\n+ tX = X[hi] + X[-lo];\n tXX = XX[hi] + XX[-lo];\n tY = Y[hi] + Y[-lo];\n- tXY = XY[hi] - XY[-lo];\n+ tXY = XY[hi] + XY[-lo];\n \n \n A = tY * tXX - tX * tXY;\n@@ -780,14 +780,14 @@\n }\n \n if(seq&1)\n- _analysis_output(\"medianR\",seq\/2,work,n,1,0,0);\n+ _analysis_output(\"median2R\",seq\/2,work,n,1,0,0);\n else\n- _analysis_output(\"medianL\",seq\/2,work,n,1,0,0);\n+ _analysis_output(\"median2L\",seq\/2,work,n,1,0,0);\n \n if(seq&1)\n- _analysis_output(\"envelopeR\",seq\/2,work2,n,1,0,0);\n+ _analysis_output(\"envelope2R\",seq\/2,work2,n,1,0,0);\n else\n- _analysis_output(\"enveloperL\",seq\/2,work2,n,1,0,0);\n+ _analysis_output(\"envelope2L\",seq\/2,work2,n,1,0,0);\n seq++;\n }\n #endif\n"} {"commit":"772e05b18a9dfd4109505c30d1a5f96a2c05aa24","subject":"","message":"\nNoise curve code cleanup that also should fix a divide-by-zero bug\n\n\ngit-svn-id: 03f0f1727258f1959b7b485b30a676bafdb78148@1892 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"TitaniumEagle\/libvorbis,wighawag\/vorbis,Rillke\/vorbis,Distrotech\/libvorbis,jdm\/vorbis,jdm\/vorbis,KTXSoftware\/vorbis,jdm\/vorbis,Distrotech\/libvorbis,Rillke\/vorbis,pcwalton\/vorbis,ShiftMediaProject\/vorbis,libninjam\/libvorbis,TitaniumEagle\/libvorbis,ShiftMediaProject\/vorbis,pcwalton\/vorbis,ShiftMediaProject\/vorbis,OffByOneStudios\/vorbis,ShiftMediaProject\/vorbis,KTXSoftware\/vorbis,pcwalton\/vorbis,Distrotech\/libvorbis,OffByOneStudios\/vorbis,Rillke\/vorbis,TitaniumEagle\/libvorbis,brion\/vorbis,TitaniumEagle\/libvorbis,libninjam\/libvorbis,ShiftMediaProject\/vorbis,brion\/vorbis,OffByOneStudios\/vorbis,pcwalton\/vorbis,Distrotech\/libvorbis,wighawag\/vorbis,wighawag\/vorbis,KTXSoftware\/vorbis,wighawag\/vorbis,libninjam\/libvorbis,brion\/vorbis,Rillke\/vorbis,libninjam\/libvorbis,brion\/vorbis,ShiftMediaProject\/vorbis,jdm\/vorbis,jdm\/vorbis,pcwalton\/vorbis,OffByOneStudios\/vorbis,KTXSoftware\/vorbis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/psy.c\n+++ lib\/psy.c\n@@ -11,7 +11,7 @@\n ********************************************************************\n \n function: psychoacoustics not including preecho\n- last mod: $Id: psy.c,v 1.50 2001\/08\/13 01:36:57 xiphmont Exp $\n+ last mod: $Id: psy.c,v 1.51 2001\/08\/16 22:52:54 xiphmont Exp $\n \n ********************************************************************\/\n \n@@ -594,95 +594,11 @@\n \n }\n \n-static void bark_noise_pointmp(int n,const long *b,\n- const float *f,\n- float *noise,\n- const int fixed){\n- long i,hi=0,lo=0,hif=0,lof=0;\n- double xa=0,xb=0;\n- double ya=0,yb=0;\n- double x2a=0,x2b=0;\n- double y2a=0,y2b=0;\n- double xya=0,xyb=0; \n- double na=0,nb=0;\n- \n- for(i=0;i<n;i++){\n- if(hi<n){\n- \/* find new lo\/hi *\/\n- int bi=b[i]>>16;\n- for(;hi<bi;hi++){\n- double bin=(f[hi]<-140.f?0.:f[hi]+140.);\n- double nn= bin*bin;\n- na += nn;\n- xa += hi*nn;\n- ya += bin*nn;\n- x2a += hi*hi*nn;\n- y2a += bin*bin*nn;\n- xya += hi*bin*nn;\n- }\n- bi=b[i]&0xffff;\n- for(;lo<bi;lo++){\n- double bin=(f[lo]<-140.f?0.:f[lo]+140.);\n- double nn= bin*bin;\n- na -= nn;\n- xa -= lo*nn;\n- ya -= bin*nn;\n- x2a -= lo*lo*nn;\n- y2a -= bin*bin*nn;\n- xya -= lo*bin*nn;\n- }\n- }\n-\n- if(hif<n && fixed>0){\n- int bi=i+fixed\/2;\n- if(bi>n)bi=n;\n- for(;hif<bi;hif++){\n- double bin=(f[hif]<-140.f?0.:f[hif]+140.);\n- double nn= bin*bin;\n- nb += nn;\n- xb += hif*nn;\n- yb += bin*nn;\n- x2b += hif*hif*nn;\n- y2b += bin*bin*nn;\n- xyb += hif*bin*nn;\n- }\n- bi=i-(fixed+1)\/2;\n- if(bi<0)bi=0;\n- for(;lof<bi;lof++){\n- double bin=(f[lof]<-140.f?0.:f[lof]+140.);\n- double nn= bin*bin;\n- nb -= nn;\n- xb -= lof*nn;\n- yb -= bin*nn;\n- x2b -= lof*lof*nn;\n- y2b -= bin*bin*nn;\n- xyb -= lof*bin*nn;\n- }\n- }\n-\n- { \n- double denom=1.\/(na*x2a-xa*xa);\n- double a=(ya*x2a-xya*xa)*denom;\n- double b=(na*xya-xa*ya)*denom;\n- double va=a+b*i;\n-\n- if(fixed>0){\n- double denomf=1.\/(nb*x2b-xb*xb);\n- double af=(yb*x2b-xyb*xb)*denomf;\n- double bf=(nb*xyb-xb*yb)*denomf;\n- double vb=af+bf*i;\n- if(va>vb)va=vb;\n- }\n-\n- noise[i]=va-140.f;\n- }\n- }\n-}\n-\n static void bark_noise_hybridmp(int n,const long *b,\n- const float *f,\n- float *noise,\n- const int fixed){\n+\t\t\t\tconst float *f,\n+\t\t\t\tfloat *noise,\n+\t\t\t\tconst float offset,\n+\t\t\t\tconst int fixed){\n long i,hi=0,lo=0,hif=0,lof=0;\n double xa=0,xb=0;\n double ya=0,yb=0;\n@@ -699,7 +615,7 @@\n \/* find new lo\/hi *\/\n int bi=b[i]>>16;\n for(;hi<bi;hi++){\n- double bin=f[hi];\n+ double bin=(f[hi]<-offset?0.:f[hi]+offset);\n if(bin>0.f){\n double nn= bin*bin;\n nn*=nn;\n@@ -716,7 +632,7 @@\n }\n bi=b[i]&0xffff;\n for(;lo<bi;lo++){\n- double bin=f[lo];\n+ double bin=(f[lo]<-offset?0.:f[lo]+offset);\n if(bin>0.f){\n double nn= bin*bin;\n nn*=nn;\n@@ -744,7 +660,7 @@\n if(bi>n)bi=n;\n \n for(;hif<bi;hif++){\n- double bin=f[hif];\n+ double bin=(f[hif]<-offset?0.:f[hif]+offset);\n if(bin>0.f){\n double nn= bin*bin;\n nn*=nn;\n@@ -762,7 +678,7 @@\n bi=i-(fixed+1)\/2;\n if(bi<0)bi=0;\n for(;lof<bi;lof++){\n- double bin=f[lof];\n+ double bin=(f[lof]<-offset?0.:f[lof]+offset);\n if(bin>0.f){\n double nn= bin*bin;\n nn*=nn;\n@@ -817,7 +733,7 @@\n \n }\n \n- noise[i]=va;\n+ noise[i]=va-offset;\n }\n }\n }\n@@ -859,13 +775,13 @@\n if(p->vi->noisemaskp){\n float *work=alloca(n*sizeof(float));\n \n- bark_noise_pointmp(n,p->bark,logmdct,logmask,\n-\t\t -1);\n+ bark_noise_hybridmp(n,p->bark,logmdct,logmask,\n+\t\t\t140.,-1);\n \n for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];\n \n _analysis_output(\"medianmdct\",seq,work,n,1,0);\n- bark_noise_hybridmp(n,p->bark,work,logmask,\n+ bark_noise_hybridmp(n,p->bark,work,logmask,0.,\n \t\t\tp->vi->noisewindowfixed);\n \n for(i=0;i<n;i++)work[i]=logmdct[i]-work[i];\n"} {"commit":"850c36ee3ac40d1edc4a0a6932bce066e4ada469","subject":"spi: close the file descriptor when freeing the an 'spi' struct","message":"spi: close the file descriptor when freeing the an 'spi' struct\n\nSigned-off-by: Tatiana Leon <8c4753e861fecbb16ba9ebac0b105a2d4612071d@digi.com>\n","repos":"jackmitch\/libsoc,hlummis\/libsoc,hlummis\/libsoc,hlummis\/libsoc,hlummis\/libsoc,jackmitch\/libsoc,jackmitch\/libsoc,yegorich\/libsoc,yegorich\/libsoc,yegorich\/libsoc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/spi.c\n+++ lib\/spi.c\n@@ -373,6 +373,9 @@\n }\n \n libsoc_spi_debug (__func__, spi, \"freeing spi device\");\n+ \n+ if (file_close (spi->fd) < 0)\n+ return EXIT_FAILURE;\n \n free (spi);\n \n"} {"commit":"9325846e8755aa25fe97b10df68b1bbeea40c41f","subject":"Improve the speed of grn_str_charlen_utf8","message":"Improve the speed of grn_str_charlen_utf8\n\nUse GRN_BIT_SCAN_REV to remove the first for-loop.\nSimplify the second for-loop.\n","repos":"myokoym\/groonga,redfigure\/groonga,groonga\/groonga,redfigure\/groonga,kenhys\/groonga,cosmo0920\/groonga,naoa\/groonga,myokoym\/groonga,komainu8\/groonga,cosmo0920\/groonga,groonga\/groonga,cosmo0920\/groonga,myokoym\/groonga,komainu8\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,naoa\/groonga,myokoym\/groonga,cosmo0920\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,komainu8\/groonga,redfigure\/groonga,groonga\/groonga,myokoym\/groonga,komainu8\/groonga,cosmo0920\/groonga,kenhys\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,groonga\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,komainu8\/groonga,myokoym\/groonga,cosmo0920\/groonga,redfigure\/groonga,redfigure\/groonga,kenhys\/groonga,redfigure\/groonga,groonga\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,myokoym\/groonga,kenhys\/groonga,naoa\/groonga,naoa\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,naoa\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,kenhys\/groonga,naoa\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/str.c\n+++ lib\/str.c\n@@ -31,27 +31,35 @@\n {\n \/* MEMO: This function allows non-null-terminated string as str. *\/\n \/* But requires the end of string. *\/\n- const unsigned char *p = str;\n- if (end <= p || !*p) { return 0; }\n- if (*p & 0x80) {\n- int b, w;\n- int size;\n- for (b = 0x40, w = 0; b && (*p & b); b >>= 1, w++);\n- if (!w) {\n+ if (end <= str || !*str) {\n+ return 0;\n+ }\n+ if (*str & 0x80) {\n+ int i;\n+ int len;\n+ GRN_BIT_SCAN_REV(~(*str << 24), len);\n+ len = 31 - len;\n+ if ((unsigned int)(len - 2) >= 3) { \/* (len == 1 || len >= 5) *\/\n+ \/* Error: invalid first byte. *\/\n GRN_LOG(ctx, GRN_LOG_WARNING, \"invalid utf8 string(1) on grn_str_charlen_utf8\");\n return 0;\n }\n- for (size = 1; w--; size++) {\n- if (++p >= end || !*p || (*p & 0xc0) != 0x80) {\n- GRN_LOG(ctx, GRN_LOG_WARNING, \"invalid utf8 string(2) on grn_str_charlen_utf8\");\n+ if (str + len > end) {\n+ \/* Error: the character is incomplete. *\/\n+ GRN_LOG(ctx, GRN_LOG_WARNING, \"invalid utf8 string(2) on grn_str_charlen_utf8\");\n+ return 0;\n+ }\n+ for (i = 1; i < len; ++i) {\n+ if ((str[i] & 0xc0) != 0x80) {\n+ \/* Error: the (i+1)-th byte is invalid. *\/\n+ GRN_LOG(ctx, GRN_LOG_WARNING, \"invalid utf8 string(3) on grn_str_charlen_utf8\");\n return 0;\n }\n }\n- return size;\n+ return len;\n } else {\n return 1;\n }\n- return 0;\n }\n \n unsigned int\n"} {"commit":"b3edb92e45d0c97c2a39ddd6348e4ffc861f1d31","subject":"Updated system last change date","message":"Updated system last change date\n","repos":"blakemcbride\/LISPF4,blakemcbride\/LISPF4","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lispf41.c\n+++ lispf41.c\n@@ -190,9 +190,9 @@\n L10:\n mess_(&c__20);\n b_1.prtpos = 12;\n- i__2 = a_1.numadd + 83;\n+ i__2 = a_1.numadd + 2015;\n i__4 = a_1.numadd + 8;\n- i__6 = a_1.numadd + 22;\n+ i__6 = a_1.numadd + 21;\n i__5 = cons_(&i__6, &b_1.nil);\n i__3 = cons_(&i__4, &i__5);\n i__1 = cons_(&i__2, &i__3);\n"} {"commit":"0ef0069863276d186bd66885bf6fbb253d34c6a5","subject":"linux-generic: timer: generalize arch-specific code path selection","message":"linux-generic: timer: generalize arch-specific code path selection\n\nMake architecture-specific code path selection generic, controlled\ndirectly by compiler feature predefines.\nReplace macro PREFETCH with intrinsic __builtin_prefetch.\nFixes https:\/\/bugs.linaro.org\/show_bug.cgi?id=2235\n\nSigned-off-by: Ola Liljedahl <6d19e6e0076f8797cfccb58ffb99074265221b72@linaro.org>\nReviewed-and-tested-by: Bill Fischofer <52f3c909d51cc5d355a68a403df6906b3c1a8f83@linaro.org>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"erachmi\/odp,ravineet-singh\/odp,nmorey\/odp,erachmi\/odp,dkrot\/odp,ravineet-singh\/odp,nmorey\/odp,erachmi\/odp,erachmi\/odp,ravineet-singh\/odp,dkrot\/odp,ravineet-singh\/odp,nmorey\/odp,mike-holmes-linaro\/odp,mike-holmes-linaro\/odp,dkrot\/odp,mike-holmes-linaro\/odp,mike-holmes-linaro\/odp,nmorey\/odp,dkrot\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/linux-generic\/odp_timer.c\n+++ platform\/linux-generic\/odp_timer.c\n@@ -58,12 +58,6 @@\n * for checking the freshness of received timeouts *\/\n #define TMO_INACTIVE ((uint64_t)0x8000000000000000)\n \n-#ifdef __ARM_ARCH\n-#define PREFETCH(ptr) __builtin_prefetch((ptr), 0, 0)\n-#else\n-#define PREFETCH(ptr) (void)(ptr)\n-#endif\n-\n \/******************************************************************************\n * Mutual exclusion in the absence of CAS16\n *****************************************************************************\/\n@@ -210,7 +204,7 @@\n \t\tstruct odp_timer_pool_s *tp)\n {\n \tuint32_t idx = _odp_typeval(hdl) & ((1U << INDEX_BITS) - 1U);\n-\tPREFETCH(&tp->tick_buf[idx]);\n+\t__builtin_prefetch(&tp->tick_buf[idx], 0, 0);\n \tif (odp_likely(idx < odp_atomic_load_u32(&tp->high_wm)))\n \t\treturn idx;\n \tODP_ABORT(\"Invalid timer handle %#x\\n\", hdl);\n@@ -395,7 +389,7 @@\n \ttick_buf_t *tb = &tp->tick_buf[idx];\n \n \tif (tmo_buf == NULL || *tmo_buf == ODP_BUFFER_INVALID) {\n-#ifdef ODP_ATOMIC_U128\n+#ifdef ODP_ATOMIC_U128 \/* Target supports 128-bit atomic operations *\/\n \t\ttick_buf_t new, old;\n \t\tdo {\n \t\t\t\/* Relaxed and non-atomic read of current values *\/\n@@ -422,9 +416,10 @@\n \t\t\t\t\t(_uint128_t *)&new,\n \t\t\t\t\t_ODP_MEMMODEL_RLS,\n \t\t\t\t\t_ODP_MEMMODEL_RLX));\n-#else\n-#ifdef __ARM_ARCH\n-\t\t\/* Since barriers are not good for C-A15, we take an\n+#elif __GCC_ATOMIC_LLONG_LOCK_FREE >= 2 && \\\n+\tdefined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8\n+\t\/* Target supports lock-free 64-bit CAS (and probably exchange) *\/\n+\t\t\/* Since locks\/barriers are not good for C-A15, we take an\n \t\t * alternative approach using relaxed memory model *\/\n \t\tuint64_t old;\n \t\t\/* Swap in new expiration tick, get back old tick which\n@@ -450,7 +445,7 @@\n \t\t\t\t\t_ODP_MEMMODEL_RLX);\n \t\t\tsuccess = false;\n \t\t}\n-#else\n+#else \/* Target supports neither 128-bit nor 64-bit CAS => use lock *\/\n \t\t\/* Take a related lock *\/\n \t\twhile (_odp_atomic_flag_tas(IDX2LOCK(idx)))\n \t\t\t\/* While lock is taken, spin using relaxed loads *\/\n@@ -469,7 +464,6 @@\n \n \t\t\/* Release the lock *\/\n \t\t_odp_atomic_flag_clear(IDX2LOCK(idx));\n-#endif\n #endif\n \t} else {\n \t\t\/* We have a new timeout buffer which replaces any old one *\/\n@@ -655,13 +649,11 @@\n \n \tODP_ASSERT(high_wm <= tpid->param.num_timers);\n \tfor (i = 0; i < high_wm;) {\n-#ifdef __ARM_ARCH\n \t\t\/* As a rare occurrence, we can outsmart the HW prefetcher\n \t\t * and the compiler (GCC -fprefetch-loop-arrays) with some\n \t\t * tuned manual prefetching (32x16=512B ahead), seems to\n \t\t * give 30% better performance on ARM C-A15 *\/\n-\t\tPREFETCH(&array[i + 32]);\n-#endif\n+\t\t__builtin_prefetch(&array[i + 32], 0, 0);\n \t\t\/* Non-atomic read for speed *\/\n \t\tuint64_t exp_tck = array[i++].exp_tck.v;\n \t\tif (odp_unlikely(exp_tck <= tick)) {\n@@ -691,13 +683,11 @@\n \t\t}\n \t}\n \n-#ifdef __ARM_ARCH\n \todp_timer *array = &tp->timers[0];\n \tuint32_t i;\n \t\/* Prefetch initial cache lines (match 32 above) *\/\n \tfor (i = 0; i < 32; i += ODP_CACHE_LINE_SIZE \/ sizeof(array[0]))\n-\t\tPREFETCH(&array[i]);\n-#endif\n+\t\t__builtin_prefetch(&array[i], 0, 0);\n \tprev_tick = odp_atomic_fetch_inc_u64(&tp->cur_tick);\n \n \t\/* Scan timer array, looking for timers to expire *\/\n"} {"commit":"e1f5e23426e789a373e3a3d816c10ec1a2aa8142","subject":"This version seems pretty solid","message":"This version seems pretty solid\n","repos":"FastLED\/FastLED,FastLED\/FastLED,PaulStoffregen\/FastLED,PaulStoffregen\/FastLED,FastLED\/FastLED,PaulStoffregen\/FastLED,FastLED\/FastLED","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/esp\/32\/clockless_esp32.h\n+++ platforms\/esp\/32\/clockless_esp32.h\n@@ -120,7 +120,11 @@\n \/\/ -- Counters to track progress\n static int gCurBuffer = 0;\n static bool gDoneFilling = false;\n-static bool gDoneSending = false;\n+\n+\/\/ -- Temp buffers for pixels and bits being formatted for DMA\n+static uint8_t gPixelRow[NUM_COLOR_CHANNELS][32];\n+static uint8_t gPixelBits[NUM_COLOR_CHANNELS][8][4];\n+\n \n template <int DATA_PIN, int T1, int T2, int T3, EOrder RGB_ORDER = RGB, int XTRA0 = 0, bool FLIP = false, int WAIT_TIME = 5>\n class ClocklessController : public CPixelLEDController<RGB_ORDER>\n@@ -213,6 +217,9 @@\n gZeroBit[i] = 0x00000000;\n i++;\n }\n+\n+ memset(gPixelRow, 0, NUM_COLOR_CHANNELS * 32);\n+ memset(gPixelBits, 0, NUM_COLOR_CHANNELS * 32);\n }\n \n static DMABuffer * allocateDMABuffer(int bytes)\n@@ -258,23 +265,10 @@\n i2s_base_pin_index = I2S1O_DATA_OUT0_IDX;\n }\n \n- \/\/ -- Reset i2s\n- i2s->conf.tx_reset = 1;\n- i2s->conf.tx_reset = 0;\n- i2s->conf.rx_reset = 1;\n- i2s->conf.rx_reset = 0;\n-\n- \/\/ -- Reset DMA\n- i2s->lc_conf.in_rst = 1;\n- i2s->lc_conf.in_rst = 0;\n- i2s->lc_conf.out_rst = 1;\n- i2s->lc_conf.out_rst = 0;\n-\n- \/\/ -- Reset FIFO (Do we need this?)\n- i2s->conf.rx_fifo_reset = 1;\n- i2s->conf.rx_fifo_reset = 0;\n- i2s->conf.tx_fifo_reset = 1;\n- i2s->conf.tx_fifo_reset = 0;\n+ \/\/ -- Reset everything\n+ i2sReset();\n+ i2sReset_DMA();\n+ i2sReset_FIFO();\n \n \/\/ -- Main configuration \n i2s->conf.tx_msb_right = 1;\n@@ -327,10 +321,10 @@\n dmaBuffers[0]->descriptor.qe.stqe_next = &(dmaBuffers[1]->descriptor);\n dmaBuffers[1]->descriptor.qe.stqe_next = &(dmaBuffers[0]->descriptor);\n \n- \/\/allocate disabled i2s interrupt\n+ \/\/ -- Allocate i2s interrupt\n SET_PERI_REG_BITS(I2S_INT_ENA_REG(I2S_DEVICE), I2S_OUT_EOF_INT_ENA_V, 1, I2S_OUT_EOF_INT_ENA_S);\n- esp_err_t e = esp_intr_alloc(interruptSource, 0, \/\/ ESP_INTR_FLAG_INTRDISABLED | ESP_INTR_FLAG_LEVEL3 | ESP_INTR_FLAG_IRAM,\n- &interruptHandler, 0, &gI2S_intr_handle);\n+ esp_err_t e = esp_intr_alloc(interruptSource, 0, \/\/ ESP_INTR_FLAG_INTRDISABLED | ESP_INTR_FLAG_LEVEL3,\n+ &interruptHandler, 0, &gI2S_intr_handle);\n \n \/\/ -- Create a semaphore to block execution until all the controllers are done\n if (gTX_sem == NULL) {\n@@ -354,7 +348,7 @@\n \/\/ -- Initialize the local state, save a pointer to the pixel\n \/\/ data. We need to make a copy because pixels is a local\n \/\/ variable in the calling function, and this data structure\n- \/\/ needs to outlive this call to showPixels.]\n+ \/\/ needs to outlive this call to showPixels.\n (*mPixels) = pixels;\n \n \/\/ -- Keep track of the number of strips we've seen\n@@ -368,7 +362,6 @@\n if (gNumStarted == gNumControllers) {\n gCurBuffer = 0;\n gDoneFilling = false;\n- gDoneSending = false;\n \n \/\/ -- Prefill both buffers\n fillBuffer();\n@@ -383,42 +376,11 @@\n xSemaphoreGive(gTX_sem);\n \n i2sStop();\n- \/\/ Serial.println(\"...done\");\n \n \/\/ -- Reset the counters\n gNumStarted = 0;\n }\n }\n-\n- \/\/ -- Copy pixel data\n- \/\/ Make a safe copy of the pixel data, so that the FastLED show\n- \/\/ function can continue to the next controller while the RMT\n- \/\/ device starts sending this data asynchronously.\n- \/*\n- virtual void copyPixelData(PixelController<RGB_ORDER> & pixels)\n- {\n- \/\/ -- Make sure we have a buffer of the right size\n- \/\/ (3 bytes per pixel)\n- int size_needed = pixels.size();\n- if (size_needed > mSize) {\n- mSize = size_needed;\n- for (int i = 0; i < NUM_COLOR_CHANNELS; i++) {\n- if (mPixelData[i] != NULL) free(mPixelData[i]);\n- mPixelData[i] = (uint8_t *) malloc( mSize);\n- }\n-\n- if (gMaxPixels < mSize)\n- gMaxPixels = mSize;\n- }\n-\n- \/\/ -- Cycle through the R,G, and B values in the right order,\n- \/\/ storing the resulting raw pixel data in the buffer.\n- int cur = 0;\n- while (pixels.has(1)) {\n- cur++;\n- }\n- }\n- *\/\n \n \/\/ -- Custom interrupt handler\n static IRAM_ATTR void interruptHandler(void *arg)\n@@ -429,13 +391,9 @@\n if ( ! gDoneFilling) {\n fillBuffer();\n } else {\n- if ( ! gDoneSending) {\n- gDoneSending = true;\n- } else {\n- portBASE_TYPE HPTaskAwoken = 0;\n- xSemaphoreGiveFromISR(gTX_sem, &HPTaskAwoken);\n- if(HPTaskAwoken == pdTRUE) portYIELD_FROM_ISR();\n- }\n+ portBASE_TYPE HPTaskAwoken = 0;\n+ xSemaphoreGiveFromISR(gTX_sem, &HPTaskAwoken);\n+ if(HPTaskAwoken == pdTRUE) portYIELD_FROM_ISR();\n }\n }\n }\n@@ -444,35 +402,25 @@\n {\n volatile uint32_t * buf = (uint32_t *) dmaBuffers[gCurBuffer]->buffer;\n gCurBuffer = (gCurBuffer + 1) % NUM_DMA_BUFFERS;\n- \/\/ Serial.print(\"Fill \"); Serial.print((uint32_t)buf); Serial.println();\n-\n- static uint8_t pixels[NUM_COLOR_CHANNELS][32];\n- \/\/ memset(pixels, 0, NUM_COLOR_CHANNELS * 32);\n \n \/\/ -- Get the requested pixel from each controller. Store the\n \/\/ data for each color channel in a separate array.\n uint32_t has_data_mask = 0;\n for (int i = 0; i < gNumControllers; i++) {\n+ \/\/ -- Store the pixels in reverse controller order starting at index 23\n+ \/\/ This causes the bits to come out in the right position after we\n+ \/\/ transpose them.\n int bit_index = 23-i;\n ClocklessController * pController = static_cast<ClocklessController*>(gControllers[i]);\n if (pController->mPixels->has(1)) {\n- pixels[0][bit_index] = pController->mPixels->loadAndScale0();\n- pixels[1][bit_index] = pController->mPixels->loadAndScale1();\n- pixels[2][bit_index] = pController->mPixels->loadAndScale2();\n+ gPixelRow[0][bit_index] = pController->mPixels->loadAndScale0();\n+ gPixelRow[1][bit_index] = pController->mPixels->loadAndScale1();\n+ gPixelRow[2][bit_index] = pController->mPixels->loadAndScale2();\n pController->mPixels->advanceData();\n pController->mPixels->stepDithering();\n \n \/\/ -- Record that this controller still has data to send\n- has_data_mask |= (1 << bit_index);\n- \/*\n- if (i == 0) {\n- Serial.print(\"Pixel: \"); \n- Serial.print(pixels[0][bit_index]); Serial.print(\" \");\n- Serial.print(pixels[1][bit_index]); Serial.print(\" \");\n- Serial.print(pixels[2][bit_index]);\n- Serial.println();\n- }\n- *\/\n+ has_data_mask |= (1 << (i+8));\n }\n }\n \n@@ -482,20 +430,16 @@\n }\n \n \/\/ -- Transpose and encode the pixel data for the DMA buffer\n- static uint8_t bits[NUM_COLOR_CHANNELS][8][4];\n-\n int buf_index = 0;\n-\n for (int channel = 0; channel < NUM_COLOR_CHANNELS; channel++) {\n \n \/\/ -- Tranpose each array: all the bit 7's, then all the bit 6's, ...\n- \/\/ transpose24x1_noinline(pixels[channel], bits[channel]);\n- transpose32(pixels[channel], & (bits[channel][0][0]) );\n+ transpose32(gPixelRow[channel], gPixelBits[channel][0] );\n \n \/\/Serial.print(\"Channel: \"); Serial.print(channel); Serial.print(\" \");\n for (int bitnum = 0; bitnum < 8; bitnum++) {\n- uint8_t * row = (uint8_t *) & (bits[channel][bitnum][0]);\n- uint32_t bit = (row[0] << 24) | (row[1] << 16) | (row[2] << 8) | row[3];\n+ uint8_t * row = (uint8_t *) (gPixelBits[channel][bitnum]);\n+ uint32_t bit = (row[0] << 24) | (row[1] << 16) | (row[2] << 8) | row[3];\n \n \/*\n Serial.print(bitnum); Serial.print(\": \");\n@@ -509,22 +453,11 @@\n *\/\n \n for (int pulse_num = 0; pulse_num < gPulsesPerBit; pulse_num++) {\n- buf[buf_index++] = \/*has_data_mask &*\/ (bit & gOneBit[pulse_num]) | (~bit & gZeroBit[pulse_num]);\n+ buf[buf_index++] = has_data_mask & ( (bit & gOneBit[pulse_num]) | (~bit & gZeroBit[pulse_num]) );\n \/\/if (buf[buf_index-1] & 0x100) Serial.print(\"1\");\n \/\/else Serial.print(\"0\");\n }\n- \/\/Serial.print(\" \");\n- \/\/ -- Now form the four-bit pattern: we can do this by\n- \/\/ duplicating the bit we computed, and adding a 1\n- \/\/ at the front and a zero at the back: 1bb0\n- \/*\n- buf[channel*32 + bitnum*4] = 0xFFFFFFFF;\n- buf[channel*32 + bitnum*4+1] = bit;\n- buf[channel*32 + bitnum*4+2] = bit;\n- buf[channel*32 + bitnum*4+3] = 0x00000000;\n- *\/\n }\n- \/\/Serial.println();\n }\n }\n \n@@ -534,34 +467,6 @@\n transpose8rS32(& pixels[8], 1, 4, & bits[1]);\n transpose8rS32(& pixels[16], 1, 4, & bits[2]);\n \/\/transpose8rS32(& pixels[24], 1, 4, & bits[3]);\n- \/*\n- Serial.println(\"Pixels:\");\n- for (int m = 0; m < 24; m++) {\n- Serial.print(m); Serial.print(\": \");\n- uint8_t bt = pixels[m];\n- for (int k = 0; k < 8; k++) {\n- if (bt & 0x80) Serial.print(\"1\");\n- else Serial.print(\"0\");\n- bt = bt << 1;\n- }\n- Serial.println();\n- }\n-\n- Serial.println(\"Bits:\");\n- for (int bitnum = 0; bitnum < 8; bitnum++) {\n- Serial.print(bitnum); Serial.print(\": \");\n- for (int w = 0; w < 4; w++) {\n- uint8_t bt = bits[ bitnum*4 + w ];\n- for (int k = 0; k < 8; k++) {\n- if (bt & 0x80) Serial.print(\"1\");\n- else Serial.print(\"0\");\n- bt = bt << 1;\n- }\n- Serial.print(\" \");\n- }\n- Serial.println();\n- }\n- *\/\n }\n \n static void transpose8rS32(uint8_t * A, int m, int n, uint8_t * B) \n@@ -586,74 +491,6 @@\n B[0]=x>>24; B[n]=x>>16; B[2*n]=x>>8; B[3*n]=x;\n B[4*n]=y>>24; B[5*n]=y>>16; B[6*n]=y>>8; B[7*n]=y;\n }\n-\n- \/** Transpose 24 * 8 bits --> 8 * 24 bits\n- *\n- * Important notes: the result is actually 8 * 32 bits, where\n- * each set of bits only occupy the low 24 bits. As with other\n- * transpose functions, the sets of bits are also in reverse\n- * order from what we want -- that is, the least significant bit\n- * (the bit we want to send first) is actually the last set\n- * (index 7).\n- *\n- **\/\n- static void transpose24x1_noinline(unsigned char *A, uint32_t *B) \n- {\n- uint32_t x, y, x1,y1,t,x2,y2;\n- \n- y = *(unsigned int*)(A);\n- x = *(unsigned int*)(A+4);\n- y1 = *(unsigned int*)(A+8);\n- x1 = *(unsigned int*)(A+12);\n- \n- y2 = *(unsigned int*)(A+16);\n- x2 = *(unsigned int*)(A+20);\n- \n- \n- \/\/ pre-transform x\n- t = (x ^ (x >> 7)) & 0x00AA00AA; x = x ^ t ^ (t << 7);\n- t = (x ^ (x >>14)) & 0x0000CCCC; x = x ^ t ^ (t <<14);\n- \n- t = (x1 ^ (x1 >> 7)) & 0x00AA00AA; x1 = x1 ^ t ^ (t << 7);\n- t = (x1 ^ (x1 >>14)) & 0x0000CCCC; x1 = x1 ^ t ^ (t <<14);\n- \n- t = (x2 ^ (x2 >> 7)) & 0x00AA00AA; x2 = x2 ^ t ^ (t << 7);\n- t = (x2 ^ (x2 >>14)) & 0x0000CCCC; x2 = x2 ^ t ^ (t <<14);\n- \n- \/\/ pre-transform y\n- t = (y ^ (y >> 7)) & 0x00AA00AA; y = y ^ t ^ (t << 7);\n- t = (y ^ (y >>14)) & 0x0000CCCC; y = y ^ t ^ (t <<14);\n- \n- t = (y1 ^ (y1 >> 7)) & 0x00AA00AA; y1 = y1 ^ t ^ (t << 7);\n- t = (y1 ^ (y1 >>14)) & 0x0000CCCC; y1 = y1 ^ t ^ (t <<14);\n- \n- t = (y2 ^ (y2 >> 7)) & 0x00AA00AA; y2 = y2 ^ t ^ (t << 7);\n- t = (y2 ^ (y2 >>14)) & 0x0000CCCC; y2 = y2 ^ t ^ (t <<14);\n- \n- \/\/ final transform\n- t = (x & 0xF0F0F0F0) | ((y >> 4) & 0x0F0F0F0F);\n- y = ((x << 4) & 0xF0F0F0F0) | (y & 0x0F0F0F0F);\n- x = t;\n- \n- t = (x1 & 0xF0F0F0F0) | ((y1 >> 4) & 0x0F0F0F0F);\n- y1 = ((x1 << 4) & 0xF0F0F0F0) | (y1 & 0x0F0F0F0F);\n- x1 = t;\n- \n- t = (x2 & 0xF0F0F0F0) | ((y2 >> 4) & 0x0F0F0F0F);\n- y2 = ((x2 << 4) & 0xF0F0F0F0) | (y2 & 0x0F0F0F0F);\n- x2 = t;\n- \n- *((uint32_t*)B) = (uint32_t)( (y & 0xff) | ((y1 & 0xff) <<8) | ((y2 & 0xff) <<16) );\n- *((uint32_t*)(B+1)) = (uint32_t)( ((y & 0xff00) >>8) | (y1 & 0xff00) | ((y2 & 0xff00) <<8) );\n- *((uint32_t*)(B+2)) = (uint32_t)( ((y & 0xff0000) >>16) | ((y1 & 0xff0000) >>8) | (y2 & 0xff0000) );\n- *((uint32_t*)(B+3)) = (uint32_t)( ((y & 0xff000000) >>24) | ((y1 & 0xff000000) >>16) | ((y2 & 0xff000000) >> 8) );\n- \n- *((uint32_t*)(B+4)) = (uint32_t)( (x & 0xff) | ((x1 & 0xff) <<8) | ((x2 & 0xff) <<16) );\n- *((uint32_t*)(B+5)) = (uint32_t)( ((x & 0xff00) >>8) | (x1 & 0xff00) | ((x2 & 0xff00) <<8) );\n- *((uint32_t*)(B+6)) = (uint32_t)( ((x & 0xff0000) >>16) | ((x1 & 0xff0000) >>8) | (x2 & 0xff0000) );\n- *((uint32_t*)(B+7)) = (uint32_t)( ((x & 0xff000000) >>24) | ((x1 & 0xff000000) >>16) | ((x2 & 0xff000000) >> 8) );\n- }\n-\n \n \/** Start I2S transmission\n *\/\n@@ -691,19 +528,18 @@\n const uint32_t conf_reset_flags = I2S_RX_RESET_M | I2S_RX_FIFO_RESET_M | I2S_TX_RESET_M | I2S_TX_FIFO_RESET_M;\n i2s->conf.val |= conf_reset_flags;\n i2s->conf.val &= ~conf_reset_flags;\n- \/\/while (i2s->state.rx_fifo_reset_back)\n- \/\/ ;\n- \/*\n- static void dma_reset(i2s_dev_t *dev) {\n- dev->lc_conf.in_rst=1; dev->lc_conf.in_rst=0;\n- dev->lc_conf.out_rst=1; dev->lc_conf.out_rst=0;\n- }\n-\n- static void fifo_reset(i2s_dev_t *dev) {\n- dev->conf.rx_fifo_reset=1; dev->conf.rx_fifo_reset=0;\n- dev->conf.tx_fifo_reset=1; dev->conf.tx_fifo_reset=0;\n- }\n- *\/\n+ }\n+\n+ static void i2sReset_DMA()\n+ {\n+ i2s->lc_conf.in_rst=1; i2s->lc_conf.in_rst=0;\n+ i2s->lc_conf.out_rst=1; i2s->lc_conf.out_rst=0;\n+ }\n+\n+ static void i2sReset_FIFO()\n+ {\n+ i2s->conf.rx_fifo_reset=1; i2s->conf.rx_fifo_reset=0;\n+ i2s->conf.tx_fifo_reset=1; i2s->conf.tx_fifo_reset=0;\n }\n \n static void i2sStop()\n"} {"commit":"2084f654ee465c1f4811b9fe202430a505b80ce3","subject":"patch for SDL2 integration","message":"patch for SDL2 integration\n","repos":"ronsaldo\/pharo-vm-lowcode,ronsaldo\/pharo-vm-lowcode,bencoman\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,ronsaldo\/pharo-vm-lowcode,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,bencoman\/pharo-vm,bencoman\/pharo-vm,bencoman\/pharo-vm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/win32\/vm\/sqWin32Window.c\n+++ platforms\/win32\/vm\/sqWin32Window.c\n@@ -32,12 +32,12 @@\n # undef SM_CMONITORS\n # define HMONITOR_DECLARED\n # include \"multimon.h\"\n-#else \n-\/** \n- \tTODO: REMOVE, THIS IS ADDED BECAUSE MINGW BUILD IS FAILING IN THE CI \n+#else\n+\/**\n+ TODO: REMOVE, THIS IS ADDED BECAUSE MINGW BUILD IS FAILING IN THE CI\n \tEsteban 2014\/08\/01\n-**\/\n-# ifndef MONITOR_DEFAULTTONEAREST \n+ **\/\n+# ifndef MONITOR_DEFAULTTONEAREST\n # define MONITOR_DEFAULTTONEAREST 2\n WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);\n WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);\n@@ -48,6 +48,10 @@\n #include \"sq.h\"\n #include \"sqWin32Prefs.h\"\n #include \"sqSCCSVersion.h\"\n+\n+#ifndef NO_RCSID\n+static TCHAR RCSID[]= TEXT(\"$Id: sqWin32Window.c 1693 2007-06-03 02:09:21Z andreas $\");\n+#endif\n \n \/****************************************************************************\/\n \/* General Squeak declarations and definitions *\/\n@@ -182,6 +186,15 @@\n sqInputEvent *sqNextEventPut(void);\n int sqLaunchDrop(void);\n \n+\/**\n+ * HACK: Hook for SDL2.\n+ *\/\n+static void (*ioCheckForEventsHooks)(void);\n+\n+EXPORT(void) setIoProcessEventsHandler(void * handler) {\n+ ioCheckForEventsHooks = (void (*)())handler;\n+}\n+\n \/****************************************************************************\/\n \/* Synchronization functions *\/\n \/****************************************************************************\/\n@@ -261,7 +274,7 @@\n evt->charCode = (zDelta > 0) ? 30 : 31;\n evt->pressCode = EventKeyChar;\n evt->modifiers = CtrlKeyBit;\n- evt->utf32Code = 0;\n+ evt->utf32Code = evt->charCode;\n evt->reserved1 = 0;\n } else {\n buttonState = 64;\n@@ -1571,16 +1584,26 @@\n so we won't get anything painted unless we use GetMessage() if there\n is a dirty rect. *\/\n \tlastMessage = &msg;\n-\twhile(PeekMessage(&msg,NULL,0,0,PM_NOREMOVE)) {\n-\t\tGetMessage(&msg,NULL,0,0);\n+\n+ if(ioCheckForEventsHooks)\n+\t{\n+\t\t\/* HACK for SDL 2 *\/\n+ ioCheckForEventsHooks();\n+\t}\n+\telse\n+\t{\n+\t\n+\t\twhile(PeekMessage(&msg,NULL,0,0,PM_NOREMOVE)) {\n+\t\t\tGetMessage(&msg,NULL,0,0);\n # ifndef NO_PLUGIN_SUPPORT\n-\t\tif (msg.hwnd == NULL)\n-\t\t\tpluginHandleEvent(&msg);\n+\t\t\tif (msg.hwnd == NULL)\n+\t\t\t\tpluginHandleEvent(&msg);\n # endif\n-\t\tTranslateMessage(&msg);\n-\t\tDispatchMessage(&msg);\n- }\n-\n+\t\t\tTranslateMessage(&msg);\n+\t\t\tDispatchMessage(&msg);\n+\n+\t\t}\n+\t}\n # ifndef NO_DIRECTINPUT\n \t\/* any buffered mouse input which hasn't been processed is obsolete *\/\n \tDumpBufferedMouseTrail();\n"} {"commit":"528351cdcff8a7e3b506056321398e0ef0f2943e","subject":"Add a simple command line interface","message":"Add a simple command line interface\n","repos":"leitec\/pummarola,leitec\/pummarola,leitec\/pummarola,leitec\/pummarola","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lp_test.c\n+++ lp_test.c\n@@ -17,6 +17,7 @@\n \tchar *url, *token, *token_secret;\n \tchar buf[256];\n \tFILE *f;\n+\tint count = 5;\n \tlc_list_t tweets;\n \ttweet_t tw;\n \n@@ -65,29 +66,29 @@\n \t\tprintf(\"\\nPummarola: running as %s (@%s)\\n\\n\",\n \t\t\t\tlph->name, lph->screen_name);\n \n-\tlp_timeline_get_home(lph, &tweets, 5);\n+\tfor(;;) {\n+\t\tprintf(\"Pummarola> \");\n+\t\tfflush(stdout);\n+\t\tgets(buf);\n \n-\tlc_list_foreach(tweets, (lc_foreachfn_t)print_tweet);\n-\tlc_list_destroy(tweets);\n-\n-\tprintf(\"Enter a twitter ID: \");\n-\tfflush(stdout);\n-\tgets(buf);\n-\n-\tprintf(\"\\n\");\n-\n-\tlp_timeline_get_user(lph, &tweets, buf, 5);\n-\tlc_list_foreach(tweets, (lc_foreachfn_t)print_tweet);\n-\tlc_list_destroy(tweets);\n-\n-\tprintf(\"\\n\");\n-#ifdef macintosh\n-\tlp_tweet_send(lph, &tw, \"This tweet sent from Pummarola for Mac.\");\n-#else\n-\tlp_tweet_send(lph, &tw, \"This tweet also sent from Pummarola for Linux.\");\n-#endif\n-\n-\tprint_tweet(&tw);\n+\t\tif(strncmp(buf, \"get \", 4) == 0) {\n+\t\t\tlp_timeline_get_user(lph, &tweets, buf+4, count);\n+\t\t\tlc_list_foreach(tweets,(lc_foreachfn_t)print_tweet);\n+\t\t\tlc_list_destroy(tweets);\n+\t\t} else if(strncmp(buf, \"home\", 4) == 0) {\n+\t\t\tlp_timeline_get_home(lph, &tweets, count);\n+\t\t\tlc_list_foreach(tweets,(lc_foreachfn_t)print_tweet);\n+\t\t\tlc_list_destroy(tweets);\n+\t\t} else if(strncmp(buf, \"tweet \", 6) == 0) {\n+\t\t\tlp_tweet_send(lph, &tw, buf+6);\n+\t\t\tprint_tweet(&tw);\n+\t\t} else if(strncmp(buf, \"count \", 6) == 0) {\n+\t\t\tcount = atoi(buf+6);\n+\t\t\tprintf(\"Count set to %d\\n\", count);\n+\t\t} else if(strncmp(buf, \"quit\", 4) == 0) {\n+\t\t\tbreak;\n+\t\t}\n+\t}\n \n \tlibpummarola_destroy(lph);\n \treturn 0;\n"} {"commit":"b3880122eebc91084ae60e5c1f80c1c799896c5e","subject":"fixed same carry bug in INT multiply","message":"fixed same carry bug in INT multiply\n","repos":"Zorro666\/LPA","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- lpa_int.c\n+++ lpa_int.c\n@@ -232,10 +232,7 @@\n \t\t\tpResult->pDigits[outIndex] = units;\n \t\t\tLPA_INT_LOG(\"ind:%d units:0x%X carry:0x%X\\n\", outIndex, units, carry);\n \t\t}\n-\t}\n-\tif (carry > 0)\n-\t{\n-\t\toutIndex++;\n+\t\t++outIndex;\n \t\tpResult->pDigits[outIndex] = carry;\n \t}\n }\n"} {"commit":"b45c569b6f257d8905acd8313224dc086266f602","subject":"ls-tree: further cleanup to parallel ls-files.","message":"ls-tree: further cleanup to parallel ls-files.\n\nTo get more a \"git-ls-files\" approach, this trivial patch (on top of my\nprevious one) enables recursion, and doesn't show partial trees.\n\n[jc: after further discussion, this version enables recursion by default,\n and you can disable it with \"-d\" flag.\n\n\tgit-ls-tree -d HEAD Documentation\/no\/such\/directory\n\n shows Documentation tree (without -d it shows nothing).\n\n\tgit-ls-tree HEAD\n\n shows everything from the tree. Only to get the single level from the top\n\n\tgit-ls-tree -d HEAD\n\n is needed. But there is no way to get the single level with pathspec.\n You need to extract the object name of Documentation tree from the parent\n tree and run\n\n\tgit-ls-tree -d $tree_id_of_Documentation_tree\n\n to get something similar to what you can get from the current\n\n\tgit-ls-tree HEAD Documentation\n ]\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ls-tree.c\n+++ ls-tree.c\n@@ -11,7 +11,7 @@\n static int line_termination = '\\n';\n #define LS_RECURSIVE 1\n #define LS_TREE_ONLY 2\n-static int ls_options = 0;\n+static int ls_options = LS_RECURSIVE;\n \n static const char ls_tree_usage[] =\n \t\"git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]\";\n@@ -19,16 +19,15 @@\n static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)\n {\n \tconst char *type = \"blob\";\n-\tint retval = 0;\n \n \tif (S_ISDIR(mode)) {\n+\t\tif (ls_options & LS_RECURSIVE)\n+\t\t\treturn READ_TREE_RECURSIVE;\n \t\ttype = \"tree\";\n-\t\tif (ls_options & LS_RECURSIVE)\n-\t\t\tretval = READ_TREE_RECURSIVE;\n \t}\n \n \tprintf(\"%06o %s %s\\t%.*s%s%c\", mode, type, sha1_to_hex(sha1), baselen, base, pathname, line_termination);\n-\treturn retval;\n+\treturn 0;\n }\n \n int main(int argc, const char **argv)\n"} {"commit":"a6bf530c5f99ea6359e7793172f90bc04a2abf9a","subject":"Remove a warning.","message":"Remove a warning.\n","repos":"P-p-H-d\/mlib,P-p-H-d\/mlib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- m-array.h\n+++ m-array.h\n@@ -629,7 +629,7 @@\n { \\\n size_t th = 4; \\\n M_IF_DEBUG(type *org_tab = tab;) \\\n- M_ASSUME (size > 1); \\\n+ assert (size > 1); \\\n \/* Let's select the threshold of the pass 1 to be sure \\\n the final result is in tab.*\/ \\\n if (m_core_clz(size-1) & 1) \\\n"} {"commit":"d2770956cb4c6e113c9f2ac05415831cae297bbc","subject":"- fastlz.c is obsolete since a long time","message":"- fastlz.c is obsolete since a long time\n","repos":"JacksonIsaac\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv,JacksonIsaac\/libsolv,JacksonIsaac\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv,jsilhan\/libsolv","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/fastlz.c\n+++ src\/fastlz.c\n@@ -1,702 +0,0 @@\n-\/*\n- * Copyright (c) 2007, Novell Inc.\n- *\n- * This program is licensed under the BSD license, read LICENSE.BSD\n- * for further information\n- *\/\n-\n-#include <sys\/types.h>\n-#include <stdlib.h>\n-#include <stdio.h>\n-#include <string.h>\n-#include <assert.h>\n-#include <time.h>\n-\n-#define BLOCK_SIZE (65536*1)\n-#if BLOCK_SIZE <= 65536\n-typedef __uint16_t Ref;\n-#else\n-typedef __uint32_t Ref;\n-#endif\n-\n-\/*\n- The format is tailored for fast decompression (i.e. only byte based),\n- and skewed to ASCII content (highest bit often not set):\n- \n- a 0LLLLLLL\n- - self-describing ASCII character hex L\n- b 100lllll <l+1 bytes>\n- - literal run of length l+1\n- c 101oolll <8o>\n- - back ref of length l+2, at offset -(o+1) (o < 1 << 10)\n- d 110lllll <8o>\n- - back ref of length l+2+8, at offset -(o+1) (o < 1 << 8)\n- e 1110llll <8o> <8o>\n- - back ref of length l+3, at offset -(o+1) (o < 1 << 16)\n- f1 1111llll <8l> <8o> <8o>\n- - back ref, length l+19 (l < 1<<12), offset -(o+1) (o < 1<<16)\n- f2 11110lll <8l> <8o> <8o>\n- - back ref, length l+19 (l < 1<<11), offset -(o+1) (o < 1<<16)\n- g 11111lll <8l> <8o> <8o> <8o>\n- - back ref, length l+5 (l < 1<<11), offset -(o+1) (o < 1<<24)\n-\n- Generally for a literal of length L we need L+1 bytes, hence it is\n- better to encode also very short backrefs (2 chars) as backrefs if\n- their offset is small, as that only needs two bytes. Except if we\n- already have a literal run, in that case it's better to append there,\n- instead of breaking it for a backref. So given a potential backref\n- at offset O, length L the strategy is as follows:\n-\n- L < 2 : encode as 1-literal\n- L == 2, O > 1024 : encode as 1-literal\n- L == 2, have already literals: encode as 1-literal\n- O = O - 1\n- L >= 2, L <= 9, O < 1024 : encode as c\n- L >= 10, L <= 41, O < 256 : encode as d\n- else we have either O >= 1024, or L >= 42:\n- L < 3 : encode as 1-literal\n- L >= 3, L <= 18, O < 65536 : encode as e\n- L >= 19, L <= 4095+18, O < 65536 : encode as f\n- else we have either L >= 4096+18 or O >= 65536.\n- O >= 65536: encode as 1-literal, too bad\n- (with the current block size this can't happen)\n- L >= 4096+18, so reduce to 4095+18 : encode as f\n-*\/\n-\n-\n-unsigned int\n-compress_buf (const unsigned char *in, unsigned int in_len,\n-\t unsigned char *out, unsigned int out_len)\n-{\n- unsigned int oo = 0;\t\t\/\/out-offset\n- unsigned int io = 0;\t\t\/\/in-offset\n-#define HS (65536)\n- Ref htab[HS];\n- Ref hnext[BLOCK_SIZE];\n- memset (htab, -1, sizeof (htab));\n- memset (hnext, -1, sizeof (hnext));\n- unsigned int litofs = 0;\n- while (io + 2 < in_len)\n- {\n- \/* Search for a match of the string starting at IN, we have at\n- least three characters. *\/\n- unsigned int hval = in[io] | in[io + 1] << 8 | in[io + 2] << 16;\n- unsigned int try, mlen, mofs, tries;\n- hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5;\n- hval = hval & (HS - 1);\n- try = htab[hval];\n- hnext[io] = htab[hval];\n- htab[hval] = io;\n- mlen = 0;\n- mofs = 0;\n-\n- for (tries = 0; try != -1 && tries < 12; tries++)\n- {\n-\t if (try < io\n-\t && in[try] == in[io] && in[try + 1] == in[io + 1])\n-\t {\n-\t mlen = 2;\n-\t mofs = (io - try) - 1;\n-\t break;\n-\t }\n-\t try = hnext[try];\n-\t}\n- for (; try != -1 && tries < 12; tries++)\n-\t{\n-\t \/\/assert (mlen >= 2);\n-\t \/\/assert (io + mlen < in_len);\n-\t \/* Try a match starting from [io] with the strings at [try].\n-\t That's only sensible if TRY actually is before IO (can happen\n-\t with uninit hash table). If we have a previous match already\n-\t we're only going to take the new one if it's longer, hence\n-\t check the potentially last character. *\/\n-\t if (try < io && in[try + mlen] == in[io + mlen])\n-\t {\n-\t unsigned int this_len, this_ofs;\n-\t if (memcmp (in + try, in + io, mlen))\n-\t\tgoto no_match;\n-\t this_len = mlen + 1;\n-\t \/* Now try extending the match by more characters. *\/\n-\t for (;\n-\t\t io + this_len < in_len\n-\t\t && in[try + this_len] == in[io + this_len]; this_len++)\n-\t\t;\n-#if 0\n-\t unsigned int testi;\n-\t for (testi = 0; testi < this_len; testi++)\n-\t\tassert (in[try + testi] == in[io + testi]);\n-#endif\n-\t this_ofs = (io - try) - 1;\n-\t \/*if (this_ofs > 65535)\n-\t\t goto no_match; *\/\n-#if 0\n-\t assert (this_len >= 2);\n-\t assert (this_len >= mlen);\n-\t assert (this_len > mlen || (this_len == mlen && this_ofs > mofs));\n-#endif\n-\t mlen = this_len, mofs = this_ofs;\n-\t \/* If our match extends up to the end of input, no next\n-\t\t match can become better. This is not just an\n-\t\t optimization, it establishes a loop invariant\n-\t\t (io + mlen < in_len). *\/\n-\t if (io + mlen >= in_len)\n-\t\tgoto match_done;\n-\t }\n-\tno_match:\n-\t try = hnext[try];\n-\t \/*if (io - try - 1 >= 65536)\n-\t break;*\/\n-\t}\n-\n-match_done:\n- if (mlen)\n-\t{\n-\t \/\/fprintf (stderr, \"%d %d\\n\", mlen, mofs);\n-\t if (mlen == 2 && (litofs || mofs >= 1024))\n-\t mlen = 0;\n-\t \/*else if (mofs >= 65536)\n-\t mlen = 0;*\/\n-\t else if (mofs >= 65536)\n-\t {\n-\t if (mlen >= 2048 + 5)\n-\t mlen = 2047 + 5;\n-\t else if (mlen < 5)\n-\t mlen = 0;\n-\t }\n-\t else if (mlen < 3)\n-\t mlen = 0;\n-\t \/*else if (mlen >= 4096 + 19)\n-\t mlen = 4095 + 19;*\/\n-\t else if (mlen >= 2048 + 19)\n-\t mlen = 2047 + 19;\n-\t \/* Skip this match if the next character would deliver a better one,\n-\t but only do this if we have the chance to really extend the\n-\t length (i.e. our current length isn't yet the (conservative)\n-\t maximum). *\/\n-\t if (mlen && mlen < (2048 + 5) && io + 3 < in_len)\n-\t {\n-\t unsigned int hval =\n-\t\tin[io + 1] | in[io + 2] << 8 | in[io + 3] << 16;\n-\t unsigned int try;\n-\t hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5;\n-\t hval = hval & (HS - 1);\n-\t try = htab[hval];\n-\t if (try < io + 1\n-\t\t && in[try] == in[io + 1] && in[try + 1] == in[io + 2])\n-\t\t{\n-\t\t unsigned int this_len;\n-\t\t this_len = 2;\n-\t\t for (;\n-\t\t io + 1 + this_len < in_len\n-\t\t && in[try + this_len] == in[io + 1 + this_len];\n-\t\t this_len++)\n-\t\t ;\n-\t\t if (this_len >= mlen)\n-\t\t mlen = 0;\n-\t\t}\n-\t }\n-\t}\n- if (!mlen)\n-\t{\n-\t if (!litofs)\n-\t litofs = io + 1;\n-\t io++;\n-\t}\n- else\n-\t{\n-\t if (litofs)\n-\t {\n-\t litofs--;\n-\t unsigned litlen = io - litofs;\n-\t \/\/fprintf (stderr, \"lit: %d\\n\", litlen);\n-\t while (litlen)\n-\t\t{\n-\t\t unsigned int easy_sz;\n-\t\t \/* Emit everything we can as self-describers. As soon as\n-\t\t we hit a byte we can't emit as such we're going to emit\n-\t\t a length descriptor anyway, so we can as well include\n-\t\t bytes < 0x80 which might follow afterwards in that run. *\/\n-\t\t for (easy_sz = 0;\n-\t\t easy_sz < litlen && in[litofs + easy_sz] < 0x80;\n-\t\t easy_sz++)\n-\t\t ;\n-\t\t if (easy_sz)\n-\t\t {\n-\t\t if (oo + easy_sz >= out_len)\n-\t\t\treturn 0;\n-\t\t memcpy (out + oo, in + litofs, easy_sz);\n-\t\t litofs += easy_sz;\n-\t\t oo += easy_sz;\n-\t\t litlen -= easy_sz;\n-\t\t if (!litlen)\n-\t\t\tbreak;\n-\t\t }\n-\t\t if (litlen <= 32)\n-\t\t {\n-\t\t if (oo + 1 + litlen >= out_len)\n-\t\t\treturn 0;\n-\t\t out[oo++] = 0x80 | (litlen - 1);\n-\t\t while (litlen--)\n-\t\t\tout[oo++] = in[litofs++];\n-\t\t break;\n-\t\t }\n-\t\t else\n-\t\t {\n-\t\t \/* Literal length > 32, so chunk it. *\/\n-\t\t if (oo + 1 + 32 >= out_len)\n-\t\t\treturn 0;\n-\t\t out[oo++] = 0x80 | 31;\n-\t\t memcpy (out + oo, in + litofs, 32);\n-\t\t oo += 32;\n-\t\t litofs += 32;\n-\t\t litlen -= 32;\n-\t\t }\n-\t\t}\n-\t litofs = 0;\n-\t }\n-\n-\t \/\/fprintf (stderr, \"ref: %d @ %d\\n\", mlen, mofs);\n-\n-\t if (mlen >= 2 && mlen <= 9 && mofs < 1024)\n-\t {\n-\t if (oo + 2 >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0xa0 | ((mofs & 0x300) >> 5) | (mlen - 2);\n-\t out[oo++] = mofs & 0xff;\n-\t }\n-\t else if (mlen >= 10 && mlen <= 41 && mofs < 256)\n-\t {\n-\t if (oo + 2 >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0xc0 | (mlen - 10);\n-\t out[oo++] = mofs;\n-\t }\n-\t else if (mofs >= 65536)\n-\t {\n-\t assert (mlen >= 5 && mlen < 2048 + 5);\n-\t if (oo + 5 >= out_len)\n-\t return 0;\n-\t out[oo++] = 0xf8 | ((mlen - 5) >> 8);\n-\t out[oo++] = (mlen - 5) & 0xff;\n-\t out[oo++] = mofs & 0xff;\n-\t out[oo++] = (mofs >> 8) & 0xff;\n-\t out[oo++] = mofs >> 16;\n-\t }\n-\t else if (mlen >= 3 && mlen <= 18)\n-\t {\n-\t assert (mofs < 65536);\n-\t if (oo + 3 >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0xe0 | (mlen - 3);\n-\t out[oo++] = mofs & 0xff;\n-\t out[oo++] = mofs >> 8;\n-\t }\n-\t else\n-\t {\n-\t assert (mlen >= 19 && mlen <= 4095 + 19 && mofs < 65536);\n-\t if (oo + 4 >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0xf0 | ((mlen - 19) >> 8);\n-\t out[oo++] = (mlen - 19) & 0xff;\n-\t out[oo++] = mofs & 0xff;\n-\t out[oo++] = mofs >> 8;\n-\t }\n-\t \/* Insert the hashes for the compressed run [io..io+mlen-1].\n-\t For [io] we have it already done at the start of the loop.\n-\t So it's from [io+1..io+mlen-1], and we need three chars per\n-\t hash, so the accessed characters will be [io+1..io+mlen-1+2],\n-\t ergo io+mlen+1 < in_len. *\/\n-\t mlen--;\n-\t io++;\n-\t while (mlen--)\n-\t {\n-\t if (io + 2 < in_len)\n-\t\t{\n-\t\t unsigned int hval =\n-\t\t in[io] | in[io + 1] << 8 | in[io + 2] << 16;\n-\t\t hval = (hval ^ (hval << 5) ^ (hval >> 5)) - hval * 5;\n-\t\t hval = hval & (HS - 1);\n-\t\t hnext[io] = htab[hval];\n-\t\t htab[hval] = io;\n-\t\t}\n-\t io++;\n-\t };\n-\t}\n- }\n- \/* We might have some characters left. *\/\n- if (io < in_len && !litofs)\n- litofs = io + 1;\n- io = in_len;\n- if (litofs)\n- {\n- litofs--;\n- unsigned litlen = io - litofs;\n- \/\/fprintf (stderr, \"lit: %d\\n\", litlen);\n- while (litlen)\n-\t{\n-\t unsigned int easy_sz;\n-\t \/* Emit everything we can as self-describers. As soon as we hit a\n-\t byte we can't emit as such we're going to emit a length\n-\t descriptor anyway, so we can as well include bytes < 0x80 which\n-\t might follow afterwards in that run. *\/\n-\t for (easy_sz = 0; easy_sz < litlen && in[litofs + easy_sz] < 0x80;\n-\t easy_sz++)\n-\t ;\n-\t if (easy_sz)\n-\t {\n-\t if (oo + easy_sz >= out_len)\n-\t\treturn 0;\n-\t memcpy (out + oo, in + litofs, easy_sz);\n-\t litofs += easy_sz;\n-\t oo += easy_sz;\n-\t litlen -= easy_sz;\n-\t if (!litlen)\n-\t\tbreak;\n-\t }\n-\t if (litlen <= 32)\n-\t {\n-\t if (oo + 1 + litlen >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0x80 | (litlen - 1);\n-\t while (litlen--)\n-\t\tout[oo++] = in[litofs++];\n-\t break;\n-\t }\n-\t else\n-\t {\n-\t \/* Literal length > 32, so chunk it. *\/\n-\t if (oo + 1 + 32 >= out_len)\n-\t\treturn 0;\n-\t out[oo++] = 0x80 | 31;\n-\t memcpy (out + oo, in + litofs, 32);\n-\t oo += 32;\n-\t litofs += 32;\n-\t litlen -= 32;\n-\t }\n-\t}\n- litofs = 0;\n- }\n- return oo;\n-}\n-\n-unsigned int\n-unchecked_decompress_buf (const unsigned char *in, unsigned int in_len,\n-\t\t\t unsigned char *out,\n-\t\t\t unsigned int out_len __attribute__((unused)))\n-{\n- unsigned char *orig_out = out;\n- const unsigned char *in_end = in + in_len;\n- while (in < in_end)\n- {\n- unsigned int first = *in++;\n- int o;\n- switch (first >> 4)\n-\t{\n-\tdefault:\n-\t \/* This default case can't happen, but GCCs VRP is not strong\n-\t enough to see this, so make this explicitely not fall to\n-\t the end of the switch, so that we don't have to initialize\n-\t o above. *\/\n-\t continue;\n-\tcase 0: case 1:\n-\tcase 2: case 3:\n-\tcase 4: case 5:\n-\tcase 6: case 7:\n-\t \/\/a 0LLLLLLL\n-\t \/\/fprintf (stderr, \"lit: 1\\n\");\n-\t *out++ = first;\n-\t continue;\n-\tcase 8: case 9:\n-\t \/\/b 100lllll <l+1 bytes>\n-\t {\n-\t unsigned int l = first & 31;\n-\t \/\/fprintf (stderr, \"lit: %d\\n\", l);\n-\t do\n-\t *out++ = *in++;\n-\t while (l--);\n-\t continue;\n-\t }\n-\tcase 10: case 11:\n-\t \/\/c 101oolll <8o>\n-\t {\n-\t o = first & (3 << 3);\n-\t o = (o << 5) | *in++;\n-\t first = (first & 7) + 2;\n-\t break;\n-\t }\n-\tcase 12: case 13:\n-\t \/\/d 110lllll <8o>\n-\t {\n-\t o = *in++;\n-\t first = (first & 31) + 10;\n-\t break;\n-\t }\n-\tcase 14:\n-\t \/\/ e 1110llll <8o> <8o>\n-\t {\n-\t o = in[0] | (in[1] << 8);\n-\t in += 2;\n-\t first = first & 31;\n-\t first += 3;\n-\t break;\n-\t }\n-\tcase 15:\n-\t \/\/f1 1111llll <8o> <8o> <8l>\n-\t \/\/f2 11110lll <8o> <8o> <8l>\n-\t \/\/ g 11111lll <8o> <8o> <8o> <8l>\n-\t {\n-\t first = first & 15;\n-\t if (first >= 8)\n-\t {\n-\t\tfirst = (((first - 8) << 8) | in[0]) + 5;\n-\t\to = in[1] | (in[2] << 8) | (in[3] << 16);\n-\t\tin += 4;\n-\t }\n-\t else\n-\t {\n-\t first = ((first << 8) | in[0]) + 19;\n-\t\to = in[1] | (in[2] << 8);\n-\t\tin += 3;\n-\t }\n-\t break;\n-\t }\n-\t}\n- \/\/fprintf (stderr, \"ref: %d @ %d\\n\", first, o);\n- o++;\n- o = -o;\n-#if 0\n- \/* We know that first will not be zero, and this loop structure is\n- better optimizable. *\/\n- do\n-\t{\n-\t *out = *(out - o);\n-\t out++;\n-\t}\n- while (--first);\n-#else\n- switch (first)\n- {\n-\t case 18: *out = *(out + o); out++;\n-\t case 17: *out = *(out + o); out++;\n-\t case 16: *out = *(out + o); out++;\n-\t case 15: *out = *(out + o); out++;\n-\t case 14: *out = *(out + o); out++;\n-\t case 13: *out = *(out + o); out++;\n-\t case 12: *out = *(out + o); out++;\n-\t case 11: *out = *(out + o); out++;\n-\t case 10: *out = *(out + o); out++;\n-\t case 9: *out = *(out + o); out++;\n-\t case 8: *out = *(out + o); out++;\n-\t case 7: *out = *(out + o); out++;\n-\t case 6: *out = *(out + o); out++;\n-\t case 5: *out = *(out + o); out++;\n-\t case 4: *out = *(out + o); out++;\n-\t case 3: *out = *(out + o); out++;\n-\t case 2: *out = *(out + o); out++;\n-\t case 1: *out = *(out + o); out++;\n-\t case 0: break;\n-\t default:\n-\t \/* Duff duff :-) *\/\n-\t switch (first & 15)\n-\t {\n-\t\tdo\n-\t\t {\n-\t\t case 0: *out = *(out + o); out++;\n-\t\t case 15: *out = *(out + o); out++;\n-\t\t case 14: *out = *(out + o); out++;\n-\t\t case 13: *out = *(out + o); out++;\n-\t\t case 12: *out = *(out + o); out++;\n-\t\t case 11: *out = *(out + o); out++;\n-\t\t case 10: *out = *(out + o); out++;\n-\t\t case 9: *out = *(out + o); out++;\n-\t\t case 8: *out = *(out + o); out++;\n-\t\t case 7: *out = *(out + o); out++;\n-\t\t case 6: *out = *(out + o); out++;\n-\t\t case 5: *out = *(out + o); out++;\n-\t\t case 4: *out = *(out + o); out++;\n-\t\t case 3: *out = *(out + o); out++;\n-\t\t case 2: *out = *(out + o); out++;\n-\t\t case 1: *out = *(out + o); out++;\n-\t\t }\n-\t\twhile ((int)(first -= 16) > 0);\n-\t }\n-\t break;\n-\t}\n-#endif\n- }\n- return out - orig_out;\n-}\n-\n-#ifdef STANDALONE\n-\n-static void\n-transfer_file (FILE * from, FILE * to, int compress)\n-{\n- unsigned char inb[BLOCK_SIZE];\n- unsigned char outb[BLOCK_SIZE];\n- while (!feof (from) && !ferror (from))\n- {\n- unsigned int in_len, out_len;\n- if (compress)\n-\t{\n-\t in_len = fread (inb, 1, BLOCK_SIZE, from);\n-\t if (in_len)\n-\t {\n-\t unsigned char *b = outb;\n-\t out_len = compress_buf (inb, in_len, outb, sizeof (outb));\n-\t if (!out_len)\n-\t\tb = inb, out_len = in_len;\n-\t if (fwrite (&out_len, sizeof (out_len), 1, to) != 1)\n-\t\t{\n-\t\t perror (\"write size\");\n-\t\t exit (1);\n-\t\t}\n-\t if (fwrite (b, out_len, 1, to) != 1)\n-\t\t{\n-\t\t perror (\"write data\");\n-\t\t exit (1);\n-\t\t}\n-\t }\n-\t}\n- else\n-\t{\n-\t if (fread (&in_len, sizeof (in_len), 1, from) != 1)\n-\t {\n-\t if (feof (from))\n-\t\treturn;\n-\t perror (\"can't read size\");\n-\t exit (1);\n-\t }\n-\t if (fread (inb, in_len, 1, from) != 1)\n-\t {\n-\t perror (\"can't read data\");\n-\t exit (1);\n-\t }\n-\t out_len =\n-\t unchecked_decompress_buf (inb, in_len, outb, sizeof (outb));\n-\t if (fwrite (outb, out_len, 1, to) != 1)\n-\t {\n-\t perror (\"can't write output\");\n-\t exit (1);\n-\t }\n-\t}\n- }\n-}\n-\n-\/* Just for benchmarking purposes. *\/\n-static void\n-dumb_memcpy (void *dest, const void *src, unsigned int len)\n-{\n- char *d = dest;\n- const char *s = src;\n- while (len--)\n- *d++ = *s++;\n-}\n-\n-static void\n-benchmark (FILE * from)\n-{\n- unsigned char inb[BLOCK_SIZE];\n- unsigned char outb[BLOCK_SIZE];\n- unsigned int in_len = fread (inb, 1, BLOCK_SIZE, from);\n- unsigned int out_len;\n- if (!in_len)\n- {\n- perror (\"can't read from input\");\n- exit (1);\n- }\n-\n- unsigned int calib_loop;\n- unsigned int per_loop;\n- unsigned int i, j;\n- clock_t start, end;\n- float seconds;\n-\n-#if 0\n- calib_loop = 1;\n- per_loop = 0;\n- start = clock ();\n- while ((clock () - start) < CLOCKS_PER_SEC \/ 4)\n- {\n- calib_loop *= 2;\n- for (i = 0; i < calib_loop; i++)\n-\tdumb_memcpy (outb, inb, in_len);\n- per_loop += calib_loop;\n- }\n-\n- fprintf (stderr, \"memcpy:\\nCalibrated to %d iterations per loop\\n\",\n-\t per_loop);\n-\n- start = clock ();\n- for (i = 0; i < 10; i++)\n- for (j = 0; j < per_loop; j++)\n- dumb_memcpy (outb, inb, in_len);\n- end = clock ();\n- seconds = (end - start) \/ (float) CLOCKS_PER_SEC;\n- fprintf (stderr, \"%.2f seconds == %.2f MB\/s\\n\", seconds,\n-\t ((long long) in_len * per_loop * 10) \/ (1024 * 1024 * seconds));\n-#endif\n-\n- calib_loop = 1;\n- per_loop = 0;\n- start = clock ();\n- while ((clock () - start) < CLOCKS_PER_SEC \/ 4)\n- {\n- calib_loop *= 2;\n- for (i = 0; i < calib_loop; i++)\n-\tcompress_buf (inb, in_len, outb, sizeof (outb));\n- per_loop += calib_loop;\n- }\n-\n- fprintf (stderr, \"compression:\\nCalibrated to %d iterations per loop\\n\",\n-\t per_loop);\n-\n- start = clock ();\n- for (i = 0; i < 10; i++)\n- for (j = 0; j < per_loop; j++)\n- compress_buf (inb, in_len, outb, sizeof (outb));\n- end = clock ();\n- seconds = (end - start) \/ (float) CLOCKS_PER_SEC;\n- fprintf (stderr, \"%.2f seconds == %.2f MB\/s\\n\", seconds,\n-\t ((long long) in_len * per_loop * 10) \/ (1024 * 1024 * seconds));\n-\n- out_len = compress_buf (inb, in_len, outb, sizeof (outb));\n-\n- calib_loop = 1;\n- per_loop = 0;\n- start = clock ();\n- while ((clock () - start) < CLOCKS_PER_SEC \/ 4)\n- {\n- calib_loop *= 2;\n- for (i = 0; i < calib_loop; i++)\n-\tunchecked_decompress_buf (outb, out_len, inb, sizeof (inb));\n- per_loop += calib_loop;\n- }\n-\n- fprintf (stderr, \"decompression:\\nCalibrated to %d iterations per loop\\n\",\n-\t per_loop);\n-\n- start = clock ();\n- for (i = 0; i < 10; i++)\n- for (j = 0; j < per_loop; j++)\n- unchecked_decompress_buf (outb, out_len, inb, sizeof (inb));\n- end = clock ();\n- seconds = (end - start) \/ (float) CLOCKS_PER_SEC;\n- fprintf (stderr, \"%.2f seconds == %.2f MB\/s\\n\", seconds,\n-\t ((long long) in_len * per_loop * 10) \/ (1024 * 1024 * seconds));\n-}\n-\n-int\n-main (int argc, char *argv[])\n-{\n- int compress = 1;\n- if (argc > 1 && !strcmp (argv[1], \"-d\"))\n- compress = 0;\n- if (argc > 1 && !strcmp (argv[1], \"-b\"))\n- benchmark (stdin);\n- else\n- transfer_file (stdin, stdout, compress);\n- return 0;\n-}\n-\n-#endif\n"} {"commit":"0e656d481a04239bd911216fa3d0402e70cfb40f","subject":"Implementing coroutine semaphore\/fence awaits.","message":"Implementing coroutine semaphore\/fence awaits.\n\nProgress on #8093.\n","repos":"google\/iree,iree-org\/iree,google\/iree,iree-org\/iree,google\/iree,google\/iree,iree-org\/iree,iree-org\/iree,google\/iree,google\/iree,google\/iree,iree-org\/iree,iree-org\/iree,iree-org\/iree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- runtime\/src\/iree\/modules\/hal\/module.c\n+++ runtime\/src\/iree\/modules\/hal\/module.c\n@@ -1375,43 +1375,202 @@\n return iree_ok_status();\n }\n \n+\/\/ Removes entries in |fences| if they have been reached.\n+\/\/ Returns failure if one or more fences have failed.\n+static iree_status_t iree_hal_module_fence_elide_reached(\n+ iree_host_size_t* fence_count, iree_hal_fence_t** fences) {\n+ iree_host_size_t new_count = *fence_count;\n+ for (iree_host_size_t i = 0; i < new_count;) {\n+ iree_status_t status = iree_hal_fence_query(fences[i]);\n+ if (iree_status_is_ok(status)) {\n+ \/\/ Has been reached; shift the list down.\n+ memmove(&fences[i], &fences[i + 1],\n+ (new_count - i - 1) * sizeof(iree_hal_fence_t*));\n+ fences[new_count - 1] = NULL;\n+ --new_count;\n+ } else if (iree_status_is_deferred(status)) {\n+ \/\/ Still waiting.\n+ iree_status_ignore(status);\n+ ++i; \/\/ next\n+ } else {\n+ \/\/ Failed; propagate failure.\n+ *fence_count = new_count;\n+ return status;\n+ }\n+ }\n+ *fence_count = new_count;\n+ return iree_ok_status();\n+}\n+\n+\/\/ Enters a wait frame for all timepoints in all |fences|.\n+\/\/ Returns an |out_wait_status| of OK if all fences have been reached or\n+\/\/ IREE_STATUS_DEFERRED if one or more fences are still pending and a wait\n+\/\/ frame was entered.\n+static iree_status_t iree_hal_module_fence_await_begin(\n+ iree_vm_stack_t* stack, iree_host_size_t fence_count,\n+ iree_hal_fence_t** fences, iree_timeout_t timeout, iree_zone_id_t zone_id,\n+ iree_status_t* out_wait_status) {\n+ \/\/ To avoid additional allocations when waiting on multiple fences we enter\n+ \/\/ the wait frame with the maximum required wait source capacity and perform\n+ \/\/ a simple deduplication when building the list. Ideally this helps get us on\n+ \/\/ fast paths of single semaphore waits. The common case is a single fence in\n+ \/\/ which case this is all exceptional.\n+ iree_host_size_t total_timepoint_capacity = 0;\n+ for (iree_host_size_t i = 0; i < fence_count; ++i) {\n+ total_timepoint_capacity += iree_hal_fence_timepoint_count(fences[i]);\n+ }\n+\n+ \/\/ Fast-path for no semaphores (empty\/immediate fences).\n+ if (total_timepoint_capacity == 0) {\n+ *out_wait_status = iree_ok_status();\n+ IREE_TRACE_ZONE_END(zone_id);\n+ return iree_ok_status();\n+ }\n+\n+ \/\/ Reserve storage as if all timepoints from all fences were unique.\n+ iree_vm_wait_frame_t* wait_frame = NULL;\n+ IREE_RETURN_IF_ERROR(iree_vm_stack_wait_enter(stack, IREE_VM_WAIT_ALL,\n+ total_timepoint_capacity,\n+ timeout, zone_id, &wait_frame));\n+\n+ \/\/ Insert the first set of timepoints - they're already deduplicated.\n+ iree_host_size_t unique_timepoint_count = 0;\n+ if (fence_count >= 1) {\n+ iree_hal_semaphore_list_t semaphore_list =\n+ iree_hal_fence_semaphore_list(fences[0]);\n+ for (iree_host_size_t i = 0; i < semaphore_list.count; ++i) {\n+ iree_wait_source_t wait_source = iree_hal_semaphore_await(\n+ semaphore_list.semaphores[i], semaphore_list.payload_values[i]);\n+ wait_frame->wait_sources[unique_timepoint_count++] = wait_source;\n+ }\n+ }\n+\n+ \/\/ TODO(benvanik): simplify this; it may not be worth the complexity. We'll\n+ \/\/ need more real workloads using multi-fence joins to see how useful this is.\n+\n+ \/\/ Insert remaining fence timepoints by performing merging as we go.\n+ for (iree_host_size_t i = 1; i < fence_count; ++i) {\n+ iree_hal_semaphore_list_t semaphore_list =\n+ iree_hal_fence_semaphore_list(fences[i]);\n+ for (iree_host_size_t j = 0; j < semaphore_list.count; ++j) {\n+ \/\/ O(n^2) set insertion - relying on this being rare and the total count\n+ \/\/ being low. The savings of a small linear scan here relative to an\n+ \/\/ additional syscall are always worth it but we may want to go further.\n+ iree_wait_source_t wait_source = iree_hal_semaphore_await(\n+ semaphore_list.semaphores[j], semaphore_list.payload_values[j]);\n+ bool found_existing = false;\n+ for (iree_host_size_t k = 0; k < unique_timepoint_count; ++k) {\n+ if (wait_frame->wait_sources[k].ctl == wait_source.ctl &&\n+ wait_frame->wait_sources[k].self == wait_source.self) {\n+ \/\/ Found existing; use max of both.\n+ wait_frame->wait_sources[k].data =\n+ iree_max(wait_frame->wait_sources[k].data, wait_source.data);\n+ found_existing = true;\n+ break;\n+ }\n+ }\n+ if (!found_existing) {\n+ wait_frame->wait_sources[unique_timepoint_count++] = wait_source;\n+ }\n+ }\n+ }\n+\n+ \/\/ Update frame with the actual number of timepoints in the wait operation.\n+ wait_frame->count = unique_timepoint_count;\n+\n+ *out_wait_status = iree_status_from_code(IREE_STATUS_DEFERRED);\n+ return iree_ok_status();\n+}\n+\n+\/\/ PC for iree_hal_module_fence_await.\n+enum iree_hal_module_fence_await_pc_e {\n+ \/\/ Initial entry point that will try to either wait inline or yield to the\n+ \/\/ scheduler with a wait-all operation.\n+ IREE_HAL_MODULE_FENCE_AWAIT_PC_BEGIN = 0,\n+ \/\/ Resume entry point after the scheduler wait has resolved (successfully or\n+ \/\/ otherwise).\n+ IREE_HAL_MODULE_FENCE_AWAIT_PC_RESUME,\n+};\n+\n IREE_VM_ABI_EXPORT(iree_hal_module_fence_await, \/\/\n iree_hal_module_state_t, \/\/\n iCrD, i) {\n- uint32_t timeout_millis = (uint32_t)args->i0;\n- iree_host_size_t fence_count = 0;\n- iree_hal_fence_t** fences = NULL;\n- IREE_VM_ABI_VLA_STACK_DEREF(args, a1_count, a1, iree_hal_fence, 32,\n- &fence_count, &fences);\n-\n- \/\/ Capture absolute timeout so that regardless of how long it takes us to wait\n- \/\/ the user-perceived wait time remains the same.\n- iree_timeout_t timeout = iree_make_timeout_ms(timeout_millis);\n- iree_convert_timeout_to_absolute(&timeout);\n-\n- \/\/ Wait on each fence in-turn.\n- \/\/ TODO(benvanik): use a stack wait frame and expand all fences into their\n- \/\/ individual timepoint wait sources. This will allow the loop to perform a\n- \/\/ multi-wait without needing to materialize intermediate wait primitives\n- \/\/ which may not be possible across devices.\n+ \/\/ On entry we either perform the wait or begin a coroutine yield operation.\n+ \/\/ After resuming we check to see if the fence has been reached and propagate\n+ \/\/ the result.\n+ iree_vm_stack_frame_t* current_frame = iree_vm_stack_top(stack);\n+ iree_zone_id_t zone_id = 0;\n+ iree_status_t wait_status = iree_ok_status();\n+ if (current_frame->pc == IREE_HAL_MODULE_FENCE_AWAIT_PC_BEGIN) {\n+ uint32_t timeout_millis = (uint32_t)args->i0;\n+ iree_host_size_t fence_count = 0;\n+ iree_hal_fence_t** fences = NULL;\n+ IREE_VM_ABI_VLA_STACK_DEREF(args, a1_count, a1, iree_hal_fence, 32,\n+ &fence_count, &fences);\n+\n+ IREE_TRACE_ZONE_BEGIN(z0);\n+ zone_id = z0;\n+\n+ \/\/ Capture absolute timeout so that regardless of how long it takes us to\n+ \/\/ wait the user-perceived wait time remains the same.\n+ iree_timeout_t timeout = timeout_millis == UINT32_MAX\n+ ? iree_infinite_timeout()\n+ : iree_make_timeout_ms(timeout_millis);\n+ iree_convert_timeout_to_absolute(&timeout);\n+\n+ \/\/ Remove any fences that have been reached and check for failure.\n+ IREE_RETURN_AND_END_ZONE_IF_ERROR(\n+ zone_id, iree_hal_module_fence_elide_reached(&fence_count, fences));\n+\n+ \/\/ If all fences have been reached we can exit early as if we waited\n+ \/\/ successfully.\n+ if (fence_count > 0) {\n+ if (iree_all_bits_set(state->flags, IREE_HAL_MODULE_FLAG_SYNCHRONOUS)) {\n+ \/\/ Block the native thread until the fence is reached or the deadline is\n+ \/\/ exceeded.\n+ for (iree_host_size_t i = 0; i < fence_count; ++i) {\n+ wait_status = iree_hal_fence_wait(fences[i], timeout);\n+ if (!iree_status_is_ok(wait_status)) break;\n+ }\n+ } else {\n+ IREE_RETURN_AND_END_ZONE_IF_ERROR(\n+ zone_id,\n+ iree_hal_module_fence_await_begin(stack, fence_count, fences,\n+ timeout, zone_id, &wait_status));\n+ current_frame->pc = IREE_HAL_MODULE_FENCE_AWAIT_PC_RESUME;\n+ if (iree_status_is_deferred(wait_status)) {\n+ zone_id = 0; \/\/ ownership transferred to wait frame\n+ }\n+ }\n+ }\n+ } else {\n+ \/\/ Resume by leaving the wait frame and storing the result.\n+ iree_vm_wait_result_t wait_result;\n+ IREE_RETURN_IF_ERROR(iree_vm_stack_wait_leave(stack, &wait_result));\n+ wait_status = wait_result.status;\n+ IREE_TRACE(zone_id = wait_result.trace_zone);\n+ }\n+\n iree_status_t status = iree_ok_status();\n- for (iree_host_size_t i = 0; i < fence_count; ++i) {\n- status = iree_hal_fence_wait(fences[i], timeout);\n- if (!iree_status_is_ok(status)) break;\n- }\n-\n- if (iree_status_is_ok(status)) {\n+ if (iree_status_is_ok(wait_status)) {\n \/\/ Successful wait.\n rets->i0 = 0;\n- return iree_ok_status();\n- } else if (iree_status_is_deadline_exceeded(status)) {\n+ } else if (iree_status_is_deferred(wait_status)) {\n+ \/\/ Yielding; resume required.\n+ \/\/ NOTE: zone not ended as it's reserved on the stack.\n+ status = wait_status;\n+ } else if (iree_status_is_deadline_exceeded(wait_status)) {\n \/\/ Propagate deadline exceeded back to the VM.\n- rets->i0 = (int32_t)iree_status_consume_code(status);\n- iree_status_ignore(status);\n- return iree_ok_status();\n- }\n-\n- \/\/ Fail the invocation.\n+ rets->i0 = (int32_t)iree_status_consume_code(wait_status);\n+ iree_status_ignore(wait_status);\n+ } else {\n+ \/\/ Fail the invocation.\n+ status = wait_status;\n+ }\n+\n+ IREE_TRACE({\n+ if (zone_id) IREE_TRACE_ZONE_END(zone_id);\n+ });\n return status;\n }\n \n@@ -1425,7 +1584,6 @@\n iree_hal_device_t* device = NULL;\n IREE_RETURN_IF_ERROR(iree_hal_device_check_deref(args->r0, &device));\n uint64_t initial_value = (uint64_t)args->i1;\n-\n iree_hal_semaphore_t* semaphore = NULL;\n IREE_RETURN_IF_ERROR(\n iree_hal_semaphore_create(device, initial_value, &semaphore));\n@@ -1438,11 +1596,12 @@\n r, iI) {\n iree_hal_semaphore_t* semaphore = NULL;\n IREE_RETURN_IF_ERROR(iree_hal_semaphore_check_deref(args->r0, &semaphore));\n-\n- uint64_t value = 0;\n- iree_status_t query_status = iree_hal_semaphore_query(semaphore, &value);\n+ uint64_t current_value = 0;\n+ iree_status_t query_status =\n+ iree_hal_semaphore_query(semaphore, ¤t_value);\n rets->i0 = iree_status_consume_code(query_status);\n- rets->i1 = value;\n+ rets->i1 = current_value;\n+ iree_status_ignore(query_status);\n return iree_ok_status();\n }\n \n@@ -1452,7 +1611,6 @@\n iree_hal_semaphore_t* semaphore = NULL;\n IREE_RETURN_IF_ERROR(iree_hal_semaphore_check_deref(args->r0, &semaphore));\n uint64_t new_value = (uint64_t)args->i1;\n-\n return iree_hal_semaphore_signal(semaphore, new_value);\n }\n \n@@ -1463,34 +1621,102 @@\n IREE_RETURN_IF_ERROR(iree_hal_semaphore_check_deref(args->r0, &semaphore));\n iree_status_code_t status_code =\n (iree_status_code_t)(args->i1 & IREE_STATUS_CODE_MASK);\n-\n iree_hal_semaphore_fail(semaphore, iree_make_status(status_code));\n return iree_ok_status();\n }\n+\n+\/\/ PC for iree_hal_module_semaphore_await.\n+enum iree_hal_module_semaphore_await_pc_e {\n+ \/\/ Initial entry point that will try to either wait inline or yield to the\n+ \/\/ scheduler with a wait-all operation.\n+ IREE_HAL_MODULE_SEMAPHORE_AWAIT_PC_BEGIN = 0,\n+ \/\/ Resume entry point after the scheduler wait has resolved (successfully or\n+ \/\/ otherwise).\n+ IREE_HAL_MODULE_SEMAPHORE_AWAIT_PC_RESUME,\n+};\n \n IREE_VM_ABI_EXPORT(iree_hal_module_semaphore_await, \/\/\n iree_hal_module_state_t, \/\/\n rI, i) {\n- iree_hal_semaphore_t* semaphore = NULL;\n- IREE_RETURN_IF_ERROR(iree_hal_semaphore_check_deref(args->r0, &semaphore));\n- uint64_t new_value = (uint64_t)args->i1;\n-\n- \/\/ TODO(benvanik): coroutine magic.\n- iree_status_t status =\n- iree_hal_semaphore_wait(semaphore, new_value, iree_infinite_timeout());\n-\n- if (iree_status_is_ok(status)) {\n+ \/\/ On entry we either perform the wait or begin a coroutine yield operation.\n+ \/\/ After resuming we check to see if the timepoint has been reached and\n+ \/\/ propagate the result.\n+ iree_vm_stack_frame_t* current_frame = iree_vm_stack_top(stack);\n+ iree_zone_id_t zone_id = 0;\n+ iree_status_t wait_status = iree_ok_status();\n+ if (current_frame->pc == IREE_HAL_MODULE_SEMAPHORE_AWAIT_PC_BEGIN) {\n+ iree_hal_semaphore_t* semaphore = NULL;\n+ IREE_RETURN_IF_ERROR(iree_hal_semaphore_check_deref(args->r0, &semaphore));\n+ uint64_t new_value = (uint64_t)args->i1;\n+\n+ IREE_TRACE_ZONE_BEGIN(z0);\n+ zone_id = z0;\n+\n+ \/\/ TODO(benvanik): take timeout as an argument.\n+ \/\/ Capture absolute timeout so that regardless of how long it takes us to\n+ \/\/ wait the user-perceived wait time remains the same.\n+ iree_timeout_t timeout = iree_infinite_timeout();\n+ iree_convert_timeout_to_absolute(&timeout);\n+\n+ if (iree_all_bits_set(state->flags, IREE_HAL_MODULE_FLAG_SYNCHRONOUS)) {\n+ \/\/ Block the native thread until the fence is reached or the deadline is\n+ \/\/ exceeded.\n+ wait_status = iree_hal_semaphore_wait(semaphore, new_value, timeout);\n+ } else {\n+ \/\/ Quick check inline before yielding to the scheduler. This avoids a\n+ \/\/ round-trip through the scheduling stack for cases where we complete\n+ \/\/ synchronously.\n+ \/\/\n+ \/\/ The query may fail to indicate that the semaphore is in a failure\n+ \/\/ state and we propagate the failure status to the waiter.\n+ \/\/\n+ \/\/ It's possible to race here if we get back an older value and then\n+ \/\/ before we wait the target is reached but that's ok: the wait will\n+ \/\/ always be correctly ordered.\n+ uint64_t current_value = 0ull;\n+ wait_status = iree_hal_semaphore_query(semaphore, ¤t_value);\n+ if (iree_status_is_ok(wait_status) && current_value < new_value) {\n+ \/\/ Enter a wait frame and yield execution back to the scheduler.\n+ \/\/ When the wait handle resolves we'll resume at the RESUME PC.\n+ iree_vm_wait_frame_t* wait_frame = NULL;\n+ IREE_RETURN_AND_END_ZONE_IF_ERROR(\n+ zone_id, iree_vm_stack_wait_enter(stack, IREE_VM_WAIT_ALL, 1,\n+ timeout, zone_id, &wait_frame));\n+ wait_frame->wait_sources[0] =\n+ iree_hal_semaphore_await(semaphore, new_value);\n+ current_frame->pc = IREE_HAL_MODULE_SEMAPHORE_AWAIT_PC_RESUME;\n+ wait_status = iree_status_from_code(IREE_STATUS_DEFERRED);\n+ zone_id = 0; \/\/ ownership transferred to wait frame\n+ }\n+ }\n+ } else {\n+ \/\/ Resume by leaving the wait frame and storing the result.\n+ iree_vm_wait_result_t wait_result;\n+ IREE_RETURN_IF_ERROR(iree_vm_stack_wait_leave(stack, &wait_result));\n+ wait_status = wait_result.status;\n+ IREE_TRACE(zone_id = wait_result.trace_zone);\n+ }\n+\n+ iree_status_t status = iree_ok_status();\n+ if (iree_status_is_ok(wait_status)) {\n \/\/ Successful wait.\n rets->i0 = 0;\n- return iree_ok_status();\n- } else if (iree_status_is_deadline_exceeded(status)) {\n+ } else if (iree_status_is_deferred(wait_status)) {\n+ \/\/ Yielding; resume required.\n+ \/\/ NOTE: zone not ended as it's reserved on the stack.\n+ status = wait_status;\n+ } else if (iree_status_is_deadline_exceeded(wait_status)) {\n \/\/ Propagate deadline exceeded back to the VM.\n- rets->i0 = (int32_t)iree_status_consume_code(status);\n- iree_status_ignore(status);\n- return iree_ok_status();\n- }\n-\n- \/\/ Fail the invocation.\n+ rets->i0 = (int32_t)iree_status_consume_code(wait_status);\n+ iree_status_ignore(wait_status);\n+ } else {\n+ \/\/ Fail the invocation.\n+ status = wait_status;\n+ }\n+\n+ IREE_TRACE({\n+ if (zone_id) IREE_TRACE_ZONE_END(zone_id);\n+ });\n return status;\n }\n \n"} {"commit":"e27b347e2c031f0a4dd8702c1b3da7ca887a4f67","subject":"TTMulticoreSource: avoiding crashes related to the source objects getting shifted around by their owning inlet.","message":"TTMulticoreSource: avoiding crashes related to the source objects getting shifted around by their owning inlet.\n","repos":"eriser\/JamomaCore,eriser\/JamomaCore,eriser\/JamomaCore,eriser\/JamomaCore,jamoma\/JamomaCore,eriser\/JamomaCore,jamoma\/JamomaCore,jamoma\/JamomaCore,jamoma\/JamomaCore,eriser\/JamomaCore,jamoma\/JamomaCore,eriser\/JamomaCore,jamoma\/JamomaCore,eriser\/JamomaCore,jamoma\/JamomaCore","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- library\/includes\/TTMulticoreSource.h\n+++ library\/includes\/TTMulticoreSource.h\n@@ -68,12 +68,25 @@\n \t\/\/ This one is called, for example, on the Mac when dropping a source and the vector has to be re-arranged.\t\n \tTTMulticoreSource& operator=(const TTMulticoreSource& original)\n \t{\n-\t\tmSourceObject = original.mSourceObject;\n-\t\tmOutletNumber = original.mOutletNumber;\n-\t\tmCallbackHandler = original.mCallbackHandler;\n+\t\tmSourceObject = NULL;\n+\t\tmOutletNumber = 0;\n+\t\tmCallbackHandler = NULL;\n+\t\tmOwner = NULL;\n+\t\n+\t\t\/\/ TODO: We're probably leaking memory here, because mCallbackHandler is potentially never freed...\n+\t\t\/\/ However, if we don't NULL the mCallbackHandler \n+\t\t\/\/ then we end up with crashes when we do something like close a Max patcher after editing connections while running. \n+\t\t\n+\t\tcreate();\n \t\tmOwner = original.mOwner;\n-\t\t\n-\t\t\/\/ TODO: evaluate if this is doing the correct thing -- we can copy the owner ptr for sure, but the callback might now point to a bogus object\n+\n+\t\t\/\/ TODO: evaluate if this is doing the correct thing:\n+\t\t\/\/ - we can copy the owner ptr for sure\n+\t\t\/\/ - we definitely can not copy the mCallbackHandler pointer\n+\t\t\/\/ - not certain about the mSourceObject\n+\n+\t\tif (original.mSourceObject)\n+\t\t\tconnect(original.mSourceObject, original.mOutletNumber);\n \t\t\n \t\treturn *this;\n \t}\n"} {"commit":"e0b02599a53629521e60f2dd751ab6e922bc3df1","subject":"Refactor filter_deblock_edge_ functions.","message":"Refactor filter_deblock_edge_ functions.\n\nReplaces repetitive calls to kvz_filter_deblock_luma and\nkvz_filter_deblock_chroma with loops in functions\nfilter_deblock_edge_luma and filter_deblock_edge_chroma.\n","repos":"ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/filter.c\n+++ src\/filter.c\n@@ -397,10 +397,9 @@\n useStrongFiltering(offset, 2*d3, (src+step*(block_idx*4+3)));\n \n \/\/ Filter four rows\/columns\n- kvz_filter_deblock_luma(encoder, src + step * (4*block_idx + 0), offset, tc, sw, 0, 0, thr_cut, filter_P, filter_Q);\n- kvz_filter_deblock_luma(encoder, src + step * (4*block_idx + 1), offset, tc, sw, 0, 0, thr_cut, filter_P, filter_Q);\n- kvz_filter_deblock_luma(encoder, src + step * (4*block_idx + 2), offset, tc, sw, 0, 0, thr_cut, filter_P, filter_Q);\n- kvz_filter_deblock_luma(encoder, src + step * (4*block_idx + 3), offset, tc, sw, 0, 0, thr_cut, filter_P, filter_Q);\n+ for (int i = 0; i < 4; i++) {\n+ kvz_filter_deblock_luma(encoder, src + step * (4*block_idx + i), offset, tc, sw, 0, 0, thr_cut, filter_P, filter_Q);\n+ }\n }\n }\n }\n@@ -445,8 +444,10 @@\n int32_t stride = frame->rec->stride >> 1;\n int32_t tc_offset_div2 = encoder->tc_offset_div2;\n \/\/ TODO: support 10+bits\n- kvz_pixel *src_u = &frame->rec->u[x + y*stride];\n- kvz_pixel *src_v = &frame->rec->v[x + y*stride];\n+ kvz_pixel *src[] = {\n+ &frame->rec->u[x + y*stride],\n+ &frame->rec->v[x + y*stride],\n+ };\n const cu_info_t *cu_p = NULL;\n int16_t x_cu = x >> (MIN_SIZE-1);\n int16_t y_cu = y >> (MIN_SIZE-1);\n@@ -468,16 +469,11 @@\n \n \/\/ Only filter when strenght == 2 (one of the blocks is intra coded)\n if (cu_q->type == CU_INTRA || cu_p->type == CU_INTRA) {\n- \/\/ Chroma U\n- kvz_filter_deblock_chroma(encoder, src_u + step * (4*blk_idx + 0), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_u + step * (4*blk_idx + 1), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_u + step * (4*blk_idx + 2), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_u + step * (4*blk_idx + 3), offset, Tc, 0, 0);\n- \/\/ Chroma V\n- kvz_filter_deblock_chroma(encoder, src_v + step * (4*blk_idx + 0), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_v + step * (4*blk_idx + 1), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_v + step * (4*blk_idx + 2), offset, Tc, 0, 0);\n- kvz_filter_deblock_chroma(encoder, src_v + step * (4*blk_idx + 3), offset, Tc, 0, 0);\n+ for (int component = 0; component < 2; component++) {\n+ for (int i = 0; i < 4; i++) {\n+ kvz_filter_deblock_chroma(encoder, src[component] + step * (4*blk_idx + i), offset, Tc, 0, 0);\n+ }\n+ }\n }\n }\n }\n"} {"commit":"6d8955262ab4cbfcb3ddaca4f978d27d9c088a75","subject":"ASoC: i2sc.c: use devm_ functions","message":"ASoC: i2sc.c: use devm_ functions\n\nThe various devm_ functions allocate memory that is released when a driver\ndetaches. This patch uses devm_kzalloc, devm_request_mem_region and\ndevm_ioremap for data that is allocated in the probe function of a platform\ndevice and is only freed in the remove function.\n\nSigned-off-by: Julia Lawall <018ee4f95fc49739477deedb13d2cd210889e607@lip6.fr>\nSigned-off-by: Mark Brown <b51b9a92386687a9ac927cebfa0f978adeb8cea5@opensource.wolfsonmicro.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sound\/soc\/au1x\/i2sc.c\n+++ sound\/soc\/au1x\/i2sc.c\n@@ -227,68 +227,49 @@\n \n static int __devinit au1xi2s_drvprobe(struct platform_device *pdev)\n {\n-\tint ret;\n \tstruct resource *iores, *dmares;\n \tstruct au1xpsc_audio_data *ctx;\n \n-\tctx = kzalloc(sizeof(*ctx), GFP_KERNEL);\n+\tctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);\n \tif (!ctx)\n \t\treturn -ENOMEM;\n \n \tiores = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n-\tif (!iores) {\n-\t\tret = -ENODEV;\n-\t\tgoto out0;\n-\t}\n-\n-\tret = -EBUSY;\n-\tif (!request_mem_region(iores->start, resource_size(iores),\n-\t\t\t\tpdev->name))\n-\t\tgoto out0;\n-\n-\tctx->mmio = ioremap_nocache(iores->start, resource_size(iores));\n+\tif (!iores)\n+\t\treturn -ENODEV;\n+\n+\tif (!devm_request_mem_region(&pdev->dev, iores->start,\n+\t\t\t\t resource_size(iores),\n+\t\t\t\t pdev->name))\n+\t\treturn -EBUSY;\n+\n+\tctx->mmio = devm_ioremap_nocache(&pdev->dev, iores->start,\n+\t\t\t\t\t resource_size(iores));\n \tif (!ctx->mmio)\n-\t\tgoto out1;\n+\t\treturn -EBUSY;\n \n \tdmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);\n \tif (!dmares)\n-\t\tgoto out2;\n+\t\treturn -EBUSY;\n \tctx->dmaids[SNDRV_PCM_STREAM_PLAYBACK] = dmares->start;\n \n \tdmares = platform_get_resource(pdev, IORESOURCE_DMA, 1);\n \tif (!dmares)\n-\t\tgoto out2;\n+\t\treturn -EBUSY;\n \tctx->dmaids[SNDRV_PCM_STREAM_CAPTURE] = dmares->start;\n \n \tplatform_set_drvdata(pdev, ctx);\n \n-\tret = snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);\n-\tif (ret)\n-\t\tgoto out2;\n-\n-\treturn 0;\n-\n-out2:\n-\tiounmap(ctx->mmio);\n-out1:\n-\trelease_mem_region(iores->start, resource_size(iores));\n-out0:\n-\tkfree(ctx);\n-\treturn ret;\n+\treturn snd_soc_register_dai(&pdev->dev, &au1xi2s_dai_driver);\n }\n \n static int __devexit au1xi2s_drvremove(struct platform_device *pdev)\n {\n \tstruct au1xpsc_audio_data *ctx = platform_get_drvdata(pdev);\n-\tstruct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n \n \tsnd_soc_unregister_dai(&pdev->dev);\n \n \tWR(ctx, I2S_ENABLE, EN_D);\t\/* clock off, disable *\/\n-\n-\tiounmap(ctx->mmio);\n-\trelease_mem_region(r->start, resource_size(r));\n-\tkfree(ctx);\n \n \treturn 0;\n }\n"} {"commit":"7f6f1a1f6ad376b2e42d2152fad4968165590561","subject":"* Corrected KTT API version","message":"* Corrected KTT API version\n","repos":"Fillo7\/KTT,Fillo7\/KTT","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/ktt_platform.h\n+++ source\/ktt_platform.h\n@@ -22,7 +22,7 @@\n \n \/** Minor version of KTT framework. Second number in KTT version description.\n *\/\n-#define KTT_VERSION_MINOR 2\n+#define KTT_VERSION_MINOR 3\n \n \/** Patch version of KTT framework. Third number in KTT version description.\n *\/\n"} {"commit":"2e43685dc8a8a886fc9df9b3663cf199404f7637","subject":"Bug 699271: Fix eternal loop when skipping space before EOF.","message":"Bug 699271: Fix eternal loop when skipping space before EOF.\n\nThanks to Michael J Gruber for providing this oneliner.\n","repos":"fluks\/mupdf-x11-bookmarks,muennich\/mupdf,fluks\/mupdf-x11-bookmarks,sebras\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,ArtifexSoftware\/mupdf,TamirEvan\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,TamirEvan\/mupdf,muennich\/mupdf,sebras\/mupdf,ccxvii\/mupdf,TamirEvan\/mupdf,ccxvii\/mupdf,sebras\/mupdf,sebras\/mupdf,muennich\/mupdf,ccxvii\/mupdf,sebras\/mupdf,sebras\/mupdf,fluks\/mupdf-x11-bookmarks,TamirEvan\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks,muennich\/mupdf,ArtifexSoftware\/mupdf,ccxvii\/mupdf,ArtifexSoftware\/mupdf,muennich\/mupdf,ArtifexSoftware\/mupdf,fluks\/mupdf-x11-bookmarks","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/pdf\/pdf-xref.c\n+++ source\/pdf\/pdf-xref.c\n@@ -649,7 +649,7 @@\n \tdo\n \t{\n \t\tint c = fz_peek_byte(ctx, stm);\n-\t\tif (c > 32 && c != EOF)\n+\t\tif (c == EOF || c > 32)\n \t\t\treturn;\n \t\t(void)fz_read_byte(ctx, stm);\n \t}\n"} {"commit":"c1457159d8f21dbd2893a604069551974e98b9f3","subject":"add some usage info to muinfo","message":"add some usage info to muinfo\n","repos":"PuzzleFlow\/mupdf,PuzzleFlow\/mupdf,PuzzleFlow\/mupdf,PuzzleFlow\/mupdf,PuzzleFlow\/mupdf,PuzzleFlow\/mupdf,PuzzleFlow\/mupdf","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/tools\/muinfo.c\n+++ source\/tools\/muinfo.c\n@@ -174,6 +174,12 @@\n \tchar *filename = argc >= 2 ? argv[1] : \"\";\n \tpdf_document *doc;\n \n+\tif (argc < 2)\n+\t{\n+\t\tfprintf(stderr, \"No filename given. Usage: muinfo \/path\/to\/file.pdf\\n\");\n+\t\treturn 1;\n+\t}\n+\n \t\/\/ Create a context to hold the exception stack and various caches.\n \n \tfz_context *ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED);\n@@ -229,4 +235,4 @@\n \tfz_free_argv(argc, argv);\n \treturn ret;\n }\n-#endif+#endif\n"} {"commit":"5102c66f07900375a0054b7105f662507b2fe46f","subject":"Type : correction de bug \u00e0 la bina (map_ext_code pas rempli)","message":"Type : correction de bug \u00e0 la bina (map_ext_code pas rempli)\n","repos":"frodrigo\/navitia,prhod\/navitia,patochectp\/navitia,CanalTP\/navitia,Tisseo\/navitia,djludo\/navitia,pbougue\/navitia,TeXitoi\/navitia,Tisseo\/navitia,thiphariel\/navitia,datanel\/navitia,is06\/navitia,kadhikari\/navitia,patochectp\/navitia,patochectp\/navitia,kadhikari\/navitia,fueghan\/navitia,TeXitoi\/navitia,lrocheWB\/navitia,fueghan\/navitia,prhod\/navitia,kadhikari\/navitia,ballouche\/navitia,pbougue\/navitia,kinnou02\/navitia,datanel\/navitia,datanel\/navitia,kinnou02\/navitia,ballouche\/navitia,prhod\/navitia,xlqian\/navitia,frodrigo\/navitia,stifoon\/navitia,djludo\/navitia,kadhikari\/navitia,stifoon\/navitia,CanalTP\/navitia,xlqian\/navitia,patochectp\/navitia,francois-vincent\/navitia,stifoon\/navitia,fueghan\/navitia,pbougue\/navitia,Tisseo\/navitia,VincentCATILLON\/navitia,ballouche\/navitia,is06\/navitia,stifoon\/navitia,xlqian\/navitia,VincentCATILLON\/navitia,kinnou02\/navitia,frodrigo\/navitia,antoine-de\/navitia,Tisseo\/navitia,djludo\/navitia,TeXitoi\/navitia,francois-vincent\/navitia,lrocheWB\/navitia,lrocheWB\/navitia,francois-vincent\/navitia,djludo\/navitia,CanalTP\/navitia,thiphariel\/navitia,is06\/navitia,thiphariel\/navitia,xlqian\/navitia,is06\/navitia,kinnou02\/navitia,CanalTP\/navitia,xlqian\/navitia,prhod\/navitia,VincentCATILLON\/navitia,lrocheWB\/navitia,thiphariel\/navitia,francois-vincent\/navitia,pbougue\/navitia,datanel\/navitia,frodrigo\/navitia,antoine-de\/navitia,TeXitoi\/navitia,Tisseo\/navitia,antoine-de\/navitia,fueghan\/navitia,CanalTP\/navitia,antoine-de\/navitia,ballouche\/navitia,VincentCATILLON\/navitia","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/type\/pt_data.h\n+++ source\/type\/pt_data.h\n@@ -106,7 +106,7 @@\n \n \/\/\/ Prefixe le type \u00e0 l'external_code\n template<typename T>\n- void normalize_extcode(std::map<std::string, idx_t> map){\n+ void normalize_extcode(std::map<std::string, idx_t> & map){\n std::string prefix = static_data::get()->captionByType(T::type);\n for(auto & element : this->get_data<T>()){\n element.external_code = prefix + \":\" + element.external_code;\n"} {"commit":"3d2636fedab818a204ad693ead579f3f0da99183","subject":"Data: add get_or_create_validity_pattern","message":"Data: add get_or_create_validity_pattern\n","repos":"patochectp\/navitia,djludo\/navitia,kadhikari\/navitia,kadhikari\/navitia,djludo\/navitia,lrocheWB\/navitia,pbougue\/navitia,frodrigo\/navitia,kadhikari\/navitia,xlqian\/navitia,prhod\/navitia,stifoon\/navitia,CanalTP\/navitia,ballouche\/navitia,frodrigo\/navitia,xlqian\/navitia,is06\/navitia,is06\/navitia,VincentCATILLON\/navitia,frodrigo\/navitia,is06\/navitia,djludo\/navitia,patochectp\/navitia,frodrigo\/navitia,xlqian\/navitia,kinnou02\/navitia,djludo\/navitia,Tisseo\/navitia,datanel\/navitia,lrocheWB\/navitia,CanalTP\/navitia,kadhikari\/navitia,fueghan\/navitia,kinnou02\/navitia,CanalTP\/navitia,francois-vincent\/navitia,thiphariel\/navitia,kinnou02\/navitia,Tisseo\/navitia,kinnou02\/navitia,patochectp\/navitia,TeXitoi\/navitia,pbougue\/navitia,prhod\/navitia,patochectp\/navitia,TeXitoi\/navitia,Tisseo\/navitia,prhod\/navitia,TeXitoi\/navitia,datanel\/navitia,xlqian\/navitia,VincentCATILLON\/navitia,antoine-de\/navitia,is06\/navitia,ballouche\/navitia,datanel\/navitia,lrocheWB\/navitia,thiphariel\/navitia,thiphariel\/navitia,francois-vincent\/navitia,fueghan\/navitia,fueghan\/navitia,TeXitoi\/navitia,Tisseo\/navitia,stifoon\/navitia,antoine-de\/navitia,ballouche\/navitia,pbougue\/navitia,lrocheWB\/navitia,VincentCATILLON\/navitia,fueghan\/navitia,stifoon\/navitia,CanalTP\/navitia,Tisseo\/navitia,francois-vincent\/navitia,pbougue\/navitia,antoine-de\/navitia,francois-vincent\/navitia,prhod\/navitia,xlqian\/navitia,ballouche\/navitia,CanalTP\/navitia,antoine-de\/navitia,VincentCATILLON\/navitia,datanel\/navitia,thiphariel\/navitia,stifoon\/navitia","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/type\/pt_data.h\n+++ source\/type\/pt_data.h\n@@ -144,6 +144,21 @@\n return nb;\n }\n \n+ type::ValidityPattern* get_or_create_validity_pattern(const std::bitset<366>& days) {\n+ for (auto vp : validity_patterns) {\n+ if (vp->days == days) {\n+ return vp;\n+ }\n+ }\n+ auto vp = new nt::ValidityPattern();\n+ vp->idx = validity_patterns.size();\n+ vp->uri = make_adapted_uri(vp->uri);\n+ validity_patterns.push_back(vp);\n+ validity_patterns_map[vp->uri] = vp;\n+ vp->days = days;\n+ return vp;\n+ }\n+\n \/** Retrouve un \u00e9l\u00e9ment par un attribut arbitraire de type chaine de caract\u00e8res\n *\n * Le template a \u00e9t\u00e9 surcharg\u00e9 pour g\u00e9rer des const char* (string pass\u00e9e comme literal)\n"} {"commit":"3a93a9f16d092298e4ecf82f37332326e1b3fba7","subject":"file provider adding delay during read\/write attempts","message":"file provider adding delay during read\/write attempts\n","repos":"devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c,devnexen\/deviceatlas-cloud-c","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- file_cache_provider.c\n+++ file_cache_provider.c\n@@ -75,7 +75,7 @@\n pthread_mutex_t mtx;\n mode_t m;\n struct stat s;\n- size_t valuelen;\n+ size_t valuelen, i = 0;\n int cachefd = -1;\n struct file_cache_cfg *fcfg = cfg->cache_obj;\n if (pthread_mutex_init(&mtx, NULL) != 0) {\n@@ -86,7 +86,12 @@\n pthread_mutex_lock(&mtx);\n file_cache_setumask(&m);\n file_cache_mkdir(fcfg->dir, fcfg->dirlen, key, m);\n- cache = fopen(fcfg->dir, \"r\");\n+ while ((cache = fopen(fcfg->dir, \"r\")) == NULL) {\n+ sleep(1);\n+ ++ i;\n+ if (i == 3)\n+ break;\n+ }\n if (cache == NULL) {\n pthread_mutex_unlock(&mtx);\n pthread_mutex_destroy(&mtx);\n@@ -138,6 +143,7 @@\n FILE *cache = NULL;\n struct stat s;\n pthread_mutex_t mtx;\n+ size_t i = 0;\n mode_t m;\n int cachefd = -1;\n struct file_cache_cfg *fcfg = cfg->cache_obj;\n@@ -155,7 +161,12 @@\n pthread_mutex_destroy(&mtx);\n return (0);\n }\n- cache = fopen(fcfg->dir, \"w\");\n+ while ((cache = fopen(fcfg->dir, \"w\")) == NULL) {\n+ sleep(1);\n+ ++ i;\n+ if (i == 3)\n+ break;\n+ }\n if (cache == NULL) {\n pthread_mutex_unlock(&mtx);\n pthread_mutex_destroy(&mtx);\n"} {"commit":"dabbcb4ff0a36c458fdd3505f88afec8b2db27b7","subject":"Report correct remote address for telnet CLI connections","message":"Report correct remote address for telnet CLI connections\n\n\n\ngit-svn-id: 2c9807fa3ff65b17195bd55dc8a6c4261e10127b@4466 d4fa192b-c00b-0410-8231-f00ffab90ce4\n","repos":"varnish\/Varnish-Cache,gquintard\/Varnish-Cache,mrhmouse\/Varnish-Cache,varnish\/Varnish-Cache,varnish\/Varnish-Cache,alarky\/varnish-cache-doc-ja,alarky\/varnish-cache-doc-ja,wikimedia\/operations-debs-varnish,gauthier-delacroix\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,chrismoulton\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,1HLtd\/Varnish-Cache,drwilco\/varnish-cache-old,mrhmouse\/Varnish-Cache,varnish\/Varnish-Cache,franciscovg\/Varnish-Cache,chrismoulton\/Varnish-Cache,franciscovg\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,zhoualbeart\/Varnish-Cache,alarky\/varnish-cache-doc-ja,franciscovg\/Varnish-Cache,ambernetas\/varnish-cache,wikimedia\/operations-debs-varnish,wikimedia\/operations-debs-varnish,feld\/Varnish-Cache,wikimedia\/operations-debs-varnish,wikimedia\/operations-debs-varnish,mrhmouse\/Varnish-Cache,mrhmouse\/Varnish-Cache,ssm\/pkg-varnish,alarky\/varnish-cache-doc-ja,drwilco\/varnish-cache-old,drwilco\/varnish-cache-drwilco,1HLtd\/Varnish-Cache,zhoualbeart\/Varnish-Cache,feld\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,ssm\/pkg-varnish,zhoualbeart\/Varnish-Cache,gquintard\/Varnish-Cache,gquintard\/Varnish-Cache,ambernetas\/varnish-cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,feld\/Varnish-Cache,chrismoulton\/Varnish-Cache,ambernetas\/varnish-cache,gauthier-delacroix\/Varnish-Cache,ssm\/pkg-varnish,gauthier-delacroix\/Varnish-Cache,franciscovg\/Varnish-Cache,drwilco\/varnish-cache-drwilco,ajasty-cavium\/Varnish-Cache,gquintard\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,mrhmouse\/Varnish-Cache,drwilco\/varnish-cache-drwilco,zhoualbeart\/Varnish-Cache,1HLtd\/Varnish-Cache,ssm\/pkg-varnish,feld\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,chrismoulton\/Varnish-Cache,chrismoulton\/Varnish-Cache,1HLtd\/Varnish-Cache,varnish\/Varnish-Cache,ssm\/pkg-varnish,drwilco\/varnish-cache-old,alarky\/varnish-cache-doc-ja,feld\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/varnishd\/mgt_cli.c\n+++ bin\/varnishd\/mgt_cli.c\n@@ -598,7 +598,7 @@\n \t\treturn (0);\n \n \ttn = telnet_new(i);\n-\tvsb = sock_id(\"telnet\", ev->fd);\n+\tvsb = sock_id(\"telnet\", i);\n \tmgt_cli_setup(i, i, 0, vsb_data(vsb), telnet_close, tn);\n \tvsb_delete(vsb);\n \treturn (0);\n"} {"commit":"ed628ad0776db600fab8d5e4bcd6b563f5e808fd","subject":"added more asm macros for floating point subtraction of single\/double\/quad","message":"added more asm macros for floating point subtraction of single\/double\/quad\n\nsvn path=\/trunk\/mono\/; revision=17394\n","repos":"biotrump\/ffts-tec,biotrump\/ffts-tec,linkotec\/mono_arch,biotrump\/ffts-tec,biotrump\/ffts-tec,linkotec\/mono_arch,linkotec\/mono_arch","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sparc\/sparc-codegen.h\n+++ sparc\/sparc-codegen.h\n@@ -391,8 +391,8 @@\n #define sparc_faddq(ins, r1, op, r2, dest) sparc_fop( ins, r1, 67, r2, dest )\n \n #define sparc_fsubs(ins, r1, op, r2, dest) sparc_fop( ins, r1, 69, r2, dest ) \n-#define sparc_fsubd(ins, r1, op, r2, dest) sparc_fop( ins, r1, 69, r2, dest ) \n-#define sparc_fsubq(ins, r1, op, r2, dest) sparc_fop( ins, r1, 69, r2, dest ) \n+#define sparc_fsubd(ins, r1, op, r2, dest) sparc_fop( ins, r1, 70, r2, dest ) \n+#define sparc_fsubq(ins, r1, op, r2, dest) sparc_fop( ins, r1, 71, r2, dest ) \n \n \/* logical *\/\n #define sparc_and(ins,setcc,r1,r2,dest) sparc_encode_format3a((ins),2,0,(r1),(r2),(setcc)|1,(dest))\n"} {"commit":"635064c432b15407a29a78158d31108a4152fbde","subject":"nrf\/modules\/uos\/microbitfs: Fix errno defines.","message":"nrf\/modules\/uos\/microbitfs: Fix errno defines.\n\nProbably broken after the recent Clang fixes to errno.h.\n","repos":"pramasoul\/micropython,bvernoux\/micropython,selste\/micropython,adafruit\/circuitpython,kerneltask\/micropython,selste\/micropython,pfalcon\/micropython,bvernoux\/micropython,pramasoul\/micropython,pozetroninc\/micropython,pozetroninc\/micropython,tobbad\/micropython,adafruit\/circuitpython,MrSurly\/micropython,pozetroninc\/micropython,bvernoux\/micropython,trezor\/micropython,adafruit\/circuitpython,trezor\/micropython,kerneltask\/micropython,henriknelson\/micropython,trezor\/micropython,trezor\/micropython,pozetroninc\/micropython,pfalcon\/micropython,tobbad\/micropython,pfalcon\/micropython,adafruit\/circuitpython,henriknelson\/micropython,bvernoux\/micropython,MrSurly\/micropython,MrSurly\/micropython,trezor\/micropython,selste\/micropython,pramasoul\/micropython,henriknelson\/micropython,tobbad\/micropython,henriknelson\/micropython,pozetroninc\/micropython,MrSurly\/micropython,pfalcon\/micropython,pfalcon\/micropython,kerneltask\/micropython,tobbad\/micropython,MrSurly\/micropython,pramasoul\/micropython,adafruit\/circuitpython,kerneltask\/micropython,tobbad\/micropython,kerneltask\/micropython,selste\/micropython,henriknelson\/micropython,adafruit\/circuitpython,pramasoul\/micropython,bvernoux\/micropython,selste\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ports\/nrf\/modules\/uos\/microbitfs.c\n+++ ports\/nrf\/modules\/uos\/microbitfs.c\n@@ -404,7 +404,7 @@\n if (next_chunk == FILE_NOT_FOUND) {\n clear_file(self->start_chunk);\n self->open = false;\n- return ENOSPC;\n+ return MP_ENOSPC;\n }\n \/\/ Link next chunk to this one\n flash_write_byte((uint32_t)&(file_system_chunks[self->seek_chunk].next_chunk), next_chunk);\n@@ -420,7 +420,7 @@\n file_descriptor_obj *self = (file_descriptor_obj *)obj;\n check_file_open(self);\n if (self->writable || file_system_chunks[self->start_chunk].marker == FREED_CHUNK) {\n- *errcode = EBADF;\n+ *errcode = MP_EBADF;\n return MP_STREAM_ERROR;\n }\n uint32_t bytes_read = 0;\n@@ -450,7 +450,7 @@\n file_descriptor_obj *self = (file_descriptor_obj *)obj;\n check_file_open(self);\n if (!self->writable || file_system_chunks[self->start_chunk].marker == FREED_CHUNK) {\n- *errcode = EBADF;\n+ *errcode = MP_EBADF;\n return MP_STREAM_ERROR;\n }\n uint32_t len = size;\n"} {"commit":"582cf190b71145f91c8dbd78decf22a6ef3e2746","subject":"for sg","message":"for sg\n\nthis is prly wrong and has to have another value. but somehow 32 was missing lol","repos":"mrkite\/minutor,EtlamGit\/minutor,mrkite\/minutor,mrkite\/minutor,EtlamGit\/minutor,mrkite\/minutor,mrkite\/minutor,EtlamGit\/minutor,EtlamGit\/minutor,EtlamGit\/minutor","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- mapview.h\n+++ mapview.h\n@@ -21,6 +21,7 @@\n flgCaveMode = 4,\n flgDepthShading = 8,\n flgShowEntities = 16,\n+ flgSingleLayer = 32,\n flgBiomeColors = 64\n };\n \n"} {"commit":"bf126aee6d54fe1e509846abf3b27aba84c6d7ce","subject":"[GFS2] Patch to fix mmap of stuffed files","message":"[GFS2] Patch to fix mmap of stuffed files\n\nIf a stuffed file is mmaped and a page fault is generated at some offset\nabove the initial page, we need to create a zero page to hang the buffer\nheads off before we can unstuff the file. This is a fix for bz #236087\n\nSigned-off-by: Steven Whitehouse <9801c4ef11586b619a1c43ac9377eea2aee672dd@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/gfs2\/ops_address.c\n+++ fs\/gfs2\/ops_address.c\n@@ -197,7 +197,19 @@\n \tvoid *kaddr;\n \tint error;\n \n-\tBUG_ON(page->index);\n+\t\/*\n+\t * Due to the order of unstuffing files and ->nopage(), we can be\n+\t * asked for a zero page in the case of a stuffed file being extended,\n+\t * so we need to supply one here. It doesn't happen often.\n+\t *\/\n+\tif (unlikely(page->index)) {\n+\t\tkaddr = kmap_atomic(page, KM_USER0);\n+\t\tmemset(kaddr, 0, PAGE_CACHE_SIZE);\n+\t\tkunmap_atomic(kaddr, KM_USER0);\n+\t\tflush_dcache_page(page);\n+\t\tSetPageUptodate(page);\n+\t\treturn 0;\n+\t}\n \n \terror = gfs2_meta_inode_buffer(ip, &dibh);\n \tif (error)\n@@ -208,9 +220,8 @@\n \t ip->i_di.di_size);\n \tmemset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size);\n \tkunmap_atomic(kaddr, KM_USER0);\n-\n+\tflush_dcache_page(page);\n \tbrelse(dibh);\n-\n \tSetPageUptodate(page);\n \n \treturn 0;\n"} {"commit":"0607fd02587a6b4b086dc746d63123c1f284db68","subject":"fat: detect media without partition table correctly","message":"fat: detect media without partition table correctly\n\nI received a complaint that some FAT formated medias (e.g. sd memory cards)\ntrigger a \"unknown partition table\" message even though there is no partition\ntable and they work correctly, while in general (when e.g. formated with\nmkdosfs or even Windows Vista) this message is not shown.\n\nCurrently this seems only to happen when the medias get formatted with Windows\nXP (and possibly Win 2000). Then the boot indicator byte contains garbage\n(part of text message) and so do the other parts checked by msdos_paritition\nwhich then later triggers this message.\n\nReferences: novell bug #364365\n\nMost fat formatted media without partition table contains zeros in the boot\nindication and the other tested bytes and so falls through the checks in\nmsdos_partition, leading it to return with 1 (all is fine).\n\nBut some (e.g. WinXP formatted) fat fomated medias don't use boot_ind and so\nthe check fails and causes a \"unkown partition table\" warning eventhough there\nis none and everything would be fine.\n\nThis additional check directly verifies if there is a fat formatted medium\nwithout a partition table.\n\nSigned-off-by: Frank Seidel <26e1d4128fe77f226263ecef115a6ab8f95c3fb1@suse.de>\nCc: Andreas Dilger <fd4823dd86d134508df78a168e24c446ce7699f3@sun.com>\nAcked-by: OGAWA Hirofumi <1dd685eef08048be95744a1b104ca593a93cc914@mail.parknet.co.jp>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/partitions\/msdos.c\n+++ fs\/partitions\/msdos.c\n@@ -18,7 +18,7 @@\n *\n * Re-organised Feb 1998 Russell King\n *\/\n-\n+#include <linux\/msdos_fs.h>\n \n #include \"check.h\"\n #include \"msdos.h\"\n@@ -419,6 +419,7 @@\n \tSector sect;\n \tunsigned char *data;\n \tstruct partition *p;\n+\tstruct fat_boot_sector *fb;\n \tint slot;\n \n \tdata = read_dev_sector(bdev, 0, §);\n@@ -444,8 +445,21 @@\n \tp = (struct partition *) (data + 0x1be);\n \tfor (slot = 1; slot <= 4; slot++, p++) {\n \t\tif (p->boot_ind != 0 && p->boot_ind != 0x80) {\n-\t\t\tput_dev_sector(sect);\n-\t\t\treturn 0;\n+\t\t\t\/*\n+\t\t\t * Even without a valid boot inidicator value\n+\t\t\t * its still possible this is valid FAT filesystem\n+\t\t\t * without a partition table.\n+\t\t\t *\/\n+\t\t\tfb = (struct fat_boot_sector *) data;\n+\t\t\tif (slot == 1 && fb->reserved && fb->fats\n+\t\t\t\t&& fat_valid_media(fb->media)) {\n+\t\t\t\tprintk(\"\\n\");\n+\t\t\t\tput_dev_sector(sect);\n+\t\t\t\treturn 1;\n+\t\t\t} else {\n+\t\t\t\tput_dev_sector(sect);\n+\t\t\t\treturn 0;\n+\t\t\t}\n \t\t}\n \t}\n \n"} {"commit":"d3efd73cbb1fb5cf133739622fe0bd49653fad2e","subject":"futility\/cmd_update.c: free cfg before leaving context","message":"futility\/cmd_update.c: free cfg before leaving context\n\nFound by Coverity Scan #198897\n\nBUG=none\nBRANCH=none\nTEST=none\n\nChange-Id: I171571afe2492d15256df8388fa4a05bd8b10bf2\nSigned-off-by: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@google.com>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/vboot_reference\/+\/1789711\nTested-by: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@chromium.org>\nCommit-Queue: Patrick Georgi <bc411205f21846a74924ee7b489c75617ec76078@chromium.org>\nReviewed-by: Hung-Te Lin <8a7fce4940baad93a69f5073b383c85deed9d9c4@chromium.org>\n","repos":"coreboot\/vboot,coreboot\/vboot,coreboot\/vboot,coreboot\/vboot,coreboot\/vboot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- futility\/cmd_update.c\n+++ futility\/cmd_update.c\n@@ -174,6 +174,7 @@\n \t\t\tbreak;\n \t\tcase OPT_QUIRKS_LIST:\n \t\t\tupdater_list_config_quirks(cfg);\n+\t\t\tupdater_delete_config(cfg);\n \t\t\treturn 0;\n \t\tcase OPT_OUTPUT_DIR:\n \t\t\targs.output_dir = optarg;\n"} {"commit":"f8cd424a5594ed6b2680d860b33d3933f64f1c20","subject":"tests: Skip \/service\/network_error test by default","message":"tests: Skip \/service\/network_error test by default\n\nIt requires network access, so is not suitable for running on build\nmachines as per Debian policy. Skip it unless running \u2018slow\u2019 tests.\n\nhttps:\/\/bugs.debian.org\/cgi-bin\/bugreport.cgi?bug=838530\n\nSigned-off-by: Philip Withnall <29c2a2ac2a854b9cf047275aa9de346d096be2e0@endlessm.com>\n","repos":"GNOME\/libgdata,pwithnall\/libgdata,pwithnall\/libgdata","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdata\/tests\/general.c\n+++ gdata\/tests\/general.c\n@@ -1421,6 +1421,12 @@\n #endif\n \tGError *error = NULL;\n \n+\t\/* Skip this test unless explicitly asked for, so that we don\u2019t do network accesses on build machines by default. *\/\n+\tif (!g_test_slow ()) {\n+\t\tg_test_skip (\"Test requires network access\");\n+\t\treturn;\n+\t}\n+\n \t\/* This is a little hacky, but it should work *\/\n \tservice = g_object_new (GDATA_TYPE_SERVICE, NULL);\n \n"} {"commit":"99e66d945d47e5d7c490af0a6110fc7e5792ae9e","subject":"static const* should be static const char*","message":"static const* should be static const char*\n","repos":"martinezjavier\/tpm2-tools,01org\/tpm2.0-tools,martinezjavier\/tpm2-tools,01org\/tpm2.0-tools,martinezjavier\/tpm2-tools,martinezjavier\/tpm2-tools,01org\/tpm2.0-tools","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tools\/tpm2_getmanufec.c\n+++ tools\/tpm2_getmanufec.c\n@@ -405,7 +405,7 @@\n int execute_tool (int argc, char *argv[], char *envp[], common_opts_t *opts,\n TSS2_SYS_CONTEXT *sapi_context)\n {\n- static const *optstring = \"e:o:H:P:g:f:X:N:O:E:S:U\";\n+ static const char*optstring = \"e:o:H:P:g:f:X:N:O:E:S:U\";\n \n static struct option long_options[] =\n {\n"} {"commit":"6b7b62d7483ec1b81b4a50ee9afc142dd6e9a323","subject":"update konoha.import sugar","message":"update konoha.import sugar\n","repos":"konoha-project\/minikonoha,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/minikonoha,konoha-project\/konoha3,konoha-project\/minikonoha","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- package\/konoha.import\/import_glue.c\n+++ package\/konoha.import\/import_glue.c\n@@ -89,7 +89,7 @@\n static kbool_t import_initNameSpace(KonohaContext *kctx, kNameSpace *packageNameSpace, kNameSpace *ns, kfileline_t pline)\n {\n \tKDEFINE_SYNTAX SYNTAX[] = {\n-\t\t{ SYM_(\"import\"), 0, \"\\\"import\\\" $Token [ \\\".*\\\"] \", 0, 0, NULL, NULL, Statement_import, NULL, NULL, },\n+\t\t{ SYM_(\"import\"), 0, \"\\\"import\\\" $Token $Token* [ \\\".*\\\"] \", 0, 0, NULL, NULL, Statement_import, NULL, NULL, },\n \t\t{ KW_END, },\n \t};\n \tSUGAR kNameSpace_defineSyntax(kctx, ns, SYNTAX, packageNameSpace);\n"} {"commit":"85724a419212df5ced7f44cd1e8716ce8a741909","subject":"Change FanoutChannel to synchronously process handle destruction.","message":"Change FanoutChannel to synchronously process handle destruction.\n\nSummary: This ensures that closing a FanoutChannel will synchronously cancel its input receiver. We don't need to run this code on the provided executor, because it is not running as part of a callback (and because we already have a lock).\n\nReviewed By: aary\n\nDifferential Revision: D32191795\n\nfbshipit-source-id: 9ec2a2303a12580e052de7af8651ebf5b773b8b6\n","repos":"facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly,facebook\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/experimental\/channels\/FanoutChannel-inl.h\n+++ folly\/experimental\/channels\/FanoutChannel-inl.h\n@@ -180,10 +180,8 @@\n * This is called when the user's FanoutChannel object has been destroyed.\n *\/\n void destroyHandle(CloseResult closeResult) {\n- executor_->add([=, closeResult = std::move(closeResult)]() mutable {\n- auto state = state_.wlock();\n- processHandleDestroyed(state, std::move(closeResult));\n- });\n+ auto state = state_.wlock();\n+ processHandleDestroyed(state, std::move(closeResult));\n }\n \n \/**\n"} {"commit":"8f6d0d6ef88e225521bb21ec2d975c3395036250","subject":"bluetooth:Fix memory leak while validating the pointer","message":"bluetooth:Fix memory leak while validating the pointer\n\nSigned-off-by: Amit Purwar <e173242e39b567d3d321a57b664b2deea782cb99@samsung.com>\n","repos":"junmin-kim\/TizenRT,jeongchanKim\/TizenRT,an4967\/TizenRT,jeongchanKim\/TizenRT,chanijjani\/TizenRT,davidfather\/TizenRT,jeongarmy\/TizenRT,jsdosa\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,jsdosa\/TizenRT,sunghan-chang\/TizenRT,jsdosa\/TizenRT,davidfather\/TizenRT,Samsung\/TizenRT,jeongchanKim\/TizenRT,junmin-kim\/TizenRT,sunghan-chang\/TizenRT,pillip8282\/TizenRT,davidfather\/TizenRT,jsdosa\/TizenRT,junmin-kim\/TizenRT,chanijjani\/TizenRT,davidfather\/TizenRT,Samsung\/TizenRT,junmin-kim\/TizenRT,pillip8282\/TizenRT,davidfather\/TizenRT,pillip8282\/TizenRT,pillip8282\/TizenRT,jeongchanKim\/TizenRT,jeongarmy\/TizenRT,jeongarmy\/TizenRT,Samsung\/TizenRT,jeongchanKim\/TizenRT,Samsung\/TizenRT,jeongarmy\/TizenRT,sunghan-chang\/TizenRT,sunghan-chang\/TizenRT,an4967\/TizenRT,chanijjani\/TizenRT,pillip8282\/TizenRT,jsdosa\/TizenRT,Samsung\/TizenRT,pillip8282\/TizenRT,junmin-kim\/TizenRT,an4967\/TizenRT,jeongchanKim\/TizenRT,jeongarmy\/TizenRT,davidfather\/TizenRT,chanijjani\/TizenRT,jeongarmy\/TizenRT,jeongarmy\/TizenRT,sunghan-chang\/TizenRT,an4967\/TizenRT,Samsung\/TizenRT,chanijjani\/TizenRT,pillip8282\/TizenRT,chanijjani\/TizenRT,jsdosa\/TizenRT,Samsung\/TizenRT,an4967\/TizenRT,junmin-kim\/TizenRT,an4967\/TizenRT,an4967\/TizenRT,jsdosa\/TizenRT,chanijjani\/TizenRT,junmin-kim\/TizenRT,davidfather\/TizenRT,jeongchanKim\/TizenRT","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- framework\/src\/bluetooth\/src\/bluetooth-adapter.c\n+++ framework\/src\/bluetooth\/src\/bluetooth-adapter.c\n@@ -1018,9 +1018,17 @@\n \n \t\t\/* ptr[4] contain \"08x\" and \"04hx\" *\/\n \t\tptr[5] = calloc(1, sizeof(char) * 8);\n+\t\tif (ptr[5] == NULL) {\n+\t\t\tfree(data);\n+\t\t\treturn BT_ERROR_OUT_OF_MEMORY;\n+\t\t}\n+\n \t\tptr[6] = calloc(1, sizeof(char) * 4);\n-\t\tif (ptr[5] == NULL || ptr[6] == NULL)\n+\t\tif (ptr[6] == NULL) {\n+\t\t\tfree(data);\n+\t\t\tfree(ptr[5]);\n \t\t\treturn BT_ERROR_OUT_OF_MEMORY;\n+\t\t}\n \n \t\tstrncpy(ptr[5], ptr[4], 8);\n \t\tstrncpy(ptr[6], ptr[4] + 8, 4);\n"} {"commit":"3783c83b2556b8235fd51752329fa6c43738f273","subject":"soc: arm: microchip: Allow to support only light sleep","message":"soc: arm: microchip: Allow to support only light sleep\n\nMake sure light sleep hook function is compile when needed\nThis solves linking error for shippable test that only enable\nlight sleep.\n\nSigned-off-by: Jose Alberto Meza <93346bcba00086196ffe58e37d7adff1143c3f07@intel.com>\n","repos":"Vudentz\/zephyr,galak\/zephyr,galak\/zephyr,nashif\/zephyr,nashif\/zephyr,nashif\/zephyr,nashif\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,galak\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,finikorg\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- soc\/arm\/microchip_mec\/mec1501\/power.c\n+++ soc\/arm\/microchip_mec\/mec1501\/power.c\n@@ -75,7 +75,9 @@\n \tsoc_deep_sleep_periph_restore();\n \n }\n+#endif\n \n+#ifdef CONFIG_SYS_POWER_SLEEP_STATES\n \n \/*\n * Light Sleep\n"} {"commit":"168da2617f25260ad72ac1fdbbb8cd15bcf5bdd9","subject":"soc\/intel_adsp: Don't depend on XCHAL_EXCM_LEVEL","message":"soc\/intel_adsp: Don't depend on XCHAL_EXCM_LEVEL\n\nThe MP startup code had a hardcoded INTLEVEL field of 5 in the initial\nvalue of PS. That's needless, INTLEVEL is a full 4 bit field even if\nthe number of hardware interrupt levels is lower (and in fact 0xf is\nthe documented hardware reset state). Set that instead, so that this\ncode will work with any XEA2 hardware. This also matches the similar\ncode path in boot startup.\n\nSigned-off-by: Andy Ross <c70f9a6bf6ee0cd69c8af4ce5e6b131945769315@intel.com>\n","repos":"galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- soc\/xtensa\/intel_adsp\/common\/soc_mp.c\n+++ soc\/xtensa\/intel_adsp\/common\/soc_mp.c\n@@ -81,7 +81,7 @@\n __asm__(\".align 4 \\n\\t\"\n \t\".global z_soc_mp_asm_entry \\n\\t\"\n \t\"z_soc_mp_asm_entry: \\n\\t\"\n-\t\" movi a0, 0x40025 \\n\\t\" \/* WOE | UM | INTLEVEL(5) *\/\n+\t\" movi a0, 0x4002f \\n\\t\" \/* WOE | UM | INTLEVEL(max) *\/\n \t\" wsr a0, PS \\n\\t\"\n \t\" movi a0, 0 \\n\\t\"\n \t\" wsr a0, WINDOWBASE \\n\\t\"\n@@ -91,7 +91,6 @@\n \t\" movi a1, z_mp_stack_top \\n\\t\"\n \t\" l32i a1, a1, 0 \\n\\t\"\n \t\" call4 z_mp_entry \\n\\t\");\n-BUILD_ASSERT(XCHAL_EXCM_LEVEL == 5);\n \n __imr void z_mp_entry(void)\n {\n"} {"commit":"36c0a791e6936d1f2eba1b810288cc82a25d7f47","subject":"virsh: lookup interface by name or mac other than one by one","message":"virsh: lookup interface by name or mac other than one by one\n\nUse virMacAddrParse() to distinguish interface name from interface\nmac address.\n","repos":"datto\/libvirt,zippy2\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,rlaager\/libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jfehlig\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,jardasgit\/libvirt,agx\/libvirt,nertpinx\/libvirt,taget\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,VenkatDatta\/libvirt,elmarco\/libvirt,shugaoye\/libvirt,taget\/libvirt,datto\/libvirt,eskultety\/libvirt,cbosdo\/libvirt,jfehlig\/libvirt,taget\/libvirt,taget\/libvirt,fabianfreyer\/libvirt,agx\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,agx\/libvirt,shugaoye\/libvirt,zippy2\/libvirt,olafhering\/libvirt,cbosdo\/libvirt,datto\/libvirt,rlaager\/libvirt,libvirt\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,rlaager\/libvirt,zippy2\/libvirt,elmarco\/libvirt,crobinso\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,elmarco\/libvirt,libvirt\/libvirt,eskultety\/libvirt,cbosdo\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,zippy2\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,elmarco\/libvirt,eskultety\/libvirt,taget\/libvirt,cbosdo\/libvirt,shugaoye\/libvirt,nertpinx\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,agx\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,rlaager\/libvirt,crobinso\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,VenkatDatta\/libvirt,nertpinx\/libvirt,agx\/libvirt,shugaoye\/libvirt,rlaager\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,datto\/libvirt,libvirt\/libvirt,elmarco\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,shugaoye\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/virsh-interface.c\n+++ tools\/virsh-interface.c\n@@ -35,6 +35,7 @@\n #include \"virbuffer.h\"\n #include \"viralloc.h\"\n #include \"virfile.h\"\n+#include \"virmacaddr.h\"\n #include \"virutil.h\"\n #include \"virxml.h\"\n #include \"virstring.h\"\n@@ -46,6 +47,8 @@\n {\n virInterfacePtr iface = NULL;\n const char *n = NULL;\n+ bool is_mac = false;\n+ virMacAddr dummy;\n virCheckFlags(VSH_BYNAME | VSH_BYMAC, NULL);\n \n if (!optname)\n@@ -62,14 +65,17 @@\n if (name)\n *name = n;\n \n+ if (virMacAddrParse(n, &dummy) == 0)\n+ is_mac = true;\n+\n \/* try it by NAME *\/\n- if (flags & VSH_BYNAME) {\n+ if (!is_mac && (flags & VSH_BYNAME)) {\n vshDebug(ctl, VSH_ERR_DEBUG, \"%s: <%s> trying as interface NAME\\n\",\n cmd->def->name, optname);\n iface = virInterfaceLookupByName(ctl->conn, n);\n- }\n+\n \/* try it by MAC *\/\n- if (!iface && (flags & VSH_BYMAC)) {\n+ } else if (is_mac && (flags & VSH_BYMAC)) {\n vshDebug(ctl, VSH_ERR_DEBUG, \"%s: <%s> trying as interface MAC\\n\",\n cmd->def->name, optname);\n iface = virInterfaceLookupByMACString(ctl->conn, n);\n"} {"commit":"47a4f1c1bb684a7ed470aba71391d3bd8d77290c","subject":"drbd: Fix module refcount leak in drbd_accept()","message":"drbd: Fix module refcount leak in drbd_accept()\n\ndrbd_accept was modelled after kernel_accept\nwith drbd commit 53eb779 in July 2008.\n\nOnly, kernel_accept was then broken, and only fixed later\nwith kernel commit 1b08534e in Dec 2008:\nnet: Fix module refcount leak in kernel_accept()\n\nImpact: protocol families provided as modules, e.g. ipv6 or ib_sdp,\nwould soon have their reference count become negative, preventing\nthem from being unloaded (likely), or worse, hit zero without actually\nbeing unused, allowing them to be unloaded while still in use (unlikely,\nbut if triggered, causing a kernel crash).\n\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nSigned-off-by: Lars Ellenberg <31df9cacdc65c624cc60c2dcd22bbf92dc230e16@linbit.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/drbd\/drbd_receiver.c\n+++ drivers\/block\/drbd\/drbd_receiver.c\n@@ -466,6 +466,7 @@\n \t\tgoto out;\n \t}\n \t(*newsock)->ops = sock->ops;\n+\t__module_get((*newsock)->ops->owner);\n \n out:\n \treturn err;\n"} {"commit":"6fda40e5c1e2f7f00a183be57e8d41cabbd89188","subject":"removed debug instructions in indexer.c","message":"removed debug instructions in indexer.c\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -302,9 +302,6 @@\n av_free_packet(&pkt);\n }\n calculate_pts_from_dts(&stcontext);\n- int k;\n- for (k = 0; k < stcontext.frame_num; k++)\n- printf(\"----------\\npts %lld\\ndts %lld\\n\", stcontext.index[k].pts, stcontext.index[k].dts);\n write_index(&stcontext);\n av_close_input_file(ic);\n url_fclose(&stcontext.opb);\n"} {"commit":"de0ff338d61645f39e0687c9c3560d8b64bed4a3","subject":"drbd: Converted drbd_recv() from mdev to tconn","message":"drbd: Converted drbd_recv() from mdev to tconn\n\nSigned-off-by: Philipp Reisner <35a55a4ac466b5abd81eb66f3f7d6a972dd0dc24@linbit.com>\nSigned-off-by: Lars Ellenberg <31df9cacdc65c624cc60c2dcd22bbf92dc230e16@linbit.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/block\/drbd\/drbd_receiver.c\n+++ drivers\/block\/drbd\/drbd_receiver.c\n@@ -498,7 +498,7 @@\n \treturn rv;\n }\n \n-static int drbd_recv(struct drbd_conf *mdev, void *buf, size_t size)\n+static int drbd_recv(struct drbd_tconn *tconn, void *buf, size_t size)\n {\n \tmm_segment_t oldfs;\n \tstruct kvec iov = {\n@@ -516,7 +516,7 @@\n \tset_fs(KERNEL_DS);\n \n \tfor (;;) {\n-\t\trv = sock_recvmsg(mdev->tconn->data.socket, &msg, size, msg.msg_flags);\n+\t\trv = sock_recvmsg(tconn->data.socket, &msg, size, msg.msg_flags);\n \t\tif (rv == size)\n \t\t\tbreak;\n \n@@ -527,12 +527,12 @@\n \n \t\tif (rv < 0) {\n \t\t\tif (rv == -ECONNRESET)\n-\t\t\t\tdev_info(DEV, \"sock was reset by peer\\n\");\n+\t\t\t\tconn_info(tconn, \"sock was reset by peer\\n\");\n \t\t\telse if (rv != -ERESTARTSYS)\n-\t\t\t\tdev_err(DEV, \"sock_recvmsg returned %d\\n\", rv);\n+\t\t\t\tconn_err(tconn, \"sock_recvmsg returned %d\\n\", rv);\n \t\t\tbreak;\n \t\t} else if (rv == 0) {\n-\t\t\tdev_info(DEV, \"sock was shut down by peer\\n\");\n+\t\t\tconn_info(tconn, \"sock was shut down by peer\\n\");\n \t\t\tbreak;\n \t\t} else\t{\n \t\t\t\/* signal came in, or peer\/link went down,\n@@ -546,7 +546,7 @@\n \tset_fs(oldfs);\n \n \tif (rv != size)\n-\t\tdrbd_force_state(mdev, NS(conn, C_BROKEN_PIPE));\n+\t\tdrbd_force_state(tconn->volume0, NS(conn, C_BROKEN_PIPE));\n \n \treturn rv;\n }\n@@ -949,7 +949,7 @@\n \tstruct p_header *h = &mdev->tconn->data.rbuf.header;\n \tint r;\n \n-\tr = drbd_recv(mdev, h, sizeof(*h));\n+\tr = drbd_recv(mdev->tconn, h, sizeof(*h));\n \tif (unlikely(r != sizeof(*h))) {\n \t\tif (!signal_pending(current))\n \t\t\tdev_warn(DEV, \"short read expecting header on sock: r=%d\\n\", r);\n@@ -1272,7 +1272,7 @@\n \t\tcrypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0;\n \n \tif (dgs) {\n-\t\trr = drbd_recv(mdev, dig_in, dgs);\n+\t\trr = drbd_recv(mdev->tconn, dig_in, dgs);\n \t\tif (rr != dgs) {\n \t\t\tif (!signal_pending(current))\n \t\t\t\tdev_warn(DEV,\n@@ -1313,7 +1313,7 @@\n \tpage_chain_for_each(page) {\n \t\tunsigned len = min_t(int, ds, PAGE_SIZE);\n \t\tdata = kmap(page);\n-\t\trr = drbd_recv(mdev, data, len);\n+\t\trr = drbd_recv(mdev->tconn, data, len);\n \t\tif (drbd_insert_fault(mdev, DRBD_FAULT_RECEIVE)) {\n \t\t\tdev_err(DEV, \"Fault injection: Corrupting data on receive\\n\");\n \t\t\tdata[0] = data[0] ^ (unsigned long)-1;\n@@ -1360,7 +1360,7 @@\n \n \tdata = kmap(page);\n \twhile (data_size) {\n-\t\trr = drbd_recv(mdev, data, min_t(int, data_size, PAGE_SIZE));\n+\t\trr = drbd_recv(mdev->tconn, data, min_t(int, data_size, PAGE_SIZE));\n \t\tif (rr != min_t(int, data_size, PAGE_SIZE)) {\n \t\t\trv = 0;\n \t\t\tif (!signal_pending(current))\n@@ -1389,7 +1389,7 @@\n \t\tcrypto_hash_digestsize(mdev->tconn->integrity_r_tfm) : 0;\n \n \tif (dgs) {\n-\t\trr = drbd_recv(mdev, dig_in, dgs);\n+\t\trr = drbd_recv(mdev->tconn, dig_in, dgs);\n \t\tif (rr != dgs) {\n \t\t\tif (!signal_pending(current))\n \t\t\t\tdev_warn(DEV,\n@@ -1410,7 +1410,7 @@\n \n \tbio_for_each_segment(bvec, bio, i) {\n \t\texpect = min_t(int, data_size, bvec->bv_len);\n-\t\trr = drbd_recv(mdev,\n+\t\trr = drbd_recv(mdev->tconn,\n \t\t\t kmap(bvec->bv_page)+bvec->bv_offset,\n \t\t\t expect);\n \t\tkunmap(bvec->bv_page);\n@@ -2094,7 +2094,7 @@\n \t\tpeer_req->digest = di;\n \t\tpeer_req->flags |= EE_HAS_DIGEST;\n \n-\t\tif (drbd_recv(mdev, di->digest, digest_size) != digest_size)\n+\t\tif (drbd_recv(mdev->tconn, di->digest, digest_size) != digest_size)\n \t\t\tgoto out_free_e;\n \n \t\tif (cmd == P_CSUM_RS_REQUEST) {\n@@ -2785,7 +2785,7 @@\n \tif (mdev->tconn->agreed_pro_version >= 87) {\n \t\tunsigned char *my_alg = mdev->tconn->net_conf->integrity_alg;\n \n-\t\tif (drbd_recv(mdev, p_integrity_alg, data_size) != data_size)\n+\t\tif (drbd_recv(mdev->tconn, p_integrity_alg, data_size) != data_size)\n \t\t\treturn false;\n \n \t\tp_integrity_alg[SHARED_SECRET_MAX-1] = 0;\n@@ -2871,7 +2871,7 @@\n \t\/* initialize verify_alg and csums_alg *\/\n \tmemset(p->verify_alg, 0, 2 * SHARED_SECRET_MAX);\n \n-\tif (drbd_recv(mdev, &p->head.payload, header_size) != header_size)\n+\tif (drbd_recv(mdev->tconn, &p->head.payload, header_size) != header_size)\n \t\treturn false;\n \n \tmdev->sync_conf.rate\t = be32_to_cpu(p->rate);\n@@ -2885,7 +2885,7 @@\n \t\t\t\treturn false;\n \t\t\t}\n \n-\t\t\tif (drbd_recv(mdev, p->verify_alg, data_size) != data_size)\n+\t\t\tif (drbd_recv(mdev->tconn, p->verify_alg, data_size) != data_size)\n \t\t\t\treturn false;\n \n \t\t\t\/* we expect NUL terminated string *\/\n@@ -3424,7 +3424,7 @@\n \t}\n \tif (want == 0)\n \t\treturn 0;\n-\terr = drbd_recv(mdev, buffer, want);\n+\terr = drbd_recv(mdev->tconn, buffer, want);\n \tif (err != want) {\n \t\tif (err >= 0)\n \t\t\terr = -EIO;\n@@ -3613,7 +3613,7 @@\n \t\t\t\/* use the page buff *\/\n \t\t\tp = buffer;\n \t\t\tmemcpy(p, h, sizeof(*h));\n-\t\t\tif (drbd_recv(mdev, p->head.payload, data_size) != data_size)\n+\t\t\tif (drbd_recv(mdev->tconn, p->head.payload, data_size) != data_size)\n \t\t\t\tgoto out;\n \t\t\tif (data_size <= (sizeof(*p) - sizeof(p->head))) {\n \t\t\t\tdev_err(DEV, \"ReportCBitmap packet too small (l:%u)\\n\", data_size);\n@@ -3677,7 +3677,7 @@\n \tsize = data_size;\n \twhile (size > 0) {\n \t\twant = min_t(int, size, sizeof(sink));\n-\t\tr = drbd_recv(mdev, sink, want);\n+\t\tr = drbd_recv(mdev->tconn, sink, want);\n \t\tif (!expect(r > 0))\n \t\t\tbreak;\n \t\tsize -= r;\n@@ -3784,7 +3784,7 @@\n \t\t}\n \n \t\tif (shs) {\n-\t\t\trv = drbd_recv(mdev, &header->payload, shs);\n+\t\t\trv = drbd_recv(mdev->tconn, &header->payload, shs);\n \t\t\tif (unlikely(rv != shs)) {\n \t\t\t\tif (!signal_pending(current))\n \t\t\t\t\tdev_warn(DEV, \"short read while reading sub header: rv=%d\\n\", rv);\n@@ -4013,7 +4013,7 @@\n \t\treturn -1;\n \t}\n \n-\trv = drbd_recv(mdev, &p->head.payload, expect);\n+\trv = drbd_recv(mdev->tconn, &p->head.payload, expect);\n \n \tif (rv != expect) {\n \t\tif (!signal_pending(current))\n@@ -4116,7 +4116,7 @@\n \t\tgoto fail;\n \t}\n \n-\trv = drbd_recv(mdev, peers_ch, length);\n+\trv = drbd_recv(mdev->tconn, peers_ch, length);\n \n \tif (rv != length) {\n \t\tif (!signal_pending(current))\n@@ -4164,7 +4164,7 @@\n \t\tgoto fail;\n \t}\n \n-\trv = drbd_recv(mdev, response , resp_size);\n+\trv = drbd_recv(mdev->tconn, response , resp_size);\n \n \tif (rv != resp_size) {\n \t\tif (!signal_pending(current))\n"} {"commit":"88ad0dab214799f17f0ddc463d10f44c00587dbf","subject":"gdbusconnection: Add some comments about object ownership","message":"gdbusconnection: Add some comments about object ownership\n\nSome annotations I made while trying to debug bug #781847. They\nintroduce no behavioural changes.\n\nSigned-off-by: Philip Withnall <29c2a2ac2a854b9cf047275aa9de346d096be2e0@endlessm.com>\n","repos":"johne53\/MB3Glib,johne53\/MB3Glib,endlessm\/glib,endlessm\/glib,johne53\/MB3Glib,johne53\/MB3Glib,endlessm\/glib,endlessm\/glib,johne53\/MB3Glib,johne53\/MB3Glib,endlessm\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/gdbusconnection.c\n+++ gio\/gdbusconnection.c\n@@ -1758,7 +1758,7 @@\n \n \/* ---------------------------------------------------------------------------------------------------- *\/\n \n-\/* can be called from any thread with lock held *\/\n+\/* can be called from any thread with lock held; @task is (transfer full) *\/\n static void\n send_message_with_reply_cleanup (GTask *task, gboolean remove)\n {\n@@ -1794,7 +1794,7 @@\n \n \/* ---------------------------------------------------------------------------------------------------- *\/\n \n-\/* Called from GDBus worker thread with lock held *\/\n+\/* Called from GDBus worker thread with lock held; @task is (transfer full). *\/\n static void\n send_message_data_deliver_reply_unlocked (GTask *task,\n GDBusMessage *reply)\n@@ -1839,7 +1839,7 @@\n \n \/* ---------------------------------------------------------------------------------------------------- *\/\n \n-\/* Called from a user thread, lock is not held *\/\n+\/* Called from a user thread, lock is not held; @task is (transfer full) *\/\n static gboolean\n send_message_with_reply_cancelled_idle_cb (gpointer user_data)\n {\n@@ -1869,7 +1869,7 @@\n \n \/* ---------------------------------------------------------------------------------------------------- *\/\n \n-\/* Called from a user thread, lock is not held *\/\n+\/* Called from a user thread, lock is not held; @task is (transfer full) *\/\n static gboolean\n send_message_with_reply_timeout_cb (gpointer user_data)\n {\n@@ -1942,7 +1942,7 @@\n \n g_hash_table_insert (connection->map_method_serial_to_task,\n GUINT_TO_POINTER (*out_serial),\n- task);\n+ g_steal_pointer (&task));\n }\n \n \/**\n@@ -2283,6 +2283,7 @@\n GUINT_TO_POINTER (reply_serial));\n if (task != NULL)\n {\n+ \/* This removes @task from @map_method_serial_to_task. *\/\n \/\/g_debug (\"delivering reply\/error for serial %d for %p\", reply_serial, connection);\n send_message_data_deliver_reply_unlocked (task, message);\n }\n"} {"commit":"95e480c2751cd0045abbca2110c275563f4fc2f0","subject":"changed switch-case in get_frame_rate() by a lookup table","message":"changed switch-case in get_frame_rate() by a lookup table\n","repos":"SmartJog\/mpeg-indexer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indexer.c\n+++ indexer.c\n@@ -20,6 +20,7 @@\n (((uint8_t*)(x))[2] << 8) | \\\n ((uint8_t*)(x))[3])\n \n+const int FPS[8] = {24, 24, 25, 30, 30, 50, 60, 60};\n typedef struct MpegDemuxContext {\n int32_t header_state;\n unsigned char psm_es_type[256];\n@@ -159,36 +160,8 @@\n uint8_t *buf = pkt->data;\n int fps = -1;\n \/\/printf(\"buf 7 : %x\\n\", buf[7]);\n- switch (buf[7] & 0xF){\n- case 0x1:\n- fps = 24;\n- break;\n- case 0x2:\n- fps = 24;\n- break;\n- case 0x3:\n- fps = 25;\n- break;\n- case 0x4:\n- fps = 30;\n- break;\n- case 0x5:\n- fps = 30;\n- break;\n- case 0x6:\n- fps = 50;\n- break;\n- case 0x7:\n- fps = 60;\n- break;\n- case 0x8:\n- fps = 60;\n- break;\n- default :\n- printf(\"error fps could not be retrieved\\n\");\n- fps = -1;\n- break;\n- }\n+ int tmp = buf[7] & 0xF;\n+ fps = FPS[tmp-1];\n return fps;\n }\n }\n@@ -363,6 +336,10 @@\n if (!tc.fps){\n tc.fps = get_frame_rate(st, &pkt);\n printf(\"fps %d\\n\", tc.fps);\n+ if (tc.fps == -1){\n+ printf(\"Frame rate could not be found\\n\");\n+ return -1;\n+ }\n }\n idx->seq = 1;\n idx_set(&stcontext, idx, &pkt, st, i);\n"} {"commit":"3f13e5969befae3b7adfadae3d2724d6cda5d7b5","subject":"Don't have dig (et al) fall back to TCP mode after non-responsive UDP attempts.","message":"Don't have dig (et al) fall back to TCP mode after non-responsive UDP\nattempts.\n","repos":"each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bin\/dig\/dighost.c\n+++ bin\/dig\/dighost.c\n@@ -15,7 +15,7 @@\n * SOFTWARE.\n *\/\n \n-\/* $Id: dighost.c,v 1.58 2000\/06\/26 00:57:18 gson Exp $ *\/\n+\/* $Id: dighost.c,v 1.59 2000\/06\/26 21:28:17 mws Exp $ *\/\n \n \/*\n * Notice to programmers: Do not use this code as an example of how to\n@@ -1251,7 +1251,7 @@\n \/* connect_timeout is used for both UDP recieves and TCP connects. *\/\n static void\n connect_timeout(isc_task_t *task, isc_event_t *event) {\n-\tdig_lookup_t *lookup=NULL, *next=NULL;\n+\tdig_lookup_t *lookup=NULL;\n \tdig_query_t *q=NULL;\n \tisc_result_t result;\n \tisc_buffer_t *b=NULL;\n@@ -1284,24 +1284,12 @@\n \t\t\t\t\t q->lookup->textname,\n \t\t\t\t\t q->lookup->retries-1);\n \t\t\t\telse {\n-\t\t\t\t\tif (lookup->tcp_mode) {\n-\t\t\t\t\t\tprintf(\";; Connection to \"\n-\t\t\t\t\t\t \"server %.*s \"\n-\t\t\t\t\t\t \"for %s timed out. \"\n-\t\t\t\t\t\t \"Giving up.\\n\",\n-\t\t\t\t\t\t (int)r.length, r.base,\n-\t\t\t\t\t\t q->lookup->textname);\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\tprintf(\";; Connection to \"\n-\t\t\t\t\t\t \"server %.*s \"\n-\t\t\t\t\t\t \"for %s timed out. \"\n-\t\t\t\t\t\t \"Trying TCP.\\n\",\n-\t\t\t\t\t\t (int)r.length, r.base,\n-\t\t\t\t\t\t q->lookup->textname);\n-\t\t\t\t\t\tnext = requeue_lookup\n-\t\t\t\t\t\t\t(lookup,ISC_TRUE);\n-\t\t\t\t\t\tnext->tcp_mode = ISC_TRUE;\n-\t\t\t\t\t}\n+\t\t\t\t\tprintf(\";; Connection to \"\n+\t\t\t\t\t \"server %.*s \"\n+\t\t\t\t\t \"for %s timed out. \"\n+\t\t\t\t\t \"Giving up.\\n\",\n+\t\t\t\t\t (int)r.length, r.base,\n+\t\t\t\t\t q->lookup->textname);\n \t\t\t\t}\n \t\t\t}\n \t\t\tisc_socket_cancel(q->sock, task,\n"} {"commit":"5e39edd48543c2cc80a28e265b83003737088929","subject":"clk: hi3620: fix wrong flags on divider","message":"clk: hi3620: fix wrong flags on divider\n\nThe flags on dividers should be CLK_DIVIDER_HIWORD_MASK, not\nCLK_MUX_HIWORD_MASK.\n\nSigned-off-by: Haojian Zhuang <979139d45d262f0480136b0da512e0afa0fe79d3@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/clk\/hisilicon\/clk-hi3620.c\n+++ drivers\/clk\/hisilicon\/clk-hi3620.c\n@@ -60,8 +60,8 @@\n static const char *saxi_mux_p[] __initdata = { \"armpll3\", \"armpll2\", };\n static const char *pwm0_mux_p[] __initdata = { \"osc32k\", \"osc26m\", };\n static const char *pwm1_mux_p[] __initdata = { \"osc32k\", \"osc26m\", };\n-static const char *sd_mux_p[] __initdata = { \"armpll3\", \"armpll2\", };\n-static const char *mmc1_mux_p[] __initdata = { \"armpll3\", \"armpll2\", };\n+static const char *sd_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n+static const char *mmc1_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n static const char *mmc1_mux2_p[] __initdata = { \"osc26m\", \"mmc1_div\", };\n static const char *g2d_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n static const char *venc_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n@@ -74,8 +74,8 @@\n static const char *ldi1_mux_p[] __initdata = { \"armpll2\", \"armpll4\",\n \t\t\t\t\t \"armpll3\", \"armpll5\", };\n static const char *rclk_hsic_p[] __initdata = { \"armpll3\", \"armpll2\", };\n-static const char *mmc2_mux_p[] __initdata = { \"armpll3\", \"armpll2\", };\n-static const char *mmc3_mux_p[] __initdata = { \"armpll3\", \"armpll2\", };\n+static const char *mmc2_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n+static const char *mmc3_mux_p[] __initdata = { \"armpll2\", \"armpll3\", };\n \n \n \/* fixed rate clocks *\/\n@@ -137,13 +137,13 @@\n };\n \n static struct hisi_divider_clock hi3620_div_clks[] __initdata = {\n-\t{ HI3620_SHAREAXI_DIV, \"saxi_div\", \"saxi_mux\", 0, 0x100, 0, 5, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_CFGAXI_DIV, \"cfgaxi_div\", \"saxi_div\", 0, 0x100, 5, 2, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_SD_DIV, \"sd_div\", \"sd_mux\",\t 0, 0x108, 0, 4, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_MMC1_DIV, \"mmc1_div\", \"mmc1_mux\", 0, 0x108, 5, 4, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_HSIC_DIV, \"hsic_div\", \"rclk_hsic\", 0, 0x130, 0, 2, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_MMC2_DIV, \"mmc2_div\", \"mmc2_mux\", 0, 0x140, 0, 4, CLK_MUX_HIWORD_MASK, NULL, },\n-\t{ HI3620_MMC3_DIV, \"mmc3_div\", \"mmc3_mux\", 0, 0x140, 5, 4, CLK_MUX_HIWORD_MASK, NULL, },\n+\t{ HI3620_SHAREAXI_DIV, \"saxi_div\", \"saxi_mux\", 0, 0x100, 0, 5, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_CFGAXI_DIV, \"cfgaxi_div\", \"saxi_div\", 0, 0x100, 5, 2, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_SD_DIV, \"sd_div\", \"sd_mux\",\t 0, 0x108, 0, 4, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_MMC1_DIV, \"mmc1_div\", \"mmc1_mux\", 0, 0x108, 5, 4, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_HSIC_DIV, \"hsic_div\", \"rclk_hsic\", 0, 0x130, 0, 2, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_MMC2_DIV, \"mmc2_div\", \"mmc2_mux\", 0, 0x140, 0, 4, CLK_DIVIDER_HIWORD_MASK, NULL, },\n+\t{ HI3620_MMC3_DIV, \"mmc3_div\", \"mmc3_mux\", 0, 0x140, 5, 4, CLK_DIVIDER_HIWORD_MASK, NULL, },\n };\n \n static struct hisi_gate_clock hi3620_seperated_gate_clks[] __initdata = {\n"} {"commit":"f68133c4202d5fafa0961f719c189b20bb1115ff","subject":"Corrected serialize species write out in AnnealChargeMove","message":"Corrected serialize species write out in AnnealChargeMove\n","repos":"hsidky\/SAPHRON,hsidky\/SAPHRON,hsidky\/SAPHRON","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Moves\/AnnealChargeMove.h\n+++ src\/Moves\/AnnealChargeMove.h\n@@ -221,8 +221,9 @@\n \t\t{\n \t\t\tjson[\"type\"] = GetName();\n \t\t\tjson[\"seed\"] = _seed;\n+\t\t\tauto& slist = Particle::GetSpeciesList();\n \t\t\tfor(auto& s : _species)\n-\t\t\t\tjson[\"species\"].append(s);\n+\t\t\t\tjson[\"species\"].append(slist[s]);\n \t\t}\n \n \t\tvirtual std::string GetName() const override { return \"AnnealCharge\"; }\n"} {"commit":"c38c3a4d80c03195783fd11366316e3a72048436","subject":"Create ptraceIDC_1.idc","message":"Create ptraceIDC_1.idc","repos":"invictus1306\/ARM-episodes,invictus1306\/ARM-episodes","returncode":1,"stderr":"error: pathspec 'Episode1\/IDC_Script\/ptraceIDC_1.idc' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- Episode1\/IDC_Script\/ptraceIDC_1.idc\n+++ Episode1\/IDC_Script\/ptraceIDC_1.idc\n@@ -0,0 +1,9 @@\n+auto i, res;\n+auto arr1=0x10988;\n+\n+for (i=0;i<4;i++) \n+{ \n+ res = Byte(arr1)+0x40;\n+ print(res);\n+ arr1=arr1+1;\n+}\n"} {"commit":"cbfd1217e3d1688ac229ae0d1b89fe38b69fdee2","subject":"ofBaseVideo: remove getPixels, already declared in ofBaseHasPixels. Closes #210","message":"ofBaseVideo: remove getPixels, already declared in ofBaseHasPixels.\nCloses #210\n","repos":"HellicarAndLewis\/ProjectDonk,HellicarAndLewis\/ProjectDonk,HellicarAndLewis\/ProjectDonk,HellicarAndLewis\/ProjectDonk,HellicarAndLewis\/ProjectDonk,HellicarAndLewis\/ProjectDonk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libs\/openFrameworks\/utils\/ofTypes.h\n+++ libs\/openFrameworks\/utils\/ofTypes.h\n@@ -431,7 +431,6 @@\n class ofBaseVideo: public ofBaseImage, public ofBaseUpdates{\n public:\n \tvirtual ~ofBaseVideo(){}\n-\tvirtual unsigned char * getPixels()=0;\n \tvirtual bool isFrameNew()=0;\n \tvirtual void close()=0;\n };\n"} {"commit":"c135d9ea1b143382fe1372be547cf5ea76444445","subject":"tests: Add more coverage to JsonNode","message":"tests: Add more coverage to JsonNode\n","repos":"oerdnj\/json-glib,ebassi\/json-glib,frida\/json-glib,brauliobo\/json-glib,oerdnj\/json-glib,oerdnj\/json-glib,brauliobo\/json-glib,frida\/json-glib,Distrotech\/json-glib,ebassi\/json-glib,GNOME\/json-glib,brauliobo\/json-glib,GNOME\/json-glib,oerdnj\/json-glib,Distrotech\/json-glib,Distrotech\/json-glib,ebassi\/json-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- json-glib\/tests\/node.c\n+++ json-glib\/tests\/node.c\n@@ -1,6 +1,50 @@\n #include <glib.h>\n #include <json-glib\/json-glib.h>\n #include <string.h>\n+\n+static void\n+test_init_int (void)\n+{\n+ JsonNode *node = json_node_new (JSON_NODE_VALUE);\n+\n+ json_node_set_int (node, 42);\n+ g_assert_cmpint (json_node_get_int (node), ==, 42);\n+\n+ json_node_free (node);\n+}\n+\n+static void\n+test_init_double (void)\n+{\n+ JsonNode *node = json_node_new (JSON_NODE_VALUE);\n+\n+ json_node_set_double (node, 3.14159);\n+ g_assert_cmpfloat (json_node_get_double (node), ==, 3.14159);\n+\n+ json_node_free (node);\n+}\n+\n+static void\n+test_init_boolean (void)\n+{\n+ JsonNode *node = json_node_new (JSON_NODE_VALUE);\n+\n+ json_node_set_boolean (node, TRUE);\n+ g_assert (json_node_get_boolean (node));\n+\n+ json_node_free (node);\n+}\n+\n+static void\n+test_init_string (void)\n+{\n+ JsonNode *node = json_node_new (JSON_NODE_VALUE);\n+\n+ json_node_set_string (node, \"Hello, World\");\n+ g_assert_cmpstr (json_node_get_string (node), ==, \"Hello, World\");\n+\n+ json_node_free (node);\n+}\n \n static void\n test_copy_null (void)\n@@ -68,7 +112,7 @@\n }\n \n static void\n-test_value (void)\n+test_gvalue (void)\n {\n JsonNode *node = json_node_new (JSON_NODE_VALUE);\n GValue value = { 0, };\n@@ -95,6 +139,58 @@\n json_node_free (node);\n }\n \n+static void\n+test_gvalue_autopromotion (void)\n+{\n+ JsonNode *node = json_node_new (JSON_NODE_VALUE);\n+ GValue value = { 0, };\n+ GValue check = { 0, };\n+\n+ g_assert_cmpint (JSON_NODE_TYPE (node), ==, JSON_NODE_VALUE);\n+\n+ if (g_test_verbose ())\n+ g_print (\"Autopromotion of int to int64\\n\");\n+\n+ g_value_init (&value, G_TYPE_INT);\n+ g_value_set_int (&value, 42);\n+\n+ json_node_set_value (node, &value);\n+ json_node_get_value (node, &check);\n+\n+ if (g_test_verbose ())\n+ g_print (\"Expecting an gint64, got a %s\\n\", g_type_name (G_VALUE_TYPE (&check)));\n+\n+ g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_INT64);\n+ g_assert_cmpint (g_value_get_int64 (&check), ==, 42);\n+ g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check));\n+ g_assert_cmpint ((gint64) g_value_get_int (&value), ==, g_value_get_int64 (&check));\n+\n+ g_value_unset (&value);\n+ g_value_unset (&check);\n+\n+ if (g_test_verbose ())\n+ g_print (\"Autopromotion of float to double\\n\");\n+\n+ g_value_init (&value, G_TYPE_FLOAT);\n+ g_value_set_float (&value, 3.14159f);\n+\n+ json_node_set_value (node, &value);\n+ json_node_get_value (node, &check);\n+\n+ if (g_test_verbose ())\n+ g_print (\"Expecting a gdouble, got a %s\\n\", g_type_name (G_VALUE_TYPE (&check))); \n+\n+ g_assert_cmpint (G_VALUE_TYPE (&check), ==, G_TYPE_DOUBLE);\n+ g_assert_cmpfloat ((float) g_value_get_double (&check), ==, 3.14159f);\n+ g_assert_cmpint (G_VALUE_TYPE (&value), !=, G_VALUE_TYPE (&check));\n+ g_assert_cmpfloat ((gdouble) g_value_get_float (&value), ==, g_value_get_double (&check));\n+\n+ g_value_unset (&value);\n+ g_value_unset (&check);\n+\n+ json_node_free (node);\n+}\n+\n int\n main (int argc,\n char *argv[])\n@@ -102,11 +198,16 @@\n g_type_init ();\n g_test_init (&argc, &argv, NULL);\n \n- g_test_add_func (\"\/nodes\/null-node\", test_null);\n- g_test_add_func (\"\/nodes\/copy-null\", test_copy_null);\n- g_test_add_func (\"\/nodes\/copy-value\", test_copy_value);\n- g_test_add_func (\"\/nodes\/copy-object\", test_copy_object);\n- g_test_add_func (\"\/nodes\/value\", test_value);\n+ g_test_add_func (\"\/nodes\/init\/int\", test_init_int);\n+ g_test_add_func (\"\/nodes\/init\/double\", test_init_double);\n+ g_test_add_func (\"\/nodes\/init\/boolean\", test_init_boolean);\n+ g_test_add_func (\"\/nodes\/init\/string\", test_init_string);\n+ g_test_add_func (\"\/nodes\/init\/null\", test_null);\n+ g_test_add_func (\"\/nodes\/copy\/null\", test_copy_null);\n+ g_test_add_func (\"\/nodes\/copy\/value\", test_copy_value);\n+ g_test_add_func (\"\/nodes\/copy\/object\", test_copy_object);\n+ g_test_add_func (\"\/nodes\/gvalue\", test_gvalue);\n+ g_test_add_func (\"\/nodes\/gvalue\/autopromotion\", test_gvalue_autopromotion);\n \n return g_test_run ();\n }\n"} {"commit":"b4a25101d2bf94583f935fcd601f9f78e84d2865","subject":"Re-add copyright symbol again.","message":"Re-add copyright symbol again.\n\nSigned-off-by: James Hunt <170187ea054fb79d4028574cc7d937f7521ccaae@ubuntu.com>\n","repos":"udeved\/cgmanager,hallyn\/cgmanager,udeved\/cgmanager,hustcat\/cgmanager,lxc\/cgmanager,hallyn\/cgmanager-pkg-ubuntu,lxc\/cgmanager,hustcat\/cgmanager,hallyn\/cgmanager-pkg-ubuntu,hallyn\/cgmanager","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cgmanager.c\n+++ cgmanager.c\n@@ -1,6 +1,6 @@\n \/* cgmanager\n *\n- * Copyright 2013 Stphane Graber\n+ * Copyright \u00a9 2013 Stphane Graber\n * Author: Stphane Graber <stgraber@ubuntu.com>\n *\n * This program is free software; you can redistribute it and\/or modify\n"} {"commit":"eceae1ee837336ca3cedf5ac59256d82cff650f2","subject":"iptsec\/auth_digest.c: fixed whitespace","message":"iptsec\/auth_digest.c: fixed whitespace\n\ndarcs-hash:20081127125811-db55f-ca021bcde1a30fffbe100b9edd780f42ec6ed0f5.gz\n","repos":"xhook\/sofia-sip,xhook\/sofia-sip,BelledonneCommunications\/sofia-sip,jart\/sofia-sip,erdincay\/sofia-sip,xhook\/sofia-sip,jart\/sofia-sip,unispeech\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,xhook\/sofia-sip,BelledonneCommunications\/sofia-sip,unispeech\/sofia-sip,BelledonneCommunications\/sofia-sip,jart\/sofia-sip,erdincay\/sofia-sip,xhook\/sofia-sip,BelledonneCommunications\/sofia-sip","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsofia-sip-ua\/iptsec\/auth_digest.c\n+++ libsofia-sip-ua\/iptsec\/auth_digest.c\n@@ -59,7 +59,7 @@\n * found, or -1 upon an error.\n *\/\n issize_t auth_digest_challenge_get(su_home_t *home,\n-\t\t\t\t auth_challenge_t *ac0, \n+\t\t\t\t auth_challenge_t *ac0,\n \t\t\t\t char const * const params[])\n {\n ssize_t n;\n@@ -70,7 +70,7 @@\n \n ac->ac_size = sizeof(ac);\n \n- assert(ac0); \n+ assert(ac0);\n assert(ac0->ac_size >= (int) sizeof(*ac));\n \n if (ac0 == NULL || params == NULL)\n@@ -103,7 +103,7 @@\n auth_struct_copy(ac0, ac, sizeof(ac));\n \n SU_DEBUG_5((\"%s(): got \"MOD_ZD\"\\n\", \"auth_digest_challenge_get\", n));\n- \n+\n return n;\n }\n \n@@ -136,7 +136,7 @@\n * found, or -1 upon an error.\n *\/\n issize_t auth_digest_response_get(su_home_t *home,\n-\t\t\t\t auth_response_t *ar0, \n+\t\t\t\t auth_response_t *ar0,\n \t\t\t\t char const *const params[])\n {\n ssize_t n;\n@@ -189,7 +189,7 @@\n if (!quoted)\n \/*xyzzy*\/;\n else if (quoted[0] == '\"') {\n- char const *q; \n+ char const *q;\n size_t n;\n \n for (q = quoted + 1; *q; q += n + 2) {\n@@ -204,9 +204,9 @@\n su_md5_strupdate(md5, quoted);\n }\n \n-\/** Generate A1 hash for digest authentication. \n- *\/\n-int auth_digest_a1(auth_response_t *ar, \n+\/** Generate A1 hash for digest authentication.\n+ *\/\n+int auth_digest_a1(auth_response_t *ar,\n \t\t auth_hexmd5_t ha1,\n \t\t char const *secret)\n {\n@@ -222,13 +222,13 @@\n \n su_md5_hexdigest(md5, ha1);\n \n- SU_DEBUG_5((\"auth_digest_a1() has A1 = MD5(%s:%s:%s) = %s\\n\", \n+ SU_DEBUG_5((\"auth_digest_a1() has A1 = MD5(%s:%s:%s) = %s\\n\",\n \t ar->ar_username, ar->ar_realm, secret, ha1));\n \n return 0;\n }\n \n-int auth_digest_a1sess(auth_response_t *ar, \n+int auth_digest_a1sess(auth_response_t *ar,\n \t\t auth_hexmd5_t ha1sess,\n \t\t char const *ha1)\n {\n@@ -243,15 +243,15 @@\n \n su_md5_hexdigest(md5, ha1sess);\n \n- SU_DEBUG_5((\"auth_sessionkey has A1' = MD5(%s:%s:%s) = %s\\n\", \n+ SU_DEBUG_5((\"auth_sessionkey has A1' = MD5(%s:%s:%s) = %s\\n\",\n \t ha1, ar->ar_nonce, ar->ar_cnonce, ha1sess));\n \n return 0;\n }\n \n-\/** Generate MD5 session key for digest authentication. \n- *\/\n-int auth_digest_sessionkey(auth_response_t *ar, \n+\/** Generate MD5 session key for digest authentication.\n+ *\/\n+int auth_digest_sessionkey(auth_response_t *ar,\n \t\t\t auth_hexmd5_t ha1,\n \t\t\t char const *secret)\n {\n@@ -263,7 +263,7 @@\n return -1;\n \n if (ar->ar_md5sess) {\n- auth_hexmd5_t base_ha1; \n+ auth_hexmd5_t base_ha1;\n auth_digest_a1(ar, base_ha1, secret);\n auth_digest_a1sess(ar, ha1, base_ha1);\n } else {\n@@ -273,12 +273,12 @@\n return 0;\n }\n \n-\/** Generate response for digest authentication. \n- *\n- *\/\n-int auth_digest_response(auth_response_t *ar, \n+\/** Generate response for digest authentication.\n+ *\n+ *\/\n+int auth_digest_response(auth_response_t *ar,\n \t\t\t auth_hexmd5_t response,\n-\t\t\t auth_hexmd5_t const ha1, \n+\t\t\t auth_hexmd5_t const ha1,\n \t\t\t char const *method_name,\n \t\t\t void const *data, isize_t dlen)\n {\n@@ -314,7 +314,7 @@\n }\n su_md5_hexdigest(md5, HA2);\n \n- SU_DEBUG_5((\"A2 = MD5(%s:%s%s%s)\\n\", method_name, ar->ar_uri, \n+ SU_DEBUG_5((\"A2 = MD5(%s:%s%s%s)\\n\", method_name, ar->ar_uri,\n \t ar->ar_auth_int ? \":\" : \"\", ar->ar_auth_int ? Hentity : \"\"));\n \n \/* Calculate response *\/\n@@ -333,17 +333,17 @@\n }\n \n su_md5_update(md5, \":\", 1);\n- su_md5_update(md5, HA2, 32); \n+ su_md5_update(md5, HA2, 32);\n su_md5_hexdigest(md5, response);\n \n- SU_DEBUG_5((\"auth_response: %s = MD5(%s:%s%s%s%s%s%s%s:%s) (qop=%s)\\n\", \n-\t response, ha1, ar->ar_nonce, \n-\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\", \n-\t ar->ar_auth || ar->ar_auth_int ? ar->ar_nc : \"\", \n-\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\", \n-\t ar->ar_auth || ar->ar_auth_int ? ar->ar_cnonce : \"\", \n-\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\", \n-\t ar->ar_auth || ar->ar_auth_int ? ar->ar_qop : \"\", \n+ SU_DEBUG_5((\"auth_response: %s = MD5(%s:%s%s%s%s%s%s%s:%s) (qop=%s)\\n\",\n+\t response, ha1, ar->ar_nonce,\n+\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\",\n+\t ar->ar_auth || ar->ar_auth_int ? ar->ar_nc : \"\",\n+\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\",\n+\t ar->ar_auth || ar->ar_auth_int ? ar->ar_cnonce : \"\",\n+\t ar->ar_auth || ar->ar_auth_int ? \":\" : \"\",\n+\t ar->ar_auth || ar->ar_auth_int ? ar->ar_qop : \"\",\n \t HA2,\n \t ar->ar_qop ? ar->ar_qop : \"NONE\"));\n \n"} {"commit":"6d8bff5d55eb5d60040bdc7bbd9553886ea06bcf","subject":"Eliminated unneccessary system header file inclusions.","message":"Eliminated unneccessary system header file inclusions.\n\nsvn path=\/trunk\/; revision=611\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bindings\/tk\/plserver.h\n+++ bindings\/tk\/plserver.h\n@@ -1,26 +1,13 @@\n \/* $Id$\n * $Log$\n- * Revision 1.7 1993\/12\/08 06:18:08 mjl\n+ * Revision 1.8 1993\/12\/09 20:33:41 mjl\n+ * Eliminated unneccessary system header file inclusions.\n+ *\n+ * Revision 1.7 1993\/12\/08 06:18:08 mjl\n * Changed to include new plplotX.h header file.\n *\n * Revision 1.6 1993\/11\/19 07:31:20 mjl\n * Fixed the prototype for tk_toplevel().\n- *\n- * Revision 1.5 1993\/09\/08 02:32:02 mjl\n- * Added include of <errno.h>.\n- *\n- * Revision 1.4 1993\/08\/18 19:04:08 mjl\n- * Added include of file \"plplotio.h\".\n- *\n- * Revision 1.3 1993\/08\/03 01:48:08 mjl\n- * Eliminated dependence on internal Tcl\/TK header files.\n- *\n- * Revision 1.2 1993\/07\/16 22:01:29 mjl\n- * Eliminated obsolete variables from renderer state struct.\n- *\n- * Revision 1.1 1993\/07\/02 06:58:32 mjl\n- * The new TCL\/TK driver! Yes it's finally here! YAAAAAAAAYYYYYYY!!!\n- *\n *\/\n \n \/* \n@@ -31,31 +18,21 @@\n * Declarations for plserver and associated files. \n *\/\n \n-\/* This is always included first *\/\n-\n #include \"plplotP.h\"\n #include \"plplotX.h\"\n+#include \"plstream.h\"\n+#include \"plplotio.h\"\n \n-\/* System headers *\/\n-\n-#include <ctype.h>\n-#include <fcntl.h>\n-#include <math.h>\n-#include <pwd.h>\n-#include <sys\/file.h>\n-#include <sys\/stat.h>\n-#include <sys\/time.h>\n-#include <unistd.h>\n-#include <errno.h>\n-\n-#include <X11\/Xatom.h>\n-#include <X11\/Xproto.h>\n-#include <X11\/Xresource.h>\n-\n+#include <tcl.h>\n #include <tk.h>\n \n-#include \"plstream.h\"\n-#include \"plplotio.h\"\n+#include <sys\/stat.h>\n+#include <fcntl.h>\n+#include <stdlib.h>\n+#include <unistd.h>\n+#include <string.h>\n+#include <math.h>\n+#include <ctype.h>\n \n \/* Macro settings *\/\n \n"} {"commit":"69ccff31f40bf976b32e9caa73f3d028b9de0c10","subject":"fw_fcp: emit 'responded' GObject signal","message":"fw_fcp: emit 'responded' GObject signal\n\nThis commit emits 'responded' GObject signal when receiving response frame\nof Function Control Protocol.\n\nSigned-off-by: Takashi Sakamoto <d5ec7d0cd8074757a1f5eb708bc105c3065a65ea@sakamocchi.jp>\n","repos":"takaswie\/libhinawa,takaswie\/libhinawa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fw_fcp.c\n+++ src\/fw_fcp.c\n@@ -344,6 +344,9 @@\n \tlength = 0;\n \thinawa_fw_resp_get_req_frame(resp, &req_frame, &length);\n \n+\tg_signal_emit(self, fw_fcp_sigs[FW_FCP_SIG_TYPE_RESPONDED], 0,\n+\t\t req_frame, length);\n+\n \t\/* Seek corresponding request. *\/\n \tfor (entry = priv->transactions; entry != NULL; entry = entry->next) {\n \t\ttrans = (struct fcp_transaction *)entry->data;\n"} {"commit":"88156107a7a83475bc50640c31912b0da441b105","subject":"* Final patches","message":"* Final patches\n","repos":"edechter\/swipl-devel,mndrix\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel,jn7163\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,edechter\/swipl-devel,mndrix\/swipl-devel,koryonik\/swipl-devel,mndrix\/swipl-devel,koryonik\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,koryonik\/swipl-devel,edechter\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- packages\/xpce\/src\/txt\/textbuffer.c\n+++ packages\/xpce\/src\/txt\/textbuffer.c\n@@ -2018,7 +2018,8 @@\n if ( c == EOF )\n \tgoto done;\n if ( c > 0xff )\n- { promoteTextBuffer(tb);\n+ { Sungetcode(c, fd);\n+\tpromoteTextBuffer(tb);\n \tbreak;\n }\n tb->tb_bufferA[tb->gap_start++] = c;\n"} {"commit":"7385ceead1c9dbcfa095fe6eb93faefb3c1279b3","subject":"some constants","message":"some constants\n\n\ngit-svn-id: 9f3514be25e8c4f808c923faecc75db62e18396e@47 ce7afbd9-0f25-0410-bca2-9054d3de1fdb\n","repos":"eINIT\/core,eINIT\/simple,eINIT\/core,eINIT\/core,eINIT\/experimental,eINIT\/xml-sh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- einit\/src\/include\/einit\/module.h\n+++ einit\/src\/include\/einit\/module.h\n@@ -27,6 +27,10 @@\n #define EINIT_MOD_LOADER 1\n #define EINIT_MOD_FEEDBACK 2\n #define EINIT_MOD_EXEC 4\n+\n+#define LOAD_OK 1\n+#define LOAD_FAIL -1\n+#define LOAD_FAIL_REQ -2\n \n #define EINIT_\n \n"} {"commit":"1f6c220b45fe92f48c2e78795b7cb30c0215a299","subject":"vk: Update the bind map length to reflect MAX_SETS","message":"vk: Update the bind map length to reflect MAX_SETS\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/i965\/brw_context.h\n+++ src\/mesa\/drivers\/dri\/i965\/brw_context.h\n@@ -360,7 +360,7 @@\n } binding_table;\n \n uint32_t *map_entries;\n- uint32_t *bind_map[4];\n+ uint32_t *bind_map[8]; \/* MAX_SETS from vulkan\/private.h *\/\n \n GLuint nr_params; \/**< number of float params\/constants *\/\n GLuint nr_pull_params;\n"} {"commit":"5bd876bef0235ec5c745ac948e906bf51adf2fef","subject":"Add TODO item about wanting G_DBUS_NONCE_TCP_TMPDIR","message":"Add TODO item about wanting G_DBUS_NONCE_TCP_TMPDIR\n","repos":"johne53\/MB3Glib,ahmedammar\/platform_external_gst_glib,gale320\/glib,krichter722\/glib,ahmedammar\/platform_external_gst_glib,gale320\/glib,pstglia\/platform-external-bluetooth-glib,bluez-android\/glib,zsx\/glib,iConsole\/Console-OS_external_bluetooth_glib,lukasz-skalski\/glib,tamaskenez\/glib,mzabaluev\/glib,antono\/glib,cention-sany\/glib,justinkb\/aosp-bluez.glib,endlessm\/glib,ieei\/glib-old-android,iConsole\/Console-OS_external_bluetooth_glib,dicer\/android_external_glib,zsx\/glib,johne53\/MB3Glib,dicer\/android_external_glib,justinkb\/aosp-bluez.glib,iConsole\/Console-OS_external_bluetooth_glib,antono\/glib,ieei\/glib,bratsche\/glib,djdeath\/glib,cention-sany\/glib,ahmedammar\/platform_external_gst_glib,justinkb\/aosp-bluez.glib,gale320\/glib,krichter722\/glib,MathieuDuponchelle\/glib,djdeath\/glib,tchakabam\/glib,mzabaluev\/glib,bluez-android\/glib,djdeath\/glib,cosimoc\/glib,Distrotech\/glib,darren-clark\/android_platform_external_bluetooth_glib,bratsche\/glib,cosimoc\/glib,ieei\/glib,01org\/android-bluez-glib,darren-clark\/android_platform_external_bluetooth_glib,endlessm\/glib,dicer\/android_external_glib,tchakabam\/glib,tchakabam\/glib,lukasz-skalski\/glib,endlessm\/glib,endlessm\/glib,justinkb\/aosp-bluez.glib,Distrotech\/glib,johne53\/MB3Glib,01org\/android-bluez-glib,iConsole\/Console-OS_external_bluetooth_glib,ieei\/glib-old-android,bratsche\/glib,bluez-android\/glib,tamaskenez\/glib,pstglia\/external-bluetooth-glib,Distrotech\/glib,mzabaluev\/glib,pstglia\/external-bluetooth-glib,01org\/android-bluez-glib,lukasz-skalski\/glib,ahmedammar\/platform_external_gst_glib,ieei\/glib,bratsche\/glib,Distrotech\/glib,krichter722\/glib,johne53\/MB3Glib,ieei\/glib,pstglia\/platform-external-bluetooth-glib,Distrotech\/glib,pstglia\/external-bluetooth-glib,cosimoc\/glib,bluez-android\/glib,pstglia\/platform-external-bluetooth-glib,dicer\/android_external_glib,zsx\/glib,darren-clark\/android_platform_external_bluetooth_glib,tamaskenez\/glib,ieei\/glib-old-android,tchakabam\/glib,gale320\/glib,cention-sany\/glib,zsx\/glib,johne53\/MB3Glib,darren-clark\/android_platform_external_bluetooth_glib,krichter722\/glib,cosimoc\/glib,djdeath\/glib,MathieuDuponchelle\/glib,mzabaluev\/glib,bluez-android\/glib,01org\/android-bluez-glib,pstglia\/external-bluetooth-glib,MathieuDuponchelle\/glib,tchakabam\/glib,tamaskenez\/glib,cention-sany\/glib,ieei\/glib,iConsole\/Console-OS_external_bluetooth_glib,gale320\/glib,dicer\/android_external_glib,lukasz-skalski\/glib,cention-sany\/glib,antono\/glib,tamaskenez\/glib,justinkb\/aosp-bluez.glib,djdeath\/glib,mzabaluev\/glib,pstglia\/platform-external-bluetooth-glib,darren-clark\/android_platform_external_bluetooth_glib,01org\/android-bluez-glib,MathieuDuponchelle\/glib,antono\/glib,endlessm\/glib,ieei\/glib-old-android,johne53\/MB3Glib,cosimoc\/glib,krichter722\/glib,MathieuDuponchelle\/glib,lukasz-skalski\/glib,pstglia\/platform-external-bluetooth-glib,pstglia\/external-bluetooth-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/gdbusconnection.c\n+++ gio\/gdbusconnection.c\n@@ -24,6 +24,11 @@\n * TODO for GDBus:\n *\n * - would be nice to expose GDBusAuthMechanism and an extension point\n+ *\n+ * - probably want a G_DBUS_NONCE_TCP_TMPDIR environment variable\n+ * to specify where the nonce is stored. This will allow people to use\n+ * G_DBUS_NONCE_TCP_TMPDIR=\/mnt\/secure.company.server\/dbus-nonce-dir\n+ * to easily acheive secure RPC via nonce-tcp.\n *\n * - need to expose an extension point for resolving D-Bus address and\n * turning them into GIOStream objects. This will allow us to implement\n"} {"commit":"113bf7c44e595d7a7dc63b2696e3a9dfc2328243","subject":"driver\/flash\/w25qxxdv: Limit name space, add static.","message":"driver\/flash\/w25qxxdv: Limit name space, add static.\n\nChange-Id: I207438d08ab109a448b83e937b19d9503acbbcfb\nSigned-off-by: Marcus Shawcroft <cf6354583ee83038f2010cbcbe1b1f2adb85107d@arm.com>\n","repos":"runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,runchip\/zephyr-cc3200,zephyriot\/zephyr,galak\/zephyr,rsalveti\/zephyr,tidyjiang8\/zephyr-doc,tidyjiang8\/zephyr-doc,punitvara\/zephyr,erwango\/zephyr,holtmann\/zephyr,pklazy\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,holtmann\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,runchip\/zephyr-cc3200,mbolivar\/zephyr,explora26\/zephyr,tidyjiang8\/zephyr-doc,zephyriot\/zephyr,runchip\/zephyr-cc3220,pklazy\/zephyr,explora26\/zephyr,aceofall\/zephyr-iotos,Vudentz\/zephyr,holtmann\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,bboozzoo\/zephyr,bigdinotech\/zephyr,bigdinotech\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,kraj\/zephyr,bboozzoo\/zephyr,ldts\/zephyr,ldts\/zephyr,sharronliu\/zephyr,erwango\/zephyr,aceofall\/zephyr-iotos,punitvara\/zephyr,fractalclone\/zephyr-riscv,bboozzoo\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,pklazy\/zephyr,mbolivar\/zephyr,mbolivar\/zephyr,Vudentz\/zephyr,nashif\/zephyr,pklazy\/zephyr,zephyriot\/zephyr,fbsder\/zephyr,erwango\/zephyr,aceofall\/zephyr-iotos,sharronliu\/zephyr,finikorg\/zephyr,aceofall\/zephyr-iotos,fbsder\/zephyr,fractalclone\/zephyr-riscv,erwango\/zephyr,GiulianoFranchetto\/zephyr,holtmann\/zephyr,fractalclone\/zephyr-riscv,nashif\/zephyr,bigdinotech\/zephyr,nashif\/zephyr,bigdinotech\/zephyr,punitvara\/zephyr,tidyjiang8\/zephyr-doc,runchip\/zephyr-cc3220,holtmann\/zephyr,GiulianoFranchetto\/zephyr,sharronliu\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,ldts\/zephyr,finikorg\/zephyr,explora26\/zephyr,rsalveti\/zephyr,tidyjiang8\/zephyr-doc,Vudentz\/zephyr,runchip\/zephyr-cc3220,ldts\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,finikorg\/zephyr,rsalveti\/zephyr,nashif\/zephyr,rsalveti\/zephyr,explora26\/zephyr,nashif\/zephyr,pklazy\/zephyr,fbsder\/zephyr,zephyriot\/zephyr,fbsder\/zephyr,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,GiulianoFranchetto\/zephyr,sharronliu\/zephyr,erwango\/zephyr,runchip\/zephyr-cc3200,punitvara\/zephyr,mbolivar\/zephyr,sharronliu\/zephyr,Vudentz\/zephyr,bboozzoo\/zephyr,ldts\/zephyr,galak\/zephyr,kraj\/zephyr,galak\/zephyr,punitvara\/zephyr,galak\/zephyr,bboozzoo\/zephyr,galak\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3200,kraj\/zephyr,fractalclone\/zephyr-riscv","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/flash\/spi_flash_w25qxxdv.c\n+++ drivers\/flash\/spi_flash_w25qxxdv.c\n@@ -349,7 +349,7 @@\n \treturn ret;\n }\n \n-static struct flash_driver_api spi_flash_api = {\n+static const struct flash_driver_api spi_flash_api = {\n \t.read = spi_flash_wb_read,\n \t.write = spi_flash_wb_write,\n \t.erase = spi_flash_wb_erase,\n@@ -380,7 +380,7 @@\n \treturn ret;\n }\n \n-struct spi_flash_data spi_flash_memory_data;\n+static struct spi_flash_data spi_flash_memory_data;\n \n DEVICE_INIT(spi_flash_memory, CONFIG_SPI_FLASH_W25QXXDV_DRV_NAME, spi_flash_init,\n \t &spi_flash_memory_data, NULL, SECONDARY,\n"} {"commit":"1c06788580fb249332d40d53c3d0060fc7b5a8fb","subject":"Add pthread header to chan.h","message":"Add pthread header to chan.h\n","repos":"1514louluo\/chan,tempbottle\/chan,tylertreat\/chan,tylertreat\/chan,grafov\/chan,grafov\/chan,1514louluo\/chan,tempbottle\/chan,tempbottle\/chan,tylertreat\/chan,grafov\/chan,1514louluo\/chan","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- chan\/chan.h\n+++ chan\/chan.h\n@@ -1,6 +1,7 @@\n #ifndef chan_h\n #define chan_h\n \n+#include <pthread.h>\n #include \"queue.h\"\n \n \n"} {"commit":"aaa7d2e71a14fde28a6b99de14954bb85fba4b22","subject":"su_pthread_port.c: Open C mods","message":"su_pthread_port.c: Open C mods\n\ndarcs-hash:20070628121819-1b897-1558b87a7cf4871bce48d05ea3ab89882010ee5d.gz\n","repos":"xhook\/sofia-sip,xhook\/sofia-sip,jart\/sofia-sip,BelledonneCommunications\/sofia-sip,BelledonneCommunications\/sofia-sip,erdincay\/sofia-sip,unispeech\/sofia-sip,xhook\/sofia-sip,jart\/sofia-sip,BelledonneCommunications\/sofia-sip,xhook\/sofia-sip,xhook\/sofia-sip,erdincay\/sofia-sip,erdincay\/sofia-sip,jart\/sofia-sip,BelledonneCommunications\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,unispeech\/sofia-sip,unispeech\/sofia-sip","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsofia-sip-ua\/su\/su_pthread_port.c\n+++ libsofia-sip-ua\/su\/su_pthread_port.c\n@@ -459,8 +459,10 @@\n struct su_pthread_port_execute frame = {\n { PTHREAD_MUTEX_INITIALIZER },\n { _ENeedsNormalInit, NULL },\n- function, arg, 0\n+ NULL, NULL, 0\n };\n+ frame.function = function;\n+ frame.arg = arg;\n #else\n struct su_pthread_port_execute frame = {\n { PTHREAD_MUTEX_INITIALIZER },\n"} {"commit":"d26abe45f244594251c32c235ca090dff4a3829f","subject":"fw_fcp: optimization to use hinawa_fw_req_transaction()","message":"fw_fcp: optimization to use hinawa_fw_req_transaction()\n","repos":"takaswie\/libhinawa,takaswie\/libhinawa","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/fw_fcp.c\n+++ src\/fw_fcp.c\n@@ -207,9 +207,12 @@\n \tpriv->transactions = g_list_prepend(priv->transactions, &trans);\n \tg_mutex_unlock(&priv->transactions_mutex);\n \n-\t\/* Send this request frame. *\/\n-\thinawa_fw_req_write(req, priv->unit, FCP_REQUEST_ADDR, trans.req_frame,\n-\t\t\t exception);\n+\t\/\/ Send this request frame.\n+\thinawa_fw_req_transaction(req, priv->unit,\n+\t\t\tHINAWA_FW_TCODE_WRITE_BLOCK_REQUEST,\n+\t\t\tFCP_REQUEST_ADDR, trans.req_frame->len,\n+\t\t\t&(trans.req_frame->data), &(trans.req_frame->len),\n+\t\t\texception);\n \tif (*exception)\n \t\tgoto end;\n deferred:\n"} {"commit":"6cf02f12cc0f10964210a7d1bbdd5a6827ae602d","subject":"[ From Dave Tweten ]","message":"[ From Dave Tweten ]\n\nPOSIX.2 looks pretty unequivocal to me, and it agrees with you.\n\nUnder the explanation of the \"-p\" option, it says, \"Each dir operand that\nnames an existing directory shall be ignored without error.\" Under the\nexplanation of exit status zero, it says, \"All the specified directories were\ncreated successfully, or the-p option was specified and all the specified\ndirectories now exist.\"\n\nSeems to me POSIX requires exactly the behavior you want.\n\n[ And I've made the change, which is also now compatible with 1.x - jkh ]\n\nReviewed by:\tjkh\nSubmitted by:\tjkh\/tweten\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- bin\/mkdir\/mkdir.c\n+++ bin\/mkdir\/mkdir.c\n@@ -104,8 +104,10 @@\n \t\t}\n \t\tif (mkdir(*argv, oct ?\n \t\t omode : getmode(set, S_IRWXU | S_IRWXG | S_IRWXO)) < 0) {\n-\t\t\twarn(\"%s\", *argv);\n-\t\t\texitval = 1;\n+\t\t\tif (!pflag) {\n+\t\t\t\twarn(\"%s\", *argv);\n+\t\t\t\texitval = 1;\n+\t\t\t}\n \t\t}\n \t}\n \texit(exitval);\n"} {"commit":"30adf0518168ded9c7f519a7c772cab728852b1f","subject":"i965: fix response length param in brw_dp_READ_4()","message":"i965: fix response length param in brw_dp_READ_4()\n\nWe were accidentally clobbering the next register.\n","repos":"wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/i965\/brw_eu_emit.c\n+++ src\/mesa\/drivers\/dri\/i965\/brw_eu_emit.c\n@@ -994,7 +994,7 @@\n \t\t\t BRW_DATAPORT_READ_MESSAGE_OWORD_BLOCK_READ, \/* msg_type *\/\n \t\t\t 0, \/* source cache = data cache *\/\n \t\t\t 1, \/* msg_length *\/\n-\t\t\t 2, \/* response_length *\/\n+\t\t\t 1, \/* response_length (1 Oword) *\/\n \t\t\t 0); \/* eot *\/\n }\n }\n"} {"commit":"f42a9772c1e83440432075847f4a37fba7d6f8cf","subject":"Added a missing UTF-8 conversion in the command line client.","message":"Added a missing UTF-8 conversion in the command line client.\n\nPatch by: Marcus Comstedt <marcus@mc.pp.se>\n\n* subversion\/clients\/cmdline\/info-cmd.c\n (svn_cl__info): convert \"target\" to native character encoding\n before printing it.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@843066 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/clients\/cmdline\/info-cmd.c\n+++ subversion\/clients\/cmdline\/info-cmd.c\n@@ -250,7 +250,12 @@\n if (! entry)\n {\n \/* Print non-versioned message and extra newline separator. *\/\n- printf (\"%s: (Not a versioned resource)\\n\\n\", target);\n+\n+ const char *native;\n+ \/* Get a non-UTF8 version of the target. *\/\n+ SVN_ERR (svn_utf_cstring_from_utf8 (&native, target, pool));\n+\n+ printf (\"%s: (Not a versioned resource)\\n\\n\", native);\n continue;\n }\n \n"} {"commit":"8cc7428f5d52c31ab62a9ace436e42ff8a57ebab","subject":"[probes] probe_obj_eval: fixed invalid usage of SEXP_vfree","message":"[probes] probe_obj_eval: fixed invalid usage of SEXP_vfree\n","repos":"jan-cerny\/openscap,mpreisler\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,ybznek\/openscap,mpreisler\/openscap,mpreisler\/openscap,ybznek\/openscap,Hexadorsimal\/openscap,redhatrises\/openscap,jan-cerny\/openscap,ybznek\/openscap,jan-cerny\/openscap,ybznek\/openscap,postfix\/openscap,openprivacy\/openscap,isimluk\/openscap,isimluk\/openscap,mpreisler\/openscap,postfix\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,redhatrises\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,openprivacy\/openscap,isimluk\/openscap,isimluk\/openscap,postfix\/openscap,isimluk\/openscap,openprivacy\/openscap,Hexadorsimal\/openscap,postfix\/openscap,postfix\/openscap,redhatrises\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,Hexadorsimal\/openscap,postfix\/openscap,isimluk\/openscap,ybznek\/openscap,redhatrises\/openscap,Hexadorsimal\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,openprivacy\/openscap,openprivacy\/openscap,ybznek\/openscap,mpreisler\/openscap,openprivacy\/openscap,redhatrises\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/OVAL\/probes\/probe-main.c\n+++ src\/OVAL\/probes\/probe-main.c\n@@ -157,7 +157,7 @@\n \n \tres_flag = (oval_syschar_collection_flag_t)SEXP_number_getu(ret);\n \n-\tSEXP_vfree(res, rid, ret);\n+\tSEXP_vfree(res, rid, ret, NULL);\n \n \tif (res_flag != SYSCHAR_FLAG_COMPLETE) {\n \t\tSEXP_t *item, *cobj, *item_list, *r0, *attr;\n"} {"commit":"ab6126f4f4cbe7a2656612bd8dd986b7013b3379","subject":"Remove an incorrect FIXME from TextField code","message":"Remove an incorrect FIXME from TextField code\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,mltframework\/swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libswfdec\/swfdec_text_field_movie.c\n+++ libswfdec\/swfdec_text_field_movie.c\n@@ -156,7 +156,7 @@\n attr_italic->start_index = 0;\n \n attr_letter_spacing = pango_attr_letter_spacing_new (\n- format->letter_spacing * 20 * PANGO_SCALE); \/\/ FIXME: correct scaling?\n+ format->letter_spacing * 20 * PANGO_SCALE);\n attr_letter_spacing->start_index = 0;\n \n attr_size =\n"} {"commit":"778132d54c7216a3c743427e55e19646df8f67ea","subject":"gmountoperation: Add missing documentation","message":"gmountoperation: Add missing documentation\n\ngtk-doc is unhappy that skeleton documentation comments had been written\nfor these functions (for the introspection annotations) but that the\ndocumentation content was actually missing.\n\nAdd that content. I like a happy gtk-doc.\n\nSigned-off-by: Philip Withnall <29c2a2ac2a854b9cf047275aa9de346d096be2e0@endlessm.com>\n","repos":"endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/gmountoperation.h\n+++ gio\/gmountoperation.h\n@@ -66,9 +66,12 @@\n \n \/**\n * GMountOperationClass::ask_question:\n- * @op:\n- * @message:\n- * @choices: (array zero-terminated=1) (element-type utf8):\n+ * @op: a #GMountOperation\n+ * @message: string containing a message to display to the user\n+ * @choices: (array zero-terminated=1) (element-type utf8): an array of\n+ * strings for each possible choice\n+ *\n+ * Virtual implementation of #GMountOperation::ask-question.\n *\/\n void (* ask_question) (GMountOperation *op,\n \t\t\t const char *message,\n@@ -81,10 +84,14 @@\n \n \/**\n * GMountOperationClass::show_processes:\n- * @op:\n- * @message:\n- * @processes: (element-type GPid):\n- * @choices: (array zero-terminated=1) (element-type utf8):\n+ * @op: a #GMountOperation\n+ * @message: string containing a message to display to the user\n+ * @processes: (element-type GPid): an array of #GPid for processes blocking\n+ * the operation\n+ * @choices: (array zero-terminated=1) (element-type utf8): an array of\n+ * strings for each possible choice\n+ *\n+ * Virtual implementation of #GMountOperation::show-processes.\n *\n * Since: 2.22\n *\/\n"} {"commit":"a51d01f067b34b138deae6ff86276e807c606876","subject":"drm\/msm: match wait_for_completion_timeout return type","message":"drm\/msm: match wait_for_completion_timeout return type\n\nreturn type of wait_for_completion_timeout is unsigned long not int, this\npatch assigns the return value of wait_for_completion_timeout to an\nappropriately typed and named variable.\n\nSigned-off-by: Nicholas Mc Guire <1f1947151fff46847c7ab253c8b8ee2fc7e63b14@osadl.org>\nSigned-off-by: Rob Clark <915c10c999604870200b6defbe633d857c856ca0@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/msm\/edp\/edp_ctrl.c\n+++ drivers\/gpu\/drm\/msm\/edp\/edp_ctrl.c\n@@ -1018,7 +1018,7 @@\n {\n \tstruct edp_ctrl *ctrl = container_of(\n \t\t\t\twork, struct edp_ctrl, off_work);\n-\tint ret;\n+\tunsigned long time_left;\n \n \tmutex_lock(&ctrl->dev_mutex);\n \n@@ -1030,11 +1030,11 @@\n \treinit_completion(&ctrl->idle_comp);\n \tedp_state_ctrl(ctrl, EDP_STATE_CTRL_PUSH_IDLE);\n \n-\tret = wait_for_completion_timeout(&ctrl->idle_comp,\n+\ttime_left = wait_for_completion_timeout(&ctrl->idle_comp,\n \t\t\t\t\t\tmsecs_to_jiffies(500));\n-\tif (ret <= 0)\n-\t\tDBG(\"%s: idle pattern timedout, %d\\n\",\n-\t\t\t\t__func__, ret);\n+\tif (time_left <= 0)\n+\t\tDBG(\"%s: idle pattern timedout, %lu\\n\",\n+\t\t\t\t__func__, time_left);\n \n \tedp_state_ctrl(ctrl, 0);\n \n"} {"commit":"402682f083cf62426fc1878280a6fabb4be14e7d","subject":"libfence: handle EINTR correctly","message":"libfence: handle EINTR correctly\n\n- Handle EINTR correctly\n- String cleanups\n","repos":"stevenraspudic\/resource-agents,asp24\/resource-agents,stevenraspudic\/resource-agents,stevenraspudic\/resource-agents,asp24\/resource-agents,asp24\/resource-agents","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fence\/libfence\/agent.c\n+++ fence\/libfence\/agent.c\n@@ -36,28 +36,27 @@\n \n \n \n-static void display_agent_output(char *agent, int fd)\n-{\n-\tchar msg[512], buf[256];\n-\n-\tmemset(msg, 0, sizeof(msg));\n-\tmemset(buf, 0, sizeof(buf));\n-\n-\twhile (read(fd, buf, sizeof(buf)-1) > 0) {\n-\t\tsnprintf(msg, 256, \"agent \\\"%s\\\" reports: \", agent);\n-\t\tstrcat(msg, buf);\n-\n-\t\t\/* printf(\"%s\\n\", msg); *\/\n-\t\tsyslog(LOG_ERR, \"%s\", msg);\n-\n-\t\tmemset(buf, 0, sizeof(buf));\n-\t\tmemset(msg, 0, sizeof(msg));\n-\t}\n+static void display_agent_output(const char *agent, int fd)\n+{\n+\tchar buf[384];\n+\tint ret;\n+\n+\tdo {\n+\t\tret = read(fd, buf, sizeof(buf) - 1);\n+\t\tif (ret < 0) {\n+\t\t\tif (errno == EINTR)\n+\t\t\t\tcontinue;\n+\t\t\tbreak;\n+\t\t} else if (ret > 0) {\n+\t\t\tbuf[ret] = '\\0';\n+\t\t\tsyslog(LOG_ERR, \"agent \\\"%s\\\" reports: %s\", agent, buf);\n+\t\t}\n+\t} while (ret > 0);\n }\n \n static int run_agent(char *agent, char *args)\n {\n-\tint pid, status, error, len = strlen(args);\n+\tint pid, status, len;\n \tint pr_fd, pw_fd; \/* parent read\/write file descriptors *\/\n \tint cr_fd, cw_fd; \/* child read\/write file descriptors *\/\n \tint fd1[2];\n@@ -65,27 +64,35 @@\n \n \tcr_fd = cw_fd = pr_fd = pw_fd = -1;\n \n+\tif (args == NULL || agent == NULL)\n+\t\tgoto fail;\n+\tlen = strlen(args);\n+\n \tif (pipe(fd1))\n \t\tgoto fail;\n \tpr_fd = fd1[0];\n \tcw_fd = fd1[1];\n \n \tif (pipe(fd2))\n- \t\tgoto fail;\n+ \t\tgoto fail;\n \tcr_fd = fd2[0];\n \tpw_fd = fd2[1];\n \n \tpid = fork();\n \tif (pid < 0)\n- \t\tgoto fail;\n+ \t\tgoto fail;\n \n \tif (pid) {\n \t\t\/* parent *\/\n+\t\tint ret;\n \n \t\tfcntl(pr_fd, F_SETFL, fcntl(pr_fd, F_GETFL, 0) | O_NONBLOCK);\n \n-\t\terror = write(pw_fd, args, len);\n-\t\tif (error != len)\n+\t\tdo {\n+\t\t\tret = write(pw_fd, args, len);\n+\t\t} while (ret < 0 && errno == EINTR);\n+\n+\t\tif (ret != len)\n \t\t\tgoto fail;\n \n \t\tclose(pw_fd);\n"} {"commit":"78551a3f2c9dd53a85386a6234860127e23befd9","subject":"remove unused assignments [RT #45147]","message":"remove unused assignments [RT #45147]\n","repos":"each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bin\/named\/query.c\n+++ bin\/named\/query.c\n@@ -1864,12 +1864,14 @@\n \t\t\t\tif (sigrdataset != NULL &&\n \t\t\t\t dns_rdataset_isassociated(sigrdataset))\n \t\t\t\t\tdns_rdataset_disassociate(sigrdataset);\n-\t\t\t\tresult = ISC_R_NOTFOUND;\n+\t\t\t\t\/* treat as if not found *\/\n \t\t\t} else if (!query_isduplicate(client, fname,\n-\t\t\t\t\t dns_rdatatype_a, &mname)) {\n+\t\t\t\t\t dns_rdatatype_a, &mname))\n+\t\t\t{\n \t\t\t\tif (mname != fname) {\n \t\t\t\t\tif (mname != NULL) {\n-\t\t\t\t\t\tquery_releasename(client, &fname);\n+\t\t\t\t\t\tquery_releasename(client,\n+\t\t\t\t\t\t\t\t &fname);\n \t\t\t\t\t\tfname = mname;\n \t\t\t\t\t} else\n \t\t\t\t\t\tneed_addname = ISC_TRUE;\n@@ -1932,12 +1934,14 @@\n \t\t\t\tif (sigrdataset != NULL &&\n \t\t\t\t dns_rdataset_isassociated(sigrdataset))\n \t\t\t\t\tdns_rdataset_disassociate(sigrdataset);\n-\t\t\t\tresult = ISC_R_NOTFOUND;\n+\t\t\t\t\/* treat as if not found *\/\n \t\t\t} else if (!query_isduplicate(client, fname,\n-\t\t\t\t\t dns_rdatatype_aaaa, &mname)) {\n+\t\t\t\t\t dns_rdatatype_aaaa, &mname))\n+\t\t\t{\n \t\t\t\tif (mname != fname) {\n \t\t\t\t\tif (mname != NULL) {\n-\t\t\t\t\t\tquery_releasename(client, &fname);\n+\t\t\t\t\t\tquery_releasename(client,\n+\t\t\t\t\t\t\t\t &fname);\n \t\t\t\t\t\tfname = mname;\n \t\t\t\t\t} else\n \t\t\t\t\t\tneed_addname = ISC_TRUE;\n"} {"commit":"a81836ee2fe5092d695b717addf8cec91f569777","subject":"i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.","message":"i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.\n\nCorresponds to d225a25e21a24508aea3b877c78beb35502e942d and fixes\npiglit glsl-fs-loop-nested. Bug #25173.\n","repos":"adobe\/glsl2agal,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/i965\/brw_wm_glsl.c\n+++ src\/mesa\/drivers\/dri\/i965\/brw_wm_glsl.c\n@@ -2012,11 +2012,13 @@\n \/* patch all the BREAK\/CONT instructions from last BGNLOOP *\/\n while (inst0 > loop_inst[loop_depth]) {\n inst0--;\n- if (inst0->header.opcode == BRW_OPCODE_BREAK) {\n+ if (inst0->header.opcode == BRW_OPCODE_BREAK &&\n+\t\t\t inst0->bits3.if_else.jump_count == 0) {\n \t\t\tinst0->bits3.if_else.jump_count = br * (inst1 - inst0 + 1);\n \t\t\tinst0->bits3.if_else.pop_count = 0;\n }\n- else if (inst0->header.opcode == BRW_OPCODE_CONTINUE) {\n+ else if (inst0->header.opcode == BRW_OPCODE_CONTINUE &&\n+\t\t\t inst0->bits3.if_else.jump_count == 0) {\n inst0->bits3.if_else.jump_count = br * (inst1 - inst0);\n inst0->bits3.if_else.pop_count = 0;\n }\n"} {"commit":"1dc877db5ded4908a3ee017ef211cd3250b16c51","subject":"allow or disallow overriding options","message":"allow or disallow overriding options\n","repos":"m0ppers\/arangodb,fceller\/arangodb,joerg84\/arangodb,m0ppers\/arangodb,hkernbach\/arangodb,baslr\/ArangoDB,wiltonlazary\/arangodb,baslr\/ArangoDB,m0ppers\/arangodb,fceller\/arangodb,graetzer\/arangodb,Simran-B\/arangodb,baslr\/ArangoDB,joerg84\/arangodb,Simran-B\/arangodb,baslr\/ArangoDB,m0ppers\/arangodb,fceller\/arangodb,joerg84\/arangodb,hkernbach\/arangodb,m0ppers\/arangodb,joerg84\/arangodb,joerg84\/arangodb,baslr\/ArangoDB,graetzer\/arangodb,joerg84\/arangodb,Simran-B\/arangodb,fceller\/arangodb,joerg84\/arangodb,Simran-B\/arangodb,joerg84\/arangodb,baslr\/ArangoDB,Simran-B\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,fceller\/arangodb,hkernbach\/arangodb,joerg84\/arangodb,joerg84\/arangodb,graetzer\/arangodb,joerg84\/arangodb,hkernbach\/arangodb,fceller\/arangodb,wiltonlazary\/arangodb,hkernbach\/arangodb,fceller\/arangodb,wiltonlazary\/arangodb,arangodb\/arangodb,Simran-B\/arangodb,graetzer\/arangodb,hkernbach\/arangodb,hkernbach\/arangodb,Simran-B\/arangodb,fceller\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,hkernbach\/arangodb,graetzer\/arangodb,graetzer\/arangodb,arangodb\/arangodb,fceller\/arangodb,hkernbach\/arangodb,arangodb\/arangodb,graetzer\/arangodb,m0ppers\/arangodb,arangodb\/arangodb,wiltonlazary\/arangodb,baslr\/ArangoDB,baslr\/ArangoDB,graetzer\/arangodb,graetzer\/arangodb,m0ppers\/arangodb,arangodb\/arangodb,graetzer\/arangodb,baslr\/ArangoDB,Simran-B\/arangodb,hkernbach\/arangodb,fceller\/arangodb,wiltonlazary\/arangodb,graetzer\/arangodb,wiltonlazary\/arangodb,m0ppers\/arangodb,graetzer\/arangodb,hkernbach\/arangodb,wiltonlazary\/arangodb,baslr\/ArangoDB,hkernbach\/arangodb,Simran-B\/arangodb,Simran-B\/arangodb,wiltonlazary\/arangodb,hkernbach\/arangodb,m0ppers\/arangodb,arangodb\/arangodb,m0ppers\/arangodb,joerg84\/arangodb,graetzer\/arangodb,baslr\/ArangoDB,joerg84\/arangodb,joerg84\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,graetzer\/arangodb,arangodb\/arangodb,hkernbach\/arangodb,arangodb\/arangodb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/ProgramOptions2\/ProgramOptions.h\n+++ lib\/ProgramOptions2\/ProgramOptions.h\n@@ -105,8 +105,14 @@\n ProcessingResult& processingResult() { return _processingResult; }\n \n \/\/ seal the options\n- \/\/ tryin to add an option or a section after sealing will throw an error\n+ \/\/ trying to add an option or a section after sealing will throw an error\n void seal() { _sealed = true; }\n+\n+ \/\/ allow or disallow overriding already set options\n+ bool allowOverride(bool value) {\n+ checkIfSealed();\n+ _overrideOptions = value;\n+ }\n \n \/\/ set context for error reporting\n void setContext(std::string const& value) { _context = value; }\n@@ -260,6 +266,11 @@\n \n \/\/ sets a value for an option\n bool setValue(std::string const& name, std::string const& value) {\n+ if (!_overrideOptions && _processingResult.touched(name)) {\n+ \/\/ option already set. don't override it\n+ return true;\n+ } \n+\n auto parts = Option::splitName(name);\n auto it = _sections.find(parts.first);\n \n@@ -463,6 +474,8 @@\n ProcessingResult _processingResult;\n \/\/ whether or not the program options setup is still mutable\n bool _sealed;\n+ \/\/ allow or disallow overriding already set options\n+ bool _overrideOptions;\n };\n }\n }\n"} {"commit":"f83e7ed3dcaef0a8efb03c1e5507850a08639b9f","subject":"Update docstring to warn about gotchas.","message":"Update docstring to warn about gotchas.\n\n* subversion\/include\/private\/svn_skel.h:\n (svn_skel_append): add hints\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@937554 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/include\/private\/svn_skel.h\n+++ subversion\/include\/private\/svn_skel.h\n@@ -141,7 +141,10 @@\n void svn_skel__prepend(svn_skel_t *skel, svn_skel_t *list);\n \n \n-\/* Append SKEL to LIST. *\/\n+\/* Append SKEL to LIST. Note: this must traverse the LIST, so you\n+ generally want to use svn_skel__prepend().\n+\n+ NOTE: careful of the argument order here. *\/\n void svn_skel__append(svn_skel_t *list, const svn_skel_t *skel);\n \n \n"} {"commit":"3f591aabc8984521fe3724e10d90c3eaba07e48a","subject":"expose xel to Python","message":"expose xel to Python\n","repos":"mgracer48\/panda3d,Wilee999\/panda3d,jjkoletar\/panda3d,matthiascy\/panda3d,Wilee999\/panda3d,mgracer48\/panda3d,jjkoletar\/panda3d,mgracer48\/panda3d,Wilee999\/panda3d,cc272309126\/panda3d,jjkoletar\/panda3d,hj3938\/panda3d,jjkoletar\/panda3d,ee08b397\/panda3d,chandler14362\/panda3d,Wilee999\/panda3d,hj3938\/panda3d,grimfang\/panda3d,mgracer48\/panda3d,hj3938\/panda3d,ee08b397\/panda3d,cc272309126\/panda3d,matthiascy\/panda3d,mgracer48\/panda3d,brakhane\/panda3d,mgracer48\/panda3d,ee08b397\/panda3d,cc272309126\/panda3d,grimfang\/panda3d,brakhane\/panda3d,matthiascy\/panda3d,cc272309126\/panda3d,tobspr\/panda3d,Wilee999\/panda3d,chandler14362\/panda3d,ee08b397\/panda3d,tobspr\/panda3d,grimfang\/panda3d,matthiascy\/panda3d,hj3938\/panda3d,mgracer48\/panda3d,jjkoletar\/panda3d,grimfang\/panda3d,jjkoletar\/panda3d,ee08b397\/panda3d,chandler14362\/panda3d,tobspr\/panda3d,ee08b397\/panda3d,Wilee999\/panda3d,mgracer48\/panda3d,hj3938\/panda3d,cc272309126\/panda3d,matthiascy\/panda3d,brakhane\/panda3d,grimfang\/panda3d,ee08b397\/panda3d,chandler14362\/panda3d,tobspr\/panda3d,grimfang\/panda3d,brakhane\/panda3d,tobspr\/panda3d,grimfang\/panda3d,matthiascy\/panda3d,cc272309126\/panda3d,matthiascy\/panda3d,grimfang\/panda3d,brakhane\/panda3d,jjkoletar\/panda3d,chandler14362\/panda3d,brakhane\/panda3d,brakhane\/panda3d,chandler14362\/panda3d,tobspr\/panda3d,jjkoletar\/panda3d,matthiascy\/panda3d,tobspr\/panda3d,chandler14362\/panda3d,cc272309126\/panda3d,cc272309126\/panda3d,hj3938\/panda3d,brakhane\/panda3d,chandler14362\/panda3d,grimfang\/panda3d,Wilee999\/panda3d,cc272309126\/panda3d,ee08b397\/panda3d,grimfang\/panda3d,tobspr\/panda3d,hj3938\/panda3d,chandler14362\/panda3d,brakhane\/panda3d,mgracer48\/panda3d,hj3938\/panda3d,ee08b397\/panda3d,tobspr\/panda3d,Wilee999\/panda3d,tobspr\/panda3d,chandler14362\/panda3d,jjkoletar\/panda3d,matthiascy\/panda3d,Wilee999\/panda3d,hj3938\/panda3d","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- panda\/src\/pnmimage\/pnmimage_base.h\n+++ panda\/src\/pnmimage\/pnmimage_base.h\n@@ -19,8 +19,7 @@\n \/\/ essential to everything in the PNMImage package.\n \n #include \"pandabase.h\"\n-\n-#include <string>\n+#include \"pnotify.h\"\n \n \/\/ Since we no longer include pnm.h directly, we have to provide our\n \/\/ own definitions for xel and xelval.\n@@ -41,6 +40,16 @@\n #define PNM_MAXMAXVAL PGM_MAXMAXVAL\n \n struct pixel {\n+PUBLISHED:\n+ pixel() { }\n+ pixel(gray r, gray g, gray b) : r(r), g(g), b(b) { }\n+ static int size() { return 3; }\n+ gray operator [](int i) const { nassertr(i >= 0 && i < 3, 0); return *(&r + i); }\n+ gray &operator [](int i) { nassertr(i >= 0 && i < 3, r); return *(&r + i); }\n+#ifdef HAVE_PYTHON\n+ void __setitem__(int i, gray v) { operator[](i) = v; }\n+#endif\n+\n gray r, g, b;\n };\n \n"} {"commit":"9cb109df3e807db660926d31135163237b0570cf","subject":"win 16 decompiler: read entry table and add as labels to decompiled output.","message":"win 16 decompiler: read entry table and add as labels to decompiled\noutput.\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tool\/decompil\/wnedasm.c\n+++ tool\/decompil\/wnedasm.c\n@@ -487,6 +487,50 @@\n }\n }\n \n+ if (ne_entry_table.table != NULL && ne_entry_table.length != 0) {\n+ const struct exe_ne_header_entry_table_entry *ent;\n+ unsigned char *rawd;\n+ unsigned int i;\n+\n+ for (i=0;i < ne_entry_table.length;i++) { \/* NTS: ordinal value is i + 1, ordinals are 1-based *\/\n+ ent = ne_entry_table.table + i;\n+ rawd = exe_ne_header_entry_table_table_raw_entry(&ne_entry_table,ent);\n+ if (rawd == NULL) continue;\n+ if (ent->segment_id == 0x00) continue;\n+\n+ if (ent->segment_id == 0xFF) {\n+ \/* NTS: raw_entry() function guarantees that the data available is large enough to hold this struct *\/\n+ struct exe_ne_header_entry_table_movable_segment_entry *ment =\n+ (struct exe_ne_header_entry_table_movable_segment_entry*)rawd;\n+\n+ sprintf((char*)dec_buffer,\"Entry ordinal #%u\",i + 1);\n+ if ((label=dec_label_malloc()) != NULL) {\n+ dec_label_set_name(label,(char*)dec_buffer);\n+ label->seg_v =\n+ ment->segid;\n+ label->ofs_v =\n+ ment->seg_offs;\n+ }\n+ }\n+ else if (ent->segment_id == 0xFE) {\n+ }\n+ else {\n+ \/* NTS: raw_entry() function guarantees that the data available is large enough to hold this struct *\/\n+ struct exe_ne_header_entry_table_fixed_segment_entry *fent =\n+ (struct exe_ne_header_entry_table_fixed_segment_entry*)rawd;\n+\n+ sprintf((char*)dec_buffer,\"Entry ordinal #%u\",i + 1);\n+ if ((label=dec_label_malloc()) != NULL) {\n+ dec_label_set_name(label,(char*)dec_buffer);\n+ label->seg_v =\n+ ent->segment_id;\n+ label->ofs_v =\n+ fent->v.seg_offs;\n+ }\n+ }\n+ }\n+ }\n+\n \/\/ TODO first pass\n \n \/* sort labels *\/\n"} {"commit":"6aa0fe745c0a85860c76e64566e8ee63f599bf35","subject":"implement env FLON_LOG_UTC or FGAJ_UTC","message":"implement env FLON_LOG_UTC or FGAJ_UTC\n\nwhen true or 1, time is UTC\n","repos":"flon-io\/gajeta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gajeta.c\n+++ src\/gajeta.c\n@@ -41,7 +41,40 @@\n \n fgaj_logger *fgaj__logger = NULL;\n char fgaj__level = 10;\n+short fgaj__utc = 0;\n+\n void *fgaj__params = NULL;\n+\n+static void fgaj_init()\n+{\n+ if (fgaj__logger != NULL) return;\n+\n+ char *s = NULL;\n+\n+ \/\/ utc or not ?\n+\n+ s = getenv(\"FLON_LOG_UTC\");\n+ if (s == NULL) s = getenv(\"FGAJ_UTC\");\n+ fgaj__utc = (s != NULL && (s[0] == '1' || tolower(s[0]) == 't'));\n+\n+ \/\/ determine level\n+\n+ fgaj__level = 10;\n+\n+ s = getenv(\"FLON_LOG_LEVEL\");\n+ if (s == NULL) s = getenv(\"FGAJ_LEVEL\");\n+\n+ if (s != NULL)\n+ {\n+ if (s[0] > '0' && s[1] < '9') fgaj__level = atoi(s);\n+ else fgaj__level = fgaj_normalize_level(s[0]);\n+ }\n+ \/\/printf(\"level: %i\\n\", fgaj__level);\n+\n+ \/\/ determine logger\n+\n+ fgaj__logger = fgaj_color_stdout_logger;\n+}\n \n \/\/\n \/\/ misc functions\n@@ -109,10 +142,14 @@\n \n char *fgaj_now()\n {\n+ fgaj_init();\n+\n struct timeval tv;\n struct tm *tm;\n+\n gettimeofday(&tv, NULL);\n- tm = localtime(&tv.tv_sec);\n+ tm = fgaj__utc ? gmtime(&tv.tv_sec) : localtime(&tv.tv_sec);\n+\n char *s = calloc(33, sizeof(char));\n strftime(s, 33, \"%F %T.000000 %z\", tm);\n snprintf(s + 20, 7, \"%06ld\", tv.tv_usec);\n@@ -155,29 +192,6 @@\n \/\/\n \/\/ logging functions\n \n-void fgaj_init()\n-{\n- if (fgaj__logger != NULL) return;\n-\n- \/\/ determine level\n-\n- fgaj__level = 10;\n-\n- char *l = getenv(\"FLON_LOG_LEVEL\");\n- if (l == NULL) l = getenv(\"FGAJ_LEVEL\");\n- \/\/\n- if (l != NULL)\n- {\n- if (l[0] > '0' && l[1] < '9') fgaj__level = atoi(l);\n- else fgaj__level = fgaj_normalize_level(l[0]);\n- }\n- \/\/printf(\"level: %i\\n\", fgaj__level);\n-\n- \/\/ determine logger\n-\n- fgaj__logger = fgaj_color_stdout_logger;\n-}\n-\n static void fgaj_do_log(\n char level, const char *pref, const char *format, va_list ap)\n {\n"} {"commit":"c944b2abb067130542055666f23409fd5e1afc8e","subject":"drm\/radeon: remove overzealous warning in hdmi handling","message":"drm\/radeon: remove overzealous warning in hdmi handling\n\nhdmi audio works fine. The warning just confuses users.\n\nfixes:\nhttps:\/\/bugzilla.kernel.org\/show_bug.cgi?id=44341\n\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\nReviewed-by: Jerome Glisse <0620d428a1bd3756b1319066bf466b3b8be0b2b2@redhat.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/r600_hdmi.c\n+++ drivers\/gpu\/drm\/radeon\/r600_hdmi.c\n@@ -544,7 +544,6 @@\n \n \t\/* Called for ATOM_ENCODER_MODE_HDMI only *\/\n \tif (!dig || !dig->afmt) {\n-\t\tWARN_ON(1);\n \t\treturn;\n \t}\n \tif (!dig->afmt->enabled)\n"} {"commit":"16273af0cbbbae652f1ebd9ffbe51d4faec01b0f","subject":"'delete' functions that are not implemented","message":"'delete' functions that are not implemented\n","repos":"satyarth934\/root,buuck\/root,BerserkerTroll\/root,zzxuanyuan\/root-compressor-dummy,abhinavmoudgil95\/root,simonpf\/root,karies\/root,mhuwiler\/rootauto,root-mirror\/root,bbockelm\/root,olifre\/root,gganis\/root,BerserkerTroll\/root,davidlt\/root,abhinavmoudgil95\/root,satyarth934\/root,mhuwiler\/rootauto,root-mirror\/root,zzxuanyuan\/root,bbockelm\/root,zzxuanyuan\/root,karies\/root,zzxuanyuan\/root,simonpf\/root,zzxuanyuan\/root,simonpf\/root,mhuwiler\/rootauto,simonpf\/root,abhinavmoudgil95\/root,buuck\/root,olifre\/root,bbockelm\/root,satyarth934\/root,mhuwiler\/rootauto,zzxuanyuan\/root-compressor-dummy,olifre\/root,karies\/root,agarciamontoro\/root,olifre\/root,agarciamontoro\/root,olifre\/root,olifre\/root,karies\/root,mhuwiler\/rootauto,davidlt\/root,abhinavmoudgil95\/root,bbockelm\/root,zzxuanyuan\/root,BerserkerTroll\/root,abhinavmoudgil95\/root,abhinavmoudgil95\/root,simonpf\/root,beniz\/root,BerserkerTroll\/root,gganis\/root,beniz\/root,gganis\/root,agarciamontoro\/root,mhuwiler\/rootauto,buuck\/root,buuck\/root,gganis\/root,gganis\/root,olifre\/root,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root-compressor-dummy,satyarth934\/root,BerserkerTroll\/root,karies\/root,buuck\/root,mhuwiler\/rootauto,mhuwiler\/rootauto,beniz\/root,root-mirror\/root,BerserkerTroll\/root,olifre\/root,olifre\/root,satyarth934\/root,satyarth934\/root,bbockelm\/root,zzxuanyuan\/root-compressor-dummy,BerserkerTroll\/root,agarciamontoro\/root,davidlt\/root,gganis\/root,davidlt\/root,simonpf\/root,satyarth934\/root,root-mirror\/root,buuck\/root,beniz\/root,davidlt\/root,buuck\/root,root-mirror\/root,agarciamontoro\/root,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root,root-mirror\/root,satyarth934\/root,davidlt\/root,gganis\/root,gganis\/root,bbockelm\/root,root-mirror\/root,karies\/root,mhuwiler\/rootauto,gganis\/root,bbockelm\/root,zzxuanyuan\/root-compressor-dummy,beniz\/root,root-mirror\/root,davidlt\/root,zzxuanyuan\/root-compressor-dummy,buuck\/root,abhinavmoudgil95\/root,satyarth934\/root,abhinavmoudgil95\/root,abhinavmoudgil95\/root,agarciamontoro\/root,simonpf\/root,agarciamontoro\/root,zzxuanyuan\/root,buuck\/root,davidlt\/root,olifre\/root,root-mirror\/root,BerserkerTroll\/root,root-mirror\/root,buuck\/root,beniz\/root,bbockelm\/root,beniz\/root,beniz\/root,karies\/root,simonpf\/root,simonpf\/root,zzxuanyuan\/root-compressor-dummy,gganis\/root,zzxuanyuan\/root-compressor-dummy,beniz\/root,zzxuanyuan\/root,abhinavmoudgil95\/root,bbockelm\/root,mhuwiler\/rootauto,bbockelm\/root,satyarth934\/root,bbockelm\/root,beniz\/root,olifre\/root,simonpf\/root,BerserkerTroll\/root,zzxuanyuan\/root,zzxuanyuan\/root-compressor-dummy,satyarth934\/root,karies\/root,agarciamontoro\/root,zzxuanyuan\/root,BerserkerTroll\/root,agarciamontoro\/root,agarciamontoro\/root,simonpf\/root,karies\/root,karies\/root,buuck\/root,beniz\/root,mhuwiler\/rootauto,karies\/root,BerserkerTroll\/root,zzxuanyuan\/root,davidlt\/root,gganis\/root,zzxuanyuan\/root,davidlt\/root,root-mirror\/root,abhinavmoudgil95\/root,agarciamontoro\/root,davidlt\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tree\/tree\/inc\/TBranch.h\n+++ tree\/tree\/inc\/TBranch.h\n@@ -133,8 +133,8 @@\n private:\n Int_t FillEntryBuffer(TBasket* basket,TBuffer* buf, Int_t& lnew);\n Int_t WriteBasketImpl(TBasket* basket, Int_t where, ROOT::Internal::TBranchIMTHelper *);\n- TBranch(const TBranch&); \/\/ not implemented\n- TBranch& operator=(const TBranch&); \/\/ not implemented\n+ TBranch(const TBranch&) = delete; \/\/ not implemented\n+ TBranch& operator=(const TBranch&) = delete; \/\/ not implemented\n \n public:\n TBranch();\n"} {"commit":"79eb9803e4d1b86060bbfd13f8dd42f9b57ae8ba","subject":"add suppport for detecting 2 v4l cards","message":"add suppport for detecting 2 v4l cards\n\ngit-svn-id: 8f60b0cb95795e7f2da4f2192af0e1f6ffac8291@52 3f6dc0c8-ddfe-455d-9043-3cd528dc4637\n","repos":"avis\/ortp,wugh7125\/ortp,jiangjianping\/ortp,samueljero\/linphone-oRTP,carpikes\/ortp,VTCSecureLLC\/ortp,caizw\/ortp,Linphone-sync\/oRTP,samueljero\/linphone-oRTP,dozeo\/ortp,wugh7125\/ortp,samueljero\/linphone-oRTP,dmonakhov\/ortp,dozeo\/ortp,VTCSecureLLC\/ortp,carpikes\/ortp,Linphone-sync\/oRTP,jiangjianping\/ortp,dmonakhov\/ortp,caizw\/ortp,Distrotech\/oRTP,Distrotech\/oRTP,dozeo\/ortp,wugh7125\/ortp,videomedicine\/oRTP,caizw\/ortp,VTCSecureLLC\/ortp,Distrotech\/oRTP,avis\/ortp,jiangjianping\/ortp,Linphone-sync\/oRTP,avis\/ortp,videomedicine\/oRTP,carpikes\/ortp,dmonakhov\/ortp,videomedicine\/oRTP","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- linphone\/mediastreamer2\/src\/msv4l.c\n+++ linphone\/mediastreamer2\/src\/msv4l.c\n@@ -992,6 +992,13 @@\n \t{\t0\t,\tNULL\t\t\t}\n };\n \n+static int v4l_set_devfile(MSFilter *f, void *arg){\n+\tV4lState *s=(V4lState*)f->data;\n+\tif (s->dev) ms_free(s->dev);\n+\ts->dev=ms_strdup((char*)arg);\n+\treturn 0;\n+}\n+\n MSFilterDesc ms_v4l_desc={\n \t.id=MS_V4L_ID,\n \t.name=\"MSV4l\",\n@@ -1012,6 +1019,7 @@\n static MSFilter *v4l_create_reader(MSWebCam *obj){\n \tMSFilter *f=ms_filter_new_from_desc(&ms_v4l_desc);\n \tV4lState *s=(V4lState*)f->data;\n+\tv4l_set_devfile(f,obj->name);\n \ts->force_v1=TRUE;\n \treturn f;\n }\n@@ -1043,6 +1051,17 @@\n \t\t}\n \t\tclose(fd);\n \t}\n+\tdevname=\"\/dev\/video1\";\n+\tfd=open(devname,O_RDWR);\n+\tif (fd!=-1){\n+\t\tif (ioctl (fd, VIDIOCGCAP, &cap)==0) {\n+\t\t\t\/* is a V4Lv1 *\/\n+\t\t\tMSWebCam *cam=ms_web_cam_new(&v4l_desc);\n+\t\t\tcam->name=ms_strdup(devname);\n+\t\t\tms_web_cam_manager_add_cam(obj,cam);\n+\t\t}\n+\t\tclose(fd);\n+\t}\n }\n \n \n"} {"commit":"90ecb9d69b3b95fc5b357914ae98121961b7591e","subject":"ustring: Replace 8\u00d7format() with 1 variadic template","message":"ustring: Replace 8\u00d7format() with 1 variadic template\n\nas per the previous commit for Glib::ustring.\n\nNow, users can pass format() as many arguments as their compiler or\nstack will allow, rather than being limited to a maximum of 8.\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=784211\n","repos":"GNOME\/glibmm,GNOME\/glibmm,GNOME\/glibmm,GNOME\/glibmm,GNOME\/glibmm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib\/glibmm\/ustring.h\n+++ glib\/glibmm\/ustring.h\n@@ -675,91 +675,45 @@\n template <class... Ts>\n static inline ustring compose(const ustring& fmt, const Ts&... args);\n \n- \/*! Format the argument to its string representation.\n+ \/*! Format the argument(s) to a string representation.\n+ *\n * Applies the arguments in order to an std::wostringstream and returns the\n * resulting string. I\/O manipulators may also be used as arguments. This\n * greatly simplifies the common task of converting a number to a string, as\n * demonstrated by the example below. The format() methods can also be used\n * in conjunction with compose() to facilitate localization of user-visible\n * messages.\n+ *\n * @code\n * using Glib::ustring;\n * double value = 22.0 \/ 7.0;\n * ustring text = ustring::format(std::fixed, std::setprecision(2), value);\n * @endcode\n+ *\n * @note The use of a wide character stream in the implementation of format()\n * is almost completely transparent. However, one of the instances where the\n * use of wide streams becomes visible is when the std::setfill() stream\n * manipulator is used. In order for std::setfill() to work the argument\n * must be of type <tt>wchar_t<\/tt>. This can be achieved by using the\n * <tt>L<\/tt> prefix with a character literal, as shown in the example.\n+ *\n * @code\n * using Glib::ustring;\n * \/\/ Insert leading zeroes to fill in at least six digits\n * ustring text = ustring::format(std::setfill(L'0'), std::setw(6), 123);\n * @endcode\n *\n- * @param a1 A streamable value or an I\/O manipulator.\n+ * @param args One or more streamable values or I\/O manipulators.\n+ *\n * @return The string representation of the argument stream.\n+ *\n * @throw Glib::ConvertError\n *\n- * @newin{2,16}\n- *\/\n- template <class T1>\n- static inline ustring format(const T1& a1);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2>\n- static inline ustring format(const T1& a1, const T2& a2);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3>\n- static inline ustring format(const T1& a1, const T2& a2, const T3& a3);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3, class T4>\n- static inline ustring format(const T1& a1, const T2& a2, const T3& a3, const T4& a4);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3, class T4, class T5>\n- static inline ustring format(\n- const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3, class T4, class T5, class T6>\n- static inline ustring format(\n- const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>\n- static inline ustring format(const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5,\n- const T6& a6, const T7& a7);\n-\n- \/* See the documentation for format(const T1& a1).\n- *\n- * @newin{2,16}\n- *\/\n- template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>\n- static inline ustring format(const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5,\n- const T6& a6, const T7& a7, const T8& a8);\n+ * @newin{2,56}\n+ *\/\n+ template <class... Ts>\n+ static inline ustring format(const Ts&... args);\n+\n \/\/! @}\n \n private:\n@@ -782,9 +736,15 @@\n template <class T>\n class Stringify;\n \n+ static ustring compose_private(const ustring& fmt, std::initializer_list<const ustring*> ilist);\n+\n class FormatStream;\n \n- static ustring compose_private(const ustring& fmt, std::initializer_list<const ustring*> ilist);\n+ template<class T>\n+ static inline void format_private(FormatStream& buf, const T& arg);\n+\n+ template<class T1, class... Ts>\n+ static inline void format_private(FormatStream& buf, const T1& a1, const Ts&... args);\n \n #endif \/* DOXYGEN_SHOULD_SKIP_THIS *\/\n \n@@ -1099,114 +1059,30 @@\n return string_;\n }\n \n-template <class T1>\n+template <class T>\n+inline \/\/ static\n+ void\n+ ustring::format_private(FormatStream& buf, const T& arg)\n+{\n+ buf.stream(arg);\n+}\n+\n+template <class T1, class... Ts>\n+inline \/\/ static\n+ void\n+ ustring::format_private(FormatStream& buf, const T1& a1, const Ts&... args)\n+{\n+ buf.stream(a1);\n+ return format_private(buf, args...);\n+}\n+\n+template <class... Ts>\n inline \/\/ static\n ustring\n- ustring::format(const T1& a1)\n+ ustring::format(const Ts&... args)\n {\n ustring::FormatStream buf;\n- buf.stream(a1);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2, const T3& a3)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3, class T4>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2, const T3& a3, const T4& a4)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- buf.stream(a4);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3, class T4, class T5>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- buf.stream(a4);\n- buf.stream(a5);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3, class T4, class T5, class T6>\n-inline \/\/ static\n- ustring\n- ustring::format(\n- const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5, const T6& a6)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- buf.stream(a4);\n- buf.stream(a5);\n- buf.stream(a6);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5,\n- const T6& a6, const T7& a7)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- buf.stream(a4);\n- buf.stream(a5);\n- buf.stream(a6);\n- buf.stream(a7);\n- return buf.to_string();\n-}\n-\n-template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>\n-inline \/\/ static\n- ustring\n- ustring::format(const T1& a1, const T2& a2, const T3& a3, const T4& a4, const T5& a5,\n- const T6& a6, const T7& a7, const T8& a8)\n-{\n- ustring::FormatStream buf;\n- buf.stream(a1);\n- buf.stream(a2);\n- buf.stream(a3);\n- buf.stream(a4);\n- buf.stream(a5);\n- buf.stream(a6);\n- buf.stream(a7);\n- buf.stream(a8);\n+ format_private(buf, args...);\n return buf.to_string();\n }\n \n"} {"commit":"d6334ebf915b58990495ba520e42fb6c3772a66d","subject":"Delete chip8core.c","message":"Delete chip8core.c","repos":"sixthextinction\/chip8_c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- chip8core.c\n+++ chip8core.c\n@@ -1,548 +0,0 @@\n-#include <stdio.h>\r\n-#include <stdlib.h>\r\n-#include <string.h>\r\n-#include <math.h>\r\n-\r\n-int drawFlag = 0;\r\n-unsigned char *displayArray;\r\n-\/\/####################################################################################################################################################################\r\n-struct chip8\r\n-{\r\n-\t\/\/4096 memory locations, each 8 bits long\r\n-\t\/\/So, 8 bits allow us to address a byte of data (CHIP8 is an 8 bit computer)\r\n-\t\/\/Might as well use char * for this\r\n-\tunsigned char memory[4096];\r\n-\t\/\/16 8 bit data registers\r\n-\tunsigned char V[16];\r\n-\t\/\/1 16-bit address register\r\n-\tunsigned short I;\r\n-\t\/\/16 levels of stack (4 byte values)\r\n-\tunsigned char stack[16];\r\n-\t\/\/stackPointer\r\n-\tunsigned char stackPointer;\r\n-\t\/\/program counter\r\n-\tunsigned short pc;\r\n-\t\/\/timers\r\n-\tunsigned char delayTimer;\r\n-\tunsigned char soundTimer;\r\n-\t\/\/input, hex keyboard of 16 keys\r\n-\tunsigned char keypad[16];\r\n-\t\/\/display, resolution:64x32, all graphics are 8-bit long sprites. CHIP8 draws in XOR mode.\r\n-\tunsigned char display[64*32];\r\n-};\r\n-\/\/####################################################################################################################################################################\r\n-\/*forward declarations *\/\r\n-struct chip8 *loadProgram\t(char *filePath, struct chip8 *chip8core);\r\n-struct chip8 *cycle\t\t(struct chip8 *chip8core);\r\n-struct chip8 *loadFontSet\t(struct chip8 *chip8core);\r\n-\r\n-\r\n-\/\/####################################################################################################################################################################\r\n-\/* create the chip8 core*\/\r\n-struct chip8 *createChip8()\r\n-{\r\n-\tstruct chip8 *chip8core = malloc(sizeof(struct chip8));\r\n-\t\/* Program counter effectively needs to start at addr 0x200,\r\n-\t* as 0x0 - 0x1FF is reserved for interpreter\/fontset *\/\r\n-\tchip8core->pc = 0x200;\r\n-\tchip8core->stackPointer = 0;\r\n-\treturn chip8core;\r\n-}\r\n-\r\n-\/\/#######################################################################################\r\n-void destroyChip8(struct chip8 *chip8core)\r\n-{\r\n-\tfree(chip8core);\r\n-}\r\n-\/\/####################################################################################################################################################################\r\n-\/* load the fontset into memory starting at 0x50 *\/\r\n-struct chip8 *loadFontSet(struct chip8 *chip8core)\r\n-{\r\n-\tint i;\r\n-\t\/\/fontset :\r\n-\tunsigned char fontSet[80] = {\r\n-\t\t0XF0, 0X90, 0X90, 0X90, 0xF0, \t\/\/0\r\n-\t\t0X20, 0X60, 0X20, 0X20, 0X70,\t\/\/1\r\n-\t\t0XF0, 0X10, 0XF0, 0X80, 0XF0,\t\/\/2\r\n-\t\t0XF0, 0X10, 0XF0, 0X10, 0XF0,\t\/\/3\r\n-\t\t0X90, 0X90, 0XF0, 0X10, 0X10,\t\/\/4\r\n-\t\t0XF0, 0X80, 0XF0, 0X10, 0XF0,\t\/\/5\r\n-\t\t0XF0, 0X80, 0XF0, 0X90, 0XF0,\t\/\/6\r\n-\t\t0XF0, 0X10, 0X20, 0X40, 0X40,\t\/\/7\r\n-\t\t0XF0, 0X90, 0XF0, 0X90, 0XF0,\t\/\/8\r\n-\t\t0XF0, 0X90, 0XF0, 0X10, 0XF0, \t\/\/9\r\n-\t\t0XF0, 0X90, 0XF0, 0X90, 0X90,\t\/\/A\r\n-\t\t0XE0, 0X90, 0XE0, 0X90, 0XE0,\t\/\/B\r\n-\t\t0XF0, 0X80, 0X80, 0X80, 0XF0, \t\/\/C\r\n-\t\t0XE0, 0X90, 0X90, 0X90, 0XE0,\t\/\/D\r\n-\t\t0XF0, 0X80, 0XF0, 0X80, 0XF0,\t\/\/E\r\n-\t\t0XF0, 0X80, 0XF0, 0X80, 0X80 \t\/\/F\r\n-\t};\r\n-\r\n-\tfor(i = 0 ; i < 80; i++) \/\/fontSet.length = 80\r\n-\t{\r\n-\t\t\/* CHIP8's fontset (sprites for characters 0-F, basically) starts at addr 0x50*\/\r\n-\t\tchip8core->memory[0x50 + i] = fontSet[i];\r\n-\t}\r\n-\treturn chip8core;\r\n-}\r\n-\/\/####################################################################################################################################################################\r\n-\/* load ROM into chip8 memory *\/\r\n-struct chip8 *loadProgram(char *filePath, struct chip8 *chip8core)\r\n-{\r\n-\tFILE *fileStream = fopen(filePath, \"r\"); \/\/open file from filepath in binary, read only mode\r\n-\t\/\/char *buffer;\r\n-\tif(!fileStream)\r\n-\t{\r\n-\t\t\/\/Very basic error handling for a failed open\r\n-\t\tprintf(\"Failed to load ROM \\\"%s\\\"\\n\",filePath);\r\n-\t\texit(0);\r\n-\t}\r\n-\r\n-\r\n-\t\/*\r\n-\tfread usage : size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream);\r\n-\r\n-\t\t\t- reads \"nmemb\" elements of data,\r\n-\t\t\t- each \"size\" bytes long\r\n- \t \t- from the stream pointed to by \"stream\",\r\n- \t- storing them in memory beginning at the memaddr given by \"ptr\".\r\n-\t*\/\r\n-\t\/\/Read file in binary mode into Chip8 memory, starting at 0x200\r\n-\tfread((chip8core->memory + 0x200),\r\n-\t\t\/\/We read 1 byte (sizeof unsigned char = 1) at a time...\r\n-\t\tsizeof(unsigned char),\r\n-\t\t\/\/We read (4096 - 0x200) data elements in all. Again, this is because the CHIP8 interpreter has 0x0-0x1ff reserved.\r\n-\t\t(4096 - 0x200),\r\n-\t\t\/\/and we read from the specified stream fileStream.\r\n-\t\tfileStream);\r\n-\r\n-\r\n-\t\/\/Copy buffer over to CHIP8's memory.\r\n-\t\/\/CHIP 8 has memory locations 0x0 - 0x1FF reserved for interpreter and fontset\r\n-\t\/\/Thus, ROM data is stored in memory starting at 0x200.\r\n-\t\/\/if using char *buffer, uncomment this :\r\n-\t\/*for(i = 0 ; i < (int)strlen(buffer) ; i++)\r\n-\t{\r\n-\t\tchip8core->memory[0x200 + i] = buffer[i];\r\n-\t}*\/\r\n-\r\n-\tfree(fileStream);\r\n-\r\n-\treturn chip8core;\r\n-}\r\n-\/\/####################################################################################################################################################################\r\n-\/* a cycle of the emulator *\/\r\n-struct chip8 *cycle(struct chip8 *chip8core)\r\n-{\r\n-\t\/\/sizeof(short) = 2 bytes. So are our opcodes.\r\n-\tunsigned short opcode = (chip8core->memory[chip8core->pc] << 8)|chip8core->memory[chip8core->pc + 1];\r\n-\t\/* register indices, memory addresses, and data, present in opcodes *\/\r\n-\tunsigned int x = (opcode & 0x0f00) >> 8;\r\n-\tunsigned int y;\r\n-\tunsigned int nnn = (opcode & 0xfff);\r\n-\tunsigned int nn = (opcode & 0xff);\r\n-\t\/* standard loop counter *\/\r\n-\tint i;\r\n-\t\/* vars required for opcode 0xCXNN *\/\r\n-\tint rndnum;\r\n-\t\/* vars required for opcode 0xDXYN *\/\r\n-\tint xcoord;\r\n-\tint ycoord;\r\n-\tint n;\r\n-\tint finalX;\r\n-\tint finalY;\r\n-\tint finalIndex = 0;\r\n-\tint xcounter;\r\n-\tint ycounter;\r\n-\tchar pixelData;\r\n-\t\/* vars required for opcode 0xFX33 *\/\r\n-\tint hundreds;\r\n-\tint tens;\r\n-\tint ones;\r\n-\r\n-\t\/*print opcode for easier debugging *\/\r\n-\tprintf(\"0x%X : \", opcode);\/\/format this to a hex\r\n-\t\/\/printf(\"\\nDEBUG:[current PC value : %d]\",chip8core->pc);\r\n-\t\/\/exit(0);\r\n-\r\n-\t\/* switchcase first nibble to find out which kind of opcode it is *\/\r\n-\tswitch (opcode & 0xf000)\r\n-\t{\r\n-\t\tcase 0x0000:\t\t\/\/instructions beginning with a hex 0\r\n-\t\t\t\/*switchcase last two nibbles to find out which *\/\r\n-\t\t\tswitch(opcode & 0xff)\r\n-\t\t\t{\r\n-\t\t\t\tcase 0xE0:\t\/\/00E0 clear screen\r\n-\t\t\t\tprintf(\"CLR\\n\");\r\n-\t\t\t\tfor(i = 0; i < (64*32) ; i++)\r\n-\t\t\t\t{\r\n-\t\t\t\t\tchip8core->display[i] = 0;\r\n-\t\t\t\t}\r\n-\t\t\t\tchip8core->pc+=2;\/\/increment by two, as with each opcode we've seen 2 instructions\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0xee: \/\/return from subroutine\r\n-\t\t\t\tprintf(\"Return from subroutine\\n\");\r\n-\t\t\t\tchip8core->stackPointer--;\r\n-\t\t\t\tchip8core->pc = chip8core->stack[chip8core->stackPointer] + 2;\r\n-\t\t\t\tbreak;\r\n-\t\t\t}\r\n-\r\n-\t\tbreak; \/\/end of case 0x0000\r\n-\r\n-\t\tcase 0x1000:\t\/\/1NNN Jump to address nnn\r\n-\t\tprintf(\"JMP %d\\n\", nnn);\r\n-\t\t\/\/set pc to nnn\r\n-\t\tchip8core->pc = nnn;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x2000:\t\/\/2NNN call subroutine at NNN\r\n-\t\tprintf(\"call subroutine at %d\\n\", nnn);\r\n-\t\t\/\/save current pc in stack\r\n-\t\tchip8core->stackPointer++;\r\n-\t\tchip8core->stack[chip8core->stackPointer] = chip8core->pc;\r\n-\t\t\/\/set pc to nnn\r\n-\t\tchip8core->pc = nnn;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x3000:\t\/\/3XNN : SKip next ins. if VX == nn\r\n-\t\tprintf(\"SE V%d, %d\\n\",x, nn);\r\n-\t\tif(chip8core->V[x] == nn )\r\n-\t\t\tchip8core->pc+=4;\r\n-\t\telse\r\n-\t\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x4000:\t\/\/4XNN : opposite of above\r\n-\t\tprintf(\"SNE V%d, %d\\n\", x, nn);\r\n-\t\tif(chip8core->V[x] != nn)\r\n-\t\t\tchip8core->pc+=4;\r\n-\t\telse\r\n-\t\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x5000:\t\/\/5XY0 : SE Vx, Vy\r\n-\t\ty = (opcode & 0x00f0) >> 4;\r\n-\t\tprintf(\"SE V%d, V%d\\n\", x, y);\r\n-\t\tif(chip8core->V[x] == chip8core->V[y])\r\n-\t\t\tchip8core->pc+=4;\r\n-\t\telse\r\n-\t\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x6000:\t\/\/6XNN : LD Vx, nn\r\n-\t\tprintf(\"LD V%d, %d\\n\", x, nn);\r\n-\t\tchip8core->V[x] = nn;\r\n-\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x7000:\t\/\/7XNN : ADD Vx, nn\r\n-\t\tprintf(\"ADD V%d, %d\\n\", x, nn);\r\n-\t\tchip8core->V[x] += nn;\r\n-\t\tchip8core->V[x] &= 0xff;\t\/\/account for overflow\r\n-\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0x8000:\t\/\/Instructions beghinning with hex 8\r\n-\t\t\ty = (opcode & 0x00f0) >> 4;\r\n-\t\t\tswitch(opcode & 0xf)\r\n-\t\t\t{\r\n-\t\t\t\tcase 0x0:\t\/\/8XY0 : LD Vx, Vy\r\n-\t\t\t\tprintf(\"LD V%d, V%d\\n\", x, y);\r\n-\t\t\t\tchip8core->V[x] = chip8core->V[y];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x1:\t\/\/8XY1\t:\tVX = VX | VY\r\n-\t\t\t\tprintf(\"OR V%d, V%d\\n\", x, y);\r\n-\t\t\t\tchip8core->V[x] = chip8core->V[x] | chip8core->V[y];\r\n-\t\t\t\tchip8core->V[x] &= 0xff;\t\/\/account for overflow\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x2:\t\/\/8XY2\t:\tVX = VX % VY\r\n-\t\t\t\tprintf(\"AND V%d, V%d\\n\", x, y);\r\n-\t\t\t\tchip8core->V[x] &= chip8core->V[y];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x3:\t\/\/8xy3\t:\tvx = vx ^ vy\r\n-\t\t\t\tprintf(\"XOR V%d, V%d\\n\", x, y);\r\n-\t\t\t\tchip8core->V[x] ^= chip8core->V[y];\r\n-\t\t\t\tchip8core->V[x] &= 0xff;\t\/\/account for overflow\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x4:\t\/\/8xy4\t:\tvx = vx + vy, set vf if carry\r\n-\t\t\t\tprintf(\"ADD V%d, V%d\\n\", x , y);\r\n-\t\t\t\tif(chip8core->V[x] + chip8core->V[y] > 0xff)\r\n-\t\t\t\t\tchip8core->V[0xf] = 1;\r\n-\t\t\t\telse\r\n-\t\t\t\t\tchip8core->V[0xf] = 0;\r\n-\t\t\t\tchip8core->V[x] += chip8core->V[y];\r\n-\t\t\t\tchip8core->V[x] &= 0xff;\t\/\/account for overflow\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x5:\t\/\/8xy5\t:\tVx = vx - vy, set NOT vf if borrow\r\n-\t\t\t\tprintf(\"SUB V%d, V%d\\n\", x, y);\r\n-\t\t\t\tif(chip8core->V[y] > chip8core->V[x])\r\n-\t\t\t\t\tchip8core->V[0xf] = 0;\r\n-\t\t\t\telse\r\n-\t\t\t\t\tchip8core->V[0xf] = 1;\r\n-\t\t\t\tchip8core->V[x] -= chip8core->V[y];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x6:\t\/\/8xy6\t:\tvx = vx >> 1, vf = MSB before shift\r\n-\t\t\t\tprintf(\"SHR V%d\\n\", x);\r\n-\t\t\t\tchip8core->V[0xf] = chip8core->V[x] & 0x80; \/\/ AND with 10000000 to get MSB\r\n-\t\t\t\tchip8core->V[x] = chip8core->V[x] >> 1;\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x7:\t\/\/8xy7\t:\tvx = vy - vx, set NOT vf if borrow\r\n-\t\t\t\tprintf(\"Vx = Vy - Vx\\n\"); \/\/TODO: PROPER MNEMONIC\r\n-\t\t\t\tif(chip8core->V[x] > chip8core->V[y])\r\n-\t\t\t\t\tchip8core->V[0xf] = 0;\r\n-\t\t\t\telse\r\n-\t\t\t\t\tchip8core->V[0xf] = 1;\r\n-\t\t\t\tchip8core->V[x] = chip8core->V[y] - chip8core->V[x];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0xe:\t\/\/8XYE :\tVX = VX << 1, VF = LSB before shift\r\n-\t\t\t\tprintf(\"SHL V%d\\n\", x);\r\n-\t\t\t\tchip8core->V[0xf] = chip8core->V[x] & 0x1; \/\/ AND with 00000001 to get lsb\r\n-\t\t\t\tchip8core->V[x] = chip8core->V[x] << 1;\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tdefault:\r\n-\t\t\t\tprintf(\"Unsupported opcode\\n\");\r\n-\t\t\t\tbreak;\r\n-\t\t\t}\r\n-\t\tbreak;\t\/\/End of 0x8000\r\n-\r\n-\t\tcase 0x9000:\t\/\/ 9XY0\t:\tSNE Vx, Vy\r\n-\t\ty = (opcode & 0x00f0) >> 4;\r\n-\t\tprintf(\"SNE V%d, V%d\\n\", x,y);\r\n-\t\tif(chip8core->V[x] != chip8core->V[y])\r\n-\t\t\tchip8core->pc+=4;\r\n-\t\telse\r\n-\t\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xA000:\t\/\/ANNN : LD I, nnn\r\n-\t\tprintf(\"LD I, %d\\n\",nnn);\r\n-\t\tchip8core->I = nnn;\r\n-\t\tchip8core->pc+=2;\r\n-\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xB000:\t\/\/BNNN\t:\tJMP nnn (v0+nnn)\r\n-\t\tprintf(\"JMP V0, %d\\n\", nnn);\r\n-\t\tchar addr = (nnn + (chip8core->V[0x0] & 0xff));\r\n-\t\tchip8core->pc = addr;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xC000:\t\/\/CXNN\t:\tVX = Rand() & nn\r\n-\t\tprintf(\"JMP V0, rand\\n\");\r\n-\t\trndnum = rand() & 0xff;\t\/\/truncate to 8 bits.\r\n-\t\tchip8core->V[x] = rndnum & nn;\r\n-\t\tchip8core->pc+=2;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xD000:\t\/\/DXYN\t:\tDraw a pixel at coord(Vx,Vy) pixel of height N\r\n-\t\ty = (opcode & 0x00f0) >> 4;\r\n-\t\txcoord = chip8core->V[x];\t\t\/\/xcoord\/\/\r\n-\t\t\t\/\/for debug\r\n-\t\t\t\/\/printf(\"xcoord calculated okay. value > V%d = %d\\n\", x, xcoord);\r\n-\t\tycoord = chip8core->V[y];\t\t\/\/ycoord\r\n-\t\t\t\/\/for debug\r\n-\t\t\t\/\/printf(\"ycoord calculated okay. value > V%d = %d\\n\", y, ycoord);\r\n-\t\tn = opcode & 0xf;\t\/\/pixel height N\r\n-\r\n-\r\n-\t\tprintf(\"DRAW VX, VY, %d\\n\", n);\r\n-\r\n-\t\tchip8core->V[0xf] = 0;\t\/\/initialize collision flag to 0\r\n-\r\n-\t\tfor(ycounter = 0; ycounter < n ; ycounter++)\r\n-\t\t{\r\n-\t\t\tpixelData = chip8core->memory[chip8core->I + ycounter];\r\n-\t\t\tfor(xcounter = 0; xcounter < 8 ; xcounter++)\t\/\/pixels are 8 bits in width\r\n-\t\t\t{\r\n-\t\t\t\t\/*grab each bit of pixelData, one at a time, left to right*\/\r\n-\t\t\t\tif(pixelData &(0x80 >> xcounter) != 0)\t\/\/If this is hard to understand, bear in mind 0x80 = 1000 0000, and that solitary 1 shifts right by one each time\r\n-\t\t\t\t{\r\n-\t\t\t\t\tfinalX = (xcoord + xcounter);\r\n-\t\t\t\t\tfinalY = (ycoord + ycounter);\r\n-\t\t\t\t\tfinalX %= 64;\/\/wraparound\r\n-\t\t\t\t\tfinalY %= 32;\/\/wraparound\r\n-\t\t\t\t\tfinalIndex = finalY*64 + finalX;\r\n-\t\t\t\t\t\/\/draw a pixel at finalindex, set vf = 1 if collision\r\n-\t\t\t\t\tif(chip8core->display[finalIndex] == 1) \/\/collision detected\r\n-\t\t\t\t\t\tchip8core->V[0xf] = 1;\r\n-\t\t\t\t\tchip8core->display[finalIndex] ^= 1;\t\/\/xor mode drawing\r\n-\t\t\t\t}\r\n-\t\t\t}\/\/end xcounter (column) loop\r\n-\t\t}\/\/end ycounter (row)\r\n-\t\tchip8core->pc+=2;\r\n-\t\tdrawFlag = 1;\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xE000:\t\/\/instructions beginning with hex E\r\n-\t\t\tswitch(opcode & 0xf)\r\n-\t\t\t{\r\n-\r\n-\t\t\t\tcase 0xe:\t\/\/EX9E\t:\tSkip next instruction if key stored in VX pressed\r\n-\t\t\t\tprintf(\"SKip next instruction if keypad[V[%d]] pressed\\n\", x);\r\n-\t\t\t\tif(chip8core->keypad[chip8core->V[x]] != 0)\r\n-\t\t\t\t\tchip8core->pc+=4;\r\n-\t\t\t\telse\r\n-\t\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x1:\t\/\/EXA1\t: Skip next instruction if key stored in VX isnt pressed\r\n-\t\t\t\tprintf(\"SKip next instruction if keypad[V[%d]] IS NOT pressed\\n\", x);\r\n-\t\t\t\tif(chip8core->keypad[chip8core->V[x]] != 0)\r\n-\t\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\telse\r\n-\t\t\t\t\tchip8core->pc+=4;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tdefault:\r\n-\t\t\t\tprintf(\"Unsupported opcode\\n\");\r\n-\t\t\t\tbreak;\r\n-\t\t\t}\r\n-\t\tbreak;\r\n-\r\n-\t\tcase 0xF000:\t\/\/instructions beginning with hex F\r\n-\t\t\tswitch(opcode & 0xff)\/\/last 2 nibbles because i feel more comfortable with this\r\n-\t\t\t{\r\n-\t\t\t\tcase 0x07:\t\/\/FX07 LD Vx, DT\r\n-\t\t\t\tprintf(\"LD V%d, dT\\n\", x);\r\n-\t\t\t\tchip8core->V[x] = chip8core->delayTimer;\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x0a:\t\/\/keypress awaited, then stored in vx\r\n-\t\t\t\tprintf(\"await keypress to be stored in V%d\\n\", x);\r\n-\t\t\t\tfor(i = 0 ; i < 16 ; i++)\r\n-\t\t\t\t{\r\n-\t\t\t\t\tif(chip8core->keypad[i] != 0)\r\n-\t\t\t\t\t\tchip8core->V[x] = chip8core->keypad[i];\r\n-\t\t\t\t}\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x15:\t\/\/LD dT, VX\r\n-\t\t\t\tprintf(\"LD dT, V%d\\n\", x);\r\n-\t\t\t\tchip8core->delayTimer = chip8core->V[x];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x18:\t\/\/LD sT, VX\r\n-\t\t\t\tprintf(\"LD sT, V%d\\n\", x);\r\n-\t\t\t\tchip8core->soundTimer = chip8core->V[x];\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x1e:\t\/\/ I = I + VX\r\n-\t\t\t\tprintf(\"LD I, V%d\\n\", x);\r\n-\t\t\t\tchip8core->I = chip8core->I + chip8core->V[x];\r\n-\t\t\t\tchip8core->I &= 0xff;\t\/\/account for overflow\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x29:\t\/\/ I = location of sprite for char in Vx\r\n-\t\t\t\tprintf(\"Set I to location of sprite for char in V%d\\n\", (int)x);\r\n-\t\t\t\tchip8core->I = (0x50 + (chip8core->V[x]) * 5);\/\/fonts are 5 bits in width\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x33:\t\/\/store BCD representation of VX in mem loc. i, i+1, i+2\r\n-\t\t\t\tprintf(\"Store BCD representation of V%d in mem loc starting at I\\n\", (int)x);\r\n-\t\t\t\thundreds = (chip8core->V[x]) \/ 100;\r\n-\t\t\t\ttens = (chip8core->V[x]%100) \/ 10;\r\n-\t\t\t\tones = (chip8core->V[x]%100) % 10;\r\n-\r\n-\t\t\t\tchip8core->memory[chip8core->I] = hundreds;\r\n-\t\t\t\tchip8core->memory[chip8core->I + 1] = tens;\r\n-\t\t\t\tchip8core->memory[chip8core->I + 2] = ones;\r\n-\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x55:\t\/\/ store VO to VX in mem[I] onwards\r\n-\t\t\t\tprintf(\"Store V0 to VX in mem[I] onwards\\n\");\r\n-\t\t\t\tfor(i = 0 ; i < x ; i++)\r\n-\t\t\t\t{\r\n-\t\t\t\t\tchip8core->memory[chip8core->I + i] = chip8core->V[x];\r\n-\t\t\t\t}\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tcase 0x65:\t\/\/load V0 to VX with contents of memory, from memory[I] onwards.\r\n-\t\t\t\tprintf(\"Load VO to VX With mem[I] onwards\\n\");\r\n-\t\t\t\tfor(i = 0; i < x ; i++)\r\n-\t\t\t\t{\r\n-\t\t\t\t\tchip8core->V[i] = chip8core->memory[chip8core->I + i];\r\n-\t\t\t\t}\r\n-\t\t\t\tchip8core->pc+=2;\r\n-\t\t\t\tbreak;\r\n-\r\n-\t\t\t\tdefault:\t\/\/formality\r\n-\t\t\t\tprintf(\"Unsupported opcode\");\r\n-\t\t\t\tbreak;\r\n-\t\t\t}\r\n-\t\tbreak;\t\/\/end of 0xF000\r\n-\r\n-\t\tdefault:\r\n-\t\t\tprintf(\"Unsupported opcode.\\n\");\r\n-\t\tbreak;\r\n-\t}\r\n-\r\n-\t\/* timers have to be updated at the end of every CPU cycle *\/\r\n-\tif(chip8core->delayTimer > 0)\r\n-\t\tchip8core->delayTimer--;\r\n-\tif(chip8core->soundTimer > 0)\r\n-\t\tchip8core->soundTimer--;\r\n-\r\n-\treturn chip8core;\r\n-}\r\n-\r\n-\/\/####################################################################################################################################################################\r\n-\/* main function*\/\r\n-int main(int argc, char *argv[])\r\n-{\r\n-\t\/* first off, create the chip8 core *\/\r\n-\tstruct chip8 *chip8core = createChip8();\r\n-\t\/* Get path to ROM specified in command line argument *\/\r\n-\tchar filePath[40];\r\n-\tsprintf(filePath, \"C:\\\\Users\\\\PRITH\\\\workspace\\\\CHIP8C\\\\Default\\\\%s\", argv[1]);\r\n-\t\/\/the two lines above ^ comprise a horrible way of going about it. No way of knowing buffer (filePath) size.\r\n-\t\/\/char *filePath = (\"C:\\\\Users\\\\PRITH\\\\workspace\\\\CHIP8C\\\\Default\\\\zerodemo.ch8\"); <--If hardcoded\r\n-\r\n-\t\/\/printf(\"\\nDEBUG_filePath = %s\\n\",filePath);\r\n-\t\/*load the specified program into CHIP8 memory *\/\r\n-\tchip8core = loadProgram(filePath, chip8core);\r\n-\r\n-\t\/*\r\n-\t\tglobal variable *displayArray = &(chip8core->display)\r\n-\t\tand then use *displayArray in the glDisplayFunc.\r\n-\tdisplayArray = &(chip8core->display[0]);\r\n-\t*\/\r\n-\r\n-\t\/* core game loop, infinite *\/\r\n-\tfor(;;)\r\n-\t\t{\r\n-\t\t\t\/*invoke a cycle of the emulator*\/\r\n-\t\t\tchip8core = cycle(chip8core);\r\n-\t\t\t\/*insert openGL rendering loop here *\/\r\n-\t\t}\r\n-\treturn 0;\r\n-}\r\n-\/\/####################################################################################################################################################################\r\n-\r\n"} {"commit":"83ffabbfe130d7294589bc7719ec8c4239796608","subject":"Deal with negative cache responses when using dns_db_findrdataset().","message":"Deal with negative cache responses when using dns_db_findrdataset().\n","repos":"pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- bin\/named\/query.c\n+++ bin\/named\/query.c\n@@ -800,6 +800,15 @@\n \t\t\t\t\t dns_rdatatype_a, 0,\n \t\t\t\t\t client->now, rdataset,\n \t\t\t\t\t sigrdataset);\n+\t\tif (result == DNS_R_NCACHENXDOMAIN)\n+\t\t\tgoto addname;\n+\t\tif (result == DNS_R_NCACHENXRRSET) {\n+\t\t\tdns_rdataset_disassociate(rdataset);\n+\t\t\t\/*\n+\t\t\t * Negative cache entries don't have sigrdatasets.\n+\t\t\t *\/\n+\t\t\tINSIST(sigrdataset->methods == NULL);\n+\t\t}\n \t\tif (zdb != NULL && result == ISC_R_NOTFOUND) {\n \t\t\t\/*\n \t\t\t * The cache doesn't have an A, but we may have\n@@ -838,6 +847,12 @@\n \t\t\t\t\t dns_rdatatype_a6, 0,\n \t\t\t\t\t client->now, rdataset,\n \t\t\t\t\t sigrdataset);\n+\t\tif (result == DNS_R_NCACHENXDOMAIN)\n+\t\t\tgoto addname;\n+\t\tif (result == DNS_R_NCACHENXRRSET) {\n+\t\t\tdns_rdataset_disassociate(rdataset);\n+\t\t\tINSIST(sigrdataset->methods == NULL);\n+\t\t}\n \t\tif (zdb != NULL && result == ISC_R_NOTFOUND) {\n \t\t\t\/*\n \t\t\t * The cache doesn't have an A6, but we may have\n@@ -877,6 +892,12 @@\n \t\t\t\t\t dns_rdatatype_aaaa, 0,\n \t\t\t\t\t client->now, rdataset,\n \t\t\t\t\t sigrdataset);\n+\t\tif (result == DNS_R_NCACHENXDOMAIN)\n+\t\t\tgoto addname;\n+\t\tif (result == DNS_R_NCACHENXRRSET) {\n+\t\t\tdns_rdataset_disassociate(rdataset);\n+\t\t\tINSIST(sigrdataset->methods == NULL);\n+\t\t}\n \t\tif (zdb != NULL && result == ISC_R_NOTFOUND) {\n \t\t\t\/*\n \t\t\t * The cache doesn't have an AAAA, but we may have\n"} {"commit":"b343f06a0963dda416754ce2511b32afd3fadabe","subject":"set depthHasSurface field for stencil renderbuffer","message":"set depthHasSurface field for stencil renderbuffer\n","repos":"tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/r200\/r200_screen.c\n+++ src\/mesa\/drivers\/dri\/r200\/r200_screen.c\n@@ -592,6 +592,7 @@\n screen->depthOffset, screen->depthPitch);\n r200SetSpanFunctions(stencilRb, mesaVis);\n _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &stencilRb->Base);\n+\t stencilRb->depthHasSurface = screen->depthHasSurface;\n }\n \n _mesa_add_soft_renderbuffers(fb,\n"} {"commit":"f1d012c5956fc94ef9570855f4d276598c297eda","subject":"Fix spurious indentation in a comment.","message":"Fix spurious indentation in a comment.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@69934 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Target\/PowerPC\/PPCISelLowering.h\n+++ lib\/Target\/PowerPC\/PPCISelLowering.h\n@@ -326,7 +326,7 @@\n \/\/\/ the offset of the target addressing mode.\n virtual bool isLegalAddressImmediate(GlobalValue *GV) const;\n \n- \/\/\/ IsEligibleForTailCallOptimization - Check whether the call is eligible\n+ \/\/\/ IsEligibleForTailCallOptimization - Check whether the call is eligible\n \/\/\/ for tail call optimization. Target which want to do tail call\n \/\/\/ optimization should implement this function.\n virtual bool IsEligibleForTailCallOptimization(CallSDNode *TheCall,\n"} {"commit":"41b3e5040aa685fdfe0c0e5d26d879f1912ae2ff","subject":"* subversion\/libsvn_client\/deprecated.c (status4_wrapper_baton): Move the 'old_func' field next to the 'old_baton' field, because they're a logical pair. (svn_client_status4): Adjust an initializer accordingly.","message":"* subversion\/libsvn_client\/deprecated.c\n (status4_wrapper_baton): Move the 'old_func' field next to the 'old_baton'\n field, because they're a logical pair.\n (svn_client_status4): Adjust an initializer accordingly.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/deprecated.c\n+++ subversion\/libsvn_client\/deprecated.c\n@@ -1791,8 +1791,8 @@\n \n struct status4_wrapper_baton\n {\n+ svn_wc_context_t *wc_ctx;\n svn_wc_status_func3_t old_func;\n- svn_wc_context_t *wc_ctx;\n void *old_baton;\n };\n \n@@ -1831,7 +1831,7 @@\n svn_client_ctx_t *ctx,\n apr_pool_t *pool)\n {\n- struct status4_wrapper_baton swb = { status_func, ctx->wc_ctx,\n+ struct status4_wrapper_baton swb = { ctx->wc_ctx, status_func,\n status_baton };\n \n return svn_client_status5(result_rev, ctx, path, revision, depth, get_all,\n"} {"commit":"2a059ff60b98436ade9edd9801cc023c2fd62121","subject":"Doxygenized QuesoGLC","message":"Doxygenized QuesoGLC\n\n","repos":"Safety0ff\/QuesoGLC,Safety0ff\/QuesoGLC,Safety0ff\/QuesoGLC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/global.c\n+++ src\/global.c\n@@ -18,11 +18,39 @@\n *\/\n \/* $Id$ *\/\n \n-\/* This file defines the so-called \"Global commands\" described in chapter 3.4\n- * of the GLC specs. These are commands which do not use GLC context state\n- * variables and which can therefore be executed succesfully if the issuing\n- * thread has no current GLC context. All other GLC commands raise\n- * GLC_STATE_ERROR if the issuing thread has no current GLC context.\n+\/** \\file\n+ * defines the so-called \"Global commands\" described in chapter 3.4 of the GLC specs.\n+ *\/\n+\n+\/** \\defgroup global Global Commands\n+ * Those commands do not use GLC context state variables and can therefore be executed successfully\n+ * if the issuing thread has no current GLC context. \n+ *\n+ * Each GLC context has a nonzero ID of type \\b GLint. When a client is linked with a\n+ * GLC library, the library maintains a list of IDs that contains one entry for each of\n+ * the client's GLC contexts. The list is initially empty.\n+ *\n+ * Each client thread has a private GLC context ID variable that always contains either\n+ * the value zero, indicating that the thread has no current GLC context, or the ID of\n+ * the thread's current GLC context. The initial value is zero.\n+ *\n+ * When the ID of a GLC context is stored in the GLC context ID variable of a client\n+ * thread, the context is said to be current to the thread. It is not possible for a\n+ * GLC context to be current simultaneously to multiple threads. With the exception\n+ * of the per-thread GLC error code and context ID variables, all of the GLC\n+ * state variables that are used during the execution of a GLC command are stored\n+ * in the issuing thread's current GLC context. To make a context current, call\n+ * glcContext().\n+ *\n+ * When a client thread issues a GLC command, the thread's current GLC context\n+ * executes the command.\n+ *\n+ * Note that the results of issuing a GL command when there is no current GL\n+ * context are undefined. Because GLC issues GL commands, you must create a GL\n+ * context and make it current before calling GLC.\n+ *\n+ * All other GLC commands raise \\b GLC_STATE_ERROR if the issuing thread has no current\n+ * GLC context.\n *\/\n \n #include <stdlib.h>\n@@ -204,9 +232,15 @@\n \n \n \n-\/* glcIsContext:\n- * This command returns GL_TRUE if inContext is the ID of one of the client's\n- * GLC contexts.\n+\/** \\ingroup global\n+ * This command checks whether \\e inContext is the ID of one of the client's GLC context\n+ * and returns \\b GLC_TRUE if and only if it is.\n+ * \\param inContext The context ID to be tested\n+ * \\return \\b GL_TRUE if \\e inContext is the ID of a GLC context, \\b GL_FALSE otherwise\n+ * \\sa glcDeleteContext()\n+ * \\sa glcGenContext()\n+ * \\sa glcGetAllContexts()\n+ * \\sa glcContext()\n *\/\n GLboolean glcIsContext(GLint inContext)\n {\n@@ -219,8 +253,14 @@\n \n \n \n-\/* glcGetCurrentContext:\n- * Returns the value of the issuing thread's current GLC context ID variable\n+\/** \\ingroup global\n+ * Returns the value of the issuing thread's current GLC context ID variable\n+ * \\return The context ID of the current thread\n+ * \\sa glcContext()\n+ * \\sa glcDeleteContext()\n+ * \\sa glcGenContext()\n+ * \\sa glcGetAllContexts()\n+ * \\sa glcIsContext()\n *\/\n GLint glcGetCurrentContext(void)\n {\n@@ -239,14 +279,20 @@\n \n \n \n-\/* glcDeleteContext:\n- * Marks for deletion the GLC context identified by inContext. If the\n- * marked context is not current to any client thread, the command deletes\n- * the marked context immediatly. Otherwise, the marked context will be\n- * deleted during the execution of the next glcContext() command that causes\n- * it not to be current to any client thread. The command raises\n- * GLC_PARAMETER_ERROR if inContext is not the ID of one of the client's GLC\n- * contexts.\n+\/** \\ingroup global\n+ * Marks for deletion the GLC context identified by \\e inContext. If the\n+ * marked context is not current to any client thread, the command deletes\n+ * the marked context immediatly. Otherwise, the marked context will be\n+ * deleted during the execution of the next glcContext() command that causes\n+ * it not to be current to any client thread.\n+ *\n+ * The command raises \\b GLC_PARAMETER_ERROR if \\e inContext is not the ID of\n+ * one of the client's GLC contexts.\n+ * \\param inContext The ID of the context to be deleted\n+ * \\sa glcGetAllContexts()\n+ * \\sa glcIsContext()\n+ * \\sa glcContext()\n+ * \\sa glcGetCurrentContext()\n *\/\n void glcDeleteContext(GLint inContext)\n {\n@@ -285,14 +331,27 @@\n \n \n \n-\/* glcContext:\n- * Assigns the value inContext to the issuing thread's current GLC context ID\n- * variable. The command raises GLC_PARAMETER_ERROR if inContext is not zero\n- * and is not the ID of one of the client's GLC contexts. The command raises\n- * GLC_STATE_ERROR if inContext is the ID of a GLC context that is current to\n- * a thread other than the issuing thread. The command raises GLC_STATE_ERROR\n- * if the issuing thread is executing a callback function that has been\n- * called from GLC.\n+\/** \\ingroup global\n+ * Assigns the value \\e inContext to the issuing thread's current GLC context ID\n+ * variable. If another context is already current to the thread, no error is\n+ * generated but the context is released and the context identified by \\e inContext\n+ * is made current to the thread.\n+ *\n+ * Call \\e glcContext with \\e inContext set to zero to release a thread's current\n+ * context.\n+ *\n+ * The command raises \\b GLC_PARAMETER_ERROR if \\e inContext is not zero\n+ * and is not the ID of one of the client's GLC contexts. \\n\n+ * The command raises \\b GLC_STATE_ERROR if \\e inContext is the ID of a GLC\n+ * context that is current to a thread other than the issuing thread. \\n\n+ * The command raises \\b GLC_STATE_ERROR if the issuing thread is executing\n+ * a callback function that has been called from GLC.\n+ * \\param inContext The ID of the context to be made current\n+ * \\sa glcGetCurrentContext()\n+ * \\sa glcDeleteContext()\n+ * \\sa glcGenContext()\n+ * \\sa glcGetAllContexts()\n+ * \\sa glcIsContext()\n *\/\n void glcContext(GLint inContext)\n {\n@@ -439,8 +498,13 @@\n \n \n \n-\/* glcGenContext:\n- * Generates a new GLC context and returns its ID.\n+\/** \\ingroup global\n+ * Generates a new GLC context and returns its ID.\n+ * \\return The ID of the new context\n+ * \\sa glcGetAllContexts()\n+ * \\sa glcIsContext()\n+ * \\sa glcContext()\n+ * \\sa glcGetCurrentContext()\n *\/\n GLint glcGenContext(void)\n {\n@@ -518,11 +582,17 @@\n \n \n \n-\/* glcGetAllContexts:\n- * Returns a zero terminated array of GLC context IDs that contains one entry\n- * for each of the client's GLC contexts. GLC uses the ISO C library command\n- * malloc to allocate the array. The client should use the ISO C library\n- * command free to deallocate the array when it is no longer needed.\n+\/** \\ingroup global\n+ * Returns a zero terminated array of GLC context IDs that contains one entry\n+ * for each of the client's GLC contexts. GLC uses the ISO C library command\n+ * \\c malloc to allocate the array. The client should use the ISO C library\n+ * command \\c free to deallocate the array when it is no longer needed.\n+ * \\return The pointer to the array of context IDs.\n+ * \\sa glcContext()\n+ * \\sa glcDeleteContext()\n+ * \\sa glcGenContext()\n+ * \\sa glcGetCurrentContext()\n+ * \\sa glcIsContext()\n *\/\n GLint* glcGetAllContexts(void)\n {\n@@ -567,10 +637,33 @@\n \n \n \n-\/* glcGetError:\n- * retrieves the value of the issuing thread's GLC error code variable,\n- * assigns the value GLC_NONE to that variable, and returns the retrieved\n- * value.\n+\/** \\ingroup global\n+ * Retrieves the value of the issuing thread's GLC error code variable,\n+ * assigns the value \\b GLC_NONE to that variable, and returns the retrieved\n+ * value.\n+ * \\note In contrast to the GL function \\c glGetError, \\e glcGetError only\n+ * returns one error, not a list of errors.\n+ * \\return An error code from the table below : \\n\\n\n+ * <center>\n+ * <table>\n+ * <caption>Error codes<\/caption>\n+ * <tr>\n+ * <td>Name<\/td> <td>Enumerant<\/td>\n+ * <\/tr>\n+ * <tr>\n+ * <td><b>GLC_NONE<\/b><\/td> <td>0x0000<\/td>\n+ * <\/tr>\n+ * <tr>\n+ * <td><b>GLC_PARAMETER_ERROR<\/b><\/td> <td>0x0040<\/td>\n+ * <\/tr>\n+ * <tr>\n+ * <td><b>GLC_RESOURCE_ERROR<\/b><\/td> <td>0x0041<\/td>\n+ * <\/tr>\n+ * <tr>\n+ * <td><b>GLC_STATE_ERROR<\/b><\/td> <td>0x0042<\/td>\n+ * <\/tr>\n+ * <\/table>\n+ * <\/center>\n *\/\n GLCenum glcGetError(void)\n {\n"} {"commit":"a2098250fbda149cfad9e626afe80abe3b21e574","subject":"drm\/radeon\/audio: improve ACR calculation","message":"drm\/radeon\/audio: improve ACR calculation\n\nIn order to have any realistic chance of calculating proper\nACR values, we need to be able to calculate both N and CTS,\nnot just CTS. We still aim for the ideal N as specified in\nthe HDMI spec though.\n\nbug:\nhttps:\/\/bugs.freedesktop.org\/show_bug.cgi?id=69675\n\nSigned-off-by: Pierre Ossman <ff019a5748a52b5641624af88a54a2f0e46a9fb5@ossman.eu>\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/r600_hdmi.c\n+++ drivers\/gpu\/drm\/radeon\/r600_hdmi.c\n@@ -24,6 +24,7 @@\n * Authors: Christian K\u00f6nig\n *\/\n #include <linux\/hdmi.h>\n+#include <linux\/gcd.h>\n #include <drm\/drmP.h>\n #include <drm\/radeon_drm.h>\n #include \"radeon.h\"\n@@ -67,25 +68,47 @@\n { 74250, 4096, 74250, 6272, 82500, 6144, 74250 }, \/* 74.25 MHz *\/\n { 148352, 4096, 148352, 5733, 150670, 6144, 148352 }, \/* 148.50\/1.001 MHz *\/\n { 148500, 4096, 148500, 6272, 165000, 6144, 148500 }, \/* 148.50 MHz *\/\n- { 0, 4096, 0, 6272, 0, 6144, 0 } \/* Other *\/\n };\n \n-\/*\n- * calculate CTS value if it's not found in the table\n- *\/\n-static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq)\n-{\n-\tu64 n;\n-\tu32 d;\n-\n-\tif (*CTS == 0) {\n-\t\tn = (u64)clock * (u64)N * 1000ULL;\n-\t\td = 128 * freq;\n-\t\tdo_div(n, d);\n-\t\t*CTS = n;\n-\t}\n-\tDRM_DEBUG(\"Using ACR timing N=%d CTS=%d for frequency %d\\n\",\n-\t\t N, *CTS, freq);\n+\n+\/*\n+ * calculate CTS and N values if they are not found in the table\n+ *\/\n+static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int *N, int freq)\n+{\n+\tint n, cts;\n+\tunsigned long div, mul;\n+\n+\t\/* Safe, but overly large values *\/\n+\tn = 128 * freq;\n+\tcts = clock * 1000;\n+\n+\t\/* Smallest valid fraction *\/\n+\tdiv = gcd(n, cts);\n+\n+\tn \/= div;\n+\tcts \/= div;\n+\n+\t\/*\n+\t * The optimal N is 128*freq\/1000. Calculate the closest larger\n+\t * value that doesn't truncate any bits.\n+\t *\/\n+\tmul = ((128*freq\/1000) + (n-1))\/n;\n+\n+\tn *= mul;\n+\tcts *= mul;\n+\n+\t\/* Check that we are in spec (not always possible) *\/\n+\tif (n < (128*freq\/1500))\n+\t\tprintk(KERN_WARNING \"Calculated ACR N value is too small. You may experience audio problems.\\n\");\n+\tif (n > (128*freq\/300))\n+\t\tprintk(KERN_WARNING \"Calculated ACR N value is too large. You may experience audio problems.\\n\");\n+\n+\t*N = n;\n+\t*CTS = cts;\n+\n+\tDRM_DEBUG(\"Calculated ACR timing N=%d CTS=%d for frequency %d\\n\",\n+\t\t *N, *CTS, freq);\n }\n \n struct radeon_hdmi_acr r600_hdmi_acr(uint32_t clock)\n@@ -93,15 +116,16 @@\n \tstruct radeon_hdmi_acr res;\n \tu8 i;\n \n-\tfor (i = 0; r600_hdmi_predefined_acr[i].clock != clock &&\n-\t r600_hdmi_predefined_acr[i].clock != 0; i++)\n-\t\t;\n-\tres = r600_hdmi_predefined_acr[i];\n-\n-\t\/* In case some CTS are missing *\/\n-\tr600_hdmi_calc_cts(clock, &res.cts_32khz, res.n_32khz, 32000);\n-\tr600_hdmi_calc_cts(clock, &res.cts_44_1khz, res.n_44_1khz, 44100);\n-\tr600_hdmi_calc_cts(clock, &res.cts_48khz, res.n_48khz, 48000);\n+\t\/* Precalculated values for common clocks *\/\n+\tfor (i = 0; i < ARRAY_SIZE(r600_hdmi_predefined_acr); i++) {\n+\t\tif (r600_hdmi_predefined_acr[i].clock == clock)\n+\t\t\treturn r600_hdmi_predefined_acr[i];\n+\t}\n+\n+\t\/* And odd clocks get manually calculated *\/\n+\tr600_hdmi_calc_cts(clock, &res.cts_32khz, &res.n_32khz, 32000);\n+\tr600_hdmi_calc_cts(clock, &res.cts_44_1khz, &res.n_44_1khz, 44100);\n+\tr600_hdmi_calc_cts(clock, &res.cts_48khz, &res.n_48khz, 48000);\n \n \treturn res;\n }\n"} {"commit":"87d8b02b81b91433756063db07e520bcc94ce16e","subject":"lis2dh12: added an empty line to the end of the files.","message":"lis2dh12: added an empty line to the end of the files.\n\nSome compilers issues some WARNINGS if the last file\nline is not empty.\n","repos":"STMicroelectronics\/STMems_Standard_C_drivers","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lis2dh12_STdC\/driver\/lis2dh12_reg.c\n+++ lis2dh12_STdC\/driver\/lis2dh12_reg.c\n@@ -2374,4 +2374,10 @@\n *\n *\/\n \n-\/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****\/+\/**\n+ * @}\n+ *\n+ *\/\n+\n+\n+\/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****\/\n"} {"commit":"4995ef4dd7959dde44c62014a06c52d41acd8908","subject":"Add a 'these are private' note for the version macros","message":"Add a 'these are private' note for the version macros\n","repos":"tchakabam\/glib,darren-clark\/android_platform_external_bluetooth_glib,tchakabam\/glib,MathieuDuponchelle\/glib,iConsole\/Console-OS_external_bluetooth_glib,darren-clark\/android_platform_external_bluetooth_glib,darren-clark\/android_platform_external_bluetooth_glib,justinkb\/aosp-bluez.glib,ieei\/glib,MathieuDuponchelle\/glib,pstglia\/platform-external-bluetooth-glib,cention-sany\/glib,darren-clark\/android_platform_external_bluetooth_glib,cosimoc\/glib,lukasz-skalski\/glib,lukasz-skalski\/glib,01org\/android-bluez-glib,iConsole\/Console-OS_external_bluetooth_glib,gale320\/glib,johne53\/MB3Glib,endlessm\/glib,cention-sany\/glib,bluez-android\/glib,endlessm\/glib,justinkb\/aosp-bluez.glib,cosimoc\/glib,ieei\/glib,pstglia\/external-bluetooth-glib,mzabaluev\/glib,justinkb\/aosp-bluez.glib,darren-clark\/android_platform_external_bluetooth_glib,cention-sany\/glib,cosimoc\/glib,krichter722\/glib,johne53\/MB3Glib,tamaskenez\/glib,Distrotech\/glib,gale320\/glib,djdeath\/glib,pstglia\/external-bluetooth-glib,MathieuDuponchelle\/glib,endlessm\/glib,johne53\/MB3Glib,pstglia\/platform-external-bluetooth-glib,tchakabam\/glib,lukasz-skalski\/glib,MathieuDuponchelle\/glib,justinkb\/aosp-bluez.glib,bluez-android\/glib,krichter722\/glib,mzabaluev\/glib,krichter722\/glib,gale320\/glib,bluez-android\/glib,bluez-android\/glib,krichter722\/glib,mzabaluev\/glib,01org\/android-bluez-glib,ieei\/glib,tamaskenez\/glib,lukasz-skalski\/glib,johne53\/MB3Glib,Distrotech\/glib,pstglia\/external-bluetooth-glib,cosimoc\/glib,MathieuDuponchelle\/glib,01org\/android-bluez-glib,djdeath\/glib,pstglia\/external-bluetooth-glib,iConsole\/Console-OS_external_bluetooth_glib,bluez-android\/glib,johne53\/MB3Glib,tchakabam\/glib,justinkb\/aosp-bluez.glib,tamaskenez\/glib,mzabaluev\/glib,tamaskenez\/glib,djdeath\/glib,endlessm\/glib,01org\/android-bluez-glib,pstglia\/platform-external-bluetooth-glib,ieei\/glib,djdeath\/glib,iConsole\/Console-OS_external_bluetooth_glib,Distrotech\/glib,gale320\/glib,ieei\/glib,gale320\/glib,Distrotech\/glib,krichter722\/glib,johne53\/MB3Glib,iConsole\/Console-OS_external_bluetooth_glib,01org\/android-bluez-glib,tchakabam\/glib,Distrotech\/glib,mzabaluev\/glib,pstglia\/external-bluetooth-glib,tamaskenez\/glib,lukasz-skalski\/glib,cention-sany\/glib,cention-sany\/glib,cosimoc\/glib,endlessm\/glib,djdeath\/glib,pstglia\/platform-external-bluetooth-glib,pstglia\/platform-external-bluetooth-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib\/gversionmacros.h\n+++ glib\/gversionmacros.h\n@@ -145,6 +145,12 @@\n #error \"GLIB_VERSION_MIN_REQUIRED must be >= GLIB_VERSION_2_26\"\n #endif\n \n+\/* These macros are used to mark deprecated functions in GLib headers,\n+ * and thus have to be exposed in installed headers. But please\n+ * do *not* use them in other projects. Instead, use G_DEPRECATED\n+ * or define your own wrappers around it.\n+ *\/\n+\n \/* XXX: Every new stable minor release should add a set of macros here *\/\n \n #if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_26\n"} {"commit":"25faa2d56e2c417d64c3ad50f43e421002bcd29a","subject":"Turns out I left flat primitives in vertex buffer mode. Switch them back to immediate which works correctly..","message":"Turns out I left flat primitives in vertex buffer mode. Switch them back to immediate which works correctly..\n","repos":"dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/dri\/r300\/r300_render.c\n+++ src\/mesa\/drivers\/dri\/r300\/r300_render.c\n@@ -688,7 +688,7 @@\n if(ctx->Texture.Unit[0].Enabled)\n \treturn r300_run_tex_render(ctx, stage);\n \t\telse\n- \treturn r300_run_vb_flat_render(ctx, stage);\n+ \treturn r300_run_flat_render(ctx, stage);\n #else\n \treturn GL_TRUE;\n #endif\n"} {"commit":"64cc546c5f6b8b580dcd1f6e5d754394fe2923b4","subject":"Rename kind_action_state_t to deleted_path_notify_t, the former describing what fields it had (KIND, ACTION and STATE, plus now TREE_CONFLICTED), and the latter describing what it is used for.","message":"Rename kind_action_state_t to deleted_path_notify_t, the former describing\nwhat fields it had (KIND, ACTION and STATE, plus now TREE_CONFLICTED), and\nthe latter describing what it is used for.\n\n* subversion\/libsvn_client\/repos_diff.c:\n (kind_action_state_t): Rename to deleted_path_notify_t.\n (deleted_path_notify_t): New name of kind_action_state_t.\n (edit_baton, delete_entry, add_directory, close_file, close_directory):\n Apply rename of kind_action_state_t to deleted_path_notify_t and rename\n instance variables KAS to DPN.\n\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@874064 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_client\/repos_diff.c\n+++ subversion\/libsvn_client\/repos_diff.c\n@@ -72,7 +72,7 @@\n apr_hash_t *empty_hash;\n \n \/* Hash used to check replaced paths. Key is path relative CWD,\n- * Value is *kind_action_state_t.\n+ * Value is *deleted_path_notify_t.\n * All allocations are from edit_baton's pool. *\/\n apr_hash_t *deleted_paths;\n \n@@ -83,13 +83,13 @@\n apr_pool_t *pool;\n };\n \n-typedef struct kind_action_state_t\n+typedef struct deleted_path_notify_t\n {\n svn_node_kind_t kind;\n svn_wc_notify_action_t action;\n svn_wc_notify_state_t state;\n svn_boolean_t tree_conflicted;\n-} kind_action_state_t;\n+} deleted_path_notify_t;\n \n \/* Directory level baton.\n *\/\n@@ -529,13 +529,13 @@\n if (eb->notify_func)\n {\n const char* deleted_path;\n- kind_action_state_t *kas = apr_palloc(eb->pool, sizeof(*kas));\n+ deleted_path_notify_t *dpn = apr_palloc(eb->pool, sizeof(*dpn));\n deleted_path = svn_path_join(eb->target, path, eb->pool);\n- kas->kind = kind;\n- kas->action = tree_conflicted ? svn_wc_notify_update_update : action;\n- kas->state = state;\n- kas->tree_conflicted = tree_conflicted;\n- apr_hash_set(eb->deleted_paths, deleted_path, APR_HASH_KEY_STRING, kas);\n+ dpn->kind = kind;\n+ dpn->action = tree_conflicted ? svn_wc_notify_update_update : action;\n+ dpn->state = state;\n+ dpn->tree_conflicted = tree_conflicted;\n+ apr_hash_set(eb->deleted_paths, deleted_path, APR_HASH_KEY_STRING, dpn);\n }\n return SVN_NO_ERROR;\n }\n@@ -590,25 +590,25 @@\n {\n svn_wc_notify_t *notify;\n svn_boolean_t is_replace = FALSE;\n- kind_action_state_t *kas = apr_hash_get(eb->deleted_paths, b->wcpath,\n+ deleted_path_notify_t *dpn = apr_hash_get(eb->deleted_paths, b->wcpath,\n APR_HASH_KEY_STRING);\n- if (kas)\n+ if (dpn)\n {\n svn_wc_notify_action_t new_action;\n- if ((! kas->tree_conflicted)\n- && kas->action == svn_wc_notify_update_delete\n+ if ((! dpn->tree_conflicted)\n+ && dpn->action == svn_wc_notify_update_delete\n && action == svn_wc_notify_update_add)\n {\n is_replace = TRUE;\n new_action = svn_wc_notify_update_replace;\n }\n else\n- new_action = kas->action;\n+ new_action = dpn->action;\n notify = svn_wc_create_notify(b->wcpath, new_action, pool);\n- notify->kind = kas->kind;\n- notify->content_state = notify->prop_state = kas->state;\n+ notify->kind = dpn->kind;\n+ notify->content_state = notify->prop_state = dpn->state;\n notify->lock_state = svn_wc_notify_lock_state_inapplicable;\n- notify->tree_conflicted = kas->tree_conflicted;\n+ notify->tree_conflicted = dpn->tree_conflicted;\n (*eb->notify_func)(eb->notify_baton, notify, pool);\n apr_hash_set(eb->deleted_paths, b->wcpath,\n APR_HASH_KEY_STRING, NULL);\n@@ -892,25 +892,25 @@\n {\n svn_wc_notify_t *notify;\n svn_boolean_t is_replace = FALSE;\n- kind_action_state_t *kas = apr_hash_get(eb->deleted_paths, b->wcpath,\n+ deleted_path_notify_t *dpn = apr_hash_get(eb->deleted_paths, b->wcpath,\n APR_HASH_KEY_STRING);\n- if (kas)\n+ if (dpn)\n {\n svn_wc_notify_action_t new_action;\n- if ((! kas->tree_conflicted)\n- && kas->action == svn_wc_notify_update_delete\n+ if ((! dpn->tree_conflicted)\n+ && dpn->action == svn_wc_notify_update_delete\n && action == svn_wc_notify_update_add)\n {\n is_replace = TRUE;\n new_action = svn_wc_notify_update_replace;\n }\n else\n- new_action = kas->action;\n+ new_action = dpn->action;\n notify = svn_wc_create_notify(b->wcpath, new_action, pool);\n- notify->kind = kas->kind;\n- notify->content_state = notify->prop_state = kas->state;\n+ notify->kind = dpn->kind;\n+ notify->content_state = notify->prop_state = dpn->state;\n notify->lock_state = svn_wc_notify_lock_state_inapplicable;\n- notify->tree_conflicted = kas->tree_conflicted;\n+ notify->tree_conflicted = dpn->tree_conflicted;\n (*eb->notify_func)(eb->notify_baton, notify, pool);\n apr_hash_set(eb->deleted_paths, b->wcpath,\n APR_HASH_KEY_STRING, NULL);\n@@ -1002,13 +1002,13 @@\n hi = apr_hash_next(hi))\n {\n const void *deleted_path;\n- kind_action_state_t *kas;\n- apr_hash_this(hi, &deleted_path, NULL, (void *)&kas);\n- notify = svn_wc_create_notify(deleted_path, kas->action, pool);\n- notify->kind = kas->kind;\n- notify->content_state = notify->prop_state = kas->state;\n+ deleted_path_notify_t *dpn;\n+ apr_hash_this(hi, &deleted_path, NULL, (void *)&dpn);\n+ notify = svn_wc_create_notify(deleted_path, dpn->action, pool);\n+ notify->kind = dpn->kind;\n+ notify->content_state = notify->prop_state = dpn->state;\n notify->lock_state = svn_wc_notify_lock_state_inapplicable;\n- notify->tree_conflicted = kas->tree_conflicted;\n+ notify->tree_conflicted = dpn->tree_conflicted;\n (*eb->notify_func)(eb->notify_baton, notify, pool);\n apr_hash_set(eb->deleted_paths, deleted_path,\n APR_HASH_KEY_STRING, NULL);\n"} {"commit":"e9b3a07e6f73c8934439ee61d91e8f8539ed9c4f","subject":"Add back default values in qflex::global to avoid problems when qFlex library is called directly.","message":"Add back default values in qflex::global to avoid problems when qFlex library is called directly.\n","repos":"ngnrsaa\/qflex,ngnrsaa\/qflex,ngnrsaa\/qflex,ngnrsaa\/qflex","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/global.h\n+++ src\/global.h\n@@ -3,10 +3,11 @@\n \n namespace qflex::global {\n \n+\/\/ Default verbose level\n inline int verbose = 0;\n \n-\/\/ Max allowed memory\n-inline std::size_t memory_limit;\n+\/\/ Max allowed memory (default: 1GB)\n+inline std::size_t memory_limit = 1L << 30;\n \n } \/\/ namespace qflex::global\n \n"} {"commit":"b2d7211a791281b6b7b170536287acd7d9a0c8a9","subject":"handle errnoless abort","message":"handle errnoless abort\n","repos":"tsavola\/cio,tsavola\/cio,tsavola\/cio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cio\/error.c\n+++ cio\/error.c\n@@ -31,6 +31,10 @@\n *\/\n void CIO_NORETURN cio_abort(const char *message, int error)\n {\n-\tcio_error(\"%s: %s\", message, strerror(error));\n+\tif (error)\n+\t\tcio_error(\"%s: %s\", message, strerror(error));\n+\telse\n+\t\tcio_error(\"%s\", message);\n+\n \tabort();\n }\n"} {"commit":"cc6f35362585b4d447358da0d5114e4aba275ac1","subject":"drm\/radeon: update IB size estimation for VM","message":"drm\/radeon: update IB size estimation for VM\n\nThat should allow us to allocate bigger BOs.\n\nSigned-off-by: Christian K\u00f6nig <c7ea837d7a46effe4232b086213468b8b31643bf@amd.com>\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/radeon_vm.c\n+++ drivers\/gpu\/drm\/radeon\/radeon_vm.c\n@@ -410,8 +410,7 @@\n \taddr = radeon_bo_gpu_offset(bo);\n \tentries = radeon_bo_size(bo) \/ 8;\n \n-\tr = radeon_ib_get(rdev, R600_RING_TYPE_DMA_INDEX, &ib,\n-\t\t\t NULL, entries * 2 + 64);\n+\tr = radeon_ib_get(rdev, R600_RING_TYPE_DMA_INDEX, &ib, NULL, 256);\n \tif (r)\n goto error;\n \n@@ -419,6 +418,7 @@\n \n \tradeon_vm_set_pages(rdev, &ib, addr, 0, entries, 0, 0);\n \tradeon_asic_vm_pad_ib(rdev, &ib);\n+\tWARN_ON(ib.length_dw > 64);\n \n \tr = radeon_ib_schedule(rdev, &ib, NULL);\n \tif (r)\n@@ -642,7 +642,7 @@\n \tndw = 64;\n \n \t\/* assume the worst case *\/\n-\tndw += vm->max_pde_used * 16;\n+\tndw += vm->max_pde_used * 6;\n \n \t\/* update too big for an IB *\/\n \tif (ndw > 0xfffff)\n@@ -692,6 +692,7 @@\n \t\tradeon_asic_vm_pad_ib(rdev, &ib);\n \t\tradeon_semaphore_sync_to(ib.semaphore, pd->tbo.sync_obj);\n \t\tradeon_semaphore_sync_to(ib.semaphore, vm->last_id_use);\n+\t\tWARN_ON(ib.length_dw > ndw);\n \t\tr = radeon_ib_schedule(rdev, &ib, NULL);\n \t\tif (r) {\n \t\t\tradeon_ib_free(rdev, &ib);\n@@ -871,8 +872,9 @@\n {\n \tstruct radeon_vm *vm = bo_va->vm;\n \tstruct radeon_ib ib;\n-\tunsigned nptes, ndw;\n+\tunsigned nptes, ncmds, ndw;\n \tuint64_t addr;\n+\tuint32_t flags;\n \tint r;\n \n \tif (!bo_va->it.start) {\n@@ -911,19 +913,32 @@\n \n \tnptes = bo_va->it.last - bo_va->it.start + 1;\n \n+\t\/* reserve space for one command every (1 << BLOCK_SIZE) entries\n+\t or 2k dwords (whatever is smaller) *\/\n+\tncmds = (nptes >> min(radeon_vm_block_size, 11)) + 1;\n+\n \t\/* padding, etc. *\/\n \tndw = 64;\n \n-\tif (radeon_vm_block_size > 11)\n-\t\t\/* reserve space for one header for every 2k dwords *\/\n-\t\tndw += (nptes >> 11) * 4;\n-\telse\n-\t\t\/* reserve space for one header for\n-\t\t every (1 << BLOCK_SIZE) entries *\/\n-\t\tndw += (nptes >> radeon_vm_block_size) * 4;\n-\n-\t\/* reserve space for pte addresses *\/\n-\tndw += nptes * 2;\n+\tflags = radeon_vm_page_flags(bo_va->flags);\n+\tif ((flags & R600_PTE_GART_MASK) == R600_PTE_GART_MASK) {\n+\t\t\/* only copy commands needed *\/\n+\t\tndw += ncmds * 7;\n+\n+\t} else if (flags & R600_PTE_SYSTEM) {\n+\t\t\/* header for write data commands *\/\n+\t\tndw += ncmds * 4;\n+\n+\t\t\/* body of write data command *\/\n+\t\tndw += nptes * 2;\n+\n+\t} else {\n+\t\t\/* set page commands needed *\/\n+\t\tndw += ncmds * 10;\n+\n+\t\t\/* two extra commands for begin\/end of fragment *\/\n+\t\tndw += 2 * 10;\n+\t}\n \n \t\/* update too big for an IB *\/\n \tif (ndw > 0xfffff)\n@@ -939,6 +954,8 @@\n \t\t\t radeon_vm_page_flags(bo_va->flags));\n \n \tradeon_asic_vm_pad_ib(rdev, &ib);\n+\tWARN_ON(ib.length_dw > ndw);\n+\n \tradeon_semaphore_sync_to(ib.semaphore, vm->fence);\n \tr = radeon_ib_schedule(rdev, &ib, NULL);\n \tif (r) {\n"} {"commit":"bf55f32c6fd74b8eb0b31dce0ebd8f4c52f57743","subject":"run real vertex shaders, a total hack for now","message":"run real vertex shaders, a total hack for now\n","repos":"wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,adobe\/glsl2agal,adobe\/glsl2agal,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/pipe\/softpipe\/sp_draw_arrays.c\n+++ src\/mesa\/pipe\/softpipe\/sp_draw_arrays.c\n@@ -44,6 +44,163 @@\n #include \"pipe\/draw\/draw_context.h\"\n #include \"pipe\/draw\/draw_prim.h\"\n \n+#include \"pipe\/tgsi\/core\/tgsi_exec.h\"\n+#include \"pipe\/tgsi\/core\/tgsi_build.h\"\n+#include \"pipe\/tgsi\/core\/tgsi_util.h\"\n+\n+\n+#if defined __GNUC__\n+#define USE_ALIGNED_ATTRIBS 1\n+#define ALIGN16_SUFFIX __attribute__(( aligned( 16 ) ))\n+#else\n+#define USE_ALIGNED_ATTRIBS 0\n+#define ALIGN16_SUFFIX\n+#endif\n+\n+\n+static struct softpipe_context *sp_global = NULL;\n+\n+\n+static void\n+run_vertex_program2(struct draw_context *draw,\n+ const void *vbuffer, unsigned elem,\n+ struct vertex_header *vOut)\n+{\n+#if 1\n+ struct softpipe_context *sp = sp_global;\n+#endif\n+ struct tgsi_exec_machine machine;\n+ int i;\n+\n+#if USE_ALIGNED_ATTRIBS\n+ struct tgsi_exec_vector inputs[PIPE_ATTRIB_MAX] ALIGN16_SUFFIX;\n+ struct tgsi_exec_vector outputs[PIPE_ATTRIB_MAX] ALIGN16_SUFFIX;\n+#else\n+ struct tgsi_exec_vector inputs[PIPE_ATTRIB_MAX + 1];\n+ struct tgsi_exec_vector outputs[PIPE_ATTRIB_MAX + 1];\n+#endif\n+\n+#ifdef DEBUG\n+ memset( &machine, 0, sizeof( machine ) );\n+#endif\n+\n+ \/* init machine state *\/\n+ tgsi_exec_machine_init(\n+ &machine,\n+ sp->vs.tokens,\n+ PIPE_MAX_SAMPLERS,\n+ NULL \/*samplers*\/ );\n+\n+ \/* Consts does not require 16 byte alignment. *\/\n+ machine.Consts = sp->vs.constants->constant;\n+\n+#if USE_ALIGNED_ATTRIBS\n+ machine.Inputs = inputs;\n+ machine.Outputs = outputs;\n+#else\n+ machine.Inputs = (struct tgsi_exec_vector *) tgsi_align_128bit( inputs );\n+ machine.Outputs = (struct tgsi_exec_vector *) tgsi_align_128bit( outputs );\n+#endif\n+\n+ {\n+ const void *mapped = vbuffer;\n+ const float *vIn, *cIn;\n+ vIn = (const float *) ((const ubyte *) mapped\n+ + draw->vertex_buffer[0].buffer_offset\n+ + draw->vertex_element[0].src_offset\n+ + elem * draw->vertex_buffer[0].pitch);\n+\n+ cIn = (const float *) ((const ubyte *) mapped\n+ + draw->vertex_buffer[3].buffer_offset\n+ + draw->vertex_element[3].src_offset\n+ + elem * draw->vertex_buffer[3].pitch);\n+ \/*X*\/\n+ machine.Inputs[0].xyzw[0].f[0] = vIn[0];\n+ machine.Inputs[0].xyzw[0].f[1] = vIn[0];\n+ machine.Inputs[0].xyzw[0].f[2] = vIn[0];\n+ machine.Inputs[0].xyzw[0].f[3] = vIn[0];\n+\n+ \/*Y*\/\n+ machine.Inputs[0].xyzw[1].f[0] = vIn[1];\n+ machine.Inputs[0].xyzw[1].f[1] = vIn[1];\n+ machine.Inputs[0].xyzw[1].f[2] = vIn[1];\n+ machine.Inputs[0].xyzw[1].f[3] = vIn[1];\n+\n+ \/*Z*\/\n+ machine.Inputs[0].xyzw[2].f[0] = vIn[2];\n+ machine.Inputs[0].xyzw[2].f[1] = vIn[2];\n+ machine.Inputs[0].xyzw[2].f[2] = vIn[2];\n+ machine.Inputs[0].xyzw[2].f[3] = vIn[2];\n+\n+ \/*W*\/\n+ machine.Inputs[0].xyzw[3].f[0] = 1.0;\n+ machine.Inputs[0].xyzw[3].f[1] = 1.0;\n+ machine.Inputs[0].xyzw[3].f[2] = 1.0;\n+ machine.Inputs[0].xyzw[3].f[3] = 1.0;\n+\n+ printf(\"VS Input: %f %f %f %f\\n\",\n+ vIn[0], vIn[1], vIn[2], 1.0);\n+ }\n+\n+ printf(\"Consts:\\n\");\n+ for (i = 0; i < 4; i++) {\n+ printf(\" %d: %f %f %f %f\\n\", i,\n+ machine.Consts[i][0],\n+ machine.Consts[i][1],\n+ machine.Consts[i][2],\n+ machine.Consts[i][3]);\n+ }\n+\n+\n+ \/* run shader *\/\n+ tgsi_exec_machine_run( &machine );\n+\n+ \/* store result pos *\/\n+ printf(\"VS result: %f %f %f %f\\n\",\n+ outputs[0].xyzw[0].f[0],\n+ outputs[0].xyzw[1].f[0],\n+ outputs[0].xyzw[2].f[0],\n+ outputs[0].xyzw[3].f[0]);\n+ {\n+ const float *scale = draw->viewport.scale;\n+ const float *trans = draw->viewport.translate;\n+ float x, y, z, w;\n+\n+ x = outputs[0].xyzw[0].f[0];\n+ y = outputs[0].xyzw[1].f[0];\n+ z = outputs[0].xyzw[2].f[0];\n+ w = outputs[0].xyzw[3].f[0];\n+\n+ \/* divide by w *\/\n+ x \/= w;\n+ y \/= w;\n+ z \/= w;\n+ w = 1.0 \/ w;\n+\n+ \/* Viewport *\/\n+ vOut->data[0][0] = scale[0] * x + trans[0];\n+ vOut->data[0][1] = scale[1] * y + trans[1];\n+ vOut->data[0][2] = scale[2] * z + trans[2];\n+ vOut->data[0][3] = w;\n+ printf(\"wincoord: %f %f %f\\n\",\n+ vOut->data[0][0],\n+ vOut->data[0][1],\n+ vOut->data[0][2]);\n+\n+ vOut->data[1][0] = 1.0;\n+ vOut->data[1][1] = 1.0;\n+ vOut->data[1][2] = 1.0;\n+ vOut->data[1][3] = 1.0;\n+\n+ }\n+\n+#if 0\n+ memcpy(\n+ quad->outputs.color,\n+ &machine.Outputs[1].xyzw[0].f[0],\n+ sizeof( quad->outputs.color ) );\n+#endif\n+}\n \n \n \/**\n@@ -59,6 +216,9 @@\n const void *vbuffer, unsigned elem,\n struct vertex_header *vOut)\n {\n+ run_vertex_program2(draw, vbuffer, elem, vOut);\n+\n+#if 0\n const float *vIn, *cIn;\n const float *scale = draw->viewport.scale;\n const float *trans = draw->viewport.translate;\n@@ -110,6 +270,7 @@\n vOut->data[1][2] = cIn[2];\n vOut->data[1][3] = 1.0;\n }\n+#endif\n }\n \n \n@@ -161,6 +322,8 @@\n struct draw_context *draw = sp->draw;\n struct pipe_buffer_handle *buf;\n \n+ sp_global = sp;\n+\n softpipe_map_surfaces(sp);\n \n \/*\n"} {"commit":"ee2661e64e5d759893db54684617cc9b928e6330","subject":"* subversion\/libsvn_fs_fs\/transaction.c (get_shared_rep): Fix typo in comment. No functional change.","message":"* subversion\/libsvn_fs_fs\/transaction.c\n (get_shared_rep): Fix typo in comment. No functional change.\n\nFound by: julianfoad\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1681949 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_fs_fs\/transaction.c\n+++ subversion\/libsvn_fs_fs\/transaction.c\n@@ -2266,7 +2266,7 @@\n {\n \/* Make the problem show up in the server log.\n \n- Because not sharing reps is always a save option,\n+ Because not sharing reps is always a safe option,\n terminating the request would be inappropriate.\n *\/\n svn_checksum_t checksum;\n"} {"commit":"55ada8f9ed5a2a028f69dd9453dbcb24c3623046","subject":"DMA buffer allocation, DMA controller","message":"DMA buffer allocation, DMA controller\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hw\/floppy\/test.c\n+++ hw\/floppy\/test.c\n@@ -11,6 +11,7 @@\n \n #include <hw\/vga\/vga.h>\n #include <hw\/dos\/dos.h>\n+#include <hw\/8237\/8237.h>\t\t\/* DMA controller *\/\n #include <hw\/8254\/8254.h>\t\t\/* 8254 timer *\/\n #include <hw\/8259\/8259.h>\t\t\/* 8259 PIC interrupts *\/\n #include <hw\/vga\/vgagui.h>\n@@ -54,6 +55,8 @@\n \tif (x < 0 || x >= (sizeof(floppy_standard_isa)\/sizeof(floppy_standard_isa[0]))) return NULL;\n \treturn &floppy_standard_isa[x];\n }\n+\n+struct dma_8237_allocation*\t\tfloppy_dma = NULL; \/* DMA buffer *\/\n \n struct floppy_controller\t\tfloppy_controllers[MAX_FLOPPY_CONTROLLER];\n int8_t\t\t\t\t\tfloppy_controllers_init = -1;\n@@ -867,6 +870,18 @@\n \tint select=-1;\n \tint c;\n \n+\t\/* and allocate DMA too *\/\n+\tif (fdc->dma >= 0 && floppy_dma == NULL) {\n+\t\tuint32_t choice = 32768;\n+\n+\t\tdo {\n+\t\t\tfloppy_dma = dma_8237_alloc_buffer(choice);\n+\t\t\tif (floppy_dma == NULL) choice -= 4096UL;\n+\t\t} while (floppy_dma == NULL && choice > 4096UL);\n+\n+\t\tif (floppy_dma == NULL) return;\n+\t}\n+\n \t\/* if the floppy struct says to use interrupts, then do it *\/\n \tdo_floppy_controller_enable_irq(fdc,fdc->use_dma);\n \n@@ -894,6 +909,10 @@\n \t\t\t}\n \t\t\tif (fdc->dma >= 0) {\n \t\t\t\tsprintf(tmp,\" DMA %d\",fdc->dma);\n+\t\t\t\tvga_write(tmp);\n+\t\t\t}\n+\t\t\tif (floppy_dma != NULL) {\n+\t\t\t\tsprintf(tmp,\" phys=%08lxh len=%04lxh\",(unsigned long)floppy_dma->phys,(unsigned long)floppy_dma->length);\n \t\t\t\tvga_write(tmp);\n \t\t\t}\n \t\t\twhile (vga_pos_x < vga_width && vga_pos_x != 0) vga_writec(' ');\n@@ -1101,6 +1120,11 @@\n \t\t}\n \t}\n \n+\tif (floppy_dma != NULL) {\n+\t\tdma_8237_free_buffer(floppy_dma);\n+\t\tfloppy_dma = NULL;\n+\t}\n+\n \tdo_floppy_controller_enable_irq(fdc,0);\n \tfloppy_controller_enable_dma_otr(fdc,1); \/* because BIOSes probably won't *\/\n \tp8259_unmask(fdc->irq);\n@@ -1214,6 +1238,8 @@\n \t\tprintf(\"Cannot init VGA\\n\");\n \t\treturn 1;\n \t}\n+\tif (!probe_8237())\n+\t\tprintf(\"WARNING: Cannot init 8237 DMA\\n\");\n \t\/* the floppy code has some timing requirements and we'll use the 8254 to do it *\/\n \t\/* newer motherboards don't even have a floppy controller and it's probable they'll stop implementing the 8254 at some point too *\/\n \tif (!probe_8254()) {\n"} {"commit":"38101632f3ca8316a8c9093f3f725b91b87eec52","subject":"errors","message":"errors\n","repos":"arjun372\/CS111_Spring16","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c3eaa088277709d3e489c19a5a5b698eefbeb434","subject":"drm\/radeon\/dpm\/rs780: use drm_mode_vrefresh()","message":"drm\/radeon\/dpm\/rs780: use drm_mode_vrefresh()\n\nRather than open coding it.\n\nSigned-off-by: Alex Deucher <08dc22c6156113f2deff178e35e3ed9b24d6af9e@amd.com>\nReviewed-by: Christian K\u00f6nig <c7ea837d7a46effe4232b086213468b8b31643bf@amd.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/gpu\/drm\/radeon\/rs780_dpm.c\n+++ drivers\/gpu\/drm\/radeon\/rs780_dpm.c\n@@ -62,9 +62,7 @@\n \t\t\tradeon_crtc = to_radeon_crtc(crtc);\n \t\t\tpi->crtc_id = radeon_crtc->crtc_id;\n \t\t\tif (crtc->mode.htotal && crtc->mode.vtotal)\n-\t\t\t\tpi->refresh_rate =\n-\t\t\t\t\t(crtc->mode.clock * 1000) \/\n-\t\t\t\t\t(crtc->mode.htotal * crtc->mode.vtotal);\n+\t\t\t\tpi->refresh_rate = drm_mode_vrefresh(&crtc->mode);\n \t\t\tbreak;\n \t\t}\n \t}\n"} {"commit":"9704f819f61923131f439826eaf454f96c208f86","subject":"sddsds","message":"sddsds","repos":"nkouvelas\/nikos,nkouvelas\/nikos","returncode":1,"stderr":"error: pathspec 'firmware\/pgmspace.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- firmware\/pgmspace.h\n+++ firmware\/pgmspace.h\n@@ -0,0 +1,23 @@\n+#ifndef __PGMSPACE_H__\n+#define __PGMSPACE_H__\n+\n+#include <inttypes.h>\n+#define PROGMEM\n+#define strlen_P strlen\n+#define memcpy_P memcpy\n+#define PSTR(x) (x)\n+typedef const char prog_char;\n+typedef uint8_t prog_uint8_t;\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+inline uint8_t pgm_read_byte(const uint8_t* p) { return *p; }\n+inline uint32_t pgm_read_dword(const uint32_t* p) { return *p; }\n+extern void printf_P(const char* format,...);\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+#endif \/\/ __PGMSPACE_H__\n"} {"commit":"eaedc1bb3e651884a184f520bd81aa12c569c29b","subject":"st\/mesa: Remove unnecessary headers from st_framebuffer.c.","message":"st\/mesa: Remove unnecessary headers from st_framebuffer.c.\n","repos":"bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_framebuffer.c\n+++ src\/mesa\/state_tracker\/st_framebuffer.c\n@@ -30,15 +30,11 @@\n #include \"main\/buffers.h\"\n #include \"main\/context.h\"\n #include \"main\/framebuffer.h\"\n-#include \"main\/matrix.h\"\n #include \"main\/renderbuffer.h\"\n-#include \"main\/scissor.h\"\n-#include \"main\/viewport.h\"\n #include \"st_context.h\"\n #include \"st_cb_fbo.h\"\n #include \"st_public.h\"\n #include \"pipe\/p_defines.h\"\n-#include \"pipe\/p_context.h\"\n \n \n struct st_framebuffer *\n"} {"commit":"548207e00acb7c352cc6e661ed902a47a7dfac40","subject":"Use expand tab; clarify license and inspiration; simplify spacing; add second movement style","message":"Use expand tab; clarify license and inspiration; simplify spacing; add second movement style\n","repos":"HalosGhost\/.dotfiles,HalosGhost\/.dotfiles","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- bin\/src\/sicolor.c\n+++ bin\/src\/sicolor.c\n@@ -1,9 +1,9 @@\n-\/************************************************\\\n-* Display ANSI Color Schemes with Space Invaders *\n-* Based on a bash script by pfh and lollicon *\n-* Sam Stuewe (C) 2014 *\n-* Licensed: GPLv2 *\n-\\************************************************\/\n+\/**************************************************\\\n+* Display ANSI Color Schemes with Space Invaders *\n+* Inspired by a bash script by pfh and lolilolicon *\n+* Sam Stuewe (C) 2014 Licensed under the terms of *\n+* the GNU Public License version 2 *\n+\\**************************************************\/\n \n \/\/ Includes \/\/\n #include <stdio.h>\n@@ -11,86 +11,89 @@\n \n \/\/ Main Function \/\/\n int main (void) {\n-\t\/* Top Row Invaders *\/\n-\tprintf(ANSI_FG_BLACK \" \u2580\u2584 \u2584\u2580 \" \n-\t\t ANSI_FG_RED \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584 \" \n-\t\t ANSI_FG_GREEN \" \u2584\u2588\u2588\u2584 \" \n-\t\t ANSI_FG_YELLOW \" \u2580\u2584 \u2584\u2580 \" \n-\t\t ANSI_FG_BLUE \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584 \" \n-\t\t ANSI_FG_MAGENTA \" \u2584\u2588\u2588\u2584 \" \n-\t\t ANSI_FG_CYAN \" \u2580\u2584 \u2584\u2580 \\n\" );\n \n-\tprintf(ANSI_FG_BLACK \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \" \n-\t\t ANSI_FG_RED \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n-\t\t ANSI_FG_GREEN \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n-\t\t ANSI_FG_YELLOW \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \" \n-\t\t ANSI_FG_BLUE \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n-\t\t ANSI_FG_MAGENTA \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n-\t\t ANSI_FG_CYAN \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \\n\" );\n+ \/* Top Row Invaders *\/\n+ printf(ANSI_FG_BLACK \" \u2580\u2584 \u2584\u2580\" \n+ ANSI_FG_RED \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584\" \n+ ANSI_FG_GREEN \" \u2584\u2588\u2588\u2584\" \n+ ANSI_FG_YELLOW \" \u2580\u2584 \u2584\u2580\" \n+ ANSI_FG_BLUE \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584\" \n+ ANSI_FG_MAGENTA \" \u2584\u2588\u2588\u2584\" \n+ ANSI_FG_CYAN \" \u2580\u2584 \u2584\u2580\\n\" );\n \n-\tprintf(ANSI_FG_BLACK \"\u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n-\t\t ANSI_FG_RED \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n-\t\t ANSI_FG_GREEN \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n-\t\t ANSI_FG_YELLOW \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n-\t\t ANSI_FG_BLUE \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n-\t\t ANSI_FG_MAGENTA \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n-\t\t ANSI_FG_CYAN \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\\n\" );\n+ printf(ANSI_FG_BLACK \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_RED \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n+ ANSI_FG_GREEN \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_YELLOW \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_BLUE \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n+ ANSI_FG_MAGENTA \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_CYAN \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\\n\" );\n \n-\tprintf(ANSI_FG_BLACK \"\u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\"\n-\t\t ANSI_FG_RED \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580 \"\n-\t\t ANSI_FG_GREEN \" \u2580\u2584 \u2584\u2580\" \n-\t\t ANSI_FG_YELLOW \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\" \n-\t\t ANSI_FG_BLUE \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580 \" \n-\t\t ANSI_FG_MAGENTA \" \u2580\u2584 \u2584\u2580\" \n-\t\t ANSI_FG_CYAN \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\\n\" );\n+ printf(ANSI_FG_BLACK \"\u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n+ ANSI_FG_RED \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n+ ANSI_FG_GREEN \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n+ ANSI_FG_YELLOW \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n+ ANSI_FG_BLUE \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n+ ANSI_FG_MAGENTA \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n+ ANSI_FG_CYAN \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\\n\" );\n \n-\tprintf(\"\\n\");\n+ printf(ANSI_FG_BLACK \"\u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\"\n+ ANSI_FG_RED \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580\"\n+ ANSI_FG_GREEN \" \u2580\u2584 \u2584\u2580\" \n+ ANSI_FG_YELLOW \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\" \n+ ANSI_FG_BLUE \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580\" \n+ ANSI_FG_MAGENTA \" \u2580\u2584 \u2584\u2580\" \n+ ANSI_FG_CYAN \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\\n\" );\n \n-\t\/* Bottom Row Invaders *\/\n-\tprintf(ANSI_BOLD_ON\n-\t\t ANSI_FG_BLACK \" \u2580\u2584 \u2584\u2580 \" \n-\t\t ANSI_FG_RED \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584 \" \n-\t\t ANSI_FG_GREEN \" \u2584\u2588\u2588\u2584 \" \n-\t\t ANSI_FG_YELLOW \" \u2580\u2584 \u2584\u2580 \" \n-\t\t ANSI_FG_BLUE \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584 \" \n-\t\t ANSI_FG_MAGENTA \" \u2584\u2588\u2588\u2584 \" \n-\t\t ANSI_FG_CYAN \" \u2580\u2584 \u2584\u2580 \\n\" );\n+ printf(\"\\n\");\n \n-\tprintf(ANSI_BOLD_ON\n-\t\t ANSI_FG_BLACK \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \" \n-\t\t ANSI_FG_RED \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n-\t\t ANSI_FG_GREEN \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n-\t\t ANSI_FG_YELLOW \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \" \n-\t\t ANSI_FG_BLUE \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n-\t\t ANSI_FG_MAGENTA \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n-\t\t ANSI_FG_CYAN \" \u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584 \\n\" );\n+ \/* Bottom Row Invaders *\/\n+ printf(ANSI_BOLD_ON\n+ ANSI_FG_BLACK \"\u2584 \u2580\u2584 \u2584\u2580 \u2584\" \n+ ANSI_FG_RED \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584\" \n+ ANSI_FG_GREEN \" \u2584\u2588\u2588\u2584\" \n+ ANSI_FG_YELLOW \" \u2584 \u2580\u2584 \u2584\u2580 \u2584\" \n+ ANSI_FG_BLUE \" \u2584\u2584\u2584\u2588\u2588\u2588\u2588\u2584\u2584\u2584\" \n+ ANSI_FG_MAGENTA \" \u2584\u2588\u2588\u2584\" \n+ ANSI_FG_CYAN \" \u2584 \u2580\u2584 \u2584\u2580 \u2584\\n\" );\n \n-\tprintf(ANSI_BOLD_ON\n-\t\t ANSI_FG_BLACK \"\u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n-\t\t ANSI_FG_RED \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n-\t\t ANSI_FG_GREEN \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n-\t\t ANSI_FG_YELLOW \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\" \n-\t\t ANSI_FG_BLUE \" \u2580\u2580\u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2588\u2580\u2580\" \n-\t\t ANSI_FG_MAGENTA \" \u2580\u2588\u2580\u2588\u2588\u2580\u2588\u2580\" \n-\t\t ANSI_FG_CYAN \" \u2588\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\u2588\\n\" );\n+ printf(ANSI_BOLD_ON\n+ ANSI_FG_BLACK \"\u2588\u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\u2588\" \n+ ANSI_FG_RED \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n+ ANSI_FG_GREEN \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_YELLOW \" \u2588\u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\u2588\" \n+ ANSI_FG_BLUE \" \u2588\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2588\" \n+ ANSI_FG_MAGENTA \" \u2584\u2588\u2580\u2588\u2588\u2580\u2588\u2584\" \n+ ANSI_FG_CYAN \" \u2588\u2584\u2588\u2580\u2588\u2588\u2588\u2580\u2588\u2584\u2588\\n\" );\n \n-\tprintf(ANSI_BOLD_ON\n-\t\t ANSI_FG_BLACK \"\u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\"\n-\t\t ANSI_FG_RED \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580 \"\n-\t\t ANSI_FG_GREEN \" \u2580\u2584 \u2584\u2580\" \n-\t\t ANSI_FG_YELLOW \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\" \n-\t\t ANSI_FG_BLUE \" \u2580\u2588\u2584 \u2580\u2580 \u2584\u2588\u2580 \" \n-\t\t ANSI_FG_MAGENTA \" \u2580\u2584 \u2584\u2580\" \n-\t\t ANSI_FG_CYAN \" \u2580 \u2580\u2584\u2584 \u2584\u2584\u2580 \u2580\\n\" );\n+ printf(ANSI_BOLD_ON\n+ ANSI_FG_BLACK \"\u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\" \n+ ANSI_FG_RED \" \u2580\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2580\" \n+ ANSI_FG_GREEN \" \u2580\u2580\u2588\u2580\u2580\u2588\u2580\u2580\" \n+ ANSI_FG_YELLOW \" \u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\" \n+ ANSI_FG_BLUE \" \u2580\u2580\u2580\u2588\u2588\u2580\u2580\u2588\u2588\u2580\u2580\u2580\" \n+ ANSI_FG_MAGENTA \" \u2580\u2580\u2588\u2580\u2580\u2588\u2580\u2580\" \n+ ANSI_FG_CYAN \" \u2580\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2580\\n\" );\n \n-\tprintf(ANSI_RESET \"\\n\");\n+ printf(ANSI_BOLD_ON\n+ ANSI_FG_BLACK \" \u2584\u2580 \u2580\u2584\"\n+ ANSI_FG_RED \" \u2584\u2584\u2580\u2580 \u2580\u2580 \u2580\u2580\u2584\u2584\"\n+ ANSI_FG_GREEN \" \u2584\u2580\u2584\u2580\u2580\u2584\u2580\u2584\" \n+ ANSI_FG_YELLOW \" \u2584\u2580 \u2580\u2584\" \n+ ANSI_FG_BLUE \" \u2584\u2584\u2580\u2580 \u2580\u2580 \u2580\u2580\u2584\u2584\" \n+ ANSI_FG_MAGENTA \" \u2584\u2580\u2584\u2580\u2580\u2584\u2580\u2584\" \n+ ANSI_FG_CYAN \" \u2584\u2580 \u2580\u2584\\n\" );\n \n-\t\/* Defender's Tank *\/\n-\tprintf(\"\\t\\t\\t\\t\\t \u258c\\n\\n\");\n-\tprintf(\"\\t\\t\\t\\t\\t\u258c\\n\\n\");\n-\tprintf(\"\\t\\t\\t\\t \u2584\u2588\u2584\\n\");\n-\tprintf(\"\\t\\t\\t\\t \u2584\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2584\\n\");\n-\tprintf(\"\\t\\t\\t\\t \u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\\n\");\n+ printf(ANSI_RESET \"\\n\");\n \n-\treturn 0;\n+ \/* Defender's Tank *\/\n+ printf(\"\\t\\t\\t\\t\\t \u258c\\n\\n\");\n+ printf(\"\\t\\t\\t\\t\\t\u258c\\n\\n\");\n+ printf(\"\\t\\t\\t\\t \u2584\u2588\u2584\\n\");\n+ printf(\"\\t\\t\\t\\t \u2584\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2584\\n\");\n+ printf(\"\\t\\t\\t\\t \u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\u2580\\n\");\n+\n+ return 0;\n }\n+\n+\/\/ vim: set ts=4 sw=4 et:\n"} {"commit":"4db0de0d09987cc79482e988ec06350d57d66b29","subject":"Extract helper function in Windows certificate validation code.","message":"Extract helper function in Windows certificate validation code.\n\n* subversion\/libsvn_subr\/win32_crypto.c\n (certcontext_from_base64): New.\n (windows_validate_certificate): Use certcontext_from_base64().\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/win32_crypto.c\n+++ subversion\/libsvn_subr\/win32_crypto.c\n@@ -325,6 +325,28 @@\n \/* CryptoApi. *\/\n \/*-----------------------------------------------------------------------*\/\n \n+\/* Helper to create CryptoAPI CERT_CONTEXT from base64 encoded BASE64_CERT.\n+ * Returns NULL on error.\n+ *\/\n+static PCCERT_CONTEXT\n+certcontext_from_base64(const char *base64_cert, apr_pool_t *pool)\n+{\n+ PCCERT_CONTEXT cert_context = NULL;\n+ int cert_len;\n+ BYTE *binary_cert;\n+\n+ \/* Use apr-util as CryptStringToBinaryA is available only on XP+. *\/\n+ binary_cert = apr_palloc(pool,\n+ apr_base64_decode_len(base64_cert));\n+ cert_len = apr_base64_decode((char*)binary_cert, base64_cert);\n+\n+ \/* Parse the certificate into a context. *\/\n+ cert_context = CertCreateCertificateContext\n+ (X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, binary_cert, cert_len);\n+\n+ return cert_context;\n+}\n+\n \/* Helper for windows_ssl_server_trust_first_credentials for validating\n * certificate using CryptoApi. Sets *OK_P to TRUE if base64 encoded ASCII_CERT\n * certificate considered as valid.\n@@ -337,19 +359,11 @@\n PCCERT_CONTEXT cert_context = NULL;\n CERT_CHAIN_PARA chain_para;\n PCCERT_CHAIN_CONTEXT chain_context = NULL;\n- int cert_len;\n- BYTE *binary_cert;\n \n *ok_p = FALSE;\n \n- \/* Use apr-util as CryptStringToBinaryA is available only on XP+. *\/\n- binary_cert = apr_palloc(pool,\n- apr_base64_decode_len(ascii_cert));\n- cert_len = apr_base64_decode((char*)binary_cert, ascii_cert);\n-\n \/* Parse the certificate into a context. *\/\n- cert_context = CertCreateCertificateContext\n- (X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, binary_cert, cert_len);\n+ cert_context = certcontext_from_base64(ascii_cert, pool);\n \n if (cert_context)\n {\n"} {"commit":"665bf663d8d3bd04f55c9b55176c094a6844b952","subject":"Fix SB16 command test to use auto-init form (despite non-auto-init DMA) if Reveal SC-4000 \/ Galland SC-6600 card detected. Those cards don't recognize command 0xC0, but do recognize 0xC6.","message":"Fix SB16 command test to use auto-init form (despite non-auto-init DMA)\nif Reveal SC-4000 \/ Galland SC-6600 card detected. Those cards don't\nrecognize command 0xC0, but do recognize 0xC6.\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hw\/sndsb\/ts_ps.c\n+++ hw\/sndsb\/ts_ps.c\n@@ -575,7 +575,13 @@\n {\n unsigned int lv = (unsigned int)(tlen - 1UL);\n \n- sndsb_write_dsp(sb_card,SNDSB_DSPCMD_SB16_DMA_DAC_OUT_8BIT); \/* 0xC0 *\/\n+ \/* NTS: Reveal SC-4000 (Gallant 6600) cards DO support SB16 but only specific commands.\n+ * Command 0xC0 is not recognized, but command 0xC6 works. *\/\n+ if (sb_card->is_gallant_sc6600)\n+ sndsb_write_dsp(sb_card,SNDSB_DSPCMD_SB16_AUTOINIT_DMA_DAC_OUT_8BIT); \/* 0xC6 *\/\n+ else\n+ sndsb_write_dsp(sb_card,SNDSB_DSPCMD_SB16_DMA_DAC_OUT_8BIT); \/* 0xC0 *\/\n+\n sndsb_write_dsp(sb_card,0x00); \/* mode (8-bit unsigned PCM) *\/\n sndsb_write_dsp(sb_card,lv);\n sndsb_write_dsp(sb_card,lv >> 8);\n"} {"commit":"f59c2576c12d4367ca4bdade0eb054b4558f9762","subject":"iio:trigger: Convert to use ATTRIBUTE_GROUPS","message":"iio:trigger: Convert to use ATTRIBUTE_GROUPS\n\nUse new ATTRIBUTE_GROUPS macro to declare attribute groups.\n\nSigned-off-by: Axel Lin <b6ffd6973e972cb999e8e535ab74da7fee0c035f@ingics.com>\nSigned-off-by: Jonathan Cameron <09f65b71b7655725897b2fd41a09a0cefe2e1ace@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/iio\/industrialio-trigger.c\n+++ drivers\/iio\/industrialio-trigger.c\n@@ -55,15 +55,7 @@\n \t&dev_attr_name.attr,\n \tNULL,\n };\n-\n-static struct attribute_group iio_trig_attr_group = {\n-\t.attrs\t= iio_trig_dev_attrs,\n-};\n-\n-static const struct attribute_group *iio_trig_attr_groups[] = {\n-\t&iio_trig_attr_group,\n-\tNULL\n-};\n+ATTRIBUTE_GROUPS(iio_trig_dev);\n \n int iio_trigger_register(struct iio_trigger *trig_info)\n {\n@@ -403,7 +395,7 @@\n \n static struct device_type iio_trig_type = {\n \t.release = iio_trig_release,\n-\t.groups = iio_trig_attr_groups,\n+\t.groups = iio_trig_dev_groups,\n };\n \n static void iio_trig_subirqmask(struct irq_data *d)\n"} {"commit":"3f992cc0d31ceb7e6f8ba5306c04d91ca430bbd8","subject":"* subversion\/libsvn_wc\/wc_db_pristine.c (get_pristine_fname): Remove a comment obsoleted by r910234.","message":"* subversion\/libsvn_wc\/wc_db_pristine.c\n (get_pristine_fname): Remove a comment obsoleted by r910234.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/wc_db_pristine.c\n+++ subversion\/libsvn_wc\/wc_db_pristine.c\n@@ -43,7 +43,6 @@\n configured for the working copy indicated by PDH. The returned path\n does not necessarily currently exist.\n \n-\n Any other allocations are made in SCRATCH_POOL. *\/\n static svn_error_t *\n get_pristine_fname(const char **pristine_abspath,\n@@ -62,9 +61,6 @@\n SVN_ERR_ASSERT(sha1_checksum != NULL);\n SVN_ERR_ASSERT(sha1_checksum->kind == svn_checksum_sha1);\n \n- \/* ### need to fix this to use a symbol for \".svn\". we don't need\n- ### to use join_many since we know \"\/\" is the separator for\n- ### internal canonical paths *\/\n base_dir_abspath = svn_dirent_join_many(scratch_pool,\n wcroot_abspath,\n svn_wc_get_adm_dir(scratch_pool),\n"} {"commit":"f25330f63edd8e2d02ca76ed43fc852d4d76bb12","subject":"iio:magnetometer:mag3110: Report busy in _read_raw() \/ write_raw() when buffer is enabled","message":"iio:magnetometer:mag3110: Report busy in _read_raw() \/ write_raw() when buffer is enabled\n\nindividual reads are not permitted concurrently with buffered reads\n\nSigned-off-by: Peter Meerwald <a2c19d57d338d8f9d8de092166164455662a8cbe@pmeerw.net>\nSigned-off-by: Jonathan Cameron <09f65b71b7655725897b2fd41a09a0cefe2e1ace@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/iio\/magnetometer\/mag3110.c\n+++ drivers\/iio\/magnetometer\/mag3110.c\n@@ -154,6 +154,9 @@\n \n \tswitch (mask) {\n \tcase IIO_CHAN_INFO_RAW:\n+\t\tif (iio_buffer_enabled(indio_dev))\n+\t\t\treturn -EBUSY;\n+\n \t\tswitch (chan->type) {\n \t\tcase IIO_MAGN: \/* in 0.1 uT \/ LSB *\/\n \t\t\tret = mag3110_read(data, buffer);\n@@ -199,6 +202,9 @@\n \tstruct mag3110_data *data = iio_priv(indio_dev);\n \tint rate;\n \n+\tif (iio_buffer_enabled(indio_dev))\n+\t\treturn -EBUSY;\n+\n \tswitch (mask) {\n \tcase IIO_CHAN_INFO_SAMP_FREQ:\n \t\trate = mag3110_get_samp_freq_index(data, val, val2);\n"} {"commit":"f5d0d288f2b43b22652839b8712ef052ffd7957f","subject":"Correct the statistics gathered 'svnbench null-export' output. The start node was not included into it.","message":"Correct the statistics gathered 'svnbench null-export' output. The start\nnode was not included into it.\n\n* subversion\/svnbench\/null-export-cmd.c\n (file_write_handler): New stream function.\n (bench_null_export): Count the root node. For exports of single files,\n count the plaintext bytes received.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1703686 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/svnbench\/null-export-cmd.c\n+++ subversion\/svnbench\/null-export-cmd.c\n@@ -166,6 +166,15 @@\n return SVN_NO_ERROR;\n }\n \n+\/* Implement svn_write_fn_t, simply counting the incoming data. *\/\n+static svn_error_t *\n+file_write_handler(void *baton, const char *data, apr_size_t *len)\n+{\n+ edit_baton_t *eb = baton;\n+ eb->byte_count += *len;\n+\n+ return SVN_NO_ERROR;\n+}\n \n \/*** Public Interfaces ***\/\n \n@@ -199,6 +208,7 @@\n svn_client__pathrev_t *loc;\n svn_ra_session_t *ra_session;\n svn_node_kind_t kind;\n+ edit_baton_t *eb = baton;\n \n \/* Get the RA connection. *\/\n SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &loc,\n@@ -212,6 +222,11 @@\n {\n apr_hash_t *props;\n \n+ \/* Since we don't use the editor, we must count \"manually\". *\/\n+ svn_stream_t *stream = svn_stream_create(eb, pool);\n+ svn_stream_set_write(stream, file_write_handler);\n+ eb->file_count++;\n+\n \/* Since you cannot actually root an editor at a file, we\n * manually drive a few functions of our editor. *\/\n \n@@ -219,8 +234,7 @@\n * to the repository. *\/\n \/* ### note: the stream will not be closed *\/\n SVN_ERR(svn_ra_get_file(ra_session, \"\", loc->rev,\n- svn_stream_empty(pool),\n- NULL, &props, pool));\n+ stream, NULL, &props, pool));\n }\n else if (kind == svn_node_dir)\n {\n@@ -269,6 +283,10 @@\n NULL, pool));\n \n SVN_ERR(reporter->finish_report(report_baton, pool));\n+\n+ \/* We don't receive the \"add directory\" callback for the starting\n+ * node. *\/\n+ eb->dir_count++;\n }\n else if (kind == svn_node_none)\n {\n"} {"commit":"bbf207860931b6a033d0fbcd170ae2332c0d8216","subject":"[IB] user_mad: Use class_device.devt","message":"[IB] user_mad: Use class_device.devt\n\nUse devt member of struct class_device so that we don't have to create\nour own \"dev\" file in sysfs.\n\nSigned-off-by: Roland Dreier <91e9b5f7ca0bb6300133ed378670d64af90dde66@cisco.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/infiniband\/core\/user_mad.c\n+++ drivers\/infiniband\/core\/user_mad.c\n@@ -671,17 +671,6 @@\n \t.remove = ib_umad_remove_one\n };\n \n-static ssize_t show_dev(struct class_device *class_dev, char *buf)\n-{\n-\tstruct ib_umad_port *port = class_get_devdata(class_dev);\n-\n-\tif (class_dev == &port->class_dev)\n-\t\treturn print_dev_t(buf, port->dev.dev);\n-\telse\n-\t\treturn print_dev_t(buf, port->sm_dev.dev);\n-}\n-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);\n-\n static ssize_t show_ibdev(struct class_device *class_dev, char *buf)\n {\n \tstruct ib_umad_port *port = class_get_devdata(class_dev);\n@@ -762,6 +751,7 @@\n \n \tport->class_dev.class = &umad_class;\n \tport->class_dev.dev = device->dma_device;\n+\tport->class_dev.devt = port->dev.dev;\n \n \tsnprintf(port->class_dev.class_id, BUS_ID_SIZE, \"umad%d\", port->devnum);\n \n@@ -771,8 +761,6 @@\n \tclass_set_devdata(&port->class_dev, port);\n \tkref_get(&port->umad_dev->ref);\n \n-\tif (class_device_create_file(&port->class_dev, &class_device_attr_dev))\n-\t\tgoto err_class;\n \tif (class_device_create_file(&port->class_dev, &class_device_attr_ibdev))\n \t\tgoto err_class;\n \tif (class_device_create_file(&port->class_dev, &class_device_attr_port))\n@@ -786,6 +774,7 @@\n \n \tport->sm_class_dev.class = &umad_class;\n \tport->sm_class_dev.dev = device->dma_device;\n+\tport->sm_class_dev.devt = port->sm_dev.dev;\n \n \tsnprintf(port->sm_class_dev.class_id, BUS_ID_SIZE, \"issm%d\", port->sm_devnum - IB_UMAD_MAX_PORTS);\n \n@@ -795,8 +784,6 @@\n \tclass_set_devdata(&port->sm_class_dev, port);\n \tkref_get(&port->umad_dev->ref);\n \n-\tif (class_device_create_file(&port->sm_class_dev, &class_device_attr_dev))\n-\t\tgoto err_sm_class;\n \tif (class_device_create_file(&port->sm_class_dev, &class_device_attr_ibdev))\n \t\tgoto err_sm_class;\n \tif (class_device_create_file(&port->sm_class_dev, &class_device_attr_port))\n"} {"commit":"dcee9f616133e588e7f78c87c67148de9d45b761","subject":"typo fixed","message":"typo fixed\n\n[r14767]\n","repos":"MatzeB\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/arm\/arm_nodes_attr.h\n+++ ir\/be\/arm\/arm_nodes_attr.h\n@@ -61,8 +61,8 @@\n \tARM_COND_NE = 1, \/**< Not Equal, Z clear *\/\n \tARM_COND_CS = 2, \/**< Carry set, unsigned >=, C set *\/\n \tARM_COND_CC = 3, \/**< Carry clear, unsigned <, C clear *\/\n-\tARM_COND_MI = 4, \/**< Minus\/Negativ, N set *\/\n-\tARM_COND_PL = 5, \/**< Plus\/Positiv or Zero, N clear *\/\n+\tARM_COND_MI = 4, \/**< Minus\/Negative, N set *\/\n+\tARM_COND_PL = 5, \/**< Plus\/Positive or Zero, N clear *\/\n \tARM_COND_VS = 6, \/**< Overflow, V set *\/\n \tARM_COND_VC = 7, \/**< No overflow, V clear *\/\n \tARM_COND_HI = 8, \/**< unsigned >, C set and Z clear *\/\n"} {"commit":"357535800d98174ceddc6ad1f3092f1dce0ea04c","subject":"[media] az6007: Remove some dead code that doesn't seem to be needed","message":"[media] az6007: Remove some dead code that doesn't seem to be needed\n\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/dvb\/dvb-usb\/az6007.c\n+++ drivers\/media\/dvb\/dvb-usb\/az6007.c\n@@ -17,16 +17,7 @@\n module_param_named(debug,dvb_usb_az6007_debug, int, 0644);\n MODULE_PARM_DESC(debug, \"set debugging level (1=info,xfer=2,rc=4 (or-able)).\" DVB_USB_DEBUG_STATUS);\n \n-\n-static int az6007_type =0;\n-module_param(az6007_type, int, 0644);\n-MODULE_PARM_DESC(az6007_type, \"select delivery mode (0=DVB-T, 1=DVB-T\");\n-\n-\/\/module_param_named(type, 6007_type, int, 0644);\n-\/\/MODULE_PARM_DESC(type, \"select delivery mode (0=DVB-T, 1=DVB-C)\");\n-\n DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);\n-\n \n struct az6007_device_state {\n \tstruct dvb_ca_en50221 ca;\n@@ -110,57 +101,22 @@\n {\n \tint ret;\n \n-#if 0\n-\tint i=0, cyc=0, rem=0;\n-\tcyc = blen\/64;\n-\trem = blen%64;\n-#endif\n-\n \tdeb_xfer(\"out: req. %02x, val: %04x, ind: %04x, buffer: \",req,value,index);\n \tdebug_dump(b,blen,deb_xfer);\n \n-\n-#if 0\n-\tif (blen>64)\n-\t{\n-\t\tfor (i=0; i<cyc; i++)\n-\t\t{\n-\t\t\tif ((ret = usb_control_msg(d->udev,\n-\t\t\t\tusb_sndctrlpipe(d->udev,0),\n-\t\t\t\treq,\n-\t\t\t\tUSB_TYPE_VENDOR | USB_DIR_OUT,\n-\t\t\t\tvalue,index+i*64,b+i*64,64,\n-\t\t\t\t5000)) != 64) {\n-\t\t\t\twarn(\"usb out operation failed. (%d)\",ret);\n-\t\t\t\treturn -EIO;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (rem>0)\n-\t\t{\n-\t\t\tif ((ret = usb_control_msg(d->udev,\n-\t\t\t\tusb_sndctrlpipe(d->udev,0),\n-\t\t\t\treq,\n-\t\t\t\tUSB_TYPE_VENDOR | USB_DIR_OUT,\n-\t\t\t\tvalue,index+cyc*64,b+cyc*64,rem,\n-\t\t\t\t5000)) != rem) {\n-\t\t\t\twarn(\"usb out operation failed. (%d)\",ret);\n-\t\t\t\treturn -EIO;\n-\t\t\t}\n-\t\t}\n-\t}\n-\telse\n-#endif\n-\t{\n-\t\tif ((ret = usb_control_msg(d->udev,\n-\t\t\t\tusb_sndctrlpipe(d->udev,0),\n-\t\t\t\treq,\n-\t\t\t\tUSB_TYPE_VENDOR | USB_DIR_OUT,\n-\t\t\t\tvalue,index,b,blen,\n-\t\t\t\t5000)) != blen) {\n-\t\t\twarn(\"usb out operation failed. (%d)\",ret);\n-\t\t\treturn -EIO;\n-\t\t}\n+\tif (blen > 64) {\n+\t\tprintk(KERN_ERR \"az6007: doesn't suport I2C transactions longer than 64 bytes\\n\");\n+\t\treturn -EOPNOTSUPP;\n+\t}\n+\n+\tif ((ret = usb_control_msg(d->udev,\n+\t\t\tusb_sndctrlpipe(d->udev,0),\n+\t\t\treq,\n+\t\t\tUSB_TYPE_VENDOR | USB_DIR_OUT,\n+\t\t\tvalue,index,b,blen,\n+\t\t\t5000)) != blen) {\n+\t\twarn(\"usb out operation failed. (%d)\",ret);\n+\t\treturn -EIO;\n \t}\n \n \treturn 0;\n@@ -232,7 +188,7 @@\n \tinfo(\"az6007_frontend_poweron adap=%p adap->dev=%p\", adap, adap->dev);\n \n \treq = 0xBC;\n-\tvalue = 1;\/\/power on\n+\tvalue = 1;\t\t\/* power on *\/\n \tindex = 3;\n \tblen =0;\n \n@@ -245,7 +201,7 @@\n \tmsleep_interruptible(200);\n \n \treq = 0xBC;\n-\tvalue = 0;\/\/power on\n+\tvalue = 0;\t\t\/* power off *\/\n \tindex = 3;\n \tblen =0;\n \n@@ -258,7 +214,7 @@\n \tmsleep_interruptible(200);\n \n \treq = 0xBC;\n-\tvalue = 1;\/\/power on\n+\tvalue = 1;\t\t\/* power on *\/\n \tindex = 3;\n \tblen =0;\n \n@@ -552,9 +508,6 @@\n static struct i2c_algorithm az6007_i2c_algo = {\n \t.master_xfer = az6007_i2c_xfer,\n \t.functionality = az6007_i2c_func,\n-#ifdef NEED_ALGO_CONTROL\n-\t.algo_control = dummy_algo_control,\n-#endif\n };\n \n int az6007_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,\n@@ -678,5 +631,5 @@\n \n MODULE_AUTHOR(\"Henry Wang <Henry.wang@AzureWave.com>\");\n MODULE_DESCRIPTION(\"Driver for AzureWave 6007 DVB-C\/T USB2.0 and clones\");\n-MODULE_VERSION(\"1.0\");\n+MODULE_VERSION(\"1.1\");\n MODULE_LICENSE(\"GPL\");\n"} {"commit":"948741b66a750bd2235ebfd5e6fbcf0670472091","subject":"fixed comment","message":"fixed comment\n","repos":"davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,8l\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/ia32\/bearch_ia32_t.h\n+++ ir\/be\/ia32\/bearch_ia32_t.h\n@@ -141,12 +141,12 @@\n } ia32_transform_env_t;\n \n \/**\n- * Creates the unique per irg GP NoReg node.\n+ * Returns the unique per irg GP NoReg node.\n *\/\n ir_node *ia32_new_NoReg_gp(ia32_code_gen_t *cg);\n \n \/**\n- * Creates the unique per irg FP NoReg node.\n+ * Returns the unique per irg FP NoReg node.\n *\/\n ir_node *ia32_new_NoReg_fp(ia32_code_gen_t *cg);\n \n"} {"commit":"577cbf49cd793c39f149b526309b080ac4ebbad4","subject":"V4L\/DVB (9863): gspca - sonixj: Cleanup \/ simplify code.","message":"V4L\/DVB (9863): gspca - sonixj: Cleanup \/ simplify code.\n\nSigned-off-by: Jean-Francois Moine <e5394ce9c4b9ae7d2c4686830c5ac5f3b9028b6a@free.fr>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sonixj.c\n+++ drivers\/media\/video\/gspca\/sonixj.c\n@@ -37,26 +37,26 @@\n \tatomic_t avg_lum;\n \tunsigned int exposure;\n \n-\tunsigned short brightness;\n-\tunsigned char contrast;\n-\tunsigned char colors;\n-\tunsigned char autogain;\n+\t__u16 brightness;\n+\t__u8 contrast;\n+\t__u8 colors;\n+\t__u8 autogain;\n \t__u8 blue;\n \t__u8 red;\n \t__u8 vflip;\t\t\t\/* ov7630 only *\/\n \t__u8 infrared;\t\t\t\/* mi0360 only *\/\n \n-\tsigned char ag_cnt;\n+\t__s8 ag_cnt;\n #define AG_CNT_START 13\n \n-\tchar qindex;\n-\tunsigned char bridge;\n+\t__u8 qindex;\n+\t__u8 bridge;\n #define BRIDGE_SN9C102P 0\n #define BRIDGE_SN9C105 1\n #define BRIDGE_SN9C110 2\n #define BRIDGE_SN9C120 3\n #define BRIDGE_SN9C325 4\n-\tchar sensor;\t\t\t\/* Type of image sensor chip *\/\n+\t__u8 sensor;\t\t\t\/* Type of image sensor chip *\/\n #define SENSOR_HV7131R 0\n #define SENSOR_MI0360 1\n #define SENSOR_MO4000 2\n@@ -64,7 +64,7 @@\n #define SENSOR_OV7630 4\n #define SENSOR_OV7648 5\n #define SENSOR_OV7660 6\n-\tunsigned char i2c_base;\n+\t__u8 i2c_base;\n };\n \n \/* V4L2 controls supported by the driver *\/\n@@ -207,6 +207,24 @@\n \t},\n };\n \n+\/* table of the disabled controls *\/\n+static __u32 ctrl_dis[] = {\n+\t(1 << INFRARED_IDX) | (1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_HV7131R 0 *\/\n+\t(1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_MI0360 1 *\/\n+\t(1 << INFRARED_IDX) | (1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_MO4000 2 *\/\n+\t(1 << INFRARED_IDX) | (1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_OM6802 3 *\/\n+\t(1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX),\n+\t\t\t\t\t\t\/* SENSOR_OV7630 4 *\/\n+\t(1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX) | (1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_OV7648 5 *\/\n+\t(1 << AUTOGAIN_IDX) | (1 << INFRARED_IDX) | (1 << VFLIP_IDX),\n+\t\t\t\t\t\t\/* SENSOR_OV7660 6 *\/\n+};\n+\n static struct v4l2_pix_format vga_mode[] = {\n \t{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,\n \t\t.bytesperline = 160,\n@@ -801,8 +819,6 @@\n \n static int probesensor(struct gspca_dev *gspca_dev)\n {\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\n \ti2c_w1(gspca_dev, 0x02, 0);\t\t\t\/* sensor wakeup *\/\n \tmsleep(10);\n \treg_w1(gspca_dev, 0x02, 0x66);\t\t\t\/* Gpio on *\/\n@@ -814,8 +830,7 @@\n \t && gspca_dev->usb_buf[3] == 0x00\n \t && gspca_dev->usb_buf[4] == 0x00) {\n \t\tPDEBUG(D_PROBE, \"Find Sensor sn9c102P HV7131R\");\n-\t\tsd->sensor = SENSOR_HV7131R;\n-\t\treturn SENSOR_HV7131R;\n+\t\treturn 0;\n \t}\n \tPDEBUG(D_PROBE, \"Find Sensor 0x%02x 0x%02x 0x%02x\",\n \t\tgspca_dev->usb_buf[0], gspca_dev->usb_buf[1],\n@@ -1022,17 +1037,7 @@\n \tsd->vflip = VFLIP_DEF;\n \tsd->infrared = INFRARED_DEF;\n \n-\tswitch (sd->sensor) {\n-\tcase SENSOR_OV7630:\n-\tcase SENSOR_OV7648:\n-\tcase SENSOR_OV7660:\n-\t\tgspca_dev->ctrl_dis = (1 << AUTOGAIN_IDX);\n-\t\tbreak;\n-\t}\n-\tif (sd->sensor != SENSOR_OV7630)\n-\t\tgspca_dev->ctrl_dis |= (1 << VFLIP_IDX);\n-\tif (sd->sensor != SENSOR_MI0360)\n-\t\tgspca_dev->ctrl_dis |= (1 << INFRARED_IDX);\n+\tgspca_dev->ctrl_dis = ctrl_dis[sd->sensor];\n \treturn 0;\n }\n \n@@ -1040,7 +1045,6 @@\n static int sd_init(struct gspca_dev *gspca_dev)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n-\/*\tconst __u8 *sn9c1xx; *\/\n \t__u8 regGpio[] = { 0x29, 0x74 };\n \t__u8 regF1;\n \n@@ -1194,13 +1198,16 @@\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \t__u8 k2;\n-\t__u8 contrast[] = { 0x00, 0x00, 0x28, 0x00, 0x07, 0x00 };\n+\t__u8 contrast[6];\n \n \tk2 = sd->contrast * 0x30 \/ (CONTRAST_MAX + 1) + 0x10;\t\/* 10..40 *\/\n \tcontrast[0] = (k2 + 1) \/ 2;\t\t\/* red *\/\n+\tcontrast[1] = 0;\n \tcontrast[2] = k2;\t\t\t\/* green *\/\n+\tcontrast[3] = 0;\n \tcontrast[4] = (k2 + 1) \/ 5;\t\t\/* blue *\/\n-\treg_w(gspca_dev, 0x84, contrast, 6);\n+\tcontrast[5] = 0;\n+\treg_w(gspca_dev, 0x84, contrast, sizeof contrast);\n }\n \n static void setcolors(struct gspca_dev *gspca_dev)\n@@ -1365,10 +1372,6 @@\n \t\tov7648_InitSensor(gspca_dev);\n \t\treg17 = 0x21;\n \/*\t\treg1 = 0x42;\t\t * 42 - 46? *\/\n-\/*\t\tif (mode)\n-\t\t\t;\t\t * 320x2...\n-\t\telse\n-\t\t\t;\t\t * 640x... *\/\n \t\tbreak;\n \tdefault:\n \/*\tcase SENSOR_OV7660: *\/\n"} {"commit":"2b43c0a1f9b55f67e796d9795997296318445cb7","subject":"made the birg non-const (needed for the spill-slot coalescing) removed unused emit_decls","message":"made the birg non-const (needed for the spill-slot coalescing)\nremoved unused emit_decls\n\n[r13704]\n","repos":"killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,8l\/libfirm,8l\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,libfirm\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/mips\/bearch_mips_t.h\n+++ ir\/be\/mips\/bearch_mips_t.h\n@@ -43,9 +43,8 @@\n \tir_graph *irg; \/**< current irg *\/\n \tconst arch_env_t *arch_env; \/**< the arch env *\/\n \tset *reg_set; \/**< set to memorize registers for FIRM nodes (e.g. phi) *\/\n-\tint emit_decls; \/**< flag indicating if decls were already emitted *\/\n \tmips_isa_t *isa; \/**< the isa instance *\/\n-\tconst be_irg_t *birg; \/**< The be-irg (contains additional information about the irg) *\/\n+\tbe_irg_t *birg; \/**< The be-irg (contains additional information about the irg) *\/\n \tir_node **bl_list;\t\t\/**< The block schedule list. *\/\n \tsurvive_dce_t\t\t\t\t *bl_list_sdce;\t\/**< survive dce environment for the block schedule list *\/\n };\n"} {"commit":"b813b0ca1310a0fec2789bd34378492e983a866b","subject":"[media] gspca - sonixj: Cleanup source and remove useless instructions","message":"[media] gspca - sonixj: Cleanup source and remove useless instructions\n\nSigned-off-by: Jean-Fran\u00e7ois Moine <e5394ce9c4b9ae7d2c4686830c5ac5f3b9028b6a@free.fr>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sonixj.c\n+++ drivers\/media\/video\/gspca\/sonixj.c\n@@ -1,7 +1,7 @@\n \/*\n * Sonix sn9c102p sn9c105 sn9c120 (jpeg) subdriver\n *\n- * Copyright (C) 2009-2010 Jean-Fran\u00e7ois Moine <http:\/\/moinejf.free.fr>\n+ * Copyright (C) 2009-2011 Jean-Fran\u00e7ois Moine <http:\/\/moinejf.free.fr>\n * Copyright (C) 2005 Michel Xhaard mxhaard@magic.fr\n *\n * This program is free software; you can redistribute it and\/or modify\n@@ -138,7 +138,7 @@\n static void setfreq(struct gspca_dev *gspca_dev);\n \n static const struct ctrl sd_ctrls[NCTRLS] = {\n-[BRIGHTNESS] = {\n+[BRIGHTNESS] = {\n \t {\n \t\t.id = V4L2_CID_BRIGHTNESS,\n \t\t.type = V4L2_CTRL_TYPE_INTEGER,\n@@ -739,7 +739,7 @@\n \t{0xd1, 0x5d, 0x22, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x24, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x26, 0x00, 0x00, 0x00, 0x24, 0x10},\n-\t{0xd1, 0x5d, 0x2f, 0xf7, 0xB0, 0x00, 0x04, 0x10},\n+\t{0xd1, 0x5d, 0x2f, 0xf7, 0xb0, 0x00, 0x04, 0x10},\n \t{0xd1, 0x5d, 0x31, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x33, 0x00, 0x00, 0x01, 0x00, 0x10},\n \t{0xb1, 0x5d, 0x3d, 0x06, 0x8f, 0x00, 0x00, 0x10},\n@@ -2008,8 +2008,7 @@\n \tcase SENSOR_OM6802:\n \t\texpo = brightness << 2;\n \t\tsd->exposure = setexposure(gspca_dev, expo);\n-\t\tk2 = brightness >> 3;\n-\t\tbreak;\n+\t\treturn;\t\t\t\/* Y offset already set *\/\n \t}\n \n \treg_w1(gspca_dev, 0x96, k2);\t\/* color matrix Y offset *\/\n@@ -2509,9 +2508,7 @@\n \t\tbreak;\n \tcase SENSOR_HV7131R:\n \tcase SENSOR_MI0360:\n-\t\tif (mode)\n-\t\t\treg01 |= SYS_SEL_48M;\t\/* 320x240: clk 48Mhz *\/\n-\t\telse\n+\t\tif (!mode)\n \t\t\treg01 &= ~SYS_SEL_48M;\t\/* 640x480: clk 24Mhz *\/\n \t\treg17 &= ~MCK_SIZE_MASK;\n \t\treg17 |= 0x01;\t\t\t\/* clock \/ 1 *\/\n"} {"commit":"e787dcc9091185fc4fe7767d48497c5d84c5a4bd","subject":"a hook to use an lkm for unicode names decoding; from freebsd","message":"a hook to use an lkm for unicode names decoding; from freebsd\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- isofs\/cd9660\/cd9660_util.c\n+++ isofs\/cd9660\/cd9660_util.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: cd9660_util.c,v 1.6 2003\/06\/02 23:28:05 millert Exp $\t*\/\n+\/*\t$OpenBSD: cd9660_util.c,v 1.7 2003\/11\/04 21:54:01 mickey Exp $\t*\/\n \/*\t$NetBSD: cd9660_util.c,v 1.12 1997\/01\/24 00:27:33 cgd Exp $\t*\/\n \n \/*-\n@@ -57,6 +57,14 @@\n #include <isofs\/cd9660\/cd9660_extern.h>\n \n \/*\n+ * XXX: limited support for loading of Unicode\n+ * conversion routine as a kld at a run-time.\n+ * Should be removed when native Unicode kernel\n+ * interfaces have been introduced.\n+ *\/\n+u_char (*cd9660_wchar2char)(u_int32_t wchar) = NULL;\n+\n+\/*\n * Get one character out of an iso filename\n * Obey joliet_level\n * Return number of bytes consumed\n@@ -82,6 +90,11 @@\n *c = *isofn;\n break;\n }\n+\n+ \/* XXX: if Unicode conversion routine is loaded then use it *\/\n+ if (cd9660_wchar2char != NULL)\n+\t *c = cd9660_wchar2char((*(isofn - 1) << 8) | *isofn);\n+\n return 2;\n }\n \n"} {"commit":"2d59aca34464abfa708c3deb36c242b461696ed4","subject":"EffectRunner::getPixelInfo() makes more sense than getFrameInfo","message":"EffectRunner::getPixelInfo() makes more sense than getFrameInfo\n","repos":"pixelmatix\/fadecandy,fragmede\/fadecandy,PimentNoir\/fadecandy,lincomatic\/fadecandy,Jorgen-VikingGod\/fadecandy,nomis52\/fadecandy,Protoneer\/fadecandy,fragmede\/fadecandy,fragmede\/fadecandy,pixelmatix\/fadecandy,nomis52\/fadecandy,Protoneer\/fadecandy,hakan42\/fadecandy,scanlime\/fadecandy,PimentNoir\/fadecandy,poe\/fadecandy,Jorgen-VikingGod\/fadecandy,Protoneer\/fadecandy,adam-back\/fadecandy,pixelmatix\/fadecandy,poe\/fadecandy,poe\/fadecandy,hakan42\/fadecandy,pixelmatix\/fadecandy,hakan42\/fadecandy,adam-back\/fadecandy,lincomatic\/fadecandy,poe\/fadecandy,jsestrich\/fadecandy,fragmede\/fadecandy,jsestrich\/fadecandy,PimentNoir\/fadecandy,Jorgen-VikingGod\/fadecandy,nomis52\/fadecandy,fragmede\/fadecandy,scanlime\/fadecandy,adam-back\/fadecandy,fragmede\/fadecandy,Protoneer\/fadecandy,adam-back\/fadecandy,jsestrich\/fadecandy,scanlime\/fadecandy,nomis52\/fadecandy,lincomatic\/fadecandy,Jorgen-VikingGod\/fadecandy,PimentNoir\/fadecandy,adam-back\/fadecandy,PimentNoir\/fadecandy,piers7\/fadecandy,hakan42\/fadecandy,Jorgen-VikingGod\/fadecandy,piers7\/fadecandy,pixelmatix\/fadecandy,PimentNoir\/fadecandy,hakan42\/fadecandy,piers7\/fadecandy,lincomatic\/fadecandy,fragmede\/fadecandy,scanlime\/fadecandy,jsestrich\/fadecandy,piers7\/fadecandy,poe\/fadecandy,lincomatic\/fadecandy,lincomatic\/fadecandy,poe\/fadecandy,scanlime\/fadecandy,lincomatic\/fadecandy,Protoneer\/fadecandy,poe\/fadecandy,nomis52\/fadecandy,nomis52\/fadecandy,scanlime\/fadecandy,poe\/fadecandy,lincomatic\/fadecandy,piers7\/fadecandy,nomis52\/fadecandy,jsestrich\/fadecandy,nomis52\/fadecandy,fragmede\/fadecandy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/cpp\/lib\/effect_runner.h\n+++ examples\/cpp\/lib\/effect_runner.h\n@@ -58,7 +58,9 @@\n const rapidjson::Document& getLayout() const;\n Effect* getEffect() const;\n OPCClient& getClient();\n- const Effect::FrameInfo& getFrameInfo() const;\n+\n+ \/\/ Access to most recent framebuffer information\n+ const Effect::PixelInfoVec& getPixelInfo() const;\n const uint8_t* getPixel(unsigned index) const;\n void getPixelColor(unsigned index, Vec3 &rgb) const;\n \n@@ -306,9 +308,9 @@\n return opc;\n }\n \n-inline const Effect::FrameInfo& EffectRunner::getFrameInfo() const\n-{\n- return frameInfo;\n+inline const Effect::PixelInfoVec& EffectRunner::getPixelInfo() const\n+{\n+ return frameInfo.pixels;\n }\n \n inline const uint8_t* EffectRunner::getPixel(unsigned index) const\n"} {"commit":"0e5e7894a3200e3b239184b2a5afb60cebf70631","subject":"Add some validations to response status set","message":"Add some validations to response status set\n\nSigned-off-by: Eduardo Silva <b6525c140147034c280e3cd2f39161f32f3f4f62@gmail.com>\n","repos":"sujayraaj\/monkey_rtems,sujayraaj\/monkeyTest,WilliamRen\/monkey-1,sujayraaj\/monkey_rtems,sujayraaj\/monkey_rtems,dreamsxin\/monkey,sbagmeijer\/monkey,sujayraaj\/monkey_rtems,sujayraaj\/monkey,dreamsxin\/monkey,WilliamRen\/monkey-1,monkey\/monkey,monkey\/monkey,sujayraaj\/monkeyTest,sbagmeijer\/monkey,WilliamRen\/monkey-1,dougsko\/monkey,monkey\/monkey,WilliamRen\/monkey-1,sujayraaj\/monkeyTest,sujayraaj\/monkeyTest,dougsko\/monkey,dougsko\/monkey,monkey\/monkey,sbagmeijer\/monkey,dougsko\/monkey,dougsko\/monkey,sujayraaj\/monkey,sbagmeijer\/monkey,sujayraaj\/monkey,WilliamRen\/monkey-1,dreamsxin\/monkey,sujayraaj\/monkey,sujayraaj\/monkey_rtems,monkey\/monkey,dreamsxin\/monkey,sbagmeijer\/monkey,dreamsxin\/monkey,monkey\/monkey,sujayraaj\/monkey","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/header.c\n+++ src\/header.c\n@@ -229,7 +229,8 @@\n }\n }\n \n- mk_info(\"matched: %i\", i);\n+ \/* Invalid status set *\/\n+ mk_bug(i == status_response_len);\n \n if (fd_status < 0) {\n mk_header_iov_free(iov);\n@@ -417,6 +418,7 @@\n \n void mk_header_set_http_status(struct session_request *sr, int status)\n {\n+ mk_bug(!sr || !sr->headers);\n sr->headers->status = status;\n }\n \n"} {"commit":"dde006d1f6c900cf0cb62fc0d904f71b77232927","subject":"* Put a few more constants within function scope","message":"* Put a few more constants within function scope\n","repos":"redorav\/hlslpp,redorav\/hlslpp,redorav\/hlslpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/hlsl++.h\n+++ src\/hlsl++.h\n@@ -699,18 +699,16 @@\n \treturn _hlslpp_add_ps(p, e);\n }\n \n-static const n128 invlog_2_10 = _hlslpp_div_ps(f4_1, _hlslpp_log2_ps(f4_10));\n-\n inline n128 _hlslpp_log10_ps(n128 x)\n {\n+\tstatic const n128 invlog_2_10 = _hlslpp_div_ps(f4_1, _hlslpp_log2_ps(f4_10));\n \treturn _hlslpp_mul_ps(_hlslpp_log2_ps(x), invlog_2_10);\n }\n \n-static const n128 invlog_2_e = _hlslpp_div_ps(f4_1, _hlslpp_log2_ps(f4_e));\n-\n inline n128 _hlslpp_log_ps(n128 x)\n {\n \tstatic const n128 log_2_e = _hlslpp_log2_ps(f4_e);\n+\tstatic const n128 invlog_2_e = _hlslpp_div_ps(f4_1, _hlslpp_log2_ps(f4_e));\n \treturn _hlslpp_mul_ps(_hlslpp_log2_ps(x), invlog_2_e);\n }\n \n"} {"commit":"9881918756be1cf0a33ae7454ca767682cbfadc3","subject":"V4L\/DVB (10372): gspca - sonixj: Cleanup code.","message":"V4L\/DVB (10372): gspca - sonixj: Cleanup code.\n\nSigned-off-by: Jean-Francois Moine <e5394ce9c4b9ae7d2c4686830c5ac5f3b9028b6a@free.fr>\nSigned-off-by: Mauro Carvalho Chehab <ad86ba2154032c9f55743a190faa2459a9d61d42@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/media\/video\/gspca\/sonixj.c\n+++ drivers\/media\/video\/gspca\/sonixj.c\n@@ -36,28 +36,28 @@\n \tstruct gspca_dev gspca_dev;\t\/* !! must be the first item *\/\n \n \tatomic_t avg_lum;\n-\tunsigned int exposure;\n-\n-\t__u16 brightness;\n-\t__u8 contrast;\n-\t__u8 colors;\n-\t__u8 autogain;\n-\t__u8 blue;\n-\t__u8 red;\n+\tu32 exposure;\n+\n+\tu16 brightness;\n+\tu8 contrast;\n+\tu8 colors;\n+\tu8 autogain;\n+\tu8 blue;\n+\tu8 red;\n \tu8 gamma;\n-\t__u8 vflip;\t\t\t\/* ov7630 only *\/\n-\t__u8 infrared;\t\t\t\/* mi0360 only *\/\n-\n-\t__s8 ag_cnt;\n+\tu8 vflip;\t\t\t\/* ov7630 only *\/\n+\tu8 infrared;\t\t\t\/* mi0360 only *\/\n+\n+\ts8 ag_cnt;\n #define AG_CNT_START 13\n \n-\t__u8 bridge;\n+\tu8 bridge;\n #define BRIDGE_SN9C102P 0\n #define BRIDGE_SN9C105 1\n #define BRIDGE_SN9C110 2\n #define BRIDGE_SN9C120 3\n #define BRIDGE_SN9C325 4\n-\t__u8 sensor;\t\t\t\/* Type of image sensor chip *\/\n+\tu8 sensor;\t\t\t\/* Type of image sensor chip *\/\n #define SENSOR_HV7131R 0\n #define SENSOR_MI0360 1\n #define SENSOR_MO4000 2\n@@ -65,7 +65,7 @@\n #define SENSOR_OV7630 4\n #define SENSOR_OV7648 5\n #define SENSOR_OV7660 6\n-\t__u8 i2c_base;\n+\tu8 i2c_base;\n };\n \n \/* V4L2 controls supported by the driver *\/\n@@ -349,20 +349,20 @@\n \tsn_ov7660\n };\n \n-static const __u8 gamma_def[17] = {\n+static const u8 gamma_def[17] = {\n \t0x00, 0x2d, 0x46, 0x5a, 0x6c, 0x7c, 0x8b, 0x99,\n \t0xa6, 0xb2, 0xbf, 0xca, 0xd5, 0xe0, 0xeb, 0xf5, 0xff\n };\n \n \n \/* color matrix and offsets *\/\n-static const __u8 reg84[] = {\n+static const u8 reg84[] = {\n \t0x14, 0x00, 0x27, 0x00, 0x07, 0x00,\t\/* YR YG YB gains *\/\n \t0xe8, 0x0f, 0xda, 0x0f, 0x40, 0x00,\t\/* UR UG UB *\/\n \t0x3e, 0x00, 0xcd, 0x0f, 0xf7, 0x0f,\t\/* VR VG VB *\/\n \t0x00, 0x00, 0x00\t\t\t\/* YUV offsets *\/\n };\n-static const __u8 hv7131r_sensor_init[][8] = {\n+static const u8 hv7131r_sensor_init[][8] = {\n \t{0xc1, 0x11, 0x01, 0x08, 0x01, 0x00, 0x00, 0x10},\n \t{0xb1, 0x11, 0x34, 0x17, 0x7f, 0x00, 0x00, 0x10},\n \t{0xd1, 0x11, 0x40, 0xff, 0x7f, 0x7f, 0x7f, 0x10},\n@@ -393,9 +393,9 @@\n \t{0xa1, 0x11, 0x23, 0x10, 0x00, 0x00, 0x00, 0x10},\n \t{}\n };\n-static const __u8 mi0360_sensor_init[][8] = {\n+static const u8 mi0360_sensor_init[][8] = {\n \t{0xb1, 0x5d, 0x07, 0x00, 0x02, 0x00, 0x00, 0x10},\n-\t{0xb1, 0x5d, 0x0D, 0x00, 0x01, 0x00, 0x00, 0x10},\n+\t{0xb1, 0x5d, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x10},\n \t{0xb1, 0x5d, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x01, 0x00, 0x08, 0x00, 0x16, 0x10},\n \t{0xd1, 0x5d, 0x03, 0x01, 0xe2, 0x02, 0x82, 0x10},\n@@ -416,7 +416,7 @@\n \t{0xd1, 0x5d, 0x22, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x24, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x26, 0x00, 0x00, 0x00, 0x24, 0x10},\n-\t{0xd1, 0x5d, 0x2F, 0xF7, 0xB0, 0x00, 0x04, 0x10},\n+\t{0xd1, 0x5d, 0x2f, 0xf7, 0xB0, 0x00, 0x04, 0x10},\n \t{0xd1, 0x5d, 0x31, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xd1, 0x5d, 0x33, 0x00, 0x00, 0x01, 0x00, 0x10},\n \t{0xb1, 0x5d, 0x3d, 0x06, 0x8f, 0x00, 0x00, 0x10},\n@@ -447,7 +447,7 @@\n \t{0xb1, 0x5d, 0x07, 0x00, 0x02, 0x00, 0x00, 0x10}, \/* sensor on *\/\n \t{}\n };\n-static const __u8 mo4000_sensor_init[][8] = {\n+static const u8 mo4000_sensor_init[][8] = {\n \t{0xa1, 0x21, 0x01, 0x02, 0x00, 0x00, 0x00, 0x10},\n \t{0xa1, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xa1, 0x21, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10},\n@@ -470,7 +470,7 @@\n \t{0xa1, 0x21, 0x11, 0x38, 0x00, 0x00, 0x00, 0x10},\n \t{}\n };\n-static __u8 om6802_sensor_init[][8] = {\n+static const u8 om6802_sensor_init[][8] = {\n \t{0xa0, 0x34, 0x90, 0x05, 0x00, 0x00, 0x00, 0x10},\n \t{0xa0, 0x34, 0x49, 0x85, 0x00, 0x00, 0x00, 0x10},\n \t{0xa0, 0x34, 0x5a, 0xc0, 0x00, 0x00, 0x00, 0x10},\n@@ -504,7 +504,7 @@\n \/*\t{0xa0, 0x34, 0x69, 0x01, 0x00, 0x00, 0x00, 0x10}, *\/\n \t{}\n };\n-static const __u8 ov7630_sensor_init[][8] = {\n+static const u8 ov7630_sensor_init[][8] = {\n \t{0xa1, 0x21, 0x76, 0x01, 0x00, 0x00, 0x00, 0x10},\n \t{0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},\n \/* win: delay 20ms *\/\n@@ -558,7 +558,7 @@\n \t{}\n };\n \n-static const __u8 ov7648_sensor_init[][8] = {\n+static const u8 ov7648_sensor_init[][8] = {\n \t{0xa1, 0x21, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10},\n \t{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10},\t\/* reset *\/\n \t{0xa1, 0x21, 0x12, 0x00, 0x00, 0x00, 0x00, 0x10},\n@@ -604,7 +604,7 @@\n \t{}\n };\n \n-static const __u8 ov7660_sensor_init[][8] = {\n+static const u8 ov7660_sensor_init[][8] = {\n \t{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, \/* reset SCCB *\/\n \/*\t\t(delay 20ms) *\/\n \t{0xa1, 0x21, 0x12, 0x05, 0x00, 0x00, 0x00, 0x10},\n@@ -693,28 +693,28 @@\n \t{}\n };\n \n-static const __u8 qtable4[] = {\n-\t0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06,\n-\t0x06, 0x08, 0x0a, 0x11,\n-\t0x0a, 0x0a, 0x08, 0x08, 0x0a, 0x15, 0x0f, 0x0f, 0x0c, 0x11, 0x19, 0x15,\n-\t0x19, 0x19, 0x17, 0x15,\n-\t0x17, 0x17, 0x1b, 0x1d, 0x25, 0x21, 0x1b, 0x1d, 0x23, 0x1d, 0x17, 0x17,\n-\t0x21, 0x2e, 0x21, 0x23,\n-\t0x27, 0x29, 0x2c, 0x2c, 0x2c, 0x19, 0x1f, 0x30, 0x32, 0x2e, 0x29, 0x32,\n-\t0x25, 0x29, 0x2c, 0x29,\n-\t0x06, 0x08, 0x08, 0x0a, 0x08, 0x0a, 0x13, 0x0a, 0x0a, 0x13, 0x29, 0x1b,\n-\t0x17, 0x1b, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n-\t0x29, 0x29, 0x29, 0x29\n+static const u8 qtable4[] = {\n+\t0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06,\n+\t0x06, 0x06, 0x08, 0x06, 0x06, 0x08, 0x0a, 0x11,\n+\t0x0a, 0x0a, 0x08, 0x08, 0x0a, 0x15, 0x0f, 0x0f,\n+\t0x0c, 0x11, 0x19, 0x15, 0x19, 0x19, 0x17, 0x15,\n+\t0x17, 0x17, 0x1b, 0x1d, 0x25, 0x21, 0x1b, 0x1d,\n+\t0x23, 0x1d, 0x17, 0x17, 0x21, 0x2e, 0x21, 0x23,\n+\t0x27, 0x29, 0x2c, 0x2c, 0x2c, 0x19, 0x1f, 0x30,\n+\t0x32, 0x2e, 0x29, 0x32, 0x25, 0x29, 0x2c, 0x29,\n+\t0x06, 0x08, 0x08, 0x0a, 0x08, 0x0a, 0x13, 0x0a,\n+\t0x0a, 0x13, 0x29, 0x1b, 0x17, 0x1b, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,\n+\t0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29\n };\n \n \/* read <len> bytes to gspca_dev->usb_buf *\/\n static void reg_r(struct gspca_dev *gspca_dev,\n-\t\t __u16 value, int len)\n+\t\t u16 value, int len)\n {\n #ifdef GSPCA_DEBUG\n \tif (len > USB_BUF_SZ) {\n@@ -733,8 +733,8 @@\n }\n \n static void reg_w1(struct gspca_dev *gspca_dev,\n-\t\t __u16 value,\n-\t\t __u8 data)\n+\t\t u16 value,\n+\t\t u8 data)\n {\n \tPDEBUG(D_USBO, \"reg_w1 [%02x] = %02x\", value, data);\n \tgspca_dev->usb_buf[0] = data;\n@@ -748,8 +748,8 @@\n \t\t\t500);\n }\n static void reg_w(struct gspca_dev *gspca_dev,\n-\t\t\t __u16 value,\n-\t\t\t const __u8 *buffer,\n+\t\t\t u16 value,\n+\t\t\t const u8 *buffer,\n \t\t\t int len)\n {\n \tPDEBUG(D_USBO, \"reg_w [%02x] = %02x %02x ..\",\n@@ -771,7 +771,7 @@\n }\n \n \/* I2C write 1 byte *\/\n-static void i2c_w1(struct gspca_dev *gspca_dev, __u8 reg, __u8 val)\n+static void i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \n@@ -796,7 +796,7 @@\n \n \/* I2C write 8 bytes *\/\n static void i2c_w8(struct gspca_dev *gspca_dev,\n-\t\t const __u8 *buffer)\n+\t\t const u8 *buffer)\n {\n \tmemcpy(gspca_dev->usb_buf, buffer, 8);\n \tusb_control_msg(gspca_dev->dev,\n@@ -810,10 +810,10 @@\n }\n \n \/* read 5 bytes in gspca_dev->usb_buf *\/\n-static void i2c_r5(struct gspca_dev *gspca_dev, __u8 reg)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\t__u8 mode[8];\n+static void i2c_r5(struct gspca_dev *gspca_dev, u8 reg)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\tu8 mode[8];\n \n \tmode[0] = 0x81 | 0x10;\n \tmode[1] = sd->i2c_base;\n@@ -855,15 +855,15 @@\n }\n \n static int configure_gpio(struct gspca_dev *gspca_dev,\n-\t\t\t const __u8 *sn9c1xx)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\tconst __u8 *reg9a;\n-\tstatic const __u8 reg9a_def[] =\n+\t\t\t const u8 *sn9c1xx)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n+\tconst u8 *reg9a;\n+\tstatic const u8 reg9a_def[] =\n \t\t{0x08, 0x40, 0x20, 0x10, 0x00, 0x04};\n-\tstatic const __u8 reg9a_sn9c325[] =\n+\tstatic const u8 reg9a_sn9c325[] =\n \t\t{0x0a, 0x40, 0x38, 0x30, 0x00, 0x20};\n-\tstatic const __u8 regd4[] = {0x60, 0x00, 0x00};\n+\tstatic const u8 regd4[] = {0x60, 0x00, 0x00};\n \n \treg_w1(gspca_dev, 0xf1, 0x00);\n \treg_w1(gspca_dev, 0x01, sn9c1xx[1]);\n@@ -931,7 +931,7 @@\n static void hv7131R_InitSensor(struct gspca_dev *gspca_dev)\n {\n \tint i = 0;\n-\tstatic const __u8 SetSensorClk[] =\t\/* 0x08 Mclk *\/\n+\tstatic const u8 SetSensorClk[] =\t\/* 0x08 Mclk *\/\n \t\t{ 0xa1, 0x11, 0x01, 0x18, 0x00, 0x00, 0x00, 0x10 };\n \n \twhile (hv7131r_sensor_init[i][0]) {\n@@ -1059,8 +1059,8 @@\n static int sd_init(struct gspca_dev *gspca_dev)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n-\t__u8 regGpio[] = { 0x29, 0x74 };\n-\t__u8 regF1;\n+\tu8 regGpio[] = { 0x29, 0x74 };\n+\tu8 regF1;\n \n \t\/* setup a selector by bridge *\/\n \treg_w1(gspca_dev, 0xf1, 0x01);\n@@ -1100,20 +1100,14 @@\n \treturn 0;\n }\n \n-static unsigned int setexposure(struct gspca_dev *gspca_dev,\n-\t\t\t\tunsigned int expo)\n-{\n-\tstruct sd *sd = (struct sd *) gspca_dev;\n-\tstatic const __u8 doit[] =\t\t\/* update sensor *\/\n-\t\t{ 0xb1, 0x5d, 0x07, 0x00, 0x03, 0x00, 0x00, 0x10 };\n-\tstatic const __u8 sensorgo[] =\t\t\/* sensor on *\/\n-\t\t{ 0xb1, 0x5d, 0x07, 0x00, 0x02, 0x00, 0x00, 0x10 };\n-\tstatic const __u8 gainMo[] =\n-\t\t{ 0xa1, 0x21, 0x00, 0x10, 0x00, 0x00, 0x00, 0x1d };\n+static u32 setexposure(struct gspca_dev *gspca_dev,\n+\t\t\tu32 expo)\n+{\n+\tstruct sd *sd = (struct sd *) gspca_dev;\n \n \tswitch (sd->sensor) {\n \tcase SENSOR_HV7131R: {\n-\t\t__u8 Expodoit[] =\n+\t\tu8 Expodoit[] =\n \t\t\t{ 0xc1, 0x11, 0x25, 0x07, 0x27, 0xc0, 0x00, 0x16 };\n \n \t\tExpodoit[3] = expo >> 16;\n@@ -1123,8 +1117,12 @@\n \t\tbreak;\n \t }\n \tcase SENSOR_MI0360: {\n-\t\t__u8 expoMi[] =\t \/* exposure 0x0635 -> 4 fp\/s 0x10 *\/\n+\t\tu8 expoMi[] =\t \/* exposure 0x0635 -> 4 fp\/s 0x10 *\/\n \t\t\t{ 0xb1, 0x5d, 0x09, 0x06, 0x35, 0x00, 0x00, 0x16 };\n+\t\tstatic const u8 doit[] =\t\t\/* update sensor *\/\n+\t\t\t{ 0xb1, 0x5d, 0x07, 0x00, 0x03, 0x00, 0x00, 0x10 };\n+\t\tstatic const u8 sensorgo[] =\t\t\/* sensor on *\/\n+\t\t\t{ 0xb1, 0x5d, 0x07, 0x00, 0x02, 0x00, 0x00, 0x10 };\n \n \t\tif (expo > 0x0635)\n \t\t\texpo = 0x0635;\n@@ -1138,10 +1136,12 @@\n \t\tbreak;\n \t }\n \tcase SENSOR_MO4000: {\n-\t\t__u8 expoMof[] =\n+\t\tu8 expoMof[] =\n \t\t\t{ 0xa1, 0x21, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x10 };\n-\t\t__u8 expoMo10[] =\n+\t\tu8 expoMo10[] =\n \t\t\t{ 0xa1, 0x21, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10 };\n+\t\tstatic const u8 gainMo[] =\n+\t\t\t{ 0xa1, 0x21, 0x00, 0x10, 0x00, 0x00, 0x00, 0x1d };\n \n \t\tif (expo > 0x1fff)\n \t\t\texpo = 0x1fff;\n@@ -1160,7 +1160,7 @@\n \t\tbreak;\n \t }\n \tcase SENSOR_OM6802: {\n-\t\t__u8 gainOm[] =\n+\t\tu8 gainOm[] =\n \t\t\t{ 0xa0, 0x34, 0xe5, 0x00, 0x00, 0x00, 0x00, 0x10 };\n \n \t\tif (expo > 0x03ff)\n@@ -1181,7 +1181,7 @@\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tunsigned int expo;\n-\t__u8 k2;\n+\tu8 k2;\n \n \tk2 = ((int) sd->brightness - 0x8000) >> 10;\n \tswitch (sd->sensor) {\n@@ -1211,8 +1211,8 @@\n static void setcontrast(struct gspca_dev *gspca_dev)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n-\t__u8 k2;\n-\t__u8 contrast[6];\n+\tu8 k2;\n+\tu8 contrast[6];\n \n \tk2 = sd->contrast * 0x30 \/ (CONTRAST_MAX + 1) + 0x10;\t\/* 10..40 *\/\n \tcontrast[0] = (k2 + 1) \/ 2;\t\t\/* red *\/\n@@ -1228,8 +1228,8 @@\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tint i, v;\n-\t__u8 reg8a[12];\t\t\t\/* U & V gains *\/\n-\tstatic __s16 uv[6] = {\t\t\/* same as reg84 in signed decimal *\/\n+\tu8 reg8a[12];\t\t\t\/* U & V gains *\/\n+\tstatic s16 uv[6] = {\t\t\/* same as reg84 in signed decimal *\/\n \t\t-24, -38, 64,\t\t\/* UR UG UB *\/\n \t\t 62, -51, -9\t\t\/* VR VG VB *\/\n \t};\n@@ -1297,13 +1297,13 @@\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tint i;\n-\t__u8 reg1, reg17, reg18;\n-\tconst __u8 *sn9c1xx;\n+\tu8 reg1, reg17, reg18;\n+\tconst u8 *sn9c1xx;\n \tint mode;\n-\tstatic const __u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };\n-\tstatic const __u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };\n-\tstatic const __u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd };\t\/* MI0360 *\/\n-\tstatic const __u8 CE_ov76xx[] =\n+\tstatic const u8 C0[] = { 0x2d, 0x2d, 0x3a, 0x05, 0x04, 0x3f };\n+\tstatic const u8 CA[] = { 0x28, 0xd8, 0x14, 0xec };\n+\tstatic const u8 CE[] = { 0x32, 0xdd, 0x2d, 0xdd };\t\/* MI0360 *\/\n+\tstatic const u8 CE_ov76xx[] =\n \t\t\t\t{ 0x32, 0xdd, 0x32, 0xdd };\n \n \tsn9c1xx = sn_tb[(int) sd->sensor];\n@@ -1460,14 +1460,14 @@\n static void sd_stopN(struct gspca_dev *gspca_dev)\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n-\tstatic const __u8 stophv7131[] =\n+\tstatic const u8 stophv7131[] =\n \t\t{ 0xa1, 0x11, 0x02, 0x09, 0x00, 0x00, 0x00, 0x10 };\n-\tstatic const __u8 stopmi0360[] =\n+\tstatic const u8 stopmi0360[] =\n \t\t{ 0xb1, 0x5d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10 };\n-\tstatic const __u8 stopov7648[] =\n+\tstatic const u8 stopov7648[] =\n \t\t{ 0xa1, 0x21, 0x76, 0x20, 0x00, 0x00, 0x00, 0x10 };\n-\t__u8 data;\n-\tconst __u8 *sn9c1xx;\n+\tu8 data;\n+\tconst u8 *sn9c1xx;\n \n \tdata = 0x0b;\n \tswitch (sd->sensor) {\n@@ -1503,8 +1503,8 @@\n \tstruct sd *sd = (struct sd *) gspca_dev;\n \tint delta;\n \tint expotimes;\n-\t__u8 luma_mean = 130;\n-\t__u8 luma_delta = 20;\n+\tu8 luma_mean = 130;\n+\tu8 luma_delta = 20;\n \n \t\/* Thanks S., without your advice, autobright should not work :) *\/\n \tif (sd->ag_cnt < 0)\n@@ -1546,7 +1546,7 @@\n \/* This function is run at interrupt level. *\/\n static void sd_pkt_scan(struct gspca_dev *gspca_dev,\n \t\t\tstruct gspca_frame *frame,\t\/* target *\/\n-\t\t\t__u8 *data,\t\t\t\/* isoc packet *\/\n+\t\t\tu8 *data,\t\t\t\/* isoc packet *\/\n \t\t\tint len)\t\t\t\/* iso packet length *\/\n {\n \tstruct sd *sd = (struct sd *) gspca_dev;\n"} {"commit":"8df55e4f8662732d62efb9b039f3d1863a0a2266","subject":"Add missing #ifndef _ASSERT_H_ protection against multiple inclusions","message":"Add missing #ifndef _ASSERT_H_ protection against multiple inclusions\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/assert.h\n+++ include\/assert.h\n@@ -39,6 +39,9 @@\n * $FreeBSD$\n *\/\n \n+#ifndef _ASSERT_H_\n+#define _ASSERT_H_\n+\n #include <sys\/cdefs.h>\n \n \/*\n@@ -62,3 +65,4 @@\n __BEGIN_DECLS\n void __assert(const char *, const char *, int, const char *);\n __END_DECLS\n+#endif \/* !_ASSERT_H_ *\/\n"} {"commit":"1bb6a1a3c7a3d54855173f5a760cbb72b4fd5229","subject":"Add dot operator type","message":"Add dot operator type\n","repos":"joshwatson\/binaryninja-api,joshwatson\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,joshwatson\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api,Vector35\/binaryninja-api","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- binaryninjacore.h\n+++ binaryninjacore.h\n@@ -637,6 +637,7 @@\n \t\tOperatorEqualNameType,\n \t\tOperatorNotEqualNameType,\n \t\tOperatorArrayNameType,\n+\t\tOperatorDotNameType,\n \t\tOperatorArrowNameType,\n \t\tOperatorStarNameType,\n \t\tOperatorIncrementNameType,\n"} {"commit":"94d5bb2196c33afb5cc61fbde6b1f09e86648a1c","subject":"typecheck format strings","message":"typecheck format strings","repos":"bitemyapp\/fileview,bitemyapp\/fileview,amaxwell\/fileview","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fileview\/FVUtilities.h\n+++ fileview\/FVUtilities.h\n@@ -84,7 +84,7 @@\n FV_PRIVATE_EXTERN void FVLogv(NSString *format, va_list argList);\n \/** @internal @brief Logging function. \n Log to stdout without the date\/app\/pid gunk that NSLog appends *\/\n-FV_PRIVATE_EXTERN void FVLog(NSString *format, ...);\n+FV_PRIVATE_EXTERN void FVLog(NSString *format, ...) NS_FORMAT_FUNCTION(1,2);\n \n \/** @internal\n Checks the pasteboard for any URL data. Converts an NSPasteboard to a Carbon PasteboardRef. \n"} {"commit":"910e8b4f1f61b69d269e7019d3384365dafbd3bf","subject":"fixing LED status in serial to uart sample","message":"fixing LED status in serial to uart sample\n","repos":"aabadie\/riot-apps","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gpio_to_serial\/main.c\n+++ gpio_to_serial\/main.c\n@@ -84,7 +84,7 @@\n for (;;) {\n \tmsg_receive(&msg); \/* This line blocks the loop until a message is \n \t\t\t received. *\/\n-\tprintf(\"Message received, LED is %s\", gpio_read(LED_GPIO)? \"ON\" : \"OFF\");\n+\tprintf(\"\\rMessage received, LED is %s\\n\", !gpio_read(LED_GPIO)? \"ON\" : \"OFF\");\n }\n \n return 0;\n"} {"commit":"8a2e026add3a6a7161a7273aedcf396f2a05f3f1","subject":"net\/mlx5: fix matching for UDP tunnels with Verbs","message":"net\/mlx5: fix matching for UDP tunnels with Verbs\n\nWhen creating flow rule with zero specs it will cause\nmatching all UDP packets like following:\n eth \/ ipv4 \/ udp \/ vxlan \/ end\nSuch rule will match all udp packets.\n\nThis change the behavior to match the dv flow engine\nwhich will automatically set the match on relative\nouter UDP port if the user didn't specify any.\n\nFixes: 84c406e74524 (\"net\/mlx5: add flow translate function\")\nCc: stable@dpdk.org\n\nSigned-off-by: Raslan Darawsheh <18fd192a829ab99382a9c480ddb6085edf3e8489@mellanox.com>\nAcked-by: Matan Azrad <6969f5f553ad7652679a585a85d7321babc90464@mellanox.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/mlx5\/mlx5_flow_verbs.c\n+++ drivers\/net\/mlx5\/mlx5_flow_verbs.c\n@@ -680,6 +680,28 @@\n \t\tudp.val.src_port &= udp.mask.src_port;\n \t\tudp.val.dst_port &= udp.mask.dst_port;\n \t}\n+\titem++;\n+\twhile (item->type == RTE_FLOW_ITEM_TYPE_VOID)\n+\t\titem++;\n+\tif (!(udp.val.dst_port & udp.mask.dst_port)) {\n+\t\tswitch ((item)->type) {\n+\t\tcase RTE_FLOW_ITEM_TYPE_VXLAN:\n+\t\t\tudp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN);\n+\t\t\tudp.mask.dst_port = 0xffff;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_VXLAN_GPE:\n+\t\t\tudp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN_GPE);\n+\t\t\tudp.mask.dst_port = 0xffff;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_MPLS:\n+\t\t\tudp.val.dst_port = htons(MLX5_UDP_PORT_MPLS);\n+\t\t\tudp.mask.dst_port = 0xffff;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n \tflow_verbs_spec_add(&dev_flow->verbs, &udp, size);\n }\n \n"} {"commit":"80812a2dcb05d02596e61769583dd98fd7568906","subject":"doc: Document the group functions.","message":"doc: Document the group functions.\n","repos":"dsch\/cmocka,VladimirTyrin\/cmocka,nuumio\/cmocka,JonathonReinhart\/cmocka,jhrozek\/cmocka,jhrozek\/cmocka,Odie\/cmocka,VladimirTyrin\/cmocka,wingyplus\/cmocka,tyc\/cmocka,nuumio\/cmocka,nuumio\/cmocka,jhrozek\/cmocka,Odie\/cmocka,jschmidlapp\/cmocka,dsch\/cmocka,clibs\/cmocka,jschmidlapp\/cmocka,Odie\/cmocka,tyc\/cmocka,jamesmunns\/CMocka,jschmidlapp\/cmocka,wingyplus\/cmocka,jamesmunns\/CMocka,clibs\/cmocka,tyc\/cmocka,JonathonReinhart\/cmocka","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/cmocka.h\n+++ include\/cmocka.h\n@@ -1351,9 +1351,11 @@\n unit_test(test), \\\n _unit_test_teardown(test, teardown)\n \n+\/** Initializes a UnitTest structure for a group setup function. *\/\n #define group_test_setup(setup) \\\n { \"group_\" #setup, setup, UNIT_TEST_FUNCTION_TYPE_GROUP_SETUP }\n \n+\/** Initializes a UnitTest structure for a group teardown function. *\/\n #define group_test_teardown(teardown) \\\n { \"group_\" #teardown, teardown, UNIT_TEST_FUNCTION_TYPE_GROUP_TEARDOWN }\n \n"} {"commit":"1c690da53ef2cd188f3de3e6fc3dc24470956fe7","subject":"free allocated exception","message":"free allocated exception\n","repos":"rflynn\/imgmin,pornel\/imgmin,micmro\/imgmin,pornel\/imgmin,rflynn\/imgmin,jibsen\/imgmin,jibsen\/imgmin,micmro\/imgmin,micmro\/imgmin,rflynn\/imgmin,pornel\/imgmin,jibsen\/imgmin,rflynn\/imgmin,pornel\/imgmin,micmro\/imgmin,jibsen\/imgmin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imgmin.c\n+++ src\/imgmin.c\n@@ -138,6 +138,8 @@\n }\n MagickSetImageCompressionQuality(tmp, (qmax + qmin) \/ 2);\n putc('\\n', stderr);\n+\n+ exception = DestroyExceptionInfo(exception);\n }\n \n return tmp;\n"} {"commit":"5f0d46f6703e975687546f4290a071bfe44aea3c","subject":"working version with on board samr21-xpro led and button","message":"working version with on board samr21-xpro led and button\n","repos":"aabadie\/riot-apps","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gpio_to_serial\/main.c\n+++ gpio_to_serial\/main.c\n@@ -21,69 +21,72 @@\n #include <stdio.h>\n #include <stdlib.h>\n \n-#include \"shell.h\"\n+#include \"board.h\"\n #include \"msg.h\"\n #include \"thread.h\"\n #include \"periph\/gpio.h\"\n #include \"periph\/uart.h\"\n \n-#define GPIO_BUTTON_PORT 10\n-#define GPIO_BUTTON_PIN 10\n-\n-#define GPIO_LED_PORT 11\n-#define GPIO_LED_PIN 11\n-\n #define UART_INTERFACE 0\n #define BAUDRATE (9600U)\n \n static kernel_pid_t idle_thread_pid;\n-static bool status = 0;\n+\n+static void uart_cb(void *dev, char data)\n+{ \n+ printf(\"\\rUART Callback\\n\");\n+ gpio_toggle(LED_GPIO);\n+ msg_t msg;\n+ msg.content.value = (uint32_t)(NULL);\n+ msg_send(&msg, idle_thread_pid);\n+}\n \n static void gpio_cb(void *pin)\n {\n- gpio_toggle(GPIO_PIN(GPIO_LED_PORT, GPIO_LED_PIN));\n- printf(\"INT: external interrupt from pin %i\\n\", (int)pin);\n+ printf(\"\\rGPIO Callback\\n\");\n+ gpio_toggle(LED_GPIO);\n msg_t msg;\n- msg.content.value = (uint32_t)(gpio_read(GPIO_PIN(GPIO_LED_PORT, GPIO_LED_PIN)));\n+ msg.content.value = (uint32_t)(NULL);\n msg_send(&msg, idle_thread_pid);\n }\n \n int main(void)\n {\n- puts(\"GPIO to UART sample application\\n\");\n+ puts(\"\\rGPIO to UART sample application\\n\");\n \n- if (gpio_init(GPIO_PIN(GPIO_LED_PORT, GPIO_LED_PIN),\n-\t\t GPIO_DIR_OUT, GPIO_PULLDOWN) < 0) {\n- printf(\"Error while initializing LED on PORT_%i.%i as output\\n\",\n-\t GPIO_LED_PORT, GPIO_LED_PIN);\n+ if (gpio_init(LED_GPIO, GPIO_DIR_OUT, GPIO_NOPULL) < 0) {\n+ puts(\"\\rError while initializing LED GPIO as output\\n\");\n return 1;\n }\n- printf(\"LED on PORT_%i.%i initialized successfully as output\\n\",\n-\t GPIO_LED_PORT, GPIO_LED_PIN);\n+ puts(\"\\rLED GPIO initialized successfully as output\\n\");\n+ \/* Shutdown on board LED *\/\n+ gpio_set(LED_GPIO);\n \n- if (gpio_init_int(GPIO_PIN(GPIO_BUTTON_PORT, GPIO_BUTTON_PIN),\n-\t\t GPIO_PULLDOWN, GPIO_RISING, gpio_cb,\n-\t\t (void *)GPIO_BUTTON_PIN) < 0) {\n- printf(\"Error while initializing PORT_%i.%02i as external interrupt\\n\",\n- GPIO_BUTTON_PORT, GPIO_BUTTON_PIN);\n+ if (gpio_init_int(BUTTON_GPIO, GPIO_PULLUP, GPIO_RISING, gpio_cb,\n+\t\t (void *)BUTTON_GPIO) < 0) {\n+ puts(\"\\rError while initializing BUTTON GPIO as external interrupt\\n\");\n return 1;\n }\n- printf(\"PORT_%i.%02i initialized successful as external interrupt\\n\",\n- GPIO_BUTTON_PORT, GPIO_BUTTON_PIN);\n+ puts(\"\\rBUTTON GPIO initialized successfully as external interrupt\\n\");\n \n+ \n \/* Initialize UART interface *\/\n- uart_init(UART_INTERFACE, BAUDRATE, NULL, (void *)NULL);\n+ if (uart_init(UART_INTERFACE, BAUDRATE, uart_cb, (void *)NULL) < 0) {\n+\tputs(\"\\rError while initializing UART interface\\n\");\n+\treturn 1;\n+ }\n+ puts(\"\\rUART interface initialized successfully\\n\");\n+ \n \n \/* Get Idle thread pid *\/\n idle_thread_pid = thread_getpid();\n-\n msg_t msg;\n+ bool status;\n for (;;) {\n-\tmsg_receive(&msg); \/* This line blocks the loop until a message is received. *\/\n-\tbool status = (bool)msg.content.value;\n-\tuart_write(UART_INTERFACE,\n-\t\t (uint8_t*)strcat(\"Button pressed, LED is now \",\n-\t\t\t\t status? \"ON\" : \"OFF\"), 1);\n+\tmsg_receive(&msg); \/* This line blocks the loop until a message is \n+\t\t\t received. *\/\n+\tstatus = gpio_read(LED_GPIO);\n+\tprintf(\"Message received, LED is %s\", status? \"ON\" : \"OFF\");\n }\n \n return 0;\n"} {"commit":"2bf76b2f99397a8ab8ee1b67ed3050a339a6608d","subject":"Added EntityTile.h (TileEntity)","message":"Added EntityTile.h (TileEntity)","repos":"byteandahalf\/PocketPC,byteandahalf\/PocketPC","returncode":1,"stderr":"error: pathspec 'jni\/mcpe\/tile\/EntityTile.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- jni\/mcpe\/tile\/EntityTile.h\n+++ jni\/mcpe\/tile\/EntityTile.h\n@@ -0,0 +1,17 @@\n+#pragma once\n+\n+#include <Tile.h>\n+\n+class TileEntity;\n+\n+\/\/ Size : 140\n+class EntityTile : public Tile\n+{\n+public:\n+\tEntityTile(int, const Material *);\n+\tEntityTile(int, const std::string &, const Material *);\n+\tvirtual ~EntityTile();\n+\tvirtual void neighborChanged(TileSource *, int, int, int, int, int, int);\n+\tvirtual void triggerEvent(TileSource *, int, int, int, int, int);\n+\tvirtual TileEntity *newTileEntity(const TilePos &);\n+};\n"} {"commit":"ea56505bedd03e21f497c59cece15a62b4398fc4","subject":"partitions\/efi.c: replace useless kzalloc's by kmalloc's","message":"partitions\/efi.c: replace useless kzalloc's by kmalloc's\n\nIn alloc_read_gpt_entries and alloc_read_gpt_header, the kzalloc'ated\nzones are either totally overwritten by the following read_lba call,\nor freed. As kmalloc is cheaper than kzalloc, use kmalloc.\n\nSigned-off-by: Philippe De Muyter <f1d5d9ae7ed80900d12a7e800195edd90db9f6f7@macqel.be>\nCc: Matt Domsch <04e96a82b027a3325dae0e2e6c77a776e282ec67@dell.com>\nCc: Panagiotis Issaris <ce33592a53909e58924ee357b877870389c841d3@issaris.org>\nCc: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Jens Axboe <cd8c6775e60d6f67a6984377324e5290df3d5358@kernel.dk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- block\/partitions\/efi.c\n+++ block\/partitions\/efi.c\n@@ -238,7 +238,7 @@\n le32_to_cpu(gpt->sizeof_partition_entry);\n \tif (!count)\n \t\treturn NULL;\n-\tpte = kzalloc(count, GFP_KERNEL);\n+\tpte = kmalloc(count, GFP_KERNEL);\n \tif (!pte)\n \t\treturn NULL;\n \n@@ -267,7 +267,7 @@\n \tgpt_header *gpt;\n \tunsigned ssz = bdev_logical_block_size(state->bdev);\n \n-\tgpt = kzalloc(ssz, GFP_KERNEL);\n+\tgpt = kmalloc(ssz, GFP_KERNEL);\n \tif (!gpt)\n \t\treturn NULL;\n \n"} {"commit":"4fe8b2eec848fc054ac2c45a585d74f6e8e392e7","subject":"net\/virtio: remove useless driver name copy","message":"net\/virtio: remove useless driver name copy\n\nThis is overwritten in rte_eth_dev_info_get().\n\nSigned-off-by: Jan Blunck <428a1e03bf18d7720952a3563b48222e4a94a135@infradead.org>\nReviewed-by: David Marchand <f28529695cfa9e3e1eb84e7072aa626af4abb18e@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/virtio\/virtio_ethdev.c\n+++ drivers\/net\/virtio\/virtio_ethdev.c\n@@ -1624,10 +1624,6 @@\n \tuint64_t tso_mask;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n \n-\tif (dev->pci_dev)\n-\t\tdev_info->driver_name = dev->driver->pci_drv.driver.name;\n-\telse\n-\t\tdev_info->driver_name = \"virtio_user PMD\";\n \tdev_info->max_rx_queues =\n \t\tRTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);\n \tdev_info->max_tx_queues =\n"} {"commit":"1aa4529f9207f1e65528c8254028fbeda060cabb","subject":"comments","message":"comments\n","repos":"pornel\/imgmin,rflynn\/imgmin,micmro\/imgmin,jibsen\/imgmin,jibsen\/imgmin,pornel\/imgmin,jibsen\/imgmin,rflynn\/imgmin,rflynn\/imgmin,micmro\/imgmin,jibsen\/imgmin,rflynn\/imgmin,micmro\/imgmin,pornel\/imgmin,pornel\/imgmin,micmro\/imgmin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imgmin.c\n+++ src\/imgmin.c\n@@ -197,9 +197,10 @@\n MagickWandGenesis();\n mw = NewMagickWand();\n \n+ \/* load image... *\/\n if (0 == strcmp(\"-\", src))\n {\n- \/* load image from stdin *\/\n+ \/* ...from stdin *\/\n # define BIGBUF (16 * 1024 * 1024)\n char *blob = malloc(BIGBUF);\n oldsize = read(STDIN_FILENO, blob, BIGBUF);\n@@ -211,7 +212,7 @@\n MagickReadImageBlob(mw, blob, oldsize);\n free(blob);\n } else {\n- \/* load image from disk *\/\n+ \/* ...from disk *\/\n status = MagickReadImage(mw, src);\n if (status == MagickFalse)\n ThrowWandException(mw);\n"} {"commit":"e303b9ef7e9d6404487ff5cc940cd8d2a488f091","subject":"PacketBuffer: call Recv before calling Send, so that sending has priority over receiving (it's a LIFO...)","message":"PacketBuffer: call Recv before calling Send, so that sending has priority over receiving (it's a LIFO...)\n\n","repos":"DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- flow\/PacketBuffer.c\n+++ flow\/PacketBuffer.c\n@@ -41,14 +41,14 @@\n \/\/ submit packet to buffer\n ChunkBuffer2_SubmitPacket(&buf->buf, in_len);\n \n+ \/\/ if there is space, schedule receive\n+ if (buf->buf.input_avail >= buf->input_mtu) {\n+ PacketRecvInterface_Receiver_Recv(buf->input, buf->buf.input_dest);\n+ }\n+ \n \/\/ if buffer was empty, schedule send\n if (was_empty) {\n PacketPassInterface_Sender_Send(buf->output, buf->buf.output_dest, buf->buf.output_avail);\n- }\n- \n- \/\/ if there is space, schedule receive\n- if (buf->buf.input_avail >= buf->input_mtu) {\n- PacketRecvInterface_Receiver_Recv(buf->input, buf->buf.input_dest);\n }\n }\n \n@@ -62,14 +62,14 @@\n \/\/ remove packet from buffer\n ChunkBuffer2_ConsumePacket(&buf->buf);\n \n+ \/\/ if buffer was full and there is space, schedule receive\n+ if (was_full && buf->buf.input_avail >= buf->input_mtu) {\n+ PacketRecvInterface_Receiver_Recv(buf->input, buf->buf.input_dest);\n+ }\n+ \n \/\/ if there is more data, schedule send\n if (buf->buf.output_avail >= 0) {\n PacketPassInterface_Sender_Send(buf->output, buf->buf.output_dest, buf->buf.output_avail);\n- }\n- \n- \/\/ if buffer was full and there is space, schedule receive\n- if (was_full && buf->buf.input_avail >= buf->input_mtu) {\n- PacketRecvInterface_Receiver_Recv(buf->input, buf->buf.input_dest);\n }\n }\n \n"} {"commit":"65a077152267fc461214aabe4ca8fc27e04ce175","subject":"Add fallback definition of gtk_widget_get_visible in KatzeScrolled","message":"Add fallback definition of gtk_widget_get_visible in KatzeScrolled\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- katze\/katze-scrolled.c\n+++ katze\/katze-scrolled.c\n@@ -30,6 +30,7 @@\n #define gtk_widget_get_allocation(wdgt, alloc) *alloc = wdgt->allocation\n #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE\n #define gtk_widget_get_drawable GTK_WIDGET_VISIBLE\n+ #define gtk_widget_get_visible(wdgt) GTK_WIDGET_VISIBLE (wdgt)\n #endif\n #if !GTK_CHECK_VERSION (2, 19, 6)\n #define gtk_widget_set_realized(wdgt, real) \\\n"} {"commit":"a566d0d3f14d467b3df237a9b2a0283e95db65e2","subject":"Fix List::concat to no sub-effect. Add List::concat! is List::concat sub-effective version (same as original List::concat).","message":"Fix List::concat to no sub-effect.\nAdd List::concat! is List::concat sub-effective version (same as original List::concat).\n","repos":"mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- methods.c\n+++ methods.c\n@@ -2018,6 +2018,48 @@\n \n Toy_Type*\n mth_list_concat(Toy_Interp *interp, Toy_Type *posargs, Hash *nameargs, int arglen) {\n+ Toy_Type *self, *l, *item, *src, *result;\n+\n+ if (hash_get_length(nameargs) != 0) goto error;\n+\n+ src = SELF(interp);\n+ l = result = new_list(NULL);\n+ while (src) {\n+\tl = list_append(l, list_get_item(src));\n+\tsrc = list_next(src);\n+ }\n+\n+ l = self = result;\n+ \n+ if (GET_TAG(self) != LIST) goto error2;\n+\n+ while (! IS_LIST_NULL(posargs)) {\n+\titem = list_get_item(posargs);\n+\n+\tif (GET_TAG(item) == LIST) {\n+\t Toy_Type *fitem;\n+\t fitem = item;\n+\t while (! IS_LIST_NULL(fitem)) {\n+\t\tl = list_append(l, list_get_item(fitem));\n+\t\tfitem = list_next(fitem);\n+\t }\n+\t} else {\n+\t l = list_append(l, item);\n+\t}\n+\n+\tposargs = list_next(posargs);\n+ }\n+\n+ return self;\n+\n+error:\n+ return new_exception(TE_SYNTAX, L\"Syntax error at 'concat', syntax: List concat (list) | var ...\", interp);\n+error2:\n+ return new_exception(TE_TYPE, L\"Type error.\", interp);\n+}\n+\n+Toy_Type*\n+mth_list_concat_se(Toy_Interp *interp, Toy_Type *posargs, Hash *nameargs, int arglen) {\n Toy_Type *self, *l, *item;\n \n if (hash_get_length(nameargs) != 0) goto error;\n@@ -5387,6 +5429,7 @@\n toy_add_method(interp, L\"List\", L\"filter\", \t\tmth_list_filter, \tL\"body\");\n toy_add_method(interp, L\"List\", L\"map\", \t\tmth_list_map, \t\tL\"body\");\n toy_add_method(interp, L\"List\", L\"concat\", \t\tmth_list_concat, \tL\"body\");\n+ toy_add_method(interp, L\"List\", L\"concat!\",\t\tmth_list_concat_se, \tL\"body\");\n toy_add_method(interp, L\"List\", L\"seek\", \t\tmth_list_seek, \t\tL\"val\");\n toy_add_method(interp, L\"List\", L\"split\", \t\tmth_list_split, \tL\"val\");\n toy_add_method(interp, L\"List\", L\"<<\", \t\tmth_list_unshift, \tL\"val\");\n"} {"commit":"b85b3b7af52d1c1bd45bfcd47aa425a15fda45f7","subject":"[B43]: Don't lock irq_lock in debugfs txpower adjust","message":"[B43]: Don't lock irq_lock in debugfs txpower adjust\n\nIt's not required and the txpower adjustment must not be in atomic.\n\nSigned-off-by: Michael Buesch <77666125932addc6fc525b281b518fd8fd2203d8@bu3sch.de>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/b43\/debugfs.c\n+++ drivers\/net\/wireless\/b43\/debugfs.c\n@@ -223,15 +223,10 @@\n static int txpower_g_write_file(struct b43_wldev *dev,\n \t\t\t\tconst char *buf, size_t count)\n {\n-\tunsigned long flags;\n \tunsigned long phy_flags;\n-\tint err = 0;\n-\n-\tspin_lock_irqsave(&dev->wl->irq_lock, flags);\n-\tif (dev->phy.type != B43_PHYTYPE_G) {\n-\t\terr = -ENODEV;\n-\t\tgoto out_unlock;\n-\t}\n+\n+\tif (dev->phy.type != B43_PHYTYPE_G)\n+\t\treturn -ENODEV;\n \tif ((count >= 4) && (memcmp(buf, \"auto\", 4) == 0)) {\n \t\t\/* Automatic control *\/\n \t\tdev->phy.manual_txpower_control = 0;\n@@ -240,10 +235,8 @@\n \t\tint bbatt = 0, rfatt = 0, txmix = 0, pa2db = 0, pa3db = 0;\n \t\t\/* Manual control *\/\n \t\tif (sscanf(buf, \"%d %d %d %d %d\", &bbatt, &rfatt,\n-\t\t\t &txmix, &pa2db, &pa3db) != 5) {\n-\t\t\terr = -EINVAL;\n-\t\t\tgoto out_unlock;\n-\t\t}\n+\t\t\t &txmix, &pa2db, &pa3db) != 5)\n+\t\t\treturn -EINVAL;\n \t\tb43_put_attenuation_into_ranges(dev, &bbatt, &rfatt);\n \t\tdev->phy.manual_txpower_control = 1;\n \t\tdev->phy.bbatt.att = bbatt;\n@@ -262,10 +255,8 @@\n \t\tb43_radio_unlock(dev);\n \t\tb43_phy_unlock(dev, phy_flags);\n \t}\n-out_unlock:\n-\tspin_unlock_irqrestore(&dev->wl->irq_lock, flags);\n-\n-\treturn err;\n+\n+\treturn 0;\n }\n \n \/* wl->irq_lock is locked *\/\n"} {"commit":"f5cb92ac82d06cb583c1f66666314c5c0a4d7913","subject":"genirq: Adjust irq thread affinity on IRQ_SET_MASK_OK_NOCOPY return value","message":"genirq: Adjust irq thread affinity on IRQ_SET_MASK_OK_NOCOPY return value\n\nirq_move_masked_irq() checks the return code of\nchip->irq_set_affinity() only for 0, but IRQ_SET_MASK_OK_NOCOPY is\nalso a valid return code, which is there to avoid a redundant copy of\nthe cpumask. But in case of IRQ_SET_MASK_OK_NOCOPY we not only avoid\nthe redundant copy, we also fail to adjust the thread affinity of an\neventually threaded interrupt handler.\n\nHandle IRQ_SET_MASK_OK (==0) and IRQ_SET_MASK_OK_NOCOPY(==1) return\nvalues correctly by checking the valid return values seperately.\n\nSigned-off-by: Jiang Liu <68ee766e574f18b34b683085865827393efe88bd@huawei.com>\nCc: Jiang Liu <c745fa7b96fe79db6d669643d5feb03ff0641332@gmail.com>\nCc: Keping Chen <ce7da405c708d4d1107ff7c09ce5d92bab092291@huawei.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org\nLink: http:\/\/lkml.kernel.org\/r\/1333120296-13563-2-git-send-email-68ee766e574f18b34b683085865827393efe88bd@huawei.com\nSigned-off-by: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/irq\/migration.c\n+++ kernel\/irq\/migration.c\n@@ -43,12 +43,16 @@\n \t * masking the irqs.\n \t *\/\n \tif (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)\n-\t\t < nr_cpu_ids))\n-\t\tif (!chip->irq_set_affinity(&desc->irq_data,\n-\t\t\t\t\t desc->pending_mask, false)) {\n+\t\t < nr_cpu_ids)) {\n+\t\tint ret = chip->irq_set_affinity(&desc->irq_data,\n+\t\t\t\t\t\t desc->pending_mask, false);\n+\t\tswitch (ret) {\n+\t\tcase IRQ_SET_MASK_OK:\n \t\t\tcpumask_copy(desc->irq_data.affinity, desc->pending_mask);\n+\t\tcase IRQ_SET_MASK_OK_NOCOPY:\n \t\t\tirq_set_thread_affinity(desc);\n \t\t}\n+\t}\n \n \tcpumask_clear(desc->pending_mask);\n }\n"} {"commit":"0f771cdacaca4bc55781fdb63a23207aeae0892c","subject":"preparing migrate to maintain the mflag","message":"preparing migrate to maintain the mflag\n","repos":"ibaned\/tetknife,ibaned\/tetknife,ibaned\/tetknife","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- migrate.c\n+++ migrate.c\n@@ -2,6 +2,7 @@\n #include \"comm.h\"\n #include \"remotes.h\"\n #include \"mesh_adj.h\"\n+#include \"flag.h\"\n \n mlabel* migration_plan_new(mesh* m)\n {\n@@ -71,11 +72,33 @@\n }\n }\n \n+static void pack_common(mesh* m, ment e, int to)\n+{\n+ int fv;\n+ if (mesh_flag(m)) {\n+ fv = mflag_get(mesh_flag(m), e);\n+ COMM_PACK(fv, to);\n+ }\n+}\n+\n+static void unpack_common(mesh* m, ment e)\n+{\n+ int fv;\n+ if (mesh_flag(m)) {\n+ COMM_UNPACK(fv);\n+ if (fv)\n+ mflag_set(mesh_flag(m), e);\n+ else\n+ mflag_clear(mesh_flag(m), e);\n+ }\n+}\n+\n static void pack_vertex(mesh* m, ment v, int to)\n {\n point x;\n x = mesh_point(m, v);\n COMM_PACK(x, to);\n+ pack_common(m, v, to);\n }\n \n static ment unpack_vertex(mesh* m)\n@@ -85,6 +108,7 @@\n COMM_UNPACK(x);\n v = ment_new(m, VERTEX, 0);\n mesh_set_point(m, v, x);\n+ unpack_common(m, v);\n return v;\n }\n \n@@ -179,6 +203,7 @@\n COMM_PACK(e.t, to);\n for (i = 0; i < nv; ++i)\n pack_ref(m, v[i], to);\n+ pack_common(m, e, to);\n }\n \n static ment unpack_elem(mesh* m)\n@@ -191,7 +216,9 @@\n nv = simplex_ndown[e.t][VERTEX];\n for (i = 0; i < nv; ++i)\n v[i] = unpack_ref();\n- return ment_new(m, e.t, v);\n+ e = ment_new(m, e.t, v);\n+ unpack_common(m, e);\n+ return e;\n }\n \n static void pack_and_free_elems(mesh* m, mlabel* plan)\n"} {"commit":"7bf02c2985ced746f8b8956dbe4b0384edb41846","subject":"libertas: fix error cases in lbs_process_rxed_802_11_packet()","message":"libertas: fix error cases in lbs_process_rxed_802_11_packet()\n\nSigned-off-by: David Woodhouse <97b3379caa91f4ee97e44013ae4dc6350540fa9d@infradead.org>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/libertas\/rx.c\n+++ drivers\/net\/wireless\/libertas\/rx.c\n@@ -337,9 +337,10 @@\n \t\/\/ lbs_deb_hex(LBS_DEB_RX, \"RX Data: Before chop rxpd\", skb->data, min(skb->len, 100));\n \n \tif (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {\n-\t\tlbs_deb_rx(\"rx err: frame received wit bad length\\n\");\n+\t\tlbs_deb_rx(\"rx err: frame received with bad length\\n\");\n \t\tpriv->stats.rx_length_errors++;\n-\t\tret = 0;\n+\t\tret = -EINVAL;\n+\t\tkfree(skb);\n \t\tgoto done;\n \t}\n \n@@ -381,10 +382,11 @@\n \n \t\/* add space for the new radio header *\/\n \tif ((skb_headroom(skb) < sizeof(struct rx_radiotap_hdr)) &&\n-\t pskb_expand_head(skb, sizeof(struct rx_radiotap_hdr), 0,\n-\t\t\t GFP_ATOMIC)) {\n-\t\tlbs_pr_alert(\"%s: couldn't pskb_expand_head\\n\",\n-\t\t\t __func__);\n+\t pskb_expand_head(skb, sizeof(struct rx_radiotap_hdr), 0, GFP_ATOMIC)) {\n+\t\tlbs_pr_alert(\"%s: couldn't pskb_expand_head\\n\", __func__);\n+\t\tret = -ENOMEM;\n+\t\tkfree_skb(skb);\n+\t\tgoto done;\n \t}\n \n \tpradiotap_hdr = (void *)skb_push(skb, sizeof(struct rx_radiotap_hdr));\n"} {"commit":"be3448175c4992dbdf61868e27686a47bcf7da9c","subject":"Default stride when zero is passed for fplThreadWait* and fplSignalWaitFor","message":"Default stride when zero is passed for fplThreadWait* and fplSignalWaitFor\n","repos":"f1nalspace\/final_game_tech,f1nalspace\/final_game_tech,f1nalspace\/final_game_tech","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- final_platform_layer.h\n+++ final_platform_layer.h\n@@ -3716,7 +3716,7 @@\n * @brief Wait until all given threads are done running or the given timeout has been reached.\n * @param threads The pointer to the first @ref fplThreadHandle pointer\n * @param count The number of threads\n- * @param stride The size in bytes to the next thread handle\n+ * @param stride The size in bytes to the next thread handle. When this is set to zero, the array default is used.\n * @param timeout The number of milliseconds to wait. When this is set to @ref FPL_TIMEOUT_INFINITE it will wait infinitly.\n * @return Returns true when all threads completes or when the timeout has been reached, false otherwise.\n *\/\n@@ -3725,7 +3725,7 @@\n * @brief Wait until one of given threads is done running or the given timeout has been reached.\n * @param threads The pointer to the first @ref fplThreadHandle pointer\n * @param count The number of threads\n- * @param stride The size in bytes to the next thread handle\n+ * @param stride The size in bytes to the next thread handle. When this is set to zero, the array default is used.\n * @param timeout The number of milliseconds to wait. When this is set to @ref FPL_TIMEOUT_INFINITE it will wait infinitly.\n * @return Returns true when one thread completes or when the timeout has been reached, false otherwise.\n *\/\n@@ -3786,7 +3786,7 @@\n * @brief Waits until all the given signal are waked up.\n * @param signals The pointer to the first @ref fplSignalHandle pointer\n * @param count The number of signals\n- * @param stride The size in bytes to the next signal handle\n+ * @param stride The size in bytes to the next signal handle. When this is set to zero, the array default is used.\n * @param timeout The number of milliseconds to wait. When this is set to @ref FPL_TIMEOUT_INFINITE it will wait infinitly.\n * @return Returns true when all signals woke up or the timeout has been reached, false otherwise.\n *\/\n@@ -3795,7 +3795,7 @@\n * @brief Waits until any of the given signals wakes up or the timeout has been reached.\n * @param signals The pointer to the first @ref fplSignalHandle pointer\n * @param count The number of signals\n- * @param stride The size in bytes to the next signal handle\n+ * @param stride The size in bytes to the next signal handle. When this is set to zero, the array default is used.\n * @param timeout The number of milliseconds to wait. When this is set to @ref FPL_TIMEOUT_INFINITE it will wait infinitly.\n * @return Returns true when any of the signals woke up or the timeout has been reached, false otherwise.\n *\/\n@@ -9651,8 +9651,9 @@\n \tFPL__CheckArgumentNull(threads, false);\n \tFPL__CheckArgumentMax(count, FPL__MAX_THREAD_COUNT, false);\n \tfplStaticAssert(FPL__MAX_THREAD_COUNT >= MAXIMUM_WAIT_OBJECTS);\n+\tconst size_t actualStride = stride > 0 ? stride : sizeof(fplThreadHandle *);\n \tfor (size_t index = 0; index < count; ++index) {\n-\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * stride);\n+\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * actualStride);\n \t\tif (thread == fpl_null) {\n \t\t\tFPL_ERROR(FPL__MODULE_THREADING, \"Thread for index '%d' are not allowed to be null\", index);\n \t\t\treturn false;\n@@ -9673,7 +9674,7 @@\n \twhile (stoppedThreads < minThreads) {\n \t\tstoppedThreads = 0;\n \t\tfor (size_t index = 0; index < count; ++index) {\n-\t\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * stride);\n+\t\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * actualStride);\n \t\t\tif (fplGetThreadState(thread) == fplThreadState_Stopped) {\n \t\t\t\t++stoppedThreads;\n \t\t\t}\n@@ -9696,8 +9697,9 @@\n \tFPL__CheckArgumentNull(signals, false);\n \tFPL__CheckArgumentMax(count, FPL__MAX_SIGNAL_COUNT, false);\n \tHANDLE signalHandles[FPL__MAX_SIGNAL_COUNT];\n+\tconst size_t actualStride = stride > 0 ? stride : sizeof(fplSignalHandle*);\n \tfor (uint32_t index = 0; index < count; ++index) {\n-\t\tfplSignalHandle *availableSignal = *(fplSignalHandle **)((uint8_t *)signals + index * stride);\n+\t\tfplSignalHandle *availableSignal = *(fplSignalHandle **)((uint8_t *)signals + index * actualStride);\n \t\tif (availableSignal == fpl_null) {\n \t\t\tFPL_ERROR(FPL__MODULE_THREADING, \"Signal for index '%d' are not allowed to be null\", index);\n \t\t\treturn false;\n@@ -12329,8 +12331,9 @@\n fpl_internal bool fpl__PosixThreadWaitForMultiple(fplThreadHandle **threads, const uint32_t minCount, const uint32_t maxCount, const size_t stride, const fplTimeoutValue timeout) {\n \tFPL__CheckArgumentNull(threads, false);\n \tFPL__CheckArgumentMax(maxCount, FPL__MAX_THREAD_COUNT, false);\n+\tconst size_t actualStride = stride > 0 ? stride : sizeof(fplThreadHandle *);\n \tfor (uint32_t index = 0; index < maxCount; ++index) {\n-\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * stride);\n+\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * actualStride);\n \t\tif (thread == fpl_null) {\n \t\t\tFPL_ERROR(FPL__MODULE_THREADING, \"Thread for index '%d' are not allowed to be null\", index);\n \t\t\treturn false;\n@@ -12340,7 +12343,7 @@\n \tuint32_t completeCount = 0;\n \tbool isRunning[FPL__MAX_THREAD_COUNT];\n \tfor (uint32_t index = 0; index < maxCount; ++index) {\n-\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * stride);\n+\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * actualStride);\n \t\tisRunning[index] = fplGetThreadState(thread) != fplThreadState_Stopped;\n \t\tif (!isRunning[index]) {\n \t\t\t++completeCount;\n@@ -12351,7 +12354,7 @@\n \tbool result = false;\n \twhile (completeCount < minCount) {\n \t\tfor (uint32_t index = 0; index < maxCount; ++index) {\n-\t\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * stride);\n+\t\t\tfplThreadHandle *thread = *(fplThreadHandle **)((uint8_t *)threads + index * actualStride);\n \t\t\tif (isRunning[index]) {\n \t\t\t\tfplThreadState state = fplGetThreadState(thread);\n \t\t\t\tif (state == fplThreadState_Stopped) {\n@@ -15088,8 +15091,9 @@\n fpl_internal bool fpl__LinuxSignalWaitForMultiple(fplSignalHandle *signals[], const uint32_t minCount, const uint32_t maxCount, const size_t stride, const fplTimeoutValue timeout) {\n \tFPL__CheckArgumentNull(signals, false);\n \tFPL__CheckArgumentMax(maxCount, FPL__MAX_SIGNAL_COUNT, false);\n+\tconst size_t actualStride = stride > 0 ? stride : sizeof(fplSignalHandle *);\n \tfor (uint32_t index = 0; index < maxCount; ++index) {\n-\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + index * stride);\n+\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + index * actualStride);\n \t\tif (signal == fpl_null) {\n \t\t\tFPL_ERROR(FPL__MODULE_THREADING, \"Signal for index '%d' are not allowed to be null\", index);\n \t\t\treturn false;\n@@ -15108,7 +15112,7 @@\n \tfor (int index = 0; index < maxCount; index++) {\n \t\tevents[index].events = EPOLLIN;\n \t\tevents[index].data.u32 = index;\n-\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + index * stride);\n+\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + index * actualStride);\n \t\tint x = epoll_ctl(e, EPOLL_CTL_ADD, signal->internalHandle.linuxEventHandle, events + index);\n \t\tfplAssert(x == 0);\n \t}\n@@ -15128,7 +15132,7 @@\n \t\t}\n \t\tfor (int eventIndex = 0; eventIndex < ret; eventIndex++) {\n \t\t\tuint32_t signalIndex = revent[eventIndex].data.u32;\n-\t\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + signalIndex * stride);\n+\t\t\tfplSignalHandle *signal = *(fplSignalHandle **)((uint8_t *)signals + signalIndex * actualStride);\n \t\t\tepoll_ctl(e, EPOLL_CTL_DEL, signal->internalHandle.linuxEventHandle, NULL);\n \t\t}\n \t\teventsResult = revent[0].data.u32;\n"} {"commit":"2716fd7d455e277ad8676df794fe65bd1e1ba442","subject":"mwifiex: hold proper locks when accessing ra_list \/ bss_prio lists","message":"mwifiex: hold proper locks when accessing ra_list \/ bss_prio lists\n\nNot locking ra_list when dequeuing packets creates race conditions.\nWhen adding a packet 'tx_pkts_queued' is modified before setting\nhighest_priority_queue. If in-between the main loop starts, it will\nsee a packet queued (tx_pkts_queued > 0) but will not find it, since\nmax prio is not set yet. Depending on the scheduling, the thread\ntrying to add the packet could complete and restore the situation.\nBut this is not something to rely on.\n\nAnother race condition exists, if a new packet, exceeding current\nmax prio is added. If concurrently a packet is dequeued, the newly\nset max prio will be overwritten with the value of the dequeued\npacket. This can occur, because selecting a packet and modifying\nthe max prio is not atomic. The result in an infinite loop unless,\na new packet is added that has at least the priority of the hidden\npacket.\n\nSame applies to bss_prio_tbl. Forward iteration is no proper\nlock-free technique and provides no protection from calls to\nlist_del. Although BSS are currently not added\/removed dynamically,\nthis must not be the case in the future. Hence always hold proper\nlocks when accessing those lists.\n\nSigned-off-by: Andreas Fenkart <5956c1053cc7d77d3ae9490c27bdb39cfb984101@streamunlimited.com>\nSigned-off-by: Bing Zhao <abbaae6378dda6b8d65fe6bd0f8beb334a5e4c4f@marvell.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/net\/wireless\/mwifiex\/wmm.c\n+++ drivers\/net\/wireless\/mwifiex\/wmm.c\n@@ -685,12 +685,12 @@\n \tra_list->total_pkts_size += skb->len;\n \tra_list->pkt_count++;\n \n-\tatomic_inc(&priv->wmm.tx_pkts_queued);\n-\n \tif (atomic_read(&priv->wmm.highest_queued_prio) <\n \t\t\t\t\t\ttos_to_tid_inv[tid_down])\n \t\tatomic_set(&priv->wmm.highest_queued_prio,\n \t\t\t tos_to_tid_inv[tid_down]);\n+\n+\tatomic_inc(&priv->wmm.tx_pkts_queued);\n \n \tspin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);\n }\n@@ -887,19 +887,15 @@\n \tstruct mwifiex_bss_prio_node *bssprio_node, *bssprio_head;\n \tstruct mwifiex_tid_tbl *tid_ptr;\n \tatomic_t *hqp;\n-\tint is_list_empty;\n-\tunsigned long flags;\n+\tunsigned long flags_bss, flags_ra;\n \tint i, j;\n \n \tfor (j = adapter->priv_num - 1; j >= 0; --j) {\n \t\tspin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,\n-\t\t\t\t flags);\n-\t\tis_list_empty = list_empty(&adapter->bss_prio_tbl[j]\n-\t\t\t\t\t .bss_prio_head);\n-\t\tspin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,\n-\t\t\t\t flags);\n-\t\tif (is_list_empty)\n-\t\t\tcontinue;\n+\t\t\t\t flags_bss);\n+\n+\t\tif (list_empty(&adapter->bss_prio_tbl[j].bss_prio_head))\n+\t\t\tgoto skip_prio_tbl;\n \n \t\tif (adapter->bss_prio_tbl[j].bss_prio_cur ==\n \t\t (struct mwifiex_bss_prio_node *)\n@@ -924,21 +920,18 @@\n \t\t\thqp = &priv_tmp->wmm.highest_queued_prio;\n \t\t\tfor (i = atomic_read(hqp); i >= LOW_PRIO_TID; --i) {\n \n+\t\t\t\tspin_lock_irqsave(&priv_tmp->wmm.\n+\t\t\t\t\t\t ra_list_spinlock, flags_ra);\n+\n \t\t\t\ttid_ptr = &(priv_tmp)->wmm.\n \t\t\t\t\ttid_tbl_ptr[tos_to_tid[i]];\n \n \t\t\t\t\/* For non-STA ra_list_curr may be NULL *\/\n \t\t\t\tif (!tid_ptr->ra_list_curr)\n-\t\t\t\t\tcontinue;\n-\n-\t\t\t\tspin_lock_irqsave(&priv_tmp->wmm.\n-\t\t\t\t\t\t ra_list_spinlock, flags);\n-\t\t\t\tis_list_empty =\n-\t\t\t\t\tlist_empty(&tid_ptr->ra_list);\n-\t\t\t\tspin_unlock_irqrestore(&priv_tmp->wmm.\n-\t\t\t\t\t\t ra_list_spinlock, flags);\n-\t\t\t\tif (is_list_empty)\n-\t\t\t\t\tcontinue;\n+\t\t\t\t\tgoto skip_wmm_queue;\n+\n+\t\t\t\tif (list_empty(&tid_ptr->ra_list))\n+\t\t\t\t\tgoto skip_wmm_queue;\n \n \t\t\t\t\/*\n \t\t\t\t * Always choose the next ra we transmitted\n@@ -960,10 +953,8 @@\n \t\t\t\t}\n \n \t\t\t\tdo {\n-\t\t\t\t\tis_list_empty =\n-\t\t\t\t\t\tskb_queue_empty(&ptr->skb_head);\n-\n-\t\t\t\t\tif (!is_list_empty)\n+\t\t\t\t\tif (!skb_queue_empty(&ptr->skb_head))\n+\t\t\t\t\t\t\/* holds both locks *\/\n \t\t\t\t\t\tgoto found;\n \n \t\t\t\t\t\/* Get next ra *\/\n@@ -978,6 +969,11 @@\n \t\t\t\t\t\t struct mwifiex_ra_list_tbl,\n \t\t\t\t\t\t list);\n \t\t\t\t} while (ptr != head);\n+\n+skip_wmm_queue:\n+\t\t\t\tspin_unlock_irqrestore(&priv_tmp->wmm.\n+\t\t\t\t\t\t ra_list_spinlock,\n+\t\t\t\t\t\t flags_ra);\n \t\t\t}\n \n skip_bss:\n@@ -995,14 +991,21 @@\n \t\t\t\t\t\tstruct mwifiex_bss_prio_node,\n \t\t\t\t\t\tlist);\n \t\t} while (bssprio_node != bssprio_head);\n-\t}\n+\n+skip_prio_tbl:\n+\t\tspin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,\n+\t\t\t\t flags_bss);\n+\t}\n+\n \treturn NULL;\n \n found:\n-\tspin_lock_irqsave(&priv_tmp->wmm.ra_list_spinlock, flags);\n+\t\/* holds bss_prio_lock \/ ra_list_spinlock *\/\n \tif (atomic_read(hqp) > i)\n \t\tatomic_set(hqp, i);\n-\tspin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags);\n+\tspin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags_ra);\n+\tspin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,\n+\t\t\t flags_bss);\n \n \t*priv = priv_tmp;\n \t*tid = tos_to_tid[i];\n"} {"commit":"20802ea15ed443fb32334e978566a88a3953057b","subject":"accolade_forward -> accolade_pass","message":"accolade_forward -> accolade_pass\n","repos":"ntop\/PF_RING,ntop\/PF_RING,ntop\/PF_RING,ntop\/PF_RING,ntop\/PF_RING,ntop\/PF_RING,ntop\/PF_RING","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- kernel\/linux\/pf_ring.h\n+++ kernel\/linux\/pf_ring.h\n@@ -516,7 +516,7 @@\n \n typedef enum {\n accolade_drop,\n- accolade_forward\n+ accolade_pass\n } accolade_rule_action_type;\n \n typedef struct {\n"} {"commit":"2f251eb2831ea6cb2bf9dd5465902c7ee2372dd7","subject":"board\/boldar\/sensors.c: Format with clang-format","message":"board\/boldar\/sensors.c: Format with clang-format\n\nBUG=b:236386294\nBRANCH=none\nTEST=none\n\nChange-Id: Id40ddea9bfbb081b550405a5fdc44034d31043ce\nSigned-off-by: Jack Rosenthal <d3f605bef1867f59845d4ce6e4f83b8dc9e4e0ae@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3728066\nReviewed-by: Jeremy Bettis <4df7b5147fee087dca33c181f288ee7dbf56e022@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- board\/boldar\/sensors.c\n+++ board\/boldar\/sensors.c\n@@ -85,17 +85,13 @@\n };\n \n \/* Rotation matrix for the lid accelerometer *\/\n-static const mat33_fp_t lid_standard_ref = {\n-\t{ FLOAT_TO_FP(1), 0, 0},\n-\t{ 0, FLOAT_TO_FP(-1), 0},\n-\t{ 0, 0, FLOAT_TO_FP(-1)}\n-};\n-\n-const mat33_fp_t base_standard_ref = {\n-\t{ 0, FLOAT_TO_FP(1), 0},\n-\t{ FLOAT_TO_FP(-1), 0, 0},\n-\t{ 0, 0, FLOAT_TO_FP(1)}\n-};\n+static const mat33_fp_t lid_standard_ref = { { FLOAT_TO_FP(1), 0, 0 },\n+\t\t\t\t\t { 0, FLOAT_TO_FP(-1), 0 },\n+\t\t\t\t\t { 0, 0, FLOAT_TO_FP(-1) } };\n+\n+const mat33_fp_t base_standard_ref = { { 0, FLOAT_TO_FP(1), 0 },\n+\t\t\t\t { FLOAT_TO_FP(-1), 0, 0 },\n+\t\t\t\t { 0, 0, FLOAT_TO_FP(1) } };\n \n struct motion_sensor_t motion_sensors[] = {\n \t[LID_ACCEL] = {\n"} {"commit":"053e8124f5741d5a0a97e03e8bfd29f49fc7816f","subject":"[sw,tests] Fix chip_sw_flash_ctrl_ops top level test","message":"[sw,tests] Fix chip_sw_flash_ctrl_ops top level test\n\nChange prog fifo watermark register value to be compatible with flash_ctrl\nRTL changes introduced by PR#12914.\n\nSigned-off-by: Dave Williams <10852e67b57a556998a1739908b313078f1c5af3@ensilica.com>\n","repos":"lowRISC\/opentitan,lowRISC\/opentitan,lowRISC\/opentitan,lowRISC\/opentitan,lowRISC\/opentitan,lowRISC\/opentitan","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sw\/device\/tests\/flash_ctrl_ops_test.c\n+++ sw\/device\/tests\/flash_ctrl_ops_test.c\n@@ -164,7 +164,7 @@\n uint32_t address = flash_ctrl_testutils_info_region_setup(\n &flash_state, partition_number, kFlashInfoBank, kPartitionId);\n \n- CHECK_DIF_OK(dif_flash_ctrl_set_prog_fifo_watermark(&flash_state, 1));\n+ CHECK_DIF_OK(dif_flash_ctrl_set_prog_fifo_watermark(&flash_state, 0));\n CHECK_DIF_OK(dif_flash_ctrl_set_read_fifo_watermark(&flash_state, 8));\n \n clear_irq_variables();\n@@ -235,7 +235,7 @@\n static void do_bank1_data_partition_test(void) {\n uint32_t address;\n \n- CHECK_DIF_OK(dif_flash_ctrl_set_prog_fifo_watermark(&flash_state, 1));\n+ CHECK_DIF_OK(dif_flash_ctrl_set_prog_fifo_watermark(&flash_state, 0));\n CHECK_DIF_OK(dif_flash_ctrl_set_read_fifo_watermark(&flash_state, 8));\n \n \/\/ Loop for low and high page erase, write and read.\n"} {"commit":"90a83cd96e54c4240c6d69be05c95cd32487bf67","subject":"Added a bit more debugging information.","message":"Added a bit more debugging information.\n\nsvn path=\/trunk\/; revision=875\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bindings\/tk\/plr.c\n+++ bindings\/tk\/plr.c\n@@ -1,6 +1,9 @@\n \/* $Id$\n * $Log$\n- * Revision 1.14 1994\/04\/30 16:14:58 mjl\n+ * Revision 1.15 1994\/05\/14 05:41:33 mjl\n+ * Added a bit more debugging information.\n+ *\n+ * Revision 1.14 1994\/04\/30 16:14:58 mjl\n * Fixed format field (%ld instead of %d) or introduced casts where\n * appropriate to eliminate warnings given by gcc -Wall.\n *\n@@ -86,7 +89,8 @@\n \/* Error termination *\/\n \n #define barf(msg) \\\n-{ fprintf(stderr, \"%s\\nCurrent command code: %d\\n\", msg, csave); return(-1); }\n+{ fprintf(stderr, \"%s\\nCommand code: %d, byte count: %ld\\n\", \\\n+\t msg, csave, plr->pdfs->bp); return(-1); }\n \n \/* Static function prototypes. *\/\n \n@@ -223,7 +227,7 @@\n \n plr_cmd( pdf_rd_header(plr->pdfs, tk_magic) );\n if (strcmp(tk_magic, PLSERV_HEADER))\n-\tbarf(\"Invalid header\");\n+\tbarf(\"plr_init: Invalid header\");\n \n \/* Read version field of header. We need to check that we can read the *\/\n \/* byte stream, in case this is an old version of plserver. *\/\n@@ -232,7 +236,7 @@\n if (strcmp(tk_version, PLSERV_VERSION) > 0) {\n \tfprintf(stderr,\n \t \"Error: incapable of reading output of version %s.\\n\", tk_version);\n-\tbarf(\"Please obtain a newer copy of plserver.\");\n+\tbarf(\"plr_init: Please obtain a newer copy of plserver.\");\n }\n \n \/* Read tagged initialization info. *\/\n@@ -556,7 +560,6 @@\n \n c = pdf_getc(plr->pdfs);\n if (c == EOF) {\n-\tfprintf(stderr, \"plr_get: at byte count: %ld\\n\", plr->pdfs->bp);\n \tbarf(\"plr_get: Unable to read character\");\n }\n \n"} {"commit":"e53d5b7c4f0a2ca3cc0eba4a128de74b3edccff4","subject":"simplified code","message":"simplified code\n\n[r16474]\n","repos":"MatzeB\/libfirm,8l\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,8l\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/opt\/ldstopt.c\n+++ ir\/opt\/ldstopt.c\n@@ -356,7 +356,7 @@\n *\/\n static long get_Sel_array_index_long(ir_node *n, int dim) {\n \tir_node *index = get_Sel_index(n, dim);\n-\tassert(get_irn_op(index) == op_Const);\n+\tassert(is_Const(index));\n \treturn get_tarval_long(get_Const_tarval(index));\n } \/* get_Sel_array_index_long *\/\n \n@@ -758,79 +758,80 @@\n \t\t\t\tres |= CF_CHANGED;\n \t\t\t}\n \n-\t\t\tif (variability_constant == get_entity_variability(ent)\n-\t\t\t\t&& is_atomic_entity(ent)) {\n-\t\t\t\t\/* Might not be atomic after\n-\t\t\t\t lowering of Sels. In this\n-\t\t\t\t case we could also load, but\n-\t\t\t\t it's more complicated. *\/\n-\t\t\t\t\/* more simpler case: we load the content of a constant value:\n-\t\t\t\t * replace it by the constant itself\n-\t\t\t\t *\/\n-\n-\t\t\t\t\/* no memory *\/\n-\t\t\t\tif (info->projs[pn_Load_M]) {\n-\t\t\t\t\texchange(info->projs[pn_Load_M], mem);\n-\t\t\t\t\tres |= DF_CHANGED;\n-\t\t\t\t}\n-\t\t\t\t\/* no result :-) *\/\n-\t\t\t\tif (info->projs[pn_Load_res]) {\n-\t\t\t\t\tif (is_atomic_entity(ent)) {\n-\t\t\t\t\t\tir_node *c = copy_const_value(get_irn_dbg_info(load), get_atomic_ent_value(ent));\n-\n-\t\t\t\t\t\tDBG_OPT_RC(load, c);\n-\t\t\t\t\t\texchange(info->projs[pn_Load_res], c);\n-\t\t\t\t\t\tres |= DF_CHANGED;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\texchange(load, new_Bad());\n-\t\t\t\treduce_adr_usage(ptr);\n-\t\t\t\treturn res;\n-\t\t\t} else if (variability_constant == get_entity_variability(ent)) {\n-\t\t\t\tcompound_graph_path *path = get_accessed_path(ptr);\n-\n-\t\t\t\tif (path) {\n-\t\t\t\t\tir_node *c;\n-\n-\t\t\t\t\tassert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1));\n-\t\t\t\t\t\/*\n-\t\t\t\t\t{\n-\t\t\t\t\t\tint j;\n-\t\t\t\t\t\tfor (j = 0; j < get_compound_graph_path_length(path); ++j) {\n-\t\t\t\t\t\t\tir_entity *node = get_compound_graph_path_node(path, j);\n-\t\t\t\t\t\t\tfprintf(stdout, \".%s\", get_entity_name(node));\n-\t\t\t\t\t\t\tif (is_Array_type(get_entity_owner(node)))\n-\t\t\t\t\t\t\t\tfprintf(stdout, \"[%d]\", get_compound_graph_path_array_index(path, j));\n-\t\t\t\t\t\t}\n-\t\t\t\t\t\tprintf(\"\\n\");\n-\t\t\t\t\t}\n-\t\t\t\t\t*\/\n-\n-\t\t\t\t\tc = get_compound_ent_value_by_path(ent, path);\n-\t\t\t\t\tfree_compound_graph_path(path);\n-\n-\t\t\t\t\t\/* printf(\" cons: \"); DDMN(c); *\/\n-\n+\t\t\tif (variability_constant == get_entity_variability(ent)) {\n+\t\t\t\tif (is_atomic_entity(ent)) {\n+\t\t\t\t\t\/* Might not be atomic after\n+\t\t\t\t\t lowering of Sels. In this\n+\t\t\t\t\t case we could also load, but\n+\t\t\t\t\t it's more complicated. *\/\n+\t\t\t\t\t\/* more simpler case: we load the content of a constant value:\n+\t\t\t\t\t * replace it by the constant itself\n+\t\t\t\t\t *\/\n+\n+\t\t\t\t\t\/* no memory *\/\n \t\t\t\t\tif (info->projs[pn_Load_M]) {\n \t\t\t\t\t\texchange(info->projs[pn_Load_M], mem);\n \t\t\t\t\t\tres |= DF_CHANGED;\n \t\t\t\t\t}\n+\t\t\t\t\t\/* no result :-) *\/\n \t\t\t\t\tif (info->projs[pn_Load_res]) {\n-\t\t\t\t\t\texchange(info->projs[pn_Load_res], copy_const_value(get_irn_dbg_info(load), c));\n-\t\t\t\t\t\tres |= DF_CHANGED;\n+\t\t\t\t\t\tif (is_atomic_entity(ent)) {\n+\t\t\t\t\t\t\tir_node *c = copy_const_value(get_irn_dbg_info(load), get_atomic_ent_value(ent));\n+\n+\t\t\t\t\t\t\tDBG_OPT_RC(load, c);\n+\t\t\t\t\t\t\texchange(info->projs[pn_Load_res], c);\n+\t\t\t\t\t\t\tres |= DF_CHANGED;\n+\t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t\texchange(load, new_Bad());\n \t\t\t\t\treduce_adr_usage(ptr);\n \t\t\t\t\treturn res;\n \t\t\t\t} else {\n-\t\t\t\t\t\/* We can not determine a correct access path. E.g., in jack, we load\n-\t\t\t\t\ta byte from an object to generate an exception. Happens in test program\n-\t\t\t\t\tReflectiontest.\n-\t\t\t\t\tprintf(\">>>>>>>>>>>>> Found access to constant entity %s in function %s\\n\", get_entity_name(ent),\n-\t\t\t\t\tget_entity_name(get_irg_entity(current_ir_graph)));\n-\t\t\t\t\tprintf(\" load: \"); DDMN(load);\n-\t\t\t\t\tprintf(\" ptr: \"); DDMN(ptr);\n-\t\t\t\t\t*\/\n+\t\t\t\t\tcompound_graph_path *path = get_accessed_path(ptr);\n+\n+\t\t\t\t\tif (path) {\n+\t\t\t\t\t\tir_node *c;\n+\n+\t\t\t\t\t\tassert(is_proper_compound_graph_path(path, get_compound_graph_path_length(path)-1));\n+\t\t\t\t\t\t\/*\n+\t\t\t\t\t\t{\n+\t\t\t\t\t\t\tint j;\n+\t\t\t\t\t\t\tfor (j = 0; j < get_compound_graph_path_length(path); ++j) {\n+\t\t\t\t\t\t\t\tir_entity *node = get_compound_graph_path_node(path, j);\n+\t\t\t\t\t\t\t\tfprintf(stdout, \".%s\", get_entity_name(node));\n+\t\t\t\t\t\t\t\tif (is_Array_type(get_entity_owner(node)))\n+\t\t\t\t\t\t\t\t\tfprintf(stdout, \"[%d]\", get_compound_graph_path_array_index(path, j));\n+\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\tprintf(\"\\n\");\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\t*\/\n+\n+\t\t\t\t\t\tc = get_compound_ent_value_by_path(ent, path);\n+\t\t\t\t\t\tfree_compound_graph_path(path);\n+\n+\t\t\t\t\t\t\/* printf(\" cons: \"); DDMN(c); *\/\n+\n+\t\t\t\t\t\tif (info->projs[pn_Load_M]) {\n+\t\t\t\t\t\t\texchange(info->projs[pn_Load_M], mem);\n+\t\t\t\t\t\t\tres |= DF_CHANGED;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\tif (info->projs[pn_Load_res]) {\n+\t\t\t\t\t\t\texchange(info->projs[pn_Load_res], copy_const_value(get_irn_dbg_info(load), c));\n+\t\t\t\t\t\t\tres |= DF_CHANGED;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\texchange(load, new_Bad());\n+\t\t\t\t\t\treduce_adr_usage(ptr);\n+\t\t\t\t\t\treturn res;\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\t\/* We can not determine a correct access path. E.g., in jack, we load\n+\t\t\t\t\t\ta byte from an object to generate an exception. Happens in test program\n+\t\t\t\t\t\tReflectiontest.\n+\t\t\t\t\t\tprintf(\">>>>>>>>>>>>> Found access to constant entity %s in function %s\\n\", get_entity_name(ent),\n+\t\t\t\t\t\tget_entity_name(get_irg_entity(current_ir_graph)));\n+\t\t\t\t\t\tprintf(\" load: \"); DDMN(load);\n+\t\t\t\t\t\tprintf(\" ptr: \"); DDMN(ptr);\n+\t\t\t\t\t\t*\/\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n \t\t}\n"} {"commit":"5b8c4607b3641102bd587116f123d49254cd4f5c","subject":"Workaround Eclipse CDT failures in bslmf_nestedtraiddeclaration","message":"Workaround Eclipse CDT failures in bslmf_nestedtraiddeclaration\n","repos":"che2\/bde,bloomberg\/bde,che2\/bde,che2\/bde,bloomberg\/bde,che2\/bde,bloomberg\/bde,bloomberg\/bde,bloomberg\/bde","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- groups\/bsl\/bslmf\/bslmf_nestedtraitdeclaration.h\n+++ groups\/bsl\/bslmf\/bslmf_nestedtraitdeclaration.h\n@@ -69,13 +69,19 @@\n return BloombergLP::bslmf::NestedTraitDeclaration<TYPE, TRAIT>(); \\\n } \\\n \n+#ifdef __CDT_PARSER__\n+\/\/ Work around an Eclise CDT bug where it fails to parse the conditional trait\n+\/\/ declaration. See internal DRQS S 47839133.\n+#define BSLMF_NESTED_TRAIT_DECLARATION_IF(TYPE, TRAIT, COND)\n+#else\n #define BSLMF_NESTED_TRAIT_DECLARATION_IF(TYPE, TRAIT, COND) \\\n operator BloombergLP::bslmf::NestedTraitDeclaration<TYPE, TRAIT, \\\n COND >() const \\\n { \\\n return \\\n BloombergLP::bslmf::NestedTraitDeclaration<TYPE, TRAIT, COND >();\\\n- } \\\n+ }\n+#endif\n \n } \/\/ close package namespace\n \n"} {"commit":"425c7ed03b5c7d4263f592416338642b6d99f3ba","subject":"Add test case for pr6069.","message":"Add test case for pr6069.\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@93708 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/Analysis\/malloc.c\n+++ test\/Analysis\/malloc.c\n@@ -51,3 +51,9 @@\n else\n free(p);\n }\n+\n+char *doit2();\n+void pr6069() {\n+ char *buf = doit2();\n+ free(buf);\n+}\n"} {"commit":"d0c7a8fe78d5a530779a99408c1cbd61650c3ba9","subject":"for incr pc build","message":"for incr pc build\n","repos":"ashray\/VTK-EVM,candy7393\/VTK,cjh1\/VTK,biddisco\/VTK,keithroe\/vtkoptix,Wuteyan\/VTK,keithroe\/vtkoptix,gram526\/VTK,sumedhasingla\/VTK,sumedhasingla\/VTK,candy7393\/VTK,demarle\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,jmerkow\/VTK,demarle\/VTK,keithroe\/vtkoptix,msmolens\/VTK,gram526\/VTK,ashray\/VTK-EVM,demarle\/VTK,daviddoria\/PointGraphsPhase1,sankhesh\/VTK,gram526\/VTK,msmolens\/VTK,candy7393\/VTK,mspark93\/VTK,SimVascular\/VTK,hendradarwin\/VTK,msmolens\/VTK,gram526\/VTK,sgh\/vtk,cjh1\/VTK,Wuteyan\/VTK,cjh1\/VTK,sankhesh\/VTK,aashish24\/VTK-old,biddisco\/VTK,jeffbaumes\/jeffbaumes-vtk,candy7393\/VTK,msmolens\/VTK,jmerkow\/VTK,mspark93\/VTK,berendkleinhaneveld\/VTK,demarle\/VTK,candy7393\/VTK,Wuteyan\/VTK,candy7393\/VTK,cjh1\/VTK,candy7393\/VTK,cjh1\/VTK,collects\/VTK,arnaudgelas\/VTK,naucoin\/VTKSlicerWidgets,sankhesh\/VTK,berendkleinhaneveld\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,biddisco\/VTK,hendradarwin\/VTK,sumedhasingla\/VTK,msmolens\/VTK,naucoin\/VTKSlicerWidgets,cjh1\/VTK,aashish24\/VTK-old,johnkit\/vtk-dev,SimVascular\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,hendradarwin\/VTK,ashray\/VTK-EVM,daviddoria\/PointGraphsPhase1,sankhesh\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,berendkleinhaneveld\/VTK,sumedhasingla\/VTK,spthaolt\/VTK,mspark93\/VTK,sankhesh\/VTK,SimVascular\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,ashray\/VTK-EVM,berendkleinhaneveld\/VTK,daviddoria\/PointGraphsPhase1,sankhesh\/VTK,hendradarwin\/VTK,jmerkow\/VTK,demarle\/VTK,keithroe\/vtkoptix,gram526\/VTK,sgh\/vtk,demarle\/VTK,hendradarwin\/VTK,berendkleinhaneveld\/VTK,berendkleinhaneveld\/VTK,mspark93\/VTK,jmerkow\/VTK,msmolens\/VTK,johnkit\/vtk-dev,sumedhasingla\/VTK,gram526\/VTK,biddisco\/VTK,arnaudgelas\/VTK,sankhesh\/VTK,sgh\/vtk,SimVascular\/VTK,biddisco\/VTK,naucoin\/VTKSlicerWidgets,collects\/VTK,msmolens\/VTK,SimVascular\/VTK,Wuteyan\/VTK,mspark93\/VTK,jmerkow\/VTK,SimVascular\/VTK,hendradarwin\/VTK,jmerkow\/VTK,aashish24\/VTK-old,gram526\/VTK,sgh\/vtk,candy7393\/VTK,jeffbaumes\/jeffbaumes-vtk,biddisco\/VTK,jmerkow\/VTK,naucoin\/VTKSlicerWidgets,sgh\/vtk,sumedhasingla\/VTK,ashray\/VTK-EVM,spthaolt\/VTK,ashray\/VTK-EVM,demarle\/VTK,jeffbaumes\/jeffbaumes-vtk,SimVascular\/VTK,arnaudgelas\/VTK,arnaudgelas\/VTK,aashish24\/VTK-old,jeffbaumes\/jeffbaumes-vtk,collects\/VTK,Wuteyan\/VTK,arnaudgelas\/VTK,demarle\/VTK,johnkit\/vtk-dev,collects\/VTK,sumedhasingla\/VTK,sgh\/vtk,naucoin\/VTKSlicerWidgets,arnaudgelas\/VTK,keithroe\/vtkoptix,mspark93\/VTK,sankhesh\/VTK,mspark93\/VTK,SimVascular\/VTK,collects\/VTK,keithroe\/vtkoptix,berendkleinhaneveld\/VTK,daviddoria\/PointGraphsPhase1,spthaolt\/VTK,naucoin\/VTKSlicerWidgets,mspark93\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,spthaolt\/VTK,biddisco\/VTK,jeffbaumes\/jeffbaumes-vtk,jeffbaumes\/jeffbaumes-vtk,jmerkow\/VTK,Wuteyan\/VTK,keithroe\/vtkoptix,msmolens\/VTK,spthaolt\/VTK,collects\/VTK,johnkit\/vtk-dev,gram526\/VTK,sumedhasingla\/VTK,aashish24\/VTK-old,aashish24\/VTK-old","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- graphics\/vtkOBBTree.h\n+++ graphics\/vtkOBBTree.h\n@@ -82,7 +82,7 @@\n \/\/\n \/\/BTX - begin tcl exclude\n \/\/\n-class vtkOBBNode { \/\/;prevent man page generation\n+class VTK_EXPORT vtkOBBNode { \/\/;prevent man page generation\n public:\n vtkOBBNode();\n ~vtkOBBNode();\n"} {"commit":"933f7dfca80dc9b02266f0d7e5827c0858b297ea","subject":"Added reduction for double negatives(both boolean and integer).","message":"Added reduction for double negatives(both boolean and integer).\n","repos":"Ezbob\/Diego-Compiler,Ezbob\/Diego-Compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- typechecker\/kittyweed.c\n+++ typechecker\/kittyweed.c\n@@ -679,7 +679,6 @@\n \t\t\t\t}\n \n \t\t\t}\n-\n \t\t\tbreak;\n \n \t\tcase EXPRES_EQ:\n@@ -747,7 +746,6 @@\n \t\t\t\t}\n \n \t\t\t}\n-\n \t\t\tbreak;\n \n \t\tcase EXPRES_LESS:\n@@ -799,18 +797,29 @@\n \t\tcase TERM_NOT:\n \t\t\tterm->value.term = weed_term(term->value.term);\n \n+\t\t\tif (term->value.term->kind == TERM_NOT){\n+\t\t\t\t\/\/ double negative == positive\n+\t\t\t\ttempTerm = term->value.term;\n+\t\t\t\tterm = term->value.term->value.term;\n+\t\t\t\tfree(tempTerm);\n+\t\t\t}\n \t\t\tif (term->value.term->kind == TERM_TRUE){\n \t\t\t\tterm->kind = TERM_FALSE;\n \t\t\t}\n-\n \t\t\tif (term->value.term->kind == TERM_FALSE){\n \t\t\t\tterm->kind = TERM_TRUE;\n \t\t\t}\n-\t\t\t\n \t\t\tbreak;\n \n \t\tcase TERM_UMINUS:\n \t\t\tterm->value.term = weed_term(term->value.term);\n+\n+\t\t\tif ( term->value.term->kind == TERM_UMINUS ) {\n+\t\t\t\t\/\/ like in NOT\n+\t\t\t\ttempTerm = term->value.term;\n+\t\t\t\tterm = term->value.term->value.term;\n+\t\t\t\tfree(tempTerm);\n+\t\t\t}\n \t\t\tif ( term->value.term->kind == TERM_NUM ) {\n \t\t\t\ttempTerm = term->value.term;\n \t\t\t\tterm->value.term = NULL;\n"} {"commit":"805f9d8e0517b92dde06c38004902614ea5833ba","subject":"Updated float comparion and success priting","message":"Updated float comparion and success priting\n","repos":"entia\/minunit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- minunit.h\n+++ minunit.h\n@@ -34,7 +34,7 @@\n \/* Maximum length of last message *\/\n #define MINUNIT_MESSAGE_LEN 1024\n \/* Float comparision difference value *\/\n-#define MINUNIT_EPSILON 1E-12\n+#define MINUNIT_EPSILON 1E-6\n \n \/* Misc. counters *\/\n static int minunit_run __attribute__ ((unused)) = 0;\n@@ -75,7 +75,7 @@\n #define MU_RUN_TEST(test) MU__SAFE_BLOCK(\\\n \tif (minunit_setup) (*minunit_setup)();\\\n \tminunit_status = 0;\\\n-\tprintf(\"Test: \"#test\"\\r\\r\\n\");\\\n+\tprintf(\"Test: \"#test\"\\r\\n\");\\\n \ttest();\\\n \tminunit_run++;\\\n \tif (minunit_status) {\\\n@@ -90,6 +90,8 @@\n #define MU_REPORT() MU__SAFE_BLOCK(\\\n \tprintf(\"\\r\\n\\r\\nTotal: %d tests, %d assertions, %d failures\\r\\n\", minunit_run, minunit_assert, minunit_fail);\\\n )\n+\/* Printed when test passed *\/\n+#define MU_ASSERT_OK() printf(\".\")\n \n \/* Assertions *\/\n #define mu_check(test) MU__SAFE_BLOCK(\\\n@@ -99,7 +101,7 @@\n \t\tminunit_status = 1;\\\n \t\treturn;\\\n \t} else {\\\n-\t\tprintf(\". %s\\r\\n\", __func__);\\\n+\t\tMU_ASSERT_OK();\\\n \t}\\\n )\n \n@@ -117,7 +119,7 @@\n \t\tminunit_status = 1;\\\n \t\treturn;\\\n \t} else {\\\n-\t\tprintf(\". %s\\r\\n\", __func__);\\\n+\t\tMU_ASSERT_OK();\\\n \t}\\\n )\n \n@@ -132,7 +134,7 @@\n \t\tminunit_status = 1;\\\n \t\treturn;\\\n \t} else {\\\n-\t\tprintf(\". %s\\r\\n\", __func__);\\\n+\t\tMU_ASSERT_OK();\\\n \t}\\\n )\n \n@@ -147,7 +149,7 @@\n \t\tminunit_status = 1;\\\n \t\treturn;\\\n \t} else {\\\n-\t\tprintf(\".\");\\\n+\t\tMU_ASSERT_OK();\\\n \t}\\\n )\n \n@@ -160,7 +162,7 @@\n \t\tminunit_status = 1;\\\n \t\treturn;\\\n \t} else {\\\n-\t\tprintf(\". %s\\r\\n\", __func__);\\\n+\t\tMU_ASSERT_OK();\\\n \t}\\\n )\n \n"} {"commit":"734adbcf77ca32e69fc5ae08da327f1dbad59a6e","subject":"Really remove Nginx 0.6 support and merge over some changes from Nginx 0.8.52's ngx_http_static_module.","message":"Really remove Nginx 0.6 support and merge over some changes from Nginx 0.8.52's ngx_http_static_module.\n","repos":"cgvarela\/passenger,openSUSE\/passenger,jawj\/passenger,cgvarela\/passenger,phusion\/passenger,erikogan\/passenger,kewaunited\/passenger,cgvarela\/passenger,phusion\/passenger,clemensg\/passenger,clemensg\/passenger,antek-drzewiecki\/passenger,pkmiec\/passenger,pkmiec\/passenger,antek-drzewiecki\/passenger,gravitystorm\/passenger,antek-drzewiecki\/passenger,antek-drzewiecki\/passenger,pkmiec\/passenger,clemensg\/passenger,fabiokung\/passenger-debian,erikogan\/passenger,clemensg\/passenger,kewaunited\/passenger,fabiokung\/passenger-debian,fabiokung\/passenger-debian,kewaunited\/passenger,cgvarela\/passenger,bf4\/passenger,jawj\/passenger,bf4\/passenger,clemensg\/passenger,kewaunited\/passenger,clemensg\/passenger,bf4\/passenger,gravitystorm\/passenger,clemensg\/passenger,clemensg\/passenger,gravitystorm\/passenger,openSUSE\/passenger,phusion\/passenger,fabiokung\/passenger-debian,antek-drzewiecki\/passenger,kewaunited\/passenger,phusion\/passenger,jawj\/passenger,jawj\/passenger,kewaunited\/passenger,cgvarela\/passenger,pkmiec\/passenger,cgvarela\/passenger,bf4\/passenger,erikogan\/passenger,openSUSE\/passenger,pkmiec\/passenger,openSUSE\/passenger,jawj\/passenger,gravitystorm\/passenger,gravitystorm\/passenger,erikogan\/passenger,erikogan\/passenger,jawj\/passenger,bf4\/passenger,bf4\/passenger,jawj\/passenger,bf4\/passenger,fabiokung\/passenger-debian,pkmiec\/passenger,openSUSE\/passenger,antek-drzewiecki\/passenger,phusion\/passenger,antek-drzewiecki\/passenger,phusion\/passenger,openSUSE\/passenger,gravitystorm\/passenger,erikogan\/passenger,antek-drzewiecki\/passenger,cgvarela\/passenger,fabiokung\/passenger-debian,cgvarela\/passenger,phusion\/passenger,kewaunited\/passenger,pkmiec\/passenger,kewaunited\/passenger,phusion\/passenger","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/nginx\/StaticContentHandler.c\n+++ ext\/nginx\/StaticContentHandler.c\n@@ -82,14 +82,10 @@\n clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);\n \n ngx_memzero(&of, sizeof(ngx_open_file_info_t));\n- #if NGINX_VERSION_NUM < 7000\n- of.test_dir = 0;\n- #else\n- #if NGX_VERSION_NUM >= 8000\n- of.read_ahead = clcf->read_ahead;\n- #endif\n- of.directio = clcf->directio;\n- #endif\n+ #if NGX_VERSION_NUM >= 8000\n+ of.read_ahead = clcf->read_ahead;\n+ #endif\n+ of.directio = clcf->directio;\n of.valid = clcf->open_file_cache_valid;\n of.min_uses = clcf->open_file_cache_min_uses;\n of.errors = clcf->open_file_cache_errors;\n@@ -157,11 +153,7 @@\n len += r->args.len + 1;\n }\n \n- #if NGINX_VERSION_NUM < 7000\n- location = ngx_palloc(r->pool, len);\n- #else\n- \tlocation = ngx_pnalloc(r->pool, len);\n- #endif\n+ location = ngx_pnalloc(r->pool, len);\n if (location == NULL) {\n return NGX_HTTP_INTERNAL_SERVER_ERROR;\n }\n@@ -190,7 +182,7 @@\n #if !(NGX_WIN32) \/* the not regular files are probably Unix specific *\/\n \n if (!of.is_file) {\n- ngx_log_error(NGX_LOG_CRIT, log, ngx_errno,\n+ ngx_log_error(NGX_LOG_CRIT, log, 0,\n \"\\\"%s\\\" is not a regular file\", filename->data);\n \n return NGX_HTTP_NOT_FOUND;\n"} {"commit":"d9519961aff3edaba32a95fa30aadb5319a7af7a","subject":"new struct file in subdirectory","message":"new struct file in subdirectory\n","repos":"daq-tools\/kotori,zerotired\/kotori,zerotired\/kotori,daq-tools\/kotori,zerotired\/kotori,zerotired\/kotori,daq-tools\/kotori,daq-tools\/kotori,zerotired\/kotori,daq-tools\/kotori,zerotired\/kotori,daq-tools\/kotori,daq-tools\/kotori","returncode":1,"stderr":"error: pathspec 'etc\/headers\/sattracker\/components.h' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- etc\/headers\/sattracker\/components.h\n+++ etc\/headers\/sattracker\/components.h\n@@ -0,0 +1,34 @@\n+#include \"stdio.h\"\n+\n+struct struct_system\n+{\n+ uint8_t length ;\/\/1\n+ uint8_t ID ;\/\/2\n+ uint8_t output : 1 ;\/\/3.0\n+ uint8_t use_gps : 1 ;\/\/3.1\n+ uint8_t fast : 1 ;\/\/3.2\n+ uint8_t slow : 1 ;\/\/3.3\n+ uint8_t flagbyte_2 ;\/\/4 \n+ float hdg ;\/\/8 \n+ float pitch ;\/\/12\n+ int8_t sync ;\/\/13\n+ int8_t drive_x_i ;\/\/14\n+ int8_t drive_z_i ;\/\/15\n+ uint8_t ck ;\/\/16\n+} sys = {16,0};\n+\n+struct struct_position \n+{\n+ uint8_t length ;\/\/1\n+ uint8_t ID ;\/\/2\n+ uint8_t flagbyte_1 ;\/\/3\n+ uint8_t flagbyte_2 ;\/\/4\n+ int16_t hdg ; \/\/ @rule: name=Heading; expr=hdg * 0.1;unit=degrees\n+ int16_t pitch ; \/\/ @rule: name=Pitch; expr=pitch * 0.1; unit=degrees \n+ uint8_t ck ;\/\/9\n+} position ={9, 1};\n+\n+uint8_t* struct_id[] = {\n+ &sys.length, \/\/ID0\n+ &position.length \/\/ID1\n+ }; "} {"commit":"c5ab964debe92d0ec7af330f350a3433c1b5b61e","subject":"[PATCH] spectrum_cs: Fix firmware uploading errors","message":"[PATCH] spectrum_cs: Fix firmware uploading errors\n\nspectrum_cs: Fix the logic so we error when the device is *not* present!\n\nThis fixes firmware upload failures which prevent the driver from\nworking (the bug is also present in 2.6.17).\n\nSigned-off-by: Richard Purdie <a03894c799ea916bd571ce8f12ed88f6fb3400f7@rpsys.net>\nSigned-off-by: Jeff Garzik <f3e731dfa293c7a83119d8aacfa41b5d2d780be9@garzik.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/net\/wireless\/spectrum_cs.c\n+++ drivers\/net\/wireless\/spectrum_cs.c\n@@ -242,7 +242,7 @@\n \tu_int save_cor;\n \n \t\/* Doing it if hardware is gone is guaranteed crash *\/\n-\tif (pcmcia_dev_present(link))\n+\tif (!pcmcia_dev_present(link))\n \t\treturn -ENODEV;\n \n \t\/* Save original COR value *\/\n"} {"commit":"4bd19084faa61a8c68586e74f03f5776179f65c2","subject":"locking\/mutex: Introduce ww_mutex_set_context_slowpath()","message":"locking\/mutex: Introduce ww_mutex_set_context_slowpath()\n\n... which is equivalent to the fastpath counter part.\nThis mainly allows getting some WW specific code out\nof generic mutex paths.\n\nSigned-off-by: Davidlohr Bueso <004a7ec0459a12f8239e6a658beae4a155e8573d@suse.de>\nSigned-off-by: Peter Zijlstra (Intel) <3fddac958924aef220f202ca567388ddab3f14a8@infradead.org>\nCc: \"Paul E. McKenney\" <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nCc: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nCc: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\nLink: ae2b71a121e4f72c53b02fa9f9c2b58bf4cbeada@stgolabs.net\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2d7c1b77dd59387070aab355532dd157f888325c","subject":"ACPI \/ hotplug \/ PCI: Remove entries from bus->devices in reverse order","message":"ACPI \/ hotplug \/ PCI: Remove entries from bus->devices in reverse order\n\nAccording to the changelog of commit 29ed1f29b68a (PCI: pciehp: Fix null\npointer deref when hot-removing SR-IOV device) it is unsafe to walk the\nbus->devices list of a PCI bus and remove devices from it in direct order,\nbecause that may lead to NULL pointer dereferences related to virtual\nfunctions.\n\nFor this reason, change all of the bus->devices list walks in\nacpiphp_glue.c during which devices may be removed to be carried out in\nreverse order.\n\nSigned-off-by: Rafael J. Wysocki <27ffc44a8ec6a212fba98cfc3246c6ce8ab131e0@intel.com>\nTested-by: Mika Westerberg <afb75201fb002d7fdd2b0b231e006999e00db8a9@linux.intel.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/pci\/hotplug\/acpiphp_glue.c\n+++ drivers\/pci\/hotplug\/acpiphp_glue.c\n@@ -742,7 +742,7 @@\n \n \t\t\/* The device is a bridge. so check the bus below it. *\/\n \t\tpm_runtime_get_sync(&dev->dev);\n-\t\tlist_for_each_entry_safe(child, tmp, &bus->devices, bus_list)\n+\t\tlist_for_each_entry_safe_reverse(child, tmp, &bus->devices, bus_list)\n \t\t\ttrim_stale_devices(child);\n \n \t\tpm_runtime_put(&dev->dev);\n@@ -773,8 +773,8 @@\n \t\t\t; \/* do nothing *\/\n \t\t} else if (get_slot_status(slot) == ACPI_STA_ALL) {\n \t\t\t\/* remove stale devices if any *\/\n-\t\t\tlist_for_each_entry_safe(dev, tmp, &bus->devices,\n-\t\t\t\t\t\t bus_list)\n+\t\t\tlist_for_each_entry_safe_reverse(dev, tmp,\n+\t\t\t\t\t\t\t &bus->devices, bus_list)\n \t\t\t\tif (PCI_SLOT(dev->devfn) == slot->device)\n \t\t\t\t\ttrim_stale_devices(dev);\n \n@@ -805,7 +805,7 @@\n \tint i;\n \tunsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM;\n \n-\tlist_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {\n+\tlist_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list) {\n \t\tfor (i=0; i<PCI_BRIDGE_RESOURCES; i++) {\n \t\t\tstruct resource *res = &dev->resource[i];\n \t\t\tif ((res->flags & type_mask) && !res->start &&\n"} {"commit":"7a041ac92220acfa3f81d0b7a2f6e5fba144bdc5","subject":"kernel: dtp_dump: align with flow stats get","message":"kernel: dtp_dump: align with flow stats get\n","repos":"vmaffione\/rlite,autrimpo\/rlite,autrimpo\/rlite,vmaffione\/rlite,vmaffione\/rlite,autrimpo\/rlite,autrimpo\/rlite,vmaffione\/rlite","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- kernel\/normal-common.c\n+++ kernel\/normal-common.c\n@@ -85,18 +85,42 @@\n void\n dtp_dump(struct dtp *dtp)\n {\n- printk(\"DTP(%p): flags=%x,snd_lwe=%lu,snd_rwe=%lu,next_seq_num_to_send=%lu,\"\n- \"last_seq_num_sent=%lu,rcv_lwe=%lu,rcv_rwe=%lu,\"\n- \"max_seq_num_rcvd=%lu,last_snd_data_ack=%lu,\"\n- \"next_snd_ctl_seq=%lu,last_ctrl_seq_num_rcvd=%lu\\n\",\n- dtp, dtp->flags, (long unsigned)dtp->snd_lwe,\n- (long unsigned)dtp->snd_rwe,\n+ struct flow_entry *flow = container_of(dtp, struct flow_entry, dtp);\n+\n+ printk(\"DTP(port_id=%lu):\\n\"\n+ \" flags=%08x\\n\"\n+ \" snd_lwe=%lu\\n\"\n+ \" snd_rwe=%lu\\n\"\n+ \" next_seq_num_to_send=%lu\\n\"\n+ \" last_seq_num_sent=%lu\\n\"\n+ \" last_ctrl_seq_num_rcvd=%lu\\n\"\n+ \" cwq_len=%lu\\n\"\n+ \" max_cwq_len=%lu\\n\"\n+ \" rtxq_len=%lu\\n\"\n+ \" max_rtxq_len=%lu\\n\"\n+ \" rtt=%lu\\n\"\n+ \" rtt_stddev=%lu\\n\"\n+ \" rcv_lwe=%lu\\n\"\n+ \" rcv_lwe_priv=%lu\\n\"\n+ \" rcv_rwe=%lu\\n\"\n+ \" max_seq_num_rcvd=%lu\\n\"\n+ \" last_snd_data_ack=%lu\\n\"\n+ \" next_snd_ctl_seq=%lu\\n\"\n+ \" last_lwe_sent=%lu\\n\"\n+ \" seqq_len=%lu\\n\",\n+ (long unsigned)flow->local_port, dtp->flags,\n+ (long unsigned)dtp->snd_lwe, (long unsigned)dtp->snd_rwe,\n (long unsigned)dtp->next_seq_num_to_send,\n- (long unsigned)dtp->last_seq_num_sent, (long unsigned)dtp->rcv_lwe,\n+ (long unsigned)dtp->last_seq_num_sent,\n+ (long unsigned)dtp->last_ctrl_seq_num_rcvd,\n+ (long unsigned)dtp->cwq_len, (long unsigned)dtp->max_cwq_len,\n+ (long unsigned)dtp->rtxq_len, (long unsigned)dtp->max_rtxq_len,\n+ (long unsigned)dtp->rtt, (long unsigned)dtp->rtt_stddev,\n+ (long unsigned)dtp->rcv_lwe, (long unsigned)dtp->rcv_lwe_priv,\n (long unsigned)dtp->rcv_rwe, (long unsigned)dtp->max_seq_num_rcvd,\n (long unsigned)dtp->last_snd_data_ack,\n (long unsigned)dtp->next_snd_ctl_seq,\n- (long unsigned)dtp->last_ctrl_seq_num_rcvd);\n+ (long unsigned)dtp->last_lwe_sent, (long unsigned)dtp->seqq_len);\n }\n EXPORT_SYMBOL(dtp_dump);\n \n"} {"commit":"d45e0855488032ea62ec5638fb1dcd47367f8ddb","subject":"ACPI PCI hotplug: harden against panic regression","message":"ACPI PCI hotplug: harden against panic regression\n\nACPI hotplug panic with current git head\nhttp:\/\/lkml.org\/lkml\/2009\/1\/10\/136\n\nRather than reverting the entire commit that causes the crash:\ne8c331e963c58b83db24b7d0e39e8c07f687dbc6\n\"PCI hotplug: introduce functions for ACPI slot detection\"\n\nsimply harden against it while the changes to\nthe hotplug code on this particularl machine are understood.\n\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@HansenPartnership.com>\nAcked-by: Jesse Barnes <bc7add126c2dbb8382bf1c28ac262b9363a32706@virtuousgeek.org>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/pci\/hotplug\/acpiphp_glue.c\n+++ drivers\/pci\/hotplug\/acpiphp_glue.c\n@@ -266,6 +266,8 @@\n \tint found = acpi_pci_detect_ejectable(pbus);\n \tif (!found) {\n \t\tacpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus);\n+\t\tif (!bridge_handle)\n+\t\t\treturn 0;\n \t\tacpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,\n \t\t\t\t is_pci_dock_device, (void *)&found, NULL);\n \t}\n"} {"commit":"baaf1dd491433a78826150aff7411015de7e9b65","subject":"mm\/slob: use min_t() to compare ARCH_SLAB_MINALIGN","message":"mm\/slob: use min_t() to compare ARCH_SLAB_MINALIGN\n\nThe definition of ARCH_SLAB_MINALIGN is architecture dependent\nand can be either of type size_t or int. Comparing that value\nwith ARCH_KMALLOC_MINALIGN can cause harmless warnings on\nplatforms where they are different. Since both are always\nsmall positive integer numbers, using the size_t type to compare\nthem is safe and gets rid of the warning.\n\nWithout this patch, building ARM collie_defconfig results in:\n\nmm\/slob.c: In function '__kmalloc_node':\nmm\/slob.c:431:152: warning: comparison of distinct pointer types lacks a cast [enabled by default]\nmm\/slob.c: In function 'kfree':\nmm\/slob.c:484:153: warning: comparison of distinct pointer types lacks a cast [enabled by default]\nmm\/slob.c: In function 'ksize':\nmm\/slob.c:503:153: warning: comparison of distinct pointer types lacks a cast [enabled by default]\n\nSigned-off-by: Arnd Bergmann <f2c659f01951776204a6c5b902787d9019fbeebd@arndb.de>\nAcked-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nCc: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slob.c\n+++ mm\/slob.c\n@@ -428,7 +428,7 @@\n void *__kmalloc_node(size_t size, gfp_t gfp, int node)\n {\n \tunsigned int *m;\n-\tint align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n+\tint align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n \tvoid *ret;\n \n \tgfp &= gfp_allowed_mask;\n@@ -481,7 +481,7 @@\n \n \tsp = virt_to_page(block);\n \tif (PageSlab(sp)) {\n-\t\tint align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n+\t\tint align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n \t\tunsigned int *m = (unsigned int *)(block - align);\n \t\tslob_free(m, *m + align);\n \t} else\n@@ -500,7 +500,7 @@\n \n \tsp = virt_to_page(block);\n \tif (PageSlab(sp)) {\n-\t\tint align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n+\t\tint align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);\n \t\tunsigned int *m = (unsigned int *)(block - align);\n \t\treturn SLOB_UNITS(*m) * SLOB_UNIT;\n \t} else\n"} {"commit":"55e5f09f383a15a6e457d921a55e3541558daad9","subject":"[timer_handler] Fix a bug in set_task_to_wake_after()","message":"[timer_handler] Fix a bug in set_task_to_wake_after()\n\nThe function was not re-enabling the interrupts before return.\n","repos":"vvaltchev\/experimentOs,vvaltchev\/experimentOs,vvaltchev\/experimentOs,vvaltchev\/experimentOs","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- kernel\/timer_handler.c\n+++ kernel\/timer_handler.c\n@@ -38,6 +38,7 @@\n timers_array[i].ticks_to_sleep = ticks;\n timers_array[i].task = task;\n task_change_state(get_curr_task(), TASK_STATE_SLEEPING);\n+ enable_interrupts(&var);\n return i;\n }\n }\n"} {"commit":"e0ac913374247f000aa97fdd732dcaf0070dd466","subject":"asus-laptop: log unknown keys","message":"asus-laptop: log unknown keys\n\nSigned-off-by: Corentin Chary <4153b5fcec9d8639b77e759711dc8338f0db8708@gmail.com>\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/platform\/x86\/asus-laptop.c\n+++ drivers\/platform\/x86\/asus-laptop.c\n@@ -1364,8 +1364,10 @@\n *\/\n static void asus_input_notify(struct asus_laptop *asus, int event)\n {\n-\tif (asus->inputdev)\n-\t\tsparse_keymap_report_event(asus->inputdev, event, 1, true);\n+\tif (!asus->inputdev)\n+\t\treturn ;\n+\tif (!sparse_keymap_report_event(asus->inputdev, event, 1, true))\n+\t\tpr_info(\"Unknown key %x pressed\\n\", event);\n }\n \n static int asus_input_init(struct asus_laptop *asus)\n"} {"commit":"93030d83b9e1079836d82b46ab3ec671b1fdb623","subject":"slub: fix memcg_propagate_slab_attrs","message":"slub: fix memcg_propagate_slab_attrs\n\nAfter creating a cache for a memcg we should initialize its sysfs attrs\nwith the values from its parent. That's what memcg_propagate_slab_attrs\nis for. Currently it's broken - we clearly muddled root-vs-memcg caches\nthere. Let's fix it up.\n\nSigned-off-by: Vladimir Davydov <0d62248ee021b6e01c0ee596a62a5b145b996974@parallels.com>\nCc: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nCc: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\nCc: Michal Hocko <829500b200af6c2a0eca4dfd5c388e6b8fbe8dc6@suse.cz>\nCc: Johannes Weiner <331be22c6b63ca3e0a03d408c2d906b1b02cd5f2@cmpxchg.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slub.c\n+++ mm\/slub.c\n@@ -5071,15 +5071,18 @@\n #ifdef CONFIG_MEMCG_KMEM\n \tint i;\n \tchar *buffer = NULL;\n-\n-\tif (!is_root_cache(s))\n+\tstruct kmem_cache *root_cache;\n+\n+\tif (is_root_cache(s))\n \t\treturn;\n+\n+\troot_cache = s->memcg_params->root_cache;\n \n \t\/*\n \t * This mean this cache had no attribute written. Therefore, no point\n \t * in copying default values around\n \t *\/\n-\tif (!s->max_attr_size)\n+\tif (!root_cache->max_attr_size)\n \t\treturn;\n \n \tfor (i = 0; i < ARRAY_SIZE(slab_attrs); i++) {\n@@ -5101,7 +5104,7 @@\n \t\t *\/\n \t\tif (buffer)\n \t\t\tbuf = buffer;\n-\t\telse if (s->max_attr_size < ARRAY_SIZE(mbuf))\n+\t\telse if (root_cache->max_attr_size < ARRAY_SIZE(mbuf))\n \t\t\tbuf = mbuf;\n \t\telse {\n \t\t\tbuffer = (char *) get_zeroed_page(GFP_KERNEL);\n@@ -5110,7 +5113,7 @@\n \t\t\tbuf = buffer;\n \t\t}\n \n-\t\tattr->show(s->memcg_params->root_cache, buf);\n+\t\tattr->show(root_cache, buf);\n \t\tattr->store(s, buf, strlen(buf));\n \t}\n \n"} {"commit":"e1fbf346c7c56d6b2f9d835d297bcb088baaff3a","subject":"dell-laptop: Fix rfkill state queries","message":"dell-laptop: Fix rfkill state queries\n\nThe current code in dell-laptop is confused about the hardware rfkill\nstate. Fix it up such that it's always reported correctly.\n\nSigned-off-by: Matthew Garrett <4cf8d479716eba9bc68e0146d95320fcb138b96b@redhat.com>\nTested-by: Tim Gardner <c65a040f7f664378353fb65fc3553df208a14f68@canonical.com>\nSigned-off-by: Len Brown <b060cfa1096cc6e8be83699ddb4ed8a77dd63af5@intel.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/platform\/x86\/dell-laptop.c\n+++ drivers\/platform\/x86\/dell-laptop.c\n@@ -197,8 +197,8 @@\n \tdell_send_request(&buffer, 17, 11);\n \tstatus = buffer.output[1];\n \n-\tif (status & BIT(bit))\n-\t\trfkill_set_hw_state(rfkill, !!(status & BIT(16)));\n+\trfkill_set_sw_state(rfkill, !!(status & BIT(bit)));\n+\trfkill_set_hw_state(rfkill, !(status & BIT(16)));\n }\n \n static const struct rfkill_ops dell_rfkill_ops = {\n"} {"commit":"0ad9500e16fe24aa55809a2b00e0d2d0e658fc71","subject":"slub: prefetch next freelist pointer in slab_alloc()","message":"slub: prefetch next freelist pointer in slab_alloc()\n\nRecycling a page is a problem, since freelist link chain is hot on\ncpu(s) which freed objects, and possibly very cold on cpu currently\nowning slab.\n\nAdding a prefetch of cache line containing the pointer to next object in\nslab_alloc() helps a lot in many workloads, in particular on assymetric\nones (allocations done on one cpu, frees on another cpus). Added cost is\nthree machine instructions only.\n\nExamples on my dual socket quad core ht machine (Intel CPU E5540\n@2.53GHz) (16 logical cpus, 2 memory nodes), 64bit kernel.\n\nBefore patch :\n\n# perf stat -r 32 hackbench 50 process 4000 >\/dev\/null\n\n Performance counter stats for 'hackbench 50 process 4000' (32 runs):\n\n 327577,471718 task-clock # 15,821 CPUs utilized ( +- 0,64% )\n 28 866 491 context-switches # 0,088 M\/sec ( +- 1,80% )\n 1 506 929 CPU-migrations # 0,005 M\/sec ( +- 3,24% )\n 127 151 page-faults # 0,000 M\/sec ( +- 0,16% )\n 829 399 813 448 cycles # 2,532 GHz ( +- 0,64% )\n 580 664 691 740 stalled-cycles-frontend # 70,01% frontend cycles idle ( +- 0,71% )\n 197 431 700 448 stalled-cycles-backend # 23,80% backend cycles idle ( +- 1,03% )\n 503 548 648 975 instructions # 0,61 insns per cycle\n # 1,15 stalled cycles per insn ( +- 0,46% )\n 95 780 068 471 branches # 292,389 M\/sec ( +- 0,48% )\n 1 426 407 916 branch-misses # 1,49% of all branches ( +- 1,35% )\n\n 20,705679994 seconds time elapsed ( +- 0,64% )\n\nAfter patch :\n\n# perf stat -r 32 hackbench 50 process 4000 >\/dev\/null\n\n Performance counter stats for 'hackbench 50 process 4000' (32 runs):\n\n 286236,542804 task-clock # 15,786 CPUs utilized ( +- 1,32% )\n 19 703 372 context-switches # 0,069 M\/sec ( +- 4,99% )\n 1 658 249 CPU-migrations # 0,006 M\/sec ( +- 6,62% )\n 126 776 page-faults # 0,000 M\/sec ( +- 0,12% )\n 724 636 593 213 cycles # 2,532 GHz ( +- 1,32% )\n 499 320 714 837 stalled-cycles-frontend # 68,91% frontend cycles idle ( +- 1,47% )\n 156 555 126 809 stalled-cycles-backend # 21,60% backend cycles idle ( +- 2,22% )\n 463 897 792 661 instructions # 0,64 insns per cycle\n # 1,08 stalled cycles per insn ( +- 0,94% )\n 87 717 352 563 branches # 306,451 M\/sec ( +- 0,99% )\n 941 738 280 branch-misses # 1,07% of all branches ( +- 3,35% )\n\n 18,132070670 seconds time elapsed ( +- 1,30% )\n\nSigned-off-by: Eric Dumazet <a0baddf32b28d2f9429941ed4af2fe636e210591@gmail.com>\nAcked-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nCC: Matt Mackall <4121265491a72225438dfd0e91a228f361407ae2@selenic.com>\nCC: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nCC: \"Alex,Shi\" <1abc5746028550adcf7742cb5d47df86766285d8@intel.com>\nCC: Shaohua Li <cb3904095a5bc20edc93ba3dfa3e7d27d981b654@intel.com>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slub.c\n+++ mm\/slub.c\n@@ -269,6 +269,11 @@\n \treturn *(void **)(object + s->offset);\n }\n \n+static void prefetch_freepointer(const struct kmem_cache *s, void *object)\n+{\n+\tprefetch(object + s->offset);\n+}\n+\n static inline void *get_freepointer_safe(struct kmem_cache *s, void *object)\n {\n \tvoid *p;\n@@ -2309,6 +2314,8 @@\n \t\tobject = __slab_alloc(s, gfpflags, node, addr, c);\n \n \telse {\n+\t\tvoid *next_object = get_freepointer_safe(s, object);\n+\n \t\t\/*\n \t\t * The cmpxchg will only match if there was no additional\n \t\t * operation and if we are on the right processor.\n@@ -2324,11 +2331,12 @@\n \t\tif (unlikely(!this_cpu_cmpxchg_double(\n \t\t\t\ts->cpu_slab->freelist, s->cpu_slab->tid,\n \t\t\t\tobject, tid,\n-\t\t\t\tget_freepointer_safe(s, object), next_tid(tid)))) {\n+\t\t\t\tnext_object, next_tid(tid)))) {\n \n \t\t\tnote_cmpxchg_failure(\"slab_alloc\", s, tid);\n \t\t\tgoto redo;\n \t\t}\n+\t\tprefetch_freepointer(s, next_object);\n \t\tstat(s, ALLOC_FASTPATH);\n \t}\n \n"} {"commit":"ddde708217af6d5fe43c0086247c05ed317076b4","subject":"dell-laptop: If there is no hwswitch, then clear all hw-controlled bits","message":"dell-laptop: If there is no hwswitch, then clear all hw-controlled bits\n\nTo ensure we don't enter any hw-switch related code paths on machines without\na hw-switch.\n\nSigned-off-by: Hans de Goede <9fa1be1a5b5729e4c6b404f34c9ce49ff4882fd8@redhat.com>\nSigned-off-by: Matthew Garrett <d1dada306f6f6bc535ec5238317ee8d221588a1a@nebula.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/platform\/x86\/dell-laptop.c\n+++ drivers\/platform\/x86\/dell-laptop.c\n@@ -548,6 +548,9 @@\n \tbuffer->input[0] = 0x2;\n \tdell_send_request(buffer, 17, 11);\n \thwswitch_state = buffer->output[1];\n+\t\/* If there is no hwswitch, then clear all hw-controlled bits *\/\n+\tif (!(status & BIT(0)))\n+\t\thwswitch_state &= ~7;\n \trelease_buffer();\n \n \tif ((status & (1<<2|1<<8)) == (1<<2|1<<8)) {\n"} {"commit":"90ff8ba6be3febabf99853608cf28c283cca84e4","subject":"rcar_gen3: drivers: rom: Mark NEW table as D3 compatible","message":"rcar_gen3: drivers: rom: Mark NEW table as D3 compatible\n\nAdd comment into the ROM driver that the new table is also D3 compatible.\n\nSigned-off-by: Marek Vasut <bcf2901fa1b128a7a3f88ee031c46807a29aa29d@gmail.com>\n","repos":"achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- drivers\/renesas\/rcar\/rom\/rom_api.c\n+++ drivers\/renesas\/rcar\/rom\/rom_api.c\n@@ -19,7 +19,7 @@\n #define OLD_API_TABLE1\t(0U)\t\/* H3 Ver.1.0\/Ver.1.1 *\/\n #define OLD_API_TABLE2\t(1U)\t\/* H3 Ver.2.0 *\/\n #define OLD_API_TABLE3\t(2U)\t\/* M3 Ver.1.0 *\/\n-#define NEW_API_TABLE\t(3U)\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3 *\/\n+#define NEW_API_TABLE\t(3U)\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3, D3 *\/\n #define API_TABLE_MAX\t(4U)\t\/* table max *\/\n \t\t\t\t\/* Later than H3 Ver.2.0 *\/\n \n@@ -66,7 +66,7 @@\n \t\t0xEB10DD64U,\t\/* H3 Ver.1.0\/Ver.1.1 *\/\n \t\t0xEB116ED4U,\t\/* H3 Ver.2.0 *\/\n \t\t0xEB1102FCU,\t\/* M3 Ver.1.0 *\/\n-\t\t0xEB100180U\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3 *\/\n+\t\t0xEB100180U\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3, D3 *\/\n \t};\n \trom_secure_boot_api_f secure_boot;\n \tuint32_t index;\n@@ -83,7 +83,7 @@\n \t\t0xEB10DFE0U,\t\/* H3 Ver.1.0\/Ver.1.1 *\/\n \t\t0xEB117150U,\t\/* H3 Ver.2.0 *\/\n \t\t0xEB110578U,\t\/* M3 Ver.1.0 *\/\n-\t\t0xEB10018CU\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3 *\/\n+\t\t0xEB10018CU\t\/* H3 Ver.3.0, M3 Ver.1.1 or later, M3N, E3, D3 *\/\n \t};\n \trom_get_lcs_api_f get_lcs;\n \tuint32_t index;\n"} {"commit":"499e2e6fcb9351844d721e4bd3f1184d879bd178","subject":"net, scsi\/csgb4i: convert skb->transport_header into skb_transport_header(skb)","message":"net, scsi\/csgb4i: convert skb->transport_header into skb_transport_header(skb)\n\nThe change set of 1a37e412, \"net: Use 16bits for *_headers fields\nof struct skbuff\" converted from sk_buff_data_t into 16bit integer.\nSo skb->tail needs to be converted to skb_tail_pointer(skb).\n\nFound by inspection. Compile tested only.\n\nCc: Simon Horman <a105fd58f578dea0be108941d4c59d15396e1855@verge.net.au>\nCc: Li RongQing <81c2f95e9d1350da984a3ef03e964ca9a6cbc5c2@gmail.com>\nCc: ea47de8cd575d5b79715f437890b953cbeed1aa3@vger.kernel.org\nSigned-off-by: Isaku Yamahata <4b3abd66323411eeceff090ab3754dd766fc4b25@valinux.co.jp>\nAcked-by: Simon Horman <a105fd58f578dea0be108941d4c59d15396e1855@verge.net.au>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/cxgbi\/cxgb4i\/cxgb4i.c\n+++ drivers\/scsi\/cxgbi\/cxgb4i\/cxgb4i.c\n@@ -358,7 +358,7 @@\n \t\treturn DIV_ROUND_UP(skb->len, 8);\n \tflits = skb_transport_offset(skb) \/ 8;\n \tcnt = skb_shinfo(skb)->nr_frags;\n-\tif (skb->tail != skb->transport_header)\n+\tif (skb_tail_pointer(skb) != skb_transport_header(skb))\n \t\tcnt++;\n \treturn flits + sgl_len(cnt);\n }\n"} {"commit":"b17caa174a7e1fd2e17b26e210d4ee91c4c28b37","subject":"[SCSI] libsas: fix sas_discover_devices return code handling","message":"[SCSI] libsas: fix sas_discover_devices return code handling\n\ncommit 198439e4 [SCSI] libsas: do not set res = 0 in sas_ex_discover_dev()\ncommit 19252de6 [SCSI] libsas: fix wide port hotplug issues\n\nThe above commits seem to have confused the return value of\nsas_ex_discover_dev which is non-zero on failure and\nsas_ex_join_wide_port which just indicates short circuiting discovery on\nalready established ports. The result is random discovery failures\ndepending on configuration.\n\nCalls to sas_ex_join_wide_port are the source of the trouble as its\nreturn value is errantly assigned to 'res'. Convert it to bool and stop\nreturning its result up the stack.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org>\nTested-by: Dan Melnic <2a6c2956194c0a332eeea7a4845ead744f6d2917@amd.com>\nReported-by: Dan Melnic <2a6c2956194c0a332eeea7a4845ead744f6d2917@amd.com>\nSigned-off-by: Dan Williams <24ee2bf0bd8ac766c348bf1f0639943bac1535c6@intel.com>\nReviewed-by: Jack Wang <b8206e8949faccb6bda319c49287e0957f79d731@usish.com>\nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Parallels.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/libsas\/sas_expander.c\n+++ drivers\/scsi\/libsas\/sas_expander.c\n@@ -868,7 +868,7 @@\n }\n \n \/* See if this phy is part of a wide port *\/\n-static int sas_ex_join_wide_port(struct domain_device *parent, int phy_id)\n+static bool sas_ex_join_wide_port(struct domain_device *parent, int phy_id)\n {\n \tstruct ex_phy *phy = &parent->ex_dev.ex_phy[phy_id];\n \tint i;\n@@ -884,11 +884,11 @@\n \t\t\tsas_port_add_phy(ephy->port, phy->phy);\n \t\t\tphy->port = ephy->port;\n \t\t\tphy->phy_state = PHY_DEVICE_DISCOVERED;\n-\t\t\treturn 0;\n-\t\t}\n-\t}\n-\n-\treturn -ENODEV;\n+\t\t\treturn true;\n+\t\t}\n+\t}\n+\n+\treturn false;\n }\n \n static struct domain_device *sas_ex_discover_expander(\n@@ -1030,8 +1030,7 @@\n \t\treturn res;\n \t}\n \n-\tres = sas_ex_join_wide_port(dev, phy_id);\n-\tif (!res) {\n+\tif (sas_ex_join_wide_port(dev, phy_id)) {\n \t\tSAS_DPRINTK(\"Attaching ex phy%d to wide port %016llx\\n\",\n \t\t\t phy_id, SAS_ADDR(ex_phy->attached_sas_addr));\n \t\treturn res;\n@@ -1077,8 +1076,7 @@\n \t\t\tif (SAS_ADDR(ex->ex_phy[i].attached_sas_addr) ==\n \t\t\t SAS_ADDR(child->sas_addr)) {\n \t\t\t\tex->ex_phy[i].phy_state= PHY_DEVICE_DISCOVERED;\n-\t\t\t\tres = sas_ex_join_wide_port(dev, i);\n-\t\t\t\tif (!res)\n+\t\t\t\tif (sas_ex_join_wide_port(dev, i))\n \t\t\t\t\tSAS_DPRINTK(\"Attaching ex phy%d to wide port %016llx\\n\",\n \t\t\t\t\t\t i, SAS_ADDR(ex->ex_phy[i].attached_sas_addr));\n \n@@ -1943,32 +1941,20 @@\n {\n \tstruct ex_phy *ex_phy = &dev->ex_dev.ex_phy[phy_id];\n \tstruct domain_device *child;\n-\tbool found = false;\n-\tint res, i;\n+\tint res;\n \n \tSAS_DPRINTK(\"ex %016llx phy%d new device attached\\n\",\n \t\t SAS_ADDR(dev->sas_addr), phy_id);\n \tres = sas_ex_phy_discover(dev, phy_id);\n \tif (res)\n-\t\tgoto out;\n-\t\/* to support the wide port inserted *\/\n-\tfor (i = 0; i < dev->ex_dev.num_phys; i++) {\n-\t\tstruct ex_phy *ex_phy_temp = &dev->ex_dev.ex_phy[i];\n-\t\tif (i == phy_id)\n-\t\t\tcontinue;\n-\t\tif (SAS_ADDR(ex_phy_temp->attached_sas_addr) ==\n-\t\t SAS_ADDR(ex_phy->attached_sas_addr)) {\n-\t\t\tfound = true;\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\tif (found) {\n-\t\tsas_ex_join_wide_port(dev, phy_id);\n+\t\treturn res;\n+\n+\tif (sas_ex_join_wide_port(dev, phy_id))\n \t\treturn 0;\n-\t}\n+\n \tres = sas_ex_discover_devices(dev, phy_id);\n-\tif (!res)\n-\t\tgoto out;\n+\tif (res)\n+\t\treturn res;\n \tlist_for_each_entry(child, &dev->ex_dev.children, siblings) {\n \t\tif (SAS_ADDR(child->sas_addr) ==\n \t\t SAS_ADDR(ex_phy->attached_sas_addr)) {\n@@ -1978,7 +1964,6 @@\n \t\t\tbreak;\n \t\t}\n \t}\n-out:\n \treturn res;\n }\n \n"} {"commit":"6825a26c2dc21eb4f8df9c06d3786ddec97cf53b","subject":"ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt","message":"ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt\n\nas we hold dst_entry before we call __ip6_del_rt,\nso we should alse call dst_release not only return\n-ENOENT when the rt6_info is ip6_null_entry.\n\nand we already hold the dst entry, so I think it's\nsafe to call dst_release out of the write-read lock.\n\nSigned-off-by: Gao feng <7e9c653c8ec3abfdd967a0616fd143ca77e7b405@cn.fujitsu.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/ipv6\/route.c\n+++ net\/ipv6\/route.c\n@@ -1593,17 +1593,18 @@\n \tstruct fib6_table *table;\n \tstruct net *net = dev_net(rt->dst.dev);\n \n-\tif (rt == net->ipv6.ip6_null_entry)\n-\t\treturn -ENOENT;\n+\tif (rt == net->ipv6.ip6_null_entry) {\n+\t\terr = -ENOENT;\n+\t\tgoto out;\n+\t}\n \n \ttable = rt->rt6i_table;\n \twrite_lock_bh(&table->tb6_lock);\n-\n \terr = fib6_del(rt, info);\n+\twrite_unlock_bh(&table->tb6_lock);\n+\n+out:\n \tdst_release(&rt->dst);\n-\n-\twrite_unlock_bh(&table->tb6_lock);\n-\n \treturn err;\n }\n \n"} {"commit":"c2602c48b5ebde55b418ba252737bf60caa4bab0","subject":"[SCSI] qla2xxx: Update version number to 8.01.05-k4.","message":"[SCSI] qla2xxx: Update version number to 8.01.05-k4.\n\nSigned-off-by: Andrew Vasquez <67840a4977006af7f584bdc4c86d7243c1629cad@qlogic.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/scsi\/qla2xxx\/qla_version.h\n+++ drivers\/scsi\/qla2xxx\/qla_version.h\n@@ -7,7 +7,7 @@\n \/*\n * Driver version\n *\/\n-#define QLA2XXX_VERSION \"8.01.05-k3\"\n+#define QLA2XXX_VERSION \"8.01.05-k4\"\n \n #define QLA_DRIVER_MAJOR_VER\t8\n #define QLA_DRIVER_MINOR_VER\t1\n"} {"commit":"457620b47a5398e779584fc3c470683fbb3d1c8d","subject":"[SCSI] qla2xxx: Update version number to 8.01.07-k6.","message":"[SCSI] qla2xxx: Update version number to 8.01.07-k6.\n\nSigned-off-by: Andrew Vasquez <67840a4977006af7f584bdc4c86d7243c1629cad@qlogic.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/qla2xxx\/qla_version.h\n+++ drivers\/scsi\/qla2xxx\/qla_version.h\n@@ -7,7 +7,7 @@\n \/*\n * Driver version\n *\/\n-#define QLA2XXX_VERSION \"8.01.07-k5\"\n+#define QLA2XXX_VERSION \"8.01.07-k6\"\n \n #define QLA_DRIVER_MAJOR_VER\t8\n #define QLA_DRIVER_MINOR_VER\t1\n"} {"commit":"fc091e03820bf67e543362bd40959701a71d0c27","subject":"[SCSI] qla2xxx: Update version number to 8.01.04-k.","message":"[SCSI] qla2xxx: Update version number to 8.01.04-k.\n\nSigned-off-by: Andrew Vasquez <67840a4977006af7f584bdc4c86d7243c1629cad@qlogic.com>\nSigned-off-by: James Bottomley <407b36959ca09543ccda8f8e06721c791bc53435@SteelEye.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/scsi\/qla2xxx\/qla_version.h\n+++ drivers\/scsi\/qla2xxx\/qla_version.h\n@@ -7,9 +7,9 @@\n \/*\n * Driver version\n *\/\n-#define QLA2XXX_VERSION \"8.01.03-k\"\n+#define QLA2XXX_VERSION \"8.01.04-k\"\n \n #define QLA_DRIVER_MAJOR_VER\t8\n #define QLA_DRIVER_MINOR_VER\t1\n-#define QLA_DRIVER_PATCH_VER\t3\n+#define QLA_DRIVER_PATCH_VER\t4\n #define QLA_DRIVER_BETA_VER\t0\n"} {"commit":"e2690f033e807241abd8913642e02f9b60f4a3ef","subject":"drivers: sensor: max44009: Add multi-instance support","message":"drivers: sensor: max44009: Add multi-instance support\n\nMove driver to use DT_INST_FOREACH_STATUS_OKAY to add\nmulti-instance support.\n\nSigned-off-by: Benjamin Bj\u00f6rnsson <8044ef148b03b50e606a03e6e88e2c21cb9a92a8@gmail.com>\n","repos":"zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,finikorg\/zephyr,galak\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/sensor\/max44009\/max44009.c\n+++ drivers\/sensor\/max44009\/max44009.c\n@@ -183,12 +183,15 @@\n \treturn 0;\n }\n \n-static struct max44009_data max44009_drv_data;\n+#define MAX44009_DEFINE(inst)\t\t\t\t\t\t\t\t\t\\\n+\tstatic struct max44009_data max44009_data_##inst;\t\t\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\t\t\t\\\n+\tstatic const struct max44009_config max44009_config_##inst = {\t\t\t\t\\\n+\t\t.i2c = I2C_DT_SPEC_INST_GET(inst),\t\t\t\t\t\t\\\n+\t};\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\t\t\t\\\n+\tDEVICE_DT_INST_DEFINE(inst, max44009_init, NULL,\t\t\t\t\t\\\n+\t\t\t &max44009_data_##inst, &max44009_config_##inst, POST_KERNEL,\t\\\n+\t\t\t CONFIG_SENSOR_INIT_PRIORITY, &max44009_driver_api);\t\t\\\n \n-static const struct max44009_config mac44009_config_inst = {\n-\t.i2c = I2C_DT_SPEC_INST_GET(0),\n-};\n-\n-DEVICE_DT_INST_DEFINE(0, max44009_init, NULL, &max44009_drv_data,\n-\t\t &mac44009_config_inst, POST_KERNEL,\n-\t\t CONFIG_SENSOR_INIT_PRIORITY, &max44009_driver_api);\n+DT_INST_FOREACH_STATUS_OKAY(MAX44009_DEFINE)\n"} {"commit":"5d7b169214bbbc9bb0b1dfb3a29cac97f7939ca4","subject":"staging: fbtft: remove redundant set_addr_win() function","message":"staging: fbtft: remove redundant set_addr_win() function\n\nThis patch removes the function set_addr_win() from fb_st7789v.c, as its\ndefinition is redundant to the default implementation fbtft_set_addr_win()\nwhich can be found in fbtft-core.c.\n\nSigned-off-by: Dennis Menschel <7a5d6b59bfc2928d4d7b53f4eb0f4e51664978ab@posteo.de>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/fbtft\/fb_st7789v.c\n+++ drivers\/staging\/fbtft\/fb_st7789v.c\n@@ -126,24 +126,6 @@\n \n \t-3,\n };\n-\n-\/**\n- * set_addr_win() - configure display area to use\n- *\n- * @par: FBTFT parameter object\n- * @xs: first active pixel of x-axis\n- * @ys: first active pixel of y-axis\n- * @xe: last active pixel of x-axis\n- * @ye: last active pixel of y-axis\n- *\/\n-static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)\n-{\n-\twrite_reg(par, MIPI_DCS_SET_COLUMN_ADDRESS,\n-\t\t xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF);\n-\twrite_reg(par, MIPI_DCS_SET_PAGE_ADDRESS,\n-\t\t ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF);\n-\twrite_reg(par, MIPI_DCS_WRITE_MEMORY_START);\n-}\n \n \/**\n * set_var() - apply LCD properties like rotation and BGR mode\n@@ -260,7 +242,6 @@\n \t.gamma_len = 14,\n \t.gamma = DEFAULT_GAMMA,\n \t.fbtftops = {\n-\t\t.set_addr_win = set_addr_win,\n \t\t.set_var = set_var,\n \t\t.set_gamma = set_gamma,\n \t\t.blank = blank,\n"} {"commit":"d67030d215ac1ec13cab16467904c2a7265e1fbd","subject":"staging\/gdm72xx: return PTR_ERR rather -ENOENT","message":"staging\/gdm72xx: return PTR_ERR rather -ENOENT\n\nreturn the error of filp_open rather returning -ENOENT.\n\nSigned-off-by: Devendra Naga <97fdf9fb34d40445b99f4e064a18057cd6e2bccb@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/staging\/gdm72xx\/usb_boot.c\n+++ drivers\/staging\/gdm72xx\/usb_boot.c\n@@ -174,7 +174,7 @@\n \tif (IS_ERR(filp)) {\n \t\tprintk(KERN_ERR \"Can't find %s.\\n\", img_name);\n \t\tset_fs(fs);\n-\t\tret = -ENOENT;\n+\t\tret = PTR_ERR(filp);\n \t\tgoto restore_fs;\n \t}\n \n"} {"commit":"e7c6f80fd733218aa1e79efa5d9ece9f76966160","subject":"USB: unusual_devs: Add support for GI 0401 SD-Card interface","message":"USB: unusual_devs: Add support for GI 0401 SD-Card interface\n\nEnables the SD-Card interface on the GI 0401 HSUPA card from Option.\n\nThe unusual_devs.h entry is necessary because the device descriptor is\nvendor-specific. That prevents usb-storage from binding to it as an\ninterface driver.\n\nThis revised patch adds a small comment explaining why and reduces the\nrev range.\n\nT: Bus=02 Lev=01 Prnt=01 Port=06 Cnt=01 Dev#= 3 Spd=480 MxCh= 0\nD: Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=ff MxPS=64 #Cfgs= 1\nP: Vendor=0af0 ProdID=7401 Rev= 0.00\nS: Manufacturer=Option N.V.\nS: Product=Globetrotter HSUPA Modem\nC:* #Ifs=10 Cfg#= 1 Atr=80 MxPwr=500mA\nI:* If#= 0 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 0 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 1 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 2 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 2 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 3 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 3 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 4 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 4 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 5 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 5 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 6 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 6 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 7 Alt= 0 #EPs= 0 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nI: If#= 7 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 8 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)\nE: Ad=89(I) Atr=03(Int.) MxPS= 64 Ivl=2ms\nE: Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms\nI:* If#= 9 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage\nE: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms\nE: Ad=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms\n\nSigned-off-by: Filip Aben <2754b3b152309bafe792a1c297533cdb6d733f00@option.com>\nSigned-off-by: Phil Dibowitz <e888d2bd6f13f82caa51a37c03d034c76f661ba3@ipom.com>\nCc: stable <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/usb\/storage\/unusual_devs.h\n+++ drivers\/usb\/storage\/unusual_devs.h\n@@ -1311,6 +1311,16 @@\n \t\tUS_SC_DEVICE, US_PR_DEVICE, NULL,\n \t\tUS_FL_IGNORE_DEVICE ),\n \n+\/* Reported by F. Aben <f.aben@option.com>\n+ * This device (wrongly) has a vendor-specific device descriptor.\n+ * The entry is needed so usb-storage can bind to it's mass-storage\n+ * interface as an interface driver *\/\n+UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000,\n+\t\t\"Option\",\n+\t\t\"GI 0401 SD-Card\",\n+\t\tUS_SC_DEVICE, US_PR_DEVICE, NULL,\n+\t\t0 ),\n+\n #ifdef CONFIG_USB_STORAGE_ISD200\n UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,\n \t\t\"ATI\",\n"} {"commit":"aa2cba51a0a85dfbd5be58239e59bc5e8b5fb7cf","subject":"PCI\/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register","message":"PCI\/VFIO: use pcie_flags_reg instead of access PCI-E Capabilities Register\n\nCurrently, we use pcie_flags_reg to cache PCI-E Capabilities Register,\nbecause PCI-E Capabilities Register bits are almost read-only. This patch\nuse pcie_caps_reg() instead of another access PCI-E Capabilities Register.\n\nSigned-off-by: Yijing Wang <ac442ed3e729ed4f09d087e9c319e1c47c72d6f1@huawei.com>\nSigned-off-by: Alex Williamson <7469de9b95ba379e2656fa9677689657c47a7690@redhat.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/vfio\/pci\/vfio_pci_config.c\n+++ drivers\/vfio\/pci\/vfio_pci_config.c\n@@ -1037,13 +1037,9 @@\n \t\treturn byte;\n \tcase PCI_CAP_ID_EXP:\n \t\t\/* length based on version *\/\n-\t\tret = pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &word);\n-\t\tif (ret)\n-\t\t\treturn pcibios_err_to_errno(ret);\n-\n \t\tvdev->extended_caps = true;\n \n-\t\tif ((word & PCI_EXP_FLAGS_VERS) == 1)\n+\t\tif ((pcie_caps_reg(pdev) & PCI_EXP_FLAGS_VERS) == 1)\n \t\t\treturn PCI_CAP_EXP_ENDPOINT_SIZEOF_V1;\n \t\telse\n \t\t\treturn PCI_CAP_EXP_ENDPOINT_SIZEOF_V2;\n"} {"commit":"e6a78c7a0bbfe9fe0d060aff6ff11ca2e8e9f26d","subject":"Coverity: 711710","message":"Coverity: 711710\n","repos":"Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- oc2\/ocinternal.c\n+++ oc2\/ocinternal.c\n@@ -168,7 +168,7 @@\n CURL* curl = NULL; \/* curl handle*\/\n \n if(!ocuriparse(url,&tmpurl)) {OCTHROWCHK(stat=OC_EBADURL); goto fail;}\n- \n+\n stat = occurlopen(&curl);\n if(stat != OC_NOERR) {OCTHROWCHK(stat); goto fail;}\n \n@@ -191,7 +191,7 @@\n stat = ocsetcurlproperties(state);\n \n if(statep) *statep = state;\n- return OCTHROW(stat); \n+ return OCTHROW(stat);\n \n fail:\n ocurifree(tmpurl);\n@@ -207,7 +207,7 @@\n OCtree* tree = NULL;\n OCnode* root = NULL;\n OCerror stat = OC_NOERR;\n- \n+\n tree = (OCtree*)ocmalloc(sizeof(OCtree));\n MEMCHECK(tree,OC_ENOMEM);\n memset((void*)tree,0,sizeof(OCtree));\n@@ -283,7 +283,7 @@\n \/* Check and report on an error return from the server *\/\n if(stat == OC_EDAPSVC && state->error.code != NULL) {\n \toclog(OCLOGERR,\"oc_open: server error retrieving url: code=%s message=\\\"%s\\\"\",\n-\t\t state->error.code,\t\n+\t\t state->error.code,\n \t\t (state->error.message?state->error.message:\"\"));\n }\n if(stat) {OCTHROWCHK(stat); goto fail;}\n@@ -340,7 +340,7 @@\n \tif(dataError(tree->data.xdrs,state)) {\n \t stat = OC_EDATADDS;\n \t oclog(OCLOGERR,\"oc_open: server error retrieving url: code=%s message=\\\"%s\\\"\",\n-\t\t state->error.code,\t\n+\t\t state->error.code,\n \t\t (state->error.message?state->error.message:\"\"));\n \t goto fail;\n \t}\n@@ -422,7 +422,7 @@\n ocfree(state->ssl.key);\n ocfree(state->ssl.keypasswd);\n ocfree(state->ssl.cainfo);\n- ocfree(state->ssl.capath); \n+ ocfree(state->ssl.capath);\n ocfree(state->proxy.host);\n ocfree(state->creds.username);\n ocfree(state->creds.password);\n@@ -503,7 +503,10 @@\n } else\n \ttree->text = NULL;\n \/* reset the position of the tmp file*\/\n- fseek(tree->data.file,(long)tree->data.bod,SEEK_SET);\n+ if(fseek(tree->data.file,(long)tree->data.bod,SEEK_SET) < 0) {\n+ stat = OC_EDATADDS;\n+ return OCTHROW(stat);\n+ }\n if(tree->text == NULL) stat = OC_EDATADDS;\n return OCTHROW(stat);\n }\n@@ -591,7 +594,7 @@\n \/* Some servers (e.g. thredds and columbia) appear to require a place\n to put cookies in order for some security functions to work\n *\/\n- if(state->curlflags.cookiejar == NULL \n+ if(state->curlflags.cookiejar == NULL\n || *state->curlflags.cookiejar) {\n #if 1\n \t\/* Apparently anything non-null will work *\/\n@@ -601,7 +604,7 @@\n \tchar* tmp;\n \tint fd;\n int stat;\n-\t\t\n+\n tmp = (char*)malloc(strlen(ocglobalstate.home)\n \t\t\t\t +strlen(\"\/\")\n \t\t\t\t +strlen(OCDIR)\n@@ -621,7 +624,7 @@\n \terrno = 0;\n \t\/* Create the actual cookie file *\/\n \tstat = ocmktmp(tmp,&state->curlflags.cookiejar,&fd);\n-\tclose(fd);\t\n+\tclose(fd);\n \n #if 0\n \tfd = creat(tmp,S_IRUSR | S_IWUSR);\n@@ -681,7 +684,7 @@\n \t depth--;\n \t if(depth == 0) {i++; break;}\n \t}\n- } \n+ }\n errmsg = (char*)malloc((size_t)i+1);\n if(errmsg == NULL) {errfound = 1; goto done;}\n xxdr_setpos(xdrs,ckp);\n"} {"commit":"694a9114af0fa1a5c9a59a34f30ac7f96c6c7e67","subject":"stylecontext: Simplify even more code","message":"stylecontext: Simplify even more code\n","repos":"bratsche\/gtk-,bratsche\/gtk-,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,alexlarsson\/gtk,davidt\/gtk,chergert\/gtk,ebassi\/gtk,ebassi\/gtk,alexlarsson\/gtk,ebassi\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,Lyude\/gtk-,bratsche\/gtk-,davidgumberg\/gtk,jadahl\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,ebassi\/gtk,jessevdk\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,chergert\/gtk,davidt\/gtk,chergert\/gtk,ahodesuka\/gtk,msteinert\/gtk,Lyude\/gtk-,alexlarsson\/gtk,jigpu\/gtk,Lyude\/gtk-,davidt\/gtk,jigpu\/gtk,jessevdk\/gtk,msteinert\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,jigpu\/gtk,bratsche\/gtk-,ahodesuka\/gtk,davidgumberg\/gtk,Lyude\/gtk-,davidt\/gtk,jigpu\/gtk,grubersjoe\/adwaita,jadahl\/gtk,jessevdk\/gtk,Distrotech\/gtk2,chergert\/gtk,alexlarsson\/gtk,chergert\/gtk,Distrotech\/gtk2,Lyude\/gtk-,grubersjoe\/adwaita,jessevdk\/gtk,jadahl\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,Lyude\/gtk-,jessevdk\/gtk,chergert\/gtk,jigpu\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,jigpu\/gtk,davidgumberg\/gtk,jadahl\/gtk,jessevdk\/gtk,jadahl\/gtk,chergert\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,jadahl\/gtk,jigpu\/gtk,jigpu\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,bratsche\/gtk-,Lyude\/gtk-,Adamovskiy\/gtk,msteinert\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,ebassi\/gtk,davidt\/gtk,msteinert\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,ahodesuka\/gtk,msteinert\/gtk,chergert\/gtk,Adamovskiy\/gtk,msteinert\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,davidt\/gtk,jadahl\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,jadahl\/gtk,alexlarsson\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkstylecontext.c\n+++ gtk\/gtkstylecontext.c\n@@ -3520,24 +3520,18 @@\n GtkStateFlags state,\n GtkBorder *border)\n {\n- GtkStyleContextPrivate *priv;\n- StyleData *data;\n int top, left, bottom, right;\n \n g_return_if_fail (border != NULL);\n g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));\n \n- priv = context->priv;\n- g_return_if_fail (priv->widget_path != NULL);\n-\n- data = style_data_lookup (context, state);\n- gtk_style_properties_get (data->store,\n- 0,\n- \"border-top-width\", &top,\n- \"border-left-width\", &left,\n- \"border-bottom-width\", &bottom,\n- \"border-right-width\", &right,\n- NULL);\n+ gtk_style_context_get (context,\n+ state,\n+ \"border-top-width\", &top,\n+ \"border-left-width\", &left,\n+ \"border-bottom-width\", &bottom,\n+ \"border-right-width\", &right,\n+ NULL);\n \n border->top = top;\n border->left = left;\n@@ -3561,24 +3555,18 @@\n GtkStateFlags state,\n GtkBorder *padding)\n {\n- GtkStyleContextPrivate *priv;\n- StyleData *data;\n int top, left, bottom, right;\n \n g_return_if_fail (padding != NULL);\n g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));\n \n- priv = context->priv;\n- g_return_if_fail (priv->widget_path != NULL);\n-\n- data = style_data_lookup (context, state);\n- gtk_style_properties_get (data->store,\n- 0,\n- \"padding-top\", &top,\n- \"padding-left\", &left,\n- \"padding-bottom\", &bottom,\n- \"padding-right\", &right,\n- NULL);\n+ gtk_style_context_get (context,\n+ state,\n+ \"padding-top\", &top,\n+ \"padding-left\", &left,\n+ \"padding-bottom\", &bottom,\n+ \"padding-right\", &right,\n+ NULL);\n \n padding->top = top;\n padding->left = left;\n@@ -3602,24 +3590,18 @@\n GtkStateFlags state,\n GtkBorder *margin)\n {\n- GtkStyleContextPrivate *priv;\n- StyleData *data;\n int top, left, bottom, right;\n \n g_return_if_fail (margin != NULL);\n g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));\n \n- priv = context->priv;\n- g_return_if_fail (priv->widget_path != NULL);\n-\n- data = style_data_lookup (context, state);\n- gtk_style_properties_get (data->store,\n- 0,\n- \"margin-top\", &top,\n- \"margin-left\", &left,\n- \"margin-bottom\", &bottom,\n- \"margin-right\", &right,\n- NULL);\n+ gtk_style_context_get (context,\n+ state,\n+ \"margin-top\", &top,\n+ \"margin-left\", &left,\n+ \"margin-bottom\", &bottom,\n+ \"margin-right\", &right,\n+ NULL);\n \n margin->top = top;\n margin->left = left;\n"} {"commit":"839811ada64fc675f7db349bfacd4bb18eb635c2","subject":"testing gh5","message":"testing gh5\n","repos":"timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW,timelapseplus\/VIEW","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- lib\/libgphoto2_ptp2_updates\/config.c\n+++ lib\/libgphoto2_ptp2_updates\/config.c\n@@ -6431,7 +6431,7 @@\n \tfloat f;\n \tchar buf[16];\n \tfor (i = 0; i < listCount; i++) {\n-\t\tif(list[i] > 20000000) {\n+\t\tif(list[i] < 20000000) { \/\/ ~ >0 for int\n \t\t\tf = (float) list[i];\n \t\t\tf \/= 1000;\n \t\t\tif(list[i] % 1000 == 0) {\n@@ -6445,7 +6445,7 @@\n \t\tgp_widget_add_choice (*widget, &buf);\n \t}\n \n-\tif(currentVal > 20000000) {\n+\tif(currentVal < 20000000) { \/\/ ~ >0 for int\n \t\tf = (float) currentVal;\n \t\tf \/= 1000;\n \t\tif(currentVal % 1000 == 0) {\n"} {"commit":"afed24943bf33360bb01499b416f8dd4ad7dcc26","subject":"Poprawki, poprawki, poprawki.","message":"Poprawki, poprawki, poprawki.\n\n\ngit-svn-id: 5ce22904ebd2e91e07686586c06e775ed4fb9e1a@525 d0e0d552-48cc-411f-a74d-6ebdfb0732cf\n","repos":"porridge\/libgadu,porridge\/libgadu,porridge\/libgadu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- test\/connect\/connect.c\n+++ test\/connect\/connect.c\n@@ -37,6 +37,9 @@\n \/** Port and resolver plug flags *\/\n int plug_80, plug_443, plug_8074, plug_resolver;\n \n+\/** Flags telling which actions libgadu *\/\n+int tried_80, tried_443, tried_8074, tried_resolver;\n+\n \/** Asynchronous mode flag *\/\n int async_mode;\n \n@@ -93,13 +96,11 @@\n \n void failure(void)\n {\n-\tif (server_pid != -1) {\n-\t\tif (getpid() == server_pid) {\n-\t\t\tkill(getppid(), SIGTERM);\n-\t\t} else {\n-\t\t\tkill(server_pid, SIGTERM);\n-\t\t\tprintf(\"\\n\");\n-\t\t}\n+\tif (server_pid == 0) {\n+\t\tkill(getppid(), SIGTERM);\n+\t} else if (server_pid != -1) {\n+\t\tkill(server_pid, SIGTERM);\n+\t\tprintf(\"\\n\");\n \t}\n \t\n \texit(0);\n@@ -110,9 +111,9 @@\n \tva_list ap;\n \n \tva_start(ap, fmt);\n-\tdebug_handler(0, \"<b>\", ap);\n+\tdebug_handler(0, \"\\001\", ap);\n \tdebug_handler(0, fmt, ap);\n-\tdebug_handler(0, \"<\/b>\", ap);\n+\tdebug_handler(0, \"\\002\", ap);\n \tva_end(ap);\n }\n \n@@ -143,6 +144,8 @@\n \tstatic char *addr_list[2];\n \tstatic char sname[128];\n \n+\ttried_resolver = 1;\n+\n \tif (plug_resolver != PLUG_NONE) {\n \t\tif (plug_resolver == PLUG_TIMEOUT) {\n \t\t\tif (async_mode)\n@@ -219,14 +222,17 @@\n \t\tcase 80:\n \t\t\tplug = plug_80;\n \t\t\tport = LOCALPORT;\n+\t\t\ttried_80 = 1;\n \t\t\tbreak;\n \t\tcase 443:\n \t\t\tplug = plug_443;\n \t\t\tport = LOCALPORT + 1;\n+\t\t\ttried_443 = 1;\n \t\t\tbreak;\n \t\tcase 8074:\n \t\t\tplug = plug_8074;\n \t\t\tport = LOCALPORT + 2;\n+\t\t\ttried_8074 = 1;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tdebug(\"Invalid argument for connect(): sin_port = %d\\n\", ntohs(sin.sin_port));\n@@ -261,6 +267,11 @@\n \tstruct gg_session *gs;\n \tstruct gg_login_params glp;\n \n+\ttried_80 = 0;\n+\ttried_443 = 0;\n+\ttried_8074 = 0;\n+\ttried_resolver = 0;\n+\n \tmemset(&glp, 0, sizeof(glp));\n \tglp.uin = 1;\n \tglp.password = \"dupa.8\";\n@@ -305,7 +316,7 @@\n \t\t\tres = select(gs->fd + 1, &rd, &wr, NULL, (gs->timeout) ? &tv : NULL);\n \t\t\t\n \t\t\tif (res == 0 && !gs->soft_timeout) {\n-\t\t\t\tdebug(\"hard timeout\\n\");\n+\t\t\t\tdebug(\"Hard timeout\\n\");\n \t\t\t\tgg_free_session(gs);\n \t\t\t\treturn 0;\n \t\t\t}\n@@ -320,14 +331,14 @@\n \t\t\t\tstruct gg_event *ge;\n \t\t\t\t\n \t\t\t\tif (res == 0) {\n-\t\t\t\t\tdebug(\"soft timeout\\n\");\n+\t\t\t\t\tdebug(\"Soft timeout\\n\");\n \t\t\t\t\tgs->timeout = 0;\n \t\t\t\t}\n \t\t\n \t\t\t\tge = gg_watch_fd(gs);\n \n \t\t\t\tif (!ge) {\n-\t\t\t\t\tdebug(\"gg_watch_fd failure\\n\");\n+\t\t\t\t\tdebug(\"gg_watch_fd() failed\\n\");\n \t\t\t\t\tgg_free_session(gs);\n \t\t\t\t\treturn 0;\n \t\t\t\t}\n@@ -357,11 +368,6 @@\n \t\t\t}\n \t\t}\n \t}\n-}\n-\n-\n-void test_reset(void)\n-{\n }\n \n void test_stats(void)\n@@ -545,6 +551,74 @@\n \t}\n }\n \n+char *htmlize(const char *in)\n+{\n+\tchar *out;\n+\tint i, j, size = 0;\n+\n+\tfor (i = 0; in[i]; i++) {\n+\t\tswitch (in[i]) {\n+\t\t\tcase '<':\n+\t\t\tcase '>':\n+\t\t\t\tsize += 4;\n+\t\t\t\tbreak;\n+\t\t\tcase '&':\n+\t\t\t\tsize += 5;\n+\t\t\t\tbreak;\n+\t\t\tcase '\\n':\n+\t\t\t\tsize += 7;\n+\t\t\t\tbreak;\n+\t\t\tcase 1:\n+\t\t\t\tsize += 3;\n+\t\t\t\tbreak;\n+\t\t\tcase 2:\n+\t\t\t\tsize += 4;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tsize++;\n+\t\t}\n+\t}\n+\n+\tif (!(out = malloc(size + 1)))\n+\t\treturn NULL;\n+\n+\tfor (i = 0, j = 0; in[i]; i++) {\n+\t\tswitch (in[i]) {\n+\t\t\tcase '<':\n+\t\t\t\tstrcpy(out + j, \"<\");\n+\t\t\t\tj += 4;\n+\t\t\t\tbreak;\n+\t\t\tcase '>':\n+\t\t\t\tstrcpy(out + j, \">\");\n+\t\t\t\tj += 4;\n+\t\t\t\tbreak;\n+\t\t\tcase '&':\n+\t\t\t\tstrcpy(out + j, \"&\");\n+\t\t\t\tj += 5;\n+\t\t\t\tbreak;\n+\t\t\tcase '\\n':\n+\t\t\t\tstrcpy(out + j, \"<br \/>\\n\");\n+\t\t\t\tj += 7;\n+\t\t\t\tbreak;\n+\t\t\tcase 1:\n+\t\t\t\tstrcpy(out + j, \"<b>\");\n+\t\t\t\tj += 3;\n+\t\t\t\tbreak;\n+\t\t\tcase 2:\n+\t\t\t\tstrcpy(out + j, \"<\/b>\");\n+\t\t\t\tj += 4;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tout[j] = in[i];\n+\t\t\t\tj++;\n+\t\t}\n+\t}\n+\t\t\n+\tout[size] = 0;\n+\n+\treturn out;\n+}\n+\n void cleanup(int sig)\n {\n \tfailure();\n@@ -558,6 +632,7 @@\n int main(int argc, char **argv)\n {\n \tint i, test_from, test_to, result[TEST_MAX][2] = { { 0, } };\n+\tint exit_code = 0;\n \n \tif (argc == 3) {\n \t\ttest_from = atoi(argv[1]);\n@@ -602,11 +677,33 @@\n \".testno { font-size: 16pt; }\\n\"\n \".yes { background: #c0ffc0; }\\n\"\n \".no { background: #ffc0c0; }\\n\"\n-\"pre.success { background: #c0ffc0; padding: 3px 5px; border: 1px solid #80ff80; }\\n\"\n-\"pre.failure { background: #ffc0c0; padding: 3px 5px; border: 1px solid #ff8080; }\\n\"\n+\"tt { margin: 4px 3px; display: block; }\\n\"\n+\"#header { margin-bottom: 0.5em; text-align: right; }\\n\"\n \"<\/style>\\n\"\n+\"<script>\\n\"\n+\"function toggle(id)\\n\"\n+\"{\\n\"\n+\"\tif (document.getElementById(id).style.display == 'none')\\n\"\n+\"\t\tdocument.getElementById(id).style.display = 'block';\\n\"\n+\"\telse\\n\"\n+\"\t\tdocument.getElementById(id).style.display = 'none';\\n\"\n+\"}\\n\"\n+\"function showall()\\n\"\n+\"{\\n\"\n+\"\tfor (i = %d; i <= %d; i++) {\\n\"\n+\"\t\tdocument.getElementById('log'+i+'a').style.display = 'block';\\n\"\n+\"\t\tdocument.getElementById('log'+i+'b').style.display = 'block';\\n\"\n+\"\t}\\n\"\n+\"}\\n\"\n+\"<\/script>\\n\"\n \"<\/head>\\n\"\n-\"<body>\\n\");\n+\"<body>\\n\"\n+\"<div id=\\\"header\\\">\\n\"\n+\"<a href=\\\"javascript:showall();\\\">Show all<\/a>\\n\"\n+\"<\/div>\\n\"\n+\"<table border=\\\"1\\\" width=\\\"100%%\\\">\\n\"\n+\"<tr><td rowspan=\\\"2\\\">No.<\/td><td colspan=\\\"5\\\" class=\\\"io\\\">Input<\/td><td colspan=\\\"3\\\" class=\\\"io\\\">Output<\/td><\/tr>\\n\"\n+\"<tr><th>Resolver<\/th><th>Hub<\/th><th>Port 8074<\/th><th>Port 443<\/th><th>Server<\/th><th>Expect<\/th><th>Sync<\/th><th>Async<\/th><\/tr>\\n\", test_from, test_to);\n \n \tfflush(log_file);\n \n@@ -632,6 +729,33 @@\n \t\tfor (j = 0; j < 2; j++) {\n \t\t\tasync_mode = j;\n \t\t\tresult[i][j] = test_connect(server);\n+\n+\t\t\t\/* check for invalid behaviour *\/\n+\t\t\tif (server && (tried_resolver || tried_80)) {\n+\t\t\t\tresult[i][j] = 0;\n+\t\t\t\tdebug(\"Used resolver or hub when server provided\\n\");\n+\t\t\t}\n+\n+\t\t\tif (tried_443 && !tried_8074) {\n+\t\t\t\tresult[i][j] = 0;\n+\t\t\t\tdebug(\"Didn't try 8074 although tried 443\\n\");\n+\t\t\t}\n+\n+\t\t\tif (!server && plug_resolver == PLUG_NONE && !tried_80) {\n+\t\t\t\tresult[i][j] = 0;\n+\t\t\t\tdebug(\"Didn't use hub\\n\");\n+\t\t\t}\n+\n+\t\t\tif (server && !tried_8074 && !tried_443) {\n+\t\t\t\tresult[i][j] = 0;\n+\t\t\t\tdebug(\"Didn't try connecting directly\\n\");\n+\t\t\t}\n+\n+\t\t\tif ((server || (plug_resolver == PLUG_NONE && plug_80 == PLUG_NONE)) && plug_8074 != PLUG_NONE && !tried_443) {\n+\t\t\t\tresult[i][j] = 0;\n+\t\t\t\tdebug(\"Didn't try 443\\n\");\n+\t\t\t}\n+\n \t\t\tlog[j] = log_buffer;\n \t\t\tlog_buffer = NULL;\n \t\t}\n@@ -642,32 +766,34 @@\n \t\t}\n \n \t\tif (result[i][0] == result[i][1] && result[i][0] == expect) {\n-\t\t\tdisplay = \"none\";\n+\t\t\tdisplay = \" style=\\\"display: none;\\\"\";\n \t\t} else {\n-\t\t\tdisplay = \"block\";\n-\t\t}\n-\n-\t\tfprintf(log_file, \"<div id=\\\"test%d\\\">\\n\", i + 1);\n-\t\tfprintf(log_file, \"<table id=\\\"result%d\\\" border=\\\"1\\\">\\n\", i + 1);\n-\t\tfprintf(log_file, \"<tr><th class=\\\"%s\\\" colspan=\\\"8\\\"><span class=\\\"testno\\\">Test %d<\/span><\/th><\/tr>\\n\", (result[i][0] != result[i][1] || result[i][0] != expect) ? \"failure\" : \"success\", i + 1);\n-\t\tfprintf(log_file, \"<tr><td colspan=\\\"5\\\" class=\\\"io\\\">Input<\/td><td colspan=\\\"3\\\" class=\\\"io\\\">Output<\/td><\/tr>\\n\");\n-\t\tfprintf(log_file, \"<tr><th>Resolver<\/th><th>Hub<\/th><th>Port 8074<\/th><th>Port 443<\/th><th>Server<\/th><th>Expect<\/th><th>Sync<\/th><th>Async<\/th><\/tr>\\n\");\n-\t\tfprintf(log_file, \"<tr class=\\\"params\\\">\");\n+\t\t\tdisplay = \"\";\n+\t\t\texit_code = 1;\n+\t\t}\n+\n+\t\tfprintf(log_file, \"<tr class=\\\"params\\\"><td><b>%d<\/b><\/td>\", i + 1);\n \t\tfprintf(log_file, (plug_resolver == PLUG_NONE) ? \"<td class=\\\"yes\\\">Running<\/td>\" : ((plug_resolver == PLUG_RESET) ? \"<td class=\\\"no\\\">Closed<\/td>\" : \"<td class=\\\"no\\\">Timeout<\/td>\"));\n \t\tfprintf(log_file, (plug_80 == PLUG_NONE) ? \"<td class=\\\"yes\\\">Running<\/td>\" : ((plug_80 == PLUG_RESET) ? \"<td class=\\\"no\\\">Closed<\/td>\" : \"<td class=\\\"no\\\">Timeout<\/td>\"));\n \t\tfprintf(log_file, (plug_8074 == PLUG_NONE) ? \"<td class=\\\"yes\\\">Running<\/td>\" : ((plug_8074 == PLUG_RESET) ? \"<td class=\\\"no\\\">Closed<\/td>\" : \"<td class=\\\"no\\\">Timeout<\/td>\"));\n \t\tfprintf(log_file, (plug_443 == PLUG_NONE) ? \"<td class=\\\"yes\\\">Running<\/td>\" : ((plug_443 == PLUG_RESET) ? \"<td class=\\\"no\\\">Closed<\/td>\" : \"<td class=\\\"no\\\">Timeout<\/td>\"));\n \t\tfprintf(log_file, (server) ? \"<td>Yes<\/td>\" : \"<td>No<\/td>\");\n \t\tfprintf(log_file, (expect) ? \"<td class=\\\"yes\\\">Success<\/td>\" : \"<td class=\\\"no\\\">Failure<\/td>\");\n-\t\tfprintf(log_file, (result[i][0]) ? \"<td class=\\\"yes\\\">Success<\/td>\" : \"<td class=\\\"no\\\">Failure<\/td>\");\n-\t\tfprintf(log_file, (result[i][1]) ? \"<td class=\\\"yes\\\">Success<\/td>\" : \"<td class=\\\"no\\\">Failure<\/td>\");\n-\t\tfprintf(log_file, \"<\/tr>\\n<\/table>\\n\");\n-\n-\t\tfor (j = 0; j < 2; j++)\n-\t\t\tfprintf(log_file, \"<pre id=\\\"log%d%c\\\" class=\\\"%s\\\" style=\\\"display: %s;\\\">%s<\/pre>\", i + 1, 'a' + j, (result[i][j]) ? \"success\" : \"failure\", \"block\"\/*display*\/, log[j]);\n-\n-\t\tfprintf(log_file, \"<\/div>\\n\");\n-\t\tfprintf(log_file, \"<hr \/>\\n\");\n+\n+\t\tfor (j = 0; j < 2; j++) {\n+\t\t\tfprintf(log_file, \"<td class=\\\"%s\\\"><a href=\\\"javascript:toggle('log%d%c');\\\">%s<\/a><\/td>\", (result[i][j]) ? \"yes\" : \"no\", i + 1, 'a' + j, (result[i][j]) ? \"Success\" : \"Failure\");\n+\t\t}\n+\n+\t\tfprintf(log_file, \"<\/tr>\\n\");\n+\n+\t\tfor (j = 0; j < 2; j++) {\n+\t\t\tconst char *class = (result[i][j]) ? \"yes\" : \"no\";\n+\t\t\tchar *tmp = htmlize(log[j]);\n+\n+\t\t\tfprintf(log_file, \"<tr>\\n<td colspan=\\\"9\\\" class=\\\"%s\\\">\\n<tt id=\\\"log%d%c\\\"%s>\\n%s\\n<\/tt>\\n<\/td>\\n<\/tr>\\n\", class, i + 1, 'a' + j, display, tmp);\n+\t\t\tfree(tmp);\n+\t\t}\n+\n \t\tfflush(log_file);\n \n \t\tfree(log[0]);\n@@ -682,6 +808,6 @@\n \n \tcleanup(0);\n \n-\treturn 0;\n-}\n-\n+\treturn exit_code;\n+}\n+\n"} {"commit":"ca895321cff98233eea5e021397e5fd4a0b248ba","subject":"flt: regularize node creation","message":"flt: regularize node creation\n\nJust use jive_opnode_create instead of domain-specific helpers.\n\nSigned-off-by: Nico Rei\u00dfmann <d8255cca0642bdc1e6f9b45da9cb618d308e389b@gmail.com>\n","repos":"phate\/jive,phate\/jive,phate\/jive","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/jive\/types\/float\/fltoperation-classes.h\n+++ include\/jive\/types\/float\/fltoperation-classes.h\n@@ -135,21 +135,7 @@\n \t\tsize_t narguments,\n \t\tjive::output * const arguments[]) const override\n \t{\n-\t\tjive_node * node = jive::create_operation_node(*this);\n-\n-\t\tconst jive::base::type * argument_types[2] = {\n-\t\t\t&argument_type(0),\n-\t\t};\n-\t\tconst jive::base::type * result_types[1] = {\n-\t\t\t&result_type(0)\n-\t\t};\n-\n-\t\tjive_node_init_(\n-\t\t\tnode, region,\n-\t\t\t1, argument_types, arguments,\n-\t\t\t1, result_types);\n-\n-\t\treturn node;\n+\t\treturn jive_opnode_create(*this, region, arguments, arguments + narguments);\n \t}\n \n \tstatic jive::output *\n@@ -200,22 +186,7 @@\n \t\tsize_t narguments,\n \t\tjive::output * const arguments[]) const override\n \t{\n-\t\tjive_node * node = jive::create_operation_node(*this);\n-\n-\t\tconst jive::base::type * argument_types[2] = {\n-\t\t\t&argument_type(0),\n-\t\t\t&argument_type(1)\n-\t\t};\n-\t\tconst jive::base::type * result_types[1] = {\n-\t\t\t&result_type(0)\n-\t\t};\n-\n-\t\tjive_node_init_(\n-\t\t\tnode, region,\n-\t\t\t2, argument_types, arguments,\n-\t\t\t1, result_types);\n-\n-\t\treturn node;\n+\t\treturn jive_opnode_create(*this, region, arguments, arguments + narguments);\n \t}\n \n \tstatic jive::output *\n@@ -275,22 +246,7 @@\n \t\tsize_t narguments,\n \t\tjive::output * const arguments[]) const override\n \t{\n-\t\tjive_node * node = jive::create_operation_node(*this);\n-\n-\t\tconst jive::base::type * argument_types[2] = {\n-\t\t\t&argument_type(0),\n-\t\t\t&argument_type(1)\n-\t\t};\n-\t\tconst jive::base::type * result_types[1] = {\n-\t\t\t&result_type(0)\n-\t\t};\n-\n-\t\tjive_node_init_(\n-\t\t\tnode, region,\n-\t\t\t2, argument_types, arguments,\n-\t\t\t1, result_types);\n-\n-\t\treturn node;\n+\t\treturn jive_opnode_create(*this, region, arguments, arguments + narguments);\n \t}\n \n \tstatic jive::output *\n"} {"commit":"d768f853bb05b5a49a2aeb5b5702776834e68d06","subject":"Coverity 1507372: explicit null dereference","message":"Coverity 1507372: explicit null dereference\n\nReviewed-by: Tomas Mraz <2bc6038c3dfca09b2da23c8b6da8ba884dc2dcc2@openssl.org>\nReviewed-by: Dmitry Belyavskiy <38c64d6e24766247aad56af3a6ddb0056ad36a44@gmail.com>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/18822)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/evp_extra_test2.c\n+++ test\/evp_extra_test2.c\n@@ -346,9 +346,8 @@\n && TEST_int_gt(EVP_PKEY_generate(gctx, &key), 0)\n && TEST_true(do_pkey_tofrom_data_select(key, \"DHX\"));\n # ifndef OPENSSL_NO_DEPRECATED_3_0\n- dhkey = EVP_PKEY_get0_DH(key);\n- ret = ret && TEST_ptr(dhkey);\n- ret = ret && TEST_ptr(privkey = DH_get0_priv_key(dhkey))\n+ ret = ret && TEST_ptr(dhkey = EVP_PKEY_get0_DH(key))\n+ && TEST_ptr(privkey = DH_get0_priv_key(dhkey))\n && TEST_int_le(BN_num_bits(privkey), 225);\n # endif\n EVP_PKEY_free(key);\n"} {"commit":"6042999aab26276ff87e7274b97b69200919b86f","subject":"Add vital comment to circuit breaker","message":"Add vital comment to circuit breaker\n","repos":"mje-nz\/PX4-Firmware,Aerotenna\/Firmware,darknight-007\/Firmware,dagar\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,dagar\/Firmware,krbeverx\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,krbeverx\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,dagar\/Firmware,acfloria\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,darknight-007\/Firmware,mcgill-robotics\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,darknight-007\/Firmware,PX4\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,darknight-007\/Firmware,acfloria\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,acfloria\/Firmware,acfloria\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,dagar\/Firmware,PX4\/Firmware,dagar\/Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,PX4\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,krbeverx\/Firmware,darknight-007\/Firmware,jlecoeur\/Firmware,mje-nz\/PX4-Firmware,mje-nz\/PX4-Firmware,dagar\/Firmware,krbeverx\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/systemlib\/circuit_breaker.h\n+++ src\/modules\/systemlib\/circuit_breaker.h\n@@ -40,6 +40,15 @@\n #ifndef CIRCUIT_BREAKER_H_\n #define CIRCUIT_BREAKER_H_\n \n+\/* SAFETY WARNING -- SAFETY WARNING -- SAFETY WARNING\n+ *\n+ * OBEY THE DOCUMENTATION FOR ALL CIRCUIT BREAKERS HERE,\n+ * ENSURE TO READ CAREFULLY ALL SAFETY WARNINGS.\n+ * http:\/\/pixhawk.org\/dev\/circuit_breakers\n+ *\n+ * CIRCUIT BREAKERS ARE NOT PART OF THE STANDARD OPERATION PROCEDURE\n+ * AND MAY DISABLE CHECKS THAT ARE VITAL FOR SAFE FLIGHT.\n+ *\/\n #define CBRK_SUPPLY_CHK_KEY\t894281\n #define CBRK_RATE_CTRL_KEY\t140253\n #define CBRK_IO_SAFETY_KEY\t22027\n"} {"commit":"c180d634413658e9b3978a8911bee2be2e2a2693","subject":"delete accidental systemlib\/param\/param_new.c","message":"delete accidental systemlib\/param\/param_new.c\n","repos":"acfloria\/Firmware,PX4\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,PX4\/Firmware,PX4\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,PX4\/Firmware,acfloria\/Firmware,PX4\/Firmware,PX4\/Firmware,PX4\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,krbeverx\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/systemlib\/param\/param_new.c\n+++ src\/modules\/systemlib\/param\/param_new.c\n@@ -1,1321 +0,0 @@\n-\/****************************************************************************\n- *\n- * Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * 1. Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * 2. Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and\/or other materials provided with the\n- * distribution.\n- * 3. Neither the name PX4 nor the names of its contributors may be\n- * used to endorse or promote products derived from this software\n- * without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS\n- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\n- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n- * POSSIBILITY OF SUCH DAMAGE.\n- *\n- ****************************************************************************\/\n-\n-\/**\n- * @file param.c\n- *\n- * Global parameter store.\n- *\n- * The implementation utilizes 2 arrays: a constant, auto-generated array\n- * with all parameters (param_info_base) and a dynamically resized array\n- * with non-default values (param_values). Both of them are sorted.\n- *\/\n-\n-\/\/#include <debug.h>\n-#include <px4_defines.h>\n-#include <px4_posix.h>\n-#include <px4_config.h>\n-#include <px4_spi.h>\n-#include <string.h>\n-#include <stdbool.h>\n-#include <float.h>\n-#include <stdlib.h>\n-#include <fcntl.h>\n-#include <unistd.h>\n-#include <systemlib\/err.h>\n-#include <errno.h>\n-#include <px4_atomic.h>\n-#include <px4_sem.h>\n-#include <math.h>\n-\n-#include <sys\/stat.h>\n-\n-#include <drivers\/drv_hrt.h>\n-\n-#include \"systemlib\/param\/param.h\"\n-#include \"systemlib\/uthash\/utarray.h\"\n-#include \"systemlib\/bson\/tinybson.h\"\n-\n-#if !defined(PARAM_NO_ORB)\n-# include \"uORB\/uORB.h\"\n-# include \"uORB\/topics\/parameter_update.h\"\n-#endif\n-\n-#if !defined(FLASH_BASED_PARAMS)\n-# define FLASH_PARAMS_EXPOSE\n-#else\n-# include \"systemlib\/flashparams\/flashparams.h\"\n-#endif\n-\n-#include \"px4_parameters.h\"\n-#include <crc32.h>\n-\n-\n-#if 0\n-# define debug(fmt, args...)\t\tdo { warnx(fmt, ##args); } while(0)\n-#else\n-# define debug(fmt, args...)\t\tdo { } while(0)\n-#endif\n-\n-#ifdef __PX4_QURT\n-#define PARAM_OPEN\tpx4_open\n-#define PARAM_CLOSE\tpx4_close\n-#else\n-#define PARAM_OPEN\topen\n-#define PARAM_CLOSE\tclose\n-#endif\n-\n-\/**\n- * Array of static parameter info.\n- *\/\n-#ifdef _UNIT_TEST\n-extern struct param_info_s\tparam_array[];\n-extern struct param_info_s\t*param_info_base;\n-extern struct param_info_s\t*param_info_limit;\n-#define param_info_count\t(param_info_limit - param_info_base)\n-#else\n-static const struct param_info_s *param_info_base = (const struct param_info_s *) &px4_parameters;\n-#define\tparam_info_count\t\tpx4_parameters.param_count\n-#endif \/* _UNIT_TEST *\/\n-\n-\/**\n- * Storage for modified parameters.\n- *\/\n-struct param_wbuf_s {\n-\tunion param_value_u\tval;\n-\tparam_t\t\t\tparam;\n-\tbool\t\t\tunsaved;\n-};\n-\n-\n-uint8_t *param_changed_storage = NULL;\n-int size_param_changed_storage_bytes = 0;\n-const int bits_per_allocation_unit = (sizeof(*param_changed_storage) * 8);\n-\n-\n-static inline unsigned\n-get_param_info_count(void)\n-{\n-\tif (!param_changed_storage) { \/\/ there was an allocation failure\n-\t\treturn 0;\n-\t}\n-\n-\treturn param_info_count;\n-}\n-\n-\/** flexible array holding modified parameter values. The first element is only used for\n- * the array size (stored in param). This simplifies atomic updates.\n- *\/\n-\/\/FLASH_PARAMS_EXPOSE UT_array *param_values; \/\/ TODO: change...\n-FLASH_PARAMS_EXPOSE atomic_ptr param_values = (atomic_ptr)NULL; \/\/\/< type is struct param_wbuf_s *\n-\n-\n-#if !defined(PARAM_NO_ORB)\n-\/** parameter update topic handle *\/\n-static orb_advert_t param_topic = NULL;\n-#endif\n-\n-static void param_set_used_internal(param_t param);\n-\n-static param_t param_find_internal(const char *name, bool notification);\n-\n-\/* parameter locking uses RCU: readers don't need to lock, they just increase an atomic counter\n- * for the duration of the access, which makes reading wait-free and thus very efficient.\n- * Writers use a semaphore to protect against concurrent writes. At the same time they need\n- * to ensure that a reader sees a consistent state at **all** times (to simplify this, there\n- * is only a single pointer that is updated (param_values) which is visible to the reader).\n- *\/\n-static px4_sem_t\n-param_sem_writer; \/\/\/< this protects against concurrent write access to param_values and param import\/export\n-static atomic_int param_reader_counter; \/\/\/< atomic counter which a reader increases during a read access.\n-\/\/\/< a non-zero counter signals a writer that the param_values array is still in use\n-\n-\/** lock the parameter store (write access) *\/\n-static void\n-param_lock_writer(void)\n-{\n-\tdo {} while (px4_sem_wait(¶m_sem_writer) != 0);\n-}\n-\n-\/** unlock the parameter store (write access) *\/\n-static void\n-param_unlock_writer(void)\n-{\n-\tpx4_sem_post(¶m_sem_writer);\n-}\n-\n-\/** assert that the parameter store is held by a reader *\/\n-static void\n-param_assert_locked_reader(void)\n-{\n-\t\/\/ TODO: debug only\n-\tint reader_counter = atomic_int_load(¶m_reader_counter);\n-\n-\tif (reader_counter <= 0) {\n-\t\t\/\/PX4_ERR(\"wrong reader counter!\");\n-\t\t\/\/ param show -c triggers this!\n-\t}\n-}\n-\n-void\n-param_init(void)\n-{\n-\tpx4_sem_init(¶m_sem_writer, 0, 1);\n-\tatomic_int_store(¶m_reader_counter, 0);\n-\n-\t\/* Singleton creation of an array of bits to track changed values *\/\n-\tsize_param_changed_storage_bytes = (param_info_count \/ bits_per_allocation_unit) + 1;\n-\tparam_changed_storage = calloc(size_param_changed_storage_bytes, 1);\n-}\n-\n-\/**\n- * Test whether a param_t is value.\n- *\n- * @param param\t\t\tThe parameter handle to test.\n- * @return\t\t\tTrue if the handle is valid.\n- *\/\n-static inline bool\n-handle_in_range(param_t param)\n-{\n-\tunsigned count = get_param_info_count();\n-\treturn (count && param < count);\n-}\n-\n-\/**\n- * Compare two modifid parameter structures to determine ordering.\n- *\n- * This function is suitable for passing to qsort or bsearch.\n- *\/\n-static int\n-param_compare_values(const void *a, const void *b)\n-{\n-\tstruct param_wbuf_s *pa = (struct param_wbuf_s *)a;\n-\tstruct param_wbuf_s *pb = (struct param_wbuf_s *)b;\n-\n-\tif (pa->param < pb->param) {\n-\t\treturn -1;\n-\t}\n-\n-\tif (pa->param > pb->param) {\n-\t\treturn 1;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-\/**\n- * Locate the modified parameter structure for a parameter, if it exists.\n- *\n- * @param param\t\t\tThe parameter being searched.\n- * @return\t\t\tThe structure holding the modified value, or\n- *\t\t\t\tNULL if the parameter has not been modified.\n- *\/\n-static struct param_wbuf_s *\n-param_find_changed(param_t param)\n-{\n-\tstruct param_wbuf_s\t*s = NULL;\n-\n-\tparam_assert_locked_reader();\n-\n-\tstruct param_wbuf_s *param_values_ptr = (struct param_wbuf_s *)atomic_ptr_load(¶m_values);\n-\n-\tif (param_values_ptr != NULL) {\n-\t\tstruct param_wbuf_s key;\n-\t\tkey.param = param;\n-\t\ts = bsearch(&key, param_values_ptr + 1, param_values_ptr[0].param, sizeof(struct param_wbuf_s), param_compare_values);\n-\t}\n-\n-\treturn s;\n-}\n-\n-static void\n-_param_notify_changes(bool is_saved)\n-{\n-#if !defined(PARAM_NO_ORB)\n-\tstruct parameter_update_s pup = {\n-\t\t.timestamp = hrt_absolute_time(),\n-\t\t.saved = is_saved\n-\t};\n-\n-\t\/*\n-\t * If we don't have a handle to our topic, create one now; otherwise\n-\t * just publish.\n-\t *\n-\t * We have a race condition here: it can happen that we call orb_advertise multiple times.\n-\t * But it will return the same handle, thus we can live with it.\n-\t *\/\n-\tif (param_topic == NULL) {\n-\t\tparam_topic = orb_advertise(ORB_ID(parameter_update), &pup);\n-\n-\t} else {\n-\t\torb_publish(ORB_ID(parameter_update), param_topic, &pup);\n-\t}\n-\n-#endif\n-}\n-\n-void\n-param_notify_changes(void)\n-{\n-\t_param_notify_changes(true);\n-}\n-\n-param_t\n-param_find_internal(const char *name, bool notification)\n-{\n-\tparam_t middle;\n-\tparam_t front = 0;\n-\tparam_t last = get_param_info_count();\n-\n-\t\/* perform a binary search of the known parameters *\/\n-\n-\twhile (front <= last) {\n-\t\tmiddle = front + (last - front) \/ 2;\n-\t\tint ret = strcmp(name, param_info_base[middle].name);\n-\n-\t\tif (ret == 0) {\n-\t\t\tif (notification) {\n-\t\t\t\tparam_set_used_internal(middle);\n-\t\t\t}\n-\n-\t\t\treturn middle;\n-\n-\t\t} else if (middle == front) {\n-\t\t\t\/* An end point has been hit, but there has been no match *\/\n-\t\t\tbreak;\n-\n-\t\t} else if (ret < 0) {\n-\t\t\tlast = middle;\n-\n-\t\t} else {\n-\t\t\tfront = middle;\n-\t\t}\n-\t}\n-\n-\t\/* not found *\/\n-\treturn PARAM_INVALID;\n-}\n-\n-param_t\n-param_find(const char *name)\n-{\n-\treturn param_find_internal(name, true);\n-}\n-\n-param_t\n-param_find_no_notification(const char *name)\n-{\n-\treturn param_find_internal(name, false);\n-}\n-\n-unsigned\n-param_count(void)\n-{\n-\treturn get_param_info_count();\n-}\n-\n-unsigned\n-param_count_used(void)\n-{\n-\tunsigned count = 0;\n-\n-\t\/\/ ensure the allocation has been done\n-\tif (get_param_info_count()) {\n-\n-\t\tfor (unsigned i = 0; i < size_param_changed_storage_bytes; i++) {\n-\t\t\tfor (unsigned j = 0; j < bits_per_allocation_unit; j++) {\n-\t\t\t\tif (param_changed_storage[i] & (1 << j)) {\n-\t\t\t\t\tcount++;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn count;\n-}\n-\n-param_t\n-param_for_index(unsigned index)\n-{\n-\tunsigned count = get_param_info_count();\n-\n-\tif (count && index < count) {\n-\t\treturn (param_t)index;\n-\t}\n-\n-\treturn PARAM_INVALID;\n-}\n-\n-param_t\n-param_for_used_index(unsigned index)\n-{\n-\tint count = get_param_info_count();\n-\n-\tif (count && index < count) {\n-\t\t\/* walk all params and count used params *\/\n-\t\tunsigned used_count = 0;\n-\n-\t\tfor (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) {\n-\t\t\tfor (unsigned j = 0; j < bits_per_allocation_unit; j++) {\n-\t\t\t\tif (param_changed_storage[i] & (1 << j)) {\n-\n-\t\t\t\t\t\/* we found the right used count,\n-\t\t\t\t\t * return the param value\n-\t\t\t\t\t *\/\n-\t\t\t\t\tif (index == used_count) {\n-\t\t\t\t\t\treturn (param_t)(i * bits_per_allocation_unit + j);\n-\t\t\t\t\t}\n-\n-\t\t\t\t\tused_count++;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn PARAM_INVALID;\n-}\n-\n-int\n-param_get_index(param_t param)\n-{\n-\tif (handle_in_range(param)) {\n-\t\treturn (unsigned)param;\n-\t}\n-\n-\treturn -1;\n-}\n-\n-int\n-param_get_used_index(param_t param)\n-{\n-\t\/* this tests for out of bounds and does a constant time lookup *\/\n-\tif (!param_used(param)) {\n-\t\treturn -1;\n-\t}\n-\n-\t\/* walk all params and count, now knowing that it has a valid index *\/\n-\tint used_count = 0;\n-\n-\tfor (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) {\n-\t\tfor (unsigned j = 0; j < bits_per_allocation_unit; j++) {\n-\t\t\tif (param_changed_storage[i] & (1 << j)) {\n-\n-\t\t\t\tif ((unsigned)param == i * bits_per_allocation_unit + j) {\n-\t\t\t\t\treturn used_count;\n-\t\t\t\t}\n-\n-\t\t\t\tused_count++;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn -1;\n-}\n-\n-const char *\n-param_name(param_t param)\n-{\n-\treturn handle_in_range(param) ? param_info_base[param].name : NULL;\n-}\n-\n-bool\n-param_value_is_default(param_t param)\n-{\n-\tstruct param_wbuf_s *s;\n-\tatomic_int_fetch_and_add(¶m_reader_counter, 1);\n-\ts = param_find_changed(param);\n-\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\treturn s ? false : true;\n-}\n-\n-bool\n-param_value_unsaved(param_t param)\n-{\n-\tstruct param_wbuf_s *s;\n-\tatomic_int_fetch_and_add(¶m_reader_counter, 1);\n-\ts = param_find_changed(param);\n-\tbool ret = s && s->unsaved;\n-\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\treturn ret;\n-}\n-\n-enum param_type_e\n-param_type(param_t param) {\n-\treturn handle_in_range(param) ? param_info_base[param].type : PARAM_TYPE_UNKNOWN;\n-}\n-\n-size_t\n-param_size(param_t param)\n-{\n-\tif (handle_in_range(param)) {\n-\n-\t\tswitch (param_type(param)) {\n-\n-\t\tcase PARAM_TYPE_INT32:\n-\t\tcase PARAM_TYPE_FLOAT:\n-\t\t\treturn 4;\n-\n-\t\tcase PARAM_TYPE_STRUCT ... PARAM_TYPE_STRUCT_MAX:\n-\t\t\t\/* decode structure size from type value *\/\n-\t\t\treturn param_type(param) - PARAM_TYPE_STRUCT;\n-\n-\t\tdefault:\n-\t\t\treturn 0;\n-\t\t}\n-\t}\n-\n-\treturn 0;\n-}\n-\n-\n-\/**\n- * Obtain a pointer to the storage allocated for a parameter.\n- *\n- * @param param\t\t\tThe parameter whose storage is sought.\n- * @return\t\t\tA pointer to the parameter value, or NULL\n- *\t\t\t\tif the parameter does not exist.\n- *\/\n-static const void *\n-param_get_value_ptr(param_t param)\n-{\n-\tconst void *result = NULL;\n-\n-\tparam_assert_locked_reader();\n-\n-\tif (handle_in_range(param)) {\n-\n-\t\tconst union param_value_u *v;\n-\n-\t\t\/* work out whether we're fetching the default or a written value *\/\n-\t\tstruct param_wbuf_s *s = param_find_changed(param);\n-\n-\t\tif (s != NULL) {\n-\t\t\tv = &s->val;\n-\n-\t\t} else {\n-\t\t\tv = ¶m_info_base[param].val;\n-\t\t}\n-\n-\t\tif (param_type(param) >= PARAM_TYPE_STRUCT &&\n-\t\t param_type(param) <= PARAM_TYPE_STRUCT_MAX) {\n-\n-\t\t\tresult = v->p;\n-\n-\t\t} else {\n-\t\t\tresult = v;\n-\t\t}\n-\t}\n-\n-\treturn result;\n-}\n-\n-int\n-param_get(param_t param, void *val)\n-{\n-\tint result = -1;\n-\n-\tatomic_int_fetch_and_add(¶m_reader_counter, 1);\n-\n-\tconst void *v = param_get_value_ptr(param);\n-\n-\tif (val && v) {\n-\t\tmemcpy(val, v, param_size(param));\n-\t\tresult = 0;\n-\t}\n-\n-\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\n-\treturn result;\n-}\n-\n-static int\n-param_set_internal(param_t param, const void *val, bool mark_saved, bool notify_changes, bool is_saved)\n-{\n-\tint result = -1;\n-\tbool params_changed = false;\n-\n-\tparam_lock_writer();\n-\n-\tif (handle_in_range(param)) {\n-\n-\t\tatomic_int_fetch_and_add(¶m_reader_counter, 1); \/\/ only needed for the assertion...\n-\t\tstruct param_wbuf_s *s = param_find_changed(param);\n-\t\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\n-\t\tif (s == NULL) {\n-\n-\t\t\tparams_changed = true;\n-\n-\t\t\t\/\/ the following is tricky: we need to insert a new element into a sorted array,\n-\t\t\t\/\/ and guarantee that readers see a consistent state at all times.\n-\t\t\t\/\/ This is where RCU comes into play: we do that by making a copy of the array,\n-\t\t\t\/\/ update the copy, then atomically replace the array. Finally we wait until we\n-\t\t\t\/\/ are sure that no reader accesses the previous array, so that it's safe to delete it.\n-\n-\t\t\tstruct param_wbuf_s *param_values_ptr = (struct param_wbuf_s *)atomic_ptr_load(¶m_values);\n-\t\t\tint prev_param_count = 0;\n-\n-\t\t\tif (param_values_ptr) {\n-\t\t\t\tprev_param_count = param_values_ptr[0].param;\n-\t\t\t}\n-\n-\t\t\tstruct param_wbuf_s *new_param_values = (struct param_wbuf_s *)malloc(sizeof(struct param_wbuf_s) *\n-\t\t\t\t\t\t\t\t(prev_param_count + 2));\n-\n-\t\t\tif (new_param_values == NULL) {\n-\t\t\t\tPX4_ERR(\"alloc failed\");\n-\t\t\t\tgoto out;\n-\t\t\t}\n-\n-\t\t\tif (param_values_ptr) {\n-\t\t\t\tmemcpy(new_param_values, param_values_ptr, sizeof(struct param_wbuf_s) * (prev_param_count + 1));\n-\t\t\t}\n-\n-\t\t\tnew_param_values[0].param = prev_param_count + 1; \/\/ update the count\n-\n-\t\t\t\/\/ add the new element\n-\t\t\tint new_element_index = prev_param_count + 1;\n-\t\t\tnew_param_values[new_element_index].param = param;\n-\t\t\tnew_param_values[new_element_index].val.p = NULL;\n-\t\t\tnew_param_values[new_element_index].unsaved = false;\n-\n-\t\t\t\/\/ move it to the correct place by swapping neighbors (the rest of the array is already sorted)\n-\t\t\twhile (new_element_index > 1 &&\n-\t\t\t param_compare_values(&new_param_values[new_element_index - 1], &new_param_values[new_element_index]) == 1) {\n-\t\t\t\tstruct param_wbuf_s tmp;\n-\t\t\t\tmemcpy(&tmp, &new_param_values[new_element_index], sizeof(struct param_wbuf_s));\n-\t\t\t\tmemcpy(&new_param_values[new_element_index], &new_param_values[new_element_index - 1], sizeof(struct param_wbuf_s));\n-\t\t\t\tmemcpy(&new_param_values[new_element_index - 1], &tmp, sizeof(struct param_wbuf_s));\n-\t\t\t\t\/\/ TODO: only a single memcpy (keep separate new element buffer. test with param set CBRK_BUZZER ...\n-\t\t\t\t--new_element_index;\n-\t\t\t}\n-\n-\t\t\ts = &new_param_values[new_element_index];\n-\n-#if 1 \/\/ debug: check correctness of ordering\n-\n-\t\t\tfor (int test_index = 0; test_index < new_param_values[0].param - 1; ++test_index) {\n-\t\t\t\tif (new_param_values[test_index + 1].param >= new_param_values[test_index + 2].param) {\n-\t\t\t\t\tPX4_ERR(\"wrong order (%i %i)\", (int)new_param_values[test_index + 1].param,\n-\t\t\t\t\t\t(int)new_param_values[test_index + 2].param);\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif (s->param != param) {\n-\t\t\t\tPX4_ERR(\"s is set wrong\");\n-\t\t\t}\n-\n-#endif\n-\n-\n-\t\t\t\/* add it to the array and sort *\/\n-\/\/\t\t\tutarray_push_back(param_values, &buf);\n-\/\/\t\t\tutarray_sort(param_values, param_compare_values); \/\/ inefficient: N log N\n-\t\t\t\/\/ qsort((param_values)->d = base pointer, (param_values)->i = num elements, sizeof(struct param_wbuf_s), param_compare_values);\n-\n-\t\t\t\/* find it after sorting *\/\n-\/\/\t\t\ts = param_find_changed(param); \/\/inefficient too...\n-\n-\n-\n-\t\t\t\/\/ the order is important: first apply the new parameter array to make it visible to new readers.\n-\t\t\t\/\/ then wait until there is no reader, which means it's safe to delete the previous array.\n-\t\t\tatomic_ptr_store(¶m_values, new_param_values);\n-\n-\t\t\tif (param_values_ptr) {\n-\t\t\t\twhile (atomic_int_load(¶m_reader_counter) > 0) {\n-\t\t\t\t\t\/\/ usually we don't get here, since reader accesses are quick and do not happen that often.\n-\t\t\t\t\tusleep(1);\n-\t\t\t\t}\n-\n-\t\t\t\tfree(param_values_ptr);\n-\t\t\t}\n-\n-\t\t}\n-\n-\t\t\/* update the changed value *\/\n-\t\tswitch (param_type(param)) {\n-\n-\t\tcase PARAM_TYPE_INT32:\n-\t\t\tparams_changed = params_changed || s->val.i != *(int32_t *)val;\n-\t\t\ts->val.i = *(int32_t *)val; \/\/ TODO: this should be atomic (atomic read above too)\n-\t\t\t\/\/\/ -> change the type\n-\t\t\t\/\/ http:\/\/stackoverflow.com\/questions\/35226128\/are-c-c-fundamental-types-atomic\n-\t\t\tbreak;\n-\n-\t\tcase PARAM_TYPE_FLOAT:\n-\t\t\tparams_changed = params_changed || fabsf(s->val.f - * (float *)val) > FLT_EPSILON;\n-\t\t\ts->val.f = *(float *)val;\n-\t\t\t\/\/ need assert: sizeof(float) == sizeof(int32) ?\n-\t\t\tbreak;\n-\n-\t\tcase PARAM_TYPE_STRUCT ... PARAM_TYPE_STRUCT_MAX:\n-\t\t\tif (s->val.p == NULL) {\n-\t\t\t\ts->val.p = malloc(param_size(param));\n-\n-\t\t\t\tif (s->val.p == NULL) {\n-\t\t\t\t\tdebug(\"failed to allocate parameter storage\");\n-\t\t\t\t\tgoto out;\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\t\/\/ FIXME: this update is not atomic. we could do the memcpy into a separate buffer and then\n-\t\t\t\/\/ atomically replace the pointer. But since PARAM_TYPE_STRUCT is not used currently, we leave\n-\t\t\t\/\/ it as is.\n-\t\t\tmemcpy(s->val.p, val, param_size(param));\n-\t\t\tparams_changed = true;\n-\t\t\tbreak;\n-\n-\t\tdefault:\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\ts->unsaved = !mark_saved;\n-\t\tresult = 0;\n-\t}\n-\n-out:\n-\tparam_unlock_writer();\n-\n-\t\/*\n-\t * If we set something, now that we have unlocked, go ahead and advertise that\n-\t * a thing has been set.\n-\t *\/\n-\tif (params_changed && notify_changes) {\n-\t\t_param_notify_changes(is_saved);\n-\t}\n-\n-\treturn result;\n-}\n-\n-#if defined(FLASH_BASED_PARAMS)\n-int param_set_external(param_t param, const void *val, bool mark_saved, bool notify_changes, bool is_saved)\n-{\n-\treturn param_set_internal(param, val, mark_saved, notify_changes, is_saved);\n-}\n-\n-const void *param_get_value_ptr_external(param_t param)\n-{\n-\treturn param_get_value_ptr(param);\n-}\n-#endif\n-\n-int\n-param_set(param_t param, const void *val)\n-{\n-\treturn param_set_internal(param, val, false, true, false);\n-}\n-\n-int\n-param_set_no_autosave(param_t param, const void *val)\n-{\n-\treturn param_set_internal(param, val, false, true, true);\n-}\n-\n-int\n-param_set_no_notification(param_t param, const void *val)\n-{\n-\treturn param_set_internal(param, val, false, false, false);\n-}\n-\n-bool\n-param_used(param_t param)\n-{\n-\tint param_index = param_get_index(param);\n-\n-\tif (param_index < 0) {\n-\t\treturn false;\n-\t}\n-\n-\treturn param_changed_storage[param_index \/ bits_per_allocation_unit] &\n-\t (1 << param_index % bits_per_allocation_unit);\n-}\n-\n-void param_set_used_internal(param_t param)\n-{\n-\tint param_index = param_get_index(param);\n-\n-\tif (param_index < 0) {\n-\t\treturn;\n-\t}\n-\n-\t\/\/ TODO: atomic...\n-\tparam_changed_storage[param_index \/ bits_per_allocation_unit] |=\n-\t\t(1 << param_index % bits_per_allocation_unit);\n-}\n-\n-int\n-param_reset(param_t param)\n-{\n-\tstruct param_wbuf_s *s = NULL;\n-\tbool param_found = false;\n-\n-\tparam_lock_writer();\n-\n-\tif (handle_in_range(param)) {\n-\n-\t\t\/* look for a saved value *\/\n-\t\tatomic_int_fetch_and_add(¶m_reader_counter, 1); \/\/ only needed for the assertion...\n-\t\ts = param_find_changed(param);\n-\t\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\n-\t\t\/\/ TODO: RCU\n-\t\t\/* if we found one, erase it *\/\n-\t\tif (s != NULL) {\n-\t\t\t\/\/int pos = utarray_eltidx(param_values, s);\n-\t\t\t\/\/utarray_erase(param_values, pos, 1);\n-\t\t\t\/\/ -> use memmove\n-\t\t}\n-\n-\t\tparam_found = true;\n-\t}\n-\n-\tparam_unlock_writer();\n-\n-\tif (s != NULL) {\n-\t\t_param_notify_changes(false);\n-\t}\n-\n-\treturn (!param_found);\n-}\n-\n-void\n-param_reset_all(void)\n-{\n-\tparam_lock_writer();\n-\n-\tstruct param_wbuf_s *param_values_ptr = (struct param_wbuf_s *)atomic_ptr_load(¶m_values);\n-\n-\tif (param_values_ptr != NULL) {\n-\t\tatomic_ptr_store(¶m_values, NULL);\n-\n-\t\t\/\/ TODO: create a method...\n-\t\twhile (atomic_int_load(¶m_reader_counter) > 0) {\n-\t\t\t\/\/ usually we don't get here, since reader accesses are quick and do not happen that often.\n-\t\t\tusleep(1);\n-\t\t}\n-\n-\t\tfree(param_values_ptr);\n-\t}\n-\n-\tparam_unlock_writer();\n-\n-\t_param_notify_changes(false);\n-}\n-\n-void\n-param_reset_excludes(const char *excludes[], int num_excludes)\n-{\n-\tparam_t\tparam;\n-\n-\tfor (param = 0; handle_in_range(param); param++) {\n-\t\tconst char *name = param_name(param);\n-\t\tbool exclude = false;\n-\n-\t\tfor (int index = 0; index < num_excludes; index ++) {\n-\t\t\tint len = strlen(excludes[index]);\n-\n-\t\t\tif ((excludes[index][len - 1] == '*'\n-\t\t\t && strncmp(name, excludes[index], len - 1) == 0)\n-\t\t\t || strcmp(name, excludes[index]) == 0) {\n-\t\t\t\texclude = true;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (!exclude) {\n-\t\t\tparam_reset(param);\n-\t\t}\n-\t}\n-\n-\t_param_notify_changes(false);\n-}\n-\n-static const char *param_default_file = PX4_ROOTFSDIR\"\/eeprom\/parameters\";\n-static char *param_user_file = NULL;\n-\n-int\n-param_set_default_file(const char *filename)\n-{\n-\tif (param_user_file != NULL) {\n-\t\t\/\/ we assume this is not in use by some other thread\n-\t\tfree(param_user_file);\n-\t\tparam_user_file = NULL;\n-\t}\n-\n-\tif (filename) {\n-\t\tparam_user_file = strdup(filename);\n-\t}\n-\n-\treturn 0;\n-}\n-\n-const char *\n-param_get_default_file(void)\n-{\n-\treturn (param_user_file != NULL) ? param_user_file : param_default_file;\n-}\n-\n-int\n-param_save_default(void)\n-{\n-\tint res;\n-#if !defined(FLASH_BASED_PARAMS)\n-\tint fd;\n-\n-\tconst char *filename = param_get_default_file();\n-\n-\t\/* write parameters to temp file *\/\n-\tfd = PARAM_OPEN(filename, O_WRONLY | O_CREAT, PX4_O_MODE_666);\n-\n-\tif (fd < 0) {\n-\t\twarn(\"failed to open param file: %s\", filename);\n-\t\treturn ERROR;\n-\t}\n-\n-\tres = 1;\n-\tint attempts = 5;\n-\n-\twhile (res != OK && attempts > 0) {\n-\t\tres = param_export(fd, false);\n-\t\tattempts--;\n-\t}\n-\n-\tif (res != OK) {\n-\t\twarnx(\"failed to write parameters to file: %s\", filename);\n-\t}\n-\n-\tPARAM_CLOSE(fd);\n-#else\n-\tparam_lock_writer();\n-\tres = flash_param_save();\n-\tparam_unlock_writer();\n-#endif\n-\treturn res;\n-}\n-\n-\/**\n- * @return 0 on success, 1 if all params have not yet been stored, -1 if device open failed, -2 if writing parameters failed\n- *\/\n-int\n-param_load_default(void)\n-{\n-\tint res = 0;\n-#if !defined(FLASH_BASED_PARAMS)\n-\tint fd_load = PARAM_OPEN(param_get_default_file(), O_RDONLY);\n-\n-\tif (fd_load < 0) {\n-\t\t\/* no parameter file is OK, otherwise this is an error *\/\n-\t\tif (errno != ENOENT) {\n-\t\t\twarn(\"open '%s' for reading failed\", param_get_default_file());\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\treturn 1;\n-\t}\n-\n-\tint result = param_load(fd_load);\n-\tPARAM_CLOSE(fd_load);\n-\n-\tif (result != 0) {\n-\t\twarn(\"error reading parameters from '%s'\", param_get_default_file());\n-\t\treturn -2;\n-\t}\n-\n-#else\n-\t\/\/ no need for locking\n-\tres = flash_param_load();\n-#endif\n-\treturn res;\n-}\n-\n-static void\n-param_bus_lock(bool lock)\n-{\n-\n-#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4)\n-\n-\t\/\/ FMUv4 has baro and FRAM on the same bus,\n-\t\/\/ as this offers on average a 100% silent\n-\t\/\/ bus for the baro operation\n-\n-\t\/\/ XXX this would be the preferred locking method\n-\t\/\/ if (dev == nullptr) {\n-\t\/\/ \tdev = px4_spibus_initialize(PX4_SPI_BUS_BARO);\n-\t\/\/ }\n-\n-\t\/\/ SPI_LOCK(dev, lock);\n-\n-\t\/\/ we lock like this for Pixracer for now\n-\n-\tstatic irqstate_t irq_state = 0;\n-\n-\tif (lock) {\n-\t\tirq_state = px4_enter_critical_section();\n-\n-\t} else {\n-\t\tpx4_leave_critical_section(irq_state);\n-\t}\n-\n-#endif\n-}\n-\n-int\n-param_export(int fd, bool only_unsaved)\n-{\n-\tstruct param_wbuf_s *s = NULL;\n-\tstruct bson_encoder_s encoder;\n-\tint\tresult = -1;\n-\n-\tparam_lock_writer();\n-\n-\tparam_bus_lock(true);\n-\tbson_encoder_init_file(&encoder, fd);\n-\tparam_bus_lock(false);\n-\n-\tstruct param_wbuf_s *param_values_ptr = (struct param_wbuf_s *)atomic_ptr_load(¶m_values);\n-\n-\t\/* no modified parameters -> we are done *\/\n-\tif (param_values_ptr == NULL) {\n-\t\tresult = 0;\n-\t\tgoto out;\n-\t}\n-\n-\tfor (int param_idx = 0; param_idx < param_values_ptr[0].param; ++param_idx) {\n-\t\ts = ¶m_values_ptr[param_idx + 1];\n-\n-\t\tint32_t\ti;\n-\t\tfloat\tf;\n-\n-\t\t\/*\n-\t\t * If we are only saving values changed since last save, and this\n-\t\t * one hasn't, then skip it\n-\t\t *\/\n-\t\tif (only_unsaved && !s->unsaved) {\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\ts->unsaved = false;\n-\n-\t\t\/* append the appropriate BSON type object *\/\n-\n-\n-\t\tswitch (param_type(s->param)) {\n-\n-\t\tcase PARAM_TYPE_INT32: {\n-\t\t\t\ti = s->val.i;\n-\t\t\t\tconst char *name = param_name(s->param);\n-\n-\t\t\t\t\/* lock as short as possible *\/\n-\t\t\t\tparam_bus_lock(true);\n-\n-\t\t\t\tif (bson_encoder_append_int(&encoder, name, i)) {\n-\t\t\t\t\tparam_bus_lock(false);\n-\t\t\t\t\tdebug(\"BSON append failed for '%s'\", name);\n-\t\t\t\t\tgoto out;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\n-\t\tcase PARAM_TYPE_FLOAT: {\n-\n-\t\t\t\tf = s->val.f;\n-\t\t\t\tconst char *name = param_name(s->param);\n-\n-\t\t\t\t\/* lock as short as possible *\/\n-\t\t\t\tparam_bus_lock(true);\n-\n-\t\t\t\tif (bson_encoder_append_double(&encoder, name, f)) {\n-\t\t\t\t\tparam_bus_lock(false);\n-\t\t\t\t\tdebug(\"BSON append failed for '%s'\", name);\n-\t\t\t\t\tgoto out;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\n-\t\tcase PARAM_TYPE_STRUCT ... PARAM_TYPE_STRUCT_MAX: {\n-\n-\t\t\t\tconst char *name = param_name(s->param);\n-\t\t\t\tconst size_t size = param_size(s->param);\n-\t\t\t\tconst void *value_ptr = param_get_value_ptr(s->param);\n-\n-\t\t\t\t\/* lock as short as possible *\/\n-\t\t\t\tparam_bus_lock(true);\n-\n-\t\t\t\tif (bson_encoder_append_binary(&encoder,\n-\t\t\t\t\t\t\t name,\n-\t\t\t\t\t\t\t BSON_BIN_BINARY,\n-\t\t\t\t\t\t\t size,\n-\t\t\t\t\t\t\t value_ptr)) {\n-\t\t\t\t\tparam_bus_lock(false);\n-\t\t\t\t\tdebug(\"BSON append failed for '%s'\", name);\n-\t\t\t\t\tgoto out;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\n-\t\tdefault:\n-\t\t\tdebug(\"unrecognized parameter type\");\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tparam_bus_lock(false);\n-\n-\t\t\/* allow this process to be interrupted by another process \/ thread *\/\n-\t\tusleep(5);\n-\t}\n-\n-\tresult = 0;\n-\n-out:\n-\tparam_unlock_writer();\n-\n-\tif (result == 0) {\n-\t\tresult = bson_encoder_fini(&encoder);\n-\t}\n-\n-\treturn result;\n-}\n-\n-struct param_import_state {\n-\tbool mark_saved;\n-};\n-\n-static int\n-param_import_callback(bson_decoder_t decoder, void *private, bson_node_t node)\n-{\n-\tfloat f;\n-\tint32_t i;\n-\tvoid *v, *tmp = NULL;\n-\tint result = -1;\n-\tstruct param_import_state *state = (struct param_import_state *)private;\n-\n-\t\/*\n-\t * EOO means the end of the parameter object. (Currently not supporting\n-\t * nested BSON objects).\n-\t *\/\n-\tif (node->type == BSON_EOO) {\n-\t\tdebug(\"end of parameters\");\n-\t\treturn 0;\n-\t}\n-\n-\t\/*\n-\t * Find the parameter this node represents. If we don't know it,\n-\t * ignore the node.\n-\t *\/\n-\tparam_t param = param_find_no_notification(node->name);\n-\n-\tif (param == PARAM_INVALID) {\n-\t\tdebug(\"ignoring unrecognised parameter '%s'\", node->name);\n-\t\treturn 1;\n-\t}\n-\n-\t\/*\n-\t * Handle setting the parameter from the node\n-\t *\/\n-\n-\tswitch (node->type) {\n-\tcase BSON_INT32:\n-\t\tif (param_type(param) != PARAM_TYPE_INT32) {\n-\t\t\tdebug(\"unexpected type for '%s\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\ti = node->i;\n-\t\tv = &i;\n-\t\tbreak;\n-\n-\tcase BSON_DOUBLE:\n-\t\tif (param_type(param) != PARAM_TYPE_FLOAT) {\n-\t\t\tdebug(\"unexpected type for '%s\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tf = node->d;\n-\t\tv = &f;\n-\t\tbreak;\n-\n-\tcase BSON_BINDATA:\n-\t\tif (node->subtype != BSON_BIN_BINARY) {\n-\t\t\tdebug(\"unexpected subtype for '%s\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tif (bson_decoder_data_pending(decoder) != param_size(param)) {\n-\t\t\tdebug(\"bad size for '%s'\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\t\/* XXX check actual file data size? *\/\n-\t\ttmp = malloc(param_size(param));\n-\n-\t\tif (tmp == NULL) {\n-\t\t\tdebug(\"failed allocating for '%s'\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tif (bson_decoder_copy_data(decoder, tmp)) {\n-\t\t\tdebug(\"failed copying data for '%s'\", node->name);\n-\t\t\tgoto out;\n-\t\t}\n-\n-\t\tv = tmp;\n-\t\tbreak;\n-\n-\tdefault:\n-\t\tdebug(\"unrecognised node type\");\n-\t\tgoto out;\n-\t}\n-\n-\tif (param_set_internal(param, v, state->mark_saved, true, false)) {\n-\t\tdebug(\"error setting value for '%s'\", node->name);\n-\t\tgoto out;\n-\t}\n-\n-\tif (tmp != NULL) {\n-\t\tfree(tmp);\n-\t\ttmp = NULL;\n-\t}\n-\n-\t\/* don't return zero, that means EOF *\/\n-\tresult = 1;\n-\n-out:\n-\n-\tif (tmp != NULL) {\n-\t\tfree(tmp);\n-\t}\n-\n-\treturn result;\n-}\n-\n-static int\n-param_import_internal(int fd, bool mark_saved)\n-{\n-\tstruct bson_decoder_s decoder;\n-\tint result = -1;\n-\tstruct param_import_state state;\n-\thrt_abstime t = hrt_absolute_time();\n-\n-\tparam_bus_lock(true);\n-\n-\tif (bson_decoder_init_file(&decoder, fd, param_import_callback, &state)) {\n-\t\tdebug(\"decoder init failed\");\n-\t\tparam_bus_lock(false);\n-\t\tgoto out;\n-\t}\n-\n-\tparam_bus_lock(false);\n-\n-\tstate.mark_saved = mark_saved;\n-\n-\tdo {\n-\t\tparam_bus_lock(true);\n-\t\tresult = bson_decoder_next(&decoder);\n-\t\t\/\/usleep(1);\n-\t\tparam_bus_lock(false);\n-\n-\t} while (result > 0);\n-\n-out:\n-\n-\tPX4_WARN(\"load took: %i us -- ---------------\", (int)hrt_elapsed_time(&t));\n-\n-\tif (result < 0) {\n-\t\tdebug(\"BSON error decoding parameters\");\n-\t}\n-\n-\treturn result;\n-}\n-\n-int\n-param_import(int fd)\n-{\n-#if !defined(FLASH_BASED_PARAMS)\n-\treturn param_import_internal(fd, false);\n-#else\n-\t(void)fd; \/\/ unused\n-\t\/\/ no need for locking here\n-\treturn flash_param_import();\n-#endif\n-}\n-\n-int\n-param_load(int fd)\n-{\n-\tparam_reset_all();\n-\treturn param_import_internal(fd, true);\n-}\n-\n-void\n-param_foreach(void (*func)(void *arg, param_t param), void *arg, bool only_changed, bool only_used)\n-{\n-\tparam_t\tparam;\n-\n-\tfor (param = 0; handle_in_range(param); param++) {\n-\n-\t\t\/* if requested, skip unchanged values *\/\n-\t\tif (only_changed && (param_find_changed(param) == NULL)) {\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tif (only_used && !param_used(param)) {\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tfunc(arg, param);\n-\t}\n-}\n-\n-uint32_t param_hash_check(void)\n-{\n-\tuint32_t param_hash = 0;\n-\n-\tatomic_int_fetch_and_add(¶m_reader_counter, 1);\n-\n-\t\/* compute the CRC32 over all string param names and 4 byte values *\/\n-\tfor (param_t param = 0; handle_in_range(param); param++) {\n-\t\tif (!param_used(param)) {\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tconst char *name = param_name(param);\n-\t\tconst void *val = param_get_value_ptr(param);\n-\t\tparam_hash = crc32part((const uint8_t *)name, strlen(name), param_hash);\n-\t\tparam_hash = crc32part(val, param_size(param), param_hash);\n-\t}\n-\n-\tatomic_int_fetch_and_sub(¶m_reader_counter, 1);\n-\n-\treturn param_hash;\n-}\n"} {"commit":"2f622174bf863563ed17aa9d298978bf88af75ce","subject":"app\/testpmd: support query of age action","message":"app\/testpmd: support query of age action\n\nFollowing ethdev update in the previous patch of this series, this\npatch adds CLI support to query information related to AGE action.\n\nSigned-off-by: Dekel Peled <f1921780d3213ef78965aec36396441d9bf8894c@nvidia.com>\nAcked-by: Matan Azrad <6969f5f553ad7652679a585a85d7321babc90464@nvidia.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- app\/test-pmd\/config.c\n+++ app\/test-pmd\/config.c\n@@ -1835,6 +1835,7 @@\n \tunion {\n \t\tstruct rte_flow_query_count count;\n \t\tstruct rte_flow_action_rss rss_conf;\n+\t\tstruct rte_flow_query_age age;\n \t} query;\n \tint ret;\n \n@@ -1857,6 +1858,7 @@\n \tswitch (action->type) {\n \tcase RTE_FLOW_ACTION_TYPE_COUNT:\n \tcase RTE_FLOW_ACTION_TYPE_RSS:\n+\tcase RTE_FLOW_ACTION_TYPE_AGE:\n \t\tbreak;\n \tdefault:\n \t\tprintf(\"Cannot query action type %d (%s)\\n\",\n@@ -1883,6 +1885,16 @@\n \t\tbreak;\n \tcase RTE_FLOW_ACTION_TYPE_RSS:\n \t\trss_config_display(&query.rss_conf);\n+\t\tbreak;\n+\tcase RTE_FLOW_ACTION_TYPE_AGE:\n+\t\tprintf(\"%s:\\n\"\n+\t\t \" aged: %u\\n\"\n+\t\t \" sec_since_last_hit_valid: %u\\n\"\n+\t\t \" sec_since_last_hit: %\" PRIu32 \"\\n\",\n+\t\t name,\n+\t\t query.age.aged,\n+\t\t query.age.sec_since_last_hit_valid,\n+\t\t query.age.sec_since_last_hit);\n \t\tbreak;\n \tdefault:\n \t\tprintf(\"Cannot display result for action type %d (%s)\\n\",\n"} {"commit":"5c0043720567f17aca41625797c713c3b8aa3a6d","subject":"Removed stray comments from region.h","message":"Removed stray comments from region.h\n","repos":"jcowgill\/chaff","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/include\/mm\/region.h\n+++ kernel\/include\/mm\/region.h\n@@ -146,12 +146,6 @@\n *\/\n void MemContextDeleteReference(MemContext * context);\n \n-\n-\/\/Creates a new blank memory region\n-\/\/ If the context given is not the current or kernel context,\n-\/\/ a temporary memory context switch may occur\n-\/\/ The start address MUST be page aligned\n-\n \/**\n * Creates a new blank memory region\n *\n@@ -183,9 +177,6 @@\n *\/\n void MemRegionFreePages(MemRegion * region, void * address, unsigned int length);\n \n-\/\/Finds the region which contains the given address\n-\/\/ or returns NULL if there isn't one\n-\n \/**\n * Finds the region which contains the given address\n *\n"} {"commit":"9ff22ee49210c04a4f06f6da034360948dab409a","subject":"Add a method to TreeNode to return total number of nodes in a subtree.","message":"Add a method to TreeNode to return total number of nodes in a subtree.\n\nBUG=25542\nTEST=none\n\nReview URL: http:\/\/codereview.chromium.org\/332016\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@30027 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"TheTypoMaster\/chromium-crosswalk,Fireblend\/chromium-crosswalk,zcbenz\/cefode-chromium,Jonekee\/chromium.src,Jonekee\/chromium.src,mogoweb\/chromium-crosswalk,anirudhSK\/chromium,Just-D\/chromium-1,Chilledheart\/chromium,krieger-od\/nwjs_chromium.src,mogoweb\/chromium-crosswalk,mogoweb\/chromium-crosswalk,chuan9\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,dednal\/chromium.src,chuan9\/chromium-crosswalk,nacl-webkit\/chrome_deps,Chilledheart\/chromium,Just-D\/chromium-1,dednal\/chromium.src,Pluto-tv\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,ChromiumWebApps\/chromium,timopulkkinen\/BubbleFish,Just-D\/chromium-1,timopulkkinen\/BubbleFish,pozdnyakov\/chromium-crosswalk,zcbenz\/cefode-chromium,rogerwang\/chromium,rogerwang\/chromium,pozdnyakov\/chromium-crosswalk,M4sse\/chromium.src,zcbenz\/cefode-chromium,ltilve\/chromium,mohamed--abdel-maksoud\/chromium.src,Jonekee\/chromium.src,zcbenz\/cefode-chromium,junmin-zhu\/chromium-rivertrail,axinging\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,dushu1203\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Chilledheart\/chromium,anirudhSK\/chromium,hgl888\/chromium-crosswalk-efl,fujunwei\/chromium-crosswalk,ltilve\/chromium,anirudhSK\/chromium,junmin-zhu\/chromium-rivertrail,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,mogoweb\/chromium-crosswalk,patrickm\/chromium.src,mohamed--abdel-maksoud\/chromium.src,dushu1203\/chromium.src,dednal\/chromium.src,patrickm\/chromium.src,Jonekee\/chromium.src,jaruba\/chromium.src,keishi\/chromium,dushu1203\/chromium.src,Fireblend\/chromium-crosswalk,markYoungH\/chromium.src,robclark\/chromium,hgl888\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk,dednal\/chromium.src,ChromiumWebApps\/chromium,crosswalk-project\/chromium-crosswalk-efl,markYoungH\/chromium.src,hgl888\/chromium-crosswalk,jaruba\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Fireblend\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,chuan9\/chromium-crosswalk,hgl888\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,anirudhSK\/chromium,axinging\/chromium-crosswalk,patrickm\/chromium.src,pozdnyakov\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,ltilve\/chromium,nacl-webkit\/chrome_deps,jaruba\/chromium.src,timopulkkinen\/BubbleFish,nacl-webkit\/chrome_deps,markYoungH\/chromium.src,axinging\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,ondra-novak\/chromium.src,krieger-od\/nwjs_chromium.src,axinging\/chromium-crosswalk,ondra-novak\/chromium.src,timopulkkinen\/BubbleFish,dushu1203\/chromium.src,mogoweb\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,markYoungH\/chromium.src,ChromiumWebApps\/chromium,zcbenz\/cefode-chromium,anirudhSK\/chromium,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,rogerwang\/chromium,nacl-webkit\/chrome_deps,jaruba\/chromium.src,nacl-webkit\/chrome_deps,mogoweb\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,fujunwei\/chromium-crosswalk,anirudhSK\/chromium,ondra-novak\/chromium.src,Just-D\/chromium-1,zcbenz\/cefode-chromium,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,krieger-od\/nwjs_chromium.src,PeterWangIntel\/chromium-crosswalk,jaruba\/chromium.src,hgl888\/chromium-crosswalk-efl,zcbenz\/cefode-chromium,PeterWangIntel\/chromium-crosswalk,Chilledheart\/chromium,zcbenz\/cefode-chromium,M4sse\/chromium.src,rogerwang\/chromium,dushu1203\/chromium.src,ltilve\/chromium,pozdnyakov\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,Jonekee\/chromium.src,jaruba\/chromium.src,timopulkkinen\/BubbleFish,TheTypoMaster\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,M4sse\/chromium.src,Just-D\/chromium-1,krieger-od\/nwjs_chromium.src,patrickm\/chromium.src,M4sse\/chromium.src,Jonekee\/chromium.src,mohamed--abdel-maksoud\/chromium.src,jaruba\/chromium.src,timopulkkinen\/BubbleFish,hgl888\/chromium-crosswalk-efl,bright-sparks\/chromium-spacewalk,robclark\/chromium,fujunwei\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,keishi\/chromium,robclark\/chromium,littlstar\/chromium.src,ondra-novak\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,PeterWangIntel\/chromium-crosswalk,anirudhSK\/chromium,M4sse\/chromium.src,hujiajie\/pa-chromium,Jonekee\/chromium.src,Fireblend\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,krieger-od\/nwjs_chromium.src,M4sse\/chromium.src,anirudhSK\/chromium,TheTypoMaster\/chromium-crosswalk,nacl-webkit\/chrome_deps,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,littlstar\/chromium.src,robclark\/chromium,mogoweb\/chromium-crosswalk,hujiajie\/pa-chromium,hujiajie\/pa-chromium,pozdnyakov\/chromium-crosswalk,ChromiumWebApps\/chromium,fujunwei\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,chuan9\/chromium-crosswalk,ltilve\/chromium,axinging\/chromium-crosswalk,zcbenz\/cefode-chromium,ChromiumWebApps\/chromium,chuan9\/chromium-crosswalk,timopulkkinen\/BubbleFish,keishi\/chromium,mogoweb\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,nacl-webkit\/chrome_deps,pozdnyakov\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,markYoungH\/chromium.src,dednal\/chromium.src,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,robclark\/chromium,junmin-zhu\/chromium-rivertrail,dushu1203\/chromium.src,chuan9\/chromium-crosswalk,rogerwang\/chromium,krieger-od\/nwjs_chromium.src,littlstar\/chromium.src,M4sse\/chromium.src,PeterWangIntel\/chromium-crosswalk,axinging\/chromium-crosswalk,hgl888\/chromium-crosswalk,Fireblend\/chromium-crosswalk,Chilledheart\/chromium,markYoungH\/chromium.src,axinging\/chromium-crosswalk,fujunwei\/chromium-crosswalk,ChromiumWebApps\/chromium,fujunwei\/chromium-crosswalk,ChromiumWebApps\/chromium,crosswalk-project\/chromium-crosswalk-efl,zcbenz\/cefode-chromium,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk,markYoungH\/chromium.src,M4sse\/chromium.src,PeterWangIntel\/chromium-crosswalk,Just-D\/chromium-1,krieger-od\/nwjs_chromium.src,dushu1203\/chromium.src,Just-D\/chromium-1,anirudhSK\/chromium,nacl-webkit\/chrome_deps,chuan9\/chromium-crosswalk,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk-efl,ondra-novak\/chromium.src,Pluto-tv\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,rogerwang\/chromium,ltilve\/chromium,nacl-webkit\/chrome_deps,Fireblend\/chromium-crosswalk,keishi\/chromium,robclark\/chromium,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,keishi\/chromium,jaruba\/chromium.src,M4sse\/chromium.src,jaruba\/chromium.src,robclark\/chromium,robclark\/chromium,hgl888\/chromium-crosswalk-efl,ltilve\/chromium,keishi\/chromium,TheTypoMaster\/chromium-crosswalk,ltilve\/chromium,zcbenz\/cefode-chromium,mohamed--abdel-maksoud\/chromium.src,fujunwei\/chromium-crosswalk,Jonekee\/chromium.src,dushu1203\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,anirudhSK\/chromium,hgl888\/chromium-crosswalk-efl,markYoungH\/chromium.src,timopulkkinen\/BubbleFish,mohamed--abdel-maksoud\/chromium.src,pozdnyakov\/chromium-crosswalk,Jonekee\/chromium.src,ltilve\/chromium,Fireblend\/chromium-crosswalk,littlstar\/chromium.src,rogerwang\/chromium,patrickm\/chromium.src,Chilledheart\/chromium,littlstar\/chromium.src,ondra-novak\/chromium.src,keishi\/chromium,M4sse\/chromium.src,ChromiumWebApps\/chromium,Just-D\/chromium-1,Pluto-tv\/chromium-crosswalk,M4sse\/chromium.src,timopulkkinen\/BubbleFish,robclark\/chromium,keishi\/chromium,pozdnyakov\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,dednal\/chromium.src,Pluto-tv\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,Jonekee\/chromium.src,Chilledheart\/chromium,patrickm\/chromium.src,Jonekee\/chromium.src,keishi\/chromium,fujunwei\/chromium-crosswalk,Just-D\/chromium-1,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,dushu1203\/chromium.src,patrickm\/chromium.src,markYoungH\/chromium.src,hujiajie\/pa-chromium,Fireblend\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,crosswalk-project\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,Pluto-tv\/chromium-crosswalk,jaruba\/chromium.src,PeterWangIntel\/chromium-crosswalk,keishi\/chromium,ondra-novak\/chromium.src,bright-sparks\/chromium-spacewalk,fujunwei\/chromium-crosswalk,ondra-novak\/chromium.src,dushu1203\/chromium.src,littlstar\/chromium.src,markYoungH\/chromium.src,PeterWangIntel\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,nacl-webkit\/chrome_deps,ChromiumWebApps\/chromium,ChromiumWebApps\/chromium,hujiajie\/pa-chromium,mogoweb\/chromium-crosswalk,dushu1203\/chromium.src,anirudhSK\/chromium,ondra-novak\/chromium.src,littlstar\/chromium.src,krieger-od\/nwjs_chromium.src,dednal\/chromium.src,chuan9\/chromium-crosswalk,dednal\/chromium.src,patrickm\/chromium.src,junmin-zhu\/chromium-rivertrail,junmin-zhu\/chromium-rivertrail,mogoweb\/chromium-crosswalk,timopulkkinen\/BubbleFish,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,chuan9\/chromium-crosswalk,patrickm\/chromium.src,robclark\/chromium,markYoungH\/chromium.src,Chilledheart\/chromium,Chilledheart\/chromium,junmin-zhu\/chromium-rivertrail,anirudhSK\/chromium,hgl888\/chromium-crosswalk,jaruba\/chromium.src,dednal\/chromium.src,littlstar\/chromium.src,dednal\/chromium.src,TheTypoMaster\/chromium-crosswalk,ChromiumWebApps\/chromium,nacl-webkit\/chrome_deps,hgl888\/chromium-crosswalk,dednal\/chromium.src,timopulkkinen\/BubbleFish,hgl888\/chromium-crosswalk,junmin-zhu\/chromium-rivertrail,Pluto-tv\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- app\/tree_node_model.h\n+++ app\/tree_node_model.h\n@@ -104,6 +104,17 @@\n return static_cast<int>(children_->size());\n }\n \n+ \/\/ Returns the number of all nodes in teh subtree rooted at this node,\n+ \/\/ including this node.\n+ int GetTotalNodeCount() const {\n+ int count = 1; \/\/ Start with one to include the node itself.\n+ for (size_t i = 0; i < children_->size(); ++i) {\n+ TreeNode<NodeType>* child = children_[i];\n+ count += child->GetTotalNodeCount();\n+ }\n+ return count;\n+ }\n+\n \/\/ Returns a child by index.\n NodeType* GetChild(int index) {\n DCHECK(index >= 0 && index < GetChildCount());\n"} {"commit":"5498e99bf298e658aa13d176edefd1fd90adede0","subject":"Randomize attack damage","message":"Randomize attack damage\n","repos":"danieljohnson2\/Curse,danieljohnson2\/Curse","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- monster.c\n+++ monster.c\n@@ -99,11 +99,26 @@\n move_thing_towards (game, actor, player);\n }\n \n+static int\n+roll_attack_damage (Thing * actor)\n+{\n+ \/\/ actual damage is the average of 3 rolls from 0 to target->dmg.\n+\n+ int dmg = 0;\n+\n+ for (int i = 0; i < 3; ++i)\n+ dmg += (rand () % actor->dmg) + 1;\n+\n+ return dmg \/ 3;\n+}\n+\n \/* A bump-action that triggers combat *\/\n bool\n attack_bump_action (Game * game, Thing * actor, Thing * target)\n {\n- target->hp -= actor->dmg;\n+ int dmg = roll_attack_damage (actor);\n+\n+ target->hp -= dmg;\n \n if (target->hp <= 0)\n {\n@@ -126,7 +141,7 @@\n else\n {\n char msg[MESSAGE_MAX];\n- sprintf (msg, \"%s hits %s!\", actor->name, target->name);\n+ sprintf (msg, \"%s hits %s for %d!\", actor->name, target->name, dmg);\n write_game_message (game, msg);\n return false;\n }\n"} {"commit":"0c5a08adb6924922706b496b48636127291bde29","subject":"minor tweak","message":"minor tweak\n\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@8437 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/psc_util\/journal.c\n+++ psc_fsutil_libs\/psc_util\/journal.c\n@@ -31,12 +31,11 @@\n \txh = PSCALLOC(sizeof(*xh));\n \n \txh->pjx_pj = pj;\n-\n-\tpsc_warnx(\"xh=%p xh->pjx_pj=%p\", xh, xh->pjx_pj);\n-\n+\tLOCK_INIT(&xh->pjx_lock);\n \txh->pjx_tailslot = PJX_SLOT_ANY;\n \tINIT_PSCLIST_ENTRY(&xh->pjx_lentry);\n-\tLOCK_INIT(&xh->pjx_lock);\n+\n+\tpsc_warnx(\"Start a new transaction %p for journal %p.\", xh, xh->pjx_pj);\n \treturn (xh);\n }\n \n"} {"commit":"51e734d7a4c98ca10da7935dd3b9f653c1d73784","subject":"add assert to aid bug-finding","message":"add assert to aid bug-finding\n\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@12489 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/psc_util\/journal.c\n+++ psc_fsutil_libs\/psc_util\/journal.c\n@@ -420,7 +420,7 @@\n \tpj = xh->pjx_pj;\n \n \t\/* honor distill request only when we have a handler *\/\n-\tif (!pj->pj_distill_handler)\n+\tif (pj->pj_distill_handler == NULL)\n \t\txh->pjx_flags &= ~PJX_DISTILL;\n \tif (xh->pjx_flags & PJX_DISTILL)\n \t\ttype |= PJE_DISTILL;\n@@ -893,6 +893,8 @@\n \tpj = pjt->pjt_pj;\n \txid = pj->pj_distill_xid;\n \twhile (pscthr_run()) {\n+\t\tif (pj->pj_distill_handler == NULL)\n+\t\t\tpsc_assert(pll_empty(&pj->pj_distillxids));\n \t\t\/*\n \t\t * Walk the list until we find a log entry that needs processing.\n \t\t *\/\n"} {"commit":"c434592dcf153e615528ff82ec4f20fded7200ee","subject":"Refactor to use functions from winutils module","message":"Refactor to use functions from winutils module\n","repos":"andrewgho\/movewin","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- movewin.c\n+++ movewin.c\n@@ -3,134 +3,53 @@\n #define ME \"movewin\"\n #define USAGE \"usage: \" ME \" title x y [width height]\\n\"\n \n+\/* Hold target position, optional size, mutex so we only move first window *\/\n typedef struct {\n- int x;\n- int y;\n- int width;\n- int height;\n-} WindowGeometry;\n+ CGPoint position; \/* move window to this position *\/\n+ CGSize size; \/* resize window to this size *\/\n+ int hasSize; \/* only resize if this is true *\/\n+ int movedWindow; \/* set to true if we have moved any window *\/\n+} MoveWinCtx;\n \n-WindowGeometry WGCreate(int x, int y, int width, int height) {\n- WindowGeometry geo;\n-\n- geo.x = x;\n- geo.y = y;\n- geo.width = width;\n- geo.height = height;\n-\n- return geo;\n-}\n-\n-bool WGEqual(WindowGeometry geo1, WindowGeometry geo2) {\n- return\n- geo1.x == geo2.x &&\n- geo1.y == geo2.y &&\n- geo1.width == geo2.width &&\n- geo1.height == geo2.height;\n-}\n-\n+\/* Return true if and only if we are authorized to call accessibility APIs *\/\n static bool isAuthorized() {\n+ \/* TODO: silence deprecation warning in Mavericks and later *\/\n return AXAPIEnabled() || AXIsProcessTrusted();\n }\n \n-WindowGeometry CFDictionaryGetBounds(CFDictionaryRef theDict) {\n- WindowGeometry geo;\n+\/* Callback for windowList() moves the first window it encounters *\/\n+void moveWindow(CFDictionaryRef window, void *ctxPtr) {\n+ MoveWinCtx *ctx = (MoveWinCtx *)ctxPtr;\n+ AXUIElementRef appWindow = NULL;\n+ CGPoint actualPosition;\n+ CGPoint actualSize;\n \n- geo.x = CFDictionaryGetInt(theDict, CFSTR(\"X\"));\n- geo.y = CFDictionaryGetInt(theDict, CFSTR(\"Y\"));\n- geo.width = CFDictionaryGetInt(theDict, CFSTR(\"Width\"));\n- geo.height = CFDictionaryGetInt(theDict, CFSTR(\"Height\"));\n+ \/* If we already moved a window, skip all subsequent ones *\/\n+ if(ctx->movedWindow) return;\n \n- return geo;\n-}\n+ \/* Move window, unless positions already match *\/\n+ actualPosition = CGWindowGetPosition(window);\n+ if(!CGPointEqualToPoint(ctx->position, CGWindowGetPosition(window))) {\n+ appWindow = AXWindowFromCGWindow(window);\n+ AXWindowSetPosition(appWindow, ctx->position);\n+ }\n \n-WindowGeometry AXWindowGetBounds(AXUIElementRef window) {\n- AXValueRef attrValue;\n- CGPoint windowPosition;\n- CGSize windowSize;\n- WindowGeometry geo;\n+ \/* If size was specified, resize window, unless sizes already match *\/\n+ if(ctx->hasSize) {\n+ actualSize = CGWindowGetPosition(window);\n+ if(!CGSizeEqualToSize(ctx->size, CGWindowGetSize(window))) {\n+ if(!appWindow) appWindow = AXWindowFromCGWindow(window);\n+ AXWindowSetPosition(appWindow, ctx->position);\n+ }\n+ }\n \n- AXUIElementCopyAttributeValue(\n- window, kAXPositionAttribute, (CFTypeRef *)&attrValue\n- );\n- AXValueGetValue(attrValue, kAXValueCGPointType, &windowPosition);\n- CFRelease(attrValue);\n- geo.x = windowPosition.x;\n- geo.y = windowPosition.y;\n-\n- AXUIElementCopyAttributeValue(\n- window, kAXSizeAttribute, (CFTypeRef *)&attrValue\n- );\n- AXValueGetValue(attrValue, kAXValueCGSizeType, &windowSize);\n- CFRelease(attrValue);\n- geo.width = windowSize.width;\n- geo.height = windowSize.height;\n-\n- return geo;\n-}\n-\n-void AXWindowSetBounds(AXUIElementRef window, WindowGeometry geo) {\n- CGPoint windowPosition;\n- AXValueRef attrValue;\n- CGSize windowSize;\n-\n- windowPosition.x = geo.x;\n- windowPosition.y = geo.y;\n- attrValue = AXValueCreate(kAXValueCGPointType, &windowPosition);\n- AXUIElementSetAttributeValue(window, kAXPositionAttribute, attrValue);\n- CFRelease(attrValue);\n-\n- if(geo.width != -1 && geo.height != -1) {\n- windowSize.width = geo.width;\n- windowSize.height = geo.height;\n- attrValue = AXValueCreate(kAXValueCGPointType, &windowSize);\n- AXUIElementSetAttributeValue(window, kAXPositionAttribute, attrValue);\n- CFRelease(attrValue);\n- }\n-}\n-\n-void moveWindow(CFDictionaryRef window, WindowGeometry newGeo) {\n- WindowGeometry geo, appWindowGeo;\n- pid_t pid;\n- AXUIElementRef app, appWindow;\n- CFArrayRef appWindowList;\n- int i;\n- CFStringRef windowTitle;\n-\n- \/* If new coordinates and size match, then there is nothing to do *\/\n- geo = CFDictionaryGetBounds(CFDictionaryGetValue(window, kCGWindowBounds));\n- if(WGEqual(geo, newGeo)) return;\n-\n- \/* Otherwise, load accessibility application from this PID *\/\n- pid = CFDictionaryGetInt(window, kCGWindowOwnerPID);\n- app = AXUIElementCreateApplication(pid);\n- AXUIElementCopyAttributeValue(\n- app, kAXWindowsAttribute, (CFTypeRef *)&appWindowList\n- );\n-\n- \/* Search application windows for first matching title, position, size *\/\n- for(i = 0; i < CFArrayGetCount(appWindowList); i++) {\n- appWindow = CFArrayGetValueAtIndex(appWindowList, i);\n- AXUIElementCopyAttributeValue(\n- appWindow, kAXTitleAttribute, (CFTypeRef *)&windowTitle\n- );\n- \/* TODO: check that title matches *\/\n-\n- appWindowGeo = AXWindowGetBounds(appWindow);\n- if(!WGEqual(geo, appWindowGeo)) continue;\n-\n- AXWindowSetBounds(appWindow, newGeo);\n-\n- break;\n- }\n+ \/* Record that we moved a window, so we will skip all subsequent ones *\/\n+ ctx->movedWindow = 1;\n }\n \n int main(int argc, char **argv) {\n- char *find_title, *app_name, *window_name, *title;\n- WindowGeometry newGeo;\n- int found, i, layer, titleSize;\n- CFArrayRef windowList;\n- CFDictionaryRef window;\n+ char *pattern;\n+ MoveWinCtx ctx;\n \n #define WARN(msg) { fprintf(stderr, ME \": \" msg \"\\n\"); }\n #define DIE(msg) { fprintf(stderr, ME \": \" msg \"\\n\"); exit(1); }\n@@ -140,54 +59,31 @@\n if(argc < 2) DIE_USAGE(\"missing required window title\");\n if(argc < 4) DIE_USAGE(\"missing required window x and y coordinates\");\n if(argc == 5) DIE_USAGE(\"height is required if width is present\");\n- find_title = argv[1];\n- if(!find_title || !*find_title) DIE_USAGE(\"missing required title\");\n- newGeo.x = atoi(argv[2]);\n- newGeo.y = atoi(argv[3]);\n+ pattern = argv[1];\n+ if(!pattern || !*pattern) DIE_USAGE(\"missing required title\");\n+ ctx.position.x = atoi(argv[2]);\n+ ctx.position.y = atoi(argv[3]);\n if(argc > 5) {\n- newGeo.width = atoi(argv[4]);\n- newGeo.height = atoi(argv[5]);\n- if(newGeo.width <= 0) DIE(\"width must be positive integer\");\n- if(newGeo.height <= 0) DIE(\"height must be positive integer\");\n+ ctx.size.width = atoi(argv[4]);\n+ ctx.size.height = atoi(argv[5]);\n+ if(ctx.size.width <= 0) DIE(\"width must be positive integer\");\n+ if(ctx.size.height <= 0) DIE(\"height must be positive integer\");\n+ ctx.hasSize = 1;\n } else {\n- newGeo.width = newGeo.height = -1;\n+ ctx.size.width = ctx.size.height = 0;\n+ ctx.hasSize = 0;\n }\n if(argc > 6) WARN(\"ignoring extraneous arguments\");\n \n \/* Die if we are not authorized to use OS X accessibility *\/\n if(!isAuthorized()) DIE(\"not authorized to use accessibility API\");\n \n- windowList = CGWindowListCopyWindowInfo(\n- (kCGWindowListOptionOnScreenOnly|kCGWindowListExcludeDesktopElements),\n- kCGNullWindowID\n- );\n+ \/* Try to move a window *\/\n+ ctx.movedWindow = 0;\n+ windowList(pattern, moveWindow, (void *)&ctx);\n \n- found = 0;\n- for(i = 0; i < CFArrayGetCount(windowList); i++) {\n- window = CFArrayGetValueAtIndex(windowList, i);\n- layer = CFDictionaryGetInt(window, kCGWindowLayer);\n- if(layer > 0) continue;\n-\n- app_name = CFDictionaryCopyCString(window, kCGWindowOwnerName);\n- window_name = CFDictionaryCopyCString(window, kCGWindowName);\n- titleSize = strlen(app_name) + strlen(\" - \") + strlen(window_name) + 1;\n- title = (char *)malloc(titleSize);\n- snprintf(title, titleSize, \"%s - %s\", app_name, window_name);\n-\n- if(fnmatch(find_title, title, 0) == 0) {\n- moveWindow(window, newGeo);\n- found = 1;\n- }\n-\n- free(title);\n- free(window_name);\n- free(app_name);\n-\n- if(found) break;\n- }\n- if(!found) WARN(\"no window matching title\");\n-\n- return found == 1 ? 0 : 1;\n+ \/* Return success if we moved any window, failure otherwise *\/\n+ return ctx.movedWindow ? 0 : 1;\n \n #undef DIE_USAGE\n #undef DIE\n"} {"commit":"26fdf8681a9dbe222721540d3f0fae88c5e5b31a","subject":"step6","message":"step6\n","repos":"hermixy\/qtun,hermixy\/qtun,jack230230\/qtun,jack230230\/qtun,hermixy\/qtun,jack230230\/qtun,jack230230\/qtun,hermixy\/qtun,hermixy\/qtun,jack230230\/qtun,hermixy\/qtun,hermixy\/qtun,jack230230\/qtun,jack230230\/qtun","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- jump\/step6\/network.c\n+++ jump\/step6\/network.c\n@@ -192,7 +192,7 @@\n \n static void server_process(int max, fd_set* set, int remotefd, int localfd)\n {\n- unsigned char buffer[1024] = {0};\n+ unsigned char buffer[2048] = {0};\n ssize_t readen;\n hash_iterator_t iter;\n struct iphdr* ipHdr;\n@@ -238,7 +238,7 @@\n \n static void client_process(int max, fd_set* set, int remotefd, int localfd)\n {\n- unsigned char buffer[1024] = {0};\n+ unsigned char buffer[2048] = {0};\n ssize_t readen;\n if (FD_ISSET(localfd, set))\n {\n"} {"commit":"cce7ca980bb60ccb59b50cfed8e5a309c77a3eb0","subject":"msg\/mds.h: add MMM_OSD_HEARTBEAT","message":"msg\/mds.h: add MMM_OSD_HEARTBEAT\n\nSigned-off-by: Colin McCabe <3142ce8a0bdba4a38073365893e6b74f72d9c512@alumni.cmu.edu>\n","repos":"cmccabe\/redfish,cmccabe\/redfish,cmccabe\/redfish,cmccabe\/redfish,cmccabe\/redfish","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- msg\/mds.h\n+++ msg\/mds.h\n@@ -23,6 +23,8 @@\n \tMMM_OPEN_RFILE_REQ,\n \t\/** Chunk map sent from object storage daemon *\/\n \tMMM_CHUNK_REPORT,\n+\t\/** OSD heartbeat message *\/\n+\tMMM_OSD_HEARTBEAT,\n \t\/** Lookup some chunks for an open read-only file. *\/\n \tMMM_LOOKUP_CHUNKS_REQ,\n \t\/** Get a new chunk for an open write-only file *\/\n"} {"commit":"059a0267cbb7b0ef0511509e7674e773fd4fd4e5","subject":"Remove #undef mp_XXX from the header end","message":"Remove #undef mp_XXX from the header end\n","repos":"rtsisyk\/msgpuck,tarantool\/msgpuck,vitalyisaev2\/msgpuck,rvncerr\/msgpuck","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- msgpuck.h\n+++ msgpuck.h\n@@ -2311,13 +2311,5 @@\n #undef MP_IMPL\n #undef MP_ALWAYSINLINE\n #undef MP_GCC_VERSION\n-#undef mp_likely\n-#undef mp_unlikely\n-#undef mp_unreachable\n-#undef mp_bswap_u16\n-#undef mp_bswap_u32\n-#undef mp_bswap_u64\n-#undef mp_bswap_float\n-#undef mp_bswap_double\n \n #endif \/* MSGPUCK_H_INCLUDED *\/\n"} {"commit":"af2d388fc003e76fa2cd746376072ab009f0aa4d","subject":"Update help message","message":"Update help message\n","repos":"sumpygump\/nanoweb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nanoweb.c\n+++ nanoweb.c\n@@ -57,7 +57,7 @@\n case LOG: (void)sprintf(logbuffer,\" INFO: %s:%s:%d\",s1, s2,socket_fd); break;\n }\n \/* No checks here, nothing can be done with a failure anyway *\/\n- if((fd = open(\"nweb.log\", O_CREAT| O_WRONLY | O_APPEND,0644)) >= 0) {\n+ if((fd = open(\"nanoweb.log\", O_CREAT| O_WRONLY | O_APPEND,0644)) >= 0) {\n (void)write(fd,logbuffer,strlen(logbuffer));\n (void)write(fd,\"\\n\",1);\n (void)close(fd);\n@@ -118,7 +118,7 @@\n logger(LOG,\"SEND\",&buffer[5],hit);\n len = (long)lseek(file_fd, (off_t)0, SEEK_END); \/* lseek to the file end to find the length *\/\n (void)lseek(file_fd, (off_t)0, SEEK_SET); \/* lseek back to the file start ready for reading *\/\n- (void)sprintf(buffer,\"HTTP\/1.1 200 OK\\nServer: nweb\/%d.0\\nContent-Length: %ld\\nConnection: close\\nContent-Type: %s\\n\\n\", VERSION, len, fstr); \/* Header + a blank line *\/\n+ (void)sprintf(buffer,\"HTTP\/1.1 200 OK\\nServer: nanoweb\/%d.0\\nContent-Length: %ld\\nConnection: close\\nContent-Type: %s\\n\\n\", VERSION, len, fstr); \/* Header + a blank line *\/\n logger(LOG,\"Header\",buffer,hit);\n (void)write(fd,buffer,strlen(buffer));\n \n@@ -139,30 +139,30 @@\n static struct sockaddr_in serv_addr; \/* static = initialised to zeros *\/\n \n if( argc < 3 || argc > 3 || !strcmp(argv[1], \"-?\") ) {\n- (void)printf(\"hint: nweb Port-Number Top-Directory\\t\\tversion %d\\n\\n\"\n- \"\\tnweb is a small and very safe mini web server\\n\"\n- \"\\tnweb only servers out file\/web pages with extensions named below\\n\"\n- \"\\t and only from the named directory or its sub-directories.\\n\"\n- \"\\tThere is no fancy features = safe and secure.\\n\\n\"\n- \"\\tExample: nweb 8181 \/home\/nwebdir &\\n\\n\"\n- \"\\tOnly Supports:\", VERSION);\n+ (void)printf(\"Nanoweb version %d\\nusage: nanoweb <port-number> <root-directory>\\n\\n\"\n+ \" Nanoweb is a small and very safe mini web server\\n\"\n+ \" nanoweb only servers out file\/web pages with extensions named below\\n\"\n+ \" and only from the named directory or its sub-directories.\\n\"\n+ \" There are no fancy features = safe and secure.\\n\\n\"\n+ \" Example: nanoweb 8181 \/home\/nwebdir &\\n\\n\"\n+ \" Only Supports:\", VERSION);\n for(i=0;extensions[i].ext != 0;i++)\n (void)printf(\" %s\",extensions[i].ext);\n \n- (void)printf(\"\\n\\tNot Supported: URLs including \\\"..\\\", Java, Javascript, CGI\\n\"\n- \"\\tNot Supported: directories \/ \/etc \/bin \/lib \/tmp \/usr \/dev \/sbin \\n\"\n- \"\\tNo warranty given or implied\\n\\tNigel Griffiths nag@uk.ibm.com\\n\" );\n+ (void)printf(\"\\n Not Supported: URLs including \\\"..\\\", Java, Javascript, CGI\\n\"\n+ \" Not Supported: directories \/ \/etc \/bin \/lib \/tmp \/usr \/dev \/sbin \\n\"\n+ \" No warranty given or implied\\n Nigel Griffiths nag@uk.ibm.com\\n\");\n exit(0);\n }\n if( !strncmp(argv[2],\"\/\" ,2 ) || !strncmp(argv[2],\"\/etc\", 5 ) ||\n !strncmp(argv[2],\"\/bin\",5 ) || !strncmp(argv[2],\"\/lib\", 5 ) ||\n !strncmp(argv[2],\"\/tmp\",5 ) || !strncmp(argv[2],\"\/usr\", 5 ) ||\n !strncmp(argv[2],\"\/dev\",5 ) || !strncmp(argv[2],\"\/sbin\",6) ){\n- (void)printf(\"ERROR: Bad top directory %s, see nweb -?\\n\",argv[2]);\n+ (void)printf(\"ERROR: Bad root directory %s, see nanoweb -?\\n\",argv[2]);\n exit(3);\n }\n if(chdir(argv[2]) == -1){\n- (void)printf(\"ERROR: Can't Change to directory %s\\n\",argv[2]);\n+ (void)printf(\"ERROR: Can't change to directory %s\\n\",argv[2]);\n exit(4);\n }\n \/* Become deamon + unstopable and no zombies children (= no wait()) *\/\n@@ -173,7 +173,7 @@\n for(i=0;i<32;i++)\n (void)close(i); \/* close open files *\/\n (void)setpgrp(); \/* break away from process group *\/\n- logger(LOG,\"nweb starting\",argv[1],getpid());\n+ logger(LOG,\"nanoweb starting\",argv[1],getpid());\n \/* setup the network socket *\/\n if((listenfd = socket(AF_INET, SOCK_STREAM,0)) <0)\n logger(ERROR, \"system call\",\"socket\",0);\n"} {"commit":"e70e7cc7ffcb40f2ac6844b19a2d9b1bb26693a7","subject":"radv: fix logic for when to flush on multiple CS emission","message":"radv: fix logic for when to flush on multiple CS emission\n\nThe current code evaluated to always true, we only want to flush\non the first submit. Rename the variable to do_flush, and only\nemit on the first iteration.\n\nReviewed-by: Bas Nieuwenhuizen <1d31d94f30d40df7951505d1034e1e923d02ec49@basnieuwenhuizen.nl>\nSigned-off-by: Dave Airlie <f2295d84e358395675bc8031be58672073ae065e@redhat.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/amd\/vulkan\/radv_device.c\n+++ src\/amd\/vulkan\/radv_device.c\n@@ -1565,8 +1565,8 @@\n \n \tfor (uint32_t i = 0; i < submitCount; i++) {\n \t\tstruct radeon_winsys_cs **cs_array;\n-\t\tbool has_flush = !submitCount;\n-\t\tbool can_patch = !has_flush;\n+\t\tbool do_flush = !i;\n+\t\tbool can_patch = !do_flush;\n \t\tuint32_t advance;\n \n \t\tif (!pSubmits[i].commandBufferCount) {\n@@ -1589,9 +1589,9 @@\n \t\t}\n \n \t\tcs_array = malloc(sizeof(struct radeon_winsys_cs *) *\n-\t\t\t\t\t (pSubmits[i].commandBufferCount + has_flush));\n-\n-\t\tif(has_flush)\n+\t\t\t\t\t (pSubmits[i].commandBufferCount + do_flush));\n+\n+\t\tif(do_flush)\n \t\t\tcs_array[0] = queue->device->flush_cs[queue->queue_family_index];\n \n \t\tfor (uint32_t j = 0; j < pSubmits[i].commandBufferCount; j++) {\n@@ -1599,16 +1599,16 @@\n \t\t\t\t\t pSubmits[i].pCommandBuffers[j]);\n \t\t\tassert(cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY);\n \n-\t\t\tcs_array[j + has_flush] = cmd_buffer->cs;\n+\t\t\tcs_array[j + do_flush] = cmd_buffer->cs;\n \t\t\tif ((cmd_buffer->usage_flags & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT))\n \t\t\t\tcan_patch = false;\n \t\t}\n \n-\t\tfor (uint32_t j = 0; j < pSubmits[i].commandBufferCount + has_flush; j += advance) {\n+\t\tfor (uint32_t j = 0; j < pSubmits[i].commandBufferCount + do_flush; j += advance) {\n \t\t\tadvance = MIN2(max_cs_submission,\n-\t\t\t\t pSubmits[i].commandBufferCount + has_flush - j);\n+\t\t\t\t pSubmits[i].commandBufferCount + do_flush - j);\n \t\t\tbool b = j == 0;\n-\t\t\tbool e = j + advance == pSubmits[i].commandBufferCount + has_flush;\n+\t\t\tbool e = j + advance == pSubmits[i].commandBufferCount + do_flush;\n \n \t\t\tif (queue->device->trace_bo)\n \t\t\t\t*queue->device->trace_id_ptr = 0;\n"} {"commit":"1ef59774abc0309cb615acf34727d06a786527ec","subject":"ncd: ncd.c: save memory by not storing pointer to and size of preallocated process memory. Instead, to figure out if statement memory was individually allocated or is part of preallocated memory, use negative mem_size for individually allocated.","message":"ncd: ncd.c: save memory by not storing pointer to and size of preallocated process memory. Instead, to figure out if statement \nmemory was individually allocated or is part of preallocated memory, use negative mem_size for individually allocated.\n","repos":"Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/ncd.c\n+++ ncd\/ncd.c\n@@ -89,8 +89,6 @@\n BSmallTimer wait_timer;\n BSmallPending work_job;\n LinkedList1Node list_node; \/\/ node in processes\n- char *mem;\n- int mem_size;\n int state;\n int ap;\n int fp;\n@@ -160,7 +158,6 @@\n static void start_terminate (int exit_code);\n static int process_new (NCDInterpProcess *iprocess, NCDModuleProcess *module_process);\n static void process_free (struct process *p, NCDModuleProcess **out_mp);\n-static int process_mem_is_preallocated (struct process *p, char *mem);\n static void process_start_terminating (struct process *p);\n static int process_have_child (struct process *p);\n static void process_assert_pointers (struct process *p);\n@@ -176,6 +173,8 @@\n static int process_resolve_variable_expr (struct process *p, int pos, const char *names, size_t num_names, NCDValMem *mem, NCDValRef *out_value);\n static void statement_logfunc (struct statement *ps);\n static void statement_log (struct statement *ps, int level, const char *fmt, ...);\n+static int statement_mem_is_allocated (struct statement *ps);\n+static int statement_mem_size (struct statement *ps);\n static int statement_allocate_memory (struct statement *ps, int alloc_size);\n static void statement_instance_func_event (struct statement *ps, int event);\n static int statement_instance_func_getobj (struct statement *ps, const char *objname, NCDObject *out_object);\n@@ -699,8 +698,6 @@\n \/\/ set variables\n p->iprocess = iprocess;\n p->module_process = module_process;\n- p->mem = (char *)p + mem_off;\n- p->mem_size = mem_size;\n p->state = PSTATE_WORKING;\n p->ap = 0;\n p->fp = 0;\n@@ -715,13 +712,14 @@\n }\n \n \/\/ init statements\n+ char *mem = (char *)p + mem_off;\n for (int i = 0; i < num_statements; i++) {\n struct statement *ps = &p->statements[i];\n ps->p = p;\n ps->i = i;\n ps->state = SSTATE_FORGOTTEN;\n ps->mem_size = NCDInterpProcess_StatementPreallocSize(iprocess, i);\n- ps->mem = (ps->mem_size == 0 ? NULL : p->mem + NCDInterpProcess_StatementPreallocOffset(iprocess, i));\n+ ps->mem = (ps->mem_size == 0 ? NULL : mem + NCDInterpProcess_StatementPreallocOffset(iprocess, i));\n }\n \n \/\/ init timer\n@@ -754,7 +752,7 @@\n \/\/ free statement memory\n for (int i = 0; i < p->num_statements; i++) {\n struct statement *ps = &p->statements[i];\n- if (ps->mem && !process_mem_is_preallocated(p, ps->mem)) {\n+ if (statement_mem_is_allocated(ps)) {\n free(ps->mem);\n }\n }\n@@ -770,13 +768,6 @@\n \n \/\/ free strucure\n BFree(p);\n-}\n-\n-int process_mem_is_preallocated (struct process *p, char *mem)\n-{\n- ASSERT(mem)\n- \n- return (mem >= p->mem && mem < p->mem + p->mem_size);\n }\n \n void process_start_terminating (struct process *p)\n@@ -1217,12 +1208,22 @@\n va_end(vl);\n }\n \n+int statement_mem_is_allocated (struct statement *ps)\n+{\n+ return (ps->mem_size < 0);\n+}\n+\n+int statement_mem_size (struct statement *ps)\n+{\n+ return (ps->mem_size >= 0 ? ps->mem_size : -ps->mem_size);\n+}\n+\n int statement_allocate_memory (struct statement *ps, int alloc_size)\n {\n ASSERT(alloc_size >= 0)\n \n- if (alloc_size > ps->mem_size) {\n- if (ps->mem && !process_mem_is_preallocated(ps->p, ps->mem)) {\n+ if (alloc_size > statement_mem_size(ps)) {\n+ if (statement_mem_is_allocated(ps)) {\n free(ps->mem);\n }\n \n@@ -1232,7 +1233,7 @@\n return 0;\n }\n \n- ps->mem_size = alloc_size;\n+ ps->mem_size = -alloc_size;\n }\n \n return 1;\n"} {"commit":"3b32484e4efa0184f409ffe67ff8459aaf3506e9","subject":"Change cursor on timing.","message":"Change cursor on timing.\n","repos":"mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume,mitchan0321\/perfume","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ncurses.c\n+++ ncurses.c\n@@ -827,8 +827,8 @@\n incell = new_cell(L\"\");\n inlist = result = new_list(NULL);\n \n+ curs_set(1);\n wtimeout(w, itimeout);\n- curs_set(1);\n \n if (pending_key != -1) {\n \tin = pending_key;\n"} {"commit":"2e00069a72b9a100eadba75bc1c6f5df07f28b5f","subject":"Output just the char value for each letter","message":"Output just the char value for each letter\n","repos":"bobrippling\/tim,bobrippling\/tim,bobrippling\/tim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ncurses.c\n+++ ncurses.c\n@@ -126,7 +126,7 @@\n \t\treturn;\n \t}\n \n-\taddch(c);\n+\taddch(c & 0xff);\n }\n \n void nc_addstr(char *s)\n"} {"commit":"0a613eb9d61189c0c16785f0bbedd17605a2913e","subject":"Fix write filter blocking when no filter was set. Fixes problems with dhcp.","message":"Fix write filter blocking when no filter was set. Fixes\nproblems with dhcp.\n\nok frantzen@ krw@ deraadt@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net\/bpf.c\n+++ net\/bpf.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: bpf.c,v 1.40 2003\/10\/22 18:42:40 canacar Exp $\t*\/\n+\/*\t$OpenBSD: bpf.c,v 1.41 2003\/10\/24 04:26:16 canacar Exp $\t*\/\n \/*\t$NetBSD: bpf.c,v 1.33 1997\/02\/21 23:59:35 thorpej Exp $\t*\/\n \n \/*\n@@ -105,9 +105,9 @@\n {\n \tstruct mbuf *m;\n \tint error;\n-\tint len;\n-\tint hlen;\n-\tint slen; \/* XXX u_int ? *\/\n+\tu_int hlen;\n+\tu_int len;\n+\tu_int slen;\n \n \t\/*\n \t * Build a sockaddr based on the data link layer type.\n@@ -168,7 +168,7 @@\n \t}\n \n \tlen = uio->uio_resid;\n-\tif ((unsigned)len > MCLBYTES)\n+\tif (len > MCLBYTES)\n \t\treturn (EIO);\n \n \tMGETHDR(m, M_WAIT, MT_DATA);\n@@ -190,7 +190,7 @@\n \t\tgoto bad;\n \n \tslen = bpf_filter(filter, mtod(m, u_char *), len, len);\n-\tif (slen == 0 || slen < len) {\n+\tif (slen < len) {\n \t\terror = EPERM;\n \t\tgoto bad;\n \t}\n"} {"commit":"c89f51b8efd7bdbac0af22fa253dfc73034599b2","subject":"POSIX: Fix HRT semaphores for Mac OS","message":"POSIX: Fix HRT semaphores for Mac OS\n","repos":"Aerotenna\/Firmware,dagar\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,mje-nz\/PX4-Firmware,Aerotenna\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,acfloria\/Firmware,dagar\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,PX4\/Firmware,darknight-007\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,PX4\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,darknight-007\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,dagar\/Firmware,acfloria\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,darknight-007\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,dagar\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,dagar\/Firmware,darknight-007\/Firmware,mje-nz\/PX4-Firmware,mcgill-robotics\/Firmware,mcgill-robotics\/Firmware,Aerotenna\/Firmware,dagar\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,darknight-007\/Firmware,mje-nz\/PX4-Firmware,Aerotenna\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,PX4\/Firmware,jlecoeur\/Firmware,acfloria\/Firmware,jlecoeur\/Firmware,acfloria\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,krbeverx\/Firmware,PX4\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/platforms\/posix\/px4_layer\/drv_hrt.c\n+++ src\/platforms\/posix\/px4_layer\/drv_hrt.c\n@@ -43,6 +43,7 @@\n #include <time.h>\n #include <string.h>\n #include <inttypes.h>\n+#include <errno.h>\n #include \"hrt_work.h\"\n \n static struct sq_queue_s\tcallout_queue;\n@@ -59,7 +60,7 @@\n #define HRT_INTERVAL_MIN\t50\n #define HRT_INTERVAL_MAX\t50000000\n \n-static sem_t \t_hrt_lock;\n+static sem_t \t*_hrt_lock;\n static struct work_s\t_hrt_work;\n static hrt_abstime px4_timestart = 0;\n \n@@ -70,14 +71,12 @@\n \n static void hrt_lock(void)\n {\n-\t\/\/printf(\"hrt_lock\\n\");\n-\tsem_wait(&_hrt_lock);\n+\tsem_wait(_hrt_lock);\n }\n \n static void hrt_unlock(void)\n {\n-\t\/\/printf(\"hrt_unlock\\n\");\n-\tsem_post(&_hrt_lock);\n+\tsem_post(_hrt_lock);\n }\n \n #ifdef __PX4_DARWIN\n@@ -87,8 +86,11 @@\n #define MAC_GIGA UINT64_C(1000000000)\n #define CLOCK_MONOTONIC 1\n #define clockid_t int\n+#define HRT_LOCK_NAME \"\/hrt_lock\"\n \n static double px4_timebase = 0.0;\n+\n+int clock_gettime(clockid_t clk_id, struct timespec *t);\n \n int clock_gettime(clockid_t clk_id, struct timespec *t)\n {\n@@ -96,13 +98,14 @@\n \t\treturn 1;\n \t}\n \n-\t\/\/ XXX multithreading locking\n \tif (!px4_timestart) {\n-\t\tmach_timebase_info_data_t tb = { 0 };\n+\t\thrt_lock();\n+\t\tmach_timebase_info_data_t tb = {};\n \t\tmach_timebase_info(&tb);\n \t\tpx4_timebase = tb.numer;\n \t\tpx4_timebase \/= tb.denom;\n \t\tpx4_timestart = mach_absolute_time();\n+\t\thrt_unlock();\n \t}\n \n \tmemset(t, 0, sizeof(*t));\n@@ -229,7 +232,22 @@\n {\n \t\/\/printf(\"hrt_init\\n\");\n \tsq_init(&callout_queue);\n-\tsem_init(&_hrt_lock, 0, 1);\n+\n+\t#ifdef __PX4_DARWIN\n+\t\/* not using O_EXCL as the device handles are unique *\/\n+\t_hrt_lock = sem_open(HRT_LOCK_NAME, O_CREAT, 0777, 1);\n+\n+\tif (_hrt_lock == SEM_FAILED) {\n+\t\tPX4_WARN(\"SEM INIT FAIL: %s\", strerror(errno));\n+\t}\n+\t#else\n+\t_hrt_lock = malloc(sizeof(sem_t));\n+\tint sem_ret = sem_init(_hrt_lock, 0, 1);\n+\tif (sem_ret) {\n+\t\tPX4_WARN(\"SEM INIT FAIL: %s\", strerror(errno));\n+\t}\n+\t#endif\n+\n \tmemset(&_hrt_work, 0, sizeof(_hrt_work));\n }\n \n"} {"commit":"c96553dcdab1a6f775477edc016bde3afcb8955a","subject":"added payload type 0x4001 dissector to payload-handler","message":"added payload type 0x4001 dissector to payload-handler\n","repos":"AMOS-ss16-proj3\/amos-ss16-proj3,AMOS-ss16-proj3\/amos-ss16-proj3,AMOS-ss16-proj3\/amos-ss16-proj3,AMOS-ss16-proj3\/amos-ss16-proj3,AMOS-ss16-proj3\/amos-ss16-proj3","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/plugins\/doip\/doip-payload-handler.c\n+++ src\/plugins\/doip\/doip-payload-handler.c\n@@ -22,6 +22,7 @@\n #include \"doip-payload-0004.h\"\n #include \"doip-payload-0005.h\"\n #include \"doip-payload-0006.h\"\n+#include \"doip-payload-4001.h\"\n #include \"doip-payload-8001.h\"\n #include \"doip-payload-8002.h\"\n #include \"doip-payload-8003.h\"\n@@ -48,6 +49,9 @@\n break;\n case 0x0006:\n handler = dissect_payload_0006;\n+ break;\n+ case 0x4001:\n+ handler = dissect_payload_4001;\n break;\n case 0x8001:\n handler = dissect_payload_8001;\n@@ -84,6 +88,9 @@\n \/* prepare proto entries for payload type 0x0006 *\/\n register_proto_doip_payload_0006(proto_doip);\n \n+ \/* prepare proto entries for payload type 0x4001 *\/\n+ register_proto_doip_payload_4001(proto_doip);\n+\n \/* prepare proto entries for payload type 0x8001 *\/\n register_proto_doip_payload_8001(proto_doip);\n \n"} {"commit":"b932591750fbaddb7c6f180804f626911b2f0419","subject":"Fix LU-24: add \"sensor-max-adcs\"","message":"Fix LU-24: add \"sensor-max-adcs\"\n","repos":"ufo-kit\/libuca,miq\/libuca,ufo-kit\/libuca,ufo-kit\/libuca,miq\/libuca,miq\/libuca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/cameras\/uca-pco-camera.c\n+++ src\/cameras\/uca-pco-camera.c\n@@ -101,6 +101,7 @@\n PROP_SENSOR_PIXELRATES,\n PROP_SENSOR_PIXELRATE,\n PROP_SENSOR_ADCS,\n+ PROP_SENSOR_MAX_ADCS,\n PROP_DELAY_TIME,\n PROP_HAS_DOUBLE_IMAGE_MODE,\n PROP_DOUBLE_IMAGE_MODE,\n@@ -267,7 +268,7 @@\n return err;\n }\n \n-void property_override_default_guint_value (GObjectClass *oclass, const gchar *property_name, guint new_default)\n+static void property_override_default_guint_value (GObjectClass *oclass, const gchar *property_name, guint new_default)\n {\n GParamSpecUInt *pspec = G_PARAM_SPEC_UINT (g_object_class_find_property (oclass, property_name));\n \n@@ -944,6 +945,13 @@\n }\n break;\n \n+ case PROP_SENSOR_MAX_ADCS:\n+ {\n+ GParamSpecUInt *spec = (GParamSpecUInt *) pco_properties[PROP_SENSOR_ADCS];\n+ g_value_set_uint(value, spec->maximum);\n+ }\n+ break;\n+\n case PROP_SENSOR_PIXELRATES:\n g_value_set_boxed(value, priv->pixelrates);\n break;\n@@ -1350,6 +1358,13 @@\n 1, 2, 1, \n G_PARAM_READWRITE);\n \n+ pco_properties[PROP_SENSOR_MAX_ADCS] = \n+ g_param_spec_uint(\"sensor-max-adcs\",\n+ \"Maximum number of ADCs\",\n+ \"Maximum number of ADCs that can be set with \\\"sensor-adcs\\\"\",\n+ 1, G_MAXUINT, 1, \n+ G_PARAM_READABLE);\n+\n pco_properties[PROP_TIMESTAMP_MODE] =\n g_param_spec_flags(\"timestamp-mode\",\n \"Timestamp mode\",\n"} {"commit":"3296821cef80373e6ad461115d005f573d41a9fe","subject":"Fix: return correct bit number","message":"Fix: return correct bit number\n","repos":"miq\/libuca,ufo-kit\/libuca,miq\/libuca,ufo-kit\/libuca,miq\/libuca,ufo-kit\/libuca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/cameras\/uca-ufo-camera.c\n+++ src\/cameras\/uca-ufo-camera.c\n@@ -323,7 +323,10 @@\n case 2:\n g_value_set_uint (value, 12);\n break;\n+ default:\n+ g_warning (\"Bit mode unknown\");\n }\n+ break;\n case PROP_SENSOR_HORIZONTAL_BINNING:\n g_value_set_uint(value, 1);\n break;\n"} {"commit":"c0d9b2011314355d9cdea798bbe2415435a26458","subject":"Common: updated kalman filter","message":"Common: updated kalman filter\n","repos":"wanglei828\/apollo,jinghaomiao\/apollo,ycool\/apollo,wanglei828\/apollo,jinghaomiao\/apollo,ycool\/apollo,xiaoxq\/apollo,xiaoxq\/apollo,xiaoxq\/apollo,xiaoxq\/apollo,jinghaomiao\/apollo,jinghaomiao\/apollo,ApolloAuto\/apollo,xiaoxq\/apollo,ycool\/apollo,wanglei828\/apollo,wanglei828\/apollo,ApolloAuto\/apollo,jinghaomiao\/apollo,ApolloAuto\/apollo,ApolloAuto\/apollo,ApolloAuto\/apollo,ycool\/apollo,ApolloAuto\/apollo,jinghaomiao\/apollo,ycool\/apollo,ycool\/apollo,xiaoxq\/apollo,wanglei828\/apollo,wanglei828\/apollo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/common\/math\/kalman_filter.h\n+++ modules\/common\/math\/kalman_filter.h\n@@ -250,7 +250,9 @@\n inline void KalmanFilter<T, XN, ZN, UN>::Predict(\n const Eigen::Matrix<T, UN, 1> &u) {\n CHECK(is_initialized_);\n+\n x_ = F_ * x_ + B_ * u;\n+\n P_ = F_ * P_ * F_.transpose() + Q_;\n }\n \n"} {"commit":"11821b2e27d51ef802aca7a7cc1c819d03135dc8","subject":"add, mul, add+mul: Add $c output.","message":"add, mul, add+mul: Add $c output.\n","repos":"hakzsam\/envytools,kfractal\/envytools,envytools\/envytools,grate-driver\/envytools,kfractal\/envytools,envytools\/envytools,pierremoreau\/envytools,hakzsam\/envytools,kfractal\/envytools,grate-driver\/envytools,kfractal\/envytools,karolherbst\/envytools,hakzsam\/envytools,pierremoreau\/envytools,grate-driver\/envytools,karolherbst\/envytools,pierremoreau\/envytools,karolherbst\/envytools,grate-driver\/envytools,envytools\/envytools,hakzsam\/envytools,kfractal\/envytools,MoochMcGee\/envytools,MoochMcGee\/envytools,MoochMcGee\/envytools,karolherbst\/envytools,envytools\/envytools,pierremoreau\/envytools,MoochMcGee\/envytools,grate-driver\/envytools,envytools\/envytools,pierremoreau\/envytools,karolherbst\/envytools,hakzsam\/envytools,MoochMcGee\/envytools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nvc0dis.c\n+++ nvc0dis.c\n@@ -789,12 +789,12 @@\n \t{ 0x0800000000000000ull, 0xf800000000000007ull, T(minmax), T(faf), N(\"f32\"), DST, T(acout), T(neg1), T(abs1), SRC1, T(neg2), T(abs2), T(fs2) },\n \t{ 0x1000000000000000ull, 0xf000000000000007ull, N(\"set\"), T(setftz), T(setdt), DST, T(acout), T(setit), N(\"f32\"), T(neg1), T(abs1), SRC1, T(neg2), T(abs2), T(fs2), T(setlop) },\n \t{ 0x2000000000000000ull, 0xf000000000000007ull, N(\"set\"), T(setftz), PDST, PDSTN, T(setit), N(\"f32\"), T(neg1), T(abs1), SRC1, T(neg2), T(abs2), T(fs2), T(setlop) },\n-\t{ 0x3000000000000000ull, 0xf800000000000007ull, N(\"add\"), T(fmf), T(ias), T(farm), N(\"f32\"), DST, T(neg1), N(\"mul\"), T(fmz), SRC1, T(fs2w3), T(neg2), T(is3) },\n+\t{ 0x3000000000000000ull, 0xf800000000000007ull, N(\"add\"), T(fmf), T(ias), T(farm), N(\"f32\"), DST, T(acout), T(neg1), N(\"mul\"), T(fmz), SRC1, T(fs2w3), T(neg2), T(is3) },\n \t{ 0x3800000000000000ull, 0xf800000000000007ull, N(\"slct\"), N(\"b32\"), DST, SRC1, T(fs2w3), T(setit), N(\"f32\"), T(is3) },\n \t\/\/ 40?\n \t{ 0x4800000000000000ull, 0xf800000000000007ull, N(\"quadop\"), N(\"f32\"), T(qop0), T(qop1), T(qop2), T(qop3), DST, T(qs1), SRC1, T(fs2) },\n-\t{ 0x5000000000000000ull, 0xf800000000000007ull, N(\"add\"), T(faf), T(fas), T(farm), N(\"f32\"), DST, T(neg1), T(abs1), SRC1, T(neg2), T(abs2), T(fs2) },\n-\t{ 0x5800000000000000ull, 0xf800000000000007ull, N(\"mul\"), T(fmz), T(fmf), T(ias), T(farm), T(fmneg), N(\"f32\"), DST, SRC1, T(fs2) },\n+\t{ 0x5000000000000000ull, 0xf800000000000007ull, N(\"add\"), T(faf), T(fas), T(farm), N(\"f32\"), DST, T(acout), T(neg1), T(abs1), SRC1, T(neg2), T(abs2), T(fs2) },\n+\t{ 0x5800000000000000ull, 0xf800000000000007ull, N(\"mul\"), T(fmz), T(fmf), T(ias), T(farm), T(fmneg), N(\"f32\"), DST, T(acout), SRC1, T(fs2) },\n \t{ 0x6000000000000000ull, 0xf800000000000027ull, N(\"presin\"), N(\"f32\"), DST, T(neg2), T(abs2), T(fs2) },\n \t{ 0x6000000000000020ull, 0xf800000000000027ull, N(\"preex2\"), N(\"f32\"), DST, T(neg2), T(abs2), T(fs2) },\n \t\/\/ 68-b8?\n"} {"commit":"a29985ec6f4f86216f7a11e15f36500b7eb1fbde","subject":"ogrErrorHandler: validate err_no to avoid potential out of array access (#165)","message":"ogrErrorHandler: validate err_no to avoid potential out of array access (#165)\n\nSecurity in case new error numbers would be added.","repos":"pramsey\/pgsql-ogr-fdw,mysidewalk\/pgsql-ogr-fdw,pramsey\/pgsql-ogr-fdw","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ogr_fdw.c\n+++ ogr_fdw.c\n@@ -189,10 +189,22 @@\n \t\"AWSSignatureDoesNotMatch\"\n };\n \n+\/* In theory this function should be declared \"static void CPL_STDCALL\" *\/\n+\/* since this is the official signature of error handler callbacks. *\/\n+\/* That would be needed if both GDAL and ogr_fdw were compiled with Visual *\/\n+\/* Studio, but with non-Visual Studio compilers, the macro expands to empty, *\/\n+\/* so if both GDAL and ogr_fdw are compiled with gcc things are fine. In case *\/\n+\/* of mixes, crashes may occur but there is no clean fix... So let this as a note *\/\n+\/* in case of future issue... *\/\n static void\n ogrErrorHandler(CPLErr eErrClass, int err_no, const char* msg)\n {\n-\tconst char* gdalErrType = gdalErrorTypes[err_no];\n+\tconst char* gdalErrType = \"unknown type\";\n+\tif (err_no >= 0 && err_no <\n+\t (int)sizeof(gdalErrorTypes)\/sizeof(gdalErrorTypes[0]))\n+\t{\n+\t\tgdalErrType = gdalErrorTypes[err_no];\n+\t}\n \tswitch (eErrClass)\n \t{\n \tcase CE_None:\n"} {"commit":"e323daeab2301fb162a5c35714bde22a2d4478a6","subject":"Add application","message":"Add application\n","repos":"burz\/cfl,burz\/cfl,burz\/cfl,burz\/cfl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cfl_type.typed_program.c\n+++ src\/cfl_type.typed_program.c\n@@ -601,6 +601,106 @@\n return cfl_generate_typed_node_for_binary_expression(\n equations, hypothesis_head, definitions, &cfl_create_new_type_integer,\n &cfl_create_new_type_bool, node);\n+ else if(node->type == CFL_NODE_APPLICATION)\n+ {\n+ cfl_typed_node* typed_argument = cfl_generate_typed_node(\n+ equations, hypothesis_head, definitions, node->children[1]);\n+\n+ if(!typed_argument)\n+ return 0;\n+\n+ cfl_type* argument_type = cfl_copy_new_type(typed_argument->resulting_type);\n+\n+ if(!argument_type)\n+ {\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ unsigned int id = cfl_type_get_next_id();\n+\n+ cfl_type* result_type = cfl_create_new_type_variable(id);\n+\n+ if(!result_type)\n+ {\n+ cfl_free_type(argument_type);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ cfl_type* arrow = cfl_create_new_type_arrow(argument_type, result_type);\n+\n+ if(!arrow)\n+ {\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ cfl_typed_node* typed_function = cfl_generate_typed_node(\n+ equations, hypothesis_head, definitions, node->children[0]);\n+\n+ if(!typed_function)\n+ {\n+ cfl_free_type(arrow);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ free(node->children[0]);\n+ free(node->children[1]);\n+ free(node->children);\n+\n+ node->number_of_children = 0;\n+\n+ cfl_type* function_type = cfl_copy_new_type(typed_function->resulting_type);\n+\n+ if(!function_type)\n+ {\n+ cfl_free_typed_node(typed_function);\n+ cfl_free_type(arrow);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ if(!cfl_add_type_equations(equations, function_type, arrow))\n+ {\n+ cfl_free_typed_node(typed_function);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ result_type = cfl_create_new_type_variable(id);\n+\n+ if(!result_type)\n+ {\n+ cfl_free_type(argument_type);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ cfl_typed_node** children = cfl_type_malloc(sizeof(cfl_typed_node*) * 2);\n+\n+ if(!children)\n+ {\n+ cfl_free_type(result_type);\n+ cfl_free_typed_node(typed_function);\n+ cfl_free_typed_node(typed_argument);\n+\n+ return 0;\n+ }\n+\n+ children[0] = typed_function;\n+ children[1] = typed_argument;\n+\n+ return cfl_create_typed_node(CFL_NODE_APPLICATION, result_type, 2, 0, children);\n+ }\n \n return 0;\n }\n"} {"commit":"28fe6cebd7f7b1060f1fcc75eb8e06a9b4347983","subject":"Automated g4 rollback of changelist 386316152.","message":"Automated g4 rollback of changelist 386316152.\n\n*** Reason for rollback ***\n\nRoll forward of cl\/384571235\n\nYT config update for finch experiment around ACCEPT_CH over TLS\n\n * Trigger is 'YTCH' connection opt\n\nNEW: Re-ordered config for consistency.\nThis rollout is going *after* the finch experiment has started as opposed to the previous change that went *before*.\n\n*** Original change description ***\n\nAutomated g4 rollback of changelist 384571235.\n\n*** Reason for rollback ***\n\nomg\/37605\n\n*** Original change description ***\n\nYT config update for finch experiment around ACCEPT_CH over TLS\n\n * Trigger is 'YTCH' connection opt\n\nNote: This change has no effect on runtime behavior until the finch experiment is started.\n\n***\n\n***\n\nPiperOrigin-RevId: 407709077\n","repos":"google\/quiche,google\/quiche,google\/quiche,google\/quiche","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- quic\/core\/crypto\/crypto_protocol.h\n+++ quic\/core\/crypto\/crypto_protocol.h\n@@ -433,6 +433,7 @@\n \n \/\/ Client Hints triggers.\n const QuicTag kGWCH = TAG('G', 'W', 'C', 'H');\n+const QuicTag kYTCH = TAG('Y', 'T', 'C', 'H');\n \n \/\/ Rejection tags\n const QuicTag kRREJ = TAG('R', 'R', 'E', 'J'); \/\/ Reasons for server sending\n"} {"commit":"d6a125a11a172c78236a0f286b358b155b4f4c85","subject":"fix RGB color parsing from config","message":"fix RGB color parsing from config\n","repos":"milkey-mouse\/BamboozLED,milkey-mouse\/BamboozLED","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- options.c\n+++ options.c\n@@ -203,9 +203,9 @@\n \/\/ parse each color\n for (int i = 0; i < 3; i++)\n {\n- if (tok[i + 1].type == JSMN_PRIMITIVE && isdigit(jsonStr[tok[2].start]))\n- {\n- unsigned long p = strtoul(jsonStr + tok[2].start, NULL, 0);\n+ if (tok[i + 1].type == JSMN_PRIMITIVE && isdigit(jsonStr[tok[i + 1].start]))\n+ {\n+ unsigned long p = strtoul(jsonStr + tok[i + 1].start, NULL, 0);\n if (errno == ERANGE || p > 255)\n {\n fputs(\"[r, g, b] must be 0-255\\n\", stderr);\n"} {"commit":"88c800fcda7d083334aa7291366a3839d0dcfa5e","subject":"Add NewArbitrary for CaseResult","message":"Add NewArbitrary for CaseResult\n","repos":"unapiedra\/rapidfuzz,whoshuu\/rapidcheck,tm604\/rapidcheck,tm604\/rapidcheck,unapiedra\/rapidfuzz,emil-e\/rapidcheck,whoshuu\/rapidcheck,emil-e\/rapidcheck,emil-e\/rapidcheck,tm604\/rapidcheck,unapiedra\/rapidfuzz,whoshuu\/rapidcheck","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- test\/util\/Generators.h\n+++ test\/util\/Generators.h\n@@ -97,6 +97,18 @@\n };\n \n template<>\n+struct NewArbitrary<detail::CaseResult::Type>\n+{\n+ static Gen<detail::CaseResult::Type> arbitrary()\n+ {\n+ return newgen::element(\n+ detail::CaseResult::Type::Success,\n+ detail::CaseResult::Type::Failure,\n+ detail::CaseResult::Type::Discard);\n+ }\n+};\n+\n+template<>\n class Arbitrary<detail::CaseResult> : public gen::Generator<detail::CaseResult>\n {\n public:\n@@ -106,6 +118,20 @@\n result.type = *gen::arbitrary<detail::CaseResult::Type>();\n result.description = *gen::arbitrary<std::string>();\n return result;\n+ }\n+};\n+\n+template<>\n+struct NewArbitrary<detail::CaseResult>\n+{\n+ static Gen<detail::CaseResult> arbitrary()\n+ {\n+ return newgen::exec([]{\n+ detail::CaseResult result;\n+ result.type = *newgen::arbitrary<detail::CaseResult::Type>();\n+ result.description = *newgen::arbitrary<std::string>();\n+ return result;\n+ });\n }\n };\n \n"} {"commit":"88ab3ca96e31e91a3375d8eec2239bd55551a7cd","subject":"improve org-mode","message":"improve org-mode\n\n* org_scan_chunk: no longer checks for space before chunk\n* org_colorize_line: better check for heading line\n* org_colorize_line: check for chunks after white space\n* simplify do_org_todo\n* add new functions:\n - do_org_mark_element (M-h)\n - do_org_mark_subtree (C-c @)\n","repos":"dmacvicar\/qemacs,dmacvicar\/qemacs,dmacvicar\/qemacs,dmacvicar\/qemacs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- orgmode.c\n+++ orgmode.c\n@@ -49,8 +49,8 @@\n QE_STYLE_TYPE,\n };\n \n-#if 0\n-static int str4_match_str(unsigned int *str, int n, const char *str1)\n+static int str4_match_str(unsigned int *str, int n, const char *str1,\n+ int *matchlen)\n {\n int i;\n \n@@ -58,22 +58,26 @@\n if (str[i] != str1[i])\n return 0;\n }\n- return i;\n-}\n-\n+ if (matchlen)\n+ *matchlen = i;\n+ return 1;\n+}\n+\n+#if 0\n static int str4_find_str(unsigned int *str, int n, const char *str1)\n {\n int i, c = str1[0];\n \n for (i = 0; i < n; i++) {\n- if (str[i] == c && str4_match_str(str + i, n - i, str1))\n+ if (str[i] == c && str4_match_str(str + i, n - i, str1, NULL))\n return i;\n }\n return -1;\n }\n #endif\n \n-static int str4_match_istr(unsigned int *str, int n, const char *str1)\n+static int str4_match_istr(unsigned int *str, int n, const char *str1,\n+ int *matchlen)\n {\n int i;\n \n@@ -81,7 +85,9 @@\n if (qe_toupper(str[i]) != qe_toupper(str1[i]))\n return 0;\n }\n- return i;\n+ if (matchlen)\n+ *matchlen = i;\n+ return 1;\n }\n \n static int str4_find_istr(unsigned int *str, int n, const char *str1)\n@@ -89,32 +95,22 @@\n int i, c = qe_toupper(str1[0]);\n \n for (i = 0; i < n; i++) {\n- if (qe_toupper(str[i]) == c && str4_match_istr(str + i, n - i, str1))\n+ if (qe_toupper(str[i]) == c\n+ && str4_match_istr(str + i, n - i, str1, NULL)) {\n return i;\n+ }\n }\n return -1;\n }\n \n static int org_todo_keyword(unsigned int *str, int n)\n {\n- int i, c, klen;\n- char kbuf[32];\n-\n- klen = 0;\n- for (i = 0; i < n && qe_isalpha(c = str[i]); i++) {\n- if (klen < countof(kbuf) - 1)\n- kbuf[klen++] = c;\n- else\n- break;\n- }\n- kbuf[klen] = '\\0';\n- if (klen > 0 && c == ' ') {\n- int k;\n- for (k = 0; k < countof(OrgTodoKeywords); k++) {\n- if (!strcmp(kbuf, OrgTodoKeywords[k].keyword)) {\n- return k;\n- }\n- }\n+ int kw, j;\n+\n+ for (kw = 0; kw < countof(OrgTodoKeywords); kw++) {\n+ if (str4_match_str(str, n, OrgTodoKeywords[kw].keyword, &j)\n+ && j < n && str[j] == ' ')\n+ return kw;\n }\n return -1;\n }\n@@ -123,9 +119,6 @@\n const char *begin, const char *end, int min_width)\n {\n int i = i0, j;\n-\n- if (i > 0 && str[i - 1] != ' ')\n- return 0;\n \n for (j = 0; begin[j]; j++) {\n if (str[i + j] != begin[j])\n@@ -146,12 +139,12 @@\n __unused__ int state_only)\n {\n int colstate = *statep;\n- int i = 0, j = 0, kw, bullets, base_style = 0;\n+ int i = 0, j = 0, kw, base_style = 0, has_space;\n \n if (colstate & IN_BLOCK) {\n for (j = i; j < n && str[j] == ' '; )\n j++;\n- if (str4_match_istr(str + j, n - j, \"#+end_\")) {\n+ if (str4_match_istr(str + j, n - j, \"#+end_\", NULL)) {\n colstate &= ~(IN_BLOCK | IN_LISP);\n } else {\n if (colstate & IN_LISP) {\n@@ -164,19 +157,22 @@\n }\n }\n \n- for (bullets = 0; bullets < n && str[bullets] == '*'; bullets++)\n- continue;\n-\n- if (bullets > 0) {\n- base_style = OrgBulletStyles[(bullets - 1) % BULLET_STYLES];\n- set_color(str, str + bullets + 1, base_style);\n- i = bullets + 1;\n-\n- kw = org_todo_keyword(str + i, n - i);\n- if (kw > -1) {\n- int kwlen = strlen(OrgTodoKeywords[kw].keyword);\n- set_color(str + i, str + i + kwlen, OrgTodoKeywords[kw].style);\n- i += kwlen;\n+ if (str[i] == '*') {\n+ \/* Check for heading: initial string of '*' followed by ' ' *\/\n+ for (j = i + 1; j < n && str[j] == '*'; j++)\n+ continue;\n+\n+ if (j < n && str[j] == ' ') {\n+ base_style = OrgBulletStyles[(j - i - 1) % BULLET_STYLES];\n+ set_color(str + i, str + j + 1, base_style);\n+ i = j + 1;\n+\n+ kw = org_todo_keyword(str + i, n - i);\n+ if (kw > -1) {\n+ j = i + strlen(OrgTodoKeywords[kw].keyword) + 1;\n+ set_color(str + i, str + j, OrgTodoKeywords[kw].style);\n+ i = j;\n+ }\n }\n } else {\n while (i < n && str[i] == ' ')\n@@ -193,7 +189,7 @@\n * #+BEGIN_LATEX \/ #+END_LATEX\n * #+BEGIN_SRC \/ #+END_SRC\n *\/\n- if (str4_match_istr(str + i, n - i, \"#+begin_\")) {\n+ if (str4_match_istr(str + i, n - i, \"#+begin_\", NULL)) {\n colstate |= IN_BLOCK;\n if (str4_find_istr(str + i, n - i, \"lisp\")) {\n colstate |= IN_LISP;\n@@ -223,84 +219,92 @@\n }\n }\n \n+ has_space = 1;\n+\n while (i < n) {\n int chunk = 0;\n int c = str[i];\n \n- switch (c) {\n- case '#':\n- break;\n- case '*': \/* bold *\/\n- chunk = org_scan_chunk(str, i, n, \"*\", \"*\", 1);\n- break;\n- case '\/': \/* italic *\/\n- chunk = org_scan_chunk(str, i, n, \"\/\", \"\/\", 1);\n- break;\n- case '_': \/* underline *\/\n- chunk = org_scan_chunk(str, i, n, \"_\", \"_\", 1);\n- break;\n- case '=': \/* code *\/\n- chunk = org_scan_chunk(str, i, n, \"=\", \"=\", 1);\n- break;\n- case '~': \/* verbatim *\/\n- chunk = org_scan_chunk(str, i, n, \"~\", \"~\", 1);\n- break;\n- case '+': \/* strike-through *\/\n- chunk = org_scan_chunk(str, i, n, \"+\", \"+\", 1);\n- break;\n- case '@': \/* litteral stuff @@...@@ *\/\n- chunk = org_scan_chunk(str, i, n, \"@@\", \"@@\", 1);\n- break;\n- case '[': \/* wiki syntax for links [[...]..[...]] *\/\n- chunk = org_scan_chunk(str, i, n, \"[[\", \"]]\", 1);\n- break;\n- case '{': \/* LaTeX syntax for macros {{{...}}} and {} *\/\n- if (str[i + 1] == '}')\n- chunk = 2;\n- else\n- chunk = org_scan_chunk(str, i, n, \"{{{\", \"}}}\", 1);\n- break;\n- case '\\\\': \/* TeX syntax: \\keyword \\- \\[ \\] \\( \\) *\/\n- if (str[i + 1] == '\\\\') { \/* \\\\ escape *\/\n- set_color(str + i, str + i + 2, base_style);\n- i += 2;\n- continue;\n- }\n- if (str[i + 1] == '-') {\n- chunk = 2;\n- break;\n- }\n- for (chunk = 1; i + chunk < n\n- && qe_isalnum(str[i + chunk]); chunk++) {\n- continue;\n- }\n- if (chunk > 0)\n- break;\n- chunk = org_scan_chunk(str, i, n, \"\\\\(\", \"\\\\)\", 1);\n- if (chunk > 0)\n- break;\n- chunk = org_scan_chunk(str, i, n, \"\\\\[\", \"\\\\]\", 1);\n- if (chunk > 0)\n- break;\n- break;\n- case '-': \/* Colorize special glyphs -- and --- *\/\n- if (i == 0 || str[i - 1] == ' ') {\n+ if (has_space || c == '\\\\') {\n+ switch (c) {\n+ case '#':\n+ break;\n+ case '*': \/* bold *\/\n+ chunk = org_scan_chunk(str, i, n, \"*\", \"*\", 1);\n+ break;\n+ case '\/': \/* italic *\/\n+ chunk = org_scan_chunk(str, i, n, \"\/\", \"\/\", 1);\n+ break;\n+ case '_': \/* underline *\/\n+ chunk = org_scan_chunk(str, i, n, \"_\", \"_\", 1);\n+ break;\n+ case '=': \/* code *\/\n+ chunk = org_scan_chunk(str, i, n, \"=\", \"=\", 1);\n+ break;\n+ case '~': \/* verbatim *\/\n+ chunk = org_scan_chunk(str, i, n, \"~\", \"~\", 1);\n+ break;\n+ case '+': \/* strike-through *\/\n+ chunk = org_scan_chunk(str, i, n, \"+\", \"+\", 1);\n+ break;\n+ case '@': \/* litteral stuff @@...@@ *\/\n+ chunk = org_scan_chunk(str, i, n, \"@@\", \"@@\", 1);\n+ break;\n+ case '[': \/* wiki syntax for links [[...]..[...]] *\/\n+ chunk = org_scan_chunk(str, i, n, \"[[\", \"]]\", 1);\n+ break;\n+ case '{': \/* LaTeX syntax for macros {{{...}}} and {} *\/\n+ if (str[i + 1] == '}')\n+ chunk = 2;\n+ else\n+ chunk = org_scan_chunk(str, i, n, \"{{{\", \"}}}\", 1);\n+ break;\n+ case '\\\\': \/* TeX syntax: \\keyword \\- \\[ \\] \\( \\) *\/\n+ if (str[i + 1] == '\\\\') { \/* \\\\ escape *\/\n+ set_color(str + i, str + i + 2, base_style);\n+ i += 2;\n+ continue;\n+ }\n+ if (str[i + 1] == '-') {\n+ chunk = 2;\n+ break;\n+ }\n+ for (chunk = 1; i + chunk < n\n+ && qe_isalnum(str[i + chunk]); chunk++) {\n+ continue;\n+ }\n+ if (chunk > 0)\n+ break;\n+ chunk = org_scan_chunk(str, i, n, \"\\\\(\", \"\\\\)\", 1);\n+ if (chunk > 0)\n+ break;\n+ chunk = org_scan_chunk(str, i, n, \"\\\\[\", \"\\\\]\", 1);\n+ if (chunk > 0)\n+ break;\n+ break;\n+ case '-': \/* Colorize special glyphs -- and --- *\/\n if (str[i + 1] == '-') {\n chunk = 2;\n if (str[i + 2] == '-')\n chunk++;\n break;\n }\n- }\n- break;\n- case '.': \/* Colorize special glyph ... *\/\n- if (str[i + 1] == '.' && str[i + 2] == '.') {\n- chunk = 3;\n- break;\n- }\n- break;\n- default:\n- break;\n+ break;\n+ case '.': \/* Colorize special glyph ... *\/\n+ if (str[i + 1] == '.' && str[i + 2] == '.') {\n+ chunk = 3;\n+ break;\n+ }\n+ break;\n+ case ' ':\n+ has_space = 1;\n+ break;\n+ default:\n+ has_space = 0;\n+ break;\n+ }\n+ } else {\n+ has_space = (str[i] == ' ');\n }\n if (chunk) {\n set_color(str + i, str + i + chunk, QE_STYLE_STRING);\n@@ -481,10 +485,31 @@\n s->offset = offset;\n }\n \n+static void do_org_mark_element(EditState *s, int subtree)\n+{\n+ QEmacsState *qs = s->qe_state;\n+ int offset, offset1, level;\n+\n+ offset = org_find_heading(s, s->offset, &level);\n+ if (offset < 0) {\n+ put_status(s, \"before first heading\");\n+ return;\n+ }\n+ offset1 = org_next_heading(s, offset, subtree ? level : MAX_LEVEL, NULL);\n+\n+ \/* XXX: if repeating last command, add subtree to region *\/\n+ if (qs->last_cmd_func != qs->this_cmd_func)\n+ s->b->mark = offset;\n+\n+ s->offset = offset1;\n+ \/* activate region hilite *\/\n+ if (s->qe_state->hilite_region)\n+ s->region_style = QE_STYLE_REGION_HILITE;\n+}\n+\n static void do_org_todo(EditState *s)\n {\n- int offset, offsetl, bullets, len, kw;\n- unsigned int buf[MAX_BUF_SIZE];\n+ int offset, offset1, bullets, kw;\n \n if (check_read_only(s))\n return;\n@@ -496,20 +521,20 @@\n }\n \n offset = eb_skip_chars(s->b, offset, bullets + 1);\n- offsetl = offset;\n- len = eb_get_line(s->b, buf, countof(buf), &offsetl);\n-\n- kw = org_todo_keyword(buf, len);\n- if (kw > -1) {\n- int kwlen = strlen(OrgTodoKeywords[kw].keyword);\n- eb_delete_chars(s->b, offset, kwlen + 1);\n- }\n-\n- kw++;\n+ for (kw = 0; kw < countof(OrgTodoKeywords); kw++) {\n+ if (eb_match_str(s->b, offset, OrgTodoKeywords[kw].keyword, &offset1)\n+ && eb_match_uchar(s->b, offset1, ' ', &offset1)) {\n+ eb_delete_range(s->b, offset, offset1);\n+ break;\n+ }\n+ }\n+ if (kw == countof(OrgTodoKeywords))\n+ kw = 0;\n+ else\n+ kw++;\n \n if (kw < countof(OrgTodoKeywords)) {\n- int kwlen = strlen(OrgTodoKeywords[kw].keyword);\n- offset += eb_insert_utf8_buf(s->b, offset, OrgTodoKeywords[kw].keyword, kwlen);\n+ offset += eb_insert_str(s->b, offset, OrgTodoKeywords[kw].keyword);\n eb_insert_uchar(s->b, offset, ' ');\n }\n }\n@@ -713,6 +738,10 @@\n CMD2( KEY_CTRLC(KEY_CTRL('j')), KEY_NONE, \/* C-c C-j *\/\n \"org-goto\", do_org_goto, ESs,\n \"s{select location to jump to: }[orgjump]|orgjump|\")\n+ CMD3( KEY_META('h'), KEY_NONE, \/* M-h *\/\n+ \"org-mark-element\", do_org_mark_element, ESi, 0, \"v\")\n+ CMD3( KEY_CTRLC('@'), KEY_NONE, \/* C-c @ *\/\n+ \"org-mark-subtree\", do_org_mark_element, ESi, 1, \"v\")\n \/* Editing *\/\n CMD2( KEY_CTRLC(KEY_CTRL('t')), KEY_NONE, \/* C-c C-t *\/\n \"org-todo\", do_org_todo, ES, \"*\")\n"} {"commit":"8fa32646f02a3fef13f9a24dda70f92660699878","subject":"Lifted symmetry-breaking constraints","message":"Lifted symmetry-breaking constraints\n","repos":"ls-cwi\/heinz,ls-cwi\/heinz,ls-cwi\/heinz,ls-cwi\/heinz","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/solver\/impl\/cutsolverunrootedimpl.h\n+++ src\/solver\/impl\/cutsolverunrootedimpl.h\n@@ -166,14 +166,16 @@\n }\n \n \/\/ root node has to be positive\n+ expr.clear();\n for (int i = 0; i < _n; i++)\n {\n double weight_i = weight[_invNode[i]];\n if (weight_i < 0)\n {\n- _model.add(_y[i] == 0);\n- }\n- }\n+ expr += _y[i];\n+ }\n+ }\n+ _model.add(expr == 0);\n \n \/\/ objective must be positive\n expr.clear();\n@@ -208,11 +210,11 @@\n \/\/ must be part of the solution as well\n \/\/ if you get in, you have to get out as well\n \/\/ BIG FAT WARNING: not true for xHeinz!!!\n- if (g_verbosity >= VERBOSE_NON_ESSENTIAL)\n+ if (g_verbosity >= VERBOSE_DEBUG)\n {\n std::cout << std::endl;\n }\n- int idx = 0;\n+ int idx = 1;\n for (NodeIt i(g); i != lemon::INVALID; ++i, ++idx)\n {\n if (g_verbosity >= VERBOSE_DEBUG)\n@@ -232,14 +234,16 @@\n else\n {\n \/\/ symmetry breaking\n+ \/\/ sum_{j > i, w_j > 0} y_j <= 1 - x_i\n int id_i = (*_pNode)[i];\n- \n- for (int id_j = 0; id_j < id_i; ++id_j)\n+ expr.clear();\n+ for (int id_j = id_i + 1; id_j < _n; ++id_j)\n {\n Node j = _invNode[id_j];\n if (weight[j] < 0) continue;\n- _model.add(_y[id_i] <= 1 - _x[id_j]);\n+ expr += _y[id_j];\n }\n+ _model.add(expr <= 1 - _x[id_i]);\n }\n }\n if (g_verbosity >= VERBOSE_DEBUG)\n"} {"commit":"333137a3b111ea19d3a9b363dd3c766543e92ad5","subject":"Rename remaining albumart function to media_art","message":"Rename remaining albumart function to media_art\n","repos":"outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,outofbits\/tracker,outofbits\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker,outofbits\/tracker,hoheinzollern\/tracker","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tracker-extract\/tracker-media-art.c\n+++ src\/tracker-extract\/tracker-media-art.c\n@@ -82,7 +82,7 @@\n static GDBusConnection *connection;\n \n static void\n-albumart_queue_cb (GObject *source_object,\n+media_art_queue_cb (GObject *source_object,\n GAsyncResult *res,\n gpointer user_data);\n \n@@ -777,12 +777,12 @@\n }\n \n static void\n-albumart_request_download (TrackerStorage *storage,\n- TrackerMediaArtType type,\n- const gchar *album,\n- const gchar *artist,\n- const gchar *local_uri,\n- const gchar *art_path)\n+media_art_request_download (TrackerStorage *storage,\n+ TrackerMediaArtType type,\n+ const gchar *album,\n+ const gchar *artist,\n+ const gchar *local_uri,\n+ const gchar *art_path)\n {\n \tif (connection) {\n \t\tGetFileInfo *info;\n@@ -816,7 +816,7 @@\n \t\t G_DBUS_CALL_FLAGS_NONE,\n \t\t -1,\n \t\t NULL,\n-\t\t albumart_queue_cb,\n+\t\t media_art_queue_cb,\n \t\t info);\n \t}\n }\n@@ -892,9 +892,9 @@\n }\n \n static void\n-albumart_queue_cb (GObject *source_object,\n- GAsyncResult *res,\n- gpointer user_data)\n+media_art_queue_cb (GObject *source_object,\n+ GAsyncResult *res,\n+ gpointer user_data)\n {\n \tGError *error = NULL;\n \tGetFileInfo *info;\n@@ -1087,12 +1087,12 @@\n \t\t\t\t * media-art to the media-art\n \t\t\t\t * downloaders\n \t\t\t\t *\/\n-\t\t\t\talbumart_request_download (media_art_storage,\n-\t\t\t\t type,\n-\t\t\t\t artist,\n-\t\t\t\t title,\n-\t\t\t\t local_art_uri,\n-\t\t\t\t art_path);\n+\t\t\t\tmedia_art_request_download (media_art_storage,\n+\t\t\t\t type,\n+\t\t\t\t artist,\n+\t\t\t\t title,\n+\t\t\t\t local_art_uri,\n+\t\t\t\t art_path);\n \t\t\t}\n \n \t\t\tset_mtime (art_path, mtime);\n"} {"commit":"f8710c79adc55708a6484a0dcd3ce3d0ddd57284","subject":"Cosmetic fix: Unify the Q_DISABLE_COPY macro","message":"Cosmetic fix: Unify the Q_DISABLE_COPY macro\n\nQ_DISABLE_COPY must make the copy constructor and assignment\noperator private in all cases, otherwise the compiler will create\nimplicit versions when exception support is on.\n","repos":"pruiz\/wkhtmltopdf-qt,radekp\/qt,pruiz\/wkhtmltopdf-qt,radekp\/qt,igor-sfdc\/qt-wk,pruiz\/wkhtmltopdf-qt,igor-sfdc\/qt-wk,pruiz\/wkhtmltopdf-qt,igor-sfdc\/qt-wk,igor-sfdc\/qt-wk,igor-sfdc\/qt-wk,igor-sfdc\/qt-wk,igor-sfdc\/qt-wk,radekp\/qt,radekp\/qt,pruiz\/wkhtmltopdf-qt,igor-sfdc\/qt-wk,pruiz\/wkhtmltopdf-qt,radekp\/qt,pruiz\/wkhtmltopdf-qt,radekp\/qt,pruiz\/wkhtmltopdf-qt,igor-sfdc\/qt-wk,radekp\/qt,igor-sfdc\/qt-wk,radekp\/qt,pruiz\/wkhtmltopdf-qt,pruiz\/wkhtmltopdf-qt,pruiz\/wkhtmltopdf-qt,radekp\/qt,radekp\/qt,igor-sfdc\/qt-wk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/corelib\/global\/qglobal.h\n+++ src\/corelib\/global\/qglobal.h\n@@ -2337,16 +2337,9 @@\n classes contains a private copy constructor and assignment\n operator to disable copying (the compiler gives an error message).\n *\/\n-\n-#if !defined(Q_NO_DECLARED_NOT_DEFINED) || !defined(QT_MAKEDLL)\n-# define Q_DISABLE_COPY(Class) \\\n- Class(const Class &); \\\n- Class &operator=(const Class &);\n-#else\n-# define Q_DISABLE_COPY(Class) \\\n- Class(const Class &); \\\n- Class &operator=(const Class &);\n-#endif\n+#define Q_DISABLE_COPY(Class) \\\n+ Class(const Class &); \\\n+ Class &operator=(const Class &);\n \n class QByteArray;\n Q_CORE_EXPORT QByteArray qgetenv(const char *varName);\n"} {"commit":"2637ac0254a6005da93cb50c6733c4a3527f5915","subject":"added GroupFluxes to vector_parameters","message":"added GroupFluxes to vector_parameters\n","repos":"jsrehak\/BART,jsrehak\/BART","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/data\/vector_parameters.h\n+++ src\/data\/vector_parameters.h\n@@ -1,5 +1,7 @@\n #ifndef BART_SRC_DATA_VECTOR_PARAMETERS_\n #define BART_SRC_DATA_VECTOR_PARAMETERS_\n+\n+#include <unordered_map>\n \n #include <deal.II\/lac\/petsc_parallel_vector.h>\n \n@@ -8,6 +10,7 @@\n namespace data {\n \n typedef dealii::PETScWrappers::MPI::Vector Flux;\n+typedef std::unordered_map<int, Flux> GroupFluxes;\n \n } \/\/ namespace data\n \n"} {"commit":"2760a283df02d64e151f17599972385e1b115267","subject":"Logger cleanup","message":"Logger cleanup\n","repos":"tummychow\/arm-alarm,tummychow\/arm-alarm,wcalvert\/LPC11U_LPC13U_CodeBase,tummychow\/arm-alarm,wcalvert\/LPC11U_LPC13U_CodeBase,tummychow\/arm-alarm,wcalvert\/LPC11U_LPC13U_CodeBase,wcalvert\/LPC11U_LPC13U_CodeBase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/drivers\/sensors\/logger.c\n+++ src\/drivers\/sensors\/logger.c\n@@ -40,8 +40,8 @@\n #include \"logger.h\"\n #include \"core\/delay\/delay.h\"\n \n-#define LOGGER_LOCALFILE (0)\n-#define LOGGER_FATFSFILE (1)\n+#define LOGGER_LOCALFILE (1)\n+#define LOGGER_FATFSFILE (0)\n \n \/\/ Write local files using crossworks debug library (CW Debug only)\n #if LOGGER_LOCALFILE\n@@ -63,7 +63,12 @@\n \n \/**************************************************************************\/\n \/*!\n+ @code\n \n+ loggerInit(\"capture.txt\");\n+ loggerWrite(buffer, len);\n+\n+ @endcode\n *\/\n \/**************************************************************************\/\n logger_error_t loggerWrite(const uint8_t * buffer, uint32_t len)\n"} {"commit":"4563ec5abad693d554f291a9d70d0f67b3558ef0","subject":"drt: fix uninit net_ in frBTerm ctor","message":"drt: fix uninit net_ in frBTerm ctor\n\nSigned-off-by: Matt Liberty <44ef1ce0ef6935daf739a0795dad249ba5322e97@eng.ucsd.edu>\n","repos":"QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,The-OpenROAD-Project\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/drt\/src\/db\/obj\/frBTerm.h\n+++ src\/drt\/src\/db\/obj\/frBTerm.h\n@@ -41,7 +41,7 @@\n public:\n \/\/ constructors\n frBTerm(const frString& name)\n- : frTerm(name), block_(nullptr)\n+ : frTerm(name), block_(nullptr), net_(nullptr)\n {\n }\n frBTerm(const frBTerm& in)\n"} {"commit":"8a88c4215a5083cc6dabed6e8ebc1bf3ec38c65b","subject":"Only FreeBSD 11+ has NOTE_CLOSE_WRITE event","message":"Only FreeBSD 11+ has NOTE_CLOSE_WRITE event\n","repos":"okbob\/pspg,okbob\/pspg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/inputs.c\n+++ src\/inputs.c\n@@ -444,8 +444,12 @@\n \t\t\t\t\t\t{\n \t\t\t\t\t\t\tif (kqev.flags & EV_ERROR)\n \t\t\t\t\t\t\t\tlog_row(\"kqueue EV_ERROR (%s)\", strerror(kqev.data));\n+\n+#if defined(NOTE_CLOSE_WRITE)\n+\n \t\t\t\t\t\t\telse if (kqev.flags & NOTE_CLOSE_WRITE)\n \t\t\t\t\t\t\t\tstream_closed = true;\n+#endif\n \n \t\t\t\t\t\t\trc = kevent(notify_fd, NULL, 0, &kqev, 1, &tmout);\n \t\t\t\t\t\t}\n@@ -724,7 +728,7 @@\n \n \t\tf_data_opts |= STREAM_HAS_NOTIFY_SUPPORT;\n \n-#elif defined(HAVE_KQUEUE)\n+#elif defined(HAVE_KQUEUE) && defined(NOTE_CLOSE_WRITE)\n \n \t\tif (notify_fd == -1)\n \t\t{\n@@ -740,6 +744,37 @@\n \t\t\t\t EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,\n \t\t\t\t NOTE_CLOSE_WRITE |\n \t\t\t\t (current_state->stream_mode ? NOTE_WRITE : 0),\n+\t\t\t\t 0, NULL);\n+\n+\t\t\trc = kevent(notify_fd, &event, 1, NULL, 0, NULL);\n+\t\t\tif (rc == -1)\n+\t\t\t\tleave(\"cannot to register kqueue event (%s)\", strerror(errno));\n+\n+\t\t\tif (event.flags & EV_ERROR)\n+\t\t\t\tleave(\"cannot to register kqueue event (%s)\", strerror(event.data));\n+\t\t}\n+\n+\t\tf_data_opts |= STREAM_HAS_NOTIFY_SUPPORT;\n+\n+#elif defined(HAVE_KQUEUE)\n+\n+\t\t\/*\n+\t\t * NOTE_CLOSE_WRITE is available from FreeBSD 11\n+\t\t * On older BSD systems this event is not available.\n+\t\t *\/\n+\t\tif (notify_fd == -1 && current_state->stream_mode)\n+\t\t{\n+\t\t\tstatic struct kevent event;\n+\t\t\tint\t\trc;\n+\n+\t\t\tnotify_fd = kqueue();\n+\t\t\tif (notify_fd == -1)\n+\t\t\t\tleave(\"cannot to initialize kqueue(%s)\", strerror(errno));\n+\n+\t\t\tEV_SET(&event,\n+\t\t\t\t fileno(f_data),\n+\t\t\t\t EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,\n+\t\t\t\t NOTE_WRITE,\n \t\t\t\t 0, NULL);\n \n \t\t\trc = kevent(notify_fd, &event, 1, NULL, 0, NULL);\n"} {"commit":"7408a48ef29614a828d0e36effa224eb1d4e54c8","subject":"[codingstd] Add space after comma to pass c_operator.t","message":"[codingstd] Add space after comma to pass c_operator.t\n","repos":"FROGGS\/parrot,parrot\/parrot,tkob\/parrot,tkob\/parrot,youprofit\/parrot,youprofit\/parrot,tkob\/parrot,FROGGS\/parrot,tkob\/parrot,FROGGS\/parrot,FROGGS\/parrot,parrot\/parrot,youprofit\/parrot,youprofit\/parrot,youprofit\/parrot,parrot\/parrot,parrot\/parrot,youprofit\/parrot,tkob\/parrot,FROGGS\/parrot,FROGGS\/parrot,tkob\/parrot,tkob\/parrot,youprofit\/parrot,FROGGS\/parrot,parrot\/parrot,youprofit\/parrot,tkob\/parrot,FROGGS\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/io\/api.c\n+++ src\/io\/api.c\n@@ -788,10 +788,10 @@\n else {\n size_t remaining_size = total_size - vtable->get_position(interp, handle);\n IO_BUFFER * const read_buffer = IO_GET_READ_BUFFER(interp, handle);\n- STRING * const s = io_get_new_empty_string(interp, encoding, -1, remaining_size);\n+ STRING * const s = io_get_new_empty_string(interp, encoding, -1, remaining_size);\n \n io_sync_buffers_for_read(interp, handle, vtable, read_buffer, write_buffer);\n- io_read_chars_append_string(interp, s, handle, vtable, read_buffer,remaining_size);\n+ io_read_chars_append_string(interp, s, handle, vtable, read_buffer, remaining_size);\n return s;\n }\n }\n"} {"commit":"3479ca7740a164537b583531b7f779e8e418d30e","subject":"ipv6nd: don't handle NA or RA if not active interface","message":"ipv6nd: don't handle NA or RA if not active interface\n\nThis stops interfaces activated only for delegating to from\nreceiving these messages by default.\n","repos":"rsmarples\/dhcpcd,rsmarples\/dhcpcd,rsmarples\/dhcpcd","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ipv6nd.c\n+++ src\/ipv6nd.c\n@@ -1559,14 +1559,17 @@\n \t\treturn;\n \t}\n \n+\t\/* Find the receiving interface *\/\n \tTAILQ_FOREACH(ifp, ctx->ifaces, next) {\n-\t\tif (ifp->active &&\n-\t\t ifp->index == (unsigned int)pkt.ipi6_ifindex) {\n-\t\t\tif (!(ifp->options->options & DHCPCD_IPV6))\n-\t\t\t\treturn;\n+\t\tif (ifp->index == (unsigned int)pkt.ipi6_ifindex)\n \t\t\tbreak;\n-\t\t}\n-\t}\n+\t}\n+\n+\t\/* Don't do anything if the user hasn't configured it. *\/\n+\tif (ifp != NULL &&\n+\t (ifp->active != IF_ACTIVE_USER ||\n+\t !(ifp->options->options & DHCPCD_IPV6)))\n+\t\treturn;\n \n \ticp = (struct icmp6_hdr *)ctx->rcvhdr.msg_iov[0].iov_base;\n \tif (icp->icmp6_code == 0) {\n"} {"commit":"f8accef3f71f8b5c04e30abcb8dc0c2aba327a72","subject":"allow access\/accessat at all times in keymgr.","message":"allow access\/accessat at all times in keymgr.\n","repos":"jorisvink\/kore,jorisvink\/kore","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/keymgr.c\n+++ src\/keymgr.c\n@@ -85,6 +85,10 @@\n \tKORE_SYSCALL_ALLOW(futex),\n \tKORE_SYSCALL_ALLOW(writev),\n \tKORE_SYSCALL_ALLOW(openat),\n+#if defined(SYS_access)\n+\tKORE_SYSCALL_ALLOW(access),\n+#endif\n+\tKORE_SYSCALL_ALLOW(faccessat),\n \n \t\/* Net related. *\/\n #if defined(SYS_poll)\n@@ -126,10 +130,6 @@\n #endif\n \tKORE_SYSCALL_ALLOW(mkdirat),\n \tKORE_SYSCALL_ALLOW(umask),\n-#if defined(SYS_access)\n-\tKORE_SYSCALL_ALLOW(access),\n-#endif\n-\tKORE_SYSCALL_ALLOW(faccessat),\n #endif\n };\n #endif\n"} {"commit":"afd3392385a84c7e6c01c3a786e1fc3cfa183cc6","subject":"In order to make error messages from the GAPL compiler and the interpreter more understandable, newlines in the automaton course are to be changed to '\\r' instead of blanks. The Cache knows to convert the '\\r' back to newlines before compiling; the line numbers quoted in compiler or runtime error messages should now be consistent with the line number in your favorite editor.","message":"In order to make error messages from the GAPL compiler and the interpreter more\nunderstandable, newlines in the automaton course are to be changed to '\\r'\ninstead of blanks. The Cache knows to convert the '\\r' back to newlines before\ncompiling; the line numbers quoted in compiler or runtime error messages should\nnow be consistent with the line number in your favorite editor.\n","repos":"jsventek\/Cache,jsventek\/Cache,fergul\/Cache,fergul\/Cache,fergul\/Cache,jsventek\/Cache","returncode":1,"stderr":"error: pathspec 'src\/lftocr.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- src\/lftocr.c\n+++ src\/lftocr.c\n@@ -0,0 +1,30 @@\n+\/*\n+ * reads file specified as an argument (or stdin if not specified),\n+ * removes occurrences of \\r\n+ * converts occurrences of \\n to \\r\n+ *\/\n+#include <stdio.h>\n+\n+int main(int argc, char *argv[]) {\n+ int c;\n+ FILE *fd;\n+\n+ if (argc > 2) {\n+ fprintf(stderr, \"usage: %s [file]\\n\", argv[0]);\n+ return -1;\n+ }\n+ if (argc == 1)\n+ fd = stdin;\n+ else if (! (fd = fopen(argv[1], \"r\"))) {\n+ fprintf(stderr, \"%s: unable to open file %s\\n\", argv[0], argv[1]);\n+ return -2;\n+ }\n+ while ((c = fgetc(fd)) != EOF)\n+ if (c == '\\r')\n+ continue;\n+ else if (c == '\\n')\n+ fputc('\\r', stdout);\n+ else\n+ fputc(c, stdout);\n+ return 0;\n+}\n"} {"commit":"0fa7e7deeb5825092b9390ee478f64b4f131f128","subject":"fix iocb to initialize all fields (was causing -EINVAL)","message":"fix iocb to initialize all fields (was causing -EINVAL)\n","repos":"linux-xhyang\/libaio,linux-xhyang\/libaio,linux-xhyang\/libaio,linux-xhyang\/libaio,linux-xhyang\/libaio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libaio.h\n+++ src\/libaio.h\n@@ -119,6 +119,7 @@\n \n static inline void io_prep_pread(struct iocb *iocb, int fd, void *buf, size_t count, long long offset)\n {\n+\tmemset(iocb, 0, sizeof(*iocb));\n \tiocb->aio_fildes = fd;\n \tiocb->aio_lio_opcode = IO_CMD_PREAD;\n \tiocb->aio_reqprio = 0;\n@@ -129,6 +130,7 @@\n \n static inline void io_prep_pwrite(struct iocb *iocb, int fd, void *buf, size_t count, long long offset)\n {\n+\tmemset(iocb, 0, sizeof(*iocb));\n \tiocb->aio_fildes = fd;\n \tiocb->aio_lio_opcode = IO_CMD_PWRITE;\n \tiocb->aio_reqprio = 0;\n@@ -139,47 +141,47 @@\n \n static inline void io_prep_poll(struct iocb *iocb, int fd, int events)\n {\n+\tmemset(iocb, 0, sizeof(*iocb));\n \tiocb->aio_fildes = fd;\n \tiocb->aio_lio_opcode = IO_CMD_POLL;\n \tiocb->aio_reqprio = 0;\n-\tmemset(&iocb->u, 0, sizeof(iocb->u));\n \tiocb->u.poll.events = events;\n }\n \n static inline int io_poll(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd, int events)\n {\n+\tio_prep_poll(iocb, fd, events);\n \tio_set_callback(iocb, cb);\n-\tio_prep_poll(iocb, fd, events);\n \treturn io_submit(ctx, 1, &iocb);\n }\n \n static inline void io_prep_fsync(struct iocb *iocb, int fd)\n {\n+\tmemset(iocb, 0, sizeof(*iocb));\n \tiocb->aio_fildes = fd;\n \tiocb->aio_lio_opcode = IO_CMD_FSYNC;\n \tiocb->aio_reqprio = 0;\n-\tmemset(&iocb->u, 0, sizeof(iocb->u));\n }\n \n static inline int io_fsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd)\n {\n+\tio_prep_fsync(iocb, fd);\n \tio_set_callback(iocb, cb);\n-\tio_prep_fsync(iocb, fd);\n \treturn io_submit(ctx, 1, &iocb);\n }\n \n static inline void io_prep_fdsync(struct iocb *iocb, int fd)\n {\n+\tmemset(iocb, 0, sizeof(*iocb));\n \tiocb->aio_fildes = fd;\n \tiocb->aio_lio_opcode = IO_CMD_FDSYNC;\n \tiocb->aio_reqprio = 0;\n-\tmemset(&iocb->u, 0, sizeof(iocb->u));\n }\n \n static inline int io_fdsync(io_context_t ctx, struct iocb *iocb, io_callback_t cb, int fd)\n {\n+\tio_prep_fdsync(iocb, fd);\n \tio_set_callback(iocb, cb);\n-\tio_prep_fdsync(iocb, fd);\n \treturn io_submit(ctx, 1, &iocb);\n }\n \n"} {"commit":"bbb25382d9057fc86b1270d061126ce6f697d0d6","subject":"Variables fixes","message":"Variables fixes\n","repos":"jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libvlc.c\n+++ src\/libvlc.c\n@@ -807,14 +807,16 @@\n playlist_Activate( p_playlist );\n \n \/* Add service discovery modules *\/\n- psz_modules = var_CreateGetNonEmptyString( p_playlist, \"services-discovery\" );\n+ psz_modules = var_InheritString( p_libvlc, \"services-discovery\" );\n if( psz_modules )\n {\n char *p = psz_modules, *m;\n+ playlist_t *p_playlist = pl_Hold( p_libvlc );\n while( ( m = strsep( &p, \" :,\" ) ) != NULL )\n playlist_ServicesDiscoveryAdd( p_playlist, m );\n- }\n- free( psz_modules );\n+ free( psz_modules );\n+ pl_Release (p_playlist);\n+ }\n \n #ifdef ENABLE_VLM\n \/* Initialize VLM if vlm-conf is specified *\/\n@@ -924,7 +926,7 @@\n #ifdef WIN32\n if( var_InheritBool( p_libvlc, \"prefer-system-codecs\") )\n {\n- char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, \"codec\" );\n+ char *psz_codecs = var_CreateGetNonEmptyString( p_libvlc, \"codec\" );\n if( psz_codecs )\n {\n char *psz_morecodecs;\n@@ -965,15 +967,15 @@\n \/*\n * Get --open argument\n *\/\n- psz_val = var_CreateGetNonEmptyString( p_libvlc, \"open\" );\n+ psz_val = var_InheritString( p_libvlc, \"open\" );\n if ( psz_val != NULL )\n {\n playlist_t *p_playlist = pl_Hold( p_libvlc );\n playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0,\n -1, 0, NULL, 0, true, pl_Unlocked );\n pl_Release( p_libvlc );\n- }\n- free( psz_val );\n+ free( psz_val );\n+ }\n \n return VLC_SUCCESS;\n }\n"} {"commit":"2093cfa748bfa6f4f4e6582b8527729d4145ae0f","subject":"Second (blind) attempt at fixing win and mac.","message":"Second (blind) attempt at fixing win and mac.\n","repos":"jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libvlc.c\n+++ src\/libvlc.c\n@@ -1245,7 +1245,7 @@\n #else\n char psz_path[1024];\n if (snprintf (psz_path, sizeof (psz_path), \"%s\" DIR_SEP \"%s\",\n- config_GetDataDir(), \"locale\")\n+ config_GetDataDirDefault(), \"locale\")\n >= (int)sizeof (psz_path))\n return -1;\n \n"} {"commit":"9ff3595f09441ac057cf6b4f22f382e02059470b","subject":"libvlc: Advertise -p and --list in help.","message":"libvlc: Advertise -p and --list in help.\n","repos":"xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libvlc.c\n+++ src\/libvlc.c\n@@ -1272,6 +1272,18 @@\n *****************************************************************************\n * Print a short inline help. Message interface is initialized at this stage.\n *****************************************************************************\/\n+static inline void print_help_on_module_help( void )\n+{\n+ utf8_fprintf( stdout, \"\\n\" );\n+ utf8_fprintf( stdout, \"To get the VLC module list, use '--list'.\\n\" );\n+ utf8_fprintf( stdout, \"To get help on a particular module, use '-p <module_name>'.\\n\" );\n+}\n+static inline void print_help_on_full_help( void )\n+{\n+ utf8_fprintf( stdout, \"\\n\" );\n+ utf8_fprintf( stdout, \"To get a exhaustive help, use '-H'.\\n\" );\n+}\n+\n static void Help( libvlc_int_t *p_this, char const *psz_help_name )\n {\n #ifdef WIN32\n@@ -1283,18 +1295,21 @@\n utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );\n Usage( p_this, \"help\" );\n Usage( p_this, \"main\" );\n- utf8_fprintf( stdout, \"To get a exhaustive help use -H\\n\" );\n+ print_help_on_module_help();\n+ print_help_on_full_help();\n }\n else if( psz_help_name && !strcmp( psz_help_name, \"longhelp\" ) )\n {\n utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );\n Usage( p_this, NULL );\n- utf8_fprintf( stdout, \"To get an exhaustive help use -H\\n\" );\n+ print_help_on_module_help();\n+ print_help_on_full_help();\n }\n else if( psz_help_name && !strcmp( psz_help_name, \"full-help\" ) )\n {\n utf8_fprintf( stdout, vlc_usage, p_this->psz_object_name );\n Usage( p_this, NULL );\n+ print_help_on_module_help();\n }\n else if( psz_help_name )\n {\n"} {"commit":"2e614adb21b3c0c46038a7897b88accab2498ec4","subject":"Do not fuse SLOAD across RETF.","message":"Do not fuse SLOAD across RETF.\n","repos":"alexandergall\/snabbswitch,eugeneia\/snabb,alexandergall\/snabbswitch,Igalia\/snabbswitch,alexandergall\/snabbswitch,eugeneia\/snabbswitch,SnabbCo\/snabbswitch,dpino\/snabbswitch,dpino\/snabbswitch,heryii\/snabb,SnabbCo\/snabbswitch,eugeneia\/snabbswitch,alexandergall\/snabbswitch,snabbco\/snabb,snabbco\/snabb,dpino\/snabb,snabbco\/snabb,snabbco\/snabb,alexandergall\/snabbswitch,eugeneia\/snabb,heryii\/snabb,SnabbCo\/snabbswitch,Igalia\/snabbswitch,Igalia\/snabbswitch,Igalia\/snabb,Igalia\/snabbswitch,dpino\/snabb,eugeneia\/snabb,heryii\/snabb,dpino\/snabbswitch,eugeneia\/snabb,snabbco\/snabb,heryii\/snabb,eugeneia\/snabb,heryii\/snabb,alexandergall\/snabbswitch,snabbco\/snabb,Igalia\/snabb,Igalia\/snabb,alexandergall\/snabbswitch,dpino\/snabbswitch,Igalia\/snabb,eugeneia\/snabb,dpino\/snabb,eugeneia\/snabb,Igalia\/snabbswitch,snabbco\/snabb,dpino\/snabb,Igalia\/snabb,alexandergall\/snabbswitch,Igalia\/snabb,dpino\/snabb,dpino\/snabb,Igalia\/snabb,SnabbCo\/snabbswitch,eugeneia\/snabb,snabbco\/snabb,dpino\/snabb,Igalia\/snabb,eugeneia\/snabbswitch,eugeneia\/snabbswitch,heryii\/snabb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lj_asm.c\n+++ src\/lj_asm.c\n@@ -1277,7 +1277,8 @@\n } else if (mayfuse(as, ref)) {\n RegSet xallow = (allow & RSET_GPR) ? allow : RSET_GPR;\n if (ir->o == IR_SLOAD) {\n- if (!irt_isint(ir->t) && !(ir->op2 & IRSLOAD_PARENT)) {\n+ if (!irt_isint(ir->t) && !(ir->op2 & IRSLOAD_PARENT) &&\n+\t noconflict(as, ref, IR_RETF)) {\n \tas->mrm.base = (uint8_t)ra_alloc1(as, REF_BASE, xallow);\n \tas->mrm.ofs = 8*((int32_t)ir->op1-1);\n \tas->mrm.idx = RID_NONE;\n"} {"commit":"a59ad565f54304b0eed5a5983ef0444a804292d0","subject":"FIX: unnecessary to fflush when logger is stdout","message":"FIX: unnecessary to fflush when logger is stdout\n","repos":"git-hulk\/tcpkit,git-hulk\/tcpkit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/logger.c\n+++ src\/logger.c\n@@ -36,7 +36,7 @@\n vsnprintf(buf, sizeof(buf), fmt, ap);\n va_end(ap);\n fprintf(log_fp, \"%s\\n\", buf);\n- fflush(log_fp);\n+ if (log_fp != stdout) fflush(log_fp);\n }\n \n void alog(enum LEVEL loglevel, char *fmt, ...) {\n@@ -66,10 +66,10 @@\n strftime(t_buf,64,\"%Y-%m-%d %H:%M:%S\",localtime(&now));\n if(log_fp != stdout) {\n fprintf(log_fp, \"[%s] [%s] %s\\n\", t_buf, msg, buf);\n+ fflush(log_fp);\n } else {\n fprintf(log_fp, \"%s[%s] [%s] %s\"C_NONE\"\\n\", color, t_buf, msg, buf);\n }\n- fflush(log_fp);\n if(loglevel > ERROR) {\n exit(1);\n }\n"} {"commit":"812dfe4e038ffe2070adfc0bd33a284af7b6e3a3","subject":"master: reference the default mloop","message":"master: reference the default mloop\n","repos":"marel-keytech\/openCANopen,marel-keytech\/openCANopen,marel-keytech\/openCANopen","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/master.c\n+++ src\/master.c\n@@ -1127,6 +1127,7 @@\n \tmemset(node_, 0, sizeof(node_));\n \n \tmloop_ = mloop_default();\n+\tmloop_ref(mloop_);\n \n \tprofile(\"Load EDS database...\\n\");\n \teds_db_load();\n@@ -1199,6 +1200,7 @@\n \n \teds_db_unload();\n \n+\tmloop_unref(mloop_);\n \treturn rc;\n }\n \n"} {"commit":"b03327463725705ce40af2133fab163165be9d7c","subject":"memmap: correctly check mmap return value","message":"memmap: correctly check mmap return value\n","repos":"supergameherm\/supergameherm,foxkit-us\/supergameherm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/memmap.c\n+++ src\/memmap.c\n@@ -147,7 +147,7 @@\n \tm_state->f_size = size;\n \tm_state->size = size = _round_nearest(size, sysconf(_SC_PAGESIZE));\n \n-\tif(!(map = mmap(NULL, size, PROT_READ | PROT_WRITE, m_state->flags, fd, 0)))\n+\tif((map = mmap(NULL, size, PROT_READ | PROT_WRITE, m_state->flags, fd, 0)) == -1)\n \t{\n \t\terror(state, \"Could not mmap file: %s\", strerror(errno));\n \n"} {"commit":"7d8ff64e9a0192014b67d1ad348ae3341ccda5dc","subject":"Return mapping when we map a physical address","message":"Return mapping when we map a physical address\n","repos":"hoelzro\/rose-kernel,hoelzro\/rose-kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/memory.c\n+++ src\/memory.c\n@@ -353,7 +353,7 @@\n ROSE_ASSERT(0);\n }\n \n-static void\n+static void *\n _map_physical_address(void *physical, void *logical)\n {\n struct page_directory *cr3;\n@@ -372,6 +372,8 @@\n *\/\n table = _physical_to_logical(_get_page_table(cr3, logical));\n _set_page(table, logical, physical);\n+\n+ return logical;\n }\n \n static void\n"} {"commit":"5e2e9de68d6d61402ccadb580fcad3757fbf411f","subject":"Log a warning if mopherd runs as nobody or nogroup","message":"Log a warning if mopherd runs as nobody or nogroup\n","repos":"badzong\/mopher,badzong\/mopher","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/milter.c\n+++ src\/milter.c\n@@ -1152,6 +1152,9 @@\n void\n milter_init(void)\n {\n+\tint runs_as_nobody;\n+\tint runs_as_nogroup;\n+\n \t\/*\n \t * Load configuration\n \t *\/\n@@ -1163,6 +1166,16 @@\n \t *\/\n \tif (getuid() == 0)\n \t{\n+\t\truns_as_nobody = strcmp(cf_mopherd_user, \"nobody\") == 0;\n+\t\truns_as_nogroup = strcmp(cf_mopherd_group, \"nogroup\") == 0;\n+\n+\t\tif (runs_as_nobody || runs_as_nogroup)\n+\t\t{\n+\t\t\tlog_warning(\"warning: running with%s%s\",\n+\t\t\t\truns_as_nobody? \" user=nobody\": \"\",\n+\t\t\t\truns_as_nogroup? \" group=nogroup\": \"\");\n+\t\t}\n+\n \t\tif (cf_mopherd_group)\n \t\t{\n \t\t\tlog_debug(\"group: %s\", cf_mopherd_group);\n"} {"commit":"29c877af6313d9f2a5b33bd4ff7c51ad68d73318","subject":"Fix typo in models","message":"Fix typo in models\n","repos":"moverest\/bagh-chal,moverest\/bagh-chal,moverest\/bagh-chal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/models.h\n+++ src\/models.h\n@@ -12,7 +12,7 @@\n } board_t;\n \n typedef struct {\n- int l;\n+ int r;\n int c;\n } position_t;\n \n"} {"commit":"b394817754ade6151f40b64115f9fbe03a9ca09b","subject":"Fix memory leak in RM_UnregisterCommandFilter().","message":"Fix memory leak in RM_UnregisterCommandFilter().\n","repos":"ctripcorp\/redis,yossigo\/redis,soloestoy\/redis,yossigo\/redis,soveran\/redis,antirez\/redis,oranagra\/redis,PKRoma\/redis,ofirluzon\/redis,soveran\/redis,ofirluzon\/redis,PKRoma\/redis,pmem\/redis,ofirluzon\/redis,antirez\/redis,oranagra\/redis,pmem\/redis,neomantra\/redis,soveran\/redis,ctripcorp\/redis,yossigo\/redis,oranagra\/redis,yossigo\/redis,PKRoma\/redis,PKRoma\/redis,soloestoy\/redis,charsyam\/redis,charsyam\/redis,charsyam\/redis,charsyam\/redis,charsyam\/redis,ofirluzon\/redis,oranagra\/redis,oranagra\/redis,pmem\/redis,pmem\/redis,neomantra\/redis,neomantra\/redis,soloestoy\/redis,PKRoma\/redis,antirez\/redis,neomantra\/redis,ctripcorp\/redis,ofirluzon\/redis,yossigo\/redis,soloestoy\/redis,ctripcorp\/redis,soveran\/redis,neomantra\/redis,soloestoy\/redis,antirez\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/module.c\n+++ src\/module.c\n@@ -5035,6 +5035,8 @@\n ln = listSearchKey(ctx->module->filters,filter);\n if (!ln) return REDISMODULE_ERR; \/* Shouldn't happen *\/\n listDelNode(ctx->module->filters,ln);\n+\n+ zfree(filter);\n \n return REDISMODULE_OK;\n }\n"} {"commit":"607f326aa7803a35e7e2b51a93c5d333c9795122","subject":"Change a bit the style of #6385.","message":"Change a bit the style of #6385.\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/module.c\n+++ src\/module.c\n@@ -1149,10 +1149,8 @@\n int replyWithStatus(RedisModuleCtx *ctx, const char *msg, char *prefix) {\n client *c = moduleGetReplyClient(ctx);\n if (c == NULL) return REDISMODULE_OK;\n- const size_t msgLen = strlen(msg);\n- const size_t prefixLen = strlen(prefix);\n- addReplyProto(c,prefix,prefixLen);\n- addReplyProto(c,msg,msgLen);\n+ addReplyProto(c,prefix,strlen(prefix));\n+ addReplyProto(c,msg,strlen(msg));\n addReplyProto(c,\"\\r\\n\",2);\n return REDISMODULE_OK;\n }\n"} {"commit":"e22f3e40d517b8eca10a0d02a5554987b1a22b77","subject":"Cleanup: remove zset reset function from RM_ZsetRangeStop().","message":"Cleanup: remove zset reset function from RM_ZsetRangeStop().\n","repos":"antirez\/redis,oranagra\/redis,arijitvt\/redis,Markgorden\/redis,pmem\/redis,charsyam\/redis,yossigo\/redis,antirez\/redis,charsyam\/redis,badboy\/redis,OmarQunsul\/graph-redis,pmem\/redis,dreamquster\/redis,pmem\/redis,kensou97\/redis,oranagra\/redis,Sciumo\/redis,soveran\/redis,rogerchina\/redis,h0x91b\/redis,soloestoy\/redis,OmarQunsul\/graph-redis,YongMan\/redis,GitHubMota\/redis,colstrom\/redis,zguangyu\/redis,GitHubMota\/redis,spinlock\/redis,charsyam\/redis,arijitvt\/redis,PKRoma\/redis,Markgorden\/redis,ton31337\/redis,YongMan\/redis,hgl888\/redis,oranagra\/redis,colstrom\/redis,ton31337\/redis,antirez\/redis,badboy\/redis,YongMan\/redis,sunheehnus\/redis,PKRoma\/redis,colstrom\/redis,OmarQunsul\/graph-redis,rogerchina\/redis,ofirluzon\/redis,soloestoy\/redis,yossigo\/redis,spinlock\/redis,soveran\/redis,PKRoma\/redis,h0x91b\/redis,ctripcorp\/redis,neomantra\/redis,hgl888\/redis,GitHubMota\/redis,ofirluzon\/redis,sunheehnus\/redis,yossigo\/redis,OmarQunsul\/graph-redis,h0x91b\/redis,nnog\/redis,rogerchina\/redis,colstrom\/redis,dreamquster\/redis,nnog\/redis,arijitvt\/redis,badboy\/redis,spinlock\/redis,ofirluzon\/redis,ofirluzon\/redis,sunheehnus\/redis,sunheehnus\/redis,soloestoy\/redis,ofirluzon\/redis,spinlock\/redis,nnog\/redis,kensou97\/redis,dreamquster\/redis,Markgorden\/redis,soveran\/redis,pmem\/redis,hgl888\/redis,hgl888\/redis,oranagra\/redis,PKRoma\/redis,ctripcorp\/redis,Markgorden\/redis,yossigo\/redis,neomantra\/redis,dreamquster\/redis,antirez\/redis,Sciumo\/redis,nnog\/redis,neomantra\/redis,yossigo\/redis,zguangyu\/redis,badboy\/redis,h0x91b\/redis,neomantra\/redis,kensou97\/redis,ton31337\/redis,Sciumo\/redis,Sciumo\/redis,neomantra\/redis,ctripcorp\/redis,soloestoy\/redis,zguangyu\/redis,arijitvt\/redis,GitHubMota\/redis,ctripcorp\/redis,rogerchina\/redis,zguangyu\/redis,charsyam\/redis,kensou97\/redis,charsyam\/redis,PKRoma\/redis,soveran\/redis,soloestoy\/redis,YongMan\/redis,ton31337\/redis,oranagra\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/module.c\n+++ src\/module.c\n@@ -163,7 +163,8 @@\n void autoMemoryCollect(RedisModuleCtx *ctx);\n robj **moduleCreateArgvFromUserFormat(const char *cmdname, const char *fmt, int *argcp, int *flags, va_list ap);\n void moduleReplicateMultiIfNeeded(RedisModuleCtx *ctx);\n-void RM_ZsetRangeStop(RedisModuleKey *key);\n+void RM_ZsetRangeStop(RedisModuleKey *kp);\n+static void zsetKeyReset(RedisModuleKey *key);\n \n \/* --------------------------------------------------------------------------\n * Heap allocation raw functions\n@@ -1047,8 +1048,7 @@\n kp->value = value;\n kp->iter = NULL;\n kp->mode = mode;\n- kp->ztype = REDISMODULE_ZSET_RANGE_NONE;\n- RM_ZsetRangeStop(kp);\n+ zsetKeyReset(kp);\n autoMemoryAdd(ctx,REDISMODULE_AM_KEY,kp);\n return (void*)kp;\n }\n@@ -1434,17 +1434,23 @@\n * Key API for Sorted Set iterator\n * -------------------------------------------------------------------------- *\/\n \n+static void zsetKeyReset(RedisModuleKey *key)\n+{\n+ key->ztype = REDISMODULE_ZSET_RANGE_NONE;\n+ key->zcurrent = NULL;\n+ key->zer = 1;\n+}\n+\n \/* Stop a sorted set iteration. *\/\n void RM_ZsetRangeStop(RedisModuleKey *key) {\n \/* Free resources if needed. *\/\n- if (key->ztype == REDISMODULE_ZSET_RANGE_LEX)\n+ if (key->ztype == REDISMODULE_ZSET_RANGE_LEX) {\n zslFreeLexRange(&key->zlrs);\n+ }\n \/* Setup sensible values so that misused iteration API calls when an\n * iterator is not active will result into something more sensible\n * than crashing. *\/\n- key->ztype = REDISMODULE_ZSET_RANGE_NONE;\n- key->zcurrent = NULL;\n- key->zer = 1;\n+ zsetKeyReset(key);\n }\n \n \/* Return the \"End of range\" flag value to signal the end of the iteration. *\/\n"} {"commit":"2e0bcd8264ad81a7e977597db7f5337990fcc8db","subject":"Fix preview: if template contians error or no pages is outputted","message":"Fix preview: if template contians error or no pages is outputted\n","repos":"alexandervdm\/gummi,bobi32\/gummi,turbopobre\/gummi,bobi32\/gummi,turbopobre\/gummi,alexandervdm\/gummi,alexandervdm\/gummi,turbopobre\/gummi,turbopobre\/gummi,mlda065\/gummi,bobi32\/gummi,bobi32\/gummi,mlda065\/gummi,mlda065\/gummi,mlda065\/gummi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/motion.c\n+++ src\/motion.c\n@@ -156,6 +156,9 @@\n \n \/* update status light *\/\n gtk_tool_button_set_stock_id(mc->statuslight, \"gtk-no\");\n+ } else if (strstr(cresult.data, \"No pages of output.\")) {\n+ mc->errorline = -1;\n+ gtk_tool_button_set_stock_id(mc->statuslight, \"gtk-no\");\n } else\n gtk_tool_button_set_stock_id(mc->statuslight, \"gtk-yes\");\n }\n@@ -218,7 +221,7 @@\n \n void motion_update_errortags(GuMotion* mc) {\n L_F_DEBUG;\n- if (mc->errorline)\n+ if (mc->errorline > 0)\n editor_apply_errortags(mc->b_editor, mc->errorline);\n if (mc->last_errorline && !mc->errorline)\n editor_apply_errortags(mc->b_editor, 0);\n"} {"commit":"67fcfe81878870c1b2c71ca250044af632ffaee7","subject":"Align mruset.h with Bitcoin 12.1","message":"Align mruset.h with Bitcoin 12.1","repos":"GregoryBetz\/DarkSilk,GregoryBetz\/DarkSilk,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk-Release-Candidate,GregoryBetz\/DarkSilk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mruset.h\n+++ src\/mruset.h\n@@ -4,11 +4,13 @@\n #ifndef DARKSILK_MRUSET_H\n #define DARKSILK_MRUSET_H\n \n+#include <deque>\n #include <set>\n-#include <deque>\n+#include <utility>\n \n \/** STL-like set container that only keeps the most recent N elements. *\/\n-template <typename T> class mruset\n+template <typename T>\n+class mruset\n {\n public:\n typedef T key_type;\n@@ -37,10 +39,8 @@\n std::pair<iterator, bool> insert(const key_type& x)\n {\n std::pair<iterator, bool> ret = set.insert(x);\n- if (ret.second)\n- {\n- if (nMaxSize && queue.size() == nMaxSize)\n- {\n+ if (ret.second) {\n+ if (nMaxSize && queue.size() == nMaxSize) {\n set.erase(queue.front());\n queue.pop_front();\n }\n@@ -52,8 +52,7 @@\n size_type max_size(size_type s)\n {\n if (s)\n- while (queue.size() > s)\n- {\n+ while (queue.size() > s) {\n set.erase(queue.front());\n queue.pop_front();\n }\n"} {"commit":"556a6c07bbb98694e7c9a94221a613c7f1c2277a","subject":"parallelized coordinate MTTKRP","message":"parallelized coordinate MTTKRP\n","repos":"ShadenSmith\/splatt,ShadenSmith\/splatt,ShadenSmith\/splatt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mttkrp.c\n+++ src\/mttkrp.c\n@@ -1620,16 +1620,18 @@\n matrix_t ** mats,\n idx_t const mode)\n {\n+ if(pool == NULL) {\n+ pool = mutex_alloc();\n+ }\n+\n matrix_t * const M = mats[MAX_NMODES];\n idx_t const I = tt->dims[mode];\n idx_t const nfactors = M->J;\n \n val_t * const outmat = M->vals;\n- memset(outmat, 0, I * nfactors * sizeof(val_t));\n+ memset(outmat, 0, I * nfactors * sizeof(*outmat));\n \n idx_t const nmodes = tt->nmodes;\n-\n- val_t * accum = (val_t *) splatt_malloc(nfactors * sizeof(val_t));\n \n val_t * mvals[MAX_NMODES];\n for(idx_t m=0; m < nmodes; ++m) {\n@@ -1638,31 +1640,41 @@\n \n val_t const * const restrict vals = tt->vals;\n \n- \/* stream through nnz *\/\n- for(idx_t n=0; n < tt->nnz; ++n) {\n- \/* initialize with value *\/\n- for(idx_t f=0; f < nfactors; ++f) {\n- accum[f] = vals[n];\n- }\n-\n- for(idx_t m=0; m < nmodes; ++m) {\n- if(m == mode) {\n- continue;\n- }\n- val_t const * const restrict inrow = mvals[m] + (tt->ind[m][n] * nfactors);\n+ #pragma omp parallel\n+ {\n+ val_t * restrict accum = splatt_malloc(nfactors * sizeof(*accum));\n+\n+ \/* stream through nnz *\/\n+ #pragma omp for schedule(static)\n+ for(idx_t n=0; n < tt->nnz; ++n) {\n+ \/* initialize with value *\/\n for(idx_t f=0; f < nfactors; ++f) {\n- accum[f] *= inrow[f];\n- }\n- }\n-\n- \/* write to output *\/\n- val_t * const restrict outrow = outmat + (tt->ind[mode][n] * nfactors);\n- for(idx_t f=0; f < nfactors; ++f) {\n- outrow[f] += accum[f];\n- }\n- }\n-\n- free(accum);\n-}\n-\n-\n+ accum[f] = vals[n];\n+ }\n+\n+ for(idx_t m=0; m < nmodes; ++m) {\n+ if(m == mode) {\n+ continue;\n+ }\n+ val_t const * const restrict inrow = mvals[m] + \\\n+ (tt->ind[m][n] * nfactors);\n+ for(idx_t f=0; f < nfactors; ++f) {\n+ accum[f] *= inrow[f];\n+ }\n+ }\n+\n+ \/* write to output *\/\n+ idx_t const out_ind = tt->ind[mode][n];\n+ val_t * const restrict outrow = outmat + (tt->ind[mode][n] * nfactors);\n+ mutex_set_lock(pool, out_ind);\n+ for(idx_t f=0; f < nfactors; ++f) {\n+ outrow[f] += accum[f];\n+ }\n+ mutex_unset_lock(pool, out_ind);\n+ }\n+\n+ splatt_free(accum);\n+ } \/* end omp parallel *\/\n+}\n+\n+\n"} {"commit":"d0cf1040c703c7131c7c70d9de6bc2dd78b25d57","subject":"Correctly handle getaddrinfo return result","message":"Correctly handle getaddrinfo return result\n\nThe getaddrinfo function indicates failure with a non-zero return code,\nbut this code is not necessarily negative. On platforms like Android\nwhere the code is positive, a failed call causes libgit2 to segfault.\n","repos":"falqas\/libgit2,iankronquist\/libgit2,Corillian\/libgit2,kenprice\/libgit2,swisspol\/DEMO-libgit2,rcorre\/libgit2,falqas\/libgit2,JIghtuse\/libgit2,amyvmiwei\/libgit2,sygool\/libgit2,ardumont\/libgit2,mhp\/libgit2,ardumont\/libgit2,rcorre\/libgit2,KTXSoftware\/libgit2,t0xicCode\/libgit2,Corillian\/libgit2,yongthecoder\/libgit2,Tousiph\/Demo1,maxiaoqian\/libgit2,sim0629\/libgit2,jflesch\/libgit2-mariadb,swisspol\/DEMO-libgit2,chiayolin\/libgit2,sygool\/libgit2,yosefhackmon\/libgit2,mhp\/libgit2,linquize\/libgit2,mrksrm\/Mingijura,KTXSoftware\/libgit2,dleehr\/libgit2,MrHacky\/libgit2,kissthink\/libgit2,raybrad\/libit2,mingyaaaa\/libgit2,KTXSoftware\/libgit2,MrHacky\/libgit2,linquize\/libgit2,stewid\/libgit2,Tousiph\/Demo1,Corillian\/libgit2,yosefhackmon\/libgit2,joshtriplett\/libgit2,maxiaoqian\/libgit2,mrksrm\/Mingijura,maxiaoqian\/libgit2,oaastest\/libgit2,jflesch\/libgit2-mariadb,jeffhostetler\/public_libgit2,skabel\/manguse,oaastest\/libgit2,Corillian\/libgit2,KTXSoftware\/libgit2,iankronquist\/libgit2,jeffhostetler\/public_libgit2,leoyanggit\/libgit2,mhp\/libgit2,Snazz2001\/libgit2,claudelee\/libgit2,raybrad\/libit2,joshtriplett\/libgit2,KTXSoftware\/libgit2,stewid\/libgit2,sim0629\/libgit2,kissthink\/libgit2,since2014\/libgit2,spraints\/libgit2,Snazz2001\/libgit2,claudelee\/libgit2,dleehr\/libgit2,nokiddin\/libgit2,mhp\/libgit2,falqas\/libgit2,Tousiph\/Demo1,whoisj\/libgit2,ardumont\/libgit2,mingyaaaa\/libgit2,amyvmiwei\/libgit2,oaastest\/libgit2,stewid\/libgit2,Snazz2001\/libgit2,JIghtuse\/libgit2,chiayolin\/libgit2,chiayolin\/libgit2,MrHacky\/libgit2,mcanthony\/libgit2,yosefhackmon\/libgit2,linquize\/libgit2,ardumont\/libgit2,falqas\/libgit2,mcanthony\/libgit2,linquize\/libgit2,maxiaoqian\/libgit2,skabel\/manguse,JIghtuse\/libgit2,claudelee\/libgit2,nokiddin\/libgit2,kenprice\/libgit2,magnus98\/TEST,MrHacky\/libgit2,yongthecoder\/libgit2,joshtriplett\/libgit2,since2014\/libgit2,KTXSoftware\/libgit2,Tousiph\/Demo1,skabel\/manguse,kissthink\/libgit2,jeffhostetler\/public_libgit2,amyvmiwei\/libgit2,kenprice\/libgit2,spraints\/libgit2,nokiddin\/libgit2,dleehr\/libgit2,jflesch\/libgit2-mariadb,amyvmiwei\/libgit2,whoisj\/libgit2,since2014\/libgit2,Snazz2001\/libgit2,raybrad\/libit2,Tousiph\/Demo1,linquize\/libgit2,sygool\/libgit2,jflesch\/libgit2-mariadb,yongthecoder\/libgit2,sim0629\/libgit2,spraints\/libgit2,kenprice\/libgit2,skabel\/manguse,swisspol\/DEMO-libgit2,swisspol\/DEMO-libgit2,nokiddin\/libgit2,oaastest\/libgit2,rcorre\/libgit2,dleehr\/libgit2,magnus98\/TEST,since2014\/libgit2,nokiddin\/libgit2,stewid\/libgit2,yosefhackmon\/libgit2,maxiaoqian\/libgit2,magnus98\/TEST,saurabhsuniljain\/libgit2,stewid\/libgit2,t0xicCode\/libgit2,spraints\/libgit2,mcanthony\/libgit2,falqas\/libgit2,joshtriplett\/libgit2,MrHacky\/libgit2,JIghtuse\/libgit2,swisspol\/DEMO-libgit2,mrksrm\/Mingijura,kenprice\/libgit2,rcorre\/libgit2,claudelee\/libgit2,sim0629\/libgit2,whoisj\/libgit2,saurabhsuniljain\/libgit2,Snazz2001\/libgit2,dleehr\/libgit2,nokiddin\/libgit2,mrksrm\/Mingijura,jeffhostetler\/public_libgit2,sygool\/libgit2,stewid\/libgit2,maxiaoqian\/libgit2,Snazz2001\/libgit2,ardumont\/libgit2,spraints\/libgit2,t0xicCode\/libgit2,mhp\/libgit2,yosefhackmon\/libgit2,mcanthony\/libgit2,whoisj\/libgit2,rcorre\/libgit2,spraints\/libgit2,claudelee\/libgit2,mcanthony\/libgit2,JIghtuse\/libgit2,iankronquist\/libgit2,yongthecoder\/libgit2,chiayolin\/libgit2,mrksrm\/Mingijura,rcorre\/libgit2,mingyaaaa\/libgit2,chiayolin\/libgit2,chiayolin\/libgit2,mingyaaaa\/libgit2,amyvmiwei\/libgit2,saurabhsuniljain\/libgit2,Corillian\/libgit2,mhp\/libgit2,t0xicCode\/libgit2,whoisj\/libgit2,yongthecoder\/libgit2,sim0629\/libgit2,kissthink\/libgit2,saurabhsuniljain\/libgit2,magnus98\/TEST,jeffhostetler\/public_libgit2,sim0629\/libgit2,mingyaaaa\/libgit2,oaastest\/libgit2,kenprice\/libgit2,t0xicCode\/libgit2,since2014\/libgit2,falqas\/libgit2,magnus98\/TEST,yongthecoder\/libgit2,mcanthony\/libgit2,raybrad\/libit2,leoyanggit\/libgit2,Corillian\/libgit2,claudelee\/libgit2,linquize\/libgit2,ardumont\/libgit2,mingyaaaa\/libgit2,kissthink\/libgit2,skabel\/manguse,swisspol\/DEMO-libgit2,iankronquist\/libgit2,iankronquist\/libgit2,leoyanggit\/libgit2,skabel\/manguse,Tousiph\/Demo1,magnus98\/TEST,leoyanggit\/libgit2,kissthink\/libgit2,saurabhsuniljain\/libgit2,saurabhsuniljain\/libgit2,MrHacky\/libgit2,yosefhackmon\/libgit2,mrksrm\/Mingijura,t0xicCode\/libgit2,since2014\/libgit2,sygool\/libgit2,amyvmiwei\/libgit2,JIghtuse\/libgit2,oaastest\/libgit2,leoyanggit\/libgit2,jeffhostetler\/public_libgit2,jflesch\/libgit2-mariadb,joshtriplett\/libgit2,dleehr\/libgit2,joshtriplett\/libgit2,iankronquist\/libgit2,jflesch\/libgit2-mariadb,raybrad\/libit2,leoyanggit\/libgit2,sygool\/libgit2,whoisj\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/netops.c\n+++ src\/netops.c\n@@ -458,7 +458,7 @@\n \thints.ai_socktype = SOCK_STREAM;\n \thints.ai_family = AF_UNSPEC;\n \n-\tif ((ret = p_getaddrinfo(host, port, &hints, &info)) < 0) {\n+\tif ((ret = p_getaddrinfo(host, port, &hints, &info)) != 0) {\n \t\tgiterr_set(GITERR_NET,\n \t\t\t\"Failed to resolve address for %s: %s\", host, p_gai_strerror(ret));\n \t\treturn -1;\n"} {"commit":"390abf8c84a886e0c5c786fe1652188fbf53cbae","subject":"Fix incorrect doxygen tags.","message":"Fix incorrect doxygen tags.\n","repos":"oaelhara\/numbbo,oaelhara\/numbbo,dtusar\/coco,dtusar\/coco,dtusar\/coco,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,dtusar\/coco,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,dtusar\/coco,NDManh\/numbbo,oaelhara\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,dtusar\/coco,dtusar\/coco,NDManh\/numbbo,dtusar\/coco,NDManh\/numbbo","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/numbbo.h\n+++ src\/numbbo.h\n@@ -61,7 +61,7 @@\n * the returned pointer becomes invalid. When in doubt, strdup() the\n * returned value.\n *\n- * @ref numbbo_strdup\n+ * @see numbbo_strdup()\n *\/\n const char *numbbo_get_problem_name(numbbo_problem_t *self);\n \n@@ -74,7 +74,7 @@\n * the returned pointer becomes invalid. When in doubt, strdup() the\n * returned value.\n *\n- * @ref numbbo_strdup\n+ * @see numbbo_strdup\n *\/\n const char *numbbo_get_problem_id(numbbo_problem_t *self);\n \n@@ -103,8 +103,7 @@\n * By default, the center of the problems region of interest\n * is the initial solution.\n *\n- * @ref numbbo_get_smallest_values_of_interest\n- * @ref numbbo_get_largest_values_of_interest\n+ * @see numbbo_get_smallest_values_of_interest() and numbbo_get_largest_values_of_interest()\n *\/\n void numbbo_get_initial_solution(const numbbo_problem_t *self, \n double *initial_solution);\n@@ -190,7 +189,7 @@\n * it. The caller is responsible for releasing the allocated memory\n * using numbbo_free_memory().\n *\n- * @ref numbbo_free_memory\n+ * @see numbbo_free_memory()\n *\/\n char *numbbo_strdup(const char *string);\n \n"} {"commit":"cf637317a27b4b71962699ce7132e70b2612916a","subject":"Uppercases subcommands in MEMORY HELP","message":"Uppercases subcommands in MEMORY HELP\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/object.c\n+++ src\/object.c\n@@ -1123,11 +1123,11 @@\n if (c->argc == 2 && !strcasecmp(c->argv[1]->ptr,\"help\")) {\n \n const char *help[] = {\n-\"doctor - Return memory problems reports.\",\n-\"malloc-stats -- Return internal statistics report from the memory allocator.\",\n-\"purge -- Attempt to purge dirty pages for reclamation by the allocator.\",\n-\"stats -- Return information about the memory usage of the server.\",\n-\"usage <key> [samples <count>] -- Return memory in bytes used by <key> and its value. Nested values are sampled up to <count> times (default: 5).\",\n+\"DOCTOR - Return memory problems reports.\",\n+\"MALLOC-STATS -- Return internal statistics report from the memory allocator.\",\n+\"PURGE -- Attempt to purge dirty pages for reclamation by the allocator.\",\n+\"STATS -- Return information about the memory usage of the server.\",\n+\"USAGE <key> [SAMPLES <count>] -- Return memory in bytes used by <key> and its value. Nested values are sampled up to <count> times (default: 5).\",\n NULL\n };\n addReplyHelp(c, help);\n"} {"commit":"3d9ef2dc1befc9c63654633d3c714e11df85ddbc","subject":"Revert \"object: correct the expected ID size in prefix lookup\"","message":"Revert \"object: correct the expected ID size in prefix lookup\"\n\nThis reverts commit 969d4b703c910a8fd045baafbcd243b4c9825316.\n\nThis was a fluke from Coverity. The length to all the APIs in the\nlibrary is supposed to be passed in as nibbles, not bytes. Passing it as\nbytes would prevent us from parsing uneven-sized SHA1 strings.\n\nAlso, the rest of the library was still using nibbles (including\nrevparse and the odb_prefix APIs), so this change was seriously breaking\nthings in unexpected ways. ^^\n","repos":"jeffhostetler\/public_libgit2,dleehr\/libgit2,joshtriplett\/libgit2,linquize\/libgit2,sygool\/libgit2,Corillian\/libgit2,skabel\/manguse,KTXSoftware\/libgit2,t0xicCode\/libgit2,KTXSoftware\/libgit2,mcanthony\/libgit2,MrHacky\/libgit2,ardumont\/libgit2,yosefhackmon\/libgit2,mhp\/libgit2,mingyaaaa\/libgit2,yongthecoder\/libgit2,sim0629\/libgit2,spraints\/libgit2,KTXSoftware\/libgit2,t0xicCode\/libgit2,joshtriplett\/libgit2,sygool\/libgit2,magnus98\/TEST,spraints\/libgit2,falqas\/libgit2,jeffhostetler\/public_libgit2,mcanthony\/libgit2,JIghtuse\/libgit2,mcanthony\/libgit2,linquize\/libgit2,mingyaaaa\/libgit2,mrksrm\/Mingijura,leoyanggit\/libgit2,falqas\/libgit2,kenprice\/libgit2,Tousiph\/Demo1,linquize\/libgit2,claudelee\/libgit2,sim0629\/libgit2,falqas\/libgit2,sygool\/libgit2,KTXSoftware\/libgit2,spraints\/libgit2,Tousiph\/Demo1,kissthink\/libgit2,iankronquist\/libgit2,JIghtuse\/libgit2,dleehr\/libgit2,dleehr\/libgit2,JIghtuse\/libgit2,kissthink\/libgit2,since2014\/libgit2,nokiddin\/libgit2,linquize\/libgit2,since2014\/libgit2,ardumont\/libgit2,JIghtuse\/libgit2,iankronquist\/libgit2,yosefhackmon\/libgit2,stewid\/libgit2,sim0629\/libgit2,mhp\/libgit2,sim0629\/libgit2,mrksrm\/Mingijura,falqas\/libgit2,iankronquist\/libgit2,iankronquist\/libgit2,saurabhsuniljain\/libgit2,claudelee\/libgit2,saurabhsuniljain\/libgit2,KTXSoftware\/libgit2,oaastest\/libgit2,mingyaaaa\/libgit2,oaastest\/libgit2,saurabhsuniljain\/libgit2,mingyaaaa\/libgit2,mrksrm\/Mingijura,sygool\/libgit2,yosefhackmon\/libgit2,mhp\/libgit2,spraints\/libgit2,MrHacky\/libgit2,kenprice\/libgit2,claudelee\/libgit2,oaastest\/libgit2,joshtriplett\/libgit2,linquize\/libgit2,mingyaaaa\/libgit2,since2014\/libgit2,yongthecoder\/libgit2,MrHacky\/libgit2,leoyanggit\/libgit2,t0xicCode\/libgit2,Corillian\/libgit2,Corillian\/libgit2,skabel\/manguse,magnus98\/TEST,stewid\/libgit2,skabel\/manguse,KTXSoftware\/libgit2,magnus98\/TEST,iankronquist\/libgit2,kissthink\/libgit2,mcanthony\/libgit2,stewid\/libgit2,since2014\/libgit2,nokiddin\/libgit2,since2014\/libgit2,magnus98\/TEST,kissthink\/libgit2,yosefhackmon\/libgit2,jeffhostetler\/public_libgit2,stewid\/libgit2,yosefhackmon\/libgit2,skabel\/manguse,mcanthony\/libgit2,kenprice\/libgit2,leoyanggit\/libgit2,yosefhackmon\/libgit2,nokiddin\/libgit2,t0xicCode\/libgit2,nokiddin\/libgit2,leoyanggit\/libgit2,skabel\/manguse,mrksrm\/Mingijura,MrHacky\/libgit2,leoyanggit\/libgit2,yongthecoder\/libgit2,mcanthony\/libgit2,joshtriplett\/libgit2,saurabhsuniljain\/libgit2,claudelee\/libgit2,magnus98\/TEST,Corillian\/libgit2,spraints\/libgit2,skabel\/manguse,dleehr\/libgit2,joshtriplett\/libgit2,MrHacky\/libgit2,saurabhsuniljain\/libgit2,since2014\/libgit2,yongthecoder\/libgit2,sim0629\/libgit2,Corillian\/libgit2,t0xicCode\/libgit2,oaastest\/libgit2,Corillian\/libgit2,kenprice\/libgit2,ardumont\/libgit2,stewid\/libgit2,ardumont\/libgit2,yongthecoder\/libgit2,Tousiph\/Demo1,claudelee\/libgit2,stewid\/libgit2,kenprice\/libgit2,dleehr\/libgit2,linquize\/libgit2,mrksrm\/Mingijura,spraints\/libgit2,kenprice\/libgit2,kissthink\/libgit2,magnus98\/TEST,Tousiph\/Demo1,nokiddin\/libgit2,mhp\/libgit2,ardumont\/libgit2,JIghtuse\/libgit2,jeffhostetler\/public_libgit2,iankronquist\/libgit2,ardumont\/libgit2,claudelee\/libgit2,saurabhsuniljain\/libgit2,kissthink\/libgit2,dleehr\/libgit2,nokiddin\/libgit2,joshtriplett\/libgit2,MrHacky\/libgit2,mhp\/libgit2,jeffhostetler\/public_libgit2,sim0629\/libgit2,sygool\/libgit2,mrksrm\/Mingijura,Tousiph\/Demo1,mingyaaaa\/libgit2,Tousiph\/Demo1,falqas\/libgit2,mhp\/libgit2,leoyanggit\/libgit2,oaastest\/libgit2,t0xicCode\/libgit2,falqas\/libgit2,JIghtuse\/libgit2,jeffhostetler\/public_libgit2,yongthecoder\/libgit2,sygool\/libgit2,oaastest\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/object.c\n+++ src\/object.c\n@@ -129,10 +129,10 @@\n \tif (error < 0)\n \t\treturn error;\n \n-\tif (len > GIT_OID_RAWSZ)\n-\t\tlen = GIT_OID_RAWSZ;\n-\n-\tif (len == GIT_OID_RAWSZ) {\n+\tif (len > GIT_OID_HEXSZ)\n+\t\tlen = GIT_OID_HEXSZ;\n+\n+\tif (len == GIT_OID_HEXSZ) {\n \t\tgit_cached_obj *cached = NULL;\n \n \t\t\/* We want to match the full id : we can first look up in the cache,\n@@ -172,9 +172,9 @@\n \t\tmemcpy(short_oid.id, id->id, (len + 1) \/ 2);\n \t\tif (len % 2)\n \t\t\tshort_oid.id[len \/ 2] &= 0xF0;\n-\t\tmemset(short_oid.id + (len + 1) \/ 2, 0, (GIT_OID_RAWSZ - len) \/ 2);\n-\n-\t\t\/* If len < GIT_OID_RAWSZ (a strict short oid was given), we have\n+\t\tmemset(short_oid.id + (len + 1) \/ 2, 0, (GIT_OID_HEXSZ - len) \/ 2);\n+\n+\t\t\/* If len < GIT_OID_HEXSZ (a strict short oid was given), we have\n \t\t * 2 options :\n \t\t * - We always search in the cache first. If we find that short oid is\n \t\t *\tambiguous, we can stop. But in all the other cases, we must then\n"} {"commit":"3355cbef3a0dfe91056cafa2a97d52cd6d484fab","subject":"Minor update to openmp split point in substructure search","message":"Minor update to openmp split point in substructure search\n\n","repos":"pelahi\/VELOCIraptor-STF,pelahi\/VELOCIraptor-STF,pelahi\/VELOCIraptor-STF","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ompvar.h\n+++ src\/ompvar.h\n@@ -23,7 +23,7 @@\n \n \/\/\/ \\defgroup OMPLIMS For determining whether loop contains enough for openm to be worthwhile.\n \/\/@{\n-#define ompsplitsubsearchnum 10000\n+#define ompsplitsubsearchnum 100000\n #define ompsubsearchnum 10000\n #define ompsearchnum 50000\n #define ompunbindnum 1000\n"} {"commit":"2fd146ab1dcdb49aa2c298b5c0cf95fae689eee0","subject":"Added macOS Catalina to the list of OSX codenames.","message":"Added macOS Catalina to the list of OSX codenames.\n\nCloses #1615\n","repos":"allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/opesys.c\n+++ src\/opesys.c\n@@ -205,7 +205,9 @@\n static char *\n get_real_mac_osx (const char *osx)\n {\n- if (strstr (osx, \"10.14\"))\n+ if (strstr (osx, \"10.15\"))\n+ return alloc_string (\"macOS 10.14 Catalina\");\n+ else if (strstr (osx, \"10.14\"))\n return alloc_string (\"macOS 10.14 Mojave\");\n else if (strstr (osx, \"10.13\"))\n return alloc_string (\"macOS 10.13 High Sierra\");\n"} {"commit":"af62076ce970dee67b526ae4122a6f96b63e6ae1","subject":"add Android Pie 9 to get_real_android","message":"add Android Pie 9 to get_real_android\n","repos":"allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/opesys.c\n+++ src\/opesys.c\n@@ -121,7 +121,9 @@\n static char *\n get_real_android (const char *droid)\n {\n- if (strstr (droid, \"8.1\"))\n+ if (strstr (droid, \"9\"))\n+ return alloc_string (\"Pie 9\");\n+ else if (strstr (droid, \"8.1\"))\n return alloc_string (\"Oreo 8.1\");\n else if (strstr (droid, \"8.0\"))\n return alloc_string (\"Oreo 8.0\");\n"} {"commit":"390f9efa0680501f56bdc9ed9e9af263d2648d9e","subject":"Move write_repeat* functions to be strbuf functions","message":"Move write_repeat* functions to be strbuf functions\n","repos":"andybug\/ptab,andybug\/ptab,andybug\/ptab","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/output.c\n+++ src\/output.c\n@@ -31,16 +31,6 @@\n \tsize_t avail;\n };\n \n-union io_stream {\n-\tFILE *f;\n-\tptab_stream_t *s;\n-};\n-\n-struct io_vtable {\n-\tsize_t (*write)(const char*, size_t, union io_stream);\n-\tsize_t (*write_char)(const utf8_char_t*, union io_stream);\n-};\n-\n \/*\n * Format descriptors\n *\/\n@@ -87,7 +77,7 @@\n \treturn 0;\n }\n \n-static int strbuf_put_utf8c(struct strbuf *sb, const utf8_char_t *c)\n+static int strbuf_putu(struct strbuf *sb, const utf8_char_t *c)\n {\n \tif (c->len > sb->avail)\n \t\treturn EOF;\n@@ -99,146 +89,125 @@\n \treturn 0;\n }\n \n+static int strbuf_repeatc(struct strbuf *sb, char c, size_t num)\n+{\n+\tsize_t i;\n+\n+\tif (num > sb->avail)\n+\t\treturn EOF;\n+\n+\tfor (i = 0; i < num; i++)\n+\t\tsb->buf[sb->used + i] = c;\n+\n+\tsb->used += i;\n+\tsb->avail -= i;\n+\n+\treturn 0;\n+}\n+\n+static int strbuf_repeatu(struct strbuf *sb, const utf8_char_t *c, size_t num)\n+{\n+\tsize_t i;\n+\n+\tif ((num * c->len) > sb->avail)\n+\t\treturn EOF;\n+\n+\tfor (i = 0; i < num; i++)\n+\t\tstrbuf_putu(sb, c);\n+\n+\treturn 0;\n+}\n+\n \/*\n * Generic table writing\n *\/\n \n-static int write_repeat(\n-\t\tconst char *s,\n-\t\tsize_t len,\n-\t\tsize_t num,\n-\t\tconst struct io_vtable *vtable,\n-\t\tunion io_stream stream)\n-{\n-\tsize_t i;\n-\n-\tfor (i = 0; i < num; i++)\n-\t\tvtable->write(s, len, stream);\n-}\n-\n-static int write_repeat_char(\n-\t\tconst struct utf8_char *c,\n-\t\tsize_t num,\n-\t\tconst struct io_vtable *vtable,\n-\t\tunion io_stream stream)\n-{\n-\tsize_t i;\n-\n-\tfor (i = 0; i < num; i++)\n-\t\tvtable->write_char(c, stream);\n-}\n-\n static int write_row_top(\n \t\tconst ptab *p,\n \t\tconst struct format_desc *desc,\n-\t\tconst struct io_vtable *vtable,\n-\t\tunion io_stream stream)\n+\t\tstruct strbuf *sb)\n {\n \tconst struct ptab_col *col = p->internal->columns_head;\n \n-\tvtable->write_char(&desc->top_left_intersect, stream);\n-\tvtable->write_char(&desc->horiz_div, stream);\n+\tstrbuf_putu(sb, &desc->top_left_intersect);\n+\tstrbuf_putu(sb, &desc->horiz_div);\n \n \twhile (col) {\n-\t\twrite_repeat_char(\n-\t\t\t&desc->horiz_div,\n-\t\t\tcol->width,\n-\t\t\tvtable,\n-\t\t\tstream);\n+\t\tstrbuf_repeatu(sb, &desc->horiz_div, col->width);\n \n \t\tif (col->next) {\n-\t\t\tvtable->write_char(&desc->horiz_div, stream);\n-\t\t\tvtable->write_char(\n-\t\t\t\t\t&desc->top_middle_intersect,\n-\t\t\t\t\tstream);\n-\t\t\tvtable->write_char(&desc->horiz_div, stream);\n+\t\t\tstrbuf_putu(sb, &desc->horiz_div);\n+\t\t\tstrbuf_putu(sb, &desc->top_middle_intersect);\n+\t\t\tstrbuf_putu(sb, &desc->horiz_div);\n \t\t}\n \n \t\tcol = col->next;\n \t}\n \n-\tvtable->write_char(&desc->horiz_div, stream);\n-\tvtable->write_char(&desc->top_right_intersect, stream);\n-\tvtable->write(\"\\n\", 1, stream);\n+\tstrbuf_putu(sb, &desc->horiz_div);\n+\tstrbuf_putu(sb, &desc->top_right_intersect);\n+\tstrbuf_putc(sb, '\\n');\n }\n \n static int write_row_heading(\n \t\tconst ptab *p,\n \t\tconst struct format_desc *desc,\n-\t\tconst struct io_vtable *vtable,\n-\t\tunion io_stream stream)\n+\t\tstruct strbuf *sb)\n {\n \tconst struct ptab_col *col = p->internal->columns_head;\n \tsize_t padding;\n \n-\tvtable->write_char(&desc->vert_div, stream);\n-\tvtable->write(\" \", 1, stream);\n+\tstrbuf_putu(sb, &desc->vert_div);\n+\tstrbuf_putc(sb, ' ');\n \n \twhile (col) {\n \t\tpadding = col->width - col->name_len;\n \n-\t\tvtable->write(col->name, col->name_len, stream);\n-\t\twrite_repeat(\" \", 1, padding, vtable, stream);\n+\t\tstrbuf_puts(sb, col->name, col->name_len);\n+\t\tstrbuf_repeatc(sb, ' ', padding);\n \n \t\tif (col->next) {\n-\t\t\tvtable->write(\" \", 1, stream);\n-\t\t\tvtable->write_char(&desc->vert_div, stream);\n-\t\t\tvtable->write(\" \", 1, stream);\n+\t\t\tstrbuf_putc(sb, ' ');\n+\t\t\tstrbuf_putu(sb, &desc->vert_div);\n+\t\t\tstrbuf_putc(sb, ' ');\n \t\t}\n \n \t\tcol = col->next;\n \t}\n \n-\tvtable->write(\" \", 1, stream);\n-\tvtable->write_char(&desc->vert_div, stream);\n-\tvtable->write(\"\\n\", 1, stream);\n+\tstrbuf_putc(sb, ' ');\n+\tstrbuf_putu(sb, &desc->vert_div);\n+\tstrbuf_putc(sb, '\\n');\n }\n \n static int write_table(\n \t\tconst ptab *p,\n \t\tconst struct format_desc *desc,\n-\t\tconst struct io_vtable *vtable,\n-\t\tunion io_stream stream)\n-{\n-\twrite_row_top(p, desc, vtable, stream);\n-\twrite_row_heading(p, desc, vtable, stream);\n+\t\tstruct strbuf *sb)\n+{\n+\twrite_row_top(p, desc, sb);\n+\twrite_row_heading(p, desc, sb);\n \n \treturn PTAB_OK;\n }\n \n-\/*\n- * File-stream specific functions\n- *\/\n-\n-static size_t file_write(\n-\t\tconst char *str,\n-\t\tsize_t len,\n-\t\tunion io_stream stream)\n-{\n-\treturn fwrite(str, 1, len, stream.f);\n-}\n-\n-static size_t file_write_char(\n-\t\tconst struct utf8_char *c,\n-\t\tunion io_stream stream)\n-{\n-\treturn fwrite(c->c, 1, c->len, stream.f);\n-}\n-\n int ptab_dumpf(ptab *p, FILE *f, int flags)\n {\n \tconst struct format_desc *desc = &ascii_format;\n-\tstruct io_vtable vtable;\n-\tunion io_stream stream;\n-\n-\t\/* setup vtable with file functions *\/\n-\tvtable.write = file_write;\n-\tvtable.write_char = file_write_char;\n-\n-\t\/* set the stream to the file handle *\/\n-\tstream.f = f;\n-\n-\twrite_table(p, desc, &vtable, stream);\n+\tstruct strbuf sb;\n+\tsize_t alloc_size = 128;\n+\n+\t\/*\n+\t * allocate strbuf to be the same size as the entire\n+\t * output table\n+\t *\/\n+\tsb.buf = ptab_alloc(p, alloc_size);\n+\tsb.size = alloc_size;\n+\tsb.used = 0;\n+\tsb.avail = alloc_size;\n+\n+\twrite_table(p, desc, &sb);\n+\tfwrite(sb.buf, 1, sb.used, f);\n \n \treturn PTAB_OK;\n }\n"} {"commit":"b2ba7ceda3d516fa22a8ef2165d2db799e580695","subject":"ec: Copy the extended data objects to avoid crashes when they are freed","message":"ec: Copy the extended data objects to avoid crashes when they are freed\n","repos":"mtrojnar\/libp11,OpenSC\/libp11,mouse07410\/libp11,OpenSC\/libp11,mtrojnar\/libp11,mouse07410\/libp11","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/p11_ec.c\n+++ src\/p11_ec.c\n@@ -50,6 +50,7 @@\n #endif\n static compute_key_fn ossl_ecdh_compute_key;\n static void (*ossl_ec_finish)(EC_KEY *);\n+static int (*ossl_ec_copy)(EC_KEY *, const EC_KEY *);\n \n static int ec_ex_index = 0;\n \n@@ -344,6 +345,22 @@\n #endif\n }\n \n+static PKCS11_OBJECT_private *object_copy(PKCS11_OBJECT_private *src)\n+{\n+\tPKCS11_OBJECT_private *dest = NULL;\n+\n+\tdest = OPENSSL_malloc(sizeof *dest);\n+\tif (dest == NULL) {\n+\t\treturn NULL;\n+\t}\n+\t\/* shallow copy *\/\n+\tmemcpy(dest, src, sizeof *dest);\n+\t\/* update ref-counts *\/\n+\tdest->slot = pkcs11_slot_ref(src->slot);\n+\n+\treturn dest;\n+}\n+\n \/*\n * Get EC key material and stash pointer in ex_data\n * Note we get called twice, once for private key, and once for public\n@@ -355,6 +372,7 @@\n *\/\n static EVP_PKEY *pkcs11_get_evp_key_ec(PKCS11_OBJECT_private *key)\n {\n+\tPKCS11_OBJECT_private *newkey = NULL;\n \tEVP_PKEY *pk;\n \tEC_KEY *ec;\n \n@@ -378,7 +396,9 @@\n \t\/* TODO: Retrieve the ECDSA private key object attributes instead,\n \t * unless the key has the \"sensitive\" attribute set *\/\n \n-\tpkcs11_set_ex_data_ec(ec, key);\n+\t\/* This creates a new EC_KEY object which requires its own key object *\/\n+\tnewkey = object_copy(key);\n+\tpkcs11_set_ex_data_ec(ec, newkey);\n \tEVP_PKEY_set1_EC_KEY(pk, ec); \/* Also increments the ec ref count *\/\n \tEC_KEY_free(ec); \/* Drops our reference to it *\/\n \treturn pk;\n@@ -681,6 +701,32 @@\n \treturn 1;\n }\n \n+\/* Without this, the EC_KEY objects share the same PKCS11_OBJECT_private\n+ * object in ex_data and when one of them is freed, the following frees\n+ * result in crashes.\n+ * We need to deep-copy the object and fix all references to slots.\n+ *\/\n+static int pkcs11_ec_copy(EC_KEY *dest, const EC_KEY *src)\n+{\n+\tPKCS11_OBJECT_private *srckey = NULL;\n+\tPKCS11_OBJECT_private *destkey = NULL;\n+\n+\tsrckey = pkcs11_get_ex_data_ec(src);\n+\t\/* This now points to the same location ! *\/\n+\n+\tdestkey = object_copy(srckey);\n+\tif (destkey == NULL) {\n+\t\treturn 0;\n+\t}\n+\n+\tpkcs11_set_ex_data_ec(dest, destkey);\n+\n+\tif (ossl_ec_copy)\n+\t\tossl_ec_copy(dest, src);\n+\n+\treturn 1;\n+}\n+\n #else\n \n \/**\n@@ -740,7 +786,6 @@\n {\n \tstatic EC_KEY_METHOD *ops = NULL;\n \tint (*orig_init)(EC_KEY *);\n-\tint (*orig_copy)(EC_KEY *, const EC_KEY *);\n \tint (*orig_set_group)(EC_KEY *, const EC_GROUP *);\n \tint (*orig_set_private)(EC_KEY *, const BIGNUM *);\n \tint (*orig_set_public)(EC_KEY *, const EC_POINT *);\n@@ -750,9 +795,9 @@\n \talloc_ec_ex_index();\n \tif (!ops) {\n \t\tops = EC_KEY_METHOD_new((EC_KEY_METHOD *)EC_KEY_OpenSSL());\n-\t\tEC_KEY_METHOD_get_init(ops, &orig_init, &ossl_ec_finish, &orig_copy,\n+\t\tEC_KEY_METHOD_get_init(ops, &orig_init, &ossl_ec_finish, &ossl_ec_copy,\n \t\t\t&orig_set_group, &orig_set_private, &orig_set_public);\n-\t\tEC_KEY_METHOD_set_init(ops, orig_init, pkcs11_ec_finish, orig_copy,\n+\t\tEC_KEY_METHOD_set_init(ops, orig_init, pkcs11_ec_finish, pkcs11_ec_copy,\n \t\t\torig_set_group, orig_set_private, orig_set_public);\n \t\tEC_KEY_METHOD_get_sign(ops, &orig_sign, NULL, NULL);\n \t\tEC_KEY_METHOD_set_sign(ops, orig_sign, NULL, pkcs11_ecdsa_sign_sig);\n"} {"commit":"2eaff2b3630fcac754abaa69cd1c33dbda67118b","subject":"packet: Set the packet to the processed data position.","message":"packet: Set the packet to the processed data position.\n\nElse we could end up with packet - current_macsize if to_be_read is 0.\n","repos":"mwgoldsmith\/libssh,mwgoldsmith\/ssh,mwgoldsmith\/ssh,mwgoldsmith\/libssh,mwgoldsmith\/libssh,mwgoldsmith\/libssh,mwgoldsmith\/ssh,mwgoldsmith\/ssh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/packet.c\n+++ src\/packet.c\n@@ -263,7 +263,7 @@\n }\n \n \/* copy the last part from the incoming buffer *\/\n- packet = packet + to_be_read - current_macsize;\n+ packet = ((uint8_t *)data) + processed;\n if (packet == NULL) {\n goto error;\n }\n"} {"commit":"17ad1345fea6b3a7ce5120bb55b69fcf53b9d1ef","subject":"schema parsers BUGFIX uninitialized variable","message":"schema parsers BUGFIX uninitialized variable\n","repos":"PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/parser.c\n+++ src\/parser.c\n@@ -3137,6 +3137,7 @@\n struct ly_set *extset;\n \n for (i = 0; i < module->deviation_size; i++) {\n+ target = NULL;\n resolve_augment_schema_nodeid(module->deviation[i].target_name, NULL, module, 0,\n (const struct lys_node **)&target);\n if (!target) {\n"} {"commit":"ce61ba61626caef6a6b6cae6666446676ff144ba","subject":"Use `calloc` for most of the statement struct memory allocators since destroy functions may be called on uninitialized memory if parsing does not finish (e.g. due to an error)","message":"Use `calloc` for most of the statement struct memory allocators since destroy functions may be called on uninitialized memory if parsing does not finish (e.g. due to an error)\n","repos":"chrisrink10\/mscript","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/parser.c\n+++ src\/parser.c\n@@ -184,6 +184,7 @@\n \n if (prs->ast) {\n ms_ASTDestroy(prs->ast);\n+ prs->ast = NULL;\n }\n \n *err = NULL;\n@@ -261,11 +262,20 @@\n * sub_list: '[' expr_list ']'\n *\/\n \n+\/*\n+ * For the most part, the parsing functions bubble their return values up\n+ * as output parameters (pointers to pointers). It is for this reason that\n+ * very few functions appear to clean up their allocated memory in the case\n+ * of an error. However, note that everything ultimately bubbles up to the\n+ * parser `ast` field which is always cleaned up when the parser is destroyed\n+ * or whenever the parser is reinitialized with a new file or string.\n+ *\/\n+\n static ms_ParseResult ParserParseStatement(ms_Parser *prs, ms_Stmt **stmt) {\n assert(prs);\n assert(stmt);\n \n- ms_ParseResult res = PARSE_ERROR;\n+ ms_ParseResult res;\n ms_Token *cur = prs->cur;\n \n if (!cur) {\n@@ -273,7 +283,7 @@\n return PARSE_ERROR;\n }\n \n- *stmt = malloc(sizeof(ms_Stmt));\n+ *stmt = calloc(1, sizeof(ms_Stmt));\n if (!(*stmt)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -285,52 +295,41 @@\n (*stmt)->type = STMTTYPE_BREAK;\n (*stmt)->cmpnt.brk = NULL;\n ParserConsumeToken(prs);\n+ res = PARSE_SUCCESS;\n break;\n case KW_CONTINUE:\n (*stmt)->type = STMTTYPE_CONTINUE;\n (*stmt)->cmpnt.cont = NULL;\n ParserConsumeToken(prs);\n+ res = PARSE_SUCCESS;\n break;\n case KW_DEL:\n (*stmt)->type = STMTTYPE_DELETE;\n- if ((res = ParserParseDeleteStatement(prs, &(*stmt)->cmpnt.del)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseDeleteStatement(prs, &(*stmt)->cmpnt.del);\n break;\n case KW_IF:\n (*stmt)->type = STMTTYPE_IF;\n- if ((res = ParserParseIfStatement(prs, &(*stmt)->cmpnt.ifstmt)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseIfStatement(prs, &(*stmt)->cmpnt.ifstmt);\n break;\n case KW_MERGE:\n (*stmt)->type = STMTTYPE_MERGE;\n- if ((res = ParserParseMergeStatement(prs, &(*stmt)->cmpnt.merge)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseMergeStatement(prs, &(*stmt)->cmpnt.merge);\n break;\n case KW_RETURN:\n (*stmt)->type = STMTTYPE_RETURN;\n- if ((res = ParserParseReturnStatement(prs, &(*stmt)->cmpnt.ret)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseReturnStatement(prs, &(*stmt)->cmpnt.ret);\n break;\n case KW_VAR:\n (*stmt)->type = STMTTYPE_DECLARATION;\n- if ((res = ParserParseDeclaration(prs, &(*stmt)->cmpnt.decl)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseDeclaration(prs, &(*stmt)->cmpnt.decl);\n break;\n case IDENTIFIER:\n- if ((res = ParserParseAssignment(prs, stmt)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseAssignment(prs, stmt);\n break;\n default:\n (*stmt)->type = STMTTYPE_EXPRESSION;\n- if ((res = ParserParseExpression(prs, &(*stmt)->cmpnt.expr)) == PARSE_ERROR) {\n- return res;\n- }\n+ res = ParserParseExpression(prs, &(*stmt)->cmpnt.expr);\n+ break;\n }\n \n return res;\n@@ -339,8 +338,6 @@\n static ms_ParseResult ParserParseBlock(ms_Parser *prs, ms_StmtBlock **block) {\n assert(prs);\n assert(block);\n-\n- ms_ParseResult res = PARSE_SUCCESS;\n \n *block = dsarray_new_cap(STATEMENT_BLOCK_DEFAULT_CAP, NULL,\n (dsarray_free_fn)ms_StmtDestroy);\n@@ -359,8 +356,8 @@\n \n while ((prs->cur) && (!ParserExpectToken(prs, RBRACE))) {\n ms_Stmt *stmt;\n- if ((res = ParserParseStatement(prs, &stmt)) == PARSE_ERROR) {\n- return res;\n+ if (ParserParseStatement(prs, &stmt) == PARSE_ERROR) {\n+ return PARSE_ERROR;\n }\n ParserConsumeNewlines(prs);\n dsarray_append(*block, stmt);\n@@ -372,14 +369,14 @@\n }\n \n ParserConsumeToken(prs);\n- return res;\n+ return PARSE_SUCCESS;\n }\n \n static ms_ParseResult ParserParseDeleteStatement(ms_Parser *prs, ms_StmtDelete **del) {\n assert(prs);\n assert(del);\n \n- *del = malloc(sizeof(ms_StmtDelete));\n+ *del = calloc(1, sizeof(ms_StmtDelete));\n if (!(*del)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -398,9 +395,7 @@\n assert(prs);\n assert(ifstmt);\n \n- ms_ParseResult res;\n-\n- *ifstmt = malloc(sizeof(ms_StmtIf));\n+ *ifstmt = calloc(1, sizeof(ms_StmtIf));\n if (!(*ifstmt)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -412,17 +407,16 @@\n }\n \n ParserConsumeToken(prs);\n- if ((res = ParserParseExpression(prs, &(*ifstmt)->expr)) == PARSE_ERROR) {\n- return res;\n- }\n-\n- if ((res = ParserParseBlock(prs, &(*ifstmt)->block)) == PARSE_ERROR) {\n- return res;\n+ if (ParserParseExpression(prs, &(*ifstmt)->expr) == PARSE_ERROR) {\n+ return PARSE_ERROR;\n+ }\n+\n+ if (ParserParseBlock(prs, &(*ifstmt)->block) == PARSE_ERROR) {\n+ return PARSE_ERROR;\n }\n \n if (!ParserExpectToken(prs, KW_ELSE)) {\n- (*ifstmt)->elif = NULL;\n- return res;\n+ return PARSE_ERROR;\n }\n \n return ParserParseElseStatement(prs, &(*ifstmt)->elif);\n@@ -432,7 +426,7 @@\n assert(prs);\n assert(elif);\n \n- *elif = malloc(sizeof(ms_StmtIfElse));\n+ *elif = calloc(1, sizeof(ms_StmtIfElse));\n if (!(*elif)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -463,7 +457,7 @@\n assert(prs);\n assert(merge);\n \n- *merge = malloc(sizeof(ms_StmtMerge));\n+ *merge = calloc(1, sizeof(ms_StmtMerge));\n if (!(*merge)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -492,7 +486,7 @@\n assert(prs);\n assert(ret);\n \n- *ret = malloc(sizeof(ms_StmtReturn));\n+ *ret = calloc(1, sizeof(ms_StmtReturn));\n if (!(*ret)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -511,7 +505,7 @@\n assert(prs);\n assert(decl);\n \n- *decl = malloc(sizeof(ms_StmtDeclaration));\n+ *decl = calloc(1, sizeof(ms_StmtDeclaration));\n if (!(*decl)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -586,7 +580,7 @@\n assert(stmt);\n \n ParserConsumeToken(prs);\n- (*stmt)->cmpnt.assign = malloc(sizeof(ms_StmtAssignment));\n+ (*stmt)->cmpnt.assign = calloc(1, sizeof(ms_StmtAssignment));\n if (!((*stmt)->cmpnt.assign)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -594,7 +588,6 @@\n \n (*stmt)->type = STMTTYPE_ASSIGNMENT;\n (*stmt)->cmpnt.assign->ident = name;\n- (*stmt)->cmpnt.assign->expr = NULL;\n return ParserParseExpression(prs, &(*stmt)->cmpnt.assign->expr);\n }\n \n@@ -616,7 +609,7 @@\n }\n \n ParserConsumeToken(prs);\n- (*stmt)->cmpnt.assign = malloc(sizeof(ms_StmtAssignment));\n+ (*stmt)->cmpnt.assign = calloc(1, sizeof(ms_StmtAssignment));\n if (!((*stmt)->cmpnt.assign)) {\n ParserErrorSet(prs, ERR_OUT_OF_MEMORY, prs->cur);\n return PARSE_ERROR;\n@@ -624,7 +617,6 @@\n \n (*stmt)->type = STMTTYPE_ASSIGNMENT;\n (*stmt)->cmpnt.assign->ident = name;\n- (*stmt)->cmpnt.assign->expr = NULL;\n ms_Expr *right = NULL;\n \n \/* parse the right piece of the expanded compound expression *\/\n"} {"commit":"b0770f6bd36c177b116406bdbef19ba96fa4a17d","subject":"Use proper error style to see the failing function via GitHub Editor ","message":"Use proper error style to see the failing function\r\nvia GitHub Editor \r\n\r\nSigned-of-by: Alexander Preisinger <1750c84fe08bb9e508c3e12c566d672c97535ea0@gmail.com>","repos":"CaptainHayashi\/crystals,CaptainHayashi\/crystals","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/parser.c\n+++ src\/parser.c\n@@ -57,7 +57,7 @@\n \n if (err != NULL)\n {\n- fatal (\"PARSER: Unable to read conifg file: %s\\n\", err->message);\n+ fatal (\"PARSER - init_config - Unable to read conifg file: %s\\n\", err->message);\n g_error_free (err);\n return NULL;\n }\n@@ -90,7 +90,7 @@\n \n if (err != NULL)\n {\n- error (\"PARSER: Unable to read string value: %s\\n\", err->message);\n+ error (\"PARSER - cfg_get_str - Unable to read string value: %s\\n\", err->message);\n g_error_free (err);\n return NULL;\n }\n@@ -111,7 +111,7 @@\n \n if (err != NULL)\n {\n- error (\"PARSER: Unable to read integer value: %s\\n\", err->message);\n+ error (\"PARSER - cfg_get_int - Unable to read integer value: %s\\n\", err->message);\n g_error_free (err);\n return 0;\n }\n"} {"commit":"376b0ad813490b0f79b7ba4d8323590513a424df","subject":"Do nor warn if foreign-register hook fails (because this is normal if foreign predicates are loaded from an embedding C environment).","message":"Do nor warn if foreign-register hook fails (because this is normal if\nforeign predicates are loaded from an embedding C environment).\n","repos":"mndrix\/swipl-devel,mndrix\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel,jn7163\/swipl-devel,mndrix\/swipl-devel,koryonik\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,koryonik\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel,koryonik\/swipl-devel,edechter\/swipl-devel,jn7163\/swipl-devel,jn7163\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,koryonik\/swipl-devel,koryonik\/swipl-devel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pl-fli.c\n+++ src\/pl-fli.c\n@@ -3491,7 +3491,8 @@\n PL_put_atom(argv+0, m->name);\n if ( !(PL_put_functor(argv+1, fd) &&\n \t PL_call_predicate(MODULE_system, PL_Q_NODEBUG, pred, argv)) )\n-\tSdprintf(\"Failed to notify new foreign predicate\\n\");\n+\t; \/*Sdprintf(\"Failed to notify new foreign predicate\\n\");*\/\n+\t \/*note that the hook may not be defined*\/\n PL_discard_foreign_frame(cid);\n }\n }\n"} {"commit":"585394678b19a810ac622c19c77deb6806983f34","subject":"Made some small changes to defines to better reflect DJGPP 2.+","message":"Made some small changes to defines to better reflect DJGPP 2.+\n\nsvn path=\/trunk\/; revision=3861\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plctrl.c\n+++ src\/plctrl.c\n@@ -14,7 +14,7 @@\n \/* for plMacLibOpen prototype; used in plLibOpen *\/\n #endif\n \n-#ifdef __GO32__\t\t\t\/* dos386\/djgpp *\/\n+#ifdef DJGPP\t\t\t\/* dos386\/djgpp *\/\n #ifdef __unix\n #undef __unix\n #endif\n@@ -55,7 +55,7 @@\n \/* An additional hardwired location for lib files. *\/\n \/* I have no plans to change these again, ever. *\/\n \n-#if defined(GNU386)\n+#if defined(DJGPP)\n #ifndef PLLIBDEV\n #define PLLIBDEV \"c:\/plplot\/lib\"\n #endif\n"} {"commit":"fcf4bc4a69bf3bd4cae3683b7d27a382bbb35830","subject":"Fix ifi2 condition for looking for crossings between polygon 1 and 2.","message":"Fix ifi2 condition for looking for crossings between polygon 1 and 2.\n\nFor split2 store data in order of increasing index of polygon 2 to\npreserve the orientation.\n\n(These changes to fill_intersection_polygon made page 2 of example 25, where\nboth polygons have positive orientation (see\nhttp:\/\/en.wikipedia.org\/wiki\/Curve_orientation for a discussion of this)\ngive correct filling results for the first time for the\n-DFILL_INTERSECTION_POLYGON=ON case.\n\nTransform polygon 1 to have positive orientation in the\n-DFILL_INTERSECTION_POLYGON=ON part of plP_plfclp. This made page 1 of\nexample 25 (where polygon 1 had negative orientation) work correctly.\nThanks to Arjen for this idea.\n\nThere are still issues with pages 3 and above of example 25 for\n-DFILL_INTERSECTION_POLYGON=ON.\n\nThese changes should not affect the default -DFILL_INTERSECTION_POLYGON=OFF\ncase.\n\n\nsvn path=\/trunk\/; revision=10727\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plfill.c\n+++ src\/plfill.c\n@@ -102,6 +102,9 @@\n PLINT xA1, PLINT yA1, PLINT xA2, PLINT yA2,\n PLINT xB1, PLINT yB1, PLINT xB2, PLINT yB2 );\n \n+static int\n+positive_orientation( PLINT n, const PLINT *x, const PLINT *y );\n+\n \/*----------------------------------------------------------------------*\\\n * void plfill()\n *\n@@ -457,22 +460,22 @@\n if ( npts < 3 || !draw ) return;\n \n #ifdef USE_FILL_INTERSECTION_POLYGON\n- PLINT *x1, *y1, i1start = 0, i, im1, n1;\n+ PLINT *x10, *y10, *x1, *y1, i1start = 0, i, im1, n1, n1m1;\n PLINT x2[4] = { xmin, xmax, xmax, xmin };\n PLINT y2[4] = { ymin, ymin, ymax, ymax };\n PLINT if2[4] = { 0, 0, 0, 0 };\n PLINT n2 = 4;\n- if (( x1 = (PLINT *) malloc( npts * sizeof ( PLINT ))) == NULL )\n+ if (( x10 = (PLINT *) malloc( npts * sizeof ( PLINT ))) == NULL )\n {\n plexit( \"plP_plfclp: Insufficient memory\" );\n }\n- if (( y1 = (PLINT *) malloc( npts * sizeof ( PLINT ))) == NULL )\n+ if (( y10 = (PLINT *) malloc( npts * sizeof ( PLINT ))) == NULL )\n {\n plexit( \"plP_plfclp: Insufficient memory\" );\n }\n- \/* Polygon 2 obviously has no dups, but get rid of them in polygon\n- * 1 if they exist. ToDo: Deal with self-intersecting polygon 1\n- * case as well. *\/\n+ \/* Polygon 2 obviously has no dups nor two consective segments that\n+ * are parallel, but get rid of those type of segments in polygon 1\n+ * if they exist. *\/\n \n im1 = npts - 1;\n n1 = 0;\n@@ -480,12 +483,49 @@\n {\n if ( !( x[i] == x[im1] && y[i] == y[im1] ))\n {\n- x1[n1] = x[i];\n- y1[n1++] = y[i];\n+ x10[n1] = x[i];\n+ y10[n1++] = y[i];\n }\n im1 = i;\n }\n \n+ \/* Must have at least three points that satisfy the above criteria. *\/\n+ if ( n1 < 3 )\n+ {\n+ free( x10 );\n+ free( y10 );\n+ return;\n+ }\n+\n+ \/* Polygon 2 obviously has a positive orientation (i.e., as you\n+ * ascend in index along the boundary, the points just adjacent to\n+ * the boundary and on the left are interior points for the\n+ * polygon), but enforce this condition demanded by\n+ * fill_intersection_polygon for polygon 1 as well. *\/\n+ if ( positive_orientation( n1, x10, y10 ))\n+ {\n+ x1 = x10;\n+ y1 = y10;\n+ }\n+ else\n+ {\n+ if (( x1 = (PLINT *) malloc( n1 * sizeof ( PLINT ))) == NULL )\n+ {\n+ plexit( \"plP_plfclp: Insufficient memory\" );\n+ }\n+ if (( y1 = (PLINT *) malloc( n1 * sizeof ( PLINT ))) == NULL )\n+ {\n+ plexit( \"plP_plfclp: Insufficient memory\" );\n+ }\n+ n1m1 = n1 - 1;\n+ for ( i = 0; i < n1; i++ )\n+ {\n+ x1[n1m1 - i] = x10[i];\n+ y1[n1m1 - i] = y10[i];\n+ }\n+ free( x10 );\n+ free( y10 );\n+ }\n fill_intersection_polygon( 0, 0, draw, x1, y1, i1start, n1, x2, y2, if2, n2 );\n free( x1 );\n free( y1 );\n@@ -1250,25 +1290,34 @@\n return !( count_crossings % 2 );\n }\n #endif \/* NEW_NOTPOINTINPOLYGON_CODE *\/\n-\/* Fill intersection of two simple (not self-intersecting) polygons.\n- * There must be an even number of edge intersections between the two\n- * polygons (ignoring vertex intersections which touch, but do not cross).\n- * Eliminate those intersection pairs by recursion (calling the same\n- * routine twice again with the second polygon split at a boundary defined\n- * by the first intersection point, all polygon 1 vertices between\n- * the intersections, and the second intersection point).\n- * Once the recursion has eliminated all intersecting edges, fill or\n- * not using the appropriate polygon depending on whether the first\n- * and second polygons are identical or whether one of them is\n- * entirely inside the other of them. If ifextrapolygon is true, the fill\n- * step will consist of another recursive call to the routine with\n+\n+#define MAX_RECURSION_DEPTH 10\n+\n+\/* Fill intersection of two simple (not self-intersecting) polygons\n+ * that both have a positive orientation (see\n+ * http:\/\/en.wikipedia.org\/wiki\/Curve_orientation). That is, as you\n+ * traverse the boundary in index order, the inside area of the\n+ * polygon is always on the left. This requirement simplifies the\n+ * logic of fill_instersection_polygon. N.B. it is the calling\n+ * routine's responsibility to insure the two polygons do not have\n+ * duplicate points, are not self-intersecting, and have positive\n+ * orientation.\n+ *\n+ * Two polygons that do not self intersect must have an even number of\n+ * edge crossings between them. (ignoring vertex intersections which\n+ * touch, but do not cross). fill_intersection_polygon eliminates\n+ * those intersection crossings by recursion (calling the same routine\n+ * twice again with the second polygon split at a boundary defined by\n+ * the first intersection point, all polygon 1 vertices between the\n+ * intersections, and the second intersection point). Once the\n+ * recursion has eliminated all crossing edges, fill or not using the\n+ * appropriate polygon depending on whether the first and second\n+ * polygons are identical or whether one of them is entirely inside\n+ * the other of them. If ifextrapolygon is true, the fill step will\n+ * consist of another recursive call to the routine with\n * ifextrapolygon false, and the second polygon set to an additional\n- * polygon defined by the stream (not yet implemented).\n- * N.B. it is the calling routine's responsibility to insure the two\n- * polygons are not self-intersecting and do not have duplicate points. *\/\n-\n-\n-#define MAX_RECURSION_DEPTH 10\n+ * polygon defined by the stream (not yet implemented). *\/\n+\n void\n fill_intersection_polygon( PLINT recursion_depth, PLINT ifextrapolygon,\n void ( *fill )( short *, short *, PLINT ),\n@@ -1281,8 +1330,8 @@\n i2, i2m1, i2wrap, i2wraplast,\n kk, kkstart1, kkstart21, kkstart22,\n k, kstart, range1, range21, range22, ncrossed,\n- nsplit1, nsplit2;\n- PLINT xintersect[2], yintersect[2], ifcrossed;\n+ nsplit1, nsplit2, nsplit2m1;\n+ PLINT xintersect[2], yintersect[2], ifnotcrossed;\n PLINT *xsplit1, *ysplit1, *ifsplit1,\n *xsplit2, *ysplit2, *ifsplit2;\n PLINT ifill, nfill = 0,\n@@ -1413,18 +1462,14 @@\n i2wrap = -1;\n for ( i2 = 0; i2 < n2; i2++ )\n {\n- if ( !if2[i2] )\n- {\n- \/* ifcrossed true only if there is a definite crossing of\n- * the two line segments with the intersect not being\n- * near (+\/- PL_NBCC) the ends. ToDo. This test\n- * must be made more elaborate if the polygons definitely\n- * cross near one or both of their vertices. *\/\n- ifcrossed = !notcrossed(\n+ if ( !( if2[i2] && if2[i2m1] ))\n+ {\n+ ifnotcrossed = notcrossed(\n &xintersect[ncrossed], &yintersect[ncrossed],\n x1[i1m1], y1[i1m1], x1[i1], y1[i1],\n x2[i2m1], y2[i2m1], x2[i2], y2[i2] );\n- if ( ifcrossed )\n+ \/* Use only definite crossing case. *\/\n+ if ( !ifnotcrossed )\n {\n if ( ncrossed == 0 )\n {\n@@ -1501,6 +1546,12 @@\n if ( kk == n2 )\n kk = 0;\n }\n+ \/* N.B. the positive orientation of split2\n+ * is preserved since the index order is\n+ * the same as that of polygon 2, and by\n+ * assumption that polygon and polygon 1\n+ * have identical positive\n+ * orientations. *\/\n fill_intersection_polygon(\n recursion_depth + 1, ifextrapolygon, fill,\n xsplit2, ysplit2, 0, n2,\n@@ -1567,33 +1618,41 @@\n plexit( \"fill_intersection_polygon: Insufficient memory\" );\n }\n \/* Common boundary between split1 and split2. *\/\n- k = 0;\n- xsplit1[k] = xintersect[0];\n- ysplit1[k] = yintersect[0];\n- ifsplit1[k] = 1;\n- xsplit2[k] = xintersect[0];\n- ysplit2[k] = yintersect[0];\n- ifsplit2[k] = 1;\n- kstart = k + 1;\n- kk = kkstart1;\n+ \/* N.B. Although basic index arithmetic for\n+ * split 2 is done in negative orientation\n+ * order because the index is decrementing\n+ * relative to the index of split 2, actually\n+ * store results in reverse order to preserve\n+ * the positive orientation that by assumption\n+ * both polygon 1 and 2 have. *\/\n+ k = 0;\n+ xsplit1[k] = xintersect[0];\n+ ysplit1[k] = yintersect[0];\n+ ifsplit1[k] = 1;\n+ nsplit2m1 = nsplit2 - 1;\n+ xsplit2[nsplit2m1 - k] = xintersect[0];\n+ ysplit2[nsplit2m1 - k] = yintersect[0];\n+ ifsplit2[nsplit2m1 - k] = 1;\n+ kstart = k + 1;\n+ kk = kkstart1;\n \/* No wrap checks on kk index below because\n * it must always be in valid range (since\n * polygon 1 traversed only once). *\/\n for ( k = kstart; k < range1 + 1; k++ )\n {\n- xsplit1[k] = x1[kk];\n- ysplit1[k] = y1[kk];\n- ifsplit1[k] = 2;\n- xsplit2[k] = x1[kk];\n- ysplit2[k] = y1[kk++];\n- ifsplit2[k] = 2;\n+ xsplit1[k] = x1[kk];\n+ ysplit1[k] = y1[kk];\n+ ifsplit1[k] = 2;\n+ xsplit2[nsplit2m1 - k] = x1[kk];\n+ ysplit2[nsplit2m1 - k] = y1[kk++];\n+ ifsplit2[nsplit2m1 - k] = 2;\n }\n- xsplit1[k] = xintersect[1];\n- ysplit1[k] = yintersect[1];\n- ifsplit1[k] = 1;\n- xsplit2[k] = xintersect[1];\n- ysplit2[k] = yintersect[1];\n- ifsplit2[k] = 1;\n+ xsplit1[k] = xintersect[1];\n+ ysplit1[k] = yintersect[1];\n+ ifsplit1[k] = 1;\n+ xsplit2[nsplit2m1 - k] = xintersect[1];\n+ ysplit2[nsplit2m1 - k] = yintersect[1];\n+ ifsplit2[nsplit2m1 - k] = 1;\n \n \/* Finish off collecting split1 using ascending kk\n * values. *\/\n@@ -1608,6 +1667,11 @@\n kk -= n2;\n }\n \n+ \/* N.B. the positive orientation of split1 is\n+ * preserved since the index order is the same\n+ * as that of polygon 2, and by assumption\n+ * that polygon and polygon 1 have identical\n+ * positive orientations. *\/\n fill_intersection_polygon(\n recursion_depth + 1, ifextrapolygon, fill,\n x1, y1, i1start, n1,\n@@ -1621,13 +1685,18 @@\n kk = kkstart22;\n for ( k = kstart; k < nsplit2; k++ )\n {\n- xsplit2[k] = x2[kk];\n- ysplit2[k] = y2[kk];\n- ifsplit2[k] = if2[kk--];\n+ xsplit2[nsplit2m1 - k] = x2[kk];\n+ ysplit2[nsplit2m1 - k] = y2[kk];\n+ ifsplit2[nsplit2m1 - k] = if2[kk--];\n if ( kk < 0 )\n kk += n2;\n }\n \n+ \/* N.B. the positive orientation of split2 is\n+ * preserved since the index order is the same\n+ * as that of polygon 2, and by assumption\n+ * that polygon and polygon 1 have identical\n+ * positive orientations. *\/\n fill_intersection_polygon(\n recursion_depth + 1, ifextrapolygon, fill,\n x1, y1, i1start, n1,\n@@ -1793,9 +1862,9 @@\n {\n \/* Two line segments are parallel *\/\n status = status | PL_PARALLEL;\n- \/* Choice of intersect is arbitrary in this case. Choose A1 if\n- * that lies near or in B. Otherwise, choose A2 if that lies near\n- * or in B. Otherwise, choose the average point. *\/\n+ \/* Choice of intersect is arbitrary in this case. Choose A1, A2,\n+ * B1, or B2 (in that order) if any of them lie inside or near\n+ * the other line segment. Otherwise, choose the average point. *\/\n if (( BETW_NBCC( xA1, xB1, xB2 ) && BETW_NBCC( yA1, yB1, yB2 )))\n {\n fxintersect = xA1;\n@@ -1805,6 +1874,16 @@\n {\n fxintersect = xA2;\n fyintersect = yA2;\n+ }\n+ else if (( BETW_NBCC( xB1, xA1, xA2 ) && BETW_NBCC( yB1, yA1, yA2 )))\n+ {\n+ fxintersect = xB1;\n+ fyintersect = yB1;\n+ }\n+ else if (( BETW_NBCC( xB2, xA1, xA2 ) && BETW_NBCC( yB2, yA1, yA2 )))\n+ {\n+ fxintersect = xB2;\n+ fyintersect = yB2;\n }\n else\n {\n@@ -1849,3 +1928,32 @@\n \n return status;\n }\n+\n+\/* Decide if polygon has a positive orientation or not.\n+ * See http:\/\/en.wikipedia.org\/wiki\/Curve_orientation for details\n+ * of this simple determinate method. *\/\n+int\n+positive_orientation( PLINT n, const PLINT *x, const PLINT *y )\n+{\n+ PLFLT xa, ya, xb, yb, xc, yc, det;\n+ if ( n < 3 )\n+ {\n+ plwarn( \"positive_orientation: internal logic error, n < 3\" );\n+ return 0;\n+ }\n+ \/* Use floating point to avoid integer overflows. *\/\n+ xa = x[0];\n+ xb = x[1];\n+ xc = x[2];\n+ ya = y[0];\n+ yb = y[1];\n+ yc = y[2];\n+ det = ( xa * yb + xb * yc + xc * ya ) - ( xa * yc + xb * ya + xc * yb );\n+ if ( det == 0. )\n+ {\n+ plwarn( \"positive_orientation: internal logic error, det == 0.\" );\n+ return 0;\n+ }\n+ else\n+ return det > 0.;\n+}\n"} {"commit":"b2a0d55fd6cdbeadb8c415304c15d0e30046ff3b","subject":"memzero: automate the selection of the implementation (#196)","message":"memzero: automate the selection of the implementation (#196)\n\n","repos":"trezor\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto,trezor\/trezor-crypto","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- memzero.c\n+++ memzero.c\n@@ -1,7 +1,43 @@\n+#ifndef __STDC_WANT_LIB_EXT1__\n+#define __STDC_WANT_LIB_EXT1__ 1 \/\/ C11's bounds-checking interface.\n+#endif\n #include <string.h>\n+\n+#ifdef _WIN32\n+#include <Windows.h>\n+#endif\n+\n+#ifdef __unix__\n #include <strings.h>\n+#include <sys\/param.h>\n+#endif\n \n-\/\/ taken from https:\/\/github.com\/jedisct1\/libsodium\/blob\/1647f0d53ae0e370378a9195477e3df0a792408f\/src\/libsodium\/sodium\/utils.c#L102-L130\n+\/\/ C11's bounds-checking interface.\n+#if defined(__STDC_LIB_EXT1__)\n+#define HAVE_MEMSET_S 1\n+#endif\n+\n+\/\/ GNU C Library version 2.25 or later.\n+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25)\n+#define HAVE_EXPLICIT_BZERO 1\n+#endif\n+\n+\/\/ FreeBSD version 11.0 or later.\n+#if defined(__FreeBSD__) && __FreeBSD_version >= 1100037\n+#define HAVE_EXPLICIT_BZERO 1\n+#endif\n+\n+\/\/ OpenBSD version 5.5 or later.\n+#if defined(__OpenBSD__) && OpenBSD >= 201405\n+#define HAVE_EXPLICIT_BZERO 1\n+#endif\n+\n+\/\/ NetBSD version 7.2 or later.\n+#if defined(__NetBSD__) && __NetBSD_Version__ >= 702000000\n+#define HAVE_EXPLICIT_MEMSET 1\n+#endif\n+\n+\/\/ Adapted from https:\/\/github.com\/jedisct1\/libsodium\/blob\/1647f0d53ae0e370378a9195477e3df0a792408f\/src\/libsodium\/sodium\/utils.c#L102-L130\n \n void memzero(void *const pnt, const size_t len)\n {\n"} {"commit":"ebaa1afdd6bf4db663ab4aa3fb7363f481bc0403","subject":"Rewrite send_update.","message":"Rewrite send_update.\n","repos":"sudomesh\/babeld,wlanslovenija\/babeld,wlanslovenija\/babeld,Gwendocg\/babeldToS,Gwendocg\/babeldToS,woniullb\/babeld,Drooids\/babeld,boutier\/babeld,tcatm\/babeld,jech\/babeld,dtaht\/babeld-shortrtt-metrics,jech\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -737,7 +737,7 @@\n send_update(struct network *net, int urgent,\n const unsigned char *prefix, unsigned char plen)\n {\n- int i;\n+ int i, selfonly;\n struct request *request;\n \n if(prefix) {\n@@ -758,8 +758,6 @@\n if(net == NULL) {\n for(i = 0; i < numnets; i++) {\n send_update(&nets[i], urgent, prefix, plen);\n- if(!nets[i].up)\n- continue;\n }\n return;\n }\n@@ -767,37 +765,35 @@\n if(!net->up)\n return;\n \n- if(parasitic || (silent_time && now.tv_sec < reboot_time + silent_time)) {\n- if(prefix == NULL) {\n- send_self_update(net, 0);\n- delay_jitter(&net->update_time, &net->update_timeout,\n- update_interval);\n- } else if(find_xroute(prefix, plen)) {\n- buffer_update(net, prefix, plen);\n- }\n- return;\n- }\n-\n- silent_time = 0;\n+ selfonly =\n+ parasitic || (silent_time && now.tv_sec < reboot_time + silent_time);\n+\n+ if(!selfonly)\n+ silent_time = 0;\n \n if(prefix) {\n if(updates > net->bufsize \/ 24 - 2) {\n \/* Update won't fit in current packet *\/\n flushupdates();\n }\n- debugf(\"Sending update to %s for %s.\\n\",\n- net->ifname, format_prefix(prefix, plen));\n- buffer_update(net, prefix, plen);\n+ if(!selfonly || find_xroute(prefix, plen)) {\n+ debugf(\"Sending update to %s for %s.\\n\",\n+ net->ifname, format_prefix(prefix, plen));\n+ buffer_update(net, prefix, plen);\n+ }\n } else {\n send_self_update(net, 0);\n \/* Don't send full route dumps more than ten times per second *\/\n if(net->update_time.tv_sec > 0 &&\n timeval_minus_msec(&now, &net->update_time) < 100)\n return;\n- debugf(\"Sending update to %s for any.\\n\", net->ifname);\n- for(i = 0; i < numroutes; i++)\n- if(routes[i].installed)\n- buffer_update(net, routes[i].src->prefix, routes[i].src->plen);\n+ if(!selfonly) {\n+ debugf(\"Sending update to %s for any.\\n\", net->ifname);\n+ for(i = 0; i < numroutes; i++)\n+ if(routes[i].installed)\n+ buffer_update(net,\n+ routes[i].src->prefix, routes[i].src->plen);\n+ }\n delay_jitter(&net->update_time, &net->update_timeout,\n update_interval);\n }\n"} {"commit":"d3fafe01f1df61b5ebc478807b1736ac9023d27a","subject":"Fix: I never pass NULL pointers for src-prefix, but zeroes.","message":"Fix: I never pass NULL pointers for src-prefix, but zeroes.\n","repos":"jech\/babeld,Gwendocg\/babeldToS,dtaht\/babeld-shortrtt-metrics,wlanslovenija\/babeld,wlanslovenija\/babeld,Drooids\/babeld,Gwendocg\/babeldToS,sudomesh\/babeld,jech\/babeld,tcatm\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -541,8 +541,8 @@\n len - parsed_len, channels);\n }\n \n- update_route(router_id, prefix, plen, NULL, 0, seqno, metric, interval,\n- neigh, nh,\n+ update_route(router_id, prefix, plen, zeroes, 0, seqno,\n+ metric, interval, neigh, nh,\n channels, channels_len(channels));\n } else if(type == MESSAGE_REQUEST) {\n unsigned char prefix[16], plen;\n"} {"commit":"4174e678388d4a829fef7a2102fc5b19e5df888f","subject":"Eliminate memory leak in code:make_stub\/1","message":"Eliminate memory leak in code:make_stub\/1\n","repos":"RichMorin\/otp,johanclaesson\/otp,hairyhum\/otp,klarna\/otp,mikpe\/otp,ahmedshafeeq\/otp,ferd\/otp,matwey\/otp,getong\/otp,vladdu\/otp,psyeugenic\/otp,bernardd\/otp,lantti\/otp,falkevik\/otp,goertzenator\/otp,aboroska\/otp,ahmedshafeeq\/otp,bsmr-erlang\/otp,release-project\/otp,vic\/otp,vic\/otp,ahmedshafeeq\/otp,riverrun\/otp,kvakvs\/otp,msantos\/otp,psyeugenic\/otp,RaimoNiskanen\/otp,legoscia\/otp,lianghaivv\/otp,saleyn\/otp,release-project\/otp,marquisthunder\/otp,johanclaesson\/otp,lrascao\/otp,potatosalad\/otp,lantti\/otp,electricimp\/otp,VincentHHL\/otp,haguenau\/otp,jamesruan\/otp,riverrun\/otp,RaimoNiskanen\/otp,g-andrade\/otp,bernardd\/otp,yangchengjian\/otp,legoscia\/otp,uabboli\/otp,jj1bdx\/otp,entropiae\/otp,tuncer\/otp,massemanet\/otp,jamesruan\/otp,rlipscombe\/otp,klarna\/otp,kvakvs\/otp,massemanet\/otp,RGafiyatullin\/otp,derek121\/otp,benoitc\/otp-1,yangchengjian\/otp,massemanet\/otp,bjorng\/otp,uabboli\/otp,jemsbhai\/otp,yangchengjian\/otp,kvakvs\/otp,benoitc\/otp-1,lhslll\/otp,cnbin\/otp,lhslll\/otp,stolen\/otp,matwey\/otp,lucafavatella\/otp,marquisthunder\/otp,jemsbhai\/otp,lianghaivv\/otp,GinjaNinja32\/otp,VincentHHL\/otp,sitexa\/otp,weisslj\/otp,psyeugenic\/otp,msantos\/otp,lucafavatella\/otp,jemsbhai\/otp,jinshana\/otp,jemsbhai\/otp,gjaldon\/otp,legoscia\/otp,lemenkov\/otp,rlipscombe\/otp,RoadRunnr\/otp,vladdu\/otp,emacsmirror\/erlang,jinshana\/otp,uabboli\/otp,c-rack\/otp,Teino1978-Corp\/erlang-otp,RoadRunnr\/otp,dgud\/otp,mujiatong\/otp,lrascao\/otp,johanclaesson\/otp,massemanet\/otp,riverrun\/otp,awetzel\/otp,NOMORECOFFEE\/otp,krishnakumar4a4\/otp,fenollp\/otp,riverrun\/otp,lhslll\/otp,VincentHHL\/otp,sdebnath\/otp,schlagert\/otp,lightcyphers\/otp,sdebnath\/otp,palas\/otp,bernardd\/otp,beni55\/otp,jj1bdx\/otp,vladdu\/otp,riverrun\/otp,falkevik\/otp,dumbbell\/otp,tuncer\/otp,lucafavatella\/otp,release-project\/otp,cnbin\/otp,aboroska\/otp,bugs-erlang-org\/otp,hairyhum\/otp,jemsbhai\/otp,paulcager\/otp,weisslj\/otp,bsmr-erlang\/otp,rlipscombe\/otp,paladim\/otp,aboroska\/otp,c-rack\/otp,fenollp\/otp,weisslj\/otp,johanclaesson\/otp,paulcager\/otp,saleyn\/otp,palas\/otp,ader1990\/otp,potatosalad\/otp,cobusc\/otp,sitexa\/otp,bsmr-erlang\/otp,jj1bdx\/otp,lantti\/otp,dgud\/otp,weisslj\/otp,saleyn\/otp,massemanet\/otp,mikpe\/otp,falkevik\/otp,Teino1978-Corp\/otp,erlang\/otp,jamesruan\/otp,lrascao\/otp,Teino1978-Corp\/erlang-otp,marquisthunder\/otp,mikpe\/otp,dgud\/otp,mujiatong\/otp,marquisthunder\/otp,saleyn\/otp,jemsbhai\/otp,bsmr-erlang\/otp,vic\/otp,erlang\/otp,schlagert\/otp,sdebnath\/otp,krishnakumar4a4\/otp,uabboli\/otp,Teino1978-Corp\/otp,erlang\/otp,bernardd\/otp,Teino1978-Corp\/erlang-otp,emacsmirror\/erlang,palas\/otp,krishnakumar4a4\/otp,jamesruan\/otp,lantti\/otp,potatosalad\/otp,yangchengjian\/otp,yangchengjian\/otp,bjorng\/otp,dgud\/otp,cnbin\/otp,bsmr-erlang\/otp,weisslj\/otp,RJ\/otp,ahmedshafeeq\/otp,neeraj9\/otp,jj1bdx\/otp,massemanet\/otp,vic\/otp,paladim\/otp,gjaldon\/otp,platinumthinker\/otp,RoadRunnr\/otp,release-project\/otp,bsmr-erlang\/otp,RaimoNiskanen\/otp,release-project\/otp,cobusc\/otp,lemenkov\/otp,RJ\/otp,jj1bdx\/otp,dgud\/otp,beni55\/otp,NOMORECOFFEE\/otp,erlang\/otp,msantos\/otp,erlang\/otp,erlang\/otp,stolen\/otp,sitexa\/otp,haguenau\/otp,awetzel\/otp,cobusc\/otp,sitexa\/otp,c-rack\/otp,vinoski\/otp,theom\/otp,neeraj9\/otp,awetzel\/otp,haguenau\/otp,g-andrade\/otp,emile\/otp,lucafavatella\/otp,dumbbell\/otp,theom\/otp,RaimoNiskanen\/otp,basho\/otp,riverrun\/otp,vic\/otp,ader1990\/otp,theom\/otp,RichMorin\/otp,tuncer\/otp,RJ\/otp,sammoth-wazoku\/otp,Teino1978-Corp\/otp,rlipscombe\/otp,enikki\/otp,rlipscombe\/otp,getong\/otp,RoadRunnr\/otp,ader1990\/otp,saleyn\/otp,vladdu\/otp,massemanet\/otp,bjorng\/otp,isvilen\/otp,RGafiyatullin\/otp,tuncer\/otp,RGafiyatullin\/otp,getong\/otp,rlipscombe\/otp,gjaldon\/otp,emile\/otp,mujiatong\/otp,dumbbell\/otp,VincentHHL\/otp,matwey\/otp,mikpe\/otp,enikki\/otp,RGafiyatullin\/otp,lantti\/otp,vinoski\/otp,bsmr-erlang\/otp,isvilen\/otp,GinjaNinja32\/otp,bugs-erlang-org\/otp,enikki\/otp,tuncer\/otp,electricimp\/otp,platinumthinker\/otp,GinjaNinja32\/otp,kvakvs\/otp,g-andrade\/otp,NOMORECOFFEE\/otp,potatosalad\/otp,palas\/otp,getong\/otp,lantti\/otp,paulcager\/otp,potatosalad\/otp,VincentHHL\/otp,derek121\/otp,awetzel\/otp,neeraj9\/otp,lightcyphers\/otp,hairyhum\/otp,g-andrade\/otp,emacsmirror\/erlang,RJ\/otp,bugs-erlang-org\/otp,benoitc\/otp-1,derek121\/otp,dumbbell\/otp,stolen\/otp,gjaldon\/otp,RaimoNiskanen\/otp,aboroska\/otp,g-andrade\/otp,jinshana\/otp,neeraj9\/otp,mikpe\/otp,isvilen\/otp,lhslll\/otp,haguenau\/otp,NOMORECOFFEE\/otp,derek121\/otp,haguenau\/otp,bugs-erlang-org\/otp,neeraj9\/otp,jj1bdx\/otp,bernardd\/otp,RJ\/otp,isvilen\/otp,jemsbhai\/otp,paulcager\/otp,kvakvs\/otp,dgud\/otp,vladdu\/otp,jj1bdx\/otp,neeraj9\/otp,stolen\/otp,lianghaivv\/otp,goertzenator\/otp,lucafavatella\/otp,riverrun\/otp,lemenkov\/otp,msantos\/otp,bjorng\/otp,schlagert\/otp,marquisthunder\/otp,mikpe\/otp,paladim\/otp,RichMorin\/otp,NOMORECOFFEE\/otp,lightcyphers\/otp,electricimp\/otp,bjorng\/otp,yangchengjian\/otp,jinshana\/otp,potatosalad\/otp,benoitc\/otp-1,neeraj9\/otp,aboroska\/otp,erlang\/otp,vladdu\/otp,bugs-erlang-org\/otp,psyeugenic\/otp,sdebnath\/otp,emacsmirror\/erlang,ahmedshafeeq\/otp,ahmedshafeeq\/otp,fenollp\/otp,uabboli\/otp,legoscia\/otp,emile\/otp,dumbbell\/otp,falkevik\/otp,cobusc\/otp,psyeugenic\/otp,paladim\/otp,VincentHHL\/otp,platinumthinker\/otp,enikki\/otp,g-andrade\/otp,RGafiyatullin\/otp,saleyn\/otp,bjorng\/otp,goertzenator\/otp,basho\/otp,goertzenator\/otp,bernardd\/otp,saleyn\/otp,getong\/otp,vic\/otp,ader1990\/otp,NOMORECOFFEE\/otp,hairyhum\/otp,fenollp\/otp,electricimp\/otp,cobusc\/otp,basho\/otp,electricimp\/otp,aboroska\/otp,VincentHHL\/otp,bjorng\/otp,stolen\/otp,benoitc\/otp-1,platinumthinker\/otp,rlipscombe\/otp,sdebnath\/otp,g-andrade\/otp,falkevik\/otp,palas\/otp,paladim\/otp,gjaldon\/otp,vladdu\/otp,potatosalad\/otp,theom\/otp,release-project\/otp,theom\/otp,krishnakumar4a4\/otp,vinoski\/otp,Teino1978-Corp\/otp,basho\/otp,weisslj\/otp,jamesruan\/otp,fenollp\/otp,lhslll\/otp,lightcyphers\/otp,matwey\/otp,RaimoNiskanen\/otp,emile\/otp,dgud\/otp,isvilen\/otp,basho\/otp,c-rack\/otp,isvilen\/otp,erlang\/otp,kvakvs\/otp,stolen\/otp,uabboli\/otp,yangchengjian\/otp,schlagert\/otp,bjorng\/otp,dumbbell\/otp,neeraj9\/otp,weisslj\/otp,awetzel\/otp,RGafiyatullin\/otp,bjorng\/otp,RoadRunnr\/otp,electricimp\/otp,erlang\/otp,jamesruan\/otp,falkevik\/otp,derek121\/otp,NOMORECOFFEE\/otp,matwey\/otp,jemsbhai\/otp,lianghaivv\/otp,platinumthinker\/otp,fenollp\/otp,klarna\/otp,palas\/otp,potatosalad\/otp,dumbbell\/otp,jamesruan\/otp,lantti\/otp,lucafavatella\/otp,g-andrade\/otp,Teino1978-Corp\/erlang-otp,lianghaivv\/otp,marquisthunder\/otp,dumbbell\/otp,RoadRunnr\/otp,lianghaivv\/otp,vladdu\/otp,sammoth-wazoku\/otp,vic\/otp,RoadRunnr\/otp,falkevik\/otp,palas\/otp,emile\/otp,paladim\/otp,beni55\/otp,hairyhum\/otp,cnbin\/otp,erlang\/otp,jinshana\/otp,beni55\/otp,tuncer\/otp,RJ\/otp,haguenau\/otp,lightcyphers\/otp,lrascao\/otp,getong\/otp,lrascao\/otp,mikpe\/otp,jinshana\/otp,bsmr-erlang\/otp,jj1bdx\/otp,falkevik\/otp,RaimoNiskanen\/otp,emacsmirror\/erlang,entropiae\/otp,lemenkov\/otp,awetzel\/otp,lucafavatella\/otp,johanclaesson\/otp,platinumthinker\/otp,RaimoNiskanen\/otp,fenollp\/otp,msantos\/otp,matwey\/otp,electricimp\/otp,lrascao\/otp,vinoski\/otp,jj1bdx\/otp,hairyhum\/otp,getong\/otp,schlagert\/otp,derek121\/otp,jinshana\/otp,lemenkov\/otp,sammoth-wazoku\/otp,Teino1978-Corp\/otp,lucafavatella\/otp,vic\/otp,bernardd\/otp,goertzenator\/otp,awetzel\/otp,g-andrade\/otp,weisslj\/otp,ahmedshafeeq\/otp,ader1990\/otp,electricimp\/otp,matwey\/otp,RichMorin\/otp,cobusc\/otp,sammoth-wazoku\/otp,RoadRunnr\/otp,psyeugenic\/otp,rlipscombe\/otp,emile\/otp,potatosalad\/otp,lightcyphers\/otp,beni55\/otp,electricimp\/otp,ferd\/otp,dumbbell\/otp,cnbin\/otp,ferd\/otp,dgud\/otp,entropiae\/otp,goertzenator\/otp,vinoski\/otp,theom\/otp,mujiatong\/otp,schlagert\/otp,dgud\/otp,lemenkov\/otp,paulcager\/otp,bjorng\/otp,Teino1978-Corp\/erlang-otp,emacsmirror\/erlang,psyeugenic\/otp,emacsmirror\/erlang,c-rack\/otp,cobusc\/otp,awetzel\/otp,RGafiyatullin\/otp,GinjaNinja32\/otp,tuncer\/otp,benoitc\/otp-1,sdebnath\/otp,saleyn\/otp,tuncer\/otp,ferd\/otp,marquisthunder\/otp,paulcager\/otp,legoscia\/otp,getong\/otp,enikki\/otp,Teino1978-Corp\/erlang-otp,theom\/otp,isvilen\/otp,paulcager\/otp,dumbbell\/otp,sitexa\/otp,kvakvs\/otp,klarna\/otp,Teino1978-Corp\/otp,RJ\/otp,gjaldon\/otp,Teino1978-Corp\/erlang-otp,enikki\/otp,legoscia\/otp,RichMorin\/otp,ferd\/otp,emacsmirror\/erlang,derek121\/otp,uabboli\/otp,getong\/otp,falkevik\/otp,benoitc\/otp-1,gjaldon\/otp,mikpe\/otp,psyeugenic\/otp,krishnakumar4a4\/otp,fenollp\/otp,ferd\/otp,isvilen\/otp,legoscia\/otp,entropiae\/otp,goertzenator\/otp,basho\/otp,haguenau\/otp,johanclaesson\/otp,lantti\/otp,vinoski\/otp,stolen\/otp,basho\/otp,release-project\/otp,cnbin\/otp,aboroska\/otp,mujiatong\/otp,RGafiyatullin\/otp,kvakvs\/otp,krishnakumar4a4\/otp,rlipscombe\/otp,yangchengjian\/otp,emile\/otp,msantos\/otp,klarna\/otp,klarna\/otp,derek121\/otp,ader1990\/otp,paladim\/otp,beni55\/otp,basho\/otp,enikki\/otp,hairyhum\/otp,basho\/otp,lrascao\/otp,massemanet\/otp,klarna\/otp,RichMorin\/otp,bugs-erlang-org\/otp,massemanet\/otp,Teino1978-Corp\/otp,cnbin\/otp,platinumthinker\/otp,GinjaNinja32\/otp,lrascao\/otp,cobusc\/otp,theom\/otp,tuncer\/otp,rlipscombe\/otp,ader1990\/otp,Teino1978-Corp\/erlang-otp,lemenkov\/otp,sammoth-wazoku\/otp,lhslll\/otp,sdebnath\/otp,mujiatong\/otp,palas\/otp,RJ\/otp,emacsmirror\/erlang,jamesruan\/otp,cnbin\/otp,weisslj\/otp,isvilen\/otp,aboroska\/otp,lhslll\/otp,entropiae\/otp,entropiae\/otp,jinshana\/otp,ferd\/otp,lemenkov\/otp,goertzenator\/otp,sitexa\/otp,kvakvs\/otp,bugs-erlang-org\/otp,vinoski\/otp,klarna\/otp,emacsmirror\/erlang,mikpe\/otp,sitexa\/otp,g-andrade\/otp,krishnakumar4a4\/otp,legoscia\/otp,jj1bdx\/otp,gjaldon\/otp,stolen\/otp,vladdu\/otp,RichMorin\/otp,ferd\/otp,vinoski\/otp,c-rack\/otp,lhslll\/otp,enikki\/otp,johanclaesson\/otp,release-project\/otp,VincentHHL\/otp,paulcager\/otp,potatosalad\/otp,schlagert\/otp,Teino1978-Corp\/otp,c-rack\/otp,dgud\/otp,bsmr-erlang\/otp,matwey\/otp,riverrun\/otp,entropiae\/otp,matwey\/otp,sammoth-wazoku\/otp,ahmedshafeeq\/otp,bugs-erlang-org\/otp,uabboli\/otp,GinjaNinja32\/otp,marquisthunder\/otp,fenollp\/otp,lrascao\/otp,sdebnath\/otp,c-rack\/otp,uabboli\/otp,getong\/otp,RichMorin\/otp,benoitc\/otp-1,lightcyphers\/otp,beni55\/otp,msantos\/otp,sammoth-wazoku\/otp,vinoski\/otp,sammoth-wazoku\/otp,lianghaivv\/otp,mujiatong\/otp,NOMORECOFFEE\/otp,mujiatong\/otp,GinjaNinja32\/otp,bernardd\/otp,emile\/otp,krishnakumar4a4\/otp,johanclaesson\/otp,vinoski\/otp,entropiae\/otp,bernardd\/otp,ader1990\/otp,legoscia\/otp,release-project\/otp,hairyhum\/otp,lianghaivv\/otp,goertzenator\/otp,lightcyphers\/otp,haguenau\/otp,isvilen\/otp,RaimoNiskanen\/otp,msantos\/otp,GinjaNinja32\/otp,aboroska\/otp,mikpe\/otp,saleyn\/otp,sitexa\/otp,emile\/otp,ferd\/otp,paladim\/otp,beni55\/otp,schlagert\/otp,ahmedshafeeq\/otp,RoadRunnr\/otp,platinumthinker\/otp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- erts\/emulator\/beam\/beam_load.c\n+++ erts\/emulator\/beam\/beam_load.c\n@@ -1,7 +1,7 @@\n \/*\n * %CopyrightBegin%\n *\n- * Copyright Ericsson AB 1996-2010. All Rights Reserved.\n+ * Copyright Ericsson AB 1996-2011. All Rights Reserved.\n *\n * The contents of this file are subject to the Erlang Public License,\n * Version 1.1, (the \"License\"); you may not use this file except in\n@@ -5497,6 +5497,9 @@\n \tif (state.lambdas != state.def_lambdas) {\n \t erts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas);\n \t}\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels);\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom);\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export);\n \tif (bin != NULL) {\n \t driver_free_binary(bin);\n \t}\n@@ -5508,8 +5511,17 @@\n if (code != NULL) {\n \terts_free(ERTS_ALC_T_CODE, code);\n }\n+ if (state.labels != NULL) {\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.labels);\n+ }\n if (state.lambdas != state.def_lambdas) {\n \terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.lambdas);\n+ }\n+ if (state.atom != NULL) {\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.atom);\n+ }\n+ if (state.export != NULL) {\n+\terts_free(ERTS_ALC_T_LOADER_TMP, (void *) state.export);\n }\n if (bin != NULL) {\n \tdriver_free_binary(bin);\n"} {"commit":"0fbc03ec4e294eb4a7fd874984a16fced6cbdb03","subject":"Added handling for the write errors in receiveFdPipe.","message":"Added handling for the write errors in receiveFdPipe.\n\nFixed a dead assignment in process.c reported by CLang++\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sal\/osl\/unx\/process.c\n+++ sal\/osl\/unx\/process.c\n@@ -375,6 +375,16 @@\n \n OSL_TRACE(\"receiveFdPipe : writing back %i\",nRetCode);\n nRead=write(PipeFD,&nRetCode,sizeof(nRetCode));\n+\n+ if ( nRead < 0 )\n+ {\n+ OSL_TRACE(\"write failed (%s)\", strerror(errno));\n+ }\n+ else if ( nRead != sizeof(nRetCode) )\n+ {\n+ \/\/ TODO: Handle this case.\n+ OSL_TRACE(\"partial write: wrote %d out of %d)\", nRead, sizeof(nRetCode));\n+ }\n \n #if defined(IOCHANNEL_TRANSFER_BSD_RENO)\n free(cmptr);\n"} {"commit":"dec00bc88d61c660075f4cea401623cd524d6d6f","subject":"Don't log token authentication failures as error log messages","message":"Don't log token authentication failures as error log messages\n","repos":"uroni\/urbackup_backend,uroni\/urbackup_backend,uroni\/urbackup_backend,uroni\/urbackup_backend,uroni\/urbackup_backend,uroni\/urbackup_backend,uroni\/urbackup_backend","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- urbackupclient\/InternetClient.h\n+++ urbackupclient\/InternetClient.h\n@@ -52,6 +52,7 @@\n \r\n \tstatic void addOnetimeToken(const std::string &token);\r\n \tstatic std::pair<unsigned int, std::string> getOnetimeToken(void);\r\n+\tstatic void clearOnetimeTokens();\r\n \r\n \tstatic std::string getStatusMsg();\r\n \r\n"} {"commit":"2da28bfd9665f49d40abb4c7720b43135feaf79a","subject":"thp: fix page_referenced to modify mapcount\/vm_flags only if page is found","message":"thp: fix page_referenced to modify mapcount\/vm_flags only if page is found\n\nWhen vmscan.c calls page_referenced(), if an anon page was created\nbefore a process forked, rmap will search for it in both of the\nprocesses, even though one of them might have since broken COW.\n\nIf the child process mlocks the vma where the COWed page belongs to,\npage_referenced() running on the page mapped by the parent would lead to\n*vm_flags getting VM_LOCKED set erroneously (leading to the references\non the parent page being ignored and evicting the parent page too\nearly).\n\n*mapcount would also be decremented by page_referenced_one even if the\npage wasn't found by page_check_address.\n\nThis also lets pmdp_clear_flush_young_notify() go ahead on a\npmd_trans_splitting() pmd.\n\nWe hold the page_table_lock so __split_huge_page_map() must wait the\npmdp_clear_flush_young_notify() to complete before it can modify the\npmd. The pmd is also still mapped in userland so the young bit may\nmaterialize through a tlb miss before split_huge_page_map runs.\n\nThis will provide a more accurate page_referenced() behavior during\nsplit_huge_page().\n\nSigned-off-by: Andrea Arcangeli <6cb163d975a8c4c46420677e0054b55c39bdb339@redhat.com>\nReported-by: Michel Lespinasse <6a4cf9207bb95b1a4cf1be22c2e93f8b38036f65@google.com>\nReviewed-by: Michel Lespinasse <6a4cf9207bb95b1a4cf1be22c2e93f8b38036f65@google.com>\nReviewed-by: Minchan Kim <12330474acf818c36105a159b1ab0efedce0665c@gmail.com>\nReviewed-by: Johannes Weiner <331be22c6b63ca3e0a03d408c2d906b1b02cd5f2@cmpxchg.org>\nReviewed-by: Rik van Riel<a21938f5d463ddf41aa718934c205ca2cce8ebbc@redhat.com>\nReviewed-by: KOSAKI Motohiro <70a1d3ef3e17a2bb0f09a1b2e6c86f607ed1d6d9@jp.fujitsu.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mm\/rmap.c\n+++ mm\/rmap.c\n@@ -497,40 +497,50 @@\n \tstruct mm_struct *mm = vma->vm_mm;\n \tint referenced = 0;\n \n-\t\/*\n-\t * Don't want to elevate referenced for mlocked page that gets this far,\n-\t * in order that it progresses to try_to_unmap and is moved to the\n-\t * unevictable list.\n-\t *\/\n-\tif (vma->vm_flags & VM_LOCKED) {\n-\t\t*mapcount = 0;\t\/* break early from loop *\/\n-\t\t*vm_flags |= VM_LOCKED;\n-\t\tgoto out;\n-\t}\n-\n-\t\/* Pretend the page is referenced if the task has the\n-\t swap token and is in the middle of a page fault. *\/\n-\tif (mm != current->mm && has_swap_token(mm) &&\n-\t\t\trwsem_is_locked(&mm->mmap_sem))\n-\t\treferenced++;\n-\n \tif (unlikely(PageTransHuge(page))) {\n \t\tpmd_t *pmd;\n \n \t\tspin_lock(&mm->page_table_lock);\n+\t\t\/*\n+\t\t * rmap might return false positives; we must filter\n+\t\t * these out using page_check_address_pmd().\n+\t\t *\/\n \t\tpmd = page_check_address_pmd(page, mm, address,\n \t\t\t\t\t PAGE_CHECK_ADDRESS_PMD_FLAG);\n-\t\tif (pmd && !pmd_trans_splitting(*pmd) &&\n-\t\t pmdp_clear_flush_young_notify(vma, address, pmd))\n+\t\tif (!pmd) {\n+\t\t\tspin_unlock(&mm->page_table_lock);\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\tif (vma->vm_flags & VM_LOCKED) {\n+\t\t\tspin_unlock(&mm->page_table_lock);\n+\t\t\t*mapcount = 0;\t\/* break early from loop *\/\n+\t\t\t*vm_flags |= VM_LOCKED;\n+\t\t\tgoto out;\n+\t\t}\n+\n+\t\t\/* go ahead even if the pmd is pmd_trans_splitting() *\/\n+\t\tif (pmdp_clear_flush_young_notify(vma, address, pmd))\n \t\t\treferenced++;\n \t\tspin_unlock(&mm->page_table_lock);\n \t} else {\n \t\tpte_t *pte;\n \t\tspinlock_t *ptl;\n \n+\t\t\/*\n+\t\t * rmap might return false positives; we must filter\n+\t\t * these out using page_check_address().\n+\t\t *\/\n \t\tpte = page_check_address(page, mm, address, &ptl, 0);\n \t\tif (!pte)\n \t\t\tgoto out;\n+\n+\t\tif (vma->vm_flags & VM_LOCKED) {\n+\t\t\tpte_unmap_unlock(pte, ptl);\n+\t\t\t*mapcount = 0;\t\/* break early from loop *\/\n+\t\t\t*vm_flags |= VM_LOCKED;\n+\t\t\tgoto out;\n+\t\t}\n \n \t\tif (ptep_clear_flush_young_notify(vma, address, pte)) {\n \t\t\t\/*\n@@ -545,6 +555,12 @@\n \t\t}\n \t\tpte_unmap_unlock(pte, ptl);\n \t}\n+\n+\t\/* Pretend the page is referenced if the task has the\n+\t swap token and is in the middle of a page fault. *\/\n+\tif (mm != current->mm && has_swap_token(mm) &&\n+\t\t\trwsem_is_locked(&mm->mmap_sem))\n+\t\treferenced++;\n \n \t(*mapcount)--;\n \n"} {"commit":"1cff425d727f10c851aa2c0fcec63395e8f960b3","subject":"minunit: add assert_str_eq","message":"minunit: add assert_str_eq\n","repos":"siddharthist\/math389,siddharthist\/math389,siddharthist\/math389","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- minunit.h\n+++ minunit.h\n@@ -45,7 +45,18 @@\n } \\\n } while (0)\n \n-\/\/ TODO: assert_str_eq\n+#define assert_str_eq(str1, str2) \\\n+ do { \\\n+ tests_run++; \\\n+ if (strcmp(str1, str2) != 0) { \\\n+ tests_failed++; \\\n+ snprintf(message, 1024, \\\n+ \"%s failed:\\n\\t%s:%d: expected %s == %s, got %s\", __func__, \\\n+ __FILE__, __LINE__, #str2, str1, str2); \\\n+ return message; \\\n+ } \\\n+ } while (0)\n+\n #define run_test(test) \\\n do { \\\n char *message = test(); \\\n"} {"commit":"1d47d64fa6f79e969d2c4f5e573ddf5dad1e3bdd","subject":"SRZ: supress gcc unused parameter warnings II - work everywhere","message":"SRZ: supress gcc unused parameter warnings II - work everywhere\n","repos":"uentity\/bluesky,uentity\/bluesky,uentity\/bluesky,uentity\/bluesky,uentity\/bluesky","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- kernel\/include\/bs_serialize_macro.h\n+++ kernel\/include\/bs_serialize_macro.h\n@@ -193,8 +193,7 @@\n struct bs_serialize::save< Archive, BS_MAKE_FULL_TYPE(T, tpl_args_num) > { \\\n static void go(Archive& ar, const BS_MAKE_FULL_TYPE(T, tpl_args_num)& t, \\\n const unsigned int version \\\n- ){ (void)version; \\\n- typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n+ ){ typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n \/* *\/\n \n #define BS_CLASS_FCN_BEGIN_load(T, tpl_args_num, tpl_args_prefix) \\\n@@ -205,8 +204,7 @@\n struct bs_serialize::load< Archive, BS_MAKE_FULL_TYPE(T, tpl_args_num) > { \\\n static void go(Archive& ar, BS_MAKE_FULL_TYPE(T, tpl_args_num)& t, \\\n const unsigned int version \\\n- ){ (void)version; \\\n- typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n+ ){ typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n \/* *\/\n \n #define BS_CLASS_FCN_BEGIN_serialize(T, tpl_args_num, tpl_args_prefix) \\\n@@ -217,8 +215,7 @@\n struct bs_serialize::serialize< Archive, BS_MAKE_FULL_TYPE(T, tpl_args_num) > { \\\n static void go(Archive& ar, BS_MAKE_FULL_TYPE(T, tpl_args_num)& t, \\\n const unsigned int version \\\n- ){ (void)version; \\\n- typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n+ ){ typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n \/* *\/\n \n #define BS_CLASS_FCN_BEGIN_save_construct_data(T, tpl_args_num, tpl_args_prefix) \\\n@@ -229,8 +226,7 @@\n struct bs_serialize::save_construct_data< Archive, BS_MAKE_FULL_TYPE(T, tpl_args_num) > { \\\n static void go(Archive& ar, const BS_MAKE_FULL_TYPE(T, tpl_args_num)* t, \\\n const unsigned int version \\\n- ){ (void)version; \\\n- typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n+ ){ typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n \/* *\/\n \n #define BS_CLASS_FCN_BEGIN_load_construct_data(T, tpl_args_num, tpl_args_prefix) \\\n@@ -241,12 +237,14 @@\n struct bs_serialize::load_construct_data< Archive, BS_MAKE_FULL_TYPE(T, tpl_args_num) > { \\\n static void go(Archive& ar, BS_MAKE_FULL_TYPE(T, tpl_args_num)* t, \\\n const unsigned int version \\\n- ){ (void)version; \\\n- typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n+ ){ typedef BS_MAKE_FULL_TYPE(T, tpl_args_num) type; \\\n \/* *\/\n \n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ use this macro as function terminator\n+\/\/\n #define BLUE_SKY_CLASS_SRZ_FCN_END \\\n-} }; }\n+(void)version; (void)ar; (void)t; } }; }\n \n #define BLUE_SKY_CLASS_SRZ_FCN_BEGIN_EXT(fcn, T, tpl_args_num, tpl_args_prefix) \\\n BOOST_PP_CAT(BS_CLASS_FCN_BEGIN_, fcn) \\\n@@ -287,7 +285,6 @@\n \/\/ third param passed as a sequence\n #define BS_TYPE_SERIALIZE_DECL_(T, tpl_args_num, tpl_args_prefix) \\\n BS_CLASS_FCN_BEGIN_load_construct_data(T, tpl_args_num, tpl_args_prefix) \\\n- (void)ar; (void)t; \\\n BLUE_SKY_CLASS_SRZ_FCN_END \\\n namespace boost { namespace archive { namespace detail { \\\n template< BS_ENUM_TPL_ARGS(tpl_args_num, tpl_args_prefix) > \\\n@@ -327,7 +324,6 @@\n \/\/\n #define BS_TYPE_SERIALIZE_DECL_BYNAME_(T, tpl_args_num, tpl_args_prefix, stype) \\\n BS_CLASS_FCN_BEGIN_load_construct_data(T, tpl_args_num, tpl_args_prefix) \\\n- (void)ar; (void)t; \\\n BLUE_SKY_CLASS_SRZ_FCN_END \\\n namespace boost { namespace archive { namespace detail { \\\n template< BS_ENUM_TPL_ARGS(tpl_args_num, tpl_args_prefix) > \\\n"} {"commit":"bf46c7c039f6fccb1a989c569beb8793f972297b","subject":"Use the new Finder API for the svg emage module","message":"Use the new Finder API for the svg emage module\n\n","repos":"turran\/egueb,turran\/egueb,turran\/egueb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- esvg\/modules\/emage\/emage_svg.c\n+++ esvg\/modules\/emage\/emage_svg.c\n@@ -272,7 +272,7 @@\n \/*----------------------------------------------------------------------------*\n * Emage Finder API *\n *----------------------------------------------------------------------------*\/\n-static const char * _emage_svg_find(Emage_Data *data)\n+static const char * _emage_svg_data_from(Emage_Data *data)\n {\n \tchar buf[4];\n \tchar *ret = NULL;\n@@ -291,8 +291,16 @@\n \treturn ret;\n }\n \n+static const char * _emage_svg_extension_from(const char *ext)\n+{\n+\tif (!strcmp(ext, \"svg\"))\n+\t\treturn \"image\/svg+xml\";\n+\treturn NULL;\n+}\n+\n static Emage_Finder _finder = {\n-\t\/* .find = \t\t*\/ _emage_svg_find,\n+\t\/* .data_from \t\t= *\/ _emage_svg_data_from,\n+\t\/* .extension_from \t= *\/ _emage_svg_extension_from,\n };\n \/*----------------------------------------------------------------------------*\n * Module API *\n"} {"commit":"a947eb95ea03199da7408a64baa97fbb613e9b84","subject":"SLAB: Record actual last user of freed objects.","message":"SLAB: Record actual last user of freed objects.\n\nCurrently, when using CONFIG_DEBUG_SLAB, we put in kfree() or\nkmem_cache_free() as the last user of free objects, which is not\nvery useful, so change it to the caller of those functions instead.\n\nAcked-by: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nAcked-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nSigned-off-by: Suleiman Souhlal <c59d73aa392515035fc8eee220a04e1b5bb2472a@google.com>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -3604,13 +3604,14 @@\n * Release an obj back to its cache. If the obj has a constructed state, it must\n * be in this state _before_ it is released. Called with disabled ints.\n *\/\n-static inline void __cache_free(struct kmem_cache *cachep, void *objp)\n+static inline void __cache_free(struct kmem_cache *cachep, void *objp,\n+ void *caller)\n {\n \tstruct array_cache *ac = cpu_cache_get(cachep);\n \n \tcheck_irq_off();\n \tkmemleak_free_recursive(objp, cachep->flags);\n-\tobjp = cache_free_debugcheck(cachep, objp, __builtin_return_address(0));\n+\tobjp = cache_free_debugcheck(cachep, objp, caller);\n \n \tkmemcheck_slab_free(cachep, objp, obj_size(cachep));\n \n@@ -3801,7 +3802,7 @@\n \tdebug_check_no_locks_freed(objp, obj_size(cachep));\n \tif (!(cachep->flags & SLAB_DEBUG_OBJECTS))\n \t\tdebug_check_no_obj_freed(objp, obj_size(cachep));\n-\t__cache_free(cachep, objp);\n+\t__cache_free(cachep, objp, __builtin_return_address(0));\n \tlocal_irq_restore(flags);\n \n \ttrace_kmem_cache_free(_RET_IP_, objp);\n@@ -3831,7 +3832,7 @@\n \tc = virt_to_cache(objp);\n \tdebug_check_no_locks_freed(objp, obj_size(c));\n \tdebug_check_no_obj_freed(objp, obj_size(c));\n-\t__cache_free(c, (void *)objp);\n+\t__cache_free(c, (void *)objp, __builtin_return_address(0));\n \tlocal_irq_restore(flags);\n }\n EXPORT_SYMBOL(kfree);\n"} {"commit":"98939b4915b5686bf26c35388ff4a3cd41f9eb57","subject":"Replace my EOF fix with better one from sendmail-bugs discussion","message":"Replace my EOF fix with better one from sendmail-bugs discussion\n\nShould go into 2.2\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/sendmail\/src\/collect.c\n+++ usr.sbin\/sendmail\/src\/collect.c\n@@ -94,7 +94,7 @@\n \tvolatile bool ignrdot = smtpmode ? FALSE : IgnrDot;\n \tvolatile time_t dbto = smtpmode ? TimeOuts.to_datablock : 0;\n \tregister char *volatile bp;\n-\tvolatile int c = '\\0';\n+\tvolatile int c = EOF;\n \tvolatile bool inputerr = FALSE;\n \tbool headeronly;\n \tchar *volatile buf;\n@@ -192,7 +192,6 @@\n \t\t\t\tc = *--pbp;\n \t\t\telse\n \t\t\t{\n-\t\t\t\tc = EOF;\n \t\t\t\twhile (!feof(fp) && !ferror(fp))\n \t\t\t\t{\n \t\t\t\t\terrno = 0;\n"} {"commit":"ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62","subject":"SLAB: Fix lockdep annotations for CPU hotplug","message":"SLAB: Fix lockdep annotations for CPU hotplug\n\nAs reported by Paul McKenney:\n\n I am seeing some lockdep complaints in rcutorture runs that include\n frequent CPU-hotplug operations. The tests are otherwise successful.\n My first thought was to send a patch that gave each array_cache\n structure's ->lock field its own struct lock_class_key, but you already\n have a init_lock_keys() that seems to be intended to deal with this.\n\n ------------------------------------------------------------------------\n\n =============================================\n [ INFO: possible recursive locking detected ]\n 2.6.32-rc4-autokern1 #1\n ---------------------------------------------\n syslogd\/2908 is trying to acquire lock:\n (&nc->lock){..-...}, at: [<c0000000001407f4>] .kmem_cache_free+0x118\/0x2d4\n\n but task is already holding lock:\n (&nc->lock){..-...}, at: [<c0000000001411bc>] .kfree+0x1f0\/0x324\n\n other info that might help us debug this:\n 3 locks held by syslogd\/2908:\n #0: (&u->readlock){+.+.+.}, at: [<c0000000004556f8>] .unix_dgram_recvmsg+0x70\/0x338\n #1: (&nc->lock){..-...}, at: [<c0000000001411bc>] .kfree+0x1f0\/0x324\n #2: (&parent->list_lock){-.-...}, at: [<c000000000140f64>] .__drain_alien_cache+0x50\/0xb8\n\n stack backtrace:\n Call Trace:\n [c0000000e8ccafc0] [c0000000000101e4] .show_stack+0x70\/0x184 (unreliable)\n [c0000000e8ccb070] [c0000000000afebc] .validate_chain+0x6ec\/0xf58\n [c0000000e8ccb180] [c0000000000b0ff0] .__lock_acquire+0x8c8\/0x974\n [c0000000e8ccb280] [c0000000000b2290] .lock_acquire+0x140\/0x18c\n [c0000000e8ccb350] [c000000000468df0] ._spin_lock+0x48\/0x70\n [c0000000e8ccb3e0] [c0000000001407f4] .kmem_cache_free+0x118\/0x2d4\n [c0000000e8ccb4a0] [c000000000140b90] .free_block+0x130\/0x1a8\n [c0000000e8ccb540] [c000000000140f94] .__drain_alien_cache+0x80\/0xb8\n [c0000000e8ccb5e0] [c0000000001411e0] .kfree+0x214\/0x324\n [c0000000e8ccb6a0] [c0000000003ca860] .skb_release_data+0xe8\/0x104\n [c0000000e8ccb730] [c0000000003ca2ec] .__kfree_skb+0x20\/0xd4\n [c0000000e8ccb7b0] [c0000000003cf2c8] .skb_free_datagram+0x1c\/0x5c\n [c0000000e8ccb830] [c00000000045597c] .unix_dgram_recvmsg+0x2f4\/0x338\n [c0000000e8ccb920] [c0000000003c0f14] .sock_recvmsg+0xf4\/0x13c\n [c0000000e8ccbb30] [c0000000003c28ec] .SyS_recvfrom+0xb4\/0x130\n [c0000000e8ccbcb0] [c0000000003bfb78] .sys_recv+0x18\/0x2c\n [c0000000e8ccbd20] [c0000000003ed388] .compat_sys_recv+0x14\/0x28\n [c0000000e8ccbd90] [c0000000003ee1bc] .compat_sys_socketcall+0x178\/0x220\n [c0000000e8ccbe30] [c0000000000085d4] syscall_exit+0x0\/0x40\n\nThis patch fixes the issue by setting up lockdep annotations during CPU\nhotplug.\n\nReported-by: Paul E. McKenney <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nTested-by: Paul E. McKenney <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nCc: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nCc: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux-foundation.org>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@cs.helsinki.fi>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -604,67 +604,6 @@\n \n #define BAD_ALIEN_MAGIC 0x01020304ul\n \n-#ifdef CONFIG_LOCKDEP\n-\n-\/*\n- * Slab sometimes uses the kmalloc slabs to store the slab headers\n- * for other slabs \"off slab\".\n- * The locking for this is tricky in that it nests within the locks\n- * of all other slabs in a few places; to deal with this special\n- * locking we put on-slab caches into a separate lock-class.\n- *\n- * We set lock class for alien array caches which are up during init.\n- * The lock annotation will be lost if all cpus of a node goes down and\n- * then comes back up during hotplug\n- *\/\n-static struct lock_class_key on_slab_l3_key;\n-static struct lock_class_key on_slab_alc_key;\n-\n-static inline void init_lock_keys(void)\n-\n-{\n-\tint q;\n-\tstruct cache_sizes *s = malloc_sizes;\n-\n-\twhile (s->cs_size != ULONG_MAX) {\n-\t\tfor_each_node(q) {\n-\t\t\tstruct array_cache **alc;\n-\t\t\tint r;\n-\t\t\tstruct kmem_list3 *l3 = s->cs_cachep->nodelists[q];\n-\t\t\tif (!l3 || OFF_SLAB(s->cs_cachep))\n-\t\t\t\tcontinue;\n-\t\t\tlockdep_set_class(&l3->list_lock, &on_slab_l3_key);\n-\t\t\talc = l3->alien;\n-\t\t\t\/*\n-\t\t\t * FIXME: This check for BAD_ALIEN_MAGIC\n-\t\t\t * should go away when common slab code is taught to\n-\t\t\t * work even without alien caches.\n-\t\t\t * Currently, non NUMA code returns BAD_ALIEN_MAGIC\n-\t\t\t * for alloc_alien_cache,\n-\t\t\t *\/\n-\t\t\tif (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC)\n-\t\t\t\tcontinue;\n-\t\t\tfor_each_node(r) {\n-\t\t\t\tif (alc[r])\n-\t\t\t\t\tlockdep_set_class(&alc[r]->lock,\n-\t\t\t\t\t &on_slab_alc_key);\n-\t\t\t}\n-\t\t}\n-\t\ts++;\n-\t}\n-}\n-#else\n-static inline void init_lock_keys(void)\n-{\n-}\n-#endif\n-\n-\/*\n- * Guard access to the cache-chain.\n- *\/\n-static DEFINE_MUTEX(cache_chain_mutex);\n-static struct list_head cache_chain;\n-\n \/*\n * chicken and egg problem: delay the per-cpu array allocation\n * until the general caches are up.\n@@ -684,6 +623,79 @@\n {\n \treturn g_cpucache_up >= EARLY;\n }\n+\n+#ifdef CONFIG_LOCKDEP\n+\n+\/*\n+ * Slab sometimes uses the kmalloc slabs to store the slab headers\n+ * for other slabs \"off slab\".\n+ * The locking for this is tricky in that it nests within the locks\n+ * of all other slabs in a few places; to deal with this special\n+ * locking we put on-slab caches into a separate lock-class.\n+ *\n+ * We set lock class for alien array caches which are up during init.\n+ * The lock annotation will be lost if all cpus of a node goes down and\n+ * then comes back up during hotplug\n+ *\/\n+static struct lock_class_key on_slab_l3_key;\n+static struct lock_class_key on_slab_alc_key;\n+\n+static void init_node_lock_keys(int q)\n+{\n+\tstruct cache_sizes *s = malloc_sizes;\n+\n+\tif (g_cpucache_up != FULL)\n+\t\treturn;\n+\n+\tfor (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {\n+\t\tstruct array_cache **alc;\n+\t\tstruct kmem_list3 *l3;\n+\t\tint r;\n+\n+\t\tl3 = s->cs_cachep->nodelists[q];\n+\t\tif (!l3 || OFF_SLAB(s->cs_cachep))\n+\t\t\treturn;\n+\t\tlockdep_set_class(&l3->list_lock, &on_slab_l3_key);\n+\t\talc = l3->alien;\n+\t\t\/*\n+\t\t * FIXME: This check for BAD_ALIEN_MAGIC\n+\t\t * should go away when common slab code is taught to\n+\t\t * work even without alien caches.\n+\t\t * Currently, non NUMA code returns BAD_ALIEN_MAGIC\n+\t\t * for alloc_alien_cache,\n+\t\t *\/\n+\t\tif (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC)\n+\t\t\treturn;\n+\t\tfor_each_node(r) {\n+\t\t\tif (alc[r])\n+\t\t\t\tlockdep_set_class(&alc[r]->lock,\n+\t\t\t\t\t&on_slab_alc_key);\n+\t\t}\n+\t}\n+}\n+\n+static inline void init_lock_keys(void)\n+{\n+\tint node;\n+\n+\tfor_each_node(node)\n+\t\tinit_node_lock_keys(node);\n+}\n+#else\n+static void init_node_lock_keys(int q)\n+{\n+}\n+\n+static inline void init_lock_keys(void)\n+{\n+}\n+#endif\n+\n+\/*\n+ * Guard access to the cache-chain.\n+ *\/\n+static DEFINE_MUTEX(cache_chain_mutex);\n+static struct list_head cache_chain;\n \n static DEFINE_PER_CPU(struct delayed_work, reap_work);\n \n@@ -1254,6 +1266,8 @@\n \t\tkfree(shared);\n \t\tfree_alien_cache(alien);\n \t}\n+\tinit_node_lock_keys(node);\n+\n \treturn 0;\n bad:\n \tcpuup_canceled(cpu);\n"} {"commit":"2e34030f9df99a25201cd02709020b54dc8f7367","subject":"Minor comment change.","message":"Minor comment change.\n","repos":"3drepo\/GLC_lib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- geometry\/glc_vbogeom.h\n+++ geometry\/glc_vbogeom.h\n@@ -104,7 +104,7 @@\n \tinline GLC_Material* material(const GLC_uint key)\n \t{return m_MaterialHash[key];}\n \n-\t\/\/! Get materials List\n+\t\/\/! Get materials Set\n \tinline QSet<GLC_Material*> materialSet() const\n \t{return m_MaterialHash.values().toSet();}\n \n"} {"commit":"d8419a9a213157cfdd2dab1eed970896372962dd","subject":"tests\/proc_mgmt: fix nullpointer bug","message":"tests\/proc_mgmt: fix nullpointer bug\n\nSigned-off-by: Reto Achermann <66f6ea3e040423755b3cf26edfe6c7fb1f9adc27@inf.ethz.ch>\n","repos":"kishoredbn\/barrelfish,kishoredbn\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- usr\/tests\/proc_mgmt_test\/main.c\n+++ usr\/tests\/proc_mgmt_test\/main.c\n@@ -252,7 +252,7 @@\n } \n \n printf(\"Testing wait on different core process\\n\");\n- char *spawn_argv2[] = { \"proc_mgmt_test\", \"0\", \"sleeper\"};\n+ char *spawn_argv2[] = { \"proc_mgmt_test\", \"0\", \"sleeper\", NULL};\n err = test_spawn(disp_get_core_id()+1, spawn_argv2, &domain_cap);\n if (err_is_fail(err)) {\n USER_PANIC(\"Failed spawning program proc_mgmt_test \\n\");\n"} {"commit":"7e0528dadc9f8b04e4de0dba48a075100c2afe75","subject":"slub: Push irq disable into allocate_slab()","message":"slub: Push irq disable into allocate_slab()\n\nDo the irq handling in allocate_slab() instead of __slab_alloc().\n\n__slab_alloc() is already cluttered and allocate_slab() is already\nfiddling around with gfp flags.\n\nv6->v7:\n\tOnly increment ORDER_FALLBACK if we get a page during fallback\n\nSigned-off-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slub.c\n+++ mm\/slub.c\n@@ -1187,6 +1187,11 @@\n \tstruct kmem_cache_order_objects oo = s->oo;\n \tgfp_t alloc_gfp;\n \n+\tflags &= gfp_allowed_mask;\n+\n+\tif (flags & __GFP_WAIT)\n+\t\tlocal_irq_enable();\n+\n \tflags |= s->allocflags;\n \n \t\/*\n@@ -1203,11 +1208,16 @@\n \t\t * Try a lower order alloc if possible\n \t\t *\/\n \t\tpage = alloc_slab_page(flags, node, oo);\n-\t\tif (!page)\n-\t\t\treturn NULL;\n-\n-\t\tstat(s, ORDER_FALLBACK);\n-\t}\n+\n+\t\tif (page)\n+\t\t\tstat(s, ORDER_FALLBACK);\n+\t}\n+\n+\tif (flags & __GFP_WAIT)\n+\t\tlocal_irq_disable();\n+\n+\tif (!page)\n+\t\treturn NULL;\n \n \tif (kmemcheck_enabled\n \t\t&& !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) {\n@@ -1849,14 +1859,7 @@\n \t\tgoto load_freelist;\n \t}\n \n-\tgfpflags &= gfp_allowed_mask;\n-\tif (gfpflags & __GFP_WAIT)\n-\t\tlocal_irq_enable();\n-\n \tpage = new_slab(s, gfpflags, node);\n-\n-\tif (gfpflags & __GFP_WAIT)\n-\t\tlocal_irq_disable();\n \n \tif (page) {\n \t\tc = __this_cpu_ptr(s->cpu_slab);\n"} {"commit":"1fe00d50a9e81150de5000490b87ed227525cf09","subject":"slab: factor out initialization of array cache","message":"slab: factor out initialization of array cache\n\nFactor out initialization of array cache to use it in following patch.\n\nSigned-off-by: Joonsoo Kim <bb6c8cfe7699e0f11d1bee88022eb563a5f8e881@lge.com>\nAcked-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nCc: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\nAcked-by: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -791,13 +791,8 @@\n \t}\n }\n \n-static struct array_cache *alloc_arraycache(int node, int entries,\n-\t\t\t\t\t int batchcount, gfp_t gfp)\n-{\n-\tint memsize = sizeof(void *) * entries + sizeof(struct array_cache);\n-\tstruct array_cache *nc = NULL;\n-\n-\tnc = kmalloc_node(memsize, gfp, node);\n+static void init_arraycache(struct array_cache *ac, int limit, int batch)\n+{\n \t\/*\n \t * The array_cache structures contain pointers to free object.\n \t * However, when such objects are allocated or transferred to another\n@@ -805,15 +800,25 @@\n \t * valid references during a kmemleak scan. Therefore, kmemleak must\n \t * not scan such objects.\n \t *\/\n-\tkmemleak_no_scan(nc);\n-\tif (nc) {\n-\t\tnc->avail = 0;\n-\t\tnc->limit = entries;\n-\t\tnc->batchcount = batchcount;\n-\t\tnc->touched = 0;\n-\t\tspin_lock_init(&nc->lock);\n-\t}\n-\treturn nc;\n+\tkmemleak_no_scan(ac);\n+\tif (ac) {\n+\t\tac->avail = 0;\n+\t\tac->limit = limit;\n+\t\tac->batchcount = batch;\n+\t\tac->touched = 0;\n+\t\tspin_lock_init(&ac->lock);\n+\t}\n+}\n+\n+static struct array_cache *alloc_arraycache(int node, int entries,\n+\t\t\t\t\t int batchcount, gfp_t gfp)\n+{\n+\tint memsize = sizeof(void *) * entries + sizeof(struct array_cache);\n+\tstruct array_cache *ac = NULL;\n+\n+\tac = kmalloc_node(memsize, gfp, node);\n+\tinit_arraycache(ac, entries, batchcount);\n+\treturn ac;\n }\n \n static inline bool is_slab_pfmemalloc(struct page *page)\n"} {"commit":"3710fd1357385adb9c0cafa56151a8eb43d9afba","subject":"Simplify conditions and don't send ERROR chunks when not ready.","message":"Simplify conditions and don't send ERROR chunks when not ready.\n","repos":"sctplab\/usrsctp,CoolmanCZ\/usrsctp,CoolmanCZ\/usrsctp,CoolmanCZ\/usrsctp,sctplab\/usrsctp,weinrank\/usrsctp,sctplab\/usrsctp,weinrank\/usrsctp,weinrank\/usrsctp,CoolmanCZ\/usrsctp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usrsctplib\/netinet\/sctp_input.c\n+++ usrsctplib\/netinet\/sctp_input.c\n@@ -34,7 +34,7 @@\n \n #if defined(__FreeBSD__) && !defined(__Userspace__)\n #include <sys\/cdefs.h>\n-__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_input.c 362153 2020-06-13 18:38:59Z tuexen $\");\n+__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_input.c 362722 2020-06-28 14:11:36Z tuexen $\");\n #endif\n \n #include <netinet\/sctp_os.h>\n@@ -5583,7 +5583,7 @@\n \t\t\tbreak;\n \t\tcase SCTP_STREAM_RESET:\n \t\t\tSCTPDBG(SCTP_DEBUG_INPUT3, \"SCTP_STREAM_RESET\\n\");\n-\t\t\tif (((stcb == NULL) || (ch == NULL) || (chk_length < sizeof(struct sctp_stream_reset_tsn_req)))) {\n+\t\t\tif ((stcb == NULL) || (chk_length < sizeof(struct sctp_stream_reset_tsn_req))) {\n \t\t\t\t\/* Its not ours *\/\n \t\t\t\t*offset = length;\n \t\t\t\treturn (stcb);\n@@ -5606,7 +5606,7 @@\n \t\t\t\treturn (stcb);\n \t\t\t}\n \n-\t\t\tif ((ch != NULL) && (stcb != NULL) && (netp != NULL) && (*netp != NULL)) {\n+\t\t\tif ((stcb != NULL) && (netp != NULL) && (*netp != NULL)) {\n \t\t\t\tif (stcb->asoc.pktdrop_supported == 0) {\n \t\t\t\t\tgoto unknown_chunk;\n \t\t\t\t}\n@@ -5642,8 +5642,7 @@\n \t\t\t\tgoto next_chunk;\n \t\t\t}\n \t\t\tgot_auth = 1;\n-\t\t\tif ((ch == NULL) || sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch,\n-\t\t\t\t\t\t\t m, *offset)) {\n+\t\t\tif (sctp_handle_auth(stcb, (struct sctp_auth_chunk *)ch, m, *offset)) {\n \t\t\t\t\/* auth HMAC failed so dump the packet *\/\n \t\t\t\t*offset = length;\n \t\t\t\treturn (stcb);\n@@ -5656,7 +5655,11 @@\n \t\tdefault:\n \t\tunknown_chunk:\n \t\t\t\/* it's an unknown chunk! *\/\n-\t\t\tif ((ch->chunk_type & 0x40) && (stcb != NULL)) {\n+\t\t\tif ((ch->chunk_type & 0x40) &&\n+\t\t\t (stcb != NULL) &&\n+\t\t\t (SCTP_GET_STATE(stcb) != SCTP_STATE_EMPTY) &&\n+\t\t\t (SCTP_GET_STATE(stcb) != SCTP_STATE_INUSE) &&\n+\t\t\t (SCTP_GET_STATE(stcb) != SCTP_STATE_COOKIE_WAIT)) {\n \t\t\t\tstruct sctp_gen_error_cause *cause;\n \t\t\t\tint len;\n \n"} {"commit":"e823fdfe407967b7113765f3fd865b173ffb1b88","subject":"Fix blob size being overridden with 0","message":"Fix blob size being overridden with 0\n\nc++ moment (default constructor for m_size was running after it was being set to the actual file size in the constructor)\n","repos":"Radfordhound\/HedgeLib,Radfordhound\/HedgeLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- HedgeLib\/include\/hedgelib\/hl_blob.h\n+++ HedgeLib\/include\/hedgelib\/hl_blob.h\n@@ -12,9 +12,10 @@\n \/** @brief Pointer to the data this blob contains. *\/\n std::unique_ptr<u8[]> m_data;\n \/** @brief Size of the data this blob contains, in bytes. *\/\n- std::size_t m_size = 0;\n+ std::size_t m_size;\n \n- blob() noexcept = default;\n+ inline blob() noexcept :\n+ m_size(0) {}\n \n public:\n template<typename T = void>\n"} {"commit":"dcdf575184cec28ba11a9948062a6e1fe8c238ce","subject":"Update memmanager.c","message":"Update memmanager.c","repos":"LFUnion\/LFOS,LFUnion\/LFOS,LFUnion\/LFOS,LFUnion\/LFOS","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- kernel\/memory\/memmanager.c\n+++ kernel\/memory\/memmanager.c\n@@ -51,22 +51,22 @@\n crnt_addr += (n*size);\n void* count_addr = crnt_addr;\n \n- if (size==sizeof(short) && dfvar==\"i\"){\n+ if (size==sizeof(short) && dfvar=='i'){\n func_scalloc(value,(short*)count_addr, n);\n }\n- else if (size==sizeof(int) && dfvar==\"i\"){\n+ else if (size==sizeof(int) && dfvar=='i'){\n func_icalloc(value,(short*)count_addr, n); \n }\n- else if (size==sizeof(long) && dfvar==\"i\"){\n+ else if (size==sizeof(long) && dfvar=='i'){\n func_lcalloc(value,(short*)count_addr, n); \n }\n- else if (size==sizeof(long long) && dfvar==\"i\"){\n+ else if (size==sizeof(long long) && dfvar=='i'){\n func_llcalloc(value,(short*)count_addr, n); \n }\n- else if (size==sizeof(float) && dfvar==\"f\"){\n+ else if (size==sizeof(float) && dfvar=='f'){\n func_fcalloc(value,(short*)count_addr, n); \n }\n- else if (size==sizeof(double) && dfvar==\"f\"){\n+ else if (size==sizeof(double) && dfvar=='f'){\n func_dcalloc(value,(short*)count_addr, n); \n }\n else{\n"} {"commit":"17bb287080160241ded8f7fdcf83214d41b1053d","subject":"Tests: dlist.h - add test_list_empty","message":"Tests: dlist.h - add test_list_empty\n","repos":"KoynovStas\/list","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/dlist_tests.c\n+++ tests\/dlist_tests.c\n@@ -11,9 +11,45 @@\n \n \n \n+struct tmp_data\n+{\n+ struct dlist_head list;\n+ int data;\n+};\n+\n+\n+\n+\n+\n+int test_list_empty(struct test_info_t *test_info)\n+{\n+\n+ TEST_INIT;\n+\n+ DECLARE_DLIST_HEAD(tmp_list);\n+ struct tmp_data d1;\n+\n+\n+ if(!dlist_empty(&tmp_list)) \/\/list must be empty\n+ return TEST_BROKEN;\n+\n+\n+ dlist_push_front(&d1.list, &tmp_list); \/\/now d1 is first\n+\n+ if(dlist_empty(&tmp_list)) \/\/now list is NOT empty\n+ return TEST_BROKEN;\n+\n+\n+ return TEST_PASSED;\n+}\n+\n+\n+\n+\n+\n ptest_func tests[] =\n {\n-\n+ test_list_empty,\n };\n \n \n"} {"commit":"b81edc339d32655e45ac68c18dd71bf0a91edfd2","subject":"Add support for reading from mmc memory","message":"Add support for reading from mmc memory\n\nThis enables mmccopy to go both ways which only makes sense. It is also\nneeded to read MBRs off of SDCards to decide how to upgrade them in\nNerves.\n","repos":"fhunleth\/mmccopy,fhunleth\/mmccopy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mmccopy.c\n+++ mmccopy.c\n@@ -59,20 +59,34 @@\n {\"GiB\", ONE_GiB}\n };\n \n+\/\/ Progress and verbosity global variables\n+bool numeric_progress = false;\n+bool quiet = false;\n+\n void usage(const char *argv0)\n {\n- fprintf(stderr, \"Usage: %s [options] [inputpath]\\n\", argv0);\n+ fprintf(stderr, \"Usage: %s [options] [path]\\n\", argv0);\n fprintf(stderr, \" -d <Device file for the memory card>\\n\");\n- fprintf(stderr, \" -s <Amount to write>\\n\");\n+ fprintf(stderr, \" -s <Amount to read\/write>\\n\");\n fprintf(stderr, \" -o <Offset from the beginning of the memory card>\\n\");\n fprintf(stderr, \" -n Report numeric progress\\n\");\n- fprintf(stderr, \" -p Report progress\\n\");\n+ fprintf(stderr, \" -p Report progress (default)\\n\");\n fprintf(stderr, \" -q Quiet\\n\");\n+ fprintf(stderr, \" -r Read from the memory card\\n\");\n+ fprintf(stderr, \" -w Write to the memory card (default)\\n\");\n fprintf(stderr, \" -y Accept automatically found memory card\\n\");\n fprintf(stderr, \"\\n\");\n- fprintf(stderr, \"The inputpath specifies the location of the image to write to\\n\");\n- fprintf(stderr, \"the memory card. If it is unspecified or '-', the image will be\\n\");\n- fprintf(stderr, \"read from stdin.\\n\");\n+ fprintf(stderr, \"The [path] specifies the location of the image to copy to or from\\n\");\n+ fprintf(stderr, \"the memory card. If it is unspecified or '-', the image will either\\n\");\n+ fprintf(stderr, \"be read from stdin (-w) or written to stdout (-r).\\n\");\n+ fprintf(stderr, \"\\n\");\n+ fprintf(stderr, \"Examples:\\n\");\n+ fprintf(stderr, \"\\n\");\n+ fprintf(stderr, \"Write the file sdcard.img to an automatically detected SD Card:\\n\");\n+ fprintf(stderr, \" %s sdcard.img\\n\", argv0);\n+ fprintf(stderr, \"\\n\");\n+ fprintf(stderr, \"Read the master boot record (512 bytes @ offset 0) from \/dev\/sdc:\\n\");\n+ fprintf(stderr, \" %s -r -s 512 -o 0 -d \/dev\/sdc mbr.img\\n\", argv0);\n fprintf(stderr, \"\\n\");\n fprintf(stderr, \"Offset and size may be specified with the following suffixes:\\n\");\n for (size_t i = 0; i < NUM_ELEMENTS(suffix_multipliers); i++)\n@@ -225,9 +239,12 @@\n sprintf(out, \"%d bytes\", (int) amount);\n }\n \n-void report_progress(size_t written, size_t total, bool numeric)\n-{\n- if (numeric) {\n+void report_progress(size_t written, size_t total)\n+{\n+ if (quiet)\n+\treturn;\n+\n+ if (numeric_progress) {\n \/\/ If numeric, write the percentage if we can figure it out.\n printf(\"%d\\n\", calculate_progress(written, total));\n } else {\n@@ -244,16 +261,58 @@\n }\n }\n \n+void copy(int from_fd, int to_fd, size_t total_to_copy)\n+{\n+ report_progress(0, total_to_copy);\n+\n+ char *buffer = malloc(COPY_BUFFER_SIZE);\n+ off_t total_written = 0;\n+ while (total_to_copy == 0 || total_written < total_to_copy) {\n+ size_t amount_to_read = COPY_BUFFER_SIZE;\n+ if (total_to_copy != 0 && total_to_copy < amount_to_read)\n+ amount_to_read = total_to_copy;\n+\n+ ssize_t amount_read = read(from_fd, buffer, amount_to_read);\n+ if (amount_read < 0)\n+ err(EXIT_FAILURE, \"read\");\n+\n+ if (amount_read == 0)\n+ break;\n+\n+ char *ptr = buffer;\n+ do {\n+ ssize_t amount_written = write(to_fd, ptr, amount_read);\n+ if (amount_written < 0) {\n+ if (errno == EINTR)\n+ continue;\n+ else\n+ err(EXIT_FAILURE, \"write\");\n+ }\n+\n+ amount_read -= amount_written;\n+ ptr += amount_written;\n+ total_written += amount_written;\n+ } while (amount_read > 0);\n+\n+\treport_progress(total_written, total_to_copy);\n+ }\n+ free(buffer);\n+\n+ \/\/ Print a linefeed at the end so that the final progress report has\n+ \/\/ a new line after it. Numeric progress already prints linefeeds, so\n+ \/\/ don't add another on those.\n+ if (!quiet && !numeric_progress)\n+\tprintf(\"\\n\");\n+}\n+\n int main(int argc, char *argv[])\n {\n-\n const char *mmc_device = 0;\n- const char *source = \"-\";\n- size_t total_to_write = 0;\n+ const char *data_pathname = \"-\";\n+ size_t total_to_copy = 0;\n off_t seek_offset = 0;\n- bool numeric_progress = false;\n bool accept_found_device = false;\n- bool quiet = false;\n+ bool read_from_mmc = false;\n \n \/\/ Memory cards are too big to bother with systems\n \/\/ that don't support large file sizes any more.\n@@ -261,13 +320,13 @@\n errx(EXIT_FAILURE, \"recompile with largefile support\");\n \n int opt;\n- while ((opt = getopt(argc, argv, \"d:s:o:npqy\")) != -1) {\n+ while ((opt = getopt(argc, argv, \"d:s:o:npqrwy\")) != -1) {\n switch (opt) {\n case 'd':\n mmc_device = optarg;\n break;\n case 's':\n- total_to_write = parse_size(optarg);\n+ total_to_copy = parse_size(optarg);\n break;\n case 'o':\n seek_offset = parse_size(optarg);\n@@ -282,6 +341,12 @@\n case 'q':\n quiet = true;\n break;\n+ case 'r':\n+\t read_from_mmc = true;\n+\t break;\n+ case 'w':\n+\t read_from_mmc = false;\n+\t break;\n case 'y':\n accept_found_device = true;\n break;\n@@ -295,16 +360,23 @@\n errx(EXIT_FAILURE, \"pick either -n or -q, but not both.\");\n \n if (optind < argc)\n- source = argv[optind];\n+ data_pathname = argv[optind];\n+\n+ if (read_from_mmc && total_to_copy == 0)\n+\terrx(EXIT_FAILURE, \"Specify the amount to copy (-s) when reading from memory card.\");\n \n if (!mmc_device) {\n mmc_device = find_mmc_device();\n- if (!mmc_device)\n- errx(EXIT_FAILURE, \"memory card couldn't be found automatically (permissions?)\");\n+ if (!mmc_device) {\n+\t if (getuid() != 0)\n+\t\terrx(EXIT_FAILURE, \"Memory card couldn't be found automatically.\\nTry running as root or specify -? for help\");\n+\t else\n+\t\terrx(EXIT_FAILURE, \"No memory cards found.\");\n+\t}\n \n if (!accept_found_device) {\n- if (strcmp(source, \"-\") == 0)\n- errx(EXIT_FAILURE, \"Cannot confirm %s when writing data from stdin. Rerun with -y.\", mmc_device);\n+ if (strcmp(data_pathname, \"-\") == 0)\n+ errx(EXIT_FAILURE, \"Cannot confirm use of %s when using stdin\/stdout. Rerun with -y if location is correct.\", mmc_device);\n \n char sizestr[16];\n pretty_size(device_size(mmc_device), sizestr);\n@@ -315,83 +387,60 @@\n }\n }\n \n- int input_fd = 0;\n- if (strcmp(source, \"-\") != 0) {\n- input_fd = open(source, O_RDONLY);\n- if (input_fd < 0)\n- err(EXIT_FAILURE, \"%s\", source);\n-\n- struct stat st;\n- if (fstat(input_fd, &st))\n- err(EXIT_FAILURE, \"fstat\");\n-\n- if (total_to_write == 0 ||\n- st.st_size < total_to_write)\n- total_to_write = st.st_size;\n+ int data_fd;\n+ if (strcmp(data_pathname, \"-\") != 0) {\n+\tif (read_from_mmc)\n+\t data_fd = open(data_pathname, O_WRONLY | O_CREAT | O_TRUNC, 0644);\n+\telse\n+\t data_fd = open(data_pathname, O_RDONLY);\n+ if (data_fd < 0)\n+ err(EXIT_FAILURE, \"%s\", data_pathname);\n+\n+\t\/\/ If writing to the MMC, cap the number of bytes to write to the file size.\n+\tif (!read_from_mmc) {\n+\t struct stat st;\n+\t if (fstat(data_fd, &st))\n+\t\terr(EXIT_FAILURE, \"fstat\");\n+\n+\t if (total_to_copy == 0 ||\n+ st.st_size < total_to_copy)\n+\t\ttotal_to_copy = st.st_size;\n+\t}\n+ } else {\n+\t\/\/ Reading from stdin or stdout.\n+\tif (read_from_mmc) {\n+\t data_fd = STDOUT_FILENO;\n+\n+\t \/\/ Force quiet to true so that progress reports don't stomp on\n+\t \/\/ the data.\n+\t quiet = true;\n+\t} else\n+\t data_fd = STDIN_FILENO;\n }\n \n if (numeric_progress &&\n- total_to_write == 0)\n+ total_to_copy == 0)\n errx(EXIT_FAILURE, \"Specify input size to report numeric progress\");\n \n- \/\/ Don't access the device if someone is using it.\n+ \/\/ Unmount everything so that our read and writes to the device are\n+ \/\/ unaffected by file system caches or other concurrent activity.\n umount_all_on_dev(mmc_device);\n \n- int output_fd = open(mmc_device, O_WRONLY | O_SYNC);\n- if (output_fd < 0)\n+ int mmc_fd = open(mmc_device, read_from_mmc ? O_RDONLY : (O_WRONLY | O_SYNC));\n+ if (mmc_fd < 0)\n err(EXIT_FAILURE, \"%s\", mmc_device);\n \n- if (lseek(output_fd, seek_offset, SEEK_SET) == (off_t) -1)\n+ if (lseek(mmc_fd, seek_offset, SEEK_SET) == (off_t) -1)\n err(EXIT_FAILURE, \"lseek\");\n \n- if (!quiet)\n- report_progress(0, total_to_write, numeric_progress);\n-\n- char *buffer = malloc(COPY_BUFFER_SIZE);\n- off_t total_written = 0;\n- while (total_to_write == 0 || total_written < total_to_write) {\n- size_t amount_to_read = COPY_BUFFER_SIZE;\n- if (total_to_write != 0 && total_to_write < amount_to_read)\n- amount_to_read = total_to_write;\n-\n- ssize_t amount_read = read(input_fd, buffer, amount_to_read);\n- if (amount_read < 0)\n- err(EXIT_FAILURE, \"read\");\n-\n- if (amount_read == 0)\n- break;\n-\n- char *ptr = buffer;\n- do {\n- ssize_t amount_written = write(output_fd, ptr, amount_read);\n- if (amount_written < 0) {\n- if (errno == EINTR)\n- continue;\n- else\n- err(EXIT_FAILURE, \"write\");\n- }\n-\n- amount_read -= amount_written;\n- ptr += amount_written;\n- total_written += amount_written;\n- } while (amount_read > 0);\n-\n- if (!quiet)\n- report_progress(total_written, total_to_write, numeric_progress);\n- }\n- close(output_fd);\n- if (input_fd != 0)\n- close(input_fd);\n-\n- if (!quiet) {\n- report_progress(total_written, total_to_write, numeric_progress);\n-\n-\t\/\/ Numeric progress already prints linefeeds, so we don't need\n-\t\/\/ one at the very end.\n-\tif (!numeric_progress)\n-\t printf(\"\\n\");\n- }\n-\n- free(buffer);\n+ if (read_from_mmc)\n+\tcopy(mmc_fd, data_fd, total_to_copy);\n+ else\n+\tcopy(data_fd, mmc_fd, total_to_copy);\n+\n+ close(mmc_fd);\n+ if (data_fd != STDOUT_FILENO && data_fd != STDIN_FILENO)\n+ close(data_fd);\n+\n exit(EXIT_SUCCESS);\n }\n"} {"commit":"da62f3202f190a5a9a03f2ddff353f97e25c462d","subject":"pubsub_make_publish_msg: use wocky_xmpp_stanza_build","message":"pubsub_make_publish_msg: use wocky_xmpp_stanza_build\n","repos":"mlundblad\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pubsub.c\n+++ src\/pubsub.c\n@@ -118,20 +118,21 @@\n const gchar *item_name,\n WockyXmppNode **node)\n {\n- return lm_message_build (to, LM_MESSAGE_TYPE_IQ,\n- '@', \"type\", \"set\",\n- '(', \"pubsub\", \"\",\n- '@', \"xmlns\", NS_PUBSUB,\n- '(', \"publish\", \"\",\n- '@', \"node\", node_name,\n- '(', \"item\", \"\",\n- '(', item_name, \"\",\n- '*', node,\n- '@', \"xmlns\", item_ns,\n- ')',\n- ')',\n- ')',\n- ')', NULL);\n+ return wocky_xmpp_stanza_build (\n+ WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_SET,\n+ NULL, to,\n+ WOCKY_NODE, \"pubsub\",\n+ WOCKY_NODE_XMLNS, NS_PUBSUB,\n+ WOCKY_NODE, \"publish\",\n+ WOCKY_NODE_ATTRIBUTE, \"node\", node_name,\n+ WOCKY_NODE, \"item\",\n+ WOCKY_NODE, item_name,\n+ WOCKY_NODE_ASSIGN_TO, node,\n+ WOCKY_NODE_XMLNS, item_ns,\n+ WOCKY_NODE_END,\n+ WOCKY_NODE_END,\n+ WOCKY_NODE_END,\n+ WOCKY_NODE_END, WOCKY_STANZA_END);\n }\n \n \/**\n"} {"commit":"2871831eac3958d39b1d22e5d6214763301da7d1","subject":"improve output. wait for client to close rather than closing.","message":"improve output. wait for client to close rather than closing.\n\nstill mulling over this approach, but:\nhttp:\/\/www.serverframework.com\/asynchronousevents\/2011\/01\/time-wait-and-its-design-implications-for-protocols-and-scalable-servers.html\n","repos":"bliksemlabs\/rrrr","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- otp_api.c\n+++ otp_api.c\n@@ -59,6 +59,7 @@\n Note that scheduling the same connection for removal more than once will have unpredictable effects.\n *\/\n static uint32_t remove_conn_later (uint32_t nc) {\n+ printf (\"connection %02d [fd=%02d] enqueued for removal.\\n\", nc, conn_items[nc].fd);\n conn_remove_queue[conn_remove_n] = nc;\n conn_remove_n += 1;\n return conn_remove_n;\n@@ -66,20 +67,20 @@\n \n \/* Debug function: print out all open connections. *\/\n static void conn_dump_all () {\n- printf (\"number of active connections: %d\\n\", n_conn);\n+ printf (\"number of active connections is %d\\n\", n_conn);\n for (int i = 0; i < n_conn; ++i) {\n zmq_pollitem_t *pi = poll_items + 2 + i;\n- printf (\"connection %02d: fd=%d buf='%s'\\n\", i, pi->fd, buffers[i].buf);\n+ printf (\"[%02d] fd=%02d buf='%s'\\n\", i, pi->fd, buffers[i].buf);\n }\n }\n \n \/* Add a connection with socket descriptor sd to the end of the list of open connections. *\/\n static void add_conn (uint32_t sd) {\n if (n_conn < MAX_CONN) {\n- printf (\"adding a connection for socket descriptor %d\\n\", sd);\n conn_items[n_conn].socket = NULL; \/\/ indicate that this is a standard socket, not a ZMQ socket\n conn_items[n_conn].fd = sd;\n conn_items[n_conn].events = POLLIN;\n+ printf (\"connection %02d [fd=%02d] has been added.\\n\", n_conn, sd);\n n_conn++;\n conn_dump_all ();\n } else {\n@@ -98,7 +99,7 @@\n uint32_t last_index = n_conn - 1;\n zmq_pollitem_t *item = conn_items + nc;\n zmq_pollitem_t *last = conn_items + last_index;\n- printf (\"removing connection %d with socket descriptor %d\\n\", nc, item->fd);\n+ printf (\"connection %02d [fd=%02d] being removed.\\n\", nc, item->fd);\n memcpy (item, last, sizeof(*item));\n \/* Swap in the buffer struct for the last active connection (retain char *buf). *\/\n struct buffer temp;\n@@ -114,7 +115,6 @@\n \/* Remove all connections that have been enqueued for removal in a single operation. *\/\n static void remove_conn_enqueued () {\n for (int i = 0; i < conn_remove_n; ++i) {\n- printf (\"removing enqueued connection %d: %d\\n\", i, conn_remove_queue[i]);\n remove_conn (conn_remove_queue[i]);\n }\n conn_remove_n = 0;\n@@ -132,20 +132,22 @@\n char *c = b->buf + b->size; \/\/ pointer to the first available character in the buffer\n int remaining = BUFLEN - b->size;\n size_t received = recv (conn_sd, c, remaining, 0);\n+ printf (\"connection %02d [fd=%02d] recevied %ld bytes.\\n\", nc, conn_sd, received);\n \/\/ If recv returns zero, that means the connection has been closed.\n \/\/ Don't remove it immediately, since we are in the middle of a poll loop.\n if (received == 0) {\n- printf (\"socket %d was closed\\n\", nc);\n+ printf (\"connection %02d [fd=%02d] closed. closing socket descriptor locally.\\n\", nc, conn_sd);\n remove_conn_later (nc);\n+ close (conn_sd); \/\/ necessary! but maybe do this when removing connection from pollitems?\n return false;\n }\n b->size += received;\n if (b->size >= BUFLEN) {\n- printf (\"HTTP request too long for buffer.\\n\");\n+ printf (\"HTTP request does not fit in buffer.\\n\");\n return false;\n }\n- printf (\"received: %s \\n\", c);\n- printf (\"buffer is now: %s \\n\", b->buf);\n+ \/\/printf (\"received: %s \\n\", c);\n+ \/\/printf (\"buffer is now: %s \\n\", b->buf);\n bool eol = false;\n for (char *end = c + received; c <= end; ++c) {\n if (*c == '\\n' || *c == '\\r') {\n@@ -184,16 +186,15 @@\n router_request_randomize (&req);\n zmsg_t *msg = zmsg_new ();\n zmsg_pushmem (msg, &req, sizeof(req));\n- \/\/ prefix the request with the socket descriptor for use upon reply\n+ \/\/ Prefix the request with the socket descriptor for use upon reply. Worker ignores all frames but the last one.\n zmsg_pushmem (msg, &conn_sd, sizeof(conn_sd)); \n zmsg_send (&msg, broker_socket);\n- \/\/ at this point, once we have made the request, we can remove the poll item while keeping the file descriptor open.\n- remove_conn_later (nc);\n+ printf (\"connection %02d [fd=%02d] sent request to broker.\\n\", nc, conn_sd);\n+ \/\/ Do not remove_conn_later yet. Continue polling so we detect client closing, avoiding TIME_WAIT on server.\n return;\n \n cleanup:\n send (conn_sd, ERROR_404, strlen(ERROR_404), 0);\n- close (conn_sd);\n remove_conn_later (nc); \/\/ could this lead to double-remove?\n return;\n }\n@@ -210,7 +211,8 @@\n \/* Listening socket is nonblocking: connections or bytes may not be waiting. *\/\n uint32_t server_socket = socket (AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);\n socklen_t in_addr_length = sizeof (server_in_addr);\n- bind(server_socket, (struct sockaddr *) &server_in_addr, sizeof(server_in_addr));\n+ if (bind(server_socket, (struct sockaddr *) &server_in_addr, sizeof(server_in_addr)))\n+ die (\"Failed to bind socket.\\n\");\n listen(server_socket, QUEUE_CONN);\n \n \/* Set up \u00d8MQ socket to communicate with the RRRR broker. *\/\n@@ -246,20 +248,20 @@\n \/* Blocking poll for queued incoming TCP connections, traffic on open TCP connections, and ZMQ broker events. *\/\n int n_waiting = zmq_poll (poll_items, 2 + n_conn, -1); \n if (n_waiting < 1) {\n- printf (\"ZMQ poll call interrupted.\\n\");\n- break;\n- }\n- \/* Check if the \u00d8MQ broker socket has a message for us. If so, write it out to the client socket and close. *\/\n+ printf (\"ZMQ poll call interrupted.\\n\"); \n+ break; \/\/ Really, we should stop accepting incoming connections and break only when all connections closed.\n+ }\n+ \/* Check if the \u00d8MQ broker socket has a message for us. If so, write it out to the client socket. *\/\n if (broker_item->revents & ZMQ_POLLIN) {\n- printf (\"Activity on ZMQ broker socket. Reply is:\\n\");\n zmsg_t *msg = zmsg_recv (broker_socket);\n zframe_t *sd_frame = zmsg_pop (msg);\n uint32_t sd = *(zframe_data (sd_frame));\n char *response = zmsg_popstr (msg);\n- printf (\"(for socket %d) %s\\n\", sd, response);\n+ \/\/ printf (\"ZMQ broker socket received message for socket %02d:\\n%s\", sd, response);\n send (sd, OK_TEXT_PLAIN, strlen(OK_TEXT_PLAIN), 0); \n send (sd, response, strlen(response), 0);\n- close (sd);\n+ printf (\" [fd=%02d] sent response to client.\\n\", sd);\n+ \/\/ do not close(sd) yet. wait for client to close to avoid going into TIME_WAIT state.\n zmsg_destroy (&msg);\n n_waiting--;\n }\n"} {"commit":"75650a3d558ba2faa4605babfb7d225cf6963cdf","subject":"- check for supported CURLFORM options","message":"- check for supported CURLFORM options\n","repos":"ashumkin\/pycurl-cvs,ashumkin\/pycurl-cvs,ashumkin\/pycurl-cvs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pycurl.c\n+++ src\/pycurl.c\n@@ -1395,6 +1395,15 @@\n }\n \n val = PyLong_AsLong(PyTuple_GET_ITEM(t, j));\n+ if (val != CURLFORM_COPYCONTENTS &&\n+ val != CURLFORM_FILE &&\n+ val != CURLFORM_CONTENTTYPE)\n+ {\n+ PyErr_SetString(PyExc_TypeError, \"unsupported option\");\n+ PyMem_Free(forms);\n+ curl_formfree(post);\n+ return NULL;\n+ }\n PyString_AsStringAndSize(PyTuple_GET_ITEM(t, j+1), &ostr, &olen);\n forms[k].option = val;\n forms[k].value = ostr;\n@@ -1420,7 +1429,7 @@\n } else {\n \/* Some other type was given, ignore *\/\n curl_formfree(post);\n- PyErr_SetString(PyExc_TypeError, \"unsupported second value in tuple\");\n+ PyErr_SetString(PyExc_TypeError, \"unsupported second type in tuple\");\n return NULL;\n }\n }\n"} {"commit":"6ec046fee6fc6062cc6967e6f77db2f94e1d03f6","subject":"persistence_framework: Bug fix - return error code when user's create function fails.","message":"persistence_framework: Bug fix - return error code when user's create function fails.\n","repos":"b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/persistence_framework_api.c\n+++ modules\/persistence_framework_api.c\n@@ -730,6 +730,7 @@\n if (rc != IB_OK) {\n ib_log_error(\n ib, \"Failed to instantiate store %s of type %s.\", name, type);\n+ return rc;\n }\n }\n \n"} {"commit":"48740f1a9c7ef5be149d5c44bdde4cf2e5828505","subject":"ASoC: msm: Fix the voip loopback test with AMR and EVRC vocoders","message":"ASoC: msm: Fix the voip loopback test with AMR and EVRC vocoders\n\n- SPECIAL format is used in voip loopback test with AMR and EVRC vocoders\n- If the format is not S16_LE or S24_LE, Backend dai will return -EINVAL,\n which will cause the fail of setting hardware parameter when using\n SPECIAL format\n- Add SPECIAL format case into backend dai code. If the format is\n SPECIAL, the bit width is set to 16\n\nChange-Id: I97cd7e070d1d9dd355bbc4301abe6cff9a4816dd\nSigned-off-by: Helen Zeng <d2b28efa16b30aa021482b8b49f719ae841f703c@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sound\/soc\/msm\/qdsp6v2\/msm-dai-q6-v2.c\n+++ sound\/soc\/msm\/qdsp6v2\/msm-dai-q6-v2.c\n@@ -485,6 +485,7 @@\n \n \tswitch (params_format(params)) {\n \tcase SNDRV_PCM_FORMAT_S16_LE:\n+\tcase SNDRV_PCM_FMTBIT_SPECIAL:\n \t\tdai_data->port_config.i2s.bit_width = 16;\n \t\tbreak;\n \tcase SNDRV_PCM_FORMAT_S24_LE:\n@@ -560,6 +561,7 @@\n \n \tswitch (params_format(params)) {\n \tcase SNDRV_PCM_FORMAT_S16_LE:\n+\tcase SNDRV_PCM_FMTBIT_SPECIAL:\n \t\tdai_data->port_config.slim_sch.bit_width = 16;\n \t\tbreak;\n \tcase SNDRV_PCM_FORMAT_S24_LE:\n"} {"commit":"a4c94832dbeb5dfa2bf1c76e4be98835e40db5bb","subject":"-added multi_setopt and timeout","message":"-added multi_setopt and timeout\n","repos":"m13253\/pycurl-python3,jcharum\/pycurl,ninemoreminutes\/pycurl,ninemoreminutes\/pycurl,ninemoreminutes\/pycurl,jcharum\/pycurl,ninemoreminutes\/pycurl,m13253\/pycurl-python3,jcharum\/pycurl,m13253\/pycurl-python3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pycurl.c\n+++ src\/pycurl.c\n@@ -1,4 +1,4 @@\n-\/* $Id: pycurl.c,v 1.118 2006\/11\/07 15:30:04 kjetilja Exp $ *\/\n+\/* $Id: pycurl.c,v 1.119 2006\/11\/08 13:38:45 kjetilja Exp $ *\/\n \n \/* PycURL -- cURL Python module\n *\n@@ -84,6 +84,7 @@\n \n \/* Calculate the number of OBJECTPOINT options we need to store *\/\n #define OPTIONS_SIZE ((int)CURLOPT_LASTENTRY % 10000)\n+#define MOPTIONS_SIZE ((int)CURLMOPT_LASTENTRY % 10000)\n static int OPT_INDEX(int o)\n {\n assert(o >= CURLOPTTYPE_OBJECTPOINT);\n@@ -117,6 +118,9 @@\n fd_set read_fd_set;\n fd_set write_fd_set;\n fd_set exc_fd_set;\n+ \/* callbacks *\/\n+ PyObject *t_cb;\n+ PyObject *s_cb;\n } CurlMultiObject;\n \n typedef struct {\n@@ -583,6 +587,27 @@\n ZAP(self->dict);\n return 0;\n }\n+\n+\n+static void\n+util_share_close(CurlShareObject *self){\n+ curl_share_cleanup(self->share_handle);\n+ share_lock_destroy(self->lock);\n+}\n+\n+\n+static void\n+do_share_dealloc(CurlShareObject *self){\n+ PyObject_GC_UnTrack(self);\n+ Py_TRASHCAN_SAFE_BEGIN(self);\n+\n+ ZAP(self->dict);\n+ util_share_close(self);\n+\n+ PyObject_GC_Del(self);\n+ Py_TRASHCAN_SAFE_END(self)\n+}\n+\n \n \/* setopt, unsetopt*\/\n \/* --------------- unsetopt\/setopt\/getinfo --------------- *\/\n@@ -2077,6 +2102,8 @@\n \/* Initialize object attributes *\/\n self->dict = NULL;\n self->state = NULL;\n+ self->t_cb = NULL;\n+ self->s_cb = NULL;\n \n \/* Allocate libcurl multi handle *\/\n self->multi_handle = curl_multi_init();\n@@ -2086,12 +2113,6 @@\n return NULL;\n }\n return self;\n-}\n-\n-static void\n-util_share_close(CurlShareObject *self){\n- curl_share_cleanup(self->share_handle);\n- share_lock_destroy(self->lock);\n }\n \n static void\n@@ -2106,17 +2127,6 @@\n }\n }\n \n-static void\n-do_share_dealloc(CurlShareObject *self){\n- PyObject_GC_UnTrack(self);\n- Py_TRASHCAN_SAFE_BEGIN(self);\n-\n- ZAP(self->dict);\n- util_share_close(self);\n-\n- PyObject_GC_Del(self);\n- Py_TRASHCAN_SAFE_END(self)\n-}\n \n static void\n do_multi_dealloc(CurlMultiObject *self)\n@@ -2167,8 +2177,113 @@\n #undef VISIT\n }\n \n+\n+\/* --------------- setopt --------------- *\/\n+\n+int multi_socket_callback(CURL *easy,\n+ curl_socket_t s,\n+ int what,\n+ void *userp,\n+ void *socketp)\n+{\n+ return 0;\n+}\n+\n+\n+int multi_timer_callback(CURLM *multi,\n+ long timeout_ms,\n+ void *userp)\n+{\n+ return 0;\n+}\n+\n+\n+static PyObject *\n+do_multi_setopt(CurlMultiObject *self, PyObject *args)\n+{\n+ int option;\n+ PyObject *obj;\n+\n+ if (!PyArg_ParseTuple(args, \"iO:setopt\", &option, &obj))\n+ return NULL;\n+ if (check_multi_state(self, 1 | 2, \"setopt\") != 0)\n+ return NULL;\n+\n+ \/* Early checks of option value *\/\n+ if (option <= 0)\n+ goto error;\n+ if (option >= (int)CURLOPTTYPE_OFF_T + MOPTIONS_SIZE)\n+ goto error;\n+ if (option % 10000 >= MOPTIONS_SIZE)\n+ goto error;\n+\n+ \/* Handle the case of integer arguments *\/\n+ if (PyInt_Check(obj)) {\n+ long d = PyInt_AsLong(obj);\n+ switch(option) {\n+ case CURLMOPT_PIPELINING:\n+ curl_multi_setopt(self->multi_handle, option, d);\n+ break;\n+ default:\n+ PyErr_SetString(PyExc_TypeError, \"integers are not supported for this option\");\n+ return NULL;\n+ }\n+ Py_INCREF(Py_None);\n+ return Py_None;\n+ }\n+ if (PyFunction_Check(obj) || PyCFunction_Check(obj) || PyMethod_Check(obj)) {\n+ \/* We use function types here to make sure that our callback\n+ * definitions exactly match the <curl\/multi.h> interface.\n+ *\/\n+ const curl_multi_timer_callback t_cb = multi_timer_callback;\n+ const curl_socket_callback s_cb = multi_socket_callback;\n+\n+ switch(option) {\n+ case CURLMOPT_SOCKETFUNCTION:\n+ curl_multi_setopt(self->multi_handle, CURLMOPT_SOCKETFUNCTION, s_cb);\n+ curl_multi_setopt(self->multi_handle, CURLMOPT_SOCKETDATA, self);\n+ break;\n+ case CURLMOPT_TIMERFUNCTION:\n+ curl_multi_setopt(self->multi_handle, CURLMOPT_TIMERFUNCTION, t_cb);\n+ curl_multi_setopt(self->multi_handle, CURLMOPT_TIMERDATA, self);\n+ break;\n+ default:\n+ PyErr_SetString(PyExc_TypeError, \"callables are not supported for this option\");\n+ return NULL;\n+ }\n+ Py_INCREF(Py_None);\n+ return Py_None;\n+ }\n+ \/* Failed to match any of the function signatures -- return error *\/\n+error:\n+ PyErr_SetString(PyExc_TypeError, \"invalid arguments to setopt\");\n+ return NULL;\n+}\n+\n+\n+\/* --------------- timeout --------------- *\/\n+\n+static PyObject *\n+do_multi_timeout(CurlMultiObject *self)\n+{\n+ CURLMcode res;\n+ long timeout;\n+\n+ if (check_multi_state(self, 1 | 2, \"timeout\") != 0) {\n+ return NULL;\n+ }\n+\n+ res = curl_multi_timeout(self->multi_handle, &timeout);\n+ if (res != CURLM_OK) {\n+ CURLERROR_MSG(\"timeout failed\");\n+ }\n+\n+ \/* Return number of millisecs until timeout *\/\n+ return Py_BuildValue(\"i\", timeout);\n+}\n+\n+\n \/* --------------- perform --------------- *\/\n-\n \n static PyObject *\n do_multi_perform(CurlMultiObject *self)\n@@ -2525,6 +2640,8 @@\n {\"fdset\", (PyCFunction)do_multi_fdset, METH_NOARGS, co_multi_fdset_doc},\n {\"info_read\", (PyCFunction)do_multi_info_read, METH_VARARGS, co_multi_info_read_doc},\n {\"perform\", (PyCFunction)do_multi_perform, METH_NOARGS, NULL},\n+ {\"setopt\", (PyCFunction)do_multi_setopt, METH_NOARGS, NULL},\n+ {\"timeout\", (PyCFunction)do_multi_timeout, METH_NOARGS, NULL},\n {\"remove_handle\", (PyCFunction)do_multi_remove_handle, METH_VARARGS, NULL},\n {\"select\", (PyCFunction)do_multi_select, METH_VARARGS, co_multi_select_doc},\n {NULL, NULL, 0, NULL}\n@@ -3181,7 +3298,7 @@\n insint_c(d, \"SSL_SESSIONID_CACHE\", CURLOPT_SSL_SESSIONID_CACHE);\n \n insint_c(d, \"M_TIMERFUNCTION\", CURLMOPT_TIMERFUNCTION);\n- insint_c(d, \"M_TIMERDATA\", CURLMOPT_TIMERDATA);\n+ insint_c(d, \"M_SOCKETFUNCTION\", CURLMOPT_SOCKETFUNCTION);\n insint_c(d, \"M_PIPELINING\", CURLMOPT_PIPELINING);\n \n \/* constants for setopt(IPRESOLVE, x) *\/\n"} {"commit":"0b5dc4fbe0a1f783604b348dc3b6e4088e830a43","subject":"checked wrong macro","message":"checked wrong macro\n","repos":"ninemoreminutes\/pycurl,ninemoreminutes\/pycurl,ninemoreminutes\/pycurl,jcharum\/pycurl,ninemoreminutes\/pycurl,m13253\/pycurl-python3,jcharum\/pycurl,jcharum\/pycurl,m13253\/pycurl-python3,m13253\/pycurl-python3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pycurl.c\n+++ src\/pycurl.c\n@@ -1,4 +1,4 @@\n-\/* $Id: pycurl.c,v 1.107 2006\/07\/03 13:14:11 kjetilja Exp $ *\/\n+\/* $Id: pycurl.c,v 1.108 2006\/07\/03 13:21:04 kjetilja Exp $ *\/\n \n \/* PycURL -- cURL Python module\n *\n@@ -3339,7 +3339,7 @@\n }\n \n \/* Initialize callback locks if ssl is enabled *\/\n-#if defined(PYCURL_NEEDS_SSL_TSL)\n+#if defined(PYCURL_NEED_SSL_TSL)\n pycurl_ssl_init();\n #endif\n \n"} {"commit":"635be49d81723cda62acca7f4c233836493048bd","subject":"esx: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef)","message":"esx: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef)\n\nSigned-off-by: Laine Stump <c23361c43fbf79fed83e8b76173707b083d6caf5@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"zippy2\/libvirt,libvirt\/libvirt,olafhering\/libvirt,libvirt\/libvirt,olafhering\/libvirt,olafhering\/libvirt,libvirt\/libvirt,zippy2\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,zippy2\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/esx\/esx_network_driver.c\n+++ src\/esx\/esx_network_driver.c\n@@ -277,7 +277,7 @@\n {\n virNetworkPtr network = NULL;\n esxPrivate *priv = conn->privateData;\n- virNetworkDef *def = NULL;\n+ g_autoptr(virNetworkDef) def = NULL;\n esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;\n esxVI_HostPortGroup *hostPortGroupList = NULL;\n esxVI_HostPortGroup *hostPortGroup = NULL;\n@@ -483,7 +483,6 @@\n network = virGetNetwork(conn, hostVirtualSwitch->name, md5);\n \n cleanup:\n- virNetworkDefFree(def);\n esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch);\n esxVI_HostPortGroup_Free(&hostPortGroupList);\n esxVI_HostVirtualSwitchSpec_Free(&hostVirtualSwitchSpec);\n@@ -658,7 +657,7 @@\n esxVI_String *networkNameList = NULL;\n esxVI_String *hostPortGroupKey = NULL;\n esxVI_String *networkName = NULL;\n- virNetworkDef *def;\n+ g_autoptr(virNetworkDef) def = NULL;\n \n if (esxVI_EnsureSession(priv->primary) < 0)\n return NULL;\n@@ -812,7 +811,6 @@\n esxVI_String_Free(&propertyNameList);\n esxVI_ObjectContent_Free(&networkList);\n esxVI_String_Free(&networkNameList);\n- virNetworkDefFree(def);\n \n return xml;\n }\n"} {"commit":"432df7f46c5ab89dff75ca0198ecae252fccc000","subject":"Bad size_of","message":"Bad size_of\n","repos":"infoforcefeed\/OlegDB,infoforcefeed\/OlegDB,infoforcefeed\/OlegDB,infoforcefeed\/OlegDB","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/rehash.c\n+++ src\/rehash.c\n@@ -39,7 +39,7 @@\n check_mem(tmp_hashes);\n \n ol_mstack *orphans = NULL;\n- orphans = malloc(sizeof(ol_stack));\n+ orphans = malloc(sizeof(ol_mstack));\n check_mem(orphans);\n orphans->next = NULL;\n orphans->data = NULL;\n"} {"commit":"b83c92dd6fe11adae0ff29e1db381c31f0f88cb7","subject":"remote: Assert proper GIT_DIRECTION_XXXX values","message":"remote: Assert proper GIT_DIRECTION_XXXX values\n","repos":"sygool\/libgit2,mingyaaaa\/libgit2,nokiddin\/libgit2,maxiaoqian\/libgit2,amyvmiwei\/libgit2,MrHacky\/libgit2,saurabhsuniljain\/libgit2,dleehr\/libgit2,kenprice\/libgit2,swisspol\/DEMO-libgit2,KTXSoftware\/libgit2,magnus98\/TEST,saurabhsuniljain\/libgit2,t0xicCode\/libgit2,linquize\/libgit2,t0xicCode\/libgit2,KTXSoftware\/libgit2,saurabhsuniljain\/libgit2,mhp\/libgit2,since2014\/libgit2,leoyanggit\/libgit2,maxiaoqian\/libgit2,iankronquist\/libgit2,JIghtuse\/libgit2,rcorre\/libgit2,Corillian\/libgit2,iankronquist\/libgit2,sygool\/libgit2,JIghtuse\/libgit2,falqas\/libgit2,Corillian\/libgit2,JIghtuse\/libgit2,mrksrm\/Mingijura,rcorre\/libgit2,Snazz2001\/libgit2,spraints\/libgit2,rcorre\/libgit2,falqas\/libgit2,skabel\/manguse,mcanthony\/libgit2,saurabhsuniljain\/libgit2,dleehr\/libgit2,since2014\/libgit2,jflesch\/libgit2-mariadb,raybrad\/libit2,joshtriplett\/libgit2,KTXSoftware\/libgit2,kenprice\/libgit2,stewid\/libgit2,ardumont\/libgit2,falqas\/libgit2,mhp\/libgit2,saurabhsuniljain\/libgit2,sim0629\/libgit2,kissthink\/libgit2,oaastest\/libgit2,mcanthony\/libgit2,mingyaaaa\/libgit2,mhp\/libgit2,whoisj\/libgit2,kissthink\/libgit2,kenprice\/libgit2,JIghtuse\/libgit2,Snazz2001\/libgit2,iankronquist\/libgit2,linquize\/libgit2,Corillian\/libgit2,mingyaaaa\/libgit2,yosefhackmon\/libgit2,claudelee\/libgit2,mhp\/libgit2,jeffhostetler\/public_libgit2,jflesch\/libgit2-mariadb,oaastest\/libgit2,rcorre\/libgit2,yosefhackmon\/libgit2,dleehr\/libgit2,KTXSoftware\/libgit2,joshtriplett\/libgit2,chiayolin\/libgit2,sygool\/libgit2,swisspol\/DEMO-libgit2,mingyaaaa\/libgit2,Aorjoa\/libgit2_maked_lib,Snazz2001\/libgit2,yongthecoder\/libgit2,sygool\/libgit2,amyvmiwei\/libgit2,kissthink\/libgit2,mcanthony\/libgit2,iankronquist\/libgit2,mrksrm\/Mingijura,sim0629\/libgit2,sim0629\/libgit2,chiayolin\/libgit2,magnus98\/TEST,skabel\/manguse,MrHacky\/libgit2,jflesch\/libgit2-mariadb,spraints\/libgit2,whoisj\/libgit2,nokiddin\/libgit2,whoisj\/libgit2,mhp\/libgit2,magnus98\/TEST,Tousiph\/Demo1,ardumont\/libgit2,yosefhackmon\/libgit2,oaastest\/libgit2,leoyanggit\/libgit2,raybrad\/libit2,MrHacky\/libgit2,joshtriplett\/libgit2,t0xicCode\/libgit2,falqas\/libgit2,yosefhackmon\/libgit2,Corillian\/libgit2,oaastest\/libgit2,skabel\/manguse,mrksrm\/Mingijura,chiayolin\/libgit2,mingyaaaa\/libgit2,oaastest\/libgit2,skabel\/manguse,swisspol\/DEMO-libgit2,kissthink\/libgit2,sim0629\/libgit2,jeffhostetler\/public_libgit2,kenprice\/libgit2,JIghtuse\/libgit2,JIghtuse\/libgit2,yongthecoder\/libgit2,t0xicCode\/libgit2,t0xicCode\/libgit2,spraints\/libgit2,skabel\/manguse,maxiaoqian\/libgit2,claudelee\/libgit2,KTXSoftware\/libgit2,mrksrm\/Mingijura,mhp\/libgit2,nokiddin\/libgit2,mrksrm\/Mingijura,chiayolin\/libgit2,joshtriplett\/libgit2,dleehr\/libgit2,KTXSoftware\/libgit2,Corillian\/libgit2,jeffhostetler\/public_libgit2,kissthink\/libgit2,since2014\/libgit2,nokiddin\/libgit2,stewid\/libgit2,spraints\/libgit2,swisspol\/DEMO-libgit2,chiayolin\/libgit2,stewid\/libgit2,Aorjoa\/libgit2_maked_lib,swisspol\/DEMO-libgit2,ardumont\/libgit2,skabel\/manguse,stewid\/libgit2,MrHacky\/libgit2,ardumont\/libgit2,joshtriplett\/libgit2,chiayolin\/libgit2,claudelee\/libgit2,sygool\/libgit2,jflesch\/libgit2-mariadb,nokiddin\/libgit2,amyvmiwei\/libgit2,sim0629\/libgit2,leoyanggit\/libgit2,jeffhostetler\/public_libgit2,spraints\/libgit2,nokiddin\/libgit2,linquize\/libgit2,leoyanggit\/libgit2,amyvmiwei\/libgit2,jflesch\/libgit2-mariadb,sygool\/libgit2,jeffhostetler\/public_libgit2,magnus98\/TEST,raybrad\/libit2,maxiaoqian\/libgit2,Snazz2001\/libgit2,jeffhostetler\/public_libgit2,leoyanggit\/libgit2,yongthecoder\/libgit2,MrHacky\/libgit2,amyvmiwei\/libgit2,ardumont\/libgit2,kenprice\/libgit2,jflesch\/libgit2-mariadb,Aorjoa\/libgit2_maked_lib,Tousiph\/Demo1,raybrad\/libit2,sim0629\/libgit2,magnus98\/TEST,stewid\/libgit2,joshtriplett\/libgit2,oaastest\/libgit2,saurabhsuniljain\/libgit2,spraints\/libgit2,mcanthony\/libgit2,claudelee\/libgit2,Corillian\/libgit2,Tousiph\/Demo1,Snazz2001\/libgit2,whoisj\/libgit2,dleehr\/libgit2,since2014\/libgit2,maxiaoqian\/libgit2,mingyaaaa\/libgit2,ardumont\/libgit2,leoyanggit\/libgit2,iankronquist\/libgit2,linquize\/libgit2,Snazz2001\/libgit2,swisspol\/DEMO-libgit2,since2014\/libgit2,amyvmiwei\/libgit2,falqas\/libgit2,stewid\/libgit2,yongthecoder\/libgit2,yosefhackmon\/libgit2,dleehr\/libgit2,yongthecoder\/libgit2,mrksrm\/Mingijura,claudelee\/libgit2,kenprice\/libgit2,mcanthony\/libgit2,yongthecoder\/libgit2,linquize\/libgit2,rcorre\/libgit2,whoisj\/libgit2,MrHacky\/libgit2,kissthink\/libgit2,whoisj\/libgit2,Tousiph\/Demo1,falqas\/libgit2,claudelee\/libgit2,linquize\/libgit2,yosefhackmon\/libgit2,since2014\/libgit2,iankronquist\/libgit2,Aorjoa\/libgit2_maked_lib,raybrad\/libit2,magnus98\/TEST,Tousiph\/Demo1,maxiaoqian\/libgit2,rcorre\/libgit2,Aorjoa\/libgit2_maked_lib,Tousiph\/Demo1,t0xicCode\/libgit2,mcanthony\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/remote.c\n+++ src\/remote.c\n@@ -534,6 +534,8 @@\n {\n \tassert(remote);\n \n+\tassert(direction == GIT_DIRECTION_FETCH || direction == GIT_DIRECTION_PUSH);\n+\n \tif (direction == GIT_DIRECTION_FETCH) {\n \t\treturn remote->url;\n \t}\n"} {"commit":"18c901f79e8bff4dd6b8e2d878f7600a1921041c","subject":"Removed the glPush\/PopAttrib() which were awfully slow","message":"Removed the glPush\/PopAttrib() which were awfully slow\n\n","repos":"Safety0ff\/QuesoGLC,Safety0ff\/QuesoGLC,Safety0ff\/QuesoGLC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/render.c\n+++ src\/render.c\n@@ -420,13 +420,8 @@\n glNewList(inGlyph->displayList[0], GL_COMPILE_AND_EXECUTE);\n }\n \n- glPushAttrib(GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);\n- glEnable(GL_TEXTURE_2D);\n- glEnable(GL_BLEND);\n- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\n \/* Repeat glBindTexture() so that the display list includes it *\/\n glBindTexture(GL_TEXTURE_2D, texture);\n- glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);\n \n \/* Compute the size of the glyph *\/\n width = (GLfloat)((boundingBox.xMax - boundingBox.xMin) \/ 64.);\n@@ -452,8 +447,6 @@\n glTranslatef(face->glyph->advance.x \/ 64. \/ scale_x,\n \t face->glyph->advance.y \/ 64. \/ scale_y, 0.);\n \n- glPopAttrib();\n-\n if (inState->glObjects) {\n \/* Finish display list creation *\/\n glEndList();\n@@ -494,16 +487,19 @@\n \tglCallList(glyph->displayList[0]);\n \treturn;\n }\n+ break;\n case GLC_LINE:\n if (glyph->displayList[1]) {\n \tglCallList(glyph->displayList[1]);\n \treturn;\n }\n+ break;\n case GLC_TRIANGLE:\n if (glyph->displayList[2]) {\n \tglCallList(glyph->displayList[2]);\n \treturn;\n }\n+ break;\n }\n }\n \n@@ -617,6 +613,8 @@\n {\n __glcContextState *state = NULL;\n GLint code = 0;\n+ GLboolean tex2D = GL_FALSE, blend = GL_FALSE;\n+ GLint texEnvMode = 0, blendSrc = 0, blendDst = 0, texture = 0;\n \n \/* Check if the current thread owns a context state *\/\n state = __glcGetCurrent();\n@@ -625,12 +623,39 @@\n return;\n }\n \n+ \/* Set the texture environment if the render style is GLC_TEXTURE *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ \/* Save the value of the parameters *\/\n+ tex2D = glIsEnabled(GL_TEXTURE_2D);\n+ blend = glIsEnabled(GL_BLEND);\n+ glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvMode);\n+ glGetIntegerv(GL_BLEND_SRC, &blendSrc);\n+ glGetIntegerv(GL_BLEND_DST, &blendDst);\n+ glGetIntegerv(GL_TEXTURE_BINDING_2D, &texture);\n+ \/* Set the new values of the parameters *\/\n+ glEnable(GL_TEXTURE_2D);\n+ glEnable(GL_BLEND);\n+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);\n+ }\n+\n \/* Get the character code converted to the UCS-4 format *\/\n code = __glcConvertGLintToUcs4(state, inCode);\n if (code < 0)\n return;\n \n __glcProcessChar(state, code, __glcRenderChar, NULL);\n+\n+ \/* Restore the values of the texture parameters if needed *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ glBindTexture(GL_TEXTURE_2D, texture);\n+ if (!tex2D)\n+ glDisable(GL_TEXTURE_2D);\n+ if (!blend)\n+ glDisable(GL_BLEND);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvMode);\n+ glBlendFunc(blendSrc, blendDst);\n+ }\n }\n \n \n@@ -654,6 +679,8 @@\n __glcContextState *state = NULL;\n FcChar8* UinString = NULL;\n FcChar8* ptr = NULL;\n+ GLboolean tex2D = GL_FALSE, blend = GL_FALSE;\n+ GLint texEnvMode = 0, blendSrc = 0, blendDst = 0, texture = 0;\n \n \/* Check if inCount is positive *\/\n if (inCount < 0) {\n@@ -680,6 +707,22 @@\n if (!UinString) {\n __glcRaiseError(GLC_RESOURCE_ERROR);\n return;\n+ }\n+\n+ \/* Set the texture environment if the render style is GLC_TEXTURE *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ \/* Save the value of the parameters *\/\n+ tex2D = glIsEnabled(GL_TEXTURE_2D);\n+ blend = glIsEnabled(GL_BLEND);\n+ glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvMode);\n+ glGetIntegerv(GL_BLEND_SRC, &blendSrc);\n+ glGetIntegerv(GL_BLEND_DST, &blendDst);\n+ glGetIntegerv(GL_TEXTURE_BINDING_2D, &texture);\n+ \/* Set the new values of the parameters *\/\n+ glEnable(GL_TEXTURE_2D);\n+ glEnable(GL_BLEND);\n+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);\n }\n \n \/* Render the string *\/\n@@ -697,6 +740,17 @@\n }\n \n __glcFree(UinString);\n+\n+ \/* Restore the values of the texture parameters if needed *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ glBindTexture(GL_TEXTURE_2D, texture);\n+ if (!tex2D)\n+ glDisable(GL_TEXTURE_2D);\n+ if (!blend)\n+ glDisable(GL_BLEND);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvMode);\n+ glBlendFunc(blendSrc, blendDst);\n+ }\n }\n \n \n@@ -714,6 +768,8 @@\n FcChar8* UinString = NULL;\n FcChar8* ptr = NULL;\n FcChar32 code = 0;\n+ GLboolean tex2D = GL_FALSE, blend = GL_FALSE;\n+ GLint texEnvMode = 0, blendSrc = 0, blendDst = 0, texture = 0;\n \n \/* Check if the current thread owns a context state *\/\n state = __glcGetCurrent();\n@@ -733,6 +789,22 @@\n if (!UinString) {\n __glcRaiseError(GLC_RESOURCE_ERROR);\n return;\n+ }\n+\n+ \/* Set the texture environment if the render style is GLC_TEXTURE *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ \/* Save the value of the parameters *\/\n+ tex2D = glIsEnabled(GL_TEXTURE_2D);\n+ blend = glIsEnabled(GL_BLEND);\n+ glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvMode);\n+ glGetIntegerv(GL_BLEND_SRC, &blendSrc);\n+ glGetIntegerv(GL_BLEND_DST, &blendDst);\n+ glGetIntegerv(GL_TEXTURE_BINDING_2D, &texture);\n+ \/* Set the new values of the parameters *\/\n+ glEnable(GL_TEXTURE_2D);\n+ glEnable(GL_BLEND);\n+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);\n }\n \n \/* Render the string *\/\n@@ -749,6 +821,17 @@\n }\n \n __glcFree(UinString);\n+\n+ \/* Restore the values of the texture parameters if needed *\/\n+ if (state->renderStyle == GLC_TEXTURE) {\n+ glBindTexture(GL_TEXTURE_2D, texture);\n+ if (!tex2D)\n+ glDisable(GL_TEXTURE_2D);\n+ if (!blend)\n+ glDisable(GL_BLEND);\n+ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvMode);\n+ glBlendFunc(blendSrc, blendDst);\n+ }\n }\n \n \n"} {"commit":"bb2e5f389b09d681591d2999fb10fd09b47e4eae","subject":"Actually check for 0.9.1...","message":"Actually check for 0.9.1...\n\nFun fact: some packages of librdkafka 0.9.0, such as the one in the\nConfluent Platform 2.0 Debian repo, define RD_KAFKA_VERSION as\n0x00090100!\n","repos":"confluentinc\/bottledwater-pg,confluentinc\/bottledwater-pg,confluentinc\/bottledwater-pg,confluentinc\/bottledwater-pg","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kafka\/bottledwater.c\n+++ kafka\/bottledwater.c\n@@ -629,7 +629,7 @@\n * in the circular buffer starting out empty, since the tail is one ahead\n * of the head. *\/\n \n-#if RD_KAFKA_VERSION >= 0x00090100\n+#if RD_KAFKA_VERSION >= 0x000901ff\n \/* librdkafka 0.9.1 provides a \"consistent_random\" partitioner, which is\n * a good choice for us: \"Uses consistent hashing to map identical keys\n * onto identical partitions, and messages without keys will be assigned\n"} {"commit":"0b700a6a253b6a3b3059bb9a9247a73490ee33fb","subject":"x86 mmiotrace: split set_page_presence()","message":"x86 mmiotrace: split set_page_presence()\n\nFrom 36772dcb6ffbbb68254cbfc379a103acd2fbfefc Mon Sep 17 00:00:00 2001\nFrom: Pekka Paalanen <57fbf5561796ac3f40d7fbf8e6b649ed5638552e@iki.fi>\nDate: Sat, 28 Feb 2009 21:34:59 +0200\n\nSplit set_page_presence() in kmmio.c into two more functions set_pmd_presence()\nand set_pte_presence(). Purely code reorganization, no functional changes.\n\nSigned-off-by: Pekka Paalanen <57fbf5561796ac3f40d7fbf8e6b649ed5638552e@iki.fi>\nCc: Stuart Bennett <1c8c08db85a36cc69d975124539be839dea91342@freedesktop.org>\nCc: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/x86\/mm\/kmmio.c\n+++ arch\/x86\/mm\/kmmio.c\n@@ -107,12 +107,29 @@\n \treturn NULL;\n }\n \n+static void set_pmd_presence(pmd_t *pmd, bool present, bool *old)\n+{\n+\tpmdval_t v = pmd_val(*pmd);\n+\t*old = !!(v & _PAGE_PRESENT);\n+\tv &= ~_PAGE_PRESENT;\n+\tif (present)\n+\t\tv |= _PAGE_PRESENT;\n+\tset_pmd(pmd, __pmd(v));\n+}\n+\n+static void set_pte_presence(pte_t *pte, bool present, bool *old)\n+{\n+\tpteval_t v = pte_val(*pte);\n+\t*old = !!(v & _PAGE_PRESENT);\n+\tv &= ~_PAGE_PRESENT;\n+\tif (present)\n+\t\tv |= _PAGE_PRESENT;\n+\tset_pte_atomic(pte, __pte(v));\n+}\n+\n static int set_page_presence(unsigned long addr, bool present, bool *old)\n {\n-\tpteval_t pteval;\n-\tpmdval_t pmdval;\n \tunsigned int level;\n-\tpmd_t *pmd;\n \tpte_t *pte = lookup_address(addr, &level);\n \n \tif (!pte) {\n@@ -122,31 +139,17 @@\n \n \tswitch (level) {\n \tcase PG_LEVEL_2M:\n-\t\tpmd = (pmd_t *)pte;\n-\t\tpmdval = pmd_val(*pmd);\n-\t\t*old = !!(pmdval & _PAGE_PRESENT);\n-\t\tpmdval &= ~_PAGE_PRESENT;\n-\t\tif (present)\n-\t\t\tpmdval |= _PAGE_PRESENT;\n-\t\tset_pmd(pmd, __pmd(pmdval));\n+\t\tset_pmd_presence((pmd_t *)pte, present, old);\n \t\tbreak;\n-\n \tcase PG_LEVEL_4K:\n-\t\tpteval = pte_val(*pte);\n-\t\t*old = !!(pteval & _PAGE_PRESENT);\n-\t\tpteval &= ~_PAGE_PRESENT;\n-\t\tif (present)\n-\t\t\tpteval |= _PAGE_PRESENT;\n-\t\tset_pte_atomic(pte, __pte(pteval));\n+\t\tset_pte_presence(pte, present, old);\n \t\tbreak;\n-\n \tdefault:\n \t\tpr_err(\"kmmio: unexpected page level 0x%x.\\n\", level);\n \t\treturn -1;\n \t}\n \n \t__flush_tlb_one(addr);\n-\n \treturn 0;\n }\n \n"} {"commit":"a87f4cc2ccb0b4e769748c73c96bc12090f95b76","subject":"initializer element is not constant","message":"initializer element is not constant\n","repos":"guts-lang\/guts","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/frontend\/jay\/jay_lexer.c\n+++ src\/frontend\/jay\/jay_lexer.c\n@@ -134,8 +134,8 @@\n };\n \n #define EMPTY {0}\n-#define TOK(t, s) {(t), (jl_loc_t){0}, s, sizeof(s)-1}\n-#define IDN(t, s) {(t), (jl_loc_t){0}, s, sizeof(s)-1}\n+#define TOK(t, s) {(t), {0}, s, sizeof(s)-1}\n+#define IDN(t, s) {(t), {0}, s, sizeof(s)-1}\n \n const jl_token_t tokens[] = {\n \/* 0x00 *\/\n"} {"commit":"591556deb94d99bac31db5bc0db5ab0df860d2e2","subject":"added #include <boost\/thread\/condition.hpp>","message":"added \n#include <boost\/thread\/condition.hpp>\n\n\ngit-svn-id: 1af002208e930b4d920e7c2b948d1e98a012c795@435 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn,psoetens\/pcl-svn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- io\/include\/pcl\/io\/openni_camera\/openni_device.h\n+++ io\/include\/pcl\/io\/openni_camera\/openni_device.h\n@@ -45,6 +45,7 @@\n #include <boost\/noncopyable.hpp>\n #include <boost\/function.hpp>\n #include <boost\/thread.hpp>\n+#include <boost\/thread\/condition.hpp>\n \n \/\/\/ @todo Get rid of all exception-specifications, these are useless and soon to be deprecated\n \n"} {"commit":"73272534935626214df3584e6287c3f652f10f32","subject":"Cope with trailing CIGAR H (or S and H) in 'samtools depad'","message":"Cope with trailing CIGAR H (or S and H) in 'samtools depad'\n","repos":"peterjc\/samtools,dondelelcaro\/samtools,mcshane\/samtools,mcshane\/samtools,Kontakter\/samtools,kdmurray91\/samtools,dondelelcaro\/samtools,lh3\/samtools-legacy,dondelelcaro\/samtools,lh3\/samtools-legacy,Kontakter\/samtools,dondelelcaro\/samtools,peterjc\/samtools,mcshane\/samtools,dondelelcaro\/samtools,Kontakter\/samtools,peterjc\/samtools,kdmurray91\/samtools,mcshane\/samtools,peterjc\/samtools,lh3\/samtools-legacy,mcshane\/samtools,lh3\/samtools-legacy,kdmurray91\/samtools,Kontakter\/samtools,Kontakter\/samtools,mcshane\/samtools,peterjc\/samtools,lh3\/samtools-legacy,kdmurray91\/samtools,kdmurray91\/samtools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- padding.c\n+++ padding.c\n@@ -96,7 +96,9 @@\n \t\t\tif (bam_cigar_op(cigar[0]) == BAM_CSOFT_CLIP) write_cigar(cigar2, n2, m2, cigar[0]);\n \t\t\tif (bam_cigar_op(cigar[0]) == BAM_CHARD_CLIP) {\n \t\t\t\twrite_cigar(cigar2, n2, m2, cigar[0]);\n-\t\t\t\tif (bam_cigar_op(cigar[1]) == BAM_CSOFT_CLIP) write_cigar(cigar2, n2, m2, cigar[1]);\n+\t\t\t\tif (b->core.n_cigar > 2 && bam_cigar_op(cigar[1]) == BAM_CSOFT_CLIP) {\n+\t\t\t\t\twrite_cigar(cigar2, n2, m2, cigar[1]);\n+\t\t\t\t}\n \t\t\t}\n \t\t\t\/* Include any pads if starts with an insert *\/\n \t\t\tfor (k = 0; k+1 < b->core.pos && !r.s[b->core.pos - k - 1]; ++k);\n@@ -113,6 +115,12 @@\n \t\t\t}\n \t\t\twrite_cigar(cigar2, n2, m2, bam_cigar_gen(k, op));\n \t\t\tif (bam_cigar_op(cigar[b->core.n_cigar-1]) == BAM_CSOFT_CLIP) write_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-1]);\n+ if (bam_cigar_op(cigar[b->core.n_cigar-1]) == BAM_CHARD_CLIP) {\n+\t\t\t\tif (b->core.n_cigar > 2 && bam_cigar_op(cigar[b->core.n_cigar-2]) == BAM_CSOFT_CLIP) {\n+\t\t\t\t\twrite_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-2]);\n+\t\t\t \t}\n+\t\t\t\twrite_cigar(cigar2, n2, m2, cigar[b->core.n_cigar-1]);\n+\t\t\t}\n \t\t\t\/* Remove redundant P operators between M operators, e.g. 5M2P10M -> 15M *\/\n \t\t\tfor (i = 2; i < n2; ++i)\n \t\t\t\tif (bam_cigar_op(cigar2[i]) == BAM_CMATCH && bam_cigar_op(cigar2[i-1]) == BAM_CPAD && bam_cigar_op(cigar2[i-2]) == BAM_CMATCH)\n"} {"commit":"c1541778731f1912815b6cfe269dbb45d449d587","subject":"adding missing PCL_EXPORTS in openni_driver.h struct","message":"adding missing PCL_EXPORTS in openni_driver.h struct\n\ngit-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@5372 a9d63959-f2ad-4865-b262-bf0e56cfafb6\n","repos":"ResByte\/pcl,soulsheng\/pcl,Tabjones\/pcl,zhangxaochen\/pcl,locnx1984\/pcl,pkuhto\/pcl,shyamalschandra\/pcl,stefanbuettner\/pcl,nh2\/pcl,damienjadeduff\/pcl,krips89\/pcl_newfeatures,Tabjones\/pcl,3dtof\/pcl,fskuka\/pcl,jakobwilm\/pcl,damienjadeduff\/pcl,lydhr\/pcl,3dtof\/pcl,zavataafnan\/pcl-truck,chatchavan\/pcl,ipa-rmb\/pcl,srbhprajapati\/pcl,cascheberg\/pcl,ipa-rmb\/pcl,msalvato\/pcl_kinfu_highres,starius\/pcl,chenxingzhe\/pcl,jakobwilm\/pcl,simonleonard\/pcl,jakobwilm\/pcl,fanxiaochen\/mypcltest,locnx1984\/pcl,starius\/pcl,krips89\/pcl_newfeatures,closerbibi\/pcl,kanster\/pcl,chenxingzhe\/pcl,pkuhto\/pcl,KevenRing\/vlp,stfuchs\/pcl,shyamalschandra\/pcl,starius\/pcl,mschoeler\/pcl,jeppewalther\/kinfu_segmentation,mschoeler\/pcl,jeppewalther\/kinfu_segmentation,MMiknis\/pcl,ResByte\/pcl,the-glu\/pcl,damienjadeduff\/pcl,mschoeler\/pcl,nh2\/pcl,lebronzhang\/pcl,stefanbuettner\/pcl,MMiknis\/pcl,3dtof\/pcl,lebronzhang\/pcl,starius\/pcl,wgapl\/pcl,drmateo\/pcl,raydtang\/pcl,zavataafnan\/pcl-truck,mikhail-matrosov\/pcl,ipa-rmb\/pcl,shivmalhotra\/pcl,krips89\/pcl_newfeatures,zhangxaochen\/pcl,stfuchs\/pcl,shivmalhotra\/pcl,drmateo\/pcl,sbec\/pcl,shyamalschandra\/pcl,RufaelDev\/pcc-mp3dg,msalvato\/pcl_kinfu_highres,chatchavan\/pcl,sbec\/pcl,raydtang\/pcl,v4hn\/pcl,zavataafnan\/pcl-truck,zavataafnan\/pcl-truck,KevenRing\/vlp,closerbibi\/pcl,lebronzhang\/pcl,KevenRing\/pcl,KevenRing\/pcl,msalvato\/pcl_kinfu_highres,srbhprajapati\/pcl,lydhr\/pcl,locnx1984\/pcl,KevenRing\/pcl,closerbibi\/pcl,v4hn\/pcl,DaikiMaekawa\/pcl,damienjadeduff\/pcl,jakobwilm\/pcl,Nerei\/pcl_old_repo,Nerei\/pcl_old_repo,mikhail-matrosov\/pcl,nikste\/pcl,lydhr\/pcl,pkuhto\/pcl,DaikiMaekawa\/pcl,soulsheng\/pcl,fskuka\/pcl,jeppewalther\/kinfu_segmentation,soulsheng\/pcl,chenxingzhe\/pcl,fanxiaochen\/mypcltest,kanster\/pcl,locnx1984\/pcl,LZRS\/pcl,DaikiMaekawa\/pcl,msalvato\/pcl_kinfu_highres,zhangxaochen\/pcl,chenxingzhe\/pcl,zavataafnan\/pcl-truck,nikste\/pcl,KevenRing\/pcl,shyamalschandra\/pcl,drmateo\/pcl,fanxiaochen\/mypcltest,LZRS\/pcl,wgapl\/pcl,RufaelDev\/pcc-mp3dg,mikhail-matrosov\/pcl,jeppewalther\/kinfu_segmentation,stfuchs\/pcl,nikste\/pcl,kanster\/pcl,pkuhto\/pcl,Nerei\/pcl_old_repo,KevenRing\/pcl,RufaelDev\/pcc-mp3dg,srbhprajapati\/pcl,simonleonard\/pcl,shivmalhotra\/pcl,krips89\/pcl_newfeatures,kanster\/pcl,damienjadeduff\/pcl,wgapl\/pcl,RufaelDev\/pcc-mp3dg,shangwuhencc\/pcl,srbhprajapati\/pcl,shangwuhencc\/pcl,chatchavan\/pcl,the-glu\/pcl,LZRS\/pcl,soulsheng\/pcl,LZRS\/pcl,MMiknis\/pcl,ResByte\/pcl,3dtof\/pcl,the-glu\/pcl,nikste\/pcl,pkuhto\/pcl,krips89\/pcl_newfeatures,fskuka\/pcl,chenxingzhe\/pcl,shyamalschandra\/pcl,lebronzhang\/pcl,cascheberg\/pcl,RufaelDev\/pcc-mp3dg,shangwuhencc\/pcl,fanxiaochen\/mypcltest,sbec\/pcl,lydhr\/pcl,soulsheng\/pcl,jakobwilm\/pcl,locnx1984\/pcl,starius\/pcl,stfuchs\/pcl,shangwuhencc\/pcl,simonleonard\/pcl,nikste\/pcl,wgapl\/pcl,ipa-rmb\/pcl,mikhail-matrosov\/pcl,KevenRing\/vlp,v4hn\/pcl,stfuchs\/pcl,msalvato\/pcl_kinfu_highres,sbec\/pcl,lydhr\/pcl,simonleonard\/pcl,stefanbuettner\/pcl,zhangxaochen\/pcl,fskuka\/pcl,DaikiMaekawa\/pcl,3dtof\/pcl,v4hn\/pcl,drmateo\/pcl,zhangxaochen\/pcl,raydtang\/pcl,Nerei\/pcl_old_repo,shivmalhotra\/pcl,KevenRing\/vlp,v4hn\/pcl,kanster\/pcl,Tabjones\/pcl,mikhail-matrosov\/pcl,raydtang\/pcl,DaikiMaekawa\/pcl,jeppewalther\/kinfu_segmentation,stefanbuettner\/pcl,wgapl\/pcl,MMiknis\/pcl,nh2\/pcl,KevenRing\/vlp,mschoeler\/pcl,chatchavan\/pcl,shivmalhotra\/pcl,simonleonard\/pcl,srbhprajapati\/pcl,closerbibi\/pcl,fskuka\/pcl,cascheberg\/pcl,lebronzhang\/pcl,shangwuhencc\/pcl,cascheberg\/pcl,Tabjones\/pcl,LZRS\/pcl,cascheberg\/pcl,fanxiaochen\/mypcltest,mschoeler\/pcl,MMiknis\/pcl,sbec\/pcl,the-glu\/pcl,Tabjones\/pcl,stefanbuettner\/pcl,raydtang\/pcl,ResByte\/pcl,closerbibi\/pcl,nh2\/pcl,the-glu\/pcl,drmateo\/pcl,ipa-rmb\/pcl,ResByte\/pcl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- io\/include\/pcl\/io\/openni_camera\/openni_driver.h\n+++ io\/include\/pcl\/io\/openni_camera\/openni_driver.h\n@@ -208,7 +208,7 @@\n getDeviceType (const std::string& connection_string, unsigned short& vendorId, unsigned short& productId);\n protected:\n \n- struct DeviceContext\n+ struct PCL_EXPORTS DeviceContext\n {\n DeviceContext (const xn::NodeInfo& device_node, xn::NodeInfo* image_node, xn::NodeInfo* depth_node, xn::NodeInfo * ir_node);\n DeviceContext (const xn::NodeInfo & device_node);\n"} {"commit":"c678ef5286ddb5cf70384ad5af286b0afc9b73e1","subject":"block: avoid using uninitialized value in from queue_var_store","message":"block: avoid using uninitialized value in from queue_var_store\n\nAs found by gcc-4.8, the QUEUE_SYSFS_BIT_FNS macro creates functions\nthat use a value generated by queue_var_store independent of whether\nthat value was set or not.\n\nblock\/blk-sysfs.c: In function 'queue_store_nonrot':\nblock\/blk-sysfs.c:244:385: warning: 'val' may be used uninitialized in this function [-Wmaybe-uninitialized]\n\nUnlike most other such warnings, this one is not a false positive,\nwriting any non-number string into the sysfs files indeed has\nan undefined result, rather than returning an error.\n\nSigned-off-by: Arnd Bergmann <f2c659f01951776204a6c5b902787d9019fbeebd@arndb.de>\nSigned-off-by: Jens Axboe <cd8c6775e60d6f67a6984377324e5290df3d5358@kernel.dk>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- block\/blk-sysfs.c\n+++ block\/blk-sysfs.c\n@@ -229,6 +229,8 @@\n \tunsigned long val;\t\t\t\t\t\t\\\n \tssize_t ret;\t\t\t\t\t\t\t\\\n \tret = queue_var_store(&val, page, count);\t\t\t\\\n+\tif (ret < 0)\t\t\t\t\t\t\t\\\n+\t\t return ret;\t\t\t\t\t\t\\\n \tif (neg)\t\t\t\t\t\t\t\\\n \t\tval = !val;\t\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\t\\\n"} {"commit":"853566e15e2f52750a9ecd2f0873b88a3c04e9c7","subject":"Ellipse and circle - Fill mode","message":"Ellipse and circle - Fill mode\n","repos":"libretro\/libretro-lutro,RobLoach\/libretro-lutro,libretro\/libretro-lutro,libretro\/libretro-lutro,RobLoach\/libretro-lutro","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- painter.c\n+++ painter.c\n@@ -10,8 +10,8 @@\n #include <assert.h>\n #include <retro_miscellaneous.h>\n \n+#define _USE_MATH_DEFINES\n #include <math.h>\n-#define M_PI 3.14159265358979323846\n \n #ifndef max\n #define max(a, b) ((a) > (b) ? (a) : (b))\n@@ -208,7 +208,36 @@\n \n void pntr_fill_ellipse(painter_t *p, int x, int y, int radius_x, int radius_y, int nb_segments)\n {\n- \/\/ TODO\n+ uint32_t color = p->foreground;\n+ if ((color & 0xff000000) == 0)\n+ return;\n+\n+ for (int yy = y - radius_y; yy <= y + radius_y; ++yy)\n+ {\n+ int xmin = p->target->width + 1;\n+ int xmax = -1;\n+ for (int i = 0; i < nb_segments; ++i)\n+ {\n+ int x1 = x + (radius_x * cos(2 * i * M_PI \/ nb_segments));\n+ int y1 = y + (radius_y * sin(2 * i * M_PI \/ nb_segments));\n+ int x2 = x + (radius_x * cos(2 * (i + 1) * M_PI \/ nb_segments));\n+ int y2 = y + (radius_y * sin(2 * (i + 1) * M_PI \/ nb_segments));\n+\n+ if ((y1 > yy) != (y2 > yy))\n+ {\n+ int testx = x1 + ((x2 - x1) * (yy - y1)) \/ (y2 - y1);\n+ xmin = min(xmin, testx);\n+ xmax = max(xmax, testx);\n+ }\n+ }\n+\n+ for (int xx = xmin; xx <= xmax; ++xx)\n+ {\n+ if (yy >= 0 && yy < p->target->height)\n+ if (xx >= 0 && xx < p->target->width)\n+ p->target->data[yy * (p->target->pitch >> 2) + xx] = color;\n+ }\n+ }\n }\n \n void pntr_draw(painter_t *p, const bitmap_t *bmp, const rect_t *src_rect, const rect_t *dst_rect)\n"} {"commit":"96be85f1443bc706ab73257f15a24027a4d28dce","subject":"Aceitando par\u00e2metros ao chamar uma fun\u00e7\u00e3o","message":"Aceitando par\u00e2metros ao chamar uma fun\u00e7\u00e3o\n","repos":"LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 2019\/SO2\/aula4\/my_shell.c\n+++ 2019\/SO2\/aula4\/my_shell.c\n@@ -1,37 +1,51 @@\n #include <stdio.h>\n+#include <stdlib.h>\n #include <string.h>\n-#include <stdlib.h>\n #include <unistd.h>\n \n #include <sys\/types.h>\n #include <sys\/wait.h>\n \n+void slice(char *args[], char *string) {\n+ char *token;\n+ int i;\n \n-int main(){\n-\tchar command[2048];\n-\tpid_t forkStatus;\n+ for (token = strtok(string, \" \"), i = 0; token != NULL;\n+ token = strtok(NULL, \" \"), i++) {\n+ args[i] = token;\n+ }\n+ args[i] = NULL;\n+}\n \n- \n-\twhile(1){\n-\t\tprintf(\"> \");\n-\t\tscanf(\" %[^\\n]\",command);\n-\t\tif(strcmp(command,\"q\")==0){\n-\t\t\tbreak;\n-\t\t}else{\n-\t\t\tforkStatus = vfork();\n-\t\t\tif(forkStatus ==0){\n-\t\t\t\tchar *end = strpbrk(command,\"&\");\n-\t\t\t\tif (end){\n-\t\t\t\t\t*end = '\\0';\n-\t\t\t\t}\n-\t\t\t\texeclp(command,command, NULL);\n-\t\t\t}else if(forkStatus!=-1){\n-\t\t\t\tif(!strpbrk(command,\"&\")){\n-\t\t\t\t\twait(NULL);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n+int main() {\n+ char command[2048];\n+ pid_t forkStatus;\n \n-\t}\n-\treturn 0;\n+ char *args[2048];\n+ int tem_e;\n+\n+ while (1) {\n+ tem_e = 0;\n+ printf(\"> \");\n+ scanf(\" %[^\\n]\", command);\n+ if (strcmp(command, \"q\") == 0) {\n+ break;\n+ } else {\n+ char *end = strrchr(command, '&');\n+ if ('&' == command[strlen(command) - 1]) {\n+ tem_e = 1;\n+ *end = '\\0';\n+ }\n+ forkStatus = vfork();\n+ if (forkStatus == 0) {\n+ slice(args, command);\n+ execvp(command, args);\n+ } else if (forkStatus != -1) {\n+ if (!tem_e) {\n+ wait(NULL);\n+ }\n+ }\n+ }\n+ }\n+ return 0;\n }\n"} {"commit":"99dbdba98cdee275366cf81a1f1119d100ff038b","subject":"Updated to match the other architectures. Fixes problem with \"fcntl: function not implemented\".","message":"Updated to match the other architectures. Fixes problem with \"fcntl:\nfunction not implemented\".\n","repos":"skristiansson\/uClibc-or1k,OpenInkpot-archive\/iplinux-uclibc,ddcc\/klee-uclibc-0.9.33.2,OpenInkpot-archive\/iplinux-uclibc,wbx-github\/uclibc-ng,gittup\/uClibc,hwoarang\/uClibc,klee\/klee-uclibc,ysat0\/uClibc,ffainelli\/uClibc,brgl\/uclibc-ng,kraj\/uClibc,m-labs\/uclibc-lm32,gittup\/uClibc,gittup\/uClibc,kraj\/uclibc-ng,czankel\/xtensa-uclibc,ddcc\/klee-uclibc-0.9.33.2,gittup\/uClibc,brgl\/uclibc-ng,mephi42\/uClibc,m-labs\/uclibc-lm32,hjl-tools\/uClibc,groundwater\/uClibc,skristiansson\/uClibc-or1k,waweber\/uclibc-clang,hjl-tools\/uClibc,groundwater\/uClibc,kraj\/uclibc-ng,waweber\/uclibc-clang,ndmsystems\/uClibc,m-labs\/uclibc-lm32,kraj\/uclibc-ng,foss-xtensa\/uClibc,wbx-github\/uclibc-ng,czankel\/xtensa-uclibc,foss-for-synopsys-dwc-arc-processors\/uClibc,foss-xtensa\/uClibc,klee\/klee-uclibc,kraj\/uclibc-ng,foss-xtensa\/uClibc,waweber\/uclibc-clang,ChickenRunjyd\/klee-uclibc,skristiansson\/uClibc-or1k,groundwater\/uClibc,atgreen\/uClibc-moxie,kraj\/uClibc,ffainelli\/uClibc,ysat0\/uClibc,hwoarang\/uClibc,ChickenRunjyd\/klee-uclibc,majek\/uclibc-vx32,ffainelli\/uClibc,brgl\/uclibc-ng,ffainelli\/uClibc,ChickenRunjyd\/klee-uclibc,ndmsystems\/uClibc,ffainelli\/uClibc,majek\/uclibc-vx32,hjl-tools\/uClibc,waweber\/uclibc-clang,czankel\/xtensa-uclibc,foss-for-synopsys-dwc-arc-processors\/uClibc,wbx-github\/uclibc-ng,ndmsystems\/uClibc,atgreen\/uClibc-moxie,kraj\/uClibc,wbx-github\/uclibc-ng,klee\/klee-uclibc,OpenInkpot-archive\/iplinux-uclibc,klee\/klee-uclibc,foss-for-synopsys-dwc-arc-processors\/uClibc,hwoarang\/uClibc,atgreen\/uClibc-moxie,hjl-tools\/uClibc,groundwater\/uClibc,ysat0\/uClibc,hwoarang\/uClibc,mephi42\/uClibc,skristiansson\/uClibc-or1k,ndmsystems\/uClibc,czankel\/xtensa-uclibc,kraj\/uClibc,majek\/uclibc-vx32,foss-for-synopsys-dwc-arc-processors\/uClibc,foss-xtensa\/uClibc,ddcc\/klee-uclibc-0.9.33.2,mephi42\/uClibc,hjl-tools\/uClibc,atgreen\/uClibc-moxie,groundwater\/uClibc,majek\/uclibc-vx32,mephi42\/uClibc,brgl\/uclibc-ng,ysat0\/uClibc,OpenInkpot-archive\/iplinux-uclibc,ChickenRunjyd\/klee-uclibc,m-labs\/uclibc-lm32,ddcc\/klee-uclibc-0.9.33.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/cris\/bits\/fcntl.h\n+++ libc\/sysdeps\/linux\/cris\/bits\/fcntl.h\n@@ -1,21 +1,21 @@\n \/* O_*, F_*, FD_* bit values for Linux.\n- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n+ Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.\n This file is part of the GNU C Library.\n \n The GNU C Library is free software; you can redistribute it and\/or\n- modify it under the terms of the GNU Library General Public License as\n- published by the Free Software Foundation; either version 2 of the\n- License, or (at your option) any later version.\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n \n The GNU C Library is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n- Library General Public License for more details.\n+ Lesser General Public License for more details.\n \n- You should have received a copy of the GNU Library General Public\n- License along with the GNU C Library; see the file COPYING.LIB. If not,\n- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n- Boston, MA 02111-1307, USA. *\/\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with the GNU C Library; if not, write to the Free\n+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA\n+ 02111-1307 USA. *\/\n \n #ifndef\t_FCNTL_H\n # error \"Never use <bits\/fcntl.h> directly; include <fcntl.h> instead.\"\n@@ -42,18 +42,18 @@\n #define O_ASYNC\t\t 020000\n \n #ifdef __USE_GNU\n-# define O_DIRECT\t 040000\t\/* Direct disk access. *\/\n-# define O_DIRECTORY\t0200000\t\/* Must be a directory. *\/\n-# define O_NOFOLLOW\t0400000\t\/* Do not follow links. *\/\n+# define O_DIRECT\t 040000\t\/* Direct disk access.\t*\/\n+# define O_DIRECTORY\t0200000\t\/* Must be a directory.\t *\/\n+# define O_NOFOLLOW\t0400000\t\/* Do not follow links.\t *\/\n # define O_STREAMING\t04000000\/* streaming access *\/\n #endif\n \n \/* For now Linux has synchronisity options for data and read operations.\n We define the symbols here but let them do the same as O_SYNC since\n- this is a superset. *\/\n+ this is a superset.\t*\/\n #if defined __USE_POSIX199309 || defined __USE_UNIX98\n # define O_DSYNC\tO_SYNC\t\/* Synchronize data. *\/\n-# define O_RSYNC\tO_SYNC\t\/* Synchronize read operations. *\/\n+# define O_RSYNC\tO_SYNC\t\/* Synchronize read operations.\t *\/\n #endif\n \n #ifdef __USE_LARGEFILE64\n@@ -66,16 +66,20 @@\n #define F_SETFD\t\t2\t\/* Set file descriptor flags. *\/\n #define F_GETFL\t\t3\t\/* Get file status flags. *\/\n #define F_SETFL\t\t4\t\/* Set file status flags. *\/\n-#define F_GETLK\t\t5\t\/* Get record locking info. *\/\n-#define F_SETLK\t\t6\t\/* Set record locking info (non-blocking). *\/\n-#define F_SETLKW\t7\t\/* Set record locking info (blocking). *\/\n+#ifndef __USE_FILE_OFFSET64\n+# define F_GETLK\t5\t\/* Get record locking info. *\/\n+# define F_SETLK\t6\t\/* Set record locking info (non-blocking). *\/\n+# define F_SETLKW\t7\t\/* Set record locking info (blocking).\t*\/\n+#else\n+# define F_GETLK\tF_GETLK64 \/* Get record locking info.\t*\/\n+# define F_SETLK\tF_SETLK64 \/* Set record locking info (non-blocking).*\/\n+# define F_SETLKW\tF_SETLKW64 \/* Set record locking info (blocking). *\/\n+#endif\n+#define F_GETLK64\t12\t\/* Get record locking info. *\/\n+#define F_SETLK64\t13\t\/* Set record locking info (non-blocking). *\/\n+#define F_SETLKW64\t14\t\/* Set record locking info (blocking).\t*\/\n \n-\/* XXX missing *\/\n-#define F_GETLK64\t5\t\/* Get record locking info. *\/\n-#define F_SETLK64\t6\t\/* Set record locking info (non-blocking). *\/\n-#define F_SETLKW64\t7\t\/* Set record locking info (blocking). *\/\n-\n-#ifdef __USE_BSD\n+#if defined __USE_BSD || defined __USE_XOPEN2K\n # define F_SETOWN\t8\t\/* Get owner of socket (receiver of SIGIO). *\/\n # define F_GETOWN\t9\t\/* Set owner of socket (receiver of SIGIO). *\/\n #endif\n@@ -85,20 +89,26 @@\n # define F_GETSIG\t11\t\/* Get number of signal to be sent. *\/\n #endif\n \n+#ifdef __USE_GNU\n+# define F_SETLEASE\t1024\t\/* Set a lease.\t *\/\n+# define F_GETLEASE\t1025\t\/* Enquire what lease is active. *\/\n+# define F_NOTIFY\t1026\t\/* Request notfications on a directory.\t *\/\n+#endif\n+\n \/* For F_[GET|SET]FL. *\/\n #define FD_CLOEXEC\t1\t\/* actually anything with low bit set goes *\/\n \n \/* For posix fcntl() and `l_type' field of a `struct flock' for lockf(). *\/\n #define F_RDLCK\t\t0\t\/* Read lock. *\/\n-#define F_WRLCK\t\t1\t\/* Write lock. *\/\n-#define F_UNLCK\t\t2\t\/* Remove lock. *\/\n+#define F_WRLCK\t\t1\t\/* Write lock.\t*\/\n+#define F_UNLCK\t\t2\t\/* Remove lock.\t *\/\n \n-\/* for old implementation of bsd flock () *\/\n+\/* For old implementation of bsd flock(). *\/\n #define F_EXLCK\t\t4\t\/* or 3 *\/\n #define F_SHLCK\t\t8\t\/* or 4 *\/\n \n #ifdef __USE_BSD\n-\/* operations for bsd flock(), also used by the kernel implementation *\/\n+\/* Operations for bsd flock(), also used by the kernel implementation.\t*\/\n # define LOCK_SH\t1\t\/* shared lock *\/\n # define LOCK_EX\t2\t\/* exclusive lock *\/\n # define LOCK_NB\t4\t\/* or'd with one of the above to prevent\n@@ -106,9 +116,27 @@\n # define LOCK_UN\t8\t\/* remove lock *\/\n #endif\n \n+#ifdef __USE_GNU\n+# define LOCK_MAND\t32\t\/* This is a mandatory flock:\t*\/\n+# define LOCK_READ\t64\t\/* ... which allows concurrent read operations.\t *\/\n+# define LOCK_WRITE\t128\t\/* ... which allows concurrent write operations. *\/\n+# define LOCK_RW\t192\t\/* ... Which allows concurrent read & write operations.\t *\/\n+#endif\n+\n+#ifdef __USE_GNU\n+\/* Types of directory notifications that may be requested with F_NOTIFY. *\/\n+# define DN_ACCESS\t0x00000001\t\/* File accessed. *\/\n+# define DN_MODIFY\t0x00000002\t\/* File modified. *\/\n+# define DN_CREATE\t0x00000004\t\/* File created. *\/\n+# define DN_DELETE\t0x00000008\t\/* File removed. *\/\n+# define DN_RENAME\t0x00000010\t\/* File renamed. *\/\n+# define DN_ATTRIB\t0x00000020\t\/* File changed attibutes. *\/\n+# define DN_MULTISHOT\t0x80000000\t\/* Don't remove notifier. *\/\n+#endif\n+\n struct flock\n {\n- short int l_type;\t\/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. *\/\n+ short int l_type;\t\/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.\t*\/\n short int l_whence;\t\/* Where `l_start' is relative to (like `lseek'). *\/\n #ifndef __USE_FILE_OFFSET64\n __off_t l_start;\t\/* Offset where the lock begins. *\/\n@@ -123,7 +151,7 @@\n #ifdef __USE_LARGEFILE64\n struct flock64\n {\n- short int l_type;\t\/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK. *\/\n+ short int l_type;\t\/* Type of lock: F_RDLCK, F_WRLCK, or F_UNLCK.\t*\/\n short int l_whence;\t\/* Where `l_start' is relative to (like `lseek'). *\/\n __off64_t l_start;\t\/* Offset where the lock begins. *\/\n __off64_t l_len;\t\/* Size of the locked area; zero means until EOF. *\/\n@@ -140,3 +168,13 @@\n # define FNONBLOCK\tO_NONBLOCK\n # define FNDELAY\tO_NDELAY\n #endif \/* Use BSD. *\/\n+\n+\/* Advise to `posix_fadvise'. *\/\n+#ifdef __USE_XOPEN2K\n+# define POSIX_FADV_NORMAL\t0 \/* No further special treatment. *\/\n+# define POSIX_FADV_RANDOM\t1 \/* Expect random page references. *\/\n+# define POSIX_FADV_SEQUENTIAL\t2 \/* Expect sequential page references.\t *\/\n+# define POSIX_FADV_WILLNEED\t3 \/* Will need these pages. *\/\n+# define POSIX_FADV_DONTNEED\t4 \/* Don't need these pages. *\/\n+# define POSIX_FADV_NOREUSE\t5 \/* Data will be accessed once. *\/\n+#endif\n"} {"commit":"51d341ddb8d4059f445d9007db01ed01a0c03c6d","subject":"tests CHANGE enhance context tests","message":"tests CHANGE enhance context tests\n","repos":"sartura\/libyang,sartura\/libyang,sartura\/libyang,sartura\/libyang,CESNET\/libyang,CESNET\/libyang,sartura\/libyang,sartura\/libyang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/src\/context.c\n+++ tests\/src\/context.c\n@@ -162,7 +162,7 @@\n \/* test searchdir list in ly_ctx_new() *\/\n assert_int_equal(LY_EINVAL, ly_ctx_new(\"\/nonexistingfile\", 0, &ctx));\n logbuf_assert(\"Unable to use search directory \\\"\/nonexistingfile\\\" (No such file or directory)\");\n- assert_int_equal(LY_SUCCESS, ly_ctx_new(TESTS_SRC\":\/tmp:\/tmp\", 0, &ctx));\n+ assert_int_equal(LY_SUCCESS, ly_ctx_new(TESTS_SRC\":\/tmp:\/tmp:\"TESTS_SRC, 0, &ctx));\n assert_int_equal(2, ctx->search_paths.count);\n assert_string_equal(TESTS_SRC, ctx->search_paths.objs[0]);\n assert_string_equal(\"\/tmp\", ctx->search_paths.objs[1]);\n"} {"commit":"4b252bc49431306f476acae1f64589e6ed187559","subject":"Constify a couple string pointers","message":"Constify a couple string pointers\n","repos":"arkana-fts\/openal-soft,BeamNG\/openal-soft,dapetcu21\/openal-soft,arkana-fts\/openal-soft,AerialX\/openal-soft-android,irungentoo\/openal-soft-tox,franklixuefei\/openal-soft,jims\/openal-soft,franklixuefei\/openal-soft,mmozeiko\/OpenAL-Soft,irungentoo\/openal-soft-tox,rryan\/openal-soft,aaronmjacobs\/openal-soft,Wemersive\/openal-soft,rryan\/openal-soft,BeamNG\/openal-soft,alexxvk\/openal-soft,EddieRingle\/openal-soft,jims\/openal-soft,mmozeiko\/OpenAL-Soft,Wemersive\/openal-soft,aaronmjacobs\/openal-soft,alexxvk\/openal-soft,EddieRingle\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Alc\/backends\/pulseaudio.c\n+++ Alc\/backends\/pulseaudio.c\n@@ -888,7 +888,7 @@\n \/\/ OpenAL {{{\n static ALCenum pulse_open_playback(ALCdevice *device, const ALCchar *device_name) \/\/{{{\n {\n- char *pulse_name = NULL;\n+ const char *pulse_name = NULL;\n pa_sample_spec spec;\n pa_stream *stream;\n pulse_data *data;\n@@ -1150,10 +1150,10 @@\n \n static ALCenum pulse_open_capture(ALCdevice *device, const ALCchar *device_name) \/\/{{{\n {\n- char *pulse_name = NULL;\n- pulse_data *data;\n+ const char *pulse_name = NULL;\n pa_stream_flags_t flags = 0;\n pa_channel_map chanmap;\n+ pulse_data *data;\n ALuint samples;\n \n if(!allCaptureDevNameMap)\n"} {"commit":"986578ea178de26d94d653322359f74fc7fa76d5","subject":"Fix typo in comment","message":"Fix typo in comment\n","repos":"GNOME\/gupnp-av","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libgupnp-av\/gupnp-didl-lite-writer.c\n+++ libgupnp-av\/gupnp-didl-lite-writer.c\n@@ -110,7 +110,7 @@\n int len;\n \n if (a[0] == '@')\n- \/* Filer is for top-level property *\/\n+ \/* Filter is for top-level property *\/\n return -1;\n \n p = strstr (a, \"@\");\n"} {"commit":"1b40b327217826736c9825cfcfb886940f301802","subject":"rename variables","message":"rename variables\n","repos":"davidzchen\/tensorflow,paolodedios\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,paolodedios\/tensorflow,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,annarev\/tensorflow,Intel-Corporation\/tensorflow,freedomtan\/tensorflow,yongtang\/tensorflow,aam-at\/tensorflow,Intel-Corporation\/tensorflow,annarev\/tensorflow,freedomtan\/tensorflow,cxxgtxy\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,karllessard\/tensorflow,Intel-Corporation\/tensorflow,Intel-tensorflow\/tensorflow,cxxgtxy\/tensorflow,aam-at\/tensorflow,freedomtan\/tensorflow,tensorflow\/tensorflow,aldian\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-experimental_link_static_libraries_once,annarev\/tensorflow,cxxgtxy\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,aam-at\/tensorflow,Intel-Corporation\/tensorflow,Intel-tensorflow\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,paolodedios\/tensorflow,aam-at\/tensorflow,Intel-tensorflow\/tensorflow,paolodedios\/tensorflow,aldian\/tensorflow,aldian\/tensorflow,frreiss\/tensorflow-fred,yongtang\/tensorflow,freedomtan\/tensorflow,freedomtan\/tensorflow,petewarden\/tensorflow,petewarden\/tensorflow,frreiss\/tensorflow-fred,gautam1858\/tensorflow,tensorflow\/tensorflow,freedomtan\/tensorflow,aldian\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,davidzchen\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,davidzchen\/tensorflow,gautam1858\/tensorflow,karllessard\/tensorflow,Intel-Corporation\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,tensorflow\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,aam-at\/tensorflow,paolodedios\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,tensorflow\/tensorflow-pywrap_saved_model,petewarden\/tensorflow,tensorflow\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow,freedomtan\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,gautam1858\/tensorflow,frreiss\/tensorflow-fred,davidzchen\/tensorflow,Intel-tensorflow\/tensorflow,sarvex\/tensorflow,cxxgtxy\/tensorflow,yongtang\/tensorflow,frreiss\/tensorflow-fred,davidzchen\/tensorflow,annarev\/tensorflow,frreiss\/tensorflow-fred,paolodedios\/tensorflow,paolodedios\/tensorflow,aam-at\/tensorflow,gautam1858\/tensorflow,davidzchen\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,annarev\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,tensorflow\/tensorflow-experimental_link_static_libraries_once,Intel-tensorflow\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,tensorflow\/tensorflow-pywrap_saved_model,tensorflow\/tensorflow-pywrap_saved_model,gautam1858\/tensorflow,cxxgtxy\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,petewarden\/tensorflow,annarev\/tensorflow,yongtang\/tensorflow,freedomtan\/tensorflow,karllessard\/tensorflow,Intel-Corporation\/tensorflow,petewarden\/tensorflow,karllessard\/tensorflow,freedomtan\/tensorflow,aldian\/tensorflow,paolodedios\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,karllessard\/tensorflow,petewarden\/tensorflow,karllessard\/tensorflow,aam-at\/tensorflow,paolodedios\/tensorflow,yongtang\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,sarvex\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,aldian\/tensorflow,paolodedios\/tensorflow,Intel-Corporation\/tensorflow,frreiss\/tensorflow-fred,petewarden\/tensorflow,yongtang\/tensorflow,frreiss\/tensorflow-fred,davidzchen\/tensorflow,petewarden\/tensorflow,tensorflow\/tensorflow-pywrap_tf_optimizer,freedomtan\/tensorflow,gautam1858\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,annarev\/tensorflow,frreiss\/tensorflow-fred,gautam1858\/tensorflow,aldian\/tensorflow,cxxgtxy\/tensorflow,tensorflow\/tensorflow,Intel-tensorflow\/tensorflow,aam-at\/tensorflow,aldian\/tensorflow,petewarden\/tensorflow,Intel-tensorflow\/tensorflow,freedomtan\/tensorflow,sarvex\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,gautam1858\/tensorflow,paolodedios\/tensorflow,gautam1858\/tensorflow,yongtang\/tensorflow,aam-at\/tensorflow,freedomtan\/tensorflow,karllessard\/tensorflow,aam-at\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,petewarden\/tensorflow,karllessard\/tensorflow,sarvex\/tensorflow,davidzchen\/tensorflow,petewarden\/tensorflow,cxxgtxy\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,frreiss\/tensorflow-fred,gautam1858\/tensorflow,karllessard\/tensorflow,tensorflow\/tensorflow-pywrap_saved_model,gautam1858\/tensorflow,gautam1858\/tensorflow,frreiss\/tensorflow-fred,frreiss\/tensorflow-fred,Intel-Corporation\/tensorflow,davidzchen\/tensorflow,davidzchen\/tensorflow,yongtang\/tensorflow,tensorflow\/tensorflow-experimental_link_static_libraries_once,aam-at\/tensorflow,cxxgtxy\/tensorflow,Intel-tensorflow\/tensorflow,frreiss\/tensorflow-fred,tensorflow\/tensorflow-experimental_link_static_libraries_once,aam-at\/tensorflow,sarvex\/tensorflow,annarev\/tensorflow,tensorflow\/tensorflow,Intel-tensorflow\/tensorflow","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tensorflow\/core\/kernels\/map_kernels.h\n+++ tensorflow\/core\/kernels\/map_kernels.h\n@@ -22,30 +22,30 @@\n \n namespace tensorflow {\n \n-Status GetInputMap(OpKernelContext* c, int index, const TensorMap** map) {\n- if (!TensorShapeUtils::IsScalar(c->input(index).shape())) {\n+Status GetInputMap(OpKernelContext* ctx, int index, const TensorMap** ret_map) {\n+ if (!TensorShapeUtils::IsScalar(ctx->input(index).shape())) {\n return errors::InvalidArgument(\"Input map must be a scalar. Saw: \",\n- c->input(index).shape().DebugString());\n- }\n- const TensorMap* m = c->input(index).scalar<Variant>()().get<TensorMap>();\n- if (m == nullptr) {\n+ ctx->input(index).shape().DebugString());\n+ }\n+ const TensorMap* map = ctx->input(index).scalar<Variant>()().get<TensorMap>();\n+ if (map == nullptr) {\n return errors::InvalidArgument(\n \"Input handle is not a map. Saw: '\",\n- c->input(index).scalar<Variant>()().DebugString(), \"'\");\n- }\n- *map = m;\n+ ctx->input(index).scalar<Variant>()().DebugString(), \"'\");\n+ }\n+ *ret_map = map;\n return Status::OK();\n }\n \n \/\/ TODO(kattian): change into templated function\n-Status ForwardInputOrCreateNewMap(OpKernelContext* c, int32 input_index,\n+Status ForwardInputOrCreateNewMap(OpKernelContext* ctx, int32 input_index,\n int32 output_index,\n const TensorMap& input_map,\n TensorMap** output_map) {\n \/\/ Attempt to forward the input tensor to the output if possible.\n- std::unique_ptr<Tensor> maybe_output = c->forward_input(\n+ std::unique_ptr<Tensor> maybe_output = ctx->forward_input(\n input_index, output_index, DT_VARIANT, TensorShape{},\n- c->input_memory_type(input_index), AllocatorAttributes());\n+ ctx->input_memory_type(input_index), AllocatorAttributes());\n Tensor* output_tensor;\n if (maybe_output != nullptr && maybe_output->dtype() == DT_VARIANT &&\n maybe_output->NumElements() == 1) {\n@@ -58,7 +58,7 @@\n }\n if (tmp_out->RefCountIsOne()) {\n \/\/ Woohoo, forwarding succeeded!\n- c->set_output(output_index, *output_tensor);\n+ ctx->set_output(output_index, *output_tensor);\n *output_map = tmp_out;\n return Status::OK();\n }\n@@ -69,7 +69,7 @@\n AllocatorAttributes attr;\n attr.set_on_host(true);\n TF_RETURN_IF_ERROR(\n- c->allocate_output(output_index, {}, &output_tensor, attr));\n+ ctx->allocate_output(output_index, {}, &output_tensor, attr));\n output_tensor->scalar<Variant>()() = input_map.Copy();\n \n *output_map = output_tensor->scalar<Variant>()().get<TensorMap>();\n@@ -78,13 +78,13 @@\n \n class EmptyTensorMap : public OpKernel {\n public:\n- explicit EmptyTensorMap(OpKernelConstruction* c) : OpKernel(c) {}\n-\n- void Compute(OpKernelContext* c) override {\n+ explicit EmptyTensorMap(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n+\n+ void Compute(OpKernelContext* ctx) override {\n Tensor* result;\n AllocatorAttributes attr;\n attr.set_on_host(true);\n- OP_REQUIRES_OK(c, c->allocate_output(0, TensorShape{}, &result, attr));\n+ OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape{}, &result, attr));\n TensorMap empty;\n result->scalar<Variant>()() = std::move(empty);\n }\n@@ -92,116 +92,116 @@\n \n class TensorMapSize : public OpKernel {\n public:\n- explicit TensorMapSize(OpKernelConstruction* c) : OpKernel(c) {}\n+ explicit TensorMapSize(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n ~TensorMapSize() override {}\n \n- void Compute(OpKernelContext* c) override {\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n- Tensor* result;\n- OP_REQUIRES_OK(c, c->allocate_output(0, TensorShape{}, &result));\n- result->scalar<int32>()() = m->tensors().size();\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n+ Tensor* result;\n+ OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape{}, &result));\n+ result->scalar<int32>()() = map->tensors().size();\n }\n };\n \n class TensorMapLookup : public OpKernel {\n public:\n- explicit TensorMapLookup(OpKernelConstruction* c) : OpKernel(c) {}\n+ explicit TensorMapLookup(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n ~TensorMapLookup() override {}\n \n- void Compute(OpKernelContext* c) override {\n- const TensorKey& key = c->input(1);\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n-\n- OP_REQUIRES(c, m->tensors().find(key) != m->tensors().end(),\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorKey& key = ctx->input(1);\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n+\n+ OP_REQUIRES(ctx, map->tensors().find(key) != map->tensors().end(),\n errors::InvalidArgument(\"Trying to lookup non-existent key. Could not \" \n \"find key \\\"\" + key.SummarizeValue(100) + \"\\\".\"));\n \n- c->set_output(0, m->tensors().find(key)->second);\n+ ctx->set_output(0, map->tensors().find(key)->second);\n }\n };\n \n class TensorMapInsert : public OpKernel {\n public:\n- explicit TensorMapInsert(OpKernelConstruction* c) : OpKernel(c) {}\n+ explicit TensorMapInsert(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n ~TensorMapInsert() override {}\n \n- void Compute(OpKernelContext* c) override {\n- const TensorKey& key = c->input(1);\n- const Tensor& value = c->input(2);\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorKey& key = ctx->input(1);\n+ const Tensor& value = ctx->input(2);\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n \n TensorMap* output_map = nullptr;\n- OP_REQUIRES_OK(c, ForwardInputOrCreateNewMap(c, 0, 0, *m, &output_map));\n+ OP_REQUIRES_OK(ctx, ForwardInputOrCreateNewMap(ctx, 0, 0, *map, &output_map));\n output_map->replace(key, value);\n }\n };\n \n class TensorMapErase : public OpKernel {\n public:\n- explicit TensorMapErase(OpKernelConstruction* c) : OpKernel(c) {}\n-\n- void Compute(OpKernelContext* c) override {\n- const TensorKey& key = c->input(1);\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n-\n- OP_REQUIRES(c, m->tensors().find(key) != m->tensors().end(),\n+ explicit TensorMapErase(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n+\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorKey& key = ctx->input(1);\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n+\n+ OP_REQUIRES(ctx, map->tensors().find(key) != map->tensors().end(),\n errors::InvalidArgument(\"Trying to erase non-existent item. Could not \" \n \"find key \\\"\" + key.SummarizeValue(100) + \"\\\".\"));\n \n TensorMap* output_map = nullptr;\n- OP_REQUIRES_OK(c, ForwardInputOrCreateNewMap(c, 0, 0, *m, &output_map));\n+ OP_REQUIRES_OK(ctx, ForwardInputOrCreateNewMap(ctx, 0, 0, *map, &output_map));\n output_map->tensors().erase(key);\n }\n };\n \n class TensorMapHasKey : public OpKernel {\n public:\n- explicit TensorMapHasKey(OpKernelConstruction* c) : OpKernel(c) {}\n+ explicit TensorMapHasKey(OpKernelConstruction* ctx) : OpKernel(ctx) {}\n ~TensorMapHasKey() override {}\n \n- void Compute(OpKernelContext* c) override {\n- const TensorKey& key = c->input(1);\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n- Tensor* result;\n- OP_REQUIRES_OK(c, c->allocate_output(0, TensorShape{}, &result));\n- result->scalar<bool>()() = m->tensors().find(key) != m->tensors().end();\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorKey& key = ctx->input(1);\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n+ Tensor* result;\n+ OP_REQUIRES_OK(ctx, ctx->allocate_output(0, TensorShape{}, &result));\n+ result->scalar<bool>()() = map->tensors().find(key) != map->tensors().end();\n }\n };\n \n class TensorMapStackKeys : public OpKernel {\n public:\n- explicit TensorMapStackKeys(OpKernelConstruction* c) : OpKernel(c) {\n- OP_REQUIRES_OK(c, c->GetAttr(\"key_dtype\", &key_dtype_));\n+ explicit TensorMapStackKeys(OpKernelConstruction* ctx) : OpKernel(ctx) {\n+ OP_REQUIRES_OK(ctx, ctx->GetAttr(\"key_dtype\", &key_dtype_));\n }\n ~TensorMapStackKeys() override {}\n \n- void Compute(OpKernelContext* c) override {\n- const TensorMap* m = nullptr;\n- OP_REQUIRES_OK(c, GetInputMap(c, 0, &m));\n+ void Compute(OpKernelContext* ctx) override {\n+ const TensorMap* map = nullptr;\n+ OP_REQUIRES_OK(ctx, GetInputMap(ctx, 0, &map));\n \n- OP_REQUIRES(c, m->size() != 0,\n+ OP_REQUIRES(ctx, map->size() != 0,\n errors::InvalidArgument(\"TensorMapStackKeys cannot be called on empty map.\"));\n \n- auto it = m->tensors().begin();\n+ auto it = map->tensors().begin();\n TensorShape output_shape = it->first.shape();\n- output_shape.InsertDim(0, m->tensors().size());\n- Tensor* result;\n- OP_REQUIRES_OK(c, c->allocate_output(0, output_shape, &result));\n+ output_shape.InsertDim(0, map->tensors().size());\n+ Tensor* result;\n+ OP_REQUIRES_OK(ctx, ctx->allocate_output(0, output_shape, &result));\n \n int i = 0;\n- size_t sz = m->tensors().size();\n+ size_t sz = map->tensors().size();\n TensorShape key_shape = it->first.shape();\n- while (it != m->tensors().end() && i < sz) {\n- OP_REQUIRES(c, it->first.dtype() == key_dtype_,\n+ while (it != map->tensors().end() && i < sz) {\n+ OP_REQUIRES(ctx, it->first.dtype() == key_dtype_,\n errors::InvalidArgument(\"Key does not match requested dtype.\"));\n- OP_REQUIRES(c, it->first.shape() == key_shape,\n+ OP_REQUIRES(ctx, it->first.shape() == key_shape,\n errors::InvalidArgument(\"Keys must all have the same shape.\"));\n- OP_REQUIRES_OK(c, batch_util::CopyElementToSlice(it->first, result, i));\n+ OP_REQUIRES_OK(ctx, batch_util::CopyElementToSlice(it->first, result, i));\n i++;\n it++;\n }\n@@ -211,7 +211,7 @@\n };\n \n template <typename Device>\n-Status TensorMapBinaryAdd(OpKernelContext* c, const TensorMap& a,\n+Status TensorMapBinaryAdd(OpKernelContext* ctx, const TensorMap& a,\n const TensorMap& b, TensorMap* out) {\n \/\/ Binary add returns a map containing the union of keys.\n \/\/ Values with keys in the intersection are added.\n@@ -222,7 +222,7 @@\n if (it != out->tensors().end()) {\n Tensor out_tensor;\n TF_RETURN_IF_ERROR(\n- BinaryAddTensors<Device>(c, p.second, it->second, &out_tensor));\n+ BinaryAddTensors<Device>(ctx, p.second, it->second, &out_tensor));\n it->second = out_tensor;\n } else {\n out->tensors().emplace(p.first, p.second);\n@@ -232,7 +232,7 @@\n }\n \n template <typename Device>\n-Status TensorMapZerosLike(OpKernelContext* c, const TensorMap& x,\n+Status TensorMapZerosLike(OpKernelContext* ctx, const TensorMap& x,\n TensorMap* y) {\n \/\/ Zeros like returns an empty map.\n return Status::OK();\n"} {"commit":"bc6eef7637db1aebf830a09c16a5b58fcc8abb9f","subject":"Remove unused variable","message":"Remove unused variable\n","repos":"stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libharp\/harp-derived-variable-list.c\n+++ libharp\/harp-derived-variable-list.c\n@@ -4441,7 +4441,6 @@\n {\n harp_variable_conversion *conversion;\n harp_dimension_type dimension_type[HARP_MAX_NUM_DIMS];\n- int i;\n \n dimension_type[0] = harp_dimension_time;\n \n"} {"commit":"e2dca533b2f699a34124953a51c68264df0e6ba8","subject":"Removed deprecated GL_R for GL_RED","message":"Removed deprecated GL_R for GL_RED\n","repos":"VLanvin\/ogaml,ogaml\/ogaml,ogaml\/ogaml,ogaml\/ogaml,ogaml\/ogaml,ogaml\/ogaml,VLanvin\/ogaml","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gl\/stubs\/texture_stubs.c\n+++ src\/gl\/stubs\/texture_stubs.c\n@@ -106,7 +106,7 @@\n switch(Int_val(fmt))\n {\n case 0:\n- return GL_R;\n+ return GL_RED;\n \n case 1:\n return GL_RG;\n@@ -185,12 +185,12 @@\n {\n CAMLparam5(target, fmt, size, tfmt, data);\n \n- glTexImage2D(Target_val(target), \n- 0, \n+ glTexImage2D(Target_val(target),\n+ 0,\n TextureFormat_val(tfmt),\n Int_val(Field(size,0)),\n Int_val(Field(size,1)),\n- 0, \n+ 0,\n PixelFormat_val(fmt),\n GL_UNSIGNED_BYTE,\n String_val(data));\n@@ -210,7 +210,7 @@\n glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, Magnify_val(Field(loc, 1)));\n else if(Field(loc, 0) == MLvar_Minify)\n glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, Minify_val(Field(loc, 1)));\n- else \n+ else\n caml_failwith(\"Caml polymorphic variant error in tex_parameter_2D(1)\");\n \n CAMLreturn(Val_unit);\n@@ -229,4 +229,3 @@\n \n CAMLreturn(Val_unit);\n }\n-\n"} {"commit":"ac27a574daa0724e1d02569436143f9cc10025c7","subject":"roster.c: use the lm_message_node_get_value accessor","message":"roster.c: use the lm_message_node_get_value accessor\n","repos":"Ziemin\/telepathy-gabble,jku\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/roster.c\n+++ src\/roster.c\n@@ -349,14 +349,16 @@\n for (i = node_iter (item_node); i; i = node_iter_next (i))\n {\n LmMessageNode *group_node = node_iter_data (i);\n+ const gchar *value;\n \n if (0 != strcmp (group_node->name, \"group\"))\n continue;\n \n- if (NULL == group_node->value)\n+ value = lm_message_node_get_value (group_node);\n+ if (NULL == value)\n continue;\n \n- handle = tp_handle_ensure (group_repo, group_node->value, NULL, NULL);\n+ handle = tp_handle_ensure (group_repo, value, NULL, NULL);\n if (!handle)\n continue;\n tp_handle_set_add (groups, handle);\n"} {"commit":"ce8671c6127aafc819137f2e4dd067567187129b","subject":"Testcase for llvm-gcc commit r132591.","message":"Testcase for llvm-gcc commit r132591.\n\nPart of rdar:\/\/9037836 and rdar:\/\/9119939\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@132592 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm","returncode":1,"stderr":"error: pathspec 'test\/FrontendC\/inline-asm-multichar.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- test\/FrontendC\/inline-asm-multichar.c\n+++ test\/FrontendC\/inline-asm-multichar.c\n@@ -0,0 +1,11 @@\n+\/\/ RUN: %llvmgcc -S -march=armv7a %s \n+\n+\/\/ XFAIL: *\n+\/\/ XTARGET: arm\n+\n+int t1() {\n+ static float k = 1.0f;\n+CHECK: call void asm sideeffect \"flds s15, $0 \\0A\", \"*^Uv,~{s15}\"\n+ __asm__ volatile (\"flds s15, %[k] \\n\" :: [k] \"Uv,m\" (k) : \"s15\");\n+ return 0;\n+}\n"} {"commit":"6f85f3c0d23a4aefe2ca73041232f9184da4fb5f","subject":"gray-crawler: fixing compile-time warnings for ext4","message":"gray-crawler: fixing compile-time warnings for ext4\n","repos":"cmusatyalab\/gammaray,cmusatyalab\/gammaray,wenluhu\/gammaray-android,wenluhu\/gammaray-android,wenluhu\/gammaray-android,cmusatyalab\/gammaray","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gray-crawler\/ext4\/ext4.c\n+++ src\/gray-crawler\/ext4\/ext4.c\n@@ -648,8 +648,8 @@\n {\n int i;\n struct ext4_extent_header hdr; \n- struct ext4_extent_idx idx;\n- struct ext4_extent_idx idx2; \/* lookahead when searching for block_num *\/\n+ struct ext4_extent_idx idx = {};\n+ struct ext4_extent_idx idx2 = {}; \/* lookahead when searching block_num *\/\n struct ext4_extent extent;\n \n memcpy(buf, inode.i_block, (size_t) 60);\n@@ -1565,8 +1565,8 @@\n {\n int i;\n struct ext4_extent_header* hdr; \n- struct ext4_extent_idx idx;\n- struct ext4_extent_idx idx2; \/* lookahead when searching for block_num *\/\n+ struct ext4_extent_idx idx = {};\n+ struct ext4_extent_idx idx2 = {}; \/* lookahead when searching block_num *\/\n struct ext4_extent extent;\n uint64_t block_size = ext4_block_size(superblock);\n uint8_t buf[block_size];\n"} {"commit":"28aa74478d3b3b352d577d63dceebc26a87568f0","subject":"screen: Remove blit list on AVR","message":"screen: Remove blit list on AVR\n\nI had thought that clearing the contents of struct blit would set the size\nto zero, but apparently each struct still gets a byte allocated for it.\n\nAfter removing the blit struct, the size of Screen on AVR dropped from 364\nbyte to 4 bytes.\n","repos":"eecsninja\/invaders,eecsninja\/invaders","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/screen.h\n+++ src\/screen.h\n@@ -53,14 +53,14 @@\n class Screen {\n private:\n \/\/ A list of scheduled blits.\n+#ifndef __AVR__\n struct blit {\n-#ifndef __AVR__\n int type;\n int image_index;\n int x;\n int y;\n+ } blits[max_updates];\n #endif\n- } blits[max_updates];\n int num_blits;\n Images* image_lib;\n \n"} {"commit":"ef73d185c7fe281414ea65fcdf6e5fd3215d46a4","subject":"Revert Change From 80 Byte To 40 Byte OP_Return By Bitcoin Devs","message":"Revert Change From 80 Byte To 40 Byte OP_Return By Bitcoin Devs\n","repos":"vladroberto\/IXCoin,vladroberto\/IXCoin,IXCoin-Dev\/IXCoin,IXCoin-Dev\/IXCoin,vladroberto\/IXCoin,IXCoin-Dev\/IXCoin,vladroberto\/IXCoin,IXCoin-Dev\/IXCoin,vladroberto\/IXCoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/script.h\n+++ src\/script.h\n@@ -23,7 +23,7 @@\n class CTransaction;\n \n static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; \/\/ bytes\n-static const unsigned int MAX_OP_RETURN_RELAY = 40; \/\/ bytes\n+static const unsigned int MAX_OP_RETURN_RELAY = 80; \/\/ bytes\n \n \/** Signature hash types\/flags *\/\n enum\n"} {"commit":"7a14dac65a365e4b80211b0c07495bf94c28f896","subject":"Fixed another physical frame leak in the heap code.","message":"Fixed another physical frame leak in the heap code.\n","repos":"grahamedgecombe\/arc,grahamedgecombe\/arc,grahamedgecombe\/arc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- kernel\/arc\/mm\/heap.c\n+++ kernel\/arc\/mm\/heap.c\n@@ -235,6 +235,7 @@\n *\/\n if (!vmm_map(page, phy, map_flags))\n {\n+ pmm_free(phy);\n _heap_free(node);\n return 0;\n }\n"} {"commit":"d29be158a68254f58cf1fbf60ce1e89557a321aa","subject":"Audit: add support to match lsm labels on user audit messages","message":"Audit: add support to match lsm labels on user audit messages\n\nAdd support for matching by security label (e.g. SELinux context) of\nthe sender of an user-space audit record.\n\nThe audit filter code already allows user space to configure such\nfilters, but they were ignored during evaluation. This patch implements\nevaluation of these filters.\n\nFor example, after application of this patch, PAM authentication logs\ncaused by cron can be disabled using\n\tauditctl -a user,never -F subj_type=crond_t\n\nSigned-off-by: Miloslav Trmac <9c008e38982a5397deb855345fb164f0558459ae@redhat.com>\nAcked-by: Eric Paris <b0b36e3cd9ea4e5739ff430a3056fabf2fdb0376@redhat.com>\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/auditfilter.c\n+++ kernel\/auditfilter.c\n@@ -1252,6 +1252,18 @@\n \t\tcase AUDIT_LOGINUID:\n \t\t\tresult = audit_comparator(cb->loginuid, f->op, f->val);\n \t\t\tbreak;\n+\t\tcase AUDIT_SUBJ_USER:\n+\t\tcase AUDIT_SUBJ_ROLE:\n+\t\tcase AUDIT_SUBJ_TYPE:\n+\t\tcase AUDIT_SUBJ_SEN:\n+\t\tcase AUDIT_SUBJ_CLR:\n+\t\t\tif (f->lsm_rule)\n+\t\t\t\tresult = security_audit_rule_match(cb->sid,\n+\t\t\t\t\t\t\t\t f->type,\n+\t\t\t\t\t\t\t\t f->op,\n+\t\t\t\t\t\t\t\t f->lsm_rule,\n+\t\t\t\t\t\t\t\t NULL);\n+\t\t\tbreak;\n \t\t}\n \n \t\tif (!result)\n"} {"commit":"1fcb452479e604c28db308326dedb0fc9e1558c2","subject":"Simplify reference buffer calculation.","message":"Simplify reference buffer calculation.\n","repos":"ultravideo\/kvazaar,lu-zero\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,lu-zero\/kvazaar,lu-zero\/kvazaar,lu-zero\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/search.c\n+++ src\/search.c\n@@ -99,6 +99,8 @@\n int block_width, int block_height)\n {\n uint8_t *pic_data, *ref_data;\n+ int mv_x = ref_x - pic_x;\n+ int mv_y = ref_y - pic_y;\n int width = pic->width;\n int height = pic->height;\n int left = ref_x < 0;\n@@ -108,25 +110,27 @@\n \n unsigned result = 0;\n \n+ \/\/ Center both picture buffer and reference buffer to the picture block, so \n+ \/\/ that further references are relative to the block rather than the\n+ \/\/ top-left corner of the picture.\n+ pic_data = &pic->y_data[pic_y * width + pic_x];\n+ ref_data = &ref->y_data[pic_y * width + pic_x];\n+\n \/\/ 0 means invalid, for now.\n \/\/if (!IN_FRAME(ref_x, ref_y, width, height, block_width, block_height)) return 0;\n \n if (left && top) {\n- pic_data = &pic->y_data[0];\n- ref_data = &ref->y_data[0];\n- result += corner_sad(pic_data, ref_data, -ref_x, -ref_y, width);\n-\n- pic_data = &pic->y_data[-ref_x];\n- ref_data = &ref->y_data[0];\n- result += vertical_sad(pic_data, ref_data, block_width + ref_x, -ref_y, width);\n-\n- pic_data = &pic->y_data[-ref_y * width];\n- ref_data = &ref->y_data[0];\n- result += horizontal_sad(pic_data, ref_data, -ref_x, block_height + ref_y, width);\n-\n- pic_data = &pic->y_data[(pic_y - ref_y) * width + pic_x - ref_x];\n- ref_data = &ref->y_data[0];\n- result += sad(pic_data, ref_data, block_width + ref_x, block_height + ref_y, width);\n+ result += corner_sad(pic_data, ref_data,\n+ -ref_x, -ref_y, width);\n+\n+ result += vertical_sad(&pic_data[-ref_x], ref_data,\n+ block_width - -ref_x, -ref_y, width);\n+\n+ result += horizontal_sad(&pic_data[-ref_y * width], ref_data,\n+ -ref_x, block_height - -ref_y, width);\n+\n+ result += sad(&pic_data[-ref_y * width + -ref_x], ref_data,\n+ block_width - -ref_x, block_height - -ref_y, width);\n } else if (top) {\n \n } else if (top && right) {\n@@ -142,9 +146,7 @@\n } else if (bottom && right) {\n \n } else {\n- pic_data = &pic->y_data[pic_y * width + pic_x];\n- ref_data = &ref->y_data[ref_y * width + ref_x];\n- result += sad(pic_data, ref_data, block_width, block_height, width);\n+ result += sad(pic_data, &ref_data[mv_y * width + mv_x], block_width, block_height, width);\n }\n \n \n"} {"commit":"6039078bc6b4fcf3ee865d17379a28629a1d070b","subject":"Implement strncmp for hash table","message":"Implement strncmp for hash table\n","repos":"iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/core\/string.c\n+++ kernel\/core\/string.c\n@@ -1,3 +1,4 @@\n+#include <truth\/types.h>\n #include <truth\/string.h>\n \n int memcmp(const void *a, const void *b, size_t size)\n@@ -50,6 +51,19 @@\n return destination;\n }\n \n+enum order strncmp(const string s1, const string s2, size_t n) {\n+ for (size_t i = 0; i < n; ++i) {\n+ if (s1[i] != s2[i]) {\n+ if (s1[i] > s2[i]) {\n+ return Order_Greater;\n+ } else {\n+ return Order_Less;\n+ }\n+ }\n+ }\n+ return Order_Equal;\n+}\n+\n size_t strlen(const char *str) {\n size_t ret = 0;\n while (str[ret] != 0) {\n"} {"commit":"e27fc875c089b07e2b4dee212421646b6e1b1871","subject":"Clean up intra search.","message":"Clean up intra search.\n","repos":"lu-zero\/kvazaar,lu-zero\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,lu-zero\/kvazaar,ultravideo\/kvazaar,lu-zero\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/search.c\n+++ src\/search.c\n@@ -838,10 +838,10 @@\n }\n \n static int8_t search_intra_rough(encoder_state * const encoder_state, \n- pixel *orig, int32_t origstride,\n- pixel *rec, int16_t recstride,\n- int width, int8_t *intra_preds,\n- int8_t modes[35], uint32_t costs[35])\n+ pixel *orig, int32_t origstride,\n+ pixel *rec, int16_t recstride,\n+ int width, int8_t *intra_preds,\n+ int8_t modes[35], uint32_t costs[35])\n {\n int16_t mode;\n \n@@ -870,19 +870,24 @@\n }\n intra_filter(ref[1], recstride, width, 0);\n }\n-\n+ \n+ int8_t modes_selected = 0;\n unsigned min_cost = UINT_MAX;\n unsigned max_cost = 0;\n- int offset = 8;\n-\n+ \n+ \/\/ Initial offset decides how many modes are tried before moving on to the\n+ \/\/ recursive search.\n+ int offset;\n if (width == 4) {\n offset = 2;\n } else if (width == 8) {\n offset = 4;\n- }\n-\n- int8_t modes_selected = 0;\n- \/\/ Search 2 vertical and 3 diagonal modes.\n+ } else {\n+ offset = 8;\n+ }\n+\n+ \/\/ Calculate SAD for evenly spaced modes to select the starting point for \n+ \/\/ the recursive search.\n for (int mode = 2; mode <= 34; mode += offset) {\n intra_get_pred(encoder_state->encoder_control, ref, recstride, pred, width, mode, 0);\n costs[modes_selected] = cost_func(pred, orig_block);\n@@ -894,13 +899,12 @@\n ++modes_selected;\n }\n \n- \/\/ Do a halving search to find the best mode, always centering on the\n- \/\/ current best mode. Unless all costs are the same in which let's not\n- \/\/ bother.\n+ \/\/ Skip recursive search if all modes have the same cost.\n if (min_cost != max_cost) {\n+ \/\/ Do a recursive search to find the best mode, always centering on the\n+ \/\/ current best mode.\n while (offset > 1) {\n offset >>= 1;\n-\n sort_modes(modes, costs, modes_selected);\n \n int8_t mode = modes[0] - offset;\n"} {"commit":"d068415120a2003be286bb944005cc9cb36eb793","subject":"Fix decoding error.","message":"Fix decoding error.\n","repos":"dcjones\/quip,dcjones\/quip,dcjones\/quip,dcjones\/quip","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/seqenc.c\n+++ src\/seqenc.c\n@@ -473,7 +473,16 @@\n }\n }\n else {\n- for (i = 0; i < n - 1;) {\n+ for (i = 0; i < n - 1 && i \/ 2 < prefix_len;) {\n+ uv = cond_dist16_decode(E->ac, &E->cs0[i\/2], ctx);\n+ u = uv >> 2;\n+ v = uv & 0x3;\n+ x->seq.s[i++] = kmertochar[u];\n+ x->seq.s[i++] = kmertochar[v];\n+ ctx = ((ctx << 4) | uv) & E->ctx_mask;\n+ }\n+\n+ while (i < n - 1) {\n uv = cond_dist16_decode(E->ac, &E->cs, ctx);\n u = uv >> 2;\n v = uv & 0x3;\n"} {"commit":"b6e8673b264894dcae80e3311b9779995de715dd","subject":"Changed the array size used when getting and setting the termio struct for the control-character array size.","message":"Changed the array size used when getting and setting the termio struct for the control-character array size.","repos":"jtkb\/libj232","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/serial.c\n+++ src\/serial.c\n@@ -165,7 +165,8 @@\n #endif\n syslog(LOG_USER | LOG_DEBUG, \"Setting c_cflag: 0x%x c_iflag: 0x%x c_oflag: 0x%x c_lflag: 0x%x\", l_termios.c_cflag, l_termios.c_iflag, l_termios.c_oflag, l_termios.c_lflag);\n jbyteArray j_c_cc = (*env)->GetObjectField(env, termios, field_ids[4]);\n- (*env)->GetByteArrayRegion(env, j_c_cc, 0, 32, (jbyte*)(l_termios.c_cc));\n+ (*env)->GetByteArrayRegion(env, j_c_cc, 0, number_control_character_flags, \\\n+ (jbyte*)(l_termios.c_cc));\n \n return_value = tcsetattr(file_descriptor, termattr, &l_termios);\n if (return_value == -1){\n@@ -267,7 +268,9 @@\n }\n \/\/Set the control characters\n jbyteArray j_c_cc = (*env)->GetObjectField(env, returnObject, field_ids[4]);\n- (*env)->SetByteArrayRegion(env, j_c_cc, 0, NCCS, l_termios.c_cc);\n+ (*env)->SetByteArrayRegion(env, j_c_cc, 0, \\\n+ number_control_character_flags,\\\n+ l_termios.c_cc);\n }\n }\n }\n"} {"commit":"a2e3d404886bc380b541207e609de2ecbdb5f6ce","subject":"minor fix","message":"minor fix\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/src\/vfs\/sys.c\n+++ kernel\/src\/vfs\/sys.c\n@@ -16,9 +16,9 @@\n if (id == 1)\n {\n \n- memory_copy(buffer, \"all\/\\nbus\/\\ndevice\/\\ndriver\/\\nfilesystem\/\\n\", 38);\n+ memory_copy(buffer, \"all\/\\nbus\/\\ndevice\/\\ndriver\/\\nfilesystem\/\\nramdisk\/\\nmodule\/\\n\", 55);\n \n- return 38;\n+ return 55;\n \n }\n \n"} {"commit":"c3198f55f1c898a6e92fdbfb65ccfd406ff248a2","subject":" * Added test code of the <marquee bgcolor> attribute for CHTML2.0 converter.","message":" * Added test code of the <marquee bgcolor> attribute for CHTML2.0 converter.\n\n\ngit-svn-id: 7e42957eae6452db79c3ea1a6279e527418ba1c8@2537 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"unpush\/mod_chxj,unpush\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_chtml20\/test_chxj_chtml20.c\n+++ test\/chxj_chtml20\/test_chxj_chtml20.c\n@@ -451,6 +451,9 @@\n void test_chtml20_marquee_tag_016();\n void test_chtml20_marquee_tag_017();\n void test_chtml20_marquee_tag_018();\n+void test_chtml20_marquee_tag_019();\n+void test_chtml20_marquee_tag_020();\n+void test_chtml20_marquee_tag_021();\n \n void test_chtml20_meta_tag_001();\n void test_chtml20_meta_tag_002();\n@@ -880,6 +883,9 @@\n CU_add_test(chtml20_suite, \"test <marquee> 16.\" , test_chtml20_marquee_tag_016);\n CU_add_test(chtml20_suite, \"test <marquee> 17.\" , test_chtml20_marquee_tag_017);\n CU_add_test(chtml20_suite, \"test <marquee> 18.\" , test_chtml20_marquee_tag_018);\n+ CU_add_test(chtml20_suite, \"test <marquee> 19.\" , test_chtml20_marquee_tag_019);\n+ CU_add_test(chtml20_suite, \"test <marquee> 20.\" , test_chtml20_marquee_tag_020);\n+ CU_add_test(chtml20_suite, \"test <marquee> 21.\" , test_chtml20_marquee_tag_021);\n \n CU_add_test(chtml20_suite, \"test <meta> 1.\" , test_chtml20_meta_tag_001);\n CU_add_test(chtml20_suite, \"test <meta> 2.\" , test_chtml20_meta_tag_002);\n@@ -11648,6 +11654,90 @@\n #undef TEST_STRING\n #undef RESULT_STRING\n }\n+void test_chtml20_marquee_tag_019() \n+{\n+#define TEST_STRING \"<marquee bgcolor=\\\"#ff0000\\\">\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+#define RESULT_STRING \"<marquee>\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_chtml20(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_chtml20_marquee_tag_020() \n+{\n+#define TEST_STRING \"<marquee bgcolor=\\\"\\\">\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+#define RESULT_STRING \"<marquee>\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_chtml20(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n+void test_chtml20_marquee_tag_021() \n+{\n+#define TEST_STRING \"<marquee bgcolor>\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+#define RESULT_STRING \"<marquee>\uff8a\uff9d\uff76\uff78<\/marquee>\"\n+ char *ret;\n+ char *tmp;\n+ device_table spec;\n+ chxjconvrule_entry entry;\n+ cookie_t cookie;\n+ apr_size_t destlen;\n+ APR_INIT;\n+\n+ COOKIE_INIT(cookie);\n+\n+ SPEC_INIT(spec);\n+ destlen = sizeof(TEST_STRING)-1;\n+\n+ tmp = chxj_encoding(&r, TEST_STRING, &destlen);\n+ ret = chxj_convert_chtml20(&r, &spec, tmp, destlen, &destlen, &entry, &cookie);\n+ ret = chxj_rencoding(&r, ret, &destlen);\n+ CU_ASSERT(ret != NULL);\n+ CU_ASSERT(strcmp(RESULT_STRING, ret) == 0);\n+ CU_ASSERT(destlen == sizeof(RESULT_STRING)-1);\n+\n+ APR_TERM;\n+#undef TEST_STRING\n+#undef RESULT_STRING\n+}\n \/*============================================================================*\/\n \/* <META> *\/\n \/*============================================================================*\/\n"} {"commit":"335155f7fa50f2a7b714993e2c0427eebbf61a33","subject":"fix read_all and write_all functions","message":"fix read_all and write_all functions\n","repos":"Giraudux\/c-othello-net","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/server.c\n+++ src\/server.c\n@@ -40,9 +40,9 @@\n * \\return the result of the last call to read\n *\/\n ssize_t othello_read_all(int fd, void * buf, size_t count) {\n- ssize_t bytes_read;\n-\n- while((bytes_read = read(fd, buf, count)) > 0 && count > 0) {\n+ ssize_t bytes_read = 0;\n+\n+ while(count > 0 && (bytes_read = read(fd, buf, count)) > 0) {\n count -= bytes_read;\n buf += bytes_read;\n }\n@@ -54,9 +54,9 @@\n * \\return the result of the last call to write\n *\/\n ssize_t othello_write_all(int fd, void * buf, size_t count) {\n- ssize_t bytes_write;\n-\n- while((bytes_write = write(fd, buf, count)) > 0 && count > 0) {\n+ ssize_t bytes_write = 0;\n+\n+ while(count > 0 && (bytes_write = write(fd, buf, count)) > 0) {\n count -= bytes_write;\n buf += bytes_write;\n }\n"} {"commit":"c98c567d9347209083dcddcf4451a02de7b34375","subject":"Hot fix","message":"Hot fix\n","repos":"rksdna\/swamp,rksdna\/swamp,rksdna\/swamp-m0","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sample\/source\/board.c\n+++ sample\/source\/board.c\n@@ -48,7 +48,7 @@\n FLASH->ACR = FLASH_ACR_LATENCY_48MHz | FLASH_ACR_PRFTBE;\n \n RCC->CR = RCC_CR_HSEON | RCC_CR_HSION;\n- wait_for(&RCC->CR, RCC_CR_HSERDY, RCC_CR_PLLRDY);\n+ wait_for(&RCC->CR, RCC_CR_HSERDY, RCC_CR_HSERDY);\n \n RCC->CFGR = RCC_CFGR_PLLMUL12 | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC_HSE_PREDIV;\n RCC->CR = RCC_CR_HSEON | RCC_CR_HSION | RCC_CR_PLLON;\n"} {"commit":"4d3435b8a4c3357695e09c5e7a3bf73a19fca5b0","subject":"tracing: Change tracing_stats_fops to rely on tracing_get_cpu()","message":"tracing: Change tracing_stats_fops to rely on tracing_get_cpu()\n\ntracing_open_generic_tc() is racy, the memory inode->i_private\npoints to can be already freed.\n\n1. Change one of its users, tracing_stats_fops, to use\n tracing_*_generic_tr() instead.\n\n2. Change trace_create_cpu_file(\"stats\", data) to pass \"data = tr\".\n\n3. Change tracing_stats_read() to use tracing_get_cpu().\n\nLink: http:\/\/lkml.kernel.org\/r\/20130723152603.GA23727@redhat.com\n\nSigned-off-by: Oleg Nesterov <20b70f0af00562e63758b9ee42012ecc96c58590@redhat.com>\nSigned-off-by: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/trace\/trace.c\n+++ kernel\/trace\/trace.c\n@@ -2982,7 +2982,6 @@\n \tfilp->private_data = inode->i_private;\n \n \treturn 0;\n-\t\n }\n \n static int tracing_open_generic_tc(struct inode *inode, struct file *filp)\n@@ -5285,14 +5284,14 @@\n tracing_stats_read(struct file *filp, char __user *ubuf,\n \t\t size_t count, loff_t *ppos)\n {\n-\tstruct trace_cpu *tc = filp->private_data;\n-\tstruct trace_array *tr = tc->tr;\n+\tstruct inode *inode = file_inode(filp);\n+\tstruct trace_array *tr = inode->i_private;\n \tstruct trace_buffer *trace_buf = &tr->trace_buffer;\n+\tint cpu = tracing_get_cpu(inode);\n \tstruct trace_seq *s;\n \tunsigned long cnt;\n \tunsigned long long t;\n \tunsigned long usec_rem;\n-\tint cpu = tc->cpu;\n \n \ts = kmalloc(sizeof(*s), GFP_KERNEL);\n \tif (!s)\n@@ -5345,10 +5344,10 @@\n }\n \n static const struct file_operations tracing_stats_fops = {\n-\t.open\t\t= tracing_open_generic_tc,\n+\t.open\t\t= tracing_open_generic_tr,\n \t.read\t\t= tracing_stats_read,\n \t.llseek\t\t= generic_file_llseek,\n-\t.release\t= tracing_release_generic_tc,\n+\t.release\t= tracing_release_generic_tr,\n };\n \n #ifdef CONFIG_DYNAMIC_FTRACE\n@@ -5578,7 +5577,7 @@\n \t\t\t\ttr, cpu, &tracing_buffers_fops);\n \n \ttrace_create_cpu_file(\"stats\", 0444, d_cpu,\n-\t\t\t\t&data->trace_cpu, cpu, &tracing_stats_fops);\n+\t\t\t\ttr, cpu, &tracing_stats_fops);\n \n \ttrace_create_cpu_file(\"buffer_size_kb\", 0444, d_cpu,\n \t\t\t\t&data->trace_cpu, cpu, &tracing_entries_fops);\n"} {"commit":"11d0587f80bd8ca20c067d4ba3c8072dd0732a51","subject":"","message":"\n\nFix build.\n\n\ngit-svn-id: 18bf4e4f0ca11a3471e5785d6da82074410339c6@21018 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6\n","repos":"DarthGandalf\/Enchant,DarthGandalf\/Enchant,DarthGandalf\/Enchant,DarthGandalf\/Enchant","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/hspell\/hspell_provider.c\n+++ src\/hspell\/hspell_provider.c\n@@ -295,7 +295,7 @@\n \tprovider->identify = hspell_provider_identify;\n \tprovider->describe = hspell_provider_describe;\n \tprovider->list_dicts = hspell_provider_list_dicts;\n-\tprovider->free_string_list = uspell_provider_free_string_list;\n+\tprovider->free_string_list = hspell_provider_free_string_list;\n \n \treturn provider;\n }\n"} {"commit":"09665805e8b77229056ce90149b144c2e583b45c","subject":"move func defs to avoid implicit declaration compiler warning","message":"move func defs to avoid implicit declaration compiler warning\n","repos":"edgimar\/borg,edgewood\/borg,RonnyPfannschmidt\/borg,RonnyPfannschmidt\/borg,mhubig\/borg,raxenak\/borg,edgimar\/borg,edgewood\/borg,raxenak\/borg,RonnyPfannschmidt\/borg,edgewood\/borg,edgimar\/borg,raxenak\/borg,RonnyPfannschmidt\/borg,mhubig\/borg,raxenak\/borg,RonnyPfannschmidt\/borg,mhubig\/borg,edgewood\/borg,edgimar\/borg","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- borg\/_hashindex.c\n+++ borg\/_hashindex.c\n@@ -145,92 +145,6 @@\n return 1;\n }\n \n-\/* Public API *\/\n-static HashIndex *\n-hashindex_read(const char *path)\n-{\n- FILE *fd;\n- off_t length, buckets_length, bytes_read;\n- HashHeader header;\n- HashIndex *index = NULL;\n-\n- if((fd = fopen(path, \"rb\")) == NULL) {\n- EPRINTF_PATH(path, \"fopen for reading failed\");\n- return NULL;\n- }\n- bytes_read = fread(&header, 1, sizeof(HashHeader), fd);\n- if(bytes_read != sizeof(HashHeader)) {\n- if(ferror(fd)) {\n- EPRINTF_PATH(path, \"fread header failed (expected %ju, got %ju)\",\n- (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);\n- }\n- else {\n- EPRINTF_MSG_PATH(path, \"fread header failed (expected %ju, got %ju)\",\n- (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);\n- }\n- goto fail;\n- }\n- if(fseek(fd, 0, SEEK_END) < 0) {\n- EPRINTF_PATH(path, \"fseek failed\");\n- goto fail;\n- }\n- if((length = ftell(fd)) < 0) {\n- EPRINTF_PATH(path, \"ftell failed\");\n- goto fail;\n- }\n- if(fseek(fd, sizeof(HashHeader), SEEK_SET) < 0) {\n- EPRINTF_PATH(path, \"fseek failed\");\n- goto fail;\n- }\n- if(memcmp(header.magic, MAGIC, MAGIC_LEN)) {\n- EPRINTF_MSG_PATH(path, \"Unknown MAGIC in header\");\n- goto fail;\n- }\n- buckets_length = (off_t)_le32toh(header.num_buckets) * (header.key_size + header.value_size);\n- if((size_t) length != sizeof(HashHeader) + buckets_length) {\n- EPRINTF_MSG_PATH(path, \"Incorrect file length (expected %ju, got %ju)\",\n- (uintmax_t) sizeof(HashHeader) + buckets_length, (uintmax_t) length);\n- goto fail;\n- }\n- if(!(index = malloc(sizeof(HashIndex)))) {\n- EPRINTF_PATH(path, \"malloc header failed\");\n- goto fail;\n- }\n- if(!(index->buckets = malloc(buckets_length))) {\n- EPRINTF_PATH(path, \"malloc buckets failed\");\n- free(index);\n- index = NULL;\n- goto fail;\n- }\n- bytes_read = fread(index->buckets, 1, buckets_length, fd);\n- if(bytes_read != buckets_length) {\n- if(ferror(fd)) {\n- EPRINTF_PATH(path, \"fread buckets failed (expected %ju, got %ju)\",\n- (uintmax_t) buckets_length, (uintmax_t) bytes_read);\n- }\n- else {\n- EPRINTF_MSG_PATH(path, \"fread buckets failed (expected %ju, got %ju)\",\n- (uintmax_t) buckets_length, (uintmax_t) bytes_read);\n- }\n- free(index->buckets);\n- free(index);\n- index = NULL;\n- goto fail;\n- }\n- index->num_entries = _le32toh(header.num_entries);\n- index->num_buckets = _le32toh(header.num_buckets);\n- index->key_size = header.key_size;\n- index->value_size = header.value_size;\n- index->bucket_size = index->key_size + index->value_size;\n- index->lower_limit = get_lower_limit(index->num_buckets);\n- index->upper_limit = get_upper_limit(index->num_buckets);\n-fail:\n- if(fclose(fd) < 0) {\n- EPRINTF_PATH(path, \"fclose failed\");\n- }\n- return index;\n-}\n-\n int get_lower_limit(int num_buckets){\n int min_buckets = hash_sizes[0];\n if (num_buckets <= min_buckets)\n@@ -278,6 +192,92 @@\n return hash_sizes[i];\n }\n \n+\/* Public API *\/\n+static HashIndex *\n+hashindex_read(const char *path)\n+{\n+ FILE *fd;\n+ off_t length, buckets_length, bytes_read;\n+ HashHeader header;\n+ HashIndex *index = NULL;\n+\n+ if((fd = fopen(path, \"rb\")) == NULL) {\n+ EPRINTF_PATH(path, \"fopen for reading failed\");\n+ return NULL;\n+ }\n+ bytes_read = fread(&header, 1, sizeof(HashHeader), fd);\n+ if(bytes_read != sizeof(HashHeader)) {\n+ if(ferror(fd)) {\n+ EPRINTF_PATH(path, \"fread header failed (expected %ju, got %ju)\",\n+ (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);\n+ }\n+ else {\n+ EPRINTF_MSG_PATH(path, \"fread header failed (expected %ju, got %ju)\",\n+ (uintmax_t) sizeof(HashHeader), (uintmax_t) bytes_read);\n+ }\n+ goto fail;\n+ }\n+ if(fseek(fd, 0, SEEK_END) < 0) {\n+ EPRINTF_PATH(path, \"fseek failed\");\n+ goto fail;\n+ }\n+ if((length = ftell(fd)) < 0) {\n+ EPRINTF_PATH(path, \"ftell failed\");\n+ goto fail;\n+ }\n+ if(fseek(fd, sizeof(HashHeader), SEEK_SET) < 0) {\n+ EPRINTF_PATH(path, \"fseek failed\");\n+ goto fail;\n+ }\n+ if(memcmp(header.magic, MAGIC, MAGIC_LEN)) {\n+ EPRINTF_MSG_PATH(path, \"Unknown MAGIC in header\");\n+ goto fail;\n+ }\n+ buckets_length = (off_t)_le32toh(header.num_buckets) * (header.key_size + header.value_size);\n+ if((size_t) length != sizeof(HashHeader) + buckets_length) {\n+ EPRINTF_MSG_PATH(path, \"Incorrect file length (expected %ju, got %ju)\",\n+ (uintmax_t) sizeof(HashHeader) + buckets_length, (uintmax_t) length);\n+ goto fail;\n+ }\n+ if(!(index = malloc(sizeof(HashIndex)))) {\n+ EPRINTF_PATH(path, \"malloc header failed\");\n+ goto fail;\n+ }\n+ if(!(index->buckets = malloc(buckets_length))) {\n+ EPRINTF_PATH(path, \"malloc buckets failed\");\n+ free(index);\n+ index = NULL;\n+ goto fail;\n+ }\n+ bytes_read = fread(index->buckets, 1, buckets_length, fd);\n+ if(bytes_read != buckets_length) {\n+ if(ferror(fd)) {\n+ EPRINTF_PATH(path, \"fread buckets failed (expected %ju, got %ju)\",\n+ (uintmax_t) buckets_length, (uintmax_t) bytes_read);\n+ }\n+ else {\n+ EPRINTF_MSG_PATH(path, \"fread buckets failed (expected %ju, got %ju)\",\n+ (uintmax_t) buckets_length, (uintmax_t) bytes_read);\n+ }\n+ free(index->buckets);\n+ free(index);\n+ index = NULL;\n+ goto fail;\n+ }\n+ index->num_entries = _le32toh(header.num_entries);\n+ index->num_buckets = _le32toh(header.num_buckets);\n+ index->key_size = header.key_size;\n+ index->value_size = header.value_size;\n+ index->bucket_size = index->key_size + index->value_size;\n+ index->lower_limit = get_lower_limit(index->num_buckets);\n+ index->upper_limit = get_upper_limit(index->num_buckets);\n+fail:\n+ if(fclose(fd) < 0) {\n+ EPRINTF_PATH(path, \"fclose failed\");\n+ }\n+ return index;\n+}\n+\n static HashIndex *\n hashindex_init(int capacity, int key_size, int value_size)\n {\n"} {"commit":"521e99b46ba16bbe3a7a1199c8bd09c5f9400303","subject":"Bodrato updated for lower dimensions","message":"Bodrato updated for lower dimensions\n","repos":"dsroche\/flint2,dsroche\/flint2,wbhart\/flint2,jpflori\/flint2,jpflori\/flint2,dsroche\/flint2,fredrik-johansson\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,wbhart\/flint2,jpflori\/flint2,jpflori\/flint2,dsroche\/flint2,fredrik-johansson\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmpz_mat\/sqr_bodrato.c\n+++ fmpz_mat\/sqr_bodrato.c\n@@ -21,7 +21,7 @@\n \n Copyright (C) 2012 Fredrik Johansson\n Copyright (C) 2015 Anubhav Srivastava\n- \n+\n ******************************************************************************\/\n \n #include \"fmpz_mat.h\"\n@@ -33,216 +33,184 @@\n {\n slong n = A->r;\n slong i,j;\n- if (n == 0)\n+\n+\n+ fmpz_mat_t window11, window12, window21, window22;\n+ fmpz_mat_t s1, s2, s3;\n+ fmpz_mat_t p1, p2, p3, p5, p6;\n+ fmpz_t sum, val;\n+\n+ slong m = n, x, iseven = 1; \n+\n+ if (n % 2 == 1)\n {\n- return;\n+ m = n - 1;\n+ iseven = 0;\n }\n- else if (n == 1)\n+\n+ fmpz_mat_init(s1, m\/2, m\/2);\n+ fmpz_mat_init(s2, m\/2, m\/2);\n+ fmpz_mat_init(s3, m\/2, m\/2);\n+ fmpz_mat_init(p1, m\/2, m\/2);\n+ fmpz_mat_init(p2, m\/2, m\/2);\n+ fmpz_mat_init(p3, m\/2, m\/2);\n+ fmpz_mat_init(p5, m\/2, m\/2);\n+ fmpz_mat_init(p6, m\/2, m\/2);\n+\n+ fmpz_mat_window_init(window11, A, 0, 0, m\/2, m\/2);\n+ fmpz_mat_window_init(window12, A, 0, m\/2, m\/2, m);\n+ fmpz_mat_window_init(window21, A, m\/2, 0, m, m\/2);\n+ fmpz_mat_window_init(window22, A, m\/2, m\/2, m, m);\n+\n+ fmpz_mat_add(s1, window22, window12);\n+ fmpz_mat_sqr(p1, s1);\n+\n+ fmpz_mat_sub(s2, window22, window21);\n+ fmpz_mat_sqr(p2, s2);\n+\n+ fmpz_mat_add(s3, s2, window12);\n+ fmpz_mat_sqr(p3, s3); \n+\n+ fmpz_mat_sub(s1, s3, window11);\n+ fmpz_mat_mul(p6, s1, window12);\n+ fmpz_mat_mul(s3, window21, s1);\n+\n+ fmpz_mat_mul(p5, window12, window21);\n+ fmpz_mat_add(s1, p3, p5);\n+ fmpz_mat_sub(s2, p1, s1);\n+\n+ fmpz_mat_sub(p3, s2, s3);\n+ fmpz_mat_sub(s3, s1, p2);\n+ fmpz_mat_sqr(s1, window11);\n+\n+ fmpz_mat_add(p1, s1, p5);\n+ fmpz_mat_add(p5, p2, s2);\n+ fmpz_mat_sub(p2, s3, p6);\n+\n+ if (iseven == 1)\n {\n- fmpz_mul(E(B, 0, 0), E(A, 0, 0), E(A, 0, 0));\n- }\n- else if (n == 2)\n- {\n- fmpz_t t, u;\n-\n-\n- fmpz_init(t);\n- fmpz_init(u);\n-\n- fmpz_add(t, E(A, 0, 0), E(A, 1, 1));\n- fmpz_mul(u, E(A, 0, 1), E(A, 1, 0));\n-\n- fmpz_mul(E(B, 0, 0), E(A, 0, 0), E(A, 0, 0));\n- fmpz_add(E(B, 0, 0), E(B, 0, 0), u);\n-\n- fmpz_mul(E(B, 1, 1), E(A, 1, 1), E(A, 1, 1));\n- fmpz_add(E(B, 1, 1), E(B, 1, 1), u);\n-\n- fmpz_mul(E(B, 0, 1), E(A, 0, 1), t);\n- fmpz_mul(E(B, 1, 0), E(A, 1, 0), t);\n-\n- fmpz_clear(t);\n- fmpz_clear(u);\n+ for (i = 0; i < n\/2; ++i)\n+ {\n+ for (j = 0; j < n\/2; ++j)\n+ {\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p1, i, j));\n+ }\n+ }\n+\n+ for (i = n\/2; i < n; ++i)\n+ {\n+ for (j = 0; j < n\/2; ++j)\n+ {\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - n\/2, j));\n+ }\n+ }\n+\n+ for (i = 0; i < n\/2; ++i)\n+ {\n+ for (j = n\/2; j < n; ++j)\n+ {\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p2, i, j - n\/2));\n+ }\n+ }\n+\n+ for (i = n\/2; i < n; ++i)\n+ {\n+ for (j = n\/2; j < n; ++j)\n+ {\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p5, i - n\/2, j - n\/2));\n+ }\n+ }\n }\n else\n {\n- fmpz_mat_t window11, window12, window21, window22;\n- fmpz_mat_t s1, s2, s3;\n- fmpz_mat_t p1, p2, p3, p5, p6;\n- fmpz_t sum, val;\n-\n- slong m = n, x, iseven = 1; \n- \n- if (n % 2 == 1)\n- {\n- m = n - 1;\n- iseven = 0;\n- }\n-\n- fmpz_mat_init(s1, m\/2, m\/2);\n- fmpz_mat_init(s2, m\/2, m\/2);\n- fmpz_mat_init(s3, m\/2, m\/2);\n- fmpz_mat_init(p1, m\/2, m\/2);\n- fmpz_mat_init(p2, m\/2, m\/2);\n- fmpz_mat_init(p3, m\/2, m\/2);\n- fmpz_mat_init(p5, m\/2, m\/2);\n- fmpz_mat_init(p6, m\/2, m\/2);\n-\n- fmpz_mat_window_init(window11, A, 0, 0, m\/2, m\/2);\n- fmpz_mat_window_init(window12, A, 0, m\/2, m\/2, m);\n- fmpz_mat_window_init(window21, A, m\/2, 0, m, m\/2);\n- fmpz_mat_window_init(window22, A, m\/2, m\/2, m, m);\n-\n- fmpz_mat_add(s1, window22, window12);\n- fmpz_mat_sqr(p1, s1);\n- \n- fmpz_mat_sub(s2, window22, window21);\n- fmpz_mat_sqr(p2, s2);\n- \n- fmpz_mat_add(s3, s2, window12);\n- fmpz_mat_sqr(p3, s3); \n- \n- fmpz_mat_sub(s1, s3, window11);\n- fmpz_mat_mul(p6, s1, window12);\n- fmpz_mat_mul(s3, window21, s1);\n- \n- fmpz_mat_mul(p5, window12, window21);\n- fmpz_mat_add(s1, p3, p5);\n- fmpz_mat_sub(s2, p1, s1);\n- \n- fmpz_mat_sub(p3, s2, s3);\n- fmpz_mat_sub(s3, s1, p2);\n- fmpz_mat_sqr(s1, window11);\n-\n- fmpz_mat_add(p1, s1, p5);\n- fmpz_mat_add(p5, p2, s2);\n- fmpz_mat_sub(p2, s3, p6);\n-\n- if (iseven == 1)\n- {\n- for (i = 0; i < n\/2; ++i)\n- {\n- for (j = 0; j < n\/2; ++j)\n- {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p1, i, j));\n- }\n- }\n-\n- for (i = n\/2; i < n; ++i)\n- {\n- for (j = 0; j < n\/2; ++j)\n- {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - n\/2, j));\n- }\n- }\n-\n- for (i = 0; i < n\/2; ++i)\n- {\n- for (j = n\/2; j < n; ++j)\n- {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p2, i, j - n\/2));\n- }\n- }\n-\n- for (i = n\/2; i < n; ++i)\n- {\n- for (j = n\/2; j < n; ++j)\n- {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p5, i - n\/2, j - n\/2));\n- }\n- }\n- }\n- else\n- {\n- fmpz_mat_t temp_A, cache_A;\n- \n- fmpz_mat_init(temp_A, n, n);\n- fmpz_mat_init(cache_A, n, n);\n-\n- fmpz_init(sum);\n- fmpz_init(val);\n- \n- fmpz_mat_set(temp_A, A);\n-\n-\n- for (i = 0; i < n; ++i)\n- {\n- for (j = 0; j < n; ++j)\n- {\n- fmpz_mul(fmpz_mat_entry(cache_A, i, j), fmpz_mat_entry(A, i, n - 1), fmpz_mat_entry(A, n - 1, j)); \n- }\n- }\n-\n- for (i = 0; i < n; ++i)\n- {\n- fmpz_zero(sum);\n- for (x = 0; x < n; ++x)\n- {\n- fmpz_mul(val, fmpz_mat_entry(temp_A, n - 1, x), fmpz_mat_entry(temp_A, x, i));\n- fmpz_add(sum, sum, val);\n- }\n- fmpz_set(fmpz_mat_entry(B, n - 1, i), sum);\n- }\n-\n- for (i = 0; i < n; ++i)\n- {\n- fmpz_zero(sum);\n- for (x = 0; x < n; ++x)\n- {\n- fmpz_mul(val, fmpz_mat_entry(temp_A, x, n - 1), fmpz_mat_entry(temp_A, i, x));\n- fmpz_add(sum, sum, val);\n- }\n- fmpz_set(fmpz_mat_entry(B, i, n - 1), sum);\n- }\n-\n- for (i = 0; i < m\/2; ++i)\n- {\n- for (j = 0; j < m\/2; ++j)\n- {\n- fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p1, i, j), fmpz_mat_entry(cache_A, i, j));\n- }\n- }\n- for (i = m\/2; i < m; ++i)\n- {\n- for (j = 0; j < m\/2; ++j)\n- {\n- fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - m\/2, j), fmpz_mat_entry(cache_A, i, j));\n- }\n- }\n- for (i = 0; i < m\/2; ++i)\n- {\n- for (j = m\/2; j < m; ++j)\n- {\n- fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p2, i, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n- }\n- }\n- for (i = m\/2; i < m; ++i)\n- {\n- for (j = m\/2; j < m; ++j)\n- {\n- fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p5, i - m\/2, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n- }\n- }\n-\n- fmpz_clear(sum);\n- fmpz_clear(val);\n- \n- fmpz_mat_clear(temp_A);\n- fmpz_mat_clear(cache_A);\n-\n- }\n-\n- fmpz_mat_window_clear(window11);\n- fmpz_mat_window_clear(window12);\n- fmpz_mat_window_clear(window21);\n- fmpz_mat_window_clear(window22);\n- fmpz_mat_clear(s1);\n- fmpz_mat_clear(s2);\n- fmpz_mat_clear(s3);\n- fmpz_mat_clear(p1);\n- fmpz_mat_clear(p2);\n- fmpz_mat_clear(p3);\n- fmpz_mat_clear(p5);\n- fmpz_mat_clear(p6);\n+ fmpz_mat_t temp_A, cache_A;\n+\n+ fmpz_mat_init(temp_A, n, n);\n+ fmpz_mat_init(cache_A, n, n);\n+\n+ fmpz_init(sum);\n+ fmpz_init(val);\n+\n+ fmpz_mat_set(temp_A, A);\n+\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ for (j = 0; j < n; ++j)\n+ {\n+ fmpz_mul(fmpz_mat_entry(cache_A, i, j), fmpz_mat_entry(A, i, n - 1), fmpz_mat_entry(A, n - 1, j)); \n+ }\n+ }\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ fmpz_zero(sum);\n+ for (x = 0; x < n; ++x)\n+ {\n+ fmpz_mul(val, fmpz_mat_entry(temp_A, n - 1, x), fmpz_mat_entry(temp_A, x, i));\n+ fmpz_add(sum, sum, val);\n+ }\n+ fmpz_set(fmpz_mat_entry(B, n - 1, i), sum);\n+ }\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ fmpz_zero(sum);\n+ for (x = 0; x < n; ++x)\n+ {\n+ fmpz_mul(val, fmpz_mat_entry(temp_A, x, n - 1), fmpz_mat_entry(temp_A, i, x));\n+ fmpz_add(sum, sum, val);\n+ }\n+ fmpz_set(fmpz_mat_entry(B, i, n - 1), sum);\n+ }\n+\n+ for (i = 0; i < m\/2; ++i)\n+ {\n+ for (j = 0; j < m\/2; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p1, i, j), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = m\/2; i < m; ++i)\n+ {\n+ for (j = 0; j < m\/2; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - m\/2, j), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = 0; i < m\/2; ++i)\n+ {\n+ for (j = m\/2; j < m; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p2, i, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = m\/2; i < m; ++i)\n+ {\n+ for (j = m\/2; j < m; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p5, i - m\/2, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+\n+ fmpz_clear(sum);\n+ fmpz_clear(val);\n+\n+ fmpz_mat_clear(temp_A);\n+ fmpz_mat_clear(cache_A);\n+\n }\n+\n+ fmpz_mat_window_clear(window11);\n+ fmpz_mat_window_clear(window12);\n+ fmpz_mat_window_clear(window21);\n+ fmpz_mat_window_clear(window22);\n+ fmpz_mat_clear(s1);\n+ fmpz_mat_clear(s2);\n+ fmpz_mat_clear(s3);\n+ fmpz_mat_clear(p1);\n+ fmpz_mat_clear(p2);\n+ fmpz_mat_clear(p3);\n+ fmpz_mat_clear(p5);\n+ fmpz_mat_clear(p6);\n }\n"} {"commit":"21172ee38a714b9b3c8d9552b2880d454633201a","subject":"Time until response object: a week.","message":"Time until response object: a week.\n","repos":"qpfiffer\/waifu.xyz,qpfiffer\/waifu.xyz,qpfiffer\/waifu.xyz,qpfiffer\/waifu.xyz","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/server.c\n+++ src\/server.c\n@@ -38,50 +38,56 @@\n \tconst char *message;\n } code_to_message;\n \n-typedef struct http_request {\n+typedef struct {\n \tchar verb[VERB_SIZE];\n \tchar resource[128];\n } http_request;\n \n+typedef struct {\n+\tchar *out;\n+\tsize_t outsize;\n+\tvoid *extra_data;\n+} http_response;\n+\n typedef struct route {\n \tchar verb[VERB_SIZE];\n \tchar route_match[256];\n-\tint (*handler)(const http_request *request, char **out, size_t *outsize);\n-\tvoid (*cleanup)(char **to_clean);\n+\tint (*handler)(const http_request *request, http_response *response);\n+\tvoid (*cleanup)(http_response *response);\n } route;\n \n \/* Various handlers for our routes: *\/\n-static int static_handler(const http_request *request, char **out, size_t *outsize) {\n+static int static_handler(const http_request *request, http_response *response) {\n \tstruct stat st = {0};\n \tif (stat(request->resource + sizeof(char), &st) == -1) {\n-\t\t(*out) = \"<html><body><p>No such file.<\/p><\/body><\/html>\";\n-\t\t(*outsize) = strlen(\"<html><body><p>No such file.<\/p><\/body><\/html>\");\n+\t\tresponse->out = \"<html><body><p>No such file.<\/p><\/body><\/html>\";\n+\t\tresponse->outsize= strlen(\"<html><body><p>No such file.<\/p><\/body><\/html>\");\n \t\treturn 404;\n \t}\n-\t(*out) = \"xxx\";\n-\t(*outsize) = strlen(\"xxx\");\n+\tresponse->out = \"xxx\";\n+\tresponse->outsize = strlen(\"xxx\");\n \treturn 200;\n }\n \n-static int index_handler(const http_request *request, char **out, size_t *outsize) {\n+static int index_handler(const http_request *request, http_response *response) {\n \treturn 200;\n }\n \n-static int r_404_handler(const http_request *request, char **out, size_t *outsize) {\n-\t(*out) = \"<h1>\\\"Welcome to Die|<\/h1>\";\n-\t(*outsize) = strlen(\"<h1>\\\"Welcome to Die|<\/h1>\");\n+static int r_404_handler(const http_request *request, http_response *response) {\n+\tresponse->out = \"<h1>\\\"Welcome to Die|<\/h1>\";\n+\tresponse->outsize = strlen(\"<h1>\\\"Welcome to Die|<\/h1>\");\n \treturn 404;\n }\n \n \/* Cleanup functions used after handlers have made a bunch of bullshit: *\/\n-\/\/static void heap_cleanup(char **out) {\n+\/\/static void heap_cleanup(http_response *response) {\n \/\/\tfree(*out);\n \/\/}\n \n-static void mmap_cleanup(char **out) {\n-}\n-\n-static void stack_cleanup(char **out) {\n+static void mmap_cleanup(http_response *response) {\n+}\n+\n+static void stack_cleanup(http_response *response) {\n \t\/* Do nothing. *\/\n }\n \n@@ -135,7 +141,7 @@\n static int respond(const int accept_fd) {\n \tchar to_read[MAX_READ_LEN] = {0};\n \tchar *actual_response = NULL;\n-\tchar *data = NULL;\n+\thttp_response response = {0};\n \tconst route *matching_route = NULL;\n \n \tint rc = recv(accept_fd, to_read, MAX_READ_LEN, 0);\n@@ -180,9 +186,7 @@\n \t\tmatching_route = &r_404_route;\n \n \t\/* Run the handler through with the data we have: *\/\n-\tdata = NULL;\n-\tsize_t dsize = 0;\n-\tconst int response_code = matching_route->handler(&request, &data, &dsize);\n+\tconst int response_code = matching_route->handler(&request, &response);\n \n \t\/* Figure out what header we need to use: *\/\n \tconst code_to_message *matched_response = NULL;\n@@ -198,11 +202,11 @@\n \tassert(matched_response != NULL);\n \n \t\/* Embed the handler's text into the header: *\/\n-\tconst size_t integer_length = INT_LEN(dsize);\n-\tsize_t actual_response_siz = dsize + strlen(matched_response->message) + integer_length;\n+\tconst size_t integer_length = INT_LEN(response.outsize);\n+\tsize_t actual_response_siz = response.outsize + strlen(matched_response->message) + integer_length;\n \tactual_response = malloc(actual_response_siz + 1);\n \tmemset(actual_response, '\\0', actual_response_siz + 1);\n-\tsnprintf(actual_response, actual_response_siz, matched_response->message, dsize, data);\n+\tsnprintf(actual_response, actual_response_siz, matched_response->message, response.outsize, response.out);\n \n \t\/* Send that shit over the wire: *\/\n \trc = send(accept_fd, actual_response, actual_response_siz - strlen(\"%zu\") - strlen(\"%s\"), 0);\n@@ -210,14 +214,14 @@\n \t\tlog_msg(LOG_ERR, \"Could not send response.\");\n \t\tgoto error;\n \t}\n-\tmatching_route->cleanup(&data);\n+\tmatching_route->cleanup(&response);\n \tfree(actual_response);\n \n \treturn 0;\n \n error:\n \tif (matching_route != NULL)\n-\t\tmatching_route->cleanup(&data);\n+\t\tmatching_route->cleanup(&response);\n \tfree(actual_response);\n \treturn -1;\n }\n"} {"commit":"bec55921ea3da9942f1ed984de6bd5b47b7d5a07","subject":"Added extra character to LLC miss column in monitoring output.","message":"Added extra character to LLC miss column in monitoring output.\n\nChange-Id: Ia4899bb0ffa0e2402e11ed4a63d85faca65ecce9\n","repos":"01org\/intel-cmt-cat,01org\/intel-cmt-cat,01org\/intel-cmt-cat","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- monitor.c\n+++ monitor.c\n@@ -1040,13 +1040,13 @@\n sel_events_max & PQOS_MON_EVENT_RMEM_BW);\n \n if (!process_mode())\n- fprintf(fp, \"\\n%8.8s %5.2f %6uk%s\",\n+ fprintf(fp, \"\\n%8.8s %5.2f %7uk%s\",\n (char *)mon_data->context,\n mon_data->values.ipc,\n (unsigned)mon_data->values.llc_misses_delta\/1000,\n data);\n else\n- fprintf(fp, \"\\n%6u %6s %6.2f %6uk%s\",\n+ fprintf(fp, \"\\n%6u %6s %6.2f %7uk%s\",\n mon_data->pid, \"N\/A\",\n mon_data->values.ipc,\n (unsigned)mon_data->values.llc_misses_delta\/1000,\n@@ -1207,9 +1207,9 @@\n \n if (istext) {\n if (!process_mode())\n- strncpy(hdr, \" CORE IPC MISSES\", sz_hdr - 1);\n+ strncpy(hdr, \" CORE IPC MISSES\", sz_hdr - 1);\n else\n- strncpy(hdr, \" PID CORE IPC MISSES\",\n+ strncpy(hdr, \" PID CORE IPC MISSES\",\n sz_hdr - 1);\n if (sel_events_max & PQOS_MON_EVENT_L3_OCCUP)\n strncat(hdr, \" LLC[KB]\", sz_hdr - strlen(hdr) - 1);\n"} {"commit":"1aa54bca6ee0d07ebcafb8ca8074b624d80724aa","subject":"tracing: Sanitize value returned from write(trace_marker, \"...\", len)","message":"tracing: Sanitize value returned from write(trace_marker, \"...\", len)\n\nWhen userspace code writes non-new-line-terminated string to trace_marker\nfile, write handler appends new-line and returns number of bytes written\nto trace buffer, so\nwrite(fd, \"abc\", 3) will return 4\n\nThat's unexpected and unfortunately it confuses glibc's fprintf function.\n\nExample:\nint main() {\n fprintf(stderr, \"abc\");\n return 0;\n}\n\n$ gcc test.c -o test\n$ echo mmiotrace > \/sys\/kernel\/debug\/tracing\/current_tracer\n$ .\/test 2>\/sys\/kernel\/debug\/tracing\/trace_marker\n\nresults in infinite loop:\nwrite(fd, \"abc\", 3) = 4\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\nwrite(fd, \"\", 1) = 0\n(...)\n\n...and kernel trace buffer full of empty markers.\n\nFix it by sanitizing write return value.\n\nSigned-off-by: Marcin Slusarz <bc4bbf83189bf2aa3b4ae434673d425054bbfadd@gmail.com>\nLKML-Reference: <1c5d7f646eac70653468ede6b3e3a66086197d99@joi.lan>\nCc: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@redhat.com>\nSigned-off-by: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/trace\/trace.c\n+++ kernel\/trace\/trace.c\n@@ -3498,6 +3498,7 @@\n \t\t\t\t\tsize_t cnt, loff_t *fpos)\n {\n \tchar *buf;\n+\tsize_t written;\n \n \tif (tracing_disabled)\n \t\treturn -EINVAL;\n@@ -3519,11 +3520,15 @@\n \t} else\n \t\tbuf[cnt] = '\\0';\n \n-\tcnt = mark_printk(\"%s\", buf);\n+\twritten = mark_printk(\"%s\", buf);\n \tkfree(buf);\n-\t*fpos += cnt;\n-\n-\treturn cnt;\n+\t*fpos += written;\n+\n+\t\/* don't tell userspace we wrote more - it might confuse them *\/\n+\tif (written > cnt)\n+\t\twritten = cnt;\n+\n+\treturn written;\n }\n \n static int tracing_clock_show(struct seq_file *m, void *v)\n"} {"commit":"6a2e4098331077037cb9c197f88a54f46d870068","subject":"Upstream: unconditional parsing of last_modified_time.","message":"Upstream: unconditional parsing of last_modified_time.\n\nThis fixes at least the following cases, where no last_modified_time\n(assuming caching is not enabled) resulted in incorrect behaviour:\n\n- slice filter and If-Range requests (ticket #1357);\n- If-Range requests with proxy_force_ranges;\n- expires modified.\n","repos":"hy0kl\/nginx,hy0kl\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/ngx_http_upstream.c\n+++ src\/http\/ngx_http_upstream.c\n@@ -4390,15 +4390,8 @@\n u = r->upstream;\n \n u->headers_in.last_modified = h;\n-\n-#if (NGX_HTTP_CACHE)\n-\n- if (u->cacheable) {\n- u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,\n- h->value.len);\n- }\n-\n-#endif\n+ u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,\n+ h->value.len);\n \n return NGX_OK;\n }\n@@ -4940,15 +4933,8 @@\n *ho = *h;\n \n r->headers_out.last_modified = ho;\n-\n-#if (NGX_HTTP_CACHE)\n-\n- if (r->upstream->cacheable) {\n- r->headers_out.last_modified_time =\n+ r->headers_out.last_modified_time =\n r->upstream->headers_in.last_modified_time;\n- }\n-\n-#endif\n \n return NGX_OK;\n }\n"} {"commit":"4b4b2a04bc45391736e2af045a9c9d1e54854f52","subject":"Bodrato square function for matrices","message":"Bodrato square function for matrices\n","repos":"dsroche\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,jpflori\/flint2,wbhart\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,jpflori\/flint2,jpflori\/flint2,dsroche\/flint2,jpflori\/flint2,dsroche\/flint2,fredrik-johansson\/flint2,dsroche\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmpz_mat\/sqr_bodrato.c\n+++ fmpz_mat\/sqr_bodrato.c\n@@ -1,27 +1,27 @@\n \/*=============================================================================\n \n- This file is part of FLINT.\n-\n- FLINT is free software; you can redistribute it and\/or modify\n- it under the terms of the GNU General Public License as published by\n- the Free Software Foundation; either version 2 of the License, or\n- (at your option) any later version.\n-\n- FLINT is distributed in the hope that it will be useful,\n- but WITHOUT ANY WARRANTY; without even the implied warranty of\n- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n- GNU General Public License for more details.\n-\n- You should have received a copy of the GNU General Public License\n- along with FLINT; if not, write to the Free Software\n- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n-\n-=============================================================================*\/\n+ This file is part of FLINT.\n+\n+ FLINT is free software; you can redistribute it and\/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation; either version 2 of the License, or\n+ (at your option) any later version.\n+\n+ FLINT is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License\n+ along with FLINT; if not, write to the Free Software\n+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n+\n+ =============================================================================*\/\n \/******************************************************************************\n \n- Copyright (C) 2012 Fredrik Johansson\n-\n-******************************************************************************\/\n+ Copyright (C) 2012 Fredrik Johansson\n+\n+ ******************************************************************************\/\n \n #include \"fmpz_mat.h\"\n \n@@ -43,7 +43,7 @@\n else if (n == 2)\n {\n fmpz_t t, u;\n- \n+\n \n fmpz_init(t);\n fmpz_init(u);\n@@ -64,64 +64,71 @@\n fmpz_clear(u);\n }\n else\n- { \n- if (n%2 == 0)\n+ {\n+ fmpz_mat_t window_A, window11, window12, window21, window22;\n+ fmpz_mat_t s1, s2, s3, s4;\n+ fmpz_mat_t p1, p2, p3, p4, p5, p6, p7;\n+ fmpz_t sum, val;\n+\n+ slong m = n, x, iseven = 1; \n+ \n+ if (n % 2 == 1)\n {\n- fmpz_mat_t window11, window12, window21, window22;\n- fmpz_mat_t s1, s2, s3, s4;\n- fmpz_mat_t p1, p2, p3, p4, p5, p6, p7;\n-\n- fmpz_mat_init(s1, n\/2, n\/2);\n- fmpz_mat_init(s2, n\/2, n\/2);\n- fmpz_mat_init(s3, n\/2, n\/2);\n- fmpz_mat_init(s4, n\/2, n\/2);\n- fmpz_mat_init(p1, n\/2, n\/2);\n- fmpz_mat_init(p2, n\/2, n\/2);\n- fmpz_mat_init(p3, n\/2, n\/2);\n- fmpz_mat_init(p4, n\/2, n\/2);\n- fmpz_mat_init(p5, n\/2, n\/2);\n- fmpz_mat_init(p6, n\/2, n\/2);\n- fmpz_mat_init(p7, n\/2, n\/2);\n-\n- fmpz_mat_window_init(window11, A, 0, 0, n\/2, n\/2);\n- fmpz_mat_window_init(window12, A, 0, n\/2, n\/2, n);\n- fmpz_mat_window_init(window21, A, n\/2, 0, n, n\/2);\n- fmpz_mat_window_init(window22, A, n\/2, n\/2, n, n);\n- \n- \n- fmpz_mat_add(s1, window22, window12);\n- fmpz_mat_sub(s2, window22, window21);\n- fmpz_mat_add(s3, s2, window12);\n- fmpz_mat_sub(s4, s3, window11);\n- \n-\n- fmpz_mat_sqr_bodrato(p1, s1);\n- fmpz_mat_sqr_bodrato(p2, s2);\n- fmpz_mat_sqr_bodrato(p3, s3); \n- fmpz_mat_sqr_bodrato(p4, window11);\n- fmpz_mat_mul(p5, window12, window21);\n- fmpz_mat_mul(p6, s4, window12);\n- fmpz_mat_mul(p7, window21, s4);\n- \n-\n- fmpz_mat_zero(s1);\n- fmpz_mat_zero(s2);\n- fmpz_mat_zero(s3);\n- \n- fmpz_mat_add(s1, p3, p5);\n- fmpz_mat_sub(s2, p1, s1);\n- fmpz_mat_sub(s3, s1, p2);\n- \n- fmpz_mat_zero(s1);\n- fmpz_mat_zero(p1);\n- fmpz_mat_zero(p3);\n- fmpz_mat_zero(s4);\n- \n- fmpz_mat_add(p1, p4, p5);\n- fmpz_mat_sub(s1, s3, p6);\n- fmpz_mat_sub(p3, s2, p7);\n- fmpz_mat_add(s4, p2, s2);\n- \n+ m = n - 1;\n+ iseven = 0;\n+ }\n+\n+ fmpz_mat_init(s1, m\/2, m\/2);\n+ fmpz_mat_init(s2, m\/2, m\/2);\n+ fmpz_mat_init(s3, m\/2, m\/2);\n+ fmpz_mat_init(s4, m\/2, m\/2);\n+ fmpz_mat_init(p1, m\/2, m\/2);\n+ fmpz_mat_init(p2, m\/2, m\/2);\n+ fmpz_mat_init(p3, m\/2, m\/2);\n+ fmpz_mat_init(p4, m\/2, m\/2);\n+ fmpz_mat_init(p5, m\/2, m\/2);\n+ fmpz_mat_init(p6, m\/2, m\/2);\n+ fmpz_mat_init(p7, m\/2, m\/2);\n+\n+ fmpz_mat_window_init(window_A, A, 0, 0, m, m);\n+ fmpz_mat_window_init(window11, window_A, 0, 0, m\/2, m\/2);\n+ fmpz_mat_window_init(window12, window_A, 0, m\/2, m\/2, m);\n+ fmpz_mat_window_init(window21, window_A, m\/2, 0, m, m\/2);\n+ fmpz_mat_window_init(window22, window_A, m\/2, m\/2, m, m);\n+\n+ fmpz_mat_add(s1, window22, window12);\n+ fmpz_mat_sub(s2, window22, window21);\n+ fmpz_mat_add(s3, s2, window12);\n+ fmpz_mat_sub(s4, s3, window11);\n+\n+ fmpz_mat_sqr(p1, s1);\n+ fmpz_mat_sqr(p2, s2);\n+ fmpz_mat_sqr(p3, s3); \n+ fmpz_mat_sqr(p4, window11);\n+ fmpz_mat_mul(p5, window12, window21);\n+ fmpz_mat_mul(p6, s4, window12);\n+ fmpz_mat_mul(p7, window21, s4);\n+\n+ fmpz_mat_zero(s1);\n+ fmpz_mat_zero(s2);\n+ fmpz_mat_zero(s3);\n+\n+ fmpz_mat_add(s1, p3, p5);\n+ fmpz_mat_sub(s2, p1, s1);\n+ fmpz_mat_sub(s3, s1, p2);\n+\n+ fmpz_mat_zero(s1);\n+ fmpz_mat_zero(p1);\n+ fmpz_mat_zero(p3);\n+ fmpz_mat_zero(s4);\n+\n+ fmpz_mat_add(p1, p4, p5);\n+ fmpz_mat_sub(s1, s3, p6);\n+ fmpz_mat_sub(p3, s2, p7);\n+ fmpz_mat_add(s4, p2, s2);\n+\n+ if (iseven == 1)\n+ {\n for (i = 0; i < n\/2; ++i)\n {\n for (j = 0; j < n\/2; ++j)\n@@ -134,7 +141,7 @@\n {\n for (j = 0; j < n\/2; ++j)\n {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i-n\/2, j));\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - n\/2, j));\n }\n }\n \n@@ -142,7 +149,7 @@\n {\n for (j = n\/2; j < n; ++j)\n {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s1, i, j-n\/2));\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s1, i, j - n\/2));\n }\n }\n \n@@ -150,222 +157,105 @@\n {\n for (j = n\/2; j < n; ++j)\n {\n- fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s4, i-n\/2, j-n\/2));\n- }\n- }\n- \n- fmpz_mat_window_clear(window11);\n- fmpz_mat_window_clear(window12);\n- fmpz_mat_window_clear(window21);\n- fmpz_mat_window_clear(window22);\n- \n- fmpz_mat_clear(s1);\n- fmpz_mat_clear(s2);\n- fmpz_mat_clear(s3);\n- fmpz_mat_clear(s4);\n- fmpz_mat_clear(p1);\n- fmpz_mat_clear(p2);\n- fmpz_mat_clear(p3);\n- fmpz_mat_clear(p4);\n- fmpz_mat_clear(p5);\n- fmpz_mat_clear(p6);\n- fmpz_mat_clear(p7);\n-\n+ fmpz_set(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s4, i - n\/2, j - n\/2));\n+ }\n+ }\n }\n else\n {\n- fmpz_mat_t window_A;\n- fmpz_mat_window_init(window_A, A, 0, 0, n-1, n-1);\n+ fmpz_mat_t temp_A, cache_A;\n \n- slong m = window_A->r, x;\n- \n- fmpz_t sum, val, temp;\n- \n- fmpz_mat_t window11, window12, window21, window22;\n- fmpz_mat_t s1, s2, s3, s4;\n- fmpz_mat_t p1, p2, p3, p4, p5, p6, p7;\n-\n- fmpz_mat_init(s1, m\/2, m\/2);\n- fmpz_mat_init(s2, m\/2, m\/2);\n- fmpz_mat_init(s3, m\/2, m\/2);\n- fmpz_mat_init(s4, m\/2, m\/2);\n- fmpz_mat_init(p1, m\/2, m\/2);\n- fmpz_mat_init(p2, m\/2, m\/2);\n- fmpz_mat_init(p3, m\/2, m\/2);\n- fmpz_mat_init(p4, m\/2, m\/2);\n- fmpz_mat_init(p5, m\/2, m\/2);\n- fmpz_mat_init(p6, m\/2, m\/2);\n- fmpz_mat_init(p7, n\/2, n\/2);\n-\n- fmpz_mat_window_init(window11, window_A, 0, 0, m\/2, m\/2);\n- fmpz_mat_window_init(window12, window_A, 0, m\/2, m\/2, m);\n- fmpz_mat_window_init(window21, window_A, m\/2, 0, m, m\/2);\n- fmpz_mat_window_init(window22, window_A, m\/2, m\/2, m, m);\n- \n+ fmpz_mat_init(temp_A, n, n);\n+ fmpz_mat_init(cache_A, n, n);\n+\n+ fmpz_init(sum);\n+ fmpz_init(val);\n \n- fmpz_mat_add(s1, window22, window12);\n- fmpz_mat_sub(s2, window22, window21);\n- fmpz_mat_add(s3, s2, window12);\n- fmpz_mat_sub(s4, s3, window11);\n- \n-\n- fmpz_mat_sqr_bodrato(p1, s1);\n- fmpz_mat_sqr_bodrato(p2, s2);\n- fmpz_mat_sqr_bodrato(p3, s3); \n- fmpz_mat_sqr_bodrato(p4, window11);\n- fmpz_mat_mul(p5, window12, window21);\n- fmpz_mat_mul(p6, s4, window12);\n- fmpz_mat_mul(p7, window21, s4);\n+ fmpz_mat_set(temp_A, A);\n+\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ for (j = 0; j < n; ++j)\n+ {\n+ fmpz_mul(fmpz_mat_entry(cache_A, i, j), fmpz_mat_entry(A, i, n - 1), fmpz_mat_entry(A, n - 1, j)); \n+ }\n+ }\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ fmpz_zero(sum);\n+ for (x = 0; x < n; ++x)\n+ {\n+ fmpz_mul(val, fmpz_mat_entry(temp_A, n - 1, x), fmpz_mat_entry(temp_A, x, i));\n+ fmpz_add(sum, sum, val);\n+ }\n+ fmpz_set(fmpz_mat_entry(B, n - 1, i), sum);\n+ }\n+\n+ for (i = 0; i < n; ++i)\n+ {\n+ fmpz_zero(sum);\n+ for (x = 0; x < n; ++x)\n+ {\n+ fmpz_mul(val, fmpz_mat_entry(temp_A, x, n - 1), fmpz_mat_entry(temp_A, i, x));\n+ fmpz_add(sum, sum, val);\n+ }\n+ fmpz_set(fmpz_mat_entry(B, i, n - 1), sum);\n+ }\n+\n+ for (i = 0; i < m\/2; ++i)\n+ {\n+ for (j = 0; j < m\/2; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p1, i, j), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = m\/2; i < m; ++i)\n+ {\n+ for (j = 0; j < m\/2; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(p3, i - m\/2, j), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = 0; i < m\/2; ++i)\n+ {\n+ for (j = m\/2; j < m; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s1, i, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+ for (i = m\/2; i < m; ++i)\n+ {\n+ for (j = m\/2; j < m; ++j)\n+ {\n+ fmpz_add(fmpz_mat_entry(B, i, j), fmpz_mat_entry(s4, i - m\/2, j - m\/2), fmpz_mat_entry(cache_A, i, j));\n+ }\n+ }\n+\n+ fmpz_clear(sum);\n+ fmpz_clear(val);\n \n-\n- fmpz_mat_zero(s1);\n- fmpz_mat_zero(s2);\n- fmpz_mat_zero(s3);\n- \n- fmpz_mat_add(s1, p3, p5);\n- fmpz_mat_sub(s2, p1, s1);\n- fmpz_mat_sub(s3, s1, p2);\n- \n- fmpz_mat_zero(s1);\n- fmpz_mat_zero(p1);\n- fmpz_mat_zero(p3);\n- fmpz_mat_zero(s4);\n- \n- fmpz_mat_add(p1, p4, p5);\n- fmpz_mat_sub(s1, s3, p6);\n- fmpz_mat_sub(p3, s2, p7);\n- fmpz_mat_add(s4, p2, s2);\n- \n- for (i = 0; i < m\/2; ++i)\n- {\n- for (j = 0; j < m\/2; ++j)\n- {\n- fmpz_init(temp);\n- fmpz_init(val);\n-\n- fmpz_mul(val, fmpz_mat_entry(A, i, n-1), fmpz_mat_entry(A, n-1, j));\n- fmpz_add(temp, fmpz_mat_entry(p1, i, j), val);\n- fmpz_set(fmpz_mat_entry(B, i, j), temp);\n- \n- fmpz_clear(temp);\n- fmpz_clear(val);\n- }\n- }\n-\n- for (i = m\/2; i < m; ++i)\n- {\n- for (j = 0; j < m\/2; ++j)\n- {\n- fmpz_init(temp);\n- fmpz_init(val);\n-\n- fmpz_mul(val, fmpz_mat_entry(A, i, n-1), fmpz_mat_entry(A, n-1, j));\n- fmpz_add(temp, fmpz_mat_entry(p3, i-m\/2, j), val);\n- fmpz_set(fmpz_mat_entry(B, i, j), temp);\n- \n- fmpz_clear(temp);\n- fmpz_clear(val);\n-\n- }\n- }\n-\n- for (i = 0; i < m\/2; ++i)\n- {\n- for (j = m\/2; j < m; ++j)\n- {\n- fmpz_init(temp);\n- fmpz_init(val);\n-\n- fmpz_mul(val, fmpz_mat_entry(A, i, n-1), fmpz_mat_entry(A, n-1, j));\n- fmpz_add(temp, fmpz_mat_entry(s1, i, j-m\/2), val);\n- fmpz_set(fmpz_mat_entry(B, i, j), temp);\n- \n- fmpz_clear(temp);\n- fmpz_clear(val);\n-\n- }\n- }\n-\n- for (i = m\/2; i < m; ++i)\n- {\n- for (j = m\/2; j < m; ++j)\n- {\n- fmpz_init(temp);\n- fmpz_init(val);\n-\n- fmpz_mul(val, fmpz_mat_entry(A, i, n-1), fmpz_mat_entry(A, n-1, j));\n- fmpz_add(temp, fmpz_mat_entry(s4, i-m\/2, j-m\/2), val);\n- fmpz_set(fmpz_mat_entry(B, i, j), temp);\n- \n- fmpz_clear(temp);\n- fmpz_clear(val);\n- }\n- }\n- \n- fmpz_mat_window_clear(window11);\n- fmpz_mat_window_clear(window12);\n- fmpz_mat_window_clear(window21);\n- fmpz_mat_window_clear(window22);\n- \n- fmpz_mat_clear(s1);\n- fmpz_mat_clear(s2);\n- fmpz_mat_clear(s3);\n- fmpz_mat_clear(s4);\n- fmpz_mat_clear(p1);\n- fmpz_mat_clear(p2);\n- fmpz_mat_clear(p3);\n- fmpz_mat_clear(p4);\n- fmpz_mat_clear(p5);\n- fmpz_mat_clear(p6);\n- fmpz_mat_clear(p7);\n-\n-\n- \/* Matrix Peeling *\/\n- for (i = 0; i < n; ++i)\n- {\n- fmpz_init(sum);\n- for (x = 0; x < n; ++x)\n- {\n- fmpz_init(val);\n- fmpz_mul(val, fmpz_mat_entry(A, n-1, x), fmpz_mat_entry(A, x, i)); \n- fmpz_add(sum, sum, val); \n- fmpz_clear(val);\n- }\n- fmpz_set(fmpz_mat_entry(B, n-1, i), sum);\n- fmpz_clear(sum);\n- }\n-\n- for (i = 0; i < n; ++i)\n- {\n- fmpz_init(sum);\n- for (x = 0; x < n; ++x)\n- {\n- fmpz_init(val);\n- fmpz_mul(val, fmpz_mat_entry(A, x, n-1), fmpz_mat_entry(A, i, x)); \n- fmpz_add(sum, sum, val);\n- fmpz_clear(val);\n- }\n- fmpz_set(fmpz_mat_entry(B, i, n-1), sum);\n- fmpz_clear(sum);\n- }\n-\n- fmpz_mat_window_clear(window_A);\n- \n- \n- \/*\n- fmpz_mat_t D;\n- fmpz_mat_init(D, n, n);\n- fmpz_mat_mul(D, A, A);\n-\n- flint_printf(\"\\nA:\\n\");\n- fmpz_mat_print_pretty(A);\n- flint_printf(\"\\nB:\\n\");\n- fmpz_mat_print_pretty(B);\n- flint_printf(\"\\nC:\\n\");\n- fmpz_mat_print_pretty(D);\n- flint_printf(\"\\n\");\n- fmpz_mat_clear(D);*\/\n+ fmpz_mat_clear(temp_A);\n+ fmpz_mat_clear(cache_A);\n \n }\n+\n+ fmpz_mat_window_clear(window_A);\n+ fmpz_mat_window_clear(window11);\n+ fmpz_mat_window_clear(window12);\n+ fmpz_mat_window_clear(window21);\n+ fmpz_mat_window_clear(window22);\n+ fmpz_mat_clear(s1);\n+ fmpz_mat_clear(s2);\n+ fmpz_mat_clear(s3);\n+ fmpz_mat_clear(s4);\n+ fmpz_mat_clear(p1);\n+ fmpz_mat_clear(p2);\n+ fmpz_mat_clear(p3);\n+ fmpz_mat_clear(p4);\n+ fmpz_mat_clear(p5);\n+ fmpz_mat_clear(p6);\n+ fmpz_mat_clear(p7);\n }\n }\n"} {"commit":"44292634c9f27dc75d6e709fbf055a01c00c8466","subject":"Initial logger test","message":"Initial logger test\n","repos":"shookees\/http_server,shookees\/http_server,shookees\/http_server","returncode":1,"stderr":"error: pathspec 'tests\/test_logger.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- tests\/test_logger.c\n+++ tests\/test_logger.c\n@@ -0,0 +1,91 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <unistd.h>\n+#include <string.h>\n+#include <sys\/stat.h>\n+#include \"minunit.h\"\n+#include \"..\/src\/logger.h\"\n+\n+int tests_run = 0;\n+\n+int is_in_file(const char * filename, char * substr)\n+{\n+ FILE *f = fopen(filename, \"rb\");\n+ \/\/find out the size\n+ fseek(f, 0L, SEEK_END);\n+ int file_size = ftell(f);\n+ \/\/get back and start reading\n+ fseek(f, 0L, SEEK_SET);\n+ char *str = malloc(file_size * sizeof(char));\n+ fread(str, sizeof(char), file_size, f);\n+ fclose(f);\n+ if (strstr(str, substr) == NULL)\n+ {\n+ free (str);\n+ return 0;\n+ }\n+ else\n+ {\n+ free (str);\n+ return 1;\n+ }\n+}\n+\n+\/*\n+ * Test simple output\n+ *\/\n+static char * test_logging_output()\n+{\n+ printf(\"Test logging: output\\n\");\n+ \/* intercept stdout *\/\n+ \/* Solution by: http:\/\/stackoverflow.com\/a\/17071777\/552214 *\/\n+ FILE *fp;\n+ char * tmp_filename;\n+ int stdout_bak;\/\/stdout fd backup\n+\n+ tmp_filename = tmpnam(NULL);\n+ stdout_bak = dup(fileno(stdout));\n+ fp = fopen(tmp_filename, \"w\");\n+\n+ dup2(fileno(fp), fileno(stdout));\n+ log_info(\"Testing info\");\n+ log_error(\"Testing error\");\n+ log_debug(\"Testing debug\");\n+ fflush(stdout);\n+ fclose(fp);\n+\n+ dup2(stdout_bak, fileno(stdout));\n+\n+ mu_assert(\"Info tag not shown in log stdout\", is_in_file(tmp_filename, \"info\"));\n+ mu_assert(\"Error tag not shown in log stdout\", is_in_file(tmp_filename, \"error\"));\n+ mu_assert(\"Debug tag not shown in log stdout\", is_in_file(tmp_filename, \"debug\"));\n+ mu_assert(\"Info log message not in stdout\", is_in_file(tmp_filename, \"Testing info\"));\n+ mu_assert(\"Error log message not in stdout\", is_in_file(tmp_filename, \"Testing error\"));\n+ mu_assert(\"Debug log message not in stdout\", is_in_file(tmp_filename, \"Testing debug\"));\n+\n+ return 0;\n+}\n+\n+static char * all_tests()\n+{\n+ printf(\"===== TEST LOGGER =====\\n\");\n+ mu_run_test(test_logging_output);\n+ return 0;\n+}\n+\n+int main(int argc, char **argv)\n+{\n+ char *result = all_tests();\n+ if (result != 0)\n+ {\n+ printf(\"%s\\n\", result);\n+ }\n+ else\n+ {\n+ printf(\"ALL TESTS PASSED\\n\");\n+ }\n+\n+ printf(\"Tests run: %d\\n\", tests_run);\n+\n+ return result != 0;\n+}"} {"commit":"14a93c5a150500928d707f7ba3ded1ae1427dab6","subject":"Upstream: upstream argument in ngx_http_upstream_process_request().","message":"Upstream: upstream argument in ngx_http_upstream_process_request().\n\nIn case of filter finalization, r->upstream might be changed during\nthe ngx_event_pipe() call. Added an argument to preserve it while\ncalling the ngx_http_upstream_process_request() function.\n","repos":"hy0kl\/nginx,hy0kl\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/ngx_http_upstream.c\n+++ src\/http\/ngx_http_upstream.c\n@@ -76,7 +76,8 @@\n static void ngx_http_upstream_process_downstream(ngx_http_request_t *r);\n static void ngx_http_upstream_process_upstream(ngx_http_request_t *r,\n ngx_http_upstream_t *u);\n-static void ngx_http_upstream_process_request(ngx_http_request_t *r);\n+static void ngx_http_upstream_process_request(ngx_http_request_t *r,\n+ ngx_http_upstream_t *u);\n static void ngx_http_upstream_store(ngx_http_request_t *r,\n ngx_http_upstream_t *u);\n static void ngx_http_upstream_dummy_handler(ngx_http_request_t *r,\n@@ -3349,7 +3350,7 @@\n }\n }\n \n- ngx_http_upstream_process_request(r);\n+ ngx_http_upstream_process_request(r, u);\n }\n \n \n@@ -3417,18 +3418,17 @@\n }\n }\n \n- ngx_http_upstream_process_request(r);\n+ ngx_http_upstream_process_request(r, u);\n }\n \n \n static void\n-ngx_http_upstream_process_request(ngx_http_request_t *r)\n+ngx_http_upstream_process_request(ngx_http_request_t *r,\n+ ngx_http_upstream_t *u)\n {\n ngx_temp_file_t *tf;\n ngx_event_pipe_t *p;\n- ngx_http_upstream_t *u;\n-\n- u = r->upstream;\n+\n p = u->pipe;\n \n if (u->peer.connection) {\n"} {"commit":"3ff8f57ef32e3b1ddd407b65d474f610881bef34","subject":"Command \"r\" flag removed from commands not accessing the key space.","message":"Command \"r\" flag removed from commands not accessing the key space.\n\nThanks to @oranagra for the hint about misplaced 'r' flags.\n","repos":"xuguruogu\/redis,4396\/redis,xuguruogu\/redis,4396\/redis,pedigree\/redis,xuguruogu\/redis,pedigree\/redis,pedigree\/redis,4396\/redis,xuguruogu\/redis,pedigree\/redis,4396\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/server.c\n+++ src\/server.c\n@@ -216,7 +216,7 @@\n {\"mset\",msetCommand,-3,\"wm\",0,NULL,1,-1,2,0,0},\n {\"msetnx\",msetnxCommand,-3,\"wm\",0,NULL,1,-1,2,0,0},\n {\"randomkey\",randomkeyCommand,1,\"rR\",0,NULL,0,0,0,0,0},\n- {\"select\",selectCommand,2,\"rlF\",0,NULL,0,0,0,0,0},\n+ {\"select\",selectCommand,2,\"lF\",0,NULL,0,0,0,0,0},\n {\"move\",moveCommand,3,\"wF\",0,NULL,1,1,1,0,0},\n {\"rename\",renameCommand,3,\"w\",0,NULL,1,2,1,0,0},\n {\"renamenx\",renamenxCommand,3,\"wF\",0,NULL,1,2,1,0,0},\n@@ -227,73 +227,73 @@\n {\"keys\",keysCommand,2,\"rS\",0,NULL,0,0,0,0,0},\n {\"scan\",scanCommand,-2,\"rR\",0,NULL,0,0,0,0,0},\n {\"dbsize\",dbsizeCommand,1,\"rF\",0,NULL,0,0,0,0,0},\n- {\"auth\",authCommand,2,\"rsltF\",0,NULL,0,0,0,0,0},\n- {\"ping\",pingCommand,-1,\"rtF\",0,NULL,0,0,0,0,0},\n- {\"echo\",echoCommand,2,\"rF\",0,NULL,0,0,0,0,0},\n- {\"save\",saveCommand,1,\"ars\",0,NULL,0,0,0,0,0},\n- {\"bgsave\",bgsaveCommand,1,\"ar\",0,NULL,0,0,0,0,0},\n- {\"bgrewriteaof\",bgrewriteaofCommand,1,\"ar\",0,NULL,0,0,0,0,0},\n- {\"shutdown\",shutdownCommand,-1,\"arlt\",0,NULL,0,0,0,0,0},\n- {\"lastsave\",lastsaveCommand,1,\"rRF\",0,NULL,0,0,0,0,0},\n+ {\"auth\",authCommand,2,\"sltF\",0,NULL,0,0,0,0,0},\n+ {\"ping\",pingCommand,-1,\"tF\",0,NULL,0,0,0,0,0},\n+ {\"echo\",echoCommand,2,\"F\",0,NULL,0,0,0,0,0},\n+ {\"save\",saveCommand,1,\"as\",0,NULL,0,0,0,0,0},\n+ {\"bgsave\",bgsaveCommand,1,\"a\",0,NULL,0,0,0,0,0},\n+ {\"bgrewriteaof\",bgrewriteaofCommand,1,\"a\",0,NULL,0,0,0,0,0},\n+ {\"shutdown\",shutdownCommand,-1,\"alt\",0,NULL,0,0,0,0,0},\n+ {\"lastsave\",lastsaveCommand,1,\"RF\",0,NULL,0,0,0,0,0},\n {\"type\",typeCommand,2,\"rF\",0,NULL,1,1,1,0,0},\n- {\"multi\",multiCommand,1,\"rsF\",0,NULL,0,0,0,0,0},\n+ {\"multi\",multiCommand,1,\"sF\",0,NULL,0,0,0,0,0},\n {\"exec\",execCommand,1,\"sM\",0,NULL,0,0,0,0,0},\n- {\"discard\",discardCommand,1,\"rsF\",0,NULL,0,0,0,0,0},\n+ {\"discard\",discardCommand,1,\"sF\",0,NULL,0,0,0,0,0},\n {\"sync\",syncCommand,1,\"ars\",0,NULL,0,0,0,0,0},\n {\"psync\",syncCommand,3,\"ars\",0,NULL,0,0,0,0,0},\n- {\"replconf\",replconfCommand,-1,\"arslt\",0,NULL,0,0,0,0,0},\n+ {\"replconf\",replconfCommand,-1,\"aslt\",0,NULL,0,0,0,0,0},\n {\"flushdb\",flushdbCommand,1,\"w\",0,NULL,0,0,0,0,0},\n {\"flushall\",flushallCommand,1,\"w\",0,NULL,0,0,0,0,0},\n {\"sort\",sortCommand,-2,\"wm\",0,sortGetKeys,1,1,1,0,0},\n- {\"info\",infoCommand,-1,\"rlt\",0,NULL,0,0,0,0,0},\n- {\"monitor\",monitorCommand,1,\"ars\",0,NULL,0,0,0,0,0},\n+ {\"info\",infoCommand,-1,\"lt\",0,NULL,0,0,0,0,0},\n+ {\"monitor\",monitorCommand,1,\"as\",0,NULL,0,0,0,0,0},\n {\"ttl\",ttlCommand,2,\"rF\",0,NULL,1,1,1,0,0},\n {\"pttl\",pttlCommand,2,\"rF\",0,NULL,1,1,1,0,0},\n {\"persist\",persistCommand,2,\"wF\",0,NULL,1,1,1,0,0},\n {\"slaveof\",slaveofCommand,3,\"ast\",0,NULL,0,0,0,0,0},\n {\"role\",roleCommand,1,\"lst\",0,NULL,0,0,0,0,0},\n {\"debug\",debugCommand,-1,\"as\",0,NULL,0,0,0,0,0},\n- {\"config\",configCommand,-2,\"art\",0,NULL,0,0,0,0,0},\n- {\"subscribe\",subscribeCommand,-2,\"rpslt\",0,NULL,0,0,0,0,0},\n- {\"unsubscribe\",unsubscribeCommand,-1,\"rpslt\",0,NULL,0,0,0,0,0},\n- {\"psubscribe\",psubscribeCommand,-2,\"rpslt\",0,NULL,0,0,0,0,0},\n- {\"punsubscribe\",punsubscribeCommand,-1,\"rpslt\",0,NULL,0,0,0,0,0},\n- {\"publish\",publishCommand,3,\"pltrF\",0,NULL,0,0,0,0,0},\n- {\"pubsub\",pubsubCommand,-2,\"pltrR\",0,NULL,0,0,0,0,0},\n- {\"watch\",watchCommand,-2,\"rsF\",0,NULL,1,-1,1,0,0},\n- {\"unwatch\",unwatchCommand,1,\"rsF\",0,NULL,0,0,0,0,0},\n- {\"cluster\",clusterCommand,-2,\"ar\",0,NULL,0,0,0,0,0},\n+ {\"config\",configCommand,-2,\"at\",0,NULL,0,0,0,0,0},\n+ {\"subscribe\",subscribeCommand,-2,\"pslt\",0,NULL,0,0,0,0,0},\n+ {\"unsubscribe\",unsubscribeCommand,-1,\"pslt\",0,NULL,0,0,0,0,0},\n+ {\"psubscribe\",psubscribeCommand,-2,\"pslt\",0,NULL,0,0,0,0,0},\n+ {\"punsubscribe\",punsubscribeCommand,-1,\"pslt\",0,NULL,0,0,0,0,0},\n+ {\"publish\",publishCommand,3,\"pltF\",0,NULL,0,0,0,0,0},\n+ {\"pubsub\",pubsubCommand,-2,\"pltR\",0,NULL,0,0,0,0,0},\n+ {\"watch\",watchCommand,-2,\"sF\",0,NULL,1,-1,1,0,0},\n+ {\"unwatch\",unwatchCommand,1,\"sF\",0,NULL,0,0,0,0,0},\n+ {\"cluster\",clusterCommand,-2,\"a\",0,NULL,0,0,0,0,0},\n {\"restore\",restoreCommand,-4,\"wm\",0,NULL,1,1,1,0,0},\n {\"restore-asking\",restoreCommand,-4,\"wmk\",0,NULL,1,1,1,0,0},\n {\"migrate\",migrateCommand,-6,\"w\",0,migrateGetKeys,0,0,0,0,0},\n- {\"asking\",askingCommand,1,\"r\",0,NULL,0,0,0,0,0},\n- {\"readonly\",readonlyCommand,1,\"rF\",0,NULL,0,0,0,0,0},\n- {\"readwrite\",readwriteCommand,1,\"rF\",0,NULL,0,0,0,0,0},\n+ {\"asking\",askingCommand,1,\"F\",0,NULL,0,0,0,0,0},\n+ {\"readonly\",readonlyCommand,1,\"F\",0,NULL,0,0,0,0,0},\n+ {\"readwrite\",readwriteCommand,1,\"F\",0,NULL,0,0,0,0,0},\n {\"dump\",dumpCommand,2,\"r\",0,NULL,1,1,1,0,0},\n {\"object\",objectCommand,3,\"r\",0,NULL,2,2,2,0,0},\n- {\"client\",clientCommand,-2,\"rs\",0,NULL,0,0,0,0,0},\n+ {\"client\",clientCommand,-2,\"as\",0,NULL,0,0,0,0,0},\n {\"eval\",evalCommand,-3,\"s\",0,evalGetKeys,0,0,0,0,0},\n {\"evalsha\",evalShaCommand,-3,\"s\",0,evalGetKeys,0,0,0,0,0},\n- {\"slowlog\",slowlogCommand,-2,\"r\",0,NULL,0,0,0,0,0},\n- {\"script\",scriptCommand,-2,\"rs\",0,NULL,0,0,0,0,0},\n- {\"time\",timeCommand,1,\"rRF\",0,NULL,0,0,0,0,0},\n+ {\"slowlog\",slowlogCommand,-2,\"a\",0,NULL,0,0,0,0,0},\n+ {\"script\",scriptCommand,-2,\"s\",0,NULL,0,0,0,0,0},\n+ {\"time\",timeCommand,1,\"RF\",0,NULL,0,0,0,0,0},\n {\"bitop\",bitopCommand,-4,\"wm\",0,NULL,2,-1,1,0,0},\n {\"bitcount\",bitcountCommand,-2,\"r\",0,NULL,1,1,1,0,0},\n {\"bitpos\",bitposCommand,-3,\"r\",0,NULL,1,1,1,0,0},\n- {\"wait\",waitCommand,3,\"rs\",0,NULL,0,0,0,0,0},\n- {\"command\",commandCommand,0,\"rlt\",0,NULL,0,0,0,0,0},\n+ {\"wait\",waitCommand,3,\"s\",0,NULL,0,0,0,0,0},\n+ {\"command\",commandCommand,0,\"lt\",0,NULL,0,0,0,0,0},\n {\"geoadd\",geoaddCommand,-5,\"wm\",0,NULL,1,1,1,0,0},\n {\"georadius\",georadiusCommand,-6,\"w\",0,NULL,1,1,1,0,0},\n {\"georadiusbymember\",georadiusByMemberCommand,-5,\"w\",0,NULL,1,1,1,0,0},\n {\"geohash\",geohashCommand,-2,\"r\",0,NULL,1,1,1,0,0},\n {\"geopos\",geoposCommand,-2,\"r\",0,NULL,1,1,1,0,0},\n {\"geodist\",geodistCommand,-4,\"r\",0,NULL,1,1,1,0,0},\n- {\"pfselftest\",pfselftestCommand,1,\"r\",0,NULL,0,0,0,0,0},\n+ {\"pfselftest\",pfselftestCommand,1,\"a\",0,NULL,0,0,0,0,0},\n {\"pfadd\",pfaddCommand,-2,\"wmF\",0,NULL,1,1,1,0,0},\n {\"pfcount\",pfcountCommand,-2,\"r\",0,NULL,1,-1,1,0,0},\n {\"pfmerge\",pfmergeCommand,-2,\"wm\",0,NULL,1,-1,1,0,0},\n {\"pfdebug\",pfdebugCommand,-3,\"w\",0,NULL,0,0,0,0,0},\n- {\"latency\",latencyCommand,-2,\"arslt\",0,NULL,0,0,0,0,0}\n+ {\"latency\",latencyCommand,-2,\"aslt\",0,NULL,0,0,0,0,0}\n };\n \n struct evictionPoolEntry *evictionPoolAlloc(void);\n"} {"commit":"2e6097a30672e8c78230d8aca495c48a385b56b8","subject":"make the SKIP() macro report tests as successful","message":"make the SKIP() macro report tests as successful\n\nSummary:\nThe googletest framework does not have a built-in mechanism for skipping tests\nat run-time. Folly uses a `SKIP()` macro for some tests to report themselves\nas skipped. For our internal builds these are reported as failures with a\nspecial message that gets handled by our test runner framework. However for\nopen source builds it is better to report these tests as passing rather than as\nfailing.\n\nReviewed By: yfeldblum\n\nDifferential Revision: D6843331\n\nfbshipit-source-id: f74f29354305703448e5757ddc0ec3e72380a8f7\n","repos":"rklabs\/folly,rklabs\/folly,facebook\/folly,rklabs\/folly,facebook\/folly,rklabs\/folly,facebook\/folly,rklabs\/folly,facebook\/folly,facebook\/folly","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- folly\/test\/TestUtils.h\n+++ folly\/test\/TestUtils.h\n@@ -39,12 +39,21 @@\n #include <folly\/Range.h>\n #include <folly\/portability\/GTest.h>\n \n-\/\/ We use this to indicate that tests have failed because of timing\n-\/\/ or dependencies that may be flakey. Internally this is used by\n-\/\/ our test runner to retry the test. To gtest this will look like\n-\/\/ a normal test failure; there is only an effect if the test framework\n-\/\/ interprets the message.\n+\/\/ SKIP() is used to mark a test skipped if we could not successfully execute\n+\/\/ the test due to runtime issues or behavior that do not necessarily indicate\n+\/\/ a problem with the code.\n+\/\/\n+\/\/ googletest does not have a built-in mechanism to report tests as skipped a\n+\/\/ run time. We either report the test as successful or failure based on the\n+\/\/ FOLLY_SKIP_AS_FAILURE configuration setting. The default is to report the\n+\/\/ test as successful. Enabling FOLLY_SKIP_AS_FAILURE can be useful with a\n+\/\/ test harness that can identify the \"Test skipped by client\" in the failure\n+\/\/ message and convert this into a skipped test result.\n+#if FOLLY_SKIP_AS_FAILURE\n #define SKIP() GTEST_FATAL_FAILURE_(\"Test skipped by client\")\n+#else\n+#define SKIP() return GTEST_SUCCESS_(\"Test skipped by client\")\n+#endif\n \n \/\/ Encapsulate conditional-skip, since it's nontrivial to get right.\n #define SKIP_IF(expr) \\\n"} {"commit":"1236471b7b415c4773b8545e1c658572a211f7da","subject":"Fix MIGRATE entry in command table.","message":"Fix MIGRATE entry in command table.\n\nThanks to Oran Agra (@oranagra) for reporting. Key extraction would not\nwork otherwise and it does not make sense to take wrong data in the\ncommand table.\n","repos":"pedigree\/redis,4396\/redis,janekmi\/redis,4396\/redis,xuguruogu\/redis,janekmi\/redis,pedigree\/redis,xuguruogu\/redis,xuguruogu\/redis,pedigree\/redis,xuguruogu\/redis,4396\/redis,4396\/redis,janekmi\/redis,janekmi\/redis,pedigree\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/server.c\n+++ src\/server.c\n@@ -264,7 +264,7 @@\n {\"cluster\",clusterCommand,-2,\"ar\",0,NULL,0,0,0,0,0},\n {\"restore\",restoreCommand,-4,\"wm\",0,NULL,1,1,1,0,0},\n {\"restore-asking\",restoreCommand,-4,\"wmk\",0,NULL,1,1,1,0,0},\n- {\"migrate\",migrateCommand,-6,\"w\",0,NULL,0,0,0,0,0},\n+ {\"migrate\",migrateCommand,-6,\"ws\",0,NULL,3,3,1,0,0},\n {\"asking\",askingCommand,1,\"r\",0,NULL,0,0,0,0,0},\n {\"readonly\",readonlyCommand,1,\"rF\",0,NULL,0,0,0,0,0},\n {\"readwrite\",readwriteCommand,1,\"rF\",0,NULL,0,0,0,0,0},\n"} {"commit":"9d9508f5b9c8d2c85d81b0a9d77f7e1f2fbd3948","subject":"Add new playlist functions.","message":"Add new playlist functions.\n","repos":"PCManticore\/foo_rpc,PCManticore\/foo_rpc,PCManticore\/foo_rpc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- foo_rpc\/api\/playlist.h\n+++ foo_rpc\/api\/playlist.h\n@@ -114,6 +114,27 @@\n result.setResult(success);\n }\n \n+ void activeplaylist_reorder_items(ApiParam<vector<int>> param, ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+ \n+ ApiParam<tuple<t_size, vector<int>>> passthrough(make_tuple(playlist, param.value()));\n+\n+ playlist_reorder_items(passthrough, result);\n+ }\n+\n+ void activeplaylist_set_selection(ApiParam<tuple<vector<t_size>, vector<bool>>> param, Event event) {\n+ vector<t_size> p_affected;\n+ vector<bool> p_status;\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ tie(p_affected, p_status) = param.value();\n+\n+ ApiParam<tuple<t_size, vector<t_size>, vector<bool>>> passthrough(\n+ make_tuple(playlist, p_affected, p_status));\n+\n+ playlist_set_selection(passthrough, event);\n+ }\n+\n void playlist_set_selection(ApiParam<tuple<t_size, vector<t_size>, vector<bool>>> param, Event event) {\n t_size p_playlist;\n vector<t_size> p_affected;\n@@ -140,6 +161,15 @@\n playlist_manager->playlist_set_selection(p_playlist, bit_array_true(), p_status_array);\n event.set();\n }\n+ \n+ void activeplaylist_remove_items(ApiParam<vector<t_size>> param, ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, vector<t_size>>> passthrough(\n+ make_tuple(playlist, param.value()));\n+\n+ playlist_remove_items(passthrough, result);\n+ }\n \n void playlist_remove_items(ApiParam<tuple<t_size, vector<t_size>>> param, ApiResult<bool> & result) {\n t_size p_playlist;\n@@ -153,6 +183,17 @@\n \n bool successful = playlist_manager->playlist_remove_items(p_playlist, table);\n result.setResult(successful);\n+ }\n+\n+ void activeplaylist_replace_item(ApiParam<tuple<t_size, string>> param,\n+ ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size, string>> passthrough(\n+ tuple_cat(make_tuple(playlist), param.value()));\n+\n+ playlist_replace_item(passthrough, result);\n+\n }\n \n void playlist_replace_item(ApiParam<tuple<t_size, t_size, string>> param, ApiResult<bool> & result) {\n@@ -176,6 +217,25 @@\n playlist_manager->playlist_set_focus_item(p_playlist, p_item);\n \n event.set();\n+ }\n+\n+ void activeplaylist_set_focus_item(ApiParam<t_size> param, Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size>> passthrough(\n+ make_tuple(playlist, param.value()));\n+ playlist_set_focus_item(passthrough, event);\n+ }\n+\n+ void activeplaylist_insert_items(ApiParam<tuple<t_size, vector<string>>> param,\n+ ApiResult<t_size> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size, vector<string>>> passthrough(\n+ tuple_cat(make_tuple(playlist), param.value()));\n+\n+ playlist_insert_items(passthrough, result);\n+\n }\n \n void playlist_insert_items(ApiParam<tuple<t_size, t_size, vector<string>>> param,\n@@ -199,6 +259,14 @@\n result.setResult(res);\n }\n \n+ void activeplaylist_ensure_visible(ApiParam<t_size> param, Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size>> passthrough(\n+ make_tuple(playlist, param.value()));\n+\n+ playlist_ensure_visible(passthrough, event);\n+ }\n \n void playlist_ensure_visible(ApiParam<tuple<t_size, t_size>> param, Event event) {\n t_size p_playlist, p_item;\n@@ -207,6 +275,15 @@\n playlist_manager->playlist_ensure_visible(p_playlist, p_item);\n \n event.set();\n+ }\n+\n+ void activeplaylist_rename(ApiParam<string> param, ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, string>> passthrough(\n+ make_tuple(playlist, param.value()));\n+\n+ playlist_rename(passthrough, result);\n }\n \n void playlist_rename(ApiParam<tuple<t_size, string>> param,\n@@ -222,12 +299,28 @@\n \n }\n \n+ void activeplaylist_undo_backup(Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+ \n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_undo_backup(param, event);\n+ }\n+\n void playlist_undo_backup(ApiParam<t_size> param, Event event) {\n t_size p_playlist = param.value();\n playlist_manager->playlist_undo_backup(p_playlist);\n event.set();\n }\n \n+ void activeplaylist_undo_restore(ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_undo_restore(param, result);\n+ }\n+\n void playlist_undo_restore(ApiParam<t_size> param, ApiResult<bool> & result) {\n t_size p_playlist = param.value();\n \n@@ -236,6 +329,14 @@\n result.setResult(success);\n }\n \n+ void activeplaylist_redo_restore(ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_redo_restore(param, result);\n+ }\n+\n void playlist_redo_restore(ApiParam<t_size> param, ApiResult<bool> & result) {\n t_size p_playlist = param.value();\n \n@@ -244,12 +345,28 @@\n result.setResult(success);\n }\n \n+ void activeplaylist_is_undo_available(ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_is_undo_available(param, result);\n+ }\n+\n void playlist_is_undo_available(ApiParam<t_size> param, ApiResult<bool> & result) {\n t_size p_playlist = param.value();\n \n bool success = playlist_manager->playlist_is_undo_available(p_playlist);\n \n result.setResult(success);\n+ }\n+\n+ void activeplaylist_is_redo_available(ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_is_redo_available(param, result);\n }\n \n void playlist_is_redo_available(ApiParam<t_size> param, ApiResult<bool> & result) {\n@@ -291,6 +408,15 @@\n result.setResult(make_tuple(success, p_playlist, p_index));\n }\n \n+ void activeplaylist_sort_by_format(ApiParam<tuple<string, bool>> param, ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, string, bool>> passthrough(\n+ tuple_cat(make_tuple(playlist), param.value())\n+ );\n+ playlist_sort_by_format(passthrough, result);\n+ }\n+\n void playlist_sort_by_format(ApiParam<tuple<t_size, string, bool>> param, ApiResult<bool> & result) {\n t_size p_playlist;\n string format;\n@@ -424,6 +550,15 @@\n result.setResult(success);\n }\n \n+ void activeplaylist_is_item_selected(ApiParam<t_size> param, ApiResult<bool> & result) {\n+ t_size p_playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size>> passthrough(\n+ make_tuple(p_playlist, param.value()));\n+\n+ playlist_is_item_selected(passthrough, result);\n+ }\n+\n void playlist_is_item_selected(ApiParam<tuple<t_size, t_size>> param, ApiResult<bool> & result) {\n t_size p_playlist;\n t_size p_item;\n@@ -434,9 +569,252 @@\n result.setResult(success);\n }\n \n- \/* TODO: can't implement over RPC:\n+ void activeplaylist_move_selection(ApiParam<int> param, ApiResult<bool> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, int>> passthrough(\n+ make_tuple(playlist, param.value())\n+ );\n+\n+ playlist_move_selection(passthrough, result);\n+ }\n+\n+ void playlist_move_selection(ApiParam<tuple<t_size, int>> param, ApiResult<bool> & result) {\n+ int p_delta;\n+ t_size p_playlist;\n+ tie(p_playlist, p_delta) = param.value();\n+\n+ bool success = playlist_manager->playlist_move_selection(p_playlist, p_delta);\n+\n+ result.setResult(success);\n+ }\n+\n+ void activeplaylist_clear(Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_clear(param, event);\n+ }\n+\n+ void playlist_clear(ApiParam<t_size> param, Event event) {\n+ t_size p_playlist = param.value();\n+\n+ playlist_manager->playlist_clear(p_playlist);\n+\n+ event.set();\n+ }\n+\n+ void activeplaylist_clear_selection(Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<t_size> param(playlist);\n+\n+ playlist_clear_selection(param, event);\n+ }\n+\n+ void playlist_clear_selection(ApiParam<t_size> param, Event event) {\n+ t_size p_selection = param.value();\n+\n+ playlist_manager->playlist_clear_selection(p_selection);\n+\n+ event.set();\n+\n+ }\n+\n+ void activeplaylist_remove_selection(ApiParam<bool> param, Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, bool>> passthrough(\n+ make_tuple(playlist, param.value()));\n+\n+ playlist_remove_selection(passthrough, event);\n+\n+ }\n+\n+ void playlist_remove_selection(ApiParam<tuple<t_size, bool>> param, Event event) {\n+ t_size p_playlist;\n+ bool p_crop;\n+\n+ tie(p_playlist, p_crop) = param.value();\n+\n+ playlist_manager->playlist_remove_selection(p_playlist, p_crop);\n+\n+ event.set();\n+ }\n+\n+ void active_playlist_get_name(ApiResult<pfc::string8> & result) { \n+ pfc::string8 temp;\n+ bool success = playlist_manager->activeplaylist_get_name(temp);\n+\n+ result.setResult(temp);\n+ }\n+\n+ void activeplaylist_get_item_count(ApiResult<t_size> & result) {\n+ t_size count = playlist_manager->activeplaylist_get_item_count();\n+\n+ result.setResult(count);\n+ }\n+\n+ void activeplaylist_get_focus_item(ApiResult<t_size> & result) {\n+ t_size focus_item = playlist_manager->activeplaylist_get_focus_item();\n+\n+ result.setResult(focus_item);\n+ }\n+\n+ void create_playlist_autoname(ApiParam<t_size> param, ApiResult<t_size> & result) {\n+ t_size playlist = param.value();\n+\n+ t_size playlist_id = playlist_manager->create_playlist_autoname(\n+ playlist\n+ );\n+\n+ result.setResult(playlist_id);\n+ }\n+\n+ void reset_playing_playlist(Event event) {\n+ playlist_manager->reset_playing_playlist();\n+\n+ event.set();\n+ }\n+\n+ void find_playlist(ApiParam<tuple<string, t_size>> param, ApiResult<t_size> & result) {\n+ string name;\n+ t_size length;\n+ tie(name, length) = param.value();\n+\n+ t_size index = playlist_manager->find_playlist(name.c_str(), length);\n+\n+ result.setResult(index);\n+ }\n+\n+ void find_or_playlist(ApiParam<tuple<string, t_size>> param, ApiResult<t_size> & result) {\n+ string name;\n+ t_size length;\n+ tie(name, length) = param.value();\n+\n+ t_size index = playlist_manager->find_or_create_playlist(name.c_str(), length);\n+\n+ result.setResult(index);\n+ }\n+\n+ void find_or_create_playlist_unlocked(ApiParam<tuple<string, t_size>> param,\n+ ApiResult<t_size> & result) {\n+ string name;\n+ t_size length;\n+ tie(name, length) = param.value();\n+\n+ t_size index = playlist_manager->find_or_create_playlist_unlocked(\n+ name.c_str(), length);\n+\n+ result.setResult(index);\n+ }\n+\n+ void active_playlist_fix(Event event) {\n+ playlist_manager->active_playlist_fix();\n+\n+ event.set();\n+ }\n+\n+ void playlist_activate_delta(ApiParam<int> param, Event event) {\n+ int t_delta = param.value();\n+\n+ playlist_manager->playlist_activate_delta(t_delta);\n+\n+ event.set();\n+\n+ }\n+\n+ void playlist_activate_next(Event event) {\n+ playlist_manager->playlist_activate_next();\n+\n+ event.set();\n+ }\n+\n+ void playlist_activate_previous(Event event) {\n+ playlist_manager->playlist_activate_previous();\n+\n+ event.set();\n+ }\n+\n+ void playlist_get_selection_count(ApiParam<tuple<t_size, t_size>> param, ApiResult<t_size> & result) {\n+ t_size playlist;\n+ t_size p_max;\n+ tie(playlist, p_max) = param.value();\n+\n+ t_size count = playlist_manager->playlist_get_selection_count(playlist, p_max);\n+\n+ result.setResult(count);\n+\n+ }\n+\n+ void activeplaylist_get_selection_count(ApiParam<t_size> param, ApiResult<t_size> & result) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size>> passthrough(\n+ make_tuple(playlist, param.value()));\n+\n+ playlist_get_selection_count(passthrough, result);\n+ }\n+\n+ void playlist_set_selection_single(ApiParam<tuple<t_size, t_size, bool>> param, Event event) {\n+ t_size playlist;\n+ t_size item;\n+ bool state;\n+ tie(playlist, item, state) = param.value();\n+\n+ playlist_manager->playlist_set_selection_single(playlist, item, state);\n+ \n+ event.set();\n+ }\n+\n+ void activeplaylist_set_selection_single(ApiParam<tuple<t_size, bool>> param, Event event) {\n+ t_size playlist = playlist_manager->get_active_playlist();\n+\n+ ApiParam<tuple<t_size, t_size, bool>> passthrough(\n+ tuple_cat(make_tuple(playlist), param.value())\n+ );\n+\n+ playlist_set_selection_single(passthrough, event);\n+ }\n+\n+ \n+ \/* \n+ TODO: can't implement over RPC:\n bool playlist_get_item_handle(metadb_handle_ptr & p_out, t_size p_playlist, t_size p_item);\n metadb_handle_ptr playlist_get_item_handle(t_size playlist, t_size item);\n+\n+ void playlist_get_items(t_size p_playlist,pfc::list_base_t<metadb_handle_ptr> & out,const bit_array & p_mask);\n+ void playlist_get_all_items(t_size p_playlist,pfc::list_base_t<metadb_handle_ptr> & out);\n+ void playlist_get_selected_items(t_size p_playlist,pfc::list_base_t<metadb_handle_ptr> & out);\n+ bool playlist_add_items(t_size playlist,const pfc::list_base_const_t<metadb_handle_ptr> & data,const bit_array & p_selection);\n+\n+ \/\/! Changes contents of the specified playlist to the specified items, trying to reuse existing playlist content as much as possible (preserving selection\/focus\/etc). Order of items in playlist not guaranteed to be the same as in the specified item list.\n+ \/\/! @returns true if the playlist has been altered, false if there was nothing to update.\n+ bool playlist_update_content(t_size playlist, metadb_handle_list_cref content, bool bUndoBackup);\n+ void activeplaylist_enum_items(enum_items_callback & p_callback,const bit_array & p_mask);\n+ \n+ bool activeplaylist_get_item_handle(metadb_handle_ptr & item,t_size p_item);\n+ metadb_handle_ptr activeplaylist_get_item_handle(t_size p_item); \n+ void activeplaylist_get_items(pfc::list_base_t<metadb_handle_ptr> & out,const bit_array & p_mask);\n+ void activeplaylist_get_all_items(pfc::list_base_t<metadb_handle_ptr> & out);\n+ void activeplaylist_get_selected_items(pfc::list_base_t<metadb_handle_ptr> & out); \n+ bool activeplaylist_add_items(const pfc::list_base_const_t<metadb_handle_ptr> & data,const bit_array & p_selection);\n+ bool playlist_insert_items_filter(t_size p_playlist,t_size p_base,const pfc::list_base_const_t<metadb_handle_ptr> & p_data,bool p_select);\n+ bool activeplaylist_insert_items_filter(t_size p_base,const pfc::list_base_const_t<metadb_handle_ptr> & p_data,bool p_select); \n+ bool playlist_add_items_filter(t_size p_playlist,const pfc::list_base_const_t<metadb_handle_ptr> & p_data,bool p_select);\n+ bool activeplaylist_add_items_filter(const pfc::list_base_const_t<metadb_handle_ptr> & p_data,bool p_select); \n+ void activeplaylist_item_format_title(t_size p_item,titleformat_hook * p_hook,pfc::string_base & out,const service_ptr_t<titleformat_object> & p_script,titleformat_text_filter * p_filter,play_control::t_display_level p_playback_info_level);\n+ bool playlist_get_focus_item_handle(metadb_handle_ptr & p_item,t_size p_playlist);\n+ bool activeplaylist_get_focus_item_handle(metadb_handle_ptr & item); \n+ void remove_items_from_all_playlists(const pfc::list_base_const_t<metadb_handle_ptr> & p_data); \n+ bool get_all_items(pfc::list_base_t<metadb_handle_ptr> & out);\n+ bool playlist_find_item(t_size p_playlist,metadb_handle_ptr p_item,t_size & p_result);\/\/inefficient, walks entire playlist\n+ bool playlist_find_item_selected(t_size p_playlist,metadb_handle_ptr p_item,t_size & p_result);\/\/inefficient, walks entire playlist\n+ t_size playlist_set_focus_by_handle(t_size p_playlist,metadb_handle_ptr p_item);\n+ bool activeplaylist_find_item(metadb_handle_ptr p_item,t_size & p_result);\/\/inefficient, walks entire playlist\n+ t_size activeplaylist_set_focus_by_handle(metadb_handle_ptr p_item);\n+ static void g_make_selection_move_permutation(t_size * p_output,t_size p_count,const bit_array & p_selection,int p_delta);\n *\/\n \n };\n"} {"commit":"c6dbda4bb360075d1690566940d7c801b00de5c8","subject":"remove opengl32.lib link pragma","message":"remove opengl32.lib link pragma\n","repos":"seven-phases\/spectrum-analyzer,seven-phases\/spectrum-analyzer,seven-phases\/spectrum-analyzer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libraries\/win\/kali\/graphics.opengl.h\n+++ libraries\/win\/kali\/graphics.opengl.h\n@@ -1,8 +1,6 @@\n \r\n #ifndef GL_INCLUDED\r\n #define GL_INCLUDED\r\n-\r\n-#pragma comment(lib, \"opengl32.lib\")\r\n \r\n #include <malloc.h>\r\n #include <windows.h>\r\n"} {"commit":"5dfce6cabc62dc316b7e523805659b6a584420eb","subject":"Account for the machdep.msgbuf -> kern.msgbuf renaming.","message":"Account for the machdep.msgbuf -> kern.msgbuf renaming.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- release\/picobsd\/tinyware\/msg\/msg.c\n+++ release\/picobsd\/tinyware\/msg\/msg.c\n@@ -40,7 +40,7 @@\n {\n \tint len,i;\n \tchar *buf,*p;\n-\tchar *mib=\"machdep.msgbuf\";\n+\tchar *mib=\"kern.msgbuf\";\n \n \t\/* We use sysctlbyname, because the oid is unknown (OID_AUTO) *\/\n \n"} {"commit":"17378447a37bcc883b2f9de0806347b34681c332","subject":"Changed csp_if_kiss to use const kiss_crc_table for faster initialisation and lower memory usage","message":"Changed csp_if_kiss to use const kiss_crc_table for faster initialisation and lower memory usage\n","repos":"GomSpace\/libcsp,pacheco017\/libcsp,GomSpace\/libcsp,pacheco017\/libcsp,Psykar\/kubos,kubostech\/KubOS,GomSpace\/libcsp,libcsp\/libcsp,satlab\/libcsp,Psykar\/kubos,libcsp\/libcsp,marshall\/libcsp,satlab\/libcsp,kubostech\/KubOS,Psykar\/kubos,marshall\/libcsp,satlab\/libcsp,Psykar\/kubos,marshall\/libcsp,pacheco017\/libcsp,pacheco017\/libcsp,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/interfaces\/csp_if_kiss.c\n+++ src\/interfaces\/csp_if_kiss.c\n@@ -53,33 +53,40 @@\n csp_kiss_discard_f kiss_discard;\n \n #ifdef KISS_CRC32\n-\/**\n- * crc_tab[] -- this crcTable is being build by chksum_crc32GenTab().\n- * so make sure, you call it before using the other functions!\n- *\/\n-static uint32_t kiss_crc_tab[256];\n-\n-\/**\n- * chksum_crc32gentab() -- to a global crc_tab[256], this one will\n- * calculate the crcTable for crc32-checksums.\n- *\/\n-static void kiss_crc_gentab(void) {\n-\tuint32_t crc, poly;\n-\tint i, j;\n-\n-\tpoly = 0xEDB88320L;\n-\tfor (i = 0; i < 256; i++) {\n-\t\tcrc = i;\n-\t\tfor (j = 8; j > 0; j--) {\n-\t\t\tif (crc & 1) {\n-\t\t\t\tcrc = (crc >> 1) ^ poly;\n-\t\t\t} else {\n-\t\t\t\tcrc >>= 1;\n-\t\t\t}\n-\t\t}\n-\t\tkiss_crc_tab[i] = crc;\n-\t}\n-}\n+\n+static const int kiss_crc_tab[256] = {\n+\t\t0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,\n+\t\t0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,\n+\t\t0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,\n+\t\t0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,\n+\t\t0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,\n+\t\t0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,\n+\t\t0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,\n+\t\t0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,\n+\t\t0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,\n+\t\t0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,\n+\t\t0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,\n+\t\t0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,\n+\t\t0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,\n+\t\t0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,\n+\t\t0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,\n+\t\t0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,\n+\t\t0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,\n+\t\t0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,\n+\t\t0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,\n+\t\t0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,\n+\t\t0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,\n+\t\t0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,\n+\t\t0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,\n+\t\t0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,\n+\t\t0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,\n+\t\t0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,\n+\t\t0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,\n+\t\t0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,\n+\t\t0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,\n+\t\t0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,\n+\t\t0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,\n+\t\t0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};\n \n \/**\n * Generate CRC32\n@@ -255,11 +262,6 @@\n \n int csp_kiss_init(csp_kiss_putstr_f kiss_putstr_f, csp_kiss_discard_f kiss_discard_f) {\n \n-#ifdef KISS_CRC32\n-\t\/* Generate lookup table for CRC32 *\/\n-\tkiss_crc_gentab();\n-#endif\n-\n \t\/* Store function pointers *\/\n \tkiss_putstr = kiss_putstr_f;\n \tkiss_discard = kiss_discard_f;\n"} {"commit":"1d3d22f812007229c527596a1ace7137c2a5e88b","subject":"Added server functions for mopher control socket","message":"Added server functions for mopher control socket\n","repos":"badzong\/mopher,badzong\/mopher","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/server.c\n+++ src\/server.c\n@@ -13,11 +13,24 @@\n #define MAX_CLIENTS 10\n #define BACKLOG 16\n #define RECV_BUFFER 4096\n-\n-static int\t\tserver_socket;\n-static int\t\tserver_clients[MAX_CLIENTS + 1];\n-static int\t\tserver_running;\n-static pthread_t\tserver_thread;\n+#define MAXARGS 16\n+#define FUNC_BUCKETS 64\n+\n+static server_function_t server_functions[] = {\n+\t{ \"greylist\",\t\"Dump greylist tuples\",\t\tserver_greylist_dump },\n+\t{ \"pass\",\t\"Let tuple pass greylistung\",\tserver_greylist_pass },\n+\t{ \"help\",\t\"Print this dialog\",\t\tserver_help },\n+#ifdef DEBUG\n+\t{ \"echo\",\t\"Echo input for debugging\",\tserver_echo },\n+#endif\n+\t{ NULL,\t\tNULL,\t\t\t\tNULL },\n+};\n+\n+static sht_t *server_function_table;\n+static int server_socket;\n+static int server_clients[MAX_CLIENTS + 1];\n+static int server_running;\n+static pthread_t server_thread;\n \n \n static void\n@@ -30,7 +43,139 @@\n \n \n static int\n-server_update(int socket)\n+server_reply(int sock, char *message)\n+{\n+\tint len, n;\n+\tchar buffer[RECV_BUFFER];\n+\n+\tlen = util_concat(buffer, sizeof buffer, message, \"\\n\", NULL);\n+\tif (len == -1)\n+\t{\n+\t\tlog_error(\"server_reply: util_concat failed\");\n+\t\treturn -1;\n+\t}\n+\n+\tn = write(sock, buffer, len);\n+\tif (n == -1)\n+\t{\n+\t\tlog_sys_error(\"server_reply: write\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn n;\n+}\n+\n+\n+int\n+server_help(int sock, int argc, char **argv)\n+{\n+\tserver_function_t *func;\n+\tchar buffer[RECV_BUFFER];\n+\n+\tfor (func = server_functions; func->sf_name; ++func)\n+\t{\n+\t\tutil_concat(buffer, sizeof buffer, func->sf_name, \"\\t\", func->sf_help, NULL);\n+\t\tserver_reply(sock, buffer);\n+\t}\n+\t\n+\treturn 0;\n+}\n+\n+\n+int\n+server_greylist_dump(int sock, int argc, char **argv)\n+{\n+\treturn 0;\n+}\n+\n+\n+int\n+server_greylist_pass(int sock, int argc, char **argv)\n+{\n+\treturn 0;\n+}\n+\n+\n+int\n+server_echo(int sock, int argc, char **argv)\n+{\n+\treturn 0;\n+}\n+\n+\n+static int\n+server_exec_cmd(int sock, char *cmd)\n+{\n+\tint argc = 0;\n+\tchar *argv[MAXARGS];\n+\tchar *save, *p, *nil;\n+\tserver_function_t *sf;\n+\n+\tfor (nil = cmd; (p = strtok_r(nil, \" \", &save)) && argc < MAXARGS; nil = NULL, ++argc)\n+\t{\n+\t\targv[argc] = p;\n+\t}\n+\n+\tif (argc == MAXARGS)\n+\t{\n+\t\tserver_reply(sock, \"ERROR: Too many arguments\");\n+\t\tlog_error(\"server_exec_cmd: Too many arguments\");\n+\t\treturn -1;\n+\t}\n+\n+\tsf = sht_lookup(server_function_table, argv[0]);\n+\tif (sf == NULL)\n+\t{\n+\t\tsf = sht_lookup(server_function_table, \"help\");\n+\t\tif (sf == NULL)\n+\t\t{\n+\t\t\tlog_die(EX_SOFTWARE, \"server_exec_cmd: help not found. This is impossible hence fatal.\");\n+\t\t}\n+\t}\n+\n+\treturn sf->sf_callback(sock, argc, argv);\n+}\n+\n+static int\n+server_request(int sock)\n+{\n+\tchar cmd_buffer[RECV_BUFFER];\n+\tint len;\n+\n+\tlen = read(sock, cmd_buffer, sizeof cmd_buffer);\n+\tif (len == -1)\n+\t{\n+\t\tlog_sys_error(\"server_request: read\");\n+\t\treturn -1;\n+\t}\n+\n+\tif (len == sizeof cmd_buffer)\n+\t{\n+\t\tlog_sys_error(\"server_request: buffer exhausted\");\n+\t\treturn -1;\n+\t}\n+\n+\tcmd_buffer[len] = 0;\n+\n+\t\/*\n+\t * Connection closed\n+\t *\/\n+\tif (!len)\n+\t{\n+\t\treturn 0;\n+\t}\n+\n+\tif(server_exec_cmd(sock, cmd_buffer))\n+\t{\n+\t\tlog_error(\"server_request: server_exec_cmd failed\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn len;\n+}\n+\n+static int\n+server_update(int sock)\n {\n \tdbt_t *dbt;\n \tchar buffer[RECV_BUFFER];\n@@ -39,7 +184,7 @@\n \tchar *name = NULL;\n \tvar_t *record = NULL;\n \n-\tlen = read(socket, buffer, sizeof buffer);\n+\tlen = read(sock, buffer, sizeof buffer);\n \tif (len == -1)\n \t{\n \t\tlog_sys_error(\"server_update: read\");\n@@ -124,6 +269,7 @@\n \tint ready;\n \tfd_set master;\n \tfd_set rs;\n+\tchar *client_addr;\n \n \t\/*\n \t * Server is running\n@@ -174,7 +320,7 @@\n \t\t\t\tcontinue;\n \t\t\t}\n \n-\t\t\tlog_sys_error(\"server: select\");\n+\t\t\tlog_sys_error(\"server_main: select\");\n \t\t}\n \n \t\t\/*\n@@ -189,7 +335,7 @@\n \n \t\t\tif(server_clients[i] == 0)\n \t\t\t{\n-\t\t\t\tlog_error(\"server: client slots depleted\");\n+\t\t\t\tlog_error(\"server_main: client slots depleted\");\n \n \t\t\t\t\/*\n \t\t\t\t * Disable server_socket in master set and queue new connections\n@@ -206,7 +352,7 @@\n \n \t\t\tif(server_clients[i] == -1)\n \t\t\t{\n-\t\t\t\tlog_sys_error(\"server: accept\");\n+\t\t\t\tlog_sys_error(\"server_main: accept\");\n \t\t\t}\n \n \t\t\telse\n@@ -220,6 +366,17 @@\n \t\t\t\t}\n \t\t\t}\n \n+\t\t\tclient_addr = util_addrtostr(&caddr);\n+\t\t\tif (client_addr)\n+\t\t\t{\n+\t\t\t\tlog_error(\"server_main: new client connection from %s\", client_addr);\n+\t\t\t\tfree(client_addr);\n+\t\t\t}\n+\t\t\telse\n+\t\t\t{\n+\t\t\t\tlog_error(\"server_main: util_addrtostr failed\");\n+\t\t\t}\n+\n server_slots_depleted:\n \n \t\t\tif(--ready == 0) {\n@@ -241,7 +398,7 @@\n \t\t\t\/*\n \t\t\t * Handle request\n \t\t\t *\/\n-\t\t\tlen = server_update(server_clients[i]);\n+\t\t\tlen = server_request(server_clients[i]);\n \t\t\tif (len == -1)\n \t\t\t{\n \t\t\t\tlog_error(\"server_main: server_update failed\");\n@@ -314,6 +471,8 @@\n int\n server_init()\n {\n+\tserver_function_t *func;\n+\n \t\/*\n \t * Don't start the server if server_socket is empty\n \t *\/\n@@ -324,6 +483,23 @@\n \t}\n \n \t\/*\n+\t * Load function table\n+\t *\/\n+\tserver_function_table = sht_create(FUNC_BUCKETS, NULL);\n+\tif (server_function_table == NULL)\n+\t{\n+\t\tlog_die(EX_SOFTWARE, \"server_init: sht_create failed\");\n+\t}\n+\n+\tfor (func = server_functions; func->sf_name; ++func)\n+\t{\n+\t\tif (sht_insert(server_function_table, func->sf_name, func))\n+\t\t{\n+\t\t\tlog_die(EX_SOFTWARE, \"server_init: sht_insert failed\");\n+\t\t}\n+\t}\n+\t\n+\t\/*\n \t * Start server thread\n \t *\/\n \tif (util_thread_create(&server_thread, server_main, NULL))\n@@ -361,5 +537,7 @@\n \t\tlog_error(\"server_main: util_signal failed\");\n \t}\n \n+\tsht_clear(server_function_table);\n+\n \treturn;\n }\n"} {"commit":"f7a94526dd93ebb56b1a21ba86a71329c4e3f6e4","subject":"Set ZSKIPLIST_MAXLEVEL to optimal value given 2^64 elements and p=0.25","message":"Set ZSKIPLIST_MAXLEVEL to optimal value given 2^64 elements and p=0.25\n","repos":"pmem\/redis,pmem\/redis,pmem\/redis,pmem\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/server.h\n+++ src\/server.h\n@@ -335,7 +335,7 @@\n \/* Anti-warning macro... *\/\n #define UNUSED(V) ((void) V)\n \n-#define ZSKIPLIST_MAXLEVEL 64 \/* Should be enough for 2^64 elements *\/\n+#define ZSKIPLIST_MAXLEVEL 32 \/* Should be enough for 2^64 elements *\/\n #define ZSKIPLIST_P 0.25 \/* Skiplist P = 1\/4 *\/\n \n \/* Append only defines *\/\n"} {"commit":"f11270e14a067ca3a4b90d249c5ff08a838362f5","subject":"mark pointers as const to fix compiler warning","message":"mark pointers as const to fix compiler warning\n","repos":"mongrel2\/mongrel2,mongrel2\/mongrel2,mongrel2\/mongrel2,mongrel2\/mongrel2,mongrel2\/mongrel2,mongrel2\/mongrel2","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/server.h\n+++ src\/server.h\n@@ -75,8 +75,8 @@\n mbedtls_x509_crt ca_chain;\n mbedtls_pk_context pk_key;\n const int *ciphers;\n- char *dhm_P;\n- char *dhm_G;\n+ const char *dhm_P;\n+ const char *dhm_G;\n } Server;\n \n Server *Server_create(bstring uuid, bstring default_host,\n"} {"commit":"38ff12b27e696f0a73bec0aec622001203dc56f7","subject":"Commented out call to int_join_per.","message":"Commented out call to int_join_per.\n\n","repos":"SINTEF-Geometry\/SISL","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/sh1871.c\n+++ src\/sh1871.c\n@@ -11,7 +11,7 @@\n \n \/*\n *\n- * $Id: sh1871.c,v 1.2 2001-03-19 15:59:06 afr Exp $\n+ * $Id: sh1871.c,v 1.3 2002-01-28 12:38:50 jbt Exp $\n *\n *\/\n \n@@ -155,9 +155,9 @@\n if (kstat < 0) goto error;\n \n \/* Join periodic curves *\/\n- int_join_per( &qintdat,qo1,qo2,nullp,kdeg=0,aepsge,&kstat);\n- if (kstat < 0)\n- goto error;\n+\/* int_join_per( &qintdat,qo1,qo2,nullp,kdeg=0,aepsge,&kstat); *\/\n+\/* if (kstat < 0) *\/\n+\/* goto error; *\/\n \n \/* Create tracks *\/\n if (trackflag && qintdat)\n"} {"commit":"82064d19a57eacd510a2bb75d59bb432ee5501a1","subject":"Log dead LIBCx mutex owner on assertions.","message":"Log dead LIBCx mutex owner on assertions.\n\nCloses #96.\n","repos":"bitwiseworks\/libcx,bitwiseworks\/libcx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared.c\n+++ src\/shared.c\n@@ -30,6 +30,7 @@\n #include <process.h>\n #include <stdarg.h>\n #include <sys\/builtin.h>\n+#include <sys\/errno.h>\n #include <assert.h>\n #include <emx\/io.h>\n \n@@ -43,6 +44,7 @@\n \n #include <InnoTekLIBC\/fork.h>\n #include <InnoTekLIBC\/FastInfoBlocks.h>\n+#include <InnoTekLIBC\/errno.h>\n \n \/*\n * Debug builds are hardly compatible with release builds so use a separate\n@@ -349,8 +351,21 @@\n ASSERT(gSeenAssertion || gMutex != NULLHANDLE);\n \n DOS_NI(arc = DosRequestMutexSem(gMutex, SEM_INDEFINITE_WAIT));\n-\n- if (gpData)\n+ TRACE(\"DosRequestMutexSem = %ld\\n\", arc);\n+\n+ \/*\n+ * At this point we should either successfully grab the mutex or we already\n+ * crashed because of some assertion (e.g. when we tried to grab it in\n+ * global_lock but received ERROR_SEM_OWNER_DIED).\n+ *\/\n+ ASSERT_MSG(gSeenAssertion || arc == NO_ERROR, \"%d %lu\", gSeenAssertion, arc);\n+\n+ \/*\n+ * Only go with uninit if we successfully grabbed the mutex. Otherwise, it is\n+ * pointless as it means some other LIBCX process died holding it or such and\n+ * there is no way to recover from that: all LIBCx processes are dying anyway.\n+ *\/\n+ if (gpData && arc == NO_ERROR)\n {\n if (gpData->heap)\n {\n@@ -578,12 +593,16 @@\n }\n \n \/**\n- * Returns 0 and PID, TID and the request count of the global mutex owner if it\n- * is currently owned.\n+ * Returns PID, TID and the request count of the global mutex owner.\n *\n- * Any parameter can be NULL to ignore the respective value.\n+ * On success, the return value indicates the owner state:\n+ * - 0: the mutex is currently owned and the owner is alive\n+ * - 1: the mutex is currently owned byt the owner is dead\n+ * - 2: the mutex is not currently owned\n *\n- * Returns -1 if the mutex is not owned or an error occurs.\n+ * Any argument can be NULL to ignore the respective value.\n+ *\n+ * Returns -1 and sets errno if an error occurs when querying the owner.\n *\/\n int global_lock_info(pid_t *pid, int *tid, unsigned *count)\n {\n@@ -593,7 +612,7 @@\n TID tid2 = 0;\n ULONG count2 = 0;\n APIRET arc = DosQueryMutexSem(gMutex, &pid2, &tid2, &count2);\n- if (arc == NO_ERROR)\n+ if (arc == NO_ERROR || arc == ERROR_SEM_OWNER_DIED)\n {\n if (pid)\n *pid = pid2;\n@@ -601,10 +620,13 @@\n *tid = tid2;\n if (count)\n *count = count2;\n- return 0;\n- }\n- }\n-\n+ return arc == NO_ERROR ? (count2 != 0 ? 0 : 2) : 1;\n+ }\n+ errno = __libc_native2errno(arc);\n+ return -1;\n+ }\n+\n+ errno = EBADF; \/\/ ERROR_INVALID_HANDLE\n return -1;\n }\n \n@@ -1311,17 +1333,32 @@\n #endif\n );\n \n+ if (nret < size - 1)\n+ nret += snprintf(buf + nret, size - nret,\n+ \"===== LIBCx global mutex info =====\\n\"\n+ \"mutex handle: %08lx\\n\", gMutex);\n+\n if (nret < size - 1 && gMutex != NULLHANDLE)\n {\n int pid, tid;\n- if (global_lock_info(&pid, &tid, NULL) == 0)\n+ unsigned count;\n+ if ((rc = global_lock_info(&pid, &tid, &count)) >= 0)\n {\n nret += snprintf(buf + nret, size - nret,\n- \"===== LIBCx global mutex owner =====\\n\"\n- \"mutex handle: %08lx\\n\"\n- \"owner PID: %04x (%d)\\n\"\n- \"owner TID: %d\\n\",\n- gMutex, pid, pid, tid);\n+ \"owner state: %s\\n\"\n+ \"owner PID: %04x (%d)%s\\n\"\n+ \"owner TID: %d%s\\n\"\n+ \"request #: %u\\n\",\n+ rc == 0 ? \"alive\" : rc == 1 ? \"dead\" : \"not owned\",\n+ pid, pid, pid == getpid() ? \" <current>\" : \"\",\n+ tid, pid == getpid() && tid == _gettid() ? \" <current>\" : \"\",\n+ count);\n+ }\n+ else\n+ {\n+ nret += snprintf(buf + nret, size - nret,\n+ \"<failed to get owner info: rc %d, errno %d>\\n\",\n+ rc, errno);\n }\n }\n \n"} {"commit":"1069eaf4dbf89cdb270d26373f644e00e343d9ac","subject":"Added another safe cast to prevent warning","message":"Added another safe cast to prevent warning\n","repos":"dcrossleyau\/yaz,nla\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz,nla\/yaz,nla\/yaz,nla\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/siconv.c\n+++ src\/siconv.c\n@@ -2,7 +2,7 @@\n * Copyright (C) 1995-2006, Index Data ApS\n * See the file LICENSE for details.\n *\n- * $Id: siconv.c,v 1.20 2006-04-19 23:46:15 adam Exp $\n+ * $Id: siconv.c,v 1.21 2006-04-19 23:48:06 adam Exp $\n *\/\n \/**\n * \\file siconv.c\n@@ -740,7 +740,8 @@\n \n for (i = 0; i < cd->write_marc8_comb_no; i++)\n {\n- byte = cd->write_marc8_comb_ch[i];\n+ \/* all MARC-8 combined characters are simple bytes *\/\n+ byte = (unsigned char )(cd->write_marc8_comb_ch[i]);\n if (byte == 0xEB)\n second_half = 0xEC;\n else if (byte == 0xFA)\n"} {"commit":"32c924506eca496ed580a3f9175f3cde69179fee","subject":"added raise() to signal.h","message":"added raise() to signal.h\n","repos":"ynezz\/wcelibcex","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/signal.h\n+++ src\/signal.h\n@@ -0,0 +1,47 @@\n+\/* \n+ * $Id$\n+ *\n+ * signal.h - obvious, isn't it?\n+ *\n+ * Copyright (c) 2011 Petr Stetiar <ynezz@true.cz>\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining\n+ * a copy of this software and associated documentation files (the \"Software\"),\n+ * to deal in the Software without restriction, including without limitation \n+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\n+ * and\/or sell copies of the Software, and to permit persons to whom \n+ * the Software is furnished to do so, subject to the following conditions:\n+ * \n+ * The above copyright notice and this permission notice shall be included\n+ * in all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\n+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\n+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH\n+ * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n+ *\n+ * MIT License:\n+ * http:\/\/opensource.org\/licenses\/mit-license.php\n+ *\n+ *\/\n+#ifndef WCEEX_SIGNAL_H\n+#define WCEEX_SIGNAL_H\t1\n+\n+#if !defined(_WIN32_WCE)\n+# error \"Only Windows CE target is supported!\"\n+#endif\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif \/* __cplusplus *\/\n+\n+#define raise(x)\n+\n+#ifdef __cplusplus\n+}\n+#endif \/* __cplusplus *\/\n+\n+#endif \/* #ifndef WCEEX_SIGNAL_H *\/\n"} {"commit":"fa9115e08d7f997f433d13b359ea120d28d9562a","subject":"Forgot to free the arguments","message":"Forgot to free the arguments\n","repos":"mariusor\/mpris-scrobbler,mariusor\/mpris-scrobbler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/signon.c\n+++ src\/signon.c\n@@ -188,5 +188,6 @@\n }\n \n free_configuration(config);\n+ free_arguments(arguments);\n return EXIT_SUCCESS;\n }\n"} {"commit":"45891745c64f2a4229ab4c2296ef282df522b978","subject":"[net]add simple_readline for net tool","message":"[net]add simple_readline for net tool\n","repos":"xboot\/xboot,xboot\/xboot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/kernel\/command\/cmd-net.c\n+++ src\/kernel\/command\/cmd-net.c\n@@ -6,13 +6,49 @@\n #include <net\/net.h>\n #include <command\/command.h>\n \n+struct srl_buf_t {\n+\tchar buf[SZ_1K];\n+\tint len;\n+};\n+\n+static int simple_readline(struct srl_buf_t * srl)\n+{\n+\tint ch;\n+\n+\tif((ch = getchar()) != EOF)\n+\t{\n+\t\tunsigned char c = ch;\n+\t\tswitch(c)\n+\t\t{\n+\t\tcase 0x3:\n+\t\t\treturn -1;\n+\t\tcase 0xd:\n+\t\t\tif(srl->len < sizeof(srl->buf) - 1)\n+\t\t\t{\n+\t\t\t\tsrl->buf[srl->len++] = '\\r';\n+\t\t\t\tsrl->buf[srl->len++] = '\\n';\n+\t\t\t\tprintf(\"\\r\\n\");\n+\t\t\t}\n+\t\t\treturn 1;\n+\t\tdefault:\n+\t\t\tif(srl->len < sizeof(srl->buf))\n+\t\t\t{\n+\t\t\t\tsrl->buf[srl->len++] = c;\n+\t\t\t\tprintf(\"%c\", c);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n static void usage(void)\n {\n \tstruct device_t * pos, * n;\n \n \tprintf(\"usage:\\r\\n\");\n \tprintf(\" net <device> server <type> <port> - Listen port for waiting connection\\r\\n\");\n-\tprintf(\" net <device> client <type> <host> <port> - Connect to the remote host port\\r\\n\");\n+\tprintf(\" net <device> client <type> <host> <port> - Connect to the remote server\\r\\n\");\n \n \tprintf(\"supported device list:\\r\\n\");\n \tlist_for_each_entry_safe(pos, n, &__device_head[DEVICE_TYPE_NET], head)\n@@ -86,20 +122,21 @@\n \t\t\t\tstruct socket_connect_t * c = net_connect(net, argv[0], argv[1], atoi(argv[2]));\n \t\t\t\tif(c)\n \t\t\t\t{\n-\t\t\t\t\tchar buf[SZ_4K];\n+\t\t\t\t\tchar buf[SZ_1K];\n+\t\t\t\t\tstruct srl_buf_t srl;\n+\t\t\t\t\tsrl.len = 0;\n \t\t\t\t\twhile(1)\n \t\t\t\t\t{\n \t\t\t\t\t\tif(!net_status(c))\n \t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tint ch = getchar();\n-\t\t\t\t\t\tif(ch != EOF)\n+\t\t\t\t\t\tint r = simple_readline(&srl);\n+\t\t\t\t\t\tif(r > 0)\n \t\t\t\t\t\t{\n-\t\t\t\t\t\t\tif(ch == 0x3)\n-\t\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\tunsigned char uc = ch;\n-\t\t\t\t\t\t\tnet_write(c, &uc, 1);\n-\t\t\t\t\t\t\tprintf(\"%c\", uc);\n+\t\t\t\t\t\t\tnet_write(c, srl.buf, srl.len);\n+\t\t\t\t\t\t\tsrl.len = 0;\n \t\t\t\t\t\t}\n+\t\t\t\t\t\telse if(r < 0)\n+\t\t\t\t\t\t\tbreak;\n \t\t\t\t\t\tint len = net_read(c, buf, sizeof(buf));\n \t\t\t\t\t\tif(len > 0)\n \t\t\t\t\t\t{\n@@ -116,7 +153,7 @@\n \t\t\t\t\tnet_close(c);\n \t\t\t\t}\n \t\t\t\telse\n-\t\t\t\t\tprintf(\"Failed to connect '%s:%s' with '%s' type\\r\\n\", argv[1], argv[2], argv[0]);\n+\t\t\t\t\tprintf(\"Failed to connect server '%s:%s' with '%s' type\\r\\n\", argv[1], argv[2], argv[0]);\n \t\t\t}\n \t\t\telse\n \t\t\t\tusage();\n@@ -131,7 +168,7 @@\n \n static struct command_t cmd_net = {\n \t.name\t= \"net\",\n-\t.desc\t= \"network protocol tool\",\n+\t.desc\t= \"network protocol debug tool\",\n \t.usage\t= usage,\n \t.exec\t= do_net,\n };\n"} {"commit":"9d9e492dc0e61468d1914a449f080a75ee171b4b","subject":"remove unused variable","message":"remove unused variable\n","repos":"mingyaaaa\/libgit2,claudelee\/libgit2,maxiaoqian\/libgit2,kenprice\/libgit2,KTXSoftware\/libgit2,KTXSoftware\/libgit2,Snazz2001\/libgit2,amyvmiwei\/libgit2,whoisj\/libgit2,Corillian\/libgit2,kissthink\/libgit2,chiayolin\/libgit2,saurabhsuniljain\/libgit2,nokiddin\/libgit2,spraints\/libgit2,Corillian\/libgit2,dleehr\/libgit2,sygool\/libgit2,iankronquist\/libgit2,mrksrm\/Mingijura,magnus98\/TEST,Snazz2001\/libgit2,sim0629\/libgit2,ardumont\/libgit2,mcanthony\/libgit2,dleehr\/libgit2,amyvmiwei\/libgit2,oaastest\/libgit2,dleehr\/libgit2,linquize\/libgit2,Aorjoa\/libgit2_maked_lib,yosefhackmon\/libgit2,joshtriplett\/libgit2,nokiddin\/libgit2,kissthink\/libgit2,jeffhostetler\/public_libgit2,magnus98\/TEST,t0xicCode\/libgit2,yongthecoder\/libgit2,Snazz2001\/libgit2,jflesch\/libgit2-mariadb,kenprice\/libgit2,yongthecoder\/libgit2,evhan\/libgit2,mhp\/libgit2,leoyanggit\/libgit2,stewid\/libgit2,whoisj\/libgit2,spraints\/libgit2,mingyaaaa\/libgit2,spraints\/libgit2,joshtriplett\/libgit2,ardumont\/libgit2,falqas\/libgit2,MrHacky\/libgit2,skabel\/manguse,iankronquist\/libgit2,evhan\/libgit2,evhan\/libgit2,jamieleecool\/ptest,sygool\/libgit2,Tousiph\/Demo1,whoisj\/libgit2,falqas\/libgit2,t0xicCode\/libgit2,mrksrm\/Mingijura,Tousiph\/Demo1,claudelee\/libgit2,since2014\/libgit2,swisspol\/DEMO-libgit2,oaastest\/libgit2,Tousiph\/Demo1,spraints\/libgit2,jflesch\/libgit2-mariadb,amyvmiwei\/libgit2,dleehr\/libgit2,mingyaaaa\/libgit2,jeffhostetler\/public_libgit2,nacho\/libgit2,zodiac\/libgit2.js,whoisj\/libgit2,mcanthony\/libgit2,KTXSoftware\/libgit2,swisspol\/DEMO-libgit2,leoyanggit\/libgit2,KTXSoftware\/libgit2,oaastest\/libgit2,JIghtuse\/libgit2,jeffhostetler\/public_libgit2,maxiaoqian\/libgit2,MrHacky\/libgit2,stewid\/libgit2,kenprice\/libgit2,t0xicCode\/libgit2,rcorre\/libgit2,Corillian\/libgit2,swisspol\/DEMO-libgit2,linquize\/libgit2,saurabhsuniljain\/libgit2,stewid\/libgit2,sygool\/libgit2,linquize\/libgit2,chiayolin\/libgit2,nacho\/libgit2,swisspol\/DEMO-libgit2,raybrad\/libit2,KTXSoftware\/libgit2,falqas\/libgit2,claudelee\/libgit2,mhp\/libgit2,since2014\/libgit2,Aorjoa\/libgit2_maked_lib,iankronquist\/libgit2,ardumont\/libgit2,mcanthony\/libgit2,sygool\/libgit2,rcorre\/libgit2,stewid\/libgit2,oaastest\/libgit2,joshtriplett\/libgit2,mhp\/libgit2,rcorre\/libgit2,oaastest\/libgit2,mcanthony\/libgit2,JIghtuse\/libgit2,jflesch\/libgit2-mariadb,raybrad\/libit2,saurabhsuniljain\/libgit2,jeffhostetler\/public_libgit2,sim0629\/libgit2,yosefhackmon\/libgit2,kenprice\/libgit2,yongthecoder\/libgit2,yongthecoder\/libgit2,magnus98\/TEST,JIghtuse\/libgit2,nokiddin\/libgit2,ardumont\/libgit2,stewid\/libgit2,yosefhackmon\/libgit2,rcorre\/libgit2,linquize\/libgit2,mrksrm\/Mingijura,raybrad\/libit2,chiayolin\/libgit2,amyvmiwei\/libgit2,Tousiph\/Demo1,linquize\/libgit2,chiayolin\/libgit2,skabel\/manguse,ardumont\/libgit2,KTXSoftware\/libgit2,saurabhsuniljain\/libgit2,ardumont\/libgit2,rcorre\/libgit2,joshtriplett\/libgit2,jflesch\/libgit2-mariadb,since2014\/libgit2,jflesch\/libgit2-mariadb,nokiddin\/libgit2,mhp\/libgit2,yosefhackmon\/libgit2,kenprice\/libgit2,maxiaoqian\/libgit2,iankronquist\/libgit2,chiayolin\/libgit2,MrHacky\/libgit2,claudelee\/libgit2,leoyanggit\/libgit2,since2014\/libgit2,kissthink\/libgit2,since2014\/libgit2,MrHacky\/libgit2,JIghtuse\/libgit2,dleehr\/libgit2,joshtriplett\/libgit2,t0xicCode\/libgit2,Aorjoa\/libgit2_maked_lib,sim0629\/libgit2,kenprice\/libgit2,mcanthony\/libgit2,Aorjoa\/libgit2_maked_lib,sim0629\/libgit2,jamieleecool\/ptest,evhan\/libgit2,yongthecoder\/libgit2,spraints\/libgit2,mhp\/libgit2,jflesch\/libgit2-mariadb,magnus98\/TEST,iankronquist\/libgit2,nokiddin\/libgit2,skabel\/manguse,claudelee\/libgit2,whoisj\/libgit2,nokiddin\/libgit2,zodiac\/libgit2.js,jamieleecool\/ptest,sim0629\/libgit2,kissthink\/libgit2,jamieleecool\/ptest,jeffhostetler\/public_libgit2,magnus98\/TEST,mcanthony\/libgit2,Aorjoa\/libgit2_maked_lib,swisspol\/DEMO-libgit2,yosefhackmon\/libgit2,zodiac\/libgit2.js,rcorre\/libgit2,skabel\/manguse,mingyaaaa\/libgit2,saurabhsuniljain\/libgit2,t0xicCode\/libgit2,raybrad\/libit2,nacho\/libgit2,mrksrm\/Mingijura,chiayolin\/libgit2,Tousiph\/Demo1,kissthink\/libgit2,linquize\/libgit2,Tousiph\/Demo1,spraints\/libgit2,falqas\/libgit2,sygool\/libgit2,magnus98\/TEST,mhp\/libgit2,since2014\/libgit2,Snazz2001\/libgit2,kissthink\/libgit2,falqas\/libgit2,dleehr\/libgit2,amyvmiwei\/libgit2,JIghtuse\/libgit2,zodiac\/libgit2.js,Corillian\/libgit2,yongthecoder\/libgit2,stewid\/libgit2,saurabhsuniljain\/libgit2,leoyanggit\/libgit2,mingyaaaa\/libgit2,jeffhostetler\/public_libgit2,sim0629\/libgit2,mrksrm\/Mingijura,whoisj\/libgit2,JIghtuse\/libgit2,sygool\/libgit2,iankronquist\/libgit2,mingyaaaa\/libgit2,joshtriplett\/libgit2,falqas\/libgit2,skabel\/manguse,amyvmiwei\/libgit2,claudelee\/libgit2,swisspol\/DEMO-libgit2,oaastest\/libgit2,zodiac\/libgit2.js,maxiaoqian\/libgit2,Snazz2001\/libgit2,skabel\/manguse,MrHacky\/libgit2,Corillian\/libgit2,t0xicCode\/libgit2,yosefhackmon\/libgit2,maxiaoqian\/libgit2,Corillian\/libgit2,leoyanggit\/libgit2,raybrad\/libit2,nacho\/libgit2,leoyanggit\/libgit2,mrksrm\/Mingijura,Snazz2001\/libgit2,MrHacky\/libgit2,maxiaoqian\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/status.c\n+++ src\/status.c\n@@ -247,7 +247,6 @@\n \tunsigned int i, cnt;\n \tgit_index_entry *index_entry;\n \tchar temp_path[GIT_PATH_MAX];\n-\tgit_oid zero;\n \tint error;\n \tgit_tree *tree;\n \tstruct status_st dirent_st;\n@@ -284,7 +283,6 @@\n \tstrcpy(temp_path, repo->path_workdir);\n \tgit_futils_direach(temp_path, GIT_PATH_MAX, dirent_cb, &dirent_st);\n \n-\tmemset(&zero, 0x0, sizeof(git_oid));\n \tfor (i = 0; i < entries.length; ++i) {\n \t\te = (struct status_entry *)git_vector_get(&entries, i);\n \n"} {"commit":"498cbb1d630c8ddc473ea7e86089e6be1f08f254","subject":"Added a bunch of external includes to stdafx.h","message":"Added a bunch of external includes to stdafx.h","repos":"ahmetsemihparlak\/heekscad,ahmetsemihparlak\/heekscad,thojongle\/heekscad,tbinias\/heekscad,DINKIN\/heekscad,AlanZheng\/heekscad,pyrotron\/heekscad,FluffyMortain\/heekscad,thojongle\/heekscad,Powerino73\/heekscad,DINKIN\/heekscad,Nurb432\/heekscad,FluffyMortain\/heekscad,DINKIN\/heekscad,AlanZheng\/heekscad,Nurb432\/heekscad,singwina\/heekscad,singwina\/heekscad,tectronics\/heekscad,AlanZheng\/heekscad,ahmetsemihparlak\/heekscad,tbinias\/heekscad,DINKIN\/heekscad,Nurb432\/heekscad,thojongle\/heekscad,AlanZheng\/heekscad,pyrotron\/heekscad,tectronics\/heekscad,singwina\/heekscad,FluffyMortain\/heekscad,FluffyMortain\/heekscad,Powerino73\/heekscad,namoamitof\/heekscad,ahmetsemihparlak\/heekscad,Nurb432\/heekscad,tbinias\/heekscad,Powerino73\/heekscad,tectronics\/heekscad,tbinias\/heekscad,pyrotron\/heekscad,namoamitof\/heekscad,pyrotron\/heekscad,thojongle\/heekscad,Powerino73\/heekscad,namoamitof\/heekscad,tectronics\/heekscad,singwina\/heekscad,namoamitof\/heekscad","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/stdafx.h\n+++ src\/stdafx.h\n@@ -5,15 +5,40 @@\n #pragma warning(disable : 4996)\n #endif\n \n+#include <algorithm>\n #include <list>\n #include <vector>\n #include <map>\n #include <set>\n #include <fstream>\n #include <iomanip>\n+#include <cmath>\r\n+#include <sstream>\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <math.h>\n \n #include <wx\/wx.h>\n-\n+#include <wx\/aui\/aui.h>\r\n+#include <wx\/clipbrd.h>\r\n+#include <wx\/checklst.h>\r\n+#include <wx\/cmdline.h>\r\n+#include <wx\/dc.h>\n+#include <wx\/dcmirror.h>\n+#include <wx\/filedlg.h>\r\n+#include <wx\/filename.h>\r\n+#include <wx\/image.h>\r\n+#include <wx\/imaglist.h>\r\n+#include <wx\/menuitem.h>\n+#include <wx\/print.h>\n+#include <wx\/printdlg.h>\r\n+#include <wx\/stdpaths.h>\r\n+#include <wx\/sizer.h>\n+#include <wx\/toolbar.h>\n+#include <wx\/treectrl.h>\n+#include \"..\/tinyxml\/tinyxml.h\"\n #ifdef WIN32\n #pragma warning(disable:4100)\n #pragma warning( disable : 4244 ) \/\/ Issue warning 4244\n@@ -23,45 +48,93 @@\n #pragma warning( default : 4244 ) \/\/ Issue warning 4244\n #endif\n \n-#include <Standard.hxx>\n-\n+#include <BRepAdaptor_Curve.hxx>\n #include <BRepAdaptor_Surface.hxx>\r\n+#include <BRepAlgoAPI_Common.hxx>\r\n+#include <BRepAlgoAPI_Cut.hxx>\r\n+#include <BRepAlgoAPI_Fuse.hxx>\r\n+#include <BRepBuilderAPI_MakeEdge.hxx>\n+#include <BRepBuilderAPI_MakeFace.hxx>\n+#include <BRepBuilderAPI_MakePolygon.hxx>\n+#include <BRepBuilderAPI_MakeShape.hxx>\n+#include <BRepBuilderAPI_MakeWire.hxx>\n #include <BRepBuilderAPI_Transform.hxx>\r\n #include <BRepExtrema_DistShapeShape.hxx>\r\n+#include <BRepFilletAPI_MakeChamfer.hxx>\r\n+#include <BRepFilletAPI_MakeFillet.hxx>\n #include <BRepGProp.hxx>\r\n #include <BRepMesh.hxx>\r\n+#include <BRepOffsetAPI_DraftAngle.hxx>\n #include <BRepOffsetAPI_MakeEvolved.hxx>\n #include <BRepOffsetAPI_MakeOffset.hxx>\r\n+#include <BRepOffsetAPI_MakeOffsetShape.hxx>\r\n #include <BRepOffsetAPI_MakePipe.hxx>\n+#include <BRepOffsetAPI_Sewing.hxx>\r\n #include <BRepOffsetAPI_ThruSections.hxx>\n-#include <BRepBuilderAPI_MakePolygon.hxx>\n-#include <BRepOffsetAPI_DraftAngle.hxx>\n+#include <BRepPrimAPI_MakeBox.hxx>\n+#include <BRepPrimAPI_MakeCone.hxx>\n+#include <BRepPrimAPI_MakeCylinder.hxx>\n+#include <BRepPrimAPI_MakePrism.hxx>\r\n #include <BRepPrimAPI_MakeRevol.hxx>\n #include <BRep_Tool.hxx>\n #include <BRepTools.hxx>\r\n+#include <BRepTools_WireExplorer.hxx>\n+#include <GCPnts_AbscissaPoint.hxx>\n #include <Geom_Axis1Placement.hxx>\n #include <Geom_BezierCurve.hxx>\n+#include <Geom_BSplineCurve.hxx>\n+#include <Geom_Curve.hxx>\n+#include <Geom_Line.hxx>\n #include <Geom_Plane.hxx>\n+#include <GeomAPI_IntCS.hxx>\n+#include <GeomAPI_IntSS.hxx>\n #include <GeomAPI_ProjectPointOnSurf.hxx>\r\n+#include <GeomConvert_CompCurveToBSplineCurve.hxx>\r\n #include <GeomLProp_SLProps.hxx>\r\n #include <GProp_GProps.hxx>\r\n #include <gp.hxx>\n #include <gp_Circ.hxx>\n #include <gp_Cone.hxx>\r\n #include <gp_Cylinder.hxx>\n+#include <gp_Elips.hxx>\n+#include <gp_Dir.hxx>\n+#include <gp_Lin.hxx>\n #include <gp_Pln.hxx>\n+#include <gp_Pnt.hxx>\n+#include <gp_Vec.hxx>\n #include <gp_Sphere.hxx>\r\n+#include <gp_Trsf.hxx>\r\n+#include <IGESControl_Controller.hxx>\r\n+#include <IGESControl_Reader.hxx>\r\n+#include <IGESControl_Writer.hxx>\r\n+#include \"math_BFGS.hxx\"\n+#include \"math_MultipleVarFunctionWithGradient.hxx\"\r\n #include <Poly_Connect.hxx>\r\n+#include <Poly_Polygon3D.hxx>\n+#include <Poly_PolygonOnTriangulation.hxx>\n #include <Poly_Triangulation.hxx>\r\n #include <Precision.hxx>\n+#include <Standard.hxx>\n #include <Standard_ErrorHandler.hxx>\n #include <StdPrs_ToolShadedShape.hxx>\r\n+#include <STEPControl_Controller.hxx>\r\n+#include <STEPControl_Reader.hxx>\r\n+#include <STEPControl_Writer.hxx>\r\n #include <TColgp_Array1OfDir.hxx>\r\n #include <TColgp_Array1OfPnt.hxx>\n+#include <TColStd_Array1OfInteger.hxx>\n+#include <TColStd_Array1OfReal.hxx>\n+#include <TopExp.hxx>\n #include <TopExp_Explorer.hxx>\n #include <TopoDS.hxx>\n #include <TopoDS_Face.hxx>\r\n+#include <TopoDS_Shape.hxx>\n+#include <TopoDS_Vertex.hxx>\n+#include <TopoDS_Wire.hxx>\n+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>\n #include <TopTools_ListIteratorOfListOfShape.hxx>\r\n+#include <TopTools_MapIteratorOfMapOfShape.hxx>\r\n+#include <TopTools_MapOfShape.hxx>\r\n #include <UnitsAPI.hxx>\n \n \n"} {"commit":"85b41cb48380d86ae35474f37be4bce1cbe782ad","subject":"Fix cuda grouped convolution","message":"Fix cuda grouped convolution\n","repos":"jnbraun\/bcnn,jnbraun\/bcnn","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/layers\/bcnn_conv_layer.c\n+++ src\/layers\/bcnn_conv_layer.c\n@@ -440,9 +440,8 @@\n float *a = weights->data + j * wsz \/ param->num_groups;\n float *c =\n dst_tensor->data + (i * param->num_groups + j) * n * m;\n- float *src =\n- src_tensor->data +\n- (i * param->num_groups + j) * sz \/ param->num_groups;\n+ float *src = src_tensor->data + (i * param->num_groups + j) *\n+ sz \/ param->num_groups;\n if (param->size == 1) {\n b = src;\n } else {\n@@ -619,9 +618,9 @@\n &alpha, param->dst_tensor_desc, dst_tensor->data_gpu));\n }\n #else\n- int i, w_sz, out_sz, dst_sz2d;\n+ int i, k, out_sz, dst_sz2d;\n out_sz = batch_size * dst_tensor->w * dst_tensor->h * dst_tensor->c;\n- w_sz = param->size * param->size * src_tensor->c \/ param->num_groups;\n+ k = param->size * param->size * src_tensor->c \/ param->num_groups;\n dst_sz2d = dst_tensor->w * dst_tensor->h;\n sz = src_tensor->c * src_tensor->h * src_tensor->w \/ param->num_groups;\n \n@@ -638,13 +637,15 @@\n src_tensor->w, param->size, param->stride, param->pad,\n param->conv_workspace_gpu);\n }\n- bcnn_cuda_gemm(0, 0, param->num \/ param->num_groups, dst_sz2d, w_sz,\n- 1.0f, weights->data_gpu, w_sz,\n- param->conv_workspace_gpu, dst_sz2d, 1.0f,\n- dst_tensor->data_gpu +\n- (i * param->num_groups + j) * param->num \/\n- param->num_groups * dst_sz2d,\n- dst_sz2d);\n+ bcnn_cuda_gemm(\n+ 0, 0, param->num \/ param->num_groups, dst_sz2d, k, 1.0f,\n+ weights->data_gpu +\n+ j * bcnn_tensor_size(weights) \/ param->num_groups,\n+ k, param->conv_workspace_gpu, dst_sz2d, 1.0f,\n+ dst_tensor->data_gpu + (i * param->num_groups + j) *\n+ param->num \/ param->num_groups *\n+ dst_sz2d,\n+ dst_sz2d);\n }\n }\n if (!param->batch_norm) {\n@@ -661,7 +662,7 @@\n ,\n param->dst_tensor_desc, param->bias_desc\n #endif\n- );\n+ );\n }\n sz = dst_tensor->w * dst_tensor->h * dst_tensor->c * batch_size;\n bcnn_forward_activation_gpu(dst_tensor->data_gpu, sz, param->activation);\n@@ -708,7 +709,7 @@\n ,\n param->dst_tensor_desc, param->bias_desc\n #endif\n- );\n+ );\n } else {\n #ifndef BCNN_USE_CUDNN\n bcnn_cuda_grad_bias(biases->grad_data_gpu, dst_tensor->grad_data_gpu,\n@@ -749,9 +750,9 @@\n }\n bcnn_cuda_gemm(\n 0, 1, param->num \/ param->num_groups, n, dst_sz2d, 1,\n- dst_tensor->grad_data_gpu +\n- (i * param->num_groups + j) * param->num \/\n- param->num_groups * dst_sz2d,\n+ dst_tensor->grad_data_gpu + (i * param->num_groups + j) *\n+ param->num \/ param->num_groups *\n+ dst_sz2d,\n dst_sz2d, param->conv_workspace_gpu, dst_sz2d, 1,\n weights->grad_data_gpu + j * w_sz \/ param->num_groups, n);\n if (src_tensor->grad_data_gpu) {\n@@ -762,8 +763,9 @@\n dst_tensor->grad_data_gpu +\n (i * param->num_groups + j) * param->num \/\n param->num_groups * dst_sz2d,\n- dst_sz2d, 0, src_tensor->grad_data_gpu +\n- (i * param->num_groups + j) * sz,\n+ dst_sz2d, 0,\n+ src_tensor->grad_data_gpu +\n+ (i * param->num_groups + j) * sz,\n dst_sz2d);\n } else {\n bcnn_cuda_gemm(\n"} {"commit":"f5896b9393a22ec28911185923cc0ba569efcde7","subject":"Code cleanup","message":"Code cleanup\n","repos":"DeforaOS\/libc,DeforaOS\/libc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/stdlib.c\n+++ src\/stdlib.c\n@@ -307,9 +307,10 @@\n \n \n \/* free *\/\n+static void _free_abort(void);\n+\n void free(void * ptr)\n {\n-\tconst char buf[] = \"invalid free detected: terminated\\n\";\n \tAlloc * a = (Alloc*)((char*)ptr - sizeof(*a));\n \tAlloc * b;\n \n@@ -318,8 +319,7 @@\n \tb = a->prev;\n \tif(b->next != a)\n \t{\n-\t\twrite(2, buf, sizeof(buf) - 1);\n-\t\tabort();\n+\t\t_free_abort();\n \t\treturn;\n \t}\n \tb->next = a->next;\n@@ -329,6 +329,14 @@\n \t\treturn;\n \t}\n \tsbrk(-(a->size + sizeof(*a)));\n+}\n+\n+static void _free_abort(void)\n+{\n+\tconst char buf[] = \"invalid free detected: terminated\\n\";\n+\n+\twrite(2, buf, sizeof(buf) - 1);\n+\tabort();\n }\n \n \n"} {"commit":"bff6aee4ca2459f7aa5e82538628b38920a2dff1","subject":"tests: virNumaGetPages: use g_new0 instead of VIR_ALLOC_N","message":"tests: virNumaGetPages: use g_new0 instead of VIR_ALLOC_N\n\nSigned-off-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\nReviewed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"zippy2\/libvirt,olafhering\/libvirt,olafhering\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/virnumamock.c\n+++ tests\/virnumamock.c\n@@ -133,23 +133,13 @@\n size_t i = 0;\n \n if (pages_size)\n- *pages_size = NULL;\n+ *pages_size = g_new0(unsigned int, npages_def);\n \n if (pages_avail)\n- *pages_avail = NULL;\n+ *pages_avail = g_new0(unsigned long long, npages_def);\n \n if (pages_free)\n- *pages_free = NULL;\n-\n- *npages = 0;\n-\n- if ((pages_size && VIR_ALLOC_N(*pages_size, npages_def) < 0) ||\n- (pages_avail && VIR_ALLOC_N(*pages_avail, npages_def) < 0) ||\n- (pages_free && VIR_ALLOC_N(*pages_free, npages_def) < 0)) {\n- VIR_FREE(*pages_size);\n- VIR_FREE(*pages_avail);\n- return -1;\n- }\n+ *pages_free = g_new0(unsigned long long, npages_def);\n \n *npages = npages_def;\n if (pages_size)\n"} {"commit":"ad0d5f54100b1f3685f2535a668084f05ca4e6ae","subject":"Make clock bold","message":"Make clock bold\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=631553\n","repos":"GNOME\/gnome-panel,GNOME\/gnome-panel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- applets\/clock\/clock.c\n+++ applets\/clock\/clock.c\n@@ -1323,12 +1323,33 @@\n return button;\n }\n \n+ static void\n+_gtk_label_make_bold (GtkLabel *label)\n+{\n+ PangoFontDescription *font_desc;\n+\n+ font_desc = pango_font_description_new ();\n+\n+ pango_font_description_set_weight (font_desc,\n+ PANGO_WEIGHT_BOLD);\n+\n+ \/* This will only affect the weight of the font, the rest is\n+ * from the current state of the widget, which comes from the\n+ * theme or user prefs, since the font desc only has the\n+ * weight flag turned on.\n+ *\/\n+ gtk_widget_modify_font (GTK_WIDGET (label), font_desc);\n+\n+ pango_font_description_free (font_desc);\n+}\n+\n static GtkWidget *\n create_main_clock_label (ClockData *cd)\n {\n GtkWidget *label;\n \n label = gtk_label_new (NULL);\n+ _gtk_label_make_bold (GTK_LABEL (label));\n \tg_signal_connect (label, \"size_request\",\n \t\t\t G_CALLBACK (clock_size_request),\n \t\t\t cd);\n"} {"commit":"f6269b7e10b2641946d091a4afeda592980798a9","subject":"Improve block doxygen [ci skip]","message":"Improve block doxygen [ci skip]\n","repos":"randombit\/botan,Rohde-Schwarz-Cybersecurity\/botan,webmaster128\/botan,webmaster128\/botan,randombit\/botan,Rohde-Schwarz-Cybersecurity\/botan,webmaster128\/botan,Rohde-Schwarz-Cybersecurity\/botan,Rohde-Schwarz-Cybersecurity\/botan,randombit\/botan,randombit\/botan,randombit\/botan,webmaster128\/botan,Rohde-Schwarz-Cybersecurity\/botan,webmaster128\/botan,Rohde-Schwarz-Cybersecurity\/botan","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/block\/block_cipher.h\n+++ src\/lib\/block\/block_cipher.h\n@@ -24,14 +24,17 @@\n \n \/**\n * Create an instance based on a name\n- * Will return a null pointer if the algo\/provider combination cannot\n- * be found. If provider is empty then best available is chosen.\n+ * If provider is empty then best available is chosen.\n+ * @param algo_spec algorithm name\n+ * @param provider provider implementation to choose\n+ * @return a null pointer if the algo\/provider combination cannot be found\n *\/\n static std::unique_ptr<BlockCipher> create(const std::string& algo_spec,\n const std::string& provider = \"\");\n \n \/**\n- * Returns the list of available providers for this algorithm, empty if not available\n+ * @return list of available providers for this algorithm, empty if not available\n+ * @param algo_spec algorithm name\n *\/\n static std::vector<std::string> providers(const std::string& algo_spec);\n \n"} {"commit":"a75339130df900d94b9ecd371fb70aaf06df256b","subject":"Remove warnings from evas_preload","message":"Remove warnings from evas_preload\n\nUse EINA_INLIST_CONTAINER_GET instead of cast to\n(Evas_Preload_Pthread_Worker*) to get eina_inlist_remove's return.\n\nThis works even if the first field of Evas_Preload_Pthread_Worker is no\nlonger a EINA_INLIST\n\nPatch by: Fabiano Fid\u00eancio <fabianofidencio@gmail.com>\n\n\n\ngit-svn-id: 24a995eca3b83137dd7eab3408044d7832e202f7@53826 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"antognolli\/Evas,antognolli\/Evas,antognolli\/Evas,antognolli\/Evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/cache\/evas_preload.c\n+++ src\/lib\/cache\/evas_preload.c\n@@ -90,8 +90,9 @@\n \t }\n \n \twork = _workers;\n-\t_workers = (Evas_Preload_Pthread_Worker*) eina_inlist_remove(EINA_INLIST_GET(_workers),\n- EINA_INLIST_GET(_workers));\n+ _workers = EINA_INLIST_CONTAINER_GET(eina_inlist_remove(EINA_INLIST_GET(_workers),\n+ EINA_INLIST_GET(_workers)),\n+ Evas_Preload_Pthread_Worker);\n \tLKU(_mutex);\n \n \tif (work->func_heavy) work->func_heavy(work->data);\n@@ -142,9 +143,9 @@\n while (_workers)\n {\n work = _workers;\n- _workers = eina_inlist_remove(EINA_INLIST_GET(_workers),\n- EINA_INLIST_GET(_workers));\n-\n+ _workers = EINA_INLIST_CONTAINER_GET(eina_inlist_remove(EINA_INLIST_GET(_workers),\n+ EINA_INLIST_GET(_workers)),\n+ Evas_Preload_Pthread_Worker);\n if (work->func_cancel) work->func_cancel(work->data);\n \tfree(work);\n }\n@@ -176,7 +177,7 @@\n work->data = (void *)data;\n \n LKL(_mutex);\n- _workers = eina_inlist_append(EINA_INLIST_GET(_workers), EINA_INLIST_GET(work));\n+ _workers = (Evas_Preload_Pthread_Worker *)eina_inlist_append(EINA_INLIST_GET(_workers), EINA_INLIST_GET(work));\n if (_threads_count == _threads_max)\n {\n \tLKU(_mutex);\n@@ -230,8 +231,9 @@\n {\n if (work == (Evas_Preload_Pthread_Worker *)thread)\n {\n- _workers = eina_inlist_remove(EINA_INLIST_GET(_workers),\n- EINA_INLIST_GET(work));\n+ _workers = EINA_INLIST_CONTAINER_GET(eina_inlist_remove(EINA_INLIST_GET(_workers),\n+ EINA_INLIST_GET(work)),\n+ Evas_Preload_Pthread_Worker);\n LKU(_mutex);\n if (work->func_cancel) work->func_cancel(work->data);\n free(work);\n"} {"commit":"945d41b48c58a4a657d1f8697b0b1a0d26400086","subject":"Streams: add streamCompareID() declaration in stream.h.","message":"Streams: add streamCompareID() declaration in stream.h.\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/stream.h\n+++ src\/stream.h\n@@ -108,5 +108,6 @@\n streamCG *streamCreateCG(stream *s, char *name, size_t namelen, streamID *id);\n streamNACK *streamCreateNACK(streamConsumer *consumer);\n void streamDecodeID(void *buf, streamID *id);\n+int streamCompareID(streamID *a, streamID *b);\n \n #endif\n"} {"commit":"b5cbe227146a5dd7e578e162eb22350dcef2f6d7","subject":"Evas: Handle framespace changes also during 'render'.","message":"Evas: Handle framespace changes also during 'render'.\n\n\n\ngit-svn-id: 6d771e449150288cc513807b7f4d2af31e9482bd@66306 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"TizenChameleon\/evas,TizenChameleon\/evas,TizenChameleon\/evas,TizenChameleon\/uifw-evas,TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/uifw-evas,TizenChameleon\/uifw-evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/canvas\/evas_render.c\n+++ src\/lib\/canvas\/evas_render.c\n@@ -1406,7 +1406,13 @@\n r->x, r->y, r->w, r->h);\n eina_rectangle_free(r);\n }\n- \/* phase 4. output & viewport changes *\/\n+ \/* phase 4. framespace, output & viewport changes *\/\n+ if (e->framespace.changed) \n+ {\n+ e->engine.func->output_redraws_rect_add(e->engine.data.output,\n+ e->framespace.x, e->framespace.y,\n+ e->framespace.w, e->framespace.h);\n+ }\n if (e->viewport.changed)\n {\n e->engine.func->output_redraws_rect_add(e->engine.data.output,\n@@ -1664,6 +1670,7 @@\n e->changed = 0;\n e->viewport.changed = 0;\n e->output.changed = 0;\n+ e->framespace.changed = 0;\n e->invalidate = 0;\n \n \/* If their are some object to restack or some object to delete,\n"} {"commit":"6cc878c5d3b027ed045b1e0cad4aa2b4f319229e","subject":"runtime prefix 3 - use prefix for ICU data","message":"runtime prefix 3 - use prefix for ICU data\n\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@6780 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/string.c\n+++ src\/string.c\n@@ -251,15 +251,33 @@\n void * __ptr;\n } __ptr_u;\n \n- \/* DEFAULT_ICU_DATA_DIR is configured at build time, or it may be\n- set through the $PARROT_ICU_DATA_DIR environment variable. Need\n- a way to specify this via the command line as well. *\/\n- data_dir = Parrot_getenv(\"PARROT_ICU_DATA_DIR\", &free_data_dir);\n- if (data_dir == NULL)\n- data_dir = const_cast(DEFAULT_ICU_DATA_DIR);\n- string_set_data_directory(data_dir);\n- if (free_data_dir)\n- mem_sys_free((void*)data_dir); \/* cast away the constness *\/\n+ if (!interpreter->parent_interpreter) {\n+ \/* DEFAULT_ICU_DATA_DIR is configured at build time, or it may be\n+ set through the $PARROT_ICU_DATA_DIR environment variable. Need\n+ a way to specify this via the command line as well. *\/\n+ data_dir = Parrot_getenv(\"PARROT_ICU_DATA_DIR\", &free_data_dir);\n+ if (data_dir == NULL) {\n+ const char *prefix;\n+ char *p, *build_path;\n+ build_path = data_dir = const_cast(DEFAULT_ICU_DATA_DIR);\n+ \/*\n+ * if the installed --prefix directory exists then use it\n+ *\/\n+ prefix = Parrot_get_runtime_prefix(interpreter, NULL);\n+ if (prefix) {\n+ p = strstr(build_path, \"blib\"); \/* ...\/blib\/lib\/... *\/\n+ assert(p);\n+ --p; \/* slash or backslash *\/\n+ data_dir = mem_sys_allocate(strlen(prefix) + strlen(p) + 1);\n+ strcpy(data_dir, prefix);\n+ strcat(data_dir, p);\n+ free_data_dir = 1;\n+ }\n+ }\n+ string_set_data_directory(data_dir);\n+ if (free_data_dir)\n+ mem_sys_free((void*)data_dir); \/* cast away the constness *\/\n+ }\n \/*\n encoding_init();\n chartype_init();\n"} {"commit":"bb952138fff081a8d72c85638677b3c5fa1dd3d4","subject":"Be sure to ininitalize the copy descriptor","message":"Be sure to ininitalize the copy descriptor\n\n","repos":"turran\/egueb,turran\/egueb,turran\/egueb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/dom\/egueb_dom_list.c\n+++ src\/lib\/dom\/egueb_dom_list.c\n@@ -133,6 +133,7 @@\n \t\tEgueb_Dom_Value nv = EGUEB_DOM_VALUE_INIT;;\n \n \t\tegueb_dom_value_init(&v, thiz->content_descriptor);\n+\t\tegueb_dom_value_init(&nv, thiz->content_descriptor);\n \t\tegueb_dom_value_data_from(&v, data);\n \t\tegueb_dom_value_copy(&v, &nv, EINA_TRUE);\n \t\tret->list = eina_list_append(ret->list, nv.data.ptr);\n"} {"commit":"0adc072a14901e5759e06f90c47cd344938e803c","subject":"\t* ecore: Match what doc when disabling thread support in ecore.","message":"\t* ecore: Match what doc when disabling thread support in ecore.\n\n\ngit-svn-id: 02aad79badda6dfe9dc72877135550b4bc575585@46467 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/ecore\/ecore_thread.c\n+++ src\/lib\/ecore\/ecore_thread.c\n@@ -316,6 +316,6 @@\n work->cancel = EINA_TRUE;\n return EINA_FALSE;\n #else\n- return EINA_FALSE;\n-#endif\n-}\n+ return EINA_TRUE;\n+#endif\n+}\n"} {"commit":"f88c4d64fffd012a3858bbee841d3ac3c09b9326","subject":"Don't add duplicate blocks to the hashtable.","message":"Don't add duplicate blocks to the hashtable.\n\nA large number of duplicate blocks (long runs of zero) act like a DOS\nattack on the open addressing hashtable because they all cluster.\n\nMake rs_block_sig_init() support passing NULL for the strong_sum for\nwhen the strong sum is not yet calculated.\n\nMake rs_block_match_init() take a strong_sum argument for when the\nstrong_sum is pre-calculated. Use rs_block_sig_init() to initialize\nthe block_sig attribute.\n\nMake rs_build_hash_table() check for existing identical blocks before\nadding entries to the hashtable.\n","repos":"librsync\/librsync,librsync\/librsync,sourcefrog\/librsync,dbaarda\/librsync,dbaarda\/librsync,dbaarda\/librsync,dbaarda\/librsync,librsync\/librsync,sourcefrog\/librsync,sourcefrog\/librsync,librsync\/librsync,sourcefrog\/librsync","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sumset.c\n+++ src\/sumset.c\n@@ -39,7 +39,8 @@\n static void rs_block_sig_init(rs_block_sig_t *sig, rs_weak_sum_t weak_sum, rs_strong_sum_t *strong_sum, int strong_len)\n {\n sig->weak_sum = weak_sum;\n- memcpy(sig->strong_sum, strong_sum, strong_len);\n+ if (strong_sum)\n+ memcpy(sig->strong_sum, strong_sum, strong_len);\n }\n \n static inline unsigned rs_block_sig_hash(const rs_block_sig_t *sig)\n@@ -54,10 +55,10 @@\n size_t len;\n } rs_block_match_t;\n \n-static void rs_block_match_init(rs_block_match_t *match, rs_signature_t *sig, rs_weak_sum_t weak_sum, const void *buf,\n-\t\t\t\tsize_t len)\n-{\n- match->block_sig.weak_sum = weak_sum;\n+static void rs_block_match_init(rs_block_match_t *match, rs_signature_t *sig, rs_weak_sum_t weak_sum,\n+ rs_strong_sum_t *strong_sum, const void *buf, size_t len)\n+{\n+ rs_block_sig_init(&match->block_sig, weak_sum, strong_sum, sig->strong_sum_len);\n match->signature = sig;\n match->buf = buf;\n match->len = len;\n@@ -167,7 +168,7 @@\n rs_block_sig_t *b;\n \n rs_signature_check(sig);\n- rs_block_match_init(&m, sig, weak_sum, buf, len);\n+ rs_block_match_init(&m, sig, weak_sum, NULL, buf, len);\n if ((b = hashtable_find(sig->hashtable, &m))) {\n return (rs_long_t)rs_block_sig_idx(sig, b) * sig->block_len;\n }\n@@ -193,14 +194,20 @@\n \n rs_result rs_build_hash_table(rs_signature_t *sig)\n {\n+ rs_block_match_t m;\n+ rs_block_sig_t *b;\n int i;\n \n rs_signature_check(sig);\n sig->hashtable = hashtable_new(sig->count);\n if (!sig->hashtable)\n return RS_MEM_ERROR;\n- for (i = 0; i < sig->count; i++)\n- hashtable_add(sig->hashtable, rs_block_sig_ptr(sig, i));\n+ for (i = 0; i < sig->count; i++) {\n+ b = rs_block_sig_ptr(sig, i);\n+ rs_block_match_init(&m, sig, b->weak_sum, &b->strong_sum, NULL, 0);\n+ if (!hashtable_find(sig->hashtable, &m))\n+ hashtable_add(sig->hashtable, b);\n+ }\n return RS_DONE;\n }\n \n@@ -217,7 +224,7 @@\n char strong_hex[RS_MAX_STRONG_SUM_LENGTH * 3];\n \n rs_log(RS_LOG_INFO|RS_LOG_NONAME, \"sumset info: magic=%#x, block_len=%d, block_num=%d\",\n-\t sums->magic, sums->block_len, sums->count);\n+ sums->magic, sums->block_len, sums->count);\n \n for (i = 0; i < sums->count; i++) {\n b = rs_block_sig_ptr(sums, i);\n"} {"commit":"c27098405654809ec6195daa38689fd447222435","subject":"fix valgrind bitch about uniittied mem!","message":"fix valgrind bitch about uniittied mem!\n\n\n\nSVN revision: 70461\n","repos":"gfriloux\/ecore,gfriloux\/ecore,gfriloux\/ecore","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/ecore\/ecore_thread.c\n+++ src\/lib\/ecore\/ecore_thread.c\n@@ -662,7 +662,7 @@\n \n result = eina_trash_pop(&_ecore_thread_worker_trash);\n \n- if (!result) result = malloc(sizeof (Ecore_Pthread_Worker));\n+ if (!result) result = calloc(1, sizeof(Ecore_Pthread_Worker));\n else _ecore_thread_worker_count--;\n \n LKI(result->cancel_mutex);\n"} {"commit":"bebcb928c820d0ee83aca4b192adc195e43e66a2","subject":"ipc\/msg.c: Fix lost wakeup in msgsnd().","message":"ipc\/msg.c: Fix lost wakeup in msgsnd().\n\nThe check if the queue is full and adding current to the wait queue of\npending msgsnd() operations (ss_add()) must be atomic.\n\nOtherwise:\n - the thread that performs msgsnd() finds a full queue and decides to\n sleep.\n - the thread that performs msgrcv() first reads all messages from the\n queue and then sleeps, because the queue is empty.\n - the msgrcv() calls do not perform any wakeups, because the msgsnd()\n task has not yet called ss_add().\n - then the msgsnd()-thread first calls ss_add() and then sleeps.\n\nNet result: msgsnd() and msgrcv() both sleep forever.\n\nObserved with msgctl08 from ltp with a preemptible kernel.\n\nFix: Call ipc_lock_object() before performing the check.\n\nThe patch also moves security_msg_queue_msgsnd() under ipc_lock_object:\n - msgctl(IPC_SET) explicitely mentions that it tries to expunge any\n pending operations that are not allowed anymore with the new\n permissions. If security_msg_queue_msgsnd() is called without locks,\n then there might be races.\n - it makes the patch much simpler.\n\nReported-and-tested-by: Vineet Gupta <bd05ca6cff4fa9f3083b4f5f4cfd92a96f3c3adb@synopsys.com>\nAcked-by: Rik van Riel <a21938f5d463ddf41aa718934c205ca2cce8ebbc@redhat.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org # for 3.11\nSigned-off-by: Manfred Spraul <e4eddfaff1fc5d7affa656f47ee4d83207ccac30@colorfullife.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ipc\/msg.c\n+++ ipc\/msg.c\n@@ -680,16 +680,18 @@\n \t\tgoto out_unlock1;\n \t}\n \n+\tipc_lock_object(&msq->q_perm);\n+\n \tfor (;;) {\n \t\tstruct msg_sender s;\n \n \t\terr = -EACCES;\n \t\tif (ipcperms(ns, &msq->q_perm, S_IWUGO))\n-\t\t\tgoto out_unlock1;\n+\t\t\tgoto out_unlock0;\n \n \t\terr = security_msg_queue_msgsnd(msq, msg, msgflg);\n \t\tif (err)\n-\t\t\tgoto out_unlock1;\n+\t\t\tgoto out_unlock0;\n \n \t\tif (msgsz + msq->q_cbytes <= msq->q_qbytes &&\n \t\t\t\t1 + msq->q_qnum <= msq->q_qbytes) {\n@@ -699,10 +701,9 @@\n \t\t\/* queue full, wait: *\/\n \t\tif (msgflg & IPC_NOWAIT) {\n \t\t\terr = -EAGAIN;\n-\t\t\tgoto out_unlock1;\n-\t\t}\n-\n-\t\tipc_lock_object(&msq->q_perm);\n+\t\t\tgoto out_unlock0;\n+\t\t}\n+\n \t\tss_add(msq, &s);\n \n \t\tif (!ipc_rcu_getref(msq)) {\n@@ -730,10 +731,7 @@\n \t\t\tgoto out_unlock0;\n \t\t}\n \n-\t\tipc_unlock_object(&msq->q_perm);\n-\t}\n-\n-\tipc_lock_object(&msq->q_perm);\n+\t}\n \tmsq->q_lspid = task_tgid_vnr(current);\n \tmsq->q_stime = get_seconds();\n \n"} {"commit":"17052af1af959a7994d346b3745611f71baea88b","subject":"linenoise small fix","message":"linenoise small fix","repos":"abusalimov\/embox,Kefir0192\/embox,Kefir0192\/embox,Kefir0192\/embox,Kefir0192\/embox,Kefir0192\/embox,embox\/embox,abusalimov\/embox,Kakadu\/embox,vrxfile\/embox-trik,mike2390\/embox,Kakadu\/embox,vrxfile\/embox-trik,vrxfile\/embox-trik,embox\/embox,mike2390\/embox,gzoom13\/embox,mike2390\/embox,abusalimov\/embox,abusalimov\/embox,gzoom13\/embox,vrxfile\/embox-trik,Kakadu\/embox,gzoom13\/embox,Kakadu\/embox,mike2390\/embox,embox\/embox,Kefir0192\/embox,embox\/embox,Kakadu\/embox,embox\/embox,mike2390\/embox,Kefir0192\/embox,vrxfile\/embox-trik,mike2390\/embox,abusalimov\/embox,embox\/embox,mike2390\/embox,gzoom13\/embox,abusalimov\/embox,gzoom13\/embox,gzoom13\/embox,Kakadu\/embox,gzoom13\/embox,Kakadu\/embox,vrxfile\/embox-trik,vrxfile\/embox-trik","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/readline\/linenoise.c\n+++ src\/lib\/readline\/linenoise.c\n@@ -295,7 +295,9 @@\n \t if (compl_cnt == 0) {\n \t\tcompl_cnt = cb(buf, compl);\n \t }\n-\t if (compl_cnt == 1) {\n+\t if (compl_cnt == 0) {\n+\t\tcontinue;\n+\t } else if (compl_cnt == 1) {\n \t\tstrcpy(buf, compl);\n \t\tlen = strlen(buf);\n \t\tpos = len;\n"} {"commit":"72a6e90d83c28370502e2c681074e617b3788f6c","subject":"exit functions take an optional argument","message":"exit functions take an optional argument\n","repos":"leavesbnw\/picrin,picrin-scheme\/picrin,koba-e964\/picrin,omasanori\/picrin,leavesbnw\/picrin,ktakashi\/picrin,leavesbnw\/picrin,dcurrie\/picrin,ktakashi\/picrin,ktakashi\/picrin,omasanori\/picrin,dcurrie\/picrin,koba-e964\/picrin,picrin-scheme\/picrin,koba-e964\/picrin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/system.c\n+++ src\/system.c\n@@ -24,17 +24,41 @@\n static pic_value\n pic_system_exit(pic_state *pic)\n {\n- pic_get_args(pic, \"\");\n+ pic_value v;\n+ int argc, status = EXIT_SUCCESS;\n \n- exit(EXIT_SUCCESS);\n+ argc = pic_get_args(pic, \"|o\", &v);\n+ if (argc == 1) {\n+ switch (pic_type(v)) {\n+ case PIC_TT_FLOAT:\n+ status = (int)pic_float(v);\n+ break;\n+ default:\n+ break;\n+ }\n+ }\n+\n+ exit(status);\n }\n \n static pic_value\n pic_system_emergency_exit(pic_state *pic)\n {\n- pic_get_args(pic, \"\");\n+ pic_value v;\n+ int argc, status = EXIT_FAILURE;\n \n- _Exit(EXIT_FAILURE);\n+ argc = pic_get_args(pic, \"|o\", &v);\n+ if (argc == 1) {\n+ switch (pic_type(v)) {\n+ case PIC_TT_FLOAT:\n+ status = (int)pic_float(v);\n+ break;\n+ default:\n+ break;\n+ }\n+ }\n+\n+ _Exit(status);\n }\n \n static pic_value\n"} {"commit":"e9d805dd4374cead02a4e991515bae3bf9547e43","subject":"libFLAC\/lpc_intrin_sse.c : New SSE code to calculate autocorrelation.","message":"libFLAC\/lpc_intrin_sse.c : New SSE code to calculate autocorrelation.\n\nAccelerate FLAC__lpc_compute_autocorrelation_intrin_sse_lag_NN routines for\nAMD and newer Intel CPUs (means Core i aka Nehalem and newer). Unfortunately\nit's slower on older Intel CPUs.\n\nAccording to tests at HA:\n\n <http:\/\/www.hydrogenaud.io\/forums\/index.php?s=&showtopic=101082&view=findpost&p=870753>\n\n CPU flac -5 flac -8\n\n Athlon XP +5 % +2.4 %\n Athlon 64 X2 +9 % +4 %\n Core i +7 % +1 % ... +2.7 %\n Core 2 ? -3.5 %\n\nAccording to Steam HW survey <http:\/\/store.steampowered.com\/hwsurvey\/>\n69% of Steam users have SSE4.2 which means that the new code is faster for\nthem. There are also AMD users that don't have SSE4.2, so 75% of Steam users\nshould benefit from this patch.\n\nPatch-from: lvqcl <eea571d36fd4ab6d1b7846011ee3606fc46f6b58@gmail.com>\n","repos":"waitman\/flac,waitman\/flac,waitman\/flac,waitman\/flac,waitman\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libFLAC\/lpc_intrin_sse.c\n+++ src\/libFLAC\/lpc_intrin_sse.c\n@@ -45,6 +45,204 @@\n \n #include <xmmintrin.h> \/* SSE *\/\n \n+#if 1\n+\/* Faster on current Intel (starting from Core i aka Nehalem) and all AMD CPUs *\/\n+\n+FLAC__SSE_TARGET(\"sse\")\n+void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[])\n+{\n+\tint i;\n+\tint limit = data_len - 4;\n+\t__m128 sum0;\n+\n+\t(void) lag;\n+\tFLAC__ASSERT(lag <= 4);\n+\tFLAC__ASSERT(lag <= data_len);\n+\n+\tsum0 = _mm_setzero_ps();\n+\n+\tfor(i = 0; i <= limit; i++) {\n+\t\t__m128 d, d0;\n+\t\td0 = _mm_loadu_ps(data+i);\n+\t\td = d0; d = _mm_shuffle_ps(d, d, 0);\n+\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d));\n+\t}\n+\n+\t{\n+\t\t__m128 d0 = _mm_setzero_ps();\n+\t\tlimit++; if(limit < 0) limit = 0;\n+\n+\t\tfor(i = data_len-1; i >= limit; i--) {\n+\t\t\t__m128 d;\n+\t\t\td = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0);\n+\t\t\td0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td0 = _mm_move_ss(d0, d);\n+\t\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0));\n+\t\t}\n+\t}\n+\n+\t_mm_storeu_ps(autoc, sum0);\n+}\n+\n+FLAC__SSE_TARGET(\"sse\")\n+void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[])\n+{\n+\tint i;\n+\tint limit = data_len - 8;\n+\t__m128 sum0, sum1;\n+\n+\t(void) lag;\n+\tFLAC__ASSERT(lag <= 8);\n+\tFLAC__ASSERT(lag <= data_len);\n+\n+\tsum0 = _mm_setzero_ps();\n+\tsum1 = _mm_setzero_ps();\n+\n+\tfor(i = 0; i <= limit; i++) {\n+\t\t__m128 d, d0, d1;\n+\t\td0 = _mm_loadu_ps(data+i);\n+\t\td1 = _mm_loadu_ps(data+i+4);\n+\t\td = d0; d = _mm_shuffle_ps(d, d, 0);\n+\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d));\n+\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d));\n+\t}\n+\n+\t{\n+\t\t__m128 d0 = _mm_setzero_ps();\n+\t\t__m128 d1 = _mm_setzero_ps();\n+\t\tlimit++; if(limit < 0) limit = 0;\n+\n+\t\tfor(i = data_len-1; i >= limit; i--) {\n+\t\t\t__m128 d;\n+\t\t\td = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0);\n+\t\t\td1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td1 = _mm_move_ss(d1, d0);\n+\t\t\td0 = _mm_move_ss(d0, d);\n+\t\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1));\n+\t\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0));\n+\t\t}\n+\t}\n+\n+\t_mm_storeu_ps(autoc, sum0);\n+\t_mm_storeu_ps(autoc+4, sum1);\n+}\n+\n+FLAC__SSE_TARGET(\"sse\")\n+void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[])\n+{\n+\tint i;\n+\tint limit = data_len - 12;\n+\t__m128 sum0, sum1, sum2;\n+\n+\t(void) lag;\n+\tFLAC__ASSERT(lag <= 12);\n+\tFLAC__ASSERT(lag <= data_len);\n+\n+\tsum0 = _mm_setzero_ps();\n+\tsum1 = _mm_setzero_ps();\n+\tsum2 = _mm_setzero_ps();\n+\n+\tfor(i = 0; i <= limit; i++) {\n+\t\t__m128 d, d0, d1, d2;\n+\t\td0 = _mm_loadu_ps(data+i);\n+\t\td1 = _mm_loadu_ps(data+i+4);\n+\t\td2 = _mm_loadu_ps(data+i+8);\n+\t\td = d0; d = _mm_shuffle_ps(d, d, 0);\n+\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d));\n+\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d));\n+\t\tsum2 = _mm_add_ps(sum2, _mm_mul_ps(d2, d));\n+\t}\n+\n+\t{\n+\t\t__m128 d0 = _mm_setzero_ps();\n+\t\t__m128 d1 = _mm_setzero_ps();\n+\t\t__m128 d2 = _mm_setzero_ps();\n+\t\tlimit++; if(limit < 0) limit = 0;\n+\n+\t\tfor(i = data_len-1; i >= limit; i--) {\n+\t\t\t__m128 d;\n+\t\t\td = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0);\n+\t\t\td2 = _mm_shuffle_ps(d2, d2, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td2 = _mm_move_ss(d2, d1);\n+\t\t\td1 = _mm_move_ss(d1, d0);\n+\t\t\td0 = _mm_move_ss(d0, d);\n+\t\t\tsum2 = _mm_add_ps(sum2, _mm_mul_ps(d, d2));\n+\t\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1));\n+\t\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0));\n+\t\t}\n+\t}\n+\n+\t_mm_storeu_ps(autoc, sum0);\n+\t_mm_storeu_ps(autoc+4, sum1);\n+\t_mm_storeu_ps(autoc+8, sum2);\n+}\n+\n+FLAC__SSE_TARGET(\"sse\")\n+void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[])\n+{\n+\tint i;\n+\tint limit = data_len - 16;\n+\t__m128 sum0, sum1, sum2, sum3;\n+\n+\t(void) lag;\n+\tFLAC__ASSERT(lag <= 16);\n+\tFLAC__ASSERT(lag <= data_len);\n+\n+\tsum0 = _mm_setzero_ps();\n+\tsum1 = _mm_setzero_ps();\n+\tsum2 = _mm_setzero_ps();\n+\tsum3 = _mm_setzero_ps();\n+\n+\tfor(i = 0; i <= limit; i++) {\n+\t\t__m128 d, d0, d1, d2, d3;\n+\t\td0 = _mm_loadu_ps(data+i);\n+\t\td1 = _mm_loadu_ps(data+i+4);\n+\t\td2 = _mm_loadu_ps(data+i+8);\n+\t\td3 = _mm_loadu_ps(data+i+12);\n+\t\td = d0; d = _mm_shuffle_ps(d, d, 0);\n+\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d));\n+\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d));\n+\t\tsum2 = _mm_add_ps(sum2, _mm_mul_ps(d2, d));\n+\t\tsum3 = _mm_add_ps(sum3, _mm_mul_ps(d3, d));\n+\t}\n+\n+\t{\n+\t\t__m128 d0 = _mm_setzero_ps();\n+\t\t__m128 d1 = _mm_setzero_ps();\n+\t\t__m128 d2 = _mm_setzero_ps();\n+\t\t__m128 d3 = _mm_setzero_ps();\n+\t\tlimit++; if(limit < 0) limit = 0;\n+\n+\t\tfor(i = data_len-1; i >= limit; i--) {\n+\t\t\t__m128 d;\n+\t\t\td = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0);\n+\t\t\td3 = _mm_shuffle_ps(d3, d3, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td2 = _mm_shuffle_ps(d2, d2, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3));\n+\t\t\td3 = _mm_move_ss(d3, d2);\n+\t\t\td2 = _mm_move_ss(d2, d1);\n+\t\t\td1 = _mm_move_ss(d1, d0);\n+\t\t\td0 = _mm_move_ss(d0, d);\n+\t\t\tsum3 = _mm_add_ps(sum3, _mm_mul_ps(d, d3));\n+\t\t\tsum2 = _mm_add_ps(sum2, _mm_mul_ps(d, d2));\n+\t\t\tsum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1));\n+\t\t\tsum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0));\n+\t\t}\n+\t}\n+\n+\t_mm_storeu_ps(autoc, sum0);\n+\t_mm_storeu_ps(autoc+4, sum1);\n+\t_mm_storeu_ps(autoc+8, sum2);\n+\t_mm_storeu_ps(autoc+12,sum3);\n+}\n+\n+#else\n+\/* Faster on older Intel CPUs (up to Core 2) *\/\n+\n FLAC__SSE_TARGET(\"sse\")\n void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[])\n {\n@@ -245,6 +443,7 @@\n \t_mm_storeu_ps(autoc+8, xmm8);\n \t_mm_storeu_ps(autoc+12,xmm9);\n }\n+#endif\n \n #endif \/* FLAC__SSE_SUPPORTED *\/\n #endif \/* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN *\/\n"} {"commit":"6f0e77ca19278fd37d19c28156d8704754498680","subject":"Replicate HINCRBYFLOAT as HSET.","message":"Replicate HINCRBYFLOAT as HSET.\n","repos":"AplayER\/redis,yossigo\/redis,spinlock\/redis,alenslan\/redis,neomantra\/redis,YuanZhewei\/redis,gilala\/redis,dreamquster\/redis,4396\/redis,weizijun\/redis,zhiliaoniu\/redis,brg-liuwei\/redis,spearhead-ea\/redis,cusspvz\/redis,louisliangjun\/redis,wuyu201321060203\/redis-3.0-annotated,aim-for-better\/redis,timothyohare\/3rdPartySrc-redis,zy416548283\/redis-3.0-annotated,ramonsnir\/redis,itamarhaber\/redis,mverrilli\/redis,netroby\/redis,nnog\/redis,onlymellb\/redis-3.0-annotated,xujunhai1991\/redis,kaushik94\/redis,RepmujNetsik\/redis,jxwr\/redis,YuraLukashik\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,linfangrong\/redis,4396\/redis,darksideofthemoo\/redis-histogram,NBSW\/redis,YuraLukashik\/redis,yybirdcf\/learn-redis,0x55\/redis-3.0-annotated,LongXQ\/redis,elkingtonmcb\/redis,csuhawk\/redis,gilala\/hbjredis,MasahikoSawada\/redis,soveran\/redis,oranagra\/redis,thomasdarimont\/redis,MSOpenTech\/redis,soveran\/redis,onlymellb\/redis-3.0-annotated,narma\/redis,wangyikai\/redis,zhoudayang\/redis,Cisphyx\/redis-websockets,roth1002\/redis,tellapart\/redis,takeshineshiro\/redis,supasate\/redis,antirez\/redis,LongXQ\/redis,ytjiang\/redis,ouyangkongtong\/redis,xuguruogu\/redis,xuguruogu\/redis,programmecat\/redis,ipmobiletech\/redis,takeshineshiro\/redis,MasahikoSawada\/redis,HunanTV\/redis,cloudrain21\/redis,allengaller\/redis,ChanningDuan\/annotated_redis_source,qiyang0221\/redis,francischan714\/redis,huangz1990\/experiment-redis,izhoujie\/redis,ramonsnir\/redis,sunheehnus\/redis,duanx\/redis,OmarQunsul\/graph-redis,Cisphyx\/redis-websockets,maodeyi\/redis_lua,gilala\/hbjredis,AALEKH\/redis,saisai\/redis,moonbingbing\/redis-3.0-annotated,josephholsten\/redis,mumingv\/redis,wbailey5\/redis,Aaron1992\/redis,raphaelfruneaux\/redis,mattsta\/redis,ErikDubbelboer\/redis,JoeWoo\/redis,tellapart\/redis,pietern\/redis,taoguan\/redis,ramonsnir\/redis,ketor\/redis,linfangrong\/redis,guker\/redis,mpalmer\/redis,brg-liuwei\/redis,GitHubMota\/redis,abhiklodh\/redis,izhoujie\/redis,LongXQ\/redis,fengshao0907\/redis-3.0-annotated,fengshao0907\/redis-3.0-annotated,nilyang\/redis-tdd-annotation,machicao2013\/redis-source-annotated,tidatida\/annotated_redis_source,arijitvt\/redis,sunlianqiang\/redis-3.0-annotated,huangz1990\/redis-3.0-annotated,PKRoma\/redis,mcanthony\/redis,nilyang\/redis-tdd-annotation,YuanZhewei\/redis,dreamquster\/redis,arijitvt\/redis,ncopa\/redis,shreesundara\/redis,SummonY\/redis,tzq668766\/redis-3.0-annotated,elkingtonmcb\/redis,j0hnma\/hszredis,brg-liuwei\/redis,ChanningDuan\/annotated_redis_source,holstvoogd\/redis,gechong\/redis-3.0-annotated,xlzhan\/redis,wujf\/redis,spearhead-ea\/redis,simplestbest\/redis,Instagram\/redis,xuzhezhaozhao\/redis_reading,twskipper\/redis,jackyan\/redis,seppo0010\/redis,spinlock\/redis,oranagra\/redis,pkdevbox\/redis,hornen\/redis,wuyu201321060203\/redis-3.0-annotated,MasahikoSawada\/redis,clamoriniere1A\/redis,tellapart\/redis,mpalmer\/redis,universsky\/redis,wprice\/redis,gongice\/redis-3.0-annotated,PradheepShrinivasan\/redis,jingjidejuren\/redis,wuxiaowei907\/annotated_redis_source,Markgorden\/redis,mpalmer\/redis,huangz1990\/annotated_redis_source,cloudrain21\/redis,jxwr\/redis,tanghaodong25\/redis,charsyam\/redis,gongice\/redis-3.0-annotated,july2993\/redis,Soledad89\/redis,aluzzardi\/redis,jbochi\/redis,rogerchina\/redis,huangz1990\/experiment-redis,devaos\/redis,davidradunz\/redis,StevenTsai\/redis,itamarhaber\/redis,shshlzh\/redis-3.0-annotated,mingyaaaa\/redis,GrimDerp\/redis,Aaron1992\/redis,wangyikai\/redis,MOON-CLJ\/redis,tjschuck\/redis,moonbingbing\/redis-3.0-annotated,riyan8250\/redis,shreesundara\/redis,GitHubMota\/redis,badboy\/redis,adamweixuan\/redis-3.0-annotated,zhaobo1023\/redis-3.0-annotated,programmecat\/redis,jingjidejuren\/redis,elkingtonmcb\/redis,mrb\/redis,wenxueliu\/redis_comment,gilala\/redis,wujf\/redis,ofirluzon\/redis,aim-for-better\/redis,xlzhan\/redis,sunheehnus\/redis,SummonY\/redis,hawkchch\/redis,twskipper\/redis,wbailey5\/redis,cnbin\/redis,GrimDerp\/redis,yuhc\/redis-benchmark-enhanced,fengshao0907\/redis,gilala\/bjredis,Wangyao14cyy\/redis,soveran\/redis,0x20h\/redis,maodeyi\/redis_lua,fengshao0907\/redis,mrb\/redis,SyntaxStacks\/redis,yossigo\/redis,huangz1990\/redis-3.0-annotated,wprice\/redis,slfs007\/mk-redis,ReadCode\/redis-3.0-annotated,jackyan\/redis,modulexcite\/redis,jbochi\/parallel_redis,louisliangjun\/redis,ytjiang\/redis,rrsean\/redis-3.0-annotated,thomasdarimont\/redis,splitice\/redis,0x55\/redis-3.0-annotated,simplestbest\/redis,haima-zju\/redis-3.0-annotated,healerkx\/redis,sunlianqiang\/redis-3.0-annotated,StevenTsai\/redis,ketor\/redis,ksarch-saas\/redis,timothyohare\/3rdPartySrc-redis,devaos\/redis,mgk\/redis,louisliangjun\/redis,xuzhezhaozhao\/redis_reading,tanghaodong25\/redis,soloestoy\/redis,AplayER\/redis,MOON-CLJ\/redis,CodeJuan\/redis,badboy\/redis,zczhuohuo\/redis,izhoujie\/redis,mgk\/redis,tidatida\/annotated_redis_source,gilala\/bjredis,fengshao0907\/redis,zczhuohuo\/redis,kaushik94\/redis,josephholsten\/redis,mengzhejin\/RedisStudy,ofirluzon\/redis,nnog\/redis,holstvoogd\/redis,mingyaaaa\/redis,josiahcarlson\/redis,mingyaaaa\/redis,wuxiaowei907\/annotated_redis_source,Sciumo\/redis,magastzheng\/redis-3.0-annotated,ctripcorp\/redis,zguangyu\/redis,supasate\/redis,wenxueliu\/redis_comment,PradheepShrinivasan\/redis,oranagra\/redis,honestme\/redis,holstvoogd\/redis,zhaobo1023\/redis-3.0-annotated,spearhead-ea\/redis,dreamquster\/redis,pmem\/redis,clamoriniere1A\/redis,neomantra\/redis,ton31337\/redis,flashbuckets\/redis,wbailey5\/redis,whille\/redis-3.0-annotated,jermnelson\/redis,viongpanzi\/annotated_redis_source,190235047\/redis,healerkx\/redis,rouzier\/redis,machicao2013\/redis-source-annotated,ttuna\/msot-redis,wangyikai\/redis,tanghaodong25\/redis,CodeJuan\/redis,pedigree\/redis,miaoyc1989\/redis-3.0-annotated,itugs\/redis,maodeyi\/redis_lua,a-pavlov\/redis,brg-liuwei\/redis,universsky\/redis,zguangyu\/redis,splitice\/redis,aluzzardi\/redis,huyuezheng\/redis,janekmi\/redis,Wangyao14cyy\/redis,blackmady\/redis,h0x91b\/redis,0x20h\/redis,takeshineshiro\/redis,jacklee0810\/redis-3.0-annotated,clamoriniere1A\/redis,itamarhaber\/redis,healerkx\/redis,ouyangkongtong\/redis,rrsean\/redis-3.0-annotated,ttuna\/msot-redis,HeartSaVioR\/redis,thomasdarimont\/redis,j0hnma\/szredis,supasate\/redis,huyuezheng\/redis,nnog\/redis,JoeWoo\/redis,ton31337\/redis,clamoriniere1A\/redis,fengshao0907\/annotated_redis_source,wuyu201321060203\/redis-3.0-annotated,z-fork\/redis,yuzhangjob\/redis-3.0-annotated-unstable,h0x91b\/redis,Hailei\/redis,ChanningDuan\/annotated_redis_source,SyntaxStacks\/redis,WorkingOfTimtohyZhang\/redis-3.0-annotated,tellapart\/redis,slfs007\/mk-redis,seandsky\/redis,dramenk\/annotated_redis_source,190235047\/redis,qiyang0221\/redis,splitice\/redis,takeshineshiro\/redis,jxwr\/redis,supasate\/redis,YuraLukashik\/redis,fengshao0907\/annotated_redis_source,PKRoma\/redis,twskipper\/redis,csuhawk\/redis,a-pavlov\/redis,atreeyang\/redis,ErikDubbelboer\/redis,alenslan\/redis,jasonkying\/redis,PKRoma\/redis,drinkthere\/redis-3.0-annotated,SyntaxStacks\/redis,wprice\/redis,figoxu\/annotated_redis_source,dongqifan2\/redis-3.0-annotated,dreamquster\/redis,roth1002\/redis,zhaobo1023\/redis-3.0-annotated,SummonY\/redis,honestme\/redis,timothyohare\/3rdPartySrc-redis,gechong\/redis-3.0-annotated,YongMan\/redis,jbochi\/redis,dayuoba\/redis,csuhawk\/redis,Soledad89\/redis,AALEKH\/redis,gaoxianglong\/redis,soloestoy\/redis,atreeyang\/redis,mumingv\/redis,mverrilli\/redis,rogerchina\/redis,yossigo\/redis,zczhuohuo\/redis,MasahikoSawada\/redis,simplestbest\/redis,mcanthony\/redis,ofirluzon\/redis,CodeJuan\/redis,mengzhejin\/RedisStudy,jackyan\/redis,duanx\/redis,ctripcorp\/redis,darksideofthemoo\/redis-histogram,mengzhejin\/RedisStudy,hgl888\/redis,Cisphyx\/redis-websockets,whille\/redis-3.0-annotated,mumingv\/redis,ChaosCoo\/annotated_redis_source,pmem\/redis,buobao\/redis-3.0-annotated,kaushik94\/redis,zooniverse\/redis,j0hnma\/hszredis,rogerlz\/redis,hhli\/redis,cloudrain21\/redis,ttuna\/msot-redis,allengaller\/redis,antirez\/redis,ReadCode\/redis-3.0-annotated,4396\/redis,z-fork\/redis,jbochi\/parallel_redis,charsyam\/redis,YuanZhewei\/redis,Hailei\/redis,gilala\/redis,fankeke\/redis-3.0-annotated,MSOpenTech\/redis,riyan8250\/redis,GrimDerp\/redis,OmarQunsul\/graph-redis,viongpanzi\/annotated_redis_source,nuxeh\/redis,HouKangkang\/redis-3.0-annotated,shining-yang\/redis,colstrom\/redis,h0x91b\/redis,GitHubMota\/redis,modulexcite\/redis,spinlock\/redis,netroby\/redis,YongMan\/redis,shining-yang\/redis,zhoudayang\/redis,ipmobiletech\/redis,machicao2013\/redis-source-annotated,abhiklodh\/redis,charsyam\/redis,Cisphyx\/redis-websockets,ttuna\/msot-redis,StevenTsai\/redis,mcanthony\/redis,louisliangjun\/redis,gaoxianglong\/redis,guker\/redis,simplestbest\/redis,jermnelson\/redis,gilala\/hbjredis,aluzzardi\/redis,neomantra\/redis,raphaelfruneaux\/redis,mattsta\/redis,PradheepShrinivasan\/redis,mumingv\/redis-3.0-annotated,j0hnma\/hszredis,blackmady\/redis,Markgorden\/redis,antirez\/redis,ChaosCoo\/annotated_redis_source,alenslan\/redis,gilala\/hredis,tanghaodong25\/redis,jasonkying\/redis,itamarhaber\/redis,ipmobiletech\/redis,taoguan\/redis,Aaron1992\/redis,PKRoma\/redis,zguangyu\/redis,ofirluzon\/redis,devaos\/redis,ketor\/redis,zhoudayang\/redis,rouzier\/redis,atreeyang\/redis,msn217\/redis-3.0-annotated,Wangyao14cyy\/redis,unasm\/redis-3.0-annotated,seppo0010\/rlite-server,gaoxianglong\/redis,ton31337\/redis,kmiku7\/redis,hgl888\/redis,ksarch-saas\/redis,gspandy\/annotated_redis_source,Aliceljm1\/redis-3.0-annotated,thomasdarimont\/redis,ncopa\/redis,StevenTsai\/redis,himoca\/redis,duanx\/redis,seppo0010\/rlite-server,WorkingOfTimtohyZhang\/redis-3.0-annotated,ncopa\/redis,a-pavlov\/redis,hornen\/redis,oranagra\/redis,colstrom\/redis,yuhc\/redis-benchmark-enhanced,francischan714\/redis,programmecat\/redis,NBSW\/redis,hornen\/redis,sunheehnus\/redis,citusdata\/redis,healerkx\/redis,iandyh\/redis,programmecat\/redis,YuanZhewei\/redis,fengshao0907\/annotated_redis_source,mgk\/redis,tidatida\/annotated_redis_source,gilala\/hredis,mumingv\/redis-3.0-annotated,a-pavlov\/redis,mverrilli\/redis,4396\/redis,citusdata\/redis,shshlzh\/redis-3.0-annotated,HunanTV\/redis,janekmi\/redis,hhli\/redis,nnog\/redis,hawkchch\/redis,josiahcarlson\/redis,ChaosCoo\/annotated_redis_source,harrisonfeng\/redis,Markgorden\/redis,xujunhai1991\/redis,yybirdcf\/learn-redis,huangz1990\/annotated_redis_source,guker\/redis,0x20h\/redis,Aliceljm1\/redis,gilala\/bjredis,AplayER\/redis,pcarrier\/redis,josiahcarlson\/redis,cloudrain21\/redis,citusdata\/redis,jermnelson\/redis,gilala\/bjredis,honestme\/redis,ReadCode\/redis-3.0-annotated,badboy\/redis,soloestoy\/redis,YongMan\/redis,msn217\/redis-3.0-annotated,yuzhangjob\/redis-3.0-annotated-unstable,HouKangkang\/redis-3.0-annotated,onlymellb\/redis-3.0-annotated,PKRoma\/redis,huangz1990\/redis-3.0-annotated,ouyangkongtong\/redis,jacklee0810\/annotated_redis_source,pcarrier\/redis,Aliceljm1\/redis,ituncle\/redis,190235047\/redis,dayuoba\/redis,HouKangkang\/redis-3.0-annotated,haima-zju\/redis-3.0-annotated,neomantra\/redis,alenslan\/redis,july2993\/redis,gilala\/hbjredis,MSOpenTech\/redis,cnbin\/redis,ctripcorp\/redis,YuraLukashik\/redis,harrisonfeng\/redis,0x55\/redis-3.0-annotated,pietern\/redis,danny200309\/annotated_redis_source,gaoxianglong\/redis,atreeyang\/redis,pedigree\/redis,Sciumo\/redis,j0hnma\/szredis,SummonY\/redis,ituncle\/redis,linfangrong\/redis,ton31337\/redis,zhcy\/redis,kensou97\/redis,zhcy\/redis,splitice\/redis,kensou97\/redis,ipmobiletech\/redis,idning\/redis,cusspvz\/redis,allengaller\/redis,valdsJohn\/redis,rogerlz\/redis,xuzhezhaozhao\/redis_reading,huangz1990\/experiment-redis,gspandy\/annotated_redis_source,colstrom\/redis,jingjidejuren\/redis,drinkthere\/redis-3.0-annotated,Soledad89\/redis,dramenk\/annotated_redis_source,NBSW\/redis,MOON-CLJ\/redis,seppo0010\/redis,j0hnma\/hszredis,himoca\/redis,ouyangkongtong\/redis,viongpanzi\/annotated_redis_source,jbochi\/redis,oranagra\/redis,soloestoy\/redis,figoxu\/annotated_redis_source,jackyan\/redis,modulexcite\/redis,seppo0010\/redis,mengyou0304\/redis,mcanthony\/redis,flashbuckets\/redis,mengyou0304\/redis,zhiliaoniu\/redis,dongqifan2\/redis-3.0-annotated,saisai\/redis,weizijun\/redis,jingjidejuren\/redis,Aliceljm1\/redis,shining-yang\/redis,mengyou0304\/redis,shining-yang\/redis,soveran\/redis,jacklee0810\/annotated_redis_source,raphaelfruneaux\/redis,msn217\/redis-3.0-annotated,qiyang0221\/redis,miaoyc1989\/redis-3.0-annotated,fengshao0907\/redis-3.0-annotated,weizijun\/redis,magastzheng\/redis-3.0-annotated,ErikDubbelboer\/redis,Markgorden\/redis,pedigree\/redis,h0x91b\/redis,valdsJohn\/redis,devaos\/redis,itugs\/redis,zooniverse\/redis,mingyaaaa\/redis,xujunhai1991\/redis,zhiliaoniu\/redis,huangz1990\/experiment-redis,netroby\/redis,iandyh\/redis,RepmujNetsik\/redis,Instagram\/redis,csuhawk\/redis,modulexcite\/redis,allengaller\/redis,qiyang0221\/redis,whille\/redis-3.0-annotated,zooniverse\/redis,cusspvz\/redis,idning\/redis,zczhuohuo\/redis,ytjiang\/redis,universsky\/redis,charsyam\/redis,hawkchch\/redis,gilala\/hredis,nuxeh\/redis,badboy\/redis,narma\/redis,gongice\/redis-3.0-annotated,pcarrier\/redis,vincent-vivian-liu\/redis,z-fork\/redis,zy416548283\/redis-3.0-annotated,nuxeh\/redis,wujf\/redis,kmiku7\/redis,hedisdb\/hedis,mrb\/redis,josephholsten\/redis,darksideofthemoo\/redis-histogram,kaushik94\/redis,valdsJohn\/redis,xuzhezhaozhao\/redis_reading,Soledad89\/redis,yossigo\/redis,mpalmer\/redis,rouzier\/redis,netroby\/redis,zguangyu\/redis,honestme\/redis,rrsean\/redis-3.0-annotated,sunheehnus\/redis,buobao\/redis-3.0-annotated,taoguan\/redis,hgl888\/redis,wujf\/redis,xlzhan\/redis,shreesundara\/redis,july2993\/redis,shshlzh\/redis-3.0-annotated,josiahcarlson\/redis,Sciumo\/redis,mengyou0304\/redis,pkdevbox\/redis,SyntaxStacks\/redis,francischan714\/redis,saisai\/redis,ctripcorp\/redis,kensou97\/redis,arijitvt\/redis,narma\/redis,xuguruogu\/redis,riyan8250\/redis,vincent-vivian-liu\/redis,hedisdb\/hedis,tjschuck\/redis,izhoujie\/redis,moonbingbing\/redis-3.0-annotated,antirez\/redis,adamweixuan\/redis-3.0-annotated,190235047\/redis,yossigo\/redis,z-fork\/redis,darksideofthemoo\/redis-histogram,hedisdb\/hedis,seandsky\/redis,fankeke\/redis-3.0-annotated,HunanTV\/redis,zhoudayang\/redis,cnbin\/redis,Instagram\/redis,dayuoba\/redis,aim-for-better\/redis,pcarrier\/redis,kensou97\/redis,OmarQunsul\/graph-redis,Aliceljm1\/redis-3.0-annotated,ksarch-saas\/redis,rogerchina\/redis,dramenk\/annotated_redis_source,nilyang\/redis-tdd-annotation,seppo0010\/redis,spinlock\/redis,mengzhejin\/RedisStudy,GrimDerp\/redis,kmiku7\/redis,buobao\/redis-3.0-annotated,zhcy\/redis,harrisonfeng\/redis,Aliceljm1\/redis,itugs\/redis,zy416548283\/redis-3.0-annotated,seppo0010\/rlite-server,roth1002\/redis,wprice\/redis,ofirluzon\/redis,danny200309\/annotated_redis_source,mgk\/redis,davidradunz\/redis,neomantra\/redis,Aaron1992\/redis,pedigree\/redis,cnbin\/redis,machicao2013\/redis-source-annotated,LongXQ\/redis,cusspvz\/redis,sunlianqiang\/redis-3.0-annotated,ituncle\/redis,xlzhan\/redis,nilyang\/redis-tdd-annotation,Hailei\/redis,nuxeh\/redis,valdsJohn\/redis,yuhc\/redis-benchmark-enhanced,francischan714\/redis,iandyh\/redis,jacklee0810\/redis-3.0-annotated,duanx\/redis,yybirdcf\/learn-redis,yuhc\/redis-benchmark-enhanced,july2993\/redis,AplayER\/redis,abhiklodh\/redis,dayuoba\/redis,wbailey5\/redis,dongqifan2\/redis-3.0-annotated,Wangyao14cyy\/redis,universsky\/redis,linfangrong\/redis,wangyikai\/redis,pmem\/redis,jbochi\/parallel_redis,rouzier\/redis,Sciumo\/redis,mumingv\/redis,miaoyc1989\/redis-3.0-annotated,wuyu201321060203\/redis-3.0-annotated,xujunhai1991\/redis,ksarch-saas\/redis,gspandy\/annotated_redis_source,OmarQunsul\/graph-redis,wenxueliu\/redis_comment,hhli\/redis,janekmi\/redis,mrb\/redis,tzq668766\/redis-3.0-annotated,kmiku7\/redis,hhli\/redis,MSOpenTech\/redis,pietern\/redis,tjschuck\/redis,janekmi\/redis,Hailei\/redis,idning\/redis,AALEKH\/redis,hornen\/redis,charsyam\/redis,CodeJuan\/redis,davidradunz\/redis,jasonkying\/redis,aluzzardi\/redis,HeartSaVioR\/redis,HeartSaVioR\/redis,colstrom\/redis,guker\/redis,wenxueliu\/redis_comment,huangz1990\/annotated_redis_source,figoxu\/annotated_redis_source,drinkthere\/redis-3.0-annotated,0x20h\/redis,JoeWoo\/redis,RepmujNetsik\/redis,shshlzh\/redis-3.0-annotated,j0hnma\/szredis,tjschuck\/redis,taoguan\/redis,slfs007\/mk-redis,seandsky\/redis,blackmady\/redis,gilala\/redis,unasm\/redis-3.0-annotated,abhiklodh\/redis,elkingtonmcb\/redis,ttuna\/msot-redis,tzq668766\/redis-3.0-annotated,holstvoogd\/redis,adamweixuan\/redis-3.0-annotated,ytjiang\/redis,harrisonfeng\/redis,0x55\/redis-3.0-annotated,pkdevbox\/redis,gilala\/hredis,ErikDubbelboer\/redis,magastzheng\/redis-3.0-annotated,jasonkying\/redis,pmem\/redis,zhiliaoniu\/redis,idning\/redis,iandyh\/redis,shreesundara\/redis,riyan8250\/redis,ncopa\/redis,rogerchina\/redis,timothyohare\/3rdPartySrc-redis,citusdata\/redis,danny200309\/annotated_redis_source,soloestoy\/redis,unasm\/redis-3.0-annotated,Aliceljm1\/redis-3.0-annotated,j0hnma\/szredis,yybirdcf\/learn-redis,jacklee0810\/redis-3.0-annotated,mverrilli\/redis,huyuezheng\/redis,xuguruogu\/redis,pkdevbox\/redis,blackmady\/redis,rogerlz\/redis,JoeWoo\/redis,fengshao0907\/redis,roth1002\/redis,miaoyc1989\/redis-3.0-annotated,mumingv\/redis-3.0-annotated,MSOpenTech\/redis,GitHubMota\/redis,YongMan\/redis,RepmujNetsik\/redis,NBSW\/redis,mattsta\/redis,seppo0010\/rlite-server,rogerlz\/redis,wuxiaowei907\/annotated_redis_source,hgl888\/redis,AALEKH\/redis,weizijun\/redis,hawkchch\/redis,ituncle\/redis,haima-zju\/redis-3.0-annotated,vincent-vivian-liu\/redis,fankeke\/redis-3.0-annotated,gechong\/redis-3.0-annotated,hedisdb\/hedis,huyuezheng\/redis,saisai\/redis,PradheepShrinivasan\/redis,yuzhangjob\/redis-3.0-annotated-unstable,jacklee0810\/annotated_redis_source,HunanTV\/redis,twskipper\/redis,himoca\/redis,flashbuckets\/redis,pietern\/redis,HeartSaVioR\/redis,vincent-vivian-liu\/redis,seandsky\/redis,zhcy\/redis,aim-for-better\/redis,flashbuckets\/redis,arijitvt\/redis,itugs\/redis,davidradunz\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/t_hash.c\n+++ src\/t_hash.c\n@@ -135,7 +135,9 @@\n }\n \n \/* Add an element, discard the old if the key already exists.\n- * Return 0 on insert and 1 on update. *\/\n+ * Return 0 on insert and 1 on update.\n+ * This function will take care of incrementing the reference count of the\n+ * retained fields and value objects. *\/\n int hashTypeSet(robj *o, robj *field, robj *value) {\n int update = 0;\n \n@@ -168,30 +170,23 @@\n zl = ziplistPush(zl, field->ptr, sdslen(field->ptr), ZIPLIST_TAIL);\n zl = ziplistPush(zl, value->ptr, sdslen(value->ptr), ZIPLIST_TAIL);\n }\n-\n o->ptr = zl;\n-\n decrRefCount(field);\n decrRefCount(value);\n \n \/* Check if the ziplist needs to be converted to a hash table *\/\n- if (hashTypeLength(o) > server.hash_max_ziplist_entries) {\n+ if (hashTypeLength(o) > server.hash_max_ziplist_entries)\n hashTypeConvert(o, REDIS_ENCODING_HT);\n- }\n-\n } else if (o->encoding == REDIS_ENCODING_HT) {\n if (dictReplace(o->ptr, field, value)) { \/* Insert *\/\n incrRefCount(field);\n } else { \/* Update *\/\n update = 1;\n }\n-\n incrRefCount(value);\n-\n- } else {\n- redisPanic(\"Unknown hash encoding\");\n- }\n-\n+ } else {\n+ redisPanic(\"Unknown hash encoding\");\n+ }\n return update;\n }\n \n@@ -520,7 +515,7 @@\n \n void hincrbyfloatCommand(redisClient *c) {\n double long value, incr;\n- robj *o, *current, *new;\n+ robj *o, *current, *new, *aux;\n \n if (getLongDoubleFromObjectOrReply(c,c->argv[3],&incr,NULL) != REDIS_OK) return;\n if ((o = hashTypeLookupWriteOrCreate(c,c->argv[1])) == NULL) return;\n@@ -540,9 +535,17 @@\n hashTypeTryObjectEncoding(o,&c->argv[2],NULL);\n hashTypeSet(o,c->argv[2],new);\n addReplyBulk(c,new);\n- decrRefCount(new);\n signalModifiedKey(c->db,c->argv[1]);\n server.dirty++;\n+\n+ \/* Always replicate HINCRBYFLOAT as an HSET command with the final value\n+ * in order to make sure that differences in float pricision or formatting\n+ * will not create differences in replicas or after an AOF restart. *\/\n+ aux = createStringObject(\"HSET\",4);\n+ rewriteClientCommandArgument(c,0,aux);\n+ decrRefCount(aux);\n+ rewriteClientCommandArgument(c,3,new);\n+ decrRefCount(new);\n }\n \n static void addHashFieldToReply(redisClient *c, robj *o, robj *field) {\n"} {"commit":"f68c4e093e9b48caffaf91d117c8be3319144bc0","subject":"Improved log message","message":"Improved log message\n","repos":"ShiftMediaProject\/libbluray,EdwardNewK\/libbluray,mwgoldsmith\/bluray,mwgoldsmith\/bluray,tourettes\/libbluray,ShiftMediaProject\/libbluray,koying\/libbluray,Azzuro\/libbluray,UIKit0\/libbluray,ace20022\/libbluray,koying\/libbluray,Distrotech\/libbluray,ShiftMediaProject\/libbluray,EdwardNewK\/libbluray,koying\/libbluray,ace20022\/libbluray,UIKit0\/libbluray,UIKit0\/libbluray,ace20022\/libbluray,Distrotech\/libbluray,vlc-mirror\/libbluray,Azzuro\/libbluray,zxlooong\/libbluray,vlc-mirror\/libbluray,ace20022\/libbluray,Distrotech\/libbluray,zxlooong\/libbluray,pingflood\/libbluray,tourettes\/libbluray,koying\/libbluray,vlc-mirror\/libbluray,tourettes\/libbluray,Distrotech\/libbluray,mwgoldsmith\/bluray,pingflood\/libbluray,EdwardNewK\/libbluray,tourettes\/libbluray,Azzuro\/libbluray,ShiftMediaProject\/libbluray,vlc-mirror\/libbluray,Azzuro\/libbluray,zxlooong\/libbluray,mwgoldsmith\/bluray,UIKit0\/libbluray,EdwardNewK\/libbluray,pingflood\/libbluray","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libbluray\/hdmv\/hdmv_vm.c\n+++ src\/libbluray\/hdmv\/hdmv_vm.c\n@@ -405,7 +405,9 @@\n \n p->suspended_object = NULL;\n \n- BD_DEBUG(DBG_HDMV, \"resuming object %p at %d\\n\", p->object, p->pc);\n+ BD_DEBUG(DBG_HDMV, \"resuming object %d at %d\\n\",\n+ (p->movie_objects->objects - p->object) \/ sizeof(p->movie_objects->objects[0]),\n+ p->pc);\n \n _queue_event(p, HDMV_EVENT_PLAY_STOP, 0);\n \n"} {"commit":"7094324aa24775e645c56d59237aae04bbf6cb6b","subject":"*** empty log message ***","message":"*** empty log message ***\n\n[r209]\n","repos":"davidgiven\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,libfirm\/libfirm,8l\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,MatzeB\/libfirm","returncode":1,"stderr":"error: pathspec 'ir\/test.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- ir\/test.c\n+++ ir\/test.c\n@@ -0,0 +1 @@\n+Nur leer zum testen.\n"} {"commit":"3d6eade781a618c052030dd6a5b36a38eed4e5a3","subject":"Don't encode element argument when dealing with ziplist","message":"Don't encode element argument when dealing with ziplist\n","repos":"AndersonFirmino\/redis,lonely8rain\/redis,mdavid\/redis-windows-port,dmajkic\/redis,sunqb\/redis-1,AndersonFirmino\/redis,mdavid\/redis-windows-port,coverxiaoeye\/redis,VCTLabs\/redis,VCTLabs\/redis,coverxiaoeye\/redis,jango2015\/redis,esomenos\/redis,VCTLabs\/redis,dmajkic\/redis,esomenos\/redis,sunqb\/redis-1,Linked95\/redis,coverxiaoeye\/redis,rgl\/redis,dmajkic\/redis,Linked95\/redis,lonely8rain\/redis,lonely8rain\/redis,VCTLabs\/redis,jango2015\/redis,Linked95\/redis,sunqb\/redis-1,AndersonFirmino\/redis,rgl\/redis,jango2015\/redis,esomenos\/redis,rgl\/redis,rgl\/redis,mdavid\/redis-windows-port","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/t_zset.c\n+++ src\/t_zset.c\n@@ -560,11 +560,16 @@\n *----------------------------------------------------------------------------*\/\n \n \/* This generic command implements both ZADD and ZINCRBY. *\/\n-void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double score, int incr) {\n+void zaddGenericCommand(redisClient *c, int incr) {\n static char *nanerr = \"resulting score is not a number (NaN)\";\n+ robj *key = c->argv[1];\n+ robj *ele;\n robj *zobj;\n robj *curobj;\n- double curscore = 0.0;\n+ double score, curscore = 0.0;\n+\n+ if (getDoubleFromObjectOrReply(c,c->argv[2],&score,NULL) != REDIS_OK)\n+ return;\n \n zobj = lookupKeyWrite(c->db,key);\n if (zobj == NULL) {\n@@ -580,6 +585,8 @@\n if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {\n unsigned char *eptr;\n \n+ \/* Prefer non-encoded element when dealing with ziplists. *\/\n+ ele = c->argv[3];\n if ((eptr = zzlFind(zobj,ele,&curscore)) != NULL) {\n if (incr) {\n score += curscore;\n@@ -620,6 +627,7 @@\n zskiplistNode *znode;\n dictEntry *de;\n \n+ ele = c->argv[3] = tryObjectEncoding(c->argv[3]);\n de = dictFind(zs->dict,ele);\n if (de != NULL) {\n curobj = dictGetEntryKey(de);\n@@ -672,17 +680,11 @@\n }\n \n void zaddCommand(redisClient *c) {\n- double scoreval;\n- if (getDoubleFromObjectOrReply(c,c->argv[2],&scoreval,NULL) != REDIS_OK) return;\n- c->argv[3] = tryObjectEncoding(c->argv[3]);\n- zaddGenericCommand(c,c->argv[1],c->argv[3],scoreval,0);\n+ zaddGenericCommand(c,0);\n }\n \n void zincrbyCommand(redisClient *c) {\n- double scoreval;\n- if (getDoubleFromObjectOrReply(c,c->argv[2],&scoreval,NULL) != REDIS_OK) return;\n- c->argv[3] = tryObjectEncoding(c->argv[3]);\n- zaddGenericCommand(c,c->argv[1],c->argv[3],scoreval,1);\n+ zaddGenericCommand(c,1);\n }\n \n void zremCommand(redisClient *c) {\n"} {"commit":"8d85686a6caa1c1deb46f8ff81cdf344698816a7","subject":"CDRIVER-2933 fix oid test","message":"CDRIVER-2933 fix oid test\n","repos":"rcsanchez97\/mongo-c-driver,mongodb\/mongo-c-driver,rcsanchez97\/mongo-c-driver,mongodb\/mongo-c-driver,rcsanchez97\/mongo-c-driver,mongodb\/mongo-c-driver,beingmeta\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,jmikola\/mongo-c-driver,rcsanchez97\/mongo-c-driver,jmikola\/mongo-c-driver,beingmeta\/mongo-c-driver,rcsanchez97\/mongo-c-driver,acmorrow\/mongo-c-driver,acmorrow\/mongo-c-driver,acmorrow\/mongo-c-driver,jmikola\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,acmorrow\/mongo-c-driver,rcsanchez97\/mongo-c-driver,beingmeta\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,beingmeta\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,mongodb\/mongo-c-driver,jmikola\/mongo-c-driver,acmorrow\/mongo-c-driver,beingmeta\/mongo-c-driver,rcsanchez97\/mongo-c-driver,mongodb\/mongo-c-driver,beingmeta\/mongo-c-driver,jmikola\/mongo-c-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/libbson\/tests\/test-oid.c\n+++ src\/libbson\/tests\/test-oid.c\n@@ -547,7 +547,7 @@\n char max_len_host[HOST_NAME_MAX] = {0};\n \n for (i = 0; i < HOST_NAME_MAX - 1; i++) {\n- max_len_host[i] = \"a\";\n+ max_len_host[i] = 'a';\n }\n hostname_tests[sizeof(hostname_tests) - 1] = max_len_host;\n \n"} {"commit":"52d8e47bdc9c1857c5c5b16e3363454bea86bbdc","subject":"[project @ 2000-10-12 15:49:34 by simonmar] remove superfluous defns of index{Word,Ptr}OffClosure","message":"[project @ 2000-10-12 15:49:34 by simonmar]\nremove superfluous defns of index{Word,Ptr}OffClosure\n","repos":"ekmett\/ghc,gcampax\/ghc,jstolarek\/ghc,vikraman\/ghc,nushio3\/ghc,lukexi\/ghc-7.8-arm64,tjakway\/ghcjvm,hferreiro\/replay,TomMD\/ghc,snoyberg\/ghc,nkaretnikov\/ghc,wxwxwwxxx\/ghc,lukexi\/ghc,holzensp\/ghc,mfine\/ghc,jstolarek\/ghc,sgillespie\/ghc,tibbe\/ghc,nkaretnikov\/ghc,christiaanb\/ghc,sgillespie\/ghc,christiaanb\/ghc,urbanslug\/ghc,frantisekfarka\/ghc-dsi,wxwxwwxxx\/ghc,christiaanb\/ghc,shlevy\/ghc,gcampax\/ghc,spacekitteh\/smcghc,acowley\/ghc,ghc-android\/ghc,wxwxwwxxx\/ghc,GaloisInc\/halvm-ghc,olsner\/ghc,mfine\/ghc,green-haskell\/ghc,mfine\/ghc,elieux\/ghc,frantisekfarka\/ghc-dsi,christiaanb\/ghc,mfine\/ghc,nathyong\/microghc-ghc,snoyberg\/ghc,mcschroeder\/ghc,ezyang\/ghc,bitemyapp\/ghc,siddhanathan\/ghc,hferreiro\/replay,gcampax\/ghc,forked-upstream-packages-for-ghcjs\/ghc,tjakway\/ghcjvm,urbanslug\/ghc,tjakway\/ghcjvm,lukexi\/ghc,sdiehl\/ghc,nathyong\/microghc-ghc,oldmanmike\/ghc,shlevy\/ghc,nkaretnikov\/ghc,siddhanathan\/ghc,mettekou\/ghc,christiaanb\/ghc,mettekou\/ghc,lukexi\/ghc,tibbe\/ghc,oldmanmike\/ghc,GaloisInc\/halvm-ghc,ml9951\/ghc,mettekou\/ghc,ezyang\/ghc,nomeata\/ghc,acowley\/ghc,fmthoma\/ghc,vikraman\/ghc,fmthoma\/ghc,sdiehl\/ghc,TomMD\/ghc,green-haskell\/ghc,GaloisInc\/halvm-ghc,anton-dessiatov\/ghc,ghc-android\/ghc,mettekou\/ghc,snoyberg\/ghc,wxwxwwxxx\/ghc,hferreiro\/replay,olsner\/ghc,anton-dessiatov\/ghc,bitemyapp\/ghc,TomMD\/ghc,fmthoma\/ghc,ezyang\/ghc,fmthoma\/ghc,vTurbine\/ghc,jstolarek\/ghc,ekmett\/ghc,gridaphobe\/ghc,nushio3\/ghc,nomeata\/ghc,mcschroeder\/ghc,acowley\/ghc,da-x\/ghc,ekmett\/ghc,bitemyapp\/ghc,olsner\/ghc,nkaretnikov\/ghc,christiaanb\/ghc,frantisekfarka\/ghc-dsi,sdiehl\/ghc,ilyasergey\/GHC-XAppFix,sdiehl\/ghc,TomMD\/ghc,bitemyapp\/ghc,vikraman\/ghc,TomMD\/ghc,nathyong\/microghc-ghc,green-haskell\/ghc,acowley\/ghc,holzensp\/ghc,tjakway\/ghcjvm,holzensp\/ghc,snoyberg\/ghc,fmthoma\/ghc,ezyang\/ghc,gcampax\/ghc,urbanslug\/ghc,nushio3\/ghc,ml9951\/ghc,spacekitteh\/smcghc,shlevy\/ghc,tjakway\/ghcjvm,spacekitteh\/smcghc,gridaphobe\/ghc,anton-dessiatov\/ghc,gcampax\/ghc,holzensp\/ghc,elieux\/ghc,bitemyapp\/ghc,tibbe\/ghc,AlexanderPankiv\/ghc,mcschroeder\/ghc,lukexi\/ghc,ryantm\/ghc,ghc-android\/ghc,vTurbine\/ghc,TomMD\/ghc,gridaphobe\/ghc,elieux\/ghc,tibbe\/ghc,nkaretnikov\/ghc,ghc-android\/ghc,sgillespie\/ghc,GaloisInc\/halvm-ghc,GaloisInc\/halvm-ghc,lukexi\/ghc-7.8-arm64,ilyasergey\/GHC-XAppFix,ghc-android\/ghc,elieux\/ghc,vTurbine\/ghc,acowley\/ghc,siddhanathan\/ghc,ryantm\/ghc,siddhanathan\/ghc,mcschroeder\/ghc,nkaretnikov\/ghc,ml9951\/ghc,nathyong\/microghc-ghc,mcmaniac\/ghc,vikraman\/ghc,mcmaniac\/ghc,fmthoma\/ghc,shlevy\/ghc,olsner\/ghc,acowley\/ghc,lukexi\/ghc-7.8-arm64,da-x\/ghc,vTurbine\/ghc,sgillespie\/ghc,hferreiro\/replay,acowley\/ghc,tibbe\/ghc,tjakway\/ghcjvm,oldmanmike\/ghc,mcmaniac\/ghc,urbanslug\/ghc,mettekou\/ghc,da-x\/ghc,urbanslug\/ghc,hferreiro\/replay,frantisekfarka\/ghc-dsi,urbanslug\/ghc,gridaphobe\/ghc,sdiehl\/ghc,nathyong\/microghc-ghc,sgillespie\/ghc,lukexi\/ghc,vikraman\/ghc,forked-upstream-packages-for-ghcjs\/ghc,anton-dessiatov\/ghc,oldmanmike\/ghc,ryantm\/ghc,forked-upstream-packages-for-ghcjs\/ghc,vTurbine\/ghc,sdiehl\/ghc,da-x\/ghc,ryantm\/ghc,vTurbine\/ghc,TomMD\/ghc,wxwxwwxxx\/ghc,ryantm\/ghc,siddhanathan\/ghc,ekmett\/ghc,frantisekfarka\/ghc-dsi,jstolarek\/ghc,elieux\/ghc,oldmanmike\/ghc,sdiehl\/ghc,green-haskell\/ghc,hferreiro\/replay,forked-upstream-packages-for-ghcjs\/ghc,gridaphobe\/ghc,shlevy\/ghc,green-haskell\/ghc,sgillespie\/ghc,da-x\/ghc,hferreiro\/replay,forked-upstream-packages-for-ghcjs\/ghc,AlexanderPankiv\/ghc,ghc-android\/ghc,snoyberg\/ghc,spacekitteh\/smcghc,ml9951\/ghc,mcmaniac\/ghc,lukexi\/ghc-7.8-arm64,siddhanathan\/ghc,mcschroeder\/ghc,lukexi\/ghc-7.8-arm64,gridaphobe\/ghc,forked-upstream-packages-for-ghcjs\/ghc,nushio3\/ghc,mfine\/ghc,ilyasergey\/GHC-XAppFix,oldmanmike\/ghc,da-x\/ghc,gridaphobe\/ghc,AlexanderPankiv\/ghc,AlexanderPankiv\/ghc,urbanslug\/ghc,ml9951\/ghc,vikraman\/ghc,nushio3\/ghc,nushio3\/ghc,da-x\/ghc,mfine\/ghc,siddhanathan\/ghc,anton-dessiatov\/ghc,ezyang\/ghc,ghc-android\/ghc,sgillespie\/ghc,ilyasergey\/GHC-XAppFix,nomeata\/ghc,mcschroeder\/ghc,olsner\/ghc,vTurbine\/ghc,mcmaniac\/ghc,wxwxwwxxx\/ghc,ml9951\/ghc,olsner\/ghc,anton-dessiatov\/ghc,ekmett\/ghc,ezyang\/ghc,snoyberg\/ghc,gcampax\/ghc,vikraman\/ghc,ml9951\/ghc,nushio3\/ghc,mettekou\/ghc,elieux\/ghc,mfine\/ghc,spacekitteh\/smcghc,anton-dessiatov\/ghc,mcschroeder\/ghc,holzensp\/ghc,nomeata\/ghc,forked-upstream-packages-for-ghcjs\/ghc,nkaretnikov\/ghc,AlexanderPankiv\/ghc,ml9951\/ghc,wxwxwwxxx\/ghc,fmthoma\/ghc,jstolarek\/ghc,gcampax\/ghc,snoyberg\/ghc,mettekou\/ghc,nathyong\/microghc-ghc,nathyong\/microghc-ghc,nomeata\/ghc,tjakway\/ghcjvm,shlevy\/ghc,ezyang\/ghc,GaloisInc\/halvm-ghc,olsner\/ghc,AlexanderPankiv\/ghc,shlevy\/ghc,oldmanmike\/ghc,christiaanb\/ghc,elieux\/ghc,GaloisInc\/halvm-ghc,AlexanderPankiv\/ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ghc\/includes\/PrimOps.h\n+++ ghc\/includes\/PrimOps.h\n@@ -1,5 +1,5 @@\n \/* -----------------------------------------------------------------------------\n- * $Id: PrimOps.h,v 1.63 2000\/09\/26 16:45:34 simonpj Exp $\n+ * $Id: PrimOps.h,v 1.64 2000\/10\/12 15:49:34 simonmar Exp $\n *\n * (c) The GHC Team, 1998-1999\n *\n@@ -41,15 +41,7 @@\n r = ((P_ *)tmp)[i]; \\\n } while (0)\n \n-\n-#else\n-\n-\/* These are the original definitions. They don't chase indirections. *\/\n-#define indexWordOffClosurezh(r,a,i) \tr= ((W_ *)(a))[i]\n-#define indexPtrOffClosurezh(r,a,i) \tr= ((P_ *)(a))[i]\n-\n-#endif\n-\n+#endif\n \n \/* -----------------------------------------------------------------------------\n Comparison PrimOps.\n"} {"commit":"dc8e45817088a92858977cbe8a630d0e367dea0c","subject":"Convert encoding when thresholds overflow","message":"Convert encoding when thresholds overflow\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/t_zset.c\n+++ src\/t_zset.c\n@@ -728,6 +728,85 @@\n return length;\n }\n \n+void zsConvert(robj *zobj, int encoding) {\n+ zset *zs;\n+ zskiplistNode *node, *next;\n+ robj *ele;\n+ double score;\n+\n+ if (zobj->encoding == encoding) return;\n+ if (zobj->encoding == REDIS_ENCODING_ZIPLIST) {\n+ unsigned char *zl = zobj->ptr;\n+ unsigned char *eptr, *sptr;\n+ unsigned char *vstr;\n+ unsigned int vlen;\n+ long long vlong;\n+\n+ if (encoding != REDIS_ENCODING_RAW)\n+ redisPanic(\"Unknown target encoding\");\n+\n+ zs = zmalloc(sizeof(*zs));\n+ zs->dict = dictCreate(&zsetDictType,NULL);\n+ zs->zsl = zslCreate();\n+\n+ eptr = ziplistIndex(zl,0);\n+ redisAssert(eptr != NULL);\n+ sptr = ziplistNext(zl,eptr);\n+ redisAssert(sptr != NULL);\n+\n+ while (eptr != NULL) {\n+ score = zzlGetScore(sptr);\n+ redisAssert(ziplistGet(eptr,&vstr,&vlen,&vlong));\n+ if (vstr == NULL)\n+ ele = createStringObjectFromLongLong(vlong);\n+ else\n+ ele = createStringObject((char*)vstr,vlen);\n+\n+ \/* Has incremented refcount since it was just created. *\/\n+ node = zslInsert(zs->zsl,score,ele);\n+ redisAssert(dictAdd(zs->dict,ele,&node->score) == DICT_OK);\n+ incrRefCount(ele); \/* Added to dictionary. *\/\n+ zzlNext(zl,&eptr,&sptr);\n+ }\n+\n+ zfree(zobj->ptr);\n+ zobj->ptr = zs;\n+ zobj->encoding = REDIS_ENCODING_RAW;\n+ } else if (zobj->encoding == REDIS_ENCODING_RAW) {\n+ unsigned char *zl = ziplistNew();\n+\n+ if (encoding != REDIS_ENCODING_ZIPLIST)\n+ redisPanic(\"Unknown target encoding\");\n+\n+ \/* Approach similar to zslFree(), since we want to free the skiplist at\n+ * the same time as creating the ziplist. *\/\n+ zs = zobj->ptr;\n+ dictRelease(zs->dict);\n+ node = zs->zsl->header->level[0].forward;\n+ zfree(zs->zsl->header);\n+ zfree(zs->zsl);\n+\n+ \/* Immediately store pointer to ziplist in object because it will\n+ * change because of reallocations when pushing to the ziplist. *\/\n+ zobj->ptr = zl;\n+\n+ while (node) {\n+ ele = getDecodedObject(node->obj);\n+ redisAssert(zzlInsertAt(zobj,ele,node->score,NULL) == REDIS_OK);\n+ decrRefCount(ele);\n+\n+ next = node->level[0].forward;\n+ zslFreeNode(node);\n+ node = next;\n+ }\n+\n+ zfree(zs);\n+ zobj->encoding = REDIS_ENCODING_ZIPLIST;\n+ } else {\n+ redisPanic(\"Unknown sorted set encoding\");\n+ }\n+}\n+\n \/*-----------------------------------------------------------------------------\n * Sorted set commands \n *----------------------------------------------------------------------------*\/\n@@ -746,7 +825,13 @@\n \n zobj = lookupKeyWrite(c->db,key);\n if (zobj == NULL) {\n- zobj = createZsetZiplistObject();\n+ if (server.zset_max_ziplist_entries == 0 ||\n+ server.zset_max_ziplist_value < sdslen(c->argv[3]->ptr))\n+ {\n+ zobj = createZsetObject();\n+ } else {\n+ zobj = createZsetZiplistObject();\n+ }\n dbAdd(c->db,key,zobj);\n } else {\n if (zobj->type != REDIS_ZSET) {\n@@ -785,7 +870,13 @@\n else \/* ZADD *\/\n addReply(c,shared.czero);\n } else {\n+ \/* Optimize: check if the element is too large or the list becomes\n+ * too long *before* executing zzlInsert. *\/\n redisAssert(zzlInsert(zobj,ele,score) == REDIS_OK);\n+ if (zzlLength(zobj) > server.zset_max_ziplist_entries)\n+ zsConvert(zobj,REDIS_ENCODING_RAW);\n+ if (sdslen(ele->ptr) > server.zset_max_ziplist_value)\n+ zsConvert(zobj,REDIS_ENCODING_RAW);\n \n signalModifiedKey(c->db,key);\n server.dirty++;\n"} {"commit":"89abedb52820e370f3259fffcaae9b3d639130d0","subject":"isl_aff.c: replace_by_nan: extract out nan_on_domain_set","message":"isl_aff.c: replace_by_nan: extract out nan_on_domain_set\n\nThis function will be reused in the next commit.\n\nSigned-off-by: Sven Verdoolaege <dd860110a62b19214c4ee03aec0abffecb4e86b8@cerebras.net>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_aff.c\n+++ isl_aff.c\n@@ -3644,25 +3644,34 @@\n \treturn isl_pw_aff_involves_nan(pa2);\n }\n \n-\/* Replace \"pa1\" and \"pa2\" (at least one of which involves a NaN)\n- * by a NaN on their shared domain.\n- *\n- * In principle, the result could be refined to only being NaN\n- * on the parts of this domain where at least one of \"pa1\" or \"pa2\" is NaN.\n- *\/\n-static __isl_give isl_pw_aff *replace_by_nan(__isl_take isl_pw_aff *pa1,\n-\t__isl_take isl_pw_aff *pa2)\n+\/* Return a piecewise affine expression defined on the specified domain\n+ * that represents NaN.\n+ *\/\n+static __isl_give isl_pw_aff *nan_on_domain_set(__isl_take isl_set *dom)\n {\n \tisl_local_space *ls;\n-\tisl_set *dom;\n \tisl_pw_aff *pa;\n \n-\tdom = isl_set_intersect(isl_pw_aff_domain(pa1), isl_pw_aff_domain(pa2));\n \tls = isl_local_space_from_space(isl_set_get_space(dom));\n \tpa = isl_pw_aff_nan_on_domain(ls);\n \tpa = isl_pw_aff_intersect_domain(pa, dom);\n \n \treturn pa;\n+}\n+\n+\/* Replace \"pa1\" and \"pa2\" (at least one of which involves a NaN)\n+ * by a NaN on their shared domain.\n+ *\n+ * In principle, the result could be refined to only being NaN\n+ * on the parts of this domain where at least one of \"pa1\" or \"pa2\" is NaN.\n+ *\/\n+static __isl_give isl_pw_aff *replace_by_nan(__isl_take isl_pw_aff *pa1,\n+\t__isl_take isl_pw_aff *pa2)\n+{\n+\tisl_set *dom;\n+\n+\tdom = isl_set_intersect(isl_pw_aff_domain(pa1), isl_pw_aff_domain(pa2));\n+\treturn nan_on_domain_set(dom);\n }\n \n static __isl_give isl_pw_aff *pw_aff_min(__isl_take isl_pw_aff *pwaff1,\n"} {"commit":"e5d50b236cd2ae81cbe901fe1f44e8c285f8f2dc","subject":"reuse existing range comparators in the zset (#8714)","message":"reuse existing range comparators in the zset (#8714)\n\nThere are 2 common range comparators for skiplist: zslValueGteMin and\r\nzslValueLteMax, but they're not being reused in zslDeleteRangeByScore\r\n\r\nThis is a small change to make code cleaner.","repos":"antirez\/redis,soloestoy\/redis,ctripcorp\/redis,yossigo\/redis,charsyam\/redis,yossigo\/redis,ctripcorp\/redis,yossigo\/redis,PKRoma\/redis,oranagra\/redis,PKRoma\/redis,oranagra\/redis,ofirluzon\/redis,soloestoy\/redis,PKRoma\/redis,ofirluzon\/redis,neomantra\/redis,yossigo\/redis,antirez\/redis,oranagra\/redis,ofirluzon\/redis,neomantra\/redis,soloestoy\/redis,ctripcorp\/redis,neomantra\/redis,neomantra\/redis,charsyam\/redis,soloestoy\/redis,ofirluzon\/redis,charsyam\/redis,oranagra\/redis,charsyam\/redis,antirez\/redis,oranagra\/redis,soloestoy\/redis,PKRoma\/redis,ctripcorp\/redis,ofirluzon\/redis,charsyam\/redis,yossigo\/redis,PKRoma\/redis,neomantra\/redis,antirez\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/t_zset.c\n+++ src\/t_zset.c\n@@ -388,9 +388,8 @@\n \n x = zsl->header;\n for (i = zsl->level-1; i >= 0; i--) {\n- while (x->level[i].forward && (range->minex ?\n- x->level[i].forward->score <= range->min :\n- x->level[i].forward->score < range->min))\n+ while (x->level[i].forward &&\n+ !zslValueGteMin(x->level[i].forward->score, range))\n x = x->level[i].forward;\n update[i] = x;\n }\n@@ -399,9 +398,7 @@\n x = x->level[0].forward;\n \n \/* Delete nodes while in range. *\/\n- while (x &&\n- (range->maxex ? x->score < range->max : x->score <= range->max))\n- {\n+ while (x && zslValueLteMax(x->score, range)) {\n zskiplistNode *next = x->level[0].forward;\n zslDeleteNode(zsl,x,update);\n dictDelete(dict,x->ele);\n"} {"commit":"0d6be5db269c022fa80fbef76bc3dcb387b010b2","subject":"OpenPGP: define & set LCS (lifecycle support) as extended capability","message":"OpenPGP: define & set LCS (lifecycle support) as extended capability\n\nUse it in pgp_erase_card() to slightly simplify the code.\n","repos":"dengert\/OpenSC,dengert\/OpenSC,OpenSC\/OpenSC,metsma\/OpenSC,OpenSC\/OpenSC,hongquan\/OpenSC-main,philipWendland\/OpenSC,AktivCo\/OpenSC,frankmorgner\/OpenSC,hongquan\/OpenSC-main,viktorTarasov\/OpenSC-SM,fabled\/OpenSC,fabled\/OpenSC,fabled\/OpenSC,frankmorgner\/OpenSC,OpenSC\/OpenSC,metsma\/OpenSC,metsma\/OpenSC,CardContact\/OpenSC,LudovicRousseau\/OpenSC,mouse07410\/OpenSC,CardContact\/OpenSC,LudovicRousseau\/OpenSC,mouse07410\/OpenSC,hongquan\/OpenSC-main,viktorTarasov\/OpenSC-SM,rickyepoderi\/OpenSC,dengert\/OpenSC,Jakuje\/OpenSC,frankmorgner\/OpenSC,Jakuje\/OpenSC,CardContact\/OpenSC,viktorTarasov\/OpenSC-SM,hhonkanen\/OpenSC,Jakuje\/OpenSC,rickyepoderi\/OpenSC,AktivCo\/OpenSC,frankmorgner\/OpenSC,LudovicRousseau\/OpenSC,rickyepoderi\/OpenSC,fabled\/OpenSC,hhonkanen\/OpenSC,hhonkanen\/OpenSC,philipWendland\/OpenSC,mouse07410\/OpenSC,philipWendland\/OpenSC,AktivCo\/OpenSC,Jakuje\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libopensc\/card-openpgp.c\n+++ src\/libopensc\/card-openpgp.c\n@@ -121,6 +121,7 @@\n \tEXT_CAP_KEY_IMPORT = 0x0020,\n \tEXT_CAP_GET_CHALLENGE = 0x0040,\n \tEXT_CAP_SM = 0x0080,\n+\tEXT_CAP_LCS = 0x0100,\n \tEXT_CAP_CHAINING = 0x1000,\n \tEXT_CAP_APDU_EXT = 0x2000\n };\n@@ -593,6 +594,9 @@\n \t\t}\n \t}\n \n+\t\/* v1.1 does not support lifecycle via ACTIVATE & TERMINATE: set default *\/\n+\tpriv->ext_caps &= ~EXT_CAP_LCS;\n+\n \tif (priv->bcd_version >= OPENPGP_CARD_2_0) {\n \t\t\/* get card capabilities from \"historical bytes\" DO *\/\n \t\tif ((pgp_get_blob(card, priv->mf, 0x5f52, &blob) >= 0) &&\n@@ -601,8 +605,12 @@\n \t\t\tpgp_parse_hist_bytes(card, hist_bytes+1, hist_bytes_len-4);\n \n \t\t\t\/* get card status from historical bytes status indicator *\/\n-\t\t\tif ((blob->data[0] == 0x00) && (blob->len >= 4))\n+\t\t\tif ((blob->data[0] == 0x00) && (blob->len >= 4)) {\n \t\t\t\tpriv->state = blob->data[blob->len-3];\n+\t\t\t\t\/* state not CARD_STATE_UNKNOWN => LCS supported *\/\n+\t\t\t\tif (priv->state != CARD_STATE_UNKNOWN)\n+\t\t\t\t\tpriv->ext_caps |= EXT_CAP_LCS;\n+\t\t\t}\n \t\t}\n \t}\n \n@@ -2759,8 +2767,7 @@\n \n \tLOG_FUNC_CALLED(card->ctx);\n \n-\tif (priv->bcd_version < OPENPGP_CARD_2_0\n-\t\t\t|| priv->state == CARD_STATE_UNKNOWN) {\n+\tif ((priv->ext_caps & EXT_CAP_LCS) == 0) {\n \t\tLOG_TEST_RET(card->ctx, SC_ERROR_NO_CARD_SUPPORT,\n \t\t\t\t\"Card does not offer life cycle management\");\n \t}\n"} {"commit":"492e5a43304fb02f77571bb0c40f789bcb920c61","subject":"isl_set_opt: align parameters","message":"isl_set_opt: align parameters\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"UBERTC\/isl,inducer\/isl-mirror,VanirLLVM\/toolchain_isl,Distrotech\/isl,BenzoSM\/isl,tobig\/isl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,abduld\/isl,tobig\/isl,crossbuild\/isl,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,jleben\/isl,Distrotech\/isl,inducer\/isl-mirror,simbuerg\/isl,Meinersbur\/isl,BenzoSM\/isl,epowers\/isl,PollyLabs\/isl,epowers\/isl,jleben\/isl,evaautomation\/isl,cfx-next\/toolchain_isl-upstream,epowers\/isl,simbuerg\/isl,cfx-next\/toolchain_isl-upstream,BobSaget-Mod\/libisl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,VanirLLVM\/toolchain_isl,SaberMod\/isl-current,UBERTC\/isl,abduld\/isl,evaautomation\/isl,KangDroidSMProject\/ISL,BenzoSM\/isl,UBERTC\/isl,abduld\/isl,simbuerg\/isl,serge-sans-paille\/isl,simbuerg\/isl,pierrotdelalune\/isl,BenzoSM\/isl,Distrotech\/isl,Meinersbur\/isl,nicolasvasilache\/isl,tobig\/isl,VanirLLVM\/toolchain_isl,KangDroidSMProject\/ISL,PollyLabs\/isl,serge-sans-paille\/isl,nicolasvasilache\/isl,evaautomation\/isl,Distrotech\/isl,inducer\/isl-mirror,abduld\/isl,pierrotdelalune\/isl,nicolasvasilache\/isl,evaautomation\/isl,epowers\/isl,epowers\/isl,SaberMod\/isl-current,jleben\/isl,SaberMod\/isl-current,VanirLLVM\/toolchain_isl,simbuerg\/isl,inducer\/isl-mirror,pierrotdelalune\/isl,jleben\/isl,BobSaget-Mod\/libisl,PollyLabs\/isl,crossbuild\/isl,UBERTC\/isl,VanirLLVM\/toolchain_isl,inducer\/isl-mirror,PollyLabs\/isl,crossbuild\/isl,crossbuild\/isl,nicolasvasilache\/isl,KangDroidSMProject\/ISL,tobig\/isl,PollyLabs\/isl,Meinersbur\/isl,BenzoSM\/isl,nicolasvasilache\/isl,pierrotdelalune\/isl,cfx-next\/toolchain_isl-upstream,cfx-next\/toolchain_isl-upstream,jleben\/isl,SaberMod\/isl-current,Distrotech\/isl,Meinersbur\/isl,serge-sans-paille\/isl,pierrotdelalune\/isl,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_ilp.c\n+++ isl_ilp.c\n@@ -427,8 +427,10 @@\n \n \/* Compute the minimum (maximum if max is set) of the integer affine\n * expression obj over the points in set and put the result in *opt.\n- *\/\n-enum isl_lp_result isl_set_opt(__isl_keep isl_set *set, int max,\n+ *\n+ * The parameters are assumed to have been aligned.\n+ *\/\n+static enum isl_lp_result isl_set_opt_aligned(__isl_keep isl_set *set, int max,\n \t__isl_keep isl_aff *obj, isl_int *opt)\n {\n \tint i;\n@@ -466,6 +468,34 @@\n \treturn empty ? isl_lp_empty : isl_lp_ok;\n }\n \n+\/* Compute the minimum (maximum if max is set) of the integer affine\n+ * expression obj over the points in set and put the result in *opt.\n+ *\/\n+enum isl_lp_result isl_set_opt(__isl_keep isl_set *set, int max,\n+\t__isl_keep isl_aff *obj, isl_int *opt)\n+{\n+\tenum isl_lp_result res;\n+\n+\tif (!set || !obj)\n+\t\treturn isl_lp_error;\n+\n+\tif (isl_space_match(set->dim, isl_dim_param,\n+\t\t\t obj->ls->dim, isl_dim_param))\n+\t\treturn isl_set_opt_aligned(set, max, obj, opt);\n+\n+\tset = isl_set_copy(set);\n+\tobj = isl_aff_copy(obj);\n+\tset = isl_set_align_params(set, isl_aff_get_domain_space(obj));\n+\tobj = isl_aff_align_params(obj, isl_set_get_space(set));\n+\n+\tres = isl_set_opt_aligned(set, max, obj, opt);\n+\n+\tisl_set_free(set);\n+\tisl_aff_free(obj);\n+\n+\treturn res;\n+}\n+\n enum isl_lp_result isl_basic_set_max(__isl_keep isl_basic_set *bset,\n \t__isl_keep isl_aff *obj, isl_int *opt)\n {\n"} {"commit":"16a8a14ccd7378fddf22ea919d3dcee8ec367581","subject":"tcache: moved code to tcache_miss()","message":"tcache: moved code to tcache_miss()\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/tcache.c\n+++ src\/tcache.c\n@@ -240,6 +240,40 @@\n tcr->callback(response, tcr->ctx);\n }\n \n+static void\n+tcache_hit(pool_t pool, const char *key, const struct tcache_item *item,\n+ translate_callback_t callback, void *ctx)\n+{\n+ struct translate_response *response =\n+ p_malloc(pool, sizeof(*response));\n+\n+ cache_log(4, \"translate_cache: hit %s\\n\", key);\n+\n+ tcache_dup_response(pool, response, &item->response);\n+ callback(response, ctx);\n+}\n+\n+static void\n+tcache_miss(pool_t pool, struct tcache *tcache,\n+ const struct translate_request *request, const char *key,\n+ translate_callback_t callback, void *ctx,\n+ struct async_operation_ref *async_ref)\n+{\n+ struct tcache_request *tcr = p_malloc(pool, sizeof(*tcr));\n+\n+ cache_log(4, \"translate_cache: miss %s\\n\", key);\n+\n+ tcr->pool = pool;\n+ tcr->tcache = tcache;\n+ tcr->request = request;\n+ tcr->key = key;\n+ tcr->callback = callback;\n+ tcr->ctx = ctx;\n+\n+ translate(pool, tcache->tcp_stock, tcache->socket_path,\n+ request, tcache_callback, tcr, async_ref);\n+}\n+\n \n \/*\n * cache class\n@@ -319,29 +353,10 @@\n (struct tcache_item *)cache_get_match(tcache->cache, key,\n tcache_item_match, &match_ctx);\n \n- if (item == NULL) {\n- struct tcache_request *tcr = p_malloc(pool, sizeof(*tcr));\n-\n- cache_log(4, \"translate_cache: miss %s\\n\", key);\n-\n- tcr->pool = pool;\n- tcr->tcache = tcache;\n- tcr->request = request;\n- tcr->key = key;\n- tcr->callback = callback;\n- tcr->ctx = ctx;\n-\n- translate(pool, tcache->tcp_stock, tcache->socket_path,\n- request, tcache_callback, tcr, async_ref);\n- } else {\n- struct translate_response *response =\n- p_malloc(pool, sizeof(*response));\n-\n- cache_log(4, \"translate_cache: hit %s\\n\", key);\n-\n- tcache_dup_response(pool, response, &item->response);\n- callback(response, ctx);\n- }\n+ if (item != NULL)\n+ tcache_hit(pool, key, item, callback, ctx);\n+ else\n+ tcache_miss(pool, tcache, request, key, callback, ctx, async_ref);\n } else {\n cache_log(4, \"translate_cache: ignore %s\\n\",\n request->uri == NULL ? request->widget_type : request->uri);\n"} {"commit":"bd05d3778e5c0a2448ba9be757afc97cc12b6b40","subject":"isl_basic_map_intersect: use isl_basic_map_peek_space","message":"isl_basic_map_intersect: use isl_basic_map_peek_space\n\nThis reduces the dependence on the internal representation.\n\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl,Meinersbur\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -3497,17 +3497,20 @@\n \t__isl_take isl_basic_map *bmap1, __isl_take isl_basic_map *bmap2)\n {\n \tstruct isl_vec *sample = NULL;\n+\tisl_space *space1, *space2;\n \n \tif (isl_basic_map_check_equal_params(bmap1, bmap2) < 0)\n \t\tgoto error;\n-\tif (isl_space_dim(bmap1->dim, isl_dim_all) ==\n-\t\t\t\tisl_space_dim(bmap1->dim, isl_dim_param) &&\n-\t isl_space_dim(bmap2->dim, isl_dim_all) !=\n-\t\t\t\tisl_space_dim(bmap2->dim, isl_dim_param))\n+\tspace1 = isl_basic_map_peek_space(bmap1);\n+\tspace2 = isl_basic_map_peek_space(bmap2);\n+\tif (isl_space_dim(space1, isl_dim_all) ==\n+\t\t\t\tisl_space_dim(space1, isl_dim_param) &&\n+\t isl_space_dim(space2, isl_dim_all) !=\n+\t\t\t\tisl_space_dim(space2, isl_dim_param))\n \t\treturn isl_basic_map_intersect(bmap2, bmap1);\n \n-\tif (isl_space_dim(bmap2->dim, isl_dim_all) !=\n-\t\t\t\t\tisl_space_dim(bmap2->dim, isl_dim_param))\n+\tif (isl_space_dim(space2, isl_dim_all) !=\n+\t\t\t\t\tisl_space_dim(space2, isl_dim_param))\n \t\tisl_assert(bmap1->ctx,\n \t\t\t isl_space_is_equal(bmap1->dim, bmap2->dim), goto error);\n \n"} {"commit":"53d7587e0a3e1cd2bacf9263a92179c248b8eed4","subject":"Fixed improper handling of snprintf return value","message":"Fixed improper handling of snprintf return value\n\n... and fix improper snprintf buffer size broken by\n703d69b6478fe2fad2c1c78e746cc766bc13673c\n","repos":"allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess,allinurl\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/tcbtdb.c\n+++ src\/tcbtdb.c\n@@ -63,8 +63,16 @@\n va_list args;\n \n va_start (args, fmt);\n- n = vsnprintf (params + len, DB_PARAMS, fmt, args);\n+ n = vsnprintf (params + len, DB_PARAMS - len, fmt, args);\n va_end (args);\n+\n+ if (n < 0) {\n+ \/\/ XXX log error\n+ n = 0;\n+ } else if (n >= DB_PARAMS - len) {\n+ \/\/ XXX log truncation\n+ n = DB_PARAMS - len;\n+ }\n \n return n;\n }\n@@ -79,7 +87,6 @@\n \n \/* copy path name to buffer *\/\n len += set_dbparam (params, len, \"%s\", path);\n- \/*len += snprintf (params + len, DB_PARAMS - len, \"%s\", path); *\/\n \n \/* caching parameters of a B+ tree database object *\/\n lcnum = conf.cache_lcnum > 0 ? conf.cache_lcnum : TC_LCNUM;\n"} {"commit":"50af1e2c70cc4d75552b00e0e804be414af9a18e","subject":"isl_set_project_out: always update dimension, even for empty sets","message":"isl_set_project_out: always update dimension, even for empty sets\n","repos":"BenzoSM\/isl,serge-sans-paille\/isl,evaautomation\/isl,pierrotdelalune\/isl,PollyLabs\/isl,Meinersbur\/isl,SaberMod\/isl-current,pierrotdelalune\/isl,BenzoSM\/isl,nicolasvasilache\/isl,evaautomation\/isl,serge-sans-paille\/isl,VanirLLVM\/toolchain_isl,KangDroidSMProject\/ISL,abduld\/isl,Distrotech\/isl,cfx-next\/toolchain_isl-upstream,simbuerg\/isl,inducer\/isl-mirror,Distrotech\/isl,crossbuild\/isl,epowers\/isl,inducer\/isl-mirror,PollyLabs\/isl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,evaautomation\/isl,serge-sans-paille\/isl,BobSaget-Mod\/libisl,tobig\/isl,Meinersbur\/isl,nicolasvasilache\/isl,simbuerg\/isl,jleben\/isl,crossbuild\/isl,inducer\/isl-mirror,UBERTC\/isl,PollyLabs\/isl,UBERTC\/isl,serge-sans-paille\/isl,inducer\/isl-mirror,epowers\/isl,pierrotdelalune\/isl,simbuerg\/isl,VanirLLVM\/toolchain_isl,tobig\/isl,crossbuild\/isl,BenzoSM\/isl,UBERTC\/isl,crossbuild\/isl,cfx-next\/toolchain_isl-upstream,inducer\/isl-mirror,jleben\/isl,epowers\/isl,KangDroidSMProject\/ISL,jleben\/isl,KangDroidSMProject\/ISL,abduld\/isl,BobSaget-Mod\/libisl,Distrotech\/isl,jleben\/isl,SaberMod\/isl-current,BenzoSM\/isl,pierrotdelalune\/isl,nicolasvasilache\/isl,Distrotech\/isl,epowers\/isl,Meinersbur\/isl,BobSaget-Mod\/libisl,Meinersbur\/isl,tobig\/isl,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,VanirLLVM\/toolchain_isl,simbuerg\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,SaberMod\/isl-current,KangDroidSMProject\/ISL,cfx-next\/toolchain_isl-upstream,simbuerg\/isl,PollyLabs\/isl,abduld\/isl,pierrotdelalune\/isl,abduld\/isl,cfx-next\/toolchain_isl-upstream,evaautomation\/isl,jleben\/isl,nicolasvasilache\/isl,tobig\/isl,UBERTC\/isl,nicolasvasilache\/isl,BenzoSM\/isl,SaberMod\/isl-current,VanirLLVM\/toolchain_isl,cfx-next\/toolchain_isl-upstream,epowers\/isl,Distrotech\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_map.c\n+++ isl_map.c\n@@ -2024,9 +2024,6 @@\n \tisl_assert(set->ctx, type == isl_dim_set, goto error);\n \tisl_assert(set->ctx, first + n == isl_set_n_dim(set), goto error);\n \n-\tif (n == 0)\n-\t\treturn set;\n-\n \tset = isl_set_cow(set);\n \tif (!set)\n \t\tgoto error;\n"} {"commit":"2ef39d89cbbbf08a08e45396e3df39821cb9c439","subject":"isl_tab_add_eq: propagate errors of drop_row","message":"isl_tab_add_eq: propagate errors of drop_row\n\nBy design, we should only be dropping the final row.\nHowever, if something should go wrong, we should propagate the error\nto the caller.\n\nSigned-off-by: Sven Verdoolaege <e5350bbed4977f5eb8ae1dc6abd9ae59d21ace75@kotnet.org>\n","repos":"KangDroidSMProject\/ISL,abduld\/isl,tobig\/isl,Distrotech\/isl,BenzoSM\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,SaberMod\/isl-current,evaautomation\/isl,UBERTC\/isl,abduld\/isl,KangDroidSMProject\/ISL,abduld\/isl,abduld\/isl,nicolasvasilache\/isl,tobig\/isl,Distrotech\/isl,simbuerg\/isl,Meinersbur\/isl,simbuerg\/isl,SaberMod\/isl-current,simbuerg\/isl,Meinersbur\/isl,KangDroidSMProject\/ISL,evaautomation\/isl,UBERTC\/isl,UBERTC\/isl,PollyLabs\/isl,tobig\/isl,SaberMod\/isl-current,evaautomation\/isl,PollyLabs\/isl,Meinersbur\/isl,nicolasvasilache\/isl,UBERTC\/isl,inducer\/isl-mirror,PollyLabs\/isl,BenzoSM\/isl,Distrotech\/isl,evaautomation\/isl,BenzoSM\/isl,Meinersbur\/isl,inducer\/isl-mirror,simbuerg\/isl,BenzoSM\/isl,BenzoSM\/isl,KangDroidSMProject\/ISL,simbuerg\/isl,PollyLabs\/isl,KangDroidSMProject\/ISL,SaberMod\/isl-current,Distrotech\/isl,nicolasvasilache\/isl,nicolasvasilache\/isl,tobig\/isl,inducer\/isl-mirror,PollyLabs\/isl,Distrotech\/isl,inducer\/isl-mirror","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_tab.c\n+++ isl_tab.c\n@@ -1983,12 +1983,9 @@\n \tvar = &tab->con[r];\n \trow = var->index;\n \tif (row_is_manifestly_zero(tab, row)) {\n-\t\tif (snap) {\n-\t\t\tif (isl_tab_rollback(tab, snap) < 0)\n-\t\t\t\treturn -1;\n-\t\t} else\n-\t\t\tdrop_row(tab, row);\n-\t\treturn 0;\n+\t\tif (snap)\n+\t\t\treturn isl_tab_rollback(tab, snap);\n+\t\treturn drop_row(tab, row);\n \t}\n \n \tif (tab->bmap) {\n"} {"commit":"069086ae283055b1ce4076151ba1e11c3a6f1e2b","subject":"[kernel] \u4e3art_thread_sleep\u6dfb\u52a0\u4e0a\u4e0b\u6587\u68c0\u67e5","message":"[kernel] \u4e3art_thread_sleep\u6dfb\u52a0\u4e0a\u4e0b\u6587\u68c0\u67e5\n","repos":"RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread,RT-Thread\/rt-thread","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"d6c07169cf06b470917ec530be46493a1c088f99","subject":"isl_tab_dup: avoid out-of-bounds array access","message":"isl_tab_dup: avoid out-of-bounds array access\n\ntab->n_col is between 0 and mat->n_col - 2 - M\nand may not be equal to n_var after some columns have been dropped.\n","repos":"PollyLabs\/isl,serge-sans-paille\/isl,serge-sans-paille\/isl,Meinersbur\/isl,pierrotdelalune\/isl,BobSaget-Mod\/libisl,KangDroidSMProject\/ISL,BenzoSM\/isl,BenzoSM\/isl,PollyLabs\/isl,UBERTC\/isl,Distrotech\/isl,cfx-next\/toolchain_isl-upstream,tobig\/isl,epowers\/isl,abduld\/isl,Meinersbur\/isl,Distrotech\/isl,nicolasvasilache\/isl,VanirLLVM\/toolchain_isl,BenzoSM\/isl,crossbuild\/isl,UBERTC\/isl,serge-sans-paille\/isl,VanirLLVM\/toolchain_isl,serge-sans-paille\/isl,nicolasvasilache\/isl,cfx-next\/toolchain_isl-upstream,inducer\/isl-mirror,pierrotdelalune\/isl,Meinersbur\/isl,BenzoSM\/isl,SaberMod\/isl-current,jleben\/isl,UBERTC\/isl,BobSaget-Mod\/libisl,BenzoSM\/isl,evaautomation\/isl,KangDroidSMProject\/ISL,simbuerg\/isl,PollyLabs\/isl,inducer\/isl-mirror,pierrotdelalune\/isl,simbuerg\/isl,jleben\/isl,nicolasvasilache\/isl,SaberMod\/isl-current,UBERTC\/isl,epowers\/isl,BobSaget-Mod\/libisl,crossbuild\/isl,Distrotech\/isl,tobig\/isl,VanirLLVM\/toolchain_isl,pierrotdelalune\/isl,inducer\/isl-mirror,evaautomation\/isl,SaberMod\/isl-current,Meinersbur\/isl,jleben\/isl,KangDroidSMProject\/ISL,cfx-next\/toolchain_isl-upstream,KangDroidSMProject\/ISL,epowers\/isl,BobSaget-Mod\/libisl,serge-sans-paille\/isl,nicolasvasilache\/isl,BobSaget-Mod\/libisl,abduld\/isl,cfx-next\/toolchain_isl-upstream,simbuerg\/isl,simbuerg\/isl,jleben\/isl,abduld\/isl,cfx-next\/toolchain_isl-upstream,jleben\/isl,crossbuild\/isl,Distrotech\/isl,abduld\/isl,PollyLabs\/isl,epowers\/isl,VanirLLVM\/toolchain_isl,nicolasvasilache\/isl,Distrotech\/isl,KangDroidSMProject\/ISL,inducer\/isl-mirror,SaberMod\/isl-current,tobig\/isl,tobig\/isl,VanirLLVM\/toolchain_isl,PollyLabs\/isl,evaautomation\/isl,inducer\/isl-mirror,evaautomation\/isl,pierrotdelalune\/isl,crossbuild\/isl,epowers\/isl,simbuerg\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_tab.c\n+++ isl_tab.c\n@@ -131,7 +131,7 @@\n \t\tif (!tab->mat)\n \t\t\treturn -1;\n \t\tp = isl_realloc_array(tab->mat->ctx, tab->col_var,\n-\t\t\t\t\t int, tab->mat->n_col);\n+\t\t\t\t\t int, tab->n_col + n_new);\n \t\tif (!p)\n \t\t\treturn -1;\n \t\ttab->col_var = p;\n@@ -181,10 +181,12 @@\n {\n \tint i;\n \tstruct isl_tab *dup;\n+\tunsigned off;\n \n \tif (!tab)\n \t\treturn NULL;\n \n+\toff = 2 + tab->M;\n \tdup = isl_calloc_type(tab->ctx, struct isl_tab);\n \tif (!dup)\n \t\treturn NULL;\n@@ -201,10 +203,10 @@\n \t\tgoto error;\n \tfor (i = 0; i < tab->n_con; ++i)\n \t\tdup->con[i] = tab->con[i];\n-\tdup->col_var = isl_alloc_array(tab->ctx, int, tab->mat->n_col);\n+\tdup->col_var = isl_alloc_array(tab->ctx, int, tab->mat->n_col - off);\n \tif (!dup->col_var)\n \t\tgoto error;\n-\tfor (i = 0; i < tab->n_var; ++i)\n+\tfor (i = 0; i < tab->n_col; ++i)\n \t\tdup->col_var[i] = tab->col_var[i];\n \tdup->row_var = isl_alloc_array(tab->ctx, int, tab->mat->n_row);\n \tif (!dup->row_var)\n"} {"commit":"8aac29a464e397e0f9b7809035de36fa37edd0fb","subject":"Set default error handler for thread.","message":"Set default error handler for thread.\n","repos":"tokuhirom\/Pone,tokuhirom\/Pone,tokuhirom\/Pone,tokuhirom\/Pone","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/thread.c\n+++ src\/thread.c\n@@ -20,17 +20,22 @@\n assert(pone_type(code) == PONE_CODE);\n assert(world->universe);\n \n- \/\/ free the context object.\n- pone_free(world->universe, p);\n+ world->err_handler_lexs[0] = world->lex;\n+ if (setjmp(world->err_handlers[0])) {\n+ pone_universe_default_err_handler(world);\n+ } else {\n+ \/\/ free the context object.\n+ pone_free(world->universe, p);\n \n- assert(pone_type(code) == PONE_CODE);\n- (void) pone_code_call(world, code, pone_nil(), 0);\n+ assert(pone_type(code) == PONE_CODE);\n+ (void) pone_code_call(world, code, pone_nil(), 0);\n \n- pone_universe* universe = world->universe;\n- UNIVERSE_LOCK(universe);\n- pone_world_free(world);\n- CHECK_PTHREAD(pthread_cond_signal(&(universe->thread_temrinate_cond)));\n- UNIVERSE_UNLOCK(universe);\n+ pone_universe* universe = world->universe;\n+ UNIVERSE_LOCK(universe);\n+ pone_world_free(world);\n+ CHECK_PTHREAD(pthread_cond_signal(&(universe->thread_temrinate_cond)));\n+ UNIVERSE_UNLOCK(universe);\n+ }\n \n return NULL;\n }\n"} {"commit":"b3d5ac1e408b5bdbe4efb1bc329d8ca263584c46","subject":"fixed typo","message":"fixed typo\n","repos":"ekorian\/udptun,ekorian\/udptun","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/udptun.c\n+++ src\/udptun.c\n@@ -230,7 +230,6 @@\n validate_args(&args);\n if (args.verbose) print_args(&args);\n \n- return 0;\n switch (args.mode) {\n case CLI_MODE:\n tun_cli(&args);\n"} {"commit":"1f39b5c6681536ef833a2e2e1312f2747be728f3","subject":"Add support for moving items to another day","message":"Add support for moving items to another day\n\nWhen moving an item (or when changing the start time of an item), allow\nfor optionally specifying a date. If both date and time are entered, the\nitem is updated to start on the given date and time. If only a date is\nentered, the item is modified to start on the given date, keeping the\ncurrent start time. If only a time is entered, the item is modified to\nstart on the current date and the new start time.\n\nFixes GitHub issue #12.\n\nSigned-off-by: Lukas Fleischer <c9ca73f8336dcfb037ec2c2abf52d80a6847a5cd@calcurse.org>\n","repos":"lfos\/calcurse,lfos\/calcurse,lfos\/calcurse","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ui-day.c\n+++ src\/ui-day.c\n@@ -61,26 +61,42 @@\n \/* Request the user to enter a new time. *\/\n static int day_edit_time(int time)\n {\n-\tchar *timestr = date_sec2date_str(time, \"%H:%M\");\n+\tchar *input = date_sec2date_str(time, \"%H:%M\");\n \tconst char *msg_time =\n-\t _(\"Enter start time ([hh:mm] or [hhmm]):\");\n+\t _(\"Enter start time ([hh:mm] or [hhmm]) or date:\");\n \tconst char *enter_str = _(\"Press [Enter] to continue\");\n \tconst char *fmt_msg =\n \t _(\"You entered an invalid time, should be [hh:mm] or [hhmm]\");\n-\tint hour, minute;\n+\tunsigned int hour, minute;\n+\tint year, month, day;\n+\tstruct date new_date;\n \n \tfor (;;) {\n \t\tstatus_mesg(msg_time, \"\");\n-\t\tif (updatestring(win[STA].p, ×tr, 0, 1) !=\n-\t\t GETSTRING_VALID)\n+\t\tif (updatestring(win[STA].p, &input, 0, 1) != GETSTRING_VALID)\n \t\t\treturn 0;\n-\t\tif (parse_time(timestr, &hour, &minute) == 1) {\n-\t\t\tmem_free(timestr);\n-\t\t\treturn update_time_in_date(time, hour, minute);\n-\t\t} else {\n-\t\t\tstatus_mesg(fmt_msg, enter_str);\n-\t\t\twgetch(win[KEY].p);\n-\t\t}\n+\t\tchar *inputcpy = mem_strdup(input);\n+\t\tchar *p = strtok(inputcpy, \" \");\n+\t\twhile (p) {\n+\t\t\tif (parse_date(p, conf.input_datefmt, &year, &month,\n+\t\t\t\t &day, ui_calendar_get_slctd_day())) {\n+\t\t\t\tnew_date.dd = day;\n+\t\t\t\tnew_date.mm = month;\n+\t\t\t\tnew_date.yyyy = year;\n+\t\t\t\ttime = date2sec(new_date, 0, 0) +\n+\t\t\t\t get_item_time(time);\n+\t\t\t} else if (parse_time(p, &hour, &minute) == 1) {\n+\t\t\t\ttime = update_time_in_date(time, hour, minute);\n+\t\t\t} else {\n+\t\t\t\tstatus_mesg(fmt_msg, enter_str);\n+\t\t\t\twgetch(win[KEY].p);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tp = strtok(NULL, \" \");\n+\t\t}\n+\t\tmem_free(inputcpy);\n+\t\tif (!p)\n+\t\t\treturn time;\n \t}\n }\n \n"} {"commit":"6bc4a6ed77b3e127ef15b736a4269b51470bf234","subject":"Fix vector dot product.","message":"Fix vector dot product.\n","repos":"wtolson\/nbody-opengl,wtolson\/nbody-opengl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/vector.c\n+++ src\/vector.c\n@@ -40,7 +40,7 @@\n \n \n float Vector_dot(Vector a, Vector b) {\n- return (a.x * b.x) + (a.y * b.y) + (a.z + b.z);\n+ return (a.x * b.x) + (a.y * b.y) + (a.z * b.z);\n }\n \n \n"} {"commit":"a5eabab7e4e40a20008af1b0056a9afed3ba9a67","subject":"Fix VIA VB8001 Mini-ITX Board (P4M900) support","message":"Fix VIA VB8001 Mini-ITX Board (P4M900) support\n\n\ngit-svn-id: 1e41a1b69b713dc96107d2dd734891188b9b2ee7@913 e8d65cb0-85f4-0310-8831-c60e2a5ce829\n","repos":"chutzimir\/openchrome,chutzimir\/openchrome,chutzimir\/openchrome","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/via_id.c\n+++ src\/via_id.c\n@@ -188,7 +188,7 @@\n {\"Mitac 8515\", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD},\n {\"Medion Notebook MD96483\", VIA_P4M900, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},\n {\"Mitac 8624\", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},\n- {\"VIA VT3364 (P4M900)\", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD},\n+ {\"VIA VB8001 Mini-ITX Board (P4M900)\", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT},\n {\"Gigabyte GA-VM900M\", VIA_P4M900, 0x1458, 0xD000, VIA_DEVICE_CRT},\n {\"MSI VR321\", VIA_P4M900, 0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD},\n {\"MSI P4M900M \/ P4M900M2-F\/L\", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT},\n"} {"commit":"8504842bac06655b2d52834ed0c18fde9e4a3c72","subject":"support virtual method call","message":"support virtual method call\n","repos":"konoha-project\/minikonoha,konoha-project\/minikonoha,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/minikonoha","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/vm\/asm.c\n+++ src\/vm\/asm.c\n@@ -88,7 +88,7 @@\n \n int verbose_code = 0; \/\/ global variable\n \n-static void EXPR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx);\n+static void EXPR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx);\n \n static kBasicBlock* new_BasicBlockLABEL(KonohaContext *kctx)\n {\n@@ -501,9 +501,9 @@\n \treturn lbJUMP;\n }\n \n-static kBasicBlock* EXPR_asmJMPIF(KonohaContext *kctx, int a, kExpr *expr, int isTRUE, kBasicBlock* label, int shift, int espidx)\n-{\n-\tEXPR_asm(kctx, a, expr, shift, espidx);\n+static kBasicBlock* EXPR_asmJMPIF(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int isTRUE, kBasicBlock* label, int shift, int espidx)\n+{\n+\tEXPR_asm(kctx, stmt, a, expr, shift, espidx);\n \tif(isTRUE) {\n \t\tASM(BNOT, NC_(a), NC_(a));\n \t}\n@@ -522,10 +522,10 @@\n }\n \n static void BLOCK_asm(KonohaContext *kctx, kBlock *bk, int shift);\n-static void CALL_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx);\n-static void AND_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx);\n-static void OR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx);\n-static void LETEXPR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx);\n+static void CALL_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx);\n+static void AND_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx);\n+static void OR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx);\n+static void LETEXPR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx);\n \n static void NMOV_asm(KonohaContext *kctx, int a, ktype_t ty, int b)\n {\n@@ -537,7 +537,7 @@\n \t}\n }\n \n-static void EXPR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx)\n+static void EXPR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx)\n {\n \tDBG_ASSERT(expr != NULL);\n \t\/\/DBG_P(\"a=%d, shift=%d, espidx=%d\", a, shift, espidx);\n@@ -595,7 +595,7 @@\n \t}\n \tcase TEXPR_BOX : {\n \t\tDBG_ASSERT(IS_Expr(expr->single));\n-\t\tEXPR_asm(kctx, a, expr->single, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, a, expr->single, shift, espidx);\n \t\tASM(BOX, OC_(a), NC_(a), CT_(expr->single->ty));\n \t\tbreak;\n \t}\n@@ -604,19 +604,19 @@\n \t\tbreak;\n \t}\n \tcase TEXPR_CALL :\n-\t\tCALL_asm(kctx, a, expr, shift, espidx);\n+\t\tCALL_asm(kctx, stmt, a, expr, shift, espidx);\n \t\tif(a != espidx) {\n \t\t\tNMOV_asm(kctx, a, expr->ty, espidx);\n \t\t}\n \t\tbreak;\n \tcase TEXPR_AND :\n-\t\tAND_asm(kctx, a, expr, shift, espidx);\n+\t\tAND_asm(kctx, stmt, a, expr, shift, espidx);\n \t\tbreak;\n \tcase TEXPR_OR :\n-\t\tOR_asm(kctx, a, expr, shift, espidx);\n+\t\tOR_asm(kctx, stmt, a, expr, shift, espidx);\n \t\tbreak;\n \tcase TEXPR_LET :\n-\t\tLETEXPR_asm(kctx, a, expr, shift, espidx);\n+\t\tLETEXPR_asm(kctx, stmt, a, expr, shift, espidx);\n \t\tbreak;\n \tcase TEXPR_STACKTOP :\n \t\t\/\/DBG_P(\"STACKTOP mov %d, %d, < %d\", a, expr->index + shift, espidx);\n@@ -630,7 +630,7 @@\n \n static KMETHOD MethodFunc_invokeAbstractMethod(KonohaContext *kctx, KonohaStack *sfp);\n \n-static void CALL_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx)\n+static void CALL_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx)\n {\n \tkMethod *mtd = expr->cons->methodItems[0];\n \tDBG_ASSERT(IS_Method(mtd));\n@@ -643,7 +643,7 @@\n \tfor(i = s; i < kArray_size(expr->cons); i++) {\n \t\tkExpr *exprN = kExpr_at(expr, i);\n \t\tDBG_ASSERT(IS_Expr(exprN));\n-\t\tEXPR_asm(kctx, thisidx + i - 1, exprN, shift, thisidx + i - 1);\n+\t\tEXPR_asm(kctx, stmt, thisidx + i - 1, exprN, shift, thisidx + i - 1);\n \t}\n \tint argc = kArray_size(expr->cons) - 2;\n \/\/\tif (mtd->mn == MN_new && mtd->invokeMethodFunc == MethodFunc_abstract) {\n@@ -658,18 +658,22 @@\n \/\/\t\t}\n \/\/\t}\n \/\/\telse {\n+\tif(Method_isFinal(mtd) || !Method_isVirtual(mtd)) {\n \t\tASM(NSET, NC_(thisidx-1), (intptr_t)mtd, CT_Method);\n-\t\tASM(CALL, ctxcode->uline, SFP_(thisidx), ESP_(espidx, argc), KLIB Knull(kctx, CT_(expr->ty)));\n-\/\/\t}\n-}\n-\n-static void OR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx)\n+\t}\n+\telse {\n+\t\tASM(LOOKUP, SFP_(thisidx), Stmt_nameSpace(stmt), mtd);\n+\t}\n+\tASM(CALL, ctxcode->uline, SFP_(thisidx), ESP_(espidx, argc), KLIB Knull(kctx, CT_(expr->ty)));\n+}\n+\n+static void OR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx)\n {\n \tint i, size = kArray_size(expr->cons);\n \tkBasicBlock* lbTRUE = new_BasicBlockLABEL(kctx);\n \tkBasicBlock* lbFALSE = new_BasicBlockLABEL(kctx);\n \tfor(i = 1; i < size; i++) {\n-\t\tEXPR_asmJMPIF(kctx, a, kExpr_at(expr, i), 1\/*TRUE*\/, lbTRUE, shift, espidx);\n+\t\tEXPR_asmJMPIF(kctx, stmt, a, kExpr_at(expr, i), 1\/*TRUE*\/, lbTRUE, shift, espidx);\n \t}\n \tASM(NSET, NC_(a), 0\/*O_data(K_FALSE)*\/, CT_Boolean);\n \tASM_JMP(kctx, lbFALSE);\n@@ -678,13 +682,13 @@\n \tASM_LABEL(kctx, lbFALSE); \/\/ false\n }\n \n-static void AND_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx)\n+static void AND_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx)\n {\n \tint i, size = kArray_size(expr->cons);\n \tkBasicBlock* lbTRUE = new_BasicBlockLABEL(kctx);\n \tkBasicBlock* lbFALSE = new_BasicBlockLABEL(kctx);\n \tfor(i = 1; i < size; i++) {\n-\t\tEXPR_asmJMPIF(kctx, a, kExpr_at(expr, i), 0\/*FALSE*\/, lbFALSE, shift, espidx);\n+\t\tEXPR_asmJMPIF(kctx, stmt, a, kExpr_at(expr, i), 0\/*FALSE*\/, lbFALSE, shift, espidx);\n \t}\n \tASM(NSET, NC_(a), 1\/*O_data(K_TRUE)*\/, CT_Boolean);\n \tASM_JMP(kctx, lbTRUE);\n@@ -693,26 +697,26 @@\n \tASM_LABEL(kctx, lbTRUE); \/\/ TRUE\n }\n \n-static void LETEXPR_asm(KonohaContext *kctx, int a, kExpr *expr, int shift, int espidx)\n+static void LETEXPR_asm(KonohaContext *kctx, kStmt *stmt, int a, kExpr *expr, int shift, int espidx)\n {\n \tkExpr *exprL = kExpr_at(expr, 1);\n \tkExpr *exprR = kExpr_at(expr, 2);\n \tif(exprL->build == TEXPR_LOCAL) {\n-\t\tEXPR_asm(kctx, exprL->index, exprR, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, exprL->index, exprR, shift, espidx);\n \t\tif(a != espidx) {\n \t\t\tNMOV_asm(kctx, a, exprL->ty, espidx);\n \t\t}\n \t}\n \telse if(exprL->build == TEXPR_STACKTOP) {\n \t\tDBG_P(\"LET TEXPR_STACKTOP a=%d, exprL->index=%d, espidx=%d\", a, exprL->index, espidx);\n-\t\tEXPR_asm(kctx, exprL->index + shift, exprR, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, exprL->index + shift, exprR, shift, espidx);\n \t\tif(a != espidx) {\n \t\t\tNMOV_asm(kctx, a, exprL->ty, exprL->index + espidx);\n \t\t}\n \t}\n \telse{\n \t\tassert(exprL->build == TEXPR_FIELD);\n-\t\tEXPR_asm(kctx, espidx, exprR, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, espidx, exprR, shift, espidx);\n \t\tkshort_t index = (kshort_t)exprL->index;\n \t\tkshort_t xindex = (kshort_t)(exprL->index >> (sizeof(kshort_t)*8));\n \t\tif(TY_isUnbox(exprR->ty)) {\n@@ -768,7 +772,7 @@\n {\n \tkExpr *expr = (kExpr*)kStmt_getObjectNULL(kctx, stmt, KW_ExprPattern);\n \tif(IS_Expr(expr)) {\n-\t\tEXPR_asm(kctx, espidx, expr, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, espidx, expr, shift, espidx);\n \t}\n }\n \n@@ -782,7 +786,7 @@\n \tkBasicBlock* lbELSE = new_BasicBlockLABEL(kctx);\n \tkBasicBlock* lbEND = new_BasicBlockLABEL(kctx);\n \t\/* if *\/\n-\tlbELSE = EXPR_asmJMPIF(kctx, espidx, SUGAR kStmt_getExpr(kctx, stmt, KW_ExprPattern, NULL), 0\/*FALSE*\/, lbELSE, shift, espidx);\n+\tlbELSE = EXPR_asmJMPIF(kctx, stmt, espidx, SUGAR kStmt_getExpr(kctx, stmt, KW_ExprPattern, NULL), 0\/*FALSE*\/, lbELSE, shift, espidx);\n \t\/* then *\/\n \tBLOCK_asm(kctx, SUGAR kStmt_getBlock(kctx, stmt, KW_BlockPattern, K_NULLBLOCK), shift);\n \tASM_JMP(kctx, lbEND);\n@@ -797,7 +801,7 @@\n {\n \tkExpr *expr = (kExpr*)kStmt_getObjectNULL(kctx, stmt, KW_ExprPattern);\n \tif(expr != NULL && IS_Expr(expr) && expr->ty != TY_void) {\n-\t\tEXPR_asm(kctx, K_RTNIDX, expr, shift, espidx);\n+\t\tEXPR_asm(kctx, stmt, K_RTNIDX, expr, shift, espidx);\n \t}\n \tASM_JMP(kctx, ctxcode->lbEND); \/\/ RET\n }\n@@ -811,7 +815,7 @@\n \tKLIB kObject_setObject(kctx, stmt, SYM_(\"break\"), TY_BasicBlock, lbBREAK);\n \tASM_LABEL(kctx, lbCONTINUE);\n \tASM_SAFEPOINT(kctx, espidx);\n-\tEXPR_asmJMPIF(kctx, espidx, SUGAR kStmt_getExpr(kctx, stmt, KW_ExprPattern, NULL), 0\/*FALSE*\/, lbBREAK, shift, espidx);\n+\tEXPR_asmJMPIF(kctx, stmt, espidx, SUGAR kStmt_getExpr(kctx, stmt, KW_ExprPattern, NULL), 0\/*FALSE*\/, lbBREAK, shift, espidx);\n \t\/\/BLOCK_asm(kctx, SUGAR kStmt_getBlock(kctx, stmt, KW_(\"iteration\"), K_NULLBLOCK));\n \tBLOCK_asm(kctx, SUGAR kStmt_getBlock(kctx, stmt, KW_BlockPattern, K_NULLBLOCK), shift);\n \tASM_JMP(kctx, lbCONTINUE);\n"} {"commit":"8b971a7b2c59902914ecbbc3915c45dd21530a91","subject":"Fix terminal title reporting","message":"Fix terminal title reporting\n\nFixed CVE-2003-0070 again.\nSee also http:\/\/marc.info\/?l=bugtraq&m=104612710031920&w=2 .\n(cherry picked from commit 6042c75b5a6daa0e499e61c8e07242d890d38ff1)\n","repos":"aligo\/vte,jessevdk\/vte,rvu95\/vte,aligo\/vte,jessevdk\/vte,rvu95\/vte,pjm0616\/vte,thestinger\/vte-ng,asivokon\/vte-fx,saitoha\/vte-sixel,thestinger\/vte-ng,flaxandteal\/gasket-vte,thestinger\/vte-ng,rvu95\/vte,gloob\/vte-copy,gloob\/vte-copy,pjm0616\/vte,flaxandteal\/gasket-vte,jessevdk\/vte,flaxandteal\/gasket-vte,pjm0616\/vte,jessevdk\/vte,rvu95\/vte,saitoha\/vte-sixel,aligo\/vte,flaxandteal\/gasket-vte,asivokon\/vte-fx,saitoha\/vte-sixel,asivokon\/vte-fx,asivokon\/vte-fx,gloob\/vte-copy","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/vteseq.c\n+++ src\/vteseq.c\n@@ -3212,21 +3212,29 @@\n \t\t\tvte_terminal_feed_child(terminal, buf, -1);\n \t\t\tbreak;\n \t\tcase 20:\n-\t\t\t\/* Report the icon title. *\/\n+\t\t\t\/* Report a static icon title, since the real\n+\t\t\t icon title should NEVER be reported, as it\n+\t\t\t creates a security vulnerability. See\n+\t\t\t http:\/\/marc.info\/?l=bugtraq&m=104612710031920&w=2\n+\t\t\t and CVE-2003-0070. *\/\n \t\t\t_vte_debug_print(VTE_DEBUG_PARSE,\n-\t\t\t\t\"Reporting icon title.\\n\");\n+\t\t\t\t\"Reporting fake icon title.\\n\");\n+\t\t\t\/* never use terminal->icon_title here! *\/\n \t\t\tg_snprintf (buf, sizeof (buf),\n-\t\t\t\t _VTE_CAP_OSC \"L%s\" _VTE_CAP_ST,\n-\t\t\t\t terminal->icon_title);\n+\t\t\t\t _VTE_CAP_OSC \"LTerminal\" _VTE_CAP_ST);\n \t\t\tvte_terminal_feed_child(terminal, buf, -1);\n \t\t\tbreak;\n \t\tcase 21:\n-\t\t\t\/* Report the window title. *\/\n+\t\t\t\/* Report a static window title, since the real\n+\t\t\t window title should NEVER be reported, as it\n+\t\t\t creates a security vulnerability. See\n+\t\t\t http:\/\/marc.info\/?l=bugtraq&m=104612710031920&w=2\n+\t\t\t and CVE-2003-0070. *\/\n \t\t\t_vte_debug_print(VTE_DEBUG_PARSE,\n-\t\t\t\t\t\"Reporting window title.\\n\");\n+\t\t\t\t\t\"Reporting fake window title.\\n\");\n+\t\t\t\/* never use terminal->window_title here! *\/\n \t\t\tg_snprintf (buf, sizeof (buf),\n-\t\t\t\t _VTE_CAP_OSC \"l%s\" _VTE_CAP_ST,\n-\t\t\t\t terminal->window_title);\n+\t\t\t\t _VTE_CAP_OSC \"lTerminal\" _VTE_CAP_ST);\n \t\t\tvte_terminal_feed_child(terminal, buf, -1);\n \t\t\tbreak;\n \t\tdefault:\n"} {"commit":"8b68263ed3c78db309c650931c6c8fcd53dbfd34","subject":"Fix null pointer in IsTrusted()","message":"Fix null pointer in IsTrusted()\n\nRebased-From: ba51c7d\n","repos":"Exceltior\/dogecoin,coinkeeper\/2015-06-22_18-37_dogecoin,haisee\/dogecoin,RazorLove\/cloaked-octo-spice,haisee\/dogecoin,brishtiteveja\/sherlockcoin,masterbraz\/dg,nigeriacoin\/nigeriacoin,riecoin\/riecoin,nigeriacoin\/nigeriacoin,nsacoin\/nsacoin,langerhans\/dogecoin,Domer85\/dogecoin,nsacoin\/nsacoin,RazorLove\/cloaked-octo-spice,koharjidan\/dogecoin,koharjidan\/dogecoin,RazorLove\/cloaked-octo-spice,koharjidan\/dogecoin,jarymoth\/dogecoin,coinwarp\/dogecoin,riecoin\/riecoin,coinkeeper\/2015-06-22_18-37_dogecoin,coinkeeper\/2015-06-22_18-37_dogecoin,coinwarp\/dogecoin,coinkeeper\/2015-06-22_18-37_dogecoin,coinwarp\/dogecoin,Domer85\/dogecoin,oklink-dev\/bitcoin_block,koharjidan\/dogecoin,marklai9999\/Taiwancoin,jarymoth\/dogecoin,marklai9999\/Taiwancoin,RazorLove\/cloaked-octo-spice,Domer85\/dogecoin,langerhans\/dogecoin,Exceltior\/dogecoin,brishtiteveja\/sherlockcoin,haisee\/dogecoin,masterbraz\/dg,marklai9999\/Taiwancoin,masterbraz\/dg,nigeriacoin\/nigeriacoin,koharjidan\/dogecoin,brishtiteveja\/sherlockcoin,nigeriacoin\/nigeriacoin,brishtiteveja\/sherlockcoin,jarymoth\/dogecoin,nsacoin\/nsacoin,riecoin\/riecoin,oklink-dev\/bitcoin_block,coinwarp\/dogecoin,haisee\/dogecoin,RazorLove\/cloaked-octo-spice,marklai9999\/Taiwancoin,nsacoin\/nsacoin,masterbraz\/dg,Exceltior\/dogecoin,nsacoin\/nsacoin,oklink-dev\/bitcoin_block,oklink-dev\/bitcoin_block,langerhans\/dogecoin,nigeriacoin\/nigeriacoin,riecoin\/riecoin,coinwarp\/dogecoin,Exceltior\/dogecoin,jarymoth\/dogecoin,brishtiteveja\/sherlockcoin,Exceltior\/dogecoin,haisee\/dogecoin,riecoin\/riecoin,coinkeeper\/2015-06-22_18-37_dogecoin,langerhans\/dogecoin,masterbraz\/dg,oklink-dev\/bitcoin_block,jarymoth\/dogecoin,Domer85\/dogecoin,langerhans\/dogecoin,langerhans\/dogecoin,koharjidan\/dogecoin,oklink-dev\/bitcoin_block","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wallet.h\n+++ src\/wallet.h\n@@ -675,8 +675,10 @@\n {\n \/\/ Transactions not sent by us: not trusted\n const CWalletTx* parent = pwallet->GetWalletTx(txin.prevout.hash);\n+ if (parent == NULL)\n+ return false;\n const CTxOut& parentOut = parent->vout[txin.prevout.n];\n- if (parent == NULL || !pwallet->IsMine(parentOut))\n+ if (!pwallet->IsMine(parentOut))\n return false;\n }\n return true;\n"} {"commit":"6238424a1be6a555551b138c1851912bbd8cdeab","subject":"add widget structure","message":"add widget structure\n","repos":"fkmclane\/barline","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/widget.h\n+++ src\/widget.h\n@@ -1,3 +1,33 @@\n #ifndef WIDGET_H\n #define WIDGET_H\n+typedef struct widget {\n+\tstruct widget * prev;\n+\n+\tenum {\n+\t\tBATT,\n+\t\tCPU,\n+\t\tMEM,\n+\t\tTEMP,\n+\t\tTIME,\n+\t\tVOL,\n+\t\tWIN,\n+\t\tWLAN,\n+\t\tWORK,\n+\t} type;\n+\n+\tunion {\n+\t\tbatt_t * batt;\n+\t\tcpu_t * cpu;\n+\t\tmem_t * mem;\n+\t\ttemp_t * temp;\n+\t\ttime_t * time;\n+\t\tvol_t * vol;\n+\t\twin_t * win;\n+\t\twlan_t * wlan;\n+\t\twork_t * work;\n+\t} data;\n+} widget_t;\n+\n+void widget_parse(const char * widget, widget_t * widget);\n+size_t widget_format(const widget_t * widget, char * buf, size_t size);\n #endif\n"} {"commit":"eddc75024c75c951dcc2a074201af82cf7268ca1","subject":"Add comments to the windowStruct","message":"Add comments to the windowStruct\n","repos":"Abestanis\/SDL2X11Emulation,Abestanis\/SDL2X11Emulation,Abestanis\/SDL2X11Emulation","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/window.h\n+++ src\/window.h\n@@ -17,13 +17,24 @@\n typedef enum {UnMapped, Mapped, MapRequested} MapState;\n \n typedef struct {\n+ \/* Parent window of this window, never NULL (except SCREEN_WINDOW). *\/\n Window parent;\n- Window* children; \/* List of children, must end with NULL, can contain NULL between values *\/\n+ \/* List of children, must end with NULL, can contain NULL between values, can be NULL if no children exist. *\/\n+ Window* children;\n+ \/* Number of Windows that can fit in the currently allocated children list. *\/\n unsigned int childSpace;\n+ \/* This is the drawing target of the window and its children while it is unmapped. Might be NULL.*\/\n GPU_Image* unmappedContent;\n+ \/* \n+ * This is the SDL Window handler to the real window of this window.\n+ * Only set if this window is a mapped top level window.\n+ *\/\n SDL_Window* sdlWindow;\n+ \/* The render target of this window. Only set if sdlWindow or unmappedContent is set. *\/\n GPU_Target* renderTarget;\n+ \/* The position of this window relative to its parent. *\/\n int x, y;\n+ \/* The dimensions of this window. *\/\n unsigned int w, h;\n Bool inputOnly;\n Visual* visual;\n@@ -35,13 +46,17 @@\n unsigned int propertyCount;\n unsigned int propertySize;\n WindowProperty* properties;\n+ \/* The window name. Only used if this window has a corresponding sdlWindow. *\/\n char* windowName;\n+ \/* The icon of this window. Only used if this window has a corresponding sdlWindow. *\/\n SDL_Surface* icon;\n unsigned int borderWidth;\n int depth;\n+ \/* Indicates if this window is Mapped, if mapping it is requested or if it is Unmapped. *\/\n MapState mapState;\n long eventMask;\n #ifdef DEBUG_WINDOWS\n+ \/* Random id used for debugging. *\/\n unsigned long debugId;\n #endif \/* DEBUG_WINDOWS *\/\n } WindowStruct;\n"} {"commit":"047b40ab60473d9578b04de59f6fd247b0440ba9","subject":"more","message":"more\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wm\/wm2.c\n+++ src\/wm\/wm2.c\n@@ -153,7 +153,29 @@\n 0xFFB05070,\n 0xFFF898B8\n };\n-static unsigned int windowcmap[] = {\n+\n+#if 0\n+#define BORDERRECT_COLOR_NORMAL 0\n+\n+static unsigned int borderrectcmap[] = {\n+ 0xFFFF0000,\n+};\n+static struct linesegment borderrect0[1] = {\n+ {1, -1, BORDERRECT_COLOR_NORMAL}\n+};\n+\n+static struct linesegment borderrect1[2] = {\n+ {0, 1, BORDERRECT_COLOR_NORMAL},\n+ {-1, 1, BORDERRECT_COLOR_NORMAL}\n+};\n+#endif\n+\n+#define WINDOW_COLOR_SHADOW 0\n+#define WINDOW_COLOR_MAIN_LIGHT 1\n+#define WINDOW_COLOR_MAIN_NORMAL 2\n+#define WINDOW_COLOR_AREA_NORMAL 3\n+\n+static unsigned int windowcmapnormal[] = {\n 0xFF101010,\n 0xFFA0A0A0,\n 0xFF808080,\n@@ -165,75 +187,56 @@\n 0xFF88A878,\n 0xFF242424\n };\n-static unsigned char colormap8[] = {\n- 0x00, 0x00, 0x00,\n- 0x3F, 0x3F, 0x3F,\n- 0x04, 0x02, 0x02,\n- 0x06, 0x04, 0x04,\n- 0x08, 0x06, 0x06,\n- 0x08, 0x10, 0x18,\n- 0x0C, 0x14, 0x1C,\n- 0x28, 0x10, 0x18,\n- 0x38, 0x20, 0x28,\n- 0x1C, 0x18, 0x18,\n- 0x3F, 0x3F, 0x3F\n-};\n-\n-#define BORDER_COLOR_SHADOW 0\n-#define BORDER_COLOR_MAIN_LIGHT 1\n-#define BORDER_COLOR_MAIN_NORMAL 2\n-#define BORDER_COLOR_AREA_NORMAL 3\n-\n static struct linesegment windowborder0[1] = {\n- {1, -1, BORDER_COLOR_SHADOW}\n+ {1, -1, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowborder1[1] = {\n- {0, 0, BORDER_COLOR_SHADOW}\n+ {0, 0, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowborder2[3] = {\n- {0, 3, BORDER_COLOR_SHADOW},\n- {3, -3, BORDER_COLOR_MAIN_LIGHT},\n- {-3, 3, BORDER_COLOR_SHADOW}\n+ {0, 3, WINDOW_COLOR_SHADOW},\n+ {3, -3, WINDOW_COLOR_MAIN_LIGHT},\n+ {-3, 3, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowborder3[5] = {\n- {0, 2, BORDER_COLOR_SHADOW},\n- {2, 2, BORDER_COLOR_MAIN_LIGHT},\n- {4, -4, BORDER_COLOR_MAIN_NORMAL},\n- {-4, 2, BORDER_COLOR_MAIN_LIGHT},\n- {-2, 2, BORDER_COLOR_SHADOW}\n+ {0, 2, WINDOW_COLOR_SHADOW},\n+ {2, 2, WINDOW_COLOR_MAIN_LIGHT},\n+ {4, -4, WINDOW_COLOR_MAIN_NORMAL},\n+ {-4, 2, WINDOW_COLOR_MAIN_LIGHT},\n+ {-2, 2, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowbordertitle[5] = {\n- {0, 2, BORDER_COLOR_SHADOW},\n- {2, 1, BORDER_COLOR_MAIN_LIGHT},\n- {3, -3, BORDER_COLOR_MAIN_NORMAL},\n- {-3, 1, BORDER_COLOR_MAIN_LIGHT},\n- {-2, 2, BORDER_COLOR_SHADOW}\n+ {0, 2, WINDOW_COLOR_SHADOW},\n+ {2, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {3, -3, WINDOW_COLOR_MAIN_NORMAL},\n+ {-3, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {-2, 2, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowborderspacing[7] = {\n- {0, 2, BORDER_COLOR_SHADOW},\n- {2, 1, BORDER_COLOR_MAIN_LIGHT},\n- {3, 1, BORDER_COLOR_MAIN_NORMAL},\n- {4, -4, BORDER_COLOR_SHADOW},\n- {-4, 1, BORDER_COLOR_MAIN_NORMAL},\n- {-3, 1, BORDER_COLOR_MAIN_LIGHT},\n- {-2, 2, BORDER_COLOR_SHADOW}\n+ {0, 2, WINDOW_COLOR_SHADOW},\n+ {2, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {3, 1, WINDOW_COLOR_MAIN_NORMAL},\n+ {4, -4, WINDOW_COLOR_SHADOW},\n+ {-4, 1, WINDOW_COLOR_MAIN_NORMAL},\n+ {-3, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {-2, 2, WINDOW_COLOR_SHADOW}\n };\n \n static struct linesegment windowborderarea[9] = {\n- {0, 2, BORDER_COLOR_SHADOW},\n- {2, 1, BORDER_COLOR_MAIN_LIGHT},\n- {3, 1, BORDER_COLOR_MAIN_NORMAL},\n- {4, 1, BORDER_COLOR_SHADOW},\n- {5, -5, BORDER_COLOR_AREA_NORMAL},\n- {-5, 1, BORDER_COLOR_SHADOW},\n- {-4, 1, BORDER_COLOR_MAIN_NORMAL},\n- {-3, 1, BORDER_COLOR_MAIN_LIGHT},\n- {-2, 2, BORDER_COLOR_SHADOW}\n+ {0, 2, WINDOW_COLOR_SHADOW},\n+ {2, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {3, 1, WINDOW_COLOR_MAIN_NORMAL},\n+ {4, 1, WINDOW_COLOR_SHADOW},\n+ {5, -5, WINDOW_COLOR_AREA_NORMAL},\n+ {-5, 1, WINDOW_COLOR_SHADOW},\n+ {-4, 1, WINDOW_COLOR_MAIN_NORMAL},\n+ {-3, 1, WINDOW_COLOR_MAIN_LIGHT},\n+ {-2, 2, WINDOW_COLOR_SHADOW}\n };\n \n static void setupvideo(void)\n@@ -253,7 +256,6 @@\n \n file_seekwriteall(FILE_L1, black, 768, 0);\n file_seekwriteall(FILE_L0, &settings, sizeof (struct ctrl_videosettings), 0);\n- file_seekwriteall(FILE_L1, colormap8, 3 * 11, 0);\n \n }\n \n@@ -420,24 +422,24 @@\n \n }\n \n-static void paintlinesegment(struct rectangle *r1, unsigned int *cmap, struct linesegment *p, struct rectangle *area, unsigned int y)\n+static void paintlinesegment(int x, int w, unsigned int *cmap, struct linesegment *p, struct rectangle *area, unsigned int y)\n {\n \n struct position p0;\n struct position p1;\n \n- convert(r1->position.x, r1->size.w, p->x, p->w, y, &p0, &p1);\n+ convert(x, w, p->x, p->w, y, &p0, &p1);\n blit_line(p0.x, p1.x, screen.size.w, cmap[p->color], y);\n \n }\n \n-static void paintlinesegments(struct rectangle *r1, unsigned int *cmap, struct linesegment *ls, unsigned int n, struct rectangle *area, unsigned int y)\n+static void paintlinesegments(int x, int w, unsigned int *cmap, struct linesegment *ls, unsigned int n, struct rectangle *area, unsigned int y)\n {\n \n unsigned int i;\n \n for (i = 0; i < n; i++)\n- paintlinesegment(r1, cmap, &ls[i], area, y);\n+ paintlinesegment(x, w, cmap, &ls[i], area, y);\n \n }\n \n@@ -451,36 +453,48 @@\n \n }\n \n+#if 0\n+static void paintborderrect(struct rectangle *area, unsigned int y)\n+{\n+\n+ unsigned int *cmap = borderrectcmap;\n+ unsigned int ly = y - area->position.y;\n+\n+ if (ly == 0 || ly == area->size.h - 1)\n+ paintlinesegments(area->position.x, area->size.w, cmap, borderrect0, 1, area, y);\n+\n+ if (ly > 1 && ly < area->size.h - 2)\n+ paintlinesegments(area->position.x, area->size.w, cmap, borderrect1, 2, area, y);\n+\n+}\n+#endif\n+\n static void paintwindow(struct window *w, struct rectangle *area, unsigned int y)\n {\n \n- unsigned int *cmap = (w->focus) ? windowcmapfocus : windowcmap;\n+ unsigned int *cmap = (w->focus) ? windowcmapfocus : windowcmapnormal;\n unsigned int ly = y - w->position.y;\n- struct rectangle r;\n-\n- r.position.x = w->position.x;\n- r.size.w = w->size.w;\n \n if (ly == 0 || ly == w->size.h - 1)\n- paintlinesegments(&r, cmap, windowborder0, 1, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborder0, 1, area, y);\n \n if (ly == 1 || ly == w->size.h - 2)\n- paintlinesegments(&r, cmap, windowborder1, 1, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborder1, 1, area, y);\n \n if (ly == 2 || ly == w->size.h - 3)\n- paintlinesegments(&r, cmap, windowborder2, 3, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborder2, 3, area, y);\n \n if (ly == 3 || ly == w->size.h - 4)\n- paintlinesegments(&r, cmap, windowborder3, 5, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborder3, 5, area, y);\n \n if (ly >= 4 && ly < 40)\n- paintlinesegments(&r, cmap, windowbordertitle, 5, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowbordertitle, 5, area, y);\n \n if (ly == 40)\n- paintlinesegments(&r, cmap, windowborderspacing, 7, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborderspacing, 7, area, y);\n \n if (ly > 40 && ly < w->size.h - 4)\n- paintlinesegments(&r, cmap, windowborderarea, 9, area, y);\n+ paintlinesegments(w->position.x, w->size.w, cmap, windowborderarea, 9, area, y);\n \n }\n \n@@ -514,6 +528,9 @@\n if (intersects(y, mouse.position.y, mouse.position.y + mouse.image.size.h))\n paintmouse(&mouse, &repaint.area, y);\n \n+ #if 0\n+ paintborderrect(&repaint.area, y);\n+ #endif\n }\n \n repaint.state = 0;\n"} {"commit":"8d3f73bc719f18ac07bd22e5612b169c5dda83f2","subject":"call fatalx() instead of fatal() in certain cases.","message":"call fatalx() instead of fatal() in certain cases.\n","repos":"jorisvink\/kore,jorisvink\/kore","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/worker.c\n+++ src\/worker.c\n@@ -227,30 +227,30 @@\n \tstruct passwd\t\t*pw = NULL;\n \n \tif (root == NULL)\n-\t\tfatal(\"no root directory for kore_worker_privdrop\");\n+\t\tfatalx(\"no root directory for kore_worker_privdrop\");\n \n \t\/* Must happen before chroot. *\/\n \tif (skip_runas == 0) {\n \t\tif (runas == NULL)\n-\t\t\tfatal(\"no runas user given and -r not specified\");\n+\t\t\tfatalx(\"no runas user given and -r not specified\");\n \t\tpw = getpwnam(runas);\n \t\tif (pw == NULL) {\n-\t\t\tfatal(\"cannot getpwnam(\\\"%s\\\") for user: %s\",\n+\t\t\tfatalx(\"cannot getpwnam(\\\"%s\\\") for user: %s\",\n \t\t\t runas, errno_s);\n \t\t}\n \t}\n \n \tif (skip_chroot == 0) {\n \t\tif (chroot(root) == -1) {\n-\t\t\tfatal(\"cannot chroot(\\\"%s\\\"): %s\",\n+\t\t\tfatalx(\"cannot chroot(\\\"%s\\\"): %s\",\n \t\t\t root, errno_s);\n \t\t}\n \n \t\tif (chdir(\"\/\") == -1)\n-\t\t\tfatal(\"cannot chdir(\\\"\/\\\"): %s\", errno_s);\n+\t\t\tfatalx(\"cannot chdir(\\\"\/\\\"): %s\", errno_s);\n \t} else {\n \t\tif (chdir(root) == -1)\n-\t\t\tfatal(\"cannot chdir(\\\"%s\\\"): %s\", root, errno_s);\n+\t\t\tfatalx(\"cannot chdir(\\\"%s\\\"): %s\", root, errno_s);\n \t}\n \n \tif (getrlimit(RLIMIT_NOFILE, &rl) == -1) {\n@@ -279,7 +279,7 @@\n \t\t setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||\n \t\t setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))\n #endif\n-\t\t\tfatal(\"cannot drop privileges\");\n+\t\t\tfatalx(\"cannot drop privileges\");\n \t}\n \n #if defined(KORE_USE_PLATFORM_PLEDGE)\n@@ -322,6 +322,8 @@\n \t\texit(0);\n \t}\n #endif\n+\tkore_platform_event_init();\n+\tkore_msg_worker_init();\n \n \tkore_worker_privdrop(kore_runas_user, kore_root_path);\n \n@@ -342,9 +344,6 @@\n \tnext_lock = 0;\n \tnext_prune = 0;\n \tworker_active_connections = 0;\n-\n-\tkore_platform_event_init();\n-\tkore_msg_worker_init();\n \n #if defined(KORE_USE_PGSQL)\n \tkore_pgsql_sys_init();\n"} {"commit":"8d68feb78b3ea56d2ea4103b9ef9b8770053981c","subject":"Stream read fix.","message":"Stream read fix.\n","repos":"minaevmike\/rspamd,minaevmike\/rspamd,dark-al\/rspamd,amohanta\/rspamd,minaevmike\/rspamd,andrejzverev\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,amohanta\/rspamd,amohanta\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,minaevmike\/rspamd,minaevmike\/rspamd,awhitesong\/rspamd,minaevmike\/rspamd,dark-al\/rspamd,minaevmike\/rspamd,amohanta\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,dark-al\/rspamd,awhitesong\/rspamd,dark-al\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,andrejzverev\/rspamd,minaevmike\/rspamd,AlexeySa\/rspamd,andrejzverev\/rspamd,AlexeySa\/rspamd,awhitesong\/rspamd,AlexeySa\/rspamd,dark-al\/rspamd,amohanta\/rspamd","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/worker.c\n+++ src\/worker.c\n@@ -299,15 +299,23 @@\n \t\tbreak;\n \tcase READ_MESSAGE:\n \t\t\/* Allow half-closed connections to be proceed *\/\n-\t\ttask->dispatcher->want_read = FALSE;\n+\n \t\tif (task->content_length > 0) {\n \t\t\ttask->msg->begin = in->begin;\n \t\t\ttask->msg->len = in->len;\n \t\t\tdebug_task (\"got string of length %z\", task->msg->len);\n \t\t\ttask->state = WAIT_FILTER;\n-\n+\t\t\ttask->dispatcher->want_read = FALSE;\n \t\t}\n \t\telse {\n+\t\t\tif (!task->dispatcher->want_read && in->len == 0) {\n+\t\t\t\t\/*\n+\t\t\t\t * Skip initial zero length string remain from\n+\t\t\t\t * buffer policy switch\n+\t\t\t\t *\/\n+\t\t\t\ttask->dispatcher->want_read = FALSE;\n+\t\t\t\treturn TRUE;\n+\t\t\t}\n \t\t\tif (in->len > 0) {\n \t\t\t\tif (task->msg->begin == NULL) {\n \t\t\t\t\t\/* Allocate buf *\/\n"} {"commit":"ce6f8d7f4e9680fe8660b0b8309c45ca1d6b5a22","subject":"Fix build (oops).","message":"Fix build (oops).\n\n\ngit-svn-id: 3ef324c313953cf23400aadf260ac472ecaf2802@51 490d8e77-9747-427b-9fa3-0b8f29cee8a0\n","repos":"drobilla\/serd,drobilla\/serd","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/writer.c\n+++ src\/writer.c\n@@ -86,7 +86,7 @@\n \t\tif ((in & 0x80) == 0) { \/\/ Starts with `0'\n \t\t\tsize = 1;\n \t\t\tc = in & 0x7F;\n-\t\t\tif (in_range((in >= 0x20) && (in <= 0x7E)) { \/\/ Printable ASCII\n+\t\t\tif (in_range(in, 0x20, 0x7E)) { \/\/ Printable ASCII\n \t\t\t\twriter->sink(&in, 1, writer->stream);\n \t\t\t\tcontinue;\n \t\t\t}\n"} {"commit":"5a66c012673861bef93a77052758bdd931a31fb1","subject":"Problem: zactor_destroy fails on half-created actor","message":"Problem: zactor_destroy fails on half-created actor\n\nzactor_new destroys itself if construction failed which is fine, except\nthe destructor then tries to destroy the pipe, which may be null.\n\nSolution: don't destroy null pipes.\n","repos":"oikosdev\/czmq,opedroso\/czmq,zeromq\/czmq,c-rack\/czmq,saki4510t\/czmq,eburkitt\/czmq,twhittock\/czmq,opedroso\/czmq,taotetek\/czmq,evoskuil\/czmq,evoskuil\/czmq,trevorbernard\/czmq,portworx\/czmq,taotetek\/czmq,ritchiecarroll\/czmq,twhittock\/czmq,eburkitt\/czmq,saki4510t\/czmq,c-rack\/czmq,taotetek\/czmq,oikosdev\/czmq,portworx\/czmq,zeromq\/czmq,ritchiecarroll\/czmq,hintjens\/czmq,evoskuil\/czmq,saki4510t\/czmq,pmienk\/czmq,oikosdev\/czmq,eburkitt\/czmq,opedroso\/czmq,keent\/czmq,saki4510t\/czmq,eburkitt\/czmq,pmienk\/czmq,keent\/czmq,ritchiecarroll\/czmq,pmienk\/czmq,awynne\/czmq,awynne\/czmq,portworx\/czmq,portworx\/czmq,trevorbernard\/czmq,evoskuil\/czmq,opedroso\/czmq,evoskuil\/czmq,c-rack\/czmq,evoskuil\/czmq,ritchiecarroll\/czmq,eburkitt\/czmq,saki4510t\/czmq,maxkozlovsky\/czmq,pmienk\/czmq,c-rack\/czmq,maxkozlovsky\/czmq,hintjens\/czmq,awynne\/czmq,keent\/czmq,maxkozlovsky\/czmq,trevorbernard\/czmq,evoskuil\/czmq,portworx\/czmq,opedroso\/czmq,twhittock\/czmq,pmienk\/czmq,oikosdev\/czmq,eburkitt\/czmq,taotetek\/czmq,keent\/czmq,keent\/czmq,zeromq\/czmq,twhittock\/czmq,hintjens\/czmq,keent\/czmq,portworx\/czmq,keent\/czmq,taotetek\/czmq,hintjens\/czmq,pmienk\/czmq,zeromq\/czmq,awynne\/czmq,oikosdev\/czmq,taotetek\/czmq,portworx\/czmq,trevorbernard\/czmq,c-rack\/czmq,evoskuil\/czmq,opedroso\/czmq,trevorbernard\/czmq,c-rack\/czmq,opedroso\/czmq,maxkozlovsky\/czmq,evoskuil\/czmq,zeromq\/czmq,ritchiecarroll\/czmq,hintjens\/czmq,c-rack\/czmq,maxkozlovsky\/czmq,twhittock\/czmq,taotetek\/czmq,pmienk\/czmq,awynne\/czmq,zeromq\/czmq,saki4510t\/czmq,trevorbernard\/czmq,oikosdev\/czmq,ritchiecarroll\/czmq,maxkozlovsky\/czmq,twhittock\/czmq,twhittock\/czmq,saki4510t\/czmq,hintjens\/czmq,twhittock\/czmq,portworx\/czmq,saki4510t\/czmq,hintjens\/czmq,maxkozlovsky\/czmq,twhittock\/czmq,taotetek\/czmq,eburkitt\/czmq,trevorbernard\/czmq,hintjens\/czmq,awynne\/czmq,eburkitt\/czmq,oikosdev\/czmq,ritchiecarroll\/czmq,pmienk\/czmq,keent\/czmq,eburkitt\/czmq,c-rack\/czmq,saki4510t\/czmq,oikosdev\/czmq,opedroso\/czmq,taotetek\/czmq,ritchiecarroll\/czmq,awynne\/czmq,zeromq\/czmq,zeromq\/czmq,maxkozlovsky\/czmq,trevorbernard\/czmq,opedroso\/czmq,awynne\/czmq","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/zactor.c\n+++ src\/zactor.c\n@@ -111,7 +111,7 @@\n }\n shim->pipe = zsys_create_pipe (&self->pipe);\n if (!shim->pipe) {\n- free(shim);\n+ free (shim);\n zactor_destroy (&self);\n return NULL;\n }\n@@ -165,10 +165,12 @@\n \/\/ If the pipe isn't connected any longer, assume child thread\n \/\/ has already quit due to other reasons and don't collect the\n \/\/ exit signal.\n- zsock_set_sndtimeo (self->pipe, 0);\n- if (zstr_send (self->pipe, \"$TERM\") == 0)\n- zsock_wait (self->pipe);\n- zsock_destroy (&self->pipe);\n+ if (self->pipe) {\n+ zsock_set_sndtimeo (self->pipe, 0);\n+ if (zstr_send (self->pipe, \"$TERM\") == 0)\n+ zsock_wait (self->pipe);\n+ zsock_destroy (&self->pipe);\n+ }\n self->tag = 0xDeadBeef;\n free (self);\n *self_p = NULL;\n"} {"commit":"35298f11a6adb5192254fabd6e7bb4387773e48e","subject":"small cleanups","message":"small cleanups\n","repos":"zevv\/zForth","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/zforth.c\n+++ src\/zforth.c\n@@ -15,6 +15,7 @@\n #define ZF_FLAG_PRIM (1<<5)\n #define ZF_FLAG_LEN(v) (v & 0x1f)\n \n+\n \/* This macro is used to perform boundary checks. If ZF_ENABLE_BOUNDARY_CHECKS\n * is set to 0, the boundary check code will not be compiled in to reduce size *\/\n \n@@ -23,6 +24,7 @@\n #else\n #define CHECK(exp, abort)\n #endif\n+\n \n \/* Define all primitives, make sure the two tables below always match. The\n * names are defined as a \\0 separated list, terminated by double \\0. This\n@@ -77,14 +79,13 @@\n #define TRACE uservar[2] \/* trace enable flag *\/\n #define COMPILING uservar[3] \/* compiling flag *\/\n #define POSTPONE uservar[4] \/* flag to indicate next imm word should be compiled *\/\n-\n-\n #define USERVAR_COUNT 5\n \n const char uservar_names[] =\n \t_(\"here\") _(\"latest\") _(\"trace\") _(\"compiling\") _(\"_postpone\");\n \n static zf_addr *uservar = (zf_addr *)dict;\n+\n \n \/* Prototypes *\/\n \n@@ -115,19 +116,13 @@\n \tstatic char name[32];\n \n \twhile(TRACE && w) {\n-\t\tzf_cell link;\n \t\tzf_addr p = w;\n-\n-\t\tzf_cell d;\n-\t\tint lenflags;\n+\t\tzf_cell d, link, op2;\n+\n \t\tp += dict_get_cell(p, &d);\n-\t\tlenflags = d;\n-\n+\t\tint lenflags = d;\n \t\tp += dict_get_cell(p, &link);\n-\n \t\tzf_addr xt = p + ZF_FLAG_LEN(lenflags);\n-\n-\t\tzf_cell op2 = 0;\n \t\tdict_get_cell(xt, &op2);\n \n \t\tif(((lenflags & ZF_FLAG_PRIM) && addr == (zf_addr)op2) || addr == w || addr == xt) {\n@@ -138,7 +133,6 @@\n \t\t}\n \n \t\tw = link;\n-\n \t}\n \treturn \"?\";\n }\n@@ -167,7 +161,7 @@\n static int word_has_flag(zf_addr w, int flag)\n {\n \tzf_cell d;\n-\tw += dict_get_cell(w, &d);\n+\tdict_get_cell(w, &d);\n \treturn !!((int)d & flag);\n }\n \n@@ -235,6 +229,7 @@\n static zf_addr dict_put_cell2(zf_addr addr, unsigned int vi)\n {\n \tCHECK(addr < ZF_DICT_SIZE-2, ZF_ABORT_OUTSIDE_MEM);\n+\n \tdict[addr++] = (vi >> 8) | 0x80;\n \tdict[addr++] = vi;\n \ttrace(\" \u00b2\");\n"} {"commit":"f213113a8a7f5d311d5dc60aafbd6bc49d76e3b1","subject":"Added support for multiple languages and charsets to be specified in ZOOM. Each charset\/language is separated by a blank. If negoation is in effect in init-response, Option \"negotiation-charset-in-effect-for-records\" set to 1(true) or 0(false). Code based on patch by Vasiliy Osadchuk.","message":"Added support for multiple languages and charsets to be specified\nin ZOOM. Each charset\/language is separated by a blank.\nIf negoation is in effect in init-response, Option\n\"negotiation-charset-in-effect-for-records\" set to 1(true) or 0(false).\nCode based on patch by Vasiliy Osadchuk.\n","repos":"dcrossleyau\/yaz,nla\/yaz,nla\/yaz,nla\/yaz,nla\/yaz,dcrossleyau\/yaz,dcrossleyau\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/zoom-c.c\n+++ src\/zoom-c.c\n@@ -2,7 +2,7 @@\n * Copyright (C) 1995-2005, Index Data ApS\n * See the file LICENSE for details.\n *\n- * $Id: zoom-c.c,v 1.37 2005-01-16 22:01:13 adam Exp $\n+ * $Id: zoom-c.c,v 1.38 2005-05-02 19:17:48 adam Exp $\n *\/\n \/**\n * \\file zoom-c.c\n@@ -299,54 +299,20 @@\n int *num)\n {\n char **databaseNames;\n- const char *c;\n- int no = 2;\n const char *cp = ZOOM_options_get (options, \"databaseName\");\n \n if (!cp || !*cp)\n {\n if (strncmp (con->host_port, \"unix:\", 5) == 0)\n-\t cp = strchr (con->host_port+5, ':');\n+\t cp = strchr(con->host_port+5, ':');\n \telse\n-\t cp = strchr (con->host_port, '\/');\n+\t cp = strchr(con->host_port, '\/');\n \tif (cp)\n \t cp++;\n }\n- if (cp)\n- {\n-\tc = cp;\n-\twhile ((c = strchr(c, '+')))\n-\t{\n-\t c++;\n-\t no++;\n-\t}\n- }\n- else\n+ if (!cp)\n \tcp = \"Default\";\n- databaseNames = (char**)\n- odr_malloc (con->odr_out, no * sizeof(*databaseNames));\n- no = 0;\n- while (*cp)\n- {\n-\tc = strchr (cp, '+');\n-\tif (!c)\n-\t c = cp + strlen(cp);\n-\telse if (c == cp)\n-\t{\n-\t cp++;\n-\t continue;\n-\t}\n-\t\/* cp ptr to first char of db name, c is char\n-\t following db name *\/\n-\tdatabaseNames[no] = (char*) odr_malloc (con->odr_out, 1+c-cp);\n-\tmemcpy (databaseNames[no], cp, c-cp);\n-\tdatabaseNames[no++][c-cp] = '\\0';\n-\tcp = c;\n-\tif (*cp)\n-\t cp++;\n- }\n- databaseNames[no] = NULL;\n- *num = no;\n+ nmem_strsplit(con->odr_out->mem, \"+\", cp, &databaseNames, num);\n return databaseNames;\n }\n \n@@ -389,7 +355,10 @@\n xfree (c->charset);\n val = ZOOM_options_get (c->options, \"charset\");\n if (val && *val)\n+ {\n \tc->charset = xstrdup (val);\n+\tyaz_log(YLOG_LOG, \"connect charset=%s\", c->charset);\n+ }\n else\n \tc->charset = 0;\n \n@@ -943,7 +912,7 @@\n val = ZOOM_options_get (c->options, buf);\n if (!val)\n break;\n- cp = strchr (val, ':');\n+ cp = strchr(val, ':');\n if (!cp)\n continue;\n len = cp - val;\n@@ -1049,7 +1018,7 @@\n \tZOOM_options_get(c->options, \"implementationName\"),\n \todr_prepend(c->odr_out, \"ZOOM-C\", ireq->implementationName));\n \n- version = odr_strdup(c->odr_out, \"$Revision: 1.37 $\");\n+ version = odr_strdup(c->odr_out, \"$Revision: 1.38 $\");\n if (strlen(version) > 10)\t\/* check for unexpanded CVS strings *\/\n \tversion[strlen(version)-2] = '\\0';\n ireq->implementationVersion = odr_prepend(c->odr_out,\n@@ -1107,7 +1076,7 @@\n if (c->proxy)\n \tyaz_oi_set_string_oidval(&ireq->otherInfo, c->odr_out,\n \t\t\t\t VAL_PROXY, 1, c->host_port);\n- if (c->charset||c->lang)\n+ if (c->charset || c->lang)\n {\n \tZ_OtherInformation **oi;\n \tZ_OtherInformationUnit *oi_unit;\n@@ -1116,14 +1085,26 @@\n \t\n \tif ((oi_unit = yaz_oi_update(oi, c->odr_out, NULL, 0, 0)))\n \t{\n+ char **charsets_addresses = 0;\n+ char **langs_addresses = 0;\n+ int charsets_count = 0;\n+ int langs_count = 0;\n+\t \n+ if (c->charset)\n+\t\tnmem_strsplit_blank(c->odr_out->mem, c->charset,\n+\t\t\t\t &charsets_addresses, &charsets_count);\n+ if (c->lang)\n+\t\tnmem_strsplit_blank(c->odr_out->mem, c->lang,\n+\t\t\t\t &langs_addresses, &langs_count);\n ODR_MASK_SET(ireq->options, Z_Options_negotiationModel);\n- \n oi_unit->which = Z_OtherInfo_externallyDefinedInfo;\n oi_unit->information.externallyDefinedInfo =\n- yaz_set_proposal_charneg\n- (c->odr_out,\n- (const char **)&c->charset, (c->charset) ? 1:0,\n- (const char **)&c->lang, (c->lang) ? 1:0, 1);\n+ yaz_set_proposal_charneg(c->odr_out,\n+\t\t\t\t\t (const char **) charsets_addresses,\n+\t\t\t\t\t charsets_count,\n+\t\t\t\t\t (const char **) langs_addresses,\n+\t\t\t\t\t langs_count, \n+\t\t\t\t\t 1);\n \t}\n }\n assert (apdu);\n@@ -1510,7 +1491,7 @@\n if (record_charset && *record_charset)\n {\n \t\/* Use \"from,to\" or just \"from\" *\/\n-\tconst char *cp =strchr(record_charset, ',');\n+\tconst char *cp = strchr(record_charset, ',');\n \tint clen = strlen(record_charset);\n \tif (cp && cp[1])\n \t{\n@@ -1564,7 +1545,7 @@\n if (record_charset && *record_charset)\n {\n \t\/* Use \"from,to\" or just \"from\" *\/\n-\tconst char *cp =strchr(record_charset, ',');\n+\tconst char *cp = strchr(record_charset, ',');\n \tint clen = strlen(record_charset);\n \tif (cp && cp[1])\n \t{\n@@ -2989,6 +2970,10 @@\n if (lang)\n ZOOM_connection_option_set (c, \"negotiation-lang\",\n lang);\n+\n+ ZOOM_connection_option_set (\n+\t\t c, \"negotiation-charset-in-effect-for-records\",\n+\t\t (sel != 0) ? \"1\" : \"0\");\n nmem_destroy(tmpmem);\n }\n \t}\t\n"} {"commit":"3e3ff819eeb853c1e7d2466526f9c8d29a9dad64","subject":"Fix duplicate const warning.","message":"Fix duplicate const warning.\n","repos":"benjihan\/zingzong,benjihan\/zingzong,benjihan\/zingzong","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/zz_vfs.c\n+++ src\/zz_vfs.c\n@@ -13,7 +13,7 @@\n #endif\n \n \n-static inline int valid_vfs(const vfs_t const vfs) { return vfs != 0; }\n+static inline int valid_vfs(const vfs_t vfs) { return vfs != 0; }\n \n #define VFS_OR(E,X) if (!valid_vfs((E))) { return (X); } else (E)->err=0\n #define VFS_OR_EOF(E) VFS_OR( (E) , ZZ_EOF )\n"} {"commit":"c53a5308a5670a685bc47fd7f66d715ad311dff2","subject":"Oops, get selection logic right.","message":"Oops, get selection logic right.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ssl\/s3_lib.c\n+++ ssl\/s3_lib.c\n@@ -3908,9 +3908,10 @@\n \t\tbreak;\n \n \tcase SSL_CTRL_GET_EXTRA_CHAIN_CERTS:\n-\t\t*(STACK_OF(X509) **)parg = ctx->extra_certs;\n-\t\tif (parg == NULL && larg == 0)\n+\t\tif (ctx->extra_certs == NULL && larg == 0)\n \t\t\t*(STACK_OF(X509) **)parg = ctx->cert->key->chain;\n+\t\telse\n+\t\t\t*(STACK_OF(X509) **)parg = ctx->extra_certs;\n \t\tbreak;\n \n \tcase SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS:\n"} {"commit":"748270554824d2a51d1718f52a8d3ab34116bbfb","subject":"Fix for session tickets memory leak.","message":"Fix for session tickets memory leak.\n\nCVE-2014-3567\n\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\nReviewed-by: Matt Caswell <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ssl\/t1_lib.c\n+++ ssl\/t1_lib.c\n@@ -3380,7 +3380,10 @@\n \tHMAC_Final(&hctx, tick_hmac, NULL);\n \tHMAC_CTX_cleanup(&hctx);\n \tif (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen))\n+\t\t{\n+\t\tEVP_CIPHER_CTX_cleanup(&ctx);\n \t\treturn 2;\n+\t\t}\n \t\/* Attempt to decrypt session data *\/\n \t\/* Move p after IV to start of encrypted ticket, update length *\/\n \tp = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx);\n"} {"commit":"e408c09bbf7c3057bda4b8d20bec1b3a7771c15b","subject":"Fix OCSP Status Request extension unbounded memory growth","message":"Fix OCSP Status Request extension unbounded memory growth\n\nA malicious client can send an excessively large OCSP Status Request\nextension. If that client continually requests renegotiation,\nsending a large OCSP Status Request extension each time, then there will\nbe unbounded memory growth on the server. This will eventually lead to a\nDenial Of Service attack through memory exhaustion. Servers with a\ndefault configuration are vulnerable even if they do not support OCSP.\nBuilds using the \"no-ocsp\" build time option are not affected.\n\nI have also checked other extensions to see if they suffer from a similar\nproblem but I could not find any other issues.\n\nCVE-2016-6304\n\nIssue reported by Shi Lei.\n\nReviewed-by: Rich Salz <c04971a99e5a9ee80eaab4b1deb37e845b0bd697@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ssl\/t1_lib.c\n+++ ssl\/t1_lib.c\n@@ -2019,6 +2019,22 @@\n (&extension, &responder_id_list))\n return 0;\n \n+ \/*\n+ * We remove any OCSP_RESPIDs from a previous handshake\n+ * to prevent unbounded memory growth - CVE-2016-6304\n+ *\/\n+ sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids,\n+ OCSP_RESPID_free);\n+ if (PACKET_remaining(&responder_id_list) > 0) {\n+ s->tlsext_ocsp_ids = sk_OCSP_RESPID_new_null();\n+ if (s->tlsext_ocsp_ids == NULL) {\n+ *al = SSL_AD_INTERNAL_ERROR;\n+ return 0;\n+ }\n+ } else {\n+ s->tlsext_ocsp_ids = NULL;\n+ }\n+\n while (PACKET_remaining(&responder_id_list) > 0) {\n OCSP_RESPID *id;\n PACKET responder_id;\n@@ -2027,13 +2043,6 @@\n if (!PACKET_get_length_prefixed_2(&responder_id_list,\n &responder_id)\n || PACKET_remaining(&responder_id) == 0) {\n- return 0;\n- }\n-\n- if (s->tlsext_ocsp_ids == NULL\n- && (s->tlsext_ocsp_ids =\n- sk_OCSP_RESPID_new_null()) == NULL) {\n- *al = SSL_AD_INTERNAL_ERROR;\n return 0;\n }\n \n"} {"commit":"31f18a365baca98f976c0dd67c44d218a2d31952","subject":"MFC r272762: Correct scale factor for T terabyte suffix","message":"MFC r272762: Correct scale factor for T terabyte suffix\n\nPR:\t\t194250\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/find\/function.c\n+++ usr.bin\/find\/function.c\n@@ -1500,7 +1500,7 @@\n \t\t\tscale = 0x40000000LL;\n \t\t\tbreak;\n \t\tcase 'T': \/* terabytes 1<<40 *\/\n-\t\t\tscale = 0x1000000000LL;\n+\t\t\tscale = 0x10000000000LL;\n \t\t\tbreak;\n \t\tcase 'P': \/* petabytes 1<<50 *\/\n \t\t\tscale = 0x4000000000000LL;\n"} {"commit":"2b21f1a948ddfc3597835e95b1709246d146b319","subject":"Allow format strings containing \"%%\" to be reused.","message":"Allow format strings containing \"%%\" to be reused.\n\nPR:\t\t39116\nSubmitted by:\tEgil Brendsdal <egilb@ife.no>\nMFC after:\t1 week\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/printf\/printf.c\n+++ usr.bin\/printf\/printf.c\n@@ -173,8 +173,8 @@\n \t\t\tif (*fmt == '%') {\n \t\t\t\tif (*++fmt != '%')\n \t\t\t\t\tbreak;\n-\t\t\t\t*fmt++ = '\\0';\n-\t\t\t\t(void)printf(\"%s\", start);\n+\t\t\t\t(void)printf(\"%.*s\", (int)(fmt - start), start);\n+\t\t\t\tfmt++;\n \t\t\t\tgoto next;\n \t\t\t}\n \t\t}\n"} {"commit":"a2f18e904a958b0acbb9a81dcad9e154c2a0b401","subject":"Do not print first digits of IRQ number if whole number doesn't fit.","message":"Do not print first digits of IRQ number if whole number doesn't fit.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/systat\/vmstat.c\n+++ usr.bin\/systat\/vmstat.c\n@@ -254,24 +254,23 @@\n \t\t\t\t\tcp1++;\n \t\t\t\tif (cp1 != cp && *cp1 == ':' &&\n \t\t\t\t *(cp1 + 1) == ' ') {\n+\t\t\t\t\tsz = strlen(cp);\n \t\t\t\t\t*cp1 = '\\0';\n \t\t\t\t\tcp1 = cp1 + 2;\n \t\t\t\t\tcp2 = strdup(cp);\n-\t\t\t\t\tbcopy(cp1, cp, strlen(cp1) + 1);\n-\t\t\t\t\tstrcat(cp, \" \");\n-\t\t\t\t\tstrcat(cp, cp2);\n+\t\t\t\t\tbcopy(cp1, cp, sz - (cp1 - cp) + 1);\n+\t\t\t\t\t\/* If line is long - drop \"irq\",\n+\t\t\t\t\t if too long - drop \"irqN\". *\/\n+\t\t\t\t\tif (sz <= 10 + 1) {\n+\t\t\t\t\t\tstrcat(cp, \" \");\n+\t\t\t\t\t\tstrcat(cp, cp2);\n+\t\t\t\t\t} else if (sz <= 10 + 4) {\n+\t\t\t\t\t\tstrcat(cp, \" \");\n+\t\t\t\t\t\tstrcat(cp, cp2 + 3);\n+\t\t\t\t\t}\n \t\t\t\t\tfree(cp2);\n \t\t\t\t}\n \t\t\t}\n-\n-\t\t\t\/*\n-\t\t\t * Convert \"name irqN\" to \"name N\" if the former is\n-\t\t\t * longer than the field width.\n-\t\t\t *\/\n-\t\t\tif ((cp1 = strstr(cp, \"irq\")) != NULL &&\n-\t\t\t strlen(cp) > 10)\n-\t\t\t\tbcopy(cp1 + 3, cp1, strlen(cp1 + 3) + 1);\n-\n \t\t\tintrname[i] = cp;\n \t\t\tcp = nextcp;\n \t\t}\n"} {"commit":"fb529bc1325a6685f76489b616d7b54d9a28a05e","subject":"- lock stderr to prevent splicing, although this won't fix the problem just yet because locking is at the intra process level and not inter process level - add a -f option to only process files - fix file descriptor leak when attempting to load file inode data from a directory - correctly skip FTS processing when using multithreading and partitioning the namespace","message":"- lock stderr to prevent splicing, although this won't fix the problem\n just yet because locking is at the intra process level and not inter\n process level\n- add a -f option to only process files\n- fix file descriptor leak when attempting to load file inode data from\n a directory\n- correctly skip FTS processing when using multithreading and\n partitioning the namespace\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- utils\/dumpfid\/dumpfid.c\n+++ utils\/dumpfid\/dumpfid.c\n@@ -48,6 +48,20 @@\n #include \"slashd\/inode.h\"\n #include \"slashd\/mdsio.h\"\n \n+#define df_warnx(msg, ...)\t\t\t\t\t\t\\\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tflockfile(stderr);\t\t\t\t\t\\\n+\t\twarnx(msg, ##__VA_ARGS__);\t\t\t\t\\\n+\t\tfunlockfile(stderr);\t\t\t\t\t\\\n+\t} while (0)\n+\n+#define df_warn(msg, ...)\t\t\t\t\t\t\\\n+\tdo {\t\t\t\t\t\t\t\t\\\n+\t\tflockfile(stderr);\t\t\t\t\t\\\n+\t\twarn(msg, ##__VA_ARGS__);\t\t\t\t\\\n+\t\tfunlockfile(stderr);\t\t\t\t\t\\\n+\t} while (0)\n+\n struct path {\n \tconst char\t\t*p_fn;\n \tstruct psc_listentry\t p_lentry;\n@@ -90,6 +104,7 @@\n struct psc_lockedlist\t\t df_hosts = PLL_INIT(&df_hosts, struct host, h_lentry);\n int\t\t\t\t df_rank;\n int\t\t\t\t df_nprocs = 1;\n+int\t\t\t\t df_onlyfiles;\n struct psc_lockedlist\t\t df_excludes = PLL_INIT(&df_excludes, struct path, p_lentry);\n const char\t\t\t*df_outfn;\n FILE\t\t\t\t*df_outfp;\n@@ -214,15 +229,15 @@\n \t\treturn;\n \n \tif (lseek(f->f_fd, SL_BMAP_START_OFF, SEEK_SET) == -1)\n-\t\twarn(\"seek\");\n+\t\tdf_warn(\"seek\");\n \tfd = dup(f->f_fd);\n \tif (fd == -1) {\n-\t\twarn(\"dup\");\n+\t\tdf_warn(\"dup\");\n \t\treturn;\n \t}\n \tfp = fdopen(fd, \"r\");\n \tif (fp == NULL) {\n-\t\twarn(\"fdopen\");\n+\t\tdf_warn(\"fdopen\");\n \t\tclose(fd);\n \t\treturn;\n \t}\n@@ -232,7 +247,7 @@\n \t\tif (rc == 0)\n \t\t\tbreak;\n \t\tif (rc != sizeof(bd)) {\n-\t\t\twarn(\"read\");\n+\t\t\tdf_warn(\"read\");\n \t\t\tbreak;\n \t\t}\n \n@@ -249,7 +264,7 @@\n \t}\n \n \tif (ferror(fp))\n-\t\twarn(\"%s: read\", f->f_pathfn);\n+\t\tdf_warn(\"%s: read\", f->f_pathfn);\n \n \tfclose(fp);\n }\n@@ -329,9 +344,6 @@\n \t\tpfl_fts_set(fe, FTS_SKIP);\n \t\treturn (0);\n \t}\n-\n-\tif (fe->fts_info != FTS_F && fe->fts_info != FTS_D)\n-\t\treturn (0);\n \n \tif (fe->fts_level < 5) {\n \t\tif (df_rank != (int)(fe->fts_ino % df_nprocs))\n@@ -343,6 +355,10 @@\n \t\t}\n \t}\n \n+\tif (fe->fts_info != FTS_F && (fe->fts_info != FTS_D ||\n+\t df_onlyfiles))\n+\t\treturn (0);\n+\n \tmemset(f, 0, sizeof(*f));\n \tf->f_fd = -1;\n \tINIT_PSC_LISTENTRY(&f->f_lentry);\n@@ -350,8 +366,8 @@\n \tf->f_pathfn = fe->fts_path;\n \n \tif (!load_data(f, &f->f_data)) {\n-\t\twarn(\"%s\", f->f_pathfn);\n-\t\treturn (0);\n+\t\tdf_warn(\"%s\", f->f_pathfn);\n+\t\tgoto out;\n \t}\n \tsstb = &f->f_sstb;\n \tino = &f->f_ino;\n@@ -385,6 +401,7 @@\n \t\tf->f_inox_mem_crc == f->f_inox_od_crc ? \"OK\" : \"BAD\")\n \t);\n \n+ out:\n \tif (f->f_fd != -1)\n \t\tclose(f->f_fd);\n \treturn (0);\n@@ -457,10 +474,13 @@\n \n \tpfl_init();\n \twalkflags = PFL_FILEWALKF_NOSTAT;\n-\twhile ((c = getopt(argc, argv, \"C:F:O:Rt:x:\")) != -1) {\n+\twhile ((c = getopt(argc, argv, \"C:F:fO:Rt:x:\")) != -1) {\n \t\tswitch (c) {\n \t\tcase 'C':\n \t\t\taddhost(optarg);\n+\t\t\tbreak;\n+\t\tcase 'f':\n+\t\t\tdf_onlyfiles = 1;\n \t\t\tbreak;\n \t\tcase 'F':\n \t\t\tdf_dispfmt = optarg;\n"} {"commit":"b4a93ead4a394cf0a5bd2db3aeda1c69d94fa0ed","subject":"Only ignore input XML errors in hwloc-assembler when -f\/--force is given","message":"Only ignore input XML errors in hwloc-assembler when -f\/--force is given\n\ngit-svn-id: 85ac67bc7c4afe135c9a2a80330376080c31cd41@3701 4b44e086-7f34-40ce-a3bd-00e031736276\n","repos":"BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- utils\/hwloc-assembler.c\n+++ utils\/hwloc-assembler.c\n@@ -15,6 +15,7 @@\n fprintf (where, \"Usage: %s [options] <output>.xml <input1>.xml <input2>.xml ...\\n\", name);\n fprintf (where, \"Options:\\n\");\n fprintf (where, \" -v --verbose Show verbose messages\\n\");\n+ fprintf (where, \" -f --force Ignore errors while reading input files\\n\");\n }\n \n int main(int argc, char *argv[])\n@@ -23,6 +24,7 @@\n char *callname;\n char *output;\n int verbose = 0;\n+ int force = 0;\n int opt;\n int i;\n \n@@ -38,6 +40,8 @@\n opt = 0;\n if (!strcmp(argv[0], \"-v\") || !strcmp(argv[0], \"--verbose\")) {\n verbose++;\n+ } else if (!strcmp(argv[0], \"-f\") || !strcmp(argv[0], \"--force\")) {\n+ force = 1;\n } else if (!strcmp(argv[0], \"-h\") || !strcmp(argv[0], \"--help\")) {\n usage(callname, stdout);\n exit(EXIT_SUCCESS);\n@@ -75,7 +79,10 @@\n if (hwloc_topology_set_xml(input, argv[i])) {\n fprintf(stderr, \"Failed to set source XML file %s (%s)\\n\", argv[i], strerror(errno));\n hwloc_topology_destroy(input);\n- continue;\n+ if (force)\n+\tcontinue;\n+ else\n+\treturn EXIT_FAILURE;\n }\n hwloc_topology_load(input);\n hwloc_topology_insert_topology(topology, hwloc_get_root_obj(topology), input);\n"} {"commit":"ba4bc72119e977d0de7a2211aca24a30a3dff67c","subject":"Include ctype.h for isprint()","message":"Include ctype.h for isprint()\n","repos":"edgeware\/mp4tree","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mp4tree.c\n+++ mp4tree.c\n@@ -8,6 +8,7 @@\n #include <fcntl.h>\n #include <unistd.h>\n #include <getopt.h>\n+#include <ctype.h>\n \n \/*\n ******************************************************************************\n"} {"commit":"df5deb96b0b46fde0884fb4462daf125c11b83d1","subject":"make pause and skip work when hgd is using a non-standard state path.","message":"make pause and skip work when hgd is using a non-standard state path.\n","repos":"vext01\/hgd,vext01\/hgd,vext01\/hgd","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mplayer.c\n+++ mplayer.c\n@@ -49,10 +49,10 @@\n \n \tif (mplayer_fifo_path == NULL)\n \t\txasprintf(&mplayer_fifo_path, \"%s\/%s\",\n-\t\t HGD_DFL_DIR, HGD_MPLAYER_PIPE_NAME);\n+\t\t state_path, HGD_MPLAYER_PIPE_NAME);\n \n \tif (stat(mplayer_fifo_path, &st) < 0) {\n-\t\tif (errno == ENOENT) { \n+\t\tif (errno == ENOENT) {\n \t\t\t\/* no pipe = not playing *\/\n \t\t\tDPRINTF(HGD_D_ERROR, \"No track is playing\");\n \t\t\tret = HGD_FAIL_NOPLAY;\n"} {"commit":"90b5b1853ebd3e0428495d9cbae728b3bdb75985","subject":"Minor changes","message":"Minor changes\n","repos":"spirilis\/msprf24,spirilis\/msprf24","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- msprf24.c\n+++ msprf24.c\n@@ -745,7 +745,7 @@\n {\n \tmsprf24_standby();\n \t\/\/ Cancel any outstanding TX interrupt\n-\tw_reg(RF24_STATUS, RF24_TX_DS);\n+\tw_reg(RF24_STATUS, RF24_TX_DS|RF24_MAX_RT);\n \n \t\/\/ Pulse CE for 10us to activate PTX\n \tpulse_ce();\n"} {"commit":"66ac382adb1ce1d784ff150eea245745a1bff77b","subject":"[cleanup\/unifying-mac] handling MACs the same","message":"[cleanup\/unifying-mac] handling MACs the same\n\nIt turns-out that the MAC handling functions in Linux are also present\nin MacOS (which I didn't realize earlier). So instead of relying on\nplatform-specific functions, I'll just use the same one for both,\nsimplifying the code a bit.\n","repos":"pdelong42\/pcap-sandbox","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- myifcfg.c\n+++ myifcfg.c\n@@ -3,22 +3,17 @@\n #include <stdlib.h>\n #include <pcap.h>\n #include <pcap\/pcap.h>\n+#include <net\/ethernet.h>\n+#include <netinet\/in.h>\n #include <arpa\/inet.h>\n-#include <netinet\/in.h>\n #include <sys\/socket.h>\n \n #ifdef __APPLE__\n # include <net\/if_dl.h>\n # define AF_CUSTOM1 AF_LINK\n-# define MAC_NTOA link_ntoa\n-# define MAC_NTOA_STR \"link_ntoa\"\n-# define MAC_SOCKADDR sockaddr_dl\n #else\n # include <netinet\/ether.h>\n # define AF_CUSTOM1 AF_PACKET\n-# define MAC_NTOA ether_ntoa\n-# define MAC_NTOA_STR \"ether_ntoa\"\n-# define MAC_SOCKADDR ether_addr\n #endif\n \n void print_description( char *description ) {\n@@ -62,10 +57,10 @@\n \n void print_link_addr( struct sockaddr *addr ) {\n \n- char *mac = MAC_NTOA( (struct MAC_SOCKADDR *)addr );\n+ char *mac = ether_ntoa( (struct ether_addr *)addr );\n \n if( mac == NULL ) {\n- perror( MAC_NTOA_STR );\n+ perror( \"ether_ntoa\" );\n return;\n }\n \n"} {"commit":"34a5c14ddb12abd121b7f6a1cdf26d65e8d0f4ff","subject":"ncd: rename process_statement to statement","message":"ncd: rename process_statement to statement\n\n","repos":"linfengfeiye\/badvpn,PowerOlive\/badvpn,tempbottle\/badvpn,PowerOlive\/badvpn,Git-Host\/badvpn,LazyZhu\/badvpn,tempbottle\/badvpn,chrisballinger\/badvpn,binondord\/badvpn,chrisballinger\/badvpn,LazyZhu\/badvpn,chrisballinger\/badvpn,PowerOlive\/badvpn,LazyZhu\/badvpn,tempbottle\/badvpn,binondord\/badvpn,Git-Host\/badvpn,linfengfeiye\/badvpn,binondord\/badvpn,linfengfeiye\/badvpn,binondord\/badvpn,tempbottle\/badvpn,PowerOlive\/badvpn,linfengfeiye\/badvpn,tempbottle\/badvpn,Git-Host\/badvpn,PowerOlive\/badvpn,binondord\/badvpn,Git-Host\/badvpn,linfengfeiye\/badvpn,LazyZhu\/badvpn,chrisballinger\/badvpn,LazyZhu\/badvpn,Git-Host\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/ncd.c\n+++ ncd\/ncd.c\n@@ -78,7 +78,7 @@\n \n struct process;\n \n-struct process_statement {\n+struct statement {\n struct process *p;\n btime_t error_until;\n NCDModuleInst inst;\n@@ -99,7 +99,7 @@\n int ap;\n int fp;\n int num_statements;\n- struct process_statement statements[];\n+ struct statement statements[];\n };\n \n \/\/ command-line options\n@@ -170,17 +170,17 @@\n static int process_find_object (struct process *p, int pos, const char *name, NCDObject *out_object);\n static int process_resolve_object_expr (struct process *p, int pos, char **names, NCDObject *out_object);\n static int process_resolve_variable_expr (struct process *p, int pos, char **names, NCDValMem *mem, NCDValRef *out_value);\n-static void process_statement_logfunc (struct process_statement *ps);\n-static void process_statement_log (struct process_statement *ps, int level, const char *fmt, ...);\n-static void process_statement_set_error (struct process_statement *ps);\n-static int process_statement_resolve_argument (struct process_statement *ps, NCDInterpValue *arg, NCDValMem *mem, NCDValRef *out);\n-static void process_statement_instance_func_event (struct process_statement *ps, int event);\n-static int process_statement_instance_func_getobj (struct process_statement *ps, const char *objname, NCDObject *out_object);\n-static int process_statement_instance_func_initprocess (struct process_statement *ps, NCDModuleProcess *mp, const char *template_name);\n-static void process_statement_instance_logfunc (struct process_statement *ps);\n-static void process_statement_instance_func_interp_exit (struct process_statement *ps, int exit_code);\n-static int process_statement_instance_func_interp_getargs (struct process_statement *ps, NCDValMem *mem, NCDValRef *out_value);\n-static btime_t process_statement_instance_func_interp_getretrytime (struct process_statement *ps);\n+static void statement_logfunc (struct statement *ps);\n+static void statement_log (struct statement *ps, int level, const char *fmt, ...);\n+static void statement_set_error (struct statement *ps);\n+static int statement_resolve_argument (struct statement *ps, NCDInterpValue *arg, NCDValMem *mem, NCDValRef *out);\n+static void statement_instance_func_event (struct statement *ps, int event);\n+static int statement_instance_func_getobj (struct statement *ps, const char *objname, NCDObject *out_object);\n+static int statement_instance_func_initprocess (struct statement *ps, NCDModuleProcess *mp, const char *template_name);\n+static void statement_instance_logfunc (struct statement *ps);\n+static void statement_instance_func_interp_exit (struct statement *ps, int exit_code);\n+static int statement_instance_func_interp_getargs (struct statement *ps, NCDValMem *mem, NCDValRef *out_value);\n+static btime_t statement_instance_func_interp_getretrytime (struct statement *ps);\n static void process_moduleprocess_func_event (struct process *p, int event);\n static int process_moduleprocess_func_getobj (struct process *p, const char *name, NCDObject *out_object);\n \n@@ -338,16 +338,16 @@\n }\n \n \/\/ init common module params\n- module_params.func_event = (NCDModuleInst_func_event)process_statement_instance_func_event;\n- module_params.func_getobj = (NCDModuleInst_func_getobj)process_statement_instance_func_getobj;\n- module_params.logfunc = (BLog_logfunc)process_statement_instance_logfunc;\n+ module_params.func_event = (NCDModuleInst_func_event)statement_instance_func_event;\n+ module_params.func_getobj = (NCDModuleInst_func_getobj)statement_instance_func_getobj;\n+ module_params.logfunc = (BLog_logfunc)statement_instance_logfunc;\n module_iparams.reactor = &ss;\n module_iparams.manager = &manager;\n module_iparams.umanager = &umanager;\n- module_iparams.func_initprocess = (NCDModuleInst_func_initprocess)process_statement_instance_func_initprocess;\n- module_iparams.func_interp_exit = (NCDModuleInst_func_interp_exit)process_statement_instance_func_interp_exit;\n- module_iparams.func_interp_getargs = (NCDModuleInst_func_interp_getargs)process_statement_instance_func_interp_getargs;\n- module_iparams.func_interp_getretrytime = (NCDModuleInst_func_interp_getretrytime)process_statement_instance_func_interp_getretrytime;\n+ module_iparams.func_initprocess = (NCDModuleInst_func_initprocess)statement_instance_func_initprocess;\n+ module_iparams.func_interp_exit = (NCDModuleInst_func_interp_exit)statement_instance_func_interp_exit;\n+ module_iparams.func_interp_getargs = (NCDModuleInst_func_interp_getargs)statement_instance_func_interp_getargs;\n+ module_iparams.func_interp_getretrytime = (NCDModuleInst_func_interp_getretrytime)statement_instance_func_interp_getretrytime;\n \n \/\/ init processes list\n LinkedList1_Init(&processes);\n@@ -659,7 +659,7 @@\n int num_statements = NCDBlock_NumStatements(block);\n \n \/\/ calculate allocation size\n- bsize_t alloc_size = bsize_add(bsize_fromsize(sizeof(struct process)), bsize_mul(bsize_fromsize(num_statements), bsize_fromsize(sizeof(struct process_statement))));\n+ bsize_t alloc_size = bsize_add(bsize_fromsize(sizeof(struct process)), bsize_mul(bsize_fromsize(num_statements), bsize_fromsize(sizeof(struct statement))));\n \n \/\/ allocate strucure\n struct process *p = BAllocSize(alloc_size);\n@@ -683,7 +683,7 @@\n \n \/\/ init statements\n for (int i = 0; i < num_statements; i++) {\n- struct process_statement *ps = &p->statements[i];\n+ struct statement *ps = &p->statements[i];\n ps->p = p;\n ps->i = i;\n ps->state = SSTATE_FORGOTTEN;\n@@ -832,10 +832,10 @@\n }\n \n \/\/ order the last living statement to die, if needed\n- struct process_statement *ps = &p->statements[p->fp - 1];\n+ struct statement *ps = &p->statements[p->fp - 1];\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n if (ps->state != SSTATE_DYING) {\n- process_statement_log(ps, BLOG_INFO, \"killing\");\n+ statement_log(ps, BLOG_INFO, \"killing\");\n \n \/\/ order it to die\n NCDModuleInst_Die(&ps->inst);\n@@ -870,9 +870,9 @@\n \/\/ cleaning up?\n if (p->ap < p->fp) {\n \/\/ order the last living statement to die, if needed\n- struct process_statement *ps = &p->statements[p->fp - 1];\n+ struct statement *ps = &p->statements[p->fp - 1];\n if (ps->state != SSTATE_DYING) {\n- process_statement_log(ps, BLOG_INFO, \"killing\");\n+ statement_log(ps, BLOG_INFO, \"killing\");\n \n \/\/ order it to die\n NCDModuleInst_Die(&ps->inst);\n@@ -888,10 +888,10 @@\n ASSERT(p->ap > 0)\n ASSERT(p->ap <= p->num_statements)\n \n- struct process_statement *ps = &p->statements[p->ap - 1];\n+ struct statement *ps = &p->statements[p->ap - 1];\n ASSERT(ps->state == SSTATE_CHILD)\n \n- process_statement_log(ps, BLOG_INFO, \"clean\");\n+ statement_log(ps, BLOG_INFO, \"clean\");\n \n \/\/ report clean\n NCDModuleInst_Clean(&ps->inst);\n@@ -901,7 +901,7 @@\n \/\/ advancing?\n if (p->ap < p->num_statements) {\n ASSERT(p->state == PSTATE_WORKING)\n- struct process_statement *ps = &p->statements[p->ap];\n+ struct statement *ps = &p->statements[p->ap];\n ASSERT(ps->state == SSTATE_FORGOTTEN)\n \n \/\/ clear expired error\n@@ -910,7 +910,7 @@\n }\n \n if (ps->have_error) {\n- process_statement_log(ps, BLOG_INFO, \"waiting after error\");\n+ statement_log(ps, BLOG_INFO, \"waiting after error\");\n \n \/\/ set wait timer\n BReactor_SetTimerAbsolute(&ss, &p->wait_timer, ps->error_until);\n@@ -946,10 +946,10 @@\n ASSERT(!BTimer_IsRunning(&p->wait_timer))\n ASSERT(p->state == PSTATE_WORKING)\n \n- struct process_statement *ps = &p->statements[p->ap];\n+ struct statement *ps = &p->statements[p->ap];\n ASSERT(ps->state == SSTATE_FORGOTTEN)\n \n- process_statement_log(ps, BLOG_INFO, \"initializing\");\n+ statement_log(ps, BLOG_INFO, \"initializing\");\n \n NCDObject object;\n NCDObject *object_ptr = NULL;\n@@ -968,14 +968,14 @@\n \/\/ get object type\n const char *object_type = NCDObject_Type(&object);\n if (!object_type) {\n- process_statement_log(ps, BLOG_ERROR, \"cannot call method on object with no type\");\n+ statement_log(ps, BLOG_ERROR, \"cannot call method on object with no type\");\n goto fail0;\n }\n \n \/\/ build type string\n int res = snprintf(method_concat_buf, sizeof(method_concat_buf), \"%s::%s\", object_type, type);\n if (res >= sizeof(method_concat_buf) || res < 0) {\n- process_statement_log(ps, BLOG_ERROR, \"type\/method name too long\");\n+ statement_log(ps, BLOG_ERROR, \"type\/method name too long\");\n goto fail0;\n }\n type = method_concat_buf;\n@@ -984,7 +984,7 @@\n \/\/ find module to instantiate\n const struct NCDModule *module = NCDModuleIndex_FindModule(&mindex, type);\n if (!module) {\n- process_statement_log(ps, BLOG_ERROR, \"failed to find module: %s\", type);\n+ statement_log(ps, BLOG_ERROR, \"failed to find module: %s\", type);\n goto fail0;\n }\n \n@@ -994,8 +994,8 @@\n \/\/ resolve arguments\n NCDValRef args;\n NCDInterpValue *iargs = NCDInterpBlock_StatementInterpValue(p->iblock, ps->i);\n- if (!process_statement_resolve_argument(ps, iargs, &ps->args_mem, &args)) {\n- process_statement_log(ps, BLOG_ERROR, \"failed to resolve arguments\");\n+ if (!statement_resolve_argument(ps, iargs, &ps->args_mem, &args)) {\n+ statement_log(ps, BLOG_ERROR, \"failed to resolve arguments\");\n goto fail1;\n }\n \n@@ -1018,7 +1018,7 @@\n NCDValMem_Free(&ps->args_mem);\n fail0:\n \/\/ mark error\n- process_statement_set_error(ps);\n+ statement_set_error(ps);\n \n \/\/ schedule work to start the timer\n process_schedule_work(p);\n@@ -1052,7 +1052,7 @@\n \n int i = NCDInterpBlock_FindStatement(p->iblock, pos, name);\n if (i >= 0) {\n- struct process_statement *ps = &p->statements[i];\n+ struct statement *ps = &p->statements[i];\n ASSERT(i < p->num_statements)\n \n if (ps->state == SSTATE_FORGOTTEN) {\n@@ -1124,13 +1124,13 @@\n return 0;\n }\n \n-void process_statement_logfunc (struct process_statement *ps)\n+void statement_logfunc (struct statement *ps)\n {\n process_logfunc(ps->p);\n BLog_Append(\"statement %zu: \", ps->i);\n }\n \n-void process_statement_log (struct process_statement *ps, int level, const char *fmt, ...)\n+void statement_log (struct statement *ps, int level, const char *fmt, ...)\n {\n if (!BLog_WouldLog(BLOG_CURRENT_CHANNEL, level)) {\n return;\n@@ -1138,11 +1138,11 @@\n \n va_list vl;\n va_start(vl, fmt);\n- BLog_LogViaFuncVarArg((BLog_logfunc)process_statement_logfunc, ps, BLOG_CURRENT_CHANNEL, level, fmt, vl);\n+ BLog_LogViaFuncVarArg((BLog_logfunc)statement_logfunc, ps, BLOG_CURRENT_CHANNEL, level, fmt, vl);\n va_end(vl);\n }\n \n-void process_statement_set_error (struct process_statement *ps)\n+void statement_set_error (struct statement *ps)\n {\n ASSERT(ps->state == SSTATE_FORGOTTEN)\n \n@@ -1150,7 +1150,7 @@\n ps->error_until = btime_add(btime_gettime(), options.retry_time);\n }\n \n-int process_statement_resolve_argument (struct process_statement *ps, NCDInterpValue *arg, NCDValMem *mem, NCDValRef *out)\n+int statement_resolve_argument (struct statement *ps, NCDInterpValue *arg, NCDValMem *mem, NCDValRef *out)\n {\n ASSERT(ps->i <= process_rap(ps->p))\n ASSERT(arg)\n@@ -1161,7 +1161,7 @@\n case NCDVALUE_STRING: {\n *out = NCDVal_NewStringBin(mem, (uint8_t *)arg->string, arg->string_len);\n if (NCDVal_IsInvalid(*out)) {\n- process_statement_log(ps, BLOG_ERROR, \"NCDVal_NewStringBin failed\");\n+ statement_log(ps, BLOG_ERROR, \"NCDVal_NewStringBin failed\");\n return 0;\n }\n } break;\n@@ -1178,7 +1178,7 @@\n case NCDVALUE_LIST: {\n *out = NCDVal_NewList(mem, arg->list_count);\n if (NCDVal_IsInvalid(*out)) {\n- process_statement_log(ps, BLOG_ERROR, \"NCDVal_NewList failed\");\n+ statement_log(ps, BLOG_ERROR, \"NCDVal_NewList failed\");\n return 0;\n }\n \n@@ -1186,7 +1186,7 @@\n struct NCDInterpValueListElem *elem = UPPER_OBJECT(n, struct NCDInterpValueListElem, list_node);\n \n NCDValRef new_elem;\n- if (!process_statement_resolve_argument(ps, &elem->value, mem, &new_elem)) {\n+ if (!statement_resolve_argument(ps, &elem->value, mem, &new_elem)) {\n return 0;\n }\n \n@@ -1197,7 +1197,7 @@\n case NCDVALUE_MAP: {\n *out = NCDVal_NewMap(mem, arg->map_count);\n if (NCDVal_IsInvalid(*out)) {\n- process_statement_log(ps, BLOG_ERROR, \"NCDVal_NewMap failed\");\n+ statement_log(ps, BLOG_ERROR, \"NCDVal_NewMap failed\");\n return 0;\n }\n \n@@ -1205,18 +1205,18 @@\n struct NCDInterpValueMapElem *elem = UPPER_OBJECT(n, struct NCDInterpValueMapElem, maplist_node);\n \n NCDValRef new_key;\n- if (!process_statement_resolve_argument(ps, &elem->key, mem, &new_key)) {\n+ if (!statement_resolve_argument(ps, &elem->key, mem, &new_key)) {\n return 0;\n }\n \n NCDValRef new_val;\n- if (!process_statement_resolve_argument(ps, &elem->val, mem, &new_val)) {\n+ if (!statement_resolve_argument(ps, &elem->val, mem, &new_val)) {\n return 0;\n }\n \n int res = NCDVal_MapInsert(*out, new_key, new_val);\n if (!res) {\n- process_statement_log(ps, BLOG_ERROR, \"duplicate map keys\");\n+ statement_log(ps, BLOG_ERROR, \"duplicate map keys\");\n return 0;\n }\n }\n@@ -1228,7 +1228,7 @@\n return 1;\n }\n \n-void process_statement_instance_func_event (struct process_statement *ps, int event)\n+void statement_instance_func_event (struct statement *ps, int event)\n {\n ASSERT(ps->state == SSTATE_CHILD || ps->state == SSTATE_ADULT || ps->state == SSTATE_DYING)\n \n@@ -1242,7 +1242,7 @@\n case NCDMODULE_EVENT_UP: {\n ASSERT(ps->state == SSTATE_CHILD)\n \n- process_statement_log(ps, BLOG_INFO, \"up\");\n+ statement_log(ps, BLOG_INFO, \"up\");\n \n \/\/ set state ADULT\n ps->state = SSTATE_ADULT;\n@@ -1251,7 +1251,7 @@\n case NCDMODULE_EVENT_DOWN: {\n ASSERT(ps->state == SSTATE_ADULT)\n \n- process_statement_log(ps, BLOG_INFO, \"down\");\n+ statement_log(ps, BLOG_INFO, \"down\");\n \n \/\/ set state CHILD\n ps->state = SSTATE_CHILD;\n@@ -1266,9 +1266,9 @@\n int is_error = NCDModuleInst_HaveError(&ps->inst);\n \n if (is_error) {\n- process_statement_log(ps, BLOG_ERROR, \"died with error\");\n+ statement_log(ps, BLOG_ERROR, \"died with error\");\n } else {\n- process_statement_log(ps, BLOG_INFO, \"died\");\n+ statement_log(ps, BLOG_INFO, \"died\");\n }\n \n \/\/ free instance\n@@ -1282,7 +1282,7 @@\n \n \/\/ set error\n if (is_error) {\n- process_statement_set_error(ps);\n+ statement_set_error(ps);\n }\n \n \/\/ update AP\n@@ -1298,14 +1298,14 @@\n }\n }\n \n-int process_statement_instance_func_getobj (struct process_statement *ps, const char *objname, NCDObject *out_object)\n+int statement_instance_func_getobj (struct statement *ps, const char *objname, NCDObject *out_object)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n return process_find_object(ps->p, ps->i, objname, out_object);\n }\n \n-int process_statement_instance_func_initprocess (struct process_statement *ps, NCDModuleProcess *mp, const char *template_name)\n+int statement_instance_func_initprocess (struct statement *ps, NCDModuleProcess *mp, const char *template_name)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n@@ -1313,50 +1313,50 @@\n NCDProcess *p_ast;\n NCDInterpBlock *iblock;\n if (!NCDInterpProg_FindProcess(&iprogram, template_name, &p_ast, &iblock) || !NCDProcess_IsTemplate(p_ast)) {\n- process_statement_log(ps, BLOG_ERROR, \"no template named %s\", template_name);\n+ statement_log(ps, BLOG_ERROR, \"no template named %s\", template_name);\n return 0;\n }\n \n \/\/ create process\n if (!process_new(p_ast, iblock, mp)) {\n- process_statement_log(ps, BLOG_ERROR, \"failed to create process from template %s\", template_name);\n+ statement_log(ps, BLOG_ERROR, \"failed to create process from template %s\", template_name);\n return 0;\n }\n \n- process_statement_log(ps, BLOG_INFO, \"created process from template %s\", template_name);\n+ statement_log(ps, BLOG_INFO, \"created process from template %s\", template_name);\n \n return 1;\n }\n \n-void process_statement_instance_logfunc (struct process_statement *ps)\n+void statement_instance_logfunc (struct statement *ps)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n- process_statement_logfunc(ps);\n+ statement_logfunc(ps);\n BLog_Append(\"module: \");\n }\n \n-void process_statement_instance_func_interp_exit (struct process_statement *ps, int exit_code)\n+void statement_instance_func_interp_exit (struct statement *ps, int exit_code)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n start_terminate(exit_code);\n }\n \n-int process_statement_instance_func_interp_getargs (struct process_statement *ps, NCDValMem *mem, NCDValRef *out_value)\n+int statement_instance_func_interp_getargs (struct statement *ps, NCDValMem *mem, NCDValRef *out_value)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n *out_value = NCDVal_NewList(mem, options.num_extra_args);\n if (NCDVal_IsInvalid(*out_value)) {\n- process_statement_log(ps, BLOG_ERROR, \"NCDVal_NewList failed\");\n+ statement_log(ps, BLOG_ERROR, \"NCDVal_NewList failed\");\n goto fail;\n }\n \n for (int i = 0; i < options.num_extra_args; i++) {\n NCDValRef arg = NCDVal_NewString(mem, options.extra_args[i]);\n if (NCDVal_IsInvalid(arg)) {\n- process_statement_log(ps, BLOG_ERROR, \"NCDVal_NewString failed\");\n+ statement_log(ps, BLOG_ERROR, \"NCDVal_NewString failed\");\n goto fail;\n }\n \n@@ -1370,7 +1370,7 @@\n return 1;\n }\n \n-btime_t process_statement_instance_func_interp_getretrytime (struct process_statement *ps)\n+btime_t statement_instance_func_interp_getretrytime (struct statement *ps)\n {\n ASSERT(ps->state != SSTATE_FORGOTTEN)\n \n"} {"commit":"2f347f3de774292b49de535150d2709fabfb1983","subject":"Delete netbase.h","message":"Delete netbase.h","repos":"CMcoin\/cmc,CMcoin\/cmc,CMcoin\/cmc,CMcoin\/cmc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- netbase.h\n+++ netbase.h\n@@ -1,146 +0,0 @@\n-\/\/ Copyright (c) 2009-2012 The Bitcoin developers\n-\/\/ Distributed under the MIT\/X11 software license, see the accompanying\n-\/\/ file COPYING or http:\/\/www.opensource.org\/licenses\/mit-license.php.\n-#ifndef BITCOIN_NETBASE_H\n-#define BITCOIN_NETBASE_H\n-\n-#include <string>\n-#include <vector>\n-\n-#include \"serialize.h\"\n-#include \"compat.h\"\n-\n-extern int nConnectTimeout;\n-extern bool fNameLookup;\n-\n-#ifdef WIN32\n-\/\/ In MSVC, this is defined as a macro, undefine it to prevent a compile and link error\n-#undef SetPort\n-#endif\n-\n-enum Network\n-{\n- NET_UNROUTABLE,\n- NET_IPV4,\n- NET_IPV6,\n- NET_TOR,\n- NET_I2P,\n-\n- NET_MAX,\n-};\n-\n-\/** IP address (IPv6, or IPv4 using mapped IPv6 range (::FFFF:0:0\/96)) *\/\n-class CNetAddr\n-{\n- protected:\n- unsigned char ip[16]; \/\/ in network byte order\n-\n- public:\n- CNetAddr();\n- CNetAddr(const struct in_addr& ipv4Addr);\n- explicit CNetAddr(const char *pszIp, bool fAllowLookup = false);\n- explicit CNetAddr(const std::string &strIp, bool fAllowLookup = false);\n- void Init();\n- void SetIP(const CNetAddr& ip);\n- bool SetSpecial(const std::string &strName); \/\/ for Tor and I2P addresses\n- bool IsIPv4() const; \/\/ IPv4 mapped address (::FFFF:0:0\/96, 0.0.0.0\/0)\n- bool IsIPv6() const; \/\/ IPv6 address (not mapped IPv4, not Tor\/I2P)\n- bool IsRFC1918() const; \/\/ IPv4 private networks (10.0.0.0\/8, 192.168.0.0\/16, 172.16.0.0\/12)\n- bool IsRFC3849() const; \/\/ IPv6 documentation address (2001:0DB8::\/32)\n- bool IsRFC3927() const; \/\/ IPv4 autoconfig (169.254.0.0\/16)\n- bool IsRFC3964() const; \/\/ IPv6 6to4 tunnelling (2002::\/16)\n- bool IsRFC4193() const; \/\/ IPv6 unique local (FC00::\/15)\n- bool IsRFC4380() const; \/\/ IPv6 Teredo tunnelling (2001::\/32)\n- bool IsRFC4843() const; \/\/ IPv6 ORCHID (2001:10::\/28)\n- bool IsRFC4862() const; \/\/ IPv6 autoconfig (FE80::\/64)\n- bool IsRFC6052() const; \/\/ IPv6 well-known prefix (64:FF9B::\/96)\n- bool IsRFC6145() const; \/\/ IPv6 IPv4-translated address (::FFFF:0:0:0\/96)\n- bool IsTor() const;\n- bool IsI2P() const;\n- bool IsLocal() const;\n- bool IsRoutable() const;\n- bool IsValid() const;\n- bool IsMulticast() const;\n- enum Network GetNetwork() const;\n- std::string ToString() const;\n- std::string ToStringIP() const;\n- unsigned int GetByte(int n) const;\n- uint64_t GetHash() const;\n- bool GetInAddr(struct in_addr* pipv4Addr) const;\n- std::vector<unsigned char> GetGroup() const;\n- int GetReachabilityFrom(const CNetAddr *paddrPartner = NULL) const;\n- void print() const;\n-\n- CNetAddr(const struct in6_addr& pipv6Addr);\n- bool GetIn6Addr(struct in6_addr* pipv6Addr) const;\n-\n- friend bool operator==(const CNetAddr& a, const CNetAddr& b);\n- friend bool operator!=(const CNetAddr& a, const CNetAddr& b);\n- friend bool operator<(const CNetAddr& a, const CNetAddr& b);\n-\n- IMPLEMENT_SERIALIZE\n- (\n- READWRITE(FLATDATA(ip));\n- )\n-};\n-\n-\/** A combination of a network address (CNetAddr) and a (TCP) port *\/\n-class CService : public CNetAddr\n-{\n- protected:\n- unsigned short port; \/\/ host order\n-\n- public:\n- CService();\n- CService(const CNetAddr& ip, unsigned short port);\n- CService(const struct in_addr& ipv4Addr, unsigned short port);\n- CService(const struct sockaddr_in& addr);\n- explicit CService(const char *pszIpPort, int portDefault, bool fAllowLookup = false);\n- explicit CService(const char *pszIpPort, bool fAllowLookup = false);\n- explicit CService(const std::string& strIpPort, int portDefault, bool fAllowLookup = false);\n- explicit CService(const std::string& strIpPort, bool fAllowLookup = false);\n- void Init();\n- void SetPort(unsigned short portIn);\n- unsigned short GetPort() const;\n- bool GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const;\n- bool SetSockAddr(const struct sockaddr* paddr);\n- friend bool operator==(const CService& a, const CService& b);\n- friend bool operator!=(const CService& a, const CService& b);\n- friend bool operator<(const CService& a, const CService& b);\n- std::vector<unsigned char> GetKey() const;\n- std::string ToString() const;\n- std::string ToStringPort() const;\n- std::string ToStringIPPort() const;\n- void print() const;\n-\n- CService(const struct in6_addr& ipv6Addr, unsigned short port);\n- CService(const struct sockaddr_in6& addr);\n-\n- IMPLEMENT_SERIALIZE\n- (\n- CService* pthis = const_cast<CService*>(this);\n- READWRITE(FLATDATA(ip));\n- unsigned short portN = htons(port);\n- READWRITE(portN);\n- if (fRead)\n- pthis->port = ntohs(portN);\n- )\n-};\n-\n-typedef std::pair<CService, int> proxyType;\n-\n-enum Network ParseNetwork(std::string net);\n-void SplitHostPort(std::string in, int &portOut, std::string &hostOut);\n-bool SetProxy(enum Network net, CService addrProxy, int nSocksVersion = 5);\n-bool GetProxy(enum Network net, proxyType &proxyInfoOut);\n-bool IsProxy(const CNetAddr &addr);\n-bool SetNameProxy(CService addrProxy, int nSocksVersion = 5);\n-bool HaveNameProxy();\n-bool LookupHost(const char *pszName, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions = 0, bool fAllowLookup = true);\n-bool Lookup(const char *pszName, CService& addr, int portDefault = 0, bool fAllowLookup = true);\n-bool Lookup(const char *pszName, std::vector<CService>& vAddr, int portDefault = 0, bool fAllowLookup = true, unsigned int nMaxSolutions = 0);\n-bool LookupNumeric(const char *pszName, CService& addr, int portDefault = 0);\n-bool ConnectSocket(const CService &addr, SOCKET& hSocketRet, int nTimeout = nConnectTimeout);\n-bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest, int portDefault = 0, int nTimeout = nConnectTimeout);\n-\n-#endif\n"} {"commit":"b48c4ffec930f0ca76892a6d928b1790bee0fe63","subject":"Failing start-up for account or key proc doesn't error us.","message":"Failing start-up for account or key proc doesn't error us.\n","repos":"kristapsdz\/letskencrypt","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- netproc.c\n+++ netproc.c\n@@ -557,13 +557,16 @@\n \t * There's no point in running if these don't work.\n \t *\/\n \n-\tif (0 == (op = readop(afd, COMM_ACCT_STAT)))\n-\t\tgoto out;\n-\telse if (ACCT_READY != op)\n-\t\tgoto out;\n-\telse if (0 == (op = readop(afd, COMM_KEY_STAT)))\n-\t\tgoto out;\n-\telse if (KEY_READY != op)\n+\tif (0 == (op = readop(afd, COMM_ACCT_STAT))) {\n+\t\trc = 1;\n+\t\tgoto out;\n+\t} else if (ACCT_READY != op)\n+\t\tgoto out;\n+\n+\tif (0 == (op = readop(afd, COMM_KEY_STAT))) {\n+\t\trc = 1;\n+\t\tgoto out;\n+\t} else if (KEY_READY != op)\n \t\tgoto out;\n \n \t\/* Allocate main state. *\/\n"} {"commit":"ff50953317ea640756195b0eed10bb6a51f33ccc","subject":"Network backend: Added \"clone\" backend function","message":"Network backend: Added \"clone\" backend function\n\nSigned-off-by: Paul Cercueil <73d292422978d45c9eeef455bb1b24a0db453722@analog.com>\n","repos":"Sunderfield\/libiio,analogdevicesinc\/libiio,gburca\/libiio,analogdevicesinc\/libiio,sensarliar\/libiio,gburca\/libiio,sensarliar\/libiio,Sunderfield\/libiio,Sunderfield\/libiio,sensarliar\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio,gburca\/libiio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- network.c\n+++ network.c\n@@ -64,6 +64,7 @@\n \n struct iio_context_pdata {\n \tint fd;\n+\tchar *host;\n #if HAVE_PTHREAD\n \tpthread_mutex_t lock;\n #endif\n@@ -648,6 +649,8 @@\n \t\/* XXX(pcercuei): is this safe? *\/\n \tpthread_mutex_destroy(&pdata->lock);\n #endif\n+\tif (pdata->host)\n+\t\tfree(pdata->host);\n \tfree(pdata);\n \n \tfor (i = 0; i < ctx->nb_devices; i++) {\n@@ -741,7 +744,13 @@\n \treturn ret;\n }\n \n+static struct iio_context * network_clone(const struct iio_context *ctx)\n+{\n+\treturn iio_create_network_context(ctx->pdata->host);\n+}\n+\n static struct iio_backend_ops network_ops = {\n+\t.clone = network_clone,\n \t.open = network_open,\n \t.close = network_close,\n \t.read = network_read,\n@@ -854,12 +863,20 @@\n \t\tgoto err_close_socket;\n \t}\n \n+\tif (host) {\n+\t\tpdata->host = strdup(host);\n+\t\tif (!pdata->host) {\n+\t\t\tERROR(\"Unable to allocate memory\\n\");\n+\t\t\tgoto err_free_pdata;\n+\t\t}\n+\t}\n+\n \tpdata->fd = fd;\n \n \tDEBUG(\"Creating context...\\n\");\n \tctx = get_context(fd);\n \tif (!ctx)\n-\t\tgoto err_free_pdata;\n+\t\tgoto err_free_pdata_host;\n \n \tfor (i = 0; i < ctx->nb_devices; i++) {\n \t\tstruct iio_device *dev = ctx->devices[i];\n@@ -900,6 +917,9 @@\n err_network_shutdown:\n \tnetwork_shutdown(ctx);\n \tiio_context_destroy(ctx);\n+err_free_pdata_host:\n+\tif (pdata->host)\n+\t\tfree(pdata->host);\n err_free_pdata:\n \tfree(pdata);\n err_close_socket:\n"} {"commit":"939c5b34d8694b7120175bbc7e991ba0b96e2dcc","subject":"Change the values of NET_CHANNEL_* to fit in a byte.","message":"Change the values of NET_CHANNEL_* to fit in a byte.\n","repos":"Gwendocg\/babeldToS,dtaht\/babeld-shortrtt-metrics,sudomesh\/babeld,jech\/babeld,boutier\/babeld,wlanslovenija\/babeld,Gwendocg\/babeldToS,woniullb\/babeld,wlanslovenija\/babeld,jech\/babeld,Drooids\/babeld,tcatm\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- network.h\n+++ network.h\n@@ -49,8 +49,8 @@\n #define NET_LQ (1 << 3)\n \n #define NET_CHANNEL_UNKNOWN 0\n-#define NET_CHANNEL_INTERFERING -2\n-#define NET_CHANNEL_NONINTERFERING -3\n+#define NET_CHANNEL_INTERFERING 253\n+#define NET_CHANNEL_NONINTERFERING 254\n \n struct network {\n struct network *next;\n@@ -58,7 +58,7 @@\n unsigned int ifindex;\n unsigned short flags;\n unsigned short cost;\n- int channel;\n+ unsigned char channel;\n struct timeval hello_timeout;\n struct timeval update_timeout;\n struct timeval flush_timeout;\n"} {"commit":"6331ca0873c975a8a9da8f4b5415abbc6cbad487","subject":"INTEGRATION: CWS changefileheader (1.3.846); FILE MERGED 2008\/03\/28 15:44:02 rt 1.3.846.1: #i87441# Change license header to LPGL v3.","message":"INTEGRATION: CWS changefileheader (1.3.846); FILE MERGED\n2008\/03\/28 15:44:02 rt 1.3.846.1: #i87441# Change license header to LPGL v3.\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- vcl\/aqua\/inc\/salconst.h\n+++ vcl\/aqua\/inc\/salconst.h\n@@ -1,35 +1,30 @@\n \/*************************************************************************\n *\n- * OpenOffice.org - a multi-platform office productivity suite\n+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n *\n- * $RCSfile: salconst.h,v $\n+ * Copyright 2008 by Sun Microsystems, Inc.\n *\n- * $Revision: 1.3 $\n+ * OpenOffice.org - a multi-platform office productivity suite\n *\n- * last change: $Author: rt $ $Date: 2005-09-09 10:33:14 $\n+ * $RCSfile: salconst.h,v $\n+ * $Revision: 1.4 $\n *\n- * The Contents of this file are made available subject to\n- * the terms of GNU Lesser General Public License Version 2.1.\n+ * This file is part of OpenOffice.org.\n *\n+ * OpenOffice.org is free software: you can redistribute it and\/or modify\n+ * it under the terms of the GNU Lesser General Public License version 3\n+ * only, as published by the Free Software Foundation.\n *\n- * GNU Lesser General Public License Version 2.1\n- * =============================================\n- * Copyright 2005 by Sun Microsystems, Inc.\n- * 901 San Antonio Road, Palo Alto, CA 94303, USA\n+ * OpenOffice.org is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU Lesser General Public License version 3 for more details\n+ * (a copy is included in the LICENSE file that accompanied this code).\n *\n- * This library is free software; you can redistribute it and\/or\n- * modify it under the terms of the GNU Lesser General Public\n- * License version 2.1, as published by the Free Software Foundation.\n- *\n- * This library is distributed in the hope that it will be useful,\n- * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n- * Lesser General Public License for more details.\n- *\n- * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n- * MA 02111-1307 USA\n+ * You should have received a copy of the GNU Lesser General Public License\n+ * version 3 along with OpenOffice.org. If not, see\n+ * <http:\/\/www.openoffice.org\/license.html>\n+ * for a copy of the LGPLv3 License.\n *\n ************************************************************************\/\n \n"} {"commit":"c6ceb202bcced96c7d37c57abf87374d31e22d51","subject":"refactor on aput impl choices","message":"refactor on aput impl choices\n","repos":"jeffhammond\/oshmpi,jeffhammond\/oshmpi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/extensions\/aput\/dmapp-strided.c\n+++ tests\/extensions\/aput\/dmapp-strided.c\n@@ -31,11 +31,9 @@\n \/* Set the RMA parameters. *\/\n dmapp_rma_attrs_t rma_args={0};\n rma_args.put_relaxed_ordering = DMAPP_ROUTING_ADAPTIVE;\n- rma_args.max_outstanding_nb = DMAPP_DEF_OUTSTANDING_NB;\n+ rma_args.max_outstanding_nb = DMAPP_DEF_OUTSTANDING_NB; \/* 1024 *\/\n rma_args.offload_threshold = DMAPP_OFFLOAD_THRESHOLD;\n rma_args.max_concurrency = 1;\n-\n- printf(\"DMAPP_DEF_OUTSTANDING_NB = %d\\n\", DMAPP_DEF_OUTSTANDING_NB);\n \n \/* Initialize DMAPP. *\/\n dmapp_rma_attrs_t actual_args={0};\n@@ -129,32 +127,56 @@\n ptrdiff_t dstr, ptrdiff_t sstr,\n size_t blksz, size_t blkct, dmapp_pe_t pe)\n {\n- \/\/dmapp_syncid_handle_t syncid;\n+#if defined(USE_SYNCIDS)\n+ int numsyncids = (blksz<=blkct) ? blksz : blkct;\n+ dmapp_syncid_handle_t * syncids = (dmapp_syncid_handle_t *) malloc(numsyncids*sizeof(dmapp_syncid_handle_t));\n+#elif defined(USE_BLOCKING)\n+#else\n+ const int maxnbi = DMAPP_DEF_OUTSTANDING_NB\/2;\n+#endif\n+\n double *dtmp = dest;\n const double *stmp = src;\n if (blksz<=blkct) {\n for (size_t i=0; i<blksz; i++) {\n- \/\/dmapp_return_t rc = dmapp_iput_nb(dtmp, _sheap, pe, (double*)stmp, dstr, sstr, blkct, DMAPP_QW, &syncid);\n- \/\/dmapp_return_t rc = dmapp_iput_nbi(dtmp, _sheap, pe, (double*)stmp, dstr, sstr, blkct, DMAPP_QW);\n+#if defined(USE_SYNCIDS)\n+ dmapp_return_t rc = dmapp_iput_nb(dtmp, _sheap, pe, (double*)stmp, dstr, sstr, blkct, DMAPP_QW, &(syncid[i]));\n+#elif defined(USE_BLOCKING)\n dmapp_return_t rc = dmapp_iput(dtmp, _sheap, pe, (double*)stmp, dstr, sstr, blkct, DMAPP_QW);\n+#else\n+ dmapp_return_t rc = dmapp_iput_nbi(dtmp, _sheap, pe, (double*)stmp, dstr, sstr, blkct, DMAPP_QW);\n+#endif\n DMAPP_CHECK(rc,__LINE__);\n dtmp++; stmp++;\n }\n } else {\n for (size_t i=0; i<blkct; i++) {\n- \/\/dmapp_return_t rc = dmapp_put_nb((void*)dtmp, _sheap, (dmapp_pe_t)pe, (void*)stmp, blksz, DMAPP_QW, &syncid);\n- \/\/dmapp_return_t rc = dmapp_put_nbi((void*)dtmp, _sheap, (dmapp_pe_t)pe, (void*)stmp, blksz, DMAPP_QW);\n+#if defined(USE_SYNCIDS)\n+ dmapp_return_t rc = dmapp_put_nb((void*)dtmp, _sheap, (dmapp_pe_t)pe, (void*)stmp, blksz, DMAPP_QW, &(syncid[i]));\n+#elif defined(USE_BLOCKING)\n dmapp_return_t rc = dmapp_put((void*)dtmp, _sheap, (dmapp_pe_t)pe, (void*)stmp, blksz, DMAPP_QW);\n+#else\n+ dmapp_return_t rc = dmapp_put_nbi((void*)dtmp, _sheap, (dmapp_pe_t)pe, (void*)stmp, blksz, DMAPP_QW);\n+ if (i%maxnbi==0) {\n+ dmapp_return_t rc2 = dmapp_gsync_wait();\n+ DMAPP_CHECK(rc2,__LINE__);\n+ }\n+#endif\n DMAPP_CHECK(rc,__LINE__);\n dtmp += dstr; stmp += sstr;\n }\n }\n- {\n- \/\/dmapp_return_t rc = dmapp_syncid_wait(&syncid);\n- \/\/dmapp_return_t rc = dmapp_gsync_wait();\n- dmapp_return_t rc = DMAPP_RC_SUCCESS;\n- DMAPP_CHECK(rc,__LINE__);\n- }\n+#if defined(USE_SYNCIDS)\n+ for (size_t i=0; i<blkct; i++) {\n+ dmapp_return_t rc = dmapp_syncid_wait(&(syncid[i]));\n+ }\n+ free(syncids);\n+#elif defined(USE_BLOCKING)\n+ dmapp_return_t rc = DMAPP_RC_SUCCESS;\n+#else\n+ dmapp_return_t rc = dmapp_gsync_wait();\n+#endif\n+ DMAPP_CHECK(rc,__LINE__);\n return;\n }\n \n"} {"commit":"6961e96e9a815ceaafc10078c3360729f87dc793","subject":"typos from Jared Yanovich; also sync with header, and change spacing a little to prevent line breaks;","message":"typos from Jared Yanovich;\nalso sync with header, and change spacing a little to prevent\nline breaks;\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- nfs\/nfs.h\n+++ nfs\/nfs.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: nfs.h,v 1.20 2003\/06\/02 23:28:19 millert Exp $\t*\/\n+\/*\t$OpenBSD: nfs.h,v 1.21 2003\/10\/22 04:45:54 jmc Exp $\t*\/\n \/*\t$NetBSD: nfs.h,v 1.10.4.1 1996\/05\/27 11:23:56 fvdl Exp $\t*\/\n \n \/*\n@@ -148,7 +148,7 @@\n \tstruct ucred\tnsd_cr;\t\t\/* Cred. uid maps to *\/\n \tint\t\tnsd_authlen;\t\/* Length of auth string (ret) *\/\n \tu_char\t\t*nsd_authstr;\t\/* Auth string (ret) *\/\n-\tint\t\tnsd_verflen;\t\/* and the verfier *\/\n+\tint\t\tnsd_verflen;\t\/* and the verifier *\/\n \tu_char\t\t*nsd_verfstr;\n \tstruct timeval\tnsd_timestamp;\t\/* timestamp from verifier *\/\n \tu_int32_t\tnsd_ttl;\t\/* credential ttl (sec) *\/\n"} {"commit":"77a45ce30e222f95c4be389928a13085cf3ae2c7","subject":"added LED heartbeat on pin 21","message":"added LED heartbeat on pin 21\n","repos":"ReeceStevens\/patient-monitor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sunfounder.c\n+++ sunfounder.c\n@@ -202,6 +202,13 @@\n return -1;\n }\n \n+uint8_t led_heartbeat_setup(void){\n+ INP_GPIO(21);\n+ OUT_GPIO(21);\n+ GPIO_SET = 1<<21;\n+ return 0;\n+}\n+\n uint8_t spi_setup(void){\n int rc = setupio();\n if (rc) {\n@@ -372,6 +379,7 @@\n printf(\"hello there main\");\n \/\/setupio();\n uint8_t rc = screen_init();\n+ led_heartbeat_setup();\n if (rc) {\n return 1;\n }\n@@ -379,19 +387,24 @@\n printf(\"setup is complete\");\n while(1){\n fillScreen(0x0000);\n+\twrite_command(CMD_MEM_WRITE);\n+ GPIO_CLR = 1<<21;\n \/\/write_command(0x20);\n+\tprintf(\"passing loop\\n\");\n while (i) {\n i--;\n }\n- i = 10000;\n+ i = 100000000;\n fillScreen(0xFFFF);\n+\twrite_command(CMD_MEM_WRITE);\n+\tGPIO_SET = 1<<21;\n \/\/write_command(0x21);\n while (i) {\n i--;\n }\n- i = 10000;\n- }\n- return 0;\n-\n-}\n-\n+ i = 100000000;\n+ }\n+ return 0;\n+\n+}\n+\n"} {"commit":"9c4ef536002d5195311f20c112ca956b6a90dc7e","subject":"[nm] Add correct output in member of archives","message":"[nm] Add correct output in member of archives\n","repos":"k0gaMSX\/scc,k0gaMSX\/scc,k0gaMSX\/scc","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- nm\/main.c\n+++ nm\/main.c\n@@ -14,12 +14,13 @@\n \n char *argv0;\n char *strings;\n-int radix = 16;\n-int Pflag;\n-int Aflag;\n-int vflag;\n-int gflag;\n-int uflag;\n+static int radix = 16;\n+static int Pflag;\n+static int Aflag;\n+static int vflag;\n+static int gflag;\n+static int uflag;\n+static int archflag;\n \n static int\n object(char *fname, FILE *fp)\n@@ -74,7 +75,7 @@\n }\n \n static void\n-print(char *member, struct myrosym *sym, FILE *fp)\n+print(char *file, char *member, struct myrosym *sym, FILE *fp)\n {\n \tchar *fmt, *name = strings + sym->name;\n \tint type = typeof(sym);\n@@ -85,7 +86,7 @@\n \t\treturn;\n \n \tif (Aflag)\n-\t\tfprintf(fp, \"%s: \", member);\n+\t\tfprintf(fp, (archflag) ? \"%s[%s]: \" : \"%s: \", file, member);\n \tif (Pflag) {\n \t\tfprintf(fp, \"%s %c\", name, type);\n \t\tif (type != 'U') {\n@@ -159,7 +160,7 @@\n \t}\n \tqsort(syms, n, sizeof(*syms), cmp);\n \tfor (i = 0; i < n; ++i)\n-\t\tprint(member, &syms[i], fp);\n+\t\tprint(fname, member, &syms[i], fp);\n \n \n free_arrays:\n@@ -179,6 +180,7 @@\n \tstruct arhdr hdr;\n \tlong pos;\n \n+\tarchflag = 1;\n \twhile (rdarhdr(fp, &hdr) != EOF) {\n \t\tpos = ftell(fp);\n \t\tif (pos == -1 || pos > LONG_MAX - hdr.size) {\n@@ -207,6 +209,7 @@\n {\n \tFILE *fp;\n \n+\tarchflag = 0;\n \tif ((fp = fopen(fname, \"rb\")) == NULL)\n \t\tgoto file_error;\n \n"} {"commit":"8d789c90b802d03ed0e458d5948189562f02322a","subject":"Pledge!","message":"Pledge!\n","repos":"kristapsdz\/kcaldav,kristapsdz\/kcaldav,kristapsdz\/kcaldav","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- kcaldav.c\n+++ kcaldav.c\n@@ -1,6 +1,6 @@\n \/*\t$Id$ *\/\n \/*\n- * Copyright (c) 2015, 2016 Kristaps Dzonsons <kristaps@bsd.lv>\n+ * Copyright (c) 2015, 2016, 2018 Kristaps Dzonsons <kristaps@bsd.lv>\n *\n * Permission to use, copy, modify, and distribute this software for any\n * purpose with or without fee is hereby granted, provided that the above\n@@ -32,6 +32,9 @@\n #include <stdint.h>\n #include <stdlib.h>\n #include <string.h>\n+#if HAVE_PLEDGE\n+# include <unistd.h>\n+#endif\n \n #include <kcgi.h>\n #include <kcgixml.h>\n@@ -334,6 +337,12 @@\n \t\t SANDBOX_NAMED, &np);\n \tif (-1 == rc) {\n \t\tkerrx(\"sandbox_init: %s\", np);\n+\t\tgoto out;\n+\t}\n+#endif\n+#if HAVE_PLEDGE\n+\tif (-1 == pledge(\"stdio rpath cpath wpath flock fattr\", NULL)) {\n+\t\tkerr(\"pledge\");\n \t\tgoto out;\n \t}\n #endif\n"} {"commit":"bc90590a92d68a178b172e028a7c986c7d997207","subject":"Make this file build on the Mac.","message":"Make this file build on the Mac.\n","repos":"ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/pk11wrap\/pk11sdr.c\n+++ security\/nss\/lib\/pk11wrap\/pk11sdr.c\n@@ -194,7 +194,7 @@\n sdrResult.data.len = paddedData.len;\n sdrResult.data.data = (unsigned char *)PORT_ArenaAlloc(arena, sdrResult.data.len);\n \n- rv = PK11_CipherOp(ctx, sdrResult.data.data, &sdrResult.data.len, sdrResult.data.len,\n+ rv = PK11_CipherOp(ctx, sdrResult.data.data, (int*)&sdrResult.data.len, sdrResult.data.len,\n paddedData.data, paddedData.len);\n if (rv != SECSuccess) goto loser;\n \n@@ -266,7 +266,7 @@\n paddedResult.len = sdrResult.data.len;\n paddedResult.data = PORT_ArenaAlloc(arena, paddedResult.len);\n \n- rv = PK11_CipherOp(ctx, paddedResult.data, &paddedResult.len, paddedResult.len,\n+ rv = PK11_CipherOp(ctx, paddedResult.data, (int*)&paddedResult.len, paddedResult.len,\n sdrResult.data.data, sdrResult.data.len);\n if (rv != SECSuccess) goto loser;\n \n"} {"commit":"fa51fba2ab0f86a2ed8857b2311785b61ca21a55","subject":"1) fix warnings on AIX, HP, Linux, and Solaris.","message":"1) fix warnings on AIX, HP, Linux, and Solaris.\n\n2) Move private functions into private headers.\n\n3) Sharpen the layer separation between NSS components, especially pkcs #12\nand soft token.\n\n4) Remove dead code.\n","repos":"nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/softoken\/secmodt.h\n+++ security\/nss\/lib\/softoken\/secmodt.h\n@@ -35,6 +35,17 @@\n *\/\n #ifndef _SECMODT_H_\n #define _SECMODT_H_ 1\n+\n+#include \"secoid.h\"\n+#include \"secasn1.h\"\n+\n+\/* find a better home for these... *\/\n+extern const SEC_ASN1Template SECKEY_PointerToEncryptedPrivateKeyInfoTemplate[];\n+extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToEncryptedPrivateKeyInfoTemplate;\n+extern const SEC_ASN1Template SECKEY_PrivateKeyInfoTemplate[];\n+extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PrivateKeyInfoTemplate;\n+extern const SEC_ASN1Template SECKEY_PointerToPrivateKeyInfoTemplate[];\n+extern SEC_ASN1TemplateChooser NSS_Get_SECKEY_PointerToPrivateKeyInfoTemplate;\n \n \/* PKCS11 needs to be included *\/\n typedef struct SECMODModuleStr SECMODModule;\n@@ -79,7 +90,6 @@\n PRBool\tmoduleDBOnly;\t\/* this module only has lists of PKCS #11 modules *\/\n int\t\ttrustOrder;\t\/* order for this module's certificate trust rollup *\/\n int\t\tcipherOrder;\t\/* order for cipher operations *\/\n-\n };\n \n struct SECMODModuleListStr {\n@@ -189,4 +199,40 @@\n typedef PRBool (*PK11VerifyPasswordFunc)(PK11SlotInfo *slot, void *arg);\n typedef PRBool (*PK11IsLoggedInFunc)(PK11SlotInfo *slot, void *arg);\n \n+\/*\n+ * PKCS #11 key structures\n+ *\/\n+\n+\/*\n+** Attributes\n+*\/\n+struct SECKEYPrivAttributeStr {\n+ SECItem attrType;\n+ SECItem **attrValue;\n+};\n+typedef struct SECKEYPrivAttributeStr SECKEYPrivAttribute;\n+\n+\/*\n+** A PKCS#8 private key info object\n+*\/\n+struct SECKEYPrivateKeyInfoStr {\n+ PLArenaPool *arena;\n+ SECItem version;\n+ SECAlgorithmID algorithm;\n+ SECItem privateKey;\n+ SECKEYPrivAttribute **attributes;\n+};\n+typedef struct SECKEYPrivateKeyInfoStr SECKEYPrivateKeyInfo;\n+#define SEC_PRIVATE_KEY_INFO_VERSION\t\t0\t\/* what we *create* *\/\n+\n+\/*\n+** A PKCS#8 private key info object\n+*\/\n+struct SECKEYEncryptedPrivateKeyInfoStr {\n+ PLArenaPool *arena;\n+ SECAlgorithmID algorithm;\n+ SECItem encryptedData;\n+};\n+typedef struct SECKEYEncryptedPrivateKeyInfoStr SECKEYEncryptedPrivateKeyInfo;\n+\n #endif \/*_SECMODT_H_ *\/\n"} {"commit":"d374d7d230a2286e55495431e90ce7e56e5bb757","subject":"tests\/unwind: produce trace in case of failure","message":"tests\/unwind: produce trace in case of failure\n","repos":"gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- testsuite\/tests\/unwind\/stack_walker.c\n+++ testsuite\/tests\/unwind\/stack_walker.c\n@@ -11,18 +11,17 @@\n return Val_unit;\n }\n \n-void error() {\n- exit(1);\n-}\n-\n-void perform_stack_walk() {\n+int perform_stack_walk(int dbg) {\n unw_context_t ctxt;\n unw_getcontext(&ctxt);\n \n unw_cursor_t cursor;\n {\n int result = unw_init_local(&cursor, &ctxt);\n- if (result != 0) error();\n+ if (result != 0) {\n+ if (dbg) printf(\"unw_init_local failed: %d\\n\", result);\n+ return -1;\n+ }\n }\n \n int reached_main = 0;\n@@ -33,27 +32,39 @@\n unw_word_t ip_offset; \/\/ IP - start_of_proc\n int result = unw_get_proc_name(&cursor, procname, sizeof(procname),\n &ip_offset);\n- if (result != 0) error();\n+ if (result != 0) {\n+ if (dbg) printf(\"unw_get_proc_name failed: %d\\n\", result);\n+ return -1;\n+ }\n+\n if (strcmp(procname, \"main\") == 0)\n reached_main = 1;\n- \/\/printf(\"%s + %lld\\n\", procname, (long long int)ip_offset);\n+ if (dbg) printf(\"%s + %lld\\n\", procname, (long long int)ip_offset);\n }\n \n {\n int result = unw_step(&cursor);\n if (result == 0) break;\n- if (result < 0) error();\n+ if (result < 0) {\n+ if (dbg) printf(\"unw_step failed: %d\\n\", result);\n+ return -1;\n+ }\n }\n }\n \n- \/\/printf(\"Reached end of stack.\\n\");\n+ if (dbg) printf(\"Reached end of stack.\\n\");\n if (!reached_main) {\n- \/\/printf(\"Failure: Did not reach main.\\n\");\n- error();\n+ if (dbg) printf(\"Failure: Did not reach main.\\n\");\n+ return -1;\n }\n+ return 0;\n }\n \n value ml_perform_stack_walk() {\n- perform_stack_walk();\n+ if (perform_stack_walk(0) != 0) {\n+ printf(\"TEST FAILED\\n\");\n+ \/* Re-run the test to produce a trace *\/\n+ perform_stack_walk(1);\n+ }\n return Val_unit;\n }\n"} {"commit":"de6088d01acad4ebfb97696289796843454e222e","subject":"Update actuator-board LED GPIO","message":"Update actuator-board LED GPIO\n","repos":"cvra\/can-bootloader,cvra\/can-bootloader,cvra\/can-bootloader,cvra\/can-bootloader","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- platform\/actuator-board\/platform.c\n+++ platform\/actuator-board\/platform.c\n@@ -8,7 +8,7 @@\n #include <platform\/mcu\/armv7-m\/timeout_timer.h>\n #include \"platform.h\"\n \n-#define GPIOA_LED GPIO15\n+#define GPIOB_LED GPIO0\n #define GPIOA_CAN_RX GPIO11\n #define GPIOA_CAN_TX GPIO12\n \n@@ -126,6 +126,7 @@\n rcc_clock_setup_hse(&clock_72mhz);\n \n rcc_periph_clock_enable(RCC_GPIOA);\n+ rcc_periph_clock_enable(RCC_GPIOB);\n \n \/\/ CAN pin\n gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIOA_CAN_RX | GPIOA_CAN_TX);\n@@ -133,9 +134,9 @@\n gpio_set_af(GPIOA, GPIO_AF9, GPIOA_CAN_RX | GPIOA_CAN_TX);\n \n \/\/ LED on\n- gpio_mode_setup(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIOA_LED);\n- gpio_set_output_options(GPIOA, GPIO_OTYPE_PP, GPIO_OSPEED_100MHZ, GPIOA_LED);\n- gpio_set(GPIOA, GPIOA_LED);\n+ gpio_mode_setup(GPIOB, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIOB_LED);\n+ gpio_set_output_options(GPIOB, GPIO_OTYPE_PP, GPIO_OSPEED_100MHZ, GPIOB_LED);\n+ gpio_set(GPIOB, GPIOB_LED);\n \n \/\/ configure timeout of 10000 milliseconds\n timeout_timer_init(72000000, 10000);\n"} {"commit":"24b6071234505c685da5163b358115a71089a1dd","subject":"change maca_raw_mode to contiki_maca_raw_mode","message":"change maca_raw_mode to contiki_maca_raw_mode\n","repos":"arurke\/contiki,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,arurke\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,MohamedSeliem\/contiki,bluerover\/6lbr,bluerover\/6lbr","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/redbee-dev\/contiki-conf.h\n+++ platform\/redbee-dev\/contiki-conf.h\n@@ -79,10 +79,10 @@\n #define uart_init uart1_init\n #define dbg_putchar(x) uart1_putc(x)\n \n-#define USE_FORMATTED_STDIO 1\n-#define MACA_DEBUG 0\n-#define MACA_RAW_MODE 0\n-#define USE_32KHZ_XTAL 0\n+#define USE_FORMATTED_STDIO 1\n+#define MACA_DEBUG 0\n+#define CONTIKI_MACA_RAW_MODE 0\n+#define USE_32KHZ_XTAL 0\n \n #define BLOCKING_TX 0\n \n"} {"commit":"257b5cfbae6ed9a2c85e0ab18c8ef6c0187e0a0f","subject":"do not wait when stopping","message":"do not wait when stopping\n","repos":"rhomobile\/rhodes,pslgoh\/rhodes,tauplatform\/tau,tauplatform\/tau,pslgoh\/rhodes,tauplatform\/tau,rhomobile\/rhodes,watusi\/rhodes,pslgoh\/rhodes,watusi\/rhodes,pslgoh\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,watusi\/rhodes,tauplatform\/tau,tauplatform\/tau,watusi\/rhodes,rhomobile\/rhodes,watusi\/rhodes,tauplatform\/tau,tauplatform\/tau,pslgoh\/rhodes,watusi\/rhodes,watusi\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,rhomobile\/rhodes,watusi\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,tauplatform\/tau,watusi\/rhodes,watusi\/rhodes,pslgoh\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,tauplatform\/tau,pslgoh\/rhodes,tauplatform\/tau","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platform\/shared\/common\/RhoThread.h\n+++ platform\/shared\/common\/RhoThread.h\n@@ -24,7 +24,7 @@\n \n virtual void start(EPriority ePriority);\n virtual void stop(unsigned int nTimeoutToKill){ m_nState |= TS_STOPPING; if (m_nState&TS_RUNNING) m_pImpl->stop(nTimeoutToKill); m_nState &= ~TS_STOPPING; }\n- virtual void wait(unsigned int nTimeout){ m_nState |= TS_WAIT; if (m_nState&TS_RUNNING) m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; }\n+ virtual void wait(unsigned int nTimeout){ m_nState |= TS_WAIT; if ((m_nState&TS_RUNNING) && !(m_nState&TS_STOPPING) ) m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; }\n virtual void stopWait(){ if (isWaiting()) m_pImpl->stopWait(); }\n virtual void sleep(unsigned int nTimeout){ m_pImpl->sleep(nTimeout); }\n virtual void run() = 0;\n"} {"commit":"adbf539dc9540a5284d2a94973e96afc8d1a8323","subject":"Make single valued vectors ctors explicit","message":"Make single valued vectors ctors explicit\n\nThat way, unintended calls are less likely\nThanks to Alex for this recommendation\n\ngit-svn-id: a0a066a1d7ce87c7a04dae20f169ad0cd8bda35d@1643 04231f92-3938-0410-9931-e931ac552b4f\n","repos":"deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- virvo\/virvo\/vvvecmath.h\n+++ virvo\/virvo\/vvvecmath.h\n@@ -161,7 +161,7 @@\n T e[4]; \/\/\/< vector elements (x|y|z|w)\n \n vvBaseVector4();\n- vvBaseVector4(T val);\n+ explicit vvBaseVector4(T val);\n vvBaseVector4(T x, T y, T z, T w);\n vvBaseVector4(const vvBaseVector4*);\n vvBaseVector4(const vvBaseVector3<T>*, const T w);\n@@ -190,7 +190,7 @@\n T e[3]; \/\/\/< vector elements (x|y|z)\n \n vvBaseVector3();\n- vvBaseVector3(T);\n+ explicit vvBaseVector3(T);\n vvBaseVector3(T x, T y, T z);\n vvBaseVector3(const vvBaseVector3*);\n vvBaseVector3 operator^(const vvBaseVector3) const;\n"} {"commit":"eb139c9babeda44a7e613602f8aa86d6207cb994","subject":"Correct pins to not reset.","message":"Correct pins to not reset.\n\nThey must have the PORT_ prefix otherwise they mask the wrong pins.\n\nFixes #3552\n","repos":"adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ports\/atmel-samd\/boards\/matrixportal_m4\/mpconfigboard.h\n+++ ports\/atmel-samd\/boards\/matrixportal_m4\/mpconfigboard.h\n@@ -9,7 +9,7 @@\n \n \/\/ These are pins not to reset.\n \/\/ QSPI Data pins, PA23 is NeoPixel\n-#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PA23)\n+#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11 | PORT_PA23)\n \/\/ QSPI CS, QSPI SCK\n #define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)\n #define MICROPY_PORT_C (0)\n"} {"commit":"3e2b687efd0c42aafffd09a785ab80fae99677c6","subject":"implement WSASocket for win ce","message":"implement WSASocket for win ce\n","repos":"watusi\/rhodes,tauplatform\/tau,rhomobile\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,tauplatform\/tau,pslgoh\/rhodes,pslgoh\/rhodes,tauplatform\/tau,tauplatform\/tau,tauplatform\/tau,tauplatform\/tau,pslgoh\/rhodes,pslgoh\/rhodes,tauplatform\/tau,watusi\/rhodes,watusi\/rhodes,rhomobile\/rhodes,watusi\/rhodes,watusi\/rhodes,watusi\/rhodes,pslgoh\/rhodes,watusi\/rhodes,rhomobile\/rhodes,tauplatform\/tau,pslgoh\/rhodes,tauplatform\/tau,watusi\/rhodes,tauplatform\/tau,watusi\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,watusi\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,rhomobile\/rhodes,pslgoh\/rhodes,pslgoh\/rhodes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platform\/shared\/ruby\/wince\/wince.c\n+++ platform\/shared\/ruby\/wince\/wince.c\n@@ -750,8 +750,37 @@\n IN DWORD dwFlags\n )\n {\n- \/\/TODO:WSASocketA \n-\treturn 0;\n+ int nSize = 0;\n+ WSAPROTOCOL_INFOW lpProtocolInfoW;\n+\n+ lpProtocolInfoW.dwServiceFlags1 = lpProtocolInfo->dwServiceFlags1;\n+ lpProtocolInfoW.dwServiceFlags2 = lpProtocolInfo->dwServiceFlags2;\n+ lpProtocolInfoW.dwServiceFlags3 = lpProtocolInfo->dwServiceFlags3;\n+ lpProtocolInfoW.dwServiceFlags4 = lpProtocolInfo->dwServiceFlags4;\n+ lpProtocolInfoW.dwProviderFlags = lpProtocolInfo->dwProviderFlags;\n+ lpProtocolInfoW.ProviderId = lpProtocolInfo->ProviderId;\n+ lpProtocolInfoW.dwCatalogEntryId = lpProtocolInfo->dwCatalogEntryId;\n+ lpProtocolInfoW.ProtocolChain = lpProtocolInfo->ProtocolChain;\n+ lpProtocolInfoW.iVersion = lpProtocolInfo->iVersion;\n+ lpProtocolInfoW.iAddressFamily = lpProtocolInfo->iAddressFamily;\n+ lpProtocolInfoW.iMaxSockAddr = lpProtocolInfo->iMaxSockAddr;\n+ lpProtocolInfoW.iMinSockAddr = lpProtocolInfo->iMinSockAddr;\n+ lpProtocolInfoW.iSocketType = lpProtocolInfo->iSocketType;\n+ lpProtocolInfoW.iProtocol = lpProtocolInfo->iProtocol;\n+ lpProtocolInfoW.iProtocolMaxOffset = lpProtocolInfo->iProtocolMaxOffset;\n+ lpProtocolInfoW.iNetworkByteOrder = lpProtocolInfo->iNetworkByteOrder;\n+ lpProtocolInfoW.iSecurityScheme = lpProtocolInfo->iSecurityScheme;\n+ lpProtocolInfoW.dwMessageSize = lpProtocolInfo->dwMessageSize;\n+ lpProtocolInfoW.dwProviderReserved = lpProtocolInfo->dwProviderReserved;\n+\n+ nSize = MultiByteToWideChar(CP_UTF8, 0, lpProtocolInfo->szProtocol, -1, NULL, 0);\n+ \n+ if ( nSize > 1 )\n+ {\n+ MultiByteToWideChar(CP_UTF8, 0, lpProtocolInfo->szProtocol, -1, lpProtocolInfoW.szProtocol, nSize);\n+ }\n+\n+ return WSASocketW(af, type, protocol, &lpProtocolInfoW, g, dwFlags);\n }\n \n int\n"} {"commit":"d13f04f9534813ab1c1d975350961bfc0f5b7f67","subject":"Updated formatting","message":"Updated formatting\n","repos":"adafruit\/micropython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/micropython,adafruit\/micropython,adafruit\/micropython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/micropython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ports\/mimxrt10xx\/common-hal\/microcontroller\/Processor.c\n+++ ports\/mimxrt10xx\/common-hal\/microcontroller\/Processor.c\n@@ -59,16 +59,12 @@\n \n \/\/ Reads shadow registers 0x01 - 0x04 (Configuration and Manufacturing Info)\n \/\/ into 8 bit wide destination, avoiding punning.\n- for (int i = 0; i < 4; ++i)\n- {\n-\tuint32_t wr = OCOTP_ReadFuseShadowRegister(OCOTP, i + 1);\n-\n-\tfor (int j = 0; j < 4; j++)\n-\t {\n-\t raw_id[i*4+j] = wr&0xff;\n-\t wr>>=8;\n-\t }\n- }\n-\n+ for (int i = 0; i < 4; ++i) {\n+ uint32_t wr = OCOTP_ReadFuseShadowRegister(OCOTP, i + 1);\n+ for (int j = 0; j < 4; j++) {\n+ raw_id[i*4+j] = wr&0xff;\n+ wr>>=8;\n+ }\n+ }\n OCOTP_Deinit(OCOTP);\n }\n"} {"commit":"def420c787e597ba19867d5d4af54b48185ffb64","subject":"trying to get the definitions needed for compile in windows. so far, I added manual definitions of: MONITOR_DEFAULTTONEAREST 2 WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);","message":"trying to get the definitions needed for compile in windows.\nso far, I added manual definitions of:\nMONITOR_DEFAULTTONEAREST 2\nWINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);\n\nnot sure this will work.\nif I would have access to windows machine all would be a lot easier :(\n","repos":"peteruhnak\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,ronsaldo\/pharo-vm-lowcode,bencoman\/pharo-vm,bencoman\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,ronsaldo\/pharo-vm-lowcode,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,bencoman\/pharo-vm,ronsaldo\/pharo-vm-lowcode,peteruhnak\/pharo-vm,bencoman\/pharo-vm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/win32\/vm\/sqWin32Window.c\n+++ platforms\/win32\/vm\/sqWin32Window.c\n@@ -26,13 +26,18 @@\n #include <commdlg.h>\n #include <excpt.h>\n \n-#if (defined(__MINGW32_VERSION) && (__MINGW32_MAJOR_VERSION < 3)) || ((_WIN32_WINNT < 0x0410))\n+#if defined(__MINGW32_VERSION) && (__MINGW32_MAJOR_VERSION < 3)\n \/** Kludge to get multimonitor API's to compile in the mingw\/directx7 mix. **\/\n \/** Not needed in cygwin **\/\n # define COMPILE_MULTIMON_STUBS\n # undef SM_CMONITORS\n # define HMONITOR_DECLARED\n # include \"multimon.h\"\n+#else \n+# ifndef MONITOR_DEFAULTTONEAREST \n+# define MONITOR_DEFAULTTONEAREST 2\n+WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);\n+# endif\n #endif \/* defined(__MINGW32_VERSION) && (__MINGW32_MAJOR_VERSION < 3) *\/\n \n #include \"sq.h\"\n"} {"commit":"92d67358986c3be48ccbd4135b53ea591f15ea86","subject":"Guard g_inet_address_mask_equal against invalid input","message":"Guard g_inet_address_mask_equal against invalid input\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=733338\n","repos":"krichter722\/glib,Distrotech\/glib,tchakabam\/glib,lukasz-skalski\/glib,johne53\/MB3Glib,Distrotech\/glib,MathieuDuponchelle\/glib,mzabaluev\/glib,krichter722\/glib,cention-sany\/glib,tchakabam\/glib,tamaskenez\/glib,johne53\/MB3Glib,endlessm\/glib,cention-sany\/glib,lukasz-skalski\/glib,mzabaluev\/glib,mzabaluev\/glib,tchakabam\/glib,ieei\/glib,endlessm\/glib,ieei\/glib,gale320\/glib,cention-sany\/glib,endlessm\/glib,mzabaluev\/glib,ieei\/glib,johne53\/MB3Glib,johne53\/MB3Glib,MathieuDuponchelle\/glib,Distrotech\/glib,lukasz-skalski\/glib,tamaskenez\/glib,MathieuDuponchelle\/glib,cention-sany\/glib,tchakabam\/glib,gale320\/glib,lukasz-skalski\/glib,MathieuDuponchelle\/glib,ieei\/glib,tamaskenez\/glib,gale320\/glib,tamaskenez\/glib,Distrotech\/glib,gale320\/glib,ieei\/glib,Distrotech\/glib,endlessm\/glib,tchakabam\/glib,MathieuDuponchelle\/glib,krichter722\/glib,lukasz-skalski\/glib,krichter722\/glib,johne53\/MB3Glib,krichter722\/glib,endlessm\/glib,mzabaluev\/glib,johne53\/MB3Glib,cention-sany\/glib,gale320\/glib,tamaskenez\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/ginetaddressmask.c\n+++ gio\/ginetaddressmask.c\n@@ -465,6 +465,9 @@\n g_inet_address_mask_equal (GInetAddressMask *mask,\n \t\t\t GInetAddressMask *mask2)\n {\n+ g_return_val_if_fail (G_IS_INET_ADDRESS_MASK (mask), FALSE);\n+ g_return_val_if_fail (G_IS_INET_ADDRESS_MASK (mask2), FALSE);\n+\n return ((mask->priv->length == mask2->priv->length) &&\n \t g_inet_address_equal (mask->priv->addr, mask2->priv->addr));\n }\n"} {"commit":"28cf9c626ee5eb0fce7bad34b8a87753fd974417","subject":"Fix TEXT(VMOPTION('foo\"))","message":"Fix TEXT(VMOPTION('foo\"))\n\nTEXT is a macro that prepend a L, like TEXT(\"foo\") => L\"foo\".\nIt does not work for concatenated constants: TEXT(\"foo\" \"bar\") => L\"foo\" \"bar\".\nVMOPTION concatenates a \"-\".\nTherefore we need a specific TVMOPTION macro.\n","repos":"timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/win32\/vm\/sqWin32Window.c\n+++ platforms\/win32\/vm\/sqWin32Window.c\n@@ -3308,6 +3308,7 @@\n \/****************************************************************************\/\n \n # define VMOPTION(arg) \"-\"arg\n+# define TVMOPTION(arg) TEXT(\"-\") TEXT(arg)\n \n \/* print usage with different output levels *\/\n int printUsage(int level)\n@@ -3320,43 +3321,43 @@\n abortMessage(TEXT(\"%s\\n\"),\n TEXT(\"Usage: \") TEXT(VM_NAME) TEXT(\" [vmOptions] imageFile [imageOptions]\\n\\n\")\n TEXT(\"vmOptions:\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"service:\")) TEXT(\" ServiceName \\t(install VM as NT service)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"headless\")) TEXT(\" \\t\\t(force VM to run headless)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"timephases\")) TEXT(\" \\t\\t(print start load and run times)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"log:\")) TEXT(\" LogFile \\t\\t(use LogFile for VM messages)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"memory:\")) TEXT(\" megaByte \\t(set memory to megaByte MB)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"service:\") TEXT(\" ServiceName \\t(install VM as NT service)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"headless\") TEXT(\" \\t\\t(force VM to run headless)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"timephases\") TEXT(\" \\t\\t(print start load and run times)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"log:\") TEXT(\" LogFile \\t\\t(use LogFile for VM messages)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"memory:\") TEXT(\" megaByte \\t(set memory to megaByte MB)\")\n #if STACKVM || NewspeakVM\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"breaksel:\")) TEXT(\" string \\t(call warning on send of sel for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"breaksel:\") TEXT(\" string \\t(call warning on send of sel for debug)\")\n #endif \/* STACKVM || NewspeakVM *\/\n #if STACKVM\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"breakmnu:\")) TEXT(\" string \\t(call warning on MNU of sel for debug)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"leakcheck:\")) TEXT(\" n \\t\\t(leak check on GC (1=full,2=incr,3=both))\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"eden:\")) TEXT(\" bytes \\t\\t(set eden memory size to bytes)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"stackpages:\")) TEXT(\" n \\t\\t(use n stack pages)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"numextsems:\")) TEXT(\" n \\t\\t(allow up to n external semaphores)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"checkpluginwrites\")) TEXT(\" \\t(check for writes past end of object in plugins\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"noheartbeat\")) TEXT(\" \\t\\t(no heartbeat for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"breakmnu:\") TEXT(\" string \\t(call warning on MNU of sel for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"leakcheck:\") TEXT(\" n \\t\\t(leak check on GC (1=full,2=incr,3=both))\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"eden:\") TEXT(\" bytes \\t\\t(set eden memory size to bytes)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"stackpages:\") TEXT(\" n \\t\\t(use n stack pages)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"numextsems:\") TEXT(\" n \\t\\t(allow up to n external semaphores)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"checkpluginwrites\") TEXT(\" \\t(check for writes past end of object in plugins\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"noheartbeat\") TEXT(\" \\t\\t(no heartbeat for debug)\")\n #endif \/* STACKVM *\/\n #if STACKVM || NewspeakVM\n # if COGVM\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"trace\")) TEXT(\"[=num]\\t\\tenable tracing (optionally to a specific value)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"trace\") TEXT(\"[=num]\\t\\tenable tracing (optionally to a specific value)\")\n # else\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"sendtrace\")) TEXT(\" \\t\\t(trace sends to stdout for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"sendtrace\") TEXT(\" \\t\\t(trace sends to stdout for debug)\")\n # endif\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"warnpid\")) TEXT(\" \\t\\t(print pid in warnings)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"[no]failonffiexception\")) TEXT(\" \\t\\t([never]always catch exceptions in FFI calls)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"warnpid\") TEXT(\" \\t\\t(print pid in warnings)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"[no]failonffiexception\") TEXT(\" \\t\\t([never]always catch exceptions in FFI calls)\")\n #endif\n #if COGVM\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"codesize:\")) TEXT(\" bytes \\t(set machine-code memory size to bytes)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"cogmaxlits:\")) TEXT(\" n \\t\\t(set max number of literals for methods to be compiled to machine code)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"cogminjumps:\")) TEXT(\" n \\t(set min number of backward jumps for interpreted methods to be considered for compilation to machine code)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"tracestores\")) TEXT(\" \\t\\t(assert-check stores for debug)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"reportheadroom\")) TEXT(\" \\t(report unused stack headroom on exit)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"dpcso:\")) TEXT(\" bytes \\t\\t(stack offset for prim calls for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"codesize:\") TEXT(\" bytes \\t(set machine-code memory size to bytes)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"cogmaxlits:\") TEXT(\" n \\t\\t(set max number of literals for methods to be compiled to machine code)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"cogminjumps:\") TEXT(\" n \\t(set min number of backward jumps for interpreted methods to be considered for compilation to machine code)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"tracestores\") TEXT(\" \\t\\t(assert-check stores for debug)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"reportheadroom\") TEXT(\" \\t(report unused stack headroom on exit)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"dpcso:\") TEXT(\" bytes \\t\\t(stack offset for prim calls for debug)\")\n #endif \/* COGVM *\/\n #if SPURVM\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"maxoldspace:\")) TEXT(\" bytes \\t(set max size of old space memory to bytes)\")\n- TEXT(\"\\n\\t\") TEXT(VMOPTION(\"logscavenge\")) TEXT(\" \\t\\t(log scavenging to scavenge.log)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"maxoldspace:\") TEXT(\" bytes \\t(set max size of old space memory to bytes)\")\n+ TEXT(\"\\n\\t\") TVMOPTION(\"logscavenge\") TEXT(\" \\t\\t(log scavenging to scavenge.log)\")\n #endif\n TEXT(\"\\n\") TEXT(\"Options begin with single -, but -- prefix is silently accepted\")\n TEXT(\"\\n\") TEXT(\"Options with arguments -opt:n are also accepted with separators -opt n\")\n"} {"commit":"1041fc21905767fc15cf1ec9a4ff3ecb0fdcd6d9","subject":"Improve gdbus test coverage","message":"Improve gdbus test coverage\n","repos":"tchakabam\/glib,Distrotech\/glib,mzabaluev\/glib,Distrotech\/glib,lukasz-skalski\/glib,lukasz-skalski\/glib,endlessm\/glib,tchakabam\/glib,cention-sany\/glib,Distrotech\/glib,johne53\/MB3Glib,lukasz-skalski\/glib,lukasz-skalski\/glib,tamaskenez\/glib,johne53\/MB3Glib,gale320\/glib,krichter722\/glib,tchakabam\/glib,MathieuDuponchelle\/glib,endlessm\/glib,mzabaluev\/glib,johne53\/MB3Glib,gale320\/glib,krichter722\/glib,johne53\/MB3Glib,tchakabam\/glib,johne53\/MB3Glib,ieei\/glib,tchakabam\/glib,mzabaluev\/glib,krichter722\/glib,mzabaluev\/glib,Distrotech\/glib,Distrotech\/glib,johne53\/MB3Glib,tamaskenez\/glib,ieei\/glib,MathieuDuponchelle\/glib,cention-sany\/glib,krichter722\/glib,gale320\/glib,MathieuDuponchelle\/glib,gale320\/glib,endlessm\/glib,cention-sany\/glib,krichter722\/glib,ieei\/glib,endlessm\/glib,tamaskenez\/glib,lukasz-skalski\/glib,ieei\/glib,gale320\/glib,mzabaluev\/glib,tamaskenez\/glib,cention-sany\/glib,MathieuDuponchelle\/glib,tamaskenez\/glib,MathieuDuponchelle\/glib,endlessm\/glib,ieei\/glib,cention-sany\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gio\/tests\/gdbus-peer.c\n+++ gio\/tests\/gdbus-peer.c\n@@ -1596,6 +1596,7 @@\n GThread *service_thread;\n GError *error = NULL;\n GVariant *value;\n+ const gchar *s;\n \n \/* bring up a server - we run the server in a different thread to avoid deadlocks *\/\n service_thread = g_thread_new (\"codegen_test_peer\",\n@@ -1659,6 +1660,16 @@\n example_animal_call_poke_sync (animal2, FALSE, TRUE, NULL, &error);\n g_assert_no_error (error);\n \n+ \/* Some random unrelated call, just to get some test coverage *\/\n+ value = g_dbus_proxy_call_sync (G_DBUS_PROXY (animal2),\n+ \"org.freedesktop.DBus.Peer.GetMachineId\",\n+ NULL, G_DBUS_CALL_FLAGS_NONE, -1,\n+ NULL, &error);\n+ g_assert_no_error (error);\n+ g_variant_get (value, \"(&s)\", &s);\n+ g_assert (g_dbus_is_guid (s));\n+ g_variant_unref (value);\n+ \n \/* Poke server and make sure animal is updated *\/\n value = g_dbus_proxy_call_sync (G_DBUS_PROXY (animal2),\n \"org.freedesktop.DBus.Peer.Ping\",\n"} {"commit":"de4ff761fba91ab3ef398155f307d55fee4f849e","subject":"change static functions","message":"change static functions\n","repos":"nuft\/kprintf,cvra\/kprintf,nuft\/kprintf,cvra\/kprintf","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kprintf.c\n+++ kprintf.c\n@@ -62,7 +62,7 @@\n \/\/ convert to hexadecimal (with leading 0s)\n \/\/ buffer must be 8+1 bytes long\n \/\/ return length of string (without null character)\n-int itoa_hex(uint32_t x, char *buffer)\n+static int itoa_hex(uint32_t x, char *buffer)\n {\n char *w = buffer;\n int i;\n@@ -75,7 +75,7 @@\n \/\/ convert to decimal\n \/\/ buffer must be 10+1 chars long for full range\n \/\/ returns lenght of string (without null character)\n-int utoa_dec(uint32_t x, char *buffer)\n+static int utoa_dec(uint32_t x, char *buffer)\n {\n int len = 0;\n char *a = buffer;\n@@ -97,7 +97,7 @@\n \/\/ convert to decimal\n \/\/ buffer must be 11+1 chars long for full range\n \/\/ returns lenght of string (without null character)\n-int itoa_dec(int32_t x, char *buffer)\n+static int itoa_dec(int32_t x, char *buffer)\n {\n int len = 0;\n if (x < 0) {\n"} {"commit":"0b9b3d864355c7ce477099b305c7c8381b730e36","subject":"Add a few branch hints to vp10_optimize_b.","message":"Add a few branch hints to vp10_optimize_b.\n\nvp10_optimize_b now takes between 40% to 60% of the TOTAL runtime\nof the encoder, depending on bit-rate. It also contains 2\/3 to 3\/4\nof the mispredicted branch instructions in the whole program.\n\nAdding a few branch hints makes vp10_optimize_b around 2-5% faster\n(dependig on bit-rate) when compiled with gcc\/clang.\n\nChange-Id: I1572733e18b4166bc10591b958c5018a9561fa2b\n","repos":"luctrudeau\/aom,smarter\/aom,mbebenita\/aom,luctrudeau\/aom,mbebenita\/aom,smarter\/aom,mbebenita\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,luctrudeau\/aom,mbebenita\/aom,luctrudeau\/aom,luctrudeau\/aom,GrokImageCompression\/aom,smarter\/aom,smarter\/aom,GrokImageCompression\/aom,mbebenita\/aom,mbebenita\/aom,GrokImageCompression\/aom,smarter\/aom,GrokImageCompression\/aom,luctrudeau\/aom,mbebenita\/aom,smarter\/aom,mbebenita\/aom,mbebenita\/aom","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp10\/encoder\/encodemb.c\n+++ vp10\/encoder\/encodemb.c\n@@ -160,7 +160,7 @@\n next_shortcut = shortcut;\n \n \/* Only add a trellis state for non-zero coefficients. *\/\n- if (x) {\n+ if (UNLIKELY(x)) {\n error0 = tokens[next][0].error;\n error1 = tokens[next][1].error;\n \/* Evaluate the first possibility for this state. *\/\n@@ -204,7 +204,7 @@\n rate1 = tokens[next][1].rate;\n \n \/\/ The threshold of 3 is empirically obtained.\n- if (abs(x) > 3) {\n+ if (UNLIKELY(abs(x) > 3)) {\n shortcut = 0;\n } else {\n #if CONFIG_NEW_QUANT\n@@ -233,7 +233,7 @@\n best_index[i][1] = best_index[i][0];\n next = i;\n \n- if (!(--band_left)) {\n+ if (UNLIKELY(!(--band_left))) {\n --band_counts;\n band_left = *band_counts;\n --token_costs;\n@@ -255,7 +255,7 @@\n }\n \n if (next_shortcut) {\n- if (next < default_eob) {\n+ if (LIKELY(next < default_eob)) {\n if (t0 != EOB_TOKEN) {\n token_cache[rc] = vp10_pt_energy_class[t0];\n pt = get_coef_context(nb, token_cache, i + 1);\n@@ -350,7 +350,7 @@\n \/* Don't update next, because we didn't add a new node. *\/\n }\n \n- if (!(--band_left)) {\n+ if (UNLIKELY(!(--band_left))) {\n --band_counts;\n band_left = *band_counts;\n --token_costs;\n"} {"commit":"37bf29b916c65e189a7bad0f1972af9365a3ad19","subject":"Rework table access operations in vp10_optimize_b function","message":"Rework table access operations in vp10_optimize_b function\n\nLocalize table access. This provides another 10% speed-up to\nthe unit.\n\nChange-Id: Ib902121f412f78e2bd501b9799c8c64462f803b5\n","repos":"mbebenita\/aom,mbebenita\/aom,smarter\/aom,mbebenita\/aom,luctrudeau\/aom,mbebenita\/aom,smarter\/aom,luctrudeau\/aom,luctrudeau\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,smarter\/aom,luctrudeau\/aom,GrokImageCompression\/aom,luctrudeau\/aom,smarter\/aom,mbebenita\/aom,mbebenita\/aom,smarter\/aom,GrokImageCompression\/aom,luctrudeau\/aom,mbebenita\/aom,smarter\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,mbebenita\/aom,mbebenita\/aom","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp10\/encoder\/encodemb.c\n+++ vp10\/encoder\/encodemb.c\n@@ -91,8 +91,8 @@\n struct macroblock_plane *const p = &mb->plane[plane];\n struct macroblockd_plane *const pd = &xd->plane[plane];\n const int ref = is_inter_block(&xd->mi[0]->mbmi);\n- vp10_token_state tokens[MAX_TX_SQUARE+1][2];\n- unsigned best_index[MAX_TX_SQUARE+1][2];\n+ vp10_token_state tokens[MAX_TX_SQUARE + 1][2];\n+ unsigned best_index[MAX_TX_SQUARE + 1][2];\n uint8_t token_cache[MAX_TX_SQUARE];\n const tran_low_t *const coeff = BLOCK_OFFSET(mb->plane[plane].coeff, block);\n tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);\n@@ -118,13 +118,14 @@\n int64_t rd_cost0, rd_cost1;\n int rate0, rate1, error0, error1;\n int16_t t0, t1;\n- EXTRABIT e0;\n int best, band, pt, i, final_eob;\n #if CONFIG_VP9_HIGHBITDEPTH\n const int *cat6_high_cost = vp10_get_high_cost_table(xd->bd);\n #else\n const int *cat6_high_cost = vp10_get_high_cost_table(8);\n #endif\n+ unsigned int (*token_costs)[2][COEFF_CONTEXTS][ENTROPY_TOKENS] =\n+ mb->token_costs[tx_size][type][ref];\n \n assert((!type && !plane) || (type && plane));\n assert(eob <= default_eob);\n@@ -146,6 +147,7 @@\n int base_bits, d2, dx;\n const int rc = scan[i];\n int x = qcoeff[rc];\n+\n \/* Only add a trellis state for non-zero coefficients. *\/\n if (x) {\n int shortcut = 0;\n@@ -154,20 +156,18 @@\n \/* Evaluate the first possibility for this state. *\/\n rate0 = tokens[next][0].rate;\n rate1 = tokens[next][1].rate;\n- vp10_get_token_extra(x, &t0, &e0);\n+\n+ base_bits = vp10_get_token_cost(x, &t0, cat6_high_cost);\n \/* Consider both possible successor states. *\/\n if (next < default_eob) {\n band = band_translate[i + 1];\n pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);\n- rate0 += mb->token_costs[tx_size][type][ref][band][0][pt]\n- [tokens[next][0].token];\n- rate1 += mb->token_costs[tx_size][type][ref][band][0][pt]\n- [tokens[next][1].token];\n+ rate0 += token_costs[band][0][pt][tokens[next][0].token];\n+ rate1 += token_costs[band][0][pt][tokens[next][1].token];\n }\n UPDATE_RD_COST();\n \/* And pick the best. *\/\n best = rd_cost1 < rd_cost0;\n- base_bits = vp10_get_cost(t0, e0, cat6_high_cost);\n \n dx = (dqcoeff[rc] - coeff[rc]) * (1 << shift);\n #if CONFIG_VP9_HIGHBITDEPTH\n@@ -222,29 +222,26 @@\n *\/\n t0 = tokens[next][0].token == EOB_TOKEN ? EOB_TOKEN : ZERO_TOKEN;\n t1 = tokens[next][1].token == EOB_TOKEN ? EOB_TOKEN : ZERO_TOKEN;\n- e0 = 0;\n+ base_bits = 0;\n } else {\n- vp10_get_token_extra(x, &t0, &e0);\n+ base_bits = vp10_get_token_cost(x, &t0, cat6_high_cost);\n t1 = t0;\n }\n if (next < default_eob) {\n band = band_translate[i + 1];\n if (t0 != EOB_TOKEN) {\n pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);\n- rate0 += mb->token_costs[tx_size][type][ref][band][!x][pt]\n- [tokens[next][0].token];\n+ rate0 += token_costs[band][!x][pt][tokens[next][0].token];\n }\n if (t1 != EOB_TOKEN) {\n pt = trellis_get_coeff_context(scan, nb, i, t1, token_cache);\n- rate1 += mb->token_costs[tx_size][type][ref][band][!x][pt]\n- [tokens[next][1].token];\n+ rate1 += token_costs[band][!x][pt][tokens[next][1].token];\n }\n }\n \n UPDATE_RD_COST();\n \/* And pick the best. *\/\n best = rd_cost1 < rd_cost0;\n- base_bits = vp10_get_cost(t0, e0, cat6_high_cost);\n \n if (shortcut) {\n #if CONFIG_NEW_QUANT\n@@ -304,13 +301,11 @@\n t1 = tokens[next][1].token;\n \/* Update the cost of each path if we're past the EOB token. *\/\n if (t0 != EOB_TOKEN) {\n- tokens[next][0].rate +=\n- mb->token_costs[tx_size][type][ref][band][1][0][t0];\n+ tokens[next][0].rate += token_costs[band][1][0][t0];\n tokens[next][0].token = ZERO_TOKEN;\n }\n if (t1 != EOB_TOKEN) {\n- tokens[next][1].rate +=\n- mb->token_costs[tx_size][type][ref][band][1][0][t1];\n+ tokens[next][1].rate += token_costs[band][1][0][t1];\n tokens[next][1].token = ZERO_TOKEN;\n }\n best_index[i][0] = best_index[i][1] = 0;\n@@ -326,8 +321,8 @@\n error1 = tokens[next][1].error;\n t0 = tokens[next][0].token;\n t1 = tokens[next][1].token;\n- rate0 += mb->token_costs[tx_size][type][ref][band][0][ctx][t0];\n- rate1 += mb->token_costs[tx_size][type][ref][band][0][ctx][t1];\n+ rate0 += token_costs[band][0][ctx][t0];\n+ rate1 += token_costs[band][0][ctx][t1];\n UPDATE_RD_COST();\n best = rd_cost1 < rd_cost0;\n \n"} {"commit":"906c1b4bd91ef5d3ba2bcecc359280ed0b31da45","subject":"changed to avoid code confusion","message":"changed to avoid code confusion\n\nThe previous double if and else code snippets were rather confusing.\n\nChange-Id: Id1b6152fa0e471beb9b20407aa406e109c1471e3\n","repos":"smarter\/aom,shacklettbp\/aom,n4t\/libvpx,shyamalschandra\/libvpx,abwiz0086\/webm.libvpx,ittiamvpx\/libvpx-1,ShiftMediaProject\/libvpx,gshORTON\/webm.libvpx,iniwf\/webm.libvpx,matanbs\/vp982,Topopiccione\/libvpx,vasilvv\/esvp8,zofuthan\/libvpx,matanbs\/vp982,vasilvv\/esvp8,goodleixiao\/vpx,mbebenita\/aom,turbulenz\/libvpx,liqianggao\/libvpx,thdav\/aom,kleopatra999\/webm.libvpx,openpeer\/libvpx_new,n4t\/libvpx,turbulenz\/libvpx,lyx2014\/libvpx_c,sanyaade-teachings\/libvpx,ittiamvpx\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,hsueceumd\/test_hui,shareefalis\/libvpx,luctrudeau\/aom,jacklicn\/webm.libvpx,altogother\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,kleopatra999\/webm.libvpx,matanbs\/webm.libvpx,n4t\/libvpx,jdm\/libvpx,matanbs\/vp982,Acidburn0zzz\/webm.libvpx,shyamalschandra\/libvpx,webmproject\/libvpx,pcwalton\/libvpx,turbulenz\/libvpx,ittiamvpx\/libvpx-1,kleopatra999\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,cinema6\/libvpx,kleopatra999\/webm.libvpx,shacklettbp\/aom,shyamalschandra\/libvpx,altogother\/webm.libvpx,running770\/libvpx,cinema6\/libvpx,altogother\/webm.libvpx,jdm\/libvpx,stewnorriss\/libvpx,gshORTON\/webm.libvpx,smarter\/aom,kim42083\/webm.libvpx,jmvalin\/aom,reimaginemedia\/webm.libvpx,mbebenita\/aom,mbebenita\/aom,Acidburn0zzz\/webm.libvpx,Topopiccione\/libvpx,iniwf\/webm.libvpx,sanyaade-teachings\/libvpx,matanbs\/webm.libvpx,webmproject\/libvpx,zofuthan\/libvpx,VTCSecureLLC\/libvpx,mwgoldsmith\/libvpx,lyx2014\/libvpx_c,Distrotech\/libvpx,goodleixiao\/vpx,stewnorriss\/libvpx,abwiz0086\/webm.libvpx,Maria1099\/webm.libvpx,ittiamvpx\/libvpx,liqianggao\/libvpx,GrokImageCompression\/aom,Acidburn0zzz\/webm.libvpx,Maria1099\/webm.libvpx,jacklicn\/webm.libvpx,mwgoldsmith\/libvpx,shyamalschandra\/libvpx,hsueceumd\/test_hui,sanyaade-teachings\/libvpx,kim42083\/webm.libvpx,Laknot\/libvpx,pcwalton\/libvpx,charup\/https---github.com-webmproject-libvpx-,matanbs\/vp982,pcwalton\/libvpx,running770\/libvpx,reimaginemedia\/webm.libvpx,felipebetancur\/libvpx,shacklettbp\/aom,matanbs\/vp982,cinema6\/libvpx,Laknot\/libvpx,matanbs\/webm.libvpx,reimaginemedia\/webm.libvpx,Suvarna1488\/webm.libvpx,mwgoldsmith\/vpx,goodleixiao\/vpx,stewnorriss\/libvpx,goodleixiao\/vpx,GrokImageCompression\/aom,vasilvv\/esvp8,jacklicn\/webm.libvpx,WebRTC-Labs\/libvpx,liqianggao\/libvpx,abwiz0086\/webm.libvpx,thdav\/aom,shacklettbp\/aom,webmproject\/libvpx,lyx2014\/libvpx_c,jacklicn\/webm.libvpx,jmvalin\/aom,luctrudeau\/aom,shacklettbp\/aom,matanbs\/webm.libvpx,matanbs\/webm.libvpx,hsueceumd\/test_hui,felipebetancur\/libvpx,pcwalton\/libvpx,mbebenita\/aom,Maria1099\/webm.libvpx,Distrotech\/libvpx,turbulenz\/libvpx,lyx2014\/libvpx_c,liqianggao\/libvpx,kalli123\/webm.libvpx,vasilvv\/esvp8,shareefalis\/libvpx,Acidburn0zzz\/webm.libvpx,Topopiccione\/libvpx,zofuthan\/libvpx,ittiamvpx\/libvpx,Acidburn0zzz\/webm.libvpx,mbebenita\/aom,luctrudeau\/aom,jdm\/libvpx,jacklicn\/webm.libvpx,liqianggao\/libvpx,Suvarna1488\/webm.libvpx,jdm\/libvpx,GrokImageCompression\/aom,GrokImageCompression\/aom,cinema6\/libvpx,mbebenita\/aom,WebRTC-Labs\/libvpx,mbebenita\/aom,Laknot\/libvpx,zofuthan\/libvpx,smarter\/aom,liqianggao\/libvpx,kleopatra999\/webm.libvpx,jacklicn\/webm.libvpx,mwgoldsmith\/vpx,kleopatra999\/webm.libvpx,Distrotech\/libvpx,turbulenz\/libvpx,goodleixiao\/vpx,felipebetancur\/libvpx,lyx2014\/libvpx_c,running770\/libvpx,WebRTC-Labs\/libvpx,iniwf\/webm.libvpx,hsueceumd\/test_hui,charup\/https---github.com-webmproject-libvpx-,vasilvv\/esvp8,kalli123\/webm.libvpx,stewnorriss\/libvpx,Laknot\/libvpx,jmvalin\/aom,altogother\/webm.libvpx,kalli123\/webm.libvpx,ShiftMediaProject\/libvpx,stewnorriss\/libvpx,sanyaade-teachings\/libvpx,shyamalschandra\/libvpx,abwiz0086\/webm.libvpx,hsueceumd\/test_hui,gshORTON\/webm.libvpx,gshORTON\/webm.libvpx,mwgoldsmith\/libvpx,openpeer\/libvpx_new,vasilvv\/esvp8,mwgoldsmith\/vpx,shareefalis\/libvpx,felipebetancur\/libvpx,smarter\/aom,openpeer\/libvpx_new,jmvalin\/aom,Topopiccione\/libvpx,ittiamvpx\/libvpx-1,Distrotech\/libvpx,ShiftMediaProject\/libvpx,altogother\/webm.libvpx,Suvarna1488\/webm.libvpx,jmvalin\/aom,lyx2014\/libvpx_c,shyamalschandra\/libvpx,gshORTON\/webm.libvpx,ittiamvpx\/libvpx-1,pcwalton\/libvpx,running770\/libvpx,turbulenz\/libvpx,VTCSecureLLC\/libvpx,matanbs\/vp982,shareefalis\/libvpx,luctrudeau\/aom,mwgoldsmith\/vpx,smarter\/aom,Suvarna1488\/webm.libvpx,luctrudeau\/aom,reimaginemedia\/webm.libvpx,Distrotech\/libvpx,mbebenita\/aom,Acidburn0zzz\/webm.libvpx,Distrotech\/libvpx,ittiamvpx\/libvpx-1,Topopiccione\/libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx,matanbs\/webm.libvpx,ittiamvpx\/libvpx,Suvarna1488\/webm.libvpx,vasilvv\/esvp8,altogother\/webm.libvpx,Suvarna1488\/webm.libvpx,VTCSecureLLC\/libvpx,turbulenz\/libvpx,Laknot\/libvpx,VTCSecureLLC\/libvpx,felipebetancur\/libvpx,gshORTON\/webm.libvpx,webmproject\/libvpx,thdav\/aom,WebRTC-Labs\/libvpx,kalli123\/webm.libvpx,VTCSecureLLC\/libvpx,kalli123\/webm.libvpx,mwgoldsmith\/vpx,iniwf\/webm.libvpx,jdm\/libvpx,felipebetancur\/libvpx,charup\/https---github.com-webmproject-libvpx-,VTCSecureLLC\/libvpx,Maria1099\/webm.libvpx,jmvalin\/aom,shareefalis\/libvpx,abwiz0086\/webm.libvpx,abwiz0086\/webm.libvpx,reimaginemedia\/webm.libvpx,shareefalis\/libvpx,Laknot\/libvpx,ittiamvpx\/libvpx-1,goodleixiao\/vpx,n4t\/libvpx,cinema6\/libvpx,reimaginemedia\/webm.libvpx,kim42083\/webm.libvpx,running770\/libvpx,turbulenz\/libvpx,iniwf\/webm.libvpx,mwgoldsmith\/libvpx,n4t\/libvpx,matanbs\/vp982,pcwalton\/libvpx,cinema6\/libvpx,stewnorriss\/libvpx,shacklettbp\/aom,WebRTC-Labs\/libvpx,kalli123\/webm.libvpx,openpeer\/libvpx_new,iniwf\/webm.libvpx,luctrudeau\/aom,zofuthan\/libvpx,kim42083\/webm.libvpx,openpeer\/libvpx_new,smarter\/aom,charup\/https---github.com-webmproject-libvpx-,webmproject\/libvpx,mbebenita\/aom,thdav\/aom,mwgoldsmith\/libvpx,thdav\/aom,zofuthan\/libvpx,turbulenz\/libvpx,webmproject\/libvpx,Maria1099\/webm.libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,kim42083\/webm.libvpx,GrokImageCompression\/aom,running770\/libvpx,cinema6\/libvpx,Maria1099\/webm.libvpx,openpeer\/libvpx_new,Topopiccione\/libvpx,hsueceumd\/test_hui,thdav\/aom,jdm\/libvpx,kim42083\/webm.libvpx,sanyaade-teachings\/libvpx,ittiamvpx\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp8\/common\/findnearmv.c\n+++ vp8\/common\/findnearmv.c\n@@ -241,11 +241,10 @@\n \n \/\/ If we see a 0,0 vector for a second time we have reached the end of\n \/\/ the list of valid candidate vectors.\n- if (!this_mv.as_int)\n- if (zero_seen)\n- break;\n- else\n- zero_seen = TRUE;\n+ if (!this_mv.as_int && zero_seen)\n+ break;\n+\n+ zero_seen = zero_seen || !this_mv.as_int;\n \n vp8_clamp_mv(&this_mv,\n xd->mb_to_left_edge - LEFT_TOP_MARGIN + 16,\n"} {"commit":"e33de44420ab116a67e1ad6e997fffd35aa138ad","subject":"simplify rbgobj_lookup_class_by_gtype() a bit.","message":"simplify rbgobj_lookup_class_by_gtype() a bit.\n\n","repos":"benolee\/ruby-gnome2,benolee\/ruby-gnome2,benolee\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- glib\/src\/rbgobj_type.c\n+++ glib\/src\/rbgobj_type.c\n@@ -3,8 +3,8 @@\n \n rbgobj_type.c -\n \n- $Author: mutoh $\n- $Date: 2006\/05\/14 10:04:04 $\n+ $Author: sakai $\n+ $Date: 2006\/05\/26 15:33:15 $\n created at: Sun Jun 9 20:31:47 JST 2002\n \n Copyright (C) 2002-2006 Ruby-GNOME2 Project Team\n@@ -121,12 +121,8 @@\n case G_TYPE_OBJECT:\n case G_TYPE_ENUM:\n case G_TYPE_FLAGS:\n- if (NIL_P(parent)){\n- cinfo->klass = rb_funcall(rb_cClass, id_new, 1,\n- get_superclass(gtype));\n- } else {\n- cinfo->klass = rb_funcall(rb_cClass, id_new, 1, parent);\n- }\n+ if (NIL_P(parent)) parent = get_superclass(gtype);\n+ cinfo->klass = rb_funcall(rb_cClass, id_new, 1, parent);\n break;\n \n case G_TYPE_INTERFACE:\n@@ -136,12 +132,8 @@\n default:\n \/* we should raise exception? *\/\n if (rbgobj_fund_has_type(G_TYPE_FUNDAMENTAL(gtype))) {\n- if (NIL_P(parent)) {\n- cinfo->klass = rb_funcall(rb_cClass, id_new, 1,\n- get_superclass(gtype));\n- } else {\n+ if (NIL_P(parent)) parent = get_superclass(gtype);\n cinfo->klass = rb_funcall(rb_cClass, id_new, 1, parent);\n- }\n } else {\n fprintf(stderr,\n \"%s: %s's fundamental type %s isn't supported\\n\",\n"} {"commit":"b1d85bf60f85a5b2f049d6a13c69f129ab740b7a","subject":"vp8: align left pixel array by 16 bytes.","message":"vp8: align left pixel array by 16 bytes.\n\nThe x86 simd expects this. Identical alignment can be found in vp9\nand vp10 also. Fixes crashes on 32bit x86 systems.\n\nChange-Id: I229c88d8f696acbef5337c8fa9503528df4e1c40\n","repos":"smarter\/aom,luctrudeau\/aom,ShiftMediaProject\/libvpx,openpeer\/libvpx_new,shacklettbp\/aom,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,GrokImageCompression\/aom,mwgoldsmith\/libvpx,thdav\/aom,mbebenita\/aom,mwgoldsmith\/vpx,luctrudeau\/aom,GrokImageCompression\/aom,thdav\/aom,Topopiccione\/libvpx,mwgoldsmith\/vpx,Topopiccione\/libvpx,ShiftMediaProject\/libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx-1,luctrudeau\/aom,webmproject\/libvpx,luctrudeau\/aom,mbebenita\/aom,openpeer\/libvpx_new,Topopiccione\/libvpx,mwgoldsmith\/vpx,GrokImageCompression\/aom,mwgoldsmith\/vpx,ShiftMediaProject\/libvpx,luctrudeau\/aom,smarter\/aom,mbebenita\/aom,Topopiccione\/libvpx,mbebenita\/aom,luctrudeau\/aom,mwgoldsmith\/libvpx,openpeer\/libvpx_new,jmvalin\/aom,shacklettbp\/aom,Topopiccione\/libvpx,openpeer\/libvpx_new,shacklettbp\/aom,webmproject\/libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx-1,thdav\/aom,mwgoldsmith\/vpx,webmproject\/libvpx,jmvalin\/aom,ittiamvpx\/libvpx-1,thdav\/aom,ittiamvpx\/libvpx-1,mbebenita\/aom,mwgoldsmith\/libvpx,jmvalin\/aom,mwgoldsmith\/libvpx,mwgoldsmith\/libvpx,shacklettbp\/aom,ittiamvpx\/libvpx-1,mbebenita\/aom,shacklettbp\/aom,openpeer\/libvpx_new,mwgoldsmith\/libvpx,smarter\/aom,webmproject\/libvpx,thdav\/aom,mbebenita\/aom,webmproject\/libvpx,ittiamvpx\/libvpx-1,webmproject\/libvpx,GrokImageCompression\/aom,mbebenita\/aom,jmvalin\/aom,Topopiccione\/libvpx,openpeer\/libvpx_new,smarter\/aom,jmvalin\/aom,jmvalin\/aom,mbebenita\/aom,mwgoldsmith\/vpx,shacklettbp\/aom,smarter\/aom,thdav\/aom,smarter\/aom","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp8\/common\/reconintra.c\n+++ vp8\/common\/reconintra.c\n@@ -55,7 +55,7 @@\n int y_stride)\n {\n MB_PREDICTION_MODE mode = x->mode_info_context->mbmi.mode;\n- unsigned char yleft_col[16];\n+ DECLARE_ALIGNED(16, uint8_t, yleft_col[16]);\n int i;\n intra_pred_fn fn;\n \n"} {"commit":"9594370e0cdc6a35ee3254994fb05204e99449b5","subject":"Update VP8DX_BOOL_DECODER_FILL to better detect EOS","message":"Update VP8DX_BOOL_DECODER_FILL to better detect EOS\n\nAllow more reliable detection of truncated bitstreams by being more\nprecise with the count of \"virtual\" bits in the value buffer.\nSpecifically, the VP8_LOTS_OF_BITS value is accumulated into count,\nrather than being assigned, which was losing the prior value,\nincreasing the required tolerance when testing for the error condition.\n\nChange-Id: Ib5172eaa57323b939c439fff8a8ab5fa38da9b69\n","repos":"kleopatra999\/webm.libvpx,goodleixiao\/vpx,kim42083\/webm.libvpx,VTCSecureLLC\/libvpx,thdav\/aom,Laknot\/libvpx,mbebenita\/aom,luctrudeau\/aom,pcwalton\/libvpx,Suvarna1488\/webm.libvpx,jmvalin\/aom,Maria1099\/webm.libvpx,goodleixiao\/vpx,genesi\/libvpx0,shacklettbp\/aom,mwgoldsmith\/vpx,mwgoldsmith\/vpx,smarter\/aom,jacklicn\/webm.libvpx,kleopatra999\/webm.libvpx,webmproject\/libvpx,ittiamvpx\/libvpx-1,Acidburn0zzz\/webm.libvpx,luctrudeau\/aom,jmvalin\/aom,Laknot\/libvpx,charup\/https---github.com-webmproject-libvpx-,jacklicn\/webm.libvpx,hsueceumd\/test_hui,ittiamvpx\/libvpx,cinema6\/libvpx,Suvarna1488\/webm.libvpx,stewnorriss\/libvpx,goodleixiao\/vpx,smarter\/aom,kim42083\/webm.libvpx,Acidburn0zzz\/webm.libvpx,n4t\/libvpx,mwgoldsmith\/vpx,running770\/libvpx,turbulenz\/libvpx,lyx2014\/libvpx_c,Maria1099\/webm.libvpx,luctrudeau\/aom,shyamalschandra\/libvpx,vasilvv\/esvp8,turbulenz\/libvpx,vasilvv\/esvp8,thdav\/aom,jdm\/libvpx,altogother\/webm.libvpx,n4t\/libvpx,openpeer\/libvpx_new,stewnorriss\/libvpx,enmasse-entertainment\/libvpx,felipebetancur\/libvpx,felipebetancur\/libvpx,felipebetancur\/libvpx,thdav\/aom,gshORTON\/webm.libvpx,Topopiccione\/libvpx,reimaginemedia\/webm.libvpx,jmvalin\/aom,kalli123\/webm.libvpx,turbulenz\/libvpx,VTCSecureLLC\/libvpx,abwiz0086\/webm.libvpx,jacklicn\/webm.libvpx,shacklettbp\/aom,abwiz0086\/webm.libvpx,zofuthan\/libvpx,Laknot\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,shyamalschandra\/libvpx,kalli123\/webm.libvpx,matanbs\/webm.libvpx,Distrotech\/libvpx,n4t\/libvpx,stewnorriss\/libvpx,running770\/libvpx,abwiz0086\/webm.libvpx,jdm\/libvpx,mbebenita\/aom,Topopiccione\/libvpx,Topopiccione\/libvpx,vasilvv\/esvp8,matanbs\/webm.libvpx,Suvarna1488\/webm.libvpx,matanbs\/vp982,Maria1099\/webm.libvpx,turbulenz\/libvpx,Laknot\/libvpx,shareefalis\/libvpx,mwgoldsmith\/vpx,enmasse-entertainment\/libvpx,matanbs\/webm.libvpx,iniwf\/webm.libvpx,smarter\/aom,ShiftMediaProject\/libvpx,running770\/libvpx,ittiamvpx\/libvpx,reimaginemedia\/webm.libvpx,luctrudeau\/aom,ShiftMediaProject\/libvpx,cinema6\/libvpx,liqianggao\/libvpx,mbebenita\/aom,shyamalschandra\/libvpx,webmproject\/libvpx,matanbs\/vp982,shacklettbp\/aom,felipebetancur\/libvpx,openpeer\/libvpx_new,altogother\/webm.libvpx,stewnorriss\/libvpx,Suvarna1488\/webm.libvpx,ittiamvpx\/libvpx-1,GrokImageCompression\/aom,zofuthan\/libvpx,pcwalton\/libvpx,felipebetancur\/libvpx,altogother\/webm.libvpx,jdm\/libvpx,mwgoldsmith\/libvpx,lyx2014\/libvpx_c,jacklicn\/webm.libvpx,mwgoldsmith\/libvpx,turbulenz\/libvpx,Laknot\/libvpx,kalli123\/webm.libvpx,mbebenita\/aom,WebRTC-Labs\/libvpx,enmasse-entertainment\/libvpx,goodleixiao\/vpx,openpeer\/libvpx_new,zofuthan\/libvpx,mwgoldsmith\/libvpx,awatry\/libvpx.opencl,kalli123\/webm.libvpx,enmasse-entertainment\/libvpx,felipebetancur\/libvpx,ShiftMediaProject\/libvpx,Maria1099\/webm.libvpx,mwgoldsmith\/libvpx,matanbs\/webm.libvpx,jmvalin\/aom,gshORTON\/webm.libvpx,zofuthan\/libvpx,iniwf\/webm.libvpx,thdav\/aom,mbebenita\/aom,stewnorriss\/libvpx,running770\/libvpx,liqianggao\/libvpx,jdm\/libvpx,gshORTON\/webm.libvpx,Maria1099\/webm.libvpx,shyamalschandra\/libvpx,matanbs\/vp982,charup\/https---github.com-webmproject-libvpx-,charup\/https---github.com-webmproject-libvpx-,sanyaade-teachings\/libvpx,enmasse-entertainment\/libvpx,vasilvv\/esvp8,Acidburn0zzz\/webm.libvpx,pcwalton\/libvpx,liqianggao\/libvpx,goodleixiao\/vpx,turbulenz\/libvpx,turbulenz\/libvpx,genesi\/libvpx0,jdm\/libvpx,shareefalis\/libvpx,iniwf\/webm.libvpx,Topopiccione\/libvpx,jmvalin\/aom,liqianggao\/libvpx,liqianggao\/libvpx,WebRTC-Labs\/libvpx,shareefalis\/libvpx,genesi\/libvpx0,shacklettbp\/aom,Laknot\/libvpx,jacklicn\/webm.libvpx,altogother\/webm.libvpx,kalli123\/webm.libvpx,gshORTON\/webm.libvpx,reimaginemedia\/webm.libvpx,WebRTC-Labs\/libvpx,charup\/https---github.com-webmproject-libvpx-,kim42083\/webm.libvpx,hsueceumd\/test_hui,charup\/https---github.com-webmproject-libvpx-,rikaunite\/gst-opera_libvpx,jdm\/libvpx,running770\/libvpx,cinema6\/libvpx,cinema6\/libvpx,Distrotech\/libvpx,abwiz0086\/webm.libvpx,WebRTC-Labs\/libvpx,gshORTON\/webm.libvpx,VTCSecureLLC\/libvpx,mwgoldsmith\/vpx,sanyaade-teachings\/libvpx,genesi\/libvpx0,ittiamvpx\/libvpx,Distrotech\/libvpx,jacklicn\/webm.libvpx,Maria1099\/webm.libvpx,pcwalton\/libvpx,ittiamvpx\/libvpx-1,Acidburn0zzz\/webm.libvpx,hsueceumd\/test_hui,matanbs\/vp982,Suvarna1488\/webm.libvpx,ShiftMediaProject\/libvpx,n4t\/libvpx,altogother\/webm.libvpx,shareefalis\/libvpx,openpeer\/libvpx_new,hsueceumd\/test_hui,awatry\/libvpx.opencl,shareefalis\/libvpx,cinema6\/libvpx,lyx2014\/libvpx_c,running770\/libvpx,gshORTON\/webm.libvpx,smarter\/aom,Topopiccione\/libvpx,mbebenita\/aom,openpeer\/libvpx_new,jmvalin\/aom,turbulenz\/libvpx,thdav\/aom,vasilvv\/esvp8,VTCSecureLLC\/libvpx,cinema6\/libvpx,openpeer\/libvpx_new,kalli123\/webm.libvpx,vasilvv\/esvp8,altogother\/webm.libvpx,shacklettbp\/aom,reimaginemedia\/webm.libvpx,Suvarna1488\/webm.libvpx,shyamalschandra\/libvpx,reimaginemedia\/webm.libvpx,webmproject\/libvpx,mwgoldsmith\/libvpx,GrokImageCompression\/aom,rikaunite\/gst-opera_libvpx,ittiamvpx\/libvpx-1,kleopatra999\/webm.libvpx,matanbs\/vp982,matanbs\/vp982,genesi\/libvpx0,rikaunite\/gst-opera_libvpx,sanyaade-teachings\/libvpx,matanbs\/webm.libvpx,matanbs\/webm.libvpx,hsueceumd\/test_hui,webmproject\/libvpx,Distrotech\/libvpx,reimaginemedia\/webm.libvpx,ittiamvpx\/libvpx,liqianggao\/libvpx,shyamalschandra\/libvpx,kleopatra999\/webm.libvpx,webmproject\/libvpx,matanbs\/vp982,pcwalton\/libvpx,vasilvv\/esvp8,sanyaade-teachings\/libvpx,GrokImageCompression\/aom,Distrotech\/libvpx,kim42083\/webm.libvpx,iniwf\/webm.libvpx,ittiamvpx\/libvpx,ShiftMediaProject\/libvpx,kleopatra999\/webm.libvpx,zofuthan\/libvpx,goodleixiao\/vpx,cinema6\/libvpx,iniwf\/webm.libvpx,sanyaade-teachings\/libvpx,iniwf\/webm.libvpx,n4t\/libvpx,abwiz0086\/webm.libvpx,awatry\/libvpx.opencl,webmproject\/libvpx,Distrotech\/libvpx,thdav\/aom,Acidburn0zzz\/webm.libvpx,GrokImageCompression\/aom,GrokImageCompression\/aom,ittiamvpx\/libvpx-1,VTCSecureLLC\/libvpx,GrokImageCompression\/aom,kleopatra999\/webm.libvpx,VTCSecureLLC\/libvpx,Acidburn0zzz\/webm.libvpx,rikaunite\/gst-opera_libvpx,mbebenita\/aom,mbebenita\/aom,lyx2014\/libvpx_c,ittiamvpx\/libvpx-1,abwiz0086\/webm.libvpx,zofuthan\/libvpx,shareefalis\/libvpx,rikaunite\/gst-opera_libvpx,mbebenita\/aom,kim42083\/webm.libvpx,lyx2014\/libvpx_c,lyx2014\/libvpx_c,awatry\/libvpx.opencl,smarter\/aom,genesi\/libvpx0,Topopiccione\/libvpx,kim42083\/webm.libvpx,turbulenz\/libvpx,luctrudeau\/aom,luctrudeau\/aom,shacklettbp\/aom,WebRTC-Labs\/libvpx,stewnorriss\/libvpx,smarter\/aom,charup\/https---github.com-webmproject-libvpx-,pcwalton\/libvpx,ittiamvpx\/libvpx,hsueceumd\/test_hui","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp8\/decoder\/dboolhuff.h\n+++ vp8\/decoder\/dboolhuff.h\n@@ -55,7 +55,7 @@\n for(shift = VP8_BD_VALUE_SIZE - 8 - ((_count) + 8); shift >= 0; ) \\\n { \\\n if((_bufptr) >= (_bufend)) { \\\n- (_count) = VP8_LOTS_OF_BITS; \\\n+ (_count) += VP8_LOTS_OF_BITS; \\\n break; \\\n } \\\n (_count) += 8; \\\n@@ -119,18 +119,19 @@\n \n static int vp8dx_bool_error(BOOL_DECODER *br)\n {\n- \/* Check if we have reached the end of the buffer.\n- *\n- * Variable 'count' stores the number of bits in the 'value' buffer,\n- * minus 8. So if count == 8, there are 16 bits available to be read.\n- * Normally, count is filled with 8 and one byte is filled into the\n- * value buffer. When we reach the end of the buffer, count is instead\n- * filled with VP8_LOTS_OF_BITS, 8 of which represent the last 8 real\n- * bits from the bitstream. So the last bit in the bitstream will be\n- * represented by count == VP8_LOTS_OF_BITS - 16.\n- *\/\n- if ((br->count > VP8_BD_VALUE_SIZE)\n- && (br->count <= VP8_LOTS_OF_BITS - 16))\n+ \/* Check if we have reached the end of the buffer.\n+ *\n+ * Variable 'count' stores the number of bits in the 'value' buffer, minus\n+ * 8. The top byte is part of the algorithm, and the remainder is buffered\n+ * to be shifted into it. So if count == 8, the top 16 bits of 'value' are\n+ * occupied, 8 for the algorithm and 8 in the buffer.\n+ *\n+ * When reading a byte from the user's buffer, count is filled with 8 and\n+ * one byte is filled into the value buffer. When we reach the end of the\n+ * data, count is additionally filled with VP8_LOTS_OF_BITS. So when\n+ * count == VP8_LOTS_OF_BITS - 1, the user's data has been exhausted.\n+ *\/\n+ if ((br->count > VP8_BD_VALUE_SIZE) && (br->count < VP8_LOTS_OF_BITS))\n {\n \/* We have tried to decode bits after the end of\n * stream was encountered.\n"} {"commit":"726d1b841b8101fbfa75eb9832e9baa9e477c1d5","subject":"Minor adjustment in diagonal sub-pixel point checking","message":"Minor adjustment in diagonal sub-pixel point checking\n\nChoose a different diagonal point to check when the two costs are\nthe same, making it consistent with the way we choose the best mv.\nThis slightly changes the encoding result, and the derflr set borg\ntest at speed 0 shows 0.027% Overall PSNR gain, 0.024% Avg PSNR\ngain, and 0.043% SSIM gain.\n\nChange-Id: Ic8ee3a6767394866d159e4f9e1c777604dd73c17\n","repos":"VTCSecureLLC\/libvpx,felipebetancur\/libvpx,shyamalschandra\/libvpx,thdav\/aom,ShiftMediaProject\/libvpx,shacklettbp\/aom,smarter\/aom,jmvalin\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,shyamalschandra\/libvpx,webmproject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,VTCSecureLLC\/libvpx,webmproject\/libvpx,thdav\/aom,mwgoldsmith\/libvpx,zofuthan\/libvpx,webmproject\/libvpx,mwgoldsmith\/libvpx,zofuthan\/libvpx,shyamalschandra\/libvpx,shyamalschandra\/libvpx,felipebetancur\/libvpx,Topopiccione\/libvpx,openpeer\/libvpx_new,ittiamvpx\/libvpx-1,jmvalin\/aom,liqianggao\/libvpx,luctrudeau\/aom,ShiftMediaProject\/libvpx,ittiamvpx\/libvpx-1,smarter\/aom,mbebenita\/aom,mbebenita\/aom,shacklettbp\/aom,openpeer\/libvpx_new,GrokImageCompression\/aom,smarter\/aom,shacklettbp\/aom,VTCSecureLLC\/libvpx,liqianggao\/libvpx,mbebenita\/aom,mwgoldsmith\/vpx,running770\/libvpx,ittiamvpx\/libvpx-1,luctrudeau\/aom,openpeer\/libvpx_new,Topopiccione\/libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx-1,mbebenita\/aom,running770\/libvpx,GrokImageCompression\/aom,smarter\/aom,mwgoldsmith\/vpx,VTCSecureLLC\/libvpx,felipebetancur\/libvpx,running770\/libvpx,mwgoldsmith\/libvpx,zofuthan\/libvpx,jmvalin\/aom,mwgoldsmith\/vpx,running770\/libvpx,Topopiccione\/libvpx,luctrudeau\/aom,liqianggao\/libvpx,shacklettbp\/aom,thdav\/aom,ShiftMediaProject\/libvpx,mbebenita\/aom,zofuthan\/libvpx,zofuthan\/libvpx,jmvalin\/aom,luctrudeau\/aom,jmvalin\/aom,ittiamvpx\/libvpx-1,running770\/libvpx,mwgoldsmith\/vpx,zofuthan\/libvpx,mwgoldsmith\/libvpx,liqianggao\/libvpx,openpeer\/libvpx_new,mwgoldsmith\/vpx,luctrudeau\/aom,luctrudeau\/aom,felipebetancur\/libvpx,shacklettbp\/aom,VTCSecureLLC\/libvpx,shacklettbp\/aom,openpeer\/libvpx_new,webmproject\/libvpx,liqianggao\/libvpx,running770\/libvpx,mbebenita\/aom,smarter\/aom,thdav\/aom,felipebetancur\/libvpx,ShiftMediaProject\/libvpx,mwgoldsmith\/libvpx,jmvalin\/aom,VTCSecureLLC\/libvpx,mwgoldsmith\/vpx,GrokImageCompression\/aom,Topopiccione\/libvpx,liqianggao\/libvpx,thdav\/aom,mbebenita\/aom,shyamalschandra\/libvpx,Topopiccione\/libvpx,thdav\/aom,ittiamvpx\/libvpx-1,mbebenita\/aom,mbebenita\/aom,felipebetancur\/libvpx,mwgoldsmith\/libvpx,openpeer\/libvpx_new,Topopiccione\/libvpx,ShiftMediaProject\/libvpx,shyamalschandra\/libvpx,smarter\/aom","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_mcomp.c\n+++ vp9\/encoder\/vp9_mcomp.c\n@@ -703,8 +703,8 @@\n }\n \n \/\/ Check diagonal sub-pixel position\n- tc = bc + (cost_array[0] < cost_array[1] ? -hstep : hstep);\n- tr = br + (cost_array[2] < cost_array[3] ? -hstep : hstep);\n+ tc = bc + (cost_array[0] <= cost_array[1] ? -hstep : hstep);\n+ tr = br + (cost_array[2] <= cost_array[3] ? -hstep : hstep);\n if (tc >= minc && tc <= maxc && tr >= minr && tr <= maxr) {\n const uint8_t *const pre_address = y + (tr >> 3) * y_stride + (tc >> 3);\n MV this_mv = {tr, tc};\n"} {"commit":"7d7818aed66c04e0764d8649f89d4101378026b8","subject":"Remove a lot of printfs. Addresses #1195.","message":"Remove a lot of printfs. Addresses #1195.\n\ngit-svn-id: 245a047bdc941a0af057fa9b6981311888c8bb16@6885 c7de825b-a66e-492c-adef-691d508d4ae1\n","repos":"natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,percona\/PerconaFT,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,BohuTANG\/ft-index,ollie314\/server,ollie314\/server,kuszmaul\/PerconaFT-tmp,ottok\/PerconaFT,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,ottok\/PerconaFT,ollie314\/server,kuszmaul\/PerconaFT,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT-tmp,percona\/PerconaFT,ollie314\/server,davidl-zend\/zenddbi,percona\/PerconaFT,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT-tmp,percona\/PerconaFT,davidl-zend\/zenddbi,davidl-zend\/zenddbi,BohuTANG\/ft-index,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ottok\/PerconaFT,flynn1973\/mariadb-aix,BohuTANG\/ft-index,natsys\/mariadb_10.2,kuszmaul\/PerconaFT,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,ottok\/PerconaFT,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,davidl-zend\/zenddbi,kuszmaul\/PerconaFT-tmp,slanterns\/server,kuszmaul\/PerconaFT,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,BohuTANG\/ft-index","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- newbrt\/brt.c\n+++ newbrt\/brt.c\n@@ -397,7 +397,7 @@\n BRTNODE B;\n int r;\n \n- printf(\"%s:%d splitting leaf %\" PRIu64 \" which is size %u (targetsize = %u)\\n\", __FILE__, __LINE__, node->thisnodename.b, toku_serialize_brtnode_size(node), node->nodesize);\n+ \/\/printf(\"%s:%d splitting leaf %\" PRIu64 \" which is size %u (targetsize = %u)\\n\", __FILE__, __LINE__, node->thisnodename.b, toku_serialize_brtnode_size(node), node->nodesize);\n \n assert(node->height==0);\n assert(t->h->nodesize>=node->nodesize); \/* otherwise we might be in trouble because the nodesize shrank. *\/\n@@ -501,9 +501,9 @@\n *nodea = node;\n *nodeb = B;\n \n- printf(\"%s:%d new sizes Node %\" PRIu64 \" size=%u omtsize=%d dirty=%d; Node %\" PRIu64 \" size=%u omtsize=%d dirty=%d\\n\", __FILE__, __LINE__,\n-\t node->thisnodename.b, toku_serialize_brtnode_size(node), node->height==0 ? (int)(toku_omt_size(node->u.l.buffer)) : -1, node->dirty,\n-\t B ->thisnodename.b, toku_serialize_brtnode_size(B ), B ->height==0 ? (int)(toku_omt_size(B ->u.l.buffer)) : -1, B->dirty);\n+ \/\/printf(\"%s:%d new sizes Node %\" PRIu64 \" size=%u omtsize=%d dirty=%d; Node %\" PRIu64 \" size=%u omtsize=%d dirty=%d\\n\", __FILE__, __LINE__,\n+ \/\/\t node->thisnodename.b, toku_serialize_brtnode_size(node), node->height==0 ? (int)(toku_omt_size(node->u.l.buffer)) : -1, node->dirty,\n+ \/\/\t B ->thisnodename.b, toku_serialize_brtnode_size(B ), B ->height==0 ? (int)(toku_omt_size(B ->u.l.buffer)) : -1, B->dirty);\n \/\/toku_dump_brtnode(t, node->thisnodename, 0, NULL, 0, NULL, 0);\n \/\/toku_dump_brtnode(t, B ->thisnodename, 0, NULL, 0, NULL, 0);\n return 0;\n@@ -1277,9 +1277,9 @@\n \/\/verify_local_fingerprint_nonleaf(child);\n VERIFY_NODE(child);\n \/\/printf(\"%s:%d height=%d n_bytes_in_buffer = {%d, %d, %d, ...}\\n\", __FILE__, __LINE__, child->height, child->n_bytes_in_buffer[0], child->n_bytes_in_buffer[1], child->n_bytes_in_buffer[2]);\n- printf(\"%s:%d before pushing into Node %\" PRIu64 \", disksize=%d\", __FILE__, __LINE__, child->thisnodename.b, toku_serialize_brtnode_size(child));\n- if (child->height==0) printf(\" omtsize=%d\", toku_omt_size(child->u.l.buffer));\n- printf(\"\\n\");\n+ \/\/printf(\"%s:%d before pushing into Node %\" PRIu64 \", disksize=%d\", __FILE__, __LINE__, child->thisnodename.b, toku_serialize_brtnode_size(child));\n+ \/\/if (child->height==0) printf(\" omtsize=%d\", toku_omt_size(child->u.l.buffer));\n+ \/\/printf(\"\\n\");\n assert(toku_serialize_brtnode_size(child)<=child->nodesize);\n if (child->height>0 && child->u.n.n_children>0) assert(BNC_BLOCKNUM(child, child->u.n.n_children-1).b!=0);\n \n@@ -1331,9 +1331,9 @@\n }\n assert(toku_serialize_brtnode_size(node)<=node->nodesize);\n \/\/verify_local_fingerprint_nonleaf(node);\n- printf(\"%s:%d after pushing %d into Node %\" PRIu64 \", disksize=%d\", __FILE__, __LINE__, pushed_count, child->thisnodename.b, toku_serialize_brtnode_size(child));\n- if (child->height==0) printf(\" omtsize=%d\", toku_omt_size(child->u.l.buffer));\n- printf(\"\\n\");\n+ \/\/printf(\"%s:%d after pushing %d into Node %\" PRIu64 \", disksize=%d\", __FILE__, __LINE__, pushed_count, child->thisnodename.b, toku_serialize_brtnode_size(child));\n+ \/\/if (child->height==0) printf(\" omtsize=%d\", toku_omt_size(child->u.l.buffer));\n+ \/\/printf(\"\\n\");\n r=toku_unpin_brtnode(t, child);\n if (r!=0) return r;\n *must_split = some_must_split;\n@@ -2161,7 +2161,7 @@\n return 0;\n }\n \n-static int\n+static inline int\n brt_serialize_size_of_child (BRT t, BRTNODE node, int childnum) {\n assert(node->height>0);\n BLOCKNUM childblocknum = BNC_BLOCKNUM(node, childnum);\n@@ -2180,7 +2180,7 @@\n \/\/ Return the new fanout of node.\n static int\n brt_nonleaf_maybe_split_or_merge (BRT t, BRTNODE node, int childnum, BOOL should_split, BOOL should_merge, TOKULOGGER logger, u_int32_t *new_fanout) {\n- printf(\"%s:%d Node %\" PRIu64 \" is size %d, child %d is Node %\" PRIu64 \" size is %d\\n\", __FILE__, __LINE__, node->thisnodename.b, toku_serialize_brtnode_size(node), childnum, BNC_BLOCKNUM(node, childnum).b, brt_serialize_size_of_child(t, node, childnum));\n+ \/\/printf(\"%s:%d Node %\" PRIu64 \" is size %d, child %d is Node %\" PRIu64 \" size is %d\\n\", __FILE__, __LINE__, node->thisnodename.b, toku_serialize_brtnode_size(node), childnum, BNC_BLOCKNUM(node, childnum).b, brt_serialize_size_of_child(t, node, childnum));\n assert(!(should_split && should_merge));\n if (should_split) { int r = brt_split_child(t, node, childnum, logger); if (r!=0) return r; }\n if (should_merge) { int r = merge(); if (r!=0) return r; }\n@@ -2230,7 +2230,7 @@\n \tBOOL must_split MAYBE_INIT(FALSE);\n \tBOOL must_merge MAYBE_INIT(FALSE);\n \tfind_heaviest_child(node, &biggest_child);\n-\tprintf(\"%s:%d Pushing into child %d (Node %\" PRIu64 \", size %d)\\n\", __FILE__, __LINE__, biggest_child, BNC_BLOCKNUM(node, biggest_child).b, brt_serialize_size_of_child(t, node, biggest_child));\n+\t\/\/printf(\"%s:%d Pushing into child %d (Node %\" PRIu64 \", size %d)\\n\", __FILE__, __LINE__, biggest_child, BNC_BLOCKNUM(node, biggest_child).b, brt_serialize_size_of_child(t, node, biggest_child));\n \tint r = push_some_brt_cmds_down_simple(t, node, biggest_child, &must_split, &must_merge, logger);\n \tif (r!=0) return r;\n \treturn brt_nonleaf_maybe_split_or_merge(t, node, biggest_child, must_split, must_merge, logger, new_fanout);\n"} {"commit":"0b6440ce02fb165965da8ff6558c9c887dcd3b88","subject":"Cleaning up vp9_refining_search_sadx4().","message":"Cleaning up vp9_refining_search_sadx4().\n\nChange-Id: I3ed0a95645a66be069ce92a1fad8083a87d01001\n","repos":"luctrudeau\/aom,abwiz0086\/webm.libvpx,GrokImageCompression\/aom,kleopatra999\/webm.libvpx,kleopatra999\/webm.libvpx,kim42083\/webm.libvpx,kalli123\/webm.libvpx,shacklettbp\/aom,mwgoldsmith\/vpx,running770\/libvpx,zofuthan\/libvpx,VTCSecureLLC\/libvpx,shyamalschandra\/libvpx,mwgoldsmith\/vpx,GrokImageCompression\/aom,n4t\/libvpx,Maria1099\/webm.libvpx,Topopiccione\/libvpx,kleopatra999\/webm.libvpx,felipebetancur\/libvpx,shyamalschandra\/libvpx,webmproject\/libvpx,reimaginemedia\/webm.libvpx,jacklicn\/webm.libvpx,stewnorriss\/libvpx,running770\/libvpx,liqianggao\/libvpx,openpeer\/libvpx_new,luctrudeau\/aom,VTCSecureLLC\/libvpx,reimaginemedia\/webm.libvpx,running770\/libvpx,Laknot\/libvpx,Maria1099\/webm.libvpx,Topopiccione\/libvpx,Maria1099\/webm.libvpx,gshORTON\/webm.libvpx,shacklettbp\/aom,shacklettbp\/aom,charup\/https---github.com-webmproject-libvpx-,jacklicn\/webm.libvpx,matanbs\/vp982,kleopatra999\/webm.libvpx,Laknot\/libvpx,smarter\/aom,altogother\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,smarter\/aom,abwiz0086\/webm.libvpx,Suvarna1488\/webm.libvpx,shacklettbp\/aom,shareefalis\/libvpx,mwgoldsmith\/vpx,Distrotech\/libvpx,GrokImageCompression\/aom,pcwalton\/libvpx,Distrotech\/libvpx,matanbs\/webm.libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/libvpx,Laknot\/libvpx,mbebenita\/aom,felipebetancur\/libvpx,iniwf\/webm.libvpx,smarter\/aom,shyamalschandra\/libvpx,gshORTON\/webm.libvpx,altogother\/webm.libvpx,gshORTON\/webm.libvpx,VTCSecureLLC\/libvpx,jmvalin\/aom,running770\/libvpx,jmvalin\/aom,openpeer\/libvpx_new,matanbs\/vp982,Distrotech\/libvpx,thdav\/aom,goodleixiao\/vpx,ShiftMediaProject\/libvpx,GrokImageCompression\/aom,mbebenita\/aom,matanbs\/webm.libvpx,Topopiccione\/libvpx,Distrotech\/libvpx,hsueceumd\/test_hui,Suvarna1488\/webm.libvpx,lyx2014\/libvpx_c,goodleixiao\/vpx,charup\/https---github.com-webmproject-libvpx-,charup\/https---github.com-webmproject-libvpx-,altogother\/webm.libvpx,VTCSecureLLC\/libvpx,Maria1099\/webm.libvpx,Laknot\/libvpx,shyamalschandra\/libvpx,Acidburn0zzz\/webm.libvpx,Acidburn0zzz\/webm.libvpx,zofuthan\/libvpx,gshORTON\/webm.libvpx,mbebenita\/aom,Distrotech\/libvpx,webmproject\/libvpx,abwiz0086\/webm.libvpx,liqianggao\/libvpx,liqianggao\/libvpx,mwgoldsmith\/libvpx,altogother\/webm.libvpx,reimaginemedia\/webm.libvpx,Acidburn0zzz\/webm.libvpx,reimaginemedia\/webm.libvpx,jdm\/libvpx,mwgoldsmith\/libvpx,kim42083\/webm.libvpx,altogother\/webm.libvpx,GrokImageCompression\/aom,Acidburn0zzz\/webm.libvpx,iniwf\/webm.libvpx,smarter\/aom,openpeer\/libvpx_new,mwgoldsmith\/vpx,iniwf\/webm.libvpx,ittiamvpx\/libvpx-1,lyx2014\/libvpx_c,Acidburn0zzz\/webm.libvpx,abwiz0086\/webm.libvpx,shareefalis\/libvpx,Suvarna1488\/webm.libvpx,shareefalis\/libvpx,zofuthan\/libvpx,liqianggao\/libvpx,matanbs\/vp982,gshORTON\/webm.libvpx,kim42083\/webm.libvpx,kleopatra999\/webm.libvpx,webmproject\/libvpx,hsueceumd\/test_hui,luctrudeau\/aom,thdav\/aom,altogother\/webm.libvpx,hsueceumd\/test_hui,smarter\/aom,jacklicn\/webm.libvpx,mbebenita\/aom,pcwalton\/libvpx,ittiamvpx\/libvpx,felipebetancur\/libvpx,zofuthan\/libvpx,kalli123\/webm.libvpx,WebRTC-Labs\/libvpx,ShiftMediaProject\/libvpx,smarter\/aom,Laknot\/libvpx,kleopatra999\/webm.libvpx,kalli123\/webm.libvpx,kim42083\/webm.libvpx,shareefalis\/libvpx,webmproject\/libvpx,VTCSecureLLC\/libvpx,VTCSecureLLC\/libvpx,matanbs\/webm.libvpx,shareefalis\/libvpx,stewnorriss\/libvpx,mbebenita\/aom,iniwf\/webm.libvpx,WebRTC-Labs\/libvpx,openpeer\/libvpx_new,kalli123\/webm.libvpx,hsueceumd\/test_hui,luctrudeau\/aom,Suvarna1488\/webm.libvpx,ittiamvpx\/libvpx,jmvalin\/aom,n4t\/libvpx,stewnorriss\/libvpx,WebRTC-Labs\/libvpx,gshORTON\/webm.libvpx,goodleixiao\/vpx,pcwalton\/libvpx,jacklicn\/webm.libvpx,liqianggao\/libvpx,webmproject\/libvpx,hsueceumd\/test_hui,matanbs\/webm.libvpx,jdm\/libvpx,jdm\/libvpx,thdav\/aom,thdav\/aom,charup\/https---github.com-webmproject-libvpx-,Maria1099\/webm.libvpx,mbebenita\/aom,ittiamvpx\/libvpx-1,Suvarna1488\/webm.libvpx,GrokImageCompression\/aom,Topopiccione\/libvpx,zofuthan\/libvpx,WebRTC-Labs\/libvpx,kim42083\/webm.libvpx,felipebetancur\/libvpx,shacklettbp\/aom,abwiz0086\/webm.libvpx,iniwf\/webm.libvpx,thdav\/aom,ittiamvpx\/libvpx,jacklicn\/webm.libvpx,lyx2014\/libvpx_c,pcwalton\/libvpx,n4t\/libvpx,Maria1099\/webm.libvpx,goodleixiao\/vpx,zofuthan\/libvpx,abwiz0086\/webm.libvpx,mbebenita\/aom,mwgoldsmith\/vpx,hsueceumd\/test_hui,kim42083\/webm.libvpx,mbebenita\/aom,n4t\/libvpx,pcwalton\/libvpx,reimaginemedia\/webm.libvpx,webmproject\/libvpx,Laknot\/libvpx,jdm\/libvpx,stewnorriss\/libvpx,stewnorriss\/libvpx,shyamalschandra\/libvpx,felipebetancur\/libvpx,mwgoldsmith\/libvpx,Topopiccione\/libvpx,running770\/libvpx,matanbs\/vp982,Acidburn0zzz\/webm.libvpx,jdm\/libvpx,ittiamvpx\/libvpx-1,goodleixiao\/vpx,matanbs\/vp982,ShiftMediaProject\/libvpx,ittiamvpx\/libvpx-1,openpeer\/libvpx_new,liqianggao\/libvpx,mwgoldsmith\/libvpx,matanbs\/webm.libvpx,lyx2014\/libvpx_c,ittiamvpx\/libvpx,pcwalton\/libvpx,mwgoldsmith\/vpx,charup\/https---github.com-webmproject-libvpx-,mbebenita\/aom,reimaginemedia\/webm.libvpx,jmvalin\/aom,n4t\/libvpx,WebRTC-Labs\/libvpx,jdm\/libvpx,lyx2014\/libvpx_c,ittiamvpx\/libvpx-1,lyx2014\/libvpx_c,shacklettbp\/aom,Topopiccione\/libvpx,luctrudeau\/aom,jmvalin\/aom,thdav\/aom,ShiftMediaProject\/libvpx,jacklicn\/webm.libvpx,running770\/libvpx,Suvarna1488\/webm.libvpx,matanbs\/webm.libvpx,kalli123\/webm.libvpx,stewnorriss\/libvpx,goodleixiao\/vpx,luctrudeau\/aom,iniwf\/webm.libvpx,ittiamvpx\/libvpx,matanbs\/vp982,shareefalis\/libvpx,ittiamvpx\/libvpx,kalli123\/webm.libvpx,ShiftMediaProject\/libvpx,Distrotech\/libvpx,matanbs\/vp982,ittiamvpx\/libvpx-1,openpeer\/libvpx_new,jmvalin\/aom,shyamalschandra\/libvpx,felipebetancur\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_mcomp.c\n+++ vp9\/encoder\/vp9_mcomp.c\n@@ -1674,7 +1674,6 @@\n const MACROBLOCKD *const xd = &x->e_mbd;\n MV neighbors[4] = {{ -1, 0}, {0, -1}, {0, 1}, {1, 0}};\n int i, j;\n- int this_row_offset, this_col_offset;\n \n const int what_stride = x->plane[0].src.stride;\n const int in_what_stride = xd->plane[0].pre[0].stride;\n@@ -1682,8 +1681,6 @@\n const uint8_t *best_address = xd->plane[0].pre[0].buf +\n (ref_mv->row * xd->plane[0].pre[0].stride) +\n ref_mv->col;\n- unsigned int thissad;\n- MV this_mv;\n \n const MV fcenter_mv = {center_mv->row >> 3, center_mv->col >> 3};\n \n@@ -1715,8 +1712,8 @@\n \n for (j = 0; j < 4; j++) {\n if (sad_array[j] < bestsad) {\n- this_mv.row = ref_mv->row + neighbors[j].row;\n- this_mv.col = ref_mv->col + neighbors[j].col;\n+ const MV this_mv = {ref_mv->row + neighbors[j].row,\n+ ref_mv->col + neighbors[j].col};\n sad_array[j] += mvsad_err_cost(&this_mv, &fcenter_mv,\n mvjsadcost, mvsadcost, error_per_bit);\n \n@@ -1728,21 +1725,16 @@\n }\n } else {\n for (j = 0; j < 4; j++) {\n- this_row_offset = ref_mv->row + neighbors[j].row;\n- this_col_offset = ref_mv->col + neighbors[j].col;\n-\n- if ((this_col_offset > x->mv_col_min) &&\n- (this_col_offset < x->mv_col_max) &&\n- (this_row_offset > x->mv_row_min) &&\n- (this_row_offset < x->mv_row_max)) {\n+ const MV this_mv = {ref_mv->row + neighbors[j].row,\n+ ref_mv->col + neighbors[j].col};\n+\n+ if (is_mv_in(x, &this_mv)) {\n const uint8_t *check_here = neighbors[j].row * in_what_stride +\n neighbors[j].col + best_address;\n- thissad = fn_ptr->sdf(what, what_stride, check_here, in_what_stride,\n- bestsad);\n+ unsigned int thissad = fn_ptr->sdf(what, what_stride, check_here,\n+ in_what_stride, bestsad);\n \n if (thissad < bestsad) {\n- this_mv.row = this_row_offset;\n- this_mv.col = this_col_offset;\n thissad += mvsad_err_cost(&this_mv, &fcenter_mv,\n mvjsadcost, mvsadcost, error_per_bit);\n \n@@ -1764,6 +1756,7 @@\n neighbors[best_site].col;\n }\n }\n+\n return bestsad;\n }\n \n"} {"commit":"dc6e6fbdcc7aee0d2ff7984e974ae045bd9805c9","subject":"Change to thresholding in rd_variance_adjustment()","message":"Change to thresholding in rd_variance_adjustment()\n\nAlways test thresholds using a scaled block variance value.\n\nSource pixel variance no longer used so delete it as a parameter\nto the function\n\nChange-Id: I9e251edac6ebb15da98e40dcfa43333fe8b6ba55\n","repos":"webmproject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_rdopt.c\n+++ vp9\/encoder\/vp9_rdopt.c\n@@ -3124,16 +3124,14 @@\n \n \/\/ This function is designed to apply a bias or adjustment to an rd value based\n \/\/ on the relative variance of the source and reconstruction.\n-#define VERY_LOW_VAR_THRESH 2\n-#define LOW_VAR_THRESH 5\n+#define LOW_VAR_THRESH 250\n #define VAR_MULT 250\n static unsigned int max_var_adjust[VP9E_CONTENT_INVALID] = { 16, 16, 250 };\n \n static void rd_variance_adjustment(VP9_COMP *cpi, MACROBLOCK *x,\n BLOCK_SIZE bsize, int64_t *this_rd,\n struct buf_2d *recon,\n- MV_REFERENCE_FRAME ref_frame,\n- unsigned int source_variance) {\n+ MV_REFERENCE_FRAME ref_frame) {\n MACROBLOCKD *const xd = &x->e_mbd;\n unsigned int rec_variance;\n unsigned int src_variance;\n@@ -3168,7 +3166,7 @@\n \/\/ Lower of source (raw per pixel value) and recon variance. Note that\n \/\/ if the source per pixel is 0 then the recon value here will not be per\n \/\/ pixel (see above) so will likely be much larger.\n- src_rec_min = VPXMIN(source_variance, rec_variance);\n+ src_rec_min = VPXMIN(src_variance, rec_variance);\n \n if (src_rec_min > LOW_VAR_THRESH) return;\n \n@@ -3184,7 +3182,7 @@\n *this_rd += (*this_rd * var_factor) \/ 100;\n \n if (content_type == VP9E_CONTENT_FILM) {\n- if (src_rec_min <= VERY_LOW_VAR_THRESH) {\n+ if (src_rec_min <= LOW_VAR_THRESH \/ 2) {\n if (ref_frame == INTRA_FRAME) *this_rd *= 2;\n if (bsize > BLOCK_16X16) *this_rd *= 2;\n }\n@@ -3728,8 +3726,7 @@\n \/\/ Apply an adjustment to the rd value based on the similarity of the\n \/\/ source variance and reconstructed variance.\n if (recon) {\n- rd_variance_adjustment(cpi, x, bsize, &this_rd, recon, ref_frame,\n- x->source_variance);\n+ rd_variance_adjustment(cpi, x, bsize, &this_rd, recon, ref_frame);\n }\n \n if (ref_frame == INTRA_FRAME) {\n"} {"commit":"c1fb6e4d9f7652b697e5ea2fe91bf99087b25bd0","subject":"arm: da14695: Add arch_init from SDK","message":"arm: da14695: Add arch_init from SDK\n","repos":"embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox","returncode":1,"stderr":"error: pathspec 'third-party\/bsp\/dialog\/da14695\/arch.c' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- third-party\/bsp\/dialog\/da14695\/arch.c\n+++ third-party\/bsp\/dialog\/da14695\/arch.c\n@@ -0,0 +1,68 @@\n+\/**\n+ * @file\n+ * @brief\n+ *\n+ * @date 10.05.2020\n+ * @author Alexander Kalmuk\n+ *\/\n+\n+#include <string.h>\n+#include <assert.h>\n+#include <kernel\/irq.h>\n+#include <util\/log.h>\n+#include <hal\/arch.h>\n+#include <hal\/reg.h>\n+\n+#include <config\/custom_config_qspi.h>\n+\n+#include <sys_clock_mgr.h>\n+\n+#define GPREG_SET_FREEZE_REG (GPREG_BASE + 0x0)\n+# define GPREG_SET_FREEZE_SYS_WDOG (1 << 3)\n+\n+#define PLL_LOCK_IRQ 49\n+static_assert(PLL_LOCK_IRQ == PLL_LOCK_IRQn + 16);\n+\n+#define XTAL32M_RDY_IRQ 42\n+static_assert(XTAL32M_RDY_IRQ == XTAL32M_RDY_IRQn + 16);\n+\n+extern void XTAL32M_Ready_Handler(void);\n+static irq_return_t xtal32m_irq_handler(unsigned int irq_nr,\n+\t\tvoid *data) {\n+\tXTAL32M_Ready_Handler();\n+\treturn IRQ_HANDLED;\n+}\n+STATIC_IRQ_ATTACH(XTAL32M_RDY_IRQ, xtal32m_irq_handler, NULL);\n+\n+extern void PLL_Lock_Handler(void);\n+static irq_return_t pll_lock_irq_handler(unsigned int irq_nr,\n+\t\tvoid *data) {\n+\tPLL_Lock_Handler();\n+\treturn IRQ_HANDLED;\n+}\n+STATIC_IRQ_ATTACH(PLL_LOCK_IRQ, pll_lock_irq_handler, NULL);\n+\n+extern void SystemInitPre(void);\n+extern void da1469x_SystemInit(void);\n+\n+extern char _bss_vma;\n+extern char _bss_len;\n+\n+void arch_init(void) {\n+\t\/* Disable watchdog. It was enabled by bootloader. *\/\n+\tREG16_STORE(GPREG_SET_FREEZE_REG, GPREG_SET_FREEZE_SYS_WDOG);\n+\n+\tSystemInitPre();\n+\tda1469x_SystemInit();\n+\n+\t\/* SystemInitPre and da1469x_SystemInit use BSS variables, so reinit BSS.*\/\n+\tmemset(&_bss_vma, 0, (int) &_bss_len);\n+}\n+\n+void arch_idle(void) {\n+}\n+\n+void _NORETURN arch_shutdown(arch_shutdown_mode_t mode) {\n+\twhile (1) {\n+\t}\n+}\n"} {"commit":"61c573377ad83611f9c4a0a248ec570475fbd5df","subject":"Thrust: Remove unnecessary `static` qualifier, which breaks -Werror builds, from `get_occ_device_properties`. bug 1965743","message":"Thrust: Remove unnecessary `static` qualifier, which breaks -Werror builds, from `get_occ_device_properties`.\nbug 1965743\n\nJobs: 1965743-2006\n[git-p4: depot-paths = \"\/\/sw\/gpgpu\/thrust\/\": change = 22929220]\n","repos":"thrust\/thrust,jaredhoberock\/thrust,andrewcorrigan\/thrust-multi-permutation-iterator,andrewcorrigan\/thrust-multi-permutation-iterator,jaredhoberock\/thrust,thrust\/thrust,thrust\/thrust,andrewcorrigan\/thrust-multi-permutation-iterator,thrust\/thrust,jaredhoberock\/thrust,jaredhoberock\/thrust,thrust\/thrust,jaredhoberock\/thrust","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- thrust\/system\/cuda\/detail\/core\/util.h\n+++ thrust\/system\/cuda\/detail\/core\/util.h\n@@ -433,7 +433,7 @@\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n- inline static cudaError_t CUB_RUNTIME_FUNCTION\n+ inline cudaError_t CUB_RUNTIME_FUNCTION\n get_occ_device_properties(cudaOccDeviceProp &occ_prop, int dev_id)\n {\n cudaError_t status = cudaSuccess;\n"} {"commit":"32d42403c15c74876d6306710e56897aae293325","subject":"record_descr: add NSEC3, NSEC3PARAM","message":"record_descr: add NSEC3, NSEC3PARAM\n","repos":"d4s\/wdns,hstern\/wdns,hstern\/wdns,d4s\/wdns,hstern\/wdns,d4s\/wdns,hstern\/wdns","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- wdns\/msg\/record_descr.c\n+++ wdns\/msg\/record_descr.c\n@@ -123,6 +123,17 @@\n \t[WDNS_TYPE_DS] =\n \t\t{ class_un, { rdf_int16, rdf_int8, rdf_int8, rdf_bytes_b64 } },\n \t\t\t\/* key tag, algorithm, digest type, digest *\/\n+\n+\t\/* RFC 5155 DNSSEC types *\/\n+\n+\t[WDNS_TYPE_NSEC3] =\n+\t\t{ class_un, { rdf_int8, rdf_int8, rdf_int16, rdf_salt, rdf_hash,\n+\t\t\t\t rdf_type_bitmap } },\n+\t\t\t\/* hash algorithm, flags, iterations, salt, hash, rrtype bit maps *\/\n+\n+\t[WDNS_TYPE_NSEC3PARAM] =\n+\t\t{ class_un, { rdf_int8, rdf_int8, rdf_int16, rdf_salt } },\n+\t\t\t\/* hash algorithm, flags, iterations, salt *\/\n };\n \n const size_t record_descr_len = sizeof(record_descr_array) \/ sizeof(record_descr);\n"} {"commit":"6a76cca81a095ff4d08f4294006e7ceb09319137","subject":"DEBUG fixes","message":"DEBUG fixes\n\nOriginal commit message from CVS:\nDEBUG fixes\n","repos":"sh0\/gst-plugins-good,pexip\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,loshca\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,knuesel\/gst-plugins-good,rawoul\/gst-plugins-good,BigBrother-International\/gst-plugins-good,ariscop\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,jcaden\/gst-plugins-good,surround-io\/gst-plugins-good,kittee\/gst-plugins-good,alessandrod\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,kittee\/gst-plugins-good,lovebug356\/gst-plugins-good,StreamUtils\/gst-plugins-good,ted-n\/gst-plugins-good,alessandrod\/gst-plugins-good,veo-labs\/gst-plugins-good,ted-n\/gst-plugins-good,sebras\/gst-plugins-good,PPCDroid\/external-gst-plugins-good,ted-n\/gst-plugins-good,GStreamer\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,davibe\/gst-plugins-good-1.0,shelsonjava\/gst-plugins-good,Kurento\/gst-plugins-good,mrchapp\/gst-plugins-good,rawoul\/gst-plugins-good,dgerlach\/gst-plugins-good,ylatuya\/gst-plugins-good,ariscop\/gst-plugins-good,GStreamer\/gst-plugins-good,mrchapp\/gst-plugins-good,veo-labs\/gst-plugins-good,matsu\/gst-plugins-good,zaheerm\/gst-plugins-good,roopar\/gst-plugins-good,cfoch\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,jpakkane\/gstreamer-plugins-good,Kurento\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,prajnashi\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,an146\/gst-plugins-good,ikonst\/gst-plugins-good,jhodapp\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,ikonst\/gst-plugins-good,Distrotech\/gst-plugins-good,vatavuserban\/gst-plugins-good,shelsonjava\/gst-plugins-good,collects\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,luisbg\/gst-plugins-good,jcaden\/gst-plugins-good,davibe\/gst-plugins-good-1.0,pexip\/gst-plugins-good,lovebug356\/gst-plugins-good,ylatuya\/gst-plugins-good,lovebug356\/gst-plugins-good,krieger-od\/gst-plugins-good,greg80303\/gst-plugins-good,dgerlach\/gst-plugins-good,chamois94\/gst-plugins-good,cfoch\/gst-plugins-good,cablelabs\/gst-plugins-good,krieger-od\/gst-plugins-good,greg80303\/gst-plugins-good,prajnashi\/gst-plugins-good,sebras\/gst-plugins-good,wkatsak\/gst-plugins-good,ikonst\/gst-plugins-good,strukturag\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,BigBrother-International\/gst-plugins-good,jahrome\/gst-plugins-good,mrchapp\/gst-plugins-good,shelsonjava\/gst-plugins-good,Lachann\/gst-plugins-good,surround-io\/gst-plugins-good,jahrome\/gst-plugins-good,chamois94\/gst-plugins-good,pexip\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,roopar\/gst-plugins-good,stfl\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,Kurento\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,froggatt\/gst-plugins-good-m,ylatuya\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,Distrotech\/gst-plugins-good,wkatsak\/gst-plugins-good,BigBrother-International\/gst-plugins-good,prajnashi\/gst-plugins-good,krieger-od\/gst-plugins-good,luisbg\/gst-plugins-good,strukturag\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,sh0\/gst-plugins-good,veo-labs\/gst-plugins-good,GStreamer\/gst-plugins-good,jhodapp\/gst-plugins-good,zaheerm\/gst-plugins-good,davibe\/gst-plugins-good,ndufresne\/gst-plugins-good,luisbg\/gst-plugins-good,cfoch\/gst-plugins-good,wkatsak\/gst-plugins-good,matsu\/gst-plugins-good,hizukiayaka\/gst-plugins-good,ylatuya\/gst-plugins-good,matsu\/gst-plugins-good,Distrotech\/gst-plugins-good,strukturag\/gst-plugins-good,greg80303\/gst-plugins-good,davibe\/gst-plugins-good,zaheerm\/gst-plugins-good,ariscop\/gst-plugins-good,froggatt\/gst-plugins-good-m,GrokImageCompression\/gst-plugins-good,wkatsak\/gst-plugins-good,chamois94\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,Lachann\/gst-plugins-good,Distrotech\/gst-plugins-good,hizukiayaka\/gst-plugins-good,davibe\/gst-plugins-good,krieger-od\/gst-plugins-good,StreamUtils\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,cablelabs\/gst-plugins-good,pexip\/gst-plugins-good,davibe\/gst-plugins-good-1.0,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,greg80303\/gst-plugins-good,StreamUtils\/gst-plugins-good,GStreamer\/gst-plugins-good,offlinehacker\/gst-plugins-good,vatavuserban\/gst-plugins-good,lovebug356\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,dgerlach\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,an146\/gst-plugins-good,sh0\/gst-plugins-good,matsu\/gst-plugins-good,knuesel\/gst-plugins-good,Kurento\/gst-plugins-good,mrchapp\/gst-plugins-good,an146\/gst-plugins-good,cablelabs\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,luisbg\/gst-plugins-good,sebras\/gst-plugins-good,Distrotech\/gst-plugins-good,alessandrod\/gst-plugins-good,surround-io\/gst-plugins-good,davibe\/gst-plugins-good-1.0,sh0\/gst-plugins-good,kittee\/gst-plugins-good,StreamUtils\/gst-plugins-good,shelsonjava\/gst-plugins-good,hizukiayaka\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,jcaden\/gst-plugins-good,PPCDroid\/external-gst-plugins-good,knuesel\/gst-plugins-good,jahrome\/gst-plugins-good,kittee\/gst-plugins-good,ikonst\/gst-plugins-good,offlinehacker\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,stfl\/gst-plugins-good,jcaden\/gst-plugins-good,BigBrother-International\/gst-plugins-good,collects\/gst-plugins-good,rawoul\/gst-plugins-good,loshca\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,stfl\/gst-plugins-good,vatavuserban\/gst-plugins-good,ndufresne\/gst-plugins-good,chamois94\/gst-plugins-good,alessandrod\/gst-plugins-good,ndufresne\/gst-plugins-good,rikaunite\/gst-opera_gst-plugins-good,PPCDroid\/external-gst-plugins-good,ted-n\/gst-plugins-good,froggatt\/gst-plugins-good-m,froggatt\/gst-plugins-good-m,stfl\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer-sdk__gst-plugins-good,zaheerm\/gst-plugins-good,loshca\/gst-plugins-good,ariscop\/gst-plugins-good,pexip\/gst-plugins-good,ndufresne\/gst-plugins-good,offlinehacker\/gst-plugins-good,collects\/gst-plugins-good,strukturag\/gst-plugins-good,Lachann\/gst-plugins-good,cfoch\/gst-plugins-good,ahmedammar\/platform_external_gst_plugins_good,jahrome\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,surround-io\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,jhodapp\/gst-plugins-good,vatavuserban\/gst-plugins-good,loshca\/gst-plugins-good,rawoul\/gst-plugins-good,krad-radio\/gstreamer-plugins-good-krad,knuesel\/gst-plugins-good,mrchapp\/gst-plugins-good,cablelabs\/gst-plugins-good,roopar\/gst-plugins-good,veo-labs\/gst-plugins-good,Kurento\/gst-plugins-good,hizukiayaka\/gst-plugins-good,sebras\/gst-plugins-good,collects\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,Lachann\/gst-plugins-good,jhodapp\/gst-plugins-good,offlinehacker\/gst-plugins-good,an146\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/cutter\/gstcutter.c\n+++ gst\/cutter\/gstcutter.c\n@@ -268,7 +268,7 @@\n \/* g_print (\"DEBUG: cutter: start from here, turning on out\\n\"); *\/\n \/* first of all, flush current buffer *\/\n g_signal_emit (G_OBJECT (filter), gst_cutter_signals[CUT_START], 0);\n- g_print (\"DEBUG: cutter: flushing buffer \");\n+ GST_DEBUG (GST_CAT_PLUGIN_INFO, \"DEBUG: cutter: flushing buffer\");\n while (filter->pre_buffer)\n {\n g_print (\".\");\n@@ -324,8 +324,9 @@\n case ARG_THRESHOLD:\n \t\/* set the level *\/\n filter->threshold_level = g_value_get_double (value);\n- g_print (\"DEBUG: cutter: set threshold level to %f\\n\",\n-\t\tfilter->threshold_level);\n+ GST_DEBUG (GST_CAT_PLUGIN_INFO, \n+\t\t \"DEBUG: cutter: set threshold level to %f\\n\", \n+\t\t filter->threshold_level);\n break;\n case ARG_THRESHOLD_DB:\n \/* set the level given in dB \n@@ -333,8 +334,9 @@\n * values in dB < 0 result in values between 0 and 1\n *\/\n filter->threshold_level = pow (10, g_value_get_double (value) \/ 20);\n- g_print (\"DEBUG: cutter: set threshold level to %f\\n\",\n-\t\tfilter->threshold_level);\n+ GST_DEBUG (GST_CAT_PLUGIN_INFO,\n+ \"DEBUG: cutter: set threshold level to %f\\n\",\n+\t\t filter->threshold_level);\n break;\n case ARG_RUN_LENGTH:\n \/* set the minimum length of the silent run required *\/\n"} {"commit":"2af5ce906e89a7051e59ef6f99f04f1cd580bf35","subject":"Add comment about missing way to get symbolic icons for bookmarks Nautilus got the ability to do that in commit 0ed400b9c1692e42498bff3c10780073ec137f63. Maybe we should just copy that code to here later.","message":"Add comment about missing way to get symbolic icons for bookmarks\nNautilus got the ability to do that in commit 0ed400b9c1692e42498bff3c10780073ec137f63.\nMaybe we should just copy that code to here later.\n","repos":"Lyude\/gtk-,ebassi\/gtk,grubersjoe\/adwaita,ebassi\/gtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,jadahl\/gtk,Lyude\/gtk-,alexlarsson\/gtk,bratsche\/gtk-,jigpu\/gtk,jessevdk\/gtk,jigpu\/gtk,grubersjoe\/adwaita,jadahl\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,ebassi\/gtk,msteinert\/gtk,chergert\/gtk,chergert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,jigpu\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,Adamovskiy\/gtk,msteinert\/gtk,bratsche\/gtk-,Distrotech\/gtk2,chergert\/gtk,Adamovskiy\/gtk,ebassi\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,bratsche\/gtk-,msteinert\/gtk,davidgumberg\/gtk,jessevdk\/gtk,Lyude\/gtk-,jigpu\/gtk,davidgumberg\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,jigpu\/gtk,msteinert\/gtk,jessevdk\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,jadahl\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,jessevdk\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,ahodesuka\/gtk,jadahl\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,jessevdk\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,ebassi\/gtk,bratsche\/gtk-,msteinert\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,Lyude\/gtk-,jadahl\/gtk,jigpu\/gtk,ahodesuka\/gtk,jadahl\/gtk,jadahl\/gtk,jigpu\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,chergert\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,bratsche\/gtk-,Lyude\/gtk-,Distrotech\/gtk2,alexlarsson\/gtk,chergert\/gtk,bratsche\/gtk-,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,chergert\/gtk,alexlarsson\/gtk,msteinert\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,chergert\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,ahodesuka\/gtk,chergert\/gtk,ebassi\/gtk,jadahl\/gtk,Adamovskiy\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkplacessidebar.c\n+++ gtk\/gtkplacessidebar.c\n@@ -971,6 +971,10 @@\n \t\t\tif (bookmark_name == NULL)\n \t\t\t\tbookmark_name = g_strdup (g_file_info_get_display_name (info));\n \n+\t\t\t\/* FIXME: in commit 0ed400b9c1692e42498bff3c10780073ec137f63, nautilus added the ability\n+\t\t\t * to get a symbolic icon for bookmarks. We don't have that machinery. Should we\n+\t\t\t * just copy that code?\n+\t\t\t *\/\n \t\t\ticon = g_file_info_get_icon (info);\n \n \t\t\tmount_uri = g_file_get_uri (root);\n"} {"commit":"a7213e3ccfc921fe24b1fd6ad4e1b06950035504","subject":"Disallow drops on the recent:\/\/\/ item","message":"Disallow drops on the recent:\/\/\/ item\n\nSigned-off-by: Federico Mena Quintero <4999915a961edfd7686112c2935288e1266eae14@gnome.org>\n","repos":"jadahl\/gtk,msteinert\/gtk,jadahl\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,chergert\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,bratsche\/gtk-,jessevdk\/gtk,msteinert\/gtk,chergert\/gtk,jadahl\/gtk,Adamovskiy\/gtk,ebassi\/gtk,ebassi\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,jigpu\/gtk,jadahl\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,Lyude\/gtk-,davidgumberg\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,jessevdk\/gtk,jigpu\/gtk,Lyude\/gtk-,bratsche\/gtk-,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,jigpu\/gtk,Distrotech\/gtk2,Adamovskiy\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,Lyude\/gtk-,jessevdk\/gtk,davidgumberg\/gtk,chergert\/gtk,msteinert\/gtk,ebassi\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,grubersjoe\/adwaita,jadahl\/gtk,alexlarsson\/gtk,ebassi\/gtk,chergert\/gtk,jigpu\/gtk,bratsche\/gtk-,jigpu\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jessevdk\/gtk,msteinert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,jadahl\/gtk,chergert\/gtk,jessevdk\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,Lyude\/gtk-,jigpu\/gtk,msteinert\/gtk,Lyude\/gtk-,Distrotech\/gtk2,alexlarsson\/gtk,chergert\/gtk,grubersjoe\/adwaita,jigpu\/gtk,jigpu\/gtk,Distrotech\/gtk2,alexlarsson\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,jadahl\/gtk,ahodesuka\/gtk,bratsche\/gtk-,ahodesuka\/gtk,alexlarsson\/gtk,ebassi\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,Lyude\/gtk-,chergert\/gtk,bratsche\/gtk-,msteinert\/gtk,ebassi\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,chergert\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,bratsche\/gtk-","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkplacessidebar.c\n+++ gtk\/gtkplacessidebar.c\n@@ -1326,6 +1326,20 @@\n \t\t\t\t\t*pos = GTK_TREE_VIEW_DROP_AFTER;\n \t\t\t}\n \t\t}\n+\t}\n+\n+\t\/* Disallow drops on recent:\/\/\/ *\/\n+\tif (place_type == PLACES_BUILT_IN) {\n+\t\tchar *uri;\n+\n+\t\tgtk_tree_model_get (model, &iter,\n+\t\t\t\t PLACES_SIDEBAR_COLUMN_URI, &uri,\n+\t\t\t\t -1);\n+\n+\t\tif (strcmp (uri, \"recent:\/\/\/\") == 0)\n+\t\t\tdrop_possible = FALSE;\n+\n+\t\tg_free (uri);\n \t}\n \n \tif (!drop_possible) {\n"} {"commit":"8fb4b1373079503686d7cfd8f23290b0c47c2126","subject":"css: Break out enum parse\/print helper","message":"css: Break out enum parse\/print helper\n\nWe need this to parse non-GValue enums\n","repos":"chergert\/gtk,bratsche\/gtk-,jessevdk\/gtk,alexlarsson\/gtk,jigpu\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,ahodesuka\/gtk,ahodesuka\/gtk,msteinert\/gtk,Distrotech\/gtk2,jadahl\/gtk,chergert\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,ebassi\/gtk,davidgumberg\/gtk,chergert\/gtk,msteinert\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,msteinert\/gtk,jadahl\/gtk,davidt\/gtk,chergert\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,jadahl\/gtk,bratsche\/gtk-,davidt\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,chergert\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,jigpu\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,jadahl\/gtk,jigpu\/gtk,grubersjoe\/adwaita,ebassi\/gtk,jigpu\/gtk,msteinert\/gtk,davidgumberg\/gtk,jigpu\/gtk,Lyude\/gtk-,msteinert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,ebassi\/gtk,jadahl\/gtk,davidt\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,Lyude\/gtk-,ahodesuka\/gtk,bratsche\/gtk-,bratsche\/gtk-,jessevdk\/gtk,davidt\/gtk,jadahl\/gtk,Distrotech\/gtk2,bratsche\/gtk-,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,ebassi\/gtk,msteinert\/gtk,davidt\/gtk,jadahl\/gtk,Lyude\/gtk-,ebassi\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,jessevdk\/gtk,alexlarsson\/gtk,Lyude\/gtk-,jessevdk\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,Distrotech\/gtk2,ebassi\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,chergert\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,alexlarsson\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,chergert\/gtk,jessevdk\/gtk,jigpu\/gtk,jigpu\/gtk,jessevdk\/gtk,jadahl\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,chergert\/gtk,Lyude\/gtk-,jessevdk\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,davidgumberg\/gtk,davidt\/gtk,grubersjoe\/adwaita,Distrotech\/gtk2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkstyleproperty.c\n+++ gtk\/gtkstyleproperty.c\n@@ -113,6 +113,47 @@\n \/*** IMPLEMENTATIONS ***\/\n \n static gboolean \n+enum_parse (GtkCssParser *parser,\n+\t GType type,\n+\t int *res)\n+{\n+ char *str;\n+\n+ if (_gtk_css_parser_try_enum (parser, type, res))\n+ return TRUE;\n+\n+ str = _gtk_css_parser_try_ident (parser, TRUE);\n+ if (str == NULL)\n+ {\n+ _gtk_css_parser_error (parser, \"Expected an identifier\");\n+ return FALSE;\n+ }\n+\n+ _gtk_css_parser_error (parser,\n+\t\t\t \"Unknown value '%s' for enum type '%s'\",\n+\t\t\t str, g_type_name (type));\n+ g_free (str);\n+\n+ return FALSE;\n+}\n+\n+static void\n+enum_print (int value,\n+\t GType type,\n+\t GString *string)\n+{\n+ GEnumClass *enum_class;\n+ GEnumValue *enum_value;\n+\n+ enum_class = g_type_class_ref (type);\n+ enum_value = g_enum_get_value (enum_class, value);\n+\n+ g_string_append (string, enum_value->value_nick);\n+\n+ g_type_class_unref (enum_class);\n+}\n+\n+static gboolean\n rgba_value_parse (GtkCssParser *parser,\n GFile *base,\n GValue *value)\n@@ -1360,27 +1401,14 @@\n GFile *base,\n GValue *value)\n {\n- char *str;\n int v;\n \n- if (_gtk_css_parser_try_enum (parser, G_VALUE_TYPE (value), &v))\n+ if (enum_parse (parser, G_VALUE_TYPE (value), &v))\n {\n g_value_set_enum (value, v);\n return TRUE;\n }\n \n- str = _gtk_css_parser_try_ident (parser, TRUE);\n- if (str == NULL)\n- {\n- _gtk_css_parser_error (parser, \"Expected an identifier\");\n- return FALSE;\n- }\n- \n- _gtk_css_parser_error (parser,\n-\t\t\t \"Unknown value '%s' for enum type '%s'\",\n-\t\t\t str, g_type_name (G_VALUE_TYPE (value)));\n- g_free (str);\n-\n return FALSE;\n }\n \n@@ -1388,15 +1416,7 @@\n enum_value_print (const GValue *value,\n GString *string)\n {\n- GEnumClass *enum_class;\n- GEnumValue *enum_value;\n-\n- enum_class = g_type_class_ref (G_VALUE_TYPE (value));\n- enum_value = g_enum_get_value (enum_class, g_value_get_enum (value));\n-\n- g_string_append (string, enum_value->value_nick);\n-\n- g_type_class_unref (enum_class);\n+ enum_print (g_value_get_enum (value), G_VALUE_TYPE (value), string);\n }\n \n static gboolean \n"} {"commit":"639bf2a2a5011678f6175af8264803ceaa2f81d0","subject":"theme: Remove unnecessary save\/restore in spinner code","message":"theme: Remove unnecessary save\/restore in spinner code\n","repos":"msteinert\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,bratsche\/gtk-,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,jadahl\/gtk,jadahl\/gtk,jigpu\/gtk,ebassi\/gtk,alexlarsson\/gtk,jadahl\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,Lyude\/gtk-,ahodesuka\/gtk,simokivimaki\/gtk,Adamovskiy\/gtk,simokivimaki\/gtk,msteinert\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,jadahl\/gtk,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,davidgumberg\/gtk,bratsche\/gtk-,Sidnioulz\/SandboxGtk,chergert\/gtk,davidt\/gtk,Lyude\/gtk-,jessevdk\/gtk,davidt\/gtk,jessevdk\/gtk,simokivimaki\/gtk,chergert\/gtk,chergert\/gtk,Lyude\/gtk-,alexlarsson\/gtk,msteinert\/gtk,msteinert\/gtk,ahodesuka\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,jessevdk\/gtk,ebassi\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,jadahl\/gtk,alexlarsson\/gtk,jadahl\/gtk,davidt\/gtk,msteinert\/gtk,Lyude\/gtk-,Distrotech\/gtk2,Sidnioulz\/SandboxGtk,Distrotech\/gtk2,davidgumberg\/gtk,chergert\/gtk,chergert\/gtk,chergert\/gtk,grubersjoe\/adwaita,Distrotech\/gtk2,davidgumberg\/gtk,jessevdk\/gtk,Distrotech\/gtk2,bratsche\/gtk-,jessevdk\/gtk,grubersjoe\/adwaita,ahodesuka\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,jigpu\/gtk,Adamovskiy\/gtk,davidt\/gtk,jadahl\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,jigpu\/gtk,jigpu\/gtk,ebassi\/gtk,ebassi\/gtk,davidt\/gtk,simokivimaki\/gtk,chergert\/gtk,chergert\/gtk,davidgumberg\/gtk,jigpu\/gtk,davidt\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,simokivimaki\/gtk,Adamovskiy\/gtk,ebassi\/gtk,jigpu\/gtk,davidgumberg\/gtk,bratsche\/gtk-,ebassi\/gtk,msteinert\/gtk,jigpu\/gtk,Lyude\/gtk-,simokivimaki\/gtk,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,bratsche\/gtk-,Adamovskiy\/gtk,davidgumberg\/gtk,jadahl\/gtk,bratsche\/gtk-,jigpu\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkthemingengine.c\n+++ gtk\/gtkthemingengine.c\n@@ -3007,8 +3007,6 @@\n gdouble t = (gdouble) ((i + num_steps - step)\n % num_steps) \/ num_steps;\n \n- cairo_save (cr);\n-\n cairo_set_source_rgba (cr,\n color->red,\n color->green,\n@@ -3023,8 +3021,6 @@\n radius * cos (i * G_PI \/ half),\n radius * sin (i * G_PI \/ half));\n cairo_stroke (cr);\n-\n- cairo_restore (cr);\n }\n \n cairo_restore (cr);\n"} {"commit":"c8a4ac0cbc2187c8a95f03904b456a15552fcf38","subject":"generate files for mxmodelgen","message":"generate files for mxmodelgen\n\ngit-svn-id: b6c97393e82be3812a607970066d172a5388f86f@105 df83fd30-4cca-4c36-ab9d-e8b5583ccbd1\n","repos":"JuKa87\/OpenMx,mhunter1\/OpenMx,JuKa87\/OpenMx,JuKa87\/OpenMx,jpritikin\/OpenMx,mhunter1\/OpenMx,jpritikin\/OpenMx,mhunter1\/OpenMx,mhunter1\/OpenMx,mhunter1\/OpenMx,JuKa87\/OpenMx,jpritikin\/OpenMx,JuKa87\/OpenMx,JuKa87\/OpenMx,mhunter1\/OpenMx,jpritikin\/OpenMx,jpritikin\/OpenMx,jpritikin\/OpenMx","returncode":1,"stderr":"error: pathspec 'swift\/perm.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- swift\/perm.c\n+++ swift\/perm.c\n@@ -0,0 +1,178 @@\n+\/*\n+perm.c \n+\n+creates all permutations \n+of the matrix size 'size'\n+with 'connections' conn\n+\n+*\/\n+\n+#include <stdio.h>\n+#include <stdlib.h>\n+#include <string.h>\n+\n+static int count = 0;\n+\n+\/* Free memory used for data *\/\n+\n+void FreeData(void) {\n+ return;\n+}\n+\n+int find_n(int n, int idata[], int size)\n+{\n+ int j;\n+ int cnt = 0;\n+ for(j=0; j<=size; j++)\n+ {\n+ if (idata[j] == 1)\n+ cnt++;\n+ if(cnt == n)\n+ return j;\n+ }\n+\n+ return j;\n+}\n+\n+int find_shift_elmt(int connections, int idata[], int size)\n+{\n+ int x;\n+ for(x=connections-1; x>=1; x--)\n+ {\n+ int curr_n = find_n(x, idata, size);\n+ if(idata[curr_n+1] == 0)\n+ return curr_n;\n+ }\n+ return 0;\n+}\n+\n+\/* Insert data 0 at position 'pos' *\/\n+\n+void insert_zero(unsigned pos, int size, int connections, int idata[], int recentdata[]) {\n+ int selmt_pos;\n+ if(idata[pos+1] != 0 || pos+1>=size){\n+ selmt_pos = find_shift_elmt(connections, idata, size);\n+ pos = selmt_pos;\n+ }\n+ int j,m,k,p;\n+ int bitcount = 0;\n+ int n = 0;\n+ \/* create tmp for shifting *\/\n+ for(j=0; j<size; j++){\n+ recentdata[j] = idata[j];\n+ }\n+ int i = (signed) size;\n+\n+ \/* set position of interest *\/\n+ idata[pos] = n;\n+\n+ \/* set those to left which should \n+ be static but keep track of them*\/\n+\n+ for(k=0; k<pos; k++){\n+ idata[k] = recentdata[k];\n+ if(idata[k] == 1){ bitcount++;}\n+ }\n+\n+ \/* now remaining active bits not set on left\n+ should be set immediately to the right *\/\n+\n+ for(m=pos+1; m<=pos+(connections-bitcount); m++)\n+ {\n+ idata[m] = 1;\n+ }\n+ for(p=pos+connections-bitcount+1;p<size; p++)\n+ {\n+ idata[p] = 0;\n+ }\n+}\n+\n+int get_total(int size, int connections)\n+{\n+ int top = (size-connections)+1;\n+ int statop = top;\n+ int total=0;\n+ int j;\n+\n+ for(j=1;j<=statop;j++)\n+ {\n+ total += top*j;\n+ top--;\n+ }\n+ printf(\"total is %i\\n\", total);\n+ return total;\n+}\n+\n+int find_last(int size, int idata[])\n+ {\n+ int j;\n+ int last;\n+ int count = 0;\n+ for(j=0; j<size; j++)\n+ {\n+ if (idata[j] == 1)\n+\t last = j;\n+ }\n+ return last;\n+ }\n+\n+\n+void Perm(int size, int connections, int idata[], int recentdata[]) {\n+ int i,j,c;\n+ int total = get_total(size, connections);\n+ for(i=0; i<total-1; i++)\n+ {\n+ insert_zero(find_last(size,idata), size, connections, idata, recentdata);\n+\n+ \/* save current perm to file *\/\n+ FILE *datfile;\n+ char fname [10];\n+ const char ext[] = \".adat\";\n+ sprintf(fname, \"%d%s\", count,ext);\n+ datfile = fopen(fname, \"wt\");\n+ int x;\n+ for (x=0; x<size; x++){\n+ fprintf(datfile, \"%i \",idata[x]);\n+ }\n+ fputc('\\n',datfile);\n+ fclose(datfile);\n+ count++;\n+ }\n+}\n+ \n+int run_perm(int *con, int *sz) {\n+\n+ int connections = con[0];\n+ int size = sz[0];\n+ int idata[size];\n+ int recentdata[size];\n+\n+ int i,j;\n+ for(i=0; i<size; i++)\n+ {\n+ if(i<connections)\n+\tidata[i] = 1;\n+ else\n+\tidata[i] = 0;\n+ }\n+ for(j=0; j<size; j++)\n+ {\n+ recentdata[j] = idata[j];\n+ }\n+\n+ printf(\"connections: %i\\n\",connections);\n+ printf(\"size: %i\\n\",size);\n+ \n+ printf(\"Permutations of %u items:\\n\\n\", connections);\n+ Perm(size, connections, idata, recentdata);\n+\n+ printf(\"\\n%d permutations in all.\\n\", count);\n+ FreeData();\n+ return EXIT_SUCCESS;\n+ }\n+\n+int main(int argc, char *argv[])\n+{\n+ printf(\"in main\\n\");\n+ return 0;\n+}\n"} {"commit":"c5aeee750f410ff1adfe7dc0218b9ecd91917934","subject":"Typo in comment.","message":"Typo in comment.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/net\/if.c\n+++ sys\/net\/if.c\n@@ -1651,7 +1651,7 @@\n }\n \n \/*\n- * Just like if_promisc(), but for all-multicast-reception mode.\n+ * Just like ifpromisc(), but for all-multicast-reception mode.\n *\/\n int\n if_allmulti(struct ifnet *ifp, int onswitch)\n"} {"commit":"75918164b97617ac120eecaac38dfe464708ddb3","subject":"implement the model property","message":"implement the model property\n\n* gutachter-tree-list.c: implement the model property\n","repos":"herzi\/gutachter,herzi\/gutachter","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gutachter-tree-list.c\n+++ gutachter-tree-list.c\n@@ -20,18 +20,71 @@\n \n #include \"gutachter-tree-list.h\"\n \n+struct _GutachterTreeListPrivate\n+{\n+ GtkTreeModel* model;\n+};\n+\n+#define PRIV(i) (((GutachterTreeList*)(i))->_private)\n+\n+enum\n+{\n+ PROP_0,\n+ PROP_MODEL\n+};\n+\n static void implement_gtk_tree_model (GtkTreeModelIface* iface);\n \n G_DEFINE_TYPE_WITH_CODE (GutachterTreeList, gutachter_tree_list, G_TYPE_OBJECT,\n G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, implement_gtk_tree_model));\n \n static void\n-gutachter_tree_list_init (GutachterTreeList* self G_GNUC_UNUSED)\n-{}\n+gutachter_tree_list_init (GutachterTreeList* self)\n+{\n+ PRIV (self) = G_TYPE_INSTANCE_GET_PRIVATE (self, GUTACHTER_TYPE_TREE_LIST, GutachterTreeListPrivate);\n+}\n \n static void\n-gutachter_tree_list_class_init (GutachterTreeListClass* self_class G_GNUC_UNUSED)\n-{}\n+finalize (GObject* object)\n+{\n+ g_object_unref (PRIV (object)->model);\n+\n+ G_OBJECT_CLASS (gutachter_tree_list_parent_class)->finalize (object);\n+}\n+\n+static void\n+set_property (GObject * object,\n+ guint prop_id,\n+ GValue const* value,\n+ GParamSpec * pspec)\n+{\n+ switch (prop_id)\n+ {\n+ case PROP_MODEL:\n+ g_return_if_fail (!PRIV (object)->model);\n+ PRIV (object)->model = g_value_dup_object (value);\n+ \/* construct-only => no notification *\/\n+ break;\n+ default:\n+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);\n+ break;\n+ }\n+}\n+\n+static void\n+gutachter_tree_list_class_init (GutachterTreeListClass* self_class)\n+{\n+ GObjectClass* object_class = G_OBJECT_CLASS (self_class);\n+\n+ object_class->finalize = finalize;\n+ object_class->set_property = set_property;\n+\n+ g_object_class_install_property (object_class, PROP_MODEL,\n+ g_param_spec_object (\"model\", NULL, NULL,\n+ GTK_TYPE_TREE_MODEL, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));\n+\n+ g_type_class_add_private (self_class, sizeof (GutachterTreeList));\n+}\n \n GtkTreeModelFlags\n get_flags (GtkTreeModel* model G_GNUC_UNUSED)\n@@ -46,9 +99,10 @@\n }\n \n GtkTreeModel*\n-gutachter_tree_list_new (GtkTreeModel* real_tree G_GNUC_UNUSED)\n+gutachter_tree_list_new (GtkTreeModel* model)\n {\n return g_object_new (GUTACHTER_TYPE_TREE_LIST,\n+ \"model\", model,\n NULL);\n }\n \n"} {"commit":"c647c4d7b886f2a2910d1ac1e289d048c15e22e6","subject":"Fix up an error message.","message":"Fix up an error message.\n","repos":"nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome,nmc-probe\/emulab-nome","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- event\/program-agent\/program-agent.c\n+++ event\/program-agent\/program-agent.c\n@@ -1,6 +1,6 @@\n \/*\n * EMULAB-COPYRIGHT\n- * Copyright (c) 2000-2007 University of Utah and the Flux Group.\n+ * Copyright (c) 2000-2008 University of Utah and the Flux Group.\n * All rights reserved.\n *\/\n \n@@ -585,7 +585,7 @@\n \t\t\t\"cannot set real-time priority\\n\");\n \t }\n \t else if (rtprio(RTP_SET, 0, &rtp) < 0) {\n-\t\tpwarning(\"main: cannot set real-time priority\\n\");\n+\t\tpwarning(\"main: cannot set real-time priority\");\n \t }\n \t}\n #elif defined(linux)\n"} {"commit":"92fdb3d091fa8ea6073b0dc3b657e247a49e40c3","subject":"minor code reorg for clarity","message":"minor code reorg for clarity","repos":"ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead,ldm5180\/hammerhead","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hab\/random\/add-node.c\n+++ hab\/random\/add-node.c\n@@ -58,32 +58,24 @@\n printf(\"Error adding Resource\\n\");\n }\n \n- \/\/ half of the resources start out without a datapoint\n- if ((rand() % 2) == 0) {\n- printf(\n- \" %s %s %s = (no value)\\n\",\n- resource_id,\n- bionet_resource_data_type_to_string(data_type),\n- bionet_resource_flavor_to_string(flavor)\n- );\n- return;\n- }\n-\n+ printf(\n+ \" %s %s %s = \",\n+ resource_id,\n+ bionet_resource_data_type_to_string(data_type),\n+ bionet_resource_flavor_to_string(flavor)\n+ );\n \n \/\/\n+ \/\/ half of the resources start out without a datapoint\n \/\/ the other half of the resources get an initial datapoint\n \/\/\n-\n- set_random_resource_value(resource);\n-\n- datapoint = bionet_resource_get_datapoint_by_index(resource, 0);\n- printf(\n- \" %s %s %s = %s\\n\",\n- resource_id,\n- bionet_resource_data_type_to_string(data_type),\n- bionet_resource_flavor_to_string(flavor),\n- bionet_datapoint_value_to_string(datapoint)\n- );\n+ if ((rand() % 2) == 0) {\n+ printf(\"(starts with no value)\\n\");\n+ } else {\n+ set_random_resource_value(resource);\n+ datapoint = bionet_resource_get_datapoint_by_index(resource, 0); \/\/ there's only one datapoint\n+ printf(\"%s\\n\", bionet_datapoint_value_to_string(datapoint));\n+ }\n }\n \n \n"} {"commit":"6d03e2d63d577654f53a51cc490a9e111a65d9ff","subject":"examples\/ota_update_app: additional command to view fw_vers and slot of current firmware","message":"examples\/ota_update_app: additional command to view fw_vers and slot of current firmware\n","repos":"jbeyerstedt\/RIOT-OTA-update,jbeyerstedt\/RIOT-OTA-update,jbeyerstedt\/RIOT-OTA-update,jbeyerstedt\/RIOT-OTA-update,jbeyerstedt\/RIOT-OTA-update","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/ota_update_app\/main.c\n+++ examples\/ota_update_app\/main.c\n@@ -37,6 +37,7 @@\n int ota_request_cmd(int argc, char **argv)\n {\n int ret_val = ota_updater_request_update();\n+\n printf(\"ota_updater_request_update returned %i\\n\", ret_val);\n return 0;\n }\n@@ -44,6 +45,7 @@\n int ota_download_cmd(int argc, char **argv)\n {\n int ret_val = ota_updater_download();\n+\n printf(\"ota_updater_download returned %i\\n\", ret_val);\n return 0;\n }\n@@ -51,6 +53,7 @@\n int ota_install_cmd(int argc, char **argv)\n {\n int ret_val = ota_updater_install();\n+\n printf(\"ota_updater_install returned %i\\n\", ret_val);\n return 0;\n }\n@@ -67,12 +70,22 @@\n return 0;\n }\n \n+int fw_info_cmd(int argc, char **argv)\n+{\n+ OTA_FW_metadata_t slot_metadata;\n+\n+ ota_slots_get_int_slot_metadata(FW_SLOT, &slot_metadata);\n+ printf(\"FW version %d, slot %d\\n\", slot_metadata.fw_vers, FW_SLOT);\n+ return 0;\n+}\n+\n static const shell_command_t shell_commands[] = {\n { \"ota_request\", \"Send request to update server\", ota_request_cmd },\n { \"ota_download\", \"Download the requested update\", ota_download_cmd },\n { \"ota_install\", \"Install the downloaded update\", ota_install_cmd },\n { \"ota_reboot\", \"Reboot device\", ota_reboot_cmd },\n- { \"view_slots\", \"View FW Slots\", view_slots_cmd },\n+ { \"view_slots\", \"View FW slots\", view_slots_cmd },\n+ { \"fw_info\", \"View FW version and slot number\", fw_info_cmd },\n { NULL, NULL, NULL }\n };\n \n"} {"commit":"debec1801bcdd348deb68fe4e7dbca0f50acb53c","subject":"Update URIs to documentation in the example program.","message":"Update URIs to documentation in the example program.\n","repos":"didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- examples\/simple_rohc_program.c\n+++ examples\/simple_rohc_program.c\n@@ -71,7 +71,7 @@\n \t\/* Create a ROHC compressor with small CIDs, no jamming and no adaptation\n \t * to encapsulation frames.\n \t *\n-\t * See http:\/\/www.tech.viveris.com\/docs\/rohc\/group__rohc__comp.html#g721fd34fc0cd9e1d789b693eb6bb6485\n+\t * See http:\/\/rohc-lib.org\/doc\/latest\/group__rohc__comp.html#ga721fd34fc0cd9e1d789b693eb6bb6485\n \t * for details about rohc_alloc_compressor in the API documentation.\n \t *\/\n \tprintf(\"\\ncreate the ROHC compressor\\n\");\n@@ -85,7 +85,7 @@\n \n \t\/* Enable the compression profiles you need (comment or uncomment some lines).\n \t *\n-\t * See http:\/\/www.tech.viveris.com\/docs\/rohc\/group__rohc__comp.html#g1a444eb91681521f726712a60a4df867\n+\t * See http:\/\/rohc-lib.org\/doc\/latest\/group__rohc__comp.html#ga1a444eb91681521f726712a60a4df867\n \t * for details about rohc_activate_profile in the API documentation.\n \t *\/\n \tprintf(\"\\nenable several ROHC compression profiles\\n\");\n@@ -135,7 +135,7 @@\n \n \t\/* Now, compress this fake IP packet.\n \t *\n-\t * See http:\/\/www.tech.viveris.com\/docs\/rohc\/group__rohc__comp.html#g99be8242b7bc4f442f4519461a99726b\n+\t * See http:\/\/rohc-lib.org\/doc\/latest\/group__rohc__comp.html#ga99be8242b7bc4f442f4519461a99726b\n \t * for details about rohc_compress in the API documentation.\n \t *\/\n \tprintf(\"\\ncompress the fake IP packet\\n\");\n@@ -167,7 +167,7 @@\n \n \t\/* Release the ROHC compressor when you do not need it anymore.\n \t *\n-\t * See http:\/\/www.tech.viveris.com\/docs\/rohc\/group__rohc__comp.html#g736ea1760d7af54ad903c29765df5bd3\n+\t * See http:\/\/rohc-lib.org\/doc\/latest\/group__rohc__comp.html#ga736ea1760d7af54ad903c29765df5bd3\n \t * for details about rohc_free_compressor in the API documentation.\n \t *\/\n \tprintf(\"\\n\\ndestroy the ROHC decompressor\\n\");\n@@ -177,7 +177,7 @@\n \tprintf(\"\\nThe program ended successfully. The ROHC packet is larger than the \"\n \t \"IP packet (39 bytes versus 38 bytes). This is expected since we only \"\n \t \"compress one packet in this simple example. Keep in mind that ROHC \"\n-\t \"is designed to compress streams of packets not one single packet\\n\\n\");\n+\t \"is designed to compress streams of packets not one single packet.\\n\\n\");\n \n \treturn 0;\n \n"} {"commit":"97e1ba647093be07e483cc0a8bae1ba994870513","subject":"fix warnings for unused variables and functions","message":"fix warnings for unused variables and functions\n","repos":"EvanKuhn\/nu_unit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nu_unit.h\n+++ nu_unit.h\n@@ -241,7 +241,7 @@\n } \\\n } while(0)\n \n-static void _nu_check_int_helper(char* macro, int a, char* a_name, int b, char* b_name,\n+static inline void _nu_check_int_helper(char* macro, int a, char* a_name, int b, char* b_name,\n nu_op_t op, char* file, int line)\n {\n ++nu_num_checks;\n@@ -282,7 +282,7 @@\n do { _nu_check_int_helper(\"nu_check_int_ge\", a, #a, b, #b, NU_OP_GE, __FILE__, __LINE__); } while(0)\n \n \/\/ Yuck. Copy-and-paste the integer function for floats.\n-static void _nu_check_flt_helper(char* macro, float a, char* a_name, float b, char* b_name,\n+static inline void _nu_check_flt_helper(char* macro, float a, char* a_name, float b, char* b_name,\n nu_op_t op, char* file, int line)\n {\n ++nu_num_checks;\n@@ -393,9 +393,10 @@\n {\n int failure = (nu_num_failures || (!nu_num_checks && !nu_num_asserts));\n char* color = (failure ? RED : GREEN);\n+ char* status = (failure ? \"FAILURE\" : \"SUCCESS\");\n printf(\"%i checks, %i asserts, %i failures, %i not implemented\\n\", \\\n nu_num_checks, nu_num_asserts, nu_num_failures, nu_num_not_impl);\n- printf(\"%s%s%s\\n\", (failure ? RED : GREEN), (failure ? \"FAILURE\" : \"SUCCESS\"), NOCOLOR);\n+ printf(\"%s%s%s\\n\", color, status, NOCOLOR);\n }\n \n \/\/ Exit with success or failure depending on the number of failures\n"} {"commit":"986c2c9e5696ea61e2e440702e21d28e7d8eaa5f","subject":"examples\/ipsec-secgw: fix eventdev start sequence","message":"examples\/ipsec-secgw: fix eventdev start sequence\n\nStart eventdev after complete initialization of event dev,\nrx adapter and tx adapter.\n\nFixes: e0b0e55c8f15 (\"examples\/ipsec-secgw: add framework for event helper\")\nCc: stable@dpdk.org\n\nSigned-off-by: Nithin Dabilpuram <5876e1d9ac41f57357c508f9123b8d030ff3606b@marvell.com>\nAcked-by: Anoob Joseph <3ccb4777bd2856f4d9127f25efe6455b1a791ba2@marvell.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- examples\/ipsec-secgw\/event_helper.c\n+++ examples\/ipsec-secgw\/event_helper.c\n@@ -716,6 +716,16 @@\n \t\t}\n \t}\n \n+\treturn 0;\n+}\n+\n+static int\n+eh_start_eventdev(struct eventmode_conf *em_conf)\n+{\n+\tstruct eventdev_params *eventdev_config;\n+\tint nb_eventdev = em_conf->nb_eventdev;\n+\tint i, ret;\n+\n \t\/* Start event devices *\/\n \tfor (i = 0; i < nb_eventdev; i++) {\n \n@@ -1688,6 +1698,13 @@\n \t\treturn ret;\n \t}\n \n+\t\/* Start eventdev *\/\n+\tret = eh_start_eventdev(em_conf);\n+\tif (ret < 0) {\n+\t\tEH_LOG_ERR(\"Failed to start event dev %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n \t\/* Start eth devices after setting up adapter *\/\n \tRTE_ETH_FOREACH_DEV(port_id) {\n \n"} {"commit":"8a22752492bf4464543d12ac345e9167f3b2e31b","subject":"nv60: A few funny bitty operations.","message":"nv60: A few funny bitty operations.\n\nYet another yay for undocumented stuff.\n","repos":"karolherbst\/envytools,karolherbst\/envytools,grate-driver\/envytools,envytools\/envytools,hakzsam\/envytools,pierremoreau\/envytools,pierremoreau\/envytools,hakzsam\/envytools,pierremoreau\/envytools,kfractal\/envytools,grate-driver\/envytools,hakzsam\/envytools,MoochMcGee\/envytools,karolherbst\/envytools,kfractal\/envytools,grate-driver\/envytools,pierremoreau\/envytools,envytools\/envytools,kfractal\/envytools,karolherbst\/envytools,envytools\/envytools,grate-driver\/envytools,MoochMcGee\/envytools,MoochMcGee\/envytools,kfractal\/envytools,hakzsam\/envytools,grate-driver\/envytools,kfractal\/envytools,pierremoreau\/envytools,envytools\/envytools,MoochMcGee\/envytools,MoochMcGee\/envytools,hakzsam\/envytools,karolherbst\/envytools,envytools\/envytools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nv60dis.c\n+++ nv60dis.c\n@@ -507,6 +507,10 @@\n F1(abs1, 7, N(\"abs\"))\n F1(abs2, 6, N(\"abs\"))\n F1(rint, 7, N(\"rint\"))\n+F1(rev, 8, N(\"rev\"))\n+\n+F1(not1, 9, N(\"not\"))\n+F1(not2, 8, N(\"not\"))\n \n F1(acout, 0x30, CF)\n F1(acout2, 0x3a, CF)\n@@ -700,7 +704,8 @@\n \t{ AP, 0x6800000000000043ull, 0xf8000000000000c7ull, N(\"or\"), N(\"b32\"), DST, SRC1, T(is2) },\n \t{ AP, 0x6800000000000083ull, 0xf8000000000000c7ull, N(\"xor\"), N(\"b32\"), DST, SRC1, T(is2) },\n \t{ AP, 0x68000000000001c3ull, 0xf8000000000001c7ull, N(\"not2\"), N(\"b32\"), DST, SRC1, T(is2) }, \/\/ yes, this is probably just a mov2 with a not bit set.\n-\t{ AP, 0x7000000000000003ull, 0xf800000000000007ull, N(\"ext\"), T(us32), DST, SRC1, T(is2) },\n+\t{ AP, 0x7000000000000003ull, 0xf800000000000007ull, N(\"ext\"), T(rev), T(us32), DST, SRC1, T(is2) }, \/\/ yes. this can reverse bits in a bitfield. really.\n+\t{ AP, 0x7800000000000003ull, 0xf800000000000007ull, N(\"bfind\"), T(us32), DST, T(not2), T(is2) }, \/\/ index of highest bit set, counted from 0, -1 for 0 src. or highest bit different from sign for signed version. check me.\n \t{ AP, 0x0000000000000003ull, 0x0000000000000007ull, OOPS, N(\"b32\"), DST, SRC1, T(is2), SRC3 },\n \n \n@@ -729,6 +734,7 @@\n \t{ AP, 0x50000000fc0fc044ull, 0xf8000000fc0fc0e7ull, N(\"bar or\"), PDST3, T(bar), T(pnot3), PSRC3 },\n \t{ AP, 0x50ee0000000fc084ull, 0xf8ee4000000fc0e7ull, N(\"bar arrive\"), T(bar), SRC2 }, \/\/ ... maybe bit 7 is just enable-threadlimit field?\n \t{ AP, 0x50ee4000000fc084ull, 0xf8ee4000000fc0e7ull, N(\"bar arrive\"), T(bar), TCNT },\n+\t{ AP, 0x5400000000000004ull, 0xfc00000000000007ull, N(\"popc\"), DST, T(not1), SRC1, T(not2), T(is2) }, \/\/ XXX: popc(SRC1 & SRC2)? insane idea, but I don't have any better\n \n \n \t{ AP, 0x8000000000000105ull, 0xf800000000000307ull, N(\"mov\"), T(ldstt), T(ldstd), T(gmem) }, \/\/ XXX wtf is this flag?\n"} {"commit":"b1d85e3b6ad684a79f1ea04c199893aa3de5354c","subject":"more tests for integer decoding on ilp32","message":"more tests for integer decoding on ilp32\n","repos":"hongyunnchen\/asn1c,xxkkk\/asn1c,hongyunnchen\/asn1c,simo5\/asn1c,mojmir-svoboda\/asn1c,khmseu\/asn1c,mouse07410\/asn1c,Yodpong\/asn1c,xxkkk\/asn1c,khmseu\/asn1c,mouse07410\/asn1c,hongyunnchen\/asn1c,hugewave\/asn1c,hugewave\/asn1c,mojmir-svoboda\/asn1c,hugewave\/asn1c,xxkkk\/asn1c,simo5\/asn1c,khmseu\/asn1c,simo5\/asn1c,Yodpong\/asn1c,open-io\/asn1c,hongyunnchen\/asn1c,mojmir-svoboda\/asn1c,mouse07410\/asn1c,open-io\/asn1c,simo5\/asn1c,xxkkk\/asn1c,khmseu\/asn1c,mojmir-svoboda\/asn1c,Yodpong\/asn1c,Yodpong\/asn1c,open-io\/asn1c,hugewave\/asn1c,mouse07410\/asn1c,open-io\/asn1c","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- skeletons\/tests\/check-PER-INTEGER.c\n+++ skeletons\/tests\/check-PER-INTEGER.c\n@@ -166,35 +166,40 @@\n \tCHECK(0, 1073741803UL, -10, 1073741803UL, 30);\n \tCHECK(0, 2147483607UL, -10, 2147483607UL, 31);\n \n-\tif(sizeof(long) == 4) {\n-\t\tCHECK(0, 0, 0, 4294967205UL, 32);\n-\t\tCHECK(0, 1, 0, 4294967205UL, 32);\n-\t\tCHECK(0, 10, 0, 4294967205UL, 32);\n-\t\tCHECK(0, 0x8babab, 0, 4294967205UL, 32);\n-\n-\t\tCHECK(1, 0x8babab, 0, 4294967295UL, 32);\n-\t\tCHECK(1, 0x8babab, 10, 4294967205UL, 32);\n-\t\tCHECK(1, 11, 10, 4294967205UL, 32);\n-\t\tCHECK(1, 10, 10, 4294967205UL, 32);\n-\n-\t\tCHECK(1, 2000000000, 0, 4294967295UL, 32);\n-\t\tCHECK(1, 2147483647, 0, 4294967295UL, 32);\n-\t\tCHECK(1, 2147483648, 0, 4294967295UL, 32);\n-\t\tCHECK(1, 4000000000, 0, 4294967295UL, 32);\n-\t} else {\n-\t\tCHECK(0, 0, -10, 4294967205UL, 32);\n-\t\tCHECK(0, 1, -10, 4294967205UL, 32);\n-\t\tCHECK(0, -1, -10, 4294967205UL, 32);\n-\t\tCHECK(0, -10, -10, 4294967205UL, 32);\n-\t\tCHECK(0, -10, -10, 4294967205UL, 32);\n-\t\tCHECK(0, 0x8babab, -10, 4294967205UL, 32);\n+\tCHECK(0, -2147483648, -2147483648, 2147483647, 32);\n+\tCHECK(0, -10, -2147483648, 2147483647, 32);\n+\tCHECK(0, -1, -2147483648, 2147483647, 32);\n+\tCHECK(0, 0, -2147483648, 2147483647, 32);\n+\tCHECK(0, 1, -2147483648, 2147483647, 32);\n+\tCHECK(0, 10, -2147483648, 2147483647, 32);\n+\tCHECK(0, 2147483647, -2147483648, 2147483647, 32);\n+\n+\tCHECK(1, 0, 0, 4294967295UL, 32);\n+\tCHECK(1, 1, 0, 4294967295UL, 32);\n+\tCHECK(1, 10, 0, 4294967295UL, 32);\n+\tCHECK(1, 2000000000, 0, 4294967295UL, 32);\n+\tCHECK(1, 2147483647, 0, 4294967295UL, 32);\n+\tCHECK(1, 2147483648, 0, 4294967295UL, 32);\n+\tCHECK(1, 4000000000, 0, 4294967295UL, 32);\n+\tCHECK(1, 4294967295UL, 0, 4294967295UL, 32);\n+\n+\tCHECK(1, 10, 10, 4294967285UL, 32);\n+\tCHECK(1, 11, 10, 4294967285UL, 32);\n+\n+\tif(sizeof(long) > sizeof(uint32_t)) {\n+\t\tCHECK(0, 0, -10, 4294967285UL, 32);\n+\t\tCHECK(0, 1, -10, 4294967285UL, 32);\n+\t\tCHECK(0, -1, -10, 4294967285UL, 32);\n+\t\tCHECK(0, -10, -10, 4294967285UL, 32);\n+\t\tCHECK(0, -10, -10, 4294967285UL, 32);\n+\t\tCHECK(0, 0x8babab, -10, 4294967285UL, 32);\n \n \t\tCHECK(u, 0x8babab, 0, 4294967295UL, 32);\n \t\tCHECK(u, 11, 10, 4294967205UL, 32);\n \t\tCHECK(u, 10, 10, 4294967205UL, 32);\n-\t\tCHECK(u, 4294967205UL, 10, 4294967205UL, 32);\n-\n-\t\tCHECK(0, 4294967205UL, -10, 4294967205UL, 32);\n+\t\tCHECK(u, 4294967205UL, 10, 4294967285UL, 32);\n+\n+\t\tCHECK(0, 4294967205UL, -10, 4294967285UL, 32);\n \t\tCHECK(u, 4294967295UL, 1, 4294967295UL, 32);\n \n \t\tCHECK(u, 2000000000, 0, 4294967295UL, 32);\n"} {"commit":"6692869e3efcd3eb18dcfb4ca16688adc33d2c2f","subject":"gl preserve buffers","message":"gl preserve buffers\n","repos":"mayqueenRD\/OpenVG_Rasbian_UI,chappyhome\/openvg,superjudge\/openvg,chappyhome\/openvg,mayqueenRD\/OpenVG_Rasbian_UI,superjudge\/openvg,superjudge\/openvg,superjudge\/openvg,chappyhome\/openvg,mayqueenRD\/OpenVG_Rasbian_UI,chappyhome\/openvg","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- oglinit.c\n+++ oglinit.c\n@@ -78,11 +78,15 @@\n \tstate->surface = eglCreateWindowSurface(state->display, config, &nativewindow, NULL);\n \tassert(state->surface != EGL_NO_SURFACE);\n \n+\t\/\/ preserve the buffers on swap\n+\tresult = eglSurfaceAttrib(state->display, state->surface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED);\n+\tassert(EGL_FALSE != result);\n+\n \t\/\/ connect the context to the surface\n \tresult = eglMakeCurrent(state->display, state->surface, state->surface, state->context);\n \tassert(EGL_FALSE != result);\n \n-\t\/\/DAVE - Set up screen ratio\n+\t\/\/ set up screen ratio\n \tglViewport(0, 0, (GLsizei) state->screen_width, (GLsizei) state->screen_height);\n \n \tglMatrixMode(GL_PROJECTION);\n"} {"commit":"4d0147dd1811f7a7f93e8225f51659f8cef61fdb","subject":"removed bad neighbor.h include","message":"removed bad neighbor.h include\n","repos":"MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,arurke\/contiki,MohamedSeliem\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,bluerover\/6lbr,bluerover\/6lbr,arurke\/contiki,MohamedSeliem\/contiki,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,MohamedSeliem\/contiki,arurke\/contiki,arurke\/contiki,bluerover\/6lbr,bluerover\/6lbr,MohamedSeliem\/contiki,arurke\/contiki","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- examples\/sky-shell\/sky-checkpoint.c\n+++ examples\/sky-shell\/sky-checkpoint.c\n@@ -28,7 +28,7 @@\n *\n * This file is part of the Contiki operating system.\n *\n- * $Id: sky-checkpoint.c,v 1.4 2009\/11\/14 11:31:28 fros4943 Exp $\n+ * $Id: sky-checkpoint.c,v 1.5 2010\/03\/29 09:50:44 fros4943 Exp $\n *\/\n \n \/**\n@@ -42,15 +42,8 @@\n #include \"shell.h\"\n #include \"serial-shell.h\"\n \n-#include \"net\/rime\/neighbor.h\"\n-#include \"dev\/watchdog.h\"\n-\n #include \"net\/rime.h\"\n-#include \"dev\/cc2420.h\"\n #include \"dev\/leds.h\"\n-#include \"dev\/light.h\"\n-#include \"dev\/sht11.h\"\n-#include \"dev\/battery-sensor.h\"\n \n #include \"lib\/checkpoint.h\"\n \n"} {"commit":"59cdc52d1839c545887bb81d3c4890d4c5ae8112","subject":"dont reinvent strdup, noob","message":"dont reinvent strdup, noob\n","repos":"rofl0r\/openbor,rofl0r\/openbor,lantus\/openbor,lantus\/openbor,lantus\/openbor,rofl0r\/openbor,lantus\/openbor,rofl0r\/openbor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- openbor.c\n+++ openbor.c\n@@ -6418,11 +6418,15 @@\n \t}\n }\n \n-\n+void alloc_levelorder(int diff, char* filename) {\n+\tlevelorder[diff][num_levels[diff]] = (s_level_entry *) calloc(1, sizeof(s_level_entry));\n+\tlevelorder[diff][num_levels[diff]]->branchname = strdup(branch_name);\n+\tlevelorder[diff][num_levels[diff]]->filename = strdup(filename);\n+}\n \n \/\/ Add a level to the level order\n void add_level(char *filename, int diff) {\n-\tint len, Zs[3] = { 0, 0, 0 };\n+\tint Zs[3] = { 0, 0, 0 };\n \n \tif(z_coords[0] > 0)\n \t\tZs[0] = z_coords[0];\n@@ -6444,47 +6448,22 @@\n \tif(num_levels[diff] >= MAX_LEVELS)\n \t\tshutdown(1, \"Too many entries in level order (max. %i)!\", MAX_LEVELS);\n \n-\tlevelorder[diff][num_levels[diff]] = malloc(sizeof(s_level_entry));\n-\tmemset(levelorder[diff][num_levels[diff]], 0, sizeof(s_level_entry));\n-\n-\tlen = strlen(branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->branchname, branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname[len] = 0;\n-\n-\tlen = strlen(filename);\n-\tlevelorder[diff][num_levels[diff]]->filename = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->filename, filename);\n-\tlevelorder[diff][num_levels[diff]]->filename[len] = 0;\n-\n+\talloc_levelorder(diff, filename);\n+\t\n \tlevelorder[diff][num_levels[diff]]->z_coords[0] = Zs[0];\n \tlevelorder[diff][num_levels[diff]]->z_coords[1] = Zs[1];\n \tlevelorder[diff][num_levels[diff]]->z_coords[2] = Zs[2];\n \tnum_levels[diff]++;\n }\n \n-\n-\n \/\/ Add a scene to the level order\n void add_scene(char *filename, int diff) {\n-\tint len;\n \tif(diff > MAX_DIFFICULTIES)\n \t\treturn;\n \tif(num_levels[diff] >= MAX_LEVELS)\n \t\tshutdown(1, \"Too many entries in level order (max. %i)!\", MAX_LEVELS);\n-\n-\tlevelorder[diff][num_levels[diff]] = (s_level_entry *) malloc(sizeof(s_level_entry));\n-\tmemset(levelorder[diff][num_levels[diff]], 0, sizeof(s_level_entry));\n-\n-\tlen = strlen(branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->branchname, branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname[len] = 0;\n-\n-\tlen = strlen(filename);\n-\tlevelorder[diff][num_levels[diff]]->filename = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->filename, filename);\n-\tlevelorder[diff][num_levels[diff]]->filename[len] = 0;\n+\t\n+\talloc_levelorder(diff, filename);\n \n \tlevelorder[diff][num_levels[diff]]->type = cut_scene;\n \tnum_levels[diff]++;\n@@ -6492,24 +6471,12 @@\n \n \/\/ Add a select screen file to the level order\n void add_select(char *filename, int diff) {\n-\tint len;\n \tif(diff > MAX_DIFFICULTIES)\n \t\treturn;\n \tif(num_levels[diff] >= MAX_LEVELS)\n \t\tshutdown(1, \"Too many entries in level order (max. %i)!\", MAX_LEVELS);\n-\n-\tlevelorder[diff][num_levels[diff]] = (s_level_entry *) malloc(sizeof(s_level_entry));\n-\tmemset(levelorder[diff][num_levels[diff]], 0, sizeof(s_level_entry));\n-\n-\tlen = strlen(branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->branchname, branch_name);\n-\tlevelorder[diff][num_levels[diff]]->branchname[len] = 0;\n-\n-\tlen = strlen(filename);\n-\tlevelorder[diff][num_levels[diff]]->filename = malloc(len + 1);\n-\tstrcpy(levelorder[diff][num_levels[diff]]->filename, filename);\n-\tlevelorder[diff][num_levels[diff]]->filename[len] = 0;\n+\t\n+\talloc_levelorder(diff, filename);\n \n \tlevelorder[diff][num_levels[diff]]->type = select_screen;\n \tnum_levels[diff]++;\n"} {"commit":"12db1c0d34f04714a9aea4416175b80d6b1dfc8b","subject":"average overall error during cast","message":"average overall error during cast\n\naddresses #141\n","repos":"nezticle\/fluidsynth,nezticle\/fluidsynth,nezticle\/fluidsynth,nezticle\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fluidsynth\/src\/midi\/fluid_midi.c\n+++ fluidsynth\/src\/midi\/fluid_midi.c\n@@ -1624,7 +1624,7 @@\n player->cur_msec = msec;\n player->cur_ticks = (player->start_ticks\n + (int) ((double) (player->cur_msec - player->start_msec)\n- \/ player->deltatime));\n+ \/ player->deltatime + 0.5)); \/* 0.5 to average overall error when casting *\/\n \n for (i = 0; i < player->ntracks; i++) {\n if (!fluid_track_eot(player->track[i])) {\n"} {"commit":"21455a80bfee3e78206f98616cb902c0bfaced8c","subject":"added weighted bounding box averaging","message":"added weighted bounding box averaging\n","repos":"trungda\/mlpack,BookChan\/mlpack,ranjan1990\/mlpack,trungda\/mlpack,BookChan\/mlpack,theranger\/mlpack,palashahuja\/mlpack,chenmoshushi\/mlpack,palashahuja\/mlpack,erubboli\/mlpack,ersanliqiao\/mlpack,erubboli\/mlpack,stereomatchingkiss\/mlpack,ranjan1990\/mlpack,thirdwing\/mlpack,thirdwing\/mlpack,Azizou\/mlpack,theranger\/mlpack,trungda\/mlpack,Azizou\/mlpack,stereomatchingkiss\/mlpack,palashahuja\/mlpack,ajjl\/mlpack,bmswgnp\/mlpack,ajjl\/mlpack,lezorich\/mlpack,thirdwing\/mlpack,datachand\/mlpack,datachand\/mlpack,lezorich\/mlpack,bmswgnp\/mlpack,stereomatchingkiss\/mlpack,lezorich\/mlpack,chenmoshushi\/mlpack,erubboli\/mlpack,ranjan1990\/mlpack,ajjl\/mlpack,darcyliu\/mlpack,BookChan\/mlpack,bmswgnp\/mlpack,ersanliqiao\/mlpack,minhpqn\/mlpack,darcyliu\/mlpack,theranger\/mlpack,Azizou\/mlpack,minhpqn\/mlpack,minhpqn\/mlpack,chenmoshushi\/mlpack,datachand\/mlpack,darcyliu\/mlpack,ersanliqiao\/mlpack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- fastlib2\/fastlib\/tree\/bounds.h\n+++ fastlib2\/fastlib\/tree\/bounds.h\n@@ -56,7 +56,7 @@\n * i.e. the max and min of each range is the average of the maxes and mins \n * of the arguments. \n *\n- * Added by: Bill March, 5\/7\n+ * Added by: Bill March\n *\/\n void AverageBoxesInit(const DHrectBound& box1, const DHrectBound& box2) {\n \n@@ -74,7 +74,48 @@\n \n } \n \n- } \/\/ AverageBoxes()\n+ } \/\/ AverageBoxesInit()\n+\n+ \/** \n+ * Computes the weighted average bounding box of two given boxes.\n+ *\n+ * If A \\in box1 and B \\in box2, each point in box1 (box2) is associated \n+ * with a weight \\alpha (\\beta), then this box bounds the vectors \n+ * (\\alpha A + \\beta B)\/(\\alpha + \\beta)\n+ *\n+ * alpha1_min and alpha1_max bound the possible (positive) weights of the \n+ * vectors in box1\n+ *\n+ * added by Bill March \n+ *\/\n+ void WeightedAverageBoxesInit(double alpha1_min, double alpha1_max, \n+ const DHrectBound& box1, double alpha2_min, \n+ double alpha2_max, const DHrectBound& box2) {\n+ \n+ index_t dim = box1.dim();\n+ DEBUG_ASSERT(dim == box2.dim());\n+ \n+ Init(dim);\n+ \n+ for (index_t i = 0; i < dim; i++) {\n+ \n+ DRange range1 = box1.get(i);\n+ DRange range2 = box2.get(i);\n+ \n+ double min_x = alpha1_min * range1.lo + alpha2_min * range2.lo;\n+ min_x = min_x\/(alpha1_max + alpha2_max);\n+\n+ double max_x = alpha1_max * range1.hi + alpha2_max * range2.hi;\n+ max_x = max_x\/(alpha1_min + alpha2_min);\n+\n+ DRange out_range;\n+ out_range.Init(min_x, max_x);\n+ \n+ bounds_[i] = out_range;\n+ \n+ } \n+ \n+ } \/\/ WeightedAverageBoxesInit()\n \n \/**\n * Resets all dimensions to the empty set.\n"} {"commit":"c5a7aeb4c09bea07076f51db41b2c0e9f5747d6c","subject":"openbor.h: sort the model props by type to avoid alignment bloat","message":"openbor.h: sort the model props by type to avoid alignment bloat\n","repos":"rofl0r\/openbor-legacy,rofl0r\/openbor-legacy,rofl0r\/openbor-legacy,rofl0r\/openbor-legacy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- openbor.h\n+++ openbor.h\n@@ -849,33 +849,30 @@\n #define MF_ALL 0x1FFFF\n \n typedef struct {\n-\tint index;\n+\tint (*special)[MAX_SPECIAL_INPUTS];\t\/\/ Stores freespecials\n+\tint (*weapon)[MAX_WEAPONS];\t\/\/ weapon model list\n+\n+\tunsigned char *palette;\t\/\/ original palette for 32\/16bit mode\n+\tunsigned char *colourmap[MAX_COLOUR_MAPS];\n \tchar *name;\n \tchar *path;\t\t\/\/ Path, so scripts can dynamically get files, sprites, sounds, etc.\n-\tunsigned int score;\n-\tfloat stats[20];\t\/\/ Parameters that do nothing on their own.\n+\tchar *branch;\t\t\/\/level branch name\n+\tfloat *defense_factors;\t\/\/basic defense factors: damage = damage*(1-def)\n+\tfloat *defense_pain;\t\/\/Pain factor (like nopain) for defense type.\n+\tfloat *defense_knockdown;\t\/\/Knockdowncount (like knockdowncount) for attack type.\n+\tfloat *defense_blockpower;\t\/\/If > unblockable, this attack type is blocked.\n+\tfloat *defense_blockthreshold;\t\/\/Strongest attack from this attack type that can be blocked.\n+\tfloat *defense_blockratio;\t\/\/% of damage still taken from this attack type when blocked.\n+\tfloat *defense_blocktype;\t\/\/0 = HP, 1=MP, 2=both taken when this attack type is blocked.\n+\tfloat *offense_factors;\t\/\/basic offense factors: damage = damage*(1+def)\n+\ts_attack *smartbomb;\n+\ts_anim **animation;\n+\t\n \tint health;\n-\tfloat scroll;\t\t\/\/ Autoscroll like panel entity.\n-\tunsigned offscreenkill;\t\/\/ for biker, arrow, etc\n-\t\/\/unsigned offscreenkillz;\n-\t\/\/unsigned offscreeenkila;\n \tint mp;\t\t\t\/\/ mp's variable for mpbar by tails\n-\tshort counter;\t\/\/ counter of weapons by tails\n-\tunsigned char shootnum;\t\/\/ counter of shots by tails\n-\tunsigned char reload;\t\/\/ reload max shots by tails\n-\tchar reactive;\t\/\/ Used for setting the \"a\" at which weapons are spawned\n-\tchar typeshot;\t\/\/ see if weapon is a gun or knife by tails\n-\tchar animal;\t\t\/\/ see is the weapon is a animal by tails\n-\tchar nolife;\t\t\/\/ Feb 25, 2005 - Variable flag to show life 0 = no, else yes\n \tint makeinv;\t\t\/\/ Option to spawn player invincible >0 blink <0 noblink\n \tint riseinv;\t\t\/\/ how many seconds will the character become invincible after rise >0 blink, <0 noblink\n-\tchar dofreeze;\t\/\/ Flag to freeze all enemies\/players while special is executed\n-\tchar noquake;\t\t\/\/ Flag to make the screen shake when entity lands 1 = no, else yes\n-\tchar ground;\t\t\/\/ Flag to determine if enemy projectiles only hit the enemy when hitting the ground\n \tint multiple;\t\t\/\/ So you can control how many points are given for hitting opponents\n-\tchar bounce;\t\t\/\/ Flag to determine if bounce\/quake is to be used.\n-\tshort type;\n-\tchar subtype;\n \tint icon;\n \tint iconpain;\t\t\/\/ 20-1-2005 New icons\n \tint iconget;\t\t\/\/ 20-1-2005 New icons\n@@ -884,7 +881,89 @@\n \tint iconmp[3];\t\t\/\/ icon for the mpbar 3 levels\n \tint parrow[MAX_PLAYERS][3];\t\/\/ Image to be displayed when player spawns invincible\n \tint setlayer;\t\t\/\/ Used for forcing enities to be displayed behind\n+\tint diesound;\n+\t\n+\tint index;\n+\t\/\/ these are model id of various stuff\n+\tint project;\n+\tint rider;\t\t\/\/ 7-1-2005 now every \"biker\" can have a new driver!\n+\tint knife;\t\t\/\/ 7-1-2005 now every enemy can have their own \"knife\" projectile\n+\tint pshotno;\t\t\/\/ 7-1-2005 now every enemy can have their own \"knife\" projectile\n+\tint star;\t\t\/\/ 7-1-2005 now every enemy can have their own \"ninja star\" projectiles\n+\tint bomb;\t\t\/\/ New projectile type for exploding bombs\/grenades\/dynamite\n+\tint flash;\t\t\/\/ Now each entity can have their own flash\n+\tint bflash;\t\t\/\/ Flash that plays when an attack is blocked\n+\tint dust[3];\t\t\/\/ Dust spawn (0 = Fall land, 1 = Jumpland, 2 = Jumpstart.)\n+\tint grabforce;\t\t\/\/ grab factor, antigrab - grabforce <= 0 means can grab\n+\tint sight[6];\t\t\/\/ Sight ranges, xmin, xmax, zmin, zmax, amin, amax\n+\tint jugglepoints[2];\t\/\/ juggle points. [0] = current [1] = max total\n+\tint guardpoints[2];\t\/\/ guard points. [0] = current [1] = max total\n+\n+\tunsigned int aiattack;\t\/\/ attack\/defend style\n+\tunsigned int aimove;\t\/\/ move style\n+\tunsigned int offscreenkill;\t\/\/ for biker, arrow, etc\n+\tunsigned int score;\n+\t\n+\tfloat stats[20];\t\/\/ Parameters that do nothing on their own.\n+\tfloat scroll;\t\t\/\/ Autoscroll like panel entity.\n+\n+\tfloat speed;\n+\tfloat grabdistance;\t\/\/ 30-12-2004 grabdistance varirable adder per character\n+\tfloat jumpspeed;\t\/\/ normal jump foward speed, default to max(1, speed)\n+\tfloat jumpheight;\t\/\/ 28-12-2004 Jump height variable added per character\n+\tfloat grabwalkspeed;\n+\tfloat runspeed;\t\t\/\/ The speed the character runs at\n+\tfloat runjumpheight;\t\/\/ The height the character jumps when running\n+\tfloat runjumpdist;\t\/\/ The distance the character jumps when running\n+\tfloat throwheight;\t\/\/ The height at which an opponent can now be adjusted\n+\tfloat throwdist;\t\/\/ The distance an opponent can now be adjusted\n+\tfloat lifespan;\t\t\/\/ lifespan count down\n+\tfloat knockdowncount;\t\/\/ the knock down count for this entity\n+\tfloat antigravity;\t\/\/antigravity : gravity * (1- antigravity)\n+\t\n+\tshort mpstableval;\t\/\/ MP Stable target.\n+\tshort aggression;\t\/\/ For enemy A.I.\n+\tshort risetime[2];\t\/\/ 0 = Rise delay, 1 = Riseattack delay.\n+\tshort sleepwait;\n+\tshort counter;\t\/\/ counter of weapons by tails\n+\tshort type;\n \tshort thold;\t\t\/\/ The entities threshold for block\n+\tshort blockodds;\t\/\/ Odds that an enemy will block an attack (1 : blockodds)\n+\tshort throwframewait;\t\/\/ The frame victim is thrown during ANIM_THROW, added by kbandressen 10\/20\/06\n+\tshort specials_loaded;\t\/\/ Stores how many specials have been loaded\n+\tshort valid_special;\t\/\/ Used for setting when a valid special has been found\n+\tshort height;\t\/\/ Used to set height of player in pixels\n+\tshort turndelay;\t\/\/ turn delay\n+\tshort stealth[2];\t\/\/ 0 = Entity's invisibility to AI. 1 = AI ability to see through stealth.\n+\n+\t\/\/---------------new A.I. switches-----------\n+\tshort hostile;\t\/\/ specify hostile types\n+\tshort candamage;\t\/\/ specify types that can be damaged by this entity\n+\tshort projectilehit;\t\/\/ specify types that can be hit by this entity if it is thrown\n+\t\n+\tshort throwdamage;\t\/\/ 1-14-05 adjust throw damage\n+\tshort hpx;\n+\tshort hpy;\n+\tshort iconx;\n+\tshort icony;\n+\tshort namex;\n+\tshort namey;\n+\t\n+\tunsigned char shootnum;\t\/\/ counter of shots by tails\n+\tunsigned char reload;\t\/\/ reload max shots by tails\n+\tchar weapnum;\n+\tchar secret;\n+\tchar weaploss[2];\t\/\/ Determines possibility of losing weapon.\n+\tchar ownweapons;\t\/\/ is the weapon list own or share with others\n+\tchar reactive;\t\/\/ Used for setting the \"a\" at which weapons are spawned\n+\tchar typeshot;\t\/\/ see if weapon is a gun or knife by tails\n+\tchar animal;\t\t\/\/ see is the weapon is a animal by tails\n+\tchar nolife;\t\t\/\/ Feb 25, 2005 - Variable flag to show life 0 = no, else yes\n+\tchar dofreeze;\t\/\/ Flag to freeze all enemies\/players while special is executed\n+\tchar noquake;\t\t\/\/ Flag to make the screen shake when entity lands 1 = no, else yes\n+\tchar ground;\t\t\/\/ Flag to determine if enemy projectiles only hit the enemy when hitting the ground\n+\tchar bounce;\t\t\/\/ Flag to determine if bounce\/quake is to be used.\n+\tchar subtype;\n \tchar fmap;\t\t\/\/ Corresponds to which remap to use for when a character is frozen\n \tchar komap[2];\t\t\/\/ Remap to use when KO'd\n \tchar hmap1;\t\t\/\/Bottom range of remaps unavailable at select screen.\n@@ -901,56 +980,18 @@\n \tchar holdblock;\t\/\/ Continue the block animation as long as the player holds the button down\n \tchar nopassiveblock;\t\/\/ Don't auto block randomly\n \tchar blockback;\t\/\/ Able to block attacks from behind\n-\tshort blockodds;\t\/\/ Odds that an enemy will block an attack (1 : blockodds)\n-\ts_edelay edelay;\t\/\/ Entity level delay adjustment.\n-\tfloat runspeed;\t\t\/\/ The speed the character runs at\n-\tfloat runjumpheight;\t\/\/ The height the character jumps when running\n-\tfloat runjumpdist;\t\/\/ The distance the character jumps when running\n \tchar noatflash;\t\/\/ Flag to determine if attacking characters attack spawns a flash\n \tchar runupdown;\t\/\/ Flag to determine if a player will continue to run while pressing up or down\n \tchar runhold;\t\t\/\/ Flag to determine if a player will continue to run if holding down forward when landing\n \tchar remove;\t\t\/\/ Flag to remove a projectile on contact or not\n-\tfloat throwheight;\t\/\/ The height at which an opponent can now be adjusted\n-\tfloat throwdist;\t\/\/ The distance an opponent can now be adjusted\n-\tshort throwframewait;\t\/\/ The frame victim is thrown during ANIM_THROW, added by kbandressen 10\/20\/06\n-\tint (*special)[MAX_SPECIAL_INPUTS];\t\/\/ Stores freespecials\n-\tshort specials_loaded;\t\/\/ Stores how many specials have been loaded\n-\tshort valid_special;\t\/\/ Used for setting when a valid special has been found\n-\tint diesound;\n-\tchar weapnum;\n-\tchar secret;\n-\tchar weaploss[2];\t\/\/ Determines possibility of losing weapon.\n-\tchar ownweapons;\t\/\/ is the weapon list own or share with others\n-\tint (*weapon)[MAX_WEAPONS];\t\/\/ weapon model list\n-\n-\t\/\/ these are model id of various stuff\n-\tint project;\n-\tint rider;\t\t\/\/ 7-1-2005 now every \"biker\" can have a new driver!\n-\tint knife;\t\t\/\/ 7-1-2005 now every enemy can have their own \"knife\" projectile\n-\tint pshotno;\t\t\/\/ 7-1-2005 now every enemy can have their own \"knife\" projectile\n-\tint star;\t\t\/\/ 7-1-2005 now every enemy can have their own \"ninja star\" projectiles\n-\tint bomb;\t\t\/\/ New projectile type for exploding bombs\/grenades\/dynamite\n-\tint flash;\t\t\/\/ Now each entity can have their own flash\n-\tint bflash;\t\t\/\/ Flash that plays when an attack is blocked\n-\tint dust[3];\t\t\/\/ Dust spawn (0 = Fall land, 1 = Jumpland, 2 = Jumpstart.)\n-\tshort height;\t\/\/ Used to set height of player in pixels\n-\tfloat speed;\n-\tfloat grabdistance;\t\/\/ 30-12-2004 grabdistance varirable adder per character\n-\tfloat jumpspeed;\t\/\/ normal jump foward speed, default to max(1, speed)\n-\tfloat jumpheight;\t\/\/ 28-12-2004 Jump height variable added per character\n \tchar jumpmovex;\t\/\/ low byte: 0 default 1 flip in air, 2 move in air, 3 flip and move\n \tchar jumpmovez;\t\/\/ 2nd byte: 0 default 1 zjump with flip(not implemented yet) 2 z jump move in air, 3 1+2\n \tchar grabfinish;\t\/\/ wait for grab animation to finish before do other actoins\n \tchar antigrab;\t\/\/ anti-grab factor\n-\tint grabforce;\t\t\/\/ grab factor, antigrab - grabforce <= 0 means can grab\n \tchar facing;\t\t\/\/ 0 no effect, 1 alway right, 2 always left, 3, affected by level dir\n \tchar grabback;\t\/\/ Flag to determine if entities grab images display behind opponenets\n \tchar grabturn;\n \tchar paingrab;\t\/\/ Can only be grabbed when in pain\n-\tfloat grabwalkspeed;\n-\tshort throwdamage;\t\/\/ 1-14-05 adjust throw damage\n-\tunsigned char *palette;\t\/\/ original palette for 32\/16bit mode\n-\tunsigned char *colourmap[MAX_COLOUR_MAPS];\n \tchar maps_loaded;\t\/\/ Used for player colourmap selecting\n \tchar unload;\t\t\/\/ Unload model after level completed?\n \tchar falldie;\t\t\/\/ Play die animation?\n@@ -961,7 +1002,6 @@\n \tchar blockpain;\n \tchar atchain[MAX_ATCHAIN];\n \tchar chainlength;\n-\ts_anim **animation;\n \tchar credit;\n \tchar escapehits;\t\/\/ Escape spammers!\n \tchar chargerate;\t\/\/ For the charge animation\n@@ -969,54 +1009,9 @@\n \tchar mprate;\t\t\/\/ For time-based mp recovery.\n \tchar mpdroprate;\t\/\/ Time based MP loss.\n \tchar mpstable;\t\/\/ MP stable type.\n-\tshort mpstableval;\t\/\/ MP Stable target.\n-\tshort aggression;\t\/\/ For enemy A.I.\n-\tshort risetime[2];\t\/\/ 0 = Rise delay, 1 = Riseattack delay.\n-\tshort sleepwait;\n \tchar riseattacktype;\n-\tint jugglepoints[2];\t\/\/ juggle points. [0] = current [1] = max total\n-\tint guardpoints[2];\t\/\/ guard points. [0] = current [1] = max total\n \tchar mpswitch;\t\/\/ switch between reduce or gain mp for mpstabletype 4\n-\tshort turndelay;\t\/\/ turn delay\n-\tfloat lifespan;\t\t\/\/ lifespan count down\n-\tfloat knockdowncount;\t\/\/ the knock down count for this entity\n-\tshort stealth[2];\t\/\/ 0 = Entity's invisibility to AI. 1 = AI ability to see through stealth.\n-\n-\t\/\/---------------new A.I. switches-----------\n-\tshort hostile;\t\/\/ specify hostile types\n-\tshort candamage;\t\/\/ specify types that can be damaged by this entity\n-\tshort projectilehit;\t\/\/ specify types that can be hit by this entity if it is thrown\n-\tunsigned int aimove;\t\/\/ move style\n-\tint sight[6];\t\t\/\/ Sight ranges, xmin, xmax, zmin, zmax, amin, amax\n-\tunsigned int aiattack;\t\/\/ attack\/defend style\n-\n-\t\/\/----------------physical system-------------------\n-\tfloat antigravity;\t\/\/antigravity : gravity * (1- antigravity)\n-\n-\t\/\/--------------new property for endlevel item--------\n-\tchar *branch;\t\t\/\/level branch name\n \tchar model_flag;\t\/\/used to judge some copy method when setting new model to an entity\n-\n-\tfloat *defense_factors;\t\/\/basic defense factors: damage = damage*(1-def)\n-\tfloat *defense_pain;\t\/\/Pain factor (like nopain) for defense type.\n-\tfloat *defense_knockdown;\t\/\/Knockdowncount (like knockdowncount) for attack type.\n-\tfloat *defense_blockpower;\t\/\/If > unblockable, this attack type is blocked.\n-\tfloat *defense_blockthreshold;\t\/\/Strongest attack from this attack type that can be blocked.\n-\tfloat *defense_blockratio;\t\/\/% of damage still taken from this attack type when blocked.\n-\tfloat *defense_blocktype;\t\/\/0 = HP, 1=MP, 2=both taken when this attack type is blocked.\n-\tfloat *offense_factors;\t\/\/basic offense factors: damage = damage*(1+def)\n-\n-\ts_attack *smartbomb;\n-\n-\t\/\/ e.g., boss\n-\ts_barstatus hpbarstatus;\n-\tshort hpx;\n-\tshort hpy;\n-\tshort iconx;\n-\tshort icony;\n-\tshort namex;\n-\tshort namey;\n-\n \t\/\/ movement flags\n \tchar subject_to_wall;\n \tchar subject_to_platform;\n@@ -1029,8 +1024,11 @@\n \tchar no_adjust_base;\t\/\/ dont change base to 0 automatically\n \tchar instantitemdeath;\t\/\/ no delay before item suicides\n \tchar isSubclassed;\n+\t\n \tModelFreetype freetypes;\n \ts_scripts scripts;\n+\ts_barstatus hpbarstatus;\n+\ts_edelay edelay;\t\/\/ Entity level delay adjustment.\n } s_model;\n \n typedef struct {\n"} {"commit":"2c85c3478b184d5572a710a0fafd2bf31da49fed","subject":"silence compiler warnings - is this legal C99?","message":"silence compiler warnings - is this legal C99?\n","repos":"intelesg\/PGAS-examples","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- openmp2.c\n+++ openmp2.c\n@@ -28,12 +28,12 @@\n int n = (argc>1) ? atoi(argv[1]) : 1<<20;\n int np = omp_get_max_threads();\n if (np<2) exit(1);\n- int ** A = ompx_calloc(n*sizeof(int));\n+ int ** A = (int**)ompx_calloc(n*sizeof(int));\n #pragma omp parallel shared(A)\n {\n \/* threaded computation *\/\n }\n- ompx_free(A);\n+ ompx_free((void**)A);\n return 0;\n }\n \n"} {"commit":"fdc17abbc4b6094b34ee8ff5d91eaba8637594a2","subject":"pnfsblock: fix size of upcall message","message":"pnfsblock: fix size of upcall message\n\nMake the status field explicitly 32 bits. \"...it's unlikely that the kernel\nand userspace would differ on the size of an int here, but it might be a\ngood idea to go ahead and make that explicitly 32 bits in case we end up\ndealing with more exotic arches at some point in the future.\"\n\nSuggested-by: Jeff Layton <4376fbf8623cd7b7c0232225289bb91cedc0a27f@redhat.com>\nSigned-off-by: Jim Rees <14205d78daf1e87c7b0b53ebbdb5dec3841e86d0@umich.edu>\nSigned-off-by: Benny Halevy <23c997c90eb8537635e9392d48e7af1bf1b2ca22@tonian.com>\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org [3.0]\nSigned-off-by: Trond Myklebust <6a1f9db795c9fc44be97d66ab114c53193bd3d13@netapp.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/nfs\/blocklayout\/blocklayout.h\n+++ fs\/nfs\/blocklayout\/blocklayout.h\n@@ -150,7 +150,7 @@\n }\n \n struct bl_dev_msg {\n-\tint status;\n+\tint32_t status;\n \tuint32_t major, minor;\n };\n \n"} {"commit":"fa34f2d8984e7140528f781147635dce3ecf0ef5","subject":"Added basic UART handling","message":"Added basic UART handling\n","repos":"cmonr\/HoverPuck-Package,cmonr\/HoverPuck-Package,cmonr\/HoverPuck-Package","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- firmware\/EFM8\/src\/Interrupts.c\n+++ firmware\/EFM8\/src\/Interrupts.c\n@@ -22,7 +22,18 @@\n \/\/-----------------------------------------------------------------------------\n SI_INTERRUPT (UART0_ISR, UART0_IRQn)\n {\n+\tif (SCON0_RI)\n+\t{\n+\t\t\/\/ We received data\n+\t\tSCON0_RI = 0;\n+\t\trxData = SBUF0;\n+\t}\n \n+\tif (SCON0_TI)\n+\t{\n+\t\t\/\/ We transmitted data\n+\t\tSCON0_TI = 0;\n+\t}\n }\n \n \n"} {"commit":"9152d431da4dab77d010834046f72b84044dffab","subject":"- ssl options were only setable rather than modifiable through setOptions","message":"- ssl options were only setable rather than modifiable through setOptions\n\n","repos":"m6w6\/ext-http,m6w6\/ext-http,datasift\/ext-http,datasift\/ext-http,datasift\/ext-http,m6w6\/ext-http,m6w6\/ext-http,datasift\/ext-http","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- http_request_object.c\n+++ http_request_object.c\n@@ -658,7 +658,13 @@\n \t\t\t\t\tarray_merge(*opt, *cookies);\n \t\t\t\t\tcontinue;\n \t\t\t\t}\n-\t\t\t} else if ((!strcasecmp(key, \"url\")) || (!strcasecmp(key, \"uri\"))) {\n+\t\t\t} else if (!strcmp(key, \"ssl\")) {\n+\t\t\t\tzval **ssl;\n+\t\t\t\tif (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), \"ssl\", sizeof(\"ssl\"), (void **) &ssl)) {\n+\t\t\t\t\tarray_merge(*opt, *ssl);\n+\t\t\t\t\tcontinue;\n+\t\t\t\t}\n+\t\t\t}else if ((!strcasecmp(key, \"url\")) || (!strcasecmp(key, \"uri\"))) {\n \t\t\t\tif (Z_TYPE_PP(opt) != IS_STRING) {\n \t\t\t\t\tconvert_to_string_ex(opt);\n \t\t\t\t}\n"} {"commit":"eda913288157142525a4ca1c109cb1a08d5627a7","subject":"Commented the Gordon-Taylor file","message":"Commented the Gordon-Taylor file\n","repos":"mirrorscotty\/material-data","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- glass-transition\/gordon-taylor.c\n+++ glass-transition\/gordon-taylor.c\n@@ -1,3 +1,9 @@\n+\/**\n+ * @file gordon-taylor.c\n+ * Functions to calculate glass transition temperature using the Gordon-Taylor\n+ * equation.\n+ *\/\n+\n #include \"glass-transition.h\"\n #include <stdlib.h>\n \n@@ -6,9 +12,9 @@\n gordontaylor *gt;\n gt = (gordontaylor*) calloc(sizeof(gordontaylor), 1);\n \n- gt->Tg1 = 435;\n- gt->Tg2 = 138;\n- gt->kGT = 3.4;\n+ gt->Tg1 = 435; \/* [K] Tg of solid at zero moisture content *\/\n+ gt->Tg2 = 138; \/* [K] Tg of water *\/\n+ gt->kGT = 3.4; \/* Gordon-Taylor constant *\/\n \n return gt;\n }\n@@ -19,20 +25,37 @@\n return;\n }\n \n+\/**\n+ * Gordon-Taylor equation for predicting glass transition temperature.\n+ * @param gt Equation parameters\n+ * @param Xdb Moisture content [kg\/kg db]\n+ * @returns Glass transition temperature [K]\n+ *\/\n double GordonTaylor(gordontaylor *gt, double Xdb)\n {\n double w1, w2, Tg;\n- w2 = Xdb\/(1+Xdb);\n- w1 = 1-w2;\n+ w2 = Xdb\/(1+Xdb); \/* Convert from dry basis to wet basis moisture content *\/\n+ w1 = 1-w2; \/* Calculate the mass fraction of solids *\/\n \n+ \/* Gordon-Taylor equation *\/\n Tg = (w1*gt->Tg1 + gt->kGT*w2*gt->Tg2)\/(w1+gt->kGT*w2);\n return Tg;\n }\n \n+\/**\n+ * Use the gordon taylor equation to predict moisture content from glass\n+ * transition temperature.\n+ * @param gt Equation parameters\n+ * @param T Glass transition temperature [K]\n+ * @returns Moisture content [kg\/kg db]\n+ *\/\n double GordonTaylorInv(gordontaylor *gt, double T)\n {\n double Xwb;\n+ \/* Gordon-Taylor equation inverted to calculate wet-basis moisture\n+ * content. *\/\n Xwb = (gt->Tg1-T)\/(gt->Tg1-gt->Tg2*gt->kGT+(gt->kGT-1)*T);\n+ \/* Convert to dry basis *\/\n return Xwb\/(1-Xwb);\n }\n \n"} {"commit":"9c3812e0d25f37425e9d48e1348c88a9ee101015","subject":"configure needs to set HAVE_GSSAPI_EXT depending on our Globus version; the header files don't give enough information for us to determine the correct value here","message":"configure needs to set HAVE_GSSAPI_EXT depending on our Globus version;\nthe header files don't give enough information for us to determine the\ncorrect value here\n","repos":"gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,gridcf\/gct,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gssapi-openssh\/openssh\/ssh-gss.h\n+++ gssapi-openssh\/openssh\/ssh-gss.h\n@@ -139,9 +139,6 @@\n \n #ifdef GSI\n int gsi_gridmap(char *subject_name, char **mapped_name);\n-#ifdef _HAVE_GSI_EXTENDED_GSSAPI\n-#define HAVE_GSSAPI_EXT\n-#endif\n #endif\n \n #ifdef MECHGLUE\n@@ -149,16 +146,8 @@\n (gss_cred_id_t,\t\/* union_cred *\/\n gss_OID\t\t\/* mech_type *\/\n );\n-#ifndef _HAVE_GSI_EXTENDED_GSSAPI\n-#define HAVE_GSSAPI_EXT\n-OM_uint32 gss_export_cred\n- (OM_uint32 *, \/* minor_status *\/\n- const gss_cred_id_t,\/* cred_handle *\/\n- const gss_OID, \/* desired mech *\/\n- OM_uint32, \/* option req *\/\n- gss_buffer_t); \/* output buffer *\/\n #endif\n-#endif\n+\n #endif \/* GSSAPI *\/\n \n #endif \/* _SSH_GSS_H *\/\n"} {"commit":"d05ab22dcdd3969bc41e3f5d6d558de0bade9b4d","subject":"Revert \"droidmemory: use 2 ANativeWindowBuffer objects\"","message":"Revert \"droidmemory: use 2 ANativeWindowBuffer objects\"\n\nThis reverts commit c03920636a5230c2c2f003d971efb98638f9d2a0.\n","repos":"mlehtima\/gst-droid,foolab\/gst-droid,sledges\/gst-droid,foolab\/gst-droid,sledges\/gst-droid,sledges\/gst-droid,sailfishos\/gst-droid,mlehtima\/gst-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst-libs\/gst\/memory\/gstgralloc.c\n+++ gst-libs\/gst\/memory\/gstgralloc.c\n@@ -61,7 +61,9 @@\n GstMemory mem;\n \n struct ANativeWindowBuffer *remote;\n- struct ANativeWindowBuffer buff;\n+\n+ void (*incRef) (struct android_native_base_t * base);\n+ void (*decRef) (struct android_native_base_t * base);\n \n } GstGrallocMemory;\n \n@@ -85,11 +87,14 @@\n struct ANativeWindowBuffer *self =\n container_of (base, struct ANativeWindowBuffer, common);\n \n- GstGrallocMemory *mem = container_of (self, GstGrallocMemory, buff);\n+ GstGrallocMemory *mem = container_of (&self, GstGrallocMemory, remote);\n \n gst_memory_ref (GST_MEMORY_CAST (mem));\n \n GST_DEBUG (\"ref %p\", mem);\n+\n+ \/\/ TODO: crash\n+ \/\/ mem->incRef(base);\n }\n \n static void\n@@ -97,11 +102,14 @@\n {\n struct ANativeWindowBuffer *self =\n container_of (base, struct ANativeWindowBuffer, common);\n- GstGrallocMemory *mem = container_of (self, GstGrallocMemory, buff);\n+ GstGrallocMemory *mem = container_of (&self, GstGrallocMemory, remote);\n \n gst_memory_unref (GST_MEMORY_CAST (mem));\n \n GST_DEBUG (\"unref %p\", mem);\n+\n+ \/\/ TODO: crash\n+ \/\/ mem->decRef(base);\n }\n \n GstAllocator *\n@@ -232,19 +240,11 @@\n return NULL;\n }\n \n- memset (mem->buff.common.reserved, 0, sizeof (mem->buff.common.reserved));\n-\n- mem->buff.width = mem->remote->width;\n- mem->buff.height = mem->remote->height;\n- mem->buff.stride = mem->remote->stride;\n- mem->buff.format = mem->remote->format;\n- mem->buff.usage = mem->remote->usage;\n- mem->buff.handle = mem->remote->handle;\n- mem->buff.common.magic = mem->remote->common.magic;\n- mem->buff.common.version = mem->remote->common.version;\n-\n- mem->buff.common.incRef = incRef;\n- mem->buff.common.decRef = decRef;\n+ mem->incRef = mem->remote->common.incRef;\n+ mem->decRef = mem->remote->common.decRef;\n+\n+ mem->remote->common.incRef = incRef;\n+ mem->remote->common.decRef = decRef;\n \n gst_memory_init (GST_MEMORY_CAST (mem),\n GST_MEMORY_FLAG_NO_SHARE | GST_MEMORY_FLAG_NOT_MAPPABLE, allocator, NULL,\n@@ -362,7 +362,7 @@\n return NULL;\n }\n \n- return &((GstGrallocMemory *) mem)->buff;\n+ return ((GstGrallocMemory *) mem)->remote;\n }\n \n GstVideoFormat\n"} {"commit":"ee07932080e2400d5b0456ae0a200cb849b83bf4","subject":"fiptool: simplify the top line of command usage","message":"fiptool: simplify the top line of command usage\n\nWe need not mention like [--force], [--out <path>] because they are\nincluded in [opts].\n\nSigned-off-by: Masahiro Yamada <378b411a8a63ecc7605ec4272234862d7781c6ae@socionext.com>\n","repos":"sbranden\/arm-trusted-firmware,sbranden\/arm-trusted-firmware,achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware,lsigithub\/arm-trusted-firmware_public,lsigithub\/arm-trusted-firmware_public","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tools\/fiptool\/fiptool.c\n+++ tools\/fiptool\/fiptool.c\n@@ -802,8 +802,9 @@\n {\n \ttoc_entry_t *toc_entry = toc_entries;\n \n-\tprintf(\"fiptool create [--blob uuid=...,file=...] \"\n-\t \"[--plat-toc-flags <value>] [opts] FIP_FILENAME\\n\");\n+\tprintf(\"fiptool create [opts] FIP_FILENAME\\n\");\n+\tprintf(\"\\n\");\n+\tprintf(\"Options:\\n\");\n \tprintf(\" --blob uuid=...,file=...\\tAdd an image with the given UUID \"\n \t \"pointed to by file.\\n\");\n \tprintf(\" --plat-toc-flags <value>\\t16-bit platform specific flag field \"\n@@ -911,8 +912,9 @@\n {\n \ttoc_entry_t *toc_entry = toc_entries;\n \n-\tprintf(\"fiptool update [--blob uuid=...,file=...] [--out FIP_FILENAME] \"\n-\t \"[--plat-toc-flags <value>] [opts] FIP_FILENAME\\n\");\n+\tprintf(\"fiptool update [opts] FIP_FILENAME\\n\");\n+\tprintf(\"\\n\");\n+\tprintf(\"Options:\\n\");\n \tprintf(\" --blob uuid=...,file=...\\tAdd or update an image \"\n \t \"with the given UUID pointed to by file.\\n\");\n \tprintf(\" --out FIP_FILENAME\\t\\tSet an alternative output FIP file.\\n\");\n@@ -1048,8 +1050,9 @@\n {\n \ttoc_entry_t *toc_entry = toc_entries;\n \n-\tprintf(\"fiptool unpack [--blob uuid=...,file=...] [--force] \"\n-\t \"[--out <path>] [opts] FIP_FILENAME\\n\");\n+\tprintf(\"fiptool unpack [opts] FIP_FILENAME\\n\");\n+\tprintf(\"\\n\");\n+\tprintf(\"Options:\\n\");\n \tprintf(\" --blob uuid=...,file=...\\tUnpack an image with the given UUID \"\n \t \"to file.\\n\");\n \tprintf(\" --force\\t\\t\\tIf the output file already exists, use --force to \"\n@@ -1171,8 +1174,9 @@\n {\n \ttoc_entry_t *toc_entry = toc_entries;\n \n-\tprintf(\"fiptool remove [--blob uuid=...] [--force] \"\n-\t \"[--out FIP_FILENAME] [opts] FIP_FILENAME\\n\");\n+\tprintf(\"fiptool remove [opts] FIP_FILENAME\\n\");\n+\tprintf(\"\\n\");\n+\tprintf(\"Options:\\n\");\n \tprintf(\" --blob uuid=...\\tRemove an image with the given UUID.\\n\");\n \tprintf(\" --force\\t\\tIf the output FIP file already exists, use --force to \"\n \t \"overwrite it.\\n\");\n"} {"commit":"2d4243ce60bcd7a9f64c2ce670bc456f2c7da708","subject":"ldso\/mips: Enable bootstrap relocations","message":"ldso\/mips: Enable bootstrap relocations\n\n_dl_reltypes_tab[] is an array of pointers to constant strings:\n\nContents of section .data:\n 20000 01000000 02000000 00000000 00000000 ................\n 20010 70e50000 7ce50000 88e50000 94e50000 p...|...........\n ^^^^^^^^ ^^^^^^^^ ^^^^^^^^ ^^^^^^^^\n\n(pointers are LE)\n\nContents of section .rodata:\n e570 525f4d49 50535f4e 4f4e4500 525f4d49 R_MIPS_NONE.R_MI\n e580 50535f31 36000000 525f4d49 50535f33 PS_16...R_MIPS_3\n e590 32000000 525f4d49 50535f52 454c3332 2...R_MIPS_REL32\n\nThese pointers require relocation:\n\nDYNAMIC RELOCATION RECORDS\nOFFSET TYPE VALUE\n00000000 R_MIPS_NONE *ABS*\n0001fffc R_MIPS_REL32 *ABS*\n00020010 R_MIPS_REL32 *ABS*\n00020014 R_MIPS_REL32 *ABS*\n00020018 R_MIPS_REL32 *ABS*\n\nOn MIPS, only GOT relocations are currently handled by ldso during\nstartup. The net effect is that when running with \"LD_DEBUG=reloc\",\nldso itself crashes before the program even starts. This is caused\nby _dl_dprintf() dereferencing an unadjusted string pointer such as\n0xe570.\n\nThis patch enables the missing relocations and allows LD_DEBUG to work\nas designed.\n\nSigned-off-by: Kevin Cernekee <3105dbb3dd63fbb4f6371cfb04adc6726f76c56b@gmail.com>\nSigned-off-by: Carmelo Amoroso <532378793705a04edd56deb76ad8c0442834d55d@st.com>\n","repos":"atgreen\/uClibc-moxie,groundwater\/uClibc,majek\/uclibc-vx32,ndmsystems\/uClibc,kraj\/uclibc-ng,kraj\/uClibc,wbx-github\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,ffainelli\/uClibc,atgreen\/uClibc-moxie,skristiansson\/uClibc-or1k,hjl-tools\/uClibc,foss-xtensa\/uClibc,ffainelli\/uClibc,ddcc\/klee-uclibc-0.9.33.2,groundwater\/uClibc,ddcc\/klee-uclibc-0.9.33.2,wbx-github\/uclibc-ng,hwoarang\/uClibc,atgreen\/uClibc-moxie,kraj\/uclibc-ng,kraj\/uclibc-ng,brgl\/uclibc-ng,wbx-github\/uclibc-ng,czankel\/xtensa-uclibc,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,waweber\/uclibc-clang,foss-for-synopsys-dwc-arc-processors\/uClibc,foss-xtensa\/uClibc,ddcc\/klee-uclibc-0.9.33.2,foss-for-synopsys-dwc-arc-processors\/uClibc,groundwater\/uClibc,majek\/uclibc-vx32,hwoarang\/uClibc,skristiansson\/uClibc-or1k,waweber\/uclibc-clang,hjl-tools\/uClibc,atgreen\/uClibc-moxie,foss-xtensa\/uClibc,kraj\/uclibc-ng,mephi42\/uClibc,czankel\/xtensa-uclibc,kraj\/uClibc,hjl-tools\/uClibc,ffainelli\/uClibc,groundwater\/uClibc,skristiansson\/uClibc-or1k,waweber\/uclibc-clang,hwoarang\/uClibc,skristiansson\/uClibc-or1k,czankel\/xtensa-uclibc,foss-xtensa\/uClibc,hjl-tools\/uClibc,kraj\/uClibc,majek\/uclibc-vx32,ffainelli\/uClibc,mephi42\/uClibc,waweber\/uclibc-clang,ndmsystems\/uClibc,mephi42\/uClibc,czankel\/xtensa-uclibc,ffainelli\/uClibc,majek\/uclibc-vx32,wbx-github\/uclibc-ng,brgl\/uclibc-ng,hwoarang\/uClibc,ndmsystems\/uClibc,brgl\/uclibc-ng,ndmsystems\/uClibc,kraj\/uClibc,brgl\/uclibc-ng,mephi42\/uClibc,ddcc\/klee-uclibc-0.9.33.2,hjl-tools\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ldso\/ldso\/dl-startup.c\n+++ ldso\/ldso\/dl-startup.c\n@@ -251,7 +251,7 @@\n \tPERFORM_BOOTSTRAP_GOT(tpnt);\n #endif\n \n-#if !defined(PERFORM_BOOTSTRAP_GOT) || defined(__avr32__)\n+#if !defined(PERFORM_BOOTSTRAP_GOT) || defined(__avr32__) || defined(__mips__)\n \n \t\/* OK, now do the relocations. We do not do a lazy binding here, so\n \t that once we are done, we have considerably more flexibility. *\/\n"} {"commit":"16eba3214ab113df9f4539d4cda19e8ca7ae9b05","subject":"fixed writing to \/view\/X\/mode","message":"fixed writing to \/view\/X\/mode\n\n","repos":"sunaku\/wmii,bwhmather\/wmii,0intro\/wmii,sunaku\/wmii,sunaku\/wmii,bwhmather\/wmii,0intro\/wmii,0intro\/wmii,bwhmather\/wmii,bwhmather\/wmii,0intro\/wmii,sunaku\/wmii,sunaku\/wmii,bwhmather\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wm\/fs.c\n+++ cmd\/wm\/fs.c\n@@ -227,8 +227,6 @@\n \t\tbreak;\n \tcase FsFmode:\n \t\tif((qid->dir_type == FsDarea) && (i1 == -1 || i2 == -1))\n-\t\t\treturn nil;\n-\t\telse if(qid->dir_type != FsDdef)\n \t\t\treturn nil;\n \t\tif(qid->dir_type == FsDdef)\n \t\t\treturn \"colmode\";\n@@ -410,8 +408,6 @@\n \tcase FsFmode:\n \t\tif((dir_type == FsDarea) && (dir_i1 == -1 || dir_i2 == -1))\n \t\t\treturn -1;\n-\t\tif(dir_type != FsDdef)\n-\t\t\treturn -1;\n \t\tgoto Mkfile;\n \t\tbreak;\n \tcase FsFgeom:\n"} {"commit":"7169bac85cbf3c91e26f67aa3174e46c169bdb8e","subject":"Redraw the bar on removal or bars","message":"Redraw the bar on removal or bars\n\n","repos":"sunaku\/wmii,sunaku\/wmii,bwhmather\/wmii,sunaku\/wmii,bwhmather\/wmii,0intro\/wmii,0intro\/wmii,0intro\/wmii,sunaku\/wmii,bwhmather\/wmii,bwhmather\/wmii,sunaku\/wmii,0intro\/wmii,bwhmather\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wm\/fs.c\n+++ cmd\/wm\/fs.c\n@@ -804,6 +804,7 @@\n \t\tf = lookup_file(f, r->ifcall.name);\n \t\tif(!f)\n \t\t\treturn respond(r, Enofile);\n+\n \t\tr->ofcall.qid.type = f->tab.qtype;\n \t\tr->ofcall.qid.path = QID(f->tab.type, f->id);\n \t\tf->next = r->fid->aux;\n@@ -822,6 +823,7 @@\n \t\treturn respond(r, Enoperm);\n \tcase FsFBar:\n \t\tdestroy_bar(f->next->bar_p, f->bar);\n+\t\tdraw_bar();\n \t\trespond(r, nil);\n \t\tbreak;\n \t}\n"} {"commit":"87d6c014d4c4e4a64729ae4b73aee4c822159efd","subject":"[NOP] index_qgram_bucketrefinement: brace balanced","message":"[NOP] index_qgram_bucketrefinement: brace balanced\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@13072 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- extras\/include\/seqan\/index\/index_qgram_bucketrefinement.h\n+++ extras\/include\/seqan\/index\/index_qgram_bucketrefinement.h\n@@ -350,7 +350,9 @@\n while (saOld != saEnd)\n {\n if (suffixLength(*saOld, index) < weight(indexShape(index)))\n+ {\n ++saOld;\n+ }\n else\n {\n *saNew = *saOld;\n"} {"commit":"3a44b58b20d8793b2419158bc0b7641b5f28d241","subject":"Use a uchar* buffer for wmiir.c to avoid a warning.","message":"Use a uchar* buffer for wmiir.c to avoid a warning.\n","repos":"bartman\/wmii,bartman\/wmii,bartman\/wmii,bartman\/wmii","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cmd\/wmiir.c\n+++ cmd\/wmiir.c\n@@ -216,7 +216,8 @@\n \tMessage m;\n \tStat *stat;\n \tIxpCFid *fid;\n-\tchar *file, *buf;\n+\tchar *file;\n+\tuchar *buf;\n \tint lflag, dflag, count, nstat, mstat, i;\n \n \tlflag = dflag = 0;\n"} {"commit":"03c0990275029c72600438b52c8612fe65d6b861","subject":"ztest: fix failure when exceeding mock parameter count","message":"ztest: fix failure when exceeding mock parameter count\n\nIf you tried to use more mock parameters than were set in\nCONFIG_ZTEST_PARAMETER_COUNT, you would get a random seg fault somewhere\nunrelated to the mocking parameter as we would use memory past an array\nbounds.\n\nSigned-off-by: Jett Rink <9d4aef0593e6843318d99df31597fb6153b89787@google.com>\n","repos":"finikorg\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,Vudentz\/zephyr,nashif\/zephyr,galak\/zephyr,nashif\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/testsuite\/ztest\/src\/ztest_mock.c\n+++ subsys\/testsuite\/ztest\/src\/ztest_mock.c\n@@ -67,25 +67,34 @@\n \tunsigned long int(name)[((bits) + BITS_PER_UL - 1) \/ BITS_PER_UL]\n \n static inline int sys_bitfield_find_first_clear(const unsigned long *bitmap,\n-\t\t\t\t\t\tunsigned int bits)\n-{\n-\tunsigned int words = (bits + BITS_PER_UL - 1) \/ BITS_PER_UL;\n-\tunsigned int cnt;\n+\t\t\t\t\t\tconst unsigned int bits)\n+{\n+\tconst size_t words = (bits + BITS_PER_UL - 1) \/ BITS_PER_UL;\n+\tsize_t cnt;\n \tunsigned int long neg_bitmap;\n \n \t\/*\n-\t * By bitwise negating the bitmap, we are actually implemeting\n+\t * By bitwise negating the bitmap, we are actually implementing\n \t * ffc (find first clear) using ffs (find first set).\n \t *\/\n-\tfor (cnt = 0U; cnt < words; cnt++) {\n+\tfor (cnt = 0; cnt < words; cnt++) {\n \t\tneg_bitmap = ~bitmap[cnt];\n-\t\tif (neg_bitmap == 0) \/* all full *\/\n+\t\tif (neg_bitmap == 0) {\n+\t\t\t\/* All full. Try next word. *\/\n \t\t\tcontinue;\n-\t\telse if (neg_bitmap == ~0UL) \/* first bit *\/\n+\t\t} else if (neg_bitmap == ~0UL) {\n+\t\t\t\/* First bit is free *\/\n \t\t\treturn cnt * BITS_PER_UL;\n-\t\telse\n-\t\t\treturn cnt * BITS_PER_UL + __builtin_ffsl(neg_bitmap) -\n-\t\t\t 1;\n+\t\t} else {\n+\t\t\tconst unsigned int bit = (cnt * BITS_PER_UL) +\n+\t\t\t\t\t\t __builtin_ffsl(neg_bitmap) - 1;\n+\t\t\t\/* Ensure first free bit is within total bits count *\/\n+\t\t\tif (bit < bits) {\n+\t\t\t\treturn bit;\n+\t\t\t} else {\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n \t}\n \treturn -1;\n }\n"} {"commit":"737977b9dc27043a53e923c88eda45c3328c33ae","subject":"Do not immediately redispatch deferred events","message":"Do not immediately redispatch deferred events\n","repos":"jawebada\/libmbb,jawebada\/libmbb,jawebada\/libmbb,jawebada\/libmbb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mbb\/hsm.c\n+++ mbb\/hsm.c\n@@ -207,16 +207,8 @@\n \t\t\ttarget = result;\n \t}\n \n-\t\/* check whether the event was deferred *\/\n-\tif (target == NULL) {\n-\t\tMDBG_PRINT2(\"event %d was defered by %s\\n\", event.id, state->name);\n-\n-\t\t\/* (re-)enqueue event *\/\n-\t\tif (_defer_event_arg(hsm, event.id, event.arg) != 0)\n-\t\t\tMDBG_PRINT_LN(\"(re-)enqueing defered event failed\");\n-\n-\t\treturn state;\n-\t}\n+\t\/* return if the event was deferred *\/\n+\tif (target == NULL) return NULL;\n \n \tif (target != state) \n \t\treturn _transition(hsm, state, target);\n@@ -241,8 +233,9 @@\n void mhsm_dispatch_event_arg(mhsm_hsm_t *hsm, uint32_t id, int32_t arg)\n {\t\n \tmhsm_event_t event;\n+\tmhsm_state_t *new_state;\n+\tint nevents;\n \tint i;\n-\tint nevents;\n \n \tMDBG_ASSERT(hsm->current_state != NULL);\n \n@@ -256,8 +249,18 @@\n \tevent.id = id;\n \tevent.arg = arg;\n \n-\thsm->current_state = _dispatch_event(hsm, hsm->current_state, event);\n-\tMDBG_ASSERT(hsm->current_state != NULL);\n+\tnew_state = _dispatch_event(hsm, hsm->current_state, event);\n+\tif (new_state == NULL) {\n+\t\tMDBG_PRINT2(\"event %d was defered by %s\\n\", event.id, hsm->current_state->name);\n+\n+\t\t\/* (re-)enqueue event *\/\n+\t\tif (_defer_event_arg(hsm, event.id, event.arg) != 0)\n+\t\t\tMDBG_PRINT_LN(\"(re-)enqueing defered event failed\");\n+\n+\t\treturn;\n+\t}\n+\n+\thsm->current_state = new_state;\n \n \tnevents = MQUE_LENGTH(&hsm->deferred_events);\n \tfor (i = 0; i < nevents; i++) {\n"} {"commit":"c8c9540b04b08d04bd44f6b8c7aa5d75d4a9e1a8","subject":"slice: check if vio is still valid before calling TSVIODone* on shutdown (#7147)","message":"slice: check if vio is still valid before calling TSVIODone* on shutdown (#7147)\n\n","repos":"SolidWallOfCode\/trafficserver,bryancall\/trafficserver,SolidWallOfCode\/trafficserver,vmamidi\/trafficserver,vmamidi\/trafficserver,pbchou\/trafficserver,bryancall\/trafficserver,bryancall\/trafficserver,bryancall\/trafficserver,SolidWallOfCode\/trafficserver,vmamidi\/trafficserver,bryancall\/trafficserver,duke8253\/trafficserver,duke8253\/trafficserver,SolidWallOfCode\/trafficserver,SolidWallOfCode\/trafficserver,bryancall\/trafficserver,vmamidi\/trafficserver,duke8253\/trafficserver,pbchou\/trafficserver,SolidWallOfCode\/trafficserver,duke8253\/trafficserver,pbchou\/trafficserver,duke8253\/trafficserver,duke8253\/trafficserver,duke8253\/trafficserver,SolidWallOfCode\/trafficserver,pbchou\/trafficserver,pbchou\/trafficserver,pbchou\/trafficserver,vmamidi\/trafficserver,vmamidi\/trafficserver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/experimental\/slice\/Stage.h\n+++ plugins\/experimental\/slice\/Stage.h\n@@ -49,7 +49,9 @@\n int64_t const avail = TSIOBufferReaderAvail(m_reader);\n TSIOBufferReaderConsume(m_reader, avail);\n consumed = avail;\n- TSVIONDoneSet(m_vio, TSVIONDoneGet(m_vio) + consumed);\n+ if (nullptr != m_vio) {\n+ TSVIONDoneSet(m_vio, TSVIONDoneGet(m_vio) + consumed);\n+ }\n }\n \n return consumed;\n"} {"commit":"b9af08dcef84b3330f80b032d8b1e43a2f9efb90","subject":"Pedantic - labels can't be parsed as tdefs","message":"Pedantic - labels can't be parsed as tdefs\n","repos":"8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler","returncode":1,"stderr":"error: pathspec 'bugs\/tdef_label.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- bugs\/tdef_label.c\n+++ bugs\/tdef_label.c\n@@ -0,0 +1,7 @@\n+typedef int foo;\n+\n+void f(void)\n+{\n+foo:\n+\treturn;\n+}\n"} {"commit":"9a44d86aa65881a7cec9fa4fe20fc44223ca0643","subject":"WIP Sequences with number of elements in N, rename pt__match_state fields","message":"WIP Sequences with number of elements in N, rename pt__match_state fields\n","repos":"gilzoide\/pega-texto,gilzoide\/pega-texto","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- pega-texto.h\n+++ pega-texto.h\n@@ -148,10 +148,6 @@\n * Return:\n * Anything you want.\n * This result will be used as argument for other actions below in the stack.\n- *\n- * @sa @ref InfixCalculator.c\n- * @sa @ref Lisp.c\n- * @sa @ref Re.c\n *\/\n typedef pt_data(*pt_expression_action)(\n PT_STRING_TYPE str,\n@@ -171,10 +167,10 @@\n * - User custom data from match options\n *\/\n typedef void(*pt_error_action)(\n- PT_STRING_TYPE,\n- size_t,\n- int,\n- void*\n+ PT_STRING_TYPE str,\n+ size_t where,\n+ int code,\n+ void* userdata\n );\n \n \/\/\/ Parsing Expressions.\n@@ -185,10 +181,11 @@\n int16_t N;\n \/\/\/ Literal and Character Set strings, Custom Matcher functions.\n union {\n- void* data;\n+ void *data;\n PT_STRING_TYPE str;\n pt_custom_matcher_function matcher;\n pt_expression_action action;\n+ uintptr_t quantifier;\n };\n } pt_expr;\n \n@@ -200,45 +197,61 @@\n #define PT_RANGE_PACK(from, to) (from | (to << 8))\n #define PT_RANGE_UNPACK(r, into_from, into_to) { into_from = r & 0xff; into_to = (r >> 8); }\n \n-#define PT_END() ((pt_expr){ PT_OP_END, 0, NULL })\n-#define PT_END_SEQUENCE PT_END\n-#define PT_END_CHOICE PT_END\n-#define PT_BYTE(b) ((pt_expr){ PT_OP_BYTE, b, NULL })\n+\/\/ Ref: https:\/\/groups.google.com\/g\/comp.std.c\/c\/d-6Mj5Lko_s\n+#define PT_NARG(...) \\\n+ PT_NARG_(__VA_ARGS__, PT_RSEQ_N())\n+#define PT_NARG_(...) \\\n+ PT_ARG_N(__VA_ARGS__)\n+#define PT_ARG_N( \\\n+ _1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \\\n+ _11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \\\n+ _21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \\\n+ _31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \\\n+ _41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \\\n+ _51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \\\n+ _61,_62,_63,N,...) N\n+#define PT_RSEQ_N() \\\n+ 63,62,61,60, \\\n+ 59,58,57,56,55,54,53,52,51,50, \\\n+ 49,48,47,46,45,44,43,42,41,40, \\\n+ 39,38,37,36,35,34,33,32,31,30, \\\n+ 29,28,27,26,25,24,23,22,21,20, \\\n+ 19,18,17,16,15,14,13,12,11,10, \\\n+ 9,8,7,6,5,4,3,2,1,0\n+\n+#define PT_END() ((pt_expr){ PT_OP_END })\n+#define PT_BYTE(b) ((pt_expr){ PT_OP_BYTE, b })\n #define PT_LITERAL(str, size) ((pt_expr){ PT_OP_LITERAL, size, str })\n #define PT_LITERAL_S(str) ((pt_expr){ PT_OP_LITERAL, sizeof(str) - 1, str })\n #define PT_LITERAL_0(str) ((pt_expr){ PT_OP_LITERAL, strlen(str), str })\n #define PT_CASE(str, size) ((pt_expr){ PT_OP_CASE_INSENSITIVE, size, str })\n #define PT_CASE_S(str) ((pt_expr){ PT_OP_CASE_INSENSITIVE, sizeof(str) - 1, str })\n #define PT_CASE_0(str) ((pt_expr){ PT_OP_CASE_INSENSITIVE, strlen(str), str })\n-#define PT_ALNUM() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_ALNUM, NULL })\n-#define PT_ALPHA() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_ALPHA, NULL })\n-#define PT_CNTRL() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_CNTRL, NULL })\n-#define PT_DIGIT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_DIGIT, NULL })\n-#define PT_GRAPH() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_GRAPH, NULL })\n-#define PT_LOWER() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_LOWER, NULL })\n-#define PT_PUNCT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_PUNCT, NULL })\n-#define PT_SPACE() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_SPACE, NULL })\n-#define PT_UPPER() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_UPPER, NULL })\n-#define PT_XDIGIT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_XDIGIT, NULL })\n+#define PT_ALNUM() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_ALNUM })\n+#define PT_ALPHA() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_ALPHA })\n+#define PT_CNTRL() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_CNTRL })\n+#define PT_DIGIT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_DIGIT })\n+#define PT_GRAPH() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_GRAPH })\n+#define PT_LOWER() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_LOWER })\n+#define PT_PUNCT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_PUNCT })\n+#define PT_SPACE() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_SPACE })\n+#define PT_UPPER() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_UPPER })\n+#define PT_XDIGIT() ((pt_expr){ PT_OP_CHARACTER_CLASS, PT_CLASS_XDIGIT })\n #define PT_SET(str, size) ((pt_expr){ PT_OP_SET, size, str })\n #define PT_SET_S(str) ((pt_expr){ PT_OP_SET, sizeof(str) - 1, str })\n #define PT_SET_0(str) ((pt_expr){ PT_OP_SET, strlen(str), str })\n-#define PT_RANGE(from, to) ((pt_expr){ PT_OP_RANGE, PT_RANGE_PACK(from, to), NULL })\n-#define PT_ANY() ((pt_expr){ PT_OP_ANY, 0, NULL })\n-#define PT_RULE(index) ((pt_expr){ PT_OP_NON_TERMINAL, index, NULL })\n-#define PT_AT_LEAST(n) ((pt_expr){ PT_OP_AT_LEAST, n, NULL })\n-#define PT_AT_MOST(n) ((pt_expr){ PT_OP_AT_MOST, n, NULL })\n-#define PT_AND_() ((pt_expr){ PT_OP_AND, 0, NULL })\n-#define PT_AND(expr) PT_AND_(), expr\n-#define PT_NOT_() ((pt_expr){ PT_OP_NOT, 0, NULL })\n-#define PT_NOT(expr) PT_NOT_(), expr\n-#define PT_SEQUENCE_() ((pt_expr){ PT_OP_SEQUENCE, 0, NULL })\n-#define PT_SEQUENCE(...) PT_SEQUENCE_(), __VA_ARGS__, PT_END()\n-#define PT_CHOICE_() ((pt_expr){ PT_OP_CHOICE, 0, NULL })\n-#define PT_CHOICE(...) (pt_expr){ PT_OP_CHOICE, 0, NULL }, __VA_ARGS__, (pt_expr){ PT_OP_END }\n-#define PT_CUSTOM_MATCHER(f) ((pt_expr){ PT_OP_CUSTOM_MATCHER, 0, f })\n-#define PT_ERROR(index) ((pt_expr){ PT_OP_ERROR, 0, NULL })\n-#define PT_ACTION(action) ((pt_expr){ PT_OP_ACTION, 0, action })\n+#define PT_RANGE(from, to) ((pt_expr){ PT_OP_RANGE, PT_RANGE_PACK(from, to) })\n+#define PT_ANY() ((pt_expr){ PT_OP_ANY, 0 })\n+#define PT_RULE(index) ((pt_expr){ PT_OP_NON_TERMINAL, index })\n+#define PT_AT_LEAST(n, ...) ((pt_expr){ PT_OP_AT_LEAST, PT_NARG(__VA_ARGS__), (void *) n }), __VA_ARGS__\n+#define PT_AT_MOST(n, ...) ((pt_expr){ PT_OP_AT_MOST, PT_NARG(__VA_ARGS__), (void *) n }), __VA_ARGS__\n+#define PT_AND(...) ((pt_expr){ PT_OP_AND, PT_NARG(__VA_ARGS__) }), __VA_ARGS__\n+#define PT_NOT(...) ((pt_expr){ PT_OP_NOT, PT_NARG(__VA_ARGS__) }), __VA_ARGS__\n+#define PT_SEQUENCE(...) ((pt_expr){ PT_OP_SEQUENCE, PT_NARG(__VA_ARGS__) }), __VA_ARGS__\n+#define PT_CHOICE(...) ((pt_expr){ PT_OP_CHOICE, PT_NARG(__VA_ARGS__) }), __VA_ARGS__\n+#define PT_CUSTOM_MATCHER(f) ((pt_expr){ PT_OP_CUSTOM_MATCHER, 0, (void *) f })\n+#define PT_ERROR(index) ((pt_expr){ PT_OP_ERROR, 0 })\n+#define PT_ACTION(action, ...) ((pt_expr){ PT_OP_ACTION, PT_NARG(__VA_ARGS__), (void *) action }), __VA_ARGS__\n \n \/**\n * Match result: a {number of matched chars\/match error code, action\n@@ -381,10 +394,10 @@\n PT__MATCH_NONE = 0,\n PT__MATCH_AND = 1 << 1,\n PT__MATCH_NOT = 1 << 2,\n- PT__MATCH_SEQUENCE = 1 << 3,\n- PT__MATCH_CHOICE = 1 << 4,\n- PT__MATCH_QUANTIFIER = 1 << 5,\n- PT__MATCH_HAVE_ACTION = 1 << 6,\n+ PT__MATCH_CHOICE = 1 << 3,\n+ PT__MATCH_AT_LEAST = 1 << 4,\n+ PT__MATCH_AT_MOST = 1 << 5,\n+ PT__MATCH_ACTION = 1 << 6,\n } pt__match_flags;\n \n \/**\n@@ -393,11 +406,10 @@\n typedef struct pt__match_state {\n const pt_expr *e; \/\/\/< Current expression being matched.\n size_t pos; \/\/\/< Current position in the stream.\n- int r1; \/\/\/< General purpose register 1.\n- unsigned int r2; \/\/\/< General purpose register 2.\n+ int matched;\n+ int N; \/\/\/< General purpose register 1.\n unsigned int ac; \/\/\/< Action counter.\n- unsigned int qa; \/\/\/< Number of queried Actions.\n- pt__match_flags flags;\n+ int flags;\n } pt__match_state;\n \n \/**\n@@ -493,9 +505,9 @@\n state = context->state_stack.states + (context->state_stack.size)++;\n state->e = e;\n state->pos = pos;\n- state->r1 = state->r2 = 0;\n+ state->matched = 0;\n+ state->N = 0;\n state->ac = context->action_stack.size;\n- state->qa = 0;\n \n return state;\n }\n@@ -509,6 +521,17 @@\n static pt__match_state *pt__get_current_state(const pt__match_state_stack *s) {\n int i = s->size - 1;\n return i >= 0 ? s->states + i : NULL;\n+}\n+\n+static pt__match_state *pt__pop_state(pt__match_state_stack *state_stack, size_t count) {\n+ if(count < state_stack->size) {\n+ state_stack->size -= count;\n+ return &state_stack->states[state_stack->size - 1];\n+ }\n+ else {\n+ state_stack->size = 0;\n+ return NULL;\n+ }\n }\n \n \/**\n@@ -594,8 +617,8 @@\n *\/\n static pt_data pt__run_actions(pt__match_context *context, PT_STRING_TYPE str) {\n \/\/ allocate the data stack\n- pt_data *data_stack;\n- if((data_stack = malloc(context->action_stack.size * sizeof(pt_data))) == NULL) return PT_NULL_DATA;\n+ pt_data *data_stack = (pt_data *) malloc(context->action_stack.size * sizeof(pt_data));\n+ if(data_stack == NULL) return PT_NULL_DATA;\n \n \/\/ index to current Data on the stack\n int data_index = 0;\n@@ -627,6 +650,7 @@\n static pt__match_state *pt__match_succeed(pt__match_context *context,\n int *matched, PT_STRING_TYPE str, size_t new_pos) {\n pt__match_state *state = context->state_stack.states + context->state_stack.size - 1;\n+ \/\/const pt_expr* e = state->e;\n int i;\n \/\/#ifdef PT_SUCCESS_CALLBACK\n \/\/PT_SUCCESS_CALLBACK(context, str, state->pos, new_pos);\n@@ -635,10 +659,9 @@\n state = context->state_stack.states + i;\n switch(state->e->op) {\n case PT_OP_SEQUENCE:\n- state->r1 = (state + 1)->e - state->e;\n case PT_OP_AT_LEAST:\n case PT_OP_AT_MOST:\n- state->r2 = new_pos - state->pos; \/\/ mark current match accumulator\n+ state->matched = new_pos - state->pos; \/\/ mark current match accumulator\n state->ac = context->action_stack.size; \/\/ keep queried actions\n goto backtrack;\n \n@@ -648,7 +671,7 @@\n break;\n \n case PT_OP_NOT:\n- state->r1 = -1; \/\/ NOT success = fail\n+ state->matched = PT_NO_MATCH; \/\/ NOT success = fail\n context->action_stack.size = state->ac; \/\/ discard queried actions\n goto backtrack;\n \n@@ -678,12 +701,12 @@\n switch(state->e->op) {\n case PT_OP_AT_LEAST:\n case PT_OP_AT_MOST:\n- state->r1 = -(state->r1); \/\/ mark end of quantifier matching\n+ state->matched = -(state->matched); \/\/ mark end of quantifier matching\n case PT_OP_CHOICE:\n goto backtrack;\n \n case PT_OP_NOT:\n- state->r1 = 1; \/\/ NOT fail = success\n+ state->matched = 1; \/\/ NOT fail = success\n goto backtrack;\n \n case PT_OP_ERROR:\n@@ -751,6 +774,9 @@\n matched = PT_NO_MATCH;\n \n switch(e->op) {\n+ case PT_OP_END:\n+ break;\n+\n \/\/ Primary\n case PT_OP_BYTE:\n if(*ptr == e->N) {\n@@ -759,25 +785,25 @@\n break;\n \n case PT_OP_LITERAL:\n- if(strncmp(ptr, e->data, e->N) == 0) {\n+ if(strncmp(ptr, e->str, e->N) == 0) {\n matched = e->N;\n }\n break;\n \n case PT_OP_CASE_INSENSITIVE:\n- if(strncasecmp(ptr, e->data, e->N) == 0) {\n+ if(strncasecmp(ptr, e->str, e->N) == 0) {\n matched = e->N;\n }\n break;\n \n case PT_OP_CHARACTER_CLASS:\n- if(pt__function_for_character_class(e->N)(*ptr)) {\n+ if(pt__function_for_character_class((enum pt_character_class) e->N)(*ptr)) {\n matched = 1;\n }\n break;\n \n case PT_OP_SET:\n- if(*ptr && strchr(e->data, *ptr)) {\n+ if(*ptr && strchr(e->str, *ptr)) {\n matched = 1;\n }\n break;\n@@ -795,79 +821,73 @@\n }\n break;\n \n+ case PT_OP_CUSTOM_MATCHER:\n+ matched = e->matcher(ptr, context.opts->userdata);\n+ if(matched <= 0) {\n+ matched = PT_NO_MATCH;\n+ }\n+ break;\n+\n+\n \/\/ Unary\n case PT_OP_NON_TERMINAL:\n state = pt__push_state(&context, es[e->N], state->pos);\n continue;\n \n case PT_OP_AT_LEAST:\n- if(state->r1 >= 0) {\n- goto iterate_quantifier;\n- }\n- else if(-(state->r1) > e->N) {\n- matched = state->r2;\n- }\n- break;\n+ state = pt__push_state(&context, e + 1, state->pos);\n+ state->flags |= PT__MATCH_AT_LEAST;\n+ continue;\n+\n case PT_OP_AT_MOST:\n- if(state->r1 >= 0) {\n- if(state->r1 < -(e->N)) {\n- goto iterate_quantifier;\n+ state = pt__push_state(&context, e + 1, state->pos);\n+ state->flags |= PT__MATCH_AT_MOST;\n+ continue;\n+\n+ case PT_OP_NOT:\n+ if(state->N > 0) {\n+ matched = 0;\n+ break;\n+ }\n+ else if(state->N < 0) {\n+ break;\n+ }\n+ \/\/ fallthrough\n+ case PT_OP_AND:\n+ state = pt__push_state(&context, e + 1, state->pos);\n+ continue;\n+\n+ \/\/ N-ary\n+ case PT_OP_ACTION:\n+ if(e->action) {\n+ if(state->ac - 1 < context.action_stack.size) {\n+ action = &context.action_stack.actions[state->ac - 1];\n+ action->argc++;\n }\n- else {\n- matched = state->r2;\n- }\n- }\n- else if(state->r1 >= e->N - 1) {\n- matched = state->r2;\n- }\n- break;\n-iterate_quantifier:\n- state->r1++;\n- state = pt__push_state(&context, e + 1, state->pos + state->r2);\n- continue;\n-\n- case PT_OP_NOT:\n- state->flags |= PT__MATCH_NOT;\n- state->e++;\n- continue;\n-\n- case PT_OP_AND:\n- state->flags |= PT__MATCH_AND;\n- state->e++;\n- continue;\n-\n- \/\/ N-ary\n+ pt__push_action(&context, e->action, state->pos);\n+ state->flags |= PT__MATCH_ACTION;\n+ }\n+ \/\/ fallthrough\n case PT_OP_SEQUENCE:\n- e = e + state->r1 + 1;\n- if(e->op != PT_OP_END) {\n- state = pt__push_state(&context, e, state->pos + state->r2);\n+ if(state->N < e->N) {\n+ state = pt__push_state(&context, e + 1 + state->N, state->pos);\n+ state->N++;\n continue;\n }\n else {\n- matched = state->r2;\n+ matched = state->matched;\n }\n break;\n \n case PT_OP_CHOICE:\n- e = e + state->r1 + 1;\n- if(e->op != PT_OP_END) {\n- state = pt__push_state(&context, e, state->pos);\n+ if(state->N < e->N) {\n+ state = pt__push_state(&context, e + 1 + state->N, state->pos);\n+ state->N++;\n continue;\n }\n break;\n \n- case PT_OP_END:\n- matched = 0;\n- break;\n-\n \/\/ Others\n- case PT_OP_CUSTOM_MATCHER:\n- matched = e->matcher(ptr, context.opts->userdata);\n- if(matched <= 0) {\n- matched = PT_NO_MATCH;\n- }\n- break;\n-\n case PT_OP_ERROR:\n \/\/ mark that a syntactic error ocurred, so even syncing we remember this\n if(matched_error == 0) {\n@@ -879,18 +899,6 @@\n }\n matched = PT_MATCHED_ERROR;\n break;\n-\n- case PT_OP_ACTION:\n- if(e->action) {\n- if(state->ac - 1 >= 0) {\n- action = &context.action_stack.actions[state->ac - 1];\n- action->argc++;\n- }\n- pt__push_action(&context, e->action, state->pos);\n- state->flags |= PT__MATCH_HAVE_ACTION;\n- }\n- state->e++;\n- continue;\n \n \/\/ Unknown operation: always fail\n default: break;\n"} {"commit":"36cb33d1fcdce87ba58566cf65457cd924475264","subject":"ncd: avoid a malloc on every method call","message":"ncd: avoid a malloc on every method call\n\n","repos":"PowerOlive\/badvpn,chrisballinger\/badvpn,Git-Host\/badvpn,Git-Host\/badvpn,LazyZhu\/badvpn,PowerOlive\/badvpn,tempbottle\/badvpn,tempbottle\/badvpn,binondord\/badvpn,PowerOlive\/badvpn,PowerOlive\/badvpn,binondord\/badvpn,chrisballinger\/badvpn,LazyZhu\/badvpn,linfengfeiye\/badvpn,linfengfeiye\/badvpn,chrisballinger\/badvpn,linfengfeiye\/badvpn,linfengfeiye\/badvpn,tempbottle\/badvpn,tempbottle\/badvpn,binondord\/badvpn,LazyZhu\/badvpn,PowerOlive\/badvpn,chrisballinger\/badvpn,Git-Host\/badvpn,binondord\/badvpn,Git-Host\/badvpn,linfengfeiye\/badvpn,tempbottle\/badvpn,LazyZhu\/badvpn,LazyZhu\/badvpn,Git-Host\/badvpn,binondord\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/ncd.c\n+++ ncd\/ncd.c\n@@ -145,6 +145,9 @@\n \n \/\/ processes\n LinkedList1 processes;\n+\n+\/\/ buffer for concatenating base_type::method_name\n+char method_concat_buf[200];\n \n static void print_help (const char *name);\n static void print_version (void);\n@@ -966,15 +969,14 @@\n \n NCDObject object;\n NCDObject *object_ptr = NULL;\n- char *type;\n- int free_type = 0;\n+ const char *type;\n \n char **object_names = NCDInterpBlock_StatementObjNames(p->iblock, p->ap);\n const char *method_name = NCDInterpBlock_StatementCmdName(p->iblock, p->ap);\n \n if (!object_names) {\n \/\/ this is a function_call(); type is \"function_call\"\n- type = (char *)method_name;\n+ type = method_name;\n } else {\n \/\/ this is a some.object.somewhere->method_call(); type is \"base_type(some.object.somewhere)::method_call\"\n \n@@ -992,11 +994,12 @@\n }\n \n \/\/ build type string\n- if (!(type = concat_strings(3, object_type, \"::\", method_name))) {\n- process_statement_log(ps, BLOG_ERROR, \"concat_strings failed\");\n+ int res = snprintf(method_concat_buf, sizeof(method_concat_buf), \"%s::%s\", object_type, method_name);\n+ if (res >= sizeof(method_concat_buf) || res < 0) {\n+ process_statement_log(ps, BLOG_ERROR, \"type\/method name too long\");\n goto fail;\n }\n- free_type = 1;\n+ type = method_concat_buf;\n }\n \n \/\/ find module to instantiate\n@@ -1024,18 +1027,10 @@\n \/\/ increment FP\n p->fp++;\n \n- if (free_type) {\n- free(type);\n- }\n- \n process_assert_pointers(p);\n return;\n \n fail:\n- if (free_type) {\n- free(type);\n- }\n- \n \/\/ mark error\n process_statement_set_error(ps);\n \n"} {"commit":"396f57b4943c0986e98a289e8767085077be80d9","subject":"Scrub debug statements","message":"Scrub debug statements\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/Text\/sys\/englishd.c\n+++ mudlib\/mud\/home\/Text\/sys\/englishd.c\n@@ -18,7 +18,6 @@\n * along with this program. If not, see <http:\/\/www.gnu.org\/licenses\/>.\n *\/\n #include <kotaka\/privilege.h>\n-#include <kotaka\/paths\/kotaka.h>\n #include <kotaka\/paths\/string.h>\n #include <kotaka\/paths\/system.h>\n #include <kotaka\/paths\/text.h>\n@@ -356,8 +355,6 @@\n \tsz = sizeof(phrases);\n \tcandidates = initial;\n \n-\tCHANNELD->post_message(\"debug\", \"parse\", \"Binding phrases: \" + STRINGD->hybrid_sprint(phrases));\n-\n \tfor (i = sz - 1; i >= 0; i--) {\n \t\tmixed *phrase;\n \t\tstring *np;\n@@ -478,8 +475,6 @@\n \t\t}\n \t}\n \n-\tCHANNELD->post_message(\"debug\", \"parse\", \"Prepkey: \" + STRINGD->hybrid_sprint(prepkey));\n-\n \t\/* stage 2-2: assign phrases to roles *\/\n \t{\n \t\tint i, sz;\n@@ -497,7 +492,6 @@\n \t\t\tint j, sz2;\n \n \t\t\tphrase = parse[i];\n-\t\t\tCHANNELD->post_message(\"debug\", \"parse\", \"Phrase: \" + STRINGD->hybrid_sprint(phrase));\n \n \t\t\tswitch(phrase[0]) {\n \t\t\tcase \"V\":\n@@ -522,7 +516,6 @@\n \t\t\trcand = prepkey[prep];\n \n \t\t\tif (!rcand) {\n-\t\t\t\tCHANNELD->post_message(\"debug\", \"parse\", \"Empty rcand for \" + (prep ? prep : \"nil\"));\n \t\t\t\trcand = ({ });\n \t\t\t}\n \n@@ -591,6 +584,5 @@\n \t}\n \n \troles[\"evoke\"] = evoke;\n-\tCHANNELD->post_message(\"debug\", \"parse\", \"Roles: \" + STRINGD->hybrid_sprint(roles));\n \treturn ({ 3, roles });\n }\n"} {"commit":"49834b3dbb309b5c25ddcea74976b0efe4a857a2","subject":"Add memphis-rule.h to the main header file","message":"Add memphis-rule.h to the main header file\n\ngit-svn-id: 8f7cd130d2806a1f2d10ea8d1f9381d5f0407039@134 da981f62-ed57-4248-99b7-598fd1fc20d8\n","repos":"potyl\/memphis,potyl\/memphis,potyl\/memphis,potyl\/memphis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- memphis.h\n+++ memphis.h\n@@ -21,5 +21,6 @@\n \n #include \"memphis-map.h\"\n #include \"memphis-rule-set.h\"\n+#include \"memphis-rule.h\"\n #include \"memphis-renderer.h\"\n #include \"memphis-data-pool.h\"\n"} {"commit":"e03c233823a83525b8882595cbe5b90ba2efe5b5","subject":"Don't abort on disconnecting not-connected network_conn","message":"Don't abort on disconnecting not-connected network_conn\n","repos":"darsto\/brother-scanner-driver,darsto\/brother-scanner-driver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- network.c\n+++ network.c\n@@ -246,7 +246,9 @@\n struct network_conn *conn;\n \n conn = get_network_conn(conn_id);\n- assert(conn->connected);\n+ if (!conn->connected) {\n+ return 0;\n+ }\n \n close(conn->fd);\n conn->connected = false;\n"} {"commit":"9ed50949a6730927f813707d97dbe318150e809a","subject":"* subversion\/tests\/libsvn_fs\/locks-test.c (attach_lock): Oops. Fix a compile error caused by not compiling merged code.","message":"* subversion\/tests\/libsvn_fs\/locks-test.c\n (attach_lock): Oops. Fix a compile error caused by not compiling\n merged code.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/tests\/libsvn_fs\/locks-test.c\n+++ subversion\/tests\/libsvn_fs\/locks-test.c\n@@ -238,7 +238,6 @@\n \"This is a comment. Yay comment!\",\n apr_time_from_sec(3),\n SVN_INVALID_REVNUM, FALSE, pool));\n- mylock.xml_comment = 0;\n \n \/* Can we look up the lock by path? *\/\n SVN_ERR (svn_fs_get_lock (&somelock, fs, \"\/A\/D\/G\/rho\", pool));\n"} {"commit":"e289def741325b87881b4556bf600b77108bccba","subject":"thermometer: Always write CCC value when connecting","message":"thermometer: Always write CCC value when connecting\n\nThis patch ensures that CCC values for Intermediate Temperature and\nTermperature Measurement are always written when connecting to device.\nThis is to i.e. disable notifications and\/or indications in case they\nare already enabled (reconnection scenario) but we don't have watcher\nregistered so it's pointless for remote to send us data.\n","repos":"mapfau\/bluez,silent-snowman\/bluez,mapfau\/bluez,mapfau\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pkarasev3\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- profiles\/thermometer\/thermometer.c\n+++ profiles\/thermometer\/thermometer.c\n@@ -550,19 +550,23 @@\n \tif (g_strcmp0(ch->uuid, TEMPERATURE_MEASUREMENT_UUID) == 0) {\n \t\tch->t->measurement_ccc_handle = handle;\n \n-\t\tif (g_slist_length(ch->t->tadapter->fwatchers) == 0)\n-\t\t\treturn;\n-\n-\t\tval = GATT_CLIENT_CHARAC_CFG_IND_BIT;\n-\t\tmsg = g_strdup(\"Enable Temperature Measurement indication\");\n+\t\tif (g_slist_length(ch->t->tadapter->fwatchers) == 0) {\n+\t\t\tval = 0x0000;\n+\t\t\tmsg = g_strdup(\"Disable Temperature Measurement ind\");\n+\t\t} else {\n+\t\t\tval = GATT_CLIENT_CHARAC_CFG_IND_BIT;\n+\t\t\tmsg = g_strdup(\"Enable Temperature Measurement ind\");\n+\t\t}\n \t} else if (g_strcmp0(ch->uuid, INTERMEDIATE_TEMPERATURE_UUID) == 0) {\n \t\tch->t->intermediate_ccc_handle = handle;\n \n-\t\tif (g_slist_length(ch->t->tadapter->iwatchers) == 0)\n-\t\t\treturn;\n-\n-\t\tval = GATT_CLIENT_CHARAC_CFG_NOTIF_BIT;\n-\t\tmsg = g_strdup(\"Enable Intermediate Temperature notification\");\n+\t\tif (g_slist_length(ch->t->tadapter->iwatchers) == 0) {\n+\t\t\tval = 0x0000;\n+\t\t\tmsg = g_strdup(\"Disable Intermediate Temperature noti\");\n+\t\t} else {\n+\t\t\tval = GATT_CLIENT_CHARAC_CFG_NOTIF_BIT;\n+\t\t\tmsg = g_strdup(\"Enable Intermediate Temperature noti\");\n+\t\t}\n \t} else if (g_strcmp0(ch->uuid, MEASUREMENT_INTERVAL_UUID) == 0) {\n \t\tval = GATT_CLIENT_CHARAC_CFG_IND_BIT;\n \t\tmsg = g_strdup(\"Enable Measurement Interval indication\");\n"} {"commit":"1ee7815d5da2792767f411a2b7f30f21376cbea8","subject":"Be more careful when computing initial request timeout.","message":"Be more careful when computing initial request timeout.\n","repos":"boutier\/babeld,Gwendocg\/babeldToS,Gwendocg\/babeldToS,wlanslovenija\/babeld,jech\/babeld,dtaht\/babeld-shortrtt-metrics,Drooids\/babeld,wlanslovenija\/babeld,tcatm\/babeld,woniullb\/babeld,sudomesh\/babeld,jech\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -514,7 +514,10 @@\n {\n send_request(NULL, prefix, plen, 127, seqno, router_hash);\n record_request(prefix, plen, seqno, router_hash, NULL,\n- MIN(wireless_hello_interval \/ 2, 2000));\n+ MAX(10,\n+ MIN(wireless_hello_interval \/ 2,\n+ MIN(wired_hello_interval \/ 2,\n+ 2000))));\n }\n \n static void\n"} {"commit":"89ad4d4ad1ba75a98a5adcc2d42e4dc80b9ae8b1","subject":"Added midi channels, store signal pointers instead of using mdev_get_output_by_name.","message":"Added midi channels, store signal pointers instead of using mdev_get_output_by_name.\n","repos":"malloch\/midimap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midimap.c\n+++ midimap.c\n@@ -23,6 +23,7 @@\n mapper_device dev;\n PmStream *stream;\n int is_linked;\n+ mapper_signal signals[8][16];\n struct _midimap_device *next;\n } *midimap_device;\n \n@@ -49,9 +50,20 @@\n midimap_device dev = (midimap_device)props->user_data;\n if (!dev)\n return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x80, (uint8_t)v[0], (uint8_t)v[1])); \n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0x80),\n+ (uint8_t)v[0], (uint8_t)v[1])); \n }\n \n void noteon_handler(mapper_signal sig, mapper_db_signal props,\n@@ -61,21 +73,43 @@\n midimap_device dev = (midimap_device)props->user_data;\n if (!dev)\n return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x90, (uint8_t)v[0], (uint8_t)v[1])); \n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0x90),\n+ (uint8_t)v[0], (uint8_t)v[1])); \n }\n \n void aftertouch_handler(mapper_signal sig, mapper_db_signal props,\n mapper_timetag_t *timetag, void *value)\n {\n- \/\/ aftertouch messages passed straight through with no instances\n- midimap_device dev = (midimap_device)props->user_data;\n- if (!dev)\n- return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x80, (uint8_t)v[0], (uint8_t)v[1]));\n+ \/\/ aftertouch messages passed straight through with no instances\n+ midimap_device dev = (midimap_device)props->user_data;\n+ if (!dev)\n+ return;\n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0xA0),\n+ (uint8_t)v[0], (uint8_t)v[1]));\n }\n \n void control_change_handler(mapper_signal sig, mapper_db_signal props,\n@@ -85,16 +119,43 @@\n midimap_device dev = (midimap_device)props->user_data;\n if (!dev)\n return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x80, (uint8_t)v[0], (uint8_t)v[1]));\n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0xB0),\n+ (uint8_t)v[0], (uint8_t)v[1]));\n }\n \n void program_change_handler(mapper_signal sig, mapper_db_signal props,\n mapper_timetag_t *timetag, void *value)\n {\n \/\/ program change messages passed straight through with no instances\n- return;\n+ midimap_device dev = (midimap_device)props->user_data;\n+ if (!dev)\n+ return;\n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0xC0),\n+ (uint8_t)v[0], (uint8_t)v[1]));\n }\n \n void channel_pressure_handler(mapper_signal sig, mapper_db_signal props,\n@@ -104,121 +165,104 @@\n midimap_device dev = (midimap_device)props->user_data;\n if (!dev)\n return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x80, (uint8_t)v[0], (uint8_t)v[1]));\n-}\n-\n-void pitchbend_handler(mapper_signal sig, mapper_db_signal props,\n- mapper_timetag_t *timetag, void *value)\n-{\n- \/\/ channel pressure messages passed straight through with no instances\n- midimap_device dev = (midimap_device)props->user_data;\n- if (!dev)\n- return;\n- int *v = value;\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x80, (uint8_t)v[0], (uint8_t)v[1]));\n-}\n-\n-\n-\n-void pitch_handler(mapper_signal sig, mapper_db_signal props,\n- mapper_timetag_t *timetag, void *value)\n-{\n- midimap_device dev = (midimap_device)props->user_data;\n- if (!dev)\n- return;\n- int *v = value;\n- uint8_t b = v[0];\n- if (value) {\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x90, b, 100));\n- }\n- else {\n- Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n- Pm_Message(0x90, b, 0));\n- }\n-\n-}\n-\n-void velocity_handler(mapper_signal sig, mapper_db_signal props,\n- mapper_timetag_t *timetag, void *value)\n-{\n-}\n-\n-\n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0xD0),\n+ (uint8_t)v[0], (uint8_t)v[1]));\n+}\n+\n+void pitch_wheel_handler(mapper_signal sig, mapper_db_signal props,\n+ mapper_timetag_t *timetag, void *value)\n+{\n+ \/\/ pitch wheel messages passed straight through with no instances\n+ midimap_device dev = (midimap_device)props->user_data;\n+ if (!dev)\n+ return;\n+ char channel[4] = {0, 0, 0, 0};\n+ int channel_num = 0;\n+ if (props->name[8] != '.')\n+ return;\n+ \/\/ extract channel number from signal name\n+ strncpy(channel, &props->name[9], 3);\n+ channel[strchr(channel, '\/') - channel] = 0;\n+ channel_num = atoi(channel);\n+ if (channel_num < 1 || channel_num > 16)\n+ return;\n+ int *v = value;\n+ Pm_WriteShort(dev->stream, TIME_PROC(TIME_INFO),\n+ Pm_Message((uint8_t)(channel_num + 0xE0),\n+ (uint8_t)v[0], (uint8_t)v[0] >> 8));\n+}\n \n void add_input_signals(midimap_device dev)\n {\n+ char signame[64];\n int i, min = 0, max7bit = 127, max14bit = 16383;\n- float minf = 0;\n- char signame[128];\n- for (i = 1; i < 2; i++) {\n- \/\/mdev_add_input(dev->dev, \"\/midi\", 1, 'm', 0, 0, 0, midi_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/noteon\", i);\n- mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n- &min, &max7bit, noteon_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/noteoff\", i);\n- mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n- &min, &max7bit, noteoff_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/note\/pitch\", i);\n- mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n- &min, &max7bit, pitch_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/note\/velocity\", i);\n- mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n- &min, &max7bit, velocity_handler, dev);\n- \/\/snprintf(signame, 128, \"\/channel.%i\/note\/duration\", i);\n- \/\/mdev_add_input(dev->dev, signame, 1, 'f', \"midi\",\n- \/\/ &minf, 0, duration_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/note\/aftertouch\", i);\n- mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n- &min, &max7bit, aftertouch_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/aftertouch\", i);\n- mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n- &min, &max7bit, channel_pressure_handler, dev);\n- snprintf(signame, 128, \"\/channel.%i\/pitchbend\", i);\n- mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n- &min, &max14bit, pitchbend_handler, dev);\n+ for (i = 1; i < 17; i++) {\n+ snprintf(signame, 64, \"\/channel.%i\/noteoff\", i);\n+ dev->signals[0][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, noteoff_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/noteon\", i);\n+ dev->signals[1][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, noteon_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/aftertouch\", i);\n+ dev->signals[2][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, aftertouch_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/control_change\", i);\n+ dev->signals[3][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, control_change_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/program_change\", i);\n+ dev->signals[4][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, program_change_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/channel_pressure\", i);\n+ dev->signals[5][i] = mdev_add_input(dev->dev, signame, 2, 'i', \"midi\",\n+ &min, &max7bit, channel_pressure_handler, dev);\n+ snprintf(signame, 64, \"\/channel.%i\/pitch_wheel\", i);\n+ dev->signals[6][i] = mdev_add_input(dev->dev, signame, 1, 'i', \"midi\",\n+ &min, &max14bit, pitch_wheel_handler, dev);\n }\n }\n \n \/\/ Declare output signals\n void add_output_signals(midimap_device dev)\n {\n+ char signame[64];\n int i, min = 0, max7bit = 127, max14bit = 16383;\n- float minf = 0;\n- char signame[128];\n \/\/ TODO: Need to declare these signals for each MIDI channel\n- for (i = 1; i < 2; i++) {\n- \/\/mdev_add_output(dev->dev, \"\/midi\", 1, 'm', 0, 0, 0);\n- snprintf(signame, 128, \"\/channel.%i\/noteon\", i);\n- mdev_add_output(dev->dev, signame, 2, 'i', \"midi\", &min, &max7bit);\n- snprintf(signame, 128, \"\/channel.%i\/noteoff\", i);\n- mdev_add_output(dev->dev, signame, 2, 'i', \"midi\", &min, &max7bit);\n- snprintf(signame, 128, \"\/channel.%i\/note\/pitch\", i);\n- mdev_add_output(dev->dev, signame, 1, 'i', \"midi\", &min, &max7bit);\n- snprintf(signame, 128, \"\/channel.%i\/note\/velocity\", i);\n- mdev_add_output(dev->dev, signame, 1, 'i', \"midi\", &min, &max7bit);\n- \/\/snprintf(signame, 128, \"\/channel.%i\/note\/duration\", i);\n- \/\/mdev_add_output(dev->dev, signame, 1, 'f', \"midi\", &minf, 0);\n- snprintf(signame, 128, \"\/channel.%i\/note\/aftertouch\", i);\n- mdev_add_output(dev->dev, signame, 1, 'i', \"midi\", &min, &max7bit);\n- snprintf(signame, 128, \"\/channel.%i\/aftertouch\", i);\n- mdev_add_output(dev->dev, signame, 1, 'i', \"midi\", &min, &max7bit);\n- snprintf(signame, 128, \"\/channel.%i\/pitchbend\", i);\n- mdev_add_output(dev->dev, signame, 1, 'i', \"midi\", &min, &max14bit);\n- }\n-}\n-\n-\/\/ MIDI -> mapper\n-\n-\/\/ Process a pitch wheel message\n-\/\/ Process a master volume message\n-\/\/ Process a transport control message\n-\/\/ Process a control change message\n-\/\/ Process a MIDI time code message\n-\/\/ Process a sysex message\n+ for (i = 1; i < 17; i++) {\n+ snprintf(signame, 64, \"\/channel.%i\/noteoff\", i);\n+ dev->signals[0][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/noteon\", i);\n+ dev->signals[1][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/aftertouch\", i);\n+ dev->signals[2][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/control_change\", i);\n+ dev->signals[3][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/program_change\", i);\n+ dev->signals[4][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/channel_pressure\", i);\n+ dev->signals[5][i] = mdev_add_output(dev->dev, signame, 2,\n+ 'i', \"midi\", &min, &max7bit);\n+ snprintf(signame, 64, \"\/channel.%i\/pitch_wheel\", i);\n+ dev->signals[6][i] = mdev_add_output(dev->dev, signame, 1,\n+ 'i', \"midi\", &min, &max14bit);\n+ }\n+}\n \n \/\/ Check if any MIDI ports are available on the system\n void search_midi()\n@@ -239,7 +283,7 @@\n midimap_device dev = (midimap_device) calloc(1, sizeof(struct _midimap_device));\n dev->dev = mdev_new(devname, port, 0);\n if (info->input) {\n- printf(\"Got MIDI input %d %s %s\\n\", i, info->interf, info->name);\n+ printf(\"Got MIDI input %d %s %s...\", i, info->interf, info->name);\n \/\/ TODO: Should only open input if it is mapped\n Pm_OpenInput(&dev->stream, i, DRIVER_INFO, INPUT_BUFFER_SIZE, TIME_PROC, TIME_INFO);\n Pm_SetFilter(dev->stream, PM_FILT_ACTIVE | PM_FILT_CLOCK | PM_FILT_SYSEX);\n@@ -251,102 +295,88 @@\n dev->next = outputs;\n outputs = dev;\n add_output_signals(dev);\n- printf(\"added device!\\n\");\n+ printf(\"added.\\n\");\n }\n if (info->output) {\n- printf(\"Got MIDI output %d %s %s\\n\", i, info->interf, info->name);\n+ printf(\"Got MIDI output %d %s %s...\", i, info->interf, info->name);\n \/\/ TODO: Should only open output if it is mapped\n Pm_OpenOutput(&dev->stream, i, DRIVER_INFO, OUTPUT_BUFFER_SIZE, TIME_PROC, TIME_INFO, latency);\n dev->next = inputs;\n inputs = dev;\n add_input_signals(dev);\n+ printf(\"added.\\n\");\n }\n }\n }\n \n void parse_midi(midimap_device dev, PmEvent buffer)\n {\n- char sig_name[128];\n-\n int msg_type = (Pm_MessageStatus(buffer.message) - 0x80) \/ 0x0F;\n int channel = (Pm_MessageStatus(buffer.message) - 0x80) % 0x0F;\n int data[2] = {Pm_MessageData1(buffer.message),\n Pm_MessageData2(buffer.message)};\n- mapper_signal sig;\n+\n+ \/* TODO: add array of signal pointers to device, use array index instead\n+ * of mdev_get_output_by_name() *\/\n \n switch (msg_type) {\n case 0:\n \/\/ note-off message\n- snprintf(sig_name, 128, \"\/channel.%i\/noteoff\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ msig_update(dev->signals[0][channel], data);\n break;\n case 1:\n \/\/ note-on message\n- snprintf(sig_name, 128, \"\/channel.%i\/noteon\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ msig_update(dev->signals[1][channel], data);\n break;\n case 2:\n \/\/ aftertouch\n- snprintf(sig_name, 128, \"\/channel.%i\/aftertouch\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ msig_update(dev->signals[2][channel], data);\n break;\n case 3:\n \/\/ control change\n- snprintf(sig_name, 128, \"\/channel.%i\/controlchange\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ msig_update(dev->signals[3][channel], data);\n break;\n case 4:\n \/\/ program change\n+ msig_update(dev->signals[4][channel], data);\n break;\n case 5:\n \/\/ channel pressure\n- snprintf(sig_name, 128, \"\/channel.%i\/noteoff\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ msig_update(dev->signals[5][channel], data);\n break;\n case 6:\n \/\/ pitch wheel\n- snprintf(sig_name, 128, \"\/channel.%i\/pitchwheel\", channel);\n- sig = mdev_get_output_by_name(dev->dev, sig_name, 0);\n- if (sig)\n- msig_update(sig, data);\n+ data[1] = data[1] + (data[2] << 8);\n+ msig_update(dev->signals[6][channel], data);\n break;\n default:\n break;\n }\n }\n \n-void cleanup_devices()\n+void cleanup_device(midimap_device dev)\n+{\n+ if (dev->dev) {\n+ mdev_free(dev->dev);\n+ }\n+ if (dev->stream) {\n+ Pm_Close(dev->stream);\n+ }\n+}\n+\n+void cleanup_all_devices()\n {\n printf(\"\\nCleaning up!\\n\");\n- midimap_device temp = inputs;\n- while (temp) {\n- if (temp->dev) {\n- mdev_free(temp->dev);\n- }\n- if (temp->stream) {\n- Pm_Close(temp->stream);\n- }\n- temp = temp->next;\n- }\n- temp = outputs;\n- while (temp) {\n- if (temp->dev) {\n- mdev_free(temp->dev);\n- }\n- if (temp->stream) {\n- Pm_Close(temp->stream);\n- }\n- temp = temp->next;\n+ midimap_device dev;\n+ while (inputs) {\n+ dev = inputs;\n+ inputs = dev->next;\n+ cleanup_device(dev);\n+ }\n+ while (outputs) {\n+ dev = outputs;\n+ outputs = dev->next;\n+ cleanup_device(dev);\n }\n Pm_Terminate();\n }\n@@ -357,8 +387,8 @@\n PmEvent buffer[1];\n search_midi();\n int i;\n-\n while (!done) {\n+ \/\/ TODO: check periodically for new\/dropped MIDI devices\n \/\/ poll libmapper outputs\n temp = outputs;\n while (temp) {\n@@ -377,7 +407,7 @@\n mdev_poll(temp->dev, 0);\n temp = temp->next;\n }\n- usleep(100 * 1000);\n+ usleep(10 * 1000);\n }\n }\n \n@@ -393,6 +423,6 @@\n loop();\n \n done:\n- cleanup_devices();\n+ cleanup_all_devices();\n return 0;\n }"} {"commit":"c23eb221ef37728e99b6f4640c94095c3bc99b6e","subject":" Merge pull request #4 from manxorist\/no-underscore-cpuid Rename __cpuid to minimp3_cpuid because double underscore names are reserved in C.","message":" \n \nMerge pull request #4 from manxorist\/no-underscore-cpuid\nRename __cpuid to minimp3_cpuid because double underscore names are reserved in C.\n","repos":"lieff\/minimp3,lieff\/minimp3,lieff\/minimp3","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- minimp3.h\n+++ minimp3.h\n@@ -97,8 +97,10 @@\n # define VMUL_S(x, s) _mm_mul_ps(x, _mm_set1_ps(s))\n # define VREV(x) _mm_shuffle_ps(x, x, _MM_SHUFFLE(0, 1, 2, 3))\n typedef __m128 f4;\n-#ifndef _MSC_VER\n-static __inline__ __attribute__((always_inline)) void __cpuid(int CPUInfo[], const int InfoType)\n+#ifdef _MSC_VER\n+#define minimp3_cpuid __cpuid\n+#else\n+static __inline__ __attribute__((always_inline)) void minimp3_cpuid(int CPUInfo[], const int InfoType)\n {\n #if defined(__PIC__)\n __asm__ __volatile__(\n@@ -125,10 +127,10 @@\n static int have_simd()\n {\n int CPUInfo[4];\n- __cpuid(CPUInfo, 0);\n+ minimp3_cpuid(CPUInfo, 0);\n if (CPUInfo[0] > 0)\n {\n- __cpuid(CPUInfo, 1);\n+ minimp3_cpuid(CPUInfo, 1);\n return (CPUInfo[3] & (1 << 26)); \/\/ SSE2\n }\n return 0;\n"} {"commit":"62e1a1b2358b1033803000d9d0c8a6c3605e3690","subject":"slightly more compact code","message":"slightly more compact code\n","repos":"lieff\/minimp3,lieff\/minimp3,lieff\/minimp3","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- minimp3.h\n+++ minimp3.h\n@@ -27,11 +27,12 @@\n \n void mp3dec_init(mp3dec_t *dec);\n #ifndef MINIMP3_FLOAT_OUTPUT\n-int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes, short *pcm, mp3dec_frame_info_t *info);\n+typedef short mp3d_sample_t;\n #else\n-int mp3dec_decode_frame(mp3dec_t *dec, const unsigned char *mp3, int mp3_bytes, float *pcm, mp3dec_frame_info_t *info);\n+typedef float mp3d_sample_t;\n void mp3dec_f32_to_s16(const float *in, short *out, int num_samples);\n #endif\n+int mp3dec_decode_frame(mp3dec_t *dec, const uint8_t *mp3, int mp3_bytes, mp3d_sample_t *pcm, mp3dec_frame_info_t *info);\n \n #ifdef __cplusplus\n }\n@@ -1370,8 +1371,6 @@\n }\n \n #ifndef MINIMP3_FLOAT_OUTPUT\n-typedef short mp3d_sample_t;\n-\n static short mp3d_scale_pcm(float sample)\n {\n if (sample >= 32766.5) return (short) 32767;\n@@ -1381,8 +1380,6 @@\n return s;\n }\n #else\n-typedef float mp3d_sample_t;\n-\n static float mp3d_scale_pcm(float sample)\n {\n return sample \/ 32768.0f;\n"} {"commit":"49745b3e734a9f88dc902c5a2d70f79cb630c45d","subject":"Make sure to map the whole kernel into 1MB pages. Try to use the remaining memory for things such as the kernel stack.","message":"Make sure to map the whole kernel into 1MB pages. Try to use the remaining\nmemory for things such as the kernel stack.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/arm\/xscale\/i80321\/iq31244_machdep.c\n+++ sys\/arm\/xscale\/i80321\/iq31244_machdep.c\n@@ -202,7 +202,9 @@\n \tu_int kerneldatasize, symbolsize;\n \tu_int l1pagetable;\n \tvm_offset_t freemempos;\n+\tvm_offset_t freemem_pt;\n \tvm_offset_t afterkern;\n+\tvm_offset_t freemem_after;\n \tint i = 0;\n \tuint32_t fake_preload[35];\n \tuint32_t memsize, memstart;\n@@ -242,7 +244,6 @@\n \n \tphysical_start = (vm_offset_t) SDRAM_START;\n \tphysical_end = (vm_offset_t) &end + SDRAM_START - 0xc0000000;\n-\tafterkern = round_page((vm_offset_t)&end);\n #define KERNEL_TEXT_BASE (KERNBASE + 0x00200000)\n \tkerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE;\n \tsymbolsize = 0;\n@@ -273,7 +274,10 @@\n \t\t}\n \t\ti++;\n \t}\n-\n+\tfreemempos -= 2 * PAGE_SIZE;\n+\n+\tfreemem_pt = freemempos;\n+\tfreemempos = 0xa0100000;\n \t\/*\n \t * Allocate a page for the system page mapped to V0x00000000\n \t * This page will just contain the system vectors and can be\n@@ -317,29 +321,66 @@\n \t\t &kernel_pt_table[KERNEL_PT_VMDATA + loop]);\n \tpmap_link_l2pt(l1pagetable, IQ80321_IOPXS_VBASE,\n \t &kernel_pt_table[KERNEL_PT_IOPXS]);\n+\tpmap_map_chunk(l1pagetable, KERNBASE, SDRAM_START,\n+\t freemempos - 0xa0000000 + 0x1000,\n+\t VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n+\tpmap_map_chunk(l1pagetable, KERNBASE + 0x100000, SDRAM_START + 0x100000,\n+\t 0x100000, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);\n \tpmap_map_chunk(l1pagetable, KERNBASE + 0x200000, SDRAM_START + 0x200000,\n-\t (((uint32_t)(&end) - KERNBASE - 0x200000) + PAGE_SHIFT) & ~PAGE_SHIFT,\n+\t (((uint32_t)(&end) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1),\n \t VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n+\tfreemem_after = ((int)&end + PAGE_SIZE) & ~(PAGE_SIZE - 1);\n+\tafterkern = round_page(((vm_offset_t)&end + L1_S_SIZE) & ~(L1_S_SIZE \n+\t - 1));\n+\n \t\/* Map the stack pages *\/\n-\tpmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa,\n-\t IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n-\tpmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa,\n-\t ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n-\tpmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa,\n-\t UND_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n-\tpmap_map_chunk(l1pagetable, kernelstack.pv_va, kernelstack.pv_pa,\n-\t KSTACK_PAGES * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n-\tpmap_map_chunk(l1pagetable, msgbufpv.pv_va, msgbufpv.pv_pa,\n-\t MSGBUF_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n-\n-\n-\tpmap_map_chunk(l1pagetable, kernel_l1pt.pv_va, kernel_l1pt.pv_pa,\n-\t L1_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);\n-\tfor (loop = 0; loop < NUM_KERNEL_PTS; ++loop) {\n-\t\tpmap_map_chunk(l1pagetable, kernel_pt_table[loop].pv_va,\n-\t\t kernel_pt_table[loop].pv_pa, L2_TABLE_SIZE,\n-\t\t VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);\n+#define\talloc_afterkern(va, pa, size)\t\\\n+\tva = freemem_after;\t\t\\\n+\tpa = freemem_after - 0x20000000;\\\n+\tfreemem_after += size;\n+\tif (freemem_after + KSTACK_PAGES * PAGE_SIZE < afterkern) {\n+\t\talloc_afterkern(kernelstack.pv_va, kernelstack.pv_pa, \n+\t\t KSTACK_PAGES * PAGE_SIZE);\n+\t} else {\n+\t\tpmap_map_chunk(l1pagetable, kernelstack.pv_va, \n+\t\t kernelstack.pv_pa, KSTACK_PAGES * PAGE_SIZE,\n+\t\t VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n \t}\n+\tif (freemem_after + IRQ_STACK_SIZE * PAGE_SIZE < afterkern) {\n+\t\talloc_afterkern(irqstack.pv_va, irqstack.pv_pa, \n+\t\t IRQ_STACK_SIZE * PAGE_SIZE);\n+\t} else\n+\t\tpmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa,\n+\t\t IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, \n+\t\t PTE_CACHE);\n+\tif (freemem_after + ABT_STACK_SIZE * PAGE_SIZE < afterkern) {\n+\t\talloc_afterkern(abtstack.pv_va, abtstack.pv_pa, \n+\t\t ABT_STACK_SIZE * PAGE_SIZE);\n+\t} else\n+\t\tpmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa,\n+\t\t ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE,\n+\t\t PTE_CACHE);\n+\tif (freemem_after + UND_STACK_SIZE * PAGE_SIZE < afterkern) {\n+\t\talloc_afterkern(undstack.pv_va, undstack.pv_pa, \n+\t\t UND_STACK_SIZE * PAGE_SIZE);\n+\t} else\n+\t\tpmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa,\n+\t\t UND_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, \n+\t\t PTE_CACHE);\n+\tif (freemem_after + KSTACK_PAGES * PAGE_SIZE < afterkern) {\n+\t\talloc_afterkern(kernelstack.pv_va, kernelstack.pv_pa, \n+\t\t KSTACK_PAGES * PAGE_SIZE);\n+\t} else\n+\t\tpmap_map_chunk(l1pagetable, kernelstack.pv_va, \n+\t\t kernelstack.pv_pa, KSTACK_PAGES * PAGE_SIZE,\n+\t\t VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n+\tif (freemem_after + MSGBUF_SIZE < afterkern) {\n+\t\talloc_afterkern(msgbufpv.pv_va, msgbufpv.pv_pa, \n+\t\t IRQ_STACK_SIZE * PAGE_SIZE);\n+\t} else\n+\t\tpmap_map_chunk(l1pagetable, msgbufpv.pv_va, msgbufpv.pv_pa,\n+\t\t MSGBUF_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);\n+\n \t\/* Map the Mini-Data cache clean area. *\/\n \txscale_setup_minidata(l1pagetable, minidataclean.pv_va,\n \t minidataclean.pv_pa);\n@@ -412,20 +453,19 @@\n \n \n \tpmap_curmaxkvaddr = afterkern;\n-\tpmap_curmaxkvaddr &= 0xfff00000;\n-\tpmap_curmaxkvaddr += 0x00100000;\n \tpmap_bootstrap(pmap_curmaxkvaddr, \n \t 0xd0000000, &kernel_l1pt);\n \tmsgbufp = (void*)msgbufpv.pv_va;\n \tmsgbufinit(msgbufp, MSGBUF_SIZE);\n \tmutex_init();\n \t\n+\tfreemempos &= ~(PAGE_SIZE - 1);\n \tphys_avail[0] = SDRAM_START;\n-\tphys_avail[1] = round_page(freemempos);\n-\tphys_avail[2] = round_page(virtual_avail - KERNBASE + SDRAM_START);\n-\tphys_avail[3] = trunc_page(0xa0000000 + memsize - 1);\n-\tphys_avail[4] = 0;\n-\tphys_avail[5] = 0;\n+\tphys_avail[1] = freemempos;\n+\tphys_avail[0] = round_page(virtual_avail - KERNBASE + SDRAM_START);\n+\tphys_avail[1] = trunc_page(0xa0000000 + memsize - 1);\n+\tphys_avail[2] = 0;\n+\tphys_avail[3] = 0;\n \t\n \t\/* Do basic tuning, hz etc *\/\n \tinit_param1();\n"} {"commit":"9793b7dcf42bc31fc6fae28d9255ecd2f082b84b","subject":"make indent","message":"make indent\n","repos":"google\/honggfuzz,google\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- posix\/arch.c\n+++ posix\/arch.c\n@@ -186,7 +186,7 @@\n \n bool arch_launchChild(run_t* run) {\n #if defined(__FreeBSD__)\n- int enableTrace = PROC_TRACE_CTL_ENABLE;\n+ int enableTrace = PROC_TRACE_CTL_ENABLE;\n int disableRandomization = PROC_ASLR_FORCE_DISABLE;\n if (procctl(P_PID, 0, PROC_TRACE_CTL, &enableTrace) == -1) {\n PLOG_E(\"procctl(PROC_TRACE_CTL, PROC_TRACE_CTL_ENABLE)\");\n"} {"commit":"5638c5a86c4802e587d111ea888d0d3d3a0045b0","subject":"PROTON-907: check error status of connections selectable, and close transport if set","message":"PROTON-907: check error status of connections selectable, and close transport if set\n","repos":"kgiusti\/qpid-proton,bozzzzo\/qpid-proton,Karm\/qpid-proton,ssorj\/qpid-proton,bozzzzo\/qpid-proton,prestona\/qpid-proton,RobertoMalatesta\/qpid-proton,prestona\/qpid-proton,RobertoMalatesta\/qpid-proton,bozzzzo\/qpid-proton,alanconway\/qpid-proton,RobertoMalatesta\/qpid-proton,clemensv\/qpid-proton,ssorj\/qpid-proton,bozzzzo\/qpid-proton,wprice\/qpid-proton,wprice\/qpid-proton,Azure\/qpid-proton,bozzzzo\/qpid-proton,ssorj\/qpid-proton,wprice\/qpid-proton,gemmellr\/qpid-proton,apache\/qpid-proton,kgiusti\/qpid-proton,clemensv\/qpid-proton,clemensv\/qpid-proton,clemensv\/qpid-proton,Karm\/qpid-proton,RobertoMalatesta\/qpid-proton,bozzzzo\/qpid-proton,clemensv\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,prestona\/qpid-proton,Azure\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,bozzzzo\/qpid-proton,wprice\/qpid-proton,wprice\/qpid-proton,RobertoMalatesta\/qpid-proton,Karm\/qpid-proton,Azure\/qpid-proton,prestona\/qpid-proton,astitcher\/qpid-proton,Karm\/qpid-proton,wprice\/qpid-proton,bozzzzo\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,wprice\/qpid-proton,clemensv\/qpid-proton,prestona\/qpid-proton,RobertoMalatesta\/qpid-proton,Karm\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,Azure\/qpid-proton,apache\/qpid-proton,astitcher\/qpid-proton,prestona\/qpid-proton,gemmellr\/qpid-proton,gemmellr\/qpid-proton,gemmellr\/qpid-proton,kgiusti\/qpid-proton,gemmellr\/qpid-proton,alanconway\/qpid-proton,clemensv\/qpid-proton,Karm\/qpid-proton,Karm\/qpid-proton,ChugR\/qpid-proton,Azure\/qpid-proton,Karm\/qpid-proton,kgiusti\/qpid-proton,RobertoMalatesta\/qpid-proton,alanconway\/qpid-proton,RobertoMalatesta\/qpid-proton,apache\/qpid-proton,prestona\/qpid-proton,bozzzzo\/qpid-proton,wprice\/qpid-proton,ChugR\/qpid-proton,ssorj\/qpid-proton,Azure\/qpid-proton,RobertoMalatesta\/qpid-proton,prestona\/qpid-proton,Karm\/qpid-proton,alanconway\/qpid-proton,apache\/qpid-proton,prestona\/qpid-proton,clemensv\/qpid-proton,astitcher\/qpid-proton,Azure\/qpid-proton,Azure\/qpid-proton,ChugR\/qpid-proton,alanconway\/qpid-proton,Azure\/qpid-proton,bozzzzo\/qpid-proton,wprice\/qpid-proton,Karm\/qpid-proton,wprice\/qpid-proton,bozzzzo\/qpid-proton,ChugR\/qpid-proton,ChugR\/qpid-proton,gemmellr\/qpid-proton-j,Karm\/qpid-proton,Karm\/qpid-proton,RobertoMalatesta\/qpid-proton,clemensv\/qpid-proton,ChugR\/qpid-proton,clemensv\/qpid-proton,kgiusti\/qpid-proton,wprice\/qpid-proton,prestona\/qpid-proton,gemmellr\/qpid-proton-j,clemensv\/qpid-proton,Azure\/qpid-proton,gemmellr\/qpid-proton,ssorj\/qpid-proton,kgiusti\/qpid-proton,ssorj\/qpid-proton,RobertoMalatesta\/qpid-proton,astitcher\/qpid-proton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- proton-c\/src\/messenger\/messenger.c\n+++ proton-c\/src\/messenger\/messenger.c\n@@ -233,6 +233,13 @@\n \n int pn_messenger_process_events(pn_messenger_t *messenger);\n \n+static void pni_connection_error(pn_selectable_t *sel)\n+{\n+ pn_transport_t *transport = pni_transport(sel);\n+ pn_transport_close_tail(transport);\n+ pn_transport_close_head(transport);\n+}\n+\n static void pni_connection_readable(pn_selectable_t *sel)\n {\n pn_connection_ctx_t *context = pni_context(sel);\n@@ -444,6 +451,7 @@\n ctx->connection = conn;\n pn_selectable_t *sel = pn_selectable();\n ctx->selectable = sel;\n+ pn_selectable_on_error(sel, pni_connection_error);\n pn_selectable_on_readable(sel, pni_connection_readable);\n pn_selectable_on_writable(sel, pni_connection_writable);\n pn_selectable_on_expired(sel, pni_connection_expired);\n@@ -1356,6 +1364,9 @@\n }\n if (events & PN_EXPIRED) {\n pn_selectable_expired(sel);\n+ }\n+ if (events & PN_ERROR) {\n+ pn_selectable_error(sel);\n }\n }\n \/\/ ensure timer events are processed. Cannot call this inside the while loop\n"} {"commit":"96c52f00c2d11bd75e83476068886312454e4822","subject":"o Change almost all magic numbers to the appropriate constants. o Fix zero payloading, unbreak ping -s 0. o Increase socket recieve buffer, ping -s 65467 is working now.","message":"o Change almost all magic numbers to the appropriate constants.\no Fix zero payloading, unbreak ping -s 0.\no Increase socket recieve buffer, ping -s 65467 is working now.\n\nSubmitted by:\tanti-magic sweep based on kris's patch\nReviewed by:\tbde, silence on -audit\nMFC after:\t2 months\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sbin\/ping\/ping.c\n+++ sbin\/ping\/ping.c\n@@ -101,12 +101,12 @@\n #define\tDEFDATALEN\t(64 - PHDR_LEN)\t\/* default data length *\/\n #define\tFLOOD_BACKOFF\t20000\t\t\/* usecs to back off if F_FLOOD mode *\/\n \t\t\t\t\t\/* runs out of buffer space *\/\n-#define\tMAXIPLEN\t60\n-#define\tMAXICMPLEN\t76\n-#define\tMAXPACKET\t(65536 - 60 - 8)\/* max packet size *\/\n+#define\tMAXIPLEN\t(sizeof(struct ip) + MAX_IPOPTLEN)\n+#define\tMAXICMPLEN\t(ICMP_ADVLENMIN + MAX_IPOPTLEN)\n+#define\tMINICMPLEN\tICMP_MINLEN\n+#define\tMAXPAYLOAD\t(IP_MAXPACKET - MAXIPLEN - MINICMPLEN)\n #define\tMAXWAIT\t\t10\t\t\/* max seconds to wait for response *\/\n #define\tMAXALARM\t(60 * 60)\t\/* max seconds for alarm timeout *\/\n-#define\tNROUTES\t\t9\t\t\/* number of record route slots *\/\n \n #define\tA(bit)\t\trcvd_tbl[(bit)>>3]\t\/* identify byte in array *\/\n #define\tB(bit)\t\t(1 << ((bit) & 0x07))\t\/* identify bit in byte *\/\n@@ -150,7 +150,7 @@\n struct sockaddr_in whereto;\t\/* who to ping *\/\n int datalen = DEFDATALEN;\n int s;\t\t\t\t\/* socket file descriptor *\/\n-u_char outpack[MAXPACKET];\n+u_char outpack[MINICMPLEN + MAXPAYLOAD];\n char BSPACE = '\\b';\t\t\/* characters written for flood *\/\n char BBELL = '\\a';\t\t\/* characters written for MISSED and AUDIBLE *\/\n char DOT = '.';\n@@ -208,7 +208,7 @@\n \tstruct hostent *hp;\n \tstruct sockaddr_in *to;\n \tdouble t;\n-\tu_char *datap, *packet;\n+\tu_char *datap, packet[IP_MAXPACKET];\n \tchar *ep, *source, *target;\n #ifdef IPSEC_POLICY_IPSEC\n \tchar *policy_in, *policy_out;\n@@ -218,7 +218,7 @@\n \tchar ctrl[CMSG_SPACE(sizeof(struct timeval))];\n \tchar hnamebuf[MAXHOSTNAMELEN], snamebuf[MAXHOSTNAMELEN];\n #ifdef IP_OPTIONS\n-\tchar rspace[3 + 4 * NROUTES + 1];\t\/* record route space *\/\n+\tchar rspace[MAX_IPOPTLEN];\t\/* record route space *\/\n #endif\n \tunsigned char mttl, loop;\n \n@@ -240,7 +240,7 @@\n \n \talarmtimeout = preload = 0;\n \n-\tdatap = &outpack[8 + PHDR_LEN];\n+\tdatap = &outpack[MINICMPLEN + PHDR_LEN];\n \twhile ((ch = getopt(argc, argv,\n \t\t\"AI:LQRS:T:c:adfi:l:m:np:qrs:t:v\"\n #ifdef IPSEC\n@@ -342,10 +342,11 @@\n \t\t\t\terr(EX_NOPERM, \"-s flag\");\n \t\t\t}\n \t\t\tultmp = strtoul(optarg, &ep, 0);\n-\t\t\tif (ultmp > MAXPACKET)\n-\t\t\t\terrx(EX_USAGE, \"packet size too large: %lu\",\n-\t\t\t\t ultmp);\n-\t\t\tif (*ep || ep == optarg || !ultmp)\n+\t\t\tif (ultmp > MAXPAYLOAD)\n+\t\t\t\terrx(EX_USAGE,\n+\t\t\t\t \"packet size too large: %lu > %u\",\n+\t\t\t\t ultmp, MAXPAYLOAD);\n+\t\t\tif (*ep || ep == optarg)\n \t\t\t\terrx(EX_USAGE, \"invalid packet size: `%s'\",\n \t\t\t\t optarg);\n \t\t\tdatalen = ultmp;\n@@ -408,7 +409,8 @@\n \t\t\t\t source, hstrerror(h_errno));\n \n \t\t\tsin.sin_len = sizeof sin;\n-\t\t\tif (hp->h_length > sizeof(sin.sin_addr))\n+\t\t\tif (hp->h_length > sizeof(sin.sin_addr) ||\n+\t\t\t hp->h_length < 0)\n \t\t\t\terrx(1, \"gethostbyname2: illegal address\");\n \t\t\tmemcpy(&sin.sin_addr, hp->h_addr_list[0],\n \t\t\t sizeof(sin.sin_addr));\n@@ -454,9 +456,8 @@\n \n \tif (datalen >= PHDR_LEN)\t\/* can we time transfer *\/\n \t\ttiming = 1;\n-\tpacklen = datalen + MAXIPLEN + MAXICMPLEN;\n-\tif (!(packet = (u_char *)malloc((size_t)packlen)))\n-\t\terr(EX_UNAVAILABLE, \"malloc\");\n+\tpacklen = MAXIPLEN + MAXICMPLEN + datalen;\n+\tpacklen = packlen > IP_MAXPACKET ? IP_MAXPACKET : packlen;\n \n \tif (!(options & F_PINGFILLED))\n \t\tfor (i = PHDR_LEN; i < datalen; ++i)\n@@ -559,7 +560,12 @@\n \t * \/etc\/ethers. But beware: RFC 1122 allows hosts to ignore broadcast\n \t * or multicast pings if they wish.\n \t *\/\n-\thold = 48 * 1024;\n+\n+\t\/*\n+\t * XXX receive buffer needs undetermined space for mbuf overhead\n+\t * as well.\n+\t *\/\n+\thold = IP_MAXPACKET + 128;\n \t(void)setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&hold,\n \t sizeof(hold));\n \n@@ -738,9 +744,9 @@\n * pinger --\n *\tCompose and transmit an ICMP ECHO REQUEST packet. The IP packet\n * will be added on by the kernel. The ID field is our UNIX process ID,\n- * and the sequence number is an ascending integer. The first 8 bytes\n- * of the data portion are used to hold a UNIX \"timeval\" struct in host\n- * byte-order, to compute the round-trip time.\n+ * and the sequence number is an ascending integer. The first PHDR_LEN\n+ * bytes of the data portion are used to hold a UNIX \"timeval\" struct in\n+ * host byte-order, to compute the round-trip time.\n *\/\n static void\n pinger(void)\n@@ -758,10 +764,10 @@\n \tCLR(ntransmitted % mx_dup_ck);\n \n \tif (timing)\n-\t\t(void)gettimeofday((struct timeval *)&outpack[8],\n+\t\t(void)gettimeofday((struct timeval *)&outpack[MINICMPLEN],\n \t\t (struct timezone *)NULL);\n \n-\tcc = datalen + PHDR_LEN;\t\t\/* skips ICMP portion *\/\n+\tcc = MINICMPLEN + datalen;\n \n \t\/* compute ICMP checksum here *\/\n \ticp->icmp_cksum = in_cksum((u_short *)icp, cc);\n@@ -877,7 +883,7 @@\n \t\t\t\t(void)write(STDOUT_FILENO, &BBELL, 1);\n \t\t\t\/* check the data *\/\n \t\t\tcp = (u_char*)&icp->icmp_data[PHDR_LEN];\n-\t\t\tdp = &outpack[8 + PHDR_LEN];\n+\t\t\tdp = &outpack[MINICMPLEN + PHDR_LEN];\n \t\t\tfor (i = PHDR_LEN; i < datalen; ++i, ++cp, ++dp) {\n \t\t\t\tif (*cp != *dp) {\n \t(void)printf(\"\\nwrong data byte #%d should be 0x%x but was 0x%x\",\n@@ -890,7 +896,7 @@\n \t\t\t\t\t\t(void)printf(\"%x \", *cp);\n \t\t\t\t\t}\n \t\t\t\t\t(void)printf(\"\\ndp:\");\n-\t\t\t\t\tcp = &outpack[8];\n+\t\t\t\t\tcp = &outpack[MINICMPLEN];\n \t\t\t\t\tfor (i = 0; i < datalen; ++i, ++cp) {\n \t\t\t\t\t\tif ((i % 32) == 8)\n \t\t\t\t\t\t\t(void)printf(\"\\n\\t\");\n@@ -1403,7 +1409,7 @@\n {\n \tchar *cp;\n \tint pat[16];\n-\tint ii, jj, kk;\n+\tu_int ii, jj, kk;\n \n \tfor (cp = patp; *cp; cp++) {\n \t\tif (!isxdigit(*cp))\n@@ -1418,9 +1424,7 @@\n \t &pat[13], &pat[14], &pat[15]);\n \n \tif (ii > 0)\n-\t\tfor (kk = 0;\n-\t\t kk <= MAXPACKET - (8 + PHDR_LEN + ii);\n-\t\t kk += ii)\n+\t\tfor (kk = 0; kk <= MAXPAYLOAD - (PHDR_LEN + ii); kk += ii)\n \t\t\tfor (jj = 0; jj < ii; ++jj)\n \t\t\t\tbp[jj + kk] = pat[jj];\n \tif (!(options & F_QUIET)) {\n"} {"commit":"4b6f3e9602482afbd0511ad69a7135695bd8231c","subject":"update(ics2017-pa4.1): implement '_map' function","message":"update(ics2017-pa4.1): implement '_map' function\n\nissue sabertazimi\/ics-2017#4\n","repos":"sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nexus-am\/am\/arch\/x86-nemu\/src\/pte.c\n+++ nexus-am\/am\/arch\/x86-nemu\/src\/pte.c\n@@ -66,6 +66,19 @@\n }\n \n void _map(_Protect *p, void *va, void *pa) {\n+ PDE *pde_base = p->ptr;\n+ uint32_t pdx = PDX(va);\n+\n+ if (!(pde_base[pdx] & PTE_P)) {\n+ \/\/ alloc a new page table\n+ PTE *ptab = (PTE *)(palloc_f());\n+ pde_base[pdx] = (uintptr_t)ptab | PTE_P;\n+ }\n+\n+ PDE pde = pde_base[pdx];\n+ PTE *pte_base = (PTE *)PTE_ADDR(pde);\n+ uint32_t ptx = PTX(va);\n+ pte_base[ptx] = (uintptr_t)PTE_ADDR(pa) | PTE_P;\n }\n \n void _unmap(_Protect *p, void *va) {\n"} {"commit":"c6fe6d8c3795d546e15c21cf2dea886630202ec9","subject":"nimble\/ll: Fix LE Ping with devices that don't support it","message":"nimble\/ll: Fix LE Ping with devices that don't support it\n\nCore Specification 5.0 Vol. 6 Part D. 6.13 \"LE PING\":\n\"Either Link Layer can authenticate the remote device using the LE Ping\nProcedure even if the remote device does not support the LE Ping\nfeature.\"\n\nBoth LE_PING_RSP and LL_UNKNOWN_RSP are valid reasponses for LE Ping\nprocedure.\n\nThis was affecting TP\/SEC\/MAS\/BV-10-C qualification test case.\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_ctrl.c\n+++ nimble\/controller\/src\/ble_ll_ctrl.c\n@@ -387,10 +387,9 @@\n ctrl_proc = BLE_LL_CTRL_PROC_CONN_PARAM_REQ;\n break;\n case BLE_LL_CTRL_PING_REQ:\n- CONN_F_LE_PING_SUPP(connsm) = 0;\n-#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING) == 1)\n- os_callout_stop(&connsm->auth_pyld_timer);\n-#endif\n+ \/* LL can authenticate remote device even if remote device does not\n+ * support LE Ping feature.\n+ *\/\n ctrl_proc = BLE_LL_CTRL_PROC_LE_PING;\n break;\n #if (BLE_LL_BT5_PHY_SUPPORTED ==1)\n"} {"commit":"523d4e2008fd4a68b1a164e63e8c75b7b20f07e0","subject":"mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()","message":"mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()\n\nanon_vma_clone() expects new_vma->vm_{start,end,pgoff} to be correctly set\nso that the new vma can be indexed on the anon interval tree.\n\ncopy_vma() was failing to do that, which broke mremap().\n\nSigned-off-by: Michel Lespinasse <6a4cf9207bb95b1a4cf1be22c2e93f8b38036f65@google.com>\nCc: Jiri Slaby <dfbf39eb5bf303a3db5454d815cb8c8888cbadf9@suse.cz>\nCc: Hugh Dickins <d3abdf3e2800e6cb849f11b81e6eb50b34d96431@google.com>\nTested-by: Sasha Levin <611d453c03d02ce713e72b62ff6a901ea7e9cd77@gmail.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/mmap.c\n+++ mm\/mmap.c\n@@ -2419,16 +2419,16 @@\n \t\tnew_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);\n \t\tif (new_vma) {\n \t\t\t*new_vma = *vma;\n+\t\t\tnew_vma->vm_start = addr;\n+\t\t\tnew_vma->vm_end = addr + len;\n+\t\t\tnew_vma->vm_pgoff = pgoff;\n \t\t\tpol = mpol_dup(vma_policy(vma));\n \t\t\tif (IS_ERR(pol))\n \t\t\t\tgoto out_free_vma;\n+\t\t\tvma_set_policy(new_vma, pol);\n \t\t\tINIT_LIST_HEAD(&new_vma->anon_vma_chain);\n \t\t\tif (anon_vma_clone(new_vma, vma))\n \t\t\t\tgoto out_free_mempol;\n-\t\t\tvma_set_policy(new_vma, pol);\n-\t\t\tnew_vma->vm_start = addr;\n-\t\t\tnew_vma->vm_end = addr + len;\n-\t\t\tnew_vma->vm_pgoff = pgoff;\n \t\t\tif (new_vma->vm_file)\n \t\t\t\tget_file(new_vma->vm_file);\n \t\t\tif (new_vma->vm_ops && new_vma->vm_ops->open)\n"} {"commit":"d7979f08ba06c6a5914505b928d3209cecccde87","subject":"don't check the tailslot unless there's actually an item on the list","message":"don't check the tailslot unless there's actually an item on the list\n\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@7700 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/psc_util\/journal.c\n+++ psc_fsutil_libs\/psc_util\/journal.c\n@@ -140,17 +140,20 @@\n \t * slot. By checking it, we're trying to prevent the journal from\n \t * over writing slots belonging to open transactions.\n \t *\/\n-\tt = psclist_first_entry(&pj->pj_pndgxids, struct psc_journal_xidhndl,\n-\t\t\t\tpjx_lentry);\n-\n-\tpsc_trace(\"pj(%p) tail@slot(%d) my@slot(%d)\",\n-\t\t pj, t->pjx_tailslot, slot);\n-\n-\tif (t->pjx_tailslot == slot) {\n-\t\tpsc_warnx(\"pj(%p) blocking on slot(%d) availability - \"\n-\t\t\t \"owned by xid (%p)\", pj, slot, t);\n-\t\tpsc_waitq_wait(&pj->pj_waitq, &pj->pj_lock);\n-\t\tgoto retry;\n+\tif (!psclist_empty(&pj->pj_pndgxids)) {\n+\t\n+\t\tt = psclist_first_entry(&pj->pj_pndgxids, struct psc_journal_xidhndl,\n+\t\t\t\t\tpjx_lentry);\n+\t\t\n+\t\tpsc_trace(\"pj(%p) tail@slot(%d) my@slot(%d)\",\n+\t\t\t pj, t->pjx_tailslot, slot);\n+\t\t\n+\t\tif (t->pjx_tailslot == slot) {\n+\t\t\tpsc_warnx(\"pj(%p) blocking on slot(%d) availability - \"\n+\t\t\t\t \"owned by xid (%p)\", pj, slot, t);\n+\t\t\tpsc_waitq_wait(&pj->pj_waitq, &pj->pj_lock);\n+\t\t\tgoto retry;\n+\t\t}\n \t}\n \n \tif (atomic_dec_and_test(&xh->pjx_ref) &&\n"} {"commit":"111b86fae097983332f406cbfdf7060856b0cbc2","subject":"net\/nimble\/controller\tSlave connection update fix","message":"net\/nimble\/controller\tSlave connection update fix\n\nThe code was not correctly handling the case where a slave receives\na connection update where the current connection event counter is\nequal to the instant in the connection update PDU. This is a valid\ncase (as per spec errata). With this fix the controller should\ncorrectly handle this case.\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_ctrl.c\n+++ nimble\/controller\/src\/ble_ll_ctrl.c\n@@ -1571,10 +1571,10 @@\n break;\n #endif\n case BLE_LL_CTRL_PROC_DATA_LEN_UPD:\n-\t\/* That should not happen according to Bluetooth 5.0 Vol6 Part B, 5.1.9\n-\t * However we need this workaround as there are devices on the market\n-\t * which do send LL_REJECT on LL_LENGTH_REQ when collision happens\n-\t *\/\n+ \/* That should not happen according to Bluetooth 5.0 Vol6 Part B, 5.1.9\n+ * However we need this workaround as there are devices on the market\n+ * which do send LL_REJECT on LL_LENGTH_REQ when collision happens\n+ *\/\n ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);\n break;\n default:\n@@ -1623,6 +1623,21 @@\n ble_ll_conn_timeout(connsm, BLE_ERR_INSTANT_PASSED);\n } else {\n connsm->csmflags.cfbit.conn_update_sched = 1;\n+\n+ \/*\n+ * Errata says that receiving a connection update when the event\n+ * counter is equal to the instant means wesimply ignore the window\n+ * offset and window size. Anchor point has already been set based on\n+ * first packet received in connection event. Given that we increment\n+ * the event counter BEFORE checking to see if the instant is equal to\n+ * the event counter what we do here is increment the instant and set\n+ * the window offset and size to 0.\n+ *\/\n+ if (conn_events == 0) {\n+ reqdata->winoffset = 0;\n+ reqdata->winsize = 0;\n+ reqdata->instant += 1;\n+ }\n }\n \n return rsp_opcode;\n"} {"commit":"947ca1856a7e60aa6d20536785e6a42dff25aa6e","subject":"slab: fix the DEADLOCK issue on l3 alien lock","message":"slab: fix the DEADLOCK issue on l3 alien lock\n\nDEADLOCK will be report while running a kernel with NUMA and LOCKDEP enabled,\nthe process of this fake report is:\n\n\t kmem_cache_free()\t\/\/free obj in cachep\n\t-> cache_free_alien()\t\/\/acquire cachep's l3 alien lock\n\t-> __drain_alien_cache()\n\t-> free_block()\n\t-> slab_destroy()\n\t-> kmem_cache_free()\t\/\/free slab in cachep->slabp_cache\n\t-> cache_free_alien()\t\/\/acquire cachep->slabp_cache's l3 alien lock\n\nSince the cachep and cachep->slabp_cache's l3 alien are in the same lock class,\nfake report generated.\n\nThis should not happen since we already have init_lock_keys() which will\nreassign the lock class for both l3 list and l3 alien.\n\nHowever, init_lock_keys() was invoked at a wrong position which is before we\ninvoke enable_cpucache() on each cache.\n\nSince until set slab_state to be FULL, we won't invoke enable_cpucache()\non caches to build their l3 alien while creating them, so although we invoked\ninit_lock_keys(), the l3 alien lock class won't change since we don't have\nthem until invoked enable_cpucache() later.\n\nThis patch will invoke init_lock_keys() after we done enable_cpucache()\ninstead of before to avoid the fake DEADLOCK report.\n\nMichael traced the problem back to a commit in release 3.0.0:\n\ncommit 30765b92ada267c5395fc788623cb15233276f5c\nAuthor: Peter Zijlstra <peterz@infradead.org>\nDate: Thu Jul 28 23:22:56 2011 +0200\n\n slab, lockdep: Annotate the locks before using them\n\n Fernando found we hit the regular OFF_SLAB 'recursion' before we\n annotate the locks, cure this.\n\n The relevant portion of the stack-trace:\n\n > [ 0.000000] [<c085e24f>] rt_spin_lock+0x50\/0x56\n > [ 0.000000] [<c04fb406>] __cache_free+0x43\/0xc3\n > [ 0.000000] [<c04fb23f>] kmem_cache_free+0x6c\/0xdc\n > [ 0.000000] [<c04fb2fe>] slab_destroy+0x4f\/0x53\n > [ 0.000000] [<c04fb396>] free_block+0x94\/0xc1\n > [ 0.000000] [<c04fc551>] do_tune_cpucache+0x10b\/0x2bb\n > [ 0.000000] [<c04fc8dc>] enable_cpucache+0x7b\/0xa7\n > [ 0.000000] [<c0bd9d3c>] kmem_cache_init_late+0x1f\/0x61\n > [ 0.000000] [<c0bba687>] start_kernel+0x24c\/0x363\n > [ 0.000000] [<c0bba0ba>] i386_start_kernel+0xa9\/0xaf\n\n Reported-by: Fernando Lopez-Lezcano <nando@ccrma.Stanford.EDU>\n Acked-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>\n Link: http:\/\/lkml.kernel.org\/r\/1311888176.2617.379.camel@laptop\n Signed-off-by: Ingo Molnar <mingo@elte.hu>\n\nThe commit moved init_lock_keys() before we build up the alien, so we\nfailed to reclass it.\n\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org> # 3.0+\nAcked-by: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nTested-by: Paul E. McKenney <1e0ce936bb9b355d257bf5790d2513c3f28be22b@linux.vnet.ibm.com>\nSigned-off-by: Michael Wang <6affa2782fb8514898f88c7c4a087191fcbabb20@linux.vnet.ibm.com>\nSigned-off-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -1774,15 +1774,15 @@\n \n \tslab_state = UP;\n \n-\t\/* Annotate slab for lockdep -- annotate the malloc caches *\/\n-\tinit_lock_keys();\n-\n \t\/* 6) resize the head arrays to their final sizes *\/\n \tmutex_lock(&slab_mutex);\n \tlist_for_each_entry(cachep, &slab_caches, list)\n \t\tif (enable_cpucache(cachep, GFP_NOWAIT))\n \t\t\tBUG();\n \tmutex_unlock(&slab_mutex);\n+\n+\t\/* Annotate slab for lockdep -- annotate the malloc caches *\/\n+\tinit_lock_keys();\n \n \t\/* Done! *\/\n \tslab_state = FULL;\n"} {"commit":"e930d096c85fc1f06ecbc481000dd8cbf944b81e","subject":"nimble\/controller: Use scansm from function parameter","message":"nimble\/controller: Use scansm from function parameter\n\nX-Original-Commit: ef1b67ff8700db9e191ec5a67c74c6e29311ff26\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_scan.c\n+++ nimble\/controller\/src\/ble_ll_scan.c\n@@ -486,7 +486,7 @@\n rc = ble_ll_hci_event_send(orig_evbuf);\n if (!rc) {\n \/* If filtering, add it to list of duplicate addresses *\/\n- if (g_ble_ll_scan_sm.scan_filt_dups) {\n+ if (scansm->scan_filt_dups) {\n ble_ll_scan_add_dup_adv(adv_addr, txadd, subev);\n }\n }\n"} {"commit":"3580d7d1450c4d194f0954adf1c18de2f65b854f","subject":"Implemented double click detection in icon view widget","message":"Implemented double click detection in icon view widget\n\nSimply stores the last clicked icon and a timestamp. If any user input\nhappens, other than left mouse button click\/release, the icon pointer\nis cleared. If the timestamp is further in the past than a certain\nthreshold, the icon pointer is cleared.\n-> If a an icon gets clicked and the icon pointer points to the same\n icon, a select event is generated\n\nAppears a little flaky on my system with spurious double clicks, but\nthat might be my broken mouse (other programs on the same system show\nthe same behaviour)\n\nSigned-off-by: David Oberhollenzer <ef97309e490485c1bad5018f0617d7fa37bc07ac@tele2.at>\n","repos":"AgentD\/sgui,AgentD\/sgui,AgentD\/sgui","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- widgets\/src\/icon_view.c\n+++ widgets\/src\/icon_view.c\n@@ -33,6 +33,13 @@\n #include <stdlib.h>\n #include <string.h>\n \n+#ifdef MACHINE_OS_WINDOWS\n+ #define WIN32_LEAN_AND_MEAN\n+ #include <windows.h>\n+#else\n+ #include <sys\/time.h>\n+#endif\n+\n \n \n #define IV_MULTISELECT 0x01\n@@ -63,10 +70,30 @@\n int endx, endy;\n int flags;\n int offset; \/* the offset from the border of the view *\/\n+\n+ icon* grabed; \/* the last icon that was clicked *\/\n+ long grabtime; \/* when the last icon was clicked *\/\n }\n icon_view;\n \n \n+\n+#define DOUBLE_CLICK_MS 750\n+\n+\n+\n+static long get_time_ms( void )\n+{\n+#ifdef MACHINE_OS_WINDOWS\n+ return GetTickCount( );\n+#else\n+ struct timeval tp;\n+\n+ gettimeofday( &tp, NULL );\n+\n+ return tp.tv_sec*1000 + tp.tv_usec\/1000;\n+#endif\n+}\n \n static void get_icon_bounding_box( icon_view* this, icon* i, sgui_rect* r )\n {\n@@ -168,6 +195,20 @@\n \n sgui_internal_lock_mutex( );\n \n+ \/*\n+ stop double click detection if mouse moved, key pressed\/released or\n+ any mouse button other than the left one did something\n+ *\/\n+ if( e->type==SGUI_MOUSE_MOVE_EVENT || e->type==SGUI_KEY_PRESSED_EVENT ||\n+ e->type==SGUI_KEY_RELEASED_EVENT ||\n+ (e->type==SGUI_MOUSE_PRESS_EVENT &&\n+ e->arg.i3.z!=SGUI_MOUSE_BUTTON_LEFT)||\n+ (e->type==SGUI_MOUSE_RELEASE_EVENT &&\n+ e->arg.i3.z!=SGUI_MOUSE_BUTTON_LEFT) )\n+ {\n+ this->grabed = NULL;\n+ }\n+\n if(e->type==SGUI_MOUSE_PRESS_EVENT && e->arg.i3.z==SGUI_MOUSE_BUTTON_LEFT)\n {\n this->endx = this->grab_x = e->arg.i3.x;\n@@ -194,6 +235,30 @@\n {\n deselect_all_icons( this );\n this->flags = IV_SELECTBOX;\n+ }\n+\n+ \/* double click detection timeout *\/\n+ if( this->grabed && (get_time_ms( )-this->grabtime)>DOUBLE_CLICK_MS )\n+ {\n+ this->grabed = NULL;\n+ }\n+\n+ \/* double click detection *\/\n+ if( !(this->flags&IV_MULTISELECT) )\n+ {\n+ if( this->grabed && this->grabed==new )\n+ {\n+ ev.widget = (sgui_widget*)this->grabed->user;\n+ ev.window = NULL;\n+ ev.type = SGUI_ICON_SELECTED;\n+ this->grabed = NULL;\n+ sgui_event_post( &ev );\n+ }\n+ else\n+ {\n+ this->grabed = new;\n+ this->grabtime = get_time_ms( );\n+ }\n }\n }\n else if( e->type==SGUI_MOUSE_MOVE_EVENT && (this->flags & IV_SELECTBOX) )\n"} {"commit":"51cd8e6ff265650e35e46b5bcbe2ee381a7a2877","subject":"mm, slab: lock the correct nodelist after reenabling irqs","message":"mm, slab: lock the correct nodelist after reenabling irqs\n\ncache_grow() can reenable irqs so the cpu (and node) can change, so ensure\nthat we take list_lock on the correct nodelist.\n\nThis fixes an issue with commit 072bb0aa5e06 (\"mm: sl[au]b: add\nknowledge of PFMEMALLOC reserve pages\") where list_lock for the wrong\nnode was taken after growing the cache.\n\nReported-and-tested-by: Haggai Eran <a558c0e8c8d9df6f2e5864bc715329bac6a2f11b@mellanox.com>\nSigned-off-by: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -3260,6 +3260,7 @@\n \n \t\t\/* cache_grow can reenable interrupts, then ac could change. *\/\n \t\tac = cpu_cache_get(cachep);\n+\t\tnode = numa_mem_id();\n \n \t\t\/* no objects in sight? abort *\/\n \t\tif (!x && (ac->avail == 0 || force_refill))\n"} {"commit":"f09eac9034a4502cce558b0ec4bf7d422b8b355b","subject":"tracing\/kmemtrace: fix typo","message":"tracing\/kmemtrace: fix typo\n\nImpact: build fix\n\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slab.c\n+++ mm\/slab.c\n@@ -102,7 +102,7 @@\n #include\t<linux\/cpu.h>\n #include\t<linux\/sysctl.h>\n #include\t<linux\/module.h>\n-#include\t<tracing\/kmemtrace.h>\n+#include\t<trace\/kmemtrace.h>\n #include\t<linux\/rcupdate.h>\n #include\t<linux\/string.h>\n #include\t<linux\/uaccess.h>\n"} {"commit":"3811dbf67162bd08412f1b0e02e554f353e93bdb","subject":"SLUB: remove useless masking of GFP_ZERO","message":"SLUB: remove useless masking of GFP_ZERO\n\nRemove a recently added useless masking of GFP_ZERO. GFP_ZERO is already\nmasked out in new_slab() (See how it calls allocate_slab). No need to do\nit twice.\n\nThis reverts the SLUB parts of 7fd272550bd43cc1d7289ef0ab2fa50de137e767.\n\nCc: Matt Mackall <4121265491a72225438dfd0e91a228f361407ae2@selenic.com>\nReviewed-by: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@cs.helsinki.fi>\nSigned-off-by: Christoph Lameter <a2610c5c148280bb6730402b12a8276c2f194fbe@sgi.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slub.c\n+++ mm\/slub.c\n@@ -1467,9 +1467,6 @@\n {\n \tvoid **object;\n \tstruct page *new;\n-\n-\t\/* We handle __GFP_ZERO in the caller *\/\n-\tgfpflags &= ~__GFP_ZERO;\n \n \tif (!c->page)\n \t\tgoto new_slab;\n"} {"commit":"be21f0ab0d8f10c90265066603a8d95b6037a6fa","subject":"fix mm\/util.c:krealloc()","message":"fix mm\/util.c:krealloc()\n\nCommit ef8b4520bd9f8294ffce9abd6158085bde5dc902 added one NULL check for\n\"p\" in krealloc(), but that doesn't seem to be enough since there\ndoesn't seem to be any guarantee that memcpy(ret, NULL, 0) works\n(spotted by the Coverity checker).\n\nFor making it clearer what happens this patch also removes the pointless\nmin().\n\nSigned-off-by: Adrian Bunk <0b86548ef377da0031a3ff3f0c4e06f016e20105@kernel.org>\nAcked-by: Christoph Lameter <a2610c5c148280bb6730402b12a8276c2f194fbe@sgi.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/util.c\n+++ mm\/util.c\n@@ -95,8 +95,8 @@\n \t\treturn (void *)p;\n \n \tret = kmalloc_track_caller(new_size, flags);\n-\tif (ret) {\n-\t\tmemcpy(ret, p, min(new_size, ks));\n+\tif (ret && p) {\n+\t\tmemcpy(ret, p, ks);\n \t\tkfree(p);\n \t}\n \treturn ret;\n"} {"commit":"87b723a54bc7be661e3fd1cfa54c6290d2b64b79","subject":"wocky_strdiff preferred over strcmp","message":"wocky_strdiff preferred over strcmp\n","repos":"freedesktop-unofficial-mirror\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky,freedesktop-unofficial-mirror\/wocky,noonien-d\/wocky,noonien-d\/wocky","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- wocky\/wocky-connector.c\n+++ wocky\/wocky-connector.c\n@@ -544,7 +544,7 @@\n return;\n }\n \n- if ((version == NULL) || strcmp (version, \"1.0\"))\n+ if (wocky_strdiff (version, \"1.0\"))\n {\n abort_connect (self, NULL, WOCKY_CONNECTOR_ERR_MALFORMED_XMPP,\n \"Server not XMPP Compliant\");\n@@ -566,6 +566,7 @@\n WockyConnectorPrivate *priv = WOCKY_CONNECTOR_GET_PRIVATE (self);\n WockyXmppStanza *stanza;\n WockyXmppNode *tls;\n+ WockyXmppNode *node;\n WockyXmppStanza *starttls;\n gboolean can_encrypt = FALSE;\n \n@@ -579,8 +580,10 @@\n return;\n }\n \n- if (strcmp (stanza->node->name, \"features\") ||\n- strcmp (wocky_xmpp_node_get_ns (stanza->node), WOCKY_XMPP_NS_STREAM))\n+ node = stanza->node;\n+\n+ if (wocky_strdiff (node->name, \"features\") ||\n+ wocky_strdiff (wocky_xmpp_node_get_ns (node), WOCKY_XMPP_NS_STREAM))\n {\n const char *msg =\n WOCKY_CONNECTOR_CHOOSE_BY_STATE (priv,\n@@ -592,7 +595,7 @@\n }\n \n tls =\n- wocky_xmpp_node_get_child_ns (stanza->node, \"starttls\", WOCKY_XMPP_NS_TLS);\n+ wocky_xmpp_node_get_child_ns (node, \"starttls\", WOCKY_XMPP_NS_TLS);\n can_encrypt = (tls != NULL);\n \n \/* conditions:\n@@ -655,6 +658,7 @@\n GError *error = NULL;\n WockyConnector *self = WOCKY_CONNECTOR (data);\n WockyConnectorPrivate *priv = WOCKY_CONNECTOR_GET_PRIVATE (self);\n+ WockyXmppNode *node;\n \n stanza =\n wocky_xmpp_connection_recv_stanza_finish (priv->conn, result, &priv->error);\n@@ -666,8 +670,10 @@\n return;\n }\n \n- if (strcmp (stanza->node->name, \"proceed\") ||\n- strcmp (wocky_xmpp_node_get_ns (stanza->node), WOCKY_XMPP_NS_TLS))\n+ node = stanza->node;\n+\n+ if (wocky_strdiff (node->name, \"proceed\") ||\n+ wocky_strdiff (wocky_xmpp_node_get_ns (node), WOCKY_XMPP_NS_TLS))\n {\n if (priv->tls_required)\n {\n"} {"commit":"5d7ef8477ca16fe62bbf75e77a053086470f8d35","subject":"Change to state_message + comment from review.","message":"Change to state_message + comment from review.\n","repos":"noonien-d\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky,freedesktop-unofficial-mirror\/wocky,noonien-d\/wocky,freedesktop-unofficial-mirror\/wocky","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- wocky\/wocky-connector.c\n+++ wocky\/wocky-connector.c\n@@ -195,21 +195,22 @@\n #define WOCKY_CONNECTOR_GET_PRIVATE(o) \\\n (G_TYPE_INSTANCE_GET_PRIVATE((o),WOCKY_TYPE_CONNECTOR,WockyConnectorPrivate))\n \n-\/* during XMPP setup, we have to loop through very similar states\n- (handling the same stanza types) about 3 times: the handling is\n- almost identical, with the few differences depending on which\n- of these states we are in: AUTHENTICATED, ENCRYPTED or INITIAL\n- This macro wraps up the logic of inspecting our internal state\n- and deciding which condition applies: *\/\n-\n+\/* choose an appropriate chunk of text describing our state for debug\/error *\/\n static char *\n state_message (WockyConnectorPrivate *priv, const char *str)\n {\n GString *msg = g_string_new (\"\");\n- const char *state = (priv->authed ? \"Authentication Completed\" :\n- priv->encrypted ? \"TLS Negotiated\" :\n- priv->connected ? \"TCP Connection Established\" :\n- \"Connecting... \");\n+ const char *state = NULL;\n+\n+ if (priv->authed)\n+ state = \"Authentication Completed\";\n+ else if (priv->encrypted)\n+ state = \"TLS Negotiated\";\n+ else if (priv->connected)\n+ state = \"TCP Connection Established\";\n+ else\n+ state = \"Connecting... \";\n+\n g_string_printf (msg, \"%s: %s\", state, str);\n return g_string_free (msg, FALSE);\n }\n"} {"commit":"58c78600a5c025812aac4e0141f8f56912cbdaec","subject":"add test for string conversion","message":"add test for string conversion\n","repos":"rekola\/canvas,Sometrik\/canvas,Sometrik\/canvas,rekola\/canvas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ContextQuartz2D.h\n+++ src\/ContextQuartz2D.h\n@@ -8,6 +8,7 @@\n #include <CoreText\/CoreText.h>\n \n #include <sstream>\n+#include <iostream>\n \n namespace canvas {\n class Quartz2DCache {\n@@ -128,6 +129,10 @@\n #endif\n \n CFStringRef text2 = CFStringCreateWithCString(NULL, text.c_str(), kCFStringEncodingUTF8);\n+ if (!text2) {\n+ std::cerr << \"failed to create CString from '\" << text << \"'\" << std::endl;\n+ assert(0);\n+ }\n CFStringRef keys[] = { kCTFontAttributeName, kCTForegroundColorAttributeName }; \/\/ kCTFontSymbolicTrait };\n CFTypeRef values[] = { font2, color }; \/\/ traits2\n \n"} {"commit":"85e08830d9ee73100ebf6195a1da7a30ca811428","subject":"Fix 2 potential buffer overrun in sqWin32Service.c","message":"Fix 2 potential buffer overrun in sqWin32Service.c\n","repos":"OpenSmalltalk\/vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,timfel\/squeakvm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/win32\/vm\/sqWin32Service.c\n+++ platforms\/win32\/vm\/sqWin32Service.c\n@@ -338,7 +338,7 @@\n \/* sqStartService95: start the named service on a Windows 95 system *\/\n int\n sqStartService95(LPTSTR serviceName)\n-{ TCHAR tmpString[1024];\n+{ TCHAR tmpString[1025];\n STARTUPINFO sInfo;\n PROCESS_INFORMATION pInfo;\n DWORD dwSize, dwType;\n@@ -499,7 +499,7 @@\n DWORD WINAPI sqThreadMain(DWORD ignored)\n { DWORD dwSize, dwType, ok;\n HKEY hk;\n- static TCHAR tmpString[256];\n+ static TCHAR tmpString[MAX_PATH+1];\n static TCHAR lbuf[50];\n char *cmd;\n \n"} {"commit":"08cc27d481fc29b30eca854dcae9fd0e9147d8ce","subject":"Make win32 threads LLP64 compatible","message":"Make win32 threads LLP64 compatible\n","repos":"OpenSmalltalk\/vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,timfel\/squeakvm,timfel\/squeakvm,peteruhnak\/pharo-vm,timfel\/squeakvm,bencoman\/pharo-vm,timfel\/squeakvm,bencoman\/pharo-vm,OpenSmalltalk\/vm,OpenSmalltalk\/vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,timfel\/squeakvm,bencoman\/pharo-vm,timfel\/squeakvm,timfel\/squeakvm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,bencoman\/pharo-vm,timfel\/squeakvm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- platforms\/win32\/vm\/sqWin32Threads.c\n+++ platforms\/win32\/vm\/sqWin32Threads.c\n@@ -243,7 +243,7 @@\n \n \/* this for testing crash dumps *\/\n static sqInt\n-indirect(long p)\n+indirect(sqIntptr_t p)\n {\n \tif ((p & 2))\n \t\terror(\"crashInThisOrAnotherThread\");\n"} {"commit":"b1452803ec9b8064afa4844d3eaa43671b9bf47f","subject":"updated xine plugin: Cosmetics","message":"updated xine plugin: Cosmetics\n","repos":"vlc-mirror\/libbluray,ShiftMediaProject\/libbluray,mwgoldsmith\/bluray,vlc-mirror\/libbluray,koying\/libbluray,UIKit0\/libbluray,pingflood\/libbluray,ShiftMediaProject\/libbluray,Azzuro\/libbluray,Azzuro\/libbluray,UIKit0\/libbluray,EdwardNewK\/libbluray,ace20022\/libbluray,EdwardNewK\/libbluray,tourettes\/libbluray,pingflood\/libbluray,ShiftMediaProject\/libbluray,EdwardNewK\/libbluray,zxlooong\/libbluray,koying\/libbluray,ShiftMediaProject\/libbluray,tourettes\/libbluray,vlc-mirror\/libbluray,zxlooong\/libbluray,ace20022\/libbluray,zxlooong\/libbluray,vlc-mirror\/libbluray,tourettes\/libbluray,pingflood\/libbluray,koying\/libbluray,mwgoldsmith\/bluray,ace20022\/libbluray,mwgoldsmith\/bluray,Azzuro\/libbluray,mwgoldsmith\/bluray,tourettes\/libbluray,Distrotech\/libbluray,Distrotech\/libbluray,Azzuro\/libbluray,EdwardNewK\/libbluray,UIKit0\/libbluray,UIKit0\/libbluray,koying\/libbluray,ace20022\/libbluray,Distrotech\/libbluray,Distrotech\/libbluray","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- player_wrappers\/xine\/input_bluray.c\n+++ player_wrappers\/xine\/input_bluray.c\n@@ -168,27 +168,27 @@\n if (ov->palette) {\n uint32_t color[256];\n uint8_t trans[256];\n- for(i = 0; i < 256; i++) {\n- trans[i] = ov->palette[i].T;\n- color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;\n- }\n-\n- xine_osd_set_palette(this->osd, color, trans);\n+ for(i = 0; i < 256; i++) {\n+ trans[i] = ov->palette[i].T;\n+ color[i] = (ov->palette[i].Y << 16) | (ov->palette[i].Cr << 8) | ov->palette[i].Cb;\n+ }\n+\n+ xine_osd_set_palette(this->osd, color, trans);\n }\n \n \/* uncompress and draw bitmap *\/\n if (ov->img) {\n- const BD_PG_RLE_ELEM *rlep = ov->img;\n- uint8_t *img = malloc(ov->w * ov->h);\n- unsigned pixels = ov->w * ov->h;\n-\n- for (i = 0; i < pixels; i += rlep->len, rlep++) {\n- memset(img + i, rlep->color, rlep->len);\n- }\n-\n- xine_osd_draw_bitmap(this->osd, img, ov->x, ov->y, ov->w, ov->h, NULL);\n-\n- free(img);\n+ const BD_PG_RLE_ELEM *rlep = ov->img;\n+ uint8_t *img = malloc(ov->w * ov->h);\n+ unsigned pixels = ov->w * ov->h;\n+\n+ for (i = 0; i < pixels; i += rlep->len, rlep++) {\n+ memset(img + i, rlep->color, rlep->len);\n+ }\n+\n+ xine_osd_draw_bitmap(this->osd, img, ov->x, ov->y, ov->w, ov->h, NULL);\n+\n+ free(img);\n }\n \n \/* display *\/\n"} {"commit":"40ccadc7885edcf1dc78086693d61082117c7544","subject":" * Added test code of CSS for div tag.","message":" * Added test code of CSS for div tag.\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@4462 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"c957b49d04281e965ab1cdc386752c3b28615e2c","subject":"Moved helper macros inside header guard","message":"Moved helper macros inside header guard\n\nA previous push request added some macros into the header file and\nI missed that it was outside the header include guard. This should\nnow be fixed and not cause problem if included multiple times in\ndifferent location.\n","repos":"OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/sherlock.lv2","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- nuklear.h\n+++ nuklear.h\n@@ -2471,11 +2471,6 @@\n unsigned int seq;\n };\n \n-#ifdef __cplusplus\n-}\n-#endif\n-#endif \/* NK_H_ *\/\n-\n \/* ==============================================================\n * MATH\n * =============================================================== *\/\n@@ -2545,6 +2540,11 @@\n #else\n #define NK_ALIGNOF(t) ((char*)(&((struct {char c; t _h;}*)0)->_h) - (char*)0)\n #endif\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+#endif \/* NK_H_ *\/\n \n \/*\n * ==============================================================\n"} {"commit":"1d8b9662ac449b6dbcad17a51441838d5855bf76","subject":" * Added test code of the blockquote tag for XHTML1.0 converter.","message":" * Added test code of the blockquote tag for XHTML1.0 converter.\n\n\ngit-svn-id: 5a656d61eb83e8a11bc10c623638a3ef5e8fa3fa@3337 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"9bf6b9c28245ac9814f7b5bad7b15896f5e10985","subject":"fixed invalid null terminator reads from string schema fields in client","message":"fixed invalid null terminator reads from string schema fields in client\n","repos":"FabianHahn\/shoveler-spatialos,FabianHahn\/shoveler-spatialos,FabianHahn\/shoveler-spatialos","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- workers\/client\/schema.c\n+++ workers\/client\/schema.c\n@@ -557,11 +557,17 @@\n \t\tshovelerComponentClearConfigurationOption(component, optionId, \/* isCanonical *\/ true);\n \t\tshovelerLogTrace(\"Cleared entity %lld component '%s' option '%s'.\", component->entityId, component->type->id, configurationOption->name);\n \t} else {\n-\t\tconst char *stringValue = (const char *) Schema_GetBytes(fields, fieldId);\n-\n-\t\tshovelerComponentUpdateCanonicalConfigurationOptionString(component, optionId, stringValue);\n-\n-\t\tshovelerLogTrace(\"Updated entity %lld component '%s' option '%s' to string value '%s'.\", component->entityId, component->type->id, configurationOption->name, stringValue);\n+\t\tint bytesLength = (int) Schema_GetBytesLength(fields, fieldId);\n+\t\tconst char *bytesValue = (const char *) Schema_GetBytes(fields, fieldId);\n+\n+\t\tGString *stringValue = g_string_new(\"\");\n+\t\tg_string_append_len(stringValue, bytesValue, bytesLength);\n+\n+\t\tshovelerComponentUpdateCanonicalConfigurationOptionString(component, optionId, stringValue->str);\n+\n+\t\tshovelerLogTrace(\"Updated entity %lld component '%s' option '%s' to string value '%s'.\", component->entityId, component->type->id, configurationOption->name, stringValue->str);\n+\n+\t\tg_string_free(stringValue, \/* free_segment *\/ true);\n \t}\n }\n \n"} {"commit":"314b7d9b73cd7f02d3878e5848774e8411004120","subject":"[numerics] doxygen, add return type to NM_convert","message":"[numerics] doxygen, add return type to NM_convert\n","repos":"siconos\/siconos,radarsat1\/siconos,radarsat1\/siconos,siconos\/siconos,siconos\/siconos,radarsat1\/siconos,radarsat1\/siconos,siconos\/siconos,radarsat1\/siconos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- numerics\/src\/tools\/NumericsMatrix.h\n+++ numerics\/src\/tools\/NumericsMatrix.h\n@@ -713,8 +713,9 @@\n \n \n \/** Pass a NumericsMatrix through swig typemaps.\n- * This is only usefull in python.\n+ * This is only useful in python.\n * \\param A the matrix\n+ * \\return a NumericsMatrix\n *\/\n static inline NumericsMatrix* NM_convert(NumericsMatrix* A)\n {\n"} {"commit":"8ebe45c0ad59cc52b4d5bf9bbcb1dd0650bcffee","subject":"Removed inline for pulse_ce due to compatibility issues with TI compiler (inline funcs must contain code defined only within current source file)","message":"Removed inline for pulse_ce due to compatibility issues with TI compiler (inline funcs must contain code defined only within current source file)\n","repos":"spirilis\/msprf24,spirilis\/msprf24","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- msprf24.c\n+++ msprf24.c\n@@ -201,7 +201,7 @@\n \tCSN_DIS;\n }\n \n-inline void pulse_ce()\n+void pulse_ce()\n {\n \tCE_EN;\n \t__delay_cycles(DELAY_CYCLES_15US);\n"} {"commit":"1a3be7c8aa7b7772f76255b1a38bd19e18d3f76e","subject":"Forgot to delete one instance of py_matrix.h in MatrixIF.h","message":"Forgot to delete one instance of py_matrix.h in MatrixIF.h\n\n\n","repos":"tesch1\/GAMMA,tesch1\/GAMMA,tesch1\/GAMMA,tesch1\/GAMMA,tesch1\/GAMMA","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/Matrix\/MatrixIF.h\n+++ src\/Matrix\/MatrixIF.h\n@@ -36,7 +36,6 @@\n #include <Matrix\/n_matrix.h>\t\t\/\/ Normal (full) matrix\r\n #include <Matrix\/h_matrix.h>\t\t\/\/ Hermitian matrix\r\n #include <Matrix\/matrix.h> \/\/ Matrix (collection of all types)\r\n-#include <Matrix\/py_matrix.h>\t\t\/\/ Additonal Python exports from matrix\r\n #include <Matrix\/col_vector.h>\t\t\/\/ Column vectors (derived from matrix)\r\n #include <Matrix\/row_vector.h>\t\t\/\/ Row vectors (derived from matrix)\r\n \r\n"} {"commit":"6cfb6f99926ff36c9f1386a485ebd5f3681048bd","subject":"align commits","message":"align commits\n","repos":"ckj996\/Y86","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/Y86.c\n+++ lib\/Y86.c\n@@ -7,7 +7,7 @@\n \n struct immp_entry {\n \timm_t *immp;\n-\tstruct list_head immp_list;\t\t\/* immp list *\/\n+\tstruct list_head immp_list;\t\/* immp list *\/\n };\n \n struct symbol_entry {\n@@ -260,9 +260,9 @@\n \t{F_INS|F_REG, 2, fill_i_r },\t\/* A pushl *\/\n \t{F_INS|F_REG, 2, fill_i_r },\t\/* B popl *\/\n \t{F_IMM, 2, fill_i_v },\t\/* C .long *\/\n-\t{F_NONE, 2, NULL },\t\/* D .pos *\/\n-\t{F_NONE, 2, NULL },\t\/* E .align *\/\n-\t{F_NONE, 0, NULL },\t\/* F ERROR *\/\n+\t{F_NONE, 2, NULL },\t\/* D .pos *\/\n+\t{F_NONE, 2, NULL },\t\/* E .align *\/\n+\t{F_NONE, 0, NULL },\t\/* F ERROR *\/\n };\n \n code_t instr_code(ins_t ins)\n"} {"commit":"9b0690c1c8a8eea0eb7e02922177264a1e62ca7d","subject":"changed scope.c to have better priority example","message":"changed scope.c to have better priority example\n","repos":"rkgibson2\/CS50-Section","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- section2\/scope.c\n+++ section2\/scope.c\n@@ -30,10 +30,11 @@\n void scope2(void)\n {\n int a = 4;\n- (void) a; \/\/ have to do this to compile w\/out warning \"unused variable\"\n \n- {\n+ if (1) {\n int a = 0;\n printf(\"%d\\n\", a); \/\/ what will this print?\n }\n+\n+ printf(\"%d\\n\", a);\n }\n"} {"commit":"fa01e2a0dbe7c72d0cfed3d09aabd596f5e3763e","subject":"Fixed grapped dragging behavior #116","message":"Fixed grapped dragging behavior #116\n\nFixed mouse grapping emulation for progressbars and window position\ndragging which previously still got triggered if other widgets were\nbeing dragged.\n","repos":"OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/sherlock.lv2,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/moony.lv2,OpenMusicKontrollers\/midi_matrix.lv2,OpenMusicKontrollers\/patchmatrix,OpenMusicKontrollers\/sherlock.lv2","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- nuklear.h\n+++ nuklear.h\n@@ -11741,9 +11741,7 @@\n nk_flags *state, int active)\n {\n *state = NK_WIDGET_STATE_INACTIVE;\n- if (in && nk_input_is_mouse_hovering_rect(in, select))\n- *state = NK_WIDGET_STATE_HOVERED;\n- if (nk_input_mouse_clicked(in, NK_BUTTON_LEFT, select)) {\n+ if (nk_button_behavior(state, select, in, NK_BUTTON_DEFAULT)) {\n *state = NK_WIDGET_STATE_ACTIVE;\n active = !active;\n }\n@@ -12229,7 +12227,11 @@\n {\n *state = NK_WIDGET_STATE_INACTIVE;\n if (in && modifiable && nk_input_is_mouse_hovering_rect(in, r)) {\n- if (nk_input_is_mouse_down(in, NK_BUTTON_LEFT)) {\n+ int left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down;\n+ int left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in,\n+ NK_BUTTON_LEFT, r, nk_true);\n+\n+ if (left_mouse_down && left_mouse_click_in_cursor) {\n float ratio = NK_MAX(0, (float)(in->mouse.pos.x - r.x)) \/ (float)r.w;\n value = (nk_size)NK_MAX(0,((float)max * ratio));\n *state = NK_WIDGET_STATE_ACTIVE;\n@@ -14776,7 +14778,6 @@\n nk_free_window(ctx, win->popup.win);\n win->popup.win = 0;\n }\n-\n win->next = 0;\n win->prev = 0;\n \n@@ -14904,6 +14905,7 @@\n title_hash = nk_murmur_hash(title, (int)title_len, NK_WINDOW_TITLE);\n win = nk_find_window(ctx, title_hash);\n if (!win) {\n+ \/* create new window *\/\n win = (struct nk_window*)nk_create_window(ctx);\n nk_insert_window(ctx, win);\n nk_command_buffer_init(&win->buffer, &ctx->memory, NK_CLIPPING_ON);\n@@ -14929,17 +14931,11 @@\n return 0;\n }\n \n- \/* overlapping window *\/\n+ \/* window overlapping *\/\n if (!(win->flags & NK_WINDOW_SUB) && !(win->flags & NK_WINDOW_HIDDEN))\n {\n int inpanel, ishovered;\n const struct nk_window *iter = win;\n-\n- \/* This is so terrible but necessary for minimized windows. The difference\n- * lies in the size of the window. But it is not possible to get the size\n- * without cheating because you do not have the information at this point.\n- * Even worse this is wrong since windows could have different window heights.\n- * I leave it in for now since I otherwise loose my mind. *\/\n float h = ctx->style.font.height + 2 * style->window.header.padding.y;\n \n \/* activate window if hovered and no other window is overlapping this window *\/\n@@ -15395,7 +15391,8 @@\n \n \/* window dragging *\/\n if ((win->flags & NK_WINDOW_MOVABLE) && !(win->flags & NK_WINDOW_ROM)) {\n- int incursor;\n+ int left_mouse_down;\n+ int left_mouse_click_in_cursor;\n struct nk_rect move;\n move.x = win->bounds.x;\n move.y = win->bounds.y;\n@@ -15407,10 +15404,16 @@\n move.h += 2.0f * style->window.header.label_padding.y;\n } else move.h = window_padding.y + item_spacing.y;\n \n- incursor = nk_input_is_mouse_prev_hovering_rect(in, move);\n- if (nk_input_is_mouse_down(in, NK_BUTTON_LEFT) && incursor) {\n+ \/*incursor = nk_input_is_mouse_prev_hovering_rect(in, move);*\/\n+ left_mouse_down = in->mouse.buttons[NK_BUTTON_LEFT].down;\n+ left_mouse_click_in_cursor = nk_input_has_mouse_click_down_in_rect(in,\n+ NK_BUTTON_LEFT, move, nk_true);\n+\n+ if (left_mouse_down && left_mouse_click_in_cursor) {\n win->bounds.x = win->bounds.x + in->mouse.delta.x;\n win->bounds.y = win->bounds.y + in->mouse.delta.y;\n+ in->mouse.buttons[NK_BUTTON_LEFT].clicked_pos.x += in->mouse.delta.x;\n+ in->mouse.buttons[NK_BUTTON_LEFT].clicked_pos.y += in->mouse.delta.y;\n }\n }\n \n"} {"commit":"a7b466caafbadc0efc1f7ef0e30d569cdc35dd54","subject":" * Added test code of CSS for div tag.","message":" * Added test code of CSS for div tag.\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@4456 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n+++ test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n@@ -23920,7 +23920,7 @@\n #define RESULT_STRING \"<?xml version=\\\"1.0\\\" encoding=\\\"Shift_JIS\\\" ?>\" \\\n \"<!DOCTYPE html PUBLIC \\\"-\/\/i-mode group (ja)\/\/DTD XHTML i-XHTML(Locale\/Ver.=ja\/1.0) 1.0\/\/EN\\\" \\\"i-xhtml_4ja_10.dtd\\\">\" \\\n \"<html xmlns=\\\"http:\/\/www.w3.org\/1999\/xhtml\\\">\" \\\n- \"<head><\/head><body><div style=\\\"font-size:large;\\\">\u3042\u3044\u3046<\/div><\/div><\/body><\/html>\"\n+ \"<head><\/head><body><div style=\\\"font-size:large;\\\">\u3042\u3044\u3046<\/div><\/body><\/html>\"\n char *ret;\n char *tmp;\n device_table spec;\n"} {"commit":"053b12985eac881cfc98171b1c385aa2a2efe60b","subject":"[compiler-rt][builtins] Provide __clear_cache for SPARC","message":"[compiler-rt][builtins] Provide __clear_cache for SPARC\n\nWhile working on https:\/\/reviews.llvm.org\/D40900, two tests were failing since __clear_cache\naborted. While libgcc's __clear_cache is just empty, this only happens because\ngcc (in gcc\/config\/sparc\/sparc.c (sparc32_initialize_trampoline, sparc64_initialize_trampoline))\nemits flush insns directly.\n\nThe following patch mimics that.\n\nTested on sparcv9-sun-solaris2.11.\n\nDifferential Revision: https:\/\/reviews.llvm.org\/D64496\n\n\ngit-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@366822 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/builtins\/clear_cache.c\n+++ lib\/builtins\/clear_cache.c\n@@ -173,6 +173,16 @@\n for (uintptr_t line = start_line; line < end_line; line += line_size)\n __asm__ volatile(\"icbi 0, %0\" : : \"r\"(line));\n __asm__ volatile(\"isync\");\n+#elif defined(__sparc__)\n+ const size_t dword_size = 8;\n+ const size_t len = (uintptr_t)end - (uintptr_t)start;\n+\n+ const uintptr_t mask = ~(dword_size - 1);\n+ const uintptr_t start_dword = ((uintptr_t)start) & mask;\n+ const uintptr_t end_dword = ((uintptr_t)start + len + dword_size - 1) & mask;\n+\n+ for (uintptr_t dword = start_dword; dword < end_dword; dword += dword_size)\n+ __asm__ volatile(\"flush %0\" : : \"r\"(dword));\n #else\n #if __APPLE__\n \/\/ On Darwin, sys_icache_invalidate() provides this functionality\n"} {"commit":"c8228126ac0a00e058fb5a2c6106184b03d3fbb0","subject":"ENH: use intrinsics for isnan, isfinite and isinf","message":"ENH: use intrinsics for isnan, isfinite and isinf\n\nUse of intrinsics avoids expensive function calls in tight loops on x86\ncpus where these operations are implemented in hardware while still\nretaining same portability.\nMore than doubles performance of np.isnan\/isinf\/isfinite.\n","repos":"rajathkumarmp\/numpy,njase\/numpy,mhvk\/numpy,ContinuumIO\/numpy,CMartelLML\/numpy,tdsmith\/numpy,rudimeier\/numpy,grlee77\/numpy,ahaldane\/numpy,MichaelAquilina\/numpy,argriffing\/numpy,has2k1\/numpy,mindw\/numpy,SiccarPoint\/numpy,naritta\/numpy,felipebetancur\/numpy,nbeaver\/numpy,skymanaditya1\/numpy,ContinuumIO\/numpy,jschueller\/numpy,GaZ3ll3\/numpy,tdsmith\/numpy,Dapid\/numpy,Linkid\/numpy,has2k1\/numpy,mattip\/numpy,endolith\/numpy,mathdd\/numpy,mindw\/numpy,naritta\/numpy,shoyer\/numpy,BMJHayward\/numpy,NextThought\/pypy-numpy,gfyoung\/numpy,tacaswell\/numpy,KaelChen\/numpy,endolith\/numpy,kirillzhuravlev\/numpy,kiwifb\/numpy,ogrisel\/numpy,mhvk\/numpy,sinhrks\/numpy,mindw\/numpy,brandon-rhodes\/numpy,chatcannon\/numpy,ajdawson\/numpy,naritta\/numpy,BMJHayward\/numpy,ViralLeadership\/numpy,pdebuyl\/numpy,bringingheavendown\/numpy,embray\/numpy,mortada\/numpy,pyparallel\/numpy,rmcgibbo\/numpy,pbrod\/numpy,gmcastil\/numpy,SunghanKim\/numpy,jankoslavic\/numpy,Anwesh43\/numpy,sonnyhu\/numpy,Srisai85\/numpy,ddasilva\/numpy,SunghanKim\/numpy,Anwesh43\/numpy,maniteja123\/numpy,Yusa95\/numpy,NextThought\/pypy-numpy,jakirkham\/numpy,jorisvandenbossche\/numpy,SunghanKim\/numpy,rmcgibbo\/numpy,mindw\/numpy,simongibbons\/numpy,ahaldane\/numpy,maniteja123\/numpy,ChristopherHogan\/numpy,Linkid\/numpy,gmcastil\/numpy,rhythmsosad\/numpy,yiakwy\/numpy,mingwpy\/numpy,MaPePeR\/numpy,pbrod\/numpy,AustereCuriosity\/numpy,anntzer\/numpy,musically-ut\/numpy,has2k1\/numpy,sonnyhu\/numpy,Yusa95\/numpy,mhvk\/numpy,ogrisel\/numpy,dch312\/numpy,bertrand-l\/numpy,MaPePeR\/numpy,dimasad\/numpy,leifdenby\/numpy,numpy\/numpy,simongibbons\/numpy,pdebuyl\/numpy,madphysicist\/numpy,bmorris3\/numpy,rmcgibbo\/numpy,WillieMaddox\/numpy,sinhrks\/numpy,moreati\/numpy,nguyentu1602\/numpy,pbrod\/numpy,jankoslavic\/numpy,chiffa\/numpy,GrimDerp\/numpy,kirillzhuravlev\/numpy,jorisvandenbossche\/numpy,githubmlai\/numpy,jakirkham\/numpy,numpy\/numpy,ssanderson\/numpy,b-carter\/numpy,anntzer\/numpy,tdsmith\/numpy,seberg\/numpy,gfyoung\/numpy,jakirkham\/numpy,rgommers\/numpy,ESSS\/numpy,leifdenby\/numpy,immerrr\/numpy,trankmichael\/numpy,sinhrks\/numpy,kirillzhuravlev\/numpy,kiwifb\/numpy,MaPePeR\/numpy,bmorris3\/numpy,dwillmer\/numpy,madphysicist\/numpy,kiwifb\/numpy,groutr\/numpy,Eric89GXL\/numpy,embray\/numpy,mortada\/numpy,ChristopherHogan\/numpy,chiffa\/numpy,groutr\/numpy,ChristopherHogan\/numpy,Anwesh43\/numpy,immerrr\/numpy,pyparallel\/numpy,immerrr\/numpy,mhvk\/numpy,NextThought\/pypy-numpy,hainm\/numpy,Eric89GXL\/numpy,ContinuumIO\/numpy,bringingheavendown\/numpy,jankoslavic\/numpy,AustereCuriosity\/numpy,has2k1\/numpy,brandon-rhodes\/numpy,nguyentu1602\/numpy,ajdawson\/numpy,grlee77\/numpy,utke1\/numpy,numpy\/numpy,nbeaver\/numpy,grlee77\/numpy,jakirkham\/numpy,groutr\/numpy,bringingheavendown\/numpy,ChanderG\/numpy,jorisvandenbossche\/numpy,BabeNovelty\/numpy,SiccarPoint\/numpy,WillieMaddox\/numpy,mwiebe\/numpy,mattip\/numpy,mingwpy\/numpy,dwillmer\/numpy,skymanaditya1\/numpy,tynn\/numpy,chatcannon\/numpy,joferkington\/numpy,rhythmsosad\/numpy,ekalosak\/numpy,BMJHayward\/numpy,GrimDerp\/numpy,larsmans\/numpy,jonathanunderwood\/numpy,ddasilva\/numpy,empeeu\/numpy,utke1\/numpy,behzadnouri\/numpy,hainm\/numpy,dch312\/numpy,pizzathief\/numpy,cjermain\/numpy,BabeNovelty\/numpy,mathdd\/numpy,ChristopherHogan\/numpy,GaZ3ll3\/numpy,ViralLeadership\/numpy,charris\/numpy,pizzathief\/numpy,mwiebe\/numpy,rherault-insa\/numpy,sigma-random\/numpy,ESSS\/numpy,ChanderG\/numpy,MaPePeR\/numpy,moreati\/numpy,mortada\/numpy,kirillzhuravlev\/numpy,trankmichael\/numpy,ahaldane\/numpy,tynn\/numpy,joferkington\/numpy,musically-ut\/numpy,sonnyhu\/numpy,joferkington\/numpy,chatcannon\/numpy,ajdawson\/numpy,larsmans\/numpy,mattip\/numpy,madphysicist\/numpy,rgommers\/numpy,skwbc\/numpy,utke1\/numpy,rajathkumarmp\/numpy,rudimeier\/numpy,MichaelAquilina\/numpy,andsor\/numpy,Srisai85\/numpy,jonathanunderwood\/numpy,KaelChen\/numpy,MSeifert04\/numpy,charris\/numpy,nguyentu1602\/numpy,maniteja123\/numpy,shoyer\/numpy,dch312\/numpy,nguyentu1602\/numpy,sigma-random\/numpy,yiakwy\/numpy,felipebetancur\/numpy,shoyer\/numpy,Linkid\/numpy,andsor\/numpy,stuarteberg\/numpy,ogrisel\/numpy,grlee77\/numpy,WarrenWeckesser\/numpy,ahaldane\/numpy,dimasad\/numpy,cjermain\/numpy,gfyoung\/numpy,Yusa95\/numpy,solarjoe\/numpy,dwillmer\/numpy,ssanderson\/numpy,drasmuss\/numpy,tacaswell\/numpy,cowlicks\/numpy,sonnyhu\/numpy,sinhrks\/numpy,cjermain\/numpy,jorisvandenbossche\/numpy,CMartelLML\/numpy,simongibbons\/numpy,rgommers\/numpy,drasmuss\/numpy,endolith\/numpy,ChanderG\/numpy,brandon-rhodes\/numpy,behzadnouri\/numpy,pyparallel\/numpy,Dapid\/numpy,stuarteberg\/numpy,githubmlai\/numpy,simongibbons\/numpy,githubmlai\/numpy,rherault-insa\/numpy,cowlicks\/numpy,larsmans\/numpy,jschueller\/numpy,tdsmith\/numpy,hainm\/numpy,MSeifert04\/numpy,embray\/numpy,pdebuyl\/numpy,bmorris3\/numpy,andsor\/numpy,CMartelLML\/numpy,rhythmsosad\/numpy,abalkin\/numpy,rgommers\/numpy,pdebuyl\/numpy,pizzathief\/numpy,cjermain\/numpy,Yusa95\/numpy,BabeNovelty\/numpy,empeeu\/numpy,ajdawson\/numpy,KaelChen\/numpy,Srisai85\/numpy,larsmans\/numpy,KaelChen\/numpy,rmcgibbo\/numpy,dato-code\/numpy,empeeu\/numpy,immerrr\/numpy,mortada\/numpy,endolith\/numpy,madphysicist\/numpy,skwbc\/numpy,rherault-insa\/numpy,shoyer\/numpy,njase\/numpy,dwillmer\/numpy,NextThought\/pypy-numpy,rajathkumarmp\/numpy,ogrisel\/numpy,argriffing\/numpy,seberg\/numpy,mathdd\/numpy,MichaelAquilina\/numpy,grlee77\/numpy,WarrenWeckesser\/numpy,trankmichael\/numpy,GrimDerp\/numpy,ViralLeadership\/numpy,jschueller\/numpy,Linkid\/numpy,stuarteberg\/numpy,dato-code\/numpy,rudimeier\/numpy,AustereCuriosity\/numpy,brandon-rhodes\/numpy,rajathkumarmp\/numpy,ESSS\/numpy,MSeifert04\/numpy,numpy\/numpy,tynn\/numpy,BabeNovelty\/numpy,jankoslavic\/numpy,abalkin\/numpy,pbrod\/numpy,charris\/numpy,njase\/numpy,bertrand-l\/numpy,cowlicks\/numpy,seberg\/numpy,bertrand-l\/numpy,ahaldane\/numpy,solarjoe\/numpy,MichaelAquilina\/numpy,nbeaver\/numpy,embray\/numpy,musically-ut\/numpy,hainm\/numpy,GaZ3ll3\/numpy,jakirkham\/numpy,SiccarPoint\/numpy,jonathanunderwood\/numpy,felipebetancur\/numpy,githubmlai\/numpy,tacaswell\/numpy,WarrenWeckesser\/numpy,Anwesh43\/numpy,anntzer\/numpy,dimasad\/numpy,felipebetancur\/numpy,rhythmsosad\/numpy,embray\/numpy,Eric89GXL\/numpy,leifdenby\/numpy,Eric89GXL\/numpy,mathdd\/numpy,mattip\/numpy,cowlicks\/numpy,SiccarPoint\/numpy,chiffa\/numpy,andsor\/numpy,WarrenWeckesser\/numpy,b-carter\/numpy,GrimDerp\/numpy,sigma-random\/numpy,charris\/numpy,pbrod\/numpy,ddasilva\/numpy,skwbc\/numpy,dato-code\/numpy,anntzer\/numpy,argriffing\/numpy,naritta\/numpy,b-carter\/numpy,pizzathief\/numpy,Dapid\/numpy,ssanderson\/numpy,MSeifert04\/numpy,skymanaditya1\/numpy,shoyer\/numpy,joferkington\/numpy,yiakwy\/numpy,drasmuss\/numpy,empeeu\/numpy,mingwpy\/numpy,GaZ3ll3\/numpy,WillieMaddox\/numpy,musically-ut\/numpy,bmorris3\/numpy,solarjoe\/numpy,Srisai85\/numpy,ekalosak\/numpy,abalkin\/numpy,CMartelLML\/numpy,moreati\/numpy,simongibbons\/numpy,madphysicist\/numpy,SunghanKim\/numpy,ekalosak\/numpy,BMJHayward\/numpy,ChanderG\/numpy,ogrisel\/numpy,behzadnouri\/numpy,jschueller\/numpy,ekalosak\/numpy,dimasad\/numpy,jorisvandenbossche\/numpy,stuarteberg\/numpy,WarrenWeckesser\/numpy,pizzathief\/numpy,trankmichael\/numpy,MSeifert04\/numpy,sigma-random\/numpy,seberg\/numpy,dato-code\/numpy,dch312\/numpy,mingwpy\/numpy,skymanaditya1\/numpy,gmcastil\/numpy,mhvk\/numpy,rudimeier\/numpy,mwiebe\/numpy,yiakwy\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/include\/numpy\/npy_math.h\n+++ numpy\/core\/include\/numpy\/npy_math.h\n@@ -148,33 +148,49 @@\n \/*\n * IEEE 754 fpu handling. Those are guaranteed to be macros\n *\/\n-#ifndef NPY_HAVE_DECL_ISNAN\n- #define npy_isnan(x) ((x) != (x))\n+\n+\/* use a builtins to avoid function calls in tight loops\n+ * documented only on 4.4, but available in at least 4.2 *\/\n+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)\n+ #define npy_isnan(x) __builtin_isnan(x)\n #else\n- #ifdef _MSC_VER\n- #define npy_isnan(x) _isnan((x))\n+ #ifndef NPY_HAVE_DECL_ISNAN\n+ #define npy_isnan(x) ((x) != (x))\n #else\n- #define npy_isnan(x) isnan((x))\n+ #ifdef _MSC_VER\n+ #define npy_isnan(x) _isnan((x))\n+ #else\n+ #define npy_isnan(x) isnan(x)\n+ #endif\n #endif\n #endif\n \n-#ifndef NPY_HAVE_DECL_ISFINITE\n- #ifdef _MSC_VER\n- #define npy_isfinite(x) _finite((x))\n+\n+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)\n+ #define npy_isfinite(x) __builtin_isfinite(x)\n+#else\n+ #ifndef NPY_HAVE_DECL_ISFINITE\n+ #ifdef _MSC_VER\n+ #define npy_isfinite(x) _finite((x))\n+ #else\n+ #define npy_isfinite(x) !npy_isnan((x) + (-x))\n+ #endif\n #else\n- #define npy_isfinite(x) !npy_isnan((x) + (-x))\n+ #define npy_isfinite(x) isfinite((x))\n #endif\n+#endif\n+\n+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)\n+ #define npy_isinf(x) __builtin_isinf(x)\n #else\n- #define npy_isfinite(x) isfinite((x))\n-#endif\n-\n-#ifndef NPY_HAVE_DECL_ISINF\n- #define npy_isinf(x) (!npy_isfinite(x) && !npy_isnan(x))\n-#else\n- #ifdef _MSC_VER\n- #define npy_isinf(x) (!_finite((x)) && !_isnan((x)))\n+ #ifndef NPY_HAVE_DECL_ISINF\n+ #define npy_isinf(x) (!npy_isfinite(x) && !npy_isnan(x))\n #else\n- #define npy_isinf(x) isinf((x))\n+ #ifdef _MSC_VER\n+ #define npy_isinf(x) (!_finite((x)) && !_isnan((x)))\n+ #else\n+ #define npy_isinf(x) isinf((x))\n+ #endif\n #endif\n #endif\n \n"} {"commit":"d3af0d0aa5aad1b17c57434928d87ae67791bb85","subject":"Need to make sure that the ARP packet has been sent, before returning its w_iov","message":"Need to make sure that the ARP packet has been sent, before returning its w_iov\n","repos":"NTAP\/warpcore,NTAP\/warpcore,NTAP\/warpcore,NTAP\/warpcore","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/arp.c\n+++ lib\/arp.c\n@@ -141,8 +141,16 @@\n memcpy(eth->dst, req->sha, ETH_ADDR_LEN);\n memcpy(eth->src, w->mac, ETH_ADDR_LEN);\n eth->type = ETH_TYPE_ARP;\n+\n+ \/\/ send the Ethernet packet (make sure it went out)\n+ const uint32_t orig_idx = v->idx;\n eth_tx(w, v, sizeof(*reply));\n- w_nic_tx(w);\n+ while (v->idx != orig_idx) {\n+ usleep(100);\n+ w_nic_tx(w);\n+ }\n+\n+ \/\/ make iov available again\n STAILQ_INSERT_HEAD(&w->iov, v, next);\n }\n \n"} {"commit":"7f5e7ee486cc374044cb9064f210d5430a137167","subject":"don't base new_server_identity_check_behavior_needed() on GT version for now; also fix non-C90-compliant C code (mixed declaration and code)","message":"don't base new_server_identity_check_behavior_needed() on GT version for now; also fix non-C90-compliant C code (mixed declaration and code)\n","repos":"ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- myproxy.c\n+++ myproxy.c\n@@ -750,43 +750,9 @@\n static int\n new_server_identity_check_behavior_needed()\n {\n- \/* Based on globus_l_xio_gsi_activate() *\/\n-\n- static gss_OID_desc gss_l_openssl_mech_oid =\n- {9, \"\\x2b\\x06\\x01\\x04\\x01\\x9b\\x50\\x01\\x01\"};\n- static gss_OID_desc * gss_l_openssl_mech = &gss_l_openssl_mech_oid;\n-\n- static gss_OID_desc gss_nt_host_ip_oid =\n- { 10, \"\\x2b\\x06\\x01\\x04\\x01\\x9b\\x50\\x01\\x01\\x02\" };\n- static gss_OID_desc * GLOBUS_GSS_C_NT_HOST_IP = &gss_nt_host_ip_oid;\n-\n- OM_uint32 major_status, minor_status;\n- gss_OID_set name_types;\n- globus_bool_t globus_l_gsi_host_ip_supported = GLOBUS_FALSE;\n-\n- major_status = gss_inquire_names_for_mech(\n- &minor_status,\n- gss_l_openssl_mech ,\n- &name_types);\n-\n- if (major_status == GSS_S_COMPLETE)\n- {\n- int present = 0;\n- major_status = gss_test_oid_set_member(\n- &minor_status,\n- GLOBUS_GSS_C_NT_HOST_IP,\n- name_types,\n- &present);\n-\n- if (major_status == GSS_S_COMPLETE && present)\n- {\n- globus_l_gsi_host_ip_supported = GLOBUS_TRUE;\n- }\n- gss_release_oid_set(&minor_status, &name_types);\n- }\n-\n- char *compat = getenv(\"GLOBUS_GSSAPI_NAME_COMPATIBILITY\");\n-\n+ char *compat = NULL;\n+\n+ compat = getenv(\"GLOBUS_GSSAPI_NAME_COMPATIBILITY\");\n if (compat == NULL || strcmp(compat, \"STRICT_RFC2818\"))\n {\n return 0; \/* Perform old checks *\/\n"} {"commit":"b0ce01ab3618814f60e341da1c9f6ab8b47ba3c7","subject":"\/process_receipt\/: Catch 0.00 net and gross values.","message":"\/process_receipt\/: Catch 0.00 net and gross values.\n\nNet and Gross should never have a 0.00 amount.\n\nThis also catches when nothing has been entered into these fields.\n\nSigned-off-by: Andrew Clayton <02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@opentechlabs.co.uk>\n","repos":"ac000\/receiptomatic","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- www\/receiptomatic-www.c\n+++ www\/receiptomatic-www.c\n@@ -99,6 +99,9 @@\n \tif (round(net * (vr \/ 100 + 1) * 100) \/ 100 < gross - 0.01 ||\n \t\t\t\tround(net * (vr \/ 100 + 1) * 100 \/\n \t\t\t\t100 > gross + 0.01))\n+\t\tret = -1;\n+\n+\tif (net == 0.0 || gross == 0.0)\n \t\tret = -1;\n \n \treturn ret;\n"} {"commit":"585340b813036f36688f2ebc27237e7dcc805b11","subject":" * Added test code of CSS for hr tag.","message":" * Added test code of CSS for hr tag.\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@4189 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n+++ test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n@@ -21508,7 +21508,7 @@\n #define RESULT_STRING \"<?xml version=\\\"1.0\\\" encoding=\\\"Shift_JIS\\\" ?>\" \\\n \"<!DOCTYPE html PUBLIC \\\"-\/\/i-mode group (ja)\/\/DTD XHTML i-XHTML(Locale\/Ver.=ja\/1.0) 1.0\/\/EN\\\" \\\"i-xhtml_4ja_10.dtd\\\">\" \\\n \"<html xmlns=\\\"http:\/\/www.w3.org\/1999\/xhtml\\\">\" \\\n- \"<head><\/head><body><div><hr style=\\\"border-style:solid;\\\" \/>\u3042\u3044\u3046<\/div><\/body><\/html>\"\n+ \"<head><\/head><body><hr style=\\\"border-style:solid;\\\" \/>\u3042\u3044\u3046<\/body><\/html>\"\n char *ret;\n char *tmp;\n device_table spec;\n"} {"commit":"1565a393e46eefcb28417be797a51b617d9dff56","subject":"Fixed a leak of errobj.","message":"Fixed a leak of errobj.\n","repos":"numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor,numpy\/numpy-refactor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -833,6 +833,7 @@\n \n \/* Convert args to arrays in mps. *\/\n if ((i=convert_args(self, args, mps)) < 0) {\n+ Py_XDECREF(errobj);\n return i;\n }\n \n"} {"commit":"c200f5035f43270a2a8b83155ee053080cec8b8e","subject":"fix a format string","message":"fix a format string\n","repos":"rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir,rhansen\/rpstir","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/casn\/asn_gen\/asn_gen.c\n+++ lib\/casn\/asn_gen\/asn_gen.c\n@@ -1529,7 +1529,7 @@\n if (ntbp->generation != gen)\n continue;\n did++;\n- printf(\"#%d %s \", ntbp - (struct name_table *)name_area.area,\n+ printf(\"#%td %s \", ntbp - (struct name_table *)name_area.area,\n ntbp->name);\n printf(\"has:\\n\");\n print_gen(ntbp);\n"} {"commit":"ed554af4b789299e8b30f97947dc921a0ba798bd","subject":"Fix return code for \/dev\/urandom failure","message":"Fix return code for \/dev\/urandom failure\n","repos":"Deewiant\/naclypt,Deewiant\/naclypt","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- naclypt.c\n+++ naclypt.c\n@@ -169,7 +169,7 @@\n != NONCE_RANDOMS))\n {\n fprintf(stderr, \"\/dev\/urandom failed to provide\\n\");\n- return 1;\n+ return 3;\n }\n fill_in_nonce(nonce, total_read);\n }\n"} {"commit":"9b22b19481649515931bd1530a85d4b412fb0570","subject":"Remove wrong fix","message":"Remove wrong fix\n\nThe fix is introduced in 0968491d39d7dcb10b9ef8347c71514de01e775b:\n\n Fix a crash bug that geo_distance() sort by index\n\n If there is any not indexed GeoPoint entry, geo_distance() sort by\n index may cause a crash. Because it touches uninitialized area.\n\n Not initialized GeoPoint value or initialized by 0x0 value are not\n indexed. If they aren't ignored, groonga may be crashed.\n\nThe real fix is done in 989464181a8d4dc9c3148614eb21821bc3ca72e1.\n","repos":"myokoym\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,redfigure\/groonga,kenhys\/groonga,redfigure\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,myokoym\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,naoa\/groonga,kenhys\/groonga,groonga\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,groonga\/groonga,myokoym\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,komainu8\/groonga,naoa\/groonga,cosmo0920\/groonga,myokoym\/groonga,kenhys\/groonga,groonga\/groonga,naoa\/groonga,redfigure\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,kenhys\/groonga,komainu8\/groonga,naoa\/groonga,redfigure\/groonga,komainu8\/groonga,myokoym\/groonga,redfigure\/groonga,myokoym\/groonga,groonga\/groonga,myokoym\/groonga,myokoym\/groonga,komainu8\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,kenhys\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/geo.c\n+++ lib\/geo.c\n@@ -638,8 +638,6 @@\n grn_geo_point *base_point;\n geo_entry *ep;\n \n- memset(entries, 0, sizeof(geo_entry) * (e + 1));\n-\n base_point = (grn_geo_point *)GRN_BULK_HEAD(arg);\n n = grn_geo_table_sort_detect_far_point(ctx, table, index, pat,\n entries, pc, e, accessorp,\n@@ -652,9 +650,6 @@\n base_point, d_far, diff_bit);\n }\n for (i = 0, ep = entries + offset; i < limit && ep < entries + n; i++, ep++) {\n- if (ep->id == GRN_ID_NIL) {\n- break;\n- }\n if (!grn_array_add(ctx, (grn_array *)result, (void **)&v)) { break; }\n *v = ep->id;\n }\n"} {"commit":"93605afea0bb56492ba6e9d6bd0d97e12967fa3e","subject":"ncd: use NCDInterpBlock and NCDInterpProg to speed up looking up templates and variables","message":"ncd: use NCDInterpBlock and NCDInterpProg to speed up looking up templates and variables\n","repos":"DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn,DavidCox1979\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/ncd.c\n+++ ncd\/ncd.c\n@@ -55,6 +55,7 @@\n #include <ncd\/NCDModule.h>\n #include <ncd\/NCDModuleIndex.h>\n #include <ncd\/NCDSugar.h>\n+#include <ncd\/NCDInterpProg.h>\n #include <ncd\/modules\/modules.h>\n \n #include <ncd\/ncd.h>\n@@ -112,6 +113,8 @@\n };\n \n struct process {\n+ NCDProcess *proc_ast;\n+ NCDInterpBlock *iblock;\n NCDModuleProcess *module_process;\n char *name;\n size_t num_statements;\n@@ -170,6 +173,9 @@\n \n \/\/ program AST\n NCDProgram program;\n+\n+\/\/ structure for efficient interpretation\n+NCDInterpProg iprogram;\n \n \/\/ common module parameters\n struct NCDModuleInst_params module_params;\n@@ -197,7 +203,7 @@\n static void names_free (char **names);\n static int statement_init (struct statement *s, NCDStatement *stmt_ast);\n static void statement_free (struct statement *s);\n-static int process_new (NCDProcess *proc_ast, NCDModuleProcess *module_process);\n+static int process_new (NCDProcess *proc_ast, NCDInterpBlock *iblock, NCDModuleProcess *module_process);\n static void process_free (struct process *p);\n static void process_start_terminating (struct process *p);\n static void process_free_statements (struct process *p);\n@@ -354,6 +360,12 @@\n goto fail4;\n }\n \n+ \/\/ init interp program\n+ if (!NCDInterpProg_Init(&iprogram, &program)) {\n+ BLog(BLOG_ERROR, \"NCDInterpProg_Init failed\");\n+ goto fail4;\n+ }\n+ \n \/\/ init module params\n struct NCDModuleInitParams params;\n params.reactor = &ss;\n@@ -390,7 +402,15 @@\n if (NCDProcess_IsTemplate(p)) {\n continue;\n }\n- if (!process_new(p, NULL)) {\n+ \n+ \/\/ find iblock\n+ NCDProcess *f_proc;\n+ NCDInterpBlock *iblock;\n+ int res = NCDInterpProg_FindProcess(&iprogram, NCDProcess_Name(p), &f_proc, &iblock);\n+ ASSERT(res)\n+ ASSERT(f_proc == p)\n+ \n+ if (!process_new(p, iblock, NULL)) {\n BLog(BLOG_ERROR, \"failed to initialize process, exiting\");\n goto fail6;\n }\n@@ -417,6 +437,8 @@\n }\n num_inited_modules--;\n }\n+ \/\/ free interp program\n+ NCDInterpProg_Free(&iprogram);\n fail4:\n \/\/ free program AST\n NCDProgram_Free(&program);\n@@ -949,7 +971,7 @@\n }\n }\n \n-int process_new (NCDProcess *proc_ast, NCDModuleProcess *module_process)\n+static int process_new (NCDProcess *proc_ast, NCDInterpBlock *iblock, NCDModuleProcess *module_process)\n {\n \/\/ allocate strucure\n struct process *p = malloc(sizeof(*p));\n@@ -958,7 +980,9 @@\n goto fail0;\n }\n \n- \/\/ set module process\n+ \/\/ init arguments\n+ p->proc_ast = proc_ast;\n+ p->iblock = iblock;\n p->module_process = module_process;\n \n \/\/ set module process handlers\n@@ -1398,24 +1422,25 @@\n ASSERT(name)\n ASSERT(out_object)\n \n- for (size_t i = pos; i > 0; i--) {\n- struct process_statement *ps = &p->statements[i - 1];\n- if (ps->s.name && !strcmp(ps->s.name, name)) {\n- if (ps->state == SSTATE_FORGOTTEN) {\n- process_log(p, BLOG_ERROR, \"statement (%zu) is uninitialized\", i - 1);\n- goto fail;\n- }\n- \n- *out_object = NCDModuleInst_Object(&ps->inst);\n- return 1;\n- }\n+ int i = NCDInterpBlock_FindStatement(p->iblock, pos, name);\n+ if (i >= 0) {\n+ struct process_statement *ps = &p->statements[i];\n+ ASSERT(i < p->num_statements)\n+ ASSERT(!strcmp(ps->s.name, name))\n+ \n+ if (ps->state == SSTATE_FORGOTTEN) {\n+ process_log(p, BLOG_ERROR, \"statement (%d) is uninitialized\", i);\n+ return 0;\n+ }\n+ \n+ *out_object = NCDModuleInst_Object(&ps->inst);\n+ return 1;\n }\n \n if (p->module_process && NCDModuleProcess_Interp_GetSpecialObj(p->module_process, name, out_object)) {\n return 1;\n }\n \n-fail:\n return 0;\n }\n \n@@ -1665,19 +1690,14 @@\n \n \/\/ find template\n NCDProcess *p_ast;\n- for (p_ast = NCDProgram_FirstProcess(&program); p_ast; p_ast = NCDProgram_NextProcess(&program, p_ast)) {\n- if (NCDProcess_IsTemplate(p_ast) && !strcmp(NCDProcess_Name(p_ast), template_name)) {\n- break;\n- }\n- }\n- \n- if (!p_ast) {\n+ NCDInterpBlock *iblock;\n+ if (!NCDInterpProg_FindProcess(&iprogram, template_name, &p_ast, &iblock) || !NCDProcess_IsTemplate(p_ast)) {\n process_statement_log(ps, BLOG_ERROR, \"no template named %s\", template_name);\n return 0;\n }\n \n \/\/ create process\n- if (!process_new(p_ast, mp)) {\n+ if (!process_new(p_ast, iblock, mp)) {\n process_statement_log(ps, BLOG_ERROR, \"failed to create process from template %s\", template_name);\n return 0;\n }\n"} {"commit":"f79e56d967010bb1a782027b0c645319380f98be","subject":"Check for sucessful call to MapIterBind","message":"Check for sucessful call to MapIterBind\n","repos":"ogrisel\/numpy,skymanaditya1\/numpy,Dapid\/numpy,KaelChen\/numpy,leifdenby\/numpy,madphysicist\/numpy,MSeifert04\/numpy,KaelChen\/numpy,Anwesh43\/numpy,CMartelLML\/numpy,ssanderson\/numpy,jorisvandenbossche\/numpy,pdebuyl\/numpy,jakirkham\/numpy,ogrisel\/numpy,naritta\/numpy,rgommers\/numpy,utke1\/numpy,Linkid\/numpy,kiwifb\/numpy,groutr\/numpy,argriffing\/numpy,rudimeier\/numpy,dch312\/numpy,madphysicist\/numpy,BabeNovelty\/numpy,stuarteberg\/numpy,ogrisel\/numpy,cjermain\/numpy,GaZ3ll3\/numpy,pizzathief\/numpy,rgommers\/numpy,joferkington\/numpy,Anwesh43\/numpy,maniteja123\/numpy,musically-ut\/numpy,bringingheavendown\/numpy,dato-code\/numpy,sonnyhu\/numpy,GrimDerp\/numpy,endolith\/numpy,WarrenWeckesser\/numpy,BabeNovelty\/numpy,jakirkham\/numpy,githubmlai\/numpy,hainm\/numpy,anntzer\/numpy,mingwpy\/numpy,ajdawson\/numpy,solarjoe\/numpy,nguyentu1602\/numpy,Anwesh43\/numpy,tdsmith\/numpy,ekalosak\/numpy,sigma-random\/numpy,charris\/numpy,skymanaditya1\/numpy,stuarteberg\/numpy,GrimDerp\/numpy,gfyoung\/numpy,sinhrks\/numpy,Srisai85\/numpy,tacaswell\/numpy,GrimDerp\/numpy,dato-code\/numpy,njase\/numpy,rherault-insa\/numpy,cjermain\/numpy,simongibbons\/numpy,seberg\/numpy,ESSS\/numpy,pbrod\/numpy,joferkington\/numpy,simongibbons\/numpy,ESSS\/numpy,behzadnouri\/numpy,chatcannon\/numpy,chiffa\/numpy,ekalosak\/numpy,mingwpy\/numpy,hainm\/numpy,Srisai85\/numpy,BMJHayward\/numpy,githubmlai\/numpy,kiwifb\/numpy,MSeifert04\/numpy,yiakwy\/numpy,rgommers\/numpy,madphysicist\/numpy,chatcannon\/numpy,Eric89GXL\/numpy,seberg\/numpy,musically-ut\/numpy,skwbc\/numpy,tdsmith\/numpy,CMartelLML\/numpy,dwillmer\/numpy,Srisai85\/numpy,ahaldane\/numpy,AustereCuriosity\/numpy,mhvk\/numpy,ddasilva\/numpy,MichaelAquilina\/numpy,solarjoe\/numpy,b-carter\/numpy,KaelChen\/numpy,AustereCuriosity\/numpy,ViralLeadership\/numpy,charris\/numpy,ContinuumIO\/numpy,jonathanunderwood\/numpy,jorisvandenbossche\/numpy,sonnyhu\/numpy,ContinuumIO\/numpy,abalkin\/numpy,nguyentu1602\/numpy,grlee77\/numpy,jonathanunderwood\/numpy,mortada\/numpy,bertrand-l\/numpy,ahaldane\/numpy,pbrod\/numpy,felipebetancur\/numpy,mindw\/numpy,tynn\/numpy,mhvk\/numpy,immerrr\/numpy,mortada\/numpy,mingwpy\/numpy,rmcgibbo\/numpy,SunghanKim\/numpy,pizzathief\/numpy,dimasad\/numpy,BabeNovelty\/numpy,tynn\/numpy,AustereCuriosity\/numpy,jschueller\/numpy,MSeifert04\/numpy,yiakwy\/numpy,utke1\/numpy,dch312\/numpy,ajdawson\/numpy,mwiebe\/numpy,MSeifert04\/numpy,rhythmsosad\/numpy,jorisvandenbossche\/numpy,jankoslavic\/numpy,CMartelLML\/numpy,ChanderG\/numpy,stuarteberg\/numpy,dato-code\/numpy,naritta\/numpy,endolith\/numpy,MaPePeR\/numpy,ajdawson\/numpy,dch312\/numpy,dimasad\/numpy,abalkin\/numpy,trankmichael\/numpy,Eric89GXL\/numpy,Yusa95\/numpy,rherault-insa\/numpy,dimasad\/numpy,cjermain\/numpy,MaPePeR\/numpy,nbeaver\/numpy,MaPePeR\/numpy,dwillmer\/numpy,cowlicks\/numpy,rudimeier\/numpy,tacaswell\/numpy,jschueller\/numpy,ChristopherHogan\/numpy,rudimeier\/numpy,empeeu\/numpy,ahaldane\/numpy,rmcgibbo\/numpy,WillieMaddox\/numpy,mindw\/numpy,sinhrks\/numpy,musically-ut\/numpy,tdsmith\/numpy,NextThought\/pypy-numpy,SiccarPoint\/numpy,gfyoung\/numpy,mortada\/numpy,naritta\/numpy,dwillmer\/numpy,MichaelAquilina\/numpy,SiccarPoint\/numpy,njase\/numpy,jorisvandenbossche\/numpy,sonnyhu\/numpy,GaZ3ll3\/numpy,ViralLeadership\/numpy,cowlicks\/numpy,githubmlai\/numpy,chiffa\/numpy,stuarteberg\/numpy,groutr\/numpy,NextThought\/pypy-numpy,brandon-rhodes\/numpy,SunghanKim\/numpy,grlee77\/numpy,ssanderson\/numpy,pizzathief\/numpy,grlee77\/numpy,trankmichael\/numpy,Linkid\/numpy,charris\/numpy,b-carter\/numpy,mindw\/numpy,Yusa95\/numpy,immerrr\/numpy,jakirkham\/numpy,anntzer\/numpy,anntzer\/numpy,larsmans\/numpy,yiakwy\/numpy,pyparallel\/numpy,mattip\/numpy,jakirkham\/numpy,sinhrks\/numpy,GaZ3ll3\/numpy,jankoslavic\/numpy,mhvk\/numpy,maniteja123\/numpy,Dapid\/numpy,mattip\/numpy,immerrr\/numpy,sigma-random\/numpy,ahaldane\/numpy,behzadnouri\/numpy,madphysicist\/numpy,kirillzhuravlev\/numpy,ekalosak\/numpy,mathdd\/numpy,mathdd\/numpy,larsmans\/numpy,simongibbons\/numpy,kirillzhuravlev\/numpy,jonathanunderwood\/numpy,bmorris3\/numpy,CMartelLML\/numpy,pbrod\/numpy,ChanderG\/numpy,sigma-random\/numpy,Dapid\/numpy,mattip\/numpy,pbrod\/numpy,embray\/numpy,felipebetancur\/numpy,ChristopherHogan\/numpy,trankmichael\/numpy,MichaelAquilina\/numpy,moreati\/numpy,joferkington\/numpy,andsor\/numpy,SiccarPoint\/numpy,embray\/numpy,bringingheavendown\/numpy,GaZ3ll3\/numpy,pyparallel\/numpy,embray\/numpy,WarrenWeckesser\/numpy,dato-code\/numpy,skymanaditya1\/numpy,nguyentu1602\/numpy,musically-ut\/numpy,dch312\/numpy,WarrenWeckesser\/numpy,leifdenby\/numpy,ChanderG\/numpy,numpy\/numpy,andsor\/numpy,larsmans\/numpy,ahaldane\/numpy,shoyer\/numpy,Anwesh43\/numpy,bmorris3\/numpy,ChanderG\/numpy,simongibbons\/numpy,andsor\/numpy,moreati\/numpy,has2k1\/numpy,jankoslavic\/numpy,tacaswell\/numpy,NextThought\/pypy-numpy,empeeu\/numpy,tdsmith\/numpy,mathdd\/numpy,rherault-insa\/numpy,shoyer\/numpy,argriffing\/numpy,dwillmer\/numpy,has2k1\/numpy,ChristopherHogan\/numpy,Srisai85\/numpy,Eric89GXL\/numpy,kiwifb\/numpy,pyparallel\/numpy,abalkin\/numpy,skwbc\/numpy,madphysicist\/numpy,SunghanKim\/numpy,joferkington\/numpy,SunghanKim\/numpy,moreati\/numpy,Linkid\/numpy,nguyentu1602\/numpy,BMJHayward\/numpy,shoyer\/numpy,bertrand-l\/numpy,ddasilva\/numpy,rhythmsosad\/numpy,trankmichael\/numpy,brandon-rhodes\/numpy,drasmuss\/numpy,drasmuss\/numpy,pdebuyl\/numpy,pbrod\/numpy,cowlicks\/numpy,endolith\/numpy,ddasilva\/numpy,jorisvandenbossche\/numpy,Yusa95\/numpy,BabeNovelty\/numpy,mindw\/numpy,bmorris3\/numpy,rgommers\/numpy,BMJHayward\/numpy,kirillzhuravlev\/numpy,empeeu\/numpy,chiffa\/numpy,bertrand-l\/numpy,chatcannon\/numpy,ESSS\/numpy,NextThought\/pypy-numpy,shoyer\/numpy,maniteja123\/numpy,MichaelAquilina\/numpy,ssanderson\/numpy,grlee77\/numpy,charris\/numpy,rajathkumarmp\/numpy,seberg\/numpy,nbeaver\/numpy,hainm\/numpy,sigma-random\/numpy,felipebetancur\/numpy,hainm\/numpy,cowlicks\/numpy,gmcastil\/numpy,behzadnouri\/numpy,SiccarPoint\/numpy,drasmuss\/numpy,Linkid\/numpy,rmcgibbo\/numpy,utke1\/numpy,gmcastil\/numpy,has2k1\/numpy,githubmlai\/numpy,gfyoung\/numpy,mathdd\/numpy,groutr\/numpy,simongibbons\/numpy,nbeaver\/numpy,ogrisel\/numpy,pdebuyl\/numpy,leifdenby\/numpy,numpy\/numpy,ViralLeadership\/numpy,andsor\/numpy,Eric89GXL\/numpy,ogrisel\/numpy,ChristopherHogan\/numpy,kirillzhuravlev\/numpy,sonnyhu\/numpy,bmorris3\/numpy,immerrr\/numpy,njase\/numpy,ekalosak\/numpy,sinhrks\/numpy,pdebuyl\/numpy,mhvk\/numpy,larsmans\/numpy,GrimDerp\/numpy,WillieMaddox\/numpy,tynn\/numpy,rajathkumarmp\/numpy,MaPePeR\/numpy,jankoslavic\/numpy,jschueller\/numpy,rudimeier\/numpy,WarrenWeckesser\/numpy,ContinuumIO\/numpy,endolith\/numpy,empeeu\/numpy,rajathkumarmp\/numpy,mortada\/numpy,grlee77\/numpy,skwbc\/numpy,seberg\/numpy,mwiebe\/numpy,naritta\/numpy,dimasad\/numpy,argriffing\/numpy,numpy\/numpy,ajdawson\/numpy,mwiebe\/numpy,brandon-rhodes\/numpy,rmcgibbo\/numpy,jakirkham\/numpy,BMJHayward\/numpy,mhvk\/numpy,shoyer\/numpy,embray\/numpy,anntzer\/numpy,WarrenWeckesser\/numpy,rhythmsosad\/numpy,jschueller\/numpy,Yusa95\/numpy,gmcastil\/numpy,felipebetancur\/numpy,yiakwy\/numpy,bringingheavendown\/numpy,mattip\/numpy,rajathkumarmp\/numpy,numpy\/numpy,KaelChen\/numpy,mingwpy\/numpy,has2k1\/numpy,rhythmsosad\/numpy,solarjoe\/numpy,pizzathief\/numpy,pizzathief\/numpy,WillieMaddox\/numpy,cjermain\/numpy,skymanaditya1\/numpy,b-carter\/numpy,brandon-rhodes\/numpy,MSeifert04\/numpy,embray\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -4896,6 +4896,9 @@\n }\n \n PyArray_MapIterBind(iter, op1_array);\n+ if (iter->ait == NULL) {\n+ return NULL;\n+ }\n PyArray_MapIterReset(iter);\n \n \/* If second operand is an array, create MapIter object for it *\/\n@@ -4911,12 +4914,17 @@\n }\n \n PyArray_MapIterBind(iter2, op2_array);\n+ if (iter->ait == NULL) {\n+ return NULL;\n+ }\n PyArray_MapIterReset(iter2);\n }\n \/* If second operand is a scalar, create 0 dim array from it *\/\n else if (op2 != NULL && PyArray_IsAnyScalar(op2)) {\n op2_array = (PyArrayObject *)PyArray_FromAny(op2, NULL, 0, 0, 0, NULL);\n if (op2_array == NULL) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"could not convert scalar to array\");\n return NULL;\n }\n \n"} {"commit":"09b72a771e7258a44beca32d550478c078bf6403","subject":" * Added test code of CSS for div tag.","message":" * Added test code of CSS for div tag.\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@4365 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n+++ test\/chxj_ixhtml10\/test_chxj_ixhtml10.c\n@@ -23116,7 +23116,7 @@\n #define RESULT_STRING \"<?xml version=\\\"1.0\\\" encoding=\\\"Shift_JIS\\\" ?>\" \\\n \"<!DOCTYPE html PUBLIC \\\"-\/\/i-mode group (ja)\/\/DTD XHTML i-XHTML(Locale\/Ver.=ja\/1.0) 1.0\/\/EN\\\" \\\"i-xhtml_4ja_10.dtd\\\">\" \\\n \"<html xmlns=\\\"http:\/\/www.w3.org\/1999\/xhtml\\\">\" \\\n- \"<html><head><\/head><body><div><div style=\\\"display:-wap-marquee;-wap-marquee-style:alternate;-wap-marquee-dir:ltr;\\\">\u3042\u3044\u3046<\/div><\/div><\/body><\/html>\"\n+ \"<head><\/head><body><div><div style=\\\"display:-wap-marquee;-wap-marquee-style:alternate;-wap-marquee-dir:ltr;\\\">\u3042\u3044\u3046<\/div><\/div><\/body><\/html>\"\n char *ret;\n char *tmp;\n device_table spec;\n"} {"commit":"63a910129c59b831a4a20508078c3519dfdd8561","subject":"","message":"\n\nMy lpc filter stability fix introduced a new, stupid uninitialized data bug.\nFix that.\n\nMonty\n\n\ngit-svn-id: 03f0f1727258f1959b7b485b30a676bafdb78148@4448 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"jdm\/vorbis,wighawag\/vorbis,Distrotech\/libvorbis,ShiftMediaProject\/vorbis,OffByOneStudios\/vorbis,KTXSoftware\/vorbis,Distrotech\/libvorbis,Distrotech\/libvorbis,KTXSoftware\/vorbis,jdm\/vorbis,wighawag\/vorbis,ShiftMediaProject\/vorbis,libninjam\/libvorbis,Rillke\/vorbis,libninjam\/libvorbis,libninjam\/libvorbis,ShiftMediaProject\/vorbis,pcwalton\/vorbis,brion\/vorbis,pcwalton\/vorbis,OffByOneStudios\/vorbis,ShiftMediaProject\/vorbis,pcwalton\/vorbis,brion\/vorbis,jdm\/vorbis,ShiftMediaProject\/vorbis,OffByOneStudios\/vorbis,brion\/vorbis,TitaniumEagle\/libvorbis,TitaniumEagle\/libvorbis,Rillke\/vorbis,pcwalton\/vorbis,ShiftMediaProject\/vorbis,KTXSoftware\/vorbis,jdm\/vorbis,brion\/vorbis,TitaniumEagle\/libvorbis,wighawag\/vorbis,libninjam\/libvorbis,pcwalton\/vorbis,TitaniumEagle\/libvorbis,jdm\/vorbis,Distrotech\/libvorbis,KTXSoftware\/vorbis,OffByOneStudios\/vorbis,wighawag\/vorbis,Rillke\/vorbis,Rillke\/vorbis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/lpc.c\n+++ lib\/lpc.c\n@@ -11,7 +11,7 @@\n ********************************************************************\n \n function: LPC low level routines\n- last mod: $Id: lpc.c,v 1.36 2003\/03\/07 09:13:30 xiphmont Exp $\n+ last mod: $Id: lpc.c,v 1.37 2003\/03\/08 07:15:32 xiphmont Exp $\n \n ********************************************************************\/\n \n@@ -80,7 +80,7 @@\n double r= -aut[i+1];\n \n if(error==0){\n- memset(lpc,0,m*sizeof(*lpc));\n+ memset(lpci,0,m*sizeof(*lpci));\n return 0;\n }\n \n"} {"commit":"cae2d50da070db132db37188517df9ea0cceb0a3","subject":"net: fix misplaced definition.","message":"net: fix misplaced definition.\n","repos":"dlbeer\/libdlb,dlbeer\/libdlb","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net\/net.h\n+++ net\/net.h\n@@ -16,6 +16,8 @@\n \n #ifndef NET_NET_H_\n #define NET_NET_H_\n+\n+#define NETERR_NONE ((neterr_t)0)\n \n \/* Start up\/shut down the network stack. This pair of functions must be\n * called at startup before any network functions are used, and at exit\n@@ -116,6 +118,4 @@\n static inline void net_stop(void) { }\n #endif\n \n-#define NETERR_NONE ((neterr_t)0)\n-\n #endif\n"} {"commit":"ed8c90653e434695ff4cf90b2ab1b4c736506d50","subject":"WHT: Remove trailing whitespace.","message":"WHT: Remove trailing whitespace.\n","repos":"solarjoe\/numpy,embray\/numpy,moreati\/numpy,dimasad\/numpy,bmorris3\/numpy,KaelChen\/numpy,mindw\/numpy,pdebuyl\/numpy,musically-ut\/numpy,Srisai85\/numpy,argriffing\/numpy,gfyoung\/numpy,bringingheavendown\/numpy,trankmichael\/numpy,ssanderson\/numpy,ddasilva\/numpy,pelson\/numpy,pizzathief\/numpy,ajdawson\/numpy,NextThought\/pypy-numpy,Srisai85\/numpy,njase\/numpy,astrofrog\/numpy,sinhrks\/numpy,grlee77\/numpy,simongibbons\/numpy,dwillmer\/numpy,MaPePeR\/numpy,naritta\/numpy,nbeaver\/numpy,MaPePeR\/numpy,jakirkham\/numpy,shoyer\/numpy,BMJHayward\/numpy,mortada\/numpy,ogrisel\/numpy,BMJHayward\/numpy,mortada\/numpy,rherault-insa\/numpy,matthew-brett\/numpy,empeeu\/numpy,mingwpy\/numpy,sonnyhu\/numpy,sinhrks\/numpy,jorisvandenbossche\/numpy,bringingheavendown\/numpy,has2k1\/numpy,Eric89GXL\/numpy,nguyentu1602\/numpy,stefanv\/numpy,jschueller\/numpy,andsor\/numpy,ahaldane\/numpy,numpy\/numpy-refactor,cowlicks\/numpy,abalkin\/numpy,rgommers\/numpy,dato-code\/numpy,astrofrog\/numpy,hainm\/numpy,grlee77\/numpy,shoyer\/numpy,Srisai85\/numpy,pbrod\/numpy,nguyentu1602\/numpy,sigma-random\/numpy,skwbc\/numpy,mattip\/numpy,matthew-brett\/numpy,ddasilva\/numpy,groutr\/numpy,jankoslavic\/numpy,chatcannon\/numpy,pizzathief\/numpy,jorisvandenbossche\/numpy,tynn\/numpy,nbeaver\/numpy,skwbc\/numpy,ViralLeadership\/numpy,WarrenWeckesser\/numpy,jankoslavic\/numpy,CMartelLML\/numpy,tynn\/numpy,dwf\/numpy,ekalosak\/numpy,Dapid\/numpy,ahaldane\/numpy,larsmans\/numpy,b-carter\/numpy,kirillzhuravlev\/numpy,Anwesh43\/numpy,dato-code\/numpy,stefanv\/numpy,jorisvandenbossche\/numpy,GaZ3ll3\/numpy,githubmlai\/numpy,yiakwy\/numpy,rudimeier\/numpy,jakirkham\/numpy,utke1\/numpy,immerrr\/numpy,b-carter\/numpy,numpy\/numpy-refactor,pdebuyl\/numpy,tdsmith\/numpy,abalkin\/numpy,Anwesh43\/numpy,CMartelLML\/numpy,cowlicks\/numpy,jankoslavic\/numpy,nbeaver\/numpy,WillieMaddox\/numpy,behzadnouri\/numpy,ssanderson\/numpy,astrofrog\/numpy,chatcannon\/numpy,pyparallel\/numpy,simongibbons\/numpy,WillieMaddox\/numpy,githubmlai\/numpy,numpy\/numpy,has2k1\/numpy,jschueller\/numpy,mingwpy\/numpy,Linkid\/numpy,MichaelAquilina\/numpy,cjermain\/numpy,MichaelAquilina\/numpy,skymanaditya1\/numpy,GrimDerp\/numpy,numpy\/numpy-refactor,skymanaditya1\/numpy,ChristopherHogan\/numpy,CMartelLML\/numpy,jankoslavic\/numpy,mathdd\/numpy,empeeu\/numpy,stuarteberg\/numpy,drasmuss\/numpy,skymanaditya1\/numpy,rudimeier\/numpy,drasmuss\/numpy,trankmichael\/numpy,rhythmsosad\/numpy,shoyer\/numpy,SiccarPoint\/numpy,maniteja123\/numpy,seberg\/numpy,ChanderG\/numpy,ogrisel\/numpy,rmcgibbo\/numpy,pizzathief\/numpy,ahaldane\/numpy,nguyentu1602\/numpy,joferkington\/numpy,kiwifb\/numpy,dimasad\/numpy,pbrod\/numpy,immerrr\/numpy,felipebetancur\/numpy,nguyentu1602\/numpy,rherault-insa\/numpy,sonnyhu\/numpy,mingwpy\/numpy,WillieMaddox\/numpy,Yusa95\/numpy,jonathanunderwood\/numpy,AustereCuriosity\/numpy,madphysicist\/numpy,Srisai85\/numpy,drasmuss\/numpy,ogrisel\/numpy,jonathanunderwood\/numpy,astrofrog\/numpy,MaPePeR\/numpy,mhvk\/numpy,mhvk\/numpy,hainm\/numpy,ContinuumIO\/numpy,pyparallel\/numpy,ogrisel\/numpy,rgommers\/numpy,madphysicist\/numpy,leifdenby\/numpy,Dapid\/numpy,mwiebe\/numpy,kiwifb\/numpy,cjermain\/numpy,dch312\/numpy,mattip\/numpy,Yusa95\/numpy,dch312\/numpy,charris\/numpy,endolith\/numpy,embray\/numpy,sigma-random\/numpy,larsmans\/numpy,moreati\/numpy,joferkington\/numpy,BabeNovelty\/numpy,rhythmsosad\/numpy,anntzer\/numpy,GaZ3ll3\/numpy,Eric89GXL\/numpy,CMartelLML\/numpy,ContinuumIO\/numpy,MSeifert04\/numpy,kirillzhuravlev\/numpy,brandon-rhodes\/numpy,naritta\/numpy,ChristopherHogan\/numpy,chiffa\/numpy,naritta\/numpy,brandon-rhodes\/numpy,AustereCuriosity\/numpy,gfyoung\/numpy,pbrod\/numpy,ChanderG\/numpy,trankmichael\/numpy,jorisvandenbossche\/numpy,tacaswell\/numpy,mattip\/numpy,anntzer\/numpy,naritta\/numpy,solarjoe\/numpy,pelson\/numpy,mingwpy\/numpy,Eric89GXL\/numpy,ogrisel\/numpy,simongibbons\/numpy,endolith\/numpy,trankmichael\/numpy,empeeu\/numpy,numpy\/numpy,bertrand-l\/numpy,njase\/numpy,rmcgibbo\/numpy,BabeNovelty\/numpy,yiakwy\/numpy,dch312\/numpy,KaelChen\/numpy,SiccarPoint\/numpy,felipebetancur\/numpy,Anwesh43\/numpy,ContinuumIO\/numpy,rajathkumarmp\/numpy,argriffing\/numpy,solarjoe\/numpy,dato-code\/numpy,ViralLeadership\/numpy,brandon-rhodes\/numpy,tdsmith\/numpy,maniteja123\/numpy,ESSS\/numpy,matthew-brett\/numpy,musically-ut\/numpy,has2k1\/numpy,kirillzhuravlev\/numpy,andsor\/numpy,moreati\/numpy,WarrenWeckesser\/numpy,ChristopherHogan\/numpy,astrofrog\/numpy,BMJHayward\/numpy,Linkid\/numpy,sigma-random\/numpy,MichaelAquilina\/numpy,stuarteberg\/numpy,ekalosak\/numpy,tdsmith\/numpy,SiccarPoint\/numpy,jonathanunderwood\/numpy,madphysicist\/numpy,tacaswell\/numpy,hainm\/numpy,endolith\/numpy,Anwesh43\/numpy,behzadnouri\/numpy,pelson\/numpy,cjermain\/numpy,pbrod\/numpy,jschueller\/numpy,rudimeier\/numpy,mindw\/numpy,BabeNovelty\/numpy,ewmoore\/numpy,numpy\/numpy,ESSS\/numpy,ESSS\/numpy,pdebuyl\/numpy,maniteja123\/numpy,Yusa95\/numpy,mwiebe\/numpy,mhvk\/numpy,WarrenWeckesser\/numpy,immerrr\/numpy,gmcastil\/numpy,rmcgibbo\/numpy,cowlicks\/numpy,grlee77\/numpy,ewmoore\/numpy,mathdd\/numpy,andsor\/numpy,behzadnouri\/numpy,pelson\/numpy,KaelChen\/numpy,dwillmer\/numpy,sigma-random\/numpy,rhythmsosad\/numpy,ajdawson\/numpy,numpy\/numpy-refactor,ekalosak\/numpy,simongibbons\/numpy,Linkid\/numpy,pizzathief\/numpy,felipebetancur\/numpy,rajathkumarmp\/numpy,shoyer\/numpy,dwf\/numpy,Yusa95\/numpy,stuarteberg\/numpy,SunghanKim\/numpy,anntzer\/numpy,SunghanKim\/numpy,gmcastil\/numpy,Linkid\/numpy,ddasilva\/numpy,brandon-rhodes\/numpy,mhvk\/numpy,chiffa\/numpy,rgommers\/numpy,rmcgibbo\/numpy,rajathkumarmp\/numpy,groutr\/numpy,ajdawson\/numpy,pdebuyl\/numpy,skwbc\/numpy,matthew-brett\/numpy,tdsmith\/numpy,empeeu\/numpy,mortada\/numpy,charris\/numpy,yiakwy\/numpy,bringingheavendown\/numpy,dwillmer\/numpy,SunghanKim\/numpy,mindw\/numpy,njase\/numpy,ewmoore\/numpy,seberg\/numpy,mortada\/numpy,madphysicist\/numpy,AustereCuriosity\/numpy,rajathkumarmp\/numpy,immerrr\/numpy,tynn\/numpy,jorisvandenbossche\/numpy,ahaldane\/numpy,MSeifert04\/numpy,dwf\/numpy,seberg\/numpy,WarrenWeckesser\/numpy,dwf\/numpy,GrimDerp\/numpy,mindw\/numpy,abalkin\/numpy,embray\/numpy,ajdawson\/numpy,ekalosak\/numpy,groutr\/numpy,numpy\/numpy,MaPePeR\/numpy,shoyer\/numpy,endolith\/numpy,leifdenby\/numpy,NextThought\/pypy-numpy,chiffa\/numpy,anntzer\/numpy,ssanderson\/numpy,hainm\/numpy,tacaswell\/numpy,MichaelAquilina\/numpy,yiakwy\/numpy,KaelChen\/numpy,charris\/numpy,embray\/numpy,Dapid\/numpy,mwiebe\/numpy,has2k1\/numpy,skymanaditya1\/numpy,joferkington\/numpy,joferkington\/numpy,MSeifert04\/numpy,ChanderG\/numpy,utke1\/numpy,ewmoore\/numpy,sonnyhu\/numpy,sonnyhu\/numpy,felipebetancur\/numpy,pyparallel\/numpy,madphysicist\/numpy,mattip\/numpy,ewmoore\/numpy,grlee77\/numpy,musically-ut\/numpy,ahaldane\/numpy,ChanderG\/numpy,SunghanKim\/numpy,stefanv\/numpy,NextThought\/pypy-numpy,utke1\/numpy,cjermain\/numpy,dimasad\/numpy,b-carter\/numpy,embray\/numpy,pelson\/numpy,chatcannon\/numpy,githubmlai\/numpy,kiwifb\/numpy,pizzathief\/numpy,grlee77\/numpy,GrimDerp\/numpy,gfyoung\/numpy,MSeifert04\/numpy,leifdenby\/numpy,rgommers\/numpy,Eric89GXL\/numpy,kirillzhuravlev\/numpy,numpy\/numpy-refactor,cowlicks\/numpy,jakirkham\/numpy,BMJHayward\/numpy,gmcastil\/numpy,GrimDerp\/numpy,mhvk\/numpy,stefanv\/numpy,musically-ut\/numpy,mathdd\/numpy,ChristopherHogan\/numpy,argriffing\/numpy,rherault-insa\/numpy,sinhrks\/numpy,bmorris3\/numpy,seberg\/numpy,bmorris3\/numpy,stuarteberg\/numpy,jakirkham\/numpy,bmorris3\/numpy,andsor\/numpy,ViralLeadership\/numpy,dimasad\/numpy,SiccarPoint\/numpy,charris\/numpy,NextThought\/pypy-numpy,matthew-brett\/numpy,bertrand-l\/numpy,dch312\/numpy,GaZ3ll3\/numpy,jakirkham\/numpy,dwf\/numpy,GaZ3ll3\/numpy,stefanv\/numpy,githubmlai\/numpy,larsmans\/numpy,pbrod\/numpy,rhythmsosad\/numpy,WarrenWeckesser\/numpy,dato-code\/numpy,bertrand-l\/numpy,dwillmer\/numpy,mathdd\/numpy,BabeNovelty\/numpy,larsmans\/numpy,sinhrks\/numpy,rudimeier\/numpy,MSeifert04\/numpy,simongibbons\/numpy,jschueller\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -2512,7 +2512,7 @@\n else {\n loop->obj = 0;\n }\n- if ((loop->meth == ZERO_EL_REDUCELOOP) || \n+ if ((loop->meth == ZERO_EL_REDUCELOOP) ||\n \t((operation == UFUNC_REDUCEAT) && (loop->meth == BUFFER_UFUNCLOOP))) {\n idarr = _getidentity(self, otype, str);\n if (idarr == NULL) {\n@@ -2817,17 +2817,17 @@\n loop->index++;\n }\n \n- \/* \n- * DECREF left-over objects if buffering was used. \n+ \/*\n+ * DECREF left-over objects if buffering was used.\n * It is needed when casting created new objects in\n * castbuf. Intermediate copying into castbuf (via\n * loop->function) decref'd what was already there.\n- \n+\n * It's the final copy into the castbuf that needs a DECREF.\n *\/\n \n \/* Only when casting needed and it is from a non-object array *\/\n- if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast && \n+ if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast &&\n (!PyArray_ISOBJECT(arr))) {\n for (i=0; i<loop->bufsize; i++) {\n Py_CLEAR(((PyObject **)loop->castbuf)[i]);\n@@ -2983,17 +2983,17 @@\n loop->index++;\n }\n \n- \/* \n- * DECREF left-over objects if buffering was used. \n+ \/*\n+ * DECREF left-over objects if buffering was used.\n * It is needed when casting created new objects in\n * castbuf. Intermediate copying into castbuf (via\n * loop->function) decref'd what was already there.\n- \n+\n * It's the final copy into the castbuf that needs a DECREF.\n *\/\n \n \/* Only when casting needed and it is from a non-object array *\/\n- if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast && \n+ if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast &&\n (!PyArray_ISOBJECT(arr))) {\n for (i=0; i<loop->bufsize; i++) {\n Py_CLEAR(((PyObject **)loop->castbuf)[i]);\n@@ -3158,17 +3158,17 @@\n loop->index++;\n }\n \n- \/* \n- * DECREF left-over objects if buffering was used. \n+ \/*\n+ * DECREF left-over objects if buffering was used.\n * It is needed when casting created new objects in\n * castbuf. Intermediate copying into castbuf (via\n * loop->function) decref'd what was already there.\n- \n+\n * It's the final copy into the castbuf that needs a DECREF.\n *\/\n- \n+\n \/* Only when casting needed and it is from a non-object array *\/\n- if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast && \n+ if ((loop->obj & UFUNC_OBJ_ISOBJECT) && loop->cast &&\n (!PyArray_ISOBJECT(arr))) {\n for (i=0; i<loop->bufsize; i++) {\n Py_CLEAR(((PyObject **)loop->castbuf)[i]);\n"} {"commit":"0fe8d15febf9a5e42b92920be9e6b49e628b9948","subject":"crypto: nettle: take into account interface differences","message":"crypto: nettle: take into account interface differences\n\nSigned-off-by: Dmitry Eremin-Solenikov <b6edad08270b2e4ffbcb0879e25a0e29a48c5275@gmail.com>\n","repos":"lumag\/emv-tools","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/crypto\/crypto_nettle.c\n+++ lib\/crypto\/crypto_nettle.c\n@@ -286,7 +286,13 @@\n \n }\n \n-static void rnd_func(void *_ctx, size_t length, uint8_t *data)\n+#if NETTLE_VERSION_MAJOR > 2\n+typedef size_t rnd_size_t;\n+#else\n+typedef unsigned int rnd_size_t;\n+#endif\n+\n+static void rnd_func(void *_ctx, rnd_size_t length, uint8_t *data)\n {\n \tyarrow256_random(&rndctx.yactx, length, data);\n }\n"} {"commit":"2b88eaa8016ec877d8de071c90161e02625c3678","subject":"Fix a test that doesn't work on architectures where long double is no wider than double. Thanks to Ian Lepore for catching the bug.","message":"Fix a test that doesn't work on architectures where long double is no\nwider than double. Thanks to Ian Lepore for catching the bug.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tools\/regression\/lib\/msun\/test-next.c\n+++ tools\/regression\/lib\/msun\/test-next.c\n@@ -211,7 +211,9 @@\n \ttest(idd(nextafter(DBL_MAX, INFINITY)), INFINITY, ex_over);\n \ttest(idd(nextafter(INFINITY, 0.0)), DBL_MAX, 0);\n \ttest(idd(nexttoward(DBL_MAX, DBL_MAX * 2.0L)), INFINITY, ex_over);\n+#if LDBL_MANT_DIG > 53\n \ttest(idd(nexttoward(INFINITY, DBL_MAX * 2.0L)), DBL_MAX, 0);\n+#endif\n \n \ttestf(idf(nextafterf(FLT_MAX, INFINITY)), INFINITY, ex_over);\n \ttestf(idf(nextafterf(INFINITY, 0.0)), FLT_MAX, 0);\n"} {"commit":"fe349e42baa47dd7c010707bddbd114946f4d95b","subject":"stripe: allow lookup on an entry if other than first subvolume is down","message":"stripe: allow lookup on an entry if other than first subvolume is down\n\nSigned-off-by: Amar Tumballi <amar@gluster.com>\nSigned-off-by: Anand V. Avati <avati@dev.gluster.com>\n\nBUG: 2099 ()\nURL: http:\/\/bugs.gluster.com\/cgi-bin\/bugzilla3\/show_bug.cgi?id=2099\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- xlators\/cluster\/stripe\/src\/stripe.c\n+++ xlators\/cluster\/stripe\/src\/stripe.c\n@@ -243,7 +243,7 @@\n strerror (op_errno));\n if (local->op_errno != ESTALE)\n local->op_errno = op_errno;\n- if ((op_errno != ENOENT) ||\n+ if (((op_errno != ENOENT) && (op_errno != ENOTCONN)) ||\n (prev->this == FIRST_CHILD (this)))\n local->failed = 1;\n if (op_errno == ENOENT)\n"} {"commit":"ec9da81d266fdaf5dd2f4c0d2efaf949ebb83978","subject":"bugfix to close dialog correctly","message":"bugfix to close dialog correctly\n","repos":"MKelm\/dtdw","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tae\/dialog.c\n+++ tae\/dialog.c\n@@ -38,6 +38,9 @@\n \n if (has_next_ids == 1) {\n dialog_get_next_element_output(output);\n+ } else if (is_multiple_choice == 0) {\n+ strcat(output, \"\\n\");\n+ dialog_close();\n }\n }\n return output;\n"} {"commit":"488a9e644edd01b847f4c0c0f7ee944b9a10fe13","subject":"msvc fix for missing zext: replace with cast","message":"msvc fix for missing zext: replace with cast\n\nPiperOrigin-RevId: 381438226\n","repos":"google\/highway,google\/highway,google\/highway","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hwy\/ops\/x86_256-inl.h\n+++ hwy\/ops\/x86_256-inl.h\n@@ -1360,10 +1360,12 @@\n asm(\"vbroadcasti128 %1, %[reg]\" : [ reg ] \"=x\"(out) : \"m\"(p[0]));\n return Vec256<T>{out};\n #elif HWY_COMPILER_MSVC && !HWY_COMPILER_CLANG\n- \/\/ Workaround for incorrect results with _mm256_broadcastsi128_si256\n+ \/\/ Workaround for incorrect results with _mm256_broadcastsi128_si256. Note\n+ \/\/ that MSVC also lacks _mm256_zextsi128_si256, but cast (which leaves the\n+ \/\/ upper half undefined) is fine because we're overwriting that anyway.\n const __m128i v128 = LoadU(Full128<T>(), p).raw;\n return Vec256<T>{\n- _mm256_inserti128_si256(_mm256_zextsi128_si256(v128), v128, 1)};\n+ _mm256_inserti128_si256(_mm256_castsi128_si256(v128), v128, 1)};\n #else\n return Vec256<T>{_mm256_broadcastsi128_si256(LoadU(Full128<T>(), p).raw)};\n #endif\n@@ -1377,7 +1379,7 @@\n #elif HWY_COMPILER_MSVC && !HWY_COMPILER_CLANG\n const __m128 v128 = LoadU(Full128<float>(), p).raw;\n return Vec256<float>{\n- _mm256_insertf128_ps(_mm256_zextps128_ps256(v128), v128, 1)};\n+ _mm256_insertf128_ps(_mm256_castps128_ps256(v128), v128, 1)};\n #else\n return Vec256<float>{_mm256_broadcast_ps(reinterpret_cast<const __m128*>(p))};\n #endif\n@@ -1391,7 +1393,7 @@\n #elif HWY_COMPILER_MSVC && !HWY_COMPILER_CLANG\n const __m128d v128 = LoadU(Full128<double>(), p).raw;\n return Vec256<double>{\n- _mm256_insertf128_pd(_mm256_zextpd128_pd256(v128), v128, 1)};\n+ _mm256_insertf128_pd(_mm256_castpd128_pd256(v128), v128, 1)};\n #else\n return Vec256<double>{\n _mm256_broadcast_pd(reinterpret_cast<const __m128d*>(p))};\n@@ -1669,9 +1671,9 @@\n \/\/ compiler could decide to optimize out code that relies on this.\n \/\/\n \/\/ The newer _mm256_zextsi128_si256 intrinsic fixes this by specifying the\n-\/\/ zeroing, but it is not available on GCC until 10.1. For older GCC, we can\n-\/\/ still obtain the desired code thanks to pattern recognition; note that the\n-\/\/ expensive insert instruction is not actually generated, see\n+\/\/ zeroing, but it is not available on MSVC nor GCC until 10.1. For older GCC,\n+\/\/ we can still obtain the desired code thanks to pattern recognition; note that\n+\/\/ the expensive insert instruction is not actually generated, see\n \/\/ https:\/\/gcc.godbolt.org\/z\/1MKGaP.\n \n template <typename T>\n"} {"commit":"bb546835a1bb006c104f098dffad807073fd7f41","subject":"netdev\/ieee802154_submac: enable ACK_REQ","message":"netdev\/ieee802154_submac: enable ACK_REQ\n\nOne of the features of the sub-MAC is to allow for ACK-handling in\nsoftware.\nSo enable the use of ACKs by default, just like the netdev drivers do\nthat support this feature in hardware.\n","repos":"OlegHahm\/RIOT,OlegHahm\/RIOT,miri64\/RIOT,kYc0o\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,authmillenon\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,kaspar030\/RIOT,kaspar030\/RIOT,RIOT-OS\/RIOT,authmillenon\/RIOT,ant9000\/RIOT,miri64\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,ant9000\/RIOT,OTAkeys\/RIOT,RIOT-OS\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,kaspar030\/RIOT,ant9000\/RIOT,authmillenon\/RIOT,OlegHahm\/RIOT,kYc0o\/RIOT,kaspar030\/RIOT,OTAkeys\/RIOT,authmillenon\/RIOT,kYc0o\/RIOT,kYc0o\/RIOT,kaspar030\/RIOT,miri64\/RIOT,OTAkeys\/RIOT,jasonatran\/RIOT,RIOT-OS\/RIOT,jasonatran\/RIOT,jasonatran\/RIOT,ant9000\/RIOT,miri64\/RIOT,miri64\/RIOT,OlegHahm\/RIOT,RIOT-OS\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- drivers\/netdev_ieee802154_submac\/netdev_ieee802154_submac.c\n+++ drivers\/netdev_ieee802154_submac\/netdev_ieee802154_submac.c\n@@ -279,6 +279,7 @@\n \n uint16_t chan = CONFIG_IEEE802154_DEFAULT_CHANNEL;\n int16_t tx_power = CONFIG_IEEE802154_DEFAULT_TXPOWER;\n+ netopt_enable_t enable = NETOPT_ENABLE;\n \n \/* Initialise netdev_ieee802154_t struct *\/\n netdev_ieee802154_set(netdev_ieee802154, NETOPT_CHANNEL,\n@@ -287,6 +288,8 @@\n &submac->short_addr, sizeof(submac->short_addr));\n netdev_ieee802154_set(netdev_ieee802154, NETOPT_ADDRESS_LONG,\n &submac->ext_addr, sizeof(submac->ext_addr));\n+ netdev_ieee802154_set(netdev_ieee802154, NETOPT_ACK_REQ,\n+ &enable, sizeof(enable));\n \n netdev_submac->dev.txpower = tx_power;\n \n"} {"commit":"3c47e4043ba1dfd9e95b6abde3efef6a4282c783","subject":"Get rid of some warnings.","message":"Get rid of some warnings.\n","repos":"pope\/version_sorter,pope\/version_sorter,pope\/version_sorter","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ext\/version_sorter\/version_sorter.c\n+++ ext\/version_sorter\/version_sorter.c\n@@ -16,6 +16,8 @@\n \n #define min(a, b) ((a) < (b) ? (a) : (b))\n typedef int compare_callback_t(const void *, const void *);\n+\n+void Init_version_sorter(void);\n \n struct version_number {\n \tconst char *original;\n@@ -82,20 +84,20 @@\n version_compare_cb(const void *a, const void *b)\n {\n \treturn compare_version_number(\n-\t\t(*(const struct version_number **)a),\n-\t\t(*(const struct version_number **)b));\n+\t\t(*(const struct version_number * const *)a),\n+\t\t(*(const struct version_number * const *)b));\n }\n \n static int\n version_compare_cb_r(const void *a, const void *b)\n {\n \treturn -compare_version_number(\n-\t\t(*(const struct version_number **)a),\n-\t\t(*(const struct version_number **)b));\n+\t\t(*(const struct version_number * const *)a),\n+\t\t(*(const struct version_number * const *)b));\n }\n \n static struct version_number *\n-grow_version_number(struct version_number *version, int new_size)\n+grow_version_number(struct version_number *version, uint new_size)\n {\n \treturn xrealloc(version,\n \t\t\t(sizeof(struct version_number) +\n@@ -106,9 +108,9 @@\n parse_version_number(const char *string)\n {\n \tstruct version_number *version = NULL;\n-\tuint64_t num_flags = 0x0;\n+\tuint32_t num_flags = 0x0;\n \tuint16_t offset;\n-\tint comp_n = 0, comp_alloc = 4;\n+\tuint comp_n = 0, comp_alloc = 4;\n \n \tversion = grow_version_number(version, comp_alloc);\n \n@@ -126,7 +128,7 @@\n \t\t\twhile (isdigit(string[offset])) {\n \t\t\t\tif (!overflown) {\n \t\t\t\t\tuint32_t old_number = number;\n-\t\t\t\t\tnumber = (10 * number) + (string[offset] - '0');\n+\t\t\t\t\tnumber = (10 * number) + (uint32_t)(string[offset] - '0');\n \t\t\t\t\tif (number < old_number) overflown = 1;\n \t\t\t\t}\n \n@@ -164,7 +166,7 @@\n \n \tversion->original = string;\n \tversion->num_flags = num_flags;\n-\tversion->size = comp_n;\n+\tversion->size = (int32_t)comp_n;\n \n \treturn version;\n }\n@@ -172,6 +174,8 @@\n static VALUE\n rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)\n {\n+\t(void)rb_self; \/\/ Unused.\n+\n \tstruct version_number **versions;\n \tlong length, i;\n \tVALUE *rb_version_ptr;\n@@ -197,7 +201,7 @@\n \t\tversions[i]->rb_version = rb_version;\n \t}\n \n-\tqsort(versions, length, sizeof(struct version_number *), cmp);\n+\tqsort(versions, (size_t)length, sizeof(struct version_number *), cmp);\n \trb_version_ptr = RARRAY_PTR(rb_version_array);\n \n \tfor (i = 0; i < length; ++i) {\n@@ -232,7 +236,8 @@\n \treturn rb_version_sort_1(rb_self, rb_versions, version_compare_cb_r);\n }\n \n-void Init_version_sorter(void)\n+void\n+Init_version_sorter(void)\n {\n \tVALUE rb_mVersionSorter = rb_define_module(\"VersionSorter\");\n \trb_define_module_function(rb_mVersionSorter, \"sort\", rb_version_sort, 1);\n"} {"commit":"04a93695c6c488d67b389b65f72f05abc71eb512","subject":"port vformat.c from 0.2x branch: - it now has BASE64 handling - handles more correct type in vcard and - has more traces","message":"port vformat.c from 0.2x branch:\n- it now has BASE64 handling\n- handles more correct type in vcard and\n- has more traces\n\n\ngit-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@1802 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e\n","repos":"luizluca\/opensync-luizluca,luizluca\/opensync-luizluca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- formats\/vformats-xml\/vformat.c\n+++ formats\/vformats-xml\/vformat.c\n@@ -21,6 +21,11 @@\n *\/\n \n #include \"vformat.h\"\n+\n+#ifdef HAVE_CONFIG_H\n+#include \"config.h\"\n+#endif\n+\n #include <string.h>\n #include <stdio.h>\n #include <ctype.h>\n@@ -35,6 +40,20 @@\n \n size_t quoted_decode_simple (char *data, size_t len);\n char *quoted_encode_simple (const unsigned char *string, int len);\n+\n+\n+\/**\n+ * _helper_is_base64 is helper function to check i a string is \"b\" or \"base64\"\n+ * @param check_string string that should be compared with \"b\" or \"base64\"\n+ * @return 0 if check_string is not base64 and 1 if it is\n+ *\/\n+static int _helper_is_base64(const char *check_string)\n+{\n+\tif(!g_ascii_strcasecmp ((char *) check_string, \"BASE64\") ||\n+\t !g_ascii_strcasecmp ((char *) check_string, \"b\") )\n+\t\treturn (1);\n+\treturn (0);\n+}\n \n time_t vformat_time_to_unix(const char *inptime)\n {\n@@ -217,8 +236,11 @@\n \tif (charset) {\n \n \t\tcd = iconv_open(\"UTF-8\", charset->str);\n+#ifdef SOLARIS\n+ if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {\n+#else\n if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {\n-\n+#endif\n *p = 0;\n vformat_attribute_add_value(attr, outbuf);\n \n@@ -242,8 +264,11 @@\n \n \t\t\t\/* because inbuf is not UTF-8, we think it is ISO-8859-1 *\/\n cd = iconv_open(\"UTF-8\", \"ISO-8859-1\");\n+#ifdef SOLARIS\n+ if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {\n+#else\n if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {\n-\n+#endif\n *p = 0;\n vformat_attribute_add_value (attr, outbuf);\n \n@@ -263,7 +288,7 @@\n \n }\n \n-static void _read_attribute_value (VFormatAttribute *attr, char **p, gboolean quoted_printable, GString *charset)\n+static void _read_attribute_value (VFormatAttribute *attr, char **p, int format_encoding, GString *charset)\n {\n \tchar *lp = *p;\n \tGString *str;\n@@ -271,7 +296,7 @@\n \t\/* read in the value *\/\n \tstr = g_string_new (\"\");\n \twhile (*lp != '\\r' && *lp != '\\0') {\n-\t\tif (*lp == '=' && quoted_printable) {\n+\t\tif (*lp == '=' && format_encoding == VF_ENCODING_QP) {\n \t\t\tchar a, b, x1=0, x2=0;\n \n \t\t\tif ((a = *(++lp)) == '\\0') break;\n@@ -343,6 +368,11 @@\n \t\t\tlp++;\n \t\t\tx1 = x2 = 0;\n \t\t}\n+\t\telse if (format_encoding == VF_ENCODING_BASE64) {\n+\t\t\tif((*lp != ' ') && (*lp != '\\t') )\n+\t\t\t\tstr = g_string_append_unichar (str, g_utf8_get_char (lp));\n+\t\t\tlp = g_utf8_next_char(lp);\n+\t\t}\n \t\telse if (*lp == '\\\\') {\n \t\t\t\/* convert back to the non-escaped version of\n \t\t\t the characters *\/\n@@ -400,7 +430,7 @@\n \t*p = lp;\n }\n \n-static void _read_attribute_params(VFormatAttribute *attr, char **p, gboolean *quoted_printable, GString **charset)\n+static void _read_attribute_params(VFormatAttribute *attr, char **p, int *format_encoding, GString **charset)\n {\n \tchar *lp = *p;\n \tGString *str;\n@@ -469,11 +499,16 @@\n \t\t\t\t}\n \n \t\t\t\tif (param\n-\t\t\t\t && !g_ascii_strcasecmp (param->name, \"encoding\")\n-\t\t\t\t && !g_ascii_strcasecmp (param->values->data, \"quoted-printable\")) {\n-\t\t\t\t\t*quoted_printable = TRUE;\n-\t\t\t\t\tvformat_attribute_param_free (param);\n-\t\t\t\t\tparam = NULL;\n+\t\t\t\t && !g_ascii_strcasecmp (param->name, \"encoding\")) {\n+\t\t\t\t\tif (!g_ascii_strcasecmp (param->values->data, \"quoted-printable\")) {\n+\t\t\t\t\t\t*format_encoding = VF_ENCODING_QP;\n+\t\t\t\t\t\tvformat_attribute_param_free (param);\n+\t\t\t\t\t\tparam = NULL;\n+\t\t\t\t\t} else if ( _helper_is_base64(param->values->data)) {\n+\t\t\t\t\t\t*format_encoding = VF_ENCODING_BASE64;\n+\t\t\t\t\t\tvformat_attribute_param_free (param);\n+\t\t\t\t\t\tparam = NULL;\n+\t\t\t\t\t}\n \t\t\t\t} else if (param && !g_ascii_strcasecmp(param->name, \"charset\")) {\n \t\t\t\t\t*charset = g_string_new(param->values->data);\n \t\t\t\t\tvformat_attribute_param_free (param);\n@@ -486,7 +521,7 @@\n \t\t\t\t\tif (!g_ascii_strcasecmp (str->str,\n \t\t\t\t\t\t\t\t \"quoted-printable\")) {\n \t\t\t\t\t\tparam_name = \"ENCODING\";\n-\t\t\t\t\t\t*quoted_printable = TRUE;\n+\t\t\t\t\t\t*format_encoding = VF_ENCODING_QP;\n \t\t\t\t\t}\n \t\t\t\t\t\/* apple's broken addressbook app outputs naked BASE64\n \t\t\t\t\t parameters, which aren't even vcard 3.0 compliant. *\/\n@@ -494,6 +529,7 @@\n \t\t\t\t\t\t\t\t \"base64\")) {\n \t\t\t\t\t\tparam_name = \"ENCODING\";\n \t\t\t\t\t\tg_string_assign (str, \"b\");\n+\t\t\t\t\t\t*format_encoding = VF_ENCODING_BASE64;\n \t\t\t\t\t}\n \t\t\t\t\telse {\n \t\t\t\t\t\tparam_name = \"TYPE\";\n@@ -812,6 +848,7 @@\n \n char *vformat_to_string (VFormat *evc, VFormatType type)\n {\n+\tosync_trace(TRACE_ENTRY, \"%s(%p, %i)\", __func__, type);\n \tGList *l;\n \tGList *v;\n \n@@ -842,7 +879,7 @@\n \t\tVFormatAttribute *attr = l->data;\n \t\tGString *attr_str;\n \t\tint l;\n-\t\tgboolean quoted_printable = FALSE;\n+\t\tint format_encoding = VF_ENCODING_RAW;\n \n \t\tattr_str = g_string_new (\"\");\n \n@@ -856,30 +893,72 @@\n \t\t\tattr_str = g_string_append_c (attr_str, '.');\n \t\t}\n \t\tattr_str = g_string_append (attr_str, attr->name);\n-\n \t\t\/* handle the parameters *\/\n \t\tfor (p = attr->params; p; p = p->next) {\n \t\t\tVFormatParam *param = p->data;\n \t\t\t\/* 5.8.2:\n \t\t\t * param = param-name \"=\" param-value *(\",\" param-value)\n \t\t\t *\/\n-\t\t\tif (!g_ascii_strcasecmp (param->name, \"CHARSET\") && (type == VFORMAT_CARD_30 || type == VFORMAT_TODO_20 || type == VFORMAT_EVENT_20))\n-\t\t\t\tcontinue;\n-\t\t\tattr_str = g_string_append_c (attr_str, ';');\n-\t\t\tif (g_ascii_strcasecmp (param->name, \"TYPE\") || type == VFORMAT_CARD_30 || type == VFORMAT_TODO_20 || type == VFORMAT_EVENT_20)\n+\t\t\tif( type == VFORMAT_CARD_30 || type == VFORMAT_TODO_20\n+\t\t\t || type == VFORMAT_EVENT_20) {\n+\n+\t\t\t\t\/**\n+\t\t\t\t * Character set can only be specified on the CHARSET\n+\t\t\t\t * parameter on the Content-Type MIME header field.\n+\t\t\t\t**\/\n+\t\t\t\tif (!g_ascii_strcasecmp (param->name, \"CHARSET\"))\n+\t\t\t\t\tcontinue;\n+\t\t\t\tattr_str = g_string_append_c (attr_str, ';');\n \t\t\t\tattr_str = g_string_append (attr_str, param->name);\n-\t\t\tif (param->values) {\n-\t\t\t\tif (g_ascii_strcasecmp (param->name, \"TYPE\") || type == VFORMAT_CARD_30 || type == VFORMAT_TODO_20 || type == VFORMAT_EVENT_20)\n+\t\t\t\tif (param->values) {\n+\t\t\t\t\tattr_str = g_string_append_c (attr_str, '=');\n+\t\t\t\t}\n+\t\t\t\tfor (v = param->values; v; v = v->next) {\n+\t\t\t\t\tif (_helper_is_base64((const char *) v->data)) {\n+\t\t\t\t\t\tformat_encoding = VF_ENCODING_BASE64;\n+\t\t\t\t\t\t\/*Only the \"B\" encoding of [RFC 2047] is an allowed*\/\n+\t\t\t\t\t\tv->data=\"B\";\n+\t\t\t\t\t}\n+\t\t\t\t\t\/**\n+\t\t\t\t\t * QUOTED-PRINTABLE inline encoding has been\n+\t\t\t\t\t * eliminated.\n+\t\t\t\t\t**\/\n+\t\t\t\t\tif (!g_ascii_strcasecmp (param->name, \"ENCODING\") && !g_ascii_strcasecmp ((char *) v->data, \"QUOTED-PRINTABLE\")) {\n+\t\t\t\t\t\tosync_trace(TRACE_ERROR, \"%s false encoding QUOTED-PRINTABLE is not allowed\", __func__);\n+\t\t\t\t\t\tformat_encoding = VF_ENCODING_QP;\n+\t\t\t\t\t}\n+\t\t\t\t\tattr_str = g_string_append (attr_str, v->data);\n+\n+\t\t\t\t\tif (v->next)\n+\t\t\t\t\t\tattr_str = g_string_append_c (attr_str, ',');\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\tattr_str = g_string_append_c (attr_str, ';');\n+\t\t\t\t\/**\n+\t\t\t\t * The \"TYPE=\" is optional skip it.\n+\t\t\t\t * LOGO, PHOTO and SOUND multimedia formats MUST\n+\t\t\t\t * have a \"TYPE=\" parameter\n+\t\t\t\t**\/\n+\t\t\t\tgboolean must_have_type = FALSE;\n+\t\t\t\tif (!g_ascii_strcasecmp (attr->name, \"PHOTO\") || !g_ascii_strcasecmp (attr->name, \"LOGO\") || !g_ascii_strcasecmp (attr->name, \"SOUND\") )\n+\t\t\t\t\tmust_have_type = TRUE;\n+\t\t\t\tif ( must_have_type || g_ascii_strcasecmp (param->name, \"TYPE\") )\n+\t\t\t\t\tattr_str = g_string_append (attr_str, param->name);\n+\t\t\t\tif ( param->values && (must_have_type || g_ascii_strcasecmp (param->name, \"TYPE\")) )\n \t\t\t\t\tattr_str = g_string_append_c (attr_str, '=');\n \t\t\t\tfor (v = param->values; v; v = v->next) {\n+\t\t\t\t\t\/\/ check for quoted-printable encoding\n+\t\t\t\t\tif (!g_ascii_strcasecmp (param->name, \"ENCODING\") && !g_ascii_strcasecmp ((char *) v->data, \"QUOTED-PRINTABLE\"))\n+\t\t\t\t\t\tformat_encoding = VF_ENCODING_QP;\n+\t\t\t\t\t\/\/ check for base64 encoding\n+\t\t\t\t\tif (_helper_is_base64((const char *) v->data)) {\n+\t\t\t\t\t\tformat_encoding = VF_ENCODING_BASE64;\n+\t\t\t\t\t\tv->data=\"BASE64\";\n+\t\t\t\t\t}\n \t\t\t\t\tattr_str = g_string_append (attr_str, v->data);\n-\n \t\t\t\t\tif (v->next)\n \t\t\t\t\t\tattr_str = g_string_append_c (attr_str, ',');\n-\n-\t\t\t\t\t\/\/ check for quoted-printable encoding\n-\t\t\t\t\tif (!g_ascii_strcasecmp (param->name, \"ENCODING\") && !g_ascii_strcasecmp ((char *) v->data, \"QUOTED-PRINTABLE\"))\n-\t\t\t\t\t\tquoted_printable = TRUE;\n \t\t\t\t}\n \t\t\t}\n \t\t}\n@@ -959,14 +1038,14 @@\n \t\t\t\tl += 75;\n \n \t\t\t\t\/* If using QP, must be sure that we do not fold within a quote sequence *\/\n-\t\t\t\tif (quoted_printable) {\n+\t\t\t\tif (format_encoding == VF_ENCODING_QP) {\n \t\t\t\t if (g_utf8_get_char(g_utf8_offset_to_pointer(attr_str->str, l-1)) == '=') l--;\n \t\t\t\t else if (g_utf8_get_char(g_utf8_offset_to_pointer(attr_str->str, l-2)) == '=') l -= 2;\n \t\t\t\t}\n \n \t\t\t\tchar *p = g_utf8_offset_to_pointer(attr_str->str, l);\n \n-\t\t\t\tif (quoted_printable)\n+\t\t\t\tif (format_encoding == VF_ENCODING_QP)\n \t\t\t\t\tattr_str = g_string_insert_len (attr_str, p - attr_str->str, \"=\" CRLF \"\", sizeof (\"=\" CRLF \"\") - 1);\n \t\t\t\telse\n \t\t\t\t\tattr_str = g_string_insert_len (attr_str, p - attr_str->str, CRLF \" \", sizeof (CRLF \" \") - 1);\n@@ -976,6 +1055,15 @@\n \t\t} while (l < g_utf8_strlen(attr_str->str, attr_str->len));\n \n \t\tattr_str = g_string_append (attr_str, CRLF);\n+\t\t\/**\n+\t\t * base64= <MIME RFC 1521 base64 text>\n+\t\t * the end of the text is marked with two CRLF sequences\n+\t\t * this results in one blank line before the start of the\n+\t\t * next property\n+\t\t**\/\n+\t\tif( format_encoding == VF_ENCODING_BASE64\n+\t\t && (type == VFORMAT_CARD_21))\n+\t\t\tattr_str = g_string_append (attr_str, CRLF);\n \n \t\tstr = g_string_append (str, attr_str->str);\n \t\tg_string_free (attr_str, TRUE);\n@@ -1001,6 +1089,7 @@\n \t\t\tbreak;\n \t}\n \n+\tosync_trace(TRACE_EXIT, \"%s(%p, %i)\", __func__, type);\n \treturn g_string_free (str, FALSE);\n }\n \n@@ -1322,7 +1411,7 @@\n \t\t}\n \n \t\tif (param->values && param->values->data) {\n-\t\t\tif (!g_ascii_strcasecmp ((char*)param->values->data, \"b\"))\n+\t\t\tif (_helper_is_base64((const char*)param->values->data))\n \t\t\t\tattr->encoding = VF_ENCODING_BASE64;\n \t\t\telse if (!g_ascii_strcasecmp ((char*)param->values->data, \"QUOTED-PRINTABLE\"))\n \t\t\t\tattr->encoding = VF_ENCODING_QP;\n@@ -1351,6 +1440,15 @@\n \t\t\treturn param;\n \t}\n \treturn NULL;\n+}\n+\n+void\n+vformat_attribute_set_value (VFormatAttribute *attr,\n+\t\t\t\tint nth, const char *value)\n+{\n+\tGList *param = g_list_nth(attr->values, nth);\n+\tg_free(param->data);\n+\tparam->data = g_strdup(value);\n }\n \n void\n"} {"commit":"8dcd734b87298bb9217dc2c51540c4d23121c1b5","subject":"Added another constructor to rigidbodycomponent","message":"Added another constructor to rigidbodycomponent\n","repos":"luky1971\/Diamond,luky1971\/Diamond,polymergames\/Diamond,luky1971\/Diamond,polymergames\/Diamond,luky1971\/Diamond,luky1971\/Diamond,polymergames\/Diamond,polymergames\/Diamond,luky1971\/Diamond,polymergames\/Diamond,polymergames\/Diamond","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/D_RigidbodyComponent2D.h\n+++ include\/D_RigidbodyComponent2D.h\n@@ -26,7 +26,11 @@\n namespace Diamond {\n class RigidbodyComponent2D : public Component {\n public:\n- RigidbodyComponent2D(const Entity2D *parent, PhysicsWorld2D *world) : world(world) {\n+ RigidbodyComponent2D(Rigidbody2D *body, PhysicsWorld2D *world)\n+ : body(body), world(world) {}\n+\n+ RigidbodyComponent2D(const Entity2D *parent, PhysicsWorld2D *world) \n+ : world(world) {\n body = world->genRigidbody(parent->getTransformID());\n }\n \n"} {"commit":"9b8c3d9600b5dbcf9f076a2fd132cba990b13493","subject":"Restructuring of printing. Eliminated another long else block with a goto. Gotos are already quite common in that function. refs #325.","message":"Restructuring of printing. Eliminated another long else block with a goto.\nGotos are already quite common in that function. refs #325.\n","repos":"timoc\/colm,timoc\/colm,timoc\/colm,timoc\/colm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- colm\/tree.c\n+++ colm\/tree.c\n@@ -1941,7 +1941,10 @@\n \t\tkid = (Kid*)vm_pop();\n \t}\n \n+\t\/* If it is an ignore list, queue it and skip past the content. *\/\n \tif ( kid->tree->id == LEL_ID_IGNORE_LIST ) {\n+\t\t\/* Ignore suppression can be triggered by a suppress right or suppress\n+\t\t * outside left for example. *\/\n \t\tif ( ! (printFlags & IPF_SUPPRESS ) ) {\n \t\t\tdebug( REALM_PRINT, \"putting %p on ignore list\\n\", kid->tree );\n \t\t\tKid *newIgnore = kidAllocate( prg );\n@@ -1949,115 +1952,115 @@\n \t\t\tleadingIgnore = newIgnore;\n \t\t\tleadingIgnore->tree = kid->tree;\n \t\t}\n-\t}\n-\telse {\n-\n-\t\t\/* Terminals trigger leading ignore printing. *\/\n-\t\tif ( kid->tree->id < prg->rtd->firstNonTermId ) {\n-\t\t\t\/* Reset suppress left stop. *\/\n-\t\t\tsuppressLeftStop = 0;\n-\n-\t\t\t\/* Reverse the leading ignore list. *\/\n-\t\t\tif ( leadingIgnore != 0 ) {\n-\t\t\t\tKid *ignore = 0, *last = 0;\n-\t\t\t\tlong youngest = -1;\n-\t\t\t\tKid *youngestKid = 0;\n-\n-\t\t\t\tdebug( REALM_PRINT, \"printing ignore %p\\n\", leadingIgnore->tree );\n-\n-\t\t\t\t\/* Reverse the list. *\/\n-\t\t\t\twhile ( true ) {\n-\t\t\t\t\tKid *next = leadingIgnore->next;\n-\t\t\t\t\tleadingIgnore->next = last;\n-\n-\t\t\t\t\tif ( ((IgnoreList*)leadingIgnore->tree)->generation > youngest ) {\n-\t\t\t\t\t\tyoungest = ((IgnoreList*)leadingIgnore->tree)->generation;\n-\t\t\t\t\t\tyoungestKid = leadingIgnore;\n+\t\tgoto skip_node;\n+\t}\n+\n+\t\/* Terminals trigger leading ignore printing. *\/\n+\tif ( kid->tree->id < prg->rtd->firstNonTermId ) {\n+\t\t\/* Reset suppress left stop. *\/\n+\t\tsuppressLeftStop = 0;\n+\n+\t\t\/* Reverse the leading ignore list. *\/\n+\t\tif ( leadingIgnore != 0 ) {\n+\t\t\tKid *ignore = 0, *last = 0;\n+\t\t\tlong youngest = -1;\n+\t\t\tKid *youngestKid = 0;\n+\n+\t\t\tdebug( REALM_PRINT, \"printing ignore %p\\n\", leadingIgnore->tree );\n+\n+\t\t\t\/* Reverse the list. *\/\n+\t\t\twhile ( true ) {\n+\t\t\t\tKid *next = leadingIgnore->next;\n+\t\t\t\tleadingIgnore->next = last;\n+\n+\t\t\t\tif ( ((IgnoreList*)leadingIgnore->tree)->generation > youngest ) {\n+\t\t\t\t\tyoungest = ((IgnoreList*)leadingIgnore->tree)->generation;\n+\t\t\t\t\tyoungestKid = leadingIgnore;\n+\t\t\t\t}\n+\n+\t\t\t\tif ( next == 0 )\n+\t\t\t\t\tbreak;\n+\n+\t\t\t\tlast = leadingIgnore;\n+\t\t\t\tleadingIgnore = next;\n+\t\t\t}\n+\t\t\n+\t\t\tKid *start = leadingIgnore;\n+\t\t\tKid *stop = 0;\n+\n+\t\t\t\/* Print the leading ignore list, free the kids in the process. *\/\n+\t\t\tignore = youngestKid;\n+\t\t\tif ( printArgs->comm && ignore != 0 && kid->tree->id != 0 &&\n+\t\t\t\t(printFlags & IPF_TERM_PRINTED) )\n+\t\t\t{\t\n+\t\t\t\t\/* Non-terminal. *\/\n+\t\t\t\tKid *child = treeChild( prg, ignore->tree );\n+\t\t\t\tif ( child != 0 ) {\n+\t\t\t\t\tvm_push( (SW)leadingIgnore );\n+\t\t\t\t\tvm_push( (SW)ignore );\n+\t\t\t\t\tvm_push( (SW)kid );\n+\t\t\t\t\tleadingIgnore = 0;\n+\t\t\t\t\tkid = child;\n+\t\t\t\t\twhile ( kid != 0 ) {\n+\t\t\t\t\t\tdebug( REALM_PRINT, \"rec call on %p\\n\", kid->tree );\n+\t\t\t\t\t\tvm_push( (SW) RecIgnoreList );\n+\t\t\t\t\t\tgoto rec_call;\n+\t\t\t\t\t\trec_return_il:\n+\t\t\t\t\t\tkid = kid->next;\n \t\t\t\t\t}\n-\n-\t\t\t\t\tif ( next == 0 )\n-\t\t\t\t\t\tbreak;\n-\n-\t\t\t\t\tlast = leadingIgnore;\n-\t\t\t\t\tleadingIgnore = next;\n-\t\t\t\t}\n-\t\t\t\n-\t\t\t\tKid *start = leadingIgnore;\n-\t\t\t\tKid *stop = 0;\n-\n-\t\t\t\t\/* Print the leading ignore list, free the kids in the process. *\/\n-\t\t\t\tignore = youngestKid;\n-\t\t\t\tif ( printArgs->comm && ignore != 0 && kid->tree->id != 0 &&\n-\t\t\t\t\t(printFlags & IPF_TERM_PRINTED) )\n-\t\t\t\t{\t\n-\t\t\t\t\t\/* Non-terminal. *\/\n-\t\t\t\t\tKid *child = treeChild( prg, ignore->tree );\n-\t\t\t\t\tif ( child != 0 ) {\n-\t\t\t\t\t\tvm_push( (SW)leadingIgnore );\n-\t\t\t\t\t\tvm_push( (SW)ignore );\n-\t\t\t\t\t\tvm_push( (SW)kid );\n-\t\t\t\t\t\tleadingIgnore = 0;\n-\t\t\t\t\t\tkid = child;\n-\t\t\t\t\t\twhile ( kid != 0 ) {\n-\t\t\t\t\t\t\tdebug( REALM_PRINT, \"rec call on %p\\n\", kid->tree );\n-\t\t\t\t\t\t\tvm_push( (SW) RecIgnoreList );\n-\t\t\t\t\t\t\tgoto rec_call;\n-\t\t\t\t\t\t\trec_return_il:\n-\t\t\t\t\t\t\tkid = kid->next;\n-\t\t\t\t\t\t}\n-\t\t\t\t\t\tkid = (Kid*)vm_pop();\n-\t\t\t\t\t\tignore = (Kid*)vm_pop();\n-\t\t\t\t\t\tleadingIgnore = (Kid*)vm_pop();\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\n-\t\t\t\t\/* Free the leading ignore list. *\/\n-\t\t\t\twhile ( leadingIgnore != 0 ) {\n-\t\t\t\t\tKid *next = leadingIgnore->next;\n-\t\t\t\t\tkidFree( prg, leadingIgnore );\n-\t\t\t\t\tleadingIgnore = next;\n+\t\t\t\t\tkid = (Kid*)vm_pop();\n+\t\t\t\t\tignore = (Kid*)vm_pop();\n+\t\t\t\t\tleadingIgnore = (Kid*)vm_pop();\n \t\t\t\t}\n \t\t\t}\n-\t\t}\n-\n-\t\t\/* Open the tree. *\/\n-\t\tprintArgs->openTree( printArgs, sp, prg, parent, kid );\n-\n-\t\t\/* Print contents. *\/\n-\t\tif ( kid->tree->id < prg->rtd->firstNonTermId ) {\n-\t\t\tdebug( DBG_PRINT, \"printing terminal %p\\n\", kid->tree );\n-\t\t\tif ( kid->tree->id != 0 ) {\n-\t\t\t\tprintFlags |= IPF_TERM_PRINTED;\n-\t\t\t\tprintArgs->printTerm( printArgs, sp, prg, kid );\n+\n+\t\t\t\/* Free the leading ignore list. *\/\n+\t\t\twhile ( leadingIgnore != 0 ) {\n+\t\t\t\tKid *next = leadingIgnore->next;\n+\t\t\t\tkidFree( prg, leadingIgnore );\n+\t\t\t\tleadingIgnore = next;\n \t\t\t}\n-\n-\t\t\tprintFlags &= ~IPF_SUPPRESS;\n-\t\t}\n-\n-\t\t\/* Print children. *\/\n-\t\tKid *child = printArgs->attr ? \n-\t\t\ttreeAttr( prg, kid->tree ) : \n-\t\t\ttreeChild( prg, kid->tree );\n-\n-\t\tif ( child != 0 ) {\n-\t\t\tvm_push( (SW)parent );\n-\t\t\tvm_push( (SW)kid );\n-\t\t\tparent = kid;\n-\t\t\tkid = child;\n-\t\t\twhile ( kid != 0 ) {\n-\t\t\t\tvm_push( (SW) ChildPrint );\n-\t\t\t\tgoto rec_call;\n-\t\t\t\trec_return:\n-\t\t\t\tkid = kid->next;\n-\t\t\t}\n-\t\t\tkid = (Kid*)vm_pop();\n-\t\t\tparent = (Kid*)vm_pop();\n-\t\t}\n-\n-\t\t\/* close the tree. *\/\n-\t\tprintArgs->closeTree( printArgs, sp, prg, parent, kid );\n-\t}\n-\n+\t\t}\n+\t}\n+\n+\t\/* Open the tree. *\/\n+\tprintArgs->openTree( printArgs, sp, prg, parent, kid );\n+\n+\t\/* Print contents. *\/\n+\tif ( kid->tree->id < prg->rtd->firstNonTermId ) {\n+\t\tdebug( DBG_PRINT, \"printing terminal %p\\n\", kid->tree );\n+\t\tif ( kid->tree->id != 0 ) {\n+\t\t\tprintFlags |= IPF_TERM_PRINTED;\n+\t\t\tprintArgs->printTerm( printArgs, sp, prg, kid );\n+\t\t}\n+\n+\t\tprintFlags &= ~IPF_SUPPRESS;\n+\t}\n+\n+\t\/* Print children. *\/\n+\tKid *child = printArgs->attr ? \n+\t\ttreeAttr( prg, kid->tree ) : \n+\t\ttreeChild( prg, kid->tree );\n+\n+\tif ( child != 0 ) {\n+\t\tvm_push( (SW)parent );\n+\t\tvm_push( (SW)kid );\n+\t\tparent = kid;\n+\t\tkid = child;\n+\t\twhile ( kid != 0 ) {\n+\t\t\tvm_push( (SW) ChildPrint );\n+\t\t\tgoto rec_call;\n+\t\t\trec_return:\n+\t\t\tkid = kid->next;\n+\t\t}\n+\t\tkid = (Kid*)vm_pop();\n+\t\tparent = (Kid*)vm_pop();\n+\t}\n+\n+\t\/* close the tree. *\/\n+\tprintArgs->closeTree( printArgs, sp, prg, parent, kid );\n+\n+skip_node:\n \t\/* If not currently skipping ignore data, then print it. Ignore data can\n \t * be associated with terminals and nonterminals. *\/\n \tif ( kid->tree->flags & AF_RIGHT_IGNORE ) {\n@@ -2180,8 +2183,8 @@\n \n \tLangElInfo *lelInfo = prg->rtd->lelInfo;\n \n-\t\/* Skip the repeats and lists that are a continuation of the list. This is\n-\t * the list flattening. *\/\n+\t\/* List flattening: skip the repeats and lists that are a continuation of\n+\t * the list. *\/\n \tif ( parent != 0 && parent->tree->id == kid->tree->id && kid->next == 0 &&\n \t\t\t( lelInfo[parent->tree->id].repeat || lelInfo[parent->tree->id].list ) )\n \t{\n@@ -2254,8 +2257,8 @@\n \n \tLangElInfo *lelInfo = prg->rtd->lelInfo;\n \n-\t\/* Skip the repeats and lists that are a continuation of the list. This is\n-\t * the list flattening. *\/\n+\t\/* List flattening: skip the repeats and lists that are a continuation of\n+\t * the list. *\/\n \tif ( parent != 0 && parent->tree->id == kid->tree->id && kid->next == 0 &&\n \t\t\t( lelInfo[parent->tree->id].repeat || lelInfo[parent->tree->id].list ) )\n \t{\n"} {"commit":"cfa37ef74adc1eb2946699eaf28d64a4020b5a0a","subject":" * Added test code of CSS for center tag.","message":" * Added test code of CSS for center tag.\n\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@4178 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"b1c9a9397e8cd4c37d450f1d8f797b9ff3a39ac5","subject":"sketching out how packet write will look","message":"sketching out how packet write will look\n","repos":"wirepair\/netcode.io,vvanders\/netcode.io,vvanders\/netcode.io,wirepair\/netcode.io,networkprotocol\/netcode.io,wirepair\/netcode.io,vvanders\/netcode.io,vvanders\/netcode.io,networkprotocol\/netcode.io","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- netcode.c\n+++ netcode.c\n@@ -81,7 +81,7 @@\n \n struct netcode_connection_keep_alive_packet_t\n {\n- uint8_t packet_type; \n+ uint8_t packet_type;\n };\n \n struct netcode_connection_payload_packet_t\n@@ -93,6 +93,73 @@\n {\n uint8_t packet_type;\n };\n+\n+void netcode_write_uint8( uint8_t * p, uint8_t value )\n+{\n+ (void) p;\n+ (void) value;\n+\n+ \/\/ ...\n+}\n+\n+void netcode_write_uint16( uint8_t * p, uint16_t value )\n+{\n+ (void) p;\n+ (void) value;\n+\n+ \/\/ ...\n+}\n+\n+void netcode_write_uint32( uint8_t * p, uint32_t value )\n+{\n+ (void) p;\n+ (void) value;\n+\n+ \/\/ ...\n+}\n+\n+void netcode_write_uint64( uint8_t * p, uint64_t value )\n+{\n+ (void) p;\n+ (void) value;\n+\n+ \/\/ ...\n+}\n+\n+void netcode_write_bytes( uint8_t * p, const uint8_t * byte_array, int num_bytes )\n+{\n+ (void) p;\n+ (void) byte_array;\n+ (void) num_bytes;\n+\n+ \/\/ ...\n+}\n+\n+int netcode_write_packet( void * packet_data, uint8_t * buffer, int buffer_length )\n+{\n+ uint8_t packet_type = ((uint8_t*)packet_data)[0];\n+\n+ if ( packet_type == NETCODE_CONNECTION_REQUEST_PACKET )\n+ {\n+ \/\/ non-encrypted packets (connection request packet only)\n+\n+ assert( buffer_length >= 1 + 8 + NETCODE_NONCE_BYTES + NETCODE_CONNECT_TOKEN_BYTES );\n+\n+ struct netcode_connection_request_packet_t * packet = (struct netcode_connection_request_packet_t*) NULL;\n+\n+ netcode_write_uint8( buffer, NETCODE_CONNECTION_REQUEST_PACKET );\n+ netcode_write_uint64( buffer + 1, packet->connect_token_expire_timestamp );\n+ netcode_write_bytes( buffer + 1 + 8, packet->connect_token_nonce, NETCODE_NONCE_BYTES );\n+\n+ return 1 + 8 + NETCODE_NONCE_BYTES + NETCODE_CONNECT_TOKEN_BYTES;\n+ }\n+ else\n+ {\n+ \/\/ encrypted packets\n+ }\n+\n+ return 0;\n+}\n \n \/\/ ----------------------------------------------------------------\n \n"} {"commit":"f429e7e17883cd603294ef316e1d8fd9d2adfff1","subject":"NUM_BASE constant for defining numerical base of argument","message":"NUM_BASE constant for defining numerical base of argument\n","repos":"aliclark\/paracat","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- paracat.c\n+++ paracat.c\n@@ -30,6 +30,10 @@\n #define BUF_COUNT 4096\n #endif\n \n+#ifndef NUM_BASE\n+#define NUM_BASE 10\n+#endif\n+\n #define NEWLINE_CH 10\n \n #define TRUE 1\n@@ -178,7 +182,7 @@\n return 5;\n }\n \n- numpids = strtol(argv[1], &end, 10);\n+ numpids = strtol(argv[1], &end, NUM_BASE);\n if (*end) {\n perror(\"Error: Could not parse spawn count\");\n return 1;\n"} {"commit":"7d47e06e0962a2c6ed2c03325168d5db8fad390b","subject":"r3131| dont calculate again what we already know","message":"r3131| dont calculate again what we already know\n","repos":"lantus\/openbor,lantus\/openbor,lantus\/openbor,rofl0r\/openbor,rofl0r\/openbor,lantus\/openbor,rofl0r\/openbor,rofl0r\/openbor","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- openbor.c\n+++ openbor.c\n@@ -4003,17 +4003,15 @@\n \r\n static void _readbarstatus(char*, s_barstatus*);\r\n \r\n-s_model* lcmHandleCommandName(ArgList* arglist, s_model* newchar) {\r\n+s_model* lcmHandleCommandName(ArgList* arglist, s_model* newchar, int cacheindex) {\r\n \tchar* value = GET_ARGP(1);\r\n \ts_model* tempmodel;\r\n-\tint tempInt;\r\n \t\/\/if((tempmodel=find_model(value)) && tempmodel!=newchar) shutdown(1, \"Duplicate model name '%s'\", value);\r\n \tif((tempmodel=find_model(value))) {\r\n \t\treturn tempmodel;\r\n \t}\t\r\n-\ttempInt = get_cached_model_index(value);\r\n-\tmodel_cache[tempInt].model = newchar;\r\n-\tnewchar->name = model_cache[tempInt].name;\r\n+\tmodel_cache[cacheindex].model = newchar;\r\n+\tnewchar->name = model_cache[cacheindex].name;\r\n \tif(stricmp(newchar->name, \"steam\")==0)\r\n \t{\r\n \t\tnewchar->alpha = 1;\r\n@@ -4425,6 +4423,15 @@\n \telse shutdown(1, \"Unable to load %s '%s' in file '%s'.\\n\", scriptname, GET_ARGP(1), filename);\r\n }\r\n \r\n+void lc(char* buf, size_t size) {\r\n+\tint i;\r\n+\tfor(i=0;i<size;i++) \r\n+\t\tbuf[i] = tolower((int)buf[i]);\r\n+}\r\n+\r\n+void init_model(s_model* newchar, int cacheindex) {\r\n+}\r\n+\r\n s_model* load_cached_model(char * name, char * owner, char unload)\r\n {\r\n \ts_model_list *curr = NULL,\r\n@@ -4570,6 +4577,8 @@\n \tnewchar = model_list->model;\r\n \tadd_model_map(models_loaded);\r\n \tmodel_map[models_loaded++].model = newchar;\r\n+\t\t\r\n+\t\r\n \tmemset(newchar,0,sizeof(s_model));\r\n \tnewchar->name = model_cache[cacheindex].name; \/\/ well give it a name for sort method\r\n \tnewchar->index = cacheindex;\r\n@@ -4728,11 +4737,8 @@\n \t\tif(ParseArgs(&arglist,buf+pos,argbuf)){\r\n \t\t\tcommand = GET_ARG(0);\r\n \t\t\tcommandlen = GET_ARG_LEN(0);\r\n-\t\t\t\r\n-\t\t\t\r\n \t\t\t\/\/ lowercase the command so that we can find it using hashes.\r\n-\t\t\tfor(i=0;i<commandlen;i++) \r\n-\t\t\t\tcommand[i] = tolower((int)command[i]);\r\n+\t\t\tlc(command, commandlen);\r\n \t\t\t\r\n \t\t\tif(!command) \r\n \t\t\t\tcmd = (txtCommands) 0;\r\n@@ -4741,7 +4747,7 @@\n \t\t\t\r\n \t\t\tswitch(cmd) {\r\n \t\t\t\tcase CMD_NAME: \r\n-\t\t\t\t\ttempmodel = lcmHandleCommandName(&arglist, newchar);\r\n+\t\t\t\t\ttempmodel = lcmHandleCommandName(&arglist, newchar, cacheindex);\r\n \t\t\t\t\tif (tempmodel != newchar) {\t\t\t\t\t\t\r\n \t\t\t\t\t\tprintf(\"loaded dup model: name = %s, filename = %s\\n\", GET_ARG(1), filename);\r\n \t\t\t\t\t\ttracefree(buf);\r\n"} {"commit":"9a601b484bf1f1665c2cd58875a9f8de1d4d8f3a","subject":"Switch to a consistent no-space-before-param-list-paren style.","message":"Switch to a consistent no-space-before-param-list-paren style.\n\n* tools\/server-side\/svnauthz-validate.c:\n Remove those extra spaces!\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tools\/server-side\/svnauthz-validate.c\n+++ tools\/server-side\/svnauthz-validate.c\n@@ -28,7 +28,7 @@\n #include \"svn_cmdline.h\"\n \n int\n-main (int argc, const char **argv)\n+main(int argc, const char **argv)\n {\n apr_pool_t *pool;\n svn_error_t *err;\n@@ -37,25 +37,25 @@\n \n if (argc <= 1)\n {\n- printf (\"Usage: %s PATH \\n\\n\", argv[0]);\n- printf (\"Loads the authz file at PATH and validates its syntax. \\n\"\n- \"Returns:\\n\"\n- \" 0 when syntax is OK.\\n\"\n- \" 1 when syntax is invalid.\\n\"\n- \" 2 operational error\\n\");\n+ printf(\"Usage: %s PATH \\n\\n\", argv[0]);\n+ printf(\"Loads the authz file at PATH and validates its syntax. \\n\"\n+ \"Returns:\\n\"\n+ \" 0 when syntax is OK.\\n\"\n+ \" 1 when syntax is invalid.\\n\"\n+ \" 2 operational error\\n\");\n return 2;\n }\n \n authz_file = argv[1];\n \n \/* Initialize the app. Send all error messages to 'stderr'. *\/\n- if (svn_cmdline_init (argv[0], stderr) != EXIT_SUCCESS)\n+ if (svn_cmdline_init(argv[0], stderr) != EXIT_SUCCESS)\n return 2;\n \n- pool = svn_pool_create (NULL);\n+ pool = svn_pool_create(NULL);\n \n \/* Read the access file and validate it. *\/\n- err = svn_repos_authz_read (&authz, authz_file, TRUE, pool);\n+ err = svn_repos_authz_read(&authz, authz_file, TRUE, pool);\n \n svn_pool_destroy(pool);\n \n@@ -69,6 +69,3 @@\n return 0;\n }\n }\n-\n-\n-\n"} {"commit":"83aa2ac65a36e77f5651ef8946003b856cab49bc","subject":"staging: lustre: obdclass: Make structure declerations static const","message":"staging: lustre: obdclass: Make structure declerations static const\n\nobd_device_list_sops and obd_device_list_fops are not referenced\noutside of linux-module.c, and in the general use case\nstruct file_operations and struct seq_operations should be a const\nobject, so make them static and const.\n\nThis patch fixes the following sparse warnings:\nWARNING: struct seq_operations should normally be const\nWARNING: struct file_operations should normally be const\n\nSigned-off-by: Cihangir Akturk <11f395824a946e8925f106c1f042cb83fade0e47@gmail.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@linuxfoundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- drivers\/staging\/lustre\/lustre\/obdclass\/linux\/linux-module.c\n+++ drivers\/staging\/lustre\/lustre\/obdclass\/linux\/linux-module.c\n@@ -385,7 +385,7 @@\n \treturn 0;\n }\n \n-struct seq_operations obd_device_list_sops = {\n+static const struct seq_operations obd_device_list_sops = {\n \t.start = obd_device_list_seq_start,\n \t.stop = obd_device_list_seq_stop,\n \t.next = obd_device_list_seq_next,\n@@ -406,7 +406,7 @@\n \treturn 0;\n }\n \n-struct file_operations obd_device_list_fops = {\n+static const struct file_operations obd_device_list_fops = {\n \t.owner = THIS_MODULE,\n \t.open = obd_device_list_open,\n \t.read = seq_read,\n"} {"commit":"b0b47fc5bf470dd283c2144385c438bb8dba515c","subject":"Update RenderTarget.h","message":"Update RenderTarget.h","repos":"surgura\/modulargui,surgura\/modulargui","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/Mgui\/Grph\/RenderTarget.h\n+++ include\/Mgui\/Grph\/RenderTarget.h\n@@ -10,6 +10,7 @@\n \n \/\/ Include files\n #include \"Texture.h\"\n+#include \"Vector2u32.h\"\n \n \/\/\/ A target that can be rendered to.\n typedef struct\n"} {"commit":"7667006ab1993e7f348fefe22209e3b0abfc01b2","subject":" * Added test code of CSS for h3 tag.","message":" * Added test code of CSS for h3 tag.\n\n\ngit-svn-id: a5f274977ba119e8cb0852a7baa1e58e2494093d@3840 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"fddd578d2134cc577c50412f06184a4c7b4295a6","subject":"network: make use of the iio_context_pdata() helper","message":"network: make use of the iio_context_pdata() helper\n\nThis tries to most of the access to the pdata pointer of the IIO context.\n\nSigned-off-by: Alexandru Ardelean <685557f6b7c225d86b536740313ed51b24843a58@analog.com>\n","repos":"analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- network.c\n+++ network.c\n@@ -641,7 +641,7 @@\n static int network_open(const struct iio_device *dev,\n \t\tsize_t samples_count, bool cyclic)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \tstruct iio_device_pdata *ppdata = dev->pdata;\n \tint ret = -EBUSY;\n \n@@ -696,6 +696,7 @@\n \n static int network_close(const struct iio_device *dev)\n {\n+\tstruct iio_context_pdata *ctx_pdata = iio_context_get_pdata(dev->ctx);\n \tstruct iio_device_pdata *pdata = dev->pdata;\n \tint ret = -EBADF;\n \n@@ -704,7 +705,7 @@\n \tif (pdata->io_ctx.fd >= 0) {\n \t\tif (!pdata->io_ctx.cancelled) {\n \t\t\tret = iiod_client_close_unlocked(\n-\t\t\t\t\tdev->ctx->pdata->iiod_client,\n+\t\t\t\t\tctx_pdata->iiod_client,\n \t\t\t\t\t&pdata->io_ctx, dev);\n \n \t\t\twrite_command(&pdata->io_ctx, \"\\r\\nEXIT\\r\\n\");\n@@ -735,11 +736,12 @@\n static ssize_t network_read(const struct iio_device *dev, void *dst, size_t len,\n \t\tuint32_t *mask, size_t words)\n {\n+\tstruct iio_context_pdata *ctx_pdata = iio_context_get_pdata(dev->ctx);\n \tstruct iio_device_pdata *pdata = dev->pdata;\n \tssize_t ret;\n \n \tiio_mutex_lock(pdata->lock);\n-\tret = iiod_client_read_unlocked(dev->ctx->pdata->iiod_client,\n+\tret = iiod_client_read_unlocked(ctx_pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, dst, len, mask, words);\n \tiio_mutex_unlock(pdata->lock);\n \n@@ -749,11 +751,12 @@\n static ssize_t network_write(const struct iio_device *dev,\n \t\tconst void *src, size_t len)\n {\n+\tstruct iio_context_pdata *ctx_pdata = iio_context_get_pdata(dev->ctx);\n \tstruct iio_device_pdata *pdata = dev->pdata;\n \tssize_t ret;\n \n \tiio_mutex_lock(pdata->lock);\n-\tret = iiod_client_write_unlocked(dev->ctx->pdata->iiod_client,\n+\tret = iiod_client_write_unlocked(ctx_pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, src, len);\n \tiio_mutex_unlock(pdata->lock);\n \n@@ -1074,7 +1077,7 @@\n static ssize_t network_read_dev_attr(const struct iio_device *dev,\n \t\tconst char *attr, char *dst, size_t len, enum iio_attr_type type)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \n \treturn iiod_client_read_attr(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, NULL, attr, dst, len, type);\n@@ -1083,7 +1086,7 @@\n static ssize_t network_write_dev_attr(const struct iio_device *dev,\n \t\tconst char *attr, const char *src, size_t len, enum iio_attr_type type)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \n \treturn iiod_client_write_attr(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, NULL, attr, src, len, type);\n@@ -1092,7 +1095,7 @@\n static ssize_t network_read_chn_attr(const struct iio_channel *chn,\n \t\tconst char *attr, char *dst, size_t len)\n {\n-\tstruct iio_context_pdata *pdata = chn->dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(chn->dev->ctx);\n \n \treturn iiod_client_read_attr(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, chn->dev, chn, attr, dst, len, false);\n@@ -1101,7 +1104,7 @@\n static ssize_t network_write_chn_attr(const struct iio_channel *chn,\n \t\tconst char *attr, const char *src, size_t len)\n {\n-\tstruct iio_context_pdata *pdata = chn->dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(chn->dev->ctx);\n \n \treturn iiod_client_write_attr(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, chn->dev, chn, attr, src, len, false);\n@@ -1110,7 +1113,7 @@\n static int network_get_trigger(const struct iio_device *dev,\n \t\tconst struct iio_device **trigger)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \n \treturn iiod_client_get_trigger(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, trigger);\n@@ -1119,7 +1122,7 @@\n static int network_set_trigger(const struct iio_device *dev,\n \t\tconst struct iio_device *trigger)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \n \treturn iiod_client_set_trigger(pdata->iiod_client,\n \t\t\t&pdata->io_ctx, dev, trigger);\n@@ -1127,7 +1130,7 @@\n \n static void network_shutdown(struct iio_context *ctx)\n {\n-\tstruct iio_context_pdata *pdata = ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(ctx);\n \tunsigned int i;\n \n \tiiod_client_mutex_lock(pdata->iiod_client);\n@@ -1153,8 +1156,10 @@\n static int network_get_version(const struct iio_context *ctx,\n \t\tunsigned int *major, unsigned int *minor, char git_tag[8])\n {\n-\treturn iiod_client_get_version(ctx->pdata->iiod_client,\n-\t\t\t&ctx->pdata->io_ctx, major, minor, git_tag);\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(ctx);\n+\n+\treturn iiod_client_get_version(pdata->iiod_client,\n+\t\t\t&pdata->io_ctx, major, minor, git_tag);\n }\n \n static unsigned int calculate_remote_timeout(unsigned int timeout)\n@@ -1166,7 +1171,7 @@\n \n static int network_set_timeout(struct iio_context *ctx, unsigned int timeout)\n {\n-\tstruct iio_context_pdata *pdata = ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(ctx);\n \tint ret, fd = pdata->io_ctx.fd;\n \n \tret = set_socket_timeout(fd, timeout);\n@@ -1189,7 +1194,7 @@\n static int network_set_kernel_buffers_count(const struct iio_device *dev,\n \t\tunsigned int nb_blocks)\n {\n-\tstruct iio_context_pdata *pdata = dev->ctx->pdata;\n+\tstruct iio_context_pdata *pdata = iio_context_get_pdata(dev->ctx);\n \n \treturn iiod_client_set_kernel_buffers_count(pdata->iiod_client,\n \t\t\t &pdata->io_ctx, dev, nb_blocks);\n"} {"commit":"4eca78b5c3ee689425e3a547e7d2bdd246b89f43","subject":"Fix LZ4_compress_fast_continue() docs","message":"Fix LZ4_compress_fast_continue() docs\n\nFixes #549.\n","repos":"unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso,unknownbrackets\/maxcso","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lib\/lz4.h\n+++ lib\/lz4.h\n@@ -266,7 +266,7 @@\n * 'dst' buffer must be already allocated.\n * If dstCapacity >= LZ4_compressBound(srcSize), compression is guaranteed to succeed, and runs faster.\n *\n- * Important : The previous 64KB of compressed data is assumed to remain present and unmodified in memory!\n+ * Important : The previous 64KB of source data is assumed to remain present and unmodified in memory!\n *\n * Special 1 : When input is a double-buffer, they can have any size, including < 64 KB.\n * Make sure that buffers are separated by at least one byte.\n"} {"commit":"1d61ab686efe27405239fea245e50933f6c02dea","subject":"Missing end of comment","message":"Missing end of comment\n","repos":"andcor02\/mbed-os,betzw\/mbed-os,kjbracey-arm\/mbed,c1728p9\/mbed-os,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,kjbracey-arm\/mbed,mbedmicro\/mbed,c1728p9\/mbed-os,c1728p9\/mbed-os,mbedmicro\/mbed,betzw\/mbed-os,mbedmicro\/mbed,andcor02\/mbed-os,andcor02\/mbed-os,andcor02\/mbed-os,kjbracey-arm\/mbed,betzw\/mbed-os,c1728p9\/mbed-os,c1728p9\/mbed-os,betzw\/mbed-os,betzw\/mbed-os,c1728p9\/mbed-os,kjbracey-arm\/mbed,betzw\/mbed-os,mbedmicro\/mbed","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- features\/nfc\/nfc\/NFCEEPROMDriver.h\n+++ features\/nfc\/nfc\/NFCEEPROMDriver.h\n@@ -42,7 +42,7 @@\n \n virtual void reset() = 0;\n virtual size_t get_max_size() = 0;\n- virtual void start_session() = 0; \/\/ This could lock the chip i\n+ virtual void start_session() = 0; \/\/ This could lock the chip's RF interface\n virtual void end_session() = 0;\n virtual void read_bytes(uint32_t address, size_t count) = 0;\n virtual void write_bytes(uint32_t address, const uint8_t* bytes, size_t count) = 0;\n"} {"commit":"59ae4e65512f479f49232e6e7c8ca68fc54218f0","subject":"remove redundant error messages","message":"remove redundant error messages\n","repos":"dbitbox\/mcu,jonasschnelli\/mcu,jonasschnelli\/mcu,dbitbox\/mcu,lclc\/mcu,jonasschnelli\/mcu,dbitbox\/mcu,lclc\/mcu,lclc\/mcu,dbitbox\/mcu,lclc\/mcu","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- commander.c\n+++ commander.c\n@@ -472,6 +472,7 @@\n commander_fill_report(\"input\", \"Could not decrypt. \"\r\n \"Too many access errors will cause the device to reset. \", ERROR);\r\n memory_delay_iterate(1);\r\n+\t\treturn NULL;\r\n } else {\r\n memset(json_token, 0, sizeof(jsmntok_t) * MAX_TOKENS);\r\n n = jsmn_parse_init(command, command_len, json_token, MAX_TOKENS);\r\n@@ -812,6 +813,10 @@\n \/\/ Must free() returned value\r\n char *aes_cbc_b64_decrypt(const unsigned char *in, int inlen, int *decrypt_len, PASSWORD_ID id)\r\n {\r\n+\tif (!in || inlen == 0) {\r\n+\t\treturn NULL;\r\n+\t}\r\n+\t\r\n \/\/ unbase64\r\n int ub64len;\r\n unsigned char *ub64 = unbase64((char *)in, inlen, &ub64len);\r\n"} {"commit":"018608ae1850ecd2e69ffcf55f1e33be7335f83c","subject":"Update RingRayLib - raylib.c - Add Function : unsigned int TextCountCodepoints(const char *text)","message":"Update RingRayLib - raylib.c - Add Function : unsigned int TextCountCodepoints(const char *text)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"52418544f87325cc32e892a02ade6777d965f964","subject":"Tweak the maximum search steps of 3d pathfinding to meet a blance between searching time and result.","message":"Tweak the maximum search steps of 3d pathfinding to meet a blance between searching time and result.","repos":"williampma\/opencog,kim135797531\/opencog,gavrieltal\/opencog,rodsol\/atomspace,rodsol\/atomspace,AmeBel\/opencog,sanuj\/opencog,anitzkin\/opencog,Tiggels\/opencog,AmeBel\/opencog,Selameab\/atomspace,roselleebarle04\/opencog,tim777z\/opencog,AmeBel\/atomspace,gaapt\/opencog,cosmoharrigan\/opencog,Selameab\/opencog,sanuj\/opencog,prateeksaxena2809\/opencog,printedheart\/atomspace,gavrieltal\/opencog,misgeatgit\/atomspace,misgeatgit\/atomspace,anitzkin\/opencog,andre-senna\/opencog,AmeBel\/opencog,MarcosPividori\/atomspace,printedheart\/opencog,shujingke\/opencog,jlegendary\/opencog,printedheart\/opencog,inflector\/opencog,ceefour\/opencog,ceefour\/opencog,cosmoharrigan\/atomspace,eddiemonroe\/atomspace,zhaozengguang\/opencog,iAMr00t\/opencog,Allend575\/opencog,virneo\/opencog,virneo\/opencog,cosmoharrigan\/opencog,UIKit0\/atomspace,anitzkin\/opencog,ArvinPan\/opencog,zhaozengguang\/opencog,ceefour\/atomspace,AmeBel\/opencog,kinoc\/opencog,inflector\/opencog,Selameab\/atomspace,AmeBel\/atomspace,misgeatgit\/opencog,sanuj\/opencog,andre-senna\/opencog,Selameab\/opencog,tim777z\/opencog,misgeatgit\/opencog,virneo\/opencog,TheNameIsNigel\/opencog,yantrabuddhi\/opencog,Allend575\/opencog,rodsol\/opencog,AmeBel\/opencog,iAMr00t\/opencog,kinoc\/opencog,sumitsourabh\/opencog,printedheart\/atomspace,rodsol\/atomspace,roselleebarle04\/opencog,kim135797531\/opencog,iAMr00t\/opencog,zhaozengguang\/opencog,gavrieltal\/opencog,ceefour\/opencog,TheNameIsNigel\/opencog,cosmoharrigan\/opencog,rohit12\/opencog,shujingke\/opencog,ceefour\/opencog,yantrabuddhi\/opencog,Tiggels\/opencog,Tiggels\/opencog,kim135797531\/opencog,ruiting\/opencog,roselleebarle04\/opencog,Tiggels\/opencog,printedheart\/atomspace,andre-senna\/opencog,TheNameIsNigel\/opencog,inflector\/opencog,Selameab\/opencog,kinoc\/opencog,rohit12\/atomspace,kinoc\/opencog,virneo\/opencog,jlegendary\/opencog,eddiemonroe\/atomspace,gavrieltal\/opencog,prateeksaxena2809\/opencog,Selameab\/opencog,ceefour\/atomspace,ArvinPan\/opencog,eddiemonroe\/opencog,rohit12\/atomspace,ArvinPan\/opencog,sumitsourabh\/opencog,Allend575\/opencog,ArvinPan\/opencog,Selameab\/atomspace,anitzkin\/opencog,ceefour\/atomspace,rohit12\/atomspace,sumitsourabh\/opencog,kim135797531\/opencog,ruiting\/opencog,rTreutlein\/atomspace,cosmoharrigan\/opencog,sanuj\/opencog,UIKit0\/atomspace,kim135797531\/opencog,misgeatgit\/opencog,TheNameIsNigel\/opencog,ArvinPan\/opencog,virneo\/atomspace,ruiting\/opencog,eddiemonroe\/opencog,Tiggels\/opencog,prateeksaxena2809\/opencog,ArvinPan\/atomspace,virneo\/atomspace,AmeBel\/opencog,prateeksaxena2809\/opencog,MarcosPividori\/atomspace,prateeksaxena2809\/opencog,iAMr00t\/opencog,ArvinPan\/atomspace,inflector\/atomspace,ceefour\/opencog,sumitsourabh\/opencog,misgeatgit\/opencog,cosmoharrigan\/opencog,AmeBel\/atomspace,inflector\/atomspace,jswiergo\/atomspace,ruiting\/opencog,kim135797531\/opencog,misgeatgit\/opencog,andre-senna\/opencog,inflector\/atomspace,tim777z\/opencog,gavrieltal\/opencog,misgeatgit\/opencog,Selameab\/atomspace,williampma\/atomspace,rohit12\/opencog,gaapt\/opencog,rohit12\/opencog,rTreutlein\/atomspace,misgeatgit\/opencog,Selameab\/opencog,eddiemonroe\/opencog,tim777z\/opencog,sumitsourabh\/opencog,ceefour\/opencog,ArvinPan\/atomspace,kinoc\/opencog,zhaozengguang\/opencog,Allend575\/opencog,andre-senna\/opencog,eddiemonroe\/opencog,virneo\/opencog,cosmoharrigan\/atomspace,inflector\/opencog,jlegendary\/opencog,yantrabuddhi\/opencog,sanuj\/opencog,ArvinPan\/atomspace,virneo\/opencog,inflector\/atomspace,williampma\/atomspace,virneo\/opencog,roselleebarle04\/opencog,rodsol\/opencog,misgeatgit\/atomspace,roselleebarle04\/opencog,anitzkin\/opencog,kim135797531\/opencog,eddiemonroe\/atomspace,tim777z\/opencog,prateeksaxena2809\/opencog,gavrieltal\/opencog,misgeatgit\/atomspace,yantrabuddhi\/atomspace,williampma\/atomspace,sumitsourabh\/opencog,AmeBel\/atomspace,rodsol\/opencog,rohit12\/atomspace,eddiemonroe\/opencog,shujingke\/opencog,virneo\/atomspace,cosmoharrigan\/atomspace,AmeBel\/opencog,printedheart\/opencog,printedheart\/atomspace,inflector\/opencog,anitzkin\/opencog,kinoc\/opencog,printedheart\/opencog,gaapt\/opencog,williampma\/opencog,williampma\/opencog,misgeatgit\/opencog,tim777z\/opencog,sumitsourabh\/opencog,rohit12\/opencog,printedheart\/opencog,yantrabuddhi\/opencog,AmeBel\/atomspace,TheNameIsNigel\/opencog,cosmoharrigan\/atomspace,gaapt\/opencog,prateeksaxena2809\/opencog,MarcosPividori\/atomspace,gaapt\/opencog,gaapt\/opencog,williampma\/opencog,printedheart\/opencog,yantrabuddhi\/opencog,eddiemonroe\/atomspace,williampma\/opencog,gaapt\/opencog,jlegendary\/opencog,virneo\/atomspace,ceefour\/atomspace,Allend575\/opencog,UIKit0\/atomspace,misgeatgit\/opencog,inflector\/opencog,inflector\/opencog,williampma\/opencog,eddiemonroe\/opencog,yantrabuddhi\/atomspace,jlegendary\/opencog,rTreutlein\/atomspace,rodsol\/opencog,yantrabuddhi\/opencog,zhaozengguang\/opencog,rTreutlein\/atomspace,rodsol\/opencog,rohit12\/opencog,iAMr00t\/opencog,yantrabuddhi\/atomspace,Allend575\/opencog,ArvinPan\/opencog,Tiggels\/opencog,andre-senna\/opencog,yantrabuddhi\/atomspace,roselleebarle04\/opencog,shujingke\/opencog,inflector\/atomspace,roselleebarle04\/opencog,anitzkin\/opencog,MarcosPividori\/atomspace,rohit12\/opencog,iAMr00t\/opencog,ruiting\/opencog,Selameab\/opencog,shujingke\/opencog,eddiemonroe\/opencog,jlegendary\/opencog,cosmoharrigan\/opencog,sanuj\/opencog,yantrabuddhi\/atomspace,andre-senna\/opencog,williampma\/atomspace,kinoc\/opencog,ceefour\/opencog,rodsol\/atomspace,yantrabuddhi\/opencog,inflector\/opencog,rTreutlein\/atomspace,UIKit0\/atomspace,jswiergo\/atomspace,jswiergo\/atomspace,gavrieltal\/opencog,jswiergo\/atomspace,shujingke\/opencog,eddiemonroe\/atomspace,zhaozengguang\/opencog,ruiting\/opencog,misgeatgit\/atomspace,shujingke\/opencog,TheNameIsNigel\/opencog,Allend575\/opencog,ruiting\/opencog,rodsol\/opencog,jlegendary\/opencog","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- opencog\/spatial\/AStar3DController.h\n+++ opencog\/spatial\/AStar3DController.h\n@@ -28,12 +28,12 @@\n * A* 3d pathfinding functionality\n *\n * Current implementation uses LocalSpaceMap2D for map\n- * LSMap2DSearchNode implements functionality specific to LocalSpaceMap2D\n+ * LSMap3DSearchNode implements functionality specific to LocalSpaceMap2D\n * stlastar.h (and fsa.h) contains generic astar algorithm implementation\n * Currently, start and goal coordinates are based on gridpoints,\n- * solution path movement is in 8 directions--horizontal, vertical, diagonal\n+ * solution path movement is in 10 directions--horizontal, vertical, diagonal,\n+ * up and down.\n *\n- * See AStarTest.cc for example usage\n *\n * General usage:\n * AStar3DController asc;\n@@ -53,7 +53,7 @@\n \n #include <opencog\/spatial\/LSMap3DSearchNode.h>\n \n-#define MAX_SEARCH_NODES 20000\n+#define MAX_SEARCH_NODES 5000\n #define DEBUG_LISTS 0\n #define DEBUG_LIST_LENGTHS_ONLY 0\n #define DISPLAY_SOLUTION 0\n"} {"commit":"44a0dedc0a27344d7973a8d05bf38bd0a31dff59","subject":"r3104| double dragon3 dragon stone was passing load knife in level 3-2, where a number is expected instead. interestingly, this crashed only in debug mode. i added a number of checks... if someone volunteers, theres still a lot of atois and atofs left for you","message":"r3104| double dragon3 dragon stone was passing load knife in level 3-2, where a number is expected instead. interestingly, this crashed only in debug mode. i added a number of checks... if someone volunteers, theres still a lot of atois and atofs left for you\n","repos":"rofl0r\/openbor,lantus\/openbor,rofl0r\/openbor,lantus\/openbor,rofl0r\/openbor,lantus\/openbor,lantus\/openbor,rofl0r\/openbor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- openbor.c\n+++ openbor.c\n@@ -2217,6 +2217,42 @@\n \r\n \/\/ ----------------------- General ------------------------------\r\n \r\n+int isNumeric(char* text) {\r\n+\tchar* p = text;\r\n+\tassert(p);\r\n+\tif(!*p) return 0;\r\n+\t\/\/assert(*p);\r\n+\twhile(*p) {\r\n+\t\tswitch (*p) {\r\n+\t\t\tcase '0': case '1': case '2': case '3': case '4':\r\n+\t\t\tcase '5': case '6': case '7': case '8': case '9':\r\n+\t\t\t\tp++;\r\n+\t\t\t\tbreak;\r\n+\t\t\tdefault:\r\n+\t\t\t\treturn 0;\r\n+\t\t}\r\n+\t}\r\n+\treturn 1;\r\n+}\r\n+\r\n+int isFloat(char* text) {\r\n+\tchar* p = text;\r\n+\tassert(p);\r\n+\tif(!*p) return 0;\r\n+\t\/\/assert(*p);\r\n+\twhile(*p) {\r\n+\t\tswitch (*p) {\r\n+\t\t\tcase '0': case '1': case '2': case '3': case '4':\r\n+\t\t\tcase '5': case '6': case '7': case '8': case '9': case '.':\r\n+\t\t\t\tp++;\r\n+\t\t\t\tbreak;\r\n+\t\t\tdefault:\r\n+\t\t\t\treturn 0;\r\n+\t\t}\r\n+\t}\r\n+\treturn 1;\r\n+}\r\n+\r\n char *findarg(char *command, int which){\r\n int d;\r\n int argc;\r\n@@ -3909,6 +3945,7 @@\n static void _readbarstatus(char*, s_barstatus*);\r\n s_model* load_cached_model(char * name, char * owner, char unload)\r\n {\r\n+\tstatic const char* WARN_NUMBER_EXPECTED = \"WARNING: %s tries to load a nonnumeric value, where a number is expected!\\nerroneus string: %s\\n\";\r\n \ts_model_list *curr = NULL,\r\n \t*head = NULL;\r\n \r\n@@ -3976,6 +4013,8 @@\n \t*pattack = NULL;\r\n \r\n \ts_drawmethod drawmethod;\r\n+\t\r\n+\tchar* save; \/\/ you can use it wherever you like...\r\n \r\n \tunsigned char mapflag[MAX_COLOUR_MAPS]; \/\/ in 24bit mode, we need to know whether a colourmap is a common map or a palette\r\n \r\n@@ -4407,39 +4446,90 @@\n \t\t}\r\n \t\telse if(stricmp(command, \"stats\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->stats[atoi(value)] = atof(findarg(buf+pos, 2));\r\n+\t\t\tsave = findarg(buf+pos, 2);\r\n+\t\t\tif(isNumeric(value) && isFloat(save)) {\r\n+\t\t\t\tnewchar->stats[atoi(value)] = atof(save);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"health\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->health = atoi(value);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tnewchar->health = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"scroll\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->scroll = atof(value);\r\n+\t\t\tif(isFloat(value))\r\n+\t\t\t\tnewchar->scroll = atof(value);\r\n+\t\t\telse\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n \t\t}\r\n \t\t\/\/Left for backward compatability. See mpset.\r\n \t\telse if(stricmp(command, \"mp\")==0){\/\/ mp values to put max mp for player by tails\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->mp = atoi(value);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tnewchar->mp = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"nolife\")==0){ \/\/ Feb 25, 2005 - Flag to display enemy life or not\r\n-\t\t\tnewchar->nolife = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tnewchar->nolife = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"makeinv\")==0){ \/\/ Mar 12, 2005 - If a value is supplied, corresponds to amount of time the player spawns invincible\r\n-\t\t\tnewchar->makeinv = atoi(findarg(buf+pos, 1)) * GAME_SPEED;\r\n-\t\t\tif(atoi(findarg(buf+pos, 2))) newchar->makeinv = -newchar->makeinv;\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tnewchar->makeinv = atoi(value) * GAME_SPEED;\r\n+\t\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\t\tif(atoi(value)) newchar->makeinv = -newchar->makeinv;\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\t\t\t\t\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"riseinv\")==0){\r\n \t\t\tnewchar->riseinv = atoi(findarg(buf+pos, 1)) * GAME_SPEED;\r\n-\t\t\tif(atoi(findarg(buf+pos, 2))) newchar->riseinv = -newchar->riseinv;\r\n+\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tif(atoi(value)) newchar->riseinv = -newchar->riseinv;\r\n+\t\t\t}\r\n+\t\t\telse {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"load\")==0){\r\n \t\t\tstrncpy(load_name, findarg(buf+pos, 1), MAX_NAME_LEN);\r\n-\t\t\tload_cached_model(load_name, name, atoi(findarg(buf+pos, 2)));\r\n+\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\tif(isNumeric(value))\r\n+\t\t\t\tload_cached_model(load_name, name, atoi(value));\r\n+\t\t\telse\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n \t\t}\r\n \t\telse if(stricmp(command, \"score\")==0){\r\n-\t\t\tnewchar->score = atoi(findarg(buf+pos, 1));\r\n-\t\t\tnewchar->multiple = atoi(findarg(buf+pos, 2));\t\t\t\/\/ New var multiple for force\/scoring\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif(isNumeric(value)) {\r\n+\t\t\t\tnewchar->score = atoi(value);\r\n+\t\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->multiple = atoi(value);\t\t\t\/\/ New var multiple for force\/scoring\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"smartbomb\")==0){ \/\/smartbomb now use a normal attack box\r\n \t\t\tif(!newchar->smartbomb)\r\n@@ -4448,8 +4538,18 @@\n \t\t\t\t*(newchar->smartbomb) = emptyattack;\r\n \t\t\t}\r\n \t\t\telse shutdown(1, \"Model '%s' has multiple smartbomb commands defined.\", filename);\r\n-\t\t\tnewchar->smartbomb->attack_force = atoi(findarg(buf+pos, 1));\t\t\t\/\/ Special force\r\n-\t\t\tnewchar->smartbomb->attack_type = atoi(findarg(buf+pos, 2));\t\t\t\/\/ Special attack type\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->smartbomb->attack_force = atoi(value);\t\t\t\/\/ Special force\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n+\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->smartbomb->attack_type = atoi(value);\t\/\/ Special attack type\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t\tnewchar->smartbomb->attack_drop = 1; \/\/by default\r\n \t\t\tnewchar->smartbomb->dropv[0] = 3;\r\n \t\t\tif(newchar->smartbomb->attack_type==ATK_BLAST)\r\n@@ -4473,31 +4573,70 @@\n \t\t\t}\r\n \t\t\tif(newchar->type == TYPE_ITEM)\r\n \t\t\t{\r\n-\t\t\t\tnewchar->dofreeze = 0;\t\t\t\t\t\t\t\t\/\/ Items don't animate\r\n-\t\t\t\tnewchar->smartbomb->freezetime = atoi(findarg(buf+pos, 3)) * GAME_SPEED;\r\n+\t\t\t\tnewchar->dofreeze = 0;\t\/\/ Items don't animate\r\n+\t\t\t\tvalue = findarg(buf+pos, 3);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->smartbomb->freezetime = atoi(value) * GAME_SPEED;\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\r\n \t\t\t}\r\n \t\t\telse\r\n \t\t\t{\r\n-\t\t\t\tnewchar->dofreeze = atoi(findarg(buf+pos, 3));\t\t\/\/ Are all animations frozen during special\r\n-\t\t\t\tnewchar->smartbomb->freezetime = atoi(findarg(buf+pos, 4)) * GAME_SPEED;\r\n+\t\t\t\tvalue = findarg(buf+pos, 3);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->dofreeze = atoi(value);\t\t\/\/ Are all animations frozen during special\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\r\n+\t\t\t\tvalue = findarg(buf+pos, 4);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->smartbomb->freezetime = atoi(value) * GAME_SPEED;\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\r\n \t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"bounce\")==0){\t\t\t\t\t\t\/\/ Flag to determine if bounce\/quake is to be used.\r\n-\t\t\tnewchar->bounce = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->bounce = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"noquake\")==0){\t\t\t\t\t\/\/ Mar 12, 2005 - Flag to determine if entity shakes screen\r\n-\t\t\tnewchar->noquake = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\t\t\t\t\r\n+\t\t\t\tnewchar->noquake = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"blockback\")==0){\t\t\t\t\t\/\/ Flag to determine if attacks can be blocked from behind\r\n-\t\t\tnewchar->blockback = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->blockback = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"hitenemy\")==0){\t\t\t\t\t\/\/ Flag to determine if an enemy projectile will hit enemies\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tif(atoi(value) == 1)\r\n-\t\t\tnewchar->candamage = newchar->hostile = TYPE_PLAYER | TYPE_ENEMY;\r\n-\t\t\telse if(atoi(value) == 2)\r\n-\t\t\tnewchar->candamage = newchar->hostile = TYPE_PLAYER;\r\n-\t\t\tnewchar->ground = atoi(findarg(buf+pos, 2)); \/\/ Added to determine if enemies are damaged with mid air projectiles or ground only\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tif(atoi(value) == 1)\r\n+\t\t\t\t\tnewchar->candamage = newchar->hostile = TYPE_PLAYER | TYPE_ENEMY;\r\n+\t\t\t\telse if(atoi(value) == 2)\r\n+\t\t\t\t\tnewchar->candamage = newchar->hostile = TYPE_PLAYER;\r\n+\t\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->ground = atoi(value); \/\/ Added to determine if enemies are damaged with mid air projectiles or ground only\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"hostile\")==0){\r\n \t\t\ti = 1;\r\n@@ -4639,58 +4778,132 @@\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_wall\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_wall = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_wall = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_hole\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_hole = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_hole = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_platform\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_platform = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_platform = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_obstacle\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_obstacle = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_obstacle = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_gravity\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_gravity = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_gravity = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_screen\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_screen = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_screen = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_minz\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_minz = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_minz = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"subject_to_maxz\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->subject_to_maxz = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->subject_to_maxz = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"no_adjust_base\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->no_adjust_base = (0!=atoi(findarg(buf+pos, 1)));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->no_adjust_base = (0!=atoi(value));\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"instantitemdeath\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->instantitemdeath = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->instantitemdeath = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"secret\")==0){\r\n-\t\t\tnewchar->secret = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->secret = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"modelflag\")==0){ \/\/ model copy flag\r\n-\t\t\tnewchar->model_flag = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->model_flag = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\t\/\/ weapons\r\n \t\telse if(stricmp(command, \"weaploss\")==0){\r\n-\t\t\tnewchar->weaploss[0] = atoi(findarg(buf+pos, 1));\r\n-\t\t\tnewchar->weaploss[1] = atoi(findarg(buf+pos, 2));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->weaploss[0] = atoi(value);\r\n+\t\t\t\tvalue = findarg(buf+pos, 2);\r\n+\t\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\t\tnewchar->weaploss[1] = atoi(value);\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\t}\t\t\t\t\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"weapnum\")==0){\r\n-\t\t\tnewchar->weapnum = atoi(findarg(buf+pos, 1));\r\n-\t\t}\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->weapnum = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t}\r\n \t\telse if(stricmp(command, \"project\")==0){ \/\/ New projectile subtype\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n \t\t\tif(stricmp(value, \"none\")==0) newchar->project = -1;\r\n@@ -4718,19 +4931,44 @@\n \t\t}\r\n \t\t\/\/here weapons things like shoot rest type of weapon ect..by tails\r\n \t\telse if(stricmp(command, \"shootnum\")==0){\r\n-\t\t\tnewchar->shootnum = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->shootnum = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"reload\")==0){\r\n-\t\t\tnewchar->reload = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->reload = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"typeshot\")==0){\r\n-\t\t\tnewchar->typeshot = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->typeshot = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"counter\")==0){\r\n-\t\t\tnewchar->counter = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->counter = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"animal\")==0){\r\n-\t\t\tnewchar->animal = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->animal = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\t\/\/ end weapons\r\n \t\telse if(stricmp(command, \"rider\")==0){\r\n@@ -4794,72 +5032,141 @@\n \t\t}\r\n \t\telse if(stricmp(command, \"cantgrab\")==0 ||\r\n \t\t\tstricmp(command, \"notgrab\")==0){\r\n-\t\t\ttempInt = atoi(findarg(buf+pos, 1));\r\n-\t\t\tif(tempInt == 2) newchar->grabforce = -999999;\r\n-\t\t\telse newchar->antigrab = 1;\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\ttempInt = atoi(value);\r\n+\t\t\t\tif(tempInt == 2) newchar->grabforce = -999999;\r\n+\t\t\t\telse newchar->antigrab = 1;\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t\tnewchar->antigrab = 1;\r\n+\t\t\t}\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"antigrab\")==0) \/\/ a can grab b: a->antigrab - b->grabforce <=0\r\n \t\t{\r\n-\t\t\tnewchar->antigrab = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->antigrab = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"grabforce\")==0)\r\n \t\t{\r\n-\t\t\tnewchar->grabforce = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->grabforce = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"grabback\")==0){\r\n-\t\t\tnewchar->grabback = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->grabback = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"offscreenkill\")==0){\r\n-\t\t\tnewchar->offscreenkill = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->offscreenkill = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"falldie\")==0 ||\r\n \t\t\tstricmp(command, \"death\")==0){\r\n-\t\t\tnewchar->falldie = atoi(findarg(buf+pos, 1));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->falldie = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\t\t\t\r\n \t\t}\r\n \t\telse if(stricmp(command, \"speed\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->speed = atof(value);\r\n-\t\t\tnewchar->speed \/= 10;\r\n-\t\t\tif(newchar->speed < 0.5) newchar->speed = 0.5;\r\n-\t\t\tif(newchar->speed > 30) newchar->speed = 30;\r\n+\t\t\tif (isFloat(value)) {\r\n+\t\t\t\tnewchar->speed = atof(value);\r\n+\t\t\t\tnewchar->speed \/= 10;\r\n+\t\t\t\tif(newchar->speed < 0.5) newchar->speed = 0.5;\r\n+\t\t\t\tif(newchar->speed > 30) newchar->speed = 30;\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"speedf\")==0){ \/\/ float speed\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->speed = atof(value);\r\n+\t\t\tif (isFloat(value)) {\r\n+\t\t\t\tnewchar->speed = atof(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"jumpspeed\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->jumpspeed = atof(value);\r\n-\t\t\tnewchar->jumpspeed \/= 10;\r\n+\t\t\tif (isFloat(value)) {\r\n+\t\t\t\tnewchar->jumpspeed = atof(value);\r\n+\t\t\t\tnewchar->jumpspeed \/= 10;\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"jumpspeedf\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->jumpspeed = atof(value);\r\n+\t\t\tif (isFloat(value)) {\t\t\t\t\r\n+\t\t\t\tnewchar->jumpspeed = atof(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"antigravity\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->antigravity = atof(value);\r\n-\t\t\tnewchar->antigravity \/= 100;\r\n+\t\t\tif (isFloat(value)) {\r\n+\t\t\t\tnewchar->antigravity = atof(value);\r\n+\t\t\t\tnewchar->antigravity \/= 100;\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"stealth\")==0){\r\n-\t\t\tnewchar->stealth[0] = atoi(findarg(buf+pos, 1));\r\n-\t\t\tnewchar->stealth[1] = atoi(findarg(buf+pos, 2));\r\n+\t\t\tvalue = findarg(buf+pos, 1);\r\n+\t\t\tsave = findarg(buf+pos, 2);\r\n+\t\t\tif (isNumeric(value) && isNumeric(save)) {\r\n+\t\t\t\tnewchar->stealth[0] = atoi(value);\r\n+\t\t\t\tnewchar->stealth[1] = atoi(save);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"jugglepoints\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->jugglepoints[0] = atoi(value);\r\n-\t\t\tnewchar->jugglepoints[1] = atoi(value);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->jugglepoints[0] = atoi(value);\r\n+\t\t\t\tnewchar->jugglepoints[1] = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"riseattacktype\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->riseattacktype = atoi(value);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->riseattacktype = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n \t\telse if(stricmp(command, \"guardpoints\")==0){\r\n \t\t\tvalue = findarg(buf+pos, 1);\r\n-\t\t\tnewchar->guardpoints[0] = atoi(value);\r\n-\t\t\tnewchar->guardpoints[1] = atoi(value);\r\n+\t\t\tif (isNumeric(value)) {\r\n+\t\t\t\tnewchar->guardpoints[0] = atoi(value);\r\n+\t\t\t\tnewchar->guardpoints[1] = atoi(value);\r\n+\t\t\t} else {\r\n+\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, value);\r\n+\t\t\t}\r\n \t\t}\r\n-\r\n+\/\/ok, i'm not gonna touch your code.\r\n #define tempdef(x, y, z, p, k, b, t, r, e) \\\r\n x(stricmp(value, #y)==0)\\\r\n {\\\r\n@@ -4893,27 +5200,59 @@\n \t\t\ttempdef(else if, FREEZE, defense_factors, defense_pain, defense_knockdown, defense_blockpower, defense_blockthreshold, defense_blockratio, defense_blocktype)\r\n \t\t\telse if(strnicmp(value, \"normal\", 6)==0)\r\n \t\t\t{\r\n-\t\t\t\ttempInt = atoi(value+6);\r\n-\t\t\t\tif(tempInt<11) tempInt = 11;\r\n-\t\t\t\tnewchar->defense_factors[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 2));\r\n-\t\t\t\tnewchar->defense_pain[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 3));\r\n-\t\t\t\tnewchar->defense_knockdown[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 4));\r\n-\t\t\t\tnewchar->defense_blockpower[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 5));\r\n-\t\t\t\tnewchar->defense_blockthreshold[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 6));\r\n-\t\t\t\tnewchar->defense_blockratio[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 7));\r\n-\t\t\t\tnewchar->defense_blocktype[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 8));\r\n+\t\t\t\tsave = value+6;\r\n+\t\t\t\tif (isNumeric(save)) {\r\n+\t\t\t\t\ttempInt = atoi(save);\r\n+\t\t\t\t\tif(tempInt<11) tempInt = 11;\r\n+\t\t\t\t\tnewchar->defense_factors[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 2));\r\n+\t\t\t\t\tnewchar->defense_pain[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 3));\r\n+\t\t\t\t\tnewchar->defense_knockdown[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 4));\r\n+\t\t\t\t\tnewchar->defense_blockpower[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 5));\r\n+\t\t\t\t\tnewchar->defense_blockthreshold[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 6));\r\n+\t\t\t\t\tnewchar->defense_blockratio[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 7));\r\n+\t\t\t\t\tnewchar->defense_blocktype[tempInt+STA_ATKS-1] = atof(findarg(buf+pos, 8));\r\n+\t\t\t\t} else {\r\n+\t\t\t\t\tprintf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\t\t\t\t}\r\n \t\t\t}\r\n \t\t\telse if(stricmp(value, \"ALL\")==0)\r\n \t\t\t{\r\n \t\t\t\tfor(i=0;i<max_attack_types;i++)\r\n \t\t\t\t{\r\n-\t\t\t\t\tnewchar->defense_factors[i] = atof(findarg(buf+pos, 2));\r\n-\t\t\t\t\tnewchar->defense_pain[i] = atof(findarg(buf+pos, 3));\r\n-\t\t\t\t\tnewchar->defense_knockdown[i] = atof(findarg(buf+pos, 4));\r\n-\t\t\t\t\tnewchar->defense_blockpower[i] = atof(findarg(buf+pos, 5));\r\n-\t\t\t\t\tnewchar->defense_blockthreshold[i] = atof(findarg(buf+pos, 6));\r\n-\t\t\t\t\tnewchar->defense_blockratio[i] = atof(findarg(buf+pos, 7));\r\n-\t\t\t\t\tnewchar->defense_blocktype[i] = atof(findarg(buf+pos, 8));\r\n+\t\t\t\t\tsave = findarg(buf+pos, 2);\r\n+\t\t\t\t\tif (isFloat(save))\r\n+\t\t\t\t\t\tnewchar->defense_factors[i] = atof(save);\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\t\t\t\t\t\r\n+\t\t\t\t\tsave = findarg(buf+pos, 3);\r\n+\t\t\t\t\tif (isFloat(save))\t\t\t\t\t\t\r\n+\t\t\t\t\t\tnewchar->defense_pain[i] = atof(save);\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\r\n+\t\t\t\t\tsave = findarg(buf+pos, 4);\r\n+\t\t\t\t\tif (isFloat(save))\t\t\t\t\t\t\r\n+\t\t\t\t\t\tnewchar->defense_knockdown[i] = atof(findarg(buf+pos, 4));\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\t\t\t\t\t\r\n+\t\t\t\t\tsave = findarg(buf+pos, 5);\r\n+\t\t\t\t\tif (isFloat(save))\r\n+\t\t\t\t\t\tnewchar->defense_blockpower[i] = atof(findarg(buf+pos, 5));\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\r\n+\t\t\t\t\tsave = findarg(buf+pos, 6);\r\n+\t\t\t\t\tif (isFloat(save))\r\n+\t\t\t\t\t\tnewchar->defense_blockthreshold[i] = atof(findarg(buf+pos, 6));\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\t\t\t\t\t\r\n+\t\t\t\t\tsave = findarg(buf+pos, 7);\r\n+\t\t\t\t\tif (isFloat(save))\t\t\t\t\t\t\r\n+\t\t\t\t\t\tnewchar->defense_blockratio[i] = atof(findarg(buf+pos, 7));\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n+\t\t\t\t\t\r\n+\t\t\t\t\tsave = findarg(buf+pos, 8);\r\n+\t\t\t\t\tif (isFloat(save))\t\t\t\t\t\t\r\n+\t\t\t\t\t\tnewchar->defense_blocktype[i] = atof(findarg(buf+pos, 8));\r\n+\t\t\t\t\telse printf(WARN_NUMBER_EXPECTED, filename, save);\r\n \t\t\t\t}\r\n \t\t\t}\r\n \t\t}\r\n@@ -4958,7 +5297,10 @@\n }\r\n #undef tempoff\r\n else if(stricmp(command, \"height\")==0){\r\n- newchar->height = atoi(findarg(buf+pos, 1));\r\n+\t\t value = findarg(buf+pos, 1);\r\n+\t\t if (isNumeric(value))\r\n+\t\t\tnewchar->height = atoi(value);\r\n+\t\t else printf(WARN_NUMBER_EXPECTED, filename, value);\r\n }\r\n else if(stricmp(command, \"jumpheight\")==0){ \/\/ 28-12-2004 if string for jump height found\r\n newchar->jumpheight = atof(findarg(buf+pos, 1));\r\n"} {"commit":"e8050ebbc11faa05ead6d4506157c1c7fcf44023","subject":"fixed linking on Windows","message":"fixed linking on Windows\n","repos":"oktavarium\/qca,karolherbst\/qca,Bjoe\/qca,oktavarium\/qca,karolherbst\/qca,KDE\/qca,KDE\/qca,JoshuaKolden\/qca,JoshuaKolden\/qca,oktavarium\/qca,JoshuaKolden\/qca,karolherbst\/qca,Bjoe\/qca,Bjoe\/qca,karolherbst\/qca,oktavarium\/qca,JoshuaKolden\/qca,KDE\/qca,KDE\/qca,Bjoe\/qca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/QtCrypto\/qca_safetimer.h\n+++ include\/QtCrypto\/qca_safetimer.h\n@@ -22,6 +22,7 @@\n #ifndef QCA_SAFETIMER_H\n #define QCA_SAFETIMER_H\n \n+#include \"qca_export.h\"\n #include <QObject>\n \n class QEvent;\n@@ -29,7 +30,7 @@\n \n namespace QCA {\n \n-class SafeTimer : public QObject\n+class QCA_EXPORT SafeTimer : public QObject\n {\n \tQ_OBJECT\n public:\n"} {"commit":"5a53d6bc3e76f4dd218863bd27ea7ac22807bd01","subject":" * Added ul tag for docomo XHTML1.0 converter.","message":" * Added ul tag for docomo XHTML1.0 converter.\n\n\ngit-svn-id: 5a656d61eb83e8a11bc10c623638a3ef5e8fa3fa@3144 1a406e8e-add9-4483-a2c8-d8cac5b7c224\n","repos":"atkonn\/mod_chxj,atkonn\/mod_chxj,atkonn\/mod_chxj","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"e80f6da91e8b1e462b143f20b276055080fd8b26","subject":"Network backend: Fix errno set to a negative value","message":"Network backend: Fix errno set to a negative value\n\nSigned-off-by: Paul Cercueil <73d292422978d45c9eeef455bb1b24a0db453722@analog.com>\n","repos":"analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio,analogdevicesinc\/libiio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- network.c\n+++ network.c\n@@ -1379,7 +1379,7 @@\n \t\tERROR(\"Unable to find host: %s\\n\", gai_strerror(ret));\n #ifndef _WIN32\n \t\tif (ret != EAI_SYSTEM)\n-\t\t\terrno = ret;\n+\t\t\terrno = -ret;\n #endif\n \t\treturn NULL;\n \t}\n"} {"commit":"4b8e564256d60e901b5049297a389f46bed5a4eb","subject":"Update RingRayLib - raylib.c - Add Function : const char *TextFormat(const char *text)","message":"Update RingRayLib - raylib.c - Add Function : const char *TextFormat(const char *text)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"327c3b682b8c33faaae9a4fa014f384492e9608f","subject":"don't cast at all, even. bugfix","message":"don't cast at all, even. bugfix\n","repos":"cicku\/zmap,djeraseit\/zmap,eacha\/zmap,eacha\/zmap,KeelanArrendale\/zmap,shakenetwork\/zmap,tdi\/zmap,scarito\/zmap-android,scarito\/zmap-android,KeelanArrendale\/zmap,coolacid\/zmap,potatozhao\/zmap,unixfreaxjp\/zmap,willscott\/zmap,scarito\/zmap-android,eacha\/zmap,shakenetwork\/zmap,tdi\/zmap,cicku\/zmap,BobuSumisu\/zmap,cicku\/zmap,scarito\/zmap,shakenetwork\/zmap,zhuyue1314\/zmap,scarito\/zmap,zhuyue1314\/zmap,zhuyue1314\/zmap,tdi\/zmap,unixfreaxjp\/zmap,unixfreaxjp\/zmap,3L3N4\/zmap,BobuSumisu\/zmap,KeelanArrendale\/zmap,willscott\/zmap,KeelanArrendale\/zmap,unixfreaxjp\/zmap,3L3N4\/zmap,coolacid\/zmap,zhuyue1314\/zmap,potatozhao\/zmap,zmap\/zmap,scarito\/zmap,willscott\/zmap,KeelanArrendale\/zmap,3L3N4\/zmap,shakenetwork\/zmap,zhuyue1314\/zmap,zmap\/zmap,shakenetwork\/zmap,tdi\/zmap,djeraseit\/zmap,willscott\/zmap,coolacid\/zmap,potatozhao\/zmap,djeraseit\/zmap,BobuSumisu\/zmap,tdi\/zmap,unixfreaxjp\/zmap,BobuSumisu\/zmap,djeraseit\/zmap,BobuSumisu\/zmap,cicku\/zmap,scarito\/zmap,willscott\/zmap,djeraseit\/zmap,zmap\/zmap,cicku\/zmap,scarito\/zmap-android,potatozhao\/zmap,3L3N4\/zmap,scarito\/zmap,coolacid\/zmap,eacha\/zmap,3L3N4\/zmap,eacha\/zmap,coolacid\/zmap,potatozhao\/zmap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/pbm.c\n+++ lib\/pbm.c\n@@ -22,14 +22,14 @@\n \n static inline int bm_check(uint8_t *bm, uint16_t v)\n {\n-\tuint16_t page_idx = (uint8_t) (v >> 3);\n+\tuint16_t page_idx = (v >> 3);\n \tuint8_t bit_idx = (uint8_t) (v & 0x07);\n \treturn bm[page_idx] & (1 << bit_idx);\n }\n \n static inline void bm_set(uint8_t *bm, uint16_t v) \n {\n-\tuint16_t page_idx = (uint8_t) (v >> 3);\n+\tuint16_t page_idx = (v >> 3);\n \tuint8_t bit_idx = (uint8_t) (v & 0x07);\n \tbm[page_idx] |= (1 << bit_idx);\n }\n"} {"commit":"776a4fc0340dcd95c033600862462659f3180f15","subject":"changed: PSE replaced by PTE","message":"changed: PSE replaced by PTE\n","repos":"tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball,tkemmer\/ball","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/BALL\/kernel.h\n+++ include\/BALL\/kernel.h\n@@ -1,4 +1,4 @@\n-\/\/ $Id: kernel.h,v 1.1 2000\/01\/03 15:17:33 oliver Exp $\n+\/\/ $Id: kernel.h,v 1.2 2000\/03\/28 15:26:18 oliver Exp $\n \/\/ BALL collective kernel header file\n \/\/ includes all kernel headers\n #ifndef BALL_KERNEL_H\n@@ -56,8 +56,8 @@\n #\tinclude <BALL\/KERNEL\/protein.h>\n #endif\n \n-#ifndef BALL_KERNEL_PSE_H\n-#\tinclude <BALL\/KERNEL\/PSE.h>\n+#ifndef BALL_KERNEL_PTE_H\n+#\tinclude <BALL\/KERNEL\/PTE.h>\n #endif\n \n #ifndef BALL_KERNEL_RESIDUE_H\n"} {"commit":"a96e5ffbe087bc320c833b59f733675efd15ec5d","subject":"spelling","message":"spelling\n","repos":"pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- lib\/isc\/include\/isc\/task.h\n+++ lib\/isc\/include\/isc\/task.h\n@@ -632,7 +632,7 @@\n * 'priv'.\n *\n * Under normal circumstances this flag has no effect on the task behavior,\n- * but when the task manager has been set to privileged exeuction mode via\n+ * but when the task manager has been set to privileged execution mode via\n * isc_taskmgr_setmode(), only tasks with the flag set will be executed,\n * and all other tasks will wait until they're done. Once all privileged\n * tasks have finished executing, the task manager will automatically\n"} {"commit":"8b84bcaefc4653a0b0a468a66184b90617866cfe","subject":"Update the scene","message":"Update the scene\n","repos":"etheriqa\/amber","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/amber\/scene\/cornel_box.h\n+++ include\/amber\/scene\/cornel_box.h\n@@ -73,7 +73,7 @@\n vector3_type(-1, -1, -1),\n vector3_type( 1, -1, -1),\n }),\n- new Phong(radiant_type(.1), radiant_type(.5), 16)\n+ new Phong(radiant_type(.1), radiant_type(.5), 256)\n );\n \/\/ floor\n output = Object(\n"} {"commit":"d99034bdfec79d885aa58164a1b4e547efa4e6fd","subject":"Don't perror() on EGAIN and EWOULDBLOCK errno (non-blocking sockets)","message":"Don't perror() on EGAIN and EWOULDBLOCK errno (non-blocking sockets)\n","repos":"darsto\/brother-scanner-driver,darsto\/brother-scanner-driver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- network.c\n+++ network.c\n@@ -11,6 +11,7 @@\n #include <assert.h>\n #include <stdbool.h>\n #include <memory.h>\n+#include <errno.h>\n #include \"network.h\"\n \n #define MAX_NETWORK_CONNECTIONS 32\n@@ -132,7 +133,8 @@\n ssize_t recv_bytes;\n struct sockaddr_in sin_oth_tmp;\n socklen_t slen;\n-\n+ int rc;\n+ \n conn = get_network_conn(conn_id);\n assert((conn->server && conn->state != NETWORK_CONN_STATE_UNITIALIZED) ||\n (!conn->server && conn->state == NETWORK_CONN_STATE_CONNECTED));\n@@ -140,7 +142,10 @@\n slen = sizeof(sin_oth_tmp);\n recv_bytes = recvfrom(conn->fd, buf, len, 0, (struct sockaddr *) &sin_oth_tmp, &slen);\n if (recv_bytes < 0) {\n- perror(\"recvfrom\");\n+ rc = errno;\n+ if (rc != EAGAIN && rc != EWOULDBLOCK) {\n+ perror(\"recvfrom\");\n+ }\n return -1;\n }\n \n@@ -272,12 +277,14 @@\n {\n struct network_conn *conn;\n ssize_t recv_bytes;\n+ int rc;\n \n conn = get_network_conn(conn_id);\n assert(conn->state == NETWORK_CONN_STATE_CONNECTED);\n \n recv_bytes = recv(conn->fd, buf, len, 0);\n- if (recv_bytes < 0) {\n+ rc = errno;\n+ if (recv_bytes < 0 && rc != EAGAIN && rc != EWOULDBLOCK) {\n perror(\"recvfrom\");\n }\n \n"} {"commit":"97ec10f6391896f1091bb6026b7fbea7df5aa59e","subject":"Update RingRayLib - raylib.c - Add Function : void ToggleFullscreen(void)","message":"Update RingRayLib - raylib.c - Add Function : void ToggleFullscreen(void)\n","repos":"ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring,ring-lang\/ring","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a903bd1d4281df23b1b2e5083a21bbcdfc4ed346","subject":"remove unnecessary code","message":"remove unnecessary code\n","repos":"Sometrik\/canvas,rekola\/canvas,Sometrik\/canvas,rekola\/canvas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/ImageFormat.h\n+++ include\/ImageFormat.h\n@@ -19,78 +19,4 @@\n #define PACK_RGB24(r, g, b) ((r) | ((g) << 8) | ((b) << 16))\n #define PACK_RGBA32(r, g, b, a) ((r) | ((g) << 8) | ((b) << 16) | ((a) << 24))\n \n-#if 0\n-namespace canvas {\n- class ImageFormat {\n- public:\n- static ImageFormat UNDEF;\n- static ImageFormat RGB24;\n- static ImageFormat RGB32;\n- static ImageFormat RGBA32;\n- static ImageFormat RGB565;\n- static ImageFormat RGBA4;\n- static ImageFormat LUM8;\n- static ImageFormat ALPHA8;\n- static ImageFormat LA88;\n- static ImageFormat LA44;\n- static ImageFormat RGB_ETC1;\n- static ImageFormat RGB_DXT1;\n- static ImageFormat RGBA_DXT5;\n- static ImageFormat RED_RGTC1;\n- static ImageFormat RG_RGTC2;\n- static ImageFormat FLOAT32;\n-\n- enum Compression {\n- NO_COMPRESSION = 0,\n- ETC1,\n- DXT1,\n- DXT5,\n- RGTC1,\n- RGTC2,\n- EAC,\n- EAC_SIGNED\n- };\n- \n- ImageFormat(unsigned short _channels, unsigned short _bytes_per_pixel, bool _force_alpha = false, Compression _compression = NO_COMPRESSION)\n- : channels(_channels),\n- bytes_per_pixel(_bytes_per_pixel),\n- force_alpha(_force_alpha),\n- compression(_compression) { }\n-\n- bool operator==(const ImageFormat & other) const {\n- return channels == other.channels && bytes_per_pixel == other.bytes_per_pixel && force_alpha == other.force_alpha && compression == other.compression;\n- }\n- \n- unsigned short getNumChannels() const { return channels; }\n- unsigned short getBytesPerPixel() const { return bytes_per_pixel; }\n-\n- void setBytesPerPixel(unsigned short _bytes_per_pixel) { bytes_per_pixel = _bytes_per_pixel; }\n-\n- void clear() {\n- channels = bytes_per_pixel = 0;\n- compression = NO_COMPRESSION;\n- }\n-\n- bool defined() const { return channels > 0; }\n- bool hasAlpha() const { return channels >= 4 || force_alpha; }\n- Compression getCompression() const { return compression; }\n- \n- private:\n- unsigned short channels;\n- unsigned short bytes_per_pixel;\n- bool force_alpha;\n- Compression compression;\n- };\n-\n- class ImageFormatRegistry {\n- public:\n- \n- private:\n- ImageFormatRegistry() {\n-\n- }\n- };\n-};\n #endif\n-\n-#endif\n"} {"commit":"c296b099155ea85727feae9878980c0d4eea3639","subject":"sdp: Add MAP_PROFILE_ID","message":"sdp: Add MAP_PROFILE_ID\n","repos":"pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,pkarasev3\/bluez,mapfau\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/sdp.h\n+++ lib\/sdp.h\n@@ -207,6 +207,7 @@\n #define PBAP_PCE_PROFILE_ID\t\tPBAP_PCE_SVCLASS_ID\n #define PBAP_PSE_PROFILE_ID\t\tPBAP_PSE_SVCLASS_ID\n #define PBAP_PROFILE_ID\t\t\tPBAP_SVCLASS_ID\n+#define MAP_PROFILE_ID\t\t\tMAP_SVCLASS_ID\n #define PNP_INFO_PROFILE_ID\t\tPNP_INFO_SVCLASS_ID\n #define GENERIC_NETWORKING_PROFILE_ID\tGENERIC_NETWORKING_SVCLASS_ID\n #define GENERIC_FILETRANS_PROFILE_ID\tGENERIC_FILETRANS_SVCLASS_ID\n"} {"commit":"20f4eb3e502d68b12224577ebcd2cd50cc6e14e4","subject":"[PATCH] powerpc: Fixup for STRICT_MM_TYPECHECKS","message":"[PATCH] powerpc: Fixup for STRICT_MM_TYPECHECKS\n\nCurrently ARCH=powerpc will not compile when STRICT_MM_TYPECHECKS is\nturned on and CONFIG_64K_PAGES is turned off. This corrects the\nproblem.\n\nSigned-off-by: David Gibson <58469ba664997fcb401d465b27655a3c41d34e08@au1.ibm.com>\nSigned-off-by: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-powerpc\/pgtable-4k.h\n+++ include\/asm-powerpc\/pgtable-4k.h\n@@ -62,9 +62,14 @@\n \/* shift to put page number into pte *\/\n #define PTE_RPN_SHIFT\t(17)\n \n-#define __real_pte(e,p)\t\t((real_pte_t)(e))\n-#define __rpte_to_pte(r)\t(r)\n-#define __rpte_to_hidx(r,index)\t(pte_val((r)) >> 12)\n+#ifdef STRICT_MM_TYPECHECKS\n+#define __real_pte(e,p)\t\t((real_pte_t){(e)})\n+#define __rpte_to_pte(r)\t((r).pte)\n+#else\n+#define __real_pte(e,p)\t\t(e)\n+#define __rpte_to_pte(r)\t(__pte(r))\n+#endif\n+#define __rpte_to_hidx(r,index)\t(pte_val(__rpte_to_pte(r)) >> 12)\n \n #define pte_iterate_hashed_subpages(rpte, psize, va, index, shift) \\\n \tdo {\t\t\t\t\t\t\t \\\n"} {"commit":"4b26c30992bba5015934c04df778721ca1e35bd7","subject":"clang: suppress a warning","message":"clang: suppress a warning\n\nUse \"char *\" instead of \"byte *\" for byte string because we check only\nwhether any '\\0' character exists or not.\n\n lib\/str.c:3263:9: warning: initializing 'byte *'\n (aka 'unsigned char *') with an expression of type 'char *' converts\n between pointers to integer types with different sign [-Wpointer-sign]\n byte *v = GRN_BULK_HEAD(obj);\n ^ ~~~~~~~~~~~~~~~~~~\n","repos":"hiroyuki-sato\/groonga,komainu8\/groonga,redfigure\/groonga,naoa\/groonga,myokoym\/groonga,groonga\/groonga,kenhys\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,cosmo0920\/groonga,kenhys\/groonga,komainu8\/groonga,redfigure\/groonga,myokoym\/groonga,myokoym\/groonga,groonga\/groonga,myokoym\/groonga,myokoym\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,naoa\/groonga,cosmo0920\/groonga,komainu8\/groonga,cosmo0920\/groonga,kenhys\/groonga,redfigure\/groonga,myokoym\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,cosmo0920\/groonga,naoa\/groonga,kenhys\/groonga,kenhys\/groonga,naoa\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,kenhys\/groonga,komainu8\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,redfigure\/groonga,groonga\/groonga,redfigure\/groonga,redfigure\/groonga,naoa\/groonga,komainu8\/groonga,groonga\/groonga,myokoym\/groonga,naoa\/groonga,redfigure\/groonga,redfigure\/groonga,naoa\/groonga,groonga\/groonga,kenhys\/groonga,komainu8\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/str.c\n+++ lib\/str.c\n@@ -3260,7 +3260,7 @@\n grn_bool\n grn_bulk_is_zero(grn_ctx *ctx, grn_obj *obj)\n {\n- byte *v = GRN_BULK_HEAD(obj);\n+ const char *v = GRN_BULK_HEAD(obj);\n unsigned int s = GRN_BULK_VSIZE(obj);\n for (; s; s--, v++) {\n if (*v) { return GRN_FALSE; }\n"} {"commit":"33facb7ae97fa7bd9df398abe456a461753d38bb","subject":"Bug Fix: ConditionVariable::timed_wait should return bool","message":"Bug Fix: ConditionVariable::timed_wait should return bool\n","repos":"zillians\/supercell_common,zillians\/supercell_common","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- include\/core\/ConditionVariable.h\n+++ include\/core\/ConditionVariable.h\n@@ -188,7 +188,7 @@\n \t\tmQueue.wait_and_pop(result);\n \t}\n \n-\tvoid timed_wait(T& result, const boost::system_time& absolute)\n+\tbool timed_wait(T& result, const boost::system_time& absolute)\n \t{\n \t\tmQueue.timed_wait_and_pop(result, absolute);\n \t}\n"} {"commit":"6ccd4979882f50268b611d5b2afb8516125e58b9","subject":"update nl80211.h","message":"update nl80211.h\n","repos":"chunyeow\/iw,chunyeow\/iw,Distrotech\/iw,Distrotech\/iw,bw-oss\/iw,greearb\/iw-ct,bw-oss\/iw,CTU-IIG\/802.11p-iw,CTU-IIG\/802.11p-iw,cozybit\/iw,cozybit\/iw,greearb\/iw-ct","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- nl80211.h\n+++ nl80211.h\n@@ -374,8 +374,8 @@\n *\trequests to connect to a specified network but without separating\n *\tauth and assoc steps. For this, you need to specify the SSID in a\n *\t%NL80211_ATTR_SSID attribute, and can optionally specify the association\n- *\tIEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,\n- *\t%NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,\n+ *\tIEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,\n+ *\t%NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,\n *\t%NL80211_ATTR_CONTROL_PORT_ETHERTYPE and\n *\t%NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.\n *\tBackground scan period can optionally be\n@@ -958,7 +958,7 @@\n * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is\n *\tused for the association (&enum nl80211_mfp, represented as a u32);\n *\tthis attribute can be used\n- *\twith %NL80211_CMD_ASSOCIATE request\n+ *\twith %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests\n *\n * @NL80211_ATTR_STA_FLAGS2: Attribute containing a\n *\t&struct nl80211_sta_flag_update.\n@@ -1310,6 +1310,9 @@\n *\tif not given in START_AP 0 is assumed, if not given in SET_BSS\n *\tno change is made.\n *\n+ * @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode\n+ *\tdefined in &enum nl80211_mesh_power_mode.\n+ *\n * @NL80211_ATTR_MAX: highest attribute number currently defined\n * @__NL80211_ATTR_AFTER_LAST: internal use\n *\/\n@@ -1579,6 +1582,8 @@\n \n \tNL80211_ATTR_P2P_CTWINDOW,\n \tNL80211_ATTR_P2P_OPPPS,\n+\n+\tNL80211_ATTR_LOCAL_MESH_POWER_MODE,\n \n \t\/* add attributes here, update the policy in nl80211.c *\/\n \n@@ -1697,6 +1702,9 @@\n *\tflag can't be changed, it is only valid while adding a station, and\n *\tattempts to change it will silently be ignored (rather than rejected\n *\tas errors.)\n+ * @NL80211_STA_FLAG_ASSOCIATED: station is associated; used with drivers\n+ *\tthat support %NL80211_FEATURE_FULL_AP_CLIENT_STATE to transition a\n+ *\tpreviously added station into associated state\n * @NL80211_STA_FLAG_MAX: highest station flag number currently defined\n * @__NL80211_STA_FLAG_AFTER_LAST: internal use\n *\/\n@@ -1708,6 +1716,7 @@\n \tNL80211_STA_FLAG_MFP,\n \tNL80211_STA_FLAG_AUTHENTICATED,\n \tNL80211_STA_FLAG_TDLS_PEER,\n+\tNL80211_STA_FLAG_ASSOCIATED,\n \n \t\/* keep last *\/\n \t__NL80211_STA_FLAG_AFTER_LAST,\n@@ -1834,6 +1843,10 @@\n * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.\n * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)\n * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)\n+ * @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode\n+ * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode\n+ * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards\n+ *\tnon-peer STA\n * @__NL80211_STA_INFO_AFTER_LAST: internal\n * @NL80211_STA_INFO_MAX: highest possible station info attribute\n *\/\n@@ -1858,6 +1871,9 @@\n \tNL80211_STA_INFO_STA_FLAGS,\n \tNL80211_STA_INFO_BEACON_LOSS,\n \tNL80211_STA_INFO_T_OFFSET,\n+\tNL80211_STA_INFO_LOCAL_PM,\n+\tNL80211_STA_INFO_PEER_PM,\n+\tNL80211_STA_INFO_NONPEER_PM,\n \n \t\/* keep last *\/\n \t__NL80211_STA_INFO_AFTER_LAST,\n@@ -2249,6 +2265,34 @@\n };\n \n \/**\n+ * enum nl80211_mesh_power_mode - mesh power save modes\n+ *\n+ * @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is\n+ *\tnot known or has not been set yet.\n+ * @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is\n+ *\tin Awake state all the time.\n+ * @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will\n+ *\talternate between Active and Doze states, but will wake up for\n+ *\tneighbor's beacons.\n+ * @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will\n+ *\talternate between Active and Doze states, but may not wake up\n+ *\tfor neighbor's beacons.\n+ *\n+ * @__NL80211_MESH_POWER_AFTER_LAST - internal use\n+ * @NL80211_MESH_POWER_MAX - highest possible power save level\n+ *\/\n+\n+enum nl80211_mesh_power_mode {\n+\tNL80211_MESH_POWER_UNKNOWN,\n+\tNL80211_MESH_POWER_ACTIVE,\n+\tNL80211_MESH_POWER_LIGHT_SLEEP,\n+\tNL80211_MESH_POWER_DEEP_SLEEP,\n+\n+\t__NL80211_MESH_POWER_AFTER_LAST,\n+\tNL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1\n+};\n+\n+\/**\n * enum nl80211_meshconf_params - mesh configuration parameters\n *\n * Mesh configuration parameters. These can be changed while the mesh is\n@@ -2341,6 +2385,11 @@\n * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: The minimum interval of time\n *\t(in TUs) during which a mesh STA can send only one Action frame\n *\tcontaining a PREQ element for root path confirmation.\n+ *\n+ * @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.\n+ *\ttype &enum nl80211_mesh_power_mode (u32)\n+ *\n+ * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)\n *\n * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use\n *\/\n@@ -2371,6 +2420,8 @@\n \tNL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,\n \tNL80211_MESHCONF_HWMP_ROOT_INTERVAL,\n \tNL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,\n+\tNL80211_MESHCONF_POWER_MODE,\n+\tNL80211_MESHCONF_AWAKE_WINDOW,\n \n \t\/* keep last *\/\n \t__NL80211_MESHCONF_ATTR_AFTER_LAST,\n@@ -2933,6 +2984,8 @@\n *\tthe infrastructure network's beacon interval.\n * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many\n *\tdifferent channels may be used within this group.\n+ * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap\n+ *\tof supported channel widths for radar detection.\n * @NUM_NL80211_IFACE_COMB: number of attributes\n * @MAX_NL80211_IFACE_COMB: highest attribute number\n *\n@@ -2965,6 +3018,7 @@\n \tNL80211_IFACE_COMB_MAXNUM,\n \tNL80211_IFACE_COMB_STA_AP_BI_MATCH,\n \tNL80211_IFACE_COMB_NUM_CHANNELS,\n+\tNL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,\n \n \t\/* keep last *\/\n \tNUM_NL80211_IFACE_COMB,\n@@ -3140,6 +3194,17 @@\n *\tsetting\n * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic\n *\tpowersave\n+ * @NL80211_FEATURE_FULL_AP_CLIENT_STATE: The driver supports full state\n+ *\ttransitions for AP clients. Without this flag (and if the driver\n+ *\tdoesn't have the AP SME in the device) the driver supports adding\n+ *\tstations only when they're associated and adds them in associated\n+ *\tstate (to later be transitioned into authorized), with this flag\n+ *\tthey should be added before even sending the authentication reply\n+ *\tand then transitioned into authenticated, associated and authorized\n+ *\tstates using station flags.\n+ *\tNote that even for drivers that support this, the default is to add\n+ *\tstations in authenticated\/associated state, so to add unauthenticated\n+ *\tstations the authenticated\/associated bits have to be set in the mask.\n *\/\n enum nl80211_feature_flags {\n \tNL80211_FEATURE_SK_TX_STATUS\t\t\t= 1 << 0,\n@@ -3155,6 +3220,7 @@\n \tNL80211_FEATURE_NEED_OBSS_SCAN\t\t\t= 1 << 10,\n \tNL80211_FEATURE_P2P_GO_CTWIN\t\t\t= 1 << 11,\n \tNL80211_FEATURE_P2P_GO_OPPPS\t\t\t= 1 << 12,\n+\tNL80211_FEATURE_FULL_AP_CLIENT_STATE\t\t= 1 << 13,\n };\n \n \/**\n"} {"commit":"6e8bbfb62c1e5f97844852d43623037b8151fb91","subject":"opflags: Rework opflags bits with OP_ macros","message":"opflags: Rework opflags bits with OP_ macros\n\nIn this path the opflags bits are completely reworked\nin a sake of simplier extension. Inparticular for Knights\nCorener instructions we will need new registers and new\nsizes.\n\nWhat's done\n\n - all bits are grouped in sequences, and start using OP_\n macros, thus if one need to extend some field -- just\n tune up @shift and @bits where needed\n\n - the #define we use in code are OR'ed in symbols, this\n should be a way more convenient to deal with instead of\n pure hex numbers.\n\nThe tests are passed but more eyes needed to review this\nrather big and intrusive patch. The reason why it's done\nin one single path -- for revertability in one command.\n\nSigned-off-by: Cyrill Gorcunov <7a1ea01eee6961eb1e372e3508c2670446d086f4@gmail.com>\n","repos":"techkey\/nasm,techkey\/nasm,projedi\/nasm,Distrotech\/nasm,techkey\/nasm,projedi\/nasm,Distrotech\/nasm,turingstudio\/nasm,turingstudio\/nasm,projedi\/nasm,turingstudio\/nasm,turingstudio\/nasm,Distrotech\/nasm,projedi\/nasm,Distrotech\/nasm,projedi\/nasm,techkey\/nasm,techkey\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- opflags.h\n+++ opflags.h\n@@ -51,85 +51,6 @@\n * (class & ~operand) == 0\n *\n * if and only if \"operand\" belongs to class type \"class\".\n- *\n- * The bits are assigned as follows:\n- *\n- * Bits 0-7, 23, 29: sizes\n- * 0: 8 bits (BYTE)\n- * 1: 16 bits (WORD)\n- * 2: 32 bits (DWORD)\n- * 3: 64 bits (QWORD)\n- * 4: 80 bits (TWORD)\n- * 5: FAR\n- * 6: NEAR\n- * 7: SHORT\n- * 23: 256 bits (YWORD)\n- * 29: 128 bits (OWORD)\n- *\n- * Bits 8-10 modifiers\n- * 8: TO\n- * 9: COLON\n- * 10: STRICT\n- *\n- * Bits 12-15: type of operand\n- * 12: REGISTER\n- * 13: IMMEDIATE\n- * 14: MEMORY (always has REGMEM attribute as well)\n- * 15: REGMEM (valid EA operand)\n- *\n- * Bits 11, 16-19, 28: subclasses\n- * With REG_CDT:\n- * 16: REG_CREG (CRx)\n- * 17: REG_DREG (DRx)\n- * 18: REG_TREG (TRx)\n-\n- * With REG_GPR:\n- * 16: REG_ACCUM (AL, AX, EAX, RAX)\n- * 17: REG_COUNT (CL, CX, ECX, RCX)\n- * 18: REG_DATA (DL, DX, EDX, RDX)\n- * 19: REG_HIGH (AH, CH, DH, BH)\n- * 28: REG_NOTACC (not REG_ACCUM)\n- *\n- * With REG_SREG:\n- * 16: REG_CS\n- * 17: REG_DESS (DS, ES, SS)\n- * 18: REG_FSGS\n- * 19: REG_SEG67\n- *\n- * With FPUREG:\n- * 16: FPU0\n- *\n- * With XMMREG:\n- * 16: XMM0\n- *\n- * With YMMREG:\n- * 16: YMM0\n- *\n- * With MEMORY:\n- * 16: MEM_OFFS (this is a simple offset)\n- * 17: IP_REL (IP-relative offset)\n- *\n- * With IMMEDIATE:\n- * 16: UNITY (1)\n- * 17: BYTENESS16 (-128..127)\n- * 18: BYTENESS32 (-128..127)\n- * 19: BYTENESS64 (-128..127)\n- * 28: SDWORD64 (-2^31..2^31-1)\n- * 11: UDWORD64 (0..2^32-1)\n- *\n- * Bits 20-22, 24-27: register classes\n- * 20: REG_CDT (CRx, DRx, TRx)\n- * 21: RM_GPR (REG_GPR) (integer register)\n- * 22: REG_SREG\n- * 24: FPUREG\n- * 25: RM_MMX (MMXREG)\n- * 26: RM_XMM (XMMREG)\n- * 27: RM_YMM (YMMREG)\n- *\n- * 30: SAME_AS\n- * Special flag only used in instruction patterns; means this operand\n- * has to be identical to another operand. Currently only supported\n- * for registers.\n *\/\n \n typedef uint64_t opflags_t;\n@@ -137,34 +58,110 @@\n #define OP_GENMASK(bits, shift) (((UINT64_C(1) << (bits)) - 1) << (shift))\n #define OP_GENBIT(bit, shift) (UINT64_C(1) << ((shift) + (bit)))\n \n-\n-\/* Size, and other attributes, of the operand *\/\n-#define BITS8 UINT64_C(0x00000001)\n-#define BITS16 UINT64_C(0x00000002)\n-#define BITS32 UINT64_C(0x00000004)\n-#define BITS64 UINT64_C(0x00000008) \/* x64 and FPU only *\/\n-#define BITS80 UINT64_C(0x00000010) \/* FPU only *\/\n-#define BITS128 UINT64_C(0x20000000)\n-#define BITS256 UINT64_C(0x00800000)\n-#define FAR UINT64_C(0x00000020) \/* grotty: this means 16:16 or *\/\n- \/* 16:32, like in CALL\/JMP *\/\n-#define NEAR UINT64_C(0x00000040)\n-#define SHORT UINT64_C(0x00000080) \/* and this means what it says :) *\/\n-\n-#define SIZE_MASK UINT64_C(0x208000FF) \/* all the size attributes *\/\n-\n-\/* Modifiers *\/\n-#define MODIFIER_MASK UINT64_C(0x00000700)\n-#define TO UINT64_C(0x00000100) \/* reverse effect in FADD, FSUB &c *\/\n-#define COLON UINT64_C(0x00000200) \/* operand is followed by a colon *\/\n-#define STRICT UINT64_C(0x00000400) \/* do not optimize this operand *\/\n-\n-\/* Type of operand: memory reference, register, etc. *\/\n-#define OPTYPE_MASK UINT64_C(0x0000f000)\n-#define REGISTER UINT64_C(0x00001000) \/* register number in 'basereg' *\/\n-#define IMMEDIATE UINT64_C(0x00002000)\n-#define MEMORY UINT64_C(0x0000c000)\n-#define REGMEM UINT64_C(0x00008000) \/* for r\/m, ie EA, operands *\/\n+\/*\n+ * Type of operand: memory reference, register, etc.\n+ *\n+ * Bits: 0 - 3\n+ *\/\n+#define OPTYPE_SHIFT (0)\n+#define OPTYPE_BITS (4)\n+#define OPTYPE_MASK OP_GENMASK(OPTYPE_BITS, OPTYPE_SHIFT)\n+#define GEN_OPTYPE(bit) OP_GENBIT(bit, OPTYPE_SHIFT)\n+\n+\/*\n+ * Modifiers.\n+ *\n+ * Bits: 4 - 6\n+ *\/\n+#define MODIFIER_SHIFT (4)\n+#define MODIFIER_BITS (3)\n+#define MODIFIER_MASK OP_GENMASK(MODIFIER_BITS, MODIFIER_SHIFT)\n+#define GEN_MODIFIER(bit) OP_GENBIT(bit, MODIFIER_SHIFT)\n+\n+\/*\n+ * Register classes.\n+ *\n+ * Bits: 7 - 16\n+ *\/\n+#define REG_CLASS_SHIFT (7)\n+#define REG_CLASS_BITS (10)\n+#define REG_CLASS_MASK OP_GENMASK(REG_CLASS_BITS, REG_CLASS_SHIFT)\n+#define GEN_REG_CLASS(bit) OP_GENBIT(bit, REG_CLASS_SHIFT)\n+\n+\/*\n+ * Subclasses. Depends on type of operand.\n+ *\n+ * Bits: 17 - 24\n+ *\/\n+#define SUBCLASS_SHIFT (17)\n+#define SUBCLASS_BITS (8)\n+#define SUBCLASS_MASK OP_GENMASK(SUBCLASS_BITS, SUBCLASS_SHIFT)\n+#define GEN_SUBCLASS(bit) OP_GENBIT(bit, SUBCLASS_SHIFT)\n+\n+\/*\n+ * Special flags. Context dependant.\n+ *\n+ * Bits: 25 - 31\n+ *\/\n+#define SPECIAL_SHIFT (25)\n+#define SPECIAL_BITS (7)\n+#define SPECIAL_MASK OP_GENMASK(SPECIAL_BITS, SPECIAL_SHIFT)\n+#define GEN_SPECIAL(bit) OP_GENBIT(bit, SPECIAL_SHIFT)\n+\n+\/*\n+ * Sizes of the operands and attributes.\n+ *\n+ * Bits: 32 - 42\n+ *\/\n+#define SIZE_SHIFT (32)\n+#define SIZE_BITS (11)\n+#define SIZE_MASK OP_GENMASK(SIZE_BITS, SIZE_SHIFT)\n+#define GEN_SIZE(bit) OP_GENBIT(bit, SIZE_SHIFT)\n+\n+\/*\n+ * Bits distribution (counted from 0)\n+ *\n+ * 6 5 4 3 2 1\n+ * 3210987654321098765432109876543210987654321098765432109876543210\n+ * |\n+ * | dword bound\n+ *\n+ * ............................................................1111 optypes\n+ * .........................................................111.... modifiers\n+ * ...............................................1111111111....... register classes\n+ * .......................................11111111................. subclasses\n+ * ................................1111111......................... specials\n+ * .....................11111111111................................ sizes\n+ *\/\n+\n+#define REGISTER GEN_OPTYPE(0) \/* register number in 'basereg' *\/\n+#define IMMEDIATE GEN_OPTYPE(1)\n+#define REGMEM GEN_OPTYPE(2) \/* for r\/m, ie EA, operands *\/\n+#define MEMORY (GEN_OPTYPE(3) | REGMEM)\n+\n+#define BITS8 GEN_SIZE(0) \/* 8 bits (BYTE) *\/\n+#define BITS16 GEN_SIZE(1) \/* 16 bits (WORD) *\/\n+#define BITS32 GEN_SIZE(2) \/* 32 bits (DWORD) *\/\n+#define BITS64 GEN_SIZE(3) \/* 64 bits (QWORD), x64 and FPU only *\/\n+#define BITS80 GEN_SIZE(4) \/* 80 bits (TWORD), FPU only *\/\n+#define BITS128 GEN_SIZE(5) \/* 128 bits (OWORD) *\/\n+#define BITS256 GEN_SIZE(6) \/* 256 bits (YWORD) *\/\n+#define BITS512 GEN_SIZE(7) \/* 512 bits (ZWORD) *\/\n+#define FAR GEN_SIZE(8) \/* grotty: this means 16:16 or 16:32, like in CALL\/JMP *\/\n+#define NEAR GEN_SIZE(9)\n+#define SHORT GEN_SIZE(10) \/* and this means what it says :) *\/\n+\n+#define TO GEN_MODIFIER(0) \/* reverse effect in FADD, FSUB &c *\/\n+#define COLON GEN_MODIFIER(1) \/* operand is followed by a colon *\/\n+#define STRICT GEN_MODIFIER(2) \/* do not optimize this operand *\/\n+\n+#define REG_CLASS_CDT GEN_REG_CLASS(0)\n+#define REG_CLASS_GPR GEN_REG_CLASS(1)\n+#define REG_CLASS_SREG GEN_REG_CLASS(2)\n+#define REG_CLASS_FPUREG GEN_REG_CLASS(3)\n+#define REG_CLASS_RM_MMX GEN_REG_CLASS(4)\n+#define REG_CLASS_RM_XMM GEN_REG_CLASS(5)\n+#define REG_CLASS_RM_YMM GEN_REG_CLASS(6)\n \n #define is_class(class, op) (!((opflags_t)(class) & ~(opflags_t)(op)))\n \n@@ -172,73 +169,76 @@\n #define IS_FSGS(op) is_class(REG_FSGS, nasm_reg_flags[(op)])\n \n \/* Register classes *\/\n-#define REG_EA UINT64_C(0x00009000) \/* 'normal' reg, qualifies as EA *\/\n-#define RM_GPR UINT64_C(0x00208000) \/* integer operand *\/\n-#define REG_GPR UINT64_C(0x00209000) \/* integer register *\/\n-#define REG8 UINT64_C(0x00209001) \/* 8-bit GPR *\/\n-#define REG16 UINT64_C(0x00209002) \/* 16-bit GPR *\/\n-#define REG32 UINT64_C(0x00209004) \/* 32-bit GPR *\/\n-#define REG64 UINT64_C(0x00209008) \/* 64-bit GPR *\/\n-#define FPUREG UINT64_C(0x01001000) \/* floating point stack registers *\/\n-#define FPU0 UINT64_C(0x01011000) \/* FPU stack register zero *\/\n-#define RM_MMX UINT64_C(0x02008000) \/* MMX operand *\/\n-#define MMXREG UINT64_C(0x02009000) \/* MMX register *\/\n-#define RM_XMM UINT64_C(0x04008000) \/* XMM (SSE) operand *\/\n-#define XMMREG UINT64_C(0x04009000) \/* XMM (SSE) register *\/\n-#define XMM0 UINT64_C(0x04019000) \/* XMM register zero *\/\n-#define RM_YMM UINT64_C(0x08008000) \/* YMM (AVX) operand *\/\n-#define YMMREG UINT64_C(0x08009000) \/* YMM (AVX) register *\/\n-#define YMM0 UINT64_C(0x08019000) \/* YMM register zero *\/\n-#define REG_CDT UINT64_C(0x00101004) \/* CRn, DRn and TRn *\/\n-#define REG_CREG UINT64_C(0x00111004) \/* CRn *\/\n-#define REG_DREG UINT64_C(0x00121004) \/* DRn *\/\n-#define REG_TREG UINT64_C(0x00141004) \/* TRn *\/\n-#define REG_SREG UINT64_C(0x00401002) \/* any segment register *\/\n-#define REG_CS UINT64_C(0x00411002) \/* CS *\/\n-#define REG_DESS UINT64_C(0x00421002) \/* DS, ES, SS *\/\n-#define REG_FSGS UINT64_C(0x00441002) \/* FS, GS *\/\n-#define REG_SEG67 UINT64_C(0x00481002) \/* Unimplemented segment registers *\/\n+#define REG_EA ( REGMEM | REGISTER) \/* 'normal' reg, qualifies as EA *\/\n+#define RM_GPR ( REG_CLASS_GPR | REGMEM) \/* integer operand *\/\n+#define REG_GPR ( REG_CLASS_GPR | REGMEM | REGISTER) \/* integer register *\/\n+#define REG8 ( REG_CLASS_GPR | BITS8 | REGMEM | REGISTER) \/* 8-bit GPR *\/\n+#define REG16 ( REG_CLASS_GPR | BITS16 | REGMEM | REGISTER) \/* 16-bit GPR *\/\n+#define REG32 ( REG_CLASS_GPR | BITS32 | REGMEM | REGISTER) \/* 32-bit GPR *\/\n+#define REG64 ( REG_CLASS_GPR | BITS64 | REGMEM | REGISTER) \/* 64-bit GPR *\/\n+#define FPUREG ( REG_CLASS_FPUREG | REGISTER) \/* floating point stack registers *\/\n+#define FPU0 (GEN_SUBCLASS(1) | REG_CLASS_FPUREG | REGISTER) \/* FPU stack register zero *\/\n+#define RM_MMX ( REG_CLASS_RM_MMX | REGMEM) \/* MMX operand *\/\n+#define MMXREG ( REG_CLASS_RM_MMX | REGMEM | REGISTER) \/* MMX register *\/\n+#define RM_XMM ( REG_CLASS_RM_XMM | REGMEM) \/* XMM (SSE) operand *\/\n+#define XMMREG ( REG_CLASS_RM_XMM | REGMEM | REGISTER) \/* XMM (SSE) register *\/\n+#define XMM0 (GEN_SUBCLASS(1) | REG_CLASS_RM_XMM | REGMEM | REGISTER) \/* XMM register zero *\/\n+#define RM_YMM ( REG_CLASS_RM_YMM | REGMEM) \/* YMM (AVX) operand *\/\n+#define YMMREG ( REG_CLASS_RM_YMM | REGMEM | REGISTER) \/* YMM (AVX) register *\/\n+#define YMM0 (GEN_SUBCLASS(1) | REG_CLASS_RM_YMM | REGMEM | REGISTER) \/* YMM register zero *\/\n+#define REG_CDT ( REG_CLASS_CDT | BITS32 | REGISTER) \/* CRn, DRn and TRn *\/\n+#define REG_CREG (GEN_SUBCLASS(1) | REG_CLASS_CDT | BITS32 | REGISTER) \/* CRn *\/\n+#define REG_DREG (GEN_SUBCLASS(2) | REG_CLASS_CDT | BITS32 | REGISTER) \/* DRn *\/\n+#define REG_TREG (GEN_SUBCLASS(3) | REG_CLASS_CDT | BITS32 | REGISTER) \/* TRn *\/\n+#define REG_SREG ( REG_CLASS_SREG | BITS16 | REGISTER) \/* any segment register *\/\n+#define REG_CS (GEN_SUBCLASS(1) | REG_CLASS_SREG | BITS16 | REGISTER) \/* CS *\/\n+#define REG_DESS (GEN_SUBCLASS(2) | REG_CLASS_SREG | BITS16 | REGISTER) \/* DS, ES, SS *\/\n+#define REG_FSGS (GEN_SUBCLASS(3) | REG_CLASS_SREG | BITS16 | REGISTER) \/* FS, GS *\/\n+#define REG_SEG67 (GEN_SUBCLASS(4) | REG_CLASS_SREG | BITS16 | REGISTER) \/* Unimplemented segment registers *\/\n \n \/* Special GPRs *\/\n-#define REG_SMASK UINT64_C(0x100f0800) \/* a mask for the following *\/\n-#define REG_ACCUM UINT64_C(0x00219000) \/* accumulator: AL, AX, EAX, RAX *\/\n-#define REG_AL UINT64_C(0x00219001)\n-#define REG_AX UINT64_C(0x00219002)\n-#define REG_EAX UINT64_C(0x00219004)\n-#define REG_RAX UINT64_C(0x00219008)\n-#define REG_COUNT UINT64_C(0x10229000) \/* counter: CL, CX, ECX, RCX *\/\n-#define REG_CL UINT64_C(0x10229001)\n-#define REG_CX UINT64_C(0x10229002)\n-#define REG_ECX UINT64_C(0x10229004)\n-#define REG_RCX UINT64_C(0x10229008)\n-#define REG_DL UINT64_C(0x10249001) \/* data: DL, DX, EDX, RDX *\/\n-#define REG_DX UINT64_C(0x10249002)\n-#define REG_EDX UINT64_C(0x10249004)\n-#define REG_RDX UINT64_C(0x10249008)\n-#define REG_HIGH UINT64_C(0x10289001) \/* high regs: AH, CH, DH, BH *\/\n-#define REG_NOTACC UINT64_C(0x10000000) \/* non-accumulator register *\/\n-#define REG8NA UINT64_C(0x10209001) \/* 8-bit non-acc GPR *\/\n-#define REG16NA UINT64_C(0x10209002) \/* 16-bit non-acc GPR *\/\n-#define REG32NA UINT64_C(0x10209004) \/* 32-bit non-acc GPR *\/\n-#define REG64NA UINT64_C(0x10209008) \/* 64-bit non-acc GPR *\/\n+#define REG_SMASK SUBCLASS_MASK \/* a mask for the following *\/\n+#define REG_ACCUM (GEN_SUBCLASS(1) | REG_CLASS_GPR | REGMEM | REGISTER) \/* accumulator: AL, AX, EAX, RAX *\/\n+#define REG_AL (GEN_SUBCLASS(1) | REG_CLASS_GPR | BITS8 | REGMEM | REGISTER)\n+#define REG_AX (GEN_SUBCLASS(1) | REG_CLASS_GPR | BITS16 | REGMEM | REGISTER)\n+#define REG_EAX (GEN_SUBCLASS(1) | REG_CLASS_GPR | BITS32 | REGMEM | REGISTER)\n+#define REG_RAX (GEN_SUBCLASS(1) | REG_CLASS_GPR | BITS64 | REGMEM | REGISTER)\n+#define REG_COUNT (GEN_SUBCLASS(5) | GEN_SUBCLASS(2) | REG_CLASS_GPR | REGMEM | REGISTER) \/* counter: CL, CX, ECX, RCX *\/\n+#define REG_CL (GEN_SUBCLASS(5) | GEN_SUBCLASS(2) | REG_CLASS_GPR | BITS8 | REGMEM | REGISTER)\n+#define REG_CX (GEN_SUBCLASS(5) | GEN_SUBCLASS(2) | REG_CLASS_GPR | BITS16 | REGMEM | REGISTER)\n+#define REG_ECX (GEN_SUBCLASS(5) | GEN_SUBCLASS(2) | REG_CLASS_GPR | BITS32 | REGMEM | REGISTER)\n+#define REG_RCX (GEN_SUBCLASS(5) | GEN_SUBCLASS(2) | REG_CLASS_GPR | BITS64 | REGMEM | REGISTER)\n+#define REG_DL (GEN_SUBCLASS(5) | GEN_SUBCLASS(3) | REG_CLASS_GPR | BITS8 | REGMEM | REGISTER) \/* data: DL, DX, EDX, RDX *\/\n+#define REG_DX (GEN_SUBCLASS(5) | GEN_SUBCLASS(3) | REG_CLASS_GPR | BITS16 | REGMEM | REGISTER)\n+#define REG_EDX (GEN_SUBCLASS(5) | GEN_SUBCLASS(3) | REG_CLASS_GPR | BITS32 | REGMEM | REGISTER)\n+#define REG_RDX (GEN_SUBCLASS(5) | GEN_SUBCLASS(3) | REG_CLASS_GPR | BITS64 | REGMEM | REGISTER)\n+#define REG_HIGH (GEN_SUBCLASS(5) | GEN_SUBCLASS(4) | REG_CLASS_GPR | BITS8 | REGMEM | REGISTER) \/* high regs: AH, CH, DH, BH *\/\n+#define REG_NOTACC GEN_SUBCLASS(5) \/* non-accumulator register *\/\n+#define REG8NA (GEN_SUBCLASS(5) | REG_CLASS_GPR | BITS8 | REGMEM | REGISTER) \/* 8-bit non-acc GPR *\/\n+#define REG16NA (GEN_SUBCLASS(5) | REG_CLASS_GPR | BITS16 | REGMEM | REGISTER) \/* 16-bit non-acc GPR *\/\n+#define REG32NA (GEN_SUBCLASS(5) | REG_CLASS_GPR | BITS32 | REGMEM | REGISTER) \/* 32-bit non-acc GPR *\/\n+#define REG64NA (GEN_SUBCLASS(5) | REG_CLASS_GPR | BITS64 | REGMEM | REGISTER) \/* 64-bit non-acc GPR *\/\n \n \/* special types of EAs *\/\n-#define MEM_OFFS UINT64_C(0x0001c000) \/* simple [address] offset - absolute! *\/\n-#define IP_REL UINT64_C(0x0002c000) \/* IP-relative offset *\/\n+#define MEM_OFFS (GEN_SUBCLASS(1) | MEMORY) \/* simple [address] offset - absolute! *\/\n+#define IP_REL (GEN_SUBCLASS(2) | MEMORY) \/* IP-relative offset *\/\n \n \/* memory which matches any type of r\/m operand *\/\n-#define MEMORY_ANY (MEMORY|RM_GPR|RM_MMX|RM_XMM|RM_YMM)\n+#define MEMORY_ANY (MEMORY | RM_GPR | RM_MMX | RM_XMM | RM_YMM)\n \n \/* special type of immediate operand *\/\n-#define UNITY UINT64_C(0x00012000) \/* for shift\/rotate instructions *\/\n-#define SBYTE16 UINT64_C(0x00022000) \/* for op r16,immediate instrs. *\/\n-#define SBYTE32 UINT64_C(0x00042000) \/* for op r32,immediate instrs. *\/\n-#define SBYTE64 UINT64_C(0x00082000) \/* for op r64,immediate instrs. *\/\n-#define BYTENESS UINT64_C(0x000e0000) \/* for testing for byteness *\/\n-#define SDWORD64\tUINT64_C(0x10002000) \/* for op r64,simm32 instrs. *\/\n-#define UDWORD64\tUINT64_C(0x00002800) \/* for op r64,uimm32 instrs. *\/\n+#define UNITY (GEN_SUBCLASS(1) | IMMEDIATE) \/* for shift\/rotate instructions *\/\n+#define SBYTE16 (GEN_SUBCLASS(2) | IMMEDIATE) \/* for op r16,immediate instrs. *\/\n+#define SBYTE32 (GEN_SUBCLASS(3) | IMMEDIATE) \/* for op r32,immediate instrs. *\/\n+#define SBYTE64 (GEN_SUBCLASS(4) | IMMEDIATE) \/* for op r64,immediate instrs. *\/\n+#define SDWORD64\t (GEN_SUBCLASS(5) | IMMEDIATE) \/* for op r64,simm32 instrs. *\/\n+#define UDWORD64\t (GEN_SUBCLASS(0) | IMMEDIATE) \/* for op r64,uimm32 instrs. *\/\n+\n+#define BYTENESS (GEN_SUBCLASS(2) | \\\n+ GEN_SUBCLASS(3) | \\\n+ GEN_SUBCLASS(4)) \/* for testing for byteness *\/\n \n \/* special flags *\/\n-#define SAME_AS UINT64_C(0x40000000)\n+#define SAME_AS GEN_SPECIAL(0)\n \n #endif \/* NASM_OPFLAGS_H *\/\n"} {"commit":"95fff0e2ad2e3c1abfe59c9cb3ac52f8891807c5","subject":"Explicitly include for custom hash functor.","message":"Explicitly include for custom hash functor.\n","repos":"thomaskrause\/graphANNIS,thomaskrause\/graphANNIS,thomaskrause\/graphANNIS,thomaskrause\/graphANNIS,thomaskrause\/graphANNIS,thomaskrause\/graphANNIS,thomaskrause\/graphANNIS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/annis\/types.h\n+++ include\/annis\/types.h\n@@ -4,6 +4,7 @@\n #include <string>\n #include <cstring>\n #include <limits>\n+#include <unordered_map>\n \n \/\/ add implemtations for the types defined here to the std::less operator (and some for the std::hash)\n #define ANNIS_STRUCT_COMPARE(a, b) {if(a < b) {return true;} else if(a > b) {return false;}}\n"} {"commit":"624efe61c31c1bb6e532a8f09b4d56f9b2376984","subject":"gtest: Fix build with gcc 4.7","message":"gtest: Fix build with gcc 4.7\n\nInclusion order has to be changed because of gcc\nstandards compliance fix.\nhttp:\/\/gcc.gnu.org\/bugzilla\/show_bug.cgi?id=29131\n\nSigned-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>\n\nChange-Id: Ieea28ad3897f10901bce72bed8f0e536b961372e\n","repos":"xhteam\/external-gtest,SlimSaber\/android_external_gtest,RichardLuo\/rowboat-external-gtest,aospX\/platform_external_gtest,olibc\/gtest,geekboxzone\/mmallow_external_gtest,geekboxzone\/lollipop_external_gtest,Omegaphora\/external_gtest,thiz11\/platform_external_gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,geekboxzone\/mmallow_external_gtest,thiz11\/platform_external_gtest,Nico60\/external_gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,PurityROM\/platform_external_gtest,omapzoom\/platform-external-gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,omapzoom\/platform-external-gtest,RichardLuo\/rowboat-external-gtest,xhteam\/external-gtest,IllusionRom-deprecated\/android_platform_external_gtest,olibc\/gtest,yinquan529\/platform-external-gtest,geekboxzone\/lollipop_external_gtest,yinquan529\/platform-external-gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,PurityROM\/platform_external_gtest,TeamNyx\/external_gtest,aospX\/platform_external_gtest,SaleJumper\/android-source-browsing.platform--external--gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,SlimSaber\/android_external_gtest,IllusionRom-deprecated\/android_platform_external_gtest,IllusionRom-deprecated\/android_platform_external_gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,bhargavkumar040\/android-source-browsing.platform--external--gtest,thiz11\/platform_external_gtest,android-ia\/platform_external_gtest,ThangBK2009\/android-source-browsing.platform--external--gtest,android-ia\/platform_external_gtest,Omegaphora\/external_gtest,PurityROM\/platform_external_gtest,Nico60\/external_gtest,yinquan529\/platform-external-gtest,SlimSaber\/android_external_gtest,RichardLuo\/rowboat-external-gtest,SaleJumper\/android-source-browsing.platform--external--gtest,olibc\/gtest,Nico60\/external_gtest,TeamNyx\/external_gtest,SaleJumper\/android-source-browsing.platform--external--gtest,Pankaj-Sakariya\/android-source-browsing.platform--external--gtest,xhteam\/external-gtest,aospX\/platform_external_gtest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/gtest-param-test.h\n+++ include\/gtest\/gtest-param-test.h\n@@ -155,7 +155,6 @@\n \n #include <gtest\/internal\/gtest-internal.h>\n #include <gtest\/internal\/gtest-param-util.h>\n-#include <gtest\/internal\/gtest-param-util-generated.h>\n \n namespace testing {\n \n@@ -288,6 +287,10 @@\n const Container& container) {\n return ValuesIn(container.begin(), container.end());\n }\n+\n+} \/\/ namespace testing\n+#include <gtest\/internal\/gtest-param-util-generated.h> \/\/ Must be included after ValuesIn and friends are defined\n+namespace testing { \/\/ And back in...\n \n \/\/ Values() allows generating tests from explicitly specified list of\n \/\/ parameters.\n"} {"commit":"1c0a278da255e575c05bd297537d82e50c10eca3","subject":"Define options in alphabetical order.","message":"Define options in alphabetical order.\n","repos":"isbadawi\/badavi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- options.h\n+++ options.h\n@@ -6,32 +6,32 @@\n \n #define BUFFER_OPTIONS \\\n OPTION(autoindent, bool, false) \\\n+ OPTION(cinwords, string, \"if,else,while,do,for,switch\") \\\n+ OPTION(expandtab, bool, false) \\\n+ OPTION(modifiable, bool, true) \\\n+ OPTION(modified, bool, false) \\\n+ OPTION(readonly, bool, false) \\\n+ OPTION(shiftwidth, int, 8) \\\n OPTION(smartindent, bool, false) \\\n- OPTION(shiftwidth, int, 8) \\\n OPTION(tabstop, int, 8) \\\n- OPTION(expandtab, bool, false) \\\n- OPTION(cinwords, string, \"if,else,while,do,for,switch\") \\\n- OPTION(modified, bool, false) \\\n- OPTION(modifiable, bool, true) \\\n- OPTION(readonly, bool, false) \\\n \n #define WINDOW_OPTIONS \\\n+ OPTION(cursorline, bool, false) \\\n+ OPTION(number, bool, false) \\\n OPTION(numberwidth, int, 4) \\\n- OPTION(number, bool, false) \\\n OPTION(relativenumber, bool, false) \\\n- OPTION(cursorline, bool, false) \\\n \n #define EDITOR_OPTIONS \\\n+ OPTION(equalalways, bool, true) \\\n OPTION(history, int, 50) \\\n- OPTION(sidescroll, int, 0) \\\n+ OPTION(hlsearch, bool, false) \\\n OPTION(ignorecase, bool, false) \\\n- OPTION(smartcase, bool, false) \\\n- OPTION(splitright, bool, false) \\\n- OPTION(splitbelow, bool, false) \\\n- OPTION(equalalways, bool, true) \\\n- OPTION(hlsearch, bool, false) \\\n OPTION(incsearch, bool, false) \\\n OPTION(ruler, bool, false) \\\n+ OPTION(sidescroll, int, 0) \\\n+ OPTION(smartcase, bool, false) \\\n+ OPTION(splitbelow, bool, false) \\\n+ OPTION(splitright, bool, false) \\\n \n struct editor;\n struct window;\n"} {"commit":"104b8deaa5c0144cccfc7d914413ff80c7176af1","subject":"[PATCH] unify pfn_to_page: sh pfn_to_page","message":"[PATCH] unify pfn_to_page: sh pfn_to_page\n\nsh can use generic funcs.\n\nSigned-off-by: KAMEZAWA Hiroyuki <634f508bd7c47cf0ee4126243675c3e598920fbc@jp.fujitsu.com>\nCc: Paul Mundt <38b52dbb5f0b63d149982b6c5de788ec93a89032@linux-sh.org>\nCc: Kazumoto Kojima <5f374640ce4129c6fb14371ee9c992d96e0e729c@rr.iij4u.or.jp>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-sh\/page.h\n+++ include\/asm-sh\/page.h\n@@ -105,9 +105,7 @@\n \n \/* PFN start number, because of __MEMORY_START *\/\n #define PFN_START\t\t(__MEMORY_START >> PAGE_SHIFT)\n-\n-#define pfn_to_page(pfn)\t(mem_map + (pfn) - PFN_START)\n-#define page_to_pfn(page)\t((unsigned long)((page) - mem_map) + PFN_START)\n+#define ARCH_PFN_OFFSET\t\t(FPN_START)\n #define virt_to_page(kaddr)\tpfn_to_page(__pa(kaddr) >> PAGE_SHIFT)\n #define pfn_valid(pfn)\t\t(((pfn) - PFN_START) < max_mapnr)\n #define virt_addr_valid(kaddr)\tpfn_valid(__pa(kaddr) >> PAGE_SHIFT)\n@@ -117,6 +115,7 @@\n \n #endif \/* __KERNEL__ *\/\n \n+#include <asm-generic\/memory_model.h>\n #include <asm-generic\/page.h>\n \n #endif \/* __ASM_SH_PAGE_H *\/\n"} {"commit":"270068cc29b58767448414c89ec20585a51cfb7a","subject":"Remove broken CREATEOPT_INIT macro","message":"Remove broken CREATEOPT_INIT macro\n\nThis macro was broken and shouldn't be inside the header anyway\n\nChange-Id: I6fc7b5fcc6c9e48190ba208046ed5965756f7843\nReviewed-on: http:\/\/review.couchbase.org\/43748\nTested-by: Mark Nunberg <e7d42768707bf23038325b0b68d4b577e5f6064a@haskalah.org>\nReviewed-by: Sergey Avseyev <87f6d5e4fd3644c3c20800cde7fd3ad1569370b3@gmail.com>\n","repos":"couchbase\/libcouchbase,signmotion\/libcouchbase,mnunberg\/libcouchbase,mnunberg\/libcouchbase,senthilkumaranb\/libcouchbase,PureSwift\/libcouchbase,mnunberg\/libcouchbase,PureSwift\/libcouchbase,signmotion\/libcouchbase,kojiromike\/libcouchbase,mody\/libcouchbase,signmotion\/libcouchbase,kojiromike\/libcouchbase,mnunberg\/libcouchbase,couchbase\/libcouchbase,mody\/libcouchbase,avsej\/libcouchbase,couchbase\/libcouchbase,maxim-ky\/libcouchbase,avsej\/libcouchbase,avsej\/libcouchbase,signmotion\/libcouchbase,couchbase\/libcouchbase,avsej\/libcouchbase,maxim-ky\/libcouchbase,senthilkumaranb\/libcouchbase,avsej\/libcouchbase,couchbase\/libcouchbase,senthilkumaranb\/libcouchbase,mody\/libcouchbase,PureSwift\/libcouchbase,kojiromike\/libcouchbase,maxim-ky\/libcouchbase,couchbase\/libcouchbase,mnunberg\/libcouchbase,PureSwift\/libcouchbase,avsej\/libcouchbase,avsej\/libcouchbase,senthilkumaranb\/libcouchbase,maxim-ky\/libcouchbase,couchbase\/libcouchbase,mody\/libcouchbase,kojiromike\/libcouchbase","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/libcouchbase\/couchbase.h\n+++ include\/libcouchbase\/couchbase.h\n@@ -272,14 +272,6 @@\n struct lcb_create_st2 v2;\n struct lcb_create_st3 v3; \/**< Use this field *\/\n } v;\n-\n-#define LCB_CREATEOPT_INIT(cropt, s, iops) do { \\\n- memset(cropt, 0, sizeof(*cropt)); \\\n- (cropt)->version = 3; \\\n- (cropt)->v.v3.connstr = s; \\\n- (cropt)->v.v3.iops = iops; \\\n-} while (0);\n-\n LCB_DEPR_CTORS_CRST\n };\n \n"} {"commit":"609e03d49ef3eb61299b7f2108c00886430516fa","subject":"Block all signals during store_pageinfo() and free_unclaimed_pages()","message":"Block all signals during store_pageinfo() and free_unclaimed_pages()\n\nThe friendly folks at #musl again:\n\n21:34 < dalias> the cheap way around this problem is to block signals for the\n entire duration of the unsafe operation\n21:35 < dalias> formally (by the rules of the standard) this is not sufficient\n21:35 < dalias> because formally it's not just calling pthread_mutex_lock again\n on the same mutex while the first call is interrupted that's undefined\n21:36 < dalias> it's calling ANY unsafe function while ANY unsafe function (the\n same or otherwise) with any argument (e.g. not necessarily the same mutex)\n that gives undefined behavior\n21:38 < dalias> but real-world-implementations don't have this maximum\n theoretical degree of unsafety\n21:38 < dalias> so the approach i described (just ensuring your functions don't\n interrupt themselves or each other) should be enough to make them safe\n","repos":"Feh\/nocache,lazy404\/nocache,lazy404\/nocache,Feh\/nocache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- nocache.c\n+++ nocache.c\n@@ -12,6 +12,7 @@\n #include <sys\/time.h>\n #include <sys\/resource.h>\n #include <assert.h>\n+#include <signal.h>\n \n #include \"fcntl_helpers.h\"\n \n@@ -326,9 +327,13 @@\n struct stat st;\n void *file = NULL;\n unsigned char *pageinfo = NULL;\n+ sigset_t mask, old_mask;\n+\n+ sigfillset(&mask);\n+ sigprocmask(SIG_BLOCK, &mask, &old_mask);\n \n if(fstat(fd, &st) == -1 || !S_ISREG(st.st_mode))\n- return;\n+ goto restoresigset;\n \n \/* Hint we'll be using this file only once;\n * the Linux kernel will currently ignore this *\/\n@@ -340,7 +345,7 @@\n ;\n if(i == max_fds) {\n pthread_mutex_unlock(&lock);\n- return; \/* no space! *\/\n+ goto restoresigset; \/* no space! *\/\n }\n fds[i].fd = fd;\n pthread_mutex_unlock(&lock);\n@@ -351,7 +356,7 @@\n fds[i].size = 0;\n fds[i].nr_pages = 0;\n fds[i].info = NULL;\n- return;\n+ goto restoresigset;\n }\n \n fds[i].size = st.st_size;\n@@ -368,7 +373,7 @@\n fds[i].info = pageinfo;\n \n munmap(file, st.st_size);\n- return;\n+ goto restoresigset;\n \n cleanup:\n fds[i].fd = -1;\n@@ -376,15 +381,24 @@\n free(pageinfo);\n if(file)\n munmap(file, st.st_size);\n+\n+ restoresigset:\n+ sigprocmask(SIG_SETMASK, &old_mask, NULL);\n+\n+ return;\n }\n \n static void free_unclaimed_pages(int fd)\n {\n int i, j;\n int start;\n+ sigset_t mask, old_mask;\n \n if(fd == -1)\n return;\n+\n+ sigfillset(&mask);\n+ sigprocmask(SIG_BLOCK, &mask, &old_mask);\n \n pthread_mutex_lock(&lock);\n for(i = 0; i < max_fds; i++)\n@@ -392,7 +406,7 @@\n break;\n pthread_mutex_unlock(&lock);\n if(i == max_fds)\n- return; \/* not found *\/\n+ goto restoresigset; \/* not found *\/\n \n sync_if_writable(fd);\n \n@@ -411,4 +425,7 @@\n \n free(fds[i].info);\n fds[i].fd = -1;\n-}\n+\n+ restoresigset:\n+ sigprocmask(SIG_SETMASK, &old_mask, NULL);\n+}\n"} {"commit":"accdb6fcaeb7cd86f435a0287b38c4e2a91b1163","subject":"Removing arbitrary spacing from class declarations.","message":"Removing arbitrary spacing from class declarations.\n","repos":"Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/base\/getpot.h\n+++ include\/base\/getpot.h\n@@ -146,29 +146,31 @@\n \/**\n * absorbing contents of another GetPot object\n *\/\n- inline void absorb(const GetPot& Other);\n+ inline void absorb(const GetPot& Other);\n \n \/**\n * for ufo detection: recording requested arguments, options etc.\n *\/\n- inline void clear_requests();\n- inline void disable_request_recording() { request_recording_f = false; }\n- inline void enable_request_recording() { request_recording_f = true; }\n+ inline void clear_requests();\n+ inline void disable_request_recording() { request_recording_f = false; }\n+ inline void enable_request_recording() { request_recording_f = true; }\n \n \/**\n * direct access to command line arguments\n *\/\n- inline const char* operator[](unsigned Idx) const;\n+ inline const char* operator[](unsigned Idx) const;\n+\n template <typename T>\n- inline T get(unsigned Idx, const T& Default) const;\n- inline const char* get(unsigned Idx, const char* Default) const;\n- inline unsigned size() const;\n+ inline T get(unsigned Idx, const T& Default) const;\n+\n+ inline const char* get(unsigned Idx, const char* Default) const;\n+ inline unsigned size() const;\n \n \/**\n * flags\n *\/\n- inline bool options_contain(const char* FlagList) const;\n- inline bool argument_contains(unsigned Idx, const char* FlagList) const;\n+ inline bool options_contain(const char* FlagList) const;\n+ inline bool argument_contains(unsigned Idx, const char* FlagList) const;\n \n \/**\n * variables\n@@ -177,49 +179,57 @@\n \/**\n * check for a variable\n *\/\n- inline bool have_variable(const char* VarName) const;\n- inline bool have_variable(const std::string& VarName) const;\n+ inline bool have_variable(const char* VarName) const;\n+ inline bool have_variable(const std::string& VarName) const;\n \n \/**\n * scalar values\n *\/\n template<typename T>\n- inline T operator()(const char* VarName, const T& Default) const;\n+ inline T operator()(const char* VarName, const T& Default) const;\n+\n template<typename T>\n- inline T operator()(const std::string& VarName, const T& Default) const;\n- inline const char* operator()(const char* VarName, const char* Default) const;\n- inline const char* operator()(const std::string& VarName, const char* Default) const;\n+ inline T operator()(const std::string& VarName, const T& Default) const;\n+\n+ inline const char* operator()(const char* VarName, const char* Default) const;\n+ inline const char* operator()(const std::string& VarName, const char* Default) const;\n \n \/**\n * vectors\n *\/\n template<typename T>\n- inline T operator()(const char* VarName, const T& Default, unsigned Idx) const;\n+ inline T operator()(const char* VarName, const T& Default, unsigned Idx) const;\n+\n template<typename T>\n- inline T operator()(const std::string& VarName, const T& Default, unsigned Idx) const;\n- inline const char* operator()(const char* VarName, const char* Default, unsigned Idx) const;\n- inline const char* operator()(const std::string& VarName, const char* Default, unsigned Idx) const;\n+ inline T operator()(const std::string& VarName, const T& Default, unsigned Idx) const;\n+\n+ inline const char* operator()(const char* VarName, const char* Default, unsigned Idx) const;\n+ inline const char* operator()(const std::string& VarName, const char* Default, unsigned Idx) const;\n \n \/**\n * access varibles, but error out if not present\n * scalar values\n *\/\n template<typename T>\n- inline T get_value_no_default(const char* VarName, const T& Default) const;\n+ inline T get_value_no_default(const char* VarName, const T& Default) const;\n+\n template<typename T>\n- inline T get_value_no_default(const std::string& VarName, const T& Default) const;\n- inline const char* get_value_no_default(const char* VarName, const char* Default) const;\n- inline const char* get_value_no_default(const std::string& VarName, const char* Default) const;\n+ inline T get_value_no_default(const std::string& VarName, const T& Default) const;\n+\n+ inline const char* get_value_no_default(const char* VarName, const char* Default) const;\n+ inline const char* get_value_no_default(const std::string& VarName, const char* Default) const;\n \n \/**\n * vectors\n *\/\n template<typename T>\n- inline T get_value_no_default(const char* VarName, const T& Default, unsigned Idx) const;\n+ inline T get_value_no_default(const char* VarName, const T& Default, unsigned Idx) const;\n+\n template<typename T>\n- inline T get_value_no_default(const std::string& VarName, const T& Default, unsigned Idx) const;\n- inline const char* get_value_no_default(const char* VarName, const char* Default, unsigned Idx) const;\n- inline const char* get_value_no_default(const std::string& VarName, const char* Default, unsigned Idx) const;\n+ inline T get_value_no_default(const std::string& VarName, const T& Default, unsigned Idx) const;\n+\n+ inline const char* get_value_no_default(const char* VarName, const char* Default, unsigned Idx) const;\n+ inline const char* get_value_no_default(const std::string& VarName, const char* Default, unsigned Idx) const;\n \n \/**\n * setting variables\n@@ -227,110 +237,114 @@\n * ii) from inside, use '_set_variable()' below\n *\/\n template<typename T>\n- inline void set(const char* VarName, const T& Value, const bool Requested = true);\n+ inline void set(const char* VarName, const T& Value, const bool Requested = true);\n+\n template<typename T>\n- inline void set(const std::string& VarName, const T& Value, const bool Requested = true);\n- inline void set(const char* VarName, const char* Value, const bool Requested = true);\n- inline void set(const std::string& VarName, const char* Value, const bool Requested = true);\n-\n- inline unsigned vector_variable_size(const char* VarName) const;\n- inline unsigned vector_variable_size(const std::string& VarName) const;\n- inline STRING_VECTOR get_variable_names() const;\n- inline STRING_VECTOR get_section_names() const;\n- inline\n- std::set<std::string> get_overridden_variables() const;\n+ inline void set(const std::string& VarName, const T& Value, const bool Requested = true);\n+\n+ inline void set(const char* VarName, const char* Value, const bool Requested = true);\n+ inline void set(const std::string& VarName, const char* Value, const bool Requested = true);\n+\n+ inline unsigned vector_variable_size(const char* VarName) const;\n+ inline unsigned vector_variable_size(const std::string& VarName) const;\n+ inline STRING_VECTOR get_variable_names() const;\n+ inline STRING_VECTOR get_section_names() const;\n+ inline std::set<std::string> get_overridden_variables() const;\n \n \/**\n * cursor oriented functions\n *\/\n- inline void set_prefix(const char* Prefix) { prefix = std::string(Prefix); }\n- inline bool search_failed() const { return search_failed_f; }\n+ inline void set_prefix(const char* Prefix) { prefix = std::string(Prefix); }\n+ inline bool search_failed() const { return search_failed_f; }\n \n \/**\n * enable\/disable search for an option in loop\n *\/\n- inline void disable_loop() { search_loop_f = false; }\n- inline void enable_loop() { search_loop_f = true; }\n+ inline void disable_loop() { search_loop_f = false; }\n+ inline void enable_loop() { search_loop_f = true; }\n \n \/**\n * reset cursor to position '1'\n *\/\n- inline void reset_cursor();\n- inline void init_multiple_occurrence();\n+ inline void reset_cursor();\n+ inline void init_multiple_occurrence();\n \n \/**\n * search for a certain option and set cursor to position\n *\/\n- inline bool search(const char* option);\n- inline bool search(const std::string& option);\n- inline bool search(unsigned No, const char* P, ...);\n+ inline bool search(const char* option);\n+ inline bool search(const std::string& option);\n+ inline bool search(unsigned No, const char* P, ...);\n \n \/**\n * get argument at cursor++\n *\/\n template<typename T>\n- inline T next(const T& Default);\n- inline const char* next(const char* Default);\n+ inline T next(const T& Default);\n+\n+ inline const char* next(const char* Default);\n \n \/**\n * search for option and get argument at cursor++\n *\/\n template<typename T>\n- inline T follow(const T& Default, const char* Option);\n- inline const char* follow(const char* Default, const char* Option);\n+ inline T follow(const T& Default, const char* Option);\n+\n+ inline const char* follow(const char* Default, const char* Option);\n \n \/**\n * search for one of the given options and get argument that follows it\n *\/\n template<typename T>\n- inline T follow(const T& Default, unsigned No, const char* Option, ...);\n- inline const char* follow(const char* Default, unsigned No, const char* Option, ...);\n+ inline T follow(const T& Default, unsigned No, const char* Option, ...);\n+\n+ inline const char* follow(const char* Default, unsigned No, const char* Option, ...);\n \n \/**\n * directly followed arguments\n *\/\n template<typename T>\n- inline T direct_follow(const T& Default, const char* Option);\n- inline const char* direct_follow(const char* Default, const char* Option);\n+ inline T direct_follow(const T& Default, const char* Option);\n+\n+ inline const char* direct_follow(const char* Default, const char* Option);\n \n \/**\n * nominus arguments\n *\/\n- inline void reset_nominus_cursor();\n- inline STRING_VECTOR nominus_vector() const;\n- inline unsigned nominus_size() const { return getpot_cast_int<unsigned>(idx_nominus.size()); }\n- inline const char* next_nominus();\n+ inline void reset_nominus_cursor();\n+ inline STRING_VECTOR nominus_vector() const;\n+ inline unsigned nominus_size() const { return getpot_cast_int<unsigned>(idx_nominus.size()); }\n+ inline const char* next_nominus();\n \n \/**\n * unidentified flying objects\n *\/\n- inline STRING_VECTOR unidentified_arguments(unsigned Number, const char* Known, ...) const;\n- inline STRING_VECTOR unidentified_arguments(const std::set<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_arguments(const std::vector<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_arguments() const;\n-\n- inline STRING_VECTOR unidentified_options(unsigned Number, const char* Known, ...) const;\n- inline STRING_VECTOR unidentified_options(const std::set<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_options(const std::vector<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_options() const;\n-\n- inline std::string unidentified_flags(const char* Known,\n- int ArgumentNumber \/* =-1 *\/) const;\n-\n- inline STRING_VECTOR unidentified_variables(unsigned Number, const char* Known, ...) const;\n- inline STRING_VECTOR unidentified_variables(const std::set<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_variables(const std::vector<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_variables() const;\n-\n- inline STRING_VECTOR unidentified_sections(unsigned Number, const char* Known, ...) const;\n- inline STRING_VECTOR unidentified_sections(const std::set<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_sections(const std::vector<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_sections() const;\n-\n- inline STRING_VECTOR unidentified_nominuses(unsigned Number, const char* Known, ...) const;\n- inline STRING_VECTOR unidentified_nominuses(const std::set<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_nominuses(const std::vector<std::string>& Knowns) const;\n- inline STRING_VECTOR unidentified_nominuses() const;\n+ inline STRING_VECTOR unidentified_arguments(unsigned Number, const char* Known, ...) const;\n+ inline STRING_VECTOR unidentified_arguments(const std::set<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_arguments(const std::vector<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_arguments() const;\n+\n+ inline STRING_VECTOR unidentified_options(unsigned Number, const char* Known, ...) const;\n+ inline STRING_VECTOR unidentified_options(const std::set<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_options(const std::vector<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_options() const;\n+\n+ inline std::string unidentified_flags(const char* Known, int ArgumentNumber \/* =-1 *\/) const;\n+\n+ inline STRING_VECTOR unidentified_variables(unsigned Number, const char* Known, ...) const;\n+ inline STRING_VECTOR unidentified_variables(const std::set<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_variables(const std::vector<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_variables() const;\n+\n+ inline STRING_VECTOR unidentified_sections(unsigned Number, const char* Known, ...) const;\n+ inline STRING_VECTOR unidentified_sections(const std::set<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_sections(const std::vector<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_sections() const;\n+\n+ inline STRING_VECTOR unidentified_nominuses(unsigned Number, const char* Known, ...) const;\n+ inline STRING_VECTOR unidentified_nominuses(const std::set<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_nominuses(const std::vector<std::string>& Knowns) const;\n+ inline STRING_VECTOR unidentified_nominuses() const;\n \n \/**\n * output\n@@ -367,42 +381,42 @@\n ~variable();\n variable& operator=(const variable& Other);\n \n- void take(const char* Value, const char* FieldSeparator);\n+ void take(const char* Value, const char* FieldSeparator);\n \n \/**\n * get a specific element in the string vector\n * (return 0 if not present)\n *\/\n- const std::string* get_element(unsigned Idx) const;\n+ const std::string* get_element(unsigned Idx) const;\n \n \/**\n * data memebers\n *\/\n- std::string name; \/\/ identifier of variable\n- STRING_VECTOR value; \/\/ value of variable stored in vector\n- std::string original; \/\/ value of variable as given on command line\n+ std::string name; \/\/ identifier of variable\n+ STRING_VECTOR value; \/\/ value of variable stored in vector\n+ std::string original; \/\/ value of variable as given on command line\n };\n \n \/**\n * member variables\n *\/\n- std::string prefix; \/\/ prefix automatically added in queries\n- std::string section; \/\/ (for dollar bracket parsing)\n- STRING_VECTOR section_list; \/\/ list of all parsed sections\n+ std::string prefix; \/\/ prefix automatically added in queries\n+ std::string section; \/\/ (for dollar bracket parsing)\n+ STRING_VECTOR section_list; \/\/ list of all parsed sections\n \n \/**\n * argument vector\n *\/\n- STRING_VECTOR argv; \/\/ vector of command line arguments stored as strings\n- unsigned cursor; \/\/ cursor for argv\n- bool search_loop_f; \/\/ shall search start at beginning after reaching end of arg array ?\n- bool search_failed_f; \/\/ flag indicating a failed search() operation (e.g. next() functions react with 'missed')\n+ STRING_VECTOR argv; \/\/ vector of command line arguments stored as strings\n+ unsigned cursor; \/\/ cursor for argv\n+ bool search_loop_f; \/\/ shall search start at beginning after reaching end of arg array ?\n+ bool search_failed_f; \/\/ flag indicating a failed search() operation (e.g. next() functions react with 'missed')\n std::set<std::string> overridden_vars; \/\/ vector of variables that were supplied more than once during parsing\n \n \/**\n * nominus vector\n *\/\n- int nominus_cursor; \/\/ cursor for nominus_pointers\n+ int nominus_cursor; \/\/ cursor for nominus_pointers\n std::vector<unsigned> idx_nominus; \/\/ indecies of 'no minus' arguments\n \n \/**\n@@ -413,13 +427,13 @@\n \/**\n * comment delimiters\n *\/\n- std::string _comment_start;\n- std::string _comment_end;\n+ std::string _comment_start;\n+ std::string _comment_end;\n \n \/**\n * field separator (separating elements of a vector)\n *\/\n- std::string _field_separator;\n+ std::string _field_separator;\n \n \/**\n * helper functor for creating sets of C-style strings\n@@ -453,7 +467,7 @@\n * some functions return a char pointer to a temporarily existing string\n * this function adds them to our container\n *\/\n- const char* _internal_managed_copy(const std::string& Arg) const;\n+ const char* _internal_managed_copy(const std::string& Arg) const;\n \n \/**\n * keeping track about arguments that are requested, so that the UFO detection\n@@ -463,7 +477,7 @@\n mutable std::set<std::string> _requested_variables;\n mutable std::set<std::string> _requested_sections;\n \n- bool request_recording_f; \/\/ speed: request recording can be turned off\n+ bool request_recording_f; \/\/ speed: request recording can be turned off\n \n \/**\n * if an argument is requested record it and the 'tag' the section branch to which\n@@ -471,8 +485,8 @@\n * These are \"const\" functions but they do modify the\n * mutable _requested_* members\n *\/\n- void _record_argument_request(const std::string& Arg) const;\n- void _record_variable_request(const std::string& Arg) const;\n+ void _record_argument_request(const std::string& Arg) const;\n+ void _record_variable_request(const std::string& Arg) const;\n \n \/**\n * helper functions\n@@ -481,9 +495,9 @@\n \/**\n * set variable from inside GetPot (no prefix considered)\n *\/\n- inline void _set_variable(const std::string& VarName,\n- const std::string& Value,\n- const bool Requested);\n+ inline void _set_variable(const std::string& VarName,\n+ const std::string& Value,\n+ const bool Requested);\n \n \/**\n * produce three basic data vectors:\n@@ -491,7 +505,7 @@\n * - nominus vector\n * - variable dictionary\n *\/\n- inline void _parse_argument_vector(const STRING_VECTOR& ARGV);\n+ inline void _parse_argument_vector(const STRING_VECTOR& ARGV);\n \n \/**\n * helpers for argument list processing\n@@ -500,43 +514,46 @@\n \/**\n * search for a variable in 'variables' array\n *\/\n- inline const variable* _find_variable(const char*) const;\n+ inline const variable* _find_variable(const char*) const;\n \n \/**\n * search (and record request) for a variable in 'variables' array\n *\/\n- inline const variable* _request_variable(const char*) const;\n+ inline const variable* _request_variable(const char*) const;\n \n \/**\n * support finding directly followed arguments\n *\/\n- inline const char* _match_starting_string(const char* StartString);\n+ inline const char* _match_starting_string(const char* StartString);\n \n \/**\n * support search for flags in a specific argument\n *\/\n- inline bool _check_flags(const std::string& Str, const char* FlagList) const;\n+ inline bool _check_flags(const std::string& Str, const char* FlagList) const;\n \n \/**\n * type conversion if possible\n *\/\n template<typename T>\n- inline T _convert_to_type(const std::string& String, const T& Default) const;\n- inline std::string _convert_to_type(const std::string& String, const char* Default) const;\n+ inline T _convert_to_type(const std::string& String, const T& Default) const;\n+\n+ inline std::string _convert_to_type(const std::string& String, const char* Default) const;\n+\n template<typename T>\n- inline T _convert_to_type_no_default(const char* VarName, const std::string& String, const T& Default) const;\n- inline std::string _convert_to_type_no_default(const char* VarName, const std::string& String, const char* Default) const;\n+ inline T _convert_to_type_no_default(const char* VarName, const std::string& String, const T& Default) const;\n+\n+ inline std::string _convert_to_type_no_default(const char* VarName, const std::string& String, const char* Default) const;\n \n \/**\n * prefix extraction\n *\/\n- const std::string _get_remaining_string(const std::string& String,\n- const std::string& Start) const;\n+ const std::string _get_remaining_string(const std::string& String,\n+ const std::string& Start) const;\n \/**\n * search for a specific string\n *\/\n- inline bool _search_string_vector(const STRING_VECTOR& Vec,\n- const std::string& Str) const;\n+ inline bool _search_string_vector(const STRING_VECTOR& Vec,\n+ const std::string& Str) const;\n \n \/**\n * helpers to parse input file\n@@ -548,24 +565,24 @@\n * my-variable='007 J. B.'\n * 3) interprete sections like '[..\/my-section]' etc.\n *\/\n- inline void _skip_whitespace(std::istream& istr);\n- inline const std::string _get_next_token(std::istream& istr);\n- inline const std::string _get_string(std::istream& istr);\n- inline const std::string _get_until_closing_bracket(std::istream& istr);\n- inline const std::string _get_until_closing_square_bracket(std::istream& istr);\n-\n- inline STRING_VECTOR _read_in_stream(std::istream& istr);\n- inline STRING_VECTOR _read_in_file(const std::string& FileName);\n- inline std::string _process_section_label(const std::string& Section,\n+ inline void _skip_whitespace(std::istream& istr);\n+ inline const std::string _get_next_token(std::istream& istr);\n+ inline const std::string _get_string(std::istream& istr);\n+ inline const std::string _get_until_closing_bracket(std::istream& istr);\n+ inline const std::string _get_until_closing_square_bracket(std::istream& istr);\n+\n+ inline STRING_VECTOR _read_in_stream(std::istream& istr);\n+ inline STRING_VECTOR _read_in_file(const std::string& FileName);\n+ inline std::string _process_section_label(const std::string& Section,\n STRING_VECTOR& section_stack);\n \n \/**\n * dollar bracket expressions\n *\/\n- std::string _DBE_expand_string(const std::string& str);\n- std::string _DBE_expand(const std::string& str);\n- const GetPot::variable* _DBE_get_variable(const std::string& str);\n- STRING_VECTOR _DBE_get_expr_list(const std::string& str, const unsigned ExpectedNumber);\n+ std::string _DBE_expand_string(const std::string& str);\n+ std::string _DBE_expand(const std::string& str);\n+ const GetPot::variable* _DBE_get_variable(const std::string& str);\n+ STRING_VECTOR _DBE_get_expr_list(const std::string& str, const unsigned ExpectedNumber);\n \n template <typename T>\n static std::string _convert_from_type(const T& Value)\n"} {"commit":"9cd3ecd674cf3194e07435b5b9559c4d432026d5","subject":"[NETFILTER]: include\/linux\/netfilter_bridge.h: header cleanup","message":"[NETFILTER]: include\/linux\/netfilter_bridge.h: header cleanup\n\nHeader doesn't use anything from atomic.h.\nIt fixes headers_check warning:\n\ninclude\/linux\/netfilter_bridge.h requires asm\/atomic.h, which does not exist\n\nCompile tested on\nalpha arm i386-up sparc sparc64-up x86_64\nalpha-up i386 sparc64 sparc-up x86_64-up\n\nSigned-off-by: Alexey Dobriyan <b99bff5923d24d2fb8e844db9dac7cd59203da1d@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/netfilter_bridge.h\n+++ include\/linux\/netfilter_bridge.h\n@@ -6,7 +6,6 @@\n \n #include <linux\/netfilter.h>\n #if defined(__KERNEL__) && defined(CONFIG_BRIDGE_NETFILTER)\n-#include <asm\/atomic.h>\n #include <linux\/if_ether.h>\n #endif\n \n"} {"commit":"00c0bb742d7b08f83a98a260020db2642a611798","subject":"Some clang compilers which use GCC cmath header files don't support hyperbolic inverse trig functions.","message":"Some clang compilers which use GCC cmath header files don't support\nhyperbolic inverse trig functions.\n","repos":"libMesh\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,90jrong\/libmesh,hrittich\/libmesh,giorgiobornia\/libmesh,jiangwen84\/libmesh,permcody\/libmesh,balborian\/libmesh,capitalaslash\/libmesh,Mbewu\/libmesh,jwpeterson\/libmesh,svallaghe\/libmesh,libMesh\/libmesh,Mbewu\/libmesh,dmcdougall\/libmesh,BalticPinguin\/libmesh,svallaghe\/libmesh,90jrong\/libmesh,dschwen\/libmesh,cahaynes\/libmesh,Mbewu\/libmesh,benkirk\/libmesh,friedmud\/libmesh,BalticPinguin\/libmesh,90jrong\/libmesh,roystgnr\/libmesh,dmcdougall\/libmesh,pbauman\/libmesh,vikramvgarg\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,aeslaughter\/libmesh,pbauman\/libmesh,Mbewu\/libmesh,balborian\/libmesh,friedmud\/libmesh,aeslaughter\/libmesh,Mbewu\/libmesh,dknez\/libmesh,permcody\/libmesh,benkirk\/libmesh,libMesh\/libmesh,dknez\/libmesh,pbauman\/libmesh,aeslaughter\/libmesh,benkirk\/libmesh,cahaynes\/libmesh,svallaghe\/libmesh,karpeev\/libmesh,capitalaslash\/libmesh,Mbewu\/libmesh,giorgiobornia\/libmesh,karpeev\/libmesh,giorgiobornia\/libmesh,svallaghe\/libmesh,coreymbryant\/libmesh,dschwen\/libmesh,90jrong\/libmesh,jwpeterson\/libmesh,pbauman\/libmesh,dknez\/libmesh,BalticPinguin\/libmesh,cahaynes\/libmesh,hrittich\/libmesh,coreymbryant\/libmesh,svallaghe\/libmesh,salazardetroya\/libmesh,salazardetroya\/libmesh,90jrong\/libmesh,cahaynes\/libmesh,karpeev\/libmesh,jiangwen84\/libmesh,vikramvgarg\/libmesh,90jrong\/libmesh,pbauman\/libmesh,capitalaslash\/libmesh,friedmud\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,hrittich\/libmesh,benkirk\/libmesh,balborian\/libmesh,Mbewu\/libmesh,friedmud\/libmesh,libMesh\/libmesh,libMesh\/libmesh,svallaghe\/libmesh,dknez\/libmesh,jwpeterson\/libmesh,BalticPinguin\/libmesh,benkirk\/libmesh,vikramvgarg\/libmesh,karpeev\/libmesh,cahaynes\/libmesh,balborian\/libmesh,dmcdougall\/libmesh,capitalaslash\/libmesh,vikramvgarg\/libmesh,dmcdougall\/libmesh,friedmud\/libmesh,permcody\/libmesh,giorgiobornia\/libmesh,roystgnr\/libmesh,svallaghe\/libmesh,friedmud\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,giorgiobornia\/libmesh,90jrong\/libmesh,vikramvgarg\/libmesh,giorgiobornia\/libmesh,permcody\/libmesh,karpeev\/libmesh,friedmud\/libmesh,roystgnr\/libmesh,permcody\/libmesh,dschwen\/libmesh,jiangwen84\/libmesh,capitalaslash\/libmesh,pbauman\/libmesh,salazardetroya\/libmesh,hrittich\/libmesh,BalticPinguin\/libmesh,Mbewu\/libmesh,aeslaughter\/libmesh,hrittich\/libmesh,jiangwen84\/libmesh,aeslaughter\/libmesh,dknez\/libmesh,jiangwen84\/libmesh,karpeev\/libmesh,svallaghe\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,hrittich\/libmesh,coreymbryant\/libmesh,dschwen\/libmesh,dmcdougall\/libmesh,permcody\/libmesh,capitalaslash\/libmesh,cahaynes\/libmesh,salazardetroya\/libmesh,dmcdougall\/libmesh,capitalaslash\/libmesh,pbauman\/libmesh,roystgnr\/libmesh,dmcdougall\/libmesh,jwpeterson\/libmesh,friedmud\/libmesh,coreymbryant\/libmesh,pbauman\/libmesh,hrittich\/libmesh,dmcdougall\/libmesh,jwpeterson\/libmesh,jwpeterson\/libmesh,aeslaughter\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,salazardetroya\/libmesh,balborian\/libmesh,benkirk\/libmesh,dknez\/libmesh,coreymbryant\/libmesh,cahaynes\/libmesh,permcody\/libmesh,jiangwen84\/libmesh,salazardetroya\/libmesh,benkirk\/libmesh,coreymbryant\/libmesh,dknez\/libmesh,svallaghe\/libmesh,dknez\/libmesh,roystgnr\/libmesh,karpeev\/libmesh,90jrong\/libmesh,balborian\/libmesh,coreymbryant\/libmesh,libMesh\/libmesh,salazardetroya\/libmesh,coreymbryant\/libmesh,jwpeterson\/libmesh,dschwen\/libmesh,permcody\/libmesh,vikramvgarg\/libmesh,friedmud\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,dschwen\/libmesh,Mbewu\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,balborian\/libmesh,libMesh\/libmesh,jiangwen84\/libmesh,cahaynes\/libmesh,salazardetroya\/libmesh,BalticPinguin\/libmesh,balborian\/libmesh,aeslaughter\/libmesh,balborian\/libmesh,giorgiobornia\/libmesh,aeslaughter\/libmesh,karpeev\/libmesh,aeslaughter\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,jiangwen84\/libmesh,jwpeterson\/libmesh,capitalaslash\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/base\/getpot.h\n+++ include\/base\/getpot.h\n@@ -89,7 +89,15 @@\n \n #endif\n \n-\n+\/\/ Only support hyperbolic inverse trig functions in C++11\n+#if __cplusplus > 199711L\n+\/\/ For non-clang compilers, we assume their C++11 mode supports\n+\/\/ hyperbolic inverse trig functions. Otherwise, we require a clang compiler\n+\/\/ from Apple with major version >= 6.\n+#if !defined(__clang__) || (defined(__apple_build_version__) && (__clang_major__ >= 6))\n+#define HAVE_HYPERBOLIC_INVERSE_TRIG_FUNCTIONS\n+#endif\n+#endif\n \n typedef std::vector<std::string> STRING_VECTOR;\n \n@@ -2848,7 +2856,7 @@\n double arg = _convert_to_type(A[0], 0.0);\n return _convert_from_type(std::tanh(arg));\n }\n-#if __cplusplus > 199711L \/\/ C++11 or better\n+#ifdef HAVE_HYPERBOLIC_INVERSE_TRIG_FUNCTIONS\n else if (funcname == \"asinh\")\n {\n STRING_VECTOR A =\n@@ -2870,7 +2878,7 @@\n double arg = _convert_to_type(A[0], 0.0);\n return _convert_from_type(std::atanh(arg));\n }\n-#endif \/\/ __cplusplus > 199711L\n+#endif \/\/ HAVE_HYPERBOLIC_INVERSE_TRIG_FUNCTIONS\n else if (funcname == \"sqrt\")\n {\n STRING_VECTOR A =\n"} {"commit":"a474e3fa6b07fd98874fde643aaeb9bf7460a286","subject":"Fix typo in comment.","message":"Fix typo in comment.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@236392 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/ADT\/edit_distance.h\n+++ include\/llvm\/ADT\/edit_distance.h\n@@ -50,7 +50,7 @@\n \/\/ http:\/\/en.wikipedia.org\/wiki\/Levenshtein_distance\n \/\/\n \/\/ Although the algorithm is typically described using an m x n\n- \/\/ array, only two rows are used at a time, so this implemenation\n+ \/\/ array, only two rows are used at a time, so this implementation\n \/\/ just keeps two separate vectors for those two rows.\n typename ArrayRef<T>::size_type m = FromArray.size();\n typename ArrayRef<T>::size_type n = ToArray.size();\n"} {"commit":"8d7dc2772d7086d9ec6f71fb67f30e3b0c038eb3","subject":"Fix use-after-free and memory leak problems.","message":"Fix use-after-free and memory leak problems.\n","repos":"kpayson64\/grpc,daniel-j-born\/grpc,simonkuang\/grpc,firebase\/grpc,ppietrasa\/grpc,sreecha\/grpc,quizlet\/grpc,LuminateWireless\/grpc,dklempner\/grpc,royalharsh\/grpc,quizlet\/grpc,jcanizales\/grpc,7anner\/grpc,makdharma\/grpc,yang-g\/grpc,ncteisen\/grpc,thunderboltsid\/grpc,hstefan\/grpc,simonkuang\/grpc,vsco\/grpc,MakMukhi\/grpc,stanley-cheung\/grpc,kpayson64\/grpc,philcleveland\/grpc,simonkuang\/grpc,deepaklukose\/grpc,vjpai\/grpc,adelez\/grpc,infinit\/grpc,ppietrasa\/grpc,zhimingxie\/grpc,donnadionne\/grpc,PeterFaiman\/ruby-grpc-minimal,rjshade\/grpc,ppietrasa\/grpc,philcleveland\/grpc,muxi\/grpc,sreecha\/grpc,nicolasnoble\/grpc,infinit\/grpc,y-zeng\/grpc,vjpai\/grpc,Vizerai\/grpc,jboeuf\/grpc,dklempner\/grpc,philcleveland\/grpc,yugui\/grpc,kpayson64\/grpc,murgatroid99\/grpc,nicolasnoble\/grpc,MakMukhi\/grpc,mehrdada\/grpc,a11r\/grpc,muxi\/grpc,geffzhang\/grpc,vsco\/grpc,kumaralokgithub\/grpc,firebase\/grpc,rjshade\/grpc,chrisdunelm\/grpc,msmania\/grpc,dgquintas\/grpc,andrewpollock\/grpc,wcevans\/grpc,jtattermusch\/grpc,ncteisen\/grpc,grpc\/grpc,yongni\/grpc,jboeuf\/grpc,carl-mastrangelo\/grpc,andrewpollock\/grpc,infinit\/grpc,hstefan\/grpc,deepaklukose\/grpc,kpayson64\/grpc,yang-g\/grpc,ipylypiv\/grpc,rjshade\/grpc,pmarks-net\/grpc,hstefan\/grpc,LuminateWireless\/grpc,perumaalgoog\/grpc,fuchsia-mirror\/third_party-grpc,jcanizales\/grpc,matt-kwong\/grpc,muxi\/grpc,ejona86\/grpc,ctiller\/grpc,pmarks-net\/grpc,makdharma\/grpc,sreecha\/grpc,wcevans\/grpc,dgquintas\/grpc,yongni\/grpc,yang-g\/grpc,kriswuollett\/grpc,yang-g\/grpc,Crevil\/grpc,grpc\/grpc,chrisdunelm\/grpc,hstefan\/grpc,chrisdunelm\/grpc,kumaralokgithub\/grpc,zhimingxie\/grpc,daniel-j-born\/grpc,fuchsia-mirror\/third_party-grpc,murgatroid99\/grpc,wcevans\/grpc,7anner\/grpc,thinkerou\/grpc,mehrdada\/grpc,adelez\/grpc,carl-mastrangelo\/grpc,kpayson64\/grpc,wcevans\/grpc,murgatroid99\/grpc,matt-kwong\/grpc,mehrdada\/grpc,grani\/grpc,apolcyn\/grpc,malexzx\/grpc,sreecha\/grpc,soltanmm-google\/grpc,greasypizza\/grpc,yongni\/grpc,deepaklukose\/grpc,kriswuollett\/grpc,PeterFaiman\/ruby-grpc-minimal,hstefan\/grpc,Vizerai\/grpc,yongni\/grpc,grpc\/grpc,carl-mastrangelo\/grpc,geffzhang\/grpc,thinkerou\/grpc,soltanmm-google\/grpc,carl-mastrangelo\/grpc,simonkuang\/grpc,Crevil\/grpc,Vizerai\/grpc,soltanmm-google\/grpc,MakMukhi\/grpc,MakMukhi\/grpc,y-zeng\/grpc,firebase\/grpc,greasypizza\/grpc,pszemus\/grpc,malexzx\/grpc,msmania\/grpc,kskalski\/grpc,msmania\/grpc,murgatroid99\/grpc,a11r\/grpc,kskalski\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,baylabs\/grpc,pmarks-net\/grpc,dgquintas\/grpc,muxi\/grpc,jboeuf\/grpc,kumaralokgithub\/grpc,stanley-cheung\/grpc,ejona86\/grpc,Crevil\/grpc,firebase\/grpc,adelez\/grpc,perumaalgoog\/grpc,nicolasnoble\/grpc,donnadionne\/grpc,rjshade\/grpc,mehrdada\/grpc,grani\/grpc,murgatroid99\/grpc,geffzhang\/grpc,Vizerai\/grpc,ejona86\/grpc,LuminateWireless\/grpc,MakMukhi\/grpc,stanley-cheung\/grpc,kriswuollett\/grpc,kpayson64\/grpc,firebase\/grpc,greasypizza\/grpc,apolcyn\/grpc,kumaralokgithub\/grpc,pszemus\/grpc,pmarks-net\/grpc,zhimingxie\/grpc,Vizerai\/grpc,perumaalgoog\/grpc,geffzhang\/grpc,pszemus\/grpc,andrewpollock\/grpc,kskalski\/grpc,vjpai\/grpc,simonkuang\/grpc,murgatroid99\/grpc,sreecha\/grpc,ctiller\/grpc,baylabs\/grpc,royalharsh\/grpc,7anner\/grpc,ctiller\/grpc,donnadionne\/grpc,muxi\/grpc,ipylypiv\/grpc,perumaalgoog\/grpc,ncteisen\/grpc,yugui\/grpc,PeterFaiman\/ruby-grpc-minimal,ctiller\/grpc,Vizerai\/grpc,ctiller\/grpc,7anner\/grpc,baylabs\/grpc,baylabs\/grpc,donnadionne\/grpc,kriswuollett\/grpc,a11r\/grpc,greasypizza\/grpc,kumaralokgithub\/grpc,ncteisen\/grpc,royalharsh\/grpc,kpayson64\/grpc,firebase\/grpc,makdharma\/grpc,deepaklukose\/grpc,ejona86\/grpc,baylabs\/grpc,msmania\/grpc,yugui\/grpc,PeterFaiman\/ruby-grpc-minimal,greasypizza\/grpc,kpayson64\/grpc,ipylypiv\/grpc,andrewpollock\/grpc,vjpai\/grpc,jtattermusch\/grpc,grani\/grpc,kumaralokgithub\/grpc,PeterFaiman\/ruby-grpc-minimal,yongni\/grpc,fuchsia-mirror\/third_party-grpc,vsco\/grpc,ipylypiv\/grpc,malexzx\/grpc,a11r\/grpc,yongni\/grpc,yang-g\/grpc,kpayson64\/grpc,sreecha\/grpc,vjpai\/grpc,jtattermusch\/grpc,mehrdada\/grpc,jtattermusch\/grpc,MakMukhi\/grpc,perumaalgoog\/grpc,thinkerou\/grpc,andrewpollock\/grpc,grpc\/grpc,ncteisen\/grpc,y-zeng\/grpc,wcevans\/grpc,pmarks-net\/grpc,a11r\/grpc,jboeuf\/grpc,yang-g\/grpc,7anner\/grpc,y-zeng\/grpc,grpc\/grpc,donnadionne\/grpc,vsco\/grpc,apolcyn\/grpc,jboeuf\/grpc,kskalski\/grpc,pszemus\/grpc,a11r\/grpc,mehrdada\/grpc,makdharma\/grpc,philcleveland\/grpc,simonkuang\/grpc,andrewpollock\/grpc,chrisdunelm\/grpc,nicolasnoble\/grpc,wcevans\/grpc,greasypizza\/grpc,Crevil\/grpc,fuchsia-mirror\/third_party-grpc,firebase\/grpc,jtattermusch\/grpc,baylabs\/grpc,philcleveland\/grpc,muxi\/grpc,dklempner\/grpc,donnadionne\/grpc,ejona86\/grpc,LuminateWireless\/grpc,ejona86\/grpc,andrewpollock\/grpc,kpayson64\/grpc,chrisdunelm\/grpc,andrewpollock\/grpc,perumaalgoog\/grpc,pszemus\/grpc,jboeuf\/grpc,murgatroid99\/grpc,philcleveland\/grpc,ctiller\/grpc,daniel-j-born\/grpc,quizlet\/grpc,grpc\/grpc,perumaalgoog\/grpc,Vizerai\/grpc,kriswuollett\/grpc,pszemus\/grpc,kskalski\/grpc,ppietrasa\/grpc,donnadionne\/grpc,greasypizza\/grpc,dgquintas\/grpc,vsco\/grpc,ctiller\/grpc,Vizerai\/grpc,nicolasnoble\/grpc,malexzx\/grpc,ejona86\/grpc,yang-g\/grpc,geffzhang\/grpc,apolcyn\/grpc,kriswuollett\/grpc,LuminateWireless\/grpc,ejona86\/grpc,thunderboltsid\/grpc,jcanizales\/grpc,msmania\/grpc,deepaklukose\/grpc,jtattermusch\/grpc,grani\/grpc,makdharma\/grpc,jcanizales\/grpc,vjpai\/grpc,jboeuf\/grpc,PeterFaiman\/ruby-grpc-minimal,philcleveland\/grpc,daniel-j-born\/grpc,donnadionne\/grpc,stanley-cheung\/grpc,thinkerou\/grpc,grpc\/grpc,soltanmm-google\/grpc,dklempner\/grpc,adelez\/grpc,dgquintas\/grpc,thunderboltsid\/grpc,thinkerou\/grpc,PeterFaiman\/ruby-grpc-minimal,vjpai\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,pmarks-net\/grpc,carl-mastrangelo\/grpc,fuchsia-mirror\/third_party-grpc,pszemus\/grpc,thinkerou\/grpc,7anner\/grpc,rjshade\/grpc,ejona86\/grpc,makdharma\/grpc,jtattermusch\/grpc,Vizerai\/grpc,firebase\/grpc,apolcyn\/grpc,thinkerou\/grpc,vjpai\/grpc,ncteisen\/grpc,sreecha\/grpc,stanley-cheung\/grpc,apolcyn\/grpc,soltanmm-google\/grpc,sreecha\/grpc,vjpai\/grpc,baylabs\/grpc,firebase\/grpc,y-zeng\/grpc,baylabs\/grpc,ncteisen\/grpc,kumaralokgithub\/grpc,carl-mastrangelo\/grpc,dgquintas\/grpc,firebase\/grpc,royalharsh\/grpc,chrisdunelm\/grpc,muxi\/grpc,jboeuf\/grpc,carl-mastrangelo\/grpc,daniel-j-born\/grpc,mehrdada\/grpc,makdharma\/grpc,yang-g\/grpc,pmarks-net\/grpc,rjshade\/grpc,dklempner\/grpc,pszemus\/grpc,wcevans\/grpc,malexzx\/grpc,hstefan\/grpc,MakMukhi\/grpc,stanley-cheung\/grpc,adelez\/grpc,yugui\/grpc,pszemus\/grpc,jcanizales\/grpc,geffzhang\/grpc,ipylypiv\/grpc,thunderboltsid\/grpc,malexzx\/grpc,jboeuf\/grpc,infinit\/grpc,yugui\/grpc,matt-kwong\/grpc,hstefan\/grpc,quizlet\/grpc,malexzx\/grpc,jboeuf\/grpc,nicolasnoble\/grpc,ejona86\/grpc,mehrdada\/grpc,y-zeng\/grpc,jboeuf\/grpc,firebase\/grpc,daniel-j-born\/grpc,daniel-j-born\/grpc,quizlet\/grpc,sreecha\/grpc,kskalski\/grpc,soltanmm-google\/grpc,grani\/grpc,sreecha\/grpc,PeterFaiman\/ruby-grpc-minimal,fuchsia-mirror\/third_party-grpc,kriswuollett\/grpc,deepaklukose\/grpc,dklempner\/grpc,MakMukhi\/grpc,adelez\/grpc,jcanizales\/grpc,soltanmm-google\/grpc,geffzhang\/grpc,yang-g\/grpc,jcanizales\/grpc,ncteisen\/grpc,donnadionne\/grpc,ncteisen\/grpc,infinit\/grpc,ncteisen\/grpc,Crevil\/grpc,carl-mastrangelo\/grpc,geffzhang\/grpc,carl-mastrangelo\/grpc,fuchsia-mirror\/third_party-grpc,infinit\/grpc,LuminateWireless\/grpc,dklempner\/grpc,malexzx\/grpc,ncteisen\/grpc,simonkuang\/grpc,nicolasnoble\/grpc,murgatroid99\/grpc,apolcyn\/grpc,thunderboltsid\/grpc,thunderboltsid\/grpc,vsco\/grpc,ctiller\/grpc,nicolasnoble\/grpc,royalharsh\/grpc,pszemus\/grpc,simonkuang\/grpc,7anner\/grpc,royalharsh\/grpc,rjshade\/grpc,grani\/grpc,stanley-cheung\/grpc,baylabs\/grpc,nicolasnoble\/grpc,malexzx\/grpc,zhimingxie\/grpc,nicolasnoble\/grpc,LuminateWireless\/grpc,y-zeng\/grpc,firebase\/grpc,Vizerai\/grpc,ppietrasa\/grpc,ppietrasa\/grpc,muxi\/grpc,kriswuollett\/grpc,yongni\/grpc,donnadionne\/grpc,vsco\/grpc,rjshade\/grpc,royalharsh\/grpc,matt-kwong\/grpc,wcevans\/grpc,wcevans\/grpc,stanley-cheung\/grpc,dgquintas\/grpc,ctiller\/grpc,PeterFaiman\/ruby-grpc-minimal,greasypizza\/grpc,y-zeng\/grpc,LuminateWireless\/grpc,vjpai\/grpc,msmania\/grpc,grani\/grpc,murgatroid99\/grpc,matt-kwong\/grpc,kskalski\/grpc,yongni\/grpc,hstefan\/grpc,thinkerou\/grpc,ipylypiv\/grpc,ppietrasa\/grpc,thunderboltsid\/grpc,deepaklukose\/grpc,chrisdunelm\/grpc,carl-mastrangelo\/grpc,stanley-cheung\/grpc,apolcyn\/grpc,muxi\/grpc,ppietrasa\/grpc,fuchsia-mirror\/third_party-grpc,ejona86\/grpc,jtattermusch\/grpc,pszemus\/grpc,royalharsh\/grpc,mehrdada\/grpc,rjshade\/grpc,matt-kwong\/grpc,fuchsia-mirror\/third_party-grpc,thinkerou\/grpc,dgquintas\/grpc,perumaalgoog\/grpc,ctiller\/grpc,mehrdada\/grpc,pmarks-net\/grpc,jtattermusch\/grpc,carl-mastrangelo\/grpc,matt-kwong\/grpc,ppietrasa\/grpc,thunderboltsid\/grpc,Crevil\/grpc,grpc\/grpc,grpc\/grpc,mehrdada\/grpc,vsco\/grpc,kskalski\/grpc,jtattermusch\/grpc,makdharma\/grpc,ncteisen\/grpc,infinit\/grpc,PeterFaiman\/ruby-grpc-minimal,stanley-cheung\/grpc,sreecha\/grpc,donnadionne\/grpc,dklempner\/grpc,quizlet\/grpc,kriswuollett\/grpc,thinkerou\/grpc,grpc\/grpc,dgquintas\/grpc,yugui\/grpc,7anner\/grpc,msmania\/grpc,simonkuang\/grpc,sreecha\/grpc,kskalski\/grpc,philcleveland\/grpc,grpc\/grpc,a11r\/grpc,7anner\/grpc,greasypizza\/grpc,deepaklukose\/grpc,pmarks-net\/grpc,a11r\/grpc,Crevil\/grpc,deepaklukose\/grpc,jcanizales\/grpc,fuchsia-mirror\/third_party-grpc,adelez\/grpc,daniel-j-born\/grpc,muxi\/grpc,Vizerai\/grpc,ipylypiv\/grpc,MakMukhi\/grpc,royalharsh\/grpc,infinit\/grpc,soltanmm-google\/grpc,quizlet\/grpc,grani\/grpc,quizlet\/grpc,nicolasnoble\/grpc,infinit\/grpc,chrisdunelm\/grpc,ejona86\/grpc,jtattermusch\/grpc,msmania\/grpc,thinkerou\/grpc,yugui\/grpc,murgatroid99\/grpc,matt-kwong\/grpc,thinkerou\/grpc,kumaralokgithub\/grpc,jtattermusch\/grpc,grani\/grpc,hstefan\/grpc,a11r\/grpc,yongni\/grpc,zhimingxie\/grpc,geffzhang\/grpc,Crevil\/grpc,perumaalgoog\/grpc,jcanizales\/grpc,zhimingxie\/grpc,dgquintas\/grpc,chrisdunelm\/grpc,carl-mastrangelo\/grpc,andrewpollock\/grpc,zhimingxie\/grpc,philcleveland\/grpc,msmania\/grpc,grpc\/grpc,apolcyn\/grpc,yugui\/grpc,y-zeng\/grpc,chrisdunelm\/grpc,muxi\/grpc,vjpai\/grpc,dklempner\/grpc,jboeuf\/grpc,matt-kwong\/grpc,ipylypiv\/grpc,makdharma\/grpc,vjpai\/grpc,kpayson64\/grpc,yugui\/grpc,daniel-j-born\/grpc,chrisdunelm\/grpc,ctiller\/grpc,zhimingxie\/grpc,quizlet\/grpc,muxi\/grpc,stanley-cheung\/grpc,vsco\/grpc,thunderboltsid\/grpc,ctiller\/grpc,ipylypiv\/grpc,nicolasnoble\/grpc,donnadionne\/grpc,Crevil\/grpc,LuminateWireless\/grpc,mehrdada\/grpc,adelez\/grpc,pszemus\/grpc,soltanmm-google\/grpc,adelez\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- test\/core\/end2end\/fixtures\/http_proxy.c\n+++ test\/core\/end2end\/fixtures\/http_proxy.c\n@@ -123,18 +123,12 @@\n const char* msg = grpc_error_string(error);\n gpr_log(GPR_ERROR, \"%s: %s\", prefix, msg);\n grpc_error_free_string(msg);\n- GRPC_ERROR_UNREF(error);\n-gpr_log(GPR_ERROR, \"HERE 0\");\n grpc_endpoint_shutdown(exec_ctx, cd->client_endpoint);\n-gpr_log(GPR_ERROR, \"HERE 1\");\n if (cd->server_endpoint != NULL)\n grpc_endpoint_shutdown(exec_ctx, cd->server_endpoint);\n-gpr_log(GPR_ERROR, \"HERE 2\");\n if (gpr_unref(&cd->refcount)) {\n-gpr_log(GPR_ERROR, \"HERE 2.5\");\n connection_data_destroy(exec_ctx, cd);\n }\n-gpr_log(GPR_ERROR, \"HERE 3\");\n }\n \n static void on_client_write_done(grpc_exec_ctx* exec_ctx, void* arg,\n@@ -365,6 +359,7 @@\n static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p,\n grpc_error *error) {\n grpc_pollset_destroy(p);\n+ gpr_free(p);\n }\n \n \/\/ FIXME: remove (including all references below)\n@@ -397,24 +392,17 @@\n grpc_end2end_http_proxy *proxy = arg;\n grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;\n do {\n-gpr_log(GPR_ERROR, \"HERE a\");\n const gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);\n const gpr_timespec deadline =\n gpr_time_add(now, gpr_time_from_seconds(5, GPR_TIMESPAN));\n grpc_pollset_worker *worker = NULL;\n-gpr_log(GPR_ERROR, \"HERE b\");\n gpr_mu_lock(proxy->mu);\n-gpr_log(GPR_ERROR, \"HERE c\");\n GRPC_LOG_IF_ERROR(\"grpc_pollset_work\",\n grpc_pollset_work(&exec_ctx, proxy->pollset, &worker,\n now, deadline));\n-gpr_log(GPR_ERROR, \"HERE d\");\n gpr_mu_unlock(proxy->mu);\n-gpr_log(GPR_ERROR, \"HERE e\");\n grpc_exec_ctx_flush(&exec_ctx);\n-gpr_log(GPR_ERROR, \"HERE f\");\n } while (!proxy->shutdown);\n-gpr_log(GPR_ERROR, \"HERE g\");\n grpc_exec_ctx_finish(&exec_ctx);\n }\n \n"} {"commit":"7de24b7d9302e18bfcd52b3625f399f8e43a0f9d","subject":"In TBB mutex'es are no longer copy constructable.","message":"In TBB mutex'es are no longer copy constructable.\n\nI don't think these need to be, either, so long as a new object gets default-constructed that can be locked.\n\nFrom, https:\/\/www.threadingbuildingblocks.org\/sites\/default\/files\/resources\/CHANGES_0.txt\n\nChanges affecting backward compatibility:\n\n- For compatibility with C++11 standard, copy and move constructors and\n assignment operators are disabled for all mutex classes. To allow\n the old behavior, use TBB_DEPRECATED_MUTEX_COPYING macro.\n","repos":"dmcdougall\/libmesh,vikramvgarg\/libmesh,dmcdougall\/libmesh,jiangwen84\/libmesh,dknez\/libmesh,salazardetroya\/libmesh,capitalaslash\/libmesh,karpeev\/libmesh,dschwen\/libmesh,aeslaughter\/libmesh,libMesh\/libmesh,coreymbryant\/libmesh,jiangwen84\/libmesh,svallaghe\/libmesh,dmcdougall\/libmesh,balborian\/libmesh,cahaynes\/libmesh,cahaynes\/libmesh,libMesh\/libmesh,dknez\/libmesh,karpeev\/libmesh,benkirk\/libmesh,permcody\/libmesh,jwpeterson\/libmesh,vikramvgarg\/libmesh,dmcdougall\/libmesh,dknez\/libmesh,dknez\/libmesh,pbauman\/libmesh,dschwen\/libmesh,hrittich\/libmesh,aeslaughter\/libmesh,salazardetroya\/libmesh,pbauman\/libmesh,aeslaughter\/libmesh,dmcdougall\/libmesh,roystgnr\/libmesh,giorgiobornia\/libmesh,cahaynes\/libmesh,libMesh\/libmesh,cahaynes\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,giorgiobornia\/libmesh,roystgnr\/libmesh,libMesh\/libmesh,vikramvgarg\/libmesh,friedmud\/libmesh,pbauman\/libmesh,balborian\/libmesh,salazardetroya\/libmesh,jwpeterson\/libmesh,Mbewu\/libmesh,libMesh\/libmesh,hrittich\/libmesh,Mbewu\/libmesh,friedmud\/libmesh,friedmud\/libmesh,svallaghe\/libmesh,aeslaughter\/libmesh,svallaghe\/libmesh,jwpeterson\/libmesh,Mbewu\/libmesh,jwpeterson\/libmesh,giorgiobornia\/libmesh,BalticPinguin\/libmesh,dmcdougall\/libmesh,aeslaughter\/libmesh,roystgnr\/libmesh,karpeev\/libmesh,capitalaslash\/libmesh,90jrong\/libmesh,balborian\/libmesh,capitalaslash\/libmesh,aeslaughter\/libmesh,Mbewu\/libmesh,jwpeterson\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,svallaghe\/libmesh,dschwen\/libmesh,jwpeterson\/libmesh,salazardetroya\/libmesh,Mbewu\/libmesh,BalticPinguin\/libmesh,vikramvgarg\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,salazardetroya\/libmesh,cahaynes\/libmesh,90jrong\/libmesh,coreymbryant\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,jiangwen84\/libmesh,karpeev\/libmesh,pbauman\/libmesh,vikramvgarg\/libmesh,capitalaslash\/libmesh,salazardetroya\/libmesh,jiangwen84\/libmesh,90jrong\/libmesh,cahaynes\/libmesh,90jrong\/libmesh,pbauman\/libmesh,dmcdougall\/libmesh,friedmud\/libmesh,aeslaughter\/libmesh,balborian\/libmesh,dknez\/libmesh,permcody\/libmesh,giorgiobornia\/libmesh,capitalaslash\/libmesh,benkirk\/libmesh,Mbewu\/libmesh,friedmud\/libmesh,hrittich\/libmesh,permcody\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,giorgiobornia\/libmesh,permcody\/libmesh,roystgnr\/libmesh,giorgiobornia\/libmesh,vikramvgarg\/libmesh,salazardetroya\/libmesh,roystgnr\/libmesh,benkirk\/libmesh,karpeev\/libmesh,capitalaslash\/libmesh,hrittich\/libmesh,karpeev\/libmesh,friedmud\/libmesh,dknez\/libmesh,salazardetroya\/libmesh,Mbewu\/libmesh,aeslaughter\/libmesh,hrittich\/libmesh,coreymbryant\/libmesh,BalticPinguin\/libmesh,coreymbryant\/libmesh,Mbewu\/libmesh,jiangwen84\/libmesh,BalticPinguin\/libmesh,balborian\/libmesh,90jrong\/libmesh,friedmud\/libmesh,aeslaughter\/libmesh,coreymbryant\/libmesh,jiangwen84\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,pbauman\/libmesh,dschwen\/libmesh,hrittich\/libmesh,dschwen\/libmesh,dschwen\/libmesh,vikramvgarg\/libmesh,karpeev\/libmesh,capitalaslash\/libmesh,libMesh\/libmesh,vikramvgarg\/libmesh,cahaynes\/libmesh,BalticPinguin\/libmesh,Mbewu\/libmesh,dknez\/libmesh,permcody\/libmesh,90jrong\/libmesh,dschwen\/libmesh,balborian\/libmesh,BalticPinguin\/libmesh,benkirk\/libmesh,hrittich\/libmesh,hrittich\/libmesh,jwpeterson\/libmesh,jiangwen84\/libmesh,friedmud\/libmesh,90jrong\/libmesh,pbauman\/libmesh,cahaynes\/libmesh,benkirk\/libmesh,permcody\/libmesh,90jrong\/libmesh,balborian\/libmesh,benkirk\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,balborian\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,BalticPinguin\/libmesh,roystgnr\/libmesh,permcody\/libmesh,friedmud\/libmesh,coreymbryant\/libmesh,dschwen\/libmesh,libMesh\/libmesh,permcody\/libmesh,jwpeterson\/libmesh,coreymbryant\/libmesh,jiangwen84\/libmesh,giorgiobornia\/libmesh,svallaghe\/libmesh,dmcdougall\/libmesh,dknez\/libmesh,roystgnr\/libmesh,giorgiobornia\/libmesh,karpeev\/libmesh,balborian\/libmesh,svallaghe\/libmesh,coreymbryant\/libmesh,pbauman\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/base\/getpot.h\n+++ include\/base\/getpot.h\n@@ -839,9 +839,9 @@\n _comment_start(Other._comment_start),\n _comment_end(Other._comment_end),\n _field_separator(Other._field_separator),\n-#if !defined(GETPOT_DISABLE_MUTEX)\n- _getpot_mtx(Other._getpot_mtx),\n-#endif\n+\/\/ #if !defined(GETPOT_DISABLE_MUTEX)\n+\/\/ _getpot_mtx(Other._getpot_mtx),\n+\/\/ #endif\n _internal_string_container(),\n _requested_arguments(Other._requested_arguments),\n _requested_variables(Other._requested_variables),\n@@ -897,9 +897,9 @@\n _comment_start = Other._comment_start;\n _comment_end = Other._comment_end;\n _field_separator = Other._field_separator;\n-#if !defined(GETPOT_DISABLE_MUTEX)\n- _getpot_mtx = Other._getpot_mtx;\n-#endif\n+\/\/ #if !defined(GETPOT_DISABLE_MUTEX)\n+\/\/ _getpot_mtx = Other._getpot_mtx;\n+\/\/ #endif\n _requested_arguments = Other._requested_arguments;\n _requested_variables = Other._requested_variables;\n _requested_sections = Other._requested_sections;\n"} {"commit":"ea21f4c50227af9e7ca7fdcfd8565d61bfbca33d","subject":"fixed possible NULL pointer dereference in pgfree()","message":"fixed possible NULL pointer dereference in pgfree()\n","repos":"necheffa\/pgalloc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pgalloc.c\n+++ pgalloc.c\n@@ -69,9 +69,19 @@\n void *page = (void *)(((unsigned long) ptr) & pageMask);\n PageHeader *ph = (PageHeader *)page;\n \n- \/\/TODO: handle case where freeList is not NULL\n- \/\/ handle adding page back into pages[]\n- ph->freeList = ptr;\n+ \/\/TODO: handle adding page back into pages[]\n+ \/\/ if page was originally moved out as full\n+\n+ if (ptr->freeList) {\n+ \/\/ insert newly free'd block at start of freeList\n+ ptr = *(ph->freeList);\n+ ph->freeList = &ptr;\n+ } else {\n+ \/\/ first free on this page\n+ ptr = NULL;\n+ ph->freeList = &ptr;\n+ }\n+\n (ph->blocksUsed)--;\n }\n \n@@ -143,6 +153,15 @@\n } else {\n \n unsigned int remainingBlocks = blocksLeft(page);\n+\n+ if (((PageHeader *)page)->freeList) {\n+ \/\/ there are free blocks in the list\n+ \/\/ TODO: use these instead\n+\n+ return ptr;\n+ }\n+\n+ \/\/ page->freeList == NULL\n \n if (remainingBlocks > 2) {\n \/\/ add block to page\n"} {"commit":"829a1c2c41dc62e48c99e645017ebab80092df09","subject":"mbuf: extend flow director field","message":"mbuf: extend flow director field\n\nfdir field in rte_mbuf is extended to support flex bytes reported when fdir match.\n8 flex bytes can be reported in maximum.\nThe reported flex bytes are part of flexible payload.\n\nSigned-off-by: Jingjing Wu <64d28b617c3b4840f5ded1bfa611cba7fadfe5c7@intel.com>\nAcked-by: Konstantin Ananyev <cbd5212b59ab42a210d72992d23a3aa17cfd3eaf@intel.com>\n","repos":"tsphillips\/dpdk-fork,tsphillips\/dpdk-fork,venkynv\/dpdk-mirror,msune\/dpdk,msune\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,venkynv\/dpdk-mirror,msune\/dpdk,venkynv\/dpdk-mirror,mixja\/dpdk,mixja\/dpdk,msune\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,mixja\/dpdk,venkynv\/dpdk-mirror,tsphillips\/dpdk-fork,tsphillips\/dpdk-fork,mixja\/dpdk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/librte_mbuf\/rte_mbuf.h\n+++ lib\/librte_mbuf\/rte_mbuf.h\n@@ -77,7 +77,7 @@\n *\/\n #define PKT_RX_VLAN_PKT (1ULL << 0) \/**< RX packet is a 802.1q VLAN packet. *\/\n #define PKT_RX_RSS_HASH (1ULL << 1) \/**< RX packet with RSS hash result. *\/\n-#define PKT_RX_FDIR (1ULL << 2) \/**< RX packet with FDIR infos. *\/\n+#define PKT_RX_FDIR (1ULL << 2) \/**< RX packet with FDIR match indicate. *\/\n #define PKT_RX_L4_CKSUM_BAD (1ULL << 3) \/**< L4 cksum of RX pkt. is not OK. *\/\n #define PKT_RX_IP_CKSUM_BAD (1ULL << 4) \/**< IP cksum of RX pkt. is not OK. *\/\n #define PKT_RX_EIP_CKSUM_BAD (0ULL << 0) \/**< External IP header checksum error. *\/\n@@ -93,6 +93,8 @@\n #define PKT_RX_IEEE1588_TMST (1ULL << 10) \/**< RX IEEE1588 L2\/L4 timestamped packet.*\/\n #define PKT_RX_TUNNEL_IPV4_HDR (1ULL << 11) \/**< RX tunnel packet with IPv4 header.*\/\n #define PKT_RX_TUNNEL_IPV6_HDR (1ULL << 12) \/**< RX tunnel packet with IPv6 header. *\/\n+#define PKT_RX_FDIR_ID (1ULL << 13) \/**< FD id reported if FDIR match. *\/\n+#define PKT_RX_FDIR_FLX (1ULL << 14) \/**< Flexible bytes reported if FDIR match. *\/\n \n #define PKT_TX_VLAN_PKT (1ULL << 55) \/**< TX packet is a 802.1q VLAN packet. *\/\n #define PKT_TX_IP_CKSUM (1ULL << 54) \/**< IP cksum of TX pkt. computed by NIC. *\/\n@@ -181,8 +183,17 @@\n \tunion {\n \t\tuint32_t rss; \/**< RSS hash result if RSS enabled *\/\n \t\tstruct {\n-\t\t\tuint16_t hash;\n-\t\t\tuint16_t id;\n+\t\t\tunion {\n+\t\t\t\tstruct {\n+\t\t\t\t\tuint16_t hash;\n+\t\t\t\t\tuint16_t id;\n+\t\t\t\t};\n+\t\t\t\tuint32_t lo;\n+\t\t\t\t\/**< Second 4 flexible bytes *\/\n+\t\t\t};\n+\t\t\tuint32_t hi;\n+\t\t\t\/**< First 4 flexible bytes or FD ID, dependent on\n+\t\t\t PKT_RX_FDIR_* flag in ol_flags. *\/\n \t\t} fdir; \/**< Filter identifier if FDIR enabled *\/\n \t\tuint32_t sched; \/**< Hierarchical scheduler *\/\n \t\tuint32_t usr;\t \/**< User defined tags. See @rte_distributor_process *\/\n"} {"commit":"3f49cc14e760db7e4207f27814b9bd717b397678","subject":"Clarify the \"duplicate documentation\" remark","message":"Clarify the \"duplicate documentation\" remark\n\nThis remark is intended for maintainers, not for users. It should not have\nbeen in the Doxygen typeset part.\n\nSigned-off-by: Gilles Peskine <f805f64266d288fc5467baa7be6cd0ff366f477b@arm.com>\n","repos":"Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/mbedtls\/mbedtls_config.h\n+++ include\/mbedtls\/mbedtls_config.h\n@@ -3167,11 +3167,15 @@\n *\n * Our advice is to enable options and change their values here\n * only if you have a good reason and know the consequences.\n- *\n- * Please check the respective header file for documentation on these\n- * parameters (to prevent duplicate documentation).\n * \\{\n *\/\n+\/* The Doxygen documentation here is used when a user comments out a\n+ * setting and runs doxygen themselves. On the other hand, when we typeset\n+ * the full documentation including disabled settings, the documentation\n+ * in specific modules' header files is used if present. When editing this\n+ * file, make sure that each option is documented in exactly one place,\n+ * plus optionally a same-line Doxygen comment here if there is a Doxygen\n+ * comment in the specific module. *\/\n \n \/* MPI \/ BIGNUM options *\/\n \/\/#define MBEDTLS_MPI_WINDOW_SIZE 6 \/**< Maximum window size used. *\/\n"} {"commit":"9452fdea68a51adad8c9934cf1dbc2d2b71cb5d6","subject":"Revamp get_rsa_public_key()","message":"Revamp get_rsa_public_key()\n\n* Added error checking for all OpenSSL calls\n","repos":"dumbbell\/otp,legoscia\/otp,aboroska\/otp,uabboli\/otp,dumbbell\/otp,kvakvs\/otp,getong\/otp,RoadRunnr\/otp,potatosalad\/otp,mikpe\/otp,g-andrade\/otp,dumbbell\/otp,dgud\/otp,aboroska\/otp,legoscia\/otp,mikpe\/otp,jj1bdx\/otp,bsmr-erlang\/otp,g-andrade\/otp,bjorng\/otp,electricimp\/otp,ferd\/otp,ferd\/otp,rlipscombe\/otp,erlang\/otp,erlang\/otp,legoscia\/otp,legoscia\/otp,uabboli\/otp,vinoski\/otp,bsmr-erlang\/otp,g-andrade\/otp,g-andrade\/otp,emacsmirror\/erlang,jj1bdx\/otp,legoscia\/otp,RoadRunnr\/otp,rlipscombe\/otp,vladdu\/otp,jj1bdx\/otp,erlang\/otp,vladdu\/otp,jj1bdx\/otp,isvilen\/otp,electricimp\/otp,uabboli\/otp,jj1bdx\/otp,ferd\/otp,kvakvs\/otp,dumbbell\/otp,electricimp\/otp,bjorng\/otp,g-andrade\/otp,dgud\/otp,uabboli\/otp,isvilen\/otp,mikpe\/otp,emacsmirror\/erlang,aboroska\/otp,uabboli\/otp,kvakvs\/otp,jj1bdx\/otp,lrascao\/otp,dgud\/otp,bsmr-erlang\/otp,emacsmirror\/erlang,jj1bdx\/otp,getong\/otp,potatosalad\/otp,emacsmirror\/erlang,bjorng\/otp,kvakvs\/otp,dumbbell\/otp,g-andrade\/otp,uabboli\/otp,vinoski\/otp,RoadRunnr\/otp,uabboli\/otp,lrascao\/otp,getong\/otp,isvilen\/otp,erlang\/otp,vladdu\/otp,dgud\/otp,rlipscombe\/otp,legoscia\/otp,g-andrade\/otp,g-andrade\/otp,RoadRunnr\/otp,kvakvs\/otp,dumbbell\/otp,mikpe\/otp,mikpe\/otp,vinoski\/otp,isvilen\/otp,uabboli\/otp,RoadRunnr\/otp,erlang\/otp,getong\/otp,mikpe\/otp,electricimp\/otp,bjorng\/otp,getong\/otp,potatosalad\/otp,aboroska\/otp,jj1bdx\/otp,mikpe\/otp,isvilen\/otp,getong\/otp,erlang\/otp,erlang\/otp,ferd\/otp,vinoski\/otp,isvilen\/otp,dgud\/otp,isvilen\/otp,kvakvs\/otp,bjorng\/otp,erlang\/otp,dumbbell\/otp,potatosalad\/otp,jj1bdx\/otp,electricimp\/otp,rlipscombe\/otp,vladdu\/otp,ferd\/otp,potatosalad\/otp,RoadRunnr\/otp,potatosalad\/otp,rlipscombe\/otp,vinoski\/otp,vladdu\/otp,RoadRunnr\/otp,potatosalad\/otp,aboroska\/otp,dgud\/otp,dgud\/otp,mikpe\/otp,vladdu\/otp,lrascao\/otp,emacsmirror\/erlang,vladdu\/otp,lrascao\/otp,rlipscombe\/otp,vinoski\/otp,kvakvs\/otp,aboroska\/otp,aboroska\/otp,legoscia\/otp,lrascao\/otp,isvilen\/otp,g-andrade\/otp,getong\/otp,vinoski\/otp,erlang\/otp,dgud\/otp,legoscia\/otp,dgud\/otp,emacsmirror\/erlang,dumbbell\/otp,ferd\/otp,bjorng\/otp,vinoski\/otp,dgud\/otp,getong\/otp,electricimp\/otp,uabboli\/otp,potatosalad\/otp,legoscia\/otp,ferd\/otp,vinoski\/otp,lrascao\/otp,bjorng\/otp,dumbbell\/otp,emacsmirror\/erlang,vladdu\/otp,emacsmirror\/erlang,rlipscombe\/otp,isvilen\/otp,isvilen\/otp,aboroska\/otp,electricimp\/otp,erlang\/otp,bsmr-erlang\/otp,vladdu\/otp,g-andrade\/otp,jj1bdx\/otp,lrascao\/otp,electricimp\/otp,mikpe\/otp,rlipscombe\/otp,vinoski\/otp,rlipscombe\/otp,electricimp\/otp,bjorng\/otp,lrascao\/otp,kvakvs\/otp,bjorng\/otp,potatosalad\/otp,mikpe\/otp,emacsmirror\/erlang,lrascao\/otp,bsmr-erlang\/otp,ferd\/otp,RoadRunnr\/otp,bsmr-erlang\/otp,dumbbell\/otp,aboroska\/otp,rlipscombe\/otp,getong\/otp,potatosalad\/otp,bsmr-erlang\/otp,bsmr-erlang\/otp,bjorng\/otp,kvakvs\/otp,RoadRunnr\/otp,bsmr-erlang\/otp,ferd\/otp,getong\/otp,emacsmirror\/erlang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/crypto\/c_src\/rsa.c\n+++ lib\/crypto\/c_src\/rsa.c\n@@ -120,18 +120,35 @@\n {\n \/* key=[E,N] *\/\n ERL_NIF_TERM head, tail;\n- BIGNUM *e, *n;\n-\n- if (!enif_get_list_cell(env, key, &head, &tail)\n-\t|| !get_bn_from_bin(env, head, &e)\n-\t|| !enif_get_list_cell(env, tail, &head, &tail)\n-\t|| !get_bn_from_bin(env, head, &n)\n- || !enif_is_empty_list(env, tail)) {\n-\treturn 0;\n- }\n-\n- (void) RSA_set0_key(rsa, n, e, NULL);\n+ BIGNUM *e = NULL, *n = NULL;\n+\n+ if (!enif_get_list_cell(env, key, &head, &tail))\n+ goto bad_arg;\n+ if (!get_bn_from_bin(env, head, &e))\n+ goto bad_arg;\n+ if (!enif_get_list_cell(env, tail, &head, &tail))\n+ goto bad_arg;\n+ if (!get_bn_from_bin(env, head, &n))\n+ goto bad_arg;\n+ if (!enif_is_empty_list(env, tail))\n+ goto bad_arg;\n+\n+ if (!RSA_set0_key(rsa, n, e, NULL))\n+ goto err;\n+ \/* rsa now owns n and e *\/\n+ n = NULL;\n+ e = NULL;\n+\n return 1;\n+\n+ bad_arg:\n+ err:\n+ if (e)\n+ BN_free(e);\n+ if (n)\n+ BN_free(n);\n+\n+ return 0;\n }\n \n \/* Creates a term which can be parsed by get_rsa_private_key(). This is a list of plain integer binaries (not mpints). *\/\n"} {"commit":"59a33f694f40d172e26908b218c168389dc93ff6","subject":"Bump ABI version","message":"Bump ABI version\n\nSigned-off-by: Martin Sustrik <4dd6061be1198639e8b05ce4fd5ead7a0dcaa0f4@250bpm.com>\n","repos":"sustrik\/libdill,sustrik\/libdill,pskocik\/libdill,sustrik\/libdill,pskocik\/libdill,sustrik\/libdill,pskocik\/libdill","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libdill.h\n+++ libdill.h\n@@ -46,7 +46,7 @@\n \/* www.gnu.org\/software\/libtool\/manual\/html_node\/Updating-version-info.html *\/\n \n \/* The current interface version. *\/\n-#define DILL_VERSION_CURRENT 10\n+#define DILL_VERSION_CURRENT 11\n \n \/* The latest revision of the current interface. *\/\n #define DILL_VERSION_REVISION 0\n"} {"commit":"ee07d519ceb05e59dd970c48a42cf2f09b3ac4dc","subject":"mbuf: fix reference counter integer promotion","message":"mbuf: fix reference counter integer promotion\n\nGCC 8.1 warned:\n\n\"1 + value\", where value is an uint16_t causes promotion\nto a signed int. The compiler complained that we are\nshoving an int into a uint16_t return type with different\nsize and sign.\n\nBumping and returning value directly instead removes the\npromotion and the problem.\n\nFixes: f20b50b946da (\"mbuf: optimize refcnt update\")\nFixes: a53aa2b9f3be (\"mbuf: support attaching external buffer\")\nCc: stable@dpdk.org\n\nSigned-off-by: Andy Green <e3579b1e47f273529f0f929453e939a68ede9fd1@warmcat.com>\nAcked-by: Olivier Matz <dfcc1510895413197abb4336e39bb0a3906cba71@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_mbuf\/rte_mbuf.h\n+++ lib\/librte_mbuf\/rte_mbuf.h\n@@ -836,8 +836,9 @@\n \t * reference counter can occur.\n \t *\/\n \tif (likely(rte_mbuf_refcnt_read(m) == 1)) {\n-\t\trte_mbuf_refcnt_set(m, 1 + value);\n-\t\treturn 1 + value;\n+\t\t++value;\n+\t\trte_mbuf_refcnt_set(m, value);\n+\t\treturn value;\n \t}\n \n \treturn __rte_mbuf_refcnt_update(m, value);\n@@ -927,8 +928,9 @@\n \tint16_t value)\n {\n \tif (likely(rte_mbuf_ext_refcnt_read(shinfo) == 1)) {\n-\t\trte_mbuf_ext_refcnt_set(shinfo, 1 + value);\n-\t\treturn 1 + value;\n+\t\t++value;\n+\t\trte_mbuf_ext_refcnt_set(shinfo, value);\n+\t\treturn value;\n \t}\n \n \treturn (uint16_t)rte_atomic16_add_return(&shinfo->refcnt_atomic, value);\n"} {"commit":"c376d333e6b05bd67bc5a40dc85ed20a3608169b","subject":"Add missing header to sysmem.h","message":"Add missing header to sysmem.h\n","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2kern\/kernel\/sysmem.h\n+++ include\/psp2kern\/kernel\/sysmem.h\n@@ -13,6 +13,7 @@\n #include <psp2kern\/kernel\/sysmem\/heap.h>\n #include <psp2kern\/kernel\/sysmem\/data_transfers.h>\n #include <psp2kern\/kernel\/sysmem\/mmu.h>\n+#include <psp2kern\/kernel\/sysmem\/memtype.h>\n #include <psp2kern\/kernel\/debug.h>\n #include <psp2kern\/kernel\/sysroot.h>\n #include <psp2common\/kernel\/sysmem.h>\n"} {"commit":"13169d92924b8f3abdf7d4dbd6417cd0da17c1c9","subject":"Added curl_config include in curl_header","message":"Added curl_config include in curl_header\n","repos":"JosephP91\/curlcpp,gaomingyang21\/curlcpp,JosephP91\/curlcpp,capturePointer\/curlcpp,ellivr\/curlcpp,ellivr\/curlcpp,susnux\/curlcpp,guker\/curlcpp,capturePointer\/curlcpp,susnux\/curlcpp,guker\/curlcpp,gaomingyang21\/curlcpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/curl_header.h\n+++ include\/curl_header.h\n@@ -29,6 +29,8 @@\n #include <string>\n #include <initializer_list>\n #include <curl\/curl.h>\n+\n+#include \"curl_config.h\"\n \n using std::string;\n using std::initializer_list;\n"} {"commit":"4b7e9029d1703a0cd0b6746d36c51b127dcce63d","subject":"deflate_compress: don't use far len 3 matches in lazy compressor","message":"deflate_compress: don't use far len 3 matches in lazy compressor\n\nIt's usually not worth using length 3 matches with a large offset.\n","repos":"ebiggers\/libdeflate,ebiggers\/libdeflate,ebiggers\/libdeflate","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/deflate_compress.c\n+++ lib\/deflate_compress.c\n@@ -2122,7 +2122,9 @@\n \t\t\t\t\t\tc->max_search_depth,\n \t\t\t\t\t\tnext_hashes,\n \t\t\t\t\t\t&cur_offset);\n-\t\t\tif (cur_len < DEFLATE_MIN_MATCH_LEN) {\n+\t\t\tif (cur_len < DEFLATE_MIN_MATCH_LEN ||\n+\t\t\t (cur_len == DEFLATE_MIN_MATCH_LEN &&\n+\t\t\t cur_offset > 8192)) {\n \t\t\t\t\/* No match found. Choose a literal. *\/\n \t\t\t\tdeflate_choose_literal(c, *in_next, &litrunlen);\n \t\t\t\tobserve_literal(&c->split_stats, *in_next);\n"} {"commit":"d0979646166e740917baaabc4b78ded3482226b7","subject":"ring: fix deadlock in zero object multi enqueue or dequeue","message":"ring: fix deadlock in zero object multi enqueue or dequeue\n\nIssuing a zero objects dequeue with a single consumer has no effect.\nDoing so with multiple consumers, can get more than one thread to succeed\nthe compare-and-set operation and observe starvation or even deadlock in\nthe while loop that checks for preceding dequeues. The problematic piece\nof code when n = 0:\n\n cons_next = cons_head + n;\n success = rte_atomic32_cmpset(&r->cons.head, cons_head, cons_next);\n\nThe same is possible on the enqueue path.\n\nFixes: af75078fece3 (\"first public release\")\n\nSigned-off-by: Lazaros Koromilas <07c342be6e560e7f43842e2e21b774e61d85f047@nofutznetworks.com>\nAcked-by: Olivier Matz <dfcc1510895413197abb4336e39bb0a3906cba71@6wind.com>\n","repos":"john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk,john-mcnamara-intel\/dpdk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/librte_ring\/rte_ring.h\n+++ lib\/librte_ring\/rte_ring.h\n@@ -431,6 +431,11 @@\n \tuint32_t mask = r->prod.mask;\n \tint ret;\n \n+\t\/* Avoid the unnecessary cmpset operation below, which is also\n+\t * potentially harmful when n equals 0. *\/\n+\tif (n == 0)\n+\t\treturn 0;\n+\n \t\/* move prod.head atomically *\/\n \tdo {\n \t\t\/* Reset n to the initial burst count *\/\n@@ -618,6 +623,11 @@\n \tunsigned i, rep = 0;\n \tuint32_t mask = r->prod.mask;\n \n+\t\/* Avoid the unnecessary cmpset operation below, which is also\n+\t * potentially harmful when n equals 0. *\/\n+\tif (n == 0)\n+\t\treturn 0;\n+\n \t\/* move cons.head atomically *\/\n \tdo {\n \t\t\/* Restore n as it may change every loop *\/\n"} {"commit":"89694d9b5226dcd70b414822e06b226cf9b8e3b0","subject":"[FIX] closes the fasta file after fai_index is built","message":"[FIX] closes the fasta file after fai_index is built\n","repos":"bestrauc\/seqan,xenigmax\/seqan,bestrauc\/seqan,bestrauc\/seqan,xenigmax\/seqan,bestrauc\/seqan,xenigmax\/seqan,xenigmax\/seqan,bestrauc\/seqan,bestrauc\/seqan,bestrauc\/seqan,xenigmax\/seqan,xenigmax\/seqan,bestrauc\/seqan,xenigmax\/seqan,xenigmax\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/seqan\/seq_io\/fai_index.h\n+++ include\/seqan\/seq_io\/fai_index.h\n@@ -677,7 +677,10 @@\n \n \/\/ Recreate name store cache.\n refresh(index.seqNameStoreCache);\n-\n+ \n+ \/\/close the fasta file\n+ close(index.file);\n+ \n return true;\n }\n \n"} {"commit":"f88903db977533f3941d471540d437e887701e1c","subject":"add a way to add extra content to the usage screen - and do so with the HTTP endpoints registered by default.","message":"add a way to add extra content to the usage screen - and do so with the HTTP endpoints registered by default.\n","repos":"ef-gy\/cxxhttp,ef-gy\/cxxhttp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/ef.gy\/httpd.h\n+++ include\/ef.gy\/httpd.h\n@@ -85,7 +85,6 @@\n return *this;\n }\n \n-protected:\n std::set<servlet *> servlets;\n };\n \n@@ -135,6 +134,21 @@\n return setup(net::endpoint<asio::ip::tcp>(m[1], m[2])) > 0;\n },\n \"Listen for HTTP connections on the given host[1] and port[2].\");\n+\n+namespace usage {\n+template <typename transport> static std::string print(void) {\n+ std::string rv = \"\";\n+ for (const auto &servlet :\n+ set<transport, servlet<transport>>::common().servlets) {\n+ rv += \" \" + servlet->regex + \"\\n\";\n+ }\n+ return rv;\n+}\n+\n+static cli::hint tcpEndpoints(\"HTTP endpoints (TCP)\", print<asio::ip::tcp>);\n+static cli::hint unixEndpoints(\"HTTP endpoints (UNIX)\",\n+ print<asio::local::stream_protocol>);\n+}\n }\n }\n \n"} {"commit":"3995efca5d635ad526738d886dea6d9dd7caa9c7","subject":"EPIPE and ESTRPIPE may be equal","message":"EPIPE and ESTRPIPE may be equal\n\nfixes #133","repos":"FluidSynth\/fluidsynth,nezticle\/fluidsynth,FluidSynth\/fluidsynth,FluidSynth\/fluidsynth,nezticle\/fluidsynth,nezticle\/fluidsynth,FluidSynth\/fluidsynth,nezticle\/fluidsynth","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fluidsynth\/src\/drivers\/fluid_alsa.c\n+++ fluidsynth\/src\/drivers\/fluid_alsa.c\n@@ -347,16 +347,22 @@\n case -EAGAIN:\n snd_pcm_wait(pcm, 1);\n break;\n+\/\/ on some BSD variants ESTRPIPE is defined as EPIPE.\n+\/\/ not sure why, maybe because this version of alsa doesnt support\n+\/\/ suspending pcm stream. anyway, since EPIPE seems to be more \n+\/\/ likely than ESTRPIPE, so ifdef it out in case.\n+#if ESTRPIPE != EPIPE\n+ case -ESTRPIPE:\n+ if (snd_pcm_resume(pcm) != 0) {\n+ FLUID_LOG(FLUID_ERR, \"Failed to resume the audio device\");\n+ return FLUID_FAILED;\n+ }\n+ \/* fall through, since the stream got resumed, but still has to be prepared *\/\n+#endif\n case -EPIPE:\n case -EBADFD:\n if (snd_pcm_prepare(pcm) != 0) {\n FLUID_LOG(FLUID_ERR, \"Failed to prepare the audio device\");\n- return FLUID_FAILED;\n- }\n- break;\n- case -ESTRPIPE:\n- if ((snd_pcm_resume(pcm) != 0) && (snd_pcm_prepare(pcm) != 0)) {\n- FLUID_LOG(FLUID_ERR, \"Failed to resume the audio device\");\n return FLUID_FAILED;\n }\n break;\n"} {"commit":"d4138a03c5a8ffac7cc65a1c6960d14f7a16623c","subject":"Grammar in a comment.","message":"Grammar in a comment.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libutil\/_secure_path.c\n+++ lib\/libutil\/_secure_path.c\n@@ -34,7 +34,7 @@\n * Check for common security problems on a given path\n * It must be:\n * 1. A regular file, and exists\n- * 2. Owned and writaable only by root (or given owner)\n+ * 2. Owned and writable only by root (or given owner)\n * 3. Group ownership is given group or is non-group writable\n *\n * Returns:\t-2 if file does not exist,\n"} {"commit":"50e84061b764ab528cb686403295871bc5b4e108","subject":"silly bug fixed","message":"silly bug fixed\n","repos":"gitesei\/faunus,mlund\/faunus,gitesei\/faunus,mlund\/faunus,gitesei\/faunus,bjornstenqvist\/faunus,bjornstenqvist\/faunus,bjornstenqvist\/faunus,mlund\/faunus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/faunus\/move.h\n+++ include\/faunus\/move.h\n@@ -1475,7 +1475,7 @@\n for (auto g : spc->groupList())\n if (g!=gPtr)\n du+=pot->g2g(spc->trial, *g, *gPtr) - pot->g2g(spc->p, *g, *gPtr);\n- du+=pot->g2g(spc->trial, *g, *gPtr) - pot->g2g(spc->p, *g, *gPtr);\n+ du+=pot->external(spc->trial) - pot->external(spc->p);\n \/\/for (auto i : index)\n \/\/ du += pot->i2all(spc->trial, i) - pot->i2all(spc->p, i);\n return du;\n"} {"commit":"4ec6c62ff62c676409a185cb96b7e195e08b04fb","subject":"Add a safe default initializer for IRGenOptions::DWARFVersion.","message":"Add a safe default initializer for IRGenOptions::DWARFVersion.\n\n<rdar:\/\/problem\/26472452>\n","repos":"sschiau\/swift,frootloops\/swift,rudkx\/swift,jopamer\/swift,felix91gr\/swift,therealbnut\/swift,shajrawi\/swift,brentdax\/swift,bitjammer\/swift,aschwaighofer\/swift,allevato\/swift,hooman\/swift,karwa\/swift,milseman\/swift,natecook1000\/swift,tardieu\/swift,shahmishal\/swift,milseman\/swift,practicalswift\/swift,Jnosh\/swift,swiftix\/swift,xedin\/swift,IngmarStein\/swift,hooman\/swift,roambotics\/swift,Jnosh\/swift,zisko\/swift,arvedviehweger\/swift,modocache\/swift,stephentyrone\/swift,parkera\/swift,gribozavr\/swift,danielmartin\/swift,JaSpa\/swift,tinysun212\/swift-windows,ben-ng\/swift,calebd\/swift,lorentey\/swift,therealbnut\/swift,arvedviehweger\/swift,nathawes\/swift,roambotics\/swift,benlangmuir\/swift,shajrawi\/swift,arvedviehweger\/swift,airspeedswift\/swift,allevato\/swift,felix91gr\/swift,milseman\/swift,manavgabhawala\/swift,alblue\/swift,bitjammer\/swift,codestergit\/swift,atrick\/swift,xwu\/swift,jopamer\/swift,practicalswift\/swift,ben-ng\/swift,glessard\/swift,jtbandes\/swift,tjw\/swift,zisko\/swift,hooman\/swift,hooman\/swift,deyton\/swift,austinzheng\/swift,calebd\/swift,jopamer\/swift,tkremenek\/swift,bitjammer\/swift,practicalswift\/swift,hughbe\/swift,frootloops\/swift,gottesmm\/swift,jckarter\/swift,jmgc\/swift,tardieu\/swift,jckarter\/swift,xwu\/swift,jckarter\/swift,rudkx\/swift,atrick\/swift,IngmarStein\/swift,Jnosh\/swift,harlanhaskins\/swift,devincoughlin\/swift,roambotics\/swift,huonw\/swift,gregomni\/swift,return\/swift,IngmarStein\/swift,gmilos\/swift,sschiau\/swift,OscarSwanros\/swift,therealbnut\/swift,ahoppen\/swift,karwa\/swift,aschwaighofer\/swift,uasys\/swift,danielmartin\/swift,jmgc\/swift,apple\/swift,karwa\/swift,hughbe\/swift,practicalswift\/swift,danielmartin\/swift,ahoppen\/swift,therealbnut\/swift,tardieu\/swift,atrick\/swift,alblue\/swift,tkremenek\/swift,lorentey\/swift,practicalswift\/swift,brentdax\/swift,rudkx\/swift,alblue\/swift,milseman\/swift,gottesmm\/swift,OscarSwanros\/swift,practicalswift\/swift,nathawes\/swift,gottesmm\/swift,gmilos\/swift,JGiola\/swift,gribozavr\/swift,CodaFi\/swift,gottesmm\/swift,shahmishal\/swift,gmilos\/swift,manavgabhawala\/swift,gottesmm\/swift,tjw\/swift,frootloops\/swift,gmilos\/swift,jmgc\/swift,brentdax\/swift,xwu\/swift,codestergit\/swift,OscarSwanros\/swift,russbishop\/swift,zisko\/swift,JGiola\/swift,aschwaighofer\/swift,kstaring\/swift,djwbrown\/swift,jopamer\/swift,tjw\/swift,russbishop\/swift,stephentyrone\/swift,frootloops\/swift,airspeedswift\/swift,allevato\/swift,kstaring\/swift,felix91gr\/swift,tinysun212\/swift-windows,deyton\/swift,modocache\/swift,gregomni\/swift,apple\/swift,devincoughlin\/swift,stephentyrone\/swift,milseman\/swift,benlangmuir\/swift,parkera\/swift,swiftix\/swift,russbishop\/swift,calebd\/swift,frootloops\/swift,JGiola\/swift,codestergit\/swift,bitjammer\/swift,milseman\/swift,lorentey\/swift,manavgabhawala\/swift,shajrawi\/swift,sschiau\/swift,tjw\/swift,jmgc\/swift,amraboelela\/swift,CodaFi\/swift,Jnosh\/swift,devincoughlin\/swift,tjw\/swift,benlangmuir\/swift,danielmartin\/swift,kstaring\/swift,austinzheng\/swift,airspeedswift\/swift,arvedviehweger\/swift,tinysun212\/swift-windows,gregomni\/swift,jckarter\/swift,codestergit\/swift,lorentey\/swift,hooman\/swift,CodaFi\/swift,benlangmuir\/swift,amraboelela\/swift,airspeedswift\/swift,deyton\/swift,kperryua\/swift,felix91gr\/swift,amraboelela\/swift,jtbandes\/swift,sschiau\/swift,calebd\/swift,nathawes\/swift,shahmishal\/swift,gmilos\/swift,huonw\/swift,shajrawi\/swift,jmgc\/swift,sschiau\/swift,manavgabhawala\/swift,calebd\/swift,zisko\/swift,alblue\/swift,devincoughlin\/swift,hughbe\/swift,tkremenek\/swift,frootloops\/swift,felix91gr\/swift,danielmartin\/swift,hughbe\/swift,felix91gr\/swift,return\/swift,Jnosh\/swift,kperryua\/swift,gottesmm\/swift,codestergit\/swift,hooman\/swift,therealbnut\/swift,nathawes\/swift,natecook1000\/swift,brentdax\/swift,djwbrown\/swift,kperryua\/swift,practicalswift\/swift,arvedviehweger\/swift,djwbrown\/swift,lorentey\/swift,shajrawi\/swift,stephentyrone\/swift,jtbandes\/swift,shajrawi\/swift,codestergit\/swift,alblue\/swift,roambotics\/swift,austinzheng\/swift,lorentey\/swift,tkremenek\/swift,russbishop\/swift,ahoppen\/swift,swiftix\/swift,zisko\/swift,IngmarStein\/swift,xedin\/swift,tinysun212\/swift-windows,devincoughlin\/swift,lorentey\/swift,deyton\/swift,CodaFi\/swift,calebd\/swift,hughbe\/swift,ben-ng\/swift,alblue\/swift,tjw\/swift,harlanhaskins\/swift,felix91gr\/swift,kperryua\/swift,rudkx\/swift,JaSpa\/swift,JaSpa\/swift,nathawes\/swift,return\/swift,ahoppen\/swift,atrick\/swift,xedin\/swift,ahoppen\/swift,tinysun212\/swift-windows,uasys\/swift,sschiau\/swift,natecook1000\/swift,CodaFi\/swift,shajrawi\/swift,aschwaighofer\/swift,aschwaighofer\/swift,apple\/swift,aschwaighofer\/swift,ben-ng\/swift,xedin\/swift,gribozavr\/swift,bitjammer\/swift,stephentyrone\/swift,CodaFi\/swift,devincoughlin\/swift,parkera\/swift,tjw\/swift,glessard\/swift,djwbrown\/swift,jckarter\/swift,tkremenek\/swift,harlanhaskins\/swift,return\/swift,deyton\/swift,xedin\/swift,swiftix\/swift,xwu\/swift,uasys\/swift,rudkx\/swift,parkera\/swift,allevato\/swift,nathawes\/swift,gribozavr\/swift,parkera\/swift,xwu\/swift,parkera\/swift,austinzheng\/swift,devincoughlin\/swift,gregomni\/swift,karwa\/swift,jopamer\/swift,return\/swift,karwa\/swift,jmgc\/swift,modocache\/swift,amraboelela\/swift,sschiau\/swift,glessard\/swift,tardieu\/swift,karwa\/swift,jtbandes\/swift,devincoughlin\/swift,tkremenek\/swift,airspeedswift\/swift,hooman\/swift,deyton\/swift,JaSpa\/swift,lorentey\/swift,practicalswift\/swift,benlangmuir\/swift,roambotics\/swift,manavgabhawala\/swift,shahmishal\/swift,harlanhaskins\/swift,shajrawi\/swift,modocache\/swift,CodaFi\/swift,therealbnut\/swift,russbishop\/swift,parkera\/swift,jopamer\/swift,kstaring\/swift,return\/swift,airspeedswift\/swift,gribozavr\/swift,ben-ng\/swift,austinzheng\/swift,gribozavr\/swift,kstaring\/swift,uasys\/swift,codestergit\/swift,IngmarStein\/swift,jtbandes\/swift,djwbrown\/swift,bitjammer\/swift,kperryua\/swift,JGiola\/swift,huonw\/swift,gmilos\/swift,jmgc\/swift,alblue\/swift,shahmishal\/swift,natecook1000\/swift,JGiola\/swift,karwa\/swift,atrick\/swift,huonw\/swift,OscarSwanros\/swift,swiftix\/swift,harlanhaskins\/swift,tinysun212\/swift-windows,harlanhaskins\/swift,uasys\/swift,uasys\/swift,milseman\/swift,jopamer\/swift,zisko\/swift,tkremenek\/swift,jckarter\/swift,djwbrown\/swift,brentdax\/swift,amraboelela\/swift,modocache\/swift,danielmartin\/swift,tardieu\/swift,allevato\/swift,amraboelela\/swift,apple\/swift,allevato\/swift,huonw\/swift,shahmishal\/swift,uasys\/swift,sschiau\/swift,swiftix\/swift,Jnosh\/swift,stephentyrone\/swift,tardieu\/swift,ahoppen\/swift,apple\/swift,kstaring\/swift,djwbrown\/swift,IngmarStein\/swift,russbishop\/swift,glessard\/swift,arvedviehweger\/swift,huonw\/swift,Jnosh\/swift,xwu\/swift,xwu\/swift,jtbandes\/swift,aschwaighofer\/swift,kperryua\/swift,swiftix\/swift,apple\/swift,karwa\/swift,gregomni\/swift,austinzheng\/swift,allevato\/swift,danielmartin\/swift,frootloops\/swift,xedin\/swift,therealbnut\/swift,gribozavr\/swift,glessard\/swift,deyton\/swift,brentdax\/swift,harlanhaskins\/swift,gmilos\/swift,natecook1000\/swift,OscarSwanros\/swift,huonw\/swift,modocache\/swift,rudkx\/swift,russbishop\/swift,atrick\/swift,xedin\/swift,bitjammer\/swift,amraboelela\/swift,airspeedswift\/swift,arvedviehweger\/swift,OscarSwanros\/swift,tinysun212\/swift-windows,shahmishal\/swift,calebd\/swift,parkera\/swift,benlangmuir\/swift,OscarSwanros\/swift,jtbandes\/swift,ben-ng\/swift,ben-ng\/swift,zisko\/swift,JaSpa\/swift,gregomni\/swift,roambotics\/swift,kperryua\/swift,IngmarStein\/swift,jckarter\/swift,shahmishal\/swift,JaSpa\/swift,manavgabhawala\/swift,modocache\/swift,nathawes\/swift,tardieu\/swift,glessard\/swift,hughbe\/swift,natecook1000\/swift,kstaring\/swift,hughbe\/swift,return\/swift,brentdax\/swift,stephentyrone\/swift,JaSpa\/swift,manavgabhawala\/swift,austinzheng\/swift,xedin\/swift,natecook1000\/swift,gribozavr\/swift,gottesmm\/swift,JGiola\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/AST\/IRGenOptions.h\n+++ include\/swift\/AST\/IRGenOptions.h\n@@ -166,8 +166,8 @@\n llvm::SanitizerCoverageOptions SanitizeCoverage;\n \n IRGenOptions()\n- : OutputKind(IRGenOutputKind::LLVMAssembly), Verify(true),\n- Optimize(false), Sanitize(SanitizerKind::None),\n+ : DWARFVersion(2), OutputKind(IRGenOutputKind::LLVMAssembly),\n+ Verify(true), Optimize(false), Sanitize(SanitizerKind::None),\n DebugInfoKind(IRGenDebugInfoKind::None), UseJIT(false),\n DisableLLVMOptzns(false), DisableLLVMARCOpts(false),\n DisableLLVMSLPVectorizer(false), DisableFPElim(true), Playground(false),\n"} {"commit":"e7ebf707f7395edb52e9f26ea27f2f19eeda3568","subject":"Fixed t-factor_power235 to work with 32 bits.","message":"Fixed t-factor_power235 to work with 32 bits.\n","repos":"wbhart\/flint2,dsroche\/flint2,jpflori\/flint2,jpflori\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,dsroche\/flint2,jpflori\/flint2,fredrik-johansson\/flint2,fredrik-johansson\/flint2,wbhart\/flint2,wbhart\/flint2,dsroche\/flint2,dsroche\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ulong_extras\/test\/t-factor_power235.c\n+++ ulong_extras\/test\/t-factor_power235.c\n@@ -39,7 +39,7 @@\n {\n mp_limb_t factor, exp, n1, n2, bits;\n \n- bits = n_randint(32) + 1;\n+ bits = n_randint(FLINT_BITS\/2) + 1;\n n1 = n_randbits(bits);\n factor = n_factor_power235(&exp, n1*n1);\n \n@@ -59,7 +59,7 @@\n {\n mp_limb_t factor, exp, n1, n2, bits;\n \n- bits = n_randint(21) + 1;\n+ bits = n_randint(FLINT_BITS\/3) + 1;\n n1 = n_randbits(bits);\n factor = n_factor_power235(&exp, n1*n1*n1);\n \n@@ -79,7 +79,7 @@\n {\n mp_limb_t factor, exp, n1, n2, bits;\n \n- bits = n_randint(12) + 1;\n+ bits = n_randint(FLINT_BITS\/5) + 1;\n n1 = n_randbits(bits);\n factor = n_factor_power235(&exp, n1*n1*n1*n1*n1);\n \n"} {"commit":"4a89a8c5f9ed89ba9de690e866f3e05341d7b646","subject":"add include guard to functions1D","message":"add include guard to functions1D\n","repos":"openDGM\/project_V","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/functions1D.h\n+++ include\/functions1D.h\n@@ -19,6 +19,9 @@\n #include <Eigen\/Dense>\n #define EIGEN_MPL2_ONLY\n #include <tuple>\n+\n+#ifndef FUNCTIONS1D_H\n+#define FUNCTIONS1D_H\n \n using namespace Eigen;\n \n@@ -58,3 +61,4 @@\n inline double a(int n, int alpha, int beta);\n inline double b(int n, int alpha, int beta);\n }\n+#endif\n"} {"commit":"051c601082935d8e102a200e67c8fe7d1278083f","subject":"Updated Version to 0.1.8.9","message":"Updated Version to 0.1.8.9\n","repos":"Benderx2\/FVM,Benderx2\/FVM,Benderx2\/FVM,Benderx2\/FVM","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/fvm\/version.h\n+++ include\/fvm\/version.h\n@@ -1,6 +1,6 @@\n #ifndef __VERSION_H\n #define __VERSION_H\n #define __USE_GRAPHICS\n-#define FVM_VER \"0.1.5\"\n+#define FVM_VER \"0.1.8.9\"\n #define FVM_MIN_ARGS 2\n #endif\n"} {"commit":"ede21113a23741e7e8a47843dafccfd9b52bbe41","subject":"Fix compilation in C++: remove double GIT_BEGIN_DECL","message":"Fix compilation in C++: remove double GIT_BEGIN_DECL\n","repos":"whoisj\/libgit2,JIghtuse\/libgit2,t0xicCode\/libgit2,linquize\/libgit2,whoisj\/libgit2,raybrad\/libit2,t0xicCode\/libgit2,JIghtuse\/libgit2,linquize\/libgit2,iankronquist\/libgit2,mcanthony\/libgit2,amyvmiwei\/libgit2,rcorre\/libgit2,chiayolin\/libgit2,Aorjoa\/libgit2_maked_lib,mhp\/libgit2,jeffhostetler\/public_libgit2,saurabhsuniljain\/libgit2,swisspol\/DEMO-libgit2,claudelee\/libgit2,skabel\/manguse,joshtriplett\/libgit2,mingyaaaa\/libgit2,jflesch\/libgit2-mariadb,magnus98\/TEST,sygool\/libgit2,jflesch\/libgit2-mariadb,raybrad\/libit2,mingyaaaa\/libgit2,amyvmiwei\/libgit2,t0xicCode\/libgit2,MrHacky\/libgit2,mingyaaaa\/libgit2,sim0629\/libgit2,JIghtuse\/libgit2,iankronquist\/libgit2,Tousiph\/Demo1,jflesch\/libgit2-mariadb,Aorjoa\/libgit2_maked_lib,mhp\/libgit2,maxiaoqian\/libgit2,joshtriplett\/libgit2,iankronquist\/libgit2,kenprice\/libgit2,evhan\/libgit2,whoisj\/libgit2,yosefhackmon\/libgit2,rcorre\/libgit2,mingyaaaa\/libgit2,stewid\/libgit2,Tousiph\/Demo1,magnus98\/TEST,sim0629\/libgit2,chiayolin\/libgit2,magnus98\/TEST,zodiac\/libgit2.js,iankronquist\/libgit2,iankronquist\/libgit2,joshtriplett\/libgit2,claudelee\/libgit2,linquize\/libgit2,leoyanggit\/libgit2,Tousiph\/Demo1,yosefhackmon\/libgit2,evhan\/libgit2,rcorre\/libgit2,Corillian\/libgit2,oaastest\/libgit2,iankronquist\/libgit2,whoisj\/libgit2,skabel\/manguse,ardumont\/libgit2,dleehr\/libgit2,since2014\/libgit2,stewid\/libgit2,raybrad\/libit2,Corillian\/libgit2,kissthink\/libgit2,dleehr\/libgit2,leoyanggit\/libgit2,sygool\/libgit2,jamieleecool\/ptest,nokiddin\/libgit2,jeffhostetler\/public_libgit2,KTXSoftware\/libgit2,rcorre\/libgit2,falqas\/libgit2,jeffhostetler\/public_libgit2,Snazz2001\/libgit2,amyvmiwei\/libgit2,kenprice\/libgit2,Corillian\/libgit2,KTXSoftware\/libgit2,kissthink\/libgit2,dleehr\/libgit2,maxiaoqian\/libgit2,swisspol\/DEMO-libgit2,mrksrm\/Mingijura,whoisj\/libgit2,sygool\/libgit2,yongthecoder\/libgit2,sim0629\/libgit2,linquize\/libgit2,jeffhostetler\/public_libgit2,swisspol\/DEMO-libgit2,spraints\/libgit2,falqas\/libgit2,falqas\/libgit2,kenprice\/libgit2,ardumont\/libgit2,kissthink\/libgit2,sim0629\/libgit2,Corillian\/libgit2,skabel\/manguse,maxiaoqian\/libgit2,since2014\/libgit2,zodiac\/libgit2.js,nokiddin\/libgit2,mingyaaaa\/libgit2,dleehr\/libgit2,swisspol\/DEMO-libgit2,chiayolin\/libgit2,claudelee\/libgit2,magnus98\/TEST,JIghtuse\/libgit2,yosefhackmon\/libgit2,ardumont\/libgit2,mingyaaaa\/libgit2,Aorjoa\/libgit2_maked_lib,jeffhostetler\/public_libgit2,mcanthony\/libgit2,KTXSoftware\/libgit2,mcanthony\/libgit2,mhp\/libgit2,saurabhsuniljain\/libgit2,falqas\/libgit2,jeffhostetler\/public_libgit2,JIghtuse\/libgit2,kenprice\/libgit2,leoyanggit\/libgit2,yongthecoder\/libgit2,mrksrm\/Mingijura,maxiaoqian\/libgit2,dleehr\/libgit2,raybrad\/libit2,saurabhsuniljain\/libgit2,mcanthony\/libgit2,falqas\/libgit2,oaastest\/libgit2,yongthecoder\/libgit2,mrksrm\/Mingijura,since2014\/libgit2,amyvmiwei\/libgit2,whoisj\/libgit2,yongthecoder\/libgit2,swisspol\/DEMO-libgit2,nacho\/libgit2,jflesch\/libgit2-mariadb,claudelee\/libgit2,rcorre\/libgit2,oaastest\/libgit2,Tousiph\/Demo1,jamieleecool\/ptest,Snazz2001\/libgit2,sim0629\/libgit2,amyvmiwei\/libgit2,swisspol\/DEMO-libgit2,chiayolin\/libgit2,ardumont\/libgit2,nokiddin\/libgit2,jamieleecool\/ptest,Tousiph\/Demo1,Snazz2001\/libgit2,leoyanggit\/libgit2,chiayolin\/libgit2,spraints\/libgit2,jflesch\/libgit2-mariadb,evhan\/libgit2,jflesch\/libgit2-mariadb,nacho\/libgit2,since2014\/libgit2,t0xicCode\/libgit2,skabel\/manguse,Tousiph\/Demo1,stewid\/libgit2,maxiaoqian\/libgit2,dleehr\/libgit2,mhp\/libgit2,stewid\/libgit2,Aorjoa\/libgit2_maked_lib,kissthink\/libgit2,nacho\/libgit2,mhp\/libgit2,MrHacky\/libgit2,Corillian\/libgit2,Snazz2001\/libgit2,ardumont\/libgit2,MrHacky\/libgit2,mcanthony\/libgit2,kenprice\/libgit2,KTXSoftware\/libgit2,sygool\/libgit2,nacho\/libgit2,oaastest\/libgit2,claudelee\/libgit2,MrHacky\/libgit2,kissthink\/libgit2,nokiddin\/libgit2,amyvmiwei\/libgit2,Snazz2001\/libgit2,mcanthony\/libgit2,Corillian\/libgit2,Snazz2001\/libgit2,maxiaoqian\/libgit2,chiayolin\/libgit2,t0xicCode\/libgit2,ardumont\/libgit2,rcorre\/libgit2,yongthecoder\/libgit2,saurabhsuniljain\/libgit2,spraints\/libgit2,skabel\/manguse,spraints\/libgit2,linquize\/libgit2,spraints\/libgit2,saurabhsuniljain\/libgit2,magnus98\/TEST,JIghtuse\/libgit2,leoyanggit\/libgit2,KTXSoftware\/libgit2,Aorjoa\/libgit2_maked_lib,leoyanggit\/libgit2,stewid\/libgit2,t0xicCode\/libgit2,mhp\/libgit2,spraints\/libgit2,oaastest\/libgit2,yongthecoder\/libgit2,stewid\/libgit2,sygool\/libgit2,zodiac\/libgit2.js,yosefhackmon\/libgit2,joshtriplett\/libgit2,linquize\/libgit2,joshtriplett\/libgit2,magnus98\/TEST,kenprice\/libgit2,nokiddin\/libgit2,saurabhsuniljain\/libgit2,mrksrm\/Mingijura,oaastest\/libgit2,sygool\/libgit2,kissthink\/libgit2,MrHacky\/libgit2,jamieleecool\/ptest,joshtriplett\/libgit2,MrHacky\/libgit2,nokiddin\/libgit2,mrksrm\/Mingijura,since2014\/libgit2,sim0629\/libgit2,zodiac\/libgit2.js,skabel\/manguse,since2014\/libgit2,falqas\/libgit2,zodiac\/libgit2.js,evhan\/libgit2,claudelee\/libgit2,yosefhackmon\/libgit2,yosefhackmon\/libgit2,KTXSoftware\/libgit2,raybrad\/libit2,mrksrm\/Mingijura","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/git2\/remote.h\n+++ include\/git2\/remote.h\n@@ -44,15 +44,6 @@\n * - _rename\n * - _del (needs support from config)\n *\/\n-\n-\/**\n- * @file git2\/remote.h\n- * @brief Git remote management\n- * @defgroup git_remote Git remote management routines\n- * @ingroup Git\n- * @{\n- *\/\n-GIT_BEGIN_DECL\n \n \/**\n * Get the information for a particular remote\n"} {"commit":"17c1a2c1a7620781cba0a10b9b773dec6ad81326","subject":"Fixed outdated comments.","message":"Fixed outdated comments.\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@19864 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/iutil\/event.h\n+++ include\/iutil\/event.h\n@@ -461,20 +461,16 @@\n \n \/**\n * Put a keyboard event into event queue.<p>\n- * Note that iKey is the key code, either the alphanumeric symbol\n+ * Note that codeRaw is the key code, either the alphanumeric symbol\n * that is emmited by the given key when no shift keys\/modes are\n * active (e.g. 'a', 'b', '.', '\/' and so on) or one of CSKEY_XXX\n- * values (with value above 255) and the iChar parameter is the\n- * translated key, after applying all modeshift keys. Never assume\n- * that any of these two codes is always less 127, not being 255\n- * or 224 -- these are common mistakes for English-speaking programmers.\n+ * values (with value above 255) and the codeCooked parameter is the\n+ * translated key, after applying all modeshift keys.\n * <p>\n- * if you pass -1 as character code, the iChar argument is computed\n- * using an simple internal translation table that takes care of\n- * Control\/Shift\/Alt for English characters. But in general it is\n- * hardly advised your driver to make the conversion using OS-specific\n- * National Language Support subsystem so that national characters\n- * are properly supported.\n+ * If you pass 0 as codeCooked, a synthesized value is created based upon\n+ * codeRaw using an simple internal translation table that takes care of\n+ * Control\/Shift\/Alt for English characters. However, in general, it is\n+ * best if the entity posting the event can provide both codes.\n *\/\n virtual void Key (utf32_char codeRaw, utf32_char codeCooked, bool iDown) = 0;\n \n"} {"commit":"062ca4546301f635ec9574e287bf6eaa9febd156","subject":"fix bug with sample_size not being copied when track if ref'd","message":"fix bug with sample_size not being copied when track if ref'd\n","repos":"nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- includes\/acl\/compression\/track.h\n+++ includes\/acl\/compression\/track.h\n@@ -264,6 +264,7 @@\n \t\t\tout_track.m_sample_rate = m_sample_rate;\n \t\t\tout_track.m_type = m_type;\n \t\t\tout_track.m_category = m_category;\n+\t\t\tout_track.m_sample_size = m_sample_size;\n \t\t\tout_track.m_desc = m_desc;\n \n \t\t\tstd::memcpy(out_track.m_data, m_data, m_data_size);\n@@ -281,6 +282,7 @@\n \t\t\tout_track.m_sample_rate = m_sample_rate;\n \t\t\tout_track.m_type = m_type;\n \t\t\tout_track.m_category = m_category;\n+\t\t\tout_track.m_sample_size = m_sample_size;\n \t\t\tout_track.m_desc = m_desc;\n \t\t}\n \n"} {"commit":"61d3b740ea250c3d06922d5bbdeb2e1141e9170e","subject":"Add StringBuilder class","message":"Add StringBuilder class\n","repos":"Pelagicore\/ivi-logging,Pelagicore\/ivi-logging","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/ivi-logging.h\n+++ include\/ivi-logging.h\n@@ -2,9 +2,12 @@\n \n #include <string>\n #include <functional>\n+#include <sstream>\n+\n #include \"string.h\"\n \n #include \"ivi-logging-common.h\"\n+\n \n namespace logging {\n \n@@ -27,6 +30,24 @@\n \treturn buffer;\n }\n \n+class StringBuilder {\n+public:\n+\ttemplate<typename Type> StringBuilder& operator<<(const Type& v) {\n+\t\tm_stream << v;\n+\t\treturn *this;\n+\t}\n+\n+\toperator std::string() {\n+\t\treturn m_stream.str();\n+\t}\n+\n+\toperator const char*() {\n+\t\treturn m_stream.str().c_str();\n+\t}\n+\n+\tstd::stringstream m_stream;\n+\n+};\n \n #define log_with_context(context, severity, args ...) \\\n \tfor (auto dummy = &context; (dummy != nullptr) && dummy->isEnabled(severity); dummy = nullptr) \\\n"} {"commit":"4e9c4bb95e133d75956f2bdd108e749a04800567","subject":"Saner(?) listbox navigation.","message":"Saner(?) listbox navigation.\n","repos":"Distrotech\/newt,Distrotech\/newt,Distrotech\/newt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- listbox.c\n+++ listbox.c\n@@ -37,6 +37,7 @@\n static void listboxDraw(newtComponent co);\n static void listboxDestroy(newtComponent co);\n static struct eventResult listboxEvent(newtComponent co, struct event ev);\n+static void newtListboxRealSetCurrent(newtComponent co);\n \n static struct componentOps listboxOps = {\n listboxDraw,\n@@ -89,7 +90,8 @@\n return co;\n }\n \n-void newtListboxSetCurrent(newtComponent co, int num) {\n+void newtListboxSetCurrent(newtComponent co, int num)\n+{\n struct listbox * li = co->data;\n if (num >= li->numItems)\n \tli->currItem = li->numItems - 1;\n@@ -106,12 +108,18 @@\n \tli->startShowItem = li->numItems - co->height;\n if(li->startShowItem < 0)\n \tli->startShowItem = 0;\n+ newtListboxRealSetCurrent(co);\n+}\n+\n+static void\n+newtListboxRealSetCurrent(newtComponent co)\n+{\n+ struct listbox * li = co->data;\n if(li->sb)\n \tnewtScrollbarSet(li->sb, li->currItem + 1, li->numItems);\n listboxDraw(co);\n if(co->callback) co->callback(co, co->callbackData);\n }\n-\n \n void newtListboxSetWidth(newtComponent co , int width) {\n struct listbox * li = co->data;\n@@ -383,11 +391,13 @@\n \n \tswitch(ev.u.key) {\n \t case NEWT_KEY_ENTER:\n-\t if(li-> flags & NEWT_FLAG_RETURNEXIT)\n+\t if(li->numItems <= 0) break;\n+\t if(li->flags & NEWT_FLAG_RETURNEXIT)\n \t\ter.result = ER_EXITFORM;\n \t break;\n \n \t case NEWT_KEY_UP:\n+\t if(li->numItems <= 0) break;\n \t if(li->currItem > 0) {\n \t\tli->currItem--;\n \t\tif(li->currItem < li->startShowItem)\n@@ -401,6 +411,7 @@\n \t break;\n \n \t case NEWT_KEY_DOWN:\n+\t if(li->numItems <= 0) break;\n \t if(li->currItem < li->numItems - 1) {\n \t\tli->currItem++;\n \t\tif(li->currItem > (li->startShowItem + co->height - 1)) {\n@@ -417,21 +428,42 @@\n \t break;\n \n \t case NEWT_KEY_PGUP:\n-\t newtListboxSetCurrent(co, li->currItem - co->height + 1);\n+\t if(li->numItems <= 0) break;\n+\t li->startShowItem -= co->height - 1;\n+\t if(li->startShowItem < 0)\n+\t\tli->startShowItem = 0;\n+\t li->currItem -= co->height - 1;\n+\t if(li->currItem < 0)\n+\t\tli->currItem = 0;\n+\t newtListboxRealSetCurrent(co);\n \t er.result = ER_SWALLOWED;\n \t break;\n \n \t case NEWT_KEY_PGDN:\n-\t newtListboxSetCurrent(co, li->currItem + co->height - 1);\n+\t if(li->numItems <= 0) break;\n+\t li->startShowItem += co->height;\n+\t if(li->startShowItem > (li->numItems - co->height)) {\n+\t\tli->startShowItem = li->numItems - co->height;\n+\t }\n+\t li->currItem += co->height;\n+\t if(li->currItem > li->numItems) {\n+\t\tli->currItem = li->numItems - 1;\n+\t }\n+\t newtListboxRealSetCurrent(co);\n \t er.result = ER_SWALLOWED;\n \t break;\n \n \t case NEWT_KEY_HOME:\n+\t if(li->numItems <= 0) break;\n \t newtListboxSetCurrent(co, 0);\n \t er.result = ER_SWALLOWED;\n \t break;\n \n \t case NEWT_KEY_END:\n+\t if(li->numItems <= 0) break;\n+\t li->currItem = li->numItems - 1;\n+\t li->startShowItem = li->numItems - co->height - 1;\n+\t newtListboxRealSetCurrent(co);\n \t newtListboxSetCurrent(co, li->numItems - 1);\n \t er.result = ER_SWALLOWED;\n \t break;\n"} {"commit":"6fd5c665d8fe9da5f2081f0b3ca8054f0f730b1a","subject":"include\/linux\/hdreg.h: cover struct hd_driveid with #ifndef\/#endif __KERNEL__","message":"include\/linux\/hdreg.h: cover struct hd_driveid with #ifndef\/#endif __KERNEL__\n\nSigned-off-by: Bartlomiej Zolnierkiewicz <248de9df611a028e5eceb9d893a2ed6c24c89ef4@gmail.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/hdreg.h\n+++ include\/linux\/hdreg.h\n@@ -448,6 +448,7 @@\n \n #define __NEW_HD_DRIVE_ID\n \n+#ifndef __KERNEL__\n \/*\n * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec.\n *\n@@ -699,6 +700,7 @@\n \t\t\t\t\t * 7:0 Signature\n \t\t\t\t\t *\/\n };\n+#endif \/* __KERNEL__ *\/\n \n \/*\n * IDE \"nice\" flags. These are used on a per drive basis to determine\n"} {"commit":"540dfb09240ebaded110feb1b9573c420b134335","subject":"#13 fix travis","message":"#13 fix travis\n","repos":"3drepo\/3drepobouncer,3drepo\/3drepobouncer,3drepo\/3drepobouncer,3drepo\/3drepobouncer","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- test\/src\/unit\/repo_test_database_info.h\n+++ test\/src\/unit\/repo_test_database_info.h\n@@ -50,11 +50,13 @@\n \n static std::string getClientExePath()\n {\n-\tstd::string path = getenv(\"REPO_CLIENT_PATH\");\n+\tchar* pathChr = getenv(\"REPO_CLIENT_PATH\");\n \tstd::string returnPath = clientExe;\n-\tpath.erase(std::remove(path.begin(), path.end(), '\"'), path.end());\n-\tif (!path.empty())\n+\n+\tif (pathChr)\n \t{\n+\t\tstd::string path = pathChr;\n+\t\tpath.erase(std::remove(path.begin(), path.end(), '\"'), path.end());\n \t\tboost::filesystem::path fileDir(path);\n \t\tauto fullPath = fileDir \/ boost::filesystem::path(clientExe);\n \t\treturnPath = fullPath.string();\n@@ -65,11 +67,13 @@\n static std::string getDataPath(\n \tconst std::string &file)\n {\n-\tstd::string path = getenv(\"REPO_MODEL_PATH\");\n+\tchar* pathChr = getenv(\"REPO_MODEL_PATH\");\n \tstd::string returnPath = simpleModel;\n-\tpath.erase(std::remove(path.begin(), path.end(), '\"'), path.end());\n-\tif (!path.empty())\n+\n+\tif (pathChr)\n \t{\n+\t\tstd::string path = pathChr;\n+\t\tpath.erase(std::remove(path.begin(), path.end(), '\"'), path.end());\n \t\tboost::filesystem::path fileDir(path);\n \t\tauto fullPath = fileDir \/ boost::filesystem::path(file);\n \t\treturnPath = fullPath.string();\n"} {"commit":"d64e14a7f4d274247b91fb18cde0b42f38ffdbac","subject":"#10 PostgreSQL 9.5 IMPORT FOREIGN SCHEMA patch cleanup Rename strlaunder to strTableColumnLaunder pfree buf.data","message":"#10 PostgreSQL 9.5 IMPORT FOREIGN SCHEMA patch cleanup\nRename strlaunder to strTableColumnLaunder\npfree buf.data\n","repos":"pramsey\/pgsql-ogr-fdw,pramsey\/pgsql-ogr-fdw,mysidewalk\/pgsql-ogr-fdw","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ogr_fdw.c\n+++ ogr_fdw.c\n@@ -104,7 +104,7 @@\n static void ogrReScanForeignScan(ForeignScanState *node);\n static void ogrEndForeignScan(ForeignScanState *node);\n \n-static void strlaunder (char *str);\n+static void strTableColumnLaunder (char *str);\n \n #if PG_VERSION_NUM >= 90500\n \/*\n@@ -1389,7 +1389,7 @@\n \t\t\t\/* having this as separate variable since we may choose to launder it *\/\n \t\t\tstrncpy(table_name, OGR_L_GetName(ogr_lyr), STR_MAX_LEN);\n \t\t\tif (launder_table_names){\n-\t\t\t\tstrlaunder(table_name);\n+\t\t\t\tstrTableColumnLaunder(table_name);\n \t\t\t}\n \t\t\t\n \t\t\t\/* only include if layer prefix starts with remote schema \n@@ -1421,7 +1421,7 @@\n \t\t\tresetStringInfo(&buf);\n \t\t\t\n \t\t\tif (launder_table_names){\n-\t\t\t\tstrlaunder(table_name);\n+\t\t\t\tstrTableColumnLaunder(table_name);\n \t\t\t}\n \t\t\togr_fd = OGR_L_GetLayerDefn(ogr_lyr);\n \t\t\tif ( !ogr_fd )\n@@ -1458,7 +1458,7 @@\n \t\t\t\t\tOGRFieldDefnH ogr_fld = OGR_FD_GetFieldDefn(ogr_fd, k);\n \t\t\t\t\tstrncpy(field_name, OGR_Fld_GetNameRef(ogr_fld), STR_MAX_LEN);\n \t\t\t\t\tif (launder_column_names){\n-\t\t\t\t\t\tstrlaunder(field_name);\n+\t\t\t\t\t\tstrTableColumnLaunder(field_name);\n \t\t\t\t\t}\n \t\t\t\t\tappendStringInfo(&buf, \" , %s \", quote_identifier(field_name));\n \t\t\t\t\tswitch( OGR_Fld_GetType(ogr_fld) )\n@@ -1530,12 +1530,14 @@\n \telog(NOTICE, \"Number of tables to be created %d\", list_length(commands) );\n \t\/\/elog(NOTICE, \"The nth item %s\", list_nth(commands,0) );\n \n+\t\/* Clean up *\/\n+\tpfree(buf.data);\n \t\/** returns list of create foreign table statements to run **\/\n \treturn commands;\n }\n #endif \/*end import foreign schema **\/\n \n-static void strlaunder (char *str)\n+static void strTableColumnLaunder (char *str)\n {\n \tint i, j = 0;\n \tfor(i = 0; str[i]; i++)\n"} {"commit":"76b5c84f77c3abc92a3c4e185e7b78f17a0ed204","subject":"Input: add new keycodes useful in mobile devices","message":"Input: add new keycodes useful in mobile devices\n\nAdd new codes for camera focus key, and camera lens cover, keypad slide,\nfront proximity switches.\n\nSigned-off-by: Jani Nikula <7bed8abb126756341ed9b2e86ba01937a625e010@nokia.com>\nSigned-off-by: Dmitry Torokhov <10a8c465cefc9bdd6c925e26964d23c90f1141cc@mail.ru>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/input.h\n+++ include\/linux\/input.h\n@@ -595,6 +595,8 @@\n #define KEY_NUMERIC_STAR\t0x20a\n #define KEY_NUMERIC_POUND\t0x20b\n \n+#define KEY_CAMERA_FOCUS\t0x210\n+\n \/* We avoid low common keys in module aliases so they don't get huge. *\/\n #define KEY_MIN_INTERESTING\tKEY_MUTE\n #define KEY_MAX\t\t\t0x2ff\n@@ -677,6 +679,9 @@\n #define SW_LINEOUT_INSERT\t0x06 \/* set = inserted *\/\n #define SW_JACK_PHYSICAL_INSERT 0x07 \/* set = mechanical switch set *\/\n #define SW_VIDEOOUT_INSERT\t0x08 \/* set = inserted *\/\n+#define SW_CAMERA_LENS_COVER\t0x09 \/* set = lens covered *\/\n+#define SW_KEYPAD_SLIDE\t\t0x0a \/* set = keypad slide out *\/\n+#define SW_FRONT_PROXIMITY\t0x0b \/* set = front proximity sensor active *\/\n #define SW_MAX\t\t\t0x0f\n #define SW_CNT\t\t\t(SW_MAX+1)\n \n"} {"commit":"4b244ac1b4599c97183f184362adf5a67729912e","subject":"Add new << to allow printing modules by reference.","message":"Add new << to allow printing modules by reference.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@2814 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/Module.h\n+++ include\/llvm\/Module.h\n@@ -174,4 +174,9 @@\n return O;\n }\n \n+inline std::ostream &operator<<(std::ostream &O, const Module &M) {\n+ M.print(O);\n+ return O;\n+}\n+\n #endif\n"} {"commit":"1d46bf641318b701be59a32cec3bf0a09cc87b2c","subject":"Fix pre-fork init","message":"Fix pre-fork init\n","repos":"boazsegev\/facil.io,boazsegev\/facil.io","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/facil\/core\/facil.c\n+++ lib\/facil\/core\/facil.c\n@@ -255,7 +255,7 @@\n \n #pragma weak http_lib_init\n void http_lib_init(void) {}\n-#pragma weak http_lib_init\n+#pragma weak http_lib_cleanup\n void http_lib_cleanup(void) {}\n \n \/* perform initialization for external services. *\/\n"} {"commit":"39de4067ae4666c1ef59bfc488ef0c1eef1fa59e","subject":"Make the standard 'lpq' output a little more informative when listing jobs which have long names. Instead of just listing '...', try to list some reasonable subset of the name (with a \"...\" to indicate something missing).","message":"Make the standard 'lpq' output a little more informative when listing jobs\nwhich have long names. Instead of just listing '...', try to list some\nreasonable subset of the name (with a \"...\" to indicate something missing).\n\nReviewed by:\tfreebsd-print@bostonradio.org (only a little review)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/lpr\/common_source\/displayq.c\n+++ usr.sbin\/lpr\/common_source\/displayq.c\n@@ -439,27 +439,54 @@\n \tchar *nfile, *file;\n \tint copies;\n {\n-\tregister short n, fill;\n \tstruct stat lbuf;\n-\n-\t\/*\n-\t * Print as many files as will fit\n-\t * (leaving room for the total size)\n-\t *\/\n-\t fill = first ? 0 : 2;\t\/* fill space for ``, '' *\/\n-\t if (((n = strlen(nfile)) + col + fill) >= SIZCOL-4) {\n-\t\tif (col < SIZCOL) {\n-\t\t\tprintf(\" ...\"), col += 4;\n-\t\t\tblankfill(SIZCOL);\n+\tconst char etctmpl[] = \", ...\";\n+\tchar\t etc[sizeof(etctmpl)];\n+\tchar\t*lastsep;\n+\tshort\t fill, nlen;\n+\tshort\t rem, remetc;\n+\n+\t\/*\n+\t * Print as many filenames as will fit\n+\t * (leaving room for the 'total size' field)\n+\t *\/\n+\tfill = first ? 0 : 2;\t\/* fill space for ``, '' *\/\n+\tnlen = strlen(nfile);\n+\trem = SIZCOL - 1 - col;\n+\tif (nlen + fill > rem) {\n+\t\tif (first) {\n+\t\t\t\/* print the right-most part of the name *\/\n+\t\t\tprintf(\"...%s \", &nfile[3+nlen-rem]);\n+\t\t\tcol = SIZCOL;\n+\t\t} else if (rem > 0) {\n+\t\t\t\/* fit as much of the etc-string as we can *\/\n+\t\t\tremetc = rem;\n+\t\t\tif (rem > strlen(etctmpl))\n+\t\t\t\tremetc = strlen(etctmpl);\n+\t\t\tetc[0] = '\\0';\n+\t\t\tstrncat(etc, etctmpl, remetc);\n+\t\t\tprintf(etc);\n+\t\t\tcol += remetc;\n+\t\t\trem -= remetc;\n+\t\t\t\/* room for the last segment of this filename? *\/\n+\t\t\tlastsep = strrchr(nfile, '\/');\n+\t\t\tif ((lastsep != NULL) && (rem > strlen(lastsep))) {\n+\t\t\t\t\/* print the right-most part of this name *\/\n+\t\t\t\tprintf(\"%s\", lastsep);\n+\t\t\t\tcol += strlen(lastsep);\n+\t\t\t} else {\n+\t\t\t\t\/* do not pack any more names in here *\/\n+\t\t\t\tblankfill(SIZCOL);\n+\t\t\t}\n \t\t}\n \t} else {\n-\t\tif (first)\n-\t\t\tfirst = 0;\n-\t\telse\n+\t\tif (!first)\n \t\t\tprintf(\", \");\n \t\tprintf(\"%s\", nfile);\n-\t\tcol += n+fill;\n-\t}\n+\t\tcol += nlen + fill;\n+\t}\n+\tfirst = 0;\n+\n \tseteuid(euid);\n \tif (*file && !stat(file, &lbuf))\n \t\ttotsize += copies * lbuf.st_size;\n"} {"commit":"a8c18133e97d2b23d5862c60884960a066f0eed7","subject":"Fixed opcode CPY where it takes an immediate address","message":"Fixed opcode CPY where it takes an immediate address\n","repos":"Groffa\/6502,Groffa\/6502,Groffa\/6502","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- opcodes.h\n+++ opcodes.h\n@@ -129,7 +129,7 @@\n LDA_abs_X, \/\/ LDA absolute, X\n LDX_abs_Y, \/\/ LDX absolute, Y\n \n- CPY = 0xC0, \/\/ CPY\n+ CPY_im = 0xC0, \/\/ CPY immediate\n CMP_X_ind, \/\/ CMP (zeropage, X)\n CPY_zpg = 0xC4, \/\/ CPY zeropage\n CMP_zpg, \/\/ CMP zeropage\n"} {"commit":"f1ccdf297cda559c26ab45ca839021aa589341d4","subject":"Updated command line help format.","message":"Updated command line help format.\n","repos":"Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess,Seravo\/goaccess","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- options.c\n+++ options.c\n@@ -92,127 +92,100 @@\n #endif\n {0, 0, 0, 0}\n };\n-\/* *INDENT-ON* *\/\n \n void\n cmd_help (void)\n {\n printf (\"\\nGoAccess - %s\\n\\n\", GO_VERSION);\n- printf (\"Usage: \");\n- printf (\"goaccess [ options ... ] -f log_file [-c][-M][-H][-q][-d][...]\\n\");\n- printf (\"The following options can also be supplied to the command:\\n\\n\");\n+ printf (\n+ \"Usage: \"\n+ \"goaccess [ options ... ] -f log_file [-c][-M][-H][-q][-d][...]\\n\"\n+ \"The following options can also be supplied to the command:\\n\\n\"\n \n \/* Log & Date Format Options *\/\n- printf (\"Log & Date Format Options\\n\\n\");\n- printf (\" --date-format=<dateformat> - \");\n- printf (\"Specify log date format.\\n\");\n- printf (\" --log-format=<logformat> - \");\n- printf (\"Specify log format. Inner quotes need\\n\");\n- printf (\"\\t\\t\\t to be escaped.\\n\\n\");\n+ \"Log & Date Format Options\\n\\n\"\n+ \" --date-format=<dateformat> - Specify log date format.\\n\"\n+ \" --log-format=<logformat> - Specify log format. Inner quotes need\\n\"\n+ \" to be escaped.\\n\\n\"\n \n \/* User Interface Options *\/\n- printf (\"User Interface Options\\n\\n\");\n- printf (\" -c --config-dialog - \");\n- printf (\"Prompt log\/date configuration window.\\n\");\n- printf (\" --color-scheme=<1|2> - \");\n- printf (\"Color schemes: 1 => Grey, 2 => Green.\\n\");\n- printf (\" --no-color - \");\n- printf (\"Disable colored output.\\n\\n\");\n+ \"User Interface Options\\n\\n\"\n+ \" -c --config-dialog - Prompt log\/date configuration window.\\n\"\n+ \" --color-scheme=<1|2> - Color schemes: 1 => Grey, 2 => Green.\\n\"\n+ \" --no-color - Disable colored output.\\n\\n\"\n \n \/* File Options *\/\n- printf (\"File Options\\n\\n\");\n- printf (\" -f --log-file=<filename> - \");\n- printf (\"Path to input log file.\\n\");\n- printf (\" -p --config-file=<filename> - \");\n- printf (\"Custom configuration file.\\n\");\n+ \"File Options\\n\\n\"\n+ \" -f --log-file=<filename> - Path to input log file.\\n\"\n+ \" -p --config-file=<filename> - Custom configuration file.\\n\"\n #ifdef DEBUG\n- printf (\" -l --debug-file=<filename> - \");\n- printf (\"Send all debug messages to the\\n\");\n- printf (\"\\t\\t\\t specified file.\\n\");\n-#endif\n- printf (\" --no-global-config - \");\n- printf (\"Don't load global configuration file.\\n\\n\");\n+ \" -l --debug-file=<filename> - Send all debug messages to the\\n\"\n+ \" specified file.\\n\"\n+#endif\n+ \" --no-global-config - Don't load global configuration file.\\n\\n\"\n \n \/* Parse Options *\/\n- printf (\"Parse Options\\n\\n\");\n- printf (\" -e --exclude-ip=<IP> - \");\n- printf (\"Exclude an IP from being counted.\\n\");\n- printf (\" -a --agent-list - \");\n- printf (\"Enable a list of user-agents by host.\\n\");\n- printf (\" -M --http-method - \");\n- printf (\"Include HTTP request method if found.\\n\");\n- printf (\" -H --http-protocol - \");\n- printf (\"Include HTTP request protocol if found.\\n\");\n- printf (\" -q --no-query-string - \");\n- printf (\"Ignore request's query string.\\n\");\n- printf (\" -r --no-term-resolver - \");\n- printf (\"Disable IP resolver on terminal output.\\n\");\n- printf (\" -o --output-format=csv|json - \");\n- printf (\"Output either a JSON or a CSV file.\\n\");\n- printf (\" -m --with-mouse - \");\n- printf (\"Enable mouse support on main dashboard.\\n\");\n- printf (\" -d --with-output-resolver - \");\n- printf (\"Enable IP resolver on HTML|JSON output.\\n\");\n- printf (\" --real-os - \");\n- printf (\"Display real OS names. e.g, Windows XP,\\n\");\n- printf (\"\\t\\t\\t Snow Leopard.\\n\");\n- printf (\" --no-progress - \");\n- printf (\"Disable progress metrics.\\n\\n\");\n-\n- \/* GeoIP Options *\/\n-#ifdef HAVE_LIBGEOIP\n- printf (\"GeoIP Options\\n\\n\");\n- printf (\" -g --std-geoip - \");\n- printf (\"Standard GeoIP database for less memory\\n\");\n- printf (\"\\t\\t\\t usage.\\n\");\n- printf (\" --geoip-city-data=<path> - \");\n- printf (\"Specify path to GeoIP City database file.\\n\");\n- printf (\"\\t\\t\\t i.e., GeoLiteCity.dat\\n\\n\");\n-#endif\n-\n- \/* On-Disk Database Options *\/\n+ \"Parse Options\\n\\n\"\n+ \" -e --exclude-ip=<IP> - Exclude an IP from being counted.\\n\"\n+ \" -a --agent-list - Enable a list of user-agents by host.\\n\"\n+ \" -M --http-method - Include HTTP request method if found.\\n\"\n+ \" -H --http-protocol - Include HTTP request protocol if found.\\n\"\n+ \" -q --no-query-string - Ignore request's query string.\\n\"\n+ \" -r --no-term-resolver - Disable IP resolver on terminal output.\\n\"\n+ \" -o --output-format=csv|json - Output either a JSON or a CSV file.\\n\"\n+ \" -m --with-mouse - Enable mouse support on main dashboard.\\n\"\n+ \" -d --with-output-resolver - Enable IP resolver on HTML|JSON output.\\n\"\n+ \" --real-os - Display real OS names. e.g, Windows XP,\\n\"\n+ \" Snow Leopard.\\n\"\n+ \" --no-progress - Disable progress metrics.\\n\\n\"\n+\n+\/* GeoIP Options *\/\n+#ifdef HAVE_LIBGEOIP\n+ \"GeoIP Options\\n\\n\"\n+ \" -g --std-geoip - Standard GeoIP database for less memory\\n\"\n+ \" usage.\\n\"\n+ \" --geoip-city-data=<path> - Specify path to GeoIP City database\\n\"\n+ \" file. i.e., GeoLiteCity.dat\\n\\n\"\n+#endif\n+\n+\/* On-Disk Database Options *\/\n #ifdef TCB_BTREE\n- printf (\"On-Disk Database Options\\n\\n\");\n- printf (\" --keep-db-files - \");\n- printf (\"Persist parsed data into disk.\\n\");\n- printf (\" --load-from-disk - \");\n- printf (\"Load previously stored data from disk.\\n\");\n- printf (\" --db-path=<path> - \");\n- printf (\"Path of the database file. [%s]\\n\", TC_DBPATH);\n- printf (\" --xmmap=<number> - \");\n- printf (\"Set the size in bytes of the extra mapped\\n\");\n- printf (\"\\t\\t\\t memory. [%d]\\n\", TC_MMAP);\n- printf (\" --cache-lcnum=<number> - \");\n- printf (\"Max number of leaf nodes to be cached. [%d]\\n\", TC_LCNUM);\n- printf (\" --cache-ncnum=<number> - \");\n- printf (\"Max number of non-leaf nodes to be cached. [%d]\\n\", TC_NCNUM);\n- printf (\" --tune-lmemb=<number> - \");\n- printf (\"Number of members in each leaf page. [%d]\\n\", TC_LMEMB);\n- printf (\" --tune-nmemb=<number> - \");\n- printf (\"Number of members in each non-leaf page. [%d]\\n\", TC_NMEMB);\n- printf (\" --tune-bnum=<number> - \");\n- printf (\"Number of elements of the bucket array. [%d]\\n\", TC_BNUM);\n+ \"On-Disk Database Options\\n\\n\"\n+ \" --keep-db-files - Persist parsed data into disk.\\n\"\n+ \" --load-from-disk - Load previously stored data from disk.\\n\"\n+ \" --db-path=<path> - Path of the database file. Default [%s]\\n\"\n+ \" --xmmap=<number> - Set the size in bytes of the extra\\n\"\n+ \" mapped memory. Default [%d]\\n\"\n+ \" --cache-lcnum=<number> - Max number of leaf nodes to be cached.\\n\"\n+ \" Default [%d]\\n\"\n+ \" --cache-ncnum=<number> - Max number of non-leaf nodes to be cached.\\n\"\n+ \" Default [%d]\\n\"\n+ \" --tune-lmemb=<number> - Number of members in each leaf page.\\n\"\n+ \" Default [%d]\\n\"\n+ \" --tune-nmemb=<number> - Number of members in each non-leaf page.\\n\"\n+ \" Default [%d]\\n\"\n+ \" --tune-bnum=<number> - Number of elements of the bucket array.\\n\"\n+ \" Default [%d]\\n\"\n #if defined(HAVE_ZLIB) || defined(HAVE_BZ2)\n- printf (\" --compression=<zlib|bz2> - \");\n- printf (\"Specifies that each page is compressed with\\n\");\n- printf (\"\\t\\t\\t ZLIB|BZ2 encoding.\\n\\n\");\n-#endif\n-#endif\n-\n- \/* Other Options *\/\n- printf (\"Other Options\\n\\n\");\n- printf (\" -h --help - \");\n- printf (\"This help.\\n\");\n- printf (\" -s --storage - \");\n- printf (\"Display current storage method.\\n\");\n- printf (\"\\t\\t\\t i.e., B+ Tree, Hash.\\n\\n\");\n-\n- printf (\"Examples can be found by running `man goaccess`.\\n\\n\");\n- printf (\"For more details visit: http:\/\/goaccess.prosoftcorp.com\\n\");\n- printf (\"GoAccess Copyright (C) 2009-2014 GNU GPL'd, by Gerardo Orellana\");\n- printf (\"\\n\\n\");\n+ \" --compression=<zlib|bz2> - Specifies that each page is compressed\\n\"\n+ \" with ZLIB|BZ2 encoding.\\n\\n\"\n+#endif\n+#endif\n+\n+\/* Other Options *\/\n+ \"Other Options\\n\\n\"\n+ \" -h --help - This help.\\n\"\n+ \" -s --storage - Display current storage method.\\n\"\n+ \" i.e., B+ Tree, Hash.\\n\\n\"\n+\n+ \"Examples can be found by running `man goaccess`.\\n\\n\"\n+ \"For more details visit: http:\/\/goaccess.prosoftcorp.com\\n\"\n+ \"GoAccess Copyright (C) 2009-2014 GNU GPL'd, by Gerardo Orellana\"\n+ \"\\n\\n\",\n+ TC_DBPATH, TC_MMAP, TC_LCNUM, TC_NCNUM, TC_LMEMB, TC_NMEMB, TC_BNUM);\n exit (EXIT_FAILURE);\n }\n+\/* *INDENT-ON* *\/\n \n void\n verify_global_config (int argc, char **argv)\n"} {"commit":"2f089b8d45c1dcaf63498d3e4121ed6616ed1a11","subject":"expose GetAtomicSymbolName in header (#2627)","message":"expose GetAtomicSymbolName in header (#2627)\n\n","repos":"nicklhy\/mxnet,vikingMei\/mxnet,LinkHS\/incubator-mxnet,ptrendx\/mxnet,ykim362\/mxnet,apaleyes\/mxnet,wangyum\/mxnet,yajiedesign\/mxnet,yajiedesign\/mxnet,solin319\/incubator-mxnet,stefanhenneking\/mxnet,smolix\/incubator-mxnet,rishita\/mxnet,eric-haibin-lin\/mxnet,vikingMei\/mxnet,coder-james\/mxnet,ForkedReposBak\/mxnet,rishita\/mxnet,ZihengJiang\/mxnet,Ldpe2G\/mxnet,xcgoner\/dist-mxnet,Guneet-Dhillon\/mxnet,solin319\/incubator-mxnet,Mega-DatA-Lab\/mxnet,kevinthesun\/mxnet,hpi-xnor\/BMXNet,DR08\/mxnet,tlby\/mxnet,Northrend\/mxnet,dmlc\/mxnet,yuruofeifei\/mxnet,yuruofeifei\/mxnet,wangyum\/mxnet,ForkedReposBak\/mxnet,vikingMei\/mxnet,DR08\/mxnet,madjam\/mxnet,rahul003\/mxnet,crazy-cat\/incubator-mxnet,wangyum\/mxnet,Northrend\/mxnet,sergeykolychev\/mxnet,thirdwing\/mxnet,DR08\/mxnet,leezu\/mxnet,EvanzzzZ\/mxnet,ForkedReposBak\/mxnet,piiswrong\/mxnet,zhreshold\/mxnet,ykim362\/mxnet,saurabh3949\/mxnet,larroy\/mxnet,nicklhy\/mxnet,formath\/mxnet,LinkHS\/incubator-mxnet,DR08\/mxnet,antoan2\/incubator-mxnet,rahul003\/mxnet,nicklhy\/mxnet,apache\/incubator-mxnet,jamesliu\/mxnet,kkk669\/mxnet,hesseltuinhof\/mxnet,TuSimple\/mxnet,sxjscience\/mxnet,xcgoner\/dist-mxnet,stefanhenneking\/mxnet,ZihengJiang\/mxnet,TuSimple\/mxnet,piiswrong\/mxnet,fullfanta\/mxnet,sxjscience\/mxnet,tlby\/mxnet,Mega-DatA-Lab\/mxnet,precedenceguo\/mxnet,jennyzhang0215\/incubator-mxnet,EvanzzzZ\/mxnet,LinkHS\/incubator-mxnet,luoyetx\/mxnet,vikingMei\/mxnet,lxn2\/mxnet,Northrend\/mxnet,apaleyes\/mxnet,jermainewang\/mxnet,likelyzhao\/mxnet,solin319\/incubator-mxnet,luoyetx\/mxnet,arikpoz\/mxnet,ForkedReposBak\/mxnet,piiswrong\/mxnet,gautamkmr\/incubator-mxnet,likelyzhao\/mxnet,sergeykolychev\/mxnet,Mega-DatA-Lab\/mxnet,ptrendx\/mxnet,szha\/mxnet,formath\/mxnet,luoyetx\/mxnet,jamesliu\/mxnet,madjam\/mxnet,antoan2\/incubator-mxnet,fullfanta\/mxnet,thirdwing\/mxnet,dmlc\/mxnet,larroy\/mxnet,precedenceguo\/mxnet,ptrendx\/mxnet,arikpoz\/mxnet,xcgoner\/dist-mxnet,leezu\/mxnet,Northrend\/mxnet,arank\/mxnet,saurabh3949\/mxnet,lxn2\/mxnet,luoyetx\/mxnet,DickJC123\/mxnet,indhub\/mxnet,pluskid\/mxnet,yajiedesign\/mxnet,solin319\/incubator-mxnet,thirdwing\/mxnet,leezu\/mxnet,kevinthesun\/mxnet,weleen\/mxnet,likelyzhao\/mxnet,szha\/mxnet,ptrendx\/mxnet,arank\/mxnet,wangyum\/mxnet,zhreshold\/mxnet,arank\/mxnet,saurabh3949\/mxnet,luoyetx\/mxnet,jermainewang\/mxnet,jennyzhang0215\/incubator-mxnet,stefanhenneking\/mxnet,tornadomeet\/mxnet,Prasad9\/incubator-mxnet,smolix\/incubator-mxnet,weleen\/mxnet,ShownX\/incubator-mxnet,yajiedesign\/mxnet,ShownX\/incubator-mxnet,hesseltuinhof\/mxnet,formath\/mxnet,rahul003\/mxnet,TuSimple\/mxnet,kevinthesun\/mxnet,TuSimple\/mxnet,sxjscience\/mxnet,thirdwing\/mxnet,ykim362\/mxnet,sxjscience\/mxnet,sxjscience\/mxnet,navrasio\/mxnet,arikpoz\/mxnet,lxn2\/mxnet,hesseltuinhof\/mxnet,szha\/mxnet,jennyzhang0215\/incubator-mxnet,wangyum\/mxnet,jiajiechen\/mxnet,saurabh3949\/mxnet,Prasad9\/incubator-mxnet,lxn2\/mxnet,indhub\/mxnet,crazy-cat\/incubator-mxnet,lxn2\/mxnet,xcgoner\/dist-mxnet,kkk669\/mxnet,mbaijal\/incubator-mxnet,zhreshold\/mxnet,thirdwing\/mxnet,jamesliu\/mxnet,hotpxl\/mxnet,nicklhy\/mxnet,kkk669\/mxnet,Guneet-Dhillon\/mxnet,szha\/mxnet,tornadomeet\/mxnet,Guneet-Dhillon\/mxnet,thirdwing\/mxnet,piiswrong\/mxnet,Guneet-Dhillon\/mxnet,leezu\/mxnet,TuSimple\/mxnet,Prasad9\/incubator-mxnet,coder-james\/mxnet,ShownX\/incubator-mxnet,pluskid\/mxnet,tlby\/mxnet,CodingCat\/mxnet,ZihengJiang\/mxnet,reminisce\/mxnet,formath\/mxnet,zhreshold\/mxnet,ykim362\/mxnet,stefanhenneking\/mxnet,sxjscience\/mxnet,piiswrong\/mxnet,ykim362\/mxnet,jennyzhang0215\/incubator-mxnet,ShownX\/incubator-mxnet,stefanhenneking\/mxnet,tornadomeet\/mxnet,jennyzhang0215\/incubator-mxnet,xcgoner\/dist-mxnet,tornadomeet\/mxnet,formath\/mxnet,hpi-xnor\/BMXNet,jamesliu\/mxnet,coder-james\/mxnet,weleen\/mxnet,leezu\/mxnet,indhub\/mxnet,solin319\/incubator-mxnet,ptrendx\/mxnet,jennyzhang0215\/incubator-mxnet,yajiedesign\/mxnet,likelyzhao\/mxnet,weleen\/mxnet,antoan2\/incubator-mxnet,tlby\/mxnet,EvanzzzZ\/mxnet,arank\/mxnet,arank\/mxnet,navrasio\/mxnet,larroy\/mxnet,jamesliu\/mxnet,Mega-DatA-Lab\/mxnet,crazy-cat\/incubator-mxnet,precedenceguo\/mxnet,hotpxl\/mxnet,ForkedReposBak\/mxnet,eric-haibin-lin\/mxnet,rishita\/mxnet,formath\/mxnet,Northrend\/mxnet,ForkedReposBak\/mxnet,vikingMei\/mxnet,precedenceguo\/mxnet,weleen\/mxnet,sxjscience\/mxnet,apaleyes\/mxnet,Guneet-Dhillon\/mxnet,ZihengJiang\/mxnet,ShownX\/incubator-mxnet,precedenceguo\/mxnet,likelyzhao\/mxnet,indhub\/mxnet,ShownX\/incubator-mxnet,pluskid\/mxnet,tlby\/mxnet,apaleyes\/mxnet,Ldpe2G\/mxnet,luoyetx\/mxnet,reminisce\/mxnet,mbaijal\/incubator-mxnet,arikpoz\/mxnet,saurabh3949\/mxnet,nicklhy\/mxnet,jiajiechen\/mxnet,antoan2\/incubator-mxnet,coder-james\/mxnet,xcgoner\/dist-mxnet,wangyum\/mxnet,danithaca\/mxnet,gautamkmr\/incubator-mxnet,hotpxl\/mxnet,hpi-xnor\/BMXNet,jermainewang\/mxnet,xcgoner\/dist-mxnet,yuruofeifei\/mxnet,sxjscience\/mxnet,likelyzhao\/mxnet,thirdwing\/mxnet,mbaijal\/incubator-mxnet,solin319\/incubator-mxnet,danithaca\/mxnet,hesseltuinhof\/mxnet,Guneet-Dhillon\/mxnet,szha\/mxnet,Ldpe2G\/mxnet,rahul003\/mxnet,lxn2\/mxnet,reminisce\/mxnet,pluskid\/mxnet,danithaca\/mxnet,coder-james\/mxnet,Ldpe2G\/mxnet,navrasio\/mxnet,reminisce\/mxnet,navrasio\/mxnet,nicklhy\/mxnet,apache\/incubator-mxnet,reminisce\/mxnet,fullfanta\/mxnet,Northrend\/mxnet,antoan2\/incubator-mxnet,precedenceguo\/mxnet,indhub\/mxnet,kevinthesun\/mxnet,antoan2\/incubator-mxnet,sergeykolychev\/mxnet,stefanhenneking\/mxnet,fullfanta\/mxnet,tornadomeet\/mxnet,ForkedReposBak\/mxnet,hotpxl\/mxnet,weleen\/mxnet,crazy-cat\/incubator-mxnet,precedenceguo\/mxnet,hesseltuinhof\/mxnet,pluskid\/mxnet,hesseltuinhof\/mxnet,vikingMei\/mxnet,smolix\/incubator-mxnet,jennyzhang0215\/incubator-mxnet,jiajiechen\/mxnet,reminisce\/mxnet,madjam\/mxnet,CodingCat\/mxnet,luoyetx\/mxnet,sergeykolychev\/mxnet,Northrend\/mxnet,formath\/mxnet,hotpxl\/mxnet,mbaijal\/incubator-mxnet,jamesliu\/mxnet,DR08\/mxnet,arank\/mxnet,fullfanta\/mxnet,zhreshold\/mxnet,jiajiechen\/mxnet,eric-haibin-lin\/mxnet,navrasio\/mxnet,LinkHS\/incubator-mxnet,jennyzhang0215\/incubator-mxnet,Mega-DatA-Lab\/mxnet,gautamkmr\/incubator-mxnet,yajiedesign\/mxnet,rishita\/mxnet,jiajiechen\/mxnet,solin319\/incubator-mxnet,jiajiechen\/mxnet,ykim362\/mxnet,arank\/mxnet,kkk669\/mxnet,coder-james\/mxnet,Prasad9\/incubator-mxnet,jermainewang\/mxnet,jiajiechen\/mxnet,nicklhy\/mxnet,madjam\/mxnet,vikingMei\/mxnet,tlby\/mxnet,szha\/mxnet,rahul003\/mxnet,danithaca\/mxnet,crazy-cat\/incubator-mxnet,lxn2\/mxnet,hotpxl\/mxnet,Prasad9\/incubator-mxnet,xcgoner\/dist-mxnet,yuruofeifei\/mxnet,hesseltuinhof\/mxnet,szha\/mxnet,antoan2\/incubator-mxnet,ykim362\/mxnet,ZihengJiang\/mxnet,Mega-DatA-Lab\/mxnet,tornadomeet\/mxnet,yuruofeifei\/mxnet,larroy\/mxnet,LinkHS\/incubator-mxnet,TuSimple\/mxnet,tornadomeet\/mxnet,sergeykolychev\/mxnet,ZihengJiang\/mxnet,stefanhenneking\/mxnet,Mega-DatA-Lab\/mxnet,LinkHS\/incubator-mxnet,Prasad9\/incubator-mxnet,arank\/mxnet,crazy-cat\/incubator-mxnet,kkk669\/mxnet,hpi-xnor\/BMXNet,sergeykolychev\/mxnet,likelyzhao\/mxnet,dmlc\/mxnet,fullfanta\/mxnet,likelyzhao\/mxnet,zhreshold\/mxnet,jiajiechen\/mxnet,Northrend\/mxnet,mbaijal\/incubator-mxnet,Mega-DatA-Lab\/mxnet,ZihengJiang\/mxnet,navrasio\/mxnet,eric-haibin-lin\/mxnet,jiajiechen\/mxnet,saurabh3949\/mxnet,madjam\/mxnet,TuSimple\/mxnet,DickJC123\/mxnet,LinkHS\/incubator-mxnet,leezu\/mxnet,larroy\/mxnet,ykim362\/mxnet,Prasad9\/incubator-mxnet,likelyzhao\/mxnet,wangyum\/mxnet,ZihengJiang\/mxnet,apaleyes\/mxnet,hpi-xnor\/BMXNet,zhreshold\/mxnet,jermainewang\/mxnet,Ldpe2G\/mxnet,hotpxl\/mxnet,ZihengJiang\/mxnet,crazy-cat\/incubator-mxnet,jermainewang\/mxnet,ptrendx\/mxnet,fullfanta\/mxnet,saurabh3949\/mxnet,rahul003\/mxnet,tlby\/mxnet,ShownX\/incubator-mxnet,danithaca\/mxnet,yuruofeifei\/mxnet,smolix\/incubator-mxnet,danithaca\/mxnet,stefanhenneking\/mxnet,rahul003\/mxnet,gautamkmr\/incubator-mxnet,apaleyes\/mxnet,indhub\/mxnet,mbaijal\/incubator-mxnet,navrasio\/mxnet,saurabh3949\/mxnet,reminisce\/mxnet,thirdwing\/mxnet,formath\/mxnet,eric-haibin-lin\/mxnet,jennyzhang0215\/incubator-mxnet,EvanzzzZ\/mxnet,Prasad9\/incubator-mxnet,vikingMei\/mxnet,TuSimple\/mxnet,gautamkmr\/incubator-mxnet,rahul003\/mxnet,weleen\/mxnet,stefanhenneking\/mxnet,eric-haibin-lin\/mxnet,crazy-cat\/incubator-mxnet,ForkedReposBak\/mxnet,hpi-xnor\/BMXNet,larroy\/mxnet,leezu\/mxnet,dmlc\/mxnet,tlby\/mxnet,kkk669\/mxnet,luoyetx\/mxnet,xcgoner\/dist-mxnet,madjam\/mxnet,pluskid\/mxnet,luoyetx\/mxnet,tlby\/mxnet,ykim362\/mxnet,indhub\/mxnet,DR08\/mxnet,CodingCat\/mxnet,mbaijal\/incubator-mxnet,arikpoz\/mxnet,Mega-DatA-Lab\/mxnet,yuruofeifei\/mxnet,ptrendx\/mxnet,wangyum\/mxnet,jermainewang\/mxnet,leezu\/mxnet,antoan2\/incubator-mxnet,sxjscience\/mxnet,weleen\/mxnet,precedenceguo\/mxnet,rishita\/mxnet,coder-james\/mxnet,gautamkmr\/incubator-mxnet,DR08\/mxnet,danithaca\/mxnet,kkk669\/mxnet,smolix\/incubator-mxnet,apache\/incubator-mxnet,Guneet-Dhillon\/mxnet,smolix\/incubator-mxnet,CodingCat\/mxnet,DR08\/mxnet,thirdwing\/mxnet,ptrendx\/mxnet,smolix\/incubator-mxnet,gautamkmr\/incubator-mxnet,rishita\/mxnet,hotpxl\/mxnet,larroy\/mxnet,jamesliu\/mxnet,smolix\/incubator-mxnet,piiswrong\/mxnet,jamesliu\/mxnet,sergeykolychev\/mxnet,indhub\/mxnet,eric-haibin-lin\/mxnet,yajiedesign\/mxnet,ptrendx\/mxnet,tlby\/mxnet,jermainewang\/mxnet,Prasad9\/incubator-mxnet,EvanzzzZ\/mxnet,ShownX\/incubator-mxnet,apaleyes\/mxnet,LinkHS\/incubator-mxnet,madjam\/mxnet,nicklhy\/mxnet,danithaca\/mxnet,sergeykolychev\/mxnet,gautamkmr\/incubator-mxnet,reminisce\/mxnet,CodingCat\/mxnet,mbaijal\/incubator-mxnet,tornadomeet\/mxnet,Northrend\/mxnet,EvanzzzZ\/mxnet,precedenceguo\/mxnet,DickJC123\/mxnet,Guneet-Dhillon\/mxnet,weleen\/mxnet,lxn2\/mxnet,indhub\/mxnet,smolix\/incubator-mxnet,dmlc\/mxnet,mbaijal\/incubator-mxnet,DR08\/mxnet,hpi-xnor\/BMXNet,leezu\/mxnet,jamesliu\/mxnet,sergeykolychev\/mxnet,eric-haibin-lin\/mxnet,kevinthesun\/mxnet,Ldpe2G\/mxnet,vikingMei\/mxnet,hesseltuinhof\/mxnet,saurabh3949\/mxnet,kevinthesun\/mxnet,navrasio\/mxnet,coder-james\/mxnet,pluskid\/mxnet,dmlc\/mxnet,apaleyes\/mxnet,arikpoz\/mxnet,tornadomeet\/mxnet,TuSimple\/mxnet,yajiedesign\/mxnet,larroy\/mxnet,madjam\/mxnet,wangyum\/mxnet,rishita\/mxnet,hesseltuinhof\/mxnet,zhreshold\/mxnet,yajiedesign\/mxnet,CodingCat\/mxnet,szha\/mxnet,CodingCat\/mxnet,EvanzzzZ\/mxnet,pluskid\/mxnet,arikpoz\/mxnet,DickJC123\/mxnet,zhreshold\/mxnet,hotpxl\/mxnet,CodingCat\/mxnet,rishita\/mxnet,lxn2\/mxnet,arank\/mxnet,ForkedReposBak\/mxnet,fullfanta\/mxnet,kkk669\/mxnet,jermainewang\/mxnet,ShownX\/incubator-mxnet,formath\/mxnet,apache\/incubator-mxnet,hpi-xnor\/BMXNet,kkk669\/mxnet,szha\/mxnet,solin319\/incubator-mxnet,nicklhy\/mxnet,danithaca\/mxnet,kevinthesun\/mxnet,piiswrong\/mxnet,pluskid\/mxnet,arikpoz\/mxnet,Guneet-Dhillon\/mxnet,ptrendx\/mxnet,yuruofeifei\/mxnet,antoan2\/incubator-mxnet,Ldpe2G\/mxnet,dmlc\/mxnet,kevinthesun\/mxnet,LinkHS\/incubator-mxnet,piiswrong\/mxnet,rahul003\/mxnet,dmlc\/mxnet,fullfanta\/mxnet,navrasio\/mxnet,gautamkmr\/incubator-mxnet,crazy-cat\/incubator-mxnet,larroy\/mxnet,coder-james\/mxnet,rishita\/mxnet,reminisce\/mxnet,dmlc\/mxnet,EvanzzzZ\/mxnet,solin319\/incubator-mxnet,madjam\/mxnet,piiswrong\/mxnet,arikpoz\/mxnet,reminisce\/mxnet,CodingCat\/mxnet,yuruofeifei\/mxnet,EvanzzzZ\/mxnet,hpi-xnor\/BMXNet,Ldpe2G\/mxnet,TuSimple\/mxnet,kevinthesun\/mxnet,eric-haibin-lin\/mxnet,Ldpe2G\/mxnet,apaleyes\/mxnet","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/mxnet\/c_api.h\n+++ include\/mxnet\/c_api.h\n@@ -479,6 +479,14 @@\n *\/\n MXNET_DLL int MXSymbolListAtomicSymbolCreators(mx_uint *out_size,\n AtomicSymbolCreator **out_array);\n+\n+\/*!\n+ * \\brief Get the name of an atomic symbol.\n+ * \\param creator the AtomicSymbolCreator.\n+ * \\param name The returned name of the creator.\n+ *\/\n+MXNET_DLL int MXSymbolGetAtomicSymbolName(AtomicSymbolCreator creator,\n+ const char **name);\n \/*!\n * \\brief Get the detailed information about atomic symbol.\n * \\param creator the AtomicSymbolCreator.\n"} {"commit":"02cb7e6e714e26d8287b4abd5f002235c7b87a48","subject":"net_pkt: Reordering the attributes for better alignment","message":"net_pkt: Reordering the attributes for better alignment\n\nInstead of using a bool, let's just use a bit in a bifield, shared among\nvarious attribute. This saves space.\n\nMake ext_len attribute enabled only on IPv6 (ipv6, icmpv6 and rpl are\nthe only code setting it) and reordering the helpers functions\naccordingly.\n\nChange-Id: Ifd3295d778959308ead7db9b2a59396e50f8e18c\nSigned-off-by: Tomasz Bursztyka <ba81a3a719836727e6857ae83462b9f52ec41006@linux.intel.com>\n","repos":"bigdinotech\/zephyr,sharronliu\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,sharronliu\/zephyr,fractalclone\/zephyr-riscv,holtmann\/zephyr,galak\/zephyr,punitvara\/zephyr,finikorg\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3220,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,explora26\/zephyr,fractalclone\/zephyr-riscv,kraj\/zephyr,nashif\/zephyr,aceofall\/zephyr-iotos,nashif\/zephyr,rsalveti\/zephyr,aceofall\/zephyr-iotos,pklazy\/zephyr,nashif\/zephyr,bboozzoo\/zephyr,finikorg\/zephyr,ldts\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,mbolivar\/zephyr,bboozzoo\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,punitvara\/zephyr,galak\/zephyr,fbsder\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,explora26\/zephyr,sharronliu\/zephyr,pklazy\/zephyr,erwango\/zephyr,punitvara\/zephyr,rsalveti\/zephyr,pklazy\/zephyr,galak\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3220,GiulianoFranchetto\/zephyr,punitvara\/zephyr,erwango\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,rsalveti\/zephyr,kraj\/zephyr,kraj\/zephyr,nashif\/zephyr,bboozzoo\/zephyr,finikorg\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,kraj\/zephyr,nashif\/zephyr,zephyriot\/zephyr,mbolivar\/zephyr,rsalveti\/zephyr,holtmann\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,zephyriot\/zephyr,bigdinotech\/zephyr,Vudentz\/zephyr,rsalveti\/zephyr,holtmann\/zephyr,zephyriot\/zephyr,erwango\/zephyr,galak\/zephyr,holtmann\/zephyr,bboozzoo\/zephyr,bigdinotech\/zephyr,erwango\/zephyr,Vudentz\/zephyr,explora26\/zephyr,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220,pklazy\/zephyr,holtmann\/zephyr,kraj\/zephyr,mbolivar\/zephyr,pklazy\/zephyr,erwango\/zephyr,zephyriot\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,runchip\/zephyr-cc3220,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3220,ldts\/zephyr,explora26\/zephyr,sharronliu\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,fbsder\/zephyr,bigdinotech\/zephyr,sharronliu\/zephyr,fbsder\/zephyr,aceofall\/zephyr-iotos,fractalclone\/zephyr-riscv,fractalclone\/zephyr-riscv,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr,aceofall\/zephyr-iotos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/net\/net_pkt.h\n+++ include\/net\/net_pkt.h\n@@ -35,7 +35,7 @@\n \n struct net_pkt {\n \t\/** FIFO uses first 4 bytes itself, reserve space *\/\n-\tint _unused;\n+\tint _reserved;\n \n \t\/** Slab pointer from where it belongs to *\/\n \tstruct k_mem_slab *slab;\n@@ -55,6 +55,7 @@\n \tstruct net_if *iface;\n \n \t\/** @cond ignore *\/\n+\n \tuint8_t *appdata;\t\/* application data starts here *\/\n \tuint8_t *next_hdr;\t\/* where is the next header *\/\n \n@@ -62,20 +63,28 @@\n \tstruct net_linkaddr lladdr_src;\n \tstruct net_linkaddr lladdr_dst;\n \n-#if defined(CONFIG_NET_IPV6_FRAGMENT)\n-\t\/* Fragment id *\/\n-\tuint32_t ipv6_fragment_id;\n-\n-\t\/* Where is the start of the fragment header *\/\n-\tuint8_t *ipv6_frag_hdr_start;\n-\n-\t\/* What is the fragment offset of this IPv6 packet *\/\n-\tuint16_t ipv6_fragment_offset;\n+\tuint16_t appdatalen;\n+\tuint8_t ll_reserve;\t\/* link layer header length *\/\n+\tuint8_t ip_hdr_len;\t\/* pre-filled in order to avoid func call *\/\n+\n+#if defined(CONFIG_NET_TCP)\n+\tsys_snode_t sent_list;\n #endif\n \n-\tuint16_t appdatalen;\n+\tuint8_t sent : 1;\t\/* Is this sent or not\n+\t\t\t\t * Used only if defined(CONFIG_NET_TCP)\n+\t\t\t\t *\/\n+\tuint8_t forwarding : 1;\t\/* Are we forwarding this pkt\n+\t\t\t\t * Used only if defined(CONFIG_NET_ROUTE)\n+\t\t\t\t *\/\n+\tuint8_t family : 4;\t\/* IPv4 vs IPv6 *\/\n+\tuint8_t _unused : 4;\n \n #if defined(CONFIG_NET_IPV6)\n+\tuint8_t ipv6_hop_limit;\t\/* IPv6 hop limit for this network packet. *\/\n+\tuint8_t ext_len;\t\/* length of extension headers *\/\n+\tuint8_t ext_opt_len;\t\/* IPv6 ND option length *\/\n+\n \t\/* Where is the start of the last header before payload data\n \t * in IPv6 packet. This is offset value from start of the IPv6\n \t * packet. Note that this value should be updated by who ever\n@@ -83,27 +92,12 @@\n \t *\/\n \tuint16_t ipv6_prev_hdr_start;\n \n-\t\/* IPv6 hop limit for this network packet. *\/\n-\tuint8_t ipv6_hop_limit;\n-#endif\n-\n-\tuint8_t ll_reserve;\t\/* link layer header length *\/\n-\tuint8_t family;\t\t\/* IPv4 vs IPv6 *\/\n-\tuint8_t ip_hdr_len;\t\/* pre-filled in order to avoid func call *\/\n-\tuint8_t ext_len;\t\/* length of extension headers *\/\n-\n-#if defined(CONFIG_NET_IPV6)\n-\tuint8_t ext_opt_len; \/* IPv6 ND option length *\/\n-#endif\n-\n-#if defined(CONFIG_NET_TCP)\n-\tsys_snode_t sent_list;\n-\tbool sent; \/* Is this net_pkt sent or not *\/\n-#endif\n-\n-#if defined(CONFIG_NET_ROUTE)\n-\tbool forwarding; \/* Are we forwarding this pkt *\/\n-#endif\n+#if defined(CONFIG_NET_IPV6_FRAGMENT)\n+\tuint16_t ipv6_fragment_offset;\t\/* Fragment offset of this packet *\/\n+\tuint32_t ipv6_fragment_id;\t\/* Fragment id *\/\n+\tuint8_t *ipv6_frag_hdr_start;\t\/* Where starts the fragment header *\/\n+#endif \/* CONFIG_NET_IPV6_FRAGMENT *\/\n+#endif \/* CONFIG_NET_IPV6 *\/\n \n #if defined(CONFIG_NET_L2_IEEE802154)\n \tuint8_t ieee802154_rssi;\n@@ -181,16 +175,6 @@\n \tpkt->ip_hdr_len = len;\n }\n \n-static inline uint8_t net_pkt_ext_len(struct net_pkt *pkt)\n-{\n-\treturn pkt->ext_len;\n-}\n-\n-static inline void net_pkt_set_ext_len(struct net_pkt *pkt, uint8_t len)\n-{\n-\tpkt->ext_len = len;\n-}\n-\n static inline uint8_t *net_pkt_next_hdr(struct net_pkt *pkt)\n {\n \treturn pkt->next_hdr;\n@@ -200,6 +184,35 @@\n {\n \tpkt->next_hdr = hdr;\n }\n+\n+#if defined(CONFIG_NET_TCP)\n+static inline uint8_t net_pkt_sent(struct net_pkt *pkt)\n+{\n+\treturn pkt->sent;\n+}\n+\n+static inline void net_pkt_set_sent(struct net_pkt *pkt, bool sent)\n+{\n+\tpkt->sent = sent;\n+}\n+#endif\n+\n+#if defined(CONFIG_NET_ROUTE)\n+static inline bool net_pkt_forwarding(struct net_pkt *pkt)\n+{\n+\treturn pkt->forwarding;\n+}\n+\n+static inline void net_pkt_set_forwarding(struct net_pkt *pkt, bool forward)\n+{\n+\tpkt->forwarding = forward;\n+}\n+#else\n+static inline bool net_pkt_forwarding(struct net_pkt *pkt)\n+{\n+\treturn false;\n+}\n+#endif\n \n #if defined(CONFIG_NET_IPV6)\n static inline uint8_t net_pkt_ext_opt_len(struct net_pkt *pkt)\n@@ -211,36 +224,77 @@\n {\n \tpkt->ext_opt_len = len;\n }\n-#endif\n-\n-#if defined(CONFIG_NET_TCP)\n-static inline uint8_t net_pkt_sent(struct net_pkt *pkt)\n-{\n-\treturn pkt->sent;\n-}\n-\n-static inline void net_pkt_set_sent(struct net_pkt *pkt, bool sent)\n-{\n-\tpkt->sent = sent;\n-}\n-#endif\n-\n-#if defined(CONFIG_NET_ROUTE)\n-static inline bool net_pkt_forwarding(struct net_pkt *pkt)\n-{\n-\treturn pkt->forwarding;\n-}\n-\n-static inline void net_pkt_set_forwarding(struct net_pkt *pkt, bool forward)\n-{\n-\tpkt->forwarding = forward;\n-}\n-#else\n-static inline bool net_pkt_forwarding(struct net_pkt *pkt)\n-{\n-\treturn false;\n-}\n-#endif\n+\n+static inline uint8_t net_pkt_ext_len(struct net_pkt *pkt)\n+{\n+\treturn pkt->ext_len;\n+}\n+\n+static inline void net_pkt_set_ext_len(struct net_pkt *pkt, uint8_t len)\n+{\n+\tpkt->ext_len = len;\n+}\n+\n+static inline uint16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)\n+{\n+\treturn pkt->ipv6_prev_hdr_start;\n+}\n+\n+static inline void net_pkt_set_ipv6_hdr_prev(struct net_pkt *pkt,\n+\t\t\t\t\t uint16_t offset)\n+{\n+\tpkt->ipv6_prev_hdr_start = offset;\n+}\n+\n+static inline uint8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)\n+{\n+\treturn pkt->ipv6_hop_limit;\n+}\n+\n+static inline void net_pkt_set_ipv6_hop_limit(struct net_pkt *pkt,\n+\t\t\t\t\t uint8_t hop_limit)\n+{\n+\tpkt->ipv6_hop_limit = hop_limit;\n+}\n+\n+#if defined(CONFIG_NET_IPV6_FRAGMENT)\n+static inline uint8_t *net_pkt_ipv6_fragment_start(struct net_pkt *pkt)\n+{\n+\treturn pkt->ipv6_frag_hdr_start;\n+}\n+\n+static inline void net_pkt_set_ipv6_fragment_start(struct net_pkt *pkt,\n+\t\t\t\t\t\t uint8_t *start)\n+{\n+\tpkt->ipv6_frag_hdr_start = start;\n+}\n+\n+static inline uint16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)\n+{\n+\treturn pkt->ipv6_fragment_offset;\n+}\n+\n+static inline void net_pkt_set_ipv6_fragment_offset(struct net_pkt *pkt,\n+\t\t\t\t\t\t uint16_t offset)\n+{\n+\tpkt->ipv6_fragment_offset = offset;\n+}\n+\n+static inline uint32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)\n+{\n+\treturn pkt->ipv6_fragment_id;\n+}\n+\n+static inline void net_pkt_set_ipv6_fragment_id(struct net_pkt *pkt,\n+\t\t\t\t\t\tuint32_t id)\n+{\n+\tpkt->ipv6_fragment_id = id;\n+}\n+#endif \/* CONFIG_NET_IPV6_FRAGMENT *\/\n+#else \/* CONFIG_NET_IPV6 *\/\n+#define net_pkt_ext_len(...) 0\n+#define net_pkt_set_ext_len(...)\n+#endif \/* CONFIG_NET_IPV6 *\/\n \n static inline size_t net_pkt_get_len(struct net_pkt *pkt)\n {\n@@ -329,65 +383,6 @@\n \tnet_pkt_ll_src(pkt)->addr = net_pkt_ll_dst(pkt)->addr;\n \tnet_pkt_ll_dst(pkt)->addr = addr;\n }\n-\n-#if defined(CONFIG_NET_IPV6)\n-static inline uint16_t net_pkt_ipv6_hdr_prev(struct net_pkt *pkt)\n-{\n-\treturn pkt->ipv6_prev_hdr_start;\n-}\n-\n-static inline void net_pkt_set_ipv6_hdr_prev(struct net_pkt *pkt,\n-\t\t\t\t\t uint16_t offset)\n-{\n-\tpkt->ipv6_prev_hdr_start = offset;\n-}\n-\n-static inline uint8_t net_pkt_ipv6_hop_limit(struct net_pkt *pkt)\n-{\n-\treturn pkt->ipv6_hop_limit;\n-}\n-\n-static inline void net_pkt_set_ipv6_hop_limit(struct net_pkt *pkt,\n-\t\t\t\t\t uint8_t hop_limit)\n-{\n-\tpkt->ipv6_hop_limit = hop_limit;\n-}\n-#endif\n-\n-#if defined(CONFIG_NET_IPV6_FRAGMENT)\n-static inline uint8_t *net_pkt_ipv6_fragment_start(struct net_pkt *pkt)\n-{\n-\treturn pkt->ipv6_frag_hdr_start;\n-}\n-\n-static inline void net_pkt_set_ipv6_fragment_start(struct net_pkt *pkt,\n-\t\t\t\t\t\t uint8_t *start)\n-{\n-\tpkt->ipv6_frag_hdr_start = start;\n-}\n-\n-static inline uint16_t net_pkt_ipv6_fragment_offset(struct net_pkt *pkt)\n-{\n-\treturn pkt->ipv6_fragment_offset;\n-}\n-\n-static inline void net_pkt_set_ipv6_fragment_offset(struct net_pkt *pkt,\n-\t\t\t\t\t\t uint16_t offset)\n-{\n-\tpkt->ipv6_fragment_offset = offset;\n-}\n-\n-static inline uint32_t net_pkt_ipv6_fragment_id(struct net_pkt *pkt)\n-{\n-\treturn pkt->ipv6_fragment_id;\n-}\n-\n-static inline void net_pkt_set_ipv6_fragment_id(struct net_pkt *pkt,\n-\t\t\t\t\t\tuint32_t id)\n-{\n-\tpkt->ipv6_fragment_id = id;\n-}\n-#endif\n \n #if defined(CONFIG_NET_L2_IEEE802154)\n static inline uint8_t net_pkt_ieee802154_rssi(struct net_pkt *pkt)\n"} {"commit":"89717883e1e5e5d0045788a010092940dc391f1d","subject":"Fix build on VS prior 2019 (#146)","message":"Fix build on VS prior 2019 (#146)\n\n","repos":"SergiusTheBest\/plog,SergiusTheBest\/plog","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/plog\/WinApi.h\n+++ include\/plog\/WinApi.h\n@@ -108,31 +108,6 @@\n const WORD kIntensity = 0x0080;\n }\n \n- inline void InitializeCriticalSection(CRITICAL_SECTION* criticalSection)\n- {\n- InitializeCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n- }\n-\n- inline void EnterCriticalSection(CRITICAL_SECTION* criticalSection)\n- {\n- EnterCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n- }\n-\n- inline void LeaveCriticalSection(CRITICAL_SECTION* criticalSection)\n- {\n- LeaveCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n- }\n-\n- inline void DeleteCriticalSection(CRITICAL_SECTION* criticalSection)\n- {\n- DeleteCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n- }\n-\n- inline BOOL GetConsoleScreenBufferInfo(HANDLE consoleOutput, CONSOLE_SCREEN_BUFFER_INFO* consoleScreenBufferInfo)\n- {\n- return GetConsoleScreenBufferInfo(consoleOutput, reinterpret_cast<_CONSOLE_SCREEN_BUFFER_INFO*>(consoleScreenBufferInfo));\n- }\n-\n extern \"C\"\n {\n __declspec(dllimport) int __stdcall MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, int cbMultiByte, LPWSTR lpWideCharStr, int cchWideChar);\n@@ -165,5 +140,30 @@\n \n __declspec(dllimport) void __stdcall OutputDebugStringW(LPCWSTR lpOutputString);\n }\n+\n+ inline void InitializeCriticalSection(CRITICAL_SECTION* criticalSection)\n+ {\n+ InitializeCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n+ }\n+\n+ inline void EnterCriticalSection(CRITICAL_SECTION* criticalSection)\n+ {\n+ EnterCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n+ }\n+\n+ inline void LeaveCriticalSection(CRITICAL_SECTION* criticalSection)\n+ {\n+ LeaveCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n+ }\n+\n+ inline void DeleteCriticalSection(CRITICAL_SECTION* criticalSection)\n+ {\n+ DeleteCriticalSection(reinterpret_cast<_RTL_CRITICAL_SECTION*>(criticalSection));\n+ }\n+\n+ inline BOOL GetConsoleScreenBufferInfo(HANDLE consoleOutput, CONSOLE_SCREEN_BUFFER_INFO* consoleScreenBufferInfo)\n+ {\n+ return GetConsoleScreenBufferInfo(consoleOutput, reinterpret_cast<_CONSOLE_SCREEN_BUFFER_INFO*>(consoleScreenBufferInfo));\n+ }\n }\n #endif \/\/ _WIN32\n"} {"commit":"cd18e9fab29c698abbc3676f0a946fa6cf27421a","subject":"Added error code for SceAppMgr","message":"Added error code for SceAppMgr\n\nCredit also to @MerLev\n\nThanks to @Princess-of-Sleeping\n","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2\/appmgr.h\n+++ include\/psp2\/appmgr.h\n@@ -21,6 +21,7 @@\n \tSCE_APPMGR_ERROR_INVALID = 0x8080201A, \/\/!< Invalid param\n \tSCE_APPMGR_ERROR_TOO_LONG_ARGV = 0x8080201D, \/\/!< argv is too long\n \tSCE_APPMGR_ERROR_INVALID_SELF_PATH = 0x8080201E, \/\/!< Invalid SELF path\n+\tSCE_APPMGR_ERROR_NOEXEC = 0x8080201F, \/\/!< The process is not authorized to run this function\n \tSCE_APPMGR_ERROR_BGM_PORT_BUSY = 0x80803000 \/\/!< BGM port was occupied and could not be secured\n } SceAppMgrErrorCode;\n \n"} {"commit":"275c73f55713533c349b9dbfabcdc42a6d9e78ab","subject":"Added sceAppMgrGameDataMount header","message":"Added sceAppMgrGameDataMount header","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2\/appmgr.h\n+++ include\/psp2\/appmgr.h\n@@ -126,6 +126,9 @@\n \/\/! return AppId ?\n SceUID sceAppMgrLaunchAppByName2ForShell(const char *name, const char *param, SceAppMgrLaunchAppOptParam *optParam);\n \n+\/\/! Mount pfs, set unk and unk2 to 0\n+int sceAppMgrGameDataMount(const char *path, int unk, int unk2, char *mount_point);\n+\t\n \/\/! id: 100 (photo0), 101 (friends), 102 (messages), 103 (near), 105 (music), 108 (calendar)\n int sceAppMgrAppDataMount(int id, char *mount_point);\n \n"} {"commit":"6f2af39044620579b50edd65b8807a657ea7c4ef","subject":"Add unused attribute to PyStr_Concat if compiling with gcc","message":"Add unused attribute to PyStr_Concat if compiling with gcc\n\nThis supresses harmless compilation warnings that the\r\nfunction is unused.\r\n\r\nhttps:\/\/github.com\/encukou\/py3c\/pull\/19","repos":"encukou\/py3c,encukou\/py3c,encukou\/py3c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/py3c\/compat.h\n+++ include\/py3c\/compat.h\n@@ -73,6 +73,9 @@\n #define PyStr_InternFromString PyString_InternFromString\n #define PyStr_Decode PyString_Decode\n \n+#ifdef __GNUC__\n+static PyObject *PyStr_Concat(PyObject *left, PyObject *right) __attribute__ ((unused));\n+#endif\n static PyObject *PyStr_Concat(PyObject *left, PyObject *right) {\n PyObject *str = left;\n Py_INCREF(left); \/\/ reference to old left will be stolen\n"} {"commit":"3b80705950130a9b3ce787981bca0b36d08e4d16","subject":"Fix clang #pragma: should 'push', not 'pop'","message":"Fix clang #pragma: should 'push', not 'pop'\n","repos":"WopsS\/sampgdk,WopsS\/sampgdk,Zeex\/sampgdk,WopsS\/sampgdk,Zeex\/sampgdk,Zeex\/sampgdk","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/sampgdk\/amx.h\n+++ include\/sampgdk\/amx.h\n@@ -49,7 +49,7 @@\n #if defined __INTEL_COMPILER\n \t\/* ... *\/\n #elif defined __clang__\n-\t#pragma clang pop\n+\t#pragma clang push\n \t#pragma clang diagnostic ignored \"-Wignored-attributes\"\n #elif defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))\n \t#pragma GCC diagnostic push\n"} {"commit":"6aecfc10f85f33dcf8b26a3db644a322bd16e798","subject":"Removed memory leaks","message":"Removed memory leaks\n","repos":"jspd-group\/pegit,jspd-group\/pegit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/strbuf-list.h\n+++ include\/strbuf-list.h\n@@ -32,7 +32,7 @@\n static int strbuf_list_add(struct strbuf_list *sbl, const void *buf,\n size_t size, char sign, size_t index)\n {\n- struct strbuf_list_node *node = malloc(sizeof(struct strbuf_list_node));\n+ struct strbuf_list_node *node = MALLOC(struct strbuf_list_node, 1);\n \n if (!node) die(\"Out of memory\\n\");\n \n@@ -49,11 +49,17 @@\n \n static void strbuf_list_free(struct strbuf_list *sbl)\n {\n- struct strbuf_list_node *node = sbl->head;\n- do {\n- sbl->head = sbl->head->next;\n- free(node);\n- } while ((node = sbl->head));\n+ struct strbuf_list_node *node = sbl->head->next;\n+ struct strbuf_list_node *prev = node;\n+\n+ while (prev) {\n+ node = node->next;\n+ strbuf_release(&prev->buf);\n+ free(prev);\n+ prev = node;\n+ }\n+\n+ free(sbl->head);\n }\n \n static void strbuf_list_append(struct strbuf_list *sbl, struct strbuf_list *sec)\n"} {"commit":"cc8d5481974c052e82b22b053f99553936136591","subject":"mark non standard item","message":"mark non standard item\n","repos":"chipsalliance\/UHDM,chipsalliance\/UHDM,chipsalliance\/UHDM","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/sv_vpi_user.h\n+++ include\/sv_vpi_user.h\n@@ -88,7 +88,7 @@\n #define vpiSequenceTypespec 696\n #define vpiPropertyTypespec 697\n #define vpiEventTypespec 698\n-#define vpiModuleTypespec 768\n+#define vpiModuleTypespec 768 \/* !!! NOT Standard !!! *\/\n \n #define vpiClockingBlock 650\n #define vpiClockingIODecl 651\n"} {"commit":"2520e4cd1a430b50884764dedead4f28905785c3","subject":"mingw ETIMEDOUT\/EINPROGRESS tentative fix","message":"mingw ETIMEDOUT\/EINPROGRESS tentative fix\n","repos":"koanlogic\/libu,xunmengfeng\/libu,xunmengfeng\/libu,koanlogic\/libu","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/toolbox\/net.h\n+++ include\/toolbox\/net.h\n@@ -41,6 +41,8 @@\n #include <winsock2.h>\n #include <ws2tcpip.h>\n \n+ #define EINPROGRESS WSAEWOULDBLOCK\n+ #define ETIMEDOUT WSAETIMEDOUT\n #define EAFNOSUPPORT WSAEAFNOSUPPORT\n #endif \/* OS_WIN *\/\n \n"} {"commit":"110f65aeb1d27858bb11a46a52dda97032733e4d","subject":"Define align_as macro","message":"Define align_as macro\n","repos":"iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth,iankronquist\/kernel-of-truth","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/truth\/types.h\n+++ include\/truth\/types.h\n@@ -76,6 +76,7 @@\n \n #define container_of(child, parent_type, parent_entry) \\\n ((parent_type)(child - &((parent_type)NULL)->parent_entry))\n+#define align_as(value, alignment) (value & (alignment - 1))\n #define is_aligned(value, alignment) !(value & (alignment - 1))\n #define round_next(x, y) (((x) + (y - 1)) & ~(y - 1))\n #define static_array_count(x) (sizeof(x) \/ sizeof(x)[0])\n"} {"commit":"bf58b42bc1ec75ad0a3cac037219dc42a7277c1f","subject":"Remove references to INFINITY","message":"Remove references to INFINITY\n\nDon't need to block compilation now, should work with any compiler\n","repos":"cpputest\/cpputest,arstrube\/cpputest,bithium\/cpputest,arstrube\/cpputest,cpputest\/cpputest,Mindtribe\/cpputest,cpputest\/cpputest,offa\/cpputest,Andne\/cpputest,PaulBussmann\/cpputest,jaeguly\/cpputest,offa\/cpputest,KisImre\/cpputest,basvodde\/cpputest,jaeguly\/cpputest,bithium\/cpputest,maxilai\/cpputest,jaeguly\/cpputest,offa\/cpputest,Mindtribe\/cpputest,cpputest\/cpputest,Andne\/cpputest,PaulBussmann\/cpputest,asgeroverby\/cpputest,maxilai\/cpputest,arstrube\/cpputest,basvodde\/cpputest,asgeroverby\/cpputest,PaulBussmann\/cpputest,Andne\/cpputest,KisImre\/cpputest,arstrube\/cpputest,offa\/cpputest,bithium\/cpputest,bithium\/cpputest,basvodde\/cpputest,maxilai\/cpputest,KisImre\/cpputest,jaeguly\/cpputest,KisImre\/cpputest,maxilai\/cpputest,Andne\/cpputest,asgeroverby\/cpputest,PaulBussmann\/cpputest,Mindtribe\/cpputest,Mindtribe\/cpputest,basvodde\/cpputest,asgeroverby\/cpputest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tests\/CppUTestExt\/IEEE754PluginTest_c.c\n+++ tests\/CppUTestExt\/IEEE754PluginTest_c.c\n@@ -27,8 +27,6 @@\n \n #include <CppUTest\/CppUTestConfig.h>\n \n-#ifdef CPPUTEST_HAVE_FENV\n-\n #include \"IEEE754PluginTest_c.h\"\n #include <math.h>\n \n@@ -42,14 +40,14 @@\n \n void set_overflow_c(void)\n {\n- f = 1000.0f;\n- while (f < INFINITY) f *= f;\n+ f = 1e38f;\n+ f *= f;\n }\n \n void set_underflow_c(void)\n {\n- f = 0.01f;\n- while (f > 0.0f) f *= f;\n+ f = 1e-38f;\n+ f *= f;\n }\n \n void set_invalid_c(void)\n@@ -75,5 +73,3 @@\n set_invalid_c();\n set_inexact_c();\n }\n-\n-#endif \/* CPPUTEST_HAVE_FENV *\/\n"} {"commit":"d6445fe0493b7f896c3ea8f166ae64f85ad28ebd","subject":"TEMPLATE: Use bool arg for be_new_IncSP","message":"TEMPLATE: Use bool arg for be_new_IncSP\n","repos":"libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,libfirm\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/TEMPLATE\/TEMPLATE_bearch.c\n+++ ir\/be\/TEMPLATE\/TEMPLATE_bearch.c\n@@ -68,7 +68,8 @@\n \tir_node *const initial_sp = be_get_Start_proj(irg, sp);\n \tir_type *const frame_type = get_irg_frame_type(irg);\n \tunsigned const frame_size = get_type_size(frame_type);\n-\tir_node *const incsp = be_new_IncSP(sp, block, initial_sp, frame_size, 0);\n+\tir_node *const incsp\n+\t\t= be_new_IncSP(sp, block, initial_sp, frame_size, false);\n \tedges_reroute_except(initial_sp, incsp, incsp);\n \tsched_add_after(start, incsp);\n }\n"} {"commit":"018acb9003575613f59fb5977fe2b067029dfc78","subject":"Add psp2kern\/avcodec\/jpegenc.h to vitasdkkern.h","message":"Add psp2kern\/avcodec\/jpegenc.h to vitasdkkern.h\n","repos":"Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/vitasdkkern.h\n+++ include\/vitasdkkern.h\n@@ -34,4 +34,6 @@\n \n #include <psp2kern\/net\/net.h>\n \n+#include <psp2kern\/avcodec\/jpegenc.h>\n+\n #endif\n"} {"commit":"fefeb157308bcd58d1ece262981d4f73c67f1a00","subject":"Minor improvements.","message":"Minor improvements.\n","repos":"blagodarin\/yttrium,blagodarin\/yttrium","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/yttrium\/api.h\n+++ include\/yttrium\/api.h\n@@ -5,13 +5,13 @@\n #define _include_yttrium_api_h_\n \n \/\/\/ \\def Y_EXPORT\n-\/\/\/ \\brief Shared library exported declaration specifier.\n+\/\/\/ \\brief Exported API specifier.\n \n \/\/\/ \\def Y_IMPORT\n-\/\/\/ \\brief Shared library imported declaration specifier.\n+\/\/\/ \\brief Imported API specifier.\n \n \/\/\/ \\def Y_PRIVATE\n-\/\/\/ \\brief Shared library private declaration specifier.\n+\/\/\/ \\brief Prevents a declaration from being exported as a part of API.\n \n #if defined(_WIN32) || defined(__CYGWIN__)\n \t#define Y_EXPORT __declspec(dllexport)\n@@ -22,7 +22,7 @@\n \t#define Y_IMPORT\n \t#define Y_PRIVATE __attribute__((visibility(\"hidden\")))\n #else\n-\t#define Y_EXPORT\n+\t#error\n #endif\n \n \/\/\/ \\def Y_API\n@@ -34,9 +34,4 @@\n \t#define Y_API Y_IMPORT\n #endif\n \n-\/\/\/ %Yttrium namespace.\n-namespace Yttrium\n-{\n-}\n-\n #endif\n"} {"commit":"e77ceb7d05cd1c6617a963532ae41a27eb144624","subject":"Tweaked constants for non-IR","message":"Tweaked constants for non-IR","repos":"FTCTeam772\/Competition,FTCTeam772\/Competition","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- constants.h\n+++ constants.h\n@@ -46,6 +46,6 @@\n #define AUTO_RAMP_TURN 1000\n #define AUTO_RAMP_UP 3700\n \/\/Autonomous Programs 1 and 3\n-#define AUTO_FIRST_BASKET 2000\n-#define AUTO_RAMP 2400\n+#define AUTO_FIRST_BASKET 2250\n+#define AUTO_RAMP 2150\n #define AUTO_RAMP_OVER 6400\n"} {"commit":"3cfaf8720c21950018b667a653d2bda461ab5dbc","subject":"Moved selected autonomous to top","message":"Moved selected autonomous to top\n","repos":"FTCTeam772\/Competition,FTCTeam772\/Competition","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- constants.h\n+++ constants.h\n@@ -1,3 +1,12 @@\n+\/* Selected Autonomous Program\n+ *\n+ * 0 - Left and IR\n+ * 1 - Left and no IR\n+ * 2 - Right and IR\n+ * 3 - Right and no IR\n+ *\/\n+#define AUTO_PROGRAM 0\n+\n \/\/Flags\n #define NONLINEARTARGET\n \n@@ -26,15 +35,6 @@\n #define ARM_SHOULDER_BASKET 14200\n #define ARM_ELBOW_BASKET -1200\n \n-\/* Selected Autonomous Program\n- *\n- * 0 - Left and IR\n- * 1 - Left and no IR\n- * 2 - Right and IR\n- * 3 - Right and no IR\n- *\/\n-#define AUTO_PROGRAM 0\n-\n \/\/Autonomous\n #define WAIT 50\n #define AUTO_DETECT 12000\n"} {"commit":"8ba9aad14bf064a6913a714669470741516d7462","subject":"Give llround its own namespace to not conflict with 'long long round' in newer compilers","message":"Give llround its own namespace to not conflict with 'long long round' in newer compilers\n","repos":"gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indra\/llmath\/llmath.h\n+++ indra\/llmath\/llmath.h\n@@ -193,6 +193,7 @@\n \n #ifndef BOGUS_ROUND\n \/\/ Use this round. Does an arithmetic round (0.5 always rounds up)\n+#define llround _llround \/\/ <FS:TM> added to not conflict with 'Long Long Round' in newer compilers\n inline S32 llround(const F32 val)\n {\n \treturn llfloor(val + 0.5f);\n"} {"commit":"0a87704d77ab0d26b739818a3889eb6ca285719e","subject":"New test file","message":"New test file\n","repos":"8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler,8l\/ucc-c-compiler","returncode":1,"stderr":"error: pathspec 'init\/simple_nobrace.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- init\/simple_nobrace.c\n+++ init\/simple_nobrace.c\n@@ -0,0 +1,9 @@\n+main()\n+{\n+\tint x[][2] = {\n+\t\t1, 2, \/\/ i=0, t\n+\t\t3, 4\n+\t};\n+\n+\treturn x[1][0]; \/\/ 3\n+}\n"} {"commit":"7cc2522d0abd2b1c9374fe6e4bb2d9f24a18bb71","subject":"band-aide until _SC_PHYS_PAGES actually is defined","message":"band-aide until _SC_PHYS_PAGES actually is defined\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libc\/gen\/sysconf.c\n+++ lib\/libc\/gen\/sysconf.c\n@@ -576,9 +576,11 @@\n \t\tmib[1] = HW_NCPU;\n \t\tbreak;\n \n+#ifdef _SC_PHYS_PAGES\n \tcase _SC_PHYS_PAGES:\n \t\tsname = \"hw.availpages\";\n \t\tbreak;\n+#endif\n \n \tdefault:\n \t\terrno = EINVAL;\n"} {"commit":"369fe04016ea7a31008c50b210b53d2d70e1def0","subject":"MFC r268467: Implement sysconf(_SC_GETGR_R_SIZE_MAX) and sysconf(_SC_GETPW_R_SIZE_MAX).","message":"MFC r268467:\nImplement sysconf(_SC_GETGR_R_SIZE_MAX) and sysconf(_SC_GETPW_R_SIZE_MAX).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"a222062d021f2ab91e8ea63fa5f619a8eb0f92c7","subject":"wordexp(): Simplify code by deferring work to sh.","message":"wordexp(): Simplify code by deferring work to sh.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"c44dc0d6393702c6bcf74f9504921665918da2b9","subject":"Add comment explaining __mb_sb_limit trick here.","message":"Add comment explaining __mb_sb_limit trick here.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"46a36068d3a28f4379b5888e43d289eaff413348","subject":"made a bunch of style modifications \/ reformating","message":"made a bunch of style modifications \/ reformating\n","repos":"globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gass\/copy\/source\/globus_gass_copy.c\n+++ gass\/copy\/source\/globus_gass_copy.c\n@@ -158,15 +158,15 @@\n * globus_gass_copy_handle_destroy().\n *\n * @param handle\n- * The handle to be initialized\n- *\n- * @return\n+ * The handle to be initialized\n+ *\n+ * @return\n * This function returns GLOBUS_SUCCESS if successful, or a\n * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_handle_destroy() ,\n- * globus_gass_copy_handle_set_ftp_plugins(),\n- * globus_ftp_client_hande_init()\n+ * globus_gass_copy_handle_set_ftp_plugins(),\n+ * globus_ftp_client_hande_init()\n *\/\n globus_result_t\n globus_gass_copy_handle_init(\n@@ -221,15 +221,15 @@\n * associated with it.\n *\n * @param handle\n- * The handle to be destroyed\n- *\n- * @return\n+ * The handle to be destroyed\n+ *\n+ * @return\n * This function returns GLOBUS_SUCCESS if successful, or a\n * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_handle_init(),\n- * globus_gass_copy_handle_set_ftp_plugins(),\n- * globus_ftp_client_handle_destroy() \n+ * globus_gass_copy_handle_set_ftp_plugins(),\n+ * globus_ftp_client_handle_destroy() \n *\/\n globus_result_t\n globus_gass_copy_handle_destroy(\n@@ -269,15 +269,19 @@\n \/**\n * Set the plugins for ftp\/gsiftp transfers\n *\n- * The globus_ftp_client library allows for plugins to extend the behaviour of the API\n- * to add new reliability or performance features without changing the rest of the API.\n- * This function can be used to pass a list of plugins to the globus_ftp_client API for transfer\n- * associated with this handle.\n- *\n+ * The globus_ftp_client library allows for plugins to extend the behaviour of\n+ * the API to add new reliability or performance features without changing the\n+ * rest of the API. This function can be used to pass a list of plugins to the\n+ * globus_ftp_client API for transfer associated with this handle.\n+ *\n * @param handle\n * A globus_gass_copy handle that should use these plugins\n- *@param ftp_plugins\n+ * @param ftp_plugins\n * The ftp\/gsiftp plugins to be used\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_handle_init(),\n * globus_gass_copy_handle_destroy()\n@@ -314,11 +318,11 @@\n * will default to 1M.\n *\n * @param handle\n- * Set the buffer length for transfers associated with this handle.\n+ * Set the buffer length for transfers associated with this handle.\n * @param length\n * The length, in bytes, to make the buffer.\n *\n- * @return\n+ * @return\n * This function returns GLOBUS_SUCCESS if successful, or a\n * globus_result_t indicating the error that occurred.\n *\/\n@@ -364,9 +368,9 @@\n * @param attr\n * The attribute structure to be initialized\n *\n- * @return\n- * This function returns GLOBUS_SUCCESS if successful, or a\n- * globus_result_t indicating the error that occurred.\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_attr_set_ftp(),\n * globus_gass_copy_attr_set_gass(),\n@@ -407,8 +411,12 @@\n *\n * @param attr\n * A globus_gass_copy attribute structure \n- *@param ftp_attr\n+ * @param ftp_attr\n * The ftp\/gsiftp attributes to be used\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_attr_init(),\n * globus_gass_copy_attr_set_gass(),\n@@ -454,9 +462,9 @@\n * @param io_attr\n * The file attributes to be used\n *\n- * @return\n- * This function returns GLOBUS_SUCCESS if successful, or a\n- * globus_result_t indicating the error that occurred.\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_attr_init(),\n * globus_gass_copy_attr_set_gass(),\n@@ -501,9 +509,9 @@\n * @param io_attr\n * The http\/https attributes to be used\n *\n- * @return\n- * This function returns GLOBUS_SUCCESS if successful, or a\n- * globus_result_t indicating the error that occurred.\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_attr_init(),\n * globus_gass_copy_attr_set_io(),\n@@ -545,13 +553,13 @@\n * to specify the appropriate attributes when initiating a transfer.\n *\n * @param url\n- * The URL for schema checking\n+ * The URL for schema checking\n * @param mode\n- * the filled in schema type of the URL param\n- *\n- * @return\n- * This function returns GLOBUS_SUCCESS if successful, or a\n- * globus_result_t indicating the error that occurred.\n+ * the filled in schema type of the URL param\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @see globus_gass_copy_attr_init(),\n * globus_gass_copy_attr_set_io(),\n@@ -819,6 +827,19 @@\n }\n } \/* globus_gass_copy_get_status() *\/\n \n+\n+\/**\n+ * Get performace values for a transfer.\n+ *\n+ * @param handle\n+ * A globus_gass_copy_handle\n+ * @param perf_info\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n+ *\n+ *\/\n globus_result_t\n globus_gass_copy_get_performance(\n globus_gass_copy_handle_t * handle,\n@@ -1269,11 +1290,13 @@\n * Based on the source and destination information in the state structure, start\n * the data transfer using the appropriate method - FTP, GASS, IO\n *\n- * @param state\n+ * @param handle\n * structure containing all the information required to perform data\n * transfer from a source to a destination.\n *\n- * @return fuzzy description\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @retval GLOBUS_SUCCESS\n * Descriptions\n@@ -1693,13 +1716,15 @@\n * Based on the mod of the source, register a read using the appropriate\n * data transfer method.\n *\n- * @param state\n+ * @param handle\n * structure containing all the information required to perform data\n * transfer from a source to a destination.\n * @param buffer\n * The buffer to be used to transfer the data.\n *\n- * @return fuzzy description\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\n * @retval GLOBUS_SUCCESS\n * Descriptions\n@@ -1787,22 +1812,10 @@\n \/**\n * GASS setup callback.\n *\n- * This function is called after the connection attempt to the data source has\n- * completed or failed.\n- *\n- * @param state\n- * structure containing all the information required to perform data\n- * transfer from a source to a destination.\n- *\n- * @return fuzzy description\n- *\n- * @retval GLOBUS_SUCCESS\n- * Descriptions\n- * @retval GLOBUS_FAILURE\n- *\n- * @see globus_gass_copy_destroy()\n+ * This function is called after the connection attempt to the target\n+ * (e.g source or destination) has completed, failed, is a referral, ...\n+ *\n *\/\n-\n void\n globus_l_gass_copy_gass_setup_callback(\n void * callback_arg,\n@@ -2390,7 +2403,8 @@\n static char * myname=\"globus_l_gass_copy_generic_read_callback\";\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG \n- globus_libc_fprintf(stderr, \"generic_read_callback(): read %d bytes\\n\", nbytes);\n+ globus_libc_fprintf(stderr,\n+ \"generic_read_callback(): read %d bytes\\n\", nbytes);\n #endif \n globus_mutex_lock(&(state->source.mutex));\n state->source.n_pending--;\n@@ -2400,7 +2414,8 @@\n if(state->cancel == GLOBUS_I_GASS_COPY_CANCEL_TRUE)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG \n-\tglobus_libc_fprintf(stderr, \"generic_read_callback(): there was an error\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"generic_read_callback(): there was an error\\n\");\n #endif\n globus_gass_copy_cancel(handle, NULL, NULL);\n \treturn;\n@@ -2426,7 +2441,8 @@\n \t globus_i_gass_copy_set_error(handle, err);\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t globus_libc_fprintf(stderr, \"generic_read_callback(): malloc failed\\n\");\n+\t globus_libc_fprintf(stderr,\n+ \"generic_read_callback(): malloc failed\\n\");\n #endif\n globus_gass_copy_cancel(handle, NULL, NULL);\n \t return;\n@@ -2644,11 +2660,14 @@\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n if(result== GLOBUS_SUCCESS)\n-\tglobus_libc_fprintf(stderr, \"io_read_callback(): result == GLOBUS_SUCCESS\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"io_read_callback(): result == GLOBUS_SUCCESS\\n\");\n else\n-\tglobus_libc_fprintf(stderr, \"io_read_callback(): result != GLOBUS_SUCCESS\\n\");\n- \n- globus_libc_fprintf(stderr, \"io_read_callback(): %d bytes READ\\n\", nbytes);\n+\tglobus_libc_fprintf(stderr,\n+ \"io_read_callback(): result != GLOBUS_SUCCESS\\n\");\n+ \n+ globus_libc_fprintf(stderr,\n+ \"io_read_callback(): %d bytes READ\\n\", nbytes);\n #endif\n \n if(result != GLOBUS_SUCCESS)\n@@ -2657,7 +2676,8 @@\n \tlast_data=globus_io_eof(err);\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"io_read_callback(): last_data == %d\\n\", last_data);\n+\tglobus_libc_fprintf(stderr,\n+ \"io_read_callback(): last_data == %d\\n\", last_data);\n #endif\n \tif(last_data)\n \t{ \/* this was the last read. set READ_COMPLETE *\/\n@@ -2674,7 +2694,8 @@\n \t {\n \t\tglobus_io_close(io_handle);\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\tglobus_libc_fprintf(stderr, \"io_read_callback(): handle closed\\n\");\n+\t\tglobus_libc_fprintf(stderr,\n+ \"io_read_callback(): handle closed\\n\");\n #endif\n \t\t\/* thinking that this should go in the\n * globus_l_gass_copy_state_free()\n@@ -2764,7 +2785,8 @@\n if(state->cancel == GLOBUS_I_GASS_COPY_CANCEL_TRUE)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG \n-\tglobus_libc_fprintf(stderr, \"generic_write_callback(): there was an error\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"generic_write_callback(): there was an error\\n\");\n #endif\n globus_gass_copy_cancel(handle, NULL, NULL);\n \treturn;\n@@ -2772,7 +2794,8 @@\n \n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"generic_write_callback(): wrote %d bytes\\n\", nbytes);\n+ globus_libc_fprintf(stderr,\n+ \"generic_write_callback(): wrote %d bytes\\n\", nbytes);\n #endif\n \/* push the buffer on the read queue and start another read *\/\n \n@@ -2790,7 +2813,8 @@\n \tglobus_i_gass_copy_set_error(handle, err);\n \t\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"generic_write_callback(): malloc failed\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"generic_write_callback(): malloc failed\\n\");\n #endif\n globus_gass_copy_cancel(handle, NULL, NULL);\n \treturn;\n@@ -2801,7 +2825,8 @@\n globus_fifo_enqueue( &(state->source.queue), buffer_entry);\n globus_mutex_unlock(&(state->source.mutex));\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"generic_write_callback(): calling read_from_queue()\\n\");\n+ globus_libc_fprintf(stderr, \n+ \"generic_write_callback(): calling read_from_queue()\\n\");\n #endif\n if(handle->state)\n \tglobus_l_gass_copy_read_from_queue(handle);\n@@ -2813,7 +2838,8 @@\n \t\n \/* if there are more writes to do, register the next write *\/\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"generic_write_callback(): calling write_from_queue()\\n\");\n+ globus_libc_fprintf(stderr,\n+ \"generic_write_callback(): calling write_from_queue()\\n\");\n #endif\n if(handle->state)\n \tglobus_l_gass_copy_write_from_queue(handle);\n@@ -2836,7 +2862,8 @@\n globus_object_t * err = GLOBUS_NULL;\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"globus_l_gass_copy_write_from_queue(): called\\n\");\n+ globus_libc_fprintf(stderr,\n+ \"globus_l_gass_copy_write_from_queue(): called\\n\");\n #endif\n \n while(1)\n@@ -2860,21 +2887,26 @@\n * haven't canceled\n *\/\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\t globus_libc_fprintf(stderr, \"write_from_queue: gonna check the queue\\n\");\n-#endif\n-\t\t if ((buffer_entry = globus_fifo_dequeue(&(state->dest.queue)))\n+\t\t globus_libc_fprintf(stderr,\n+ \"write_from_queue: gonna check the queue\\n\");\n+#endif\n+\t\t if ((buffer_entry=globus_fifo_dequeue(&(state->dest.queue)))\n \t\t\t!= GLOBUS_NULL)\n \t\t {\n \t\t\tstate->dest.n_pending++;\n \t\t\tdo_the_write = GLOBUS_TRUE;\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\t\tglobus_libc_fprintf(stderr, \"write_from_queue: got a buffer from the queue\\n\");\n-#endif\n-\t\t }\/* if (buffer_entry != GLOBUS_NULL), there is a buffer in the write queue *\/\n+\t\t\tglobus_libc_fprintf(stderr,\n+ \"write_from_queue: got a buffer from the queue\\n\");\n+#endif\n+\t\t }\/* if (buffer_entry != GLOBUS_NULL), there is a buffer\n+ * in the write queue\n+ *\/\n \t\t else\n \t\t {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\t\tglobus_libc_fprintf(stderr, \"write_from_queue: NO buffers in the queue\\n\");\n+\t\t\tglobus_libc_fprintf(stderr,\n+ \"write_from_queue: NO buffers in the queue\\n\");\n #endif\n \t\t }\n \t\t} \/* (n_pending < n_simulatneous) && !cancel *\/\n@@ -2882,7 +2914,8 @@\n \t} \/* lock state->dest *\/\n \tglobus_mutex_unlock(&(state->dest.mutex));\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"write_from_queue: unlocking the dest mutex\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"write_from_queue: unlocking the dest mutex\\n\");\n #endif\n \tif(do_the_write)\n \t{\n@@ -2944,7 +2977,8 @@\n \t\t handle,\n \t\t err);\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t globus_libc_fprintf(stderr, \"write_from_queue(): done calling user callback\\n\");\n+\t globus_libc_fprintf(stderr,\n+ \"write_from_queue(): done calling user callback\\n\");\n #endif\n \t \/* if an error object was created, free it *\/\n \t if(err != GLOBUS_NULL)\n@@ -2974,7 +3008,8 @@\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n \tglobus_libc_fprintf(stderr,\n \"register_write(): calling globus_ftp_client_register_write()\\n\");\n-\tglobus_libc_fprintf(stderr, \"\\t\\t\\t nbytes= %d, offset= %d, last_data= %d\\n\",\n+\tglobus_libc_fprintf(stderr,\n+ \"\\t\\t\\t nbytes= %d, offset= %d, last_data= %d\\n\",\n buffer_entry->nbytes,\n \t\tbuffer_entry->offset,\n \t\tbuffer_entry->last_data);\n@@ -3069,8 +3104,8 @@\n = copy_handle->state;\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"ftp_write_callback(): has been called, nbytes: %d\\n\",\n- nbytes);\n+ globus_libc_fprintf(stderr,\n+ \"ftp_write_callback(): has been called, nbytes: %d\\n\", nbytes);\n #endif\n \n if(error == GLOBUS_SUCCESS) \/* no error occured *\/\n@@ -3136,8 +3171,9 @@\n \n req_status = globus_gass_transfer_request_get_status(request);\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"gass_write_callback(): last_data== %d, req_status= %d\\n\",\n- last_data, req_status);\n+ globus_libc_fprintf(stderr,\n+ \"gass_write_callback(): last_data== %d, req_status= %d\\n\",\n+ last_data, req_status);\n #endif\n \n if(req_status == GLOBUS_GASS_TRANSFER_REQUEST_DONE ||\n@@ -3146,7 +3182,8 @@\n \tif(last_data)\n \t{ \/* this was the last write. set WRITE_COMPLETE and free the request *\/\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t globus_libc_fprintf(stderr, \"gass_write_callback(): THIS WAS THE LAST WRITE\\n\");\n+\t globus_libc_fprintf(stderr,\n+ \"gass_write_callback(): THIS WAS THE LAST WRITE\\n\");\n #endif\n \t globus_mutex_lock(&(state->dest.mutex));\n \t {\n@@ -3155,11 +3192,11 @@\n \t globus_mutex_unlock(&(state->dest.mutex));\n \t handle->status = GLOBUS_GASS_COPY_STATUS_WRITE_COMPLETE;\n \t\n-\/*\trc = globus_gass_transfer_request_get_status(request); *\/\n \t if(req_status == GLOBUS_GASS_TRANSFER_REQUEST_DONE)\n \t {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\tglobus_libc_fprintf(stderr, \"gass_write_callback(): GLOBUS_GASS_TRANSFER_REQUEST_DONE\\n\");\n+\t\tglobus_libc_fprintf(stderr,\n+ \"gass_write_callback(): GLOBUS_GASS_TRANSFER_REQUEST_DONE\\n\");\n #endif\n \t\tglobus_gass_transfer_request_destroy(request);\n \t }\n@@ -3231,7 +3268,8 @@\n if(result==GLOBUS_SUCCESS)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"io_write_callback(): result == GLOBUS_SUCCESS\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"io_write_callback(): result == GLOBUS_SUCCESS\\n\");\n #endif\n \n \tglobus_mutex_lock(&(state->source.mutex));\n@@ -3255,7 +3293,8 @@\n \t\t\t{\n \t\t\t globus_io_close(io_handle);\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t\t\t globus_libc_fprintf(stderr, \"io_write_callback(): handle closed\\n\");\n+\t\t\t globus_libc_fprintf(stderr,\n+ \"io_write_callback(): handle closed\\n\");\n #endif\n \t\t\t} \/* if(state->dest.data.io.free_handle) *\/\n \t\t } \/* if write queue is empty *\/\n@@ -3269,13 +3308,15 @@\n else \/* there was an error *\/\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"io_write_callback(): result != GLOBUS_SUCCESS\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"io_write_callback(): result != GLOBUS_SUCCESS\\n\");\n #endif\n \t{\n \t if(!state->cancel) \/* cancel has not been set already *\/\n \t {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tfprintf(stderr, \"io_write_callback(): cancel has not been set\\n\");\n+\t fprintf(stderr,\n+ \"io_write_callback(): cancel has not been set\\n\");\n #endif\n \t\tglobus_i_gass_copy_set_error_from_result(handle, result);\n \t\tstate->cancel = GLOBUS_I_GASS_COPY_CANCEL_TRUE;\n@@ -3284,7 +3325,8 @@\n \t else\n \t {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tfprintf(stderr, \"io_write_callback(): cancel has already been set\\n\");\n+\t fprintf(stderr,\n+ \"io_write_callback(): cancel has already been set\\n\");\n #endif\n \t globus_mutex_lock(&(state->dest.mutex));\n \t\tstate->dest.n_pending--;\n@@ -3720,7 +3762,8 @@\n if(handle == GLOBUS_NULL)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"register_url_to_url(): handle was GLOBUS_NULL\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"register_url_to_url(): handle was GLOBUS_NULL\\n\");\n #endif\n \tbad_param = 1;\n \tgoto error_exit;\n@@ -3728,7 +3771,8 @@\n if(source_url == GLOBUS_NULL)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"register_url_to_url(): source_url was GLOBUS_NULL\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"register_url_to_url(): source_url was GLOBUS_NULL\\n\");\n #endif\n \tbad_param = 2;\n \tgoto error_exit;\n@@ -3736,7 +3780,8 @@\n if(dest_url == GLOBUS_NULL)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"register_url_to_url(): dest_url was GLOBUS_NULL\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"register_url_to_url(): dest_url was GLOBUS_NULL\\n\");\n #endif\n \tbad_param = 4;\n \tgoto error_exit; \n@@ -3770,7 +3815,8 @@\n \tchar src_msg[256];\n \tchar dest_msg[256];\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"register_url_to_url(): source or dest is URL_MODE_UNSUPPORTED\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"register_url_to_url(): source or dest is URL_MODE_UNSUPPORTED\\n\");\n #endif\n \tif(source_url_mode == GLOBUS_GASS_COPY_URL_MODE_UNSUPPORTED)\n \t sprintf(src_msg, \" %s, GLOBUS_GASS_COPY_URL_MODE_UNSUPPORTED.\",\n@@ -3829,7 +3875,8 @@\n {\n \t\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"calling globus_ftp_client_third_party_transfer()\\n\");\n+ globus_libc_fprintf(stderr,\n+ \"calling globus_ftp_client_third_party_transfer()\\n\");\n #endif\n \n handle->external_third_party = GLOBUS_TRUE;\n@@ -3848,14 +3895,17 @@\n \t{\n \t \/* do some error handling *\/\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\t globus_libc_fprintf(stderr, \"third_party_transfer() was not GLOBUS_SUCCESS! it returned %d\\n\", result);\n+\t globus_libc_fprintf(stderr,\n+ \"third_party_transfer() was not GLOBUS_SUCCESS! it returned %d\\n\",\n+ result);\n #endif\n \t goto error_result_exit;\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\t \n \t}\n \telse\n \t{\n-\t globus_libc_fprintf(stderr, \"third_party_transfer() returned GLOBUS_SUCCESS\\n\");\n+\t globus_libc_fprintf(stderr,\n+ \"third_party_transfer() returned GLOBUS_SUCCESS\\n\");\n #endif\n \t}\n }\n@@ -4191,6 +4241,11 @@\n * Handle which will contain a cached connection to the URL server.\n * @param url\n * The URL of the FTP or GSIFTP server to cache.\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n+ *\n *\/\n globus_result_t\n globus_gass_copy_cache_url_state(\n@@ -4223,7 +4278,7 @@\n \t err = globus_error_construct_string(\n \t\tGLOBUS_GASS_COPY_MODULE,\n \t\tGLOBUS_NULL,\n-\t\t\"[%s]: BAD_URL_SCHEME, url: %s, only ftp or gsiftp can be cached\",\n+ \"[%s]: BAD_URL_SCHEME, url: %s, only ftp or gsiftp can be cached\",\n \t\tmyname,\n \t\turl);\n \t return globus_error_put(err);\n@@ -4256,6 +4311,10 @@\n * Handle which contains a cached connection to the URL server.\n * @param url\n * The URL of the FTP or GSIFTP server to remove.\n+ *\n+ * @return\n+ * This function returns GLOBUS_SUCCESS if successful, or a\n+ * globus_result_t indicating the error that occurred.\n *\/\n globus_result_t\n globus_gass_copy_flush_url_state(\n@@ -4286,11 +4345,11 @@\n \telse\n \t{\n \t err = globus_error_construct_string(\n-\t\tGLOBUS_GASS_COPY_MODULE,\n-\t\tGLOBUS_NULL,\n-\t\t\"[%s]: BAD_URL_SCHEME, url: %s, only ftp or gsiftp can be cached\",\n-\t\tmyname,\n-\t\turl);\n+\t GLOBUS_GASS_COPY_MODULE,\n+\t GLOBUS_NULL,\n+\t \"[%s]: BAD_URL_SCHEME, url: %s, only ftp or gsiftp can be cached\",\n+\t myname,\n+\t url);\n \t return globus_error_put(err);\n \t}\n \n@@ -4538,10 +4597,11 @@\n if (result != GLOBUS_SUCCESS)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n- globus_libc_fprintf(stderr, \"target_cancel(): _ftp_client_abort() returned an error\\n\");\n-\t\t globus_libc_fprintf(stderr, \"target_cancel(): error = %s\\n\", \n-\t\t\t\t globus_object_printable_to_string(globus_error_get(result)));\n- globus_libc_fprintf(stderr, \" resetting to SUCCESS\\n\"); \n+ globus_libc_fprintf(stderr,\n+ \"target_cancel(): _ftp_client_abort() returned an error\\n\");\n+\t\tglobus_libc_fprintf(stderr, \"target_cancel(): error = %s\\n\", \n+\t\t globus_object_printable_to_string(globus_error_get(result)));\n+ globus_libc_fprintf(stderr, \" resetting to SUCCESS\\n\");\n #endif\n result = GLOBUS_SUCCESS;\n }\n@@ -4577,7 +4637,8 @@\n }\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n if(result != GLOBUS_SUCCESS)\n-\tglobus_libc_fprintf(stderr, \"[%s]: error trying to cancel one of the targets\\n\",\n+\tglobus_libc_fprintf(stderr,\n+ \"[%s]: error trying to cancel one of the targets\\n\",\n myname);\n #endif\n return result;\n@@ -4594,7 +4655,8 @@\n \t= (globus_i_gass_copy_cancel_t *) callback_arg;\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \"starting _gass_transfer_cancel_callback()\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \"starting _gass_transfer_cancel_callback()\\n\");\n #endif\n \n status = globus_gass_transfer_request_get_status(request);\n@@ -4673,7 +4735,7 @@\n \n globus_mutex_unlock(&(handle->state->mutex));\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tfprintf(stderr, \"_generic_cancel() before all done\\n\");\n+ fprintf(stderr, \"_generic_cancel() before all done\\n\");\n #endif\n \n if (all_done)\n@@ -4686,12 +4748,14 @@\n \n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n \tglobus_libc_fprintf(stderr, \"globus_l_gass_copy_generic_cancel():\\n\");\n-\tglobus_libc_fprintf(stderr, \" ...check to call user\/cancel callbacks.\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \" ...check to call user\/cancel callbacks.\\n\");\n #endif\n \tif(handle->user_cancel_callback != GLOBUS_NULL)\n {\n #ifdef GLOBUS_I_GASS_COPY_DEBUG\n-\tglobus_libc_fprintf(stderr, \" ...calling user cancel callback.\\n\");\n+\tglobus_libc_fprintf(stderr,\n+ \" ...calling user cancel callback.\\n\");\n #endif\n \t handle->user_cancel_callback(\n \t\thandle->cancel_callback_arg,\n@@ -4857,6 +4921,7 @@\n } \/* globus_i_gass_copy_attr_duplicate *\/\n \n #endif \/* GLOBUS_DONT_DOCUMENT_INTERNAL *\/\n+\n \/************************************************************\n * Example\n ************************************************************\n"} {"commit":"92443659984613828ef50d769de39e8bc2eb2f1d","subject":"Cleaned up.","message":"Cleaned up.\n","repos":"SvenMichaelKlose\/tre,SvenMichaelKlose\/tre,SvenMichaelKlose\/tre","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- interpreter\/builtin.c\n+++ interpreter\/builtin.c\n@@ -47,8 +47,8 @@\n treptr\n trebuiltin_apply_args (treptr list)\n {\n- treptr i;\n- treptr last;\n+ treptr i;\n+ treptr last;\n \n RETURN_NIL(list); \/* No arguments. *\/\n \n@@ -82,17 +82,17 @@\n treptr\n trebuiltin_apply (treptr list)\n {\n- if (NOT(list))\n- return treerror (list, \"Arguments expected.\");\n- return trefuncall (CAR(list), trebuiltin_apply_args (trelist_copy (CDR(list))));\n+ return NOT(list) ?\n+ treerror (list, \"Arguments expected.\") :\n+ trefuncall (CAR(list), trebuiltin_apply_args (trelist_copy (CDR(list))));\n }\n \n treptr\n trebuiltin_funcall (treptr list)\n {\n- if (NOT(list))\n- return treerror (list, \"Arguments expected.\");\n- return trefuncall (CAR(list), CDR(list));\n+ return NOT(list) ?\n+ treerror (list, \"Arguments expected.\") :\n+ trefuncall (CAR(list), CDR(list));\n }\n \n treptr\n@@ -105,7 +105,7 @@\n trebuiltin_quit (treptr args)\n {\n treptr arg;\n- int code = 0;\n+ int code = 0;\n \n if (NOT_NIL(args)) {\n arg = CAR(args);\n@@ -131,9 +131,9 @@\n treptr\n trebuiltin_load (treptr expr)\n {\n- trestream * stream;\n- treptr pathname = trearg_get (expr);\n- char fname[1024];\n+ trestream * stream;\n+ treptr pathname = trearg_get (expr);\n+ char fname[1024];\n \n \tpathname = trearg_typed (1, TRETYPE_STRING, pathname, \"LOAD\");\n \n@@ -170,7 +170,7 @@\n treptr name;\n treptr package;\n treptr p;\n- char *n;\n+ char * n;\n \n name = CAR(args);\n if (TREPTR_IS_CONS(CDR(args))) {\n@@ -185,10 +185,9 @@\n \t\tpackage = trearg_typed (1, TRETYPE_STRING, package, \"INTERN\");\n \n n = TREPTR_STRINGZ(name);\n- if (NOT_NIL(package))\n- p = treatom_get (TREPTR_STRINGZ(package), treptr_nil);\n- else\n- p = treptr_nil;\n+ p = NOT_NIL(package) ?\n+ treatom_get (TREPTR_STRINGZ(package), treptr_nil) :\n+ treptr_nil;\n \n return treatom_get (n, p);\n }\n@@ -229,8 +228,7 @@\n {\n treptr ptr;\n \n- ptr = trearg_get (args);\n-\tptr = trearg_typed (1, TRETYPE_NUMBER, ptr, \"%FREE\");\n+\tptr = trearg_typed (1, TRETYPE_NUMBER, trearg_get (args), \"%FREE\");\n \n \tfree ((void *) (long) TRENUMBER_VAL(ptr));\n \n@@ -255,10 +253,10 @@\n treptr\n trebuiltin_set (treptr args)\n {\n- treptr ptr;\n- treptr val;\n-\tchar c;\n-\tchar * p;\n+ treptr ptr;\n+ treptr val;\n+\tchar c;\n+\tchar * p;\n \n trearg_get2 (&ptr, &val, args);\n \n@@ -275,8 +273,8 @@\n treptr\n trebuiltin_get (treptr args)\n {\n- treptr ptr = trearg_get (args);\n-\tchar * p;\n+ treptr ptr = trearg_get (args);\n+\tchar * p;\n \n \tptr = trearg_typed (1, TRETYPE_NUMBER, ptr, \"%%GET\");\n \n"} {"commit":"55e88d0e13843e3bb550e22821dc870c2a8c6539","subject":"more documentation","message":"more documentation\n","repos":"ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gass\/copy\/source\/globus_gass_copy.h\n+++ gass\/copy\/source\/globus_gass_copy.h\n@@ -64,7 +64,7 @@\n globus_module_descriptor_t globus_i_gass_copy_module;\n \n \n-\/** Globus GASS copy GSIFTP control tcpbuffer Types *\/\n+\/** control tcpbuffer Types *\/\n typedef enum\n {\n \/** Don't change the TCP buffer\/window size from the system default *\/\n@@ -77,7 +77,7 @@\n GLOBUS_GSIFTP_CONTROL_TCPBUFFER_AUTOMATIC\n } globus_gsiftp_control_tcpbuffer_mode_t;\n \n-\/** Globus GASS copy GSIFTP control tcpbuffer attribute structure. *\/\n+\/** control tcpbuffer attribute structure *\/\n typedef struct globus_gsiftp_control_tcpbuffer_s\n {\n globus_gsiftp_control_tcpbuffer_mode_t mode;\n@@ -101,7 +101,7 @@\n } globus_gsiftp_control_tcpbuffer_t;\n \n \n-\/** Globus GASS copy GSIFTP control parallelism Types *\/\n+\/** control parallelism Types *\/\n typedef enum {\n \/** No parallelism *\/\n GLOBUS_GSIFTP_CONTROL_PARALLELISM_NONE,\n@@ -113,7 +113,7 @@\n GLOBUS_GSIFTP_CONTROL_PARALLELISM_AUTOMATIC,\n } globus_gsiftp_control_parallelism_mode_t;\n \n-\/** Globus GASS copy GSIFTP control parallelism attribute structure. *\/\n+\/** control parallelism attribute structure *\/\n typedef struct globus_gsiftp_control_parallelism_s\n {\n globus_gsiftp_control_parallelism_mode_t mode;\n@@ -127,7 +127,7 @@\n \t{\n \t unsigned long size;\n \t} fixed;\n-\tstruct \/* GLOBUS_GSIFTP_CONTROL_PARALLELIS_AUTOMATIC *\/\n+\tstruct \/* GLOBUS_GSIFTP_CONTROL_PARALLELISM_AUTOMATIC *\/\n \t{\n \t unsigned long initial_size;\n \t unsigned long minimum_size;\n@@ -138,7 +138,7 @@\n \n \n \n-\/** Globus GASS copy GSIFTP control striping Types *\/\n+\/** control striping Types *\/\n typedef enum\n {\n \/** No striping *\/\n@@ -151,7 +151,7 @@\n GLOBUS_GSIFTP_CONTROL_STRIPING_BLOCKED_ROUND_ROBIN,\n } globus_gsiftp_control_striping_mode_t;\n \n-\/** Globus GASS copy GSIFTP control striping attribute structure. *\/\n+\/** control striping attribute structure *\/\n typedef struct globus_gsiftp_control_striping_s\n {\n globus_gsiftp_control_striping_mode_t mode;\n@@ -194,6 +194,129 @@\n globus_gass_copy_destroy(\n globus_gass_copy_handle_t * handle);\n \n+\n+\/**\n+ * copy functions (blocking)\n+ *\/\n+globus_result_t\n+globus_gass_copy_url_to_url(\n+ globus_gass_copy_handle_t * handle,\n+ char * source_url,\n+ globus_gass_copy_attr_t * source_attr,\n+ char * dest_url,\n+ globus_gass_copy_attr_t * dest_attr);\n+\n+globus_result_t\n+globus_gass_copy_url_to_handle(\n+ globus_gass_copy_handle_t * handle,\n+ char * source_url,\n+ globus_gass_copy_attr_t * source_attr,\n+ globus_io_handle_t * dest_handle);\n+\n+globus_result_t\n+globus_gass_copy_handle_to_url(\n+ globus_gass_copy_handle_t * handle,\n+ globus_io_handle_t * source_handle,\n+ char * dest_url,\n+ globus_gass_copy_attr_t * dest_attr);\n+\n+\/**\n+ * copy functions (asyncronous)\n+ *\/\n+globus_result_t\n+globus_gass_copy_register_url_to_url(\n+ globus_gass_copy_handle_t * handle,\n+ char * source_url,\n+ globus_gass_copy_attr_t * dest_attr,\n+ char * dest_url,\n+ globus_gass_copy_attr_t * source_attr,\n+ globus_gass_copy_callback_t callback_func,\n+ void * callback_arg);\n+\n+globus_result_t\n+globus_gass_copy_register_url_to_handle(\n+ globus_gass_copy_handle_t * handle,\n+ char * source_url,\n+ globus_gass_copy_attr_t * source_attr,\n+ globus_io_handle_t * dest_handle,\n+ globus_gass_copy_callback_t callback_func,\n+ void * callback_arg);\n+\n+globus_result_t\n+globus_gass_copy_register_handle_to_url(\n+ globus_gass_copy_handle_t * handle,\n+ globus_io_handle_t * source_handle,\n+ char * dest_url,\n+ globus_gass_copy_attr_t * dest_attr,\n+ globus_gass_copy_callback_t callback_func,\n+ void * callback_arg);\n+\n+\/**\n+ * cache handles functions\n+ *\n+ * Use this when transferring mulitple files from or to the same host\n+ *\/\n+globus_result_t\n+globus_gass_copy_cache_url_state(\n+ globus_gass_copy_handle_t * handle,\n+ char * url);\n+\n+globus_result_t\n+globus_gass_copy_flush_url_state(\n+ globus_gass_copy_handle_t * handle,\n+ char * url);\n+\n+\/**\n+ * get\/set user pointers from\/to GASS copy handles\n+ *\/\n+globus_result_t\n+globus_gass_copy_set_user_pointer(\n+ globus_gass_copy_handle_t * handle,\n+ void * user_data);\n+\n+void *\n+globus_gass_copy_get_user_pointer(\n+ globus_gass_copy_handle_t * handle);\n+\n+\n+\/**\n+ * Set Attribute functions\n+ *\/\n+\n+\/* TCP buffer\/window size *\/\n+globus_result_t\n+globus_gass_copy_attr_set_tcpbuffer(\n+ globus_gass_copy_attr_t * attr,\n+ globus_gsiftp_control_tcpbuffer_t * tcpbuffer_info);\n+\n+\/* parallel transfer options *\/\n+globus_result_t\n+globus_gass_copy_attr_set_parallelism(\n+ globus_gass_copy_attr_t * attr,\n+ globus_gsiftp_control_parallelism_t * parallelism_info);\n+\n+\/* striping options *\/\n+globus_result_t\n+globus_gass_copy_attr_set_striping(\n+ globus_gass_copy_attr_t * attr,\n+ globus_gsiftp_control_striping_t * striping_info);\n+\n+\/* authorization options *\/\n+globus_result_t\n+globus_gass_copy_attr_set_authorization(\n+ globus_gass_copy_attr_t * attr,\n+ globus_io_authorization_t * authorization_info);\n+\n+\/* secure channel options *\/\n+globus_result_t\n+globus_gass_copy_attr_set_secure_channel(\n+ globus_gass_copy_attr_t * attr,\n+ globus_io_secure_channel_t * secure_channel_info);\n+\n+\/**\n+ * Get Attribute functions\n+ *\/\n+\n EXTERN_C_END\n \n #endif \/* GLOBUS_INCLUDE_GLOBUS_GASS_COPY_H *\/\n"} {"commit":"a75fb4f20bed1222d48bb5ad12404479aadaad35","subject":"Another minor nit: Make sure the constant here is a float so the compiler doesn't promote the entire expression to double.","message":"Another minor nit: Make sure the constant here is a float so the compiler\ndoesn't promote the entire expression to double.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/msun\/src\/e_log2f.c\n+++ lib\/msun\/src\/e_log2f.c\n@@ -50,7 +50,7 @@\n \tSET_FLOAT_WORD(x,hx|(i^0x3f800000));\t\/* normalize x or x\/2 *\/\n \tk += (i>>23);\n \tf = __kernel_logf(x);\n-\tx = x - 1;\n+\tx = x - (float)1.0;\n \tGET_FLOAT_WORD(hx,x);\n \tSET_FLOAT_WORD(hi,hx&0xfffff000);\n \tlo = x - hi;\n"} {"commit":"84df07987f7a80e425d1794e682cf78fef24cb51","subject":"Optimize this a bit better.","message":"Optimize this a bit better.\n\nSubmitted by:\tbde (although these aren't all of his changes)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/msun\/src\/s_rintl.c\n+++ lib\/msun\/src\/s_rintl.c\n@@ -32,8 +32,10 @@\n \n #include \"fpmath.h\"\n \n-static const long double\n-shift[2]={\n+#define\tBIAS\t(LDBL_MAX_EXP - 1)\n+\n+static const float\n+shift[2] = {\n #if LDBL_MANT_DIG == 64\n \t0x1.0p63, -0x1.0p63\n #elif LDBL_MANT_DIG == 113\n@@ -51,27 +53,30 @@\n \n \tu.e = x;\n \n-\tif (u.bits.exp >= LDBL_MANT_DIG + LDBL_MAX_EXP - 2) {\n+\tif (u.bits.exp >= BIAS + LDBL_MANT_DIG - 1) {\n \t\t\/*\n \t\t * The biased exponent is greater than the number of digits\n \t\t * in the mantissa, so x is inf, NaN, or an integer.\n \t\t *\/\n-\t\tif (u.bits.exp == 2 * LDBL_MAX_EXP - 1)\n-\t\t\treturn (x + x);\t\/* inf or NaN *\/\n-\t\telse\n-\t\t\treturn (x);\n+\t\treturn (x);\n \t}\n+\tsign = u.bits.sign;\n \n \t\/*\n \t * The following code assumes that intermediate results are\n \t * evaluated in long double precision. If they are evaluated in\n-\t * greater precision, double rounding will occur, and if they are\n+\t * greater precision, double rounding may occur, and if they are\n \t * evaluated in less precision (as on i386), results will be\n \t * wildly incorrect.\n \t *\/\n-\tsign = u.bits.sign;\n-\tu.e = shift[sign] + x;\n-\tu.e -= shift[sign];\n-\tu.bits.sign = sign;\n-\treturn (u.e);\n+\tx += shift[sign];\n+\tx -= shift[sign];\n+\n+\t\/*\n+\t * If the result is +-0, then it must have the same sign as x, but\n+\t * the above calculation doesn't always give this. Fix up the sign.\n+\t *\/\n+\tif (x == 0.0L)\n+\t\treturn (sign ? -0.0L : 0.0L);\n+\treturn (x);\n }\n"} {"commit":"fa09205783d11cc05122ad6e4ce06074624b2c0c","subject":"cputime: Comment cputime's adjusting code","message":"cputime: Comment cputime's adjusting code\n\nThe reason for the scaling and monotonicity correction performed\nby cputime_adjust() may not be immediately clear to the reviewer.\n\nAdd some comments to explain what happens there.\n\nSigned-off-by: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@kernel.org>\nCc: Peter Zijlstra <3fddac958924aef220f202ca567388ddab3f14a8@infradead.org>\nCc: Thomas Gleixner <00e4cf8f46a57000a44449bf9dd8cbbcc209fd2a@linutronix.de>\nCc: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\nCc: Paul Gortmaker <ae947f3c8df96e1dc851c5e3e5a930ce6d3f1f74@windriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"2ed95bfe166d9a844455d8a26b38f0c1a08ae26b","subject":"Fix generic issue for deque (was totaly broken before).","message":"Fix generic issue for deque\n(was totaly broken before).\n","repos":"P-p-H-d\/mlib,P-p-H-d\/mlib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- m-deque.h\n+++ m-deque.h\n@@ -92,23 +92,23 @@\n \t\t\t\t\t\t\t\t\t\\\n typedef type M_C(name, _type_t);\t\t\t\t\t\\\n \t\t\t\t\t\t\t\t\t\\\n- static inline deque_node_t*\t\t\t\t\t\t\\\n+ static inline M_C(name, _node_t)* \\\n M_C(name, _int_new_node)(deque_t d)\t\t\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n size_t def = d->default_size;\t\t\t\t\t\\\n- if (M_UNLIKELY (def >SIZE_MAX \/ sizeof (type) - sizeof(deque_node_t))) { \\\n- M_MEMORY_FULL(sizeof(deque_node_t)+def * sizeof(type));\t\t\\\n+ if (M_UNLIKELY (def >SIZE_MAX \/ sizeof (type) - sizeof(M_C(name, _node_t)))) { \\\n+ M_MEMORY_FULL(sizeof(M_C(name, _node_t))+def * sizeof(type)); \\\n return NULL;\t\t\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n- deque_node_t*n = (deque_node_t*) (void*)\t\t\t\t\\\n+ M_C(name, _node_t)*n = (M_C(name, _node_t)*) (void*) \\\n M_GET_REALLOC oplist (char, NULL,\t\t\t\t\t\\\n-\t\t\t sizeof(deque_node_t)+def * sizeof(type) );\t\\\n+\t\t\t sizeof(M_C(name, _node_t)) + def * sizeof(type) ); \\\n if (n==NULL) {\t\t\t\t\t\t\t\\\n- M_MEMORY_FULL(sizeof(deque_node_t)+def * sizeof(type));\t\t\\\n+ M_MEMORY_FULL(sizeof(M_C(name, _node_t))+def * sizeof(type)); \\\n return NULL;\t\t\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n n->size = def;\t\t\t\t\t\t\t\\\n- deque_node_list_init_field(n);\t\t\t\t\t\\\n+ M_C(name, _node_list_init_field)(n); \\\n \/* Do not increase it too much if there are few items *\/ \\\n def = M_MIN(def, d->count); \\\n d->default_size = M_GET_INC_ALLOC oplist (def); \\\n@@ -121,9 +121,9 @@\n M_C(name, _node_list_init)(d->list);\t\t\t\t\\\n d->default_size = DEQUEUI_DEFAULT_SIZE;\t\t\t\t\\\n d->count = 0;\t\t\t\t\t\t\\\n- deque_node_t *n = M_C(name, _int_new_node)(d);\t\t\t\\\n+ M_C(name, _node_t) *n = M_C(name, _int_new_node)(d); \\\n if (n == NULL) return;\t\t\t\t\t\t\\\n- deque_node_list_push_back(d->list, n);\t\t\t\t\\\n+ M_C(name, _node_list_push_back)(d->list, n); \\\n d->front->node = n;\t\t\t\t\t\t\\\n d->front->index = DEQUEUI_DEFAULT_SIZE\/2;\t\t\t\t\\\n d->back->node = n;\t\t\t\t\t\t\\\n@@ -136,11 +136,11 @@\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n M_C(name, _node_list_it_t) it;\t\t\t\t\t\\\n- deque_node_t *min_node = NULL;\t\t\t\t\t\\\n+ M_C(name, _node_t) *min_node = NULL; \\\n for(M_C(name, _node_list_it)(it, d->list) ;\t\t\t\t\\\n \t!M_C(name, _node_list_end_p)(it) ;\t\t\t\t\\\n \tM_C(name, _node_list_next)(it) ){\t\t\t\t\\\n- deque_node_t *n = M_C(name, _node_list_ref)(it);\t\t\t\\\n+ M_C(name, _node_t) *n = M_C(name, _node_list_ref)(it); \\\n size_t min = n == d->front->node ? d->back->index + 1 : 0;\t\\\n size_t max = n == d->back->node ? d->back->index + 1: n->size;\t\\\n for(size_t i = min; i < max; i++) {\t\t\t\t\\\n@@ -174,7 +174,7 @@\n M_C(name, _push_back_raw)(deque_t d)\t\t\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n- deque_node_t *n = d->back->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->back->node; \\\n size_t index = d->back->index;\t\t\t\t\t\\\n if (M_UNLIKELY (n->size <= index)) {\t\t\t\t\\\n n = M_C(name, _node_list_next_obj)(d->list, n);\t\t\t\\\n@@ -217,7 +217,7 @@\n M_C(name, _push_front_raw)(deque_t d)\t\t\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n- deque_node_t *n = d->front->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->front->node; \\\n size_t index = d->front->index;\t\t\t\t\t\\\n index --;\t\t\t\t\t\t\t\t\\\n \/* If overflow *\/\t\t\t\t\t\t\t\\\n@@ -262,20 +262,20 @@\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n assert(d->count > 0);\t\t\t\t\t\t\\\n- deque_node_t *n = d->back->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->back->node; \\\n size_t index = d->back->index;\t\t\t\t\t\\\n index --;\t\t\t\t\t\t\t\t\\\n if (M_UNLIKELY (n->size <= index)) {\t\t\t\t\\\n \/* If there is a next node, \\\n pop the back node and push it back to the front. This \\\n reduce the used memory if the deque is used as a FIFO queue.*\/ \\\n- deque_node_t *next = M_C(name, _node_list_next_obj)(d->list, n); \\\n+ M_C(name, _node_t) *next = M_C(name, _node_list_next_obj)(d->list, n); \\\n if (next != NULL) { \\\n- next = deque_node_list_pop_back(d->list); \\\n+ next = M_C(name, _node_list_pop_back)(d->list); \\\n assert (next != n); \\\n- deque_node_list_push_front(d->list, next); \\\n+ M_C(name, _node_list_push_front)(d->list, next); \\\n } \\\n- n = deque_node_list_previous_obj(d->list, n);\t\t\t\\\n+ n = M_C(name, _node_list_previous_obj)(d->list, n); \\\n assert (n != NULL);\t\t\t\t\t\t\\\n d->back->node = n;\t\t\t\t\t\t\\\n index = n->size-1;\t\t\t\t\t\t\\\n@@ -297,19 +297,19 @@\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n assert(d->count > 0);\t\t\t\t\t\t\\\n- deque_node_t *n = d->front->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->front->node; \\\n size_t index = d->front->index;\t\t\t\t\t\\\n if (M_UNLIKELY (n->size <= index)) {\t\t\t\t\\\n \/* If there is a previous node, \\\n pop the front node and push it back to the back. This \\\n reduce the used memory if the deque is used as a FIFO queue.*\/ \\\n- deque_node_t *prev = M_C(name, _node_list_previous_obj)(d->list, n); \\\n+ M_C(name,_node_t) *prev = M_C(name, _node_list_previous_obj)(d->list, n); \\\n if (prev != NULL) { \\\n- prev = deque_node_list_pop_front(d->list); \\\n+ prev = M_C(name, _node_list_pop_front)(d->list); \\\n assert (prev != n); \\\n- deque_node_list_push_back(d->list, prev); \\\n+ M_C(name, _node_list_push_back)(d->list, prev); \\\n } \\\n- n = deque_node_list_next_obj(d->list, n);\t\t\t\t\\\n+ n = M_C(name, _node_list_next_obj)(d->list, n); \\\n assert (n != NULL);\t\t\t\t\t\t\\\n d->front->node = n;\t\t\t\t\t\t\\\n index = 0;\t\t\t\t\t\t\t\\\n@@ -332,9 +332,9 @@\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n assert (d->count > 0);\t\t\t\t\t\t\\\n size_t i = d->back->index;\t\t\t\t\t\t\\\n- deque_node_t *n = d->back->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->back->node; \\\n if (M_UNLIKELY (i == 0)) {\t\t\t\t\t\t\\\n- n = deque_node_list_previous_obj(d->list, n);\t\t\t\\\n+ n = M_C(name, _node_list_previous_obj)(d->list, n); \\\n assert (n != NULL);\t\t\t\t\t\t\\\n i = n->size;\t\t\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n@@ -347,9 +347,9 @@\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n assert (d->count > 0);\t\t\t\t\t\t\\\n size_t i = d->front->index;\t\t\t\t\t\t\\\n- deque_node_t *n = d->front->node;\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = d->front->node; \\\n if (M_UNLIKELY (n->size <= i)) {\t\t\t\t\t\\\n- n = deque_node_list_next_obj(d->list, n);\t\t\t\t\\\n+ n = M_C(name, _node_list_next_obj)(d->list, n); \\\n assert (n != NULL);\t\t\t\t\t\t\\\n i = 0;\t\t\t\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n@@ -389,7 +389,7 @@\n it->index = d->back->index - 1;\t\t\t\t\t\\\n it->deque = d;\t\t\t\t\t\t\t\\\n if (M_UNLIKELY (it->index >= it->node->size)) {\t\t\t\\\n- it->node = deque_node_list_previous_obj(d->list, it->node);\t\\\n+ it->node = M_C(name, _node_list_previous_obj)(d->list, it->node);\t\\\n assert (it->node != NULL);\t\t\t\t\t\\\n it->index = it->node->size-1;\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n@@ -429,10 +429,10 @@\n M_C(name, _next)(it_t it)\t\t\t\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n assert (it != NULL);\t\t\t\t\t\t\\\n- deque_node_t *n = it->node;\t\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = it->node; \\\n it->index ++;\t\t\t\t\t\t\t\\\n if (M_UNLIKELY (it->index >= n->size)) {\t\t\t\t\\\n- n = deque_node_list_next_obj(it->deque->list, n);\t\t\t\\\n+ n = M_C(name, _node_list_next_obj)(it->deque->list, n); \\\n if (M_UNLIKELY (n == NULL)) {\t\t\t\t\t\\\n \t\/* Point to 'end' (can't undo it) *\/\t\t\t\t\\\n \tit->node = it->deque->back->node;\t\t\t\t\\\n@@ -448,10 +448,10 @@\n M_C(name, _previous)(it_t it)\t\t\t\t\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n assert (it != NULL);\t\t\t\t\t\t\\\n- deque_node_t *n = it->node;\t\t\t\t\t\t\\\n+ M_C(name, _node_t) *n = it->node; \\\n it->index --;\t\t\t\t\t\t\t\\\n if (M_UNLIKELY (it->index >= n->size)) {\t\t\t\t\\\n- n = deque_node_list_previous_obj(it->deque->list, n);\t\t\\\n+ n = M_C(name, _node_list_previous_obj)(it->deque->list, n); \\\n if (M_UNLIKELY (n == NULL)) {\t\t\t\t\t\\\n \t\/* Point to 'end' (can't undo it) *\/\t\t\t\t\\\n \tit->node = it->deque->back->node;\t\t\t\t\\\n@@ -507,10 +507,10 @@\n M_C(name, _node_list_init)(d->list);\t\t\t\t\\\n d->default_size = DEQUEUI_DEFAULT_SIZE + src->count;\t\t\\\n d->count = src->count;\t\t\t\t\t\\\n- deque_node_t *n = M_C(name, _int_new_node)(d);\t\t\t\\\n+ M_C(name, _node_t) *n = M_C(name, _int_new_node)(d); \\\n if (n == NULL) return;\t\t\t\t\t\t\\\n d->default_size \/= 2;\t\t\t\t\t\t\\\n- deque_node_list_push_back(d->list, n);\t\t\t\t\\\n+ M_C(name, _node_list_push_back)(d->list, n); \\\n d->front->node = n;\t\t\t\t\t\t\\\n d->front->index = DEQUEUI_DEFAULT_SIZE\/2;\t\t\t\t\\\n d->back->node = n;\t\t\t\t\t\t\\\n@@ -561,7 +561,7 @@\n {\t\t\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(d);\t\t\t\t\t\t\t\\\n DEQUEI_CONTRACT(e);\t\t\t\t\t\t\t\\\n- deque_node_list_swap (d->list, e->list);\t\t\t\t\\\n+ M_C(name, _node_list_swap) (d->list, e->list); \\\n M_SWAP(node_t *, d->front->node, e->front->node);\t\t\t\\\n M_SWAP(node_t *, d->back->node, e->back->node);\t\t\t\\\n M_SWAP(size_t, d->front->index, e->front->index);\t\t\t\\\n@@ -584,7 +584,7 @@\n for(M_C(name, _node_list_it)(it, d->list) ;\t\t\t\t\\\n \t!M_C(name, _node_list_end_p)(it) ;\t\t\t\t\\\n \tM_C(name, _node_list_next)(it) ){\t\t\t\t\\\n- deque_node_t *n = M_C(name, _node_list_ref)(it);\t\t\t\\\n+ M_C(name, _node_t) *n = M_C(name, _node_list_ref)(it); \\\n if (index0 + key < count + n->size) {\t\t\t\t\\\n \treturn &n->data[index0 + key - count];\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n@@ -689,10 +689,13 @@\n DEQUEI_CONTRACT(deque); \\\n assert (file != NULL); \\\n fputc ('[', file); \\\n- for (size_t i = 0; i < deque->size; i++) { \\\n- const type *item = M_C(name, _cget)(deque, i);\t\t\t\\\n+ it_t it; \\\n+ for (M_C(name, _it)(it, deque) ;\t\t\t\t\t\\\n+ !M_C(name, _end_p)(it);\t\t\t\t\t\\\n+ M_C(name, _next)(it)) { \\\n+ const type *item = M_C(name, _cref)(it);\t\t\t\t\\\n M_GET_OUT_STR oplist (file, *item); \\\n- if (i != deque->size-1) \\\n+ if (!M_C(name, _last_p)(it))\t\t\t\t\t\\\n fputc (M_GET_SEPARATOR oplist, file); \\\n } \\\n fputc (']', file); \\\n"} {"commit":"e7a91809191aec12fce05fb14bfa9f4e24364074","subject":"properly falling back to single ray codepath for streams when no SSE4.2 present","message":"properly falling back to single ray codepath for streams when no SSE4.2 present\n","repos":"Sjoerdie\/embree,embree\/embree,Sjoerdie\/embree,embree\/embree,embree\/embree,embree\/embree,Sjoerdie\/embree,Sjoerdie\/embree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernels\/common\/accel.h\n+++ kernels\/common\/accel.h\n@@ -308,16 +308,15 @@\n }\n \n \/*! Intersects a packet of N rays in SOA layout with the scene. *\/\n- __forceinline void intersectN (RTCRay **rayN, const size_t N, const RTCIntersectContext* context) {\n- \/\/assert(intersectors.intersectorN.intersect);\n- if (likely(intersectors.intersectorN.intersect)) \/\/ FIXME: not working properly, will be set to error function sometimes\n- intersectors.intersectorN.intersect(intersectors.ptr,rayN,N,context);\n- else\n- {\n- \/* fallback path *\/\n- for (size_t i=0;i<N;i++)\n- intersect(*rayN[i],context);\n- }\n+ __forceinline void intersectN (RTCRay **rayN, const size_t N, const RTCIntersectContext* context) \n+ {\n+#if defined(__SSE4_2__)\n+ assert(intersectors.intersectorN.intersect);\n+ intersectors.intersectorN.intersect(intersectors.ptr,rayN,N,context);\n+#else\n+ for (size_t i=0; i<N; i++)\n+ intersect(*rayN[i],context);\n+#endif\n }\n \n #if defined(__SSE__)\n@@ -365,14 +364,15 @@\n }\n \n \/*! Tests if a packet of N rays in SOA layout is occluded by the scene. *\/\n- __forceinline void occludedN (RTCRay** rayN, const size_t N, const RTCIntersectContext* context) {\n- \/\/assert(intersectors.intersectorN.occluded);\n- if(likely(intersectors.intersectorN.occluded)) \/\/ FIXME: not working properly, will be set to error function sometimes\n- intersectors.intersectorN.occluded(intersectors.ptr,rayN,N,context);\n- else\n- \/* fallback path *\/\n- for (size_t i=0;i<N;i++)\n- occluded(*rayN[i],context);\n+ __forceinline void occludedN (RTCRay** rayN, const size_t N, const RTCIntersectContext* context) \n+ {\n+#if defined(__SSE4_2__)\n+ assert(intersectors.intersectorN.occluded);\n+ intersectors.intersectorN.occluded(intersectors.ptr,rayN,N,context);\n+#else\n+ for (size_t i=0;i<N;i++)\n+ occluded(*rayN[i],context);\n+#endif\n }\n \n #if defined(__SSE__)\n"} {"commit":"5c9f29e77650c9d6f0be472a3bd338924568f89a","subject":"cleaned up, fixed and commented daemelspiller a bit","message":"cleaned up, fixed and commented daemelspiller a bit\n\n[r16122]\n","repos":"davidgiven\/libfirm,libfirm\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,8l\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,8l\/libfirm,libfirm\/libfirm,libfirm\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespilldaemel.c\n+++ ir\/be\/bespilldaemel.c\n@@ -57,15 +57,12 @@\n \n DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)\n \n-typedef struct daemel_env_t daemel_env_t;\n-struct daemel_env_t {\n-\tspill_env_t *spill_env;\n-\tint n_regs;\n-\tconst arch_env_t *arch_env;\n-\tconst arch_register_class_t *cls;\n-\tconst be_lv_t *lv;\n-\tbitset_t *spilled_nodes;\n-};\n+static spill_env_t *spill_env;\n+static int n_regs;\n+static const arch_env_t *arch_env;\n+static const arch_register_class_t *cls;\n+static const be_lv_t *lv;\n+static bitset_t *spilled_nodes;\n \n typedef struct spill_candidate_t spill_candidate_t;\n struct spill_candidate_t {\n@@ -73,8 +70,7 @@\n \tir_node *node;\n };\n \n-static\n-int compare_spill_candidates_desc(const void *d1, const void *d2)\n+static int compare_spill_candidates_desc(const void *d1, const void *d2)\n {\n \tconst spill_candidate_t *c1 = d1;\n \tconst spill_candidate_t *c2 = d2;\n@@ -82,15 +78,20 @@\n \treturn (int) (c1->costs - c2->costs);\n }\n \n-static\n-double get_spill_costs(daemel_env_t *env, ir_node *node)\n+static double get_spill_costs(ir_node *node)\n {\n \tconst ir_edge_t *edge;\n-\tspill_env_t *spill_env = env->spill_env;\n-\tdouble costs = be_get_spill_costs(spill_env, node, node);\n+\tir_node *spill_place = skip_Proj(node);\n+\tdouble costs = be_get_spill_costs(spill_env, node,\n+\t spill_place);\n \n \tforeach_out_edge(node, edge) {\n \t\tir_node *use = get_edge_src_irn(edge);\n+\n+\t\t\/* keeps should be directly below the node *\/\n+\t\tif(be_is_Keep(use)) {\n+\t\t\tcontinue;\n+\t\t}\n \n \t\tif(is_Phi(use)) {\n \t\t\tint in = get_edge_src_pos(edge);\n@@ -102,18 +103,17 @@\n \t\t}\n \t}\n \n+\t\/* TODO cache costs? *\/\n+\n \treturn costs;\n }\n \n \/**\n * spills a node by placing a reload before each usage\n *\/\n-static\n-void spill_node(daemel_env_t *env, ir_node *node)\n+static void spill_node(ir_node *node)\n {\n \tconst ir_edge_t *edge;\n-\tspill_env_t *spill_env = env->spill_env;\n-\tconst arch_register_class_t *cls = env->cls;\n \n \tDBG((dbg, LEVEL_3, \"\\tspilling %+F\\n\", node));\n \n@@ -121,40 +121,37 @@\n \t\tir_node *use = get_edge_src_irn(edge);\n \t\tif(is_Anchor(use))\n \t\t\tcontinue;\n+\t\tif(be_is_Keep(use))\n+\t\t\tcontinue;\n \n \t\tif(is_Phi(use)) {\n \t\t\tint in = get_edge_src_pos(edge);\n \t\t\tir_node *block = get_nodes_block(use);\n \n \t\t\tbe_add_reload_on_edge(spill_env, node, block, in, cls, 1);\n-\t\t} else if(!be_is_Keep(use)) {\n+\t\t} else {\n \t\t\tbe_add_reload(spill_env, node, use, cls, 1);\n \t\t}\n \t}\n \n-\tbitset_set(env->spilled_nodes, get_irn_idx(node));\n+\tbitset_set(spilled_nodes, get_irn_idx(node));\n }\n \n \/**\n * spill @p n nodes from a nodeset. Removes the nodes from the nodeset and\n- * sets the spilled bits in env->spilled_nodes.\n- *\/\n-static\n-void do_spilling(daemel_env_t *env, ir_nodeset_t *live_nodes, ir_node *node)\n-{\n-\tsize_t node_count = ir_nodeset_size(live_nodes);\n-\tsize_t additional_defines = 0;\n-\tsize_t reload_values = 0;\n-\tint registers = env->n_regs;\n-\tconst arch_env_t *arch_env = env->arch_env;\n-\tconst arch_register_class_t *cls = env->cls;\n-\tspill_candidate_t *candidates;\n-\tir_nodeset_iterator_t iter;\n-\tsize_t i, arity;\n-\tint spills_needed;\n-\tsize_t cand_idx;\n-\tir_node *n;\n-\tconst bitset_t *spilled_nodes = env->spilled_nodes;\n+ * sets the spilled bits in spilled_nodes.\n+ *\/\n+static void do_spilling(ir_nodeset_t *live_nodes, ir_node *node)\n+{\n+\tsize_t n_live_nodes = ir_nodeset_size(live_nodes);\n+\tsize_t values_defined = 0;\n+\tsize_t free_regs_needed = 0;\n+\tspill_candidate_t *candidates;\n+\tir_nodeset_iterator_t iter;\n+\tsize_t i, arity;\n+\tint spills_needed;\n+\tsize_t cand_idx;\n+\tir_node *n;\n \n \t\/* mode_T nodes define several values at once. Count them *\/\n \tif(get_irn_mode(node) == mode_T) {\n@@ -164,12 +161,12 @@\n \t\t\tconst ir_node *proj = get_edge_src_irn(edge);\n \n \t\t\tif(arch_irn_consider_in_reg_alloc(arch_env, cls, proj)) {\n-\t\t\t\t++additional_defines;\n+\t\t\t\t++values_defined;\n \t\t\t}\n \t\t}\n-\t}\n-\tif(bitset_is_set(spilled_nodes, get_irn_idx(node)))\n-\t\t++additional_defines;\n+\t} else if(arch_irn_consider_in_reg_alloc(arch_env, cls, node)) {\n+\t\t++values_defined;\n+\t}\n \n \t\/* we need registers for the non-live argument values *\/\n \tarity = get_irn_arity(node);\n@@ -177,19 +174,21 @@\n \t\tir_node *pred = get_irn_n(node, i);\n \t\tif(arch_irn_consider_in_reg_alloc(arch_env, cls, pred)\n \t\t\t\t&& !ir_nodeset_contains(live_nodes, pred)) {\n-\t\t\t++reload_values;\n-\t\t}\n-\t}\n-\n-\tif(reload_values > additional_defines)\n-\t\tadditional_defines = reload_values;\n-\n-\tspills_needed = (node_count + additional_defines) - registers;\n+\t\t\t++free_regs_needed;\n+\t\t}\n+\t}\n+\n+\t\/* we can reuse all reloaded values for the defined values, but we might\n+\t need even more registers *\/\n+\tif(values_defined > free_regs_needed)\n+\t\tfree_regs_needed = values_defined;\n+\n+\tspills_needed = (n_live_nodes + free_regs_needed) - n_regs;\n \tif(spills_needed <= 0)\n \t\treturn;\n \tDBG((dbg, LEVEL_2, \"\\tspills needed after %+F: %d\\n\", node, spills_needed));\n \n-\tcandidates = xmalloc(node_count * sizeof(candidates[0]));\n+\tcandidates = alloca(n_live_nodes * sizeof(candidates[0]));\n \n \t\/* construct array with spill candidates and calculate their costs *\/\n \ti = 0;\n@@ -199,13 +198,13 @@\n \t\tassert(!bitset_is_set(spilled_nodes, get_irn_idx(n)));\n \n \t\tcandidate->node = n;\n-\t\tcandidate->costs = get_spill_costs(env, n);\n+\t\tcandidate->costs = get_spill_costs(n);\n \t\t++i;\n \t}\n-\tassert(i == node_count);\n+\tassert(i == n_live_nodes);\n \n \t\/* sort spill candidates *\/\n-\tqsort(candidates, node_count, sizeof(candidates[0]),\n+\tqsort(candidates, n_live_nodes, sizeof(candidates[0]),\n \t compare_spill_candidates_desc);\n \n \t\/* spill cheapest ones *\/\n@@ -215,7 +214,7 @@\n \t\tir_node *cand_node;\n \t\tint is_use;\n \n-\t\tif (cand_idx >= node_count) {\n+\t\tif (cand_idx >= n_live_nodes) {\n \t\t\tpanic(\"can't spill enough values for node %+F\\n\", node);\n \t\t}\n \n@@ -240,26 +239,17 @@\n \t\t\tcontinue;\n \t\t}\n \n-\t\tspill_node(env, cand_node);\n+\t\tspill_node(cand_node);\n \t\tir_nodeset_remove(live_nodes, cand_node);\n \t\t--spills_needed;\n \t}\n-\n-\tfree(candidates);\n }\n \n \/**\n- * similar to be_liveness_transfer.\n- * custom liveness transfer function, that doesn't place already spilled values\n- * into the liveness set\n- *\/\n-static\n-void liveness_transfer_remove_defs(daemel_env_t *env, ir_node *node,\n- ir_nodeset_t *nodeset)\n-{\n-\tconst arch_register_class_t *cls = env->cls;\n-\tconst arch_env_t *arch_env = env->arch_env;\n-\n+ * removes all values from the nodeset that are defined by node\n+ *\/\n+static void remove_defs(ir_node *node, ir_nodeset_t *nodeset)\n+{\n \t\/* You should better break out of your loop when hitting the first phi\n \t * function. *\/\n \tassert(!is_Phi(node) && \"liveness_transfer produces invalid results for phi nodes\");\n@@ -281,21 +271,16 @@\n }\n }\n \n-static void liveness_transfer_add_uses(daemel_env_t *env, ir_node *node,\n- ir_nodeset_t *nodeset)\n+static void add_uses(ir_node *node, ir_nodeset_t *nodeset)\n {\n \tint i, arity;\n-\tconst arch_register_class_t *cls = env->cls;\n-\tconst arch_env_t *arch_env = env->arch_env;\n-\tconst bitset_t *bitset = env->spilled_nodes;\n-\n \n arity = get_irn_arity(node);\n for(i = 0; i < arity; ++i) {\n ir_node *op = get_irn_n(node, i);\n \n if(arch_irn_consider_in_reg_alloc(arch_env, cls, op)\n-\t\t && !bitset_is_set(bitset, get_irn_idx(op))) {\n+\t\t && !bitset_is_set(spilled_nodes, get_irn_idx(op))) {\n ir_nodeset_insert(nodeset, op);\n \t\t}\n }\n@@ -317,24 +302,23 @@\n * make sure register pressure in a block is always equal or below the number\n * of available registers\n *\/\n-static\n-void spill_block(ir_node *block, void *data)\n-{\n-\tdaemel_env_t *env = data;\n-\tconst arch_env_t *arch_env = env->arch_env;\n-\tconst arch_register_class_t *cls = env->cls;\n-\tconst be_lv_t *lv = env->lv;\n+static void spill_block(ir_node *block, void *data)\n+{\n \tir_nodeset_t live_nodes;\n \tir_nodeset_iterator_t iter;\n \tir_node *node;\n-\tbitset_t *spilled_nodes = env->spilled_nodes;\n-\tint phi_count, spilled_phis, regpressure, phi_spills_needed;\n+\tint n_phi_values_spilled;\n+\tint regpressure;\n+\tint phi_spills_needed;\n+\t(void) data;\n \n \tDBG((dbg, LEVEL_1, \"spilling block %+F\\n\", block));\n \n+\t\/* construct set of live nodes at end of block *\/\n \tir_nodeset_init(&live_nodes);\n \tbe_liveness_end_of_block(lv, arch_env, cls, block, &live_nodes);\n \n+\t\/* remove already spilled nodes from liveset *\/\n \tforeach_ir_nodeset(&live_nodes, node, iter) {\n \t\tDBG((dbg, LEVEL_2, \"\\t%+F is live-end... \", node));\n \t\tif(bitset_is_set(spilled_nodes, get_irn_idx(node))) {\n@@ -345,38 +329,40 @@\n \t\t}\n \t}\n \n+\t\/* walk schedule backwards and spill until register pressure is fine at\n+\t * each node *\/\n \tsched_foreach_reverse(block, node) {\n \t\tif(is_Phi(node))\n \t\t\tbreak;\n \n-\t\tif(be_is_Keep(node)) {\n-\t\t\t\/* remove defs should never do something for keep nodes, but we\n-\t\t\t * leave it here for consistency *\/\n-\t\t\tliveness_transfer_remove_defs(env, node, &live_nodes);\n-\t\t\tliveness_transfer_add_uses(env, node, &live_nodes);\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tliveness_transfer_remove_defs(env, node, &live_nodes);\n-\t\tdo_spilling(env, &live_nodes, node);\n-\t\tliveness_transfer_add_uses(env, node, &live_nodes);\n-\t}\n-\n-\tphi_count = 0;\n-\tspilled_phis = 0;\n+\t\tremove_defs(node, &live_nodes);\n+\t\tdo_spilling(&live_nodes, node);\n+\t\tadd_uses(node, &live_nodes);\n+\t}\n+\n+\t\/* until now only the values of some phis have been spilled the phis itself\n+\t * are still there and occupy registers, so we need to count them and might\n+\t * have to spill some of them.\n+\t *\/\n+\tn_phi_values_spilled = 0;\n \tsched_foreach(block, node) {\n \t\tif(!is_Phi(node))\n \t\t\tbreak;\n \n-\t\t++phi_count;\n \t\tif(bitset_is_set(spilled_nodes, get_irn_idx(node))) {\n-\t\t\t++spilled_phis;\n-\t\t}\n-\t}\n-\tregpressure = ir_nodeset_size(&live_nodes) + spilled_phis;\n-\tphi_spills_needed = regpressure - env->n_regs;\n+\t\t\t++n_phi_values_spilled;\n+\t\t}\n+\t}\n+\n+\t\/* calculate how many of the phis need to be spilled *\/\n+\tregpressure = ir_nodeset_size(&live_nodes) + n_phi_values_spilled;\n+\tphi_spills_needed = regpressure - n_regs;\n \tDBG((dbg, LEVEL_3, \"Regpressure before phis: %d phispills: %d\\n\",\n \t regpressure, phi_spills_needed));\n+\n+\t\/* spill as many phis as needed *\/\n+\t\/* TODO: we should really estimate costs of the phi spill as well...\n+\t * and preferably spill phis with lower costs... *\/\n \tsched_foreach(block, node) {\n \t\tif(!is_Phi(node))\n \t\t\tbreak;\n@@ -384,7 +370,7 @@\n \t\t\tbreak;\n \n \t\tif(bitset_is_set(spilled_nodes, get_irn_idx(node))) {\n-\t\t\tbe_spill_phi(env->spill_env, node);\n+\t\t\tbe_spill_phi(spill_env, node);\n \t\t\t--phi_spills_needed;\n \t\t}\n \t}\n@@ -393,33 +379,33 @@\n \tir_nodeset_destroy(&live_nodes);\n }\n \n-void be_spill_daemel(be_irg_t *birg, const arch_register_class_t *cls)\n-{\n-\tdaemel_env_t env;\n+void be_spill_daemel(be_irg_t *birg, const arch_register_class_t *new_cls)\n+{\n \tir_graph *irg = be_get_birg_irg(birg);\n-\tint n_regs = cls->n_regs - be_put_ignore_regs(birg, cls, NULL);\n+\tn_regs = new_cls->n_regs - be_put_ignore_regs(birg, new_cls, NULL);\n \n \tif(n_regs == 0)\n \t\treturn;\n \n \tbe_liveness_assure_sets(be_assure_liveness(birg));\n \n-\tenv.spill_env = be_new_spill_env(birg);\n-\tenv.n_regs = n_regs;\n-\tenv.arch_env = be_get_birg_arch_env(birg);\n-\tenv.cls = cls;\n-\tenv.lv = be_get_birg_liveness(birg);\n-\tenv.spilled_nodes = bitset_malloc(get_irg_last_idx(irg));\n+\tspill_env = be_new_spill_env(birg);\n+\tarch_env = be_get_birg_arch_env(birg);\n+\tcls = new_cls;\n+\tlv = be_get_birg_liveness(birg);\n+\tspilled_nodes = bitset_malloc(get_irg_last_idx(irg));\n \n \tDBG((dbg, LEVEL_1, \"*** RegClass %s\\n\", cls->name));\n \n-\tirg_block_walk_graph(irg, spill_block, NULL, &env);\n-\n-\tbitset_free(env.spilled_nodes);\n-\n-\tbe_insert_spills_reloads(env.spill_env);\n-\n-\tbe_delete_spill_env(env.spill_env);\n+\tirg_block_walk_graph(irg, spill_block, NULL, NULL);\n+\n+\tbitset_free(spilled_nodes);\n+\tspilled_nodes = NULL;\n+\n+\tbe_insert_spills_reloads(spill_env);\n+\n+\tbe_delete_spill_env(spill_env);\n+\tspill_env = NULL;\n }\n \n void be_init_daemelspill(void)\n"} {"commit":"551e0087842a4535febe9be4c2fcd35e0b827491","subject":"Get rid of x87_push_dbl() by passing an usable register to x87_create_fpush().","message":"Get rid of x87_push_dbl() by passing an usable register to x87_create_fpush().\n","repos":"MatzeB\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/ia32\/ia32_x87.c\n+++ ir\/be\/ia32\/ia32_x87.c\n@@ -250,14 +250,15 @@\n }\n \n \/**\n- * Push a virtual Register onto the stack, double pushed allowed.\n+ * Push a virtual Register onto the stack, double pushes are NOT allowed.\n *\n * @param state the x87 state\n * @param reg_idx the register vfp index\n * @param node the node that produces the value of the vfp register\n *\/\n-static void x87_push_dbl(x87_state *state, int reg_idx, ir_node *node)\n-{\n+static void x87_push(x87_state *state, int reg_idx, ir_node *node)\n+{\n+\tassert(x87_on_stack(state, reg_idx) == -1 && \"double push\");\n \tassert(state->depth < N_ia32_st_REGS && \"stack overrun\");\n \n \t++state->depth;\n@@ -266,20 +267,6 @@\n \tentry->node = node;\n \n \tDB((dbg, LEVEL_2, \"After PUSH: \")); DEBUG_ONLY(x87_dump_stack(state);)\n-}\n-\n-\/**\n- * Push a virtual Register onto the stack, double pushes are NOT allowed.\n- *\n- * @param state the x87 state\n- * @param reg_idx the register vfp index\n- * @param node the node that produces the value of the vfp register\n- *\/\n-static void x87_push(x87_state *state, int reg_idx, ir_node *node)\n-{\n-\tassert(x87_on_stack(state, reg_idx) == -1 && \"double push\");\n-\n-\tx87_push_dbl(state, reg_idx, node);\n }\n \n \/**\n@@ -576,10 +563,9 @@\n * @param pos push st(pos) on stack\n * @param val the value to push\n *\/\n-static void x87_create_fpush(x87_state *state, ir_node *n, int pos, ir_node *const val)\n-{\n-\tarch_register_t const *const out = x87_get_irn_register(val);\n-\tx87_push_dbl(state, arch_register_get_index(out), val);\n+static void x87_create_fpush(x87_state *state, ir_node *n, int pos, int const out_reg_idx, ir_node *const val)\n+{\n+\tx87_push(state, out_reg_idx, val);\n \n \tir_node *const fpush = new_bd_ia32_fpush(NULL, get_nodes_block(n));\n \tia32_x87_attr_t *const attr = get_ia32_x87_attr(fpush);\n@@ -814,6 +800,7 @@\n \tattr = get_ia32_x87_attr(n);\n \tpermuted = attr->attr.data.ins_permuted;\n \n+\tint const out_reg_idx = arch_register_get_index(out);\n \tif (reg_index_2 != REG_VFP_VFP_NOREG) {\n \t\tassert(!permuted);\n \n@@ -828,7 +815,7 @@\n \t\t\tif (op1_live_after) {\n \t\t\t\t\/* Both operands are live: push the first one.\n \t\t\t\t This works even for op1 == op2. *\/\n-\t\t\t\tx87_create_fpush(state, n, op1_idx, op2);\n+\t\t\t\tx87_create_fpush(state, n, op1_idx, out_reg_idx, op2);\n \t\t\t\t\/* now do fxxx (tos=tos X op) *\/\n \t\t\t\top1_idx = 0;\n \t\t\t\top2_idx += 1;\n@@ -904,7 +891,7 @@\n \t\t\/* second operand is an address mode *\/\n \t\tif (op1_live_after) {\n \t\t\t\/* first operand is live: push it here *\/\n-\t\t\tx87_create_fpush(state, n, op1_idx, op1);\n+\t\t\tx87_create_fpush(state, n, op1_idx, out_reg_idx, op1);\n \t\t\top1_idx = 0;\n \t\t} else {\n \t\t\t\/* first operand is dead: bring it to tos *\/\n@@ -920,7 +907,7 @@\n \t}\n \n \tpatched_insn = x87_patch_insn(n, dst);\n-\tx87_set_st(state, arch_register_get_index(out), patched_insn, out_idx);\n+\tx87_set_st(state, out_reg_idx, patched_insn, out_idx);\n \tif (do_pop) {\n \t\tx87_pop(state);\n \t}\n@@ -965,9 +952,10 @@\n \tarch_register_t const *const op1_reg = x87_get_irn_register(op1);\n \tint const op1_reg_idx = arch_register_get_index(op1_reg);\n \tint const op1_idx = x87_on_stack(state, op1_reg_idx);\n+\tint const out_reg_idx = arch_register_get_index(out);\n \tif (is_vfp_live(op1_reg_idx, live)) {\n \t\t\/* push the operand here *\/\n-\t\tx87_create_fpush(state, n, op1_idx, op1);\n+\t\tx87_create_fpush(state, n, op1_idx, out_reg_idx, op1);\n \t} else {\n \t\t\/* operand is dead, bring it to tos *\/\n \t\tif (op1_idx != 0) {\n@@ -975,7 +963,7 @@\n \t\t}\n \t}\n \n-\tx87_set_tos(state, arch_register_get_index(out), x87_patch_insn(n, op));\n+\tx87_set_tos(state, out_reg_idx, x87_patch_insn(n, op));\n \tia32_x87_attr_t *const attr = get_ia32_x87_attr(n);\n \tattr->x87[2] = attr->x87[0] = get_st_reg(0);\n \tDB((dbg, LEVEL_1, \"<<< %s -> %s\\n\", get_irn_opname(n), attr->x87[2]->name));\n@@ -1056,7 +1044,7 @@\n \t\tif (get_mode_size_bits(mode) > (mode_is_int(mode) ? 32 : 64)) {\n \t\t\tif (x87_get_depth(state) < N_ia32_st_REGS) {\n \t\t\t\t\/* ok, we have a free register: push + fstp *\/\n-\t\t\t\tx87_create_fpush(state, n, op2_idx, val);\n+\t\t\t\tx87_create_fpush(state, n, op2_idx, REG_VFP_VFP_NOREG, val);\n \t\t\t\tx87_pop(state);\n \t\t\t\tx87_patch_insn(n, op_p);\n \t\t\t} else {\n"} {"commit":"56e00ea18a5a32b4411eee52d4216611e7565ba6","subject":"Fix sbrk() to conform to the new (old) prototype.","message":"Fix sbrk() to conform to the new (old) prototype.\n","repos":"kishoredbn\/barrelfish,kishoredbn\/barrelfish,utsav2601\/cmpe295A,mslovy\/barrelfish,linusyang\/barrelfish,8l\/barrelfish,BarrelfishOS\/barrelfish,8l\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,mslovy\/barrelfish,BarrelfishOS\/barrelfish,utsav2601\/cmpe295A,kishoredbn\/barrelfish,linusyang\/barrelfish,mslovy\/barrelfish,BarrelfishOS\/barrelfish,utsav2601\/cmpe295A,utsav2601\/cmpe295A,utsav2601\/cmpe295A,kishoredbn\/barrelfish,mslovy\/barrelfish,utsav2601\/cmpe295A,kishoredbn\/barrelfish,linusyang\/barrelfish,linusyang\/barrelfish,mslovy\/barrelfish,8l\/barrelfish,linusyang\/barrelfish,mslovy\/barrelfish,8l\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,8l\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,8l\/barrelfish","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/posixcompat\/sbrk.c\n+++ lib\/posixcompat\/sbrk.c\n@@ -17,7 +17,7 @@\n #define SBRK_REGION_BYTES (256 * 1024 * 1024)\n #endif\n \n-void *sbrk(ptrdiff_t increment)\n+void *sbrk(intptr_t increment)\n {\n errval_t err;\n size_t orig_offset;\n"} {"commit":"f7e3fefb922789d19a70b7da48f37b1a2fc9af88","subject":"be a bit less exact with float results so we don't get wrong error reports because of spilling","message":"be a bit less exact with float results so we don't get wrong error reports because of spilling\n\n[r13971]\n","repos":"killbug2004\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,8l\/libfirm,8l\/libfirm,8l\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,8l\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/test\/ack\/test.c\n+++ ir\/be\/test\/ack\/test.c\n@@ -10,8 +10,8 @@\n \/* This program can be used to test C-compilers *\/\n \n #ifndef NOFLOAT\n-# define EPSD 1e-6\n-# define EPSF 1e-6\n+# define EPSD 1e-5\n+# define EPSF 1e-5\n #endif\n \n \/* global counters *\/\n"} {"commit":"94285712e84d211f6ca111f3d9f6ce96b80a8188","subject":"jetzt cooler?","message":"jetzt cooler?\n\n[r15973]\n","repos":"jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,8l\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,libfirm\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/test\/fehler83.c\n+++ ir\/be\/test\/fehler83.c\n@@ -1,6 +1,6 @@\n #include <stdio.h>\n \n-\/* produces a graph with wrong modes*\/\n+\/* produces a graph with wrong modes *\/\n static char parens[] = \"=!<,>\";\n static char *p = & parens[2];\n \n"} {"commit":"d228563792070d17ed0730210e56305de2b811de","subject":"PUD: receiver: make uplink work with IPv6","message":"PUD: receiver: make uplink work with IPv6\n\nSigned-off-by: Ferry Huberts <66e11f9f5d965b69497c7e73d5e808f8b13c1218@pelagic.nl>\n","repos":"acinonyx\/olsrd,diogomg\/olsrd-binary-heap,duydb2\/olsr,duydb2\/olsr,duydb2\/olsr,duydb2\/olsr,acinonyx\/olsrd,diogomg\/olsrd,sebkur\/olsrd,ninuxorg\/olsrd,diogomg\/olsrd-binary-heap,sebkur\/olsrd,acinonyx\/olsrd,sebkur\/olsrd,diogomg\/olsrd,nolith\/olsrd,diogomg\/olsrd-binary-heap,cholin\/olsrd,nolith\/olsrd,zioproto\/olsrd,sebkur\/olsrd,zioproto\/olsrd,zioproto\/olsrd,acinonyx\/olsrd,zioproto\/olsrd,tdz\/olsrd,diogomg\/olsrd,nolith\/olsrd,tdz\/olsrd,diogomg\/olsrd-binary-heap,cholin\/olsrd,duydb2\/olsr,diogomg\/olsrd,ninuxorg\/olsrd,servalproject\/olsr,tdz\/olsrd,tdz\/olsrd,ninuxorg\/olsrd,servalproject\/olsr,duydb2\/olsr,tdz\/olsrd,diogomg\/olsrd-binary-heap,servalproject\/olsr,duydb2\/olsr,sebkur\/olsrd,cholin\/olsrd,ninuxorg\/olsrd,duydb2\/olsr,ninuxorg\/olsrd,cholin\/olsrd,servalproject\/olsr,servalproject\/olsr,nolith\/olsrd,diogomg\/olsrd,zioproto\/olsrd,servalproject\/olsr,cholin\/olsrd,nolith\/olsrd,acinonyx\/olsrd,diogomg\/olsrd-binary-heap,sebkur\/olsrd,diogomg\/olsrd,diogomg\/olsrd-binary-heap,diogomg\/olsrd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/pud\/src\/receiver.c\n+++ lib\/pud\/src\/receiver.c\n@@ -183,11 +183,14 @@\n \t\tint fd = getDownlinkSocketFd();\n \t\tif (fd != -1) {\n \t\t\tunion olsr_sockaddr * uplink_addr = getUplinkAddr();\n+\t\t\tstruct sockaddr * addr;\n+\t\t\tsocklen_t addrSize;\n \n \t\t\tUplinkMessage * cl_uplink = (UplinkMessage *) &txBuffer[txBufferBytesUsed];\n \t\t\tUplinkClusterLeader * cl = &cl_uplink->msg.clusterLeader;\n \t\t\tunion olsr_ip_addr * cl_originator = getClusterLeaderOriginator(olsr_cnf->ip_version, cl);\n \t\t\tunion olsr_ip_addr * cl_clusterLeader = getClusterLeaderClusterLeader(olsr_cnf->ip_version, cl);\n+\n \t\t\tunsigned int cl_size =\n \t\t\t\t\tsizeof(UplinkClusterLeader) - sizeof(cl->leader)\n \t\t\t\t\t\t\t+ ((olsr_cnf->ip_version == AF_INET) ? sizeof(cl->leader.v4) :\n@@ -195,6 +198,14 @@\n \n \t\t\tunsigned long long uplinkUpdateInterval =\n \t\t\t\t\t(externalState == MOVEMENT_STATE_STATIONARY) ? getUplinkUpdateIntervalStationary() : getUplinkUpdateIntervalMoving();\n+\n+\t\t\tif (uplink_addr->in.sa_family == AF_INET) {\n+\t\t\t\taddr = (struct sockaddr *)&uplink_addr->in4;\n+\t\t\t\taddrSize = sizeof(struct sockaddr_in);\n+\t\t\t} else {\n+\t\t\t\taddr = (struct sockaddr *)&uplink_addr->in6;\n+\t\t\t\taddrSize = sizeof(struct sockaddr_in6);\n+\t\t\t}\n \n \t\t\t\/*\n \t\t\t * position update message (pu)\n@@ -236,8 +247,7 @@\n \t\t\ttxBufferBytesUsed += cl_size;\n \n \t\t\terrno = 0;\n-\t\t\tif (sendto(fd, &txBuffer, txBufferBytesUsed, 0, (struct sockaddr *) &uplink_addr->in,\n-\t\t\t\t\tsizeof(uplink_addr->in)) < 0) {\n+\t\t\tif (sendto(fd, &txBuffer, txBufferBytesUsed, 0, addr, addrSize) < 0) {\n \t\t\t\tpudError(true, \"Could not send to uplink (size=%u)\", txBufferBytesUsed);\n \t\t\t}\n \t\t}\n"} {"commit":"ed66d2bf99af405f72d6d4f59de43e6f748e638a","subject":"string funcs - added tokenize_string function","message":"string funcs - added tokenize_string function\n","repos":"BayshoreNetworks\/gargoyle,BayshoreNetworks\/gargoyle,BayshoreNetworks\/gargoyle,BayshoreNetworks\/gargoyle","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/string_functions.h\n+++ lib\/string_functions.h\n@@ -30,6 +30,7 @@\n #ifndef __stringfunctions__H_\n #define __stringfunctions__H_\n \n+#include <vector>\n \n #include <stdio.h>\n #include <stdint.h>\n@@ -66,6 +67,28 @@\n }\n \n \n+void tokenize_string (\n+\t\tconst std::string &str,\n+\t\tstd::vector<std::string> &tokens,\n+\t\tconst std::string &delimiters) {\n+\t\n+ \/\/ Skip delimiters at beginning.\n+ std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);\n+ \/\/ Find first \"non-delimiter\".\n+ std::string::size_type pos = str.find_first_of(delimiters, lastPos);\n+\n+ while (std::string::npos != pos || std::string::npos != lastPos)\n+ {\n+ \/\/ Found a token, add it to the vector.\n+ tokens.push_back(str.substr(lastPos, pos - lastPos));\n+ \/\/ Skip delimiters. Note the \"not_of\"\n+ lastPos = str.find_first_not_of(delimiters, pos);\n+ \/\/ Find next \"non-delimiter\"\n+ pos = str.find_first_of(delimiters, lastPos);\n+ }\n+}\n+\n+\n #ifdef __cplusplus\n }\n #endif\n"} {"commit":"c26611f35eb412c70be7a0fa5f5cf7d93a180884","subject":"test on insert","message":"test on insert\n","repos":"wallarm\/libdetection,wallarm\/libdetection","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/test\/detect_unit.c\n+++ lib\/test\/detect_unit.c\n@@ -344,6 +344,15 @@\n Tsqli_for_xml(void)\n {\n s_sqli_attacks({CSTR_LEN(\"SELECT 1 FOR XML PATH('')\")});\n+}\n+\n+static void\n+Tsqli_insert(void)\n+{\n+ s_sqli_attacks(\n+ {CSTR_LEN(\"INSERT INTO table_name EXEC xp_cmdshell 'dir'\")},\n+ {CSTR_LEN(\"INSERT INTO table_name (col) VALUES (1)\")},\n+ );\n }\n \n int\n@@ -392,6 +401,7 @@\n {\"goto\", Tsqli_goto},\n {\"call\", Tsqli_call},\n {\"for_xml\", Tsqli_for_xml},\n+ {\"insert\", Tsqli_insert},\n CU_TEST_INFO_NULL\n };\n CU_SuiteInfo suites[] = {\n"} {"commit":"dc36c1fa9a59881b220c1e8de3bb02fa9c6948d6","subject":"implementing import of TGA files","message":"implementing import of TGA files\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libAfterImage\/import.c\n+++ libAfterImage\/import.c\n@@ -1797,3 +1797,181 @@\n \tSHOW_TIME(\"image loading\",started);\n \treturn im ;\n }\n+\/*************************************************************************\/\n+\/* Targa Image format - some stuff borrowed from the GIMP.\n+ *************************************************************************\/\n+typedef struct ASTGAHeader\n+{\n+\tCARD8 IDLength ;\n+\tCARD8 ColorMapType;\n+#define TGA_NoImageData\t\t\t0\n+#define TGA_ColormappedImage\t1\n+#define TGA_TrueColorImage\t\t2\n+#define TGA_BWImage\t\t\t\t3\n+#define TGA_RLEColormappedImage\t\t9\n+#define TGA_RLETrueColorImage\t\t10\n+#define TGA_RLEBWImage\t\t\t\t11\n+\tCARD8 ImageType;\n+\tstruct \n+\t{\n+\t\tCARD16 FirstEntryIndex ;\n+\t\tCARD16 ColorMapLength ; \/* number of entries *\/ \n+\t\tCARD8 ColorMapEntrySize ; \/* number of bits per entry *\/ \n+\t} ColorMapSpec;\t\n+\tstruct \n+\t{\n+\t\tCARD16 XOrigin;\n+\t\tCARD16 YOrigin;\n+\t\tCARD16 Width;\n+\t\tCARD16 Height;\n+\t\tCARD8 Depth;\n+#define TGA_LeftToRight\t\t(0x01<<4)\n+#define TGA_TopToBottom\t\t(0x01<<5)\n+\t\tCARD8 Descriptor;\n+\t} ImageSpec;\n+\n+}ASTGAHeader;\n+\n+typedef struct ASTGAColorMap\n+{\n+\tint bytes_per_entry;\n+\tint bytes_total ; \n+\tCARD8 *data ; \n+}ASTGAColorMap;\n+\n+typedef struct ASTGAImageData\n+{\n+\tint bytes_per_pixel;\n+\tint image_size;\n+\tint bytes_total ; \n+\tCARD8 *data ; \n+}ASTGAImageData;\n+\n+static Bool load_tga_colormapped(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+static Bool load_tga_truecolor(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+static Bool load_tga_bw(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+static Bool load_tga_rle_colormapped(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+static Bool load_tga_rle_truecolor(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+static Bool load_tga_rle_bw(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf )\n+{\n+\t\t\n+\treturn True;\n+}\n+\n+\n+\n+ASImage *\n+tga2ASImage( const char * path, ASImageImportParams *params )\n+{\n+\tASImage *im = NULL ;\n+\t\/* More stuff *\/\n+\tFILE *infile;\t\t\t\t\t \/* source file *\/\n+\tASTGAHeader tga;\n+\tASTGAColorMap *cmap = NULL ;\n+ \tASTGAImageData *img_data = NULL ;\n+\tint width = 1, height = 1;\n+\tSTART_TIME(started);\n+\n+\n+\tif ((infile = open_image_file(path)) == NULL)\n+\t\treturn NULL;\n+\tif( fread( &tga, 1, sizeof(ASTGAHeader), infile ) == sizeof(ASTGAHeader) ) \n+\t{\n+\t\tBool success = True ;\n+\t\tBool (*load_row_func)(FILE *infile, ASTGAHeader *tga, ASTGAColorMap *cmap, ASScanline *buf, CARD8 *read_buf );\n+\n+\t\tif( tga.IDLength > 0 ) \n+\t\t\tsuccess = (fseek( infile, tga.IDLength, SEEK_CUR )==0);\n+\t\tif( success && tga.ColorMapType != 0 ) \n+\t\t{\n+\t\t\tcmap = safecalloc( 1, sizeof(ASTGAColorMap));\n+\t\t\tcmap->bytes_per_entry = (tga.ColorMapSpec.ColorMapEntrySize+7)\/8;\n+\t\t\tcmap->bytes_total = cmap->bytes_per_entry*tga.ColorMapSpec.ColorMapLength; \n+\t\t\tcmap->data = safemalloc( cmap->bytes_total);\n+\t\t\tsuccess = ( fread( cmap->data, 1, cmap->bytes_total, infile ) == cmap->bytes_total );\n+\t\t}\t \n+\t\tif( success ) \n+\t\t{\n+\t\t\tsuccess = False;\n+\t\t\tif( tga.ImageType == TGA_NoImageData )\n+\t\t\t{\t\n+\t\t\t\twidth = tga.ImageSpec.Width ; \n+\t\t\t\theight = tga.ImageSpec.Height ; \n+\t\t\t\tif( width < MAX_IMPORT_IMAGE_SIZE && height < MAX_IMPORT_IMAGE_SIZE )\n+\t\t\t\t\tsuccess = True;\n+\t\t\t}\n+\t\t}\n+\t\tswitch( tga.ImageType ) \n+\t\t{\n+\t\t\tcase TGA_ColormappedImage\t:load_row_func = load_tga_colormapped ; break ;\n+\t\t\tcase TGA_TrueColorImage\t\t:load_row_func = load_tga_truecolor ; break ;\n+\t\t\tcase TGA_BWImage\t\t\t:load_row_func = load_tga_bw ; break ;\n+\t\t\tcase TGA_RLEColormappedImage:load_row_func = load_tga_rle_colormapped ; break ;\n+\t\t\tcase TGA_RLETrueColorImage\t:load_row_func = load_tga_rle_truecolor ; break ;\n+\t\t\tcase TGA_RLEBWImage\t\t\t:load_row_func = load_tga_rle_bw ; break ;\n+\t\t\tdefault:\n+\t\t\t\tload_row_func = NULL ;\n+\t\t}\t \n+\t\t\n+\t\tif( success && load_row_func != NULL ) \n+\t\t{\t\n+\t\t\tASImageOutput *imout ;\n+\t\t\tim = create_asimage( width, height, params->compression );\n+\t\t\tif((imout = start_image_output( NULL, im, ASA_ASImage, 0, ASIMAGE_QUALITY_DEFAULT)) == NULL )\n+\t\t\t{\n+ \t\tdestroy_asimage( &im );\n+\t\t\t\tsuccess = False;\n+\t\t\t}else\n+\t\t\t{\t\n+\t\t\t\tASScanline buf;\n+\t\t\t\tint y ;\n+\t\t\t\tCARD8 *read_buf = safemalloc( width*4*2 ); \n+\t\t\t\tprepare_scanline( im->width, 0, &buf, True );\n+\t\t\t\tif( !get_flags( tga.ImageSpec.Descriptor, TGA_TopToBottom ) )\t\t\t\n+\t\t\t\t\ttoggle_image_output_direction( imout );\n+\t\t\t\tfor( y = 0 ; y < height ; ++y ) \n+\t\t\t\t{\t\n+\t\t\t\t\tif( !load_row_func( infile, &tga, cmap, &buf, read_buf ) )\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\timout->output_image_scanline( imout, &buf, 1);\n+\t\t\t\t}\n+\t\t\t\tstop_image_output( &imout );\n+\t\t\t\tfree_scanline( &buf, True );\n+\t\t\t\tfree( read_buf );\n+\t\t\t} \n+\t\t}\t \n+\t}\t \n+\tif( im == NULL )\n+\t\tshow_error( \"invalid or unsupported TGA format in image file \\\"%s\\\"\", path );\n+\n+\tfclose( infile );\n+\tSHOW_TIME(\"image loading\",started);\n+\treturn im ;\n+}\n+\n+\n"} {"commit":"42c49716b61f3ec2e4fc776c4bf02e6eb98e776f","subject":"samplerate as double","message":"samplerate as double\n\neven if libsndfile uses int internally\n","repos":"iem-projects\/ambix,iem-projects\/ambix,kronihias\/libambix,iem-projects\/ambix,umlaeute\/ambix,umlaeute\/ambix,kronihias\/libambix,umlaeute\/ambix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libambix\/ambix\/ambix.h\n+++ libambix\/ambix\/ambix.h\n@@ -85,7 +85,7 @@\n \/** number of frames in the file *\/\n unsigned long frames;\n \/** samplerate in Hz *\/\n- int\t\t\tsamplerate;\n+ double\t\t\tsamplerate;\n \/** type of the ambix file *\/\n ambix_sampleformat_t sampleformat;\n \n"} {"commit":"fd6ebbcaadca684cb721d0997ffc1e5cc855deba","subject":"Allow creation of filter graphs from a graph description structure which can be created programmatically or loaded from a file.","message":"Allow creation of filter graphs from a graph description structure which\ncan be created programmatically or loaded from a file.\n\nCommited in SoC by Bobby Bingham on 2007-08-14 22:27:05\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@12004 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavfilter\/avfilter.c\n+++ libavfilter\/avfilter.c\n@@ -220,6 +220,8 @@\n avfilter_register(&vf_crop);\n avfilter_register(&vf_fps);\n avfilter_register(&vf_graph);\n+ avfilter_register(&vf_graphdesc);\n+ avfilter_register(&vf_graphfile);\n avfilter_register(&vf_overlay);\n avfilter_register(&vf_passthrough);\n avfilter_register(&vf_rgb2bgr);\n"} {"commit":"424f798fd0e23288d4630192ff4a30b617476246","subject":"Use __STDC__ syntax, no need for prototype if random_r is before srandom_r","message":"Use __STDC__ syntax, no need for prototype if random_r is before srandom_r\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/stdlib\/random_r.c\n+++ libc\/stdlib\/random_r.c\n@@ -124,186 +124,6 @@\n \n \f \n-\/* Initialize the random number generator based on the given seed. If the\n- type is the trivial no-state-information type, just remember the seed.\n- Otherwise, initializes state[] based on the given \"seed\" via a linear\n- congruential generator. Then, the pointers are set to known locations\n- that are exactly rand_sep places apart. Lastly, it cycles the state\n- information a given number of times to get rid of any initial dependencies\n- introduced by the L.C.R.N.G. Note that the initialization of randtbl[]\n- for default usage relies on values produced by this routine. *\/\n-int attribute_hidden __srandom_r (unsigned int seed, struct random_data *buf)\n-{\n- int type;\n- int32_t *state;\n- long int i;\n- long int word;\n- int32_t *dst;\n- int kc;\n-\n- if (buf == NULL)\n-\tgoto fail;\n- type = buf->rand_type;\n- if ((unsigned int) type >= MAX_TYPES)\n-\tgoto fail;\n-\n- state = buf->state;\n- \/* We must make sure the seed is not 0. Take arbitrarily 1 in this case. *\/\n- if (seed == 0)\n-\tseed = 1;\n- state[0] = seed;\n- if (type == TYPE_0)\n-\tgoto done;\n-\n- dst = state;\n- word = seed;\n- kc = buf->rand_deg;\n- for (i = 1; i < kc; ++i)\n- {\n-\t\/* This does:\n-\t state[i] = (16807 * state[i - 1]) % 2147483647;\n-\t but avoids overflowing 31 bits. *\/\n-\tlong int hi = word \/ 127773;\n-\tlong int lo = word % 127773;\n-\tword = 16807 * lo - 2836 * hi;\n-\tif (word < 0)\n-\t word += 2147483647;\n-\t*++dst = word;\n- }\n-\n- buf->fptr = &state[buf->rand_sep];\n- buf->rptr = &state[0];\n- kc *= 10;\n- while (--kc >= 0)\n- {\n-\tint32_t discard;\n-\t(void) __random_r (buf, &discard);\n- }\n-\n-done:\n- return 0;\n-\n-fail:\n- return -1;\n-}\n-strong_alias(__srandom_r,srandom_r)\n-\n-\/* Initialize the state information in the given array of N bytes for\n- future random number generation. Based on the number of bytes we\n- are given, and the break values for the different R.N.G.'s, we choose\n- the best (largest) one we can and set things up for it. srandom is\n- then called to initialize the state information. Note that on return\n- from srandom, we set state[-1] to be the type multiplexed with the current\n- value of the rear pointer; this is so successive calls to initstate won't\n- lose this information and will be able to restart with setstate.\n- Note: The first thing we do is save the current state, if any, just like\n- setstate so that it doesn't matter when initstate is called.\n- Returns a pointer to the old state. *\/\n-int initstate_r (seed, arg_state, n, buf)\n- unsigned int seed;\n- char *arg_state;\n- size_t n;\n- struct random_data *buf;\n-{\n- int type;\n- int degree;\n- int separation;\n- int32_t *state;\n-\n- if (buf == NULL)\n-\tgoto fail;\n-\n- if (n >= BREAK_3)\n-\ttype = n < BREAK_4 ? TYPE_3 : TYPE_4;\n- else if (n < BREAK_1)\n- {\n-\tif (n < BREAK_0)\n-\t{\n-\t __set_errno (EINVAL);\n-\t goto fail;\n-\t}\n-\ttype = TYPE_0;\n- }\n- else\n-\ttype = n < BREAK_2 ? TYPE_1 : TYPE_2;\n-\n- degree = random_poly_info.degrees[type];\n- separation = random_poly_info.seps[type];\n-\n- buf->rand_type = type;\n- buf->rand_sep = separation;\n- buf->rand_deg = degree;\n- state = &((int32_t *) arg_state)[1];\t\/* First location. *\/\n- \/* Must set END_PTR before srandom. *\/\n- buf->end_ptr = &state[degree];\n-\n- buf->state = state;\n-\n- __srandom_r (seed, buf);\n-\n- state[-1] = TYPE_0;\n- if (type != TYPE_0)\n-\tstate[-1] = (buf->rptr - state) * MAX_TYPES + type;\n-\n- return 0;\n-\n-fail:\n- __set_errno (EINVAL);\n- return -1;\n-}\n-\n-\/* Restore the state from the given state array.\n- Note: It is important that we also remember the locations of the pointers\n- in the current state information, and restore the locations of the pointers\n- from the old state information. This is done by multiplexing the pointer\n- location into the zeroth word of the state information. Note that due\n- to the order in which things are done, it is OK to call setstate with the\n- same state as the current state\n- Returns a pointer to the old state information. *\/\n-int setstate_r (char *arg_state, struct random_data *buf)\n-{\n- int32_t *new_state = 1 + (int32_t *) arg_state;\n- int type;\n- int old_type;\n- int32_t *old_state;\n- int degree;\n- int separation;\n-\n- if (arg_state == NULL || buf == NULL)\n-\tgoto fail;\n-\n- old_type = buf->rand_type;\n- old_state = buf->state;\n- if (old_type == TYPE_0)\n-\told_state[-1] = TYPE_0;\n- else\n-\told_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;\n-\n- type = new_state[-1] % MAX_TYPES;\n- if (type < TYPE_0 || type > TYPE_4)\n-\tgoto fail;\n-\n- buf->rand_deg = degree = random_poly_info.degrees[type];\n- buf->rand_sep = separation = random_poly_info.seps[type];\n- buf->rand_type = type;\n-\n- if (type != TYPE_0)\n- {\n-\tint rear = new_state[-1] \/ MAX_TYPES;\n-\tbuf->rptr = &new_state[rear];\n-\tbuf->fptr = &new_state[(rear + separation) % degree];\n- }\n- buf->state = new_state;\n- \/* Set end_ptr too. *\/\n- buf->end_ptr = &new_state[degree];\n-\n- return 0;\n-\n-fail:\n- __set_errno (EINVAL);\n- return -1;\n-}\n-\n \/* If we are using the trivial TYPE_0 R.N.G., just do the old linear\n congruential bit. Otherwise, we do our fancy trinomial stuff, which is the\n same in all the other cases due to all the global variables that have been\n@@ -315,9 +135,7 @@\n rear pointers can't wrap on the same call by not testing the rear\n pointer if the front one has wrapped. Returns a 31-bit random number. *\/\n \n-int attribute_hidden __random_r (buf, result)\n- struct random_data *buf;\n- int32_t *result;\n+int attribute_hidden __random_r(struct random_data *buf, int32_t *result)\n {\n int32_t *state;\n \n@@ -365,3 +183,183 @@\n return -1;\n }\n strong_alias(__random_r,random_r)\n+\n+\/* Initialize the random number generator based on the given seed. If the\n+ type is the trivial no-state-information type, just remember the seed.\n+ Otherwise, initializes state[] based on the given \"seed\" via a linear\n+ congruential generator. Then, the pointers are set to known locations\n+ that are exactly rand_sep places apart. Lastly, it cycles the state\n+ information a given number of times to get rid of any initial dependencies\n+ introduced by the L.C.R.N.G. Note that the initialization of randtbl[]\n+ for default usage relies on values produced by this routine. *\/\n+int attribute_hidden __srandom_r (unsigned int seed, struct random_data *buf)\n+{\n+ int type;\n+ int32_t *state;\n+ long int i;\n+ long int word;\n+ int32_t *dst;\n+ int kc;\n+\n+ if (buf == NULL)\n+\tgoto fail;\n+ type = buf->rand_type;\n+ if ((unsigned int) type >= MAX_TYPES)\n+\tgoto fail;\n+\n+ state = buf->state;\n+ \/* We must make sure the seed is not 0. Take arbitrarily 1 in this case. *\/\n+ if (seed == 0)\n+\tseed = 1;\n+ state[0] = seed;\n+ if (type == TYPE_0)\n+\tgoto done;\n+\n+ dst = state;\n+ word = seed;\n+ kc = buf->rand_deg;\n+ for (i = 1; i < kc; ++i)\n+ {\n+\t\/* This does:\n+\t state[i] = (16807 * state[i - 1]) % 2147483647;\n+\t but avoids overflowing 31 bits. *\/\n+\tlong int hi = word \/ 127773;\n+\tlong int lo = word % 127773;\n+\tword = 16807 * lo - 2836 * hi;\n+\tif (word < 0)\n+\t word += 2147483647;\n+\t*++dst = word;\n+ }\n+\n+ buf->fptr = &state[buf->rand_sep];\n+ buf->rptr = &state[0];\n+ kc *= 10;\n+ while (--kc >= 0)\n+ {\n+\tint32_t discard;\n+\t(void) __random_r (buf, &discard);\n+ }\n+\n+done:\n+ return 0;\n+\n+fail:\n+ return -1;\n+}\n+strong_alias(__srandom_r,srandom_r)\n+\n+\/* Initialize the state information in the given array of N bytes for\n+ future random number generation. Based on the number of bytes we\n+ are given, and the break values for the different R.N.G.'s, we choose\n+ the best (largest) one we can and set things up for it. srandom is\n+ then called to initialize the state information. Note that on return\n+ from srandom, we set state[-1] to be the type multiplexed with the current\n+ value of the rear pointer; this is so successive calls to initstate won't\n+ lose this information and will be able to restart with setstate.\n+ Note: The first thing we do is save the current state, if any, just like\n+ setstate so that it doesn't matter when initstate is called.\n+ Returns a pointer to the old state. *\/\n+int initstate_r (seed, arg_state, n, buf)\n+ unsigned int seed;\n+ char *arg_state;\n+ size_t n;\n+ struct random_data *buf;\n+{\n+ int type;\n+ int degree;\n+ int separation;\n+ int32_t *state;\n+\n+ if (buf == NULL)\n+\tgoto fail;\n+\n+ if (n >= BREAK_3)\n+\ttype = n < BREAK_4 ? TYPE_3 : TYPE_4;\n+ else if (n < BREAK_1)\n+ {\n+\tif (n < BREAK_0)\n+\t{\n+\t __set_errno (EINVAL);\n+\t goto fail;\n+\t}\n+\ttype = TYPE_0;\n+ }\n+ else\n+\ttype = n < BREAK_2 ? TYPE_1 : TYPE_2;\n+\n+ degree = random_poly_info.degrees[type];\n+ separation = random_poly_info.seps[type];\n+\n+ buf->rand_type = type;\n+ buf->rand_sep = separation;\n+ buf->rand_deg = degree;\n+ state = &((int32_t *) arg_state)[1];\t\/* First location. *\/\n+ \/* Must set END_PTR before srandom. *\/\n+ buf->end_ptr = &state[degree];\n+\n+ buf->state = state;\n+\n+ __srandom_r (seed, buf);\n+\n+ state[-1] = TYPE_0;\n+ if (type != TYPE_0)\n+\tstate[-1] = (buf->rptr - state) * MAX_TYPES + type;\n+\n+ return 0;\n+\n+fail:\n+ __set_errno (EINVAL);\n+ return -1;\n+}\n+\n+\/* Restore the state from the given state array.\n+ Note: It is important that we also remember the locations of the pointers\n+ in the current state information, and restore the locations of the pointers\n+ from the old state information. This is done by multiplexing the pointer\n+ location into the zeroth word of the state information. Note that due\n+ to the order in which things are done, it is OK to call setstate with the\n+ same state as the current state\n+ Returns a pointer to the old state information. *\/\n+int setstate_r (char *arg_state, struct random_data *buf)\n+{\n+ int32_t *new_state = 1 + (int32_t *) arg_state;\n+ int type;\n+ int old_type;\n+ int32_t *old_state;\n+ int degree;\n+ int separation;\n+\n+ if (arg_state == NULL || buf == NULL)\n+\tgoto fail;\n+\n+ old_type = buf->rand_type;\n+ old_state = buf->state;\n+ if (old_type == TYPE_0)\n+\told_state[-1] = TYPE_0;\n+ else\n+\told_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;\n+\n+ type = new_state[-1] % MAX_TYPES;\n+ if (type < TYPE_0 || type > TYPE_4)\n+\tgoto fail;\n+\n+ buf->rand_deg = degree = random_poly_info.degrees[type];\n+ buf->rand_sep = separation = random_poly_info.seps[type];\n+ buf->rand_type = type;\n+\n+ if (type != TYPE_0)\n+ {\n+\tint rear = new_state[-1] \/ MAX_TYPES;\n+\tbuf->rptr = &new_state[rear];\n+\tbuf->fptr = &new_state[(rear + separation) % degree];\n+ }\n+ buf->state = new_state;\n+ \/* Set end_ptr too. *\/\n+ buf->end_ptr = &new_state[degree];\n+\n+ return 0;\n+\n+fail:\n+ __set_errno (EINVAL);\n+ return -1;\n+}\n"} {"commit":"cde0e6b07adc877fea3d8cde56d0b7ef74f4dd6e","subject":"fix compilation bug gcc","message":"fix compilation bug gcc\n","repos":"johnpeter66\/ethminer,johnpeter66\/ethminer,johnpeter66\/ethminer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libethcore\/EthashAux.h\n+++ libethcore\/EthashAux.h\n@@ -121,7 +121,7 @@\n \tstatic char * dagDirName();\n \n \tstatic void setDAGEraseMode(DAGEraseMode mode);\n-\tstatic void EthashAux::eraseDAGs();\n+\tstatic void eraseDAGs();\n \n \tstatic LightType light(h256 const& _seedHash);\n \n"} {"commit":"d47ad358204abe9e3c5148926fe5bb70b0848ea3","subject":"[DEV][io] code reorganisation","message":"[DEV][io] code reorganisation\n\nChange-Id: I9b35e464ba16da0d98d228c1b82a5c4f9b380f26\n","repos":"ncarrier\/fusion,Parrot-Developers\/fusion,ncarrier\/fusion,Parrot-Developers\/fusion","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libioutils\/src\/io_io.c\n+++ libioutils\/src\/io_io.c\n@@ -8,7 +8,6 @@\n *\/\n \n \/* TODO update doc of static functions and other private symbols *\/\n-\/* TODO reorganize *\/\n \n #ifndef _GNU_SOURCE\n #define _GNU_SOURCE\n@@ -213,86 +212,6 @@\n \t}\n }\n \n-int io_io_log_rx(struct io_io *io, void (*log_cb)(const char *))\n-{\n-\tif (!io)\n-\t\treturn -EINVAL;\n-\n-\tio->log_rx = log_cb;\n-\n-\treturn 0;\n-}\n-\n-int io_io_log_tx(struct io_io *io, void (*log_tx)(const char *))\n-{\n-\tif (!io)\n-\t\treturn -EINVAL;\n-\n-\tio->log_tx = log_tx;\n-\n-\treturn 0;\n-}\n-\n-int io_io_read_start(struct io_io *io, io_io_read_cb_t cb, void *data,\n-\t\tint clear)\n-{\n-\tint ret;\n-\n-\tif (!io || !cb)\n-\t\treturn -EINVAL;\n-\n-\tif (io->readctx.state != IO_IO_STOPPED)\n-\t\treturn -EBUSY;\n-\n-\t\/*\n-\t * activate out source, useless at init, but needed after calls to\n-\t * io_io_read_stop()\n-\t *\/\n-\tret = io_mon_activate_in_source(io->mon, &io->src, 1);\n-\tif (ret < 0)\n-\t\treturn ret;\n-\n-\t\/* set callback info *\/\n-\tio->readctx.cb = cb;\n-\tio->readctx.data = data;\n-\n-\t\/* clear read buffer if needed *\/\n-\tif (clear)\n-\t\trs_rb_empty(&io->readctx.rb);\n-\n-\t\/* update read state *\/\n-\tio->readctx.state = IO_IO_STARTED;\n-\treturn 0;\n-}\n-\n-int io_io_read_stop(struct io_io *io)\n-{\n-\tif (NULL == io)\n-\t\treturn -EINVAL;\n-\n-\tif (io->readctx.state != IO_IO_STARTED)\n-\t\treturn -EBUSY;\n-\n-\t\/* reset callback info *\/\n-\tio->readctx.cb = NULL;\n-\tio->readctx.data = NULL;\n-\n-\t\/* update state *\/\n-\tio->readctx.state = IO_IO_STOPPED;\n-\n-\treturn io_mon_activate_in_source(io->mon, &io->src, 0);\n-}\n-\n-int io_io_is_read_started(struct io_io *io)\n-{\n-\treturn NULL != io ? io->readctx.state == IO_IO_STARTED : 0;\n-}\n-\n-int io_io_has_read_error(struct io_io *io)\n-{\n-\treturn NULL != io ? io->readctx.state == IO_IO_ERROR : 0;\n-}\n-\n \/**\n *\n * @param fd\n@@ -360,6 +279,11 @@\n \t}\n }\n \n+\/**\n+ *\n+ * @param timer\n+ * @param nbexpired\n+ *\/\n static void write_timer_cb(struct io_src_tmr *timer, uint64_t *nbexpired)\n {\n \tstruct io_io_write_ctx *ctx = rs_container_of(timer,\n@@ -381,6 +305,10 @@\n \t(*buffer->cb)(buffer, IO_IO_WRITE_TIMEOUT);\n }\n \n+\/**\n+ *\n+ * @param src\n+ *\/\n static void write_src_cb(struct io_src *src)\n {\n \tstruct io_io_write_ctx *writectx = rs_container_of(src,\n@@ -441,67 +369,21 @@\n \t}\n }\n \n+\/**\n+ *\n+ * @param buffer\n+ * @param status\n+ *\/\n static void default_write_cb(struct io_io_write_buffer *buffer,\n \tenum io_io_write_status status)\n {\n \n }\n \n-\/* add write buffer in queue *\/\n-int io_io_write_add(struct io_io *io, struct io_io_write_buffer *buffer)\n-{\n-\tint ret = 0;\n-\tstruct io_io_write_ctx *ctx;\n-\n-\tif (NULL == io || NULL == buffer)\n-\t\treturn -EINVAL;\n-\tif (!buffer->address || buffer->length == 0)\n-\t\treturn -EINVAL;\n-\n-\tctx = &io->writectx;\n-\n-\tif (!buffer->cb) {\n-\t\tbuffer->cb = &default_write_cb;\n-\t\tbuffer->data = io;\n-\t}\n-\n-\trs_dll_enqueue(&ctx->buffers, &buffer->node);\n-\tif (ctx->current == NULL)\n-\t\tprocess_next_write(io);\n-\n-\treturn ret;\n-}\n-\n-\/* abort all write buffers in io write queue\n- * (buffer cb invoked with status IO_IO_WRITE_ABORTED) *\/\n-int io_io_write_abort(struct io_io *io)\n-{\n-\tstruct io_io_write_ctx *ctx;\n-\tstruct io_io_write_buffer *buffer = NULL;\n-\tstruct rs_node *node;\n-\n-\tif (NULL == io)\n-\t\treturn -EINVAL;\n-\tctx = &io->writectx;\n-\tbuffer = ctx->current;\n-\n-\t\/* TODO: how to be safe on io destroy call in write cb here ? *\/\n-\tif (buffer) {\n-\t\t(*buffer->cb)(buffer, IO_IO_WRITE_ABORTED);\n-\t\tctx->current = NULL;\n-\t\tctx->nbwritten = 0;\n-\t}\n-\n-\twhile ((node = rs_dll_pop(&ctx->buffers))) {\n-\t\tbuffer = rs_container_of(node, struct io_io_write_buffer, node);\n-\t\t(*buffer->cb)(buffer, IO_IO_WRITE_ABORTED);\n-\t}\n-\n-\tprocess_next_write(io);\n-\n-\treturn 0;\n-}\n-\n+\/**\n+ *\n+ * @param src\n+ *\/\n static void duplex_src_cb(struct io_src *src)\n {\n \tstruct io_io *io = rs_container_of(src, struct io_io, src);\n@@ -624,6 +506,138 @@\n \treturn 0;\n }\n \n+int io_io_read_start(struct io_io *io, io_io_read_cb_t cb, void *data,\n+\t\tint clear)\n+{\n+\tint ret;\n+\n+\tif (!io || !cb)\n+\t\treturn -EINVAL;\n+\n+\tif (io->readctx.state != IO_IO_STOPPED)\n+\t\treturn -EBUSY;\n+\n+\t\/*\n+\t * activate out source, useless at init, but needed after calls to\n+\t * io_io_read_stop()\n+\t *\/\n+\tret = io_mon_activate_in_source(io->mon, &io->src, 1);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\t\/* set callback info *\/\n+\tio->readctx.cb = cb;\n+\tio->readctx.data = data;\n+\n+\t\/* clear read buffer if needed *\/\n+\tif (clear)\n+\t\trs_rb_empty(&io->readctx.rb);\n+\n+\t\/* update read state *\/\n+\tio->readctx.state = IO_IO_STARTED;\n+\treturn 0;\n+}\n+\n+int io_io_log_rx(struct io_io *io, void (*log_cb)(const char *))\n+{\n+\tif (!io)\n+\t\treturn -EINVAL;\n+\n+\tio->log_rx = log_cb;\n+\n+\treturn 0;\n+}\n+\n+int io_io_log_tx(struct io_io *io, void (*log_tx)(const char *))\n+{\n+\tif (!io)\n+\t\treturn -EINVAL;\n+\n+\tio->log_tx = log_tx;\n+\n+\treturn 0;\n+}\n+\n+int io_io_read_stop(struct io_io *io)\n+{\n+\tif (NULL == io)\n+\t\treturn -EINVAL;\n+\n+\tif (io->readctx.state != IO_IO_STARTED)\n+\t\treturn -EBUSY;\n+\n+\t\/* reset callback info *\/\n+\tio->readctx.cb = NULL;\n+\tio->readctx.data = NULL;\n+\n+\t\/* update state *\/\n+\tio->readctx.state = IO_IO_STOPPED;\n+\n+\treturn io_mon_activate_in_source(io->mon, &io->src, 0);\n+}\n+\n+int io_io_is_read_started(struct io_io *io)\n+{\n+\treturn NULL != io ? io->readctx.state == IO_IO_STARTED : 0;\n+}\n+\n+int io_io_has_read_error(struct io_io *io)\n+{\n+\treturn NULL != io ? io->readctx.state == IO_IO_ERROR : 0;\n+}\n+\n+int io_io_write_add(struct io_io *io, struct io_io_write_buffer *buffer)\n+{\n+\tint ret = 0;\n+\tstruct io_io_write_ctx *ctx;\n+\n+\tif (NULL == io || NULL == buffer)\n+\t\treturn -EINVAL;\n+\tif (!buffer->address || buffer->length == 0)\n+\t\treturn -EINVAL;\n+\n+\tctx = &io->writectx;\n+\n+\tif (!buffer->cb) {\n+\t\tbuffer->cb = &default_write_cb;\n+\t\tbuffer->data = io;\n+\t}\n+\n+\trs_dll_enqueue(&ctx->buffers, &buffer->node);\n+\tif (ctx->current == NULL)\n+\t\tprocess_next_write(io);\n+\n+\treturn ret;\n+}\n+\n+int io_io_write_abort(struct io_io *io)\n+{\n+\tstruct io_io_write_ctx *ctx;\n+\tstruct io_io_write_buffer *buffer = NULL;\n+\tstruct rs_node *node;\n+\n+\tif (NULL == io)\n+\t\treturn -EINVAL;\n+\tctx = &io->writectx;\n+\tbuffer = ctx->current;\n+\n+\t\/* TODO: how to be safe on io destroy call in write cb here ? *\/\n+\tif (buffer) {\n+\t\t(*buffer->cb)(buffer, IO_IO_WRITE_ABORTED);\n+\t\tctx->current = NULL;\n+\t\tctx->nbwritten = 0;\n+\t}\n+\n+\twhile ((node = rs_dll_pop(&ctx->buffers))) {\n+\t\tbuffer = rs_container_of(node, struct io_io_write_buffer, node);\n+\t\t(*buffer->cb)(buffer, IO_IO_WRITE_ABORTED);\n+\t}\n+\n+\tprocess_next_write(io);\n+\n+\treturn 0;\n+}\n+\n int io_io_write_buffer_init(struct io_io_write_buffer *buf, io_io_write_cb_t cb,\n \t\tvoid *data, size_t length, void *address)\n {\n"} {"commit":"d2089a8da02d5a2d8d3025c90d80d8447d332c07","subject":"liblox: fix strcpy warnings","message":"liblox: fix strcpy warnings\n","repos":"DirectMyFile\/Raptor,DirectMyFile\/Raptor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- liblox\/string\/strcpy.c\n+++ liblox\/string\/strcpy.c\n@@ -1,8 +1,8 @@\n #include \"..\/string.h\"\n \n char* strcpy(char* restrict dest, const char* restrict src) {\n- const unsigned char* s = src;\n- unsigned char* d = dest;\n- while ((*d++ = *s++));\n+ const unsigned char* s = (const unsigned char*) src;\n+ unsigned char* d = (unsigned char*) dest;\n+ while ((*d++ = *s++)) {}\n return dest;\n }\n"} {"commit":"326a714879733096afc42697734e5d07dbf58bc9","subject":"[libmultipath] fix pathcount wildcard","message":"[libmultipath] fix pathcount wildcard\n","repos":"vijaychauhan\/multipath-tools,unakatsuo\/multipath-tools,unakatsuo\/multipath-tools,unakatsuo\/multipath-tools,gebi\/multipath-tools,vijaychauhan\/multipath-tools,grzn\/multipath-tools-explained,grzn\/multipath-tools-explained","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmultipath\/structs.c\n+++ libmultipath\/structs.c\n@@ -311,7 +311,7 @@\n \n \tvector_foreach_slot (mpp->pg, pgp, i)\n \t\tvector_foreach_slot (pgp->paths, pp, j)\n-\t\t\tif ((pp->state == state) || (state == PATH_WILD))\n+\t\t\tif ((pp->state == state) || (state < 0))\n \t\t\t\tcount++;\n \n \treturn count;\n"} {"commit":"7f858f2f42ac770d18baea9c4a81249d2b07b4bc","subject":"Fix various login issues when the server behaves bad, now better at retrying connections","message":"Fix various login issues when the server behaves bad, now better at retrying connections\n","repos":"noahwilliamsson\/openspotify,noahwilliamsson\/openspotify","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libopenspotify\/login.c\n+++ libopenspotify\/login.c\n@@ -150,6 +150,7 @@\n \tfd_set wfds;\n \tstruct timeval tv;\n \n+\tl->error = SP_LOGIN_ERROR_OK;\n \tswitch(l->state) {\n \n \tcase 0:\n@@ -327,8 +328,17 @@\n \n \tcase 4:\n \t\tret = send_client_parameters(l);\n-\t\tif(ret < 0)\n-\t\t\tl->state = 0;\n+\t\tif(ret < 0) {\n+\t\t\tif(l->error == SP_ERROR_OTHER_TRANSIENT || l->error == SP_LOGIN_ERROR_SOCKET_ERROR) {\n+\t\t\t\tDSFYDEBUG(\"Retrying with next server\\n\");\n+\t\t\t\tl->state = 2;\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t\telse {\n+\t\t\t\tl->state = 0;\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t}\n \t\telse\n \t\t\tl->state++;\n \n@@ -339,8 +349,15 @@\n \t\t\/* Receive server parameters and eventually compute session key *\/\n \t\tret = receive_server_parameters(l);\n \t\tDSFYDEBUG(\"Recieved initial packet, return value was %d, login error is %d\\n\", ret, l->error);\n-\t\tif(ret < 0)\n-\t\t\tl->state = 0;\n+\t\tif(ret < 0) {\n+\t\t\tif(l->error == SP_ERROR_OTHER_TRANSIENT || l->error == SP_LOGIN_ERROR_SOCKET_ERROR) {\n+\t\t\t\tDSFYDEBUG(\"Retrying with next server\\n\");\n+\t\t\t\tl->state = 2;\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t\tl->state = 0;\n+\t\t}\n \t\telse\n \t\t\tl->state++;\n \n@@ -388,7 +405,7 @@\n \t\t\treturn 1;\n \n \t\tl->state = 0;\n-\t\tl->error = -12;\n+\t\treturn -1;\n \t\tbreak;\n \t}\n \n"} {"commit":"d793594173bb5367e466134d5fe3366feeb672f6","subject":"ITS#7229 more mdb_page_split tweaks","message":"ITS#7229 more mdb_page_split tweaks\n\nAlso add mdb_debug\/mdb_debug_start to toggle debug output at runtime\n","repos":"bobek-balinek\/BlueJet","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libraries\/libmdb\/mdb.c\n+++ libraries\/libmdb\/mdb.c\n@@ -259,9 +259,12 @@\n #if !(__STDC_VERSION__ >= 199901L || defined(__GNUC__))\n # define DPRINTF\t(void)\t\/* Vararg macros may be unsupported *\/\n #elif MDB_DEBUG\n+static int mdb_debug;\n+static int mdb_debug_start;\n+\n \t\/**\tPrint a debug message with printf formatting. *\/\n # define DPRINTF(fmt, ...)\t\/**< Requires 2 or more args *\/ \\\n-\tfprintf(stderr, \"%s:%d \" fmt \"\\n\", __func__, __LINE__, __VA_ARGS__)\n+\tif (mdb_debug) fprintf(stderr, \"%s:%d \" fmt \"\\n\", __func__, __LINE__, __VA_ARGS__)\n #else\n # define DPRINTF(fmt, ...)\t((void) 0)\n #endif\n@@ -1576,6 +1579,10 @@\n \t\tif (env->me_wtxnid < txn->mt_txnid)\n \t\t\tmt_dbflag = DB_STALE;\n \t\ttxn->mt_txnid++;\n+#if MDB_DEBUG\n+\t\tif (txn->mt_txnid == mdb_debug_start)\n+\t\t\tmdb_debug = 1;\n+#endif\n \t\ttxn->mt_toggle = env->me_txns->mti_me_toggle;\n \t\ttxn->mt_u.dirty_list = env->me_dirty_list;\n \t\ttxn->mt_u.dirty_list[0].mid = 0;\n@@ -5765,43 +5772,45 @@\n \t * When the size of the data items is much smaller than\n \t * one-half of a page, this check is irrelevant.\n \t *\/\n-\tif (IS_LEAF(mp) && nkeys < 16) {\n+\tif (IS_LEAF(mp)) {\n \t\tunsigned int psize, nsize;\n \t\t\/* Maximum free space in an empty page *\/\n \t\tpmax = mc->mc_txn->mt_env->me_psize - PAGEHDRSZ;\n \t\tnsize = mdb_leaf_size(mc->mc_txn->mt_env, newkey, newdata);\n-\t\tif (newindx <= split_indx) {\n-\t\t\tpsize = nsize;\n-\t\t\tnewpos = 0;\n-\t\t\tfor (i=0; i<split_indx; i++) {\n-\t\t\t\tnode = NODEPTR(mp, i);\n-\t\t\t\tpsize += NODESIZE + NODEKSZ(node) + sizeof(indx_t);\n-\t\t\t\tif (F_ISSET(node->mn_flags, F_BIGDATA))\n-\t\t\t\t\tpsize += sizeof(pgno_t);\n-\t\t\t\telse\n-\t\t\t\t\tpsize += NODEDSZ(node);\n-\t\t\t\tpsize += psize & 1;\n-\t\t\t\tif (psize > pmax) {\n-\t\t\t\t\tif (i == split_indx - 1 && newindx == split_indx)\n-\t\t\t\t\t\tnewpos = 1;\n+\t\tif ((nkeys < 20) || (nsize > pmax\/4)) {\n+\t\t\tif (newindx <= split_indx) {\n+\t\t\t\tpsize = nsize;\n+\t\t\t\tnewpos = 0;\n+\t\t\t\tfor (i=0; i<split_indx; i++) {\n+\t\t\t\t\tnode = NODEPTR(mp, i);\n+\t\t\t\t\tpsize += NODESIZE + NODEKSZ(node) + sizeof(indx_t);\n+\t\t\t\t\tif (F_ISSET(node->mn_flags, F_BIGDATA))\n+\t\t\t\t\t\tpsize += sizeof(pgno_t);\n \t\t\t\t\telse\n-\t\t\t\t\t\tsplit_indx = i;\n-\t\t\t\t\tbreak;\n+\t\t\t\t\t\tpsize += NODEDSZ(node);\n+\t\t\t\t\tpsize += psize & 1;\n+\t\t\t\t\tif (psize > pmax) {\n+\t\t\t\t\t\tif (i == split_indx - 1 && newindx == split_indx)\n+\t\t\t\t\t\t\tnewpos = 1;\n+\t\t\t\t\t\telse\n+\t\t\t\t\t\t\tsplit_indx = i;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n \t\t\t\t}\n-\t\t\t}\n-\t\t} else {\n-\t\t\tpsize = nsize;\n-\t\t\tfor (i=nkeys-1; i>=split_indx; i--) {\n-\t\t\t\tnode = NODEPTR(mp, i);\n-\t\t\t\tpsize += NODESIZE + NODEKSZ(node) + sizeof(indx_t);\n-\t\t\t\tif (F_ISSET(node->mn_flags, F_BIGDATA))\n-\t\t\t\t\tpsize += sizeof(pgno_t);\n-\t\t\t\telse\n-\t\t\t\t\tpsize += NODEDSZ(node);\n-\t\t\t\tpsize += psize & 1;\n-\t\t\t\tif (psize > pmax) {\n-\t\t\t\t\tsplit_indx = i+1;\n-\t\t\t\t\tbreak;\n+\t\t\t} else {\n+\t\t\t\tpsize = nsize;\n+\t\t\t\tfor (i=nkeys-1; i>=split_indx; i--) {\n+\t\t\t\t\tnode = NODEPTR(mp, i);\n+\t\t\t\t\tpsize += NODESIZE + NODEKSZ(node) + sizeof(indx_t);\n+\t\t\t\t\tif (F_ISSET(node->mn_flags, F_BIGDATA))\n+\t\t\t\t\t\tpsize += sizeof(pgno_t);\n+\t\t\t\t\telse\n+\t\t\t\t\t\tpsize += NODEDSZ(node);\n+\t\t\t\t\tpsize += psize & 1;\n+\t\t\t\t\tif (psize > pmax) {\n+\t\t\t\t\t\tsplit_indx = i+1;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t}\n \t\t}\n@@ -5918,6 +5927,7 @@\n \t\t}\n \n \t\trc = mdb_node_add(mc, j, &rkey, rdata, pgno, flags);\n+\t\tif (rc) break;\n \t}\n \n \tnkeys = NUMKEYS(copy);\n"} {"commit":"d60c19ac9e140941a963a374fb410c58654856ce","subject":"Print root AST node without branch","message":"Print root AST node without branch\n","repos":"amyinorbit\/orbitvm,cesarparent\/orbitvm,amyinorbit\/orbitvm,amyinorbit\/orbitvm,cesarparent\/orbitvm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libs\/ast\/ast_printer.c\n+++ libs\/ast\/ast_printer.c\n@@ -13,13 +13,13 @@\n static void ast_printList(FILE* out, const char* name, AST* list, int depth, bool last);\n \n static void ast_printReturn(FILE* out, int depth, bool last) {\n+ static bool indents[256] = {false};\n+ fputs(\"\\n\", out);\n+ if(depth <= 0) { return; }\n+\n \n- static bool indents[256] = {false};\n- \n- indents[depth] = !last;\n- \n- fputs(\"\\n\", out);\n- for(int i = 0; i < depth; ++i) {\n+ indents[depth-1] = !last;\n+ for(int i = 0; i < depth-1; ++i) {\n fputc(((i >= 256 || indents[i]) ? '|' : ' '), out);\n fputc(' ', out);\n }\n"} {"commit":"378721e46cdafc7ba99e30f51b8b8395fb254de0","subject":"backends: X11: Fix window size passed to event parser.","message":"backends: X11: Fix window size passed to event parser.\n\nWhen SHM is not in use, the win->context field is not used to construct\nthe backend context and the width and height fields are uninitialized\nwhich leads to wrong (or none) events from mouse pointer movement.\n\nFix this by using self->context which is correct in all cases.\n\nSigned-off-by: Cyril Hrubis <b1e90efd3b808b8e0bcf2a9a55fd8b9a779bfd81@ucw.cz>\n","repos":"gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/backends\/GP_X11.c\n+++ libs\/backends\/GP_X11.c\n@@ -167,7 +167,7 @@\n \tdefault:\n \t\t\/\/TODO: More accurate window w and h?\n \t\tGP_InputDriverX11EventPut(&self->event_queue, ev,\n-\t\t win->context.w, win->context.h);\n+\t\t self->context->w, self->context->h);\n \tbreak;\n \t}\n }\n@@ -480,7 +480,6 @@\n \t}\n \n \twin->shm_flag = 0;\n-\n \twin->img->data = (char*)self->context->pixels;\n \n \treturn 0;\n"} {"commit":"468dcaf825b5e7279d0a7d18131363785bf8dd8d","subject":"backends: gp_x11: Initialize struct x11_win","message":"backends: gp_x11: Initialize struct x11_win\n\nSigned-off-by: Cyril Hrubis <b1e90efd3b808b8e0bcf2a9a55fd8b9a779bfd81@ucw.cz>\n","repos":"gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim,gfxprim\/gfxprim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/backends\/gp_x11.c\n+++ libs\/backends\/gp_x11.c\n@@ -590,6 +590,8 @@\n \n \twin = GP_BACKEND_PRIV(backend);\n \n+\tmemset(win, 0, sizeof(struct x11_win));\n+\n \t\/\/XSynchronize(win->dpy, True);\n \n \t\/* Pack parameters and open window *\/\n"} {"commit":"f99e8afa66641d81d6354c65ca80c0de77f21428","subject":"\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b inline","message":"\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b inline\n","repos":"andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libs\/compiler\/writer.c\n+++ libs\/compiler\/writer.c\n@@ -38,7 +38,7 @@\n \/\/ Writer Utils \/\/\n \/\/===----------------------------------------------------------------------===\/\/\n \n-static void write(writer *const wrt, const char *const string)\n+static inline void write(writer *const wrt, const char *const string)\n {\n \tuni_printf(wrt->io, \"%s\", string);\n }\n@@ -49,7 +49,7 @@\n *\t@param\twrt\t\t\tWriter\n *\t@param\tindent\t\tIndentation\n *\/\n-static void write_indent(writer *const wrt, const size_t indent)\n+static inline void write_indent(writer *const wrt, const size_t indent)\n {\n \tfor (size_t i = 0; i < indent; i++)\n \t{\n@@ -63,7 +63,7 @@\n *\t@param\twrt\t\t\tWriter\n *\t@param\tloc\t\t\tSource location\n *\/\n-static void write_location(writer *const wrt, const location loc)\n+static inline void write_location(writer *const wrt, const location loc)\n {\n \tuni_printf(wrt->io, \" at <%lu, %lu>\\n\", loc.begin, loc.end);\n }\n"} {"commit":"52fa1904d5bf3775c6d65964cec5c57e3135e844","subject":"alloca patch by Aron Rosenberg","message":"alloca patch by Aron Rosenberg\n\n\ngit-svn-id: 42b1393cca5d551bec90c34575d0b84245f1dba8@10776 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"ksophocleous\/speex,lu-zero\/speex,lu-zero\/speex,jiangjianping\/speex,felipebetancur\/speex,Distrotech\/speex,felipebetancur\/speexdsp,felipebetancur\/speexdsp,lu-zero\/speex,felipebetancur\/speexdsp,maolin-cdzl\/speexdsp,lowlevel-studios\/speex-android,ksophocleous\/speex,Distrotech\/speex,ksophocleous\/speexdsp,ksophocleous\/speexdsp,ksophocleous\/speexdsp,mwgoldsmith\/speex,felipebetancur\/speex,Distrotech\/speex,felipebetancur\/speex,ksophocleous\/speexdsp,jiangjianping\/speex,Distrotech\/speex,mwgoldsmith\/speex,mwgoldsmith\/speex,lowlevel-studios\/speex-android,jiangjianping\/speex,jiangjianping\/speex,jiangjianping\/speex,felipebetancur\/speexdsp,maolin-cdzl\/speexdsp,lowlevel-studios\/speex-android,mwgoldsmith\/speex,maolin-cdzl\/speexdsp,felipebetancur\/speex,maolin-cdzl\/speexdsp,ksophocleous\/speex","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libspeex\/stack_alloc.h\n+++ libspeex\/stack_alloc.h\n@@ -36,7 +36,11 @@\n #define STACK_ALLOC_H\n \n #ifdef USE_ALLOCA\n+#ifdef WIN32\n+#include <malloc.h>\n+#else\n #include <alloca.h>\n+#endif\n #endif\n \n \/**\n"} {"commit":"5c420fe27923118f2657a3c59fede6a47489036a","subject":"panel_manager: Remove unused resource field","message":"panel_manager: Remove unused resource field\n","repos":"sulami\/swc,unknownloner\/swc,michaelforney\/swc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libswc\/panel_manager.c\n+++ libswc\/panel_manager.c\n@@ -31,7 +31,6 @@\n static struct\n {\n struct wl_global * global;\n- struct wl_resource * resource;\n } panel_manager;\n \n static void create_panel(struct wl_client * client,\n"} {"commit":"bf12efb464a87bb52c8e69a98999e88f617865c7","subject":"Darwin: Improve device enumeration performance and save device location","message":"Darwin: Improve device enumeration performance and save device location\n\n[stuge: Formatting fixes and split out libusb_get_device_speed() change]\n","repos":"pbatard\/libusb-pbatard,pbatard\/libusb-pbatard","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libusb\/os\/darwin_usb.c\n+++ libusb\/os\/darwin_usb.c\n@@ -1,6 +1,6 @@\n \/*\n * darwin backend for libusb 1.0\n- * Copyright (C) 2008-2010 Nathan Hjelm <hjelmn@users.sourceforge.net>\n+ * Copyright (C) 2008-2011 Nathan Hjelm <hjelmn@users.sourceforge.net>\n *\n * This library is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU Lesser General Public\n@@ -517,13 +517,143 @@\n return 0;\n }\n \n+static int darwin_cache_device_descriptor (struct libusb_context *ctx, struct libusb_device *dev, usb_device_t **device) {\n+ struct darwin_device_priv *priv;\n+ int retries = 5, delay = 30000;\n+ int unsuspended = 0, try_unsuspend = 1, try_reconfigure = 1;\n+ int is_open = 0;\n+ int ret = 0, ret2;\n+ IOUSBDevRequest req;\n+ UInt8 bDeviceClass;\n+ UInt16 idProduct, idVendor;\n+\n+ (*device)->GetDeviceClass (device, &bDeviceClass);\n+ (*device)->GetDeviceProduct (device, &idProduct);\n+ (*device)->GetDeviceVendor (device, &idVendor);\n+\n+ priv = (struct darwin_device_priv *)dev->os_priv;\n+\n+ \/* try to open the device (we can usually continue even if this fails) *\/\n+ is_open = ((*device)->USBDeviceOpenSeize(device) == kIOReturnSuccess);\n+\n+ \/**** retrieve device descriptor ****\/\n+ do {\n+ \/* Set up request for device descriptor *\/\n+ memset (&(priv->dev_descriptor), 0, sizeof(IOUSBDeviceDescriptor));\n+ req.bmRequestType = USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);\n+ req.bRequest = kUSBRqGetDescriptor;\n+ req.wValue = kUSBDeviceDesc << 8;\n+ req.wIndex = 0;\n+ req.wLength = sizeof(priv->dev_descriptor);\n+ req.pData = &(priv->dev_descriptor);\n+\n+ \/* according to Apple's documentation the device must be open for DeviceRequest but we may not be able to open some\n+ * devices and Apple's USB Prober doesn't bother to open the device before issuing a descriptor request. Still,\n+ * to follow the spec as closely as possible, try opening the device *\/\n+\n+ ret = (*(device))->DeviceRequest (device, &req);\n+\n+ if (kIOReturnOverrun == ret && kUSBDeviceDesc == priv->dev_descriptor.bDescriptorType)\n+ \/* received an overrun error but we still received a device descriptor *\/\n+ ret = kIOReturnSuccess;\n+\n+ if (kIOReturnSuccess == ret && (0 == priv->dev_descriptor.idProduct ||\n+\t\t\t\t 0 == priv->dev_descriptor.bNumConfigurations ||\n+\t\t\t\t 0 == priv->dev_descriptor.bcdUSB)) {\n+ \/* work around for incorrectly configured devices *\/\n+ if (try_reconfigure && is_open) {\n+\tusbi_dbg(\"descriptor appears to be invalid. resetting configuration before trying again...\");\n+\n+\t\/* set the first configuration *\/\n+\t(*device)->SetConfiguration(device, 1);\n+\n+\t\/* don't try to reconfigure again *\/\n+\ttry_reconfigure = 0;\n+ }\n+\n+ ret = kIOUSBPipeStalled;\n+ }\n+\n+ if (kIOReturnSuccess != ret && is_open && try_unsuspend) {\n+ \/* device may be suspended. unsuspend it and try again *\/\n+#if DeviceVersion >= 320\n+ UInt32 info;\n+\n+ \/* IOUSBFamily 320+ provides a way to detect device suspension but earlier versions do not *\/\n+ (void)(*device)->GetUSBDeviceInformation (device, &info);\n+\n+ try_unsuspend = info & (1 << kUSBInformationDeviceIsSuspendedBit);\n+#endif\n+\n+ if (try_unsuspend) {\n+\t\/* resume the device *\/\n+\tret2 = (*device)->USBDeviceSuspend (device, 0);\n+\tif (kIOReturnSuccess != ret2) {\n+\t \/* prevent log spew from poorly behaving devices. this indicates the\n+\t os actually had trouble communicating with the device *\/\n+\t usbi_dbg(\"could not retrieve device descriptor. failed to unsuspend: %s\",darwin_error_str(ret2));\n+\t} else\n+\t unsuspended = 1;\n+\n+\ttry_unsuspend = 0;\n+ }\n+ }\n+\n+ if (kIOReturnSuccess != ret) {\n+ usbi_dbg(\"kernel responded with code: 0x%08x. sleeping for %d ms before trying again\", ret, delay\/1000);\n+ \/* sleep for a little while before trying again *\/\n+ usleep (delay);\n+ }\n+ } while (kIOReturnSuccess != ret && retries--);\n+\n+ if (unsuspended)\n+ \/* resuspend the device *\/\n+ (void)(*device)->USBDeviceSuspend (device, 1);\n+\n+ if (is_open)\n+ (void) (*device)->USBDeviceClose (device);\n+\n+ if (ret != kIOReturnSuccess) {\n+ \/* a debug message was already printed out for this error *\/\n+ if (LIBUSB_CLASS_HUB == bDeviceClass)\n+ usbi_dbg (\"could not retrieve device descriptor %.4x:%.4x: %s. skipping device\", idVendor, idProduct, darwin_error_str (ret));\n+ else\n+ usbi_warn (ctx, \"could not retrieve device descriptor %.4x:%.4x: %s. skipping device\", idVendor, idProduct, darwin_error_str (ret));\n+\n+ return -1;\n+ }\n+\n+ usbi_dbg (\"device descriptor:\");\n+ usbi_dbg (\" bDescriptorType: 0x%02x\", priv->dev_descriptor.bDescriptorType);\n+ usbi_dbg (\" bcdUSB: 0x%04x\", priv->dev_descriptor.bcdUSB);\n+ usbi_dbg (\" bDeviceClass: 0x%02x\", priv->dev_descriptor.bDeviceClass);\n+ usbi_dbg (\" bDeviceSubClass: 0x%02x\", priv->dev_descriptor.bDeviceSubClass);\n+ usbi_dbg (\" bDeviceProtocol: 0x%02x\", priv->dev_descriptor.bDeviceProtocol);\n+ usbi_dbg (\" bMaxPacketSize0: 0x%02x\", priv->dev_descriptor.bMaxPacketSize0);\n+ usbi_dbg (\" idVendor: 0x%04x\", priv->dev_descriptor.idVendor);\n+ usbi_dbg (\" idProduct: 0x%04x\", priv->dev_descriptor.idProduct);\n+ usbi_dbg (\" bcdDevice: 0x%04x\", priv->dev_descriptor.bcdDevice);\n+ usbi_dbg (\" iManufacturer: 0x%02x\", priv->dev_descriptor.iManufacturer);\n+ usbi_dbg (\" iProduct: 0x%02x\", priv->dev_descriptor.iProduct);\n+ usbi_dbg (\" iSerialNumber: 0x%02x\", priv->dev_descriptor.iSerialNumber);\n+ usbi_dbg (\" bNumConfigurations: 0x%02x\", priv->dev_descriptor.bNumConfigurations);\n+\n+ \/* catch buggy hubs (which appear to be virtual). Apple's own USB prober has problems with these devices. *\/\n+ if (libusb_le16_to_cpu (priv->dev_descriptor.idProduct) != idProduct) {\n+ \/* not a valid device *\/\n+ usbi_warn (ctx, \"idProduct from iokit (%04x) does not match idProduct in descriptor (%04x). skipping device\",\n+\t idProduct, libusb_le16_to_cpu (priv->dev_descriptor.idProduct));\n+ return -1;\n+ }\n+\n+ return 0;\n+}\n+\n static int process_new_device (struct libusb_context *ctx, usb_device_t **device, UInt32 locationID, struct discovered_devs **_discdevs) {\n struct darwin_device_priv *priv;\n struct libusb_device *dev;\n struct discovered_devs *discdevs;\n- UInt16 address, idVendor, idProduct;\n- UInt8 bDeviceClass, bDeviceSubClass;\n- IOUSBDevRequest req;\n+ UInt16 address;\n int ret = 0, need_unref = 0;\n \n do {\n@@ -542,80 +672,24 @@\n \n priv = (struct darwin_device_priv *)dev->os_priv;\n \n- \/* Set up request for device descriptor *\/\n- req.bmRequestType = USBmakebmRequestType(kUSBIn, kUSBStandard, kUSBDevice);\n- req.bRequest = kUSBRqGetDescriptor;\n- req.wValue = kUSBDeviceDesc << 8;\n- req.wIndex = 0;\n- req.wLength = sizeof(IOUSBDeviceDescriptor);\n- req.pData = &(priv->dev_descriptor);\n-\n- (*(device))->GetDeviceAddress (device, (USBDeviceAddress *)&address);\n- (*(device))->GetDeviceProduct (device, &idProduct);\n- (*(device))->GetDeviceVendor (device, &idVendor);\n- (*(device))->GetDeviceClass (device, &bDeviceClass);\n- (*(device))->GetDeviceSubClass (device, &bDeviceSubClass);\n-\n- \/**** retrieve device descriptors ****\/\n- \/* according to Apple's documentation the device must be open for DeviceRequest but we may not be able to open some\n- * devices and Apple's USB Prober doesn't bother to open the device before issuing a descriptor request *\/\n- ret = (*(device))->DeviceRequest (device, &req);\n- if (ret != kIOReturnSuccess) {\n- int try_unsuspend = 1;\n-#if DeviceVersion >= 320\n- UInt32 info;\n-\n- \/* device may be suspended. unsuspend it and try again *\/\n- \/* IOUSBFamily 320+ provides a way to detect device suspension but earlier versions do not *\/\n- (void)(*device)->GetUSBDeviceInformation (device, &info);\n-\n- try_unsuspend = info & (1 << kUSBInformationDeviceIsSuspendedBit);\n-#endif\n-\n- \/* the device should be open before to device is unsuspended *\/\n- (void) (*device)->USBDeviceOpenSeize(device);\n-\n- if (try_unsuspend) {\n-\t\/* resume the device *\/\n-\t(void)(*device)->USBDeviceSuspend (device, 0);\n-\n-\tret = (*(device))->DeviceRequest (device, &req);\n-\n-\t\/* resuspend the device *\/\n-\t(void)(*device)->USBDeviceSuspend (device, 1);\n- }\n-\n- (*device)->USBDeviceClose (device);\n- }\n-\n- if (ret != kIOReturnSuccess) {\n- usbi_warn (ctx, \"could not retrieve device descriptor: %s. skipping device\", darwin_error_str (ret));\n- ret = -1;\n+ (*device)->GetDeviceAddress (device, (USBDeviceAddress *)&address);\n+\n+ ret = darwin_cache_device_descriptor (ctx, dev, device);\n+ if (ret < 0)\n break;\n- }\n-\n- \/**** end: retrieve device descriptors ****\/\n-\n- \/* catch buggy hubs (which appear to be virtual). Apple's own USB prober has problems with these devices. *\/\n- if (libusb_le16_to_cpu (priv->dev_descriptor.idProduct) != idProduct) {\n- \/* not a valid device *\/\n- usbi_warn (ctx, \"idProduct from iokit (%04x) does not match idProduct in descriptor (%04x). skipping device\",\n-\t\t idProduct, libusb_le16_to_cpu (priv->dev_descriptor.idProduct));\n- ret = -1;\n- break;\n- }\n-\n- dev->bus_number = locationID >> 24;\n- dev->device_address = address;\n \n \/* check current active configuration (and cache the first configuration value-- which may be used by claim_interface) *\/\n ret = darwin_check_configuration (ctx, dev, device);\n if (ret < 0)\n break;\n \n+ dev->bus_number = locationID >> 24;\n+ dev->device_address = address;\n+\n \/* save our location, we'll need this later *\/\n priv->location = locationID;\n- snprintf(priv->sys_path, 20, \"%03i-%04x-%04x-%02x-%02x\", address, idVendor, idProduct, bDeviceClass, bDeviceSubClass);\n+ snprintf(priv->sys_path, 20, \"%03i-%04x-%04x-%02x-%02x\", address, priv->dev_descriptor.idVendor, priv->dev_descriptor.idProduct,\n+\t priv->dev_descriptor.bDeviceClass, priv->dev_descriptor.bDeviceSubClass);\n \n ret = usbi_sanitize_device (dev);\n if (ret < 0)\n"} {"commit":"c3f343a818c7be07d08fc82ab0da4e101481330d","subject":"another attempt to resolve the crash, happening during processing of \"unregistered\" signal by already destroyed object.","message":"another attempt to resolve the crash, happening during processing of \"unregistered\" signal by already destroyed object.\n","repos":"maemo-foss\/accounts-sso-signon-glib,plotters\/accounts-sso.libsignon-glib,maemo-foss\/accounts-sso-signon-glib,plotters\/accounts-sso.libsignon-glib,plotters\/accounts-sso.libsignon-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsignon-glib\/signon-auth-session.c\n+++ libsignon-glib\/signon-auth-session.c\n@@ -156,8 +156,6 @@\n \n if (priv->proxy)\n {\n- com_nokia_SingleSignOn_AuthSession_object_unref (priv->proxy, &err);\n-\n dbus_g_proxy_disconnect_signal (priv->proxy,\n \"stateChanged\",\n G_CALLBACK (auth_session_state_changed_cb),\n@@ -167,7 +165,9 @@\n G_CALLBACK (auth_session_remote_object_destroyed_cb),\n self);\n \n+ com_nokia_SingleSignOn_AuthSession_object_unref (priv->proxy, &err);\n g_object_unref (priv->proxy);\n+\n priv->proxy = NULL;\n }\n \n"} {"commit":"6760b693645187a73ec6b4acdbc53ab85008221d","subject":"Delete lagrangepolynomial.h","message":"Delete lagrangepolynomial.h","repos":"MireaVT-11\/Zuev_VV-Program","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lagrangepolynomial.h\n+++ lagrangepolynomial.h\n@@ -1,380 +0,0 @@\n-#ifndef LAGRANGEPOLYNOMIAL_H\n-#define LAGRANGEPOLYNOMIAL_H\r\n-\r\n-#include <iostream>\r\n-#include <vector>\r\n-#include <map>\r\n-#include <algorithm>\r\n-#include <fstream>\r\n-\r\n-template<typename T>\r\n-class LagrangePolynomial {\r\n-public:\r\n-\t\/\/ LagrangePolynomial() = default;\r\n-\tLagrangePolynomial(std::size_t numPoints);\r\n-\r\n-\tT operator()(T x);\r\n-\r\n-\tvoid compute();\r\n-\tLagrangePolynomial &addPoint(T x, T y);\r\n-\r\n-private:\r\n-\tstruct Point {\r\n-\t\tT x;\r\n-\t\tT y;\r\n-\t};\r\n-\r\n-\tstd::vector<Point>points;\r\n-};\r\n-\r\n-template<typename T>\r\n-LagrangePolynomial<T>::LagrangePolynomial(std::size_t numPoints) {\r\n-\tpoints.reserve(numPoints);\r\n-}\r\n-\r\n-template<typename T>\r\n-T LagrangePolynomial<T>:: operator()(T x) {\r\n-\tT result = T();\r\n-\tT prod;\r\n-\tfor (std::size_t k = 0; k < points.size(); ++k) {\r\n-\t\tprod = T(1);\r\n-\t\tfor (std::size_t i = 0; i < k; ++i)\r\n-\t\t\tprod *= x - points[i].x;\r\n-\t\tfor (std::size_t i = k + 1; i < points.size(); ++i)\r\n-\t\t\tprod *= x - points[i].x;\r\n-\t\tresult += points[k].y * prod;\r\n-\t}\r\n-\treturn result;\r\n-}\r\n-\r\n-template<typename T>\r\n-void LagrangePolynomial<T>::compute() {\r\n-\tT prod;\r\n-\tfor (std::size_t k = 0; k < points.size(); ++k) {\r\n-\t\tprod = T(1);\r\n-\t\tfor (std::size_t i = 0; i < k; ++i)\r\n-\t\t\tprod *= points[k].x - points[i].x;\r\n-\t\tfor (std::size_t i = k + 1; i < points.size(); ++i)\r\n-\t\t\tprod *= points[k].x - points[i].x;\r\n-\t\tpoints[k].y \/= prod;\r\n-\t}\r\n-}\r\n-\r\n-template<typename T>\r\n-LagrangePolynomial<T> &LagrangePolynomial<T>::addPoint(T x, T y) {\r\n-\tPoint p = {x, y};\r\n-\tpoints.push_back(p);\r\n-\treturn *this;\r\n-}\r\n-\r\n-template<typename T, std::size_t POWER>\r\n-class PartialLagrangePolynomial;\r\n-\r\n-template<typename T>\r\n-class PartialLagrangePolynomial<T, 2u> {\r\n-public:\r\n-\t\/\/ LagrangePolynomial() = default;\r\n-\tPartialLagrangePolynomial(std::size_t numPoints);\r\n-\r\n-\tT operator()(T x);\r\n-\r\n-\tvoid compute();\r\n-\tPartialLagrangePolynomial &addPoint(T x, T y);\r\n-\r\n-private:\r\n-\tstruct Point {\r\n-\t\tT x;\r\n-\t\tT y;\r\n-\r\n-\t\tbool operator < (const Point &p) {\r\n-\t\t\treturn x < p.x;\r\n-\t\t}\r\n-\t};\r\n-\r\n-\tstd::vector<Point>points;\r\n-\tstd::vector<LagrangePolynomial<T> >lps;\r\n-};\r\n-\r\n-template<typename T>\r\n-PartialLagrangePolynomial<T, 2u>::PartialLagrangePolynomial(std::size_t numPoints) {\r\n-\tpoints.reserve(numPoints);\r\n-\tlps.reserve(numPoints - 1);\r\n-}\r\n-\r\n-template<typename T>\r\n-T PartialLagrangePolynomial<T, 2u>:: operator()(T x) {\r\n-\tfor (std::size_t i = 1; i < points.size() - 1; ++i)\r\n-\t\tif (x < points[i].x)\r\n-\t\t\treturn lps[i - 1](x);\r\n-\treturn lps.back()(x);\r\n-}\r\n-\r\n-template<typename T>\r\n-void PartialLagrangePolynomial<T, 2u>::compute() {\r\n-\tif (points.size() < 3)\r\n-\t\tthrow(\"There is too few points\");\r\n-\tstd::sort(points.begin(), points.end());\r\n-\tlps.resize(points.size() - 2, T());\r\n-\tfor (std::size_t k = 0; k < points.size() - 2; ++k) {\r\n-\t\tfor (std::size_t i = k; i < k + 3; ++i)\r\n-\t\t\tlps[k].addPoint(points[i].x, points[i].y);\r\n-\t\tlps[k].compute();\r\n-\t}\r\n-\t\/\/ lps[ points.size()-2 ] = lps[ points.size()-3 ];\r\n-}\r\n-\r\n-template<typename T>\r\n-PartialLagrangePolynomial<T, 2u> &PartialLagrangePolynomial<T, 2u>::addPoint(T x, T y) {\r\n-\tPoint p = {x, y};\r\n-\tpoints.push_back(p);\r\n-\treturn *this;\r\n-}\r\n-\r\n-template<typename T>\r\n-class PartialLagrangePolynomial<T, 3u> {\r\n-public:\r\n-\t\/\/ LagrangePolynomial() = default;\r\n-\tPartialLagrangePolynomial(std::size_t numPoints);\r\n-\r\n-\tT operator()(T x);\r\n-\r\n-\tvoid compute();\r\n-\tPartialLagrangePolynomial &addPoint(T x, T y);\r\n-\r\n-private:\r\n-\tstruct Point {\r\n-\t\tT x;\r\n-\t\tT y;\r\n-\r\n-\t\tbool operator < (const Point &p) const {\r\n-\t\t\treturn x < p.x;\r\n-\t\t}\r\n-\t};\r\n-\r\n-\tstd::vector<Point>points;\r\n-\tstd::vector<LagrangePolynomial<T> >lps;\r\n-};\r\n-\r\n-template<typename T>\r\n-PartialLagrangePolynomial<T, 3u>::PartialLagrangePolynomial(std::size_t numPoints) {\r\n-\tpoints.reserve(numPoints);\r\n-\tlps.reserve(numPoints - 1);\r\n-}\r\n-\r\n-template<typename T>\r\n-T PartialLagrangePolynomial<T, 3u>:: operator()(T x) {\r\n-\tfor (std::size_t i = 2; i < points.size() - 1; ++i)\r\n-\t\tif (x < points[i].x)\r\n-\t\t\treturn lps[i - 2](x);\r\n-\treturn lps.back()(x);\r\n-}\r\n-\r\n-template<typename T>\r\n-void PartialLagrangePolynomial<T, 3u>::compute() {\r\n-\tif (points.size() < 4)\r\n-\t\tthrow(\"There is too few points\");\r\n-\tstd::sort(points.begin(), points.end());\r\n-\tlps.resize(points.size() - 3, T());\r\n-\tfor (std::size_t k = 1; k < points.size() - 2; ++k) {\r\n-\t\tfor (std::size_t i = k - 1; i < k + 3; ++i)\r\n-\t\t\tlps[k - 1].addPoint(points[i].x, points[i].y);\r\n-\t\tlps[k - 1].compute();\r\n-\t}\r\n-\t\/\/ lps[ 0 ] = lps[ 1 ];\r\n-\t\/\/ lps[ points.size()-2 ] = lps[ points.size()-3 ];\r\n-}\r\n-\r\n-template<typename T>\r\n-PartialLagrangePolynomial<T, 3u> &PartialLagrangePolynomial<T, 3u>::addPoint(T x, T y) {\r\n-\tPoint p = {x, y};\r\n-\tpoints.push_back(p);\r\n-\treturn *this;\r\n-}\r\n-\r\n-\/\/ --------------------------------------------------------------------------------------------------\r\n-\/\/ \r\n-template<typename T1, typename T2, typename T3, typename T4>\r\n-void tridiagonalMatrixAlgorithm(T1 &aIn, T2 &bIn, T3 &cIn, T4 &fIn_xOut, std::size_t N) {\r\n-\tusing namespace std;\r\n-\tcIn[0] = -cIn[0] \/ bIn[0];\r\n-\taIn[0] = fIn_xOut[0] \/ bIn[0];\r\n-\tfor (size_t i = 1; i < N - 1; ++i) {\r\n-\t\tcIn[i] = -cIn[i] \/ (aIn[i] * cIn[i - 1] + bIn[i]);\r\n-\t\taIn[i] = (fIn_xOut[i] - aIn[i] * aIn[i - 1]) \/ (aIn[i] * cIn[i - 1] + bIn[i]);\r\n-\t}\r\n-\tfIn_xOut[N - 1] = (fIn_xOut[N - 1] - aIn[N - 1] * aIn[N - 2]) \/ (aIn[N - 1] * cIn[N - 2] + bIn[N - 1]);\r\n-\tfor (size_t i = N - 2; i != static_cast<size_t>(-1); --i)\r\n-\t\tfIn_xOut[i] = cIn[i] * fIn_xOut[i + 1] + aIn[i];\r\n-}\r\n-\r\n-template<typename T1, typename T2, typename T3, typename T4, std::size_t N1, std::size_t N2, std::size_t N3,\r\n-\tstd::size_t N4>\r\n-inline void tridiagonalMatrixAlgorithm(T1(&aIn)[N1], T2(&bIn)[N2], T3(&cIn)[N3], T4(&fIn_xOut)[N4]) {\r\n-\ttridiagonalMatrixAlgorithm(aIn, bIn, cIn, fIn_xOut, N4);\r\n-}\r\n-\r\n-\/\/ --------------------------------------------------------------------------------------------------\r\n-\/\/ () \r\n-template<typename T>\r\n-class HornerScheme {\r\n-public:\r\n-\tHornerScheme();\r\n-\r\n-\ttemplate<typename C>\r\n-\tHornerScheme& setCoeffs(C &coeffs);\r\n-\r\n-\tT operator()(T x);\r\n-\r\n-private:\r\n-\tstd::vector<T>coeffs;\r\n-};\r\n-\r\n-template<typename T>\r\n-inline HornerScheme<T>::HornerScheme() {\r\n-}\r\n-\r\n-template<typename T>\r\n-inline T HornerScheme<T>:: operator()(T x) {\r\n-\tT result(coeffs.back());\r\n-\tfor (std::size_t i = coeffs.size() - 2; i != -1u; --i)\r\n-\t\tresult = coeffs[i] + x * result;\r\n-\treturn result;\r\n-}\r\n-\r\n-template<typename T>\r\n-\r\n-template<typename C>\r\n-inline HornerScheme<T> &HornerScheme<T>::setCoeffs(C &coeffs) {\r\n-\tHornerScheme::coeffs.assign(coeffs.begin(), coeffs.end());\r\n-\treturn *this;\r\n-}\r\n-\r\n-\/\/ --------------------------------------------------------------------------------------------------\r\n-\/\/ -\r\n-template<typename T>\r\n-class CubicSpline {\r\n-public:\r\n-\tstruct out_of_range : exception {\r\n-\t\tconst char *what() const ; \/\/ noexcept( true ) override;\r\n-\t};\r\n-\r\n-\tstruct too_few_points : exception {\r\n-\t\tconst char *what() const ; \/\/ noexcept( true ) override;\r\n-\t};\r\n-\r\n-\tCubicSpline() {\r\n-\t}\r\n-\tCubicSpline(std::size_t size);\r\n-\r\n-\tT operator()(T x);\r\n-\r\n-\tvoid compute();\r\n-\tCubicSpline &addPoint(T x, T y);\r\n-\r\n-private:\r\n-\tstruct Point {\r\n-\t\tT x;\r\n-\t\tT y;\r\n-\r\n-\t\tbool operator < (const Point &p) const {\r\n-\t\t\treturn x < p.x;\r\n-\t\t}\r\n-\t};\r\n-\r\n-\tstd::vector<Point>points;\r\n-\tstd::map<T, std::size_t>xs;\r\n-\tstd::vector<HornerScheme<T> >hss;\r\n-};\r\n-\r\n-template<typename T>\r\n-const char *CubicSpline<T>::out_of_range::what() const \/\/ noexcept( true )\r\n-{\r\n-\treturn \"Exception in: \\n\" \"template< typename T > \\n\" \"T CubicSpline< T >::operator()( T x )\\n\\n\"\r\n-\t\t\"Exception text: \\n\" \"x is out of range \\n\\n\";\r\n-}\r\n-\r\n-template<typename T>\r\n-const char *CubicSpline<T>::too_few_points::what() const \/\/ noexcept( true )\r\n-{\r\n-\treturn \"Exception in: \\n\" \"template< typename T > \\n\" \"void CubicSpline< T >::compute() \\n\\n\" \"Exception text: \\n\"\r\n-\t\t\"There is too few points\";\r\n-}\r\n-\r\n-template<typename T>\r\n-inline CubicSpline<T>::CubicSpline(std::size_t size) {\r\n-\tpoints.reserve(size);\r\n-\thss.reserve(size);\r\n-}\r\n-\r\n-template<typename T>\r\n-inline T CubicSpline<T>:: operator()(T x) {\r\n-\tusing namespace std;\r\n-\tif (xs.begin()->first > x || (--xs.end())->first < x)\r\n-\t\tthrow(out_of_range());\r\n-\ttypename map<T, size_t>::iterator p = xs.lower_bound(x);\r\n-\tif (x < p->first)\r\n-\t\t--p;\r\n-\treturn hss[p->second](x - p->first);\r\n-}\r\n-\r\n-template<typename T>\r\n-void CubicSpline<T>::compute() {\r\n-\tusing namespace std;\r\n-\tif (points.size() < 3)\r\n-\t\tthrow(too_few_points());\r\n-\tsort(points.begin(), points.end());\r\n-\thss.resize(points.size());\r\n-\r\n-\tconst size_t size1 = points.size() - 2;\r\n-\tvector<T>a(size1);\r\n-\tvector<T>b(size1);\r\n-\tvector<T>c(size1);\r\n-\tvector<T>f(size1 + 2);\r\n-\r\n-\tT dyc;\r\n-\tT dxc;\r\n-\tT dyl = points[1].y - points[0].y;\r\n-\tT dxl = points[1].x - points[0].x;\r\n-\tfor (size_t i = 0; i < size1; ++i) {\r\n-\t\tdyc = points[i + 2].y - points[i + 1].y;\r\n-\t\tdxc = points[i + 2].x - points[i + 1].x;\r\n-\r\n-\t\ta[i] = 2. * dxl * dxl * dxc;\r\n-\t\tc[i] = dxl * dxc * dxc;\r\n-\t\tb[i] = a[i] + 4. * c[i];\r\n-\t\tf[i + 1] = 6. * (dxl * dyc - dxc * dyl);\r\n-\r\n-\t\tdxl = dxc;\r\n-\t\tdyl = dyc;\r\n-\t}\r\n-\r\n-\ttypename vector<T>::iterator f_from_1 = f.begin() + 1;\r\n-\ttridiagonalMatrixAlgorithm(a, b, c, f_from_1, size1);\r\n-\tf[0] = 0.;\r\n-\tf[size1 + 1] = 0.;\r\n-\r\n-\tvector<T>coeffs(4);\r\n-\tconst size_t size2 = points.size() - 1;\r\n-\tfor (size_t i = 0; i < size2; ++i) {\r\n-\t\tdyc = points[i + 1].y - points[i].y;\r\n-\t\tdxc = points[i + 1].x - points[i].x;\r\n-\t\tcoeffs[0] = points[i].y;\r\n-\t\tcoeffs[2] = f[i];\r\n-\t\tcoeffs[3] = (f[i + 1] - 2. * f[i]) \/ (6. * dxc);\r\n-\t\tcoeffs[1] = dyc \/ dxc - f[i] * dxc - coeffs[3] * dxc * dxc;\r\n-\t\thss[i].setCoeffs(coeffs);\r\n-\t}\r\n-\thss[size2].setCoeffs(coeffs);\r\n-\tfor (size_t i = 0; i < points.size(); ++i)\r\n-\t\txs[points[i].x] = i;\r\n-\tpoints.clear();\r\n-}\r\n-\r\n-template<typename T>\r\n-inline CubicSpline<T> &CubicSpline<T>::addPoint(T x, T y) {\r\n-\tPoint p = {x, y};\r\n-\tpoints.push_back(p);\r\n-\treturn *this;\r\n-}\r\n-\r\n-#endif \/\/ LAGRANGEPOLYNOMIAL_H\n"} {"commit":"b1f47fe3a40fe83bab78333059d64ded85631e05","subject":"Scrobble securely.","message":"Scrobble securely.","repos":"HermesApp\/Hermes,HermesApp\/Hermes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ImportedSources\/FMEngine\/FMEngine.h\n+++ ImportedSources\/FMEngine\/FMEngine.h\n@@ -11,7 +11,7 @@\n \n #define _LASTFM_API_KEY_ @\"31fc44bcd6e21954afb404d179a09e9a\"\n #define _LASTFM_SECRETK_ @\"a146429ed54f25b8bf9d5ca3cc423260\"\n-#define _LASTFM_BASEURL_ @\"http:\/\/ws.audioscrobbler.com\/2.0\/\"\n+#define _LASTFM_BASEURL_ @\"https:\/\/ws.audioscrobbler.com\/2.0\/\"\n \n \/\/ Comment the next line to use XML\n #define _USE_JSON_ 1\n"} {"commit":"a67a3b54dcde8cdffef49a552ce865b708fc4cf6","subject":"added reversetraversal_List.c","message":"added reversetraversal_List.c\n","repos":"applecool\/Practice,applecool\/Practice,applecool\/Practice,applecool\/Practice,applecool\/Practice,applecool\/Practice,applecool\/Practice","returncode":1,"stderr":"error: pathspec 'C\/reversetraversal_list.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- C\/reversetraversal_list.c\n+++ C\/reversetraversal_list.c\n@@ -0,0 +1,61 @@\n+#include<stdio.h>\n+struct node\n+\t{\n+\t\tint data;\n+\t\tstruct node *link;\n+\t};\n+void add(struct node**,int);\n+void display(struct node*);\n+void reverse(struct node **);\n+int main()\n+{ struct node *p;\n+p=NULL;\n+add(&p,2);\n+add(&p,-1);\n+add(&p,27);\n+display(p);\n+reverse(&p);\n+display(p);\n+return 0;\n+}\n+void add(struct node **q,int num)\n+{ struct node *r,*temp=*q;\n+r=(struct node*)malloc(sizeof(struct node));\n+r->data=num;\n+\tif(*q==NULL||(*q)->data>num)\n+\t{\n+\t*q=r;\n+\t(*q)->link=temp;\n+ }\n+\telse\n+\t{\twhile(temp!=NULL)\n+\t\t{\n+\t\tif(temp->data<=num &&(temp->link==NULL||temp->link->data>num))\n+\t\t{\tr->link=temp->link;\n+\t\t\ttemp->link=r;\n+\t\t\treturn;\n+\t\t}\n+\t\ttemp=temp->link;\n+\t\t}\n+\t}\n+}\n+void display(struct node *q)\n+{\twhile(q!=NULL)\n+\t{\t\n+ printf(\"%d\\n\",q->data);\n+\t q=q->link;\n+\t}\n+}\n+void reverse(struct node **x)\n+{ struct node *q,*r,*s;\n+q=*x;\n+r=NULL;\n+while(q!=NULL)\n+{ s=r;\n+ r=q;\n+ q=q->link;\n+ r->link=s;\n+}\n+*x=r;\n+}\n+\n"} {"commit":"7f8afb7d28acb1e04b39bd6668a49ab31f06e972","subject":"changed comm. protocol to mqtt","message":"changed comm. protocol to mqtt\n","repos":"totosan\/DevOpsIoT,totosan\/DevOpsIoT,totosan\/DevOpsIoT,totosan\/DevOpsIoT","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- IoTSolution\/app\/simplesample_http.c\n+++ IoTSolution\/app\/simplesample_http.c\n@@ -17,7 +17,7 @@\n #include \"azure_c_shared_utility\/platform.h\"\n #include \"serializer.h\"\n #include \"iothub_client_ll.h\"\n-#include \"iothubtransporthttp.h\"\n+#include \"iothubtransportmqtt.h\"\n #endif\n \n \/* \n@@ -350,7 +350,7 @@\n {\n int receiveContext = 0;\n printf(\"Try to connect to IoT Hub with cnnStr %s\\r\\n\", cnnStr);\n- IOTHUB_CLIENT_LL_HANDLE iotHubClientHandle = IoTHubClient_LL_CreateFromConnectionString(cnnStr, HTTP_Protocol);\n+ IOTHUB_CLIENT_LL_HANDLE iotHubClientHandle = IoTHubClient_LL_CreateFromConnectionString(cnnStr, MQTT_Protocol);\n \n int avgBatteryLevel = 10;\n srand((unsigned int)time(NULL));\n@@ -373,7 +373,8 @@\n {\n printf(\"failure to set option \\\"MinimumPollingTime\\\"\\r\\n\");\n }\n-\n+ printf(\"Creating model instance..\\r\\n\");\n+ \n myTestOMeter = CREATE_MODEL_INSTANCE(TestDataNS, TestOMeter);\n if (myTestOMeter == NULL)\n {\n@@ -381,7 +382,8 @@\n }\n else\n {\n-\n+ printf(\"setup direct method callback...\\r\\n\");\n+ \n if (IoTHubClient_LL_SetDeviceMethodCallback(iotHubClientHandle, DeviceMethodCallback, myTestOMeter) != IOTHUB_CLIENT_OK)\n {\n (void)printf(\"ERROR: IoTHubClient_LL_SetDeviceMethodCallback..........FAILED!\\r\\n\");\n"} {"commit":"65b254e8c02a52be4fa3af47e62c19eb8dab4169","subject":"remove debugging leftovers","message":"remove debugging leftovers\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"e19ea55783bc3e1af5bc6a51775ed41b638aab10","subject":"Only OPENSSL_free() non-NULL pointers.","message":"Only OPENSSL_free() non-NULL pointers.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"07a76aacfbdb8ac1d1e19c18eaacf41b87cee1a5","subject":"cogl-slip-stack: Store clip window rect entries in Cogl coordinates","message":"cogl-slip-stack: Store clip window rect entries in Cogl coordinates\n\nWhen glScissor is called it needs to pass coordinates in GL's\ncoordinate space where the origin is the bottom left. Previously this\nconversion was done before storing the window rect in the clip\nstack. However this might make it more difficult if we want to be able\nto grab a handle to a clip stack and use it in different circumstances\nlater. This patch moves the coordinate conversion to inside the clip\nstate flushing code.\n","repos":"gcampax\/cogl,djdeath\/cogl,gcampax\/cogl,djdeath\/cogl-android,Distrotech\/cogl,gcampax\/cogl,gcampax\/cogl,djdeath\/cogl,Distrotech\/cogl,djdeath\/cogl-android,djdeath\/cogl,djdeath\/cogl-android,collects\/cogl,spatulasnout\/cogl,Distrotech\/cogl,Distrotech\/cogl,spatulasnout\/cogl,collects\/cogl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cogl\/cogl-clip-stack.c\n+++ cogl\/cogl-clip-stack.c\n@@ -128,7 +128,8 @@\n {\n CoglClipStackEntry _parent_data;\n \n- \/* The window space rectangle for this clip *\/\n+ \/* The window space rectangle for this clip. This is stored in\n+ Cogl's coordinate space (ie, 0,0 is the top left) *\/\n int x0;\n int y0;\n int x1;\n@@ -409,7 +410,6 @@\n CoglHandle framebuffer;\n CoglClipStackState *clip_state;\n CoglClipStack *stack;\n- int framebuffer_height;\n CoglClipStackEntryWindowRect *entry;\n \n _COGL_GET_CONTEXT (ctx, NO_RETVAL);\n@@ -423,31 +423,14 @@\n \n stack = clip_state->stacks->data;\n \n- framebuffer_height = _cogl_framebuffer_get_height (framebuffer);\n-\n entry = _cogl_clip_stack_push_entry (stack,\n sizeof (CoglClipStackEntryWindowRect),\n COGL_CLIP_STACK_WINDOW_RECT);\n \n- \/* We store the entry coordinates in OpenGL window coordinate space and so\n- * because Cogl defines the window origin to be top left but OpenGL defines\n- * it as bottom left we may need to convert the incoming coordinates.\n- *\n- * NB: Cogl forces all offscreen rendering to be done upside down so in this\n- * case no conversion is needed.\n- *\/\n entry->x0 = x_offset;\n entry->x1 = x_offset + width;\n- if (cogl_is_offscreen (framebuffer))\n- {\n- entry->y0 = y_offset;\n- entry->y1 = y_offset + height;\n- }\n- else\n- {\n- entry->y0 = framebuffer_height - y_offset - height;\n- entry->y1 = framebuffer_height - y_offset;\n- }\n+ entry->y0 = y_offset;\n+ entry->y1 = y_offset + height;\n \n clip_state->stack_dirty = TRUE;\n }\n@@ -835,14 +818,38 @@\n if (using_clip_planes)\n enable_clip_planes ();\n \n- if (scissor_x0 >= scissor_x1 || scissor_y0 >= scissor_y1)\n- scissor_x0 = scissor_y0 = scissor_x1 = scissor_y1 = 0;\n-\n if (!(scissor_x0 == 0 && scissor_y0 == 0 &&\n scissor_x1 == G_MAXINT && scissor_y1 == G_MAXINT))\n {\n+ int scissor_y_start;\n+\n+ if (scissor_x0 >= scissor_x1 || scissor_y0 >= scissor_y1)\n+ scissor_x0 = scissor_y0 = scissor_x1 = scissor_y1 = scissor_y_start = 0;\n+ else\n+ {\n+ CoglHandle framebuffer = _cogl_get_framebuffer ();\n+\n+ \/* We store the entry coordinates in Cogl coordinate space\n+ * but OpenGL requires the window origin to be the bottom\n+ * left so we may need to convert the incoming coordinates.\n+ *\n+ * NB: Cogl forces all offscreen rendering to be done upside\n+ * down so in this case no conversion is needed.\n+ *\/\n+\n+ if (cogl_is_offscreen (framebuffer))\n+ scissor_y_start = scissor_y0;\n+ else\n+ {\n+ int framebuffer_height =\n+ _cogl_framebuffer_get_height (framebuffer);\n+\n+ scissor_y_start = framebuffer_height - scissor_y1;\n+ }\n+ }\n+\n GE (glEnable (GL_SCISSOR_TEST));\n- GE (glScissor (scissor_x0, scissor_y0,\n+ GE (glScissor (scissor_x0, scissor_y_start,\n scissor_x1 - scissor_x0,\n scissor_y1 - scissor_y0));\n }\n"} {"commit":"8f857ae5d3794c72cd16878bebb66f9f29a3909a","subject":"libobjc2: Change sel_getUid to just call sel_registerName (compatible with OS X 10.0 onwards)","message":"libobjc2: Change sel_getUid to just call sel_registerName (compatible with OS X 10.0 onwards)\n","repos":"darlinghq\/darling-libobjc2,crystax\/android-vendor-libobjc2,gnustep\/libobjc2,darlinghq\/darling-libobjc2,crystax\/android-vendor-libobjc2,davidchisnall\/libobjc2,gnustep\/libobjc2,ngrewe\/libobjc2,ngrewe\/libobjc2,davidchisnall\/libobjc2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- selector_table.c\n+++ selector_table.c\n@@ -311,7 +311,7 @@\n \n SEL sel_getUid(const char *selName)\n {\n-\treturn selector_lookup(selName, 0);\n+\treturn sel_registerName(selName);\n }\n \n BOOL sel_isEqual(SEL sel1, SEL sel2)\n"} {"commit":"03828bef6c5f37f031225089bd341eb2caae3e08","subject":"fix leak","message":"fix leak\n","repos":"fredrik-johansson\/flint2,wbhart\/flint2,wbhart\/flint2,fredrik-johansson\/flint2,fredrik-johansson\/flint2,wbhart\/flint2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- fmpz_mpoly\/univar.c\n+++ fmpz_mpoly\/univar.c\n@@ -313,6 +313,13 @@\n bits = _fmpz_vec_max_bits(max_fields, ctx->minfo->nfields);\n bits = FLINT_MAX(MPOLY_MIN_BITS, bits + 1);\n bits = mpoly_fix_bits(bits, ctx->minfo);\n+\n+ for (i = 0; i < ctx->minfo->nfields; i++)\n+ {\n+ fmpz_clear(gen_fields + i);\n+ fmpz_clear(tmp_fields + i);\n+ fmpz_clear(max_fields + i);\n+ }\n \n \/* pack everything into bits *\/\n N = mpoly_words_per_exp(bits, ctx->minfo);\n"} {"commit":"0dd2363e1db447bdc4188cf89e8ca7842b265a29","subject":"Removed comment parameter from macro.","message":"Removed comment parameter from macro.\n","repos":"morethanlogic\/mtl-ios-utils","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Classes\/mtlLocalization.h\n+++ Classes\/mtlLocalization.h\n@@ -9,7 +9,7 @@\n \n #import <Foundation\/Foundation.h>\n \n-#define mtlLocalizedString(key, comment) [[mtlLocalization sharedInstance] localizedStringForKey:(key) value:(comment)]\n+#define mtlLocalizedString(key) [[mtlLocalization sharedInstance] localizedStringForKey:(key) value:(key)]\n \n \/\/--------------------------------------------------------------\n \/\/--------------------------------------------------------------\n"} {"commit":"f55552a9d4fe96695f6c6c5edd08b7eab4f04ff4","subject":"otp_api: wrap zmsg with socket descriptor, return responses to HTTP clients","message":"otp_api: wrap zmsg with socket descriptor, return responses to HTTP clients\n","repos":"bliksemlabs\/rrrr","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- otp_api.c\n+++ otp_api.c\n@@ -25,6 +25,7 @@\n #include <czmq.h>\n #include \"util.h\"\n #include \"config.h\"\n+#include \"router.h\"\n \n #define OK_TEXT_PLAIN \"HTTP\/1.0 200 OK\\nContent-Type:text\/plain\\n\\n\"\n #define ERROR_404 \"HTTP\/1.0 404 Not Found\\nContent-Type:text\/plain\\n\\nFOUR ZERO FOUR\\n\"\n@@ -125,7 +126,7 @@\n POLLIN tells us that \"data is available\", which actually means \"you can call read on this socket without blocking\".\n If read\/recv then returns 0 bytes, that indicates that the socket has been closed.\n *\/\n-static void read_input (uint32_t nc) {\n+static bool read_input (uint32_t nc) {\n struct buffer *b = &(buffers[nc]);\n int conn_sd = conn_items[nc].fd;\n char *c = b->buf + b->size; \/\/ pointer to the first available character in the buffer\n@@ -136,12 +137,12 @@\n if (received == 0) {\n printf (\"socket %d was closed\\n\", nc);\n remove_conn_later (nc);\n- return;\n+ return false;\n }\n b->size += received;\n if (b->size >= BUFLEN) {\n printf (\"HTTP request too long for buffer.\\n\");\n- return;\n+ return false;\n }\n printf (\"received: %s \\n\", c);\n printf (\"buffer is now: %s \\n\", b->buf);\n@@ -153,7 +154,12 @@\n break;\n }\n }\n- if ( ! eol) return;\n+ return eol;\n+}\n+\n+static void send_request (int nc, void *broker_socket) {\n+ struct buffer *b = &(buffers[nc]);\n+ uint32_t conn_sd = conn_items[nc].fd;\n char *token = strtok (b->buf, \" \");\n if (token == NULL) {\n printf (\"request contained no verb \\n\");\n@@ -173,17 +179,18 @@\n printf (\"request contained no query string \\n\");\n goto cleanup;\n }\n- \/\/ at this point, once we have the request, we could remove the poll item while keeping the file descriptor open.\n- qstring++;\n- char out[BUFLEN];\n- strcpy (out, OK_TEXT_PLAIN);\n- send (conn_sd, out, strlen(out), 0); \n- strcpy (out, qstring);\n- send (conn_sd, out, strlen(out), 0);\n- close (conn_sd);\n+ router_request_t req;\n+ router_request_initialize (&req);\n+ router_request_randomize (&req);\n+ zmsg_t *msg = zmsg_new ();\n+ zmsg_pushmem (msg, &req, sizeof(req));\n+ \/\/ prefix the request with the socket descriptor for use upon reply\n+ zmsg_pushmem (msg, &conn_sd, sizeof(conn_sd)); \n+ zmsg_send (&msg, broker_socket);\n+ \/\/ at this point, once we have made the request, we can remove the poll item while keeping the file descriptor open.\n remove_conn_later (nc);\n return;\n- \n+\n cleanup:\n send (conn_sd, ERROR_404, strlen(ERROR_404), 0);\n close (conn_sd);\n@@ -208,7 +215,7 @@\n \n \/* Set up \u00d8MQ socket to communicate with the RRRR broker. *\/\n zctx_t *ctx = zctx_new ();\n- void *broker_socket = zsocket_new (ctx, ZMQ_DEALER); \/\/ full async\n+ void *broker_socket = zsocket_new (ctx, ZMQ_DEALER); \/\/ full async: dealer (api side) to router (broker side)\n if (zsocket_connect (broker_socket, CLIENT_ENDPOINT)) die (\"RRRR OTP REST API server could not connect to broker.\");\n \n \/* Set up the poll_items for the main polling loop. *\/\n@@ -244,6 +251,16 @@\n }\n \/* Check if the \u00d8MQ broker socket has a message for us. If so, write it out to the client socket and close. *\/\n if (broker_item->revents & ZMQ_POLLIN) {\n+ printf (\"Activity on ZMQ broker socket. Reply is:\\n\");\n+ zmsg_t *msg = zmsg_recv (broker_socket);\n+ zframe_t *sd_frame = zmsg_pop (msg);\n+ uint32_t sd = *(zframe_data (sd_frame));\n+ char *response = zmsg_popstr (msg);\n+ printf (\"(for socket %d) %s\\n\", sd, response);\n+ send (sd, OK_TEXT_PLAIN, strlen(OK_TEXT_PLAIN), 0); \n+ send (sd, response, strlen(response), 0);\n+ close (sd);\n+ zmsg_destroy (&msg);\n n_waiting--;\n }\n \/* Check if the listening TCP\/IP socket has a queued connection. *\/\n@@ -263,13 +280,15 @@\n \/* Read from any open HTTP connections that have available input. *\/\n for (uint32_t c = 0; c < n_conn && n_waiting > 0; ++c) {\n if (conn_items[c].revents & ZMQ_POLLIN) {\n- read_input (c);\n+ bool eol = read_input (c);\n n_waiting--;\n+ if (eol) send_request (c, broker_socket);\n }\n }\n \/* Remove all connections found to be closed during this poll iteration. *\/\n remove_conn_enqueued (); \n }\n+ zctx_destroy (&ctx);\n close (server_socket);\n return (0);\n }\n"} {"commit":"66966145a5e9fd0aeafae6d4bc2851851d0fac25","subject":"tests: ibecc_cov: Simulate correct register value","message":"tests: ibecc_cov: Simulate correct register value\n\nSimulate ECC_ERROR_CERRSTS when reading from register\nIBECC_ECC_ERROR_LOG.\n\nSigned-off-by: Andrei Emeltchenko <a6565233ddc88e4fb9c66c1d70743223493f2ed4@intel.com>\n","repos":"zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/subsys\/edac\/ibecc_cov\/src\/ibecc.c\n+++ tests\/subsys\/edac\/ibecc_cov\/src\/ibecc.c\n@@ -34,8 +34,8 @@\n {\n #if defined(IBECC_ENABLED)\n \tif (addr == IBECC_ECC_ERROR_LOG) {\n-\t\tTC_PRINT(\"Simulate sys_read64(IBECC_ECC_ERROR_LOG)=>1\\n\");\n-\t\treturn 1;\n+\t\tTC_PRINT(\"Simulate sys_read64(IBECC_ECC_ERROR_LOG)=>CERRSTS\\n\");\n+\t\treturn ECC_ERROR_CERRSTS;\n \t}\n \n \tif (addr == IBECC_PARITY_ERROR_LOG) {\n"} {"commit":"be824473f7de00c2230b56731feffad3448ac759","subject":"We will never condtionalize ficache on PTE_PROT(TLB_EXECUTE) because it is risky. Delete the comment suggesting we might.","message":"We will never condtionalize ficache on PTE_PROT(TLB_EXECUTE) because it\nis risky. Delete the comment suggesting we might.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/hppa\/hppa\/pmap.c\n+++ arch\/hppa\/hppa\/pmap.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: pmap.c,v 1.149 2010\/03\/28 18:00:51 kettenis Exp $\t*\/\n+\/*\t$OpenBSD: pmap.c,v 1.150 2010\/03\/30 02:38:03 deraadt Exp $\t*\/\n \n \/*\n * Copyright (c) 1998-2004 Michael Shalayeff\n@@ -1171,7 +1171,6 @@\n \t\t\tpdcache(pve->pv_pmap->pm_space, pve->pv_va, PAGE_SIZE);\n \t\telse\n \t\t\tfdcache(pve->pv_pmap->pm_space, pve->pv_va, PAGE_SIZE);\n-\t\t\/* XXX Conditionalize ficache on PTE_PROT(TLB_EXECUTE)? *\/\n \t\tficache(pve->pv_pmap->pm_space, pve->pv_va, PAGE_SIZE);\n \t\tpdtlb(pve->pv_pmap->pm_space, pve->pv_va);\n \t\tpitlb(pve->pv_pmap->pm_space, pve->pv_va);\n"} {"commit":"20cf67db4e2c56c56f8c261f391cf273bd09bb2a","subject":"vector-traits needed","message":"vector-traits needed\n","repos":"linbox-team\/linbox,linbox-team\/linbox,linbox-team\/linbox,linbox-team\/linbox,linbox-team\/linbox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- linbox\/vector\/vector.h\n+++ linbox\/vector\/vector.h\n@@ -35,6 +35,7 @@\n #define __LINBOX_vector_dense_vector_H\n \n #include \"linbox\/linbox-config.h\"\n+#include \"linbox\/vector\/vector-traits.h\"\n \n namespace LinBox { \/* BlasVector *\/\n \n"} {"commit":"48761311c009605a420d8a1be08a89742e8ebbb8","subject":"[Modify] documentation","message":"[Modify] documentation\n","repos":"blodely\/LYPopView,blodely\/LYPopView","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- LYPopView\/Classes\/LYPopActionView.h\n+++ LYPopView\/Classes\/LYPopActionView.h\n@@ -13,8 +13,12 @@\n \t__weak UIView *vActionCont;\n }\n \n-\/\/@property (nonatomic, strong) NSArray *buttons;\n+\/**\n+ action pop view with one button at bottom\n \n+ @param title button title\n+ @param pressedAction button action block on event touch up inside\n+ *\/\n - (void)setSingleButtonTitle:(NSString *)title andAction:(void (^)(void))pressedAction;\n \n - (void)setDoubleButtonBtnZeroTitle:(NSString *)titleZero action:(void (^)(void))btnZeroAction andBtnOneTitle:(NSString *)titleOne action:(void (^)(void))btnOneAction;\n"} {"commit":"39d74549f493863631664fd882503290f6e5e24a","subject":"uvm_extern.h is enough here","message":"uvm_extern.h is enough here\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/i386\/i386\/trap.c\n+++ arch\/i386\/i386\/trap.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: trap.c,v 1.40 2001\/05\/05 23:25:42 art Exp $\t*\/\n+\/*\t$OpenBSD: trap.c,v 1.41 2001\/08\/12 21:51:03 mickey Exp $\t*\/\n \/*\t$NetBSD: trap.c,v 1.95 1996\/05\/05 06:50:02 mycroft Exp $\t*\/\n \n \/*-\n@@ -57,10 +57,6 @@\n #endif\n #include <sys\/syscall.h>\n \n-#include <vm\/vm_param.h>\n-#include <vm\/pmap.h>\n-#include <vm\/vm_map.h>\n-\n #include <uvm\/uvm_extern.h>\n \n #include <machine\/cpu.h>\n"} {"commit":"055ce95224d47a6ff69755b5ffe03a49812c3fde","subject":"lance is gone","message":"lance is gone\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/pica\/pica\/trap.c\n+++ arch\/pica\/pica\/trap.c\n@@ -38,7 +38,7 @@\n * from: Utah Hdr: trap.c 1.32 91\/04\/06\n *\n *\tfrom: @(#)trap.c\t8.5 (Berkeley) 1\/11\/94\n- * $Id: trap.c,v 1.1.1.1 1995\/10\/18 10:39:19 deraadt Exp $\n+ * $Id: trap.c,v 1.2 1995\/10\/28 23:09:43 deraadt Exp $\n *\/\n \n #include <sys\/param.h>\n@@ -69,8 +69,6 @@\n #include <vm\/vm_page.h>\n \n #include <pica\/pica\/pica.h>\n-\n-#include <le.h>\n \n #include <sys\/cdefs.h>\n #include <sys\/syslog.h>\n"} {"commit":"6e50d7817cb227ee2e10dcd8d3ff6180925f2d48","subject":"make passing -[QS] optional","message":"make passing -[QS] optional\n","repos":"andrewgregory\/pacfind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pacfind.c\n+++ pacfind.c\n@@ -394,6 +394,7 @@\n \n int parse_opts(int argc, char **argv, config_t *config) {\n int option_index = 0;\n+ int qs_passed = 0;\n int c;\n \n static struct option long_options[] = {\n@@ -424,9 +425,15 @@\n usage(NULL);\n break;\n case 'S':\n+ if(!qs_passed)\n+ config->local = 0;\n+ qs_passed = 1;\n config->sync = 1;\n break;\n case 'Q':\n+ if(!qs_passed)\n+ config->sync = 0;\n+ qs_passed = 1;\n config->local = 1;\n break;\n case 'd':\n@@ -850,6 +857,8 @@\n \n int main(int argc, char **argv) {\n config_t config = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };\n+ config.local = 1;\n+ config.sync = 1;\n node_t *query;\n int i;\n alpm_list_t *matched;\n"} {"commit":"11a6b0c933b55654a58afd84f63a5dde1607d78f","subject":"x86: 64 bit print out absent pages num too","message":"x86: 64 bit print out absent pages num too\n\nso users are not confused with memhole causing big total ram\n\nwe don't need to worry about 32 bit, because memhole is always\nabove max_low_pfn.\n\nSigned-off-by: Yinghai Lu <0674548f4d596393408a51d6287a76ebba2f42aa@kernel.org>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/mm\/init_64.c\n+++ arch\/x86\/mm\/init_64.c\n@@ -884,6 +884,7 @@\n void __init mem_init(void)\n {\n \tlong codesize, reservedpages, datasize, initsize;\n+\tunsigned long absent_pages;\n \n \tstart_periodic_check_for_corruption();\n \n@@ -899,8 +900,9 @@\n #else\n \ttotalram_pages = free_all_bootmem();\n #endif\n-\treservedpages = max_pfn - totalram_pages -\n-\t\t\t\t\tabsent_pages_in_range(0, max_pfn);\n+\n+\tabsent_pages = absent_pages_in_range(0, max_pfn);\n+\treservedpages = max_pfn - totalram_pages - absent_pages;\n \tafter_bootmem = 1;\n \n \tcodesize = (unsigned long) &_etext - (unsigned long) &_text;\n@@ -917,10 +919,11 @@\n \t\t\t\t VSYSCALL_END - VSYSCALL_START);\n \n \tprintk(KERN_INFO \"Memory: %luk\/%luk available (%ldk kernel code, \"\n-\t\t\t\t\"%ldk reserved, %ldk data, %ldk init)\\n\",\n+\t\t\t \"%ldk absent, %ldk reserved, %ldk data, %ldk init)\\n\",\n \t\t(unsigned long) nr_free_pages() << (PAGE_SHIFT-10),\n \t\tmax_pfn << (PAGE_SHIFT-10),\n \t\tcodesize >> 10,\n+\t\tabsent_pages << (PAGE_SHIFT-10),\n \t\treservedpages << (PAGE_SHIFT-10),\n \t\tdatasize >> 10,\n \t\tinitsize >> 10);\n"} {"commit":"43a432b1559798d33970261f710030f787770231","subject":"x86, CPA: Change idmap attribute before ioremap attribute setup","message":"x86, CPA: Change idmap attribute before ioremap attribute setup\n\nChange the identity mapping with the requested attribute first, before\nwe setup the virtual memory mapping with the new requested attribute.\n\nThis makes sure that there is no window when identity map'ed attribute\nmay disagree with ioremap range on the attribute type.\n\nThis also avoids doing cpa on the ioremap'ed address twice (first in\nioremap_page_range and then in ioremap_change_attr using vaddr), and\nshould improve ioremap performance a bit.\n\nSigned-off-by: Suresh Siddha <a42fd12510d3895be740fb89f87586733ee62f57@intel.com>\nSigned-off-by: Venkatesh Pallipadi <6b7ddbe82beec4500037cfc9bc14de0a76fca340@intel.com>\nLKML-Reference: <3533dfd69dd7ff8e1ad1a6c0e7998c33bc317dbe@intel.com>\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/x86\/mm\/ioremap.c\n+++ arch\/x86\/mm\/ioremap.c\n@@ -280,15 +280,16 @@\n \t\treturn NULL;\n \tarea->phys_addr = phys_addr;\n \tvaddr = (unsigned long) area->addr;\n+\n+\tif (kernel_map_sync_memtype(phys_addr, size, prot_val)) {\n+\t\tfree_memtype(phys_addr, phys_addr + size);\n+\t\tfree_vm_area(area);\n+\t\treturn NULL;\n+\t}\n+\n \tif (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {\n \t\tfree_memtype(phys_addr, phys_addr + size);\n \t\tfree_vm_area(area);\n-\t\treturn NULL;\n-\t}\n-\n-\tif (ioremap_change_attr(vaddr, size, prot_val) < 0) {\n-\t\tfree_memtype(phys_addr, phys_addr + size);\n-\t\tvunmap(area->addr);\n \t\treturn NULL;\n \t}\n \n"} {"commit":"5480a01ddfb7aa98188365ebf890c127946ef3d9","subject":"remove trailing spaces","message":"remove trailing spaces\n\ngit-svn-id: 2380535542b9d902a9e28d524e07971ff43b9bb1@915 ef36b2f9-881f-0410-afb5-c4e39611909c\n","repos":"arthurdejong\/nss-pam-ldapd,arthurdejong\/nss-pam-ldapd,arthurdejong\/nss-pam-ldapd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pam\/pam.c\n+++ pam\/pam.c\n@@ -417,16 +417,16 @@\n rc=PAM_IGNORE;\n else if ((rc==PAM_USER_UNKNOWN)&&(ignore_flags&IGNORE_UNKNOWN))\n rc=PAM_IGNORE;\n- if (rc!=PAM_SUCCESS) \n+ if (rc!=PAM_SUCCESS)\n {\n if (rc!=PAM_IGNORE)\n pam_warn(appconv,\"LDAP authorization failed\",PAM_ERROR_MSG,no_warn);\n- } \n- else \n+ }\n+ else\n {\n if (ctx2.authzmsg && ctx2.authzmsg[0])\n pam_warn(appconv,ctx2.authzmsg,PAM_TEXT_INFO,no_warn);\n- if (ctx2.authz==PAM_SUCCESS) \n+ if (ctx2.authz==PAM_SUCCESS)\n {\n rc=ctx->authz;\n if (ctx->authzmsg && ctx->authzmsg[0])\n@@ -627,12 +627,12 @@\n }\n }\n rc=pam_get_item(pamh,PAM_OLDAUTHTOK,&p);\n- if (rc) \n+ if (rc)\n return rc;\n- } \n- else \n+ }\n+ else\n rc=PAM_SUCCESS;\n- if (!ctx->dn) \n+ if (!ctx->dn)\n {\n rc=nslcd_request_pwmod(ctx,username,svc,p,NULL);\n if ((rc==PAM_AUTHINFO_UNAVAIL)&&(ignore_flags&IGNORE_UNAVAIL))\n@@ -644,13 +644,13 @@\n }\n \n rc=pam_get_item(pamh,PAM_OLDAUTHTOK,&p);\n- if (rc) \n+ if (rc)\n return rc;\n \n if (!p)\n p=ctx->oldpw;\n \n- if (first_pass) \n+ if (first_pass)\n {\n rc=pam_get_item(pamh,PAM_AUTHTOK,&q);\n if ((rc!=PAM_SUCCESS || !q) && (first_pass & (USE_FIRST|USE_TOKEN))) {\n@@ -659,11 +659,11 @@\n return rc;\n }\n }\n- if (!q) \n+ if (!q)\n {\n rc=pam_get_authtok(pamh, flags, \"Enter new LDAP Password: \",\n \"Retype new LDAP Password: \", &q);\n- if (rc==PAM_SUCCESS) \n+ if (rc==PAM_SUCCESS)\n {\n pam_set_item(pamh,PAM_AUTHTOK,q);\n memset(q,0,strlen(q));\n@@ -679,12 +679,12 @@\n else if ((rc==PAM_USER_UNKNOWN)&&(ignore_flags&IGNORE_UNKNOWN))\n rc=PAM_IGNORE;\n p=NULL; q=NULL;\n- if (rc==PAM_SUCCESS) \n+ if (rc==PAM_SUCCESS)\n {\n rc=ctx->authz;\n if (rc!=PAM_SUCCESS)\n pam_warn(appconv, ctx->authzmsg, PAM_ERROR_MSG, no_warn);\n- } \n+ }\n else if (rc!=PAM_IGNORE)\n pam_warn(appconv, \"LDAP pwmod failed\", PAM_ERROR_MSG, no_warn);\n return rc;\n"} {"commit":"7c95bd1567121a59f607de942f82fa4fe11cc9da","subject":"Try to do a rewrite when AP fails after a reset.","message":"Try to do a rewrite when AP fails after a reset.\n\nMTB_ADV_WISE_1530 issues when the target is in invalid state, AP writes fail. Seen in MTB+MCB boards.\n","repos":"google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port,google\/DAPLink-port","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- source\/daplink\/interface\/swd_host.c\n+++ source\/daplink\/interface\/swd_host.c\n@@ -850,7 +850,7 @@\n uint8_t swd_set_target_state_hw(TARGET_RESET_STATE state)\n {\n uint32_t val;\n-\n+ int8_t ap_retries = 2;\n \/* Calling swd_init prior to entering RUN state causes operations to fail. *\/\n if (state != RUN) {\n swd_init();\n@@ -875,8 +875,14 @@\n }\n \n \/\/ Enable debug\n- if (!swd_write_word(DBG_HCSR, DBGKEY | C_DEBUGEN)) {\n- return 0;\n+ while(swd_write_word(DBG_HCSR, DBGKEY | C_DEBUGEN) == 0) {\n+ if( --ap_retries <=0 )\n+ return 0;\n+ \/\/ Target is in invalid state?\n+ swd_set_target_reset(1);\n+ os_dly_wait(2);\n+ swd_set_target_reset(0);\n+ os_dly_wait(2);\n }\n \n \/\/ Enable halt on reset\n"} {"commit":"d6317be507e028c8576f7204810da4868545fe02","subject":"py\/compile: compile_store_id: Accept is_const flag.","message":"py\/compile: compile_store_id: Accept is_const flag.\n\nIf true, it means this store is for constant namespace slot, i.e. cannot\nbe further overriden (in strict mode).\n\nChange-Id: Iad4da47182be972ed5a89ef01875cf189b284644\nSigned-off-by: Paul Sokolovsky <9dc5061f178bb11813e14f1ed02ba27eaf21fa5d@users.sourceforge.net>\n","repos":"pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython,pfalcon\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- py\/compile.c\n+++ py\/compile.c\n@@ -291,7 +291,8 @@\n }\n }\n \n-STATIC void compile_store_id(compiler_t *comp, qstr qst) {\n+STATIC void compile_store_id(compiler_t *comp, qstr qst, bool is_const) {\n+ (void)is_const; \/\/ TODO\n if (comp->pass == MP_PASS_SCOPE) {\n mp_emit_common_get_id_for_modification(comp->scope_cur, qst);\n } else {\n@@ -499,7 +500,7 @@\n switch (assign_kind) {\n case ASSIGN_STORE:\n case ASSIGN_AUG_STORE:\n- compile_store_id(comp, arg);\n+ compile_store_id(comp, arg, false);\n break;\n case ASSIGN_AUG_LOAD:\n default:\n@@ -934,13 +935,13 @@\n }\n \n \/\/ store func\/class object into name\n- compile_store_id(comp, body_name);\n+ compile_store_id(comp, body_name, true);\n }\n \n STATIC void compile_funcdef(compiler_t *comp, mp_parse_node_struct_t *pns) {\n qstr fname = compile_funcdef_helper(comp, pns, comp->scope_cur->emit_options);\n \/\/ store function object into function name\n- compile_store_id(comp, fname);\n+ compile_store_id(comp, fname, true);\n }\n \n STATIC void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {\n@@ -1152,7 +1153,7 @@\n EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); \/\/ not importing from anything\n qstr q_base;\n do_import_name(comp, pn, &q_base);\n- compile_store_id(comp, q_base);\n+ compile_store_id(comp, q_base, true);\n }\n \n STATIC void compile_import_name(compiler_t *comp, mp_parse_node_struct_t *pns) {\n@@ -1238,9 +1239,9 @@\n qstr id2 = MP_PARSE_NODE_LEAF_ARG(pns3->nodes[0]); \/\/ should be id\n EMIT_ARG(import, id2, MP_EMIT_IMPORT_FROM);\n if (MP_PARSE_NODE_IS_NULL(pns3->nodes[1])) {\n- compile_store_id(comp, id2);\n+ compile_store_id(comp, id2, true);\n } else {\n- compile_store_id(comp, MP_PARSE_NODE_LEAF_ARG(pns3->nodes[1]));\n+ compile_store_id(comp, MP_PARSE_NODE_LEAF_ARG(pns3->nodes[1]), true);\n }\n }\n EMIT(pop_top);\n@@ -1654,7 +1655,7 @@\n if (qstr_exception_local == 0) {\n EMIT(pop_top);\n } else {\n- compile_store_id(comp, qstr_exception_local);\n+ compile_store_id(comp, qstr_exception_local, false);\n }\n \n \/\/ If the exception is bound to a variable <e> then the <body> of the\n@@ -1683,7 +1684,7 @@\n \/\/ That's quite a rare case, so save 2 bytecode bytes unless\n \/\/ full CPython compatibility is requested.\n EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);\n- compile_store_id(comp, qstr_exception_local);\n+ compile_store_id(comp, qstr_exception_local, false);\n #endif\n compile_delete_id(comp, qstr_exception_local);\n compile_decrease_except_level(comp);\n@@ -1812,7 +1813,7 @@\n compile_node(comp, pns->nodes[1]); \/\/ iterator\n EMIT_ARG(load_method, MP_QSTR___aiter__, false);\n EMIT_ARG(call_method, 0, 0, 0);\n- compile_store_id(comp, context);\n+ compile_store_id(comp, context, false);\n \n START_BREAK_CONTINUE_BLOCK\n \n@@ -2150,7 +2151,7 @@\n \/\/ Use parent's scope for assigned value so it can \"escape\"\n comp->scope_cur = comp->scope_cur->parent;\n }\n- compile_store_id(comp, MP_PARSE_NODE_LEAF_ARG(pn_name));\n+ compile_store_id(comp, MP_PARSE_NODE_LEAF_ARG(pn_name), false);\n comp->scope_cur = old_scope;\n }\n \n@@ -2746,7 +2747,7 @@\n STATIC void compile_classdef(compiler_t *comp, mp_parse_node_struct_t *pns) {\n qstr cname = compile_classdef_helper(comp, pns, comp->scope_cur->emit_options);\n \/\/ store class object into class name\n- compile_store_id(comp, cname);\n+ compile_store_id(comp, cname, true);\n }\n \n STATIC void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) {\n@@ -3056,7 +3057,7 @@\n \/\/ compile the doc string\n compile_node(comp, pns->nodes[0]);\n \/\/ store the doc string\n- compile_store_id(comp, MP_QSTR___doc__);\n+ compile_store_id(comp, MP_QSTR___doc__, true);\n }\n }\n #else\n@@ -3200,9 +3201,9 @@\n EMIT_ARG(set_source_line, pns->source_line);\n #endif\n compile_load_id(comp, MP_QSTR___name__);\n- compile_store_id(comp, MP_QSTR___module__);\n+ compile_store_id(comp, MP_QSTR___module__, true);\n EMIT_ARG(load_const_str, MP_PARSE_NODE_LEAF_ARG(pns->nodes[0])); \/\/ 0 is class name\n- compile_store_id(comp, MP_QSTR___qualname__);\n+ compile_store_id(comp, MP_QSTR___qualname__, true);\n \n check_for_doc_string(comp, pns->nodes[2]);\n compile_node(comp, pns->nodes[2]); \/\/ 2 is class body\n"} {"commit":"898b2e8dbe53682241ce5fe063de67d64db0a46b","subject":"GEN: spatial: regenerate qhull.c","message":"GEN: spatial: regenerate qhull.c\n","repos":"matthewalbani\/scipy,behzadnouri\/scipy,Shaswat27\/scipy,vhaasteren\/scipy,giorgiop\/scipy,pbrod\/scipy,bkendzior\/scipy,josephcslater\/scipy,lukauskas\/scipy,aman-iitj\/scipy,trankmichael\/scipy,juliantaylor\/scipy,sauliusl\/scipy,arokem\/scipy,minhlongdo\/scipy,jseabold\/scipy,gertingold\/scipy,piyush0609\/scipy,mhogg\/scipy,josephcslater\/scipy,jseabold\/scipy,giorgiop\/scipy,mortada\/scipy,person142\/scipy,jonycgn\/scipy,jsilter\/scipy,rmcgibbo\/scipy,grlee77\/scipy,richardotis\/scipy,ortylp\/scipy,gef756\/scipy,cpaulik\/scipy,gfyoung\/scipy,teoliphant\/scipy,lukauskas\/scipy,juliantaylor\/scipy,Kamp9\/scipy,vanpact\/scipy,chatcannon\/scipy,sargas\/scipy,cpaulik\/scipy,mikebenfield\/scipy,sonnyhu\/scipy,sriki18\/scipy,matthewalbani\/scipy,piyush0609\/scipy,niknow\/scipy,pschella\/scipy,jsilter\/scipy,ndchorley\/scipy,WarrenWeckesser\/scipy,fernand\/scipy,fredrikw\/scipy,pnedunuri\/scipy,jor-\/scipy,pyramania\/scipy,gertingold\/scipy,Eric89GXL\/scipy,woodscn\/scipy,mingwpy\/scipy,lhilt\/scipy,vigna\/scipy,mdhaber\/scipy,vigna\/scipy,matthew-brett\/scipy,endolith\/scipy,endolith\/scipy,Stefan-Endres\/scipy,petebachant\/scipy,perimosocordiae\/scipy,haudren\/scipy,felipebetancur\/scipy,witcxc\/scipy,pizzathief\/scipy,perimosocordiae\/scipy,raoulbq\/scipy,raoulbq\/scipy,endolith\/scipy,vberaudi\/scipy,Dapid\/scipy,e-q\/scipy,sauliusl\/scipy,behzadnouri\/scipy,gef756\/scipy,aarchiba\/scipy,mortonjt\/scipy,hainm\/scipy,gdooper\/scipy,mhogg\/scipy,nvoron23\/scipy,tylerjereddy\/scipy,apbard\/scipy,pbrod\/scipy,apbard\/scipy,arokem\/scipy,aarchiba\/scipy,gef756\/scipy,maciejkula\/scipy,surhudm\/scipy,rgommers\/scipy,witcxc\/scipy,maciejkula\/scipy,witcxc\/scipy,argriffing\/scipy,aarchiba\/scipy,vhaasteren\/scipy,WarrenWeckesser\/scipy,ChanderG\/scipy,vberaudi\/scipy,mgaitan\/scipy,sargas\/scipy,kleskjr\/scipy,apbard\/scipy,woodscn\/scipy,cpaulik\/scipy,minhlongdo\/scipy,jseabold\/scipy,lhilt\/scipy,jamestwebber\/scipy,WillieMaddox\/scipy,anntzer\/scipy,efiring\/scipy,WillieMaddox\/scipy,vberaudi\/scipy,felipebetancur\/scipy,Newman101\/scipy,haudren\/scipy,person142\/scipy,tylerjereddy\/scipy,Gillu13\/scipy,Kamp9\/scipy,njwilson23\/scipy,chatcannon\/scipy,sonnyhu\/scipy,nmayorov\/scipy,mhogg\/scipy,pnedunuri\/scipy,andyfaff\/scipy,WillieMaddox\/scipy,aman-iitj\/scipy,Stefan-Endres\/scipy,rmcgibbo\/scipy,newemailjdm\/scipy,maniteja123\/scipy,bkendzior\/scipy,sargas\/scipy,Shaswat27\/scipy,jamestwebber\/scipy,zaxliu\/scipy,andim\/scipy,ortylp\/scipy,jsilter\/scipy,ogrisel\/scipy,matthew-brett\/scipy,rmcgibbo\/scipy,larsmans\/scipy,vanpact\/scipy,anielsen001\/scipy,sriki18\/scipy,giorgiop\/scipy,chatcannon\/scipy,vigna\/scipy,giorgiop\/scipy,ChanderG\/scipy,gertingold\/scipy,trankmichael\/scipy,jseabold\/scipy,scipy\/scipy,befelix\/scipy,Shaswat27\/scipy,efiring\/scipy,felipebetancur\/scipy,fernand\/scipy,aeklant\/scipy,Dapid\/scipy,woodscn\/scipy,juliantaylor\/scipy,anielsen001\/scipy,WillieMaddox\/scipy,pyramania\/scipy,jjhelmus\/scipy,nvoron23\/scipy,zxsted\/scipy,njwilson23\/scipy,bkendzior\/scipy,mdhaber\/scipy,andim\/scipy,jonycgn\/scipy,befelix\/scipy,maniteja123\/scipy,lhilt\/scipy,Dapid\/scipy,haudren\/scipy,Newman101\/scipy,e-q\/scipy,Gillu13\/scipy,FRidh\/scipy,maniteja123\/scipy,ogrisel\/scipy,behzadnouri\/scipy,gfyoung\/scipy,Stefan-Endres\/scipy,jsilter\/scipy,andim\/scipy,ndchorley\/scipy,ales-erjavec\/scipy,scipy\/scipy,Newman101\/scipy,petebachant\/scipy,Gillu13\/scipy,mdhaber\/scipy,larsmans\/scipy,pyramania\/scipy,andyfaff\/scipy,Eric89GXL\/scipy,hainm\/scipy,futurulus\/scipy,Kamp9\/scipy,newemailjdm\/scipy,petebachant\/scipy,e-q\/scipy,jamestwebber\/scipy,ogrisel\/scipy,kleskjr\/scipy,argriffing\/scipy,fredrikw\/scipy,fredrikw\/scipy,teoliphant\/scipy,nvoron23\/scipy,woodscn\/scipy,larsmans\/scipy,e-q\/scipy,nonhermitian\/scipy,nonhermitian\/scipy,aeklant\/scipy,rmcgibbo\/scipy,gef756\/scipy,Kamp9\/scipy,WarrenWeckesser\/scipy,raoulbq\/scipy,anielsen001\/scipy,zaxliu\/scipy,minhlongdo\/scipy,pbrod\/scipy,gdooper\/scipy,ortylp\/scipy,ChanderG\/scipy,richardotis\/scipy,piyush0609\/scipy,mingwpy\/scipy,Dapid\/scipy,fernand\/scipy,fernand\/scipy,juliantaylor\/scipy,behzadnouri\/scipy,nvoron23\/scipy,anielsen001\/scipy,kleskjr\/scipy,petebachant\/scipy,dch312\/scipy,gdooper\/scipy,ChanderG\/scipy,Shaswat27\/scipy,zerothi\/scipy,ales-erjavec\/scipy,gdooper\/scipy,niknow\/scipy,kalvdans\/scipy,matthewalbani\/scipy,Eric89GXL\/scipy,WillieMaddox\/scipy,ilayn\/scipy,haudren\/scipy,petebachant\/scipy,futurulus\/scipy,kleskjr\/scipy,haudren\/scipy,jonycgn\/scipy,befelix\/scipy,mortada\/scipy,nmayorov\/scipy,pizzathief\/scipy,mortada\/scipy,pschella\/scipy,dominicelse\/scipy,felipebetancur\/scipy,ogrisel\/scipy,haudren\/scipy,Dapid\/scipy,rgommers\/scipy,ilayn\/scipy,Shaswat27\/scipy,Stefan-Endres\/scipy,fredrikw\/scipy,grlee77\/scipy,mortada\/scipy,newemailjdm\/scipy,trankmichael\/scipy,sriki18\/scipy,ilayn\/scipy,mgaitan\/scipy,maniteja123\/scipy,jjhelmus\/scipy,gef756\/scipy,minhlongdo\/scipy,rgommers\/scipy,vigna\/scipy,argriffing\/scipy,mtrbean\/scipy,lukauskas\/scipy,richardotis\/scipy,dominicelse\/scipy,zerothi\/scipy,Srisai85\/scipy,maciejkula\/scipy,argriffing\/scipy,teoliphant\/scipy,dch312\/scipy,anntzer\/scipy,Newman101\/scipy,mortonjt\/scipy,mortonjt\/scipy,jseabold\/scipy,mikebenfield\/scipy,dominicelse\/scipy,mortonjt\/scipy,ales-erjavec\/scipy,newemailjdm\/scipy,ales-erjavec\/scipy,zxsted\/scipy,vberaudi\/scipy,efiring\/scipy,ortylp\/scipy,perimosocordiae\/scipy,WarrenWeckesser\/scipy,felipebetancur\/scipy,njwilson23\/scipy,jjhelmus\/scipy,kleskjr\/scipy,hainm\/scipy,WarrenWeckesser\/scipy,mtrbean\/scipy,jonycgn\/scipy,vanpact\/scipy,mgaitan\/scipy,rmcgibbo\/scipy,giorgiop\/scipy,zaxliu\/scipy,vanpact\/scipy,vanpact\/scipy,rmcgibbo\/scipy,gef756\/scipy,sonnyhu\/scipy,argriffing\/scipy,mdhaber\/scipy,futurulus\/scipy,minhlongdo\/scipy,pyramania\/scipy,fernand\/scipy,aman-iitj\/scipy,FRidh\/scipy,sonnyhu\/scipy,efiring\/scipy,zerothi\/scipy,Kamp9\/scipy,mhogg\/scipy,larsmans\/scipy,ilayn\/scipy,Gillu13\/scipy,piyush0609\/scipy,FRidh\/scipy,lhilt\/scipy,larsmans\/scipy,argriffing\/scipy,vberaudi\/scipy,petebachant\/scipy,pbrod\/scipy,mingwpy\/scipy,endolith\/scipy,mtrbean\/scipy,kalvdans\/scipy,aeklant\/scipy,sargas\/scipy,maniteja123\/scipy,jakevdp\/scipy,trankmichael\/scipy,jor-\/scipy,Kamp9\/scipy,matthewalbani\/scipy,ChanderG\/scipy,niknow\/scipy,endolith\/scipy,matthew-brett\/scipy,jakevdp\/scipy,pschella\/scipy,ndchorley\/scipy,Shaswat27\/scipy,arokem\/scipy,bkendzior\/scipy,hainm\/scipy,mtrbean\/scipy,aman-iitj\/scipy,mingwpy\/scipy,scipy\/scipy,ilayn\/scipy,maciejkula\/scipy,jor-\/scipy,kalvdans\/scipy,niknow\/scipy,efiring\/scipy,piyush0609\/scipy,anntzer\/scipy,richardotis\/scipy,anntzer\/scipy,befelix\/scipy,anntzer\/scipy,maniteja123\/scipy,matthewalbani\/scipy,trankmichael\/scipy,ortylp\/scipy,WillieMaddox\/scipy,dominicelse\/scipy,Stefan-Endres\/scipy,scipy\/scipy,Eric89GXL\/scipy,josephcslater\/scipy,teoliphant\/scipy,mgaitan\/scipy,sargas\/scipy,larsmans\/scipy,nmayorov\/scipy,tylerjereddy\/scipy,ogrisel\/scipy,apbard\/scipy,vhaasteren\/scipy,vhaasteren\/scipy,ndchorley\/scipy,jseabold\/scipy,jor-\/scipy,juliantaylor\/scipy,jjhelmus\/scipy,nonhermitian\/scipy,FRidh\/scipy,jjhelmus\/scipy,sauliusl\/scipy,ales-erjavec\/scipy,njwilson23\/scipy,minhlongdo\/scipy,jakevdp\/scipy,jamestwebber\/scipy,dch312\/scipy,kleskjr\/scipy,zaxliu\/scipy,Stefan-Endres\/scipy,mtrbean\/scipy,behzadnouri\/scipy,dch312\/scipy,sriki18\/scipy,mingwpy\/scipy,mortada\/scipy,witcxc\/scipy,lukauskas\/scipy,aarchiba\/scipy,tylerjereddy\/scipy,sauliusl\/scipy,futurulus\/scipy,sonnyhu\/scipy,lukauskas\/scipy,mhogg\/scipy,gertingold\/scipy,felipebetancur\/scipy,scipy\/scipy,raoulbq\/scipy,surhudm\/scipy,josephcslater\/scipy,aman-iitj\/scipy,surhudm\/scipy,vberaudi\/scipy,grlee77\/scipy,piyush0609\/scipy,aman-iitj\/scipy,FRidh\/scipy,vhaasteren\/scipy,matthew-brett\/scipy,ilayn\/scipy,zaxliu\/scipy,giorgiop\/scipy,zerothi\/scipy,mortada\/scipy,raoulbq\/scipy,zaxliu\/scipy,niknow\/scipy,aarchiba\/scipy,Srisai85\/scipy,perimosocordiae\/scipy,mikebenfield\/scipy,vigna\/scipy,pnedunuri\/scipy,zxsted\/scipy,surhudm\/scipy,teoliphant\/scipy,raoulbq\/scipy,Eric89GXL\/scipy,richardotis\/scipy,andyfaff\/scipy,newemailjdm\/scipy,maciejkula\/scipy,perimosocordiae\/scipy,andim\/scipy,anielsen001\/scipy,gdooper\/scipy,Gillu13\/scipy,befelix\/scipy,mgaitan\/scipy,endolith\/scipy,ChanderG\/scipy,jsilter\/scipy,mgaitan\/scipy,chatcannon\/scipy,nmayorov\/scipy,pbrod\/scipy,anielsen001\/scipy,ndchorley\/scipy,FRidh\/scipy,tylerjereddy\/scipy,niknow\/scipy,grlee77\/scipy,bkendzior\/scipy,mortonjt\/scipy,nvoron23\/scipy,gfyoung\/scipy,aeklant\/scipy,pyramania\/scipy,chatcannon\/scipy,surhudm\/scipy,sonnyhu\/scipy,zxsted\/scipy,andim\/scipy,e-q\/scipy,Gillu13\/scipy,woodscn\/scipy,rgommers\/scipy,fernand\/scipy,Newman101\/scipy,pnedunuri\/scipy,andyfaff\/scipy,arokem\/scipy,sauliusl\/scipy,hainm\/scipy,pizzathief\/scipy,person142\/scipy,fredrikw\/scipy,ortylp\/scipy,vanpact\/scipy,mdhaber\/scipy,pizzathief\/scipy,zerothi\/scipy,Dapid\/scipy,mingwpy\/scipy,fredrikw\/scipy,person142\/scipy,jonycgn\/scipy,zxsted\/scipy,zxsted\/scipy,pnedunuri\/scipy,pschella\/scipy,njwilson23\/scipy,cpaulik\/scipy,Srisai85\/scipy,trankmichael\/scipy,mikebenfield\/scipy,mhogg\/scipy,rgommers\/scipy,nonhermitian\/scipy,perimosocordiae\/scipy,mdhaber\/scipy,mortonjt\/scipy,dominicelse\/scipy,kalvdans\/scipy,vhaasteren\/scipy,Srisai85\/scipy,cpaulik\/scipy,futurulus\/scipy,pizzathief\/scipy,jonycgn\/scipy,josephcslater\/scipy,Newman101\/scipy,scipy\/scipy,sauliusl\/scipy,andyfaff\/scipy,Srisai85\/scipy,ndchorley\/scipy,futurulus\/scipy,sriki18\/scipy,gfyoung\/scipy,aeklant\/scipy,woodscn\/scipy,efiring\/scipy,hainm\/scipy,Eric89GXL\/scipy,gfyoung\/scipy,matthew-brett\/scipy,lhilt\/scipy,andim\/scipy,lukauskas\/scipy,jakevdp\/scipy,WarrenWeckesser\/scipy,jor-\/scipy,nvoron23\/scipy,jakevdp\/scipy,apbard\/scipy,surhudm\/scipy,kalvdans\/scipy,cpaulik\/scipy,andyfaff\/scipy,Srisai85\/scipy,chatcannon\/scipy,richardotis\/scipy,mtrbean\/scipy,gertingold\/scipy,person142\/scipy,nmayorov\/scipy,witcxc\/scipy,arokem\/scipy,nonhermitian\/scipy,grlee77\/scipy,mikebenfield\/scipy,pschella\/scipy,pnedunuri\/scipy,ales-erjavec\/scipy,anntzer\/scipy,behzadnouri\/scipy,njwilson23\/scipy,pbrod\/scipy,zerothi\/scipy,sriki18\/scipy,jamestwebber\/scipy,newemailjdm\/scipy,dch312\/scipy","returncode":1,"stderr":"error: pathspec 'scipy\/spatial\/qhull.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- scipy\/spatial\/qhull.c\n+++ scipy\/spatial\/qhull.c\n@@ -0,0 +1,9528 @@\n+\n+\n+#define PY_SSIZE_T_CLEAN\n+#include \"Python.h\"\n+#include \"structmember.h\"\n+#ifndef Py_PYTHON_H\n+ #error Python headers needed to compile C extensions, please install development version of Python.\n+#else\n+\n+#ifndef PY_LONG_LONG\n+ #define PY_LONG_LONG LONG_LONG\n+#endif\n+#ifndef DL_EXPORT\n+ #define DL_EXPORT(t) t\n+#endif\n+#if PY_VERSION_HEX < 0x02040000\n+ #define METH_COEXIST 0\n+ #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)\n+ #define PyDict_Contains(d,o) PySequence_Contains(d,o)\n+#endif\n+\n+#if PY_VERSION_HEX < 0x02050000\n+ typedef int Py_ssize_t;\n+ #define PY_SSIZE_T_MAX INT_MAX\n+ #define PY_SSIZE_T_MIN INT_MIN\n+ #define PY_FORMAT_SIZE_T \"\"\n+ #define PyInt_FromSsize_t(z) PyInt_FromLong(z)\n+ #define PyInt_AsSsize_t(o) PyInt_AsLong(o)\n+ #define PyNumber_Index(o) PyNumber_Int(o)\n+ #define PyIndex_Check(o) PyNumber_Check(o)\n+ #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)\n+#endif\n+\n+#if PY_VERSION_HEX < 0x02060000\n+ #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)\n+ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)\n+ #define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)\n+ #define PyVarObject_HEAD_INIT(type, size) \\\n+ PyObject_HEAD_INIT(type) size,\n+ #define PyType_Modified(t)\n+\n+ typedef struct {\n+ void *buf;\n+ PyObject *obj;\n+ Py_ssize_t len;\n+ Py_ssize_t itemsize;\n+ int readonly;\n+ int ndim;\n+ char *format;\n+ Py_ssize_t *shape;\n+ Py_ssize_t *strides;\n+ Py_ssize_t *suboffsets;\n+ void *internal;\n+ } Py_buffer;\n+\n+ #define PyBUF_SIMPLE 0\n+ #define PyBUF_WRITABLE 0x0001\n+ #define PyBUF_FORMAT 0x0004\n+ #define PyBUF_ND 0x0008\n+ #define PyBUF_STRIDES (0x0010 | PyBUF_ND)\n+ #define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES)\n+ #define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES)\n+ #define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES)\n+ #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)\n+\n+#endif\n+\n+#if PY_MAJOR_VERSION < 3\n+ #define __Pyx_BUILTIN_MODULE_NAME \"__builtin__\"\n+#else\n+ #define __Pyx_BUILTIN_MODULE_NAME \"builtins\"\n+#endif\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define Py_TPFLAGS_CHECKTYPES 0\n+ #define Py_TPFLAGS_HAVE_INDEX 0\n+#endif\n+\n+#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)\n+ #define Py_TPFLAGS_HAVE_NEWBUFFER 0\n+#endif\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define PyBaseString_Type PyUnicode_Type\n+ #define PyString_Type PyUnicode_Type\n+ #define PyString_CheckExact PyUnicode_CheckExact\n+#else\n+ #define PyBytes_Type PyString_Type\n+ #define PyBytes_CheckExact PyString_CheckExact\n+#endif\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define PyInt_Type PyLong_Type\n+ #define PyInt_Check(op) PyLong_Check(op)\n+ #define PyInt_CheckExact(op) PyLong_CheckExact(op)\n+ #define PyInt_FromString PyLong_FromString\n+ #define PyInt_FromUnicode PyLong_FromUnicode\n+ #define PyInt_FromLong PyLong_FromLong\n+ #define PyInt_FromSize_t PyLong_FromSize_t\n+ #define PyInt_FromSsize_t PyLong_FromSsize_t\n+ #define PyInt_AsLong PyLong_AsLong\n+ #define PyInt_AS_LONG PyLong_AS_LONG\n+ #define PyInt_AsSsize_t PyLong_AsSsize_t\n+ #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask\n+ #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask\n+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)\n+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)\n+#else\n+ #define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)\n+ #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)\n+\n+#endif\n+\n+#if PY_MAJOR_VERSION >= 3\n+ #define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)\n+#endif\n+\n+#if !defined(WIN32) && !defined(MS_WINDOWS)\n+ #ifndef __stdcall\n+ #define __stdcall\n+ #endif\n+ #ifndef __cdecl\n+ #define __cdecl\n+ #endif\n+ #ifndef __fastcall\n+ #define __fastcall\n+ #endif\n+#else\n+ #define _USE_MATH_DEFINES\n+#endif\n+\n+#if PY_VERSION_HEX < 0x02050000\n+ #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))\n+ #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))\n+ #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),((char *)(n)))\n+#else\n+ #define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),(n))\n+ #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))\n+ #define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))\n+#endif\n+\n+#if PY_VERSION_HEX < 0x02050000\n+ #define __Pyx_NAMESTR(n) ((char *)(n))\n+ #define __Pyx_DOCSTR(n) ((char *)(n))\n+#else\n+ #define __Pyx_NAMESTR(n) (n)\n+ #define __Pyx_DOCSTR(n) (n)\n+#endif\n+#ifdef __cplusplus\n+#define __PYX_EXTERN_C extern \"C\"\n+#else\n+#define __PYX_EXTERN_C extern\n+#endif\n+#include <math.h>\n+#define __PYX_HAVE_API__scipy__spatial__qhull\n+#include \"stdlib.h\"\n+#include \"numpy\/ndarraytypes.h\"\n+#include \"stdio.h\"\n+#include \"numpy\/arrayobject.h\"\n+#include \"numpy\/ufuncobject.h\"\n+#include \"qhull\/src\/qset.h\"\n+#include \"qhull\/src\/qhull.h\"\n+#include \"qhull_blas.h\"\n+\n+#ifndef CYTHON_INLINE\n+ #if defined(__GNUC__)\n+ #define CYTHON_INLINE __inline__\n+ #elif defined(_MSC_VER)\n+ #define CYTHON_INLINE __inline\n+ #else\n+ #define CYTHON_INLINE \n+ #endif\n+#endif\n+\n+typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; \n+\n+\n+\n+\n+#if PY_MAJOR_VERSION < 3\n+#define __Pyx_PyBytes_FromString PyString_FromString\n+#define __Pyx_PyBytes_FromStringAndSize PyString_FromStringAndSize\n+#define __Pyx_PyBytes_AsString PyString_AsString\n+#else\n+#define __Pyx_PyBytes_FromString PyBytes_FromString\n+#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize\n+#define __Pyx_PyBytes_AsString PyBytes_AsString\n+#endif\n+\n+#define __Pyx_PyBytes_FromUString(s) __Pyx_PyBytes_FromString((char*)s)\n+#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))\n+\n+#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))\n+static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);\n+static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);\n+\n+#if !defined(T_PYSSIZET)\n+#if PY_VERSION_HEX < 0x02050000\n+#define T_PYSSIZET T_INT\n+#elif !defined(T_LONGLONG)\n+#define T_PYSSIZET \\\n+ ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \\\n+ ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : -1))\n+#else\n+#define T_PYSSIZET \\\n+ ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \\\n+ ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : \\\n+ ((sizeof(Py_ssize_t) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))\n+#endif\n+#endif\n+\n+\n+#if !defined(T_ULONGLONG)\n+#define __Pyx_T_UNSIGNED_INT(x) \\\n+ ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \\\n+ ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \\\n+ ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \\\n+ ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : -1))))\n+#else\n+#define __Pyx_T_UNSIGNED_INT(x) \\\n+ ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \\\n+ ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \\\n+ ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \\\n+ ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : \\\n+ ((sizeof(x) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))))\n+#endif\n+#if !defined(T_LONGLONG)\n+#define __Pyx_T_SIGNED_INT(x) \\\n+ ((sizeof(x) == sizeof(char)) ? T_BYTE : \\\n+ ((sizeof(x) == sizeof(short)) ? T_SHORT : \\\n+ ((sizeof(x) == sizeof(int)) ? T_INT : \\\n+ ((sizeof(x) == sizeof(long)) ? T_LONG : -1))))\n+#else\n+#define __Pyx_T_SIGNED_INT(x) \\\n+ ((sizeof(x) == sizeof(char)) ? T_BYTE : \\\n+ ((sizeof(x) == sizeof(short)) ? T_SHORT : \\\n+ ((sizeof(x) == sizeof(int)) ? T_INT : \\\n+ ((sizeof(x) == sizeof(long)) ? T_LONG : \\\n+ ((sizeof(x) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))))\n+#endif\n+\n+#define __Pyx_T_FLOATING(x) \\\n+ ((sizeof(x) == sizeof(float)) ? T_FLOAT : \\\n+ ((sizeof(x) == sizeof(double)) ? T_DOUBLE : -1))\n+\n+#if !defined(T_SIZET)\n+#if !defined(T_ULONGLONG)\n+#define T_SIZET \\\n+ ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \\\n+ ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : -1))\n+#else\n+#define T_SIZET \\\n+ ((sizeof(size_t) == sizeof(unsigned int)) ? T_UINT : \\\n+ ((sizeof(size_t) == sizeof(unsigned long)) ? T_ULONG : \\\n+ ((sizeof(size_t) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))\n+#endif\n+#endif\n+\n+static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);\n+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);\n+static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);\n+\n+#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))\n+\n+\n+#ifdef __GNUC__\n+\n+#if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)) \n+#define likely(x) __builtin_expect(!!(x), 1)\n+#define unlikely(x) __builtin_expect(!!(x), 0)\n+#else \n+#define likely(x) (x)\n+#define unlikely(x) (x)\n+#endif \n+#else \n+#define likely(x) (x)\n+#define unlikely(x) (x)\n+#endif \n+ \n+static PyObject *__pyx_m;\n+static PyObject *__pyx_b;\n+static PyObject *__pyx_empty_tuple;\n+static PyObject *__pyx_empty_bytes;\n+static int __pyx_lineno;\n+static int __pyx_clineno = 0;\n+static const char * __pyx_cfilenm= __FILE__;\n+static const char *__pyx_filename;\n+static const char **__pyx_f;\n+\n+\n+#if !defined(CYTHON_CCOMPLEX)\n+ #if defined(__cplusplus)\n+ #define CYTHON_CCOMPLEX 1\n+ #elif defined(_Complex_I)\n+ #define CYTHON_CCOMPLEX 1\n+ #else\n+ #define CYTHON_CCOMPLEX 0\n+ #endif\n+#endif\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ #include <complex>\n+ #else\n+ #include <complex.h>\n+ #endif\n+#endif\n+\n+#if CYTHON_CCOMPLEX && !defined(__cplusplus) && defined(__sun__) && defined(__GNUC__)\n+ #undef _Complex_I\n+ #define _Complex_I 1.0fj\n+#endif\n+\n+typedef npy_int8 __pyx_t_5numpy_int8_t;\n+\n+typedef npy_int16 __pyx_t_5numpy_int16_t;\n+\n+typedef npy_int32 __pyx_t_5numpy_int32_t;\n+\n+typedef npy_int64 __pyx_t_5numpy_int64_t;\n+\n+typedef npy_uint8 __pyx_t_5numpy_uint8_t;\n+\n+typedef npy_uint16 __pyx_t_5numpy_uint16_t;\n+\n+typedef npy_uint32 __pyx_t_5numpy_uint32_t;\n+\n+typedef npy_uint64 __pyx_t_5numpy_uint64_t;\n+\n+typedef npy_float32 __pyx_t_5numpy_float32_t;\n+\n+typedef npy_float64 __pyx_t_5numpy_float64_t;\n+\n+typedef npy_long __pyx_t_5numpy_int_t;\n+\n+typedef npy_longlong __pyx_t_5numpy_long_t;\n+\n+typedef npy_intp __pyx_t_5numpy_intp_t;\n+\n+typedef npy_uintp __pyx_t_5numpy_uintp_t;\n+\n+typedef npy_ulong __pyx_t_5numpy_uint_t;\n+\n+typedef npy_ulonglong __pyx_t_5numpy_ulong_t;\n+\n+typedef npy_double __pyx_t_5numpy_float_t;\n+\n+typedef npy_double __pyx_t_5numpy_double_t;\n+\n+typedef npy_longdouble __pyx_t_5numpy_longdouble_t;\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ typedef ::std::complex< float > __pyx_t_float_complex;\n+ #else\n+ typedef float _Complex __pyx_t_float_complex;\n+ #endif\n+#else\n+ typedef struct { float real, imag; } __pyx_t_float_complex;\n+#endif\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ typedef ::std::complex< double > __pyx_t_double_complex;\n+ #else\n+ typedef double _Complex __pyx_t_double_complex;\n+ #endif\n+#else\n+ typedef struct { double real, imag; } __pyx_t_double_complex;\n+#endif\n+\n+\n+\n+typedef npy_cfloat __pyx_t_5numpy_cfloat_t;\n+\n+typedef npy_cdouble __pyx_t_5numpy_cdouble_t;\n+\n+typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;\n+\n+typedef npy_cdouble __pyx_t_5numpy_complex_t;\n+\n+\n+\n+typedef struct {\n+ int ndim;\n+ int npoints;\n+ int nsimplex;\n+ double *points;\n+ int *vertices;\n+ int *neighbors;\n+ double *equations;\n+ double *transform;\n+ int *vertex_to_simplex;\n+ double paraboloid_scale;\n+ double paraboloid_shift;\n+ double *max_bound;\n+ double *min_bound;\n+} __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t;\n+\n+\n+\n+typedef struct {\n+ __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *info;\n+ int vertex;\n+ int edge;\n+ int vertex2;\n+ int triangle;\n+ int start_triangle;\n+ int start_edge;\n+} __pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t;\n+\n+#ifndef CYTHON_REFNANNY\n+ #define CYTHON_REFNANNY 0\n+#endif\n+\n+#if CYTHON_REFNANNY\n+ typedef struct {\n+ void (*INCREF)(void*, PyObject*, int);\n+ void (*DECREF)(void*, PyObject*, int);\n+ void (*GOTREF)(void*, PyObject*, int);\n+ void (*GIVEREF)(void*, PyObject*, int);\n+ void* (*SetupContext)(const char*, int, const char*);\n+ void (*FinishContext)(void**);\n+ } __Pyx_RefNannyAPIStruct;\n+ static __Pyx_RefNannyAPIStruct *__Pyx_RefNanny = NULL;\n+ static __Pyx_RefNannyAPIStruct * __Pyx_RefNannyImportAPI(const char *modname) {\n+ PyObject *m = NULL, *p = NULL;\n+ void *r = NULL;\n+ m = PyImport_ImportModule((char *)modname);\n+ if (!m) goto end;\n+ p = PyObject_GetAttrString(m, (char *)\"RefNannyAPI\");\n+ if (!p) goto end;\n+ r = PyLong_AsVoidPtr(p);\n+ end:\n+ Py_XDECREF(p);\n+ Py_XDECREF(m);\n+ return (__Pyx_RefNannyAPIStruct *)r;\n+ }\n+ #define __Pyx_RefNannySetupContext(name) void *__pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)\n+ #define __Pyx_RefNannyFinishContext() __Pyx_RefNanny->FinishContext(&__pyx_refnanny)\n+ #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)\n+ #define __Pyx_DECREF(r) __Pyx_RefNanny->DECREF(__pyx_refnanny, (PyObject *)(r), __LINE__)\n+ #define __Pyx_GOTREF(r) __Pyx_RefNanny->GOTREF(__pyx_refnanny, (PyObject *)(r), __LINE__)\n+ #define __Pyx_GIVEREF(r) __Pyx_RefNanny->GIVEREF(__pyx_refnanny, (PyObject *)(r), __LINE__)\n+ #define __Pyx_XDECREF(r) do { if((r) != NULL) {__Pyx_DECREF(r);} } while(0)\n+#else\n+ #define __Pyx_RefNannySetupContext(name)\n+ #define __Pyx_RefNannyFinishContext()\n+ #define __Pyx_INCREF(r) Py_INCREF(r)\n+ #define __Pyx_DECREF(r) Py_DECREF(r)\n+ #define __Pyx_GOTREF(r)\n+ #define __Pyx_GIVEREF(r)\n+ #define __Pyx_XDECREF(r) Py_XDECREF(r)\n+#endif \n+#define __Pyx_XGIVEREF(r) do { if((r) != NULL) {__Pyx_GIVEREF(r);} } while(0)\n+#define __Pyx_XGOTREF(r) do { if((r) != NULL) {__Pyx_GOTREF(r);} } while(0)\n+\n+\n+struct __Pyx_StructField_;\n+\n+typedef struct {\n+ const char* name; \n+ struct __Pyx_StructField_* fields;\n+ size_t size; \n+ char typegroup; \n+} __Pyx_TypeInfo;\n+\n+typedef struct __Pyx_StructField_ {\n+ __Pyx_TypeInfo* type;\n+ const char* name;\n+ size_t offset;\n+} __Pyx_StructField;\n+\n+typedef struct {\n+ __Pyx_StructField* field;\n+ size_t parent_offset;\n+} __Pyx_BufFmt_StackElem;\n+\n+\n+static CYTHON_INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info);\n+static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack);\n+\n+static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); \n+\n+static void __Pyx_RaiseBufferFallbackError(void); \n+\n+static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);\n+\n+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void);\n+\n+static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); \n+static int __Pyx_EndUnpack(PyObject *); \n+\n+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); \n+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); \n+\n+static void __Pyx_RaiseDoubleKeywordsError(\n+ const char* func_name, PyObject* kw_name); \n+\n+static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,\n+ Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found); \n+\n+static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[], PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args, const char* function_name); \n+static void __Pyx_RaiseBufferIndexError(int axis); \n+#define __Pyx_BufPtrStrided1d(type, buf, i0, s0) (type)((char*)buf + i0 * s0)\n+#define __Pyx_BufPtrStrided2d(type, buf, i0, s0, i1, s1) (type)((char*)buf + i0 * s0 + i1 * s1)\n+#define __Pyx_BufPtrStrided3d(type, buf, i0, s0, i1, s1, i2, s2) (type)((char*)buf + i0 * s0 + i1 * s1 + i2 * s2)\n+\n+\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {\n+ PyObject *r;\n+ if (!j) return NULL;\n+ r = PyObject_GetItem(o, j);\n+ Py_DECREF(j);\n+ return r;\n+}\n+\n+\n+#define __Pyx_GetItemInt_List(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_List_Fast(o, i, size <= sizeof(long)) : \\\n+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n+\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+ if (likely(o != Py_None)) {\n+ if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {\n+ PyObject *r = PyList_GET_ITEM(o, i);\n+ Py_INCREF(r);\n+ return r;\n+ }\n+ else if ((-PyList_GET_SIZE(o) <= i) & (i < 0)) {\n+ PyObject *r = PyList_GET_ITEM(o, PyList_GET_SIZE(o) + i);\n+ Py_INCREF(r);\n+ return r;\n+ }\n+ }\n+ return __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+}\n+\n+#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_Tuple_Fast(o, i, size <= sizeof(long)) : \\\n+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n+\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+ if (likely(o != Py_None)) {\n+ if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {\n+ PyObject *r = PyTuple_GET_ITEM(o, i);\n+ Py_INCREF(r);\n+ return r;\n+ }\n+ else if ((-PyTuple_GET_SIZE(o) <= i) & (i < 0)) {\n+ PyObject *r = PyTuple_GET_ITEM(o, PyTuple_GET_SIZE(o) + i);\n+ Py_INCREF(r);\n+ return r;\n+ }\n+ }\n+ return __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+}\n+\n+\n+#define __Pyx_GetItemInt(o, i, size, to_py_func) ((size <= sizeof(Py_ssize_t)) ? \\\n+ __Pyx_GetItemInt_Fast(o, i, size <= sizeof(long)) : \\\n+ __Pyx_GetItemInt_Generic(o, to_py_func(i)))\n+\n+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {\n+ PyObject *r;\n+ if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {\n+ r = PyList_GET_ITEM(o, i);\n+ Py_INCREF(r);\n+ }\n+ else if (PyTuple_CheckExact(o) && ((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {\n+ r = PyTuple_GET_ITEM(o, i);\n+ Py_INCREF(r);\n+ }\n+ else if (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_item && (likely(i >= 0))) {\n+ r = PySequence_GetItem(o, i);\n+ }\n+ else {\n+ r = __Pyx_GetItemInt_Generic(o, fits_long ? PyInt_FromLong(i) : PyLong_FromLongLong(i));\n+ }\n+ return r;\n+}\n+\n+static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void);\n+\n+static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index); \n+\n+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact); \n+#if PY_MAJOR_VERSION < 3\n+static int __Pyx_GetBuffer(PyObject *obj, Py_buffer *view, int flags);\n+static void __Pyx_ReleaseBuffer(Py_buffer *view);\n+#else\n+#define __Pyx_GetBuffer PyObject_GetBuffer\n+#define __Pyx_ReleaseBuffer PyBuffer_Release\n+#endif\n+\n+Py_ssize_t __Pyx_zeros[] = {0, 0, 0};\n+Py_ssize_t __Pyx_minusones[] = {-1, -1, -1};\n+\n+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); \n+\n+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); \n+\n+static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, const char *modname); \n+\n+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); \n+\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp);\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ #define __Pyx_CREAL(z) ((z).real())\n+ #define __Pyx_CIMAG(z) ((z).imag())\n+ #else\n+ #define __Pyx_CREAL(z) (__real__(z))\n+ #define __Pyx_CIMAG(z) (__imag__(z))\n+ #endif\n+#else\n+ #define __Pyx_CREAL(z) ((z).real)\n+ #define __Pyx_CIMAG(z) ((z).imag)\n+#endif\n+\n+#if defined(_WIN32) && defined(__cplusplus) && CYTHON_CCOMPLEX\n+ #define __Pyx_SET_CREAL(z,x) ((z).real(x))\n+ #define __Pyx_SET_CIMAG(z,y) ((z).imag(y))\n+#else\n+ #define __Pyx_SET_CREAL(z,x) __Pyx_CREAL(z) = (x)\n+ #define __Pyx_SET_CIMAG(z,y) __Pyx_CIMAG(z) = (y)\n+#endif\n+\n+static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float, float);\n+\n+#if CYTHON_CCOMPLEX\n+ #define __Pyx_c_eqf(a, b) ((a)==(b))\n+ #define __Pyx_c_sumf(a, b) ((a)+(b))\n+ #define __Pyx_c_difff(a, b) ((a)-(b))\n+ #define __Pyx_c_prodf(a, b) ((a)*(b))\n+ #define __Pyx_c_quotf(a, b) ((a)\/(b))\n+ #define __Pyx_c_negf(a) (-(a))\n+ #ifdef __cplusplus\n+ #define __Pyx_c_is_zerof(z) ((z)==(float)0)\n+ #define __Pyx_c_conjf(z) (::std::conj(z))\n+ \n+ #else\n+ #define __Pyx_c_is_zerof(z) ((z)==0)\n+ #define __Pyx_c_conjf(z) (conjf(z))\n+ \n+ #endif\n+#else\n+ static CYTHON_INLINE int __Pyx_c_eqf(__pyx_t_float_complex, __pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_sumf(__pyx_t_float_complex, __pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_difff(__pyx_t_float_complex, __pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_prodf(__pyx_t_float_complex, __pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_quotf(__pyx_t_float_complex, __pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_negf(__pyx_t_float_complex);\n+ static CYTHON_INLINE int __Pyx_c_is_zerof(__pyx_t_float_complex);\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_conjf(__pyx_t_float_complex);\n+ \n+#endif\n+\n+static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double, double);\n+\n+#if CYTHON_CCOMPLEX\n+ #define __Pyx_c_eq(a, b) ((a)==(b))\n+ #define __Pyx_c_sum(a, b) ((a)+(b))\n+ #define __Pyx_c_diff(a, b) ((a)-(b))\n+ #define __Pyx_c_prod(a, b) ((a)*(b))\n+ #define __Pyx_c_quot(a, b) ((a)\/(b))\n+ #define __Pyx_c_neg(a) (-(a))\n+ #ifdef __cplusplus\n+ #define __Pyx_c_is_zero(z) ((z)==(double)0)\n+ #define __Pyx_c_conj(z) (::std::conj(z))\n+ \n+ #else\n+ #define __Pyx_c_is_zero(z) ((z)==0)\n+ #define __Pyx_c_conj(z) (conj(z))\n+ \n+ #endif\n+#else\n+ static CYTHON_INLINE int __Pyx_c_eq(__pyx_t_double_complex, __pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_sum(__pyx_t_double_complex, __pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_diff(__pyx_t_double_complex, __pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_prod(__pyx_t_double_complex, __pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_quot(__pyx_t_double_complex, __pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_neg(__pyx_t_double_complex);\n+ static CYTHON_INLINE int __Pyx_c_is_zero(__pyx_t_double_complex);\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_conj(__pyx_t_double_complex);\n+ \n+#endif\n+\n+static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);\n+\n+static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);\n+\n+static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);\n+\n+static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);\n+\n+static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);\n+\n+static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);\n+\n+static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);\n+\n+static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);\n+\n+static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);\n+\n+static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);\n+\n+static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);\n+\n+static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);\n+\n+static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);\n+\n+static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);\n+\n+static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);\n+\n+static void __Pyx_WriteUnraisable(const char *name); \n+\n+static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig); \n+\n+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size, int strict); \n+\n+static PyObject *__Pyx_ImportModule(const char *name); \n+\n+static void __Pyx_AddTraceback(const char *funcname); \n+\n+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); \n+\n+\n+\n+\n+\n+\n+\n+\n+\n+\n+\n+\n+static PyTypeObject *__pyx_ptype_5numpy_dtype = 0;\n+static PyTypeObject *__pyx_ptype_5numpy_flatiter = 0;\n+static PyTypeObject *__pyx_ptype_5numpy_broadcast = 0;\n+static PyTypeObject *__pyx_ptype_5numpy_ndarray = 0;\n+static PyTypeObject *__pyx_ptype_5numpy_ufunc = 0;\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *); \n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *, PyObject *); \n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *, PyObject *, PyObject *); \n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *, PyObject *, PyObject *, PyObject *); \n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *, PyObject *, PyObject *, PyObject *, PyObject *); \n+static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *, char *, char *, int *); \n+static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *, PyObject *); \n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *); \n+\n+\n+\n+\n+static __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_f_5scipy_7spatial_5qhull__get_delaunay_info(PyObject *, int, int); \n+static int __pyx_f_5scipy_7spatial_5qhull__barycentric_inside(int, double *, double *, double *, double); \n+static void __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinate_single(int, double *, double *, double *, int); \n+static void __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinates(int, double *, double *, double *); \n+static void __pyx_f_5scipy_7spatial_5qhull__lift_point(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *); \n+static double __pyx_f_5scipy_7spatial_5qhull__distplane(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int, double *); \n+static int __pyx_f_5scipy_7spatial_5qhull__is_point_fully_outside(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double); \n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex_bruteforce(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, double); \n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex_directed(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, int *, double); \n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, int *, double); \n+static void __pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_init(__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *, __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int); \n+static void __pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_next(__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *); \n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_double_t = { \"numpy.double_t\", NULL, sizeof(__pyx_t_5numpy_double_t), 'R' };\n+static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_5numpy_int_t = { \"numpy.int_t\", NULL, sizeof(__pyx_t_5numpy_int_t), 'I' };\n+#define __Pyx_MODULE_NAME \"scipy.spatial.qhull\"\n+int __pyx_module_is_main_scipy__spatial__qhull = 0;\n+\n+\n+static PyObject *__pyx_builtin_object;\n+static PyObject *__pyx_builtin_property;\n+static PyObject *__pyx_builtin_ValueError;\n+static PyObject *__pyx_builtin_RuntimeError;\n+static PyObject *__pyx_builtin_xrange;\n+static PyObject *__pyx_builtin_range;\n+static char __pyx_k_1[] = \"qhull d Qz Qbb Qt\";\n+static char __pyx_k_2[] = \"No points to triangulate\";\n+static char __pyx_k_3[] = \"Need at least 2-D data to triangulate\";\n+static char __pyx_k_4[] = \"Qhull error\";\n+static char __pyx_k_5[] = \"_qhull_get_facet_array\";\n+static char __pyx_k_6[] = \"qhull: did not free %d bytes (%d pieces)\";\n+static char __pyx_k_7[] = \"non-simplical facet encountered\";\n+static char __pyx_k_8[] = \"_get_barycentric_transforms\";\n+static char __pyx_k_10[] = \"wrong dimensionality in xi\";\n+static char __pyx_k_11[] = \"xi has different dimensionality than triangulation\";\n+static char __pyx_k_12[] = \"ndarray is not C contiguous\";\n+static char __pyx_k_13[] = \"ndarray is not Fortran contiguous\";\n+static char __pyx_k_14[] = \"Non-native byte order not supported\";\n+static char __pyx_k_15[] = \"unknown dtype code in numpy.pxd (%d)\";\n+static char __pyx_k_16[] = \"Format string allocated too short, see comment in numpy.pxd\";\n+static char __pyx_k_17[] = \"Format string allocated too short.\";\n+static char __pyx_k_18[] = \"\\nWrappers for Qhull triangulation, plus some additional N-D geometry utilities\\n\\n.. versionadded:: 0.9\\n\\n\";\n+static char __pyx_k_19[] = \"\\n Delaunay(points)\\n\\n Delaunay tesselation in N dimensions\\n\\n .. versionadded:: 0.9\\n\\n Parameters\\n ----------\\n points : ndarray of floats, shape (npoints, ndim)\\n Coordinates of points to triangulate\\n\\n Attributes\\n ----------\\n points : ndarray of double, shape (npoints, ndim)\\n Points in the triangulation\\n vertices : ndarray of ints, shape (nsimplex, ndim+1)\\n Indices of vertices forming simplices in the triangulation\\n neighbors : ndarray of ints, shape (nsimplex, ndim+1)\\n Indices of neighbor simplices for each simplex.\\n The kth neighbor is opposite to the kth vertex.\\n For simplices at the boundary, -1 denotes no neighbor.\\n equations : ndarray of double, shape (nsimplex, ndim+2)\\n [normal, offset] forming the hyperplane equation of the facet\\n on the paraboloid. (See [Qhull]_ documentation for more.)\\n paraboloid_scale, paraboloid_shift : float\\n Scale and shift for the extra paraboloid dimension.\\n (See [Qhull]_ documentation for more.)\\n transform : ndarray of double, shape (nsimplex, ndim+1, ndim)\\n Affine transform from ``x`` to the barycentric coordinates ``c``.\\n This is defined by::\\n\\n T c = x - r\\n\\n At vertex ``j``, ``c_j = 1`` and the other coordinates zero.\\n\\n For simplex ``i``, ``transform[i,:ndim,:ndim]`` contains\\n inverse of the matrix ``T``, and ``transform[i,ndim,:]``\\n contains the vector ``r``.\\n vertex_to_simplex : ndarray of int, shape (npoints,)\\n Lookup array, from a vertex, to some simplex which it is a part of.\\n convex_hull : ndarray of int, shape (nfaces, ndim)\\n Vertices of facets forming the convex hull of the point set.\\n The array contains the indices of the points belonging to\\n the (N-1)-dimensional facets that form the convex hull\\n of the triangulation.\\n\\n Notes\\n -----\\n The tesselation is computed using the Qhull libary [Qhull]_.\\n\\n References\\n ----------\\n\\n .. [Qhull] http:\/\/www.qhull.org\/\\n\\n \";\n+static char __pyx_k__B[] = \"B\";\n+static char __pyx_k__H[] = \"H\";\n+static char __pyx_k__I[] = \"I\";\n+static char __pyx_k__L[] = \"L\";\n+static char __pyx_k__O[] = \"O\";\n+static char __pyx_k__Q[] = \"Q\";\n+static char __pyx_k__b[] = \"b\";\n+static char __pyx_k__d[] = \"d\";\n+static char __pyx_k__e[] = \"e\";\n+static char __pyx_k__f[] = \"f\";\n+static char __pyx_k__g[] = \"g\";\n+static char __pyx_k__h[] = \"h\";\n+static char __pyx_k__i[] = \"i\";\n+static char __pyx_k__l[] = \"l\";\n+static char __pyx_k__p[] = \"p\";\n+static char __pyx_k__q[] = \"q\";\n+static char __pyx_k__x[] = \"x\";\n+static char __pyx_k__Zd[] = \"Zd\";\n+static char __pyx_k__Zf[] = \"Zf\";\n+static char __pyx_k__Zg[] = \"Zg\";\n+static char __pyx_k__id[] = \"id\";\n+static char __pyx_k__np[] = \"np\";\n+static char __pyx_k__xi[] = \"xi\";\n+static char __pyx_k__buf[] = \"buf\";\n+static char __pyx_k__eps[] = \"eps\";\n+static char __pyx_k__int[] = \"int\";\n+static char __pyx_k__max[] = \"max\";\n+static char __pyx_k__min[] = \"min\";\n+static char __pyx_k__nan[] = \"nan\";\n+static char __pyx_k__obj[] = \"obj\";\n+static char __pyx_k__sum[] = \"sum\";\n+static char __pyx_k__tri[] = \"tri\";\n+static char __pyx_k__Lock[] = \"Lock\";\n+static char __pyx_k__axis[] = \"axis\";\n+static char __pyx_k__base[] = \"base\";\n+static char __pyx_k__data[] = \"data\";\n+static char __pyx_k__edge[] = \"edge\";\n+static char __pyx_k__fill[] = \"fill\";\n+static char __pyx_k__info[] = \"info\";\n+static char __pyx_k__ndim[] = \"ndim\";\n+static char __pyx_k__next[] = \"next\";\n+static char __pyx_k__prod[] = \"prod\";\n+static char __pyx_k__self[] = \"self\";\n+static char __pyx_k__descr[] = \"descr\";\n+static char __pyx_k__dtype[] = \"dtype\";\n+static char __pyx_k__empty[] = \"empty\";\n+static char __pyx_k__finfo[] = \"finfo\";\n+static char __pyx_k__names[] = \"names\";\n+static char __pyx_k__numpy[] = \"numpy\";\n+static char __pyx_k__point[] = \"point\";\n+static char __pyx_k__range[] = \"range\";\n+static char __pyx_k__shape[] = \"shape\";\n+static char __pyx_k__zeros[] = \"zeros\";\n+static char __pyx_k__astype[] = \"astype\";\n+static char __pyx_k__double[] = \"double\";\n+static char __pyx_k__fields[] = \"fields\";\n+static char __pyx_k__format[] = \"format\";\n+static char __pyx_k__normal[] = \"normal\";\n+static char __pyx_k__object[] = \"object\";\n+static char __pyx_k__offset[] = \"offset\";\n+static char __pyx_k__points[] = \"points\";\n+static char __pyx_k__resize[] = \"resize\";\n+static char __pyx_k__vertex[] = \"vertex\";\n+static char __pyx_k__xrange[] = \"xrange\";\n+static char __pyx_k____all__[] = \"__all__\";\n+static char __pyx_k__acquire[] = \"acquire\";\n+static char __pyx_k__npoints[] = \"npoints\";\n+static char __pyx_k__release[] = \"release\";\n+static char __pyx_k__reshape[] = \"reshape\";\n+static char __pyx_k__strides[] = \"strides\";\n+static char __pyx_k__tsearch[] = \"tsearch\";\n+static char __pyx_k__vertex2[] = \"vertex2\";\n+static char __pyx_k__Delaunay[] = \"Delaunay\";\n+static char __pyx_k____init__[] = \"__init__\";\n+static char __pyx_k____main__[] = \"__main__\";\n+static char __pyx_k__facet_id[] = \"facet_id\";\n+static char __pyx_k__itemsize[] = \"itemsize\";\n+static char __pyx_k__last_low[] = \"last_low\";\n+static char __pyx_k__nsimplex[] = \"nsimplex\";\n+static char __pyx_k__property[] = \"property\";\n+static char __pyx_k__readonly[] = \"readonly\";\n+static char __pyx_k__triangle[] = \"triangle\";\n+static char __pyx_k__type_num[] = \"type_num\";\n+static char __pyx_k__vertices[] = \"vertices\";\n+static char __pyx_k__NOerrexit[] = \"NOerrexit\";\n+static char __pyx_k__SCALElast[] = \"SCALElast\";\n+static char __pyx_k__byteorder[] = \"byteorder\";\n+static char __pyx_k__equations[] = \"equations\";\n+static char __pyx_k__last_high[] = \"last_high\";\n+static char __pyx_k__max_bound[] = \"max_bound\";\n+static char __pyx_k__min_bound[] = \"min_bound\";\n+static char __pyx_k__neighbors[] = \"neighbors\";\n+static char __pyx_k__numpoints[] = \"numpoints\";\n+static char __pyx_k__threading[] = \"threading\";\n+static char __pyx_k__transform[] = \"transform\";\n+static char __pyx_k__ValueError[] = \"ValueError\";\n+static char __pyx_k___transform[] = \"_transform\";\n+static char __pyx_k__asanyarray[] = \"asanyarray\";\n+static char __pyx_k__bruteforce[] = \"bruteforce\";\n+static char __pyx_k__facet_list[] = \"facet_list\";\n+static char __pyx_k__simplicial[] = \"simplicial\";\n+static char __pyx_k__start_edge[] = \"start_edge\";\n+static char __pyx_k__suboffsets[] = \"suboffsets\";\n+static char __pyx_k___qhull_lock[] = \"_qhull_lock\";\n+static char __pyx_k__convex_hull[] = \"convex_hull\";\n+static char __pyx_k__lift_points[] = \"lift_points\";\n+static char __pyx_k__RuntimeError[] = \"RuntimeError\";\n+static char __pyx_k__find_simplex[] = \"find_simplex\";\n+static char __pyx_k__last_newhigh[] = \"last_newhigh\";\n+static char __pyx_k__upperdelaunay[] = \"upperdelaunay\";\n+static char __pyx_k__plane_distance[] = \"plane_distance\";\n+static char __pyx_k__start_triangle[] = \"start_triangle\";\n+static char __pyx_k__paraboloid_scale[] = \"paraboloid_scale\";\n+static char __pyx_k__paraboloid_shift[] = \"paraboloid_shift\";\n+static char __pyx_k__ascontiguousarray[] = \"ascontiguousarray\";\n+static char __pyx_k__vertex_to_simplex[] = \"vertex_to_simplex\";\n+static char __pyx_k___vertex_to_simplex[] = \"_vertex_to_simplex\";\n+static char __pyx_k___construct_delaunay[] = \"_construct_delaunay\";\n+static PyObject *__pyx_kp_s_10;\n+static PyObject *__pyx_kp_s_11;\n+static PyObject *__pyx_kp_u_12;\n+static PyObject *__pyx_kp_u_13;\n+static PyObject *__pyx_kp_u_14;\n+static PyObject *__pyx_kp_u_15;\n+static PyObject *__pyx_kp_u_16;\n+static PyObject *__pyx_kp_u_17;\n+static PyObject *__pyx_kp_s_19;\n+static PyObject *__pyx_kp_s_2;\n+static PyObject *__pyx_kp_s_3;\n+static PyObject *__pyx_kp_s_4;\n+static PyObject *__pyx_n_s_5;\n+static PyObject *__pyx_kp_s_6;\n+static PyObject *__pyx_kp_s_7;\n+static PyObject *__pyx_n_s_8;\n+static PyObject *__pyx_n_s__Delaunay;\n+static PyObject *__pyx_n_s__Lock;\n+static PyObject *__pyx_n_s__NOerrexit;\n+static PyObject *__pyx_n_s__RuntimeError;\n+static PyObject *__pyx_n_s__SCALElast;\n+static PyObject *__pyx_n_s__ValueError;\n+static PyObject *__pyx_n_s____all__;\n+static PyObject *__pyx_n_s____init__;\n+static PyObject *__pyx_n_s____main__;\n+static PyObject *__pyx_n_s___construct_delaunay;\n+static PyObject *__pyx_n_s___qhull_lock;\n+static PyObject *__pyx_n_s___transform;\n+static PyObject *__pyx_n_s___vertex_to_simplex;\n+static PyObject *__pyx_n_s__acquire;\n+static PyObject *__pyx_n_s__asanyarray;\n+static PyObject *__pyx_n_s__ascontiguousarray;\n+static PyObject *__pyx_n_s__astype;\n+static PyObject *__pyx_n_s__axis;\n+static PyObject *__pyx_n_s__base;\n+static PyObject *__pyx_n_s__bruteforce;\n+static PyObject *__pyx_n_s__buf;\n+static PyObject *__pyx_n_s__byteorder;\n+static PyObject *__pyx_n_s__convex_hull;\n+static PyObject *__pyx_n_s__data;\n+static PyObject *__pyx_n_s__descr;\n+static PyObject *__pyx_n_s__double;\n+static PyObject *__pyx_n_s__dtype;\n+static PyObject *__pyx_n_s__e;\n+static PyObject *__pyx_n_s__edge;\n+static PyObject *__pyx_n_s__empty;\n+static PyObject *__pyx_n_s__eps;\n+static PyObject *__pyx_n_s__equations;\n+static PyObject *__pyx_n_s__facet_id;\n+static PyObject *__pyx_n_s__facet_list;\n+static PyObject *__pyx_n_s__fields;\n+static PyObject *__pyx_n_s__fill;\n+static PyObject *__pyx_n_s__find_simplex;\n+static PyObject *__pyx_n_s__finfo;\n+static PyObject *__pyx_n_s__format;\n+static PyObject *__pyx_n_s__id;\n+static PyObject *__pyx_n_s__info;\n+static PyObject *__pyx_n_s__int;\n+static PyObject *__pyx_n_s__itemsize;\n+static PyObject *__pyx_n_s__last_high;\n+static PyObject *__pyx_n_s__last_low;\n+static PyObject *__pyx_n_s__last_newhigh;\n+static PyObject *__pyx_n_s__lift_points;\n+static PyObject *__pyx_n_s__max;\n+static PyObject *__pyx_n_s__max_bound;\n+static PyObject *__pyx_n_s__min;\n+static PyObject *__pyx_n_s__min_bound;\n+static PyObject *__pyx_n_s__names;\n+static PyObject *__pyx_n_s__nan;\n+static PyObject *__pyx_n_s__ndim;\n+static PyObject *__pyx_n_s__neighbors;\n+static PyObject *__pyx_n_s__next;\n+static PyObject *__pyx_n_s__normal;\n+static PyObject *__pyx_n_s__np;\n+static PyObject *__pyx_n_s__npoints;\n+static PyObject *__pyx_n_s__nsimplex;\n+static PyObject *__pyx_n_s__numpoints;\n+static PyObject *__pyx_n_s__numpy;\n+static PyObject *__pyx_n_s__obj;\n+static PyObject *__pyx_n_s__object;\n+static PyObject *__pyx_n_s__offset;\n+static PyObject *__pyx_n_s__p;\n+static PyObject *__pyx_n_s__paraboloid_scale;\n+static PyObject *__pyx_n_s__paraboloid_shift;\n+static PyObject *__pyx_n_s__plane_distance;\n+static PyObject *__pyx_n_s__point;\n+static PyObject *__pyx_n_s__points;\n+static PyObject *__pyx_n_s__prod;\n+static PyObject *__pyx_n_s__property;\n+static PyObject *__pyx_n_s__range;\n+static PyObject *__pyx_n_s__readonly;\n+static PyObject *__pyx_n_s__release;\n+static PyObject *__pyx_n_s__reshape;\n+static PyObject *__pyx_n_s__resize;\n+static PyObject *__pyx_n_s__self;\n+static PyObject *__pyx_n_s__shape;\n+static PyObject *__pyx_n_s__simplicial;\n+static PyObject *__pyx_n_s__start_edge;\n+static PyObject *__pyx_n_s__start_triangle;\n+static PyObject *__pyx_n_s__strides;\n+static PyObject *__pyx_n_s__suboffsets;\n+static PyObject *__pyx_n_s__sum;\n+static PyObject *__pyx_n_s__threading;\n+static PyObject *__pyx_n_s__transform;\n+static PyObject *__pyx_n_s__tri;\n+static PyObject *__pyx_n_s__triangle;\n+static PyObject *__pyx_n_s__tsearch;\n+static PyObject *__pyx_n_s__type_num;\n+static PyObject *__pyx_n_s__upperdelaunay;\n+static PyObject *__pyx_n_s__vertex;\n+static PyObject *__pyx_n_s__vertex2;\n+static PyObject *__pyx_n_s__vertex_to_simplex;\n+static PyObject *__pyx_n_s__vertices;\n+static PyObject *__pyx_n_s__x;\n+static PyObject *__pyx_n_s__xi;\n+static PyObject *__pyx_n_s__xrange;\n+static PyObject *__pyx_n_s__zeros;\n+static PyObject *__pyx_int_0;\n+static PyObject *__pyx_int_1;\n+static PyObject *__pyx_int_2;\n+static PyObject *__pyx_int_neg_1;\n+static PyObject *__pyx_int_10;\n+static PyObject *__pyx_int_15;\n+static PyObject *__pyx_k_9;\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__construct_delaunay(PyObject *__pyx_self, PyObject *__pyx_v_points); \n+static char __pyx_doc_5scipy_7spatial_5qhull__construct_delaunay[] = \"\\n Perform Delaunay triangulation of the given set of points.\\n\\n \";\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__construct_delaunay(PyObject *__pyx_self, PyObject *__pyx_v_points) {\n+ char *__pyx_v_options;\n+ int __pyx_v_curlong;\n+ int __pyx_v_totlong;\n+ int __pyx_v_dim;\n+ int __pyx_v_numpoints;\n+ int __pyx_v_exitcode;\n+ PyObject *__pyx_v_paraboloid_scale;\n+ PyObject *__pyx_v_paraboloid_shift;\n+ PyObject *__pyx_v_vertices;\n+ PyObject *__pyx_v_neighbors;\n+ PyObject *__pyx_v_equations;\n+ Py_buffer __pyx_bstruct_points;\n+ Py_ssize_t __pyx_bstride_0_points = 0;\n+ Py_ssize_t __pyx_bstride_1_points = 0;\n+ Py_ssize_t __pyx_bshape_0_points = 0;\n+ Py_ssize_t __pyx_bshape_1_points = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyArrayObject *__pyx_t_4 = NULL;\n+ int __pyx_t_5;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyObject *__pyx_t_7 = NULL;\n+ PyObject *__pyx_t_8 = NULL;\n+ int __pyx_t_9;\n+ boolT __pyx_t_10;\n+ realT __pyx_t_11;\n+ PyObject *__pyx_t_12 = NULL;\n+ PyObject *__pyx_t_13 = NULL;\n+ int __pyx_t_14;\n+ int __pyx_t_15;\n+ __Pyx_RefNannySetupContext(\"_construct_delaunay\");\n+ __pyx_self = __pyx_self;\n+ __Pyx_INCREF((PyObject *)__pyx_v_points);\n+ __pyx_v_paraboloid_scale = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_paraboloid_shift = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_vertices = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_neighbors = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_equations = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_points.buf = NULL;\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_points), __pyx_ptype_5numpy_ndarray, 1, \"points\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_points, (PyObject*)__pyx_v_points, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_bstride_0_points = __pyx_bstruct_points.strides[0]; __pyx_bstride_1_points = __pyx_bstruct_points.strides[1];\n+ __pyx_bshape_0_points = __pyx_bstruct_points.shape[0]; __pyx_bshape_1_points = __pyx_bstruct_points.shape[1];\n+\n+ \n+ __pyx_v_options = __pyx_k_1;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(__pyx_v_points);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_points);\n+ __Pyx_GIVEREF(__pyx_v_points);\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = __pyx_t_3;\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __pyx_t_5 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_points, (PyObject*)__pyx_t_4, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_5 < 0)) {\n+ PyErr_Fetch(&__pyx_t_6, &__pyx_t_7, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_points, (PyObject*)__pyx_v_points, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_6); Py_XDECREF(__pyx_t_7); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_6, __pyx_t_7, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_points = __pyx_bstruct_points.strides[0]; __pyx_bstride_1_points = __pyx_bstruct_points.strides[1];\n+ __pyx_bshape_0_points = __pyx_bstruct_points.shape[0]; __pyx_bshape_1_points = __pyx_bstruct_points.shape[1];\n+ if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_v_points);\n+ __pyx_v_points = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_v_numpoints = (((PyArrayObject *)__pyx_v_points)->dimensions[0]);\n+\n+ \n+ __pyx_v_dim = (((PyArrayObject *)__pyx_v_points)->dimensions[1]);\n+\n+ \n+ __pyx_t_9 = (__pyx_v_numpoints <= 0);\n+ if (__pyx_t_9) {\n+\n+ \n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_2));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_2));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_2));\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_1, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __pyx_t_9 = (__pyx_v_dim < 2);\n+ if (__pyx_t_9) {\n+\n+ \n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_3));\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_kp_s_3));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_3));\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_Raise(__pyx_t_3, 0, 0);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s___qhull_lock); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__acquire); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+\n+ \n+ {\n+\n+ \n+ qh_qh.NOerrexit = 1;\n+\n+ \n+ __pyx_v_exitcode = qh_new_qhull(__pyx_v_dim, __pyx_v_numpoints, ((realT *)((PyArrayObject *)__pyx_v_points)->data), 0, __pyx_v_options, NULL, stderr);\n+\n+ \n+ {\n+\n+ \n+ __pyx_t_9 = (__pyx_v_exitcode != 0);\n+ if (__pyx_t_9) {\n+\n+ \n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_4));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_4));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_4));\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_1, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ goto __pyx_L13;\n+ }\n+ __pyx_L13:;\n+\n+ \n+ qh_triangulate();\n+\n+ \n+ __pyx_t_10 = qh_qh.SCALElast;\n+ if (__pyx_t_10) {\n+\n+ \n+ __pyx_t_11 = (qh_qh.last_high - qh_qh.last_low);\n+ if (unlikely(__pyx_t_11 == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ }\n+ __pyx_t_1 = PyFloat_FromDouble((qh_qh.last_newhigh \/ __pyx_t_11)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __pyx_v_paraboloid_scale = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyFloat_FromDouble((-qh_qh.last_low)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyNumber_Multiply(__pyx_t_1, __pyx_v_paraboloid_scale); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __pyx_v_paraboloid_shift = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ goto __pyx_L14;\n+ }\n+ {\n+\n+ \n+ __pyx_t_3 = PyFloat_FromDouble(1.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __pyx_v_paraboloid_scale = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __pyx_v_paraboloid_shift = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ }\n+ __pyx_L14:;\n+\n+ \n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_dim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyInt_FromLong(__pyx_v_numpoints); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_12 = PyTuple_New(2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_12, 1, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_1 = 0;\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_3, __pyx_t_12, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ if (PyTuple_CheckExact(__pyx_t_2) && likely(PyTuple_GET_SIZE(__pyx_t_2) == 3)) {\n+ PyObject* tuple = __pyx_t_2;\n+ __pyx_t_12 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_12);\n+ __pyx_t_3 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_3);\n+ __pyx_t_1 = PyTuple_GET_ITEM(tuple, 2); __Pyx_INCREF(__pyx_t_1);\n+\n+ \n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __pyx_v_vertices = __pyx_t_12;\n+ __pyx_t_12 = 0;\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __pyx_v_neighbors = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __pyx_v_equations = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ } else {\n+ __pyx_t_13 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_13);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_12 = __Pyx_UnpackItem(__pyx_t_13, 0); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_3 = __Pyx_UnpackItem(__pyx_t_13, 1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_1 = __Pyx_UnpackItem(__pyx_t_13, 2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (__Pyx_EndUnpack(__pyx_t_13) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __pyx_v_vertices = __pyx_t_12;\n+ __pyx_t_12 = 0;\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __pyx_v_neighbors = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __pyx_v_equations = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ }\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+\n+ \n+ __pyx_t_2 = PyTuple_New(5); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L11;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_v_vertices);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_vertices);\n+ __Pyx_GIVEREF(__pyx_v_vertices);\n+ __Pyx_INCREF(__pyx_v_neighbors);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_v_neighbors);\n+ __Pyx_GIVEREF(__pyx_v_neighbors);\n+ __Pyx_INCREF(__pyx_v_equations);\n+ PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_v_equations);\n+ __Pyx_GIVEREF(__pyx_v_equations);\n+ __Pyx_INCREF(__pyx_v_paraboloid_scale);\n+ PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_v_paraboloid_scale);\n+ __Pyx_GIVEREF(__pyx_v_paraboloid_scale);\n+ __Pyx_INCREF(__pyx_v_paraboloid_shift);\n+ PyTuple_SET_ITEM(__pyx_t_2, 4, __pyx_v_paraboloid_shift);\n+ __Pyx_GIVEREF(__pyx_v_paraboloid_shift);\n+ __pyx_r = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ goto __pyx_L10;\n+ }\n+ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L12;\n+ __pyx_L10: __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 3; goto __pyx_L12;\n+ __pyx_L11: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;\n+ __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+\n+ \n+ qh_freeqhull(0);\n+\n+ \n+ qh_memfreeshort((&__pyx_v_curlong), (&__pyx_v_totlong));\n+\n+ \n+ __pyx_t_9 = (__pyx_v_curlong != 0);\n+ if (!__pyx_t_9) {\n+ __pyx_t_14 = (__pyx_v_totlong != 0);\n+ __pyx_t_15 = __pyx_t_14;\n+ } else {\n+ __pyx_t_15 = __pyx_t_9;\n+ }\n+ if (__pyx_t_15) {\n+\n+ \n+ __pyx_t_2 = PyInt_FromLong(__pyx_v_totlong); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_curlong); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_2 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_6), __pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_1, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L15_error;}\n+ goto __pyx_L16;\n+ }\n+ __pyx_L16:;\n+ goto __pyx_L17;\n+ __pyx_L15_error:;\n+ if (__pyx_why == 4) {\n+ Py_XDECREF(__pyx_exc_type);\n+ Py_XDECREF(__pyx_exc_value);\n+ Py_XDECREF(__pyx_exc_tb);\n+ }\n+ goto __pyx_L8;\n+ __pyx_L17:;\n+ switch (__pyx_why) {\n+ case 3: goto __pyx_L7;\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L8;\n+ }\n+ }\n+ }\n+ }\n+ {\n+ int __pyx_why;\n+ PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;\n+ int __pyx_exc_lineno;\n+ __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 0; goto __pyx_L9;\n+ __pyx_L7: __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;\n+ __pyx_why = 3; goto __pyx_L9;\n+ __pyx_L8: {\n+ __pyx_why = 4;\n+ __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0;\n+ __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);\n+ __pyx_exc_lineno = __pyx_lineno;\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s___qhull_lock); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L18_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__release); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L18_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L18_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ goto __pyx_L19;\n+ __pyx_L18_error:;\n+ if (__pyx_why == 4) {\n+ Py_XDECREF(__pyx_exc_type);\n+ Py_XDECREF(__pyx_exc_value);\n+ Py_XDECREF(__pyx_exc_tb);\n+ }\n+ goto __pyx_L1_error;\n+ __pyx_L19:;\n+ switch (__pyx_why) {\n+ case 3: goto __pyx_L0;\n+ case 4: {\n+ __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);\n+ __pyx_lineno = __pyx_exc_lineno;\n+ __pyx_exc_type = 0;\n+ __pyx_exc_value = 0;\n+ __pyx_exc_tb = 0;\n+ goto __pyx_L1_error;\n+ }\n+ }\n+ }\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_12);\n+ __Pyx_XDECREF(__pyx_t_13);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull._construct_delaunay\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __pyx_L2:;\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __Pyx_DECREF((PyObject *)__pyx_v_points);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__qhull_get_facet_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull__qhull_get_facet_array[] = \"\\n Return array of simplical facets currently in Qhull.\\n\\n Returns\\n -------\\n vertices : array of int, shape (nfacets, ndim+1)\\n Indices of coordinates of vertices forming the simplical facets\\n neighbors : array of int, shape (nfacets, ndim)\\n Indices of neighboring facets. The kth neighbor is opposite\\n the kth vertex, and the first neighbor is the horizon facet\\n for the first vertex.\\n\\n Facets extending to infinity are denoted with index -1.\\n\\n \";\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__qhull_get_facet_array(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ int __pyx_v_ndim;\n+ int __pyx_v_numpoints;\n+ facetT *__pyx_v_facet;\n+ facetT *__pyx_v_neighbor;\n+ vertexT *__pyx_v_vertex;\n+ int __pyx_v_i;\n+ int __pyx_v_j;\n+ int __pyx_v_point;\n+ PyArrayObject *__pyx_v_vertices;\n+ PyArrayObject *__pyx_v_neighbors;\n+ PyArrayObject *__pyx_v_equations;\n+ PyArrayObject *__pyx_v_id_map;\n+ Py_buffer __pyx_bstruct_neighbors;\n+ Py_ssize_t __pyx_bstride_0_neighbors = 0;\n+ Py_ssize_t __pyx_bstride_1_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_0_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_1_neighbors = 0;\n+ Py_buffer __pyx_bstruct_id_map;\n+ Py_ssize_t __pyx_bstride_0_id_map = 0;\n+ Py_ssize_t __pyx_bshape_0_id_map = 0;\n+ Py_buffer __pyx_bstruct_vertices;\n+ Py_ssize_t __pyx_bstride_0_vertices = 0;\n+ Py_ssize_t __pyx_bstride_1_vertices = 0;\n+ Py_ssize_t __pyx_bshape_0_vertices = 0;\n+ Py_ssize_t __pyx_bshape_1_vertices = 0;\n+ Py_buffer __pyx_bstruct_equations;\n+ Py_ssize_t __pyx_bstride_0_equations = 0;\n+ Py_ssize_t __pyx_bstride_1_equations = 0;\n+ Py_ssize_t __pyx_bshape_0_equations = 0;\n+ Py_ssize_t __pyx_bshape_1_equations = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyArrayObject *__pyx_t_6 = NULL;\n+ int __pyx_t_7;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ int __pyx_t_11;\n+ int __pyx_t_12;\n+ unsigned int __pyx_t_13;\n+ PyArrayObject *__pyx_t_14 = NULL;\n+ PyArrayObject *__pyx_t_15 = NULL;\n+ PyArrayObject *__pyx_t_16 = NULL;\n+ flagT __pyx_t_17;\n+ long __pyx_t_18;\n+ int __pyx_t_19;\n+ int __pyx_t_20;\n+ int __pyx_t_21;\n+ unsigned int __pyx_t_22;\n+ int __pyx_t_23;\n+ int __pyx_t_24;\n+ int __pyx_t_25;\n+ int __pyx_t_26;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__ndim,&__pyx_n_s__numpoints,0};\n+ __Pyx_RefNannySetupContext(\"_qhull_get_facet_array\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__ndim);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__numpoints);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"_qhull_get_facet_array\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"_qhull_get_facet_array\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_ndim = __Pyx_PyInt_AsInt(values[0]); if (unlikely((__pyx_v_ndim == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_numpoints = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_numpoints == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_ndim = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 0)); if (unlikely((__pyx_v_ndim == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_v_numpoints = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_numpoints == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"_qhull_get_facet_array\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull._qhull_get_facet_array\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __pyx_v_vertices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_neighbors = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_equations = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_id_map = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_vertices.buf = NULL;\n+ __pyx_bstruct_neighbors.buf = NULL;\n+ __pyx_bstruct_equations.buf = NULL;\n+ __pyx_bstruct_id_map.buf = NULL;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyLong_FromUnsignedLong(qh_qh.facet_id); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__int); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyEval_CallObjectWithKeywords(__pyx_t_2, __pyx_t_1, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = ((PyArrayObject *)__pyx_t_5);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_id_map);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_id_map, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_id_map, (PyObject*)__pyx_v_id_map, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ }\n+ }\n+ __pyx_bstride_0_id_map = __pyx_bstruct_id_map.strides[0];\n+ __pyx_bshape_0_id_map = __pyx_bstruct_id_map.shape[0];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_id_map));\n+ __pyx_v_id_map = ((PyArrayObject *)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \n+ __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_id_map), __pyx_n_s__fill); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(__pyx_int_neg_1);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_int_neg_1);\n+ __Pyx_GIVEREF(__pyx_int_neg_1);\n+ __pyx_t_1 = PyObject_Call(__pyx_t_5, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_v_facet = qh_qh.facet_list;\n+\n+ \n+ __pyx_v_j = 0;\n+\n+ \n+ while (1) {\n+ if ((__pyx_v_facet != 0)) {\n+ __pyx_t_11 = (__pyx_v_facet->next != 0);\n+ } else {\n+ __pyx_t_11 = (__pyx_v_facet != 0);\n+ }\n+ if (!__pyx_t_11) break;\n+\n+ \n+ if (__pyx_v_facet->simplicial) {\n+ __pyx_t_11 = (!__pyx_v_facet->upperdelaunay);\n+ __pyx_t_12 = __pyx_t_11;\n+ } else {\n+ __pyx_t_12 = __pyx_v_facet->simplicial;\n+ }\n+ if (__pyx_t_12) {\n+\n+ \n+ __pyx_t_13 = __pyx_v_facet->id;\n+ __pyx_t_7 = -1;\n+ if (unlikely(__pyx_t_13 >= __pyx_bshape_0_id_map)) __pyx_t_7 = 0;\n+ if (unlikely(__pyx_t_7 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_7);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_id_map.buf, __pyx_t_13, __pyx_bstride_0_id_map) = __pyx_v_j;\n+\n+ \n+ __pyx_v_j += 1;\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \n+ __pyx_v_facet = __pyx_v_facet->next;\n+ }\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__zeros); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_j); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyInt_FromLong((__pyx_v_ndim + 1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_1 = 0;\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__int); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_3, __pyx_t_5, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_14 = ((PyArrayObject *)__pyx_t_4);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_t_14, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_v_vertices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_vertices = __pyx_bstruct_vertices.strides[0]; __pyx_bstride_1_vertices = __pyx_bstruct_vertices.strides[1];\n+ __pyx_bshape_0_vertices = __pyx_bstruct_vertices.shape[0]; __pyx_bshape_1_vertices = __pyx_bstruct_vertices.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_14 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_vertices));\n+ __pyx_v_vertices = ((PyArrayObject *)__pyx_t_4);\n+ __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__zeros); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PyInt_FromLong(__pyx_v_j); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyInt_FromLong((__pyx_v_ndim + 1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_4 = 0;\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_3));\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__int); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyDict_SetItem(__pyx_t_3, ((PyObject *)__pyx_n_s__dtype), __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyEval_CallObjectWithKeywords(__pyx_t_2, __pyx_t_5, ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_15 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_neighbors, (PyObject*)__pyx_t_15, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_neighbors, (PyObject*)__pyx_v_neighbors, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ }\n+ }\n+ __pyx_bstride_0_neighbors = __pyx_bstruct_neighbors.strides[0]; __pyx_bstride_1_neighbors = __pyx_bstruct_neighbors.strides[1];\n+ __pyx_bshape_0_neighbors = __pyx_bstruct_neighbors.shape[0]; __pyx_bshape_1_neighbors = __pyx_bstruct_neighbors.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_15 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_neighbors));\n+ __pyx_v_neighbors = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__zeros); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_j); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyInt_FromLong((__pyx_v_ndim + 2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_1 = 0;\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__double); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_3, __pyx_t_5, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_16 = ((PyArrayObject *)__pyx_t_4);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_equations);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_equations, (PyObject*)__pyx_t_16, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_equations, (PyObject*)__pyx_v_equations, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_equations = __pyx_bstruct_equations.strides[0]; __pyx_bstride_1_equations = __pyx_bstruct_equations.strides[1];\n+ __pyx_bshape_0_equations = __pyx_bstruct_equations.shape[0]; __pyx_bshape_1_equations = __pyx_bstruct_equations.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_16 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_equations));\n+ __pyx_v_equations = ((PyArrayObject *)__pyx_t_4);\n+ __pyx_t_4 = 0;\n+\n+ \n+ __pyx_v_facet = qh_qh.facet_list;\n+\n+ \n+ __pyx_v_j = 0;\n+\n+ \n+ while (1) {\n+ if ((__pyx_v_facet != 0)) {\n+ __pyx_t_12 = (__pyx_v_facet->next != 0);\n+ } else {\n+ __pyx_t_12 = (__pyx_v_facet != 0);\n+ }\n+ if (!__pyx_t_12) break;\n+\n+ \n+ __pyx_t_12 = (!__pyx_v_facet->simplicial);\n+ if (__pyx_t_12) {\n+\n+ \n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_7));\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_s_7));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_7));\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_Raise(__pyx_t_2, 0, 0);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ \n+ __pyx_t_17 = __pyx_v_facet->upperdelaunay;\n+ if (__pyx_t_17) {\n+\n+ \n+ __pyx_v_facet = __pyx_v_facet->next;\n+\n+ \n+ goto __pyx_L9_continue;\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+\n+ \n+ __pyx_t_18 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_18; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \n+ __pyx_v_vertex = ((vertexT *)(__pyx_v_facet->vertices->e[__pyx_v_i]).p);\n+\n+ \n+ __pyx_v_point = qh_pointid(__pyx_v_vertex->point);\n+\n+ \n+ __pyx_t_19 = __pyx_v_j;\n+ __pyx_t_20 = __pyx_v_i;\n+ __pyx_t_21 = -1;\n+ if (__pyx_t_19 < 0) {\n+ __pyx_t_19 += __pyx_bshape_0_vertices;\n+ if (unlikely(__pyx_t_19 < 0)) __pyx_t_21 = 0;\n+ } else if (unlikely(__pyx_t_19 >= __pyx_bshape_0_vertices)) __pyx_t_21 = 0;\n+ if (__pyx_t_20 < 0) {\n+ __pyx_t_20 += __pyx_bshape_1_vertices;\n+ if (unlikely(__pyx_t_20 < 0)) __pyx_t_21 = 1;\n+ } else if (unlikely(__pyx_t_20 >= __pyx_bshape_1_vertices)) __pyx_t_21 = 1;\n+ if (unlikely(__pyx_t_21 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_21);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_19, __pyx_bstride_0_vertices, __pyx_t_20, __pyx_bstride_1_vertices) = __pyx_v_point;\n+ }\n+\n+ \n+ __pyx_t_18 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_18; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \n+ __pyx_v_neighbor = ((facetT *)(__pyx_v_facet->neighbors->e[__pyx_v_i]).p);\n+\n+ \n+ __pyx_t_22 = __pyx_v_neighbor->id;\n+ __pyx_t_21 = -1;\n+ if (unlikely(__pyx_t_22 >= __pyx_bshape_0_id_map)) __pyx_t_21 = 0;\n+ if (unlikely(__pyx_t_21 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_21);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_21 = __pyx_v_j;\n+ __pyx_t_23 = __pyx_v_i;\n+ __pyx_t_24 = -1;\n+ if (__pyx_t_21 < 0) {\n+ __pyx_t_21 += __pyx_bshape_0_neighbors;\n+ if (unlikely(__pyx_t_21 < 0)) __pyx_t_24 = 0;\n+ } else if (unlikely(__pyx_t_21 >= __pyx_bshape_0_neighbors)) __pyx_t_24 = 0;\n+ if (__pyx_t_23 < 0) {\n+ __pyx_t_23 += __pyx_bshape_1_neighbors;\n+ if (unlikely(__pyx_t_23 < 0)) __pyx_t_24 = 1;\n+ } else if (unlikely(__pyx_t_23 >= __pyx_bshape_1_neighbors)) __pyx_t_24 = 1;\n+ if (unlikely(__pyx_t_24 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_24);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_neighbors.buf, __pyx_t_21, __pyx_bstride_0_neighbors, __pyx_t_23, __pyx_bstride_1_neighbors) = (*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_id_map.buf, __pyx_t_22, __pyx_bstride_0_id_map));\n+ }\n+\n+ \n+ __pyx_t_18 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_18; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \n+ __pyx_t_24 = __pyx_v_j;\n+ __pyx_t_25 = __pyx_v_i;\n+ __pyx_t_26 = -1;\n+ if (__pyx_t_24 < 0) {\n+ __pyx_t_24 += __pyx_bshape_0_equations;\n+ if (unlikely(__pyx_t_24 < 0)) __pyx_t_26 = 0;\n+ } else if (unlikely(__pyx_t_24 >= __pyx_bshape_0_equations)) __pyx_t_26 = 0;\n+ if (__pyx_t_25 < 0) {\n+ __pyx_t_25 += __pyx_bshape_1_equations;\n+ if (unlikely(__pyx_t_25 < 0)) __pyx_t_26 = 1;\n+ } else if (unlikely(__pyx_t_25 >= __pyx_bshape_1_equations)) __pyx_t_26 = 1;\n+ if (unlikely(__pyx_t_26 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_26);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_equations.buf, __pyx_t_24, __pyx_bstride_0_equations, __pyx_t_25, __pyx_bstride_1_equations) = (__pyx_v_facet->normal[__pyx_v_i]);\n+ }\n+\n+ \n+ __pyx_t_7 = __pyx_v_j;\n+ __pyx_t_18 = (__pyx_v_ndim + 1);\n+ __pyx_t_26 = -1;\n+ if (__pyx_t_7 < 0) {\n+ __pyx_t_7 += __pyx_bshape_0_equations;\n+ if (unlikely(__pyx_t_7 < 0)) __pyx_t_26 = 0;\n+ } else if (unlikely(__pyx_t_7 >= __pyx_bshape_0_equations)) __pyx_t_26 = 0;\n+ if (__pyx_t_18 < 0) {\n+ __pyx_t_18 += __pyx_bshape_1_equations;\n+ if (unlikely(__pyx_t_18 < 0)) __pyx_t_26 = 1;\n+ } else if (unlikely(__pyx_t_18 >= __pyx_bshape_1_equations)) __pyx_t_26 = 1;\n+ if (unlikely(__pyx_t_26 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_26);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_equations.buf, __pyx_t_7, __pyx_bstride_0_equations, __pyx_t_18, __pyx_bstride_1_equations) = __pyx_v_facet->offset;\n+\n+ \n+ __pyx_v_j += 1;\n+\n+ \n+ __pyx_v_facet = __pyx_v_facet->next;\n+ __pyx_L9_continue:;\n+ }\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(((PyObject *)__pyx_v_vertices));\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_vertices));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_v_vertices));\n+ __Pyx_INCREF(((PyObject *)__pyx_v_neighbors));\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_neighbors));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_v_neighbors));\n+ __Pyx_INCREF(((PyObject *)__pyx_v_equations));\n+ PyTuple_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_v_equations));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_v_equations));\n+ __pyx_r = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_id_map);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_equations);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull._qhull_get_facet_array\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_id_map);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_equations);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_vertices);\n+ __Pyx_DECREF((PyObject *)__pyx_v_neighbors);\n+ __Pyx_DECREF((PyObject *)__pyx_v_equations);\n+ __Pyx_DECREF((PyObject *)__pyx_v_id_map);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__get_barycentric_transforms(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull__get_barycentric_transforms[] = \"\\n Compute barycentric affine coordinate transformations for given\\n simplices.\\n\\n Returns\\n -------\\n Tinvs : array, shape (nsimplex, ndim+1, ndim)\\n Barycentric transforms for each simplex.\\n\\n Tinvs[i,:ndim,:ndim] contains inverse of the matrix ``T``,\\n and Tinvs[i,ndim,:] contains the vector ``r_n`` (see below).\\n\\n Notes\\n -----\\n Barycentric transform from ``x`` to ``c`` is defined by::\\n\\n T c = x - r_n\\n\\n where the ``r_1, ..., r_n`` are the vertices of the simplex.\\n The matrix ``T`` is defined by the condition::\\n\\n T e_j = r_j - r_n\\n\\n where ``e_j`` is the unit axis vector, e.g, ``e_2 = [0,1,0,0,...]``\\n This implies that ``T_ij = (r_j - r_n)_i``.\\n\\n For the barycentric transforms, we need to compute the inverse\\n matrix ``T^-1`` and store the vectors ``r_n`` for each vertex.\\n These are stacked into the `Tinvs` returned.\\n\\n \";\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull__get_barycentric_transforms(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyArrayObject *__pyx_v_points = 0;\n+ PyArrayObject *__pyx_v_vertices = 0;\n+ PyArrayObject *__pyx_v_T;\n+ PyArrayObject *__pyx_v_Tinvs;\n+ int __pyx_v_ivertex;\n+ int __pyx_v_i;\n+ int __pyx_v_j;\n+ int __pyx_v_n;\n+ int __pyx_v_nrhs;\n+ int __pyx_v_lda;\n+ int __pyx_v_ldb;\n+ int __pyx_v_info;\n+ int __pyx_v_ipiv[(NPY_MAXDIMS + 1)];\n+ int __pyx_v_ndim;\n+ int __pyx_v_nvertex;\n+ double __pyx_v_nan;\n+ double __pyx_v_x1;\n+ double __pyx_v_x2;\n+ double __pyx_v_x3;\n+ double __pyx_v_y1;\n+ double __pyx_v_y2;\n+ double __pyx_v_y3;\n+ double __pyx_v_det;\n+ Py_buffer __pyx_bstruct_Tinvs;\n+ Py_ssize_t __pyx_bstride_0_Tinvs = 0;\n+ Py_ssize_t __pyx_bstride_1_Tinvs = 0;\n+ Py_ssize_t __pyx_bstride_2_Tinvs = 0;\n+ Py_ssize_t __pyx_bshape_0_Tinvs = 0;\n+ Py_ssize_t __pyx_bshape_1_Tinvs = 0;\n+ Py_ssize_t __pyx_bshape_2_Tinvs = 0;\n+ Py_buffer __pyx_bstruct_T;\n+ Py_ssize_t __pyx_bstride_0_T = 0;\n+ Py_ssize_t __pyx_bstride_1_T = 0;\n+ Py_ssize_t __pyx_bshape_0_T = 0;\n+ Py_ssize_t __pyx_bshape_1_T = 0;\n+ Py_buffer __pyx_bstruct_vertices;\n+ Py_ssize_t __pyx_bstride_0_vertices = 0;\n+ Py_ssize_t __pyx_bstride_1_vertices = 0;\n+ Py_ssize_t __pyx_bshape_0_vertices = 0;\n+ Py_ssize_t __pyx_bshape_1_vertices = 0;\n+ Py_buffer __pyx_bstruct_points;\n+ Py_ssize_t __pyx_bstride_0_points = 0;\n+ Py_ssize_t __pyx_bstride_1_points = 0;\n+ Py_ssize_t __pyx_bshape_0_points = 0;\n+ Py_ssize_t __pyx_bshape_1_points = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ double __pyx_t_3;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyArrayObject *__pyx_t_7 = NULL;\n+ int __pyx_t_8;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyObject *__pyx_t_11 = NULL;\n+ PyArrayObject *__pyx_t_12 = NULL;\n+ int __pyx_t_13;\n+ int __pyx_t_14;\n+ int __pyx_t_15;\n+ long __pyx_t_16;\n+ __pyx_t_5numpy_int_t __pyx_t_17;\n+ long __pyx_t_18;\n+ int __pyx_t_19;\n+ long __pyx_t_20;\n+ __pyx_t_5numpy_int_t __pyx_t_21;\n+ long __pyx_t_22;\n+ int __pyx_t_23;\n+ long __pyx_t_24;\n+ __pyx_t_5numpy_int_t __pyx_t_25;\n+ long __pyx_t_26;\n+ int __pyx_t_27;\n+ long __pyx_t_28;\n+ __pyx_t_5numpy_int_t __pyx_t_29;\n+ long __pyx_t_30;\n+ int __pyx_t_31;\n+ long __pyx_t_32;\n+ __pyx_t_5numpy_int_t __pyx_t_33;\n+ long __pyx_t_34;\n+ int __pyx_t_35;\n+ long __pyx_t_36;\n+ __pyx_t_5numpy_int_t __pyx_t_37;\n+ long __pyx_t_38;\n+ int __pyx_t_39;\n+ long __pyx_t_40;\n+ long __pyx_t_41;\n+ int __pyx_t_42;\n+ long __pyx_t_43;\n+ long __pyx_t_44;\n+ int __pyx_t_45;\n+ long __pyx_t_46;\n+ long __pyx_t_47;\n+ int __pyx_t_48;\n+ long __pyx_t_49;\n+ long __pyx_t_50;\n+ int __pyx_t_51;\n+ long __pyx_t_52;\n+ long __pyx_t_53;\n+ int __pyx_t_54;\n+ long __pyx_t_55;\n+ long __pyx_t_56;\n+ int __pyx_t_57;\n+ int __pyx_t_58;\n+ int __pyx_t_59;\n+ int __pyx_t_60;\n+ __pyx_t_5numpy_int_t __pyx_t_61;\n+ int __pyx_t_62;\n+ int __pyx_t_63;\n+ int __pyx_t_64;\n+ int __pyx_t_65;\n+ int __pyx_t_66;\n+ int __pyx_t_67;\n+ int __pyx_t_68;\n+ int __pyx_t_69;\n+ __pyx_t_5numpy_int_t __pyx_t_70;\n+ int __pyx_t_71;\n+ int __pyx_t_72;\n+ int __pyx_t_73;\n+ int __pyx_t_74;\n+ int __pyx_t_75;\n+ int __pyx_t_76;\n+ int __pyx_t_77;\n+ long __pyx_t_78;\n+ int __pyx_t_79;\n+ int __pyx_t_80;\n+ int __pyx_t_81;\n+ int __pyx_t_82;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__points,&__pyx_n_s__vertices,0};\n+ __Pyx_RefNannySetupContext(\"_get_barycentric_transforms\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__points);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__vertices);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"_get_barycentric_transforms\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"_get_barycentric_transforms\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_points = ((PyArrayObject *)values[0]);\n+ __pyx_v_vertices = ((PyArrayObject *)values[1]);\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_points = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));\n+ __pyx_v_vertices = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"_get_barycentric_transforms\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull._get_barycentric_transforms\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __Pyx_INCREF((PyObject *)__pyx_v_points);\n+ __Pyx_INCREF((PyObject *)__pyx_v_vertices);\n+ __pyx_v_T = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_Tinvs = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_T.buf = NULL;\n+ __pyx_bstruct_Tinvs.buf = NULL;\n+ __pyx_bstruct_points.buf = NULL;\n+ __pyx_bstruct_vertices.buf = NULL;\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_points), __pyx_ptype_5numpy_ndarray, 1, \"points\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_vertices), __pyx_ptype_5numpy_ndarray, 1, \"vertices\", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 276; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_points, (PyObject*)__pyx_v_points, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_bstride_0_points = __pyx_bstruct_points.strides[0]; __pyx_bstride_1_points = __pyx_bstruct_points.strides[1];\n+ __pyx_bshape_0_points = __pyx_bstruct_points.shape[0]; __pyx_bshape_1_points = __pyx_bstruct_points.shape[1];\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_v_vertices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_bstride_0_vertices = __pyx_bstruct_vertices.strides[0]; __pyx_bstride_1_vertices = __pyx_bstruct_vertices.strides[1];\n+ __pyx_bshape_0_vertices = __pyx_bstruct_vertices.shape[0]; __pyx_bshape_1_vertices = __pyx_bstruct_vertices.shape[1];\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__nan); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_t_2); if (unlikely((__pyx_t_3 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_v_nan = __pyx_t_3;\n+\n+ \n+ __pyx_v_ndim = (__pyx_v_points->dimensions[1]);\n+\n+ \n+ __pyx_v_nvertex = (__pyx_v_vertices->dimensions[0]);\n+\n+ \n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ __pyx_t_2 = 0;\n+ __pyx_t_4 = 0;\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_4, ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n+ if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = ((PyArrayObject *)__pyx_t_6);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_T);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_T, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_8 < 0)) {\n+ PyErr_Fetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_T, (PyObject*)__pyx_v_T, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_11);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_9, __pyx_t_10, __pyx_t_11);\n+ }\n+ }\n+ __pyx_bstride_0_T = __pyx_bstruct_T.strides[0]; __pyx_bstride_1_T = __pyx_bstruct_T.strides[1];\n+ __pyx_bshape_0_T = __pyx_bstruct_T.shape[0]; __pyx_bshape_1_T = __pyx_bstruct_T.shape[1];\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_7 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_T));\n+ __pyx_v_T = ((PyArrayObject *)__pyx_t_6);\n+ __pyx_t_6 = 0;\n+\n+ \n+ __pyx_t_6 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__zeros); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyInt_FromLong(__pyx_v_nvertex); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_4 = PyInt_FromLong((__pyx_v_ndim + 1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_6);\n+ __Pyx_GIVEREF(__pyx_t_6);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_6 = 0;\n+ __pyx_t_4 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_4 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_4, __pyx_n_s__double); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyEval_CallObjectWithKeywords(__pyx_t_5, __pyx_t_1, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_12 = ((PyArrayObject *)__pyx_t_6);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_Tinvs);\n+ __pyx_t_8 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_Tinvs, (PyObject*)__pyx_t_12, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 3, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_8 < 0)) {\n+ PyErr_Fetch(&__pyx_t_11, &__pyx_t_10, &__pyx_t_9);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_Tinvs, (PyObject*)__pyx_v_Tinvs, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 3, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_11, __pyx_t_10, __pyx_t_9);\n+ }\n+ }\n+ __pyx_bstride_0_Tinvs = __pyx_bstruct_Tinvs.strides[0]; __pyx_bstride_1_Tinvs = __pyx_bstruct_Tinvs.strides[1]; __pyx_bstride_2_Tinvs = __pyx_bstruct_Tinvs.strides[2];\n+ __pyx_bshape_0_Tinvs = __pyx_bstruct_Tinvs.shape[0]; __pyx_bshape_1_Tinvs = __pyx_bstruct_Tinvs.shape[1]; __pyx_bshape_2_Tinvs = __pyx_bstruct_Tinvs.shape[2];\n+ if (unlikely(__pyx_t_8 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_12 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_Tinvs));\n+ __pyx_v_Tinvs = ((PyArrayObject *)__pyx_t_6);\n+ __pyx_t_6 = 0;\n+\n+ \n+ __pyx_t_8 = __pyx_v_nvertex;\n+ for (__pyx_t_13 = 0; __pyx_t_13 < __pyx_t_8; __pyx_t_13+=1) {\n+ __pyx_v_ivertex = __pyx_t_13;\n+\n+ \n+ __pyx_t_14 = (__pyx_v_ndim == 2);\n+ if (__pyx_t_14) {\n+\n+ \n+ __pyx_t_15 = __pyx_v_ivertex;\n+ __pyx_t_16 = 0;\n+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_1_vertices;\n+ __pyx_t_17 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_15, __pyx_bstride_0_vertices, __pyx_t_16, __pyx_bstride_1_vertices));\n+ __pyx_t_18 = 0;\n+ if (__pyx_t_17 < 0) __pyx_t_17 += __pyx_bshape_0_points;\n+ if (__pyx_t_18 < 0) __pyx_t_18 += __pyx_bshape_1_points;\n+ __pyx_v_x1 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_17, __pyx_bstride_0_points, __pyx_t_18, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_19 = __pyx_v_ivertex;\n+ __pyx_t_20 = 1;\n+ if (__pyx_t_19 < 0) __pyx_t_19 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_1_vertices;\n+ __pyx_t_21 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_19, __pyx_bstride_0_vertices, __pyx_t_20, __pyx_bstride_1_vertices));\n+ __pyx_t_22 = 0;\n+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_0_points;\n+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_1_points;\n+ __pyx_v_x2 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_21, __pyx_bstride_0_points, __pyx_t_22, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_23 = __pyx_v_ivertex;\n+ __pyx_t_24 = 2;\n+ if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_1_vertices;\n+ __pyx_t_25 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_23, __pyx_bstride_0_vertices, __pyx_t_24, __pyx_bstride_1_vertices));\n+ __pyx_t_26 = 0;\n+ if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_0_points;\n+ if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_1_points;\n+ __pyx_v_x3 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_25, __pyx_bstride_0_points, __pyx_t_26, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_27 = __pyx_v_ivertex;\n+ __pyx_t_28 = 0;\n+ if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_28 < 0) __pyx_t_28 += __pyx_bshape_1_vertices;\n+ __pyx_t_29 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_27, __pyx_bstride_0_vertices, __pyx_t_28, __pyx_bstride_1_vertices));\n+ __pyx_t_30 = 1;\n+ if (__pyx_t_29 < 0) __pyx_t_29 += __pyx_bshape_0_points;\n+ if (__pyx_t_30 < 0) __pyx_t_30 += __pyx_bshape_1_points;\n+ __pyx_v_y1 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_29, __pyx_bstride_0_points, __pyx_t_30, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_31 = __pyx_v_ivertex;\n+ __pyx_t_32 = 1;\n+ if (__pyx_t_31 < 0) __pyx_t_31 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_32 < 0) __pyx_t_32 += __pyx_bshape_1_vertices;\n+ __pyx_t_33 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_31, __pyx_bstride_0_vertices, __pyx_t_32, __pyx_bstride_1_vertices));\n+ __pyx_t_34 = 1;\n+ if (__pyx_t_33 < 0) __pyx_t_33 += __pyx_bshape_0_points;\n+ if (__pyx_t_34 < 0) __pyx_t_34 += __pyx_bshape_1_points;\n+ __pyx_v_y2 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_33, __pyx_bstride_0_points, __pyx_t_34, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_35 = __pyx_v_ivertex;\n+ __pyx_t_36 = 2;\n+ if (__pyx_t_35 < 0) __pyx_t_35 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_36 < 0) __pyx_t_36 += __pyx_bshape_1_vertices;\n+ __pyx_t_37 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_35, __pyx_bstride_0_vertices, __pyx_t_36, __pyx_bstride_1_vertices));\n+ __pyx_t_38 = 1;\n+ if (__pyx_t_37 < 0) __pyx_t_37 += __pyx_bshape_0_points;\n+ if (__pyx_t_38 < 0) __pyx_t_38 += __pyx_bshape_1_points;\n+ __pyx_v_y3 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_37, __pyx_bstride_0_points, __pyx_t_38, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_v_x1 -= __pyx_v_x3;\n+\n+ \n+ __pyx_v_x2 -= __pyx_v_x3;\n+\n+ \n+ __pyx_v_y1 -= __pyx_v_y3;\n+\n+ \n+ __pyx_v_y2 -= __pyx_v_y3;\n+\n+ \n+ __pyx_v_det = ((__pyx_v_x1 * __pyx_v_y2) - (__pyx_v_x2 * __pyx_v_y1));\n+\n+ \n+ __pyx_t_14 = (__pyx_v_det == 0);\n+ if (__pyx_t_14) {\n+\n+ \n+ __pyx_v_info = 1;\n+ goto __pyx_L9;\n+ }\n+ {\n+\n+ \n+ __pyx_v_info = 0;\n+\n+ \n+ if (unlikely(__pyx_v_det == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 356; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_39 = __pyx_v_ivertex;\n+ __pyx_t_40 = 0;\n+ __pyx_t_41 = 0;\n+ if (__pyx_t_39 < 0) __pyx_t_39 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_40 < 0) __pyx_t_40 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_41 < 0) __pyx_t_41 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_39, __pyx_bstride_0_Tinvs, __pyx_t_40, __pyx_bstride_1_Tinvs, __pyx_t_41, __pyx_bstride_2_Tinvs) = (__pyx_v_y2 \/ __pyx_v_det);\n+\n+ \n+ __pyx_t_3 = (-__pyx_v_x2);\n+ if (unlikely(__pyx_v_det == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 357; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_42 = __pyx_v_ivertex;\n+ __pyx_t_43 = 0;\n+ __pyx_t_44 = 1;\n+ if (__pyx_t_42 < 0) __pyx_t_42 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_43 < 0) __pyx_t_43 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_44 < 0) __pyx_t_44 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_42, __pyx_bstride_0_Tinvs, __pyx_t_43, __pyx_bstride_1_Tinvs, __pyx_t_44, __pyx_bstride_2_Tinvs) = (__pyx_t_3 \/ __pyx_v_det);\n+\n+ \n+ __pyx_t_3 = (-__pyx_v_y1);\n+ if (unlikely(__pyx_v_det == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 358; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_45 = __pyx_v_ivertex;\n+ __pyx_t_46 = 1;\n+ __pyx_t_47 = 0;\n+ if (__pyx_t_45 < 0) __pyx_t_45 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_46 < 0) __pyx_t_46 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_47 < 0) __pyx_t_47 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_45, __pyx_bstride_0_Tinvs, __pyx_t_46, __pyx_bstride_1_Tinvs, __pyx_t_47, __pyx_bstride_2_Tinvs) = (__pyx_t_3 \/ __pyx_v_det);\n+\n+ \n+ if (unlikely(__pyx_v_det == 0)) {\n+ PyErr_Format(PyExc_ZeroDivisionError, \"float division\");\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_48 = __pyx_v_ivertex;\n+ __pyx_t_49 = 1;\n+ __pyx_t_50 = 1;\n+ if (__pyx_t_48 < 0) __pyx_t_48 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_49 < 0) __pyx_t_49 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_50 < 0) __pyx_t_50 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_48, __pyx_bstride_0_Tinvs, __pyx_t_49, __pyx_bstride_1_Tinvs, __pyx_t_50, __pyx_bstride_2_Tinvs) = (__pyx_v_x1 \/ __pyx_v_det);\n+\n+ \n+ __pyx_t_51 = __pyx_v_ivertex;\n+ __pyx_t_52 = 2;\n+ __pyx_t_53 = 0;\n+ if (__pyx_t_51 < 0) __pyx_t_51 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_52 < 0) __pyx_t_52 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_53 < 0) __pyx_t_53 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_51, __pyx_bstride_0_Tinvs, __pyx_t_52, __pyx_bstride_1_Tinvs, __pyx_t_53, __pyx_bstride_2_Tinvs) = __pyx_v_x3;\n+\n+ \n+ __pyx_t_54 = __pyx_v_ivertex;\n+ __pyx_t_55 = 2;\n+ __pyx_t_56 = 1;\n+ if (__pyx_t_54 < 0) __pyx_t_54 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_55 < 0) __pyx_t_55 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_56 < 0) __pyx_t_56 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_54, __pyx_bstride_0_Tinvs, __pyx_t_55, __pyx_bstride_1_Tinvs, __pyx_t_56, __pyx_bstride_2_Tinvs) = __pyx_v_y3;\n+ }\n+ __pyx_L9:;\n+ goto __pyx_L8;\n+ }\n+ {\n+\n+ \n+ __pyx_t_57 = __pyx_v_ndim;\n+ for (__pyx_t_58 = 0; __pyx_t_58 < __pyx_t_57; __pyx_t_58+=1) {\n+ __pyx_v_i = __pyx_t_58;\n+\n+ \n+ __pyx_t_59 = __pyx_v_ivertex;\n+ __pyx_t_60 = __pyx_v_ndim;\n+ if (__pyx_t_59 < 0) __pyx_t_59 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_60 < 0) __pyx_t_60 += __pyx_bshape_1_vertices;\n+ __pyx_t_61 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_59, __pyx_bstride_0_vertices, __pyx_t_60, __pyx_bstride_1_vertices));\n+ __pyx_t_62 = __pyx_v_i;\n+ if (__pyx_t_61 < 0) __pyx_t_61 += __pyx_bshape_0_points;\n+ if (__pyx_t_62 < 0) __pyx_t_62 += __pyx_bshape_1_points;\n+ __pyx_t_63 = __pyx_v_ivertex;\n+ __pyx_t_64 = __pyx_v_ndim;\n+ __pyx_t_65 = __pyx_v_i;\n+ if (__pyx_t_63 < 0) __pyx_t_63 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_64 < 0) __pyx_t_64 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_65 < 0) __pyx_t_65 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_63, __pyx_bstride_0_Tinvs, __pyx_t_64, __pyx_bstride_1_Tinvs, __pyx_t_65, __pyx_bstride_2_Tinvs) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_61, __pyx_bstride_0_points, __pyx_t_62, __pyx_bstride_1_points));\n+\n+ \n+ __pyx_t_66 = __pyx_v_ndim;\n+ for (__pyx_t_67 = 0; __pyx_t_67 < __pyx_t_66; __pyx_t_67+=1) {\n+ __pyx_v_j = __pyx_t_67;\n+\n+ \n+ __pyx_t_68 = __pyx_v_ivertex;\n+ __pyx_t_69 = __pyx_v_j;\n+ if (__pyx_t_68 < 0) __pyx_t_68 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_69 < 0) __pyx_t_69 += __pyx_bshape_1_vertices;\n+ __pyx_t_70 = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_68, __pyx_bstride_0_vertices, __pyx_t_69, __pyx_bstride_1_vertices));\n+ __pyx_t_71 = __pyx_v_i;\n+ if (__pyx_t_70 < 0) __pyx_t_70 += __pyx_bshape_0_points;\n+ if (__pyx_t_71 < 0) __pyx_t_71 += __pyx_bshape_1_points;\n+\n+ \n+ __pyx_t_72 = __pyx_v_ivertex;\n+ __pyx_t_73 = __pyx_v_ndim;\n+ __pyx_t_74 = __pyx_v_i;\n+ if (__pyx_t_72 < 0) __pyx_t_72 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_73 < 0) __pyx_t_73 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_74 < 0) __pyx_t_74 += __pyx_bshape_2_Tinvs;\n+\n+ \n+ __pyx_t_75 = __pyx_v_i;\n+ __pyx_t_76 = __pyx_v_j;\n+ if (__pyx_t_75 < 0) __pyx_t_75 += __pyx_bshape_0_T;\n+ if (__pyx_t_76 < 0) __pyx_t_76 += __pyx_bshape_1_T;\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_T.buf, __pyx_t_75, __pyx_bstride_0_T, __pyx_t_76, __pyx_bstride_1_T) = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_points.buf, __pyx_t_70, __pyx_bstride_0_points, __pyx_t_71, __pyx_bstride_1_points)) - (*__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_72, __pyx_bstride_0_Tinvs, __pyx_t_73, __pyx_bstride_1_Tinvs, __pyx_t_74, __pyx_bstride_2_Tinvs)));\n+ }\n+\n+ \n+ __pyx_t_66 = __pyx_v_ivertex;\n+ __pyx_t_67 = __pyx_v_i;\n+ __pyx_t_77 = __pyx_v_i;\n+ if (__pyx_t_66 < 0) __pyx_t_66 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_67 < 0) __pyx_t_67 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_77 < 0) __pyx_t_77 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_66, __pyx_bstride_0_Tinvs, __pyx_t_67, __pyx_bstride_1_Tinvs, __pyx_t_77, __pyx_bstride_2_Tinvs) = 1;\n+ }\n+\n+ \n+ __pyx_v_n = __pyx_v_ndim;\n+\n+ \n+ __pyx_v_nrhs = __pyx_v_ndim;\n+\n+ \n+ __pyx_v_lda = __pyx_v_ndim;\n+\n+ \n+ __pyx_v_ldb = __pyx_v_ndim;\n+\n+ \n+ qh_dgesv((&__pyx_v_n), (&__pyx_v_nrhs), ((double *)__pyx_v_T->data), (&__pyx_v_lda), __pyx_v_ipiv, (((double *)__pyx_v_Tinvs->data) + ((__pyx_v_ndim * (__pyx_v_ndim + 1)) * __pyx_v_ivertex)), (&__pyx_v_ldb), (&__pyx_v_info));\n+ }\n+ __pyx_L8:;\n+\n+ \n+ __pyx_t_14 = (__pyx_v_info != 0);\n+ if (__pyx_t_14) {\n+\n+ \n+ __pyx_t_78 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_57 = 0; __pyx_t_57 < __pyx_t_78; __pyx_t_57+=1) {\n+ __pyx_v_i = __pyx_t_57;\n+\n+ \n+ __pyx_t_58 = __pyx_v_ndim;\n+ for (__pyx_t_79 = 0; __pyx_t_79 < __pyx_t_58; __pyx_t_79+=1) {\n+ __pyx_v_j = __pyx_t_79;\n+\n+ \n+ __pyx_t_80 = __pyx_v_ivertex;\n+ __pyx_t_81 = __pyx_v_i;\n+ __pyx_t_82 = __pyx_v_j;\n+ if (__pyx_t_80 < 0) __pyx_t_80 += __pyx_bshape_0_Tinvs;\n+ if (__pyx_t_81 < 0) __pyx_t_81 += __pyx_bshape_1_Tinvs;\n+ if (__pyx_t_82 < 0) __pyx_t_82 += __pyx_bshape_2_Tinvs;\n+ *__Pyx_BufPtrStrided3d(__pyx_t_5numpy_double_t *, __pyx_bstruct_Tinvs.buf, __pyx_t_80, __pyx_bstride_0_Tinvs, __pyx_t_81, __pyx_bstride_1_Tinvs, __pyx_t_82, __pyx_bstride_2_Tinvs) = __pyx_v_nan;\n+ }\n+ }\n+ goto __pyx_L14;\n+ }\n+ __pyx_L14:;\n+ }\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(((PyObject *)__pyx_v_Tinvs));\n+ __pyx_r = ((PyObject *)__pyx_v_Tinvs);\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_XDECREF(__pyx_t_6);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_Tinvs);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_T);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull._get_barycentric_transforms\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_Tinvs);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_T);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_T);\n+ __Pyx_DECREF((PyObject *)__pyx_v_Tinvs);\n+ __Pyx_DECREF((PyObject *)__pyx_v_points);\n+ __Pyx_DECREF((PyObject *)__pyx_v_vertices);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static int __pyx_f_5scipy_7spatial_5qhull__barycentric_inside(int __pyx_v_ndim, double *__pyx_v_transform, double *__pyx_v_x, double *__pyx_v_c, double __pyx_v_eps) {\n+ int __pyx_v_i;\n+ int __pyx_v_j;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ int __pyx_t_4;\n+ double __pyx_t_5;\n+ int __pyx_t_6;\n+ int __pyx_t_7;\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) = 1.0;\n+\n+ \n+ __pyx_t_1 = __pyx_v_ndim;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) = 0;\n+\n+ \n+ __pyx_t_3 = __pyx_v_ndim;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_j = __pyx_t_4;\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) += ((__pyx_v_transform[((__pyx_v_ndim * __pyx_v_i) + __pyx_v_j)]) * ((__pyx_v_x[__pyx_v_j]) - (__pyx_v_transform[((__pyx_v_ndim * __pyx_v_ndim) + __pyx_v_j)])));\n+ }\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) -= (__pyx_v_c[__pyx_v_i]);\n+\n+ \n+ __pyx_t_5 = (__pyx_v_c[__pyx_v_i]);\n+ __pyx_t_6 = ((-__pyx_v_eps) <= __pyx_t_5);\n+ if (__pyx_t_6) {\n+ __pyx_t_6 = (__pyx_t_5 <= (1 + __pyx_v_eps));\n+ }\n+ __pyx_t_7 = (!__pyx_t_6);\n+ if (__pyx_t_7) {\n+\n+ \n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+ }\n+\n+ \n+ __pyx_t_5 = (__pyx_v_c[__pyx_v_ndim]);\n+ __pyx_t_7 = ((-__pyx_v_eps) <= __pyx_t_5);\n+ if (__pyx_t_7) {\n+ __pyx_t_7 = (__pyx_t_5 <= (1 + __pyx_v_eps));\n+ }\n+ __pyx_t_6 = (!__pyx_t_7);\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \n+ __pyx_r = 1;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static void __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinate_single(int __pyx_v_ndim, double *__pyx_v_transform, double *__pyx_v_x, double *__pyx_v_c, int __pyx_v_i) {\n+ int __pyx_v_j;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+\n+ \n+ __pyx_t_1 = (__pyx_v_i == __pyx_v_ndim);\n+ if (__pyx_t_1) {\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) = 1.0;\n+\n+ \n+ __pyx_t_2 = __pyx_v_ndim;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_j = __pyx_t_3;\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) -= (__pyx_v_c[__pyx_v_j]);\n+ }\n+ goto __pyx_L3;\n+ }\n+ {\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) = 0;\n+\n+ \n+ __pyx_t_2 = __pyx_v_ndim;\n+ for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {\n+ __pyx_v_j = __pyx_t_3;\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) += ((__pyx_v_transform[((__pyx_v_ndim * __pyx_v_i) + __pyx_v_j)]) * ((__pyx_v_x[__pyx_v_j]) - (__pyx_v_transform[((__pyx_v_ndim * __pyx_v_ndim) + __pyx_v_j)])));\n+ }\n+ }\n+ __pyx_L3:;\n+\n+}\n+\n+\n+\n+static void __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinates(int __pyx_v_ndim, double *__pyx_v_transform, double *__pyx_v_x, double *__pyx_v_c) {\n+ int __pyx_v_i;\n+ int __pyx_v_j;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ int __pyx_t_4;\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) = 1.0;\n+\n+ \n+ __pyx_t_1 = __pyx_v_ndim;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) = 0;\n+\n+ \n+ __pyx_t_3 = __pyx_v_ndim;\n+ for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {\n+ __pyx_v_j = __pyx_t_4;\n+\n+ \n+ (__pyx_v_c[__pyx_v_i]) += ((__pyx_v_transform[((__pyx_v_ndim * __pyx_v_i) + __pyx_v_j)]) * ((__pyx_v_x[__pyx_v_j]) - (__pyx_v_transform[((__pyx_v_ndim * __pyx_v_ndim) + __pyx_v_j)])));\n+ }\n+\n+ \n+ (__pyx_v_c[__pyx_v_ndim]) -= (__pyx_v_c[__pyx_v_i]);\n+ }\n+\n+}\n+\n+\n+\n+static void __pyx_f_5scipy_7spatial_5qhull__lift_point(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, double *__pyx_v_x, double *__pyx_v_z) {\n+ int __pyx_v_i;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+\n+ \n+ (__pyx_v_z[__pyx_v_d->ndim]) = 0;\n+\n+ \n+ __pyx_t_1 = __pyx_v_d->ndim;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \n+ (__pyx_v_z[__pyx_v_i]) = (__pyx_v_x[__pyx_v_i]);\n+\n+ \n+ (__pyx_v_z[__pyx_v_d->ndim]) += pow((__pyx_v_x[__pyx_v_i]), 2);\n+ }\n+\n+ \n+ (__pyx_v_z[__pyx_v_d->ndim]) *= __pyx_v_d->paraboloid_scale;\n+\n+ \n+ (__pyx_v_z[__pyx_v_d->ndim]) += __pyx_v_d->paraboloid_shift;\n+\n+}\n+\n+\n+\n+static double __pyx_f_5scipy_7spatial_5qhull__distplane(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, int __pyx_v_isimplex, double *__pyx_v_point) {\n+ double __pyx_v_dist;\n+ int __pyx_v_k;\n+ double __pyx_r;\n+ long __pyx_t_1;\n+ int __pyx_t_2;\n+\n+ \n+ __pyx_v_dist = (__pyx_v_d->equations[(((__pyx_v_isimplex * (__pyx_v_d->ndim + 2)) + __pyx_v_d->ndim) + 1)]);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_d->ndim + 1);\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_k = __pyx_t_2;\n+\n+ \n+ __pyx_v_dist += ((__pyx_v_d->equations[((__pyx_v_isimplex * (__pyx_v_d->ndim + 2)) + __pyx_v_k)]) * (__pyx_v_point[__pyx_v_k]));\n+ }\n+\n+ \n+ __pyx_r = __pyx_v_dist;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static void __pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_init(__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *__pyx_v_it, __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, int __pyx_v_vertex) {\n+ int __pyx_v_k;\n+ int __pyx_v_ivertex;\n+ int __pyx_v_start;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+\n+ \n+ __pyx_v_start = 0;\n+\n+ \n+ __pyx_v_it->info = __pyx_v_d;\n+\n+ \n+ __pyx_v_it->vertex = __pyx_v_vertex;\n+\n+ \n+ __pyx_v_it->triangle = (__pyx_v_d->vertex_to_simplex[__pyx_v_vertex]);\n+\n+ \n+ __pyx_v_it->start_triangle = __pyx_v_it->triangle;\n+\n+ \n+ __pyx_t_1 = (__pyx_v_it->triangle != -1);\n+ if (__pyx_t_1) {\n+\n+ \n+ for (__pyx_t_2 = 0; __pyx_t_2 < 3; __pyx_t_2+=1) {\n+ __pyx_v_k = __pyx_t_2;\n+\n+ \n+ __pyx_v_ivertex = (__pyx_v_it->info->vertices[((__pyx_v_it->triangle * 3) + __pyx_v_k)]);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_ivertex != __pyx_v_vertex);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_v_it->vertex2 = __pyx_v_ivertex;\n+\n+ \n+ __pyx_v_it->edge = __pyx_v_k;\n+\n+ \n+ __pyx_v_it->start_edge = __pyx_v_k;\n+\n+ \n+ goto __pyx_L5_break;\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+ }\n+ __pyx_L5_break:;\n+ goto __pyx_L3;\n+ }\n+ {\n+\n+ \n+ __pyx_v_it->start_edge = -1;\n+\n+ \n+ __pyx_v_it->edge = -1;\n+ }\n+ __pyx_L3:;\n+\n+}\n+\n+\n+\n+static void __pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_next(__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *__pyx_v_it) {\n+ int __pyx_v_itri;\n+ int __pyx_v_k;\n+ int __pyx_v_ivertex;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ int __pyx_t_4;\n+\n+ \n+ __pyx_v_itri = (__pyx_v_it->info->neighbors[((__pyx_v_it->triangle * 3) + __pyx_v_it->edge)]);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_itri == -1);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_t_1 = (__pyx_v_it->start_edge == -1);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_v_it->edge = -1;\n+\n+ \n+ goto __pyx_L0;\n+ goto __pyx_L4;\n+ }\n+ __pyx_L4:;\n+\n+ \n+ for (__pyx_t_2 = 0; __pyx_t_2 < 3; __pyx_t_2+=1) {\n+ __pyx_v_k = __pyx_t_2;\n+\n+ \n+ __pyx_v_ivertex = (__pyx_v_it->info->vertices[((__pyx_v_it->triangle * 3) + __pyx_v_k)]);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_ivertex != __pyx_v_it->vertex);\n+ if (__pyx_t_1) {\n+ __pyx_t_3 = (__pyx_v_k != __pyx_v_it->start_edge);\n+ __pyx_t_4 = __pyx_t_3;\n+ } else {\n+ __pyx_t_4 = __pyx_t_1;\n+ }\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_v_it->edge = __pyx_v_k;\n+\n+ \n+ __pyx_v_it->vertex2 = __pyx_v_ivertex;\n+\n+ \n+ goto __pyx_L6_break;\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+ }\n+ __pyx_L6_break:;\n+\n+ \n+ __pyx_v_it->start_edge = -1;\n+\n+ \n+ goto __pyx_L0;\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \n+ for (__pyx_t_2 = 0; __pyx_t_2 < 3; __pyx_t_2+=1) {\n+ __pyx_v_k = __pyx_t_2;\n+\n+ \n+ __pyx_v_ivertex = (__pyx_v_it->info->vertices[((__pyx_v_itri * 3) + __pyx_v_k)]);\n+\n+ \n+ __pyx_t_4 = ((__pyx_v_it->info->neighbors[((__pyx_v_itri * 3) + __pyx_v_k)]) != __pyx_v_it->triangle);\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_t_1 = (__pyx_v_ivertex != __pyx_v_it->vertex);\n+ __pyx_t_3 = __pyx_t_1;\n+ } else {\n+ __pyx_t_3 = __pyx_t_4;\n+ }\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_v_it->edge = __pyx_v_k;\n+\n+ \n+ __pyx_v_it->vertex2 = __pyx_v_ivertex;\n+\n+ \n+ goto __pyx_L9_break;\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+ }\n+ __pyx_L9_break:;\n+\n+ \n+ __pyx_v_it->triangle = __pyx_v_itri;\n+\n+ \n+ __pyx_t_3 = (__pyx_v_it->triangle == __pyx_v_it->start_triangle);\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_v_it->edge = -1;\n+\n+ \n+ goto __pyx_L0;\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ __pyx_L0:;\n+}\n+\n+\n+\n+static int __pyx_f_5scipy_7spatial_5qhull__is_point_fully_outside(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, double *__pyx_v_x, double __pyx_v_eps) {\n+ int __pyx_v_i;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ int __pyx_t_4;\n+ int __pyx_t_5;\n+\n+ \n+ __pyx_t_1 = __pyx_v_d->ndim;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_i = __pyx_t_2;\n+\n+ \n+ __pyx_t_3 = ((__pyx_v_x[__pyx_v_i]) < ((__pyx_v_d->min_bound[__pyx_v_i]) - __pyx_v_eps));\n+ if (!__pyx_t_3) {\n+ __pyx_t_4 = ((__pyx_v_x[__pyx_v_i]) > ((__pyx_v_d->max_bound[__pyx_v_i]) + __pyx_v_eps));\n+ __pyx_t_5 = __pyx_t_4;\n+ } else {\n+ __pyx_t_5 = __pyx_t_3;\n+ }\n+ if (__pyx_t_5) {\n+\n+ \n+ __pyx_r = 1;\n+ goto __pyx_L0;\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+ }\n+\n+ \n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex_bruteforce(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, double *__pyx_v_c, double *__pyx_v_x, double __pyx_v_eps) {\n+ int __pyx_v_inside;\n+ int __pyx_v_isimplex;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+\n+ \n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_5qhull__is_point_fully_outside(__pyx_v_d, __pyx_v_x, __pyx_v_eps);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \n+ __pyx_t_1 = __pyx_v_d->nsimplex;\n+ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {\n+ __pyx_v_isimplex = __pyx_t_2;\n+\n+ \n+ __pyx_v_inside = __pyx_f_5scipy_7spatial_5qhull__barycentric_inside(__pyx_v_d->ndim, (__pyx_v_d->transform + ((__pyx_v_isimplex * __pyx_v_d->ndim) * (__pyx_v_d->ndim + 1))), __pyx_v_x, __pyx_v_c, __pyx_v_eps);\n+\n+ \n+ __pyx_t_3 = __pyx_v_inside;\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_r = __pyx_v_isimplex;\n+ goto __pyx_L0;\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+ }\n+\n+ \n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex_directed(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, double *__pyx_v_c, double *__pyx_v_x, int *__pyx_v_start, double __pyx_v_eps) {\n+ int __pyx_v_k;\n+ int __pyx_v_m;\n+ int __pyx_v_ndim;\n+ int __pyx_v_inside;\n+ int __pyx_v_isimplex;\n+ double *__pyx_v_transform;\n+ double __pyx_v_v;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ long __pyx_t_4;\n+ int __pyx_t_5;\n+\n+ \n+ __pyx_v_ndim = __pyx_v_d->ndim;\n+\n+ \n+ __pyx_v_isimplex = (__pyx_v_start[0]);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_isimplex < 0);\n+ if (!__pyx_t_1) {\n+ __pyx_t_2 = (__pyx_v_isimplex >= __pyx_v_d->nsimplex);\n+ __pyx_t_3 = __pyx_t_2;\n+ } else {\n+ __pyx_t_3 = __pyx_t_1;\n+ }\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_v_isimplex = 0;\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \n+ while (1) {\n+ __pyx_t_3 = (__pyx_v_isimplex != -1);\n+ if (!__pyx_t_3) break;\n+\n+ \n+ __pyx_v_transform = (__pyx_v_d->transform + ((__pyx_v_isimplex * __pyx_v_ndim) * (__pyx_v_ndim + 1)));\n+\n+ \n+ __pyx_v_inside = 1;\n+\n+ \n+ __pyx_t_4 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {\n+ __pyx_v_k = __pyx_t_5;\n+\n+ \n+ __pyx_f_5scipy_7spatial_5qhull__barycentric_coordinate_single(__pyx_v_ndim, __pyx_v_transform, __pyx_v_x, __pyx_v_c, __pyx_v_k);\n+\n+ \n+ __pyx_t_3 = ((__pyx_v_c[__pyx_v_k]) < (-__pyx_v_eps));\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_v_m = (__pyx_v_d->neighbors[(((__pyx_v_ndim + 1) * __pyx_v_isimplex) + __pyx_v_k)]);\n+\n+ \n+ __pyx_t_3 = (__pyx_v_m == -1);\n+ if (__pyx_t_3) {\n+\n+ \n+ (__pyx_v_start[0]) = __pyx_v_isimplex;\n+\n+ \n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+\n+ \n+ __pyx_v_v = (__pyx_v_d->transform[((__pyx_v_m * __pyx_v_ndim) * (__pyx_v_ndim + 1))]);\n+\n+ \n+ __pyx_t_3 = (__pyx_v_v != __pyx_v_v);\n+ if (__pyx_t_3) {\n+\n+ \n+ goto __pyx_L6_continue;\n+ goto __pyx_L10;\n+ }\n+ {\n+\n+ \n+ __pyx_v_isimplex = __pyx_v_m;\n+\n+ \n+ __pyx_v_inside = -1;\n+\n+ \n+ goto __pyx_L7_break;\n+ }\n+ __pyx_L10:;\n+ goto __pyx_L8;\n+ }\n+\n+ \n+ __pyx_t_3 = ((__pyx_v_c[__pyx_v_k]) > (1 + __pyx_v_eps));\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_v_inside = 0;\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+ __pyx_L6_continue:;\n+ }\n+ __pyx_L7_break:;\n+\n+ \n+ switch (__pyx_v_inside) {\n+ case -1:\n+\n+ \n+ goto __pyx_L4_continue;\n+ break;\n+\n+ \n+ case 1:\n+\n+ \n+ goto __pyx_L5_break;\n+ break;\n+ default:\n+\n+ \n+ __pyx_v_isimplex = __pyx_f_5scipy_7spatial_5qhull__find_simplex_bruteforce(__pyx_v_d, __pyx_v_c, __pyx_v_x, __pyx_v_eps);\n+\n+ \n+ goto __pyx_L5_break;\n+ break;\n+ }\n+ __pyx_L4_continue:;\n+ }\n+ __pyx_L5_break:;\n+\n+ \n+ (__pyx_v_start[0]) = __pyx_v_isimplex;\n+\n+ \n+ __pyx_r = __pyx_v_isimplex;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static int __pyx_f_5scipy_7spatial_5qhull__find_simplex(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_d, double *__pyx_v_c, double *__pyx_v_x, int *__pyx_v_start, double __pyx_v_eps) {\n+ int __pyx_v_isimplex;\n+ int __pyx_v_k;\n+ int __pyx_v_ineigh;\n+ int __pyx_v_ndim;\n+ double __pyx_v_z[(NPY_MAXDIMS + 1)];\n+ double __pyx_v_best_dist;\n+ double __pyx_v_dist;\n+ int __pyx_v_changed;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ int __pyx_t_4;\n+ long __pyx_t_5;\n+\n+ \n+ __pyx_t_1 = __pyx_f_5scipy_7spatial_5qhull__is_point_fully_outside(__pyx_v_d, __pyx_v_x, __pyx_v_eps);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+ goto __pyx_L3;\n+ }\n+ __pyx_L3:;\n+\n+ \n+ __pyx_t_2 = (__pyx_v_d->nsimplex <= 0);\n+ if (__pyx_t_2) {\n+\n+ \n+ __pyx_r = -1;\n+ goto __pyx_L0;\n+ goto __pyx_L4;\n+ }\n+ __pyx_L4:;\n+\n+ \n+ __pyx_v_ndim = __pyx_v_d->ndim;\n+\n+ \n+ __pyx_v_isimplex = (__pyx_v_start[0]);\n+\n+ \n+ __pyx_t_2 = (__pyx_v_isimplex < 0);\n+ if (!__pyx_t_2) {\n+ __pyx_t_3 = (__pyx_v_isimplex >= __pyx_v_d->nsimplex);\n+ __pyx_t_4 = __pyx_t_3;\n+ } else {\n+ __pyx_t_4 = __pyx_t_2;\n+ }\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_v_isimplex = 0;\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __pyx_f_5scipy_7spatial_5qhull__lift_point(__pyx_v_d, __pyx_v_x, __pyx_v_z);\n+\n+ \n+ __pyx_v_best_dist = __pyx_f_5scipy_7spatial_5qhull__distplane(__pyx_v_d, __pyx_v_isimplex, __pyx_v_z);\n+\n+ \n+ __pyx_v_changed = 1;\n+\n+ \n+ while (1) {\n+ __pyx_t_1 = __pyx_v_changed;\n+ if (!__pyx_t_1) break;\n+\n+ \n+ __pyx_t_4 = (__pyx_v_best_dist > 0);\n+ if (__pyx_t_4) {\n+\n+ \n+ goto __pyx_L7_break;\n+ goto __pyx_L8;\n+ }\n+ __pyx_L8:;\n+\n+ \n+ __pyx_v_changed = 0;\n+\n+ \n+ __pyx_t_5 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_t_5; __pyx_t_1+=1) {\n+ __pyx_v_k = __pyx_t_1;\n+\n+ \n+ __pyx_v_ineigh = (__pyx_v_d->neighbors[(((__pyx_v_ndim + 1) * __pyx_v_isimplex) + __pyx_v_k)]);\n+\n+ \n+ __pyx_t_4 = (__pyx_v_ineigh == -1);\n+ if (__pyx_t_4) {\n+\n+ \n+ goto __pyx_L9_continue;\n+ goto __pyx_L11;\n+ }\n+ __pyx_L11:;\n+\n+ \n+ __pyx_v_dist = __pyx_f_5scipy_7spatial_5qhull__distplane(__pyx_v_d, __pyx_v_ineigh, __pyx_v_z);\n+\n+ \n+ __pyx_t_4 = (__pyx_v_dist > __pyx_v_best_dist);\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_v_isimplex = __pyx_v_ineigh;\n+\n+ \n+ __pyx_v_best_dist = __pyx_v_dist;\n+\n+ \n+ __pyx_v_changed = 1;\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+ __pyx_L9_continue:;\n+ }\n+ }\n+ __pyx_L7_break:;\n+\n+ \n+ (__pyx_v_start[0]) = __pyx_v_isimplex;\n+\n+ \n+ __pyx_r = __pyx_f_5scipy_7spatial_5qhull__find_simplex_directed(__pyx_v_d, __pyx_v_c, __pyx_v_x, __pyx_v_start, __pyx_v_eps);\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay___init__(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay___init__ = {__Pyx_NAMESTR(\"__init__\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay___init__, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay___init__(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_self = 0;\n+ PyObject *__pyx_v_points = 0;\n+ PyObject *__pyx_v_vertices;\n+ PyObject *__pyx_v_neighbors;\n+ PyObject *__pyx_v_equations;\n+ PyObject *__pyx_v_paraboloid_scale;\n+ PyObject *__pyx_v_paraboloid_shift;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyObject *__pyx_t_7 = NULL;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__points,0};\n+ __Pyx_RefNannySetupContext(\"__init__\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__points);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"__init__\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"__init__\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_self = values[0];\n+ __pyx_v_points = values[1];\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);\n+ __pyx_v_points = PyTuple_GET_ITEM(__pyx_args, 1);\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"__init__\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.__init__\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __pyx_v_vertices = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_neighbors = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_equations = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_paraboloid_scale = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_paraboloid_shift = Py_None; __Pyx_INCREF(Py_None);\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s___construct_delaunay); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_v_points);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_points);\n+ __Pyx_GIVEREF(__pyx_v_points);\n+ __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyTuple_CheckExact(__pyx_t_3) && likely(PyTuple_GET_SIZE(__pyx_t_3) == 5)) {\n+ PyObject* tuple = __pyx_t_3;\n+ __pyx_t_2 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_2);\n+ __pyx_t_1 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_1);\n+ __pyx_t_4 = PyTuple_GET_ITEM(tuple, 2); __Pyx_INCREF(__pyx_t_4);\n+ __pyx_t_5 = PyTuple_GET_ITEM(tuple, 3); __Pyx_INCREF(__pyx_t_5);\n+ __pyx_t_6 = PyTuple_GET_ITEM(tuple, 4); __Pyx_INCREF(__pyx_t_6);\n+\n+ \n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __pyx_v_vertices = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __pyx_v_neighbors = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __pyx_v_equations = __pyx_t_4;\n+ __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __pyx_v_paraboloid_scale = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __pyx_v_paraboloid_shift = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+ } else {\n+ __pyx_t_7 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_7);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_2 = __Pyx_UnpackItem(__pyx_t_7, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = __Pyx_UnpackItem(__pyx_t_7, 1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = __Pyx_UnpackItem(__pyx_t_7, 2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = __Pyx_UnpackItem(__pyx_t_7, 3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = __Pyx_UnpackItem(__pyx_t_7, 4); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ if (__Pyx_EndUnpack(__pyx_t_7) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __pyx_v_vertices = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __pyx_v_neighbors = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __pyx_v_equations = __pyx_t_4;\n+ __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __pyx_v_paraboloid_scale = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __pyx_v_paraboloid_shift = __pyx_t_6;\n+ __pyx_t_6 = 0;\n+ }\n+\n+ \n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_points, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, 1, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__ndim, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+\n+ \n+ __pyx_t_6 = PyObject_GetAttr(__pyx_v_points, __pyx_n_s__shape); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 868; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_6, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 868; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__npoints, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 868; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_vertices, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__nsimplex, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__points, __pyx_v_points) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__vertices, __pyx_v_vertices) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__neighbors, __pyx_v_neighbors) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__equations, __pyx_v_equations) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__paraboloid_scale, __pyx_v_paraboloid_scale) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__paraboloid_shift, __pyx_v_paraboloid_shift) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ __pyx_t_6 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__points); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_6, __pyx_n_s__min); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_6));\n+ if (PyDict_SetItem(__pyx_t_6, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyEval_CallObjectWithKeywords(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__min_bound, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \n+ __pyx_t_5 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__points); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_6 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__max); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_6);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_5));\n+ if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__axis), __pyx_int_0) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = PyEval_CallObjectWithKeywords(__pyx_t_6, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s__max_bound, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s___transform, Py_None) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex, Py_None) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_XDECREF(__pyx_t_6);\n+ __Pyx_XDECREF(__pyx_t_7);\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.__init__\");\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_DECREF(__pyx_v_vertices);\n+ __Pyx_DECREF(__pyx_v_neighbors);\n+ __Pyx_DECREF(__pyx_v_equations);\n+ __Pyx_DECREF(__pyx_v_paraboloid_scale);\n+ __Pyx_DECREF(__pyx_v_paraboloid_shift);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_transform(PyObject *__pyx_self, PyObject *__pyx_v_self); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_transform[] = \"\\n Affine transform from ``x`` to the barycentric coordinates ``c``.\\n\\n :type: ndarray of double, shape (nsimplex, ndim+1, ndim)\\n\\n This is defined by::\\n\\n T c = x - r\\n\\n At vertex ``j``, ``c_j = 1`` and the other coordinates zero.\\n\\n For simplex ``i``, ``transform[i,:ndim,:ndim]`` contains\\n inverse of the matrix ``T``, and ``transform[i,ndim,:]``\\n contains the vector ``r``.\\n\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_transform = {__Pyx_NAMESTR(\"transform\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_transform, METH_O, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_transform)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_transform(PyObject *__pyx_self, PyObject *__pyx_v_self) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ int __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ __Pyx_RefNannySetupContext(\"transform\");\n+ __pyx_self = __pyx_self;\n+ __Pyx_INCREF(__pyx_v_self);\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___transform); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = (__pyx_t_1 == Py_None);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (__pyx_t_2) {\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s_8); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__points); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+\n+ \n+ __pyx_t_4 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__vertices); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ __pyx_t_3 = 0;\n+ __pyx_t_4 = 0;\n+ __pyx_t_4 = PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s___transform, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___transform); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_r = __pyx_t_4;\n+ __pyx_t_4 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.transform\");\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_DECREF(__pyx_v_self);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex(PyObject *__pyx_self, PyObject *__pyx_v_self); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex[] = \"\\n Lookup array, from a vertex, to some simplex which it is a part of.\\n\\n :type: ndarray of int, shape (npoints,)\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex = {__Pyx_NAMESTR(\"vertex_to_simplex\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex, METH_O, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex(PyObject *__pyx_self, PyObject *__pyx_v_self) {\n+ int __pyx_v_isimplex;\n+ int __pyx_v_k;\n+ int __pyx_v_ivertex;\n+ int __pyx_v_nsimplex;\n+ int __pyx_v_ndim;\n+ PyArrayObject *__pyx_v_vertices;\n+ PyArrayObject *__pyx_v_arr;\n+ Py_buffer __pyx_bstruct_arr;\n+ Py_ssize_t __pyx_bstride_0_arr = 0;\n+ Py_ssize_t __pyx_bshape_0_arr = 0;\n+ Py_buffer __pyx_bstruct_vertices;\n+ Py_ssize_t __pyx_bstride_0_vertices = 0;\n+ Py_ssize_t __pyx_bstride_1_vertices = 0;\n+ Py_ssize_t __pyx_bshape_0_vertices = 0;\n+ Py_ssize_t __pyx_bshape_1_vertices = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ int __pyx_t_2;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyArrayObject *__pyx_t_6 = NULL;\n+ int __pyx_t_7;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyArrayObject *__pyx_t_11 = NULL;\n+ int __pyx_t_12;\n+ long __pyx_t_13;\n+ int __pyx_t_14;\n+ int __pyx_t_15;\n+ int __pyx_t_16;\n+ int __pyx_t_17;\n+ int __pyx_t_18;\n+ int __pyx_t_19;\n+ __Pyx_RefNannySetupContext(\"vertex_to_simplex\");\n+ __pyx_self = __pyx_self;\n+ __Pyx_INCREF(__pyx_v_self);\n+ __pyx_v_vertices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_vertices.buf = NULL;\n+ __pyx_bstruct_arr.buf = NULL;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = (__pyx_t_1 == Py_None);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (__pyx_t_2) {\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__npoints); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ __pyx_t_4 = 0;\n+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_4));\n+ if (PyDict_SetItem(__pyx_t_4, ((PyObject *)__pyx_n_s__dtype), ((PyObject *)((PyObject*)&PyInt_Type))) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = PyEval_CallObjectWithKeywords(__pyx_t_3, __pyx_t_1, ((PyObject *)__pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 916; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+\n+ \n+ __pyx_t_5 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_4 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__fill); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(__pyx_int_neg_1);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_int_neg_1);\n+ __Pyx_GIVEREF(__pyx_int_neg_1);\n+ __pyx_t_1 = PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_v_arr, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ }\n+ }\n+ __pyx_bstride_0_arr = __pyx_bstruct_arr.strides[0];\n+ __pyx_bshape_0_arr = __pyx_bstruct_arr.shape[0];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_arr));\n+ __pyx_v_arr = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__vertices); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_11 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_v_vertices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_vertices = __pyx_bstruct_vertices.strides[0]; __pyx_bstride_1_vertices = __pyx_bstruct_vertices.strides[1];\n+ __pyx_bshape_0_vertices = __pyx_bstruct_vertices.shape[0]; __pyx_bshape_1_vertices = __pyx_bstruct_vertices.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_11 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_vertices));\n+ __pyx_v_vertices = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__nsimplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_7 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 922; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_nsimplex = __pyx_t_7;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_7 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_ndim = __pyx_t_7;\n+\n+ \n+ __pyx_t_7 = __pyx_v_nsimplex;\n+ for (__pyx_t_12 = 0; __pyx_t_12 < __pyx_t_7; __pyx_t_12+=1) {\n+ __pyx_v_isimplex = __pyx_t_12;\n+\n+ \n+ __pyx_t_13 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {\n+ __pyx_v_k = __pyx_t_14;\n+\n+ \n+ __pyx_t_15 = __pyx_v_isimplex;\n+ __pyx_t_16 = __pyx_v_k;\n+ __pyx_t_17 = -1;\n+ if (__pyx_t_15 < 0) {\n+ __pyx_t_15 += __pyx_bshape_0_vertices;\n+ if (unlikely(__pyx_t_15 < 0)) __pyx_t_17 = 0;\n+ } else if (unlikely(__pyx_t_15 >= __pyx_bshape_0_vertices)) __pyx_t_17 = 0;\n+ if (__pyx_t_16 < 0) {\n+ __pyx_t_16 += __pyx_bshape_1_vertices;\n+ if (unlikely(__pyx_t_16 < 0)) __pyx_t_17 = 1;\n+ } else if (unlikely(__pyx_t_16 >= __pyx_bshape_1_vertices)) __pyx_t_17 = 1;\n+ if (unlikely(__pyx_t_17 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_17);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_v_ivertex = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_15, __pyx_bstride_0_vertices, __pyx_t_16, __pyx_bstride_1_vertices));\n+\n+ \n+ __pyx_t_17 = __pyx_v_ivertex;\n+ __pyx_t_18 = -1;\n+ if (__pyx_t_17 < 0) {\n+ __pyx_t_17 += __pyx_bshape_0_arr;\n+ if (unlikely(__pyx_t_17 < 0)) __pyx_t_18 = 0;\n+ } else if (unlikely(__pyx_t_17 >= __pyx_bshape_0_arr)) __pyx_t_18 = 0;\n+ if (unlikely(__pyx_t_18 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_18);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_2 = ((*__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_arr.buf, __pyx_t_17, __pyx_bstride_0_arr)) == -1);\n+ if (__pyx_t_2) {\n+\n+ \n+ __pyx_t_18 = __pyx_v_ivertex;\n+ __pyx_t_19 = -1;\n+ if (__pyx_t_18 < 0) {\n+ __pyx_t_18 += __pyx_bshape_0_arr;\n+ if (unlikely(__pyx_t_18 < 0)) __pyx_t_19 = 0;\n+ } else if (unlikely(__pyx_t_18 >= __pyx_bshape_0_arr)) __pyx_t_19 = 0;\n+ if (unlikely(__pyx_t_19 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_19);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_arr.buf, __pyx_t_18, __pyx_bstride_0_arr) = __pyx_v_isimplex;\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+ }\n+ }\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s___vertex_to_simplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.vertex_to_simplex\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_vertices);\n+ __Pyx_DECREF((PyObject *)__pyx_v_arr);\n+ __Pyx_DECREF(__pyx_v_self);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_convex_hull(PyObject *__pyx_self, PyObject *__pyx_v_self); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_convex_hull[] = \"\\n Vertices of facets forming the convex hull of the point set.\\n\\n :type: ndarray of int, shape (nfaces, ndim)\\n\\n The array contains the indices of the points\\n belonging to the (N-1)-dimensional facets that form the convex\\n hull of the triangulation.\\n\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_convex_hull = {__Pyx_NAMESTR(\"convex_hull\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_convex_hull, METH_O, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_convex_hull)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_convex_hull(PyObject *__pyx_self, PyObject *__pyx_v_self) {\n+ int __pyx_v_isimplex;\n+ int __pyx_v_k;\n+ int __pyx_v_j;\n+ int __pyx_v_ndim;\n+ int __pyx_v_nsimplex;\n+ int __pyx_v_m;\n+ int __pyx_v_msize;\n+ PyArrayObject *__pyx_v_arr;\n+ PyArrayObject *__pyx_v_neighbors;\n+ PyArrayObject *__pyx_v_vertices;\n+ PyObject *__pyx_v_out;\n+ Py_buffer __pyx_bstruct_neighbors;\n+ Py_ssize_t __pyx_bstride_0_neighbors = 0;\n+ Py_ssize_t __pyx_bstride_1_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_0_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_1_neighbors = 0;\n+ Py_buffer __pyx_bstruct_arr;\n+ Py_ssize_t __pyx_bstride_0_arr = 0;\n+ Py_ssize_t __pyx_bstride_1_arr = 0;\n+ Py_ssize_t __pyx_bshape_0_arr = 0;\n+ Py_ssize_t __pyx_bshape_1_arr = 0;\n+ Py_buffer __pyx_bstruct_vertices;\n+ Py_ssize_t __pyx_bstride_0_vertices = 0;\n+ Py_ssize_t __pyx_bstride_1_vertices = 0;\n+ Py_ssize_t __pyx_bshape_0_vertices = 0;\n+ Py_ssize_t __pyx_bshape_1_vertices = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyArrayObject *__pyx_t_2 = NULL;\n+ int __pyx_t_3;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyObject *__pyx_t_6 = NULL;\n+ PyArrayObject *__pyx_t_7 = NULL;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyArrayObject *__pyx_t_11 = NULL;\n+ int __pyx_t_12;\n+ long __pyx_t_13;\n+ int __pyx_t_14;\n+ int __pyx_t_15;\n+ int __pyx_t_16;\n+ int __pyx_t_17;\n+ long __pyx_t_18;\n+ int __pyx_t_19;\n+ int __pyx_t_20;\n+ int __pyx_t_21;\n+ int __pyx_t_22;\n+ int __pyx_t_23;\n+ int __pyx_t_24;\n+ int __pyx_t_25;\n+ int __pyx_t_26;\n+ long __pyx_t_27;\n+ __Pyx_RefNannySetupContext(\"convex_hull\");\n+ __pyx_self = __pyx_self;\n+ __Pyx_INCREF(__pyx_v_self);\n+ __pyx_v_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_neighbors = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_vertices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_arr.buf = NULL;\n+ __pyx_bstruct_neighbors.buf = NULL;\n+ __pyx_bstruct_vertices.buf = NULL;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__neighbors); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __pyx_t_3 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_neighbors, (PyObject*)__pyx_t_2, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_3 < 0)) {\n+ PyErr_Fetch(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_neighbors, (PyObject*)__pyx_v_neighbors, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_4); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_6);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_4, __pyx_t_5, __pyx_t_6);\n+ }\n+ }\n+ __pyx_bstride_0_neighbors = __pyx_bstruct_neighbors.strides[0]; __pyx_bstride_1_neighbors = __pyx_bstruct_neighbors.strides[1];\n+ __pyx_bshape_0_neighbors = __pyx_bstruct_neighbors.shape[0]; __pyx_bshape_1_neighbors = __pyx_bstruct_neighbors.shape[1];\n+ if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_2 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_neighbors));\n+ __pyx_v_neighbors = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__vertices); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __pyx_t_3 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_3 < 0)) {\n+ PyErr_Fetch(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_v_vertices, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_6); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_4);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_6, __pyx_t_5, __pyx_t_4);\n+ }\n+ }\n+ __pyx_bstride_0_vertices = __pyx_bstruct_vertices.strides[0]; __pyx_bstride_1_vertices = __pyx_bstruct_vertices.strides[1];\n+ __pyx_bshape_0_vertices = __pyx_bstruct_vertices.shape[0]; __pyx_bshape_1_vertices = __pyx_bstruct_vertices.shape[1];\n+ if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_7 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_vertices));\n+ __pyx_v_vertices = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_ndim = __pyx_t_3;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__nsimplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_t_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_nsimplex = __pyx_t_3;\n+\n+ \n+ __pyx_v_msize = 10;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_8 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__empty); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_msize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_9 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_10);\n+ PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_10, 1, __pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ __pyx_t_1 = 0;\n+ __pyx_t_9 = 0;\n+ __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_10);\n+ __Pyx_GIVEREF(__pyx_t_10);\n+ __pyx_t_10 = 0;\n+ __pyx_t_10 = PyDict_New(); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_10));\n+ if (PyDict_SetItem(__pyx_t_10, ((PyObject *)__pyx_n_s__dtype), ((PyObject *)((PyObject*)&PyInt_Type))) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_1 = PyEval_CallObjectWithKeywords(__pyx_t_8, __pyx_t_9, ((PyObject *)__pyx_t_10)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n+ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_10)); __pyx_t_10 = 0;\n+ __Pyx_DECREF(__pyx_v_out);\n+ __pyx_v_out = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+\n+ \n+ if (!(likely(((__pyx_v_out) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_11 = ((PyArrayObject *)__pyx_v_out);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __pyx_t_3 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_3 < 0)) {\n+ PyErr_Fetch(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_v_arr, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_4); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_6);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_4, __pyx_t_5, __pyx_t_6);\n+ }\n+ }\n+ __pyx_bstride_0_arr = __pyx_bstruct_arr.strides[0]; __pyx_bstride_1_arr = __pyx_bstruct_arr.strides[1];\n+ __pyx_bshape_0_arr = __pyx_bstruct_arr.shape[0]; __pyx_bshape_1_arr = __pyx_bstruct_arr.shape[1];\n+ if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_11 = 0;\n+ __Pyx_INCREF(__pyx_v_out);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_arr));\n+ __pyx_v_arr = ((PyArrayObject *)__pyx_v_out);\n+\n+ \n+ __pyx_v_m = 0;\n+\n+ \n+ __pyx_t_3 = __pyx_v_nsimplex;\n+ for (__pyx_t_12 = 0; __pyx_t_12 < __pyx_t_3; __pyx_t_12+=1) {\n+ __pyx_v_isimplex = __pyx_t_12;\n+\n+ \n+ __pyx_t_13 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_14 = 0; __pyx_t_14 < __pyx_t_13; __pyx_t_14+=1) {\n+ __pyx_v_k = __pyx_t_14;\n+\n+ \n+ __pyx_t_15 = __pyx_v_isimplex;\n+ __pyx_t_16 = __pyx_v_k;\n+ if (__pyx_t_15 < 0) __pyx_t_15 += __pyx_bshape_0_neighbors;\n+ if (__pyx_t_16 < 0) __pyx_t_16 += __pyx_bshape_1_neighbors;\n+ __pyx_t_17 = ((*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_neighbors.buf, __pyx_t_15, __pyx_bstride_0_neighbors, __pyx_t_16, __pyx_bstride_1_neighbors)) == -1);\n+ if (__pyx_t_17) {\n+\n+ \n+ __pyx_t_18 = (__pyx_v_ndim + 1);\n+ for (__pyx_t_19 = 0; __pyx_t_19 < __pyx_t_18; __pyx_t_19+=1) {\n+ __pyx_v_j = __pyx_t_19;\n+\n+ \n+ __pyx_t_17 = (__pyx_v_j < __pyx_v_k);\n+ if (__pyx_t_17) {\n+\n+ \n+ __pyx_t_20 = __pyx_v_isimplex;\n+ __pyx_t_21 = __pyx_v_j;\n+ if (__pyx_t_20 < 0) __pyx_t_20 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_bshape_1_vertices;\n+ __pyx_t_22 = __pyx_v_m;\n+ __pyx_t_23 = __pyx_v_j;\n+ if (__pyx_t_22 < 0) __pyx_t_22 += __pyx_bshape_0_arr;\n+ if (__pyx_t_23 < 0) __pyx_t_23 += __pyx_bshape_1_arr;\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_arr.buf, __pyx_t_22, __pyx_bstride_0_arr, __pyx_t_23, __pyx_bstride_1_arr) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_20, __pyx_bstride_0_vertices, __pyx_t_21, __pyx_bstride_1_vertices));\n+ goto __pyx_L12;\n+ }\n+\n+ \n+ __pyx_t_17 = (__pyx_v_j > __pyx_v_k);\n+ if (__pyx_t_17) {\n+\n+ \n+ __pyx_t_24 = __pyx_v_isimplex;\n+ __pyx_t_25 = __pyx_v_j;\n+ if (__pyx_t_24 < 0) __pyx_t_24 += __pyx_bshape_0_vertices;\n+ if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_bshape_1_vertices;\n+ __pyx_t_26 = __pyx_v_m;\n+ __pyx_t_27 = (__pyx_v_j - 1);\n+ if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_bshape_0_arr;\n+ if (__pyx_t_27 < 0) __pyx_t_27 += __pyx_bshape_1_arr;\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_arr.buf, __pyx_t_26, __pyx_bstride_0_arr, __pyx_t_27, __pyx_bstride_1_arr) = (*__Pyx_BufPtrStrided2d(__pyx_t_5numpy_int_t *, __pyx_bstruct_vertices.buf, __pyx_t_24, __pyx_bstride_0_vertices, __pyx_t_25, __pyx_bstride_1_vertices));\n+ goto __pyx_L12;\n+ }\n+ __pyx_L12:;\n+ }\n+\n+ \n+ __pyx_v_m += 1;\n+\n+ \n+ __pyx_t_17 = (__pyx_v_m >= __pyx_v_msize);\n+ if (__pyx_t_17) {\n+\n+ \n+ __pyx_t_11 = ((PyArrayObject *)Py_None);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __pyx_t_19 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_19 < 0)) {\n+ PyErr_Fetch(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_v_arr, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_6); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_4);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_6, __pyx_t_5, __pyx_t_4);\n+ }\n+ }\n+ __pyx_bstride_0_arr = __pyx_bstruct_arr.strides[0]; __pyx_bstride_1_arr = __pyx_bstruct_arr.strides[1];\n+ __pyx_bshape_0_arr = __pyx_bstruct_arr.shape[0]; __pyx_bshape_1_arr = __pyx_bstruct_arr.shape[1];\n+ if (unlikely(__pyx_t_19 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_11 = 0;\n+ __Pyx_INCREF(Py_None);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_arr));\n+ __pyx_v_arr = ((PyArrayObject *)Py_None);\n+\n+ \n+ __pyx_v_msize = ((2 * __pyx_v_msize) + 1);\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_out, __pyx_n_s__resize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_10 = PyInt_FromLong(__pyx_v_msize); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_10);\n+ __pyx_t_9 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_10);\n+ __Pyx_GIVEREF(__pyx_t_10);\n+ PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_9);\n+ __Pyx_GIVEREF(__pyx_t_9);\n+ __pyx_t_10 = 0;\n+ __pyx_t_9 = 0;\n+ __pyx_t_9 = PyObject_Call(__pyx_t_1, __pyx_t_8, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;\n+ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+\n+ \n+ if (!(likely(((__pyx_v_out) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_11 = ((PyArrayObject *)__pyx_v_out);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __pyx_t_19 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_19 < 0)) {\n+ PyErr_Fetch(&__pyx_t_4, &__pyx_t_5, &__pyx_t_6);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_v_arr, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_4); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_6);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_4, __pyx_t_5, __pyx_t_6);\n+ }\n+ }\n+ __pyx_bstride_0_arr = __pyx_bstruct_arr.strides[0]; __pyx_bstride_1_arr = __pyx_bstruct_arr.strides[1];\n+ __pyx_bshape_0_arr = __pyx_bstruct_arr.shape[0]; __pyx_bshape_1_arr = __pyx_bstruct_arr.shape[1];\n+ if (unlikely(__pyx_t_19 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_11 = 0;\n+ __Pyx_INCREF(__pyx_v_out);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_arr));\n+ __pyx_v_arr = ((PyArrayObject *)__pyx_v_out);\n+ goto __pyx_L13;\n+ }\n+ __pyx_L13:;\n+ goto __pyx_L9;\n+ }\n+ __pyx_L9:;\n+ }\n+ }\n+\n+ \n+ __pyx_t_11 = ((PyArrayObject *)Py_None);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __pyx_t_3 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_t_11, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_3 < 0)) {\n+ PyErr_Fetch(&__pyx_t_6, &__pyx_t_5, &__pyx_t_4);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_arr, (PyObject*)__pyx_v_arr, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_6); Py_XDECREF(__pyx_t_5); Py_XDECREF(__pyx_t_4);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_6, __pyx_t_5, __pyx_t_4);\n+ }\n+ }\n+ __pyx_bstride_0_arr = __pyx_bstruct_arr.strides[0]; __pyx_bstride_1_arr = __pyx_bstruct_arr.strides[1];\n+ __pyx_bshape_0_arr = __pyx_bstruct_arr.shape[0]; __pyx_bshape_1_arr = __pyx_bstruct_arr.shape[1];\n+ if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_11 = 0;\n+ __Pyx_INCREF(Py_None);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_arr));\n+ __pyx_v_arr = ((PyArrayObject *)Py_None);\n+\n+ \n+ __pyx_t_9 = PyObject_GetAttr(__pyx_v_out, __pyx_n_s__resize); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_9);\n+ __pyx_t_8 = PyInt_FromLong(__pyx_v_m); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_8);\n+ __pyx_t_1 = PyInt_FromLong(__pyx_v_ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_10 = PyTuple_New(2); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_10);\n+ PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8);\n+ __Pyx_GIVEREF(__pyx_t_8);\n+ PyTuple_SET_ITEM(__pyx_t_10, 1, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_8 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_t_9, __pyx_t_10, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;\n+ __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(__pyx_v_out);\n+ __pyx_r = __pyx_v_out;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_8);\n+ __Pyx_XDECREF(__pyx_t_9);\n+ __Pyx_XDECREF(__pyx_t_10);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.convex_hull\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_arr);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_arr);\n+ __Pyx_DECREF((PyObject *)__pyx_v_neighbors);\n+ __Pyx_DECREF((PyObject *)__pyx_v_vertices);\n+ __Pyx_DECREF(__pyx_v_out);\n+ __Pyx_DECREF(__pyx_v_self);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_find_simplex(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_find_simplex[] = \"\\n find_simplex(xi, bruteforce=False)\\n\\n Find the simplices containing the given points.\\n\\n Parameters\\n ----------\\n tri : DelaunayInfo\\n Delaunay triangulation\\n xi : ndarray of double, shape (..., ndim)\\n Points to locate\\n bruteforce : bool, optional\\n Whether to only perform a brute-force search\\n\\n Returns\\n -------\\n i : ndarray of int, same shape as `xi`\\n Indices of simplices containing each point.\\n Points outside the triangulation get the value -1.\\n\\n Notes\\n -----\\n This uses an algorithm adapted from Qhull's qh_findbestfacet,\\n which makes use of the connection between a convex hull and a\\n Delaunay triangulation. After finding the simplex closest to\\n the point in N+1 dimensions, the algorithm falls back to\\n directed search in N dimensions.\\n\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_find_simplex = {__Pyx_NAMESTR(\"find_simplex\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_find_simplex, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_find_simplex)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_find_simplex(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_self = 0;\n+ PyObject *__pyx_v_xi = 0;\n+ PyObject *__pyx_v_bruteforce = 0;\n+ __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_info;\n+ int __pyx_v_isimplex;\n+ double __pyx_v_c[NPY_MAXDIMS];\n+ double __pyx_v_eps;\n+ int __pyx_v_start;\n+ int __pyx_v_k;\n+ PyArrayObject *__pyx_v_x;\n+ PyArrayObject *__pyx_v_out_;\n+ PyObject *__pyx_v_xi_shape;\n+ PyObject *__pyx_v_out;\n+ Py_buffer __pyx_bstruct_out_;\n+ Py_ssize_t __pyx_bstride_0_out_ = 0;\n+ Py_ssize_t __pyx_bshape_0_out_ = 0;\n+ Py_buffer __pyx_bstruct_x;\n+ Py_ssize_t __pyx_bstride_0_x = 0;\n+ Py_ssize_t __pyx_bstride_1_x = 0;\n+ Py_ssize_t __pyx_bshape_0_x = 0;\n+ Py_ssize_t __pyx_bshape_1_x = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ int __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyArrayObject *__pyx_t_6 = NULL;\n+ int __pyx_t_7;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ double __pyx_t_11;\n+ PyObject *__pyx_t_12 = NULL;\n+ PyArrayObject *__pyx_t_13 = NULL;\n+ npy_intp __pyx_t_14;\n+ int __pyx_t_15;\n+ int __pyx_t_16;\n+ int __pyx_t_17;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__xi,&__pyx_n_s__bruteforce,0};\n+ __Pyx_RefNannySetupContext(\"find_simplex\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[3] = {0,0,0};\n+ values[2] = __pyx_k_9;\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__xi);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"find_simplex\", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ case 2:\n+ if (kw_args > 0) {\n+ PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__bruteforce);\n+ if (unlikely(value)) { values[2] = value; kw_args--; }\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"find_simplex\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_self = values[0];\n+ __pyx_v_xi = values[1];\n+ __pyx_v_bruteforce = values[2];\n+ } else {\n+ __pyx_v_bruteforce = __pyx_k_9;\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 3:\n+ __pyx_v_bruteforce = PyTuple_GET_ITEM(__pyx_args, 2);\n+ case 2:\n+ __pyx_v_xi = PyTuple_GET_ITEM(__pyx_args, 1);\n+ __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);\n+ break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"find_simplex\", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.find_simplex\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __Pyx_INCREF(__pyx_v_self);\n+ __Pyx_INCREF(__pyx_v_xi);\n+ __Pyx_INCREF(__pyx_v_bruteforce);\n+ __pyx_v_x = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_out_ = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_xi_shape = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_x.buf = NULL;\n+ __pyx_bstruct_out_.buf = NULL;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__asanyarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(__pyx_v_xi);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_xi);\n+ __Pyx_GIVEREF(__pyx_v_xi);\n+ __pyx_t_3 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_v_xi);\n+ __pyx_v_xi = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_3, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__ndim); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_t_3, Py_NE); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_10));\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_kp_s_10));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_10));\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_Raise(__pyx_t_3, 0, 0);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_v_xi_shape);\n+ __pyx_v_xi_shape = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__reshape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__prod); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_5 = PySequence_GetSlice(__pyx_t_2, 0, -1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_2, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_5 = 0;\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_xi);\n+ __pyx_v_xi = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__astype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = ((PyArrayObject *)__pyx_t_5);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_x, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x, (PyObject*)__pyx_v_x, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ }\n+ }\n+ __pyx_bstride_0_x = __pyx_bstruct_x.strides[0]; __pyx_bstride_1_x = __pyx_bstruct_x.strides[1];\n+ __pyx_bshape_0_x = __pyx_bstruct_x.shape[0]; __pyx_bshape_1_x = __pyx_bstruct_x.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_x));\n+ __pyx_v_x = ((PyArrayObject *)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \n+ __pyx_v_start = 0;\n+\n+ \n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__finfo); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__double); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_3, __pyx_t_5, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__eps); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyNumber_Multiply(__pyx_t_5, __pyx_int_10); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_11 = __pyx_PyFloat_AsDouble(__pyx_t_2); if (unlikely((__pyx_t_11 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1031; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_v_eps = __pyx_t_11;\n+\n+ \n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__zeros); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, 0, sizeof(long), PyInt_FromLong); if (!__pyx_t_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_12 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__int); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_12) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __pyx_t_12 = PyEval_CallObjectWithKeywords(__pyx_t_5, __pyx_t_3, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_out);\n+ __pyx_v_out = __pyx_t_12;\n+ __pyx_t_12 = 0;\n+\n+ \n+ if (!(likely(((__pyx_v_out) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_13 = ((PyArrayObject *)__pyx_v_out);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_out_, (PyObject*)__pyx_t_13, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_out_, (PyObject*)__pyx_v_out_, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_out_ = __pyx_bstruct_out_.strides[0];\n+ __pyx_bshape_0_out_ = __pyx_bstruct_out_.shape[0];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_13 = 0;\n+ __Pyx_INCREF(__pyx_v_out);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_out_));\n+ __pyx_v_out_ = ((PyArrayObject *)__pyx_v_out);\n+\n+ \n+ __pyx_v_info = __pyx_f_5scipy_7spatial_5qhull__get_delaunay_info(__pyx_v_self, 1, 0);\n+\n+ \n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_bruteforce); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_t_14 = (__pyx_v_x->dimensions[0]);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_14; __pyx_t_7+=1) {\n+ __pyx_v_k = __pyx_t_7;\n+\n+ \n+ __pyx_v_isimplex = __pyx_f_5scipy_7spatial_5qhull__find_simplex_bruteforce(__pyx_v_info, __pyx_v_c, (((double *)__pyx_v_x->data) + (__pyx_v_info->ndim * __pyx_v_k)), __pyx_v_eps);\n+\n+ \n+ __pyx_t_15 = __pyx_v_k;\n+ __pyx_t_16 = -1;\n+ if (__pyx_t_15 < 0) {\n+ __pyx_t_15 += __pyx_bshape_0_out_;\n+ if (unlikely(__pyx_t_15 < 0)) __pyx_t_16 = 0;\n+ } else if (unlikely(__pyx_t_15 >= __pyx_bshape_0_out_)) __pyx_t_16 = 0;\n+ if (unlikely(__pyx_t_16 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_16);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_out_.buf, __pyx_t_15, __pyx_bstride_0_out_) = __pyx_v_isimplex;\n+ }\n+ goto __pyx_L7;\n+ }\n+ {\n+\n+ \n+ __pyx_t_14 = (__pyx_v_x->dimensions[0]);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_14; __pyx_t_7+=1) {\n+ __pyx_v_k = __pyx_t_7;\n+\n+ \n+ __pyx_v_isimplex = __pyx_f_5scipy_7spatial_5qhull__find_simplex(__pyx_v_info, __pyx_v_c, (((double *)__pyx_v_x->data) + (__pyx_v_info->ndim * __pyx_v_k)), (&__pyx_v_start), __pyx_v_eps);\n+\n+ \n+ __pyx_t_16 = __pyx_v_k;\n+ __pyx_t_17 = -1;\n+ if (__pyx_t_16 < 0) {\n+ __pyx_t_16 += __pyx_bshape_0_out_;\n+ if (unlikely(__pyx_t_16 < 0)) __pyx_t_17 = 0;\n+ } else if (unlikely(__pyx_t_16 >= __pyx_bshape_0_out_)) __pyx_t_17 = 0;\n+ if (unlikely(__pyx_t_17 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_17);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided1d(__pyx_t_5numpy_int_t *, __pyx_bstruct_out_.buf, __pyx_t_16, __pyx_bstride_0_out_) = __pyx_v_isimplex;\n+ }\n+ }\n+ __pyx_L7:;\n+\n+ \n+ free(__pyx_v_info);\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_12 = PyObject_GetAttr(__pyx_v_out, __pyx_n_s__reshape); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_12);\n+ __pyx_t_2 = PySequence_GetSlice(__pyx_v_xi_shape, 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_12, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_r = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_XDECREF(__pyx_t_12);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.find_simplex\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_x);\n+ __Pyx_DECREF((PyObject *)__pyx_v_out_);\n+ __Pyx_DECREF(__pyx_v_xi_shape);\n+ __Pyx_DECREF(__pyx_v_out);\n+ __Pyx_DECREF(__pyx_v_self);\n+ __Pyx_DECREF(__pyx_v_xi);\n+ __Pyx_DECREF(__pyx_v_bruteforce);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_plane_distance(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_plane_distance[] = \"\\n plane_distance(xi)\\n\\n Compute hyperplane distances to the point `xi` from all simplices.\\n\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_plane_distance = {__Pyx_NAMESTR(\"plane_distance\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_plane_distance, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_plane_distance)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_plane_distance(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_self = 0;\n+ PyObject *__pyx_v_xi = 0;\n+ PyArrayObject *__pyx_v_x;\n+ PyArrayObject *__pyx_v_out_;\n+ __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_info;\n+ double __pyx_v_z[(NPY_MAXDIMS + 1)];\n+ int __pyx_v_i;\n+ int __pyx_v_j;\n+ PyObject *__pyx_v_xi_shape;\n+ PyObject *__pyx_v_out;\n+ Py_buffer __pyx_bstruct_out_;\n+ Py_ssize_t __pyx_bstride_0_out_ = 0;\n+ Py_ssize_t __pyx_bstride_1_out_ = 0;\n+ Py_ssize_t __pyx_bshape_0_out_ = 0;\n+ Py_ssize_t __pyx_bshape_1_out_ = 0;\n+ Py_buffer __pyx_bstruct_x;\n+ Py_ssize_t __pyx_bstride_0_x = 0;\n+ Py_ssize_t __pyx_bstride_1_x = 0;\n+ Py_ssize_t __pyx_bshape_0_x = 0;\n+ Py_ssize_t __pyx_bshape_1_x = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ int __pyx_t_4;\n+ PyObject *__pyx_t_5 = NULL;\n+ PyArrayObject *__pyx_t_6 = NULL;\n+ int __pyx_t_7;\n+ PyObject *__pyx_t_8 = NULL;\n+ PyObject *__pyx_t_9 = NULL;\n+ PyObject *__pyx_t_10 = NULL;\n+ PyObject *__pyx_t_11 = NULL;\n+ PyArrayObject *__pyx_t_12 = NULL;\n+ npy_intp __pyx_t_13;\n+ int __pyx_t_14;\n+ int __pyx_t_15;\n+ int __pyx_t_16;\n+ int __pyx_t_17;\n+ int __pyx_t_18;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__self,&__pyx_n_s__xi,0};\n+ __Pyx_RefNannySetupContext(\"plane_distance\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__self);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__xi);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"plane_distance\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"plane_distance\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_self = values[0];\n+ __pyx_v_xi = values[1];\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_self = PyTuple_GET_ITEM(__pyx_args, 0);\n+ __pyx_v_xi = PyTuple_GET_ITEM(__pyx_args, 1);\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"plane_distance\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.plane_distance\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __Pyx_INCREF(__pyx_v_self);\n+ __Pyx_INCREF(__pyx_v_xi);\n+ __pyx_v_x = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_out_ = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_xi_shape = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_x.buf = NULL;\n+ __pyx_bstruct_out_.buf = NULL;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__ndim); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_t_1, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_4) {\n+\n+ \n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_s_11));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_s_11));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_s_11));\n+ __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_1, 0, 0);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_v_xi_shape);\n+ __pyx_v_xi_shape = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__reshape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__prod); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PySequence_GetSlice(__pyx_t_3, 0, -1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_2, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__shape); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_3, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_5 = 0;\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_t_1, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_v_xi);\n+ __pyx_v_xi = __pyx_t_2;\n+ __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__ascontiguousarray); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_v_xi, __pyx_n_s__astype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_2, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_Call(__pyx_t_3, __pyx_t_1, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ if (!(likely(((__pyx_t_5) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = ((PyArrayObject *)__pyx_t_5);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_x, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_x, (PyObject*)__pyx_v_x, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_8); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_10);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_8, __pyx_t_9, __pyx_t_10);\n+ }\n+ }\n+ __pyx_bstride_0_x = __pyx_bstruct_x.strides[0]; __pyx_bstride_1_x = __pyx_bstruct_x.strides[1];\n+ __pyx_bshape_0_x = __pyx_bstruct_x.shape[0]; __pyx_bshape_1_x = __pyx_bstruct_x.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_6 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_x));\n+ __pyx_v_x = ((PyArrayObject *)__pyx_t_5);\n+ __pyx_t_5 = 0;\n+\n+ \n+ __pyx_v_info = __pyx_f_5scipy_7spatial_5qhull__get_delaunay_info(__pyx_v_self, 0, 0);\n+\n+ \n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__zeros); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = __Pyx_PyInt_to_py_npy_intp((__pyx_v_x->dimensions[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyInt_FromLong(__pyx_v_info->nsimplex); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_5 = 0;\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_2));\n+ __pyx_t_5 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_11 = PyObject_GetAttr(__pyx_t_5, __pyx_n_s__double); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__dtype), __pyx_t_11) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n+ __pyx_t_11 = PyEval_CallObjectWithKeywords(__pyx_t_1, __pyx_t_3, ((PyObject *)__pyx_t_2)); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_v_out);\n+ __pyx_v_out = __pyx_t_11;\n+ __pyx_t_11 = 0;\n+\n+ \n+ if (!(likely(((__pyx_v_out) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_12 = ((PyArrayObject *)__pyx_v_out);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __pyx_t_7 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_out_, (PyObject*)__pyx_t_12, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_7 < 0)) {\n+ PyErr_Fetch(&__pyx_t_10, &__pyx_t_9, &__pyx_t_8);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_out_, (PyObject*)__pyx_v_out_, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 2, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_10); Py_XDECREF(__pyx_t_9); Py_XDECREF(__pyx_t_8);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_10, __pyx_t_9, __pyx_t_8);\n+ }\n+ }\n+ __pyx_bstride_0_out_ = __pyx_bstruct_out_.strides[0]; __pyx_bstride_1_out_ = __pyx_bstruct_out_.strides[1];\n+ __pyx_bshape_0_out_ = __pyx_bstruct_out_.shape[0]; __pyx_bshape_1_out_ = __pyx_bstruct_out_.shape[1];\n+ if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_12 = 0;\n+ __Pyx_INCREF(__pyx_v_out);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_out_));\n+ __pyx_v_out_ = ((PyArrayObject *)__pyx_v_out);\n+\n+ \n+ __pyx_t_13 = (__pyx_v_x->dimensions[0]);\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_13; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \n+ __pyx_t_14 = __pyx_v_info->nsimplex;\n+ for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_14; __pyx_t_15+=1) {\n+ __pyx_v_j = __pyx_t_15;\n+\n+ \n+ __pyx_f_5scipy_7spatial_5qhull__lift_point(__pyx_v_info, (((double *)__pyx_v_x->data) + (__pyx_v_info->ndim * __pyx_v_i)), __pyx_v_z);\n+\n+ \n+ __pyx_t_16 = __pyx_v_i;\n+ __pyx_t_17 = __pyx_v_j;\n+ __pyx_t_18 = -1;\n+ if (__pyx_t_16 < 0) {\n+ __pyx_t_16 += __pyx_bshape_0_out_;\n+ if (unlikely(__pyx_t_16 < 0)) __pyx_t_18 = 0;\n+ } else if (unlikely(__pyx_t_16 >= __pyx_bshape_0_out_)) __pyx_t_18 = 0;\n+ if (__pyx_t_17 < 0) {\n+ __pyx_t_17 += __pyx_bshape_1_out_;\n+ if (unlikely(__pyx_t_17 < 0)) __pyx_t_18 = 1;\n+ } else if (unlikely(__pyx_t_17 >= __pyx_bshape_1_out_)) __pyx_t_18 = 1;\n+ if (unlikely(__pyx_t_18 != -1)) {\n+ __Pyx_RaiseBufferIndexError(__pyx_t_18);\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ *__Pyx_BufPtrStrided2d(__pyx_t_5numpy_double_t *, __pyx_bstruct_out_.buf, __pyx_t_16, __pyx_bstride_0_out_, __pyx_t_17, __pyx_bstride_1_out_) = __pyx_f_5scipy_7spatial_5qhull__distplane(__pyx_v_info, __pyx_v_j, __pyx_v_z);\n+ }\n+ }\n+\n+ \n+ free(__pyx_v_info);\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_11 = PyObject_GetAttr(__pyx_v_out, __pyx_n_s__reshape); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_11);\n+ __pyx_t_2 = PySequence_GetSlice(__pyx_v_xi_shape, 0, -1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_s__nsimplex); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyNumber_Add(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_Call(__pyx_t_11, __pyx_t_1, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_r = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_XDECREF(__pyx_t_11);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.plane_distance\");\n+ __pyx_r = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_out_);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_x);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_x);\n+ __Pyx_DECREF((PyObject *)__pyx_v_out_);\n+ __Pyx_DECREF(__pyx_v_xi_shape);\n+ __Pyx_DECREF(__pyx_v_out);\n+ __Pyx_DECREF(__pyx_v_self);\n+ __Pyx_DECREF(__pyx_v_xi);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_lift_points(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull_8Delaunay_lift_points[] = \"\\n lift_points(tri, x)\\n\\n Lift points to the Qhull paraboloid.\\n\\n \";\n+static PyMethodDef __pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_lift_points = {__Pyx_NAMESTR(\"lift_points\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_lift_points, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_8Delaunay_lift_points)};\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_8Delaunay_lift_points(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_tri = 0;\n+ PyObject *__pyx_v_x = 0;\n+ PyObject *__pyx_v_z;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__tri,&__pyx_n_s__x,0};\n+ __Pyx_RefNannySetupContext(\"lift_points\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__tri);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__x);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"lift_points\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"lift_points\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_tri = values[0];\n+ __pyx_v_x = values[1];\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_tri = PyTuple_GET_ITEM(__pyx_args, 0);\n+ __pyx_v_x = PyTuple_GET_ITEM(__pyx_args, 1);\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"lift_points\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.lift_points\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+ __pyx_v_z = Py_None; __Pyx_INCREF(Py_None);\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__zeros); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_3 = PySequence_GetSlice(__pyx_t_1, 0, -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_x, __pyx_n_s__shape); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_1, -1, sizeof(long), PyInt_FromLong); if (!__pyx_t_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyNumber_Add(__pyx_t_4, __pyx_int_1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyNumber_Add(__pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);\n+ __Pyx_GIVEREF(__pyx_t_1);\n+ __pyx_t_1 = 0;\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__double); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__dtype), __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyEval_CallObjectWithKeywords(__pyx_t_2, __pyx_t_4, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_v_z);\n+ __pyx_v_z = __pyx_t_5;\n+ __pyx_t_5 = 0;\n+\n+ \n+ __pyx_t_5 = PySlice_New(Py_None, __pyx_int_neg_1, Py_None); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, Py_Ellipsis);\n+ __Pyx_GIVEREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_5);\n+ __Pyx_GIVEREF(__pyx_t_5);\n+ __pyx_t_5 = 0;\n+ if (PyObject_SetItem(__pyx_v_z, __pyx_t_1, __pyx_v_x) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyNumber_Power(__pyx_v_x, __pyx_int_2, Py_None); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_5 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__sum); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__axis), __pyx_int_neg_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyEval_CallObjectWithKeywords(__pyx_t_5, ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, Py_Ellipsis);\n+ __Pyx_GIVEREF(Py_Ellipsis);\n+ __Pyx_INCREF(__pyx_int_neg_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_int_neg_1);\n+ __Pyx_GIVEREF(__pyx_int_neg_1);\n+ if (PyObject_SetItem(__pyx_v_z, __pyx_t_1, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = PyObject_GetAttr(__pyx_v_tri, __pyx_n_s__paraboloid_scale); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_INCREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_1, 0, Py_Ellipsis);\n+ __Pyx_GIVEREF(Py_Ellipsis);\n+ __Pyx_INCREF(__pyx_int_neg_1);\n+ PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_int_neg_1);\n+ __Pyx_GIVEREF(__pyx_int_neg_1);\n+ __pyx_t_5 = PyObject_GetItem(__pyx_v_z, __pyx_t_1); if (!__pyx_t_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_2 = PyNumber_InPlaceMultiply(__pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (PyObject_SetItem(__pyx_v_z, __pyx_t_1, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_tri, __pyx_n_s__paraboloid_shift); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(Py_Ellipsis);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, Py_Ellipsis);\n+ __Pyx_GIVEREF(Py_Ellipsis);\n+ __Pyx_INCREF(__pyx_int_neg_1);\n+ PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_neg_1);\n+ __Pyx_GIVEREF(__pyx_int_neg_1);\n+ __pyx_t_5 = PyObject_GetItem(__pyx_v_z, __pyx_t_2); if (!__pyx_t_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_4 = PyNumber_InPlaceAdd(__pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (PyObject_SetItem(__pyx_v_z, __pyx_t_2, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1099; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(__pyx_v_z);\n+ __pyx_r = __pyx_v_z;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.Delaunay.lift_points\");\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_DECREF(__pyx_v_z);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_tsearch(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); \n+static char __pyx_doc_5scipy_7spatial_5qhull_tsearch[] = \"\\n tsearch(tri, xi)\\n\\n Find simplices containing the given points. This function does the\\n same thing as Delaunay.find_simplex.\\n\\n .. versionadded:: 0.9\\n\\n See Also\\n --------\\n Delaunay.find_simplex\\n\\n \";\n+static PyObject *__pyx_pf_5scipy_7spatial_5qhull_tsearch(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {\n+ PyObject *__pyx_v_tri = 0;\n+ PyObject *__pyx_v_xi = 0;\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__tri,&__pyx_n_s__xi,0};\n+ __Pyx_RefNannySetupContext(\"tsearch\");\n+ __pyx_self = __pyx_self;\n+ if (unlikely(__pyx_kwds)) {\n+ Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);\n+ PyObject* values[2] = {0,0};\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);\n+ case 1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);\n+ case 0: break;\n+ default: goto __pyx_L5_argtuple_error;\n+ }\n+ switch (PyTuple_GET_SIZE(__pyx_args)) {\n+ case 0:\n+ values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__tri);\n+ if (likely(values[0])) kw_args--;\n+ else goto __pyx_L5_argtuple_error;\n+ case 1:\n+ values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__xi);\n+ if (likely(values[1])) kw_args--;\n+ else {\n+ __Pyx_RaiseArgtupleInvalid(\"tsearch\", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ }\n+ if (unlikely(kw_args > 0)) {\n+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), \"tsearch\") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ }\n+ __pyx_v_tri = values[0];\n+ __pyx_v_xi = values[1];\n+ } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {\n+ goto __pyx_L5_argtuple_error;\n+ } else {\n+ __pyx_v_tri = PyTuple_GET_ITEM(__pyx_args, 0);\n+ __pyx_v_xi = PyTuple_GET_ITEM(__pyx_args, 1);\n+ }\n+ goto __pyx_L4_argument_unpacking_done;\n+ __pyx_L5_argtuple_error:;\n+ __Pyx_RaiseArgtupleInvalid(\"tsearch\", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; __pyx_clineno = __LINE__; goto __pyx_L3_error;}\n+ __pyx_L3_error:;\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.tsearch\");\n+ return NULL;\n+ __pyx_L4_argument_unpacking_done:;\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_tri, __pyx_n_s__find_simplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_v_xi);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_xi);\n+ __Pyx_GIVEREF(__pyx_v_xi);\n+ __pyx_t_3 = PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ __pyx_r = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_AddTraceback(\"scipy.spatial.qhull.tsearch\");\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_f_5scipy_7spatial_5qhull__get_delaunay_info(PyObject *__pyx_v_obj, int __pyx_v_compute_transform, int __pyx_v_compute_vertex_to_simplex) {\n+ __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_v_info;\n+ PyArrayObject *__pyx_v_transform;\n+ PyArrayObject *__pyx_v_vertex_to_simplex;\n+ PyArrayObject *__pyx_v_points = 0;\n+ PyArrayObject *__pyx_v_vertices = 0;\n+ PyArrayObject *__pyx_v_neighbors = 0;\n+ PyArrayObject *__pyx_v_equations = 0;\n+ PyArrayObject *__pyx_v_min_bound = 0;\n+ PyArrayObject *__pyx_v_max_bound = 0;\n+ Py_buffer __pyx_bstruct_neighbors;\n+ Py_ssize_t __pyx_bstride_0_neighbors = 0;\n+ Py_ssize_t __pyx_bstride_1_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_0_neighbors = 0;\n+ Py_ssize_t __pyx_bshape_1_neighbors = 0;\n+ Py_buffer __pyx_bstruct_transform;\n+ Py_ssize_t __pyx_bstride_0_transform = 0;\n+ Py_ssize_t __pyx_bstride_1_transform = 0;\n+ Py_ssize_t __pyx_bstride_2_transform = 0;\n+ Py_ssize_t __pyx_bshape_0_transform = 0;\n+ Py_ssize_t __pyx_bshape_1_transform = 0;\n+ Py_ssize_t __pyx_bshape_2_transform = 0;\n+ Py_buffer __pyx_bstruct_vertices;\n+ Py_ssize_t __pyx_bstride_0_vertices = 0;\n+ Py_ssize_t __pyx_bstride_1_vertices = 0;\n+ Py_ssize_t __pyx_bshape_0_vertices = 0;\n+ Py_ssize_t __pyx_bshape_1_vertices = 0;\n+ Py_buffer __pyx_bstruct_points;\n+ Py_ssize_t __pyx_bstride_0_points = 0;\n+ Py_ssize_t __pyx_bstride_1_points = 0;\n+ Py_ssize_t __pyx_bshape_0_points = 0;\n+ Py_ssize_t __pyx_bshape_1_points = 0;\n+ Py_buffer __pyx_bstruct_vertex_to_simplex;\n+ Py_ssize_t __pyx_bstride_0_vertex_to_simplex = 0;\n+ Py_ssize_t __pyx_bshape_0_vertex_to_simplex = 0;\n+ Py_buffer __pyx_bstruct_min_bound;\n+ Py_ssize_t __pyx_bstride_0_min_bound = 0;\n+ Py_ssize_t __pyx_bshape_0_min_bound = 0;\n+ Py_buffer __pyx_bstruct_max_bound;\n+ Py_ssize_t __pyx_bstride_0_max_bound = 0;\n+ Py_ssize_t __pyx_bshape_0_max_bound = 0;\n+ Py_buffer __pyx_bstruct_equations;\n+ Py_ssize_t __pyx_bstride_0_equations = 0;\n+ Py_ssize_t __pyx_bstride_1_equations = 0;\n+ Py_ssize_t __pyx_bshape_0_equations = 0;\n+ Py_ssize_t __pyx_bshape_1_equations = 0;\n+ __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *__pyx_r;\n+ PyObject *__pyx_t_1 = NULL;\n+ PyArrayObject *__pyx_t_2 = NULL;\n+ PyArrayObject *__pyx_t_3 = NULL;\n+ PyArrayObject *__pyx_t_4 = NULL;\n+ PyArrayObject *__pyx_t_5 = NULL;\n+ PyArrayObject *__pyx_t_6 = NULL;\n+ PyArrayObject *__pyx_t_7 = NULL;\n+ double __pyx_t_8;\n+ int __pyx_t_9;\n+ PyArrayObject *__pyx_t_10 = NULL;\n+ PyObject *__pyx_t_11 = NULL;\n+ PyObject *__pyx_t_12 = NULL;\n+ PyObject *__pyx_t_13 = NULL;\n+ PyArrayObject *__pyx_t_14 = NULL;\n+ __Pyx_RefNannySetupContext(\"_get_delaunay_info\");\n+ __Pyx_INCREF(__pyx_v_obj);\n+ __pyx_v_transform = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_vertex_to_simplex = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_bstruct_transform.buf = NULL;\n+ __pyx_bstruct_vertex_to_simplex.buf = NULL;\n+ __pyx_bstruct_points.buf = NULL;\n+ __pyx_bstruct_vertices.buf = NULL;\n+ __pyx_bstruct_neighbors.buf = NULL;\n+ __pyx_bstruct_equations.buf = NULL;\n+ __pyx_bstruct_min_bound.buf = NULL;\n+ __pyx_bstruct_max_bound.buf = NULL;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__points); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_2 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_points, (PyObject*)__pyx_t_2, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ __pyx_v_points = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_points.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_points = __pyx_bstruct_points.strides[0]; __pyx_bstride_1_points = __pyx_bstruct_points.strides[1];\n+ __pyx_bshape_0_points = __pyx_bstruct_points.shape[0]; __pyx_bshape_1_points = __pyx_bstruct_points.shape[1];\n+ }\n+ }\n+ __pyx_t_2 = 0;\n+ __pyx_v_points = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__vertices); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertices, (PyObject*)__pyx_t_3, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ __pyx_v_vertices = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_vertices.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_vertices = __pyx_bstruct_vertices.strides[0]; __pyx_bstride_1_vertices = __pyx_bstruct_vertices.strides[1];\n+ __pyx_bshape_0_vertices = __pyx_bstruct_vertices.shape[0]; __pyx_bshape_1_vertices = __pyx_bstruct_vertices.shape[1];\n+ }\n+ }\n+ __pyx_t_3 = 0;\n+ __pyx_v_vertices = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__neighbors); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_neighbors, (PyObject*)__pyx_t_4, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ __pyx_v_neighbors = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_neighbors.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_neighbors = __pyx_bstruct_neighbors.strides[0]; __pyx_bstride_1_neighbors = __pyx_bstruct_neighbors.strides[1];\n+ __pyx_bshape_0_neighbors = __pyx_bstruct_neighbors.shape[0]; __pyx_bshape_1_neighbors = __pyx_bstruct_neighbors.shape[1];\n+ }\n+ }\n+ __pyx_t_4 = 0;\n+ __pyx_v_neighbors = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__equations); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_5 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_equations, (PyObject*)__pyx_t_5, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) {\n+ __pyx_v_equations = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_equations.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_equations = __pyx_bstruct_equations.strides[0]; __pyx_bstride_1_equations = __pyx_bstruct_equations.strides[1];\n+ __pyx_bshape_0_equations = __pyx_bstruct_equations.shape[0]; __pyx_bshape_1_equations = __pyx_bstruct_equations.shape[1];\n+ }\n+ }\n+ __pyx_t_5 = 0;\n+ __pyx_v_equations = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__min_bound); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_6 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_min_bound, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ __pyx_v_min_bound = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_min_bound.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_min_bound = __pyx_bstruct_min_bound.strides[0];\n+ __pyx_bshape_0_min_bound = __pyx_bstruct_min_bound.shape[0];\n+ }\n+ }\n+ __pyx_t_6 = 0;\n+ __pyx_v_min_bound = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__max_bound); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_7 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_max_bound, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ __pyx_v_max_bound = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_bstruct_max_bound.buf = NULL;\n+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ } else {__pyx_bstride_0_max_bound = __pyx_bstruct_max_bound.strides[0];\n+ __pyx_bshape_0_max_bound = __pyx_bstruct_max_bound.shape[0];\n+ }\n+ }\n+ __pyx_t_7 = 0;\n+ __pyx_v_max_bound = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_v_info = ((__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *)malloc((sizeof(__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t))));\n+\n+ \n+ __pyx_v_info->ndim = (__pyx_v_points->dimensions[1]);\n+\n+ \n+ __pyx_v_info->npoints = (__pyx_v_points->dimensions[0]);\n+\n+ \n+ __pyx_v_info->nsimplex = (__pyx_v_vertices->dimensions[0]);\n+\n+ \n+ __pyx_v_info->points = ((double *)__pyx_v_points->data);\n+\n+ \n+ __pyx_v_info->vertices = ((int *)__pyx_v_vertices->data);\n+\n+ \n+ __pyx_v_info->neighbors = ((int *)__pyx_v_neighbors->data);\n+\n+ \n+ __pyx_v_info->equations = ((double *)__pyx_v_equations->data);\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__paraboloid_scale); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_t_1); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_info->paraboloid_scale = __pyx_t_8;\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__paraboloid_shift); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_t_1); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_v_info->paraboloid_shift = __pyx_t_8;\n+\n+ \n+ __pyx_t_9 = __pyx_v_compute_transform;\n+ if (__pyx_t_9) {\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__transform); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_10 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_transform);\n+ __pyx_t_9 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_transform, (PyObject*)__pyx_t_10, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 3, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_9 < 0)) {\n+ PyErr_Fetch(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_transform, (PyObject*)__pyx_v_transform, &__Pyx_TypeInfo_nn___pyx_t_5numpy_double_t, PyBUF_FORMAT| PyBUF_STRIDES, 3, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_11); Py_XDECREF(__pyx_t_12); Py_XDECREF(__pyx_t_13);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_11, __pyx_t_12, __pyx_t_13);\n+ }\n+ }\n+ __pyx_bstride_0_transform = __pyx_bstruct_transform.strides[0]; __pyx_bstride_1_transform = __pyx_bstruct_transform.strides[1]; __pyx_bstride_2_transform = __pyx_bstruct_transform.strides[2];\n+ __pyx_bshape_0_transform = __pyx_bstruct_transform.shape[0]; __pyx_bshape_1_transform = __pyx_bstruct_transform.shape[1]; __pyx_bshape_2_transform = __pyx_bstruct_transform.shape[2];\n+ if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_10 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_transform));\n+ __pyx_v_transform = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_v_info->transform = ((double *)__pyx_v_transform->data);\n+ goto __pyx_L3;\n+ }\n+ {\n+\n+ \n+ __pyx_v_info->transform = NULL;\n+ }\n+ __pyx_L3:;\n+\n+ \n+ __pyx_t_9 = __pyx_v_compute_vertex_to_simplex;\n+ if (__pyx_t_9) {\n+\n+ \n+ __pyx_t_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n_s__vertex_to_simplex); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_14 = ((PyArrayObject *)__pyx_t_1);\n+ {\n+ __Pyx_BufFmt_StackElem __pyx_stack[1];\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertex_to_simplex);\n+ __pyx_t_9 = __Pyx_GetBufferAndValidate(&__pyx_bstruct_vertex_to_simplex, (PyObject*)__pyx_t_14, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack);\n+ if (unlikely(__pyx_t_9 < 0)) {\n+ PyErr_Fetch(&__pyx_t_13, &__pyx_t_12, &__pyx_t_11);\n+ if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_bstruct_vertex_to_simplex, (PyObject*)__pyx_v_vertex_to_simplex, &__Pyx_TypeInfo_nn___pyx_t_5numpy_int_t, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) {\n+ Py_XDECREF(__pyx_t_13); Py_XDECREF(__pyx_t_12); Py_XDECREF(__pyx_t_11);\n+ __Pyx_RaiseBufferFallbackError();\n+ } else {\n+ PyErr_Restore(__pyx_t_13, __pyx_t_12, __pyx_t_11);\n+ }\n+ }\n+ __pyx_bstride_0_vertex_to_simplex = __pyx_bstruct_vertex_to_simplex.strides[0];\n+ __pyx_bshape_0_vertex_to_simplex = __pyx_bstruct_vertex_to_simplex.shape[0];\n+ if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_t_14 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_v_vertex_to_simplex));\n+ __pyx_v_vertex_to_simplex = ((PyArrayObject *)__pyx_t_1);\n+ __pyx_t_1 = 0;\n+\n+ \n+ __pyx_v_info->vertex_to_simplex = ((int *)__pyx_v_vertex_to_simplex->data);\n+ goto __pyx_L4;\n+ }\n+ {\n+\n+ \n+ __pyx_v_info->vertex_to_simplex = NULL;\n+ }\n+ __pyx_L4:;\n+\n+ \n+ __pyx_v_info->min_bound = ((double *)__pyx_v_min_bound->data);\n+\n+ \n+ __pyx_v_info->max_bound = ((double *)__pyx_v_max_bound->data);\n+\n+ \n+ __pyx_r = __pyx_v_info;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ { PyObject *__pyx_type, *__pyx_value, *__pyx_tb;\n+ __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_transform);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertex_to_simplex);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_min_bound);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_max_bound);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_equations);\n+ __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);}\n+ __Pyx_WriteUnraisable(\"scipy.spatial.qhull._get_delaunay_info\");\n+ __pyx_r = 0;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_neighbors);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_transform);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertices);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_points);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_vertex_to_simplex);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_min_bound);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_max_bound);\n+ __Pyx_SafeReleaseBuffer(&__pyx_bstruct_equations);\n+ __pyx_L2:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_transform);\n+ __Pyx_DECREF((PyObject *)__pyx_v_vertex_to_simplex);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_points);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_vertices);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_neighbors);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_equations);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_min_bound);\n+ __Pyx_XDECREF((PyObject *)__pyx_v_max_bound);\n+ __Pyx_DECREF(__pyx_v_obj);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags); \n+static int __pyx_pf_5numpy_7ndarray___getbuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info, int __pyx_v_flags) {\n+ int __pyx_v_copy_shape;\n+ int __pyx_v_i;\n+ int __pyx_v_ndim;\n+ int __pyx_v_endian_detector;\n+ int __pyx_v_little_endian;\n+ int __pyx_v_t;\n+ char *__pyx_v_f;\n+ PyArray_Descr *__pyx_v_descr = 0;\n+ int __pyx_v_offset;\n+ int __pyx_v_hasfields;\n+ int __pyx_r;\n+ int __pyx_t_1;\n+ int __pyx_t_2;\n+ int __pyx_t_3;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ int __pyx_t_6;\n+ int __pyx_t_7;\n+ int __pyx_t_8;\n+ char *__pyx_t_9;\n+ __Pyx_RefNannySetupContext(\"__getbuffer__\");\n+ if (__pyx_v_info == NULL) return 0;\n+ __pyx_v_info->obj = Py_None; __Pyx_INCREF(Py_None);\n+ __Pyx_GIVEREF(__pyx_v_info->obj);\n+ __Pyx_INCREF((PyObject *)__pyx_v_self);\n+\n+ \n+ __pyx_v_endian_detector = 1;\n+\n+ \n+ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0);\n+\n+ \n+ __pyx_v_ndim = PyArray_NDIM(((PyArrayObject *)__pyx_v_self));\n+\n+ \n+ __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t)));\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_v_copy_shape = 1;\n+ goto __pyx_L5;\n+ }\n+ {\n+\n+ \n+ __pyx_v_copy_shape = 0;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __pyx_t_1 = ((__pyx_v_flags & PyBUF_C_CONTIGUOUS) == PyBUF_C_CONTIGUOUS);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_t_2 = (!PyArray_CHKFLAGS(((PyArrayObject *)__pyx_v_self), NPY_C_CONTIGUOUS));\n+ __pyx_t_3 = __pyx_t_2;\n+ } else {\n+ __pyx_t_3 = __pyx_t_1;\n+ }\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_12));\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_u_12));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_12));\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_Raise(__pyx_t_5, 0, 0);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \n+ __pyx_t_3 = ((__pyx_v_flags & PyBUF_F_CONTIGUOUS) == PyBUF_F_CONTIGUOUS);\n+ if (__pyx_t_3) {\n+\n+ \n+ __pyx_t_1 = (!PyArray_CHKFLAGS(((PyArrayObject *)__pyx_v_self), NPY_F_CONTIGUOUS));\n+ __pyx_t_2 = __pyx_t_1;\n+ } else {\n+ __pyx_t_2 = __pyx_t_3;\n+ }\n+ if (__pyx_t_2) {\n+\n+ \n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_13));\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_kp_u_13));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_13));\n+ __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_Raise(__pyx_t_4, 0, 0);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L7;\n+ }\n+ __pyx_L7:;\n+\n+ \n+ __pyx_v_info->buf = PyArray_DATA(((PyArrayObject *)__pyx_v_self));\n+\n+ \n+ __pyx_v_info->ndim = __pyx_v_ndim;\n+\n+ \n+ __pyx_t_6 = __pyx_v_copy_shape;\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_v_info->strides = ((Py_ssize_t *)malloc((((sizeof(Py_ssize_t)) * __pyx_v_ndim) * 2)));\n+\n+ \n+ __pyx_v_info->shape = (__pyx_v_info->strides + __pyx_v_ndim);\n+\n+ \n+ __pyx_t_6 = __pyx_v_ndim;\n+ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {\n+ __pyx_v_i = __pyx_t_7;\n+\n+ \n+ (__pyx_v_info->strides[__pyx_v_i]) = (PyArray_STRIDES(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]);\n+\n+ \n+ (__pyx_v_info->shape[__pyx_v_i]) = (PyArray_DIMS(((PyArrayObject *)__pyx_v_self))[__pyx_v_i]);\n+ }\n+ goto __pyx_L8;\n+ }\n+ {\n+\n+ \n+ __pyx_v_info->strides = ((Py_ssize_t *)PyArray_STRIDES(((PyArrayObject *)__pyx_v_self)));\n+\n+ \n+ __pyx_v_info->shape = ((Py_ssize_t *)PyArray_DIMS(((PyArrayObject *)__pyx_v_self)));\n+ }\n+ __pyx_L8:;\n+\n+ \n+ __pyx_v_info->suboffsets = NULL;\n+\n+ \n+ __pyx_v_info->itemsize = PyArray_ITEMSIZE(((PyArrayObject *)__pyx_v_self));\n+\n+ \n+ __pyx_v_info->readonly = (!PyArray_ISWRITEABLE(((PyArrayObject *)__pyx_v_self)));\n+\n+ \n+ __pyx_v_f = NULL;\n+\n+ \n+ __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_self)->descr));\n+ __pyx_v_descr = ((PyArrayObject *)__pyx_v_self)->descr;\n+\n+ \n+ __pyx_v_hasfields = PyDataType_HASFIELDS(__pyx_v_descr);\n+\n+ \n+ __pyx_t_2 = (!__pyx_v_hasfields);\n+ if (__pyx_t_2) {\n+ __pyx_t_3 = (!__pyx_v_copy_shape);\n+ __pyx_t_1 = __pyx_t_3;\n+ } else {\n+ __pyx_t_1 = __pyx_t_2;\n+ }\n+ if (__pyx_t_1) {\n+\n+ \n+ __Pyx_INCREF(Py_None);\n+ __Pyx_GIVEREF(Py_None);\n+ __Pyx_GOTREF(__pyx_v_info->obj);\n+ __Pyx_DECREF(__pyx_v_info->obj);\n+ __pyx_v_info->obj = Py_None;\n+ goto __pyx_L11;\n+ }\n+ {\n+\n+ \n+ __Pyx_INCREF(__pyx_v_self);\n+ __Pyx_GIVEREF(__pyx_v_self);\n+ __Pyx_GOTREF(__pyx_v_info->obj);\n+ __Pyx_DECREF(__pyx_v_info->obj);\n+ __pyx_v_info->obj = __pyx_v_self;\n+ }\n+ __pyx_L11:;\n+\n+ \n+ __pyx_t_1 = (!__pyx_v_hasfields);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_v_t = __pyx_v_descr->type_num;\n+\n+ \n+ __pyx_t_1 = (__pyx_v_descr->byteorder == '>');\n+ if (__pyx_t_1) {\n+ __pyx_t_2 = __pyx_v_little_endian;\n+ } else {\n+ __pyx_t_2 = __pyx_t_1;\n+ }\n+ if (!__pyx_t_2) {\n+\n+ \n+ __pyx_t_1 = (__pyx_v_descr->byteorder == '<');\n+ if (__pyx_t_1) {\n+ __pyx_t_3 = (!__pyx_v_little_endian);\n+ __pyx_t_8 = __pyx_t_3;\n+ } else {\n+ __pyx_t_8 = __pyx_t_1;\n+ }\n+ __pyx_t_1 = __pyx_t_8;\n+ } else {\n+ __pyx_t_1 = __pyx_t_2;\n+ }\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_14));\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_kp_u_14));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_14));\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_Raise(__pyx_t_5, 0, 0);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L13;\n+ }\n+ __pyx_L13:;\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_BYTE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__b;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_UBYTE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__B;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_SHORT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__h;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_USHORT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__H;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_INT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__i;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_UINT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__I;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_LONG);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__l;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_ULONG);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__L;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_LONGLONG);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__q;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_ULONGLONG);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__Q;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_FLOAT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__f;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_DOUBLE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__d;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_LONGDOUBLE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__g;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_CFLOAT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__Zf;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_CDOUBLE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__Zd;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_CLONGDOUBLE);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__Zg;\n+ goto __pyx_L14;\n+ }\n+\n+ \n+ __pyx_t_1 = (__pyx_v_t == NPY_OBJECT);\n+ if (__pyx_t_1) {\n+ __pyx_v_f = __pyx_k__O;\n+ goto __pyx_L14;\n+ }\n+ {\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(__pyx_v_t); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_15), __pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ __pyx_t_4 = 0;\n+ __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_Raise(__pyx_t_4, 0, 0);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_L14:;\n+\n+ \n+ __pyx_v_info->format = __pyx_v_f;\n+\n+ \n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ goto __pyx_L12;\n+ }\n+ {\n+\n+ \n+ __pyx_v_info->format = ((char *)malloc(255));\n+\n+ \n+ (__pyx_v_info->format[0]) = '^';\n+\n+ \n+ __pyx_v_offset = 0;\n+\n+ \n+ __pyx_t_9 = __pyx_f_5numpy__util_dtypestring(__pyx_v_descr, (__pyx_v_info->format + 1), (__pyx_v_info->format + 255), (&__pyx_v_offset)); if (unlikely(__pyx_t_9 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_v_f = __pyx_t_9;\n+\n+ \n+ (__pyx_v_f[0]) = 0;\n+ }\n+ __pyx_L12:;\n+\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"numpy.ndarray.__getbuffer__\");\n+ __pyx_r = -1;\n+ __Pyx_GOTREF(__pyx_v_info->obj);\n+ __Pyx_DECREF(__pyx_v_info->obj); __pyx_v_info->obj = NULL;\n+ goto __pyx_L2;\n+ __pyx_L0:;\n+ if (__pyx_v_info->obj == Py_None) {\n+ __Pyx_GOTREF(Py_None);\n+ __Pyx_DECREF(Py_None); __pyx_v_info->obj = NULL;\n+ }\n+ __pyx_L2:;\n+ __Pyx_XDECREF((PyObject *)__pyx_v_descr);\n+ __Pyx_DECREF((PyObject *)__pyx_v_self);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info); \n+static void __pyx_pf_5numpy_7ndarray___releasebuffer__(PyObject *__pyx_v_self, Py_buffer *__pyx_v_info) {\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"__releasebuffer__\");\n+ __Pyx_INCREF((PyObject *)__pyx_v_self);\n+\n+ \n+ __pyx_t_1 = PyArray_HASFIELDS(((PyArrayObject *)__pyx_v_self));\n+ if (__pyx_t_1) {\n+\n+ \n+ free(__pyx_v_info->format);\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __pyx_t_1 = ((sizeof(npy_intp)) != (sizeof(Py_ssize_t)));\n+ if (__pyx_t_1) {\n+\n+ \n+ free(__pyx_v_info->strides);\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ __Pyx_DECREF((PyObject *)__pyx_v_self);\n+ __Pyx_RefNannyFinishContext();\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__pyx_v_a) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ __Pyx_RefNannySetupContext(\"PyArray_MultiIterNew1\");\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyArray_MultiIterNew(1, ((void *)__pyx_v_a)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 756; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"numpy.PyArray_MultiIterNew1\");\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__pyx_v_a, PyObject *__pyx_v_b) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ __Pyx_RefNannySetupContext(\"PyArray_MultiIterNew2\");\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyArray_MultiIterNew(2, ((void *)__pyx_v_a), ((void *)__pyx_v_b)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 759; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"numpy.PyArray_MultiIterNew2\");\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__pyx_v_a, PyObject *__pyx_v_b, PyObject *__pyx_v_c) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ __Pyx_RefNannySetupContext(\"PyArray_MultiIterNew3\");\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyArray_MultiIterNew(3, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"numpy.PyArray_MultiIterNew3\");\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__pyx_v_a, PyObject *__pyx_v_b, PyObject *__pyx_v_c, PyObject *__pyx_v_d) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ __Pyx_RefNannySetupContext(\"PyArray_MultiIterNew4\");\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyArray_MultiIterNew(4, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 765; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"numpy.PyArray_MultiIterNew4\");\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__pyx_v_a, PyObject *__pyx_v_b, PyObject *__pyx_v_c, PyObject *__pyx_v_d, PyObject *__pyx_v_e) {\n+ PyObject *__pyx_r = NULL;\n+ PyObject *__pyx_t_1 = NULL;\n+ __Pyx_RefNannySetupContext(\"PyArray_MultiIterNew5\");\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __pyx_t_1 = PyArray_MultiIterNew(5, ((void *)__pyx_v_a), ((void *)__pyx_v_b), ((void *)__pyx_v_c), ((void *)__pyx_v_d), ((void *)__pyx_v_e)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_r = __pyx_t_1;\n+ __pyx_t_1 = 0;\n+ goto __pyx_L0;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_AddTraceback(\"numpy.PyArray_MultiIterNew5\");\n+ __pyx_r = 0;\n+ __pyx_L0:;\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_descr, char *__pyx_v_f, char *__pyx_v_end, int *__pyx_v_offset) {\n+ PyArray_Descr *__pyx_v_child;\n+ int __pyx_v_endian_detector;\n+ int __pyx_v_little_endian;\n+ PyObject *__pyx_v_fields;\n+ PyObject *__pyx_v_childname;\n+ PyObject *__pyx_v_new_offset;\n+ PyObject *__pyx_v_t;\n+ char *__pyx_r;\n+ Py_ssize_t __pyx_t_1;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ PyObject *__pyx_t_5 = NULL;\n+ int __pyx_t_6;\n+ int __pyx_t_7;\n+ int __pyx_t_8;\n+ int __pyx_t_9;\n+ char *__pyx_t_10;\n+ __Pyx_RefNannySetupContext(\"_util_dtypestring\");\n+ __Pyx_INCREF((PyObject *)__pyx_v_descr);\n+ __pyx_v_child = ((PyArray_Descr *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_fields = ((PyObject *)Py_None); __Pyx_INCREF(Py_None);\n+ __pyx_v_childname = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_new_offset = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_v_t = Py_None; __Pyx_INCREF(Py_None);\n+\n+ \n+ __pyx_v_endian_detector = 1;\n+\n+ \n+ __pyx_v_little_endian = ((((char *)(&__pyx_v_endian_detector))[0]) != 0);\n+\n+ \n+ if (likely(((PyObject *)__pyx_v_descr->names) != Py_None)) {\n+ __pyx_t_1 = 0; __pyx_t_2 = ((PyObject *)__pyx_v_descr->names); __Pyx_INCREF(__pyx_t_2);\n+ } else {\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\"); {__pyx_filename = __pyx_f[1]; __pyx_lineno = 781; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ for (;;) {\n+ if (__pyx_t_1 >= PyTuple_GET_SIZE(__pyx_t_2)) break;\n+ __pyx_t_3 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_1); __Pyx_INCREF(__pyx_t_3); __pyx_t_1++;\n+ __Pyx_DECREF(__pyx_v_childname);\n+ __pyx_v_childname = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_3 = PyObject_GetItem(__pyx_v_descr->fields, __pyx_v_childname); if (!__pyx_t_3) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ if (!(likely(PyTuple_CheckExact(__pyx_t_3))||((__pyx_t_3) == Py_None)||(PyErr_Format(PyExc_TypeError, \"Expected tuple, got %.200s\", Py_TYPE(__pyx_t_3)->tp_name), 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_v_fields));\n+ __pyx_v_fields = ((PyObject *)__pyx_t_3);\n+ __pyx_t_3 = 0;\n+\n+ \n+ if (likely(((PyObject *)__pyx_v_fields) != Py_None) && likely(PyTuple_GET_SIZE(((PyObject *)__pyx_v_fields)) == 2)) {\n+ PyObject* tuple = ((PyObject *)__pyx_v_fields);\n+ __pyx_t_3 = PyTuple_GET_ITEM(tuple, 0); __Pyx_INCREF(__pyx_t_3);\n+ if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_dtype))))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_4 = PyTuple_GET_ITEM(tuple, 1); __Pyx_INCREF(__pyx_t_4);\n+ __Pyx_DECREF(((PyObject *)__pyx_v_child));\n+ __pyx_v_child = ((PyArray_Descr *)__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __Pyx_DECREF(__pyx_v_new_offset);\n+ __pyx_v_new_offset = __pyx_t_4;\n+ __pyx_t_4 = 0;\n+ } else {\n+ __Pyx_UnpackTupleError(((PyObject *)__pyx_v_fields), 2);\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+\n+ \n+ __pyx_t_4 = PyInt_FromLong((__pyx_v_end - __pyx_v_f)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_3 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyNumber_Subtract(__pyx_v_new_offset, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_3 = PyNumber_Subtract(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_t_3, __pyx_int_15, Py_LT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_16));\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_kp_u_16));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_16));\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_Raise(__pyx_t_3, 0, 0);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L5;\n+ }\n+ __pyx_L5:;\n+\n+ \n+ __pyx_t_6 = (__pyx_v_child->byteorder == '>');\n+ if (__pyx_t_6) {\n+ __pyx_t_7 = __pyx_v_little_endian;\n+ } else {\n+ __pyx_t_7 = __pyx_t_6;\n+ }\n+ if (!__pyx_t_7) {\n+\n+ \n+ __pyx_t_6 = (__pyx_v_child->byteorder == '<');\n+ if (__pyx_t_6) {\n+ __pyx_t_8 = (!__pyx_v_little_endian);\n+ __pyx_t_9 = __pyx_t_8;\n+ } else {\n+ __pyx_t_9 = __pyx_t_6;\n+ }\n+ __pyx_t_6 = __pyx_t_9;\n+ } else {\n+ __pyx_t_6 = __pyx_t_7;\n+ }\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_14));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_u_14));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_14));\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_5, 0, 0);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 790; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L6;\n+ }\n+ __pyx_L6:;\n+\n+ \n+ while (1) {\n+ __pyx_t_5 = PyInt_FromLong((__pyx_v_offset[0])); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_5, __pyx_v_new_offset, Py_LT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 800; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (!__pyx_t_6) break;\n+\n+ \n+ (__pyx_v_f[0]) = 120;\n+\n+ \n+ __pyx_v_f += 1;\n+\n+ \n+ (__pyx_v_offset[0]) += 1;\n+ }\n+\n+ \n+ (__pyx_v_offset[0]) += __pyx_v_child->elsize;\n+\n+ \n+ __pyx_t_6 = (!PyDataType_HASFIELDS(__pyx_v_child));\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(__pyx_v_child->type_num); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 808; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_v_t);\n+ __pyx_v_t = __pyx_t_3;\n+ __pyx_t_3 = 0;\n+\n+ \n+ __pyx_t_6 = ((__pyx_v_end - __pyx_v_f) < 5);\n+ if (__pyx_t_6) {\n+\n+ \n+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_INCREF(((PyObject *)__pyx_kp_u_17));\n+ PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_kp_u_17));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_kp_u_17));\n+ __pyx_t_5 = PyObject_Call(__pyx_builtin_RuntimeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_Raise(__pyx_t_5, 0, 0);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 810; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ goto __pyx_L10;\n+ }\n+ __pyx_L10:;\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_BYTE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 813; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 98;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_UBYTE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 66;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_SHORT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 104;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_USHORT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 816; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 72;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_INT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 105;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_UINT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 73;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_LONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 108;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_ULONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 76;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_LONGLONG); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 821; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 113;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_ULONGLONG); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 822; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 81;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_FLOAT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 102;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_DOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 100;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_LONGDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 825; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 103;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_CFLOAT); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 90;\n+ (__pyx_v_f[1]) = 102;\n+ __pyx_v_f += 1;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_CDOUBLE); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 827; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 90;\n+ (__pyx_v_f[1]) = 100;\n+ __pyx_v_f += 1;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_3 = PyInt_FromLong(NPY_CLONGDOUBLE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyObject_RichCompare(__pyx_v_t, __pyx_t_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 828; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 90;\n+ (__pyx_v_f[1]) = 103;\n+ __pyx_v_f += 1;\n+ goto __pyx_L11;\n+ }\n+\n+ \n+ __pyx_t_5 = PyInt_FromLong(NPY_OBJECT); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ __pyx_t_3 = PyObject_RichCompare(__pyx_v_t, __pyx_t_5, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 829; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ if (__pyx_t_6) {\n+ (__pyx_v_f[0]) = 79;\n+ goto __pyx_L11;\n+ }\n+ {\n+\n+ \n+ __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_u_15), __pyx_v_t); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_5);\n+ PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);\n+ __Pyx_GIVEREF(__pyx_t_3);\n+ __pyx_t_3 = 0;\n+ __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;\n+ __Pyx_Raise(__pyx_t_3, 0, 0);\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ {__pyx_filename = __pyx_f[1]; __pyx_lineno = 831; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ }\n+ __pyx_L11:;\n+\n+ \n+ __pyx_v_f += 1;\n+ goto __pyx_L9;\n+ }\n+ {\n+\n+ \n+ __pyx_t_10 = __pyx_f_5numpy__util_dtypestring(__pyx_v_child, __pyx_v_f, __pyx_v_end, __pyx_v_offset); if (unlikely(__pyx_t_10 == NULL)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 836; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_v_f = __pyx_t_10;\n+ }\n+ __pyx_L9:;\n+ }\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_r = __pyx_v_f;\n+ goto __pyx_L0;\n+\n+ __pyx_r = 0;\n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ __Pyx_XDECREF(__pyx_t_5);\n+ __Pyx_AddTraceback(\"numpy._util_dtypestring\");\n+ __pyx_r = NULL;\n+ __pyx_L0:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_child);\n+ __Pyx_DECREF(__pyx_v_fields);\n+ __Pyx_DECREF(__pyx_v_childname);\n+ __Pyx_DECREF(__pyx_v_new_offset);\n+ __Pyx_DECREF(__pyx_v_t);\n+ __Pyx_DECREF((PyObject *)__pyx_v_descr);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+\n+\n+static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_arr, PyObject *__pyx_v_base) {\n+ PyObject *__pyx_v_baseptr;\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"set_array_base\");\n+ __Pyx_INCREF((PyObject *)__pyx_v_arr);\n+ __Pyx_INCREF(__pyx_v_base);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_base == Py_None);\n+ if (__pyx_t_1) {\n+\n+ \n+ __pyx_v_baseptr = NULL;\n+ goto __pyx_L3;\n+ }\n+ {\n+\n+ \n+ Py_INCREF(__pyx_v_base);\n+\n+ \n+ __pyx_v_baseptr = ((PyObject *)__pyx_v_base);\n+ }\n+ __pyx_L3:;\n+\n+ \n+ Py_XDECREF(__pyx_v_arr->base);\n+\n+ \n+ __pyx_v_arr->base = __pyx_v_baseptr;\n+\n+ __Pyx_DECREF((PyObject *)__pyx_v_arr);\n+ __Pyx_DECREF(__pyx_v_base);\n+ __Pyx_RefNannyFinishContext();\n+}\n+\n+\n+\n+static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__pyx_v_arr) {\n+ PyObject *__pyx_r = NULL;\n+ int __pyx_t_1;\n+ __Pyx_RefNannySetupContext(\"get_array_base\");\n+ __Pyx_INCREF((PyObject *)__pyx_v_arr);\n+\n+ \n+ __pyx_t_1 = (__pyx_v_arr->base == NULL);\n+ if (__pyx_t_1) {\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(Py_None);\n+ __pyx_r = Py_None;\n+ goto __pyx_L0;\n+ goto __pyx_L3;\n+ }\n+ {\n+\n+ \n+ __Pyx_XDECREF(__pyx_r);\n+ __Pyx_INCREF(((PyObject *)__pyx_v_arr->base));\n+ __pyx_r = ((PyObject *)__pyx_v_arr->base);\n+ goto __pyx_L0;\n+ }\n+ __pyx_L3:;\n+\n+ __pyx_r = Py_None; __Pyx_INCREF(Py_None);\n+ __pyx_L0:;\n+ __Pyx_DECREF((PyObject *)__pyx_v_arr);\n+ __Pyx_XGIVEREF(__pyx_r);\n+ __Pyx_RefNannyFinishContext();\n+ return __pyx_r;\n+}\n+\n+static struct PyMethodDef __pyx_methods[] = {\n+ {__Pyx_NAMESTR(\"_construct_delaunay\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull__construct_delaunay, METH_O, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull__construct_delaunay)},\n+ {__Pyx_NAMESTR(\"_qhull_get_facet_array\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull__qhull_get_facet_array, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull__qhull_get_facet_array)},\n+ {__Pyx_NAMESTR(\"_get_barycentric_transforms\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull__get_barycentric_transforms, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull__get_barycentric_transforms)},\n+ {__Pyx_NAMESTR(\"tsearch\"), (PyCFunction)__pyx_pf_5scipy_7spatial_5qhull_tsearch, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_5scipy_7spatial_5qhull_tsearch)},\n+ {0, 0, 0, 0}\n+};\n+\n+static void __pyx_init_filenames(void); \n+\n+#if PY_MAJOR_VERSION >= 3\n+static struct PyModuleDef __pyx_moduledef = {\n+ PyModuleDef_HEAD_INIT,\n+ __Pyx_NAMESTR(\"qhull\"),\n+ __Pyx_DOCSTR(__pyx_k_18), \n+ -1, \n+ __pyx_methods ,\n+ NULL, \n+ NULL, \n+ NULL, \n+ NULL \n+};\n+#endif\n+\n+static __Pyx_StringTabEntry __pyx_string_tab[] = {\n+ {&__pyx_kp_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 0},\n+ {&__pyx_kp_s_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 0, 1, 0},\n+ {&__pyx_kp_u_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 1, 0, 0},\n+ {&__pyx_kp_u_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 1, 0, 0},\n+ {&__pyx_kp_u_14, __pyx_k_14, sizeof(__pyx_k_14), 0, 1, 0, 0},\n+ {&__pyx_kp_u_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 1, 0, 0},\n+ {&__pyx_kp_u_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 1, 0, 0},\n+ {&__pyx_kp_u_17, __pyx_k_17, sizeof(__pyx_k_17), 0, 1, 0, 0},\n+ {&__pyx_kp_s_19, __pyx_k_19, sizeof(__pyx_k_19), 0, 0, 1, 0},\n+ {&__pyx_kp_s_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 1, 0},\n+ {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0},\n+ {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0},\n+ {&__pyx_n_s_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 1, 1},\n+ {&__pyx_kp_s_6, __pyx_k_6, sizeof(__pyx_k_6), 0, 0, 1, 0},\n+ {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0},\n+ {&__pyx_n_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 1},\n+ {&__pyx_n_s__Delaunay, __pyx_k__Delaunay, sizeof(__pyx_k__Delaunay), 0, 0, 1, 1},\n+ {&__pyx_n_s__Lock, __pyx_k__Lock, sizeof(__pyx_k__Lock), 0, 0, 1, 1},\n+ {&__pyx_n_s__NOerrexit, __pyx_k__NOerrexit, sizeof(__pyx_k__NOerrexit), 0, 0, 1, 1},\n+ {&__pyx_n_s__RuntimeError, __pyx_k__RuntimeError, sizeof(__pyx_k__RuntimeError), 0, 0, 1, 1},\n+ {&__pyx_n_s__SCALElast, __pyx_k__SCALElast, sizeof(__pyx_k__SCALElast), 0, 0, 1, 1},\n+ {&__pyx_n_s__ValueError, __pyx_k__ValueError, sizeof(__pyx_k__ValueError), 0, 0, 1, 1},\n+ {&__pyx_n_s____all__, __pyx_k____all__, sizeof(__pyx_k____all__), 0, 0, 1, 1},\n+ {&__pyx_n_s____init__, __pyx_k____init__, sizeof(__pyx_k____init__), 0, 0, 1, 1},\n+ {&__pyx_n_s____main__, __pyx_k____main__, sizeof(__pyx_k____main__), 0, 0, 1, 1},\n+ {&__pyx_n_s___construct_delaunay, __pyx_k___construct_delaunay, sizeof(__pyx_k___construct_delaunay), 0, 0, 1, 1},\n+ {&__pyx_n_s___qhull_lock, __pyx_k___qhull_lock, sizeof(__pyx_k___qhull_lock), 0, 0, 1, 1},\n+ {&__pyx_n_s___transform, __pyx_k___transform, sizeof(__pyx_k___transform), 0, 0, 1, 1},\n+ {&__pyx_n_s___vertex_to_simplex, __pyx_k___vertex_to_simplex, sizeof(__pyx_k___vertex_to_simplex), 0, 0, 1, 1},\n+ {&__pyx_n_s__acquire, __pyx_k__acquire, sizeof(__pyx_k__acquire), 0, 0, 1, 1},\n+ {&__pyx_n_s__asanyarray, __pyx_k__asanyarray, sizeof(__pyx_k__asanyarray), 0, 0, 1, 1},\n+ {&__pyx_n_s__ascontiguousarray, __pyx_k__ascontiguousarray, sizeof(__pyx_k__ascontiguousarray), 0, 0, 1, 1},\n+ {&__pyx_n_s__astype, __pyx_k__astype, sizeof(__pyx_k__astype), 0, 0, 1, 1},\n+ {&__pyx_n_s__axis, __pyx_k__axis, sizeof(__pyx_k__axis), 0, 0, 1, 1},\n+ {&__pyx_n_s__base, __pyx_k__base, sizeof(__pyx_k__base), 0, 0, 1, 1},\n+ {&__pyx_n_s__bruteforce, __pyx_k__bruteforce, sizeof(__pyx_k__bruteforce), 0, 0, 1, 1},\n+ {&__pyx_n_s__buf, __pyx_k__buf, sizeof(__pyx_k__buf), 0, 0, 1, 1},\n+ {&__pyx_n_s__byteorder, __pyx_k__byteorder, sizeof(__pyx_k__byteorder), 0, 0, 1, 1},\n+ {&__pyx_n_s__convex_hull, __pyx_k__convex_hull, sizeof(__pyx_k__convex_hull), 0, 0, 1, 1},\n+ {&__pyx_n_s__data, __pyx_k__data, sizeof(__pyx_k__data), 0, 0, 1, 1},\n+ {&__pyx_n_s__descr, __pyx_k__descr, sizeof(__pyx_k__descr), 0, 0, 1, 1},\n+ {&__pyx_n_s__double, __pyx_k__double, sizeof(__pyx_k__double), 0, 0, 1, 1},\n+ {&__pyx_n_s__dtype, __pyx_k__dtype, sizeof(__pyx_k__dtype), 0, 0, 1, 1},\n+ {&__pyx_n_s__e, __pyx_k__e, sizeof(__pyx_k__e), 0, 0, 1, 1},\n+ {&__pyx_n_s__edge, __pyx_k__edge, sizeof(__pyx_k__edge), 0, 0, 1, 1},\n+ {&__pyx_n_s__empty, __pyx_k__empty, sizeof(__pyx_k__empty), 0, 0, 1, 1},\n+ {&__pyx_n_s__eps, __pyx_k__eps, sizeof(__pyx_k__eps), 0, 0, 1, 1},\n+ {&__pyx_n_s__equations, __pyx_k__equations, sizeof(__pyx_k__equations), 0, 0, 1, 1},\n+ {&__pyx_n_s__facet_id, __pyx_k__facet_id, sizeof(__pyx_k__facet_id), 0, 0, 1, 1},\n+ {&__pyx_n_s__facet_list, __pyx_k__facet_list, sizeof(__pyx_k__facet_list), 0, 0, 1, 1},\n+ {&__pyx_n_s__fields, __pyx_k__fields, sizeof(__pyx_k__fields), 0, 0, 1, 1},\n+ {&__pyx_n_s__fill, __pyx_k__fill, sizeof(__pyx_k__fill), 0, 0, 1, 1},\n+ {&__pyx_n_s__find_simplex, __pyx_k__find_simplex, sizeof(__pyx_k__find_simplex), 0, 0, 1, 1},\n+ {&__pyx_n_s__finfo, __pyx_k__finfo, sizeof(__pyx_k__finfo), 0, 0, 1, 1},\n+ {&__pyx_n_s__format, __pyx_k__format, sizeof(__pyx_k__format), 0, 0, 1, 1},\n+ {&__pyx_n_s__id, __pyx_k__id, sizeof(__pyx_k__id), 0, 0, 1, 1},\n+ {&__pyx_n_s__info, __pyx_k__info, sizeof(__pyx_k__info), 0, 0, 1, 1},\n+ {&__pyx_n_s__int, __pyx_k__int, sizeof(__pyx_k__int), 0, 0, 1, 1},\n+ {&__pyx_n_s__itemsize, __pyx_k__itemsize, sizeof(__pyx_k__itemsize), 0, 0, 1, 1},\n+ {&__pyx_n_s__last_high, __pyx_k__last_high, sizeof(__pyx_k__last_high), 0, 0, 1, 1},\n+ {&__pyx_n_s__last_low, __pyx_k__last_low, sizeof(__pyx_k__last_low), 0, 0, 1, 1},\n+ {&__pyx_n_s__last_newhigh, __pyx_k__last_newhigh, sizeof(__pyx_k__last_newhigh), 0, 0, 1, 1},\n+ {&__pyx_n_s__lift_points, __pyx_k__lift_points, sizeof(__pyx_k__lift_points), 0, 0, 1, 1},\n+ {&__pyx_n_s__max, __pyx_k__max, sizeof(__pyx_k__max), 0, 0, 1, 1},\n+ {&__pyx_n_s__max_bound, __pyx_k__max_bound, sizeof(__pyx_k__max_bound), 0, 0, 1, 1},\n+ {&__pyx_n_s__min, __pyx_k__min, sizeof(__pyx_k__min), 0, 0, 1, 1},\n+ {&__pyx_n_s__min_bound, __pyx_k__min_bound, sizeof(__pyx_k__min_bound), 0, 0, 1, 1},\n+ {&__pyx_n_s__names, __pyx_k__names, sizeof(__pyx_k__names), 0, 0, 1, 1},\n+ {&__pyx_n_s__nan, __pyx_k__nan, sizeof(__pyx_k__nan), 0, 0, 1, 1},\n+ {&__pyx_n_s__ndim, __pyx_k__ndim, sizeof(__pyx_k__ndim), 0, 0, 1, 1},\n+ {&__pyx_n_s__neighbors, __pyx_k__neighbors, sizeof(__pyx_k__neighbors), 0, 0, 1, 1},\n+ {&__pyx_n_s__next, __pyx_k__next, sizeof(__pyx_k__next), 0, 0, 1, 1},\n+ {&__pyx_n_s__normal, __pyx_k__normal, sizeof(__pyx_k__normal), 0, 0, 1, 1},\n+ {&__pyx_n_s__np, __pyx_k__np, sizeof(__pyx_k__np), 0, 0, 1, 1},\n+ {&__pyx_n_s__npoints, __pyx_k__npoints, sizeof(__pyx_k__npoints), 0, 0, 1, 1},\n+ {&__pyx_n_s__nsimplex, __pyx_k__nsimplex, sizeof(__pyx_k__nsimplex), 0, 0, 1, 1},\n+ {&__pyx_n_s__numpoints, __pyx_k__numpoints, sizeof(__pyx_k__numpoints), 0, 0, 1, 1},\n+ {&__pyx_n_s__numpy, __pyx_k__numpy, sizeof(__pyx_k__numpy), 0, 0, 1, 1},\n+ {&__pyx_n_s__obj, __pyx_k__obj, sizeof(__pyx_k__obj), 0, 0, 1, 1},\n+ {&__pyx_n_s__object, __pyx_k__object, sizeof(__pyx_k__object), 0, 0, 1, 1},\n+ {&__pyx_n_s__offset, __pyx_k__offset, sizeof(__pyx_k__offset), 0, 0, 1, 1},\n+ {&__pyx_n_s__p, __pyx_k__p, sizeof(__pyx_k__p), 0, 0, 1, 1},\n+ {&__pyx_n_s__paraboloid_scale, __pyx_k__paraboloid_scale, sizeof(__pyx_k__paraboloid_scale), 0, 0, 1, 1},\n+ {&__pyx_n_s__paraboloid_shift, __pyx_k__paraboloid_shift, sizeof(__pyx_k__paraboloid_shift), 0, 0, 1, 1},\n+ {&__pyx_n_s__plane_distance, __pyx_k__plane_distance, sizeof(__pyx_k__plane_distance), 0, 0, 1, 1},\n+ {&__pyx_n_s__point, __pyx_k__point, sizeof(__pyx_k__point), 0, 0, 1, 1},\n+ {&__pyx_n_s__points, __pyx_k__points, sizeof(__pyx_k__points), 0, 0, 1, 1},\n+ {&__pyx_n_s__prod, __pyx_k__prod, sizeof(__pyx_k__prod), 0, 0, 1, 1},\n+ {&__pyx_n_s__property, __pyx_k__property, sizeof(__pyx_k__property), 0, 0, 1, 1},\n+ {&__pyx_n_s__range, __pyx_k__range, sizeof(__pyx_k__range), 0, 0, 1, 1},\n+ {&__pyx_n_s__readonly, __pyx_k__readonly, sizeof(__pyx_k__readonly), 0, 0, 1, 1},\n+ {&__pyx_n_s__release, __pyx_k__release, sizeof(__pyx_k__release), 0, 0, 1, 1},\n+ {&__pyx_n_s__reshape, __pyx_k__reshape, sizeof(__pyx_k__reshape), 0, 0, 1, 1},\n+ {&__pyx_n_s__resize, __pyx_k__resize, sizeof(__pyx_k__resize), 0, 0, 1, 1},\n+ {&__pyx_n_s__self, __pyx_k__self, sizeof(__pyx_k__self), 0, 0, 1, 1},\n+ {&__pyx_n_s__shape, __pyx_k__shape, sizeof(__pyx_k__shape), 0, 0, 1, 1},\n+ {&__pyx_n_s__simplicial, __pyx_k__simplicial, sizeof(__pyx_k__simplicial), 0, 0, 1, 1},\n+ {&__pyx_n_s__start_edge, __pyx_k__start_edge, sizeof(__pyx_k__start_edge), 0, 0, 1, 1},\n+ {&__pyx_n_s__start_triangle, __pyx_k__start_triangle, sizeof(__pyx_k__start_triangle), 0, 0, 1, 1},\n+ {&__pyx_n_s__strides, __pyx_k__strides, sizeof(__pyx_k__strides), 0, 0, 1, 1},\n+ {&__pyx_n_s__suboffsets, __pyx_k__suboffsets, sizeof(__pyx_k__suboffsets), 0, 0, 1, 1},\n+ {&__pyx_n_s__sum, __pyx_k__sum, sizeof(__pyx_k__sum), 0, 0, 1, 1},\n+ {&__pyx_n_s__threading, __pyx_k__threading, sizeof(__pyx_k__threading), 0, 0, 1, 1},\n+ {&__pyx_n_s__transform, __pyx_k__transform, sizeof(__pyx_k__transform), 0, 0, 1, 1},\n+ {&__pyx_n_s__tri, __pyx_k__tri, sizeof(__pyx_k__tri), 0, 0, 1, 1},\n+ {&__pyx_n_s__triangle, __pyx_k__triangle, sizeof(__pyx_k__triangle), 0, 0, 1, 1},\n+ {&__pyx_n_s__tsearch, __pyx_k__tsearch, sizeof(__pyx_k__tsearch), 0, 0, 1, 1},\n+ {&__pyx_n_s__type_num, __pyx_k__type_num, sizeof(__pyx_k__type_num), 0, 0, 1, 1},\n+ {&__pyx_n_s__upperdelaunay, __pyx_k__upperdelaunay, sizeof(__pyx_k__upperdelaunay), 0, 0, 1, 1},\n+ {&__pyx_n_s__vertex, __pyx_k__vertex, sizeof(__pyx_k__vertex), 0, 0, 1, 1},\n+ {&__pyx_n_s__vertex2, __pyx_k__vertex2, sizeof(__pyx_k__vertex2), 0, 0, 1, 1},\n+ {&__pyx_n_s__vertex_to_simplex, __pyx_k__vertex_to_simplex, sizeof(__pyx_k__vertex_to_simplex), 0, 0, 1, 1},\n+ {&__pyx_n_s__vertices, __pyx_k__vertices, sizeof(__pyx_k__vertices), 0, 0, 1, 1},\n+ {&__pyx_n_s__x, __pyx_k__x, sizeof(__pyx_k__x), 0, 0, 1, 1},\n+ {&__pyx_n_s__xi, __pyx_k__xi, sizeof(__pyx_k__xi), 0, 0, 1, 1},\n+ {&__pyx_n_s__xrange, __pyx_k__xrange, sizeof(__pyx_k__xrange), 0, 0, 1, 1},\n+ {&__pyx_n_s__zeros, __pyx_k__zeros, sizeof(__pyx_k__zeros), 0, 0, 1, 1},\n+ {0, 0, 0, 0, 0, 0, 0}\n+};\n+static int __Pyx_InitCachedBuiltins(void) {\n+ __pyx_builtin_object = __Pyx_GetName(__pyx_b, __pyx_n_s__object); if (!__pyx_builtin_object) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_property = __Pyx_GetName(__pyx_b, __pyx_n_s__property); if (!__pyx_builtin_property) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_n_s__RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #if PY_MAJOR_VERSION >= 3\n+ __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #else\n+ __pyx_builtin_xrange = __Pyx_GetName(__pyx_b, __pyx_n_s__xrange); if (!__pyx_builtin_xrange) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #endif\n+ __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ return 0;\n+ __pyx_L1_error:;\n+ return -1;\n+}\n+\n+static int __Pyx_InitGlobals(void) {\n+ if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_10 = PyInt_FromLong(10); if (unlikely(!__pyx_int_10)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ return 0;\n+ __pyx_L1_error:;\n+ return -1;\n+}\n+\n+#if PY_MAJOR_VERSION < 3\n+PyMODINIT_FUNC initqhull(void); \n+PyMODINIT_FUNC initqhull(void)\n+#else\n+PyMODINIT_FUNC PyInit_qhull(void); \n+PyMODINIT_FUNC PyInit_qhull(void)\n+#endif\n+{\n+ PyObject *__pyx_t_1 = NULL;\n+ PyObject *__pyx_t_2 = NULL;\n+ PyObject *__pyx_t_3 = NULL;\n+ PyObject *__pyx_t_4 = NULL;\n+ #if CYTHON_REFNANNY\n+ void* __pyx_refnanny = NULL;\n+ __Pyx_RefNanny = __Pyx_RefNannyImportAPI(\"refnanny\");\n+ if (!__Pyx_RefNanny) {\n+ PyErr_Clear();\n+ __Pyx_RefNanny = __Pyx_RefNannyImportAPI(\"Cython.Runtime.refnanny\");\n+ if (!__Pyx_RefNanny)\n+ Py_FatalError(\"failed to import 'refnanny' module\");\n+ }\n+ __pyx_refnanny = __Pyx_RefNanny->SetupContext(\"PyMODINIT_FUNC PyInit_qhull(void)\", __LINE__, __FILE__);\n+ #endif\n+ __pyx_init_filenames();\n+ __pyx_empty_tuple = PyTuple_New(0); if (unlikely(!__pyx_empty_tuple)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #if PY_MAJOR_VERSION < 3\n+ __pyx_empty_bytes = PyString_FromStringAndSize(\"\", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #else\n+ __pyx_empty_bytes = PyBytes_FromStringAndSize(\"\", 0); if (unlikely(!__pyx_empty_bytes)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ #endif\n+ \n+ \n+ #if defined(__PYX_FORCE_INIT_THREADS) && __PYX_FORCE_INIT_THREADS\n+ #ifdef WITH_THREAD \n+ PyEval_InitThreads();\n+ #endif\n+ #endif\n+ \n+ #if PY_MAJOR_VERSION < 3\n+ __pyx_m = Py_InitModule4(__Pyx_NAMESTR(\"qhull\"), __pyx_methods, __Pyx_DOCSTR(__pyx_k_18), 0, PYTHON_API_VERSION);\n+ #else\n+ __pyx_m = PyModule_Create(&__pyx_moduledef);\n+ #endif\n+ if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ #if PY_MAJOR_VERSION < 3\n+ Py_INCREF(__pyx_m);\n+ #endif\n+ __pyx_b = PyImport_AddModule(__Pyx_NAMESTR(__Pyx_BUILTIN_MODULE_NAME));\n+ if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ if (__Pyx_SetAttrString(__pyx_m, \"__builtins__\", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ \n+ if (unlikely(__Pyx_InitGlobals() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__pyx_module_is_main_scipy__spatial__qhull) {\n+ if (__Pyx_SetAttrString(__pyx_m, \"__name__\", __pyx_n_s____main__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};\n+ }\n+ \n+ if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ \n+ \n+ if (__Pyx_ExportFunction(\"_get_delaunay_info\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__get_delaunay_info, \"__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *(PyObject *, int, int)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_barycentric_inside\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__barycentric_inside, \"int (int, double *, double *, double *, double)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_barycentric_coordinate_single\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__barycentric_coordinate_single, \"void (int, double *, double *, double *, int)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_barycentric_coordinates\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__barycentric_coordinates, \"void (int, double *, double *, double *)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_lift_point\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__lift_point, \"void (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_distplane\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__distplane, \"double (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int, double *)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_is_point_fully_outside\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__is_point_fully_outside, \"int (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_find_simplex_bruteforce\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__find_simplex_bruteforce, \"int (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, double)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_find_simplex_directed\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__find_simplex_directed, \"int (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, int *, double)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_find_simplex\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__find_simplex, \"int (__pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, double *, double *, int *, double)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_RidgeIter2D_init\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_init, \"void (__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *, __pyx_t_5scipy_7spatial_5qhull_DelaunayInfo_t *, int)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ if (__Pyx_ExportFunction(\"_RidgeIter2D_next\", (void (*)(void))__pyx_f_5scipy_7spatial_5qhull__RidgeIter2D_next, \"void (__pyx_t_5scipy_7spatial_5qhull_RidgeIter2D_t *)\") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ \n+ \n+ __pyx_ptype_5numpy_dtype = __Pyx_ImportType(\"numpy\", \"dtype\", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_5numpy_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_flatiter = __Pyx_ImportType(\"numpy\", \"flatiter\", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_broadcast = __Pyx_ImportType(\"numpy\", \"broadcast\", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_ndarray = __Pyx_ImportType(\"numpy\", \"ndarray\", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_ptype_5numpy_ufunc = __Pyx_ImportType(\"numpy\", \"ufunc\", sizeof(PyUFuncObject), 0); if (unlikely(!__pyx_ptype_5numpy_ufunc)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 848; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ \n+ \n+\n+ \n+ __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__threading), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s__threading, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = __Pyx_Import(((PyObject *)__pyx_n_s__numpy), 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __Pyx_INCREF(((PyObject *)__pyx_n_s__Delaunay));\n+ PyList_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_n_s__Delaunay));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_n_s__Delaunay));\n+ __Pyx_INCREF(((PyObject *)__pyx_n_s__tsearch));\n+ PyList_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_n_s__tsearch));\n+ __Pyx_GIVEREF(((PyObject *)__pyx_n_s__tsearch));\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s____all__, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = __Pyx_GetName(__pyx_m, __pyx_n_s__threading); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__Lock); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+ __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_1);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s___qhull_lock, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;\n+\n+ \n+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(((PyObject *)__pyx_t_1));\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_INCREF(__pyx_builtin_object);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_builtin_object);\n+ __Pyx_GIVEREF(__pyx_builtin_object);\n+ if (PyDict_SetItemString(((PyObject *)__pyx_t_1), \"__doc__\", ((PyObject *)__pyx_kp_s_19)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __pyx_t_3 = __Pyx_CreateClass(__pyx_t_2, ((PyObject *)__pyx_t_1), __pyx_n_s__Delaunay, \"scipy.spatial.qhull\"); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_3);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay___init__, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s____init__, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_transform, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_2 = PyMethod_New(__pyx_t_4, 0, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__transform, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = __Pyx_GetName(__pyx_t_3, __pyx_n_s__transform); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_property, __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__transform, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_vertex_to_simplex, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__vertex_to_simplex, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = __Pyx_GetName(__pyx_t_3, __pyx_n_s__vertex_to_simplex); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);\n+ __Pyx_GIVEREF(__pyx_t_4);\n+ __pyx_t_4 = 0;\n+ __pyx_t_4 = PyObject_Call(__pyx_builtin_property, __pyx_t_2, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__vertex_to_simplex, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_convex_hull, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_2 = PyMethod_New(__pyx_t_4, 0, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__convex_hull, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = __Pyx_GetName(__pyx_t_3, __pyx_n_s__convex_hull); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_2);\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyObject_Call(__pyx_builtin_property, __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__convex_hull, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_k_9 = __pyx_t_2;\n+ __Pyx_GIVEREF(__pyx_t_2);\n+ __pyx_t_2 = 0;\n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_find_simplex, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__find_simplex, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+\n+ \n+ __pyx_t_4 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_plane_distance, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __pyx_t_2 = PyMethod_New(__pyx_t_4, 0, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__plane_distance, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1053; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+\n+ \n+ __pyx_t_2 = PyCFunction_New(&__pyx_mdef_5scipy_7spatial_5qhull_8Delaunay_lift_points, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_2);\n+ __pyx_t_4 = PyMethod_New(__pyx_t_2, 0, __pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_GOTREF(__pyx_t_4);\n+ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;\n+ if (PyObject_SetAttr(__pyx_t_3, __pyx_n_s__lift_points, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;\n+ if (PyObject_SetAttr(__pyx_m, __pyx_n_s__Delaunay, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; __pyx_clineno = __LINE__; goto __pyx_L1_error;}\n+ __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;\n+ __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;\n+\n+ \n+ goto __pyx_L0;\n+ __pyx_L1_error:;\n+ __Pyx_XDECREF(__pyx_t_1);\n+ __Pyx_XDECREF(__pyx_t_2);\n+ __Pyx_XDECREF(__pyx_t_3);\n+ __Pyx_XDECREF(__pyx_t_4);\n+ if (__pyx_m) {\n+ __Pyx_AddTraceback(\"init scipy.spatial.qhull\");\n+ Py_DECREF(__pyx_m); __pyx_m = 0;\n+ } else if (!PyErr_Occurred()) {\n+ PyErr_SetString(PyExc_ImportError, \"init scipy.spatial.qhull\");\n+ }\n+ __pyx_L0:;\n+ __Pyx_RefNannyFinishContext();\n+ #if PY_MAJOR_VERSION < 3\n+ return;\n+ #else\n+ return __pyx_m;\n+ #endif\n+}\n+\n+static const char *__pyx_filenames[] = {\n+ \"qhull.pyx\",\n+ \"numpy.pxd\",\n+};\n+\n+\n+\n+static void __pyx_init_filenames(void) {\n+ __pyx_f = __pyx_filenames;\n+}\n+\n+static CYTHON_INLINE int __Pyx_IsLittleEndian(void) {\n+ unsigned int n = 1;\n+ return *(unsigned char*)(&n) != 0;\n+}\n+\n+typedef struct {\n+ __Pyx_StructField root;\n+ __Pyx_BufFmt_StackElem* head;\n+ size_t fmt_offset;\n+ int new_count, enc_count;\n+ int is_complex;\n+ char enc_type;\n+ char packmode;\n+} __Pyx_BufFmt_Context;\n+\n+static void __Pyx_BufFmt_Init(__Pyx_BufFmt_Context* ctx,\n+ __Pyx_BufFmt_StackElem* stack,\n+ __Pyx_TypeInfo* type) {\n+ stack[0].field = &ctx->root;\n+ stack[0].parent_offset = 0;\n+ ctx->root.type = type;\n+ ctx->root.name = \"buffer dtype\";\n+ ctx->root.offset = 0;\n+ ctx->head = stack;\n+ ctx->head->field = &ctx->root;\n+ ctx->fmt_offset = 0;\n+ ctx->head->parent_offset = 0;\n+ ctx->packmode = '@';\n+ ctx->new_count = 1;\n+ ctx->enc_count = 0;\n+ ctx->enc_type = 0;\n+ ctx->is_complex = 0;\n+ while (type->typegroup == 'S') {\n+ ++ctx->head;\n+ ctx->head->field = type->fields;\n+ ctx->head->parent_offset = 0;\n+ type = type->fields->type;\n+ }\n+}\n+\n+static int __Pyx_BufFmt_ParseNumber(const char** ts) {\n+ int count;\n+ const char* t = *ts;\n+ if (*t < '0' || *t > '9') {\n+ return -1;\n+ } else {\n+ count = *t++ - '0';\n+ while (*t >= '0' && *t < '9') {\n+ count *= 10;\n+ count += *t++ - '0';\n+ }\n+ }\n+ *ts = t;\n+ return count;\n+}\n+\n+static void __Pyx_BufFmt_RaiseUnexpectedChar(char ch) {\n+ char msg[] = {ch, 0};\n+ PyErr_Format(PyExc_ValueError, \"Unexpected format string character: '%s'\", msg);\n+}\n+\n+static const char* __Pyx_BufFmt_DescribeTypeChar(char ch, int is_complex) {\n+ switch (ch) {\n+ case 'b': return \"'char'\";\n+ case 'B': return \"'unsigned char'\";\n+ case 'h': return \"'short'\";\n+ case 'H': return \"'unsigned short'\";\n+ case 'i': return \"'int'\";\n+ case 'I': return \"'unsigned int'\";\n+ case 'l': return \"'long'\";\n+ case 'L': return \"'unsigned long'\";\n+ case 'q': return \"'long long'\";\n+ case 'Q': return \"'unsigned long long'\";\n+ case 'f': return (is_complex ? \"'complex float'\" : \"'float'\");\n+ case 'd': return (is_complex ? \"'complex double'\" : \"'double'\");\n+ case 'g': return (is_complex ? \"'complex long double'\" : \"'long double'\");\n+ case 'T': return \"a struct\";\n+ case 'O': return \"Python object\";\n+ case 'P': return \"a pointer\";\n+ case 0: return \"end\";\n+ default: return \"unparseable format string\";\n+ }\n+}\n+\n+static size_t __Pyx_BufFmt_TypeCharToStandardSize(char ch, int is_complex) {\n+ switch (ch) {\n+ case '?': case 'c': case 'b': case 'B': return 1;\n+ case 'h': case 'H': return 2;\n+ case 'i': case 'I': case 'l': case 'L': return 4;\n+ case 'q': case 'Q': return 8;\n+ case 'f': return (is_complex ? 8 : 4);\n+ case 'd': return (is_complex ? 16 : 8);\n+ case 'g': {\n+ PyErr_SetString(PyExc_ValueError, \"Python does not define a standard format string size for long double ('g')..\");\n+ return 0;\n+ }\n+ case 'O': case 'P': return sizeof(void*);\n+ default:\n+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);\n+ return 0;\n+ }\n+}\n+\n+static size_t __Pyx_BufFmt_TypeCharToNativeSize(char ch, int is_complex) {\n+ switch (ch) {\n+ case 'c': case 'b': case 'B': return 1;\n+ case 'h': case 'H': return sizeof(short);\n+ case 'i': case 'I': return sizeof(int);\n+ case 'l': case 'L': return sizeof(long);\n+ #ifdef HAVE_LONG_LONG\n+ case 'q': case 'Q': return sizeof(PY_LONG_LONG);\n+ #endif\n+ case 'f': return sizeof(float) * (is_complex ? 2 : 1);\n+ case 'd': return sizeof(double) * (is_complex ? 2 : 1);\n+ case 'g': return sizeof(long double) * (is_complex ? 2 : 1);\n+ case 'O': case 'P': return sizeof(void*);\n+ default: {\n+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);\n+ return 0;\n+ } \n+ }\n+}\n+\n+typedef struct { char c; short x; } __Pyx_st_short;\n+typedef struct { char c; int x; } __Pyx_st_int;\n+typedef struct { char c; long x; } __Pyx_st_long;\n+typedef struct { char c; float x; } __Pyx_st_float;\n+typedef struct { char c; double x; } __Pyx_st_double;\n+typedef struct { char c; long double x; } __Pyx_st_longdouble;\n+typedef struct { char c; void *x; } __Pyx_st_void_p;\n+#ifdef HAVE_LONG_LONG\n+typedef struct { char c; PY_LONG_LONG x; } __Pyx_s_long_long;\n+#endif\n+\n+static size_t __Pyx_BufFmt_TypeCharToAlignment(char ch, int is_complex) {\n+ switch (ch) {\n+ case '?': case 'c': case 'b': case 'B': return 1;\n+ case 'h': case 'H': return sizeof(__Pyx_st_short) - sizeof(short);\n+ case 'i': case 'I': return sizeof(__Pyx_st_int) - sizeof(int);\n+ case 'l': case 'L': return sizeof(__Pyx_st_long) - sizeof(long);\n+#ifdef HAVE_LONG_LONG\n+ case 'q': case 'Q': return sizeof(__Pyx_s_long_long) - sizeof(PY_LONG_LONG);\n+#endif\n+ case 'f': return sizeof(__Pyx_st_float) - sizeof(float);\n+ case 'd': return sizeof(__Pyx_st_double) - sizeof(double);\n+ case 'g': return sizeof(__Pyx_st_longdouble) - sizeof(long double);\n+ case 'P': case 'O': return sizeof(__Pyx_st_void_p) - sizeof(void*);\n+ default:\n+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);\n+ return 0;\n+ }\n+}\n+\n+static size_t __Pyx_BufFmt_TypeCharToGroup(char ch, int is_complex) {\n+ switch (ch) {\n+ case 'c': case 'b': case 'h': case 'i': case 'l': case 'q': return 'I';\n+ case 'B': case 'H': case 'I': case 'L': case 'Q': return 'U';\n+ case 'f': case 'd': case 'g': return (is_complex ? 'C' : 'R');\n+ case 'O': return 'O';\n+ case 'P': return 'P';\n+ default: {\n+ __Pyx_BufFmt_RaiseUnexpectedChar(ch);\n+ return 0;\n+ } \n+ }\n+}\n+\n+static void __Pyx_BufFmt_RaiseExpected(__Pyx_BufFmt_Context* ctx) {\n+ if (ctx->head == NULL || ctx->head->field == &ctx->root) {\n+ const char* expected;\n+ const char* quote;\n+ if (ctx->head == NULL) {\n+ expected = \"end\";\n+ quote = \"\";\n+ } else {\n+ expected = ctx->head->field->type->name;\n+ quote = \"'\";\n+ }\n+ PyErr_Format(PyExc_ValueError,\n+ \"Buffer dtype mismatch, expected %s%s%s but got %s\",\n+ quote, expected, quote,\n+ __Pyx_BufFmt_DescribeTypeChar(ctx->enc_type, ctx->is_complex));\n+ } else {\n+ __Pyx_StructField* field = ctx->head->field;\n+ __Pyx_StructField* parent = (ctx->head - 1)->field;\n+ PyErr_Format(PyExc_ValueError,\n+ \"Buffer dtype mismatch, expected '%s' but got %s in '%s.%s'\",\n+ field->type->name, __Pyx_BufFmt_DescribeTypeChar(ctx->enc_type, ctx->is_complex),\n+ parent->type->name, field->name);\n+ }\n+}\n+\n+static int __Pyx_BufFmt_ProcessTypeChunk(__Pyx_BufFmt_Context* ctx) {\n+ char group;\n+ size_t size, offset;\n+ if (ctx->enc_type == 0) return 0;\n+ group = __Pyx_BufFmt_TypeCharToGroup(ctx->enc_type, ctx->is_complex);\n+ do {\n+ __Pyx_StructField* field = ctx->head->field;\n+ __Pyx_TypeInfo* type = field->type;\n+ \n+ if (ctx->packmode == '@' || ctx->packmode == '^') {\n+ size = __Pyx_BufFmt_TypeCharToNativeSize(ctx->enc_type, ctx->is_complex);\n+ } else {\n+ size = __Pyx_BufFmt_TypeCharToStandardSize(ctx->enc_type, ctx->is_complex);\n+ }\n+ if (ctx->packmode == '@') {\n+ int align_at = __Pyx_BufFmt_TypeCharToAlignment(ctx->enc_type, ctx->is_complex);\n+ int align_mod_offset;\n+ if (align_at == 0) return -1;\n+ align_mod_offset = ctx->fmt_offset % align_at;\n+ if (align_mod_offset > 0) ctx->fmt_offset += align_at - align_mod_offset;\n+ }\n+\n+ if (type->size != size || type->typegroup != group) {\n+ if (type->typegroup == 'C' && type->fields != NULL) {\n+ \n+ size_t parent_offset = ctx->head->parent_offset + field->offset;\n+ ++ctx->head;\n+ ctx->head->field = type->fields;\n+ ctx->head->parent_offset = parent_offset;\n+ continue;\n+ }\n+ \n+ __Pyx_BufFmt_RaiseExpected(ctx);\n+ return -1;\n+ }\n+\n+ offset = ctx->head->parent_offset + field->offset;\n+ if (ctx->fmt_offset != offset) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"Buffer dtype mismatch; next field is at offset %\"PY_FORMAT_SIZE_T\"d \"\n+ \"but %\"PY_FORMAT_SIZE_T\"d expected\", ctx->fmt_offset, offset);\n+ return -1;\n+ }\n+\n+ ctx->fmt_offset += size;\n+ \n+ --ctx->enc_count; \n+\n+ \n+ while (1) {\n+ if (field == &ctx->root) {\n+ ctx->head = NULL;\n+ if (ctx->enc_count != 0) {\n+ __Pyx_BufFmt_RaiseExpected(ctx);\n+ return -1;\n+ }\n+ break; \n+ }\n+ ctx->head->field = ++field;\n+ if (field->type == NULL) {\n+ --ctx->head;\n+ field = ctx->head->field;\n+ continue;\n+ } else if (field->type->typegroup == 'S') {\n+ size_t parent_offset = ctx->head->parent_offset + field->offset;\n+ if (field->type->fields->type == NULL) continue; \n+ field = field->type->fields;\n+ ++ctx->head;\n+ ctx->head->field = field;\n+ ctx->head->parent_offset = parent_offset;\n+ break;\n+ } else {\n+ break;\n+ }\n+ }\n+ } while (ctx->enc_count);\n+ ctx->enc_type = 0;\n+ ctx->is_complex = 0;\n+ return 0; \n+}\n+\n+static int __Pyx_BufFmt_FirstPack(__Pyx_BufFmt_Context* ctx) {\n+ if (ctx->enc_type != 0 || ctx->packmode != '@') {\n+ PyErr_SetString(PyExc_ValueError, \"Buffer packing mode currently only allowed at beginning of format string (this is a defect)\");\n+ return -1;\n+ }\n+ return 0;\n+}\n+\n+static const char* __Pyx_BufFmt_CheckString(__Pyx_BufFmt_Context* ctx, const char* ts) {\n+ int got_Z = 0;\n+ while (1) {\n+ switch(*ts) {\n+ case 0:\n+ if (ctx->enc_type != 0 && ctx->head == NULL) {\n+ __Pyx_BufFmt_RaiseExpected(ctx);\n+ return NULL;\n+ }\n+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;\n+ if (ctx->head != NULL) {\n+ __Pyx_BufFmt_RaiseExpected(ctx);\n+ return NULL;\n+ }\n+ return ts;\n+ case ' ':\n+ case 10:\n+ case 13:\n+ ++ts;\n+ break;\n+ case '<':\n+ if (!__Pyx_IsLittleEndian()) {\n+ PyErr_SetString(PyExc_ValueError, \"Little-endian buffer not supported on big-endian compiler\");\n+ return NULL;\n+ }\n+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;\n+ ctx->packmode = '=';\n+ ++ts;\n+ break;\n+ case '>':\n+ case '!':\n+ if (__Pyx_IsLittleEndian()) {\n+ PyErr_SetString(PyExc_ValueError, \"Big-endian buffer not supported on little-endian compiler\");\n+ return NULL;\n+ }\n+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;\n+ ctx->packmode = '=';\n+ ++ts;\n+ break;\n+ case '=':\n+ case '@':\n+ case '^':\n+ if (__Pyx_BufFmt_FirstPack(ctx) == -1) return NULL;\n+ ctx->packmode = *ts++;\n+ break;\n+ case 'T': \n+ {\n+ int i;\n+ const char* ts_after_sub;\n+ int struct_count = ctx->new_count;\n+ ctx->new_count = 1;\n+ ++ts;\n+ if (*ts != '{') {\n+ PyErr_SetString(PyExc_ValueError, \"Buffer acquisition: Expected '{' after 'T'\");\n+ return NULL;\n+ }\n+ ++ts;\n+ ts_after_sub = ts;\n+ for (i = 0; i != struct_count; ++i) {\n+ ts_after_sub = __Pyx_BufFmt_CheckString(ctx, ts);\n+ if (!ts_after_sub) return NULL;\n+ }\n+ ts = ts_after_sub;\n+ }\n+ break;\n+ case '}': \n+ ++ts;\n+ return ts;\n+ case 'x':\n+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;\n+ ctx->fmt_offset += ctx->new_count;\n+ ctx->new_count = 1;\n+ ctx->enc_count = 0;\n+ ctx->enc_type = 0;\n+ ++ts;\n+ break;\n+ case 'Z':\n+ got_Z = 1;\n+ ++ts;\n+ if (*ts != 'f' && *ts != 'd' && *ts != 'g') {\n+ __Pyx_BufFmt_RaiseUnexpectedChar('Z');\n+ return NULL;\n+ } \n+ case 'c': case 'b': case 'B': case 'h': case 'H': case 'i': case 'I':\n+ case 'l': case 'L': case 'q': case 'Q':\n+ case 'f': case 'd': case 'g':\n+ case 'O':\n+ if (ctx->enc_type == *ts && got_Z == ctx->is_complex) {\n+ \n+ ctx->enc_count += ctx->new_count;\n+ } else {\n+ \n+ if (__Pyx_BufFmt_ProcessTypeChunk(ctx) == -1) return NULL;\n+ ctx->enc_count = ctx->new_count;\n+ ctx->enc_type = *ts;\n+ ctx->is_complex = got_Z;\n+ }\n+ ++ts;\n+ ctx->new_count = 1;\n+ got_Z = 0;\n+ break;\n+ default:\n+ {\n+ ctx->new_count = __Pyx_BufFmt_ParseNumber(&ts);\n+ if (ctx->new_count == -1) { \n+ char msg[2] = { *ts, 0 };\n+ PyErr_Format(PyExc_ValueError,\n+ \"Does not understand character buffer dtype format string ('%s')\", msg);\n+ return NULL;\n+ }\n+ }\n+ \n+ }\n+ }\n+}\n+\n+static CYTHON_INLINE void __Pyx_ZeroBuffer(Py_buffer* buf) {\n+ buf->buf = NULL;\n+ buf->obj = NULL;\n+ buf->strides = __Pyx_zeros;\n+ buf->shape = __Pyx_zeros;\n+ buf->suboffsets = __Pyx_minusones;\n+}\n+\n+static int __Pyx_GetBufferAndValidate(Py_buffer* buf, PyObject* obj, __Pyx_TypeInfo* dtype, int flags, int nd, int cast, __Pyx_BufFmt_StackElem* stack) {\n+ if (obj == Py_None) {\n+ __Pyx_ZeroBuffer(buf);\n+ return 0;\n+ }\n+ buf->buf = NULL;\n+ if (__Pyx_GetBuffer(obj, buf, flags) == -1) goto fail;\n+ if (buf->ndim != nd) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"Buffer has wrong number of dimensions (expected %d, got %d)\",\n+ nd, buf->ndim);\n+ goto fail;\n+ }\n+ if (!cast) {\n+ __Pyx_BufFmt_Context ctx;\n+ __Pyx_BufFmt_Init(&ctx, stack, dtype);\n+ if (!__Pyx_BufFmt_CheckString(&ctx, buf->format)) goto fail;\n+ }\n+ if ((unsigned)buf->itemsize != dtype->size) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"Item size of buffer (%\"PY_FORMAT_SIZE_T\"d byte%s) does not match size of '%s' (%\"PY_FORMAT_SIZE_T\"d byte%s)\",\n+ buf->itemsize, (buf->itemsize > 1) ? \"s\" : \"\",\n+ dtype->name,\n+ dtype->size, (dtype->size > 1) ? \"s\" : \"\");\n+ goto fail;\n+ }\n+ if (buf->suboffsets == NULL) buf->suboffsets = __Pyx_minusones;\n+ return 0;\n+fail:;\n+ __Pyx_ZeroBuffer(buf);\n+ return -1;\n+}\n+\n+static CYTHON_INLINE void __Pyx_SafeReleaseBuffer(Py_buffer* info) {\n+ if (info->buf == NULL) return;\n+ if (info->suboffsets == __Pyx_minusones) info->suboffsets = NULL;\n+ __Pyx_ReleaseBuffer(info);\n+}\n+\n+static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {\n+ if (unlikely(!type)) {\n+ PyErr_Format(PyExc_SystemError, \"Missing type object\");\n+ return 0;\n+ }\n+ if (likely(PyObject_TypeCheck(obj, type)))\n+ return 1;\n+ PyErr_Format(PyExc_TypeError, \"Cannot convert %.200s to %.200s\",\n+ Py_TYPE(obj)->tp_name, type->tp_name);\n+ return 0;\n+}\n+\n+static void __Pyx_RaiseBufferFallbackError(void) {\n+ PyErr_Format(PyExc_ValueError,\n+ \"Buffer acquisition failed on assignment; and then reacquiring the old buffer failed too!\");\n+}\n+\n+\n+static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {\n+ PyErr_Format(PyExc_ValueError,\n+ #if PY_VERSION_HEX < 0x02050000\n+ \"need more than %d value%s to unpack\", (int)index,\n+ #else\n+ \"need more than %zd value%s to unpack\", index,\n+ #endif\n+ (index == 1) ? \"\" : \"s\");\n+}\n+\n+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void) {\n+ PyErr_SetString(PyExc_ValueError, \"too many values to unpack\");\n+}\n+\n+static PyObject *__Pyx_UnpackItem(PyObject *iter, Py_ssize_t index) {\n+ PyObject *item;\n+ if (!(item = PyIter_Next(iter))) {\n+ if (!PyErr_Occurred()) {\n+ __Pyx_RaiseNeedMoreValuesError(index);\n+ }\n+ }\n+ return item;\n+}\n+\n+static int __Pyx_EndUnpack(PyObject *iter) {\n+ PyObject *item;\n+ if ((item = PyIter_Next(iter))) {\n+ Py_DECREF(item);\n+ __Pyx_RaiseTooManyValuesError();\n+ return -1;\n+ }\n+ else if (!PyErr_Occurred())\n+ return 0;\n+ else\n+ return -1;\n+}\n+\n+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {\n+ PyObject *tmp_type, *tmp_value, *tmp_tb;\n+ PyThreadState *tstate = PyThreadState_GET();\n+\n+ tmp_type = tstate->curexc_type;\n+ tmp_value = tstate->curexc_value;\n+ tmp_tb = tstate->curexc_traceback;\n+ tstate->curexc_type = type;\n+ tstate->curexc_value = value;\n+ tstate->curexc_traceback = tb;\n+ Py_XDECREF(tmp_type);\n+ Py_XDECREF(tmp_value);\n+ Py_XDECREF(tmp_tb);\n+}\n+\n+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {\n+ PyThreadState *tstate = PyThreadState_GET();\n+ *type = tstate->curexc_type;\n+ *value = tstate->curexc_value;\n+ *tb = tstate->curexc_traceback;\n+\n+ tstate->curexc_type = 0;\n+ tstate->curexc_value = 0;\n+ tstate->curexc_traceback = 0;\n+}\n+\n+\n+static void __Pyx_RaiseDoubleKeywordsError(\n+ const char* func_name,\n+ PyObject* kw_name)\n+{\n+ PyErr_Format(PyExc_TypeError,\n+ #if PY_MAJOR_VERSION >= 3\n+ \"%s() got multiple values for keyword argument '%U'\", func_name, kw_name);\n+ #else\n+ \"%s() got multiple values for keyword argument '%s'\", func_name,\n+ PyString_AS_STRING(kw_name));\n+ #endif\n+}\n+\n+static void __Pyx_RaiseArgtupleInvalid(\n+ const char* func_name,\n+ int exact,\n+ Py_ssize_t num_min,\n+ Py_ssize_t num_max,\n+ Py_ssize_t num_found)\n+{\n+ Py_ssize_t num_expected;\n+ const char *number, *more_or_less;\n+\n+ if (num_found < num_min) {\n+ num_expected = num_min;\n+ more_or_less = \"at least\";\n+ } else {\n+ num_expected = num_max;\n+ more_or_less = \"at most\";\n+ }\n+ if (exact) {\n+ more_or_less = \"exactly\";\n+ }\n+ number = (num_expected == 1) ? \"\" : \"s\";\n+ PyErr_Format(PyExc_TypeError,\n+ #if PY_VERSION_HEX < 0x02050000\n+ \"%s() takes %s %d positional argument%s (%d given)\",\n+ #else\n+ \"%s() takes %s %zd positional argument%s (%zd given)\",\n+ #endif\n+ func_name, more_or_less, num_expected, number, num_found);\n+}\n+\n+static int __Pyx_ParseOptionalKeywords(\n+ PyObject *kwds,\n+ PyObject **argnames[],\n+ PyObject *kwds2,\n+ PyObject *values[],\n+ Py_ssize_t num_pos_args,\n+ const char* function_name)\n+{\n+ PyObject *key = 0, *value = 0;\n+ Py_ssize_t pos = 0;\n+ PyObject*** name;\n+ PyObject*** first_kw_arg = argnames + num_pos_args;\n+\n+ while (PyDict_Next(kwds, &pos, &key, &value)) {\n+ name = first_kw_arg;\n+ while (*name && (**name != key)) name++;\n+ if (*name) {\n+ values[name-argnames] = value;\n+ } else {\n+ #if PY_MAJOR_VERSION < 3\n+ if (unlikely(!PyString_CheckExact(key)) && unlikely(!PyString_Check(key))) {\n+ #else\n+ if (unlikely(!PyUnicode_CheckExact(key)) && unlikely(!PyUnicode_Check(key))) {\n+ #endif\n+ goto invalid_keyword_type;\n+ } else {\n+ for (name = first_kw_arg; *name; name++) {\n+ #if PY_MAJOR_VERSION >= 3\n+ if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&\n+ PyUnicode_Compare(**name, key) == 0) break;\n+ #else\n+ if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&\n+ _PyString_Eq(**name, key)) break;\n+ #endif\n+ }\n+ if (*name) {\n+ values[name-argnames] = value;\n+ } else {\n+ \n+ for (name=argnames; name != first_kw_arg; name++) {\n+ if (**name == key) goto arg_passed_twice;\n+ #if PY_MAJOR_VERSION >= 3\n+ if (PyUnicode_GET_SIZE(**name) == PyUnicode_GET_SIZE(key) &&\n+ PyUnicode_Compare(**name, key) == 0) goto arg_passed_twice;\n+ #else\n+ if (PyString_GET_SIZE(**name) == PyString_GET_SIZE(key) &&\n+ _PyString_Eq(**name, key)) goto arg_passed_twice;\n+ #endif\n+ }\n+ if (kwds2) {\n+ if (unlikely(PyDict_SetItem(kwds2, key, value))) goto bad;\n+ } else {\n+ goto invalid_keyword;\n+ }\n+ }\n+ }\n+ }\n+ }\n+ return 0;\n+arg_passed_twice:\n+ __Pyx_RaiseDoubleKeywordsError(function_name, **name);\n+ goto bad;\n+invalid_keyword_type:\n+ PyErr_Format(PyExc_TypeError,\n+ \"%s() keywords must be strings\", function_name);\n+ goto bad;\n+invalid_keyword:\n+ PyErr_Format(PyExc_TypeError,\n+ #if PY_MAJOR_VERSION < 3\n+ \"%s() got an unexpected keyword argument '%s'\",\n+ function_name, PyString_AsString(key));\n+ #else\n+ \"%s() got an unexpected keyword argument '%U'\",\n+ function_name, key);\n+ #endif\n+bad:\n+ return -1;\n+}\n+static void __Pyx_RaiseBufferIndexError(int axis) {\n+ PyErr_Format(PyExc_IndexError,\n+ \"Out of bounds on buffer access (axis %d)\", axis);\n+}\n+\n+\n+\n+static CYTHON_INLINE void __Pyx_RaiseNoneNotIterableError(void) {\n+ PyErr_SetString(PyExc_TypeError, \"'NoneType' object is not iterable\");\n+}\n+\n+static void __Pyx_UnpackTupleError(PyObject *t, Py_ssize_t index) {\n+ if (t == Py_None) {\n+ __Pyx_RaiseNoneNotIterableError();\n+ } else if (PyTuple_GET_SIZE(t) < index) {\n+ __Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(t));\n+ } else {\n+ __Pyx_RaiseTooManyValuesError();\n+ }\n+}\n+\n+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,\n+ const char *name, int exact)\n+{\n+ if (!type) {\n+ PyErr_Format(PyExc_SystemError, \"Missing type object\");\n+ return 0;\n+ }\n+ if (none_allowed && obj == Py_None) return 1;\n+ else if (exact) {\n+ if (Py_TYPE(obj) == type) return 1;\n+ }\n+ else {\n+ if (PyObject_TypeCheck(obj, type)) return 1;\n+ }\n+ PyErr_Format(PyExc_TypeError,\n+ \"Argument '%s' has incorrect type (expected %s, got %s)\",\n+ name, type->tp_name, Py_TYPE(obj)->tp_name);\n+ return 0;\n+}\n+\n+#if PY_MAJOR_VERSION < 3\n+static int __Pyx_GetBuffer(PyObject *obj, Py_buffer *view, int flags) {\n+ #if PY_VERSION_HEX >= 0x02060000\n+ if (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_NEWBUFFER)\n+ return PyObject_GetBuffer(obj, view, flags);\n+ #endif\n+ if (PyObject_TypeCheck(obj, __pyx_ptype_5numpy_ndarray)) return __pyx_pf_5numpy_7ndarray___getbuffer__(obj, view, flags);\n+ else {\n+ PyErr_Format(PyExc_TypeError, \"'%100s' does not have the buffer interface\", Py_TYPE(obj)->tp_name);\n+ return -1;\n+ }\n+}\n+\n+static void __Pyx_ReleaseBuffer(Py_buffer *view) {\n+ PyObject* obj = view->obj;\n+ if (obj) {\n+if (PyObject_TypeCheck(obj, __pyx_ptype_5numpy_ndarray)) __pyx_pf_5numpy_7ndarray___releasebuffer__(obj, view);\n+ Py_DECREF(obj);\n+ view->obj = NULL;\n+ }\n+}\n+\n+#endif\n+\n+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {\n+ PyObject *__import__ = 0;\n+ PyObject *empty_list = 0;\n+ PyObject *module = 0;\n+ PyObject *global_dict = 0;\n+ PyObject *empty_dict = 0;\n+ PyObject *list;\n+ __import__ = __Pyx_GetAttrString(__pyx_b, \"__import__\");\n+ if (!__import__)\n+ goto bad;\n+ if (from_list)\n+ list = from_list;\n+ else {\n+ empty_list = PyList_New(0);\n+ if (!empty_list)\n+ goto bad;\n+ list = empty_list;\n+ }\n+ global_dict = PyModule_GetDict(__pyx_m);\n+ if (!global_dict)\n+ goto bad;\n+ empty_dict = PyDict_New();\n+ if (!empty_dict)\n+ goto bad;\n+ module = PyObject_CallFunctionObjArgs(__import__,\n+ name, global_dict, empty_dict, list, NULL);\n+bad:\n+ Py_XDECREF(empty_list);\n+ Py_XDECREF(__import__);\n+ Py_XDECREF(empty_dict);\n+ return module;\n+}\n+\n+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) {\n+ PyObject *result;\n+ result = PyObject_GetAttr(dict, name);\n+ if (!result)\n+ PyErr_SetObject(PyExc_NameError, name);\n+ return result;\n+}\n+\n+static PyObject *__Pyx_CreateClass(\n+ PyObject *bases, PyObject *dict, PyObject *name, const char *modname)\n+{\n+ PyObject *py_modname;\n+ PyObject *result = 0;\n+\n+ #if PY_MAJOR_VERSION < 3\n+ py_modname = PyString_FromString(modname);\n+ #else\n+ py_modname = PyUnicode_FromString(modname);\n+ #endif\n+ if (!py_modname)\n+ goto bad;\n+ if (PyDict_SetItemString(dict, \"__module__\", py_modname) < 0)\n+ goto bad;\n+ #if PY_MAJOR_VERSION < 3\n+ result = PyClass_New(bases, dict, name);\n+ #else\n+ result = PyObject_CallFunctionObjArgs((PyObject *)&PyType_Type, name, bases, dict, NULL);\n+ #endif\n+bad:\n+ Py_XDECREF(py_modname);\n+ return result;\n+}\n+\n+#if PY_MAJOR_VERSION < 3\n+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {\n+ Py_XINCREF(type);\n+ Py_XINCREF(value);\n+ Py_XINCREF(tb);\n+ \n+ if (tb == Py_None) {\n+ Py_DECREF(tb);\n+ tb = 0;\n+ }\n+ else if (tb != NULL && !PyTraceBack_Check(tb)) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"raise: arg 3 must be a traceback or None\");\n+ goto raise_error;\n+ }\n+ \n+ if (value == NULL) {\n+ value = Py_None;\n+ Py_INCREF(value);\n+ }\n+ #if PY_VERSION_HEX < 0x02050000\n+ if (!PyClass_Check(type))\n+ #else\n+ if (!PyType_Check(type))\n+ #endif\n+ {\n+ \n+ if (value != Py_None) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"instance exception may not have a separate value\");\n+ goto raise_error;\n+ }\n+ \n+ Py_DECREF(value);\n+ value = type;\n+ #if PY_VERSION_HEX < 0x02050000\n+ if (PyInstance_Check(type)) {\n+ type = (PyObject*) ((PyInstanceObject*)type)->in_class;\n+ Py_INCREF(type);\n+ }\n+ else {\n+ type = 0;\n+ PyErr_SetString(PyExc_TypeError,\n+ \"raise: exception must be an old-style class or instance\");\n+ goto raise_error;\n+ }\n+ #else\n+ type = (PyObject*) Py_TYPE(type);\n+ Py_INCREF(type);\n+ if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"raise: exception class must be a subclass of BaseException\");\n+ goto raise_error;\n+ }\n+ #endif\n+ }\n+\n+ __Pyx_ErrRestore(type, value, tb);\n+ return;\n+raise_error:\n+ Py_XDECREF(value);\n+ Py_XDECREF(type);\n+ Py_XDECREF(tb);\n+ return;\n+}\n+\n+#else \n+\n+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) {\n+ if (tb == Py_None) {\n+ tb = 0;\n+ } else if (tb && !PyTraceBack_Check(tb)) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"raise: arg 3 must be a traceback or None\");\n+ goto bad;\n+ }\n+ if (value == Py_None)\n+ value = 0;\n+\n+ if (PyExceptionInstance_Check(type)) {\n+ if (value) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"instance exception may not have a separate value\");\n+ goto bad;\n+ }\n+ value = type;\n+ type = (PyObject*) Py_TYPE(value);\n+ } else if (!PyExceptionClass_Check(type)) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"raise: exception class must be a subclass of BaseException\");\n+ goto bad;\n+ }\n+\n+ PyErr_SetObject(type, value);\n+\n+ if (tb) {\n+ PyThreadState *tstate = PyThreadState_GET();\n+ PyObject* tmp_tb = tstate->curexc_traceback;\n+ if (tb != tmp_tb) {\n+ Py_INCREF(tb);\n+ tstate->curexc_traceback = tb;\n+ Py_XDECREF(tmp_tb);\n+ }\n+ }\n+\n+bad:\n+ return;\n+}\n+#endif\n+\n+static CYTHON_INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp val) {\n+ const npy_intp neg_one = (npy_intp)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(npy_intp) < sizeof(long)) {\n+ return PyInt_FromLong((long)val);\n+ } else if (sizeof(npy_intp) == sizeof(long)) {\n+ if (is_unsigned)\n+ return PyLong_FromUnsignedLong((unsigned long)val);\n+ else\n+ return PyInt_FromLong((long)val);\n+ } else { \n+ if (is_unsigned)\n+ return PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)val);\n+ else\n+ return PyLong_FromLongLong((PY_LONG_LONG)val);\n+ }\n+}\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) {\n+ return ::std::complex< float >(x, y);\n+ }\n+ #else\n+ static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) {\n+ return x + y*(__pyx_t_float_complex)_Complex_I;\n+ }\n+ #endif\n+#else\n+ static CYTHON_INLINE __pyx_t_float_complex __pyx_t_float_complex_from_parts(float x, float y) {\n+ __pyx_t_float_complex z;\n+ z.real = x;\n+ z.imag = y;\n+ return z;\n+ }\n+#endif\n+\n+#if CYTHON_CCOMPLEX\n+#else\n+ static CYTHON_INLINE int __Pyx_c_eqf(__pyx_t_float_complex a, __pyx_t_float_complex b) {\n+ return (a.real == b.real) && (a.imag == b.imag);\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_sumf(__pyx_t_float_complex a, __pyx_t_float_complex b) {\n+ __pyx_t_float_complex z;\n+ z.real = a.real + b.real;\n+ z.imag = a.imag + b.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_difff(__pyx_t_float_complex a, __pyx_t_float_complex b) {\n+ __pyx_t_float_complex z;\n+ z.real = a.real - b.real;\n+ z.imag = a.imag - b.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_prodf(__pyx_t_float_complex a, __pyx_t_float_complex b) {\n+ __pyx_t_float_complex z;\n+ z.real = a.real * b.real - a.imag * b.imag;\n+ z.imag = a.real * b.imag + a.imag * b.real;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_quotf(__pyx_t_float_complex a, __pyx_t_float_complex b) {\n+ __pyx_t_float_complex z;\n+ float denom = b.real * b.real + b.imag * b.imag;\n+ z.real = (a.real * b.real + a.imag * b.imag) \/ denom;\n+ z.imag = (a.imag * b.real - a.real * b.imag) \/ denom;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_negf(__pyx_t_float_complex a) {\n+ __pyx_t_float_complex z;\n+ z.real = -a.real;\n+ z.imag = -a.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE int __Pyx_c_is_zerof(__pyx_t_float_complex a) {\n+ return (a.real == 0) && (a.imag == 0);\n+ }\n+ static CYTHON_INLINE __pyx_t_float_complex __Pyx_c_conjf(__pyx_t_float_complex a) {\n+ __pyx_t_float_complex z;\n+ z.real = a.real;\n+ z.imag = -a.imag;\n+ return z;\n+ }\n+\n+#endif\n+\n+#if CYTHON_CCOMPLEX\n+ #ifdef __cplusplus\n+ static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double x, double y) {\n+ return ::std::complex< double >(x, y);\n+ }\n+ #else\n+ static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double x, double y) {\n+ return x + y*(__pyx_t_double_complex)_Complex_I;\n+ }\n+ #endif\n+#else\n+ static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(double x, double y) {\n+ __pyx_t_double_complex z;\n+ z.real = x;\n+ z.imag = y;\n+ return z;\n+ }\n+#endif\n+\n+#if CYTHON_CCOMPLEX\n+#else\n+ static CYTHON_INLINE int __Pyx_c_eq(__pyx_t_double_complex a, __pyx_t_double_complex b) {\n+ return (a.real == b.real) && (a.imag == b.imag);\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_sum(__pyx_t_double_complex a, __pyx_t_double_complex b) {\n+ __pyx_t_double_complex z;\n+ z.real = a.real + b.real;\n+ z.imag = a.imag + b.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_diff(__pyx_t_double_complex a, __pyx_t_double_complex b) {\n+ __pyx_t_double_complex z;\n+ z.real = a.real - b.real;\n+ z.imag = a.imag - b.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_prod(__pyx_t_double_complex a, __pyx_t_double_complex b) {\n+ __pyx_t_double_complex z;\n+ z.real = a.real * b.real - a.imag * b.imag;\n+ z.imag = a.real * b.imag + a.imag * b.real;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_quot(__pyx_t_double_complex a, __pyx_t_double_complex b) {\n+ __pyx_t_double_complex z;\n+ double denom = b.real * b.real + b.imag * b.imag;\n+ z.real = (a.real * b.real + a.imag * b.imag) \/ denom;\n+ z.imag = (a.imag * b.real - a.real * b.imag) \/ denom;\n+ return z;\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_neg(__pyx_t_double_complex a) {\n+ __pyx_t_double_complex z;\n+ z.real = -a.real;\n+ z.imag = -a.imag;\n+ return z;\n+ }\n+ static CYTHON_INLINE int __Pyx_c_is_zero(__pyx_t_double_complex a) {\n+ return (a.real == 0) && (a.imag == 0);\n+ }\n+ static CYTHON_INLINE __pyx_t_double_complex __Pyx_c_conj(__pyx_t_double_complex a) {\n+ __pyx_t_double_complex z;\n+ z.real = a.real;\n+ z.imag = -a.imag;\n+ return z;\n+ }\n+\n+#endif\n+\n+static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {\n+ const unsigned char neg_one = (unsigned char)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(unsigned char) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(unsigned char)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to unsigned char\" :\n+ \"value too large to convert to unsigned char\");\n+ }\n+ return (unsigned char)-1;\n+ }\n+ return (unsigned char)val;\n+ }\n+ return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);\n+}\n+\n+static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {\n+ const unsigned short neg_one = (unsigned short)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(unsigned short) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(unsigned short)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to unsigned short\" :\n+ \"value too large to convert to unsigned short\");\n+ }\n+ return (unsigned short)-1;\n+ }\n+ return (unsigned short)val;\n+ }\n+ return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);\n+}\n+\n+static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {\n+ const unsigned int neg_one = (unsigned int)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(unsigned int) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(unsigned int)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to unsigned int\" :\n+ \"value too large to convert to unsigned int\");\n+ }\n+ return (unsigned int)-1;\n+ }\n+ return (unsigned int)val;\n+ }\n+ return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);\n+}\n+\n+static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {\n+ const char neg_one = (char)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(char) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(char)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to char\" :\n+ \"value too large to convert to char\");\n+ }\n+ return (char)-1;\n+ }\n+ return (char)val;\n+ }\n+ return (char)__Pyx_PyInt_AsLong(x);\n+}\n+\n+static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {\n+ const short neg_one = (short)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(short) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(short)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to short\" :\n+ \"value too large to convert to short\");\n+ }\n+ return (short)-1;\n+ }\n+ return (short)val;\n+ }\n+ return (short)__Pyx_PyInt_AsLong(x);\n+}\n+\n+static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {\n+ const int neg_one = (int)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(int) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(int)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to int\" :\n+ \"value too large to convert to int\");\n+ }\n+ return (int)-1;\n+ }\n+ return (int)val;\n+ }\n+ return (int)__Pyx_PyInt_AsLong(x);\n+}\n+\n+static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {\n+ const signed char neg_one = (signed char)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(signed char) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(signed char)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to signed char\" :\n+ \"value too large to convert to signed char\");\n+ }\n+ return (signed char)-1;\n+ }\n+ return (signed char)val;\n+ }\n+ return (signed char)__Pyx_PyInt_AsSignedLong(x);\n+}\n+\n+static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {\n+ const signed short neg_one = (signed short)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(signed short) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(signed short)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to signed short\" :\n+ \"value too large to convert to signed short\");\n+ }\n+ return (signed short)-1;\n+ }\n+ return (signed short)val;\n+ }\n+ return (signed short)__Pyx_PyInt_AsSignedLong(x);\n+}\n+\n+static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {\n+ const signed int neg_one = (signed int)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+ if (sizeof(signed int) < sizeof(long)) {\n+ long val = __Pyx_PyInt_AsLong(x);\n+ if (unlikely(val != (long)(signed int)val)) {\n+ if (!unlikely(val == -1 && PyErr_Occurred())) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ (is_unsigned && unlikely(val < 0)) ?\n+ \"can't convert negative value to signed int\" :\n+ \"value too large to convert to signed int\");\n+ }\n+ return (signed int)-1;\n+ }\n+ return (signed int)val;\n+ }\n+ return (signed int)__Pyx_PyInt_AsSignedLong(x);\n+}\n+\n+static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {\n+ const unsigned long neg_one = (unsigned long)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to unsigned long\");\n+ return (unsigned long)-1;\n+ }\n+ return (unsigned long)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to unsigned long\");\n+ return (unsigned long)-1;\n+ }\n+ return PyLong_AsUnsignedLong(x);\n+ } else {\n+ return PyLong_AsLong(x);\n+ }\n+ } else {\n+ unsigned long val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (unsigned long)-1;\n+ val = __Pyx_PyInt_AsUnsignedLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {\n+ const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to unsigned PY_LONG_LONG\");\n+ return (unsigned PY_LONG_LONG)-1;\n+ }\n+ return (unsigned PY_LONG_LONG)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to unsigned PY_LONG_LONG\");\n+ return (unsigned PY_LONG_LONG)-1;\n+ }\n+ return PyLong_AsUnsignedLongLong(x);\n+ } else {\n+ return PyLong_AsLongLong(x);\n+ }\n+ } else {\n+ unsigned PY_LONG_LONG val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (unsigned PY_LONG_LONG)-1;\n+ val = __Pyx_PyInt_AsUnsignedLongLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {\n+ const long neg_one = (long)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to long\");\n+ return (long)-1;\n+ }\n+ return (long)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to long\");\n+ return (long)-1;\n+ }\n+ return PyLong_AsUnsignedLong(x);\n+ } else {\n+ return PyLong_AsLong(x);\n+ }\n+ } else {\n+ long val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (long)-1;\n+ val = __Pyx_PyInt_AsLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {\n+ const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to PY_LONG_LONG\");\n+ return (PY_LONG_LONG)-1;\n+ }\n+ return (PY_LONG_LONG)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to PY_LONG_LONG\");\n+ return (PY_LONG_LONG)-1;\n+ }\n+ return PyLong_AsUnsignedLongLong(x);\n+ } else {\n+ return PyLong_AsLongLong(x);\n+ }\n+ } else {\n+ PY_LONG_LONG val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (PY_LONG_LONG)-1;\n+ val = __Pyx_PyInt_AsLongLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {\n+ const signed long neg_one = (signed long)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to signed long\");\n+ return (signed long)-1;\n+ }\n+ return (signed long)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to signed long\");\n+ return (signed long)-1;\n+ }\n+ return PyLong_AsUnsignedLong(x);\n+ } else {\n+ return PyLong_AsLong(x);\n+ }\n+ } else {\n+ signed long val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (signed long)-1;\n+ val = __Pyx_PyInt_AsSignedLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {\n+ const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;\n+ const int is_unsigned = neg_one > const_zero;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (likely(PyInt_Check(x))) {\n+ long val = PyInt_AS_LONG(x);\n+ if (is_unsigned && unlikely(val < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to signed PY_LONG_LONG\");\n+ return (signed PY_LONG_LONG)-1;\n+ }\n+ return (signed PY_LONG_LONG)val;\n+ } else\n+#endif\n+ if (likely(PyLong_Check(x))) {\n+ if (is_unsigned) {\n+ if (unlikely(Py_SIZE(x) < 0)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"can't convert negative value to signed PY_LONG_LONG\");\n+ return (signed PY_LONG_LONG)-1;\n+ }\n+ return PyLong_AsUnsignedLongLong(x);\n+ } else {\n+ return PyLong_AsLongLong(x);\n+ }\n+ } else {\n+ signed PY_LONG_LONG val;\n+ PyObject *tmp = __Pyx_PyNumber_Int(x);\n+ if (!tmp) return (signed PY_LONG_LONG)-1;\n+ val = __Pyx_PyInt_AsSignedLongLong(tmp);\n+ Py_DECREF(tmp);\n+ return val;\n+ }\n+}\n+\n+static void __Pyx_WriteUnraisable(const char *name) {\n+ PyObject *old_exc, *old_val, *old_tb;\n+ PyObject *ctx;\n+ __Pyx_ErrFetch(&old_exc, &old_val, &old_tb);\n+ #if PY_MAJOR_VERSION < 3\n+ ctx = PyString_FromString(name);\n+ #else\n+ ctx = PyUnicode_FromString(name);\n+ #endif\n+ __Pyx_ErrRestore(old_exc, old_val, old_tb);\n+ if (!ctx) {\n+ PyErr_WriteUnraisable(Py_None);\n+ } else {\n+ PyErr_WriteUnraisable(ctx);\n+ Py_DECREF(ctx);\n+ }\n+}\n+\n+static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig) {\n+ PyObject *d = 0;\n+ PyObject *cobj = 0;\n+ union {\n+ void (*fp)(void);\n+ void *p;\n+ } tmp;\n+\n+ d = PyObject_GetAttrString(__pyx_m, (char *)\"__pyx_capi__\");\n+ if (!d) {\n+ PyErr_Clear();\n+ d = PyDict_New();\n+ if (!d)\n+ goto bad;\n+ Py_INCREF(d);\n+ if (PyModule_AddObject(__pyx_m, (char *)\"__pyx_capi__\", d) < 0)\n+ goto bad;\n+ }\n+ tmp.fp = f;\n+#if PY_VERSION_HEX < 0x03010000\n+ cobj = PyCObject_FromVoidPtrAndDesc(tmp.p, (void *)sig, 0);\n+#else\n+ cobj = PyCapsule_New(tmp.p, sig, 0);\n+#endif\n+ if (!cobj)\n+ goto bad;\n+ if (PyDict_SetItemString(d, name, cobj) < 0)\n+ goto bad;\n+ Py_DECREF(cobj);\n+ Py_DECREF(d);\n+ return 0;\n+bad:\n+ Py_XDECREF(cobj);\n+ Py_XDECREF(d);\n+ return -1;\n+}\n+\n+#ifndef __PYX_HAVE_RT_ImportType\n+#define __PYX_HAVE_RT_ImportType\n+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,\n+ long size, int strict)\n+{\n+ PyObject *py_module = 0;\n+ PyObject *result = 0;\n+ PyObject *py_name = 0;\n+ char warning[200];\n+\n+ py_module = __Pyx_ImportModule(module_name);\n+ if (!py_module)\n+ goto bad;\n+ #if PY_MAJOR_VERSION < 3\n+ py_name = PyString_FromString(class_name);\n+ #else\n+ py_name = PyUnicode_FromString(class_name);\n+ #endif\n+ if (!py_name)\n+ goto bad;\n+ result = PyObject_GetAttr(py_module, py_name);\n+ Py_DECREF(py_name);\n+ py_name = 0;\n+ Py_DECREF(py_module);\n+ py_module = 0;\n+ if (!result)\n+ goto bad;\n+ if (!PyType_Check(result)) {\n+ PyErr_Format(PyExc_TypeError, \n+ \"%s.%s is not a type object\",\n+ module_name, class_name);\n+ goto bad;\n+ }\n+ if (!strict && ((PyTypeObject *)result)->tp_basicsize > size) {\n+ PyOS_snprintf(warning, sizeof(warning), \n+ \"%s.%s size changed, may indicate binary incompatibility\",\n+ module_name, class_name);\n+ PyErr_WarnEx(NULL, warning, 0);\n+ }\n+ else if (((PyTypeObject *)result)->tp_basicsize != size) {\n+ PyErr_Format(PyExc_ValueError, \n+ \"%s.%s has the wrong size, try recompiling\",\n+ module_name, class_name);\n+ goto bad;\n+ }\n+ return (PyTypeObject *)result;\n+bad:\n+ Py_XDECREF(py_module);\n+ Py_XDECREF(result);\n+ return 0;\n+}\n+#endif\n+\n+#ifndef __PYX_HAVE_RT_ImportModule\n+#define __PYX_HAVE_RT_ImportModule\n+static PyObject *__Pyx_ImportModule(const char *name) {\n+ PyObject *py_name = 0;\n+ PyObject *py_module = 0;\n+\n+ #if PY_MAJOR_VERSION < 3\n+ py_name = PyString_FromString(name);\n+ #else\n+ py_name = PyUnicode_FromString(name);\n+ #endif\n+ if (!py_name)\n+ goto bad;\n+ py_module = PyImport_Import(py_name);\n+ Py_DECREF(py_name);\n+ return py_module;\n+bad:\n+ Py_XDECREF(py_name);\n+ return 0;\n+}\n+#endif\n+\n+#include \"compile.h\"\n+#include \"frameobject.h\"\n+#include \"traceback.h\"\n+\n+static void __Pyx_AddTraceback(const char *funcname) {\n+ PyObject *py_srcfile = 0;\n+ PyObject *py_funcname = 0;\n+ PyObject *py_globals = 0;\n+ PyCodeObject *py_code = 0;\n+ PyFrameObject *py_frame = 0;\n+\n+ #if PY_MAJOR_VERSION < 3\n+ py_srcfile = PyString_FromString(__pyx_filename);\n+ #else\n+ py_srcfile = PyUnicode_FromString(__pyx_filename);\n+ #endif\n+ if (!py_srcfile) goto bad;\n+ if (__pyx_clineno) {\n+ #if PY_MAJOR_VERSION < 3\n+ py_funcname = PyString_FromFormat( \"%s (%s:%d)\", funcname, __pyx_cfilenm, __pyx_clineno);\n+ #else\n+ py_funcname = PyUnicode_FromFormat( \"%s (%s:%d)\", funcname, __pyx_cfilenm, __pyx_clineno);\n+ #endif\n+ }\n+ else {\n+ #if PY_MAJOR_VERSION < 3\n+ py_funcname = PyString_FromString(funcname);\n+ #else\n+ py_funcname = PyUnicode_FromString(funcname);\n+ #endif\n+ }\n+ if (!py_funcname) goto bad;\n+ py_globals = PyModule_GetDict(__pyx_m);\n+ if (!py_globals) goto bad;\n+ py_code = PyCode_New(\n+ 0, \n+ #if PY_MAJOR_VERSION >= 3\n+ 0, \n+ #endif\n+ 0, \n+ 0, \n+ 0, \n+ __pyx_empty_bytes, \n+ __pyx_empty_tuple, \n+ __pyx_empty_tuple, \n+ __pyx_empty_tuple, \n+ __pyx_empty_tuple, \n+ __pyx_empty_tuple, \n+ py_srcfile, \n+ py_funcname, \n+ __pyx_lineno, \n+ __pyx_empty_bytes \n+ );\n+ if (!py_code) goto bad;\n+ py_frame = PyFrame_New(\n+ PyThreadState_GET(), \n+ py_code, \n+ py_globals, \n+ 0 \n+ );\n+ if (!py_frame) goto bad;\n+ py_frame->f_lineno = __pyx_lineno;\n+ PyTraceBack_Here(py_frame);\n+bad:\n+ Py_XDECREF(py_srcfile);\n+ Py_XDECREF(py_funcname);\n+ Py_XDECREF(py_code);\n+ Py_XDECREF(py_frame);\n+}\n+\n+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) {\n+ while (t->p) {\n+ #if PY_MAJOR_VERSION < 3\n+ if (t->is_unicode) {\n+ *t->p = PyUnicode_DecodeUTF8(t->s, t->n - 1, NULL);\n+ } else if (t->intern) {\n+ *t->p = PyString_InternFromString(t->s);\n+ } else {\n+ *t->p = PyString_FromStringAndSize(t->s, t->n - 1);\n+ }\n+ #else \n+ if (t->is_unicode | t->is_str) {\n+ if (t->intern) {\n+ *t->p = PyUnicode_InternFromString(t->s);\n+ } else if (t->encoding) {\n+ *t->p = PyUnicode_Decode(t->s, t->n - 1, t->encoding, NULL);\n+ } else {\n+ *t->p = PyUnicode_FromStringAndSize(t->s, t->n - 1);\n+ }\n+ } else {\n+ *t->p = PyBytes_FromStringAndSize(t->s, t->n - 1);\n+ }\n+ #endif\n+ if (!*t->p)\n+ return -1;\n+ ++t;\n+ }\n+ return 0;\n+}\n+\n+\n+\n+static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {\n+ if (x == Py_True) return 1;\n+ else if ((x == Py_False) | (x == Py_None)) return 0;\n+ else return PyObject_IsTrue(x);\n+}\n+\n+static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {\n+ PyNumberMethods *m;\n+ const char *name = NULL;\n+ PyObject *res = NULL;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (PyInt_Check(x) || PyLong_Check(x))\n+#else\n+ if (PyLong_Check(x))\n+#endif\n+ return Py_INCREF(x), x;\n+ m = Py_TYPE(x)->tp_as_number;\n+#if PY_VERSION_HEX < 0x03000000\n+ if (m && m->nb_int) {\n+ name = \"int\";\n+ res = PyNumber_Int(x);\n+ }\n+ else if (m && m->nb_long) {\n+ name = \"long\";\n+ res = PyNumber_Long(x);\n+ }\n+#else\n+ if (m && m->nb_int) {\n+ name = \"int\";\n+ res = PyNumber_Long(x);\n+ }\n+#endif\n+ if (res) {\n+#if PY_VERSION_HEX < 0x03000000\n+ if (!PyInt_Check(res) && !PyLong_Check(res)) {\n+#else\n+ if (!PyLong_Check(res)) {\n+#endif\n+ PyErr_Format(PyExc_TypeError,\n+ \"__%s__ returned non-%s (type %.200s)\",\n+ name, name, Py_TYPE(res)->tp_name);\n+ Py_DECREF(res);\n+ return NULL;\n+ }\n+ }\n+ else if (!PyErr_Occurred()) {\n+ PyErr_SetString(PyExc_TypeError,\n+ \"an integer is required\");\n+ }\n+ return res;\n+}\n+\n+static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {\n+ Py_ssize_t ival;\n+ PyObject* x = PyNumber_Index(b);\n+ if (!x) return -1;\n+ ival = PyInt_AsSsize_t(x);\n+ Py_DECREF(x);\n+ return ival;\n+}\n+\n+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {\n+#if PY_VERSION_HEX < 0x02050000\n+ if (ival <= LONG_MAX)\n+ return PyInt_FromLong((long)ival);\n+ else {\n+ unsigned char *bytes = (unsigned char *) &ival;\n+ int one = 1; int little = (int)*(unsigned char*)&one;\n+ return _PyLong_FromByteArray(bytes, sizeof(size_t), little, 0);\n+ }\n+#else\n+ return PyInt_FromSize_t(ival);\n+#endif\n+}\n+\n+static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {\n+ unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);\n+ if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {\n+ return (size_t)-1;\n+ } else if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {\n+ PyErr_SetString(PyExc_OverflowError,\n+ \"value too large to convert to size_t\");\n+ return (size_t)-1;\n+ }\n+ return (size_t)val;\n+}\n+\n+\n+#endif \n"} {"commit":"e944cdaa8bfbf5695ef1b7f8a2b02bfa2ebfba96","subject":"Add endian set for default toolchain (#2808)","message":"Add endian set for default toolchain (#2808)\n\nWhen default toolchain is used and architecture not listed in\r\n\"#if\" in jerry-libm-internal.h on little endian around 90\r\ntest-suite tests, 4 unittests and 30 jerry-tests fails depending\r\non setup tested.\r\nThis change checks endians in case no toolchain is found and\r\nsets __LITTLE_ENDIAN macro if it is little endian. This way\r\nit will be set for any future arhitectures using little endian\r\nand architecture that can have both big and little endian not\r\nlisted in jerry-libm-internal.h check.\r\n\r\nJerryScript-DCO-1.0-Signed-off-by: Lidija Besker lidija.besker@rt-rk.com","repos":"robertsipka\/jerryscript,gabrielschulhof\/jerryscript,robertsipka\/jerryscript,zherczeg\/jerryscript,akosthekiss\/jerryscript,bzsolt\/jerryscript,zherczeg\/jerryscript,gabrielschulhof\/jerryscript,dbatyai\/jerryscript,jerryscript-project\/jerryscript,zherczeg\/jerryscript,robertsipka\/jerryscript,robertsipka\/jerryscript,robertsipka\/jerryscript,akosthekiss\/jerryscript,jerryscript-project\/jerryscript,akosthekiss\/jerryscript,dbatyai\/jerryscript,jerryscript-project\/jerryscript,jerryscript-project\/jerryscript,zherczeg\/jerryscript,bzsolt\/jerryscript,gabrielschulhof\/jerryscript,bzsolt\/jerryscript,jerryscript-project\/jerryscript,akosthekiss\/jerryscript,bzsolt\/jerryscript,gabrielschulhof\/jerryscript,gabrielschulhof\/jerryscript,bzsolt\/jerryscript,akosthekiss\/jerryscript,dbatyai\/jerryscript,dbatyai\/jerryscript,robertsipka\/jerryscript,zherczeg\/jerryscript,dbatyai\/jerryscript","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- jerry-libm\/jerry-libm-internal.h\n+++ jerry-libm\/jerry-libm-internal.h\n@@ -30,14 +30,22 @@\n \/* Sometimes it's necessary to define __LITTLE_ENDIAN explicitly\n but these catch some common cases. *\/\n \n+\n+#ifndef __LITTLE_ENDIAN\n+\/* Check if compiler has byte order macro. Some older versions do not.\n+ * If byte order is supported and set to little or target is among common\n+ * cases checked define __LITTLE_ENDIAN.\n+ *\/\n #if (defined (i386) || defined (__i386) || defined (__i386__) || \\\n defined (i486) || defined (__i486) || defined (__i486__) || \\\n defined (intel) || defined (x86) || defined (i86pc) || \\\n defined (__alpha) || defined (__osf__) || \\\n defined (__x86_64__) || defined (__arm__) || defined (__aarch64__) || \\\n- defined (__xtensa__))\n+ defined (__xtensa__) || defined (__MIPSEL)) || \\\n+(defined (__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))\n #define __LITTLE_ENDIAN\n #endif\n+#endif \/* !__LITTLE_ENDIAN *\/\n \n #ifdef __LITTLE_ENDIAN\n #define __HI(x) *(1 + (int *) &x)\n"} {"commit":"a1b0ca2e8c4dd92b0ff36e4dc7ecef0c78983a58","subject":"Improve documentation","message":"Improve documentation\n","repos":"solin\/hermes_common,certik\/hermes_common,certik\/hermes_common,solin\/hermes_common,certik\/hermes_common,solin\/hermes_common","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- python_api.h\n+++ python_api.h\n@@ -9,15 +9,28 @@\n #include \"_hermes_common_api_new.h\"\n \n \/*\n- This is a nice C++ Python API and the only header file that you should\n- include in your code.\n+ This is a nice C++ Python API and the only header file that you should\n+ include in your code.\n \n- You have to create an instance of the Python() class first, which will\n- initialize the pointers to the conversion methods (like py2c_int, c2py_int,\n- ...), defined in _hermes_common_api_new.h. Once you instantiated one\n- Python() instance, then you don't have to worry about this at all. If you\n- call the c2py_int (and similar methods) without instantiating Python()\n- first, it will segfault (as they point to NULL).\n+ You have to create an instance of the Python() class first, which will\n+ initialize the pointers to the conversion methods (like py2c_int, c2py_int,\n+ ...), defined in _hermes_common_api_new.h. Once you instantiated one\n+ Python() instance, then you don't have to worry about this at all. If you\n+ call the c2py_int (and similar methods) without instantiating Python()\n+ first, it will segfault (as they point to NULL).\n+\n+ Here is an example how to use it:\n+\n+ Python *p = new Python();\n+ p->push(\"i\", c2py_int(5));\n+ p->exec(\"i = i*2\");\n+ int i = py2c_int(p->pull(\"i\"));\n+ _assert(i == 10);\n+ delete p;\n+\n+ All memory allocation\/deallocation as well as Python initialization is\n+ handled automatically, you don't have to worry about anything.\n+\n *\/\n \n class Python {\n"} {"commit":"d2c4f19a9fd13790ee48ce182c1163476e2cd762","subject":"hopefully sate the clang self host build, which is apparently instantiating some folding set stuff that GCC isn't, requiring some types to not be incomplete.","message":"hopefully sate the clang self host build, which is apparently \ninstantiating some folding set stuff that GCC isn't, requiring \nsome types to not be incomplete.\n\nI don't know if clang is right or wrong, but unbreaking the\nbot is goodness. Here's the broken build:\nhttp:\/\/google1.osuosl.org:8011\/builders\/clang-x86_64-darwin10-selfhost\/builds\/1813\/steps\/compile.llvm.stage2\/logs\/stdio\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@100418 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/CodeGen\/AsmPrinter\/DwarfDebug.h\n+++ lib\/CodeGen\/AsmPrinter\/DwarfDebug.h\n@@ -15,6 +15,7 @@\n #define CODEGEN_ASMPRINTER_DWARFDEBUG_H__\n \n #include \"llvm\/CodeGen\/AsmPrinter.h\"\n+#include \"DIE.h\"\n #include \"llvm\/ADT\/DenseMap.h\"\n #include \"llvm\/ADT\/FoldingSet.h\"\n #include \"llvm\/ADT\/SmallPtrSet.h\"\n"} {"commit":"46c78cf0f07180258928c16e804aab8bca866a62","subject":"Fixed missing return check","message":"Fixed missing return check\n","repos":"FreeRDP\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- winpr\/libwinpr\/sspi\/NTLM\/ntlm.c\n+++ winpr\/libwinpr\/sspi\/NTLM\/ntlm.c\n@@ -590,6 +590,9 @@\n \t\tif (context->state == NTLM_STATE_CHALLENGE)\n \t\t{\n \t\t\tstatus = ntlm_read_ChallengeMessage(context, input_buffer);\n+\n+\t\t\tif (status != SEC_I_CONTINUE_NEEDED)\n+\t\t\t\treturn status;\n \n \t\t\tif (!pOutput)\n \t\t\t\treturn SEC_E_INVALID_TOKEN;\n"} {"commit":"2884eac4a4d007db5b4f9de354eca3ed84354f8d","subject":"tool: help - add error messages","message":"tool: help - add error messages\n","repos":"varlink\/libvarlink,varlink\/libvarlink,varlink\/libvarlink,varlink\/libvarlink","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tool\/command-help.c\n+++ tool\/command-help.c\n@@ -29,20 +29,24 @@\n 0,\n &error,\n &out);\n- if (r < 0)\n+ if (r < 0) {\n+ fprintf(stderr, \"Unable to call method: %s\\n\", cli_error_string(-r));\n return r;\n+ }\n \n if (error) {\n- printf(\"Error: %s\\n\", error);\n+ fprintf(stderr, \"Encountered error: %s\\n\", error);\n return 0;\n }\n \n if (varlink_object_get_string(out, \"description\", &description) < 0)\n- return -CLI_ERROR_CALL_FAILED;\n+ return -CLI_ERROR_INVALID_MESSAGE;\n \n r = varlink_interface_new(&interface, description, NULL);\n- if (r < 0)\n- return -CLI_ERROR_PANIC;\n+ if (r < 0) {\n+ fprintf(stderr, \"Unable to call read interface description: %s\\n\", varlink_error_string(-r));\n+ return -CLI_ERROR_INVALID_MESSAGE;\n+ }\n \n r = varlink_interface_write_description(interface,\n &string,\n@@ -51,8 +55,10 @@\n terminal_color(TERMINAL_MAGENTA), terminal_color(TERMINAL_NORMAL),\n terminal_color(TERMINAL_GREEN), terminal_color(TERMINAL_NORMAL),\n terminal_color(TERMINAL_CYAN), terminal_color(TERMINAL_NORMAL));\n- if (r < 0)\n- return r;\n+ if (r < 0) {\n+ fprintf(stderr, \"Unable to call method: %s\\n\", cli_error_string(-r));\n+ return -CLI_ERROR_INVALID_JSON;\n+ }\n \n printf(\"%s\\n\", string);\n \n@@ -100,8 +106,15 @@\n &address,\n &port,\n &interface);\n- if (r < 0)\n+ if (r < 0) {\n+ fprintf(stderr, \"Unable to parse ADDRESS\/INTERFACE\\n\");\n return r;\n+ }\n+\n+ if (!interface) {\n+ fprintf(stderr, \"Unable to parse INTERFACE\\n\");\n+ return -CLI_ERROR_INVALID_ARGUMENT;\n+ }\n \n r = cli_connect(cli,\n &connection,\n@@ -109,8 +122,10 @@\n address,\n port,\n interface);\n- if (r < 0)\n+ if (r < 0) {\n+ fprintf(stderr, \"Unable to connect: %s\\n\", cli_error_string(-r));\n return r;\n+ }\n \n r = help_interface(cli, connection, interface);\n if (r < 0)\n"} {"commit":"481e20799bdcf98fd5a1d829d187239a90b15395","subject":"driver core: Replace the dangerous to_root_device macro with an inline function","message":"driver core: Replace the dangerous to_root_device macro with an inline function\n\nThe original macro worked only when applied to variables named 'dev'.\nWhile this could have been fixed by simply renaming the macro argument,\na more type-safe replacement by an inline function is preferred.\n\nSigned-off-by: Ferenc Wagner <684c7697b684336a4b6853ff802984f147a84f41@niif.hu>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- drivers\/base\/core.c\n+++ drivers\/base\/core.c\n@@ -1320,7 +1320,10 @@\n \tstruct module *owner;\n };\n \n-#define to_root_device(dev) container_of(dev, struct root_device, dev)\n+inline struct root_device *to_root_device(struct device *d)\n+{\n+\treturn container_of(d, struct root_device, dev);\n+}\n \n static void root_device_release(struct device *dev)\n {\n"} {"commit":"9a993302cc7a2e0a22e0851122dcfb59b56abd7a","subject":"[SCSI] hpsa: update driver version to 3.4.4-1","message":"[SCSI] hpsa: update driver version to 3.4.4-1\n\nSigned-off-by: Stephen M. Cameron <fcc9df7f1d62c98ed1e7091f4fa112f895d521f5@beardog.cce.hp.com>\nSigned-off-by: James Bottomley <1acebbdca565c7b6b638bdc23b58b5610d1a56b8@Parallels.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"1de34f9789a9d15ab06f79480e182cce5717e9a8","subject":"remove unused argument.","message":"remove unused argument.\n\n\ngit-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@1881 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"davidlt\/root,abhinavmoudgil95\/root,Y--\/root,evgeny-boger\/root,vukasinmilosevic\/root,sbinet\/cxx-root,veprbl\/root,BerserkerTroll\/root,dfunke\/root,BerserkerTroll\/root,veprbl\/root,abhinavmoudgil95\/root,zzxuanyuan\/root-compressor-dummy,esakellari\/root,simonpf\/root,agarciamontoro\/root,sbinet\/cxx-root,tc3t\/qoot,esakellari\/root,sbinet\/cxx-root,georgtroska\/root,zzxuanyuan\/root,beniz\/root,kirbyherm\/root-r-tools,esakellari\/root,gbitzes\/root,krafczyk\/root,esakellari\/root,nilqed\/root,abhinavmoudgil95\/root,mattkretz\/root,olifre\/root,olifre\/root,arch1tect0r\/root,georgtroska\/root,perovic\/root,veprbl\/root,CristinaCristescu\/root,bbockelm\/root,mkret2\/root,sirinath\/root,BerserkerTroll\/root,alexschlueter\/cern-root,omazapa\/root-old,sirinath\/root,karies\/root,omazapa\/root-old,beniz\/root,bbockelm\/root,kirbyherm\/root-r-tools,Duraznos\/root,bbockelm\/root,agarciamontoro\/root,gbitzes\/root,BerserkerTroll\/root,evgeny-boger\/root,omazapa\/root-old,dfunke\/root,arch1tect0r\/root,krafczyk\/root,evgeny-boger\/root,gganis\/root,bbockelm\/root,mhuwiler\/rootauto,simonpf\/root,smarinac\/root,arch1tect0r\/root,georgtroska\/root,satyarth934\/root,strykejern\/TTreeReader,dfunke\/root,jrtomps\/root,satyarth934\/root,vukasinmilosevic\/root,gganis\/root,kirbyherm\/root-r-tools,bbockelm\/root,perovic\/root,Dr15Jones\/root,mhuwiler\/rootauto,gbitzes\/root,davidlt\/root,agarciamontoro\/root,root-mirror\/root,olifre\/root,esakellari\/root,sawenzel\/root,evgeny-boger\/root,esakellari\/root,satyarth934\/root,Duraznos\/root,mkret2\/root,jrtomps\/root,zzxuanyuan\/root-compressor-dummy,pspe\/root,mattkretz\/root,evgeny-boger\/root,davidlt\/root,vukasinmilosevic\/root,lgiommi\/root,esakellari\/my_root_for_test,smarinac\/root,gbitzes\/root,0x0all\/ROOT,gbitzes\/root,nilqed\/root,dfunke\/root,esakellari\/my_root_for_test,CristinaCristescu\/root,zzxuanyuan\/root,karies\/root,cxx-hep\/root-cern,esakellari\/my_root_for_test,mhuwiler\/rootauto,veprbl\/root,ffurano\/root5,sawenzel\/root,strykejern\/TTreeReader,zzxuanyuan\/root-compressor-dummy,perovic\/root,agarciamontoro\/root,alexschlueter\/cern-root,zzxuanyuan\/root,kirbyherm\/root-r-tools,lgiommi\/root,beniz\/root,krafczyk\/root,sirinath\/root,jrtomps\/root,0x0all\/ROOT,root-mirror\/root,esakellari\/root,evgeny-boger\/root,sbinet\/cxx-root,CristinaCristescu\/root,omazapa\/root,davidlt\/root,nilqed\/root,perovic\/root,sawenzel\/root,gganis\/root,esakellari\/my_root_for_test,cxx-hep\/root-cern,omazapa\/root-old,Duraznos\/root,karies\/root,zzxuanyuan\/root,veprbl\/root,buuck\/root,CristinaCristescu\/root,sbinet\/cxx-root,karies\/root,dfunke\/root,buuck\/root,smarinac\/root,thomaskeck\/root,jrtomps\/root,veprbl\/root,alexschlueter\/cern-root,vukasinmilosevic\/root,olifre\/root,mhuwiler\/rootauto,sawenzel\/root,thomaskeck\/root,CristinaCristescu\/root,jrtomps\/root,karies\/root,ffurano\/root5,sbinet\/cxx-root,mattkretz\/root,root-mirror\/root,root-mirror\/root,karies\/root,Duraznos\/root,alexschlueter\/cern-root,mattkretz\/root,georgtroska\/root,lgiommi\/root,olifre\/root,thomaskeck\/root,vukasinmilosevic\/root,esakellari\/my_root_for_test,lgiommi\/root,strykejern\/TTreeReader,arch1tect0r\/root,CristinaCristescu\/root,davidlt\/root,karies\/root,zzxuanyuan\/root-compressor-dummy,smarinac\/root,abhinavmoudgil95\/root,georgtroska\/root,tc3t\/qoot,CristinaCristescu\/root,ffurano\/root5,strykejern\/TTreeReader,omazapa\/root,bbockelm\/root,sbinet\/cxx-root,mkret2\/root,Duraznos\/root,Y--\/root,mattkretz\/root,vukasinmilosevic\/root,root-mirror\/root,perovic\/root,perovic\/root,omazapa\/root-old,krafczyk\/root,zzxuanyuan\/root-compressor-dummy,CristinaCristescu\/root,sbinet\/cxx-root,root-mirror\/root,jrtomps\/root,mhuwiler\/rootauto,olifre\/root,gbitzes\/root,Duraznos\/root,davidlt\/root,abhinavmoudgil95\/root,agarciamontoro\/root,pspe\/root,sirinath\/root,perovic\/root,Duraznos\/root,gbitzes\/root,0x0all\/ROOT,tc3t\/qoot,abhinavmoudgil95\/root,georgtroska\/root,zzxuanyuan\/root,root-mirror\/root,omazapa\/root,Duraznos\/root,abhinavmoudgil95\/root,esakellari\/my_root_for_test,sirinath\/root,veprbl\/root,evgeny-boger\/root,krafczyk\/root,alexschlueter\/cern-root,omazapa\/root-old,sawenzel\/root,buuck\/root,mhuwiler\/rootauto,mhuwiler\/rootauto,buuck\/root,buuck\/root,davidlt\/root,veprbl\/root,sawenzel\/root,omazapa\/root-old,mattkretz\/root,gganis\/root,zzxuanyuan\/root,abhinavmoudgil95\/root,davidlt\/root,satyarth934\/root,strykejern\/TTreeReader,pspe\/root,tc3t\/qoot,simonpf\/root,mkret2\/root,satyarth934\/root,mattkretz\/root,karies\/root,tc3t\/qoot,veprbl\/root,davidlt\/root,pspe\/root,sirinath\/root,perovic\/root,buuck\/root,beniz\/root,jrtomps\/root,Y--\/root,sirinath\/root,simonpf\/root,mkret2\/root,krafczyk\/root,thomaskeck\/root,vukasinmilosevic\/root,cxx-hep\/root-cern,simonpf\/root,omazapa\/root,sbinet\/cxx-root,mkret2\/root,strykejern\/TTreeReader,root-mirror\/root,satyarth934\/root,nilqed\/root,simonpf\/root,beniz\/root,smarinac\/root,gbitzes\/root,bbockelm\/root,georgtroska\/root,omazapa\/root-old,Duraznos\/root,Dr15Jones\/root,0x0all\/ROOT,Dr15Jones\/root,sawenzel\/root,olifre\/root,0x0all\/ROOT,abhinavmoudgil95\/root,cxx-hep\/root-cern,evgeny-boger\/root,beniz\/root,esakellari\/my_root_for_test,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root-compressor-dummy,kirbyherm\/root-r-tools,esakellari\/my_root_for_test,omazapa\/root-old,CristinaCristescu\/root,pspe\/root,dfunke\/root,buuck\/root,Y--\/root,zzxuanyuan\/root-compressor-dummy,omazapa\/root,mattkretz\/root,krafczyk\/root,veprbl\/root,kirbyherm\/root-r-tools,BerserkerTroll\/root,mkret2\/root,simonpf\/root,zzxuanyuan\/root,pspe\/root,tc3t\/qoot,nilqed\/root,BerserkerTroll\/root,zzxuanyuan\/root-compressor-dummy,beniz\/root,BerserkerTroll\/root,gganis\/root,Y--\/root,sawenzel\/root,omazapa\/root-old,Duraznos\/root,buuck\/root,root-mirror\/root,pspe\/root,tc3t\/qoot,vukasinmilosevic\/root,georgtroska\/root,alexschlueter\/cern-root,Dr15Jones\/root,smarinac\/root,mattkretz\/root,simonpf\/root,esakellari\/root,CristinaCristescu\/root,esakellari\/root,perovic\/root,arch1tect0r\/root,mkret2\/root,satyarth934\/root,satyarth934\/root,Duraznos\/root,beniz\/root,dfunke\/root,ffurano\/root5,tc3t\/qoot,jrtomps\/root,dfunke\/root,thomaskeck\/root,nilqed\/root,gganis\/root,georgtroska\/root,omazapa\/root,jrtomps\/root,georgtroska\/root,thomaskeck\/root,thomaskeck\/root,mhuwiler\/rootauto,arch1tect0r\/root,agarciamontoro\/root,sawenzel\/root,arch1tect0r\/root,BerserkerTroll\/root,zzxuanyuan\/root,sirinath\/root,ffurano\/root5,smarinac\/root,nilqed\/root,beniz\/root,lgiommi\/root,olifre\/root,ffurano\/root5,zzxuanyuan\/root-compressor-dummy,Dr15Jones\/root,krafczyk\/root,tc3t\/qoot,arch1tect0r\/root,veprbl\/root,Y--\/root,sawenzel\/root,sirinath\/root,pspe\/root,bbockelm\/root,mattkretz\/root,vukasinmilosevic\/root,sirinath\/root,dfunke\/root,Y--\/root,gbitzes\/root,mhuwiler\/rootauto,lgiommi\/root,krafczyk\/root,0x0all\/ROOT,nilqed\/root,lgiommi\/root,0x0all\/ROOT,esakellari\/root,omazapa\/root,gbitzes\/root,0x0all\/ROOT,simonpf\/root,agarciamontoro\/root,gganis\/root,davidlt\/root,gbitzes\/root,vukasinmilosevic\/root,olifre\/root,root-mirror\/root,jrtomps\/root,omazapa\/root-old,Y--\/root,jrtomps\/root,agarciamontoro\/root,omazapa\/root,simonpf\/root,cxx-hep\/root-cern,lgiommi\/root,beniz\/root,mkret2\/root,lgiommi\/root,lgiommi\/root,pspe\/root,dfunke\/root,esakellari\/root,cxx-hep\/root-cern,alexschlueter\/cern-root,Y--\/root,zzxuanyuan\/root,kirbyherm\/root-r-tools,nilqed\/root,gganis\/root,satyarth934\/root,perovic\/root,evgeny-boger\/root,agarciamontoro\/root,satyarth934\/root,karies\/root,arch1tect0r\/root,beniz\/root,0x0all\/ROOT,davidlt\/root,cxx-hep\/root-cern,thomaskeck\/root,abhinavmoudgil95\/root,perovic\/root,zzxuanyuan\/root,bbockelm\/root,krafczyk\/root,mattkretz\/root,georgtroska\/root,agarciamontoro\/root,Y--\/root,lgiommi\/root,karies\/root,Dr15Jones\/root,Y--\/root,agarciamontoro\/root,sirinath\/root,omazapa\/root,BerserkerTroll\/root,cxx-hep\/root-cern,mhuwiler\/rootauto,abhinavmoudgil95\/root,vukasinmilosevic\/root,sbinet\/cxx-root,nilqed\/root,mkret2\/root,krafczyk\/root,gganis\/root,olifre\/root,mkret2\/root,CristinaCristescu\/root,root-mirror\/root,zzxuanyuan\/root,tc3t\/qoot,zzxuanyuan\/root,bbockelm\/root,omazapa\/root,buuck\/root,pspe\/root,sbinet\/cxx-root,karies\/root,buuck\/root,thomaskeck\/root,esakellari\/my_root_for_test,arch1tect0r\/root,buuck\/root,simonpf\/root,ffurano\/root5,smarinac\/root,Dr15Jones\/root,bbockelm\/root,BerserkerTroll\/root,pspe\/root,mhuwiler\/rootauto,BerserkerTroll\/root,gganis\/root,gganis\/root,olifre\/root,zzxuanyuan\/root-compressor-dummy,omazapa\/root,strykejern\/TTreeReader,arch1tect0r\/root,satyarth934\/root,dfunke\/root,evgeny-boger\/root,sawenzel\/root,smarinac\/root,evgeny-boger\/root,nilqed\/root,esakellari\/my_root_for_test,thomaskeck\/root,smarinac\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cont\/inc\/TBtree.h\n+++ cont\/inc\/TBtree.h\n@@ -1,4 +1,4 @@\n-\/\/ @(#)root\/cont:$Name: $:$Id: TBtree.h,v 1.4 2001\/03\/29 10:54:47 brun Exp $\n+\/\/ @(#)root\/cont:$Name: $:$Id: TBtree.h,v 1.5 2001\/03\/30 15:46:09 brun Exp $\n \/\/ Author: Fons Rademakers 10\/10\/95\n \n \/*************************************************************************\n@@ -75,12 +75,12 @@\n public:\n \n TBtree(Int_t ordern = 3); \/\/create a TBtree of order n\n- ~TBtree();\n+ virtual ~TBtree();\n void Clear(Option_t *option=\"\");\n void Delete(Option_t *option=\"\");\n TObject *FindObject(const char *name) const;\n TObject *FindObject(const TObject *obj) const;\n- TObject **GetObjectRef(TObject *obj) const {return 0;}\n+ TObject **GetObjectRef(TObject *) const { return 0; }\n TIterator *MakeIterator(Bool_t dir = kIterForward) const;\n \n void Add(TObject *obj);\n"} {"commit":"d75e82dbfbb9443efeb3f9a5921ac23605aab469","subject":"core\/ipmi: Fix use-after-free","message":"core\/ipmi: Fix use-after-free\n\nCommit f01cd77 introduced backend poller() for ipmi message. But in some\ncorner cases its possible that we endup calling poller() after freeing\nipmi message.\n\nThread 1 :\n ipmi_queue_msg_sync()\n Waiting for ipmi sync message to complete\n\nThread 2 :\n bt_poll() -> ipmi_cmd_done() -> callback handler -> free message\n\nOliver hit this issue during fast-reboot test with skiboot DEBUG build.\nIn debug build we poision the memory after free. That helped us to catch\nthis issue.\n\n[ 460.295570781,3] ***********************************************\n[ 460.295773157,3] Fatal MCE at 0000000030035cb4 .ipmi_queue_msg_sync+0x110 MSR 9000000000201002\n[ 460.295887496,3] CFAR : 0000000030035ce8 MSR : 9000000000000000\n[ 460.295956419,3] SRR0 : 0000000030035cb4 SRR1 : 9000000000201002\n[ 460.296035015,3] HSRR0: 0000000030012624 HSRR1: 9000000002803002\n[ 460.296102413,3] DSISR: 00000008 DAR : 99999999999999d1\n[ 460.296169710,3] LR : 0000000030035ce4 CTR : 0000000030002880\n[ 460.296248482,3] CR : 28002422 XER : 20040000\n[ 460.296336621,3] GPR00: 0000000030035ce4 GPR16: 00000000301d36d8\n[ 460.296415449,3] GPR01: 0000000031c133d0 GPR17: 00000000300f5cd8\n[ 460.296482811,3] GPR02: 0000000030142700 GPR18: 0000000030407ff0\n[ 460.296550265,3] GPR03: 0000000000000100 GPR19: 0000000000000000\n[ 460.296629041,3] GPR04: 0000000028002424 GPR20: 0000000000000000\n[ 460.296696369,3] GPR05: 0000000020040000 GPR21: 0000000030121d73\n[ 460.296820977,3] GPR06: c000001fffffd480 GPR22: 0000000030121dd2\n[ 460.296888226,3] GPR07: c000001fffffd480 GPR23: 0000000030613400\n[ 460.296978218,3] GPR08: 0000000000000001 GPR24: 0000000000000001\n[ 460.297056871,3] GPR09: 9999999999999999 GPR25: 0000000031c13960\n[ 460.297124647,3] GPR10: 0000000000000000 GPR26: 0000000000000004\n[ 460.297203811,3] GPR11: 0000000000000000 GPR27: 0000000000000003\n[ 460.297271250,3] GPR12: 0000000028002424 GPR28: 0000000030613400\n[ 460.297339026,3] GPR13: 0000000031c10000 GPR29: 0000000030406b50\n[ 460.297417605,3] GPR14: 00000000300f58f8 GPR30: 0000000030406b40\n[ 460.297485176,3] GPR15: 00000000300f58d8 GPR31: 00000000309249c8\n\nReported-by: Oliver O'Halloran <3dfaff8fa6ae977f042064a112a6aac576279b9b@gmail.com>\nFixes: f01cd77 (ipmi: ensure forward progress on ipmi_queue_msg_sync())\nCc: 74fabe089ecbd0f3f71683991d9e2780a4de1f4a@lists.ozlabs.org # v6.3+\nSigned-off-by: Vasant Hegde <a6d753843573f7bfed5075c1e875b0be8007a0ab@linux.vnet.ibm.com>\nSigned-off-by: Oliver O'Halloran <3dfaff8fa6ae977f042064a112a6aac576279b9b@gmail.com>\n","repos":"qemu\/skiboot,shenki\/skiboot,shenki\/skiboot,qemu\/skiboot,legoater\/skiboot,open-power\/skiboot,qemu\/skiboot,legoater\/skiboot,shenki\/skiboot,qemu\/skiboot,qemu\/skiboot,open-power\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot,open-power\/skiboot,legoater\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/ipmi.c\n+++ core\/ipmi.c\n@@ -126,6 +126,8 @@\n \n void ipmi_cmd_done(uint8_t cmd, uint8_t netfn, uint8_t cc, struct ipmi_msg *msg)\n {\n+\tbool clr_sync_msg = false;\n+\n \tmsg->cc = cc;\n \tif (msg->cmd != cmd) {\n \t\tprerror(\"IPMI: Incorrect cmd 0x%02x in response\\n\", cmd);\n@@ -138,6 +140,10 @@\n \t}\n \tmsg->netfn = netfn;\n \n+\tif (msg == sync_msg)\n+\t\tclr_sync_msg = true;\n+\n+\n \tif (cc != IPMI_CC_NO_ERROR) {\n \t\tprlog(PR_DEBUG, \"IPMI: Got error response. cmd=0x%x, netfn=0x%x,\"\n \t\t \" rc=0x%02x\\n\", msg->cmd, msg->netfn >> 2, msg->cc);\n@@ -151,12 +157,14 @@\n \t completion functions. *\/\n \n \t\/* If this is a synchronous message flag that we are done *\/\n-\tif (msg == sync_msg)\n+\tif (clr_sync_msg)\n \t\tsync_msg = NULL;\n }\n \n void ipmi_queue_msg_sync(struct ipmi_msg *msg)\n {\n+\tvoid (*poll)(void) = msg->backend->poll;\n+\n \tif (!ipmi_present())\n \t\treturn;\n \n@@ -181,8 +189,8 @@\n \t * progress.\n \t *\/\n \twhile (sync_msg == msg) {\n-\t\tif (msg->backend->poll)\n-\t\t\tmsg->backend->poll();\n+\t\tif (poll)\n+\t\t\tpoll();\n \t\ttime_wait_ms(10);\n \t}\n }\n"} {"commit":"52f73a153d524ea927e1a1f3efcade36a3bd3ca5","subject":"Fixes List<T>::insert_before\/after","message":"Fixes List<T>::insert_before\/after\n","repos":"vkbsb\/godot,Shockblast\/godot,godotengine\/godot,NateWardawg\/godot,sanikoyes\/godot,Zylann\/godot,honix\/godot,RandomShaper\/godot,ex\/godot,firefly2442\/godot,Shockblast\/godot,DmitriySalnikov\/godot,groud\/godot,Valentactive\/godot,BastiaanOlij\/godot,Zylann\/godot,MarianoGnu\/godot,sanikoyes\/godot,DmitriySalnikov\/godot,mcanders\/godot,NateWardawg\/godot,Paulloz\/godot,godotengine\/godot,BastiaanOlij\/godot,josempans\/godot,Shockblast\/godot,MarianoGnu\/godot,groud\/godot,okamstudio\/godot,pkowal1982\/godot,Zylann\/godot,honix\/godot,RandomShaper\/godot,pkowal1982\/godot,NateWardawg\/godot,Faless\/godot,vnen\/godot,sanikoyes\/godot,ZuBsPaCe\/godot,okamstudio\/godot,Paulloz\/godot,vnen\/godot,ZuBsPaCe\/godot,okamstudio\/godot,RandomShaper\/godot,ZuBsPaCe\/godot,josempans\/godot,DmitriySalnikov\/godot,akien-mga\/godot,Shockblast\/godot,firefly2442\/godot,mcanders\/godot,ex\/godot,guilhermefelipecgs\/godot,Valentactive\/godot,Faless\/godot,akien-mga\/godot,josempans\/godot,guilhermefelipecgs\/godot,RandomShaper\/godot,vkbsb\/godot,MarianoGnu\/godot,NateWardawg\/godot,Paulloz\/godot,josempans\/godot,akien-mga\/godot,honix\/godot,MarianoGnu\/godot,akien-mga\/godot,Faless\/godot,vkbsb\/godot,sanikoyes\/godot,NateWardawg\/godot,BastiaanOlij\/godot,okamstudio\/godot,ex\/godot,godotengine\/godot,guilhermefelipecgs\/godot,mcanders\/godot,RandomShaper\/godot,Faless\/godot,MarianoGnu\/godot,DmitriySalnikov\/godot,honix\/godot,sanikoyes\/godot,Paulloz\/godot,Paulloz\/godot,Faless\/godot,firefly2442\/godot,godotengine\/godot,honix\/godot,Valentactive\/godot,MarianoGnu\/godot,firefly2442\/godot,Valentactive\/godot,Valentactive\/godot,pkowal1982\/godot,Zylann\/godot,pkowal1982\/godot,Paulloz\/godot,mcanders\/godot,akien-mga\/godot,guilhermefelipecgs\/godot,akien-mga\/godot,okamstudio\/godot,josempans\/godot,BastiaanOlij\/godot,godotengine\/godot,guilhermefelipecgs\/godot,pkowal1982\/godot,Zylann\/godot,NateWardawg\/godot,okamstudio\/godot,josempans\/godot,Valentactive\/godot,guilhermefelipecgs\/godot,BastiaanOlij\/godot,godotengine\/godot,DmitriySalnikov\/godot,ZuBsPaCe\/godot,Valentactive\/godot,Shockblast\/godot,godotengine\/godot,groud\/godot,Shockblast\/godot,guilhermefelipecgs\/godot,Paulloz\/godot,Faless\/godot,guilhermefelipecgs\/godot,akien-mga\/godot,groud\/godot,pkowal1982\/godot,NateWardawg\/godot,pkowal1982\/godot,akien-mga\/godot,vkbsb\/godot,RandomShaper\/godot,Zylann\/godot,DmitriySalnikov\/godot,vnen\/godot,vkbsb\/godot,okamstudio\/godot,honix\/godot,groud\/godot,mcanders\/godot,ZuBsPaCe\/godot,ex\/godot,ex\/godot,Faless\/godot,okamstudio\/godot,ex\/godot,Shockblast\/godot,vkbsb\/godot,Valentactive\/godot,vnen\/godot,DmitriySalnikov\/godot,BastiaanOlij\/godot,ZuBsPaCe\/godot,vnen\/godot,sanikoyes\/godot,groud\/godot,godotengine\/godot,Zylann\/godot,NateWardawg\/godot,firefly2442\/godot,okamstudio\/godot,Shockblast\/godot,pkowal1982\/godot,ex\/godot,firefly2442\/godot,sanikoyes\/godot,Zylann\/godot,vkbsb\/godot,vnen\/godot,vkbsb\/godot,firefly2442\/godot,vnen\/godot,ZuBsPaCe\/godot,ZuBsPaCe\/godot,firefly2442\/godot,mcanders\/godot,sanikoyes\/godot,josempans\/godot,BastiaanOlij\/godot,NateWardawg\/godot,ex\/godot,vnen\/godot,BastiaanOlij\/godot,MarianoGnu\/godot,Faless\/godot,josempans\/godot,MarianoGnu\/godot,RandomShaper\/godot,okamstudio\/godot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- core\/list.h\n+++ core\/list.h\n@@ -306,6 +306,8 @@\n \n \t\tif (!p_element->next_ptr) {\n \t\t\t_data->last = n;\n+\t\t} else {\n+\t\t\tp_element->next_ptr->prev_ptr = n;\n \t\t}\n \n \t\tp_element->next_ptr = n;\n@@ -330,6 +332,8 @@\n \n \t\tif (!p_element->prev_ptr) {\n \t\t\t_data->first = n;\n+\t\t} else {\n+\t\t\tp_element->prev_ptr->next_ptr = n;\n \t\t}\n \n \t\tp_element->prev_ptr = n;\n"} {"commit":"cf6726e2ee387b0eff303628eaa0beaf36a1aeb4","subject":"NFSv4: Deal with atomic upgrades of an existing delegation","message":"NFSv4: Deal with atomic upgrades of an existing delegation\n\nEnsure that we deal correctly with the case where the server sends us a\nnewer instance of the same delegation. If the stateids match, but the\nsequence numbers differ, then treat the new delegation as if it were\nan atomic upgrade.\n\nSigned-off-by: Trond Myklebust <6a1f9db795c9fc44be97d66ab114c53193bd3d13@primarydata.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"c383747ef674467d02dd9c9320a47de2067b0ce3","subject":"nfsd4: remove some redundant comments","message":"nfsd4: remove some redundant comments\n\nSigned-off-by: J. Bruce Fields <51738506c1b2ccb0761f23bdc612c93babf738ea@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/nfsd\/nfs4state.c\n+++ fs\/nfsd\/nfs4state.c\n@@ -4432,17 +4432,11 @@\n \t\t\t\t\t\tlocku->lu_length);\n \tnfs4_transform_lock_offset(file_lock);\n \n-\t\/*\n-\t* Try to unlock the file in the VFS.\n-\t*\/\n \terr = vfs_lock_file(filp, F_SETLK, file_lock, NULL);\n \tif (err) {\n \t\tdprintk(\"NFSD: nfs4_locku: vfs_lock_file failed!\\n\");\n \t\tgoto out_nfserr;\n \t}\n-\t\/*\n-\t* OK, unlock succeeded; the only thing left to do is update the stateid.\n-\t*\/\n \tupdate_stateid(&stp->st_stid.sc_stateid);\n \tmemcpy(&locku->lu_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));\n \n"} {"commit":"92f41445ce234edf4f5d7b641d8f66102441a6ab","subject":"get attributes fix","message":"get attributes fix\n","repos":"pcloudcom\/pclsync","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pcompat.c\n+++ pcompat.c\n@@ -1223,12 +1223,16 @@\n wchar_t *wpath;\n HANDLE fd;\n BOOL ret;\n- int flag = FILE_ATTRIBUTE_NORMAL;\n+ DWORD flag = FILE_ATTRIBUTE_NORMAL, attr;\n wpath=utf8_to_wchar(path);\n retry:\n- if (GetFileAttributesW(wpath)&FILE_ATTRIBUTE_DIRECTORY)\n+ attr = GetFileAttributesW(wpath);\n+ if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY)\n flag = FILE_FLAG_BACKUP_SEMANTICS;\n- fd=CreateFileW(wpath, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, flag, NULL);\n+ if (attr == INVALID_FILE_ATTRIBUTES)\n+ return -1;\n+\n+ fd=CreateFileW(wpath, 0, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, flag, NULL);\n if (unlikely_log(fd==INVALID_HANDLE_VALUE)){\n if (GetLastError()==ERROR_SHARING_VIOLATION){\n debug(D_WARNING, \"file %s is locked by another process, will retry after sleep\", path);\n"} {"commit":"4af825041b06c2ef9b5933288267a11e029eb360","subject":"nfsd4: process_open2 cleanup","message":"nfsd4: process_open2 cleanup\n\nNote we can simplify the error handling a little by doing the truncate\nearlier.\n\nSigned-off-by: J. Bruce Fields <51738506c1b2ccb0761f23bdc612c93babf738ea@redhat.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/nfsd\/nfs4state.c\n+++ fs\/nfsd\/nfs4state.c\n@@ -3013,14 +3013,12 @@\n \t\tstatus = nfs4_get_vfs_file(rqstp, fp, current_fh, open);\n \t\tif (status)\n \t\t\tgoto out;\n+\t\tstatus = nfsd4_truncate(rqstp, current_fh, open);\n+\t\tif (status)\n+\t\t\tgoto out;\n \t\tstp = open->op_stp;\n \t\topen->op_stp = NULL;\n \t\tinit_open_stateid(stp, fp, open);\n-\t\tstatus = nfsd4_truncate(rqstp, current_fh, open);\n-\t\tif (status) {\n-\t\t\trelease_open_stateid(stp);\n-\t\t\tgoto out;\n-\t\t}\n \t}\n \tupdate_stateid(&stp->st_stid.sc_stateid);\n \tmemcpy(&open->op_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));\n"} {"commit":"2c64d4c82c5f2b33fcae716c1538d51e002d4d4a","subject":"fix readahead on mac","message":"fix readahead on mac\n","repos":"pcloudcom\/pclsync","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pcompat.c\n+++ pcompat.c\n@@ -1721,7 +1721,14 @@\n \n int psync_file_readahead(psync_file_t fd, uint64_t offset, size_t count){\n #if defined(P_OS_POSIX)\n+#if defined(POSIX_FADV_WILLNEED)\n return posix_fadvise(fd, offset, count, POSIX_FADV_WILLNEED);\n+#elif defined(F_RDADVISE)\n+ struct radvisory ra;\n+ ra.ra_offset=offset;\n+ ra.ra_count=count;\n+ return fcntl(fd, F_RDADVISE, &ra);\n+#endif\n #elif defined(P_OS_WINDOWS)\n return 0;\n #else\n"} {"commit":"ab2b10a4842526c38b63c6cb70751b9ccf9a253b","subject":"Fixed an issue in the forwarding.","message":"Fixed an issue in the forwarding.\n\nThe incorrect function was being forwarded: the function template, instead of the implementation-function.\n","repos":"erikvalkering\/smartref,erikvalkering\/smartref,erikvalkering\/smartref","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- reflection.h\n+++ reflection.h\n@@ -120,7 +120,7 @@\n template<typename... Args> \\\n decltype(auto) indirect(Args &&... args) \\\n { \\\n- return F{}(*this, &Class::name, std::forward<Args>(args)...); \\\n+ return F{}(*this, &Class::__reflect_impl_##name, std::forward<Args>(args)...); \\\n } \\\n \\\n public: \\\n"} {"commit":"18d3a98f3c1b0e27ce026afa4d1ef042f2903726","subject":"ocfs2: Silence a gcc warning.","message":"ocfs2: Silence a gcc warning.\n\nocfs2_block_group_claim_bits() is never called with min_bits=0, but we\nshouldn't leave status undefined if it ever is.\n\nSigned-off-by: Joel Becker <823d0e2e55da83c1616b20ae9a15f9456fa076e5@oracle.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- fs\/ocfs2\/suballoc.c\n+++ fs\/ocfs2\/suballoc.c\n@@ -484,7 +484,7 @@\n \t\t\t\t\tunsigned int min_bits,\n \t\t\t\t\tu32 *bit_off, u32 *num_bits)\n {\n-\tint status;\n+\tint status = 0;\n \n \twhile (min_bits) {\n \t\tstatus = ocfs2_claim_clusters(handle, ac, min_bits,\n"} {"commit":"02154c02b2df2dbeb15b317c83685ef2a2ac3560","subject":"fixed problem with D scale factor","message":"fixed problem with D scale factor\n","repos":"Godzil\/ack,Godzil\/ack,Godzil\/ack,Godzil\/ack,Godzil\/ack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lang\/m2\/comp\/LLlex.c\n+++ lang\/m2\/comp\/LLlex.c\n@@ -582,6 +582,7 @@\n \t\t\t\tLoadChar(ch);\n \t\t\t\tif (!(ch == '+' || ch == '-' || is_dig(ch)))\n \t\t\t\t\tgoto noscale;\n+\t\t\t\tUnloadChar(ch);\n \t\t\t}\n \t\t\tif (np < &buf[NUMSIZE]) *np++ = 'E';\n \t\t\tLoadChar(ch);\n"} {"commit":"16edd4b7671c8683ef813559c329f460f15742fe","subject":"variable alignment","message":"variable alignment\n","repos":"fceller\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,joerg84\/arangodb,kangkot\/arangodb,jsteemann\/arangodb,joerg84\/arangodb,Simran-B\/arangodb,thurt\/arangodb,jsteemann\/arangodb,thurt\/arangodb,graetzer\/arangodb,thurt\/arangodb,wiltonlazary\/arangodb,joerg84\/arangodb,baslr\/ArangoDB,graetzer\/arangodb,hkernbach\/arangodb,joerg84\/arangodb,jsteemann\/arangodb,Simran-B\/arangodb,joerg84\/arangodb,graetzer\/arangodb,graetzer\/arangodb,arangodb\/arangodb,joerg84\/arangodb,fceller\/arangodb,wiltonlazary\/arangodb,jsteemann\/arangodb,thurt\/arangodb,fceller\/arangodb,joerg84\/arangodb,graetzer\/arangodb,jsteemann\/arangodb,baslr\/ArangoDB,CoDEmanX\/ArangoDB,graetzer\/arangodb,hkernbach\/arangodb,arangodb\/arangodb,m0ppers\/arangodb,jsteemann\/arangodb,graetzer\/arangodb,CoDEmanX\/ArangoDB,m0ppers\/arangodb,graetzer\/arangodb,hkernbach\/arangodb,kangkot\/arangodb,CoDEmanX\/ArangoDB,baslr\/ArangoDB,fceller\/arangodb,baslr\/ArangoDB,Simran-B\/arangodb,CoDEmanX\/ArangoDB,fceller\/arangodb,Simran-B\/arangodb,fceller\/arangodb,wiltonlazary\/arangodb,CoDEmanX\/ArangoDB,kangkot\/arangodb,thurt\/arangodb,hkernbach\/arangodb,m0ppers\/arangodb,joerg84\/arangodb,hkernbach\/arangodb,fceller\/arangodb,m0ppers\/arangodb,hkernbach\/arangodb,baslr\/ArangoDB,fceller\/arangodb,Simran-B\/arangodb,baslr\/ArangoDB,jsteemann\/arangodb,arangodb\/arangodb,arangodb\/arangodb,hkernbach\/arangodb,CoDEmanX\/ArangoDB,joerg84\/arangodb,Simran-B\/arangodb,Simran-B\/arangodb,wiltonlazary\/arangodb,kangkot\/arangodb,baslr\/ArangoDB,m0ppers\/arangodb,arangodb\/arangodb,m0ppers\/arangodb,graetzer\/arangodb,joerg84\/arangodb,thurt\/arangodb,CoDEmanX\/ArangoDB,kangkot\/arangodb,Simran-B\/arangodb,arangodb\/arangodb,hkernbach\/arangodb,hkernbach\/arangodb,baslr\/ArangoDB,hkernbach\/arangodb,joerg84\/arangodb,graetzer\/arangodb,kangkot\/arangodb,kangkot\/arangodb,wiltonlazary\/arangodb,hkernbach\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,jsteemann\/arangodb,kangkot\/arangodb,kangkot\/arangodb,wiltonlazary\/arangodb,thurt\/arangodb,m0ppers\/arangodb,graetzer\/arangodb,graetzer\/arangodb,kangkot\/arangodb,m0ppers\/arangodb,Simran-B\/arangodb,arangodb\/arangodb,thurt\/arangodb,m0ppers\/arangodb,baslr\/ArangoDB,hkernbach\/arangodb,graetzer\/arangodb,wiltonlazary\/arangodb,joerg84\/arangodb,wiltonlazary\/arangodb,m0ppers\/arangodb,thurt\/arangodb,joerg84\/arangodb,jsteemann\/arangodb,fceller\/arangodb,CoDEmanX\/ArangoDB,joerg84\/arangodb,hkernbach\/arangodb,Simran-B\/arangodb,arangodb\/arangodb,baslr\/ArangoDB,m0ppers\/arangodb,baslr\/ArangoDB,CoDEmanX\/ArangoDB,baslr\/ArangoDB,fceller\/arangodb,graetzer\/arangodb,jsteemann\/arangodb,hkernbach\/arangodb,thurt\/arangodb,CoDEmanX\/ArangoDB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/GeneralServer\/GeneralCommTask.h\n+++ lib\/GeneralServer\/GeneralCommTask.h\n@@ -98,8 +98,8 @@\n _bodyLength(0),\n _requestPending(false),\n _closeRequested(false),\n+ _readRequestBody(false),\n _request(0),\n- _readRequestBody(false),\n _maximalHeaderSize(0),\n _maximalBodySize(0) {\n LOG_TRACE(\"connection established, client %d, server ip %s, server port %d, client ip %s, client port %d\",\n@@ -396,16 +396,16 @@\n bool _closeRequested;\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/\/ @brief true if reading the request body\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+ bool _readRequestBody;\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\/ @brief the request with possible incomplete body\n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n typename HF::GeneralRequest* _request;\n-\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\/\/\/ @brief true if reading the request body\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\n- bool _readRequestBody;\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\/ @brief the maximal header size\n"} {"commit":"6cd6cc7be4333beba006d0bf64ec8994e1f99e42","subject":"fixing a warning about a missing virtual dtor","message":"fixing a warning about a missing virtual dtor\n","repos":"cedrus-opensource\/xid_device_library,cedrus-opensource\/xid_device_library,cedrus-opensource\/xid_device_library,cedrus-opensource\/xid_device_library","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- xid_device_driver\/interface_xid_con.h\n+++ xid_device_driver\/interface_xid_con.h\n@@ -6,7 +6,11 @@\n class interface_xid_con\n {\n public:\n+ virtual ~interface_xid_con()\n+ {}\n+\n virtual bool read( unsigned char *in_buffer, int bytes_to_read, int *bytes_read) = 0;\n+\n };\n } \/\/ namespace cedrus\n \n"} {"commit":"6b2d2e80975d1214d3ea90b8a84cb1e0ca13cc79","subject":"tools\/mgmt-tester: Add basic LE-only limited discoverable on test case","message":"tools\/mgmt-tester: Add basic LE-only limited discoverable on test case\n","repos":"ComputeCycles\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/mgmt-tester.c\n+++ tools\/mgmt-tester.c\n@@ -982,6 +982,23 @@\n \t.expect_hci_command = BT_HCI_CMD_WRITE_CLASS_OF_DEV,\n \t.expect_hci_param = write_cod_limited,\n \t.expect_hci_len = sizeof(write_cod_limited),\n+};\n+\n+static uint8_t set_limited_discov_on_le_param[] = { 0x0b, 0x06, 0x00, 0x00 };\n+static uint8_t set_limited_discov_adv_data[32] = { 0x06, 0x02, 0x01, 0x05,\n+\t\t\t\t\t\t\t\t0x02, 0x0a, };\n+\n+static const struct generic_data set_limited_discov_on_le_success_1 = {\n+\t.setup_settings = settings_powered_le_connectable_advertising,\n+\t.send_opcode = MGMT_OP_SET_DISCOVERABLE,\n+\t.send_param = set_limited_discov_on_param,\n+\t.send_len = sizeof(set_limited_discov_on_param),\n+\t.expect_status = MGMT_STATUS_SUCCESS,\n+\t.expect_param = set_limited_discov_on_le_param,\n+\t.expect_len = sizeof(set_limited_discov_on_le_param),\n+\t.expect_hci_command = BT_HCI_CMD_LE_SET_ADV_DATA,\n+\t.expect_hci_param = set_limited_discov_adv_data,\n+\t.expect_hci_len = sizeof(set_limited_discov_adv_data),\n };\n \n static uint16_t settings_link_sec[] = { MGMT_OP_SET_LINK_SECURITY, 0 };\n@@ -2881,6 +2898,9 @@\n \ttest_bredrle(\"Set limited discoverable on - Success 3\",\n \t\t\t\t&set_limited_discov_on_success_3,\n \t\t\t\tNULL, test_command_generic);\n+\ttest_le(\"Set limited discoverable on (LE-only) - Success 1\",\n+\t\t\t\t&set_limited_discov_on_le_success_1,\n+\t\t\t\tNULL, test_command_generic);\n \n \ttest_bredrle(\"Set link security on - Success 1\",\n \t\t\t\t&set_link_sec_on_success_test_1,\n"} {"commit":"73315af325b936360429b6faa40f7b68db9260a0","subject":"Added new error handlers","message":"Added new error handlers\n","repos":"rosatamsen\/42_piscine,rosatamsen\/42_piscine,rosatamsen\/42_piscine,rosatamsen\/42_piscine","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- ft_error_handling.c\n+++ ft_error_handling.c\n@@ -6,7 +6,7 @@\n \/* By: gguiulfo <marvin@42.fr> +#+ +:+ +#+ *\/\n \/* +#+#+#+#+#+ +#+ *\/\n \/* Created: 2017\/02\/01 15:49:54 by gguiulfo #+# #+# *\/\n-\/* Updated: 2017\/02\/01 17:13:08 by drosa-ta ### ########.fr *\/\n+\/* Updated: 2017\/02\/01 19:21:37 by gguiulfo ### ########.fr *\/\n \/* *\/\n \/* ************************************************************************** *\/\n \n@@ -20,14 +20,16 @@\n \n \ti = 0;\n \tch_count = 0;\n-\twhile (str[i] >= '9' && str[i] <= '0' && str[i] != '\\n')\n+\twhile (str[i] <= '9' && str[i] >= '0' && str[i] != '\\n')\n \t\ti++;\n \twhile (str[i] != '\\n')\n \t{\n \t\tch_count++;\n \t\ti++;\n \t}\n-\tif (ch_count != 3)\n+\ti--;\n+\tif (ch_count != 3 || str[i] == str[i - 1] || str[i] == str[i - 2]\n+\t\t\t|| str[i - 1] == str[i - 2])\n \t\treturn (0);\n \telse\n \t\treturn (1);\n@@ -44,7 +46,7 @@\n \tkey = (char*)malloc(sizeof(key) * 4);\n \twhile (str[i] != '\\n')\n \t\ti++;\n-\tif(i == 0)\n+\tif (i == 0)\n \t\treturn (0);\n \tkey[j] = '\\0';\n \twhile (j >= 0)\n@@ -77,14 +79,14 @@\n \treturn (1);\n }\n \n-void ft_puterr(char *str)\n+void\tft_puterr(char *str)\n {\n- int i;\n+\tint i;\n \n- i = 0;\n- while (str[i] != '\\0')\n- {\n- write(2, &str[i], 1);\n- i++;\n- }\n+\ti = 0;\n+\twhile (str[i] != '\\0')\n+\t{\n+\t\twrite(2, &str[i], 1);\n+\t\ti++;\n+\t}\n }\n"} {"commit":"07a2b2e32c442aa5c3d92f90828f99dcafe45d01","subject":"notify-send: Add debug logs about the notification daemon","message":"notify-send: Add debug logs about the notification daemon\n","repos":"GNOME\/libnotify,GNOME\/libnotify","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/notify-send.c\n+++ tools\/notify-send.c\n@@ -203,6 +203,10 @@\n static char **n_text = NULL;\n static char **hints = NULL;\n static char **actions = NULL;\n+ static char *server_name = NULL;\n+ static char *server_vendor = NULL;\n+ static char *server_version = NULL;\n+ static char *server_spec_version = NULL;\n static gboolean print_id = FALSE;\n static gint notification_id = 0;\n static gboolean do_version = FALSE;\n@@ -310,6 +314,18 @@\n if (!notify_init (\"notify-send\"))\n exit (1);\n \n+ notify_get_server_info (&server_name,\n+ &server_vendor,\n+ &server_version,\n+ &server_spec_version);\n+\n+ g_debug (\"Using sever %s %s, v%s - Supporting Notification Spec %s\",\n+ server_name, server_vendor, server_version, server_spec_version);\n+ g_free (server_name);\n+ g_free (server_vendor);\n+ g_free (server_version);\n+ g_free (server_spec_version);\n+\n notify = g_object_new (NOTIFY_TYPE_NOTIFICATION,\n \"summary\", summary,\n \"body\", body,\n"} {"commit":"c878cd6b52f7674160e705c5a5db63bc306b4edf","subject":"Free Commands once osyncplugin is through all commands... Fixes also GCC warning about unused fucntion.","message":"Free Commands once osyncplugin is through all commands...\nFixes also GCC warning about unused fucntion.\n\n\ngit-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@3526 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e\n","repos":"luizluca\/opensync-luizluca,luizluca\/opensync-luizluca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/osyncplugin.c\n+++ tools\/osyncplugin.c\n@@ -1213,10 +1213,15 @@\n \t\t\tgoto error_disconnect_and_finalize;\n \n \n-\t\/* TODO: free command list - for easier memory leak checking *\/\n success:\n \tif (plugin_env)\n \t\tosync_plugin_env_free(plugin_env);\n+\n+\tfor (o=cmdlist; o; o = o->next) {\n+\t\tCommand *cmd = o->data;\n+\t\tfree_command(&cmd);\n+\t}\n+\n \n \treturn EXIT_SUCCESS;\n \n@@ -1228,6 +1233,12 @@\n \/\/error_free_plugin_env:\n \tif (plugin_env)\n \t\tosync_plugin_env_free(plugin_env);\n+\n+\tfor (o=cmdlist; o; o = o->next) {\n+\t\tCommand *cmd = o->data;\n+\t\tfree_command(&cmd);\n+\t}\n+\n error:\t\n \tfprintf(stderr, \"Error: %s\\n\", osync_error_print(&error));\n \tosync_error_unref(&error);\n"} {"commit":"7a3b63b1826e6aebfcb2d4a9b5d7a2c29d4ccc6a","subject":"Updated osyncplugin.c to osync_plugin_config_file_load() signature change: r3406","message":"Updated osyncplugin.c to osync_plugin_config_file_load() signature\nchange: r3406\n\n\ngit-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@3408 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e\n","repos":"luizluca\/opensync-luizluca,luizluca\/opensync-luizluca","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tools\/osyncplugin.c\n+++ tools\/osyncplugin.c\n@@ -311,7 +311,7 @@\n \t\tgoto error_free_plugininfo;\n \n if (osync_plugin_get_config_type(plugin) != OSYNC_PLUGIN_NO_CONFIGURATION && configfile) {\n-\t\tif (!osync_plugin_config_file_load(config, configfile, error))\n+\t\tif (!osync_plugin_config_file_load(config, configfile, NULL, error))\n \t\t\tgoto error_free_pluginconfig;\n \n \t\tosync_plugin_info_set_config(plugin_info, config);\n"} {"commit":"8d32f3a19b12f00209a472252a36bff41953f0ce","subject":"Read specs from \/usr\/libdata\/gcc\/specs if it exists.","message":"Read specs from \/usr\/libdata\/gcc\/specs if it exists.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/gcc\/gcc.c\n+++ contrib\/gcc\/gcc.c\n@@ -6015,11 +6015,11 @@\n \n \/* We need to check standard_exec_prefix\/just_machine_suffix\/specs\n for any override of as, ld and libraries. *\/\n- specs_file = (char *) alloca (strlen (standard_exec_prefix)\n+ specs_file = (char *) alloca (strlen (FBSD_DATA_PREFIX)\n \t\t\t\t+ strlen (just_machine_suffix)\n \t\t\t\t+ sizeof (\"specs\"));\n \n- strcpy (specs_file, standard_exec_prefix);\n+ strcpy (specs_file, FBSD_DATA_PREFIX);\n strcat (specs_file, just_machine_suffix);\n strcat (specs_file, \"specs\");\n if (access (specs_file, R_OK) == 0)\n"} {"commit":"0ec1aec72c97acb11e4c8f51ca6614764bf911ba","subject":"#i20052#","message":"#i20052#\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- jvmfwk\/inc\/jvmfwk\/vendorplugin.h\n+++ jvmfwk\/inc\/jvmfwk\/vendorplugin.h\n@@ -2,9 +2,9 @@\n *\n * $RCSfile: vendorplugin.h,v $\n *\n- * $Revision: 1.3 $\n+ * $Revision: 1.4 $\n *\n- * last change: $Author: jl $ $Date: 2004-04-22 12:52:39 $\n+ * last change: $Author: jl $ $Date: 2004-05-03 14:55:13 $\n *\n * The Contents of this file are made available subject to the terms of\n * either of the following licenses\n@@ -132,6 +132,7 @@\n @param\n JFW_PLUGIN_E_NONE,\n JFW_PLUGIN_E_ERROR,\n+ JFW_PLUGIN_E_WRONG_VENDOR\n JFW_PLUGIN_E_INVALID_ARG,\n \n *\/\n"} {"commit":"9280292ba434f89ad67bbf30e151c6c10b7c1cb7","subject":"randomep command added to randomly pick an episode from the database","message":"randomep command added to randomly pick an episode from the database\n","repos":"PonyChat\/ponychat-atheme-modules","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cs_ponies.c\n+++ cs_ponies.c\n@@ -9,12 +9,14 @@\n \n static void cs_cmd_countdown(sourceinfo_t *si, int parc, char *parv[]);\n static void cs_cmd_episode(sourceinfo_t *si, int parc, char *parv[]);\n+static void cs_cmd_randomep(sourceinfo_t *si, int parc, char *parv[]);\n \n static void write_fimdb(database_handle_t *db);\n static void db_h_fim(database_handle_t *db, const char *type);\n \n command_t cs_episode = { \"EPISODE\", N_(\"Manage or view the list of My Little Pony: Friendship is Magic episodes.\"), PRIV_USER_ADMIN, 5, cs_cmd_episode, { .path = \"contrib\/cs_episode\" } };\n command_t cs_countdown = { \"COUNTDOWN\", N_(\"Responds with the time remaining until the next episode of My Little Pony: Friendship is Magic\"), AC_NONE, 0, cs_cmd_countdown, { .path = \"contrib\/cs_countdown\" } };\n+command_t cs_randomep = { \"RANDOMEP\", N_(\"Responds with a name of an episode of My Little Pony: Friendship is Magic for you to watch\"), AC_NONE, 0, cs_cmd_randomep, { .path = \"contrib\/cs_countdown\" } };\n \n struct episode_ {\n \tchar *title;\n@@ -42,6 +44,7 @@\n \n \tservice_named_bind_command(\"chanserv\", &cs_countdown);\n \tservice_named_bind_command(\"chanserv\", &cs_episode);\n+\tservice_named_bind_command(\"chanserv\", &cs_randomep);\n }\n \n void _moddeinit(module_unload_intent_t intent)\n@@ -52,6 +55,7 @@\n \n \tservice_named_unbind_command(\"chanserv\", &cs_countdown);\n \tservice_named_unbind_command(\"chanserv\", &cs_episode);\n+\tservice_named_unbind_command(\"chanserv\", &cs_randomep);\n }\n \n static void write_fimdb(database_handle_t *db)\n@@ -84,6 +88,24 @@\n \tl->number = number;\n \tl->title = sstrdup(title);\n \tmowgli_node_add(l, mowgli_node_create(), &cs_episodelist);\n+}\n+\n+static void cs_cmd_randomep(sourceinfo_t *si, int parc, char *parv[])\n+{\n+\tepisode_t *toSee;\n+\n+\tint epnum = MOWGLI_LIST_LENGTH(&cs_episodelist) - 1;\n+\t\n+\tmowgli_random_t *r = mowgli_random_create_with_seed(time(NULL));\n+\t\n+\tint randnum = mowgli_random_int_ranged(r, 0, epnum);\n+\t\n+\ttoSee = mowgli_node_nth(&cs_episodelist, randnum)->data;\n+\t\n+\tservice_t *svs = service_find(\"chanserv\");\n+\t\n+\tmsg(svs->me->nick, si->c->name, \"You should watch Season %d Episode %d: %s\", \n+\ttoSee->season, toSee->number, toSee->title);\n }\n \n static void cs_cmd_countdown(sourceinfo_t *si, int parc, char *parv[])\n"} {"commit":"73afbbe4af5545f97406fb3d692e63f84de5d59e","subject":"removed fill2 test","message":"removed fill2 test\n","repos":"soumith\/TH,soumith\/TH,soumith\/TH,soumith\/TH","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- packages\/torch\/generic\/TensorMath.c\n+++ packages\/torch\/generic\/TensorMath.c\n@@ -20,49 +20,6 @@\n lua_pushnumber(L, THTensor_(FUNC)(tensor)); \\\n return 1; \\\n }\n-\n-static int torch_TensorMath_(fill2)(lua_State *L)\n-{\n- THTensor *tensor = luaT_checkudata(L, 1, torch_Tensor_id);\n- real value = (real)luaL_checknumber(L, 2);\n-\n- long sz[5];\n- int dim;\n- long nElement;\n- long ndim = tensor->nDimension;\n- long k;\n- real *data = THTensor_(data)(tensor);\n-\n- sz[tensor->nDimension-1] = 1;\n- for(dim = ndim-2; dim >= 0; dim--)\n- sz[dim] = sz[dim+1]*tensor->size[dim+1];\n- nElement = sz[0]*tensor->size[0];\n-\n- for(k = 0; k < nElement; k++)\n- {\n- long idx = 0;\n- long rest = k;\n- for(dim = 0; dim < ndim; dim++)\n- {\n-\/* long dimx = rest\/sz[dim];\n- if(dimx > 0)\n- {\n- idx += dimx*tensor->stride[dim];\n- rest -= dimx*sz[dim];\n- }\n-*\/\n- idx += (rest\/sz[dim])*tensor->stride[dim];\n- rest -= rest % sz[dim];\n- }\n- data[idx] = value;\n-\n-\/* printf(\"k=%ld idx=%ld\\n\", k, idx); *\/\n- }\n-\n- lua_settop(L, 1);\n- return 1;\n-\n-}\n \n static int torch_TensorMath_(fill)(lua_State *L)\n {\n@@ -393,7 +350,6 @@\n }\n \n static const struct luaL_Reg torch_TensorMath_(_) [] = {\n- {\"fill2\", torch_TensorMath_(fill2)},\n {\"fill\", torch_TensorMath_(fill)},\n {\"zero\", torch_TensorMath_(zero)},\n {\"add\", torch_TensorMath_(add)},\n"} {"commit":"94a362f208cebc73a7601312c5998f25d4725370","subject":"SEChecker: fixed missing header include line for apol\/policy-query.h","message":"SEChecker:\n fixed missing header include line for apol\/policy-query.h\n\n","repos":"TresysTechnology\/setools3,TresysTechnology\/setools3,TresysTechnology\/setools3,TresysTechnology\/setools3","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sechecker\/sechecker.h\n+++ sechecker\/sechecker.h\n@@ -29,6 +29,7 @@\n #include <config.h>\n \n #include <apol\/policy.h>\n+#include <apol\/policy-query.h>\n #include <apol\/vector.h>\n #include <apol\/util.h>\n \n"} {"commit":"e40b5557fce609696c06a15e0af7ae75e7d71f9b","subject":"added call to clear_list","message":"added call to clear_list\n","repos":"rkgibson2\/CS50-Section","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- section6\/linkedlist.c\n+++ section6\/linkedlist.c\n@@ -26,7 +26,7 @@\n head = new;\n }\n \n-void print_list()\n+void print_list(void)\n {\n node* ptr = head;\n \n@@ -56,4 +56,6 @@\n insert_beginning(5);\n \n print_list();\n+\n+ clear_list();\n }\n"} {"commit":"435384d1c42e7baf4ba0af0e87963cb3c5523edf","subject":"add std::tuple serialization","message":"add std::tuple serialization\n","repos":"CanalTP\/utils,CanalTP\/utils,pbougue\/utils,xlqian\/utils","returncode":1,"stderr":"error: pathspec 'serialization_tuple.h' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- serialization_tuple.h\n+++ serialization_tuple.h\n@@ -0,0 +1,62 @@\n+\/*\n+Copyright 2011 Christopher Allen Ogden. All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without modification, are\n+permitted provided that the following conditions are met:\n+\n+ 1. Redistributions of source code must retain the above copyright notice, this list of\n+ conditions and the following disclaimer.\n+\n+ 2. Redistributions in binary form must reproduce the above copyright notice, this list\n+ of conditions and the following disclaimer in the documentation and\/or other materials\n+ provided with the distribution.\n+\n+THIS SOFTWARE IS PROVIDED BY CHRISTOPHER ALLEN OGDEN ``AS IS'' AND ANY EXPRESS OR IMPLIED\n+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND\n+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CHRISTOPHER ALLEN OGDEN OR\n+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\n+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON\n+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+The views and conclusions contained in the software and documentation are those of the\n+authors and should not be interpreted as representing official policies, either expressed\n+or implied, of Christopher Allen Ogden.\n+*\/\n+\n+#pragma once\n+#include <tuple>\n+\n+namespace boost {\n+namespace serialization {\n+\n+template<uint N>\n+struct Serialize\n+{\n+ template<class Archive, typename... Args>\n+ static void serialize(Archive & ar, std::tuple<Args...> & t, const unsigned int version)\n+ {\n+ ar & std::get<N-1>(t);\n+ Serialize<N-1>::serialize(ar, t, version);\n+ }\n+};\n+\n+template<>\n+struct Serialize<0>\n+{\n+ template<class Archive, typename... Args>\n+ static void serialize(Archive &, std::tuple<Args...> &, const unsigned int)\n+ {\n+ }\n+};\n+\n+template<class Archive, typename... Args>\n+void serialize(Archive & ar, std::tuple<Args...> & t, const unsigned int version)\n+{\n+ Serialize<sizeof...(Args)>::serialize(ar, t, version);\n+}\n+\n+}\n+}\n"} {"commit":"5a35c16657da6a343a933104b63d2f46454fde1f","subject":"[percolation] Added forgotten free before exiting function","message":"[percolation] Added forgotten free before exiting function\n","repos":"cerisola\/fiscomp,cerisola\/fiscomp,cerisola\/fiscomp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- percolation\/critical_point_search.c\n+++ percolation\/critical_point_search.c\n@@ -83,6 +83,7 @@\n \n \/* free memory before leaving *\/\n free(p_critical);\n+ free(lattice);\n \n return 0;\n }\n"} {"commit":"4e48746e1a6711045a6e318395b81791c92dbf58","subject":"cmd_sign: drop an unnecessary include","message":"cmd_sign: drop an unnecessary include\n\nThis was discovered when browsing the code, there could be more\ninstances of this in this tree.\n\nBRANCH=none\nBUG=none\nTEST='make futil' still succeeds\n\nChange-Id: Ied3cd13f05ea19091abb6752fd23e7bf9fa562fb\nSigned-off-by: Vadim Bendebury <5515d6d2d0829cbe0dd0dcf2094aaded06d58514@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/vboot_reference\/+\/3120001\nReviewed-by: Daisuke Nojiri <fd5f93af191bf7e8f73ea71cc3c0f66b41b1dd49@chromium.org>\n","repos":"coreboot\/vboot,coreboot\/vboot,coreboot\/vboot,coreboot\/vboot,coreboot\/vboot","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- futility\/cmd_sign.c\n+++ futility\/cmd_sign.c\n@@ -20,7 +20,6 @@\n #include \"2common.h\"\n #include \"file_type.h\"\n #include \"file_type_bios.h\"\n-#include \"fmap.h\"\n #include \"futility.h\"\n #include \"futility_options.h\"\n #include \"host_common.h\"\n"} {"commit":"43393e0f2be8e0c767cf0d9b3b53a22dad6a70c0","subject":"\u8c03\u6574 buffer.h \u683c\u5f0f\u3002","message":"\u8c03\u6574 buffer.h \u683c\u5f0f\u3002\n","repos":"ximenpo\/simple-cpp,ximenpo\/simple-cpp,ximenpo\/simple-cpp,ximenpo\/simple-cpp,ximenpo\/simple-cpp,ximenpo\/simple-cpp","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"4e414163594bdb156b1e9c4b64a886e7278ac871","subject":"Fix typo.","message":"Fix typo.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@140313 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/Target\/Mips\/MipsTargetMachine.h\n+++ lib\/Target\/Mips\/MipsTargetMachine.h\n@@ -98,7 +98,7 @@\n Reloc::Model RM, CodeModel::Model CM);\n };\n \n-\/\/\/ MipsebTargetMachine - Mips32 big endian target machine.\n+\/\/\/ Mips64ebTargetMachine - Mips64 big endian target machine.\n \/\/\/\n class Mips64ebTargetMachine : public MipsTargetMachine {\n public:\n@@ -107,7 +107,7 @@\n Reloc::Model RM, CodeModel::Model CM);\n };\n \n-\/\/\/ MipselTargetMachine - Mips32 little endian target machine.\n+\/\/\/ Mips64elTargetMachine - Mips64 little endian target machine.\n \/\/\/\n class Mips64elTargetMachine : public MipsTargetMachine {\n public:\n"} {"commit":"4fcebee6d82c5e198e74e9c886d381e1428af214","subject":"[MCJIT] Remove PPCRelocations.h - it's no longer used.","message":"[MCJIT] Remove PPCRelocations.h - it's no longer used.\n\nThis was overlooked in r218320, which removed the relocation headers for other\ntargets. Thanks to Ulrich Weigand for catching it.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@218327 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Target\/PowerPC\/PPCRelocations.h\n+++ lib\/Target\/PowerPC\/PPCRelocations.h\n@@ -1,56 +0,0 @@\n-\/\/===-- PPCRelocations.h - PPC Code Relocations -----------------*- C++ -*-===\/\/\n-\/\/\n-\/\/ The LLVM Compiler Infrastructure\n-\/\/\n-\/\/ This file is distributed under the University of Illinois Open Source\n-\/\/ License. See LICENSE.TXT for details.\n-\/\/\n-\/\/===----------------------------------------------------------------------===\/\/\n-\/\/\n-\/\/ This file defines the PowerPC 32-bit target-specific relocation types.\n-\/\/\n-\/\/===----------------------------------------------------------------------===\/\/\n-\n-#ifndef LLVM_LIB_TARGET_POWERPC_PPCRELOCATIONS_H\n-#define LLVM_LIB_TARGET_POWERPC_PPCRELOCATIONS_H\n-\n-#include \"llvm\/CodeGen\/MachineRelocation.h\"\n-\n-\/\/ Hack to rid us of a PPC pre-processor symbol which is erroneously\n-\/\/ defined in a PowerPC header file (bug in Linux\/PPC)\n-#ifdef PPC\n-#undef PPC\n-#endif\n-\n-namespace llvm {\n- namespace PPC {\n- enum RelocationType {\n- \/\/ reloc_vanilla - A standard relocation, where the address of the\n- \/\/ relocated object completely overwrites the address of the relocation.\n- reloc_vanilla,\n- \n- \/\/ reloc_pcrel_bx - PC relative relocation, for the b or bl instructions.\n- reloc_pcrel_bx,\n-\n- \/\/ reloc_pcrel_bcx - PC relative relocation, for BLT,BLE,BEQ,BGE,BGT,BNE,\n- \/\/ and other bcx instructions.\n- reloc_pcrel_bcx,\n-\n- \/\/ reloc_absolute_high - Absolute relocation, for the loadhi instruction\n- \/\/ (which is really addis). Add the high 16-bits of the specified global\n- \/\/ address into the low 16-bits of the instruction.\n- reloc_absolute_high,\n-\n- \/\/ reloc_absolute_low - Absolute relocation, for the la instruction (which\n- \/\/ is really an addi). Add the low 16-bits of the specified global\n- \/\/ address into the low 16-bits of the instruction.\n- reloc_absolute_low,\n- \n- \/\/ reloc_absolute_low_ix - Absolute relocation for the 64-bit load\/store\n- \/\/ instruction which have two implicit zero bits.\n- reloc_absolute_low_ix\n- };\n- }\n-}\n-\n-#endif\n"} {"commit":"4f301ea0e440d7e256303656eba9011f90423c3f","subject":"Free replay queues","message":"Free replay queues\n\nThere could be still some data pending.\n\nSigned-off-by: Frediano Ziglio <55d48b080b2e443e395cde84d2c83b135a4ff48e@redhat.com>\nAcked-by: Pavel Grunt <fbda40b445316123f12a5a6bd7556918ea74f4bc@redhat.com>\n","repos":"fgouget\/spice,fgouget\/spice,fgouget\/spice,fgouget\/spice","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- server\/tests\/replay.c\n+++ server\/tests\/replay.c\n@@ -302,6 +302,21 @@\n return TRUE;\n }\n \n+static void free_queue(GAsyncQueue *queue)\n+{\n+ for (;;) {\n+ QXLCommandExt *cmd = g_async_queue_try_pop(queue);\n+ if (cmd == GINT_TO_POINTER(-1)) {\n+ continue;\n+ }\n+ if (!cmd) {\n+ break;\n+ }\n+ spice_replay_free_cmd(replay, cmd);\n+ }\n+ g_async_queue_unref(queue);\n+}\n+\n int main(int argc, char **argv)\n {\n GError *error = NULL;\n@@ -440,9 +455,9 @@\n g_print(\"Counted %d commands\\n\", ncommands);\n \n spice_server_destroy(server);\n+ free_queue(display_queue);\n+ free_queue(cursor_queue);\n end_replay();\n- g_async_queue_unref(display_queue);\n- g_async_queue_unref(cursor_queue);\n \n \/* FIXME: there should be a way to join server threads before:\n * g_main_loop_unref(loop);\n"} {"commit":"ebbaef6263380375209206cb9247c1707dd7c511","subject":"Don't repeat SmallVector size in the iterator type","message":"Don't repeat SmallVector size in the iterator type\n\n\nSwift SVN r6971\n","repos":"xwu\/swift,therealbnut\/swift,deyton\/swift,amraboelela\/swift,adrfer\/swift,devincoughlin\/swift,tkremenek\/swift,gottesmm\/swift,adrfer\/swift,deyton\/swift,LeoShimonaka\/swift,codestergit\/swift,xedin\/swift,milseman\/swift,shajrawi\/swift,kentya6\/swift,sschiau\/swift,jckarter\/swift,KrishMunot\/swift,gregomni\/swift,parkera\/swift,jtbandes\/swift,glessard\/swift,tinysun212\/swift-windows,slavapestov\/swift,return\/swift,SwiftAndroid\/swift,huonw\/swift,austinzheng\/swift,bitjammer\/swift,karwa\/swift,JaSpa\/swift,slavapestov\/swift,johnno1962d\/swift,danielmartin\/swift,emilstahl\/swift,Jnosh\/swift,milseman\/swift,stephentyrone\/swift,danielmartin\/swift,xwu\/swift,Ivacker\/swift,KrishMunot\/swift,KrishMunot\/swift,OscarSwanros\/swift,LeoShimonaka\/swift,hughbe\/swift,IngmarStein\/swift,uasys\/swift,ahoppen\/swift,amraboelela\/swift,dduan\/swift,bitjammer\/swift,OscarSwanros\/swift,hooman\/swift,jtbandes\/swift,airspeedswift\/swift,jckarter\/swift,apple\/swift,return\/swift,shahmishal\/swift,zisko\/swift,tjw\/swift,gregomni\/swift,CodaFi\/swift,mightydeveloper\/swift,JGiola\/swift,LeoShimonaka\/swift,tjw\/swift,djwbrown\/swift,manavgabhawala\/swift,hooman\/swift,gribozavr\/swift,hughbe\/swift,milseman\/swift,natecook1000\/swift,brentdax\/swift,LeoShimonaka\/swift,ken0nek\/swift,IngmarStein\/swift,gribozavr\/swift,harlanhaskins\/swift,shahmishal\/swift,huonw\/swift,practicalswift\/swift,rudkx\/swift,shahmishal\/swift,frootloops\/swift,natecook1000\/swift,bitjammer\/swift,rudkx\/swift,hooman\/swift,shahmishal\/swift,JGiola\/swift,parkera\/swift,milseman\/swift,arvedviehweger\/swift,manavgabhawala\/swift,lorentey\/swift,codestergit\/swift,kperryua\/swift,karwa\/swift,airspeedswift\/swift,ben-ng\/swift,karwa\/swift,harlanhaskins\/swift,dduan\/swift,glessard\/swift,hooman\/swift,atrick\/swift,arvedviehweger\/swift,tkremenek\/swift,swiftix\/swift.old,mightydeveloper\/swift,return\/swift,jckarter\/swift,jopamer\/swift,alblue\/swift,gmilos\/swift,karwa\/swift,shajrawi\/swift,Jnosh\/swift,djwbrown\/swift,tinysun212\/swift-windows,jtbandes\/swift,austinzheng\/swift,glessard\/swift,ken0nek\/swift,allevato\/swift,manavgabhawala\/swift,calebd\/swift,russbishop\/swift,lorentey\/swift,huonw\/swift,return\/swift,nathawes\/swift,tardieu\/swift,amraboelela\/swift,ahoppen\/swift,modocache\/swift,uasys\/swift,benlangmuir\/swift,tkremenek\/swift,codestergit\/swift,danielmartin\/swift,OscarSwanros\/swift,khizkhiz\/swift,dreamsxin\/swift,roambotics\/swift,emilstahl\/swift,amraboelela\/swift,aschwaighofer\/swift,djwbrown\/swift,therealbnut\/swift,gregomni\/swift,SwiftAndroid\/swift,CodaFi\/swift,deyton\/swift,tinysun212\/swift-windows,harlanhaskins\/swift,OscarSwanros\/swift,jopamer\/swift,swiftix\/swift,ahoppen\/swift,brentdax\/swift,frootloops\/swift,ben-ng\/swift,zisko\/swift,natecook1000\/swift,tardieu\/swift,calebd\/swift,JGiola\/swift,frootloops\/swift,stephentyrone\/swift,gottesmm\/swift,allevato\/swift,russbishop\/swift,dduan\/swift,gribozavr\/swift,kusl\/swift,cbrentharris\/swift,gottesmm\/swift,rudkx\/swift,lorentey\/swift,emilstahl\/swift,djwbrown\/swift,practicalswift\/swift,devincoughlin\/swift,manavgabhawala\/swift,IngmarStein\/swift,MukeshKumarS\/Swift,aschwaighofer\/swift,therealbnut\/swift,parkera\/swift,tjw\/swift,nathawes\/swift,Ivacker\/swift,russbishop\/swift,milseman\/swift,adrfer\/swift,ken0nek\/swift,khizkhiz\/swift,nathawes\/swift,swiftix\/swift.old,apple\/swift,KrishMunot\/swift,stephentyrone\/swift,kentya6\/swift,return\/swift,calebd\/swift,sdulal\/swift,MukeshKumarS\/Swift,airspeedswift\/swift,kusl\/swift,felix91gr\/swift,cbrentharris\/swift,benlangmuir\/swift,allevato\/swift,amraboelela\/swift,jckarter\/swift,JaSpa\/swift,kstaring\/swift,LeoShimonaka\/swift,jmgc\/swift,natecook1000\/swift,felix91gr\/swift,kstaring\/swift,MukeshKumarS\/Swift,harlanhaskins\/swift,roambotics\/swift,uasys\/swift,MukeshKumarS\/Swift,manavgabhawala\/swift,zisko\/swift,johnno1962d\/swift,Ivacker\/swift,Jnosh\/swift,roambotics\/swift,MukeshKumarS\/Swift,MukeshKumarS\/Swift,bitjammer\/swift,swiftix\/swift,huonw\/swift,deyton\/swift,modocache\/swift,rudkx\/swift,swiftix\/swift.old,russbishop\/swift,johnno1962d\/swift,KrishMunot\/swift,dreamsxin\/swift,djwbrown\/swift,djwbrown\/swift,modocache\/swift,lorentey\/swift,swiftix\/swift.old,adrfer\/swift,swiftix\/swift,ken0nek\/swift,xwu\/swift,aschwaighofer\/swift,jckarter\/swift,glessard\/swift,calebd\/swift,benlangmuir\/swift,zisko\/swift,jopamer\/swift,airspeedswift\/swift,ben-ng\/swift,khizkhiz\/swift,xedin\/swift,ben-ng\/swift,jckarter\/swift,xedin\/swift,OscarSwanros\/swift,alblue\/swift,brentdax\/swift,arvedviehweger\/swift,SwiftAndroid\/swift,cbrentharris\/swift,aschwaighofer\/swift,hughbe\/swift,cbrentharris\/swift,kperryua\/swift,huonw\/swift,modocache\/swift,tinysun212\/swift-windows,dduan\/swift,nathawes\/swift,Jnosh\/swift,kstaring\/swift,slavapestov\/swift,roambotics\/swift,kusl\/swift,jmgc\/swift,tardieu\/swift,deyton\/swift,hooman\/swift,aschwaighofer\/swift,xwu\/swift,Ivacker\/swift,practicalswift\/swift,codestergit\/swift,sschiau\/swift,gottesmm\/swift,nathawes\/swift,frootloops\/swift,tkremenek\/swift,frootloops\/swift,mightydeveloper\/swift,johnno1962d\/swift,jopamer\/swift,kentya6\/swift,practicalswift\/swift,glessard\/swift,emilstahl\/swift,tinysun212\/swift-windows,parkera\/swift,cbrentharris\/swift,JGiola\/swift,sschiau\/swift,adrfer\/swift,arvedviehweger\/swift,shahmishal\/swift,alblue\/swift,kentya6\/swift,aschwaighofer\/swift,parkera\/swift,stephentyrone\/swift,jopamer\/swift,ken0nek\/swift,lorentey\/swift,hughbe\/swift,rudkx\/swift,khizkhiz\/swift,kstaring\/swift,shajrawi\/swift,codestergit\/swift,hooman\/swift,devincoughlin\/swift,zisko\/swift,cbrentharris\/swift,shajrawi\/swift,natecook1000\/swift,swiftix\/swift,allevato\/swift,bitjammer\/swift,arvedviehweger\/swift,felix91gr\/swift,xedin\/swift,russbishop\/swift,devincoughlin\/swift,adrfer\/swift,tinysun212\/swift-windows,sdulal\/swift,felix91gr\/swift,apple\/swift,shajrawi\/swift,codestergit\/swift,sschiau\/swift,deyton\/swift,nathawes\/swift,uasys\/swift,JaSpa\/swift,tjw\/swift,ahoppen\/swift,danielmartin\/swift,zisko\/swift,JaSpa\/swift,JaSpa\/swift,ken0nek\/swift,CodaFi\/swift,benlangmuir\/swift,roambotics\/swift,parkera\/swift,gmilos\/swift,gottesmm\/swift,khizkhiz\/swift,airspeedswift\/swift,jckarter\/swift,dduan\/swift,Ivacker\/swift,calebd\/swift,mightydeveloper\/swift,devincoughlin\/swift,kstaring\/swift,IngmarStein\/swift,practicalswift\/swift,deyton\/swift,brentdax\/swift,xedin\/swift,Ivacker\/swift,emilstahl\/swift,aschwaighofer\/swift,dduan\/swift,sschiau\/swift,gottesmm\/swift,tardieu\/swift,emilstahl\/swift,alblue\/swift,natecook1000\/swift,jmgc\/swift,emilstahl\/swift,modocache\/swift,swiftix\/swift.old,manavgabhawala\/swift,LeoShimonaka\/swift,jopamer\/swift,lorentey\/swift,swiftix\/swift,kperryua\/swift,roambotics\/swift,austinzheng\/swift,xedin\/swift,gregomni\/swift,allevato\/swift,CodaFi\/swift,SwiftAndroid\/swift,frootloops\/swift,tkremenek\/swift,sdulal\/swift,hooman\/swift,LeoShimonaka\/swift,devincoughlin\/swift,practicalswift\/swift,ken0nek\/swift,stephentyrone\/swift,austinzheng\/swift,harlanhaskins\/swift,glessard\/swift,rudkx\/swift,amraboelela\/swift,kperryua\/swift,JaSpa\/swift,cbrentharris\/swift,hughbe\/swift,uasys\/swift,kentya6\/swift,gribozavr\/swift,apple\/swift,lorentey\/swift,natecook1000\/swift,gottesmm\/swift,jmgc\/swift,CodaFi\/swift,mightydeveloper\/swift,ben-ng\/swift,johnno1962d\/swift,MukeshKumarS\/Swift,OscarSwanros\/swift,atrick\/swift,shajrawi\/swift,kperryua\/swift,tardieu\/swift,jmgc\/swift,bitjammer\/swift,russbishop\/swift,karwa\/swift,swiftix\/swift.old,johnno1962d\/swift,atrick\/swift,mightydeveloper\/swift,mightydeveloper\/swift,alblue\/swift,practicalswift\/swift,gribozavr\/swift,CodaFi\/swift,shahmishal\/swift,brentdax\/swift,shajrawi\/swift,gmilos\/swift,calebd\/swift,amraboelela\/swift,benlangmuir\/swift,gmilos\/swift,apple\/swift,jtbandes\/swift,khizkhiz\/swift,gregomni\/swift,therealbnut\/swift,felix91gr\/swift,danielmartin\/swift,sschiau\/swift,austinzheng\/swift,CodaFi\/swift,sdulal\/swift,lorentey\/swift,tjw\/swift,russbishop\/swift,swiftix\/swift,ahoppen\/swift,jtbandes\/swift,harlanhaskins\/swift,JaSpa\/swift,gmilos\/swift,felix91gr\/swift,Jnosh\/swift,OscarSwanros\/swift,airspeedswift\/swift,therealbnut\/swift,uasys\/swift,ben-ng\/swift,huonw\/swift,return\/swift,calebd\/swift,Jnosh\/swift,emilstahl\/swift,atrick\/swift,airspeedswift\/swift,kstaring\/swift,modocache\/swift,sschiau\/swift,jtbandes\/swift,slavapestov\/swift,kstaring\/swift,danielmartin\/swift,devincoughlin\/swift,kentya6\/swift,sdulal\/swift,modocache\/swift,hughbe\/swift,milseman\/swift,tjw\/swift,xedin\/swift,kusl\/swift,sdulal\/swift,SwiftAndroid\/swift,nathawes\/swift,jmgc\/swift,xwu\/swift,dduan\/swift,kentya6\/swift,tinysun212\/swift-windows,Ivacker\/swift,johnno1962d\/swift,tjw\/swift,tardieu\/swift,slavapestov\/swift,tardieu\/swift,alblue\/swift,kusl\/swift,mightydeveloper\/swift,djwbrown\/swift,xwu\/swift,SwiftAndroid\/swift,cbrentharris\/swift,practicalswift\/swift,gmilos\/swift,swiftix\/swift.old,brentdax\/swift,slavapestov\/swift,IngmarStein\/swift,arvedviehweger\/swift,stephentyrone\/swift,ben-ng\/swift,JGiola\/swift,karwa\/swift,KrishMunot\/swift,danielmartin\/swift,xedin\/swift,tkremenek\/swift,gribozavr\/swift,swiftix\/swift.old,Ivacker\/swift,shajrawi\/swift,swiftix\/swift,atrick\/swift,return\/swift,brentdax\/swift,kusl\/swift,allevato\/swift,austinzheng\/swift,shahmishal\/swift,uasys\/swift,austinzheng\/swift,devincoughlin\/swift,karwa\/swift,sdulal\/swift,milseman\/swift,zisko\/swift,kusl\/swift,gribozavr\/swift,frootloops\/swift,sdulal\/swift,codestergit\/swift,therealbnut\/swift,gregomni\/swift,gribozavr\/swift,sschiau\/swift,parkera\/swift,tkremenek\/swift,IngmarStein\/swift,parkera\/swift,shahmishal\/swift,Jnosh\/swift,alblue\/swift,kperryua\/swift,bitjammer\/swift,adrfer\/swift,apple\/swift,KrishMunot\/swift,huonw\/swift,jtbandes\/swift,felix91gr\/swift,SwiftAndroid\/swift,JGiola\/swift,gmilos\/swift,arvedviehweger\/swift,harlanhaskins\/swift,slavapestov\/swift,benlangmuir\/swift,kusl\/swift,IngmarStein\/swift,hughbe\/swift,xwu\/swift,khizkhiz\/swift,kperryua\/swift,stephentyrone\/swift,jopamer\/swift,therealbnut\/swift,atrick\/swift,kentya6\/swift,ahoppen\/swift,LeoShimonaka\/swift,allevato\/swift,jmgc\/swift,manavgabhawala\/swift,karwa\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Sema\/TypeChecker.h\n+++ lib\/Sema\/TypeChecker.h\n@@ -99,7 +99,7 @@\n friend class TypeChecker;\n \n public:\n- typedef SmallVector<ValueDecl *, 4>::iterator iterator;\n+ typedef SmallVectorImpl<ValueDecl *>::iterator iterator;\n iterator begin() { return Results.begin(); }\n iterator end() { return Results.end(); }\n unsigned size() const { return Results.size(); }\n@@ -126,7 +126,7 @@\n friend class TypeChecker;\n \n public:\n- typedef SmallVector<std::pair<TypeDecl *, Type>, 4>::iterator iterator;\n+ typedef SmallVectorImpl<std::pair<TypeDecl *, Type>>::iterator iterator;\n iterator begin() { return Results.begin(); }\n iterator end() { return Results.end(); }\n unsigned size() const { return Results.size(); }\n"} {"commit":"d9e7afeeb195620ee48bd97c65dd66167837939a","subject":"work except if not found","message":"work except if not found","repos":"muharif\/vpp,muharif\/vpp,muharif\/vpp,muharif\/vpp,muharif\/vpp,muharif\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/berhasil1June2\/class\/node.c\n+++ plugins\/berhasil1June2\/class\/node.c\n@@ -246,7 +246,7 @@\n \t x=x0*field;\n \t next_table=0;\n \n- \/\/Check only the field that want to be checked\n+ \/\/Check only the field that want to be checked, tes\n \n \t if (table_index0==0) {\n \t \t if (e0->src1==0) {\n"} {"commit":"5c4bd7bd4309df14bbffbecc587ed0d3ec526891","subject":"Remove unnecessary inclusion of stdio.h in c segmenter.","message":"Remove unnecessary inclusion of stdio.h in c segmenter.\n","repos":"talkhouse\/noyes,talkhouse\/noyes,talkhouse\/noyes","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/cext\/c_segmenter.c\n+++ lib\/cext\/c_segmenter.c\n@@ -20,7 +20,6 @@\n \n #define MIN_SEGMENTS 3\n \n-#include \"stdio.h\"\n Cmat * segmenter_apply(Segmenter* self, Carr *data) {\n double * combo;\n int combolen = 0;\n"} {"commit":"3f4c3f830369cec99588171c6249f69ff0ce52b4","subject":"added convenients functions for output","message":"added convenients functions for output\n","repos":"ulno\/ulnoiot,ulno\/ulnoiot,ulno\/ulnoiot,ulno\/ulnoiot,ulno\/ulnoiot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/node_types\/esp8266\/src\/output.h\n+++ lib\/node_types\/esp8266\/src\/output.h\n@@ -42,6 +42,13 @@\n measured_value().from(_low);\n }\n void off() { low(); }\n+\n+ bool is_high() {\n+ return value().equals(_high);\n+ }\n+ bool is_low() {\n+ return value().equals(_low);\n+ }\n \/\/ TODO: set output \"floating\"?\n };\n \n"} {"commit":"b34e17cfacc9fda0b7e999d896ffffa2dd2a4660","subject":"Playing around with throttling options","message":"Playing around with throttling options\n","repos":"boazsegev\/facil.io,boazsegev\/facil.io","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/facil\/core\/defer.c\n+++ lib\/facil\/core\/defer.c\n@@ -128,8 +128,8 @@\n static inline task_s pop_task(void) {\n task_s ret = (task_s){.func = NULL};\n queue_block_s *to_free = NULL;\n- \/* lock the state machine, to grab\/create a task and place it at the tail\n- *\/ spn_lock(&deferred.lock);\n+ \/* lock the state machine, grab\/create a task and place it at the tail *\/\n+ spn_lock(&deferred.lock);\n \n \/* empty? *\/\n if (deferred.reader->write == deferred.reader->read &&\n@@ -305,14 +305,27 @@\n *\/\n #pragma weak defer_thread_wait\n void defer_thread_wait(pool_pt pool, void *p_thr) {\n- size_t throttle =\n- pool ? ((pool->count) * DEFER_THROTTLE) : DEFER_THROTTLE_LIMIT;\n- if (!throttle || throttle > DEFER_THROTTLE_LIMIT)\n- throttle = DEFER_THROTTLE_LIMIT;\n- if (throttle == DEFER_THROTTLE)\n- throttle <<= 1;\n- throttle_thread(throttle);\n- (void)p_thr;\n+ if (0) {\n+ \/* keeps threads active (concurrent), but reduces performance *\/\n+ _Thread_local static size_t static_throttle = 1;\n+ if (static_throttle < DEFER_THROTTLE_LIMIT)\n+ static_throttle = (static_throttle << 1);\n+ throttle_thread(static_throttle);\n+ if (defer_has_queue())\n+ static_throttle = 1;\n+ (void)p_thr;\n+ (void)pool;\n+ } else {\n+ \/* Protects against slow user code, but mostly a single active thread *\/\n+ size_t throttle =\n+ pool ? ((pool->count) * DEFER_THROTTLE) : DEFER_THROTTLE_LIMIT;\n+ if (!throttle || throttle > DEFER_THROTTLE_LIMIT)\n+ throttle = DEFER_THROTTLE_LIMIT;\n+ if (throttle == DEFER_THROTTLE)\n+ throttle <<= 1;\n+ throttle_thread(throttle);\n+ (void)p_thr;\n+ }\n }\n \n \/**\n"} {"commit":"1e9366cfcbfe32afea62db03f480f97a9195f767","subject":"Unconditionnaly close the connections after the grace period","message":"Unconditionnaly close the connections after the grace period\n","repos":"zlm2012\/h2o,cwyang\/h2o,devnexen\/h2o,devnexen\/h2o,devnexen\/h2o,i110\/h2o,cwyang\/h2o,deweerdt\/h2o,deweerdt\/h2o,cwyang\/h2o,yannick\/h2o,lkwg82\/h2o,h2o\/h2o,zlm2012\/h2o,yannick\/h2o,rayrapetyan\/h2o,cubicdaiya\/h2o,yannick\/h2o,cubicdaiya\/h2o,yannick\/h2o,h2o\/h2o,rayrapetyan\/h2o,cwyang\/h2o,rayrapetyan\/h2o,devnexen\/h2o,devnexen\/h2o,i110\/h2o,yannick\/h2o,h2o\/h2o,lkwg82\/h2o,lkwg82\/h2o,rayrapetyan\/h2o,i110\/h2o,h2o\/h2o,cubicdaiya\/h2o,devnexen\/h2o,deweerdt\/h2o,i110\/h2o,i110\/h2o,cubicdaiya\/h2o,i110\/h2o,rayrapetyan\/h2o,lkwg82\/h2o,rayrapetyan\/h2o,devnexen\/h2o,yannick\/h2o,deweerdt\/h2o,deweerdt\/h2o,cwyang\/h2o,devnexen\/h2o,deweerdt\/h2o,zlm2012\/h2o,lkwg82\/h2o,h2o\/h2o,i110\/h2o,zlm2012\/h2o,i110\/h2o,cubicdaiya\/h2o,rayrapetyan\/h2o,zlm2012\/h2o,yannick\/h2o,zlm2012\/h2o,cubicdaiya\/h2o,cubicdaiya\/h2o,cwyang\/h2o,zlm2012\/h2o,lkwg82\/h2o,rayrapetyan\/h2o,zlm2012\/h2o,lkwg82\/h2o,h2o\/h2o,deweerdt\/h2o,yannick\/h2o,cubicdaiya\/h2o,cwyang\/h2o,h2o\/h2o,deweerdt\/h2o,lkwg82\/h2o,cwyang\/h2o,lkwg82\/h2o,rayrapetyan\/h2o,devnexen\/h2o,i110\/h2o,i110\/h2o,h2o\/h2o,zlm2012\/h2o,deweerdt\/h2o,h2o\/h2o,rayrapetyan\/h2o,yannick\/h2o","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/http2\/connection.c\n+++ lib\/http2\/connection.c\n@@ -90,9 +90,7 @@\n for (node = ctx->http2._conns.next; node != &ctx->http2._conns; node = next) {\n h2o_http2_conn_t *conn = H2O_STRUCT_FROM_MEMBER(h2o_http2_conn_t, _conns, node);\n next = node->next;\n- if (conn->state < H2O_HTTP2_CONN_STATE_IS_CLOSING) {\n- close_connection(conn);\n- }\n+ close_connection(conn);\n }\n }\n \n"} {"commit":"0191211ce542795db1c05f5f65cef573672533de","subject":"Casting void * to unsigned long works better than casting to isc_uint32_t","message":"Casting void * to unsigned long works better than casting to isc_uint32_t\n","repos":"pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- lib\/isc\/unix\/entropy.c\n+++ lib\/isc\/unix\/entropy.c\n@@ -15,7 +15,7 @@\n * SOFTWARE.\n *\/\n \n-\/* $Id: entropy.c,v 1.44 2000\/06\/23 22:06:47 tale Exp $ *\/\n+\/* $Id: entropy.c,v 1.45 2000\/06\/26 18:41:06 bwelling Exp $ *\/\n \n #include <config.h>\n \n@@ -289,10 +289,10 @@\n \t\t isc_uint32_t entropy)\n {\n \tisc_uint32_t val;\n-\tisc_uint32_t addr;\n+\tunsigned long addr;\n \tisc_uint8_t *buf;\n \n-\taddr = (isc_uint32_t)p;\n+\taddr = (unsigned long)p;\n \tbuf = p;\n \n \tif ((addr & 0x03) != 0) {\n"} {"commit":"f148623ce2d8af53d2d0fb2989813499c30f2e16","subject":"update copyright notice","message":"update copyright notice\n","repos":"each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- lib\/isc\/win32\/unistd.h\n+++ lib\/isc\/win32\/unistd.h\n@@ -1,5 +1,5 @@\n \/*\n- * Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. (\"ISC\")\n+ * Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. (\"ISC\")\n * Copyright (C) 2000, 2001 Internet Software Consortium.\n *\n * Permission to use, copy, modify, and\/or distribute this software for any\n@@ -15,7 +15,7 @@\n * PERFORMANCE OF THIS SOFTWARE.\n *\/\n \n-\/* $Id: unistd.h,v 1.7 2008\/01\/23 03:10:48 marka Exp $ *\/\n+\/* $Id: unistd.h,v 1.8 2008\/01\/23 03:22:43 tbox Exp $ *\/\n \n \/* None of these are defined in NT, so define them for our use *\/\n #define O_NONBLOCK 1\n@@ -31,7 +31,7 @@\n \/*\n * Enough problems not having full fcntl() without worrying about this!\n *\/\n-#undef F_DUPFD \n+#undef F_DUPFD\n \n int fcntl(int, int, ...);\n \n"} {"commit":"d5a4f6e3ee9c9caecbb46e475b5c1f9d91cfd0d3","subject":"removed a warning","message":"removed a warning\n","repos":"anrl\/JAM,anrl\/JAM,anrl\/JAM,anrl\/JAM,anrl\/JAM,anrl\/JAM","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/jamrun\/jxereader.c\n+++ lib\/jamrun\/jxereader.c\n@@ -67,7 +67,7 @@\n \n a = archive_read_new();\n archive_read_support_format_all(a);\n- archive_read_support_compression_all(a);\n+ archive_read_support_filter_all(a);\n ext = archive_write_disk_new();\n archive_write_disk_set_options(ext, flags);\n archive_write_disk_set_standard_lookup(ext);\n"} {"commit":"4f5371a236bf4f5c62b0f1033c51849bafe87b2c","subject":"sbrk: fixing bug with the goffset calculation and using large pages","message":"sbrk: fixing bug with the goffset calculation and using large pages\n\nSigned-off-by: Reto Achermann <66f6ea3e040423755b3cf26edfe6c7fb1f9adc27@inf.ethz.ch>\n","repos":"BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish,BarrelfishOS\/barrelfish,kishoredbn\/barrelfish","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/posixcompat\/sbrk.c\n+++ lib\/posixcompat\/sbrk.c\n@@ -12,10 +12,15 @@\n \n #if __SIZEOF_POINTER__ == 8\n \/\/need lot of memory...\n-#define SBRK_REGION_BYTES (1*256*1024UL * BASE_PAGE_SIZE)\n+#define SBRK_REGION_BYTES (8UL * 512UL * LARGE_PAGE_SIZE)\n+#define SBRK_FLAGS (VREGION_FLAGS_READ_WRITE | VREGION_FLAGS_LARGE)\n+#define SBRK_MIN_MAPPING (16 * LARGE_PAGE_SIZE)\n #else \/\/ still huge, but slightly more achievable in a 32-bit address space!\n-#define SBRK_REGION_BYTES (256 * 1024 * 1024)\n+#define SBRK_REGION_BYTES (64 * 1024 * BASE_PAGE_SIZE)\n+#define SBRK_FLAGS (VREGION_FLAGS_READ_WRITE | VREGION_FLAGS_LARGE)\n+#define SBRK_MIN_MAPPING (2 * BASE_PAGE_SIZE)\n #endif\n+\n \n void *sbrk(intptr_t increment)\n {\n@@ -33,13 +38,17 @@\n if (!memobj) { \/\/ Initialize\n err = vspace_map_anon_nomalloc(&base, &memobj_, &vregion_,\n SBRK_REGION_BYTES, NULL,\n- VREGION_FLAGS_READ_WRITE, 0);\n+ SBRK_FLAGS, SBRK_REGION_BYTES);\n if (err_is_fail(err)) {\n DEBUG_ERR(err, \"vspace_map_anon_nomalloc failed\");\n return (void *)-1;\n }\n memobj = (struct memobj *) &memobj_;\n vregion = &vregion_;\n+\n+ \/\/debug_printf(\"%s:%u reserved region: %p..%p\\n\", __FUNCTION__, __LINE__,\n+ \/\/ base, base + SBRK_REGION_BYTES);\n+\n }\n \n if (increment < 0) {\n@@ -67,7 +76,10 @@\n }\n \n size_t inc_bytes = offset + increment - goffset;\n- orig_offset = offset;\n+ if (inc_bytes < SBRK_MIN_MAPPING) {\n+ inc_bytes = SBRK_MIN_MAPPING;\n+ }\n+\n \n struct capref frame;\n err = frame_alloc(&frame, inc_bytes, &inc_bytes);\n@@ -84,14 +96,17 @@\n }\n \n err = memobj->f.pagefault(memobj, vregion, goffset, 0);\n- goffset += inc_bytes;\n- offset = goffset;\n if (err_is_fail(err)) {\n debug_err(__FILE__, __func__, __LINE__, err,\n \"memobj->f.pagefault failed\");\n return (void *)-1;\n }\n \n+ goffset += inc_bytes;\n+\n+ orig_offset = offset;\n+ offset += increment;\n+\n void *ret = base + orig_offset;\n return ret;\n }\n"} {"commit":"0793577a39713446bc95514a652c5341dce56efb","subject":"PUD: only do a single loopback","message":"PUD: only do a single loopback\n\nSigned-off-by: Ferry Huberts <1f083df4a0371a8eba2ce71fc6b0e214b2551710@mindef.nl>\n","repos":"ninuxorg\/olsrd,diogomg\/olsrd-binary-heap,servalproject\/olsr,duydb2\/olsr,cholin\/olsrd,diogomg\/olsrd,zioproto\/olsrd,zioproto\/olsrd-gsoc2012,ninuxorg\/olsrd,acinonyx\/olsrd,cholin\/olsrd,duydb2\/olsr,sebkur\/olsrd,duydb2\/olsr,nolith\/olsrd,nolith\/olsrd,diogomg\/olsrd-binary-heap,zioproto\/olsrd,zioproto\/olsrd,duydb2\/olsr,duydb2\/olsr,zioproto\/olsrd,tdz\/olsrd,nolith\/olsrd,acinonyx\/olsrd,diogomg\/olsrd,zioproto\/olsrd,sebkur\/olsrd,acinonyx\/olsrd,diogomg\/olsrd-binary-heap,sebkur\/olsrd,tdz\/olsrd,servalproject\/olsr,servalproject\/olsr,nolith\/olsrd,zioproto\/olsrd-gsoc2012,cholin\/olsrd,ninuxorg\/olsrd,zioproto\/olsrd-gsoc2012,acinonyx\/olsrd,sebkur\/olsrd,diogomg\/olsrd-binary-heap,zioproto\/olsrd-gsoc2012,sebkur\/olsrd,diogomg\/olsrd-binary-heap,tdz\/olsrd,zioproto\/olsrd-gsoc2012,duydb2\/olsr,servalproject\/olsr,diogomg\/olsrd,servalproject\/olsr,zioproto\/olsrd-gsoc2012,diogomg\/olsrd-binary-heap,diogomg\/olsrd-binary-heap,nolith\/olsrd,sebkur\/olsrd,tdz\/olsrd,ninuxorg\/olsrd,diogomg\/olsrd,ninuxorg\/olsrd,duydb2\/olsr,servalproject\/olsr,cholin\/olsrd,tdz\/olsrd,diogomg\/olsrd,cholin\/olsrd,duydb2\/olsr,acinonyx\/olsrd,diogomg\/olsrd,diogomg\/olsrd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/pud\/src\/receiver.c\n+++ lib\/pud\/src\/receiver.c\n@@ -209,12 +209,6 @@\n \t\tstruct interface *ifn;\n \t\tfor (ifn = ifnet; ifn; ifn = ifn->int_next) {\n \t\t\tnodeIdPreTransmitHook((union olsr_message *) txBuffer, ifn);\n-\n-\t\t\t\/* loopback to tx interface when so configured *\/\n-\t\t\tif (getUseLoopback()) {\n-\t\t\t\t(void) packetReceivedFromOlsr(\n-\t\t\t\t\t\t(union olsr_message *) &txBuffer[0], NULL, NULL);\n-\t\t\t}\n \n #ifdef PUD_DUMP_GPS_PACKETS_TX_OLSR\n \t\t\tolsr_printf(0, \"%s: packet sent to OLSR interface %s (%d bytes)\\n\",\n@@ -233,6 +227,12 @@\n \t\t\t\t\t\t\t\t: (r == 0) ? \"there was not enough room in the buffer\"\n \t\t\t\t\t\t\t\t\t\t: \"unknown reason\"), aligned_size, r);\n \t\t\t}\n+\t\t}\n+\n+\t\t\/* loopback to tx interface when so configured *\/\n+\t\tif (getUseLoopback()) {\n+\t\t\t(void) packetReceivedFromOlsr(\n+\t\t\t\t\t(union olsr_message *) &txBuffer[0], NULL, NULL);\n \t\t}\n \t}\n }\n"} {"commit":"f971fe29b14eedd4abc389593b77fbdf94ac2d59","subject":"Btrfs: wake up delayed ref flushing waiters on abort","message":"Btrfs: wake up delayed ref flushing waiters on abort\n\nI hit a deadlock because we aborted when flushing delayed refs but didn't wake\nany of the other flushers up and so everybody was just sleeping forever. This\nshould fix the problem. Thanks,\n\nSigned-off-by: Josef Bacik <631dfb3d07694fdcf26abc7aac2c6c2b641f8bde@fusionio.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- fs\/btrfs\/extent-tree.c\n+++ fs\/btrfs\/extent-tree.c\n@@ -2629,6 +2629,7 @@\n \t\t\tspin_unlock(&delayed_refs->lock);\n \t\t\tbtrfs_abort_transaction(trans, root, ret);\n \t\t\tatomic_dec(&delayed_refs->procs_running_refs);\n+\t\t\twake_up(&delayed_refs->wait);\n \t\t\treturn ret;\n \t\t}\n \n"} {"commit":"49be4fb9cc3431fc4ebc71c764db848483b2a16c","subject":"overlayfs: embed root into overlay_readdir_data","message":"overlayfs: embed root into overlay_readdir_data\n\nno sense having it a pointer - all instances have it pointing to\nlocal variable in the same stack frame\n\nSigned-off-by: Al Viro <de609eb4d5d70b1d38ec6642adbfc33a2781f63c@zeniv.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"04dd1a0d4b17a71220eae4fb313218f15a49bcdd","subject":"xfs: fix crc field handling in xfs_sb_to\/from_disk","message":"xfs: fix crc field handling in xfs_sb_to\/from_disk\n\nI discovered this in userspace, but the same change applies\nto the kernel.\n\nIf we xfs_mdrestore an image from a non-crc filesystem, lo\nand behold the restored image has gained a CRC:\n\n# db\/xfs_metadump.sh -o \/dev\/sdc1 - | xfs_mdrestore - test.img\n# xfs_db -c \"sb 0\" -c \"p crc\" \/dev\/sdc1\ncrc = 0 (correct)\n# xfs_db -c \"sb 0\" -c \"p crc\" test.img\ncrc = 0xb6f8d6a0 (correct)\n\nThis is because xfs_sb_from_disk doesn't fill in sb_crc,\nbut xfs_sb_to_disk(XFS_SB_ALL_BITS) does write the in-memory\nCRC to disk - so we get uninitialized memory on disk.\n\nFix this by always initializing sb_crc to 0 when we read\nthe superblock, and masking out the CRC bit from ALL_BITS\nwhen we write it.\n\nSigned-off-by: Eric Sandeen <d55521028c14e0f378be5444e4ea388161c0d7e7@redhat.com>\nReviewed-by: Christoph Hellwig <923f7720577207a44b32e59bbfbea59d27f1ae8e@lst.de>\nSigned-off-by: Dave Chinner <aa743a0aaec8f7d7a1f01442503957f4d7a2d634@fromorbit.com>\n\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"5ae16ccb0a4818593a5cc0917acddb573d40ff19","subject":"Modified to handle blowing snow. Modified so that the calculation of sensible heat flux so that occurs in all model versions. This eliminates a problem in WB mode where sensible heat flux was not set to 0, instead it showed the cumulative sensible heat flux from the snowpack.","message":"Modified to handle blowing snow.\nModified so that the calculation of sensible heat flux so that\noccurs in all model versions. This eliminates a problem in\nWB mode where sensible heat flux was not set to 0, instead it\nshowed the cumulative sensible heat flux from the snowpack.\n","repos":"UW-Hydro\/VIC,UW-Hydro\/VIC,UW-Hydro\/VIC","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- func_surf_energy_bal.c\n+++ func_surf_energy_bal.c\n@@ -35,6 +35,8 @@\n even in water balance mode. This assures that it is set\n to 0 in water balance mode and does not yield the \n cumulative sum of sensible heat from the snowpack. KAC\n+ 11-18-02 modified to compute the effects of blowing snow on the\n+ surface energy balance. LCB\n \n **********************************************************************\/\n {\n@@ -121,10 +123,13 @@\n \/* double snow_depth; *\/\n double snow_swq;\n double snow_water;\n+ int LastSnow;\n \n double *deltaCC;\n double *refreeze_energy;\n double *VaporMassFlux;\n+ double *BlowingMassFlux;\n+ double *SurfaceMassFlux;\n \n \/* soil node terms *\/\n int Nnodes;\n@@ -180,6 +185,12 @@\n double *sensible_heat;\n double *snow_flux;\n double *store_error;\n+ double dt;\n+ double SnowDepth;\n+ float lag_one;\n+ float sigma_slope;\n+ float fetch;\n+ int Nveg;\n \n \/* Define internal routine variables *\/\n double Evap;\t\t\/** Total evap in m\/s **\/\n@@ -272,13 +283,15 @@\n melt_energy = (double) va_arg(ap, double);\n snow_coverage = (double) va_arg(ap, double);\n snow_density = (double) va_arg(ap, double);\n-\/* snow_depth = (double) va_arg(ap, double); *\/\n snow_swq = (double) va_arg(ap, double);\n snow_water = (double) va_arg(ap, double);\n-\n+ LastSnow = (int) va_arg(ap, int);\n+ \n deltaCC = (double *) va_arg(ap, double *);\n refreeze_energy = (double *) va_arg(ap, double *);\n VaporMassFlux = (double *) va_arg(ap, double *);\n+ BlowingMassFlux = (double *) va_arg(ap, double *);\n+ SurfaceMassFlux = (double *) va_arg(ap, double *);\n \n \/* soil node terms *\/\n Nnodes = (int) va_arg(ap, int);\n@@ -332,6 +345,12 @@\n sensible_heat = (double *) va_arg(ap, double *);\n snow_flux = (double *) va_arg(ap, double *);\n store_error = (double *) va_arg(ap, double *);\n+ dt = (double) va_arg(ap, double);\n+ SnowDepth = (double) va_arg(ap, double);\n+ lag_one = (float) va_arg(ap, float);\n+ sigma_slope = (float) va_arg(ap, float);\n+ fetch = (float) va_arg(ap, float);\n+ Nveg = (int) va_arg(ap, int);\n \n \/***************\n MAIN ROUTINE\n@@ -538,7 +557,9 @@\n if (INCLUDE_SNOW) {\n latent_heat_from_snow(atmos_density, ice_density, vp, Le, atmos_pressure, \n \t\t\t ra_under, TMean, vpd, &temp_latent_heat, \n-\t\t\t &temp_latent_heat_sub, VaporMassFlux);\n+\t\t\t &temp_latent_heat_sub, VaporMassFlux, BlowingMassFlux, SurfaceMassFlux,\n+\t\t\t dt,Tair, LastSnow, snow_water, wind[2],roughness, ref_height[2],\n+\t\t\t SnowDepth, overstory, lag_one, sigma_slope, fetch, Nveg, iveg);\n *latent_heat += temp_latent_heat * snow_coverage;\n *latent_heat_sub = temp_latent_heat_sub * snow_coverage;\n }\n"} {"commit":"8bbc0cce74849e07f5bcb294f149ed178f19beeb","subject":"use float64_t internally if no speed-loss is to be expected","message":"use float64_t internally if no speed-loss is to be expected\n\nthe adaptormatrix functions (for auto-applying adaptor matrices)\ncan benefit from higher precision. however since this is a time-critical\noperation, we only enable it if we are dealing with doubles anyhow...\n\nthis is related to fixing https:\/\/git.iem.at\/ambisonics\/libambix\/issues\/3\n","repos":"umlaeute\/ambix,iem-projects\/ambix,umlaeute\/ambix,iem-projects\/ambix,kronihias\/libambix,iem-projects\/ambix,kronihias\/libambix,umlaeute\/ambix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libambix\/src\/adaptor.c\n+++ libambix\/src\/adaptor.c\n@@ -87,7 +87,7 @@\n \n \n \n-#define _AMBIX_SPLITADAPTOR_MATRIX(type) \\\n+#define _AMBIX_SPLITADAPTOR_MATRIX(type, sumtype) \\\n ambix_err_t _ambix_splitAdaptormatrix_##type(const type##_t*source, uint32_t sourcechannels, \\\n const ambix_matrix_t*matrix, \\\n type##_t*dest_ambi, type##_t*dest_other, \\\n@@ -100,7 +100,7 @@\n uint32_t outchan, inchan; \\\n const type##_t*src = source+sourcechannels*f; \\\n for(outchan=0; outchan<fullambichannels; outchan++) { \\\n- float32_t sum=0.; \\\n+ sumtype##_t sum=0.; \\\n for(inchan=0; inchan<rawambichannels; inchan++) { \\\n sum+=mtx[outchan][inchan] * src[inchan]; \\\n } \\\n@@ -112,13 +112,13 @@\n return AMBIX_ERR_SUCCESS; \\\n }\n \n-_AMBIX_SPLITADAPTOR_MATRIX(float32);\n-_AMBIX_SPLITADAPTOR_MATRIX(float64);\n+_AMBIX_SPLITADAPTOR_MATRIX(float32, float32);\n+_AMBIX_SPLITADAPTOR_MATRIX(float64, float64);\n \/* both _int16 and _int32 are highly unoptimized!\n * LATER: add some fixed point magic to speed things up\n *\/\n-_AMBIX_SPLITADAPTOR_MATRIX(int32);\n-_AMBIX_SPLITADAPTOR_MATRIX(int16);\n+_AMBIX_SPLITADAPTOR_MATRIX(int32, float32);\n+_AMBIX_SPLITADAPTOR_MATRIX(int16, float32);\n \n #define _AMBIX_MERGEADAPTOR(type) \\\n ambix_err_t _ambix_mergeAdaptor_##type(const type##_t*source1, uint32_t source1channels, \\\n@@ -143,7 +143,7 @@\n \n \/\/#define _AMBIX_MERGEADAPTOR_MATRIX(type) \\\n \n-#define _AMBIX_MERGEADAPTOR_MATRIX(type) \\\n+#define _AMBIX_MERGEADAPTOR_MATRIX(type, sumtype) \\\n ambix_err_t _ambix_mergeAdaptormatrix_##type(const type##_t*ambi_data, const ambix_matrix_t*matrix, \\\n const type##_t*otherdata, uint32_t source2channels, \\\n type##_t*destination, int64_t frames) { \\\n@@ -156,7 +156,7 @@\n uint32_t outchan, inchan; \\\n const type##_t*src = ambi_data+fullambichannels*f; \\\n for(outchan=0; outchan<ambixchannels; outchan++) { \\\n- float32_t sum=0.; \\\n+ sumtype##_t sum=0.; \\\n for(inchan=0; inchan<fullambichannels; inchan++) { \\\n sum+=mtx[outchan][inchan] * src[inchan]; \\\n } \\\n@@ -169,7 +169,7 @@\n return AMBIX_ERR_SUCCESS; \\\n }\n \n-_AMBIX_MERGEADAPTOR_MATRIX(float32);\n-_AMBIX_MERGEADAPTOR_MATRIX(float64);\n-_AMBIX_MERGEADAPTOR_MATRIX(int32);\n-_AMBIX_MERGEADAPTOR_MATRIX(int16);\n+_AMBIX_MERGEADAPTOR_MATRIX(float32, float32);\n+_AMBIX_MERGEADAPTOR_MATRIX(float64, float64);\n+_AMBIX_MERGEADAPTOR_MATRIX(int32, float32);\n+_AMBIX_MERGEADAPTOR_MATRIX(int16, float32);\n"} {"commit":"2c2f77156545e4704c6050d48c76d586ff39c321","subject":"Alpha: fix inline asm with DEC\/Compaq\/HP compiler","message":"Alpha: fix inline asm with DEC\/Compaq\/HP compiler\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@17477 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/alpha\/asm.h\n+++ libavcodec\/alpha\/asm.h\n@@ -158,31 +158,31 @@\n #define ldl(p) (*(const int32_t *) (p))\n #define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0)\n #define stl(l, p) do { *(int32_t *) (p) = (l); } while (0)\n-#define ldq_u(a) __asm__ (\"ldq_u %v0,0(%a0)\", a)\n+#define ldq_u(a) asm (\"ldq_u %v0,0(%a0)\", a)\n #define uldq(a) (*(const __unaligned uint64_t *) (a))\n-#define cmpbge(a, b) __asm__ (\"cmpbge %a0,%a1,%v0\", a, b)\n-#define extql(a, b) __asm__ (\"extql %a0,%a1,%v0\", a, b)\n-#define extwl(a, b) __asm__ (\"extwl %a0,%a1,%v0\", a, b)\n-#define extqh(a, b) __asm__ (\"extqh %a0,%a1,%v0\", a, b)\n-#define zap(a, b) __asm__ (\"zap %a0,%a1,%v0\", a, b)\n-#define zapnot(a, b) __asm__ (\"zapnot %a0,%a1,%v0\", a, b)\n-#define amask(a) __asm__ (\"amask %a0,%v0\", a)\n-#define implver() __asm__ (\"implver %v0\")\n-#define rpcc() __asm__ (\"rpcc %v0\")\n-#define minub8(a, b) __asm__ (\"minub8 %a0,%a1,%v0\", a, b)\n-#define minsb8(a, b) __asm__ (\"minsb8 %a0,%a1,%v0\", a, b)\n-#define minuw4(a, b) __asm__ (\"minuw4 %a0,%a1,%v0\", a, b)\n-#define minsw4(a, b) __asm__ (\"minsw4 %a0,%a1,%v0\", a, b)\n-#define maxub8(a, b) __asm__ (\"maxub8 %a0,%a1,%v0\", a, b)\n-#define maxsb8(a, b) __asm__ (\"maxsb8 %a0,%a1,%v0\", a, b)\n-#define maxuw4(a, b) __asm__ (\"maxuw4 %a0,%a1,%v0\", a, b)\n-#define maxsw4(a, b) __asm__ (\"maxsw4 %a0,%a1,%v0\", a, b)\n-#define perr(a, b) __asm__ (\"perr %a0,%a1,%v0\", a, b)\n-#define pklb(a) __asm__ (\"pklb %a0,%v0\", a)\n-#define pkwb(a) __asm__ (\"pkwb %a0,%v0\", a)\n-#define unpkbl(a) __asm__ (\"unpkbl %a0,%v0\", a)\n-#define unpkbw(a) __asm__ (\"unpkbw %a0,%v0\", a)\n-#define wh64(a) __asm__ (\"wh64 %a0\", a)\n+#define cmpbge(a, b) asm (\"cmpbge %a0,%a1,%v0\", a, b)\n+#define extql(a, b) asm (\"extql %a0,%a1,%v0\", a, b)\n+#define extwl(a, b) asm (\"extwl %a0,%a1,%v0\", a, b)\n+#define extqh(a, b) asm (\"extqh %a0,%a1,%v0\", a, b)\n+#define zap(a, b) asm (\"zap %a0,%a1,%v0\", a, b)\n+#define zapnot(a, b) asm (\"zapnot %a0,%a1,%v0\", a, b)\n+#define amask(a) asm (\"amask %a0,%v0\", a)\n+#define implver() asm (\"implver %v0\")\n+#define rpcc() asm (\"rpcc %v0\")\n+#define minub8(a, b) asm (\"minub8 %a0,%a1,%v0\", a, b)\n+#define minsb8(a, b) asm (\"minsb8 %a0,%a1,%v0\", a, b)\n+#define minuw4(a, b) asm (\"minuw4 %a0,%a1,%v0\", a, b)\n+#define minsw4(a, b) asm (\"minsw4 %a0,%a1,%v0\", a, b)\n+#define maxub8(a, b) asm (\"maxub8 %a0,%a1,%v0\", a, b)\n+#define maxsb8(a, b) asm (\"maxsb8 %a0,%a1,%v0\", a, b)\n+#define maxuw4(a, b) asm (\"maxuw4 %a0,%a1,%v0\", a, b)\n+#define maxsw4(a, b) asm (\"maxsw4 %a0,%a1,%v0\", a, b)\n+#define perr(a, b) asm (\"perr %a0,%a1,%v0\", a, b)\n+#define pklb(a) asm (\"pklb %a0,%v0\", a)\n+#define pkwb(a) asm (\"pkwb %a0,%v0\", a)\n+#define unpkbl(a) asm (\"unpkbl %a0,%v0\", a)\n+#define unpkbw(a) asm (\"unpkbw %a0,%v0\", a)\n+#define wh64(a) asm (\"wh64 %a0\", a)\n \n #else\n #error \"Unknown compiler!\"\n"} {"commit":"58dca3ed0317158feb88cb51aa8c07afdb4c840d","subject":"Remove the getbe16 functions and use the AV_RB16 macro instead. Patch by Ian Caulfield, ian dot caulfield gmail dot com.","message":"Remove the getbe16 functions and use the AV_RB16 macro instead. Patch by Ian\nCaulfield, ian dot caulfield gmail dot com.\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@7768 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/dvdsubdec.c\n+++ libavcodec\/dvdsubdec.c\n@@ -27,11 +27,6 @@\n return 0;\n }\n \n-static uint16_t getbe16(const uint8_t *p)\n-{\n- return (p[0] << 8) | p[1];\n-}\n-\n static int get_nibble(const uint8_t *buf, int nibble_offset)\n {\n return (buf[nibble_offset >> 1] >> ((1 - (nibble_offset & 1)) << 2)) & 0xf;\n@@ -142,10 +137,10 @@\n sub_header->start_display_time = 0;\n sub_header->end_display_time = 0;\n \n- cmd_pos = getbe16(buf + 2);\n+ cmd_pos = AV_RB16(buf + 2);\n while ((cmd_pos + 4) < buf_size) {\n- date = getbe16(buf + cmd_pos);\n- next_cmd_pos = getbe16(buf + cmd_pos + 2);\n+ date = AV_RB16(buf + cmd_pos);\n+ next_cmd_pos = AV_RB16(buf + cmd_pos + 2);\n #ifdef DEBUG\n av_log(NULL, AV_LOG_INFO, \"cmd_pos=0x%04x next=0x%04x date=%d\\n\",\n cmd_pos, next_cmd_pos, date);\n@@ -211,8 +206,8 @@\n case 0x06:\n if ((buf_size - pos) < 4)\n goto fail;\n- offset1 = getbe16(buf + pos);\n- offset2 = getbe16(buf + pos + 2);\n+ offset1 = AV_RB16(buf + pos);\n+ offset2 = AV_RB16(buf + pos + 2);\n #ifdef DEBUG\n av_log(NULL, AV_LOG_INFO, \"offset1=0x%04x offset2=0x%04x\\n\", offset1, offset2);\n #endif\n@@ -438,7 +433,7 @@\n if (pc->packet_index == 0) {\n if (buf_size < 2)\n return 0;\n- pc->packet_len = (buf[0] << 8) | buf[1];\n+ pc->packet_len = AV_RB16(buf);\n av_freep(&pc->packet);\n pc->packet = av_malloc(pc->packet_len);\n }\n"} {"commit":"1a5cd8e147ab42c70fdef4d33c4649a8c5ad4e6d","subject":"const","message":"const\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@11727 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/flicvideo.c\n+++ libavcodec\/flicvideo.c\n@@ -127,7 +127,7 @@\n \n static int flic_decode_frame_8BPP(AVCodecContext *avctx,\n void *data, int *data_size,\n- uint8_t *buf, int buf_size)\n+ const uint8_t *buf, int buf_size)\n {\n FlicDecodeContext *s = avctx->priv_data;\n \n@@ -427,7 +427,7 @@\n \n static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,\n void *data, int *data_size,\n- uint8_t *buf, int buf_size)\n+ const uint8_t *buf, int buf_size)\n {\n \/* Note, the only difference between the 15Bpp and 16Bpp *\/\n \/* Format is the pixel format, the packets are processed the same. *\/\n@@ -692,7 +692,7 @@\n \n static int flic_decode_frame_24BPP(AVCodecContext *avctx,\n void *data, int *data_size,\n- uint8_t *buf, int buf_size)\n+ const uint8_t *buf, int buf_size)\n {\n av_log(avctx, AV_LOG_ERROR, \"24Bpp FLC Unsupported due to lack of test files.\\n\");\n return -1;\n@@ -700,7 +700,7 @@\n \n static int flic_decode_frame(AVCodecContext *avctx,\n void *data, int *data_size,\n- uint8_t *buf, int buf_size)\n+ const uint8_t *buf, int buf_size)\n {\n if (avctx->pix_fmt == PIX_FMT_PAL8) {\n return flic_decode_frame_8BPP(avctx, data, data_size,\n"} {"commit":"ba8d75f94d18119df461248d9286fbe51e632be4","subject":"Set pixel aspect ratio for libxvid wrapper. Patch by Thorsten Jordan tjordanATmacrosystem de","message":"Set pixel aspect ratio for libxvid wrapper.\nPatch by Thorsten Jordan tjordanATmacrosystem de\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@12936 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/libxvidff.c\n+++ libavcodec\/libxvidff.c\n@@ -405,6 +405,17 @@\n xvid_enc_frame.vol_flags = x->vol_flags;\n xvid_enc_frame.motion = x->me_flags;\n xvid_enc_frame.type = XVID_TYPE_AUTO;\n+\n+ \/* Pixel aspect ratio setting *\/\n+ if (avctx->sample_aspect_ratio.num < 1 || avctx->sample_aspect_ratio.num > 255 ||\n+ avctx->sample_aspect_ratio.den < 1 || avctx->sample_aspect_ratio.den > 255) {\n+ av_log(avctx, AV_LOG_ERROR, \"Invalid pixel aspect ratio %i\/%i\\n\",\n+ avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den);\n+ return -1;\n+ }\n+ xvid_enc_frame.par = XVID_PAR_EXT;\n+ xvid_enc_frame.par_width = avctx->sample_aspect_ratio.num;\n+ xvid_enc_frame.par_height = avctx->sample_aspect_ratio.den;\n \n \/* Quant Setting *\/\n if( x->qscale ) xvid_enc_frame.quant = picture->quality \/ FF_QP2LAMBDA;\n"} {"commit":"ef7429a4579db04a420d012f79e2a227c3c342e2","subject":"10000l","message":"10000l\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@2538 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/mpegvideo.h\n+++ libavcodec\/mpegvideo.h\n@@ -196,7 +196,7 @@\n uint16_t *mb_var; \/\/\/< Table for MB variances \n uint16_t *mc_mb_var; \/\/\/< Table for motion compensated MB variances \n uint8_t *mb_mean; \/\/\/< Table for MB luminance \n- int32_t *mb_cmp_score;\t\/\/\/< Table for MB cmp scores, for mb decission \n+ int32_t *mb_cmp_score;\t\/\/\/< Table for MB cmp scores, for mb decission FIXME remove\n int b_frame_score; \/* *\/\n } Picture;\n \n@@ -524,6 +524,7 @@\n int umvplus; \/\/\/< == H263+ && unrestricted_mv \n int h263_aic; \/\/\/< Advanded INTRA Coding (AIC) \n int h263_aic_dir; \/\/\/< AIC direction: 0 = left, 1 = top \n+ int obmc; \/\/\/< overlapped block motion compensation\n \n \/* mpeg4 specific *\/\n int time_increment_resolution;\n"} {"commit":"548f5751ae70e76b0718c25aab32c52fea97e131","subject":"matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr)","message":"matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr)\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@16080 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/matroska.c\n+++ libavformat\/matroska.c\n@@ -23,6 +23,7 @@\n \n const CodecTags ff_mkv_codec_tags[]={\n {\"V_UNCOMPRESSED\" , CODEC_ID_RAWVIDEO},\n+ {\"V_DIRAC\" , CODEC_ID_DIRAC},\n {\"V_MPEG4\/ISO\/ASP\" , CODEC_ID_MPEG4},\n {\"V_MPEG4\/ISO\/SP\" , CODEC_ID_MPEG4},\n {\"V_MPEG4\/ISO\/AP\" , CODEC_ID_MPEG4},\n"} {"commit":"5b96ef9b65bfa78d158d55ef94a876c30b5e335c","subject":"_vfprintf.c: get rid of __STDIO_PRINTF_FLOAT","message":"_vfprintf.c: get rid of __STDIO_PRINTF_FLOAT\n\nRely completely on the configuration options chosen,\nin this case on UCLIBC_HAS_FLOATS.\n\nSigned-off-by: Peter S. Mazinger <1f4071d9f342c1637b13af9bc258f2ff72e96758@gmx.net>\nSigned-off-by: Bernhard Reutner-Fischer <ce1ac9e9ad16abccd7821f371ad381197b4768ac@gmail.com>\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/stdio\/_vfprintf.c\n+++ libc\/stdio\/_vfprintf.c\n@@ -125,30 +125,19 @@\n \/**********************************************************************\/\n \/* These provide some control over printf's feature set *\/\n \n-\/* This is undefined below depeding on uClibc's configuration. *\/\n-#define __STDIO_PRINTF_FLOAT 1\n-\n-\/* Now controlled by uClibc_stdio.h. *\/\n+\/* Now controlled by uClibc_config.h. *\/\n+\/* #define __UCLIBC_HAS_FLOATS__ 1 *\/\n+\n+\/* Now controlled by uClibc_config.h. *\/\n \/* #define __UCLIBC_HAS_PRINTF_M_SPEC__ *\/\n \n \n \/**********************************************************************\/\n \n-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_FLOATS__)\n-# undef __STDIO_PRINTF_FLOAT\n-#endif\n-\n-#ifdef __BCC__\n-# undef __STDIO_PRINTF_FLOAT\n-#endif\n-\n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n # include <float.h>\n # include <bits\/uClibc_fpmax.h>\n-#else\n-# undef L__fpmaxtostr\n-#endif\n-\n+#endif\n \n #undef __STDIO_HAS_VSNPRINTF\n #if defined(__STDIO_BUFFERS) || defined(__USE_OLD_VFPRINTF__) || defined(__UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__)\n@@ -360,7 +349,7 @@\n # ifdef ULLONG_MAX\n \tunsigned long long ull;\n # endif\n-# ifdef __STDIO_PRINTF_FLOAT\n+# ifdef __UCLIBC_HAS_FLOATS__\n \tdouble d;\n \tlong double ld;\n # endif\n@@ -397,7 +386,7 @@\n \/* TODO: fix printf to return 0 and set errno if format error. Standard says\n only returns -1 if sets error indicator for the stream. *\/\n \n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len,\n \t\t\t\t\t\t\t\tintptr_t buf);\n \n@@ -649,7 +638,7 @@\n \t\t\t\t\t\/* we're assuming wchar_t is at least an int *\/\n \t\t\t\t\tGET_VA_ARG(p,wc,wchar_t,ppfs->arg);\n \t\t\t\t\tbreak;\n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \t\t\t\t\t\/* PA_FLOAT *\/\n \t\t\t\tcase PA_DOUBLE:\n \t\t\t\t\tGET_VA_ARG(p,d,double,ppfs->arg);\n@@ -657,12 +646,12 @@\n \t\t\t\tcase (PA_DOUBLE|PA_FLAG_LONG_DOUBLE):\n \t\t\t\t\tGET_VA_ARG(p,ld,long double,ppfs->arg);\n \t\t\t\t\tbreak;\n-#else \/* __STDIO_PRINTF_FLOAT *\/\n+#else \/* __UCLIBC_HAS_FLOATS__ *\/\n \t\t\t\tcase PA_DOUBLE:\n \t\t\t\tcase (PA_DOUBLE|PA_FLAG_LONG_DOUBLE):\n \t\t\t\t\tassert(0);\n \t\t\t\t\tcontinue;\n-#endif \/* __STDIO_PRINTF_FLOAT *\/\n+#endif \/* __UCLIBC_HAS_FLOATS__ *\/\n \t\t\t\tdefault:\n \t\t\t\t\t\/* TODO -- really need to ensure this can't happen *\/\n \t\t\t\t\tassert(ppfs->argtype[i-1] & PA_FLAG_PTR);\n@@ -739,7 +728,7 @@\n \tPA_INT|PA_FLAG_LONG,\n \tPA_INT|PA_FLAG_LONG_LONG,\n \tPA_WCHAR,\n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \t\/* PA_FLOAT, *\/\n \tPA_DOUBLE,\n \tPA_DOUBLE|PA_FLAG_LONG_DOUBLE,\n@@ -762,7 +751,7 @@\n \tPROMOTED_SIZE_OF(long),\t\t\/* TODO -- is this correct? (above too) *\/\n #endif\n \tPROMOTED_SIZE_OF(wchar_t),\n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \t\/* PROMOTED_SIZE_OF(float), *\/\n \tPROMOTED_SIZE_OF(double),\n \tPROMOTED_SIZE_OF(long double),\n@@ -1195,7 +1184,7 @@\n #define _outnstr(stream, string, len)\t((len > 0) ? __stdio_fwrite((const unsigned char *)(string), len, stream) : 0)\n #define FP_OUT _fp_out_narrow\n \n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \n static size_t _fp_out_narrow(FILE *fp, intptr_t type, intptr_t len, intptr_t buf)\n {\n@@ -1215,7 +1204,7 @@\n \treturn r + OUTNSTR(fp, (const char *) buf, len);\n }\n \n-#endif \/* __STDIO_PRINTF_FLOAT *\/\n+#endif \/* __UCLIBC_HAS_FLOATS__ *\/\n \n #else \/* L__vfprintf_internal *\/\n \n@@ -1257,7 +1246,7 @@\n \treturn wclen - todo;\n }\n \n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \n #ifdef __UCLIBC_MJN3_ONLY__\n #warning TODO: Move defines from _fpmaxtostr. Put them in a common header.\n@@ -1314,7 +1303,7 @@\n \treturn r;\n }\n \n-#endif \/* __STDIO_PRINTF_FLOAT *\/\n+#endif \/* __UCLIBC_HAS_FLOATS__ *\/\n \n static int _ppwfs_init(register ppfs_t *ppfs, const wchar_t *fmt0)\n {\n@@ -1604,7 +1593,7 @@\n \t\t\t}\n \t\t\tnumfill = ((numfill > SLEN) ? numfill - SLEN : 0);\n \t\t} else if (ppfs->conv_num <= CONV_A) {\t\/* floating point *\/\n-#ifdef __STDIO_PRINTF_FLOAT\n+#ifdef __UCLIBC_HAS_FLOATS__\n \t\t\tssize_t nf;\n \t\t\tnf = _fpmaxtostr(stream,\n \t\t\t\t\t\t\t (__fpmax_t)\n@@ -1618,7 +1607,7 @@\n \t\t\t*count += nf;\n \n \t\t\treturn 0;\n-#else \/* __STDIO_PRINTF_FLOAT *\/\n+#else \/* __UCLIBC_HAS_FLOATS__ *\/\n \t\t\treturn -1;\t\t\t\/* TODO -- try to continue? *\/\n #endif\n \t\t} else if (ppfs->conv_num <= CONV_S) {\t\/* wide char or string *\/\n"} {"commit":"1cd2c20dee7bd927500a6f75991b72d2131f1612","subject":"BlockHash: Drop more options","message":"BlockHash: Drop more options\n","repos":"johnpeter66\/ethminer,johnpeter66\/ethminer,johnpeter66\/ethminer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libethcore\/BlockInfo.h\n+++ libethcore\/BlockInfo.h\n@@ -44,14 +44,9 @@\n enum Strictness\n {\n \tCheckEverything,\n-\tJustSeal,\n-\tQuickNonce,\n \tIgnoreSeal,\n \tCheckNothing\n };\n-\n-DEV_SIMPLE_EXCEPTION(NoHashRecorded);\n-DEV_SIMPLE_EXCEPTION(GenesisBlockCannotBeCalculated);\n \n \/** @brief Encapsulation of a block header.\n * Class to contain all of a block header's data. It is able to parse a block header and populate\n@@ -128,7 +123,6 @@\n \n \t\/\/\/ sha3 of the header only.\n \th256 const& hashWithout() const;\n-\th256 const& hash() const { if (m_hash) return m_hash; BOOST_THROW_EXCEPTION(NoHashRecorded()); }\n \n \tvoid clear();\n \tvoid noteDirty() const { m_hashWithout = m_boundary = m_hash = h256(); }\n"} {"commit":"48859413cdeec6161df494fba1da66bead5b8ee3","subject":"Discard any messages which are buffered on the routing socket before using it otherwise the response to one of our routing messages could be lost due to buffer overflow.","message":"Discard any messages which are buffered on the routing socket before using\nit otherwise the response to one of our routing messages could be lost due\nto buffer overflow.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libexec\/bootpd\/rtmsg.c\n+++ libexec\/bootpd\/rtmsg.c\n@@ -39,7 +39,7 @@\n \n \/*\n * from arp.c\t8.2 (Berkeley) 1\/2\/94\n- * $Id: rtmsg.c,v 1.1.1.1 1994\/09\/30 05:45:06 pst Exp $\n+ * $Id: rtmsg.c,v 1.2 1995\/01\/16 18:57:45 dfr Exp $\n *\/\n \n #include <sys\/param.h>\n@@ -50,6 +50,7 @@\n #if BSD >= 199306\n \n #include <sys\/socket.h>\n+#include <sys\/filio.h>\n \n #include <net\/if.h>\n #include <net\/if_dl.h>\n@@ -84,6 +85,18 @@\n \t\tif (s < 0) {\n \t\t\treport(LOG_ERR, \"socket %s\", strerror(errno));\n \t\t\texit(1);\n+\t\t}\n+\t} else {\n+\t\t\/*\n+\t\t * Drain the socket of any unwanted routing messages.\n+\t\t *\/\n+\t\tint n;\n+\t\tchar buf[512];\n+\n+\t\tioctl(s, FIONREAD, &n);\n+\t\twhile (n > 0) {\n+\t\t\tread(s, buf, sizeof buf);\n+\t\t\tioctl(s, FIONREAD, &n);\n \t\t}\n \t}\n }\n@@ -228,7 +241,7 @@\n \t}\n \tdo {\n \t\tl = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));\n-\t} while (l > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != getpid()));\n+\t} while (l > 0 && (rtm->rtm_type != cmd || rtm->rtm_seq != seq || rtm->rtm_pid != getpid()));\n \tif (l < 0)\n \t\treport(LOG_WARNING, \"arp: read from routing socket: %s\\n\",\n \t\t strerror(errno));\n"} {"commit":"18cb5987899337a9770e9670af14acb8789586e5","subject":"do not memmove if i was the last slot, since it is already gone (and we get -1*sizeof(ExifEntry*) as size)","message":"do not memmove if i was the last slot, since it\nis already gone (and we get -1*sizeof(ExifEntry*)\nas size)\n","repos":"libexif\/libexif,libexif\/libexif,libexif\/libexif","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libexif\/exif-content.c\n+++ libexif\/exif-content.c\n@@ -175,7 +175,8 @@\n \t\t}\n \t\tc->entries = t;\n \t\tc->count--;\n-\t\tmemmove (&t[i], &t[i + 1], sizeof (ExifEntry*) * (c->count - i - 1));\n+\t\tif (i!=c->count) \/* we deallocated the last slot already *\/ \n+\t\t\tmemmove (&t[i], &t[i + 1], sizeof (ExifEntry*) * (c->count - i - 1));\n \t\tt[c->count-1] = temp;\n \t} else {\n \t\texif_mem_free (c->priv->mem, c->entries);\n"} {"commit":"0b67d13230a8ce7770193ab375a8ff6363bb7e42","subject":"runtime: Use a struct, not void, for an empty struct for libffi.","message":"runtime: Use a struct, not void, for an empty struct for libffi.\n\nA recent libffi upgrade caused the reflect test to fail on\n386. The problem case is a function that returns an empty\nstruct--a struct with no fields. The libffi library does not\nrecognize the existence of empty structs, presumably since\nthey can't happen in C. To work around this, the Go interface\nto the libffi library changes an empty struct to void. This\nnormally works fine, but with the new libffi upgrade it fails\nfor a function that returns an empty struct. On 386 a\nfunction that returns a struct is expected to pop the hidden\npointer when it returns. So when we convert an empty struct\nto void, libffi is calling a function that pops the hidden\npointer but does not expect that to happen.\n\nIn the older version of libffi, this didn't matter, because\nthe libffi code for 386 used a frame pointer, so the fact that\nthe stack pointer was wonky when the function returned was\nignored as the stack pointer was immediately replaced by the\nsaved frame pointer. In the newer version of libffi, the 386\ncode is more efficient and does not use a frame pointer, and\ntherefore it matters whether libffi expects the function to\npop the hidden pointer or not.\n\nThis patch changes libgo to convert an empty to a struct with\na single field of type void. This seems to be enough to get\nthe test cases working again.\n\nOf course the real fix would be to change libffi to handle\nempty types, but as libffi uses size == 0 as a marker for an\nuninitialized type, that would be a non-trivial change.\n\nR=iant\nCC=gofrontend-dev\nhttps:\/\/golang.org\/cl\/192310043\n","repos":"anlhord\/gofrontend,anlhord\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,golang\/gofrontend,qskycolor\/gofrontend","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libgo\/runtime\/go-ffi.c\n+++ libgo\/runtime\/go-ffi.c\n@@ -52,6 +52,14 @@\n ret = (ffi_type *) __go_alloc (sizeof (ffi_type));\n ret->type = FFI_TYPE_STRUCT;\n len = descriptor->__len;\n+ if (len == 0)\n+ {\n+ \/* The libffi library won't accept an empty struct. *\/\n+ ret->elements = (ffi_type **) __go_alloc (2 * sizeof (ffi_type *));\n+ ret->elements[0] = &ffi_type_void;\n+ ret->elements[1] = NULL;\n+ return ret;\n+ }\n ret->elements = (ffi_type **) __go_alloc ((len + 1) * sizeof (ffi_type *));\n element = go_type_to_ffi (descriptor->__element_type);\n for (i = 0; i < len; ++i)\n@@ -92,11 +100,16 @@\n int i;\n \n field_count = descriptor->__fields.__count;\n- if (field_count == 0) {\n- return &ffi_type_void;\n- }\n- ret = (ffi_type *) __go_alloc (sizeof (ffi_type));\n- ret->type = FFI_TYPE_STRUCT;\n+ ret = (ffi_type *) __go_alloc (sizeof (ffi_type));\n+ ret->type = FFI_TYPE_STRUCT;\n+ if (field_count == 0)\n+ {\n+ \/* The libffi library won't accept an empty struct. *\/\n+ ret->elements = (ffi_type **) __go_alloc (2 * sizeof (ffi_type *));\n+ ret->elements[0] = &ffi_type_void;\n+ ret->elements[1] = NULL;\n+ return ret;\n+ }\n fields = (const struct __go_struct_field *) descriptor->__fields.__values;\n ret->elements = (ffi_type **) __go_alloc ((field_count + 1)\n \t\t\t\t\t * sizeof (ffi_type *));\n"} {"commit":"a8bcc2beaa6a0040977a5ea722cccd6d63ce20a7","subject":"goo-component: Resume after OMX_StatePause.","message":"goo-component: Resume after OMX_StatePause.\n\nSigned-off-by: Daniel Diaz <ed054987dd20aebbd314fbb0d175066628f13717@ti.com>\n","repos":"mrchapp\/libgoo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libgoo\/goo-component.c\n+++ libgoo\/goo-component.c\n@@ -1068,7 +1068,7 @@\n \n \tgoo_component_wait_for_next_state (self);\n \n-\tif (self->prev_state == OMX_StateIdle)\n+\tif (self->prev_state == OMX_StateIdle || self->prev_state == OMX_StatePause)\n \t{\n \t\tgoo_component_prepare_all_ports (self);\n \t}\n@@ -2273,7 +2273,7 @@\n \tg_assert (GOO_IS_PORT (port));\n \tg_assert (goo_component_is_my_port (self, port));\n \tg_assert ((self->cur_state == OMX_StateExecuting) &&\n-\t\t (self->prev_state == OMX_StateIdle));\n+\t\t (self->prev_state == OMX_StateIdle || self->prev_state == OMX_StatePause));\n \n \tguint numbuf, i;\n \tOMX_BUFFERHEADERTYPE* buffer = NULL;\n@@ -2323,7 +2323,7 @@\n {\n \tg_assert (GOO_IS_COMPONENT (self));\n \tg_assert ((self->cur_state == OMX_StateExecuting) &&\n-\t\t (self->prev_state == OMX_StateIdle));\n+\t\t (self->prev_state == OMX_StateIdle || self->prev_state == OMX_StatePause));\n \n \tGooPort* port = NULL;\n \tgboolean do_thread = FALSE;\n"} {"commit":"7de2181cce5d6c19baf97a91d63f52701299f909","subject":"Raise error if file in dir for dataset is not supported (instead of ignoring the file)","message":"Raise error if file in dir for dataset is not supported\n(instead of ignoring the file)\n","repos":"stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp,stcorp\/harp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libharp\/harp-dataset.c\n+++ libharp\/harp-dataset.c\n@@ -180,12 +180,14 @@\n sprintf(filepath, \"%s\\\\%s\", pathname, FileData.cFileName);\n if (check_file(filepath) != 0)\n {\n- harp_set_error(HARP_ERROR_INVALID_ARGUMENT, \"'%s' is not a valid HARP file\", filepath);\n free(filepath);\n FindClose(hSearch);\n return -1;\n }\n- add_file(dataset, filepath);\n+ if (add_file(dataset, filepath) != 0)\n+ {\n+ return -1;\n+ }\n free(filepath);\n }\n \n@@ -257,12 +259,14 @@\n if (check_file(filepath) != 0)\n {\n \/* Exit, file type is not supported *\/\n- harp_set_error(HARP_ERROR_INVALID_ARGUMENT, \"'%s' is not a valid HARP file\", filepath);\n free(filepath);\n closedir(dirp);\n return -1;\n }\n- add_file(dataset, filepath);\n+ if (add_file(dataset, filepath) != 0)\n+ {\n+ return -1;\n+ }\n free(filepath);\n }\n \n"} {"commit":"7872e1565c4a2e49b5d25495b20860b68ef40df0","subject":"\u0424\u0438\u043a\u0441 \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f","message":"\u0424\u0438\u043a\u0441 \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f\n","repos":"andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libs\/compiler\/parser.c\n+++ libs\/compiler\/parser.c\n@@ -50,7 +50,7 @@\n \tprs.flag_in_assignment = 0;\n \tprs.was_error = 0;\n \n-\tprs.anon_stack.operands = vector_create(1);\n+\tprs.anon_stack.operands = stack_create(1);\n \ttoken_consume(&prs);\n \n \treturn prs;\n"} {"commit":"1d5ace1848fcefd1641a22cc3092dce8d4faae81","subject":"\u0418\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0447\u0442\u0435\u043d\u0438\u044f","message":"\u0418\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0447\u0442\u0435\u043d\u0438\u044f\n","repos":"andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libs\/compiler\/parser.c\n+++ libs\/compiler\/parser.c\n@@ -1032,9 +1032,11 @@\n \t\t\ttype = type_pointer(prs->sx, element_type);\n \t\t}\n \n-\t\tconst size_t repr = token_get_ident_name(&prs->tk);\n-\t\tif (try_consume_token(prs, TK_IDENTIFIER))\n-\t\t{\n+\t\tif (token_is(&prs->tk, TK_IDENTIFIER))\n+\t\t{\n+\t\t\tconst size_t repr = token_get_ident_name(&prs->tk);\n+\t\t\tconsume_token(prs);\n+\n \t\t\tif (token_is(&prs->tk, TK_L_SQUARE))\n \t\t\t{\n \t\t\t\tif (!was_array)\n@@ -1053,17 +1055,17 @@\n \t\t\t\tnode_set_arg(&decl, 0, type);\n \t\t\t\tnode_set_arg(&decl, 1, (item_t)fields);\n \t\t\t}\n+\n+\t\t\tlocal_modetab[local_md++] = type;\n+\t\t\tlocal_modetab[local_md++] = (item_t)repr;\n+\t\t\tfields++;\n+\t\t\tdispl += type_size(prs->sx, type);\n \t\t}\n \t\telse\n \t\t{\n \t\t\tparser_error(prs, wait_ident_after_semicolon_in_struct);\n \t\t\tskip_until(prs, TK_SEMICOLON | TK_R_BRACE);\n \t\t}\n-\n-\t\tlocal_modetab[local_md++] = type;\n-\t\tlocal_modetab[local_md++] = (item_t)repr;\n-\t\tfields++;\n-\t\tdispl += type_size(prs->sx, type);\n \n \t\texpect_and_consume(prs, TK_SEMICOLON, no_semicolon_in_struct);\n \t} while (!try_consume_token(prs, TK_R_BRACE));\n"} {"commit":"d59d8b90ca845f86bc5160aa192b7f982a2f71a9","subject":"comment fix","message":"comment fix\n","repos":"andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libs\/compiler\/syntax.h\n+++ libs\/compiler\/syntax.h\n@@ -73,7 +73,7 @@\n *\n *\t@param\tsx\t\t\tSyntax structure\n *\n- *\t@return\tSize of memory table on success, @c INT_MAX on failure\n+ *\t@return\tProgram counter on success, @c INT_MAX on failure\n *\/\n size_t mem_get_size(const syntax *const sx);\n \n"} {"commit":"882b4f49b16eab8615f6cf9c6ec9e6cb5477b274","subject":"remove leftover swfdec_bits_needbits call","message":"remove leftover swfdec_bits_needbits call\n","repos":"mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libswfdec\/swfdec_tag.c\n+++ libswfdec\/swfdec_tag.c\n@@ -69,8 +69,6 @@\n SwfdecText *text = NULL;\n SwfdecTextGlyph glyph = { 0 };\n SwfdecRect rect;\n-\n- if (swfdec_bits_needbits(bits,2)) return SWF_ERROR;\n \n id = swfdec_bits_get_u16 (bits);\n text = swfdec_object_new (s, SWFDEC_TYPE_TEXT);\n"} {"commit":"17be35c9aa6d89737ac9fef1156616dbe7eabd59","subject":"Minor changes","message":"Minor changes\n","repos":"SneManden\/compgeo,SneManden\/compgeo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libtest\/rbltree_test.c\n+++ libtest\/rbltree_test.c\n@@ -62,8 +62,8 @@\n \/\/ http:\/\/stackoverflow.com\/a\/5249150\n #define getTimeDiff(te, ts) ((double)(te - ts) \/ CLOCKS_PER_SEC)\n #define setTime(t) do { t = clock(); } while (0)\n-#define printExecTime(tr, tp) \\\n- printf(\"\\tExecution time (sec): %.5f (prep: %.5f, total: %.5f)\\n\", tr, tp, tr+tp)\n+#define printExecTime(tr, tp) printf(\"\\tExecution time (sec): %.5f \" \\\n+ \"(prep: %.5f, total: %.5f)\\n\", tr, tp, tr+tp)\n \n \/**\n * Verbose test (with printing of tree) of most parts of implementation:\n@@ -72,6 +72,7 @@\n *\/\n int test_verbose(int nodes) {\n THEAD(\"Verbose run-test of insert+delete\");\n+ printf(\"\\n\");\n \n int ok = 1;\n printf(\"Creating empty RBL tree\\n\");\n@@ -79,11 +80,12 @@\n int i, k;\n char *fname = malloc(sizeof(char)*25);\n \/\/ Insert #nodes nodes\n+ printf(\"Inserting nodes into the tree:\\n\");\n for (i=0; i<nodes; i++) {\n snprintf(fname, 25, \"rbltree_%05d.dot\", i);\n RBLwriteTree(tree, fname);\n k = rand() % (nodes*10+13);\n- printf(\"Inserting a node with key %d\\n\", k);\n+ printf(\" inserting a node with key %d\\n\", k);\n RBLinsert(tree, RBLnewNode(k, &k));\n ok &= RBLisRBLTree(tree);\n if (!ok) printf(\"=> FAIL: is not RBL-tree\\n\");\n@@ -461,9 +463,9 @@\n }\n \n printf(\"===============================\\n\");\n- printf(\"Performed %d tests:\\n\", testi);\n- printf(\"\\t%3d failures\\n\", failures);\n- printf(\"\\t%3d succeses\\n\", succeses);\n+ printf(\"Performed %3d tests:\\n\", testi*runs);\n+ printf(\"\\t %3d failures\\n\", failures);\n+ printf(\"\\t %3d succeses\\n\", succeses);\n \n return (failures != 0); \/\/ returns 0 if no failures, 1 if at least one\n }"} {"commit":"3015bb4eeb77a9adbb2aa58cf34b52b17df18a10","subject":"Clean up more resources in vips_shutdown","message":"Clean up more resources in vips_shutdown\n","repos":"jcupitt\/libvips,lovell\/libvips,jcupitt\/libvips,jcupitt\/libvips,lovell\/libvips,lovell\/libvips,jcupitt\/libvips,lovell\/libvips","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libvips\/iofuncs\/init.c\n+++ libvips\/iofuncs\/init.c\n@@ -721,7 +721,6 @@\n #endif \/*HAVE_GSF*\/\n \n VIPS_FREE(vips__argv0);\n- g_set_prgname(NULL);\n \n \t\/* In dev releases, always show leaks. But not more than once, it's\n \t * annoying.\n"} {"commit":"9abbca6d995e943b426b15cf94b6a59381970cf2","subject":"Fixing up the docs.","message":"Fixing up the docs.\n","repos":"NimbusKit\/basics","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/NimbusKitBasics.h\n+++ src\/NimbusKitBasics.h\n@@ -1,4 +1,4 @@\n-\/**\n+\/*\n Copyright (c) 2011-present, NimbusKit. All rights reserved.\n \n This source code is licensed under the BSD-style license found in the LICENSE file in the root\n"} {"commit":"46bfc884bb50eced47803ce4e9bf85b42604d0a7","subject":"Replaced assume_d macros because they cause build issues in MSVC2017 in oval_agent.c","message":"Replaced assume_d macros because they cause build issues in MSVC2017 in oval_agent.c\n","repos":"jan-cerny\/openscap,redhatrises\/openscap,mpreisler\/openscap,mpreisler\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,mpreisler\/openscap,redhatrises\/openscap,jan-cerny\/openscap,mpreisler\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,mpreisler\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,redhatrises\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,mpreisler\/openscap,redhatrises\/openscap,OpenSCAP\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/OVAL\/oval_agent.c\n+++ src\/OVAL\/oval_agent.c\n@@ -34,7 +34,6 @@\n \n #include <string.h>\n #include <time.h>\n-#include <assume.h>\n \n #include \"oval_agent_api.h\"\n #include \"oval_definitions_impl.h\"\n@@ -258,9 +257,13 @@\n \n int oval_agent_abort_session(oval_agent_session_t *ag_sess)\n {\n-\tassume_d(ag_sess != NULL, -1);\n-#if defined(OVAL_PROBES_ENABLED)\n-\tassume_d(ag_sess->psess != NULL, -1);\n+\tif (ag_sess == NULL) {\n+\t\treturn -1;\n+\t}\n+#if defined(OVAL_PROBES_ENABLED)\n+\tif (ag_sess->psess == NULL) {\n+\t\treturn -1;\n+\t}\n \treturn oval_probe_session_abort(ag_sess->psess);\n #else\n \t\/* TODO *\/\n@@ -576,8 +579,12 @@\n \t\tid = oval_definition_get_id(oval_def);\n \n \t\t\/\/ Evaluate definition.\n-\t\tassume_r(oval_agent_eval_definition(sess, id) != -1, -1);\n-\t\tassume_r(oval_agent_get_definition_result(sess, id, &oval_result) != -1, -1);\n+\t\tif (oval_agent_eval_definition(sess, id) == -1) {\n+\t\t\treturn -1;\n+\t\t}\n+\t\tif (oval_agent_get_definition_result(sess, id, &oval_result) == -1) {\n+\t\t\treturn -1;\n+\t\t}\n \t\t\/\/ Get XCCDF equivalent of the oval result.\n \t\txccdf_result = xccdf_get_result_from_oval(oval_definition_get_class(oval_def), oval_result);\n \t\t\/\/ AND as described in (NISTIR-7275r4): Table 12: Truth Table for AND\n"} {"commit":"a1271dd069a32e83c9e9704e88122444941e2f87","subject":"Fixes to marpa.w bocage logic.","message":"Fixes to marpa.w bocage logic.\n","repos":"pczarn\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos,jeffreykegler\/kollos,jeffreykegler\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos,jeffreykegler\/libmarpa,pczarn\/kollos,jeffreykegler\/kollos,jeffreykegler\/libmarpa,jeffreykegler\/kollos,jeffreykegler\/kollos,pczarn\/kollos,jeffreykegler\/libmarpa","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- xs\/libmarpa\/dev\/marpa.w\n+++ xs\/libmarpa\/dev\/marpa.w\n@@ -9819,7 +9819,7 @@\n \t if (!or_node || ES_Ord_of_OR (or_node) != work_earley_set_ordinal) {\n \t\tDAND draft_and_node;\n \t\tconst gint rhs_ix = symbol_instance - SYMI_of_RULE(rule);\n-\t\tconst OR predecessor = symbol_instance ? last_or_node : NULL;\n+\t\tconst OR predecessor = rhs_ix ? last_or_node : NULL;\n \t\tconst OR cause = (OR)SYM_by_ID( RHS_ID_of_RULE (rule, rhs_ix ) );\n \t\t@<Set |last_or_node| to a new or-node@>@;\n \t\tor_node = PSL_Datum (or_psl, symbol_instance) = last_or_node ;\n@@ -9976,9 +9976,8 @@\n if (!or_node || ES_Ord_of_OR (or_node) != work_earley_set_ordinal)\n \t{\n \t DAND draft_and_node;\n-\t OR predecessor = last_or_node;\t\/* Leo path Earley items are never predictions,\n-\t\t\t\t\t\t so that there is always a predecessor *\/\n \t const gint rhs_ix = symbol_instance - SYMI_of_RULE(path_rule);\n+\t const OR predecessor = rhs_ix ? last_or_node : NULL;\n \t const OR cause =\n \t (OR)SYM_by_ID( RHS_ID_of_RULE (path_rule, rhs_ix)) ;\n \t MARPA_ASSERT (symbol_instance < Length_of_RULE (path_rule)) @;\n@@ -10320,7 +10319,7 @@\n \n @ @<Set |dand_predecessor|@> =\n {\n- if (Position_of_AIM(work_predecessor_aim) == 0) {\n+ if (Position_of_AIM(work_predecessor_aim) < 1) {\n dand_predecessor = NULL;\n } else {\n \tconst AEX predecessor_aex =\n@@ -12349,6 +12348,7 @@\n @d MARPA_OFF_DEBUG3(a, b, c)\n @d MARPA_OFF_DEBUG4(a, b, c, d)\n @d MARPA_OFF_DEBUG5(a, b, c, d, e)\n+@d MARPA_OFF_ASSERT(expr)\n @<Debug macros@> =\n #define MARPA_DEBUG @[ 0 @]\n #define MARPA_ENABLE_ASSERT @[ 0 @]\n"} {"commit":"58f96b98476d9229693529efd91bcdfdbb2e5bad","subject":"fetch number of threads from flint","message":"fetch number of threads from flint\n","repos":"fredrik-johansson\/arb,pascalmolin\/arb,argriffing\/arb,pascalmolin\/arb,fredrik-johansson\/arb,argriffing\/arb,pascalmolin\/arb,argriffing\/arb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- zeta\/powsum_series_naive_threaded.c\n+++ zeta\/powsum_series_naive_threaded.c\n@@ -80,7 +80,8 @@\n powsum_arg_t * args;\n long i, num_threads;\n \n- num_threads = 1;\n+ num_threads = flint_get_num_threads();\n+\n threads = flint_malloc(sizeof(pthread_t) * num_threads);\n args = flint_malloc(sizeof(powsum_arg_t) * num_threads);\n \n"} {"commit":"19b0ddea9b9f9096efb9bd534d43cb9cf5f4c2da","subject":"Set HTTP headers correctly for JSON and cross-domain","message":"Set HTTP headers correctly for JSON and cross-domain","repos":"bliksemlabs\/rrrr","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- otp_api.c\n+++ otp_api.c\n@@ -33,7 +33,10 @@\n #define HEADERS CRLF\n #define END_HEADERS CRLF CRLF\n #define TEXT_PLAIN \"Content-Type:text\/plain\"\n-#define OK_TEXT_PLAIN \"HTTP\/1.0 200 OK\" HEADERS TEXT_PLAIN CRLF\n+#define APPLICATION_JSON \"Content-Type:application\/json\"\n+#define ALLOW_ORIGIN \"Access-Control-Allow-Origin:*\"\n+#define ALLOW_HEADERS \"Access-Control-Allow-Headers:Requested-With,Content-Type\"\n+#define OK_TEXT_PLAIN \"HTTP\/1.0 200 OK\" HEADERS APPLICATION_JSON CRLF ALLOW_ORIGIN CRLF ALLOW_HEADERS CRLF\n #define ERROR_404 \"HTTP\/1.0 404 Not Found\" HEADERS TEXT_PLAIN END_HEADERS \"FOUR ZERO FOUR\" CRLF\n \n #define BUFLEN 1024\n"} {"commit":"d2804c3ab3ddca52ec79ffede7dc8d07ba096fe2","subject":"restored csound_main to previous state","message":"restored csound_main to previous state\n","repos":"max-ilse\/csound,audiokit\/csound,mcanthony\/csound,mcanthony\/csound,audiokit\/csound,audiokit\/csound,max-ilse\/csound,iver56\/csound,nikhilsinghmus\/csound,max-ilse\/csound,max-ilse\/csound,nikhilsinghmus\/csound,audiokit\/csound,iver56\/csound,Angeldude\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,max-ilse\/csound,mcanthony\/csound,Angeldude\/csound,iver56\/csound,Angeldude\/csound,iver56\/csound,Angeldude\/csound,audiokit\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,nikhilsinghmus\/csound,audiokit\/csound,max-ilse\/csound,Angeldude\/csound,iver56\/csound,audiokit\/csound,iver56\/csound,nikhilsinghmus\/csound,max-ilse\/csound,mcanthony\/csound,audiokit\/csound,mcanthony\/csound,audiokit\/csound,max-ilse\/csound,mcanthony\/csound,Angeldude\/csound,iver56\/csound,nikhilsinghmus\/csound,Angeldude\/csound,Angeldude\/csound,max-ilse\/csound,nikhilsinghmus\/csound,iver56\/csound,Angeldude\/csound,iver56\/csound,Angeldude\/csound,mcanthony\/csound,iver56\/csound,mcanthony\/csound,mcanthony\/csound,audiokit\/csound,max-ilse\/csound,mcanthony\/csound","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- frontends\/csound\/csound_main.c\n+++ frontends\/csound\/csound_main.c\n@@ -131,20 +131,7 @@\n \n \/* Create Csound. *\/\n csound = csoundCreate(NULL);\n- csoundSetRTAudioModule(csound, \"auhal\");\n- {\n- int i,n = csoundAudioDevList(csound,NULL,1);\n-\t csoundMessage(csound, \"%d devices\\n\", n);\n- CS_AUDIODEVICE *devs = (CS_AUDIODEVICE *) \n- malloc(n*sizeof(CS_AUDIODEVICE));\n- csoundAudioDevList(csound,devs,1);\n- for(i=0; i < n; i++) \n- csoundMessage(csound, \"%d: %s (%s)\\n\", \n- i, devs[i].device_id, devs[i].device_name);\n- free(devs); \n- } \n-\n-\n+ \n \/* One complete performance cycle. *\/\n result = csoundCompile(csound, argc, argv);\n \n"} {"commit":"32b757f0360e1cf444fda4feebfc3acc355cf009","subject":"Audio: properly initialize HRTF member of Audio::Context::Configuration.","message":"Audio: properly initialize HRTF member of Audio::Context::Configuration.\n","repos":"MiUishadow\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,MiUishadow\/magnum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Magnum\/Audio\/Context.h\n+++ src\/Magnum\/Audio\/Context.h\n@@ -315,12 +315,7 @@\n };\n \n \/** @brief Constructor *\/\n- explicit Configuration():\n- _frequency(-1),\n- _monoSources(-1),\n- _stereoSources(-1),\n- _refreshRate(-1)\n- {}\n+ explicit Configuration() {}\n \n \/** @brief Sampling rate in Hz *\/\n Int frequency() const { return _frequency; }\n@@ -397,13 +392,13 @@\n }\n \n private:\n- Int _frequency;\n- Hrtf _hrtf;\n-\n- Int _monoSources;\n- Int _stereoSources;\n-\n- Int _refreshRate;\n+ Int _frequency{-1};\n+ Hrtf _hrtf{};\n+\n+ Int _monoSources{-1};\n+ Int _stereoSources{-1};\n+\n+ Int _refreshRate{-1};\n };\n \n \n"} {"commit":"4f6dd975175607b91a5df093b2b3afbe3ea64dac","subject":"fix client_reconnect_timer_cb to not user client_reconnect_timer after free","message":"fix client_reconnect_timer_cb to not user client_reconnect_timer after free\n","repos":"workflowproducts\/envelope,workflowproducts\/envelope,workflowproducts\/envelope,workflowproducts\/envelope","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/common_client.c\n+++ common\/common_client.c\n@@ -222,17 +222,19 @@\n \tif (revents != 0) {\n \t} \/\/ get rid of unused parameter warning\n \tstruct sock_ev_client_reconnect_timer *client_reconnect_timer = (struct sock_ev_client_reconnect_timer *)w;\n+\tstruct sock_ev_client *client = client_reconnect_timer->parent;\n \n \tif ((client_reconnect_timer->close_time + 10) < ev_now(EV_A)) {\n-\t\tev_io_stop(EV_A, &client_reconnect_timer->parent->reconnect_watcher->io);\n-\t\tDB_finish(client_reconnect_timer->parent->conn);\n-\n-\t\tev_prepare_stop(EV_A, &client_reconnect_timer->parent->client_reconnect_timer->prepare);\n-\t\tSFREE(client_reconnect_timer->parent->client_reconnect_timer);\n+\t\tev_io_stop(EV_A, &client->reconnect_watcher->io);\n+\t\tDB_finish(client->conn);\n+\n+\t\tev_prepare_stop(EV_A, &client_reconnect_timer->prepare);\n+\t\tSFREE(client->client_reconnect_timer);\n+\t\tclient_reconnect_timer = NULL;\n \n \t\tdecrement_idle(EV_A);\n \n-\t\tclient_close(client_reconnect_timer->parent);\n+\t\tclient_close(client);\n \t}\n }\n \n"} {"commit":"783581ec0bba21ead20cc0d52cb923b6ece56c79","subject":"fix login_group default","message":"fix login_group default\n","repos":"workflowproducts\/envelope,workflowproducts\/envelope,workflowproducts\/envelope,workflowproducts\/envelope","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/common_config.c\n+++ common\/common_config.c\n@@ -513,6 +513,9 @@\n \n \tSERROR_SNCAT(str_global_port, &int_global_len,\n \t\t\"8888\", (size_t)4);\n+\n+\tSERROR_SNCAT(str_global_login_group, &int_global_len,\n+\t\t\"envelope_g\", (size_t)10);\n #else\n \tSERROR_SNCAT(str_global_port, &int_global_len,\n \t\t\"8080\", (size_t)4);\n@@ -686,11 +689,6 @@\n \tchar *str_temp = NULL;\n \n #ifdef ENVELOPE\n-\tif (str_global_login_group == NULL) {\n-\t\tSERROR_SNCAT(str_global_login_group, &int_global_len,\n-\t\t\t\"envelope_g\", (size_t)10);\n-\t}\n-\n \tif (str_global_app_path == NULL) {\n #ifdef _WIN32\n \t\tSERROR_SNCAT(str_global_app_path, &int_global_len,\n"} {"commit":"da897250cca792d8b4a73ae6c37a8ea59e4a5abd","subject":"Avoid interactive prompts when redirected, assume no","message":"Avoid interactive prompts when redirected, assume no\n","repos":"GeorgesStavracas\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,GeorgesStavracas\/flatpak,flatpak\/flatpak,flatpak\/flatpak,flatpak\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/flatpak,GeorgesStavracas\/flatpak,flatpak\/flatpak,handsome-feng\/flatpak,matthiasclasen\/flatpak,handsome-feng\/flatpak,handsome-feng\/flatpak,handsome-feng\/flatpak,flatpak\/flatpak,handsome-feng\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/flatpak","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- common\/flatpak-utils.c\n+++ common\/flatpak-utils.c\n@@ -4270,6 +4270,13 @@\n while (TRUE)\n {\n g_print (\"%s %s: \", s, \"[y\/n]\");\n+\n+ if (!isatty (STDIN_FILENO) || !isatty (STDOUT_FILENO))\n+ {\n+ g_print (\"n\\n\");\n+ return FALSE;\n+ }\n+\n if (fgets (buf, sizeof (buf), stdin) == NULL)\n return FALSE;\n \n@@ -4311,8 +4318,15 @@\n while (TRUE)\n {\n g_print (\"%s [%d-%d]: \", s, min, max);\n+\n+ if (!isatty (STDIN_FILENO) || !isatty (STDOUT_FILENO))\n+ {\n+ g_print (\"0\\n\");\n+ return 0;\n+ }\n+\n if (fgets (buf, sizeof (buf), stdin) == NULL)\n- return FALSE;\n+ return 0;\n \n g_strstrip (buf);\n \n"} {"commit":"bf764094d680cfb135826160c83b67fecbcfc4cb","subject":"pass size to writev_loop() since we already calculated it fix some sloppy bugs","message":"pass size to writev_loop() since we already calculated it\nfix some sloppy bugs\n\n","repos":"gstrauss\/mcdb,gstrauss\/mcdb,gstrauss\/mcdb,gstrauss\/mcdb,gstrauss\/mcdb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mcdbctl.c\n+++ mcdbctl.c\n@@ -19,20 +19,22 @@\n #include <limits.h> \/* SSIZE_MAX *\/\n \n static bool\n-writev_loop(const int fd, struct iovec * restrict iov, int iovcnt)\n+writev_loop(const int fd, struct iovec * restrict iov, int iovcnt, ssize_t sz)\n {\n \/* Note: unlike writev(), this routine might modify the iovecs *\/\n ssize_t len;\n while (iovcnt && (len = writev(fd, iov, iovcnt)) != -1) {\n+ if ((sz -= len) == 0)\n+ return true;\n while (len != 0) {\n- if (len >= iov[0].iov_len) {\n- len -= iov[0].iov_len;\n+ if (len >= iov->iov_len) {\n+ len -= iov->iov_len;\n --iovcnt;\n ++iov;\n }\n else {\n- iov[0].iov_len -= len;\n- iov[0].iov_base = ((char *)iov[0].iov_base) + len;\n+ iov->iov_len -= len;\n+ iov->iov_base = ((char *)(iov->iov_base)) + len;\n }\n }\n }\n@@ -67,7 +69,7 @@\n \/* avoid printf(\"%.*s\\n\",...) due to mcdb arbitrary binary data *\/\n \/* klen, dlen each limited to (2GB - 8); space for extra tokens exists*\/\n if (iovlen + klen + 5 > SSIZE_MAX || iovcnt + 7 > MCDB_IOVNUM) {\n- if (!writev_loop(STDOUT_FILENO, iov, iovcnt))\n+ if (!writev_loop(STDOUT_FILENO, iov, iovcnt, (ssize_t)iovlen))\n return MCDB_ERROR_WRITE;\n iovcnt = 0;\n iovlen = 0;\n@@ -105,7 +107,7 @@\n iovlen += klen + 5;\n \n if (iovlen + dlen + 1 > SSIZE_MAX) {\n- if (!writev_loop(STDOUT_FILENO, iov, iovcnt))\n+ if (!writev_loop(STDOUT_FILENO, iov, iovcnt, (ssize_t)iovlen))\n return MCDB_ERROR_WRITE;\n iovcnt = 0;\n iovlen = 0;\n@@ -124,9 +126,11 @@\n \n }\n \n- return (writev_loop(STDOUT_FILENO, iov, iovcnt)\n- && write(STDOUT_FILENO, \"\\n\", 1)) ? EXIT_SUCCESS : MCDB_ERROR_WRITE;\n- \/* append blank line (\"\\n\") to indicate end of data *\/\n+ \/* write out iovecs and append blank line (\"\\n\") to indicate end of data *\/\n+ return (writev_loop(STDOUT_FILENO, iov, iovcnt, (ssize_t)iovlen)\n+ && write(STDOUT_FILENO, \"\\n\", 1) == 1)\n+ ? EXIT_SUCCESS\n+ : MCDB_ERROR_WRITE;\n }\n \n \/* Note: mcdbctl_stats() is equivalent test to pass\/fail of djb cdbtest *\/\n@@ -181,10 +185,9 @@\n \/* avoid printf(\"%.*s\\n\",...) due to mcdb arbitrary binary data *\/\n iov[0].iov_base = mcdb_dataptr(m);\n iov[0].iov_len = mcdb_datalen(m);\n- iov[0].iov_base = \"\\n\";\n- iov[0].iov_len = 1;\n- return\n- writev_loop(STDOUT_FILENO, iov, sizeof(iov)\/sizeof(struct iovec))\n+ iov[1].iov_base = \"\\n\";\n+ iov[1].iov_len = 1;\n+ return writev_loop(STDOUT_FILENO,iov,2,(ssize_t)(iov[0].iov_len+1))\n ? EXIT_SUCCESS\n : MCDB_ERROR_WRITE;\n }\n"} {"commit":"647ac36fda37a8ec6dd0371ab0f1e4d9780bead8","subject":"pd: do not respond to unknown SVDMs","message":"pd: do not respond to unknown SVDMs\n\nbug fix: if we see an unknown SVDM, do not respond to it.\n\nBUG=none\nBRANCH=samus\nTEST=test with third party that sends unknown SVDM\n\nChange-Id: I3ef6c38be029d57bf3784ba832b7ae137f379049\nSigned-off-by: Alec Berg <1a4429eeda29095a12e19a73405f80f5b7f37a63@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/224179\nReviewed-by: Vincent Palatin <70a9964ec8fd10b0b08fcc8623c2add25ddf99ac@chromium.org>\n","repos":"md5555\/ec,akappy7\/ChromeOS_EC_LED_Diagnostics,mtk09422\/chromiumos-platform-ec,coreboot\/chrome-ec,fourier49\/BZ_DEV_EC,longsleep\/ec,fourier49\/BIZ_EC,mtk09422\/chromiumos-platform-ec,longsleep\/ec,fourier49\/BZ_DEV_EC,akappy7\/ChromeOS_EC_LED_Diagnostics,eatbyte\/chromium-ec,fourier49\/BIZ_EC,akappy7\/ChromeOS_EC_LED_Diagnostics,md5555\/ec,fourier49\/BZ_DEV_EC,mtk09422\/chromiumos-platform-ec,eatbyte\/chromium-ec,fourier49\/BIZ_EC,fourier49\/BZ_DEV_EC,mtk09422\/chromiumos-platform-ec,coreboot\/chrome-ec,md5555\/ec,coreboot\/chrome-ec,akappy7\/ChromeOS_EC_LED_Diagnostics,coreboot\/chrome-ec,eatbyte\/chromium-ec,akappy7\/ChromeOS_EC_LED_Diagnostics,fourier49\/BIZ_EC,longsleep\/ec,coreboot\/chrome-ec,longsleep\/ec,md5555\/ec,eatbyte\/chromium-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- common\/usb_pd_policy.c\n+++ common\/usb_pd_policy.c\n@@ -263,6 +263,8 @@\n \t\tcase CMD_EXIT_MODE:\n \t\t\trsize = pd_exit_mode(port, payload);\n \t\t\tbreak;\n+\t\tdefault:\n+\t\t\trsize = 0;\n \t\t}\n \t\tpayload[0] &= ~VDO_CMDT(0);\n \t\tpayload[0] |= VDO_CMDT(CMDT_INIT);\n@@ -284,6 +286,8 @@\n \t\tcase CMD_EXIT_MODE:\n \t\t\trsize = 0;\n \t\t\tbreak;\n+\t\tdefault:\n+\t\t\trsize = 0;\n \t\t}\n \t} else if (cmd_type == CMDT_RSP_NAK) {\n \t\t\/* nothing to do *\/\n"} {"commit":"78b713a1d0909c8eb8dc0bad5df624c33d065c16","subject":"Make sha1flush void and remove conditional return.","message":"Make sha1flush void and remove conditional return.\n\nSigned-off-by: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nSigned-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- csum-file.c\n+++ csum-file.c\n@@ -10,7 +10,7 @@\n #include \"cache.h\"\n #include \"csum-file.h\"\n \n-static int sha1flush(struct sha1file *f, unsigned int count)\n+static void sha1flush(struct sha1file *f, unsigned int count)\n {\n \tvoid *buf = f->buffer;\n \n@@ -21,7 +21,7 @@\n \t\t\tcount -= ret;\n \t\t\tif (count)\n \t\t\t\tcontinue;\n-\t\t\treturn 0;\n+\t\t\treturn;\n \t\t}\n \t\tif (!ret)\n \t\t\tdie(\"sha1 file '%s' write error. Out of diskspace\", f->name);\n"} {"commit":"fe12ba23b0ee081bb5e37a6da785e024af01e810","subject":"Compare edge by edgebasednodeids","message":"Compare edge by edgebasednodeids","repos":"oxidase\/osrm-backend,ammeurer\/osrm-backend,ramyaragupathy\/osrm-backend,ammeurer\/osrm-backend,alex85k\/Project-OSRM,bitsteller\/osrm-backend,hydrays\/osrm-backend,arnekaiser\/osrm-backend,yuryleb\/osrm-backend,atsuyim\/osrm-backend,Conggge\/osrm-backend,ammeurer\/osrm-backend,antoinegiret\/osrm-backend,tkhaxton\/osrm-backend,ibikecph\/osrm-backend,keesklopt\/matrix,keesklopt\/matrix,bjtaylor1\/Project-OSRM-Old,duizendnegen\/osrm-backend,skyborla\/osrm-backend,felixguendling\/osrm-backend,keesklopt\/matrix,nagyistoce\/osrm-backend,felixguendling\/osrm-backend,KnockSoftware\/osrm-backend,KnockSoftware\/osrm-backend,bjtaylor1\/osrm-backend,arnekaiser\/osrm-backend,hydrays\/osrm-backend,atsuyim\/osrm-backend,agruss\/osrm-backend,frodrigo\/osrm-backend,beemogmbh\/osrm-backend,neilbu\/osrm-backend,alex85k\/Project-OSRM,neilbu\/osrm-backend,tkhaxton\/osrm-backend,beemogmbh\/osrm-backend,skyborla\/osrm-backend,bjtaylor1\/Project-OSRM-Old,neilbu\/osrm-backend,stevevance\/Project-OSRM,prembasumatary\/osrm-backend,antoinegiret\/osrm-geovelo,yuryleb\/osrm-backend,neilbu\/osrm-backend,atsuyim\/osrm-backend,keesklopt\/matrix,Tristramg\/osrm-backend,ibikecph\/osrm-backend,arnekaiser\/osrm-backend,ramyaragupathy\/osrm-backend,chaupow\/osrm-backend,bjtaylor1\/osrm-backend,nagyistoce\/osrm-backend,antoinegiret\/osrm-geovelo,frodrigo\/osrm-backend,agruss\/osrm-backend,Conggge\/osrm-backend,frodrigo\/osrm-backend,chaupow\/osrm-backend,stevevance\/Project-OSRM,raymond0\/osrm-backend,Conggge\/osrm-backend,duizendnegen\/osrm-backend,ammeurer\/osrm-backend,jpizarrom\/osrm-backend,felixguendling\/osrm-backend,hydrays\/osrm-backend,Carsten64\/OSRM-aux-git,bjtaylor1\/osrm-backend,ammeurer\/osrm-backend,KnockSoftware\/osrm-backend,nagyistoce\/osrm-backend,bjtaylor1\/Project-OSRM-Old,beemogmbh\/osrm-backend,yuryleb\/osrm-backend,bitsteller\/osrm-backend,chaupow\/osrm-backend,Carsten64\/OSRM-aux-git,bitsteller\/osrm-backend,ramyaragupathy\/osrm-backend,antoinegiret\/osrm-backend,agruss\/osrm-backend,stevevance\/Project-OSRM,Project-OSRM\/osrm-backend,yuryleb\/osrm-backend,stevevance\/Project-OSRM,Project-OSRM\/osrm-backend,Tristramg\/osrm-backend,jpizarrom\/osrm-backend,Conggge\/osrm-backend,raymond0\/osrm-backend,deniskoronchik\/osrm-backend,ibikecph\/osrm-backend,beemogmbh\/osrm-backend,deniskoronchik\/osrm-backend,raymond0\/osrm-backend,deniskoronchik\/osrm-backend,tkhaxton\/osrm-backend,arnekaiser\/osrm-backend,bjtaylor1\/Project-OSRM-Old,KnockSoftware\/osrm-backend,Tristramg\/osrm-backend,ammeurer\/osrm-backend,Project-OSRM\/osrm-backend,prembasumatary\/osrm-backend,hydrays\/osrm-backend,skyborla\/osrm-backend,antoinegiret\/osrm-backend,raymond0\/osrm-backend,ammeurer\/osrm-backend,alex85k\/Project-OSRM,Carsten64\/OSRM-aux-git,Carsten64\/OSRM-aux-git,oxidase\/osrm-backend,duizendnegen\/osrm-backend,frodrigo\/osrm-backend,duizendnegen\/osrm-backend,jpizarrom\/osrm-backend,antoinegiret\/osrm-geovelo,Project-OSRM\/osrm-backend,oxidase\/osrm-backend,oxidase\/osrm-backend,deniskoronchik\/osrm-backend,prembasumatary\/osrm-backend,bjtaylor1\/osrm-backend","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- DataStructures\/GridEdge.h\n+++ DataStructures\/GridEdge.h\n@@ -29,6 +29,12 @@\n int weight;\n _Coordinate startCoord;\n _Coordinate targetCoord;\n+ bool operator< ( const _GridEdge& right) const {\n+ return edgeBasedNode < right.edgeBasedNode;\n+ }\n+ bool operator== ( const _GridEdge& right) const {\n+ return edgeBasedNode == right.edgeBasedNode;\n+ }\n };\n \n struct GridEntry {\n"} {"commit":"c96b6133a4beb94a7c7493cae8fbf7318511435d","subject":"Fix typos","message":"Fix typos\n","repos":"kenhys\/groonga,kenhys\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,komainu8\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,cosmo0920\/groonga,redfigure\/groonga,kenhys\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,redfigure\/groonga,cosmo0920\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,kenhys\/groonga,komainu8\/groonga,komainu8\/groonga,komainu8\/groonga,redfigure\/groonga,groonga\/groonga,groonga\/groonga,kenhys\/groonga,naoa\/groonga,naoa\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,cosmo0920\/groonga,groonga\/groonga,redfigure\/groonga,kenhys\/groonga,cosmo0920\/groonga,komainu8\/groonga,komainu8\/groonga,redfigure\/groonga,cosmo0920\/groonga,groonga\/groonga,groonga\/groonga,naoa\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,naoa\/groonga,naoa\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/windows_event_logger.c\n+++ lib\/windows_event_logger.c\n@@ -30,13 +30,13 @@\n #endif \/* WIN32 *\/\n \n const char *\n-grn_windows_event_looger_get_source_name(void)\n+grn_windows_event_logger_get_source_name(void)\n {\n return windows_event_source_name;\n }\n \n void\n-grn_windows_event_looger_set_source_name(const char *name)\n+grn_windows_event_logger_set_source_name(const char *name)\n {\n if (windows_event_source_name) {\n free(windows_event_source_name);\n"} {"commit":"8ee199a993c19543bfbc15adcb4944b6581e040f","subject":" o fixed segfault when no valid image is generated at all o xml_print() now indents xml so it's more readable","message":" o fixed segfault when no valid image is generated at all\n o xml_print() now indents xml so it's more readable\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libAfterImage\/asimagexml.c\n+++ libAfterImage\/asimagexml.c\n@@ -164,7 +164,7 @@\n \t\t\n \t\tif( my_imman != imman ) \n \t\t{\n-\t\t\tif( im->imageman == my_imman ) \n+\t\t\tif( im && im->imageman == my_imman ) \n \t\t\t\tforget_asimage( im );\n \t\t\tdestroy_image_manager(my_imman, False);\n \t\t}\n@@ -1656,12 +1656,15 @@\n \treturn list;\n }\n \n-void xml_print(xml_elem_t* root) {\n+\/* The recursive version of xml_print(), so we can indent XML. *\/\n+static void xml_print_r(xml_elem_t* root, int depth) {\n \txml_elem_t* child;\n \tif (!strcmp(root->tag, cdata_str)) {\n-\t\tfprintf(stderr, \"%s\", root->parm);\n+\t\tchar* ptr = root->parm;\n+\t\twhile (isspace(*ptr)) ptr++;\n+\t\tfprintf(stderr, \"%s\", ptr);\n \t} else {\n-\t\tfprintf(stderr, \"<%s\", root->tag);\n+\t\tfprintf(stderr, \"%*s<%s\", depth * 2, \"\", root->tag);\n \t\tif (root->parm) {\n \t\t\txml_elem_t* parm = xml_parse_parm(root->parm);\n \t\t\twhile (parm) {\n@@ -1673,10 +1676,19 @@\n \t\t\t\tparm = p;\n \t\t\t}\n \t\t}\n-\t\tfprintf(stderr, \">\");\n-\t\tfor (child = root->child ; child ; child = child->next) xml_print(child);\n-\t\tfprintf(stderr, \"<\/%s>\", root->tag);\n-\t}\n+\t\tif (root->child) {\n+\t\t\tfprintf(stderr, \">\\n\");\n+\t\t\tfor (child = root->child ; child ; child = child->next)\n+\t\t\t\txml_print_r(child, depth + 1);\n+\t\t\tfprintf(stderr, \"%*s<\/%s>\\n\", depth * 2, \"\", root->tag);\n+\t\t} else {\n+\t\t\tfprintf(stderr, \"\/>\\n\");\n+\t\t}\n+\t}\n+}\n+\n+void xml_print(xml_elem_t* root) {\n+\txml_print_r(root, 0);\n }\n \n xml_elem_t* xml_elem_new(void) {\n"} {"commit":"94d7cc2ee3de8e4ecb6df77a410bba4410a23156","subject":"trivial: Fix a gtk-doc markup warning","message":"trivial: Fix a gtk-doc markup warning\n","repos":"ximion\/appstream-glib,ximion\/appstream-glib,ikeydoherty\/appstream-glib,hughsie\/appstream-glib,ximion\/appstream-glib,ikeydoherty\/appstream-glib,hughsie\/appstream-glib,hughsie\/appstream-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libappstream-glib\/as-app.h\n+++ libappstream-glib\/as-app.h\n@@ -338,7 +338,7 @@\n gboolean\t as_app_has_permission\t\t(AsApp\t\t*app,\n \t\t\t\t\t\t const gchar\t*permission);\n gboolean\t as_app_has_compulsory_for_desktop (AsApp\t*app,\n-\t\t\t\t\t\t const gchar\t*permission);\n+\t\t\t\t\t\t const gchar\t*desktop);\n gboolean\t as_app_has_quirk\t\t(AsApp\t\t*app,\n \t\t\t\t\t\t AsAppQuirk\t quirk);\n \n"} {"commit":"be2c910728a70762efbb8c794786658eae1b9d6d","subject":"fix 4:2:2 psnr","message":"fix 4:2:2 psnr\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@14662 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/mpegvideo_enc.c\n+++ libavcodec\/mpegvideo_enc.c\n@@ -2012,6 +2012,7 @@\n static int encode_thread(AVCodecContext *c, void *arg){\n MpegEncContext *s= arg;\n int mb_x, mb_y, pdif = 0;\n+ int chr_h= 16>>s->chroma_y_shift;\n int i, j;\n MpegEncContext best_s, backup_s;\n uint8_t bit_buf[2][MAX_MB_BYTES];\n@@ -2606,11 +2607,11 @@\n s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*s->linesize*16,\n s->dest[0], w, h, s->linesize);\n s->current_picture.error[1] += sse(\n- s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,\n- s->dest[1], w>>1, h>>1, s->uvlinesize);\n+ s, s->new_picture.data[1] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h,\n+ s->dest[1], w>>1, h>>s->chroma_y_shift, s->uvlinesize);\n s->current_picture.error[2] += sse(\n- s, s->new_picture .data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,\n- s->dest[2], w>>1, h>>1, s->uvlinesize);\n+ s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*chr_h,\n+ s->dest[2], w>>1, h>>s->chroma_y_shift, s->uvlinesize);\n }\n if(s->loop_filter){\n if(ENABLE_ANY_H263_ENCODER && s->out_format == FMT_H263)\n"} {"commit":"3b86a347cd3e859c427b7e596d949d6ce0094840","subject":"Use webkit-utils in LogWindow webview","message":"Use webkit-utils in LogWindow webview\n","repos":"Distrotech\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-log-window.c\n+++ libempathy-gtk\/empathy-log-window.c\n@@ -60,6 +60,8 @@\n #include \"empathy-images.h\"\n #include \"empathy-theme-manager.h\"\n #include \"empathy-ui-utils.h\"\n+\/\/ FIXME: this work forces a dependency on webkit\n+#include \"empathy-webkit-utils.h\"\n \n #define DEBUG_FLAG EMPATHY_DEBUG_OTHER\n #include <libempathy\/empathy-debug.h>\n@@ -1189,8 +1191,10 @@\n {\n GtkTreeStore *store = log_window->priv->store_events;\n GtkTreeIter iter, parent;\n- gchar *pretty_date, *alias, *body, *msg;\n+ gchar *pretty_date, *alias, *body;\n GDateTime *date;\n+ EmpathyStringParser *parsers;\n+ GString *msg;\n \n date = g_date_time_new_from_unix_utc (\n tpl_event_get_timestamp (event));\n@@ -1199,62 +1203,69 @@\n \n get_parent_iter_for_message (event, message, &parent);\n \n- msg = g_markup_escape_text (empathy_message_get_body (message), -1);\n alias = g_markup_escape_text (\n tpl_entity_get_alias (tpl_event_get_sender (event)), -1);\n \n- \/* If the user is searching, highlight the matched text *\/\n- if (!EMP_STR_EMPTY (log_window->priv->last_find))\n- {\n- gchar *str = g_regex_escape_string (log_window->priv->last_find, -1);\n- gchar *replacement = g_markup_printf_escaped (\n- \"<span background=\\\"yellow\\\">%s<\/span>\",\n- log_window->priv->last_find);\n- GError *error = NULL;\n- GRegex *regex = g_regex_new (str, 0, 0, &error);\n-\n- if (regex == NULL)\n- {\n- DEBUG (\"Could not create regex: %s\", error->message);\n- g_error_free (error);\n- }\n- else\n- {\n- gchar *new_msg = g_regex_replace_literal (regex,\n- empathy_message_get_body (message), -1, 0, replacement,\n- 0, &error);\n-\n- if (new_msg != NULL)\n- {\n- \/* We pass ownership of new_msg to msg, which is freed later *\/\n- g_free (msg);\n- msg = new_msg;\n- }\n- else\n- {\n- DEBUG (\"Error while performing string substitution: %s\",\n- error->message);\n- g_error_free (error);\n- }\n- }\n-\n- g_free (str);\n- g_free (replacement);\n-\n- tp_clear_pointer (®ex, g_regex_unref);\n- }\n+ \/\/ \/* If the user is searching, highlight the matched text *\/\n+ \/\/ if (!EMP_STR_EMPTY (log_window->priv->last_find))\n+ \/\/ {\n+ \/\/ gchar *str = g_regex_escape_string (log_window->priv->last_find, -1);\n+ \/\/ gchar *replacement = g_markup_printf_escaped (\n+ \/\/ \"<span background=\\\"yellow\\\">%s<\/span>\",\n+ \/\/ log_window->priv->last_find);\n+ \/\/ GError *error = NULL;\n+ \/\/ GRegex *regex = g_regex_new (str, 0, 0, &error);\n+\n+ \/\/ if (regex == NULL)\n+ \/\/ {\n+ \/\/ DEBUG (\"Could not create regex: %s\", error->message);\n+ \/\/ g_error_free (error);\n+ \/\/ }\n+ \/\/ else\n+ \/\/ {\n+ \/\/ gchar *new_msg = g_regex_replace_literal (regex,\n+ \/\/ empathy_message_get_body (message), -1, 0, replacement,\n+ \/\/ 0, &error);\n+\n+ \/\/ if (new_msg != NULL)\n+ \/\/ {\n+ \/\/ \/* We pass ownership of new_msg to msg, which is freed later *\/\n+ \/\/ g_free (msg);\n+ \/\/ msg = new_msg;\n+ \/\/ }\n+ \/\/ else\n+ \/\/ {\n+ \/\/ DEBUG (\"Error while performing string substitution: %s\",\n+ \/\/ error->message);\n+ \/\/ g_error_free (error);\n+ \/\/ }\n+ \/\/ }\n+\n+ \/\/ g_free (str);\n+ \/\/ g_free (replacement);\n+\n+ \/\/ tp_clear_pointer (®ex, g_regex_unref);\n+ \/\/ }\n+\n+ \/* escape the text *\/\n+ \/\/ FIXME: handle smileys\n+ parsers = empathy_webkit_get_string_parser (FALSE);\n+ msg = g_string_new (\"\");\n+\n+ empathy_string_parser_substr (empathy_message_get_body (message), -1,\n+ parsers, msg);\n \n if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event))\n == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION)\n {\n \/* Translators: this is an emote: '* Danielle waves' *\/\n- body = g_strdup_printf (_(\"<i>* %s %s<\/i>\"), alias, msg);\n+ body = g_strdup_printf (_(\"<i>* %s %s<\/i>\"), alias, msg->str);\n }\n else\n {\n \/* Translators: this is a message: 'Danielle: hello'\n * The string in bold is the sender's name *\/\n- body = g_strdup_printf (_(\"<b>%s:<\/b> %s\"), alias, msg);\n+ body = g_strdup_printf (_(\"<b>%s:<\/b> %s\"), alias, msg->str);\n }\n \n gtk_tree_store_append (store, &iter, &parent);\n@@ -1268,7 +1279,7 @@\n COL_EVENTS_EVENT, event,\n -1);\n \n- g_free (msg);\n+ g_string_free (msg, TRUE);\n g_free (body);\n g_free (alias);\n g_free (pretty_date);\n"} {"commit":"1ac96952d178f9fbb6ba6865bd2c4912b36282dd","subject":"Fix device_get_ieee1284_id return value","message":"Fix device_get_ieee1284_id return value\n","repos":"pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pkarasev3\/bluez,mapfau\/bluez,mapfau\/bluez,mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cups\/main.c\n+++ cups\/main.c\n@@ -147,7 +147,7 @@\n \n \tif (dbus_message_iter_get_arg_type(&reply_iter) != DBUS_TYPE_ARRAY) {\n \t\tdbus_message_unref(reply);\n-\t\treturn FALSE;\n+\t\treturn NULL;\n \t}\n \n \tdbus_message_iter_recurse(&reply_iter, &reply_iter_entry);\n"} {"commit":"dbfd14c60f1748e7608067a082d7a54434317440","subject":"Don't leak the account and entity","message":"Don't leak the account and entity\n","repos":"GNOME\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libempathy-gtk\/empathy-log-window.c\n+++ libempathy-gtk\/empathy-log-window.c\n@@ -298,13 +298,16 @@\n -1);\n }\n \n- g_return_if_fail (type == COL_TYPE_NORMAL);\n-\n- contact = empathy_contact_from_tpl_contact (account, target);\n- empathy_contact_information_dialog_show (contact,\n- GTK_WINDOW (window->window));\n-\n- g_object_unref (contact);\n+ if (type == COL_TYPE_NORMAL)\n+ {\n+ contact = empathy_contact_from_tpl_contact (account, target);\n+ empathy_contact_information_dialog_show (contact,\n+ GTK_WINDOW (window->window));\n+ g_object_unref (contact);\n+ }\n+ else\n+ g_warn_if_reached ();\n+\n g_object_unref (account);\n g_object_unref (target);\n }\n"} {"commit":"cbf2fe42a61c68ced10991d0e7ce813b4d48a96e","subject":"initial commit","message":"initial commit\n","repos":"glennlopez\/CS50.HarvardX,glennlopez\/CS50.HarvardX,glennlopez\/CS50.HarvardX","returncode":1,"stderr":"error: pathspec 'pset5\/2021\/sandbox\/binary_tree\/intro_binTree.c' did not match any file(s) known to git\n","license":"unlicense","lang":"C","diff":"--- pset5\/2021\/sandbox\/binary_tree\/intro_binTree.c\n+++ pset5\/2021\/sandbox\/binary_tree\/intro_binTree.c\n@@ -0,0 +1,7 @@\n+#include <stdio.h>\n+#include <stdlib.h>\n+\n+int main()\n+{\n+ \n+}"} {"commit":"d983d8756d4cfbe55c19b3b16b59d4bcc926bca5","subject":"Implement a dummy atomic_cmpset_32(). It should be safe to use it in rtld as the signals are masked anyway.","message":"Implement a dummy atomic_cmpset_32(). It should be safe to use it in rtld as\nthe signals are masked anyway.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libexec\/rtld-elf\/arm\/rtld_machdep.h\n+++ libexec\/rtld-elf\/arm\/rtld_machdep.h\n@@ -70,4 +70,15 @@\n void _rtld_bind_start(void);\n \n extern void *__tls_get_addr(tls_index *ti);\n+\n+static __inline u_int32_t\n+atomic_cmpset_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval)\n+{\n+\n+\tif (*p == cmpval) {\n+\t\t*p = newval;\n+\t\treturn (1);\n+\t}\n+\treturn (0);\n+}\n #endif\n"} {"commit":"215c2868aca096364a4725a42c3ffb46dc4e8b39","subject":"libc: elf: explicitly include uClibc_page.h to make PAGE_SIZE visible","message":"libc: elf: explicitly include uClibc_page.h to make PAGE_SIZE visible\n\nSigned-off-by: Filippo Arcidiacono <26825f07340f791bc0d38da89fcffcd93550a83c@st.com>\nSigned-off-by: Carmelo Amoroso <532378793705a04edd56deb76ad8c0442834d55d@st.com>\n","repos":"hjl-tools\/uClibc,brgl\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,foss-for-synopsys-dwc-arc-processors\/uClibc,groundwater\/uClibc,waweber\/uclibc-clang,ffainelli\/uClibc,majek\/uclibc-vx32,groundwater\/uClibc,groundwater\/uClibc,waweber\/uclibc-clang,wbx-github\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,kraj\/uClibc,mephi42\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,waweber\/uclibc-clang,ffainelli\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,brgl\/uclibc-ng,majek\/uclibc-vx32,ffainelli\/uClibc,majek\/uclibc-vx32,wbx-github\/uclibc-ng,kraj\/uClibc,waweber\/uclibc-clang,wbx-github\/uclibc-ng,kraj\/uclibc-ng,mephi42\/uClibc,foss-xtensa\/uClibc,kraj\/uClibc,hjl-tools\/uClibc,ffainelli\/uClibc,foss-xtensa\/uClibc,brgl\/uclibc-ng,kraj\/uclibc-ng,hjl-tools\/uClibc,kraj\/uclibc-ng,kraj\/uClibc,ddcc\/klee-uclibc-0.9.33.2,hjl-tools\/uClibc,wbx-github\/uclibc-ng,hjl-tools\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,mephi42\/uClibc,brgl\/uclibc-ng,ddcc\/klee-uclibc-0.9.33.2,mephi42\/uClibc,foss-xtensa\/uClibc,groundwater\/uClibc,foss-xtensa\/uClibc,kraj\/uclibc-ng,majek\/uclibc-vx32,ffainelli\/uClibc,groundwater\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/misc\/elf\/dl-support.c\n+++ libc\/misc\/elf\/dl-support.c\n@@ -19,6 +19,7 @@\n #include <ldsodefs.h>\n #include <string.h>\n #endif\n+#include <bits\/uClibc_page.h>\n \n #if defined(USE_TLS) && USE_TLS\n \n"} {"commit":"430143bf8db4808730b490ea538f22a557708f92","subject":"sparc: fix v4.10-25-g8497b62 fallout","message":"sparc: fix v4.10-25-g8497b62 fallout\n\nBefore:\n\n$ sleep 3 & .\/strace -p $!\nProcess 8703 attached\nsyscall: unknown syscall trap 1a800003 00025d58\nsyscall_516(0, 0x40080000, 0, 0xfc000f00, 0x28, 0xefc03b18) = 0\nexit_group(0) = ?\n+++ exited with 0 +++\n\nAfter:\n\n$ sleep 3 & .\/strace -p $!\nProcess 8725 attached\nrestart_syscall(<... resuming interrupted nanosleep ...>) = 0\nexit_group(0) = ?\n+++ exited with 0 +++\n\nSigned-off-by: Denys Vlasenko <50fbbd36fe0f9c8261d4a3c762c8c29ffb35e48f@redhat.com>\n","repos":"YUPlayGodDev\/platform_external_strace,Yu-AndroidM\/android_external_strace,Saruta\/strace,geekboxzone\/mmallow_external_strace,kapdop\/android_external_strace,MonkeyZZZZ\/platform_external_strace,AOSP-YU\/platform_external_strace,TeamExodus\/external_strace,MonkeyZZZZ\/platform_external_strace,Yu-AndroidM\/android_external_strace,Yu-AndroidM\/android_external_strace,geofft\/strace,AOSP-YU\/platform_external_strace,geekboxzone\/mmallow_external_strace,AOSP-YU\/platform_external_strace,cuviper\/strace,geofft\/strace,bigzz\/strace_android,geofft\/strace,TeamExodus\/external_strace,TeamExodus\/external_strace,vrastogi\/strace,cuviper\/strace,TeamExodus\/external_strace,Infinitive-OS\/platform_external_strace,Infinitive-OS\/platform_external_strace,kapdop\/android_external_strace,cuviper\/strace,kapdop\/android_external_strace,geekboxzone\/mmallow_external_strace,bigzz\/strace_android,cuviper\/strace,vrastogi\/strace,YUPlayGodDev\/platform_external_strace,bigzz\/strace_android,vrastogi\/strace,geofft\/strace,kapdop\/android_external_strace,Distrotech\/strace,MonkeyZZZZ\/platform_external_strace,Saruta\/strace,Yu-AndroidM\/android_external_strace,TeamExodus\/external_strace,Distrotech\/strace,MonkeyZZZZ\/platform_external_strace,Distrotech\/strace,bigzz\/strace_android,Distrotech\/strace,Saruta\/strace,geekboxzone\/mmallow_external_strace,Saruta\/strace,bigzz\/strace_android,Infinitive-OS\/platform_external_strace,vrastogi\/strace,AOSP-YU\/platform_external_strace,Infinitive-OS\/platform_external_strace,kapdop\/android_external_strace,YUPlayGodDev\/platform_external_strace,vrastogi\/strace,Saruta\/strace,Distrotech\/strace,cuviper\/strace,MonkeyZZZZ\/platform_external_strace,Infinitive-OS\/platform_external_strace,YUPlayGodDev\/platform_external_strace,YUPlayGodDev\/platform_external_strace,geekboxzone\/mmallow_external_strace,Yu-AndroidM\/android_external_strace,AOSP-YU\/platform_external_strace,geofft\/strace","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- linux\/sparc\/get_scno.c\n+++ linux\/sparc\/get_scno.c\n@@ -1,20 +1,11 @@\n-\/* Disassemble the syscall trap. *\/\n+#ifdef SPARC64\n \/* Retrieve the syscall trap instruction. *\/\n unsigned long trap;\n-\n errno = 0;\n-\n-#ifdef SPARC64\n trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.tpc, 0);\n-trap >>= 32;\n-#else\n-trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.pc, 0);\n-#endif\n-\n if (errno)\n \treturn -1;\n-\n-\/* Disassemble the trap to see what personality to use. *\/\n+trap >>= 32;\n switch (trap) {\n case 0x91d02010:\n \t\/* Linux\/SPARC syscall trap. *\/\n@@ -24,39 +15,7 @@\n \t\/* Linux\/SPARC64 syscall trap. *\/\n \tupdate_personality(tcp, 2);\n \tbreak;\n-case 0x91d02000:\n-\t\/* SunOS syscall trap. (pers 1) *\/\n-\tfprintf(stderr, \"syscall: SunOS no support\\n\");\n-\treturn -1;\n-case 0x91d02008:\n-\t\/* Solaris 2.x syscall trap. (per 2) *\/\n-\tupdate_personality(tcp, 1);\n-\tbreak;\n-case 0x91d02009:\n-\t\/* NetBSD\/FreeBSD syscall trap. *\/\n-\tfprintf(stderr, \"syscall: NetBSD\/FreeBSD not supported\\n\");\n-\treturn -1;\n-case 0x91d02027:\n-\t\/* Solaris 2.x gettimeofday *\/\n-\tupdate_personality(tcp, 1);\n-\tbreak;\n-default:\n-#ifdef SPARC64\n-\tfprintf(stderr, \"syscall: unknown syscall trap %08lx %016lx\\n\", trap, sparc_regs.tpc);\n-#else\n-\tfprintf(stderr, \"syscall: unknown syscall trap %08lx %08lx\\n\", trap, sparc_regs.pc);\n+}\n #endif\n-\treturn -1;\n-}\n \n-\/* Extract the system call number from the registers. *\/\n-if (trap == 0x91d02027) {\n-\tscno = 156;\n-} else {\n-\tscno = sparc_regs.u_regs[U_REG_G1];\n-}\n-\n-if (scno == 0) {\n-\tscno = sparc_regs.u_regs[U_REG_O0];\n-\tmemmove(&sparc_regs.u_regs[U_REG_O0], &sparc_regs.u_regs[U_REG_O1], 7*sizeof(sparc_regs.u_regs[0]));\n-}\n+scno = sparc_regs.u_regs[U_REG_G1];\n"} {"commit":"212287c56c81c0bbe57f182e063d4b1e3bf850d3","subject":"x32: update io_{setup,submit} syscalls","message":"x32: update io_{setup,submit} syscalls\n\nStarting in 3.16, these two syscalls have gotten their own entry\npoint for x32. See linux 7fd44dacdd803c0bbf38bf478d51d280902bb0f1.\n\n* linux\/x32\/syscallent.h: Change existing io_{setup,submit} to 64bit,\nand add new entry points for x32 specifically.\n","repos":"Saruta\/strace,lkundrak\/strace,Yu-AndroidM\/android_external_strace,cuviper\/strace,kapdop\/android_external_strace,AOSP-YU\/platform_external_strace,TeamExodus\/external_strace,geekboxzone\/mmallow_external_strace,xin3liang\/platform_external_strace,kapdop\/android_external_strace,geekboxzone\/mmallow_external_strace,YUPlayGodDev\/platform_external_strace,Yu-AndroidM\/android_external_strace,xin3liang\/platform_external_strace,geekboxzone\/mmallow_external_strace,TeamExodus\/external_strace,geofft\/strace,TeamExodus\/external_strace,AOSP-YU\/platform_external_strace,bnoordhuis\/strace,YUPlayGodDev\/platform_external_strace,Infinitive-OS\/platform_external_strace,geofft\/strace,Infinitive-OS\/platform_external_strace,vrastogi\/strace,bigzz\/strace_android,Saruta\/strace,geekboxzone\/mmallow_external_strace,lkundrak\/strace,bnoordhuis\/strace,MonkeyZZZZ\/platform_external_strace,kapdop\/android_external_strace,vrastogi\/strace,cuviper\/strace,vrastogi\/strace,bnoordhuis\/strace,Distrotech\/strace,xin3liang\/platform_external_strace,Saruta\/strace,lkundrak\/strace,Saruta\/strace,AOSP-YU\/platform_external_strace,TeamExodus\/external_strace,vrastogi\/strace,Infinitive-OS\/platform_external_strace,geofft\/strace,YUPlayGodDev\/platform_external_strace,MonkeyZZZZ\/platform_external_strace,geofft\/strace,bnoordhuis\/strace,bigzz\/strace_android,AOSP-YU\/platform_external_strace,YUPlayGodDev\/platform_external_strace,kapdop\/android_external_strace,TeamExodus\/external_strace,YUPlayGodDev\/platform_external_strace,Saruta\/strace,MonkeyZZZZ\/platform_external_strace,bigzz\/strace_android,cuviper\/strace,Distrotech\/strace,bigzz\/strace_android,bigzz\/strace_android,MonkeyZZZZ\/platform_external_strace,xin3liang\/platform_external_strace,kapdop\/android_external_strace,lkundrak\/strace,Infinitive-OS\/platform_external_strace,vrastogi\/strace,geofft\/strace,geekboxzone\/mmallow_external_strace,Infinitive-OS\/platform_external_strace,Distrotech\/strace,AOSP-YU\/platform_external_strace,Yu-AndroidM\/android_external_strace,Distrotech\/strace,Distrotech\/strace,cuviper\/strace,Yu-AndroidM\/android_external_strace,Yu-AndroidM\/android_external_strace,MonkeyZZZZ\/platform_external_strace,cuviper\/strace","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- linux\/x32\/syscallent.h\n+++ linux\/x32\/syscallent.h\n@@ -204,10 +204,10 @@\n \t{ 3,\t0,\tsys_sched_setaffinity,\t\"sched_setaffinity\" },\/* 203 *\/\n \t{ 3,\t0,\tsys_sched_getaffinity,\t\"sched_getaffinity\" },\/* 204 *\/\n \t{ 1,\t0,\tprintargs,\t\t\"64:set_thread_area\" }, \/* 205 *\/\n-\t{ 2,\t0,\tsys_io_setup,\t\t\"io_setup\"\t}, \/* 206 *\/\n+\t{ 2,\t0,\tsys_io_setup,\t\t\"64:io_setup\"\t}, \/* 206 *\/\n \t{ 1,\t0,\tsys_io_destroy,\t\t\"io_destroy\"\t}, \/* 207 *\/\n \t{ 5,\t0,\tsys_io_getevents,\t\"io_getevents\"\t}, \/* 208 *\/\n-\t{ 3,\t0,\tsys_io_submit,\t\t\"io_submit\"\t}, \/* 209 *\/\n+\t{ 3,\t0,\tsys_io_submit,\t\t\"64:io_submit\"\t}, \/* 209 *\/\n \t{ 3,\t0,\tsys_io_cancel,\t\t\"io_cancel\"\t}, \/* 210 *\/\n \t{ 1,\t0,\tprintargs,\t\t\"64:get_thread_area\"\t}, \/* 211 *\/\n \t{ 4,\t0,\tsys_lookup_dcookie,\t\"lookup_dcookie\"}, \/* 212 *\/\n@@ -346,3 +346,5 @@\n \t{ 6,\t0,\tsys_process_vm_writev,\t\"process_vm_writev\" }, \/* 540 *\/\n \t{ 5,\tTN,\tsys_setsockopt,\t\t\"setsockopt\"\t}, \/* 541 *\/\n \t{ 5,\tTN,\tsys_getsockopt,\t\t\"getsockopt\"\t}, \/* 542 *\/\n+\t{ 2,\t0,\tsys_io_setup,\t\t\"io_setup\"\t}, \/* 543 *\/\n+\t{ 3,\t0,\tsys_io_submit,\t\t\"io_submit\"\t}, \/* 544 *\/\n"} {"commit":"b86b712b3fd21fff45cb6bab08f7fc54418211be","subject":"MatchContext: add documentation","message":"MatchContext: add documentation\n","repos":"thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext,thomastrapp\/hext","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libhext\/include\/hext\/MatchContext.h\n+++ libhext\/include\/hext\/MatchContext.h\n@@ -5,14 +5,17 @@\n #include <vector>\n #include <cstddef>\n \n+#include <boost\/optional.hpp>\n #include <gumbo.h>\n-#include <boost\/optional.hpp>\n \n \n namespace hext {\n \n+\n class Rule;\n \n+\n+\/\/\/ A MatchContext matches a group of rules against a GumboVector of nodes.\n class MatchContext\n {\n public:\n@@ -26,9 +29,12 @@\n std::size_t mandatory_rule_cnt\n );\n \n+ \/\/\/ Return next match_group. Returns empty if there are no more matches.\n boost::optional<match_group> match_next();\n \n private:\n+ \/\/\/ Return the next mandatory rule after `it`.\n+ \/\/\/ Return this->r_end_ if there are no mandatory rules.\n rule_iter next_mandatory_rule(rule_iter it) const;\n \n rule_iter r_begin_;\n"} {"commit":"ccc0f9b0c6e7c530532482f949c97e2ad11c1092","subject":"trivial: Assign the context of incorporated devices early","message":"trivial: Assign the context of incorporated devices early\n\nThis means we can use GObject->constructed() to copy the context over\nto FuDevice helpers that also require the context.\n","repos":"fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libfwupdplugin\/fu-plugin.c\n+++ libfwupdplugin\/fu-plugin.c\n@@ -1579,7 +1579,7 @@\n \t}\n \n \t\/* create new device and incorporate existing properties *\/\n-\tdev = g_object_new(device_gtype, NULL);\n+\tdev = g_object_new(device_gtype, \"context\", priv->ctx, NULL);\n \tfu_device_incorporate(dev, FU_DEVICE(device));\n \tif (!fu_plugin_runner_device_created(self, dev, error))\n \t\treturn FALSE;\n"} {"commit":"a6b96e233049bc8edda3639aa470e0ea16636688","subject":"Use the SHA256 binary hash for the quirk GResource key","message":"Use the SHA256 binary hash for the quirk GResource key\n\nThere's no security issue, but it's one less thing I have to justify\nduring a security review.\n","repos":"fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd,fwupd\/fwupd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libfwupdplugin\/fu-quirks.c\n+++ libfwupdplugin\/fu-quirks.c\n@@ -356,7 +356,7 @@\n \tblob_self = fu_bytes_get_contents(\"\/proc\/self\/exe\", error);\n \tif (blob_self == NULL)\n \t\treturn FALSE;\n-\thash_self = g_compute_checksum_for_bytes(G_CHECKSUM_SHA1, blob_self);\n+\thash_self = g_compute_checksum_for_bytes(G_CHECKSUM_SHA256, blob_self);\n \txb_builder_append_guid(builder, hash_self);\n \n \t\/* success *\/\n"} {"commit":"cb207421495c2443c645c5fd22187c484728289b","subject":"parsing will hopefully work but i havent tested it yet","message":"parsing will hopefully work but i havent tested it yet\n","repos":"dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo,dominickhera\/PosaRepo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- year3\/cis2750\/a1\/src\/CalendarParser.c\n+++ year3\/cis2750\/a1\/src\/CalendarParser.c\n@@ -22,10 +22,10 @@\n \/\/ #include \"LinkedListAPI.h\"\n #include \"CalendarParser.h\"\n \n-Calendar* initializeCalendar(float version, char prodID[]);\n-Event* initializeEvent(char *UID, char *creationDateTime);\n+Calendar* initializeCalendar();\n+Event* initializeEvent();\n Property* initializeProperty(char propName, char propDescr[]);\n-Alarm* initializeAlarm(char action, char* trigger);\n+Alarm* initializeAlarm();\n DateTime* initializeDateTime(char *date, char *timeValue, bool UTC);\n void testDestroy(void *data);\n char * testPrint(void *toBePrinted);\n@@ -36,8 +36,33 @@\n FILE *fp;\n char line[256];\n char lineStorage[256][500];\n+ char UIDStorage[256];\n+ char VersionStorage[256];\n+ char PROIDStorage[256];\n+ char DSTAMPStorage[256];\n+ char triggerStorage[256];\n+ char actionStorage[128];\n+ char * tempStorage = malloc(sizeof(char) * 1000);\n+ char * otherTempStorage = malloc(sizeof(char) * 1000);\n char * fileTypeCheck;\n+ char * calenderCheck;\n+ char * eventCheck;\n+ char * alarmCheck;\n+ \/\/ char * propertyCheck;\n+ char * UIDCheck;\n+ char * versionCheck;\n+ char * proIDCheck;\n+ char * beginCheck;\n+ char * endCheck;\n+ char * timeStampCheck;\n+ char * otherCheck;\n int count = 0;\n+ int tempSize = 0;\n+ int eventFlag = 0;\n+ int calendarFlag = 0;\n+ int alarmFlag = 0;\n+ \/\/ int propertyFlag = 0;\n+ int tempCount = 0;\n \n \n \/\/parsing into a string array\n@@ -74,6 +99,258 @@\n return INV_FILE;\n }\n \n+ Calendar * parseCalendar = NULL;\n+ Event * parseEvent = NULL;\n+ Alarm * tempAlarm;\n+ Property * tempProperty;\n+\n+ \/\/time to actually start going through the file and figuring out what the fuck is in here\n+\n+ for(int i = 0; i < count; i++)\n+ {\n+ if((beginCheck = strcasestr(lineStorage[i], \"BEGIN\")) && (calenderCheck = strcasestr(lineStorage[i], \"VCALENDAR\")) && calendarFlag == 0)\n+ {\n+ parseCalendar = initializeCalendar();\n+ calendarFlag++;\n+ }\n+ else if((proIDCheck = strcasestr(lineStorage[i], \"PROID\")))\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(PROIDStorage, tempStorage);\n+ strcpy(parseCalendar->prodID, PROIDStorage);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000);\n+ }\n+ else if((versionCheck = strcasestr(lineStorage[i], \"VERSION\")))\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(VersionStorage, tempStorage);\n+ parseCalendar->version = atof(VersionStorage);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000);\n+ }\n+ else if((beginCheck = strcasestr(lineStorage[i], \"BEGIN\")) && (eventCheck = strcasestr(lineStorage[i], \"VEVENT\")) && eventFlag == 0)\n+ {\n+ eventFlag++;\n+ parseEvent = initializeEvent();\n+ parseCalendar->event = parseEvent;\n+ }\n+ else if((UIDCheck = strcasestr(lineStorage[i], \"UID\")) && eventFlag != 0)\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(UIDStorage, tempStorage);\n+ strcpy(parseEvent->UID, UIDStorage);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000); \n+ }\n+ else if((timeStampCheck = strcasestr(lineStorage[i], \"DSTAMP\")))\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(DSTAMPStorage, tempStorage);\n+ char tempTime[7];\n+ char tempDate[9];\n+ char * boolCheck;\n+ bool tempUTC;\n+ if((boolCheck = strstr(DSTAMPStorage, \"Z\")))\n+ {\n+ tempUTC = true;\n+ }\n+ else\n+ {\n+ tempUTC = false;\n+ }\n+\n+ char * strTokTime;\n+ char * strTokDate;\n+\n+ strTokTime = strtok(DSTAMPStorage, \"T Z\");\n+ strTokDate = strtok(DSTAMPStorage, \"T Z\");\n+ strcpy(tempTime, strTokTime);\n+ strcpy(tempDate, strTokDate);\n+\n+ parseEvent->creationDateTime = *initializeDateTime(tempTime, tempDate, tempUTC);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000); \n+ }\n+ else if((endCheck = strcasestr(lineStorage[i], \"END\")) && (eventCheck = strcasestr(lineStorage[i], \"VEVENT\")) && eventFlag == 1)\n+ {\n+ eventFlag--;\n+ }\n+ else if((beginCheck = strcasestr(lineStorage[i], \"BEGIN\")) && (alarmCheck = strcasestr(lineStorage[i], \"VALARM\")) && eventFlag == 1 && alarmFlag == 0)\n+ {\n+ alarmFlag++;\n+ tempAlarm = (Alarm*)malloc(sizeof(Alarm));\n+ \/\/ parseEvent->alarms = initializeAlarm();\n+ }\n+ else if((otherCheck = strcasestr(lineStorage[i], \"TRIGGER\")) && eventFlag == 1 && alarmFlag == 1)\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ';')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(triggerStorage, tempStorage);\n+ strcpy(tempAlarm->trigger, triggerStorage);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000); \n+ }\n+ else if((otherCheck = strcasestr(lineStorage[i], \"ACTION\")) && eventFlag == 1 && alarmFlag == 1)\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ }\n+\n+ strcpy(actionStorage, tempStorage);\n+ strcpy(tempAlarm->action, actionStorage);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000); \n+ }\n+ else if((endCheck = strcasestr(lineStorage[i], \"END\")) && (alarmCheck = strcasestr(lineStorage[i], \"VALARM\")) && alarmFlag == 1 && eventFlag == 1)\n+ {\n+ alarmFlag--;\n+ insertFront(&parseEvent->alarms, (void*)tempAlarm);\n+ }\n+ \/\/alarm property\n+ else if(calendarFlag == 1 && eventFlag == 1 && alarmFlag == 1)\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':' || lineStorage[i][j] != ';')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0' || lineStorage[i][j] != ';')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ else\n+ {\n+ while(lineStorage[i][j] != ':' || lineStorage[i][j] != ';')\n+ {\n+ otherTempStorage[tempCount] = lineStorage[i][j];\n+ tempCount++;\n+ j++;\n+ }\n+ \/\/ tempCount++;\n+ }\n+ }\n+\n+ tempProperty = initializeProperty(*tempStorage, otherTempStorage);\n+ insertFront(&tempAlarm->properties, (void *)tempProperty);\n+ tempSize = 0;\n+ tempCount = 0;\n+ memset(tempStorage, '\\0', 1000);\n+ memset(otherTempStorage, '\\0', 1000);\n+ }\n+ \/\/event property\n+ else if(calendarFlag == 1 && eventFlag == 1 && alarmFlag == 0)\n+ {\n+ for(int j = 0; j < strlen(lineStorage[i]); j++)\n+ {\n+ if(lineStorage[i][j] == ':' || lineStorage[i][j] != ';')\n+ {\n+ j++;\n+ while(lineStorage[i][j] != '\\0' || lineStorage[i][j] != ';')\n+ {\n+ tempStorage[tempSize] = lineStorage[i][j];\n+ tempSize++;\n+ j++;\n+ }\n+ }\n+ else\n+ {\n+ while(lineStorage[i][j] != ':' || lineStorage[i][j] != ';')\n+ {\n+ otherTempStorage[tempCount] = lineStorage[i][j];\n+ tempCount++;\n+ j++;\n+ }\n+ \/\/ tempCount++;\n+ }\n+ }\n+\n+ tempProperty = initializeProperty(*tempStorage, otherTempStorage);\n+ insertFront(&parseEvent->properties, tempProperty);\n+ tempSize = 0;\n+ memset(tempStorage, '\\0', 1000);\n+ memset(otherTempStorage, '\\0', 1000);\n+ }\n+\n+\n+ }\n }\n \n void deleteCalendar(Calendar* obj)\n@@ -91,84 +368,40 @@\n \n }\n \n-Calendar* initializeCalendar(float version, char *prodID)\n-{\n-\tCalendar * temp = malloc(sizeof(Calendar));\n- \/\/ temp->prodID = malloc(sizeof(prodID)*1000);\n- temp->version = version;\n- strcpy(temp->prodID, prodID);\n+Calendar* initializeCalendar()\n+{\n+ Calendar * temp = malloc(sizeof(Calendar));\n temp->event = NULL;\n \n return temp;\n }\n \n-Event* initializeEvent(char *UID, char *creationDateTime)\n-{\n-\n- char tempTime[256];\n- char tempDate[256];\n- char * boolCheck;\n- bool tempUTC;\n-\n-\tEvent * tempEvent = malloc(sizeof(Event));\n- \/\/ tempEvent->UID = malloc(sizeof(char)*1000);\n- strcpy(tempEvent->UID, UID);\n- \/\/ tempEvent->creationDateTime = creationDateTime;\n-\n- if(creationDateTime != NULL)\n- {\n-\n- if((boolCheck = strstr(creationDateTime, \"Z\")))\n- {\n- tempUTC = true;\n- }\n- else\n- {\n- tempUTC = false;\n- }\n-\n- char * strTokTime;\n- char * strTokDate;\n-\n- strTokTime = strtok(creationDateTime, \"TZ\");\n- strTokDate = strtok(creationDateTime, \"TZ\");\n- strcpy(tempTime, strTokTime);\n- strcpy(tempDate, strTokDate);\n-\n- tempEvent->creationDateTime = *initializeDateTime(tempTime, tempDate, tempUTC);\n- }\n- else\n- {\n- tempEvent->creationDateTime = *initializeDateTime(NULL, NULL, NULL);\n- }\n+Event* initializeEvent()\n+{\n+\n+ Event * tempEvent = malloc(sizeof(Event));\n tempEvent->properties = initializeList(testPrint, testDestroy, testCompare);\n-\ttempEvent->alarms = initializeList(testPrint, testDestroy, testCompare);\n-\n-\treturn tempEvent;\n+ tempEvent->alarms = initializeList(testPrint, testDestroy, testCompare);\n+\n+ return tempEvent;\n \n }\n \n Property* initializeProperty(char propName, char *propDescr)\n {\n \n-\tProperty * tempProp = malloc(sizeof(Property));\n-\t\/\/ tempProp->propName = malloc(sizeof(char)*200);\n-\t\/\/ tempProp->propDescr = malloc(sizeof(propDescr));\n-\tstrcpy(tempProp->propName, &propName);\n-\tstrcpy(tempProp->propDescr, propDescr);\n-\n-\treturn tempProp;\n-\n-}\n-\n-Alarm* initializeAlarm(char action, char* trigger)\n-{\n-\n-\tAlarm * tempAlarm = malloc(sizeof(Alarm));\n- \/\/ tempAlarm->action = malloc(sizeof(char)*200);\n- tempAlarm->trigger = malloc(sizeof(trigger));\n- strcpy(tempAlarm->action, &action);\n- strcpy(tempAlarm->trigger, trigger);\n+ Property * tempProp = malloc(sizeof(Property));\n+ strcpy(tempProp->propName, &propName);\n+ strcpy(tempProp->propDescr, propDescr);\n+\n+ return tempProp;\n+\n+}\n+\n+Alarm* initializeAlarm()\n+{\n+\n+ Alarm * tempAlarm = malloc(sizeof(Alarm));\n tempAlarm->properties = initializeList(testPrint, testDestroy, testCompare);\n \n return tempAlarm;\n@@ -177,14 +410,12 @@\n \n DateTime* initializeDateTime(char *date, char *timeValue, bool UTC)\n {\n-\tDateTime *tempTime = malloc(sizeof(DateTime));\n-\tstrcpy(tempTime->date, date);\n-\tstrcpy(tempTime->time, timeValue);\n-\ttempTime->UTC = UTC;\n-\t\/\/ tempTime->date = malloc(sizeof(char) * 9);\n-\t\/\/ tempTime->time = malloc\n-\n-\treturn tempTime;\n+ DateTime *tempTime = malloc(sizeof(DateTime));\n+ strcpy(tempTime->date, date);\n+ strcpy(tempTime->time, timeValue);\n+ tempTime->UTC = UTC;\n+\n+ return tempTime;\n }\n \n void testDestroy(void *data)\n"} {"commit":"30ca9ebf2aff4487532bd0460a80ac6bffe00875","subject":"Fix crash on separator item (after last commit).","message":"Fix crash on separator item (after last commit).\n","repos":"lxde\/menu-cache,lxde\/menu-cache","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmenu-cache\/menu-cache.c\n+++ libmenu-cache\/menu-cache.c\n@@ -340,7 +340,7 @@\n \n static void menu_cache_file_dir_unref(MenuCacheFileDir *file_dir)\n {\n- if (g_atomic_int_dec_and_test(&file_dir->n_ref))\n+ if (file_dir && g_atomic_int_dec_and_test(&file_dir->n_ref))\n {\n g_free(file_dir->dir);\n g_free(file_dir);\n"} {"commit":"f7a34ecffc516d066ae09f4ad0a3202dd350916f","subject":"multipathd crash on shutdown","message":"multipathd crash on shutdown\n\nOn shutdown multipathd flushes its internal message queue;\nbut we have to check if the messages on the queue are not empty.\n\nSigned-off-by: Hannes Reinecke <b0d1e9e4a4e27620745ff49be9000da3174a4cc6@suse.de>\n","repos":"unakatsuo\/multipath-tools,unakatsuo\/multipath-tools,vijaychauhan\/multipath-tools,unakatsuo\/multipath-tools,gebi\/multipath-tools,vijaychauhan\/multipath-tools,grzn\/multipath-tools-explained,grzn\/multipath-tools-explained","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmultipath\/log_pthread.c\n+++ libmultipath\/log_pthread.c\n@@ -31,7 +31,8 @@\n \t\tpthread_mutex_lock(logq_lock);\n \t\tempty = log_dequeue(la->buff);\n \t\tpthread_mutex_unlock(logq_lock);\n-\t\tlog_syslog(la->buff);\n+\t\tif (!empty)\n+\t\t\tlog_syslog(la->buff);\n \t} while (empty == 0);\n }\n \n"} {"commit":"0fab5ee4959fc2dbbc63b90508183c5efc005125","subject":"fixed undefined symbol zend_error_noreturn","message":"fixed undefined symbol zend_error_noreturn\n","repos":"arnaud-lb\/php-memory-profiler,arnaud-lb\/php-memory-profiler,arnaud-lb\/php-memory-profiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- memprof.c\n+++ memprof.c\n@@ -956,7 +956,8 @@\n zend_uintptr_t * symaddr_p;\n if (zend_hash_find(symbols, prev->name, prev->name_len+1, (void**) &symaddr_p) != SUCCESS) {\n \/* shouldn't happen *\/\n- zend_error_noreturn(E_CORE_ERROR, \"symbol address not found\");\n+ zend_error(E_CORE_ERROR, \"symbol address not found\");\n+ return;\n }\n stream_write_word(stream, *symaddr_p);\n }\n"} {"commit":"3e11c197042d37ee9c304f59ad83f42cea401a49","subject":"Add memory size info example","message":"Add memory size info example\n","repos":"tisma\/ctorious,tisma\/ctorious","returncode":1,"stderr":"error: pathspec 'memsize.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- memsize.c\n+++ memsize.c\n@@ -0,0 +1,19 @@\n+#include <stdio.h>\n+#include <sys\/sysinfo.h>\n+#include <stdint.h>\n+\n+uint64_t get_memory_size()\n+{\n+\tstruct sysinfo info;\n+\tsysinfo( &info );\n+\tprintf(\"total ram %lu, mem units %lu\\n\", (size_t)info.totalram, (size_t)info.mem_unit);\n+\treturn (size_t)info.totalram * (size_t)info.mem_unit;\n+}\n+\n+int main(int argc, char* argv[])\n+{\n+\tuint64_t total_memory = get_memory_size();\n+\tprintf(\"Total physical memory: %lu\\n\", total_memory);\n+\treturn 0;\n+}\n+\n"} {"commit":"194111aa3bbb2b5b398d1471caca9f4c7c75a181","subject":"Fix debug typo.","message":"Fix debug typo.","repos":"boutier\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -1119,7 +1119,7 @@\n perror(\"send(unicast)\");\n } else {\n fprintf(stderr,\n- \"Warning: bucket full, dropping unicast packet\"\n+ \"Warning: bucket full, dropping unicast packet \"\n \"to %s if %s.\\n\",\n format_address(unicast_neighbour->address),\n unicast_neighbour->ifp->name);\n"} {"commit":"2103e0518790bfcfea15e30b42f8102058d95402","subject":"Avoid potential conflicts with macros DEG2RAD, RAD2DEG","message":"Avoid potential conflicts with macros DEG2RAD, RAD2DEG\n","repos":"MRPT\/mrpt,MRPT\/mrpt,MRPT\/mrpt,MRPT\/mrpt,MRPT\/mrpt","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libs\/base\/include\/mrpt\/utils\/bits.h\n+++ libs\/base\/include\/mrpt\/utils\/bits.h\n@@ -89,6 +89,12 @@\n \t\t\t~CProfilerProxy() { global_profiler_leave(f); }\n \t\t};\n \n+#ifdef DEG2RAD \/\/ functions are preferred over macros\n+#undef DEG2RAD\n+#endif\n+#ifdef RAD2DEG\n+#undef RAD2DEG\n+#endif\n \t\t\/** Degrees to radians *\/\n \t\tinline double DEG2RAD(const double x) { return x*M_PI\/180.0;\t}\n \t\t\/** Degrees to radians *\/\n@@ -159,9 +165,9 @@\n \t\t#endif\n \t\t}\n \n-\t\t\/** Efficient and portable evaluation of the absolute difference of two unsigned integer values \n+\t\t\/** Efficient and portable evaluation of the absolute difference of two unsigned integer values\n \t\t * (but will also work for signed and floating point types) *\/\n-\t\ttemplate <typename T> \n+\t\ttemplate <typename T>\n \t\tinline T abs_diff(const T a, const T b) {\n \t\t\treturn std::max(a,b) - std::min(a,b);\n \t\t}\n"} {"commit":"1a66c3fbbc068e4abcb89ee2f1d1176b3a699241","subject":"Fix message type when sending unicast requests.","message":"Fix message type when sending unicast requests.\n","repos":"wlanslovenija\/babeld,wlanslovenija\/babeld,jech\/babeld,Gwendocg\/babeldToS,tcatm\/babeld,Drooids\/babeld,sudomesh\/babeld,jech\/babeld,boutier\/babeld,woniullb\/babeld,Gwendocg\/babeldToS,dtaht\/babeld-shortrtt-metrics","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -525,7 +525,7 @@\n prefix ? format_prefix(prefix, plen) : \"any\",\n hop_count);\n \n- buf[0] = 1;\n+ buf[0] = 2;\n if(prefix) {\n buf[1] = plen;\n buf[2] = 0;\n"} {"commit":"9b879b02f2ba7c6df9bf0c46282ec80dc3c05b02","subject":"Fix printing of send_unicast_request.","message":"Fix printing of send_unicast_request.\n","repos":"boutier\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -1843,9 +1843,14 @@\n \/* make sure any buffered updates go out before this request. *\/\n flushupdates(neigh->ifp);\n \n- debugf(\"sending unicast request to %s for %s.\\n\",\n- format_address(neigh->address),\n- prefix ? format_prefix(prefix, plen) : \"any\");\n+ if(!prefix)\n+ debugf(\"sending unicast request to %s for any.\\n\",\n+ format_address(neigh->address));\n+ else\n+ debugf(\"sending unicast request to %s for %s from %s.\\n\",\n+ format_address(neigh->address),\n+ format_prefix(prefix, plen),\n+ format_prefix(src_prefix, src_plen));\n v4 = plen >= 96 && v4mapped(prefix);\n pb = v4 ? ((plen - 96) + 7) \/ 8 : (plen + 7) \/ 8;\n len = !prefix ? 2 : 2 + pb;\n"} {"commit":"eae960862cdb8c4c7322a0913b4c3e7fa38d86ba","subject":"ap_power: Check for GPIO_GET_CONFIG option","message":"ap_power: Check for GPIO_GET_CONFIG option\n\nUse CONFIG_GPIO_GET_CONFIG as a guard for calling\ngpio_pin_get_config_dt() to get the output pin value.\nSome platforms use ioexpanders that do not support this API call.\n\nThere is a possibility but not using this call that the wrong\nvalue will be retrieved if the output pin is open drain, and the\nactual voltage on the pin is below the threshold of detecting a\nhigh state, but the ioexpander pins should not be in this situation.\n\nBUG=b:243309500\nTEST=.\/twister -T zephyr\/test\/{ap_power,drivers}\nBRANCH=none\n\nSigned-off-by: Andrew McRae <44ad1424cfc8411c96d9181798ca41ae55709dfb@google.com>\nChange-Id: Ieae25aaf5549eb9c7ec5dd46ef25e03b2fd207a2\nReviewed-on: https:\/\/chromium-review.googlesource.com\/c\/chromiumos\/platform\/ec\/+\/3844247\nCode-Coverage: Zoss <345cf107e82c70959d46f59d98bddc98ce458aff@prod.google.com>\nReviewed-by: Peter Marheine <ef0b2c492edde94778d7465bfbaeed52c5be6858@chromium.org>\n","repos":"coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec,coreboot\/chrome-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- zephyr\/subsys\/ap_pwrseq\/signal_gpio.c\n+++ zephyr\/subsys\/ap_pwrseq\/signal_gpio.c\n@@ -107,7 +107,7 @@\n \t * physical level of the pin (open drain outputs\n \t * may have a low voltage).\n \t *\/\n-\tif (gpio_config[index].output) {\n+\tif (IS_ENABLED(CONFIG_GPIO_GET_CONFIG) && gpio_config[index].output) {\n \t\tint rv;\n \t\tgpio_flags_t flags;\n \n"} {"commit":"49a0d0b35ae7fb61a6d5e88d2122543b7a6243dc","subject":"Re-re-re fix message.c ifup test","message":"Re-re-re fix message.c ifup test\n","repos":"jech\/babeld,jech\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -1903,9 +1903,11 @@\n id, neigh->ifp, resend_delay);\n } else {\n struct interface *ifp;\n- FOR_ALL_INTERFACES(ifp)\n+ FOR_ALL_INTERFACES(ifp) {\n+\t if(!if_up(ifp)) continue;\n send_multihop_request(&ifp->buf, prefix, plen, src_prefix, src_plen,\n seqno, id, 127);\n+\t}\n }\n }\n \n"} {"commit":"2acff545344915e13e366059bc8ea6fb3992d004","subject":"categorizing the functions in the comments","message":"categorizing the functions in the comments\n","repos":"arturoc\/ofxCv,danoli3\/ofxCv,tgfrerer\/ofxCv,cran-io\/ofxCv,HalfdanJ\/ofxCv,tgfrerer\/ofxCv,anthonykylai\/test1,SpecularStudio\/ofxCv,DHaylock\/ofxCv,wenbo001\/ofxCv,xionluhnis\/ofxCv,cran-io\/ofxCv,DHaylock\/ofxCv,DHaylock\/ofxCv,HalfdanJ\/ofxCv,arturoc\/ofxCv,SpecularStudio\/ofxCv,HalfdanJ\/ofxCv,wenbo001\/ofxCv,SpecularStudio\/ofxCv,cran-io\/ofxCv,xionluhnis\/ofxCv,xionluhnis\/ofxCv,wenbo001\/ofxCv,anthonykylai\/test1,tgfrerer\/ofxCv,danoli3\/ofxCv,danoli3\/ofxCv,arturoc\/ofxCv,anthonykylai\/test1","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libs\/ofxCv\/include\/ofxCv\/Wrappers.h\n+++ libs\/ofxCv\/include\/ofxCv\/Wrappers.h\n@@ -1,16 +1,22 @@\n \/*\n wrappers provide an easy-to-use interface to OpenCv functions when using data\n from openFrameworks. they don't implement anything novel, they just wrap OpenCv\n- functions in a very direct way.\n- \n- useful functions from this file:\n- - max, min\n- - multiply, divide, add, subtract\n- - absdiff\n+ functions in a very direct way. many of the functions have in-place and\n+ not-in-place variations.\n+ \n+ high level image operations:\n+ - Canny (edge detection), medianBlur, blur (gaussian), convertColor\n+ \n+ low level image manipulation and comparison:\n+ - threshold, normalize, invert, lerp\n - bitwise_and, bitwise_or, bitwise_xor\n- - lerp\n- \n- many of the functions have in-place and non-in-place variations\n+ - max, min, multiply, divide, add, subtract, absdiff\n+ \n+ image transformation:\n+ - rotate, resize, warpPerspective\n+ \n+ point set\/ofPolyline functions:\n+ - convexHull, minAreaRect, fitEllipse, unwarpPerspective, warpPerspective\n \n in ofxOpenCv, these were methods of ofxCvImage. for completeness, we need:\n ROI methods (set, get, reset)\n@@ -260,10 +266,4 @@\n \t\tMat rotationMatrix = getRotationMatrix2D(center, angle, 1);\n \t\twarpAffine(srcMat, dstMat, rotationMatrix, srcMat.size(), interpolation, BORDER_CONSTANT, toCv(fill));\n \t}\n-\t\n-\t\/\/ older wrappers, need to be templated...\n-\t\/\/void matchRegion(ofImage& source, ofRectangle& region, ofImage& search, FloatImage& result);\n-\tvoid matchRegion(Mat& source, ofRectangle& region, Mat& search, Mat& result);\n-\t\/\/void convolve(ofImage& source, FloatImage& kernel, ofImage& destination);\n-\t\/\/void convolve(ofImage& img, FloatImage& kernel);\n }\n"} {"commit":"3720540085a5c12a15a0a3c2e583a0785bbbb420","subject":"docs: Use comments to reduce the risk of breakage","message":"docs: Use comments to reduce the risk of breakage\n","repos":"OpenSCAP\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap,redhatrises\/openscap,ybznek\/openscap,isimluk\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,postfix\/openscap,mpreisler\/openscap,ybznek\/openscap,openprivacy\/openscap,OpenSCAP\/openscap,ybznek\/openscap,openprivacy\/openscap,ybznek\/openscap,isimluk\/openscap,mpreisler\/openscap,isimluk\/openscap,ybznek\/openscap,mpreisler\/openscap,postfix\/openscap,mpreisler\/openscap,openprivacy\/openscap,redhatrises\/openscap,redhatrises\/openscap,Hexadorsimal\/openscap,Hexadorsimal\/openscap,redhatrises\/openscap,postfix\/openscap,openprivacy\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,openprivacy\/openscap,redhatrises\/openscap,jan-cerny\/openscap,ybznek\/openscap,isimluk\/openscap,OpenSCAP\/openscap,postfix\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,mpreisler\/openscap,openprivacy\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,isimluk\/openscap,Hexadorsimal\/openscap,isimluk\/openscap,postfix\/openscap,postfix\/openscap,jan-cerny\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/XCCDF\/benchmark.c\n+++ src\/XCCDF\/benchmark.c\n@@ -478,6 +478,9 @@\n {\n \tstruct xccdf_result *result = NULL;\n \tif (testresult_id == NULL) {\n+\t\t\/* Take the latest TestResult by default. It may turn out to be\n+\t\t * a good idea to not change that, since the SCAP-Workbench project\n+\t\t * is assuming thissemantics. *\/\n \t\tstruct xccdf_result_iterator * results_it = xccdf_benchmark_get_results(benchmark);\n \t\twhile (xccdf_result_iterator_has_more(results_it))\n \t\t\tresult = xccdf_result_iterator_next(results_it);\n"} {"commit":"e4f6433dee2950546e9a2defc6764f0dfd580296","subject":"Fix valgrind assertions.","message":"Fix valgrind assertions.\n","repos":"jech\/babeld,sudomesh\/babeld,dtaht\/babeld-shortrtt-metrics,Gwendocg\/babeldToS,boutier\/babeld,Drooids\/babeld,Gwendocg\/babeldToS,jech\/babeld,woniullb\/babeld,tcatm\/babeld,wlanslovenija\/babeld,wlanslovenija\/babeld","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- message.c\n+++ message.c\n@@ -82,7 +82,7 @@\n net->ifname, format_address(from));\n }\n numpxroutes = 0;\n- VALGRIND_MAKE_MEM_UNDEFINED(pxroutes, sizeof(pxroutes));\n+ VALGRIND_MAKE_MEM_UNDEFINED(&pxroutes, sizeof(pxroutes));\n }\n if(message[0] == 0) {\n if(memcmp(message + 4, myid, 16) == 0)\n@@ -142,7 +142,7 @@\n message[1], (message[2] << 8 | message[3]),\n neigh, pxroutes, numpxroutes);\n numpxroutes = 0;\n- VALGRIND_MAKE_MEM_UNDEFINED(pxroutes, sizeof(pxroutes));\n+ VALGRIND_MAKE_MEM_UNDEFINED(&pxroutes, sizeof(pxroutes));\n } else if(message[0] == 3) {\n debugf(\"Received txcost from %s.\\n\", format_address(from));\n if(memcmp(myid, message + 4, 16) == 0 ||\n@@ -445,9 +445,8 @@\n }\n }\n schedule_flush_now(net);\n- VALGRIND_MAKE_MEM_UNDEFINED(buffered_updates,\n- MAX_BUFFERED_UPDATES *\n- sizeof(struct destination));\n+ VALGRIND_MAKE_MEM_UNDEFINED(&buffered_updates,\n+ sizeof(buffered_updates));\n }\n update_flush_time.tv_sec = 0;\n update_flush_time.tv_usec = 0;\n"} {"commit":"77cd935290a08d4af87cdddb2ef953ed42a1a6f4","subject":"Added multiple include guards to message.h","message":"Added multiple include guards to message.h\n","repos":"m42a\/Lirch,m42a\/Lirch","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- message.h\n+++ message.h\n@@ -1,3 +1,6 @@\n+#ifndef MESSAGE_H_\n+#define MESSAGE_H_\n+\n #include <string>\n \n \/\/This is a sample, so the message only contains a string. This can be turned\n@@ -8,3 +11,5 @@\n public:\n \tstd::string text;\n };\n+\n+#endif\n"} {"commit":"2e30ac481f212b3490fde8dbd13f496a50d70f49","subject":"libsel4: Add remaining combinations of cap rights","message":"libsel4: Add remaining combinations of cap rights\n","repos":"cmr\/seL4,cmr\/seL4,cmr\/seL4","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libsel4\/include\/sel4\/shared_types.h\n+++ libsel4\/include\/sel4\/shared_types.h\n@@ -41,5 +41,7 @@\n #define seL4_CanWrite seL4_CapRights_new(0, 0, 1)\n #define seL4_CanGrant seL4_CapRights_new(1, 0, 0)\n #define seL4_NoWrite seL4_CapRights_new(1, 1, 0)\n+#define seL4_NoRead seL4_CapRights_new(1, 0, 1)\n+#define seL4_NoRights seL4_CapRights_new(0, 0, 0)\n \n #endif\n"} {"commit":"7b5224e080b19eb0c2c62c0d1bb1244cdb6e26b6","subject":"Don't use alpha from transforms for TextField's border or background color","message":"Don't use alpha from transforms for TextField's border or background color\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libswfdec\/swfdec_text_field_movie.c\n+++ libswfdec\/swfdec_text_field_movie.c\n@@ -593,7 +593,8 @@\n if (text->background) {\n cairo_rectangle (cr, limit.x0, limit.y0, limit.x1 - limit.x0, limit.y1 - limit.y0);\n color = swfdec_color_apply_transform (text_movie->background_color, trans);\n- swfdec_color_set_source (cr, color);\n+ \/\/ always use full alpha\n+ swfdec_color_set_source (cr, (color & 0xffffff) + (255 << 24));\n cairo_fill (cr);\n }\n \n@@ -604,7 +605,8 @@\n \tmovie->original_extents.y1 - movie->original_extents.y0 -\n \tSWFDEC_DOUBLE_TO_TWIPS (1));\n color = swfdec_color_apply_transform (text_movie->border_color, trans);\n- swfdec_color_set_source (cr, color);\n+ \/\/ always use full alpha\n+ swfdec_color_set_source (cr, (color & 0xffffff) + (255 << 24));\n cairo_set_line_width (cr, SWFDEC_DOUBLE_TO_TWIPS (1));\n cairo_set_operator (cr, CAIRO_OPERATOR_OVER);\n cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);\n"} {"commit":"3a9698034f59c57340b1871b807eff69a59f20a7","subject":"Throw only warning if route is not connected","message":"Throw only warning if route is not connected\n","repos":"MicrochipTech\/unicens-linux-daemon,MicrochipTech\/unicens-linux-daemon","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libraries\/ucs-xml\/UcsXml.c\n+++ libraries\/ucs-xml\/UcsXml.c\n@@ -1671,8 +1671,7 @@\n }\r\n if (routeAmount != ucs->routesSize)\r\n {\r\n- UcsXml_CB_OnError(\"At least one sink is not connected, because of wrong Route name! Sources:%d Sinks:%d\", 2, srcCnt, snkCnt);\r\n- RETURN_ASSERT(Parse_XmlError, \"Route error\");\r\n+ UcsXml_CB_OnError(\"Warning: At least one sink is not connected, Sources:%d Sinks:%d\", 2, srcCnt, snkCnt);\r\n }\r\n \r\n #ifdef DEBUG\r\n"} {"commit":"8ddf106a58d9f9b39ec8cb86229bba4c09e1ecdc","subject":"Correctly check for the dirty flag in DBGIO VDP2 device","message":"Correctly check for the dirty flag in DBGIO VDP2 device\n","repos":"ijacquez\/libyaul,ijacquez\/libyaul,ijacquez\/libyaul,ijacquez\/libyaul","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libyaul\/kernel\/dbgio\/devices\/vdp2.c\n+++ libyaul\/kernel\/dbgio\/devices\/vdp2.c\n@@ -308,7 +308,7 @@\n static void\n _flush(void)\n {\n- if (_dev_state->state != STATE_BUFFER_DIRTY) {\n+ if ((_dev_state->state & STATE_BUFFER_DIRTY) != STATE_BUFFER_DIRTY) {\n return;\n }\n \n"} {"commit":"364c1ef7ea329d4e856e0ff1e05e4828641f6ebe","subject":"Ensure source file\/line variables are initialized.","message":"Ensure source file\/line variables are initialized.\n","repos":"jrfonseca\/drmingw,jrfonseca\/drmingw,jrfonseca\/drmingw,jrfonseca\/drmingw","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mgwhelp.c\n+++ mgwhelp.c\n@@ -247,8 +247,8 @@\n Dwarf_Addr lineaddr, plineaddr;\n char *file, *file0, *pfile;\n plineaddr = ~0ULL;\n- plineno = 0;\n- pfile = unknown;\n+ plineno = lineno = 0;\n+ pfile = file = unknown;\n Dwarf_Signed i;\n for (i = 0; i < linecount; i++) {\n if (dwarf_lineaddr(linebuf[i], &lineaddr, &error) != DW_DLV_OK) {\n"} {"commit":"bafb1a6325b40a2d29c5ab8e9408d2d322454153","subject":"Added support for reconnect.","message":"Added support for reconnect.\n","repos":"lokeller\/miniadc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- miniadc.c\n+++ miniadc.c\n@@ -1520,7 +1520,7 @@\n \t\thandle_peer(ctx, peer, port, token);\n \n \t\twrite_log(LOG_INFO, \"Shutting down\\n\");\n-\t\texit(1);\n+\t\texit(EXIT_SUCCESS);\n \t}\n \n \t\/\/ eclipse is not smart enough\n@@ -2292,19 +2292,129 @@\n \n }\n \n+int handle_hub(context_t *ctx, char*hub_address, int hub_port) {\n+\n+\twrite_log(LOG_INFO, \"Connecting to hub...\\n\");\n+\n+\tconst char *err;\n+\tint sd, ret;\n+\n+\tgnutls_session_t session;\n+\tgnutls_certificate_credentials_t xcred;\n+\n+\tsd = socket(AF_INET, SOCK_STREAM, 0);\n+\n+\tif ( sd < 0 ) {\n+\t\twrite_log(LOG_CRITICAL, \"Unable to open socket\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\n+\tint optval = 1;\n+\tif(setsockopt(sd, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval)) < 0) {\n+\t\twrite_log(LOG_CRITICAL, \"Unable to set keep-alive on socket\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tstruct hostent* remote = gethostbyname(hub_address);\n+\n+\tif ( remote == NULL) {\n+\t\twrite_log(LOG_CRITICAL, \"Unable to resolve hub address\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\tstruct sockaddr_in addr;\n+\n+\taddr.sin_family = AF_INET;\n+\taddr.sin_port = htons(hub_port);\n+\taddr.sin_addr.s_addr = ((struct in_addr*) remote->h_addr_list[0])->s_addr;\n+\n+\tif ( connect(sd, (struct sockaddr*) &addr, sizeof(addr)) < 0 ) {\n+\t\twrite_log(LOG_CRITICAL, \"Unable to connect to remote hub\");\n+\t\treturn -1;\n+\t}\n+\n+\tgnutls_certificate_allocate_credentials (&xcred);\n+\tgnutls_certificate_set_verify_function (xcred, _verify_certificate_callback);\n+\n+\tgnutls_init (&session, GNUTLS_CLIENT);\n+\n+\tret = gnutls_priority_set_direct (session, \"NORMAL\", &err);\n+\tif (ret < 0) {\n+\t\tif (ret == GNUTLS_E_INVALID_REQUEST) {\n+\t\t\tgnutls_deinit(session);\n+\t\t\tgnutls_certificate_free_credentials(xcred);\n+\t\t\twrite_log(LOG_CRITICAL, \"Syntax error at: %s\\n\", err);\n+\t\t}\n+\t\treturn -1;\n+\t}\n+\n+\tgnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);\n+\n+\n+\tgnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (intptr_t) sd);\n+\n+\tdo {\n+\t\tret = gnutls_handshake (session);\n+\t} while (ret < 0 && gnutls_error_is_fatal (ret) == 0);\n+\n+\tif ( ret < 0 ) {\n+\t\tgnutls_certificate_free_credentials(xcred);\n+\t\tgnutls_deinit(session);\n+\t\twrite_log(LOG_CRITICAL, \"TLS Handshake failed\\n\");\n+\t\tgnutls_perror(ret);\n+\t\treturn -1;\n+\t} else {\n+\t\twrite_log(LOG_INFO, \"Handshake with hub completed\\n\");\n+\t}\n+\n+\tctx->sd = sd;\n+\tctx->session = session;\n+\tctx->state = STATE_PROTOCOL;\n+\n+\tctx->first_peer = NULL;\n+\n+\tsend_message(ctx, \"HSUP ADBASE ADTIGR\\n\");\n+\n+\twhile ( 1 ) {\n+\n+\t\tret = process_message_from_hub(ctx);\n+\n+\t\tif (ret < 0) {\n+\n+\t\t\tpeer_t *next_peer = ctx->first_peer;\n+\n+\t\t\twhile ( next_peer != NULL) {\n+\t\t\t\tpeer_t *current_peer = next_peer;\n+\t\t\t\tnext_peer = current_peer->next;\n+\t\t\t\tfree(current_peer);\n+\t\t\t}\n+\n+\t\t\tgnutls_deinit(session);\n+\t\t\tgnutls_certificate_free_credentials(xcred);\n+\n+\t\t\twrite_log(LOG_INFO, \"Disconnected\\n\");\n+\t\t\tclose(sd);\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\n+\treturn -1;\n+}\n+\n int main (int argc, char** argv ) {\n \n \tif ( argc < 7) {\n \n \t\tprintf(\"usage: miniadc hub port nick password root index [log]\\n\");\n-\t\texit(1);\n+\t\texit(EXIT_FAILURE);\n \t}\n \n \tchar *hub_address = argv[1];\n \tint hub_port = atoi(argv[2]);\n \tif ( hub_port == 0) {\n \t\tprintf(\"Invalid hub port\\n\");\n-\t\texit(1);\n+\t\texit(EXIT_FAILURE);\n \t}\n \tchar *nickname = argv[3];\n \tchar *password = argv[4];\n@@ -2317,16 +2427,16 @@\n \n \t\tif ( log_file == NULL) {\n \t\t\tprintf(\"Unable to open log file\\n\");\n-\t\t\texit(1);\n+\t\t\texit(EXIT_FAILURE);\n \t\t}\n \n \t\tpid_t pid, sid;\n \n \t\tpid = fork();\n \t\tif (pid < 0) {\n-\t\t\texit(1);\n+\t\t\texit(EXIT_FAILURE);\n \t\t} else if ( pid > 0) {\n-\t\t\texit(0);\n+\t\t\texit(EXIT_SUCCESS);\n \t\t}\n \n \t\tsid = setsid();\n@@ -2352,94 +2462,29 @@\n \n \tif ( ctx.root_dir == NULL) {\n \t\twrite_log(LOG_CRITICAL, \"Unable to index shared directory\\n\");\n-\t\texit(1);\n+\t\texit(EXIT_FAILURE);\n \t}\n \n \tif ( create_compressed_file_list(&ctx) != 0 ) {\n-\t\texit(1);\n-\t}\n-\n-\twrite_log(LOG_INFO, \"Connecting to hub...\\n\");\n-\n-\tconst char *err;\n-\tint sd, ret;\n-\n-\tgnutls_session_t session;\n-\tgnutls_certificate_credentials_t xcred;\n-\n-\tgnutls_global_init ();\n-\n-\tgnutls_certificate_allocate_credentials (&xcred);\n-\tgnutls_certificate_set_verify_function (xcred, _verify_certificate_callback);\n-\n-\tgnutls_init (&session, GNUTLS_CLIENT);\n-\n-\tret = gnutls_priority_set_direct (session, \"NORMAL\", &err);\n-\tif (ret < 0) {\n-\t\tif (ret == GNUTLS_E_INVALID_REQUEST) {\n-\t\t\twrite_log(LOG_CRITICAL, \"Syntax error at: %s\\n\", err);\n-\t\t}\n-\t\texit (1);\n-\t}\n-\t\n-\tgnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);\n-\n-\tsd = socket(AF_INET, SOCK_STREAM, 0);\n-\n-\tstruct hostent* remote = gethostbyname(hub_address);\n-\n-\tif ( remote == NULL) {\n-\t\twrite_log(LOG_CRITICAL, \"Unable to resolve hub address\");\n-\t\texit(1);\n-\t}\n-\n-\tstruct sockaddr_in addr;\n-\n-\taddr.sin_family = AF_INET;\n-\taddr.sin_port = htons(hub_port);\n-\taddr.sin_addr.s_addr = ((struct in_addr*) remote->h_addr_list[0])->s_addr;\n-\n-\tif ( connect(sd, (struct sockaddr*) &addr, sizeof(addr)) < 0 ) {\n-\t\twrite_log(LOG_CRITICAL, \"Unable to connect to remote hub\");\n-\t\texit(1);\n-\t}\n-\n-\tgnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (intptr_t) sd);\n-\n-\tdo {\n-\t\tret = gnutls_handshake (session);\n-\t} while (ret < 0 && gnutls_error_is_fatal (ret) == 0);\n-\n-\tif ( ret < 0 ) {\n-\t\twrite_log(LOG_CRITICAL, \"TLS Handshake failed\\n\");\n-\t\tgnutls_perror(ret);\n-\t} else {\n-\t\twrite_log(LOG_INFO, \"Handshake with hub completed\\n\");\n-\t}\n-\n-\tctx.sd = sd;\n-\tctx.session = session;\n-\tctx.state = STATE_PROTOCOL;\n+\t\texit(EXIT_FAILURE);\n+\t}\n+\n+\tctx.nickname = nickname;\n+\tctx.password = password;\n \n \tcreate_pid(ctx.pid);\n \tcreate_cid(ctx.pid, ctx.cid);\n \n-\tctx.nickname = nickname;\n-\tctx.password = password;\n-\tctx.first_peer = NULL;\n-\n-\tsend_message(&ctx, \"HSUP ADBASE ADTIGR\\n\");\n-\n-\twhile ( 1 ) {\n-\n-\t\tret = process_message_from_hub(&ctx);\n-\n-\t\tif (ret < 0) {\n-\t\t\twrite_log(LOG_INFO, \"Disconnected\\n\");\n-\t\t\texit(1);\n-\t\t}\n-\t}\n-\n+\tgnutls_global_init ();\n+\n+\n+\twhile ( 1) {\n+\t\thandle_hub(&ctx, hub_address, hub_port);\n+\t\tsleep(10);\n+\t}\n+\n+\n+\treturn EXIT_FAILURE;\n \n }\n \n"} {"commit":"247bbaea59418c72724af56712d0ddfd331e4518","subject":"Rename EPSILON","message":"Rename EPSILON\n","repos":"siu\/minunit,ollie314\/minunit,siu\/minunit,tinyunit\/tinyunit,tinyunit\/tinyunit,entia\/minunit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- minunit.h\n+++ minunit.h\n@@ -9,7 +9,7 @@\n #define MINUNIT_MESSAGE_LEN 1024\n \/\/ Do not change\n #define MINUNIT_NSECS 1000000000\n-#define EPSILON 1E-12\n+#define MINUNIT_EPSILON 1E-12\n \n \/\/ Misc. counters\n static int minunit_run = 0;\n@@ -91,7 +91,7 @@\n \t\tminunit_assert++;\\\n \t\tdouble e = (expected);\\\n \t\tdouble r = (result);\\\n-\t\tif (fabs(e-r) > EPSILON) {\\\n+\t\tif (fabs(e-r) > MINUNIT_EPSILON) {\\\n \t\t\tsnprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, \"%s failed:\\n\\t%s:%d: %g expected but was %g\", __func__, __FILE__, __LINE__, e, r);\\\n \t\t\treturn 1;\\\n \t\t}\\\n"} {"commit":"60661e71ae0e3fad46f543813966184c26d90c53","subject":"added type for boundingbox","message":"added type for boundingbox\n","repos":"ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore,ridoo\/IlwisCore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/ilwistypes.h\n+++ core\/ilwistypes.h\n@@ -25,7 +25,8 @@\n const quint64 itOPERATIONMETADATA = 2 * itGEOREF;\r\n const quint64 itCATALOG = 2 * itOPERATIONMETADATA;\r\n const quint64 itENVELOPE = 2 * itCATALOG;\r\n-const quint64 itRASTERSIZE = 2 * itENVELOPE;\r\n+const quint64 itBOUNDINGBOX = 2 * itENVELOPE;\r\n+const quint64 itRASTERSIZE = 2 * itBOUNDINGBOX;\r\n const quint64 itGEODETICDATUM = 2 * itRASTERSIZE;\r\n const quint64 itBOOL = 2 * itGEODETICDATUM;\r\n const quint64 itINT8 = 2 * itBOOL;\r\n"} {"commit":"8620bd09352f32586f56f6458552bc3d80a9a85a","subject":"gfni: work around error with vec_bperm on clang-10 on POWER","message":"gfni: work around error with vec_bperm on clang-10 on POWER\n\nI'm not really sure why this wasn't working on clang-10; I don't see\nanything in the git blame that could explain the difference, but on\n10 clang was attempting to use the __int128 signature even though we\nwere passings bytes.\n","repos":"nemequ\/simde,nemequ\/simde,nemequ\/simde","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simde\/x86\/gfni.h\n+++ simde\/x86\/gfni.h\n@@ -260,7 +260,12 @@\n SIMDE_VECTORIZE\n #endif\n for (int i = 0 ; i < 8 ; i++) {\n- p = vec_bperm(a, bit_select);\n+ #if defined(__clang__) && !SIMDE_DETECT_CLANG_VERSION_CHECK(11,0,0)\n+ p = HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(unsigned char),\n+ vec_bperm(HEDLEY_STATIC_CAST(SIMDE_POWER_ALTIVEC_VECTOR(unsigned __int128), a), bit_select));\n+ #else\n+ p = vec_bperm(a, bit_select);\n+ #endif\n p = HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(unsigned char),\n vec_splat(HEDLEY_REINTERPRET_CAST(SIMDE_POWER_ALTIVEC_VECTOR(unsigned short), p), 4));\n p = vec_and(p, vec_cmplt(X, zero));\n"} {"commit":"852d4f49cd65c4a78791dfc781f504d6cbb9335c","subject":"Cast to fix compilation warning","message":"Cast to fix compilation warning\n","repos":"Lyude\/gtk-,Lyude\/gtk-,Adamovskiy\/gtk,alexlarsson\/gtk,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,simokivimaki\/gtk,davidt\/gtk,simokivimaki\/gtk,bratsche\/gtk-,Lyude\/gtk-,ahodesuka\/gtk,jadahl\/gtk,chergert\/gtk,jigpu\/gtk,Distrotech\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,nacho\/gtk-,msteinert\/gtk,davidt\/gtk,simokivimaki\/gtk,jigpu\/gtk,jadahl\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,msteinert\/gtk,davidt\/gtk,johne53\/MB3Gtk-2,chipx86\/gtk,jigpu\/gtk,Distrotech\/gtk2,jigpu\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,davidt\/gtk,bratsche\/gtk-,Distrotech\/gtk,ebassi\/gtk,bratsche\/gtk-,Unity-Technologies\/gtk,chergert\/gtk,simokivimaki\/gtk,jadahl\/gtk,nacho\/gtk-,Adamovskiy\/gtk,johne53\/MB3Gtk-2,davidgumberg\/gtk,ahodesuka\/gtk,bratsche\/gtk-,jessevdk\/gtk,Lyude\/gtk-,Unity-Technologies\/gtk,ebassi\/gtk,Distrotech\/gtk2,simokivimaki\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,Distrotech\/gtk2,alexlarsson\/gtk,nacho\/gtk-,ahodesuka\/gtk,Lyude\/gtk-,jessevdk\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,jessevdk\/gtk,ebassi\/gtk,grubersjoe\/adwaita,ebassi\/gtk,Lyude\/gtk-,alexlarsson\/gtk,chipx86\/gtk,simokivimaki\/gtk,msteinert\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,jigpu\/gtk,johne53\/MB3Gtk-2,davidt\/gtk,chergert\/gtk,Distrotech\/gtk2,jadahl\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,bratsche\/gtk-,jadahl\/gtk,grubersjoe\/adwaita,chipx86\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,msteinert\/gtk,ebassi\/gtk,grubersjoe\/adwaita,jigpu\/gtk,nacho\/gtk-,davidgumberg\/gtk,chergert\/gtk,chergert\/gtk,jadahl\/gtk,chipx86\/gtk,ahodesuka\/gtk,chergert\/gtk,Unity-Technologies\/gtk,Distrotech\/gtk2,bratsche\/gtk-,jigpu\/gtk,johne53\/MB3Gtk-2,Unity-Technologies\/gtk,Adamovskiy\/gtk,msteinert\/gtk,davidt\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,ahodesuka\/gtk,Distrotech\/gtk,Sidnioulz\/SandboxGtk,johne53\/MB3Gtk-2,msteinert\/gtk,Adamovskiy\/gtk,Distrotech\/gtk,nacho\/gtk-,davidgumberg\/gtk,jadahl\/gtk,davidgumberg\/gtk,jessevdk\/gtk,davidgumberg\/gtk,ebassi\/gtk,chergert\/gtk,jigpu\/gtk,Distrotech\/gtk,jadahl\/gtk,chergert\/gtk,Lyude\/gtk-,chipx86\/gtk,Unity-Technologies\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gdk-pixbuf\/io-bmp.c\n+++ gdk-pixbuf\/io-bmp.c\n@@ -1319,7 +1319,7 @@\n \tput32 (dst, 0);\t\t\t\/* biClrUsed *\/\n \tput32 (dst, 0);\t\t\t\/* biClrImportant *\/\n \n-\tif (!save_func (BFH_BIH, 14 + 40, error, user_data))\n+\tif (!save_func ((gchar *)BFH_BIH, 14 + 40, error, user_data))\n \t\treturn FALSE;\n \n \tdst_line = buf = g_try_malloc (size);\n@@ -1342,7 +1342,7 @@\n \t\t\tdst[2] = src[0];\n \t\t}\n \t}\n-\tret = save_func (buf, size, error, user_data);\n+\tret = save_func ((gchar *)buf, size, error, user_data);\n \tg_free (buf);\n \n \treturn ret;\n"} {"commit":"c07bb73548709f427c4b47b5a0d93c77806d631e","subject":"addressing-util: Fix some coding style issues.","message":"addressing-util: Fix some coding style issues.\n","repos":"Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,Ziemin\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/addressing-util.c\n+++ src\/addressing-util.c\n@@ -163,7 +163,7 @@\n guint i;\n gchar **uris = g_new0 (gchar *, len + 1);\n \n- for (i=0;i<len;i++)\n+ for (i = 0; i < len; i++)\n uris[i] = gabble_uri_for_handle (contact_repo, addressable_uri_schemes[i], contact);\n \n return uris;\n@@ -177,7 +177,7 @@\n GHashTable *addresses = g_hash_table_new_full (g_str_hash, g_str_equal,\n NULL, (GDestroyNotify) g_free);\n \n- for (field=addressable_vcard_fields;*field!=NULL;field++)\n+ for (field = addressable_vcard_fields; *field != NULL; field++)\n g_hash_table_insert (addresses, (gpointer) *field,\n gabble_vcard_address_for_handle (contact_repo, *field, contact));\n \n"} {"commit":"033745189b1bae3fc931beeaf48604ee7c259309","subject":"slub: add missing kmem cgroup support to kmem_cache_free_bulk","message":"slub: add missing kmem cgroup support to kmem_cache_free_bulk\n\nInitial implementation missed support for kmem cgroup support in\nkmem_cache_free_bulk() call, add this.\n\nIf CONFIG_MEMCG_KMEM is not enabled, the compiler should be smart enough\nto not add any asm code.\n\nIncoming bulk free objects can belong to different kmem cgroups, and\nobject free call can happen at a later point outside memcg context. Thus,\nwe need to keep the orig kmem_cache, to correctly verify if a memcg object\nmatch against its \"root_cache\" (s->memcg_params.root_cache).\n\nSigned-off-by: Jesper Dangaard Brouer <980bdea81946be3dffddbcbbdb1b5761713ff28c@redhat.com>\nReviewed-by: Vladimir Davydov <0d62248ee021b6e01c0ee596a62a5b145b996974@virtuozzo.com>\nCc: Christoph Lameter <ef3ecccf258fa062c5c6521a4887d40541963af7@linux.com>\nCc: Pekka Enberg <add4fcd06328a394f0ad91feda7ee057316dc5ed@kernel.org>\nCc: David Rientjes <d8cd2994e15bc61ddb2b113030bda55eebc3a0fe@google.com>\nCc: Joonsoo Kim <bb6c8cfe7699e0f11d1bee88022eb563a5f8e881@lge.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mm\/slub.c\n+++ mm\/slub.c\n@@ -2887,13 +2887,17 @@\n \n \n \/* Note that interrupts must be enabled when calling this function. *\/\n-void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p)\n+void kmem_cache_free_bulk(struct kmem_cache *orig_s, size_t size, void **p)\n {\n \tif (WARN_ON(!size))\n \t\treturn;\n \n \tdo {\n \t\tstruct detached_freelist df;\n+\t\tstruct kmem_cache *s;\n+\n+\t\t\/* Support for memcg *\/\n+\t\ts = cache_from_obj(orig_s, p[size - 1]);\n \n \t\tsize = build_detached_freelist(s, size, p, &df);\n \t\tif (unlikely(!df.page))\n"} {"commit":"113540ab3aea1f48b5b6a606024cc9f790dfedd3","subject":"Fix JacobiSVD wrt undeR\/overflow by doing scaling prior to QR preconditioning","message":"Fix JacobiSVD wrt undeR\/overflow by doing scaling prior to QR preconditioning\n","repos":"madlib\/eigen,madlib\/eigen,madlib\/eigen,madlib\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/SVD\/JacobiSVD.h\n+++ Eigen\/src\/SVD\/JacobiSVD.h\n@@ -692,21 +692,20 @@\n \/\/ limit for very small denormal numbers to be considered zero in order to avoid infinite loops (see bug 286)\n const RealScalar considerAsZero = RealScalar(2) * std::numeric_limits<RealScalar>::denorm_min();\n \n+ \/\/ Scaling factor to reduce over\/under-flows\n+ RealScalar scale = matrix.cwiseAbs().maxCoeff();\n+ if(scale==RealScalar(0)) scale = RealScalar(1);\n+ \n \/*** step 1. The R-SVD step: we use a QR decomposition to reduce to the case of a square matrix *\/\n \n- if(!m_qr_precond_morecols.run(*this, matrix) && !m_qr_precond_morerows.run(*this, matrix))\n- {\n- m_workMatrix = matrix.block(0,0,m_diagSize,m_diagSize);\n+ if(!m_qr_precond_morecols.run(*this, matrix\/scale) && !m_qr_precond_morerows.run(*this, matrix\/scale))\n+ {\n+ m_workMatrix = matrix.block(0,0,m_diagSize,m_diagSize) \/ scale;\n if(m_computeFullU) m_matrixU.setIdentity(m_rows,m_rows);\n if(m_computeThinU) m_matrixU.setIdentity(m_rows,m_diagSize);\n if(m_computeFullV) m_matrixV.setIdentity(m_cols,m_cols);\n if(m_computeThinV) m_matrixV.setIdentity(m_cols, m_diagSize);\n }\n- \n- \/\/ Scaling factor to reduce over\/under-flows\n- RealScalar scale = m_workMatrix.cwiseAbs().maxCoeff();\n- if(scale==RealScalar(0)) scale = RealScalar(1);\n- m_workMatrix \/= scale;\n \n \/*** step 2. The main Jacobi SVD iteration. ***\/\n \n"} {"commit":"3e7fadf46e8930f16033b034b365082be60b67c5","subject":"fix future bug with default shortcuts when TSIMD_DEFAULT_WIDTH == 1","message":"fix future bug with default shortcuts when TSIMD_DEFAULT_WIDTH == 1\n","repos":"jeffamstutz\/tsimd,jeffamstutz\/tsimd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tsimd\/detail\/pack.h\n+++ tsimd\/detail\/pack.h\n@@ -181,8 +181,13 @@\n using vfloat = pack<float, TSIMD_DEFAULT_WIDTH>;\n using vdouble = pack<double, TSIMD_DEFAULT_WIDTH>;\n using vint = pack<int, TSIMD_DEFAULT_WIDTH>;\n+ #if TSIMD_DEFAULT_WIDTH > 1\n using vuint = pack<unsigned int, TSIMD_DEFAULT_WIDTH \/ 2>;\n using vllong = pack<long long, TSIMD_DEFAULT_WIDTH \/ 2>;\n+ #else\n+ using vuint = vuint1;\n+ using vllong = vllong1;\n+ #endif\n using vboolf = maskf<TSIMD_DEFAULT_WIDTH>;\n using vboold = maskd<TSIMD_DEFAULT_WIDTH>;\n \n"} {"commit":"2519dc29a5ca70e9a20e5de5aa5d76b48e0b0602","subject":"Make Connector constructors protected.","message":"Make Connector constructors protected.\n","repos":"opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core,opensim-org\/opensim-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- OpenSim\/Common\/ComponentConnector.h\n+++ OpenSim\/Common\/ComponentConnector.h\n@@ -83,16 +83,117 @@\n \/\/ TODO to be consistent with Properties, replace \"single-value\" with \"one-value\"\n \/\/ TODO should connectee_name property in Component be private:?\n public:\n+\n+ \/\/ default copy constructor, copy assignment\n+\n+ virtual ~AbstractConnector() {};\n+ \n+ \/\/\/ Create a dynamically-allocated copy. You must manage the memory\n+ \/\/\/ for the returned pointer.\n+ \/\/\/ This function facilitates the use of SimTK::ClonePtr<AbstractConnector>.\n+ virtual AbstractConnector* clone() const = 0;\n+ \n+ \/\/\/ @name Accessors\n+ \/\/\/ @{\n+ const std::string& getName() const { return _name; }\n+ \/** Get the system Stage when the connection should be made. *\/\n+ SimTK::Stage getConnectAtStage() const { return _connectAtStage; }\n+ \/** Can this Connector have more than one connectee? *\/\n+ bool isListConnector() const { return _isList; }\n+ \/\/\/ @}\n+\n+ \/\/--------------------------------------------------------------------------\n+ \/** Derived classes must satisfy this Interface *\/\n+ \/\/--------------------------------------------------------------------------\n+ \/** Is the Connector connected to its connectee(s)? For a list connector,\n+ this is only true if this connector is connected to all its connectees.\n+ *\/\n+ virtual bool isConnected() const = 0;\n+ \n+ \/** The number of slots to fill in order to satisfy this connector.\n+ * This is 1 for a non-list connector. *\/\n+ unsigned getNumConnectees() const {\n+ return static_cast<unsigned>(getConnecteeNameProp().size());\n+ }\n+\n+ \/** Get the type of object this connector connects to. *\/\n+ virtual std::string getConnecteeTypeName() const = 0;\n+\n+ \/** Generic access to the connectee. Not all connectors support this method\n+ * (e.g., the connectee for an Input is not an Object). *\/\n+ virtual const Object& getConnecteeAsObject() const {\n+ OPENSIM_THROW(Exception, \"Not supported for this type of connector.\");\n+ }\n+\n+ \/** Connect this Connector to the provided connectee object. If this is a\n+ list connector, the connectee is appended to the list of connectees;\n+ otherwise, the provided connectee replaces the single connectee. *\/\n+ virtual void connect(const Object& connectee) = 0;\n+\n+ \/** Connect this Connector according to its connectee_name property\n+ given a root Component to search its subcomponents for the connect_to\n+ Component. *\/\n+ virtual void findAndConnect(const Component& root) {\n+ throw Exception(\"findAndConnect() not implemented; not supported \"\n+ \"for this type of connector\", __FILE__, __LINE__);\n+ }\n+\n+ \/** Set connectee name. This function can only be used if this connector is\n+ not a list connector. *\/\n+ void setConnecteeName(const std::string& name) {\n+ OPENSIM_THROW_IF(_isList,\n+ Exception,\n+ \"An index must be provided for a list Connector.\");\n+ setConnecteeName(name, 0);\n+ }\n+\n+ \/** Set connectee name of a connectee among a list of connectees. This\n+ function is used if this connector is a list connector. *\/\n+ void setConnecteeName(const std::string& name, unsigned ix) {\n+ using SimTK::isIndexInRange;\n+ SimTK_INDEXCHECK_ALWAYS(ix, getNumConnectees(),\n+ \"AbstractConnector::setConnecteeName()\");\n+ updConnecteeNameProp().setValue(ix, name);\n+ }\n+\n+ \/** Get connectee name. This function can only be used if this connector is\n+ not a list connector. *\/\n+ const std::string& getConnecteeName() const {\n+ OPENSIM_THROW_IF(_isList,\n+ Exception,\n+ \"An index must be provided for a list Connector.\");\n+ return getConnecteeName(0);\n+ }\n+\n+ \/** Get connectee name of a connectee among a list of connectees. *\/\n+ const std::string& getConnecteeName(unsigned ix) const {\n+ using SimTK::isIndexInRange;\n+ SimTK_INDEXCHECK_ALWAYS(ix, getNumConnectees(),\n+ \"AbstractConnector::getConnecteeName()\");\n+ return getConnecteeNameProp().getValue(ix);\n+ }\n+\n+ void appendConnecteeName(const std::string& name) {\n+ OPENSIM_THROW_IF((getNumConnectees() > 0 && !_isList), Exception,\n+ \"Multiple connectee names can only be appended to a list Connector.\");\n+ updConnecteeNameProp().appendValue(name);\n+ }\n+\n+\n+ \/** Disconnect this Connector from its connectee. *\/\n+ virtual void disconnect() = 0;\n+\n+protected:\n \/\/--------------------------------------------------------------------------\n \/\/ CONSTRUCTION\n \/\/--------------------------------------------------------------------------\n- \n- \/** Convenience constructor \n- Create a Connector with specified name and stage at which it\n- should be connected.\n- @param name name of the connector, usually describes its dependency. \n- @param connectAtStage Stage at which Connector should be connected.\n- @param owner Component to which this Connector belongs. *\/\n+ \/** Create a Connector with specified name and stage at which it should be\n+ connected.\n+ @param name name of the connector, usually describes its dependency.\n+ @param connecteeNameIndex Index of the property in the containing Component\n+ that holds this Connector's connectee_name(s).\n+ @param connectAtStage Stage at which Connector should be connected.\n+ @param owner Component to which this Connector belongs. *\/\n AbstractConnector(const std::string& name,\n const PropertyIndex& connecteeNameIndex,\n const SimTK::Stage& connectAtStage,\n@@ -104,106 +205,6 @@\n _isList(getConnecteeNameProp().isListProperty()) {}\n \n \n- \/\/ default copy constructor, copy assignment\n-\n- virtual ~AbstractConnector() {};\n- \n- \/\/\/ Create a dynamically-allocated copy. You must manage the memory\n- \/\/\/ for the returned pointer.\n- \/\/\/ This function facilitates the use of SimTK::ClonePtr<AbstractConnector>.\n- virtual AbstractConnector* clone() const = 0;\n- \n- \/\/\/ @name Accessors\n- \/\/\/ @{\n- const std::string& getName() const { return _name; }\n- \/** Get the system Stage when the connection should be made. *\/\n- SimTK::Stage getConnectAtStage() const { return _connectAtStage; }\n- \/** Can this Connector have more than one connectee? *\/\n- bool isListConnector() const { return _isList; }\n- \/\/\/ @}\n-\n- \/\/--------------------------------------------------------------------------\n- \/** Derived classes must satisfy this Interface *\/\n- \/\/--------------------------------------------------------------------------\n- \/** Is the Connector connected to its connectee(s)? For a list connector,\n- this is only true if this connector is connected to all its connectees.\n- *\/\n- virtual bool isConnected() const = 0;\n- \n- \/** The number of slots to fill in order to satisfy this connector.\n- * This is 1 for a non-list connector. *\/\n- unsigned getNumConnectees() const {\n- return static_cast<unsigned>(getConnecteeNameProp().size());\n- }\n-\n- \/** Get the type of object this connector connects to. *\/\n- virtual std::string getConnecteeTypeName() const = 0;\n-\n- \/** Generic access to the connectee. Not all connectors support this method\n- * (e.g., the connectee for an Input is not an Object). *\/\n- virtual const Object& getConnecteeAsObject() const {\n- OPENSIM_THROW(Exception, \"Not supported for this type of connector.\");\n- }\n-\n- \/** Connect this Connector to the provided connectee object. If this is a\n- list connector, the connectee is appended to the list of connectees;\n- otherwise, the provided connectee replaces the single connectee. *\/\n- virtual void connect(const Object& connectee) = 0;\n-\n- \/** Connect this Connector according to its connectee_name property\n- given a root Component to search its subcomponents for the connect_to\n- Component. *\/\n- virtual void findAndConnect(const Component& root) {\n- throw Exception(\"findAndConnect() not implemented; not supported \"\n- \"for this type of connector\", __FILE__, __LINE__);\n- }\n-\n- \/** Set connectee name. This function can only be used if this connector is\n- not a list connector. *\/\n- void setConnecteeName(const std::string& name) {\n- OPENSIM_THROW_IF(_isList,\n- Exception,\n- \"An index must be provided for a list Connector.\");\n- setConnecteeName(name, 0);\n- }\n-\n- \/** Set connectee name of a connectee among a list of connectees. This\n- function is used if this connector is a list connector. *\/\n- void setConnecteeName(const std::string& name, unsigned ix) {\n- using SimTK::isIndexInRange;\n- SimTK_INDEXCHECK_ALWAYS(ix, getNumConnectees(),\n- \"AbstractConnector::setConnecteeName()\");\n- updConnecteeNameProp().setValue(ix, name);\n- }\n-\n- \/** Get connectee name. This function can only be used if this connector is\n- not a list connector. *\/\n- const std::string& getConnecteeName() const {\n- OPENSIM_THROW_IF(_isList,\n- Exception,\n- \"An index must be provided for a list Connector.\");\n- return getConnecteeName(0);\n- }\n-\n- \/** Get connectee name of a connectee among a list of connectees. *\/\n- const std::string& getConnecteeName(unsigned ix) const {\n- using SimTK::isIndexInRange;\n- SimTK_INDEXCHECK_ALWAYS(ix, getNumConnectees(),\n- \"AbstractConnector::getConnecteeName()\");\n- return getConnecteeNameProp().getValue(ix);\n- }\n-\n- void appendConnecteeName(const std::string& name) {\n- OPENSIM_THROW_IF((getNumConnectees() > 0 && !_isList), Exception,\n- \"Multiple connectee names can only be appended to a list Connector.\");\n- updConnecteeNameProp().appendValue(name);\n- }\n-\n-\n- \/** Disconnect this Connector from its connectee. *\/\n- virtual void disconnect() = 0;\n-\n-protected:\n const Component& getOwner() const { return _owner.getRef(); }\n \/** Set an internal pointer to the Component that contains this Connector.\n This should only be called by Component.\n@@ -274,17 +275,6 @@\n template<class T>\n class Connector : public AbstractConnector {\n public:\n- \/** Convenience constructor\n- Create a Connector that can only connect to Object of type T with specified \n- name and stage at which it should be connected.\n- @param name name of the connector used to describe its dependency.\n- @param connectAtStage Stage at which Connector should be connected.\n- @param owner The component that contains this input. *\/\n- Connector(const std::string& name, const PropertyIndex& connecteeNameIndex,\n- const SimTK::Stage& connectAtStage,\n- Component& owner) :\n- AbstractConnector(name, connecteeNameIndex, connectAtStage, owner),\n- connectee(nullptr) {}\n \n \/\/ default copy constructor\n \n@@ -368,6 +358,24 @@\n }\n \n SimTK_DOWNCAST(Connector, AbstractConnector);\n+ \n+protected:\n+ \/** Create a Connector that can only connect to Object of type T with \n+ specified name and stage at which it should be connected. Only Component\n+ should ever construct this class.\n+ @param name name of the connector used to describe its dependency.\n+ @param connecteeNameIndex Index of the property in the containing Component\n+ that holds this Connector's connectee_name(s).\n+ @param connectAtStage Stage at which Connector should be connected.\n+ @param owner The component that contains this input. *\/\n+ Connector(const std::string& name, const PropertyIndex& connecteeNameIndex,\n+ const SimTK::Stage& connectAtStage,\n+ Component& owner) :\n+ AbstractConnector(name, connecteeNameIndex, connectAtStage, owner),\n+ connectee(nullptr) {}\n+ \n+ \/** So that Component can construct a Connector. *\/\n+ friend Component;\n \n private:\n mutable SimTK::ReferencePtr<const T> connectee;\n@@ -418,17 +426,6 @@\n *\/\n class OSIMCOMMON_API AbstractInput : public AbstractConnector {\n public:\n- \/** Convenience constructor\n- Create an AbstractInput (Connector) that connects only to an AbstractOutput\n- specified by name and stage at which it should be connected.\n- @param name name of the dependent (Abstract)Output.\n- @param connectAtStage Stage at which Input should be connected.\n- @param owner The component that contains this input. *\/\n- AbstractInput(const std::string& name,\n- const PropertyIndex& connecteeNameIndex,\n- const SimTK::Stage& connectAtStage,\n- Component& owner) :\n- AbstractConnector(name, connecteeNameIndex, connectAtStage, owner) {}\n \n virtual ~AbstractInput() {}\n \n@@ -540,29 +537,34 @@\n return true;\n }\n \n+protected:\n+ \/** Create an AbstractInput (Connector) that connects only to an \n+ AbstractOutput specified by name and stage at which it should be connected.\n+ Only Component should ever construct this class.\n+ @param name name of the dependent (Abstract)Output.\n+ @param connecteeNameIndex Index of the property in the containing Component\n+ that holds this Input's connectee_name(s).\n+ @param connectAtStage Stage at which Input should be connected.\n+ @param owner The component that contains this input. *\/\n+ AbstractInput(const std::string& name,\n+ const PropertyIndex& connecteeNameIndex,\n+ const SimTK::Stage& connectAtStage,\n+ Component& owner) :\n+ AbstractConnector(name, connecteeNameIndex, connectAtStage, owner) {}\n+ \n \/\/=============================================================================\n }; \/\/ END class AbstractInput\n \n \n \/** An Input<Y> must be connected by an Output<Y> *\/\n template<class T>\n-class Input : public AbstractInput {\n+class Input : public AbstractInput {\n public:\n \n typedef typename Output<T>::Channel Channel;\n \n typedef std::vector<SimTK::ReferencePtr<const Channel>> ChannelList;\n typedef std::vector<std::string> AnnotationList;\n- \n- \/** Convenience constructor\n- Create an Input<T> (Connector) that can only connect to an Output<T>\n- name and stage at which it should be connected.\n- @param name name of the Output dependency.\n- @param connectAtStage Stage at which Input should be connected.\n- @param owner The component that contains this input. *\/\n- Input(const std::string& name, const PropertyIndex& connecteeNameIndex,\n- const SimTK::Stage& connectAtStage, Component& owner) :\n- AbstractInput(name, connecteeNameIndex, connectAtStage, owner) {}\n \n Input<T>* clone() const override { return new Input<T>(*this); }\n \n@@ -680,6 +682,22 @@\n \n SimTK_DOWNCAST(Input, AbstractInput);\n \n+protected:\n+ \/** Create an Input<T> (Connector) that can only connect to an Output<T>\n+ name and stage at which it should be connected. Only Component should ever\n+ construct an Input.\n+ @param name name of the Output dependency.\n+ @param connecteeNameIndex Index of the property in the containing Component\n+ that holds this Input's connectee_name(s).\n+ @param connectAtStage Stage at which Input should be connected.\n+ @param owner The component that contains this input. *\/\n+ Input(const std::string& name, const PropertyIndex& connecteeNameIndex,\n+ const SimTK::Stage& connectAtStage, Component& owner) :\n+ AbstractInput(name, connecteeNameIndex, connectAtStage, owner) {}\n+ \n+ \/** So that Component can construct an Input. *\/\n+ friend Component;\n+ \n private:\n SimTK::ResetOnCopy<ChannelList> _connectees;\n \/\/ Annotations are serialized, since tools may depend on them for\n"} {"commit":"129646d5d7acc015b9eaf33b6785027620d9ff7f","subject":"Meilleure comparaison entiers vs. pointeurs. Eviter le debordement lors de la comparaison de deux pointeurs externes.","message":"Meilleure comparaison entiers vs. pointeurs.\nEviter le debordement lors de la comparaison de deux pointeurs externes.\n\n\ngit-svn-id: e7e61699ce1738538ffebb75374fbea0924bc775@1066 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02\n","repos":"gerdstolpmann\/ocaml,eliberis\/ocaml,eliberis\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,eliberis\/ocaml,yunxing\/ocaml,eliberis\/ocaml,msprotz\/ocaml,chambart\/camlp4,yallop\/camlp4,gerdstolpmann\/ocaml,msprotz\/ocaml,msprotz\/ocaml,eliberis\/ocaml,yunxing\/ocaml,yunxing\/ocaml,yunxing\/ocaml,gerdstolpmann\/ocaml,hhugo\/camlp4,msprotz\/ocaml,msprotz\/ocaml,yunxing\/ocaml","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- byterun\/compare.c\n+++ byterun\/compare.c\n@@ -27,12 +27,19 @@\n \n tailcall:\n if (v1 == v2) return 0;\n- if (Is_long(v1) || Is_long(v2)) return Long_val(v1) - Long_val(v2);\n+ if (Is_long(v1)) {\n+ if (Is_long(v2))\n+ return Long_val(v1) - Long_val(v2);\n+ else\n+ return -1;\n+ }\n+ if (Is_long(v2)) return 1;\n \/* If one of the objects is outside the heap (but is not an atom),\n- use address comparison. *\/\n+ use address comparison. Since both addresses are 2-aligned,\n+ shift lsb off to avoid overflow in subtraction. *\/\n if ((!Is_atom(v1) && !Is_young(v1) && !Is_in_heap(v1)) ||\n (!Is_atom(v2) && !Is_young(v2) && !Is_in_heap(v2)))\n- return v1 - v2;\n+ return (v1 >> 1) - (v2 >> 1);\n t1 = Tag_val(v1);\n t2 = Tag_val(v2);\n if (t1 != t2) return (long)t1 - (long)t2;\n@@ -96,7 +103,13 @@\n value compare(v1, v2) \/* ML *\/\n value v1, v2;\n {\n- return Val_long(compare_val(v1, v2));\n+ long res = compare_val(v1, v2);\n+ if (res < 0) \n+ return Val_int(-1);\n+ else if (res > 0)\n+ return Val_int(1);\n+ else\n+ return Val_int(0);\n }\n \n value equal(v1, v2) \/* ML *\/\n"} {"commit":"ed1b3802e68a171bf718ca02d55fc720d0f924bf","subject":"print nfa","message":"print nfa\n","repos":"wallymathieu\/Thompson_Regex,wallymathieu\/Thompson_Regex","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c_code\/nfa_test.c\n+++ c_code\/nfa_test.c\n@@ -361,6 +361,29 @@\n }\n return ismatch(clist);\n }\n+void printSpaces(int num){\n+ for (int i = 0; i < num; ++i)\n+ {\n+ printf(\" \");\n+ }\n+}\n+void printnfa(State *start, int depth)\n+{\n+ printSpaces(depth);\n+ printf(\"(c=%i, lastlist=%i \\n\",start->c, start->lastlist);\n+ if (start->out){\n+ printSpaces(depth+1);\n+ printf(\",out=\\n\");\n+ printnfa(start->out, depth+2);\n+ }\n+ if (start->out1){\n+ printSpaces(depth+1);\n+ printf(\",out1:\\n\");\n+ printnfa(start->out1, depth+2);\n+ }\n+ printSpaces(depth);\n+ printf(\")\\n\");\n+}\n \n int\n nfa_test()\n@@ -386,6 +409,8 @@\n if(start == NULL){\n fprintf(stderr, \"error in post2nfa %s\\n\", post);\n return 1;\n+ }else{\n+ printnfa(start,0);\n }\n \n l1.s = malloc(nstate*sizeof l1.s[0]);\n"} {"commit":"9254d125851f8b4d0434b2cdc674054549fa7982","subject":"Ignore SIGPIPE in writes","message":"Ignore SIGPIPE in writes\n","repos":"diroussel\/lua-web-tools,diroussel\/lua-web-tools","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cache\/memcached.c\n+++ cache\/memcached.c\n@@ -7,6 +7,7 @@\n #include <string.h>\n #include <unistd.h>\n #include <errno.h>\n+#include <signal.h>\n #include <sys\/socket.h>\n #include <netdb.h>\n #include <netinet\/tcp.h>\n@@ -196,6 +197,50 @@\n \tlua_pop(L, 1);\n \n \treturn fd;\t\n+}\n+\n+\/*\n+ * Writes without SIGPIPE.\n+ *\/\n+ssize_t write_nosigpipe (int fd, const void *buf, size_t count) {\n+\tstruct sigaction new_action, old_action;\n+\tssize_t result;\n+\n+\t\/* ignore SIGPIPE *\/\n+\tmemset(&new_action, 0, sizeof(new_action));\n+\tnew_action.sa_handler = SIG_IGN;\n+\tsigemptyset(&new_action.sa_mask);\n+\tsigaction(SIGPIPE, &new_action, &old_action);\n+\n+\t\/* write *\/\n+\tresult = write(fd, buf, count);\n+\n+\t\/* restore SIGPIPE *\/\n+\tsigaction(SIGPIPE, &old_action, NULL);\n+\n+\treturn result;\n+}\n+\n+\/*\n+ * Writes IO vectors without SIGPIPE.\n+ *\/\n+static ssize_t writev_nosigpipe (int fd, const struct iovec *iov, int iovcnt) {\n+\tstruct sigaction new_action, old_action;\n+\tssize_t result;\n+\n+\t\/* ignore SIGPIPE *\/\n+\tmemset(&new_action, 0, sizeof(new_action));\n+\tnew_action.sa_handler = SIG_IGN;\n+\tsigemptyset(&new_action.sa_mask);\n+\tsigaction(SIGPIPE, &new_action, &old_action);\n+\n+\t\/* write *\/\n+\tresult = writev(fd, iov, iovcnt);\n+\n+\t\/* restore SIGPIPE *\/\n+\tsigaction(SIGPIPE, &old_action, NULL);\n+\n+\treturn result;\n }\n \n \/*\n@@ -349,7 +394,7 @@\n \tiov[0].iov_len = sizeof(request.bytes);\n \tiov[1].iov_base = (void *) key;\n \tiov[1].iov_len = (uint16_t) keylen;\n-\tif (writev(fd, iov, 2) == -1) {\n+\tif (writev_nosigpipe(fd, iov, 2) == -1) {\n \t\tluaL_error(L, \"error sending request\");\n \t}\n \n@@ -434,7 +479,7 @@\n \t\tiov[1].iov_len = (uint16_t) keylen;\n \t\tiov[2].iov_base = (void *) value;\n \t\tiov[2].iov_len = valuelen;\n-\t\tif (writev(fd, iov, 3) == -1) {\n+\t\tif (writev_nosigpipe(fd, iov, 3) == -1) {\n \t\t\tluaL_error(L, \"error sending request\");\n \t\t}\n \t} else {\n@@ -454,7 +499,7 @@\n \t\tiov[0].iov_len = sizeof(drequest.bytes);\n \t\tiov[1].iov_base = (void *) key;\n \t\tiov[1].iov_len = (uint16_t) keylen;\n-\t\tif (writev(fd, iov, 2) == -1) {\n+\t\tif (writev_nosigpipe(fd, iov, 2) == -1) {\n \t\t\tluaL_error(L, \"error sending request\");\n \t\t}\n \t}\n@@ -519,7 +564,7 @@\n \tiov[0].iov_len = sizeof(request.bytes);\n \tiov[1].iov_base = (void *) key;\n \tiov[1].iov_len = (uint16_t) keylen;\n-\tif (writev(fd, iov, 2) == -1) {\n+\tif (writev_nosigpipe(fd, iov, 2) == -1) {\n \t\tluaL_error(L, \"error sending request\");\n \t}\n \n@@ -571,7 +616,7 @@\n \n \t\/* send request *\/\n \tfd = get_socket(L, m, 2);\n-\tif (write(fd, &request, sizeof(request.bytes)) == -1) {\n+\tif (write_nosigpipe(fd, &request, sizeof(request.bytes)) == -1) {\n \t\tluaL_error(L, \"error sending request\");\n \t}\n \n@@ -619,7 +664,7 @@\n \tiov[0].iov_len = sizeof(request.bytes);\n \tiov[1].iov_base = (void *) key;\n \tiov[1].iov_len = (uint16_t) keylen;\n-\tif (writev(fd, iov, 2) == -1) {\n+\tif (writev_nosigpipe(fd, iov, 2) == -1) {\n \t\tluaL_error(L, \"error sending request\");\n \t}\n \n@@ -675,13 +720,9 @@\n \t\tlua_pushnil(L);\n \t\twhile (lua_next(L, -2)) {\n \t\t\tfd = (int) lua_tointeger(L, -1);\n-\t\t\tif (write(fd, &request, sizeof(request)) == -1) {\n-\t\t\t\tluaL_error(L, \"error sending request\");\n-\t\t\t}\n-\t\t\tread_response(L, fd, &status, 0, 0);\n-\t\t\tif (status != PROTOCOL_BINARY_RESPONSE_SUCCESS) {\n-\t\t\t\tluaL_error(L, \"memcached error %d\",\n-\t\t\t\t\t\t(int) status);\n+\t\t\tif (write_nosigpipe(fd, &request, sizeof(request))\n+\t\t\t\t\t!= -1) {\n+\t\t\t\tread_response(L, fd, &status, 0, 0);\n \t\t\t}\n \n \t\t\t\/* close *\/\n"} {"commit":"a341225fd03a96051b482e0fd64623c464885864","subject":"Change function name ssl_tls13_early_data_has_valid_ticket","message":"Change function name ssl_tls13_early_data_has_valid_ticket\n\nSigned-off-by: Xiaokang Qian <7b6134ba682adad72773df97eb8737186a67b798@arm.com>\n","repos":"Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- library\/ssl_tls13_client.c\n+++ library\/ssl_tls13_client.c\n@@ -701,7 +701,7 @@\n }\n \n #if defined(MBEDTLS_SSL_EARLY_DATA)\n-static int ssl_tls13_early_data_ticket_verify( mbedtls_ssl_context *ssl )\n+static int ssl_tls13_early_data_has_valid_ticket( mbedtls_ssl_context *ssl )\n {\n mbedtls_ssl_session *session = ssl->session_negotiate;\n return( ssl->handshake->resume &&\n@@ -1176,7 +1176,7 @@\n if( mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) &&\n ( mbedtls_ssl_conf_has_static_psk( ssl->conf ) == 1\n #if defined(MBEDTLS_SSL_SESSION_TICKETS)\n- || ssl_tls13_early_data_ticket_verify( ssl )\n+ || ssl_tls13_early_data_has_valid_ticket( ssl )\n #endif\n ) &&\n ssl->conf->early_data_enabled == MBEDTLS_SSL_EARLY_DATA_ENABLED )\n"} {"commit":"d18690e46a88b34da41d3ecbf9ff551796d6a07c","subject":"Forcefully set the ConfigType pointer to NULL in case of failure sine GCC seems to be confused about this in many versions. XXX Would be nice to conditionalize but it seems to be a great many versions, indeed.","message":"Forcefully set the ConfigType pointer to NULL in case of failure sine GCC seems\nto be confused about this in many versions. XXX Would be nice to conditionalize\nbut it seems to be a great many versions, indeed.\n\n","repos":"wanproxy\/wanproxy,wanproxy\/wanproxy,wanproxy\/wanproxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- config\/config_object.h\n+++ config\/config_object.h\n@@ -39,17 +39,28 @@\n \t{\n \t\tstd::map<std::string, ConfigValue *>::const_iterator it;\n \n+\t\t\/*\n+\t\t * Some versions of GCC are in fact so broken that we have to\n+\t\t * set *ctp to NULL in *all* of these cases. Have tried shaving\n+\t\t * the yak and gotten only despair.\n+\t\t *\/\n \t\tit = members_.find(name);\n-\t\tif (it == members_.end())\n+\t\tif (it == members_.end()) {\n+\t\t\t*ctp = NULL; \/* XXX GCC -Wuninitialized. *\/\n \t\t\treturn (NULL);\n+\t\t}\n \n \t\tConfigValue *cv = it->second;\n-\t\tif (cv == NULL)\n+\t\tif (cv == NULL) {\n+\t\t\t*ctp = NULL; \/* XXX GCC -Wuninitialized. *\/\n \t\t\treturn (NULL);\n+\t\t}\n \n \t\tT *ct = dynamic_cast<T *>(cv->type_);\n-\t\tif (ct == NULL)\n+\t\tif (ct == NULL) {\n+\t\t\t*ctp = NULL; \/* XXX GCC -Wuninitialized. *\/\n \t\t\treturn (NULL);\n+\t\t}\n \n \t\t*ctp = ct;\n \t\treturn (cv);\n"} {"commit":"6173c77c8606f631ef664ecc5058bbc1ee31c7e6","subject":"- Do not use CMutex object when building with gcc or clang","message":"- Do not use CMutex object when building with gcc or clang\n","repos":"clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,felipensp\/clever,clever-lang\/clever,clever-lang\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,felipensp\/clever","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- core\/refcounted.h\n+++ core\/refcounted.h\n@@ -24,13 +24,7 @@\n \tvirtual ~RefCounted() {}\n \n \tvoid setReference(size_t reference) {\n-#ifdef CLEVER_THREADS\n-\t\tm_mutex.lock();\n \t\tm_reference = reference;\n-\t\tm_mutex.unlock();\n-#else\n-\t\tm_reference = reference;\n-#endif\n \t}\n \n \tsize_t refCount() const { return m_reference; }\n@@ -51,7 +45,7 @@\n \n \tvoid delRef() {\n \t\tclever_assert(m_reference > 0, \"This object has been free'd before.\");\n-#if CLEVER_GCC_VERSION >= 4010\n+#if CLEVER_GCC_VERSION >= 4010 || defined(__clang__)\n \t\tif (__sync_sub_and_fetch(&m_reference, 1) == 0) {\n \t\t\tclever_delete(this);\n \t\t}\n@@ -73,7 +67,7 @@\n \t}\n private:\n \tsize_t m_reference;\n-#ifdef CLEVER_THREADS\n+#if CLEVER_THREADS && !(CLEVER_GCC_VERSION >= 4010 || defined(__clang__))\n \tCMutex m_mutex;\n #endif\n \tDISALLOW_COPY_AND_ASSIGN(RefCounted);\n"} {"commit":"d2c2b52aed71ddf3c887e84cab627306e03340ca","subject":"style: reordered proto.h","message":"style: reordered proto.h\n","repos":"madeso\/euphoria,madeso\/euphoria,madeso\/euphoria,madeso\/euphoria,madeso\/euphoria,madeso\/euphoria","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libs\/core\/src\/core\/proto.h\n+++ libs\/core\/src\/core\/proto.h\n@@ -19,26 +19,6 @@\n \n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- \/\/ Helper functions\n-\n- std::string\n- get_string_from_path(const vfs::file_path& p);\n-\n- std::string\n- get_string_from_path_for_debugging(vfs::file_system* fs, const vfs::file_path& p);\n-\n- std::optional<std::string>\n- get_file_contents_or_null(vfs::file_system* fs, const vfs::file_path& file_name);\n-\n- std::optional<std::string>\n- read_source_or_get_error_message(const std::string& source, pugi::xml_document* doc);\n-\n- std::string\n- could_be_callback(const std::string& v, const std::vector<std::string>& vv);\n-\n-\n-\n- \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ Result types\n \n struct read_error_file_missing\n@@ -58,17 +38,36 @@\n std::vector<std::string> errors;\n };\n \n- void log_read_error(const read_error_file_missing&);\n- void log_read_error(const read_error_file_error&);\n-\n template<typename T>\n using read_result = std::variant<T, read_error_file_missing, read_error_file_error>;\n \n \n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- \/\/ Usage helpers\n-\n+ \/\/ Helper functions\n+\n+ std::string\n+ get_string_from_path(const vfs::file_path& p);\n+\n+ std::string\n+ get_string_from_path_for_debugging(vfs::file_system* fs, const vfs::file_path& p);\n+\n+ std::optional<std::string>\n+ get_file_contents_or_null(vfs::file_system* fs, const vfs::file_path& file_name);\n+\n+ std::optional<std::string>\n+ read_source_or_get_error_message(const std::string& source, pugi::xml_document* doc);\n+\n+ std::string\n+ could_be_callback(const std::string& v, const std::vector<std::string>& vv);\n+\n+ void\n+ log_read_error(const read_error_file_missing&);\n+\n+ void\n+ log_read_error(const read_error_file_error&);\n+\n+ \n template<typename> inline constexpr bool always_false_v = false;\n \n template<typename T>\n@@ -106,6 +105,11 @@\n result\n );\n }\n+\n+\n+\n+ \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+ \/\/ Usage helpers\n \n \/\/ log all errors, only return when file loaded\n template<typename T>\n"} {"commit":"4f3e8e84d74257df24ef64ca2eb8bbad0ebc3748","subject":"Add generic abs macro tests","message":"Add generic abs macro tests\n","repos":"MaxRoecker\/crux_algorithms-c,MaxRoecker\/crux_algorithms-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/math_abs_tests.c\n+++ tests\/math_abs_tests.c\n@@ -148,10 +148,52 @@\n }\n \n \n+void CRUX_MATH__abs_test () {\n+ const IU08 iu08_value = CRUX__as_iu08(0);\n+ const IU16 iu16_value = CRUX__as_iu16(0);\n+ const IU32 iu32_value = CRUX__as_iu32(0);\n+ const IU64 iu64_value = CRUX__as_iu64(0);\n+ const IS08 is08_value = CRUX__as_is08(0);\n+ const IS16 is16_value = CRUX__as_is16(0);\n+ const IS32 is32_value = CRUX__as_is32(0);\n+ const IS64 is64_value = CRUX__as_is64(0);\n+ CRUX__ResultIU08 iu08_result = CRUX_MATH__abs(iu08_value);\n+ CRUX__ResultIU16 iu16_result = CRUX_MATH__abs(iu16_value);\n+ CRUX__ResultIU32 iu32_result = CRUX_MATH__abs(iu32_value);\n+ CRUX__ResultIU64 iu64_result = CRUX_MATH__abs(iu64_value);\n+ CRUX__ResultIS08 is08_result = CRUX_MATH__abs(is08_value);\n+ CRUX__ResultIS16 is16_result = CRUX_MATH__abs(is16_value);\n+ CRUX__ResultIS32 is32_result = CRUX_MATH__abs(is32_value);\n+ CRUX__ResultIS64 is64_result = CRUX_MATH__abs(is64_value);\n+ ok((iu08_result.occ == NULL), \"Must not have an error.\");\n+ ok((iu08_result.value == CRUX__as_iu08(0)), \"Must be equal to 0.\");\n+ ok((iu16_result.occ == NULL), \"Must not have an error.\");\n+ ok((iu16_result.value == CRUX__as_iu16(0)), \"Must be equal to 0.\");\n+ ok((iu32_result.occ == NULL), \"Must not have an error.\");\n+ ok((iu32_result.value == CRUX__as_iu32(0)), \"Must be equal to 0.\");\n+ ok((iu64_result.occ == NULL), \"Must not have an error.\");\n+ ok((iu64_result.value == CRUX__as_iu64(0)), \"Must be equal to 0.\");\n+ ok((is08_result.occ == NULL), \"Must not have an error.\");\n+ ok((is08_result.value == CRUX__as_is08(0)), \"Must be equal to 0.\");\n+ ok((is16_result.occ == NULL), \"Must not have an error.\");\n+ ok((is16_result.value == CRUX__as_is16(0)), \"Must be equal to 0.\");\n+ ok((is32_result.occ == NULL), \"Must not have an error.\");\n+ ok((is32_result.value == CRUX__as_is32(0)), \"Must be equal to 0.\");\n+ ok((is64_result.occ == NULL), \"Must not have an error.\");\n+ ok((is64_result.value == CRUX__as_is64(0)), \"Must be equal to 0.\");\n+ CRUX__occurrences_clean(&iu08_result.occ);\n+ CRUX__occurrences_clean(&iu16_result.occ);\n+ CRUX__occurrences_clean(&iu32_result.occ);\n+ CRUX__occurrences_clean(&iu64_result.occ);\n+ CRUX__occurrences_clean(&is08_result.occ);\n+ CRUX__occurrences_clean(&is16_result.occ);\n+ CRUX__occurrences_clean(&is32_result.occ);\n+ CRUX__occurrences_clean(&is64_result.occ);\n+}\n \n \n int main () {\n- plan(36);\n+ plan(52);\n CRUX_MATH__abs_iu08_test();\n CRUX_MATH__abs_iu16_test();\n CRUX_MATH__abs_iu32_test();\n@@ -160,6 +202,7 @@\n CRUX_MATH__abs_is16_test();\n CRUX_MATH__abs_is32_test();\n CRUX_MATH__abs_is64_test();\n+ CRUX_MATH__abs_test();\n done_testing();\n return EXIT_SUCCESS;\n }\n"} {"commit":"01d5fbd6a4a0a0e84bfe80d4a18d5b5be4ba9ed8","subject":"use a contiguious buffer for the frame","message":"use a contiguious buffer for the frame\n\nfixes https:\/\/bugs.chromium.org\/p\/oss-fuzz\/issues\/detail?id=48021\n","repos":"lovell\/libvips,lovell\/libvips,lovell\/libvips,lovell\/libvips","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libvips\/foreign\/cgifsave.c\n+++ libvips\/foreign\/cgifsave.c\n@@ -105,6 +105,11 @@\n \tVipsRegion *frame;\n \tint write_y;\n \n+\t\/* VipsRegion is not always contiguious, but we need contiguious RGBA\n+\t * forthe quantizer. We need to copy each frame to a local buffer.\n+\t *\/\n+\tVipsPel *frame_bytes;\n+\n \t\/* The current frame as seen by libimagequant.\n \t *\/\n \tVipsQuantiseAttr *attr;\n@@ -165,6 +170,7 @@\n \tVIPS_UNREF( cgif->target );\n \n \tVIPS_FREE( cgif->index );\n+\tVIPS_FREE( cgif->frame_bytes );\n \tVIPS_FREE( cgif->previous_frame );\n \n \tG_OBJECT_CLASS( vips_foreign_save_cgif_parent_class )->\n@@ -422,17 +428,13 @@\n \tVipsObjectClass *class = VIPS_OBJECT_GET_CLASS( cgif );\n \tVipsRect *frame_rect = &cgif->frame->valid;\n \tint page_index = frame_rect->top \/ frame_rect->height;\n-\n-\t\/* We know this fits in an int since we limit frame size.\n-\t *\/\n-\tVipsPel *frame_bytes = \n-\t\tVIPS_REGION_ADDR( cgif->frame, 0, frame_rect->top );\n \tint n_pels = frame_rect->height * frame_rect->width;\n \n \tgboolean has_transparency;\n \tgboolean has_alpha_constraint;\n \tVipsPel * restrict p;\n \tint i;\n+\tint y;\n \tVipsQuantiseImage *image;\n \tgboolean use_local;\n \tVipsQuantiseResult *quantisation_result;\n@@ -445,8 +447,14 @@\n \tprintf( \"vips_foreign_save_cgif_write_frame: %d\\n\", page_index );\n #endif\/*DEBUG_VERBOSE*\/\n \n-\t\/* Threshold the alpha channel. It's safe to modify the region since \n-\t * it's a buffer we made.\n+\t\/* We need the frame as a contiguious RGBA buffer for the quantiser.\n+\t *\/\n+\tfor( y = 0; y < frame_rect->height; y++ )\n+\t\tmemcpy( cgif->frame_bytes + y * 4 * frame_rect->width,\n+\t\t\tVIPS_REGION_ADDR( cgif->frame, 0, frame_rect->top + y ),\n+\t\t\t4 * frame_rect->width );\n+\n+\t\/* Threshold the alpha channel. \n \t *\n \t * Also, check if the alpha channel of the current frame matches the\n \t * frame before.\n@@ -456,7 +464,7 @@\n \t * for the alpha channel instead of for the transparency size\n \t * optimization (maxerror).\n \t *\/\n-\tp = frame_bytes;\n+\tp = cgif->frame_bytes;\n \thas_alpha_constraint = FALSE;\n \tfor( i = 0; i < n_pels; i++ ) {\n \t\tif( p[3] >= 128 )\n@@ -480,7 +488,7 @@\n \t\/* Set up new frame for libimagequant.\n \t *\/\n \timage = vips__quantise_image_create_rgba( cgif->attr,\n-\t\tframe_bytes, frame_rect->width, frame_rect->height, 0 );\n+\t\tcgif->frame_bytes, frame_rect->width, frame_rect->height, 0 );\n \n \t\/* Quantise.\n \t *\/\n@@ -566,7 +574,7 @@\n \t\tint trans = has_transparency ? 0 : n_colours;\n \n \t\tvips_foreign_save_cgif_set_transparent( cgif,\n-\t\t\tcgif->previous_frame, frame_bytes, cgif->index, \n+\t\t\tcgif->previous_frame, cgif->frame_bytes, cgif->index, \n \t\t\tn_pels, trans );\n \n \t\tif( has_transparency ) \n@@ -577,7 +585,7 @@\n \telse {\n \t\t\/* Take a copy of the RGBA frame.\n \t\t *\/\n-\t\tmemcpy( cgif->previous_frame, frame_bytes, 4 * n_pels );\n+\t\tmemcpy( cgif->previous_frame, cgif->frame_bytes, 4 * n_pels );\n \t}\n \n \tif( cgif->delay &&\n@@ -728,6 +736,11 @@\n \t *\/\n \tvips__region_no_ownership( cgif->frame );\n \n+\t\/* This RGBA frame as a contiguious buffer.\n+\t *\/\n+\tcgif->frame_bytes = g_malloc0( (size_t) 4 * \n+\t\tframe_rect.width * frame_rect.height );\n+\n \t\/* The previous RGBA frame (for spotting pixels which haven't changed).\n \t *\/\n \tcgif->previous_frame = g_malloc0( (size_t) 4 * \n"} {"commit":"eebc6e5636af6a14e464556d76feb23e6dbfdbff","subject":"remove some dead code","message":"remove some dead code\n","repos":"lovell\/libvips,jcupitt\/libvips,jcupitt\/libvips,lovell\/libvips,jcupitt\/libvips,lovell\/libvips,lovell\/libvips,jcupitt\/libvips","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libvips\/foreign\/jpegsave.c\n+++ libvips\/foreign\/jpegsave.c\n@@ -53,20 +53,6 @@\n #include \"pforeign.h\"\n \n #ifdef HAVE_JPEG\n-\n-#ifdef HAVE_EXIF\n-#ifdef UNTAGGED_EXIF\n-#include <exif-data.h>\n-#include <exif-loader.h>\n-#include <exif-ifd.h>\n-#include <exif-utils.h>\n-#else \/*!UNTAGGED_EXIF*\/\n-#include <libexif\/exif-data.h>\n-#include <libexif\/exif-loader.h>\n-#include <libexif\/exif-ifd.h>\n-#include <libexif\/exif-utils.h>\n-#endif \/*UNTAGGED_EXIF*\/\n-#endif \/*HAVE_EXIF*\/\n \n typedef struct _VipsForeignSaveJpeg {\n \tVipsForeignSave parent_object;\n"} {"commit":"e50ffb1f2b3c793173a091ce64f7549804961b31","subject":"fbasc: cleaning up code","message":"fbasc: cleaning up code\n","repos":"biotrump\/liquid-dsp,cjcliffe\/liquid-dsp,wangning223\/liquid-dsp,jgaeddert\/liquid-dsp,biotrump\/liquid-dsp,manuts\/liquid-dsp,manuts\/liquid-dsp,JayKickliter\/liquid-dsp,manuts\/liquid-dsp,jgaeddert\/liquid-dsp,wangning223\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,cjcliffe\/liquid-dsp,andrepuschmann\/liquid-dsp,andrepuschmann\/liquid-dsp,andrepuschmann\/liquid-dsp,JayKickliter\/liquid-dsp,manuts\/liquid-dsp,cjcliffe\/liquid-dsp,cjcliffe\/liquid-dsp,jgaeddert\/liquid-dsp,wangning223\/liquid-dsp,wangning223\/liquid-dsp,jgaeddert\/liquid-dsp,JayKickliter\/liquid-dsp,JayKickliter\/liquid-dsp,manuts\/liquid-dsp,andrepuschmann\/liquid-dsp,wangning223\/liquid-dsp,cjcliffe\/liquid-dsp,biotrump\/liquid-dsp,andrepuschmann\/liquid-dsp,biotrump\/liquid-dsp,biotrump\/liquid-dsp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/audio\/src\/fbasc.c\n+++ src\/audio\/src\/fbasc.c\n@@ -10,9 +10,7 @@\n \n #include \"liquid.internal.h\"\n \n-#define FBASC_DEBUG 0\n-\n-#define FBASC_COMPRESS 1\n+#define FBASC_DEBUG 0\n \n \/\/ description value units\n \/\/ ----------- ----- -----\n@@ -36,7 +34,8 @@\n unsigned int bytes_per_frame; \/\/ <fixed>\n unsigned int bits_per_block;\n unsigned int max_bits_per_sample;\n- unsigned int * bk;\n+ unsigned int * bk; \/\/ bits per subchannel\n+ float * gk; \/\/ subchannel gain\n \n \/\/ derived values\n unsigned int samples_per_channel; \/\/ samples_per_frame\/num_channels (16)\n@@ -102,6 +101,7 @@\n \/\/ analysis\/synthesis\n q->X = (float*) malloc( (q->samples_per_frame)*sizeof(float) );\n q->channel_energy = (float*) malloc( (q->num_channels)*sizeof(float) );\n+ q->gk = (float*) malloc( (q->num_channels)*sizeof(float) );\n q->mu = 255.0f;\n \n \/\/ data\n@@ -120,6 +120,7 @@\n free(_q->X);\n free(_q->data);\n free(_q->bk);\n+ free(_q->gk);\n \n \/\/ free memory structure\n free(_q);\n@@ -180,31 +181,30 @@\n k_max = (_q->bk[i] > k_max) ? _q->bk[i] : k_max;\n }\n \n- \/\/ compute scaling factor\n- float g[_q->num_channels];\n- for (i=0; i<_q->num_channels; i++) {\n- g[i] = (float)(1<<(k_max-_q->bk[i]));\n- \/\/printf(\"g[%3u] = %12.8f\\n\", i, g[i]);\n- }\n+ \/\/ compute scaling factor: gk = 2^(max(bk) - bk)\n+ for (i=0; i<_q->num_channels; i++)\n+ _q->gk[i] = (float)(1<<(k_max-_q->bk[i]));\n \n \/\/ encode using basic quantizer\n float sample, z;\n+#if FBASC_DEBUG\n float max_sample=0.0f;\n+#endif\n unsigned int b;\n for (i=0; i<_q->samples_per_channel; i++) {\n for (j=0; j<_q->num_channels; j++) {\n \n if (_q->bk[j] > 1) {\n+ \/\/ acquire sample, applying proper gain\n+ sample = _q->X[i*(_q->num_channels)+j] * _q->gk[j];\n+\n \/\/ compress using mu-law encoder\n- \/\/ TODO: ensure proper scaling\n- sample = _q->X[i*(_q->num_channels)+j] * g[j];\n-#if FBASC_COMPRESS\n z = compress_mulaw(sample, _q->mu);\n-#else\n- z = sample;\n-#endif\n+\n+#if FBASC_DEBUG\n if (fabsf(z) > max_sample)\n max_sample = fabsf(z);\n+#endif\n \/\/ quantize\n b = quantize_adc(z, _q->bk[j]);\n } else {\n@@ -218,6 +218,11 @@\n #if FBASC_DEBUG\n printf(\"max sample: %12.8f\\n\", max_sample);\n #endif\n+\n+ \/\/ TODO: pack frame\n+\n+\n+\n }\n \n void fbasc_decode(fbasc _q, unsigned char * _frame, float * _audio)\n@@ -237,10 +242,9 @@\n k_max = (_q->bk[i] > k_max) ? _q->bk[i] : k_max;\n }\n \n- \/\/ compute scaling factor\n- float g[_q->num_channels];\n- for (i=0; i<_q->num_channels; i++)\n- g[i] = (float)(1<<(k_max-_q->bk[i]));\n+ \/\/ compute scaling factor: gk = 2^-(max(bk) - bk)\n+ for (i=0; i<_q->num_channels; i++)\n+ _q->gk[i] = 1.0f \/ (float)(1<<(k_max-_q->bk[i]));\n \n \/\/ decode using basic quantizer\n float sample, z;\n@@ -257,13 +261,12 @@\n }\n \n s++;\n-#if FBASC_COMPRESS\n+\n \/\/ expand using mu-law decoder\n sample = expand_mulaw(z, _q->mu);\n-#else\n- sample = z;\n-#endif\n- _q->X[i*(_q->num_channels)+j] = sample \/ g[j];\n+\n+ \/\/ store sample, applying proper gain\n+ _q->X[i*(_q->num_channels)+j] = sample * _q->gk[j];\n }\n }\n \n@@ -279,6 +282,7 @@\n \n \/\/ internal\n \n+\/\/ TODO: document this method\n void fbasc_compute_bit_allocation(unsigned int _n,\n float * _e,\n unsigned int _num_bits,\n@@ -312,7 +316,7 @@\n }\n }\n \n- \/\/ compute bit partitions\n+ \/\/ compute bit allocation\n float log2p;\n int bk;\n float bkf;\n@@ -327,7 +331,7 @@\n log2p += (e[j] == 0.0f) ? -60.0f : log2f(e[j]);\n log2p \/= n;\n \n- bkf = b + 0.5f*log2f(e[i]) - 0.5f*log2p;\n+ bkf = (e[i]==0.0f) ? 1.0f : b + 0.5f*log2f(e[i]) - 0.5f*log2p;\n bk = (int)roundf(bkf);\n \n bk = (bk > _max_bits) ? _max_bits : bk;\n"} {"commit":"9b968491d366a68ea1008ed29a74f7293501e4c4","subject":"unroll shrinkh inner loop","message":"unroll shrinkh inner loop\n\nuse VIPS_UNROLL for the inner loop, another 5% or so\n","repos":"jcupitt\/libvips,lovell\/libvips,jcupitt\/libvips,lovell\/libvips,jcupitt\/libvips,jcupitt\/libvips,lovell\/libvips,lovell\/libvips","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libvips\/resample\/shrinkh.c\n+++ libvips\/resample\/shrinkh.c\n@@ -3,7 +3,7 @@\n * 30\/10\/15\n * \t- from shrink.c\n * 22\/1\/16\n- * \t- reorganise loops, 30% faster\n+ * \t- reorganise loops, 30% faster, vectorisable\n *\/\n \n \/*\n@@ -62,6 +62,10 @@\n typedef VipsResampleClass VipsShrinkhClass;\n \n G_DEFINE_TYPE( VipsShrinkh, vips_shrinkh, VIPS_TYPE_RESAMPLE );\n+\n+#define INNER( BANDS ) \\\n+\tsum += p[x1]; \\\n+\tx1 += BANDS; \n \n \/* Integer shrink. \n *\/\n@@ -74,8 +78,8 @@\n \t\t\tint sum; \\\n \t\t\t\\\n \t\t\tsum = 0; \\\n-\t\t\tfor( x1 = b; x1 < ne; x1 += BANDS ) \\\n-\t\t\t\tsum += p[x1]; \\\n+\t\t\tx1 = b; \\\n+\t\t\tVIPS_UNROLL( shrink->xshrink, INNER( BANDS ) ); \\\n \t\t\tq[b] = (sum + shrink->xshrink \/ 2) \/ \\\n \t\t\t\tshrink->xshrink; \\\n \t\t} \\\n@@ -95,8 +99,8 @@\n \t\t\tdouble sum; \\\n \t\t\t\\\n \t\t\tsum = 0.0; \\\n-\t\t\tfor( x1 = b; x1 < ne; x1 += bands ) \\\n-\t\t\t\tsum += p[x1]; \\\n+\t\t\tx1 = b; \\\n+\t\t\tVIPS_UNROLL( shrink->xshrink, INNER( bands ) ); \\\n \t\t\tq[b] = sum \/ shrink->xshrink; \\\n \t\t} \\\n \t\tp += ne; \\\n"} {"commit":"2670df2a12bff5fd5ca87d679a4d0b01e354f846","subject":"dict-api.h: Add API for finding unused disjuncts in generation mode","message":"dict-api.h: Add API for finding unused disjuncts in generation mode\n","repos":"ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/dict-common\/dict-api.h\n+++ link-grammar\/dict-common\/dict-api.h\n@@ -52,6 +52,15 @@\n link_public_api(const Category_cost *)\n \tlinkage_get_categories(const Linkage linkage, WordIdx w);\n \n+link_public_api(Disjunct **)\n+\tsentence_unused_disjuncts(Sentence);\n+\n+link_public_api(char *)\n+\tdisjunct_expression(Disjunct *);\n+\n+link_public_api(const Category_cost *)\n+\tdisjunct_categories(Disjunct *);\n+\n \n \/* Return true if word can be found. *\/\n link_public_api(bool)\n"} {"commit":"cd73e29f2202c4aa72125490915e597aab37a23a","subject":"Add forward reference to TCollection.","message":"Add forward reference to TCollection.\n\n\ngit-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@5403 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"simonpf\/root,satyarth934\/root,omazapa\/root-old,esakellari\/my_root_for_test,davidlt\/root,agarciamontoro\/root,strykejern\/TTreeReader,cxx-hep\/root-cern,zzxuanyuan\/root,dfunke\/root,georgtroska\/root,perovic\/root,BerserkerTroll\/root,gganis\/root,mkret2\/root,beniz\/root,lgiommi\/root,perovic\/root,thomaskeck\/root,zzxuanyuan\/root-compressor-dummy,tc3t\/qoot,sirinath\/root,bbockelm\/root,esakellari\/root,root-mirror\/root,abhinavmoudgil95\/root,satyarth934\/root,pspe\/root,mhuwiler\/rootauto,simonpf\/root,dfunke\/root,buuck\/root,Y--\/root,root-mirror\/root,arch1tect0r\/root,mattkretz\/root,simonpf\/root,smarinac\/root,abhinavmoudgil95\/root,sirinath\/root,cxx-hep\/root-cern,gbitzes\/root,pspe\/root,kirbyherm\/root-r-tools,sirinath\/root,esakellari\/root,lgiommi\/root,mkret2\/root,evgeny-boger\/root,zzxuanyuan\/root-compressor-dummy,alexschlueter\/cern-root,nilqed\/root,georgtroska\/root,mhuwiler\/rootauto,beniz\/root,0x0all\/ROOT,lgiommi\/root,gbitzes\/root,dfunke\/root,mattkretz\/root,zzxuanyuan\/root,agarciamontoro\/root,kirbyherm\/root-r-tools,thomaskeck\/root,gganis\/root,zzxuanyuan\/root,veprbl\/root,kirbyherm\/root-r-tools,gganis\/root,jrtomps\/root,omazapa\/root-old,gbitzes\/root,evgeny-boger\/root,evgeny-boger\/root,abhinavmoudgil95\/root,beniz\/root,esakellari\/root,sbinet\/cxx-root,ffurano\/root5,root-mirror\/root,abhinavmoudgil95\/root,CristinaCristescu\/root,perovic\/root,karies\/root,agarciamontoro\/root,satyarth934\/root,perovic\/root,perovic\/root,lgiommi\/root,esakellari\/my_root_for_test,Dr15Jones\/root,buuck\/root,kirbyherm\/root-r-tools,bbockelm\/root,smarinac\/root,davidlt\/root,pspe\/root,omazapa\/root,abhinavmoudgil95\/root,gbitzes\/root,evgeny-boger\/root,smarinac\/root,sbinet\/cxx-root,gbitzes\/root,jrtomps\/root,buuck\/root,Y--\/root,nilqed\/root,sawenzel\/root,esakellari\/root,sirinath\/root,gganis\/root,BerserkerTroll\/root,georgtroska\/root,cxx-hep\/root-cern,agarciamontoro\/root,lgiommi\/root,smarinac\/root,esakellari\/my_root_for_test,omazapa\/root-old,mhuwiler\/rootauto,sawenzel\/root,smarinac\/root,vukasinmilosevic\/root,esakellari\/root,kirbyherm\/root-r-tools,vukasinmilosevic\/root,simonpf\/root,satyarth934\/root,karies\/root,nilqed\/root,arch1tect0r\/root,alexschlueter\/cern-root,buuck\/root,karies\/root,gganis\/root,esakellari\/my_root_for_test,omazapa\/root-old,BerserkerTroll\/root,gganis\/root,olifre\/root,zzxuanyuan\/root-compressor-dummy,omazapa\/root-old,esakellari\/root,simonpf\/root,zzxuanyuan\/root,CristinaCristescu\/root,omazapa\/root,veprbl\/root,beniz\/root,Y--\/root,krafczyk\/root,ffurano\/root5,nilqed\/root,mhuwiler\/rootauto,agarciamontoro\/root,0x0all\/ROOT,mattkretz\/root,vukasinmilosevic\/root,krafczyk\/root,simonpf\/root,smarinac\/root,arch1tect0r\/root,thomaskeck\/root,karies\/root,evgeny-boger\/root,jrtomps\/root,mhuwiler\/rootauto,davidlt\/root,omazapa\/root,bbockelm\/root,georgtroska\/root,root-mirror\/root,agarciamontoro\/root,nilqed\/root,0x0all\/ROOT,pspe\/root,beniz\/root,mattkretz\/root,olifre\/root,bbockelm\/root,lgiommi\/root,root-mirror\/root,alexschlueter\/cern-root,omazapa\/root,gbitzes\/root,davidlt\/root,dfunke\/root,satyarth934\/root,mattkretz\/root,cxx-hep\/root-cern,thomaskeck\/root,Duraznos\/root,BerserkerTroll\/root,zzxuanyuan\/root,bbockelm\/root,olifre\/root,perovic\/root,krafczyk\/root,omazapa\/root-old,omazapa\/root-old,thomaskeck\/root,olifre\/root,strykejern\/TTreeReader,karies\/root,Y--\/root,nilqed\/root,root-mirror\/root,buuck\/root,krafczyk\/root,arch1tect0r\/root,satyarth934\/root,krafczyk\/root,smarinac\/root,mattkretz\/root,bbockelm\/root,abhinavmoudgil95\/root,root-mirror\/root,lgiommi\/root,mhuwiler\/rootauto,davidlt\/root,nilqed\/root,omazapa\/root-old,vukasinmilosevic\/root,jrtomps\/root,Y--\/root,pspe\/root,dfunke\/root,vukasinmilosevic\/root,esakellari\/root,karies\/root,sirinath\/root,simonpf\/root,CristinaCristescu\/root,cxx-hep\/root-cern,zzxuanyuan\/root-compressor-dummy,esakellari\/my_root_for_test,buuck\/root,Duraznos\/root,arch1tect0r\/root,vukasinmilosevic\/root,olifre\/root,esakellari\/root,root-mirror\/root,arch1tect0r\/root,sbinet\/cxx-root,vukasinmilosevic\/root,omazapa\/root-old,pspe\/root,esakellari\/my_root_for_test,sirinath\/root,CristinaCristescu\/root,sirinath\/root,CristinaCristescu\/root,veprbl\/root,0x0all\/ROOT,jrtomps\/root,CristinaCristescu\/root,omazapa\/root,zzxuanyuan\/root,georgtroska\/root,sirinath\/root,Y--\/root,jrtomps\/root,veprbl\/root,mhuwiler\/rootauto,bbockelm\/root,satyarth934\/root,abhinavmoudgil95\/root,evgeny-boger\/root,Duraznos\/root,gganis\/root,mattkretz\/root,karies\/root,pspe\/root,0x0all\/ROOT,mkret2\/root,beniz\/root,veprbl\/root,karies\/root,zzxuanyuan\/root,simonpf\/root,Y--\/root,mkret2\/root,nilqed\/root,gbitzes\/root,dfunke\/root,kirbyherm\/root-r-tools,Y--\/root,esakellari\/root,CristinaCristescu\/root,krafczyk\/root,dfunke\/root,smarinac\/root,satyarth934\/root,beniz\/root,strykejern\/TTreeReader,krafczyk\/root,georgtroska\/root,lgiommi\/root,mattkretz\/root,bbockelm\/root,agarciamontoro\/root,mkret2\/root,pspe\/root,tc3t\/qoot,thomaskeck\/root,Y--\/root,abhinavmoudgil95\/root,gganis\/root,BerserkerTroll\/root,satyarth934\/root,satyarth934\/root,dfunke\/root,davidlt\/root,esakellari\/my_root_for_test,omazapa\/root,alexschlueter\/cern-root,karies\/root,mkret2\/root,Y--\/root,Duraznos\/root,arch1tect0r\/root,smarinac\/root,jrtomps\/root,evgeny-boger\/root,jrtomps\/root,cxx-hep\/root-cern,Duraznos\/root,sawenzel\/root,0x0all\/ROOT,agarciamontoro\/root,zzxuanyuan\/root-compressor-dummy,sbinet\/cxx-root,alexschlueter\/cern-root,tc3t\/qoot,thomaskeck\/root,sawenzel\/root,buuck\/root,nilqed\/root,georgtroska\/root,mkret2\/root,karies\/root,tc3t\/qoot,buuck\/root,sirinath\/root,arch1tect0r\/root,0x0all\/ROOT,thomaskeck\/root,tc3t\/qoot,veprbl\/root,dfunke\/root,perovic\/root,mkret2\/root,perovic\/root,davidlt\/root,abhinavmoudgil95\/root,vukasinmilosevic\/root,mkret2\/root,simonpf\/root,sbinet\/cxx-root,veprbl\/root,zzxuanyuan\/root,gbitzes\/root,veprbl\/root,BerserkerTroll\/root,georgtroska\/root,evgeny-boger\/root,beniz\/root,Y--\/root,agarciamontoro\/root,olifre\/root,bbockelm\/root,sbinet\/cxx-root,zzxuanyuan\/root-compressor-dummy,agarciamontoro\/root,mattkretz\/root,georgtroska\/root,ffurano\/root5,omazapa\/root-old,Duraznos\/root,evgeny-boger\/root,sawenzel\/root,krafczyk\/root,zzxuanyuan\/root-compressor-dummy,Duraznos\/root,arch1tect0r\/root,davidlt\/root,arch1tect0r\/root,ffurano\/root5,cxx-hep\/root-cern,gbitzes\/root,gbitzes\/root,strykejern\/TTreeReader,evgeny-boger\/root,ffurano\/root5,gganis\/root,omazapa\/root-old,root-mirror\/root,sawenzel\/root,zzxuanyuan\/root,mkret2\/root,pspe\/root,tc3t\/qoot,sirinath\/root,root-mirror\/root,sawenzel\/root,cxx-hep\/root-cern,vukasinmilosevic\/root,tc3t\/qoot,thomaskeck\/root,nilqed\/root,0x0all\/ROOT,smarinac\/root,mkret2\/root,esakellari\/root,olifre\/root,omazapa\/root,davidlt\/root,zzxuanyuan\/root-compressor-dummy,nilqed\/root,veprbl\/root,mattkretz\/root,Dr15Jones\/root,BerserkerTroll\/root,beniz\/root,Dr15Jones\/root,BerserkerTroll\/root,strykejern\/TTreeReader,olifre\/root,sbinet\/cxx-root,sawenzel\/root,mhuwiler\/rootauto,veprbl\/root,gganis\/root,CristinaCristescu\/root,zzxuanyuan\/root-compressor-dummy,abhinavmoudgil95\/root,lgiommi\/root,sawenzel\/root,davidlt\/root,Duraznos\/root,esakellari\/my_root_for_test,tc3t\/qoot,jrtomps\/root,olifre\/root,evgeny-boger\/root,Dr15Jones\/root,omazapa\/root,karies\/root,zzxuanyuan\/root-compressor-dummy,veprbl\/root,abhinavmoudgil95\/root,CristinaCristescu\/root,mhuwiler\/rootauto,olifre\/root,perovic\/root,Duraznos\/root,vukasinmilosevic\/root,BerserkerTroll\/root,alexschlueter\/cern-root,krafczyk\/root,sbinet\/cxx-root,esakellari\/root,dfunke\/root,esakellari\/my_root_for_test,krafczyk\/root,arch1tect0r\/root,davidlt\/root,vukasinmilosevic\/root,beniz\/root,simonpf\/root,zzxuanyuan\/root,Dr15Jones\/root,perovic\/root,zzxuanyuan\/root,jrtomps\/root,olifre\/root,BerserkerTroll\/root,Duraznos\/root,lgiommi\/root,thomaskeck\/root,esakellari\/my_root_for_test,Dr15Jones\/root,CristinaCristescu\/root,omazapa\/root,beniz\/root,CristinaCristescu\/root,tc3t\/qoot,BerserkerTroll\/root,gbitzes\/root,sbinet\/cxx-root,mhuwiler\/rootauto,lgiommi\/root,buuck\/root,buuck\/root,sirinath\/root,perovic\/root,root-mirror\/root,tc3t\/qoot,bbockelm\/root,buuck\/root,pspe\/root,sbinet\/cxx-root,georgtroska\/root,Dr15Jones\/root,georgtroska\/root,simonpf\/root,strykejern\/TTreeReader,pspe\/root,krafczyk\/root,Duraznos\/root,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root,0x0all\/ROOT,sawenzel\/root,sawenzel\/root,mhuwiler\/rootauto,mattkretz\/root,bbockelm\/root,agarciamontoro\/root,sbinet\/cxx-root,dfunke\/root,alexschlueter\/cern-root,jrtomps\/root,strykejern\/TTreeReader,ffurano\/root5,omazapa\/root,ffurano\/root5,satyarth934\/root,omazapa\/root,kirbyherm\/root-r-tools,gganis\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hist\/inc\/TPolyMarker.h\n+++ hist\/inc\/TPolyMarker.h\n@@ -1,4 +1,4 @@\n-\/\/ @(#)root\/hist:$Name: $:$Id: TPolyMarker.h,v 1.4 2001\/09\/19 20:05:23 brun Exp $\n+\/\/ @(#)root\/hist:$Name: $:$Id: TPolyMarker.h,v 1.5 2002\/01\/20 10:11:40 brun Exp $\n \/\/ Author: Rene Brun 12\/12\/94\n \n \/*************************************************************************\n@@ -28,6 +28,8 @@\n #ifndef ROOT_TAttMarker\n #include \"TAttMarker.h\"\n #endif\n+\n+class TCollection;\n \n class TPolyMarker : public TObject, public TAttMarker {\n protected:\n"} {"commit":"489349f3cca2eebc3965d2e6e3ee38a4c80dcc73","subject":"#249 fix incomplete typed vec2 amount","message":"#249 fix incomplete typed vec2 amount\n","repos":"TeamHypersomnia\/Hypersomnia,TeamHypersomnia\/Augmentations,TeamHypersomnia\/Hypersomnia,TeamHypersomnia\/Augmentations,TeamHypersomnia\/Hypersomnia,TeamHypersomnia\/Hypersomnia,TeamHypersomnia\/Hypersomnia","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/augs\/math\/rects.h\n+++ src\/augs\/math\/rects.h\n@@ -357,7 +357,7 @@\n \t\tthis->h = bottom - y;\n \t}\n \n-\tbasic_xywh& expand_from_center(const vec2 amount) {\n+\tbasic_xywh& expand_from_center(const basic_vec2<T> amount) {\n \t\tx -= amount.x;\n \t\ty -= amount.y;\n \t\tw += amount.x;\n"} {"commit":"3b2c77dd354720d34d4cba5fe680dfdf27720a0d","subject":"free shrinkv resources earlier","message":"free shrinkv resources earlier\n\nFree the shrinkv line buffer and struct at the end of eval, not on image\ndispose. This helps keep mem use down in some long-running operations.\n\nThank you homm, see https:\/\/github.com\/libvips\/pyvips\/issues\/147\n","repos":"jcupitt\/libvips,jcupitt\/libvips,jcupitt\/libvips,lovell\/libvips,jcupitt\/libvips,lovell\/libvips,lovell\/libvips,lovell\/libvips","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libvips\/resample\/shrinkv.c\n+++ libvips\/resample\/shrinkv.c\n@@ -124,6 +124,8 @@\n \tVipsShrinkvSequence *seq = (VipsShrinkvSequence *) vseq;\n \n \tVIPS_FREEF( g_object_unref, seq->ir );\n+\tVIPS_FREE( seq->sum );\n+\tVIPS_FREE( seq );\n \n \treturn( 0 );\n }\n@@ -137,14 +139,14 @@\n \tVipsShrinkv *shrink = (VipsShrinkv *) b;\n \tVipsShrinkvSequence *seq;\n \n-\tif( !(seq = VIPS_NEW( out, VipsShrinkvSequence )) )\n+\tif( !(seq = VIPS_NEW( NULL, VipsShrinkvSequence )) )\n \t\treturn( NULL );\n \n \tseq->ir = vips_region_new( in );\n \n \t\/* Big enough for the largest intermediate .. a whole scanline. \n \t *\/\n-\tseq->sum = VIPS_ARRAY( out, shrink->sizeof_line_buffer, VipsPel );\n+\tseq->sum = VIPS_ARRAY( NULL, shrink->sizeof_line_buffer, VipsPel );\n \n \treturn( (void *) seq );\n }\n"} {"commit":"dd3337ec10ff9b05fd22f862c2fff856d943da84","subject":"fix id parsing with white space","message":"fix id parsing with white space\n\n When device id string contains white space, parse is not correct.\nThis patch fix it\n\nSigned-off-by: Wenchao Xia <a82bded1b492a49d76e42d0788520e04e9fbf126@linux.vnet.ibm.com>\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libxkutil\/device_parsing.c\n+++ libxkutil\/device_parsing.c\n@@ -1033,7 +1033,7 @@\n {\n int ret;\n \n- ret = sscanf(devid, \"%a[^\/]\/%as\", host, device);\n+ ret = sscanf(devid, \"%a[^\/]\/%a[^\\n]\", host, device);\n if (ret != 2) {\n free(*host);\n free(*device);\n"} {"commit":"fdc5fc2340fad23428100abbad43d93d33b1dab4","subject":"remove the itrunc3 panic (if someone can convince me that the call to vinvalbuf won't keep the buffers for the metadata, I will put it back)","message":"remove the itrunc3 panic\n(if someone can convince me that the call to vinvalbuf won't keep the buffers\nfor the metadata, I will put it back)\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- ufs\/ffs\/ffs_inode.c\n+++ ufs\/ffs\/ffs_inode.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ffs_inode.c,v 1.10 1998\/11\/29 03:47:15 art Exp $\t*\/\n+\/*\t$OpenBSD: ffs_inode.c,v 1.11 1998\/12\/01 23:32:52 art Exp $\t*\/\n \/*\t$NetBSD: ffs_inode.c,v 1.10 1996\/05\/11 18:27:19 mycroft Exp $\t*\/\n \n \/*\n@@ -412,9 +412,6 @@\n \tfor (i = 0; i < NDADDR; i++)\n \t\tif (newblks[i] != oip->i_ffs_db[i])\n \t\t\tpanic(\"itrunc2\");\n-\tif (length == 0 &&\n-\t (ovp->v_dirtyblkhd.lh_first || ovp->v_cleanblkhd.lh_first))\n-\t\tpanic(\"itrunc3\");\n #endif \/* DIAGNOSTIC *\/\n \t\/*\n \t * Put back the real size.\n"} {"commit":"cbe4e8aeb317f3af99eb180492b2de99fa555933","subject":"[project @ 2002-11-01 11:16:33 by simonmar] total_alloc should be a 64-bit couunter.","message":"[project @ 2002-11-01 11:16:33 by simonmar]\ntotal_alloc should be a 64-bit couunter.\n\nMERGE TO STABLE\n","repos":"lukexi\/ghc,nushio3\/ghc,anton-dessiatov\/ghc,green-haskell\/ghc,fmthoma\/ghc,vTurbine\/ghc,tjakway\/ghcjvm,spacekitteh\/smcghc,nathyong\/microghc-ghc,AlexanderPankiv\/ghc,nathyong\/microghc-ghc,ghc-android\/ghc,spacekitteh\/smcghc,sgillespie\/ghc,nushio3\/ghc,sgillespie\/ghc,ml9951\/ghc,olsner\/ghc,da-x\/ghc,olsner\/ghc,AlexanderPankiv\/ghc,christiaanb\/ghc,da-x\/ghc,fmthoma\/ghc,nathyong\/microghc-ghc,mfine\/ghc,ghc-android\/ghc,ilyasergey\/GHC-XAppFix,tibbe\/ghc,elieux\/ghc,gridaphobe\/ghc,tjakway\/ghcjvm,nushio3\/ghc,olsner\/ghc,acowley\/ghc,TomMD\/ghc,ryantm\/ghc,nkaretnikov\/ghc,urbanslug\/ghc,oldmanmike\/ghc,hferreiro\/replay,tibbe\/ghc,green-haskell\/ghc,sdiehl\/ghc,frantisekfarka\/ghc-dsi,olsner\/ghc,vTurbine\/ghc,tibbe\/ghc,holzensp\/ghc,urbanslug\/ghc,holzensp\/ghc,da-x\/ghc,ilyasergey\/GHC-XAppFix,ekmett\/ghc,nushio3\/ghc,vikraman\/ghc,ezyang\/ghc,tibbe\/ghc,gridaphobe\/ghc,ezyang\/ghc,fmthoma\/ghc,mettekou\/ghc,nushio3\/ghc,oldmanmike\/ghc,tjakway\/ghcjvm,vikraman\/ghc,olsner\/ghc,lukexi\/ghc,hferreiro\/replay,ghc-android\/ghc,fmthoma\/ghc,siddhanathan\/ghc,hferreiro\/replay,mettekou\/ghc,gridaphobe\/ghc,jstolarek\/ghc,acowley\/ghc,mfine\/ghc,forked-upstream-packages-for-ghcjs\/ghc,vikraman\/ghc,vTurbine\/ghc,bitemyapp\/ghc,TomMD\/ghc,sdiehl\/ghc,AlexanderPankiv\/ghc,ekmett\/ghc,hferreiro\/replay,holzensp\/ghc,mcmaniac\/ghc,urbanslug\/ghc,oldmanmike\/ghc,siddhanathan\/ghc,tjakway\/ghcjvm,nomeata\/ghc,hferreiro\/replay,jstolarek\/ghc,sdiehl\/ghc,bitemyapp\/ghc,ml9951\/ghc,frantisekfarka\/ghc-dsi,ryantm\/ghc,spacekitteh\/smcghc,gridaphobe\/ghc,ryantm\/ghc,nkaretnikov\/ghc,ghc-android\/ghc,TomMD\/ghc,AlexanderPankiv\/ghc,nomeata\/ghc,christiaanb\/ghc,vTurbine\/ghc,sdiehl\/ghc,holzensp\/ghc,sdiehl\/ghc,mfine\/ghc,gcampax\/ghc,mcmaniac\/ghc,nomeata\/ghc,da-x\/ghc,vikraman\/ghc,anton-dessiatov\/ghc,snoyberg\/ghc,green-haskell\/ghc,sgillespie\/ghc,TomMD\/ghc,GaloisInc\/halvm-ghc,acowley\/ghc,acowley\/ghc,nushio3\/ghc,spacekitteh\/smcghc,lukexi\/ghc,vTurbine\/ghc,bitemyapp\/ghc,frantisekfarka\/ghc-dsi,urbanslug\/ghc,tibbe\/ghc,mettekou\/ghc,fmthoma\/ghc,nathyong\/microghc-ghc,da-x\/ghc,urbanslug\/ghc,mettekou\/ghc,wxwxwwxxx\/ghc,ilyasergey\/GHC-XAppFix,nathyong\/microghc-ghc,anton-dessiatov\/ghc,lukexi\/ghc,siddhanathan\/ghc,mcschroeder\/ghc,gridaphobe\/ghc,frantisekfarka\/ghc-dsi,lukexi\/ghc-7.8-arm64,shlevy\/ghc,snoyberg\/ghc,GaloisInc\/halvm-ghc,gcampax\/ghc,mcschroeder\/ghc,elieux\/ghc,ryantm\/ghc,lukexi\/ghc-7.8-arm64,tjakway\/ghcjvm,forked-upstream-packages-for-ghcjs\/ghc,TomMD\/ghc,ilyasergey\/GHC-XAppFix,wxwxwwxxx\/ghc,ghc-android\/ghc,ezyang\/ghc,nomeata\/ghc,forked-upstream-packages-for-ghcjs\/ghc,christiaanb\/ghc,tjakway\/ghcjvm,mfine\/ghc,urbanslug\/ghc,ezyang\/ghc,sgillespie\/ghc,nkaretnikov\/ghc,ekmett\/ghc,sgillespie\/ghc,elieux\/ghc,siddhanathan\/ghc,ezyang\/ghc,nkaretnikov\/ghc,gcampax\/ghc,oldmanmike\/ghc,mcmaniac\/ghc,mcmaniac\/ghc,da-x\/ghc,gridaphobe\/ghc,mettekou\/ghc,lukexi\/ghc-7.8-arm64,anton-dessiatov\/ghc,mcschroeder\/ghc,ekmett\/ghc,AlexanderPankiv\/ghc,mcschroeder\/ghc,wxwxwwxxx\/ghc,GaloisInc\/halvm-ghc,snoyberg\/ghc,GaloisInc\/halvm-ghc,wxwxwwxxx\/ghc,lukexi\/ghc-7.8-arm64,forked-upstream-packages-for-ghcjs\/ghc,ml9951\/ghc,snoyberg\/ghc,vTurbine\/ghc,oldmanmike\/ghc,AlexanderPankiv\/ghc,gcampax\/ghc,anton-dessiatov\/ghc,frantisekfarka\/ghc-dsi,anton-dessiatov\/ghc,christiaanb\/ghc,ekmett\/ghc,tjakway\/ghcjvm,acowley\/ghc,ml9951\/ghc,siddhanathan\/ghc,shlevy\/ghc,nkaretnikov\/ghc,GaloisInc\/halvm-ghc,mfine\/ghc,gcampax\/ghc,sdiehl\/ghc,christiaanb\/ghc,hferreiro\/replay,olsner\/ghc,acowley\/ghc,lukexi\/ghc,wxwxwwxxx\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ghc-android\/ghc,siddhanathan\/ghc,acowley\/ghc,TomMD\/ghc,AlexanderPankiv\/ghc,fmthoma\/ghc,sgillespie\/ghc,christiaanb\/ghc,wxwxwwxxx\/ghc,elieux\/ghc,vTurbine\/ghc,nomeata\/ghc,holzensp\/ghc,jstolarek\/ghc,shlevy\/ghc,snoyberg\/ghc,snoyberg\/ghc,mfine\/ghc,elieux\/ghc,anton-dessiatov\/ghc,oldmanmike\/ghc,green-haskell\/ghc,christiaanb\/ghc,mcschroeder\/ghc,shlevy\/ghc,nkaretnikov\/ghc,shlevy\/ghc,shlevy\/ghc,gcampax\/ghc,TomMD\/ghc,ezyang\/ghc,vikraman\/ghc,mcschroeder\/ghc,mettekou\/ghc,oldmanmike\/ghc,ml9951\/ghc,fmthoma\/ghc,bitemyapp\/ghc,green-haskell\/ghc,snoyberg\/ghc,da-x\/ghc,GaloisInc\/halvm-ghc,mcmaniac\/ghc,gridaphobe\/ghc,nushio3\/ghc,vikraman\/ghc,ml9951\/ghc,mettekou\/ghc,vikraman\/ghc,gcampax\/ghc,sgillespie\/ghc,lukexi\/ghc-7.8-arm64,nkaretnikov\/ghc,mcschroeder\/ghc,nathyong\/microghc-ghc,nathyong\/microghc-ghc,mfine\/ghc,sdiehl\/ghc,shlevy\/ghc,elieux\/ghc,jstolarek\/ghc,forked-upstream-packages-for-ghcjs\/ghc,spacekitteh\/smcghc,bitemyapp\/ghc,ml9951\/ghc,ghc-android\/ghc,hferreiro\/replay,ryantm\/ghc,wxwxwwxxx\/ghc,forked-upstream-packages-for-ghcjs\/ghc,ml9951\/ghc,urbanslug\/ghc,ezyang\/ghc,elieux\/ghc,GaloisInc\/halvm-ghc,jstolarek\/ghc,olsner\/ghc,siddhanathan\/ghc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ghc\/rts\/Profiling.c\n+++ ghc\/rts\/Profiling.c\n@@ -1,5 +1,5 @@\n \/* -----------------------------------------------------------------------------\n- * $Id: Profiling.c,v 1.32 2002\/07\/05 01:23:45 mthomas Exp $\n+ * $Id: Profiling.c,v 1.33 2002\/11\/01 11:16:33 simonmar Exp $\n *\n * (c) The GHC Team, 1998-2000\n *\n@@ -38,7 +38,8 @@\n \n \/* figures for the profiling report.\n *\/\n-static lnat total_alloc, total_prof_ticks;\n+static ullong total_alloc;\n+static lnat total_prof_ticks;\n \n \/* Globals for opening the profiling log file(s)\n *\/\n@@ -732,9 +733,8 @@\n \t total_prof_ticks, TICK_MILLISECS);\n \n fprintf(prof_file, \"\\ttotal alloc = %11s bytes\",\n-\t ullong_format_string((ullong) total_alloc * sizeof(W_),\n+\t ullong_format_string(total_alloc * sizeof(W_),\n \t\t\t\t temp, rtsTrue\/*commas*\/));\n- \/* ToDo: 64-bit error! *\/\n \n #if defined(PROFILING_DETAIL_COUNTS)\n fprintf(prof_file, \" (%lu closures)\", total_allocs);\n"} {"commit":"a9476c7645d935b9eb180e003a55bd3bde60e0fd","subject":"Drop obsolete reference to PTR_MASK","message":"Drop obsolete reference to PTR_MASK\n","repos":"kulp\/tenyr,kulp\/tenyr,kulp\/tenyr","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ui\/web\/src\/emtsim.c\n+++ ui\/web\/src\/emtsim.c\n@@ -100,7 +100,7 @@\n if (load_sim(s->dispatch_op, s, s->conf.fmt, in, s->conf.load_addr))\n fatal(0, \"Error while loading state into simulation\");\n \n- s->machine.regs[15] = s->conf.start_addr & PTR_MASK;\n+ s->machine.regs[15] = s->conf.start_addr;\n \n struct run_ops ops = {\n .pre_insn = pre_insn,\n"} {"commit":"e685b4d3adfbc984ab8f93ada88492c72b479b9f","subject":"-Wconversion clean on bbob2009_logger.c","message":"-Wconversion clean on bbob2009_logger.c\n","repos":"dtusar\/coco,NDManh\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,NDManh\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,dtusar\/coco,dtusar\/coco,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,NDManh\/numbbo,oaelhara\/numbbo,oaelhara\/numbbo,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,dtusar\/coco,dtusar\/coco,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,oaelhara\/numbbo","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/bbob2009_logger.c\n+++ src\/bbob2009_logger.c\n@@ -19,13 +19,13 @@\n \/* FIXME: these names could easily created conflicts with other coco.c-global names. Use bbob2009 as prefix to prevent conflicts. *\/\n static const size_t bbob2009_nbpts_nbevals = 20;\n static const size_t bbob2009_nbpts_fval = 5;\n-static long current_dim = 0;\n+static size_t current_dim = 0;\n static long current_funId = 0;\n-static size_t infoFile_firstInstance = 0;\n+static int infoFile_firstInstance = 0;\n char infoFile_firstInstance_char[3];\n \/*a possible solution: have a list of dims that are already in the file, if the ones we're about to log is != current_dim and the funId is currend_funId, create a new .info file with as suffix the number of the first instance *\/\n static const int bbob2009_number_of_dimensions = 6;\n-static long dimensions_in_current_infoFile[6] = {0,0,0,0,0,0}; \/*TODO should use BBOB2009_NUMBER_OF_DIMENSIONS*\/\n+static size_t dimensions_in_current_infoFile[6] = {0,0,0,0,0,0}; \/*TODO should use BBOB2009_NUMBER_OF_DIMENSIONS*\/\n \n \n \/* The current_... mechanism fails if several problems are open. \n@@ -52,11 +52,11 @@\n .dat file*\/\n long t_trigger; \/* next lower bound on nb fun evals to trigger a log in the\n .tdat file*\/\n- int idx_f_trigger; \/* allows to track the index i in logging target =\n+ size_t idx_f_trigger; \/* allows to track the index i in logging target =\n {10**(i\/bbob2009_nbpts_fval), i \\in Z} *\/\n- int idx_t_trigger; \/* allows to track the index i in logging nbevals =\n+ size_t idx_t_trigger; \/* allows to track the index i in logging nbevals =\n {int(10**(i\/bbob2009_nbpts_nbevals)), i \\in Z} *\/\n- int idx_tdim_trigger; \/* allows to track the index i in logging nbevals =\n+ size_t idx_tdim_trigger; \/* allows to track the index i in logging nbevals =\n {dim * 10**i, i \\in Z} *\/\n long number_of_evaluations;\n double best_fvalue;\n@@ -71,7 +71,7 @@\n * form it.*\/\n int function_id; \/*TODO: consider changing name*\/\n int instance_id;\n- long number_of_variables;\n+ size_t number_of_variables;\n double optimal_fvalue;\n } bbob2009_logger_t; \n \n@@ -94,7 +94,7 @@\n } else {\n if (data->idx_f_trigger == INT_MAX) { \/* first time*\/\n data->idx_f_trigger =\n- ceil(log10(fvalue - data->optimal_fvalue)) * bbob2009_nbpts_fval;\n+ (size_t)(ceil(log10(fvalue - data->optimal_fvalue)) * bbob2009_nbpts_fval);\n } else { \/* We only call this function when we reach the current f_trigger*\/\n data->idx_f_trigger--;\n }\n@@ -107,7 +107,7 @@\n }\n \n static void _bbob2009_logger_update_t_trigger(bbob2009_logger_t *data,\n- long number_of_variables) {\n+ size_t number_of_variables) {\n while (data->number_of_evaluations >=\n floor(pow(10, (double)data->idx_t_trigger \/ (double)bbob2009_nbpts_nbevals)))\n data->idx_t_trigger++;\n@@ -117,7 +117,7 @@\n data->idx_tdim_trigger++;\n \n data->t_trigger =\n- fmin(floor(pow(10, (double)data->idx_t_trigger \/ (double)bbob2009_nbpts_nbevals)),\n+ (long)fmin(floor(pow(10, (double)data->idx_t_trigger \/ (double)bbob2009_nbpts_nbevals)),\n number_of_variables * pow(10, (double)data->idx_tdim_trigger));\n }\n \n@@ -152,7 +152,7 @@\n const char *error_format = \"Error opening file: %s\\n \";\n \/*\"bbob2009_logger_prepare() failed to open log \"\n \"file '%s'.\";*\/\n- size_t buffer_size = snprintf(NULL, 0, error_format, path);\n+ size_t buffer_size = (size_t)(snprintf(NULL, 0, error_format, path));\/*to silence warning*\/\n buf = (char *)coco_allocate_memory(buffer_size);\n snprintf(buf, buffer_size, error_format, strerror(errnum), path);\n coco_error(buf);\n@@ -228,7 +228,7 @@\n infoFile_firstInstance = data->instance_id;\n }\n sprintf(function_id_char, \"%d\", data->function_id);\n- sprintf(infoFile_firstInstance_char, \"%zu\", infoFile_firstInstance);\n+ sprintf(infoFile_firstInstance_char, \"%d\", infoFile_firstInstance);\n char file_name[NUMBBO_PATH_MAX] = {0};\n char file_path[NUMBBO_PATH_MAX] = {0};\n FILE **target_file = &(data->index_file);\n@@ -272,7 +272,7 @@\n newLine = 0;\n file_path[strlen(file_path)-strlen(infoFile_firstInstance_char) - 7] = 0;\/*truncate the instance part*\/\n infoFile_firstInstance = data->instance_id;\n- sprintf(infoFile_firstInstance_char, \"%zu\", infoFile_firstInstance);\n+ sprintf(infoFile_firstInstance_char, \"%d\", infoFile_firstInstance);\n strncat(file_path, \"_i\", NUMBBO_PATH_MAX - strlen(file_name) - 1);\n strncat(file_path, infoFile_firstInstance_char, NUMBBO_PATH_MAX - strlen(file_name) - 1);\n strncat(file_path, \".info\", NUMBBO_PATH_MAX - strlen(file_name) - 1);\n"} {"commit":"4f39aa843ee6589fcc514f855e9164c47d351ab0","subject":"Documentation","message":"Documentation\n","repos":"patperry\/r-bcv,patperry\/r-bcv,patperry\/r-bcv","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/bcv-svd-gabriel.h\n+++ src\/bcv-svd-gabriel.h\n@@ -5,13 +5,21 @@\n #include \"bcv-partition.h\"\n #include \"bcv-types.h\"\n \n-\n+\/** \n+ * bcv_svd_gabriel_t:\n+ * \n+ * A #bcv_svd_gabriel_t is a workspace for a perfoming a Gabrial-style SVD\n+ * cross-validation.\n+ *\n+ * After being initiliazed with bcv_svd_grep_init(), the errors from the\n+ * various holdouts can be gotten from bcv_svd_gabriel_get_rss().\n+ *\/\n typedef struct _bcv_svd_gabriel bcv_svd_gabriel_t;\n \n \/**\n * bcv_gabriel_holdin_t:\n- * @m: the number of rows in the held-in set.\n- * @n: the number of columns on the held-in set.\n+ * @m: the number of rows in the held-in set\n+ * @n: the number of columns on the held-in set\n *\n * A #bcv_gabriel_holdin_t specifies the dimensions of the held-in matrix.\n *\/\n@@ -25,23 +33,76 @@\n assert (0 <= (x)->m && (x)->m <= (M)); \\\n assert (0 <= (x)->n && (x)->n <= (N));\n \n-\n+\/**\n+ * bcv_svd_gabriel_alloc:\n+ * @max_holdin: the maximum holdin dimensions.\n+ * @M: the number of rows in the matrix being cross-validated\n+ * @N: the number of columns in the matrix being cross-validated\n+ *\n+ * Allocate enough space to hold a #bcv_svd_gabriel_t workspace for \n+ * performing a Gabriel-style cross-validation of a matrix with the\n+ * given dimensions and the given maximum holdin sizes.\n+ *\/\n bcv_svd_gabriel_t *\n bcv_svd_gabriel_alloc (bcv_gabriel_holdin_t max_holdin, bcv_index_t M, \n bcv_index_t N);\n \n+\/**\n+ * bcv_svd_gabriel_init:\n+ * @bcv: uninitialized memory for a #bcv_svd_gabriel_t\n+ * @x: a matrix to cross-validate\n+ * @rows: a partition of the rows of @x\n+ * @cols: a partition of the columns of @x\n+ *\n+ * Initialize a #bcv_svd_gabriel_t workspace to cross-validate the matrix\n+ * @x with the hold-outs specified in the @rows and @cols partitions.\n+ *\n+ * This function does not allocate any memory.\n+ *\/\n void\n bcv_svd_gabriel_init (bcv_svd_gabriel_t *bcv, const bcv_matrix_t *x, \n const bcv_partition_t *rows, \n const bcv_partition_t *cols);\n \n+\/**\n+ * bcv_svd_gabriel_free:\n+ * @bcv: a BCV workspace\n+ *\n+ * Free a workspace allocated by bcv_svd_gabriel_alloc().\n+ *\/\n void\n bcv_svd_gabriel_free (bcv_svd_gabriel_t *bcv);\n \n+\/**\n+ * bcv_svd_gabriel_get_rss:\n+ * @bcv: an initialized BCV workspace\n+ * @i: the index of the hold-out row set\n+ * @j: the index of the hold-out column set\n+ * @rss: an array to store the RSS from predicting the given hold-out set\n+ * @max_rank: the maximum rank from which to get the RSS\n+ *\n+ * Get the residual sum of squares (RSS) from predicting the (@i,@j) hold-out\n+ * block with ranks 0, 1, ..., @max_rank SVD terms from the held-in set\n+ * and store the results in @rss[0], @rss[1], @rss[@max_rank]. Return\n+ * zero on success and a positive number on failing to compute the SVD of\n+ * the held-in set.\n+ *\n+ * The @max_rank parameter must be less than or equal to the minimum dimension\n+ * of the held-in set. See also bcv_svd_gabriel_get_max_rank().\n+ *\/\n bcv_error_t\n bcv_svd_gabriel_get_rss (const bcv_svd_gabriel_t *bcv, bcv_index_t i,\n bcv_index_t j, double *rss, bcv_index_t max_rank);\n \n+\/**\n+ * bcv_svd_gabriel_get_max_rank:\n+ * @bcv: an initialized BCV workspace\n+ * @i: the index of the hold-out row set\n+ * @j: the index of the hold-out column set\n+ *\n+ * The the maximum rank possible for predicting the (@i,@j) hold-out set.\n+ * This is equal to minimum dimension of the corresponding hold-in set.\n+ *\/\n bcv_index_t\n bcv_svd_gabriel_get_max_rank (const bcv_svd_gabriel_t *bcv, bcv_index_t i,\n bcv_index_t j);\n"} {"commit":"c100027f207f02c82e4aebccb5c5cae9a7de5745","subject":"e_configure: de-e_comp_get()ify","message":"e_configure: de-e_comp_get()ify\n","repos":"tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,rvandegrift\/e,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_configure.c\n+++ src\/bin\/e_configure.c\n@@ -76,9 +76,9 @@\n {\n if (custom_desktop_exec.func)\n custom_desktop_exec.func(custom_desktop_exec.data,\n- e_comp_get(NULL), params, eci->desktop);\n+ e_comp, params, eci->desktop);\n else\n- e_exec(e_zone_current_get(e_comp_get(NULL)),\n+ e_exec(e_zone_current_get(e_comp),\n eci->desktop, NULL, NULL, \"config\");\n }\n break;\n"} {"commit":"b64b8fc3aa151841f70b7ff5ed6e7d23d9f5c9b6","subject":"is_panic(): Refactor","message":"is_panic(): Refactor\n","repos":"linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/parse\/count.c\n+++ link-grammar\/parse\/count.c\n@@ -568,11 +568,11 @@\n \t * exhausted. checktimer is a device to avoid a gazillion system calls\n \t * to get the timer value. On circa-2018 machines, it results in\n \t * several timer calls per second. *\/\n+\tif (ctxt->exhausted) return true;\n \tctxt->checktimer++;\n-\tif (ctxt->exhausted || ((0 == ctxt->checktimer%(1<<18)) &&\n-\t (ctxt->current_resources != NULL) &&\n-\t \/\/fprintf(stderr, \"T\") &&\n-\t resources_exhausted(ctxt->current_resources)))\n+\tif (((0 == ctxt->checktimer%(1<<18)) && (ctxt->current_resources != NULL) &&\n+\t \/\/fprintf(stderr, \"T\") &&\n+\t resources_exhausted(ctxt->current_resources)))\n \t{\n \t\tctxt->exhausted = true;\n \t\treturn true;\n"} {"commit":"42f55ab5367ae8fbb2b2be1a1a1cb4046c211c27","subject":"","message":"\n\nthat fixme was already done\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_eapp_main.c\n+++ src\/bin\/e_eapp_main.c\n@@ -2,8 +2,6 @@\n * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2\n *\/\n #include \"e.h\"\n-\n-\/* FIXME: handle LANG!!!! *\/\n \n static void _e_help(void);\n \n"} {"commit":"a8273caa5d98ef957ca2cb9d231227acda1f3592","subject":"Implement package cleanup","message":"Implement package cleanup\n\nThe implemented solution ensures FinalizeSyncpoints()\nis called when the last thread using the package is\nabout to exit.\n","repos":"kostix\/posix-signal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- unix\/posix-signal.c\n+++ unix\/posix-signal.c\n@@ -48,6 +48,23 @@\n \n return procs[cmd](clientData, interp, objc, objv);\n }\n+\n+\f+\n+static\n+void\n+CleanupPackage (\n+ ClientData clientData)\n+{\n+ Tcl_MutexLock(&pkgInitLock);\n+\n+ --packageRefcount;\n+ if (packageRefcount == 0) {\n+\tFinalizeSyncpoints();\n+ }\n+\n+ Tcl_MutexUnlock(&pkgInitLock);\n+}\n \f \n int\n@@ -78,6 +95,8 @@\n * is loaded *\/\n InitEventHandlers();\n \n+ Tcl_CreateThreadExitHandler(CleanupPackage, NULL);\n+\n Tcl_CreateObjCommand(interp, PACKAGE_NAME,\n \t Signal_Command, clientData, NULL);\n \n"} {"commit":"7d71c91312c48c00232eca3fe62f604f3e9694e1","subject":"Convert ifdef'ed-out alt-consistency code to gword-set","message":"Convert ifdef'ed-out alt-consistency code to gword-set\n\nThe current code doesn't compile due to bit-rot.\n\nStill ifdef'ed-out.\n\nThis code is not too effective and is costly for the current corpus\nbatches and also for ady\/amy.\n\nUnless it can be improved, maybe it should be discarded.\n","repos":"ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/parse\/prune.c\n+++ link-grammar\/parse\/prune.c\n@@ -23,6 +23,15 @@\n #include \"string-set.h\"\n #include \"tokenize\/word-structures.h\" \/\/ for Word_struct\n #include \"tokenize\/wordgraph.h\"\n+\n+\/* This code is not too effective and is costly for the current corpus\n+ * batches and also for ady\/amy. So maybe it should be discarded. *\/\n+\/\/#define ALT_MUTUAL_CONSISTENCY\n+\/\/#define ALT_DISJUNCT_CONSISTENCY\n+\n+#if defined(ALT_MUTUAL_CONSISTENCY) || defined(ALT_DISJUNCT_CONSISTENCY)\n+#include \"tokenize\/tok-structures.h\"\n+#endif \/* ALT_MUTUAL_CONSISTENCY || ALT_DISJUNCT_CONSISTENCY *\/\n \n #define D_PRUNE 5\n \n@@ -376,13 +385,11 @@\n \tbool same_alternative = false;\n \n #ifdef ALT_MUTUAL_CONSISTENCY\n-\t\/* Validate that rc and lc are from the same alternative. *\/\n-\tfor (Gword **lg = (Gword **)lc->word; NULL != *lg; lg++)\n-\t{\n-\t\tfor (Gword **rg = (Gword **)rc->word; NULL != *rg; rg++)\n-\t\t{\n-\t\t\tif (in_same_alternative(*lg, *rg))\n-\t\t\t{\n+\t\/* Validate that rc and lc are from the same alternative.\n+\t * Each of the loops is of one iteration most of the times. *\/\n+\tfor (const gword_set *ga = lc->originating_gword; NULL != ga; ga = ga->next) {\n+\t\tfor (const gword_set *gb = rc->originating_gword; NULL != gb; gb = gb->next) {\n+\t\t\tif (in_same_alternative(ga->o_gword, gb->o_gword)) {\n \t\t\t\tsame_alternative = true;\n \t\t\t\tbreak;\n \t\t\t}\n@@ -400,7 +407,7 @@\n \tif (same_alternative)\n \t{\n \t\tconst Connector *remote_connector = lr ? lc : rc;\n-\t\tconst Gword **gword_c = remote_connector->word;\n+\t\tconst gword_set* gword_set_c = remote_connector->originating_gword;\n \t\tconst Connector *curr_connector = lr ? rc : lc;\n \n #if 0\n@@ -410,13 +417,13 @@\n #endif\n \t\tfor (const Connector *i = pc->first_connector; curr_connector != i; i = i->next)\n \t\t{\n-\t\t\tprintf(\" I%p=%s\", i, i->string);\n+\t\t\t\/\/printf(\" I%p=%s\", i, i->string);\n \t\t\tbool alt_compatible = false;\n-\t\t\tfor (Gword **gi = (Gword **)i->word; NULL != *gi; gi++)\n+\t\t\tfor (const gword_set *gi = i->originating_gword; NULL != gi; gi = gi->next)\n \t\t\t{\n-\t\t\t\tfor (Gword **gcp = (Gword **)gword_c; NULL != *gcp; gcp++)\n+\t\t\t\tfor (const gword_set *gs = gword_set_c; NULL != gs; gs = gs->next)\n \t\t\t\t{\n-\t\t\t\t\tif (in_same_alternative(*gi, *gcp))\n+\t\t\t\t\tif (in_same_alternative(gi->o_gword, gs->o_gword))\n \t\t\t\t\t{\n \t\t\t\t\t\talt_compatible = true;\n \t\t\t\t\t\tbreak;\n@@ -442,15 +449,15 @@\n \tif (!same_alternative)\n \t{\n \t\tlgdebug(8, \"w%d=%s and w%d=%s NSA\\n\",\n-\t\t lword, lc->word[0]->subword,\n-\t\t rword, rc->word[0]->subword);\n+\t\t lword, lc->originating_gword->o_gword->subword,\n+\t\t rword, rc->originating_gword->o_gword->subword);\n \n \t\treturn false;\n \t}\n \n \treturn same_alternative;\n }\n-#endif \/* defined(ALT_MUTUAL_CONSISTENCY) || defined(ALT_DISJUNCT_CONSISTENCY)*\/\n+#endif \/* ALT_MUTUAL_CONSISTENCY || ALT_DISJUNCT_CONSISTENCY *\/\n \n \/**\n * This takes two connectors (and whether these are shallow or not)\n"} {"commit":"6c581305d55f6d9318380b902647dab23d04e2c1","subject":"Typo.","message":"Typo.\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_scrollbar.h\n+++ src\/bin\/e_scrollbar.h\n@@ -3,7 +3,7 @@\n *\/\n #ifdef E_TYPEDEFS\n \n-typedef enum _E_Scrollbar_Direction \n+typedef enum _E_Scrollbar_Direction\n {\n E_SCROLLBAR_HORIZONTAL,\n E_SCROLLBAR_VERTICAL\n@@ -14,9 +14,9 @@\n #define E_SCROLLBAR_H\n \n EAPI Evas_Object *e_scrollbar_add(Evas *evas);\n-EAPI void e_scrollbar_direction_set_(Evas_Object *object,\n-\t\t\t\t\t\t E_Scrollbar_Direction dir);\n+EAPI void e_scrollbar_direction_set(Evas_Object *object,\n+\t\t\t\t\t\t E_Scrollbar_Direction dir);\n EAPI E_Scrollbar_Direction e_scrollbar_direction_get(Evas_Object *object);\n- \n+\n #endif\n #endif\n"} {"commit":"b3ff9099936b37ed17bddf41adc5edc17204e217","subject":"tests\/qtest-platform.h: #ifdef QT_GUI_LIB","message":"tests\/qtest-platform.h: #ifdef QT_GUI_LIB\n","repos":"shinnok\/tarsnap-gui,Tarsnap\/tarsnap-gui,shinnok\/tarsnap-gui,Tarsnap\/tarsnap-gui,Tarsnap\/tarsnap-gui,shinnok\/tarsnap-gui,shinnok\/tarsnap-gui,Tarsnap\/tarsnap-gui,Tarsnap\/tarsnap-gui,shinnok\/tarsnap-gui","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- tests\/qtest-platform.h\n+++ tests\/qtest-platform.h\n@@ -1,10 +1,13 @@\n #ifndef QTEST_PLATFORM_H\n #define QTEST_PLATFORM_H\n \n-#include <QApplication>\n #include <QTest>\n \n #include \"utils.h\"\n+\n+\/\/ Only relevant for running a gui test with -platform offscreen\n+#ifdef QT_GUI_LIB\n+#include <QApplication>\n \n \/\/ If we're running with a GUI (i.e. X11), we can watch the app doing tests\n #define IF_VISUAL if(QApplication::platformName() != \"offscreen\")\n@@ -42,6 +45,7 @@\n orig_message_handler(type, context, msg);\n }\n }\n+#endif \/* end gui-related code *\/\n \n \/\/ Find tarsnap and tarsnap-keygen in $PATH, or skip the test\n #define TARSNAP_CLI_OR_SKIP \\\n"} {"commit":"23d763d0efda15091496650853657a6dc4a4f009","subject":"Whitespace changes","message":"Whitespace changes\n","repos":"opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/print\/print.c\n+++ link-grammar\/print\/print.c\n@@ -777,13 +777,13 @@\n \tsize_t i;\n \tint c;\n \tDisjunct *d;\n-\tfor (i=0; i<sent->length; i++) {\n+\tfor (i=0; i<sent->length; i++)\n+\t{\n \t\tc = 0;\n-\t\tfor (d=sent->word[i].d; d != NULL; d = d->next) {\n-\t\t\tc++;\n-\t\t}\n+\t\tfor (d=sent->word[i].d; d != NULL; d = d->next) c++;\n+\n \t\t\/* XXX alternatives[0] is not really correct, here .. *\/\n-\t\tprintf(\"%s(%d) \",sent->word[i].alternatives[0], c);\n+\t\tprintf(\"%s(%d) \", sent->word[i].alternatives[0], c);\n \t}\n \tprintf(\"\\n\\n\");\n }\n"} {"commit":"e8a72c0db22b75144dd2ec0410352dbf34d4bde6","subject":"Prevent simple_prompt() from locking up in a tight loop at stdin EOF.","message":"Prevent simple_prompt() from locking up in a tight loop at stdin EOF.\n","repos":"edespino\/gpdb,Chibin\/gpdb,ashwinstar\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,oberstet\/postgres-xl,janebeckman\/gpdb,xuegang\/gpdb,adam8157\/gpdb,Quikling\/gpdb,edespino\/gpdb,lintzc\/gpdb,yazun\/postgres-xl,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,Chibin\/gpdb,ashwinstar\/gpdb,rubikloud\/gpdb,xuegang\/gpdb,zaksoup\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,tangp3\/gpdb,tpostgres-projects\/tPostgres,rvs\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,kmjungersen\/PostgresXL,foyzur\/gpdb,0x0FFF\/gpdb,lintzc\/gpdb,rvs\/gpdb,jmcatamney\/gpdb,lpetrov-pivotal\/gpdb,foyzur\/gpdb,atris\/gpdb,ahachete\/gpdb,royc1\/gpdb,Quikling\/gpdb,rubikloud\/gpdb,ovr\/postgres-xl,royc1\/gpdb,techdragon\/Postgres-XL,randomtask1155\/gpdb,snaga\/postgres-xl,zeroae\/postgres-xl,cjcjameson\/gpdb,kaknikhil\/gpdb,snaga\/postgres-xl,ovr\/postgres-xl,ashwinstar\/gpdb,yazun\/postgres-xl,yazun\/postgres-xl,lintzc\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,lpetrov-pivotal\/gpdb,CraigHarris\/gpdb,arcivanov\/postgres-xl,Chibin\/gpdb,rvs\/gpdb,cjcjameson\/gpdb,kaknikhil\/gpdb,ahachete\/gpdb,oberstet\/postgres-xl,kaknikhil\/gpdb,kaknikhil\/gpdb,snaga\/postgres-xl,greenplum-db\/gpdb,ovr\/postgres-xl,pavanvd\/postgres-xl,janebeckman\/gpdb,lpetrov-pivotal\/gpdb,cjcjameson\/gpdb,yazun\/postgres-xl,chrishajas\/gpdb,pavanvd\/postgres-xl,edespino\/gpdb,lpetrov-pivotal\/gpdb,adam8157\/gpdb,tangp3\/gpdb,ashwinstar\/gpdb,Postgres-XL\/Postgres-XL,Quikling\/gpdb,CraigHarris\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,techdragon\/Postgres-XL,ashwinstar\/gpdb,zeroae\/postgres-xl,atris\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,0x0FFF\/gpdb,tangp3\/gpdb,greenplum-db\/gpdb,tangp3\/gpdb,50wu\/gpdb,50wu\/gpdb,kaknikhil\/gpdb,pavanvd\/postgres-xl,greenplum-db\/gpdb,Quikling\/gpdb,50wu\/gpdb,adam8157\/gpdb,zaksoup\/gpdb,randomtask1155\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,kmjungersen\/PostgresXL,atris\/gpdb,techdragon\/Postgres-XL,adam8157\/gpdb,chrishajas\/gpdb,50wu\/gpdb,50wu\/gpdb,pavanvd\/postgres-xl,Postgres-XL\/Postgres-XL,yuanzhao\/gpdb,tangp3\/gpdb,yuanzhao\/gpdb,randomtask1155\/gpdb,yuanzhao\/gpdb,janebeckman\/gpdb,foyzur\/gpdb,royc1\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,ahachete\/gpdb,0x0FFF\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,postmind-net\/postgres-xl,Quikling\/gpdb,lisakowen\/gpdb,CraigHarris\/gpdb,Quikling\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,chrishajas\/gpdb,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,lisakowen\/gpdb,ahachete\/gpdb,zaksoup\/gpdb,techdragon\/Postgres-XL,snaga\/postgres-xl,ovr\/postgres-xl,zaksoup\/gpdb,foyzur\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,janebeckman\/gpdb,royc1\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,kaknikhil\/gpdb,CraigHarris\/gpdb,postmind-net\/postgres-xl,yazun\/postgres-xl,xinzweb\/gpdb,oberstet\/postgres-xl,kmjungersen\/PostgresXL,cjcjameson\/gpdb,zeroae\/postgres-xl,Postgres-XL\/Postgres-XL,CraigHarris\/gpdb,janebeckman\/gpdb,edespino\/gpdb,oberstet\/postgres-xl,chrishajas\/gpdb,ahachete\/gpdb,ovr\/postgres-xl,xinzweb\/gpdb,rubikloud\/gpdb,edespino\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,Postgres-XL\/Postgres-XL,Quikling\/gpdb,royc1\/gpdb,royc1\/gpdb,foyzur\/gpdb,atris\/gpdb,snaga\/postgres-xl,janebeckman\/gpdb,pavanvd\/postgres-xl,janebeckman\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,arcivanov\/postgres-xl,rubikloud\/gpdb,arcivanov\/postgres-xl,CraigHarris\/gpdb,xuegang\/gpdb,rvs\/gpdb,chrishajas\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,postmind-net\/postgres-xl,Quikling\/gpdb,xinzweb\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,tangp3\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,rvs\/gpdb,kmjungersen\/PostgresXL,50wu\/gpdb,Chibin\/gpdb,tpostgres-projects\/tPostgres,0x0FFF\/gpdb,cjcjameson\/gpdb,foyzur\/gpdb,atris\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,tangp3\/gpdb,postmind-net\/postgres-xl,lintzc\/gpdb,rubikloud\/gpdb,cjcjameson\/gpdb,edespino\/gpdb,rubikloud\/gpdb,0x0FFF\/gpdb,randomtask1155\/gpdb,royc1\/gpdb,atris\/gpdb,lisakowen\/gpdb,lpetrov-pivotal\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,rvs\/gpdb,randomtask1155\/gpdb,Chibin\/gpdb,rvs\/gpdb,cjcjameson\/gpdb,zaksoup\/gpdb,CraigHarris\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,randomtask1155\/gpdb,ahachete\/gpdb,foyzur\/gpdb,rvs\/gpdb,arcivanov\/postgres-xl,zaksoup\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,randomtask1155\/gpdb,chrishajas\/gpdb,edespino\/gpdb,zaksoup\/gpdb,atris\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,kmjungersen\/PostgresXL,greenplum-db\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,janebeckman\/gpdb,royc1\/gpdb,ahachete\/gpdb,xuegang\/gpdb,oberstet\/postgres-xl,zeroae\/postgres-xl,0x0FFF\/gpdb,randomtask1155\/gpdb,yuanzhao\/gpdb,arcivanov\/postgres-xl,0x0FFF\/gpdb,edespino\/gpdb,rubikloud\/gpdb,xuegang\/gpdb,xuegang\/gpdb,atris\/gpdb,kaknikhil\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,jmcatamney\/gpdb,yuanzhao\/gpdb,lpetrov-pivotal\/gpdb,jmcatamney\/gpdb,tpostgres-projects\/tPostgres,greenplum-db\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,xuegang\/gpdb,Quikling\/gpdb,tangp3\/gpdb,adam8157\/gpdb,adam8157\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bin\/psql\/common.c\n+++ src\/bin\/psql\/common.c\n@@ -3,7 +3,7 @@\n *\n * Copyright 2000 by PostgreSQL Global Development Group\n *\n- * $Header: \/cvsroot\/pgsql\/src\/bin\/psql\/common.c,v 1.25 2000\/11\/13 23:37:53 momjian Exp $\n+ * $Header: \/cvsroot\/pgsql\/src\/bin\/psql\/common.c,v 1.26 2000\/11\/27 01:28:40 tgl Exp $\n *\/\n #include \"postgres.h\"\n #include \"common.h\"\n@@ -217,12 +217,14 @@\n \tif (length > 0 && destination[length - 1] != '\\n')\n \t{\n \t\t\/* eat rest of the line *\/\n-\t\tchar\t\tbuf[512];\n+\t\tchar\t\tbuf[128];\n+\t\tint\t\t\tbuflen;\n \n \t\tdo\n \t\t{\n-\t\t\tfgets(buf, 512, stdin);\n-\t\t} while (buf[strlen(buf) - 1] != '\\n');\n+\t\t\tfgets(buf, sizeof(buf), stdin);\n+\t\t\tbuflen = strlen(buf);\n+\t\t} while (buflen > 0 && buf[buflen - 1] != '\\n');\n \t}\n \n \tif (length > 0 && destination[length - 1] == '\\n')\n"} {"commit":"b262f5cd94c997beb51b36602966ccbab7947ed9","subject":"fix strange memleak.","message":"fix strange memleak.\n\n\ngit-svn-id: fc35eccb03ccef1c432fd0fcf5295fcceaca86a6@28366 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6\n","repos":"linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/regex-morph.c\n+++ link-grammar\/regex-morph.c\n@@ -114,7 +114,8 @@\n \twhile (re != NULL)\n \t{\n \t\tRegex_node *next = re->next;\n-\t\tregfree((regex_t *)re->re);\n+\t\t\/* regfree((regex_t *)re->re); *\/\n+\t\tfree(re->re);\n \t\tfree(re);\n \t\tre = next;\n \t}\n"} {"commit":"225862fd3024bb53ea4789ee374d66060f5e474f","subject":"command-line.h: Remove #include link-features.h","message":"command-line.h: Remove #include link-features.h\n\nIts DECLS definitions are not needed here by now.\n","repos":"opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-parser\/command-line.h\n+++ link-parser\/command-line.h\n@@ -11,7 +11,6 @@\n \/* *\/\n \/*************************************************************************\/\n \n-#include <link-grammar\/link-features.h>\n #include <link-grammar\/link-includes.h>\n \n #define COMMENT_CHAR '%' \/* input lines beginning with this are ignored *\/\n"} {"commit":"a533729f4cc6a786eb3d88813fd3899a0e9cf77e","subject":"Be sure to import UIKit on iPhone","message":"Be sure to import UIKit on iPhone\n","repos":"amolloy\/ASMScaleKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Pod\/Classes\/OAuth\/ASMOAuth1Client.h\n+++ Pod\/Classes\/OAuth\/ASMOAuth1Client.h\n@@ -7,6 +7,9 @@\n \/\/\n \n #import <Foundation\/Foundation.h>\n+#if __IPHONE_OS_VERSION_MIN_REQUIRED\n+#import <UIKit\/UIKit.h>\n+#endif\n \n @class ASMOAuth1Token;\n \n"} {"commit":"cc886094913ba1bb7ba7a7bd30686c5dccef910e","subject":"[panel] Do not always show menu icon for Bookmark\/Media submenu","message":"[panel] Do not always show menu icon for Bookmark\/Media submenu\n\nhttp:\/\/bugzilla.gnome.org\/show_bug.cgi?id=591497\n","repos":"GNOME\/gnome-panel,GNOME\/gnome-panel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gnome-panel\/panel-menu-items.c\n+++ gnome-panel\/panel-menu-items.c\n@@ -433,7 +433,7 @@\n \t} else {\n \t\tGtkWidget *item;\n \n-\t\titem = panel_image_menu_item_new ();\n+\t\titem = gtk_image_menu_item_new ();\n \t\tsetup_menu_item_with_icon (item, panel_menu_icon_get_size (),\n \t\t\t\t\t PANEL_ICON_BOOKMARKS, NULL, NULL,\n \t\t\t\t\t _(\"Bookmarks\"));\n@@ -873,7 +873,7 @@\n \t} else {\n \t\tGtkWidget *item;\n \n-\t\titem = panel_image_menu_item_new ();\n+\t\titem = gtk_image_menu_item_new ();\n \t\tsetup_menu_item_with_icon (item, panel_menu_icon_get_size (),\n \t\t\t\t\t PANEL_ICON_REMOVABLE_MEDIA,\n \t\t\t\t\t NULL, NULL,\n"} {"commit":"53dbe1c9c8f4ab8d5068fce50677fd955c2b1e30","subject":"Add header which imports all files","message":"Add header which imports all files\n","repos":"seaburg\/IGIdenticon,seaburg\/IGIdenticon","returncode":1,"stderr":"error: pathspec 'IGIdenticon\/IGIdenticon.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- IGIdenticon\/IGIdenticon.h\n+++ IGIdenticon\/IGIdenticon.h\n@@ -0,0 +1,12 @@\n+\/\/\n+\/\/ IGIdenticon.h\n+\/\/ IGIdenticon\n+\/\/\n+\/\/ Created by Evgeniy Yurtaev on 29\/07\/15.\n+\/\/ Copyright (c) 2015 Evgeniy Yurtaev. All rights reserved.\n+\/\/\n+\n+#import \"IGImageGenerator.h\"\n+#import \"IGSimpleIdenticon.h\"\n+#import \"IGGitHubIdenticon.h\"\n+#import \"IGHashFunctions.h\"\n"} {"commit":"6811168fece6f44a1c8540504e2acafb8d3670be","subject":"Minor changes.","message":"Minor changes.\n","repos":"NESTLab\/Buzz,MISTLab\/Buzz,MISTLab\/Buzz,NESTLab\/Buzz,NESTLab\/Buzz,MISTLab\/Buzz","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/buzz\/buzzstring.c\n+++ src\/buzz\/buzzstring.c\n@@ -178,7 +178,7 @@\n int32_t i = strtod(s, &endptr);\n \/* Was the conversion successful? *\/\n if((errno != 0 && i == 0) || \/* An error occurred *\/\n- (endptr == s)) { \/* No digit found *\/\n+ (endptr == s)) { \/* No digit found *\/\n \/* Yes, an error occurred *\/\n buzzvm_pushnil(vm);\n }\n"} {"commit":"e64113bca04a195888fc7dd0cbff4a778974daaf","subject":"gobject: Add g_autoptr() support for GTypeClass, GEnumClass, GFlagsClass","message":"gobject: Add g_autoptr() support for GTypeClass, GEnumClass, GFlagsClass\n\nSigned-off-by: Philip Withnall <withnall@endlessm.com>\n\nhttps:\/\/bugzilla.gnome.org\/show_bug.cgi?id=789968\n","repos":"endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib,endlessm\/glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gobject\/gobject-autocleanups.h\n+++ gobject\/gobject-autocleanups.h\n@@ -22,7 +22,10 @@\n #endif\n \n G_DEFINE_AUTOPTR_CLEANUP_FUNC(GClosure, g_closure_unref)\n+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GEnumClass, g_type_class_unref)\n+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GFlagsClass, g_type_class_unref)\n G_DEFINE_AUTOPTR_CLEANUP_FUNC(GObject, g_object_unref)\n G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref)\n G_DEFINE_AUTOPTR_CLEANUP_FUNC(GParamSpec, g_param_spec_unref)\n+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTypeClass, g_type_class_unref)\n G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset)\n"} {"commit":"49b3e03b0aca4a3322a61305c86ebe1c1d4de631","subject":"Edited comments","message":"Edited comments\n","repos":"NicoLingg\/Bluetooth-LE-Example","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Qt_BluetoothLE_Example\/deviceinfo.h\n+++ Qt_BluetoothLE_Example\/deviceinfo.h\n@@ -38,7 +38,7 @@\n ** $QT_END_LICENSE$\r\n **\r\n ****************************************************************************\/\r\n-\/\/Thia class was written by Qt and is part of the QtBluetooth module of the Qt Toolkit\r\n+\r\n #ifndef DEVICEINFO_H\r\n #define DEVICEINFO_H\r\n \r\n"} {"commit":"873b19b457aaf4d2cfac90a1179e4b3581a44bc8","subject":"Refactor DataStack code into its own functions","message":"Refactor DataStack code into its own functions\n\n--HG--\nbranch : c-coroutine\n","repos":"larsbutler\/coveragepy,7WebPages\/coveragepy,larsbutler\/coveragepy,hugovk\/coveragepy,blueyed\/coveragepy,larsbutler\/coveragepy,hugovk\/coveragepy,hugovk\/coveragepy,larsbutler\/coveragepy,nedbat\/coveragepy,blueyed\/coveragepy,nedbat\/coveragepy,nedbat\/coveragepy,blueyed\/coveragepy,hugovk\/coveragepy,blueyed\/coveragepy,jayhetee\/coveragepy,7WebPages\/coveragepy,7WebPages\/coveragepy,jayhetee\/coveragepy,jayhetee\/coveragepy,hugovk\/coveragepy,7WebPages\/coveragepy,nedbat\/coveragepy,larsbutler\/coveragepy,jayhetee\/coveragepy,nedbat\/coveragepy,jayhetee\/coveragepy,blueyed\/coveragepy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- coverage\/tracer.c\n+++ coverage\/tracer.c\n@@ -102,6 +102,7 @@\n *\/\n \n DataStack data_stack;\n+ DataStack * pdata_stack;\n \n \/* The current file's data stack entry, copied from the stack. *\/\n DataStackEntry cur_entry;\n@@ -125,7 +126,50 @@\n #endif \/* COLLECT_STATS *\/\n } CTracer;\n \n+\n #define STACK_DELTA 100\n+\n+static int\n+DataStack_init(CTracer *self, DataStack *pdata_stack)\n+{\n+ pdata_stack->depth = -1;\n+ pdata_stack->stack = PyMem_Malloc(STACK_DELTA*sizeof(DataStackEntry));\n+ if (pdata_stack->stack == NULL) {\n+ STATS( self->stats.errors++; )\n+ PyErr_NoMemory();\n+ return RET_ERROR;\n+ }\n+ pdata_stack->alloc = STACK_DELTA;\n+ return RET_OK;\n+}\n+\n+static void\n+DataStack_dealloc(CTracer *self, DataStack *pdata_stack)\n+{\n+ PyMem_Free(pdata_stack->stack);\n+}\n+\n+static int\n+DataStack_grow(CTracer *self, DataStack *pdata_stack)\n+{\n+ pdata_stack->depth++;\n+ if (pdata_stack->depth >= pdata_stack->alloc) {\n+ STATS( self->stats.stack_reallocs++; )\n+ \/* We've outgrown our data_stack array: make it bigger. *\/\n+ int bigger = pdata_stack->alloc + STACK_DELTA;\n+ DataStackEntry * bigger_data_stack = PyMem_Realloc(pdata_stack->stack, bigger * sizeof(DataStackEntry));\n+ if (bigger_data_stack == NULL) {\n+ STATS( self->stats.errors++; )\n+ PyErr_NoMemory();\n+ pdata_stack->depth--;\n+ return RET_ERROR;\n+ }\n+ pdata_stack->stack = bigger_data_stack;\n+ pdata_stack->alloc = bigger;\n+ }\n+ return RET_OK;\n+}\n+\n \n static int\n CTracer_init(CTracer *self, PyObject *args_unused, PyObject *kwds_unused)\n@@ -152,14 +196,10 @@\n self->started = 0;\n self->tracing_arcs = 0;\n \n- self->data_stack.depth = -1;\n- self->data_stack.stack = PyMem_Malloc(STACK_DELTA*sizeof(DataStackEntry));\n- if (self->data_stack.stack == NULL) {\n- STATS( self->stats.errors++; )\n- PyErr_NoMemory();\n+ if (DataStack_init(self, &self->data_stack)) {\n return RET_ERROR;\n }\n- self->data_stack.alloc = STACK_DELTA;\n+ self->pdata_stack = &self->data_stack;\n \n self->cur_entry.file_data = NULL;\n self->cur_entry.last_line = -1;\n@@ -182,7 +222,7 @@\n Py_XDECREF(self->data);\n Py_XDECREF(self->should_trace_cache);\n \n- PyMem_Free(self->data_stack.stack);\n+ DataStack_dealloc(self, &self->data_stack);\n \n Py_TYPE(self)->tp_free((PyObject*)self);\n }\n@@ -258,16 +298,19 @@\n return ret;\n }\n \n-\/* Get the proper data_stack to use. In Python, defaultdict makes this easier. *\/\n+\/* Set self->pdata_stack to the proper data_stack to use. In Python, defaultdict makes this easier. *\/\n static int\n-CTracer_get_data_stack(CTracer *self)\n-{\n+CTracer_set_pdata_stack(CTracer *self)\n+{\n+ self->pdata_stack = &self->data_stack;\n+ return RET_OK;\n+\/*\n if (self->coroutine_id_func) {\n }\n else {\n- }\n-\n- return RET_OK;\n+ return &self->data_stack;\n+ }\n+*\/\n }\n \n \/*\n@@ -314,15 +357,18 @@\n we'll need to keep more of the missed frame's state.\n *\/\n STATS( self->stats.missed_returns++; )\n- if (self->data_stack.depth >= 0) {\n+ if (CTracer_set_pdata_stack(self)) {\n+ return RET_ERROR;\n+ }\n+ if (self->pdata_stack->depth >= 0) {\n if (self->tracing_arcs && self->cur_entry.file_data) {\n if (CTracer_record_pair(self, self->cur_entry.last_line, -self->last_exc_firstlineno) < 0) {\n return RET_ERROR;\n }\n }\n- SHOWLOG(self->data_stack.depth, frame->f_lineno, frame->f_code->co_filename, \"missedreturn\");\n- self->cur_entry = self->data_stack.stack[self->data_stack.depth];\n- self->data_stack.depth--;\n+ SHOWLOG(self->pdata_stack->depth, frame->f_lineno, frame->f_code->co_filename, \"missedreturn\");\n+ self->cur_entry = self->pdata_stack->stack[self->pdata_stack->depth];\n+ self->pdata_stack->depth--;\n }\n }\n self->last_exc_back = NULL;\n@@ -333,24 +379,15 @@\n case PyTrace_CALL: \/* 0 *\/\n STATS( self->stats.calls++; )\n \/* Grow the stack. *\/\n- self->data_stack.depth++;\n- if (self->data_stack.depth >= self->data_stack.alloc) {\n- STATS( self->stats.stack_reallocs++; )\n- \/* We've outgrown our data_stack array: make it bigger. *\/\n- int bigger = self->data_stack.alloc + STACK_DELTA;\n- DataStackEntry * bigger_data_stack = PyMem_Realloc(self->data_stack.stack, bigger * sizeof(DataStackEntry));\n- if (bigger_data_stack == NULL) {\n- STATS( self->stats.errors++; )\n- PyErr_NoMemory();\n- self->data_stack.depth--;\n- return RET_ERROR;\n- }\n- self->data_stack.stack = bigger_data_stack;\n- self->data_stack.alloc = bigger;\n+ if (CTracer_set_pdata_stack(self)) {\n+ return RET_ERROR;\n+ }\n+ if (DataStack_grow(self, self->pdata_stack)) {\n+ return RET_ERROR;\n }\n \n \/* Push the current state on the stack. *\/\n- self->data_stack.stack[self->data_stack.depth] = self->cur_entry;\n+ self->pdata_stack->stack[self->pdata_stack->depth] = self->cur_entry;\n \n \/* Check if we should trace this line. *\/\n filename = frame->f_code->co_filename;\n@@ -406,11 +443,11 @@\n \/* Make the frame right in case settrace(gettrace()) happens. *\/\n Py_INCREF(self);\n frame->f_trace = (PyObject*)self;\n- SHOWLOG(self->data_stack.depth, frame->f_lineno, filename, \"traced\");\n+ SHOWLOG(self->pdata_stack->depth, frame->f_lineno, filename, \"traced\");\n }\n else {\n self->cur_entry.file_data = NULL;\n- SHOWLOG(self->data_stack.depth, frame->f_lineno, filename, \"skipped\");\n+ SHOWLOG(self->pdata_stack->depth, frame->f_lineno, filename, \"skipped\");\n }\n \n Py_DECREF(tracename);\n@@ -422,7 +459,10 @@\n case PyTrace_RETURN: \/* 3 *\/\n STATS( self->stats.returns++; )\n \/* A near-copy of this code is above in the missing-return handler. *\/\n- if (self->data_stack.depth >= 0) {\n+ if (CTracer_set_pdata_stack(self)) {\n+ return RET_ERROR;\n+ }\n+ if (self->pdata_stack->depth >= 0) {\n if (self->tracing_arcs && self->cur_entry.file_data) {\n int first = frame->f_code->co_firstlineno;\n if (CTracer_record_pair(self, self->cur_entry.last_line, -first) < 0) {\n@@ -430,16 +470,16 @@\n }\n }\n \n- SHOWLOG(self->data_stack.depth, frame->f_lineno, frame->f_code->co_filename, \"return\");\n- self->cur_entry = self->data_stack.stack[self->data_stack.depth];\n- self->data_stack.depth--;\n+ SHOWLOG(self->pdata_stack->depth, frame->f_lineno, frame->f_code->co_filename, \"return\");\n+ self->cur_entry = self->pdata_stack->stack[self->pdata_stack->depth];\n+ self->pdata_stack->depth--;\n }\n break;\n \n case PyTrace_LINE: \/* 2 *\/\n STATS( self->stats.lines++; )\n- if (self->data_stack.depth >= 0) {\n- SHOWLOG(self->data_stack.depth, frame->f_lineno, frame->f_code->co_filename, \"line\");\n+ if (self->pdata_stack->depth >= 0) {\n+ SHOWLOG(self->pdata_stack->depth, frame->f_lineno, frame->f_code->co_filename, \"line\");\n if (self->cur_entry.file_data) {\n \/* We're tracing in this frame: record something. *\/\n if (self->tracing_arcs) {\n@@ -611,7 +651,7 @@\n \"new_files\", self->stats.new_files,\n \"missed_returns\", self->stats.missed_returns,\n \"stack_reallocs\", self->stats.stack_reallocs,\n- \"stack_alloc\", self->data_stack.alloc,\n+ \"stack_alloc\", self->pdata_stack->alloc,\n \"errors\", self->stats.errors\n );\n #else\n"} {"commit":"9ff9f01e8fba61ccd44615031b4351b1bbe91dc1","subject":"Move stats.errors stuff to reduce repetition and noise","message":"Move stats.errors stuff to reduce repetition and noise\n","repos":"nedbat\/coveragepy,hugovk\/coveragepy,jayhetee\/coveragepy,7WebPages\/coveragepy,7WebPages\/coveragepy,larsbutler\/coveragepy,hugovk\/coveragepy,blueyed\/coveragepy,jayhetee\/coveragepy,jayhetee\/coveragepy,larsbutler\/coveragepy,blueyed\/coveragepy,hugovk\/coveragepy,larsbutler\/coveragepy,larsbutler\/coveragepy,blueyed\/coveragepy,blueyed\/coveragepy,nedbat\/coveragepy,nedbat\/coveragepy,7WebPages\/coveragepy,jayhetee\/coveragepy,hugovk\/coveragepy,7WebPages\/coveragepy,nedbat\/coveragepy,hugovk\/coveragepy,larsbutler\/coveragepy,jayhetee\/coveragepy,blueyed\/coveragepy,nedbat\/coveragepy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- coverage\/tracer.c\n+++ coverage\/tracer.c\n@@ -160,7 +160,6 @@\n int bigger = pdata_stack->alloc + STACK_DELTA;\n DataStackEntry * bigger_data_stack = PyMem_Realloc(pdata_stack->stack, bigger * sizeof(DataStackEntry));\n if (bigger_data_stack == NULL) {\n- STATS( self->stats.errors++; )\n PyErr_NoMemory();\n pdata_stack->depth--;\n return RET_ERROR;\n@@ -206,6 +205,7 @@\n \n weakref = PyImport_ImportModule(\"weakref\");\n if (weakref == NULL) {\n+ STATS( self->stats.errors++; )\n return RET_ERROR;\n }\n self->data_stack_index = PyObject_CallMethod(weakref, \"WeakKeyDictionary\", NULL);\n@@ -318,13 +318,11 @@\n PyObject * t = Py_BuildValue(\"(ii)\", l1, l2);\n if (t != NULL) {\n if (PyDict_SetItem(self->cur_entry.file_data, t, Py_None) < 0) {\n- STATS( self->stats.errors++; )\n ret = RET_ERROR;\n }\n Py_DECREF(t);\n }\n else {\n- STATS( self->stats.errors++; )\n ret = RET_ERROR;\n }\n return ret;\n@@ -352,7 +350,6 @@\n the_index = self->data_stacks_used;\n stack_index = MyInt_FromLong(the_index);\n if (PyObject_SetItem(self->data_stack_index, co_obj, stack_index) < 0) {\n- STATS( self->stats.errors++; )\n Py_XDECREF(co_obj);\n Py_XDECREF(stack_index);\n return RET_ERROR;\n@@ -362,7 +359,6 @@\n int bigger = self->data_stacks_alloc + 10;\n DataStack * bigger_stacks = PyMem_Realloc(self->data_stacks, bigger * sizeof(DataStack));\n if (bigger_stacks == NULL) {\n- STATS( self->stats.errors++; )\n PyErr_NoMemory();\n Py_XDECREF(co_obj);\n Py_XDECREF(stack_index);\n@@ -479,11 +475,9 @@\n Py_DECREF(args);\n if (disposition == NULL) {\n \/* An error occurred inside should_trace. *\/\n- STATS( self->stats.errors++; )\n goto error;\n }\n if (PyDict_SetItem(self->should_trace_cache, filename, disposition) < 0) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n }\n@@ -493,7 +487,6 @@\n \n disp_trace = PyObject_GetAttrString(disposition, \"trace\");\n if (disp_trace == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n \n@@ -504,7 +497,6 @@\n \/* If tracename is a string, then we're supposed to trace. *\/\n tracename = PyObject_GetAttrString(disposition, \"source_filename\");\n if (tracename == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n }\n@@ -517,13 +509,11 @@\n if (file_data == NULL) {\n file_data = PyDict_New();\n if (file_data == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n ret = PyDict_SetItem(self->data, tracename, file_data);\n Py_DECREF(file_data);\n if (ret < 0) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n \n@@ -531,14 +521,12 @@\n \/* If the disposition mentions a plugin, record that. *\/\n disp_file_tracer = PyObject_GetAttrString(disposition, \"file_tracer\");\n if (disp_file_tracer == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n if (disp_file_tracer != Py_None) {\n disp_plugin_name = PyObject_GetAttrString(disp_file_tracer, \"plugin_name\");\n Py_DECREF(disp_file_tracer);\n if (disp_plugin_name == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n ret = PyDict_SetItem(self->plugin_data, tracename, disp_plugin_name);\n@@ -599,13 +587,11 @@\n \/* Tracing lines: key is simply this_line. *\/\n PyObject * this_line = MyInt_FromLong(frame->f_lineno);\n if (this_line == NULL) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n ret = PyDict_SetItem(self->cur_entry.file_data, this_line, Py_None);\n Py_DECREF(this_line);\n if (ret < 0) {\n- STATS( self->stats.errors++; )\n goto error;\n }\n }\n@@ -640,9 +626,12 @@\n }\n \n ret = RET_OK;\n+ goto ok;\n \n error:\n-\n+ STATS( self->stats.errors++; )\n+\n+ok:\n Py_XDECREF(tracename);\n Py_XDECREF(disposition);\n \n"} {"commit":"d2790c0aef8085511e501643c69490c11c9d19bc","subject":"channel-display: rename display_stream_destroy()","message":"channel-display: rename display_stream_destroy()\n\nThis patch renames destroy_display_stream() to\ndisplay_stream_destroy() to keep compatibility with\ndisplay_stream_create()\n\nSigned-off-by: Victor Toso <39b7599ff73bbf5db531748ba5250f21fa7120ff@redhat.com>\nAcked-by: Frediano Ziglio <55d48b080b2e443e395cde84d2c83b135a4ff48e@redhat.com>\n","repos":"flexVDI\/spice-gtk,flexVDI\/spice-gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/channel-display.c\n+++ src\/channel-display.c\n@@ -106,7 +106,7 @@\n static void spice_display_channel_reset(SpiceChannel *channel, gboolean migrating);\n static void spice_display_channel_reset_capabilities(SpiceChannel *channel);\n static void destroy_canvas(display_surface *surface);\n-static void destroy_display_stream(gpointer st);\n+static void display_stream_destroy(gpointer st);\n static void display_session_mm_time_reset_cb(SpiceSession *session, gpointer data);\n static SpiceGlScanout* spice_gl_scanout_copy(const SpiceGlScanout *scanout);\n \n@@ -1269,7 +1269,7 @@\n }\n if (st->video_decoder == NULL) {\n spice_printerr(\"could not create a video decoder for codec %u\", codec_type);\n- g_clear_pointer(&st, destroy_display_stream);\n+ g_clear_pointer(&st, display_stream_destroy);\n }\n return st;\n }\n@@ -1282,7 +1282,7 @@\n g_return_if_fail(c->streams != NULL);\n g_return_if_fail(c->nstreams > id);\n \n- g_clear_pointer(&c->streams[id], destroy_display_stream);\n+ g_clear_pointer(&c->streams[id], display_stream_destroy);\n }\n \n static void display_handle_stream_create(SpiceChannel *channel, SpiceMsgIn *in)\n@@ -1596,7 +1596,7 @@\n display_update_stream_region(st);\n }\n \n-static void destroy_display_stream(gpointer st_pointer)\n+static void display_stream_destroy(gpointer st_pointer)\n {\n int i;\n display_stream *st = st_pointer;\n"} {"commit":"4a4a66afa1939a99ad0f82654d0c7998f21d1fd2","subject":"Use bitfield attribute member","message":"Use bitfield attribute member\n\nComputation made by malsplitbinary_cursor_get_bitfield_length\nis really different.\n","repos":"gbonnefille\/malc,ccsdsmo\/malc,ccsdsmo\/malc,ccsdsmo\/malc,gbonnefille\/malc,gbonnefille\/malc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- malsplitbinary\/src\/malsplitbinary.c\n+++ malsplitbinary\/src\/malsplitbinary.c\n@@ -207,17 +207,11 @@\n \n void malsplitbinary_cursor_dump(malsplitbinary_cursor_t *cursor) {\n char *bitfield = malsplitbinary_cursor_get_bitfield_ptr(cursor);\n- int length = malsplitbinary_cursor_get_bitfield_length(cursor);\n- if (length > 9) {\n- \/\/ Avoid abnormal cursors\n- clog_debug(malsplitbinary_logger, \"invalid bitfield length=%d\\n\", length);\n- return;\n- }\n int bitfield_idx = malsplitbinary_cursor_get_bitfield_idx(cursor);\n- clog_debug(malsplitbinary_logger, \"malsplitbinary_cursor(bitfield_length=%d:[\", length);\n+ clog_debug(malsplitbinary_logger, \"malsplitbinary_cursor(bitfield_length=%d:[\", cursor->bitfield_length);\n if (bitfield != NULL)\n- for (int i = 0; i < length ; i++) {\n- for (int j = 0 ; j < 8 ; j++) {\n+ for (int i = 0 ; cursor->bitfield_length > 0 && i < (cursor->bitfield_length\/8 + 1) ; i++) {\n+ for (int j = 0 ; j < 8 && (i*8+j) < cursor->bitfield_length ; j++) {\n if ((i*8+j) == bitfield_idx) {\n \/\/ Add a marker for the current position\n clog_debug_no_header(malsplitbinary_logger, \">\");\n"} {"commit":"75eddeba4a42b63b0da98d9e56e8685d1fcadb7f","subject":"radix sort free unusing storages","message":"radix sort free unusing storages\n","repos":"namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes,namoamitabha\/StudyNotes","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- master-algorithm-with-c\/sort\/sort.c\n+++ master-algorithm-with-c\/sort\/sort.c\n@@ -355,5 +355,8 @@\n \t\texp *= base;\n \t}\n \n-\treturn 0;\n-}\n+\tfree(counter);\n+\tfree(temp);\n+\n+\treturn 0;\n+}\n"} {"commit":"487b8496b12eb0cd4249e76370c1ddcc395b9eae","subject":"* change to ANSI C style.","message":"* change to ANSI C style.\n","repos":"benolee\/ruby-gnome2,benolee\/ruby-gnome2,benolee\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkhandlebox.c\n+++ gtk2\/ext\/gtk2\/rbgtkhandlebox.c\n@@ -15,16 +15,14 @@\n #include \"global.h\"\n \n static VALUE\n-hb_initialize(self)\n- VALUE self;\n+hb_initialize(VALUE self)\n {\n RBGTK_INITIALIZE(self, gtk_handle_box_new());\n return Qnil;\n }\n \n static VALUE\n-hb_child_detached(self)\n- VALUE self;\n+hb_child_detached(VALUE self)\n {\n return CBOOL2RVAL(GTK_HANDLE_BOX(RVAL2GOBJ(self))->child_detached);\n }\n"} {"commit":"a8a2ba6e2435768c607c5bf5873d058e907164be","subject":"gtk3: add a missing file","message":"gtk3: add a missing file\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":1,"stderr":"error: pathspec 'gtk3\/ext\/gtk3\/rb-gtk3-widget.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- gtk3\/ext\/gtk3\/rb-gtk3-widget.c\n+++ gtk3\/ext\/gtk3\/rb-gtk3-widget.c\n@@ -0,0 +1,71 @@\n+\/* -*- c-file-style: \"ruby\"; indent-tabs-mode: nil -*- *\/\n+\/*\n+ * Copyright (C) 2015 Ruby-GNOME2 Project Team\n+ *\n+ * This library is free software; you can redistribute it and\/or\n+ * modify it under the terms of the GNU Lesser General Public\n+ * License as published by the Free Software Foundation; either\n+ * version 2.1 of the License, or (at your option) any later version.\n+ *\n+ * This library is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this library; if not, write to the Free Software\n+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n+ * MA 02110-1301 USA\n+ *\/\n+\n+#include \"rb-gtk3-private.h\"\n+\n+#define RG_TARGET_NAMESPACE cWidget\n+#define _SELF(self) (RVAL2GTKWIDGET(self))\n+\n+static void\n+class_init_func(gpointer g_class, gpointer class_data)\n+{\n+ rbgobj_class_init_func(g_class, class_data);\n+ rbgtk3_class_init_func(g_class, class_data);\n+}\n+\n+static VALUE\n+rg_initialize(int argc, VALUE *argv, VALUE self)\n+{\n+ rb_call_super(argc, argv);\n+ rbgtk3_initialize(self);\n+ return Qnil;\n+}\n+\n+static VALUE\n+rg_s_type_register(int argc, VALUE *argv, VALUE klass)\n+{\n+ VALUE type_name;\n+\n+ rb_scan_args(argc, argv, \"01\", &type_name);\n+\n+ rbgobj_register_type(klass, type_name, class_init_func);\n+\n+ {\n+ VALUE initialize_module;\n+ initialize_module = rb_define_module_under(klass, \"WidgetHook\");\n+ rbg_define_method(initialize_module,\n+ \"initialize\", rg_initialize, -1);\n+ rb_include_module(klass, initialize_module);\n+ }\n+\n+ return Qnil;\n+}\n+\n+void\n+rb_gtk3_widget_init(void)\n+{\n+ VALUE mGtk;\n+ VALUE RG_TARGET_NAMESPACE;\n+\n+ mGtk = rb_const_get(rb_cObject, rb_intern(\"Gtk\"));\n+ RG_TARGET_NAMESPACE = rb_const_get(mGtk, rb_intern(\"Widget\"));\n+\n+ RG_DEF_SMETHOD(type_register, -1);\n+}\n"} {"commit":"d265e6f0068d861aab3b6892c7460e9430c38dbf","subject":"gus: timer test needs to wait a little longer. apparently needed for a GUS PnP card on a Pentium 200MHz.","message":"gus: timer test needs to wait a little longer. apparently needed for a\nGUS PnP card on a Pentium 200MHz.\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hw\/ultrasnd\/ultrasnd.c\n+++ hw\/ultrasnd\/ultrasnd.c\n@@ -474,9 +474,11 @@\n \t\/* wait 100ms, more than enough time for the timers to count up to 0xFF and signal IRQ *\/\n \t\/* NTS: The SDK doc doesn't say, but apparently the timer will hit 0xFF, fire the IRQ, then reset to 0 and count up again (or else DOSBox is mis-emulating the GUS) *\/\n \tc1 = inp(u->port+0x006);\n-\tfor (i=0,c1=0;i < 100 && (c1&0xC) != 0xC;i++) {\n-\t\tt8254_wait(t8254_us2ticks(1000)); \/* 1ms *\/\n+\tfor (i=0,c1=0;i < 20 && (c1&0xC) != 0xC;i++) {\n+\t\t_cli();\n+\t\tt8254_wait(t8254_us2ticks(10000)); \/* 10ms *\/\n \t\tc1 = inp(u->port+0x006); \/* IRQ status *\/\n+\t\t_sti();\n \t}\n \tultrasnd_stop_timers(u);\n \tif ((c1&0xC) != 0xC) {\n"} {"commit":"c27d478131d59cf0269aa3a8b7b39e2cb11a8dc1","subject":"updated to 7.43 for sample","message":"updated to 7.43 for sample\n","repos":"utiasASRL\/easyloggingpp,dreal-deps\/easyloggingpp,hellowshinobu\/easyloggingpp,dreal-deps\/easyloggingpp,hellowshinobu\/easyloggingpp,arvidsson\/easyloggingpp,chenmusun\/easyloggingpp,spqr33\/easyloggingpp,arvidsson\/easyloggingpp,hellowshinobu\/easyloggingpp,simonhang\/easyloggingpp,arvidsson\/easyloggingpp,spqr33\/easyloggingpp,simonhang\/easyloggingpp,lisong521\/easyloggingpp,spthaolt\/easyloggingpp,simonhang\/easyloggingpp,utiasASRL\/easyloggingpp,spthaolt\/easyloggingpp,blankme\/easyloggingpp,blankme\/easyloggingpp,spqr33\/easyloggingpp,lisong521\/easyloggingpp,spthaolt\/easyloggingpp,utiasASRL\/easyloggingpp,lisong521\/easyloggingpp,blankme\/easyloggingpp,dreal-deps\/easyloggingpp,chenmusun\/easyloggingpp,chenmusun\/easyloggingpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- samples\/building-blocks\/engine\/easylogging++.h\n+++ samples\/building-blocks\/engine\/easylogging++.h\n@@ -2,7 +2,7 @@\n \/\/ \/\/\n \/\/ easylogging++.h - Core of EasyLogging++ \/\/\n \/\/ \/\/\n-\/\/ EasyLogging++ v7.41 \/\/\n+\/\/ EasyLogging++ v7.43 \/\/\n \/\/ Cross platform logging made easy for C++ applications \/\/\n \/\/ Author Majid Khan <mkhan3189@gmail.com> \/\/\n \/\/ http:\/\/www.icplusplus.com \/\/\n@@ -102,6 +102,11 @@\n #define _ENABLE_PERFORMANCE_TRACKING 1\n \n \/\/\n+\/\/ Severity level for performance tracking. Default is PDEBUG\n+\/\/\n+#define _PERFORMANCE_TRACKING_SEVERITY PDEBUG\n+\n+\/\/\n \/\/ High-level log evaluation\n \/\/\n #if ((_LOGGING_ENABLED) && !defined(_DISABLE_LOGS))\n@@ -198,7 +203,6 @@\n #define __UNDEF_LEAN_AND_MEAN\n #endif\n #include <windows.h>\n-#define _WINDOWS_HEADER_INCLUDED_FROM_FAST_MUTEX_H \/\/ Not part of fastmutex\n #ifdef __UNDEF_LEAN_AND_MEAN\n #undef WIN32_LEAN_AND_MEAN\n #undef __UNDEF_LEAN_AND_MEAN\n@@ -344,9 +348,7 @@\n #include <cctype>\n #if _ELPP_OS_WINDOWS\n # include <direct.h>\n-# ifndef (_WINDOWS_HEADER_INCLUDED_FROM_FAST_MUTEX_H)\n-# include <windows.h>\n-# endif\n+# include <windows.h>\n #endif \/\/ _ELPP_OS_WINDOWS\n #if _ELPP_OS_UNIX\n # include <sys\/stat.h>\n@@ -513,10 +515,10 @@\n }\n \n \/\/ Current version number\n- static inline const std::string version(void) { return std::string(\"7.41\"); }\n+ static inline const std::string version(void) { return std::string(\"7.43\"); }\n \n \/\/ Release date of current version\n- static inline const std::string releaseDate(void) { return std::string(\"26-03-2013 0941hrs\"); }\n+ static inline const std::string releaseDate(void) { return std::string(\"27-03-2013 1229hrs\"); }\n \n \/\/ Original author and maintainer\n static inline const std::string author(void) { return std::string(\"Majid Khan <mkhan3189@gmail.com>\"); }\n@@ -1639,18 +1641,18 @@\n \/\/\n \/\/ Performance tracking macros\n \/\/\n-#if (_ELPP_DEBUG_LOG && _ENABLE_PERFORMANCE_TRACKING)\n+#if (_ENABLE_PERFORMANCE_TRACKING && !defined(_DISABLE_PERFORMANCE_TRACKING))\n # define START_FUNCTION_LOG \"Executing [\" << __func__ << \"]\"\n # define TIME_OUTPUT \"Executed [\" << __func__ << \"] in [\" << \\\n easyloggingpp::internal::DateUtilities::formatMilliSeconds( \\\n easyloggingpp::internal::DateUtilities::getTimeDifference(functionEndTime, functionStartTime)) << \"]\"\n # define FUNC_SUB_COMMON_START { \\\n if (easyloggingpp::configurations::SHOW_START_FUNCTION_LOG) { \\\n- PDEBUG << START_FUNCTION_LOG; \\\n+ _PERFORMANCE_TRACKING_SEVERITY << START_FUNCTION_LOG; \\\n } \\\n timeval functionStartTime, functionEndTime; \\\n gettimeofday(&functionStartTime, NULL);\n-# define FUNC_SUB_COMMON_END gettimeofday(&functionEndTime, NULL); PDEBUG << TIME_OUTPUT;\n+# define FUNC_SUB_COMMON_END gettimeofday(&functionEndTime, NULL); _PERFORMANCE_TRACKING_SEVERITY << TIME_OUTPUT;\n # define SUB(FUNCTION_NAME,PARAMS) void FUNCTION_NAME PARAMS FUNC_SUB_COMMON_START\n # define END_SUB FUNC_SUB_COMMON_END }\n # define FUNC(RETURNING_TYPE,FUNCTION_NAME,PARAMS) RETURNING_TYPE FUNCTION_NAME PARAMS FUNC_SUB_COMMON_START\n"} {"commit":"3416db052751a0688c977f76248b3c479f1e7b4e","subject":"re-did addition and modular addition test","message":"re-did addition and modular addition test\n","repos":"sahandKashani\/CUDA-multiprecision-arithmetic-code-generator,sahandKashani\/CUDA-multiprecision-arithmetic-code-generator","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- src\/arithmetic.c\n+++ src\/arithmetic.c\n@@ -1,31 +1,19 @@\n #include <stdio.h>\n #include <gmp.h>\n \n-#define NUMBER_OF_TEST_VECTORS ((unsigned int) 1e6)\n-#define SEED 12345\n-#define RANDOM_NUMBER_BIT_RANGE 131\n+#define NUMBER_OF_TESTS ((unsigned int) 1e1)\n+#define SEED ((unsigned int) 12345)\n+#define RANDOM_NUMBER_BIT_RANGE ((unsigned int) 3)\n+#define MODULO ((unsigned int) 12)\n \n-\/**\n- * Structure to hold a test vector. A test vector contains 2 inputs and 1\n- * output. This can be used for testing addition and subtraction (with or\n- * without modulo arithmetic)\n- *\/\n typedef struct\n {\n- mpz_t op1; \/\/ first operand\n- mpz_t op2; \/\/ second operand\n- mpz_t rop; \/\/ result operand\n-} test_vector;\n+ mpz_t rop;\n+ mpz_t op1;\n+ mpz_t op2;\n+} addition_operands;\n \n-test_vector cpu_test_vectors[NUMBER_OF_TEST_VECTORS];\n-\n-\/**\n- * Function which tests a binary operator over mpz_t (integers). It expects a\n- * pointer towards a binary function, and a char representing the printed form\n- * of the operation (for representation purposes).\n- *\/\n-void binary_operator_test(void (*function)(mpz_t, const mpz_t, const mpz_t),\n- char operator)\n+void operator_test(void (*function)(mpz_t rop, const mpz_t op1, const mpz_t op2))\n {\n \/\/ random number generator initialization\n gmp_randstate_t random_state;\n@@ -33,62 +21,64 @@\n \/\/ incorporated seed in generator\n gmp_randseed_ui(random_state, SEED);\n \n- for(int i = 0; i < NUMBER_OF_TEST_VECTORS; i += 1)\n+ \/\/ initialize test vector operands and result\n+ mpz_t op1;\n+ mpz_t op2;\n+ mpz_t rop;\n+ mpz_init(op1);\n+ mpz_init(op2);\n+ mpz_init(rop);\n+\n+ for(int i = 0; i < NUMBER_OF_TESTS; i += 1)\n {\n- \/\/ initialize test vector operands and result\n- mpz_init(cpu_test_vectors[i].op1);\n- mpz_init(cpu_test_vectors[i].op2);\n- mpz_init(cpu_test_vectors[i].rop);\n-\n \/\/ generate 2 random numbers as inputs\n- mpz_urandomb(cpu_test_vectors[i].op1,\n- random_state,\n- RANDOM_NUMBER_BIT_RANGE);\n- mpz_urandomb(cpu_test_vectors[i].op2,\n- random_state,\n- RANDOM_NUMBER_BIT_RANGE);\n+ mpz_urandomb(op1, random_state, RANDOM_NUMBER_BIT_RANGE);\n+ mpz_urandomb(op2, random_state, RANDOM_NUMBER_BIT_RANGE);\n \n \/\/ apply function\n- function(cpu_test_vectors[i].rop,\n- cpu_test_vectors[i].op1,\n- cpu_test_vectors[i].op2);\n+ function(rop, op1, op2);\n+ }\n \n- \/\/ gmp_printf(\"%Zd %c %Zd = %Zd\\n\",\n- \/\/ cpu_test_vectors[i].op1,\n- \/\/ operator,\n- \/\/ cpu_test_vectors[i].op2,\n- \/\/ cpu_test_vectors[i].rop);\n-\n- \/\/ get memory back from test vectors\n- mpz_clear(cpu_test_vectors[i].op1);\n- mpz_clear(cpu_test_vectors[i].op2);\n- mpz_clear(cpu_test_vectors[i].rop);\n- }\n+ \/\/ get memory back from operands and results\n+ mpz_clear(op1);\n+ mpz_clear(op2);\n+ mpz_clear(rop);\n \n \/\/ get memory back from gmp_randstate_t\n gmp_randclear(random_state);\n }\n \n-\/**\n- * Tests the addition operator\n- *\/\n-void addition_test()\n+void addition(mpz_t rop, const mpz_t op1, const mpz_t op2)\n {\n- binary_operator_test(&mpz_add, '+');\n+ mpz_add(rop, op1, op2);\n+ \/\/ gmp_printf(\"%Zd + %Zd = %Zd\\n\", op1, op2, rop);\n }\n \n-\/**\n- * Tests the subtraction operator\n- *\/\n-void subtraction_test()\n+void modular_addition(mpz_t rop, const mpz_t op1, const mpz_t op2)\n {\n- binary_operator_test(&mpz_sub, '-');\n+ mpz_t mod;\n+ mpz_init_set_ui(mod, MODULO);\n+\n+ \/\/ perform modular addition\n+ mpz_add(rop, op1, op2);\n+ mpz_cdiv_r(rop, rop, mod);\n+\n+ \/\/ might have to adjust the remainder to be positive, because gmp only\n+ \/\/ guarantees that n = q*d + r, with 0 <= |r| <= |d|\n+ int negative_remainder = mpz_cmp(mod, rop);\n+ if(negative_remainder)\n+ {\n+ mpz_add(rop, rop, mod);\n+ }\n+\n+ \/\/ gmp_printf(\"(%Zd + %Zd) mod %Zd = %Zd\\n\", op1, op2, mod, rop);\n+\n+ mpz_clear(mod);\n }\n \n int main(void)\n {\n- addition_test();\n- subtraction_test();\n-\n+ operator_test(&addition);\n+ operator_test(&modular_addition);\n return 0;\n }\n"} {"commit":"ccf124800fe025be3ca05c28a60514909ca66a11","subject":"Always enable lock level checks.","message":"Always enable lock level checks.\n\nGathering data for Bug: 9285048.\n\nChange-Id: I2569f2fcc428df4ee43695bb9144c05f204a3070\n","repos":"treadstoneproject\/artinst,treadstoneproject\/artinst,treadstoneproject\/artinst,treadstoneproject\/artinst,treadstoneproject\/artinst","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/base\/mutex.h\n+++ src\/base\/mutex.h\n@@ -53,7 +53,7 @@\n class ScopedContentionRecorder;\n class Thread;\n \n-const bool kDebugLocking = kIsDebugBuild;\n+const bool kDebugLocking = true || kIsDebugBuild;\n \n \/\/ Base class for all Mutex implementations\n class BaseMutex {\n"} {"commit":"3582c58232d928cca683b7a50db5a781c3656bbc","subject":"cmd\/gc: instrument blocks for race detection.","message":"cmd\/gc: instrument blocks for race detection.\n\nIt happens that blocks are used for function calls in a\nquite low-level way so they cannot be instrumented as\nusual.\n\nBlocks are also used for inlined functions.\n\nR=golang-dev, rsc, dvyukov\nCC=golang-dev\nhttp:\/\/codereview.appspot.com\/6821068","repos":"abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go,abustany\/go","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/gc\/racewalk.c\n+++ src\/cmd\/gc\/racewalk.c\n@@ -88,6 +88,7 @@\n racewalknode(Node **np, NodeList **init, int wr, int skip)\n {\n \tNode *n, *n1;\n+\tNodeList *fini;\n \n \tn = *np;\n \n@@ -116,8 +117,28 @@\n \t\tgoto ret;\n \n \tcase OBLOCK:\n-\t\t\/\/ leads to crashes.\n-\t\t\/\/racewalklist(n->list, nil);\n+\t\tif(n->list == nil)\n+\t\t\tgoto ret;\n+\n+\t\tswitch(n->list->n->op) {\n+\t\tcase OCALLFUNC:\n+\t\tcase OCALLMETH:\n+\t\tcase OCALLINTER:\n+\t\t\t\/\/ Blocks are used for multiple return function calls.\n+\t\t\t\/\/ x, y := f() becomes BLOCK{CALL f, AS x [SP+0], AS y [SP+n]}\n+\t\t\t\/\/ We don't want to instrument between the statements because it will\n+\t\t\t\/\/ smash the results.\n+\t\t\tracewalknode(&n->list->n, &n->ninit, 0, 0);\n+\t\t\tfini = nil;\n+\t\t\tracewalklist(n->list->next, &fini);\n+\t\t\tn->list = concat(n->list, fini);\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\t\/\/ Ordinary block, for loop initialization or inlined bodies.\n+\t\t\tracewalklist(n->list, nil);\n+\t\t\tbreak;\n+\t\t}\n \t\tgoto ret;\n \n \tcase ODEFER:\n"} {"commit":"b5fcd27a08042e588c1cc159a6d99642ec6a4541","subject":"chExtractVersionInfo: Don't check for retversion != NULL","message":"chExtractVersionInfo: Don't check for retversion != NULL\n\nThe only caller, chExtractVersion() passes not NULL. Therefore,\nit's redundant to check for NULL.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\nReviewed-by: Daniel P. Berrang\u00e9 <bb938cf255e055ff3507f2627d214e8e62118fcf@redhat.com>\n","repos":"crobinso\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,zippy2\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,olafhering\/libvirt,zippy2\/libvirt,zippy2\/libvirt,crobinso\/libvirt,crobinso\/libvirt,libvirt\/libvirt,olafhering\/libvirt,libvirt\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,zippy2\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/ch\/ch_conf.c\n+++ src\/ch\/ch_conf.c\n@@ -201,8 +201,7 @@\n g_autofree char *ch_cmd = g_find_program_in_path(CH_CMD);\n virCommand *cmd = virCommandNewArgList(ch_cmd, \"--version\", NULL);\n \n- if (retversion)\n- *retversion = 0;\n+ *retversion = 0;\n \n virCommandAddEnvString(cmd, \"LC_ALL=C\");\n virCommandSetOutputBuffer(cmd, &help);\n@@ -231,9 +230,7 @@\n goto cleanup;\n }\n \n- if (retversion)\n- *retversion = version;\n-\n+ *retversion = version;\n ret = 0;\n \n cleanup:\n"} {"commit":"a87dd60a6b63632b86e72b846d550b6a61bbaeb4","subject":"gc: fix wrong arguments to error message for switches.","message":"gc: fix wrong arguments to error message for switches.\n\nFixes issue 2502.\n\nR=golang-dev, rsc\nCC=golang-dev, remy\nhttp:\/\/codereview.appspot.com\/5472062\n\nCommitter: Russ Cox <5ad239cb8a44f659eaaee0aa1ea5b94947abe557@golang.org>\n","repos":"sanjosh\/sanjos100-tipc,scirelli\/scirelli-go,scirelli\/scirelli-go,scirelli\/scirelli-go,glycerine\/jeaten-go-arrayof-structof,d0f\/go-zh,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,d0f\/go-zh,webfd\/go-zh,rflanagan\/reginaldflanagan-project1,rdp\/rogerpack2005-golang,scirelli\/scirelli-go,webfd\/go-zh,rdp\/rogerpack2005-golang,webfd\/go-zh,Triskite\/willstone-goclone,glycerine\/jeaten-go-arrayof-structof,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,webfd\/go-zh,rflanagan\/reginaldflanagan-project1,rdp\/rogerpack2005-golang,d0f\/go-zh,d0f\/go-zh,scirelli\/scirelli-go,Triskite\/willstone-goclone,Triskite\/willstone-goclone,d0f\/go-zh,webfd\/go-zh,Triskite\/willstone-goclone,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,Triskite\/willstone-goclone,bryanxu\/go-zh,webfd\/go-zh,scirelli\/scirelli-go,sanjosh\/sanjos100-tipc,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,mhennings\/marcohennings-go,scirelli\/scirelli-go,rflanagan\/reginaldflanagan-project1,rflanagan\/reginaldflanagan-project1,mhennings\/marcohennings-go,mhennings\/marcohennings-go,sanjosh\/sanjos100-tipc,d0f\/go-zh,bryanxu\/go-zh,Triskite\/willstone-goclone,rdp\/rogerpack2005-golang,bryanxu\/go-zh,bryanxu\/go-zh,scirelli\/scirelli-go,rflanagan\/reginaldflanagan-project1,rdp\/rogerpack2005-golang,webfd\/go-zh,bryanxu\/go-zh,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,Triskite\/willstone-goclone,d0f\/go-zh,rflanagan\/reginaldflanagan-project1,bryanxu\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,d0f\/go-zh,mhennings\/marcohennings-go,rflanagan\/reginaldflanagan-project1,Triskite\/willstone-goclone,sanjosh\/sanjos100-tipc,bryanxu\/go-zh,bryanxu\/go-zh,rflanagan\/reginaldflanagan-project1,sanjosh\/sanjos100-tipc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/gc\/swt.c\n+++ src\/cmd\/gc\/swt.c\n@@ -878,7 +878,7 @@\n \t\t\t\t\t\tif(n->ntest)\n \t\t\t\t\t\t\tyyerror(\"invalid case %N in switch on %N (mismatched types %T and %T)\", ll->n, n->ntest, ll->n->type, t);\n \t\t\t\t\t\telse\n-\t\t\t\t\t\t\tyyerror(\"invalid case %N in switch (mismatched types %T and bool)\", ll->n, n->ntest, ll->n->type, t);\n+\t\t\t\t\t\t\tyyerror(\"invalid case %N in switch (mismatched types %T and bool)\", ll->n, ll->n->type);\n \t\t\t\t\t} else if(nilonly && !isconst(ll->n, CTNIL)) {\n \t\t\t\t\t\tyyerror(\"invalid case %N in switch (can only compare %s %N to nil)\", ll->n, nilonly, n->ntest);\n \t\t\t\t\t}\n"} {"commit":"7290b924cfe12ba928e7a621cba5af7e3006486c","subject":"cmd\/ld: retry short writes, to get error detail","message":"cmd\/ld: retry short writes, to get error detail\n\nFixes issue 3802.\n\nR=golang-dev, bradfitz\nCC=golang-dev\nhttps:\/\/codereview.appspot.com\/7228066\n","repos":"webfd\/go-zh,scirelli\/scirelli-go,rdp\/rogerpack2005-golang,sanjosh\/sanjos100-tipc,sanjosh\/sanjos100-tipc,rdp\/rogerpack2005-golang,d0f\/go-zh,bryanxu\/go-zh,sanjosh\/sanjos100-tipc,d0f\/go-zh,d0f\/go-zh,sanjosh\/sanjos100-tipc,scirelli\/scirelli-go,d0f\/go-zh,bryanxu\/go-zh,mhennings\/marcohennings-go,webfd\/go-zh,d0f\/go-zh,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,sanjosh\/sanjos100-tipc,d0f\/go-zh,bryanxu\/go-zh,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,scirelli\/scirelli-go,sanjosh\/sanjos100-tipc,webfd\/go-zh,scirelli\/scirelli-go,webfd\/go-zh,d0f\/go-zh,mhennings\/marcohennings-go,mhennings\/marcohennings-go,scirelli\/scirelli-go,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,scirelli\/scirelli-go,sanjosh\/sanjos100-tipc,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,scirelli\/scirelli-go,glycerine\/jeaten-go-arrayof-structof,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,rdp\/rogerpack2005-golang,webfd\/go-zh,scirelli\/scirelli-go,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,glycerine\/jeaten-go-arrayof-structof,bryanxu\/go-zh,webfd\/go-zh,glycerine\/jeaten-go-arrayof-structof,webfd\/go-zh,webfd\/go-zh,mhennings\/marcohennings-go,rdp\/rogerpack2005-golang,bryanxu\/go-zh,rdp\/rogerpack2005-golang,glycerine\/jeaten-go-arrayof-structof,mhennings\/marcohennings-go,bryanxu\/go-zh,rdp\/rogerpack2005-golang,d0f\/go-zh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cmd\/ld\/lib.c\n+++ src\/cmd\/ld\/lib.c\n@@ -1447,6 +1447,23 @@\n \n vlong coutpos;\n \n+static void\n+dowrite(int fd, char *p, int n)\n+{\n+\tint m;\n+\t\n+\twhile(n > 0) {\n+\t\tm = write(fd, p, n);\n+\t\tif(m <= 0) {\n+\t\t\tcursym = S;\n+\t\t\tdiag(\"write error: %r\");\n+\t\t\terrorexit();\n+\t\t}\n+\t\tn -= m;\n+\t\tp += m;\n+\t}\n+}\n+\n void\n cflush(void)\n {\n@@ -1455,13 +1472,8 @@\n \tif(cbpmax < cbp)\n \t\tcbpmax = cbp;\n \tn = cbpmax - buf.cbuf;\n-\tif(n) {\n-\t\tif(write(cout, buf.cbuf, n) != n) {\n-\t\t\tdiag(\"write error: %r\");\n-\t\t\terrorexit();\n-\t\t}\n-\t\tcoutpos += n;\n-\t}\n+\tdowrite(cout, buf.cbuf, n);\n+\tcoutpos += n;\n \tcbp = buf.cbuf;\n \tcbc = sizeof(buf.cbuf);\n \tcbpmax = cbp;\n@@ -1502,10 +1514,7 @@\n \tcflush();\n \tif(n <= 0)\n \t\treturn;\n-\tif(write(cout, buf, n) != n) {\n-\t\tdiag(\"write error: %r\");\n-\t\terrorexit();\n-\t}\n+\tdowrite(cout, buf, n);\n \tcoutpos += n;\n }\n \n"} {"commit":"e05b30643ae7baaa15d995440995e1d6ca1a6dcb","subject":"Variable is used as parameter and destination in sprintf","message":"Variable is used as parameter and destination in sprintf\n\nThis is an undefined behaviour.\n","repos":"spmfilter\/libcmime,spmfilter\/libcmime","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cmime_part.c\n+++ src\/cmime_part.c\n@@ -45,8 +45,10 @@\n asprintf(&out,\"%s%s\",token,nl);\n } else {\n if (isspace(token[0])!=0) {\n- out = (char *)realloc(out,strlen(out) + strlen(token) + strlen(nl) + 1);\n- sprintf(out,\"%s%s%s\",out,token,nl);\n+ char *new_out;\n+ asprintf(&new_out, \"%s%s%s\", out, token, nl);\n+ free(out);\n+ out = new_out;\n } else\n break;\n }\n"} {"commit":"0375d66dd04ba828066807edccf7ae8245f903d2","subject":"crypto: compress - Fix checkpatch errors","message":"crypto: compress - Fix checkpatch errors\n\nSigned-off-by: Richard Hartmann <a12544d47d939944848ab384f58884ccf594e67d@gmail.com>\nSigned-off-by: Herbert Xu <ef65de1c7be0aa837fe7b25ba9a7739905af6a55@gondor.apana.org.au>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crypto\/compress.c\n+++ crypto\/compress.c\n@@ -7,7 +7,7 @@\n *\n * This program is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU General Public License as published by the Free\n- * Software Foundation; either version 2 of the License, or (at your option) \n+ * Software Foundation; either version 2 of the License, or (at your option)\n * any later version.\n *\n *\/\n@@ -39,7 +39,7 @@\n \n \tops->cot_compress = crypto_compress;\n \tops->cot_decompress = crypto_decompress;\n-\t\n+\n \treturn 0;\n }\n \n"} {"commit":"71ad1818fe0b653bde7647acbbd15ae696381cfe","subject":"Switch to SHA384_Final()","message":"Switch to SHA384_Final()\n\nThis was working previously because the Openssl libcrypto implementation\ncalls SHA512_Final directly from SHA384_Final. What if this changes?\n\nI don't think the increase in confusion here justifies the decrease\nin stack depth.\n\nfixes #157\n","repos":"PKRoma\/s2n,alexeblee\/s2n,bpdavidson\/s2n,colmmacc\/s2n,colmmacc\/s2n,awslabs\/s2n,wcs1only\/s2n,awslabs\/s2n,jldodds\/s2n,alexeblee\/s2n,PKRoma\/s2n,awslabs\/s2n,jldodds\/s2n,raycoll\/s2n,bpdavidson\/s2n,alexeblee\/s2n,colmmacc\/s2n,gibson-compsci\/s2n,PKRoma\/s2n,PKRoma\/s2n,bpdavidson\/s2n,wcs1only\/s2n,raycoll\/s2n,gibson-compsci\/s2n,PKRoma\/s2n,colmmacc\/s2n,alexeblee\/s2n,wcs1only\/s2n,gibson-compsci\/s2n,bpdavidson\/s2n,colmmacc\/s2n,wcs1only\/s2n,wcs1only\/s2n,colmmacc\/s2n,gibson-compsci\/s2n,awslabs\/s2n,awslabs\/s2n,raycoll\/s2n,bpdavidson\/s2n,gibson-compsci\/s2n,jldodds\/s2n,awslabs\/s2n,PKRoma\/s2n,wcs1only\/s2n,jldodds\/s2n,alexeblee\/s2n,raycoll\/s2n,raycoll\/s2n,PKRoma\/s2n,wcs1only\/s2n,gibson-compsci\/s2n,bpdavidson\/s2n,raycoll\/s2n,PKRoma\/s2n,jldodds\/s2n,wcs1only\/s2n,alexeblee\/s2n","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/s2n_hash.c\n+++ crypto\/s2n_hash.c\n@@ -137,7 +137,7 @@\n break;\n case S2N_HASH_SHA384:\n eq_check(size, SHA384_DIGEST_LENGTH);\n- r = SHA512_Final(out, &state->hash_ctx.sha384);\n+ r = SHA384_Final(out, &state->hash_ctx.sha384);\n break;\n case S2N_HASH_SHA512:\n eq_check(size, SHA512_DIGEST_LENGTH);\n"} {"commit":"7d4b26aa978156a9e2d19d74f9a54db51ec2d303","subject":"remove a loop from hmac_init","message":"remove a loop from hmac_init\n","repos":"alexeblee\/s2n,bpdavidson\/s2n,wcs1only\/s2n,raycoll\/s2n,PKRoma\/s2n,colmmacc\/s2n,gibson-compsci\/s2n,bpdavidson\/s2n,wcs1only\/s2n,alexeblee\/s2n,PKRoma\/s2n,gibson-compsci\/s2n,awslabs\/s2n,bpdavidson\/s2n,colmmacc\/s2n,bpdavidson\/s2n,PKRoma\/s2n,PKRoma\/s2n,PKRoma\/s2n,alexeblee\/s2n,raycoll\/s2n,colmmacc\/s2n,alexeblee\/s2n,raycoll\/s2n,gibson-compsci\/s2n,wcs1only\/s2n,colmmacc\/s2n,bpdavidson\/s2n,wcs1only\/s2n,gibson-compsci\/s2n,alexeblee\/s2n,awslabs\/s2n,PKRoma\/s2n,wcs1only\/s2n,alexeblee\/s2n,awslabs\/s2n,gibson-compsci\/s2n,raycoll\/s2n,wcs1only\/s2n,awslabs\/s2n,PKRoma\/s2n,colmmacc\/s2n,colmmacc\/s2n,wcs1only\/s2n,awslabs\/s2n,raycoll\/s2n,bpdavidson\/s2n,wcs1only\/s2n,PKRoma\/s2n,awslabs\/s2n,raycoll\/s2n,gibson-compsci\/s2n","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/s2n_hmac.c\n+++ crypto\/s2n_hmac.c\n@@ -100,21 +100,18 @@\n \n static int s2n_tls_hmac_init(struct s2n_hmac_state *state, s2n_hmac_algorithm alg, const void *key, uint32_t klen)\n {\n- uint32_t copied = klen;\n+ memset(&state->xor_pad, 0, sizeof(state->xor_pad));\n+ \n if (klen > state->xor_pad_size) {\n GUARD(s2n_hash_update(&state->outer, key, klen));\n GUARD(s2n_hash_digest(&state->outer, state->digest_pad, state->digest_size));\n memcpy_check(state->xor_pad, state->digest_pad, state->digest_size);\n- copied = state->digest_size;\n } else {\n memcpy_check(state->xor_pad, key, klen);\n }\n \n- for (int i = 0; i < copied; i++) {\n+ for (int i = 0; i < state->xor_pad_size; i++) {\n state->xor_pad[i] ^= 0x36;\n- }\n- for (int i = copied; i < state->xor_pad_size; i++) {\n- state->xor_pad[i] = 0x36;\n }\n \n GUARD(s2n_hash_update(&state->inner_just_key, state->xor_pad, state->xor_pad_size));\n@@ -206,7 +203,7 @@\n GUARD(s2n_tls_hmac_init(state, alg, key, klen));\n }\n \n- \/* Once we have updated the outer_just_key, don't need the key material in xor_pad, so wipe it.\n+ \/* Once we have produced inner_just_key and outer_just_key, don't need the key material in xor_pad, so wipe it.\n * Since xor_pad is used as a source of bytes in s2n_hmac_digest_two_compression_rounds,\n * this also prevents uninitilized bytes being used.\n *\/\n"} {"commit":"843b5a250ae9cadb4936b9e6e8ab48ac3dcc4c8d","subject":"Update symhacks.","message":"Update symhacks.\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/symhacks.h\n+++ crypto\/symhacks.h\n@@ -399,6 +399,12 @@\n #undef dtls1_retransmit_buffered_messages\n #define dtls1_retransmit_buffered_messages\tdtls1_retransmit_buffered_msgs\n \n+\/* Hack some long UI names *\/\n+#undef UI_method_get_prompt_constructor\n+#define UI_method_get_prompt_constructor\tUI_method_get_prompt_constructr\n+#undef UI_method_set_prompt_constructor\n+#define UI_method_set_prompt_constructor\tUI_method_set_prompt_constructr\n+\n #endif \/* defined OPENSSL_SYS_VMS *\/\n \n \n"} {"commit":"bcbee11cf13bed5c8c44e1c72d102174a23b2bc5","subject":"Fix uninitialized member use","message":"Fix uninitialized member use\n\nupdate_root is checking m->root with uninitialized memory.","repos":"nfnty\/bspwm,medisun\/bspwm,baskerville\/bspwm,JBouron\/bspwm,baskerville\/bspwm,nfnty\/bspwm,nfnty\/bspwm,Stebalien\/bspwm,JBouron\/bspwm,Stebalien\/bspwm,medisun\/bspwm,JBouron\/bspwm,medisun\/bspwm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- monitor.c\n+++ monitor.c\n@@ -40,6 +40,7 @@\n {\n \tmonitor_t *m = malloc(sizeof(monitor_t));\n \tsnprintf(m->name, sizeof(m->name), \"%s%02d\", DEFAULT_MON_NAME, ++monitor_uid);\n+\tm->root = XCB_NONE;\n \tm->prev = m->next = NULL;\n \tm->desk = m->desk_head = m->desk_tail = NULL;\n \tm->top_padding = m->right_padding = m->bottom_padding = m->left_padding = 0;\n@@ -48,7 +49,6 @@\n \tif (rect != NULL) {\n \t\tupdate_root(m, rect);\n \t} else {\n-\t\tm->root = XCB_NONE;\n \t\tm->rectangle = (xcb_rectangle_t) {0, 0, screen_width, screen_height};\n \t}\n \treturn m;\n"} {"commit":"e975dbe086731c9822564a0e7856e9df95e6db6e","subject":"tidy BGL target","message":"tidy BGL target\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n \n-# $Id: makefile.h,v 1.549 2007-09-03 03:27:43 d3p307 Exp $\n+# $Id: makefile.h,v 1.550 2007-09-04 16:34:49 d3p307 Exp $\n #\n \n # Common definitions for all makefiles ... these can be overridden\n@@ -1996,7 +1996,7 @@\n INSTALL = @echo $@ is built\n \n DEFINES = -DBGL -DEXTNAME\n- FOPTIONS = -q32 -qEXTNAME -qfixed -qxlf77=leadzero\n+ FOPTIONS = -qEXTNAME -qfixed -qxlf77=leadzero\n FOPTIMIZE = -O3 -qstrict -qarch=440 -qtune=440\n FOPTIMIZE += -NQ40000 -NT80000 -NS2048 -qmaxmem=8192 -qipa=level=2\n COPTIMIZE = -g -O2\n"} {"commit":"7594b82204b5d4d184530975013cf70b4e7c4da1","subject":"changes in IBM port for new compiler","message":"changes in IBM port for new compiler\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,4 +1,4 @@\n-# $Id: makefile.h,v 1.105 1995-03-31 01:33:33 d3g681 Exp $\n+# $Id: makefile.h,v 1.106 1995-04-11 03:03:04 og845 Exp $\n \n # Common definitions for all makefiles ... these can be overridden\n # either in each makefile by putting additional definitions below the\n@@ -422,7 +422,7 @@\n \n FOPTIONS = -qEXTNAME\n COPTIONS =\n- FOPTIMIZE = -O3\n+ FOPTIMIZE = -O3 -NQ40000 -NT80000 -qstrict\n COPTIMIZE = -O\n \n DEFINES = -DIBM -DEXTNAM \n"} {"commit":"ab6e68d0efc0527d11f5a765b3007b4eed12fe96","subject":"ifort options for fp accuracy. might fix the numerical problems we have recently experienced","message":"ifort options for fp accuracy. might fix the numerical problems we have recently experienced\n\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1965,6 +1965,10 @@\n FOPTIONS += -fpe0 -traceback #-fp-model precise\n endif\n ifeq ($(_IFCV11),Y) \n+# \t FOPTIMIZE += -xP\n+#next 2 lines needed for fp accuracy\n+\tFOPTIONS += -fp-model source\n+\tFOPTIONS += -fimf-arch-consistency=true\n FOPTIMIZE += -xHost -no-prec-div\n else\n ifeq ($(_GOTSSE3),Y) \n"} {"commit":"5f45574237a09bbdf7f8a242e6a1359872bfd363","subject":"Encoding fixed size integers.","message":"Encoding fixed size integers.\n","repos":"rvncerr\/msgpuck","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- msgpuck.h\n+++ msgpuck.h\n@@ -503,6 +503,14 @@\n *\/\n MP_PROTO char *\n mp_encode_uint(char *data, uint64_t num);\n+MP_PROTO char *\n+mp_encode_uint8(char *data, uint64_t num);\n+MP_PROTO char *\n+mp_encode_uint16(char *data, uint64_t num);\n+MP_PROTO char *\n+mp_encode_uint32(char *data, uint64_t num);\n+MP_PROTO char *\n+mp_encode_uint64(char *data, uint64_t num);\n \n \/**\n * \\brief Encode a signed integer \\a num.\n@@ -516,6 +524,14 @@\n *\/\n MP_PROTO char *\n mp_encode_int(char *data, int64_t num);\n+MP_PROTO char *\n+mp_encode_int8(char *data, int64_t num);\n+MP_PROTO char *\n+mp_encode_int16(char *data, int64_t num);\n+MP_PROTO char *\n+mp_encode_int32(char *data, int64_t num);\n+MP_PROTO char *\n+mp_encode_int64(char *data, int64_t num);\n \n \/**\n * \\brief Check that \\a cur buffer has enough bytes to decode an uint\n@@ -1263,6 +1279,59 @@\n }\n \n MP_IMPL char *\n+mp_encode_uint8(char *data, uint64_t num)\n+{\n+\tif (num <= UINT8_MAX) {\n+\t\tdata = mp_store_u8(data, 0xcc);\n+\t\treturn mp_store_u8(data, num);\n+\t} else if (num <= UINT16_MAX) {\n+\t\tdata = mp_store_u8(data, 0xcd);\n+\t\treturn mp_store_u16(data, num);\n+\t} else if (num <= UINT32_MAX) {\n+\t\tdata = mp_store_u8(data, 0xce);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xcf);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+\n+MP_IMPL char *\n+mp_encode_uint16(char *data, uint64_t num)\n+{\n+\tif (num <= UINT16_MAX) {\n+\t\tdata = mp_store_u8(data, 0xcd);\n+\t\treturn mp_store_u16(data, num);\n+\t} else if (num <= UINT32_MAX) {\n+\t\tdata = mp_store_u8(data, 0xce);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xcf);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+MP_IMPL char *\n+mp_encode_uint32(char *data, uint64_t num)\n+{\n+\tif (num <= UINT32_MAX) {\n+\t\tdata = mp_store_u8(data, 0xce);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xcf);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+MP_IMPL char *\n+mp_encode_uint64(char *data, uint64_t num)\n+{\n+\tdata = mp_store_u8(data, 0xcf);\n+\treturn mp_store_u64(data, num);\n+}\n+\n+MP_IMPL char *\n mp_encode_int(char *data, int64_t num)\n {\n \tassert(num < 0);\n@@ -1281,6 +1350,64 @@\n \t\tdata = mp_store_u8(data, 0xd3);\n \t\treturn mp_store_u64(data, num);\n \t}\n+}\n+\n+MP_IMPL char *\n+mp_encode_int8(char *data, int64_t num)\n+{\n+\tassert(num < 0);\n+\tif (num >= INT8_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd0);\n+\t\treturn mp_store_u8(data, num);\n+\t} else if (num >= INT16_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd1);\n+\t\treturn mp_store_u16(data, num);\n+\t} else if (num >= INT32_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd2);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xd3);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+\n+\n+MP_IMPL char *\n+mp_encode_int16(char *data, int64_t num)\n+{\n+\tassert(num < 0);\n+\tif (num >= INT16_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd1);\n+\t\treturn mp_store_u16(data, num);\n+\t} else if (num >= INT32_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd2);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xd3);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+MP_IMPL char *\n+mp_encode_int32(char *data, int64_t num)\n+{\n+\tassert(num < 0);\n+\tif (num >= INT32_MIN) {\n+\t\tdata = mp_store_u8(data, 0xd2);\n+\t\treturn mp_store_u32(data, num);\n+\t} else {\n+\t\tdata = mp_store_u8(data, 0xd3);\n+\t\treturn mp_store_u64(data, num);\n+\t}\n+}\n+\n+MP_IMPL char *\n+mp_encode_int64(char *data, int64_t num)\n+{\n+\tassert(num < 0);\n+\tdata = mp_store_u8(data, 0xd3);\n+\treturn mp_store_u64(data, num);\n }\n \n MP_IMPL uint64_t\n"} {"commit":"5bf7a75a93de729e588dff4ff7c00b512f9f7ccb","subject":"RJH: made NWCHEM env. variables consistent and added defn of CNFDIR","message":"RJH: made NWCHEM env. variables consistent and added defn of CNFDIR\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n \n-# $Id: makefile.h,v 1.10 1994-04-08 20:36:34 d3g681 Exp $\n+# $Id: makefile.h,v 1.11 1994-04-22 02:08:25 d3g681 Exp $\n \n # Common definitions for all makefiles ... these can be overridden\n # either in each makefile by putting additional definitions below the\n@@ -10,22 +10,23 @@\n # TOPDIR points to your top-level directory that contains\n # src, lib, config, ... (SRCDIR, etc., are derived from TOPDIR)\n #\n-# Either do a setenv for NWCHEMTOP or define NWCHEMTOP here\n+# Either do a setenv for NWCHEM_TOP or define NWCHEM_TOP here\n # ... it is preferable to do the setenv then this file is indep of\n # who is using it.\n #\n-# NWCHEMTOP = \/msrc\/home\/d3g681\n-\n-ifndef NWCHEMTOP\n+# NWCHEM_TOP = \/msrc\/home\/d3g681\n+\n+ifndef NWCHEM_TOP\n # This variable must be defined ... the next line will cause an error\n-You must define NWCHEMTOP in your environment\n-endif\n-\n- TOPDIR = $(NWCHEMTOP)\n+You must define NWCHEM_TOP in your environment\n+endif\n+\n+ TOPDIR = $(NWCHEM_TOP)\n SRCDIR = $(TOPDIR)\/src\n LIBDIR = $(TOPDIR)\/lib\n BINDIR = $(TOPDIR)\/bin\n INCDIR = $(TOPDIR)\/src\/include\n+ CNFDIR = $(TOPDIR)\/src\/config\n \n #\n # Define TARGET to be the machine you wish to build for\n@@ -87,7 +88,7 @@\n RANLIB = ranlib\n SHELL = \/bin\/sh\n MAKE = make\n- MAKEFLAGS = -j 4\n+ MAKEFLAGS = -j 1\n INSTALL = echo $@ is built\n \n FOPT = -g -u -Nl99\n@@ -192,7 +193,7 @@\n \t\/bin\/rm -f $*.f\n \n .F.f:\t\n-\t$(CPP) $(INCLUDES) $(DEFINES) < $*.F | sed '\/^#\/D' > $*.f\n+\t$(CPP) $(INCLUDES) $(DEFINES) < $*.F | sed '\/^#\/D' | sed '\/^[a-zA-Z].*:$\/D' > $*.f\n \n .c.o:\n \t$(CC) $(CFLAGS) -c $*.c\n"} {"commit":"da8a88fa7f1aa617b0c00d30c92ec68b3d112b29","subject":"BLAS_NOTHREADS for essl","message":"BLAS_NOTHREADS for essl\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"ef002964b976720f89c402ebc6dcf2cf1cccc854","subject":"HvD: Adding USE_DEBUG environment variable to include debug compilation flags.","message":"HvD: Adding USE_DEBUG environment variable to include debug compilation flags.\n\n\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"9d704069804fc1bc0ae4da84aa3f9eb09307fe82","subject":"modified link options for Linux so that dynamic loading of python modules works OK","message":"modified link options for Linux so that dynamic loading of python modules works OK\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n #\n-# $Id: makefile.h,v 1.334 2000-08-01 21:02:01 d3g681 Exp $\n+# $Id: makefile.h,v 1.335 2000-08-11 05:01:27 d3g681 Exp $\n #\n \n # Common definitions for all makefiles ... these can be overridden\n@@ -289,6 +289,9 @@\n ifeq ($(TARGET),SOLARIS)\n SHELL := $(NICE) \/bin\/sh\n \tCPP = \/usr\/ccs\/lib\/cpp\n+ RANLIB = echo\n+ MAKEFLAGS = -j 4 --no-print-directory\n+ INSTALL = echo $@ is built\n #\n # You can use either the f77 or f90 compiler BUT if using f90\n # you'll need to specify -DINTEGER_1='integer*1' in the selci\n@@ -311,11 +314,8 @@\n \n COPTIONS = \n COPTIMIZE = -g -O\n- RANLIB = echo\n- MAKEFLAGS = -j 4 --no-print-directory\n- INSTALL = echo $@ is built\n- FOPTIONS = -stackvar -fast\n- FOPTIMIZE = -O5 -fsimple=2 -depend -xvector=yes\n+ FOPTIONS = -stackvar -dalign \n+ FOPTIMIZE = -fast -O5 -fsimple=2 -depend -xvector=yes\n FDEBUG = -g -O1 -nodepend\n \n ifeq ($(NWCHEM_TARGET_CPU), ULTRA)\n@@ -1358,7 +1358,7 @@\n LINK.f = pgf77 $(LDFLAGS)\n EXTRA_LIBS += -lm\n else\n- LDOPTIONS = -g\n+ LDOPTIONS = -g -Xlinker -export-dynamic\n LINK.f = g77 $(LDFLAGS)\n EXTRA_LIBS += -lm\n ifndef EGCS\n"} {"commit":"622931af7960e04aba4ac33bfb62b97bbdf23484","subject":"Define OLD_GA when target is SP","message":"Define OLD_GA when target is SP\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n #\n-# $Id: makefile.h,v 1.292 1999-07-12 18:11:23 d3e129 Exp $\n+# $Id: makefile.h,v 1.293 1999-07-14 16:42:43 d3j191 Exp $\n #\n \n # Common definitions for all makefiles ... these can be overridden\n@@ -893,6 +893,7 @@\n \n ifeq ($(TARGET),SP)\n #\n+ OLD_GA = y \n CORE_SUBDIRS_EXTRA = lapack blas\n FC = mpxlf -qnohpf\n # -F\/u\/d3g681\/xlhpf.cfg:rjhxlf\n"} {"commit":"7fd34611b3a346d1658ae9c8a2dc6d1e39c72d4e","subject":"void copying buffer in condition checking","message":"void copying buffer in condition checking\n\n\ngit-svn-id: e98c317c6679dcf055eb388f05b44c3a6d6b38c6@417 152afb58-edef-0310-8abb-c4023f1b3aa9\n","repos":"Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,ctdk\/lighttpd-1.5-ct,Fumon\/lighttpd-Basic-auth-hack,pinkflozd\/lighttpd,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,Fumon\/lighttpd-Basic-auth-hack,Fumon\/lighttpd-Basic-auth-hack","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/configfile-glue.c\n+++ src\/configfile-glue.c\n@@ -198,23 +198,27 @@\n \t\t\t * append server-port to the HTTP_POST if necessary\n \t\t\t *\/\n \t\t\t\n-\t\t\tbuffer_copy_string_buffer(srv->cond_check_buf, con->uri.authority);\n+\t\t\tl = con->uri.authority;\n \t\t\t\n \t\t\tswitch(dc->cond) {\n \t\t\tcase CONFIG_COND_NE:\n \t\t\tcase CONFIG_COND_EQ:\n \t\t\t\tck_colon = strchr(dc->string->ptr, ':');\n-\t\t\t\tval_colon = strchr(con->uri.authority->ptr, ':');\n+\t\t\t\tval_colon = strchr(l->ptr, ':');\n \t\t\t\t\n \t\t\t\tif (ck_colon && !val_colon) {\n \t\t\t\t\t\/* colon found *\/\n+\t\t\t\t\tbuffer_copy_string_buffer(srv->cond_check_buf, l);\n \t\t\t\t\tBUFFER_APPEND_STRING_CONST(srv->cond_check_buf, \":\");\n \t\t\t\t\tbuffer_append_long(srv->cond_check_buf, sock_addr_get_port(&(srv_sock->addr)));\n+\t\t\t\t\tl = srv->cond_check_buf;\n \t\t\t\t}\n \t\t\t\tbreak;\n \t\t\tdefault:\n \t\t\t\tbreak;\n \t\t\t}\n+\t\t} else {\n+\t\t\tl = NULL;\n \t\t}\n \t\tbreak;\n \t}\n@@ -278,49 +282,43 @@\n \t\t\t\treturn (dc->cond == CONFIG_COND_EQ) ? COND_RESULT_FALSE : COND_RESULT_TRUE;\n \t\t\t}\n \t\t} else {\n-\t\t\tconst char *s;\n-#ifdef HAVE_IPV6\n-\t\t\tchar b2[INET6_ADDRSTRLEN + 1];\n-\t\t\t\n-\t\t\ts = inet_ntop(con->dst_addr.plain.sa_family, \n-\t\t\t\t con->dst_addr.plain.sa_family == AF_INET6 ? \n-\t\t\t\t (const void *) &(con->dst_addr.ipv6.sin6_addr) :\n-\t\t\t\t (const void *) &(con->dst_addr.ipv4.sin_addr),\n-\t\t\t\t b2, sizeof(b2)-1);\n-#else\n-\t\t\ts = inet_ntoa(con->dst_addr.ipv4.sin_addr);\n-#endif\n-\t\t\tbuffer_copy_string(srv->cond_check_buf, s);\n+\t\t\tl = con->dst_addr_buf;\n \t\t}\n \t\tbreak;\n \t}\n \tcase COMP_HTTP_URL:\n-\t\tbuffer_copy_string_buffer(srv->cond_check_buf, con->uri.path);\n+\t\tl = con->uri.path;\n \t\tbreak;\n \n \tcase COMP_SERVER_SOCKET:\n-\t\tbuffer_copy_string_buffer(srv->cond_check_buf, srv_sock->srv_token);\n+\t\tl = srv_sock->srv_token;\n \t\tbreak;\n \n \tcase COMP_HTTP_REFERER: {\n \t\tdata_string *ds;\n \t\t\n \t\tif (NULL != (ds = (data_string *)array_get_element(con->request.headers, \"Referer\"))) {\n-\t\t\tbuffer_copy_string_buffer(srv->cond_check_buf, ds->value);\n+\t\t\tl = ds->value;\n+\t\t} else {\n+\t\t\tl = NULL;\n \t\t}\n \t\tbreak;\n \t}\n \tcase COMP_HTTP_COOKIE: {\n \t\tdata_string *ds;\n \t\tif (NULL != (ds = (data_string *)array_get_element(con->request.headers, \"Cookie\"))) {\n-\t\t\tbuffer_copy_string_buffer(srv->cond_check_buf, ds->value);\n+\t\t\tl = ds->value;\n+\t\t} else {\n+\t\t\tl = NULL;\n \t\t}\n \t\tbreak;\n \t}\n \tcase COMP_HTTP_USERAGENT: {\n \t\tdata_string *ds;\n \t\tif (NULL != (ds = (data_string *)array_get_element(con->request.headers, \"User-Agent\"))) {\n-\t\t\tbuffer_copy_string_buffer(srv->cond_check_buf, ds->value);\n+\t\t\tl = ds->value;\n+\t\t} else {\n+\t\t\tl = NULL;\n \t\t}\n \t\tbreak;\n \t}\n@@ -329,10 +327,17 @@\n \t\treturn COND_RESULT_FALSE;\n \t}\n \t\n-\tl = srv->cond_check_buf;\n+\tif (NULL == l) {\n+\t\tif (con->conf.log_condition_handling) {\n+\t\t\tlog_error_write(srv, __FILE__, __LINE__, \"bsbs\", dc->comp_key,\n+\t\t\t\t\t\"(\", l, \") compare to NULL\");\n+\t\t}\n+\t\treturn COND_RESULT_FALSE;\n+\t}\n \t\n \tif (con->conf.log_condition_handling) {\n-\t\tlog_error_write(srv, __FILE__, __LINE__, \"bsbsb\", dc->comp_key, \"(\", l, \") compare to \", dc->string);\n+\t\tlog_error_write(srv, __FILE__, __LINE__, \"bsbsb\", dc->comp_key,\n+\t\t\t\t\"(\", l, \") compare to \", dc->string);\n \t}\n \tswitch(dc->cond) {\n \tcase CONFIG_COND_NE:\n@@ -388,8 +393,7 @@\n \t\tif (con->conf.log_condition_handling) {\n \t\t\tlog_error_write(srv, __FILE__, __LINE__, \"dsd\", dc->context_ndx, \"(uncached) result:\", cache[dc->context_ndx]);\n \t\t}\n-\t}\n-\telse {\n+\t} else {\n \t\tif (con->conf.log_condition_handling) {\n \t\t\tlog_error_write(srv, __FILE__, __LINE__, \"dsd\", dc->context_ndx, \"(cached) result:\", cache[dc->context_ndx]);\n \t\t}\n"} {"commit":"e43c34508166ed951f936389314a163b7c2cae75","subject":"client-side IPv6 support in progress -- not complete yet","message":"client-side IPv6 support in progress -- not complete yet\n","repos":"ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- myproxy.c\n+++ myproxy.c\n@@ -182,33 +182,6 @@\n }\n }\n return(retval);\n-}\n-\n-\/**\n- * Returns a socket file descriptor for a newly created socket and\n- * attempts to bind that socket to a specific port if the appropriate\n- * environment variable is set. This function first attemts to create\n- * a new socket. It then calls check_port_range() to see if we should\n- * bind the socket to a port in a given range. If everything is okay,\n- * the new socket file descriptor is returned. Otherwise -1 is returned.\n- *\n- * @return A newly created socket file descriptor, or -1 if error.\n- *\/\n-static int get_socket(void) {\n-\n- int retsock = -1; \/* Assume error *\/\n- \n- retsock = socket(AF_INET, SOCK_STREAM, 0);\n- if (retsock == -1) {\n- verror_put_errno(errno);\n- verror_put_string(\"get_socket() failed\");\n- } else {\n- if (!check_port_range(retsock)) {\n- close(retsock);\n- retsock = -1;\n- }\n- }\n- return(retsock);\n }\n \n \/**\n@@ -293,53 +266,64 @@\n }\n \n \/**\n- * Attempt to connect a socket file descriptor to a specific host\/port.\n- * This function takes a previously created socket and attempts to connect\n- * it (with a timeout) to a given host:port. If the host is given as a\n+ * Attempt to connect a socket to a specific host\/port.\n+ * This function attempts to connect a socket\n+ * (with a timeout) to a given host:port. If the host is given as a\n * FQDN which resolves to multiple IPs, we loop through the IPs until we \n * have successfully connected or we cannot find a valid IP to connect to. \n *\n- * @param sockfd A socket file descriptor to connect with.\n * @param host The FQDN of a host to attempt to connect to.\n * @param port The port to connect to.\n- * @return 1 upon successful connection, 0 otherwise\n+ * @return socket descriptor upon successful connection, -1 otherwise\n *\/\n-static int connect_socket_to_host(int sockfd, char *host, int port) {\n-\n- int retval = 0; \/* Assume failure; 1 is success *\/\n- struct hostent *host_info;\n- struct sockaddr_in sin;\n- int i;\n- \n- host_info = gethostbyname(host);\n- if (host_info == NULL) {\n+static int connect_socket_to_host(char *host, int port) {\n+\n+ struct addrinfo hints, *res, *ressave;\n+ char service[6];\n+ int sockfd = -1;\n+ int n;\n+ \n+ memset(&hints, 0, sizeof(struct addrinfo));\n+ hints.ai_family = AF_UNSPEC;\n+ hints.ai_socktype = SOCK_STREAM;\n+\n+ snprintf(service, 6, \"%d\", port);\n+\n+ n = getaddrinfo(host, service, &hints, &res);\n+ if (n < 0) {\n verror_put_string(\"Unknown host \\\"%s\\\"\\n\", host);\n- } else {\n- memset(&sin, 0, sizeof(sin));\n- sin.sin_family = AF_INET;\n- sin.sin_port = htons(port);\n-\n- for (i = 0; host_info->h_addr_list[i]; i++) {\n- verror_clear();\n- memcpy(&(sin.sin_addr), host_info->h_addr_list[i],\n- sizeof(sin.sin_addr));\n-\n- myproxy_debug(\"Attempting to connect to %s:%d\\n\", \n- inet_ntoa(*(struct in_addr *)host_info->h_addr_list[i]), port);\n-\n+ return(-1);\n+ }\n+\n+ ressave = res;\n+\n+ while (res) {\n+ sockfd = socket(res->ai_family,\n+ res->ai_socktype,\n+ res->ai_protocol);\n+\n+ if (!(sockfd < 0)) {\n+ char straddr[INET6_ADDRSTRLEN];\n+\n+ \/* TODO: call check_port_range() *\/\n+\n+ inet_ntop(res->ai_family, res->ai_addr, straddr, sizeof(straddr));\n+ myproxy_debug(\"Attempting to connect to %s:%d\\n\", straddr, port);\n if (connect_with_timeout(sockfd, \n- (struct sockaddr *) &sin, sizeof(sin)) < 0) {\n+ res->ai_addr, res->ai_addrlen) < 0) {\n verror_put_errno(errno);\n- verror_put_string(\"Unable to connect to %s:%d\\n\", \n- inet_ntoa(*(struct in_addr *)host_info->h_addr_list[i]),\n- port);\n+ verror_put_string(\"Unable to connect to %s:%d\\n\", straddr,port);\n } else { \/* Success! *\/\n- retval = 1;\n- break; \/* out of for loop *\/\n+ break; \/* out of while loop *\/\n }\n- } \/* End for loop thru host_info->h_addr_list[] *\/\n- }\n- return(retval);\n+ close(sockfd);\n+ sockfd=-1;\n+ }\n+ res=res->ai_next;\n+ }\n+\n+ freeaddrinfo(ressave);\n+ return(sockfd);\n }\n \n \/**\n@@ -386,22 +370,11 @@\n else\n spec_port = port;\n \n- \/* Init the socket and (possibly) bind to a port if this is the *\/\n- \/* first time looping thru MyProxy hostnames or if a previous *\/\n- \/* connect_with_timeout() failed requiring a new socket. *\/\n- if (retsock < 0) {\n- retsock = get_socket();\n- if (retsock < 0) {\n- break; \/* Can't even get a socket? Give up and fail *\/\n- } \n- } \n-\n- if (connect_socket_to_host(retsock,tok,spec_port)) { \/* Success! *\/\n+ retsock = connect_socket_to_host(tok,spec_port);\n+ if (retsock >= 0) { \/* Success! *\/\n connected = 1;\n break; \/* out of while loop *\/\n } else { \/* Failed. Get new socket and try next host *\/\n- close(retsock);\n- retsock = -1;\n verror_put_string(\"Unable to connect to %s\\n\", tok);\n }\n \n"} {"commit":"40e6e29e8170933e4ce7edee7af535099cdbf1e9","subject":"Fixed Type not building correctly.","message":"Fixed Type not building correctly.\n","repos":"gan74\/Yave,gan74\/Yave,gan74\/Yave","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- n\/Types.h\n+++ n\/Types.h\n@@ -267,7 +267,7 @@\n \t\t}\n \n \t\ttemplate<typename T>\n-\t\tType(T) : Type(typeid(T)) {\n+\t\tType(const T &t) : Type(typeid(t)) {\n \t\t}\n \n \n@@ -279,8 +279,12 @@\n \t\t\treturn !operator ==(t);\n \t\t}\n \n+\t\tbool operator>(const Type &t) const {\n+\t\t\treturn info->before(*t.info);\n+\t\t}\n+\n \t\tbool operator<(const Type &t) const {\n-\t\t\treturn info->before(*t.info);\n+\t\t\treturn t.info->before(*info);\n \t\t}\n \n \t\tcore::String name() const;\n"} {"commit":"23fc99b05fb8599eecf523f88bafcf7a8687fa4c","subject":"add fade routine!","message":"add fade routine!\n","repos":"ogrodnek\/am-nametag","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nametag.c\n+++ nametag.c\n@@ -12,7 +12,7 @@\n void allOn(void);\n \n \n-#define MAX_PROGRAMS 3\n+#define MAX_PROGRAMS 4\n uint8_t EEMEM ProgramConfig = 0;\n int program = 0;\n \n@@ -54,12 +54,17 @@\n blink();\n break;\n case 2:\n+ fade();\n+ break;\n+ case 3:\n+ flash();\n+ break;\n default:\n allOn();\n }\n }\n \n-int blinkState = 0;\n+uint8_t blinkState = 0;\n unsigned long lastBlink = 0;\n unsigned long clock = 0;\n \n@@ -77,14 +82,21 @@\n clock++;\n }\n \n+uint8_t flashState = 0;\n+\n void flash() {\n- if (clock - lastBlink > 20000) {\n- blinkState = 1 - blinkState;\n+ if (clock - lastBlink > 30000) {\n+ flashState = 1 - flashState;\n lastBlink = clock;\n }\n \n- if (blinkState) {\n- allOn();\n+ if (flashState) {\n+ blinkState++;\n+ if (blinkState > 4) {\n+ blinkState = 0;\n+ }\n+\n+ PORTB=states[blinkState];\n } else {\n PORTB = 0;\n }\n@@ -97,19 +109,13 @@\n uint8_t dir = 1;\n \n void fade() {\n- if (clock - lastBlink > 900000) {\n- blinkState = 1 - blinkState;\n+ if (clock - lastBlink > 1800) {\n lastBlink = clock;\n- }\n-\n- if (blinkState) {\n- if (level == 255) {\n- dir = -1;\n- } else if (level == 0) {\n- dir = 1;\n- }\n \n level += dir;\n+ if (level == 0 || level >= 200) {\n+ dir = -1 * dir;\n+ }\n }\n \n pwm();\n@@ -117,10 +123,20 @@\n clock++;\n }\n \n+unsigned long lastPwm = 0;\n+\n void pwm() {\n- pwmCount++;\n- if (level > pwmCount) {\n- allOn();\n+ static uint8_t pwmCnt = 0;\n+ static uint8_t which = 0;\n+\n+ pwmCnt++;\n+\n+ if (level > pwmCnt) {\n+ PORTB = states[which];\n+ which++;\n+ if (which > 4) {\n+ which = 0;\n+ }\n } else {\n PORTB = 0;\n }\n"} {"commit":"ba691bdfd7cab025016f8c7a5fa7889bba4b71e4","subject":"Use device's block size, but min. 4096 and max. 16384 bytes.","message":"Use device's block size, but min. 4096 and max. 16384 bytes.\n","repos":"sklnet\/DirectFB,kevleyski\/DirectFB-1,Distrotech\/DirectFB,deniskropp\/DirectFB,kevleyski\/directfb,deniskropp\/DirectFB,jcdubois\/DirectFB,kevleyski\/directfb,DirectFB\/directfb,djbclark\/directfb-core-DirectFB,sklnet\/DirectFB,djbclark\/directfb-core-DirectFB,dfbdok\/DirectFB1,jcdubois\/DirectFB,lancebaiyouview\/DirectFB,Distrotech\/DirectFB,sklnet\/DirectFB,mtsekm\/test,DirectFB\/directfb,sklnet\/DirectFB,lancebaiyouview\/DirectFB,DirectFB\/directfb,kevleyski\/directfb,jcdubois\/DirectFB,Distrotech\/DirectFB,kevleyski\/DirectFB-1,djbclark\/directfb-core-DirectFB,mtsekm\/test,kaostao\/directfb,kevleyski\/DirectFB-1,dfbdok\/DirectFB1,djbclark\/directfb-core-DirectFB,dfbdok\/DirectFB1,kevleyski\/DirectFB-1,kaostao\/directfb,lancebaiyouview\/DirectFB,kaostao\/directfb,deniskropp\/DirectFB,lancebaiyouview\/DirectFB,deniskropp\/DirectFB,mtsekm\/test,kevleyski\/directfb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/core\/core_sound.c\n+++ src\/core\/core_sound.c\n@@ -475,8 +475,14 @@\n return DFB_UNSUPPORTED;\n }\n \n-\/\/ if (shared->config.block_size > 4096)\n+ DEBUGMSG( \"FusionSound\/Core: got block size %d\\n\", shared->config.block_size );\n+\n+ if (shared->config.block_size < 4096)\n shared->config.block_size = 4096;\n+ else if (shared->config.block_size > 16384)\n+ shared->config.block_size = 16384;\n+\n+ DEBUGMSG( \"FusionSound\/Core: using block size %d\\n\", shared->config.block_size );\n \n \/* calculate number of samples fitting into one block *\/\n shared->config.samples_per_block = shared->config.block_size \/ bytes;\n"} {"commit":"b10b0ee130d6a58ce26aadca2db473d512a1393e","subject":"nginx-0.0.1-2004-01-15-20:51:49 import","message":"nginx-0.0.1-2004-01-15-20:51:49 import\n","repos":"firebase\/nginx,firebase\/nginx,hy0kl\/nginx,hy0kl\/nginx,firebase\/nginx,firebase\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/core\/ngx_rbtree.c\n+++ src\/core\/ngx_rbtree.c\n@@ -147,8 +147,15 @@\n }\n \n if (subst == *root) {\n- \/* it's the last node *\/\n- *root = sentinel;\n+ *root = temp;\n+ ngx_rbt_black(temp);\n+\n+ \/* DEBUG stuff *\/\n+ node->left = NULL;\n+ node->right = NULL;\n+ node->parent = NULL;\n+ node->key = 0;\n+\n return;\n }\n \n@@ -197,6 +204,12 @@\n if (subst->right != sentinel) {\n subst->right->parent = subst;\n }\n+\n+ \/* DEBUG stuff *\/\n+ node->left = NULL;\n+ node->right = NULL;\n+ node->parent = NULL;\n+ node->key = 0;\n }\n \n if (is_red) {\n"} {"commit":"30e228e35e64b97459e92940ca1e66c790523227","subject":"store_json: Split sdb_store_json_emit into private functions.","message":"store_json: Split sdb_store_json_emit into private functions.\n\nThe public function will only handle memstore specific logic.\n","repos":"tokkee\/sysdb,tokkee\/sysdb,sysdb\/sysdb,sysdb\/sysdb,sysdb\/sysdb,tokkee\/sysdb","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/core\/store_json.c\n+++ src\/core\/store_json.c\n@@ -120,6 +120,63 @@\n \tdest[i + 1] = '\\0';\n } \/* escape_string *\/\n \n+\/* handle_new_object takes care of all maintenance logic related to adding a\n+ * new object. That is, it manages context information and emit the prefix and\n+ * suffix of an object. *\/\n+static int\n+handle_new_object(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)\n+{\n+\t\/* first top-level object *\/\n+\tif (! f->context[0]) {\n+\t\tif ((obj->type != f->type) && (obj->type != SDB_HOST)) {\n+\t\t\tsdb_log(SDB_LOG_ERR, \"store: Unexpected object of type %s \"\n+\t\t\t\t\t\"as the first element during %s JSON serialization\",\n+\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type),\n+\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(f->type));\n+\t\t\treturn -1;\n+\t\t}\n+\t\tif (f->flags & SDB_WANT_ARRAY)\n+\t\t\tsdb_strbuf_append(f->buf, \"[\");\n+\t\tassert(f->current == 0);\n+\t\tf->context[f->current] = obj->type;\n+\t\treturn 0;\n+\t}\n+\n+\tif ((f->current >= 1) && (obj->type != SDB_ATTRIBUTE)) {\n+\t\t\/* new entry of a previous type or a new type on the same level;\n+\t\t * rewind to the right state *\/\n+\t\twhile ((f->current > 0)\n+\t\t\t\t&& (f->context[f->current] == obj->type)) {\n+\t\t\tsdb_strbuf_append(f->buf, \"}]\");\n+\t\t\t--f->current;\n+\t\t}\n+\t}\n+\n+\tif (obj->type == f->context[f->current]) {\n+\t\t\/* new entry of the same type *\/\n+\t\tsdb_strbuf_append(f->buf, \"},\");\n+\t}\n+\telse if ((f->context[f->current] == SDB_HOST)\n+\t\t\t|| (obj->type == SDB_ATTRIBUTE)) {\n+\t\tassert(obj->type != SDB_HOST);\n+\t\t\/* all object types may be children of a host;\n+\t\t * attributes may be children of any type *\/\n+\t\tsdb_strbuf_append(f->buf, \", \\\"%ss\\\": [\",\n+\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type));\n+\t\t++f->current;\n+\t}\n+\telse {\n+\t\tsdb_log(SDB_LOG_ERR, \"store: Unexpected object of type %s \"\n+\t\t\t\t\"on level %zu during JSON serialization\",\n+\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type), f->current);\n+\t\treturn -1;\n+\t}\n+\n+\tassert(f->current < SDB_STATIC_ARRAY_LEN(f->context));\n+\tf->context[f->current] = obj->type;\n+\treturn 0;\n+} \/* handle_new_object *\/\n+\n static int\n json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)\n {\n@@ -129,6 +186,8 @@\n \tsize_t i;\n \n \tassert(f && obj);\n+\n+\thandle_new_object(f, obj);\n \n \tescape_string(SDB_OBJ(obj)->name, name);\n \tsdb_strbuf_append(f->buf, \"{\\\"name\\\": %s, \", name);\n@@ -194,57 +253,7 @@\n {\n \tif ((! f) || (! obj))\n \t\treturn -1;\n-\n-\t\/* first top-level object *\/\n-\tif (! f->context[0]) {\n-\t\tif ((obj->type != f->type) && (obj->type != SDB_HOST)) {\n-\t\t\tsdb_log(SDB_LOG_ERR, \"store: Unexpected object of type %s \"\n-\t\t\t\t\t\"as the first element during %s JSON serialization\",\n-\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type),\n-\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(f->type));\n-\t\t\treturn -1;\n-\t\t}\n-\t\tif (f->flags & SDB_WANT_ARRAY)\n-\t\t\tsdb_strbuf_append(f->buf, \"[\");\n-\t\tassert(f->current == 0);\n-\t}\n-\telse {\n-\t\tif ((f->current >= 1) && (obj->type != SDB_ATTRIBUTE)) {\n-\t\t\t\/* new entry of a previous type or a new type on the same level;\n-\t\t\t * rewind to the right state *\/\n-\t\t\twhile (f->current > 0) {\n-\t\t\t\tif (f->context[f->current] == obj->type)\n-\t\t\t\t\tbreak;\n-\t\t\t\tsdb_strbuf_append(f->buf, \"}]\");\n-\t\t\t\t--f->current;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (obj->type == f->context[f->current]) {\n-\t\t\t\/* new entry of the same type *\/\n-\t\t\tsdb_strbuf_append(f->buf, \"},\");\n-\t\t}\n-\t\telse if ((f->context[f->current] == SDB_HOST)\n-\t\t\t\t|| (obj->type == SDB_ATTRIBUTE)) {\n-\t\t\tassert(obj->type != SDB_HOST);\n-\t\t\t\/* all object types may be children of a host;\n-\t\t\t * attributes may be children of any type *\/\n-\t\t\tsdb_strbuf_append(f->buf, \", \\\"%ss\\\": [\",\n-\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type));\n-\t\t\t++f->current;\n-\t\t}\n-\t\telse {\n-\t\t\tsdb_log(SDB_LOG_ERR, \"store: Unexpected object of type %s \"\n-\t\t\t\t\t\"on level %zu during JSON serialization\",\n-\t\t\t\t\tSDB_STORE_TYPE_TO_NAME(obj->type), f->current);\n-\t\t\treturn -1;\n-\t\t}\n-\t}\n-\n-\tjson_emit(f, obj);\n-\tassert(f->current < SDB_STATIC_ARRAY_LEN(f->context));\n-\tf->context[f->current] = obj->type;\n-\treturn 0;\n+\treturn json_emit(f, obj);\n } \/* sdb_store_json_emit *\/\n \n int\n"} {"commit":"cb8cf000830ccf63ea7b5b2bd8c57b0355c4c5aa","subject":"Add missing check for response type and public ip address","message":"Add missing check for response type and public ip address\n\nThis patch adds missing check for response type that response message\npayload really contains public ip address structure and also adds checks\nthat public ip address is valid. Gateway could set public ip address to\nzeros on error and client in this case should ignore it. As some broken\ngateways announce private\/reserved ip addresses in public address field,\ncheck that ip address in received packet is really public to avoid problems\nwith broken gateways.\n","repos":"miniupnp\/libnatpmp,miniupnp\/libnatpmp,miniupnp\/libnatpmp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- natpmpc.c\n+++ natpmpc.c\n@@ -46,6 +46,45 @@\n #endif\n #include \"natpmp.h\"\n \n+\/* List of IP address blocks which are private \/ reserved and therefore not suitable for public external IP addresses *\/\n+#define IP(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))\n+#define MSK(m) (32-(m))\n+static const struct { uint32_t address; uint32_t rmask; } reserved[] = {\n+\t{ IP( 0, 0, 0, 0), MSK( 8) }, \/* RFC1122 \"This host on this network\" *\/\n+\t{ IP( 10, 0, 0, 0), MSK( 8) }, \/* RFC1918 Private-Use *\/\n+\t{ IP(100, 64, 0, 0), MSK(10) }, \/* RFC6598 Shared Address Space *\/\n+\t{ IP(127, 0, 0, 0), MSK( 8) }, \/* RFC1122 Loopback *\/\n+\t{ IP(169, 254, 0, 0), MSK(16) }, \/* RFC3927 Link-Local *\/\n+\t{ IP(172, 16, 0, 0), MSK(12) }, \/* RFC1918 Private-Use *\/\n+\t{ IP(192, 0, 0, 0), MSK(24) }, \/* RFC6890 IETF Protocol Assignments *\/\n+\t{ IP(192, 0, 2, 0), MSK(24) }, \/* RFC5737 Documentation (TEST-NET-1) *\/\n+\t{ IP(192, 31, 196, 0), MSK(24) }, \/* RFC7535 AS112-v4 *\/\n+\t{ IP(192, 52, 193, 0), MSK(24) }, \/* RFC7450 AMT *\/\n+\t{ IP(192, 88, 99, 0), MSK(24) }, \/* RFC7526 6to4 Relay Anycast *\/\n+\t{ IP(192, 168, 0, 0), MSK(16) }, \/* RFC1918 Private-Use *\/\n+\t{ IP(192, 175, 48, 0), MSK(24) }, \/* RFC7534 Direct Delegation AS112 Service *\/\n+\t{ IP(198, 18, 0, 0), MSK(15) }, \/* RFC2544 Benchmarking *\/\n+\t{ IP(198, 51, 100, 0), MSK(24) }, \/* RFC5737 Documentation (TEST-NET-2) *\/\n+\t{ IP(203, 0, 113, 0), MSK(24) }, \/* RFC5737 Documentation (TEST-NET-3) *\/\n+\t{ IP(224, 0, 0, 0), MSK( 4) }, \/* RFC1112 Multicast *\/\n+\t{ IP(240, 0, 0, 0), MSK( 4) }, \/* RFC1112 Reserved for Future Use + RFC919 Limited Broadcast *\/\n+};\n+#undef IP\n+#undef MSK\n+\n+static int addr_is_reserved(struct in_addr * addr)\n+{\n+\tuint32_t address = ntohl(addr->s_addr);\n+\tsize_t i;\n+\n+\tfor (i = 0; i < sizeof(reserved)\/sizeof(reserved[0]); ++i) {\n+\t\tif ((address >> reserved[i].rmask) == (reserved[i].address >> reserved[i].rmask))\n+\t\t\treturn 1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n void usage(FILE * out, const char * argv0)\n {\n \tfprintf(out, \"Usage :\\n\");\n@@ -192,7 +231,16 @@\n \tif(r<0)\n \t\treturn 1;\n \n-\t\/* TODO : check that response.type == 0 *\/\n+\tif(response.type!=NATPMP_RESPTYPE_PUBLICADDRESS) {\n+\t\tfprintf(stderr, \"readnatpmpresponseorretry() failed : invalid response type %u\\n\", response.type);\n+\t\treturn 1;\n+\t}\n+\n+\tif(addr_is_reserved(&response.pnu.publicaddress.addr)) {\n+\t\tfprintf(stderr, \"readnatpmpresponseorretry() failed : invalid Public IP address %s\\n\", inet_ntoa(response.pnu.publicaddress.addr));\n+\t\treturn 1;\n+\t}\n+\n \tprintf(\"Public IP address : %s\\n\", inet_ntoa(response.pnu.publicaddress.addr));\n \tprintf(\"epoch = %u\\n\", response.epoch);\n \n"} {"commit":"b57e53055337154541f063f534fc9ecc74fea8c9","subject":"Some more small changes to typedarray.c.","message":"Some more small changes to typedarray.c.\n\nWe want to compile janet with MSVC warning free.\n","repos":"bakpakin\/gst,bakpakin\/gst","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/core\/typedarray.c\n+++ src\/core\/typedarray.c\n@@ -291,8 +291,9 @@\n }\n \n static int is_ta_type(Janet x, JanetTArrayType type) {\n- return (janet_checktype(x, JANET_ABSTRACT) && (type < TA_COUNT_TYPES) &&\n- (janet_abstract_type(janet_unwrap_abstract(x)) == &ta_array_types[type])) ? 1 : 0;\n+ return janet_checktype(x, JANET_ABSTRACT) && \n+ (type < TA_COUNT_TYPES) &&\n+ (janet_abstract_type(janet_unwrap_abstract(x)) == &ta_array_types[type]);\n }\n \n #define CASE_TYPE_INITIALIZE(type) case JANET_TARRAY_TYPE_##type : ta_init_##type(view,buffer,size,offset,stride); break\n@@ -407,7 +408,7 @@\n return janet_wrap_struct(janet_struct_end(props));\n } else {\n JanetTArrayBuffer *buffer = janet_gettarray_buffer(argv, 0);\n- JanetKV *props = janet_struct_begin(3);\n+ JanetKV *props = janet_struct_begin(2);\n janet_struct_put(props, janet_ckeywordv(\"size\"), janet_wrap_number(buffer->size));\n janet_struct_put(props, janet_ckeywordv(\"big-endian\"), janet_wrap_boolean(buffer->flags & TA_FLAG_BIG_ENDIAN));\n return janet_wrap_struct(janet_struct_end(props));\n"} {"commit":"c2a94de6539cfbff7bbb08664dc716f80353765a","subject":"ncd: ncd.c: merge the state and have_error members into a single member","message":"ncd: ncd.c: merge the state and have_error members into a single member\n","repos":"Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn,Ernillew\/badvpn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ncd\/ncd.c\n+++ ncd\/ncd.c\n@@ -68,10 +68,16 @@\n #define SSTATE_DYING 3\n #define SSTATE_FORGOTTEN 4\n \n-#define PSTATE_WORKING 1\n-#define PSTATE_UP 2\n-#define PSTATE_WAITING 3\n-#define PSTATE_TERMINATING 4\n+#define PSTATE_WORKING 0\n+#define PSTATE_UP 1\n+#define PSTATE_WAITING 2\n+#define PSTATE_TERMINATING 3\n+\n+#define PROCESS_STATE_MASK 0x3\n+#define PROCESS_ERROR_MASK 0x4\n+\n+#define PROCESS_STATE_SHIFT 0\n+#define PROCESS_ERROR_SHIFT 2\n \n struct statement {\n struct process *p;\n@@ -89,11 +95,10 @@\n BSmallTimer wait_timer;\n BSmallPending work_job;\n LinkedList1Node list_node; \/\/ node in processes\n- int state;\n int ap;\n int fp;\n- int have_error;\n int num_statements;\n+ int state2_error1;\n struct statement statements[];\n };\n \n@@ -158,6 +163,10 @@\n static void start_terminate (int exit_code);\n static int process_new (NCDInterpProcess *iprocess, NCDModuleProcess *module_process);\n static void process_free (struct process *p, NCDModuleProcess **out_mp);\n+static int process_state (struct process *p);\n+static void process_set_state (struct process *p, int state);\n+static int process_error (struct process *p);\n+static void process_set_error (struct process *p, int error);\n static void process_start_terminating (struct process *p);\n static int process_have_child (struct process *p);\n static void process_assert_pointers (struct process *p);\n@@ -648,7 +657,7 @@\n if (p->module_process) {\n continue;\n }\n- if (p->state != PSTATE_TERMINATING) {\n+ if (process_state(p) != PSTATE_TERMINATING) {\n process_start_terminating(p);\n }\n }\n@@ -698,11 +707,10 @@\n \/\/ set variables\n p->iprocess = iprocess;\n p->module_process = module_process;\n- p->state = PSTATE_WORKING;\n p->ap = 0;\n p->fp = 0;\n- p->have_error = 0;\n p->num_statements = num_statements;\n+ p->state2_error1 = PSTATE_WORKING << PROCESS_STATE_SHIFT;\n \n \/\/ set module process handlers\n if (p->module_process) {\n@@ -770,12 +778,32 @@\n BFree(p);\n }\n \n+static int process_state (struct process *p)\n+{\n+ return (p->state2_error1 & PROCESS_STATE_MASK) >> PROCESS_STATE_SHIFT;\n+}\n+\n+static void process_set_state (struct process *p, int state)\n+{\n+ p->state2_error1 = (p->state2_error1 & ~PROCESS_STATE_MASK) | (state << PROCESS_STATE_SHIFT);\n+}\n+\n+static int process_error (struct process *p)\n+{\n+ return (p->state2_error1 & PROCESS_ERROR_MASK) >> PROCESS_ERROR_SHIFT;\n+}\n+\n+static void process_set_error (struct process *p, int error)\n+{\n+ p->state2_error1 = (p->state2_error1 & ~PROCESS_ERROR_MASK) | (error << PROCESS_ERROR_SHIFT);\n+}\n+\n void process_start_terminating (struct process *p)\n {\n- ASSERT(p->state != PSTATE_TERMINATING)\n+ ASSERT(process_state(p) != PSTATE_TERMINATING)\n \n \/\/ set terminating\n- p->state = PSTATE_TERMINATING;\n+ process_set_state(p, PSTATE_TERMINATING);\n \n \/\/ schedule work\n process_schedule_work(p);\n@@ -840,11 +868,13 @@\n process_assert_pointers(p);\n ASSERT(!BSmallTimer_IsRunning(&p->wait_timer))\n \n- if (p->state == PSTATE_WAITING) {\n+ int pstate = process_state(p);\n+ \n+ if (pstate == PSTATE_WAITING) {\n return;\n }\n \n- if (p->state == PSTATE_TERMINATING) {\n+ if (pstate == PSTATE_TERMINATING) {\n if (p->fp == 0) {\n \/\/ free process\n NCDModuleProcess *mp;\n@@ -888,11 +918,11 @@\n }\n \n \/\/ process was up but is no longer?\n- if (p->state == PSTATE_UP && !(!process_have_child(p) && p->ap == p->num_statements)) {\n+ if (pstate == PSTATE_UP && !(!process_have_child(p) && p->ap == p->num_statements)) {\n \/\/ if we have module process, wait for its permission to continue\n if (p->module_process) {\n \/\/ set state waiting\n- p->state = PSTATE_WAITING;\n+ process_set_state(p, PSTATE_WAITING);\n \n \/\/ set module process down\n NCDModuleProcess_Interp_Down(p->module_process);\n@@ -900,7 +930,8 @@\n }\n \n \/\/ set state working\n- p->state = PSTATE_WORKING;\n+ process_set_state(p, PSTATE_WORKING);\n+ pstate = PSTATE_WORKING;\n }\n \n \/\/ cleaning up?\n@@ -937,15 +968,15 @@\n \n \/\/ advancing?\n if (p->ap < p->num_statements) {\n- ASSERT(p->state == PSTATE_WORKING)\n+ ASSERT(process_state(p) == PSTATE_WORKING)\n struct statement *ps = &p->statements[p->ap];\n ASSERT(ps->state == SSTATE_FORGOTTEN)\n \n- if (p->have_error) {\n+ if (process_error(p)) {\n statement_log(ps, BLOG_INFO, \"waiting after error\");\n \n \/\/ clear error\n- p->have_error = 0;\n+ process_set_error(p, 0);\n \n \/\/ set wait timer\n BReactor_SetSmallTimer(&reactor, &p->wait_timer, BTIMER_SET_RELATIVE, options.retry_time);\n@@ -957,11 +988,11 @@\n }\n \n \/\/ have we just finished?\n- if (p->state == PSTATE_WORKING) {\n+ if (pstate == PSTATE_WORKING) {\n process_log(p, BLOG_INFO, \"victory\");\n \n \/\/ set state up\n- p->state = PSTATE_UP;\n+ process_set_state(p, PSTATE_UP);\n \n \/\/ set module process up\n if (p->module_process) {\n@@ -991,10 +1022,10 @@\n ASSERT(p->ap == p->fp)\n ASSERT(!process_have_child(p))\n ASSERT(p->ap < p->num_statements)\n- ASSERT(!p->have_error)\n+ ASSERT(!process_error(p))\n ASSERT(!BSmallPending_IsSet(&p->work_job))\n ASSERT(!BSmallTimer_IsRunning(&p->wait_timer))\n- ASSERT(p->state == PSTATE_WORKING)\n+ ASSERT(process_state(p) == PSTATE_WORKING)\n \n struct statement *ps = &p->statements[p->ap];\n ASSERT(ps->state == SSTATE_FORGOTTEN)\n@@ -1086,7 +1117,7 @@\n NCDValMem_Free(&ps->args_mem);\n fail0:\n \/\/ set error\n- p->have_error = 1;\n+ process_set_error(p, 1);\n \n \/\/ schedule work to start the timer\n process_schedule_work(p);\n@@ -1099,9 +1130,9 @@\n ASSERT(p->ap == p->fp)\n ASSERT(!process_have_child(p))\n ASSERT(p->ap < p->num_statements)\n- ASSERT(!p->have_error)\n+ ASSERT(!process_error(p))\n ASSERT(!BSmallPending_IsSet(&p->work_job))\n- ASSERT(p->state == PSTATE_WORKING)\n+ ASSERT(process_state(p) == PSTATE_WORKING)\n \n process_log(p, BLOG_INFO, \"retrying\");\n \n@@ -1269,7 +1300,7 @@\n \n \/\/ clear error\n if (ps->i < p->ap) {\n- p->have_error = 0;\n+ process_set_error(p, 0);\n }\n \n \/\/ update AP\n@@ -1298,7 +1329,7 @@\n \n \/\/ set error\n if (is_error && ps->i < p->ap) {\n- p->have_error = 1;\n+ process_set_error(p, 1);\n }\n \n \/\/ update AP\n@@ -1404,17 +1435,17 @@\n \n switch (event) {\n case NCDMODULEPROCESS_INTERP_EVENT_CONTINUE: {\n- ASSERT(p->state == PSTATE_WAITING)\n+ ASSERT(process_state(p) == PSTATE_WAITING)\n \n \/\/ set state working\n- p->state = PSTATE_WORKING;\n+ process_set_state(p, PSTATE_WORKING);\n \n \/\/ schedule work\n process_schedule_work(p);\n } break;\n \n case NCDMODULEPROCESS_INTERP_EVENT_TERMINATE: {\n- ASSERT(p->state != PSTATE_TERMINATING)\n+ ASSERT(process_state(p) != PSTATE_TERMINATING)\n \n process_log(p, BLOG_INFO, \"process termination requested\");\n \n"} {"commit":"f45ee8f1de768325da501a27e43b905e97040bfe","subject":"cregistry: check for other errors","message":"cregistry: check for other errors\n","repos":"danchr\/macports-base,macports\/macports-base,danchr\/macports-base,macports\/macports-base","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cregistry\/entry.c\n+++ src\/cregistry\/entry.c\n@@ -300,7 +300,7 @@\n break;\n }\n } while (r == SQLITE_BUSY);\n- if (r == SQLITE_ERROR) {\n+ if (result == 0) {\n break;\n }\n }\n"} {"commit":"4cd4570f0bb095734b2eccd553a948db7f83ef9f","subject":"This is a just a trial","message":"This is a just a trial\n","repos":"mrrijo\/hello-world","returncode":1,"stderr":"error: pathspec 'newfile.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- newfile.c\n+++ newfile.c\n@@ -0,0 +1,6 @@\n+#include <stdio.h>\n+\n+int main ()\n+{\n+\tprintf(\"This is to test github working\\n\");\n+}\n"} {"commit":"6378fefc6de8c631f9d92b86564ce88ba4b04d9a","subject":"Fix missing newline in the overflow output.","message":"Fix missing newline in the overflow output.\n\nReported by Gary Mohr\n","repos":"pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/ctests\/overflow.c\n+++ src\/ctests\/overflow.c\n@@ -165,7 +165,7 @@\n \tmax =\n \t\t( long long ) ( ( ( double ) values[0][0] * ( 1.0 + OVR_TOLERANCE ) ) \/\n \t\t\t\t\t\t( double ) mythreshold );\n-\tprintf( \"Overflows: total(%d) > max(%lld) || total(%d) < min(%lld) \", total,\n+\tprintf( \"Overflows: total(%d) > max(%lld) || total(%d) < min(%lld) \\n\", total,\n \t\t\tmax, total, min );\n \tif ( total > max || total < min )\n \t\ttest_fail( __FILE__, __LINE__, \"Overflows\", 1 );\n"} {"commit":"562897045e38cb9e07c8f0baab856bb9469bed70","subject":"Squashed 'nk_pugl\/' changes from fa04a9a..ecc68d7","message":"Squashed 'nk_pugl\/' changes from fa04a9a..ecc68d7\n\necc68d7 fixes for updated nuklear.\n\ngit-subtree-dir: nk_pugl\ngit-subtree-split: ecc68d7c7e1c4fcb7409e5ecb55d2bc8459987d8\n","repos":"OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod,OpenMusicKontrollers\/synthpod","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- nk_pugl.h\n+++ nk_pugl.h\n@@ -827,7 +827,7 @@\n \t\t\t|| (obounds.w != wbounds.w) || (obounds.h != wbounds.h) )\n \t\t{\n \t\t\t\/\/ size has changed\n-\t\t\tnk_window_set_bounds(ctx, wbounds);\n+\t\t\tnk_window_set_bounds(ctx, \"__bg__\", wbounds);\n \t\t\tpuglPostRedisplay(view);\n \t\t}\n \n@@ -947,7 +947,7 @@\n \t\t\t\t\t_nk_pugl_zoom_out(win);\n \t\t\t}\n \t\t\telse\n-\t\t\t\tnk_input_scroll(ctx, ev->dy);\n+\t\t\t\tnk_input_scroll(ctx, nk_vec2(0.f, ev->dy));\n \n \t\t\tpuglPostRedisplay(win->view);\n \t\t\tbreak;\n"} {"commit":"564eb40548f7b9628b21262adc934f3960cb9283","subject":"update nl80211.h","message":"update nl80211.h\n","repos":"TeamEOS\/external_iw,chunyeow\/iw,SoluMachines\/external_iw,Distrotech\/iw,greearb\/iw-ct,TeamEOS\/external_iw,bw-oss\/iw,timduru\/platform-external-iw,CTU-IIG\/802.11p-iw,bw-oss\/iw,CTU-IIG\/802.11p-iw,SoluMachines\/external_iw,cozybit\/iw,chunyeow\/iw,cozybit\/iw,timduru\/platform-external-iw,greearb\/iw-ct,Distrotech\/iw","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- nl80211.h\n+++ nl80211.h\n@@ -538,6 +538,9 @@\n *\tOLBC handling in hostapd. Beacons are reported in %NL80211_CMD_FRAME\n *\tmessages. Note that per PHY only one application may register.\n *\n+ * @NL80211_CMD_SET_NOACK_MAP: sets a bitmap for the individual TIDs whether\n+ * No Acknowledgement Policy should be applied.\n+ *\n * @NL80211_CMD_MAX: highest used command number\n * @__NL80211_CMD_AFTER_LAST: internal use\n *\/\n@@ -674,6 +677,8 @@\n \tNL80211_CMD_REGISTER_BEACONS,\n \n \tNL80211_CMD_UNEXPECTED_4ADDR_FRAME,\n+\n+\tNL80211_CMD_SET_NOACK_MAP,\n \n \t\/* add new commands above here *\/\n \n@@ -1185,6 +1190,9 @@\n * abides to when initiating radiation on DFS channels. A country maps\n * to one DFS region.\n *\n+ * @NL80211_ATTR_NOACK_MAP: This u16 bitmap contains the No Ack Policy of\n+ * up to 16 TIDs.\n+ *\n * @NL80211_ATTR_MAX: highest attribute number currently defined\n * @__NL80211_ATTR_AFTER_LAST: internal use\n *\/\n@@ -1427,6 +1435,8 @@\n \n \tNL80211_ATTR_DISABLE_HT,\n \tNL80211_ATTR_HT_CAPABILITY_MASK,\n+\n+\tNL80211_ATTR_NOACK_MAP,\n \n \t\/* add attributes here, update the policy in nl80211.c *\/\n \n@@ -2084,6 +2094,10 @@\n * access to a broader network beyond the MBSS. This is done via Root\n * Announcement frames.\n *\n+ * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in\n+ * TUs) during which a mesh STA can send only one Action frame containing a\n+ * PERR element.\n+ *\n * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute\n *\n * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use\n@@ -2107,6 +2121,7 @@\n \tNL80211_MESHCONF_ELEMENT_TTL,\n \tNL80211_MESHCONF_HWMP_RANN_INTERVAL,\n \tNL80211_MESHCONF_GATE_ANNOUNCEMENTS,\n+\tNL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,\n \n \t\/* keep last *\/\n \t__NL80211_MESHCONF_ATTR_AFTER_LAST,\n"} {"commit":"23aeaced705ce41cce600c16067ab816886ed005","subject":"Created get_short_name() for use in window title","message":"Created get_short_name() for use in window title\n","repos":"mtimkovich\/noterad","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- noterad.c\n+++ noterad.c\n@@ -1,10 +1,25 @@\n #include <gtk\/gtk.h>\n #include <stdlib.h>\n-\n-gchar *FILENAME = NULL;\n+#include <string.h>\n+\n+gchar *FILENAME;\n+gchar *short_name;\n GtkWidget *window;\n GtkWidget *textbox;\n GtkTextBuffer *buffer;\n+\n+char *get_short_name(char *string)\n+{\n+ char *p;\n+ char *name;\n+\n+ name = a;\n+\n+ if ((p = strrchr(name, '\/')) != NULL) {\n+ name = p+1;\n+ }\n+ return name;\n+}\n \n void save_as_file(GtkWidget *widget, gpointer data)\n {\n@@ -25,6 +40,7 @@\n \n if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {\n FILENAME = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));\n+\n if ((fp = fopen(FILENAME, \"w\")) == NULL) {\n fprintf(stderr, \"Unable to open '%s'\\n\", FILENAME);\n return;\n@@ -42,6 +58,9 @@\n return;\n }\n printf(\"Saved file: %s\\n\", FILENAME);\n+ short_name = get_short_name(FILENAME);\n+\/\/ gtk_window_set_title(GTK_WINDOW(window), \n+\n gtk_text_buffer_set_modified(GTK_TEXT_BUFFER(buffer), FALSE);\n }\n gtk_widget_destroy(dialog);\n@@ -109,6 +128,7 @@\n {\n buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textbox));\n \n+ \/\/ Are you sure you want to quit?\n if (gtk_text_buffer_get_modified(GTK_TEXT_BUFFER(buffer))) {\n if (confirm_dialog() == 0) {\n return;\n@@ -138,6 +158,7 @@\n if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {\n buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textbox));\n \n+ \/\/ Are you sure you want to quit?\n if (gtk_text_buffer_get_modified(GTK_TEXT_BUFFER(buffer))) {\n if (confirm_dialog() == 0) {\n return;\n@@ -172,6 +193,7 @@\n {\n buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textbox));\n \n+ \/\/ Are you sure you want to quit?\n if (gtk_text_buffer_get_modified(GTK_TEXT_BUFFER(buffer))) {\n if (confirm_dialog() == 0) {\n return TRUE;\n@@ -194,9 +216,9 @@\n \/\/ Set up window\n window = gtk_window_new(GTK_WINDOW_TOPLEVEL);\n gtk_window_set_default_size(GTK_WINDOW(window), 750, 450);\n+ gtk_window_set_title(GTK_WINDOW(window), \"Untitled - Noterad\");\n gtk_container_set_border_width(GTK_CONTAINER(window), 10);\n g_signal_connect_swapped(G_OBJECT(window), \"delete_event\", G_CALLBACK(delete_event), NULL);\n-\/\/ g_signal_connect_swapped(G_OBJECT(window), \"delete_event\", G_CALLBACK(gtk_main_quit), NULL);\n \n \/\/ Create Boxes\n container = gtk_vbox_new(FALSE, 3);\n@@ -248,5 +270,3 @@\n return EXIT_SUCCESS;\n }\n \n-\n-\n"} {"commit":"cbb29a2958124b5593c26a8b0271455df9f45bff","subject":"some musings on events","message":"some musings on events\n","repos":"sirspudd\/tokoloshmediabeast,sirspudd\/tokoloshmediabeast","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tokoloshtail\/backend.h\n+++ tokoloshtail\/backend.h\n@@ -24,6 +24,19 @@\n enum Flags {\n None = 0x000,\n SupportsEqualizer = 0x001\n+ };\n+\n+ enum Event {\n+ NoEvent = 0,\n+ SongFinished,\n+ TrackChanged,\n+ SongPaused,\n+ PlayResumed,\n+ SongStopped,\n+ VolumeChanged,\n+ MuteChanged,\n+ EqualizerChanged,\n+ ProgressChanged \/\/ ### ????\n };\n public slots:\n inline bool init() { if (status() == Uninitalized) return initBackend(); return true; }\n@@ -54,6 +67,10 @@\n \/\/ compatible etc? Would anyone in their right mind need us to be\n \/\/ bc?\n signals:\n+ \/\/ need to emit this if e.g. the command line client changes the\n+ \/\/ volume on us. The other clients need to know to move their\n+ \/\/ slider etc\n+ void event(Event type, const QVariant &data);\n void statusChanged(Status status);\n void trackChanged(const QString &string);\n };\n"} {"commit":"ccf9d01027fbb4231581ebcf3d343f432324155d","subject":"fix broken unblock-pin action","message":"fix broken unblock-pin action\n\nthe unblock pin action misstakenly used pin reference 0x81 (unblock)\ninstead of 0x80 (pin)\n","repos":"Yubico\/yubico-piv-tool,akgood\/yubico-piv-tool,akgood\/yubico-piv-tool,Yubico\/yubico-piv-tool,Yubico\/yubico-piv-tool,hirden\/yubico-piv-tool,ato\/yubico-piv-tool,akgood\/yubico-piv-tool,akgood\/yubico-piv-tool,ato\/yubico-piv-tool,hirden\/yubico-piv-tool","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- tool\/yubico-piv-tool.c\n+++ tool\/yubico-piv-tool.c\n@@ -883,7 +883,7 @@\n * since they're very similar in what data they use. *\/\n static bool change_pin(ykpiv_state *state, enum enum_action action, const char *pin,\n const char *new_pin) {\n- unsigned char templ[] = {0, YKPIV_INS_CHANGE_REFERENCE, 0, 0x81};\n+ unsigned char templ[] = {0, YKPIV_INS_CHANGE_REFERENCE, 0, 0x80};\n unsigned char indata[0x10];\n unsigned char data[0xff];\n unsigned long recv_len = sizeof(data);\n@@ -899,8 +899,8 @@\n if(action == action_arg_unblockMINUS_pin) {\n templ[1] = YKPIV_INS_RESET_RETRY;\n }\n- else if(action == action_arg_changeMINUS_pin) {\n- templ[3] = 0x80;\n+ else if(action == action_arg_changeMINUS_puk) {\n+ templ[3] = 0x81;\n }\n memcpy(indata, pin, pin_len);\n if(pin_len < 8) {\n"} {"commit":"096b23a15fd838e8c84a12a114462ebef308e5a5","subject":"add return value for create function","message":"add return value for create function\n","repos":"JamisHoo\/OurSQL-DBMS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/db_indexmanager.h\n+++ src\/db_indexmanager.h\n@@ -341,6 +341,7 @@\n delete[] root._data;\n \n _fs.close();\n+ return 0;\n }\n \n \/\/ public interface of IndexManager operation\n"} {"commit":"38614b26c40292e50b349febafb9cec964335ee9","subject":"And don't crash at exit..","message":"And don't crash at exit..\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jkerihuel\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/deliver\/deliver.c\n+++ src\/deliver\/deliver.c\n@@ -460,8 +460,9 @@\n \n mail_storage_destroy(storage);\n mail_storage_deinit();\n+\tlib_signals_deinit();\n+\n \tio_loop_destroy(ioloop);\n-\tlib_signals_deinit();\n \tlib_deinit();\n \n return EX_OK;\n"} {"commit":"3df603be2c568ed4f1717dda217882a19ca37e22","subject":"Fix handling envelope senders containing spaces.","message":"Fix handling envelope senders containing spaces.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/deliver\/deliver.c\n+++ src\/deliver\/deliver.c\n@@ -20,6 +20,7 @@\n #include \"str-sanitize.h\"\n #include \"strescape.h\"\n #include \"var-expand.h\"\n+#include \"rfc822-parser.h\"\n #include \"message-address.h\"\n #include \"message-header-parser.h\"\n #include \"istream-header-filter.h\"\n@@ -451,10 +452,24 @@\n \treturn str_c(str);\n }\n \n+static const char *escape_local_part(const char *local_part)\n+{\n+\tconst char *p;\n+\n+\t\/* if there are non-atext chars, we need to return quoted-string *\/\n+\tfor (p = local_part; *p != '\\0'; p++) {\n+\t\tif (!IS_ATEXT(*p)) {\n+\t\t\treturn t_strdup_printf(\"\\\"%s\\\"\",\n+\t\t\t\t\t str_escape(local_part));\n+\t\t}\n+\t}\n+\treturn local_part;\n+}\n+\n static const char *address_sanitize(const char *address)\n {\n \tstruct message_address *addr;\n-\tconst char *ret;\n+\tconst char *ret, *mailbox;\n \tpool_t pool;\n \n \tpool = pool_alloconly_create(\"address sanitizer\", 256);\n@@ -464,10 +479,13 @@\n \tif (addr == NULL || addr->mailbox == NULL || addr->domain == NULL ||\n \t *addr->mailbox == '\\0')\n \t\tret = DEFAULT_ENVELOPE_SENDER;\n-\telse if (*addr->domain == '\\0')\n-\t\tret = t_strdup(addr->mailbox);\n-\telse\n-\t\tret = t_strdup_printf(\"%s@%s\", addr->mailbox, addr->domain);\n+\telse {\n+\t\tmailbox = escape_local_part(addr->mailbox);\n+\t\tif (*addr->domain == '\\0')\n+\t\t\tret = t_strdup(mailbox);\n+\t\telse\n+\t\t\tret = t_strdup_printf(\"%s@%s\", mailbox, addr->domain);\n+\t}\n \tpool_unref(&pool);\n \treturn ret;\n }\n"} {"commit":"7e23182b2f97d9161fabac2e7b0c2ab3ada72362","subject":"further debloat getsyspropertybyindex() [2]","message":"further debloat getsyspropertybyindex() [2]\n","repos":"rofl0r\/openbor,lantus\/openbor,rofl0r\/openbor,lantus\/openbor,lantus\/openbor,lantus\/openbor,rofl0r\/openbor,rofl0r\/openbor","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- openbor.c\n+++ openbor.c\n@@ -748,56 +748,41 @@\n \t\treturn 0;\n \n \tswitch (index) {\n-\t\t\t\n-\t\tcase _e_lasthita:\n+\t\t\n+\t\tcase _e_lasthita: case _e_lasthitx: case _e_lasthitz:\n+\t\tcase _e_xpos: case _e_ypos:\n \t\t\tScriptVariant_ChangeType(var, VT_DECIMAL);\n-\t\t\tvar->dblVal = (DOUBLE) (lasthita);\n+\t\t\tswitch(index) {\n+\t\t\t\tcase _e_xpos: case _e_ypos:\n+\t\t\t\t\tif(!level)\n+\t\t\t\t\t\treturn 0;\n+\t\t\t\t\tif(index == _e_xpos)\n+\t\t\t\t\t\tvar->dblVal = (DOUBLE) advancex;\n+\t\t\t\t\telse\n+\t\t\t\t\t\tvar->dblVal = (DOUBLE) advancey;\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase _e_lasthita: var->dblVal = (DOUBLE) (lasthita); break;\n+\t\t\t\tcase _e_lasthitx: var->dblVal = (DOUBLE) (lasthitx); break;\n+\t\t\t\tcase _e_lasthitz: var->dblVal = (DOUBLE) (lasthitz); break;\n+\t\t\t\tdefault:\n+\t\t\t\t\tassert(0);\n+\t\t\t}\n \t\t\tbreak;\n-\n-\t\tcase _e_lasthitx:\n-\t\t\tScriptVariant_ChangeType(var, VT_DECIMAL);\n-\t\t\tvar->dblVal = (DOUBLE) (lasthitx);\n-\t\t\tbreak;\n-\t\tcase _e_lasthitz:\n-\t\t\tScriptVariant_ChangeType(var, VT_DECIMAL);\n-\t\t\tvar->dblVal = (DOUBLE) (lasthitz);\n-\t\t\tbreak;\n-\t\tcase _e_xpos:\n-\t\t\tif(!level)\n-\t\t\t\treturn 0;\n-\t\t\tScriptVariant_ChangeType(var, VT_DECIMAL);\n-\t\t\tvar->dblVal = (DOUBLE) advancex;\n-\t\t\tbreak;\n-\t\tcase _e_ypos:\n-\t\t\tif(!level)\n-\t\t\t\treturn 0;\n-\t\t\tScriptVariant_ChangeType(var, VT_DECIMAL);\n-\t\t\tvar->dblVal = (DOUBLE) advancey;\n-\t\t\tbreak;\n-\n \t\tcase _e_branchname:\n \t\t\tScriptVariant_ChangeType(var, VT_STR);\n \t\t\tstrcpy(StrCache_Get(var->strVal), branch_name);\n \t\t\tbreak;\n-\n-\t\tcase _e_player:\n-\t\tcase _e_player1:\n+\t\tcase _e_player: case _e_player1: case _e_player2:\n+\t\tcase _e_player3: case _e_player4:\n \t\t\tScriptVariant_ChangeType(var, VT_PTR);\n-\t\t\tvar->ptrVal = (VOID *) player;\n+\t\t\tswitch(index) {\n+\t\t\t\tcase _e_player: case _e_player1: var->ptrVal = (VOID *) player; break;\n+\t\t\t\tcase _e_player2: var->ptrVal = (VOID *) (player + 1); break;\n+\t\t\t\tcase _e_player3: var->ptrVal = (VOID *) (player + 2); break;\n+\t\t\t\tcase _e_player4: var->ptrVal = (VOID *) (player + 3); break;\n+\t\t\t\tdefault: assert (0);\n+\t\t\t}\n \t\t\tbreak;\n-\t\tcase _e_player2:\n-\t\t\tScriptVariant_ChangeType(var, VT_PTR);\n-\t\t\tvar->ptrVal = (VOID *) (player + 1);\n-\t\t\tbreak;\n-\t\tcase _e_player3:\n-\t\t\tScriptVariant_ChangeType(var, VT_PTR);\n-\t\t\tvar->ptrVal = (VOID *) (player + 2);\n-\t\t\tbreak;\n-\t\tcase _e_player4:\n-\t\t\tScriptVariant_ChangeType(var, VT_PTR);\n-\t\t\tvar->ptrVal = (VOID *) (player + 3);\n-\t\t\tbreak;\n-\t\t\t\n \t\tcase _e_count_enemies: case _e_count_players: case _e_count_npcs: case _e_count_entities:\n \t\tcase _e_ent_max: case _e_in_level: case _e_elapsed_time: case _e_in_selectscreen: \n \t\tcase _e_lasthitc: case _e_lasthitt: case _e_hResolution: case _e_vResolution: \n@@ -862,6 +847,7 @@\n \t\t\t\tcase _e_levelheight: var->lVal = (LONG) (panel_height); break;\n \t\t\t\tdefault: assert(0); break;\n \t\t\t}\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\t\/\/ We use indices now, but players\/modders don't need to be exposed\n \t\t\t\/\/ to that implementation detail, so we write \"name\" and not \"index\".\n"} {"commit":"9091d159e02b1767f6ab4aefccc6e808f8027b36","subject":"Always use the VFS API for file operations","message":"Always use the VFS API for file operations\n","repos":"DeforaOS\/Browser,DeforaOS\/Browser","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/desktop\/desktop.c\n+++ src\/desktop\/desktop.c\n@@ -1062,7 +1062,7 @@\n \t\treturn -_desktop_perror(NULL, NULL, 1);\n \tsnprintf(desktop->path, desktop->path_cnt, \"%s\/%s\", desktop->home,\n \t\t\tpath);\n-\tif(stat(desktop->path, &st) == 0)\n+\tif(browser_vfs_stat(desktop->path, &st) == 0)\n \t{\n \t\tif(!S_ISDIR(st.st_mode))\n \t\t\treturn _desktop_error(NULL, desktop->path,\n@@ -3111,7 +3111,7 @@\n \tdesktop->refresh_source = 0;\n \tif(desktop->path == NULL)\n \t\treturn FALSE;\n-\tif(stat(desktop->path, &st) != 0)\n+\tif(browser_vfs_stat(desktop->path, &st) != 0)\n \t\treturn _desktop_perror(NULL, desktop->path, FALSE);\n \tif(st.st_mtime == desktop->refresh_mtime)\n \t\treturn TRUE;\n"} {"commit":"bbf4aa5af2b44069eded0704c6f7b3d926af75c6","subject":"-n wrap EVP_Sign and EVP_Verify","message":"-n \nwrap EVP_Sign and EVP_Verify\n","repos":"kunkku\/luaossl,kunkku\/luaossl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- openssl.c\n+++ openssl.c\n@@ -940,6 +940,52 @@\n } \/* pk_setPrivateKEY() *\/\n \n \n+static int pk_sign(lua_State *L) {\n+\tEVP_PKEY *key = checksimple(L, 1, PUBKEY_CLASS);\n+\tEVP_MD_CTX *md = luaL_checkudata(L, 2, DIGEST_CLASS);\n+\tluaL_Buffer B;\n+\tunsigned n;\n+\n+\tif (LUAL_BUFFERSIZE < EVP_PKEY_size(key))\n+\t\treturn luaL_error(L, \"pubkey:sign: LUAL_BUFFERSIZE(%zu) < EVP_PKEY_size(%zu)\", (size_t)LUAL_BUFFERSIZE, (size_t)EVP_PKEY_size(key));\n+\n+\tluaL_buffinit(L, &B);\n+\tn = LUAL_BUFFERSIZE;\n+\n+\tif (!EVP_SignFinal(md, (void *)luaL_prepbuffer(&B), &n, key))\n+\t\treturn throwssl(L, \"pubkey:sign\");\n+\n+\tluaL_addsize(&B, n);\n+\tluaL_pushresult(&B);\n+\n+\treturn 1;\n+} \/* pk_sign() *\/\n+\n+\n+static int pk_verify(lua_State *L) {\n+\tEVP_PKEY *key = checksimple(L, 1, PUBKEY_CLASS);\n+\tsize_t len;\n+\tconst void *sig = luaL_checklstring(L, 2, &len);\n+\tEVP_MD_CTX *md = luaL_checkudata(L, 3, DIGEST_CLASS);\n+\n+\tswitch (EVP_VerifyFinal(md, sig, len, key)) {\n+\tcase 0: \/* WRONG *\/\n+\t\tERR_clear_error();\n+\t\tlua_pushboolean(L, 0);\n+\n+\t\tbreak;\n+\tcase 1: \/* OK *\/\n+\t\tlua_pushboolean(L, 1);\n+\n+\t\tbreak;\n+\tdefault:\n+\t\treturn throwssl(L, \"pubkey:verify\");\n+\t}\n+\n+\treturn 1;\n+} \/* pk_verify() *\/\n+\n+\n static int pk_toPEM(lua_State *L) {\n \tEVP_PKEY *key = checksimple(L, 1, PUBKEY_CLASS);\n \tint top, i, ok;\n@@ -1074,6 +1120,8 @@\n \t{ \"type\", &pk_type },\n \t{ \"setPublicKey\", &pk_setPublicKey },\n \t{ \"setPrivateKey\", &pk_setPrivateKey },\n+\t{ \"sign\", &pk_sign },\n+\t{ \"verify\", &pk_verify },\n \t{ \"toPEM\", &pk_toPEM },\n \t{ NULL, NULL },\n };\n"} {"commit":"69cf0218d1f0d1d8f14687fec070126021502451","subject":"perf hists: Print number of samples, not the period sum","message":"perf hists: Print number of samples, not the period sum\n\nSo that we match the header where we state the number of events with the\n\"Samples\" column when using 'perf report -n\/--show-nr-samples':\n\n [root@emilia ~]# perf record -a sleep 1\n [ perf record: Woken up 1 times to write data ]\n [ perf record: Captured and wrote 0.111 MB perf.data (~4860 samples) ]\n [root@emilia ~]# perf report --stdio --show-nr-samples\n # Events: 11 cycles\n #\n # Overhead Samples Command Shared Object Symbol\n # ........ .......... ........... .................. ............................\n #\n 16.65% 1 sleep [kernel.kallsyms] [k] unmap_vmas\n 16.10% 1 perf libpthread-2.12.so [.] __pthread_cleanup_push_defer\n 15.79% 2 perf [kernel.kallsyms] [k] format_decode\n 12.88% 1 kworker\/1:2 [kernel.kallsyms] [k] cache_reap\n 10.69% 1 swapper [kernel.kallsyms] [k] _raw_spin_lock\n 7.55% 1 sleep [kernel.kallsyms] [k] prepare_exec_creds\n 6.00% 1 perf [jbd2] [k] start_this_handle\n 5.29% 1 perf [kernel.kallsyms] [k] seq_read\n 4.75% 1 perf [kernel.kallsyms] [k] get_pid_task\n 4.30% 1 perf [kernel.kallsyms] [k] _raw_spin_unlock_irqrestore\n\n #\n # (For a higher level overview, try: perf report --sort comm,dso)\n #\n [root@emilia ~]#\n\nReported-by: Stephane Eranian <f199ae9781930a5b94b284ca2f471140752002a7@google.com>\nReported-by: Cliff Wickman <ee7f92c2340d75c28a753294f7a9f57a3233aa67@sgi.com>\nAcked-by: Stephane Eranian <f199ae9781930a5b94b284ca2f471140752002a7@google.com>\nCc: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\nCc: Mike Galbraith <3cfa3897b7f55b5396b7a47c83b66325184bc9b4@gmx.de>\nCc: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nCc: Peter Zijlstra <3fddac958924aef220f202ca567388ddab3f14a8@infradead.org>\nCc: Stephane Eranian <f199ae9781930a5b94b284ca2f471140752002a7@google.com>\nCc: Tom Zanussi <ca42f6846873622f2a6dc51a5106ba83ffbdaf95@gmail.com>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nLKML-Reference: <new-submission>\nSigned-off-by: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@redhat.com>\n[ cherry-picked it from perf\/core, as it has been reported by others as well. ]\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/perf\/util\/hist.c\n+++ tools\/perf\/util\/hist.c\n@@ -585,6 +585,7 @@\n {\n \tstruct sort_entry *se;\n \tu64 period, total, period_sys, period_us, period_guest_sys, period_guest_us;\n+\tu64 nr_events;\n \tconst char *sep = symbol_conf.field_sep;\n \tint ret;\n \n@@ -593,6 +594,7 @@\n \n \tif (pair_hists) {\n \t\tperiod = self->pair ? self->pair->period : 0;\n+\t\tnr_events = self->pair ? self->pair->nr_events : 0;\n \t\ttotal = pair_hists->stats.total_period;\n \t\tperiod_sys = self->pair ? self->pair->period_sys : 0;\n \t\tperiod_us = self->pair ? self->pair->period_us : 0;\n@@ -600,6 +602,7 @@\n \t\tperiod_guest_us = self->pair ? self->pair->period_guest_us : 0;\n \t} else {\n \t\tperiod = self->period;\n+\t\tnr_events = self->nr_events;\n \t\ttotal = session_total;\n \t\tperiod_sys = self->period_sys;\n \t\tperiod_us = self->period_us;\n@@ -640,9 +643,9 @@\n \n \tif (symbol_conf.show_nr_samples) {\n \t\tif (sep)\n-\t\t\tret += snprintf(s + ret, size - ret, \"%c%\" PRIu64, *sep, period);\n-\t\telse\n-\t\t\tret += snprintf(s + ret, size - ret, \"%11\" PRIu64, period);\n+\t\t\tret += snprintf(s + ret, size - ret, \"%c%\" PRIu64, *sep, nr_events);\n+\t\telse\n+\t\t\tret += snprintf(s + ret, size - ret, \"%11\" PRIu64, nr_events);\n \t}\n \n \tif (pair_hists) {\n"} {"commit":"49f4744307f9718d8e100755110b3b7b40ec4237","subject":"perf tools: Fix report -F abort for data without branch info","message":"perf tools: Fix report -F abort for data without branch info\n\nThe branch field sorting code assumes hist_entry::branch_info is\nallocated, which is wrong and following perf session ends up with report\nsegfault.\n\n $ perf record ls\n $ perf report -F abort\n perf: Segmentation fault\n\nChecking that hist_entry::branch_info is valid and display \"N\/A\" string\nin snprint callback if it's not.\n\nSigned-off-by: Jiri Olsa <2c6594f608aa3d41e98d48846a6328831f7084ad@kernel.org>\nAcked-by: Namhyung Kim <5c915a589b3ddf58cebf14bec41bcc143b37ac3c@kernel.org>\nCc: Andi Kleen <0474aee45985f5ae829f53849df476200e876990@linux.intel.com>\nCc: Corey Ashford <d8c6f216c17042adc228efa9f1d34ca50bd37e4b@linux.vnet.ibm.com>\nCc: David Ahern <b80c1600f604d3b0d768f26f90a76757e76005dd@gmail.com>\nCc: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@kernel.org>\nCc: Namhyung Kim <5c915a589b3ddf58cebf14bec41bcc143b37ac3c@kernel.org>\nCc: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nCc: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nLink: http:\/\/lkml.kernel.org\/r\/1413468427-31049-2-git-send-email-2c6594f608aa3d41e98d48846a6328831f7084ad@kernel.org\nSigned-off-by: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@redhat.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/perf\/util\/sort.c\n+++ tools\/perf\/util\/sort.c\n@@ -989,6 +989,9 @@\n static int64_t\n sort__abort_cmp(struct hist_entry *left, struct hist_entry *right)\n {\n+\tif (!left->branch_info || !right->branch_info)\n+\t\treturn cmp_null(left->branch_info, right->branch_info);\n+\n \treturn left->branch_info->flags.abort !=\n \t\tright->branch_info->flags.abort;\n }\n@@ -996,10 +999,15 @@\n static int hist_entry__abort_snprintf(struct hist_entry *he, char *bf,\n \t\t\t\t size_t size, unsigned int width)\n {\n-\tstatic const char *out = \".\";\n-\n-\tif (he->branch_info->flags.abort)\n-\t\tout = \"A\";\n+\tstatic const char *out = \"N\/A\";\n+\n+\tif (he->branch_info) {\n+\t\tif (he->branch_info->flags.abort)\n+\t\t\tout = \"A\";\n+\t\telse\n+\t\t\tout = \".\";\n+\t}\n+\n \treturn repsep_snprintf(bf, size, \"%-*s\", width, out);\n }\n \n"} {"commit":"a1d37d5285bcda07f9c0b80a2634ca20ab545297","subject":"perf tools: Introduce xzalloc() for detecting out of memory conditions","message":"perf tools: Introduce xzalloc() for detecting out of memory conditions\n\nIntroducing xzalloc() which wrapping zalloc() for detecting out\nof memory conditions.\n\nSigned-off-by: Masami Hiramatsu <308c3db2ad395e67f502db11a9ceb1603d4442e0@redhat.com>\nCc: systemtap <922727025a0cf43e784fa68f5f4f4f544f8fca4e@sources.redhat.com>\nCc: DLE <1e1188b208cf1d83fd3b4d9428c370cd420ad15b@lists.sourceforge.net>\nCc: Frederic Weisbecker <e8a1bf9163cb25e93cfd6540f223b3872ea7ee55@gmail.com>\nCc: Arnaldo Carvalho de Melo <293abb6b76d7791c0732cc517d38c4b5c734b87f@redhat.com>\nCc: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nCc: Mike Galbraith <3cfa3897b7f55b5396b7a47c83b66325184bc9b4@gmx.de>\nCc: Peter Zijlstra <645ca7d3a8d3d4f60557176cd361ea8351edc32b@chello.nl>\nLKML-Reference: <62303006241810b51b7cb91d4c04f26c18e75c9f@localhost6.localdomain6>\n[ -v2: small cleanups in surrounding code ]\nSigned-off-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tools\/perf\/util\/util.h\n+++ tools\/perf\/util\/util.h\n@@ -295,6 +295,13 @@\n extern char *xstrndup(const char *str, size_t len);\n extern void *xrealloc(void *ptr, size_t size) __attribute__((weak));\n \n+static inline void *xzalloc(size_t size)\n+{\n+\tvoid *buf = xmalloc(size);\n+\n+\treturn memset(buf, 0, size);\n+}\n+\n static inline void *zalloc(size_t size)\n {\n \treturn calloc(1, size);\n@@ -309,6 +316,7 @@\n {\n \tsize_t len = strlen(filename);\n \tsize_t extlen = strlen(ext);\n+\n \treturn len > extlen && !memcmp(filename + len - extlen, ext, extlen);\n }\n \n@@ -322,6 +330,7 @@\n #undef isalnum\n #undef tolower\n #undef toupper\n+\n extern unsigned char sane_ctype[256];\n #define GIT_SPACE\t\t0x01\n #define GIT_DIGIT\t\t0x02\n"} {"commit":"f6949458b793edf4b68ee0384174bfa949b1cc2d","subject":"tools: make led a first class citizen of ratbag-command","message":"tools: make led a first class citizen of ratbag-command\n\nAllows to follow the usage message: we do not need to provide the\ncurrently active profile.\n\nSigned-off-by: Benjamin Tissoires <7a0e50e3f6a0939db82b6a8a423c08a163896f41@gmail.com>\n","repos":"libratbag\/libratbag,whot\/libratbag,whot\/libratbag,whot\/libratbag,libratbag\/libratbag,libratbag\/libratbag","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tools\/ratbag-command.c\n+++ tools\/ratbag-command.c\n@@ -273,7 +273,7 @@\n \tstruct ratbag_button *button = options->button;\n \tint rc;\n \n-\tif ((flags & (FLAG_NEED_DEVICE|FLAG_NEED_PROFILE|FLAG_NEED_RESOLUTION)) &&\n+\tif ((flags & (FLAG_NEED_DEVICE|FLAG_NEED_PROFILE|FLAG_NEED_RESOLUTION|FLAG_NEED_LED)) &&\n \t device == NULL) {\n \t\trc = ratbag_cmd_device_from_arg(ratbag, argc, argv,\n \t\t\t\t\t\t&device);\n@@ -282,7 +282,7 @@\n \t\toptions->device = device;\n \t}\n \n-\tif ((flags & (FLAG_NEED_PROFILE|FLAG_NEED_RESOLUTION)) &&\n+\tif ((flags & (FLAG_NEED_PROFILE|FLAG_NEED_RESOLUTION|FLAG_NEED_LED)) &&\n \t profile == NULL) {\n \t\tprofile = ratbag_cmd_get_active_profile(device);\n \t\tif (!profile)\n@@ -2019,6 +2019,7 @@\n \t\t&cmd_profile,\n \t\t&cmd_resolution_dpi,\n \t\t&cmd_resolution_rate,\n+\t\t&cmd_led,\n \t\tNULL,\n \t},\n };\n"} {"commit":"6a90a321f94b043e53596f6b52c1f45f40edfdff","subject":"simulator: add new floating point equality instructions to isCompare","message":"simulator: add new floating point equality instructions to isCompare\n\nso vector versions will work correctly\n","repos":"jbush001\/NyuziProcessor,jbush001\/NyuziProcessor,hoangt\/NyuziProcessor,hoangt\/NyuziProcessor,jbush001\/NyuziProcessor,hoangt\/NyuziProcessor,jbush001\/NyuziProcessor,FulcronZ\/NyuziProcessor,hoangt\/NyuziProcessor,FulcronZ\/NyuziProcessor,jbush001\/NyuziProcessor,jbush001\/NyuziProcessor,FulcronZ\/NyuziProcessor,FulcronZ\/NyuziProcessor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tools\/simulator\/core.c\n+++ tools\/simulator\/core.c\n@@ -620,7 +620,7 @@\n \n static int isCompareOp(int op)\n {\n-\treturn (op >= 16 && op <= 25) || (op >= 44 && op <= 47);\n+\treturn (op >= 16 && op <= 25) || (op >= 44 && op <= 49);\n }\n \n static struct Breakpoint *lookupBreakpoint(Core *core, unsigned int pc)\n"} {"commit":"88e0561397e31d30a15eef534be4d07d58e9179a","subject":"Fix build","message":"Fix build","repos":"gzoom13\/embox,embox\/embox,Kakadu\/embox,gzoom13\/embox,gzoom13\/embox,Kefir0192\/embox,Kefir0192\/embox,mike2390\/embox,Kakadu\/embox,embox\/embox,mike2390\/embox,abusalimov\/embox,embox\/embox,abusalimov\/embox,vrxfile\/embox-trik,mike2390\/embox,Kakadu\/embox,Kefir0192\/embox,gzoom13\/embox,Kefir0192\/embox,Kakadu\/embox,abusalimov\/embox,Kefir0192\/embox,vrxfile\/embox-trik,abusalimov\/embox,vrxfile\/embox-trik,mike2390\/embox,vrxfile\/embox-trik,Kakadu\/embox,Kefir0192\/embox,mike2390\/embox,mike2390\/embox,gzoom13\/embox,Kakadu\/embox,vrxfile\/embox-trik,abusalimov\/embox,vrxfile\/embox-trik,Kefir0192\/embox,Kakadu\/embox,embox\/embox,embox\/embox,vrxfile\/embox-trik,gzoom13\/embox,embox\/embox,gzoom13\/embox,abusalimov\/embox,mike2390\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/drivers\/tty\/tty.c\n+++ src\/drivers\/tty\/tty.c\n@@ -311,7 +311,7 @@\n \treturn buff - (end - size);\n }\n \n-size_t tty_write(struct tty *t, char *buff, size_t size) {\n+size_t tty_write(struct tty *t, const char *buff, size_t size) {\n \tsize_t count;\n \n \twork_disable(&t->rx_work);\n"} {"commit":"8706becc0dcaf9c1dcbd79a4d86d94e18844956b","subject":"Wait for pending flips before attempting screen resize","message":"Wait for pending flips before attempting screen resize\n\nOtherwise things get confused and we crash. I wonder if there is a better\nway to handle this.\n","repos":"Popolon\/xf86-video-armsoc,commshare\/xf86-video-armsoc,Popolon\/xf86-video-armsoc,commshare\/xf86-video-armsoc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/drmmode_display.c\n+++ src\/drmmode_display.c\n@@ -1665,8 +1665,15 @@\n {\n \tint i;\n \txf86CrtcConfigPtr xf86_config;\n+\tstruct ARMSOCRec *pARMSOC = ARMSOCPTR(pScrn);\n \n \tTRACE_ENTER();\n+\n+\t\/* FIXME: is there a correct way to handle a resolution change request\n+\t * if we're in the middle of a page flip? *\/\n+\twhile (pARMSOC->pending_flips > 0)\n+\t\tdrmmode_wait_for_event(pScrn);\n+\n \tif (!resize_scanout_bo(pScrn, width, height))\n \t\treturn FALSE;\n \n"} {"commit":"999cb5470f02ca0d2fa67424c5ab170e63fdea5c","subject":"Reload hardware cursor after mode setting if it is initialized.","message":"Reload hardware cursor after mode setting if it is initialized.\n\nIf the X server tries to load the cursor image while a crtc is disabled\n(eg during DPMS Off), it will silently fail. Later, if the pointer is\nmoved, the cursor will be displayed as some uninitialized memory pattern.\n\nThe recommended way to deal with this is to call xf86_reload_cursors()\nwhenever the screen is reconfigured (e.g., in set_mode_major), which will\nforce a reload of cursor images, if necessary. This is what\nxf86-video-intel does, for example.\n\nNote: xf86_reload_cursors has long been fixed to handle NULL pScreen and\nsw cursor. It is safe to call it unconditionally.\n\nNote: this patch is nearly identical to the following linaro patch, but\nwith a slightly different comment, fixed up formatting, plus the plumbing\nto get at drmmode within set_mode_major.\n\n(cherry picked from commit af046151a16e9d6096b29562c5f3b0e357f68f56)\nFrom linaro: git:\/\/git.linaro.org\/arm\/xorg\/driver\/xf86-video-armsoc.git\n\nSigned-off-by: Daniel Kurtz <31914e832df1cd8e5daa417106c0c6f5297b27d7@chromium.org>\n\nBUG=chromium:222117\nTEST=1) Attach HDMI cable\n 2) reboot\n 3) DO NOT TOUCH the touchpad\/mouse - in other words, do not make the cursor appear\n 4) set_short_powerd_timeouts\n 5) wait for displays to power off\n 6) wake up with keyboard\n => cursor is a pointer, not a color blob\n\nChange-Id: Iad4d010e5a0b4ca8d80e1b68f003e91e748770c7\nReviewed-on: https:\/\/chromium-review.googlesource.com\/168747\nReviewed-by: Daniel Kurtz <31914e832df1cd8e5daa417106c0c6f5297b27d7@chromium.org>\nCommit-Queue: Daniel Kurtz <31914e832df1cd8e5daa417106c0c6f5297b27d7@chromium.org>\nTested-by: Daniel Kurtz <31914e832df1cd8e5daa417106c0c6f5297b27d7@chromium.org>\n","repos":"markyzq\/armsoc-rockchip,markyzq\/armsoc-rockchip","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/drmmode_display.c\n+++ src\/drmmode_display.c\n@@ -654,6 +654,8 @@\n drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,\n \t\tRotation rotation, int x, int y)\n {\n+\tdrmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;\n+\tdrmmode_ptr drmmode = drmmode_crtc->drmmode;\n \tScrnInfoPtr pScrn = crtc->scrn;\n \tOMAPPtr pOMAP = OMAPPTR(pScrn);\n \txf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);\n@@ -716,10 +718,12 @@\n \t\tdrmmode_output_dpms(output, DPMSModeOn);\n \t}\n \n-\t\/\/ TODO: only call this if we are not using sw cursor.. ie. bad to call this\n-\t\/\/ if we haven't called xf86InitCursor()!!\n-\t\/\/\tif (pScrn->pScreen)\n-\t\/\/\t\txf86_reload_cursors(pScrn->pScreen);\n+\t\/*\n+\t * The screen has reconfigured, so reload hw cursor images as needed,\n+\t * and adjust cursor positions.\n+\t *\/\n+\tif (drmmode->cursor)\n+\t\txf86_reload_cursors(pScrn->pScreen);\n \n done:\n \tif (!ret) {\n"} {"commit":"beca4dfb0e4d11d3729214967a1fe56ee5669831","subject":"Handle new DamageUnregister API which has only one argument","message":"Handle new DamageUnregister API which has only one argument\n\nAPI change in 1.15\n\nSigned-off-by: Keith Packard <fd7f967895e9f35e58ec8a62a847a54d7fa7275f@keithp.com>\n","repos":"patjak\/xf86-video-gma500,patjak\/xf86-video-gma500,wzyy2\/xf86-video-modesetting,wzyy2\/xf86-video-modesetting","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/drmmode_display.h\n+++ src\/drmmode_display.h\n@@ -35,6 +35,10 @@\n \/* the perfect storm *\/\n #if XF86_CRTC_VERSION >= 5 && defined(HAVE_DRMPRIMEFDTOHANDLE) && HAVE_SCREEN_SPECIFIC_PRIVATE_KEYS\n #define MODESETTING_OUTPUT_SLAVE_SUPPORT 1\n+#endif\n+\n+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)\n+#define DamageUnregister(d, dd) DamageUnregister(dd)\n #endif\n \n struct dumb_bo {\n"} {"commit":"5b1294f8af37ff72f7f8370c38c48fb7bd519921","subject":"* src\/drv_initscripts.c (drv_mac_string): unknown MAC is not an error","message":"* src\/drv_initscripts.c (drv_mac_string): unknown MAC is not an error\n","repos":"osier\/netcf,osier\/netcf,emaste\/netcf,emaste\/netcf,seanbruno\/fbsd-netcf,seanbruno\/fbsd-netcf,battlemidget\/deprecated-mingw32-netcf,battlemidget\/deprecated-mingw32-netcf,hallyn\/netcf,hallyn\/netcf,seanbruno\/fbsd-netcf,emaste\/netcf,osier\/netcf,hallyn\/netcf","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/drv_initscripts.c\n+++ src\/drv_initscripts.c\n@@ -1118,12 +1118,16 @@\n int r;\n \n r = aug_get_mac(ncf, nif->name, &mac);\n- ERR_THROW(r <= 0, ncf, EOTHER, \"could not lookup MAC of %s\", nif->name);\n-\n- if (nif->mac == NULL || STRNEQ(nif->mac, mac)) {\n+ ERR_THROW(r < 0, ncf, EOTHER, \"could not lookup MAC of %s\", nif->name);\n+\n+ if (mac != NULL) {\n+ if (nif->mac == NULL || STRNEQ(nif->mac, mac)) {\n+ FREE(nif->mac);\n+ nif->mac = strdup(mac);\n+ ERR_NOMEM(nif->mac == NULL, ncf);\n+ }\n+ } else {\n FREE(nif->mac);\n- nif->mac = strdup(mac);\n- ERR_NOMEM(nif->mac == NULL, ncf);\n }\n \/* fallthrough intentional *\/\n error:\n"} {"commit":"3c33b5c9d6f984ca60143423fe45444b5ebae07e","subject":"according to change in ELL_3V_AFFINE","message":"according to change in ELL_3V_AFFINE\n\ngit-svn-id: 9e9401559e51101c165cdce4d49b411eb20436ed@3771 3d70eeeb-363e-0410-a505-8a46323a89f2\n","repos":"BRAINSia\/teem,BRAINSia\/teem,BRAINSia\/teem,Slicer\/teem,BRAINSia\/teem,Slicer\/teem,Slicer\/teem,Slicer\/teem,Slicer\/teem,BRAINSia\/teem","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/echo\/test\/glyph.c\n+++ src\/echo\/test\/glyph.c\n@@ -38,6 +38,12 @@\n rgb[1] = AIR_AFFINE(0.0, an, 1.0, 0.5, rgb[1]);\n rgb[2] = AIR_AFFINE(0.0, an, 1.0, 0.5, rgb[2]);\n }\n+\n+\/* changed in ELL, below is only usage *\/\n+#define NOTELL_3V_AFFINE(v,i,x,I,o,O) ( \\\n+ (v)[0] = AIR_AFFINE((i)[0],(x)[0],(I)[0],(o)[0],(O)[0]), \\\n+ (v)[1] = AIR_AFFINE((i)[1],(x)[1],(I)[1],(o)[1],(O)[1]), \\\n+ (v)[2] = AIR_AFFINE((i)[2],(x)[2],(I)[2],(o)[2],(O)[2]))\n \n void\n makeGlyphScene(limnCam *cam, EchoParm *eparm,\n@@ -74,8 +80,8 @@\n ELL_3V_SET(imax, 1, 1, 1);\n ELL_3V_SET(omin, 0, 0, 0);\n ELL_3V_SET(omax, xs*(sx-1), ys*(sy-1), zs*(sz-1));\n- ELL_3V_AFFINE(cam->from, imin, cam->from, imax, omin, omax);\n- ELL_3V_AFFINE(cam->at, imin, cam->at, imax, omin, omax);\n+ NOTELL_3V_AFFINE(cam->from, imin, cam->from, imax, omin, omax);\n+ NOTELL_3V_AFFINE(cam->at, imin, cam->at, imax, omin, omax);\n \n ng = 0;\n for (zi=0; zi<sz; zi++) {\n"} {"commit":"7a6d8db55434b07fdef6a61cb1bf437b251222ae","subject":"fix: handle allocation failure in element_storage","message":"fix: handle allocation failure in element_storage\n","repos":"veeg\/disir-c,veeg\/disir-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/element_storage.c\n+++ src\/element_storage.c\n@@ -76,6 +76,10 @@\n }\n \n storage->es_list = list_create ();\n+ if (storage->es_list == NULL)\n+ {\n+ goto error;\n+ }\n \n return storage;\n error:\n"} {"commit":"280c64031b2dabc11d67111007e0be29796fabe8","subject":"Added missing filesystem.h","message":"Added missing filesystem.h\n","repos":"mwgoldsmith\/aacs,zxlooong\/libaacs,ShiftMediaProject\/libaacs,ShiftMediaProject\/libaacs,rraptorr\/libaacs,mwgoldsmith\/aacs,zxlooong\/libaacs,rraptorr\/libaacs","returncode":1,"stderr":"error: pathspec 'src\/file\/filesystem.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- src\/file\/filesystem.h\n+++ src\/file\/filesystem.h\n@@ -0,0 +1,49 @@\n+\/*\n+ * This file is part of libaacs\n+ * Copyright (C) 2009-2010 Obliter0n\n+ *\n+ * This library is free software; you can redistribute it and\/or\n+ * modify it under the terms of the GNU Lesser General Public\n+ * License as published by the Free Software Foundation; either\n+ * version 2.1 of the License, or (at your option) any later version.\n+ *\n+ * This library is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ * Lesser General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Lesser General Public\n+ * License along with this library. If not, see\n+ * <http:\/\/www.gnu.org\/licenses\/>.\n+ *\/\n+\n+#ifndef AACS_FILESYSTEM_H_\n+#define AACS_FILESYSTEM_H_\n+\n+#include <stdint.h>\n+\n+typedef struct aacs_file_s AACS_FILE_H;\n+struct aacs_file_s\n+{\n+ void* internal;\n+ void (*close)(AACS_FILE_H *file);\n+ int64_t (*seek)(AACS_FILE_H *file, int64_t offset, int32_t origin);\n+ int64_t (*tell)(AACS_FILE_H *file);\n+ int (*eof)(AACS_FILE_H *file);\n+ int64_t (*read)(AACS_FILE_H *file, uint8_t *buf, int64_t size);\n+ int64_t (*write)(AACS_FILE_H *file, const uint8_t *buf, int64_t size);\n+};\n+\n+typedef AACS_FILE_H* (*AACS_FILE_OPEN)(const char* filename, const char *mode);\n+\n+\/**\n+ *\n+ * Register function pointer that will be used to open a file\n+ *\n+ * @param p function pointer\n+ * @return previous function pointer registered\n+ *\/\n+AACS_FILE_OPEN aacs_register_file(AACS_FILE_OPEN p);\n+\n+\n+#endif \/* AACS_FILESYSTEM_H_ *\/\n"} {"commit":"177032cedf997d53a9eef147f078061914dacefb","subject":"fixed warnings","message":"fixed warnings\n","repos":"RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/filters\/inspect.c\n+++ src\/filters\/inspect.c\n@@ -831,14 +831,13 @@\n static void inspect_dump_mpeg124(PidCtx *pctx, char *data, u32 size, FILE *dump)\n {\n \tu8 ftype;\n-\tu32 tinc, nb_frames, o_type;\n+\tu32 tinc, o_type;\n \tu64 fsize, start;\n \tBool is_coded, is_m4v=(pctx->codec_id==GF_CODECID_MPEG4_PART2) ? GF_TRUE : GF_FALSE;\n \tGF_Err e;\n \tGF_M4VParser *m4v = gf_m4v_parser_new(data, size, !is_m4v);\n \n \tgf_m4v_parser_set_inspect(m4v);\n-\tnb_frames = 0;\n \twhile (1) {\n \t\tftype = 0;\n \t\tis_coded = GF_FALSE;\n@@ -1147,7 +1146,6 @@\n \tGF_AVCConfig *avcc, *svcc;\n \tGF_AVCConfigSlot *slc;\n \tGF_HEVCConfig *hvcc, *lhcc;\n-\tBool is_lhvc = GF_FALSE;\n \tBool is_enh = GF_FALSE;\n \tchar *elt_name = NULL;\n \tconst GF_PropertyValue *p, *dsi, *dsi_enh;\n@@ -1270,7 +1268,6 @@\n \t\tfprintf(dump, \"<\/AVCParameterSets>\\n\");\n \t\tbreak;\n \tcase GF_CODECID_LHVC:\n-\t\tis_lhvc = GF_TRUE;\n \t\tis_enh = GF_TRUE;\n \tcase GF_CODECID_HEVC:\n \tcase GF_CODECID_HEVC_TILES:\n"} {"commit":"a486bd6f6b74e9f54ac3ba61ab0832a1ebecfc2d","subject":"input: chunk: fix tag lookup handling","message":"input: chunk: fix tag lookup handling\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@treasure-data.com>\n","repos":"nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/flb_input_chunk.c\n+++ src\/flb_input_chunk.c\n@@ -269,11 +269,17 @@\n \n \/*\n * Some callers might not set a custom tag, on that case just inherit\n- * the instance name.\n+ * the fixed instance tag or instance name.\n *\/\n if (!tag) {\n- tag = in->name;\n- tag_len = strlen(in->name);\n+ if (in->tag && in->tag_len > 0) {\n+ tag = in->tag;\n+ tag_len = in->tag_len;\n+ }\n+ else {\n+ tag = in->name;\n+ tag_len = strlen(in->name);\n+ }\n }\n \n \/*\n"} {"commit":"ff6a3cda84646075b6e237b27d1d3a498c4a9515","subject":"input: chunk: remove temporal call append_obj()","message":"input: chunk: remove temporal call append_obj()\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@treasure-data.com>\n","repos":"nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,nokute78\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,fluent\/fluent-bit,nokute78\/fluent-bit","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/flb_input_chunk.c\n+++ src\/flb_input_chunk.c\n@@ -161,40 +161,6 @@\n return ic;\n }\n \n-int flb_input_chunk_append_obj(struct flb_input_instance *in,\n- char *tag, int tag_len,\n- msgpack_object data)\n-{\n- size_t size;\n- struct flb_input_chunk *ic;\n-\n- ic = input_chunk_get(tag, tag_len, in);\n- if (!ic) {\n- return -1;\n- }\n-\n- \/* FIXME: protect buffers for filtering *\/\n-\n- \/\/flb_input_dbuf_write_start(dt);\n- msgpack_pack_object(&ic->mp_pck, data);\n- \/\/flb_input_dbuf_write_end(dt);\n-\n- \/* Get chunk size *\/\n- size = cio_chunk_get_content_size(ic->chunk);\n-\n- \/* Lock buffers if current chunk size is > 2MB *\/\n- if (size > 2048000) {\n- cio_chunk_lock(ic->chunk);\n- }\n-\n- \/* Make sure the data was not filtered out and the buffer size is zero *\/\n- if (size == 0) {\n- flb_input_chunk_destroy(ic);\n- }\n-\n- return 0;\n-}\n-\n \/* Append a RAW MessagPack buffer to the input instance *\/\n int flb_input_chunk_append_raw(struct flb_input_instance *in,\n char *tag, size_t tag_len,\n"} {"commit":"155ba08aded7a548ff6a2d14f1c057dd8d319955","subject":"started fiddling with epoch reclamation","message":"started fiddling with epoch reclamation\n","repos":"ekmett\/vr,ekmett\/vr","returncode":1,"stderr":"error: pathspec 'src\/framework\/epoch.h' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- src\/framework\/epoch.h\n+++ src\/framework\/epoch.h\n@@ -0,0 +1,115 @@\n+#pragma once\r\n+\r\n+#include <cassert>\r\n+#include \"framework\/std.h\";\r\n+\r\n+\/\/ Epoch-based reclamation\r\n+\r\n+\/\/ Based on\r\n+\/\/ [Practical Lock-freedom](https:\/\/www.cl.cam.ac.uk\/techreports\/UCAM-CL-TR-579.pdf)\r\n+\/\/ by Keir Fraser \r\n+\/\/ (Found in Section 5.2.3)\r\n+\r\n+namespace framework {\r\n+\r\n+ struct collector;\r\n+\r\n+ struct retired_ptr {\r\n+ retired_ptr(void * item, void(*finalizer)(void *)) : item(item), finalizer(finalizer) {}\r\n+ ~retired_ptr() {\r\n+ finalizer(item);\r\n+ }\r\n+ void * item;\r\n+ void(* finalizer) (void *);\r\n+ unique_ptr<retired_ptr> next;\r\n+ };\r\n+\r\n+ enum struct Epoch : int {\r\n+ min = 0,\r\n+ max = 2,\r\n+ inactive = 3,\r\n+ detached = 4\r\n+ };\r\n+\r\n+ struct collector_local {\r\n+ collector_local(collector & global) noexcept\r\n+ : epoch(Epoch::inactive),\r\n+ next(nullptr),\r\n+ global(global) {}\r\n+\r\n+ void detach() noexcept {\r\n+ epoch.store(Epoch::detached, std::memory_order_release);\r\n+ }\r\n+\r\n+ \/\/ I'd use operator++(int) but msvc seems to have an issue.\r\n+ Epoch succ(Epoch e) {\r\n+ return Epoch((int(e) + 1) % 3);\r\n+ }\r\n+\r\n+ friend collector;\r\n+ atomic<Epoch> epoch; \/\/ 0,1,2 for current epoch, 3 if inactive.\r\n+ atomic<collector_local*> next;\r\n+ atomic<retired_ptr*> limbo[3];\r\n+ collector & global;\r\n+ \r\n+\r\n+ void retire(void * v, void(*f)(void*)) {\r\n+ retired_ptr * it = new retired_ptr{ v, f };\r\n+ \/\/ thread it onto the right limbo list.\r\n+ }\r\n+ \r\n+ void access_lock() noexcept {\r\n+ assert(epoch.load(std::memory_order_relaxed) >= Epoch::inactive); \/\/ we better not already be running\r\n+ epoch.store(global.epoch.load(std::memory_order_relaxed), std::memory_order_relaxed);\r\n+ atomic_thread_fence(std::memory_order_acquire); \r\n+ }\r\n+\r\n+ void access_unlock() noexcept {\r\n+ assert(epoch.load(std::memory_order_relaxed) < Epoch::inactive);\r\n+ atomic_thread_fence(std::memory_order_release);\r\n+ epoch.store(Epoch::inactive, std::memory_order_relaxed);\r\n+ }\r\n+\r\n+ void collect(Epoch gc) {\r\n+\r\n+\r\n+ }\r\n+\r\n+ bool sync() {\r\n+ atomic<collector_local*>* last = &global.local;\r\n+ Epoch now = global.epoch.load(std::memory_order_relaxed);\r\n+ collector_local * t = global.local.load(std::memory_order_relaxed);\r\n+ while (t) {\r\n+ Epoch then = t->epoch.load(std::memory_order_relaxed);\r\n+ collector_local * n = t->next.load(std::memory_order_relaxed);\r\n+ if (then <= Epoch::max && then != now) {\r\n+ collect(succ(global.epoch.load(std::memory_order_relaxed)));\r\n+ return false;\r\n+ }\r\n+ if (then == Epoch::detached && last->compare_exchange_strong(t, n, std::memory_order_relaxed)) {\r\n+ retire(t, operator delete); \r\n+ }\r\n+ last = &t->next;\r\n+ t = n;\r\n+ }\r\n+ global.epoch.store(succ(now), std::memory_order_relaxed);\r\n+ collect(succ(global.epoch.load(std::memory_order_relaxed)));\r\n+ return true;\r\n+ }\r\n+ };\r\n+\r\n+ struct collector {\r\n+ atomic<Epoch> epoch; \/\/ 0, 1 or 2.\r\n+ atomic<collector_local*> local;\r\n+\r\n+ collector_local * attach() {\r\n+ collector_local * it = new collector_local();\r\n+ collector_local * head;\r\n+ do {\r\n+ head = local; \r\n+ it->next = head;\r\n+ } while (!local.compare_exchange_weak(head, it));\r\n+ return it;\r\n+ }\r\n+ };\r\n+};"} {"commit":"ba374a766bca3c04800f3473ca0a3bb25d3d2bbc","subject":"svct: Adjust the estimated frame size for QP=1","message":"svct: Adjust the estimated frame size for QP=1\n\nSigned-off-by: Xiang, Haihao <8d677183e5993577d4fa73a419b76987913292d6@intel.com>\nReviewed-by: Sean V Kelley <2e220d3765e3e059981b3c8d241463f952b3ee5f@posteo.de>\n(cherry picked from commit f4656a78b80d9cf402ddc86b2d0261359623e180)\n","repos":"01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver,01org\/iotg-lin-gfx-va-driver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gen6_mfc_common.c\n+++ src\/gen6_mfc_common.c\n@@ -95,14 +95,18 @@\n {\n struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;\n double bitrate, framerate;\n- double qp1_size = 0.1 * 8 * 3 * encoder_context->frame_width_in_pixel * encoder_context->frame_height_in_pixel \/ 2;\n- double qp51_size = 0.001 * 8 * 3 * encoder_context->frame_width_in_pixel * encoder_context->frame_height_in_pixel \/ 2;\n+ double frame_per_bits = 8 * 3 * encoder_context->frame_width_in_pixel * encoder_context->frame_height_in_pixel \/ 2;\n+ double qp1_size = 0.1 * frame_per_bits;\n+ double qp51_size = 0.001 * frame_per_bits;\n double bpf, factor;\n int inum = encoder_context->brc.num_iframes_in_gop,\n pnum = encoder_context->brc.num_pframes_in_gop,\n bnum = encoder_context->brc.num_bframes_in_gop; \/* Gop structure: number of I, P, B frames in the Gop. *\/\n int intra_period = encoder_context->brc.gop_size;\n int i;\n+\n+ if (encoder_context->layer.num_layers > 1)\n+ qp1_size = 0.15 * frame_per_bits;\n \n mfc_context->brc.mode = encoder_context->rate_control_mode;\n \n"} {"commit":"1348fb4dfdef889ddd864ad6f97432b138ec76c2","subject":"Added support of Framebuffer with a Cube Map texture (help CGMadness)","message":"Added support of Framebuffer with a Cube Map texture (help CGMadness)\n","repos":"ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/glshim,ptitSeb\/glshim,ptitSeb\/gl4es,ptitSeb\/glshim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gl\/framebuffers.c\n+++ src\/gl\/framebuffers.c\n@@ -372,7 +372,10 @@\n }\n \n errorGL();\n- gles_glFramebufferTexture2D(ntarget, attachment, \/*textarget*\/GL_TEXTURE_2D, texture, 0);\n+ GLenum realtarget = GL_TEXTURE_2D;\n+ if(textarget>=GL_TEXTURE_CUBE_MAP_POSITIVE_X && textarget<GL_TEXTURE_CUBE_MAP_POSITIVE_X+6)\n+ realtarget = textarget;\n+ gles_glFramebufferTexture2D(ntarget, attachment, textarget, texture, 0);\n DBG(CheckGLError(1);)\n ReadDraw_Pop(target);\n }\n"} {"commit":"1c613810d3931f20437658f1bb67c83234e2df05","subject":"[GLES2] Nope, it wasn't the last shader hacks for Antichamber","message":"[GLES2] Nope, it wasn't the last shader hacks for Antichamber\n","repos":"ptitSeb\/glshim,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/glshim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gl\/shader_hacks.c\n+++ src\/gl\/shader_hacks.c\n@@ -138,6 +138,11 @@\n \"vec4 Un_AttrBlendWeight0 = _Un_AttrBlendWeight0;\\n\",\n \"attribute vec4 _Un_AttrBlendWeight0;\\n\"\n \"#define Un_AttrBlendWeight0 _Un_AttrBlendWeight0\\n\",\n+\n+\"attribute vec4 _Un_AttrBinormal0;\\n\"\n+\"vec4 Un_AttrBinormal0 = _Un_AttrBinormal0;\\n\",\n+\"attribute vec4 _Un_AttrBinormal0;\\n\"\n+\"#define Un_AttrBinormal0 _Un_AttrBinormal0\\n\",\n \n \"attribute vec4 _Un_AttrTexCoord0;\\n\"\n \"vec4 Un_AttrTexCoord0 = _Un_AttrTexCoord0;\\n\",\n"} {"commit":"151a20dcd42c0973275479609470c2b616b3faa9","subject":"glsl: fix spelling of derived","message":"glsl: fix spelling of derived\n\nSigned-off-by: Chris Forbes <5dcac483e7a6e31a5cbe89f38cc69dff8ee93dac@ijw.co.nz>\n","repos":"zeux\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/glsl\/glsl_types.h\n+++ src\/glsl\/glsl_types.h\n@@ -180,7 +180,7 @@\n \/**@}*\/\n \n \/**\n- * For numeric and boolean derrived types returns the basic scalar type\n+ * For numeric and boolean derived types returns the basic scalar type\n *\n * If the type is a numeric or boolean scalar, vector, or matrix type,\n * this function gets the scalar type of the individual components. For\n"} {"commit":"bed9077a4c7001d43d882673e72e7d042b960e13","subject":"matrix: Go back to the simd4x4 is_2d() operator","message":"matrix: Go back to the simd4x4 is_2d() operator\n\nNow that we have a working baseline, and now that the is_2d() operator\nfor graphene_simd4x4f_t is not affected by floating point fluctuations,\nwe can go back to using it.\n\nWe can leave the fuzzy comparison code in place, in case of regressions,\nfor ease of debugging.\n","repos":"criptych\/graphene,ebassi\/graphene,criptych\/graphene,criptych\/graphene,criptych\/graphene,ebassi\/graphene","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphene-matrix.c\n+++ src\/graphene-matrix.c\n@@ -463,6 +463,7 @@\n bool\n graphene_matrix_is_2d (const graphene_matrix_t *m)\n {\n+#if 0\n float res[4];\n \n graphene_simd4f_dup_4f (m->value.x, res);\n@@ -488,6 +489,9 @@\n return false;\n \n return true;\n+#else\n+ return graphene_simd4x4f_is_2d (&m->value);\n+#endif\n }\n \n \/**\n"} {"commit":"85823e0d996b7f2d7aec5b8c1ddff15b60c114f3","subject":"simd: Fix the definition of dot3_scalar() in scalar context","message":"simd: Fix the definition of dot3_scalar() in scalar context\n\nCut and paste idiocy.\n","repos":"criptych\/graphene,criptych\/graphene,criptych\/graphene,criptych\/graphene,ebassi\/graphene,ebassi\/graphene","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphene-simd4f.c\n+++ src\/graphene-simd4f.c\n@@ -1208,7 +1208,7 @@\n return graphene_simd4f_splat (graphene_simd4f_dot3_scalar (a, b));\n }\n \n-graphene_simd4f_t\n+float\n (graphene_simd4f_dot3_scalar) (const graphene_simd4f_t a,\n const graphene_simd4f_t b)\n {\n"} {"commit":"ba2d51bdf10b1906b489227f412b188a4caa93e1","subject":"Fix typo in cmp_gt() for ARM NEON","message":"Fix typo in cmp_gt() for ARM NEON\n\nCopy and paste thinko.\n\nWe're reusing the vcgeq_f32 intrinsic, but we want the vcgtq_f32 one.\n","repos":"ebassi\/graphene,ebassi\/graphene","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphene-simd4f.h\n+++ src\/graphene-simd4f.h\n@@ -1357,7 +1357,7 @@\n \n # define graphene_simd4f_cmp_gt(a,b) \\\n (__extension__ ({ \\\n- const uint8x16_t __mask = vreinterpretq_u8_u32 (vcgeq_f32 ((a), (b))); \\\n+ const uint8x16_t __mask = vreinterpretq_u8_u32 (vcgtq_f32 ((a), (b))); \\\n (bool) (_graphene_movemask (__mask) != 0); \\\n }))\n \n"} {"commit":"8b06e04fc62d27aac568e994aad5c0d11b0e5742","subject":"missing include","message":"missing include\n\ngit-svn-id: 6b1c4fe79111c0bc0cce83313250759594f8984b@8811 e128ff1e-fa79-4151-a8cb-522299a2c450\n","repos":"filiatra\/gismo,filiatra\/gismo","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/gsUtils\/gsUtils.h\n+++ src\/gsUtils\/gsUtils.h\n@@ -14,6 +14,7 @@\n #pragma once\n \n #include <sstream>\n+#include <numeric>\n \n #include <gsCore\/gsExport.h>\n \n"} {"commit":"229eae57f3c5f1ab152ccb13886bacf1f69404bc","subject":"Correct unrefing.","message":"Correct unrefing.\n\n--HG--\nbranch : gstreamer\n","repos":"savonet\/ocaml-gstreamer,savonet\/ocaml-gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gstreamer_stubs.c\n+++ src\/gstreamer_stubs.c\n@@ -392,7 +392,7 @@\n memcpy(map.data, (unsigned char*)String_val(_buf), buflen);\n \n caml_release_runtime_system();\n- gst_buffer_unmap (gstbuf, &map);\n+ gst_buffer_unmap(gstbuf, &map);\n ret = gst_app_src_push_buffer(as->appsrc, gstbuf);\n caml_acquire_runtime_system();\n \n@@ -550,8 +550,10 @@\n ans = caml_ba_alloc(CAML_BA_C_LAYOUT | CAML_BA_UINT8, 1, NULL, &len);\n memcpy(Caml_ba_data_val(ans), map.data, len);\n \n- gst_buffer_unref(gstbuf);\n+ caml_release_runtime_system();\n+ gst_buffer_unmap(gstbuf, &map);\n gst_sample_unref(gstsample);\n+ caml_acquire_runtime_system();\n \n CAMLreturn(ans);\n }\n"} {"commit":"344a5fdcf349ac85ce2605c2a7d598ce673f06be","subject":"Fix compilation warnings","message":"Fix compilation warnings\n","repos":"archlinuxarm-n900\/libhildon,Cordia\/libhildon,archlinuxarm-n900\/libhildon,archlinuxarm-n900\/libhildon,community-ssu\/hildon,android-808\/libhildon,community-ssu\/hildon,android-808\/libhildon,community-ssu\/hildon,Cordia\/libhildon,Cordia\/libhildon,android-808\/libhildon","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/hildon-app-menu.c\n+++ src\/hildon-app-menu.c\n@@ -912,7 +912,7 @@\n {\n HildonAppMenuPrivate *priv;\n \n- g_return_if_fail (HILDON_IS_APP_MENU (menu));\n+ g_return_val_if_fail (HILDON_IS_APP_MENU (menu), NULL);\n \n priv = HILDON_APP_MENU_GET_PRIVATE (menu);\n \n@@ -934,7 +934,7 @@\n {\n HildonAppMenuPrivate *priv;\n \n- g_return_if_fail (HILDON_IS_APP_MENU (menu));\n+ g_return_val_if_fail (HILDON_IS_APP_MENU (menu), NULL);\n \n priv = HILDON_APP_MENU_GET_PRIVATE (menu);\n \n"} {"commit":"56f367ca9c66d4dbe11526335bd6840291101393","subject":"(update_frame_state): Update c->sigcontext_off so unw_resume() can reconstruct the \toriginal stack-pointer from c->sigcontext_loc. \tHandle rbs-switches for Linux signal deliver on alternate signal stack and \tfor general case, indicated by UNW_PI_FLAG_IA64_RBS_SWITCH. \tCall rbs_underflow() when we detect a register-backing-store underflow.","message":"(update_frame_state): Update c->sigcontext_off so unw_resume() can reconstruct the\n\toriginal stack-pointer from c->sigcontext_loc.\n\tHandle rbs-switches for Linux signal deliver on alternate signal stack and\n\tfor general case, indicated by UNW_PI_FLAG_IA64_RBS_SWITCH.\n\tCall rbs_underflow() when we detect a register-backing-store underflow.\n\n(Logical change 1.40)\n","repos":"Keno\/libunwind,fillexen\/libunwind,SyndicateRogue\/libunwind,libunwind\/libunwind,djwatson\/libunwind,fillexen\/libunwind,vtjnash\/libunwind,libunwind\/libunwind,DroidSim\/platform_external_libunwind,yuyichao\/libunwind,jrmuizel\/libunwind,geekboxzone\/mmallow_external_libunwind,vegard\/libunwind,geekboxzone\/lollipop_external_libunwind,tony\/libunwind,dreal-deps\/libunwind,rntz\/libunwind,fdoray\/libunwind,jrmuizel\/libunwind,dagar\/libunwind,krytarowski\/libunwind,unkadoug\/libunwind,Keno\/libunwind,adsharma\/libunwind,frida\/libunwind,djwatson\/libunwind,androidarmv6\/android_external_libunwind,androidarmv6\/android_external_libunwind,mpercy\/libunwind,CyanogenMod\/android_external_libunwind,evaautomation\/libunwind,tony\/libunwind,lat\/libunwind,tronical\/libunwind,dagar\/libunwind,cloudius-systems\/libunwind,libunwind\/libunwind,dropbox\/libunwind,mpercy\/libunwind,bo-on-software\/libunwind,pathscale\/libunwind,olibc\/libunwind,fdoray\/libunwind,maltek\/platform_external_libunwind,cloudius-systems\/libunwind,krytarowski\/libunwind,tony\/libunwind,geekboxzone\/lollipop_external_libunwind,0xlab\/0xdroid-external_libunwind,wdv4758h\/libunwind,olibc\/libunwind,martyone\/libunwind,android-ia\/platform_external_libunwind,martyone\/libunwind,unkadoug\/libunwind,djwatson\/libunwind,atanasyan\/libunwind,android-ia\/platform_external_libunwind,igprof\/libunwind,fillexen\/libunwind,adsharma\/libunwind,pathscale\/libunwind,SyndicateRogue\/libunwind,rntz\/libunwind,androidarmv6\/android_external_libunwind,zliu2014\/libunwind-tilegx,dreal-deps\/libunwind,olibc\/libunwind,maltek\/platform_external_libunwind,Keno\/libunwind,vegard\/libunwind,zeldin\/platform_external_libunwind,krytarowski\/libunwind,zeldin\/platform_external_libunwind,Chilledheart\/libunwind,0xlab\/0xdroid-external_libunwind,dropbox\/libunwind,DroidSim\/platform_external_libunwind,tkelman\/libunwind,joyent\/libunwind,zeldin\/platform_external_libunwind,vegard\/libunwind,geekboxzone\/lollipop_external_libunwind,geekboxzone\/mmallow_external_libunwind,tkelman\/libunwind,0xlab\/0xdroid-external_libunwind,cloudius-systems\/libunwind,dropbox\/libunwind,wdv4758h\/libunwind,atanasyan\/libunwind-android,rantala\/libunwind,rantala\/libunwind,mpercy\/libunwind,rntz\/libunwind,atanasyan\/libunwind-android,vtjnash\/libunwind,fdoray\/libunwind,lat\/libunwind,ehsan\/libunwind,lat\/libunwind,joyent\/libunwind,zliu2014\/libunwind-tilegx,tkelman\/libunwind,igprof\/libunwind,project-zerus\/libunwind,dagar\/libunwind,bo-on-software\/libunwind,maltek\/platform_external_libunwind,bo-on-software\/libunwind,joyent\/libunwind,geekboxzone\/mmallow_external_libunwind,project-zerus\/libunwind,rantala\/libunwind,DroidSim\/platform_external_libunwind,dreal-deps\/libunwind,adsharma\/libunwind,evaautomation\/libunwind,pathscale\/libunwind,CyanogenMod\/android_external_libunwind,Chilledheart\/libunwind,igprof\/libunwind,cms-externals\/libunwind,frida\/libunwind,cms-externals\/libunwind,ehsan\/libunwind,atanasyan\/libunwind,martyone\/libunwind,unkadoug\/libunwind,yuyichao\/libunwind,cms-externals\/libunwind,tronical\/libunwind,rogwfu\/libunwind,atanasyan\/libunwind-android,frida\/libunwind,yuyichao\/libunwind,android-ia\/platform_external_libunwind,CyanogenMod\/android_external_libunwind,evaautomation\/libunwind,wdv4758h\/libunwind,Chilledheart\/libunwind,atanasyan\/libunwind,vtjnash\/libunwind,jrmuizel\/libunwind,rogwfu\/libunwind,zliu2014\/libunwind-tilegx,rogwfu\/libunwind,project-zerus\/libunwind,tronical\/libunwind,SyndicateRogue\/libunwind,ehsan\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ia64\/Gstep-ia64.c\n+++ src\/ia64\/Gstep-ia64.c\n@@ -1,5 +1,5 @@\n \/* libunwind - a platform-independent unwind library\n- Copyright (C) 2001-2002 Hewlett-Packard Co\n+ Copyright (C) 2001-2003 Hewlett-Packard Co\n \tContributed by David Mosberger-Tang <davidm@hpl.hp.com>\n \n This file is part of libunwind.\n@@ -31,6 +31,7 @@\n update_frame_state (struct cursor *c)\n {\n unw_word_t prev_ip, prev_sp, prev_bsp, ip, pr, num_regs, cfm;\n+ unw_word_t bsp, bspstore, rnat_addr, ndirty, loadrs;\n int ret;\n \n prev_ip = c->ip;\n@@ -48,6 +49,8 @@\n if (ret < 0)\n \treturn ret;\n \n+ c->sigcontext_off = c->sigcontext_loc - c->sp;\n+\n if (c->ip_loc == c->sigcontext_loc + SIGCONTEXT_BR_OFF + 0*8)\n \t{\n \t \/* Earlier kernels (before 2.4.19 and 2.5.10) had buggy\n@@ -64,6 +67,40 @@\n \treturn ret;\n \n num_regs = cfm & 0x7f;\t\t\/* size of frame *\/\n+\n+ \/* When Linux delivers a signal on an alternate stack, it does\n+ things a bit differently from what the unwind conventions\n+ allow us to describe: instead of saving ar.rnat, ar.bsp, and\n+ ar.bspstore, it saves the former two plus the \"loadrs\" value.\n+ Because of this, we need to detect & record a potential\n+ rbs-area switch here manually... *\/\n+ if (c->bsp_loc)\n+\t{\n+\t \/* If ar.bsp has been saved already AND the current bsp is\n+\t not equal to the saved value, then we know for sure that\n+\t we're past the point where the backing store has been\n+\t switched (and before the point where it's restored). *\/\n+\t ret = ia64_get (c, c->sigcontext_loc + SIGCONTEXT_AR_BSP_OFF, &bsp);\n+\t if (ret < 0)\n+\t return ret;\n+\n+\t if (bsp != c->bsp)\n+\t {\n+\t assert (c->rnat_loc);\n+\n+\t ret = ia64_get (c, c->sigcontext_loc + SIGCONTEXT_LOADRS_OFF,\n+\t\t\t &loadrs);\n+\t if (ret < 0)\n+\t\treturn ret;\n+\n+\t loadrs >>= 16;\n+\t ndirty = ia64_rse_num_regs (c->bsp - loadrs, c->bsp);\n+\t bspstore = ia64_rse_skip_regs (bsp, -ndirty);\n+\t ret = rbs_record_switch (c, bsp, bspstore, c->rnat_loc);\n+\t if (ret < 0)\n+\t\treturn ret;\n+\t }\n+\t}\n }\n else\n {\n@@ -72,7 +109,25 @@\n \treturn ret;\n num_regs = (cfm >> 7) & 0x7f;\t\/* size of locals *\/\n }\n+\n+ if (unlikely (c->pi.flags & UNW_PI_FLAG_IA64_RBS_SWITCH))\n+ {\n+ if ((ret = ia64_get (c, c->bsp_loc, &bsp)) < 0\n+\t || (ret = ia64_get (c, c->bspstore_loc, &bspstore)) < 0\n+\t || (ret = ia64_get (c, c->rnat_loc, &rnat_addr)) < 0)\n+\treturn ret;\n+\n+ if (bsp != c->bsp)\n+\t{\n+\t ret = rbs_record_switch (c, bsp, bspstore, rnat_addr);\n+\t if (ret < 0)\n+\t return ret;\n+\t}\n+ }\n+\n c->bsp = ia64_rse_skip_regs (c->bsp, -num_regs);\n+ if (c->rbs_area[c->rbs_curr].end - c->bsp > c->rbs_area[c->rbs_curr].size)\n+ rbs_underflow (c);\n \n \/* update the IP cache: *\/\n ret = ia64_get (c, c->ip_loc, &ip);\n"} {"commit":"a87a46ec2db01b621857ca40a9ada4f431c8153c","subject":"imap: APPEND crashed if invalid keyword was given as parameter.","message":"imap: APPEND crashed if invalid keyword was given as parameter.\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -534,6 +534,7 @@\n \t\t\t\/* invalid keywords - delay failure *\/\n \t\t\tclient_send_box_error(cmd, ctx->box);\n \t\t\tctx->failed = TRUE;\n+\t\t\tkeywords = NULL;\n \t\t}\n \t}\n \n"} {"commit":"7748e8042615d7bfc8a013bfb9361d049cdf010b","subject":"imap: Allow very long MULTIAPPEND CATENATE lines that contain only URLs.","message":"imap: Allow very long MULTIAPPEND CATENATE lines that contain only URLs.\n","repos":"jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -339,7 +339,10 @@\n \t\treturn TRUE;\n \t}\n \n-\t\/* we're parsing inside CATENATE (..) list after handling a TEXT part *\/\n+\t\/* we're parsing inside CATENATE (..) list after handling a TEXT part.\n+\t it's fine that this would need to fully fit into input buffer\n+\t (although clients attempting to DoS could simply insert an extra\n+\t {1+} between the URLs) *\/\n \tret = imap_parser_read_args(ctx->save_parser, 0,\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL_SIZE |\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL8 |\n@@ -603,12 +606,33 @@\n \treturn cmd_sync(cmd, sync_flags, imap_flags, str_c(msg));\n }\n \n+static bool cmd_append_args_can_stop(const struct imap_arg *args)\n+{\n+\tif (args->type == IMAP_ARG_EOL)\n+\t\treturn TRUE;\n+\n+\t\/* [(flags)] [\"internal date\"] <message literal> | CATENATE (..) *\/\n+\tif (args->type == IMAP_ARG_LIST)\n+\t\targs++;\n+\tif (args->type == IMAP_ARG_STRING)\n+\t\targs++;\n+\n+\tif (args->type == IMAP_ARG_LITERAL_SIZE ||\n+\t args->type == IMAP_ARG_LITERAL_SIZE_NONSYNC)\n+\t\treturn TRUE;\n+\tif (imap_arg_atom_equals(args, \"CATENATE\") &&\n+\t args[1].type == IMAP_ARG_LIST)\n+\t\treturn TRUE;\n+\treturn FALSE;\n+}\n+\n static bool cmd_append_parse_new_msg(struct client_command_context *cmd)\n {\n \tstruct client *client = cmd->client;\n \tstruct cmd_append_context *ctx = cmd->context;\n \tconst struct imap_arg *args;\n \tconst char *msg;\n+\tunsigned int arg_min_count;\n \tbool fatal, nonsync;\n \tint ret;\n \n@@ -624,11 +648,15 @@\n \t\/* if error occurs, the CRLF is already read. *\/\n \tclient->input_skip_line = FALSE;\n \n-\t\/* parse the entire line up to the first message literal\n-\t FIXME: we could do with less with CATENATE.. *\/\n-\tret = imap_parser_read_args(ctx->save_parser, 0,\n-\t\t\t\t IMAP_PARSE_FLAG_LITERAL_SIZE |\n-\t\t\t\t IMAP_PARSE_FLAG_LITERAL8, &args);\n+\t\/* parse the entire line up to the first message literal, or in case\n+\t the input buffer is full of MULTIAPPEND CATENATE URLs, parse at\n+\t least until the beginning of the next message *\/\n+\targ_min_count = 1;\n+\tdo {\n+\t\tret = imap_parser_read_args(ctx->save_parser, arg_min_count++,\n+\t\t\t\t\t IMAP_PARSE_FLAG_LITERAL_SIZE |\n+\t\t\t\t\t IMAP_PARSE_FLAG_LITERAL8, &args);\n+\t} while (ret > 0 && !cmd_append_args_can_stop(args));\n \tif (ret == -1) {\n \t\tif (!ctx->failed) {\n \t\t\tmsg = imap_parser_get_error(ctx->save_parser, &fatal);\n"} {"commit":"434347212a9fdda494d30ae35903639626a8b06f","subject":"imap: Fixed assert-crash on invalid APPEND parameters.","message":"imap: Fixed assert-crash on invalid APPEND parameters.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -501,9 +501,8 @@\n \t\tctx->binary_input = args->literal8;\n \t\tvalid = TRUE;\n \t}\n-\t\/* we parsed the args only up to here. *\/\n-\ti_assert(IMAP_ARG_IS_EOL(&args[1]));\n-\n+\tif (!IMAP_ARG_IS_EOL(&args[1]))\n+\t\tvalid = FALSE;\n \tif (!valid) {\n \t\tclient->input_skip_line = TRUE;\n \t\tif (!ctx->failed)\n"} {"commit":"95ec2a977a122ad74efa745d896cf416b5c99dd9","subject":"If there had been enough sync changes while APPEND was being done, we never reset flush callback to _client_output, which could have caused hangs later.","message":"If there had been enough sync changes while APPEND was being done, we never\nreset flush callback to _client_output, which could have caused hangs later.\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,dscho\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,dscho\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,dscho\/dovecot,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -58,10 +58,10 @@\n \t}\n \n \tif (cmd->func(cmd)) {\n-\t\t\/* command execution was finished *\/\n-\t\tclient->bad_counter = 0;\n-\t\t_client_reset_command(client);\n-\n+\t\t\/* command execution was finished. Note that if cmd_sync()\n+\t\t didn't finish, we didn't get here but the input handler\n+\t\t has already been moved. So don't do anything important\n+\t\t here.. *\/\n \t\tif (client->input_pending)\n \t\t\t_client_input(client);\n \t}\n@@ -120,6 +120,9 @@\n \n \tif (ctx->box != ctx->cmd->client->mailbox && ctx->box != NULL)\n \t\tmailbox_close(&ctx->box);\n+\n+\tctx->client->bad_counter = 0;\n+\t_client_reset_command(ctx->client);\n }\n \n static bool cmd_append_continue_cancel(struct client_command_context *cmd)\n"} {"commit":"28bb17c8608e87a15122858ee7b112b48eb9ea24","subject":"QRESYNC: Fixed fallback handling to fetching expunged UIDs (again).","message":"QRESYNC: Fixed fallback handling to fetching expunged UIDs (again).\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-fetch.c\n+++ src\/imap\/imap-fetch.c\n@@ -223,10 +223,12 @@\n \t\t\t\t\t\t\t next_uid,\n \t\t\t\t\t\t\t mail->uid - 1);\n \t\t\t}\n-\t\t\tif (uid_filter[i].seq2 == mail->uid)\n-\t\t\t\tnext_uid = uid_filter[++i].seq1;\n+\t\t\tif (uid_filter[i].seq2 != mail->uid)\n+\t\t\t\tnext_uid = mail->uid + 1;\n+\t\t\telse if (++i < count)\n+\t\t\t\tnext_uid = uid_filter[i].seq1;\n \t\t\telse\n-\t\t\t\tnext_uid = mail->uid + 1;\n+\t\t\t\tbreak;\n \t\t}\n \t}\n \tif (i < count) {\n"} {"commit":"0e5c7b633b98c6df6041dd12da4a7757df2c28fe","subject":"context: all C_Gather to OR instead of AND subs.","message":"context: all C_Gather to OR instead of AND subs.\n\nThat is, call completion when first sub completes.\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/include\/Context.h\n+++ src\/include\/Context.h\n@@ -107,6 +107,8 @@\n };\n \n \n+\n+\n \/*\n * C_Gather\n *\n@@ -118,13 +120,22 @@\n \/\/cout << \"C_Gather sub_finish \" << this << \" got \" << r << \" of \" << waitfor << endl;\n assert(waitfor.count(r));\n waitfor.erase(r);\n+\n+ if (any && onfinish) {\n+ onfinish->finish(0);\n+ delete onfinish;\n+ onfinish = 0;\n+ }\n+\n if (!waitfor.empty()) \n return false; \/\/ more subs left\n \n \/\/ last one\n- onfinish->finish(0);\n- delete onfinish;\n- onfinish = 0;\n+ if (!any && onfinish) {\n+ onfinish->finish(0);\n+ delete onfinish;\n+ onfinish = 0;\n+ }\n return true;\n }\n \n@@ -149,9 +160,10 @@\n Context *onfinish;\n std::set<int> waitfor;\n int num;\n+ bool any; \/* if true, OR, otherwise, AND *\/\n \n public:\n- C_Gather(Context *f=0) : onfinish(f), num(0) {\n+ C_Gather(Context *f=0, bool an=false) : onfinish(f), num(0), any(an) {\n \/\/cout << \"C_Gather new \" << this << endl;\n }\n ~C_Gather() {\n"} {"commit":"2d823d8ef60c9aed3c2eb3c4bbee08616cd7aee3","subject":"Generic loop unrolling with template metaprograms. It seems to be as fast as manually unrolling. TODO: decide when to stop unrolling (speed vs. code size). maybe only unroll one loop for larger matixes.","message":"Generic loop unrolling with template metaprograms. It seems to be as fast as\nmanually unrolling.\nTODO: decide when to stop unrolling (speed vs. code size).\n maybe only unroll one loop for larger matixes.\n","repos":"pasuka\/eigen,ritsu1228\/eigen,cjntaylor\/eigen,pthulhu\/eigen,ritsu1228\/eigen,TSC21\/Eigen,toastedcrumpets\/eigen,Zefz\/eigen,ROCmSoftwarePlatform\/hipeigen,pthulhu\/eigen,pthulhu\/eigen,toastedcrumpets\/eigen,madlib\/eigen,TSC21\/Eigen,pasuka\/eigen,pasuka\/eigen,madlib\/eigen,Zefz\/eigen,ROCmSoftwarePlatform\/hipeigen,cjntaylor\/eigen,pthulhu\/eigen,ROCmSoftwarePlatform\/hipeigen,Zefz\/eigen,toastedcrumpets\/eigen,TSC21\/Eigen,pasuka\/eigen,madlib\/eigen,toastedcrumpets\/eigen,cjntaylor\/eigen,TSC21\/Eigen,ritsu1228\/eigen,ritsu1228\/eigen,cjntaylor\/eigen,pthulhu\/eigen,pasuka\/eigen,ritsu1228\/eigen,Zefz\/eigen,ROCmSoftwarePlatform\/hipeigen,madlib\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/internal\/Object.h\n+++ src\/internal\/Object.h\n@@ -28,26 +28,45 @@\n \n #include \"Util.h\"\n \n+template<int count, int rows> class Loop\n+{\n+ enum {\n+ col = (count-1)\/rows,\n+ row = (count-1)%rows,\n+ next = count-1\n+ };\n+ public:\n+ template <typename Derived1, typename Derived2> static void copy(Derived1 &dst, const Derived2 &src)\n+ {\n+ Loop<next, rows>::copy(dst, src);\n+ dst.write(row, col) = src.read(row, col);\n+ }\n+};\n+template<int rows> class Loop<0, rows>\n+{\n+ public:\n+ template <typename Derived1, typename Derived2> static void copy(Derived1 &dst, const Derived2 &src)\n+ {\n+ EI_UNUSED(dst);\n+ EI_UNUSED(src);\n+ }\n+};\n+\n+\n template<typename Scalar, typename Derived> class EiObject\n {\n static const int RowsAtCompileTime = Derived::RowsAtCompileTime,\n- ColsAtCompileTime = Derived::ColsAtCompileTime;\n+ ColsAtCompileTime = Derived::ColsAtCompileTime,\n+ CountAtCompileTime= RowsAtCompileTime*ColsAtCompileTime > 0 ?\n+ RowsAtCompileTime*ColsAtCompileTime : 0;\n \n template<typename OtherDerived>\n void _copy_helper(const EiObject<Scalar, OtherDerived>& other)\n {\n- if(RowsAtCompileTime == 3 && ColsAtCompileTime == 3)\n- {\n- write(0,0) = other.read(0,0);\n- write(1,0) = other.read(1,0);\n- write(2,0) = other.read(2,0);\n- write(0,1) = other.read(0,1);\n- write(1,1) = other.read(1,1);\n- write(2,1) = other.read(2,1);\n- write(0,2) = other.read(0,2);\n- write(1,2) = other.read(1,2);\n- write(2,2) = other.read(2,2);\n- }\n+ if ((RowsAtCompileTime != EiDynamic) &&\n+ (ColsAtCompileTime != EiDynamic) &&\n+ (CountAtCompileTime <= 25))\n+ Loop<CountAtCompileTime, RowsAtCompileTime>::copy(*this, other);\n else\n for(int i = 0; i < rows(); i++)\n for(int j = 0; j < cols(); j++)\n"} {"commit":"c80929f9f55f49d0f650479f3c92886ca94b54a7","subject":"ie bug workaround: dont send leading zeroes in chunk length","message":"ie bug workaround: dont send leading zeroes in chunk length\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/istream-chunked.c\n+++ src\/istream-chunked.c\n@@ -37,7 +37,13 @@\n format_uint16_hex_fixed(chunked->buffer, (uint16_t)length);\n chunked->buffer[4] = '\\r';\n chunked->buffer[5] = '\\n';\n+\n chunked->buffer_sent = 0;\n+ \/* a certain web browser from Redmond immediately closes the\n+ connection when it sees leading zeroes in the chunk length,\n+ which are legal according to RFC 2616 3.6.1 *\/\n+ while (chunked->buffer[chunked->buffer_sent] == '0')\n+ ++chunked->buffer_sent;\n }\n \n static size_t\n"} {"commit":"73717a48bf4fe60424d6a5f355041caaff12bb7f","subject":"Adds 4m Wood down slope to item dictionary","message":"Adds 4m Wood down slope to item dictionary\n","repos":"Dean4Devil\/libblueprint,Dean4Devil\/libblueprint","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/item_dictionary.h\n+++ src\/item_dictionary.h\n@@ -290,7 +290,7 @@\n { 290, bsStatic(\"\"), bsStatic(\"6f0efd3e-c241-437c-b25f-92dc1e83332c\") },\n { 291, bsStatic(\"\"), bsStatic(\"9a564782-3a07-472b-ae06-5a7dfd123e7d\") },\n { 292, bsStatic(\"\"), bsStatic(\"7d005e15-c63a-44f0-b12e-b8599a9f0424\") },\n- { 293, bsStatic(\"\"), bsStatic(\"3296c67d-6ace-44dd-8e86-335b9a90ad80\") },\n+ { 293, bsStatic(\"Wood down slope (4m)\"), bsStatic(\"3296c67d-6ace-44dd-8e86-335b9a90ad80\") },\n { 294, bsStatic(\"\"), bsStatic(\"2a3905ff-2030-421d-a2bf-90fba71c1c5e\") },\n { 295, bsStatic(\"\"), bsStatic(\"db9ed060-d556-435b-945c-19c923e233d3\") },\n { 296, bsStatic(\"\"), bsStatic(\"9d43ff24-4165-4c48-bc5d-ccb89b0667bd\") },\n"} {"commit":"178ab08676fa1a8f1b9b031ca861382835453333","subject":"Fixed percent update","message":"Fixed percent update\n","repos":"sanikoyes\/iup,sanikoyes\/iup,sanikoyes\/iup,sanikoyes\/iup","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/iup_progressdlg.c\n+++ src\/iup_progressdlg.c\n@@ -53,12 +53,13 @@\n \/* avoid duplicate updates *\/\n if (percent != progress_data->percent)\n {\n- progress_data->percent = percent;\n IupSetInt(progress_data->progress, \"VALUE\", percent);\n IupFlush();\n progress_data->last_clock = (int)clock();\n }\n }\n+\n+ progress_data->percent = percent;\n \n IupLoopStep();\n }\n@@ -176,7 +177,7 @@\n static char* iProgressDlgGetPercentAttrib(Ihandle* ih)\n {\n IprogressDlgData* progress_data = (IprogressDlgData*)iupAttribGet(ih, \"_IUP_PDLG_DATA\");\n- return IupGetAttribute(progress_data->progress, \"VALUE\");\n+ return iupStrReturnInt(progress_data->percent);\n }\n \n static int iProgressDlgSetDescriptionAttrib(Ihandle* ih, const char* value)\n"} {"commit":"1148f245b1a0c189b2fcbec1730560c443472a29","subject":"more","message":"more\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/kernel\/x86\/arch.c\n+++ src\/kernel\/x86\/arch.c\n@@ -28,6 +28,13 @@\n \n }\n \n+static struct mmu_table *gettable(struct mmu_directory *directory, unsigned int index)\n+{\n+\n+ return (struct mmu_table *)(directory + 1) + index;\n+\n+}\n+\n static void mapmissing(struct task *task)\n {\n \n@@ -49,7 +56,7 @@\n {\n \n struct mmu_directory *directory = gettaskdirectory(task->id);\n- struct mmu_table *table = (struct mmu_table *)(directory + 1) + index;\n+ struct mmu_table *table = gettable(directory, index);\n \n mmu_map(directory, table, paddress, vaddress, size, MMU_TFLAG_PRESENT | MMU_TFLAG_WRITEABLE | MMU_TFLAG_USERMODE, MMU_PFLAG_PRESENT | MMU_PFLAG_WRITEABLE | MMU_PFLAG_USERMODE);\n \n@@ -137,7 +144,7 @@\n {\n \n struct mmu_directory *directory = getkerneldirectory();\n- struct mmu_table *table = (struct mmu_table *)(directory + 1) + index;\n+ struct mmu_table *table = gettable(directory, index);\n \n mmu_map(directory, table, paddress, vaddress, size, MMU_TFLAG_PRESENT | MMU_TFLAG_WRITEABLE, MMU_PFLAG_PRESENT | MMU_PFLAG_WRITEABLE);\n \n@@ -147,7 +154,7 @@\n {\n \n struct mmu_directory *directory = getkerneldirectory();\n- struct mmu_table *table = (struct mmu_table *)(directory + 1) + index;\n+ struct mmu_table *table = gettable(directory, index);\n \n mmu_map(directory, table, paddress, vaddress, size, MMU_TFLAG_PRESENT | MMU_TFLAG_WRITEABLE | MMU_TFLAG_USERMODE | MMU_TFLAG_CACHEWRITE, MMU_PFLAG_PRESENT | MMU_PFLAG_WRITEABLE | MMU_PFLAG_USERMODE | MMU_PFLAG_CACHEWRITE);\n \n"} {"commit":"842e04885a14ba699f2938212ee9412c1147fed9","subject":"more cleanups","message":"more cleanups\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/kernel\/x86\/arch.c\n+++ src\/kernel\/x86\/arch.c\n@@ -91,6 +91,16 @@\n \n } current;\n \n+static void copymap(struct container *container, struct task *task)\n+{\n+\n+ struct arch_task *atask = (struct arch_task *)task;\n+ struct arch_container *acontainer = (struct arch_container *)container;\n+\n+ memory_copy(atask->directory, acontainer->directory, sizeof (struct mmu_directory));\n+\n+}\n+\n static void mapcontainercode(struct container *container)\n {\n \n@@ -103,16 +113,6 @@\n \n }\n \n-static void maptaskcontainer(struct task *task, struct container *container)\n-{\n-\n- struct arch_task *atask = (struct arch_task *)task;\n- struct arch_container *acontainer = (struct arch_container *)container;\n-\n- memory_copy(atask->directory, acontainer->directory, sizeof (struct mmu_directory));\n-\n-}\n-\n static void maptaskcode(struct task *task, unsigned int address)\n {\n \n@@ -158,12 +158,11 @@\n if (!next)\n return 0;\n \n+ copymap(container, next);\n kernel_copydescriptors(container, task, next);\n \n if (!kernel_setupbinary(container, next, TASKSTACK))\n return 0;\n-\n- maptaskcontainer(next, container);\n \n return 1;\n \n@@ -373,9 +372,9 @@\n \n kernel_setupramdisk(current.container, current.task, backend);\n mapcontainercode(current.container);\n+ copymap(current.container, current.task);\n kernel_copydescriptors(current.container, current.task, current.task);\n kernel_setupbinary(current.container, current.task, TASKSTACK);\n- maptaskcontainer(current.task, current.container);\n activate(current.task);\n mmu_setup();\n abi_setup(spawn, despawn);\n"} {"commit":"6ee61f22f11e77939866935d375cae14d233b81c","subject":"lib-fs: posix fs backend now closes the fd after reads are finished. This allows keeping more fs_file structs open than there are available fds.","message":"lib-fs: posix fs backend now closes the fd after reads are finished.\nThis allows keeping more fs_file structs open than there are available fds.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-fs\/fs-posix.c\n+++ src\/lib-fs\/fs-posix.c\n@@ -252,6 +252,16 @@\n \treturn &file->file;\n }\n \n+static void fs_posix_file_close(struct posix_fs_file *file)\n+{\n+\tif (file->fd != -1 && file->file.output == NULL) {\n+\t\tif (close(file->fd) < 0) {\n+\t\t\tfs_set_critical(file->file.fs, \"close(%s) failed: %m\",\n+\t\t\t\t\tfile->file.path);\n+\t\t}\n+\t}\n+}\n+\n static void fs_posix_file_deinit(struct fs_file *_file)\n {\n \tstruct posix_fs_file *file = (struct posix_fs_file *)_file;\n@@ -275,12 +285,7 @@\n \t\tbreak;\n \t}\n \n-\tif (file->fd != -1) {\n-\t\tif (close(file->fd) < 0) {\n-\t\t\tfs_set_critical(_file->fs, \"close(%s) failed: %m\",\n-\t\t\t\t\t_file->path);\n-\t\t}\n-\t}\n+\tfs_posix_file_close(file);\n \ti_free(file->temp_path);\n \ti_free(file->file.path);\n \ti_free(file);\n@@ -327,6 +332,7 @@\n \tret = read(file->fd, buf, size);\n \tif (ret < 0)\n \t\tfs_set_error(_file->fs, \"read(%s) failed: %m\", _file->path);\n+\tfs_posix_file_close(file);\n \treturn ret;\n }\n \n@@ -336,14 +342,14 @@\n \tstruct posix_fs_file *file = (struct posix_fs_file *)_file;\n \tstruct istream *input;\n \n-\tif (file->fd == -1) {\n-\t\tif (fs_posix_open(file) < 0) {\n-\t\t\tinput = i_stream_create_error(errno);\n-\t\t\ti_stream_set_name(input, _file->path);\n-\t\t\treturn input;\n-\t\t}\n-\t}\n-\treturn i_stream_create_fd(file->fd, max_buffer_size, FALSE);\n+\tif (file->fd == -1 && fs_posix_open(file) < 0) {\n+\t\tinput = i_stream_create_error(errno);\n+\t\ti_stream_set_name(input, _file->path);\n+\t} else {\n+\t\tinput = i_stream_create_fd(file->fd, max_buffer_size, FALSE);\n+\t}\n+\ti_stream_add_destroy_callback(input, fs_posix_file_close, file);\n+\treturn input;\n }\n \n static int fs_posix_write_finish(struct posix_fs_file *file)\n"} {"commit":"fa285a2638d39cf66ba7dc9ef7d893c952790349","subject":"dbus version match at compile time for dbus_watch_get_unix_fd, thx Trevi\u00f1o","message":"dbus version match at compile time for dbus_watch_get_unix_fd, thx Trevi\u00f1o\n\ngit-svn-id: ea5ea25908b0b363893e799f51beeda82c91f594@37810 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/edbus,jordemort\/edbus","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/dbus\/e_dbus.c\n+++ src\/lib\/dbus\/e_dbus.c\n@@ -134,7 +134,11 @@\n hd->watch = watch;\n \n hd->enabled = dbus_watch_get_enabled(watch);\n+#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)\n hd->fd = dbus_watch_get_unix_fd(hd->watch);\n+#else\n+ hd->fd = dbus_watch_get_fd(hd->watch);\n+#endif\n DEBUG(5, \"watch add (enabled: %d)\\n\", hd->enabled);\n if (hd->enabled) e_dbus_fd_handler_add(hd);\n }\n"} {"commit":"d783710e7ef5c24d5f9f8003006367902ca7a6bd","subject":"- stop losing the last mime","message":"- stop losing the last mime\n","repos":"jordemort\/efreet,jordemort\/efreet","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/efreet_mime.c\n+++ src\/lib\/efreet_mime.c\n@@ -716,17 +716,12 @@\n {\n char *val, buf[512];\n \n- \/* Append Mime to list of magics *\/\n- if (mime)\n- {\n- ecore_list_append(magics, mime);\n- mime = NULL;\n- }\n \n mime = NEW(Efreet_Mime_Magic, 1);\n mime->entries = ecore_list_new();\n ecore_list_set_free_cb(mime->entries,\n efreet_mime_magic_entry_free);\n+ ecore_list_append(magics, mime);\n \n val = ++ptr;\n while ((*val != ':')) val++;\n"} {"commit":"cdcb2af561ef168d199affa1199592d5eadce45d","subject":"Eina: eina_object : more use of eina_lock","message":"Eina: eina_object : more use of eina_lock\n\n\nSVN revision: 58980\n","repos":"gfriloux\/eina,gfriloux\/eina,gfriloux\/eina,turran\/eina,turran\/eina,turran\/eina","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/eina_object.c\n+++ src\/lib\/eina_object.c\n@@ -22,22 +22,6 @@\n \n #include <string.h>\n \n-#ifdef EFL_HAVE_POSIX_THREADS\n-#include <pthread.h>\n-\n-# ifdef EFL_DEBUG_THREADS\n-# include <assert.h>\n-# endif\n-#endif\n-\n-#ifdef EFL_HAVE_WIN32_THREADS\n-# define WIN32_LEAN_AND_MEAN\n-# include <windows.h>\n-# undef WIN32_LEAN_AND_MEAN\n-#endif\n-\n-#include \"eina_object.h\"\n-\n #include \"eina_private.h\"\n #include \"eina_inlist.h\"\n #include \"eina_rbtree.h\"\n@@ -46,6 +30,8 @@\n #include \"eina_log.h\"\n #include \"eina_stringshare.h\"\n #include \"eina_lock.h\"\n+\n+#include \"eina_object.h\"\n \n \/*============================================================================*\n * Local *\n@@ -153,15 +139,11 @@\n \n Eina_Bool repack_needed : 1;\n \n-#ifdef EFL_HAVE_THREADS\n-# ifdef EFL_HAVE_POSIX_THREADS\n-# ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_THREADS\n+# ifdef EINA_HAVE_DEBUG_THREADS\n pthread_t self;\n-# endif\n- pthread_mutex_t mutex;\n-# else\n- HANDLE mutex;\n # endif\n+ Eina_Lock mutex;\n #endif\n \n EINA_MAGIC;\n@@ -600,15 +582,11 @@\n c->allocated_range = NULL;\n c->childs = NULL;\n \n-#ifdef EFL_HAVE_THREADS\n-# ifdef EFL_HAVE_POSIX_THREADS\n-# ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_THREADS\n+# ifdef EINA_HAVE_DEBUG_THREADS\n c->self = pthread_self();\n-# endif\n- pthread_mutex_init(&c->mutex, NULL);\n-# else\n- c->mutex = CreateMutex(NULL, FALSE, NULL);\n # endif\n+ eina_lock_new(&c->mutex);\n #endif\n \n EINA_MAGIC_SET(c, EINA_MAGIC_CLASS);\n@@ -677,15 +655,11 @@\n \t}\n }\n \n-#ifdef EFL_HAVE_THREADS\n-# ifdef EFL_HAVE_POSIX_THREADS\n-# ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_THREADS\n+# ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(class->self, pthread_self()));\n-# endif\n- pthread_mutex_destroy(&class->mutex);\n-# else\n- CloseHandle(class->mutex);\n # endif\n+ eina_lock_free(&class->mutex);\n #endif\n \n eina_mempool_del(class->mempool);\n@@ -701,7 +675,7 @@\n \n if (!eina_lock_take(&class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n else\n assert(pthread_equal(class->self, pthread_self()));\n #endif\n@@ -771,7 +745,7 @@\n \n if (!eina_lock_take(&class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(class->self, pthread_self()));\n #endif\n }\n@@ -798,7 +772,7 @@\n \n if (!eina_lock_take(&class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(class->self, pthread_self()));\n #endif\n }\n@@ -826,14 +800,14 @@\n \n if (!eina_lock_take(&parent_class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(parent_class->self, pthread_self()));\n #endif\n }\n \n if (!eina_lock_take(&object_class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(object_class->self, pthread_self()));\n #endif\n }\n@@ -869,7 +843,7 @@\n \n if (!eina_lock_take(&class->mutex))\n {\n-#ifdef EFL_DEBUG_THREADS\n+#ifdef EINA_HAVE_DEBUG_THREADS\n assert(pthread_equal(class->self, pthread_self()));\n #endif\n }\n"} {"commit":"f0fbfc0cc0c5dc585536fcc804676456c043bcd2","subject":"Delete long press timer on item deletion","message":"Delete long press timer on item deletion\n\n\nSVN revision: 47576\n","repos":"FlorentRevest\/Elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_genlist.c\n+++ src\/lib\/elm_genlist.c\n@@ -500,6 +500,7 @@\n if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);\n if (it->realized) _item_unrealize(it);\n if (it->block) _item_block_del(it);\n+ if (it->long_timer) ecore_timer_del(it->long_timer);\n if ((!it->delete_me) && (it->itc->func.del)) \n it->itc->func.del(it->data, it->wd->obj);\n it->delete_me = EINA_TRUE;\n"} {"commit":"bdc6a18f50280eb77493757064a8d1a5ddabff8f","subject":"Hello, here is a patch for elm_genlist.","message":"Hello,\nhere is a patch for elm_genlist.\n\nFixing Eina_Bool in elm_genlist.\n0 -> EINA_FALSE\n1 -> EINA_TRUE\nAnd fixed return value of _item_block_recalc from int to Eina_Bool.\n\nAnybody can review this and apply it to upstream?\n\nThanks.\nDaniel Juyung Seo (SeoZ)\n\n\nSVN revision: 55673\n","repos":"FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_genlist.c\n+++ src\/lib\/elm_genlist.c\n@@ -1015,7 +1015,7 @@\n minh \/= 2;\n if ((adx > minw) || (ady > minh))\n {\n- it->dragging = 1;\n+ it->dragging = EINA_TRUE;\n if (it->long_timer)\n {\n ecore_timer_del(it->long_timer);\n@@ -1114,8 +1114,8 @@\n it->wd->on_hold = EINA_TRUE;\n }\n \n- it->down = 1;\n- it->dragging = 0;\n+ it->down = EINA_TRUE;\n+ it->dragging = EINA_FALSE;\n evas_object_geometry_get(obj, &x, &y, NULL, NULL);\n it->dx = ev->canvas.x - x;\n it->dy = ev->canvas.y - y;\n@@ -1150,7 +1150,7 @@\n Eina_Bool dragged = EINA_FALSE;\n \n if (ev->button != 1) return;\n- it->down = 0;\n+ it->down = EINA_FALSE;\n if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;\n else it->wd->on_hold = EINA_FALSE;\n if (it->long_timer)\n@@ -1160,7 +1160,7 @@\n }\n if (it->dragging)\n {\n- it->dragging = 0;\n+ it->dragging = EINA_FALSE;\n evas_object_smart_callback_call(it->base.widget, \"drag,stop\", it);\n dragged = 1;\n }\n@@ -1181,7 +1181,7 @@\n it->wd->longpressed = EINA_FALSE;\n if (!it->wd->wasselected)\n _item_unselect(it);\n- it->wd->wasselected = 0;\n+ it->wd->wasselected = EINA_FALSE;\n return;\n }\n if (dragged)\n@@ -1653,7 +1653,7 @@\n it->want_unrealize = EINA_FALSE;\n }\n \n-static int\n+static Eina_Bool \n _item_block_recalc(Item_Block *itb,\n int in,\n int qadd,\n@@ -1662,7 +1662,7 @@\n const Eina_List *l;\n Elm_Genlist_Item *it;\n Evas_Coord minw = 0, minh = 0;\n- int showme = 0, changed = 0;\n+ Eina_Bool showme = EINA_FALSE, changed = EINA_FALSE;\n Evas_Coord y = 0;\n \n itb->num = in;\n@@ -1674,7 +1674,7 @@\n {\n if (qadd)\n {\n- if (!it->mincalcd) changed = 1;\n+ if (!it->mincalcd) changed = EINA_TRUE;\n if (changed)\n {\n _item_realize(it, in, 1);\n@@ -1728,14 +1728,14 @@\n {\n const Eina_List *l;\n Elm_Genlist_Item *it;\n- int dragging = 0;\n+ Eina_Bool dragging = EINA_FALSE;\n \n if (!itb->realized) return;\n EINA_LIST_FOREACH(itb->items, l, it)\n {\n if (it->dragging)\n {\n- dragging = 1;\n+ dragging = EINA_TRUE;\n it->want_unrealize = EINA_TRUE;\n }\n else\n@@ -1829,11 +1829,11 @@\n \n EINA_INLIST_FOREACH(wd->blocks, itb)\n {\n- int showme = 0;\n+ Eina_Bool showme = EINA_FALSE;\n \n itb->num = in;\n showme = itb->showme;\n- itb->showme = 0;\n+ itb->showme = EINA_FALSE;\n if (chb)\n {\n if (itb->realized) _item_block_unrealize(itb);\n@@ -1870,7 +1870,7 @@\n in += itb->count;\n if ((showme) && (wd->show_item))\n {\n- wd->show_item->showme = 0;\n+ wd->show_item->showme = EINA_FALSE;\n if (wd->bring_in)\n elm_smart_scroller_region_bring_in(wd->scr,\n wd->show_item->x +\n@@ -1967,7 +1967,7 @@\n itminw = it->w;\n itminh = it->h;\n \n- it->updateme = 0;\n+ it->updateme = EINA_FALSE;\n if (it->realized)\n {\n _item_unrealize(it);\n@@ -1984,7 +1984,7 @@\n }\n num++;\n }\n- itb->updateme = 0;\n+ itb->updateme = EINA_FALSE;\n if (recalc)\n {\n position = 1;\n@@ -2530,7 +2530,8 @@\n _queue_proecess(Widget_Data *wd,\n int norender)\n {\n- int n, showme = 0;\n+ int n;\n+ Eina_Bool showme = EINA_FALSE;\n double t0, t;\n \n t0 = ecore_time_get();\n@@ -2549,7 +2550,7 @@\n norender);\n it->block->changed = 0;\n }\n- if (showme) it->block->showme = 1;\n+ if (showme) it->block->showme = EINA_TRUE;\n if (eina_inlist_count(wd->blocks) > 1)\n {\n if ((t - t0) > (ecore_animator_frametime_get())) break;\n@@ -2653,7 +2654,7 @@\n it->rel = it2;\n it->rel->relcount++;\n }\n- it->before = 0;\n+ it->before = EINA_FALSE;\n _item_queue(wd, it);\n return it;\n }\n@@ -2697,7 +2698,7 @@\n printf(\"FIXME: 12 tree not handled yet\\n\");\n }\n it->rel = NULL;\n- it->before = 1;\n+ it->before = EINA_TRUE;\n _item_queue(wd, it);\n return it;\n }\n@@ -2744,7 +2745,7 @@\n }\n it->rel = before;\n it->rel->relcount++;\n- it->before = 1;\n+ it->before = EINA_TRUE;\n _item_queue(wd, it);\n return it;\n }\n@@ -2791,7 +2792,7 @@\n }\n it->rel = after;\n it->rel->relcount++;\n- it->before = 0;\n+ it->before = EINA_FALSE;\n _item_queue(wd, it);\n return it;\n }\n@@ -2815,14 +2816,14 @@\n {\n Elm_Genlist_Item *it;\n \n- wd->clear_me = 1;\n+ wd->clear_me = EINA_TRUE;\n EINA_INLIST_FOREACH(wd->items, it)\n {\n- it->delete_me = 1;\n+ it->delete_me = EINA_TRUE;\n }\n return;\n }\n- wd->clear_me = 0;\n+ wd->clear_me = EINA_FALSE;\n while (wd->items)\n {\n Elm_Genlist_Item *it = ELM_GENLIST_ITEM_FROM_INLIST(wd->items);\n@@ -3467,7 +3468,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n@@ -3501,7 +3502,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n@@ -3536,7 +3537,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n@@ -3573,7 +3574,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n@@ -3609,7 +3610,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n@@ -3646,7 +3647,7 @@\n if ((it->queued) || (!it->mincalcd))\n {\n it->wd->show_item = it;\n- it->wd->bring_in = 1;\n+ it->wd->bring_in = EINA_TRUE;\n it->showme = EINA_TRUE;\n return;\n }\n"} {"commit":"ead11a61331778d38fa2317fa866fee7440ccabd","subject":"fix indentation","message":"fix indentation\n\n\nSVN revision: 77177\n","repos":"rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,tasn\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary,FlorentRevest\/Elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_toolbar.c\n+++ src\/lib\/elm_toolbar.c\n@@ -354,9 +354,9 @@\n Evas_Coord iw = 0, ih = 0;\n \n if (sd->vertical)\n-\t\t\th = (vh >= mh) ? vh : mh;\n-\t\telse\n-\t\t\tw = (vw >= mw) ? vw : mw;\n+ h = (vh >= mh) ? vh : mh;\n+ else\n+ w = (vw >= mw) ? vw : mw;\n \n if (sd->vertical)\n _items_visibility_fix(sd, &ih, vh, &more);\n@@ -848,14 +848,14 @@\n {\n minw = minw_bx + (w - vw);\n minh = minh_bx + (h - vh);\n-\t\tif (sd->vertical)\n-\t\t{\n-\t\t\tif (minh_bx < vh) minh_bx = vh;\n-\t\t}\n-\t\telse\n-\t\t{\n-\t\t\tif (minw_bx < vw) minw_bx = vw;\n-\t\t}\n+ if (sd->vertical)\n+ {\n+ if (minh_bx < vh) minh_bx = vh;\n+ }\n+ else\n+ {\n+ if (minw_bx < vw) minw_bx = vw;\n+ }\n }\n else\n {\n"} {"commit":"1a789db9ab11cc37fec94b8054549590ef412bf4","subject":"since 1.8 => @since 1.8 in doc","message":"since 1.8 => @since 1.8 in doc\n\n\nSVN revision: 79204\n","repos":"rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary,FlorentRevest\/Elementary,rvandegrift\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/elm_toolbar.h\n+++ src\/lib\/elm_toolbar.h\n@@ -1004,7 +1004,7 @@\n *\n * see elm_toolbar_item_bring_in()\n *\n- * since 1.8\n+ * @since 1.8\n * @ingroup Toolbar\n *\/\n EAPI void elm_toolbar_item_show(Elm_Object_Item *it);\n@@ -1016,7 +1016,7 @@\n *\n * see elm_toolbar_item_show()\n *\n- * since 1.8\n+ * @since 1.8\n * @ingroup Toolbar\n *\/\n EAPI void elm_toolbar_item_bring_in(Elm_Object_Item *it);\n"} {"commit":"04e93c1304dd6db8b7bdc24b18820aabbe2ce882","subject":"Make the initialization reentrant","message":"Make the initialization reentrant\n","repos":"turran\/enesim,turran\/enesim,turran\/enesim,turran\/enesim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/lib\/enesim_main.c\n+++ src\/lib\/enesim_main.c\n@@ -57,6 +57,8 @@\n * Local *\n *============================================================================*\/\n static int _enesim_init_count = 0;\n+static Eina_Bool _initializing = EINA_FALSE;;\n+static Eina_Bool _deinitializing = EINA_FALSE;\n \n \/* simple struct to initialize all the domains easily *\/\n struct log\n@@ -156,14 +158,21 @@\n *\/\n EAPI int enesim_init(void)\n {\n-\tif (++_enesim_init_count != 1)\n+\tif (_initializing)\n \t\treturn _enesim_init_count;\n+\n+\t_initializing = EINA_TRUE;\n+\tif (_enesim_init_count != 0)\n+\t{\n+\t\t_enesim_init_count++;\n+\t\tgoto done;\n+\t}\n \n #ifdef HAVE_EVIL\n \tif (!evil_init())\n \t{\n \t\tfprintf(stderr, \"Enesim: Evil init failed\");\n-\t\treturn --_enesim_init_count;\n+\t\tgoto done;\n \t}\n #endif\n \tif (!eina_init())\n@@ -184,6 +193,7 @@\n \t\/* TODO Dump the information about SIMD extensions\n \t * get the cpuid for this\n \t *\/\n+\t_enesim_init_count++;\n \tenesim_mempool_aligned_init();\n \tenesim_mempool_buddy_init();\n \tenesim_pool_init();\n@@ -204,7 +214,7 @@\n \t *\/\n \tfeenableexcept(FE_DIVBYZERO | FE_INVALID);\n #endif\n-\treturn _enesim_init_count;\n+\tgoto done;\n \n shutdown_eina_threads:\n \teina_threads_shutdown();\n@@ -214,7 +224,9 @@\n #ifdef HAVE_EVIL\n \tevil_shutdown();\n #endif\n-\treturn --_enesim_init_count;\n+done:\n+\t_initializing = EINA_FALSE;\n+\treturn _enesim_init_count;\n }\n \n \/**\n@@ -232,8 +244,12 @@\n *\/\n EAPI int enesim_shutdown(void)\n {\n+\tif (_deinitializing)\n+\t\treturn _enesim_init_count;\n+\n+\t_deinitializing = EINA_TRUE;\n \tif (--_enesim_init_count != 0)\n-\t\treturn _enesim_init_count;\n+\t\tgoto done;\n \n \tenesim_text_shutdown();\n \tenesim_image_shutdown();\n@@ -248,7 +264,8 @@\n #ifdef HAVE_EVIL\n \tevil_shutdown();\n #endif\n-\n+done:\n+\t_deinitializing = EINA_FALSE;\n \treturn _enesim_init_count;\n }\n \n"} {"commit":"35473319764393f88c010f7b07f64a886f612517","subject":"Compiling fix for non-gcc.","message":"Compiling fix for non-gcc.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/istream-tee.c\n+++ src\/lib\/istream-tee.c\n@@ -99,7 +99,7 @@\n {\n \tstruct tee_child_istream *tstream = (struct tee_child_istream *)stream;\n \n-\treturn i_stream_set_max_buffer_size(tstream->tee->input, max_size);\n+\ti_stream_set_max_buffer_size(tstream->tee->input, max_size);\n }\n \n static ssize_t i_stream_tee_read(struct istream_private *stream)\n@@ -169,7 +169,7 @@\n \t\ti_panic(\"tee-istream: i_stream_sync() called \"\n \t\t\t\"with data still buffered\");\n \t}\n-\treturn i_stream_sync(tstream->tee->input);\n+\ti_stream_sync(tstream->tee->input);\n }\n \n struct tee_istream *tee_i_stream_create(struct istream *input)\n"} {"commit":"29f380a6e404a69aa87e4e29f333440c8431ab4d","subject":"Remove special case handling for minimising FSM with no end states.","message":"Remove special case handling for minimising FSM with no end states.\n\nThis is now handled by `fsm_reverse()` and `fsm_determinise()` directly (which produce an FSM with a single state that does not accept), and so there's no longer a special case here.\n","repos":"katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm,katef\/libfsm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/libfsm\/minimise.c\n+++ src\/libfsm\/minimise.c\n@@ -104,22 +104,8 @@\n fsm_minimise(struct fsm *fsm)\n {\n \tint r;\n-\tint hasend;\n \n \tassert(fsm != NULL);\n-\n-\t\/*\n-\t * This is a special case to account for FSMs with no end state; end states\n-\t * become start states during reversal. If no end state is present, a start\n-\t * state is neccessarily invented. That'll become an end state again after\n-\t * the second reversal, and then merged out to all states during conversion\n-\t * to a DFA.\n-\t *\n-\t * The net effect of that is that for an FSM with no end states, every\n-\t * state would be marked an end state after minimization. Here the absence\n-\t * of an end state is recorded, so that those markings may be removed.\n-\t *\/\n-\thasend = fsm_has(fsm, fsm_isend);\n \n \t\/*\n \t * Brzozowski's algorithm.\n@@ -143,14 +129,6 @@\n \t\tr = fsm_determinise(fsm);\n \t\tif (!r) {\n \t\t\treturn 0;\n-\t\t}\n-\t}\n-\n-\tif (!hasend) {\n-\t\tstruct fsm_state *s;\n-\n-\t\tfor (s = fsm->sl; s; s = s->next) {\n-\t\t\tfsm_setend(fsm, s, 0);\n \t\t}\n \t}\n \n"} {"commit":"592fe0af8aa7869a360cbe660fc27199d9ff51f4","subject":"Blank data on blocks with read errors","message":"Blank data on blocks with read errors\n","repos":"accre\/lstore,tacketar\/lstore,tacketar\/lstore,PerilousApricot\/lstore,PerilousApricot\/lstore,tacketar\/lstore,accre\/lstore,tacketar\/lstore,PerilousApricot\/lstore,accre\/lstore,PerilousApricot\/lstore,accre\/lstore","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lio\/segment_lun.c\n+++ src\/lio\/segment_lun.c\n@@ -1421,6 +1421,7 @@\n if (rwb_table[j+i].n_ex > 0) {\n if (gop_completed_successfully(rwb_table[j+i].gop) != OP_STATE_SUCCESS) { \/\/** Error\n nerr++; \/\/** Increment the error count\n+ if (rw_mode == 0) tbuffer_memset(&(rwb_table[j+i].buffer), 0, 0, rwb_table[j+i].len); \/\/** Blank the data on READs\n }\n \n free(rwb_table[j+i].ex_iov);\n"} {"commit":"7892f3f1bc9004eeb8acb81f5ef04c5f00fc8767","subject":"Changed JPEG stub names to fix crash in virtualbox","message":"Changed JPEG stub names to fix crash in virtualbox\n\ngit-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@3447 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"epam\/gpac,rbouqueau\/gpac,DmitrySigaev\/gpac,DmitrySigaev\/gpac,gpac\/gpac,rbouqueau\/gpac_brew_travis,gpac\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,ARSekkat\/gpac,rbouqueau\/gpac_brew_travis,gpac\/gpac,rauf\/gpac,ARSekkat\/gpac,rauf\/gpac,epam\/gpac,gpac\/gpac,Bevara\/Access-open,Bevara\/Access-open,gpac\/gpac,canatella\/gpac,rbouqueau\/gpac_brew_travis,epam\/gpac,canatella\/gpac,ARSekkat\/gpac,canatella\/gpac,emmanouil\/gpac,porcelijn\/gpac,ARSekkat\/gpac,Bevara\/Access-open,rbouqueau\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,psteinb\/gpac,Bevara\/Access-open,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,porcelijn\/gpac,vladimir-kazakov\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,DmitrySigaev\/gpac,rauf\/gpac,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac,nguyen-viet-thanh-trung\/gpac,drakeguan\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac,psteinb\/gpac,rbouqueau\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,RodolpheFouquet\/gpac,epam\/gpac,DmitrySigaev\/gpac,vladimir-kazakov\/gpac,emmanouil\/gpac,vladimir-kazakov\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,nguyen-viet-thanh-trung\/gpac,porcelijn\/gpac,Bevara\/Access-open,epam\/gpac,canatella\/gpac,emmanouil\/gpac,canatella\/gpac,Bevara\/Access-open,psteinb\/gpac,drakeguan\/gpac,DmitrySigaev\/gpac,psteinb\/gpac,emmanouil\/gpac,drakeguan\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,rauf\/gpac,ARSekkat\/gpac,psteinb\/gpac,drakeguan\/gpac,porcelijn\/gpac,emmanouil\/gpac,aymanelyaagoubi\/gpac,epam\/gpac,nguyen-viet-thanh-trung\/gpac,vladimir-kazakov\/gpac,vladimir-kazakov\/gpac,DmitrySigaev\/gpac,rauf\/gpac,aymanelyaagoubi\/gpac,drakeguan\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac,vladimir-kazakov\/gpac,drakeguan\/gpac,RodolpheFouquet\/gpac,emmanouil\/gpac,rauf\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac_brew_travis,psteinb\/gpac,aymanelyaagoubi\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/img.c\n+++ src\/media_tools\/img.c\n@@ -265,7 +265,6 @@\n \tJPGErr jper;\n \tJPGCtx jpx;\n \n-#if 1\n \tjpx.cinfo.err = jpeg_std_error(&(jper.pub));\n \tjper.pub.error_exit = gf_jpeg_fatal_error;\n \tjper.pub.output_message = gf_jpeg_output_message;\n@@ -373,7 +372,6 @@\n \tjpeg_destroy_decompress(&jpx.cinfo);\n \n \tgf_free(scan_line);\n-#endif\n \n \treturn GF_OK;\n }\n@@ -397,7 +395,7 @@\n \tu32 size;\n } GFpng;\n \n-static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)\n+static void gf_png_user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)\n {\n \tGFpng *ctx = (GFpng*)png_get_io_ptr(png_ptr);\n \n@@ -408,7 +406,7 @@\n \t\tctx->pos += length;\n \t}\n }\n-static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)\n+static void gf_png_user_error_fn(png_structp png_ptr,png_const_charp error_msg)\n {\n \tlongjmp(png_jmpbuf(png_ptr), 1);\n }\n@@ -473,8 +471,8 @@\n \t\tpng_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);\n \t\treturn GF_IO_ERR;\n \t}\n- png_set_read_fn(png_ptr, &udta, (png_rw_ptr) user_read_data);\n-\tpng_set_error_fn(png_ptr, &udta, (png_error_ptr) user_error_fn, NULL);\n+\tpng_set_read_fn(png_ptr, &udta, (png_rw_ptr) gf_png_user_read_data);\n+\tpng_set_error_fn(png_ptr, &udta, (png_error_ptr) gf_png_user_error_fn, NULL);\n \n \tpng_read_info(png_ptr, info_ptr);\n \n@@ -538,13 +536,13 @@\n }\n \n \n-void my_png_write(png_structp png, png_bytep data, png_size_t size)\n+void gf_png_write(png_structp png, png_bytep data, png_size_t size)\n {\n \tGFpng *p = (GFpng *)png_get_io_ptr(png);\n \tmemcpy(p->buffer+p->pos, data, sizeof(char)*size);\n \tp->pos += size;\n }\n-void my_png_flush(png_structp png)\n+void gf_png_flush(png_structp png)\n {\n }\n \n@@ -610,7 +608,7 @@\n \n \tudta.buffer = dst;\n \tudta.pos = 0;\n-\tpng_set_write_fn(png_ptr, &udta, my_png_write, my_png_flush);\n+\tpng_set_write_fn(png_ptr, &udta, gf_png_write, gf_png_flush);\n \n \tpng_set_IHDR(png_ptr, info_ptr, width, height, 8, type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);\n \n"} {"commit":"31781d9834f3a89bd48e842a6626bba23d0038ab","subject":"gf_mpd_resolve_url(): last segment duration can be shorter","message":"gf_mpd_resolve_url(): last segment duration can be shorter\n","repos":"gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,porcelijn\/gpac,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,porcelijn\/gpac,porcelijn\/gpac,porcelijn\/gpac,porcelijn\/gpac,gpac\/gpac,ARSekkat\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,ARSekkat\/gpac,aymanelyaagoubi\/gpac,ARSekkat\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/mpd.c\n+++ src\/media_tools\/mpd.c\n@@ -2644,7 +2644,7 @@\n \t\t\t}\n \n \t\t\t\/*check total duration*\/\n-\t\t\tif ((start_number + item_index) * *segment_duration_in_ms > period->duration) {\n+\t\t\tif ((s64)(start_number + item_index - 1) * *segment_duration_in_ms > period->duration) {\n \t\t\t\tsecond_sep[0] = '$';\n \t\t\t\t\/*look for next keyword - copy over remaining text if any*\/\n \t\t\t\tfirst_sep = strchr(second_sep + 1, '$');\n@@ -2685,6 +2685,13 @@\n \t\t\t\t\t\t\tstart_time += ent->duration * (1 + ent->repeat_count);\n \t\t\t\t\t\t\tcontinue;\n \t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\tsecond_sep[0] = '$';\n+\t\t\t\t\t\t\t\/*look for next keyword - copy over remaining text if any*\/\n+\t\t\t\t\t\t\tfirst_sep = strchr(second_sep + 1, '$');\n+\t\t\t\t\t\t\tif (first_sep) first_sep[0] = 0;\n+\t\t\t\t\t\t\tif (strlen(second_sep + 1))\n+\t\t\t\t\t\t\t\tstrcat(solved_template, second_sep + 1);\n+\t\t\t\t\t\t\tif (first_sep) first_sep[0] = '$';\n \t\t\t\t\t\t\tgf_free(url);\n \t\t\t\t\t\t\tgf_free(solved_template);\n \t\t\t\t\t\t\treturn GF_EOS;\n"} {"commit":"1045481dd96dec6e37f4b623b1dbae8af381de75","subject":"mesa: fix loop over generic attribs in update_arrays()","message":"mesa: fix loop over generic attribs in update_arrays()\n","repos":"jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/state.c\n+++ src\/mesa\/main\/state.c\n@@ -159,7 +159,7 @@\n \n \/* 16..31 *\/\n if (ctx->VertexProgram._Current) {\n- for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {\n+ for (i = 0; i < Elements(ctx->Array.ArrayObj->VertexAttrib); i++) {\n if (ctx->Array.ArrayObj->VertexAttrib[i].Enabled) {\n min = MIN2(min, ctx->Array.ArrayObj->VertexAttrib[i]._MaxElement);\n }\n"} {"commit":"d499fea35e0c88e75dbaf5e0e072fdbc8f88febe","subject":"Move the initial part of basic auth processing","message":"Move the initial part of basic auth processing\n\nConsolidate and simplify AUTH BASIC Handling - Part 1.\n\nBy moving all the special operation one for auth basic into its own\nsegment we make the code simpler (less exceptions) and more readable.\n\nSigned-off-by: Simo Sorce <65f99581a93cf30dafc32b5c178edc6b0294a07f@redhat.com>\n","repos":"frenche\/mod_auth_gssapi,uhd-urz\/mod_auth_gssapi,uhd-urz\/mod_auth_gssapi,davisd123\/mod_auth_gssapi,frenche\/mod_auth_gssapi,davisd123\/mod_auth_gssapi,davisd123\/mod_auth_gssapi,frenche\/mod_auth_gssapi,devurandom\/mod_auth_gssapi,frenche\/mod_auth_gssapi,uhd-urz\/mod_auth_gssapi,devurandom\/mod_auth_gssapi,devurandom\/mod_auth_gssapi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mod_auth_gssapi.c\n+++ src\/mod_auth_gssapi.c\n@@ -469,13 +469,6 @@\n }\n }\n \n- if (mc && mc->established && auth_type != AUTH_TYPE_BASIC) {\n- \/* if we are re-authenticating make sure the conn context\n- * is cleaned up so we do not accidentally reuse an existing\n- * established context *\/\n- mag_conn_clear(mc);\n- }\n-\n switch (auth_type) {\n case AUTH_TYPE_NEGOTIATE:\n if (!parse_auth_header(req->pool, &auth_header, &input)) {\n@@ -501,18 +494,55 @@\n ba_user.length = strlen(ba_user.value);\n ba_pwd.length = strlen(ba_pwd.value);\n \n- if (mc && mc->established) {\n- if (mag_basic_check(cfg, mc, ba_user, ba_pwd)) {\n- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,\n- \"Already established BASIC AUTH context found!\");\n- mag_set_req_data(req, cfg, mc);\n- ret = OK;\n- goto done;\n- } else {\n- mag_conn_clear(mc);\n- }\n- }\n-\n+ if (mc && mc->established &&\n+ mag_basic_check(cfg, mc, ba_user, ba_pwd)) {\n+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,\n+ \"Already established BASIC AUTH context found!\");\n+ mag_set_req_data(req, cfg, mc);\n+ ret = OK;\n+ goto done;\n+ }\n+\n+ break;\n+\n+ case AUTH_TYPE_RAW_NTLM:\n+ if (!is_mech_allowed(cfg, &gss_mech_ntlmssp)) {\n+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,\n+ \"NTLM Authentication is not allowed!\");\n+ goto done;\n+ }\n+\n+ if (!parse_auth_header(req->pool, &auth_header, &input)) {\n+ goto done;\n+ }\n+\n+ desired_mechs = discard_const(&gss_mech_set_ntlmssp);\n+ break;\n+\n+ default:\n+ goto done;\n+ }\n+\n+ if (mc && mc->established) {\n+ \/* if we are re-authenticating make sure the conn context\n+ * is cleaned up so we do not accidentally reuse an existing\n+ * established context *\/\n+ mag_conn_clear(mc);\n+ }\n+\n+ req->ap_auth_type = apr_pstrdup(req->pool, auth_types[auth_type]);\n+\n+#ifdef HAVE_CRED_STORE\n+ if (cfg->use_s4u2proxy) {\n+ cred_usage = GSS_C_BOTH;\n+ }\n+#endif\n+ if (!mag_acquire_creds(req, cfg, desired_mechs,\n+ cred_usage, &acquired_cred, NULL)) {\n+ goto done;\n+ }\n+\n+ if (auth_type == AUTH_TYPE_BASIC) {\n maj = gss_import_name(&min, &ba_user, GSS_C_NT_USER_NAME, &client);\n if (GSS_ERROR(maj)) {\n ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, req,\n@@ -556,39 +586,7 @@\n goto done;\n }\n gss_release_name(&min, &client);\n- break;\n-\n- case AUTH_TYPE_RAW_NTLM:\n- if (!is_mech_allowed(cfg, &gss_mech_ntlmssp)) {\n- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, req,\n- \"NTLM Authentication is not allowed!\");\n- goto done;\n- }\n-\n- if (!parse_auth_header(req->pool, &auth_header, &input)) {\n- goto done;\n- }\n-\n- desired_mechs = discard_const(&gss_mech_set_ntlmssp);\n- break;\n-\n- default:\n- goto done;\n- }\n-\n- req->ap_auth_type = apr_pstrdup(req->pool, auth_types[auth_type]);\n-\n-#ifdef HAVE_CRED_STORE\n- if (cfg->use_s4u2proxy) {\n- cred_usage = GSS_C_BOTH;\n- }\n-#endif\n- if (!mag_acquire_creds(req, cfg, desired_mechs,\n- cred_usage, &acquired_cred, NULL)) {\n- goto done;\n- }\n-\n- if (auth_type == AUTH_TYPE_BASIC) {\n+\n if (cred_usage == GSS_C_BOTH) {\n \/* If GSS_C_BOTH is used then inquire_cred will return the client\n * name instead of the SPN of the server credentials. Therefore we\n"} {"commit":"ed6d31c3ba6ee7d36b5296c1a90864954e3b8ed0","subject":"[filestorage] manage empty content","message":"[filestorage] manage empty content\n","repos":"ouistiti-project\/ouistiti,ouistiti-project\/ouistiti,ouistiti-project\/ouistiti,ouistiti-project\/ouistiti,ouistiti-project\/ouistiti,ouistiti-project\/ouistiti","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mod_filestorage.c\n+++ src\/mod_filestorage.c\n@@ -191,8 +191,9 @@\n \t\t\t\tinputlen -= wret;\n \t\t\t\tinput += wret;\n \t\t\t}\n+\t\t}\n+\t\tif (inputlen == 0)\n \t\t\tret = EINCOMPLETE;\n-\t\t}\n \t\tif (rest < 1)\n \t\t{\n #ifdef DEBUG\n"} {"commit":"4cfa1501aaf3bc6cea964986848687708439a567","subject":"monitor: Start working on the basic detection routine","message":"monitor: Start working on the basic detection routine\n\nSigned-off-by: Ikey Doherty <d8d992cf0016e35c2a8339d5e7d44bebd12a2d77@solus-project.com>\n","repos":"solus-project\/linux-driver-management,solus-project\/linux-driver-management","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/monitor\/monitor.c\n+++ src\/monitor\/monitor.c\n@@ -19,6 +19,7 @@\n static void ldm_daemon_device_added(LdmDaemon *daemon, LdmDevice *device, gpointer v);\n static void ldm_daemon_device_removed(LdmDaemon *daemon, const gchar *path, gpointer v);\n static void ldm_daemon_discover_gpu(LdmDaemon *daemon);\n+static void ldm_daemon_discover_drivers(LdmDaemon *daemon, LdmDevice *device);\n \n struct _LdmDaemonClass {\n GObjectClass parent_class;\n@@ -125,6 +126,9 @@\n ldm_device_get_vendor(device),\n ldm_device_get_name(device));\n \n+ \/* Just check for drivers for now *\/\n+ ldm_daemon_discover_drivers(self, device);\n+\n \/* Simple Optimus detection *\/\n if (ldm_gpu_config_has_type(gpu_config, LDM_GPU_TYPE_OPTIMUS)) {\n g_message(\"Optimus gpu\");\n@@ -132,6 +136,29 @@\n g_message(\"Primary GPU in Optimus config: %s %s\",\n ldm_device_get_vendor(device),\n ldm_device_get_name(device));\n+ }\n+}\n+\n+\/**\n+ * Attempt to discover all providers for the given device.\n+ *\/\n+static void ldm_daemon_discover_drivers(LdmDaemon *self, LdmDevice *device)\n+{\n+ g_autoptr(GPtrArray) providers = NULL;\n+\n+ providers = ldm_manager_get_providers(self->manager, device);\n+ if (!providers || providers->len == 0) {\n+ g_message(\"No providers for: %s\", ldm_device_get_name(device));\n+ return;\n+ }\n+\n+ g_message(\"Found %d provider(s) for %s\", providers->len, ldm_device_get_name(device));\n+ g_message(\"Device modalias: %s\", ldm_device_get_modalias(device));\n+\n+ for (unsigned int i = 0; i < providers->len; i++) {\n+ LdmProvider *prov = providers->pdata[i];\n+ LdmPlugin *plugin = ldm_provider_get_plugin(prov);\n+ g_message(\"Provider plugin: %s\", ldm_plugin_get_name(plugin));\n }\n }\n \n"} {"commit":"db6ce15522520add5e52ffb1a6acb25aa2eaff0b","subject":"revert.","message":"revert.\n","repos":"LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/network\/Manager.c\n+++ src\/network\/Manager.c\n@@ -331,19 +331,13 @@\n for (i = 0; i < serv->worker_num; i++)\n {\n \/\/compare PID\n- if (pid != reload_workers[i].pid)\n+ if (pid != serv->workers[i].pid)\n {\n continue;\n }\n \n \/\/Check the process return code and signal\n swManager_check_exit_status(serv, i, pid, status);\n-\n- \/\/no need to create a new process when enable reload_async\n- if (serv->reload_async)\n- {\n- break;\n- }\n \n pid = 0;\n while (1)\n@@ -370,7 +364,7 @@\n if (exit_worker != NULL)\n {\n swManager_check_exit_status(serv, exit_worker->id, pid, status);\n- if (exit_worker->deleted == 1) \/\/\u4e3b\u52a8\u56de\u6536\u4e0d\u91cd\u542f\n+ if (exit_worker->deleted == 1)\n {\n exit_worker->deleted = 0;\n }\n"} {"commit":"40e7d4566ef608305b09d76ad656e00c5a5e52ae","subject":"core: add a new_request hook to allow plugins to modify or translate incoming request before it has been processed.","message":"core: add a new_request hook to allow plugins to modify or translate\nincoming request before it has been processed.\n","repos":"jusa\/ngfd,android-808\/ngfd,jusa\/ngfd,jusa\/ngfd,android-808\/ngfd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/ngf\/core-player.c\n+++ src\/ngf\/core-player.c\n@@ -185,6 +185,12 @@\n NCoreHookTransformPropertiesData transform_data;\n NCoreHookFilterSinksData filter_sinks_data;\n \n+ \/* execute the new request hook. this may translate the request to other or\n+ change properties. *\/\n+\n+ new_request.request = request;\n+ n_core_fire_hook (core, N_CORE_HOOK_NEW_REQUEST, &new_request);\n+\n \/* create and store play data for request. *\/\n \n play_data = g_slice_new0 (NPlayData);\n"} {"commit":"1d9f4f3dd8a6e506bc3c93d49879bd7ab8a01aa0","subject":"lowest\/highest -> smallest\/largest value of interest","message":"lowest\/highest -> smallest\/largest value of interest\n","repos":"oaelhara\/numbbo,dtusar\/coco,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,dtusar\/coco,oaelhara\/numbbo,oaelhara\/numbbo,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,NDManh\/numbbo,NDManh\/numbbo,dtusar\/coco,dtusar\/coco,oaelhara\/numbbo,dtusar\/coco,oaelhara\/numbbo,oaelhara\/numbbo,NDManh\/numbbo,dtusar\/coco,NDManh\/numbbo","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/numbbo_generics.c\n+++ src\/numbbo_generics.c\n@@ -67,13 +67,13 @@\n return self->number_of_parameters;\n }\n \n-const double * numbbo_get_lowest_values_of_interest(const numbbo_problem_t *self) {\n+const double * numbbo_get_smallest_values_of_interest(const numbbo_problem_t *self) {\n assert(self != NULL);\n assert(self->problem_id != NULL);\n return self->lower_bounds;\n }\n \n-const double * numbbo_get_highest_values_of_interest(const numbbo_problem_t *self) {\n+const double * numbbo_get_largest_values_of_interest(const numbbo_problem_t *self) {\n assert(self != NULL);\n assert(self->problem_id != NULL);\n return self->upper_bounds;\n"} {"commit":"1fe3f529090cb10080959ca15247caaf4d8f493e","subject":"Small fix so that nvfx_state can be included in C++ program.","message":"Small fix so that nvfx_state can be included in C++ program.\n","repos":"gzorin\/RSXGL,gzorin\/RSXGL,gzorin\/RSXGL,gzorin\/RSXGL,gzorin\/RSXGL","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/nvfx\/nvfx_state.h\n+++ src\/nvfx\/nvfx_state.h\n@@ -35,7 +35,11 @@\n \tunsigned data_start_min;\n \n \tuint32_t ir;\n+#if defined(__cplusplus)\n+ uint32_t _or;\n+#else\n \tuint32_t or;\n+#endif\n \tint clip_nr;\n \n \tstruct util_dynarray branch_relocs;\n@@ -71,7 +75,11 @@\n struct nvfx_fragment_program {\n \tunsigned samplers;\n \tunsigned point_sprite_control;\n+#if defined(__cplusplus)\n+ unsigned _or;\n+#else\n \tunsigned or;\n+#endif\n \tunsigned coord_conventions;\n \n \tuint32_t *insn;\n"} {"commit":"b4eea415929c0524e0e24473a73b1f0c306c6bab","subject":"VFS-7047 Increased default storage timeout","message":"VFS-7047 Increased default storage timeout\n","repos":"onedata\/oneclient,onedata\/oneclient,onedata\/oneclient,onedata\/oneclient","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/options\/options.h\n+++ src\/options\/options.h\n@@ -56,7 +56,7 @@\n static constexpr auto DEFAULT_READDIR_PREFETCH_SIZE = 2500;\n static constexpr auto DEFAULT_DIR_CACHE_DROP_AFTER = 5 * 60;\n static constexpr auto DEFAULT_PROVIDER_TIMEOUT = 2 * 60;\n-static constexpr auto DEFAULT_STORAGE_TIMEOUT = 30;\n+static constexpr auto DEFAULT_STORAGE_TIMEOUT = 2 * 60;\n static constexpr auto DEFAULT_MONITORING_PERIOD_SECONDS = 30;\n #if defined(__APPLE__)\n static constexpr auto DEFAULT_EMULATE_AVAILABLE_SPACE =\n"} {"commit":"343c7d15c831a3c3d8a6984c1a1b524b414012df","subject":"Use vmulq_n_u32(..., 0x01010101) to distribute alphas.","message":"Use vmulq_n_u32(..., 0x01010101) to distribute alphas.\n\nThis seems to make alphas() faster and Load[24]Alphas() no slower.\nThe change is particularly noticeable on xfermodes that call alphas()\ntwice (on src and dst), with a 10-12% speedup.\n\nXfermode_Difference_aa\t 29ms -> 28.4ms\t0.98x\n Xfermode_DstATop_aa\t27.2ms -> 26.7ms\t0.98x\n Xfermode_Xor_aa\t27.2ms -> 26.5ms\t0.98x\n Xfermode_DstOver\t23.6ms -> 22.9ms\t0.97x\n Xfermode_DstOver_aa\t27.8ms -> 26.8ms\t0.96x\n Xfermode_DstOut\t22.6ms -> 21.7ms\t0.96x\n Xfermode_Multiply_aa\t 30ms -> 28.5ms\t0.95x\n Xfermode_DstOut_aa\t26.1ms -> 24.8ms\t0.95x\n Xfermode_DstIn_aa\t25.4ms -> 24.1ms\t0.95x\n Xfermode_DstATop\t28.7ms -> 26ms\t0.9x\n Xfermode_Multiply\t35.5ms -> 31.3ms\t0.88x\n Xfermode_Difference\t31.8ms -> 27.7ms\t0.87x\n Xfermode_Xor\t30.1ms -> 26.1ms\t0.87x\nBUG=skia:\n\nReview URL: https:\/\/codereview.chromium.org\/1203513002\n","repos":"nvoron23\/skia,Jichao\/skia,noselhq\/skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,vanish87\/skia,rubenvb\/skia,pcwalton\/skia,tmpvar\/skia.cc,shahrzadmn\/skia,Jichao\/skia,todotodoo\/skia,shahrzadmn\/skia,Jichao\/skia,todotodoo\/skia,Jichao\/skia,vanish87\/skia,rubenvb\/skia,shahrzadmn\/skia,rubenvb\/skia,vanish87\/skia,aosp-mirror\/platform_external_skia,vanish87\/skia,HalCanary\/skia-hc,shahrzadmn\/skia,shahrzadmn\/skia,shahrzadmn\/skia,nvoron23\/skia,google\/skia,ominux\/skia,ominux\/skia,tmpvar\/skia.cc,qrealka\/skia-hc,tmpvar\/skia.cc,ominux\/skia,HalCanary\/skia-hc,qrealka\/skia-hc,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,pcwalton\/skia,aosp-mirror\/platform_external_skia,google\/skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,tmpvar\/skia.cc,pcwalton\/skia,rubenvb\/skia,HalCanary\/skia-hc,google\/skia,ominux\/skia,todotodoo\/skia,tmpvar\/skia.cc,Hikari-no-Tenshi\/android_external_skia,noselhq\/skia,aosp-mirror\/platform_external_skia,pcwalton\/skia,pcwalton\/skia,Hikari-no-Tenshi\/android_external_skia,Jichao\/skia,Jichao\/skia,todotodoo\/skia,pcwalton\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,noselhq\/skia,pcwalton\/skia,vanish87\/skia,nvoron23\/skia,todotodoo\/skia,rubenvb\/skia,qrealka\/skia-hc,qrealka\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,HalCanary\/skia-hc,pcwalton\/skia,aosp-mirror\/platform_external_skia,noselhq\/skia,tmpvar\/skia.cc,rubenvb\/skia,ominux\/skia,nvoron23\/skia,pcwalton\/skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,tmpvar\/skia.cc,Jichao\/skia,nvoron23\/skia,google\/skia,google\/skia,Jichao\/skia,HalCanary\/skia-hc,qrealka\/skia-hc,ominux\/skia,shahrzadmn\/skia,qrealka\/skia-hc,vanish87\/skia,HalCanary\/skia-hc,noselhq\/skia,aosp-mirror\/platform_external_skia,todotodoo\/skia,nvoron23\/skia,google\/skia,HalCanary\/skia-hc,rubenvb\/skia,shahrzadmn\/skia,nvoron23\/skia,google\/skia,todotodoo\/skia,ominux\/skia,nvoron23\/skia,ominux\/skia,Jichao\/skia,tmpvar\/skia.cc,noselhq\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,todotodoo\/skia,nvoron23\/skia,vanish87\/skia,vanish87\/skia,noselhq\/skia,vanish87\/skia,qrealka\/skia-hc,shahrzadmn\/skia,todotodoo\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,noselhq\/skia,noselhq\/skia,google\/skia,HalCanary\/skia-hc,tmpvar\/skia.cc,qrealka\/skia-hc,ominux\/skia,HalCanary\/skia-hc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/opts\/Sk4px_NEON.h\n+++ src\/opts\/Sk4px_NEON.h\n@@ -52,33 +52,26 @@\n }\n \n inline Sk4px Sk4px::alphas() const {\n- static_assert(SK_A32_SHIFT == 24, \"This method assumes little-endian.\");\n- auto as = vshrq_n_u32((uint32x4_t)this->fVec, 24); \/\/ ___3 ___2 ___1 ___0\n- as = vorrq_u32(as, vshlq_n_u32(as, 8)); \/\/ __33 __22 __11 __11\n- as = vorrq_u32(as, vshlq_n_u32(as, 16)); \/\/ 3333 2222 1111 1111\n- return Sk16b((uint8x16_t)as);\n+ auto as = vshrq_n_u32((uint32x4_t)fVec, SK_A32_SHIFT); \/\/ ___3 ___2 ___1 ___0\n+ return Sk16b((uint8x16_t)vmulq_n_u32(as, 0x01010101)); \/\/ 3333 2222 1111 0000\n }\n \n inline Sk4px Sk4px::Load4Alphas(const SkAlpha a[4]) {\n- uint8x16_t a8 = vdupq_n_u8(0); \/\/ ____ ____ ____ ____\n- a8 = vld1q_lane_u8(a+0, a8, 0); \/\/ ____ ____ ____ ___0\n- a8 = vld1q_lane_u8(a+1, a8, 4); \/\/ ____ ____ ___1 ___0\n- a8 = vld1q_lane_u8(a+2, a8, 8); \/\/ ____ ___2 ___1 ___0\n- a8 = vld1q_lane_u8(a+3, a8, 12); \/\/ ___3 ___2 ___1 ___0\n- auto a32 = (uint32x4_t)a8; \/\/\n- a32 = vorrq_u32(a32, vshlq_n_u32(a32, 8)); \/\/ __33 __22 __11 __00\n- a32 = vorrq_u32(a32, vshlq_n_u32(a32, 16)); \/\/ 3333 2222 1111 0000\n- return Sk16b((uint8x16_t)a32);\n+ uint8x16_t a8 = vdupq_n_u8(0); \/\/ ____ ____ ____ ____\n+ a8 = vld1q_lane_u8(a+0, a8, 0); \/\/ ____ ____ ____ ___0\n+ a8 = vld1q_lane_u8(a+1, a8, 4); \/\/ ____ ____ ___1 ___0\n+ a8 = vld1q_lane_u8(a+2, a8, 8); \/\/ ____ ___2 ___1 ___0\n+ a8 = vld1q_lane_u8(a+3, a8, 12); \/\/ ___3 ___2 ___1 ___0\n+ auto a32 = (uint32x4_t)a8; \/\/\n+ return Sk16b((uint8x16_t)vmulq_n_u32(a32, 0x01010101)); \/\/ 3333 2222 1111 0000\n }\n \n inline Sk4px Sk4px::Load2Alphas(const SkAlpha a[2]) {\n- uint8x16_t a8 = vdupq_n_u8(0); \/\/ ____ ____ ____ ____\n- a8 = vld1q_lane_u8(a+0, a8, 0); \/\/ ____ ____ ____ ___0\n- a8 = vld1q_lane_u8(a+1, a8, 4); \/\/ ____ ____ ___1 ___0\n- auto a32 = (uint32x4_t)a8; \/\/\n- a32 = vorrq_u32(a32, vshlq_n_u32(a32, 8)); \/\/ ____ ____ __11 __00\n- a32 = vorrq_u32(a32, vshlq_n_u32(a32, 16)); \/\/ ____ ____ 1111 0000\n- return Sk16b((uint8x16_t)a32);\n+ uint8x16_t a8 = vdupq_n_u8(0); \/\/ ____ ____ ____ ____\n+ a8 = vld1q_lane_u8(a+0, a8, 0); \/\/ ____ ____ ____ ___0\n+ a8 = vld1q_lane_u8(a+1, a8, 4); \/\/ ____ ____ ___1 ___0\n+ auto a32 = (uint32x4_t)a8; \/\/\n+ return Sk16b((uint8x16_t)vmulq_n_u32(a32, 0x01010101)); \/\/ ____ ____ 1111 0000\n }\n \n inline Sk4px Sk4px::zeroColors() const {\n"} {"commit":"ee091333557160d413d9088c077717bef13379ff","subject":"Added documentation for PIDMotor","message":"Added documentation for PIDMotor\n","repos":"Sourec\/ADBLib,Dreadbot\/ADBLib,Dreadbot\/ADBLib,Sourec\/ADBLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/output\/PIDMotor.h\n+++ src\/output\/PIDMotor.h\n@@ -15,29 +15,29 @@\n \t\t~PIDMotor();\n \n \t\t\/\/SimpleMotor overrides\n-\t\tvoid set(float value);\n-\t\tvoid setPWMMotor(Talon* motor);\n-\t\tvoid setCANMotor(CANTalon* motor);\n+\t\tvoid set(float value); \/\/!< PID-enabled set function. Does NOT work without PID stuff being properly set up!\n+\t\tvoid setPWMMotor(Talon* motor); \/\/!< Sets this PIDMotor's output as a non-CAN talon.\n+\t\tvoid setCANMotor(CANTalon* motor); \/\/!< Sets this PIDMotor's output as a CAN talon.\n \n \t\t\/\/Useful PID things from the PIDController class\n-\t\tfloat getError();\n-\t\tbool isOnTarget();\n-\t\tvoid setAbsToler(float tolerance);\n-\t\tvoid setContinuous(bool newCont);\n-\t\tvoid setInputRange(float newMax, float newMin);\n-\t\tvoid setOutputRange(float newMax, float newMin);\n-\t\tvoid setPercentTolerance(float newPToler);\n+\t\tfloat getError(); \/\/!< Returns the current error.\n+\t\tbool isOnTarget(); \/\/!< Is the motor on target?\n+\t\tvoid setAbsToler(float tolerance); \/\/!< Sets the absolute value tolerance.\n+\t\tvoid setContinuous(bool newCont); \/\/!< Sets whether this PID motor is continuous or no. See documentation for PIDController in WPILib\n+\t\tvoid setInputRange(float newMax, float newMin); \/\/!< Sets the input range expected from the sensor.\n+\t\tvoid setOutputRange(float newMax, float newMin); \/\/!< Sets the output range that the output expects\n+\t\tvoid setPercentTolerance(float newPToler); \/\/!< Sets the percent tolerance of the PID controller..\n \n \t\t\/\/PIDMotor-specific stuff\n-\t\tvoid setK(double newVal, PIDK slot);\n-\t\tvoid setPID(double newP, double newI, double newD);\n-\t\tvoid setPeriod(float newPeriod);\n-\t\tvoid setSource(PIDSource* newSource);\n+\t\tvoid setK(double newVal, PIDK slot); \/\/!< Sets a PID constant.\n+\t\tvoid setPID(double newP, double newI, double newD); \/\/!< Sets ALL the PID constants!\n+\t\tvoid setPeriod(float newPeriod); \/\/!< Sets the update period (?)\n+\t\tvoid setSource(PIDSource* newSource); \/\/!< Sets the PID input source. This should be a sensor.\n \n-\t\tdouble getK(PIDK slot);\n-\t\tfloat getPeriod();\n+\t\tdouble getK(PIDK slot); \/\/!< Gets a PID constant.\n+\t\tfloat getPeriod(); \/\/!< Gets the sensor update period.\n \tprotected:\n-\t\tvoid setupCtrl();\n+\t\tvoid setupCtrl(); \/\/!< Internal function; creates a new PID since the only way to set a bunch of stuff is through the constructor for PIDController\n \n \t\tPIDController* pidctrl;\n \t\tdouble PIDValues[3];\n"} {"commit":"bf55fed72900416bab8072b8c424f20e7f74305d","subject":"plugins\/asf: Add codec support","message":"plugins\/asf: Add codec support\n\nASF as other containers may contain streams encoded in several other\ncodecs. Maybe we should have a global list\/hash-table with all the\npossible { ID: name }? Meanwhile, put the more important codecs there\nfor this specific format.\n","repos":"profusion\/lightmediascanner,Pelagicore\/Media-Manager-lightmediascanner-patched,Pelagicore\/Media-Manager-lightmediascanner-patched,Pelagicore\/Media-Manager-lightmediascanner-patched,profusion\/lightmediascanner,profusion\/lightmediascanner","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plugins\/asf\/asf.c\n+++ src\/plugins\/asf\/asf.c\n@@ -105,6 +105,24 @@\n uint32_t byterate;\n } audio;\n };\n+};\n+\n+\/* TODO: Add the gazillion of possible codecs -- possibly a task to gperf *\/\n+static const struct {\n+ uint16_t id;\n+ struct lms_string_size name;\n+} _codecs[] = {\n+ { 0x0160, LMS_STATIC_STRING_SIZE(\"wmav1\") },\n+ { 0x0161, LMS_STATIC_STRING_SIZE(\"wmav2\") },\n+ { 0x0162, LMS_STATIC_STRING_SIZE(\"wmavpro\") },\n+ { 0x0163, LMS_STATIC_STRING_SIZE(\"wmavlossless\") },\n+ { 0x1600, LMS_STATIC_STRING_SIZE(\"aac\") },\n+ { 0x706d, LMS_STATIC_STRING_SIZE(\"aac\") },\n+ { 0x4143, LMS_STATIC_STRING_SIZE(\"aac\") },\n+ { 0xA106, LMS_STATIC_STRING_SIZE(\"aac\") },\n+ { 0xF1AC, LMS_STATIC_STRING_SIZE(\"flac\") },\n+ { 0x0055, LMS_STATIC_STRING_SIZE(\"mp3\") },\n+ { }\n };\n \n \/* ASF GUIDs\n@@ -239,6 +257,18 @@\n - le64toh(props.preroll) \/ MSEC_PER_SEC);\n \n return r;\n+}\n+\n+static struct lms_string_size\n+_codec_id_to_str(uint16_t id)\n+{\n+ unsigned int i;\n+\n+ for (i = 0; _codecs[i].name.str != NULL; i++)\n+ if (_codecs[i].id == id)\n+ return _codecs[i].name;\n+\n+ return _codecs[i].name;\n }\n \n static int\n@@ -559,6 +589,7 @@\n audio_info.channels = streams->audio.channels;\n audio_info.bitrate = streams->audio.byterate * 8;\n audio_info.sampling_rate = streams->audio.sampling_rate;\n+ audio_info.codec = _codec_id_to_str(streams->audio.codec_id);\n \n r = lms_db_audio_add(plugin->audio_db, &audio_info);\n } else {\n"} {"commit":"00c666de1d5f6f432349411ec93fa078f2e4fd5e","subject":"Fix bad usage of free(3) found by coverity.","message":"Fix bad usage of free(3) found by coverity.\n","repos":"adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pmdas\/linux\/ipc.c\n+++ src\/pmdas\/linux\/ipc.c\n@@ -197,9 +197,6 @@\n \t if (sts < 0) {\n \t\tfprintf(stderr, \"Warning: %s: pmdaCacheStore(%s, %s): %s\\n\",\n \t\t\t__FUNCTION__, shmid, shm_stat->shm_key, pmErrStr(sts));\n-\t\tfree(shm_stat->shm_key);\n-\t\tfree(shm_stat->shm_owner);\n-\t\tfree(shm_stat->shm_status);\n \t\tfree(shm_stat);\n \t }\t\n \t}\n@@ -266,8 +263,6 @@\n \t if (sts < 0) {\n \t\tfprintf(stderr, \"Warning: %s: pmdaCacheStore(%s, %s): %s\\n\",\n \t\t\t__FUNCTION__, msgid, msg_que->msg_key, pmErrStr(sts));\n-\t\tfree(msg_que->msg_key);\n-\t\tfree(msg_que->msg_owner);\n \t\tfree(msg_que);\n \t }\t\n \t}\n@@ -336,8 +331,6 @@\n \t if (sts < 0) {\n \t\tfprintf(stderr, \"Warning: %s: pmdaCacheStore(%s, %s): %s\\n\",\n \t\t\t__FUNCTION__, semid, sem_arr->sem_key, pmErrStr(sts));\n-\t\tfree(sem_arr->sem_key);\n-\t\tfree(sem_arr->sem_owner);\n \t\tfree(sem_arr);\n \t }\n \t}\n"} {"commit":"318a354e0d9e821dd52844c6023898ee596e8a86","subject":"Make use of strtok in papi_pmid","message":"Make use of strtok in papi_pmid\n\nUse strtok in pmda_papi function for a cleaner function\n","repos":"tjanez\/pcp,edwardt\/pcp,mbaldessari\/pcp,aeg-aeg\/pcpfans,edwardt\/pcp,aeg-aeg\/pcpfans,tjanez\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,wuliming\/pcp,wuliming\/pcp,andyvand\/cygpcpfans,prasincs\/pcp,wuliming\/pcp,tjanez\/pcp,wuliming\/pcp,wuliming\/pcp,mbaldessari\/pcp,prasincs\/pcp,tjanez\/pcp,prasincs\/pcp,prasincs\/pcp,prasincs\/pcp,andyvand\/cygpcpfans,andyvand\/cygpcpfans,tjanez\/pcp,andyvand\/cygpcpfans,edwardt\/pcp,adfernandes\/pcp,prasincs\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,aeg-aeg\/pcpfans,adfernandes\/pcp,mbaldessari\/pcp,prasincs\/pcp,edwardt\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,mbaldessari\/pcp,edwardt\/pcp,tjanez\/pcp,andyvand\/cygpcpfans,mbaldessari\/pcp,aeg-aeg\/pcpfans,edwardt\/pcp,adfernandes\/pcp,prasincs\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,edwardt\/pcp,wuliming\/pcp,mbaldessari\/pcp,wuliming\/pcp,adfernandes\/pcp,edwardt\/pcp,adfernandes\/pcp,adfernandes\/pcp,adfernandes\/pcp,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,tjanez\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pmdas\/papi\/papi.c\n+++ src\/pmdas\/papi\/papi.c\n@@ -640,7 +640,6 @@\n \t\t\treturn PMDA_FETCH_STATIC;\n \t\t }\n \t\t else\n-\n \t\t\treturn PMDA_FETCH_NOVALUES;\n \t\t}\n \t }\n@@ -1003,17 +1002,17 @@\n {\n \n int i;\n- const char *p;\n-\n- for (p = name; *p != '.' && *p; p++)\n-\t;\n- if (*p == '.') p++;\n-\n- for (i = 0; i < number_of_events; i++) {\n-\tif (strcmp(p, papi_info[i].papi_string_code) == 0) {\n-\t *pmid = papi_info[i].pmid;\n-\t return 0;\n+ char *substr;\n+\n+ substr = strtok(name, \".\");\n+ while (substr != NULL) {\n+\tfor (i = 0; i < number_of_events; i++) {\n+\t if (strcmp(substr, papi_info[i].papi_string_code) == 0) {\n+\t\t*pmid = papi_info[i].pmid;\n+\t\treturn 0;\n+\t }\n \t}\n+\tsubstr = strtok(NULL, \".\");\n }\n return PM_ERR_NAME;\n }\n"} {"commit":"9727fef76a9fe1ddebc1ad708f0e0e60b363f79b","subject":"not external here, actually","message":"not external here, actually\n","repos":"kyuba\/curie,kyuba\/curie","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/posix\/bootstrap.c\n+++ src\/posix\/bootstrap.c\n@@ -39,8 +39,8 @@\n #include <stdlib.h>\n #include <unistd.h>\n \n-extern char **atomic_argv;\n-extern char **atomic_environment;\n+char **atomic_argv;\n+char **atomic_environment;\n int a_main();\n \/*@noreturn@*\/ void a_exit (int status);\n \n"} {"commit":"ced822f4611b7c3f6df49cae188ab05aa65ab0d6","subject":"ipv6: cache the result of the DNS query only, the socket needs to be re-created every time","message":"ipv6: cache the result of the DNS query only, the socket needs to be re-created every time\n","repos":"DSMan195276\/i3status,JSmith-BitFlipper\/i3status,ghedamat\/i3status,jasperla\/i3status,Watcom\/i3status,jasperla\/i3status,Detegr\/i3status,Airblader\/i3status,puiterwijk\/i3status,flammi\/i3status,bsdjhb\/i3status,jasperla\/i3status,Airblader\/i3status,puiterwijk\/i3status,ixjlyons\/i3status,Dettorer\/i3status,JSmith-BitFlipper\/i3status,i3\/i3status,stettberger\/i3status,peder2tm\/i3status-netdev,dj95\/i3status,flammi\/i3status,Watcom\/i3status,rpetrano\/i3status,ghedamat\/i3status,lastorset\/i3status,stettberger\/i3status,glittershark\/i3status,afh\/i3status,lbonn\/i3status,DSMan195276\/i3status,Gravemind\/i3status,lbonn\/i3status,lexszero\/i3status,bsdjhb\/i3status,JSmith-BitFlipper\/i3status,i3\/i3status,jasperla\/i3status,lexszero\/i3status,peder2tm\/i3status-netdev,rpetrano\/i3status,Gravemind\/i3status,KarboniteKream\/i3status,JSmith-BitFlipper\/i3status,opntr\/i3status,flammi\/i3status,flammi\/i3status,ixjlyons\/i3status,DSMan195276\/i3status,afh\/i3status,mkroman\/i3status,lahwaacz\/i3status,Watcom\/i3status,glittershark\/i3status,Dettorer\/i3status,mkroman\/i3status,ghedamat\/i3status,Dettorer\/i3status,Gravemind\/i3status,mkroman\/i3status,ixjlyons\/i3status,rpetrano\/i3status,Gravemind\/i3status,Dettorer\/i3status,opntr\/i3status,Detegr\/i3status,dj95\/i3status,Airblader\/i3status,lahwaacz\/i3status,lbonn\/i3status,lexszero\/i3status,ixjlyons\/i3status,Yuhta\/i3status,puiterwijk\/i3status,afh\/i3status,peder2tm\/i3status-netdev,KarboniteKream\/i3status,Yuhta\/i3status,KarboniteKream\/i3status,i3\/i3status,DSMan195276\/i3status,lexszero\/i3status,Detegr\/i3status,Yuhta\/i3status,puiterwijk\/i3status,lbonn\/i3status,afh\/i3status,lahwaacz\/i3status,bsdjhb\/i3status,glittershark\/i3status,mkroman\/i3status,Yuhta\/i3status,opntr\/i3status,lahwaacz\/i3status,Watcom\/i3status,bsdjhb\/i3status,dj95\/i3status,Detegr\/i3status,KarboniteKream\/i3status,rpetrano\/i3status,dj95\/i3status,opntr\/i3status,glittershark\/i3status,i3\/i3status,lastorset\/i3status,ghedamat\/i3status,Airblader\/i3status,peder2tm\/i3status-netdev","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/print_ipv6_addr.c\n+++ src\/print_ipv6_addr.c\n@@ -1,5 +1,6 @@\n \/\/ vim:ts=8:expandtab\n #include <stdio.h>\n+#include <stdbool.h>\n #include <unistd.h>\n #include <stdlib.h>\n #include <sys\/types.h>\n@@ -8,17 +9,38 @@\n #include <string.h>\n #include <arpa\/inet.h>\n \n-static void print_sockname(int fd) {\n+static bool print_sockname(struct addrinfo *addr) {\n static char buf[INET6_ADDRSTRLEN+1];\n struct sockaddr_storage local;\n int ret;\n+ int fd;\n+\n+ if ((fd = socket(addr->ai_family, SOCK_DGRAM, 0)) == -1) {\n+ perror(\"socket()\");\n+ return false;\n+ }\n+\n+ \/* Since the socket was created with SOCK_DGRAM, this is\n+ * actually not establishing a connection or generating\n+ * any other network traffic. Instead, as a side-effect,\n+ * it saves the local address with which packets would\n+ * be sent to the destination. *\/\n+ if (connect(fd, addr->ai_addr, addr->ai_addrlen) == -1) {\n+ \/* We don\u2019t display the error here because most\n+ * likely, there just is no IPv6 connectivity.\n+ * Thus, don\u2019t spam the user\u2019s console but just\n+ * try the next address. *\/\n+ (void)close(fd);\n+ return false;\n+ }\n+\n \n socklen_t local_len = sizeof(struct sockaddr_storage);\n if (getsockname(fd, (struct sockaddr*)&local, &local_len) == -1) {\n perror(\"getsockname()\");\n (void)close(fd);\n printf(\"no IPv6\");\n- return;\n+ return true;\n }\n \n memset(buf, 0, INET6_ADDRSTRLEN + 1);\n@@ -26,11 +48,14 @@\n buf, sizeof(buf), NULL, 0,\n NI_NUMERICHOST)) != 0) {\n fprintf(stderr, \"getnameinfo(): %s\\n\", gai_strerror(ret));\n+ (void)close(fd);\n printf(\"no IPv6\");\n- return;\n+ return true;\n }\n \n+ (void)close(fd);\n printf(\"%s\", buf);\n+ return true;\n }\n \n \/*\n@@ -40,14 +65,13 @@\n static void print_ipv6_addr() {\n struct addrinfo hints;\n struct addrinfo *result, *resp;\n- static int fd = -1;\n+ static struct addrinfo *cached = NULL;\n \n \/* To save dns lookups (if they are not cached locally) and creating\n * sockets, we save the fd and keep it open. *\/\n- if (fd > -1) {\n- print_sockname(fd);\n- return;\n- }\n+ if (cached != NULL)\n+ if (print_sockname(cached))\n+ return;\n \n memset(&hints, 0, sizeof(struct addrinfo));\n hints.ai_family = AF_INET6;\n@@ -64,33 +88,22 @@\n }\n \n for (resp = result; resp != NULL; resp = resp->ai_next) {\n- if ((fd = socket(resp->ai_family, SOCK_DGRAM, 0)) == -1) {\n- perror(\"socket()\");\n+ if (!print_sockname(resp))\n continue;\n+\n+ if ((cached = malloc(sizeof(struct addrinfo))) == NULL)\n+ return;\n+ memcpy(cached, resp, sizeof(struct addrinfo));\n+ if ((cached->ai_addr = malloc(resp->ai_addrlen)) == NULL) {\n+ cached = NULL;\n+ return;\n }\n-\n- \/* Since the socket was created with SOCK_DGRAM, this is\n- * actually not establishing a connection or generating\n- * any other network traffic. Instead, as a side-effect,\n- * it saves the local address with which packets would\n- * be sent to the destination. *\/\n- if (connect(fd, resp->ai_addr, resp->ai_addrlen) == -1) {\n- \/* We don\u2019t display the error here because most\n- * likely, there just is no IPv6 connectivity.\n- * Thus, don\u2019t spam the user\u2019s console but just\n- * try the next address. *\/\n- (void)close(fd);\n- continue;\n- }\n-\n- free(result);\n-\n- print_sockname(fd);\n-\n+ memcpy(cached->ai_addr, resp->ai_addr, resp->ai_addrlen);\n+ freeaddrinfo(result);\n return;\n }\n \n- free(result);\n+ freeaddrinfo(result);\n printf(\"no IPv6\");\n }\n \n"} {"commit":"196ff568343ad7830145599359ebe8ed73b91c50","subject":"qemu: agent: use g_auto for ifname","message":"qemu: agent: use g_auto for ifname\n\nThis lets us conveniently reduce its scope to the outer loop.\n\nSigned-off-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\nReviewed-by: Jonathon Jongsma <c7254805a17bd5c41e24c3a278fcbf3afcdfb0fa@redhat.com>\nReviewed-by: Neal Gompa <8135daa3762340227c0c67f1c47ad07a127bd3a3@gmail.com>\n","repos":"crobinso\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,libvirt\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,zippy2\/libvirt,libvirt\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_agent.c\n+++ src\/qemu\/qemu_agent.c\n@@ -2127,7 +2127,6 @@\n size_t ifaces_count = 0;\n virDomainInterfacePtr *ifaces_ret = NULL;\n virHashTablePtr ifaces_store = NULL;\n- char **ifname = NULL;\n \n \/* Hash table to handle the interface alias *\/\n if (!(ifaces_store = virHashCreate(ifaces_count, NULL))) {\n@@ -2158,6 +2157,7 @@\n virJSONValuePtr ip_addr_arr = NULL;\n const char *hwaddr, *ifname_s, *name = NULL;\n virDomainInterfacePtr iface = NULL;\n+ g_auto(GStrv) ifname = NULL;\n size_t addrs_count = 0;\n \n \/* interface name is required to be presented *\/\n@@ -2194,10 +2194,6 @@\n iface->hwaddr = g_strdup(hwaddr);\n }\n \n- \/* Has to be freed for each interface. *\/\n- g_strfreev(ifname);\n- ifname = NULL;\n-\n \/* as well as IP address which - moreover -\n * can be presented multiple times *\/\n ip_addr_arr = virJSONValueObjectGet(tmp_iface, \"ip-addresses\");\n@@ -2242,8 +2238,6 @@\n virDomainInterfaceFree(ifaces_ret[i]);\n }\n VIR_FREE(ifaces_ret);\n- g_strfreev(ifname);\n-\n goto cleanup;\n }\n \n"} {"commit":"303f9719722d0d0093d6165a06b438bde06d53e6","subject":"Changed a comment about a QVariant type","message":"Changed a comment about a QVariant type","repos":"MidasPaymentLTD\/midascoin,MidasPaymentLTD\/midascoin,MidasPaymentLTD\/midascoin,MidasPaymentLTD\/midascoin,MidasPaymentLTD\/midascoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/qt\/optionsmodel.h\n+++ src\/qt\/optionsmodel.h\n@@ -23,7 +23,7 @@\n ProxyUse, \/\/ bool\n ProxySocksVersion, \/\/ int\n ProxyIP, \/\/ QString\n- ProxyPort, \/\/ QString\n+ ProxyPort, \/\/ int\n Fee, \/\/ qint64\n DisplayUnit, \/\/ BitcoinUnits::Unit\n DisplayAddresses, \/\/ bool\n"} {"commit":"0a7ac91427f3c019419619fcb4e82a6fa01f7e73","subject":"fix `box-cas!' name in error message","message":"fix `box-cas!' name in error message\n","repos":"mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket,mafagafogigante\/racket","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/racket\/src\/list.c\n+++ src\/racket\/src\/list.c\n@@ -1632,7 +1632,7 @@\n *\/\n \n if (!SCHEME_MUTABLE_BOXP(box)) {\n- scheme_wrong_type(\"cas!\", \"non-impersonated mutable box\", 0, 1, &box);\n+ scheme_wrong_type(\"box-cas!\", \"non-impersonated mutable box\", 0, 1, &box);\n }\n \n #ifdef MZ_USE_FUTURES\n"} {"commit":"cc638c8c9f100887812d05edbd7edaa725b2fcef","subject":"Proper \"not set\" retentionTime for OffsetCommitRequests","message":"Proper \"not set\" retentionTime for OffsetCommitRequests\n","repos":"senior7515\/librdkafka,orthrus\/librdkafka,janmejay\/librdkafka,senior7515\/librdkafka,orthrus\/librdkafka,janmejay\/librdkafka,orthrus\/librdkafka,senior7515\/librdkafka,janmejay\/librdkafka,orthrus\/librdkafka,senior7515\/librdkafka,janmejay\/librdkafka","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/rdkafka_request.c\n+++ src\/rdkafka_request.c\n@@ -727,7 +727,7 @@\n rd_kafka_buf_write_kstr(rkbuf, rkcg->rkcg_member_id);\n \/* v2: RetentionTime *\/\n if (api_version == 2)\n- rd_kafka_buf_write_i64(rkbuf, 0);\n+ rd_kafka_buf_write_i64(rkbuf, -1);\n }\n \n \/* Sort offsets by topic *\/\n"} {"commit":"94317f4ae18eb05563515d2174403247ec4f98b0","subject":"Clean redis-benchmark multi-threaded output (#8615)","message":"Clean redis-benchmark multi-threaded output (#8615)\n\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/redis-benchmark.c\n+++ src\/redis-benchmark.c\n@@ -1655,7 +1655,10 @@\n const float instantaneous_rps = (float)(requests_finished-previous_requests_finished)\/instantaneous_dt;\n config.previous_tick = current_tick;\n atomicSet(config.previous_requests_finished,requests_finished);\n- config.last_printed_bytes = printf(\"%s: rps=%.1f (overall: %.1f) avg_msec=%.3f (overall: %.3f)\\r\", config.title, instantaneous_rps, rps, hdr_mean(config.current_sec_latency_histogram)\/1000.0f, hdr_mean(config.latency_histogram)\/1000.0f);\n+ int printed_bytes = printf(\"%s: rps=%.1f (overall: %.1f) avg_msec=%.3f (overall: %.3f)\\r\", config.title, instantaneous_rps, rps, hdr_mean(config.current_sec_latency_histogram)\/1000.0f, hdr_mean(config.latency_histogram)\/1000.0f);\n+ if (printed_bytes > config.last_printed_bytes){\n+ config.last_printed_bytes = printed_bytes;\n+ }\n hdr_reset(config.current_sec_latency_histogram);\n fflush(stdout);\n return 250; \/* every 250ms *\/\n"} {"commit":"f3f87a0dd7cfe5369c7565e62109576a090213e2","subject":"Add --user argument to redis-benchmark.c (ACL)","message":"Add --user argument to redis-benchmark.c (ACL)","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/redis-benchmark.c\n+++ src\/redis-benchmark.c\n@@ -94,6 +94,7 @@\n sds dbnumstr;\n char *tests;\n char *auth;\n+ const char *user;\n int precision;\n int num_threads;\n struct benchmarkThread **threads;\n@@ -258,7 +259,10 @@\n \n if(config.auth) {\n void *authReply = NULL;\n- redisAppendCommand(c, \"AUTH %s\", config.auth);\n+ if (config.user == NULL)\n+ redisAppendCommand(c, \"AUTH %s\", config.auth);\n+ else\n+ redisAppendCommand(c, \"AUTH %s %s\", config.user, config.auth);\n if (REDIS_OK != redisGetReply(c, &authReply)) goto fail;\n if (reply) freeReplyObject(reply);\n reply = ((redisReply *) authReply);\n@@ -628,7 +632,12 @@\n c->prefix_pending = 0;\n if (config.auth) {\n char *buf = NULL;\n- int len = redisFormatCommand(&buf, \"AUTH %s\", config.auth);\n+ int len;\n+ if (config.user == NULL)\n+ len = redisFormatCommand(&buf, \"AUTH %s\", config.auth);\n+ else\n+ len = redisFormatCommand(&buf, \"AUTH %s %s\",\n+ config.user, config.auth);\n c->obuf = sdscatlen(c->obuf, buf, len);\n free(buf);\n c->prefix_pending++;\n@@ -1299,6 +1308,9 @@\n } else if (!strcmp(argv[i],\"-a\") ) {\n if (lastarg) goto invalid;\n config.auth = strdup(argv[++i]);\n+ } else if (!strcmp(argv[i],\"--user\")) {\n+ if (lastarg) goto invalid;\n+ config.user = argv[++i];\n } else if (!strcmp(argv[i],\"-d\")) {\n if (lastarg) goto invalid;\n config.datasize = atoi(argv[++i]);\n@@ -1385,6 +1397,7 @@\n \" -p <port> Server port (default 6379)\\n\"\n \" -s <socket> Server socket (overrides host and port)\\n\"\n \" -a <password> Password for Redis Auth\\n\"\n+\" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\\n\"\n \" -c <clients> Number of parallel connections (default 50)\\n\"\n \" -n <requests> Total number of requests (default 100000)\\n\"\n \" -d <size> Data size of SET\/GET value in bytes (default 3)\\n\"\n"} {"commit":"cdf35a1992c9249e4564d6b0d80a87c675e48a2b","subject":"linker errors are better than runtime errors","message":"linker errors are better than runtime errors\n","repos":"mhaberler\/machinekit,bobvanderlinden\/machinekit,ArcEye\/machinekit-testing,unseenlaser\/machinekit,unseenlaser\/linuxcnc,bmwiedemann\/linuxcnc-mirror,bobvanderlinden\/machinekit,ikcalB\/linuxcnc-mirror,strahlex\/machinekit,EqAfrica\/machinekit,cdsteinkuehler\/MachineKit,RunningLight\/machinekit,ikcalB\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,jaguarcat79\/ILC-with-LinuxCNC,ArcEye\/machinekit-testing,kinsamanka\/machinekit,cnc-club\/linuxcnc,Cid427\/machinekit,araisrobo\/machinekit,araisrobo\/machinekit,bmwiedemann\/linuxcnc-mirror,Cid427\/machinekit,cdsteinkuehler\/linuxcnc,araisrobo\/linuxcnc,yishinli\/emc2,ArcEye\/MK-Qt5,kinsamanka\/machinekit,araisrobo\/linuxcnc,ArcEye\/machinekit-testing,RunningLight\/machinekit,araisrobo\/linuxcnc,cnc-club\/linuxcnc,strahlex\/machinekit,Cid427\/machinekit,cnc-club\/linuxcnc,araisrobo\/linuxcnc,bmwiedemann\/linuxcnc-mirror,narogon\/linuxcnc,yishinli\/emc2,kinsamanka\/machinekit,ianmcmahon\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,araisrobo\/machinekit,ikcalB\/linuxcnc-mirror,cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,kinsamanka\/machinekit,mhaberler\/machinekit,ArcEye\/MK-Qt5,unseenlaser\/machinekit,narogon\/linuxcnc,ArcEye\/machinekit-testing,unseenlaser\/machinekit,RunningLight\/machinekit,aschiffler\/linuxcnc,bobvanderlinden\/machinekit,narogon\/linuxcnc,cdsteinkuehler\/linuxcnc,unseenlaser\/machinekit,ArcEye\/MK-Qt5,ianmcmahon\/linuxcnc-mirror,aschiffler\/linuxcnc,bmwiedemann\/linuxcnc-mirror,EqAfrica\/machinekit,kinsamanka\/machinekit,yishinli\/emc2,aschiffler\/linuxcnc,Cid427\/machinekit,aschiffler\/linuxcnc,araisrobo\/machinekit,araisrobo\/machinekit,strahlex\/machinekit,cdsteinkuehler\/linuxcnc,yishinli\/emc2,jaguarcat79\/ILC-with-LinuxCNC,ArcEye\/MK-Qt5,ArcEye\/MK-Qt5,mhaberler\/machinekit,cnc-club\/linuxcnc,narogon\/linuxcnc,ArcEye\/machinekit-testing,Cid427\/machinekit,strahlex\/machinekit,cdsteinkuehler\/linuxcnc,ArcEye\/machinekit-testing,strahlex\/machinekit,unseenlaser\/machinekit,araisrobo\/machinekit,unseenlaser\/linuxcnc,aschiffler\/linuxcnc,EqAfrica\/machinekit,araisrobo\/linuxcnc,mhaberler\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,EqAfrica\/machinekit,cdsteinkuehler\/linuxcnc,unseenlaser\/machinekit,cdsteinkuehler\/MachineKit,ArcEye\/machinekit-testing,mhaberler\/machinekit,mhaberler\/machinekit,cdsteinkuehler\/MachineKit,bobvanderlinden\/machinekit,RunningLight\/machinekit,RunningLight\/machinekit,ianmcmahon\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,narogon\/linuxcnc,araisrobo\/machinekit,ikcalB\/linuxcnc-mirror,ArcEye\/MK-Qt5,bobvanderlinden\/machinekit,EqAfrica\/machinekit,unseenlaser\/machinekit,cdsteinkuehler\/MachineKit,ikcalB\/linuxcnc-mirror,Cid427\/machinekit,kinsamanka\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/MachineKit,jaguarcat79\/ILC-with-LinuxCNC,ikcalB\/linuxcnc-mirror,cnc-club\/linuxcnc,strahlex\/machinekit,kinsamanka\/machinekit,mhaberler\/machinekit,RunningLight\/machinekit,EqAfrica\/machinekit,ianmcmahon\/linuxcnc-mirror,bmwiedemann\/linuxcnc-mirror,araisrobo\/machinekit,unseenlaser\/linuxcnc,RunningLight\/machinekit,bobvanderlinden\/machinekit,cnc-club\/linuxcnc,strahlex\/machinekit,ianmcmahon\/linuxcnc-mirror,cdsteinkuehler\/MachineKit,unseenlaser\/machinekit,EqAfrica\/machinekit,kinsamanka\/machinekit,EqAfrica\/machinekit,mhaberler\/machinekit,ArcEye\/MK-Qt5,cnc-club\/linuxcnc,ArcEye\/MK-Qt5,unseenlaser\/linuxcnc,RunningLight\/machinekit,Cid427\/machinekit,Cid427\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,ikcalB\/linuxcnc-mirror,bobvanderlinden\/machinekit,araisrobo\/machinekit,unseenlaser\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/rtapi\/sim_rtapi.c\n+++ src\/rtapi\/sim_rtapi.c\n@@ -319,85 +319,6 @@\n return 0;\n }\n \n-\/*! \\todo \n- FIXME - no support for simulated interrupts\n-*\/\n-\n-int rtapi_assign_interrupt_handler(unsigned int irq, void (*handler) (void))\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_free_interrupt_handler(unsigned int irq)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_enable_interrupt(unsigned int irq)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_disable_interrupt(unsigned int irq)\n-{\n- return -ENOSYS;\n-}\n-\n-\n-\/*! \\todo FIXME - no support for semaphores *\/\n-\n-int rtapi_sem_new(int key, int module_id)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_sem_delete(int id)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_sem_give(int id)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_sem_take(int id)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_sem_try(int id)\n-{\n- return -ENOSYS;\n-}\n-\n-\n-#if 0\n-\/*! \\todo FIXME - no support for fifos *\/\n-\n-int rtapi_fifo_new(int key, unsigned long int size,\n-\t\t rtapi_fifo_handle * fifoptr)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_fifo_delete(rtapi_fifo_handle fifo)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_fifo_read(rtapi_fifo_handle fifo, char *buf, unsigned long int size)\n-{\n- return -ENOSYS;\n-}\n-\n-int rtapi_fifo_write(rtapi_fifo_handle fifo,\n-\t\t char *buf, unsigned long int size)\n-{\n- return -ENOSYS;\n-}\n-#endif\n-\n long int simple_strtol(const char *nptr, char **endptr, int base) {\n return strtol(nptr, endptr, base);\n }\n"} {"commit":"57ad1b344ceb680ac76e5e02d99a6b3de5e4a536","subject":"Moved floc call in sampfunci below fsize call. This way, it will catch a non-existant gen function in all cases. (This change required by new floc behavior.)","message":"Moved floc call in sampfunci below fsize call. This way, it will catch a\nnon-existant gen function in all cases.\n(This change required by new floc behavior.)\n","repos":"RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix,RTcmix\/RTcmix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/rtcmix\/sampfunc.c\n+++ src\/rtcmix\/sampfunc.c\n@@ -39,7 +39,6 @@\n \tfnumber = p[0];\n \tskipin = p[1];\n \tfrac = p[1] - skipin;\n-\tthefunct = (float *) floc(fnumber);\n \tsize = fsize(fnumber);\n \tif(skipin >= size-2) {\n \t\tskipin = size - 1;\n@@ -47,5 +46,7 @@\n \t}\n \telse\n \t\tskipin2 = skipin + 1;\n+\tthefunct = (float *)floc(fnumber);\n \treturn(thefunct[skipin] + frac * (thefunct[skipin2]-thefunct[skipin]));\n }\n+\n"} {"commit":"395324b1dab0e8b03b0ae44704a1347fefb3776b","subject":"caps-hash: use wocky_caps_hash_compute_from_lists","message":"caps-hash: use wocky_caps_hash_compute_from_lists\n\nSigned-off-by: Jonny Lamb <505168e2a88049f340ba715e7f51053c5aa8eb50@debian.org>\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut,freedesktop-unofficial-mirror\/telepathy__telepathy-salut","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/salut-caps-hash.c\n+++ src\/salut-caps-hash.c\n@@ -29,77 +29,15 @@\n \n #include <string.h>\n \n+#include <wocky\/wocky-disco-identity.h>\n+#include <wocky\/wocky-caps-hash.h>\n+\n #define DEBUG_FLAG SALUT_DEBUG_PRESENCE\n \n #include \"debug.h\"\n #include \"salut-capabilities.h\"\n #include \"salut-caps-hash.h\"\n #include \"salut-self.h\"\n-\n-static gint\n-char_cmp (gconstpointer a, gconstpointer b)\n-{\n- gchar *left = *(gchar **) a;\n- gchar *right = *(gchar **) b;\n-\n- return strcmp (left, right);\n-}\n-\n-static void\n-salut_presence_free_xep0115_hash (\n- GPtrArray *features,\n- GPtrArray *identities)\n-{\n- g_ptr_array_foreach (features, (GFunc) g_free, NULL);\n- g_ptr_array_foreach (identities, (GFunc) g_free, NULL);\n-\n- g_ptr_array_free (features, TRUE);\n- g_ptr_array_free (identities, TRUE);\n-}\n-\n-static gchar *\n-caps_hash_compute (\n- GPtrArray *features,\n- GPtrArray *identities)\n-{\n- GString *s;\n- GChecksum *checksum;\n- guchar *sha1;\n- gsize out_len;\n- guint i;\n- gchar *encoded;\n-\n- out_len = g_checksum_type_get_length (G_CHECKSUM_SHA1);\n- sha1 = g_malloc (out_len * sizeof (guchar));\n-\n- g_ptr_array_sort (identities, char_cmp);\n- g_ptr_array_sort (features, char_cmp);\n-\n- s = g_string_new (\"\");\n-\n- for (i = 0 ; i < identities->len ; i++)\n- {\n- g_string_append (s, g_ptr_array_index (identities, i));\n- g_string_append_c (s, '<');\n- }\n-\n- for (i = 0 ; i < features->len ; i++)\n- {\n- g_string_append (s, g_ptr_array_index (features, i));\n- g_string_append_c (s, '<');\n- }\n-\n- checksum = g_checksum_new (G_CHECKSUM_SHA1);\n- g_checksum_update (checksum, (guchar *) s->str, s->len);\n- g_checksum_get_digest (checksum, sha1, &out_len);\n- g_string_free (s, TRUE);\n- g_checksum_free (checksum);\n-\n- encoded = g_base64_encode (sha1, out_len);\n- g_free (sha1);\n-\n- return encoded;\n-}\n \n \/**\n * Compute our hash as defined by the XEP-0115.\n@@ -111,24 +49,24 @@\n {\n GSList *features_list = salut_self_get_features (self);\n GPtrArray *features = g_ptr_array_new ();\n- GPtrArray *identities = g_ptr_array_new ();\n+ GPtrArray *identities = wocky_disco_identity_array_new ();\n gchar *str;\n GSList *i;\n \n \/* get our features list *\/\n for (i = features_list; NULL != i; i = i->next)\n- {\n- const Feature *feat = (const Feature *) i->data;\n- g_ptr_array_add (features, g_strdup (feat->ns));\n- }\n+ g_ptr_array_add (features, ((Feature *) i->data)->ns);\n \n \/* XEP-0030 requires at least 1 identity. We don't need more. *\/\n- g_ptr_array_add (identities, g_strdup (\"client\/pc\/\/\" PACKAGE_STRING));\n+ g_ptr_array_add (identities,\n+ wocky_disco_identity_new (\"client\", \"pc\",\n+ NULL, PACKAGE_STRING));\n \n- str = caps_hash_compute (features, identities);\n+ str = wocky_caps_hash_compute_from_lists (features, identities, NULL);\n \n- salut_presence_free_xep0115_hash (features, identities);\n g_slist_free (features_list);\n+ g_ptr_array_free (features, TRUE);\n+ wocky_disco_identity_array_free (identities);\n \n return str;\n }\n"} {"commit":"b424cc2b988b238b032dc756420b4b1cb5f58417","subject":"Close socket on failures.","message":"Close socket on failures.\n","repos":"GrahamDumpleton\/mod_wsgi,GrahamDumpleton\/mod_wsgi,GrahamDumpleton\/mod_wsgi","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/server\/mod_wsgi.c\n+++ src\/server\/mod_wsgi.c\n@@ -8512,6 +8512,9 @@\n ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,\n \"mod_wsgi (pid=%d): Couldn't bind unix domain \"\n \"socket '%s'.\", getpid(), process->socket_path);\n+\n+ close(sockfd);\n+\n return -1;\n }\n \n@@ -8523,6 +8526,9 @@\n ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,\n \"mod_wsgi (pid=%d): Couldn't listen on unix domain \"\n \"socket.\", getpid());\n+\n+ close(sockfd);\n+\n return -1;\n }\n \n@@ -8557,6 +8563,9 @@\n \"mod_wsgi (pid=%d): Couldn't change owner of unix \"\n \"domain socket '%s' to uid=%ld.\", getpid(),\n process->socket_path, (long)socket_uid);\n+\n+ close(sockfd);\n+\n return -1;\n }\n }\n"} {"commit":"3590690f93c506b94c126b5fdbcc1f23609b7edb","subject":"shared: Fix incorrect check of deserialize's return","message":"shared: Fix incorrect check of deserialize's return\n\nThe deserialization function returns the number of items it added to\nthe list array it was passed. Store that value for looping through\nfreeing the result and verify serialization didn't have an error\nbefore continuing.\n\nSigned-off-by: William Douglas <07dd1d6cf12120bb0585d2eb50da402be35d56e5@intel.com>\n","repos":"sofar\/buxton,sofar\/buxton","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared\/protocol.c\n+++ src\/shared\/protocol.c\n@@ -32,7 +32,8 @@\n \tuint8_t *response_store;\n \n \n-\tif (!buxton_deserialize_message((uint8_t*)client->data, &msg, size, &list)) {\n+\tp_count = buxton_deserialize_message((uint8_t*)client->data, &msg, size, &list);\n+\tif (p_count < 0) {\n \t\tbuxton_debug(\"Failed to deserialize message\\n\");\n \t\tgoto end;\n \t}\n"} {"commit":"47b86cfc68fade234fec6e0181e4ad775feb42a4","subject":"protocol: insurance against null ptr deref","message":"protocol: insurance against null ptr deref\n\nFlagged by the static analyzer\n\nSigned-off-by: Michael Leibowitz <297fd8c6dc8b49d20ea55c9cf28ef1e775abd351@intel.com>\n","repos":"sofar\/buxton,sofar\/buxton","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/shared\/protocol.c\n+++ src\/shared\/protocol.c\n@@ -271,7 +271,7 @@\n \t\tif (count < 0)\n \t\t\tgoto next;\n \n-\t\tif (!(r_msg == BUXTON_CONTROL_STATUS && r_list[0].type == INT32)\n+\t\tif (!(r_msg == BUXTON_CONTROL_STATUS && r_list && r_list[0].type == INT32)\n \t\t && !(r_msg == BUXTON_CONTROL_CHANGED)) {\n \t\t\thandled++;\n \t\t\tbuxton_log(\"Critical error: Invalid response\\n\");\n"} {"commit":"dbcd456769238b10217344006252cca487e8c342","subject":"TRIV: Delete commented-out code","message":"TRIV: Delete commented-out code\n","repos":"slivingston\/gr1c,slivingston\/gr1c,slivingston\/gr1c","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/solve_operators.c\n+++ src\/solve_operators.c\n@@ -406,7 +406,6 @@\n \t\t\t\treturn NULL;\n \t\t\t}\n \t\t\t**(Y+i) = Cudd_Not( Cudd_ReadOne( manager ) );\n-\t\t\t\/* **(Y+i) = Cudd_bddAnd( manager, *(sgoals+i), W ); *\/\n \t\t\tCudd_Ref( **(Y+i) );\n \n \t\t\t*(*X_ijr+i) = malloc( *(*num_sublevels+i)*sizeof(DdNode **) );\n"} {"commit":"1f89957521e4e57e5ec26a29c49ed5546a2f105d","subject":"Dont stop sending keepalives if DEBUG is defined","message":"Dont stop sending keepalives if DEBUG is defined\n","repos":"Benny-\/android-accessory-protocol-bridge,Benny-\/android-accessory-protocol-bridge,Benny-\/android-accessory-protocol-bridge,Benny-\/android-accessory-protocol-bridge","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Accessory\/AAP-Bridge\/src\/keepalive.c\n+++ Accessory\/AAP-Bridge\/src\/keepalive.c\n@@ -4,10 +4,6 @@\n #include <stdio.h>\n \n const static char* const pong = \"pong\";\n-\n-#ifdef DEBUG\n-#define BUGGY_KEEPALIVE_SERVICE\n-#endif\n \n #ifdef BUGGY_KEEPALIVE_SERVICE\n #warning This is a buggy build and will suddenly stop sending keepalives\n"} {"commit":"7b1ab7e7f189cd717eaa6a6834c75e20d4b1c300","subject":"Simplify nouserok checks for missing\/malformed authfiles","message":"Simplify nouserok checks for missing\/malformed authfiles\n\nReduce code duplication.\n","repos":"Yubico\/pam-u2f,Yubico\/pam-u2f,Yubico\/pam-u2f","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- pam-u2f.c\n+++ pam-u2f.c\n@@ -216,23 +216,19 @@\n retval = get_devices_from_authfile(cfg->auth_file, user, cfg->max_devs,\n cfg->debug, devices, &n_devices);\n if (retval != 1) {\n- if (cfg->nouserok) {\n- DBG((\"Unable to get devices from file %s but nouserok specified. \"\n- \"Skipping authentication\",\n- cfg->auth_file));\n- retval = PAM_SUCCESS;\n- goto done;\n- } else {\n- DBG((\"Unable to get devices from file %s. Aborting\", cfg->auth_file));\n- retval = PAM_AUTHINFO_UNAVAIL;\n- goto done;\n- }\n+ \/\/ for nouserok; make sure errors in get_devices_from_authfile don't\n+ \/\/ result in valid devices\n+ n_devices = 0;\n }\n \n if (n_devices == 0) {\n if (cfg->nouserok) {\n DBG((\"Found no devices but nouserok specified. Skipping authentication\"));\n retval = PAM_SUCCESS;\n+ goto done;\n+ } else if (retval != 1) {\n+ DBG((\"Unable to get devices from file %s\", cfg->auth_file));\n+ retval = PAM_AUTHINFO_UNAVAIL;\n goto done;\n } else {\n DBG((\"Found no devices. Aborting.\"));\n"} {"commit":"309f127416cd38f972d28b29f59e784ea5403785","subject":"Have PAM module log messages to syslog","message":"Have PAM module log messages to syslog\n\nThis logs informational messages that are presented to the user tot\nsyslog. This normally includes password expiry and grace login\ninformation which may be useful to log.\n","repos":"arthurdejong\/nss-pam-ldapd,arthurdejong\/nss-pam-ldapd,arthurdejong\/nss-pam-ldapd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pam\/pam.c\n+++ pam\/pam.c\n@@ -581,9 +581,17 @@\n pam_syslog(pamh, LOG_DEBUG, \"authorization succeeded\");\n \/* present any informational messages to the user *\/\n if ((authz_resp.msg[0] != '\\0') && (!cfg.no_warn))\n+ {\n pam_info(pamh, \"%s\", authz_resp.msg);\n+ pam_syslog(pamh, LOG_INFO, \"%s; user=%s\",\n+ authz_resp.msg, username);\n+ }\n if ((ctx->saved_authz.msg[0] != '\\0') && (!cfg.no_warn))\n+ {\n pam_info(pamh, \"%s\", ctx->saved_authz.msg);\n+ pam_syslog(pamh, LOG_INFO, \"%s; user=%s\",\n+ ctx->saved_authz.msg, username);\n+ }\n return PAM_SUCCESS;\n }\n \n"} {"commit":"5f0b0d1aba48396afed4d7075c2bcecbbd50eeae","subject":"in -R (ROOT) mode use the path of the output file (-f argument) as the path for the target files (.o and .d) and not the path of the source file, which is now a full path referencing the (read-only) source.","message":"in -R (ROOT) mode use the path of the output file (-f argument) as the path\nfor the target files (.o and .d) and not the path of the source file,\nwhich is now a full path referencing the (read-only) source.\n\n\ngit-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@36771 27541ba8-7e3a-0410-8455-c3a389f83636\n","repos":"bbannier\/ROOT,bbannier\/ROOT,bbannier\/ROOT,dawehner\/root,dawehner\/root,dawehner\/root,bbannier\/ROOT,dawehner\/root,dawehner\/root,dawehner\/root,bbannier\/ROOT,dawehner\/root,dawehner\/root,bbannier\/ROOT,bbannier\/ROOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- build\/rmkdepend\/main.c\n+++ build\/rmkdepend\/main.c\n@@ -499,7 +499,10 @@\n \n find_includes(filecontent, ip, ip, 0, FALSE);\n freefile(filecontent);\n- recursive_pr_include(ip, ip->i_file, base_name(*fp), *tp);\n+ if (!rootBuild)\n+ recursive_pr_include(ip, ip->i_file, base_name(*fp), *tp);\n+ else\n+ recursive_pr_include(ip, ip->i_file, base_name(makefile), *tp);\n inc_clean();\n }\n if (!rootBuild) {\n"} {"commit":"0f4f04f2a4231b040016f5560af5707fd13aff2d","subject":"Removal of rmkdepend is for v6.16!","message":"Removal of rmkdepend is for v6.16!\n","repos":"olifre\/root,karies\/root,olifre\/root,root-mirror\/root,olifre\/root,olifre\/root,root-mirror\/root,olifre\/root,root-mirror\/root,karies\/root,olifre\/root,olifre\/root,olifre\/root,olifre\/root,olifre\/root,karies\/root,karies\/root,root-mirror\/root,karies\/root,root-mirror\/root,karies\/root,karies\/root,karies\/root,root-mirror\/root,root-mirror\/root,root-mirror\/root,root-mirror\/root,karies\/root,olifre\/root,karies\/root,karies\/root,root-mirror\/root,root-mirror\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- build\/rmkdepend\/main.c\n+++ build\/rmkdepend\/main.c\n@@ -414,12 +414,12 @@\n *incp++ = defincdir;\n }\n \n- fprintf(stderr, \"WARNING: this tool is deprecated and will be removed in ROOT 6.14!\\n\");\n+ fprintf(stderr, \"WARNING: this tool is deprecated and will be removed in ROOT 6.16!\\n\");\n fprintf(stderr, \"Please use compiler-generated dependency files (`gcc -MMD` etc).\\n\");\n \n redirect(startat, makefile);\n \n- fprintf(stdout, \"\\n$(warning WARNING: this tool is deprecated and will be removed in ROOT 6.14!)\\n\");\n+ fprintf(stdout, \"\\n$(warning WARNING: this tool is deprecated and will be removed in ROOT 6.16!)\\n\");\n fprintf(stdout, \"$(warning Please use compiler-generated dependency files (`gcc -MMD` etc).)\\n\\n\");\n \/*\n * catch signals.\n"} {"commit":"7d5ea747d5015481ab31fe661f5bc41b80ead6a5","subject":"Fix conflicts.","message":"Fix conflicts.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/bison\/reader.c\n+++ contrib\/bison\/reader.c\n@@ -1,5 +1,5 @@\n \/* Input parser for bison\n- Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.\n+ Copyright (C) 1984, 1986, 1989, 1992, 1998 Free Software Foundation, Inc.\n \n This file is part of Bison, the GNU Compiler Compiler.\n \n@@ -15,7 +15,8 @@\n \n You should have received a copy of the GNU General Public License\n along with Bison; see the file COPYING. If not, write to\n-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. *\/\n+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n+Boston, MA 02111-1307, USA. *\/\n \n \n \/* read in the grammar specification and record it in the format described in gram.h.\n@@ -26,10 +27,9 @@\n The entry point is reader(). *\/\n \n #include <stdio.h>\n-#include <ctype.h>\n #include \"system.h\"\n #include \"files.h\"\n-#include \"new.h\"\n+#include \"alloc.h\"\n #include \"symtab.h\"\n #include \"lex.h\"\n #include \"gram.h\"\n@@ -52,47 +52,30 @@\n extern int numval;\n extern int expected_conflicts;\n extern char *token_buffer;\n-\n-extern void init_lex();\n-extern void tabinit();\n-extern void output_headers();\n-extern void output_trailers();\n-extern void free_symtab();\n-extern void open_extra_files();\n-extern char *int_to_string();\n-extern char *printable_version();\n-extern void fatal();\n-extern void fatals();\n-extern void warn();\n-extern void warni();\n-extern void warns();\n-extern void warnss();\n-extern void warnsss();\n-extern void unlex();\n-extern void done();\n-\n-extern int skip_white_space();\n-extern int parse_percent_token();\n-extern int lex();\n-\n-void reader_output_yylsp();\n-void read_declarations();\n-void copy_definition();\n-void parse_token_decl();\n-void parse_start_decl();\n-void parse_type_decl();\n-void parse_assoc_decl();\n-void parse_union_decl();\n-void parse_expect_decl();\n-void parse_thong_decl();\n-void copy_action();\n-void readgram();\n-void record_rule_line();\n-void packsymbols();\n-void output_token_defines();\n-void packgram();\n-int read_signed_integer();\n-static int get_type();\n+extern int maxtoken;\n+\n+extern void init_lex PARAMS((void));\n+extern char *grow_token_buffer PARAMS((char *));\n+extern void tabinit PARAMS((void));\n+extern void output_headers PARAMS((void));\n+extern void output_trailers PARAMS((void));\n+extern void free_symtab PARAMS((void));\n+extern void open_extra_files PARAMS((void));\n+extern char *int_to_string PARAMS((int));\n+extern char *printable_version PARAMS((int));\n+extern void fatal PARAMS((char *));\n+extern void fatals PARAMS((char *, char *));\n+extern void warn PARAMS((char *));\n+extern void warni PARAMS((char *, int));\n+extern void warns PARAMS((char *, char *));\n+extern void warnss PARAMS((char *, char *, char *));\n+extern void warnsss PARAMS((char *, char *, char *, char *));\n+extern void unlex PARAMS((int));\n+extern void done PARAMS((int));\n+\n+extern int skip_white_space PARAMS((void));\n+extern int parse_percent_token PARAMS((void));\n+extern int lex PARAMS((void));\n \n typedef\n struct symbol_list\n@@ -104,6 +87,31 @@\n symbol_list;\n \n \n+void reader PARAMS((void));\n+void reader_output_yylsp PARAMS((FILE *));\n+void read_declarations PARAMS((void));\n+void copy_definition PARAMS((void));\n+void parse_token_decl PARAMS((int, int));\n+void parse_start_decl PARAMS((void));\n+void parse_type_decl PARAMS((void));\n+void parse_assoc_decl PARAMS((int));\n+void parse_union_decl PARAMS((void));\n+void parse_expect_decl PARAMS((void));\n+char *get_type_name PARAMS((int, symbol_list *));\n+void copy_guard PARAMS((symbol_list *, int));\n+void parse_thong_decl PARAMS((void));\n+void copy_action PARAMS((symbol_list *, int));\n+bucket *gensym PARAMS((void));\n+void readgram PARAMS((void));\n+void record_rule_line PARAMS((void));\n+void packsymbols PARAMS((void));\n+void output_token_defines PARAMS((FILE *));\n+void packgram PARAMS((void));\n+int read_signed_integer PARAMS((FILE *));\n+\n+#if 0\n+static int get_type PARAMS((void));\n+#endif\n \n int lineno;\n symbol_list *grammar;\n@@ -123,33 +131,31 @@\n static int gensym_count; \/* incremented for each generated symbol *\/\n \n static bucket *errtoken;\n+static bucket *undeftoken;\n \n \/* Nonzero if any action or guard uses the @n construct. *\/\n static int yylsp_needed;\n \n-extern char *version_string;\n-\n \n static void\n-skip_to_char(target)\n- int target;\n+skip_to_char (int target)\n {\n int c;\n if (target == '\\n')\n- warn(\" Skipping to next \\\\n\");\n+ warn(_(\" Skipping to next \\\\n\"));\n else\n- warni(\" Skipping to next %c\", target);\n+ warni(_(\" Skipping to next %c\"), target);\n \n do\n c = skip_white_space();\n while (c != target && c != EOF);\n- if (c != EOF) \n+ if (c != EOF)\n ungetc(c, finput);\n }\n \n \n void\n-reader()\n+reader (void)\n {\n start_flag = 0;\n startval = NULL; \/* start symbol not specified yet. *\/\n@@ -191,15 +197,17 @@\n errtoken->user_token_number = 256; \/* Value specified by posix. *\/\n \/* construct a token that represents all undefined literal tokens. *\/\n \/* it is always token number 2. *\/\n- getsym(\"$undefined.\")->class = STOKEN;\n+ undeftoken = getsym(\"$undefined.\");\n+ undeftoken->class = STOKEN;\n+ undeftoken->user_token_number = 2;\n \/* Read the declaration section. Copy %{ ... %} groups to ftable and fdefines file.\n Also notice any %token, %left, etc. found there. *\/\n- if (noparserflag) \n+ if (noparserflag)\n fprintf(ftable, \"\\n\/* Bison-generated parse tables, made from %s\\n\",\n \t\tinfile);\n else\n fprintf(ftable, \"\\n\/* A Bison parser, made from %s\\n\", infile);\n- fprintf(ftable, \" by %s *\/\\n\\n\", version_string);\n+ fprintf(ftable, \" by %s *\/\\n\\n\", VERSION_STRING);\n fprintf(ftable, \"#define YYBISON 1 \/* Identify Bison output. *\/\\n\\n\");\n read_declarations();\n \/* start writing the guard and action files, if they are needed. *\/\n@@ -225,8 +233,7 @@\n }\n \n void\n-reader_output_yylsp(f)\n- FILE *f;\n+reader_output_yylsp (FILE *f)\n {\n if (yylsp_needed)\n fprintf(f, LTYPESTR);\n@@ -237,7 +244,7 @@\n and copy the contents of any %{ ... %} groups to fattrs. *\/\n \n void\n-read_declarations ()\n+read_declarations (void)\n {\n register int c;\n register int tok;\n@@ -262,23 +269,23 @@\n \t case TOKEN:\n \t parse_token_decl (STOKEN, SNTERM);\n \t break;\n-\t\n+\n \t case NTERM:\n \t parse_token_decl (SNTERM, STOKEN);\n \t break;\n-\t\n+\n \t case TYPE:\n \t parse_type_decl();\n \t break;\n-\t\n+\n \t case START:\n \t parse_start_decl();\n \t break;\n-\t\n+\n \t case UNION:\n \t parse_union_decl();\n \t break;\n-\t\n+\n \t case EXPECT:\n \t parse_expect_decl();\n \t break;\n@@ -313,16 +320,16 @@\n \t break;\n \n \t default:\n-\t warns(\"unrecognized: %s\", token_buffer);\n+\t warns(_(\"unrecognized: %s\"), token_buffer);\n \t skip_to_char('%');\n \t }\n \t}\n else if (c == EOF)\n- fatal(\"no input grammar\");\n+ fatal(_(\"no input grammar\"));\n else\n \t{\n \t\tchar buff[100];\n-\t\tsprintf(buff, \"unknown character: %s\", printable_version(c)); \n+\t\tsprintf(buff, _(\"unknown character: %s\"), printable_version(c));\n \t\twarn(buff);\n \t\tskip_to_char('%');\n \t}\n@@ -334,7 +341,7 @@\n The %{ has already been read. Return after reading the %}. *\/\n \n void\n-copy_definition ()\n+copy_definition (void)\n {\n register int c;\n register int match;\n@@ -361,7 +368,7 @@\n \tcase '%':\n after_percent = -1;\n \t break;\n-\t \n+\n \tcase '\\'':\n \tcase '\"':\n \t match = c;\n@@ -371,22 +378,22 @@\n \t while (c != match)\n \t {\n \t if (c == EOF)\n-\t\tfatal(\"unterminated string at end of file\");\n+\t\tfatal(_(\"unterminated string at end of file\"));\n \t if (c == '\\n')\n \t\t{\n-\t\t warn(\"unterminated string\");\n+\t\t warn(_(\"unterminated string\"));\n \t\t ungetc(c, finput);\n \t\t c = match;\n \t\t continue;\n \t\t}\n \n \t putc(c, fattrs);\n-\t \n+\n \t if (c == '\\\\')\n \t\t{\n \t\t c = getc(finput);\n \t\t if (c == EOF)\n-\t\t fatal(\"unterminated string at end of file\");\n+\t\t fatal(_(\"unterminated string at end of file\"));\n \t\t putc(c, fattrs);\n \t\t if (c == '\\n')\n \t\t lineno++;\n@@ -435,7 +442,7 @@\n \t\t c = getc(finput);\n \t\t}\n \t else if (c == EOF)\n-\t\tfatal(\"unterminated comment in `%{' definition\");\n+\t\tfatal(_(\"unterminated comment in `%{' definition\"));\n \t else\n \t\t{\n \t\t putc(c, fattrs);\n@@ -446,7 +453,7 @@\n \t break;\n \n \tcase EOF:\n-\t fatal(\"unterminated `%{' definition\");\n+\t fatal(_(\"unterminated `%{' definition\"));\n \n \tdefault:\n \t putc(c, fattrs);\n@@ -473,8 +480,7 @@\n For %nterm, the arguments are reversed. *\/\n \n void\n-parse_token_decl (what_is, what_is_not)\n- int what_is, what_is_not;\n+parse_token_decl (int what_is, int what_is_not)\n {\n register int token = 0;\n register char *typename = 0;\n@@ -483,8 +489,13 @@\n \n for (;;)\n {\n- if(ungetc(skip_white_space(), finput) == '%')\n+ int tmp_char = ungetc (skip_white_space (), finput);\n+\n+ if (tmp_char == '%')\n \treturn;\n+ if (tmp_char == EOF)\n+\tfatals (\"Premature EOF after %s\", token_buffer);\n+\n token = lex();\n if (token == COMMA)\n \t{\n@@ -500,7 +511,7 @@\n \t symbol = NULL;\n \t}\n else if (token == IDENTIFIER && *symval->tag == '\\\"'\n-\t\t&& symbol) \n+\t\t&& symbol)\n \t{\n \t translations = 1;\n \t symval->class = STOKEN;\n@@ -508,8 +519,8 @@\n \t symval->user_token_number = symbol->user_token_number;\n \t symbol->user_token_number = SALIAS;\n \n-\t symval->alias = symbol;\t\n-\t symbol->alias = symval;\t\n+\t symval->alias = symbol;\n+\t symbol->alias = symval;\n \t symbol = NULL;\n \n \t nsyms--; \/* symbol and symval combined are only one symbol *\/\n@@ -520,7 +531,7 @@\n \t symbol = symval;\n \n \t if (symbol->class == what_is_not)\n-\t warns(\"symbol %s redefined\", symbol->tag);\n+\t warns(_(\"symbol %s redefined\"), symbol->tag);\n \t symbol->class = what_is;\n \t if (what_is == SNTERM && oldclass != SNTERM)\n \t symbol->value = nvars++;\n@@ -530,7 +541,7 @@\n \t if (symbol->type_name == NULL)\n \t\tsymbol->type_name = typename;\n \t else if (strcmp(typename, symbol->type_name) != 0)\n-\t\twarns(\"type redeclaration for %s\", symbol->tag);\n+\t\twarns(_(\"type redeclaration for %s\"), symbol->tag);\n \t }\n \t}\n else if (symbol && token == NUMBER)\n@@ -540,8 +551,8 @@\n }\n else\n \t{\n-\t warnss(\"`%s' is invalid in %s\",\n-\t\ttoken_buffer, \n+\t warnss(_(\"`%s' is invalid in %s\"),\n+\t\ttoken_buffer,\n \t\t(what_is == STOKEN) ? \"%token\" : \"%nterm\");\n \t skip_to_char('%');\n \t}\n@@ -549,7 +560,7 @@\n \n }\n \n-\/* parse what comes after %thong \n+\/* parse what comes after %thong\n \tthe full syntax is\n \t\t%thong <type> token number literal\n the <type> or number may be omitted. The number specifies the\n@@ -560,14 +571,14 @@\n The ->user_token_number of the first is SALIAS and the ->user_token_number\n of the second is set to the number, if any, from the declaration.\n The two symbols are linked via pointers in their ->alias fields.\n- \n+\n during output_defines_table, the symbol is reported\n thereafter, only the literal string is retained\n it is the literal string that is output to yytname\n *\/\n \n void\n-parse_thong_decl ()\n+parse_thong_decl (void)\n {\n register int token;\n register struct bucket *symbol;\n@@ -586,9 +597,9 @@\n \n \/* process first token *\/\n \n- if (token != IDENTIFIER) \n- {\n- warns(\"unrecognized item %s, expected an identifier\", \n+ if (token != IDENTIFIER)\n+ {\n+ warns(_(\"unrecognized item %s, expected an identifier\"),\n \t token_buffer);\n skip_to_char('%');\n return;\n@@ -599,7 +610,7 @@\n symbol = symval;\n \n token = lex();\t\t\/* get number or literal string *\/\n-\t\n+\n if (token == NUMBER) {\n usrtoknum = numval;\n token = lex();\t\t\/* okay, did number, now get literal *\/\n@@ -608,9 +619,9 @@\n \n \/* process literal string token *\/\n \n- if (token != IDENTIFIER || *symval->tag != '\\\"') \n- {\n- warns(\"expected string constant instead of %s\", \n+ if (token != IDENTIFIER || *symval->tag != '\\\"')\n+ {\n+ warns(_(\"expected string constant instead of %s\"),\n \t token_buffer);\n skip_to_char('%');\n return;\n@@ -619,8 +630,8 @@\n symval->type_name = typename;\n symval->user_token_number = usrtoknum;\n \n- symval->alias = symbol;\t\n- symbol->alias = symval;\t\n+ symval->alias = symbol;\n+ symbol->alias = symval;\n \n nsyms--;\t\t\t\/* symbol and symval combined are only one symbol *\/\n }\n@@ -629,12 +640,12 @@\n \/* parse what comes after %start *\/\n \n void\n-parse_start_decl ()\n+parse_start_decl (void)\n {\n if (start_flag)\n- warn(\"multiple %start declarations\");\n+ warn(_(\"multiple %start declarations\"));\n if (lex() != IDENTIFIER)\n- warn(\"invalid %start declaration\");\n+ warn(_(\"invalid %start declaration\"));\n else\n {\n start_flag = 1;\n@@ -647,14 +658,14 @@\n \/* read in a %type declaration and record its information for get_type_name to access *\/\n \n void\n-parse_type_decl ()\n+parse_type_decl (void)\n {\n register int k;\n register char *name;\n \n if (lex() != TYPENAME)\n {\n- warn(\"%type declaration has no <typename>\");\n+ warn(_(\"%type declaration has no <typename>\"));\n skip_to_char('%');\n return;\n }\n@@ -666,9 +677,12 @@\n for (;;)\n {\n register int t;\n-\n- if(ungetc(skip_white_space(), finput) == '%')\n+ int tmp_char = ungetc (skip_white_space (), finput);\n+\n+ if (tmp_char == '%')\n \treturn;\n+ if (tmp_char == EOF)\n+\tfatals (\"Premature EOF after %s\", token_buffer);\n \n t = lex();\n \n@@ -683,12 +697,12 @@\n \t if (symval->type_name == NULL)\n \t symval->type_name = name;\n \t else if (strcmp(name, symval->type_name) != 0)\n-\t warns(\"type redeclaration for %s\", symval->tag);\n+\t warns(_(\"type redeclaration for %s\"), symval->tag);\n \n \t break;\n \n \tdefault:\n-\t warns(\"invalid %%type declaration due to item: `%s'\", token_buffer);\n+\t warns(_(\"invalid %%type declaration due to item: `%s'\"), token_buffer);\n \t skip_to_char('%');\n \t}\n }\n@@ -700,8 +714,7 @@\n \/* assoc is either LEFT_ASSOC, RIGHT_ASSOC or NON_ASSOC. *\/\n \n void\n-parse_assoc_decl (assoc)\n-int assoc;\n+parse_assoc_decl (int assoc)\n {\n register int k;\n register char *name = NULL;\n@@ -712,9 +725,12 @@\n for (;;)\n {\n register int t;\n-\n- if(ungetc(skip_white_space(), finput) == '%')\n+ int tmp_char = ungetc (skip_white_space (), finput);\n+\n+ if (tmp_char == '%')\n \treturn;\n+ if (tmp_char == EOF)\n+\tfatals (\"Premature EOF after %s\", token_buffer);\n \n t = lex();\n \n@@ -732,18 +748,18 @@\n \n \tcase IDENTIFIER:\n \t if (symval->prec != 0)\n-\t warns(\"redefining precedence of %s\", symval->tag);\n+\t warns(_(\"redefining precedence of %s\"), symval->tag);\n \t symval->prec = lastprec;\n \t symval->assoc = assoc;\n \t if (symval->class == SNTERM)\n-\t warns(\"symbol %s redefined\", symval->tag);\n+\t warns(_(\"symbol %s redefined\"), symval->tag);\n \t symval->class = STOKEN;\n \t if (name)\n \t { \/* record the type, if one is specified *\/\n \t if (symval->type_name == NULL)\n \t\tsymval->type_name = name;\n \t else if (strcmp(name, symval->type_name) != 0)\n-\t\twarns(\"type redeclaration for %s\", symval->tag);\n+\t\twarns(_(\"type redeclaration for %s\"), symval->tag);\n \t }\n \t break;\n \n@@ -753,9 +769,9 @@\n \t symval->user_token_number = numval;\n \t translations = 1;\n }\n- else\t \n+ else\n {\n-\t warns(\"invalid text (%s) - number should be after identifier\", \n+\t warns(_(\"invalid text (%s) - number should be after identifier\"),\n \t\t\ttoken_buffer);\n \t skip_to_char('%');\n }\n@@ -765,7 +781,7 @@\n \t return;\n \n \tdefault:\n-\t warns(\"unexpected item: %s\", token_buffer);\n+\t warns(_(\"unexpected item: %s\"), token_buffer);\n \t skip_to_char('%');\n \t}\n \n@@ -781,7 +797,7 @@\n definition of YYSTYPE, the type of elements of the parser value stack. *\/\n \n void\n-parse_union_decl()\n+parse_union_decl (void)\n {\n register int c;\n register int count;\n@@ -789,7 +805,7 @@\n int cplus_comment;\n \n if (typed)\n- warn(\"multiple %union declarations\");\n+ warn(_(\"multiple %union declarations\"));\n \n typed = 1;\n \n@@ -847,7 +863,7 @@\n \t\t\t}\n \t\t }\n \t\t if (c == EOF)\n-\t\t fatal(\"unterminated comment at end of file\");\n+\t\t fatal(_(\"unterminated comment at end of file\"));\n \n \t\t if (!cplus_comment && c == '*')\n \t\t {\n@@ -873,7 +889,7 @@\n \n \tcase '}':\n \t if (count == 0)\n-\t warn (\"unmatched close-brace (`}')\");\n+\t warn (_(\"unmatched close-brace (`}')\"));\n \t count--;\n \t if (count <= 0)\n \t {\n@@ -895,7 +911,7 @@\n shift-reduce conflicts. *\/\n \n void\n-parse_expect_decl()\n+parse_expect_decl (void)\n {\n register int c;\n register int count;\n@@ -917,7 +933,7 @@\n ungetc (c, finput);\n \n if (count <= 0 || count > 10)\n-\twarn(\"argument of %expect is not an integer\");\n+\twarn(_(\"argument of %expect is not an integer\"));\n expected_conflicts = atoi (buffer);\n }\n \n@@ -927,18 +943,16 @@\n \/* Get the data type (alternative in the union) of the value for symbol n in rule rule. *\/\n \n char *\n-get_type_name(n, rule)\n-int n;\n-symbol_list *rule;\n-{\n- static char *msg = \"invalid $ value\";\n+get_type_name (int n, symbol_list *rule)\n+{\n+ static char *msg = N_(\"invalid $ value\");\n \n register int i;\n register symbol_list *rp;\n \n if (n < 0)\n {\n- warn(msg);\n+ warn(_(msg));\n return NULL;\n }\n \n@@ -950,7 +964,7 @@\n rp = rp->next;\n if (rp == NULL || rp->sym == NULL)\n \t{\n-\t warn(msg);\n+\t warn(_(msg));\n \t return NULL;\n \t}\n i++;\n@@ -968,9 +982,7 @@\n for the simple parser in which the stack is not popped until after the guard is run. *\/\n \n void\n-copy_guard(rule, stack_offset)\n-symbol_list *rule;\n-int stack_offset;\n+copy_guard (symbol_list *rule, int stack_offset)\n {\n register int c;\n register int n;\n@@ -1011,9 +1023,9 @@\n \t putc(c, fguard);\n \t if (count > 0)\n \t count--;\n-\t else \n-\t {\n-\t warn(\"unmatched right brace (`}')\");\n+\t else\n+\t {\n+\t warn(_(\"unmatched right brace (`}')\"));\n \t c = getc(finput);\t\/* skip it *\/\n \t }\n break;\n@@ -1027,22 +1039,22 @@\n \t while (c != match)\n \t {\n \t if (c == EOF)\n-\t\tfatal(\"unterminated string at end of file\");\n-\t if (c == '\\n') \n-\t\t{\n-\t\t warn(\"unterminated string\");\n+\t\tfatal(_(\"unterminated string at end of file\"));\n+\t if (c == '\\n')\n+\t\t{\n+\t\t warn(_(\"unterminated string\"));\n \t\t ungetc(c, finput);\n \t\t c = match;\t\t\/* invent terminator *\/\n \t\t continue;\n \t\t}\n \n \t putc(c, fguard);\n-\t \n+\n \t if (c == '\\\\')\n \t\t{\n \t\t c = getc(finput);\n \t\t if (c == EOF)\n-\t\t fatal(\"unterminated string\");\n+\t\t fatal(_(\"unterminated string\"));\n \t\t putc(c, fguard);\n \t\t if (c == '\\n')\n \t\t lineno++;\n@@ -1091,7 +1103,7 @@\n \t\t c = getc(finput);\n \t\t}\n \t else if (c == EOF)\n-\t\tfatal(\"unterminated comment\");\n+\t\tfatal(_(\"unterminated comment\"));\n \t else\n \t\t{\n \t\t putc(c, fguard);\n@@ -1110,7 +1122,12 @@\n \t register char *cp = token_buffer;\n \n \t while ((c = getc(finput)) != '>' && c > 0)\n-\t\t*cp++ = c;\n+\t\t{\n+\t\t if (cp == token_buffer + maxtoken)\n+\t\t cp = grow_token_buffer(cp);\n+\n+\t\t *cp++ = c;\n+\t\t}\n \t *cp = 0;\n \t type_name = token_buffer;\n \n@@ -1124,7 +1141,7 @@\n \t if (type_name)\n \t\tfprintf(fguard, \".%s\", type_name);\n \t if(!type_name && typed)\n-\t\twarns(\"$$ of `%s' has no declared type\", rule->sym->tag);\n+\t\twarns(_(\"$$ of `%s' has no declared type\"), rule->sym->tag);\n \t }\n \n \t else if (isdigit(c) || c == '-')\n@@ -1140,11 +1157,11 @@\n \t if (type_name)\n \t\tfprintf(fguard, \".%s\", type_name);\n \t if(!type_name && typed)\n-\t\twarnss(\"$%s of `%s' has no declared type\", int_to_string(n), rule->sym->tag);\n+\t\twarnss(_(\"$%s of `%s' has no declared type\"), int_to_string(n), rule->sym->tag);\n \t continue;\n \t }\n \t else\n-\t warni(\"$%s is invalid\", printable_version(c));\n+\t warns(_(\"$%s is invalid\"), printable_version(c));\n \n \t break;\n \n@@ -1158,7 +1175,7 @@\n \t }\n \t else\n \t {\n-\t warni(\"@%s is invalid\", printable_version(c));\n+\t warns(_(\"@%s is invalid\"), printable_version(c));\n \t n = 1;\n \t }\n \n@@ -1168,7 +1185,7 @@\n \t continue;\n \n \tcase EOF:\n-\t fatal(\"unterminated %%guard clause\");\n+\t fatal(_(\"unterminated %%guard clause\"));\n \n \tdefault:\n \t putc(c, fguard);\n@@ -1201,9 +1218,7 @@\n which says where to find $0 with respect to the top of the stack. *\/\n \n void\n-copy_action(rule, stack_offset)\n-symbol_list *rule;\n-int stack_offset;\n+copy_action (symbol_list *rule, int stack_offset)\n {\n register int c;\n register int n;\n@@ -1250,13 +1265,13 @@\n \t\t{\n \t\t if (c == '\\n')\n \t\t {\n-\t\t warn(\"unterminated string\");\n+\t\t warn(_(\"unterminated string\"));\n \t\t ungetc(c, finput);\n \t\t c = match;\n \t\t continue;\n \t\t }\n \t\t else if (c == EOF)\n-\t\t fatal(\"unterminated string at end of file\");\n+\t\t fatal(_(\"unterminated string at end of file\"));\n \n \t\t putc(c, faction);\n \n@@ -1264,7 +1279,7 @@\n \t\t {\n \t\t c = getc(finput);\n \t\t if (c == EOF)\n-\t\t\tfatal(\"unterminated string\");\n+\t\t\tfatal(_(\"unterminated string\"));\n \t\t putc(c, faction);\n \t\t if (c == '\\n')\n \t\t\tlineno++;\n@@ -1313,7 +1328,7 @@\n \t\t c = getc(finput);\n \t\t }\n \t\t else if (c == EOF)\n-\t\t fatal(\"unterminated comment\");\n+\t\t fatal(_(\"unterminated comment\"));\n \t\t else\n \t\t {\n \t\t putc(c, faction);\n@@ -1332,7 +1347,12 @@\n \t\t register char *cp = token_buffer;\n \n \t\t while ((c = getc(finput)) != '>' && c > 0)\n-\t\t *cp++ = c;\n+\t\t {\n+\t\t if (cp == token_buffer + maxtoken)\n+\t\t\tcp = grow_token_buffer(cp);\n+\n+\t\t *cp++ = c;\n+\t\t }\n \t\t *cp = 0;\n \t\t type_name = token_buffer;\n \t\t value_components_used = 1;\n@@ -1345,8 +1365,8 @@\n \t\t if (!type_name) type_name = get_type_name(0, rule);\n \t\t if (type_name)\n \t\t fprintf(faction, \".%s\", type_name);\n-\t\t if(!type_name && typed)\t\n-\t\t warns(\"$$ of `%s' has no declared type\", rule->sym->tag);\n+\t\t if(!type_name && typed)\n+\t\t warns(_(\"$$ of `%s' has no declared type\"), rule->sym->tag);\n \t\t}\n \t else if (isdigit(c) || c == '-')\n \t\t{\n@@ -1360,13 +1380,13 @@\n \t\t fprintf(faction, \"yyvsp[%d]\", n - stack_offset);\n \t\t if (type_name)\n \t\t fprintf(faction, \".%s\", type_name);\n-\t\t if(!type_name && typed)\t\n-\t\t warnss(\"$%s of `%s' has no declared type\", \n+\t\t if(!type_name && typed)\n+\t\t warnss(_(\"$%s of `%s' has no declared type\"),\n \t\t\t\tint_to_string(n), rule->sym->tag);\n \t\t continue;\n \t\t}\n \t else\n-\t\twarni(\"$%s is invalid\", printable_version(c));\n+\t\twarns(_(\"$%s is invalid\"), printable_version(c));\n \n \t break;\n \n@@ -1380,7 +1400,7 @@\n \t\t}\n \t else\n \t\t{\n-\t\t warn(\"invalid @-construct\");\n+\t\t warn(_(\"invalid @-construct\"));\n \t\t n = 1;\n \t\t}\n \n@@ -1390,7 +1410,7 @@\n \t continue;\n \n \t case EOF:\n-\t fatal(\"unmatched `{'\");\n+\t fatal(_(\"unmatched `{'\"));\n \n \t default:\n \t putc(c, faction);\n@@ -1417,7 +1437,7 @@\n whose name cannot conflict with the user's names. *\/\n \n bucket *\n-gensym()\n+gensym (void)\n {\n register bucket *sym;\n \n@@ -1438,10 +1458,10 @@\n labelled by the rule number they apply to. *\/\n \n void\n-readgram()\n+readgram (void)\n {\n register int t;\n- register bucket *lhs;\n+ register bucket *lhs = NULL;\n register symbol_list *p;\n register symbol_list *p1;\n register bucket *bp;\n@@ -1472,18 +1492,18 @@\n \t\t startval = lhs;\n \t\t start_flag = 1;\n \t\t}\n- \n+\n \t t = lex();\n \t if (t != COLON)\n \t\t{\n-\t\t warn(\"ill-formed rule: initial symbol not followed by colon\");\n+\t\t warn(_(\"ill-formed rule: initial symbol not followed by colon\"));\n \t\t unlex(t);\n \t\t}\n \t }\n \n \t if (nrules == 0 && t == BAR)\n \t {\n-\t warn(\"grammar starts with vertical bar\");\n+\t warn(_(\"grammar starts with vertical bar\"));\n \t lhs = symval;\t\/* BOGUS: use a random symval *\/\n \t }\n \t \/* start a new rule and record its lhs. *\/\n@@ -1514,7 +1534,7 @@\n \t nvars++;\n \t }\n \t else if (lhs->class == STOKEN)\n-\t warns(\"rule given for %s, which is a token\", lhs->tag);\n+\t warns(_(\"rule given for %s, which is a token\"), lhs->tag);\n \n \t \/* read the rhs of the rule. *\/\n \n@@ -1612,7 +1632,7 @@\n \n \t if (t == PREC)\n \t {\n-\t warn(\"two @prec's in a row\");\n+\t warn(_(\"two @prec's in a row\"));\n \t t = lex();\n \t crule->ruleprec = symval;\n \t t = lex();\n@@ -1620,7 +1640,7 @@\n \t if (t == GUARD)\n \t {\n \t if (! semantic_parser)\n-\t\twarn(\"%%guard present but %%semantic_parser not specified\");\n+\t\twarn(_(\"%%guard present but %%semantic_parser not specified\"));\n \n \t copy_guard(crule, rulelength);\n \t t = lex();\n@@ -1628,7 +1648,7 @@\n \t else if (t == LEFT_CURLY)\n \t {\n \t\t\/* This case never occurs -wjh *\/\n-\t if (actionflag) warn(\"two actions at end of one rule\");\n+\t if (actionflag) warn(_(\"two actions at end of one rule\"));\n \t copy_action(crule, rulelength);\n \t actionflag = 1;\n \t xactions++;\t\/* -wjh *\/\n@@ -1640,16 +1660,16 @@\n \t {\n \t if (lhs->type_name == 0 || first_rhs->type_name == 0\n \t\t || strcmp(lhs->type_name,first_rhs->type_name))\n-\t\twarnss(\"type clash (`%s' `%s') on default action\",\n+\t\twarnss(_(\"type clash (`%s' `%s') on default action\"),\n \t\t\tlhs->type_name ? lhs->type_name : \"\",\n \t\t\tfirst_rhs->type_name ? first_rhs->type_name : \"\");\n \t }\n \t \/* Warn if there is no default for $$ but we need one. *\/\n \t else if (!xactions && !first_rhs && lhs->type_name != 0)\n-\t warn(\"empty rule for typed nonterminal, and no action\");\n+\t warn(_(\"empty rule for typed nonterminal, and no action\"));\n \t if (t == SEMICOLON)\n \t t = lex();\n-\t} \n+\t}\n #if 0\n \/* these things can appear as alternatives to rules. *\/\n \/* NO, they cannot.\n@@ -1690,7 +1710,7 @@\n \n else\n \t{\n-\t warns(\"invalid input: %s\", token_buffer);\n+\t warns(_(\"invalid input: %s\"), token_buffer);\n \t t = lex();\n \t}\n }\n@@ -1698,10 +1718,10 @@\n \/* grammar has been read. Do some checking *\/\n \n if (nsyms > MAXSHORT)\n- fatals(\"too many symbols (tokens plus nonterminals); maximum %s\",\n+ fatals(_(\"too many symbols (tokens plus nonterminals); maximum %s\"),\n \t int_to_string(MAXSHORT));\n if (nrules == 0)\n- fatal(\"no rules in the input grammar\");\n+ fatal(_(\"no rules in the input grammar\"));\n \n if (typed == 0\t\/* JF put out same default YYSTYPE as YACC does *\/\n && !value_components_used)\n@@ -1719,7 +1739,7 @@\n for (bp = firstsymbol; bp; bp = bp->next)\n if (bp->class == SUNKNOWN)\n {\n-\twarns(\"symbol %s is used, but is not defined as a token and has no rules\",\n+\twarns(_(\"symbol %s is used, but is not defined as a token and has no rules\"),\n \t\t\tbp->tag);\n \tbp->class = SNTERM;\n \tbp->value = nvars++;\n@@ -1730,24 +1750,25 @@\n \n \n void\n-record_rule_line ()\n+record_rule_line (void)\n {\n \/* Record each rule's source line number in rline table. *\/\n \n if (nrules >= rline_allocated)\n {\n rline_allocated = nrules * 2;\n- rline = (short *) xrealloc (rline,\n-\t\t\t\t rline_allocated * sizeof (short));\n+ rline = (short *) xrealloc ((char *) rline,\n+\t\t\t\t rline_allocated * sizeof (short));\n }\n rline[nrules] = lineno;\n }\n \n \n+#if 0\n \/* read in a %type declaration and record its information for get_type_name to access *\/\n \/* this is unused. it is only called from the #if 0 part of readgram *\/\n static int\n-get_type()\n+get_type (void)\n {\n register int k;\n register int t;\n@@ -1755,9 +1776,9 @@\n \n t = lex();\n \n- if (t != TYPENAME) \n- {\n- warn(\"ill-formed %type declaration\");\n+ if (t != TYPENAME)\n+ {\n+ warn(_(\"ill-formed %type declaration\"));\n return t;\n }\n \n@@ -1781,7 +1802,7 @@\n \t if (symval->type_name == NULL)\n \t symval->type_name = name;\n \t else if (strcmp(name, symval->type_name) != 0)\n-\t warns(\"type redeclaration for %s\", symval->tag);\n+\t warns(_(\"type redeclaration for %s\"), symval->tag);\n \n \t break;\n \n@@ -1790,14 +1811,14 @@\n \t}\n }\n }\n-\n+#endif\n \n \n \/* assign symbol numbers, and write definition of token names into fdefines.\n Set up vectors tags and sprec of names and precedences of symbols. *\/\n \n void\n-packsymbols()\n+packsymbols (void)\n {\n register bucket *bp;\n register int tokno = 1;\n@@ -1827,7 +1848,7 @@\n \t{\n \t\t\/* this symbol and its alias are a single token defn.\n \t\t allocate a tokno, and assign to both\n-\t\t check agreement of ->prec and ->assoc fields \n+\t\t check agreement of ->prec and ->assoc fields\n \t\t\tand make both the same\n \t\t*\/\n \t\tif (bp->value == 0)\n@@ -1836,7 +1857,7 @@\n \t\tif (bp->prec != bp->alias->prec) {\n \t\t\tif (bp->prec != 0 && bp->alias->prec != 0\n \t\t\t\t\t&& bp->user_token_number == SALIAS)\n-\t\t\t\twarnss(\"conflicting precedences for %s and %s\",\n+\t\t\t\twarnss(_(\"conflicting precedences for %s and %s\"),\n \t\t\t\t\tbp->tag, bp->alias->tag);\n \t\t\tif (bp->prec != 0) bp->alias->prec = bp->prec;\n \t\t\telse bp->prec = bp->alias->prec;\n@@ -1845,7 +1866,7 @@\n \t\tif (bp->assoc != bp->alias->assoc) {\n \t\t\tif (bp->assoc != 0 && bp->alias->assoc != 0\n \t\t\t\t\t&& bp->user_token_number == SALIAS)\n-\t\t\t\twarnss(\"conflicting assoc values for %s and %s\",\n+\t\t\t\twarnss(_(\"conflicting assoc values for %s and %s\"),\n \t\t\t\t\tbp->tag, bp->alias->tag);\n \t\t\tif (bp->assoc != 0) bp->alias->assoc = bp->assoc;\n \t\t\telse bp->assoc = bp->alias->assoc;\n@@ -1885,14 +1906,14 @@\n \t the internal token number for $undefined.,\n \t which represents all invalid inputs. *\/\n for (i = 0; i <= max_user_token_number; i++)\n- token_translations[i] = 2; \n+ token_translations[i] = 2;\n \n for (bp = firstsymbol; bp; bp = bp->next)\n {\n if (bp->value >= ntokens) continue;\t\t \/* non-terminal *\/\n- if (bp->user_token_number == SALIAS) continue; \n+ if (bp->user_token_number == SALIAS) continue;\n if (token_translations[bp->user_token_number] != 2)\n-\t warnsss(\"tokens %s and %s both assigned number %s\",\n+\t warnsss(_(\"tokens %s and %s both assigned number %s\"),\n \t\t\t tags[token_translations[bp->user_token_number]],\n \t\t\t bp->tag,\n \t\t\t int_to_string(bp->user_token_number));\n@@ -1906,9 +1927,9 @@\n output_token_defines(ftable);\n \n if (startval->class == SUNKNOWN)\n- fatals(\"the start symbol %s is undefined\", startval->tag);\n+ fatals(_(\"the start symbol %s is undefined\"), startval->tag);\n else if (startval->class == STOKEN)\n- fatals(\"the start symbol %s is a token\", startval->tag);\n+ fatals(_(\"the start symbol %s is a token\"), startval->tag);\n \n start_symbol = startval->value;\n \n@@ -1939,13 +1960,12 @@\n #endif\n }\n }\n- \n-\/* For named tokens, but not literal ones, define the name. \n- The value is the user token number. \n+\n+\/* For named tokens, but not literal ones, define the name.\n+ The value is the user token number.\n *\/\n void\n-output_token_defines(file)\n-FILE *file;\n+output_token_defines (FILE *file)\n {\n bucket *bp;\n register char *cp, *symbol;\n@@ -1959,7 +1979,7 @@\n if (bp->user_token_number == SALIAS) continue;\n if ('\\'' == *symbol) continue;\t\/* skip literal character *\/\n if (bp == errtoken) continue; \t\/* skip error token *\/\n- if ('\\\"' == *symbol) \n+ if ('\\\"' == *symbol)\n \t{\n \t\t\/* use literal string only if given a symbol with an alias *\/\n \t\tif (bp->alias)\n@@ -1974,8 +1994,8 @@\n if (c != '\\0') continue;\n \n fprintf(file, \"#define\\t%s\\t%d\\n\", symbol,\n-\t\t((translations && ! rawtoknumflag) \n-\t\t\t? bp->user_token_number \n+\t\t((translations && ! rawtoknumflag)\n+\t\t\t? bp->user_token_number\n \t\t\t: bp->value));\n if (semantic_parser)\n fprintf(file, \"#define\\tT%s\\t%d\\n\", symbol, bp->value);\n@@ -1989,7 +2009,7 @@\n \/* convert the rules into the representation using rrhs, rlhs and ritems. *\/\n \n void\n-packgram()\n+packgram (void)\n {\n register int itemno;\n register int ruleno;\n@@ -2051,8 +2071,7 @@\n \/* Read a signed integer from STREAM and return its value. *\/\n \n int\n-read_signed_integer (stream)\n- FILE *stream;\n+read_signed_integer (FILE *stream)\n {\n register int c = getc(stream);\n register int sign = 1;\n"} {"commit":"bf0842aa0c468495d47bf63526f083283f474d68","subject":"rtpjitterbuffer: g_queue_clear_full introduced in glib 2.60","message":"rtpjitterbuffer: g_queue_clear_full introduced in glib 2.60\n\nDefine g_queue_clear_full if glib < 2.60.\n\nFixes #747\n\nPart-of: <https:\/\/gitlab.freedesktop.org\/gstreamer\/gst-plugins-good\/-\/merge_requests\/619>\n","repos":"GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -269,6 +269,18 @@\n #define GST_BUFFER_IS_RETRANSMISSION(buffer) \\\n GST_BUFFER_FLAG_IS_SET (buffer, GST_RTP_BUFFER_FLAG_RETRANSMISSION)\n \n+#if !GLIB_CHECK_VERSION(2, 60, 0)\n+#define g_queue_clear_full queue_clear_full\n+static void\n+queue_clear_full (GQueue * queue, GDestroyNotify free_func)\n+{\n+ gpointer data;\n+\n+ while ((data = g_queue_pop_head (queue)) != NULL)\n+ free_func (data);\n+}\n+#endif\n+\n struct _GstRtpJitterBufferPrivate\n {\n GstPad *sinkpad, *srcpad;\n"} {"commit":"372e9622c6861269e7133e75efc677955b6316f5","subject":"Missed .h for kd_tree.","message":"Missed .h for kd_tree.\n","repos":"mrroach9\/HyperDoom,mrroach9\/HyperDoom","returncode":1,"stderr":"error: pathspec 'renderer\/include\/geometry\/kd_tree.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- renderer\/include\/geometry\/kd_tree.h\n+++ renderer\/include\/geometry\/kd_tree.h\n@@ -0,0 +1,92 @@\n+#ifndef _KD_TREE_H_\n+#define _KD_TREE_H_\n+\n+#include <vector>\n+#include <memory>\n+#include \"geometry\/has_bounding_box3.h\"\n+#include \"geometry\/triangle3.h\"\n+#include \"geometry\/bounding_box3.h\"\n+\n+namespace hd {\n+ \/**\n+ * Data structure for K-d tree, which can provide fast lookup of geometry entities with given\n+ * range in 3d space.\n+ *\n+ * K-d tree is essentially a binary search tree with each non-leaf node representing a bounding\n+ * box in 3d space, with its two children a subdivision of the bounding box, usually along the\n+ * longest dimension. Each leaf nodes stores a list of actuall geometry entities that,\n+ * under certain partition rules, belong to their parent bounding box (e.g. partition by gravity\n+ * center coordinates).\n+ *\n+ * Depth of the K-d tree is limited by different criteria, either stopping at a fixed max level\n+ * or stop smartly when containing set is small. This is to avoid the depth of the tree becoming\n+ * too deep, a waste of both time and space.\n+ *\n+ * We restrict our K-d tree to a render-time read-only data strcuture, built from fixed scene\n+ * and models. Therefore the tree can only be constructed from raw list of entities, rather than\n+ * exposing incremental insert and delete methods.\n+ *\n+ * Multiple partitioning methods can be used to heuristically improve the query-time performance,\n+ * a few of which will be supported: partitioning by median, or by SAH (Surface Area Heuristic).\n+ * For more details, please refer to:\n+ * Physically Based Rendering, Third Edition. Matt Pharr, Wenzel Jakob, Greg Humphreys. \n+ *\/\n+ class KdTree {\n+ class PartitionPlane {\n+ public:\n+ \/\/ Represents the type of plane we're using to split the bounding box.\n+ \/\/ 0 -- x, 1 -- y, 2 -- z.\n+ unsigned int planeType;\n+ \/\/ E.g. if planeType = 0 and value = 1.0, it means the plane is x = 1.0.\n+ double value;\n+ public:\n+ PartitionPlane(): planeType(0), value(0.0) {}\n+ PartitionPlane(unsigned int planeTypeArg, double valueArg)\n+ : planeType(planeTypeArg), value(valueArg) {}\n+ };\n+\n+ \/**\n+ * Data structure for a single tree node. Stores pointers to left and right children if not\n+ * leaf, or a list of entities stored at leaf node.\n+ * If not a leaf node, partition plane is also defined to describe the subdivision between\n+ * left and right children.\n+ *\/\n+ class Node : public HasBoundingBox3 {\n+ public:\n+ BoundingBox3 boundingBox;\n+ bool isLeaf;\n+ std::vector<Triangle3> entities;\n+ PartitionPlane partitionPlane;\n+ std::shared_ptr<Node> left;\n+ std::shared_ptr<Node> right;\n+ public:\n+ Node() {}\n+ ~Node() {}\n+ };\n+\n+ \/**\n+ * Modes for how a list of geometry entities are partitioned into two lists.\n+ *\/\n+ enum PartitionMode {\n+ \/\/ Sorting all entities by their gravity centers along the longest axis, then\n+ \/\/ divide them into two equal halves (or differ at most 1) along that axis.\n+ CENTER_MEDIAN,\n+ \/\/ Surface Area Heuristics, a smart way of partitioning list of entities to \n+ \/\/ minimize the probablity of rays intersecting with both halves.\n+ SAH\n+ };\n+\n+ \/**\n+ * Modes to limit tree depths.\n+ *\/\n+ enum DepthLimitMode {\n+ \/\/ Set a max level constraint to the tree respect to total number of nodes n.\n+ \/\/ An experience value of d = 8 + 1.3 * log(N) is proven to be effective.\n+ MAX_LEVEL,\n+ \/\/ Stop partitioning when number of entities enclosed is less than a fixed value.\n+ MIN_ENTITIES\n+ };\n+ };\n+}\n+\n+#endif \/\/_KD_TREE_H_\n"} {"commit":"7859ec51b01e7b7d3e2669cc719712478fa02340","subject":"rtpjitterbuffer: Default do-lost to TRUE for rtpjitterbuffer [pexhack]","message":"rtpjitterbuffer: Default do-lost to TRUE for rtpjitterbuffer [pexhack]\n\nJust for convenience\n","repos":"pexip\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -133,7 +133,7 @@\n #define DEFAULT_DROP_ON_LATENCY FALSE\n #define DEFAULT_TS_OFFSET 0\n #define DEFAULT_MAX_TS_OFFSET_ADJUSTMENT 0\n-#define DEFAULT_DO_LOST FALSE\n+#define DEFAULT_DO_LOST TRUE\n #define DEFAULT_POST_DROP_MESSAGES FALSE\n #define DEFAULT_DROP_MESSAGES_INTERVAL_MS 200\n #define DEFAULT_MODE RTP_JITTER_BUFFER_MODE_SLAVE\n"} {"commit":"e363c6fc925c66e9c78e3073ee9aee4952963a79","subject":"bugfix: netssl read less then need","message":"bugfix: netssl read less then need\n","repos":"findstr\/silly","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lualib-src\/lualib-netssl.c\n+++ lualib-src\/lualib-netssl.c\n@@ -149,8 +149,6 @@\n \treturn sslwrite(h, str, n);\n }\n \n-static int count = 0;\n-\n static int\n sslread(BIO *h, char *buff, int size)\n {\n@@ -160,7 +158,6 @@\n \tsb = h->ptr;\n \tif (sb->datasz < (size_t)size)\n \t\treturn -1;\n-\tcount += size;\n \tret = size;\n \toffset = sb->offset;\n \twhile (size > 0) {\n@@ -321,15 +318,19 @@\n \tstruct socketbuff *sb;\n \tsb = (struct socketbuff *)luaL_checkudata(L, 1, \"socketbuff\");\n \tsize = luaL_checkinteger(L, 2);\n-\tassert(sb->presize == 0);\n+\tassert((size_t)size > sb->presize);\n+\tsize -= sb->presize;\n \tcheckprebuff(sb, size);\n-\tret = SSL_read(sb->ssl, sb->prebuff, size);\n+\tret = SSL_read(sb->ssl, &sb->prebuff[sb->presize], size);\n \tif (ret < 0) {\n \t\tlua_pushnil(L);\n+\t} else if (ret < size) {\n+\t\tsb->presize += ret;\n+\t\tlua_pushnil(L);\n \t} else {\n-\t\tassert(ret == size);\n+\t\tsize += sb->presize;\n+\t\tsb->presize = 0;\n \t\tlua_pushlstring(L, sb->prebuff, size);\n-\t\tsb->presize = 0;\n \t}\n \treturn 1;\n }\n"} {"commit":"a8c7ff74896d6fd507d9910aebb7fd13f1cc272e","subject":"jitterbuffer: use corrected timeout when rescheduling","message":"jitterbuffer: use corrected timeout when rescheduling\n\nWhen we recalculate the timeout, use the corrected timeout value depending on\nthe timer type.\n","repos":"sh0\/gst-plugins-good,shelsonjava\/gst-plugins-good,jcaden\/gst-plugins-good,lovebug356\/gst-plugins-good,krieger-od\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,lovebug356\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,sh0\/gst-plugins-good,wkatsak\/gst-plugins-good,cablelabs\/gst-plugins-good,BigBrother-International\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,jpakkane\/gstreamer-plugins-good,veo-labs\/gst-plugins-good,Kurento\/gst-plugins-good,greg80303\/gst-plugins-good,collects\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,jcaden\/gst-plugins-good,Kurento\/gst-plugins-good,loshca\/gst-plugins-good,rawoul\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,sh0\/gst-plugins-good,Kurento\/gst-plugins-good,sebras\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,rawoul\/gst-plugins-good,Lachann\/gst-plugins-good,ariscop\/gst-plugins-good,strukturag\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,stfl\/gst-plugins-good,StreamUtils\/gst-plugins-good,ariscop\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,stfl\/gst-plugins-good,froggatt\/gst-plugins-good-m,kittee\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,shelsonjava\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,davibe\/gst-plugins-good-1.0,shelsonjava\/gst-plugins-good,stfl\/gst-plugins-good,greg80303\/gst-plugins-good,cfoch\/gst-plugins-good,sebras\/gst-plugins-good,surround-io\/gst-plugins-good,vatavuserban\/gst-plugins-good,surround-io\/gst-plugins-good,froggatt\/gst-plugins-good-m,veo-labs\/gst-plugins-good,krieger-od\/gst-plugins-good,GStreamer\/gst-plugins-good,froggatt\/gst-plugins-good-m,froggatt\/gst-plugins-good-m,chamois94\/gst-plugins-good,pexip\/gst-plugins-good,ndufresne\/gst-plugins-good,rawoul\/gst-plugins-good,BigBrother-International\/gst-plugins-good,krieger-od\/gst-plugins-good,chamois94\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,jpakkane\/gstreamer-plugins-good,ndufresne\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,cablelabs\/gst-plugins-good,jcaden\/gst-plugins-good,collects\/gst-plugins-good,StreamUtils\/gst-plugins-good,loshca\/gst-plugins-good,ndufresne\/gst-plugins-good,jhodapp\/gst-plugins-good,sebras\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,ijsf\/OpenWebRTC-gst-plugins-good,ariscop\/gst-plugins-good,ikonst\/gst-plugins-good,Kurento\/gst-plugins-good,reynaldo-samsung\/gst-plugins-good,cfoch\/gst-plugins-good,cablelabs\/gst-plugins-good,vatavuserban\/gst-plugins-good,jhodapp\/gst-plugins-good,wkatsak\/gst-plugins-good,loshca\/gst-plugins-good,lovebug356\/gst-plugins-good,strukturag\/gst-plugins-good,ikonst\/gst-plugins-good,hizukiayaka\/gst-plugins-good,ikonst\/gst-plugins-good,greg80303\/gst-plugins-good,vatavuserban\/gst-plugins-good,wkatsak\/gst-plugins-good,pexip\/gst-plugins-good,jcaden\/gst-plugins-good,chamois94\/gst-plugins-good,surround-io\/gst-plugins-good,lovebug356\/gst-plugins-good,kittee\/gst-plugins-good,BigBrother-International\/gst-plugins-good,ikonst\/gst-plugins-good,BigBrother-International\/gst-plugins-good,kittee\/gst-plugins-good,collects\/gst-plugins-good,ariscop\/gst-plugins-good,Lachann\/gst-plugins-good,cfoch\/gst-plugins-good,Lachann\/gst-plugins-good,loshca\/gst-plugins-good,hizukiayaka\/gst-plugins-good,rawoul\/gst-plugins-good,hizukiayaka\/gst-plugins-good,kittee\/gst-plugins-good,pexip\/gst-plugins-good,chamois94\/gst-plugins-good,pexip\/gst-plugins-good,jhodapp\/gst-plugins-good,strukturag\/gst-plugins-good,davibe\/gst-plugins-good-1.0,krieger-od\/gst-plugins-good,greg80303\/gst-plugins-good,wkatsak\/gst-plugins-good,veo-labs\/gst-plugins-good,sebras\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,StreamUtils\/gst-plugins-good,sh0\/gst-plugins-good,ndufresne\/gst-plugins-good,Kurento\/gst-plugins-good,hizukiayaka\/gst-plugins-good,cablelabs\/gst-plugins-good,stfl\/gst-plugins-good,strukturag\/gst-plugins-good,cfoch\/gst-plugins-good,shelsonjava\/gst-plugins-good,surround-io\/gst-plugins-good,freedesktop-unofficial-mirror\/gstreamer__gst-plugins-good,StreamUtils\/gst-plugins-good,veo-labs\/gst-plugins-good,vatavuserban\/gst-plugins-good,jhodapp\/gst-plugins-good,GrokImageCompression\/gst-plugins-good,davibe\/gst-plugins-good-1.0,davibe\/gst-plugins-good-1.0,Lachann\/gst-plugins-good,collects\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -1326,14 +1326,34 @@\n }\n }\n \n+static GstClockTime\n+get_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer)\n+{\n+ GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n+ GstClockTime test_timeout;\n+\n+ if ((test_timeout = timer->timeout) == -1)\n+ return -1;\n+\n+ if (timer->type != TIMER_TYPE_EXPECTED) {\n+ \/* add our latency and offset to get output times. *\/\n+ test_timeout = apply_offset (jitterbuffer, test_timeout);\n+ test_timeout += priv->latency_ns;\n+ }\n+ return test_timeout;\n+}\n+\n static void\n recalculate_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer)\n {\n GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n \n- if (priv->clock_id && (timer->timeout == -1\n- || priv->timer_timeout > timer->timeout))\n- unschedule_current_timer (jitterbuffer);\n+ if (priv->clock_id) {\n+ GstClockTime timeout = get_timeout (jitterbuffer, timer);\n+\n+ if (timeout == -1 || timeout < priv->timer_timeout)\n+ unschedule_current_timer (jitterbuffer);\n+ }\n }\n \n static TimerData *\n@@ -2131,28 +2151,17 @@\n len = priv->timers->len;\n for (i = 0; i < len; i++) {\n TimerData *test = &g_array_index (priv->timers, TimerData, i);\n- GstClockTime test_timeout;\n+ GstClockTime test_timeout = get_timeout (jitterbuffer, test);\n \n GST_DEBUG_OBJECT (jitterbuffer, \"%d, %d, %\" GST_TIME_FORMAT,\n- i, test->seqnum, GST_TIME_ARGS (test->timeout));\n-\n- test_timeout = test->timeout;\n- if (test_timeout == -1) {\n+ i, test->seqnum, GST_TIME_ARGS (test_timeout));\n+\n+ \/* find the smallest timeout *\/\n+ if (timer == NULL || test_timeout == -1 || test_timeout < timer_timeout) {\n timer = test;\n timer_timeout = test_timeout;\n- break;\n- }\n-\n- if (test->type != TIMER_TYPE_EXPECTED) {\n- \/* add our latency and offset to get output times. *\/\n- test_timeout = apply_offset (jitterbuffer, test_timeout);\n- test_timeout += priv->latency_ns;\n- }\n-\n- \/* find the smallest timeout *\/\n- if (timer == NULL || test_timeout < timer_timeout) {\n- timer = test;\n- timer_timeout = test_timeout;\n+ if (timer_timeout == -1)\n+ break;\n }\n }\n if (timer) {\n@@ -2198,8 +2207,8 @@\n ret = gst_clock_id_wait (id, &clock_jitter);\n \n JBUF_LOCK (priv);\n- GST_DEBUG_OBJECT (jitterbuffer, \"sync done, %d, %\" G_GINT64_FORMAT,\n- ret, clock_jitter);\n+ GST_DEBUG_OBJECT (jitterbuffer, \"sync done, %d, #%d, %\" G_GINT64_FORMAT,\n+ ret, priv->timer_seqnum, clock_jitter);\n \/* and free the entry *\/\n gst_clock_id_unref (id);\n priv->clock_id = NULL;\n"} {"commit":"9b706b62201983e7c3df79b5cc809f64ad857a15","subject":"rtpjitterbuffer: Constify timer pointers where possible","message":"rtpjitterbuffer: Constify timer pointers where possible\n\nThis helps understanding which function modify the Timerdata\nand which one does not. This is not always obvious from thelper\nname considering recalculate_timer() does not.\n","repos":"pexip\/gst-plugins-good,pexip\/gst-plugins-good,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good,pexip\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,GStreamer\/gst-plugins-good,pexip\/gst-plugins-good","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/rtpmanager\/gstrtpjitterbuffer.c\n+++ gst\/rtpmanager\/gstrtpjitterbuffer.c\n@@ -516,7 +516,7 @@\n jitterbuffer);\n \n static void update_rtx_stats (GstRtpJitterBuffer * jitterbuffer,\n- TimerData * timer, GstClockTime dts, gboolean success);\n+ const TimerData * timer, GstClockTime dts, gboolean success);\n \n static TimerQueue *timer_queue_new (void);\n static void timer_queue_free (TimerQueue * queue);\n@@ -2127,7 +2127,7 @@\n }\n \n static GstClockTime\n-get_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer)\n+get_timeout (GstRtpJitterBuffer * jitterbuffer, const TimerData * timer)\n {\n GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n GstClockTime test_timeout;\n@@ -2144,7 +2144,7 @@\n }\n \n static void\n-recalculate_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer)\n+recalculate_timer (GstRtpJitterBuffer * jitterbuffer, const TimerData * timer)\n {\n GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n \n@@ -3792,7 +3792,7 @@\n }\n \n static void\n-update_rtx_stats (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,\n+update_rtx_stats (GstRtpJitterBuffer * jitterbuffer, const TimerData * timer,\n GstClockTime dts, gboolean success)\n {\n GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;\n"} {"commit":"3a189f3abfd8502b1a74af8d1c9d2ea46e54097f","subject":"fix some bad bmap handling","message":"fix some bad bmap handling\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@18751 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/up_sched_res.c\n+++ slashd\/up_sched_res.c\n@@ -342,6 +342,7 @@\n \t\tpscrpc_req_finished(rq);\n \t\tsl_csvc_decref(csvc);\n \t\tuswi_unref(wk);\n+\t\tbmap_op_done(b);\n \t\treturn (1);\n \t}\n \n@@ -350,7 +351,7 @@\n \ttract[BREPLST_REPL_SCHED] = BREPLST_REPL_QUEUED;\n \tmds_repl_bmap_apply(b, tract, NULL, off);\n \tif (undo_write)\n-\t\tmds_bmap_write_repls_rel(b);\n+\t\tmds_bmap_write_logrepls(b);\n \n fail:\n \tif (amt)\n@@ -431,6 +432,7 @@\n \tif (rc == 0) {\n \t\tuswi_unref(wk);\n \t\tsl_csvc_decref(csvc);\n+\t\tbmap_op_done(b);\n \t\treturn (1);\n \t}\n \n@@ -439,7 +441,7 @@\n \ttract[BREPLST_TRUNCPNDG_SCHED] = BREPLST_TRUNCPNDG;\n \tmds_repl_bmap_apply(b, tract, NULL, off);\n \tif (undo_write)\n-\t\tmds_bmap_write_repls_rel(b);\n+\t\tmds_bmap_write_logrepls(b);\n \n fail:\n \tif (csvc)\n@@ -525,6 +527,7 @@\n \tif (rc == 0) {\n \t\tuswi_unref(wk);\n \t\tsl_csvc_decref(csvc);\n+\t\tbmap_op_done(b);\n \t\treturn (1);\n \t}\n \n@@ -534,7 +537,7 @@\n \ttract[BREPLST_GARBAGE_SCHED] = BREPLST_GARBAGE;\n \tmds_repl_bmap_apply(b, tract, NULL, off);\n \tif (undo_write)\n-\t\tmds_bmap_write_repls_rel(b);\n+\t\tmds_bmap_write_logrepls(b);\n \n fail:\n \tif (csvc)\n"} {"commit":"74217edbcb87719c35e7473a2f75914546c90216","subject":"* change to ANSI C style.","message":"* change to ANSI C style.\n","repos":"benolee\/ruby-gnome2,benolee\/ruby-gnome2,benolee\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkscrolledwindow.c\n+++ gtk2\/ext\/gtk2\/rbgtkscrolledwindow.c\n@@ -17,10 +17,7 @@\n #define _SELF(self) (GTK_SCROLLED_WINDOW(RVAL2GOBJ(self)))\n \n static VALUE\n-scwin_initialize(argc, argv, self)\n- int argc;\n- VALUE *argv;\n- VALUE self;\n+scwin_initialize(int argc, VALUE *argv, VALUE self)\n {\n VALUE arg1, arg2;\n GtkAdjustment *h_adj = NULL;\n@@ -36,8 +33,7 @@\n }\n \n static VALUE\n-scwin_set_policy(self, hpolicy, vpolicy)\n- VALUE self, hpolicy, vpolicy;\n+scwin_set_policy(VALUE self, VALUE hpolicy, VALUE vpolicy)\n {\n gtk_scrolled_window_set_policy(_SELF(self),\n RVAL2GENUM(hpolicy, GTK_TYPE_POLICY_TYPE),\n@@ -46,8 +42,7 @@\n }\n \n static VALUE\n-scwin_get_policy(self)\n- VALUE self;\n+scwin_get_policy(VALUE self)\n {\n GtkPolicyType hpolicy, vpolicy;\n \n@@ -58,8 +53,7 @@\n }\n \n static VALUE\n-scwin_add_with_viewport(self, other)\n- VALUE self, other;\n+scwin_add_with_viewport(VALUE self, VALUE other)\n {\n gtk_scrolled_window_add_with_viewport(_SELF(self),\n GTK_WIDGET(RVAL2GOBJ(other)));\n@@ -69,15 +63,13 @@\n \n #if GTK_CHECK_VERSION(2,8,0)\n static VALUE\n-scwin_get_hscrollbar(self)\n- VALUE self;\n+scwin_get_hscrollbar(VALUE self)\n {\n return GOBJ2RVAL(gtk_scrolled_window_get_hscrollbar(_SELF(self)));\n }\n \n static VALUE\n-scwin_get_vscrollbar(self)\n- VALUE self;\n+scwin_get_vscrollbar(VALUE self)\n {\n return GOBJ2RVAL(gtk_scrolled_window_get_vscrollbar(_SELF(self)));\n }\n@@ -85,8 +77,7 @@\n \n #if GTK_CHECK_VERSION(2,10,0)\n static VALUE\n-scwin_set_placement(self, corner_type)\n- VALUE self, corner_type;\n+scwin_set_placement(VALUE self, VALUE corner_type)\n {\n gtk_scrolled_window_set_placement(_SELF(self), \n RVAL2GENUM(corner_type, GTK_TYPE_CORNER_TYPE));\n@@ -94,16 +85,14 @@\n }\n \n static VALUE\n-scwin_unset_placement(self)\n- VALUE self;\n+scwin_unset_placement(VALUE self)\n {\n gtk_scrolled_window_unset_placement(_SELF(self));\n return self;\n }\n \n static VALUE\n-scwin_get_placement(self)\n- VALUE self;\n+scwin_get_placement(VALUE self)\n {\n return GENUM2RVAL(gtk_scrolled_window_get_placement(_SELF(self)), \n GTK_TYPE_CORNER_TYPE);\n"} {"commit":"487b725f516e75b9de05402d52ad76ae03265e6c","subject":"Completion: set translation domain to the GtkBuilder","message":"Completion: set translation domain to the GtkBuilder\n\nThe button \"Details...\" was not translated, although the strings were set\nas translatable.\n","repos":"GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,cburschka\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,cburschka\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview,uajain\/gtksourceview,GNOME\/gtksourceview,GNOME\/gtksourceview","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtksourceview\/gtksourcecompletion.c\n+++ gtksourceview\/gtksourcecompletion.c\n@@ -2929,6 +2929,7 @@\n \tGtkWidget *toggle_button_info;\n \n \tbuilder = gtk_builder_new ();\n+\tgtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);\n \n \tgtk_builder_add_from_resource (builder,\n \t\t\t\t \"\/org\/gnome\/gtksourceview\/ui\/gtksourcecompletion.ui\",\n"} {"commit":"15ea19815d0c15277cfedb607d3891ff01bbd90a","subject":"fix some of saturation errors","message":"fix some of saturation errors\n","repos":"Corly\/ImageProcessing,Corly\/ImageProcessing,Corly\/ImageProcessing","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- saturation.h\n+++ saturation.h\n@@ -6,9 +6,11 @@\n #include <corona.h>\n #include <math.h>\n \n-#define UNDERSATURATION 1\n+#define UNDERSATURATION 1\n #define SATURATION_OK 2\n #define OVERSATURATION 3\n+#define DELTA 0.004\n+\n \n #define Pr 0.299\n #define Pg 0.587\n@@ -20,31 +22,48 @@\n {\n if(t < 0) t += 1;\n if(t > 1) t -= 1;\n- if(t < 1\/6) return p + (q - p) * 6 * t;\n- if(t < 1\/2) return q;\n- if(t < 2\/3) return p + (q - p) * (2\/3 - t) * 6;\n+ if(t < 1\/6){\n+ printf(\"1\/6\\n\");\n+ return p + (q - p) * 6 * t;\n+ }\n+ if(t < 1\/2) {\n+ printf(\"1\/2\\n\");\n+ return q;\n+ }\n+\n+ if(t < 2\/3) {\n+ printf(\"1\/3\\n\");\n+ return p + (q - p) * (2\/3 - t) * 6;\n+ }\n return p;\n }\n \n \n void hslToRgb(double h, double s, double l, byte *r, byte *g, byte *b)\n {\n+ printf(\"hsl: %lf, %lf, %lf\\n\", h, s, l);\n+\n double R, G, B;\n- if (s == 0) {\n- R = G = B = 1;\n+ if (s < DELTA) {\n+ R = G = B = l;\n }\n else {\n double q = l < 0.5 ? l * (1 + s) : l + s - l * s;\n double p = 2 * l - q;\n \n- R = hus2rgb(p, q, h + 1\/3);\n+ double offset = 1.0f \/ 3.0f;\n+ R = hue2rgb(p, q, h + offset);\n G = hue2rgb(p, q, h);\n- B = hue2rgb(p, q, h - 1\/3);\n+ B = hue2rgb(p, q, h - offset);\n }\n \n *r = R * 255;\n *g = G * 255;\n *b = B * 255;\n+ \/\/ printf(\"rgb: %lf, %lf, %lf\\n\", R, G, B);\n+\n+ printf(\"rgb: %d, %d, %d\\n\", *r, *g, *b);\n+\n }\n \n double getMax(double a, double b, double c) \n@@ -60,7 +79,6 @@\n }\n \n return a;\n-\n }\n \n double getMin(double a, double b, double c) \n@@ -97,20 +115,25 @@\n double d = max - min;\n *s = *l > 0.5 ? d \/ (2 - max - min) : d \/ (max + min);\n \n- if (max == r) {\n- *h = (g - b) \/ d + (g < b ? 6 : 0); \n- }\n-\n- if (max == g) {\n- *h = (b - r) \/ d + 2;\n- }\n-\n- if (max == b) {\n- *h = (r - g) \/ d + 4;\n- }\n- \n- *h \/= 6;\n+ if (max == R) {\n+ *h = (double) (G - B) \/ d + (G < B ? 6 : 0); \n+ }\n+\n+ if (max == G) {\n+ *h = (double) (B - R) \/ d + 2;\n+ }\n+\n+ if (max == B) {\n+ *h = (double) (R - G) \/ d + 4;\n+ }\n+ \n+ \/\/ printf (\"before: %lf\\n\", *h);\n+ *h \/= 6.0f;\n+ \/\/ printf (\"after: %lf\\n\", *h);\n+\n } \n+ \/\/ printf(\"hsl: %lf, %lf, %lf\\n\", *h, *s, *l);\n+\n }\n \n int check_saturation(double *h, int width, int height)\n@@ -154,21 +177,12 @@\n double first_threshold = 0.33f;\n double second_threshold = 0.66f;\n \n- if (*s < first_threshold) {\n+ if (*s < first_threshold || *s > second_threshold) {\n *s += change;\n return;\n }\n- else if (*s < second_threshold) {\n+ else {\n *s += change \/ 4;\n- return;\n- }\n-\n- if (*s > second_threshold) {\n- *s -= change;\n- return;\n- }\n- else if (*s > first_threshold) {\n- *s -= change \/ 4;\n return;\n }\n \n@@ -184,23 +198,36 @@\n \n for (int i = 0; i < width * height; ++i) {\n rgbToHsl(red[i], green[i], blue[i], &h[i], &s[i], &l[i]);\n- }\n+ \/\/printf(\"hsl before: %lf, %lf, %lf\\n\", h[i], s[i], l[i]);\n+\n+ }\n+\n+ int i = 85;\n+ printf(\"hsl before: %lf, %lf, %lf\\n\", h[i], s[i], l[i]);\n+\n \n int k = check_saturation(s, width, height);\n \n- if (k == UNDERSATURATION) {\n- for (int i = 0; i < width * height; ++i) {\n- changeSaturation(&s[i], 0.1);\n- }\n- } \n- else if(k == OVERSATURATION) {\n- for (int i = 0; i < width * height; ++i) {\n- changeSaturation(&s[i], 0.1);\n- }\n- }\n+ \/\/ if (k == UNDERSATURATION) {\n+ \/\/ for (int i = 0; i < width * height; ++i) {\n+ \/\/ changeSaturation(&s[i], 0.1);\n+ \/\/ }\n+ \/\/ } \n+ \/\/ else if(k == OVERSATURATION) {\n+ \/\/ for (int i = 0; i < width * height; ++i) {\n+ \/\/ changeSaturation(&s[i], -0.1);\n+ \/\/ }\n+ \/\/ }\n+\n+ printf(\"hsl: %lf, %lf, %lf\\n\", h[i], s[i], l[i]);\n \n for (int i = 0; i < width * height; ++i) {\n+ \/\/ printf(\"before: %d, %d, %d\\n\", red[i], green[i], blue[i]);\n+ \/\/printf(\"hsl: %lf, %lf, %lf\\n\", h[i], s[i], l[i]);\n+\n hslToRgb(h[i], s[i], l[i], &red[i], &green[i], &blue[i]);\n+\n+ \/\/ printf(\"after: %d, %d, %d\\n\", red[i], green[i], blue[i]);\n }\n \n }\n"} {"commit":"cb9a66bd8a654c03bb98b0e62ac1cc8fb088a99f","subject":"Properly prefix visibility macros.","message":"Properly prefix visibility macros.\n","repos":"DerThorsten\/magnum,DerThorsten\/magnum,ashimidashajia\/magnum,DerThorsten\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,DerThorsten\/magnum,DerThorsten\/magnum,MiUishadow\/magnum,MiUishadow\/magnum,ashimidashajia\/magnum,ashimidashajia\/magnum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Plugins\/TgaImporter\/TgaImporter.h\n+++ src\/Plugins\/TgaImporter\/TgaImporter.h\n@@ -32,11 +32,11 @@\n #include <Trade\/AbstractImporter.h>\n \n #ifdef TgaImporter_EXPORTS\n- #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT\n+ #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT\n #else\n- #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT\n+ #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT\n #endif\n-#define MAGNUM_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL\n+#define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL\n \n namespace Magnum { namespace Trade {\n \n@@ -45,7 +45,7 @@\n \n Supports uncompressed BGR, BGRA or grayscale images with 8 bits per channel.\n *\/\n-class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {\n+class MAGNUM_TRADE_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter {\n public:\n \/** @brief Default constructor *\/\n explicit TgaImporter();\n@@ -56,13 +56,13 @@\n virtual ~TgaImporter();\n \n private:\n- Features MAGNUM_TGAIMPORTER_LOCAL doFeatures() const override;\n- bool MAGNUM_TGAIMPORTER_LOCAL doIsOpened() const override;\n- void MAGNUM_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference<const unsigned char> data) override;\n- void MAGNUM_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override;\n- void MAGNUM_TGAIMPORTER_LOCAL doClose() override;\n- UnsignedInt MAGNUM_TGAIMPORTER_LOCAL doImage2DCount() const override;\n- ImageData2D MAGNUM_TGAIMPORTER_LOCAL * doImage2D(UnsignedInt id) override;\n+ Features MAGNUM_TRADE_TGAIMPORTER_LOCAL doFeatures() const override;\n+ bool MAGNUM_TRADE_TGAIMPORTER_LOCAL doIsOpened() const override;\n+ void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenData(Containers::ArrayReference<const unsigned char> data) override;\n+ void MAGNUM_TRADE_TGAIMPORTER_LOCAL doOpenFile(const std::string& filename) override;\n+ void MAGNUM_TRADE_TGAIMPORTER_LOCAL doClose() override;\n+ UnsignedInt MAGNUM_TRADE_TGAIMPORTER_LOCAL doImage2DCount() const override;\n+ ImageData2D MAGNUM_TRADE_TGAIMPORTER_LOCAL * doImage2D(UnsignedInt id) override;\n \n std::istream* in;\n };\n"} {"commit":"af02940b09ad8b5084d774996cd7a442db24ada9","subject":"Update stop.c","message":"Update stop.c","repos":"VVurbanov\/po-homework,karakonjel\/po-homework,AlexAndreev\/po-homework,vincho7012\/po-homework,ivanmilevtues\/po-homework","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 2015-2016\/B\/18\/02\/stop.c\n+++ 2015-2016\/B\/18\/02\/stop.c\n@@ -5,24 +5,29 @@\n {\n char word[50];\n int counter, lenght;\n- \n+\n scanf(\"%s\", word);\n lenght = strlen(word);\n \n for(counter = 0; counter < lenght; counter++)\n {\n-\tif(word[counter] == 'S' && word[counter + 1] == 'T' && word[counter + 2] == 'O' && word[counter + 3] == 'P')\n-\t{\n- \n-\t for(counter = 0; counter < (lenght - 4); counter++)\n-\t {\n-\t\tprintf(\"%c\", word[counter] - 32);\n-\t }\n-\t \n- \t printf(\"\\n\");\n+ if(word[counter] == 'S' && word[counter + 1] == 'T' && word[counter + 2] == 'O' && word[counter + 3] == 'P')\n+ {\n+ for(counter = 0; counter < (lenght - 4); counter++)\n+ {\n+ printf(\"%c\", word[counter] - 32);\n+ }\n \n-\t break;\n-\t}\n+ printf(\"\\n\");\n+\n+ break;\n+ }\n+\n+ else\n+ {\n+ printf(\"Enter word ending with STOP!\\n\");\n+ break;\n+ }\n }\n }\n \n"} {"commit":"1371c6936b14a779ab2f388c39e5287cf0d9e046","subject":"Update stop.c","message":"Update stop.c","repos":"AlexAndreev\/po-homework,VVurbanov\/po-homework,vincho7012\/po-homework,karakonjel\/po-homework,ivanmilevtues\/po-homework","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 2015-2016\/B\/18\/02\/stop.c\n+++ 2015-2016\/B\/18\/02\/stop.c\n@@ -25,9 +25,8 @@\n \n else\n {\n- printf(\"Enter word ending with STOP!\\n\");\n+ printf(\"Enter word ending with STOP!\");\n break;\n }\n }\n }\n-\n"} {"commit":"52c6656cdcc7c505ef0709c78a7f80ad9aec1cb1","subject":"STOP.c","message":"STOP.c","repos":"VVurbanov\/po-homework,AlexAndreev\/po-homework,David-Nicollas\/po-homework,Verbo1806\/po-homework,ivanmilevtues\/po-homework,MarchiT\/po-homework,g55amg\/po-homework,Georgigt23\/po-homework,karakonjel\/po-homework,vincho7012\/po-homework","returncode":1,"stderr":"error: pathspec '2015-2016\/G\/09\/02\/STOP.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- 2015-2016\/G\/09\/02\/STOP.c\n+++ 2015-2016\/G\/09\/02\/STOP.c\n@@ -0,0 +1,26 @@\n+include<stdio.h>\n+int main()\n+\n+do {\n+ \n+ scanf(\"%s\", word);\n+-printf(\"%s\\n\", word);\n+\n+\n+\n+\n+if (word[0] == 'S' && word[1] == 'T' && word[2] == 'O' && word[3] == 'P') {\n+ break;\n+} else {\n+ \n+ int e = 0;\n+ for (; e < 100; e++) {\n+ if (word[e] >= 'a' && word[e] <= 'z') {\n+ word[e] -= 32;\n+ }\n+ }\n+\n+ printf(\"%s\\n\", word);\n+}\n+ \n+ } while(1);\n"} {"commit":"67fd4bfa1eb2f83fc23858667f107c919be41e9a","subject":"Adicionado coment\u00e1rio e lateral do teto","message":"Adicionado coment\u00e1rio e lateral do teto\n","repos":"LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar,LorhanSohaky\/UFSCar","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 2019\/CG\/atividade\/main.c\n+++ 2019\/CG\/atividade\/main.c\n@@ -1,4 +1,24 @@\n+\/*\n+Lorhan Sohaky\n+\n+Um gargalo \u00e9 que a minha biblioteca substitui o objeto no momento em que aplica uma transforma\u00e7\u00e3o\n+linear\n+*\/\n+\n #include \"cg3d.h\"\n+\n+void criarQuadrado( face *f ) {\n+\tSetPointFace( 1.0, 5.0, 0.0, 1, f );\n+\tSetPointFace( 5.0, 5.0, 0.0, 1, f );\n+\tSetPointFace( 5.0, 1.0, 0.0, 1, f );\n+\tSetPointFace( 1.0, 1.0, 0.0, 1, f );\n+}\n+\n+void criarTriangulo( face *f ) {\n+\tSetPointFace( -3.0, 0.0, 0.0, 1, f );\n+\tSetPointFace( -0.9, -5.1, 0.0, 1, f );\n+\tSetPointFace( -5.1, -5.1, 0.0, 1, f );\n+}\n \n int main( void ) {\n \tbufferdevice *dispositivo;\n@@ -22,30 +42,68 @@\n \tSetColor( 0, 1, 0, palheta );\n \tSetColor( 0, 0, 1, palheta );\n \n-\tface *fQuadrado, *fTriangulo;\n-\tfQuadrado = CreateFace( 4 );\n-\tSetPointFace( 1.0, 5.0, 0.0, 1, fQuadrado );\n-\tSetPointFace( 5.0, 5.0, 0.0, 1, fQuadrado );\n-\tSetPointFace( 5.0, 1.0, 0.0, 1, fQuadrado );\n-\tSetPointFace( 1.0, 1.0, 0.0, 1, fQuadrado );\n+\t\/\/ face *fQuadrado, *fTriangulo, f1;\n+\t\/\/ fQuadrado = CreateFace( 4 );\n+\t\/\/ SetPointFace( 1.0, 5.0, 0.0, 1, fQuadrado );\n+\t\/\/ SetPointFace( 5.0, 5.0, 0.0, 1, fQuadrado );\n+\t\/\/ SetPointFace( 5.0, 1.0, 0.0, 1, fQuadrado );\n+\t\/\/ SetPointFace( 1.0, 1.0, 0.0, 1, fQuadrado );\n \n-\tfTriangulo = CreateFace( 3 );\n-\tSetPointFace( -3.0, 0.0, 0.0, 1, fTriangulo );\n-\tSetPointFace( -0.9, -5.1, 0.0, 1, fTriangulo );\n-\tSetPointFace( -5.1, -5.1, 0.0, 1, fTriangulo );\n+\t\/\/ fTriangulo = CreateFace( 3 );\n+\t\/\/ SetPointFace( -3.0, 0.0, 0.0, 1, fTriangulo );\n+\t\/\/ SetPointFace( -0.9, -5.1, 0.0, 1, fTriangulo );\n+\t\/\/ SetPointFace( -5.1, -5.1, 0.0, 1, fTriangulo );\n \n-\tobject *casa;\n+\t\/\/ object3d *objQuadrado, *objQuadradoBase;\n+\t\/\/ objQuadrado = CreateObject3D( 2 );\n+\t\/\/ SetObject3D( fQuadrado, objQuadrado );\n+\t\/\/ SetObject3D( fTriangulo, objQuadrado );\n \n-\tobject3d *objQuadrado, *objQuadradoBase;\n-\tobjQuadrado = CreateObject3D( 2 );\n-\tSetObject3D( fQuadrado, objQuadrado );\n-\tSetObject3D( fTriangulo, objQuadrado );\n+\t\/\/ objQuadradoBase = ConvertObjectBase( Normal, ViewUp, Observador, objQuadrado );\n+\t\/\/ casa\t\t\t= PerspProjFaces( objQuadradoBase, 0, -60 );\n \n-\tobjQuadradoBase = ConvertObjectBase( Normal, ViewUp, Observador, objQuadrado );\n-\tcasa\t\t\t= PerspProjFaces( objQuadradoBase, 0, -60 );\n+\t\/\/ DrawObject( &casa[0], janela, porta, dispositivo, 3 );\n+\t\/\/ DrawObject( &casa[1], janela, porta, dispositivo, 3 );\n \n-\tDrawObject( &casa[0], janela, porta, dispositivo, 3 );\n-\tDrawObject( &casa[1], janela, porta, dispositivo, 3 );\n+\tface *\tf1, *f2, *f3, *f4, *f5;\n+\tmatrix3d *m1, *m2, *m3, *m4, *m5, *m6;\n+\n+\tm1 = gerarMatrizDeDeslocamento( 0, 0, 100 );\n+\tm2 = gerarMatrizDeEscala( 20, 1.1, 1 );\n+\tm3 = gerarMatrizDeRotacao( -22, X );\n+\tm4 = gerarMatrizDeRotacao( 90, Y );\n+\tm5 = gerarMatrizDeDeslocamento( -0.4, -5.15, 89.5 );\n+\n+\tobject *teto;\n+\n+\tf1 = CreateFace( 3 );\n+\tcriarTriangulo( f1 );\n+\n+\tf2 = CreateFace( 3 );\n+\tcriarTriangulo( f2 );\n+\n+\tf3 = CreateFace( 4 );\n+\tcriarQuadrado( f3 );\n+\n+\tTransformacaoLinearFace( m1, f2 );\n+\n+\tTransformacaoLinearFace( m2, f3 );\n+\tTransformacaoLinearFace( m3, f3 );\n+\tTransformacaoLinearFace( m4, f3 );\n+\tTransformacaoLinearFace( m5, f3 );\n+\n+\tobject3d *objTeto, *objTetoBase;\n+\tobjTeto = CreateObject3D( 3 );\n+\tSetObject3D( f2, objTeto );\n+\tSetObject3D( f1, objTeto );\n+\tSetObject3D( f3, objTeto );\n+\n+\tobjTetoBase = ConvertObjectBase( Normal, ViewUp, Observador, objTeto );\n+\tteto\t\t= PerspProjFaces( objTetoBase, 1, -60 );\n+\n+\tDrawObject( &teto[0], janela, porta, dispositivo, 3 );\n+\tDrawObject( &teto[1], janela, porta, dispositivo, 5 );\n+\tDrawObject( &teto[2], janela, porta, dispositivo, 1 );\n \n \tDump2PIPE( dispositivo, palheta );\n \n"} {"commit":"e8c74ade2049089afb917369c6cac8d251f962be","subject":"Added @get_docstring for API and other small fixes to accelerations\/thrust.","message":"Added @get_docstring for API and other small fixes to accelerations\/thrust.\n","repos":"Tudat\/tudat,Tudat\/tudat,Tudat\/tudat,Tudat\/tudat","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/tudat\/simulation\/propagation_setup\/thrustSettings.h\n+++ include\/tudat\/simulation\/propagation_setup\/thrustSettings.h\n@@ -74,6 +74,7 @@\n * settings of thrust direction that require no information in addition to their type.\n * Classes defining settings for thrust direction requiring additional information must be derived from this class.\n *\/\n+\/\/! @get_docstring(ThrustDirectionSettings.__docstring__)\n class ThrustDirectionSettings\n {\n public:\n@@ -101,6 +102,7 @@\n };\n \n \/\/! Thrust guidance settings for thrust that is colinear with position\/velocity vector\n+\/\/! @get_docstring(ThrustDirectionFromStateGuidanceSettings.__docstring__)\n class ThrustDirectionFromStateGuidanceSettings: public ThrustDirectionSettings\n {\n public:\n@@ -135,6 +137,7 @@\n };\n \n \/\/! Class for defining custom thrust direction (i.e. predefined thrust function of time)\n+\/\/! @get_docstring(CustomThrustDirectionSettings.__docstring__)\n class CustomThrustDirectionSettings: public ThrustDirectionSettings\n {\n public:\n@@ -162,6 +165,7 @@\n * Class for defining custom orientation of thrust (i.e. predefined body-fixed-to-propagation rotation as function of time).\n * Thrust is then computed from body-fixed direction of thrust (defined in ThrustMagnitudeSettings).\n *\/\n+\/\/! @get_docstring(CustomThrustOrientationSettings.__docstring__)\n class CustomThrustOrientationSettings: public ThrustDirectionSettings\n {\n public:\n@@ -197,6 +201,7 @@\n * Boudestijn (2014). The MEE-costates are provided for the five slow elements, as a function of time. Constructors for\n * constant costates, and costates from an interpolator, are also provided.\n *\/\n+\/\/! @get_docstring(MeeCostateBasedThrustDirectionSettings.__docstring__)\n class MeeCostateBasedThrustDirectionSettings: public ThrustDirectionSettings\n {\n public:\n@@ -259,7 +264,7 @@\n \n };\n \n-\n+\/\/! @get_docstring(thrustDirectionFromStateGuidanceSettings)\n inline std::shared_ptr< ThrustDirectionSettings > thrustDirectionFromStateGuidanceSettings(\n const std::string& centralBody,\n const bool isColinearWithVelocity,\n@@ -269,17 +274,20 @@\n centralBody, isColinearWithVelocity, directionIsOppositeToVector );\n }\n \n+\/\/! @get_docstring(thrustFromExistingBodyOrientation)\n inline std::shared_ptr< ThrustDirectionSettings > thrustFromExistingBodyOrientation( )\n {\n return std::make_shared< ThrustDirectionSettings >(thrust_direction_from_existing_body_orientation );\n }\n \n+\/\/! @get_docstring(customThrustOrientationSettings, 1)\n inline std::shared_ptr< ThrustDirectionSettings > customThrustOrientationSettings(\n const std::function< Eigen::Quaterniond( const double ) > thrustOrientationFunction )\n {\n return std::make_shared< CustomThrustOrientationSettings >( thrustOrientationFunction );\n }\n \n+\/\/! @get_docstring(customThrustOrientationSettings, 2)\n inline std::shared_ptr< ThrustDirectionSettings > customThrustOrientationSettings(\n const std::function< Eigen::Matrix3d( const double ) > thrustOrientationFunction )\n {\n@@ -287,13 +295,14 @@\n [=]( const double time ){ return Eigen::Quaterniond( thrustOrientationFunction( time ) ); } );\n }\n \n-\n+\/\/! @get_docstring(customThrustDirectionSettings)\n inline std::shared_ptr< ThrustDirectionSettings > customThrustDirectionSettings(\n const std::function< Eigen::Vector3d( const double ) > thrustDirectionFunction )\n {\n return std::make_shared< CustomThrustDirectionSettings >( thrustDirectionFunction );\n }\n \n+\/\/! @get_docstring(meeCostateBasedThrustDirectionSettings, 1)\n inline std::shared_ptr< ThrustDirectionSettings > meeCostateBasedThrustDirectionSettings(\n const std::string& vehicleName,\n const std::string& centralBodyName,\n@@ -303,6 +312,7 @@\n vehicleName, centralBodyName, costateInterpolator );\n }\n \n+\/\/! @get_docstring(meeCostateBasedThrustDirectionSettings, 2)\n inline std::shared_ptr< ThrustDirectionSettings > meeCostateBasedThrustDirectionSettings(\n const std::string& vehicleName,\n const std::string& centralBodyName,\n@@ -347,6 +357,7 @@\n * settings of thrust magnitude that require no information in addition to their type.\n * Classes defining settings for thrust magnitude requiring additional information must be derived from this class.\n *\/\n+\/\/! @get_docstring(ThrustMagnitudeSettings.__docstring__)\n class ThrustMagnitudeSettings\n {\n public:\n@@ -375,6 +386,7 @@\n };\n \n \/\/! Class to define settigns for constant thrust settings.\n+\/\/! @get_docstring(ConstantThrustMagnitudeSettings.__docstring__)\n class ConstantThrustMagnitudeSettings: public ThrustMagnitudeSettings\n {\n public:\n@@ -409,6 +421,7 @@\n };\n \n \/\/! Class to define thrust magnitude to be taken directly from an engine model\n+\/\/! @get_docstring(FromBodyThrustMagnitudeSettings.__docstring__)\n class FromBodyThrustMagnitudeSettings: public ThrustMagnitudeSettings\n {\n public:\n@@ -441,6 +454,7 @@\n * clear physical meaning (e.g. dynamic pressure, Mach number, freestream density, etc.), the\n * ParameterizedThrustMagnitudeSettings settings object can be used.\n *\/\n+\/\/! @get_docstring(FromFunctionThrustMagnitudeSettings.__docstring__)\n class FromFunctionThrustMagnitudeSettings: public ThrustMagnitudeSettings\n {\n public:\n@@ -605,6 +619,7 @@\n };\n \n \n+\/\/! @get_docstring(constantThrustMagnitudeSettings)\n inline std::shared_ptr< ThrustMagnitudeSettings > constantThrustMagnitudeSettings(\n const double thrustMagnitude,\n const double specificImpulse,\n@@ -615,6 +630,7 @@\n }\n \n \/\/ TODO: EngineModel still to be implemented\n+\/\/! @get_docstring(fromBodyThrustMagnitudeSettings)\n inline std::shared_ptr< ThrustMagnitudeSettings > fromBodyThrustMagnitudeSettings(\n const bool useAllEngines = 1,\n const std::string& thrustOrigin = \"\" )\n@@ -623,6 +639,7 @@\n useAllEngines, thrustOrigin );\n }\n \n+\/\/! @get_docstring(fromFunctionThrustMagnitudeSettings)\n inline std::shared_ptr< ThrustMagnitudeSettings > fromFunctionThrustMagnitudeSettings(\n const std::function< double( const double ) > thrustMagnitudeFunction,\n const std::function< double( const double ) > specificImpulseFunction,\n"} {"commit":"1f37601850bc9502ce6f0f9ed8e2d2f39c893387","subject":"compositor: Move pointer motion clipping to its own function","message":"compositor: Move pointer motion clipping to its own function\n","repos":"eyolfson\/weston,eyolfson\/weston,krezovic\/weston,udoprog\/weston,sir-murray\/weston,udoprog\/weston,Fantu\/compositor-spice,Fantu\/compositor-spice,kwm81\/weston,mchalupa\/weston,Tarnyko\/weston-xdg_surface_present,sir-murray\/weston,mchalupa\/weston,Tarnyko\/weston-xdg_surface_present,Fantu\/compositor-spice,xorgy\/weston,Gnurou\/weston,Gnurou\/weston,kwm81\/weston,giucam\/weston,xorgy\/weston,jonnylamb\/weston,giucam\/weston,jonnylamb\/weston,krezovic\/weston","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/compositor.c\n+++ src\/compositor.c\n@@ -1558,17 +1558,17 @@\n weston_input_update_drag_surface(struct wl_input_device *input_device,\n \t\t\t\t int dx, int dy);\n \n-WL_EXPORT void\n-notify_motion(struct wl_input_device *device, uint32_t time, GLfloat x, GLfloat y)\n+static void\n+clip_pointer_motion(struct weston_compositor *ec,\n+\t\t GLfloat *fx, GLfloat *fy)\n {\n \tstruct weston_output *output;\n-\tconst struct wl_pointer_grab_interface *interface;\n-\tstruct weston_input_device *wd = (struct weston_input_device *) device;\n-\tstruct weston_compositor *ec = wd->compositor;\n+\tint32_t x, y;\n \tint x_valid = 0, y_valid = 0;\n \tint min_x = INT_MAX, min_y = INT_MAX, max_x = INT_MIN, max_y = INT_MIN;\n \n-\tweston_compositor_activity(ec);\n+\tx = *fx;\n+\ty = *fy;\n \n \twl_list_for_each(output, &ec->output_list, link) {\n \t\tif (output->x <= x && x < output->x + output->current->width)\n@@ -1601,6 +1601,22 @@\n \t\telse if (y >= max_y)\n \t\t\ty = max_y;\n \t}\n+\n+\t*fx = x;\n+\t*fy = y;\n+}\n+\n+WL_EXPORT void\n+notify_motion(struct wl_input_device *device, uint32_t time, GLfloat x, GLfloat y)\n+{\n+\tconst struct wl_pointer_grab_interface *interface;\n+\tstruct weston_input_device *wd = (struct weston_input_device *) device;\n+\tstruct weston_compositor *ec = wd->compositor;\n+\tstruct weston_output *output;\n+\n+\tweston_compositor_activity(ec);\n+\n+\tclip_pointer_motion(ec, &x, &y);\n \n \tweston_input_update_drag_surface(device,\n \t\t\t\t\t x - device->x, y - device->y);\n"} {"commit":"881b8c263867f7f07e385cd9feef8e393e285289","subject":"brought up to date some","message":"brought up to date some\n","repos":"SimVascular\/VTK,biddisco\/VTK,cjh1\/VTK,johnkit\/vtk-dev,demarle\/VTK,arnaudgelas\/VTK,mspark93\/VTK,hendradarwin\/VTK,candy7393\/VTK,candy7393\/VTK,SimVascular\/VTK,jmerkow\/VTK,SimVascular\/VTK,keithroe\/vtkoptix,mspark93\/VTK,johnkit\/vtk-dev,spthaolt\/VTK,aashish24\/VTK-old,johnkit\/vtk-dev,keithroe\/vtkoptix,candy7393\/VTK,hendradarwin\/VTK,spthaolt\/VTK,naucoin\/VTKSlicerWidgets,msmolens\/VTK,msmolens\/VTK,spthaolt\/VTK,sankhesh\/VTK,naucoin\/VTKSlicerWidgets,ashray\/VTK-EVM,sgh\/vtk,aashish24\/VTK-old,msmolens\/VTK,aashish24\/VTK-old,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,jmerkow\/VTK,demarle\/VTK,sgh\/vtk,msmolens\/VTK,keithroe\/vtkoptix,hendradarwin\/VTK,cjh1\/VTK,hendradarwin\/VTK,mspark93\/VTK,jeffbaumes\/jeffbaumes-vtk,gram526\/VTK,candy7393\/VTK,biddisco\/VTK,sumedhasingla\/VTK,demarle\/VTK,SimVascular\/VTK,collects\/VTK,sumedhasingla\/VTK,gram526\/VTK,ashray\/VTK-EVM,johnkit\/vtk-dev,arnaudgelas\/VTK,SimVascular\/VTK,daviddoria\/PointGraphsPhase1,sumedhasingla\/VTK,jmerkow\/VTK,hendradarwin\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,mspark93\/VTK,jeffbaumes\/jeffbaumes-vtk,spthaolt\/VTK,sumedhasingla\/VTK,johnkit\/vtk-dev,ashray\/VTK-EVM,mspark93\/VTK,sankhesh\/VTK,sankhesh\/VTK,aashish24\/VTK-old,ashray\/VTK-EVM,sankhesh\/VTK,naucoin\/VTKSlicerWidgets,mspark93\/VTK,cjh1\/VTK,jeffbaumes\/jeffbaumes-vtk,spthaolt\/VTK,biddisco\/VTK,collects\/VTK,collects\/VTK,berendkleinhaneveld\/VTK,biddisco\/VTK,ashray\/VTK-EVM,keithroe\/vtkoptix,jmerkow\/VTK,keithroe\/vtkoptix,Wuteyan\/VTK,ashray\/VTK-EVM,biddisco\/VTK,candy7393\/VTK,candy7393\/VTK,gram526\/VTK,spthaolt\/VTK,jmerkow\/VTK,jmerkow\/VTK,SimVascular\/VTK,SimVascular\/VTK,jmerkow\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,sankhesh\/VTK,keithroe\/vtkoptix,daviddoria\/PointGraphsPhase1,berendkleinhaneveld\/VTK,cjh1\/VTK,berendkleinhaneveld\/VTK,arnaudgelas\/VTK,msmolens\/VTK,jeffbaumes\/jeffbaumes-vtk,msmolens\/VTK,sgh\/vtk,collects\/VTK,daviddoria\/PointGraphsPhase1,mspark93\/VTK,demarle\/VTK,candy7393\/VTK,sgh\/vtk,gram526\/VTK,berendkleinhaneveld\/VTK,sankhesh\/VTK,gram526\/VTK,Wuteyan\/VTK,demarle\/VTK,hendradarwin\/VTK,demarle\/VTK,jmerkow\/VTK,jeffbaumes\/jeffbaumes-vtk,demarle\/VTK,gram526\/VTK,keithroe\/vtkoptix,sankhesh\/VTK,Wuteyan\/VTK,johnkit\/vtk-dev,arnaudgelas\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,candy7393\/VTK,SimVascular\/VTK,mspark93\/VTK,jeffbaumes\/jeffbaumes-vtk,ashray\/VTK-EVM,sankhesh\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,spthaolt\/VTK,sgh\/vtk,sumedhasingla\/VTK,arnaudgelas\/VTK,biddisco\/VTK,cjh1\/VTK,berendkleinhaneveld\/VTK,Wuteyan\/VTK,msmolens\/VTK,Wuteyan\/VTK,collects\/VTK,Wuteyan\/VTK,aashish24\/VTK-old,berendkleinhaneveld\/VTK,ashray\/VTK-EVM,cjh1\/VTK,daviddoria\/PointGraphsPhase1,sgh\/vtk,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,msmolens\/VTK,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,collects\/VTK,demarle\/VTK,arnaudgelas\/VTK,aashish24\/VTK-old","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- graphics\/vtkGraphics.h\n+++ graphics\/vtkGraphics.h\n@@ -77,13 +77,10 @@\n #include \"vtkDataSetToUnstructuredGridFilter.h\"\n #include \"vtkDataSetWriter.h\"\n #include \"vtkDataWriter.h\"\n-#include \"vtkDecimate.h\"\n #include \"vtkDelaunay2D.h\"\n #include \"vtkDelaunay3D.h\"\n #include \"vtkDicer.h\"\n #include \"vtkDiskSource.h\"\n-#include \"vtkDividingCubes.h\"\n-#include \"vtkEarthSource.h\"\n #include \"vtkEdgePoints.h\"\n #include \"vtkElevationFilter.h\"\n #include \"vtkExporter.h\"\n@@ -117,8 +114,6 @@\n #include \"vtkMCubesReader.h\"\n #include \"vtkMCubesWriter.h\"\n #include \"vtkMapper.h\"\n-#include \"vtkMarchingCubes.h\"\n-#include \"vtkMarchingSquares.h\"\n #include \"vtkMaskPoints.h\"\n #include \"vtkMaskPolyData.h\"\n #include \"vtkMergeFilter.h\"\n@@ -142,7 +137,6 @@\n #include \"vtkPolyConnectivityFilter.h\"\n #include \"vtkPolyFilter.h\"\n #include \"vtkPolyMapper.h\"\n-#include \"vtkPolyMapperDevice.h\"\n #include \"vtkPolyNormals.h\"\n #include \"vtkPolyReader.h\"\n #include \"vtkPolySource.h\"\n@@ -166,8 +160,6 @@\n #include \"vtkShepardMethod.h\"\n #include \"vtkShrinkFilter.h\"\n #include \"vtkShrinkPolyData.h\"\n-#include \"vtkSliceCubes.h\"\n-#include \"vtkSmoothPolyFilter.h\"\n #include \"vtkSpatialRepFilter.h\"\n #include \"vtkSphere.h\"\n #include \"vtkSphereSource.h\"\n@@ -192,7 +184,6 @@\n #include \"vtkStructuredPointsToStructuredPointsFilter.h\"\n #include \"vtkStructuredPointsWriter.h\"\n #include \"vtkSubPixelPositionEdgels.h\"\n-#include \"vtkSweptSurface.h\"\n #include \"vtkTensorGlyph.h\"\n #include \"vtkTextSource.h\"\n #include \"vtkTexture.h\"\n@@ -206,7 +197,6 @@\n #include \"vtkThresholdTextureCoords.h\"\n #include \"vtkTransformFilter.h\"\n #include \"vtkTransformPolyFilter.h\"\n-#include \"vtkTransformStructuredPoints.h\"\n #include \"vtkTransformTextureCoords.h\"\n #include \"vtkTriangleFilter.h\"\n #include \"vtkTubeFilter.h\"\n"} {"commit":"df1fd36a1418e613c7bd351db5e545d85f11aaf6","subject":"compositor: log program launches","message":"compositor: log program launches\n\nSigned-off-by: Pekka Paalanen <6c0263d81461c956d504307112a4ce25eaacc3d1@gmail.com>\n","repos":"sir-murray\/weston,sir-murray\/weston,eyolfson\/weston,jonnylamb\/weston,giucam\/weston,xorgy\/weston,eyolfson\/weston,mchalupa\/weston,giucam\/weston,Fantu\/compositor-spice,kwm81\/weston,udoprog\/weston,Gnurou\/weston,krezovic\/weston,Tarnyko\/weston-xdg_surface_present,xorgy\/weston,udoprog\/weston,kwm81\/weston,jonnylamb\/weston,Fantu\/compositor-spice,Fantu\/compositor-spice,mchalupa\/weston,Tarnyko\/weston-xdg_surface_present,krezovic\/weston,Gnurou\/weston","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/compositor.c\n+++ src\/compositor.c\n@@ -140,6 +140,8 @@\n \tpid_t pid;\n \tstruct wl_client *client;\n \n+\tweston_log(\"launching '%s'\\n\", path);\n+\n \tif (os_socketpair_cloexec(AF_UNIX, SOCK_STREAM, 0, sv) < 0) {\n \t\tweston_log(\"weston_client_launch: \"\n \t\t\t\"socketpair failed while launching '%s': %m\\n\",\n"} {"commit":"9404b3ce14693ba730c6fb3c4acf9855917b4329","subject":"Fix segmentation fault if outputs are disconnected.","message":"Fix segmentation fault if outputs are disconnected.\n\nI failed to exchange all indices from i to j in the last commit.\n\nSigned-off-by: Tobias Stoeckmann <059b8b880f8441509ec8a65b50b4c6ae74ebea76@stoeckmann.org>\n","repos":"stoeckmann\/xwallpaper,stoeckmann\/xwallpaper","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- outputs.c\n+++ outputs.c\n@@ -121,7 +121,7 @@\n \t\tname_len = xcb_randr_get_output_info_name_length(output_reply);\n \n \t\toutputs[j].name = xmalloc(name_len + 1);\n-\t\tmemcpy(outputs[i].name, name, name_len);\n+\t\tmemcpy(outputs[j].name, name, name_len);\n \t\toutputs[j].name[name_len] = '\\0';\n \n \t\toutputs[j].x = crtc_reply->x;\n"} {"commit":"ff446d63feb1a5b4284c5c5014d2cec8bb991bc7","subject":"i guess the last fix would leak","message":"i guess the last fix would leak\n","repos":"tycho01\/parsley,fizx\/parsley,tycho01\/parsley,tycho01\/parsley,fizx\/parsley,fizx\/parsley,isislovecruft\/pyparsley,isislovecruft\/pyparsley,isislovecruft\/pyparsley,isislovecruft\/pyparsley,tycho01\/parsley,isislovecruft\/pyparsley,tycho01\/parsley,fizx\/parsley","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- parsley.c\n+++ parsley.c\n@@ -134,7 +134,7 @@\n if(err == NULL) asprintf(&err, \"%s was empty\", xpath_of(xml));\n prune(ptr, xml, err);\n } else if(err != NULL) {\n- \/\/ free(err);\n+ free(err);\n }\n while(err == NULL && child != NULL){\n visit(ptr, child, err);\n"} {"commit":"201ba3681790ed109be1502cfa9ad891de1e2097","subject":"Add 3 new classes about User Defined Functions","message":"Add 3 new classes about User Defined Functions\n","repos":"copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,jonasfoe\/COPASI,copasi\/COPASI","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- copasi\/output\/output.h\n+++ copasi\/output\/output.h\n@@ -5,3 +5,6 @@\n #include \"COutputLine.h\"\n #include \"COutputList.h\"\n #include \"COutputEvent.h\"\n+#include \"CNodeO.h\"\n+#include \"CUDFunction.h\"\n+#include \"CUDFunctionDB.h\""} {"commit":"71902358794c6c0070eec1ded991a6d9e96691a5","subject":"added version note to new feature","message":"added version note to new feature\n","repos":"ros\/ros,ros\/ros,ros\/ros","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- tools\/rospack\/include\/rospack\/rospack.h\n+++ tools\/rospack\/include\/rospack\/rospack.h\n@@ -186,7 +186,7 @@\n \n - <b>depends-indent [package]<\/b> : newline-separated presentation of the entire dependency chain for the package, indented to indicate where in the chain each dependency arises. May contain duplicates.\n \n- - <b>depends-why --target=TARGET [package]<\/b> : newline-separated presentation of all dependency chains from the package to TARGET.\n+ - <b>depends-why --target=TARGET [package]<\/b> (since 0.11): newline-separated presentation of all dependency chains from the package to TARGET.\n \n - <b>depends1 [package]<\/b> : newline-separated ordered list of immediate dependencies of the package\n \n"} {"commit":"5add8677075e56b939f45dc40564489fe2f36eed","subject":"multicast code working need to make directories","message":"multicast code working\nneed to make directories\n","repos":"ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,gridcf\/gct,gridcf\/gct,gridcf\/gct","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gass\/copy\/source\/globus_url_copy.c\n+++ gass\/copy\/source\/globus_url_copy.c\n@@ -1980,7 +1980,8 @@\n static\n char *\n guc_build_mc_str(\n- char * fname)\n+ char * fname,\n+ char ** out_first)\n {\n int count = 0;\n char * ptr;\n@@ -1990,6 +1991,7 @@\n char url_line[512];\n globus_url_t url_info;\n int rc;\n+ char ** l_out_first = out_first;\n \n fptr = fopen(fname, \"r\");\n if(fptr == NULL)\n@@ -2007,17 +2009,36 @@\n {\n *ptr = '\\0';\n }\n+ ptr = strchr(url_line, '?');\n+ if(ptr != NULL)\n+ {\n+ *ptr = '\\0';\n+ }\n rc = globus_url_parse(url_line, &url_info);\n if(rc != 0)\n {\n goto error;\n }\n-\n- tmp_url_str = globus_common_create_string(\"%s#%s\", url_str, url_line);\n- globus_free(url_str);\n- url_str = tmp_url_str;\n-\n- count++;\n+ \/* put the question mark back if there was one *\/\n+ if(ptr != NULL)\n+ {\n+ *ptr = '?';\n+ }\n+\n+ if(l_out_first != NULL)\n+ {\n+ *l_out_first = strdup(url_line);\n+ l_out_first = NULL;\n+ }\n+ else\n+ {\n+ tmp_url_str = globus_common_create_string(\n+ \"%s#%s\", url_str, url_line);\n+ globus_free(url_str);\n+ url_str = tmp_url_str;\n+\n+ count++;\n+ }\n ptr = fgets(url_line, 512, fptr);\n }\n \n@@ -2043,6 +2064,7 @@\n char ** argv,\n globus_l_guc_info_t * guc_info)\n {\n+ char * mc_fs_str = NULL;\n int sc;\n char * program;\n globus_list_t * options_found = NULL;\n@@ -2450,7 +2472,55 @@\n }\n \n globus_args_option_instance_list_free(&options_found);\n- \n+\n+ \/* if we are doing multicast allow no dest option by adding the first \n+ url in the file *\/\n+ if(guc_info->mc_file != NULL)\n+ {\n+ char ** first_dst_ptr = NULL;\n+ char * first_dst = NULL;\n+ char * str_ptr;\n+ char * new_mc_str;\n+\n+ if(file_name != NULL)\n+ {\n+ \/* echo error *\/\n+ globus_url_copy_l_args_error(\"iCannot use -mc and -f\");\n+ return -1;\n+ }\n+\n+ if(argc == 2)\n+ {\n+ first_dst_ptr = &first_dst;\n+ }\n+\n+ mc_fs_str = guc_build_mc_str(guc_info->mc_file, first_dst_ptr);\n+ if(mc_fs_str == NULL && first_dst_ptr == NULL)\n+ {\n+ globus_url_copy_l_args_error(\"There is no destination set\");\n+ return -1;\n+ }\n+\n+ \/* lie to the rest of the code b tacking on a new first dest *\/\n+ if(first_dst_ptr != NULL)\n+ {\n+ argc++;\n+ argv[argc-1] = first_dst;\n+ }\n+\n+ \/* TODO pull the ?.* off the url for extra opts *\/\n+ str_ptr = strchr(argv[argc-1], '?');\n+ if(str_ptr != NULL)\n+ {\n+ *str_ptr = '\\0';\n+ str_ptr++;\n+ }\n+ new_mc_str = globus_common_create_string(\"%s;%s\",\n+ mc_fs_str, str_ptr);\n+\n+ free(mc_fs_str);\n+ mc_fs_str = new_mc_str;\n+ }\n \n if(file_name != NULL)\n {\n@@ -2540,32 +2610,23 @@\n guc_info->net_stack_str = globus_libc_strdup(\"udt\");\n }\n \n- if(guc_info->mc_file != NULL)\n- {\n- char * mc_fs_str;\n- char * tmp_str;\n-\n- mc_fs_str = guc_build_mc_str(guc_info->mc_file);\n- if(mc_fs_str == NULL)\n- {\n- \/* XXX log error *\/\n+ \/* if we need to take on the multicast string *\/\n+ if(mc_fs_str != NULL)\n+ {\n+\n+ if(guc_info->disk_stack_str != NULL)\n+ {\n+ tmp_str = guc_info->disk_stack_str;\n+\n+ guc_info->disk_stack_str = globus_common_create_string(\n+ \"%s,%s\", mc_fs_str, tmp_str);\n+\n+ globus_free(tmp_str);\n }\n else\n {\n- if(guc_info->disk_stack_str != NULL)\n- {\n- tmp_str = guc_info->disk_stack_str;\n-\n- guc_info->disk_stack_str = globus_common_create_string(\n- \"%s,%s\", mc_fs_str, tmp_str);\n-\n- globus_free(tmp_str);\n- }\n- else\n- {\n- guc_info->disk_stack_str = globus_common_create_string(\n- \"file,%s\", mc_fs_str);\n- }\n+ guc_info->disk_stack_str = globus_common_create_string(\n+ \"file,%s\", mc_fs_str);\n }\n }\n \n"} {"commit":"740542cce7b736f7d1ef96b81f2d271aae88ad89","subject":"Bump default minimum length to 13","message":"Bump default minimum length to 13\n","repos":"sbennett1990\/passgen","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- passgen.c\n+++ passgen.c\n@@ -24,7 +24,7 @@\n \n #include \"util.h\"\n \n-#define MIN_LENGTH 10\n+#define MIN_LENGTH 13\n #define MAX_LENGTH 50\n \n static const char alpha[] = {\n"} {"commit":"627265afbe7b3bcdf559743b35e5ddcd5e4f3410","subject":"changed to match .c file","message":"changed to match .c file","repos":"phung001\/CS120b_project","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- path\/io.h\n+++ path\/io.h\n@@ -5,7 +5,7 @@\n void LCD_ClearScreen(void);\n void LCD_WriteCommand (unsigned char Command);\n void LCD_Cursor (unsigned char column);\n-void LCD_DisplayString(unsigned char column ,const unsigned char *string);\n+void LCD_DisplayString(unsigned char column ,const char *string);\n void delay_ms(int miliSec);\n #endif\n \n"} {"commit":"2af775a743c29ad9ffac361d31b03e28f14d7282","subject":"Testing git commits.","message":"Testing git commits.\n","repos":"dbusan\/ucp","returncode":1,"stderr":"error: pathspec 'p3\/test.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- p3\/test.c\n+++ p3\/test.c\n@@ -0,0 +1,11 @@\n+\/**\n+Test.\n+**\/\n+\n+#include <stdio.h>\n+\n+int main(void)\n+{\n+\n+\n+}\n"} {"commit":"9911ec01c7e91e6c2d800f4dd62fcf1d697a04dd","subject":"Don't need sdkconfig.old checked in","message":"Don't need sdkconfig.old checked in\n","repos":"kylehendricks\/esp32-sump-pump-monitor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- main\/include\/user_config.h\n+++ main\/include\/user_config.h\n@@ -3,10 +3,10 @@\n \n \/* User defines *\/\n \n-#define WIFI_SSID \"WIFI_SSID\"\n-#define WIFI_PASS \"WIFI_PASS\"\n+#define WIFI_SSID \"***REMOVED***\"\n+#define WIFI_PASS \"***REMOVED***\"\n \n-#define MQTT_HOST \"MQTT_HOST\"\n+#define MQTT_HOST \"192.168.1.5\"\n #define MQTT_TOPIC_PREFIX \"home\/basement\/sump\/\"\n \n #endif\n"} {"commit":"691213afa97928e3ddddbc241497a7be3fa6629a","subject":"Add TlvInfo decode option.","message":"Add TlvInfo decode option.\n","repos":"opennetworklinux\/ONLP,opennetworklinux\/ONLP","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- modules\/onlp\/module\/src\/onlp_main.c\n+++ modules\/onlp\/module\/src\/onlp_main.c\n@@ -1,21 +1,21 @@\n \/************************************************************\n * <bsn.cl fy=2014 v=onl>\n- * \n- * Copyright 2014, 2015 Big Switch Networks, Inc. \n- * \n+ *\n+ * Copyright 2014, 2015 Big Switch Networks, Inc.\n+ *\n * Licensed under the Eclipse Public License, Version 1.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n- * \n+ *\n * http:\/\/www.eclipse.org\/legal\/epl-v10.html\n- * \n+ *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,\n * either express or implied. See the License for the specific\n * language governing permissions and limitations under the\n * License.\n- * \n+ *\n * <\/bsn.cl>\n ************************************************************\n *\n@@ -78,8 +78,9 @@\n int i = 0;\n int p = 0;\n int x = 0;\n-\n- while( (c = getopt(argc, argv, \"srehdojmipx\")) != -1) {\n+ const char* t = NULL;\n+\n+ while( (c = getopt(argc, argv, \"srehdojmipxt:\")) != -1) {\n switch(c)\n {\n case 's': show=1; break;\n@@ -93,6 +94,7 @@\n case 'm': m=1; break;\n case 'i': i=1; break;\n case 'p': p=1; show=-1; break;\n+ case 't': t = optarg; break;\n default: help=1; rv = 1; break;\n }\n }\n@@ -109,7 +111,23 @@\n printf(\" -m Run platform manager.\\n\");\n printf(\" -i Iterate OIDs.\\n\");\n printf(\" -p Show SFP presence.\\n\");\n+ printf(\" -t <file> Decode TlvInfo data.\\n\");\n return rv;\n+ }\n+\n+ if(t) {\n+ int rv;\n+ onlp_onie_info_t onie;\n+ rv = onlp_onie_decode_file(&onie, t);\n+ if(rv >= 0) {\n+ onlp_onie_show(&onie, &aim_pvs_stdout);\n+ onlp_onie_info_free(&onie);\n+ return 0;\n+ }\n+ else {\n+ aim_printf(&aim_pvs_stdout, \"Decode failed.\");\n+ return 1;\n+ }\n }\n \n onlp_init();\n"} {"commit":"e8d7a291420cd91494bfdc8bff3608abc6cf84b7","subject":"kconfig: Hide choices with only one visible option and menus with no children","message":"kconfig: Hide choices with only one visible option and menus with no children\n\nChoice entries that have one visible option and menus with no children\nneed not be shown, it is somewhat pointless to do so: for example, the\nendianness choose added by the nest commit need not be shown on\nplatforms that only support one endianness.\n","repos":"gil0mendes\/Infinity-OS,gil0mendes\/Infinity-OS,gil0mendes\/Infinity-OS,gil0mendes\/Infinity-OS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- 3rdparty\/kconfig\/mconf.c\n+++ 3rdparty\/kconfig\/mconf.c\n@@ -346,7 +346,7 @@\n \tstruct symbol *sym;\n \tstruct property *prop;\n \tstruct menu *child;\n-\tint type, tmp, doint = 2;\n+\tint type, tmp, doint = 2, visible_children = 0;\n \ttristate val;\n \tchar ch;\n \tbool visible;\n@@ -361,6 +361,12 @@\n \telse if (!show_all_options && !visible)\n \t\treturn;\n \n+ for (child = menu->list; child; child = child->next) {\n+ if (menu_is_visible(child)) {\n+ visible_children++;\n+ }\n+ }\n+\n \tsym = menu->sym;\n \tprop = menu->prompt;\n \tif (!sym) {\n@@ -368,6 +374,10 @@\n \t\t\tconst char *prompt = menu_get_prompt(menu);\n \t\t\tswitch (prop->type) {\n \t\t\tcase P_MENU:\n+ if (!visible_children) {\n+ return;\n+ }\n+\n \t\t\t\tchild_count++;\n \t\t\t\tprompt = _(prompt);\n \t\t\t\tif (single_menu_mode) {\n@@ -407,6 +417,11 @@\n \tif (sym_is_choice(sym)) {\n \t\tstruct symbol *def_sym = sym_get_choice_value(sym);\n \t\tstruct menu *def_menu = NULL;\n+ int count = 0;\n+\n+ if (visible_children < 2) {\n+ return;\n+ }\n \n \t\tchild_count++;\n \t\tfor (child = menu->list; child; child = child->next) {\n@@ -529,6 +544,7 @@\n \tint s_scroll = 0;\n \n \twhile (1) {\n+ child_count = 0;\n \t\titem_reset();\n \t\tcurrent_menu = menu;\n \t\tbuild_conf(menu);\n"} {"commit":"a97d16c03791fa9e8ffca2834f630e279804337f","subject":"Fixed defs in keyframe_handler","message":"Fixed defs in keyframe_handler\n","repos":"mpmumau\/peabot,mpmumau\/peabot,mpmumau\/peabot,mpmumau\/peabot,mpmumau\/peabot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- inc\/keyframe_handler.h\n+++ inc\/keyframe_handler.h\n@@ -12,10 +12,10 @@\n #define SERVOS_NUM 8\n #endif\n \n-#define KEYFR_HOME 0;\n-#define KEYFR_DELAY 1;\n-#define KEYFR_ELEVATE 2;\n-#define KEYFR_WALK 3;\n+#define KEYFR_HOME 0\n+#define KEYFR_DELAY 1\n+#define KEYFR_ELEVATE 2\n+#define KEYFR_WALK 3\n \n typedef struct ServoPos {\n int easing;\n"} {"commit":"1ecf6e1595664529a60b028cc54d885c50df0301","subject":"gles2: Update gl2ext.h to revision 28335","message":"gles2: Update gl2ext.h to revision 28335\n\nThe main incentive to do this is to get the defines for the\nGL_KHR_context_flush_control extension.\n\nReviewed-by: Ian Romanick <2b237cafb16dc45038e85df6c85e74e6d899eba9@intel.com>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/GLES2\/gl2ext.h\n+++ include\/GLES2\/gl2ext.h\n@@ -33,14 +33,14 @@\n ** used to make the header, and the header can be found at\n ** http:\/\/www.opengl.org\/registry\/\n **\n-** Khronos $Revision: 25922 $ on $Date: 2014-03-17 03:54:32 -0700 (Mon, 17 Mar 2014) $\n+** Khronos $Revision: 28335 $ on $Date: 2014-09-26 18:55:45 -0700 (Fri, 26 Sep 2014) $\n *\/\n \n #ifndef GL_APIENTRYP\n #define GL_APIENTRYP GL_APIENTRY*\n #endif\n \n-\/* Generated on date 20140317 *\/\n+\/* Generated on date 20140926 *\/\n \n \/* Generated C header for:\n * API: gles2\n@@ -54,7 +54,6 @@\n \n #ifndef GL_KHR_blend_equation_advanced\n #define GL_KHR_blend_equation_advanced 1\n-#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285\n #define GL_MULTIPLY_KHR 0x9294\n #define GL_SCREEN_KHR 0x9295\n #define GL_OVERLAY_KHR 0x9296\n@@ -75,6 +74,17 @@\n GL_APICALL void GL_APIENTRY glBlendBarrierKHR (void);\n #endif\n #endif \/* GL_KHR_blend_equation_advanced *\/\n+\n+#ifndef GL_KHR_blend_equation_advanced_coherent\n+#define GL_KHR_blend_equation_advanced_coherent 1\n+#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285\n+#endif \/* GL_KHR_blend_equation_advanced_coherent *\/\n+\n+#ifndef GL_KHR_context_flush_control\n+#define GL_KHR_context_flush_control 1\n+#define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB\n+#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC\n+#endif \/* GL_KHR_context_flush_control *\/\n \n #ifndef GL_KHR_debug\n #define GL_KHR_debug 1\n@@ -145,6 +155,34 @@\n #endif\n #endif \/* GL_KHR_debug *\/\n \n+#ifndef GL_KHR_robust_buffer_access_behavior\n+#define GL_KHR_robust_buffer_access_behavior 1\n+#endif \/* GL_KHR_robust_buffer_access_behavior *\/\n+\n+#ifndef GL_KHR_robustness\n+#define GL_KHR_robustness 1\n+#define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3\n+#define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252\n+#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253\n+#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254\n+#define GL_UNKNOWN_CONTEXT_RESET_KHR 0x8255\n+#define GL_RESET_NOTIFICATION_STRATEGY_KHR 0x8256\n+#define GL_NO_RESET_NOTIFICATION_KHR 0x8261\n+#define GL_CONTEXT_LOST_KHR 0x0507\n+typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSKHRPROC) (void);\n+typedef void (GL_APIENTRYP PFNGLREADNPIXELSKHRPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);\n+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);\n+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);\n+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusKHR (void);\n+GL_APICALL void GL_APIENTRY glReadnPixelsKHR (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);\n+GL_APICALL void GL_APIENTRY glGetnUniformfvKHR (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);\n+GL_APICALL void GL_APIENTRY glGetnUniformivKHR (GLuint program, GLint location, GLsizei bufSize, GLint *params);\n+GL_APICALL void GL_APIENTRY glGetnUniformuivKHR (GLuint program, GLint location, GLsizei bufSize, GLuint *params);\n+#endif\n+#endif \/* GL_KHR_robustness *\/\n+\n #ifndef GL_KHR_texture_compression_astc_hdr\n #define GL_KHR_texture_compression_astc_hdr 1\n #define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0\n@@ -200,6 +238,10 @@\n #define GL_SAMPLER_EXTERNAL_OES 0x8D66\n #endif \/* GL_OES_EGL_image_external *\/\n \n+#ifndef GL_OES_compressed_ETC1_RGB8_sub_texture\n+#define GL_OES_compressed_ETC1_RGB8_sub_texture 1\n+#endif \/* GL_OES_compressed_ETC1_RGB8_sub_texture *\/\n+\n #ifndef GL_OES_compressed_ETC1_RGB8_texture\n #define GL_OES_compressed_ETC1_RGB8_texture 1\n #define GL_ETC1_RGB8_OES 0x8D64\n@@ -512,6 +554,10 @@\n #define GL_Z400_BINARY_AMD 0x8740\n #endif \/* GL_AMD_program_binary_Z400 *\/\n \n+#ifndef GL_ANDROID_extension_pack_es31a\n+#define GL_ANDROID_extension_pack_es31a 1\n+#endif \/* GL_ANDROID_extension_pack_es31a *\/\n+\n #ifndef GL_ANGLE_depth_texture\n #define GL_ANGLE_depth_texture 1\n #endif \/* GL_ANGLE_depth_texture *\/\n@@ -586,6 +632,23 @@\n GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);\n #endif\n #endif \/* GL_ANGLE_translated_shader_source *\/\n+\n+#ifndef GL_APPLE_clip_distance\n+#define GL_APPLE_clip_distance 1\n+#define GL_MAX_CLIP_DISTANCES_APPLE 0x0D32\n+#define GL_CLIP_DISTANCE0_APPLE 0x3000\n+#define GL_CLIP_DISTANCE1_APPLE 0x3001\n+#define GL_CLIP_DISTANCE2_APPLE 0x3002\n+#define GL_CLIP_DISTANCE3_APPLE 0x3003\n+#define GL_CLIP_DISTANCE4_APPLE 0x3004\n+#define GL_CLIP_DISTANCE5_APPLE 0x3005\n+#define GL_CLIP_DISTANCE6_APPLE 0x3006\n+#define GL_CLIP_DISTANCE7_APPLE 0x3007\n+#endif \/* GL_APPLE_clip_distance *\/\n+\n+#ifndef GL_APPLE_color_buffer_packed_float\n+#define GL_APPLE_color_buffer_packed_float 1\n+#endif \/* GL_APPLE_color_buffer_packed_float *\/\n \n #ifndef GL_APPLE_copy_texture_levels\n #define GL_APPLE_copy_texture_levels 1\n@@ -667,6 +730,14 @@\n #define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D\n #endif \/* GL_APPLE_texture_max_level *\/\n \n+#ifndef GL_APPLE_texture_packed_float\n+#define GL_APPLE_texture_packed_float 1\n+#define GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE 0x8C3B\n+#define GL_UNSIGNED_INT_5_9_9_9_REV_APPLE 0x8C3E\n+#define GL_R11F_G11F_B10F_APPLE 0x8C3A\n+#define GL_RGB9_E5_APPLE 0x8C3D\n+#endif \/* GL_APPLE_texture_packed_float *\/\n+\n #ifndef GL_ARM_mali_program_binary\n #define GL_ARM_mali_program_binary 1\n #define GL_MALI_PROGRAM_BINARY_ARM 0x8F61\n@@ -690,6 +761,13 @@\n #ifndef GL_ARM_shader_framebuffer_fetch_depth_stencil\n #define GL_ARM_shader_framebuffer_fetch_depth_stencil 1\n #endif \/* GL_ARM_shader_framebuffer_fetch_depth_stencil *\/\n+\n+#ifndef GL_DMP_program_binary\n+#define GL_DMP_program_binary 1\n+#define GL_SMAPHS30_PROGRAM_BINARY_DMP 0x9251\n+#define GL_SMAPHS_PROGRAM_BINARY_DMP 0x9252\n+#define GL_DMP_PROGRAM_BINARY_DMP 0x9253\n+#endif \/* GL_DMP_program_binary *\/\n \n #ifndef GL_DMP_shader_binary\n #define GL_DMP_shader_binary 1\n@@ -711,6 +789,14 @@\n #define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211\n #define GL_UNSIGNED_NORMALIZED_EXT 0x8C17\n #endif \/* GL_EXT_color_buffer_half_float *\/\n+\n+#ifndef GL_EXT_copy_image\n+#define GL_EXT_copy_image 1\n+typedef void (GL_APIENTRYP PFNGLCOPYIMAGESUBDATAEXTPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glCopyImageSubDataEXT (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);\n+#endif\n+#endif \/* GL_EXT_copy_image *\/\n \n #ifndef GL_EXT_debug_label\n #define GL_EXT_debug_label 1\n@@ -829,6 +915,30 @@\n #endif\n #endif \/* GL_EXT_draw_buffers *\/\n \n+#ifndef GL_EXT_draw_buffers_indexed\n+#define GL_EXT_draw_buffers_indexed 1\n+#define GL_MIN 0x8007\n+#define GL_MAX 0x8008\n+typedef void (GL_APIENTRYP PFNGLENABLEIEXTPROC) (GLenum target, GLuint index);\n+typedef void (GL_APIENTRYP PFNGLDISABLEIEXTPROC) (GLenum target, GLuint index);\n+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode);\n+typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);\n+typedef void (GL_APIENTRYP PFNGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst);\n+typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);\n+typedef void (GL_APIENTRYP PFNGLCOLORMASKIEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);\n+typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDIEXTPROC) (GLenum target, GLuint index);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glEnableiEXT (GLenum target, GLuint index);\n+GL_APICALL void GL_APIENTRY glDisableiEXT (GLenum target, GLuint index);\n+GL_APICALL void GL_APIENTRY glBlendEquationiEXT (GLuint buf, GLenum mode);\n+GL_APICALL void GL_APIENTRY glBlendEquationSeparateiEXT (GLuint buf, GLenum modeRGB, GLenum modeAlpha);\n+GL_APICALL void GL_APIENTRY glBlendFunciEXT (GLuint buf, GLenum src, GLenum dst);\n+GL_APICALL void GL_APIENTRY glBlendFuncSeparateiEXT (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);\n+GL_APICALL void GL_APIENTRY glColorMaskiEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);\n+GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index);\n+#endif\n+#endif \/* GL_EXT_draw_buffers_indexed *\/\n+\n #ifndef GL_EXT_draw_instanced\n #define GL_EXT_draw_instanced 1\n typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);\n@@ -838,6 +948,55 @@\n GL_APICALL void GL_APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);\n #endif\n #endif \/* GL_EXT_draw_instanced *\/\n+\n+#ifndef GL_EXT_geometry_point_size\n+#define GL_EXT_geometry_point_size 1\n+#endif \/* GL_EXT_geometry_point_size *\/\n+\n+#ifndef GL_EXT_geometry_shader\n+#define GL_EXT_geometry_shader 1\n+#define GL_GEOMETRY_SHADER_EXT 0x8DD9\n+#define GL_GEOMETRY_SHADER_BIT_EXT 0x00000004\n+#define GL_GEOMETRY_LINKED_VERTICES_OUT_EXT 0x8916\n+#define GL_GEOMETRY_LINKED_INPUT_TYPE_EXT 0x8917\n+#define GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT 0x8918\n+#define GL_GEOMETRY_SHADER_INVOCATIONS_EXT 0x887F\n+#define GL_LAYER_PROVOKING_VERTEX_EXT 0x825E\n+#define GL_LINES_ADJACENCY_EXT 0x000A\n+#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B\n+#define GL_TRIANGLES_ADJACENCY_EXT 0x000C\n+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D\n+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF\n+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT 0x8A2C\n+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8A32\n+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT 0x9123\n+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT 0x9124\n+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0\n+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1\n+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT 0x8E5A\n+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29\n+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT 0x92CF\n+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT 0x92D5\n+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT 0x90CD\n+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT 0x90D7\n+#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D\n+#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E\n+#define GL_UNDEFINED_VERTEX_EXT 0x8260\n+#define GL_PRIMITIVES_GENERATED_EXT 0x8C87\n+#define GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT 0x9312\n+#define GL_MAX_FRAMEBUFFER_LAYERS_EXT 0x9317\n+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8\n+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7\n+#define GL_REFERENCED_BY_GEOMETRY_SHADER_EXT 0x9309\n+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);\n+#endif\n+#endif \/* GL_EXT_geometry_shader *\/\n+\n+#ifndef GL_EXT_gpu_shader5\n+#define GL_EXT_gpu_shader5 1\n+#endif \/* GL_EXT_gpu_shader5 *\/\n \n #ifndef GL_EXT_instanced_arrays\n #define GL_EXT_instanced_arrays 1\n@@ -911,12 +1070,23 @@\n #define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A\n #endif \/* GL_EXT_occlusion_query_boolean *\/\n \n+#ifndef GL_EXT_primitive_bounding_box\n+#define GL_EXT_primitive_bounding_box 1\n+#define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE\n+typedef void (GL_APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glPrimitiveBoundingBoxEXT (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW);\n+#endif\n+#endif \/* GL_EXT_primitive_bounding_box *\/\n+\n #ifndef GL_EXT_pvrtc_sRGB\n #define GL_EXT_pvrtc_sRGB 1\n #define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54\n #define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55\n #define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56\n #define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57\n+#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG 0x93F0\n+#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG 0x93F1\n #endif \/* GL_EXT_pvrtc_sRGB *\/\n \n #ifndef GL_EXT_read_format_bgra\n@@ -1064,9 +1234,17 @@\n #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52\n #endif \/* GL_EXT_shader_framebuffer_fetch *\/\n \n+#ifndef GL_EXT_shader_implicit_conversions\n+#define GL_EXT_shader_implicit_conversions 1\n+#endif \/* GL_EXT_shader_implicit_conversions *\/\n+\n #ifndef GL_EXT_shader_integer_mix\n #define GL_EXT_shader_integer_mix 1\n #endif \/* GL_EXT_shader_integer_mix *\/\n+\n+#ifndef GL_EXT_shader_io_blocks\n+#define GL_EXT_shader_io_blocks 1\n+#endif \/* GL_EXT_shader_io_blocks *\/\n \n #ifndef GL_EXT_shader_pixel_local_storage\n #define GL_EXT_shader_pixel_local_storage 1\n@@ -1087,6 +1265,109 @@\n #define GL_SAMPLER_2D_SHADOW_EXT 0x8B62\n #endif \/* GL_EXT_shadow_samplers *\/\n \n+#ifndef GL_EXT_tessellation_point_size\n+#define GL_EXT_tessellation_point_size 1\n+#endif \/* GL_EXT_tessellation_point_size *\/\n+\n+#ifndef GL_EXT_tessellation_shader\n+#define GL_EXT_tessellation_shader 1\n+#define GL_PATCHES_EXT 0x000E\n+#define GL_PATCH_VERTICES_EXT 0x8E72\n+#define GL_TESS_CONTROL_OUTPUT_VERTICES_EXT 0x8E75\n+#define GL_TESS_GEN_MODE_EXT 0x8E76\n+#define GL_TESS_GEN_SPACING_EXT 0x8E77\n+#define GL_TESS_GEN_VERTEX_ORDER_EXT 0x8E78\n+#define GL_TESS_GEN_POINT_MODE_EXT 0x8E79\n+#define GL_ISOLINES_EXT 0x8E7A\n+#define GL_QUADS_EXT 0x0007\n+#define GL_FRACTIONAL_ODD_EXT 0x8E7B\n+#define GL_FRACTIONAL_EVEN_EXT 0x8E7C\n+#define GL_MAX_PATCH_VERTICES_EXT 0x8E7D\n+#define GL_MAX_TESS_GEN_LEVEL_EXT 0x8E7E\n+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E7F\n+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E80\n+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT 0x8E81\n+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT 0x8E82\n+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT 0x8E83\n+#define GL_MAX_TESS_PATCH_COMPONENTS_EXT 0x8E84\n+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT 0x8E85\n+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT 0x8E86\n+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT 0x8E89\n+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT 0x8E8A\n+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT 0x886C\n+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT 0x886D\n+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E1E\n+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E1F\n+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT 0x92CD\n+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT 0x92CE\n+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT 0x92D3\n+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT 0x92D4\n+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT 0x90CB\n+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT 0x90CC\n+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT 0x90D8\n+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT 0x90D9\n+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221\n+#define GL_IS_PER_PATCH_EXT 0x92E7\n+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT 0x9307\n+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT 0x9308\n+#define GL_TESS_CONTROL_SHADER_EXT 0x8E88\n+#define GL_TESS_EVALUATION_SHADER_EXT 0x8E87\n+#define GL_TESS_CONTROL_SHADER_BIT_EXT 0x00000008\n+#define GL_TESS_EVALUATION_SHADER_BIT_EXT 0x00000010\n+typedef void (GL_APIENTRYP PFNGLPATCHPARAMETERIEXTPROC) (GLenum pname, GLint value);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glPatchParameteriEXT (GLenum pname, GLint value);\n+#endif\n+#endif \/* GL_EXT_tessellation_shader *\/\n+\n+#ifndef GL_EXT_texture_border_clamp\n+#define GL_EXT_texture_border_clamp 1\n+#define GL_TEXTURE_BORDER_COLOR_EXT 0x1004\n+#define GL_CLAMP_TO_BORDER_EXT 0x812D\n+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);\n+typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);\n+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);\n+typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);\n+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, const GLint *param);\n+typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, const GLuint *param);\n+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, GLint *params);\n+typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, GLuint *params);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);\n+GL_APICALL void GL_APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);\n+GL_APICALL void GL_APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);\n+GL_APICALL void GL_APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);\n+GL_APICALL void GL_APIENTRY glSamplerParameterIivEXT (GLuint sampler, GLenum pname, const GLint *param);\n+GL_APICALL void GL_APIENTRY glSamplerParameterIuivEXT (GLuint sampler, GLenum pname, const GLuint *param);\n+GL_APICALL void GL_APIENTRY glGetSamplerParameterIivEXT (GLuint sampler, GLenum pname, GLint *params);\n+GL_APICALL void GL_APIENTRY glGetSamplerParameterIuivEXT (GLuint sampler, GLenum pname, GLuint *params);\n+#endif\n+#endif \/* GL_EXT_texture_border_clamp *\/\n+\n+#ifndef GL_EXT_texture_buffer\n+#define GL_EXT_texture_buffer 1\n+#define GL_TEXTURE_BUFFER_EXT 0x8C2A\n+#define GL_TEXTURE_BUFFER_BINDING_EXT 0x8C2A\n+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B\n+#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C\n+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D\n+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT 0x919F\n+#define GL_SAMPLER_BUFFER_EXT 0x8DC2\n+#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0\n+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8\n+#define GL_IMAGE_BUFFER_EXT 0x9051\n+#define GL_INT_IMAGE_BUFFER_EXT 0x905C\n+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067\n+#define GL_TEXTURE_BUFFER_OFFSET_EXT 0x919D\n+#define GL_TEXTURE_BUFFER_SIZE_EXT 0x919E\n+typedef void (GL_APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);\n+typedef void (GL_APIENTRYP PFNGLTEXBUFFERRANGEEXTPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);\n+GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);\n+#endif\n+#endif \/* GL_EXT_texture_buffer *\/\n+\n #ifndef GL_EXT_texture_compression_dxt1\n #define GL_EXT_texture_compression_dxt1 1\n #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0\n@@ -1098,6 +1379,19 @@\n #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2\n #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3\n #endif \/* GL_EXT_texture_compression_s3tc *\/\n+\n+#ifndef GL_EXT_texture_cube_map_array\n+#define GL_EXT_texture_cube_map_array 1\n+#define GL_TEXTURE_CUBE_MAP_ARRAY_EXT 0x9009\n+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT 0x900A\n+#define GL_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900C\n+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT 0x900D\n+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900E\n+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900F\n+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054\n+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F\n+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A\n+#endif \/* GL_EXT_texture_cube_map_array *\/\n \n #ifndef GL_EXT_texture_filter_anisotropic\n #define GL_EXT_texture_filter_anisotropic 1\n@@ -1160,6 +1454,19 @@\n #define GL_EXT_texture_type_2_10_10_10_REV 1\n #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368\n #endif \/* GL_EXT_texture_type_2_10_10_10_REV *\/\n+\n+#ifndef GL_EXT_texture_view\n+#define GL_EXT_texture_view 1\n+#define GL_TEXTURE_VIEW_MIN_LEVEL_EXT 0x82DB\n+#define GL_TEXTURE_VIEW_NUM_LEVELS_EXT 0x82DC\n+#define GL_TEXTURE_VIEW_MIN_LAYER_EXT 0x82DD\n+#define GL_TEXTURE_VIEW_NUM_LAYERS_EXT 0x82DE\n+#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF\n+typedef void (GL_APIENTRYP PFNGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);\n+#ifdef GL_GLEXT_PROTOTYPES\n+GL_APICALL void GL_APIENTRY glTextureViewEXT (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);\n+#endif\n+#endif \/* GL_EXT_texture_view *\/\n \n #ifndef GL_EXT_unpack_subimage\n #define GL_EXT_unpack_subimage 1\n"} {"commit":"c7dc06b2cac7c1188a43728990d2ed8e536ee1b3","subject":"make parent wait of reader process","message":"make parent wait of reader process\n","repos":"aliclark\/paracat","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- paracat.c\n+++ paracat.c\n@@ -181,7 +181,7 @@\n }\n }\n \n-static int spawn_children(pid_t* pids, int* fds, int numchildren, char** args, bool recombine_flag) {\n+static int spawn_children(pid_t* pids, int* fds, int numchildren, char** args, bool recombine_flag, pid_t* recombine_pid) {\n int fd[2];\n int out[2];\n int i;\n@@ -279,6 +279,8 @@\n read_write_from_children(outfds, numchildren);\n \n } else {\n+ *recombine_pid = pid;\n+\n for (i = 0; i < numchildren; ++i) {\n if (close(outfds[i]) < GOOD) {\n perror(\"Error: Could not close parent process pipe's output\");\n@@ -365,7 +367,9 @@\n int numpids = 0;\n char* end = NULL;\n char** command;\n-\n+ int status;\n+\n+ pid_t recombine_pid;\n int recombine_flag = 1;\n \n struct option long_options[] = {\n@@ -431,7 +435,7 @@\n pids = (pid_t*)malloc(sizeof(pid_t) * numpids);\n fds = (int*)malloc(sizeof(int) * numpids);\n \n- if (spawn_children(pids, fds, numpids, command, recombine_flag) < GOOD) {\n+ if (spawn_children(pids, fds, numpids, command, recombine_flag, &recombine_pid) < GOOD) {\n return 2;\n }\n \n@@ -447,8 +451,6 @@\n }\n \n for (i = 0; i < numpids; ++i) {\n- int status;\n-\n if (waitpid(pids[i], &status, NO_OPTIONS) < GOOD) {\n fprintf(stderr, \"Error: Could not wait for child pid: %d, %s\\n\", pids[i], strerror(errno));\n \/* continue anyway *\/\n@@ -459,5 +461,16 @@\n }\n }\n \n+ if (recombine_flag) {\n+ if (waitpid(recombine_pid, &status, NO_OPTIONS) < GOOD) {\n+ fprintf(stderr, \"Error: Could not wait for reader pid: %d, %s\\n\", pids[i], strerror(errno));\n+ \/* continue anyway *\/\n+ }\n+\n+ if (status != GOOD) {\n+ fprintf(stderr, \"Warning: got exit status: %d, from reader pid: %d\\n\", status, pids[i]);\n+ }\n+ }\n+\n return EXIT_SUCCESS;\n }\n"} {"commit":"055278593dcb03727875ef0f9c63ac0305cabdaf","subject":"fprintf","message":"fprintf\n","repos":"zheniantoushipashi\/dnsProxy,zheniantoushipashi\/dnsProxy,zheniantoushipashi\/dnsProxy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/core\/speed.c\n+++ src\/core\/speed.c\n@@ -106,6 +106,8 @@\n \n int main(int argc, char *argv[])\n {\n+\n+\tfprintf(STDOUT_FILENO, \"%s\\n\", \"sdfsfsdfsdf\");\n \tlxl_uint_t i;\n \tlxl_log_t *log;\n \tlxl_cycle_t *cycle, init_cycle;\n"} {"commit":"c4c089be9f8e1daec6cdec5c17a1cbca2c0b42a8","subject":"disable Visual Studio 2010 warning C4290","message":"disable Visual Studio 2010 warning C4290\n","repos":"ConnectedVision\/connectedvision,ConnectedVision\/connectedvision,ConnectedVision\/connectedvision,ConnectedVision\/connectedvision,ConnectedVision\/connectedvision,ConnectedVision\/connectedvision","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- core\/include\/general.h\n+++ core\/include\/general.h\n@@ -19,6 +19,7 @@\n \n #if (_MSC_VER == 1600) \/\/ check for Visual Studio 2010\n #define noexcept\n+#pragma warning( disable : 4290 )\n #endif\n \n namespace ConnectedVision\n"} {"commit":"75b4c946ac9f970de3c8935f178d574a5556ea7e","subject":"[core hwtimer]","message":"[core hwtimer]\n\n* removed double function prototype\n","repos":"abkam07\/RIOT,PSHIVANI\/Riot-Code,miri64\/RIOT,JensErdmann\/RIOT,BytesGalore\/RIOT,Osblouf\/RIOT,hamilton-mote\/RIOT-OS,attdona\/RIOT,d00616\/RIOT,sgso\/RIOT,rfswarm2\/RIOT,khhhh\/RIOT,jasonatran\/RIOT,emmanuelsearch\/RIOT,openkosmosorg\/RIOT,attdona\/RIOT,LudwigKnuepfer\/RIOT,rousselk\/RIOT,jasonatran\/RIOT,beurdouche\/RIOT,EmuxEvans\/RIOT,kerneltask\/RIOT,benoit-canet\/RIOT,Darredevil\/RIOT,neiljay\/RIOT,rajma996\/RIOT,mtausig\/RIOT,avmelnikoff\/RIOT,kbumsik\/RIOT,tfar\/RIOT,thiagohd\/RIOT,kaspar030\/RIOT,asanka-code\/RIOT,tfar\/RIOT,immesys\/RiSyn,alex1818\/RIOT,mtausig\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,ks156\/RIOT,l3nko\/RIOT,dkm\/RIOT,MohmadAyman\/RIOT,Yonezawa-T2\/RIOT,herrfz\/RIOT,rousselk\/RIOT,AnonMall\/RIOT,lebrush\/RIOT,cladmi\/RIOT,Lexandro92\/RIOT-CoAP,ros2\/ros2_embedded_riot,sgso\/RIOT,RBartz\/RIOT,rfswarm\/RIOT,josephnoir\/RIOT,msolters\/RIOT,avmelnikoff\/RIOT,smlng\/RIOT,rajma996\/RIOT,ntrtrung\/RIOT,jremmert-phytec-iot\/RIOT,jbeyerstedt\/RIOT-OTA-update,robixnai\/RIOT,d00616\/RIOT,jremmert-phytec-iot\/RIOT,kaspar030\/RIOT,EmuxEvans\/RIOT,gautric\/RIOT,stevenj\/RIOT,locicontrols\/RIOT,TobiasFredersdorf\/RIOT,Hyungsin\/RIOT-OS,smlng\/RIOT,RubikonAlpha\/RIOT,Osblouf\/RIOT,ros2\/ros2_embedded_riot,mfrey\/RIOT,abkam07\/RIOT,MarkXYang\/RIOT,ThanhVic\/RIOT,phiros\/RIOT,dailab\/RIOT,rfswarm\/RIOT,ant9000\/RIOT,kbumsik\/RIOT,AnonMall\/RIOT,Hyungsin\/RIOT-OS,latsku\/RIOT,biboc\/RIOT,bartfaizoltan\/RIOT,toonst\/RIOT,gautric\/RIOT,rfuentess\/RIOT,stevenj\/RIOT,asanka-code\/RIOT,watr-li\/RIOT,adrianghc\/RIOT,kb2ma\/RIOT,phiros\/RIOT,bartfaizoltan\/RIOT,hamilton-mote\/RIOT-OS,kYc0o\/RIOT,biboc\/RIOT,shady33\/RIOT,PSHIVANI\/Riot-Code,jhollister\/RIOT,koenning\/RIOT,phiros\/RIOT,jasonatran\/RIOT,immesys\/RiSyn,fnack\/RIOT,locicontrols\/RIOT,msolters\/RIOT,yogo1212\/RIOT,gebart\/RIOT,lazytech-org\/RIOT,MohmadAyman\/RIOT,khhhh\/RIOT,yogo1212\/RIOT,asanka-code\/RIOT,MohmadAyman\/RIOT,rakendrathapa\/RIOT,LudwigOrtmann\/RIOT,asanka-code\/RIOT,watr-li\/RIOT,wentaoshang\/RIOT,kb2ma\/RIOT,tdautc19841202\/RIOT,mfrey\/RIOT,LudwigKnuepfer\/RIOT,1blankz7\/RIOT,kushalsingh007\/RIOT,alignan\/RIOT,changbiao\/RIOT,Darredevil\/RIOT,brettswann\/RIOT,sumanpanchal\/RIOT,kaleb-himes\/RIOT,BytesGalore\/RIOT,spium\/IoT-RIOT,malosek\/RIOT,arvindpdmn\/RIOT,jasonatran\/RIOT,benoit-canet\/RIOT,ros2\/ros2_embedded_riot,syin2\/RIOT,sgso\/RIOT,fnack\/RIOT,mtausig\/RIOT,zhuoshuguo\/RIOT,fnack\/RIOT,RIOT-OS\/RIOT,malosek\/RIOT,kushalsingh007\/RIOT,dailab\/RIOT,ntrtrung\/RIOT,attdona\/RIOT,rfswarm\/RIOT,d00616\/RIOT,bartfaizoltan\/RIOT,LudwigOrtmann\/RIOT,kerneltask\/RIOT,changbiao\/RIOT,JensErdmann\/RIOT,thomaseichinger\/RIOT,Yonezawa-T2\/RIOT,JensErdmann\/RIOT,MarkXYang\/RIOT,Lexandro92\/RIOT-CoAP,centurysys\/RIOT,emmanuelsearch\/RIOT,immesys\/RiSyn,alex1818\/RIOT,Josar\/RIOT,authmillenon\/RIOT,binarylemon\/RIOT,authmillenon\/RIOT,x3ro\/RIOT,automote\/RIOT,yogo1212\/RIOT,ant9000\/RIOT,nsol-nmsu\/RIOT,syin2\/RIOT,abkam07\/RIOT,kerneltask\/RIOT,backenklee\/RIOT,MohmadAyman\/RIOT,miri64\/RIOT,aeneby\/RIOT,RubikonAlpha\/RIOT,aeneby\/RIOT,RBartz\/RIOT,kerneltask\/RIOT,toonst\/RIOT,authmillenon\/RIOT,herrfz\/RIOT,wentaoshang\/RIOT,tdautc19841202\/RIOT,jhollister\/RIOT,ks156\/RIOT,1blankz7\/RIOT,OTAkeys\/RIOT,Darredevil\/RIOT,altairpearl\/RIOT,ks156\/RIOT,marcosalm\/RIOT,southernbear\/RIOT,TobiasFredersdorf\/RIOT,OlegHahm\/RIOT,arvindpdmn\/RIOT,openkosmosorg\/RIOT,mfrey\/RIOT,lebrush\/RIOT,rousselk\/RIOT,roberthartung\/RIOT,DipSwitch\/RIOT,Lexandro92\/RIOT-CoAP,kerneltask\/RIOT,dhruvvyas90\/RIOT,josephnoir\/RIOT,syin2\/RIOT,jfischer-phytec-iot\/RIOT,southernbear\/RIOT,benoit-canet\/RIOT,stevenj\/RIOT,rakendrathapa\/RIOT,FrancescoErmini\/RIOT,sumanpanchal\/RIOT,thiagohd\/RIOT,hamilton-mote\/RIOT-OS,miri64\/RIOT,DipSwitch\/RIOT,openkosmosorg\/RIOT,rakendrathapa\/RIOT,rfswarm2\/RIOT,ros2\/ros2_embedded_riot,thomaseichinger\/RIOT,adrianghc\/RIOT,dhruvvyas90\/RIOT,kaleb-himes\/RIOT,RBartz\/RIOT,LudwigOrtmann\/RIOT,kaspar030\/RIOT,msolters\/RIOT,jfischer-phytec-iot\/RIOT,stevenj\/RIOT,abkam07\/RIOT,ximus\/RIOT,spium\/IoT-RIOT,MohmadAyman\/RIOT,marcosalm\/RIOT,emmanuelsearch\/RIOT,Darredevil\/RIOT,chris-wood\/RIOT,mziegert\/RIOT,EmuxEvans\/RIOT,locicontrols\/RIOT,fnack\/RIOT,mziegert\/RIOT,EmuxEvans\/RIOT,binarylemon\/RIOT,ximus\/RIOT,spium\/IoT-RIOT,gebart\/RIOT,centurysys\/RIOT,BytesGalore\/PetersRIOT,MohmadAyman\/RIOT,spium\/IoT-RIOT,BytesGalore\/PetersRIOT,rousselk\/RIOT,herrfz\/RIOT-old,fnack\/RIOT,DipSwitch\/RIOT,biboc\/RIOT,MonsterCode8000\/RIOT,Ell-i\/RIOT,plushvoxel\/RIOT,gbarnett\/RIOT,toonst\/RIOT,zhuoshuguo\/RIOT,haoyangyu\/RIOT,Osblouf\/RIOT,alex1818\/RIOT,OTAkeys\/RIOT,smlng\/RIOT,TobiasFredersdorf\/RIOT,abp719\/RIOT,cladmi\/RIOT,RIOT-OS\/RIOT,BytesGalore\/PetersRIOT,neiljay\/RIOT,RubikonAlpha\/RIOT,dailab\/RIOT,immesys\/RiSyn,RIOT-OS\/RIOT,patkan\/RIOT,alignan\/RIOT,marcosalm\/RIOT,smlng\/RIOT,Ell-i\/RIOT,zhuoshuguo\/RIOT,jferreir\/RIOT,luciotorre\/RIOT,josephnoir\/RIOT,LudwigKnuepfer\/RIOT,x3ro\/RIOT,basilfx\/RIOT,ntrtrung\/RIOT,OlegHahm\/RIOT,RubikonAlpha\/RIOT,plushvoxel\/RIOT,authmillenon\/RIOT,Josar\/RIOT,gebart\/RIOT,TobiasFredersdorf\/RIOT,Ell-i\/RIOT,rfswarm\/RIOT,gebart\/RIOT,tdautc19841202\/RIOT,altairpearl\/RIOT,PSHIVANI\/Riot-Code,EmuxEvans\/RIOT,wentaoshang\/RIOT,brettswann\/RIOT,JensErdmann\/RIOT,southernbear\/RIOT,shady33\/RIOT,katezilla\/RIOT,katezilla\/RIOT,locicontrols\/RIOT,wentaoshang\/RIOT,ros2\/ros2_embedded_riot,AnonMall\/RIOT,MonsterCode8000\/RIOT,MarkXYang\/RIOT,jbeyerstedt\/RIOT-OTA-update,latsku\/RIOT,changbiao\/RIOT,jfischer-phytec-iot\/RIOT,msolters\/RIOT,abp719\/RIOT,bartfaizoltan\/RIOT,jbeyerstedt\/RIOT-OTA-update,authmillenon\/RIOT,asanka-code\/RIOT,khhhh\/RIOT,kYc0o\/RIOT,altairpearl\/RIOT,kaleb-himes\/RIOT,ximus\/RIOT,herrfz\/RIOT,adrianghc\/RIOT,haoyangyu\/RIOT,marcosalm\/RIOT,x3ro\/RIOT,OTAkeys\/RIOT,kYc0o\/RIOT,spium\/IoT-RIOT,OTAkeys\/RIOT,lebrush\/RIOT,Josar\/RIOT,jfischer-phytec-iot\/RIOT,koenning\/RIOT,AnonMall\/RIOT,Lexandro92\/RIOT-CoAP,rfswarm2\/RIOT,malosek\/RIOT,aeneby\/RIOT,kushalsingh007\/RIOT,BytesGalore\/PetersRIOT,EmuxEvans\/RIOT,watr-li\/RIOT,ThanhVic\/RIOT,syin2\/RIOT,l3nko\/RIOT,nsol-nmsu\/RIOT,automote\/RIOT,kb2ma\/RIOT,Josar\/RIOT,gautric\/RIOT,fnack\/RIOT,rousselk\/RIOT,luciotorre\/RIOT,dailab\/RIOT,dhruvvyas90\/RIOT,dkm\/RIOT,Osblouf\/RIOT,MarkXYang\/RIOT,nsol-nmsu\/RIOT,lazytech-org\/RIOT,toonst\/RIOT,ntrtrung\/RIOT,benoit-canet\/RIOT,Hyungsin\/RIOT-OS,bartfaizoltan\/RIOT,jferreir\/RIOT,beurdouche\/RIOT,Yonezawa-T2\/RIOT,kushalsingh007\/RIOT,thiagohd\/RIOT,DipSwitch\/RIOT,RubikonAlpha\/RIOT,rousselk\/RIOT,josephnoir\/RIOT,zhuoshuguo\/RIOT,ntrtrung\/RIOT,brettswann\/RIOT,openkosmosorg\/RIOT,malosek\/RIOT,avmelnikoff\/RIOT,roberthartung\/RIOT,haoyangyu\/RIOT,locicontrols\/RIOT,emmanuelsearch\/RIOT,katezilla\/RIOT,basilfx\/RIOT,emmanuelsearch\/RIOT,thiagohd\/RIOT,openkosmosorg\/RIOT,shady33\/RIOT,arvindpdmn\/RIOT,gautric\/RIOT,altairpearl\/RIOT,Osblouf\/RIOT,arvindpdmn\/RIOT,kushalsingh007\/RIOT,yogo1212\/RIOT,koenning\/RIOT,jhollister\/RIOT,benoit-canet\/RIOT,gbarnett\/RIOT,patkan\/RIOT,kYc0o\/RIOT,jfischer-phytec-iot\/RIOT,herrfz\/RIOT-old,tdautc19841202\/RIOT,brettswann\/RIOT,rfswarm2\/RIOT,tfar\/RIOT,dhruvvyas90\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,rfuentess\/RIOT,rfuentess\/RIOT,rfswarm2\/RIOT,cladmi\/RIOT,herrfz\/RIOT,neumodisch\/RIOT,malosek\/RIOT,BytesGalore\/RIOT,msolters\/RIOT,latsku\/RIOT,FrancescoErmini\/RIOT,rakendrathapa\/RIOT,gbarnett\/RIOT,tfar\/RIOT,tdautc19841202\/RIOT,LudwigOrtmann\/RIOT,RBartz\/RIOT,luciotorre\/RIOT,adjih\/RIOT,hamilton-mote\/RIOT-OS,Osblouf\/RIOT,chris-wood\/RIOT,lebrush\/RIOT,d00616\/RIOT,tfar\/RIOT,abp719\/RIOT,changbiao\/RIOT,RBartz\/RIOT,AnonMall\/RIOT,msolters\/RIOT,tdautc19841202\/RIOT,l3nko\/RIOT,Lexandro92\/RIOT-CoAP,mziegert\/RIOT,rfswarm2\/RIOT,daniel-k\/RIOT,mziegert\/RIOT,luciotorre\/RIOT,sgso\/RIOT,avmelnikoff\/RIOT,daniel-k\/RIOT,PSHIVANI\/Riot-Code,spium\/IoT-RIOT,binarylemon\/RIOT,A-Paul\/RIOT,neiljay\/RIOT,phiros\/RIOT,ThanhVic\/RIOT,BytesGalore\/PetersRIOT,backenklee\/RIOT,cladmi\/RIOT,immesys\/RiSyn,kaspar030\/RIOT,DipSwitch\/RIOT,arvindpdmn\/RIOT,thiagohd\/RIOT,josephnoir\/RIOT,neumodisch\/RIOT,FrancescoErmini\/RIOT,miri64\/RIOT,chris-wood\/RIOT,locicontrols\/RIOT,sumanpanchal\/RIOT,rfswarm\/RIOT,Hyungsin\/RIOT-OS,aeneby\/RIOT,ximus\/RIOT,1blankz7\/RIOT,ximus\/RIOT,abp719\/RIOT,attdona\/RIOT,ThanhVic\/RIOT,yogo1212\/RIOT,automote\/RIOT,khhhh\/RIOT,dailab\/RIOT,l3nko\/RIOT,latsku\/RIOT,BytesGalore\/PetersRIOT,RIOT-OS\/RIOT,adjih\/RIOT,BytesGalore\/RIOT,AnonMall\/RIOT,robixnai\/RIOT,rfuentess\/RIOT,immesys\/RiSyn,jremmert-phytec-iot\/RIOT,chris-wood\/RIOT,Lotterleben\/RIOT,rajma996\/RIOT,Josar\/RIOT,cladmi\/RIOT,LudwigOrtmann\/RIOT,OTAkeys\/RIOT,ThanhVic\/RIOT,RubikonAlpha\/RIOT,OlegHahm\/RIOT,watr-li\/RIOT,stevenj\/RIOT,patkan\/RIOT,lebrush\/RIOT,openkosmosorg\/RIOT,jferreir\/RIOT,koenning\/RIOT,adjih\/RIOT,attdona\/RIOT,beurdouche\/RIOT,neiljay\/RIOT,jferreir\/RIOT,ros2\/ros2_embedded_riot,1blankz7\/RIOT,A-Paul\/RIOT,marcosalm\/RIOT,abkam07\/RIOT,mtausig\/RIOT,automote\/RIOT,zhuoshuguo\/RIOT,x3ro\/RIOT,haoyangyu\/RIOT,robixnai\/RIOT,plushvoxel\/RIOT,Lotterleben\/RIOT,kbumsik\/RIOT,binarylemon\/RIOT,ant9000\/RIOT,beurdouche\/RIOT,jremmert-phytec-iot\/RIOT,mfrey\/RIOT,Lotterleben\/RIOT,d00616\/RIOT,brettswann\/RIOT,centurysys\/RIOT,southernbear\/RIOT,phiros\/RIOT,daniel-k\/RIOT,basilfx\/RIOT,jremmert-phytec-iot\/RIOT,sumanpanchal\/RIOT,LudwigKnuepfer\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,herrfz\/RIOT,zhuoshuguo\/RIOT,rajma996\/RIOT,koenning\/RIOT,MonsterCode8000\/RIOT,watr-li\/RIOT,1blankz7\/RIOT,backenklee\/RIOT,herrfz\/RIOT,d00616\/RIOT,adrianghc\/RIOT,khhhh\/RIOT,Lotterleben\/RIOT,wentaoshang\/RIOT,biboc\/RIOT,phiros\/RIOT,l3nko\/RIOT,ks156\/RIOT,abkam07\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,roberthartung\/RIOT,ant9000\/RIOT,locicontrols\/RIOT,herrfz\/RIOT-old,changbiao\/RIOT,ximus\/RIOT,latsku\/RIOT,jhollister\/RIOT,herrfz\/RIOT-old,adjih\/RIOT,daniel-k\/RIOT,herrfz\/RIOT-old,x3ro\/RIOT,roberthartung\/RIOT,gbarnett\/RIOT,dhruvvyas90\/RIOT,lazytech-org\/RIOT,jhollister\/RIOT,A-Paul\/RIOT,asanka-code\/RIOT,rakendrathapa\/RIOT,MonsterCode8000\/RIOT,JensErdmann\/RIOT,haoyangyu\/RIOT,Lexandro92\/RIOT-CoAP,centurysys\/RIOT,jbeyerstedt\/RIOT-OTA-update,beurdouche\/RIOT,alignan\/RIOT,katezilla\/RIOT,chris-wood\/RIOT,FrancescoErmini\/RIOT,lebrush\/RIOT,dhruvvyas90\/RIOT,automote\/RIOT,thomaseichinger\/RIOT,roberthartung\/RIOT,ant9000\/RIOT,binarylemon\/RIOT,alex1818\/RIOT,altairpearl\/RIOT,kYc0o\/RIOT,basilfx\/RIOT,Hyungsin\/RIOT-OS,lazytech-org\/RIOT,MonsterCode8000\/RIOT,sgso\/RIOT,sumanpanchal\/RIOT,syin2\/RIOT,emmanuelsearch\/RIOT,lazytech-org\/RIOT,backenklee\/RIOT,arvindpdmn\/RIOT,RIOT-OS\/RIOT,jhollister\/RIOT,rajma996\/RIOT,wentaoshang\/RIOT,neumodisch\/RIOT,jbeyerstedt\/RIOT-OTA-update,daniel-k\/RIOT,smlng\/RIOT,altairpearl\/RIOT,jremmert-phytec-iot\/RIOT,daniel-k\/RIOT,thiagohd\/RIOT,DipSwitch\/RIOT,thomaseichinger\/RIOT,khhhh\/RIOT,neumodisch\/RIOT,PSHIVANI\/Riot-Code,MarkXYang\/RIOT,Darredevil\/RIOT,MarkXYang\/RIOT,hamilton-mote\/RIOT-OS,haoyangyu\/RIOT,A-Paul\/RIOT,chris-wood\/RIOT,robixnai\/RIOT,gebart\/RIOT,adjih\/RIOT,benoit-canet\/RIOT,BytesGalore\/PetersRIOT,basilfx\/RIOT,kaleb-himes\/RIOT,mziegert\/RIOT,alex1818\/RIOT,mtausig\/RIOT,koenning\/RIOT,kbumsik\/RIOT,centurysys\/RIOT,alex1818\/RIOT,rakendrathapa\/RIOT,backenklee\/RIOT,changbiao\/RIOT,OlegHahm\/RIOT,foss-for-synopsys-dwc-arc-processors\/RIOT,ThanhVic\/RIOT,jferreir\/RIOT,1blankz7\/RIOT,robixnai\/RIOT,neumodisch\/RIOT,stevenj\/RIOT,malosek\/RIOT,biboc\/RIOT,dkm\/RIOT,kaspar030\/RIOT,jasonatran\/RIOT,bartfaizoltan\/RIOT,ks156\/RIOT,RBartz\/RIOT,alignan\/RIOT,Lotterleben\/RIOT,FrancescoErmini\/RIOT,yogo1212\/RIOT,brettswann\/RIOT,katezilla\/RIOT,rfuentess\/RIOT,thomaseichinger\/RIOT,centurysys\/RIOT,nsol-nmsu\/RIOT,abp719\/RIOT,jferreir\/RIOT,patkan\/RIOT,patkan\/RIOT,binarylemon\/RIOT,A-Paul\/RIOT,rfswarm\/RIOT,marcosalm\/RIOT,kaleb-himes\/RIOT,Ell-i\/RIOT,latsku\/RIOT,kushalsingh007\/RIOT,neiljay\/RIOT,rajma996\/RIOT,Yonezawa-T2\/RIOT,gbarnett\/RIOT,PSHIVANI\/Riot-Code,shady33\/RIOT,Yonezawa-T2\/RIOT,Ell-i\/RIOT,LudwigOrtmann\/RIOT,sumanpanchal\/RIOT,BytesGalore\/RIOT,shady33\/RIOT,OlegHahm\/RIOT,TobiasFredersdorf\/RIOT,neumodisch\/RIOT,abp719\/RIOT,luciotorre\/RIOT,shady33\/RIOT,ntrtrung\/RIOT,mfrey\/RIOT,ros2\/ros2_embedded_riot,MonsterCode8000\/RIOT,luciotorre\/RIOT,alignan\/RIOT,toonst\/RIOT,gautric\/RIOT,l3nko\/RIOT,miri64\/RIOT,Lotterleben\/RIOT,mziegert\/RIOT,aeneby\/RIOT,FrancescoErmini\/RIOT,plushvoxel\/RIOT,automote\/RIOT,kb2ma\/RIOT,kbumsik\/RIOT,LudwigKnuepfer\/RIOT,sgso\/RIOT,JensErdmann\/RIOT,nsol-nmsu\/RIOT,Yonezawa-T2\/RIOT,attdona\/RIOT,robixnai\/RIOT,adrianghc\/RIOT,plushvoxel\/RIOT,avmelnikoff\/RIOT,Lotterleben\/RIOT,authmillenon\/RIOT,watr-li\/RIOT,dkm\/RIOT,Darredevil\/RIOT,patkan\/RIOT,dkm\/RIOT,kb2ma\/RIOT,gbarnett\/RIOT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/include\/hwtimer.h\n+++ core\/include\/hwtimer.h\n@@ -117,7 +117,6 @@\n * @brief TODO\n * @internal\n *\/\n-uint32_t hwtimer_now();\n void hwtimer_cpu_init(void (*handler)(int), uint32_t fcpu);\n void hwtimer_t0_disable_interrupt(void);\n void hwtimer_t0_enable_interrupt(void);\n"} {"commit":"e5f6b69f6cb46e283d9d39dcce5c5457dae706a0","subject":"alsa: Implement full-duplex support.","message":"alsa: Implement full-duplex support.\n\nThis adds capture and full-duplex streams, and basic (reporting only the\ndefault input and output device) device enumeration and selection.\n","repos":"kinetiknz\/cubeb,padenot\/cubeb,kinetiknz\/cubeb,kinetiknz\/cubeb,padenot\/cubeb,padenot\/cubeb","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/cubeb_alsa.c\n+++ src\/cubeb_alsa.c\n@@ -82,7 +82,7 @@\n cubeb_data_callback data_callback;\n cubeb_state_callback state_callback;\n void * user_ptr;\n- snd_pcm_uframes_t write_position;\n+ snd_pcm_uframes_t stream_position;\n snd_pcm_uframes_t last_position;\n snd_pcm_uframes_t buffer_size;\n cubeb_stream_params params;\n@@ -107,6 +107,12 @@\n being logically active and playing. *\/\n struct timeval last_activity;\n float volume;\n+\n+ char * buffer;\n+ snd_pcm_uframes_t bufframes;\n+ snd_pcm_stream_t stream_type;\n+\n+ struct cubeb_stream * other_stream;\n };\n \n static int\n@@ -235,6 +241,14 @@\n }\n \n static void\n+stream_buffer_decrement(cubeb_stream * stm, long count)\n+{\n+ char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);\n+ memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));\n+ stm->bufframes -= count;\n+}\n+\n+static void\n alsa_set_stream_state(cubeb_stream * stm, enum stream_state state)\n {\n cubeb * ctx;\n@@ -249,92 +263,173 @@\n }\n \n static enum stream_state\n-alsa_refill_stream(cubeb_stream * stm)\n-{\n+alsa_process_stream(cubeb_stream * stm)\n+{\n+ unsigned short revents;\n snd_pcm_sframes_t avail;\n- long got;\n- void * p;\n int draining;\n \n draining = 0;\n \n pthread_mutex_lock(&stm->mutex);\n \n+ \/* Call _poll_descriptors_revents() even if we don't use it\n+ to let underlying plugins clear null events. Otherwise poll()\n+ may wake up again and again, producing unnecessary CPU usage. *\/\n+ snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);\n+\n avail = snd_pcm_avail_update(stm->pcm);\n+\n+ \/* Got null event? Bail and wait for another wakeup. *\/\n+ if (avail == 0) {\n+ pthread_mutex_unlock(&stm->mutex);\n+ return RUNNING;\n+ }\n+\n+ \/* This could happen if we were suspended with SIGSTOP\/Ctrl+Z for a long time. *\/\n+ if ((unsigned int) avail > stm->buffer_size) {\n+ avail = stm->buffer_size;\n+ }\n+\n+ \/* Capture: Read available frames *\/\n+ if (stm->stream_type == SND_PCM_STREAM_CAPTURE && avail > 0) {\n+ snd_pcm_sframes_t got;\n+\n+ if (avail + stm->bufframes > stm->buffer_size) {\n+ \/* Buffer overflow. Skip and overwrite with new data. *\/\n+ stm->bufframes = 0;\n+ \/\/ TODO: should it be marked as DRAINING?\n+ }\n+\n+ got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);\n+\n+ if (got < 0) {\n+ avail = got; \/\/ the error handler below will recover us\n+ } else {\n+ stm->bufframes += got;\n+ stm->stream_position += got;\n+\n+ gettimeofday(&stm->last_activity, NULL);\n+ }\n+ }\n+\n+ \/* Capture: Pass read frames to callback function *\/\n+ if (stm->stream_type == SND_PCM_STREAM_CAPTURE && stm->bufframes > 0 &&\n+ (!stm->other_stream || stm->other_stream->bufframes < stm->other_stream->buffer_size)) {\n+ long wrote = stm->bufframes;\n+ struct cubeb_stream * mainstm = stm->other_stream ? stm->other_stream : stm;\n+ void * other_buffer = stm->other_stream ? stm->other_stream->buffer + stm->other_stream->bufframes : NULL;\n+\n+ \/* Correct write size to the other stream available space *\/\n+ if (stm->other_stream && wrote > stm->other_stream->buffer_size - stm->other_stream->bufframes) {\n+ wrote = stm->other_stream->buffer_size - stm->other_stream->bufframes;\n+ }\n+\n+ pthread_mutex_unlock(&stm->mutex);\n+ wrote = stm->data_callback(mainstm, stm->user_ptr, stm->buffer, other_buffer, wrote);\n+ pthread_mutex_lock(&stm->mutex);\n+\n+ if (wrote < 0) {\n+ avail = wrote; \/\/ the error handler below will recover us\n+ } else {\n+ stream_buffer_decrement(stm, wrote);\n+\n+ if (stm->other_stream) {\n+ stm->other_stream->bufframes += wrote;\n+ }\n+ }\n+ }\n+\n+ \/* Playback: Don't have enough data? Let's ask for more. *\/\n+ if (stm->stream_type == SND_PCM_STREAM_PLAYBACK && avail > stm->bufframes &&\n+ (!stm->other_stream || stm->other_stream->bufframes > 0)) {\n+ long got = avail - stm->bufframes;\n+ void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;\n+ char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);\n+\n+ \/* Correct read size to the other stream available frames *\/\n+ if (stm->other_stream && got > stm->other_stream->bufframes) {\n+ got = stm->other_stream->bufframes;\n+ }\n+\n+ pthread_mutex_unlock(&stm->mutex);\n+ got = stm->data_callback(stm, stm->user_ptr, other_buffer, buftail, got);\n+ pthread_mutex_lock(&stm->mutex);\n+\n+ if (got < 0) {\n+ avail = got; \/\/ the error handler below will recover us\n+ } else {\n+ stm->bufframes += got;\n+\n+ if (stm->other_stream) {\n+ stream_buffer_decrement(stm->other_stream, got);\n+ }\n+ }\n+ }\n+\n+ \/* Playback: Still don't have enough data? Add some silence. *\/\n+ if (stm->stream_type == SND_PCM_STREAM_PLAYBACK && avail > stm->bufframes) {\n+ long drain_frames = avail - stm->bufframes;\n+ double drain_time = (double) drain_frames \/ stm->params.rate;\n+\n+ char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);\n+ memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));\n+ stm->bufframes = avail;\n+\n+ \/* Mark as draining, unless we're waiting for capture *\/\n+ if (!stm->other_stream || stm->other_stream->bufframes > 0) {\n+ set_timeout(&stm->drain_timeout, drain_time * 1000);\n+\n+ draining = 1;\n+ }\n+ }\n+\n+ \/* Playback: Have enough data and no errors. Let's write it out. *\/\n+ if (stm->stream_type == SND_PCM_STREAM_PLAYBACK && avail > 0) {\n+ snd_pcm_sframes_t wrote;\n+\n+ if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {\n+ float * b = (float *) stm->buffer;\n+ for (uint32_t i = 0; i < avail * stm->params.channels; i++) {\n+ b[i] *= stm->volume;\n+ }\n+ } else {\n+ short * b = (short *) stm->buffer;\n+ for (uint32_t i = 0; i < avail * stm->params.channels; i++) {\n+ b[i] *= stm->volume;\n+ }\n+ }\n+\n+ wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);\n+ if (wrote < 0) {\n+ avail = wrote; \/\/ the error handler below will recover us\n+ } else {\n+ stream_buffer_decrement(stm, wrote);\n+\n+ stm->stream_position += wrote;\n+ gettimeofday(&stm->last_activity, NULL);\n+ }\n+ }\n+\n+ \/* Got some error? Let's try to recover the stream. *\/\n if (avail < 0) {\n- snd_pcm_recover(stm->pcm, avail, 1);\n- avail = snd_pcm_avail_update(stm->pcm);\n- }\n-\n- \/* Failed to recover from an xrun, this stream must be broken. *\/\n+ avail = snd_pcm_recover(stm->pcm, avail, 0);\n+\n+ \/* Capture pcm must be started after initial setup\/recover *\/\n+ if (avail >= 0 &&\n+ stm->stream_type == SND_PCM_STREAM_CAPTURE &&\n+ snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {\n+ avail = snd_pcm_start(stm->pcm);\n+ }\n+ }\n+\n+ \/* Failed to recover, this stream must be broken. *\/\n if (avail < 0) {\n pthread_mutex_unlock(&stm->mutex);\n stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);\n return ERROR;\n }\n \n- \/* This should never happen. *\/\n- if ((unsigned int) avail > stm->buffer_size) {\n- avail = stm->buffer_size;\n- }\n-\n- \/* poll(2) claims this stream is active, so there should be some space\n- available to write. If avail is still zero here, the stream must be in\n- a funky state, bail and wait for another wakeup. *\/\n- if (avail == 0) {\n- pthread_mutex_unlock(&stm->mutex);\n- return RUNNING;\n- }\n-\n- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail));\n- assert(p);\n-\n- pthread_mutex_unlock(&stm->mutex);\n- got = stm->data_callback(stm, stm->user_ptr, NULL, p, avail);\n- pthread_mutex_lock(&stm->mutex);\n- if (got < 0) {\n- pthread_mutex_unlock(&stm->mutex);\n- stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);\n- free(p);\n- return ERROR;\n- }\n- if (got > 0) {\n- snd_pcm_sframes_t wrote;\n-\n- if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {\n- float * b = (float *) p;\n- for (uint32_t i = 0; i < got * stm->params.channels; i++) {\n- b[i] *= stm->volume;\n- }\n- } else {\n- short * b = (short *) p;\n- for (uint32_t i = 0; i < got * stm->params.channels; i++) {\n- b[i] *= stm->volume;\n- }\n- }\n- wrote = snd_pcm_writei(stm->pcm, p, got);\n- if (wrote < 0) {\n- snd_pcm_recover(stm->pcm, wrote, 1);\n- wrote = snd_pcm_writei(stm->pcm, p, got);\n- }\n- assert(wrote >= 0 && wrote == got);\n- stm->write_position += wrote;\n- gettimeofday(&stm->last_activity, NULL);\n- }\n- if (got != avail) {\n- long buffer_fill = stm->buffer_size - (avail - got);\n- double buffer_time = (double) buffer_fill \/ stm->params.rate;\n-\n- \/* Fill the remaining buffer with silence to guarantee one full period\n- has been written. *\/\n- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got);\n-\n- set_timeout(&stm->drain_timeout, buffer_time * 1000);\n-\n- draining = 1;\n- }\n-\n- free(p);\n pthread_mutex_unlock(&stm->mutex);\n return draining ? DRAINING : RUNNING;\n }\n@@ -390,7 +485,7 @@\n if (stm && stm->state == RUNNING && stm->fds && any_revents(stm->fds, stm->nfds)) {\n alsa_set_stream_state(stm, PROCESSING);\n pthread_mutex_unlock(&ctx->mutex);\n- state = alsa_refill_stream(stm);\n+ state = alsa_process_stream(stm);\n pthread_mutex_lock(&ctx->mutex);\n alsa_set_stream_state(stm, state);\n }\n@@ -576,15 +671,15 @@\n }\n \n static int\n-alsa_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream, snd_config_t * local_config)\n+alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t stream, snd_config_t * local_config)\n {\n int r;\n \n pthread_mutex_lock(&cubeb_alsa_mutex);\n if (local_config) {\n- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config);\n+ r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);\n } else {\n- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK);\n+ r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);\n }\n pthread_mutex_unlock(&cubeb_alsa_mutex);\n \n@@ -707,7 +802,7 @@\n \n \/* Open a dummy PCM to force the configuration space to be evaluated so that\n init_local_config_with_workaround can find and modify the default node. *\/\n- r = alsa_locked_pcm_open(&dummy, SND_PCM_STREAM_PLAYBACK, NULL);\n+ r = alsa_locked_pcm_open(&dummy, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, NULL);\n if (r >= 0) {\n alsa_locked_pcm_close(dummy);\n }\n@@ -717,7 +812,7 @@\n pthread_mutex_unlock(&cubeb_alsa_mutex);\n if (ctx->local_config) {\n ctx->is_pa = 1;\n- r = alsa_locked_pcm_open(&dummy, SND_PCM_STREAM_PLAYBACK, ctx->local_config);\n+ r = alsa_locked_pcm_open(&dummy, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, ctx->local_config);\n \/* If we got a local_config, we found a PA PCM. If opening a PCM with that\n config fails with EINVAL, the PA PCM is too old for this workaround. *\/\n if (r == -EINVAL) {\n@@ -774,14 +869,14 @@\n static void alsa_stream_destroy(cubeb_stream * stm);\n \n static int\n-alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,\n- cubeb_devid input_device,\n- cubeb_stream_params * input_stream_params,\n- cubeb_devid output_device,\n- cubeb_stream_params * output_stream_params,\n- unsigned int latency_frames,\n- cubeb_data_callback data_callback, cubeb_state_callback state_callback,\n- void * user_ptr)\n+alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,\n+ snd_pcm_stream_t stream_type,\n+ cubeb_devid deviceid,\n+ cubeb_stream_params * stream_params,\n+ unsigned int latency_frames,\n+ cubeb_data_callback data_callback,\n+ cubeb_state_callback state_callback,\n+ void * user_ptr)\n {\n (void)stream_name;\n cubeb_stream * stm;\n@@ -789,22 +884,13 @@\n snd_pcm_format_t format;\n snd_pcm_uframes_t period_size;\n int latency_us = 0;\n+ char const * pcm_name = deviceid ? (char const *) deviceid : CUBEB_ALSA_PCM_NAME;\n \n assert(ctx && stream);\n \n- if (input_stream_params) {\n- \/* Capture support not yet implemented. *\/\n- return CUBEB_ERROR_NOT_SUPPORTED;\n- }\n-\n- if (input_device || output_device) {\n- \/* Device selection not yet implemented. *\/\n- return CUBEB_ERROR_DEVICE_UNAVAILABLE;\n- }\n-\n *stream = NULL;\n \n- switch (output_stream_params->format) {\n+ switch (stream_params->format) {\n case CUBEB_SAMPLE_S16LE:\n format = SND_PCM_FORMAT_S16_LE;\n break;\n@@ -836,14 +922,18 @@\n stm->data_callback = data_callback;\n stm->state_callback = state_callback;\n stm->user_ptr = user_ptr;\n- stm->params = *output_stream_params;\n+ stm->params = *stream_params;\n stm->state = INACTIVE;\n stm->volume = 1.0;\n+ stm->buffer = NULL;\n+ stm->bufframes = 0;\n+ stm->stream_type = stream_type;\n+ stm->other_stream = NULL;\n \n r = pthread_mutex_init(&stm->mutex, NULL);\n assert(r == 0);\n \n- r = alsa_locked_pcm_open(&stm->pcm, SND_PCM_STREAM_PLAYBACK, ctx->local_config);\n+ r = alsa_locked_pcm_open(&stm->pcm, pcm_name, stm->stream_type, ctx->local_config);\n if (r < 0) {\n alsa_stream_destroy(stm);\n return CUBEB_ERROR;\n@@ -873,6 +963,11 @@\n r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);\n assert(r == 0);\n \n+ \/* Double internal buffer size to have enough space when waiting for the other side of duplex connection *\/\n+ stm->buffer_size *= 2;\n+ stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));\n+ assert(stm->buffer);\n+\n stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);\n assert(stm->nfds > 0);\n \n@@ -894,6 +989,45 @@\n return CUBEB_OK;\n }\n \n+static int\n+alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name,\n+ cubeb_devid input_device,\n+ cubeb_stream_params * input_stream_params,\n+ cubeb_devid output_device,\n+ cubeb_stream_params * output_stream_params,\n+ unsigned int latency_frames,\n+ cubeb_data_callback data_callback, cubeb_state_callback state_callback,\n+ void * user_ptr)\n+{\n+ int result = CUBEB_OK;\n+ cubeb_stream * instm = NULL, * outstm = NULL;\n+\n+ if (result == CUBEB_OK && input_stream_params) {\n+ result = alsa_stream_init_single(ctx, &instm, stream_name, SND_PCM_STREAM_CAPTURE,\n+ input_device, input_stream_params, latency_frames,\n+ data_callback, state_callback, user_ptr);\n+ }\n+\n+ if (result == CUBEB_OK && output_stream_params) {\n+ result = alsa_stream_init_single(ctx, &outstm, stream_name, SND_PCM_STREAM_PLAYBACK,\n+ output_device, output_stream_params, latency_frames,\n+ data_callback, state_callback, user_ptr);\n+ }\n+\n+ if (result == CUBEB_OK && input_stream_params && output_stream_params) {\n+ instm->other_stream = outstm;\n+ outstm->other_stream = instm;\n+ }\n+\n+ if (result != CUBEB_OK && instm) {\n+ alsa_stream_destroy(instm);\n+ }\n+\n+ *stream = outstm ? outstm : instm;\n+\n+ return result;\n+}\n+\n static void\n alsa_stream_destroy(cubeb_stream * stm)\n {\n@@ -905,6 +1039,11 @@\n stm->state == DRAINING));\n \n ctx = stm->context;\n+\n+ if (stm->other_stream) {\n+ stm->other_stream->other_stream = NULL; \/\/ to stop infinite recursion\n+ alsa_stream_destroy(stm->other_stream);\n+ }\n \n pthread_mutex_lock(&stm->mutex);\n if (stm->pcm) {\n@@ -927,6 +1066,8 @@\n assert(ctx->active_streams >= 1);\n ctx->active_streams -= 1;\n pthread_mutex_unlock(&ctx->mutex);\n+\n+ free(stm->buffer);\n \n free(stm);\n }\n@@ -951,6 +1092,8 @@\n return CUBEB_ERROR;\n }\n \n+ assert(stm);\n+\n r = snd_pcm_hw_params_any(stm->pcm, hw_params);\n if (r < 0) {\n return CUBEB_ERROR;\n@@ -1028,7 +1171,18 @@\n assert(stm);\n ctx = stm->context;\n \n+ if (stm->stream_type == SND_PCM_STREAM_PLAYBACK && stm->other_stream) {\n+ int r = alsa_stream_start(stm->other_stream);\n+ if (r != CUBEB_OK)\n+ return r;\n+ }\n+\n pthread_mutex_lock(&stm->mutex);\n+ \/* Capture pcm must be started after initial setup\/recover *\/\n+ if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&\n+ snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {\n+ snd_pcm_start(stm->pcm);\n+ }\n snd_pcm_pause(stm->pcm, 0);\n gettimeofday(&stm->last_activity, NULL);\n pthread_mutex_unlock(&stm->mutex);\n@@ -1052,6 +1206,12 @@\n \n assert(stm);\n ctx = stm->context;\n+\n+ if (stm->stream_type == SND_PCM_STREAM_PLAYBACK && stm->other_stream) {\n+ int r = alsa_stream_stop(stm->other_stream);\n+ if (r != CUBEB_OK)\n+ return r;\n+ }\n \n pthread_mutex_lock(&ctx->mutex);\n while (stm->state == PROCESSING) {\n@@ -1089,8 +1249,8 @@\n assert(delay >= 0);\n \n *position = 0;\n- if (stm->write_position >= (snd_pcm_uframes_t) delay) {\n- *position = stm->write_position - delay;\n+ if (stm->stream_position >= (snd_pcm_uframes_t) delay) {\n+ *position = stm->stream_position - delay;\n }\n \n stm->last_position = *position;\n@@ -1121,6 +1281,55 @@\n pthread_mutex_lock(&stm->mutex);\n stm->volume = volume;\n pthread_mutex_unlock(&stm->mutex);\n+\n+ return CUBEB_OK;\n+}\n+\n+static int\n+alsa_enumerate_devices(cubeb * context, cubeb_device_type type,\n+ cubeb_device_collection ** collection)\n+{\n+ if (!context)\n+ return CUBEB_ERROR;\n+\n+ uint32_t rate, max_channels;\n+ int r;\n+\n+ r = alsa_get_preferred_sample_rate(context, &rate);\n+ if (r != CUBEB_OK) {\n+ return CUBEB_ERROR;\n+ }\n+\n+ r = alsa_get_max_channel_count(context, &max_channels);\n+ if (r != CUBEB_OK) {\n+ return CUBEB_ERROR;\n+ }\n+\n+ *collection = (cubeb_device_collection *) calloc(1, sizeof(cubeb_device_collection) + 1*sizeof(cubeb_device_info *));\n+ assert(*collection);\n+\n+ char const * a_name = \"default\";\n+ (*collection)->device[0] = (cubeb_device_info *) calloc(1, sizeof(cubeb_device_info));\n+ assert((*collection)->device[0]);\n+\n+ (*collection)->device[0]->device_id = strdup(a_name);\n+ (*collection)->device[0]->devid = (*collection)->device[0]->device_id;\n+ (*collection)->device[0]->friendly_name = strdup(a_name);\n+ (*collection)->device[0]->group_id = strdup(a_name);\n+ (*collection)->device[0]->vendor_name = strdup(a_name);\n+ (*collection)->device[0]->type = type;\n+ (*collection)->device[0]->state = CUBEB_DEVICE_STATE_ENABLED;\n+ (*collection)->device[0]->preferred = CUBEB_DEVICE_PREF_ALL;\n+ (*collection)->device[0]->format = CUBEB_DEVICE_FMT_S16NE;\n+ (*collection)->device[0]->default_format = CUBEB_DEVICE_FMT_S16NE;\n+ (*collection)->device[0]->max_channels = max_channels;\n+ (*collection)->device[0]->min_rate = rate;\n+ (*collection)->device[0]->max_rate = rate;\n+ (*collection)->device[0]->default_rate = rate;\n+ (*collection)->device[0]->latency_lo = 0;\n+ (*collection)->device[0]->latency_hi = 0;\n+\n+ (*collection)->count = 1;\n \n return CUBEB_OK;\n }\n@@ -1132,7 +1341,7 @@\n .get_min_latency = alsa_get_min_latency,\n .get_preferred_sample_rate = alsa_get_preferred_sample_rate,\n .get_preferred_channel_layout = NULL,\n- .enumerate_devices = NULL,\n+ .enumerate_devices = alsa_enumerate_devices,\n .destroy = alsa_destroy,\n .stream_init = alsa_stream_init,\n .stream_destroy = alsa_stream_destroy,\n"} {"commit":"c155fc95befc95f4a9d6497f5fadec22f4bc3a24","subject":"[ARM] 3106\/2: ARM EABI: some syscall adjustments","message":"[ARM] 3106\/2: ARM EABI: some syscall adjustments\n\nPatch from Nicolas Pitre\n\nFix a few syscalls for EABI requirements. They were sys_pread64 and\nsys_pwrite64 where the last argument is now entirely pushed on stack,\nbut since commit 567bd98017d9c9f2ac1c148ddc78c062e8abd398 they don't\nrequire any fixup. Remains only the stat64 structure. Non EABI kernels\nare unaffected.\n\nSigned-off-by: Nicolas Pitre\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-arm\/stat.h\n+++ include\/asm-arm\/stat.h\n@@ -70,14 +70,7 @@\n \n \tlong long\tst_size;\n \tunsigned long\tst_blksize;\n-\n-#if defined(__ARMEB__)\n-\tunsigned long __pad4;\t\t\/* Future possible st_blocks hi bits *\/\n-\tunsigned long st_blocks;\t\/* Number 512-byte blocks allocated. *\/\n-#else \/* Must be little *\/\n-\tunsigned long st_blocks;\t\/* Number 512-byte blocks allocated. *\/\n-\tunsigned long __pad4;\t\t\/* Future possible st_blocks hi bits *\/\n-#endif\n+\tunsigned long long st_blocks;\t\/* Number 512-byte blocks allocated. *\/\n \n \tunsigned long\tst_atime;\n \tunsigned long\tst_atime_nsec;\n@@ -89,6 +82,6 @@\n \tunsigned long\tst_ctime_nsec;\n \n \tunsigned long long\tst_ino;\n-} __attribute__((packed));\n+};\n \n #endif\n"} {"commit":"34a2a40aaa642031126e02585de88bb64a3bb352","subject":"remove trailing whitespaces from C code.","message":"remove trailing whitespaces from C code.\n\nand some smaller formatting issues.\n","repos":"sosy-lab\/java-smt,sosy-lab\/java-smt,sosy-lab\/java-smt,sosy-lab\/java-smt,sosy-lab\/java-smt","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/native\/source\/libboolector\/interface_wrap.c\n+++ lib\/native\/source\/libboolector\/interface_wrap.c\n@@ -162,9 +162,9 @@\n \n \/* Support for throwing Java exceptions *\/\n typedef enum {\n- SWIG_JavaOutOfMemoryError = 1, \n- SWIG_JavaIOException, \n- SWIG_JavaRuntimeException, \n+ SWIG_JavaOutOfMemoryError = 1,\n+ SWIG_JavaIOException,\n+ SWIG_JavaRuntimeException,\n SWIG_JavaIndexOutOfBoundsException,\n SWIG_JavaArithmeticException,\n SWIG_JavaIllegalArgumentException,\n@@ -242,16 +242,16 @@\n \/\/Make sure that filename is compliant with the used temp file method\n \/\/Returns NULL in case of NULL filename (so make sure you dont enter NULL!)\n char *addTemppathToFilename(char *filename) {\n- \n- if(!filename) {\n+\n+ if (!filename) {\n return NULL;\n }\n- \n+\n char* dir = getenv(\"TMPDIR\");\n- if(dir == NULL || strlen(dir) == 0) {\n+ if (dir == NULL || strlen(dir) == 0) {\n dir = \"\/tmp\/\";\n }\n- \n+\n int dirLength = (int)strlen(dir);\n int filenameLength = (int)strlen(filename);\n int completeNameLength = dirLength + filenameLength + 1;\n@@ -259,7 +259,7 @@\n char *tempfileName = (char *)malloc(completeNameLength * sizeof(char));\n strncpy(tempfileName, dir, (completeNameLength - filenameLength - 1)); \/\/completeNameLength - filenameLength - 1 = dirLength (without null-terminating char)\n strcat(tempfileName, filename);\n- \n+\n return tempfileName;\n }\n \n@@ -270,11 +270,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BOOLECTOR_1PARSE_1ERROR_1get(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n int result;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (int)(1);\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -282,11 +282,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BOOLECTOR_1PARSE_1UNKNOWN_1get(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n int result;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (int)(2);\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -294,11 +294,11 @@\n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1new(JNIEnv *jenv, jclass jcls) {\n jlong jresult = 0 ;\n Btor *result = 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (Btor *)boolector_new();\n- *(Btor **)&jresult = result; \n+ *(Btor **)&jresult = result;\n return jresult;\n }\n \n@@ -307,22 +307,22 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n Btor *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (Btor *)boolector_clone(arg1);\n- *(Btor **)&jresult = result; \n+ *(Btor **)&jresult = result;\n return jresult;\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1delete(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_delete(arg1);\n }\n \n@@ -331,32 +331,32 @@\n Btor *arg1 = (Btor *) 0 ;\n int32_t (*arg2)(void *) = (int32_t (*)(void *)) 0 ;\n void *arg3 = (void *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(int32_t (**)(void *))&jarg2; \n- arg3 = *(void **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(int32_t (**)(void *))&jarg2;\n+ arg3 = *(void **)&jarg3;\n boolector_set_term(arg1,arg2,arg3);\n }\n \n \n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1terminate(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n return boolector_terminate(arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1set_1abort(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n void (*arg1)(char const *) = (void (*)(char const *)) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(void (**)(char const *))&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(void (**)(char const *))&jarg1;\n boolector_set_abort(arg1);\n }\n \n@@ -364,10 +364,10 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1set_1msg_1prefix(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n@@ -380,40 +380,40 @@\n \n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1refs(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n return boolector_get_refs(arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1reset_1time(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_reset_time(arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1reset_1stats(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_reset_stats(arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1print_1stats(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_print_stats(arg1);\n }\n \n@@ -421,18 +421,18 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1set_1trapi(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n if (!arg2) perror(\"ERROR: couldn't set api trace because given path was wrong.\");\n }\n FILE *file = 0;\n file = fopen(arg2, \"w\");\n- if(file == NULL) {\n- perror(\"ERROR: couldn't set api trace because it couldn't open trace file.\"); \n+ if (file == NULL) {\n+ perror(\"ERROR: couldn't set api trace because it couldn't open trace file.\");\n }\n boolector_set_trapi(arg1,file);\n }\n@@ -442,12 +442,12 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n FILE *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (FILE *)boolector_get_trapi(arg1);\n- *(FILE **)&jresult = result; \n+ *(FILE **)&jresult = result;\n return jresult;\n }\n \n@@ -456,16 +456,16 @@\n Btor *arg1 = (Btor *) 0 ;\n uint32_t arg2 ;\n uint32_t *argp2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (uint32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (uint32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return ;\n }\n- arg2 = *argp2; \n+ arg2 = *argp2;\n boolector_push(arg1,arg2);\n }\n \n@@ -474,16 +474,16 @@\n Btor *arg1 = (Btor *) 0 ;\n uint32_t arg2 ;\n uint32_t *argp2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (uint32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (uint32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return ;\n }\n- arg2 = *argp2; \n+ arg2 = *argp2;\n boolector_pop(arg1,arg2);\n }\n \n@@ -491,11 +491,11 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1assert(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n boolector_assert(arg1,arg2);\n }\n \n@@ -503,11 +503,11 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1assume(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n boolector_assume(arg1,arg2);\n }\n \n@@ -517,13 +517,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_failed(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -532,42 +532,42 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode **result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (BoolectorNode **)boolector_get_failed_assumptions(arg1);\n- *(BoolectorNode ***)&jresult = result; \n+ *(BoolectorNode ***)&jresult = result;\n return jresult;\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1fixate_1assumptions(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_fixate_assumptions(arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1reset_1assumptions(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_reset_assumptions(arg1);\n }\n \n \n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1sat(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n return boolector_sat(arg1);\n }\n \n@@ -578,32 +578,32 @@\n int32_t arg3 ;\n int32_t *argp2 ;\n int32_t *argp3 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (int32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (int32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null int32_t\");\n return 0;\n }\n- arg2 = *argp2; \n- argp3 = (int32_t *)&jarg3; \n+ arg2 = *argp2;\n+ argp3 = (int32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null int32_t\");\n return 0;\n }\n- arg3 = *argp3; \n+ arg3 = *argp3;\n return boolector_limited_sat(arg1,arg2,arg3);\n }\n \n \n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1simplify(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n return boolector_simplify(arg1);\n }\n \n@@ -611,10 +611,10 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1set_1sat_1solver(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n@@ -630,17 +630,17 @@\n BtorOption arg2 ;\n uint32_t arg3 ;\n uint32_t *argp3 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return ;\n }\n- arg3 = *argp3; \n+ arg3 = *argp3;\n boolector_set_opt(arg1,arg2,arg3);\n }\n \n@@ -648,11 +648,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1opt(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n return boolector_get_opt(arg1,arg2);\n }\n \n@@ -660,11 +660,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1opt_1min(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n return boolector_get_opt_min(arg1,arg2);\n }\n \n@@ -672,11 +672,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1opt_1max(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n return boolector_get_opt_max(arg1,arg2);\n }\n \n@@ -684,11 +684,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1opt_1dflt(JNIEnv *jenv, jclass jcls, jlong jarg1, jint jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n return boolector_get_opt_dflt(arg1,arg2);\n }\n \n@@ -698,11 +698,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n result = (char *)boolector_get_opt_lng(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -714,11 +714,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n result = (char *)boolector_get_opt_shrt(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -730,11 +730,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n result = (char *)boolector_get_opt_desc(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -746,13 +746,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n result = (bool)boolector_has_opt(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -761,12 +761,12 @@\n jint jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BtorOption result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (BtorOption)boolector_first_opt(arg1);\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -776,13 +776,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BtorOption arg2 ;\n BtorOption result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = (BtorOption)jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = (BtorOption)jarg2;\n result = (BtorOption)boolector_next_opt(arg1,arg2);\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -792,13 +792,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_copy(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -806,21 +806,21 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1release(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n boolector_release(arg1,arg2);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1release_1all(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n boolector_release_all(arg1);\n }\n \n@@ -829,12 +829,12 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (BoolectorNode *)boolector_true(arg1);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -843,12 +843,12 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (BoolectorNode *)boolector_false(arg1);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -859,14 +859,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_implies(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -877,14 +877,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_iff(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -895,14 +895,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_eq(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -913,14 +913,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ne(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -930,13 +930,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bv_const_zero(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -946,13 +946,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bv_const_one(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -962,13 +962,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bv_const_ones(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -978,13 +978,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bv_const_max_signed(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -994,13 +994,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bv_const_min_signed(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -1010,17 +1010,17 @@\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n if (!arg2) return 0;\n }\n result = (BoolectorNode *)boolector_const(arg1,(char const *)arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);\n return jresult;\n }\n@@ -1032,18 +1032,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_constd(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -1055,18 +1055,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_consth(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -1077,13 +1077,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorNode *)boolector_zero(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1093,13 +1093,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorNode *)boolector_ones(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1109,13 +1109,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorNode *)boolector_one(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1125,13 +1125,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorNode *)boolector_min_signed(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1141,13 +1141,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorNode *)boolector_max_signed(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1159,19 +1159,19 @@\n BoolectorSort arg3 = (BoolectorSort) 0 ;\n uint32_t *argp2 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (uint32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (uint32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg2 = *argp2; \n- arg3 = *(BoolectorSort *)&jarg3; \n+ arg2 = *argp2;\n+ arg3 = *(BoolectorSort *)&jarg3;\n result = (BoolectorNode *)boolector_unsigned_int(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1183,19 +1183,19 @@\n BoolectorSort arg3 = (BoolectorSort) 0 ;\n int32_t *argp2 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (int32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (int32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null int32_t\");\n return 0;\n }\n- arg2 = *argp2; \n- arg3 = *(BoolectorSort *)&jarg3; \n+ arg2 = *argp2;\n+ arg3 = *(BoolectorSort *)&jarg3;\n result = (BoolectorNode *)boolector_int(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1206,18 +1206,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_var(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -1229,18 +1229,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_array(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -1252,18 +1252,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_uf(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -1274,13 +1274,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_not(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1290,13 +1290,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_neg(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1306,13 +1306,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_redor(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1322,13 +1322,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_redxor(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1338,13 +1338,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_redand(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1358,25 +1358,25 @@\n uint32_t *argp3 ;\n uint32_t *argp4 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n- argp4 = (uint32_t *)&jarg4; \n+ arg3 = *argp3;\n+ argp4 = (uint32_t *)&jarg4;\n if (!argp4) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg4 = *argp4; \n+ arg4 = *argp4;\n result = (BoolectorNode *)boolector_slice(arg1,arg2,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1388,19 +1388,19 @@\n uint32_t arg3 ;\n uint32_t *argp3 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n+ arg3 = *argp3;\n result = (BoolectorNode *)boolector_uext(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1412,19 +1412,19 @@\n uint32_t arg3 ;\n uint32_t *argp3 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n+ arg3 = *argp3;\n result = (BoolectorNode *)boolector_sext(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1435,14 +1435,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_xor(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1453,14 +1453,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_xnor(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1471,14 +1471,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_and(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1489,14 +1489,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_nand(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1507,14 +1507,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_or(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1525,14 +1525,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_nor(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1543,14 +1543,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_add(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1561,14 +1561,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_uaddo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1579,14 +1579,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_saddo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1597,14 +1597,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_mul(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1615,14 +1615,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_umulo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1633,14 +1633,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_smulo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1651,14 +1651,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ult(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1669,14 +1669,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_slt(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1687,14 +1687,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ulte(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1705,14 +1705,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_slte(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1723,14 +1723,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ugt(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1741,14 +1741,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sgt(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1759,14 +1759,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ugte(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1777,14 +1777,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sgte(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1795,14 +1795,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sll(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1813,14 +1813,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_srl(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1831,14 +1831,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sra(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1849,14 +1849,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_rol(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1867,14 +1867,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ror(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1885,14 +1885,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sub(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1903,14 +1903,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_usubo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1921,14 +1921,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_ssubo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1939,14 +1939,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_udiv(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1957,14 +1957,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sdiv(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1975,14 +1975,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_sdivo(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -1993,14 +1993,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_urem(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2011,14 +2011,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_srem(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2029,14 +2029,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_smod(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2047,14 +2047,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_concat(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2066,19 +2066,19 @@\n uint32_t arg3 ;\n uint32_t *argp3 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n+ arg3 = *argp3;\n result = (BoolectorNode *)boolector_repeat(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2089,14 +2089,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (BoolectorNode *)boolector_read(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2108,15 +2108,15 @@\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n- arg4 = *(BoolectorNode **)&jarg4; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_write(arg1,arg2,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2128,15 +2128,15 @@\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n- arg4 = *(BoolectorNode **)&jarg4; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_cond(arg1,arg2,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2147,18 +2147,18 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n char *arg3 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n result = (BoolectorNode *)boolector_param(arg1,arg2,(char const *)arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return jresult;\n }\n@@ -2172,20 +2172,20 @@\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n uint32_t *argp3 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode ***)&jarg2; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode ***)&jarg2;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n- arg4 = *(BoolectorNode **)&jarg4; \n+ arg3 = *argp3;\n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_fun(arg1,arg2,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2198,36 +2198,36 @@\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n uint32_t *argp3 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n- arg4 = *(BoolectorNode **)&jarg4; \n+ arg3 = *argp3;\n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_apply(arg1,(BoolectorNode**)array,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n (*jenv)->ReleaseLongArrayElements(jenv, jarg2, array, 0);\n return jresult;\n }\n- \n+\n \n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1inc(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_inc(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2237,13 +2237,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_dec(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2254,18 +2254,18 @@\n uint32_t arg3 = jarg3;\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n \n BoolectorNode **array = 0;\n array = (BoolectorNode**)(*jenv)->GetLongArrayElements(jenv, jarg2, 0);\n- arg4 = *(BoolectorNode **)&jarg4; \n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_forall(arg1, array,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n (*jenv)->ReleaseLongArrayElements(jenv, jarg2, (jlong*)array, 0);\n- \n+\n return jresult;\n }\n \n@@ -2276,17 +2276,17 @@\n uint32_t arg3 = jarg3;\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+\n jlong *array = (*jenv)->GetLongArrayElements(jenv, jarg2, 0);\n- arg4 = *(BoolectorNode **)&jarg4; \n+ arg4 = *(BoolectorNode **)&jarg4;\n result = (BoolectorNode *)boolector_exists(arg1,(BoolectorNode**)array,arg3,arg4);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n (*jenv)->ReleaseLongArrayElements(jenv, jarg2, array, 0);\n- \n+\n return jresult;\n }\n \n@@ -2295,12 +2295,12 @@\n jlong jresult = 0 ;\n BoolectorNode *arg1 = (BoolectorNode *) 0 ;\n Btor *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(BoolectorNode **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(BoolectorNode **)&jarg1;\n result = (Btor *)boolector_get_btor(arg1);\n- *(Btor **)&jresult = result; \n+ *(Btor **)&jresult = result;\n return jresult;\n }\n \n@@ -2308,11 +2308,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1node_1id(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n return boolector_get_node_id(arg1,arg2);\n }\n \n@@ -2322,13 +2322,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorSort)boolector_get_sort(arg1,(struct BoolectorNode const *)arg2);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2338,13 +2338,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorSort)boolector_fun_get_domain_sort(arg1,(struct BoolectorNode const *)arg2);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2354,13 +2354,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorSort)boolector_fun_get_codomain_sort(arg1,(struct BoolectorNode const *)arg2);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2371,18 +2371,18 @@\n int32_t arg2 ;\n int32_t *argp2 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (int32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (int32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null int32_t\");\n return 0;\n }\n- arg2 = *argp2; \n+ arg2 = *argp2;\n result = (BoolectorNode *)boolector_match_node_by_id(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2392,17 +2392,17 @@\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n if (!arg2) return 0;\n }\n result = (BoolectorNode *)boolector_match_node_by_symbol(arg1,(char const *)arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);\n return jresult;\n }\n@@ -2413,13 +2413,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (BoolectorNode *)boolector_match_node(arg1,arg2);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -2429,11 +2429,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (char *)boolector_get_symbol(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -2444,11 +2444,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n char *arg3 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n@@ -2462,11 +2462,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1width(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n return boolector_get_width(arg1,arg2);\n }\n \n@@ -2474,11 +2474,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1index_1width(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n return boolector_get_index_width(arg1,arg2);\n }\n \n@@ -2488,11 +2488,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (char *)boolector_get_bits(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -2502,10 +2502,10 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1free_1bits(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n@@ -2519,11 +2519,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1get_1fun_1arity(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n return boolector_get_fun_arity(arg1,arg2);\n }\n \n@@ -2533,13 +2533,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_const(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2549,13 +2549,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_var(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2565,13 +2565,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_array(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2581,13 +2581,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_array_var(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2597,13 +2597,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_param(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2613,13 +2613,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_bound_param(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2629,13 +2629,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_uf(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2645,13 +2645,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (bool)boolector_is_fun(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2662,18 +2662,18 @@\n BoolectorNode *arg4 = (BoolectorNode *) 0 ;\n uint32_t *argp3 ;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n jlong *array = (*jenv)->GetLongArrayElements(jenv, jarg2, 0);\n- argp3 = (uint32_t *)&jarg3; \n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n- arg4 = *(BoolectorNode **)&jarg4; \n+ arg3 = *argp3;\n+ arg4 = *(BoolectorNode **)&jarg4;\n result = boolector_fun_sort_check(arg1,(BoolectorNode**)array,arg3,arg4);\n (*jenv)->ReleaseLongArrayElements(jenv, jarg2, array, 0);\n return result;\n@@ -2685,11 +2685,11 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n result = (char *)boolector_bv_assignment(arg1,arg2);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -2699,10 +2699,10 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1free_1bv_1assignment(JNIEnv *jenv, jclass jcls, jlong jarg1, jstring jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n@@ -2719,14 +2719,14 @@\n char ***arg3 = (char ***) 0 ;\n char ***arg4 = (char ***) 0 ;\n uint32_t *arg5 = (uint32_t *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(char ****)&jarg3; \n- arg4 = *(char ****)&jarg4; \n- arg5 = (uint32_t *)&jarg5; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(char ****)&jarg3;\n+ arg4 = *(char ****)&jarg4;\n+ arg5 = (uint32_t *)&jarg5;\n boolector_array_assignment(arg1,arg2,arg3,arg4,arg5);\n }\n \n@@ -2737,18 +2737,18 @@\n char **arg3 = (char **) 0 ;\n uint32_t arg4 ;\n uint32_t *argp4 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(char ***)&jarg2; \n- arg3 = *(char ***)&jarg3; \n- argp4 = (uint32_t *)&jarg4; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(char ***)&jarg2;\n+ arg3 = *(char ***)&jarg3;\n+ argp4 = (uint32_t *)&jarg4;\n if (!argp4) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return ;\n }\n- arg4 = *argp4; \n+ arg4 = *argp4;\n boolector_free_array_assignment(arg1,arg2,arg3,arg4);\n }\n \n@@ -2759,14 +2759,14 @@\n char ***arg3 = (char ***) 0 ;\n char ***arg4 = (char ***) 0 ;\n uint32_t *arg5 = (uint32_t *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(char ****)&jarg3; \n- arg4 = *(char ****)&jarg4; \n- arg5 = *(uint32_t **)&jarg5; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(char ****)&jarg3;\n+ arg4 = *(char ****)&jarg4;\n+ arg5 = *(uint32_t **)&jarg5;\n boolector_uf_assignment(arg1,arg2,arg3,arg4,arg5);\n }\n \n@@ -2777,18 +2777,18 @@\n char **arg3 = (char **) 0 ;\n uint32_t arg4 ;\n uint32_t *argp4 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(char ***)&jarg2; \n- arg3 = *(char ***)&jarg3; \n- argp4 = (uint32_t *)&jarg4; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(char ***)&jarg2;\n+ arg3 = *(char ***)&jarg3;\n+ argp4 = (uint32_t *)&jarg4;\n if (!argp4) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return ;\n }\n- arg4 = *argp4; \n+ arg4 = *argp4;\n boolector_free_uf_assignment(arg1,arg2,arg3,arg4);\n }\n \n@@ -2797,16 +2797,16 @@\n Btor *arg1 = (Btor *) 0 ;\n char *arg2 = (char *) 0 ;\n FILE *arg3 = (FILE *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n arg2 = 0;\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n if (!arg2) return ;\n }\n- arg3 = *(FILE **)&jarg3; \n+ arg3 = *(FILE **)&jarg3;\n boolector_print_model(arg1,arg2,arg3);\n if (arg2) (*jenv)->ReleaseStringUTFChars(jenv, jarg2, (const char *)arg2);\n }\n@@ -2816,12 +2816,12 @@\n jlong jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (BoolectorSort)boolector_bool_sort(arg1);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2832,18 +2832,18 @@\n uint32_t arg2 ;\n uint32_t *argp2 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- argp2 = (uint32_t *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ argp2 = (uint32_t *)&jarg2;\n if (!argp2) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg2 = *argp2; \n+ arg2 = *argp2;\n result = (BoolectorSort)boolector_bitvec_sort(arg1,arg2);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2856,18 +2856,18 @@\n BoolectorSort arg4 = (BoolectorSort) 0 ;\n uint32_t *argp3 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- jlong *array = (*jenv)->GetLongArrayElements(jenv, jarg2, 0); \n- argp3 = (uint32_t *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ jlong *array = (*jenv)->GetLongArrayElements(jenv, jarg2, 0);\n+ argp3 = (uint32_t *)&jarg3;\n if (!argp3) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Attempt to dereference null uint32_t\");\n return 0;\n }\n- arg3 = *argp3; \n- arg4 = *(BoolectorSort *)&jarg4; \n+ arg3 = *argp3;\n+ arg4 = *(BoolectorSort *)&jarg4;\n result = (BoolectorSort)boolector_fun_sort(arg1,(BoolectorSort*)array,arg3,arg4);\n *(BoolectorSort *)&jresult = result;\n (*jenv)->ReleaseLongArrayElements(jenv, jarg2, array, 0);\n@@ -2881,14 +2881,14 @@\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorSort arg3 = (BoolectorSort) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n- arg3 = *(BoolectorSort *)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n+ arg3 = *(BoolectorSort *)&jarg3;\n result = (BoolectorSort)boolector_array_sort(arg1,arg2,arg3);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2898,13 +2898,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n BoolectorSort result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (BoolectorSort)boolector_copy_sort(arg1,arg2);\n- *(BoolectorSort *)&jresult = result; \n+ *(BoolectorSort *)&jresult = result;\n return jresult;\n }\n \n@@ -2912,11 +2912,11 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1release_1sort(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n boolector_release_sort(arg1,arg2);\n }\n \n@@ -2927,14 +2927,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n result = (bool)boolector_is_equal_sort(arg1,arg2,arg3);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2944,13 +2944,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (bool)boolector_is_array_sort(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2960,13 +2960,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (bool)boolector_is_bitvec_sort(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2976,13 +2976,13 @@\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n bool result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n result = (bool)boolector_is_fun_sort(arg1,arg2);\n- jresult = (jboolean)result; \n+ jresult = (jboolean)result;\n return jresult;\n }\n \n@@ -2996,19 +2996,19 @@\n int32_t *arg6 = (int32_t *) 0 ;\n bool parsedFlag = (bool) 0;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n- arg4 = *(FILE **)&jarg4; \n- arg5 = *(char ***)&jarg5; \n- arg6 = *(int32_t **)&jarg6; \n+ arg4 = *(FILE **)&jarg4;\n+ arg5 = *(char ***)&jarg5;\n+ arg6 = *(int32_t **)&jarg6;\n result = boolector_parse(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,&parsedFlag);\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return result;\n@@ -3023,19 +3023,19 @@\n char **arg5 = (char **) 0 ;\n int32_t *arg6 = (int32_t *) 0 ;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n- arg4 = *(FILE **)&jarg4; \n- arg5 = *(char ***)&jarg5; \n- arg6 = *(int32_t **)&jarg6; \n+ arg4 = *(FILE **)&jarg4;\n+ arg5 = *(char ***)&jarg5;\n+ arg6 = *(int32_t **)&jarg6;\n result = boolector_parse_btor(arg1,arg2,(char const *)arg3,arg4,arg5,arg6);\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return result;\n@@ -3050,19 +3050,19 @@\n char **arg5 = (char **) 0 ;\n int32_t *arg6 = (int32_t *) 0 ;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n- arg4 = *(FILE **)&jarg4; \n- arg5 = *(char ***)&jarg5; \n- arg6 = *(int32_t **)&jarg6; \n+ arg4 = *(FILE **)&jarg4;\n+ arg5 = *(char ***)&jarg5;\n+ arg6 = *(int32_t **)&jarg6;\n result = boolector_parse_btor2(arg1,arg2,(char const *)arg3,arg4,arg5,arg6);\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return result;\n@@ -3077,19 +3077,19 @@\n char **arg5 = (char **) 0 ;\n int32_t *arg6 = (int32_t *) 0 ;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n- arg4 = *(FILE **)&jarg4; \n- arg5 = *(char ***)&jarg5; \n- arg6 = *(int32_t **)&jarg6; \n+ arg4 = *(FILE **)&jarg4;\n+ arg5 = *(char ***)&jarg5;\n+ arg6 = *(int32_t **)&jarg6;\n result = boolector_parse_smt1(arg1,arg2,(char const *)arg3,arg4,arg5,arg6);\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return result;\n@@ -3104,19 +3104,19 @@\n char **arg5 = (char **) 0 ;\n int32_t *arg6 = (int32_t *) 0 ;\n jint result;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n arg3 = 0;\n if (jarg3) {\n arg3 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg3, 0);\n if (!arg3) return 0;\n }\n- arg4 = *(FILE **)&jarg4; \n- arg5 = *(char ***)&jarg5; \n- arg6 = *(int32_t **)&jarg6; \n+ arg4 = *(FILE **)&jarg4;\n+ arg5 = *(char ***)&jarg5;\n+ arg6 = *(int32_t **)&jarg6;\n result = boolector_parse_smt2(arg1,arg2,(char const *)arg3,arg4,arg5,arg6);\n if (arg3) (*jenv)->ReleaseStringUTFChars(jenv, jarg3, (const char *)arg3);\n return result;\n@@ -3127,12 +3127,12 @@\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n boolector_dump_btor_node(arg1,arg2,arg3);\n }\n \n@@ -3140,11 +3140,11 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1dump_1btor(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n boolector_dump_btor(arg1,arg2);\n }\n \n@@ -3153,12 +3153,12 @@\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n BoolectorNode *arg3 = (BoolectorNode *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n- arg3 = *(BoolectorNode **)&jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n+ arg3 = *(BoolectorNode **)&jarg3;\n boolector_dump_smt2_node(arg1,arg2,arg3);\n }\n \n@@ -3166,11 +3166,11 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1dump_1smt2(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n boolector_dump_smt2(arg1,arg2);\n }\n \n@@ -3179,12 +3179,12 @@\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n bool arg3 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n- arg3 = jarg3 ? true : false; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n+ arg3 = jarg3 ? true : false;\n boolector_dump_aiger_ascii(arg1,arg2,arg3);\n }\n \n@@ -3193,12 +3193,12 @@\n Btor *arg1 = (Btor *) 0 ;\n FILE *arg2 = (FILE *) 0 ;\n bool arg3 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(FILE **)&jarg2; \n- arg3 = jarg3 ? true : false; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(FILE **)&jarg2;\n+ arg3 = jarg3 ? true : false;\n boolector_dump_aiger_binary(arg1,arg2,arg3);\n }\n \n@@ -3207,10 +3207,10 @@\n jstring jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (char *)boolector_copyright(arg1);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -3221,10 +3221,10 @@\n jstring jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (char *)boolector_version(arg1);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -3235,10 +3235,10 @@\n jstring jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n char *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n result = (char *)boolector_git_id(arg1);\n if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);\n return jresult;\n@@ -3248,11 +3248,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BTOR_1RESULT_1SAT_1get(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n enum BtorSolverResult result;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (enum BtorSolverResult)BTOR_RESULT_SAT;\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -3260,11 +3260,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BTOR_1RESULT_1UNSAT_1get(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n enum BtorSolverResult result;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (enum BtorSolverResult)BTOR_RESULT_UNSAT;\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -3272,11 +3272,11 @@\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BTOR_1RESULT_1UNKNOWN_1get(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n enum BtorSolverResult result;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (enum BtorSolverResult)BTOR_RESULT_UNKNOWN;\n- jresult = (jint)result; \n+ jresult = (jint)result;\n return jresult;\n }\n \n@@ -3284,12 +3284,12 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BtorAbortCallback_1abort_1fun_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {\n struct BtorAbortCallback *arg1 = (struct BtorAbortCallback *) 0 ;\n void (*arg2)(char const *) = (void (*)(char const *)) 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n (void)jarg1_;\n- arg1 = *(struct BtorAbortCallback **)&jarg1; \n- arg2 = *(void (**)(char const *))&jarg2; \n+ arg1 = *(struct BtorAbortCallback **)&jarg1;\n+ arg2 = *(void (**)(char const *))&jarg2;\n if (arg1) (arg1)->abort_fun = arg2;\n }\n \n@@ -3298,13 +3298,13 @@\n jlong jresult = 0 ;\n struct BtorAbortCallback *arg1 = (struct BtorAbortCallback *) 0 ;\n void (*result)(char const *) = 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n (void)jarg1_;\n- arg1 = *(struct BtorAbortCallback **)&jarg1; \n+ arg1 = *(struct BtorAbortCallback **)&jarg1;\n result = (void (*)(char const *)) ((arg1)->abort_fun);\n- *(void (**)(char const *))&jresult = result; \n+ *(void (**)(char const *))&jresult = result;\n return jresult;\n }\n \n@@ -3312,12 +3312,12 @@\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_BtorAbortCallback_1cb_1fun_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2) {\n struct BtorAbortCallback *arg1 = (struct BtorAbortCallback *) 0 ;\n void *arg2 = (void *) 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n (void)jarg1_;\n- arg1 = *(struct BtorAbortCallback **)&jarg1; \n- arg2 = *(void **)&jarg2; \n+ arg1 = *(struct BtorAbortCallback **)&jarg1;\n+ arg2 = *(void **)&jarg2;\n if (arg1) (arg1)->cb_fun = arg2;\n }\n \n@@ -3326,13 +3326,13 @@\n jlong jresult = 0 ;\n struct BtorAbortCallback *arg1 = (struct BtorAbortCallback *) 0 ;\n void *result = 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n (void)jarg1_;\n- arg1 = *(struct BtorAbortCallback **)&jarg1; \n+ arg1 = *(struct BtorAbortCallback **)&jarg1;\n result = (void *) ((arg1)->cb_fun);\n- *(void **)&jresult = result; \n+ *(void **)&jresult = result;\n return jresult;\n }\n \n@@ -3340,32 +3340,32 @@\n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_new_1BtorAbortCallback(JNIEnv *jenv, jclass jcls) {\n jlong jresult = 0 ;\n struct BtorAbortCallback *result = 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (struct BtorAbortCallback *)calloc(1, sizeof(struct BtorAbortCallback));\n- *(struct BtorAbortCallback **)&jresult = result; \n+ *(struct BtorAbortCallback **)&jresult = result;\n return jresult;\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_delete_1BtorAbortCallback(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n struct BtorAbortCallback *arg1 = (struct BtorAbortCallback *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(struct BtorAbortCallback **)&jarg1; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(struct BtorAbortCallback **)&jarg1;\n free((char *) arg1);\n }\n \n \n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_btor_1abort_1callback_1set(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {\n BtorAbortCallback *arg1 = (BtorAbortCallback *) 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n (void)jarg1_;\n- arg1 = *(BtorAbortCallback **)&jarg1; \n+ arg1 = *(BtorAbortCallback **)&jarg1;\n btor_abort_callback = *arg1;\n }\n \n@@ -3373,29 +3373,29 @@\n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_btor_1abort_1callback_1get(JNIEnv *jenv, jclass jcls) {\n jlong jresult = 0 ;\n BtorAbortCallback *result = 0 ;\n- \n+\n (void)jenv;\n (void)jcls;\n result = (BtorAbortCallback *)&btor_abort_callback;\n- *(BtorAbortCallback **)&jresult = result; \n- return jresult;\n-} \n+ *(BtorAbortCallback **)&jresult = result;\n+ return jresult;\n+}\n \n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1bitvec_1sort_1get_1width(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n jint jresult = 0 ;\n Btor *arg1 = (Btor *) 0 ;\n BoolectorSort arg2 = (BoolectorSort) 0 ;\n int32_t result = 0;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorSort *)&jarg2; \n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorSort *)&jarg2;\n+\n result = boolector_bitvec_sort_get_width(arg1,arg2);\n- jresult = (jint)result; \n- return jresult;\n-} \n+ jresult = (jint)result;\n+ return jresult;\n+}\n \n \n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1rori(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2, jint jarg3) {\n@@ -3404,14 +3404,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n uint32_t arg3 = 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = (uint32_t)jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = (uint32_t)jarg3;\n result = (BoolectorNode *)boolector_rori(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -3421,14 +3421,14 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n uint32_t arg3 = 0 ;\n BoolectorNode *result = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- arg3 = (uint32_t)jarg3; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+ arg3 = (uint32_t)jarg3;\n result = (BoolectorNode *)boolector_roli(arg1,arg2,arg3);\n- *(BoolectorNode **)&jresult = result; \n+ *(BoolectorNode **)&jresult = result;\n return jresult;\n }\n \n@@ -3438,20 +3438,20 @@\n \/\/Returns the int value of BOOLECTOR_PARSE_ERROR\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1help_1get_1parse_1error(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- jresult = (jint)BOOLECTOR_PARSE_ERROR; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ jresult = (jint)BOOLECTOR_PARSE_ERROR;\n return jresult;\n }\n \n \/\/Returns the int value of BOOLECTOR_PARSE_UNKNOWN\n SWIGEXPORT jint JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1help_1get_1parse_1unknown(JNIEnv *jenv, jclass jcls) {\n jint jresult = 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- jresult = (jint)BOOLECTOR_PARSE_UNKNOWN; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ jresult = (jint)BOOLECTOR_PARSE_UNKNOWN;\n return jresult;\n }\n \n@@ -3468,7 +3468,7 @@\n char *tempfileName = addTemppathToFilename(tempFilenameTemplate);\n \n fileDescr = mkstemp(tempfileName);\n- if(fileDescr == -1) {\n+ if (fileDescr == -1) {\n free(tempfileName);\n perror(\"ERROR CREATING TEMPORARY FILE FOR SMT2 DUMPING\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"FileDescriptor for file used in boolector_help_dump_smt2 may not be NULL\");\n@@ -3476,35 +3476,35 @@\n }\n \n file = fdopen(fileDescr,\"w+\");\n- if(file == NULL) {\n+ if (file == NULL) {\n unlink(tempfileName);\n perror(\"ERROR OPENING FILE FOR SMT2 DUMPING\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"File for boolector_help_dump_smt2 may not be NULL\");\n return 0;\n }\n- \n- (void)jenv;\n- (void)jcls;\n- \n- arg1 = *(Btor **)&jarg1; \n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+\n+ arg1 = *(Btor **)&jarg1;\n+\n \/\/write\n boolector_dump_smt2(arg1, file);\n- \n+\n unlink(tempfileName);\n \/\/read\n- if(file) {\n+ if (file) {\n fseek(file, 0, SEEK_END);\n fileLength = ftell(file);\n rewind(file);\n buffer = (char *)malloc((fileLength + 1) * sizeof(char));\n- if(!buffer) {\n+ if (!buffer) {\n free(buffer);\n perror(\"ERROR CREATING BUFFER\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Buffer for boolector_help_dump_smt2 may not be NULL\");\n return 0;\n }\n- if(fread (buffer, 1, fileLength, file) != (unsigned long)fileLength) {\n+ if (fread (buffer, 1, fileLength, file) != (unsigned long)fileLength) {\n free(buffer);\n perror(\"ERROR READING FILE INTO BUFFER\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Error reading file into buffer in boolector_help_dump_smt2.\");\n@@ -3513,14 +3513,14 @@\n }\n \n buffer[fileLength] = '\\0';\n- \n+\n jresult = (*jenv)->NewStringUTF(jenv, (const char *)buffer);\n- \n+\n fclose(file);\n free(buffer);\n return jresult;\n }\n- \n+\n \/\/helper method for parsing string into btor\n \/\/insert java string into jarg2\n \/\/returns array of (java)strings, length 5, for (in that order): result (int in String), outfile(As string), errormsg, status (int as String), parsedFlag (bool as String)\n@@ -3539,12 +3539,12 @@\n char *arg2 = (char *) 0 ;\n FILE *fileParse = 0;\n FILE *fileOut = 0;\n- \n- (void)jenv;\n- (void)jcls;\n- \n- arg1 = *(Btor **)&jarg1; \n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+\n+ arg1 = *(Btor **)&jarg1;\n+\n if (jarg2) {\n arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);\n if (!arg2) {\n@@ -3554,41 +3554,41 @@\n return 0;\n }\n }\n- \n+\n fileDescrIn = mkstemp(tempfileNameIn);\n- if(fileDescrIn == -1) {\n- free(tempfileNameIn); \n+ if (fileDescrIn == -1) {\n+ free(tempfileNameIn);\n free(tempfileNameOut);\n perror(\"ERROR CREATING TEMPORARY FILE FOR\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"FileDescriptor for inputfile for boolector_help_parse may not be NULL\");\n return 0;\n }\n- \n+\n fileParse = fdopen(fileDescrIn, \"w+\");\n- if(fileParse==NULL) {\n+ if (fileParse==NULL) {\n unlink(tempfileNameIn);\n free(tempfileNameOut);\n perror(\"ERROR_INPUTFILE\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Inputfile for boolector_help_parse may not be NULL\");\n return 0;\n }\n- \n+\n fputs(arg2, fileParse);\n- \n+\n fileDescrOut = mkstemp(tempfileNameOut);\n- if(fileDescrOut == -1) {\n+ if (fileDescrOut == -1) {\n unlink(tempfileNameIn);\n- fclose(fileParse); \n+ fclose(fileParse);\n free(tempfileNameOut);\n perror(\"ERROR CREATING TEMPORARY FILE FOR\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"FileDescriptor for outputfile for boolector_help_parse may not be NULL\");\n return 0;\n }\n fileOut = fdopen(fileDescrOut, \"w+\");\n- if(fileOut==NULL) {\n+ if (fileOut==NULL) {\n unlink(tempfileNameIn);\n fclose(fileParse);\n- unlink(tempfileNameOut); \n+ unlink(tempfileNameOut);\n perror(\"ERROR_OUTPUTFILE\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Outputfile for boolector_help_parse may not be NULL\");\n return 0;\n@@ -3596,7 +3596,7 @@\n \n \/\/\"read\" (parse)\n result = boolector_parse(arg1, fileParse, tempfileNameIn, fileOut, &errormsg, &status, &parsedFlag);\n- \n+\n unlink(tempfileNameIn);\n fclose(fileParse);\n \/\/We create an java String Array length 5\n@@ -3605,18 +3605,18 @@\n for(int i = 0; i < 5; i++) {\n (*jenv)->SetObjectArrayElement(jenv, jniArray, i, (*jenv)->NewStringUTF(jenv, \"\"));\n }\n- \n+\n \/\/For output array\n char *fileOutString = (char *) 0;\n char * buffer = 0;\n int length = 0;\n- \n+\n char *statusString = (char *) 0;\n char flagString[2];\n char *resultString = (char *) 0;\n \/\/TODO: check return values for methods below (if we ever use this method....)\n sprintf(flagString, \"%d\", (int)parsedFlag);\n- \n+\n length = snprintf(NULL, 0,\"%d\",result);\n resultString = malloc((length+1)*sizeof(char));\n sprintf(resultString, \"%d\", result);\n@@ -3630,15 +3630,15 @@\n length = -1; \/\/Reset for buffer use\n \n \/\/We dont really care if fileOut is empty, we just return an empty string in that case\n- if(fileOut) {\n+ if (fileOut) {\n rewind(fileOut);\n fseek(fileOut, 0, SEEK_END);\n length = ftell(fileOut);\n rewind(fileOut);\n buffer = (char *)malloc((length + 1) * sizeof(char));\n- if(buffer) {\n- if(fread (buffer, 1, length, fileOut) != (unsigned long)length) {\n- unlink(tempfileNameOut); \n+ if (buffer) {\n+ if (fread (buffer, 1, length, fileOut) != (unsigned long)length) {\n+ unlink(tempfileNameOut);\n fclose(fileOut);\n free(buffer);\n free(resultString);\n@@ -3651,25 +3651,25 @@\n }\n }\n \n- if(buffer) {\n+ if (buffer) {\n buffer[length] = '\\0';\n fileOutString = buffer;\n } else {\n fileOutString = \"\";\n }\n- \n+\n (*jenv)->SetObjectArrayElement(jenv, jniArray, 0, (*jenv)->NewStringUTF(jenv, resultString));\n- \n+\n (*jenv)->SetObjectArrayElement(jenv, jniArray, 1, (*jenv)->NewStringUTF(jenv, (const char *)fileOutString));\n- \n+\n (*jenv)->SetObjectArrayElement(jenv, jniArray, 2, (*jenv)->NewStringUTF(jenv, errormsg));\n- \n+\n (*jenv)->SetObjectArrayElement(jenv, jniArray, 3, (*jenv)->NewStringUTF(jenv, statusString));\n- \n+\n (*jenv)->SetObjectArrayElement(jenv, jniArray, 4, (*jenv)->NewStringUTF(jenv, flagString));\n \n (*jenv)->DeleteLocalRef(jenv, classString);\n- unlink(tempfileNameOut); \n+ unlink(tempfileNameOut);\n fclose(fileOut);\n free(buffer);\n free(statusString);\n@@ -3689,45 +3689,45 @@\n BoolectorNode *arg2 = (BoolectorNode *) 0 ;\n char *tempfileName = addTemppathToFilename(filenameTemplate);\n \n- if(tempfileName == NULL) {\n+ if (tempfileName == NULL) {\n perror(\"ERROR CREATING TEMPORARY FILE FOR BOOLECTOR_HELP_DUMP_NODE_SMT2\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"FileName for boolector_help_dump_node_smt2 may not be NULL\");\n return 0;\n }\n \n fileDesrc = mkstemp(tempfileName);\n- if(fileDesrc == -1) {\n+ if (fileDesrc == -1) {\n free(tempfileName);\n perror(\"ERROR CREATING TEMPORARY FILE FOR BOOLECTOR_HELP_DUMP_NODE_SMT2\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"FileDescriptor for boolector_help_dump_node_smt2 may not be NULL\");\n return 0;\n }\n- \n- (void)jenv;\n- (void)jcls;\n- arg1 = *(Btor **)&jarg1;\n- arg2 = *(BoolectorNode **)&jarg2; \n+\n+ (void)jenv;\n+ (void)jcls;\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n \n file = fdopen(fileDesrc, \"w+\");\n unlink(tempfileName);\n- if(file == NULL) {\n- perror(\"ERROR: COULDNT DUMP NODE BECAUSE IT COULDNT CREATE A DUMP FILE\"); \n+ if (file == NULL) {\n+ perror(\"ERROR: COULDNT DUMP NODE BECAUSE IT COULDNT CREATE A DUMP FILE\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"File for boolector_help_dump_node_smt2 may not be NULL\");\n return 0;\n }\n- \n+\n \/\/write\n boolector_dump_smt2_node(arg1, file, arg2);\n rewind(file); \/\/Just to be sure\n- \n+\n \/\/read\n- if(!file) {\n+ if (!file) {\n perror(\"ERROR: FILE RETURNED BY BOOLECTOR_DUMP_SMT2_NODE IS NULL\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"File returned by boolector_dump_smt2_node() is NULL. boolector_help_dump_node_smt2 aborted.\");\n return 0;\n }\n \n- if(fseek(file, 0, SEEK_END) != 0) {\n+ if (fseek(file, 0, SEEK_END) != 0) {\n perror(\"ERROR SEEKING FILE LENGTH\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"boolector_help_dump_node_smt2 could not determin the end of the used file\");\n return 0;\n@@ -3735,8 +3735,8 @@\n \n fileLength = ftell(file);\n rewind(file);\n- \n- if(fileLength <= 0) {\n+\n+ if (fileLength <= 0) {\n perror(\"ERROR READING FILE LENGTH\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"File length in boolector_help_dump_node_smt2 may not be NULL\");\n return 0;\n@@ -3744,7 +3744,7 @@\n \n buffer = (char *)malloc((fileLength + 1) * sizeof(char));\n \n- if(!buffer) {\n+ if (!buffer) {\n perror(\"ERROR READING FILE INTO BUFFER\");\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Buffer for boolector_help_dump_node_smt2 may not be NULL\");\n return 0;\n@@ -3752,7 +3752,7 @@\n \n size_t readLength = fread(buffer, 1, fileLength, file);\n \n- if((unsigned long)fileLength != readLength) {\n+ if ((unsigned long)fileLength != readLength) {\n free(buffer);\n perror(\"ERROR READING FILE INTO BUFFER\");\n SWIG_JavaThrowException(jenv, SWIG_JavaIOException, \"boolector_help_dump_node_smt2 did not read the whole length of the file into the buffer\");\n@@ -3760,13 +3760,13 @@\n }\n fclose(file);\n buffer[fileLength] = '\\0';\n- \n+\n jresult = (*jenv)->NewStringUTF(jenv, (const char *)buffer);\n free(buffer);\n return jresult;\n }\n- \n- \n+\n+\n \/\/reads uf assignment and gives back array with 3 slots, first is size of the other 2 entrys, second and third are arrays, second is uf argument assignment strings, third is uf value assignments\n SWIGEXPORT jobjectArray JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1uf_1assignment_1helper(JNIEnv *jenv, jclass jcls, jlong jarg1, jlong jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n@@ -3774,35 +3774,35 @@\n char ***arg3 = (char ***) 0 ;\n char ***arg4 = (char ***) 0 ;\n uint32_t *arg5 = (uint32_t *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+\n int i = 0;\n int j = 0;\n- \n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- \n+\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+\n boolector_uf_assignment(arg1,arg2,arg3,arg4,arg5);\n- \n- if(arg3 == 0 || arg4 == 0 || arg5 == 0) {\n+\n+ if (arg3 == 0 || arg4 == 0 || arg5 == 0) {\n SWIG_JavaThrowException(jenv, SWIG_JavaIOException, \"boolector_uf_assignment_helper returned NULL\");\n return 0;\n }\n- \n+\n jsize arrayLength = *arg5;\n int arrayLengthInt = *arg5;\n char **workArray = *arg3;\n- \n+\n jclass classString = (*jenv)->FindClass(jenv, \"java\/lang\/String\");\n jclass classArray = (*jenv)->FindClass(jenv, \"[Ljava\/lang\/Object;\");\n \n jobjectArray outerJNIArray = (jobjectArray)(*jenv)->NewObjectArray(jenv, 2, classArray, NULL);\n- \n+\n for(i=0;i<2;i++) {\n jobjectArray innerJNIArray = (jobjectArray)(*jenv)->NewObjectArray(jenv, arrayLength, classString, (*jenv)->NewStringUTF(jenv, \"\"));\n- \n+\n for(j=0;j<arrayLengthInt;j++) {\n (*jenv)->SetObjectArrayElement(jenv, innerJNIArray, j, (*jenv)->NewStringUTF(jenv, workArray[j]));\n }\n@@ -3811,7 +3811,7 @@\n (*jenv)->SetObjectArrayElement(jenv, outerJNIArray, i, innerJNIArray);\n (*jenv)->DeleteLocalRef(jenv, innerJNIArray);\n }\n- \n+\n (*jenv)->DeleteLocalRef(jenv, classString);\n (*jenv)->DeleteLocalRef(jenv, classArray);\n \n@@ -3825,32 +3825,32 @@\n char ***arg3 = (char ***) 0 ;\n char ***arg4 = (char ***) 0 ;\n uint32_t *arg5 = (uint32_t *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- \n+\n+ (void)jenv;\n+ (void)jcls;\n+\n int i = 0;\n int j = 0;\n- \n- arg1 = *(Btor **)&jarg1; \n- arg2 = *(BoolectorNode **)&jarg2; \n- \n+\n+ arg1 = *(Btor **)&jarg1;\n+ arg2 = *(BoolectorNode **)&jarg2;\n+\n boolector_array_assignment(arg1,arg2,arg3,arg4,arg5);\n- \n- if(arg3 == 0 || arg4 == 0 || arg5 == 0) return ((void*)0) ;\n- \n+\n+ if (arg3 == 0 || arg4 == 0 || arg5 == 0) return ((void*)0) ;\n+\n jsize arrayLength = *arg5;\n int arrayLengthInt = *arg5;\n char **workArray = *arg3;\n- \n+\n jclass classString = (*jenv)->FindClass(jenv, \"java\/lang\/String\");\n jclass classArray = (*jenv)->FindClass(jenv, \"[Ljava\/lang\/Object;\");\n \n jobjectArray outerJNIArray = (jobjectArray)(*jenv)->NewObjectArray(jenv, 2, classArray, NULL);\n- \n+\n for(i=0;i<2;i++) {\n jobjectArray innerJNIArray = (jobjectArray)(*jenv)->NewObjectArray(jenv, arrayLength, classString, (*jenv)->NewStringUTF(jenv, \"\"));\n- \n+\n for(j=0;j<arrayLengthInt;j++) {\n (*jenv)->SetObjectArrayElement(jenv, innerJNIArray, j, (*jenv)->NewStringUTF(jenv, workArray[j]));\n }\n@@ -3859,7 +3859,7 @@\n (*jenv)->SetObjectArrayElement(jenv, outerJNIArray, i, innerJNIArray);\n (*jenv)->DeleteLocalRef(jenv, innerJNIArray);\n }\n- \n+\n (*jenv)->DeleteLocalRef(jenv, classString);\n (*jenv)->DeleteLocalRef(jenv, classArray);\n \n@@ -3868,48 +3868,45 @@\n \n SWIGEXPORT jlong JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1set_1termination(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {\n Btor *arg1 = (Btor *) 0 ;\n- \n- (void)jenv;\n- (void)jcls;\n- \n- arg1 = *(Btor **)&jarg1; \n- \n- jclass cls = (*jenv)->FindClass(jenv,\n- \"org\/sosy_lab\/java_smt\/solvers\/boolector\/BtorJNI$TerminationCallback\");\n+\n+ (void)jenv;\n+ (void)jcls;\n+\n+ arg1 = *(Btor **)&jarg1;\n+\n+ jclass cls = (*jenv)->FindClass(jenv, \"org\/sosy_lab\/java_smt\/solvers\/boolector\/BtorJNI$TerminationCallback\");\n if (cls == NULL) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"Class for boolector_set_termination may not be NULL\");\n return 0;\n }\n- \n+\n jmethodID methodID = (*jenv)->GetMethodID(jenv, cls, \"shouldTerminate\", \"()Z\");\n if (methodID == NULL) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"MethodID in boolector_set_termination may not be NULL\");\n return 0;\n }\n- \n+\n if (jarg2 == NULL) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"TerminationCallback of boolector_set_termination may not be NULL\");\n return 0;\n }\n- \n+\n struct callback_info *helper = malloc(sizeof(struct callback_info));\n helper->jenv = jenv;\n helper->callback_method = methodID;\n helper->obj = (*jenv)->NewGlobalRef(jenv, jarg2);\n \n boolector_set_term(arg1, &java_termination_callback, helper);\n- \n+\n \/\/Returns address to helper to be freed after termination has been called. See method boolector_free_termination\n return (jlong)helper;\n }\n \n \n-\n-\n \/\/Call this with the return value of the method boolector_set_termination to free ressources\n SWIGEXPORT void JNICALL Java_org_sosy_1lab_java_1smt_solvers_boolector_BtorJNI_boolector_1free_1termination(JNIEnv *jenv, jclass jcls, jlong jarg1) {\n (void)jcls;\n- \n+\n struct callback_info *helper = (struct callback_info *)(long)jarg1;\n if (helper == NULL) {\n SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, \"TerminationCallback of boolector_free_termination may not be NULL\");\n@@ -3924,4 +3921,3 @@\n #ifdef __cplusplus\n }\n #endif\n-\n"} {"commit":"fde97822a295da9dffa4af643b49a58ffc4516ad","subject":"[MIPS] Add macros to encode processor revisions.","message":"[MIPS] Add macros to encode processor revisions.\n\nOlder processors used to encode processor version and revision in two\n4-bit bitfields, the 4K seems to simply count up and even newer MTI cores\nhave switched to use the 8-bits as 3:3:2 bitfield with the last field as\nthe patch number.\n\nSigned-off-by: Ralf Baechle <92f48d309cda194c8eda36aa8f9ae28c488fa208@linux-mips.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-mips\/cpu.h\n+++ include\/asm-mips\/cpu.h\n@@ -123,6 +123,17 @@\n #define PRID_REV_VR4122\t\t0x0070\n #define PRID_REV_VR4181A\t0x0070\t\/* Same as VR4122 *\/\n #define PRID_REV_VR4130\t\t0x0080\n+\n+\/*\n+ * Older processors used to encode processor version and revision in two\n+ * 4-bit bitfields, the 4K seems to simply count up and even newer MTI cores\n+ * have switched to use the 8-bits as 3:3:2 bitfield with the last field as\n+ * the patch number. *ARGH*\n+ *\/\n+#define PRID_REV_ENCODE_44(ver, rev)\t\t\t\t\t\\\n+\t((ver) << 4 | (rev))\n+#define PRID_REV_ENCODE_332(ver, rev, patch)\t\t\t\t\\\n+\t((ver) << 5 | (rev) << 2 | (patch))\n \n \/*\n * FPU implementation\/revision register (CP1 control register 0).\n"} {"commit":"d4dafc799217b7e980bf7b824d1d46a1cc700d70","subject":"Remove unused ROOT::IsPointer.","message":"Remove unused ROOT::IsPointer.\n","repos":"davidlt\/root,Duraznos\/root,beniz\/root,thomaskeck\/root,olifre\/root,evgeny-boger\/root,esakellari\/root,agarciamontoro\/root,Duraznos\/root,evgeny-boger\/root,mattkretz\/root,Y--\/root,olifre\/root,karies\/root,evgeny-boger\/root,buuck\/root,gbitzes\/root,esakellari\/root,arch1tect0r\/root,karies\/root,zzxuanyuan\/root,krafczyk\/root,perovic\/root,perovic\/root,thomaskeck\/root,agarciamontoro\/root,evgeny-boger\/root,arch1tect0r\/root,evgeny-boger\/root,georgtroska\/root,pspe\/root,lgiommi\/root,nilqed\/root,gbitzes\/root,karies\/root,satyarth934\/root,arch1tect0r\/root,evgeny-boger\/root,zzxuanyuan\/root,georgtroska\/root,buuck\/root,buuck\/root,zzxuanyuan\/root-compressor-dummy,BerserkerTroll\/root,arch1tect0r\/root,davidlt\/root,bbockelm\/root,BerserkerTroll\/root,sawenzel\/root,olifre\/root,mattkretz\/root,zzxuanyuan\/root,arch1tect0r\/root,simonpf\/root,esakellari\/root,mattkretz\/root,Duraznos\/root,gbitzes\/root,simonpf\/root,agarciamontoro\/root,davidlt\/root,pspe\/root,gbitzes\/root,bbockelm\/root,perovic\/root,simonpf\/root,agarciamontoro\/root,esakellari\/root,perovic\/root,mhuwiler\/rootauto,zzxuanyuan\/root-compressor-dummy,zzxuanyuan\/root-compressor-dummy,root-mirror\/root,zzxuanyuan\/root-compressor-dummy,sirinath\/root,CristinaCristescu\/root,karies\/root,sirinath\/root,olifre\/root,satyarth934\/root,sirinath\/root,veprbl\/root,beniz\/root,root-mirror\/root,BerserkerTroll\/root,zzxuanyuan\/root,pspe\/root,esakellari\/root,sawenzel\/root,krafczyk\/root,root-mirror\/root,satyarth934\/root,zzxuanyuan\/root,nilqed\/root,buuck\/root,gganis\/root,Duraznos\/root,zzxuanyuan\/root-compressor-dummy,georgtroska\/root,Duraznos\/root,sirinath\/root,buuck\/root,abhinavmoudgil95\/root,root-mirror\/root,nilqed\/root,abhinavmoudgil95\/root,karies\/root,pspe\/root,thomaskeck\/root,esakellari\/root,karies\/root,mkret2\/root,jrtomps\/root,abhinavmoudgil95\/root,perovic\/root,krafczyk\/root,gganis\/root,mkret2\/root,georgtroska\/root,CristinaCristescu\/root,root-mirror\/root,bbockelm\/root,thomaskeck\/root,perovic\/root,karies\/root,arch1tect0r\/root,satyarth934\/root,beniz\/root,georgtroska\/root,mattkretz\/root,BerserkerTroll\/root,georgtroska\/root,olifre\/root,sirinath\/root,simonpf\/root,zzxuanyuan\/root,sirinath\/root,lgiommi\/root,beniz\/root,zzxuanyuan\/root-compressor-dummy,jrtomps\/root,arch1tect0r\/root,lgiommi\/root,abhinavmoudgil95\/root,mhuwiler\/rootauto,beniz\/root,davidlt\/root,mhuwiler\/rootauto,pspe\/root,krafczyk\/root,mkret2\/root,bbockelm\/root,thomaskeck\/root,gbitzes\/root,esakellari\/root,krafczyk\/root,georgtroska\/root,karies\/root,beniz\/root,davidlt\/root,satyarth934\/root,sawenzel\/root,agarciamontoro\/root,davidlt\/root,lgiommi\/root,sirinath\/root,arch1tect0r\/root,thomaskeck\/root,satyarth934\/root,beniz\/root,jrtomps\/root,evgeny-boger\/root,Y--\/root,evgeny-boger\/root,pspe\/root,nilqed\/root,mkret2\/root,sawenzel\/root,Duraznos\/root,lgiommi\/root,mhuwiler\/rootauto,lgiommi\/root,davidlt\/root,sawenzel\/root,simonpf\/root,agarciamontoro\/root,beniz\/root,Y--\/root,veprbl\/root,lgiommi\/root,simonpf\/root,CristinaCristescu\/root,veprbl\/root,zzxuanyuan\/root,olifre\/root,zzxuanyuan\/root-compressor-dummy,CristinaCristescu\/root,jrtomps\/root,gganis\/root,sirinath\/root,zzxuanyuan\/root-compressor-dummy,buuck\/root,evgeny-boger\/root,pspe\/root,mhuwiler\/rootauto,root-mirror\/root,davidlt\/root,CristinaCristescu\/root,sawenzel\/root,gganis\/root,Y--\/root,georgtroska\/root,perovic\/root,gganis\/root,veprbl\/root,olifre\/root,abhinavmoudgil95\/root,Duraznos\/root,buuck\/root,esakellari\/root,zzxuanyuan\/root-compressor-dummy,CristinaCristescu\/root,Y--\/root,agarciamontoro\/root,buuck\/root,pspe\/root,agarciamontoro\/root,mhuwiler\/rootauto,gganis\/root,nilqed\/root,veprbl\/root,Duraznos\/root,beniz\/root,mattkretz\/root,simonpf\/root,perovic\/root,simonpf\/root,karies\/root,Y--\/root,jrtomps\/root,gbitzes\/root,davidlt\/root,satyarth934\/root,mhuwiler\/rootauto,sirinath\/root,georgtroska\/root,karies\/root,zzxuanyuan\/root,veprbl\/root,mattkretz\/root,mhuwiler\/rootauto,root-mirror\/root,BerserkerTroll\/root,sawenzel\/root,zzxuanyuan\/root-compressor-dummy,buuck\/root,olifre\/root,bbockelm\/root,georgtroska\/root,mkret2\/root,gganis\/root,gganis\/root,agarciamontoro\/root,satyarth934\/root,mkret2\/root,beniz\/root,jrtomps\/root,Y--\/root,Duraznos\/root,abhinavmoudgil95\/root,abhinavmoudgil95\/root,mkret2\/root,CristinaCristescu\/root,krafczyk\/root,lgiommi\/root,root-mirror\/root,sawenzel\/root,Duraznos\/root,nilqed\/root,jrtomps\/root,bbockelm\/root,thomaskeck\/root,veprbl\/root,mattkretz\/root,krafczyk\/root,olifre\/root,gbitzes\/root,thomaskeck\/root,gbitzes\/root,olifre\/root,buuck\/root,thomaskeck\/root,lgiommi\/root,gbitzes\/root,bbockelm\/root,BerserkerTroll\/root,arch1tect0r\/root,karies\/root,BerserkerTroll\/root,nilqed\/root,Duraznos\/root,abhinavmoudgil95\/root,BerserkerTroll\/root,jrtomps\/root,CristinaCristescu\/root,nilqed\/root,zzxuanyuan\/root,Y--\/root,krafczyk\/root,perovic\/root,mattkretz\/root,krafczyk\/root,sawenzel\/root,mattkretz\/root,zzxuanyuan\/root,agarciamontoro\/root,lgiommi\/root,sawenzel\/root,zzxuanyuan\/root,mkret2\/root,BerserkerTroll\/root,davidlt\/root,bbockelm\/root,pspe\/root,sawenzel\/root,esakellari\/root,simonpf\/root,arch1tect0r\/root,veprbl\/root,mhuwiler\/rootauto,mkret2\/root,pspe\/root,evgeny-boger\/root,agarciamontoro\/root,veprbl\/root,thomaskeck\/root,evgeny-boger\/root,zzxuanyuan\/root,esakellari\/root,perovic\/root,mkret2\/root,mhuwiler\/rootauto,esakellari\/root,Y--\/root,krafczyk\/root,sirinath\/root,bbockelm\/root,satyarth934\/root,nilqed\/root,jrtomps\/root,zzxuanyuan\/root-compressor-dummy,veprbl\/root,root-mirror\/root,mkret2\/root,beniz\/root,BerserkerTroll\/root,gbitzes\/root,abhinavmoudgil95\/root,Y--\/root,georgtroska\/root,buuck\/root,nilqed\/root,simonpf\/root,gganis\/root,root-mirror\/root,lgiommi\/root,sirinath\/root,root-mirror\/root,jrtomps\/root,bbockelm\/root,mhuwiler\/rootauto,abhinavmoudgil95\/root,arch1tect0r\/root,abhinavmoudgil95\/root,mattkretz\/root,gganis\/root,satyarth934\/root,davidlt\/root,gbitzes\/root,CristinaCristescu\/root,jrtomps\/root,perovic\/root,CristinaCristescu\/root,bbockelm\/root,CristinaCristescu\/root,satyarth934\/root,gganis\/root,Y--\/root,pspe\/root,simonpf\/root,BerserkerTroll\/root,olifre\/root,veprbl\/root,nilqed\/root,mattkretz\/root,krafczyk\/root","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/meta\/inc\/TClass.h\n+++ core\/meta\/inc\/TClass.h\n@@ -551,15 +551,6 @@\n };\n \n namespace ROOT {\n-\n-#ifndef R__NO_CLASS_TEMPLATE_SPECIALIZATION\n- template <typename T> struct IsPointer { enum { kVal = 0 }; };\n- template <typename T> struct IsPointer<T*> { enum { kVal = 1 }; };\n-#else\n- template <typename T> Bool_t IsPointer(const T* \/* dummy *\/) { return false; };\n- template <typename T> Bool_t IsPointer(const T** \/* dummy *\/) { return true; };\n-#endif\n-\n template <typename T> TClass* GetClass( T* \/* dummy *\/) { return TClass::GetClass(typeid(T)); }\n template <typename T> TClass* GetClass(const T* \/* dummy *\/) { return TClass::GetClass(typeid(T)); }\n \n"} {"commit":"4444aea0ee914ace8e79247db8653188ac6a7179","subject":"Adding generic error message to communication protocol","message":"Adding generic error message to communication protocol\n\nChange-Id: Ie16fa012cecb3efb321fa488db754011223dd067\nSigned-off-by: TanelDettenborn <b78e06a93b55ca1de0e9b602be506ea7b7368e0f@intel.com>\n","repos":"Open-TEE\/libtee","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/com_protocol.h\n+++ include\/com_protocol.h\n@@ -56,6 +56,7 @@\n #define COM_MSG_NAME_CA_FINALIZ_CONTEXT\t\t0x06\n #define COM_MSG_NAME_PROC_STATUS_CHANGE\t\t0x07\n #define COM_MSG_NAME_FD_ERR\t\t\t0x08\n+#define COM_MSG_NAME_ERROR\t\t\t0x09\n \n \/* Request is used internally *\/\n #define COM_TYPE_QUERY\t\t\t\t1\n@@ -182,6 +183,16 @@\n \tvoid *proc_ptr;\n \tint err_no;\n } __attribute__ ((aligned));\n+\n+\/*!\n+ * \\brief The com_msg_gen_err struct\n+ * Generic error message.\n+ *\/\n+struct com_msg_error {\n+\tstruct com_msg_hdr msg_hdr;\n+\tTEE_Result ret;\n+\tuint32_t ret_origin;\n+};\n \n \/*\n * ## Message section end ##\n"} {"commit":"46243a7c02a1d5116e55a27ff59218f9c320df97","subject":"Combined approach.","message":"Combined approach.\n\nThis combines some ideas from these two CLs:\n - try stosd\/w\n - update memset16\/32 inlining heuristics\n\nBUG=skia:4316\n\nBlinking in and out for perf.skia.org.\nTBR=reed@google.com\n\nReview URL: https:\/\/codereview.chromium.org\/1356133002\n","repos":"rubenvb\/skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,HalCanary\/skia-hc,shahrzadmn\/skia,google\/skia,rubenvb\/skia,HalCanary\/skia-hc,tmpvar\/skia.cc,qrealka\/skia-hc,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,google\/skia,tmpvar\/skia.cc,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,qrealka\/skia-hc,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,qrealka\/skia-hc,shahrzadmn\/skia,google\/skia,tmpvar\/skia.cc,rubenvb\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,qrealka\/skia-hc,google\/skia,google\/skia,qrealka\/skia-hc,shahrzadmn\/skia,shahrzadmn\/skia,shahrzadmn\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,tmpvar\/skia.cc,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,HalCanary\/skia-hc,qrealka\/skia-hc,rubenvb\/skia,shahrzadmn\/skia,Hikari-no-Tenshi\/android_external_skia,shahrzadmn\/skia,tmpvar\/skia.cc,HalCanary\/skia-hc,HalCanary\/skia-hc,rubenvb\/skia,google\/skia,rubenvb\/skia,tmpvar\/skia.cc,tmpvar\/skia.cc,shahrzadmn\/skia,rubenvb\/skia,google\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,rubenvb\/skia,rubenvb\/skia,google\/skia,qrealka\/skia-hc,tmpvar\/skia.cc,qrealka\/skia-hc,tmpvar\/skia.cc,shahrzadmn\/skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/core\/SkUtils.h\n+++ include\/core\/SkUtils.h\n@@ -9,6 +9,27 @@\n #define SkUtils_DEFINED\n \n #include \"SkTypes.h\"\n+#if defined(SK_BUILD_FOR_WIN)\n+ #include <intrin.h>\n+#endif\n+\n+#if defined(SK_CPU_X86)\n+ static inline void rep_stosw(uint16_t buffer[], uint16_t value, int count) {\n+ #if defined(SK_BUILD_FOR_WIN)\n+ __stosw(buffer, value, count);\n+ #else\n+ __asm__ __volatile__ ( \"rep stosw\" : \"+D\"(buffer), \"+c\"(count) : \"a\"(value) );\n+ #endif\n+ }\n+\n+ static inline void rep_stosd(uint32_t buffer[], uint32_t value, int count) {\n+ #if defined(SK_BUILD_FOR_WIN)\n+ __stosd((PDWORD)buffer, value, count);\n+ #else\n+ __asm__ __volatile__ ( \"rep stosl\" : \"+D\"(buffer), \"+c\"(count) : \"a\"(value) );\n+ #endif\n+ }\n+#endif\n \n namespace SkOpts {\n extern void (*memset16)(uint16_t[], uint16_t, int);\n@@ -17,13 +38,8 @@\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n-\/\/ The inlining heuristics below were determined using bench\/MemsetBench.cpp\n-\/\/ on a x86 desktop, a Nexus 7 with and without NEON, and a Nexus 9:\n-\/\/ - on x86, inlining was never faster,\n-\/\/ - on ARMv7, inlining was faster for N<=10. Putting this check inside the NEON\n-\/\/ code was not helpful; it's got to be here outside.\n-\/\/ - NEON code generation for ARMv8 with GCC 4.9 is terrible,\n-\/\/ making the NEON code ~8x slower that just a serial loop.\n+\/\/ The stosw\/d and inlining heuristics below were determined using\n+\/\/ bench\/MemsetBench.cpp and perf.skia.org.\n \n \/** Similar to memset(), but it assigns a 16bit value into the buffer.\n @param buffer The memory to have value copied into it\n@@ -31,10 +47,10 @@\n @param count The number of times value should be copied into the buffer.\n *\/\n static inline void sk_memset16(uint16_t buffer[], uint16_t value, int count) {\n-#if defined(SK_CPU_ARM64)\n+#if defined(SK_CPU_X86)\n+ if (count > 30) { rep_stosw(buffer, value, count); return; }\n+#elif defined(SK_ARM_HAS_NEON)\n while (count --> 0) { *buffer++ = value; } return;\n-#elif defined(SK_CPU_ARM32)\n- if (count <= 10) { while (count --> 0) { *buffer++ = value; } return; }\n #endif\n SkOpts::memset16(buffer, value, count);\n }\n@@ -45,10 +61,10 @@\n @param count The number of times value should be copied into the buffer.\n *\/\n static inline void sk_memset32(uint32_t buffer[], uint32_t value, int count) {\n-#if defined(SK_CPU_ARM64)\n+#if defined(SK_CPU_X86)\n+ if (count > 30) { rep_stosd(buffer, value, count); return; }\n+#elif defined(SK_ARM_HAS_NEON)\n while (count --> 0) { *buffer++ = value; } return;\n-#elif defined(SK_CPU_ARM32)\n- if (count <= 10) { while (count --> 0) { *buffer++ = value; } return; }\n #endif\n SkOpts::memset32(buffer, value, count);\n }\n"} {"commit":"0845a7f2133472b772795f310866749a50259620","subject":"Added two funcs to marshal.h","message":"Added two funcs to marshal.h\n","repos":"alexandermerritt\/slices,alexandermerritt\/slices,alexandermerritt\/slices","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cuda\/marshal.h\n+++ include\/cuda\/marshal.h\n@@ -1124,6 +1124,13 @@\n }\n \n static inline void\n+insert_cudaDriverGetVersion(struct cuda_packet *pkt,\n+\t\tint driverVersion)\n+{\n+\tpkt->args[0].argll = driverVersion;\n+}\n+\n+static inline void\n extract_cudaDriverGetVersion(struct cuda_packet *pkt,\n \t\tint *driverVersion)\n {\n@@ -1138,6 +1145,13 @@\n \tpkt->len = sizeof(*pkt);\n \tpkt->is_sync = method_synctable[pkt->method_id];\n \t\/\/ Expect version in args[0].argll\n+}\n+\n+static inline void\n+insert_cudaRuntimeGetVersion(struct cuda_packet *pkt,\n+\t\tint runtimeVersion)\n+{\n+\tpkt->args[0].argll = runtimeVersion;\n }\n \n static inline void\n"} {"commit":"95e1a8b76996ecb673e1dec16b50211aa32af9d0","subject":"FIX: uid, pid and gid initialisation","message":"FIX: uid, pid and gid initialisation\n","repos":"djw8605\/cvmfs,cvmfs\/cvmfs,trshaffer\/cvmfs,djw8605\/cvmfs,djw8605\/cvmfs,cvmfs\/cvmfs,trshaffer\/cvmfs,DrDaveD\/cvmfs,trshaffer\/cvmfs,DrDaveD\/cvmfs,djw8605\/cvmfs,alhowaidi\/cvmfsNDN,DrDaveD\/cvmfs,DrDaveD\/cvmfs,reneme\/cvmfs,Gangbiao\/cvmfs,alhowaidi\/cvmfsNDN,DrDaveD\/cvmfs,DrDaveD\/cvmfs,trshaffer\/cvmfs,Gangbiao\/cvmfs,Gangbiao\/cvmfs,cvmfs\/cvmfs,reneme\/cvmfs,reneme\/cvmfs,cvmfs\/cvmfs,reneme\/cvmfs,DrDaveD\/cvmfs,reneme\/cvmfs,Gangbiao\/cvmfs,cvmfs\/cvmfs,djw8605\/cvmfs,alhowaidi\/cvmfsNDN,trshaffer\/cvmfs,alhowaidi\/cvmfsNDN,Gangbiao\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,alhowaidi\/cvmfsNDN","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cvmfs\/clientctx.h\n+++ cvmfs\/clientctx.h\n@@ -58,9 +58,9 @@\n public:\n ClientCtxGuard(uid_t uid, gid_t gid, pid_t pid)\n : set_on_construction_(false)\n- , old_uid_(0)\n- , old_gid_(0)\n- , old_pid_(0)\n+ , old_uid_(-1)\n+ , old_gid_(-1)\n+ , old_pid_(-1)\n {\n \/\/ Implementation guarantees old_ctx is not null.\n ClientCtx *old_ctx = ClientCtx::GetInstance();\n"} {"commit":"f540620acf59e127e5babd90e06497a6b8171176","subject":"fixed GPAC version naming","message":"fixed GPAC version naming\n","repos":"rbouqueau\/gpac_brew_travis,aymanelyaagoubi\/gpac,RodolpheFouquet\/gpac,nguyen-viet-thanh-trung\/gpac,rauf\/gpac,rauf\/gpac,rbouqueau\/gpac_brew_travis,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rauf\/gpac,aymanelyaagoubi\/gpac,aymanelyaagoubi\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,ARSekkat\/gpac,rbouqueau\/gpac_brew_travis,ARSekkat\/gpac,porcelijn\/gpac,rbouqueau\/gpac_brew_travis,rauf\/gpac,RodolpheFouquet\/gpac,emmanouil\/gpac,nguyen-viet-thanh-trung\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,porcelijn\/gpac,emmanouil\/gpac,aymanelyaagoubi\/gpac,ARSekkat\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac_brew_travis,ARSekkat\/gpac,rbouqueau\/gpac,porcelijn\/gpac,rauf\/gpac,rauf\/gpac,RodolpheFouquet\/gpac,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,emmanouil\/gpac,porcelijn\/gpac,emmanouil\/gpac,nguyen-viet-thanh-trung\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,porcelijn\/gpac,emmanouil\/gpac,porcelijn\/gpac,gpac\/gpac,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,ARSekkat\/gpac,ARSekkat\/gpac,nguyen-viet-thanh-trung\/gpac,emmanouil\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/gpac\/version.h\n+++ include\/gpac\/version.h\n@@ -35,7 +35,7 @@\n * NO SPACE in GPAC_VERSION \/ GPAC_FULL_VERSION for proper install\n * SONAME versions must be digits (not strings)\n *\/\n-#define GPAC_VERSION \"0.6.0\"\n+#define GPAC_VERSION \"0.6.0-DEV\"\n #define GPAC_VERSION_MAJOR 6\n #define GPAC_VERSION_MINOR 0\n #define GPAC_VERSION_MICRO 0\n"} {"commit":"7c6d7b78a413685a68b835ed9b130cc9eb6a7de4","subject":"Whitespace","message":"Whitespace\n","repos":"martinmoene\/gsl-lite,decaf-emu\/gsl-lite,martinmoene\/gsl-lite,martinmoene\/gsl-lite,decaf-emu\/gsl-lite","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/gsl\/gsl-lite.h\n+++ include\/gsl\/gsl-lite.h\n@@ -201,6 +201,7 @@\n # define gsl_HAVE_TR1_INTEGRAL_CONSTANT 1\n # define gsl_HAVE_TR1_REMOVE_REFERENCE 1\n #endif\n+\n \/\/ For the rest, consider VC12, VC14 as C++11 for GSL Lite:\n \n #if gsl_COMPILER_MSVC_VERSION >= 12\n"} {"commit":"d0645ab4280f74bb5e92556bf8b711efda706230","subject":"bump version to 0.5.0","message":"bump version to 0.5.0\n","repos":"redxdev\/imquery,redxdev\/imquery,redxdev\/imquery","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/imq\/platform.h\n+++ include\/imq\/platform.h\n@@ -3,7 +3,7 @@\n #include <string>\n #include <cstring>\n \n-#define IMQ_VERSION_STR (\"0.4.0\")\n+#define IMQ_VERSION_STR (\"0.5.0\")\n \n #ifdef _MSC_VER\n \t#pragma warning(disable: 4251)\n"} {"commit":"363f7cdec4c62fc1afb82ba3707980ace256029c","subject":"Remove layers","message":"Remove layers\n","repos":"edne\/pineal","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/dsl\/layers.h\n+++ src\/dsl\/layers.h\n@@ -1,44 +0,0 @@\n-{{ begin_module(\"layers\") }}\n-\n-\tunordered_map<string, shared_ptr<ofFbo>> layers_map;\n-\n-\tvoid new_layer(string name){\n-\t\tif(layers_map.find(name) != layers_map.end()){\n-\t\t\treturn;\n-\t\t}\n-\t\tauto fbo = make_shared<ofFbo>();\n-\n-\t\tfbo->allocate(BUFFER_SIZE, BUFFER_SIZE, GL_RGBA);\n-\t\tfbo->begin();\n-\t\tofClear(255,255,255, 0);\n-\t\tfbo->end();\n-\t\tlayers_map[name] = fbo;\n-\t}\n-\n-\t{{ module.bind(\"on_layer_c\", \"on_layer\") }}\n-\tvoid on_layer(pEntity& f, string name){\n-\t\tif(layers_map.find(name) == layers_map.end()){\n-\t\t\tnew_layer(name);\n-\t\t}\n-\t\tofEasyCam camera;\n-\t\tcamera.setDistance(1);\n-\t\tcamera.setNearClip(0.01);\n-\n-\t\tlayers_map[name]->begin();\n-\t\tcamera.begin();\n-\t\tf();\n-\t\tcamera.end();\n-\t\tlayers_map[name]->end();\n-\t}\n-\n-\t{{ module.bind(\"layer_entity\", \"layer_entity\") }}\n-\tpEntity layer_entity(string name){\n-\t\treturn pEntity([name](){\n-\t\t\tif(layers_map.find(name) == layers_map.end()){\n-\t\t\t\tnew_layer(name);\n-\t\t\t}\n-\t\t\tlayers_map[name]->getTexture().draw(-1, -1, 2, 2);\n-\t\t});\n-\t}\n-\n-{{ end_module() }}\n"} {"commit":"f41feb83d551d4e0343ddcdfaee755ab43c464a2","subject":"add missing dbginfo.h include","message":"add missing dbginfo.h include\n\n[r14990]\n","repos":"killbug2004\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,8l\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/libfirm\/firm.h\n+++ include\/libfirm\/firm.h\n@@ -109,6 +109,7 @@\n \n #include \"firmstat.h\" \/* statistics *\/\n \n+#include \"dbginfo.h\" \/* debug support *\/\n #include \"seqnumbers.h\" \/* debug support *\/\n #include \"firm_ycomp.h\" \/* ycomp debugging support *\/\n \n"} {"commit":"e61396627f91abb855ddd8925be9172fb5871944","subject":"debug: Introduce a dev_WARN() function","message":"debug: Introduce a dev_WARN() function\n\nin the line of dev_printk(), this patch introduces a dev_WARN() function,\nthat takes a struct device and then a printk format\/args set of arguments.\nUnlike dev_printk(), the effect is that of WARN() in that a full warning\nmessage (including filename\/line, module list, versions and a backtrace)\nis printed in addition to the device name and the arguments.\n\nSigned-off-by: Arjan van de Ven <9043bf4b08f6c93a2cb55d98c3494b123858348f@linux.intel.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/device.h\n+++ include\/linux\/device.h\n@@ -570,6 +570,14 @@\n \t({ if (0) dev_printk(KERN_DEBUG, dev, format, ##arg); 0; })\n #endif\n \n+\/*\n+ * dev_WARN() acts like dev_printk(), but with the key difference\n+ * of using a WARN\/WARN_ON to get the message out, including the\n+ * file\/line information and a backtrace.\n+ *\/\n+#define dev_WARN(dev, format, arg...) \\\n+\tWARN(1, \"Device: %s\\n\" format, dev_driver_string(dev), ## arg);\n+\n \/* Create alias, so I can be autoloaded. *\/\n #define MODULE_ALIAS_CHARDEV(major,minor) \\\n \tMODULE_ALIAS(\"char-major-\" __stringify(major) \"-\" __stringify(minor))\n"} {"commit":"74e22fac8858f83af9b589f1dcb004ccf4991003","subject":"module.h: Remove unnecessary semicolon","message":"module.h: Remove unnecessary semicolon\n\n[All 8 callers already have semicolons. -- RR]\n\nSigned-off-by: Joe Perches <16a9a54ddf4259952e3c118c763138e83693d7fd@perches.com>\nSigned-off-by: Rusty Russell <df9728c9e5104131c08c7adb03af425394842596@rustcorp.com.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/module.h\n+++ include\/linux\/module.h\n@@ -451,7 +451,7 @@\n \n extern void __module_put_and_exit(struct module *mod, long code)\n \t__attribute__((noreturn));\n-#define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code);\n+#define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code)\n \n #ifdef CONFIG_MODULE_UNLOAD\n unsigned long module_refcount(struct module *mod);\n"} {"commit":"69c31ce7f3cb3572d3efd89f078105a9dda348c2","subject":"add dummy Mutex for single threading and additional template parameter","message":"add dummy Mutex for single threading and additional template parameter\n\n\ngit-svn-id: e2e1a767b54e5f731ad8ac18fa5089ee37d5625a@511 7ec92016-0320-0410-acc4-a06ded1c099a\n","repos":"claudiordgz\/Loki,claudiordgz\/Loki,claudiordgz\/Loki","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/loki\/Threads.h\n+++ include\/loki\/Threads.h\n@@ -49,6 +49,7 @@\n \/\/\/ - POSIX (pthread.h)\n \n \n+#include <cassert>\n \n #if defined(LOKI_CLASS_LEVEL_THREADING) || defined(LOKI_OBJECT_LEVEL_THREADING)\n \n@@ -72,68 +73,15 @@\n #define LOKI_DEFAULT_THREADING_NO_OBJ_LEVEL ::Loki::SingleThreaded\n \n #endif\n-\n-#include <cassert>\n-\n-namespace Loki\n-{\n- \n- \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- \/\/\/ \\class SingleThreaded\n- \/\/\/\n- \/\/\/ \\ingroup ThreadingGroup\n- \/\/\/ Implementation of the ThreadingModel policy used by various classes\n- \/\/\/ Implements a single-threaded model; no synchronization\n- \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- template <class Host>\n- class SingleThreaded\n- {\n- public:\n- \/\/\/ \\struct Lock\n- \/\/\/ Dummy Lock class\n- struct Lock\n- {\n- Lock() {}\n- explicit Lock(const SingleThreaded&) {}\n- explicit Lock(const SingleThreaded*) {}\n- };\n- \n- typedef Host VolatileType;\n-\n- typedef int IntType; \n-\n- static IntType AtomicAdd(volatile IntType& lval, IntType val)\n- { return lval += val; }\n- \n- static IntType AtomicSubtract(volatile IntType& lval, IntType val)\n- { return lval -= val; }\n-\n- static IntType AtomicMultiply(volatile IntType& lval, IntType val)\n- { return lval *= val; }\n- \n- static IntType AtomicDivide(volatile IntType& lval, IntType val)\n- { return lval \/= val; }\n- \n- static IntType AtomicIncrement(volatile IntType& lval)\n- { return ++lval; }\n- \n- static IntType AtomicDecrement(volatile IntType& lval)\n- { return --lval; }\n- \n- static void AtomicAssign(volatile IntType & lval, IntType val)\n- { lval = val; }\n- \n- static void AtomicAssign(IntType & lval, volatile IntType & val)\n- { lval = val; }\n- };\n- \n+ \n+\n #if defined(_WINDOWS_) || defined(_WINDOWS_H) \n \n-#define LOKI_THREADS_MUTEX CRITICAL_SECTION\n-#define LOKI_THREADS_MUTEX_INIT ::InitializeCriticalSection\n-#define LOKI_THREADS_MUTEX_DELETE ::DeleteCriticalSection\n-#define LOKI_THREADS_MUTEX_LOCK ::EnterCriticalSection\n-#define LOKI_THREADS_MUTEX_UNLOCK ::LeaveCriticalSection\n+#define LOKI_THREADS_MUTEX(x) CRITICAL_SECTION x\n+#define LOKI_THREADS_MUTEX_INIT(x) ::InitializeCriticalSection x\n+#define LOKI_THREADS_MUTEX_DELETE(x) ::DeleteCriticalSection x\n+#define LOKI_THREADS_MUTEX_LOCK(x) ::EnterCriticalSection x\n+#define LOKI_THREADS_MUTEX_UNLOCK(x) ::LeaveCriticalSection x\n #define LOKI_THREADS_LONG LONG\n \n #define LOKI_THREADS_ATOMIC_FUNCTIONS \\\n@@ -154,11 +102,11 @@\n #elif defined(_PTHREAD_H) \/\/POSIX threads (pthread.h)\n \n \n-#define LOKI_THREADS_MUTEX pthread_mutex_t\n+#define LOKI_THREADS_MUTEX(x) pthread_mutex_t x\n #define LOKI_THREADS_MUTEX_INIT(x) ::pthread_mutex_init(x,0)\n-#define LOKI_THREADS_MUTEX_DELETE ::pthread_mutex_destroy\n-#define LOKI_THREADS_MUTEX_LOCK ::pthread_mutex_lock\n-#define LOKI_THREADS_MUTEX_UNLOCK ::pthread_mutex_unlock\n+#define LOKI_THREADS_MUTEX_DELETE(x) ::pthread_mutex_destroy x\n+#define LOKI_THREADS_MUTEX_LOCK(x) ::pthread_mutex_lock x\n+#define LOKI_THREADS_MUTEX_UNLOCK(x) ::pthread_mutex_unlock x\n #define LOKI_THREADS_LONG long\n \n #define LOKI_THREADS_ATOMIC(x) \\\n@@ -182,9 +130,21 @@\n static void AtomicAssign(IntType& lval, volatile IntType& val) \\\n { LOKI_THREADS_ATOMIC( lval = val ); } \n \n+#else \/\/ single threaded\n+\n+#define LOKI_THREADS_MUTEX(x)\n+#define LOKI_THREADS_MUTEX_INIT(x) \n+#define LOKI_THREADS_MUTEX_DELETE(x) \n+#define LOKI_THREADS_MUTEX_LOCK(x) \n+#define LOKI_THREADS_MUTEX_UNLOCK(x) \n+#define LOKI_THREADS_LONG \n+\n #endif\n \n-#if defined(_WINDOWS_) || defined(_WINDOWS_H) || defined(_PTHREAD_H) \n+\n+\n+namespace Loki\n+{\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\/ \\class Mutex\n@@ -196,19 +156,70 @@\n class Mutex\n {\n public:\n- Mutex() { LOKI_THREADS_MUTEX_INIT ( &mtx_ ); }\n- ~Mutex() { LOKI_THREADS_MUTEX_DELETE( &mtx_ ); }\n- void Lock() { LOKI_THREADS_MUTEX_LOCK ( &mtx_ ); }\n- void Unlock() { LOKI_THREADS_MUTEX_UNLOCK( &mtx_ ); }\n+ Mutex() { LOKI_THREADS_MUTEX_INIT ( (&mtx_) ); }\n+ ~Mutex() { LOKI_THREADS_MUTEX_DELETE( (&mtx_) ); }\n+ void Lock() { LOKI_THREADS_MUTEX_LOCK ( (&mtx_) ); }\n+ void Unlock() { LOKI_THREADS_MUTEX_UNLOCK( (&mtx_) ); }\n private:\n \/\/\/ Copy-constructor not implemented.\n Mutex( const Mutex & );\n \/\/\/ Copy-assignement operator not implemented.\n Mutex & operator = ( const Mutex & );\n- LOKI_THREADS_MUTEX mtx_;\n+ LOKI_THREADS_MUTEX(mtx_);\n };\n \n \n+ \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+ \/\/\/ \\class SingleThreaded\n+ \/\/\/\n+ \/\/\/ \\ingroup ThreadingGroup\n+ \/\/\/ Implementation of the ThreadingModel policy used by various classes\n+ \/\/\/ Implements a single-threaded model; no synchronization\n+ \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+ template <class Host, class MutexPolicy = Mutex>\n+ class SingleThreaded\n+ {\n+ public:\n+ \/\/\/ \\struct Lock\n+ \/\/\/ Dummy Lock class\n+ struct Lock\n+ {\n+ Lock() {}\n+ explicit Lock(const SingleThreaded&) {}\n+ explicit Lock(const SingleThreaded*) {}\n+ };\n+ \n+ typedef Host VolatileType;\n+\n+ typedef int IntType; \n+\n+ static IntType AtomicAdd(volatile IntType& lval, IntType val)\n+ { return lval += val; }\n+ \n+ static IntType AtomicSubtract(volatile IntType& lval, IntType val)\n+ { return lval -= val; }\n+\n+ static IntType AtomicMultiply(volatile IntType& lval, IntType val)\n+ { return lval *= val; }\n+ \n+ static IntType AtomicDivide(volatile IntType& lval, IntType val)\n+ { return lval \/= val; }\n+ \n+ static IntType AtomicIncrement(volatile IntType& lval)\n+ { return ++lval; }\n+ \n+ static IntType AtomicDecrement(volatile IntType& lval)\n+ { return --lval; }\n+ \n+ static void AtomicAssign(volatile IntType & lval, IntType val)\n+ { lval = val; }\n+ \n+ static void AtomicAssign(IntType & lval, volatile IntType & val)\n+ { lval = val; }\n+ };\n+ \n+\n+#if defined(_WINDOWS_) || defined(_WINDOWS_H) || defined(_PTHREAD_H) \n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/\/ \\class ObjectLevelLockable\n@@ -381,6 +392,9 @@\n #endif\n \n \/\/ $Log$\n+\/\/ Revision 1.25 2006\/01\/22 00:32:29 syntheticpp\n+\/\/ add dummy Mutex for single threading and additional template parameter\n+\/\/\n \/\/ Revision 1.24 2006\/01\/21 14:11:09 syntheticpp\n \/\/ complete usage of Loki::Mutex, gcc can't compile without these corrections\n \/\/\n"} {"commit":"194512985265dafb0ef23441e54543feab2a8169","subject":"[Serialization] Update SWIFTMODULE_VERSION_MINOR version","message":"[Serialization] Update SWIFTMODULE_VERSION_MINOR version\n","repos":"apple\/swift,apple\/swift,apple\/swift,JGiola\/swift,glessard\/swift,JGiola\/swift,apple\/swift,ahoppen\/swift,atrick\/swift,atrick\/swift,roambotics\/swift,roambotics\/swift,ahoppen\/swift,atrick\/swift,benlangmuir\/swift,benlangmuir\/swift,benlangmuir\/swift,ahoppen\/swift,benlangmuir\/swift,glessard\/swift,glessard\/swift,atrick\/swift,ahoppen\/swift,glessard\/swift,apple\/swift,apple\/swift,atrick\/swift,JGiola\/swift,JGiola\/swift,benlangmuir\/swift,JGiola\/swift,roambotics\/swift,roambotics\/swift,JGiola\/swift,ahoppen\/swift,atrick\/swift,glessard\/swift,glessard\/swift,benlangmuir\/swift,ahoppen\/swift,roambotics\/swift,roambotics\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Serialization\/ModuleFormat.h\n+++ lib\/Serialization\/ModuleFormat.h\n@@ -56,7 +56,7 @@\n \/\/\/ describe what change you made. The content of this comment isn't important;\n \/\/\/ it just ensures a conflict if two people change the module format.\n \/\/\/ Don't worry about adhering to the 80-column limit for this line.\n-const uint16_t SWIFTMODULE_VERSION_MINOR = 685; \/\/ Primary associated types\n+const uint16_t SWIFTMODULE_VERSION_MINOR = 686; \/\/ async let bit encoded in any_pattern\n \n \/\/\/ A standard hash seed used for all string hashes in a serialized module.\n \/\/\/\n"} {"commit":"3c7753e00af43a301d48e8062b1adadd5a6ad3a2","subject":"Improve method declaration after review","message":"Improve method declaration after review\n\nCo-authored-by: Sergio Hern\u00e1ndez <66a14107e22db2205800b2d665b26d3b4cb01fb2@mega.nz>","repos":"Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/command.h\n+++ include\/mega\/command.h\n@@ -92,7 +92,7 @@\n Command();\n virtual ~Command() = default;\n \n- bool static checkError(int64_t &e, JSON &json, ErrorDetails &errorDetails);\n+ static bool checkError(int64_t &e, JSON &json, ErrorDetails &errorDetails);\n \n MEGA_DEFAULT_COPY_MOVE(Command)\n };\n"} {"commit":"3f8e351561d36d37b9941515a6fb35eeb998d490","subject":"Remove unused arguments.","message":"Remove unused arguments.\n","repos":"ericfischer\/datamaps,wandergis\/datamaps,wandergis\/datamaps,ericfischer\/datamaps","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- serve-pair.c\n+++ serve-pair.c\n@@ -138,7 +138,7 @@\n }\n \n \/\/ http:\/\/rosettacode.org\/wiki\/Bitmap\/Bresenham's_line_algorithm#C\n-void drawLine(int x0, int y0, int x1, int y1, double *image, int zoom, double add) {\n+void drawLine(int x0, int y0, int x1, int y1, double *image, double add) {\n int dx = abs(x1 - x0), sx = (x0 < x1) ? 1 : -1;\n int dy = abs(y1 - y0), sy = (y0 < y1) ? 1 : -1;\n int err = ((dx > dy) ? dx : -dy) \/ 2, e2;\n@@ -180,7 +180,7 @@\n \n \/\/ loosely based on\n \/\/ http:\/\/en.wikipedia.org\/wiki\/Xiaolin_Wu's_line_algorithm\n-void antialiasedLine(double x0, double y0, double x1, double y1, double *image, int zoom, double add) {\n+void antialiasedLine(double x0, double y0, double x1, double y1, double *image, double add) {\n \tint steep = fabs(y1 - y0) > fabs(x1 - x0);\n \n \tif (steep) {\n@@ -305,7 +305,7 @@\n }\n \n \/\/ http:\/\/en.wikipedia.org\/wiki\/Cohen%E2%80%93Sutherland_algorithm\n-void drawClip(double x0, double y0, double x1, double y1, double *image, int zoom, double add) {\n+void drawClip(double x0, double y0, double x1, double y1, double *image, double add) {\n double dx = fabs(x1 - x0);\n double dy = fabs(y1 - y0);\n \tadd \/= sqrt(dx * dx + dy * dy);\n@@ -363,11 +363,11 @@\n \t}\n \n \tif (accept) {\n-\t\tantialiasedLine(x0, y0, x1, y1, image, zoom, add);\n-\t}\n-}\n-\n-void process(int zoom, int x, int y, int z, int ox, int oy, unsigned char *startbuf, unsigned char *endbuf, int step, double *image, int debug) {\n+\t\tantialiasedLine(x0, y0, x1, y1, image, add);\n+\t}\n+}\n+\n+void process(int zoom, int x, int y, int z, int ox, int oy, unsigned char *startbuf, unsigned char *endbuf, double *image) {\n \tchar fname[strlen(FNAME) + 3 + 5 + 1];\n \tsprintf(fname, \"%s\/%d.sort\", FNAME, zoom);\n \n@@ -410,7 +410,7 @@\n \tint bright = exp(log(1.53) * z) * 2.3;\n \n \tunsigned int j;\n-\tfor (j = 0; j < count; j += step) {\n+\tfor (j = 0; j < count; j += 1) {\n \t\tunsigned long long quad1 = buf2quad(start + j * BYTES);\n \t\tunsigned long long quad2 = buf2quad(start + j * BYTES + BYTES \/ 2);\n \n@@ -420,7 +420,7 @@\n \t\tquad2fxy(quad1, &x1, &y1, z, ox, oy);\n \t\tquad2fxy(quad2, &x2, &y2, z, ox, oy);\n \n-\t\tdrawClip(x1, y1, x2, y2, image, z, bright);\n+\t\tdrawClip(x1, y1, x2, y2, image, bright);\n \t}\n \n \tmunmap(map, st.st_size);\n@@ -462,7 +462,7 @@\n \n \tint zoom;\n \tfor (zoom = z; zoom < z + 9 && zoom < 24; zoom++) {\n-\t\tprocess(zoom, x, y, z, x, y, startbuf, endbuf, 1, image, 0);\n+\t\tprocess(zoom, x, y, z, x, y, startbuf, endbuf, image);\n \t}\n \n \tint ox = x, oy = y;\n@@ -494,7 +494,7 @@\n \t\tquad2buf(startquad, startbuf);\n \t\tquad2buf(endquad, endbuf);\n \n-\t\tprocess(zoom, x, y, z, ox, oy, startbuf, endbuf, 1, image, 0);\n+\t\tprocess(zoom, x, y, z, ox, oy, startbuf, endbuf, image);\n \t}\n \n double limit = 400;\n"} {"commit":"ca3dbc20d47ae43c201c215259d078e227bfcf01","subject":"cfg80211: update misleading comment","message":"cfg80211: update misleading comment\n\nIn cfg80211_scan_request n_channels refers to the total number\nof channels to scan. Update the misleading comment accordingly.\n\nSigned-off-by: Helmut Schaa <b93afca131f86f2653331097f5dcdcaaa5682625@googlemail.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/net\/cfg80211.h\n+++ include\/net\/cfg80211.h\n@@ -538,7 +538,7 @@\n * @ssids: SSIDs to scan for (active scan only)\n * @n_ssids: number of SSIDs\n * @channels: channels to scan on.\n- * @n_channels: number of channels for each band\n+ * @n_channels: total number of channels to scan\n * @ie: optional information element(s) to add into Probe Request or %NULL\n * @ie_len: length of ie in octets\n * @wiphy: the wiphy this was for\n"} {"commit":"428b5ea6d12ec5a6dad8d00bda3346461f041087","subject":"Data: copy impacted_journey_patterns vector","message":"Data: copy impacted_journey_patterns vector\n","repos":"djludo\/navitia,TeXitoi\/navitia,xlqian\/navitia,kadhikari\/navitia,antoine-de\/navitia,thiphariel\/navitia,kinnou02\/navitia,ballouche\/navitia,xlqian\/navitia,patochectp\/navitia,stifoon\/navitia,is06\/navitia,thiphariel\/navitia,CanalTP\/navitia,CanalTP\/navitia,patochectp\/navitia,xlqian\/navitia,pbougue\/navitia,frodrigo\/navitia,prhod\/navitia,thiphariel\/navitia,datanel\/navitia,francois-vincent\/navitia,VincentCATILLON\/navitia,frodrigo\/navitia,francois-vincent\/navitia,TeXitoi\/navitia,francois-vincent\/navitia,lrocheWB\/navitia,stifoon\/navitia,xlqian\/navitia,TeXitoi\/navitia,TeXitoi\/navitia,djludo\/navitia,CanalTP\/navitia,Tisseo\/navitia,pbougue\/navitia,VincentCATILLON\/navitia,fueghan\/navitia,lrocheWB\/navitia,djludo\/navitia,francois-vincent\/navitia,is06\/navitia,fueghan\/navitia,Tisseo\/navitia,datanel\/navitia,CanalTP\/navitia,VincentCATILLON\/navitia,djludo\/navitia,fueghan\/navitia,patochectp\/navitia,antoine-de\/navitia,kinnou02\/navitia,antoine-de\/navitia,prhod\/navitia,ballouche\/navitia,frodrigo\/navitia,kadhikari\/navitia,lrocheWB\/navitia,xlqian\/navitia,ballouche\/navitia,datanel\/navitia,Tisseo\/navitia,ballouche\/navitia,kinnou02\/navitia,stifoon\/navitia,lrocheWB\/navitia,stifoon\/navitia,fueghan\/navitia,Tisseo\/navitia,kadhikari\/navitia,antoine-de\/navitia,prhod\/navitia,is06\/navitia,is06\/navitia,thiphariel\/navitia,VincentCATILLON\/navitia,prhod\/navitia,kadhikari\/navitia,pbougue\/navitia,Tisseo\/navitia,kinnou02\/navitia,datanel\/navitia,patochectp\/navitia,frodrigo\/navitia,CanalTP\/navitia,pbougue\/navitia","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- source\/type\/message.h\n+++ source\/type\/message.h\n@@ -183,7 +183,7 @@\n \n template<class Archive>\n void serialize(Archive& ar, const unsigned int) {\n- ar & uri & created_at & updated_at & application_periods & severity & informed_entities & messages & disruption;\n+ ar & uri & created_at & updated_at & application_periods & severity & informed_entities & messages & impacted_journey_patterns & disruption;\n }\n \n bool is_valid(const boost::posix_time::ptime& current_time, const boost::posix_time::time_period& action_period) const;\n"} {"commit":"a98226842d218720094459b41a9ac774cd85ecea","subject":"Use rename to make sure no files are inserted while deleting (#3912)","message":"Use rename to make sure no files are inserted while deleting (#3912)\n\nAs suggested by @marcocitus in https:\/\/github.com\/citusdata\/citus\/pull\/3911#issuecomment-643978531, there was\r\na regression in #3893. If another backend would write a file during deletion of\r\nthe intermediate results directory, this file would not necessarily be deleted.\r\n\r\nThe approach used in `CitusRemoveDirectory` is to try recursive removal of the\r\ndirectory again if it has failed. This does not work here, since when a file\r\ncan not be removed for other reasons (e.g. `EPERM`) it will not throw an error\r\nanymore. So then we would get into an infinite removal loop. Instead I now\r\n`rename` the directory before removing it. That way other backends will not\r\nwrite files to it anymore.","repos":"citusdata\/citus,citusdata\/citus,citusdata\/citus,citusdata\/citus,citusdata\/citus","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/backend\/distributed\/executor\/intermediate_results.c\n+++ src\/backend\/distributed\/executor\/intermediate_results.c\n@@ -701,7 +701,33 @@\n {\n \tif (CreatedResultsDirectory)\n \t{\n-\t\tPathNameDeleteTemporaryDir(IntermediateResultsDirectory());\n+\t\t\/*\n+\t\t * The shared directory is renamed before deleting it. Otherwise it\n+\t\t * would be possible for another backend to write a file, while we are\n+\t\t * deleting the directory. Since rename is atomic by POSIX standards\n+\t\t * that's not possible. The current PID is included in the new\n+\t\t * filename, so there can be no collisions with other backends.\n+\t\t *\/\n+\t\tchar *sharedName = IntermediateResultsDirectory();\n+\t\tStringInfo privateName = makeStringInfo();\n+\t\tappendStringInfo(privateName, \"%s.removed-by-%d\", sharedName, MyProcPid);\n+\t\tif (rename(sharedName, privateName->data))\n+\t\t{\n+\t\t\tereport(LOG,\n+\t\t\t\t\t(errcode_for_file_access(),\n+\t\t\t\t\t errmsg(\n+\t\t\t\t\t\t \"could not rename intermediate results directory \\\"%s\\\" to \\\"%s\\\": %m\",\n+\t\t\t\t\t\t sharedName, privateName->data)));\n+\n+\t\t\t\/* rename failed for some reason, we do a best effort removal of\n+\t\t\t * the shared directory *\/\n+\n+\t\t\tPathNameDeleteTemporaryDir(sharedName);\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\tPathNameDeleteTemporaryDir(privateName->data);\n+\t\t}\n \n \t\tCreatedResultsDirectory = false;\n \t}\n"} {"commit":"59426da551359b44220f9ec2cb2c0f80ec7bf82f","subject":"search_module: don't consider '-' a word separator","message":"search_module: don't consider '-' a word separator\n","repos":"hotdoc\/hotdoc,hotdoc\/hotdoc,hotdoc\/hotdoc,hotdoc\/hotdoc,hotdoc\/hotdoc,hotdoc\/hotdoc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hotdoc\/parsers\/search_module.c\n+++ hotdoc\/parsers\/search_module.c\n@@ -210,7 +210,8 @@\n while (str[i] &&\n ((str[i] >= 'a' && str[i] <= 'z') ||\n (str[i] >= 'A' && str[i] <= 'Z') ||\n- (str[i] >= '0' && str[i] <= '9') || str[i] == '_' || str[i] == '.')) {\n+ (str[i] >= '0' && str[i] <= '9') ||\n+ str[i] == '_' || str[i] == '.' || str[i] == '-')) {\n i++;\n }\n \n"} {"commit":"c28c45961b63d1e27183e110777c02655f709458","subject":"rename pic_symbol_value to pic_sym_value","message":"rename pic_symbol_value to pic_sym_value\n","repos":"picrin-scheme\/picrin,ktakashi\/picrin,leavesbnw\/picrin,leavesbnw\/picrin,dcurrie\/picrin,koba-e964\/picrin,koba-e964\/picrin,leavesbnw\/picrin,dcurrie\/picrin,ktakashi\/picrin,omasanori\/picrin,omasanori\/picrin,koba-e964\/picrin,picrin-scheme\/picrin,ktakashi\/picrin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/picrin\/value.h\n+++ include\/picrin\/value.h\n@@ -170,9 +170,11 @@\n static inline pic_value pic_obj_value(void *);\n static inline pic_value pic_float_value(double);\n static inline pic_value pic_int_value(int);\n-static inline pic_value pic_symbol_value(pic_sym);\n+static inline pic_value pic_sym_value(pic_sym);\n static inline pic_value pic_char_value(char c);\n static inline pic_value pic_none_value();\n+\n+#define pic_symbol_value(sym) pic_sym_value(sym)\n \n static inline bool pic_eq_p(pic_value, pic_value);\n static inline bool pic_eqv_p(pic_value, pic_value);\n"} {"commit":"4f81a2034af9e135c4c13747e76740acd658f1b9","subject":"Remove comment","message":"Remove comment\n","repos":"prittt\/YACCLAB,prittt\/YACCLAB,prittt\/YACCLAB,prittt\/YACCLAB","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/progress_bar.h\n+++ include\/progress_bar.h\n@@ -404,31 +404,4 @@\n ProgressBar pb;\n };\n \n-#endif \/\/ !YACCLAB_PROGRESS_BAR_H_\n-\n-\/*\n-\n-+------------------------------------------------------------------------------+\n-| Checking Algorithms on 8-Connectivity |\n-+------------------------------------------------------------------------------+\n-| 3dpes: |\n-| [=====================================================================] 100% |\n-+------------------------------------------------------------------------------+\n-| tobacco800: |\n-| [=====================================================================] 100% |\n-+------------------------------------------------------------------------------+\n-| medical: |\n-| [=====================================================================] 100% |\n-+------------------------------------------------------------------------------+\n-| hamlet: |\n-| [error]: questo un messaggio molto molto molto ma molto lungo di prova per |\n-| vedere come fare se non ci stiamo\t\t\t\t\t\t\t\t\t |\n-| [============================================> ] 69% |\n-\n-\n-\n-\n-\n-\n-\n-*\/+#endif \/\/ !YACCLAB_PROGRESS_BAR_H_"} {"commit":"a53b7a7aa9d8dad040b2da964b5bcdef9f2de97d","subject":"fix seg","message":"fix seg\n","repos":"caosiyang\/tcpcopy,daodaoliang\/tcpcopy,daodaoliang\/tcpcopy,u20024804\/tcpcopy,liviusATnetskope\/second,horryq\/tcpcopy,u20024804\/tcpcopy,ycaihua\/tcpcopy,liviusATnetskope\/second,caosiyang\/tcpcopy,sshling\/tcpcopy,left2right\/tcpcopy,sshling\/tcpcopy,wfxiang08\/tcpcopy,ycaihua\/tcpcopy,eliteYang\/tcpcopy,eliteYang\/tcpcopy,horryq\/tcpcopy,left2right\/tcpcopy,wfxiang08\/tcpcopy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/tcpcopy\/session.c\n+++ src\/tcpcopy\/session.c\n@@ -575,6 +575,7 @@\n \ttot_len = ntohs(ip_header->tot_len);\n \tcont_len = get_pack_cont_len(ip_header, tcp_header);\n \tif(cont_len > 0){\n+\t\ts->status = SEND_REQUEST;\n \t\ts->req_last_send_cont_time = time(0);\n \t\ts->req_last_cont_sent_seq = htonl(tcp_header->seq);\n \t\ts->vir_next_seq = s->vir_next_seq + cont_len;\n@@ -909,7 +910,6 @@\n \t\t\t\t}\n \t\t\t}\n \t\t\tcand_pause = true;\n-\t\t\ts->status = SEND_REQUEST;\n \t\t\ts->candidate_response_waiting = 1;\n \t\t}else if(tcp_header->rst){\n \t\t\tif(s->candidate_response_waiting){\n@@ -2089,7 +2089,7 @@\n #endif\n \t\t}\n \t}else{\n-\t\tif(SEND_REQUEST == s->status && len > 0){\n+\t\tif(len > 0){\n \t\t\ts->candidate_response_waiting = 1;\n \t\t\twrap_send_ip_packet(s, (unsigned char *)ip_header);\n \t\t}else if(SYN_CONFIRM == s->status){\n@@ -2262,7 +2262,6 @@\n \t\t\t\t\ttcp_header, is_new_req)){\n \t\t\treturn;\n \t\t}\n-\t\ts->status = SEND_REQUEST;\n \t\t\/* Check if the current session is keepalive *\/\n \t\tcheck_conn_keepalive(s);\n #if (DEBUG_TCPCOPY)\n"} {"commit":"b096693bef569ce463b5444ce654e62293978f8c","subject":"event-loop.c: Use correct OS abstraction function for dupfd()","message":"event-loop.c: Use correct OS abstraction function for dupfd()\n\nSigned-off-by: Philip Withnall <philip at tecnocode.co.uk>\nSigned-off-by: Karsten Otto <ottoka at posteo.de>\nReviewed-by: David Fort <contact at hardening-consulting.com>\nReviewed-by: Marek Chalupa <a05df156a69ad59faa9af9b666ef78009594c145@gmail.com>\nReviewed-by: Pekka Paalanen <0f6ae7001e34c37b02fb2c1c2573ddf8f442136a@collabora.co.uk>\n","repos":"abooij\/wayland,abooij\/wayland,mchalupa\/wayland,bitfactor\/wayland,mchalupa\/wayland,eyolfson\/wayland,sir-murray\/wayland,bitfactor\/wayland,sir-murray\/wayland,mchalupa\/wayland,sir-murray\/wayland,bitfactor\/wayland,tulcod\/wayland,abooij\/wayland,eyolfson\/wayland,tulcod\/wayland,tulcod\/wayland,eyolfson\/wayland","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/event-loop.c\n+++ src\/event-loop.c\n@@ -134,7 +134,7 @@\n \t\treturn NULL;\n \n \tsource->base.interface = &fd_source_interface;\n-\tsource->base.fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);\n+\tsource->base.fd = wl_os_dupfd_cloexec(fd, 0);\n \tsource->func = func;\n \tsource->fd = fd;\n \n"} {"commit":"4e58e54754dc1fec21c3a9e824bc108b05fdf46e","subject":"tracing: Allow events to have NULL strings","message":"tracing: Allow events to have NULL strings\n\nIf an TRACE_EVENT() uses __assign_str() or __get_str on a NULL pointer\nthen the following oops will happen:\n\nBUG: unable to handle kernel NULL pointer dereference at (null)\nIP: [<c127a17b>] strlen+0x10\/0x1a\n*pde = 00000000 ^M\nOops: 0000 [#1] PREEMPT SMP\nModules linked in:\nCPU: 1 PID: 0 Comm: swapper\/1 Not tainted 3.13.0-rc1-test+ #2\nHardware name: \/DG965MQ, BIOS MQ96510J.86A.0372.2006.0605.1717 06\/05\/2006^M\ntask: f5cde9f0 ti: f5e5e000 task.ti: f5e5e000\nEIP: 0060:[<c127a17b>] EFLAGS: 00210046 CPU: 1\nEIP is at strlen+0x10\/0x1a\nEAX: 00000000 EBX: c2472da8 ECX: ffffffff EDX: c2472da8\nESI: c1c5e5fc EDI: 00000000 EBP: f5e5fe84 ESP: f5e5fe80\n DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nCR0: 8005003b CR2: 00000000 CR3: 01f32000 CR4: 000007d0\nStack:\n f5f18b90 f5e5feb8 c10687a8 0759004f 00000005 00000005 00000005 00200046\n 00000002 00000000 c1082a93 f56c7e28 c2472da8 c1082a93 f5e5fee4 c106bc61^M\n 00000000 c1082a93 00000000 00000000 00000001 00200046 00200082 00000000\nCall Trace:\n [<c10687a8>] ftrace_raw_event_lock+0x39\/0xc0\n [<c1082a93>] ? ktime_get+0x29\/0x69\n [<c1082a93>] ? ktime_get+0x29\/0x69\n [<c106bc61>] lock_release+0x57\/0x1a5\n [<c1082a93>] ? ktime_get+0x29\/0x69\n [<c10824dd>] read_seqcount_begin.constprop.7+0x4d\/0x75\n [<c1082a93>] ? ktime_get+0x29\/0x69^M\n [<c1082a93>] ktime_get+0x29\/0x69\n [<c108a46a>] __tick_nohz_idle_enter+0x1e\/0x426\n [<c10690e8>] ? lock_release_holdtime.part.19+0x48\/0x4d\n [<c10bc184>] ? time_hardirqs_off+0xe\/0x28\n [<c1068c82>] ? trace_hardirqs_off_caller+0x3f\/0xaf\n [<c108a8cb>] tick_nohz_idle_enter+0x59\/0x62\n [<c1079242>] cpu_startup_entry+0x64\/0x192\n [<c102299c>] start_secondary+0x277\/0x27c\nCode: 90 89 c6 89 d0 88 c4 ac 38 e0 74 09 84 c0 75 f7 be 01 00 00 00 89 f0 48 5e 5d c3 55 89 e5 57 66 66 66 66 90 83 c9 ff 89 c7 31 c0 <f2> ae f7 d1 8d 41 ff 5f 5d c3 55 89 e5 57 66 66 66 66 90 31 ff\nEIP: [<c127a17b>] strlen+0x10\/0x1a SS:ESP 0068:f5e5fe80\nCR2: 0000000000000000\n---[ end trace 01bc47bf519ec1b2 ]---\n\nNew tracepoints have been added that have allowed for NULL pointers\nbeing assigned to strings. To fix this, change the TRACE_EVENT() code\nto check for NULL and if it is, it will assign \"(null)\" to it instead\n(similar to what glibc printf does).\n\nReported-by: Shuah Khan <7a008e9ca14f0bd5b2b4fb5bbf85c809f40f4224@samsung.com>\nReported-by: Jovi Zhangwei <a8ae8cb0c5ce7eeda1b4de6b4b82210f652e86b4@gmail.com>\nLink: d9164fba5fc1de7553909de92fcd4f9c6f153668@mail.gmail.com\nLink: a534c1d8d1798e4b298f65b4c532766261abe34c@samsung.com\nFixes: 9cbf117662e2 (\"tracing\/events: provide string with undefined size support\")\nCc: 4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@vger.kernel.org # 2.6.31+\nSigned-off-by: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/trace\/ftrace.h\n+++ include\/trace\/ftrace.h\n@@ -372,7 +372,8 @@\n \t__data_size += (len) * sizeof(type);\n \n #undef __string\n-#define __string(item, src) __dynamic_array(char, item, strlen(src) + 1)\n+#define __string(item, src) __dynamic_array(char, item,\t\t\t\\\n+\t\t strlen((src) ? (const char *)(src) : \"(null)\") + 1)\n \n #undef DECLARE_EVENT_CLASS\n #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)\t\\\n@@ -501,7 +502,7 @@\n \n #undef __assign_str\n #define __assign_str(dst, src)\t\t\t\t\t\t\\\n-\tstrcpy(__get_str(dst), src);\n+\tstrcpy(__get_str(dst), (src) ? (const char *)(src) : \"(null)\");\n \n #undef TP_fast_assign\n #define TP_fast_assign(args...) args\n"} {"commit":"54b3e7af3a83b25300ee4a52f68c7ba7a64e5c65","subject":"- fix printf format (%u is enougth) ","message":"- fix printf format (%u is enougth) \n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@24438 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"fernandobrito\/parrot,youprofit\/parrot,gagern\/parrot,gitster\/parrot,fernandobrito\/parrot,fernandobrito\/parrot,gitster\/parrot,parrot\/parrot,FROGGS\/parrot,gagern\/parrot,tkob\/parrot,tkob\/parrot,gagern\/parrot,fernandobrito\/parrot,gagern\/parrot,gagern\/parrot,FROGGS\/parrot,parrot\/parrot,fernandobrito\/parrot,gitster\/parrot,tkob\/parrot,tkob\/parrot,tkob\/parrot,fernandobrito\/parrot,gitster\/parrot,tewk\/parrot-select,gitster\/parrot,parrot\/parrot,youprofit\/parrot,FROGGS\/parrot,tkob\/parrot,fernandobrito\/parrot,FROGGS\/parrot,youprofit\/parrot,tkob\/parrot,youprofit\/parrot,FROGGS\/parrot,tkob\/parrot,parrot\/parrot,tewk\/parrot-select,FROGGS\/parrot,youprofit\/parrot,tewk\/parrot-select,youprofit\/parrot,tewk\/parrot-select,tewk\/parrot-select,gagern\/parrot,gitster\/parrot,gitster\/parrot,FROGGS\/parrot,gagern\/parrot,tewk\/parrot-select,parrot\/parrot,youprofit\/parrot,youprofit\/parrot,FROGGS\/parrot,tewk\/parrot-select","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/exceptions.c\n+++ src\/exceptions.c\n@@ -132,7 +132,7 @@\n fprintf(stderr, \"Parrot VM: PANIC: %s!\\n\",\n message ? message : \"(no message available)\");\n \n- fprintf(stderr, \"C file %s, line %ud\\n\",\n+ fprintf(stderr, \"C file %s, line %u\\n\",\n file ? file : \"(not available)\", line);\n \n fprintf(stderr, \"Parrot file (not available), \");\n"} {"commit":"3ed40d8321ffb427f75cc98fd8335937c3ebd0ee","subject":"Updated version number","message":"Updated version number\n","repos":"GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/vk_mem_alloc.h\n+++ include\/vk_mem_alloc.h\n@@ -25,7 +25,7 @@\n \r\n \/** \\mainpage Vulkan Memory Allocator\r\n \r\n-<b>Version 3.0.0 (2022-03-25)<\/b>\r\n+<b>Version 3.0.1-development (2022-03-28)<\/b>\r\n \r\n Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved. \\n\r\n License: MIT\r\n"} {"commit":"51759d3d84ba0864324db59773ffa59d81e97dfd","subject":"remove unused include","message":"remove unused include\n","repos":"metalefty\/xrdp,cocoon\/xrdp,moobyfr\/xrdp,proski\/xrdp,PKRoma\/xrdp,metalefty\/xrdp,PKRoma\/xrdp,cocoon\/xrdp,PKRoma\/xrdp,cocoon\/xrdp,neutrinolabs\/xrdp,ubuntu-xrdp\/xrdp,neutrinolabs\/xrdp,jsorg71\/xrdp,neutrinolabs\/xrdp,moobyfr\/xrdp,metalefty\/xrdp,jsorg71\/xrdp,proski\/xrdp,ubuntu-xrdp\/xrdp,moobyfr\/xrdp,jsorg71\/xrdp,proski\/xrdp,ubuntu-xrdp\/xrdp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sesman\/env.c\n+++ sesman\/env.c\n@@ -28,7 +28,6 @@\n #include \"sesman.h\"\n #include \"grp.h\"\n #include \"ssl_calls.h\"\n-#include \"os_calls.h\"\n \n extern unsigned char g_fixedkey[8]; \/* in sesman.c *\/\n extern struct config_sesman *g_cfg; \/* in sesman.c *\/\n"} {"commit":"578f2ae488e1806b79410a5249a05d1bb1137952","subject":"","message":"\nLoop on SSL_read to make sure we actually consume the whole token\n(needed in the case where there are more than one record in the token)\n","repos":"globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,gridcf\/gct","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- gsi\/gssapi\/source\/library\/unwrap.c\n+++ gsi\/gssapi\/source\/library\/unwrap.c\n@@ -191,22 +191,43 @@\n goto err;\n }\n \n- \/* now get the date from SSL. \n+ \/* now get the data from SSL. \n * We don't know how big it is, so assume the max?\n *\/\n \n- rc = SSL_read(context->gs_ssl, readarea, sizeof(readarea));\n+ while((rc = SSL_read(context->gs_ssl, readarea, sizeof(readarea))) > 0)\n+ {\n+ void * realloc_ptr;\n+\n+ realloc_ptr = realloc(\n+ output_message_buffer->value,\n+ rc + output_message_buffer->length);\n+\n+ if(realloc_ptr == NULL)\n+ {\n+ GSSerr(GSSERR_F_UNWRAP, GSSERR_R_OUT_OF_MEMORY);\n+ *minor_status = gsi_generate_minor_status();\n+ major_status = GSS_S_FAILURE;\n+ goto err;\n+ \n+ }\n+\n+ output_message_buffer->value = realloc_ptr;\n+\n+ memcpy(output_message_buffer->value +\n+ output_message_buffer->length,\n+ readarea,\n+ rc);\n+ \n+ output_message_buffer->length += rc;\n+ }\n+ \n if (rc < 0)\n {\n ssl_error = SSL_get_error(context->gs_ssl, rc);\n \n- if(ssl_error == SSL_ERROR_WANT_READ)\n+ if(!ssl_error == SSL_ERROR_WANT_READ)\n {\n- output_message_buffer->value = NULL;\n- output_message_buffer->length = 0;\n- }\n- else\n- { \n char errbuf[256];\n \n \/* Problem, we should have some data here! *\/\n@@ -219,21 +240,6 @@\n major_status = GSS_S_FAILURE;\n goto err;\n }\n- }\n- else if (rc == 0)\n- {\n- output_message_buffer->value = NULL;\n- output_message_buffer->length = rc;\n- }\n- else\n- {\n- if ((output_message_buffer->value = (char *)malloc(rc)) == NULL)\n- {\n- major_status = GSS_S_FAILURE;\n- goto err;\n- }\n- output_message_buffer->length = rc;\n- memcpy(output_message_buffer->value, readarea, rc);\n }\n \n if (conf_state)\n@@ -253,6 +259,13 @@\n \/* unlock the context mutex *\/\n \n globus_mutex_unlock(&context->mutex);\n+\n+ \/* free allocated mem *\/\n+ \n+ if(output_message_buffer->value)\n+ { \n+ free(output_message_buffer->value);\n+ }\n \n return major_status;\n }\n"} {"commit":"d3383fe9ccd1e652f65bcc9a57cfc81a2de1f2a6","subject":"settings initializing functions, using snprintf instead of sprintf","message":"settings initializing functions, using snprintf instead of sprintf\n","repos":"nmandery\/rhizofs,nmandery\/rhizofs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/fs\/rhizofs.c\n+++ src\/fs\/rhizofs.c\n@@ -889,9 +889,6 @@\n {\n (void) data;\n \n- \/\/ set the default response tiemout\n- settings.response_timeout = RESPONSE_TIMEOUT_DEFAULT;\n-\n switch (key) {\n case KEY_HELP:\n Rhizofs_usage(outargs->argv[0]);\n@@ -907,12 +904,29 @@\n \n case FUSE_OPT_KEY_NONOPT:\n if (!settings.host_socket) {\n- settings.host_socket = strdup(arg); \/* TODO: free this + handle failure *\/\n+ settings.host_socket = strdup(arg); \/* TODO: handle failure *\/\n return 0;\n }\n return 1;\n }\n return 1;\n+}\n+\n+\n+static inline void\n+Rhizofs_settings_init()\n+{\n+ memset(&settings, 0, sizeof(settings));\n+\n+ \/\/ set the default response timeout\n+ settings.response_timeout = RESPONSE_TIMEOUT_DEFAULT;\n+}\n+\n+\n+static inline void\n+Rhizofs_settings_deinit()\n+{\n+ free(settings.host_socket);\n }\n \n \n@@ -920,8 +934,8 @@\n * check the settings from the command line arguments\n * returns -1 o failure, 0 on correct arguments\n *\/\n-int\n-Rhizofs_check_settings()\n+static int\n+Rhizofs_settings_check()\n {\n if (settings.host_socket == NULL) {\n fprintf(stderr, \"Missing host\");\n@@ -937,36 +951,39 @@\n int\n Rhizofs_run(int argc, char * argv[])\n {\n+#define TMPBUF_SIZE 1024\n struct fuse_args args = FUSE_ARGS_INIT(argc, argv);\n- char tmpbuf[1024];\n+ char tmpbuf[TMPBUF_SIZE];\n int rc;\n \n- memset(&settings, 0, sizeof(settings));\n+ Rhizofs_settings_init();\n \n fuse_opt_parse(&args, &settings, rhizo_opts, Rhizofs_opt_proc);\n- check_debug((Rhizofs_check_settings() == 0),\n+ check_debug((Rhizofs_settings_check() == 0),\n \"Invalid command line arguments\");\n \n \/* set the host\/socket to show in \/etc\/mtab *\/\n if (settings.host_socket != NULL) {\n if (fuse_version() >= 27) {\n- sprintf(tmpbuf, \"-osubtype=%.20s,fsname=%.990s\", RHI_NAME_LOWER,\n+ snprintf(tmpbuf, TMPBUF_SIZE, \"-osubtype=%.20s,fsname=%.990s\", RHI_NAME_LOWER,\n settings.host_socket);\n }\n else {\n- sprintf(tmpbuf, \"-ofsname=%.20s#%.990s\",\n+ snprintf(tmpbuf, TMPBUF_SIZE, \"-ofsname=%.20s#%.990s\",\n RHI_NAME_LOWER, settings.host_socket);\n }\n fuse_opt_insert_arg(&args, 1, tmpbuf);\n }\n+#undef TMPBUF_SIZE\n \n rc = Rhizofs_fuse_main(&args);\n \n+ Rhizofs_settings_deinit();\n fuse_opt_free_args(&args);\n return rc;\n \n error:\n-\n+ Rhizofs_settings_deinit();\n fuse_opt_free_args(&args);\n return -1;\n }\n"} {"commit":"1621226c7d6a4fbd3cd00213df251d6fe21046dc","subject":"droidcodectype: Make sure we check for encoder type before we call compliment","message":"droidcodectype: Make sure we check for encoder type before we call compliment\n\nOtherwise the H264 decoder will be picked which does not have a compliment function\n","repos":"foolab\/gst-droid,sailfishos\/gst-droid,foolab\/gst-droid,mlehtima\/gst-droid,mlehtima\/gst-droid","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gst\/droidcodec\/gstdroidcodectype.c\n+++ gst\/droidcodec\/gstdroidcodectype.c\n@@ -152,7 +152,7 @@\n int len = G_N_ELEMENTS (types);\n \n for (x = 0; x < len; x++) {\n- if (!g_strcmp0 (type, types[x].droid_type)) {\n+ if (types[x].type == GST_DROID_CODEC_ENCODER && !g_strcmp0 (type, types[x].droid_type)) {\n if (types[x].compliment) {\n types[x].compliment (caps);\n }\n"} {"commit":"db2991082b09e936a9f3429c3a03f6a5e2d4dd5c","subject":"using functions","message":"using functions\n","repos":"votca\/xtp,votca\/xtp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/votca\/xtp\/gw.h\n+++ include\/votca\/xtp\/gw.h\n@@ -110,14 +110,17 @@\n QPFunc(Index gw_level, const Sigma_base& sigma, double offset)\n : _gw_level(gw_level), _offset(offset), _sigma_c_func(sigma){};\n std::pair<double, double> operator()(double frequency) const {\n- std::pair<double, double> value;\n- value.first =\n- _sigma_c_func.CalcCorrelationDiagElement(_gw_level, frequency);\n- value.second = _sigma_c_func.CalcCorrelationDiagElementDerivative(\n- _gw_level, frequency);\n- value.first += (_offset - frequency);\n- value.second -= 1.0;\n- return value;\n+ std::pair<double, double> result;\n+ \/\/ value.first =\n+ \/\/ _sigma_c_func.CalcCorrelationDiagElement(_gw_level, frequency);\n+ \/\/ value.second = _sigma_c_func.CalcCorrelationDiagElementDerivative(\n+ \/\/ _gw_level, frequency);\n+ \/\/ value.first += (_offset - frequency);\n+ \/\/ value.second -= 1.0;\n+ result.first = value(frequency);\n+ result.second = deriv(frequency);\n+\n+ return result;\n }\n double value(double frequency) const {\n return _sigma_c_func.CalcCorrelationDiagElement(_gw_level, frequency) +\n"} {"commit":"49c93f29f2a1eb515ce3d3e58a7bb18dfb3d7b73","subject":"some comments","message":"some comments\n","repos":"28msec\/zorba,bgarrels\/zorba,28msec\/zorba,28msec\/zorba,cezarfx\/zorba,28msec\/zorba,28msec\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,cezarfx\/zorba,bgarrels\/zorba,bgarrels\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,28msec\/zorba,cezarfx\/zorba,bgarrels\/zorba,28msec\/zorba,bgarrels\/zorba,cezarfx\/zorba,28msec\/zorba,bgarrels\/zorba,cezarfx\/zorba,cezarfx\/zorba","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/zorba\/zorbac.h\n+++ include\/zorba\/zorbac.h\n@@ -186,6 +186,9 @@\n void\n (*free)(XQC_Implementation implementation);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -306,6 +309,9 @@\n void\n (*free)(XQC_Query query);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -619,6 +625,9 @@\n void\n (*free)(XQC_StaticContext context);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -649,6 +658,9 @@\n void\n (*free)(XQC_DynamicContext context);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -678,6 +690,9 @@\n void\n (*free)(XQC_Item item);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -702,6 +717,9 @@\n void\n (*free)(XQC_ItemFactory factory);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -713,6 +731,9 @@\n void\n (*free)(XQC_Sequence sequence);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -739,6 +760,9 @@\n void\n (*free)(XQC_Collection collection);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n@@ -768,6 +792,9 @@\n void\n (*free)(XQC_DataManager data_manager);\n \n+ \/**\n+ * for internal use only\n+ *\/\n void* data;\n };\n \n"} {"commit":"c7347cd94d434d8b521ff7fee1d74b4551df991f","subject":"> compile U201414800 sabertazimi Linux 17aa0d73d5e3 4.8.0-46-generic #49~16.04.1-Ubuntu SMP Fri Mar 31 14:51:03 UTC 2017 x86_64 GNU\/Linux 11:54:30 up 1 day, 11:44, 3 users, load average: 0.30, 0.20, 0.33 32e4265ab6f3fafc6c9e63dd2660ac73f5fdba","message":"> compile\nU201414800\nsabertazimi\nLinux 17aa0d73d5e3 4.8.0-46-generic #49~16.04.1-Ubuntu SMP Fri Mar 31 14:51:03 UTC 2017 x86_64 GNU\/Linux\n 11:54:30 up 1 day, 11:44, 3 users, load average: 0.30, 0.20, 0.33\n32e4265ab6f3fafc6c9e63dd2660ac73f5fdba\n","repos":"sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nemu\/src\/monitor\/debug\/watchpoint.c\n+++ nemu\/src\/monitor\/debug\/watchpoint.c\n@@ -84,6 +84,10 @@\n void print_watchpoints(void) {\n Info(\"Num\\tWhat\");\n \n+ if (head == NULL) {\n+ Info(\"No watchpoints\");\n+ }\n+\n for (WP *trav = head; trav != NULL; trav = trav->next) {\n Info(\"%d\\t%s\", trav->NO, trav->exprStr);\n }\n"} {"commit":"724f1da51bba27b09af3f1bcd8067fe6c5a14b6b","subject":"> compile U201414800 sabertazimi Linux 17aa0d73d5e3 4.8.0-46-generic #49~16.04.1-Ubuntu SMP Fri Mar 31 14:51:03 UTC 2017 x86_64 GNU\/Linux 09:13:05 up 6 days, 9:03, 4 users, load average: 0.09, 0.21, 0.35 17096744f6e422e15b73dc9bee56f3952f790d52","message":"> compile\nU201414800\nsabertazimi\nLinux 17aa0d73d5e3 4.8.0-46-generic #49~16.04.1-Ubuntu SMP Fri Mar 31 14:51:03 UTC 2017 x86_64 GNU\/Linux\n 09:13:05 up 6 days, 9:03, 4 users, load average: 0.09, 0.21, 0.35\n17096744f6e422e15b73dc9bee56f3952f790d52\n","repos":"sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab,sabertazimi\/hust-lab","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- nemu\/src\/monitor\/debug\/watchpoint.c\n+++ nemu\/src\/monitor\/debug\/watchpoint.c\n@@ -42,6 +42,7 @@\n \n \/\/ initlize\n strncpy(head->exprStr, exprStr, strlen(exprStr));\n+ head->exprStr[strlen(exprStr)] = '\\0';\n head->oldval = val;\n \n return head;\n"} {"commit":"085badcfdb3e02408376adbe6366f67ac6802a1a","subject":"Renamed some variables.","message":"Renamed some variables.\n","repos":"angeni8\/javascript-bignum,jtobey\/javascript-bignum,jtobey\/javascript-bignum,angeni8\/javascript-bignum,jtobey\/javascript-bignum,angeni8\/javascript-bignum,angeni8\/javascript-bignum,jtobey\/javascript-bignum,angeni8\/javascript-bignum,angeni8\/javascript-bignum,jtobey\/javascript-bignum,jtobey\/javascript-bignum","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gmp-plugin.c\n+++ src\/gmp-plugin.c\n@@ -516,6 +516,24 @@\n \n #define del_mpz_ptr(arg)\n \n+#if 0\n+static bool\n+x_in_new_mpz (NPObject* entry, NPVariant* result, mpz_ptr* arg)\n+{\n+ TopObject* top = CONTAINING (TopObject, Entry_npclass, entry->_class);\n+ Integer* ret = (Integer*) sBrowserFuncs->createobject\n+ (top->instance, &Integer_npclass);\n+\n+ if (!ret) {\n+ sBrowserFuncs->setexception (entry, \"out of memory\");\n+ return false;\n+ }\n+ OBJECT_TO_NPVARIANT (&ret->npobj, *result);\n+ return true;\n+}\n+#define in_new_mpz(XXX)\n+#endif\n+\n \/*\n * Rational objects wrap mpq_t.\n *\/\n@@ -1016,9 +1034,9 @@\n \/* Calls to most functions go through Entry_invokeDefault. *\/\n \n static bool\n-Entry_invokeDefault (NPObject *npobj,\n+Entry_invokeDefault (NPObject *vEntry,\n const NPVariant *args, uint32_t argCount,\n- NPVariant *result)\n+ NPVariant *vResult)\n {\n bool ok = false;\n \n@@ -1043,14 +1061,14 @@\n ARGN(a3);\n ARGN(a4);\n \n- switch (CONTAINING (Entry, npobj, npobj)->number) {\n+ switch (CONTAINING (Entry, npobj, vEntry)->number) {\n \n #define ENTRY1v(name, string, id, t0) \\\n case __LINE__: \\\n+ VOID_TO_NPVARIANT (*vResult); \\\n if (argCount != 1 || !in_ ## t0 (&args[0], &a0 ## t0)) \\\n break; \\\n name (a0 ## t0); \\\n- VOID_TO_NPVARIANT (*result); \\\n ok = true; \\\n del_ ## t0 (a0 ## t0); \\\n break;\n@@ -1059,17 +1077,17 @@\n case __LINE__: \\\n if (argCount != 1 || !in_ ## t0 (&args[0], &a0 ## t0)) \\\n break; \\\n- out_ ## rett (name (a0 ## t0), result); \\\n+ out_ ## rett (name (a0 ## t0), vResult); \\\n ok = true; \\\n del_ ## t0 (a0 ## t0); \\\n break;\n \n #define ENTRY2v(name, string, id, t0, t1) \\\n case __LINE__: \\\n+ VOID_TO_NPVARIANT (*vResult); \\\n if (argCount != 2 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n name (a0 ## t0, a1 ## t1); \\\n- VOID_TO_NPVARIANT (*result); \\\n ok = true; \\\n del_ ## t1 (a1 ## t1); \\\n del0_ ## id: del_ ## t0 (a0 ## t0); \\\n@@ -1079,7 +1097,7 @@\n case __LINE__: \\\n if (argCount != 2 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n- out_ ## rett (name (a0 ## t0, a1 ## t1), result); \\\n+ out_ ## rett (name (a0 ## t0, a1 ## t1), vResult); \\\n ok = true; \\\n del_ ## t1 (a1 ## t1); \\\n del0_ ## id: del_ ## t0 (a0 ## t0); \\\n@@ -1087,11 +1105,11 @@\n \n #define ENTRY3v(name, string, id, t0, t1, t2) \\\n case __LINE__: \\\n+ VOID_TO_NPVARIANT (*vResult); \\\n if (argCount != 3 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n if (!in_ ## t2 (&args[2], &a2 ## t2)) goto del1_ ## id; \\\n name (a0 ## t0, a1 ## t1, a2 ## t2); \\\n- VOID_TO_NPVARIANT (*result); \\\n ok = true; \\\n del_ ## t2 (a2 ## t2); \\\n del1_ ## id: del_ ## t1 (a1 ## t1); \\\n@@ -1103,7 +1121,7 @@\n if (argCount != 3 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n if (!in_ ## t2 (&args[2], &a2 ## t2)) goto del1_ ## id; \\\n- out_ ## rett (name (a0 ## t0, a1 ## t1, a2 ## t2), result); \\\n+ out_ ## rett (name (a0 ## t0, a1 ## t1, a2 ## t2), vResult);\\\n ok = true; \\\n del_ ## t2 (a2 ## t2); \\\n del1_ ## id: del_ ## t1 (a1 ## t1); \\\n@@ -1112,12 +1130,12 @@\n \n #define ENTRY4v(name, string, id, t0, t1, t2, t3) \\\n case __LINE__: \\\n+ VOID_TO_NPVARIANT (*vResult); \\\n if (argCount != 4 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n if (!in_ ## t2 (&args[2], &a2 ## t2)) goto del1_ ## id; \\\n if (!in_ ## t3 (&args[3], &a3 ## t3)) goto del2_ ## id; \\\n name (a0 ## t0, a1 ## t1, a2 ## t2, a3 ## t3); \\\n- VOID_TO_NPVARIANT (*result); \\\n ok = true; \\\n del_ ## t3 (a3 ## t3); \\\n del2_ ## id: del_ ## t2 (a2 ## t2); \\\n@@ -1132,7 +1150,7 @@\n if (!in_ ## t2 (&args[2], &a2 ## t2)) goto del1_ ## id; \\\n if (!in_ ## t3 (&args[3], &a3 ## t3)) goto del2_ ## id; \\\n out_ ## rett (name (a0 ## t0, a1 ## t1, a2 ## t2, \\\n- a3 ## t3), result); \\\n+ a3 ## t3), vResult); \\\n ok = true; \\\n del_ ## t3 (a3 ## t3); \\\n del2_ ## id: del_ ## t2 (a2 ## t2); \\\n@@ -1142,13 +1160,13 @@\n \n #define ENTRY5v(name, string, id, t0, t1, t2, t3, t4) \\\n case __LINE__: \\\n+ VOID_TO_NPVARIANT (*vResult); \\\n if (argCount != 5 || !in_ ## t0 (&args[0], &a0 ## t0)) break; \\\n if (!in_ ## t1 (&args[1], &a1 ## t1)) goto del0_ ## id; \\\n if (!in_ ## t2 (&args[2], &a2 ## t2)) goto del1_ ## id; \\\n if (!in_ ## t3 (&args[3], &a3 ## t3)) goto del2_ ## id; \\\n if (!in_ ## t4 (&args[4], &a4 ## t4)) goto del3_ ## id; \\\n name (a0 ## t0, a1 ## t1, a2 ## t2, a3 ## t3, a4 ## t4); \\\n- VOID_TO_NPVARIANT (*result); \\\n ok = true; \\\n del_ ## t4 (a4 ## t4); \\\n del3_ ## id: del_ ## t3 (a3 ## t3); \\\n@@ -1160,13 +1178,14 @@\n #include \"gmp-entries.h\"\n \n default:\n- sBrowserFuncs->setexception (npobj, \"internal error, bad entry number\");\n- ok = true; \\\n+ sBrowserFuncs->setexception (vEntry,\n+ \"internal error, bad entry number\");\n+ ok = true;\n break;\n }\n \n if (!ok)\n- sBrowserFuncs->setexception (npobj, \"wrong type arguments\");\n+ sBrowserFuncs->setexception (vEntry, \"wrong type arguments\");\n return true;\n }\n \n"} {"commit":"577c5ef7736998ff20b9c9c6a543fd6ceb34486c","subject":"New default constant.","message":"New default constant.\n","repos":"ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools,ubtue\/ub_tools","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- cpp\/lib\/include\/Solr.h\n+++ cpp\/lib\/include\/Solr.h\n@@ -2,7 +2,7 @@\n * \\brief Various utility functions relating to Apache Solr.\n * \\author Dr. Johannes Ruscheinski (johannes.ruscheinski@uni-tuebingen.de)\n *\n- * \\copyright 2016 Universit\u00e4tsbibliothek T\u00fcbingen. All rights reserved.\n+ * \\copyright 2016,2019 Universit\u00e4tsbibliothek T\u00fcbingen. All rights reserved.\n *\n * This program is free software: you can redistribute it and\/or modify\n * it under the terms of the GNU Affero General Public License as\n@@ -28,6 +28,7 @@\n \n constexpr unsigned DEFAULT_TIMEOUT(10); \/\/ in s\n constexpr unsigned JAVA_INT_MAX(2147483647);\n+const std::string DEFAULT_HOST_AND_PORT(\"localhost:8080\");\n \n \n enum QueryResultFormat { XML, JSON };\n@@ -43,7 +44,7 @@\n * \\return True if we got a valid response, else false.\n *\/\n bool Query(const std::string &query, const std::string &fields, std::string * const xml_or_json_result,\n- std::string * const err_msg, const std::string &host_and_port = \"localhost:8080\",\n+ std::string * const err_msg, const std::string &host_and_port = DEFAULT_HOST_AND_PORT,\n const unsigned timeout = DEFAULT_TIMEOUT, const QueryResultFormat query_result_format = XML,\n const unsigned max_no_of_rows = JAVA_INT_MAX);\n \n"} {"commit":"ae48338dc1e678d43debfec4d37b2d84aadb1005","subject":"gtk2: must use 8 for format when we use a character array","message":"gtk2: must use 8 for format when we use a character array\n\nBecause XChangeProperty(3) says:\n\n> If the specified format is 8, the property data must be a char array.\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n+++ gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n@@ -44,12 +44,11 @@\n len = 1;\n } else if(ntype == GDK_SELECTION_TYPE_STRING) {\n dat = (void *)RVAL2CSTR(src);\n+ fmt = 8;\n if (NIL_P(size)) {\n- fmt = sizeof(char) * 8;\n len = RSTRING_LEN(src);\n } else {\n len = NUM2UINT(size);\n- fmt = (RSTRING_LEN(src) \/ len) * 8;\n }\n } else if(ntype == compound_text){\n guchar* str = (guchar*)dat;\n"} {"commit":"bbf507b50732b2e91ccf8a1b71b7a120a802e9c3","subject":"gtk2 rbgtkselectiondata.c: drop GTK_CHECK_VERSION(2,6,0)","message":"gtk2 rbgtkselectiondata.c: drop GTK_CHECK_VERSION(2,6,0)\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n+++ gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n@@ -159,7 +159,6 @@\n return CSTR2RVAL_FREE((gchar *)gtk_selection_data_get_text(_SELF(self)));\n }\n \n-#if GTK_CHECK_VERSION(2,6,0)\n static VALUE\n rg_set_pixbuf(VALUE self, VALUE pixbuf)\n {\n@@ -206,7 +205,6 @@\n }\n return ary;\n }\n-#endif\n \n static VALUE\n rg_targets(VALUE self)\n@@ -226,13 +224,12 @@\n g_free(targets);\n return result;\n }\n-#if GTK_CHECK_VERSION(2,6,0)\n+\n static VALUE\n rg_targets_include_image(VALUE self, VALUE writable)\n {\n return CBOOL2RVAL(gtk_selection_data_targets_include_image(_SELF(self), RVAL2CBOOL(writable)));\n }\n-#endif\n \n static VALUE\n rg_targets_include_text(VALUE self)\n@@ -274,13 +271,11 @@\n RG_DEF_METHOD(text, 0);\n RG_DEF_METHOD(set_text, 1);\n \n-#if GTK_CHECK_VERSION(2,6,0)\n RG_DEF_METHOD(pixbuf, 0);\n RG_DEF_METHOD(set_pixbuf, 1);\n RG_DEF_METHOD(uris, 0);\n RG_DEF_METHOD(set_uris, 1);\n RG_DEF_METHOD(targets_include_image, 1);\n-#endif\n RG_DEF_METHOD(targets, 0);\n RG_DEF_METHOD(targets_include_text, 0);\n #if GTK_CHECK_VERSION(2,10,0)\n"} {"commit":"225715b64230f230cedc31e4d9a769219fe09fa2","subject":"gtk2: use long instead of int","message":"gtk2: use long instead of int\n\nBecause XChangeProperty(3) says:\n\n> If the specified format is 8, the property data must be a char array.\n>\n> If the specified format is 16, the property data must be a short array.\n\n> If the specified format is 32, the property data must be a long array.\n\nIn this case (format is 32 case), we should use a long array instead of\nan int array.\n\nGitHub: #256\n\nPatch by mtasaka. Thanks!!!\n","repos":"kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2,kitachro\/ruby-gnome2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n+++ gtk2\/ext\/gtk2\/rbgtkselectiondata.c\n@@ -36,11 +36,11 @@\n GdkAtom ntype = RVAL2ATOM(type);\n \n if(ntype == GDK_SELECTION_TYPE_INTEGER){\n- int *i;\n- i = ALLOC(int);\n+ glong *i;\n+ i = ALLOC(glong);\n *i = NUM2INT(src);\n dat = i;\n- fmt = sizeof(int) * 8;\n+ fmt = 32;\n len = 1;\n } else if(ntype == GDK_SELECTION_TYPE_STRING) {\n dat = (void *)RVAL2CSTR(src);\n"} {"commit":"d020e489dceeb23f564b1fe20112ac19d1ca2135","subject":"finished tree","message":"finished tree\n","repos":"zhgxun\/cNotes,zhgxun\/cNotes","returncode":1,"stderr":"error: pathspec 'petclub.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- petclub.c\n+++ petclub.c\n@@ -0,0 +1,194 @@\n+#include <stdio.h>\n+#include <string.h>\n+#include <ctype.h>\n+#include \"tree.h\"\n+\n+char menu(void);\n+void addpet(Tree * pt);\n+void droppet(Tree * pt);\n+void showpets(const Tree * pt);\n+void findpet(const Tree * pt);\n+void printitem(Item item);\n+void uppercase(char * st);\n+char * s_gets(char * st, int n);\n+\n+int main(void)\n+{\n+\tTree pets;\n+\tchar choice;\n+\n+\tInitializeTree(&pets);\n+\n+\twhile ((choice = menu()) != 'q') {\n+\t\tswitch (choice) {\n+\t\t\tcase 'a':\n+\t\t\t\taddpet(&pets);\n+\t\t\t\tbreak;\n+\t\t\tcase 'l':\n+\t\t\t\tshowpets(&pets);\n+\t\t\t\tbreak;\n+\t\t\tcase 'f':\n+\t\t\t\tfindpet(&pets);\n+\t\t\t\tbreak;\n+\t\t\tcase 'n':\n+\t\t\t\tprintf(\"%d pets in clud.\\n\", TreeItemCount(&pets));\n+\t\t\t\tbreak;\n+\t\t\tcase 'd':\n+\t\t\t\tdroppet(&pets);\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tputs(\"Switching error\");\n+\t\t}\n+\t}\n+\n+\tDeleteAll(&pets);\n+\n+\tputs(\"Bye.\");\n+\n+\treturn 0;\n+}\n+\n+\/**\n+ * \u9009\u62e9\u83dc\u5355\n+ *\/\n+char menu(void)\n+{\n+\tint ch;\n+\n+\tputs(\"NerFville Pet Club Membership Program\");\n+\tputs(\"Enter the letter corresponding to your choice\");\n+\tputs(\"a) add a pet l) show list of pets\");\n+\tputs(\"n) number of pets f) find pets\");\n+\tputs(\"d) delete a pet q) quit\");\n+\n+\twhile ((ch = getchar()) != EOF) {\n+\t\twhile (getchar() != '\\n') {\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t\/\/ \u8f6c\u5316\u4e3a\u5c0f\u5199\u6bd4\u8f83\n+\t\tch = tolower(ch);\n+\t\tif (strchr(\"alnfdq\", ch) == NULL) {\n+\t\t\tputs(\"Please enter an a, l, n, f, d or q\");\n+\t\t} else {\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\t\/\/ \u4f7f\u7a0b\u5e8f\u7ed3\u675f\n+\tif (ch == EOF) {\n+\t\tch = 'q';\n+\t}\n+\n+\treturn ch;\n+}\n+\n+\/**\n+ * \u6dfb\u52a0\u4e00\u4e2a\u5ba0\u7269\n+ *\/\n+void addpet(Tree * pt)\n+{\n+\tItem temp;\n+\n+\tif (TreeIsFull(pt)) {\n+\t\tputs(\"No room in the clud!\");\n+\t} else {\n+\t\tputs(\"Please enter name of pet:\");\n+\t\ts_gets(temp.petname, SLEN);\n+\t\tputs(\"Please enter pet kind:\");\n+\t\ts_gets(temp.petkind, SLEN);\n+\n+\t\t\/\/ \u5ba0\u7269\u540d\u79f0\u5747\u8f6c\u5316\u4e3a\u5927\u5199\n+\t\tuppercase(temp.petname);\n+\t\tuppercase(temp.petkind);\n+\n+\t\tAddItem(&temp, pt);\n+\t}\n+}\n+\n+\/**\n+ * \u5c55\u793a\u6240\u6709\u5ba0\u7269\n+ *\/\n+void showpets(const Tree * pt)\n+{\n+\tif (TreeIsEmpty(pt)) {\n+\t\tputs(\"No entries\");\n+\t} else {\n+\t\tTraverse(pt, printitem);\n+\t}\n+}\n+\n+\/**\n+ * \u663e\u793a\u4e00\u4e2a\u5ba0\u7269\u7684\u540d\u79f0\u548c\u79cd\u5c5e\n+ *\/\n+void printitem(Item item)\n+{\n+\tprintf(\"Pet: %-19s Kind: %-19s\\n\", item.petname, item.petkind);\n+}\n+\n+\/**\n+ * \u6839\u636e\u5ba0\u7269\u540d\u79f0\u548c\u79cd\u5c5e\u67e5\u627e\u662f\u5426\u662f\u4e00\u4e2a\u5df2\u7ecf\u5b58\u5728\u7684\u6210\u5458\n+ *\/\n+void findpet(const Tree * pt)\n+{\n+\tItem temp;\n+\n+\tif (TreeIsEmpty(pt)) {\n+\t\tputs(\"No entries\");\n+\t\treturn;\n+\t}\n+\n+\tputs(\"Please enter name of pet you wish to find:\");\n+\ts_gets(temp.petname, SLEN);\n+\tputs(\"Please enter pet kind:\");\n+\ts_gets(temp.petkind, SLEN);\n+\n+\tuppercase(temp.petname);\n+\tuppercase(temp.petkind);\n+\n+\tprintf(\"%s the %s \", temp.petname, temp.petkind);\n+\tif (InTree(&temp, pt)) {\n+\t\tprintf(\"is a member.\\n\");\n+\t} else {\n+\t\tprintf(\"is not a member.\\n\");\n+\t}\n+}\n+\n+\/**\n+ * \u5220\u9664\u4e00\u4e2a\u5ba0\u7269\n+ *\/\n+void droppet(Tree * pt)\n+{\n+\tItem temp;\n+\n+\tif (TreeIsEmpty(pt)) {\n+\t\tputs(\"No entries\");\n+\t\treturn;\n+\t}\n+\n+\tputs(\"Please enter name of pet you wish to find:\");\n+\ts_gets(temp.petname, SLEN);\n+\tputs(\"Please enter pet kind:\");\n+\ts_gets(temp.petkind, SLEN);\n+\n+\tuppercase(temp.petname);\n+\tuppercase(temp.petkind);\n+\n+\tprintf(\"%s the %s \", temp.petname, temp.petkind);\n+\tif (DeleteItem(&temp, pt)) {\n+\t\tprintf(\"is dropped from the clud.\\n\");\n+\t} else {\n+\t\tprintf(\"is not a member.\\n\");\n+\t}\n+}\n+\n+\/**\n+ * \u5c06\u5b57\u7b26\u8f6c\u4e3a\u5927\u5199\n+ *\/\n+void uppercase(char * str)\n+{\n+\twhile (*str) {\n+\t\t*str = toupper(*str);\n+\t\tstr++;\n+\t}\n+}\n"} {"commit":"c083b7362bdeda037755de22de5129187e542c31","subject":"remove unnecessary checks","message":"remove unnecessary checks\n","repos":"GUI\/nginx-upstream-dynamic-servers,GUI\/nginx-upstream-dyanmic-servers,GUI\/nginx-upstream-dyanmic-servers,wandenberg\/nginx-upstream-dynamic-servers,wandenberg\/nginx-upstream-dynamic-servers,GUI\/nginx-upstream-dynamic-servers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ngx_http_upstream_dynamic_servers.c\n+++ ngx_http_upstream_dynamic_servers.c\n@@ -321,41 +321,35 @@\n }\n \n static ngx_int_t ngx_http_upstream_dynamic_servers_init_process(ngx_cycle_t *cycle) {\n+ ngx_http_upstream_dynamic_server_main_conf_t *udsmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_upstream_dynamic_servers_module);\n+ ngx_http_upstream_dynamic_server_conf_t *dynamic_server = udsmcf->dynamic_servers.elts;\n ngx_uint_t i;\n- ngx_http_upstream_dynamic_server_conf_t *dynamic_server;\n ngx_event_t *timer;\n ngx_uint_t refresh_in;\n+\n+ for (i = 0; i < udsmcf->dynamic_servers.nelts; i++) {\n+ timer = &dynamic_server[i].timer;\n+ timer->handler = ngx_http_upstream_dynamic_server_resolve;\n+ timer->log = cycle->log;\n+ timer->data = &dynamic_server[i];\n+\n+ refresh_in = ngx_random() % 1000;\n+ ngx_log_debug(NGX_LOG_DEBUG_CORE, cycle->log, 0, \"upstream-dynamic-servers: Initial DNS refresh of '%V' in %ims\", &dynamic_server[i].host, refresh_in);\n+ ngx_add_timer(timer, refresh_in);\n+ }\n+\n+ return NGX_OK;\n+}\n+\n+static void ngx_http_upstream_dynamic_servers_exit_process(ngx_cycle_t *cycle) {\n ngx_http_upstream_dynamic_server_main_conf_t *udsmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_upstream_dynamic_servers_module);\n-\n- if (udsmcf->dynamic_servers.nelts > 0) {\n- dynamic_server = udsmcf->dynamic_servers.elts;\n- for (i = 0; i < udsmcf->dynamic_servers.nelts; i++) {\n- timer = &dynamic_server[i].timer;\n- timer->handler = ngx_http_upstream_dynamic_server_resolve;\n- timer->log = cycle->log;\n- timer->data = &dynamic_server[i];\n-\n- refresh_in = ngx_random() % 1000;\n- ngx_log_debug(NGX_LOG_DEBUG_CORE, cycle->log, 0, \"upstream-dynamic-servers: Initial DNS refresh of '%V' in %ims\", &dynamic_server[i].host, refresh_in);\n- ngx_add_timer(timer, refresh_in);\n- }\n- }\n-\n- return NGX_OK;\n-}\n-\n-static void ngx_http_upstream_dynamic_servers_exit_process(ngx_cycle_t *cycle) {\n+ ngx_http_upstream_dynamic_server_conf_t *dynamic_server = udsmcf->dynamic_servers.elts;\n ngx_uint_t i;\n- ngx_http_upstream_dynamic_server_conf_t *dynamic_server;\n- ngx_http_upstream_dynamic_server_main_conf_t *udsmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_upstream_dynamic_servers_module);\n-\n- if (udsmcf->dynamic_servers.nelts > 0) {\n- dynamic_server = udsmcf->dynamic_servers.elts;\n- for (i = 0; i < udsmcf->dynamic_servers.nelts; i++) {\n- if (dynamic_server[i].pool) {\n- ngx_destroy_pool(dynamic_server[i].pool);\n- dynamic_server[i].pool = NULL;\n- }\n+\n+ for (i = 0; i < udsmcf->dynamic_servers.nelts; i++) {\n+ if (dynamic_server[i].pool) {\n+ ngx_destroy_pool(dynamic_server[i].pool);\n+ dynamic_server[i].pool = NULL;\n }\n }\n }\n"} {"commit":"9f8fab797bc491a5cf8e406b4f0a156912cdaa3a","subject":"nimble\/ll: Remove redundant variable in local scope","message":"nimble\/ll: Remove redundant variable in local scope\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_conn.c\n+++ nimble\/controller\/src\/ble_ll_conn.c\n@@ -2080,7 +2080,6 @@\n connsm->anchor_point += connsm->conn_itvl_ticks;\n connsm->anchor_point_usecs += connsm->conn_itvl_usecs;\n } else {\n- uint32_t ticks;\n ticks = os_cputime_usecs_to_ticks(itvl);\n connsm->anchor_point += ticks;\n connsm->anchor_point_usecs += (itvl - os_cputime_ticks_to_usecs(ticks));\n"} {"commit":"ef7803a1d7634003c8d0e427967daa2e1643fc66","subject":"nimble\/controller: Initiate data length update if remote supports it","message":"nimble\/controller: Initiate data length update if remote supports it\n\nWe initiate data length update procedure as soon as we receive features\nfrom remote and know that this is supported on connection.\n\nThis fixes issue with some crippled controllers which do not indicate\nDLE support but will reply with LL_LENGTH_RSP but with broken payload\n(e.g. the one in Sony Xperia Z5). This would result in LL timeout since\nwe properly ignore broken PDU.\n\nX-Original-Commit: 456682623f454710824ad97213ab7576ddeca4e9\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_ctrl.c\n+++ nimble\/controller\/src\/ble_ll_ctrl.c\n@@ -1517,6 +1517,27 @@\n return rsp_opcode;\n }\n \n+static void\n+ble_ll_ctrl_initiate_dle(struct ble_ll_conn_sm *connsm)\n+{\n+ if (!(connsm->conn_features & BLE_LL_FEAT_DATA_LEN_EXT)) {\n+ return;\n+ }\n+\n+ \/*\n+ * Section 4.5.10 Vol 6 PART B. If the max tx\/rx time or octets\n+ * exceeds the minimum, data length procedure needs to occur\n+ *\/\n+ if ((connsm->max_tx_octets <= BLE_LL_CONN_SUPP_BYTES_MIN) &&\n+ (connsm->max_rx_octets <= BLE_LL_CONN_SUPP_BYTES_MIN) &&\n+ (connsm->max_tx_time <= BLE_LL_CONN_SUPP_TIME_MIN) &&\n+ (connsm->max_rx_time <= BLE_LL_CONN_SUPP_TIME_MIN)) {\n+ return;\n+ }\n+\n+ ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);\n+}\n+\n \/**\n * Called when we receive a feature request or a slave initiated feature\n * request.\n@@ -1569,8 +1590,11 @@\n put_le32(rspbuf + 1, our_feat);\n rspbuf[1] = connsm->conn_features;\n \n- \/* We now have remote features *\/\n- connsm->csmflags.cfbit.rxd_features = 1;\n+ \/* If this is the first time we received remote features, try to start DLE *\/\n+ if (!connsm->csmflags.cfbit.rxd_features) {\n+ ble_ll_ctrl_initiate_dle(connsm);\n+ connsm->csmflags.cfbit.rxd_features = 1;\n+ }\n \n return rsp_opcode;\n }\n@@ -2220,8 +2244,11 @@\n case BLE_LL_CTRL_FEATURE_RSP:\n connsm->conn_features = dptr[0];\n memcpy(connsm->remote_features, dptr + 1, 7);\n- \/* We now have remote features *\/\n- connsm->csmflags.cfbit.rxd_features = 1;\n+ \/* If this is the first time we received remote features, try to start DLE *\/\n+ if (!connsm->csmflags.cfbit.rxd_features) {\n+ ble_ll_ctrl_initiate_dle(connsm);\n+ connsm->csmflags.cfbit.rxd_features = 1;\n+ }\n \/* Stop the control procedure *\/\n if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG)) {\n ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);\n"} {"commit":"3e1edfc9d9aa54ac789dbed99b0ecfc55aba879c","subject":"Fixing buffer size estimate comment.","message":"Fixing buffer size estimate comment.\n","repos":"dvorka\/hstr,dvorka\/hstr,dragon788\/hstr,dvorka\/hstr,dvorka\/hstr,jlec\/hstr,dragon788\/hstr,tbabej\/hstr,tbabej\/hstr,dvorka\/hstr,jlec\/hstr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/hstr_utils.c\n+++ src\/hstr_utils.c\n@@ -13,7 +13,7 @@\n \n #define DEFAULT_COMMAND \"pwd\"\n #define PROC_HOSTNAME \"\/proc\/sys\/kernel\/hostname\"\n-\/\/ TODO PID_BUFFER 11+ characters might be enough\n+\/\/ TODO PID_BUFFER 20+ characters might be enough\n #define PID_BUFFER_SIZE 128\n \n \/\/ strdup() not in ISO C\n"} {"commit":"9a790bc985427b32e03f67ae9c62b010a6974fd1","subject":"nimble\/ll: Refactor ble_ll_scan_set_enable","message":"nimble\/ll: Refactor ble_ll_scan_set_enable\n\nThis is in preparation for adding duration\/period support.\nMakes disable and already enabled a special case with early exit.\n","repos":"apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble,apache\/mynewt-nimble","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- nimble\/controller\/src\/ble_ll_scan.c\n+++ nimble\/controller\/src\/ble_ll_scan.c\n@@ -2724,7 +2724,6 @@\n int\n ble_ll_scan_set_enable(uint8_t *cmd, uint8_t ext)\n {\n- int rc;\n uint8_t filter_dups;\n uint8_t enable;\n struct ble_ll_scan_sm *scansm;\n@@ -2743,6 +2742,7 @@\n \n scansm = &g_ble_ll_scan_sm;\n \n+ \/* we can do that here since value will never change until reset *\/\n scansm->ext_scanning = ext;\n \n if (ext) {\n@@ -2754,56 +2754,56 @@\n (void) period;\n }\n \n- rc = BLE_ERR_SUCCESS;\n- if (enable) {\n- \/* If already enabled, do nothing *\/\n- if (!scansm->scan_enabled) {\n-\n- scansm->cur_phy = PHY_NOT_CONFIGURED;\n- scansm->next_phy = PHY_NOT_CONFIGURED;\n-\n- for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {\n- scanphy = &scansm->phy_data[i];\n- scanp = &g_ble_ll_scan_params[i];\n-\n- if (!scanp->configured) {\n- continue;\n- }\n-\n- scanphy->configured = scanp->configured;\n- scanphy->scan_type = scanp->scan_type;\n- scanphy->scan_itvl = scanp->scan_itvl;\n- scanphy->scan_window = scanp->scan_window;\n- scanphy->scan_filt_policy = scanp->scan_filt_policy;\n- scanphy->own_addr_type = scanp->own_addr_type;\n- scansm->scan_filt_dups = filter_dups;\n-\n- if (scansm->cur_phy == PHY_NOT_CONFIGURED) {\n- scansm->cur_phy = i;\n- } else {\n- scansm->next_phy = i;\n- }\n- }\n-\n- rc = ble_ll_scan_sm_start(scansm);\n- } else {\n- \/* Controller does not allow initiating and scanning.*\/\n- for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {\n- scanphy = &scansm->phy_data[i];\n- if (scanphy->configured &&\n- scanphy->scan_type == BLE_SCAN_TYPE_INITIATE) {\n- rc = BLE_ERR_CMD_DISALLOWED;\n- break;\n- }\n- }\n- }\n- } else {\n+ \/* disable*\/\n+ if (!enable) {\n if (scansm->scan_enabled) {\n ble_ll_scan_sm_stop(1);\n }\n- }\n-\n- return rc;\n+\n+ return BLE_ERR_SUCCESS;\n+ }\n+\n+ \/* if already enable we just need to update parameters *\/\n+ if (scansm->scan_enabled) {\n+ \/* Controller does not allow initiating and scanning.*\/\n+ for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {\n+ scanphy = &scansm->phy_data[i];\n+ if (scanphy->configured &&\n+ scanphy->scan_type == BLE_SCAN_TYPE_INITIATE) {\n+ return BLE_ERR_CMD_DISALLOWED;\n+ }\n+ }\n+\n+ return BLE_ERR_SUCCESS;\n+ }\n+\n+ scansm->scan_filt_dups = filter_dups;\n+ scansm->cur_phy = PHY_NOT_CONFIGURED;\n+ scansm->next_phy = PHY_NOT_CONFIGURED;\n+\n+ for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {\n+ scanphy = &scansm->phy_data[i];\n+ scanp = &g_ble_ll_scan_params[i];\n+\n+ if (!scanp->configured) {\n+ continue;\n+ }\n+\n+ scanphy->configured = scanp->configured;\n+ scanphy->scan_type = scanp->scan_type;\n+ scanphy->scan_itvl = scanp->scan_itvl;\n+ scanphy->scan_window = scanp->scan_window;\n+ scanphy->scan_filt_policy = scanp->scan_filt_policy;\n+ scanphy->own_addr_type = scanp->own_addr_type;\n+\n+ if (scansm->cur_phy == PHY_NOT_CONFIGURED) {\n+ scansm->cur_phy = i;\n+ } else {\n+ scansm->next_phy = i;\n+ }\n+ }\n+\n+ return ble_ll_scan_sm_start(scansm);\n }\n \n \/**\n"} {"commit":"fdff60f093a7cb2c99abe1abcc52ee8f982b0651","subject":"GabbleIMFactory: implement foreach_channel_class","message":"GabbleIMFactory: implement foreach_channel_class\n\n\n20080730183424-53eee-b0e6d8cd77a4ff14bd4ff1dd194cdd037440d01c.gz\n","repos":"mlundblad\/telepathy-gabble,jku\/telepathy-gabble,jku\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/im-factory.c\n+++ src\/im-factory.c\n@@ -530,6 +530,43 @@\n }\n \n \n+static const gchar * const im_channel_required_properties[] = {\n+ TP_IFACE_CHANNEL \".TargetHandle\",\n+ NULL\n+};\n+\n+\n+static const gchar * const im_channel_optional_properties[] = {\n+ NULL\n+};\n+\n+\n+static void\n+gabble_im_factory_foreach_channel_class (GabbleChannelManager *manager,\n+ GabbleChannelManagerChannelClassFunc func,\n+ gpointer user_data)\n+{\n+ GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,\n+ NULL, (GDestroyNotify) tp_g_value_slice_free);\n+ GValue *value;\n+\n+ value = tp_g_value_slice_new (G_TYPE_STRING);\n+ g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_TEXT);\n+ g_hash_table_insert (table, TP_IFACE_CHANNEL \".ChannelType\",\n+ value);\n+\n+ value = tp_g_value_slice_new (G_TYPE_UINT);\n+ g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);\n+ g_hash_table_insert (table, TP_IFACE_CHANNEL \".TargetHandleType\",\n+ value);\n+\n+ func (manager, table, im_channel_required_properties,\n+ im_channel_optional_properties, user_data);\n+\n+ g_hash_table_destroy (table);\n+}\n+\n+\n static gboolean\n gabble_im_factory_requestotron (GabbleImFactory *self,\n gpointer request_token,\n@@ -633,6 +670,7 @@\n GabbleChannelManagerIface *iface = g_iface;\n \n iface->foreach_channel = gabble_im_factory_foreach_channel;\n+ iface->foreach_channel_class = gabble_im_factory_foreach_channel_class;\n iface->create_channel = gabble_im_factory_create_channel;\n iface->request_channel = gabble_im_factory_request_channel;\n }\n"} {"commit":"5c484febaf6e0f7eb01336c696f315f8b1e79eee","subject":"inhibit (power management) : supports gnome-session >= 2.27","message":"inhibit (power management) : supports gnome-session >= 2.27\n\nGNOME went away from freedesktop DBus interface some time ago (for the sake of being 'special' ?)\nUnfortunately that means we have to support 2 different (but very similar) interfaces\n","repos":"jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/misc\/inhibit.c\n+++ modules\/misc\/inhibit.c\n@@ -42,17 +42,34 @@\n \n #include <dbus\/dbus.h>\n \n-#define PM_SERVICE \"org.freedesktop.PowerManagement\"\n-#define PM_PATH \"\/org\/freedesktop\/PowerManagement\/Inhibit\"\n-#define PM_INTERFACE \"org.freedesktop.PowerManagement.Inhibit\"\n+enum {\n+ FREEDESKTOP = 0, \/* as used by KDE and gnome <= 2.26 *\/\n+ GNOME = 1, \/* as used by gnome > 2.26 *\/\n+};\n+\n+static const char *dbus_service[] = {\n+ [FREEDESKTOP] = \"org.freedesktop.PowerManagement\",\n+ [GNOME] = \"org.gnome.SessionManager\",\n+};\n+\n+static const char *dbus_path[] = {\n+ [FREEDESKTOP] = \"\/org\/freedesktop\/PowerManagement\",\n+ [GNOME] = \"\/org\/gnome\/SessionManager\",\n+};\n+\n+static const char *dbus_interface[] = {\n+ [FREEDESKTOP] = \"org.freedesktop.PowerManagement.Inhibit\",\n+ [GNOME] = \"org.gnome.SessionManager\",\n+};\n+\n \n \/*****************************************************************************\n * Local prototypes\n- *****************************************************************************\/\n+ !*****************************************************************************\/\n static int Activate ( vlc_object_t * );\n static void Deactivate ( vlc_object_t * );\n \n-static void UnInhibit( intf_thread_t *p_intf );\n+static void UnInhibit( intf_thread_t *p_intf, int type );\n \n static int InputChange( vlc_object_t *, const char *,\n vlc_value_t, vlc_value_t, void * );\n@@ -64,7 +81,7 @@\n playlist_t *p_playlist;\n vlc_object_t *p_input;\n DBusConnection *p_conn;\n- dbus_uint32_t i_cookie;\n+ dbus_uint32_t i_cookie[2];\n };\n \n \/*****************************************************************************\n@@ -89,7 +106,8 @@\n if( !p_sys )\n return VLC_ENOMEM;\n \n- p_sys->i_cookie = 0;\n+ p_sys->i_cookie[FREEDESKTOP] = 0;\n+ p_sys->i_cookie[GNOME] = 0;\n p_sys->p_input = NULL;\n \n dbus_error_init( &error );\n@@ -124,8 +142,10 @@\n vlc_object_release( p_sys->p_input );\n }\n \n- if( p_sys->i_cookie )\n- UnInhibit( p_intf );\n+ if( p_sys->i_cookie[FREEDESKTOP] )\n+ UnInhibit( p_intf, FREEDESKTOP );\n+ if( p_sys->i_cookie[GNOME] )\n+ UnInhibit( p_intf, GNOME );\n dbus_connection_unref( p_sys->p_conn );\n \n free( p_sys );\n@@ -134,26 +154,42 @@\n \/*****************************************************************************\n * Inhibit: Notify the power management daemon that it shouldn't suspend\n * the computer because of inactivity\n- *\n- * returns false if Out of memory, else true\n- *****************************************************************************\/\n-static void Inhibit( intf_thread_t *p_intf )\n-{\n- intf_sys_t *p_sys = p_intf->p_sys;\n-\n- DBusMessage *msg = dbus_message_new_method_call( PM_SERVICE, PM_PATH,\n- PM_INTERFACE, \"Inhibit\" );\n+ *****************************************************************************\/\n+static void Inhibit( intf_thread_t *p_intf, int type )\n+{\n+ intf_sys_t *p_sys = p_intf->p_sys;\n+\n+ DBusMessage *msg = dbus_message_new_method_call(\n+ dbus_service[type], dbus_path[type], dbus_interface[type], \"Inhibit\" );\n if( unlikely(msg == NULL) )\n return;\n \n const char *app = PACKAGE;\n const char *reason = _(\"Playing some media.\");\n \n- p_sys->i_cookie = 0;\n-\n- if( !dbus_message_append_args( msg, DBUS_TYPE_STRING, &app,\n+ p_sys->i_cookie[type] = 0;\n+\n+ dbus_bool_t ret;\n+ dbus_uint32_t xid = 0; \/\/ FIXME?\n+ dbus_uint32_t flags = 8 \/* Inhibit suspending the session or computer *\/\n+ | 4;\/* Inhibit the session being marked as idle *\/\n+ switch( type ) {\n+ case FREEDESKTOP:\n+ ret = dbus_message_append_args( msg, DBUS_TYPE_STRING, &app,\n DBUS_TYPE_STRING, &reason,\n- DBUS_TYPE_INVALID ) )\n+ DBUS_TYPE_INVALID );\n+ break;\n+ case GNOME:\n+ default:\n+ ret = dbus_message_append_args( msg, DBUS_TYPE_STRING, &app,\n+ DBUS_TYPE_UINT32, &xid,\n+ DBUS_TYPE_STRING, &reason,\n+ DBUS_TYPE_UINT32, &flags,\n+ DBUS_TYPE_INVALID );\n+ break;\n+ }\n+\n+ if( !ret )\n {\n dbus_message_unref( msg );\n return;\n@@ -175,32 +211,30 @@\n if( dbus_message_get_args( reply, NULL,\n DBUS_TYPE_UINT32, &i_cookie,\n DBUS_TYPE_INVALID ) )\n- p_sys->i_cookie = i_cookie;\n+ p_sys->i_cookie[type] = i_cookie;\n \n dbus_message_unref( reply );\n }\n \n \/*****************************************************************************\n * UnInhibit: Notify the power management daemon that we aren't active anymore\n- *\n- * returns false if Out of memory, else true\n- *****************************************************************************\/\n-static void UnInhibit( intf_thread_t *p_intf )\n-{\n- intf_sys_t *p_sys = p_intf->p_sys;\n-\n- DBusMessage *msg = dbus_message_new_method_call( PM_SERVICE, PM_PATH,\n- PM_INTERFACE, \"UnInhibit\" );\n+ *****************************************************************************\/\n+static void UnInhibit( intf_thread_t *p_intf, int type )\n+{\n+ intf_sys_t *p_sys = p_intf->p_sys;\n+\n+ DBusMessage *msg = dbus_message_new_method_call( dbus_service[type],\n+ dbus_path[type], dbus_interface[type], \"UnInhibit\" );\n if( unlikely(msg == NULL) )\n return;\n \n- dbus_uint32_t i_cookie = p_sys->i_cookie;\n+ dbus_uint32_t i_cookie = p_sys->i_cookie[type];\n if( dbus_message_append_args( msg, DBUS_TYPE_UINT32, &i_cookie,\n DBUS_TYPE_INVALID )\n && dbus_connection_send( p_sys->p_conn, msg, NULL ) )\n {\n dbus_connection_flush( p_sys->p_conn );\n- p_sys->i_cookie = 0;\n+ p_sys->i_cookie[type] = 0;\n }\n dbus_message_unref( msg );\n }\n@@ -210,18 +244,24 @@\n vlc_value_t prev, vlc_value_t value, void *data )\n {\n intf_thread_t *p_intf = data;\n+ intf_sys_t *p_sys = p_intf->p_sys;\n const int old = prev.i_int, cur = value.i_int;\n \n if( ( old == PLAYING_S ) == ( cur == PLAYING_S ) )\n return VLC_SUCCESS; \/* No interesting change *\/\n \n- if( ( p_intf->p_sys->i_cookie != 0 ) == ( cur == PLAYING_S ) )\n- return VLC_SUCCESS; \/* Already in correct state *\/\n-\n- if( cur == PLAYING_S )\n- Inhibit( p_intf );\n- else\n- UnInhibit( p_intf );\n+ if( cur == PLAYING_S ) {\n+ if (p_sys->i_cookie[FREEDESKTOP] == 0)\n+ Inhibit( p_intf, FREEDESKTOP );\n+ if (p_sys->i_cookie[GNOME] == 0)\n+ Inhibit( p_intf, GNOME );\n+ }\n+ else {\n+ if (p_sys->i_cookie[FREEDESKTOP] != 0)\n+ UnInhibit( p_intf, FREEDESKTOP );\n+ if (p_sys->i_cookie[GNOME] != 0)\n+ UnInhibit( p_intf, GNOME );\n+ }\n \n (void)p_input; (void)var; (void)prev;\n return VLC_SUCCESS;\n"} {"commit":"73fcb2e1bb8da627f32a952781b33f4c5521ccc8","subject":"Fix interface filtering for Windows","message":"Fix interface filtering for Windows\n\nThe mentioned fix is not only needed for MSVC, but when\ncross-compiling for Windows with mingw-w64 too.\n","repos":"mrjimenez\/pupnp,mrjimenez\/pupnp,mrjimenez\/pupnp,mrjimenez\/pupnp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- upnp\/src\/api\/upnpapi.c\n+++ upnp\/src\/api\/upnpapi.c\n@@ -3360,9 +3360,8 @@\n \t\t}\n \t\tif (ifname_found == 0) {\n \t\t\t\/* We have found a valid interface name. Keep it. *\/\n-#ifdef UPNP_USE_MSVCPP\n \t\t\t\/*\n-\t\t\t * Partial fix for VC - friendly name is wchar string,\n+\t\t\t * Partial fix for Windows: Friendly name is wchar string,\n \t\t\t * but currently gIF_NAME is char string. For now try\n \t\t\t * to convert it, which will work with many (but not\n \t\t\t * all) adapters. A full fix would require a lot of\n@@ -3370,16 +3369,10 @@\n \t\t\t *\/\n \t\t\twcstombs(gIF_NAME, adapts_item->FriendlyName,\n \t\t\t\tsizeof(gIF_NAME));\n-#else \/* UPNP_USE_MSVCPP *\/\n-\t\t\tmemset(gIF_NAME, 0, sizeof(gIF_NAME));\n-\t\t\tstrncpy(gIF_NAME, adapts_item->FriendlyName,\n-\t\t\t\tsizeof(gIF_NAME) - 1);\n-#endif \/* UPNP_USE_MSVCPP *\/\n \t\t\tifname_found = 1;\n \t\t} else {\n-#ifdef UPNP_USE_MSVCPP\n \t\t\t\/*\n-\t\t\t * Partial fix for VC - friendly name is wchar string,\n+\t\t\t * Partial fix for Windows: Friendly name is wchar string,\n \t\t\t * but currently gIF_NAME is char string. For now try\n \t\t\t * to convert it, which will work with many (but not\n \t\t\t * all) adapters. A full fix would require a lot of\n@@ -3394,14 +3387,6 @@\n \t\t\t\t\/* This is not the interface we're looking for. *\/\n \t\t\t\tcontinue;\n \t\t\t}\n-#else \/* UPNP_USE_MSVCPP *\/\n-\t\t\tif (strncmp\n-\t\t\t (gIF_NAME, adapts_item->FriendlyName,\n-\t\t\t sizeof(gIF_NAME)) != 0) {\n-\t\t\t\t\/* This is not the interface we're looking for. *\/\n-\t\t\t\tcontinue;\n-\t\t\t}\n-#endif \/* UPNP_USE_MSVCPP *\/\n \t\t}\n \t\t\/* Loop thru this adapter's unicast IP addresses. *\/\n \t\tuni_addr = adapts_item->FirstUnicastAddress;\n"} {"commit":"792c144ba62840309b90ba7fd6ad0e14c1f7f501","subject":"more doc for shell interface","message":"more doc for shell interface\n","repos":"aurelijusb\/arangodb,mujiansu\/arangodb,morsdatum\/ArangoDB,nekulin\/arangodb,nekulin\/arangodb,razvanphp\/arangodb,nvoron23\/arangodb,razvanphp\/arangodb,mujiansu\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,aurelijusb\/arangodb,nekulin\/arangodb,morsdatum\/ArangoDB,abaditsegay\/arangodb,nekulin\/arangodb,nvoron23\/arangodb,nekulin\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,abaditsegay\/arangodb,morsdatum\/ArangoDB,razvanphp\/arangodb,mujiansu\/arangodb,morsdatum\/ArangoDB,kkdd\/arangodb,nekulin\/arangodb,mujiansu\/arangodb,aurelijusb\/arangodb,pekeler\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,aurelijusb\/arangodb,morsdatum\/ArangoDB,kkdd\/arangodb,morsdatum\/ArangoDB,pekeler\/arangodb,kkdd\/arangodb,kkdd\/arangodb,nvoron23\/arangodb,razvanphp\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,mujiansu\/arangodb,nvoron23\/arangodb,nekulin\/arangodb,aurelijusb\/arangodb,pekeler\/arangodb,razvanphp\/arangodb,razvanphp\/arangodb,aurelijusb\/arangodb,razvanphp\/arangodb,mujiansu\/arangodb,morsdatum\/ArangoDB,nvoron23\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,pekeler\/arangodb,kkdd\/arangodb,kkdd\/arangodb,kkdd\/arangodb,nvoron23\/arangodb,pekeler\/arangodb,kkdd\/arangodb,razvanphp\/arangodb,abaditsegay\/arangodb,morsdatum\/ArangoDB,abaditsegay\/arangodb,aurelijusb\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,abaditsegay\/arangodb,pekeler\/arangodb,pekeler\/arangodb,mujiansu\/arangodb,nekulin\/arangodb,abaditsegay\/arangodb,aurelijusb\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,morsdatum\/ArangoDB,razvanphp\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,razvanphp\/arangodb,morsdatum\/ArangoDB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- js\/server\/js-server.h\n+++ js\/server\/js-server.h\n@@ -152,15 +152,21 @@\n \"\/\/\/\\n\"\n \"\/\/\/ @FUN{db._drop(@FA{collection})}\\n\"\n \"\/\/\/\\n\"\n- \"\/\/\/ Drops a collection and all its indexes.\\n\"\n+ \"\/\/\/ Drops a @FA{collection} and all its indexes.\\n\"\n \"\/\/\/\\n\"\n \"\/\/\/ @FUN{db._drop(@FA{collection-name})}\\n\"\n \"\/\/\/\\n\"\n- \"\/\/\/ Drops a collection and all its indexes.\\n\"\n+ \"\/\/\/ Drops a collection named @FA{collection-name} and all its indexes.\\n\"\n \"\/\/\/\\n\"\n \"\/\/\/ @EXAMPLES\\n\"\n \"\/\/\/\\n\"\n- \"\/\/\/ @verbinclude shell_collection-drop\\n\"\n+ \"\/\/\/ Drops a collection:\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @verbinclude shell_collection-drop-db\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Drops a collection identified by name:\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @verbinclude shell_collection-drop-name-db\\n\"\n \"\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\\n\"\n \"\\n\"\n \"AvocadoDatabase.prototype._drop = function(name) {\\n\"\n@@ -181,6 +187,25 @@\n \"\\n\"\n \"\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\\n\"\n \"\/\/\/ @brief truncates a collection\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @FUN{db._truncate(@FA{collection})}\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a @FA{collection}, removing all documents but keeping all its\\n\"\n+ \"\/\/\/ indexes.\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @FUN{db._truncate(@FA{collection-name})}\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a collection named @FA{collection-name}.\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @EXAMPLES\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a collection:\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @verbinclude shell_collection-truncate-db\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a collection identified by name:\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @verbinclude shell_collection-truncate-name-db\\n\"\n \"\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\\n\"\n \"\\n\"\n \"AvocadoDatabase.prototype._truncate = function(name) {\\n\"\n@@ -286,6 +311,17 @@\n \"\\n\"\n \"\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\\n\"\n \"\/\/\/ @brief truncates a collection\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @FUN{@FA{collection}.truncate()}\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a @FA{collection}, removing all documents but keeping all its\\n\"\n+ \"\/\/\/ indexes.\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @EXAMPLES\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ Truncates a collection:\\n\"\n+ \"\/\/\/\\n\"\n+ \"\/\/\/ @verbinclude shell_collection-truncate\\n\"\n \"\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\\n\"\n \"\\n\"\n \"AvocadoCollection.prototype.truncate = function() {\\n\"\n"} {"commit":"915166be12382c1b91deee4458f84af9c7409865","subject":"Correctly backspace over number N that preceeds macros.","message":"Correctly backspace over number N that preceeds macros.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/more\/command.c\n+++ usr.bin\/more\/command.c\n@@ -149,9 +149,8 @@\n \tint c; \/* The character to process *\/\n \tchar *bufbeg; \/* The buffer to add the character to *\/\n \tchar **bufcur; \/* The position at which to add the character *\/\n-\tchar *bufend; \/* The last spot available in the buffer --- remember\n-\t * to leave one after bufend for the '\\0'! (You must\n-\t * add the '\\0' yourself!!) *\/\n+\tchar *bufend; \/* One after the last address available in the buffer.\n+\t * No character will be placed into *bufend. *\/\n {\n \tif (c == erase_char)\n \t\treturn(cmd_erase(bufbeg, bufcur));\n@@ -583,8 +582,11 @@\n \t\t\tcontinue; \/* process the sigs *\/\n \t\t}\n \n-\t\tif (Nstate == GETTING && !isdigit(c)) {\n-\t\t\t\/* mark the end of an input number N, if any *\/\n+\t\tif (Nstate == GETTING && !isdigit(c)\n+\t\t && c != erase_char && c != werase_char && c != kill_char) {\n+\t\t\t\/*\n+\t\t\t * Mark the end of an input number N, if any.\n+\t\t\t *\/\n \n \t\t\tif (!*inbuf) {\n \t\t\t\t\/* We never actually got an input number *\/\n@@ -596,9 +598,12 @@\n \t\t\t*inbuf = '\\0';\n \t\t\tincur = inbuf;\n \t\t}\n-\t\tcmd_char(c, inbuf, &incur, inbuf + sizeof(inbuf) - 1);\n+\t\t(void) cmd_char(c, inbuf, &incur, inbuf + sizeof(inbuf) - 1);\n \t\t*incur = '\\0';\n-\t\tif (*inbuf) prmpt(inbuf);\n+\t\tif (*inbuf)\n+\t\t\tprmpt(inbuf);\n+\t\telse\n+\t\t\tNstate = GETTING; \/* abort command *\/\n \n \t\tif (Nstate == GETTING) {\n \t\t\t\/* Still reading in the number N ... don't want to\n"} {"commit":"82b18a4bfe88114e39260d80800476d91272b7b4","subject":"Fix int\/size_t mismatch for sysctl arguments. Try not to introduce more unsorting.","message":"Fix int\/size_t mismatch for sysctl arguments. Try not to introduce more\nunsorting.\n\nReviewed by:\tbde (unsorted version)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/kgmon\/kgmon.c\n+++ usr.sbin\/kgmon\/kgmon.c\n@@ -190,7 +190,8 @@\n \tchar *kmemf;\n \tstruct kvmvars *kvp;\n {\n-\tint mib[3], state, size, openmode;\n+\tsize_t size;\n+\tint mib[3], state, openmode;\n \tchar errbuf[_POSIX2_LINE_MAX];\n \n \tif (!kflag) {\n@@ -260,7 +261,8 @@\n getprof(kvp)\n \tstruct kvmvars *kvp;\n {\n-\tint mib[3], size;\n+\tsize_t size;\n+\tint mib[3];\n \n \tif (kflag) {\n \t\tsize = kvm_read(kvp->kd, nl[N_GMONPARAM].n_value, &kvp->gpm,\n@@ -316,7 +318,8 @@\n \tint state;\n {\n \tstruct gmonparam *p = (struct gmonparam *)nl[N_GMONPARAM].n_value;\n-\tint mib[3], sz, oldstate;\n+\tsize_t sz;\n+\tint mib[3], oldstate;\n \n \tsz = sizeof(state);\n \tif (!kflag) {\n@@ -353,7 +356,8 @@\n \tstruct tostruct *tos;\n \tu_long frompc;\n \tu_short *froms, *tickbuf;\n-\tint mib[3], i;\n+\tsize_t i;\n+\tint mib[3];\n \tstruct gmonhdr h;\n \tint fromindex, endfrom, toindex;\n \n@@ -464,7 +468,8 @@\n getprofhz(kvp)\n \tstruct kvmvars *kvp;\n {\n-\tint mib[2], size, profrate;\n+\tsize_t size;\n+\tint mib[2], profrate;\n \tstruct clockinfo clockrate;\n \n \tif (kflag) {\n"} {"commit":"30c0318b7212b809feebeafc31e09189164336db","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/lpr\/lpd\/lpd.c\n+++ usr.sbin\/lpr\/lpd\/lpd.c\n@@ -114,8 +114,8 @@\n static void\t startup(void);\n static void\t chkhost(struct sockaddr *_f);\n static int\t ckqueue(struct printer *_pp);\n+static int\t*socksetup(int _af, int _debuglvl);\n static void\t usage(void);\n-static int\t*socksetup(int _af, int _options);\n \n \/* XXX from libc\/net\/rcmd.c *\/\n extern int __ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t,\n@@ -299,10 +299,7 @@\n \tFD_SET(funix, &defreadfds);\n \tlisten(funix, 5);\n \tif (pflag == 0) {\n-\t\toptions = SO_REUSEADDR;\n-\t\tif (socket_debug)\n-\t\t\toptions |= SO_DEBUG;\n-\t\tfinet = socksetup(family, options);\n+\t\tfinet = socksetup(family, socket_debug);\n \t} else\n \t\tfinet = NULL;\t\/* pretend we couldn't open TCP socket. *\/\n \tif (finet) {\n@@ -322,7 +319,7 @@\n \t * XXX - should be redone for multi-protocol\n \t *\/\n \tfor (;;) {\n-\t\tint domain = -1, nfds, s = -1;\n+\t\tint domain, nfds, s;\n \t\tfd_set readfds;\n \n \t\tFD_COPY(&defreadfds, &readfds);\n@@ -332,8 +329,8 @@\n \t\t\t\tsyslog(LOG_WARNING, \"select: %m\");\n \t\t\tcontinue;\n \t\t}\n-\t\tdomain = 0;\t\t\t\/* avoid compile-time warning *\/\n-\t\ts = 0;\t\t\t\t\/* avoid compile-time warning *\/\n+\t\tdomain = -1;\t\t \/* avoid compile-time warning *\/\n+\t\ts = -1;\t\t\t \/* avoid compile-time warning *\/\n \t\tif (FD_ISSET(funix, &readfds)) {\n \t\t\tdomain = AF_UNIX, fromlen = sizeof(fromunix);\n \t\t\ts = accept(funix,\n@@ -699,7 +696,7 @@\n \/* if af is PF_UNSPEC more than one socket may be returned *\/\n \/* the returned list is dynamically allocated, so caller needs to free it *\/\n static int *\n-socksetup(int af, int options)\n+socksetup(int af, int debuglvl)\n {\n \tstruct addrinfo hints, *res, *r;\n \tint error, maxs, *s, *socks;\n@@ -732,16 +729,15 @@\n \t\t\tsyslog(LOG_DEBUG, \"socket(): %m\");\n \t\t\tcontinue;\n \t\t}\n-\t\tif (options & SO_REUSEADDR)\n-\t\t\tif (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, &on,\n-\t\t\t\t sizeof(on)) < 0) {\n-\t\t\t\tsyslog(LOG_ERR, \"setsockopt(SO_REUSEADDR): %m\");\n-\t\t\t\tclose(*s);\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\t\tif (options & SO_DEBUG)\n-\t\t\tif (setsockopt(*s, SOL_SOCKET, SO_DEBUG,\n-\t\t\t\t &on, sizeof(on)) < 0) {\n+\t\tif (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on))\n+\t\t < 0) {\n+\t\t\tsyslog(LOG_ERR, \"setsockopt(SO_REUSEADDR): %m\");\n+\t\t\tclose(*s);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (debuglvl)\n+\t\t\tif (setsockopt(*s, SOL_SOCKET, SO_DEBUG, &debuglvl,\n+\t\t\t sizeof(debuglvl)) < 0) {\n \t\t\t\tsyslog(LOG_ERR, \"setsockopt (SO_DEBUG): %m\");\n \t\t\t\tclose(*s);\n \t\t\t\tcontinue;\n"} {"commit":"ca976a18cf90573559d9085ac6fc522eabbf77b4","subject":"MAINT: Relax asserts to match relaxed reducelike resolution behaviour","message":"MAINT: Relax asserts to match relaxed reducelike resolution behaviour\n\nThis closes gh-20751, which was due to the assert not being noticed\ntriggered (not sure why) during initial CI run.\nThe behaviour is relaxed, so the assert must also be relaxed.\n","repos":"endolith\/numpy,mhvk\/numpy,charris\/numpy,endolith\/numpy,pdebuyl\/numpy,rgommers\/numpy,anntzer\/numpy,rgommers\/numpy,seberg\/numpy,rgommers\/numpy,anntzer\/numpy,endolith\/numpy,charris\/numpy,mattip\/numpy,mattip\/numpy,jakirkham\/numpy,endolith\/numpy,numpy\/numpy,rgommers\/numpy,mhvk\/numpy,seberg\/numpy,charris\/numpy,seberg\/numpy,anntzer\/numpy,pdebuyl\/numpy,jakirkham\/numpy,jakirkham\/numpy,pdebuyl\/numpy,mhvk\/numpy,mattip\/numpy,mhvk\/numpy,pdebuyl\/numpy,charris\/numpy,jakirkham\/numpy,jakirkham\/numpy,mattip\/numpy,numpy\/numpy,seberg\/numpy,mhvk\/numpy,numpy\/numpy,anntzer\/numpy,numpy\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -3032,8 +3032,12 @@\n return NULL;\n }\n \n- \/* The below code assumes that all descriptors are identical: *\/\n- assert(descrs[0] == descrs[1] && descrs[0] == descrs[2]);\n+ \/*\n+ * The below code assumes that all descriptors are interchangeable, we\n+ * allow them to not be strictly identical (but they typically should be)\n+ *\/\n+ assert(PyArray_EquivTypes(descrs[0], descrs[1])\n+ && PyArray_EquivTypes(descrs[0], descrs[2]));\n \n if (PyDataType_REFCHK(descrs[2]) && descrs[2]->type_num != NPY_OBJECT) {\n \/* This can be removed, but the initial element copy needs fixing *\/\n@@ -3445,8 +3449,12 @@\n return NULL;\n }\n \n- \/* The below code assumes that all descriptors are identical: *\/\n- assert(descrs[0] == descrs[1] && descrs[0] == descrs[2]);\n+ \/*\n+ * The below code assumes that all descriptors are interchangeable, we\n+ * allow them to not be strictly identical (but they typically should be)\n+ *\/\n+ assert(PyArray_EquivTypes(descrs[0], descrs[1])\n+ && PyArray_EquivTypes(descrs[0], descrs[2]));\n \n if (PyDataType_REFCHK(descrs[2]) && descrs[2]->type_num != NPY_OBJECT) {\n \/* This can be removed, but the initial element copy needs fixing *\/\n"} {"commit":"4fe8f1d3a6f83aff0437ca6d1542de52fd4671a7","subject":"Deal with keys with descriptions that have empty fields in some of their lines.","message":"Deal with keys with descriptions that have empty fields in some of\ntheir lines.\n\nProperly discard PCMCIA device declarations. I plan to support\nPCMCIA cards, but they don't work yet, and it appears some .INF files\ndeclare both PCI and PCMCIA device instances.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/ndiscvt\/inf.c\n+++ usr.sbin\/ndiscvt\/inf.c\n@@ -215,8 +215,9 @@\n \t\t\t\/* Emit device IDs. *\/\n \t\t\tif (strcasestr(assign->vals[1], \"PCI\") != NULL)\n \t\t\t\tdump_pci_id(assign->vals[1]);\n+\t\t\telse if (strcasestr(assign->vals[1], \"PCMCIA\") != NULL)\n+\t\t\t\tcontinue;\n #ifdef notdef\n-\t\t\telse if (strcasestr(assign->vals[1], \"PCMCIA\") != NULL)\n \t\t\t\tdump_pcmcia_id(assign->vals[1]);\n #endif\n \t\t\t\/* Emit device description *\/\n@@ -256,7 +257,8 @@\n \t\t\t\t stringcvt(reg->value), devidx);\n \t\t\t} else if (strncasecmp(reg->subkey,\n \t\t\t \"Ndi\\\\params\", strlen(\"Ndi\\\\params\")-1) == 0 &&\n-\t\t\t strcasecmp(reg->key, \"ParamDesc\") == 0)\n+\t\t\t (reg->key != NULL && strcasecmp(reg->key,\n+\t\t\t \"ParamDesc\") == 0))\n \t\t\t\tdump_paramreg(sec, reg, devidx);\n \t\t}\n \t}\n@@ -291,6 +293,8 @@\n \t\tif (reg->section != s)\n \t\t\tcontinue;\n \t\tif (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))\n+\t\t\tcontinue;\n+\t\tif (reg->key == NULL)\n \t\t\tcontinue;\n \t\tif (strcasecmp(reg->key, \"LimitText\") == 0)\n \t\t\tfprintf(ofp, \" [maxchars=%s]\", reg->value);\n@@ -312,6 +316,8 @@\n \t\t\tcontinue;\n \t\tif (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))\n \t\t\tcontinue;\n+\t\tif (reg->key == NULL)\n+\t\t\tcontinue;\n \t\tif (strcasecmp(reg->key, \"min\") == 0)\n \t\t\tfprintf(ofp, \" [min=%s]\", reg->value);\n \t\tif (strcasecmp(reg->key, \"max\") == 0)\n@@ -329,7 +335,7 @@\n \t\t\tcontinue;\n \t\tif (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))\n \t\t\tcontinue;\n-\t\tif (strcasecmp(reg->key, \"Default\"))\n+\t\tif (reg->key == NULL || strcasecmp(reg->key, \"Default\"))\n \t\t\tcontinue;\n \t\tfprintf(ofp, \"\\n\\t{ \\\"%s\\\" }, %d },\", reg->value == NULL ? \"\" :\n \t\t stringcvt(reg->value), devidx);\n@@ -347,7 +353,7 @@\n \t\t\tcontinue;\n \t\tif (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))\n \t\t\tcontinue;\n-\t\tif (strcasecmp(reg->key, \"ParamDesc\"))\n+\t\tif (reg->key == NULL || strcasecmp(reg->key, \"ParamDesc\"))\n \t\t\tcontinue;\n \t\tfprintf(ofp, \"\\n\\t\\\"%s\", stringcvt(r->value));\n \t\t\tbreak;\n@@ -363,6 +369,8 @@\n \t\tif (reg->section != s)\n \t\t\tcontinue;\n \t\tif (reg->subkey == NULL || strcasecmp(reg->subkey, r->subkey))\n+\t\t\tcontinue;\n+\t\tif (reg->key == NULL)\n \t\t\tcontinue;\n \t\tif (strcasecmp(reg->key, \"type\"))\n \t\t\tcontinue;\n"} {"commit":"e440e674e5d332f99a42bd488c6900829f6d55a2","subject":"BUG: reference stolen from None when looking up a ufunc's identity attribute","message":"BUG: reference stolen from None when looking up a ufunc's identity attribute\n\nA new reference must be returned by the C getter function, not a borrowed one.\n","repos":"pdebuyl\/numpy,kirillzhuravlev\/numpy,mattip\/numpy,rherault-insa\/numpy,dato-code\/numpy,bmorris3\/numpy,tacaswell\/numpy,trankmichael\/numpy,rgommers\/numpy,musically-ut\/numpy,nbeaver\/numpy,chiffa\/numpy,simongibbons\/numpy,mingwpy\/numpy,pyparallel\/numpy,ddasilva\/numpy,bmorris3\/numpy,jakirkham\/numpy,jakirkham\/numpy,mingwpy\/numpy,jorisvandenbossche\/numpy,ChanderG\/numpy,MSeifert04\/numpy,sinhrks\/numpy,Linkid\/numpy,has2k1\/numpy,ContinuumIO\/numpy,pizzathief\/numpy,trankmichael\/numpy,felipebetancur\/numpy,tdsmith\/numpy,githubmlai\/numpy,SiccarPoint\/numpy,Anwesh43\/numpy,tdsmith\/numpy,rhythmsosad\/numpy,numpy\/numpy,kiwifb\/numpy,sonnyhu\/numpy,cjermain\/numpy,gmcastil\/numpy,dwillmer\/numpy,skymanaditya1\/numpy,nguyentu1602\/numpy,has2k1\/numpy,mhvk\/numpy,chiffa\/numpy,bmorris3\/numpy,rudimeier\/numpy,jorisvandenbossche\/numpy,WarrenWeckesser\/numpy,mhvk\/numpy,ViralLeadership\/numpy,argriffing\/numpy,tynn\/numpy,pyparallel\/numpy,BMJHayward\/numpy,githubmlai\/numpy,felipebetancur\/numpy,SunghanKim\/numpy,sinhrks\/numpy,WarrenWeckesser\/numpy,sigma-random\/numpy,musically-ut\/numpy,CMartelLML\/numpy,AustereCuriosity\/numpy,argriffing\/numpy,mingwpy\/numpy,pbrod\/numpy,shoyer\/numpy,SunghanKim\/numpy,empeeu\/numpy,rgommers\/numpy,BMJHayward\/numpy,Dapid\/numpy,bmorris3\/numpy,joferkington\/numpy,mathdd\/numpy,SiccarPoint\/numpy,BMJHayward\/numpy,charris\/numpy,dato-code\/numpy,MSeifert04\/numpy,simongibbons\/numpy,Linkid\/numpy,nbeaver\/numpy,gfyoung\/numpy,GrimDerp\/numpy,WillieMaddox\/numpy,mwiebe\/numpy,SunghanKim\/numpy,joferkington\/numpy,stuarteberg\/numpy,ESSS\/numpy,madphysicist\/numpy,endolith\/numpy,abalkin\/numpy,abalkin\/numpy,njase\/numpy,rajathkumarmp\/numpy,seberg\/numpy,cowlicks\/numpy,gmcastil\/numpy,stuarteberg\/numpy,nguyentu1602\/numpy,cjermain\/numpy,pbrod\/numpy,drasmuss\/numpy,mhvk\/numpy,tynn\/numpy,groutr\/numpy,rajathkumarmp\/numpy,pbrod\/numpy,simongibbons\/numpy,dwillmer\/numpy,Anwesh43\/numpy,mathdd\/numpy,ChanderG\/numpy,WillieMaddox\/numpy,grlee77\/numpy,Srisai85\/numpy,CMartelLML\/numpy,jonathanunderwood\/numpy,nguyentu1602\/numpy,utke1\/numpy,jorisvandenbossche\/numpy,madphysicist\/numpy,KaelChen\/numpy,pbrod\/numpy,mathdd\/numpy,MSeifert04\/numpy,MaPePeR\/numpy,ESSS\/numpy,argriffing\/numpy,Anwesh43\/numpy,mattip\/numpy,ContinuumIO\/numpy,has2k1\/numpy,mortada\/numpy,jonathanunderwood\/numpy,kirillzhuravlev\/numpy,jschueller\/numpy,rhythmsosad\/numpy,jankoslavic\/numpy,sonnyhu\/numpy,Yusa95\/numpy,Srisai85\/numpy,njase\/numpy,charris\/numpy,ahaldane\/numpy,skymanaditya1\/numpy,cowlicks\/numpy,mortada\/numpy,Yusa95\/numpy,MaPePeR\/numpy,charris\/numpy,b-carter\/numpy,dwillmer\/numpy,pizzathief\/numpy,CMartelLML\/numpy,rhythmsosad\/numpy,leifdenby\/numpy,bringingheavendown\/numpy,shoyer\/numpy,hainm\/numpy,dimasad\/numpy,b-carter\/numpy,solarjoe\/numpy,mwiebe\/numpy,SiccarPoint\/numpy,SunghanKim\/numpy,madphysicist\/numpy,BabeNovelty\/numpy,Eric89GXL\/numpy,MichaelAquilina\/numpy,solarjoe\/numpy,njase\/numpy,skwbc\/numpy,rherault-insa\/numpy,BabeNovelty\/numpy,BabeNovelty\/numpy,jschueller\/numpy,maniteja123\/numpy,MSeifert04\/numpy,ekalosak\/numpy,sigma-random\/numpy,groutr\/numpy,abalkin\/numpy,sinhrks\/numpy,pyparallel\/numpy,musically-ut\/numpy,ssanderson\/numpy,stuarteberg\/numpy,ViralLeadership\/numpy,jonathanunderwood\/numpy,felipebetancur\/numpy,shoyer\/numpy,KaelChen\/numpy,tynn\/numpy,ContinuumIO\/numpy,ChristopherHogan\/numpy,moreati\/numpy,MSeifert04\/numpy,dimasad\/numpy,ChanderG\/numpy,endolith\/numpy,leifdenby\/numpy,seberg\/numpy,mathdd\/numpy,githubmlai\/numpy,dimasad\/numpy,pdebuyl\/numpy,jankoslavic\/numpy,groutr\/numpy,MichaelAquilina\/numpy,shoyer\/numpy,hainm\/numpy,skwbc\/numpy,ddasilva\/numpy,mattip\/numpy,jakirkham\/numpy,solarjoe\/numpy,dwillmer\/numpy,bertrand-l\/numpy,CMartelLML\/numpy,empeeu\/numpy,anntzer\/numpy,bertrand-l\/numpy,drasmuss\/numpy,cjermain\/numpy,drasmuss\/numpy,endolith\/numpy,chatcannon\/numpy,jorisvandenbossche\/numpy,jorisvandenbossche\/numpy,GaZ3ll3\/numpy,rhythmsosad\/numpy,ahaldane\/numpy,jschueller\/numpy,mwiebe\/numpy,stuarteberg\/numpy,WarrenWeckesser\/numpy,charris\/numpy,gmcastil\/numpy,Srisai85\/numpy,Eric89GXL\/numpy,Dapid\/numpy,trankmichael\/numpy,WarrenWeckesser\/numpy,rherault-insa\/numpy,ssanderson\/numpy,GrimDerp\/numpy,AustereCuriosity\/numpy,empeeu\/numpy,felipebetancur\/numpy,ddasilva\/numpy,moreati\/numpy,MaPePeR\/numpy,Yusa95\/numpy,b-carter\/numpy,behzadnouri\/numpy,GrimDerp\/numpy,sinhrks\/numpy,musically-ut\/numpy,numpy\/numpy,ekalosak\/numpy,mortada\/numpy,Linkid\/numpy,seberg\/numpy,cowlicks\/numpy,ekalosak\/numpy,sonnyhu\/numpy,mortada\/numpy,numpy\/numpy,GrimDerp\/numpy,tdsmith\/numpy,ChristopherHogan\/numpy,hainm\/numpy,KaelChen\/numpy,grlee77\/numpy,nbeaver\/numpy,nguyentu1602\/numpy,moreati\/numpy,ESSS\/numpy,skymanaditya1\/numpy,madphysicist\/numpy,jakirkham\/numpy,chiffa\/numpy,jankoslavic\/numpy,rajathkumarmp\/numpy,grlee77\/numpy,Linkid\/numpy,endolith\/numpy,rudimeier\/numpy,sonnyhu\/numpy,utke1\/numpy,gfyoung\/numpy,pdebuyl\/numpy,mingwpy\/numpy,jschueller\/numpy,tacaswell\/numpy,mhvk\/numpy,bertrand-l\/numpy,dimasad\/numpy,hainm\/numpy,kirillzhuravlev\/numpy,cjermain\/numpy,rudimeier\/numpy,behzadnouri\/numpy,chatcannon\/numpy,WarrenWeckesser\/numpy,joferkington\/numpy,rgommers\/numpy,BabeNovelty\/numpy,Yusa95\/numpy,jankoslavic\/numpy,sigma-random\/numpy,behzadnouri\/numpy,madphysicist\/numpy,maniteja123\/numpy,pizzathief\/numpy,maniteja123\/numpy,kiwifb\/numpy,numpy\/numpy,shoyer\/numpy,sigma-random\/numpy,tdsmith\/numpy,BMJHayward\/numpy,grlee77\/numpy,kiwifb\/numpy,mattip\/numpy,SiccarPoint\/numpy,dato-code\/numpy,skwbc\/numpy,ChristopherHogan\/numpy,seberg\/numpy,pbrod\/numpy,anntzer\/numpy,Anwesh43\/numpy,ekalosak\/numpy,MichaelAquilina\/numpy,Eric89GXL\/numpy,trankmichael\/numpy,pdebuyl\/numpy,MaPePeR\/numpy,anntzer\/numpy,simongibbons\/numpy,MichaelAquilina\/numpy,bringingheavendown\/numpy,GaZ3ll3\/numpy,rajathkumarmp\/numpy,ChanderG\/numpy,KaelChen\/numpy,ssanderson\/numpy,rgommers\/numpy,utke1\/numpy,anntzer\/numpy,cowlicks\/numpy,simongibbons\/numpy,dato-code\/numpy,empeeu\/numpy,grlee77\/numpy,rudimeier\/numpy,ahaldane\/numpy,GaZ3ll3\/numpy,joferkington\/numpy,ahaldane\/numpy,chatcannon\/numpy,leifdenby\/numpy,Srisai85\/numpy,kirillzhuravlev\/numpy,gfyoung\/numpy,githubmlai\/numpy,tacaswell\/numpy,ahaldane\/numpy,ChristopherHogan\/numpy,GaZ3ll3\/numpy,Dapid\/numpy,mhvk\/numpy,AustereCuriosity\/numpy,skymanaditya1\/numpy,pizzathief\/numpy,has2k1\/numpy,jakirkham\/numpy,bringingheavendown\/numpy,pizzathief\/numpy,WillieMaddox\/numpy,Eric89GXL\/numpy,ViralLeadership\/numpy","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- numpy\/core\/src\/umath\/ufunc_object.c\n+++ numpy\/core\/src\/umath\/ufunc_object.c\n@@ -5547,7 +5547,7 @@\n case PyUFunc_Zero:\n return PyInt_FromLong(0);\n }\n- return Py_None;\n+ Py_RETURN_NONE;\n }\n \n static PyObject *\n"} {"commit":"b3c396649181724070d20cb7156cf0f58b4f9b31","subject":"MFC r178214","message":"MFC r178214\n\n If the .inf file did not have a Default entry for the registry key then write\n out a blank value and close the brackets on the ndis_regvals array.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/ndiscvt\/inf.c\n+++ usr.sbin\/ndiscvt\/inf.c\n@@ -545,8 +545,10 @@\n \t\t\tcontinue;\n \t\tfprintf(ofp, \"\\n\\t{ \\\"%s\\\" }, %d },\", reg->value == NULL ? \"\" :\n \t\t stringcvt(reg->value), devidx);\n-\t\t\tbreak;\n-\t}\n+\t\treturn;\n+\t}\n+\t\/* Default registry entry missing *\/\n+\tfprintf(ofp, \"\\n\\t{ \\\"\\\" }, %d },\", devidx);\n \treturn;\n }\n \n"} {"commit":"56ae0558f5ba0519e94a092249dc6f15954a5e16","subject":"Plug two file descriptor leaks","message":"Plug two file descriptor leaks\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/ppp\/systems.c\n+++ usr.sbin\/ppp\/systems.c\n@@ -349,8 +349,10 @@\n log_Printf(LogCOMMAND, \"%s: Including \\\"%s\\\"\\n\", filename, arg);\n n = ReadSystem(bundle, name, arg, prompt, cx, how);\n log_Printf(LogCOMMAND, \"%s: Done include of \\\"%s\\\"\\n\", filename, arg);\n- if (!n)\n+ if (!n) {\n+ fclose(fp);\n return 0;\t\/* got it *\/\n+ }\n break;\n default:\n log_Printf(LogWARN, \"%s: %s: Invalid command\\n\", filename, cp);\n@@ -364,8 +366,10 @@\n \n if (strcmp(cp, name) == 0) {\n \/* We're in business *\/\n- if (how == SYSTEM_EXISTS)\n+ if (how == SYSTEM_EXISTS) {\n+ fclose(fp);\n \t return 0;\n+\t}\n \twhile ((n = xgets(line, sizeof line, fp))) {\n linenum += n;\n indent = issep(*line);\n"} {"commit":"dbc631f55006fe265195e9c3471cbc508e946de3","subject":"Whitespace cleanup.","message":"Whitespace cleanup.\n\nSponsored by:\tDARPA, NAI Labs\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/pstat\/pstat.c\n+++ usr.sbin\/pstat\/pstat.c\n@@ -562,13 +562,13 @@\n }\n \n void\n-union_header() \n+union_header()\n {\n \t(void)printf(\" UPPER LOWER\");\n }\n \n int\n-union_print(vp) \n+union_print(vp)\n \tstruct vnode *vp;\n {\n \tstruct union_node unode, *up = &unode;\n@@ -579,7 +579,7 @@\n \t (u_long)(void *)up->un_lowervp);\n \treturn (0);\n }\n-\t\n+\n \/*\n * Given a pointer to a mount structure in kernel space,\n * read it in and return a usable pointer to it.\n@@ -988,7 +988,7 @@\n \tlong blocksize;\n \n \tn = kvm_getswapinfo(\n-\t kd, \n+\t kd,\n \t kswap,\n \t sizeof(kswap)\/sizeof(kswap[0]),\n \t ((swapflag > 1) ? SWIF_DUMP_TREE : 0) | SWIF_DEV_PREFIX\n@@ -1025,7 +1025,7 @@\n \t\tblocksize = 1024 * 1024;\n \n \t\t(void)printf(\n-\t\t \"%dM\/%dM swap space\\n\", \n+\t\t \"%dM\/%dM swap space\\n\",\n \t\t CONVERT(kswap[n].ksw_used),\n \t\t CONVERT(kswap[n].ksw_total)\n \t\t);\n@@ -1033,7 +1033,7 @@\n \t\t(void)printf(\n \t\t \"%-15s %*d %8d %8d %5.0f%%\\n\",\n \t\t \"Total\",\n-\t\t hlen, \n+\t\t hlen,\n \t\t CONVERT(kswap[n].ksw_total),\n \t\t CONVERT(kswap[n].ksw_used),\n \t\t CONVERT(kswap[n].ksw_total - kswap[n].ksw_used),\n"} {"commit":"30bbed088a5fb44d278456fba684f2163909724e","subject":"Fix warning when compiling with gcc46: \terror: variable 'hostname' set but not used","message":"Fix warning when compiling with gcc46:\n\terror: variable 'hostname' set but not used\n\nApproved by:\tdim, cperciva (mentor, blanket for pre-mentorship already-approved commits)\nMFC after:\t3 days\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/rarpd\/rarpd.c\n+++ usr.sbin\/rarpd\/rarpd.c\n@@ -122,7 +122,7 @@\n main(int argc, char *argv[])\n {\n \tint op;\n-\tchar *ifname, *hostname, *name;\n+\tchar *ifname, *name;\n \n \tint aflag = 0;\t\t\/* listen on \"all\" interfaces *\/\n \tint fflag = 0;\t\t\/* don't fork *\/\n@@ -174,7 +174,6 @@\n \targv += optind;\n \n \tifname = (aflag == 0) ? argv[0] : NULL;\n-\thostname = ifname ? argv[1] : argv[0];\n \t\n \tif ((aflag && ifname) || (!aflag && ifname == NULL))\n \t\tusage();\n"} {"commit":"2b8e8d26ef46942dd22e802eeecfc45b712f9a87","subject":"The FIONREAD sysctl operates on an int *, not a size_t *.","message":"The FIONREAD sysctl operates on an int *, not a size_t *.\n\nReviewed by:\tdd\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.sbin\/watch\/watch.c\n+++ usr.sbin\/watch\/watch.c\n@@ -285,8 +285,8 @@\n int\n main(int ac, char *av[])\n {\n-\tint res, idata, rv;\n-\tsize_t\t\tnread, b_size = MIN_SIZE;\n+\tint res, rv, nread;\n+\tsize_t\t\tb_size = MIN_SIZE;\n \tchar ch, *buf, chb[READB_LEN];\n \tfd_set fd_s;\n \n@@ -362,7 +362,7 @@\n \t\t\tif (nread > READB_LEN)\n \t\t\t\tnread = READB_LEN;\n \t\t\trv = read(std_in, chb, nread);\n-\t\t\tif (rv == -1 || (unsigned)rv != nread)\n+\t\t\tif (rv == -1 || rv != nread)\n \t\t\t\tfatal(EX_IOERR, \"read (stdin) failed\");\n \n \t\t\tswitch (chb[0]) {\n@@ -379,7 +379,7 @@\n \t\t\tdefault:\n \t\t\t\tif (opt_write) {\n \t\t\t\t\trv = write(snp_io, chb, nread);\n-\t\t\t\t\tif (rv == -1 || (unsigned)rv != nread) {\n+\t\t\t\t\tif (rv == -1 || rv != nread) {\n \t\t\t\t\t\tdetach_snp();\n \t\t\t\t\t\tif (opt_no_switch)\n \t\t\t\t\t\t\tfatal(EX_IOERR,\n@@ -394,10 +394,10 @@\n \t\tif (!FD_ISSET(snp_io, &fd_s))\n \t\t\tcontinue;\n \n-\t\tif ((res = ioctl(snp_io, FIONREAD, &idata)) != 0)\n+\t\tif ((res = ioctl(snp_io, FIONREAD, &nread)) != 0)\n \t\t\tfatal(EX_OSERR, \"ioctl(FIONREAD)\");\n \n-\t\tswitch (idata) {\n+\t\tswitch (nread) {\n \t\tcase SNP_OFLOW:\n \t\t\tif (opt_reconn_oflow)\n \t\t\t\tattach_snp();\n@@ -418,7 +418,6 @@\n \t\t\t\tcleanup(-1);\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tnread = (unsigned)idata;\n \t\t\tif (nread < (b_size \/ 2) && (b_size \/ 2) > MIN_SIZE) {\n \t\t\t\tfree(buf);\n \t\t\t\tif (!(buf = (char *) malloc(b_size \/ 2)))\n@@ -432,10 +431,10 @@\n \t\t\t\t\tfatal(EX_UNAVAILABLE, \"malloc failed\");\n \t\t\t}\n \t\t\trv = read(snp_io, buf, nread);\n-\t\t\tif (rv == -1 || (unsigned)rv != nread)\n+\t\t\tif (rv == -1 || rv != nread)\n \t\t\t\tfatal(EX_IOERR, \"read failed\");\n \t\t\trv = write(std_out, buf, nread);\n-\t\t\tif (rv == -1 || (unsigned)rv != nread)\n+\t\t\tif (rv == -1 || rv != nread)\n \t\t\t\tfatal(EX_IOERR, \"write failed\");\n \t\t}\n \t}\t\t\t\/* While *\/\n"} {"commit":"89c5d96c57060c1bc83298bc48d2c13df62fb680","subject":"hw\/battery: Minor whitespace fix","message":"hw\/battery: Minor whitespace fix\n","repos":"mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/battery\/src\/battery_shell.c\n+++ hw\/battery\/src\/battery_shell.c\n@@ -475,12 +475,12 @@\n \n static const struct shell_cmd bat_cli_commands[] =\n {\n- { \"read\", cmd_bat_read, HELP(bat_read_help) },\n- { \"write\", cmd_bat_write, HELP(bat_write_help) },\n- { \"list\", cmd_bat_list, HELP(bat_list_help) },\n- { \"pollrate\", cmd_bat_poll_rate, HELP(bat_poll_rate_help) },\n- { \"monitor\", cmd_bat_monitor, HELP(bat_monitor_help) },\n- { NULL, NULL, NULL }\n+ { \"read\", cmd_bat_read, HELP(bat_read_help) },\n+ { \"write\", cmd_bat_write, HELP(bat_write_help) },\n+ { \"list\", cmd_bat_list, HELP(bat_list_help) },\n+ { \"pollrate\", cmd_bat_poll_rate, HELP(bat_poll_rate_help) },\n+ { \"monitor\", cmd_bat_monitor, HELP(bat_monitor_help) },\n+ { NULL, NULL, NULL }\n };\n \n \/**\n"} {"commit":"78946a82a4867435d565e39a865a059c698fcd85","subject":"Disable the heap search in priority_queue::upper_bound","message":"Disable the heap search in priority_queue::upper_bound\n\nHeap search is broken for some cases. Replace with exhaustive search on\nm_queue for now.\n\nChange-Id: I40466cc2edf4c13b67b0bc440833ac88eabdf10f\n\n[git-p4: depot-paths = \"\/\/sw\/gpgpu\/nvbio\/main\/\": change = 18360486]\n","repos":"kimrutherford\/nvbio,NVlabs\/nvbio,kimrutherford\/nvbio,NVlabs\/nvbio,kimrutherford\/nvbio,kimrutherford\/nvbio,NVlabs\/nvbio,NVlabs\/nvbio","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- nvbio\/basic\/priority_queue_inline.h\n+++ nvbio\/basic\/priority_queue_inline.h\n@@ -164,6 +164,25 @@\n {\n uint32 max_i = 0;\n Key max;\n+#if 1\n+ for (uint32 j = 1; j < size()+1; ++j)\n+ {\n+ if (!m_cmp( x, m_queue[j] )) \/\/ m_queue[j] <= x\n+ {\n+ if (max_i == 0 || !m_cmp( m_queue[j], max )) \/\/ m_queue[j] >= max\n+ {\n+ \/\/ found a new maximum\n+ max = m_queue[j];\n+ max_i = j;\n+ }\n+ }\n+ }\n+\n+ if (max_i == 0)\n+ return end();\n+\n+ return begin() + max_i-1;\n+#else\n uint32 i;\n bool stop;\n \n@@ -176,7 +195,8 @@\n const uint32 num_nodes = nvbio::min( priqueue::width(i), m_size - i );\n \n \/\/ visit all nodes at the same level of i\n- stop = true;\n+ \/\/stop = true;\n+ stop = (num_nodes == priqueue::width(i) ? true : false);\n for(uint32 j = i; j < i + num_nodes; j++)\n {\n if (!m_cmp( x, m_queue[j] )) \/\/ m_queue[j] <= x\n@@ -204,7 +224,8 @@\n if (max_i == 0)\n return end();\n \n- return begin() + max_i;\n+ return begin() + max_i-1;\n+#endif\n }\n \n } \/\/ namespace nvbio\n"} {"commit":"474e85e1276fef185f8a6081c3c9c31f4e9ce07d","subject":"Remove useless funcs in hyperspace.h.","message":"Remove useless funcs in hyperspace.h.\n","repos":"jtk54\/HyperDex,UIKit0\/HyperDex,hyc\/HyperDex,jtk54\/HyperDex,hyc\/HyperDex,hyc\/HyperDex,UIKit0\/HyperDex,hyc\/HyperDex,rescrv\/HyperDex,jtk54\/HyperDex,vashstorm\/HyperDex,tempbottle\/HyperDex,tempbottle\/HyperDex,vashstorm\/HyperDex,tempbottle\/HyperDex,rescrv\/HyperDex,UIKit0\/HyperDex,cactorium\/HyperDex,tempbottle\/HyperDex,jtk54\/HyperDex,vashstorm\/HyperDex,hyc\/HyperDex,UIKit0\/HyperDex,tempbottle\/HyperDex,vashstorm\/HyperDex,vashstorm\/HyperDex,jtk54\/HyperDex,cactorium\/HyperDex,jtk54\/HyperDex,hyc\/HyperDex,UIKit0\/HyperDex,rescrv\/HyperDex,vashstorm\/HyperDex,UIKit0\/HyperDex,cactorium\/HyperDex,cactorium\/HyperDex,rescrv\/HyperDex,rescrv\/HyperDex,pombredanne\/HyperDex,cactorium\/HyperDex,cactorium\/HyperDex,tempbottle\/HyperDex,cactorium\/HyperDex,pombredanne\/HyperDex,rescrv\/HyperDex,pombredanne\/HyperDex,pombredanne\/HyperDex,pombredanne\/HyperDex,hyc\/HyperDex,jtk54\/HyperDex,cactorium\/HyperDex,jtk54\/HyperDex,pombredanne\/HyperDex,jtk54\/HyperDex,vashstorm\/HyperDex,vashstorm\/HyperDex,UIKit0\/HyperDex,rescrv\/HyperDex,rescrv\/HyperDex,hyc\/HyperDex,pombredanne\/HyperDex,tempbottle\/HyperDex,UIKit0\/HyperDex,pombredanne\/HyperDex,pombredanne\/HyperDex,rescrv\/HyperDex,UIKit0\/HyperDex,cactorium\/HyperDex,tempbottle\/HyperDex,vashstorm\/HyperDex,tempbottle\/HyperDex","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hyperdex\/hyperdex\/hyperspace.h\n+++ hyperdex\/hyperdex\/hyperspace.h\n@@ -43,42 +43,6 @@\n namespace hyperdex\n {\n \n-\/\/ A spacing of 1 corresponds to the identity function. A spacing of 0 is\n-\/\/ undefined. A spacing > 64 is undefined.\n-inline uint64_t\n-spacing(uint64_t number, uint8_t spacing)\n-{\n- uint64_t ret = 0;\n-\n- for (uint8_t i = 0; i * spacing < 64; ++i)\n- {\n- \/\/ Don't do this inline so that it will use the full 64-bit int.\n- \/\/ It's also much easier to read this way.\n- uint64_t bit = 1;\n- bit <<= (63 - i);\n- bit &= number;\n- bit >>= (i * (spacing - 1));\n- ret |= bit;\n- }\n-\n- return ret;\n-}\n-\n-\/\/ Interlace in a modified morton order (high-order bits preserved).\n-inline uint64_t\n-interlace(const std::vector<uint64_t>& nums)\n-{\n- uint64_t ret = 0;\n-\n- for (size_t i = 0; i < nums.size(); ++i)\n- {\n- uint64_t spaced = spacing(nums[i], nums.size());\n- ret |= (spaced >> i);\n- }\n-\n- return ret;\n-}\n-\n inline uint64_t\n prefixmask(uint8_t prefix)\n {\n@@ -120,56 +84,6 @@\n return true;\n }\n \n-namespace hyperspace\n-{\n-\n-inline void\n-point_hashes(const e::buffer& key, const std::vector<e::buffer>& value,\n- uint64_t* key_hash, std::vector<uint64_t>* value_hashes)\n-{\n- *key_hash = CityHash64(static_cast<const char*>(key.get()), key.size());\n-\n- for (size_t i = 0; i < value.size(); ++i)\n- {\n- value_hashes->push_back(CityHash64(static_cast<const char*>(value[i].get()), value[i].size()));\n- }\n-}\n-\n-inline uint32_t\n-primary_point(uint64_t key_hash)\n-{\n- return 0xffffffff & key_hash;\n-}\n-\n-inline uint32_t\n-secondary_point(const std::vector<uint64_t>& value_hashes)\n-{\n- return 0xffffffff & interlace(value_hashes);\n-}\n-\n-inline uint64_t\n-replication_point(uint64_t key_hash, const std::vector<uint64_t>& value_hashes, const std::vector<bool>& which_dims)\n-{\n- assert(which_dims.size() == value_hashes.size() + 1);\n- std::vector<uint64_t> hashes;\n-\n- if (which_dims[0])\n- {\n- hashes.push_back(key_hash);\n- }\n-\n- for (size_t i = 0; i < value_hashes.size(); ++i)\n- {\n- if (which_dims[i + 1])\n- {\n- hashes.push_back(value_hashes[i]);\n- }\n- }\n-\n- return interlace(hashes);\n-}\n-\n-} \/\/ namespace hyperspace\n } \/\/ namespace hyperdex\n \n #endif \/\/ hyperdex_hyperspace_h_\n"} {"commit":"1ede6717cab60e0f96dc0661dbacf6500f4dede3","subject":"openmp progress","message":"openmp progress\n","repos":"soumith\/TH,soumith\/TH,soumith\/TH,soumith\/TH","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- openmp\/lib\/THOmp\/generic\/THOmpLab.c\n+++ openmp\/lib\/THOmp\/generic\/THOmpLab.c\n@@ -55,7 +55,7 @@\n real *output_data = THTensor_(data)(r_); \n \n long k;\n-#pragma omp parallel for\n+#pragma omp parallel for private(k)\n for(k = 0; k < nKernelPlane; k++)\n {\n long i;\n@@ -140,7 +140,7 @@\n real *output_data = THTensor_(data)(r_); \n \n long k;\n-#pragma omp parallel for\n+#pragma omp parallel for private(k)\n for(k = 0; k < nKernelPlane; k++)\n {\n long i;\n@@ -237,7 +237,7 @@\n real *output_data = THTensor_(data)(r_); \n \n long k;\n-#pragma omp parallel for\n+#pragma omp parallel for private(k)\n for(k = 0; k < nOutputPlane; k++)\n {\n long i;\n"} {"commit":"595e98de20ba8e1467c8455e472e0e80fe548403","subject":"Handle also the case if the value is NULL because a field is not fullfield. For example a vcard got converted and the ADR field is not full field e.g. ZIP Code is missing. This fix multiple asseration warnging about not full field but valid vcards.","message":"Handle also the case if the value is NULL because a field\nis not fullfield. For example a vcard got converted and\nthe ADR field is not full field e.g. ZIP Code is missing.\nThis fix multiple asseration warnging about not full field\nbut valid vcards.\n\n\ngit-svn-id: d74bd7aed9ec2d996d31810ce74317c2e68d0add@1561 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e\n","repos":"ianmartin\/opensync,ianmartin\/opensync","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- opensync\/merger\/opensync_xmlfield.c\n+++ opensync\/merger\/opensync_xmlfield.c\n@@ -360,7 +360,10 @@\n {\n \tosync_assert(xmlfield);\n \tosync_assert(key);\n-\tosync_assert(value);\n+\/* osync_assert(value); If value is empty (this happen of for exmaple not full filled address field) just skip the argument. *\/\n+\tif (!value)\n+\t\treturn;\n+\n \n \txmlNodePtr cur = xmlfield->node->children;\n \tfor(; cur != NULL; cur = cur->next) {\n"} {"commit":"6dcdb8945482554160ccade3a68cf23770d11fea","subject":"set hyperframe number in struct tdma_time","message":"set hyperframe number in struct tdma_time\n","repos":"osmocom\/osmo-tetra,geosphere\/osmo-tetra,osmocom\/osmo-tetra,geosphere\/osmo-tetra,geosphere\/osmo-tetra,osmocom\/osmo-tetra","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/tetra_upper_mac.c\n+++ src\/tetra_upper_mac.c\n@@ -49,6 +49,7 @@\n \n \tmemset(&sid, 0, sizeof(sid));\n \tmacpdu_decode_sysinfo(&sid, msg->l1h);\n+\ttmvp->u.unitdata.tdma_time.hn = sid.hyperframe_number;\n \n \tdl_freq = tetra_dl_carrier_hz(sid.freq_band,\n \t\t\t\t sid.main_carrier,\n"} {"commit":"be15c6f328e1d6c0d6f3492d58f6ff077337f6c0","subject":"Fixed bug #144","message":"Fixed bug #144\n\nMake sure we don't crash or deadlock if someone tries to free a timer after\nthe timer subsystem has been shut down.\n\n\ngit-svn-id: 75429ccc2030f235ccf16e6b9b7f8e83d5edd22e@2350 c70aab31-4412-0410-b14c-859654838e24\n","repos":"albertz\/sdl,albertz\/sdl,albertz\/sdl,albertz\/sdl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/timer\/SDL_timer.c\n+++ src\/timer\/SDL_timer.c\n@@ -95,6 +95,7 @@\n \t}\n \tif ( SDL_timer_threaded ) {\n \t\tSDL_DestroyMutex(SDL_timer_mutex);\n+\t\tSDL_timer_mutex = NULL;\n \t}\n \tSDL_timer_started = 0;\n \tSDL_timer_threaded = 0;\n"} {"commit":"6bd813d78730ab472512feba8473ce9a59ff87db","subject":"oggz-info: actually print the messages headers we found","message":"oggz-info: actually print the messages headers we found\n","repos":"brion\/liboggz,kfish\/liboggz,brion\/liboggz,brion\/liboggz,kfish\/liboggz,brion\/liboggz,kfish\/liboggz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tools\/oggz-info.c\n+++ src\/tools\/oggz-info.c\n@@ -301,7 +301,7 @@\n if (token == NULL)\n break;\n *token = '\\0';\n- printf(\"\\t %s\", token);\n+ printf(\"\\t %s\\n\", messages);\n \n token++;\n if (*token == '\\n')\n"} {"commit":"1f310f7b035e454f38d0de3035f0be83a38efe04","subject":"trau_frame: Fix computation of odd parity while encoding HR frames","message":"trau_frame: Fix computation of odd parity while encoding HR frames\n\ndivision modulo 1 is always 0, and hence we always returned '1'\nas parity bit. Instead, we need to check if the LSB is set in order to\nknow if the number of bits is odd or even.\n\nChange-Id: I37af702ba020a90a820bae84cb603e187ebbacb5\nCloses: CID#211594\n","repos":"osmocom\/libosmo-abis,osmocom\/libosmo-abis,osmocom\/libosmo-abis","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/trau\/trau_frame.c\n+++ src\/trau\/trau_frame.c\n@@ -817,7 +817,7 @@\n \t\t\tsum++;\n \t}\n \n-\tif (sum % 1)\n+\tif (sum & 1)\n \t\treturn 0;\n \telse\n \t\treturn 1;\n"} {"commit":"e476adfac7fd9c4266a7fbcf53bb45a21dab69af","subject":"removed obsolete file","message":"removed obsolete file\n","repos":"pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/unicosmp-memory.c\n+++ src\/unicosmp-memory.c\n@@ -1,91 +0,0 @@\n-\/*\n-* File: unicos-memory.c\n-* Author: Kevin London\n-* london@cs.utk.edu\n-*\n-* Mods: <your name here>\n-* <your email address>\n-*\/\n-\n-#include \"papi.h\"\n-#include \"papi_internal.h\"\n-\n-int get_memory_info(PAPI_hw_info_t * mem_info)\n-{\n- inventory_t *curr;\n- PAPI_mh_level_t *L = mem_info->mem_hierarchy.level;\n-\n- return PAPI_OK;\n-}\n-\n-int _papi_hwd_get_dmem_info(PAPI_dmem_info_t *d)\n-{\n-\t\/* This function has been reimplemented \n-\t\tto conform to current interface.\n-\t\tIt has not been tested.\n-\t\tNor has it been confirmed for completeness.\n-\t\tAn identical copy exists inside irix-memory.c\n-\t\tIf you change this one, check that one too.\n-\t\tdkt 05-10-06\n-\t*\/\n-\n- pid_t pid = getpid();\n- prpsinfo_t info;\n- char pfile[256];\n- int fd;\n-\n- sprintf(pfile, \"\/proc\/%05d\", (int) pid);\n- if ((fd = open(pfile, O_RDONLY)) < 0) {\n- SUBDBG(\"PAPI_get_dmem_info can't open \/proc\/%d\\n\", (int) pid);\n- return (PAPI_ESYS);\n- }\n- if (ioctl(fd, PIOCPSINFO, &info) < 0) {\n- return (PAPI_ESYS);\n- }\n- close(fd);\n-\n- d->size = info.pr_size;\n- d->resident = info.pr_rssize;\n- d->high_water_mark = PAPI_EINVAL;\n- d->shared = PAPI_EINVAL;\n- d->text = PAPI_EINVAL;\n- d->library = PAPI_EINVAL;\n- d->heap = PAPI_EINVAL;\n- d->locked = PAPI_EINVAL;\n- d->stack = PAPI_EINVAL;\n- d->pagesize = getpagesize();\n-\n- return (PAPI_OK);\n-}\n-\n-\/* old PAPI 2 implementation...\n-long _papi_hwd_get_dmem_info(int option)\n-{\n- pid_t pid = getpid();\n- prpsinfo_t info;\n- char pfile[256];\n- int fd;\n-\n- sprintf(pfile, \"\/proc\/%05d\", (int) pid);\n- if ((fd = open(pfile, O_RDONLY)) < 0) {\n- SUBDBG(\"open(\/proc\/%d) errno %d\", (int) pid, errno);\n- return (PAPI_ESYS);\n- }\n- if (ioctl(fd, PIOCPSINFO, &info) < 0) {\n- return (PAPI_ESYS);\n- }\n- close(fd);\n-\n- switch(option) {\n-\tcase PAPI_GET_RESSIZE:\n- \t return (info.pr_rssize);\n-\tcase PAPI_GET_SIZE:\n- return (info.pr_size);\n-\tcase PAPI_GET_PAGESIZE:\n-\t return(getpagesize());\n-\tdefault:\n-\t return(PAPI_EINVAL);\n- }\n-}\n-*\/\n-\n"} {"commit":"dcbcc1ec40e695d926efacc0f5c827a70f55b65f","subject":"event package","message":"event package\n","repos":"erenon\/casino","returncode":1,"stderr":"error: pathspec 'src\/uno\/event\/event.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src\/uno\/event\/event.h\n+++ src\/uno\/event\/event.h\n@@ -0,0 +1,52 @@\n+#ifndef CSU_EVENT_H_\n+#define CSU_EVENT_H_\n+\n+#include \"..\/action\/card.h\"\n+\n+namespace Casino { namespace Uno { namespace Player {\n+\tclass UnoPlayer;\n+}}} \/\/namespace\n+\n+namespace Casino { namespace Uno { namespace Action {\n+\tclass UnoCard;\n+}}} \/\/namespace\n+\n+namespace Casino { namespace Uno { namespace Event {\n+\n+using ::Casino::Uno::Player::UnoPlayer;\n+using ::Casino::Uno::Action::UnoCard;\n+\n+enum EVENT {\n+\tEVENT_CARD_PLAYED,\n+\tEVENT_DRAW_CARD,\n+\tEVENT_COLORPICK,\n+\tEVENT_GAME_START,\n+\tEVENT_GAME_END\n+};\n+\n+struct card_played {\n+\tUnoPlayer* played_by;\n+\tUnoCard* played_card;\n+};\n+\n+struct draw_card {\n+\tUnoPlayer* player;\n+\tint card_count;\n+};\n+\n+struct colorpick {\n+\tUnoPlayer* picked_by;\n+\tCasino::Uno::Action::CARD_COLOR color;\n+};\n+\n+struct game_start {\n+\tUnoCard* first_card;\n+};\n+\n+struct game_end {\n+\tUnoPlayer* winner;\n+};\n+\n+}}} \/\/namespace\n+\n+#endif \/* CSU_EVENT_H_ *\/\n"} {"commit":"3178df9afa45cf9d0694536f7fcefd0384def488","subject":"virCommand: Don't misuse the eventloop for async IO","message":"virCommand: Don't misuse the eventloop for async IO\n\nCurrently, if a command wants to do asynchronous IO, a callback\nis registered in the libvirtd eventloop to handle writes and\nreads. However, there's a race in virCommandWait. The eventloop\nmay already be executing the callback, while virCommandWait is\nmangling internal state of virCommand. To deal with it, we need\nto either introduce locking or spawn a separate thread where we\npoll() on stdio from child. The former, however, requires to\nunlock all mutexes held, as the event loop may execute other\ncallbacks which tries to lock one of the mutexes, deadlock and\nthus never wake us up. So it's safer to spawn a separate thread.\n","repos":"agx\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,VenkatDatta\/libvirt,trainstack\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,trainstack\/libvirt,rlaager\/libvirt,agx\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,shugaoye\/libvirt,datto\/libvirt,iam-TJ\/libvirt,cbosdo\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,olafhering\/libvirt,datto\/libvirt,siboulet\/libvirt-openvz,VenkatDatta\/libvirt,agx\/libvirt,siboulet\/libvirt-openvz,crobinso\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,iam-TJ\/libvirt,cbosdo\/libvirt,eskultety\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,agx\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,trainstack\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,iam-TJ\/libvirt,siboulet\/libvirt-openvz,shugaoye\/libvirt,elmarco\/libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,olafhering\/libvirt,iam-TJ\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,taget\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,cbosdo\/libvirt,rlaager\/libvirt,libvirt\/libvirt,iam-TJ\/libvirt,nertpinx\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,shugaoye\/libvirt,libvirt\/libvirt,libvirt\/libvirt,rlaager\/libvirt,siboulet\/libvirt-openvz,eskultety\/libvirt,elmarco\/libvirt,andreabolognani\/libvirt,trainstack\/libvirt,andreabolognani\/libvirt,iam-TJ\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,elmarco\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,datto\/libvirt,trainstack\/libvirt,zippy2\/libvirt,shugaoye\/libvirt,eskultety\/libvirt,elmarco\/libvirt,fabianfreyer\/libvirt,agx\/libvirt,eskultety\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,trainstack\/libvirt,shugaoye\/libvirt,jardasgit\/libvirt,elmarco\/libvirt,taget\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,datto\/libvirt,cbosdo\/libvirt,iam-TJ\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,taget\/libvirt,jardasgit\/libvirt,datto\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/vircommand.c\n+++ src\/util\/vircommand.c\n@@ -42,6 +42,7 @@\n #include \"virpidfile.h\"\n #include \"virprocess.h\"\n #include \"virbuffer.h\"\n+#include \"virthread.h\"\n \n #define VIR_FROM_THIS VIR_FROM_NONE\n \n@@ -80,15 +81,13 @@\n char **errbuf;\n \n int infd;\n+ int inpipe;\n int outfd;\n int errfd;\n int *outfdptr;\n int *errfdptr;\n \n- size_t inbufOffset;\n- int inWatch;\n- int outWatch;\n- int errWatch;\n+ virThreadPtr asyncioThread;\n \n bool handshake;\n int handshakeWait[2];\n@@ -784,8 +783,7 @@\n cmd->handshakeNotify[0] = -1;\n cmd->handshakeNotify[1] = -1;\n \n- cmd->infd = cmd->outfd = cmd->errfd = -1;\n- cmd->inWatch = cmd->outWatch = cmd->errWatch = -1;\n+ cmd->infd = cmd->inpipe = cmd->outfd = cmd->errfd = -1;\n cmd->pid = -1;\n \n virCommandAddArgSet(cmd, args);\n@@ -1703,19 +1701,17 @@\n * Manage input and output to the child process.\n *\/\n static int\n-virCommandProcessIO(virCommandPtr cmd, int *inpipe)\n-{\n- int infd = -1, outfd = -1, errfd = -1;\n+virCommandProcessIO(virCommandPtr cmd)\n+{\n+ int outfd = -1, errfd = -1;\n size_t inlen = 0, outlen = 0, errlen = 0;\n size_t inoff = 0;\n int ret = 0;\n \n \/* With an input buffer, feed data to child\n * via pipe *\/\n- if (cmd->inbuf) {\n+ if (cmd->inbuf)\n inlen = strlen(cmd->inbuf);\n- infd = *inpipe;\n- }\n \n \/* With out\/err buffer, the outfd\/errfd have been filled with an\n * FD for us. Guarantee an allocated string with partial results\n@@ -1744,8 +1740,8 @@\n struct pollfd fds[3];\n int nfds = 0;\n \n- if (infd != -1) {\n- fds[nfds].fd = infd;\n+ if (cmd->inpipe != -1) {\n+ fds[nfds].fd = cmd->inpipe;\n fds[nfds].events = POLLOUT;\n fds[nfds].revents = 0;\n nfds++;\n@@ -1817,21 +1813,19 @@\n }\n \n if (fds[i].revents & (POLLOUT | POLLERR) &&\n- fds[i].fd == infd) {\n+ fds[i].fd == cmd->inpipe) {\n int done;\n \n \/* Coverity 5.3.0 can't see that we only get here if\n * infd is in the set because it was non-negative. *\/\n sa_assert(infd != -1);\n- done = write(infd, cmd->inbuf + inoff,\n+ done = write(cmd->inpipe, cmd->inbuf + inoff,\n inlen - inoff);\n if (done < 0) {\n if (errno == EPIPE) {\n VIR_DEBUG(\"child closed stdin early, ignoring EPIPE \"\n- \"on fd %d\", infd);\n- if (VIR_CLOSE(*inpipe) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", infd);\n- infd = -1;\n+ \"on fd %d\", cmd->inpipe);\n+ VIR_FORCE_CLOSE(cmd->inpipe);\n } else if (errno != EINTR && errno != EAGAIN) {\n virReportSystemError(errno, \"%s\",\n _(\"unable to write to child input\"));\n@@ -1839,11 +1833,8 @@\n }\n } else {\n inoff += done;\n- if (inoff == inlen) {\n- if (VIR_CLOSE(*inpipe) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", infd);\n- infd = -1;\n- }\n+ if (inoff == inlen)\n+ VIR_FORCE_CLOSE(cmd->inpipe);\n }\n }\n }\n@@ -1914,7 +1905,6 @@\n int ret = 0;\n char *outbuf = NULL;\n char *errbuf = NULL;\n- int infd[2] = { -1, -1 };\n struct stat st;\n bool string_io;\n bool async_io = false;\n@@ -1960,18 +1950,6 @@\n }\n }\n \n- \/* If we have an input buffer, we need\n- * a pipe to feed the data to the child *\/\n- if (cmd->inbuf) {\n- if (pipe2(infd, O_CLOEXEC) < 0) {\n- virReportSystemError(errno, \"%s\",\n- _(\"unable to open pipe\"));\n- cmd->has_error = -1;\n- return -1;\n- }\n- cmd->infd = infd[0];\n- }\n-\n \/* If caller requested the same string for stdout and stderr, then\n * merge those into one string. *\/\n if (cmd->outbuf && cmd->outbuf == cmd->errbuf) {\n@@ -1999,23 +1977,14 @@\n \n cmd->flags |= VIR_EXEC_RUN_SYNC;\n if (virCommandRunAsync(cmd, NULL) < 0) {\n- if (cmd->inbuf) {\n- tmpfd = infd[0];\n- if (VIR_CLOSE(infd[0]) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", tmpfd);\n- tmpfd = infd[1];\n- if (VIR_CLOSE(infd[1]) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", tmpfd);\n- }\n cmd->has_error = -1;\n return -1;\n }\n \n- tmpfd = infd[0];\n- if (VIR_CLOSE(infd[0]) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", tmpfd);\n- if (string_io)\n- ret = virCommandProcessIO(cmd, &infd[1]);\n+ if (string_io) {\n+ VIR_FORCE_CLOSE(cmd->infd);\n+ ret = virCommandProcessIO(cmd);\n+ }\n \n if (virCommandWait(cmd, exitstatus) < 0)\n ret = -1;\n@@ -2031,11 +2000,7 @@\n \n \/* Reset any capturing, in case caller runs\n * this identical command again *\/\n- if (cmd->inbuf) {\n- tmpfd = infd[1];\n- if (VIR_CLOSE(infd[1]) < 0)\n- VIR_DEBUG(\"ignoring failed close on fd %d\", tmpfd);\n- }\n+ VIR_FORCE_CLOSE(cmd->inpipe);\n if (cmd->outbuf == &outbuf) {\n tmpfd = cmd->outfd;\n if (VIR_CLOSE(cmd->outfd) < 0)\n@@ -2135,177 +2100,13 @@\n \n \n static void\n-virCommandHandleReadWrite(int watch, int fd, int events, void *opaque)\n-{\n- virCommandPtr cmd = (virCommandPtr) opaque;\n- char ***bufptr = NULL;\n- char buf[1024];\n- ssize_t nread, nwritten;\n- size_t len = 0;\n- int *watchPtr = NULL;\n- bool eof = false;\n- int *fdptr = NULL, **fdptrptr = NULL;\n-\n- VIR_DEBUG(\"watch=%d fd=%d events=%d\", watch, fd, events);\n- errno = 0;\n-\n- if (watch == cmd->inWatch) {\n- watchPtr = &cmd->inWatch;\n- fdptr = &cmd->infd;\n-\n- if (events & VIR_EVENT_HANDLE_WRITABLE) {\n- len = strlen(cmd->inbuf);\n-\n- while (true) {\n- nwritten = write(fd, cmd->inbuf + cmd->inbufOffset,\n- len - cmd->inbufOffset);\n- if (nwritten < 0) {\n- if (errno != EAGAIN && errno != EINTR) {\n- virReportSystemError(errno,\n- _(\"Unable to write command's \"\n- \"input to FD %d\"),\n- fd);\n- eof = true;\n- }\n- break;\n- }\n-\n- if (nwritten == 0) {\n- eof = true;\n- break;\n- }\n-\n- cmd->inbufOffset += nwritten;\n- if (cmd->inbufOffset == len) {\n- VIR_FORCE_CLOSE(cmd->infd);\n- eof = true;\n- break;\n- }\n- }\n-\n- }\n- } else {\n- if (watch == cmd->outWatch) {\n- watchPtr = &cmd->outWatch;\n- bufptr = &cmd->outbuf;\n- fdptr = &cmd->outfd;\n- fdptrptr = &cmd->outfdptr;\n- } else {\n- watchPtr = &cmd->errWatch;\n- bufptr = &cmd->errbuf;\n- fdptr = &cmd->errfd;\n- fdptrptr = &cmd->errfdptr;\n- }\n-\n- if (events & VIR_EVENT_HANDLE_READABLE) {\n- if (**bufptr)\n- len = strlen(**bufptr);\n-\n- while (true) {\n- nread = read(fd, buf, sizeof(buf));\n- if (nread < 0) {\n- if (errno != EAGAIN && errno != EINTR) {\n- virReportSystemError(errno,\n- _(\"unable to read command's \"\n- \"output from FD %d\"),\n- fd);\n- eof = true;\n- }\n- break;\n- }\n-\n- if (nread == 0) {\n- eof = true;\n- break;\n- }\n-\n- if (VIR_REALLOC_N(**bufptr, len + nread + 1) < 0) {\n- virReportOOMError();\n- break;\n- }\n-\n- memcpy(**bufptr + len, buf, nread);\n- (**bufptr)[len + nread] = '\\0';\n- }\n-\n- }\n- }\n-\n- if (eof || (events & VIR_EVENT_HANDLE_HANGUP) ||\n- (events & VIR_EVENT_HANDLE_ERROR)) {\n- virEventRemoveHandle(watch);\n-\n- *watchPtr = -1;\n- VIR_FORCE_CLOSE(*fdptr);\n- if (bufptr)\n- *bufptr = NULL;\n- if (fdptrptr)\n- *fdptrptr = NULL;\n- }\n-}\n-\n-\n-static int\n-virCommandRegisterEventLoop(virCommandPtr cmd)\n-{\n- int ret = -1;\n-\n- if (cmd->inbuf &&\n- (cmd->inWatch = virEventAddHandle(cmd->infd,\n- VIR_EVENT_HANDLE_WRITABLE |\n- VIR_EVENT_HANDLE_HANGUP |\n- VIR_EVENT_HANDLE_ERROR,\n- virCommandHandleReadWrite,\n- cmd, NULL)) < 0) {\n- virReportError(VIR_ERR_INTERNAL_ERROR,\n- _(\"Unable to register infd %d in the event loop\"),\n- cmd->infd);\n- goto cleanup;\n- }\n-\n- if (cmd->outbuf && cmd->outfdptr == &cmd->outfd &&\n- (cmd->outWatch = virEventAddHandle(cmd->outfd,\n- VIR_EVENT_HANDLE_READABLE |\n- VIR_EVENT_HANDLE_HANGUP |\n- VIR_EVENT_HANDLE_ERROR,\n- virCommandHandleReadWrite,\n- cmd, NULL)) < 0) {\n- virReportError(VIR_ERR_INTERNAL_ERROR,\n- _(\"Unable to register outfd %d in the event loop\"),\n- cmd->outfd);\n-\n- if (cmd->inWatch != -1) {\n- virEventRemoveHandle(cmd->inWatch);\n- cmd->inWatch = -1;\n- }\n- goto cleanup;\n- }\n-\n- if (cmd->errbuf && cmd->errfdptr == &cmd->errfd &&\n- (cmd->errWatch = virEventAddHandle(cmd->errfd,\n- VIR_EVENT_HANDLE_READABLE |\n- VIR_EVENT_HANDLE_HANGUP |\n- VIR_EVENT_HANDLE_ERROR,\n- virCommandHandleReadWrite,\n- cmd, NULL)) < 0) {\n- virReportError(VIR_ERR_INTERNAL_ERROR,\n- _(\"Unable to register errfd %d in the event loop\"),\n- cmd->errfd);\n- if (cmd->inWatch != -1) {\n- virEventRemoveHandle(cmd->inWatch);\n- cmd->inWatch = -1;\n- }\n- if (cmd->outWatch != -1) {\n- virEventRemoveHandle(cmd->outWatch);\n- cmd->outWatch = -1;\n- }\n- goto cleanup;\n- }\n-\n- ret = 0;\n-\n-cleanup:\n- return ret;\n+virCommandDoAsyncIOHelper(void *opaque)\n+{\n+ virCommandPtr cmd = opaque;\n+ if (virCommandProcessIO(cmd) < 0) {\n+ \/* If something went wrong, save errno or -1*\/\n+ cmd->has_error = errno ? errno : -1;\n+ }\n }\n \n \n@@ -2332,7 +2133,7 @@\n int\n virCommandRunAsync(virCommandPtr cmd, pid_t *pid)\n {\n- int ret;\n+ int ret = -1;\n char *str;\n int i;\n bool synchronous = false;\n@@ -2351,23 +2152,21 @@\n synchronous = cmd->flags & VIR_EXEC_RUN_SYNC;\n cmd->flags &= ~VIR_EXEC_RUN_SYNC;\n \n- \/* Buffer management can only be requested via virCommandRun, unless help\n- * from the event loop has been requested via virCommandDoAsyncIO. *\/\n- if (cmd->flags & VIR_EXEC_ASYNC_IO) {\n- \/* If we have an input buffer, we need\n- * a pipe to feed the data to the child *\/\n- if (cmd->inbuf && cmd->infd == -1) {\n- if (pipe2(infd, O_CLOEXEC) < 0) {\n- virReportSystemError(errno, \"%s\",\n- _(\"unable to open pipe\"));\n- cmd->has_error = -1;\n- return -1;\n- }\n- cmd->infd = infd[0];\n- }\n+ \/* Buffer management can only be requested via virCommandRun or\n+ * virCommandDoAsyncIO. *\/\n+ if (cmd->inbuf && cmd->infd == -1 &&\n+ (synchronous || cmd->flags & VIR_EXEC_ASYNC_IO)) {\n+ if (pipe2(infd, O_CLOEXEC) < 0) {\n+ virReportSystemError(errno, \"%s\",\n+ _(\"unable to open pipe\"));\n+ cmd->has_error = -1;\n+ return -1;\n+ }\n+ cmd->infd = infd[0];\n+ cmd->inpipe = infd[1];\n } else if ((cmd->inbuf && cmd->infd == -1) ||\n- (cmd->outbuf && cmd->outfdptr != &cmd->outfd) ||\n- (cmd->errbuf && cmd->errfdptr != &cmd->errfd)) {\n+ (cmd->outbuf && cmd->outfdptr != &cmd->outfd) ||\n+ (cmd->errbuf && cmd->errfdptr != &cmd->errfd)) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"cannot mix string I\/O with asynchronous command\"));\n return -1;\n@@ -2377,24 +2176,24 @@\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"command is already running as pid %lld\"),\n (long long) cmd->pid);\n- return -1;\n+ goto cleanup;\n }\n \n if (!synchronous && (cmd->flags & VIR_EXEC_DAEMON)) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"daemonized command cannot use virCommandRunAsync\"));\n- return -1;\n+ goto cleanup;\n }\n if (cmd->pwd && (cmd->flags & VIR_EXEC_DAEMON)) {\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"daemonized command cannot set working directory %s\"),\n cmd->pwd);\n- return -1;\n+ goto cleanup;\n }\n if (cmd->pidfile && !(cmd->flags & VIR_EXEC_DAEMON)) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"creation of pid file requires daemonized command\"));\n- return -1;\n+ goto cleanup;\n }\n \n str = virCommandToString(cmd);\n@@ -2430,15 +2229,27 @@\n cmd->reap = true;\n \n if (ret == 0 && cmd->flags & VIR_EXEC_ASYNC_IO) {\n- cmd->flags &= ~VIR_EXEC_ASYNC_IO;\n- if (cmd->inbuf && cmd->infd != -1) {\n- \/* close the read end of infd and replace it with the write end *\/\n+ if (cmd->inbuf)\n VIR_FORCE_CLOSE(cmd->infd);\n- cmd->infd = infd[1];\n- }\n- ret = virCommandRegisterEventLoop(cmd);\n- }\n-\n+ \/* clear any error so we can catch if the helper thread reports one *\/\n+ cmd->has_error = 0;\n+ if (VIR_ALLOC(cmd->asyncioThread) < 0 ||\n+ virThreadCreate(cmd->asyncioThread, true,\n+ virCommandDoAsyncIOHelper, cmd) < 0) {\n+ virReportSystemError(errno, \"%s\",\n+ _(\"Unable to create thread \"\n+ \"to process command's IO\"));\n+ VIR_FREE(cmd->asyncioThread);\n+ virCommandAbort(cmd);\n+ ret = -1;\n+ }\n+ }\n+\n+cleanup:\n+ if (ret < 0) {\n+ VIR_FORCE_CLOSE(cmd->infd);\n+ VIR_FORCE_CLOSE(cmd->inpipe);\n+ }\n return ret;\n }\n \n@@ -2459,7 +2270,6 @@\n {\n int ret;\n int status = 0;\n- const int events = VIR_EVENT_HANDLE_READABLE | VIR_EVENT_HANDLE_HANGUP;\n \n if (!cmd ||cmd->has_error == ENOMEM) {\n virReportOOMError();\n@@ -2484,24 +2294,20 @@\n * guarantee that virProcessWait only fails due to failure to wait,\n * and repeat the exitstatus check code ourselves. *\/\n ret = virProcessWait(cmd->pid, exitstatus ? exitstatus : &status);\n-\n- if (cmd->inWatch != -1) {\n- virEventRemoveHandle(cmd->inWatch);\n- cmd->inWatch = -1;\n- }\n-\n- if (cmd->outWatch != -1) {\n- virEventRemoveHandle(cmd->outWatch);\n- virCommandHandleReadWrite(cmd->outWatch, cmd->outfd, events, cmd);\n- cmd->outWatch = -1;\n- }\n-\n- if (cmd->errWatch != -1) {\n- virEventRemoveHandle(cmd->errWatch);\n- virCommandHandleReadWrite(cmd->errWatch, cmd->errfd, events, cmd);\n- cmd->errWatch = -1;\n- }\n-\n+ if (cmd->flags & VIR_EXEC_ASYNC_IO) {\n+ cmd->flags &= ~VIR_EXEC_ASYNC_IO;\n+ virThreadJoin(cmd->asyncioThread);\n+ VIR_FREE(cmd->asyncioThread);\n+ VIR_FORCE_CLOSE(cmd->inpipe);\n+ if (cmd->has_error) {\n+ const char *msg = _(\"Error while processing command's IO\");\n+ if (cmd->has_error < 0)\n+ virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\", msg);\n+ else\n+ virReportSystemError(cmd->has_error, \"%s\", msg);\n+ ret = -1;\n+ }\n+ }\n if (ret == 0) {\n cmd->pid = -1;\n cmd->reap = false;\n@@ -2719,6 +2525,10 @@\n VIR_FORCE_CLOSE(cmd->transfer[i]);\n }\n \n+ if (cmd->asyncioThread) {\n+ virThreadJoin(cmd->asyncioThread);\n+ VIR_FREE(cmd->asyncioThread);\n+ }\n VIR_FREE(cmd->inbuf);\n VIR_FORCE_CLOSE(cmd->outfd);\n VIR_FORCE_CLOSE(cmd->errfd);\n"} {"commit":"4ae0f65669a6672a408e08698678ed2958a77fde","subject":"util: hostcpu: Correctly report total number of vcpus in virHostCPUGetMap","message":"util: hostcpu: Correctly report total number of vcpus in virHostCPUGetMap\n\nCallers expect the return value to be the total number of vcpus in the\nhost (including offline vcpus). The refactor in c67e04e25fa58104e0fae41\nbroke this assumption by using virHostCPUGetOnlineBitmap which only\ncreates a bitmap long enough to hold the last online vcpu.\n\nReport the full number of host vcpus by returning value from\nvirHostCPUGetCount().\n\nSigned-off-by: Nitesh Konkar <0c76797a2b22fdb43818c29f9111edd281fa1e01@linux.vnet.ibm.com>\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"nertpinx\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,eskultety\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,datto\/libvirt,libvirt\/libvirt,crobinso\/libvirt,zippy2\/libvirt,VenkatDatta\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,libvirt\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,datto\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,olafhering\/libvirt,eskultety\/libvirt,VenkatDatta\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,datto\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,datto\/libvirt,VenkatDatta\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virhostcpu.c\n+++ src\/util\/virhostcpu.c\n@@ -1093,7 +1093,7 @@\n if (online)\n *online = virBitmapCountBits(cpus);\n \n- ret = virBitmapSize(cpus);\n+ ret = virHostCPUGetCount();\n \n cleanup:\n if (ret < 0 && cpumap)\n"} {"commit":"30b07a425d7b5b3ac7ca68d3574692ac6415ccbe","subject":"util: make virMacAddrParse more versatile","message":"util: make virMacAddrParse more versatile\n\nPreviously the MAC address text was required to be terminated with a\nNULL. After this, it can be terminated with a space or any control\ncharacter.\n","repos":"libvirt\/libvirt,crobinso\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,datto\/libvirt,datto\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,VenkatDatta\/libvirt,zippy2\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,VenkatDatta\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,olafhering\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,eskultety\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,datto\/libvirt,datto\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,datto\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virmacaddr.c\n+++ src\/util\/virmacaddr.c\n@@ -169,7 +169,7 @@\n \n addr->addr[i] = (unsigned char) result;\n \n- if ((i == 5) && (*end_ptr == '\\0'))\n+ if ((i == 5) && (*end_ptr <= ' '))\n return 0;\n if (*end_ptr != ':')\n break;\n"} {"commit":"3fa15af8e1b38b025ded71a317e7e19da2b160f6","subject":"util: virresctrl: Remove empty 'cleanup' sections","message":"util: virresctrl: Remove empty 'cleanup' sections\n\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"jfehlig\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,crobinso\/libvirt,olafhering\/libvirt,zippy2\/libvirt,crobinso\/libvirt,olafhering\/libvirt,libvirt\/libvirt,crobinso\/libvirt,nertpinx\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virresctrl.c\n+++ src\/util\/virresctrl.c\n@@ -527,7 +527,6 @@\n DIR *dirp)\n {\n int rv = -1;\n- int ret = -1;\n struct dirent *ent = NULL;\n \n while ((rv = virDirRead(dirp, &ent, SYSFS_RESCTRL_PATH \"\/info\")) > 0) {\n@@ -568,7 +567,7 @@\n ent->d_name);\n } else if (rv < 0) {\n \/* Other failures are fatal, so just quit *\/\n- goto cleanup;\n+ return -1;\n }\n \n rv = virFileReadValueString(&cbm_mask_str,\n@@ -584,14 +583,14 @@\n _(\"Cannot get cbm_mask from resctrl cache info\"));\n }\n if (rv < 0)\n- goto cleanup;\n+ return -1;\n \n virStringTrimOptionalNewline(cbm_mask_str);\n \n if (!(cbm_mask_map = virBitmapNewString(cbm_mask_str))) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Cannot parse cbm_mask from resctrl cache info\"));\n- goto cleanup;\n+ return -1;\n }\n \n i_type->bits = virBitmapCountBits(cbm_mask_map);\n@@ -603,7 +602,7 @@\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Cannot get min_cbm_bits from resctrl cache info\"));\n if (rv < 0)\n- goto cleanup;\n+ return -1;\n \n if (resctrl->nlevels <= level)\n VIR_EXPAND_N(resctrl->levels, resctrl->nlevels,\n@@ -624,22 +623,19 @@\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"Duplicate cache type in resctrl for level %u\"),\n level);\n- goto cleanup;\n+ return -1;\n }\n \n i_level->types[type] = g_steal_pointer(&i_type);\n }\n \n- ret = 0;\n- cleanup:\n- return ret;\n+ return 0;\n }\n \n \n static int\n virResctrlGetMemoryBandwidthInfo(virResctrlInfoPtr resctrl)\n {\n- int ret = -1;\n int rv = -1;\n g_autofree virResctrlInfoMemBWPtr i_membw = NULL;\n \n@@ -652,11 +648,10 @@\n * probably memory bandwidth allocation unsupported *\/\n VIR_INFO(\"The path '\" SYSFS_RESCTRL_PATH \"\/info\/MB\/bandwidth_gran'\"\n \"does not exist\");\n- ret = 0;\n- goto cleanup;\n+ return 0;\n } else if (rv < 0) {\n \/* Other failures are fatal, so just quit *\/\n- goto cleanup;\n+ return -1;\n }\n \n rv = virFileReadValueUint(&i_membw->min_bandwidth,\n@@ -669,7 +664,7 @@\n _(\"Cannot get min bandwidth from resctrl memory info\"));\n }\n if (rv < 0)\n- goto cleanup;\n+ return -1;\n \n rv = virFileReadValueUint(&i_membw->max_allocation,\n SYSFS_RESCTRL_PATH \"\/info\/MB\/num_closids\");\n@@ -679,12 +674,10 @@\n _(\"Cannot get max allocation from resctrl memory info\"));\n }\n if (rv < 0)\n- goto cleanup;\n+ return -1;\n \n resctrl->membw_info = g_steal_pointer(&i_membw);\n- ret = 0;\n- cleanup:\n- return ret;\n+ return 0;\n }\n \n \n@@ -702,7 +695,6 @@\n static int\n virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl)\n {\n- int ret = -1;\n int rv = -1;\n g_autofree char *featurestr = NULL;\n g_auto(GStrv) features = NULL;\n@@ -721,11 +713,10 @@\n * monitor unsupported *\/\n VIR_INFO(\"The file '\" SYSFS_RESCTRL_PATH \"\/info\/L3_MON\/num_rmids' \"\n \"does not exist\");\n- ret = 0;\n- goto cleanup;\n+ return 0;\n } else if (rv < 0) {\n \/* Other failures are fatal, so just quit *\/\n- goto cleanup;\n+ return -1;\n }\n \n rv = virFileReadValueUint(&info_monitor->cache_reuse_threshold,\n@@ -737,7 +728,7 @@\n VIR_DEBUG(\"File '\" SYSFS_RESCTRL_PATH\n \"\/info\/L3_MON\/max_threshold_occupancy' does not exist\");\n } else if (rv < 0) {\n- goto cleanup;\n+ return -1;\n }\n \n rv = virFileReadValueString(&featurestr,\n@@ -747,14 +738,14 @@\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Cannot get mon_features from resctrl\"));\n if (rv < 0)\n- goto cleanup;\n+ return -1;\n \n if (!*featurestr) {\n \/* If no feature found in \"\/info\/L3_MON\/mon_features\",\n * some error happens *\/\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n _(\"Got empty feature list from resctrl\"));\n- goto cleanup;\n+ return -1;\n }\n \n features = virStringSplitCount(featurestr, \"\\n\", 0, &nfeatures);\n@@ -764,9 +755,7 @@\n info_monitor->features = g_steal_pointer(&features);\n resctrl->monitor_info = g_steal_pointer(&info_monitor);\n \n- ret = 0;\n- cleanup:\n- return ret;\n+ return 0;\n }\n \n \n@@ -1480,7 +1469,6 @@\n char *tmp = NULL;\n size_t nmbs = 0;\n size_t i;\n- int ret = -1;\n \n \/* For no reason there can be spaces *\/\n virSkipSpaces((const char **) &line);\n@@ -1508,12 +1496,10 @@\n mbs = virStringSplitCount(tmp, \";\", 0, &nmbs);\n for (i = 0; i < nmbs; i++) {\n if (virResctrlAllocParseProcessMemoryBandwidth(resctrl, alloc, mbs[i]) < 0)\n- goto cleanup;\n- }\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+ }\n+\n+ return 0;\n }\n \n \n@@ -1591,7 +1577,6 @@\n char *tmp = strchr(cache, '=');\n unsigned int cache_id = 0;\n g_autoptr(virBitmap) mask = NULL;\n- int ret = -1;\n \n if (!tmp)\n return 0;\n@@ -1617,17 +1602,15 @@\n _(\"Missing or inconsistent resctrl info for \"\n \"level '%u' type '%s'\"),\n level, virCacheTypeToString(type));\n- goto cleanup;\n+ return -1;\n }\n \n virBitmapShrink(mask, resctrl->levels[level]->types[type]->bits);\n \n if (virResctrlAllocUpdateMask(alloc, level, type, cache_id, mask) < 0)\n- goto cleanup;\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+\n+ return 0;\n }\n \n \n@@ -1642,7 +1625,6 @@\n int type = -1;\n size_t ncaches = 0;\n size_t i = 0;\n- int ret = -1;\n \n \/* For no reason there can be spaces *\/\n virSkipSpaces((const char **) &line);\n@@ -1680,12 +1662,10 @@\n \n for (i = 0; i < ncaches; i++) {\n if (virResctrlAllocParseProcessCache(resctrl, alloc, level, type, caches[i]) < 0)\n- goto cleanup;\n- }\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+ }\n+\n+ return 0;\n }\n \n \n@@ -1697,20 +1677,16 @@\n g_auto(GStrv) lines = NULL;\n size_t nlines = 0;\n size_t i = 0;\n- int ret = -1;\n \n lines = virStringSplitCount(schemata, \"\\n\", 0, &nlines);\n for (i = 0; i < nlines; i++) {\n if (virResctrlAllocParseCacheLine(resctrl, alloc, lines[i]) < 0)\n- goto cleanup;\n+ return -1;\n if (virResctrlAllocParseMemoryBandwidthLine(resctrl, alloc, lines[i]) < 0)\n- goto cleanup;\n-\n- }\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+ }\n+\n+ return 0;\n }\n \n \n@@ -1943,7 +1919,6 @@\n ssize_t pos = -1;\n ssize_t last_bits = 0;\n ssize_t last_pos = -1;\n- int ret = -1;\n \n if (!size)\n return 0;\n@@ -2037,11 +2012,9 @@\n ignore_value(virBitmapSetBit(a_mask, i));\n \n if (virResctrlAllocUpdateMask(alloc, level, type, cache, a_mask) < 0)\n- goto cleanup;\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+\n+ return 0;\n }\n \n \n@@ -2174,7 +2147,6 @@\n virResctrlAllocAssign(virResctrlInfoPtr resctrl,\n virResctrlAllocPtr alloc)\n {\n- int ret = -1;\n unsigned int level = 0;\n g_autoptr(virResctrlAlloc) alloc_free = NULL;\n g_autoptr(virResctrlAlloc) alloc_default = NULL;\n@@ -2185,16 +2157,16 @@\n \n alloc_default = virResctrlAllocGetDefault(resctrl);\n if (!alloc_default)\n- goto cleanup;\n+ return -1;\n \n if (virResctrlAllocMemoryBandwidth(resctrl, alloc) < 0)\n- goto cleanup;\n+ return -1;\n \n if (virResctrlAllocCopyMasks(alloc, alloc_default) < 0)\n- goto cleanup;\n+ return -1;\n \n if (virResctrlAllocCopyMemBW(alloc, alloc_default) < 0)\n- goto cleanup;\n+ return -1;\n \n for (level = 0; level < alloc->nlevels; level++) {\n virResctrlAllocPerLevelPtr a_level = alloc->levels[level];\n@@ -2211,7 +2183,7 @@\n virReportError(VIR_ERR_CONFIG_UNSUPPORTED,\n _(\"Cache level %d does not support tuning\"),\n level);\n- goto cleanup;\n+ return -1;\n }\n \n for (type = 0; type < VIR_CACHE_TYPE_LAST; type++) {\n@@ -2227,7 +2199,7 @@\n _(\"Cache level %d does not support tuning for \"\n \"scope type '%s'\"),\n level, virCacheTypeToString(type));\n- goto cleanup;\n+ return -1;\n }\n \n for (cache = 0; cache < a_type->nsizes; cache++) {\n@@ -2235,14 +2207,12 @@\n virResctrlInfoPerTypePtr i_type = i_level->types[type];\n \n if (virResctrlAllocFindUnused(alloc, i_type, f_type, level, type, cache) < 0)\n- goto cleanup;\n+ return -1;\n }\n }\n }\n \n- ret = 0;\n- cleanup:\n- return ret;\n+ return 0;\n }\n \n \n@@ -2376,7 +2346,6 @@\n {\n g_autofree char *tasks = NULL;\n g_autofree char *pidstr = NULL;\n- int ret = 0;\n \n if (!path) {\n virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\",\n@@ -2392,12 +2361,10 @@\n virReportSystemError(errno,\n _(\"Cannot write pid in tasks file '%s'\"),\n tasks);\n- goto cleanup;\n- }\n-\n- ret = 0;\n- cleanup:\n- return ret;\n+ return -1;\n+ }\n+\n+ return 0;\n }\n \n \n"} {"commit":"d659cd341fcba05803472a021d511132ab197def","subject":"virsysinfo: Don't leak fw_cfg","message":"virsysinfo: Don't leak fw_cfg\n\nIn v6.4.0-72-g3dda889a44 I've introduced parsing and formatting\nof new sysinfo type 'fwcfg'. However, I've forgot to introduce\ncode that would free parsed data.\n\nSigned-off-by: Michal Privoznik <83d82aaba2eed257f4814b0c239c260c4caaadf0@redhat.com>\nReviewed-by: Daniel Henrique Barboza <627b089ad62deae9aaf06ccfa2c9056df28927e0@gmail.com>\n","repos":"nertpinx\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,crobinso\/libvirt,olafhering\/libvirt,libvirt\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,olafhering\/libvirt,zippy2\/libvirt,zippy2\/libvirt,zippy2\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,zippy2\/libvirt,olafhering\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/util\/virsysinfo.c\n+++ src\/util\/virsysinfo.c\n@@ -131,6 +131,19 @@\n VIR_FREE(def);\n }\n \n+\n+static void\n+virSysinfoFWCfgDefClear(virSysinfoFWCfgDefPtr def)\n+{\n+ if (!def)\n+ return;\n+\n+ VIR_FREE(def->name);\n+ VIR_FREE(def->value);\n+ VIR_FREE(def->file);\n+}\n+\n+\n \/**\n * virSysinfoDefFree:\n * @def: a sysinfo structure\n@@ -183,6 +196,10 @@\n VIR_FREE(def->memory);\n \n virSysinfoOEMStringsDefFree(def->oemStrings);\n+\n+ for (i = 0; i < def->nfw_cfgs; i++)\n+ virSysinfoFWCfgDefClear(&def->fw_cfgs[i]);\n+ VIR_FREE(def->fw_cfgs);\n \n VIR_FREE(def);\n }\n"} {"commit":"4888f9369c3ab7487d83fa8ee46cb4426d6a6f2c","subject":"[bouqueau] check input args + hide error messages from std:out\/err","message":"[bouqueau] check input args + hide error messages from std:out\/err\n\ngit-svn-id: ab66a9de07fa9d47c5829c82992f5279466c775f@4268 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"porcelijn\/gpac,gpac\/gpac,emmanouil\/gpac,ARSekkat\/gpac,DmitrySigaev\/gpac,rauf\/gpac,canatella\/gpac,RodolpheFouquet\/gpac,psteinb\/gpac,porcelijn\/gpac,nguyen-viet-thanh-trung\/gpac,epam\/gpac,ARSekkat\/gpac,psteinb\/gpac,Bevara\/Access-open,Bevara\/Access-open,epam\/gpac,rauf\/gpac,vladimir-kazakov\/gpac,gpac\/gpac,rbouqueau\/gpac_brew_travis,ARSekkat\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,epam\/gpac,drakeguan\/gpac,rbouqueau\/gpac,nguyen-viet-thanh-trung\/gpac,rbouqueau\/gpac,nguyen-viet-thanh-trung\/gpac,gpac\/gpac,porcelijn\/gpac,canatella\/gpac,emmanouil\/gpac,drakeguan\/gpac,vladimir-kazakov\/gpac,ARSekkat\/gpac,DmitrySigaev\/gpac,gpac\/gpac,rbouqueau\/gpac,porcelijn\/gpac,Bevara\/Access-open,gpac\/gpac,porcelijn\/gpac,aymanelyaagoubi\/gpac,psteinb\/gpac,nguyen-viet-thanh-trung\/gpac,DmitrySigaev\/gpac,psteinb\/gpac,emmanouil\/gpac,epam\/gpac,rauf\/gpac,epam\/gpac,aymanelyaagoubi\/gpac,gpac\/gpac,epam\/gpac,canatella\/gpac,nguyen-viet-thanh-trung\/gpac,RodolpheFouquet\/gpac,ARSekkat\/gpac,rbouqueau\/gpac_brew_travis,rbouqueau\/gpac,canatella\/gpac,canatella\/gpac,drakeguan\/gpac,gpac\/gpac,aymanelyaagoubi\/gpac,psteinb\/gpac,Bevara\/Access-open,aymanelyaagoubi\/gpac,gpac\/gpac,ARSekkat\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac_brew_travis,vladimir-kazakov\/gpac,RodolpheFouquet\/gpac,psteinb\/gpac,DmitrySigaev\/gpac,canatella\/gpac,emmanouil\/gpac,aymanelyaagoubi\/gpac,Bevara\/Access-open,rbouqueau\/gpac,vladimir-kazakov\/gpac,rauf\/gpac,drakeguan\/gpac,aymanelyaagoubi\/gpac,vladimir-kazakov\/gpac,drakeguan\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,vladimir-kazakov\/gpac,rbouqueau\/gpac_brew_travis,drakeguan\/gpac,rbouqueau\/gpac_brew_travis,rauf\/gpac,emmanouil\/gpac,rbouqueau\/gpac_brew_travis,RodolpheFouquet\/gpac,rauf\/gpac,emmanouil\/gpac,porcelijn\/gpac,rbouqueau\/gpac,Bevara\/Access-open,DmitrySigaev\/gpac,DmitrySigaev\/gpac,rbouqueau\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/utils\/os_divers.c\n+++ src\/utils\/os_divers.c\n@@ -407,7 +407,9 @@\n #else\n \t\/* success is == 0 *\/\n \tchar cmd[1024];\n-\tsnprintf(cmd, sizeof(cmd)-1, \"mv %s %s\", fileName, newFileName);\n+\tif (!fileName || !newFileName)\n+\t\treturn GF_IO_ERR;\n+\tsnprintf(cmd, sizeof(cmd)-1, \"mv %s %s > \/dev\/null 2>&1\", fileName, newFileName);\n \treturn ( system(cmd) == 0) ? GF_OK : GF_IO_ERR;\n #endif\n }\n"} {"commit":"c981b0970e2709d7bc84363eec0f1326adb2505d","subject":"vcl: fix compiling on newer systems","message":"vcl: fix compiling on newer systems\n\nBuild fails on ubuntu 17.10...\n\nChange-Id: I98dfffa3f8f5f9bca2ba97a856709714fbeec49c\nSigned-off-by: Damjan Marion <9141bba8b2efed526e55cf796d48631af330ad98@cisco.com>\n","repos":"vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,chrisy\/vpp,chrisy\/vpp,FDio\/vpp,vpp-dev\/vpp,FDio\/vpp,vpp-dev\/vpp,FDio\/vpp,FDio\/vpp,vpp-dev\/vpp,chrisy\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp,vpp-dev\/vpp,chrisy\/vpp,vpp-dev\/vpp,vpp-dev\/vpp,chrisy\/vpp,FDio\/vpp,chrisy\/vpp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vcl\/vcom_socket.c\n+++ src\/vcl\/vcom_socket.c\n@@ -30,6 +30,9 @@\n \n #include <vcl\/vppcom.h>\n \n+#ifndef IOV_MAX\n+#define IOV_MAX __IOV_MAX\n+#endif\n \n \/*\n * VCOM_SOCKET Private definitions and functions.\n"} {"commit":"660753d559044f38ecb3d1ab0f8a3ad7494ca5cf","subject":"clean-up debug output","message":"clean-up debug output\n","repos":"bisdn\/basebox,bisdn\/basebox,toanju\/basebox,bisdn\/basebox,bisdn\/basebox,toanju\/basebox","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/vmcore\/dptroute.h\n+++ src\/vmcore\/dptroute.h\n@@ -180,14 +180,11 @@\n \t\t\t\tos << \"rtindex: \" \t<< route.rtindex << \" \";\n \t\t\tos << \"> \";\n \n-\t\t\tif (route.dptnexthops.size() > 0)\n-\t\t\t\tos << std::endl;\n-\n \t\t\tfor (std::map<uint16_t, dptnexthop>::const_iterator\n \t\t\t\t\tit = route.dptnexthops.begin(); it != route.dptnexthops.end(); ++it) {\n \n \t\t\t\tdptnexthop const& nhop = it->second;\n-\t\t\t\tos << \" \" << nhop << std::endl;\n+\t\t\t\tos << std::endl << \" \" << nhop;\n \n \t\t\t}\n \t\t} break;\n"} {"commit":"5bc3bb96b3ad081930f5818b30a8308ee03455c0","subject":"Draw each side of a voxels with its own color","message":"Draw each side of a voxels with its own color\n","repos":"shamazmazum\/voxvision,shamazmazum\/voxvision","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/voxrnd\/renderer.c\n+++ src\/voxrnd\/renderer.c\n@@ -31,8 +31,8 @@\n vox_bounding_box (tree, &bb);\n __v4sf min = _mm_load_ps (bb.min);\n __v4sf max = _mm_load_ps (bb.max);\n- __v4sf m = _mm_set_ps1 (255.0) \/ (max - min);\n- __v4sf a = _mm_set_ps1 (255.0) * min \/ (min - max);\n+ __v4sf m = _mm_rcp_ps (max - min);\n+ __v4sf a = min \/ (min - max);\n _mm_store_ps (mul, m);\n _mm_store_ps (add, a);\n }\n@@ -43,7 +43,15 @@\n assert (format->format == SDL_PIXELFORMAT_ARGB8888);\n __v4sf m = _mm_load_ps (mul);\n __v4sf a = _mm_load_ps (add);\n- __v4sf color = _mm_load_ps (inter) * m + a;\n+ __v4sf i = _mm_load_ps (inter);\n+\n+ __v4sf color1 = i * m + a;\n+ __v4sf color2 = color1 + _mm_set_ps1 (0.05);\n+ __v4sf voxel = _mm_load_ps (vox_voxel);\n+ __v4sf aligned = voxel * _mm_floor_ps (i \/ voxel);\n+ __v4sf color = _mm_blendv_ps (color1, color2, i == aligned);\n+ color = _mm_set1_ps (255) * _mm_min_ps (color, _mm_set1_ps (1.0));\n+\n __m128i icol = _mm_cvtps_epi32 (color);\n __m128i mask = _mm_set_epi8 (0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,\n 0x80, 0x80, 0x80, 0x80, 0x80, 0, 4, 8);\n"} {"commit":"d66967f683d6d6a305f56d1680208b42e0c6dad0","subject":"vox_ray_tree_intersection() suspicious optimization","message":"vox_ray_tree_intersection() suspicious optimization\n","repos":"shamazmazum\/voxvision,shamazmazum\/voxvision","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/voxtrees\/search.c\n+++ src\/voxtrees\/search.c\n@@ -7,12 +7,11 @@\n \n WITH_STAT (static int recursion = -1;)\n \n-\/\/ Maybe following deserves a bit more explanation\n const struct vox_node*\n vox_ray_tree_intersection (const struct vox_node *tree, const vox_dot origin,\n const vox_dot dir, vox_dot res)\n {\n- vox_dot tmp;\n+ vox_dot bb_inter;\n int i;\n vox_dot *plane_inter;\n int *plane_inter_idx, tmp2;\n@@ -20,41 +19,63 @@\n \n WITH_STAT (recursion++);\n WITH_STAT (if (recursion == 0) gstats.rti_calls++);\n- \n+\n+ \/*\n+ * After hit_box call we can take bb_inter as a new ray origin.\n+ * This will help us with little optimization technik.\n+ *\/\n if (!(VOX_FULLP (tree)) ||\n- !(hit_box (&(tree->bounding_box), origin, dir, tmp)))\n+ !(hit_box (&(tree->bounding_box), origin, dir, bb_inter)))\n {\n WITH_STAT (if (recursion == 0) gstats.rti_early_exits++);\n goto end;\n }\n+ \/*\n+ * If ray hits bounding box of a dense leaf, then it hits anything inside it.\n+ *\/\n if (tree->flags & DENSE_LEAF)\n {\n leaf = tree;\n- vox_dot_copy (res, tmp);\n+ vox_dot_copy (res, bb_inter);\n WITH_STAT (if (recursion == 0) gstats.rti_early_exits++);\n goto end;\n }\n \n if (tree->flags & LEAF)\n {\n- \/\/ If passed argument is a tree leaf, do O(tree->dots_num) search for intersections\n- \/\/ with voxels stored in the leaf and return closest one\n+ \/*\n+ * If passed argument is a tree leaf, do O(tree->dots_num) search for intersections\n+ * with voxels stored in the leaf and return closest one.\n+ *\/\n float dist_closest, dist_far;\n vox_dot *dots = tree->data.dots;\n struct vox_box *voxel = alloca (sizeof (struct vox_box));\n+ vox_dot far_inter;\n \n- \/\/ tmp is a \"far\" intersection, while res is the closest one.\n for (i=0; i<tree->dots_num; i++)\n {\n vox_dot_copy (voxel->min, dots[i]);\n vox_sum_vector (voxel->min, vox_voxel, voxel->max);\n- if (hit_box (voxel, origin, dir, tmp))\n+ if (hit_box (voxel, bb_inter, dir, far_inter))\n {\n- dist_far = vox_abs_metric (origin, tmp);\n+ dist_far = vox_abs_metric (bb_inter, far_inter);\n+ \/*\n+ * This is the optimization I mentioned earlier.\n+ * If a distance between the node's bounding box and newly found\n+ * intersection is zero, than you cannot get any closer, so return\n+ * it. This works on very rare occasions in normal scenes, but helps a lot\n+ * in certain conditions. The branch should be predictible.\n+ *\/\n+ if (dist_far == 0)\n+ {\n+ vox_dot_copy (res, far_inter);\n+ leaf = tree;\n+ goto end;\n+ }\n if ((leaf && (dist_far < dist_closest)) || (!leaf))\n {\n dist_closest = dist_far;\n- vox_dot_copy (res, tmp);\n+ vox_dot_copy (res, far_inter);\n leaf = tree;\n }\n }\n@@ -62,10 +83,10 @@\n goto end;\n }\n \n- \/\/ not a leaf. tmp holds an entry point into node's bounding box\n+ \/\/ not a leaf. bb_inter holds an entry point into node's bounding box\n const vox_inner_data *inner = &(tree->data.inner);\n \/\/ Find subspace index of the entry point\n- int subspace = get_subspace_idx (inner->center, tmp);\n+ int subspace = get_subspace_idx (inner->center, bb_inter);\n for (i=0; i<VOX_N; i++)\n {\n \/*\n@@ -73,32 +94,36 @@\n direction. This is because get_subspace_idx() may return wrong index in that\n special case.\n *\/\n- if (inner->center[i] == origin[i])\n+ if (inner->center[i] == bb_inter[i])\n {\n if (dir[i] > 0) subspace &= ~(1<<i);\n else subspace |= 1<<i;\n }\n }\n- \/\/ Look if we are lucky and the ray hits any box before it traverses the dividing planes\n- \/\/ (in other words it hits a box close enough to the entry_point)\n- if ((leaf = vox_ray_tree_intersection (inner->children[subspace], tmp, dir,\n+ \/*\n+ * Look if we are lucky and the ray hits any box before it traverses the dividing\n+ * planes (in other words it hits a box close enough to the entry point).\n+ *\/\n+ if ((leaf = vox_ray_tree_intersection (inner->children[subspace], bb_inter, dir,\n res)))\n {\n WITH_STAT (if (recursion == 0) gstats.rti_first_subspace++);\n goto end;\n }\n \n- \/\/ No luck, search for intersections of the ray and all N axis-aligned dividing planes\n- \/\/ for our N-dimentional space.\n- \/\/ If such an intersection is inside the node (it means, inside its bounding box),\n- \/\/ add it to plane_inter and mark with number of plane where intersection is occured.\n+ \/*\n+ * No luck, search for intersections of the ray and all N axis-aligned dividing planes\n+ * for our N-dimentional space. If such an intersection is inside the node (it means,\n+ * inside its bounding box), add it to plane_inter and mark with number of plane where\n+ * intersection is occured.\n+ *\/\n plane_inter = alloca (sizeof (vox_dot) * VOX_N);\n plane_inter_idx = alloca (sizeof (vox_dot) * VOX_N);\n int plane_counter = 0;\n for (i=0; i<VOX_N; i++)\n {\n plane_inter_idx[plane_counter] = i;\n- if (hit_plane_within_box (origin, dir, inner->center, i, plane_inter[plane_counter],\n+ if (hit_plane_within_box (bb_inter, dir, inner->center, i, plane_inter[plane_counter],\n &(tree->bounding_box))) plane_counter++;\n }\n \n@@ -109,9 +134,10 @@\n so find closest remaining intersection with dividing planes.\n *\/\n int j;\n+ vox_dot tmp;\n for (j=i+1; j<plane_counter; j++)\n {\n- if (vox_abs_metric (origin, plane_inter[j]) < vox_abs_metric (origin, plane_inter[i]))\n+ if (vox_abs_metric (bb_inter, plane_inter[j]) < vox_abs_metric (bb_inter, plane_inter[i]))\n {\n vox_dot_copy (tmp, plane_inter[j]);\n vox_dot_copy (plane_inter[j], plane_inter[i]);\n@@ -125,9 +151,12 @@\n \/\/ Convert a plane number into a subspace index\n subspace = subspace ^ (1 << plane_inter_idx[i]);\n \n- \/\/ For each intersection with dividing plane call vox_ray_tree_intersection recursively,\n- \/\/ using child node specified by subspace index. If an intersection is found, return.\n- \/\/ Note, what we specify an entry point to that child as a new ray origin\n+ \/*\n+ * For each intersection with dividing plane call vox_ray_tree_intersection\n+ * recursively, using child node specified by subspace index. If an intersection\n+ * is found, return. Note, what we specify an entry point to that child as a new\n+ * ray origin.\n+ *\/\n if ((leaf = vox_ray_tree_intersection (inner->children[subspace], plane_inter[i], dir,\n res)))\n goto end;\n"} {"commit":"f19d3d6c78bb381885b59df659fd1721527193fe","subject":"CORE: QA: Fix an issue with missing height serialisation","message":"CORE: QA: Fix an issue with missing height serialisation\n\nThis was having some knock on effects like incorrect balance display and creation of invalid transactions in some cases.\n","repos":"nlgcoin\/guldencoin-official,nlgcoin\/guldencoin-official,nlgcoin\/guldencoin-official,nlgcoin\/guldencoin-official,nlgcoin\/guldencoin-official,nlgcoin\/guldencoin-official","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wallet\/merkletx.h\n+++ src\/wallet\/merkletx.h\n@@ -89,7 +89,7 @@\n READWRITE(hashBlock);\n \n \/\/ From 2.1 (mobile unity wallets) and 2.2 (desktop wallets) we introduce block height and time for transactions.\n- if ( (s.GetType() & SER_DISK) && (s.GetVersion() >= 2020000))\n+ if ( (s.GetType() & SER_DISK) && (s.GetVersion() >= 1000004))\n {\n READWRITE(nHeight);\n READWRITE(nBlockTime);\n"} {"commit":"7cc981c14067d4b0e774a6bfb0acfc2f5c911f0d","subject":"string.format(\"%q\", str) is now fully reversible (from Lua 5.2).","message":"string.format(\"%q\", str) is now fully reversible (from Lua 5.2).\n","repos":"SnabbCo\/snabbswitch,snabbco\/snabb,Igalia\/snabb,alexandergall\/snabbswitch,Igalia\/snabbswitch,Igalia\/snabb,SnabbCo\/snabbswitch,eugeneia\/snabb,eugeneia\/snabbswitch,heryii\/snabb,eugeneia\/snabbswitch,dpino\/snabb,dpino\/snabbswitch,snabbco\/snabb,alexandergall\/snabbswitch,Igalia\/snabbswitch,dpino\/snabb,SnabbCo\/snabbswitch,eugeneia\/snabbswitch,dpino\/snabb,heryii\/snabb,Igalia\/snabb,heryii\/snabb,snabbco\/snabb,heryii\/snabb,alexandergall\/snabbswitch,alexandergall\/snabbswitch,dpino\/snabbswitch,Igalia\/snabbswitch,snabbco\/snabb,dpino\/snabb,snabbco\/snabb,Igalia\/snabb,Igalia\/snabb,Igalia\/snabb,dpino\/snabbswitch,snabbco\/snabb,dpino\/snabb,eugeneia\/snabb,Igalia\/snabb,dpino\/snabb,eugeneia\/snabb,alexandergall\/snabbswitch,Igalia\/snabbswitch,heryii\/snabb,SnabbCo\/snabbswitch,eugeneia\/snabb,eugeneia\/snabb,eugeneia\/snabbswitch,snabbco\/snabb,eugeneia\/snabb,dpino\/snabbswitch,alexandergall\/snabbswitch,Igalia\/snabbswitch,Igalia\/snabb,alexandergall\/snabbswitch,heryii\/snabb,snabbco\/snabb,eugeneia\/snabb,alexandergall\/snabbswitch,eugeneia\/snabb,dpino\/snabb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/lib_string.c\n+++ src\/lib_string.c\n@@ -653,20 +653,18 @@\n const char *s = strdata(str);\n luaL_addchar(b, '\"');\n while (len--) {\n- switch (*s) {\n- case '\"': case '\\\\': case '\\n':\n+ if (*s == '\"' || *s == '\\\\' || *s == '\\n') {\n luaL_addchar(b, '\\\\');\n luaL_addchar(b, *s);\n- break;\n- case '\\r':\n- luaL_addlstring(b, \"\\\\r\", 2);\n- break;\n- case '\\0':\n- luaL_addlstring(b, \"\\\\000\", 4);\n- break;\n- default:\n+ } else if (lj_char_iscntrl(uchar(*s))) {\n+ uint32_t c1, c2, c3;\n+ luaL_addchar(b, '\\\\');\n+ c1 = uchar(*s); c3 = c1 % 10; c1 \/= 10; c2 = c1 % 10; c1 \/= 10;\n+ if (c1 + lj_char_isdigit(uchar(s[1]))) luaL_addchar(b, '0' + c1);\n+ if (c2 + (c1 + lj_char_isdigit(uchar(s[1])))) luaL_addchar(b, '0' + c2);\n+ luaL_addchar(b, '0' + c3);\n+ } else {\n luaL_addchar(b, *s);\n- break;\n }\n s++;\n }\n"} {"commit":"a44068b161db1891afe07aa27470ae79d0b11c1d","subject":"likelihood.c now frees gamma_matrix correctly always","message":"likelihood.c now frees gamma_matrix correctly always\n","repos":"cboettig\/wrightscape,cboettig\/wrightscape","returncode":0,"stderr":"","license":"cc0-1.0","lang":"C","diff":"--- src\/likelihood.c\n+++ src\/likelihood.c\n@@ -367,7 +367,7 @@\n }\n \n *llik = log_normal_lik(n_tips, X_EX, V);\n- free(gamma_matrix);\n+ gsl_matrix_free(gamma_matrix);\n free(X_EX); \n free(V);\n free(tips);\n@@ -434,9 +434,97 @@\n gsl_vector_free(EX);\n gsl_matrix_free(V);\n gsl_vector_free(simdata);\n- free(gamma_matrix);\n+ gsl_matrix_free(gamma_matrix);\n free(tips);\n }\n \n \n-\n+void unit_tests (const double *Xo, const double alpha[], const double theta[], \n+ const double sigma[], const int regimes[], const int ancestor[],\n+ const double branch_length[], const double traits[], \n+ int *n_nodes, int lca_matrix[], double *llik)\n+{\n+ \/* gsl_set_error_handler_off (); \/* Comment out this line to assist debugging *\/\n+\n+ \/* Declare variables *\/\n+ int i, j, ki, kj;\n+ int n_tips = (*n_nodes+1)\/2;\n+ double *X_EX = (double *) malloc(n_tips * sizeof(double));\n+ double *V = (double *) malloc(n_tips * n_tips * sizeof(double));\n+ gsl_matrix * gamma_matrix = gsl_matrix_calloc(*n_nodes,*n_nodes);\n+ double mean;\n+ int lca;\n+ int * tips = alloc_tips(*n_nodes, ancestor);\n+\n+\n+ \/* Calculate the gamma matrix *\/\n+ calc_gamma_matrix(tips, n_tips, alpha, regimes, ancestor,\n+ branch_length, gamma_matrix);\n+\n+\n+ \/* Unit test -- tips have the same age *\/\n+ for(i = 0; i < n_tips; i++)\n+ printf(\"%lf\\n\", node_age(tips[i], ancestor, branch_length));\n+\n+ \/* Unit test -- gamma of root values *\/\n+ for(i = 0; i < n_tips; i++)\n+ printf(\"%lf\\n\", gsl_matrix_get(gamma_matrix, tips[i], 0));\n+ printf(\"%lf\\n\", gsl_matrix_get(gamma_matrix, tips[i], ancestor[tips[i]]));\n+\n+\/* Unit test -- variance on a single tip with a middle node (tree = *-*-*) *\/\n+double salpha[] = {.1}; \n+double ssigma[] = {2}; \n+int sregimes[] = {0, 0, 0, 0}; \n+int sancestor[] = {-1, 0, 1, 1}; \n+double sbranch_length[] = {0, 5, 5, 5}; \n+int s_tips[] = {2,3};\n+gsl_matrix * sgamma_matrix = gsl_matrix_calloc(4,4);\n+calc_gamma_matrix(s_tips, 2, salpha, sregimes, sancestor,\n+ sbranch_length, sgamma_matrix);\n+printf(\"var: %lf\\n\",\tcalc_var(2, 3, 1, salpha, ssigma, sregimes, sancestor, sbranch_length, sgamma_matrix));\n+printf(\"analytic %lf\\n\", gsl_pow_2(ssigma[0])\/(2*salpha[0]) * (1 - exp(-2*salpha[0]*5)) *exp(-2*salpha[0]*5) );\n+\n+printf(\"var: %lf\\n\",\tcalc_var(2, 2, 2, salpha, ssigma, sregimes, sancestor, sbranch_length, sgamma_matrix));\n+printf(\"analytic %lf\\n\", gsl_pow_2(ssigma[0])\/(2*salpha[0]) * (1 - exp(-2*salpha[0]*10)));\n+\n+for(i=0;i<4;i++){\n+\tprintf(\"\\n\");\n+ for(j=0;j<4;j++){\n+\t\tprintf(\"%g\\t \", gsl_matrix_get(sgamma_matrix, i, j));\n+\t}\n+}\n+printf(\"\\n\\n\");\n+\n+\n+ \/* Calculate the mean square differences *\/\n+ for(i = 0; i < n_tips; i++){\n+ ki = tips[i];\n+ mean = calc_mean(ki, *Xo, alpha, theta, regimes, ancestor,\n+ branch_length, gamma_matrix);\n+ X_EX[i] = traits[ki] - mean;\n+ printf(\"%lf\\n\", mean);\n+ }\n+\n+\n+ \/* Calculate the variances *\/\n+ for(i=0; i < n_tips; i++){\n+ ki = tips[i];\n+ for(j=0; j < n_tips; j++){\n+ kj = tips[j];\n+ \/* Identify which node is last common ancestor of the tips*\/\n+ lca = lca_matrix[ki * *n_nodes + kj];\n+ \/* get the covariance between all possible pairs of tips *\/\n+ V[n_tips*i+j] = calc_var(ki, kj, lca, alpha, sigma, regimes,\n+ ancestor, branch_length, gamma_matrix);\n+ if(ki==kj) printf(\"%g, %d, %d\\n\", V[n_tips*i+j], ki, lca);\n+ }\n+ }\n+\n+ *llik = log_normal_lik(n_tips, X_EX, V);\n+ gsl_matrix_free(gamma_matrix);\n+ free(X_EX); \n+ free(V);\n+ free(tips);\n+}\n+\n+\n"} {"commit":"6f63e871cde9ad7f774dd309a12963d33ad9e850","subject":"Itanium2, doesn't support hardware overflow....yet...","message":"Itanium2, doesn't support hardware overflow....yet...\n","repos":"pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/linux-ia64.c\n+++ src\/linux-ia64.c\n@@ -2050,7 +2050,7 @@\n \t\t\t 0, \/* We can use add_prog_event *\/\n \t\t\t 0, \/* We can write the counters *\/\n \t\t\t 1, \/* supports HW overflow *\/\n-#ifdef PFM20 \/* Only Libpfm 2.0+ supports hardware profiling *\/\n+#if defined(PFM20) && !defined(ITANIUM2) \/* Only Libpfm 2.0+ and Itanium supports hardware profiling *\/\n \t\t\t 1, \/* supports HW profile *\/\n #else\n \t\t\t 0, \/* supports HW profile *\/\n"} {"commit":"59e44a3ff36e0a67cd39c8e3149d2fdaa089b7d4","subject":"Fix thread initialisation race (thread sanitizer)","message":"Fix thread initialisation race (thread sanitizer)\n","repos":"metaparadigm\/latypus,metaparadigm\/latypus,metaparadigm\/latypus,metaparadigm\/latypus","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/log_thread.h\n+++ src\/log_thread.h\n@@ -24,10 +24,10 @@\n time_t last_time;\n std::atomic<bool> running;\n std::atomic<bool> writer_waiting;\n- std::thread thread;\n std::mutex log_mutex;\n std::condition_variable log_cond;\n std::condition_variable writer_cond;\n+ std::thread thread;\n \n log_thread(int fd, size_t num_buffers);\n virtual ~log_thread();\n"} {"commit":"858835c54adb57c54e4870bd61caab8cfcf2f6df","subject":"Fixed Bug 7827","message":"Fixed Bug 7827\n\nFixed reflect shield not respecting maps reduction flags.\nData tested and confirmed on official server, special Thanks to Yommy and Haruna.\nhttp:\/\/hercules.ws\/board\/tracker\/issue-7827-reflect-shield-woe-reductions-autoguard\/\n\nSigned-off-by: shennetsind <d2875a25db4b1dbc5c3b90f5ac80c894b5d6c5e5@henn.et>\n","repos":"Nipol\/Siesta,Nipol\/Siesta,Nipol\/Siesta","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/map\/battle.c\n+++ src\/map\/battle.c\n@@ -5175,7 +5175,19 @@\n \t\t}\n \t\tif( sc && sc->count ) {\n \t\t\tif( sc->data[SC_REFLECTSHIELD] && skill_id != WS_CARTTERMINATION ){\n-\t\t\t\tNORMALIZE_RDAMAGE(damage * sc->data[SC_REFLECTSHIELD]->val2 \/ 100);\n+\t\t\t\tint64 t = damage * sc->data[SC_REFLECTSHIELD]->val2 \/ 100;\n+\t\t\t\t\n+\t\t\t\tif (flag & BF_SKILL) {\n+\t\t\t\t\tif (flag&BF_WEAPON)\n+\t\t\t\t\t\tt = t * map->list[bl->m].weapon_damage_rate \/ 100;\n+\t\t\t\t\tif (flag&BF_MISC)\n+\t\t\t\t\t\tt = t * map->list[bl->m].misc_damage_rate \/ 100;\n+\t\t\t\t} else {\n+\t\t\t\t\tif (flag & BF_SHORT)\n+\t\t\t\t\t\tt = t * map->list[bl->m].short_damage_rate \/ 100;\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tNORMALIZE_RDAMAGE(t);\n \t\t\t\t*delay = clif->skill_damage(src, src, timer->gettick(), status_get_amotion(src), status_get_dmotion(src), rdamage, 1, CR_REFLECTSHIELD, 1, 4);\n \t\t\t}\n \t\t\tif( sc->data[SC_LG_REFLECTDAMAGE] && rand()%100 < (30 + 10*sc->data[SC_LG_REFLECTDAMAGE]->val1) ) {\n"} {"commit":"e9a2a815985c8b824eb18b4da2b3519c281c5367","subject":"Fix Mips bug.","message":"Fix Mips bug.\n\nThe source and destination addresses were swapped, causing access errors.\n\nBug: 21759492\n(cherry picked from commit a7db682f20dedc53c6ded05d870eb2490d257fe1)\n\nChange-Id: I7e7e98918577fc708c09f195842a6088df4f40ee\n","repos":"geekboxzone\/mmallow_external_libunwind,SyndicateRogue\/libunwind,geekboxzone\/mmallow_external_libunwind,geekboxzone\/mmallow_external_libunwind,SyndicateRogue\/libunwind,SyndicateRogue\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mips\/Ginit.c\n+++ src\/mips\/Ginit.c\n@@ -216,7 +216,7 @@\n if (write)\n return -1;\n \n- *(unw_word_t *) (uintptr_t) addr = *val;\n+ *val = *(unw_word_t *) (uintptr_t) addr;\n Debug (16, \"mem[%llx] <- %llx\\n\", (long long) addr, (long long) *val);\n return 0;\n }\n"} {"commit":"4e54fc160224190187431e60a8a3b14d767b65ee","subject":"Fixed block_Realloc when block_t->p_buffer has changed.","message":"Fixed block_Realloc when block_t->p_buffer has changed.\n","repos":"krichter722\/vlc,krichter722\/vlc,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/misc\/block.c\n+++ src\/misc\/block.c\n@@ -172,21 +172,21 @@\n return p_rea;\n }\n \n- \/* We have a very large reserved footer now? Release some of it. *\/\n- if ((p_sys->p_allocated_buffer + p_sys->i_allocated_buffer) -\n- (p_block->p_buffer + p_block->i_buffer) > BLOCK_WASTE_SIZE)\n- {\n- const size_t news = p_block->i_buffer + 2 * BLOCK_PADDING_SIZE + 16;\n- block_sys_t *newb = realloc (p_sys, sizeof (*p_sys) + news);\n-\n- if (newb != NULL)\n+ \/* We have a very large reserved footer now? Release some of it.\n+ * XXX it may not keep the algniment of p_buffer *\/\n+ if( (p_sys->p_allocated_buffer + p_sys->i_allocated_buffer) -\n+ (p_block->p_buffer + p_block->i_buffer) > BLOCK_WASTE_SIZE )\n+ {\n+ const ptrdiff_t i_prebody = p_block->p_buffer - p_sys->p_allocated_buffer;\n+ const size_t i_new = i_prebody + p_block->i_buffer + 1 * BLOCK_PADDING_SIZE;\n+ block_sys_t *p_new = realloc( p_sys, sizeof (*p_sys) + i_new );\n+\n+ if( p_new != NULL )\n {\n- p_sys = newb;\n- p_sys->i_allocated_buffer = news;\n+ p_sys = p_new;\n+ p_sys->i_allocated_buffer = i_new;\n p_block = &p_sys->self;\n- p_block->p_buffer = p_sys->p_allocated_buffer + BLOCK_PADDING_SIZE\n- + BLOCK_ALIGN\n- - ((uintptr_t)p_sys->p_allocated_buffer % BLOCK_ALIGN);\n+ p_block->p_buffer = &p_sys->p_allocated_buffer[i_prebody];\n }\n }\n return p_block;\n"} {"commit":"6cd4aa257bd2d9ea851f809b727806565d03aee7","subject":"image: filter may fail, don't crash on NULL picture","message":"image: filter may fail, don't crash on NULL picture\n","repos":"xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/misc\/image.c\n+++ src\/misc\/image.c\n@@ -339,9 +339,15 @@\n p_tmp_pic =\n p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );\n \n- p_block = p_image->p_enc->pf_encode_video( p_image->p_enc, p_tmp_pic );\n-\n- p_image->p_filter->pf_video_buffer_del( p_image->p_filter, p_tmp_pic );\n+ if( likely(p_tmp_pic != NULL) )\n+ {\n+ p_block = p_image->p_enc->pf_encode_video( p_image->p_enc,\n+ p_tmp_pic );\n+ p_image->p_filter->pf_video_buffer_del( p_image->p_filter,\n+ p_tmp_pic );\n+ }\n+ else\n+ p_block = NULL;\n }\n else\n {\n"} {"commit":"60c51db90c028630b59d462c61e058e8df0651d4","subject":"Fix stats crash","message":"Fix stats crash\n\n","repos":"xkfz007\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/misc\/stats.c\n+++ src\/misc\/stats.c\n@@ -162,7 +162,14 @@\n *val = p_counter->pp_samples[0]->value;\n break;\n case STATS_DERIVATIVE:\n- if( p_counter->i_type == VLC_VAR_INTEGER )\n+ \/* Not ready yet *\/\n+ if( p_counter->i_samples < 2 )\n+ {\n+ vlc_mutex_unlock( &p_handler->object_lock );\n+ val->i_int = 0; val->f_float = 0.0;\n+ return VLC_EGENERIC;\n+ }\n+ if( p_counter->i_type == VLC_VAR_INTEGER )\n {\n float f = ( p_counter->pp_samples[0]->value.i_int -\n p_counter->pp_samples[1]->value.i_int ) \/\n"} {"commit":"c34ae88f3867877a83957d78025d6d49e7ff6340","subject":"Problem: server contains debugging output","message":"Problem: server contains debugging output\n\nSolution: remove this\n","repos":"hintjens\/malamute,QbaseLLC\/malamute-core,zoobab\/malamute,trevorbernard\/malamute-core,lnls-dig\/malamute,hurtonm\/malamute,hintjens\/malamute,hurtonm\/malamute,hintjens\/malamute,lnls-dig\/malamute,hintjens\/malamute,lnls-dig\/malamute,opedroso\/malamute,gotcha\/malamute,zeromq\/malamute,tberkey\/malamute-core,malanka\/malamute,opedroso\/malamute,zoobab\/malamute,opedroso\/malamute,lnls-dig\/malamute,gotcha\/malamute,hintjens\/malamute,gotcha\/malamute,zoobab\/malamute,tberkey\/malamute-core,zeromq\/malamute,malanka\/malamute,vyskocilm\/malamute-core,opedroso\/malamute,opedroso\/malamute,lnls-dig\/malamute,asokoloski\/malamute,trevorbernard\/malamute-core,zeromq\/malamute,opedroso\/malamute,gotcha\/malamute,asokoloski\/malamute,hurtonm\/malamute,tberkey\/malamute-core,vyskocilm\/malamute-core,gotcha\/malamute,malanka\/malamute,karolhrdina\/malamute,QbaseLLC\/malamute-core,hintjens\/malamute,vyskocilm\/malamute-core,zoobab\/malamute,asokoloski\/malamute,trevorbernard\/malamute-core,hurtonm\/malamute,zoobab\/malamute,karolhrdina\/malamute,vyskocilm\/malamute-core,lnls-dig\/malamute,asokoloski\/malamute,hurtonm\/malamute,hintjens\/malamute,trevorbernard\/malamute-core,zeromq\/malamute,vyskocilm\/malamute-core,vyskocilm\/malamute-core,zoobab\/malamute,asokoloski\/malamute,opedroso\/malamute,karolhrdina\/malamute,karolhrdina\/malamute,hurtonm\/malamute,karolhrdina\/malamute,zoobab\/malamute,asokoloski\/malamute,hurtonm\/malamute,malanka\/malamute,zeromq\/malamute,gotcha\/malamute,zeromq\/malamute,malanka\/malamute,zeromq\/malamute,malanka\/malamute,malanka\/malamute,QbaseLLC\/malamute-core,karolhrdina\/malamute,asokoloski\/malamute,gotcha\/malamute,vyskocilm\/malamute-core,karolhrdina\/malamute,lnls-dig\/malamute","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/mlm_server.c\n+++ src\/mlm_server.c\n@@ -378,7 +378,6 @@\n mailbox_msg_t *msg = s_mailbox_msg_new (\n self->address, mlm_msg_subject (self->message), mlm_msg_tracker (self->message), &content);\n zlistx_add_end (mailbox->queue, msg);\n- zsys_debug (\"mailbox name=%s size=%d\", mailbox->name, zlistx_size (mailbox->queue));\n \n \/\/ Alert mailbox client, if any\n if (mailbox->client)\n"} {"commit":"c2feb3e1ad3149ff394cddd80c93e9cceceda8e9","subject":"[mod_expire] check for default if mime not found","message":"[mod_expire] check for default if mime not found\n\ncheck for default caching if mime-type not found in expire.mimetypes\n","repos":"lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/mod_expire.c\n+++ src\/mod_expire.c\n@@ -267,10 +267,15 @@\n \tif (NULL == ds) {\n \t\tif (NULL == p->conf.expire_mimetypes) return HANDLER_GO_ON;\n \t\tvb = http_header_response_get(r, HTTP_HEADER_CONTENT_TYPE, CONST_STR_LEN(\"Content-Type\"));\n-\t\tds = (NULL != vb)\n-\t\t ? (const data_string *)array_match_key_prefix(p->conf.expire_mimetypes, vb)\n-\t\t : (const data_string *)array_get_element_klen(p->conf.expire_mimetypes, CONST_STR_LEN(\"\"));\n-\t\tif (NULL == ds) return HANDLER_GO_ON;\n+\t\tif (NULL != vb)\n+\t\t\tds = (const data_string *)\n+\t\t\t array_match_key_prefix(p->conf.expire_mimetypes, vb);\n+\t\tif (NULL == ds) {\n+\t\t\tds = (const data_string *)\n+\t\t\t array_get_element_klen(p->conf.expire_mimetypes,\n+\t\t\t CONST_STR_LEN(\"\"));\n+\t\t\tif (NULL == ds) return HANDLER_GO_ON;\n+\t\t}\n \t}\n \n \tconst time_t * const off = p->toffsets + ds->value.used;\n"} {"commit":"77c2883da976872362780ba4f774a52f9dd07ad2","subject":"[mod_webdav] quiet coverity warnings","message":"[mod_webdav] quiet coverity warnings\n","repos":"gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4,gstrauss\/lighttpd1.4","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/mod_webdav.c\n+++ src\/mod_webdav.c\n@@ -2034,6 +2034,9 @@\n static int\n webdav_fcopyfile_sz (int ifd, int ofd, off_t isz)\n {\n+ if (0 == isz)\n+ return 0;\n+\n #ifdef _WIN32\n \/* Windows CopyFile() not usable here; operates on filenames, not fds *\/\n #else\n@@ -2046,8 +2049,8 @@\n if (0 == fcopyfile(ifd, ofd, NULL, COPYFILE_ALL))\n return 0;\n \n- lseek(ifd, 0, SEEK_SET);\n- lseek(ofd, 0, SEEK_SET);\n+ if (0 != lseek(ifd, 0, SEEK_SET)) return -1;\n+ if (0 != lseek(ofd, 0, SEEK_SET)) return -1;\n #endif\n \n #if 0\n@@ -2055,8 +2058,8 @@\n if (0 == elftc_copyfile(ifd, ofd))\n return 0;\n \n- lseek(ifd, 0, SEEK_SET);\n- lseek(ofd, 0, SEEK_SET);\n+ if (0 != lseek(ifd, 0, SEEK_SET)) return -1;\n+ if (0 != lseek(ofd, 0, SEEK_SET)) return -1;\n #endif\n #endif\n \n@@ -2067,11 +2070,8 @@\n return 0;\n \n \/*lseek(ifd, 0, SEEK_SET);*\/ \/*(ifd offset not modified due to &offset arg)*\/\n- lseek(ofd, 0, SEEK_SET);\n+ if (0 != lseek(ofd, 0, SEEK_SET)) return -1;\n #endif\n-\n- if (0 == isz)\n- return 0;\n \n ssize_t rd, wr, off;\n char buf[16384];\n@@ -2777,6 +2777,9 @@\n * Be sure to hard-link using linkat() w\/o AT_SYMLINK_FOLLOW)*\/\n }\n #endif\n+ else {\n+ status = 0;\n+ }\n \n src->path->ptr[ (src->path->used = src_path_used) -1] = '\\0';\n src->rel_path->ptr[(src->rel_path->used = src_rel_path_used)-1] = '\\0';\n"} {"commit":"5b39016d50c17cdc95641d873945d741865f0550","subject":"bump version to 0.28.3","message":"bump version to 0.28.3\n","repos":"nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/nw_version.h\n+++ src\/nw_version.h\n@@ -23,7 +23,7 @@\n \n #define NW_MAJOR_VERSION 0\n #define NW_MINOR_VERSION 28\n-#define NW_PATCH_VERSION 2\n+#define NW_PATCH_VERSION 3\n \n #define NW_VERSION_IS_RELEASE 1\n \n"} {"commit":"b0e6b160d5c942969af99dbefc1c1e45ae3d55ff","subject":"bump version to 0.18.4","message":"bump version to 0.18.4\n","repos":"nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/nw_version.h\n+++ src\/nw_version.h\n@@ -23,7 +23,7 @@\n \n #define NW_MAJOR_VERSION 0\n #define NW_MINOR_VERSION 18\n-#define NW_PATCH_VERSION 3\n+#define NW_PATCH_VERSION 4\n \n #define NW_VERSION_IS_RELEASE 1\n \n"} {"commit":"1d65e6d5f10acc293e844df5c9e5922089c89621","subject":"bump version: 0.69.0","message":"bump version: 0.69.0\n","repos":"nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js,nwjs\/nw.js","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/nw_version.h\n+++ src\/nw_version.h\n@@ -22,8 +22,8 @@\n #define NW_VERSION_H\n \n #define NW_MAJOR_VERSION 0\n-#define NW_MINOR_VERSION 68\n-#define NW_PATCH_VERSION 2\n+#define NW_MINOR_VERSION 69\n+#define NW_PATCH_VERSION 0\n \n #define NW_VERSION_IS_RELEASE 1\n \n"} {"commit":"0653f49bdea3e201b46977bb0a84d85f4a71dc6a","subject":"Set max FPS reduction to 1\/2 FPS (30FPS).","message":"Set max FPS reduction to 1\/2 FPS (30FPS).\n\n* A compromise between FPS reduction and noise level (in night mode).\n","repos":"kwagyeman\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,openmv\/openmv,kwagyeman\/openmv,openmv\/openmv,openmv\/openmv,iabdalkader\/openmv,iabdalkader\/openmv,openmv\/openmv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/omv\/ov7725.c\n+++ src\/omv\/ov7725.c\n@@ -106,7 +106,7 @@\n {LC_COEFB, 0x14},\n {LC_COEFR, 0x17},\n {LC_CTR, 0x05},\n- {COM5, 0xF5}, \/\/0x65\n+ {COM5, 0xD5},\n \n {0x00, 0x00},\n };\n"} {"commit":"afa16869407e0f3ea57f4367b6b4db8c177e263a","subject":"USE OMV_XCLK_FREQUENCY from OMV board config file.","message":"USE OMV_XCLK_FREQUENCY from OMV board config file.\n","repos":"openmv\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,openmv\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,openmv\/openmv,kwagyeman\/openmv,openmv\/openmv,iabdalkader\/openmv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/omv\/sensor.c\n+++ src\/omv\/sensor.c\n@@ -24,8 +24,6 @@\n \n #define REG_MIDH 0x1C\n #define REG_MIDL 0x1D\n-\n-#define XCLK_FREQ (12000000)\n \n #define MAX_XFER_SIZE (0xFFFC)\n \n@@ -174,7 +172,7 @@\n \/* Configure the sensor external clock (XCLK) to XCLK_FREQ.\n Note: The sensor's internal PLL (when CLKRC=0x80) doubles the XCLK_FREQ\n (XCLK=XCLK_FREQ*2), and the unscaled PIXCLK output is XCLK_FREQ*4 *\/\n- if (extclk_config(XCLK_FREQ) != 0) {\n+ if (extclk_config(OMV_XCLK_FREQ) != 0) {\n \/\/ Timer problem\n return -1;\n }\n"} {"commit":"af2bfbd6dad9af2ccbd45032d76b82b289a8ac3b","subject":"Bump firmware version.","message":"Bump firmware version.\n","repos":"openmv\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,openmv\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,kwagyeman\/openmv,openmv\/openmv,openmv\/openmv,kwagyeman\/openmv,iabdalkader\/openmv,iabdalkader\/openmv","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/omv\/usbdbg.h\n+++ src\/omv\/usbdbg.h\n@@ -18,7 +18,7 @@\n * the IDE will Not connect if the major version number is different.\n *\/\n #define FIRMWARE_VERSION_MAJOR (2)\n-#define FIRMWARE_VERSION_MINOR (8)\n+#define FIRMWARE_VERSION_MINOR (9)\n #define FIRMWARE_VERSION_PATCH (0)\n \n \/**\n"} {"commit":"b3fcb825267d2d1d18d0139c720b186d8b6d93f1","subject":"Refactor: fix always-true condition warning from Pelles C","message":"Refactor: fix always-true condition warning from Pelles C\n","repos":"wormt\/bcc,wormt\/bcc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/parse\/expr.c\n+++ src\/parse\/expr.c\n@@ -752,7 +752,7 @@\n p_bail( parse );\n }\n if ( ( value == LONG_MAX && errno == ERANGE ) ||\n- value > ( long ) ENGINE_MAX_INT_VALUE ) {\n+ ENGINE_MAX_INT_VALUE - value < 0 ) {\n p_diag( parse, DIAG_POS_ERR, &parse->tk_pos,\n \"numeric value `%s` is too large\", parse->tk_text );\n p_bail( parse );\n"} {"commit":"0048a2576d8ea2b77df6773c8013f678d9bbfd66","subject":"yin parser BUGFIX resolving union types","message":"yin parser BUGFIX resolving union types\n\nunion types were resolved but then the pointer to the superior type\nwas removed\n","repos":"lukasmacko\/libyang,PavolVican\/libyang,lukasmacko\/libyang,PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/parser\/yin.c\n+++ src\/parser\/yin.c\n@@ -5422,13 +5422,14 @@\n \/* resolve unresolved types (possible in typedef's with unions *\/\n while (unres) {\n node = (struct lyxml_elem *)((struct ly_type *)unres->obj)->der;\n+ ((struct ly_type *)unres->obj)->der = NULL;\n if (fill_yin_type(module, NULL, node, (struct ly_type *)unres->obj, NULL)) {\n+ lyxml_free_elem(ctx, node);\n goto error;\n }\n \n \/* cleanup *\/\n lyxml_free_elem(ctx, node);\n- ((struct ly_type *)unres->obj)->der = NULL;\n unres_next = unres->next;\n free(unres);\n unres = unres_next;\n"} {"commit":"0fdcd24e19a721f996d5ec129df3033ae8184130","subject":"lyb parser FORMAT typo","message":"lyb parser FORMAT typo\n","repos":"sartura\/libyang,sartura\/libyang,sartura\/libyang,sartura\/libyang,sartura\/libyang,sartura\/libyang,CESNET\/libyang,CESNET\/libyang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/parser_lyb.c\n+++ src\/parser_lyb.c\n@@ -499,7 +499,7 @@\n ret = lyb_read_start_subtree(lybctx);\n LY_CHECK_GOTO(ret, cleanup);\n \n- \/* prefix, may be emtpy *\/\n+ \/* prefix, may be empty *\/\n ret = lyb_read_string(&prefix, 1, lybctx);\n LY_CHECK_GOTO(ret, cleanup);\n if (!prefix[0]) {\n"} {"commit":"43a405276b1dda51140b745236b3eadcd4d97a5f","subject":"parser yin BUGFIX wrong type of struct (lys_node_anyxml)","message":"parser yin BUGFIX wrong type of struct (lys_node_anyxml)\n","repos":"PavolVican\/libyang,lukasmacko\/libyang,PavolVican\/libyang,lukasmacko\/libyang,PavolVican\/libyang,PavolVican\/libyang,PavolVican\/libyang","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/parser_yin.c\n+++ src\/parser_yin.c\n@@ -2895,7 +2895,7 @@\n struct unres_schema *unres)\n {\n struct lys_node *retval;\n- struct lys_node_leaf *anyxml;\n+ struct lys_node_anyxml *anyxml;\n struct lyxml_elem *sub, *next;\n const char *value;\n int r;\n"} {"commit":"91ed2c0238a7d3cea84c9c07ff5ad7cb20fdbb53","subject":"define GetDaemonPid() prototype","message":"define GetDaemonPid() prototype\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@2306 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pcscdaemon.c\n+++ src\/pcscdaemon.c\n@@ -67,6 +67,7 @@\n PCSCLITE_MUTEX usbNotifierMutex;\n \n #ifdef USE_RUN_PID\n+pid_t GetDaemonPid(void);\n pid_t GetDaemonPid(void)\n {\n \tFILE *f;\n"} {"commit":"d470f775a37413f59982e1d2327f55e052538660","subject":"main(): do not create the PCSCLITE_IPC_DIR directory with write permission for group and other","message":"main(): do not create the PCSCLITE_IPC_DIR directory with write\npermission for group and other\n\n\ngit-svn-id: f2d781e409b7e36a714fc884bb9b2fc5091ddd28@2663 0ce88b0d-b2fd-0310-8134-9614164e65ea\n","repos":"vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android,vicamo\/pcsc-lite-android","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/pcscdaemon.c\n+++ src\/pcscdaemon.c\n@@ -447,7 +447,8 @@\n \trv = SYS_Stat(PCSCLITE_IPC_DIR, &fStatBuf);\n \tif (rv < 0)\n \t{\n-\t\trv = SYS_Mkdir(PCSCLITE_IPC_DIR, S_ISVTX | S_IRWXO | S_IRWXG | S_IRWXU);\n+\t\trv = SYS_Mkdir(PCSCLITE_IPC_DIR,\n+\t\t\tS_ISVTX | S_IROTH | S_IXOTH | S_IRGRP | S_IXGRP | S_IRWXU);\n \t\tif (rv != 0)\n \t\t{\n \t\t\tLog2(PCSC_LOG_CRITICAL,\n"} {"commit":"4ec3af921eaad68c69807ac05f500ec508424163","subject":"Media: Fix shared component build.","message":"Media: Fix shared component build.\n","repos":"AndriyP\/ozone-wayland,baillaw\/ozone-wayland,baillaw\/ozone-wayland,qjia7\/ozone-wayland,shaochangbin\/ozone-wayland,kuscsik\/ozone-wayland,nagineni\/ozone-wayland,darktears\/ozone-wayland,nicoguyo\/ozone-wayland,shaochangbin\/ozone-wayland,kuscsik\/ozone-wayland,joone\/ozone-wayland,clopez\/ozone-wayland,joone\/ozone-wayland,siteshwar\/ozone-wayland,qjia7\/ozone-wayland,nicoguyo\/ozone-wayland,likewise\/ozone-wayland,shaochangbin\/ozone-wayland,baillaw\/ozone-wayland,nicoguyo\/ozone-wayland,kishansheshagiri\/ozone-wayland,Tarnyko\/ozone-wayland,Tarnyko\/ozone-wayland,nicoguyo\/ozone-wayland,01org\/ozone-wayland,likewise\/ozone-wayland,hongzhang-yan\/ozone-wayland,01org\/ozone-wayland,Tarnyko\/ozone-wayland,likewise\/ozone-wayland,Tarnyko\/ozone-wayland,sjnewbury\/ozone-wayland,shaochangbin\/ozone-wayland,darktears\/ozone-wayland,qjia7\/ozone-wayland,kishansheshagiri\/ozone-wayland,sjnewbury\/ozone-wayland,mrunalk\/ozone-wayland,hongzhang-yan\/ozone-wayland,hongzhang-yan\/ozone-wayland,darktears\/ozone-wayland,siteshwar\/ozone-wayland,mrunalk\/ozone-wayland,clopez\/ozone-wayland,kishansheshagiri\/ozone-wayland,AndriyP\/ozone-wayland,01org\/ozone-wayland,sjnewbury\/ozone-wayland,sjnewbury\/ozone-wayland,siteshwar\/ozone-wayland,likewise\/ozone-wayland,joone\/ozone-wayland,kishansheshagiri\/ozone-wayland,clopez\/ozone-wayland,01org\/ozone-wayland,nagineni\/ozone-wayland,clopez\/ozone-wayland,mrunalk\/ozone-wayland,AndriyP\/ozone-wayland,siteshwar\/ozone-wayland,qjia7\/ozone-wayland,mrunalk\/ozone-wayland,darktears\/ozone-wayland,kuscsik\/ozone-wayland,AndriyP\/ozone-wayland,hongzhang-yan\/ozone-wayland,joone\/ozone-wayland,baillaw\/ozone-wayland,nagineni\/ozone-wayland,nagineni\/ozone-wayland,kuscsik\/ozone-wayland","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- media\/media_ozone_platform_wayland.h\n+++ media\/media_ozone_platform_wayland.h\n@@ -5,11 +5,13 @@\n #ifndef OZONE_MEDIA_MEDIA_OZONE_PLATFORM_WAYLAND_H_\n #define OZONE_MEDIA_MEDIA_OZONE_PLATFORM_WAYLAND_H_\n \n+#include \"ozone\/platform\/ozone_export_wayland.h\"\n+\n namespace media {\n \n class MediaOzonePlatform;\n \n-MediaOzonePlatform* CreateMediaOzonePlatformWayland();\n+OZONE_WAYLAND_EXPORT MediaOzonePlatform* CreateMediaOzonePlatformWayland();\n \n } \/\/ namespace media\n \n"} {"commit":"fc3843fe8e6f7e63ff384166b1e63cf774bbadbc","subject":"Tidy PersonData","message":"Tidy PersonData\n","repos":"detrout\/libkpeople-debian,detrout\/libkpeople-debian,detrout\/libkpeople-debian","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/persondata.h\n+++ src\/persondata.h\n@@ -41,18 +41,29 @@\n Q_OBJECT\n \n public:\n+ \/** Creates a Person object from a given ID.\n+ * The ID can be either a local application specific ID (such as akonadi:\/\/?item=15)\n+ * or a kpeople ID in the form kpeople:\/\/15\n+ *\/\n PersonData(const QString &id, QObject *parent=0);\n-\/\/ PersonData(const MetaContact &mc, QObject *parent=0);\n \n virtual ~PersonData();\n+\n+ \/**\n+ * Returns the aggregated contact information from all sources\n+ *\/\n KABC::Addressee person() const;\n+\n+ \/**\n+ * Returns information from each contact source\n+ *\/\n KABC::AddresseeList contacts() const;\n \n Q_SIGNALS:\n- \/** Some of the person's data we're offering has changed *\/\n+ \/**\n+ * One of the contact sources has changed\n+ *\/\n void dataChanged();\n-\n- protected:\n \n private Q_SLOTS:\n void onContactChanged();\n"} {"commit":"38d1c83772062ffb1632b5a9e32e88fead76b73c","subject":"stay deleted dammit","message":"stay deleted dammit\n","repos":"tlively\/cs51-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physics.c\n+++ physics.c\n@@ -176,17 +176,6 @@\n \/\/ variables to store our x and y index\n int kx = x\/BUCKET_SIZE;\n int ky = y\/BUCKET_SIZE;\n- \n- \/\/center polygons around origin\n- if(geom->shape_type)\n- {\n- po_vector* crawler = geom->poly.vertices;\n- while(crawler != NULL)\n-\t{\n-\t *crawler = vect_minus(*crawler,new_obj->centroid);\n-\t crawler = crawler + sizeof(po_vector);\n-\t}\n- }\n \n \/\/ get array at that row number and figure out what's there\n dynamic_array* row_k = dynamic_array_get(world->rows,ky);\n"} {"commit":"4b4104d87e28a56a14d89289e960a92618ce5621","subject":"ArmPkg\/ArmDmaLib: implement DmaAllocateAlignedBuffer()","message":"ArmPkg\/ArmDmaLib: implement DmaAllocateAlignedBuffer()\n\nImplement the new DmaLib routine that returns DMA'able buffers\nat a specified minimum alignment.\n\nContributed-under: TianoCore Contribution Agreement 1.1\nSigned-off-by: Ard Biesheuvel <66d3c5fdaeea7ff1f996ad04f2c45e08ab38e2f5@linaro.org>\nReviewed-by: Leif Lindholm <a613079f0455438b29e28a9c5b9eb3779a81a33a@linaro.org>\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ArmPkg\/Library\/ArmDmaLib\/ArmDmaLib.c\n+++ ArmPkg\/Library\/ArmDmaLib\/ArmDmaLib.c\n@@ -285,20 +285,56 @@\n OUT VOID **HostAddress\r\n )\r\n {\r\n+ return DmaAllocateAlignedBuffer (MemoryType, Pages, 0, HostAddress);\r\n+}\r\n+\r\n+\/**\r\n+ Allocates pages that are suitable for an DmaMap() of type\r\n+ MapOperationBusMasterCommonBuffer mapping, at the requested alignment.\r\n+\r\n+ @param MemoryType The type of memory to allocate, EfiBootServicesData or\r\n+ EfiRuntimeServicesData.\r\n+ @param Pages The number of pages to allocate.\r\n+ @param Alignment Alignment in bytes of the base of the returned\r\n+ buffer (must be a power of 2)\r\n+ @param HostAddress A pointer to store the base system memory address of the\r\n+ allocated range.\r\n+\r\n+ @retval EFI_SUCCESS The requested memory pages were allocated.\r\n+ @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal attribute bits are\r\n+ MEMORY_WRITE_COMBINE and MEMORY_CACHED.\r\n+ @retval EFI_INVALID_PARAMETER One or more parameters are invalid.\r\n+ @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated.\r\n+\r\n+**\/\r\n+EFI_STATUS\r\n+EFIAPI\r\n+DmaAllocateAlignedBuffer (\r\n+ IN EFI_MEMORY_TYPE MemoryType,\r\n+ IN UINTN Pages,\r\n+ IN UINTN Alignment,\r\n+ OUT VOID **HostAddress\r\n+ )\r\n+{\r\n EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor;\r\n VOID *Allocation;\r\n UINT64 MemType;\r\n UNCACHED_ALLOCATION *Alloc;\r\n EFI_STATUS Status;\r\n \r\n- if (HostAddress == NULL) {\r\n+ if (Alignment == 0) {\r\n+ Alignment = EFI_PAGE_SIZE;\r\n+ }\r\n+\r\n+ if (HostAddress == NULL ||\r\n+ (Alignment & (Alignment - 1)) != 0) {\r\n return EFI_INVALID_PARAMETER;\r\n }\r\n \r\n if (MemoryType == EfiBootServicesData) {\r\n- Allocation = AllocatePages (Pages);\r\n+ Allocation = AllocateAlignedPages (Pages, Alignment);\r\n } else if (MemoryType == EfiRuntimeServicesData) {\r\n- Allocation = AllocateRuntimePages (Pages);\r\n+ Allocation = AllocateAlignedRuntimePages (Pages, Alignment);\r\n } else {\r\n return EFI_INVALID_PARAMETER;\r\n }\r\n"} {"commit":"834ed0d3c05d945e1fc53beb02a5d3daf51d86cf","subject":"cartiso: Added isothresh & autoset for it and A","message":"cartiso: Added isothresh & autoset for it and A\n","repos":"PETTT\/miniIO,PETTT\/miniIO,PETTT\/miniIO,PETTT\/miniIO","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cartiso\/cartiso.c\n+++ cartiso\/cartiso.c\n@@ -132,7 +132,7 @@\n float y0 = 0.5f;\n float z0 = 0.5f;\n int centertask = 1; \/* Set Gaussian center at first task *\/\n- float A = 0.25f; \/* Amplitude of sinusoid from top relative when Gaussian present *\/\n+ float A = -1.f; \/* Ampl. of sinusoid from top relative when Gaussian present, -1 invalid *\/\n float fx = 15.f; \/* Freq. of sinusoid *\/\n float fy = 15.f;\n float fz = 15.f;\n@@ -148,6 +148,7 @@\n int sfc0i, sfc0j, sfc0k; \/* Space filling curve 1st of 2 points *\/\n struct isoinfo iso; \/* Isosurface context *\/\n struct osn_context *osn; \/* Open simplex noise context *\/\n+ float isothresh = -1.f; \/* Threshold of isosurface, -1 invalid *\/\n \n \/* MPI vars *\/\n int rank, nprocs; \n@@ -266,6 +267,13 @@\n MPI_Cart_create(MPI_COMM_WORLD, 3, cprocs, cpers, 1, &comm);\n MPI_Comm_rank(comm, &rank);\n MPI_Cart_coords(comm, rank, 3, crnk);\n+\n+ \/* Assign default arguments for A & isothresh *\/\n+ if(isothresh == -1.f)\n+ isothresh = exp(-0.5); \/* Default is at the gaussian of 1*sigma *\/\n+ if(A == -1.f)\n+ A = (1 - isothresh) * 1.05; \/* Default is at isothr + 5% to allow for good isos *\/\n+ if(rank==0) printf(\"isothresh = %f, A = %f\\n\", isothresh, A);\n \n \/* Data inits *\/\n omegax = fx * 2 * M_PI;\n@@ -299,6 +307,7 @@\n x0 = (float)(sfc0i + 1) \/ (inp + 1);\n y0 = (float)(sfc0j + 1) \/ (jnp + 1);\n z0 = (float)(sfc0k + 1) \/ (knp + 1);\n+ if(rank==0) printf(\"x0=%f, y0=%f, z0=%f\\n\", x0, y0, z0);\n }\n \/* Set up isosurfacing structure *\/\n isoinit(&iso, xs, ys, zs, deltax, deltay, deltaz, cni, cnj, cnk, 1);\n@@ -370,7 +379,7 @@\n for(j = 0; j < cnj; j++) {\n x = xs;\n for(i = 0; i < cni; i++, ii++) {\n- double noisefreq = 20., noisetimefreq = 0.25;\n+ double noisefreq = 0.3125, noisetimefreq = 0.25;\n float sinusoid = ( sin(omegax*x)+sinshift + \\\n sin(omegay*y)+sinshift + \\\n cos(omegaz*z)+sinshift ) * sinscale;\n@@ -414,7 +423,7 @@\n if(rank == 0) {\n printf(\" Isosurface...\\n\"); fflush(stdout);\n }\n- isosurf(&iso, 0.7, data, xdata);\n+ isosurf(&iso, isothresh, data, xdata);\n \/*printf(\" %d tris = %llu\\n\", rank, iso.ntris);*\/\n print_loadbalance(comm, rank, nprocs, iso.ntris);\n \n"} {"commit":"c6bf8737fb5e3a19cc16f67e223f90a5eedcf229","subject":"resolved collison....(hopefully)","message":"resolved collison....(hopefully)\n","repos":"tlively\/cs51-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physics.c\n+++ physics.c\n@@ -6,6 +6,7 @@\n **************************************************************\/\n #include <stdlib.h>\n #include <stddef.h>\n+#include <math.h>\n #include \"physics.h\"\n \n \/* the actual implementation of a physics object structure *\/\n@@ -62,7 +63,6 @@\n if (world == NULL || obj == NULL) {\n return 1;\n }\n-\n }\n \/* Updates object's global position based on velocity\n * Future versions may include more sophistocated algorthims using acceleration *\/\n@@ -125,6 +125,7 @@\n return 0;\n \n }\n+\n int resolve_collision (po_handle obj1, po_handle obj2){\n if (obj1 == NULL || obj2 == NULL) {\n return 1;\n@@ -133,6 +134,21 @@\n obj1-> dy * -1;\n obj2-> dx * -1;\n obj2-> dy * -1;\n+\n+ float delta_x = (obj1->x - obj2->x)\/2.0; \n+ float delta_y = (obj1->y - obj2->y)\/2.0;\n+ if (delta_x < 0){\n+ obj1->x = obj1->x - delta_x;\n+ }\n+ else{\n+ obj1->x = obj1->x + delta_x;\n+ }\n+ if (detla_y< 0){\n+ obj2->y = obj2->y + delta_y;\n+ }\n+ else{\n+ obj2->y = obj2->y - delta_y;\n+ }\n return 0;\n }\n \n@@ -154,6 +170,12 @@\n \/\/ detects overlap between bounding boxes\n \/\/ if overlap, call narrowphase\n \n-void coll_narrowphase();\n-\/\/ parallel axis theorem on objects that might collide\n+void coll_narrowphase(po_handle obj1, po_handle obj2){\n+ float d_2 = pow((obj1->x - obj2->x), 2.0) + pow((obj1->x - obj2->x), 2.0);\n+ float r_2 = pow(obj1->x,2.0) + pow(obj2->x,2.0);\n+ if(d_2 <= r_2){\n+ resolve_collision(obj1, obj2);\n+ }\n+}\n+\/\/ seperating axis theorem on objects that might collide\n \/\/ if collision, call resolve collsion (with two objects)? set collision flag?\n"} {"commit":"09e0c679efc5f0390f2a1df4d91a828a1115b9df","subject":"containsPoint tweaks","message":"containsPoint tweaks\n","repos":"bdonlan\/openc2e,ccdevnet\/openc2e,ccdevnet\/openc2e,crystalline\/openc2e,ccdevnet\/openc2e,ccdevnet\/openc2e,bdonlan\/openc2e,crystalline\/openc2e,ccdevnet\/openc2e,bdonlan\/openc2e,crystalline\/openc2e,crystalline\/openc2e,crystalline\/openc2e,ccdevnet\/openc2e,bdonlan\/openc2e","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- physics.h\n+++ physics.h\n@@ -203,15 +203,20 @@\n \t\t\/\/ TODO: this code hasn't really been tested - fuzzie\n \t\tbool containsPoint(Point p) const {\n \t\t\tif (type == VERTICAL) {\n-\t\t\t\tbool is_v = (start.x == p.x);\n-\t\t\t\tbool is_h = containsY(p.y);\n+\t\t\t\tbool is_x = fabs(start.x - p.x) < 1;\n+\t\t\t\tbool is_y = containsY(p.y);\n \t\t\t\t\/\/ TODO\n \t\t\t\t\/\/bool is_v = (start.x > (p.x + 0.5)) && (start.x < (p.x - 0.5));\n \t\t\t\t\/\/bool is_h = (start.y > (p.y + 0.5)) && (start.y < (p.y - 0.5));\n-\t\t\t\treturn (is_v && is_h);\n+\t\t\t\treturn (is_x && is_y);\n+\t\t\t} else if (type == HORIZONTAL) {\n+\t\t\t\tbool is_y = fabs(start.y - p.y) < 1;\n+\t\t\t\tbool is_x = containsX(p.x);\n+\n+\t\t\t\treturn is_x && is_y;\n \t\t\t} else {\n \t\t\t\tPoint point_on_line = pointAtX(p.x);\n-\t\t\t\treturn (point_on_line.y > (p.y - 1)) && (point_on_line.y < (p.y + 1));\n+\t\t\t\treturn containsX(p.x) && fabs(point_on_line.y - p.y) < 1;\n \t\t\t}\n \t\t}\n \t\t\t\t\t\n"} {"commit":"558e29c5a0ae66dc14467414542d2daeaa572d78","subject":"change a global into a local, misc style fixes","message":"change a global into a local, misc style fixes\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/head\/head.c\n+++ usr.bin\/head\/head.c\n@@ -65,8 +65,6 @@\n void obsolete __P((char *[]));\n void usage __P((void));\n \n-int eval;\n-\n int\n main(argc, argv)\n \tint argc;\n@@ -74,7 +72,7 @@\n {\n \tregister int ch;\n \tFILE *fp;\n-\tint first, linecnt = -1, bytecnt = -1;\n+\tint first, linecnt = -1, bytecnt = -1, eval = 0;\n \tchar *ep;\n \n \tobsolete(argv);\n@@ -119,8 +117,7 @@\n \t\t\t\thead_bytes(fp, bytecnt);\n \t\t\t(void)fclose(fp);\n \t\t}\n-\t}\n-\telse if (bytecnt == -1)\n+\t} else if (bytecnt == -1)\n \t\thead(stdin, linecnt);\n \telse\n \t\thead_bytes(stdin, bytecnt);\n@@ -145,8 +142,8 @@\n \n void\n head_bytes(fp, cnt)\n-\t FILE *fp;\n-\t register int cnt;\n+\tFILE *fp;\n+\tregister int cnt;\n {\n \tchar buf[4096];\n \tregister int readlen;\n@@ -187,6 +184,7 @@\n void\n usage()\n {\n+\n \t(void)fprintf(stderr, \"usage: head [-n lines] [-c bytes] [file ...]\\n\");\n \texit(1);\n }\n"} {"commit":"227775e50cbd9d0a1e1a39d6694e293adea9282c","subject":"Declared msginfo, shminfo, and seminfo structs.","message":"Declared msginfo, shminfo, and seminfo structs.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/ipcs\/ipcs.c\n+++ usr.bin\/ipcs\/ipcs.c\n@@ -24,7 +24,7 @@\n * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n *\n- *\t$Id: ipcs.c,v 1.6 1994\/06\/18 22:05:08 cgd Exp $\n+ *\t$Id: ipcs.c,v 1.2 1994\/09\/13 16:59:29 dfr Exp $\n *\/\n \n #include <stdio.h>\n@@ -45,6 +45,10 @@\n #include <sys\/sem.h>\n #include <sys\/shm.h>\n #include <sys\/msg.h>\n+\n+struct shminfo\tshminfo;\n+struct seminfo\tseminfo;\n+struct msginfo\tmsginfo;\n \n int\tsemconfig __P((int,...));\n void\tusage __P((void));\n"} {"commit":"3c804431a011cfce68ff263668813a05a84c9bd8","subject":"Fixed misspellings of '\\0' as NULL.","message":"Fixed misspellings of '\\0' as NULL.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/msgs\/msgs.c\n+++ usr.bin\/msgs\/msgs.c\n@@ -778,7 +778,7 @@\n \t\t\t\tfor (n=0; in[n] > ' '; n++) { \/* sizeof fname? *\/\n \t\t\t\t\tfname[n] = in[n];\n \t\t\t\t}\n-\t\t\t\tfname[n] = NULL;\n+\t\t\t\tfname[n] = '\\0';\n \t\t\t}\n \t\t\telse\n \t\t\t\tstrcpy(fname, \"Messages\");\n@@ -828,7 +828,7 @@\n \n \tseensubj = seenfrom = NO;\n \tlocal = YES;\n-\tsubj[0] = from[0] = date[0] = NULL;\n+\tsubj[0] = from[0] = date[0] = '\\0';\n \n \t\/*\n \t * Is this a normal message?\n@@ -851,12 +851,12 @@\n \t\t\t\t\t*ptr++ = *in++;\n \t\t\t\t}\n \t\t\t}\n-\t\t\t*ptr = NULL;\n+\t\t\t*ptr = '\\0';\n \t\t\tif (*(in = nxtfld(in)))\n \t\t\t\tstrncpy(date, in, sizeof date);\n \t\t\telse {\n \t\t\t\tdate[0] = '\\n';\n-\t\t\t\tdate[1] = NULL;\n+\t\t\t\tdate[1] = '\\0';\n \t\t\t}\n \t\t}\n \t\telse {\n"} {"commit":"cd74f3103976553b9405a4c458b37575b4b220bb","subject":"Fixed most style bugs in previous commit.","message":"Fixed most style bugs in previous commit.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/tftp\/main.c\n+++ usr.bin\/tftp\/main.c\n@@ -62,6 +62,7 @@\n \n #include <ctype.h>\n #include <err.h>\n+#include <histedit.h>\n #include <netdb.h>\n #include <setjmp.h>\n #include <signal.h>\n@@ -70,13 +71,10 @@\n #include <string.h>\n #include <unistd.h>\n \n-#include <histedit.h>\n-\n #include \"extern.h\"\n \n+#define\tMAXLINE\t\t200\n #define\tTIMEOUT\t\t5\t\t\/* secs between rexmt's *\/\n-\n-#define MAXLINE 200\n \n struct\tsockaddr_in peeraddr;\n int\tf;\n@@ -107,6 +105,7 @@\n void\tstatus __P((int, char **));\n \n static void command __P((void)) __dead2;\n+static const char *command_prompt __P((void));\n \n static void getusage __P((char *));\n static void makeargv __P((void));\n@@ -593,7 +592,9 @@\n }\n \n static const char *\n-command_prompt() {\n+command_prompt()\n+{\n+\n \treturn (\"tftp> \");\n }\n \n@@ -603,17 +604,15 @@\n static void\n command()\n {\n+\tHistEvent he;\n \tregister struct cmd *c;\n+\tstatic EditLine *el;\n+\tstatic History *hist;\n+\tconst char *bp;\n \tchar *cp;\n-\tstatic EditLine *el = NULL;\n-\tstatic History *hist = NULL;\n-\tHistEvent he;\n-\tconst char * bp;\n-\tint len, num;\n-\tint verbose;\n+\tint len, num, verbose;\n \n \tverbose = isatty(0);\n-\n \tif (verbose) {\n \t\tel = el_init(\"tftp\", stdin, stdout, stderr);\n \t\thist = history_init();\n@@ -624,12 +623,10 @@\n \t\tel_set(el, EL_SIGNAL, 1);\n \t\tel_source(el, NULL);\n \t}\n-\n \tfor (;;) {\n \t\tif (verbose) {\n if ((bp = el_gets(el, &num)) == NULL || num == 0)\n exit(0);\n-\n len = (num > MAXLINE) ? MAXLINE : num;\n memcpy(line, bp, len);\n line[len] = '\\0';\n"} {"commit":"be99ddf809b6d0e6c08039424cddd7b74cb237ce","subject":"The talkd security hole can ealso be exploited by wall (and thus rwall). write and talk are not affected. Now print out escape sequences in the same way as is done by write(1).","message":"The talkd security hole can ealso be exploited by wall (and thus rwall).\nwrite and talk are not affected.\nNow print out escape sequences in the same way as is done by write(1).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/wall\/wall.c\n+++ usr.bin\/wall\/wall.c\n@@ -178,6 +178,11 @@\n \t\t\t\tputc('\\r', fp);\n \t\t\t\tputc('\\n', fp);\n \t\t\t\tcnt = 0;\n+\t\t\t} else if (!isprint(ch) && !isspace(ch) && ch != '\\007')\n+ {\n+\t\t\t\tputc('^', fp);\n+\t\t\t\tputc(ch^0x40, fp);\t\/* DEL to ?, others to a\n+lpha *\/\n \t\t\t} else\n \t\t\t\tputc(ch, fp);\n \t\t}\n"} {"commit":"aeb0106f0770d654a04c7065721de784f3163cc4","subject":"trivial update to misleading comments","message":"trivial update to misleading comments\n","repos":"modeswitch\/barrelfish,modeswitch\/barrelfish,modeswitch\/barrelfish,modeswitch\/barrelfish,modeswitch\/barrelfish","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- usr\/monitor\/spawn.c\n+++ usr\/monitor\/spawn.c\n@@ -48,7 +48,7 @@\n }\n }\n \n- \/* Pass IO cap to PCI (as a hack) *\/\n+ \/* Pass IO cap to PCI *\/\n if (!strcmp(name, \"pci\")) {\n dest.cnode = si->taskcn;\n dest.slot = TASKCN_SLOT_IO;\n@@ -60,7 +60,7 @@\n }\n }\n \n- \/* Pass IRQ cap to bfscope *\/\n+ \/* Pass IRQ cap to bfscope (XXX: kludge) *\/\n if (!strcmp(name, \"bfscope\")) {\n dest.cnode = si->taskcn;\n dest.slot = TASKCN_SLOT_IRQ;\n"} {"commit":"a47a4e202cf01282d233fcfcb0ae63d43c0552e5","subject":"comments","message":"comments\n","repos":"aparrish\/rwet-examples-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ut_string_helpers.c\n+++ ut_string_helpers.c\n@@ -1,3 +1,8 @@\n+\/*\n+ * some helper functions to deal with uthash data structures that contain\n+ * strings.\n+ *\/\n+\n #include <string.h>\n #include <stdlib.h>\n #include <stdio.h>\n@@ -27,7 +32,7 @@\n \treturn tokens;\n }\n \n-\/* return a newly allocated UT_array that is a slice of src *\/\n+\/* return a newly allocated UT_array that is a (copied) slice of src *\/\n UT_array* slice_new(const UT_array* src, int start, int end) {\n \n \tint i = start;\n"} {"commit":"a5d2778737707199dd0c89c3d26b95bf21f3337b","subject":"Actually set the default for GtkMenuButton::use-popover","message":"Actually set the default for GtkMenuButton::use-popover\n\nThe previous commit changed the property declaration, but\nomitted the actual change of the default.\n","repos":"msteinert\/gtk,jessevdk\/gtk,chergert\/gtk,Lyude\/gtk-,jadahl\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,ahodesuka\/gtk,Lyude\/gtk-,ahodesuka\/gtk,jessevdk\/gtk,chergert\/gtk,Adamovskiy\/gtk,msteinert\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,jigpu\/gtk,jigpu\/gtk,jigpu\/gtk,chergert\/gtk,jigpu\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,chergert\/gtk,ahodesuka\/gtk,jigpu\/gtk,Lyude\/gtk-,msteinert\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,jadahl\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,chergert\/gtk,jadahl\/gtk,jigpu\/gtk,Adamovskiy\/gtk,chergert\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,alexlarsson\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,jadahl\/gtk,jadahl\/gtk,grubersjoe\/adwaita,jessevdk\/gtk,alexlarsson\/gtk,msteinert\/gtk,davidgumberg\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,Sidnioulz\/SandboxGtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,chergert\/gtk,alexlarsson\/gtk,msteinert\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,alexlarsson\/gtk,Lyude\/gtk-,jessevdk\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,grubersjoe\/adwaita,davidgumberg\/gtk,ahodesuka\/gtk,jessevdk\/gtk,chergert\/gtk,Lyude\/gtk-,msteinert\/gtk,jadahl\/gtk,alexlarsson\/gtk,jadahl\/gtk,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,davidgumberg\/gtk,jigpu\/gtk,grubersjoe\/adwaita","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkmenubutton.c\n+++ gtk\/gtkmenubutton.c\n@@ -610,6 +610,7 @@\n priv = gtk_menu_button_get_instance_private (menu_button);\n menu_button->priv = priv;\n priv->arrow_type = GTK_ARROW_DOWN;\n+ priv->use_popover = TRUE;\n \n add_arrow (menu_button);\n \n"} {"commit":"fab2173b315c7d305b75f6aabb4da45922b44afa","subject":"GtkMenuButton: use popovers by default","message":"GtkMenuButton: use popovers by default\n\nWhen constructing from a menu model, use popovers by default.\nThis change has the potential to cause some size problems for\napplications with big gear menus, so we're doing it early in\nthe cycle to uncover and fix those.\n","repos":"chergert\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,jigpu\/gtk,jessevdk\/gtk,jessevdk\/gtk,jadahl\/gtk,jessevdk\/gtk,chergert\/gtk,Adamovskiy\/gtk,davidgumberg\/gtk,jigpu\/gtk,grubersjoe\/adwaita,msteinert\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,Lyude\/gtk-,ahodesuka\/gtk,jadahl\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,jadahl\/gtk,jessevdk\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,jigpu\/gtk,davidgumberg\/gtk,chergert\/gtk,jadahl\/gtk,ahodesuka\/gtk,alexlarsson\/gtk,chergert\/gtk,ahodesuka\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,jadahl\/gtk,Sidnioulz\/SandboxGtk,Lyude\/gtk-,msteinert\/gtk,chergert\/gtk,grubersjoe\/adwaita,jigpu\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,grubersjoe\/adwaita,jadahl\/gtk,Lyude\/gtk-,jadahl\/gtk,jigpu\/gtk,ahodesuka\/gtk,chergert\/gtk,Lyude\/gtk-,Lyude\/gtk-,msteinert\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,chergert\/gtk,jigpu\/gtk,jessevdk\/gtk,Sidnioulz\/SandboxGtk,Adamovskiy\/gtk,jigpu\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,jessevdk\/gtk,davidgumberg\/gtk,Lyude\/gtk-,msteinert\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,msteinert\/gtk,jadahl\/gtk,ahodesuka\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,davidgumberg\/gtk,chergert\/gtk,Lyude\/gtk-,jigpu\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkmenubutton.c\n+++ gtk\/gtkmenubutton.c\n@@ -568,7 +568,7 @@\n g_param_spec_boolean (\"use-popover\",\n P_(\"Use a popover\"),\n P_(\"Use a popover instead of a menu\"),\n- FALSE,\n+ TRUE,\n G_PARAM_READWRITE));\n \n \/**\n"} {"commit":"e008fe237b02d7d309fb72bbca8cc43d1c39c482","subject":"Hopefully fixing find begin in VS.","message":"Hopefully fixing find begin in VS.\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@6087 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- seqan\/projects\/library\/seqan\/find\/find_begin.h\n+++ seqan\/projects\/library\/seqan\/find\/find_begin.h\n@@ -35,8 +35,8 @@\n struct DPSearch;\n \n \/\/see finder_myers_ukkonen.h\n-\/\/template <typename TSpec, typename TFindBeginPatternSpec>\n-\/\/struct Myers;\n+template <typename TSpec, typename TFindBeginPatternSpec>\n+struct Myers;\n \n \n \/\/____________________________________________________________________________\n"} {"commit":"24df69b283d7e7f310450449ae5eca95edc396b2","subject":"Add a note about tooltip limitations","message":"Add a note about tooltip limitations\n\nApparently Windows only shows the first 64 characters of tooltips\non statusicons. Bug 594600.\n","repos":"jigpu\/gtk,davidt\/gtk,simokivimaki\/gtk,chipx86\/gtk,davidt\/gtk,Lyude\/gtk-,jigpu\/gtk,Distrotech\/gtk,alexlarsson\/gtk,Lyude\/gtk-,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,ebassi\/gtk,chergert\/gtk,ebassi\/gtk,ebassi\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,Adamovskiy\/gtk,johne53\/MB3Gtk-2,chipx86\/gtk,chergert\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,jadahl\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,alexlarsson\/gtk,nacho\/gtk-,ahodesuka\/gtk,Adamovskiy\/gtk,jigpu\/gtk,alexlarsson\/gtk,davidt\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,chergert\/gtk,davidgumberg\/gtk,ebassi\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,Unity-Technologies\/gtk,chipx86\/gtk,alexlarsson\/gtk,ahodesuka\/gtk,msteinert\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,grubersjoe\/adwaita,chergert\/gtk,msteinert\/gtk,jigpu\/gtk,simokivimaki\/gtk,msteinert\/gtk,Distrotech\/gtk,grubersjoe\/adwaita,Unity-Technologies\/gtk,alexlarsson\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,johne53\/MB3Gtk-2,Distrotech\/gtk2,jadahl\/gtk,alexlarsson\/gtk,bratsche\/gtk-,Distrotech\/gtk2,Unity-Technologies\/gtk,msteinert\/gtk,jadahl\/gtk,jadahl\/gtk,Lyude\/gtk-,chergert\/gtk,johne53\/MB3Gtk-2,jessevdk\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,msteinert\/gtk,Lyude\/gtk-,davidt\/gtk,nacho\/gtk-,Distrotech\/gtk2,Unity-Technologies\/gtk,jigpu\/gtk,alexlarsson\/gtk,bratsche\/gtk-,msteinert\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,Sidnioulz\/SandboxGtk,jadahl\/gtk,nacho\/gtk-,Distrotech\/gtk,Adamovskiy\/gtk,johne53\/MB3Gtk-2,jadahl\/gtk,davidgumberg\/gtk,Distrotech\/gtk2,ebassi\/gtk,davidgumberg\/gtk,Lyude\/gtk-,chipx86\/gtk,simokivimaki\/gtk,bratsche\/gtk-,bratsche\/gtk-,simokivimaki\/gtk,ahodesuka\/gtk,nacho\/gtk-,chergert\/gtk,ebassi\/gtk,grubersjoe\/adwaita,jigpu\/gtk,Adamovskiy\/gtk,bratsche\/gtk-,Adamovskiy\/gtk,jessevdk\/gtk,alexlarsson\/gtk,jadahl\/gtk,Adamovskiy\/gtk,simokivimaki\/gtk,johne53\/MB3Gtk-2,jigpu\/gtk,nacho\/gtk-,jigpu\/gtk,chipx86\/gtk,Lyude\/gtk-,Distrotech\/gtk2,jessevdk\/gtk,Distrotech\/gtk,davidgumberg\/gtk,Distrotech\/gtk,davidt\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,Unity-Technologies\/gtk,chergert\/gtk,chergert\/gtk,jessevdk\/gtk,davidt\/gtk,ahodesuka\/gtk,jessevdk\/gtk,Distrotech\/gtk2,simokivimaki\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkstatusicon.c\n+++ gtk\/gtkstatusicon.c\n@@ -369,6 +369,10 @@\n * #GtkStatusIcon:has-tooltip will automatically be set to %TRUE and\n * the default handler for the #GtkStatusIcon::query-tooltip signal\n * will take care of displaying the tooltip.\n+ *\n+ * Note that some platforms have limitations on the length of tooltips\n+ * that they allow on status icons, e.g. Windows only shows the first\n+ * 64 characters.\n *\n * Since: 2.16\n *\/\n"} {"commit":"5aeb9e65b1ea801b55ee828bb25e579e117b31df","subject":"show machine memory size","message":"show machine memory size\n\ngit-svn-id: 14be032f8f42541b1a281b51ae8ea69814daf20e@207 4b44e086-7f34-40ce-a3bd-00e031736276\n","repos":"BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- utils\/lstopo-draw.c\n+++ utils\/lstopo-draw.c\n@@ -231,16 +231,26 @@\n static void\n machine_draw(struct draw_methods *methods, topo_obj_t level, topo_obj_type_t type, void *output, unsigned depth, unsigned x, unsigned *retwidth, unsigned y, unsigned *retheight)\n {\n- unsigned myheight = UNIT;\n+ unsigned myheight = UNIT + FONT_SIZE + UNIT;\n unsigned totwidth = UNIT, maxheight = 0;\n+ char text[64];\n \n RECURSE(level, &null_draw_methods, UNIT);\n \n- maxheight += UNIT;\n- *retwidth = totwidth + UNIT;\n- *retheight = myheight + maxheight;\n+ if (totwidth < 10*FONT_SIZE)\n+ totwidth = 10*FONT_SIZE;\n+\n+ *retwidth = totwidth + UNIT;\n+ *retheight = myheight + maxheight;\n+ if (maxheight)\n+ *retheight += UNIT;\n \n methods->box(output, MACHINE_R_COLOR, MACHINE_G_COLOR, MACHINE_B_COLOR, depth, x, *retwidth, y, *retheight);\n+\n+ snprintf(text, sizeof(text), \"Machine (%lu%s)\",\n+\t\t size_value(level->memory_kB),\n+\t\t size_unit(level->memory_kB));\n+ methods->text(output, 0, 0, 0, FONT_SIZE, depth-1, x + UNIT, y + UNIT, text);\n \n totwidth = UNIT;\n RECURSE(level, methods, UNIT);\n"} {"commit":"54e59b1b9323372a99d4d0b74a3f4c91f362880b","subject":"guest-i8080: support jmp and rst opcodes","message":"guest-i8080: support jmp and rst opcodes\n\nSigned-off-by: Dmitry Eremin-Solenikov <b6edad08270b2e4ffbcb0879e25a0e29a48c5275@gmail.com>\n","repos":"lumag\/nemu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- guest-i8080\/parse.c\n+++ guest-i8080\/parse.c\n@@ -286,6 +286,15 @@\n \t\tprintf(\"%s %s\", alu_ops[reg2].name, regs[reg].name);\n \t\tbreak;\n \tcase 0xc0:\n+\t\t\/\/ FIXME: this 'if' should be folded into some more generic switch\/case\n+\t\tif (b == 0xc3) {\n+\t\t\top16 = addr[pc++];\n+\t\t\top16 |= (addr[pc++] << 8);\n+\t\t\tstmt1 = ir_add_stmt(bb, new_immediate(Size_I16, op16));\n+\t\t\tir_add_stmt(bb, new_set_reg(Size_I16, off_PC, stmt1));\n+\t\t\tbb->finished = 1;\n+\t\t\tprintf(\"jp %04x\", op16);\n+\t\t} else\n \t\tswitch (b & 7) {\n \t\tcase 6:\n \t\t\top8 = addr[pc++];\n@@ -302,6 +311,22 @@\n \n \t\t\tprintf(\"%s 0x%x\", alu_ops[reg2].name, op8);\n \t\t\tbreak;\n+\t\tcase 7:\n+\t\t\top16 = b & 0x38;\n+\t\t\tstmt1 = ir_add_stmt(bb, new_get_reg(Size_I16, off_PC));\n+\t\t\tstmt2 = ir_add_stmt(bb, new_get_reg(Size_I16, off_SP));\n+\t\t\tir_add_stmt(bb, new_store(Size_I16, stmt2, stmt1));\n+\n+\t\t\tstmt1 = ir_add_stmt(bb, new_immediate(Size_I16, 2));\n+\t\t\tstmt2 = ir_add_stmt(bb, new_alu(Size_I16, SUB, stmt2, stmt1));\n+\t\t\tir_add_stmt(bb, new_set_reg(Size_I16, off_SP, stmt2));\n+\n+\t\t\tstmt1 = ir_add_stmt(bb, new_immediate(Size_I16, op16));\n+\t\t\tir_add_stmt(bb, new_set_reg(Size_I16, off_PC, stmt1));\n+\t\t\tbb->finished = 1;\n+\n+\t\t\tprintf(\"rst 0x%02x\", op16);\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tgoto undef;\n \t\t}\n"} {"commit":"2ecf53b92697af94d0a08b74270d821fb7efaa55","subject":"fix drawing nodes without CPUs","message":"fix drawing nodes without CPUs\n\ngit-svn-id: 14be032f8f42541b1a281b51ae8ea69814daf20e@191 4b44e086-7f34-40ce-a3bd-00e031736276\n","repos":"BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- utils\/lstopo-draw.c\n+++ utils\/lstopo-draw.c\n@@ -215,11 +215,12 @@\n myheight += UNIT + FONT_SIZE + UNIT + UNIT;\n \n RECURSE(&null_draw_methods, UNIT);\n- maxheight += UNIT;\n if (totwidth < 10*UNIT)\n totwidth = 10*UNIT;\n *retwidth = totwidth + UNIT;\n- *retheight = myheight + maxheight;\n+ *retheight = myheight + maxheight + UNIT;\n+ if (!maxheight)\n+ *retheight -= UNIT;\n \n methods->box(output, EPOXY_R_COLOR, EPOXY_G_COLOR, EPOXY_B_COLOR, depth, x, *retwidth, y, *retheight);\n methods->box(output, MEMORY_R_COLOR, MEMORY_G_COLOR, MEMORY_B_COLOR, depth-1, x + UNIT, *retwidth - 2 * UNIT, y + UNIT, myheight - 2 * UNIT);\n"} {"commit":"9d541b6e81b127786f2be0fa67117fc5e3255333","subject":"lstopo-draw: remove comma and next digits when displaying link speed >= 10 GB\/s (PCIe Gen3 16x)","message":"lstopo-draw: remove comma and next digits when displaying link speed >= 10 GB\/s (PCIe Gen3 16x)\n\n(we only show 3 chars)\n\n\ngit-svn-id: 14be032f8f42541b1a281b51ae8ea69814daf20e@5048 4b44e086-7f34-40ce-a3bd-00e031736276\n","repos":"BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc,BlueBrain\/hwloc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- utils\/lstopo-draw.c\n+++ utils\/lstopo-draw.c\n@@ -501,7 +501,10 @@\n speed = subobjs[i]->attr->bridge.upstream.pci.linkspeed;\n if (speed != 0.) {\n char text[4];\n- snprintf(text, sizeof(text), \"%0.1f\", subobjs[i]->attr->pcidev.linkspeed);\n+ if (speed >= 10.)\n+\t snprintf(text, sizeof(text), \"%.0f\", subobjs[i]->attr->pcidev.linkspeed);\n+\t else\n+\t snprintf(text, sizeof(text), \"%0.1f\", subobjs[i]->attr->pcidev.linkspeed);\n methods->text(output, 0, 0, 0, fontsize, depth-1, x + 2*gridsize + gridsize, y + totheight, text);\n }\n }\n"} {"commit":"71010cd6fe45916e9d1f7db8c21076f4aedec420","subject":"* \u4fee\u590d\u7f16\u8bd1\u8b66\u544a","message":"* \u4fee\u590d\u7f16\u8bd1\u8b66\u544a","repos":"zero-rp\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,weolar\/miniblink49,weolar\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,weolar\/miniblink49,weolar\/miniblink49,zero-rp\/miniblink49,zero-rp\/miniblink49,zero-rp\/miniblink49,zero-rp\/miniblink49","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- vc6\/include\/wnet\/sal.h\n+++ vc6\/include\/wnet\/sal.h\n@@ -311,14 +311,22 @@\n \/\/ _In_ by itself can be used with non-pointer types (although it is redundant).\n \n \/\/ e.g. void SetPoint( _In_ const POINT* pPT );\n+#ifndef _In_\n #define _In_ _SAL2_Source_(_In_, (), _Pre1_impl_(__notnull_impl_notref) _Pre_valid_impl_ _Deref_pre1_impl_(__readaccess_impl_notref))\n+#endif\n+\n+#ifndef _In_opt_\n #define _In_opt_ _SAL2_Source_(_In_opt_, (), _Pre1_impl_(__maybenull_impl_notref) _Pre_valid_impl_ _Deref_pre_readonly_)\n+#endif\n \n \/\/ nullterminated 'in' parameters.\n \/\/ e.g. void CopyStr( _In_z_ const char* szFrom, _Out_z_cap_(cchTo) char* szTo, size_t cchTo );\n+#ifndef _In_z_\n #define _In_z_ _SAL2_Source_(_In_z_, (), _In_ _Pre1_impl_(__zterm_impl))\n+#endif\n+#ifndef _In_opt_z_\n #define _In_opt_z_ _SAL2_Source_(_In_opt_z_, (), _In_opt_ _Pre1_impl_(__zterm_impl))\n-\n+#endif\n \n \/\/ 'input' buffers with given size\n \n"} {"commit":"a3b4fb0750c097b072a5ec6d966db4af4185daa6","subject":"hygiene, use modf() instead of fmod()","message":"hygiene, use modf() instead of fmod()\n\nSigned-off-by: Sebastian Freundt <1f0829204b3475c52f714f96be4e7b39a87b6e74@ga-group.nl>\n","repos":"rudimeier\/dateutils,rudimeier\/dateutils,rudimeier\/dateutils","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- contrib\/tzconv.c\n+++ contrib\/tzconv.c\n@@ -97,7 +97,7 @@\n \n \t\tfor (mwSize i = 0; i < m * n; i++) {\n \t\t\tdouble x = TO_UNIX(src[i]);\n-\t\t\tdouble frac = fmod(x, 1.0);\n+\t\t\tdouble frac = modf(x, &x);\n \t\t\tint32_t utc = zif_utc_time(fromz, (int32_t)x);\n \t\t\tint32_t lcl = zif_local_time(toz, utc);\n \n"} {"commit":"6669fc0d9811568f36461edc689470bde52bf29a","subject":"Changed from storing positions at two adjacent time steps to storing position and velocity at one time step.","message":"Changed from storing positions at two adjacent time steps to storing\nposition and velocity at one time step.\n\nCommented the code much more thouroughly, so there is a chance someone\nelse may actually be able to understand it.\n\nStill TODO: Read all configuration parameters from an input file. The\noutput is especially hackish, and should be addressed next.\n","repos":"fcahoon\/physmod","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physmod.c\n+++ physmod.c\n@@ -2,18 +2,20 @@\n This code simulates a resonating n-dimensional space using a simplified\n physical model.\n \n-The code iterates over an array representing an n-dimensional grid. At \n-each step a new value is calculated for each point by considering two factors:\n-\n-1) Each point continues moving in the same direction it was moving before\n- (called \"momentum\"). An amount is added to the value of the point equal\n- to the difference between the past two values of that point, times a \n- coefficient c_momentum (which may need to be < 1.0 to prevent divergence).\n-\n-2) Each point is pulled on by its surrounding points (those whose coordinates\n- are equal to this point plus or minus 1 in each of the n dimensions).\n- The average of the difference between the surrounding points and the\n- point being evaluated is multiplied by another coefficient, c_pull.\n+The code iterates over two arrays representing the positions and velocities of\n+points moving in the (n+1)th dimension in an n-dimensional grid. At each step, new\n+values are calculated for each point by following these steps:\n+\n+1) The position of each point is adjusted according to the velocity it has from\n+ the previous step. The velocity value times the coefficient coeff_momentum is\n+ added to the position of each point. \n+\n+2) The new velocity of each point is computed from the updated positions calculated\n+ in step (1). Each point is pulled on by its surrounding points (those whose \n+ coordinates are equal to this point plus or minus 1 in each of the n dimensions).\n+ The sum of the difference between the surrounding points and the point being\n+ evaluated is multiplied by another coefficient, coeff_pull, to give the new velocity\n+ for that point.\n \n The results of each step are sampled at one or more coordinates in the grid\n and these values are written to a file for later analysis to (hopefully)\n@@ -51,7 +53,7 @@\n edge, so the dimension is \"wrapped around\".\n \n LOOSE: The point just off the edge is not used in the calculation.\n- The average used to calculate the pull contains one less point.\n+ The sum used to calculate the pull contains one less point.\n *\/\n typedef enum {\n FIXED,\n@@ -66,10 +68,10 @@\n typedef struct {\n int dimcount;\n int *dimsize;\n- MYFLT c_momentum, c_pull;\n+ MYFLT coeff_momentum, coeff_pull;\n end_strategy_t *left_strategy, *right_strategy;\n int bufsize;\n- MYFLT *bufA, *bufB;\n+ MYFLT *position, *velocity;\n int **adj_cache;\n } physmod_t;\n \n@@ -85,22 +87,21 @@\n init(physmod_t *p)\n {\n \n+ \/*\n const int dimcount = 1;\n- const int dimsize[] = { 512 };\n- const MYFLT c_momentum = 0.999999;\n- const MYFLT c_pull = 1.0;\n+ const int dimsize[] = { 64 };\n+ const MYFLT coeff_momentum = 1.0;\n+ const MYFLT coeff_pull = 1e-7;\n const end_strategy_t left_strategy[] = { FIXED };\n const end_strategy_t right_strategy[] = { FIXED };\n-\n-\n- \/*\n+ *\/\n+\n const int dimcount = 4;\n const int dimsize[] = { (5*6*7)\/2, (4*6*7)\/2, (4*5*7)\/2, (5*6*7)\/2 };\n- const MYFLT c_momentum = 1.0;\n- const MYFLT c_pull = 1.0 + 1e-6;\n+ const MYFLT coeff_momentum = 1.0;\n+ const MYFLT coeff_pull = 1.0 + 1e-6;\n const end_strategy_t left_strategy[] = { WRAPPED, WRAPPED, WRAPPED, WRAPPED };\n const end_strategy_t right_strategy[] = { WRAPPED, WRAPPED, WRAPPED, WRAPPED };\n- *\/\n \n int i, bufsize; \n p->dimcount = dimcount;\n@@ -114,13 +115,14 @@\n (p->right_strategy)[i] = right_strategy[i];\n bufsize *= dimsize[i];\n }\n- p->c_momentum = c_momentum;\n- p->c_pull = c_pull;\n+ p->coeff_momentum = coeff_momentum;\n+ p->coeff_pull = coeff_pull; \n p->bufsize = bufsize;\n- p->bufA = calloc(bufsize, sizeof(MYFLT));\n- p->bufB = calloc(bufsize, sizeof(MYFLT));\n+ p->position = calloc(bufsize, sizeof(MYFLT));\n+ p->velocity = calloc(bufsize, sizeof(MYFLT));\n p->adj_cache = calloc(bufsize, sizeof(int *));\n- randomize_buffer(p->bufA, bufsize, -1.0, 1.0);\n+ \/* randomize_buffer(p->position, bufsize, -1.0, 1.0); *\/\n+ p->position[1] = 1; \/* more like a pluck *\/\n }\n \n MYFLT\n@@ -179,15 +181,24 @@\n return c;\n }\n \n-\n #define ADJ_IDX_FIXED (-1)\n #define ADJ_IDX_IGNORE (-2)\n \n \/*\n-Calculate the buffer indices of all adjacent points to\n-a given buffer index c. The adjacent indices are placed in\n-in the passed-in adj_idx array, which is assumed to have\n-sufficent memory allocated to store 2*dimcount ints.\n+Calculate the one-dimensional buffer indices of all adjacent\n+points to a given one-dimensional buffer index c. The adjacent\n+indices are placed in in the passed-in adj_idx array, which is\n+assumed to have sufficent memory allocated to store 2*dimcount\n+ints.\n+\n+A scratch array which can also hold 2*dimcount ints is also passed\n+in to this function. This is used in the conversion from a one-\n+diminsional to a multi-dimensional representation of coordinates.\n+\n+By passing in a scratch array here we hope to avoid the deallocation\n+and reallocation of memory. We can't just declare this array locally\n+because its size is dependant on the number of dimensions we're\n+simulating.\n \n Negative numbers indicate special treatment to handle the\n edges:\n@@ -197,7 +208,7 @@\n (FIXED end stategy)\n \n ADJ_IDX_IGNORE (-2)\n- Omit this point when calculating the average pull\n+ Omit this point when calculating the total pull\n (LOOSE end strategy)\n *\/\n void\n@@ -206,17 +217,53 @@\n int *coords, *adj_coords;\n int i;\n \n+ \/*\n+ The first dimcount ints of the scratch array hold the\n+ n-dimensional coordinates of the point we're evaluating\n+ whose one-dimensional index is c. This is assigned the array\n+ name \"coords\".\n+\n+ The remaining dimcount ints of the scratch array hold the\n+ n-dimensional coordinates of an adjacent point in the array\n+ while we calculate its one-dimensional index. This is assigned\n+ the array name \"adj_coords\".\n+ *\/\n coords = scratch;\n adj_coords = scratch + p->dimcount;\n+\n+ \/* Put the n-dimensional coords for c in coords *\/\n extract_coords(p, c, coords);\n- \/* points to the \"left\" in each dimension *\/\n+ \n+ \/* Calculate the adjacent points to the \"left\" in each dimension *\/\n for (i=0 ; i < p->dimcount ; i++) {\n+\n+ \/* \n+ adj_idx[i] will hold the one-dimensional index for the point which\n+ is \"to the left\" in dimension i. We initially set this value to zero\n+ as a flag which let us distinguish \"off the grid\" cases.\n+ *\/\n adj_idx[i] = 0;\n- \/* start with a copy of this point's coordinates *\/\n+\n+ \/* \n+ Now we put the n-dimensional coordinates for the adjacent point\n+ in adj_coords. We Start with a copy of this point's coordinates\n+ *\/\n memcpy(adj_coords, coords, p->dimcount * sizeof(int));\n- \/* move dimension i one step \"to the left\" *\/\n+ \/* \n+ then we move one step \"to the left\" along dimension i. \n+ *\/\n adj_coords[i] = coords[i]-1;\n- \/* handle cases where we went off the grid *\/\n+ \n+ \/* \n+ This is where we handle cases where we went \"off the grid\".\n+ FIXED and LOOSE end strategies require special handling when\n+ calculating the pull of adjacent points, so for these we use\n+ special negative one-dimensional index values that serve as \n+ flags for that special handling. The WRAPPED end strategy requires \n+ that we adjust the i-th dimension coordinate to wrap around, but\n+ then we will want to compute the one-dimensional index from the\n+ n-dimensional coordinates as usual.\n+ *\/\n if (adj_coords[i] < 0) {\n switch ((p->left_strategy)[i]) {\n case FIXED:\n@@ -230,11 +277,20 @@\n \tbreak;\n }\n }\n+ \/*\n+ If this n-dimensional point did not require a special end strategy \n+ (it was not at an edge or the end strategy was WRAPPED) adj_idx[i]\n+ will still be 0, and now we need to translate from n-dimensional\n+ coordinates to a one-dimensional array index.\n+ *\/\n if (adj_idx[i] == 0) {\n adj_idx[i] = combine_coords(p, adj_coords);\n }\n }\n- \/* points to the \"right\" in each dimension *\/\n+ \/* \n+ Now, calculate points to the \"right\" in each dimension, following\n+ the same logic as we did for the \"left\" points above.\n+ *\/\n for (i=0 ; i < p->dimcount ; i++) {\n adj_idx[p->dimcount + i] = 0;\n memcpy(adj_coords, coords, p->dimcount * sizeof(int));\n@@ -259,50 +315,69 @@\n }\n \n \/*\n-Calculates the pull part of the simulation for one-dimensional\n-index c of buffer buf. \n+Calculate the pull on one-dimensional index c of the position array.\n+Buffer scratch must have enough memory to store 2*p->dimcount ints. \n *\/\n MYFLT\n-calc_pull_part(physmod_t *p, MYFLT *buf, int c, int *scratch)\n+calc_pull(physmod_t *p, MYFLT *position, int c, int *scratch)\n {\n int *adj_idx;\n int i, adj_count;\n- MYFLT pull_part, value, adj_value;\n-\n- \/* if adj_cache is nonzero, we assume it's initialized and should be used *\/\n+ MYFLT pull, value, adj_value;\n+\n+ \/* \n+ p->adj_cache is an optional cache of the one-dimensional indexes of the\n+ adjacent points to every point by its one-dimensional index. Special\n+ negative values are used for end strategies that require special handling.\n+ By caching this information we save a lot of computation for each iteration,\n+ but if memory is tight it doesn't have to be allocated.\n+\n+ If the memory address p->adj_cache is nonzero, that means that memory has\n+ been allocated for it and we're using the cache. If the memory address\n+ p->adj_cache[c] for one-dimensional index c is zero, that means the cache\n+ for that index has not yet been populated so we allocate the memory and\n+ compute the adjacent indexes for that index.\n+\n+ This means that, if the cache is in use, it should be fully populated in the\n+ first iteration of the simulation.\n+ *\/\n if (p->adj_cache) {\n- \/* if the adj_cache entry for this point is zero, we need to fill it *\/\n if (!p->adj_cache[c]) {\n+ \/* Populate the adjacent cache for this index, \n+\t if it hasn't been done already *\/\n p->adj_cache[c] = calloc(2 * p->dimcount, sizeof(int));\n calc_adj(p, c, p->adj_cache[c], scratch);\n }\n- \/* use the cached values *\/\n+ \/* Use the adjacent indexes from the cache. *\/\n adj_idx = p->adj_cache[c];\n } else {\n- \/* cache is not in use, calculate adj values (each time) *\/\n+ \/* Cache is not in use, calculate adj values (each time) *\/\n adj_idx = calloc(2 * p->dimcount, sizeof(int));\n calc_adj(p, c, adj_idx, scratch);\n }\n- \/* Now that we have all the adjacent points, calculate pull *\/\n- adj_count = 0;\n- pull_part = 0;\n+ \/* \n+ Now that we have all the adjacent points, we calculate the pull by\n+ summing the differences between the adjacent points and the point\n+ we're evaluating.\n+ *\/\n+\n+ pull = 0;\n for (i=0 ; i < 2*p->dimcount ; i++) {\n switch (adj_idx[i]) {\n case ADJ_IDX_FIXED:\n- pull_part += (0 - buf[c]);\n- adj_count++;\n+ \/* A fixed point on the edge always stays at position zero. *\/\n+ pull += (0 - position[c]);\n break;\n case ADJ_IDX_IGNORE:\n- \/* do nothing *\/\n+ \/* An point off the edge with a LOOSE end strategy makes no\n+ contribution to the pull. There's nothing to do in this case. *\/\n break;\n default:\n- pull_part += (buf[adj_idx[i]] - buf[c]);\n- adj_count++;\n- }\n- }\n- pull_part \/= adj_count;\n- pull_part *= p->c_pull;\n- return pull_part;\n+ pull += (position[adj_idx[i]] - position[c]);\n+ }\n+ }\n+ pull *= p->coeff_pull;\n+ return pull;\n }\n \n \/*\n@@ -312,24 +387,73 @@\n \n On entry, curr_buf is expected to contain the data from two steps ago,\n while prev_buf contains the data from one step ago. \n-*\/\n+\n void\n do_step(physmod_t *p, MYFLT *prev_buf, MYFLT *curr_buf, int *scratch)\n {\n- MYFLT momentum_part, pull_part;\n+ MYFLT momentum, pull;\n int i, thread_num;\n int *scratch_private;\n \n #pragma omp parallel shared(p, prev_buf, curr_buf, scratch) \\\n- private(i, momentum_part, pull_part, thread_num, scratch_private)\n+ private(i, momentum, pull, thread_num, scratch_private)\n {\n thread_num = omp_get_thread_num();\n scratch_private = scratch + (2 * p->dimcount) * thread_num;\n #pragma omp for\n for (i=0 ; i < p->bufsize ; i++) {\n- momentum_part = (prev_buf[i] - curr_buf[i]) * p->c_momentum;\n- pull_part = calc_pull_part(p, prev_buf, i, scratch_private);\n- curr_buf[i] = prev_buf[i] + momentum_part + pull_part;\n+ momentum = (prev_buf[i] - curr_buf[i]) * p->coeff_momentum;\n+ pull = calc_pull(p, prev_buf, i, scratch_private);\n+ curr_buf[i] = prev_buf[i] + momentum + pull;\n+ }\n+ }\n+}\n+*\/\n+\n+\/*\n+Do one step of the resonance simulation.\n+\n+First, the positions of each point are updated by their corresponding\n+velocities. \n+\n+Next, the velocities are adjusted by the pull calculated from\n+the differences in positions of each point from its adjacent points.\n+\n+Note the OMP trickery here: to handle variable numbers of dimensions, we\n+dynamically allocate memory before we enter this parallel section, and\n+pass a unique buffer to each thread using its thread number. \n+*\/\n+void\n+do_step(physmod_t *p, int *scratch)\n+{\n+ MYFLT *position, *velocity;\n+ int i, thread_num;\n+ int *scratch_private;\n+ position = p->position;\n+ velocity = p->velocity;\n+\n+#pragma omp parallel shared(position, velocity) \\\n+ private(i, thread_num, scratch_private)\n+ {\n+ \/* Assign each thred its own private scratch buffer *\/\n+ thread_num = omp_get_thread_num();\n+ scratch_private = scratch + (2 * p->dimcount) * thread_num;\n+\n+ \/* First, calculate the change in position of each point\n+ from the velocities *\/\n+#pragma omp for\n+ for (i=0 ; i < p->bufsize ; i++) {\n+ position[i] += velocity[i] * p->coeff_momentum;\n+ }\n+\n+ \/* Ensure all threads are done before the next step *\/\n+#pragma omp barrier\n+\n+ \/* Now, calculate the change in velocity of each point\n+ from the positions of adjacent points *\/\n+#pragma omp for\n+ for (i=0 ; i < p->bufsize ; i++) {\n+ velocity[i] += calc_pull(p, position, i, scratch_private);\n }\n }\n }\n@@ -351,43 +475,34 @@\n fpAt = fopen(\"outA.txt\", \"w\");\n fpBt = fopen(\"outB.txt\", \"w\");\n \n-\n \/* \n The \"taps\" (locations where we record the output of our\n simulation) are the one place we still use a hardcoded\n number of dimensions. This must be fixed.\n *\/\n tapAcoords[0] = PHYSMOD->dimsize[0]\/4;\n- \/*\n tapAcoords[1] = PHYSMOD->dimsize[1]\/4;\n tapAcoords[2] = PHYSMOD->dimsize[2]\/4;\n tapAcoords[3] = PHYSMOD->dimsize[3]\/4;\n- *\/\n tapA = combine_coords(PHYSMOD, tapAcoords);\n \n tapBcoords[0] = 3*PHYSMOD->dimsize[0]\/4;\n- \/*\n tapBcoords[1] = 3*PHYSMOD->dimsize[1]\/4;\n tapBcoords[2] = 3*PHYSMOD->dimsize[2]\/4;\n tapBcoords[3] = 3*PHYSMOD->dimsize[3]\/4;\n- *\/\n tapB = combine_coords(PHYSMOD, tapBcoords);\n \n \/* dynamically allocate scratch space for all threads *\/\n scratch = calloc(2 * PHYSMOD->dimcount * omp_get_max_threads(), sizeof(int));\n+ printf(\"max threads: %d\\n\", omp_get_max_threads());\n \n- for (j=0 ; j<64; j++) {\n+ for (j=0 ; j<16; j++) {\n for (i=0 ; i<1024*64; i++) {\n- do_step(PHYSMOD, PHYSMOD->bufA, PHYSMOD->bufB, scratch);\n- fwrite( PHYSMOD->bufA + tapA, sizeof(MYFLT), 1, fpA);\n- fprintf(fpAt, \"%f\\n\", (PHYSMOD->bufA)[tapA]);\n- fwrite( PHYSMOD->bufA + tapB, sizeof(MYFLT), 1, fpB);\n- fprintf(fpBt, \"%f\\n\", (PHYSMOD->bufA)[tapB]);\n- do_step(PHYSMOD, PHYSMOD->bufB, PHYSMOD->bufA, scratch);\n- fwrite( PHYSMOD->bufB + tapA, sizeof(MYFLT), 1, fpA);\n- fprintf(fpAt, \"%f\\n\", (PHYSMOD->bufB)[tapA]);\n- fwrite( PHYSMOD->bufB + tapB, sizeof(MYFLT), 1, fpB);\n- fprintf(fpBt, \"%f\\n\", (PHYSMOD->bufB)[tapB]);\n+ do_step(PHYSMOD, scratch);\n+ fwrite( PHYSMOD->position + tapA, sizeof(MYFLT), 1, fpA);\n+ fprintf(fpAt, \"%f\\n\", (PHYSMOD->position)[tapA]);\n+ fwrite( PHYSMOD->position + tapB, sizeof(MYFLT), 1, fpB);\n+ fprintf(fpBt, \"%f\\n\", (PHYSMOD->position)[tapB]);\n }\n fflush(NULL);\n printf(\"%6d samples written\\n\", (j+1)*1024*64);\n"} {"commit":"837a3439119b4219fece1923302ccc4984da6755","subject":"fixed convert<std::string>(), inline detail functions.","message":"fixed convert<std::string>(), inline detail functions.\n","repos":"norsync\/nanodbc,nanodbc\/nanodbc,nanodbc\/nanodbc,ChrisBFX\/nanodbc,ChrisBFX\/nanodbc,norsync\/nanodbc,mcg1969\/nanodbc,mcg1969\/nanodbc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- picodbc.h\n+++ picodbc.h\n@@ -71,7 +71,7 @@\n \t}\r\n \r\n \t\/\/ attempts to get the last ODBC error as a string.\r\n-\tstd::string last_error(SQLHANDLE handle, SQLSMALLINT handle_type)\r\n+\tinline std::string last_error(SQLHANDLE handle, SQLSMALLINT handle_type)\r\n \t{\r\n \t\tSQLCHAR sql_state[6];\r\n \t\tSQLCHAR sql_message[SQL_MAX_MESSAGE_LENGTH];\r\n@@ -96,7 +96,7 @@\n \t}\r\n \r\n \t\/\/ allocates the native ODBC handles.\r\n-\tvoid allocate_handle(HENV& env, HDBC& conn)\r\n+\tinline void allocate_handle(HENV& env, HDBC& conn)\r\n \t{\r\n \t\tSQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);\r\n \t\tSQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, reinterpret_cast<void*>(SQL_OV_ODBC3), 0);\r\n@@ -104,7 +104,7 @@\n \t}\r\n \r\n \t\/\/ Tests if the given db_data indicates NULL data.\r\n-\tbool is_null(SQLLEN cb_data)\r\n+\tinline bool is_null(SQLLEN cb_data)\r\n \t{\r\n \t\treturn (cb_data == SQL_NULL_DATA || cb_data < 0);\r\n \t}\r\n@@ -151,16 +151,22 @@\n \r\n \t\/\/ Converts the given string to the given type T.\r\n \ttemplate<class T>\r\n-\tT convert(const std::string& s)\r\n+\tinline T convert(const std::string& s)\r\n \t{\r\n \t\tT value;\r\n \t\tstd::sscanf(s.c_str(), sql_type_info<T>::format, &value);\r\n \t\treturn value;\r\n \t}\r\n \r\n+\ttemplate<>\r\n+\tinline std::string convert<std::string>(const std::string& s)\r\n+\t{\r\n+\t\treturn s;\r\n+\t}\r\n+\r\n \t\/\/ Binds the given column as an input parameter, the parameter value is written into the given output buffer.\r\n \ttemplate<class T>\r\n-\tconst T& bind_param(HSTMT stmt, long column, const T& value, void* output)\r\n+\tinline const T& bind_param(HSTMT stmt, long column, const T& value, void* output)\r\n \t{\r\n \t\tstd::memcpy(output, &value, sizeof(value));\r\n \t\tSQLLEN StrLenOrInPoint = 0;\r\n"} {"commit":"15a116710626d095443a78563368fbf40fe230f3","subject":"Include version in help text to make identification easier.","message":"Include version in help text to make identification easier.\n","repos":"miccoli\/pigpio,joan2937\/pigpio,joan2937\/pigpio,joan2937\/pigpio,miccoli\/pigpio,miccoli\/pigpio,joan2937\/pigpio,miccoli\/pigpio,joan2937\/pigpio","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- pigpiod.c\n+++ pigpiod.c\n@@ -84,6 +84,7 @@\n void usage()\n {\n fprintf(stderr, \"\\n\" \\\n+ \"pigpio V%d\\n\" \\\n \"Usage: sudo pigpiod [OPTION] ...\\n\" \\\n \" -a value, DMA mode, 0=AUTO, 1=PMAP, 2=MBOX, default AUTO\\n\" \\\n \" -b value, gpio sample buffer in milliseconds, default 120\\n\" \\\n@@ -100,7 +101,7 @@\n \"sudo pigpiod -s 2 -b 200 -f\\n\" \\\n \" Set a sample rate of 2 microseconds with a 200 millisecond\\n\" \\\n \" buffer. Disable the fifo interface.\\n\" \\\n- \"\\n\");\n+ \"\\n\", PIGPIO_VERSION);\n }\n \n static uint64_t getNum(char *str, int *err)\n"} {"commit":"e5aa6ed98914fc3b3067d2baa3ac7f30d6ee34fd","subject":"More documentation. Mostly low level super user functionality.","message":"More documentation. Mostly low level super user functionality.\n","repos":"PunchThrough\/PunchThrough-BEAN-Arduino-Firmware,PunchThrough\/PunchThrough-BEAN-Arduino-Firmware,PunchThrough\/PunchThrough-BEAN-Arduino-Firmware","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hardware\/bean\/avr\/cores\/bean\/Bean.h\n+++ hardware\/bean\/avr\/cores\/bean\/Bean.h\n@@ -86,12 +86,12 @@\n typedef LED_SETTING_T LedReading;\n \n \/**\n- * Needs docs\n+ * Currently enabled advertisements in the rotating advertisement controller.\n *\/\n typedef ADV_SWITCH_ENABLED_T BluetoothServices;\n \n \/**\n- * Needs docs\n+ * Data returned by the observer role.\n *\/\n typedef OBSERVER_INFO_MESSAGE_T ObseverAdvertisementInfo;\n \n@@ -149,12 +149,18 @@\n AccelerationReading getAcceleration(void);\n \n \/**\n- * Needs docs\n+ * Low level function for writing directly to the accelerometers registers.\n+ * @param reg the register to write to\n+ * @param value the value to write to the register\n *\/\n void accelRegisterWrite(uint8_t reg, uint8_t value);\n \n \/**\n- * Needs docs\n+ * Low level function for reading the accelerometers register directly\n+ * @param reg the register to read\n+ * @param length the number of bytes to read starting at that register\n+ * @param value a pointer to a user supplied array to fill with values\n+ * @return the number of bytes actually read\n *\/\n int accelRegisterRead(uint8_t reg, uint8_t length, uint8_t *value);\n \n@@ -447,7 +453,9 @@\n const char *getBeanName(void);\n \n \/**\n- * Needs docs\n+ * Sets the Beans advertisement interval. This is useful if you are trying to optimize battery life at the exense of advertisement rates\n+ and can also be useful for increasing beacon advertisement rates.\n+ * @param interval_ms length of advertisement interval in milliseconds. Minimum of BEAN_MIN_ADVERTISING_INT_MS and max of BEAN_MAX_ADVERTISING_INT_MS\n *\/\n void setAdvertisingInterval(uint16_t interval_ms);\n \n@@ -533,7 +541,7 @@\n \/\/\/@{\n \n \/**\n- * Needs docs\n+ * Works very similarly to setBeaconEnable. The primary difference being that enableiBeacon adds the beacon advertisement to a rotating adverisement instead of overrwriting the current standard Bean advertisement. Parameters are still set with the setBeaconParameters function.\n *\/\n void enableiBeacon(void);\n \n@@ -622,17 +630,18 @@\n \/\/\/@{\n \n \/**\n- * Needs docs\n+ * Returns a struct of all of the currently services and whether or not they are enabled.\n *\/\n BluetoothServices getServices(void);\n \n \/**\n- * Needs docs\n+ * Sets services for the Bean to use (NOTE: disabling the standard service will no longer allow the Bean to connect to the Bean Loader)\n+ * @param services the services to change\n *\/\n void setServices(BluetoothServices services);\n \n \/**\n- * Needs docs\n+ * Resets services leaving only the primary standard Bean service advertising.\n *\/\n void resetServices(void);\n \/\/\/@}\n"} {"commit":"51db1332af2e0a358578007d9447f2d314040b91","subject":"allocate widget_class from widget_pool","message":"allocate widget_class from widget_pool\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/widget-registry.c\n+++ src\/widget-registry.c\n@@ -35,8 +35,6 @@\n struct widget_class_lookup {\n pool_t pool;\n \n- struct widget_class class;\n-\n widget_class_callback_t callback;\n void *callback_ctx;\n };\n@@ -52,7 +50,7 @@\n return;\n }\n \n- class = &lookup->class;\n+ class = p_malloc(lookup->pool, sizeof(*class));\n class->stateful = response->stateful;\n resource_address_copy(lookup->pool, &class->address, &response->address);\n \n"} {"commit":"f9d1e3964f4a1225af81bd37abcf965efdfe3e49","subject":"Added a quick fix which should stop out of bounds setting of the colour map by the freetype driver while it is smoothing. ----------------------------------------------------------------------","message":"Added a quick fix which should stop out of bounds setting of the\ncolour map by the freetype driver while it is smoothing.\n----------------------------------------------------------------------\n\nsvn path=\/trunk\/; revision=5595\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plfreetype.c\n+++ src\/plfreetype.c\n@@ -883,7 +883,7 @@\n \t if ((r<0)||(g<0)||(b<0))\n \t\tplscol0 (k, 0, 0, 0);\n \t else\n-\t\tplscol0 (k, r, g, b);\n+\t\tplscol0 (k, (r > 0xff ? 0xff : r), (g > 0xff ? 0xff : g), (b > 0xff ? 0xff : b));\n }\n }\n }\n"} {"commit":"9c99108025a4e38ac61cf635750b1f0c8fa1c829","subject":"Update RCTCameraManager.h","message":"Update RCTCameraManager.h\n","repos":"wehriam\/react-native-camera,egpast\/react-native-camera,darrylblake\/react-native-camera,wehriam\/react-native-camera,FishErr\/react-native-camera,rpopovici\/react-native-camera,usergyt\/react-native-camera-fork,JedWatson\/react-native-camera,jibarra\/react-native-camera,wehriam\/react-native-camera,wehriam\/react-native-camera,jibarra\/react-native-camera,rpopovici\/react-native-camera,rpopovici\/react-native-camera,usergyt\/react-native-camera-fork,abrahambotros\/react-native-camera,JuniusAng\/react-native-camera,jibarra\/react-native-camera,rpopovici\/react-native-camera,abrahambotros\/react-native-camera,FishErr\/react-native-camera,Tredsite\/react-native-camera,lwansbrough\/react-native-camera,abrahambotros\/react-native-camera,lwansbrough\/react-native-camera,wehriam\/react-native-camera,Tredsite\/react-native-camera,egpast\/react-native-camera,abrahambotros\/react-native-camera,usergyt\/react-native-camera-fork,lwansbrough\/react-native-camera,jibarra\/react-native-camera,JedWatson\/react-native-camera,lwansbrough\/react-native-camera,JuniusAng\/react-native-camera,Tredsite\/react-native-camera,JuniusAng\/react-native-camera,JedWatson\/react-native-camera,Tredsite\/react-native-camera,FishErr\/react-native-camera,usergyt\/react-native-camera-fork,JuniusAng\/react-native-camera,JedWatson\/react-native-camera,egpast\/react-native-camera,egpast\/react-native-camera,darrylblake\/react-native-camera,FishErr\/react-native-camera","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ios\/RCTCameraManager.h\n+++ ios\/RCTCameraManager.h\n@@ -61,6 +61,7 @@\n @property (nonatomic, assign) NSInteger videoTarget;\n @property (nonatomic, assign) NSInteger orientation;\n @property (nonatomic, assign) BOOL mirrorImage;\n+@property (nonatomic, strong) NSArray* barCodeTypes;\n @property (nonatomic, strong) RCTPromiseResolveBlock videoResolve;\n @property (nonatomic, strong) RCTPromiseRejectBlock videoReject;\n @property (nonatomic, strong) RCTCamera *camera;\n@@ -70,6 +71,7 @@\n - (void)changeCamera:(NSInteger)camera;\n - (void)changeOrientation:(NSInteger)orientation;\n - (void)changeMirrorImage:(BOOL)mirrorImage;\n+- (void)changeBarCodeTypes:(NSArray *)barCodeTypes;\n - (void)changeFlashMode:(NSInteger)flashMode;\n - (void)changeTorchMode:(NSInteger)torchMode;\n - (AVCaptureDevice *)deviceWithMediaType:(NSString *)mediaType preferringPosition:(AVCaptureDevicePosition)position;\n"} {"commit":"26561e2299ae5ad98654916cb256b0009b88d23a","subject":"Add --astpackage command line option to print AST for just the main package","message":"Add --astpackage command line option to print AST for just the main package\n","repos":"CausalityLtd\/ponyc,Praetonus\/ponyc,jupvfranco\/ponyc,Perelandric\/ponyc,mkfifo\/ponyc,jupvfranco\/ponyc,boemmels\/ponyc,Perelandric\/ponyc,Theodus\/ponyc,cquinn\/ponyc,ponylang\/ponyc,Theodus\/ponyc,Praetonus\/ponyc,Theodus\/ponyc,dipinhora\/ponyc,dipinhora\/ponyc,jemc\/ponyc,ryanai3\/ponyc,kulibali\/ponyc,sgebbie\/ponyc,lukecheeseman\/ponyta,dipinhora\/ponyc,jemc\/ponyc,CausalityLtd\/ponyc,Perelandric\/ponyc,jupvfranco\/ponyc,doublec\/ponyc,jemc\/ponyc,boemmels\/ponyc,lukecheeseman\/ponyta,doublec\/ponyc,ryanai3\/ponyc,mkfifo\/ponyc,ryanai3\/ponyc,ponylang\/ponyc,boemmels\/ponyc,ponylang\/ponyc,cquinn\/ponyc,malthe\/ponyc,cquinn\/ponyc,jupvfranco\/ponyc,kulibali\/ponyc,lukecheeseman\/ponyta,malthe\/ponyc,sgebbie\/ponyc,kulibali\/ponyc,malthe\/ponyc,boemmels\/ponyc,Perelandric\/ponyc,boemmels\/ponyc,Theodus\/ponyc,kulibali\/ponyc,CausalityLtd\/ponyc,sgebbie\/ponyc,Perelandric\/ponyc,cquinn\/ponyc,malthe\/ponyc,mkfifo\/ponyc,Praetonus\/ponyc,mkfifo\/ponyc,jupvfranco\/ponyc,Theodus\/ponyc,mkfifo\/ponyc,sgebbie\/ponyc,doublec\/ponyc,sgebbie\/ponyc,Praetonus\/ponyc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ponyc\/main.c\n+++ src\/ponyc\/main.c\n@@ -38,6 +38,7 @@\n \n OPT_PASSES,\n OPT_AST,\n+ OPT_ASTPACKAGE,\n OPT_TRACE,\n OPT_WIDTH,\n OPT_IMMERR,\n@@ -71,6 +72,7 @@\n \n {\"pass\", 'r', OPT_ARG_REQUIRED, OPT_PASSES},\n {\"ast\", 'a', OPT_ARG_NONE, OPT_AST},\n+ {\"astpackage\", 0, OPT_ARG_NONE, OPT_ASTPACKAGE},\n {\"trace\", 't', OPT_ARG_NONE, OPT_TRACE},\n {\"width\", 'w', OPT_ARG_REQUIRED, OPT_WIDTH},\n {\"immerr\", '\\0', OPT_ARG_NONE, OPT_IMMERR},\n@@ -136,7 +138,8 @@\n \" =asm Output assembly.\\n\"\n \" =obj Output an object file.\\n\"\n \" =all The default: generate an executable.\\n\"\n- \" --ast, -a Output an abstract syntax tree.\\n\"\n+ \" --ast, -a Output an abstract syntax tree for the whole program.\\n\"\n+ \" --astpackage Output an abstract syntax tree for the main package.\\n\"\n \" --trace, -t Enable parse trace.\\n\"\n \" --width, -w Width to target when printing the AST.\\n\"\n \" =columns Defaults to the terminal width.\\n\"\n@@ -195,15 +198,19 @@\n return width;\n }\n \n-static bool compile_package(const char* path, pass_opt_t* opt, bool print_ast)\n+static bool compile_package(const char* path, pass_opt_t* opt,\n+ bool print_program_ast, bool print_package_ast)\n {\n ast_t* program = program_load(path, opt);\n \n if(program == NULL)\n return false;\n \n- if(print_ast)\n+ if(print_program_ast)\n ast_print(program);\n+\n+ if(print_package_ast)\n+ ast_print(ast_child(program));\n \n bool ok = generate_passes(program, opt);\n ast_free(program);\n@@ -222,7 +229,8 @@\n opt.output = \".\";\n \n ast_setwidth(get_width());\n- bool print_ast = false;\n+ bool print_program_ast = false;\n+ bool print_package_ast = false;\n \n opt_state_t s;\n opt_init(args, &s, &argc, argv);\n@@ -259,7 +267,8 @@\n case OPT_TRIPLE: opt.triple = s.arg_val; break;\n case OPT_STATS: opt.print_stats = true; break;\n \n- case OPT_AST: print_ast = true; break;\n+ case OPT_AST: print_program_ast = true; break;\n+ case OPT_ASTPACKAGE: print_package_ast = true; break;\n case OPT_TRACE: parse_trace(true); break;\n case OPT_WIDTH: ast_setwidth(atoi(s.arg_val)); break;\n case OPT_IMMERR: error_set_immediate(true); break;\n@@ -311,10 +320,11 @@\n {\n if(argc == 1)\n {\n- ok &= compile_package(\".\", &opt, print_ast);\n+ ok &= compile_package(\".\", &opt, print_program_ast, print_package_ast);\n } else {\n for(int i = 1; i < argc; i++)\n- ok &= compile_package(argv[i], &opt, print_ast);\n+ ok &= compile_package(argv[i], &opt, print_program_ast,\n+ print_package_ast);\n }\n }\n \n"} {"commit":"0efcd9f4a3608b5ba7c804c3cf4f62ead67f2219","subject":"PR#7505: Memory cannot be released after calling Bigarray.Genarray.change_layout.","message":"PR#7505: Memory cannot be released after calling Bigarray.Genarray.change_layout.\n","repos":"gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml,gerdstolpmann\/ocaml","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- otherlibs\/bigarray\/bigarray_stubs.c\n+++ otherlibs\/bigarray\/bigarray_stubs.c\n@@ -586,7 +586,8 @@\n \/* if the layout is different, change the flags and reverse the dimensions *\/\n if (Caml_ba_layout_val(vlayout) != (b->flags & CAML_BA_LAYOUT_MASK)) {\n \/* change the flags to reflect the new layout *\/\n- int flags = (b->flags & CAML_BA_KIND_MASK) | Caml_ba_layout_val(vlayout);\n+ int flags = (b->flags & (CAML_BA_KIND_MASK | CAML_BA_MANAGED_MASK))\n+ | Caml_ba_layout_val(vlayout);\n \/* reverse the dimensions *\/\n intnat new_dim[CAML_BA_MAX_NUM_DIMS];\n unsigned int i;\n@@ -595,8 +596,8 @@\n caml_ba_update_proxy(b, Caml_ba_array_val(res));\n CAMLreturn(res);\n } else {\n- \/* otherwise, do nothing *\/\n- CAMLreturn(vb);\n+ \/* otherwise, do nothing *\/\n+ CAMLreturn(vb);\n }\n #undef b\n }\n"} {"commit":"edd5f36c18dcae7d70e03586ccd3c6afbaa210e3","subject":"declare twitter kit view's delegate protocol","message":"declare twitter kit view's delegate protocol\n","repos":"netceteragroup\/react-native-twitterkit,netceteragroup\/react-native-twitterkit,netceteragroup\/react-native-twitterkit,netceteragroup\/react-native-twitterkit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ios\/RNTwitterKitView.h\n+++ ios\/RNTwitterKitView.h\n@@ -15,6 +15,15 @@\n #import <React\/UIView+React.h>\n #import <TwitterKit\/TwitterKit.h>\n \n+@class RNTwitterKitView;\n+\n+@protocol RNTwitterKitViewDelegate <NSObject>\n+@optional\n+\n+- (void)tweetView:(RNTwitterKitView *)view didChangeIntrinsicSize:(CGSize)newSize;\n+@end\n+\n @interface RNTwitterKitView : RCTView<TWTRTweetViewDelegate>\n \n+@property(nonatomic, weak) id<RNTwitterKitViewDelegate> delegate;\n @end\n"} {"commit":"cdc39363d33506b0e067d41fc91f89d186bdf7f7","subject":"[PATCH] Directed yield: direct yield of spinlocks for powerpc","message":"[PATCH] Directed yield: direct yield of spinlocks for powerpc\n\nPowerpc already has a directed yield for CONFIG_PREEMPT=\"n\". To make it\nwork with CONFIG_PREEMPT=\"y\" as well the _raw_{spin,read,write}_relax\nprimitives need to be defined to call __spin_yield() for spinlocks and\n__rw_yield() for rw-locks.\n\nAcked-by: Paul Mackerras <19a0ba370c443ba08d20b5061586430ab449ee8c@samba.org>\nSigned-off-by: Martin Schwidefsky <52616596d8f5df0d597e85ab515377f92f939c68@de.ibm.com>\nCc: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-powerpc\/spinlock.h\n+++ include\/asm-powerpc\/spinlock.h\n@@ -285,9 +285,9 @@\n \trw->lock = 0;\n }\n \n-#define _raw_spin_relax(lock)\tcpu_relax()\n-#define _raw_read_relax(lock)\tcpu_relax()\n-#define _raw_write_relax(lock)\tcpu_relax()\n+#define _raw_spin_relax(lock)\t__spin_yield(lock)\n+#define _raw_read_relax(lock)\t__rw_yield(lock)\n+#define _raw_write_relax(lock)\t__rw_yield(lock)\n \n #endif \/* __KERNEL__ *\/\n #endif \/* __ASM_SPINLOCK_H *\/\n"} {"commit":"02a5323d8060d7259277e9e2936fd02129dc0984","subject":"[PATCH] uml: remove some leftover PPC code","message":"[PATCH] uml: remove some leftover PPC code\n\nI happened to notice that this code is a leftover and it should be removed -\nsince there are sporadical efforts to revive the PPC port doing such cleanups\nis not useless.\n\nSigned-off-by: Paolo 'Blaisorblade' Giarrusso <25fbe3e5acbb7edd90bb5fdeec999a792321fbc4@yahoo.it>\nCc: Jeff Dike <f9b6309e85863eba5d28138b6a0f35841ce976d0@addtoit.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-um\/archparam-ppc.h\n+++ include\/asm-um\/archparam-ppc.h\n@@ -1,14 +1,5 @@\n #ifndef __UM_ARCHPARAM_PPC_H\n #define __UM_ARCHPARAM_PPC_H\n-\n-\/********* Bits for asm-um\/hw_irq.h **********\/\n-\n-struct hw_interrupt_type;\n-\n-\/********* Bits for asm-um\/hardirq.h **********\/\n-\n-#define irq_enter(cpu, irq) hardirq_enter(cpu)\n-#define irq_exit(cpu, irq) hardirq_exit(cpu)\n \n \/********* Bits for asm-um\/string.h **********\/\n \n"} {"commit":"47222bb21fe08e5663fcf05c80ba622066911226","subject":"Fixing issue with MatrixAffine2::rotateCopy methods","message":"Fixing issue with MatrixAffine2::rotateCopy methods\n\nBefore that, the following would not compile due to:\nNo matching member function for call to 'rotateCopy'\n\nci::MatrixAffine2f m1;\nauto m2 = m1.rotateCopy(M_PI * 0.5f);\nauto m3 = m1.rotateCopy(M_PI * 0.5f, ci::Vec2f(100, 200));\n","repos":"2666hz\/Cinder,morbozoo\/sonyHeadphones,sosolimited\/Cinder,morbozoo\/sonyHeadphones,2666hz\/Cinder,sosolimited\/Cinder,2666hz\/Cinder,2666hz\/Cinder,sosolimited\/Cinder,sosolimited\/Cinder,morbozoo\/sonyHeadphones,morbozoo\/sonyHeadphones","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/cinder\/MatrixAffine2.h\n+++ include\/cinder\/MatrixAffine2.h\n@@ -165,9 +165,9 @@\n \t\/\/! concatenate rotation by \\a radians around the point \\a pt (conceptually, rotate is before 'this')\n \tvoid\t\t\t\trotate( T radians, const Vec2<T> &pt ) { *this *= MatrixAffine2<T>::makeRotate( radians, pt ); }\n \t\/\/! Returns a copy of the matrix rotate by \\a radians \n-\tMatrixAffine2 \t\trotateCopy( const Vec2<T> &v ) const { MatrixAffine2 result = *this; result.rotate( v ); return result; }\n+\tMatrixAffine2 \t\trotateCopy( T radians ) const { MatrixAffine2 result = *this; result.rotate( radians ); return result; }\n \t\/\/! Returns a copy of the matrix rotate by \\a radians around the point \\a pt\n-\tMatrixAffine2 \t\trotateCopy( const Vec2<T> &v, const Vec2<T> &pt ) const { MatrixAffine2 result = *this; result.rotate( v, pt ); return result; }\n+\tMatrixAffine2 \t\trotateCopy( T radians, const Vec2<T> &pt ) const { MatrixAffine2 result = *this; result.rotate( radians, pt ); return result; }\n \n \t\/\/! concatenate scale (conceptually, scale is before 'this')\n \tvoid\t\t\t\tscale( T s );\n"} {"commit":"1f8d2cf2344ad4db17707d319415573f2ec8df00","subject":"- fixed typos","message":"- fixed typos\n\n[r22817]\n","repos":"8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,8l\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,8l\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,8l\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bespillbelady2.c\n+++ ir\/be\/bespillbelady2.c\n@@ -431,7 +431,7 @@\n \tblock_info_t *bi; \/**< The block to which bring in should happen. *\/\n \tint pressure_so_far; \/**< The maximal pressure till the first use of irn in bl. *\/\n \tir_node *first_use; \/**< The first user of irn in bl. *\/\n-\tsched_timestep_t use_step; \/**< Schedule sttep of the first use. *\/\n+\tsched_timestep_t use_step; \/**< Schedule step of the first use. *\/\n \n \tint is_remat : 1; \/**< Is rematerializable. *\/\n \tint sect_pressure; \/**< Offset to maximum pressure in block. *\/\n@@ -505,7 +505,7 @@\n \n \tassert(!(flags & arch_irn_flags_ignore));\n \n-\t\/* We have to keep nonspillable nodes in the workingset *\/\n+\t\/* We have to keep non-spillable nodes in the working set *\/\n \tif(flags & arch_irn_flags_dont_spill)\n \t\treturn 0;\n \n@@ -543,7 +543,7 @@\n * @param irn The node in question.\n * @return 1, if node is something transported into @p bl, 0 if not.\n * @note The function will only give correct answers in the case\n- * where @p irn is unsed in the block @p bl which is always\n+ * where @p irn is unused in the block @p bl which is always\n * the case in our usage scenario.\n *\/\n static INLINE int is_transport_in(const ir_node *bl, const ir_node *irn)\n@@ -679,7 +679,7 @@\n \t\tint i, arity;\n \t\tassert(workset_get_length(env->ws) <= env->n_regs && \"Too much values in workset!\");\n \n-\t\t\/* projs are handled with the tuple value.\n+\t\t\/* Projs are handled with the tuple value.\n \t\t * Phis are no real instr (see insert_starters())\n \t\t * instr_nr does not increase *\/\n \t\tif (is_Proj(irn) || is_Phi(irn))\n@@ -719,7 +719,7 @@\n \n \t\t\/* allocate all values _defined_ by this instruction *\/\n \t\tworkset_clear(new_vals);\n-\t\tif (get_irn_mode(irn) == mode_T) { \/* special handling for tuples and projs *\/\n+\t\tif (get_irn_mode(irn) == mode_T) { \/* special handling for Tuples and Projs *\/\n \t\t\tconst ir_edge_t *edge;\n \n \t\t\tforeach_out_edge(irn, edge) {\n@@ -993,7 +993,7 @@\n \n \t\t\/*\n \t\t * finally there is some room. we can at least reload the value.\n-\t\t * but we will try to let ot live through anyhow.\n+\t\t * but we will try to let or live through anyhow.\n \t\t *\/\n \t\tif (slot >= 0) {\n \t\t\tirn_action_t *vs = new_irn_action(ges, irn, bi->bl);\n@@ -1074,7 +1074,7 @@\n \t\t\tdouble c;\n \n \t\t\t\/*\n-\t\t\t * there might by unknwons as operands of phis in that case\n+\t\t\t * there might by Unknowns as operands of Phis in that case\n \t\t\t * we set the costs to zero, since they won't get spilled.\n \t\t\t *\/\n \t\t\tif (arch_irn_consider_in_reg_alloc(env->cls, op))\n@@ -1232,7 +1232,7 @@\n \t\/\/ assert(!is_local_phi(bl, irn) || !bitset_contains_irn(ges->succ_phis, irn));\n \n \t\/*\n-\t * if we cannot bring the value to the use, let's see ifit would be worthwhile\n+\t * if we cannot bring the value to the use, let's see if it would be worthwhile\n \t * to bring the value to the beginning of the block to have a better spill\n \t * location.\n \t *\n@@ -1269,7 +1269,7 @@\n \t\t *\n \t\t * If the second is larger than the first,\n \t\t * we have to increment the total block pressure and hence\n-\t\t * save the old pressure to restire it in case of failing to\n+\t\t * save the old pressure to restore it in case of failing to\n \t\t * bring the variable into the block in a register.\n \t\t *\/\n \t\ttrans = trans_begin(ges);\n@@ -1291,7 +1291,7 @@\n \t\t *\n \t\t * following actions can be taken:\n \t\t * a) commit changes\n-\t\t * b) mark phi as succeded if node was phi\n+\t\t * b) mark phi as succeeded if node was phi\n \t\t * c) insert reload at use location\n \t\t * d) give a spill location hint\n \t\t *\n@@ -1330,10 +1330,10 @@\n \t\t\t}\n \n \t\t\t\/*\n-\t\t\t * go from the last bring in use to the first and add all the variabled\n+\t\t\t * go from the last bring in use to the first and add all the variables\n \t\t\t * which additionally live through the block to their pressure.\n \t\t\t * at the point were the actually treated use is, we have to increase\n-\t\t\t * the pressure by one more as the nrought in value starts to count.\n+\t\t\t * the pressure by one more as the brought in value starts to count.\n \t\t\t * Finally, adjust the front pressure as well.\n \t\t\t *\/\n \t\t\tpressure_inc = 0;\n@@ -1428,7 +1428,7 @@\n \t\t\tworkset_set_version(bi->ws_end, j, ver_youngest);\n \t}\n \n-\t\/* determine ordeer and optimize them *\/\n+\t\/* determine order and optimize them *\/\n \tfor (br = determine_global_order(env); *br; ++br)\n \t\toptimize_variable(&ges, *br);\n \n"} {"commit":"bea3408d86266a5a2ca5de94164c5f95110df548","subject":"Add missing inline keywords to seed.h","message":"Add missing inline keywords to seed.h\n","repos":"hsu\/fcl,hsu\/fcl,hsu\/fcl","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/fcl\/math\/detail\/seed.h\n+++ include\/fcl\/math\/detail\/seed.h\n@@ -88,25 +88,25 @@\n \/\/============================================================================\/\/\n \n \/\/==============================================================================\n-bool Seed::isFirstSeedGenerated()\n+inline bool Seed::isFirstSeedGenerated()\n {\n return getInstance().firstSeedGenerated;\n }\n \n \/\/==============================================================================\n-uint_fast32_t Seed::getUserSetSeed()\n+inline uint_fast32_t Seed::getUserSetSeed()\n {\n return getInstance().userSetSeed;\n }\n \n \/\/==============================================================================\n-void Seed::setUserSetSeed(uint_fast32_t seed)\n+inline void Seed::setUserSetSeed(uint_fast32_t seed)\n {\n getInstance().userSetSeed = seed;\n }\n \n \/\/==============================================================================\n-uint_fast32_t Seed::getFirstSeed()\n+inline uint_fast32_t Seed::getFirstSeed()\n {\n \/\/ Compute the first seed to be used; this function should be called only once\n static std::mutex fsLock;\n@@ -134,7 +134,7 @@\n }\n \n \/\/==============================================================================\n-uint_fast32_t Seed::getNextSeed()\n+inline uint_fast32_t Seed::getNextSeed()\n {\n static std::mutex rngMutex;\n std::unique_lock<std::mutex> slock(rngMutex);\n@@ -145,13 +145,13 @@\n }\n \n \/\/==============================================================================\n-Seed::Seed() : userSetSeed(0), firstSeedGenerated(false), firstSeedValue(0)\n+inline Seed::Seed() : userSetSeed(0), firstSeedGenerated(false), firstSeedValue(0)\n {\n \/\/ Do nothing\n }\n \n \/\/==============================================================================\n-Seed& Seed::getInstance()\n+inline Seed& Seed::getInstance()\n {\n static Seed seed;\n \n"} {"commit":"ef2407fb8293923b527141910e97b70bb482c86c","subject":"Tried to create a PBQP graph with can't be solved heuristically (not finished yet)","message":"Tried to create a PBQP graph with can't be solved heuristically (not finished yet)\n\n[r22347]\n","repos":"killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,8l\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,libfirm\/libfirm","returncode":1,"stderr":"error: pathspec 'ir\/be\/test\/pbqpHeur2.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/test\/pbqpHeur2.c\n+++ ir\/be\/test\/pbqpHeur2.c\n@@ -0,0 +1,56 @@\n+char *block;\n+volatile char arr[100];\n+char ca,cb,cc;\n+int b;\n+\n+int k3_3(char* base, int i1, int i2, int i3, int k1, int k2, int k3)\n+{\n+\tchar a1, a2, a3;\n+\tchar b1, b2, b3;\n+\tchar c1, c2, c3;\n+\n+\ta1 = base[i1 + k1];\n+\ta2 = base[i2 + k1];\n+\ta3 = base[i3 + k1];\n+\n+\tb1 = base[i1 + k2];\n+\tb2 = base[i2 + k2];\n+\tb3 = base[i3 + k2];\n+\n+\tc1 = base[i1 + k3];\n+\tc2 = base[i2 + k3];\n+\tc3 = base[i3 + k3];\n+\n+\tif (a1 != a2)\n+\t\treturn a3;\n+\tif (b1 != b2)\n+\t\treturn b3;\n+\tif (c1 != c2)\n+\t\treturn c3;\n+\n+\treturn 0;\n+}\n+\n+int g1,g2,g3;\n+int h1,h2,h3;\n+int k1,k2,k3;\n+int k4,k5,k6;\n+int k7,k8,k9;\n+\n+void full_am(int base, int index)\n+{\n+\tca = arr[base + 4*index];\n+\tcb = arr[base + 4*index];\n+\tcc = arr[base + 4*index];\n+\n+\tb = k3_3(base + 4 * index, g1, g2, g3, 1, 2, 3);\n+\tb = k3_3(block, h1, h2, h3, 42, 5, 6);\n+\n+\tb = k3_3(ca, k1, k2, k3, 7, 8, 9);\n+\tb = k3_3(cb, k4, k5, k6, 10, 11, 12);\n+\tb = k3_3(cc, k7, k8, k9, 13, 14, 15);\n+}\n+\n+int main(int argc, char **argv) {\n+\treturn 0;\n+}\n"} {"commit":"510f9ebee360f935c82a6cd7755abb522ba07054","subject":"FIXME: who wrote this?","message":"FIXME: who wrote this?\n","repos":"konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/konoha3,konoha-project\/minikonoha,konoha-project\/minikonoha,konoha-project\/minikonoha","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- package\/konoha.regexp\/regexp_glue.c\n+++ package\/konoha.regexp\/regexp_glue.c\n@@ -807,7 +807,7 @@\n \t\t\t\tkArray *a = (kArray*)KLIB new_kObject(kctx, CT_StringArray0, 2);\n \t\t\t\tKLIB kArray_add(kctx, a, KLIB new_kString(kctx, source + 1, (pos0-2), 0));\n \t\t\t\tKLIB kArray_add(kctx, a, KLIB new_kString(kctx, source + pos0, pos-pos0, 0));\n-\t\t\t\ttk->subTokenList = a;\n+\t\t\t\ttk->subTokenList = a; \/\/ FIXME: terrible bug!! who wrote this\n \t\t\t\ttk->unresolvedTokenType = SYM_(\"$RegExp\");\n \t\t\t}\n \t\t\tRETURNi_(pos);\n"} {"commit":"b1df213042ef14c24b6d370e5fe16c681508af8b","subject":"Fix use of = instead of == to compare audio mode.","message":"Fix use of = instead of == to compare audio mode.\n","repos":"mapfau\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,mapfau\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,mapfau\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- audio\/pcm_bluetooth.c\n+++ audio\/pcm_bluetooth.c\n@@ -788,7 +788,7 @@\n \t\treturn err;\n \n \t\/* supported channels *\/\n-\tchannels = cfg.mode = CFG_MODE_MONO ? 1 : 2;\n+\tchannels = cfg.mode == CFG_MODE_MONO ? 1 : 2;\n \terr = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS,\n \t\t\t\t\t\t\tchannels, channels);\n \tif (err < 0)\n"} {"commit":"65aaf349ebcb2f029e3904b03060b32f7dead31e","subject":"Fix memory allocation failure check in ALSA initialization function","message":"Fix memory allocation failure check in ALSA initialization function\n","repos":"mapfau\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- audio\/pcm_bluetooth.c\n+++ audio\/pcm_bluetooth.c\n@@ -1769,7 +1769,8 @@\n \treturn 0;\n \n error:\n-\tbluetooth_exit(data);\n+\tif (data)\n+\t\tbluetooth_exit(data);\n \n \treturn err;\n }\n"} {"commit":"d0c2a7c1dbd00ba8196e2c01053781d1053ac0cb","subject":"docstring: typedef: qemu:: Add 'Since version' metadata","message":"docstring: typedef: qemu:: Add 'Since version' metadata\n\nEither create or append to existing docstring, the version (git tag)\nthat a given typedef was introduced in the format:\n\n Since: v1.2.3\n\nSigned-off-by: Victor Toso <39b7599ff73bbf5db531748ba5250f21fa7120ff@redhat.com>\nReviewed-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\n","repos":"crobinso\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,zippy2\/libvirt,zippy2\/libvirt,olafhering\/libvirt,libvirt\/libvirt,crobinso\/libvirt,libvirt\/libvirt,olafhering\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,zippy2\/libvirt,crobinso\/libvirt,libvirt\/libvirt,olafhering\/libvirt,olafhering\/libvirt,jfehlig\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/libvirt\/libvirt-qemu.h\n+++ include\/libvirt\/libvirt-qemu.h\n@@ -30,6 +30,11 @@\n extern \"C\" {\n # endif\n \n+\/**\n+ * virDomainQemuMonitorCommandFlags:\n+ *\n+ * Since: v0.8.8\n+ *\/\n typedef enum {\n VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT = 0, \/* (Since: v0.8.8) *\/\n VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP = (1 << 0), \/* cmd is in HMP (Since: v0.8.8) *\/\n@@ -50,6 +55,11 @@\n unsigned int pid_value,\n unsigned int flags);\n \n+\/**\n+ * virDomainQemuAgentCommandTimeoutValues:\n+ *\n+ * Since: v0.10.0\n+ *\/\n typedef enum {\n VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, \/* (Since: v0.10.0) *\/\n VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, \/* (Since: v0.10.0) *\/\n@@ -84,6 +94,11 @@\n void *opaque);\n \n \n+\/**\n+ * virConnectDomainQemuMonitorEventRegisterFlags:\n+ *\n+ * Since: v1.2.3\n+ *\/\n typedef enum {\n \/* Event filter is a regex rather than a literal string (Since: v1.2.3) *\/\n VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX = (1 << 0),\n"} {"commit":"436fd9a2e34f3659343ae965f055302a09d169dd","subject":"[GraphTraits] Add support for iterating over children edges.","message":"[GraphTraits] Add support for iterating over children edges.\n\nSummary:\nThis change is mostly adding comments to GraphTraits describing\ninterfaces to iterate over children edges of a node. These will\nhave to be implemented by specializations of GraphTraits. The\nnon-comment change is the addition of children_edges template\nfunction that returns an iterator range.\n\nThe motivation for this is to use it in synthetic count propagation\nalgorithm and remove the CallGraphTraits class that provide similar\ninterfaces.\n\nReviewers: dberlin, davidxl\n\nSubscribers: llvm-commits\n\nDifferential Revision: https:\/\/reviews.llvm.org\/D42698\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@323990 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/ADT\/GraphTraits.h\n+++ include\/llvm\/ADT\/GraphTraits.h\n@@ -46,6 +46,19 @@\n \/\/ static nodes_iterator nodes_begin(GraphType *G)\n \/\/ static nodes_iterator nodes_end (GraphType *G)\n \/\/ nodes_iterator\/begin\/end - Allow iteration over all nodes in the graph\n+\n+ \/\/ typedef EdgeRef - Type of Edge token in the graph, which should\n+ \/\/ be cheap to copy.\n+ \/\/ typedef ChildEdgeIteratorType - Type used to iterate over children edges in\n+ \/\/ graph, dereference to a EdgeRef.\n+\n+ \/\/ static ChildEdgeIteratorType child_edge_begin(NodeRef)\n+ \/\/ static ChildEdgeIteratorType child_edge_end(NodeRef)\n+ \/\/ Return iterators that point to the beginning and ending of the\n+ \/\/ edge list for the given callgraph node.\n+ \/\/\n+ \/\/ static NodeRef edge_dest(EdgeRef)\n+ \/\/ Return the destination node of an edge.\n \n \/\/ static unsigned size (GraphType *G)\n \/\/ Return total number of nodes in the graph\n@@ -111,6 +124,13 @@\n GraphTraits<Inverse<GraphType>>::child_end(G));\n }\n \n+template <class GraphType>\n+iterator_range<typename GraphTraits<GraphType>::ChildEdgeIteratorType>\n+children_edges(const typename GraphTraits<GraphType>::NodeRef &G) {\n+ return make_range(GraphTraits<GraphType>::child_edge_begin(G),\n+ GraphTraits<GraphType>::child_edge_end(G));\n+}\n+\n } \/\/ end namespace llvm\n \n #endif \/\/ LLVM_ADT_GRAPHTRAITS_H\n"} {"commit":"2e502577ab3645ab5c54434671d299e35c2245cc","subject":"Clarify that the NextPowerOfTwo template is idempotent.","message":"Clarify that the NextPowerOfTwo template is idempotent.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@107286 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/ADT\/SmallPtrSet.h\n+++ include\/llvm\/ADT\/SmallPtrSet.h\n@@ -200,7 +200,7 @@\n };\n \n \/\/\/ NextPowerOfTwo - This is a helper template that rounds N up to the next\n-\/\/\/ power of two.\n+\/\/\/ power of two (which means N itself if N is already a power of two).\n template<unsigned N>\n struct NextPowerOfTwo;\n \n"} {"commit":"6e9ff7ded6db1ad7314bcba64b6af29116e3f48d","subject":"Add capability to print out call graph","message":"Add capability to print out call graph\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@654 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Analysis\/Writer.h\n+++ include\/llvm\/Analysis\/Writer.h\n@@ -51,6 +51,20 @@\n inline ostream &operator <<(ostream &o, const DominanceFrontier &DF) {\n WriteToOutput(DF, o); return o;\n }\n+\n+ \/\/ Stuff for printing out a callgraph...\n+ class CallGraph;\n+ class CallGraphNode;\n+\n+ void WriteToOutput(const CallGraph &, ostream &o);\n+ inline ostream &operator <<(ostream &o, const CallGraph &CG) {\n+ WriteToOutput(CG, o); return o;\n+ }\n+ \n+ void WriteToOutput(const CallGraphNode *, ostream &o);\n+ inline ostream &operator <<(ostream &o, const CallGraphNode *CG) {\n+ WriteToOutput(CG, o); return o;\n+ }\n } \/\/ End namespace CFG\n \n #endif\n"} {"commit":"b8509c8936bdb3deaeac86e2ee9716c06d4e0865","subject":"i965: Add some APL and KBL SKU strings","message":"i965: Add some APL and KBL SKU strings\n\nWe got a couple for products that exist on ark.intel.com, so let's just\nput them in now.\n\nSigned-off-by: Ben Widawsky <73675debcd8a436be48ec22211dcf44fe0df0a64@bwidawsk.net>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/pci_ids\/i965_pci_ids.h\n+++ include\/pci_ids\/i965_pci_ids.h\n@@ -144,11 +144,11 @@\n CHIPSET(0x5915, kbl_gt1_5, \"Intel(R) Kabylake GT1.5\")\n CHIPSET(0x5917, kbl_gt1_5, \"Intel(R) Kabylake GT1.5\")\n CHIPSET(0x5912, kbl_gt2, \"Intel(R) Kabylake GT2\")\n-CHIPSET(0x5916, kbl_gt2, \"Intel(R) Kabylake GT2\")\n+CHIPSET(0x5916, kbl_gt2, \"Intel(R) HD Graphics 620 (Intel(R) Kabylake GT2)\")\n CHIPSET(0x591A, kbl_gt2, \"Intel(R) Kabylake GT2\")\n CHIPSET(0x591B, kbl_gt2, \"Intel(R) Kabylake GT2\")\n CHIPSET(0x591D, kbl_gt2, \"Intel(R) Kabylake GT2\")\n-CHIPSET(0x591E, kbl_gt2, \"Intel(R) Kabylake GT2\")\n+CHIPSET(0x591E, kbl_gt2, \"Intel(R) HD Graphics 615 (Kabylake GT2)\")\n CHIPSET(0x5921, kbl_gt2, \"Intel(R) Kabylake GT2F\")\n CHIPSET(0x5923, kbl_gt3, \"Intel(R) Kabylake GT3\")\n CHIPSET(0x5926, kbl_gt3, \"Intel(R) Kabylake GT3\")\n@@ -161,5 +161,5 @@\n CHIPSET(0x0A84, bxt, \"Intel(R) HD Graphics (Broxton)\")\n CHIPSET(0x1A84, bxt, \"Intel(R) HD Graphics (Broxton)\")\n CHIPSET(0x1A85, bxt_2x6, \"Intel(R) HD Graphics (Broxton 2x6)\")\n-CHIPSET(0x5A84, bxt, \"Intel(R) HD Graphics (Broxton)\")\n-CHIPSET(0x5A85, bxt_2x6, \"Intel(R) HD Graphics (Broxton 2x6)\")\n+CHIPSET(0x5A84, bxt, \"Intel(R) HD Graphics 505 (Broxton)\")\n+CHIPSET(0x5A85, bxt_2x6, \"Intel(R) HD Graphics 500 (Broxton 2x6)\")\n"} {"commit":"fccba5d82e66e23c9779c13b4059b3a8da1a9829","subject":"[FIX] Weird gcc error with overloaded ostream operator.","message":"[FIX] Weird gcc error with overloaded ostream operator.\n","repos":"xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan,xenigmax\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/seqan\/simd\/simd_base.h\n+++ include\/seqan\/simd\/simd_base.h\n@@ -385,17 +385,6 @@\n return stream;\n }\n \n-template <typename TSimdVector>\n-inline SEQAN_FUNC_ENABLE_IF(Is<SimdMaskVectorConcept<TSimdVector> >, std::ostream &)\n-operator<<(std::ostream & stream, TSimdVector const & vector)\n-{\n- stream << '<';\n- for (int i = 0; i < LENGTH<TSimdVector>::VALUE; ++i)\n- stream << '\\t' << vector[i];\n- stream << \"\\t>\";\n- return stream;\n-}\n-\n } \/\/ namespace seqan\n \n #endif \/\/ SEQAN_INCLUDE_SEQAN_SIMD_SIMD_BASE_H_\n"} {"commit":"8d34333da31893a56f7d37046208dfec20a7076e","subject":"Remove unused struct field","message":"Remove unused struct field\n","repos":"omf2097\/openomf,omf2097\/openomf,omf2097\/libShadowDive,omf2097\/openomf,omf2097\/libShadowDive,omf2097\/libShadowDive","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/shadowdive\/animation.h\n+++ include\/shadowdive\/animation.h\n@@ -21,7 +21,6 @@\n \n \/\/ String header\n char *anim_string;\n- uint8_t unknown_b;\n uint8_t extra_string_count;\n \n \/\/ Extra strings\n"} {"commit":"c64c35b5aa8e0140f0cdf3aca9e07d3c4720b4be","subject":"Use separate getter\/setter functions with different names.","message":"Use separate getter\/setter functions with different names.\n","repos":"giorgiobornia\/libmesh,libMesh\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,jwpeterson\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,capitalaslash\/libmesh,jwpeterson\/libmesh,roystgnr\/libmesh,libMesh\/libmesh,dschwen\/libmesh,hrittich\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,pbauman\/libmesh,roystgnr\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,90jrong\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,90jrong\/libmesh,90jrong\/libmesh,90jrong\/libmesh,pbauman\/libmesh,balborian\/libmesh,pbauman\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,hrittich\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,giorgiobornia\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,hrittich\/libmesh,balborian\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,capitalaslash\/libmesh,giorgiobornia\/libmesh,giorgiobornia\/libmesh,libMesh\/libmesh,capitalaslash\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,pbauman\/libmesh,dschwen\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,jwpeterson\/libmesh,roystgnr\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,hrittich\/libmesh,dschwen\/libmesh,capitalaslash\/libmesh,capitalaslash\/libmesh,balborian\/libmesh,giorgiobornia\/libmesh,jwpeterson\/libmesh,hrittich\/libmesh,libMesh\/libmesh,balborian\/libmesh,pbauman\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,balborian\/libmesh,hrittich\/libmesh,BalticPinguin\/libmesh,dschwen\/libmesh,90jrong\/libmesh,90jrong\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,dschwen\/libmesh,giorgiobornia\/libmesh,BalticPinguin\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/solvers\/eigen_solver.h\n+++ include\/solvers\/eigen_solver.h\n@@ -82,13 +82,24 @@\n bool initialized () const { return _is_initialized; }\n \n \/**\n- * \\returns \\p true if we want to close the matrix before solve,\n- * false otherwise. It is true by default.\n- *\/\n- bool & close_matrix_before_solve()\n+ * \\returns \\p The value of the flag which controls whether libmesh\n+ * closes the eigenproblem matrices before solving. \\true by\n+ * default.\n+ *\/\n+ bool get_close_matrix_before_solve() const\n {\n libmesh_experimental();\n return _close_matrix_before_solve;\n+ }\n+\n+ \/**\n+ * Set the flag which controls whether libmesh closes the\n+ * eigenproblem matrices before solving.\n+ *\/\n+ void set_close_matrix_before_solve(bool val)\n+ {\n+ libmesh_experimental();\n+ _close_matrix_before_solve = val;\n }\n \n \/**\n"} {"commit":"5124ff1bb67861fe3aa9966fc7bb6c3592b77ce1","subject":"Fix getAsOpaquePointer method const-correctness","message":"Fix getAsOpaquePointer method const-correctness\n\nIn order for the method to be const, it should cast its Pointer member to a const void* and return it as such, not as a void*. This wasn't caught before due to using a C-style cast which stripped away the member's constness implicitly.\n","repos":"uasys\/swift,tkremenek\/swift,nathawes\/swift,tinysun212\/swift-windows,lorentey\/swift,allevato\/swift,roambotics\/swift,swiftix\/swift,swiftix\/swift,shajrawi\/swift,hughbe\/swift,austinzheng\/swift,gribozavr\/swift,modocache\/swift,djwbrown\/swift,shahmishal\/swift,JGiola\/swift,brentdax\/swift,aschwaighofer\/swift,tkremenek\/swift,huonw\/swift,Jnosh\/swift,shajrawi\/swift,glessard\/swift,johnno1962d\/swift,aschwaighofer\/swift,arvedviehweger\/swift,OscarSwanros\/swift,kperryua\/swift,shahmishal\/swift,harlanhaskins\/swift,apple\/swift,swiftix\/swift,JaSpa\/swift,tkremenek\/swift,jtbandes\/swift,alblue\/swift,hooman\/swift,nathawes\/swift,tardieu\/swift,JaSpa\/swift,danielmartin\/swift,Jnosh\/swift,jckarter\/swift,devincoughlin\/swift,SwiftAndroid\/swift,swiftix\/swift,codestergit\/swift,austinzheng\/swift,IngmarStein\/swift,modocache\/swift,lorentey\/swift,dreamsxin\/swift,SwiftAndroid\/swift,amraboelela\/swift,tjw\/swift,KrishMunot\/swift,jmgc\/swift,glessard\/swift,hughbe\/swift,roambotics\/swift,benlangmuir\/swift,ken0nek\/swift,manavgabhawala\/swift,aschwaighofer\/swift,djwbrown\/swift,kperryua\/swift,SwiftAndroid\/swift,airspeedswift\/swift,benlangmuir\/swift,gottesmm\/swift,shajrawi\/swift,modocache\/swift,frootloops\/swift,CodaFi\/swift,russbishop\/swift,djwbrown\/swift,zisko\/swift,xedin\/swift,practicalswift\/swift,russbishop\/swift,tjw\/swift,sschiau\/swift,ahoppen\/swift,felix91gr\/swift,kstaring\/swift,modocache\/swift,allevato\/swift,dreamsxin\/swift,gribozavr\/swift,SwiftAndroid\/swift,CodaFi\/swift,rudkx\/swift,calebd\/swift,deyton\/swift,bitjammer\/swift,bitjammer\/swift,CodaFi\/swift,airspeedswift\/swift,practicalswift\/swift,kstaring\/swift,rudkx\/swift,lorentey\/swift,IngmarStein\/swift,gottesmm\/swift,deyton\/swift,djwbrown\/swift,tinysun212\/swift-windows,nathawes\/swift,huonw\/swift,practicalswift\/swift,ahoppen\/swift,manavgabhawala\/swift,return\/swift,allevato\/swift,alblue\/swift,return\/swift,karwa\/swift,ahoppen\/swift,glessard\/swift,amraboelela\/swift,ken0nek\/swift,KrishMunot\/swift,karwa\/swift,arvedviehweger\/swift,lorentey\/swift,jmgc\/swift,hooman\/swift,parkera\/swift,return\/swift,deyton\/swift,JaSpa\/swift,CodaFi\/swift,gregomni\/swift,KrishMunot\/swift,sschiau\/swift,felix91gr\/swift,SwiftAndroid\/swift,apple\/swift,lorentey\/swift,danielmartin\/swift,xwu\/swift,xedin\/swift,jmgc\/swift,apple\/swift,danielmartin\/swift,arvedviehweger\/swift,kstaring\/swift,Jnosh\/swift,benlangmuir\/swift,tinysun212\/swift-windows,tjw\/swift,brentdax\/swift,OscarSwanros\/swift,huonw\/swift,xwu\/swift,bitjammer\/swift,milseman\/swift,apple\/swift,JaSpa\/swift,lorentey\/swift,tjw\/swift,jopamer\/swift,austinzheng\/swift,practicalswift\/swift,frootloops\/swift,milseman\/swift,manavgabhawala\/swift,jtbandes\/swift,calebd\/swift,IngmarStein\/swift,gmilos\/swift,rudkx\/swift,ben-ng\/swift,therealbnut\/swift,sschiau\/swift,xedin\/swift,sschiau\/swift,nathawes\/swift,tardieu\/swift,hughbe\/swift,austinzheng\/swift,milseman\/swift,johnno1962d\/swift,felix91gr\/swift,amraboelela\/swift,therealbnut\/swift,tjw\/swift,natecook1000\/swift,felix91gr\/swift,stephentyrone\/swift,gregomni\/swift,therealbnut\/swift,tinysun212\/swift-windows,natecook1000\/swift,codestergit\/swift,russbishop\/swift,gottesmm\/swift,therealbnut\/swift,gottesmm\/swift,sschiau\/swift,brentdax\/swift,aschwaighofer\/swift,atrick\/swift,KrishMunot\/swift,xedin\/swift,amraboelela\/swift,kperryua\/swift,codestergit\/swift,return\/swift,jmgc\/swift,shajrawi\/swift,johnno1962d\/swift,jmgc\/swift,uasys\/swift,lorentey\/swift,airspeedswift\/swift,zisko\/swift,KrishMunot\/swift,tardieu\/swift,alblue\/swift,hooman\/swift,harlanhaskins\/swift,gribozavr\/swift,stephentyrone\/swift,bitjammer\/swift,ken0nek\/swift,jckarter\/swift,allevato\/swift,gmilos\/swift,jtbandes\/swift,therealbnut\/swift,jckarter\/swift,kstaring\/swift,amraboelela\/swift,tjw\/swift,allevato\/swift,Jnosh\/swift,CodaFi\/swift,huonw\/swift,tardieu\/swift,ahoppen\/swift,gottesmm\/swift,airspeedswift\/swift,bitjammer\/swift,IngmarStein\/swift,KrishMunot\/swift,benlangmuir\/swift,ahoppen\/swift,ken0nek\/swift,IngmarStein\/swift,parkera\/swift,return\/swift,danielmartin\/swift,CodaFi\/swift,hughbe\/swift,gribozavr\/swift,milseman\/swift,gregomni\/swift,xwu\/swift,tjw\/swift,shajrawi\/swift,alblue\/swift,ben-ng\/swift,xwu\/swift,atrick\/swift,gmilos\/swift,shahmishal\/swift,arvedviehweger\/swift,amraboelela\/swift,devincoughlin\/swift,natecook1000\/swift,ben-ng\/swift,jtbandes\/swift,uasys\/swift,OscarSwanros\/swift,IngmarStein\/swift,jckarter\/swift,jopamer\/swift,tkremenek\/swift,uasys\/swift,kperryua\/swift,ahoppen\/swift,deyton\/swift,calebd\/swift,aschwaighofer\/swift,sschiau\/swift,roambotics\/swift,roambotics\/swift,OscarSwanros\/swift,codestergit\/swift,kperryua\/swift,karwa\/swift,SwiftAndroid\/swift,therealbnut\/swift,gribozavr\/swift,practicalswift\/swift,jopamer\/swift,calebd\/swift,zisko\/swift,airspeedswift\/swift,benlangmuir\/swift,gmilos\/swift,tkremenek\/swift,calebd\/swift,stephentyrone\/swift,arvedviehweger\/swift,JaSpa\/swift,zisko\/swift,milseman\/swift,ben-ng\/swift,IngmarStein\/swift,jckarter\/swift,jtbandes\/swift,karwa\/swift,sschiau\/swift,practicalswift\/swift,felix91gr\/swift,JaSpa\/swift,brentdax\/swift,ken0nek\/swift,jopamer\/swift,shajrawi\/swift,JGiola\/swift,uasys\/swift,codestergit\/swift,atrick\/swift,tinysun212\/swift-windows,JGiola\/swift,manavgabhawala\/swift,frootloops\/swift,parkera\/swift,jopamer\/swift,Jnosh\/swift,huonw\/swift,natecook1000\/swift,OscarSwanros\/swift,tardieu\/swift,ben-ng\/swift,nathawes\/swift,bitjammer\/swift,jopamer\/swift,return\/swift,milseman\/swift,natecook1000\/swift,sschiau\/swift,devincoughlin\/swift,alblue\/swift,shahmishal\/swift,karwa\/swift,shahmishal\/swift,frootloops\/swift,JGiola\/swift,OscarSwanros\/swift,xwu\/swift,JaSpa\/swift,stephentyrone\/swift,atrick\/swift,felix91gr\/swift,johnno1962d\/swift,devincoughlin\/swift,codestergit\/swift,swiftix\/swift,tkremenek\/swift,danielmartin\/swift,practicalswift\/swift,hooman\/swift,shajrawi\/swift,aschwaighofer\/swift,frootloops\/swift,harlanhaskins\/swift,shahmishal\/swift,amraboelela\/swift,manavgabhawala\/swift,manavgabhawala\/swift,modocache\/swift,glessard\/swift,natecook1000\/swift,gmilos\/swift,natecook1000\/swift,ben-ng\/swift,parkera\/swift,therealbnut\/swift,bitjammer\/swift,shajrawi\/swift,gribozavr\/swift,kperryua\/swift,rudkx\/swift,jtbandes\/swift,djwbrown\/swift,ken0nek\/swift,karwa\/swift,xedin\/swift,jmgc\/swift,stephentyrone\/swift,hooman\/swift,hughbe\/swift,johnno1962d\/swift,practicalswift\/swift,austinzheng\/swift,johnno1962d\/swift,gribozavr\/swift,gmilos\/swift,xedin\/swift,ken0nek\/swift,atrick\/swift,johnno1962d\/swift,kstaring\/swift,russbishop\/swift,glessard\/swift,jmgc\/swift,glessard\/swift,alblue\/swift,frootloops\/swift,tardieu\/swift,harlanhaskins\/swift,calebd\/swift,kstaring\/swift,austinzheng\/swift,brentdax\/swift,nathawes\/swift,Jnosh\/swift,deyton\/swift,jckarter\/swift,gregomni\/swift,parkera\/swift,tinysun212\/swift-windows,frootloops\/swift,arvedviehweger\/swift,xedin\/swift,jckarter\/swift,jopamer\/swift,arvedviehweger\/swift,Jnosh\/swift,SwiftAndroid\/swift,parkera\/swift,milseman\/swift,parkera\/swift,modocache\/swift,airspeedswift\/swift,aschwaighofer\/swift,huonw\/swift,hughbe\/swift,austinzheng\/swift,uasys\/swift,russbishop\/swift,deyton\/swift,zisko\/swift,djwbrown\/swift,felix91gr\/swift,uasys\/swift,kstaring\/swift,xwu\/swift,djwbrown\/swift,calebd\/swift,modocache\/swift,karwa\/swift,hooman\/swift,shahmishal\/swift,zisko\/swift,hooman\/swift,russbishop\/swift,rudkx\/swift,parkera\/swift,harlanhaskins\/swift,danielmartin\/swift,devincoughlin\/swift,tinysun212\/swift-windows,brentdax\/swift,russbishop\/swift,alblue\/swift,xedin\/swift,apple\/swift,ben-ng\/swift,manavgabhawala\/swift,devincoughlin\/swift,tkremenek\/swift,gregomni\/swift,stephentyrone\/swift,allevato\/swift,JGiola\/swift,benlangmuir\/swift,deyton\/swift,harlanhaskins\/swift,devincoughlin\/swift,gottesmm\/swift,OscarSwanros\/swift,airspeedswift\/swift,harlanhaskins\/swift,atrick\/swift,KrishMunot\/swift,stephentyrone\/swift,tardieu\/swift,gribozavr\/swift,roambotics\/swift,JGiola\/swift,huonw\/swift,return\/swift,karwa\/swift,roambotics\/swift,allevato\/swift,devincoughlin\/swift,xwu\/swift,hughbe\/swift,brentdax\/swift,codestergit\/swift,kperryua\/swift,swiftix\/swift,zisko\/swift,gregomni\/swift,shahmishal\/swift,swiftix\/swift,lorentey\/swift,nathawes\/swift,jtbandes\/swift,gottesmm\/swift,rudkx\/swift,gmilos\/swift,danielmartin\/swift,CodaFi\/swift,apple\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/AST\/Identifier.h\n+++ include\/swift\/AST\/Identifier.h\n@@ -127,7 +127,9 @@\n return !empty() && isEditorPlaceholder(str());\n }\n \n- void *getAsOpaquePointer() const { return (void *)Pointer; }\n+ const void *getAsOpaquePointer() const {\n+ return static_cast<const void *>(Pointer);\n+ }\n \n static Identifier getFromOpaquePointer(void *P) {\n return Identifier((const char*)P);\n"} {"commit":"c6bd4afa4d8e6a3108fd66dbe9177f29906f2365","subject":"Prepare the configuration parameters needed for implementing a new runtime calling convention.","message":"Prepare the configuration parameters needed for implementing a new runtime calling convention.\n\nDefine a number of macro definitions that will be used for:\n- proper auto-generation of LLVM IR level declarations of runtime function using RuntimeFunctions.def\n- generation of wrappers for runtime functions\n- setting proper calling conventions, visibility and other attributes of runtime functions inside the runtime library.\n","repos":"khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift,khizkhiz\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/Runtime\/Config.h\n+++ include\/swift\/Runtime\/Config.h\n@@ -62,4 +62,121 @@\n \/\/ Bring in visibility attribute macros\n #include \"..\/..\/..\/stdlib\/public\/SwiftShims\/Visibility.h\"\n \n+\/\/ Define mappings for calling conventions.\n+\n+\/\/ Annotation for specifying a calling convention of\n+\/\/ a runtime function. It should be used with declarations\n+\/\/ of runtime functions like this:\n+\/\/ void runtime_function_name() CALLING_CONVENTION(RuntimeCC1)\n+#define CALLING_CONVENTION(CC) CALLING_CONVENTION_##CC\n+\n+#define CALLING_CONVENTION_preserve_most __attribute__((preserve_most))\n+#define CALLING_CONVENTION_preserve_all __attribute__((preserve_all))\n+#define CALLING_CONVENTION_c\n+\n+\/\/ Map a logical calling convention (e.g. RuntimeCC1) to LLVM calling\n+\/\/ convention.\n+#define LLVM_CC(CC) LLVM_CC_##CC\n+\n+\/\/ Currently, RuntimeFunction.def uses the following calling conventions:\n+\/\/ RuntimeCC, RuntimeCC0, RuntimeCC1.\n+\/\/ If new runtime calling conventions are added later, they need to be mapped\n+\/\/ here to something appropriate.\n+\n+\/\/ RuntimeCC and RuntimeCC0 are the standard C calling convention.\n+#define CALLING_CONVENTION_RuntimeCC CALLING_CONVENTION_c\n+#define CALLING_CONVENTION_RuntimeCC_IMPL CALLING_CONVENTION_c\n+#define LLVM_CC_RuntimeCC llvm::CallingConv::C\n+\n+#define CALLING_CONVENTION_RuntimeCC0 CALLING_CONVENTION_c\n+#define CALLING_CONVENTION_RuntimeCC0_IMPL CALLING_CONVENTION_c\n+#define LLVM_CC_RuntimeCC0 llvm::CallingConv::C\n+\n+\/\/ If defined, it indicates that runtime function wrappers\n+\/\/ should be used on all platforms, even they do not support\n+\/\/ the new calling convention which requires this.\n+#define RT_USE_WRAPPERS_ALWAYS 1\n+\n+\/\/ If defined, it indicates that this calling convention is\n+\/\/ supported by the currnet target.\n+\/\/ TODO: Define it once the runtime calling convention support has\n+\/\/ been integrated into clang and llvm.\n+\/\/#define RT_USE_RuntimeCC1\n+\n+\/\/ RuntimeCC1 is a dedicated runtime calling convention to be used\n+\/\/ when calling the most popular runtime functions.\n+#if defined(RT_USE_RuntimeCC1) && __has_attribute(preserve_most) && \\\n+ (defined(__aarch64__) || defined(__x86_64__))\n+\n+\/\/ Targets supporting the dedicated runtime convention should use it.\n+\/\/ If a runtime function is using this calling convention, it can\n+\/\/ be invoked only by means of a wrapper, which performs an indirect\n+\/\/ call. Wrappers are generated by the IRGen and added to object files.\n+\/\/ As a result, runtime functions are invoked only indirectly from\n+\/\/ the user code.\n+\/\/ This is a workaround for dynamic linking issues, where a dynamic\n+\/\/ linker may clobber some of the callee-saved registers defined by\n+\/\/ this new calling convention when it performs lazy binding of\n+\/\/ runtime functions using this new calling convention.\n+#define CALLING_CONVENTION_RuntimeCC1 CALLING_CONVENTION_preserve_most\n+#define CALLING_CONVENTION_RuntimeCC1_IMPL CALLING_CONVENTION_preserve_most\n+#define LLVM_CC_RuntimeCC1 llvm::CallingConv::PreserveMost\n+\n+\/\/ Indicate that wrappers should be used, because it is required\n+\/\/ for the calling convention to get around dynamic linking issues.\n+#define RT_USE_WRAPPERS 1\n+\n+#else\n+\n+\/\/ Targets not supporting the dedicated runtime calling convention\n+\/\/ should use the standard calling convention instead.\n+\/\/ No wrappers are required in this case by the calling convention.\n+#define CALLING_CONVENTION_RuntimeCC1 CALLING_CONVENTION_c\n+#define CALLING_CONVENTION_RuntimeCC1_IMPL CALLING_CONVENTION_c\n+#define LLVM_CC_RuntimeCC1 llvm::CallingConv::C\n+\n+#endif\n+\n+\/\/ Bring in visibility attribute macros for library visibility.\n+#include \"llvm\/Support\/Compiler.h\"\n+\n+\/\/ Generates a name of the runtime enrty's implementation by\n+\/\/ adding an underscore as a prefix and a suffix.\n+#define RT_ENTRY_IMPL(Name) _##Name##_\n+\n+\/\/ Library internal way to invoke the implementation of a runtime entry.\n+\/\/ E.g. a runtime function may be called internally via its public API\n+\/\/ or via the function pointer.\n+#define RT_ENTRY_CALL(Name) Name\n+\n+\/\/ Name of the symbol holding a reference to the\n+\/\/ implementation of a runtime entry.\n+#define RT_ENTRY_REF(Name) _##Name\n+\n+\/\/ String representation of the symbol's name.\n+#define RT_ENTRY_REF_AS_STR(Name) \"_\" #Name\n+\n+#if defined(RT_USE_WRAPPERS_ALWAYS)\n+#define RT_USE_WRAPPERS\n+#endif\n+\n+#if defined(RT_USE_WRAPPERS)\n+\n+\/\/ Both the runtime functions and their implementation are hidden and\n+\/\/ can be directly referenced only inside the runtime library.\n+\/\/ User code can access these runtime entries only indirectly\n+\/\/ via a global function pointer.\n+#define RT_ENTRY_VISIBILITY LLVM_LIBRARY_VISIBILITY\n+#define RT_ENTRY_IMPL_VISIBILITY LLVM_LIBRARY_VISIBILITY\n+\n+#else\n+\n+\/\/ Runtime functions are exported, because it should be possible\n+\/\/ to invoke them directly from the user code. But internal\n+\/\/ implementations of runtime functions do not need to be exported.\n+#define RT_ENTRY_VISIBILITY SWIFT_RUNTIME_EXPORT\n+#define RT_ENTRY_IMPL_VISIBILITY LLVM_LIBRARY_VISIBILITY\n+\n+#endif\n+\n #endif \/\/ SWIFT_RUNTIME_CONFIG_H\n"} {"commit":"d136b5c619e732d21ecb9d716ba51112adec69d6","subject":"It links","message":"It links\n","repos":"yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi,yuanming-hu\/taichi","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/taichi\/common\/config.h\n+++ include\/taichi\/common\/config.h\n@@ -45,9 +45,6 @@\n file_names.clear();\n }\n \n- template <typename T>\n- T get(std::string key) const;\n-\n void print_all() const {\n std::cout << \"Configures: \" << std::endl;\n for (auto key = data.begin(); key != data.end(); key++) {\n@@ -79,68 +76,63 @@\n return unsigned(std::atoll(get_string(key).c_str()));\n }\n \n- template <typename V, int N = V::D, typename T=typename V::ScalarType, int ISE=V::ise>\n- VectorND<N, T, ISE> get(std::string key) const {\n- std::string str = this->get_string(key);\n- std::string temp = \"(\";\n- for (int i = 0; i < N; i++) {\n- std::string placeholder;\n- if (std::is_same<T, float32>()) {\n- placeholder = \"%f\";\n- } else if (std::is_same<T, float64>()) {\n- placeholder = \"%lf\";\n- } else if (std::is_same<T, int32>()) {\n- placeholder = \"%d\";\n- } else if (std::is_same<T, uint32>()) {\n- placeholder = \"%u\";\n- } else if (std::is_same<T, int64>()) {\n-#ifdef WIN32\n- placeholder = \"%I64d\";\n-#else\n- placeholder = \"%lld\";\n-#endif\n- } else if (std::is_same<T, uint64>()) {\n-#ifdef WIN32\n- placeholder = \"%I64u\";\n-#else\n- placeholder = \"%llu\";\n-#endif\n- } else {\n- assert(false);\n+ template <typename T>\n+ T get(std::string key) const {NOT_IMPLEMENTED}\n+ \/*\n+ template <typename V, int N = V::D, typename T=typename V::ScalarType, int\n+ ISE=V::ise>\n+ VectorND<N, T, ISE> get(std::string key) const {\n+ std::string str = this->get_string(key);\n+ std::string temp = \"(\";\n+ for (int i = 0; i < N; i++) {\n+ std::string placeholder;\n+ if (std::is_same<T, float32>()) {\n+ placeholder = \"%f\";\n+ } else if (std::is_same<T, float64>()) {\n+ placeholder = \"%lf\";\n+ } else if (std::is_same<T, int32>()) {\n+ placeholder = \"%d\";\n+ } else if (std::is_same<T, uint32>()) {\n+ placeholder = \"%u\";\n+ } else if (std::is_same<T, int64>()) {\n+ #ifdef WIN32\n+ placeholder = \"%I64d\";\n+ #else\n+ placeholder = \"%lld\";\n+ #endif\n+ } else if (std::is_same<T, uint64>()) {\n+ #ifdef WIN32\n+ placeholder = \"%I64u\";\n+ #else\n+ placeholder = \"%llu\";\n+ #endif\n+ } else {\n+ assert(false);\n+ }\n+ temp += placeholder;\n+ if (i != N - 1) {\n+ temp += \",\";\n+ }\n }\n- temp += placeholder;\n- if (i != N - 1) {\n- temp += \",\";\n+ temp += \")\";\n+ VectorND<N, T> ret;\n+ if (N == 1) {\n+ sscanf(str.c_str(), temp.c_str(), &ret[0]);\n+ } else if (N == 2) {\n+ sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1]);\n+ }else if (N == 3) {\n+ sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1], &ret[2]);\n+ }else if (N == 4) {\n+ sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1], &ret[2], &ret[3]);\n }\n- }\n- temp += \")\";\n- VectorND<N, T> ret;\n- if (N == 1) {\n- sscanf(str.c_str(), temp.c_str(), &ret[0]);\n- } else if (N == 2) {\n- sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1]);\n- }else if (N == 3) {\n- sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1], &ret[2]);\n- }else if (N == 4) {\n- sscanf(str.c_str(), temp.c_str(), &ret[0], &ret[1], &ret[2], &ret[3]);\n- }\n- return ret;\n- }\n-\n- std::string get(std::string key, const char *default_val) const {\n- if (data.find(key) == data.end()) {\n- return default_val;\n- } else\n- return get<std::string>(key);\n- }\n-\n- template <typename T>\n- T get(std::string key, const T &default_val) const {\n- if (data.find(key) == data.end()) {\n- return default_val;\n- } else\n- return get<T>(key);\n- }\n+ return ret;\n+ }\n+ *\/\n+\n+ std::string get(std::string key, const char *default_val) const;\n+\n+ template <typename T>\n+ T get(std::string key, const T &default_val) const;\n \n bool has_key(std::string key) const { return data.find(key) != data.end(); }\n \n@@ -269,4 +261,24 @@\n }\n };\n \n+template <>\n+inline std::string Config::get<std::string>(std::string key) const {\n+ return get_string(key);\n+}\n+\n+template <typename T>\n+inline T Config::get(std::string key, const T &default_val) const {\n+ if (data.find(key) == data.end()) {\n+ return default_val;\n+ } else\n+ return get<T>(key);\n+}\n+\n+inline std::string Config::get(std::string key, const char *default_val) const {\n+ if (data.find(key) == data.end()) {\n+ return default_val;\n+ } else\n+ return get<std::string>(key);\n+}\n+\n TC_NAMESPACE_END\n"} {"commit":"afb8d8e2b3b9988bcc6cfb50f3efb0f0ba30ae75","subject":"Disambiguate","message":"Disambiguate\n","repos":"szellmann\/visionaray,szellmann\/visionaray","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/visionaray\/get_color.h\n+++ include\/visionaray\/get_color.h\n@@ -46,7 +46,12 @@\n \/\/ Get triangle vertex color from array\n \/\/\n \n-template <typename Colors, typename HR, typename T>\n+template <\n+ typename Colors,\n+ typename HR,\n+ typename T,\n+ typename = typename std::enable_if<!simd::is_simd_vector<typename HR::scalar_type>::value>::type\n+ >\n VSNRAY_FUNC\n inline auto get_color(\n Colors colors,\n"} {"commit":"7cca13eb5ccdc37b9c2189e468a18feccfe1492c","subject":"property can now convert to some eigen structures","message":"property can now convert to some eigen structures\n","repos":"votca\/tools,votca\/tools,votca\/tools,votca\/tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/votca\/tools\/property.h\n+++ include\/votca\/tools\/property.h\n@@ -312,6 +312,32 @@\n return vec(tmp[0], tmp[1], tmp[2]);\n }\n \n+template <>\n+inline Eigen::VectorXd Property::as< Eigen::VectorXd >() const {\n+ std::vector<double> tmp;\n+ Tokenizer tok(as<std::string > (), \" ,\");\n+ tok.ConvertToVector<double>(tmp);\n+ Eigen::VectorXd result;\n+ result.resize(tmp.size());\n+ for(int i=0;i<result.size();i++){\n+ result(i)=tmp[i];\n+ }\n+ return result;\n+}\n+\n+template <>\n+inline Eigen::Vector3d Property::as<Eigen::Vector3d>() const {\n+ std::vector<double> tmp;\n+ Tokenizer tok(as<std::string > (), \" ,\");\n+ tok.ConvertToVector<double>(tmp);\n+ Eigen::Vector3d result;\n+ if(int(tmp.size())!=result.size()){\n+ throw std::runtime_error(\"Vector has \" + boost::lexical_cast<std::string > (tmp.size()) + \" instead of three entries\");\n+ }\n+ result<<tmp[0],tmp[1],tmp[2];\n+ return result;\n+}\n+\n template<>\n inline std::vector<unsigned int> Property::as<std::vector <unsigned int> >() const {\n std::vector<unsigned int> tmp;\n"} {"commit":"8bb3689d42089241b209ccea2860f03aeaddd8f8","subject":"crossystem: Add support for multiple gpiochip entries","message":"crossystem: Add support for multiple gpiochip entries\n\nThe current logic for finding a GPIO expects only one gpiochip\nentry to exist in \/sys\/class\/gpio. With Samus there is a second\nentry because the codec also exports a set of GPIOs.\n\nTo solve this we can use the gpiochip#\/label file and compare\nagainst the GPIO controller name described in ACPI.\n\nThis adds support for that detection method, as well as a new\nGPIO controller entry for INT3437:00 which is used in Broadwell\nsystems.\n\nBUG=chrome-os-partner:33098\nBRANCH=samus\nTEST=crossytem wpsw_cur works on samus (TOT with enabled codec)\n\nChange-Id: Ib06f25c7c7e1451a3ab3bb00fd063e23b4d75878\nSigned-off-by: Duncan Laurie <70662b43bc1a20b57ded72a2b08be88dd0da4841@chromium.org>\nReviewed-on: https:\/\/chromium-review.googlesource.com\/224156\nReviewed-by: Bill Richardson <129945214b1d548d8e49b6c29c43094f8c78057f@chromium.org>\n","repos":"acorn-marvell\/vboot_reference,geekboxzone\/mmallow_external_vboot_reference,coreboot\/vboot,coreboot\/vboot,geekboxzone\/mmallow_external_vboot_reference,geekboxzone\/mmallow_external_vboot_reference,acorn-marvell\/vboot_reference,geekboxzone\/mmallow_external_vboot_reference,acorn-marvell\/vboot_reference,coreboot\/vboot,coreboot\/vboot,coreboot\/vboot,acorn-marvell\/vboot_reference,geekboxzone\/mmallow_external_vboot_reference","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- host\/arch\/x86\/lib\/crossystem_arch.c\n+++ host\/arch\/x86\/lib\/crossystem_arch.c\n@@ -505,7 +505,8 @@\n * we look for a directory named \/sys\/class\/gpio\/gpiochip<O>\/. If there's not\n * exactly one match for that, we're SOL.\n *\/\n-static int FindGpioChipOffset(unsigned *gpio_num, unsigned *offset) {\n+static int FindGpioChipOffset(unsigned *gpio_num, unsigned *offset,\n+ const char *name) {\n DIR *dir;\n struct dirent *ent;\n int match = 0;\n@@ -518,6 +519,43 @@\n while(0 != (ent = readdir(dir))) {\n if (1 == sscanf(ent->d_name, \"gpiochip%u\", offset)) {\n match++;\n+ }\n+ }\n+\n+ closedir(dir);\n+ return (1 == match);\n+}\n+\n+\/* Physical GPIO number <N> may be accessed through \/sys\/class\/gpio\/gpio<M>\/,\n+ * but <N> and <M> may differ by some offset <O>. To determine that constant,\n+ * we look for a directory named \/sys\/class\/gpio\/gpiochip<O>\/ and check for\n+ * a 'label' file inside of it to find the expected the controller name.\n+ *\/\n+static int FindGpioChipOffsetByLabel(unsigned *gpio_num, unsigned *offset,\n+ const char *name) {\n+ DIR *dir;\n+ struct dirent *ent;\n+ char filename[128];\n+ char chiplabel[128];\n+ int match = 0;\n+\n+ dir = opendir(GPIO_BASE_PATH);\n+ if (!dir) {\n+ return 0;\n+ }\n+\n+ while(0 != (ent = readdir(dir))) {\n+ if (1 == sscanf(ent->d_name, \"gpiochip%u\", offset)) {\n+ \/*\n+ * Read the file at gpiochip<O>\/label to get the identifier\n+ * for this bank of GPIOs.\n+ *\/\n+ snprintf(filename, sizeof(filename), \"%s\/gpiochip%u\/label\",\n+ GPIO_BASE_PATH, *offset);\n+ if (ReadFileString(chiplabel, sizeof(chiplabel), filename)) {\n+ if (!strncasecmp(chiplabel, name, strlen(name)))\n+ match++;\n+ }\n }\n }\n \n@@ -535,7 +573,8 @@\n * 2 | 0x1000\n * 3 | 0x2000\n *\/\n-static int BayTrailFindGpioChipOffset(unsigned *gpio_num, unsigned *offset) {\n+static int BayTrailFindGpioChipOffset(unsigned *gpio_num, unsigned *offset,\n+ const char *name) {\n DIR *dir;\n struct dirent *ent;\n unsigned expected_uid;\n@@ -584,7 +623,8 @@\n \n struct GpioChipset {\n const char *name;\n- int (*ChipOffsetAndGpioNumber)(unsigned *gpio_num, unsigned *chip_offset);\n+ int (*ChipOffsetAndGpioNumber)(unsigned *gpio_num, unsigned *chip_offset,\n+ const char *name);\n };\n \n static const struct GpioChipset chipsets_supported[] = {\n@@ -593,6 +633,7 @@\n { \"PantherPoint\", FindGpioChipOffset },\n { \"LynxPoint\", FindGpioChipOffset },\n { \"PCH-LP\", FindGpioChipOffset },\n+ { \"INT3437:00\", FindGpioChipOffsetByLabel },\n { \"BayTrail\", BayTrailFindGpioChipOffset },\n { NULL },\n };\n@@ -651,7 +692,8 @@\n return -1;\n \n \/* Modify GPIO number by driver's offset *\/\n- if (!chipset->ChipOffsetAndGpioNumber(&controller_num, &controller_offset))\n+ if (!chipset->ChipOffsetAndGpioNumber(&controller_num, &controller_offset,\n+ chipset->name))\n return -1;\n controller_offset += controller_num;\n \n"} {"commit":"52f2b97308bc7dd5cc8293297b7588b6658218f8","subject":"Cycles: Remove dead branch for Distant lamps, ls->t is always FLT_MAX here.","message":"Cycles: Remove dead branch for Distant lamps, ls->t is always FLT_MAX here.\n","repos":"pyrochlore\/cycles,tangent-opensource\/coreBlackbird,tangent-opensource\/coreBlackbird,pyrochlore\/cycles,tangent-opensource\/coreBlackbird,pyrochlore\/cycles","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/kernel_light.h\n+++ kernel\/kernel_light.h\n@@ -488,9 +488,6 @@\n \t\t\/* compute pdf *\/\n \t\tfloat invarea = data1.w;\n \t\tls->pdf = invarea\/(costheta*costheta*costheta);\n-\t\tif(ls->t != FLT_MAX)\n-\t\t\tls->pdf *= lamp_light_pdf(kg, ls->Ng, -ls->D, ls->t);\n-\n \t\tls->eval_fac = ls->pdf;\n \t}\n \telse if(type == LIGHT_POINT || type == LIGHT_SPOT) {\n"} {"commit":"235930982aeb4450597a44fedc5611211433fae4","subject":"OSX: disable kernels in cycles gpu again, would only work in 10.8 afaik","message":"OSX: disable kernels in cycles gpu again, would only work in 10.8 afaik\n","repos":"pyrochlore\/cycles,pyrochlore\/cycles,tangent-opensource\/coreBlackbird,tangent-opensource\/coreBlackbird,pyrochlore\/cycles,tangent-opensource\/coreBlackbird","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/kernel_types.h\n+++ kernel\/kernel_types.h\n@@ -61,12 +61,12 @@\n #endif\n \n #ifdef __KERNEL_OPENCL_APPLE__\n-#define __SVM__\n-#define __EMISSION__\n-#define __IMAGE_TEXTURES__\n-#define __HOLDOUT__\n-#define __PROCEDURAL_TEXTURES__\n-#define __EXTRA_NODES__\n+\/\/#define __SVM__\n+\/\/#define __EMISSION__\n+\/\/#define __IMAGE_TEXTURES__\n+\/\/#define __HOLDOUT__\n+\/\/#define __PROCEDURAL_TEXTURES__\n+\/\/#define __EXTRA_NODES__\n #endif\n \n #ifdef __KERNEL_OPENCL_AMD__\n"} {"commit":"e922df50694959fb4872882b148dd69c407f6ec4","subject":"kernel: Allow k_thread_abort(_current) from ISRs","message":"kernel: Allow k_thread_abort(_current) from ISRs\n\nTraditionally k_thread_abort() of the current thread has done a\nsynchronous _Swap() to the new context. Doing this from an ISR has\nnever worked portably (some architectures can do it, some can't) for\nthis reason.\n\nBut on Xtensa\/asm2, exception handlers now run in interrupt context\nand it's a very reasonable requirement for them to abort the excepting\nthread.\n\nSo simply don't swap, but do the rest of the bookeeping, returning to\nthe calling context. As a side effect it's now possible to terminate\nthreads from interrupts, even if they have been interrupted.\n\nSigned-off-by: Andy Ross <c70f9a6bf6ee0cd69c8af4ce5e6b131945769315@intel.com>\n","repos":"GiulianoFranchetto\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,punitvara\/zephyr,galak\/zephyr,zephyriot\/zephyr,mbolivar\/zephyr,nashif\/zephyr,nashif\/zephyr,ldts\/zephyr,zephyriot\/zephyr,zephyriot\/zephyr,GiulianoFranchetto\/zephyr,mbolivar\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,galak\/zephyr,galak\/zephyr,mbolivar\/zephyr,nashif\/zephyr,explora26\/zephyr,ldts\/zephyr,explora26\/zephyr,punitvara\/zephyr,ldts\/zephyr,zephyriot\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,mbolivar\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,galak\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,zephyriot\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,kraj\/zephyr,nashif\/zephyr,finikorg\/zephyr,punitvara\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,punitvara\/zephyr,explora26\/zephyr,punitvara\/zephyr,explora26\/zephyr,Vudentz\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,Vudentz\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/thread_abort.c\n+++ kernel\/thread_abort.c\n@@ -37,13 +37,17 @@\n \t_k_thread_single_abort(thread);\n \t_thread_monitor_exit(thread);\n \n-\tif (_current == thread) {\n-\t\t_Swap(key);\n-\t\tCODE_UNREACHABLE;\n+\tif (_is_in_isr()) {\n+\t\tirq_unlock(key);\n+\t} else {\n+\t\tif (_current == thread) {\n+\t\t\t_Swap(key);\n+\t\t\tCODE_UNREACHABLE;\n+\t\t}\n+\n+\t\t\/* The abort handler might have altered the ready queue. *\/\n+\t\t_reschedule_threads(key);\n \t}\n-\n-\t\/* The abort handler might have altered the ready queue. *\/\n-\t_reschedule_threads(key);\n }\n #endif\n \n"} {"commit":"0f6ce3de4ef6ff940308087c49760d068851c1a7","subject":"ftrace: do not profile functions when disabled","message":"ftrace: do not profile functions when disabled\n\nA race was found that if one were to enable and disable the function\nprofiler repeatedly, then the system can panic. This was because a profiled\nfunction may be preempted just before disabling interrupts. While\nthe profiler is disabled and then reenabled, the preempted function\ncould start again, and access the hash as it is being initialized.\n\nThis just adds a check in the irq disabled part to check if the profiler\nis enabled, and if it is not then it will just exit.\n\nWhen the system is disabled, the profile_enabled variable is cleared\nbefore calling the unregistering of the function profiler. This\nunregistering calls stop machine which also acts as a synchronize schedule.\n\n[ Impact: fix panic in enabling\/disabling function profiler ]\n\nSigned-off-by: Steven Rostedt <43232e92d70cc7aa53504ad0397085ee47bad87f@goodmis.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/trace\/ftrace.c\n+++ kernel\/trace\/ftrace.c\n@@ -599,7 +599,7 @@\n \tlocal_irq_save(flags);\n \n \tstat = &__get_cpu_var(ftrace_profile_stats);\n-\tif (!stat->hash)\n+\tif (!stat->hash || !ftrace_profile_enabled)\n \t\tgoto out;\n \n \trec = ftrace_find_profiled_func(stat, ip);\n@@ -630,7 +630,7 @@\n \n \tlocal_irq_save(flags);\n \tstat = &__get_cpu_var(ftrace_profile_stats);\n-\tif (!stat->hash)\n+\tif (!stat->hash || !ftrace_profile_enabled)\n \t\tgoto out;\n \n \tcalltime = trace->rettime - trace->calltime;\n@@ -724,6 +724,10 @@\n \t\t\tftrace_profile_enabled = 1;\n \t\t} else {\n \t\t\tftrace_profile_enabled = 0;\n+\t\t\t\/*\n+\t\t\t * unregister_ftrace_profiler calls stop_machine\n+\t\t\t * so this acts like an synchronize_sched.\n+\t\t\t *\/\n \t\t\tunregister_ftrace_profiler();\n \t\t}\n \t}\n"} {"commit":"521304fbfa68220b916b9e0cfe1c534fee3145d5","subject":"Pos detection","message":"Pos detection\n","repos":"swank-rats\/image-processing","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- image-processing\/ThomasTestMethod.h\n+++ image-processing\/ThomasTestMethod.h\n@@ -133,6 +133,21 @@\n \treturn allowedRectanglesContourPositions;\r\n \r\n \r\n+}\r\n+\r\n+static void setLabel2(cv::Mat& im, const std::string label, std::vector<cv::Point>& contour)\r\n+{\r\n+\tint fontface = cv::FONT_HERSHEY_SIMPLEX;\r\n+\tdouble scale = 0.4;\r\n+\tint thickness = 1;\r\n+\tint baseline = 0;\r\n+\r\n+\tcv::Size text = cv::getTextSize(label, fontface, scale, thickness, &baseline);\r\n+\tcv::Rect r = cv::boundingRect(contour);\r\n+\r\n+\tcv::Point pt(r.x + ((r.width - text.width) \/ 2), r.y + ((r.height + text.height) \/ 2));\r\n+\tcv::rectangle(im, pt + cv::Point(0, baseline), pt + cv::Point(text.width, -text.height), CV_RGB(0, 0, 0), CV_FILLED);\r\n+\tcv::putText(im, label, pt, fontface, scale, CV_RGB(255, 255, 255), thickness, 8);\r\n }\r\n \r\n \/**\r\n@@ -160,6 +175,11 @@\n \t\/\/\/ Show in a window\r\n \tnamedWindow(\"Contours\", WINDOW_AUTOSIZE);\r\n \timshow(\"Contours\", drawing);\r\n+}\r\n+\r\n+static void calcPosition()\r\n+{\r\n+\r\n }\r\n \r\n \/**\r\n@@ -214,7 +234,6 @@\n \t\t\/\/ Rectangles\r\n \t\tif (approx.size() == 4)\r\n \t\t{\r\n-\r\n \t\t\trectangles.push_back(contours[i]);\r\n \t\t\trectanglesContourPositions.push_back(i);\r\n \t\t}\r\n@@ -246,6 +265,28 @@\n \r\n \t\t\t\tScalar color = Scalar(rngdetect2.uniform(0, 255), rngdetect2.uniform(0, 255), rngdetect2.uniform(0, 255));\r\n \t\t\t\tdrawContours(drawing, contours, (int)i, color, 2, 8, hierarchy, 0, Point());\r\n+\r\n+\t\t\t\tcv::Moments mom;\r\n+\r\n+\t\t\t\tmom = cv::moments(cv::Mat(contours[i]));\r\n+\r\n+\t\t\t\tcv::Point point = Point(mom.m10 \/ mom.m00, mom.m01 \/ mom.m00);\r\n+\t\t\t\t\/\/ draw mass center\r\n+\t\t\t\tcv::circle(drawing,point\r\n+\t\t\t\t\t\/\/ position of mass center converted to integer\r\n+\t\t\t\t\t,\r\n+\t\t\t\t\t2, cv::Scalar(255, 255, 255), 2);\/\/ draw white dot\r\n+\r\n+\t\t\t\t\r\n+\r\n+\t\t\t\tstring xAsString = static_cast<ostringstream*>(&(ostringstream() << point.x))->str();\r\n+\t\t\t\tstring yAsString = static_cast<ostringstream*>(&(ostringstream() << point.y))->str();\r\n+\r\n+\t\t\t\tstd::string zeichenkette= \"x: \" + xAsString + \"y: \" + yAsString;\r\n+\r\n+\t\t\t\tsetLabel2(drawing, zeichenkette, contours[i]);\r\n+\t\t\t\r\n+\t\t\t\t\r\n \t\t\t}\r\n \t\t}\r\n \r\n"} {"commit":"893f7c1108452a0943bd52d65402e758bf032dcf","subject":"CID-358","message":"CID-358\n\nChecker: UNINIT_CTOR\nFunction: LLTextureCache::Entry::Entry()\nFile: \/indra\/newview\/lltexturecache.h\n","repos":"gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm,gabeharms\/firestorm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- indra\/newview\/lltexturecache.h\n+++ indra\/newview\/lltexturecache.h\n@@ -59,7 +59,12 @@\n \t};\n \tstruct Entry\n \t{\n-\t\tEntry() {}\n+ \tEntry() :\n+\t\t mBodySize(0),\n+\t\t\tmImageSize(0),\n+\t\t\tmTime(0)\n+\t\t{\n+\t\t}\n \t\tEntry(const LLUUID& id, S32 imagesize, S32 bodysize, U32 time) :\n \t\t\tmID(id), mImageSize(imagesize), mBodySize(bodysize), mTime(time) {}\n \t\tvoid init(const LLUUID& id, U32 time) { mID = id, mImageSize = 0; mBodySize = 0; mTime = time; }\n"} {"commit":"be20afde81d652124e87b9e20b1b01d72ec65668","subject":"ENH:Minor documentation change","message":"ENH:Minor documentation change\n","repos":"msmolens\/VTK,spthaolt\/VTK,sumedhasingla\/VTK,mspark93\/VTK,ashray\/VTK-EVM,Wuteyan\/VTK,sumedhasingla\/VTK,biddisco\/VTK,Wuteyan\/VTK,candy7393\/VTK,sankhesh\/VTK,SimVascular\/VTK,msmolens\/VTK,collects\/VTK,arnaudgelas\/VTK,sankhesh\/VTK,mspark93\/VTK,candy7393\/VTK,candy7393\/VTK,berendkleinhaneveld\/VTK,sumedhasingla\/VTK,berendkleinhaneveld\/VTK,ashray\/VTK-EVM,cjh1\/VTK,arnaudgelas\/VTK,msmolens\/VTK,hendradarwin\/VTK,demarle\/VTK,spthaolt\/VTK,SimVascular\/VTK,sankhesh\/VTK,demarle\/VTK,naucoin\/VTKSlicerWidgets,cjh1\/VTK,jmerkow\/VTK,keithroe\/vtkoptix,aashish24\/VTK-old,Wuteyan\/VTK,hendradarwin\/VTK,keithroe\/vtkoptix,johnkit\/vtk-dev,naucoin\/VTKSlicerWidgets,naucoin\/VTKSlicerWidgets,spthaolt\/VTK,candy7393\/VTK,candy7393\/VTK,naucoin\/VTKSlicerWidgets,mspark93\/VTK,biddisco\/VTK,candy7393\/VTK,demarle\/VTK,jmerkow\/VTK,keithroe\/vtkoptix,sankhesh\/VTK,ashray\/VTK-EVM,sgh\/vtk,msmolens\/VTK,sankhesh\/VTK,jmerkow\/VTK,cjh1\/VTK,demarle\/VTK,candy7393\/VTK,arnaudgelas\/VTK,cjh1\/VTK,SimVascular\/VTK,Wuteyan\/VTK,mspark93\/VTK,jmerkow\/VTK,aashish24\/VTK-old,daviddoria\/PointGraphsPhase1,aashish24\/VTK-old,ashray\/VTK-EVM,berendkleinhaneveld\/VTK,sgh\/vtk,sgh\/vtk,arnaudgelas\/VTK,aashish24\/VTK-old,arnaudgelas\/VTK,spthaolt\/VTK,collects\/VTK,jeffbaumes\/jeffbaumes-vtk,SimVascular\/VTK,gram526\/VTK,sumedhasingla\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,jeffbaumes\/jeffbaumes-vtk,hendradarwin\/VTK,daviddoria\/PointGraphsPhase1,Wuteyan\/VTK,jmerkow\/VTK,jmerkow\/VTK,cjh1\/VTK,naucoin\/VTKSlicerWidgets,msmolens\/VTK,hendradarwin\/VTK,spthaolt\/VTK,jmerkow\/VTK,sumedhasingla\/VTK,berendkleinhaneveld\/VTK,SimVascular\/VTK,jeffbaumes\/jeffbaumes-vtk,johnkit\/vtk-dev,candy7393\/VTK,gram526\/VTK,gram526\/VTK,jeffbaumes\/jeffbaumes-vtk,sankhesh\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,sankhesh\/VTK,biddisco\/VTK,arnaudgelas\/VTK,SimVascular\/VTK,biddisco\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,daviddoria\/PointGraphsPhase1,sumedhasingla\/VTK,daviddoria\/PointGraphsPhase1,biddisco\/VTK,mspark93\/VTK,jmerkow\/VTK,sumedhasingla\/VTK,demarle\/VTK,gram526\/VTK,SimVascular\/VTK,keithroe\/vtkoptix,gram526\/VTK,aashish24\/VTK-old,naucoin\/VTKSlicerWidgets,sgh\/vtk,keithroe\/vtkoptix,biddisco\/VTK,ashray\/VTK-EVM,demarle\/VTK,johnkit\/vtk-dev,berendkleinhaneveld\/VTK,demarle\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,ashray\/VTK-EVM,johnkit\/vtk-dev,biddisco\/VTK,hendradarwin\/VTK,Wuteyan\/VTK,jeffbaumes\/jeffbaumes-vtk,berendkleinhaneveld\/VTK,mspark93\/VTK,sgh\/vtk,gram526\/VTK,msmolens\/VTK,Wuteyan\/VTK,mspark93\/VTK,collects\/VTK,berendkleinhaneveld\/VTK,msmolens\/VTK,collects\/VTK,hendradarwin\/VTK,keithroe\/vtkoptix,cjh1\/VTK,gram526\/VTK,hendradarwin\/VTK,demarle\/VTK,johnkit\/vtk-dev,keithroe\/vtkoptix,sankhesh\/VTK,spthaolt\/VTK,msmolens\/VTK,collects\/VTK,mspark93\/VTK,sgh\/vtk,jeffbaumes\/jeffbaumes-vtk,collects\/VTK,SimVascular\/VTK,sumedhasingla\/VTK,ashray\/VTK-EVM,aashish24\/VTK-old","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- imaging\/vtkImageExtractComponents.h\n+++ imaging\/vtkImageExtractComponents.h\n@@ -68,7 +68,8 @@\n vtkGetVector3Macro(Components,int);\n \n \/\/ Description:\n- \/\/ Get the number of componets. This is set implicitly by the SetComponents method.\n+ \/\/ Get the number of components to extract. This is set implicitly by the \n+ \/\/ SetComponents() method.\n vtkGetMacro(NumberOfComponents,int);\n \n protected:\n"} {"commit":"faae1fec97fc6df047b593e50655a40cc01fc59e","subject":"Update normal_dist_random.c","message":"Update normal_dist_random.c\n\nCorrectly get the middle number of a range.","repos":"NoahDragon\/normal_dist_random","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/normal_dist_random.c\n+++ c\/normal_dist_random.c\n@@ -43,12 +43,16 @@\n return prev_num - 0.5;\n }\n \n+float range_mid(int start, int end){\n+ return (float)(abs(start+end))\/2.0;\n+}\n+\n \/*\n Parameter: range from the #start# to the #end#\n- TODO: check start end, shouldn't be equal\n+ TODO: --check start end, shouldn't be equal-- should be checked outside of this function\n *\/\n int nor_rand(int start, int end){\n- float pile = (float)abs(start-end)\/2.0+0.5;\n+ float pile = range_mid(start, end);\n int curr_layer = abs(start-end);\n while(curr_layer>0){\n pile = next_layer(pile);\n@@ -67,7 +71,7 @@\n \t\n srand(time(NULL));\n for(i=0;i<10000;i++){\n- count[nor_rand(1,10)]++;\n+ count[nor_rand(1,10)-1]++;\n }\n \n for(i=0;i<10;i++){\n"} {"commit":"4056cefe35a00c913330cf22fa4b0d9ab47e23e3","subject":"camel_settings_load_from_url(): Forgot to handle \"auth-mechanism\".","message":"camel_settings_load_from_url(): Forgot to handle \"auth-mechanism\".\n","repos":"Distrotech\/evolution-data-server,tintou\/evolution-data-server,matzipan\/evolution-data-server,matzipan\/evolution-data-server,matzipan\/evolution-data-server,Distrotech\/evolution-data-server,gcampax\/evolution-data-server,gcampax\/evolution-data-server,gcampax\/evolution-data-server,tintou\/evolution-data-server,matzipan\/evolution-data-server,matzipan\/evolution-data-server,Distrotech\/evolution-data-server,Distrotech\/evolution-data-server,Distrotech\/evolution-data-server,gcampax\/evolution-data-server,tintou\/evolution-data-server,tintou\/evolution-data-server","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camel\/camel-settings.c\n+++ camel\/camel-settings.c\n@@ -260,6 +260,7 @@\n \tif (CAMEL_IS_NETWORK_SETTINGS (settings))\n \t\tg_object_set (\n \t\t\tsettings,\n+\t\t\t\"auth-mechanism\", url->authmech,\n \t\t\t\"host\", url->host,\n \t\t\t\"port\", url->port,\n \t\t\t\"user\", url->user,\n"} {"commit":"c185d448b702ce9d0eb4877deafe0047074a71d6","subject":" Model Emprex PCD3800 added. Credits to Hisham Muhammad <hisham@apple2.com>","message":" Model Emprex PCD3800 added. Credits to\n Hisham Muhammad <hisham@apple2.com>\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@7204 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/mars\/library.c\n+++ camlibs\/mars\/library.c\n@@ -60,7 +60,8 @@\n \tunsigned short idProduct;\n } models[] = {\n {\"Aiptek PenCam VGA+\", GP_DRIVER_STATUS_EXPERIMENTAL, 0x08ca, 0x0111},\n-\t{NULL,0,0}\n+ {\"Emprex PCD3800\", GP_DRIVER_STATUS_EXPERIMENTAL, 0x093a, 0x010f},\n+ \t{NULL,0,0}\n };\n \n int\n"} {"commit":"dac8272132b83cf3b1e94ad5e8ce2e1981436ffc","subject":"moved a7 4 to correct order","message":"moved a7 4 to correct order\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -1303,10 +1303,6 @@\n \t{\"Sony:Alpha-A7r III (PC Control)\",\t0x054c, 0x0c33, PTP_CAP|PTP_CAP_PREVIEW}, \/* FIXME: crosscheck *\/\n \t{\"Sony:Alpha-A7 III (PC Control)\",\t0x054c, 0x0c34, PTP_CAP|PTP_CAP_PREVIEW}, \/* FIXME: crosscheck *\/\n \n-\t\/* https:\/\/github.com\/gphoto\/libgphoto2\/pull\/782 *\/\n-\t{\"Sony:Alpha-A7 IV (MTP mode)\",\t\t0x054c, 0x0da6, 0},\n-\t{\"Sony:Alpha-A7 IV (PC Control)\",\t0x054c, 0x0da7, PTP_CAP|PTP_CAP_PREVIEW},\n-\n \t\/* jackden@gmail.com *\/\n \t{\"Sony:DSC-RX100M6 (PC Control)\", \t0x054c, 0x0c38, PTP_CAP|PTP_CAP_PREVIEW},\n \n@@ -1344,6 +1340,10 @@\n \n \t\/* https:\/\/github.com\/gphoto\/libgphoto2\/issues\/749 *\/\n \t{\"Sony:ILCE-7RM4A (PC Control)\",\t0x054c, 0x0d9f, PTP_CAP|PTP_CAP_PREVIEW},\n+\n+\t\/* https:\/\/github.com\/gphoto\/libgphoto2\/pull\/782 *\/\n+\t{\"Sony:Alpha-A7 IV (MTP mode)\",\t\t0x054c, 0x0da6, 0},\n+\t{\"Sony:Alpha-A7 IV (PC Control)\",\t0x054c, 0x0da7, PTP_CAP|PTP_CAP_PREVIEW},\n \n \t\/* Nikon Coolpix 2500: M. Meissner, 05 Oct 2003 *\/\n \t{\"Nikon:Coolpix 2500 (PTP mode)\", 0x04b0, 0x0109, 0},\n"} {"commit":"543bf2cda9f102267415d7d3bfc05eda9c484d67","subject":"added z915","message":"added z915\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@12515 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"thusoy\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -469,6 +469,8 @@\n \t{\"Kodak:C913\", 0x040a, 0x05c6, 0},\n \t\/* reported by Jim Nelson <jim@yorba.org> *\/\n \t{\"Kodak:M1063\", 0x040a, 0x05ce, 0},\n+\t\/* http:\/\/sourceforge.net\/tracker\/index.php?func=detail&aid=2889451&group_id=8874&atid=358874 *\/\n+\t{\"Kodak:Z915\", 0x040a, 0x05cf, 0},\n \n \t\/* HP PTP cameras *\/\n #if 0\n"} {"commit":"820ed97c30260734857ff15f856af87bc92fce4f","subject":"make sony preview much much faster and more reliable. fixes https:\/\/github.com\/gphoto\/libgphoto2\/issues\/180 thanks to Adrian S for borrowing his Sony for some hours","message":"make sony preview much much faster and more reliable.\nfixes https:\/\/github.com\/gphoto\/libgphoto2\/issues\/180\nthanks to Adrian S for borrowing his Sony for some hours\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -2922,13 +2922,17 @@\n \t\tunsigned char\t*ximage = NULL;\n \t\tint\t\ttries = 20;\n \n-\t\tptp_check_event (params);\t\/* will stall for some reason *\/\n+#if 0\n+\t\t\/* this times out, with 0.3 seconds wait ... bad *\/\n+\t\tptp_check_event (params); \t\/* will stall for some reason *\/\n+#endif\n \t\tdo {\n \t\t\tret = ptp_getobject_with_size(params, preview_object, &ximage, &size);\n \t\t\tif (ret == PTP_RC_OK)\n \t\t\t\tbreak;\n \t\t\tif (ret != PTP_RC_AccessDenied) \/* we get those when we are too fast *\/\n \t\t\t\tC_PTP (ret);\n+\t\t\tusleep(10*1000);\n \t\t} while (tries--);\n \n \t\t\/* look for the JPEG SOI marker (0xFFD8) in data *\/\n"} {"commit":"b455e9752eb0fd72b98b79bfac7f9bf01fa0be8f","subject":"2 cameras I found at suse added","message":"2 cameras I found at suse added\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@10598 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -559,6 +559,8 @@\n \n \t\/* IRC report *\/\n \t{\"Casio:EX-Z120\", 0x07cf, 0x1042, 0},\n+\t\/* Andrej Semen (at suse) *\/\n+\t{\"Casio:EX-S770\", 0x07cf, 0x1049, 0},\n \t\/* https:\/\/launchpad.net\/bugs\/64146 *\/\n \t{\"Casio:EX-Z700\", 0x07cf, 0x104c, 0},\n \n@@ -724,6 +726,7 @@\n \t{\"Fuji:FinePix A800\",\t\t\t0x04cb, 0x01d2, 0},\n \n \t{\"Ricoh:Caplio GX (PTP mode)\", 0x05ca, 0x0325, 0},\n+\t{\"Sea & Sea:5000G (PTP mode)\",\t\t0x05ca, 0x0327, 0},\n \t{\"Ricoh:Caplio R3 (PTP mode)\", 0x05ca, 0x032f, 0},\n \t{\"Ricoh:Caplio R5 (PTP mode)\", 0x05ca, 0x0110, 0},\n \n"} {"commit":"41ed5588983ef8e63f69af4379055789edb969c7","subject":"update","message":"update\n","repos":"gitesei\/faunus,mlund\/faunus,mlund\/faunus,bjornstenqvist\/faunus,mlund\/faunus,gitesei\/faunus,bjornstenqvist\/faunus,bjornstenqvist\/faunus,gitesei\/faunus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/potentials.h\n+++ src\/potentials.h\n@@ -413,6 +413,94 @@\n }\n };\n \n+ template<class Tparticle>\n+ class DesernoMembrane : public PairPotentialBase {\n+\n+ WeeksChandlerAndersen<Tparticle> wca;\n+ CosAttract cos2;\n+ int tail;\n+\n+ public:\n+ DesernoMembrane(const std::string &name=\"dmembrane\") {\n+ PairPotentialBase::name=name;\n+ PairPotentialBase::name.clear();\n+ }\n+\n+ void from_json(const json &j) override {\n+ wca = j;\n+ cos2 = j;\n+ auto it = findName(atoms, \"TL\");\n+ if ( it!=atoms.end() )\n+ tail = it->id();\n+ else\n+ throw std::runtime_error(\"Atom type 'TL' is not defined.\");\n+ }\n+ void to_json(json &j) const override {\n+ json _j;\n+ wca.to_json(j);\n+ cos2.to_json(_j);\n+ j = merge(j,_j);\n+ }\n+\n+ double operator() (const Tparticle &a, const Tparticle &b, const Point &r) const {\n+ double u=wca(a,b,r);\n+ if (a.id==tail and b.id==tail)\n+ u+=cos2(a,b,r);\n+ return u;\n+ }\n+ };\n+\n+ template<class Tparticle>\n+ class DesernoMembraneAA : public PairPotentialBase {\n+\n+ WeeksChandlerAndersen<Tparticle> wca;\n+ CosAttract cos2;\n+ Polarizability<Tparticle> polar;\n+ int tail;\n+ int aa;\n+\n+ public:\n+ DesernoMembraneAA(const std::string &name=\"dmembraneAA\") {\n+ PairPotentialBase::name=name;\n+ PairPotentialBase::name.clear();\n+ }\n+\n+ void from_json(const json &j) override {\n+ wca = j;\n+ cos2 = j;\n+ polar = j;\n+ auto it = findName(atoms, \"TL\");\n+ if ( it!=atoms.end() )\n+ tail = it->id();\n+ else\n+ throw std::runtime_error(\"Atom type 'TL' is not defined.\");\n+ it = findName(atoms, \"AA\");\n+ if ( it!=atoms.end() )\n+ aa = it->id();\n+ else\n+ throw std::runtime_error(\"Atom type 'AA' is not defined.\");\n+\n+ }\n+ void to_json(json &j) const override {\n+ json _j;\n+ wca.to_json(j);\n+ cos2.to_json(_j);\n+ j = merge(j,_j);\n+ polar.to_json(_j);\n+ j = merge(j,_j);\n+ }\n+\n+ double operator() (const Tparticle &a, const Tparticle &b, const Point &r) const {\n+ double u=wca(a,b,r);\n+ if (a.id==tail and b.id==tail)\n+ u+=cos2(a,b,r);\n+ if (a.id==aa or b.id==aa) {\n+ u+=polar(a,b,r);\n+ }\n+ return u;\n+ }\n+ };\n+\n \/**\n * @brief Finite Extensible Nonlinear Elastic (FENE) potential\n *\n@@ -457,8 +545,6 @@\n double selfenergy_prefactor;\n double lB, depsdt, rc, rc2, rc1i, epsr, epsrf, alpha, kappa, I;\n int order;\n- bool ellipse_cutoff\n-\t Point Rc_ellipse;\n \n void sfYukawa(const json &j);\n void sfReactionField(const json &j);\n@@ -475,18 +561,14 @@\n \n void from_json(const json &j) override;\n \n- template<class Tparticle>\n- double operator()(const Tparticle &a, const Tparticle &b, double r2) const {\n+ template<typename... T>\n+ double operator()(const Particle<T...> &a, const Particle<T...> &b, const Point &r) const {\n+ double r2 = r.squaredNorm();\n if (r2 < rc2) {\n double r = std::sqrt(r2);\n return lB * a.charge * b.charge \/ r * sf.eval( table, r*rc1i );\n }\n return 0;\n- }\n-\n- template<typename... T>\n- double operator()(const Particle<T...> &a, const Particle<T...> &b, const Point &r) const {\n- return operator()(a,b,r.squaredNorm());\n }\n \n template<typename... T>\n@@ -581,11 +663,8 @@\n class FunctorPotential : public PairPotentialBase {\n typedef std::function<double(const T&, const T&, const Point&)> uFunc;\n PairMatrix<uFunc,true> umatrix; \/\/ matrix with potential for each atom pair\n- typedef Tabulate::TabulatorBase<double>::data Ttable; \/\/ data for tabulated potential\n- Tabulate::Andrea<double> tblt; \/\/ tabulated potential\n- PairMatrix<Ttable,true> tmatrix; \/\/ matrix with tabulated potential for each atom pair\n json _j; \/\/ storage for input json\n- double rc2;\n+\n typedef CombinedPairPotential<Coulomb,HardSphere<T>> PrimitiveModel;\n typedef CombinedPairPotential<Coulomb,WeeksChandlerAndersen<T>> PrimitiveModelWCA;\n \n@@ -648,70 +727,19 @@\n }\n \n double operator()(const T &a, const T &b, const Point &r) const {\n- double r2 = r.squaredNorm();\n- if (r2 > tmatrix(a.id, b.id).rmax2)\n- return 0.0;\n- else if (r2 <= tmatrix(a.id, b.id).rmin2)\n- return umatrix(a.id, b.id)(a, b, Point(0,0,sqrt(r2))); \/\/ pc::infty;\n- else \n- return tblt.eval(tmatrix(a.id, b.id), r2);\n+ return umatrix(a.id, b.id)(a, b, r);\n }\n \n void to_json(json &j) const override { j = _j; }\n \n void from_json(const json &j) override {\n- tblt.setTolerance(j.value(\"utol\",1e-5),j.value(\"ftol\",1e-2) );\n _j = j;\n- double rmax2 = pc::Nav;\n umatrix = decltype(umatrix)( atoms.size(), combineFunc(j.at(\"default\")) );\n for (auto it=j.begin(); it!=j.end(); ++it) {\n auto atompair = words2vec<std::string>(it.key()); \/\/ is this for a pair of atoms?\n if (atompair.size()==2) {\n auto ids = names2ids(atoms, atompair);\n umatrix.set(ids[0], ids[1], combineFunc(it.value()));\n- }\n- }\n- for (size_t i=0; i<atoms.size(); ++i) {\n- for (size_t k=0; k<=i; ++k) {\n- if (atoms[i].implicit==false and atoms[k].implicit==false) {\n- T a = atoms.at(i);\n- T b = atoms.at(k);\n- double rmin2 = .5*(atoms[i].sigma + atoms[k].sigma);\n- rmin2 = rmin2*rmin2;\n- auto it = j.find(\"cutoff_g2g\");\n- if (j.count(\"cutoff_max\")==1) {\n- rmax2 = std::pow( j.at(\"cutoff_max\").get<double>(), 2);\n- } else if (it != j.end()) {\n- if (it->is_number())\n- rmax2 = std::pow( it->get<double>(), 2 );\n- else if (it->is_object())\n- rmax2 = std::pow( it->at(\"default\").get<double>(), 2);\n- } else {\n- throw std::runtime_error(\"Specify cutoff_g2g or cutoff_max\");\n- }\n- while (rmin2 >= 1e-2) {\n- if (std::fabs(umatrix(i,k)(a, b, Point(0,0,sqrt(rmin2)))) > 1e6)\n- rmin2 = rmin2 + 1e-2;\n- else if (std::fabs(umatrix(i,k)(a, b, Point(0,0,sqrt(rmin2)))) > 1e5)\n- break;\n- else\n- rmin2 = rmin2 - 1e-2;\n- }\n- while (rmax2 >= 1e-2) {\n- if (std::fabs(umatrix(i,k)(a, b, Point(0,0,sqrt(rmax2)))) > pc::epsilon_dbl)\n- break;\n- rmax2 = rmax2 - 1e-2;\n- }\n- Ttable knotdata = tblt.generate( [&](double r2) { return umatrix(i,k)(a, b, Point(0,0,sqrt(r2))); }, rmin2, rmax2);\n- tmatrix.set(i, k, knotdata);\n- std::ofstream file(atoms[i].name+\"-\"+atoms[k].name+\"_tabulated.dat\"); \/\/ output file\n- file << \"# Separation\\tTabulated\\tOriginal\\n\";\n- double r2 = rmin2;\n- while (r2 < rmax2) {\n- r2 = r2 + 1e-2;\n- file << sqrt(r2) << \"\\t\" << tblt.eval(tmatrix(i, k), r2) << \"\\t\" << umatrix(i,k)(a, b, Point(0,0,sqrt(r2))) << \"\\n\";\n- }\n- }\n }\n }\n }\n"} {"commit":"0b4b81ea8d8ea0bff3902c8799e139bffb280b8d","subject":"x","message":"x\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@11285 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/library.c\n+++ camlibs\/ptp2\/library.c\n@@ -383,7 +383,7 @@\n \n \t\/* HP PTP cameras *\/\n #if 0\n-\t\/* 0x4002 seems to be the mass storage ID, which various forums suggest *\/\n+\t\/* 0x4002 seems to be the mass storage ID, which various forums suggest. -Marcus *\/\n \t{\"HP:PhotoSmart ... \", \t\t 0x03f0, 0x4002, 0},\n #endif\n \t{\"HP:PhotoSmart 812 (PTP mode)\", 0x03f0, 0x4202, 0},\n"} {"commit":"1c5cec35883163f8d3f7f05b6916591f52d0d29f","subject":"Fix handling of '#' while in false preprocesser conditionals.","message":"Fix handling of '#' while in false preprocesser conditionals.\n","repos":"orodley\/naive,orodley\/naive,orodley\/naive,orodley\/naive","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/preprocess.c\n+++ src\/preprocess.c\n@@ -811,6 +811,9 @@\n \t\t\tbreak;\n \t\t}\n \t\tcase '#':\n+\t\t\tif (ignoring_chars(pp))\n+\t\t\t\tbreak;\n+\n \t\t\tif (peek_char(reader) == '#') {\n \t\t\t\t\/\/ Token pasting operator\n \t\t\t\t\/\/ @TODO: Handle empty replacements properly.\n"} {"commit":"6a23538de13ff46b1233a6625f6fbe5d779abd60","subject":"can has force vector? yes. yes you can","message":"can has force vector? yes. yes you can\n","repos":"tlively\/cs51-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physics.c\n+++ physics.c\n@@ -624,16 +624,6 @@\n return 0;\n }\n \n-\/\/ to help with resolution of polygon collision\n-float get_line(po_vector p1, po_vector p2){\n- po_vector slope = vect_from_points(p1, p2);\n- float m = slope.y \/ slope.x;\n- float b = m*p1.x - p1.y;\n- \/\/ so our inequality will become 0 <\/> m * p_incoming.x + b - p_incoming.y\n- \/\/ basically, we need to do this for every side of one polygon\n- \/\/ with the incoming points being the vertices of the other poly\n-}\n-\n \/* given an array of vertices, returns an array of vectors normal to the connecting lines *\/\n void get_normals (po_vector* verts, int size, po_vector** normals) {\n *normals[size];\n@@ -642,22 +632,20 @@\n }\n } \n \n-po_vector get_force_vector(po_vector point, po_handle poly, int index) {\n- \/\/ get the vector representing the side\n- po_vector side = vect_from_points(VERTEX(poly)[index], \n-\t\t\t\t VERTEX(poly)[(index+1) % NVERTS(poly)]);\n- \/\/ vector from the origin of the line seg to the vertex point\n- po_vector p_to_p = vect_from_points(VERTEX(poly)[index], point);\n+\/* takes point and vector in global coords*\/\n+po_vector get_force_vector(po_vector point, po_vector* poly, int index, int max_index) {\n+\n+ \/\/ get the projection of the vector connecting the colliding vertex onto the line\n+ po_vector proj = vect_project(vect_from_points(poly[index], point), \n+\t\t\t\tvect_from_points(poly[index], poly[(index+1) % max_index]));\n+\n+ \/\/ get the point this hits in global coords\n+ po_vector intersect_point;\n+ intersect_point.x = proj.x + poly[index].x;\n+ intersect_point.y = proj.y + poly[index].y;\n \n- \/\/ get the projection of p_to_p ont the side\n- po_vector proj = vect_project(p_to_p, side);\n- \n- return vect_from_points(point, vect_project(p_to_p, side));\n- \n- \/\/ the down and dirty and less readable version of this file\n- \/\/ TODO: determine if worth the memory to make it that much less readable\n- \/\/ return vect_from_points(point,vect_project(vect_from_points(VERTEX(poly)[index], point), vect_from_points(VERTEX(poly)[index], VERTEX(poly)[(index+1) % NVERTS(poly)])));\n- \n+ \/\/ get the force vector!\n+ return vect_from_points(point, intersect_point);\n }\n \n \/* go through the sides of poly1 comparing with the verts of poly2 \n@@ -678,7 +666,7 @@\n get_normals(vert_sides, NVERTS(po_sides), &normals);\n \n float min_dot_prod;\n- \/\/ the outer loops is for the points in the first poly\n+ \/\/ the outer loop is for the points in the first poly\n for (int i = 0, max_j = NVERTS(po_sides); i < NVERTS(po_pts); i++){\n \/\/ these will keep track of our smallest magnitude dot prods; resets every new vert\n min_dot_prod = 0;\n@@ -693,16 +681,16 @@\n \/\/ no intersection, skip the rest of the dot prods\n break;\n }\n- \n+ \/\/ if we've found a new min value...\n if (-cur_dot_prod > min_dot_prod){\n \t\/\/ update our maxes\n \t*index_sides = j;\n \tmin_dot_prod = -cur_dot_prod;\n }\n-\n+ \/\/ we've made it to the end...\n if (j == max_j) {\n-\t\/\/ we've made it through the whole loop without sadness\n-\t\n+\t\/\/ we've made it through the whole loop without sadness! so we update.\n+\t*force_vect = get_force_vector(vert_pts[i], vert_sides, j, NVERTS(po_sides));\n \t*index_pt = i;\n \treturn 0;\n }\n"} {"commit":"228a635f7eb3c08ce611e8c63773629e6cadfa7d","subject":"Update pbMisc.h","message":"Update pbMisc.h","repos":"uCalc\/powerbasic-to-cpp,uCalc\/powerbasic-to-cpp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- convert\/pbMisc.h\n+++ convert\/pbMisc.h\n@@ -33,8 +33,7 @@\n PB_CV(PB_CVQ, long long)\n PB_CV(PB_CVS, float)\n PB_CV(PB_CVWRD, unsigned short)\n-\/\/ PB_CV(PB_CVCUR, ...) +++ no C++ type for currency\n-\/\/ PB_CV(PB_CVCUX, ...)\n+\n \n inline string PB_PEEK_STR(int address, int count) { return string((char *)address, count); }\n inline void PB_POKE_STR(int address, const string& data) { memmove((void *)address, data.c_str(), data.length()); }\n"} {"commit":"d4ca4c14d06da7405896263e44bea0a0fb9d5666","subject":"crankbench: Use crank_value_to_string to stringify value.","message":"crankbench: Use crank_value_to_string to stringify value.\n","repos":"WSID\/crank-system,WSID\/crank-system,WSID\/crank-system","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crankbase\/crankbench.c\n+++ crankbase\/crankbench.c\n@@ -2765,10 +2765,8 @@\n \n for (j = 0; j < nparam_order; j++)\n {\n- GValue strvalue = {0};\n GValue *pvalue;\n-\n- g_value_init (&strvalue, G_TYPE_STRING);\n+ gchar *str;\n \n pvalue = (GValue*) g_hash_table_lookup (run->param, param_order[j]);\n \n@@ -2776,18 +2774,17 @@\n {\n g_string_append (strbuild, \",\\t<empty>\");\n }\n- else if (! g_value_transform (pvalue, &strvalue))\n- {\n- g_string_append (strbuild, \",\\t<value>\");\n- }\n else\n {\n- g_string_append_printf (strbuild,\n- \",\\t%s\",\n- g_value_get_string (&strvalue));\n+ str = crank_value_to_string (pvalue);\n+\n+ if (str == NULL)\n+ g_string_append (strbuild, \",\\t<value>\");\n+ else\n+ g_string_append_printf (strbuild, \",\\t%s\", str);\n+\n+ g_free (str);\n }\n-\n- g_value_unset (&strvalue);\n }\n \n switch (run->state & CRANK_BENCH_RUN_MASK_RES_STATE)\n@@ -2812,10 +2809,8 @@\n {\n for (j = 0; j < nresult_order; j++)\n {\n- GValue strvalue = {0};\n GValue *pvalue;\n-\n- g_value_init (&strvalue, G_TYPE_STRING);\n+ gchar *str;\n \n pvalue = (GValue*) g_hash_table_lookup (run->result, result_order[j]);\n \n@@ -2823,18 +2818,18 @@\n {\n g_string_append (strbuild, \",\\t<empty>\");\n }\n- else if (! g_value_transform (pvalue, &strvalue))\n- {\n- g_string_append (strbuild, \",\\t<value>\");\n- }\n else\n {\n- g_string_append_printf (strbuild,\n- \",\\t%s\",\n- g_value_get_string (&strvalue));\n+ str = crank_value_to_string (pvalue);\n+\n+ if (str == NULL)\n+ g_string_append (strbuild, \",\\t<value>\");\n+ else\n+ g_string_append_printf (strbuild, \",\\t%s\", str);\n+\n+ g_free (str);\n }\n \n- g_value_unset (&strvalue);\n }\n }\n g_string_append_c (strbuild, '\\n');\n"} {"commit":"ec87409c2ef437b8aaca9debc9bd7893d559d33d","subject":"Larger assert description buffer","message":"Larger assert description buffer\n","repos":"Zubax\/zubax_chibios,Zubax\/zubax_chibios,Zubax\/zubax_chibios,Zubax\/zubax_chibios","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crdr_chibios\/sys\/sys.c\n+++ crdr_chibios\/sys\/sys.c\n@@ -104,7 +104,7 @@\n char line_buf[11];\n itoa(line, line_buf);\n \n- char buf[128]; \/\/ We don't care about possible stack overflow because we're going to die anyway\n+ char buf[256]; \/\/ We don't care about possible stack overflow because we're going to die anyway\n char* ptr = buf;\n const unsigned size = sizeof(buf);\n unsigned pos = 0;\n"} {"commit":"86812767b13f32d4f47e0ba1e6a1c739de98d8d0","subject":"atomic_dec -> psc_atomic32_dec","message":"atomic_dec -> psc_atomic32_dec\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@11342 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- share\/bmap.c\n+++ share\/bmap.c\n@@ -75,10 +75,8 @@\n {\n \tBMAP_RLOCK(b);\n \n-\tatomic_dec(&b->bcm_opcnt);\n-\n+\tpsc_atomic32_dec(&b->bcm_opcnt);\n \tDEBUG_BMAP(PLL_INFO, b, \"bmap_op_done\");\n-\n \tpsc_assert(psc_atomic32_read(&b->bcm_opcnt) >= 0);\n \n \tif (!psc_atomic32_read(&b->bcm_opcnt)) {\n"} {"commit":"d2068db4e98dd0835917b58ff168633fad889358","subject":"Added calling card.","message":"Added calling card.\n","repos":"emptymonkey\/sigsleeper","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sigsleeper.c\n+++ sigsleeper.c\n@@ -90,6 +90,10 @@\n #include \"sigsleeper.h\"\n #include \"shellcode-snippets.h\"\n #include \"libptrace_do.h\"\n+\n+\n+\n+char *CALLING_CARD = \"@emptymonkey - https:\/\/github.com\/emptymonkey\";\n \n \n \n"} {"commit":"1b28451eac5d553125d106b8a8f087e8a23d193c","subject":"cursor: don't do $query on commands.","message":"cursor: don't do $query on commands.\n","repos":"remicollet\/mongo-c-driver,acmorrow\/mongo-c-driver,ajdavis\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,beingmeta\/mongo-c-driver,u2yg\/mongo-c-driver,christopherjwang\/mongo-c-driver,bjori\/mongo-c-driver,jqk6\/mongo-c-driver,malexzx\/mongo-c-driver,jsbattig\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,remicollet\/mongo-c-driver,eugene-convey\/mongo-c-driver,remicollet\/mongo-c-driver,hanumantmk\/libmongoc,Convey-Compliance\/mongo-c-driver,derickr\/mongo-c-driver,malexzx\/mongo-c-driver,hanumantmk\/libmongoc,mongodb\/mongo-c-driver,4Second2None\/mongo_C_tmp,eugene-convey\/mongo-c-driver,shelsonjava\/mongo-c-driver,jmikola\/mongo-c-driver,mschoenlaub\/mongo-c-driver,mongodb\/mongo-c-driver,paulmelnikow\/mongo-c-driver-1,jmikola\/mongo-c-driver,acmorrow\/mongo-c-driver,beingmeta\/mongo-c-driver,u2yg\/mongo-c-driver,bauman\/mongo-c-driver,bjori\/mongo-c-driver,christopherjwang\/mongo-c-driver,jmikola\/mongo-c-driver,chergert\/mongo-c-driver-1,ksuarz\/mongo-c-driver,shelsonjava\/mongo-c-driver,acmorrow\/mongo-c-driver,jmikola\/mongo-c-driver,mongodb\/mongo-c-driver,Machyne\/mongo-c-driver,paulmelnikow\/mongo-c-driver-1,mongodb\/mongo-c-driver,shelsonjava\/mongo-c-driver,rcsanchez97\/mongo-c-driver,bjori\/mongo-c-driver,acmorrow\/mongo-c-driver,derickr\/mongo-c-driver,derickr\/mongo-c-driver,jqk6\/mongo-c-driver,mschoenlaub\/mongo-c-driver,rcsanchez97\/mongo-c-driver,rcsanchez97\/mongo-c-driver,Convey-Compliance\/mongo-c-driver,mongodb\/mongo-c-driver,acmorrow\/mongo-c-driver,christopherjwang\/mongo-c-driver,rcsanchez97\/mongo-c-driver,derickr\/mongo-c-driver,bauman\/mongo-c-driver,jmikola\/mongo-c-driver,derickr\/mongo-c-driver,ac000\/mongo-c-driver,eugene-convey\/mongo-c-driver,mongodb\/mongo-c-driver,ajdavis\/mongo-c-driver,mongodb\/mongo-c-driver,derickr\/mongo-c-driver,chergert\/mongo-c-driver-1,Convey-Compliance\/mongo-c-driver,ac000\/mongo-c-driver,Machyne\/mongo-c-driver,beingmeta\/mongo-c-driver,4Second2None\/mongo_C_tmp,Machyne\/mongo-c-driver,mschoenlaub\/mongo-c-driver,ac000\/mongo-c-driver,rcsanchez97\/mongo-c-driver,ksuarz\/mongo-c-driver,paulmelnikow\/mongo-c-driver-1,bjori\/mongo-c-driver,beingmeta\/mongo-c-driver,jqk6\/mongo-c-driver,chergert\/mongo-c-driver-1,malexzx\/mongo-c-driver,u2yg\/mongo-c-driver,bauman\/mongo-c-driver,remicollet\/mongo-c-driver,christopherjwang\/mongo-c-driver,ajdavis\/mongo-c-driver,acmorrow\/mongo-c-driver,derickr\/mongo-c-driver,rcsanchez97\/mongo-c-driver,remicollet\/mongo-c-driver,remicollet\/mongo-c-driver,ksuarz\/mongo-c-driver,Machyne\/mongo-c-driver,jmikola\/mongo-c-driver,mschoenlaub\/mongo-c-driver,bjori\/mongo-c-driver,jsbattig\/mongo-c-driver,u2yg\/mongo-c-driver,rcsanchez97\/mongo-c-driver,ksuarz\/mongo-c-driver,beingmeta\/mongo-c-driver,ajdavis\/mongo-c-driver,bjori\/mongo-c-driver,ajdavis\/mongo-c-driver,remicollet\/mongo-c-driver,ajdavis\/mongo-c-driver,jsbattig\/mongo-c-driver,4Second2None\/mongo_C_tmp,beingmeta\/mongo-c-driver,ajdavis\/mongo-c-driver,hanumantmk\/libmongoc,malexzx\/mongo-c-driver,jmikola\/mongo-c-driver,beingmeta\/mongo-c-driver,beingmeta\/mongo-c-driver,acmorrow\/mongo-c-driver,hanumantmk\/libmongoc,bjori\/mongo-c-driver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mongoc\/mongoc-cursor.c\n+++ mongoc\/mongoc-cursor.c\n@@ -124,7 +124,7 @@\n \n cursor->is_command = is_command;\n \n- if (!bson_has_field (query, \"$query\")) {\n+ if (!cursor->is_command && !bson_has_field (query, \"$query\")) {\n bson_init (&cursor->query);\n bson_append_document (&cursor->query, \"$query\", 6, query);\n } else {\n"} {"commit":"5c3a6d92c63b0da876f4d1fb61dfeb16bb5cbc3f","subject":"Removed all dependencies to my own files, compiling","message":"Removed all dependencies to my own files, compiling\n","repos":"fRasoilo\/simple_log","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- simple_log.h\n+++ simple_log.h\n@@ -7,8 +7,9 @@\n *\/\n \n \/\/TODO:\n-\/\/ - Add the types\n-\/\/ \n+\/\/ - Add option to change colors for the different logging functions.\n+\/\/ - Add option to add file, line, function info to logs.\n+\/\/ - Differentiate between internal functions and user facing api functions.\n \/\/\n \/\/\n \n@@ -28,6 +29,40 @@\n \/\/ All other files should just include \"simple_log.h\" without the define\n \/\/=============================================================================\n \n+\/\/ API --------------\n+\n+\/*\n+void sl_log_init(LogMode log_mode, char* file_path,\n+ platform_custom_log_to_file* platform_custom_log_to_file,\n+ platform_custom_log_to_console* platform_custom_log_to_console = 0,\n+ platform_custom_log_to_window* platform_custom_log_to_window = 0,\n+ platform_custom_error_message_box* platform_custom_error_message_box = 0);\n+\n+sl_log_window_set(Handle) Is a macro that is defined depending on the current platform:\n+sl_win32_log_window_set(HWND Handle) \n+\n+ \n+bool32 sl_log(char* text);\n+bool32 sl_logf(char* fmt, ...);\n+bool32 sl_log_error(char* text);\n+bool32 sl_log_errorf(char* fmt, ...);\n+bool32 sl_log_warning(char* text);\n+bool32 sl_log_warningf(char* fmt, ...);\n+bool32 sl_log_info(char* text);\n+bool32 sl_log_infof(char* fmt, ...);\n+bool32 sl_log_debug(char* text);\n+bool32 sl_log_debugf(char* fmt, ...);\n+void sl_log_fatal(char* text);\n+void sl_log_fatalf(char* fmt, ...);\n+void sl_error_message_box(char* text, char* caption = \"Error!\");\n+void sl_error_message_box_fatal(char* text, char* caption = \"FATAL ERROR!\");\n+\n+\n+*\/\n+\n+\n+\n+\n #ifdef _WIN32\n #define WIN32_LEAN_AND_MEAN\n #include <Windows.h>\n@@ -41,7 +76,6 @@\n typedef int32_t int32;\n \/\/Bool\n typedef int32 bool32;\n-\n \n \/\/ [INTERNAL] Static Declarations\n #define internal static\n@@ -133,7 +167,7 @@\n LogLevel_Debug\n };\n \n-\/\/Forward Declare\n+\/\/ [INTERNAL] Forward Declare\n \n struct LogState;\n internal bool32 sl_buffer_append_string(LogBuffer* log_buffer, char* string);\n@@ -181,8 +215,7 @@\n \n \/\/ [IMPLEMENTATION]\n \n-LogState*\n-sl_logstate_get(void)\n+LogState* sl_logstate_get(void)\n {\n local_persist LogState log_state = {};\n return(&log_state);\n@@ -193,7 +226,6 @@\n \/\/ Date and Time --------------\n \n \/\/TODO: More formating options for date\n-\/\/TODO: Replace, string_buffer from gw_tool\n void sl_date_string_get(DateAndTime date_and_time,LogBuffer* buffer)\n {\n \n@@ -201,7 +233,6 @@\n Default format for date is - 1st January 2015\n - 30th November 2015\n *\/\n-\n char* month;\n switch(date_and_time.month)\n {\n@@ -248,7 +279,6 @@\n \n }\n \n-\/\/TODO: Replace, stringbuffer from gw_tool\n void sl_time_string_get(DateAndTime date_and_time, LogBuffer* buffer)\n {\n \n@@ -523,7 +553,6 @@\n {\n LogState* log_state = sl_logstate_get();\n \n- \/\/TODO: Replace Assert, from gw_tool\n Assert(log_state);\n log_state->initialized = true;\n log_state->log_mode = (LogMode)log_mode;\n@@ -578,7 +607,7 @@\n }\n \n \n-internal bool32\n+bool32\n sl_log(char* text)\n {\n bool32 result = false;\n@@ -635,25 +664,20 @@\n }\n \n \n-internal bool32\n+bool32\n sl_logf(char* fmt, ...)\n {\n \n- \/\/TODO: Replace this with the std lib function\n-\n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n-\n-\tAssert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n- \n- string_buffer Buffer ={};\n- print_to_buffer_(&Buffer, Fmt, OptionalArgument);\n- char* Text = Buffer.Buffer;\n- \n- bool32 Result = false;\n- \n+ \/\/TODO: Do the va_list stuff\n+ \n+ LogBuffer log_buffer = {};\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n+ \n+ \n \/\/TODO: Also at the moment we are assuming the Log Window is already\n \/\/created and shown. If its not? Need to buffer up messages and show them when\n \/\/log window is presented? x(To worry about in the future). For now lets just skip\n@@ -668,42 +692,42 @@\n {\n case LogMode_File:\n {\n- Result = log_state->PlatformCustomLogToFile(log_state,Text);\n+ result = log_state->log_to_file_func(log_state,log_buffer.buffer);\n }break;\n \n- case LogMode_dialog:\n+ case LogMode_Dialog:\n {\n- Result = log_state->PlatformCustomLogToWindow(log_state,Text);\n+ result = log_state->log_to_window_func(log_state,log_buffer.buffer);\n }break;\n \n- case LogMode_console:\n+ case LogMode_Console:\n {\n- Result = log_state->PlatformCustomLogToConsole(log_state,Text);\n+ result = log_state->log_to_console_func(log_state,log_buffer.buffer);\n }break;\n \n- case LogMode_file_and_dialog:\n+ case LogMode_FileAndDialog:\n {\n- Result = log_state->PlatformCustomLogToFile(log_state,Text);\n- Result &= log_state->PlatformCustomLogToWindow(log_state,Text); \n+ result = log_state->log_to_file_func(log_state,log_buffer.buffer);\n+ result &= log_state->log_to_window_func(log_state,log_buffer.buffer); \n }break;\n \n- case LogMode_file_and_console:\n+ case LogMode_FileAndConsole:\n {\n- Result = log_state->PlatformCustomLogToFile(log_state,Text);\n- Result &= log_state->PlatformCustomLogToConsole(log_state,Text); \n+ result = log_state->log_to_file_func(log_state,log_buffer.buffer);\n+ result &= log_state->log_to_console_func(log_state,log_buffer.buffer); \n }break;\n \n- case LogMode_dialog_and_console:\n+ case LogMode_DialogAndConsole:\n {\n- Result = log_state->PlatformCustomLogToWindow(log_state,Text);\n- Result &= log_state->PlatformCustomLogToConsole(log_state,Text); \n+ result = log_state->log_to_window_func(log_state,log_buffer.buffer);\n+ result &= log_state->log_to_console_func(log_state,log_buffer.buffer); \n }break;\n \n- case LogMode_all:\n+ case LogMode_All:\n {\n- Result = log_state->PlatformCustomLogToFile(log_state,Text);\n- Result &= log_state->PlatformCustomLogToWindow(log_state,Text);\n- Result &= log_state->PlatformCustomLogToConsole(log_state,Text); \n+ result = log_state->log_to_file_func(log_state,log_buffer.buffer);\n+ result &= log_state->log_to_window_func(log_state,log_buffer.buffer);\n+ result &= log_state->log_to_console_func(log_state,log_buffer.buffer); \n }break;\n \n InvalidDefaultCase;\n@@ -713,210 +737,204 @@\n {\n Assert(!\"LogState is not initialized\");\n }\n- return(Result);\n-}\n-\n-\n-internal bool32\n+ return(result);\n+}\n+\n+\n+bool32\n sl_log_error(char* text)\n {\n- \/\/TODO: Replace string_buffer from gw_tool\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[ERROR]: \" );\n- append_string(&BufferToWriteOut,Text );\n+ LogBuffer buffer_to_write_out = {};\n+ \n+ sl_buffer_append_string(&buffer_to_write_out,\"[ERROR]: \" );\n+ sl_buffer_append_string(&buffer_to_write_out,text);\n \n sl_log_level_change(LogLevel_Error);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+ bool32 result = sl_log(buffer_to_write_out.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n-\/*\n-All The 'F' variants go here\n- *\/\n-\n-\n-internal bool32\n+\n+bool32\n sl_log_errorf(char* fmt, ...)\n {\n- \n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n- Assert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n-\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[ERROR]: \" );\n- print_to_buffer_(&BufferToWriteOut, Fmt, OptionalArgument);\n+ \/\/TODO: Do the va_list stuff\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[ERROR]: \" );\n+\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n \n sl_log_level_change(LogLevel_Error);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+ result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n \n-internal bool32\n+bool32\n sl_log_warning(char* text)\n {\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[WARNING]: \");\n- append_string(&BufferToWriteOut,Text);\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[WARNING]: \");\n+ sl_buffer_append_string(&log_buffer,text);\n \n sl_log_level_change(LogLevel_Warning);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+ bool32 result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n \n-internal bool32\n+bool32\n sl_log_warningf(char* fmt, ...)\n {\n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n- Assert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n-\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[WARNING]: \");\n- print_to_buffer_(&BufferToWriteOut, Fmt, OptionalArgument);\n+\n+ \/\/TODO: Do the va_list stuff\n+ LogBuffer log_buffer = {};\n+\n+ sl_buffer_append_string(&log_buffer,\"[WARNING]: \");\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n \n sl_log_level_change(LogLevel_Warning);\n- bool32 result = Log(BufferToWriteOut.Buffer);\n- ResetLogLevel();\n- return(Result); \n-}\n-\n-\n-internal bool32\n-sl_log_info(char* text)\n-{\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[INFO]: \");\n- append_string(&BufferToWriteOut,Text);\n- \n- sl_log_level_change(LogLevel_Info);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+ result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n-internal bool32\n-sl_log_infof(char* fmt, ...)\n-{\n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n- Assert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n-\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[INFO]: \");\n- print_to_buffer_(&BufferToWriteOut, Fmt, OptionalArgument);\n-\n+\n+bool32\n+sl_log_info(char* text)\n+{\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[INFO]: \");\n+ sl_buffer_append_string(&log_buffer,text);\n+ \n sl_log_level_change(LogLevel_Info);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+ bool32 result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n-\n-internal bool32\n-sl_log_debug(char* text)\n-{\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[DEBUG]: \" );\n- append_string(&BufferToWriteOut,Text);\n-\n- sl_log_level_change(LogLevel_Debug);\n- bool32 result = sl_log(BufferToWriteOut.Buffer);\n+bool32\n+sl_log_infof(char* fmt, ...)\n+{\n+ \/\/TODO: Do the va_list stuff.\n+\n+ LogBuffer log_buffer = {};\n+\n+ sl_buffer_append_string(&log_buffer,\"[INFO]: \");\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n+\n+ sl_log_level_change(LogLevel_Info);\n+ result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n-internal bool32\n-sl_log_debugf(char* fmt, ...)\n-{\n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n- Assert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n-\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[DEBUG]: \" );\n- print_to_buffer_(&BufferToWriteOut, Fmt, OptionalArgument);\n+\n+bool32\n+sl_log_debug(char* text)\n+{\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[DEBUG]: \" );\n+ sl_buffer_append_string(&log_buffer,text);\n \n sl_log_level_change(LogLevel_Debug);\n- bool32 Result = sl_log(BufferToWriteOut.Buffer);\n+ bool32 result = sl_log(log_buffer.buffer);\n sl_log_level_reset();\n return(result); \n }\n \n-\n-internal void\n+bool32\n+sl_log_debugf(char* fmt, ...)\n+{\n+ \/\/TODO: Do the va_list stuff\n+\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[DEBUG]: \" );\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n+ \n+ sl_log_level_change(LogLevel_Debug);\n+ result = sl_log(log_buffer.buffer);\n+ sl_log_level_reset();\n+ return(result); \n+}\n+\n+\n+void\n sl_log_fatal(char* text)\n {\n- \/\/TODO(filipe): Fatal Error should give information about file, line, function\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[***FATAL ERROR***]: \");\n- append_string(&BufferToWriteOut,Text);\n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[***FATAL ERROR***]: \");\n+ sl_buffer_append_string(&log_buffer,text);\n \n sl_log_level_change(LogLevel_Fatal);\n- sl_log(BufferToWriteOut.Buffer);\n+ sl_log(log_buffer.buffer);\n sl_log_level_reset();\n \n- \/\/NOTE: Crash on purpose!\n+ \/\/NOTE: Crash!\n Assert(!\"FATAL ERROR\");\n }\n \n-internal void\n+void\n sl_log_fatalf(char* fmt, ...)\n {\n- \/\/IMPORTANT NOTE(filipe): Win32 Specific?\n- Assert(ASM_LOADED);\n- x64SpillRegisters_R(); \n- void *OptionalArgument = (char*)(&Fmt) + 8;\n- \/\/\n-\n- \/\/TODO(filipe): Fatal Error should give information about file, line, function\n- string_buffer BufferToWriteOut = {};\n- append_string(&BufferToWriteOut,\"[***FATAL ERROR***]: \");\n- print_to_buffer_(&BufferToWriteOut, Fmt, OptionalArgument);\n+\n+ \/\/TODO: Do the va_list stuff\n+ \n+ LogBuffer log_buffer = {};\n+ sl_buffer_append_string(&log_buffer,\"[***FATAL ERROR***]: \");\n+ int32 result = sprintf(log_buffer.buffer, fmt);\n+\n+ if(result < 0){\n+ Assert(!\"Something bad happened\");\n+ }\n \n sl_log_level_change(LogLevel_Fatal);\n- sl_log(BufferToWriteOut.Buffer);\n+ sl_log(log_buffer.buffer);\n sl_log_level_reset();\n \/\/NOTE: Crash on purpose!\n Assert(!\"FATAL ERROR\");\n }\n \n \n-internal void\n+void\n sl_error_message_box(char* text, char* caption = \"Error!\")\n {\n- \/\/TODO: Should we log inside here?\n LogState* log_state = sl_logstate_get();\n Assert(log_state);\n if(log_state->initialized)\n {\n- log_state->platform_custom_error_message_box(text, caption);\n- }\n-}\n-\n-\n-internal void\n+ log_state->error_message_box_func(text, caption);\n+ }\n+}\n+\n+\n+void\n sl_error_message_box_fatal(char* text, char* caption = \"FATAL ERROR!\")\n {\n- \/\/TODO: Should we log inside here?\n LogState* log_state = sl_logstate_get();\n Assert(log_state);\n if(log_state->initialized)\n {\n- log_state->platform_custom_error_message_box(text, caption);\n+ log_state->error_message_box_func(text, caption);\n }\n \/\/TODO: Replace with debug break!\n Assert(!\"FATAL ERROR\");\n@@ -924,6 +942,15 @@\n \n \n \n+#if _WIN32\n+#define sl_log_window_set(Handle) sl_win32_log_window_set(Handle)\n+#else\n+ #error No other OS defined!\n+#endif \/\/END _wIN32\n+\/\/TODO: Other OS\n+\n+\n+\n \/\/END Platform Independent --------------\n \n \n@@ -962,10 +989,10 @@\n internal bool32\n sl_buffer_append_string(LogBuffer* log_buffer, char* string)\n {\n- uint32 string_size = StringByteSize(string);\n+ uint32 string_size = sl_string_size(string);\n \/\/TODO(filipe): In the future, should grow the buffer...\n- Assert((StringSize + log_buffer->used) < LOG_BUFFER_SIZE); \n- b32 result = false;\n+ Assert((string_size + log_buffer->used) < LOG_BUFFER_SIZE); \n+ bool32 result = false;\n \n char* str_ptr = string;\n for(int32 index = log_buffer->used ;*str_ptr; ++index)\n@@ -981,7 +1008,6 @@\n \/\/END Buffer Utilites\n \n \n-\/\/TODO: Change name, win32 speci\n internal bool32 sl_win32_string_write_to_console(char* string)\n {\n bool32 result = false;\n@@ -990,10 +1016,10 @@\n {\n DWORD BytesWritten;\n WriteFile(StdOut,\n- String,\n- StringByteSize(String),\n+ string,\n+ sl_string_size(string),\n &BytesWritten, 0);\n result = true;\n }\n- return(Result);\n-}\n+ return(result);\n+}\n"} {"commit":"ffe4354b0b0c7af4098f885f9b4c1c70baccb93c","subject":"fix JIT data access on GPU","message":"fix JIT data access on GPU\n","repos":"joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue,joaander\/hoomd-blue","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- hoomd\/jit\/PatchEnergyJITUnionGPU.h\n+++ hoomd\/jit\/PatchEnergyJITUnionGPU.h\n@@ -29,16 +29,8 @@\n m_gpu_factory(exec_conf, code, kernel_name, options, cuda_devrt_library_path, compute_arch),\n m_d_union_params(m_sysdef->getParticleData()->getNTypes(), jit::union_params_t(), managed_allocator<jit::union_params_t>(m_exec_conf->isCUDAEnabled()))\n {\n- \/\/ allocate data array\n- cudaMallocManaged(&m_d_alpha, sizeof(float)*m_alpha_size);\n- CHECK_CUDA_ERROR();\n-\n- \/\/ allocate data array for unions\n- cudaMallocManaged(&m_d_alpha_union, sizeof(float)*m_alpha_size_union);\n- CHECK_CUDA_ERROR();\n-\n m_gpu_factory.setAlphaPtr(&m_alpha.front());\n- m_gpu_factory.setAlphaUnionPtr(&m_alpha.front());\n+ m_gpu_factory.setAlphaUnionPtr(&m_alpha_union.front());\n m_gpu_factory.setUnionParamsPtr(&m_d_union_params.front());\n m_gpu_factory.setRCutUnion(m_rcut_union);\n \n@@ -61,13 +53,7 @@\n m_tuner_narrow_patch.reset(new Autotuner(valid_params_patch, 5, 100000, \"hpmc_narrow_patch\", this->m_exec_conf));\n }\n \n- virtual ~PatchEnergyJITUnionGPU()\n- {\n- cudaFree(m_d_alpha);\n- CHECK_CUDA_ERROR();\n- cudaFree(m_d_alpha_union);\n- CHECK_CUDA_ERROR();\n- }\n+ virtual ~PatchEnergyJITUnionGPU() {}\n \n \/\/! Set the per-type constituent particles\n \/*! \\param type The particle type to set the constituent particles for\n@@ -111,15 +97,13 @@\n m_tuner_narrow_patch->setPeriod(period);\n m_tuner_narrow_patch->setEnabled(enable);\n }\n- \n+\n protected:\n std::unique_ptr<Autotuner> m_tuner_narrow_patch; \/\/!< Autotuner for the narrow phase\n \n private:\n GPUEvalFactory m_gpu_factory; \/\/!< JIT implementation\n \n- float *m_d_alpha; \/\/!< device memory holding auxillary data\n- float *m_d_alpha_union; \/\/!< device memory holding auxillary data\n std::vector<jit::union_params_t, managed_allocator<jit::union_params_t> > m_d_union_params; \/\/!< Parameters for each particle type on GPU\n };\n \n"} {"commit":"43776f2855095b8607904de1824464315829ba15","subject":"MYNEWT-580; call FLASH_Erase() with interrupts disabled.","message":"MYNEWT-580; call FLASH_Erase() with interrupts disabled.\n","repos":"wes3\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,wes3\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,wes3\/incubator-mynewt-core,mlaz\/mynewt-core,IMGJulian\/incubator-mynewt-core,wes3\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,wes3\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hw\/mcu\/nxp\/MK64F12\/src\/hal_flash.c\n+++ hw\/mcu\/nxp\/MK64F12\/src\/hal_flash.c\n@@ -27,6 +27,7 @@\n #include <stdio.h>\n #include <assert.h>\n #include <hal\/hal_flash_int.h>\n+#include <os\/os.h>\n \n #include \"MK64F12.h\"\n #include \"fsl_flash.h\"\n@@ -112,9 +113,17 @@\n static int\n mk64f12_flash_erase_sector(const struct hal_flash *dev, uint32_t sector_address)\n {\n- if (FLASH_Erase(&mk64f12_config, sector_address, mk64f12_config.PFlashSectorSize,\n- kFLASH_apiEraseKey) == kStatus_Success)\n+ int sr;\n+ int rc;\n+\n+ OS_ENTER_CRITICAL(sr);\n+ rc = FLASH_Erase(&mk64f12_config, sector_address,\n+ mk64f12_config.PFlashSectorSize,\n+ kFLASH_apiEraseKey);\n+ OS_EXIT_CRITICAL(sr);\n+ if (rc == kStatus_Success) {\n return 0;\n+ }\n return -1;\n }\n \n@@ -122,7 +131,8 @@\n mk64f12_flash_sector_info(const struct hal_flash *dev, int idx,\n uint32_t *addr, uint32_t *sz)\n {\n- *addr = mk64f12_config.PFlashBlockBase + (idx * mk64f12_config.PFlashSectorSize);\n+ *addr = mk64f12_config.PFlashBlockBase +\n+ (idx * mk64f12_config.PFlashSectorSize);\n *sz = mk64f12_config.PFlashSectorSize;\n return 0;\n }\n@@ -133,7 +143,8 @@\n if (FLASH_Init(&mk64f12_config) == kStatus_Success) {\n mk64f12_flash_dev.hf_base_addr = mk64f12_config.PFlashBlockBase;\n mk64f12_flash_dev.hf_size = mk64f12_config.PFlashTotalSize;\n- mk64f12_flash_dev.hf_sector_cnt = (mk64f12_config.PFlashTotalSize \/ mk64f12_config.PFlashSectorSize);\n+ mk64f12_flash_dev.hf_sector_cnt =\n+ (mk64f12_config.PFlashTotalSize \/ mk64f12_config.PFlashSectorSize);\n }\n return 0;\n }\n"} {"commit":"0f9f7f4a320606782c09e0115df58e1420cb1ea4","subject":"Schedule static in trainers.","message":"Schedule static in trainers.\n","repos":"agnusmaximus\/cyclades,agnusmaximus\/cyclades,agnusmaximus\/cyclades,agnusmaximus\/cyclades","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/Trainer\/HogwildTrainer.h\n+++ src\/Trainer\/HogwildTrainer.h\n@@ -22,7 +22,7 @@\n \t if (FLAGS_print_loss_per_epoch) {\n \t\tthis->PrintTimeLoss(gradient_timer, model, datapoints);\n \t }\n-#pragma omp parallel for\n+#pragma omp parallel for schedule(static, 1)\n \t for (int thread = 0; thread < FLAGS_n_threads; thread++) {\n \t\tfor (int batch = 0; batch < partitions.NumBatches(); batch++) {\n \t\t for (int index = 0; index < partitions.NumDatapointsInBatch(thread, batch); index++) {\n"} {"commit":"3127257a291bb7a3c71b40b135337a8b3eea98d9","subject":"Added control on the image capture timeout","message":"Added control on the image capture timeout\n","repos":"amitibo\/ids,amitibo\/ids","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ids_core\/ids_core_Camera_methods.c\n+++ ids_core\/ids_core_Camera_methods.c\n@@ -38,7 +38,7 @@\n \n #include \"ids_core.h\"\n \n-#define IMG_TIMEOUT 3000\n+#define IMG_TIMEOUT 12000\n #define NUM_TRIES 5\n \n static PyObject *create_matrix(ids_core_Camera *self, char *mem);\n@@ -177,18 +177,18 @@\n \/* Gets next image with is_WaitForNextImage().\n * Returns zero on success, non-zero on failure,\n * with exception set. *\/\n-static int get_next_image(ids_core_Camera *self, char **mem, INT *image_id) {\n+static int get_next_image(ids_core_Camera *self, unsigned int img_timeout, char **mem, INT *image_id) {\n int ret;\n \n Py_BEGIN_ALLOW_THREADS\n- ret = is_WaitForNextImage(self->handle, IMG_TIMEOUT, mem, image_id); \n+ ret = is_WaitForNextImage(self->handle, img_timeout, mem, image_id); \n Py_END_ALLOW_THREADS\n \n switch (ret) {\n case IS_SUCCESS:\n break;\n case IS_TIMED_OUT:\n- PyErr_Format(IDSTimeoutError, \"Timeout of %dms exceeded\", IMG_TIMEOUT);\n+ PyErr_Format(IDSTimeoutError, \"Timeout of %dms exceeded\", img_timeout);\n return 1;\n case IS_CAPTURE_STATUS:\n PyErr_SetString(IDSCaptureStatus, \"Transfer error. Check capture status.\");\n@@ -202,13 +202,14 @@\n }\n \n static PyObject *ids_core_Camera_next_save(ids_core_Camera *self, PyObject *args, PyObject *kwds) {\n- static char *kwlist[] = {\"filename\", \"filetype\", \"quality\", NULL};\n+ static char *kwlist[] = {\"filename\", \"filetype\", \"quality\", \"img_timeout\", NULL};\n char *filename;\n wchar_t fancy_filename[256];\n int filetype = IS_IMG_JPG;\n unsigned int quality = 100;\n-\n- if (!PyArg_ParseTupleAndKeywords(args, kwds, \"s|iI\", kwlist, &filename, &filetype, &quality)) {\n+ unsigned int img_timeout = IMG_TIMEOUT;\n+\n+ if (!PyArg_ParseTupleAndKeywords(args, kwds, \"s|iII\", kwlist, &filename, &filetype, &quality, &img_timeout)) {\n return NULL;\n }\n \n@@ -222,7 +223,7 @@\n char *mem;\n INT image_id;\n \n- ret = get_next_image(self, &mem, &image_id);\n+ ret = get_next_image(self, img_timeout, &mem, &image_id);\n if (ret) {\n \/* Exception set, return *\/\n return NULL;\n@@ -265,8 +266,14 @@\n int ret;\n char *mem;\n INT image_id;\n-\n- ret = get_next_image(self, &mem, &image_id);\n+ static char *kwlist[] = {\"img_timeout\", NULL};\n+ unsigned int img_timeout = IMG_TIMEOUT;\n+\n+ if (!PyArg_ParseTupleAndKeywords(args, kwds, \"|I\", kwlist, &img_timeout)) {\n+ return NULL;\n+ }\n+ \n+ ret = get_next_image(self, img_timeout, &mem, &image_id);\n if (ret) {\n \/* Exception set, return *\/\n return NULL;\n@@ -381,14 +388,15 @@\n \" IDSError: An unknown error occured in the uEye SDK.\"\n },\n {\"next_save\", (PyCFunction) ids_core_Camera_next_save, METH_VARARGS | METH_KEYWORDS,\n- \"next_save(filename [, filetype=ids_core.FILETYPE_JPG, quality=100]) -> metadata\\n\\n\"\n+ \"next_save(filename [, filetype=ids_core.FILETYPE_JPG, quality=100, img_timeout=12000]) -> metadata\\n\\n\"\n \"Saves next available image.\\n\\n\"\n \"Using the uEye SDK image saving functions to save the next available\\n\"\n \"image to disk. Blocks until image is available, or timeout occurs.\\n\\n\"\n \"Arguments:\\n\"\n \" filename: File to save image to.\\n\"\n \" filetype: Filetype to save as, one of ids_core.FILETYPE_*\\n\"\n- \" quality: Image quality for JPEG and PNG, with 100 as maximum quality\\n\\n\"\n+ \" quality: Image quality for JPEG and PNG, with 100 as maximum quality\\n\"\n+ \" img_timeout: Image capture timeout in ms (defult 12000)\\n\\n\"\n \"Returns:\\n\"\n \" Dictionary containing image metadata. Timestamp is provided in UTC.\\n\\n\"\n \"Raises:\\n\"\n@@ -396,12 +404,14 @@\n \" IDSTimeoutError: An image was not available within the timeout.\\n\"\n \" IDSError: An unknown error occured in the uEye SDK.\"\n },\n- {\"next\", (PyCFunction) ids_core_Camera_next, METH_VARARGS,\n- \"next() -> image, metadata\\n\\n\"\n+ {\"next\", (PyCFunction) ids_core_Camera_next, METH_VARARGS | METH_KEYWORDS,\n+ \"next(img_timeout=12000) -> image, metadata\\n\\n\"\n \"Gets next available image.\\n\\n\"\n \"Gets the next available image from the camera as a Numpy array\\n\"\n- \"Blocks until image is available, or timeout occurs.\\n\\n\"\n- \"Returns:\\n\"\n+ \"Blocks until image is available, or timeout occurs.\\n\"\n+ \"Arguments:\\n\"\n+ \" img_timeout: Image capture timeout in ms (defult 12000)\\n\\n\"\n+ \"Returns:\\n\"\n \" (image, metadata) tuple, where image is a Numpy array containing\\n\"\n \" the image, and metadata is a dictionary containing image metadata.\\n\"\n \" Timestamp is provided as a UTC datetime object\\n\\n\"\n"} {"commit":"45aa071ad2f897f6a516567b85ffb5e929b6cc65","subject":"TS-554 Minor cosmetic cleanup","message":"TS-554 Minor cosmetic cleanup\n\ngit-svn-id: 2dd0c813ec5e66d7196e5ee63433c56c88d5b4b7@1038215 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"bryancall\/trafficserver,chenglongwei\/trafficserver,persiaAziz\/trafficserver,bryancall\/trafficserver,vmamidi\/trafficserver,clearswift\/trafficserver,chitianhao\/trafficserver,vmamidi\/trafficserver,clearswift\/trafficserver,duke8253\/trafficserver,reveller\/trafficserver,taoyunxing\/trafficserver,chitianhao\/trafficserver,SolidWallOfCode\/trafficserver,chenglongwei\/trafficserver,davidbz\/trafficserver,clearswift\/trafficserver,chitianhao\/trafficserver,davidbz\/trafficserver,dyrock\/trafficserver,chenglongwei\/trafficserver,pbchou\/trafficserver,bryancall\/trafficserver,rpufky\/trafficserver,persiaAziz\/trafficserver,vmamidi\/trafficserver,chitianhao\/trafficserver,duke8253\/trafficserver,clearswift\/trafficserver,rahmalik\/trafficserver,persiaAziz\/trafficserver,rahmalik\/trafficserver,pbchou\/trafficserver,PSUdaemon\/trafficserver,clearswift\/trafficserver,davidbz\/trafficserver,dyrock\/trafficserver,taoyunxing\/trafficserver,persiaAziz\/trafficserver,rpufky\/trafficserver,davidbz\/trafficserver,pbchou\/trafficserver,chenglongwei\/trafficserver,taoyunxing\/trafficserver,chenglongwei\/trafficserver,clearswift\/trafficserver,chitianhao\/trafficserver,PSUdaemon\/trafficserver,pbchou\/trafficserver,PSUdaemon\/trafficserver,duke8253\/trafficserver,PSUdaemon\/trafficserver,PSUdaemon\/trafficserver,reveller\/trafficserver,persiaAziz\/trafficserver,davidbz\/trafficserver,rahmalik\/trafficserver,rpufky\/trafficserver,bryancall\/trafficserver,taoyunxing\/trafficserver,persiaAziz\/trafficserver,bryancall\/trafficserver,taoyunxing\/trafficserver,reveller\/trafficserver,clearswift\/trafficserver,taoyunxing\/trafficserver,vmamidi\/trafficserver,duke8253\/trafficserver,rahmalik\/trafficserver,rpufky\/trafficserver,bryancall\/trafficserver,rpufky\/trafficserver,rahmalik\/trafficserver,PSUdaemon\/trafficserver,pbchou\/trafficserver,chenglongwei\/trafficserver,reveller\/trafficserver,pbchou\/trafficserver,vmamidi\/trafficserver,rpufky\/trafficserver,rahmalik\/trafficserver,clearswift\/trafficserver,dyrock\/trafficserver,taoyunxing\/trafficserver,rpufky\/trafficserver,PSUdaemon\/trafficserver,rpufky\/trafficserver,duke8253\/trafficserver,taoyunxing\/trafficserver,SolidWallOfCode\/trafficserver,reveller\/trafficserver,SolidWallOfCode\/trafficserver,SolidWallOfCode\/trafficserver,chitianhao\/trafficserver,reveller\/trafficserver,davidbz\/trafficserver,persiaAziz\/trafficserver,SolidWallOfCode\/trafficserver,duke8253\/trafficserver,dyrock\/trafficserver,rahmalik\/trafficserver,duke8253\/trafficserver,chenglongwei\/trafficserver,clearswift\/trafficserver,vmamidi\/trafficserver,persiaAziz\/trafficserver,PSUdaemon\/trafficserver,SolidWallOfCode\/trafficserver,chitianhao\/trafficserver,reveller\/trafficserver,rahmalik\/trafficserver,PSUdaemon\/trafficserver,reveller\/trafficserver,dyrock\/trafficserver,SolidWallOfCode\/trafficserver,rpufky\/trafficserver,reveller\/trafficserver,dyrock\/trafficserver,rahmalik\/trafficserver,taoyunxing\/trafficserver,dyrock\/trafficserver,chenglongwei\/trafficserver","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- iocore\/net\/P_SSLNetProcessor.h\n+++ iocore\/net\/P_SSLNetProcessor.h\n@@ -67,9 +67,10 @@\n int initSSLServerCTX(SslConfigParams * param,\n SSL_CTX * ctx, char *serverCertPtr, char *serverKeyPtr, bool defaultEnabled);\n \n- SSL_CTX *getSSL_CTX(void) const {return (ctx); }\n- SSL_CTX *getClientSSL_CTX(void) const { return (client_ctx); }\n- int getAcceptPort() { return (accept_port_number); }\n+ SSL_CTX *getSSL_CTX(void) const {return ctx; }\n+ SSL_CTX *getClientSSL_CTX(void) const { return client_ctx; }\n+ int getAcceptPort() { return accept_port_number; }\n+\n static void logSSLError(const char *errStr = \"\", int critical = 1);\n \n SSLNetProcessor()\n"} {"commit":"cb61af38e4b21a9eb088fa2d1691575959932787","subject":"Remove unnecessary ctor of Deferred","message":"Remove unnecessary ctor of Deferred\n","repos":"codemercenary\/autowiring,leapmotion\/autowiring,leapmotion\/autowiring,codemercenary\/autowiring,codemercenary\/autowiring,leapmotion\/autowiring,leapmotion\/autowiring,codemercenary\/autowiring,codemercenary\/autowiring,leapmotion\/autowiring,leapmotion\/autowiring,codemercenary\/autowiring","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- autowiring\/Deferred.h\n+++ autowiring\/Deferred.h\n@@ -1,7 +1,6 @@\n \/\/ Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.\n #pragma once\n \n-class CoreThread;\n class DispatchQueue;\n \n \/\/\/ <summary>\n@@ -13,6 +12,5 @@\n \/\/\/ <\/remarks>\n class Deferred {\n public:\n- Deferred(CoreThread* pThread) {}\n Deferred(DispatchQueue* pQueue) {}\n };\n"} {"commit":"b650f4bc8e04662493546c8ab2ab0fbca1081dac","subject":"Move the lhlo dialect into its own directory.","message":"Move the lhlo dialect into its own directory.\n\nAlso remove it from registerAllMhloDialects and make registrations explicit.\n\nPiperOrigin-RevId: 412411838\n","repos":"iree-org\/iree,iree-org\/iree,google\/iree,google\/iree,google\/iree,iree-org\/iree,iree-org\/iree,google\/iree,google\/iree,google\/iree,iree-org\/iree,iree-org\/iree,google\/iree,iree-org\/iree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- iree\/tools\/init_xla_dialects.h\n+++ iree\/tools\/init_xla_dialects.h\n@@ -12,7 +12,6 @@\n \n #include \"mlir-hlo\/Dialect\/mhlo\/IR\/chlo_ops.h\"\n #include \"mlir-hlo\/Dialect\/mhlo\/IR\/hlo_ops.h\"\n-#include \"mlir-hlo\/Dialect\/mhlo\/IR\/lhlo_ops.h\"\n #include \"mlir\/IR\/Dialect.h\"\n \n namespace mlir {\n@@ -21,7 +20,6 @@\n inline void registerXLADialects(DialectRegistry ®istry) {\n \/\/ clang-format off\n registry.insert<mlir::chlo::HloClientDialect,\n- mlir::lmhlo::LmhloDialect,\n mlir::mhlo::MhloDialect>();\n \/\/ clang-format on\n }\n"} {"commit":"7a2e3372eef4d8eee8ee140f517a309dc7065887","subject":"link: Increase cold reset hibernate time to 1 second","message":"link: Increase cold reset hibernate time to 1 second\n\nThis gives VDDC more time to bleed out before the system reboots.\n\nThis will require FAFT changes to compensate for the longer cold reset time.\n\nBUG=chrome-os-partner:16600\nBRANCH=link\nTEST=from ec console, 'reboot cold' should take a second.\n\nChange-Id: I7e0e901958593262868151642560296f0c5496a7\nSigned-off-by: Randall Spangler <62698fdbb84d1779579ee80c3f39fac22017e5bc@chromium.org>\nReviewed-on: https:\/\/gerrit.chromium.org\/gerrit\/39515\nReviewed-by: Bill Richardson <129945214b1d548d8e49b6c29c43094f8c78057f@chromium.org>\n","repos":"mtk09422\/chromiumos-platform-ec,akappy7\/ChromeOS_EC_LED_Diagnostics,thehobn\/ec,coreboot\/chrome-ec,coreboot\/chrome-ec,longsleep\/ec,eatbyte\/chromium-ec,fourier49\/BZ_DEV_EC,akappy7\/ChromeOS_EC_LED_Diagnostics,thehobn\/ec,fourier49\/BIZ_EC,fourier49\/BIZ_EC,mtk09422\/chromiumos-platform-ec,coreboot\/chrome-ec,md5555\/ec,alterapraxisptyltd\/chromium-ec,md5555\/ec,mtk09422\/chromiumos-platform-ec,gelraen\/cros-ec,alterapraxisptyltd\/chromium-ec,fourier49\/BIZ_EC,coreboot\/chrome-ec,md5555\/ec,fourier49\/BZ_DEV_EC,coreboot\/chrome-ec,gelraen\/cros-ec,longsleep\/ec,fourier49\/BZ_DEV_EC,fourier49\/BIZ_EC,thehobn\/ec,akappy7\/ChromeOS_EC_LED_Diagnostics,coreboot\/chrome-ec,longsleep\/ec,fourier49\/BZ_DEV_EC,longsleep\/ec,alterapraxisptyltd\/chromium-ec,akappy7\/ChromeOS_EC_LED_Diagnostics,thehobn\/ec,md5555\/ec,akappy7\/ChromeOS_EC_LED_Diagnostics,alterapraxisptyltd\/chromium-ec,eatbyte\/chromium-ec,gelraen\/cros-ec,mtk09422\/chromiumos-platform-ec,eatbyte\/chromium-ec,eatbyte\/chromium-ec,gelraen\/cros-ec","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- chip\/lm4\/system.c\n+++ chip\/lm4\/system.c\n@@ -37,7 +37,7 @@\n * EC itself, but we need a longer delay to ensure the rest of the components\n * on the same power rail are reset and 5VALW has dropped.\n *\/\n-#define HIB_RESET_USEC 200000\n+#define HIB_RESET_USEC 1000000\n \n \/**\n * Wait for a write to commit to a hibernate register.\n"} {"commit":"40685a0bcb4d46da58c67d72edaf946678415a22","subject":"Update screen.h","message":"Update screen.h\n\nUpdate 3.1","repos":"TheJJ100100\/Q-OS,TheJJ100100\/Q-OS,TheJJ100100\/Q-OS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/inc\/screen.h\n+++ kernel\/inc\/screen.h\n@@ -1,131 +1,34 @@\n-\/\/This file has most of the C functions for Q OS at the moment\n-\/\/I will be moving functions into seperate files later [eta:2 months]\n-\n+\/\/make sure that we don't duplicate the code\n #ifndef SCREEN_H\n #define SCREEN_H\n-#include \"types.h\"\n+\n+\/\/include dependent files for screen.c\n #include \"system.h\"\n #include \"string.h\"\n-\/\/Variables for the kernel functions\n-uint8 writing = 0;\n-uint8 progexit = 0;\n-uint8 layout = 0;\n-uint8 ctrl = 0;\n-uint8 typingCmd = 0;\n-uint8 startCmdY = 0;\n-uint8 startCmdX = 0;\n-uint8 newCmd = 0;\n-string writerContents = \"Welcome to the Writer program. Start typing to modify this file. Anything you type will override the current contents of the file.\";\n \n-\/\/Variables for screen.h functions\n-int cursorX = 0, cursorY = 0;\n-const uint8 sw = 80,sh = 26,sd = 2; \/\/define the screen width, height, and depth.\n-void clearLine(uint8 from,uint8 to)\n-{\n- uint16 i = sw * from * sd;\n- string vidmem=(string)0xb8000;\n- for(i;i<(sw*to*sd);i++)\n- {\n- vidmem[i] = 0x0;\n- }\n-}\n-void updateCursor()\n-{\n- unsigned temp;\n+\/\/define variables for kernel.c\n+uint8 writing; \n+uint8 progexit; \n+uint8 layout; \n+uint8 ctrl; \n+uint8 typingCmd; \n+uint8 startCmdY; \n+uint8 startCmdX; \n+uint8 newCmd;\n+string writerContents;\n \n- temp = cursorY * sw + cursorX; \/\/ Position = (y * width) + x\n+\/\/define variables for screen.c\n+int cursorX, cursorY;\n+const uint8 sw, sh, sd;\n \n- outportb(0x3D4, 14); \/\/ CRT Control Register to Select Cursor Location\n- outportb(0x3D5, temp >> 8); \/\/ ASM to send the high byte across the bus\n- outportb(0x3D4, 15); \/\/ Another CRT Control Register to Select Send Low byte\n- outportb(0x3D5, temp); \/\/ Use ASM outportb function again to send the Low byte of the cursor location\n-}\n-void clearScreen()\n-{\n- clearLine(0,sh-1);\n- cursorX = 0;\n- cursorY = 0;\n- updateCursor();\n-}\n+\/\/define functions for screen.c\n+void clearLine(uint8 from,uint8 to);\n+void updateCursor();\n+void clearScreen();\n+void scrollUp(uint8 lineNumber);\n+void newLineCheck();\n+void printch(char c,int b);\n+void print (string ch,int bh);\n \n-void scrollUp(uint8 lineNumber)\n-{\n- string vidmem = (string)0xb8000;\n- uint16 i = 0;\n- clearLine(0,lineNumber-1); \n- for (i;i<sw*(sh-1)*2;i++)\n- {\n- vidmem[i] = vidmem[i+sw*2*lineNumber];\n- }\n- clearLine(sh-1-lineNumber,sh-1);\n- if((cursorY - lineNumber) < 0 ) \n- {\n- cursorY = 0;\n- cursorX = 0;\n- } \n- else \n- {\n- cursorY -= lineNumber;\n- }\n- updateCursor();\n-}\n-\n-\n-void newLineCheck()\n-{\n- if(cursorY >=sh-1)\n- {\n- scrollUp(1);\n- }\n-}\n-\n-void printch(char c,int b)\n-{\n- string vidmem = (string) 0xb8000; \n- switch(c)\n- {\n- case (0x08):\n- if(cursorX > 0) \n- {\n-\t cursorX--;\t\t\t\t\t\t\t\t\t\n- vidmem[(cursorY * sw + cursorX)*sd]=0x00;\t \n-\t }\n-\t break;\n- \/* case (0x09):\n- cursorX = (cursorX + 8) & ~(8 - 1); \n- break;*\/\n- case ('\\r'):\n- cursorX = 0;\n- break;\n- case ('\\n'):\n- cursorX = 0;\n- cursorY++;\n- break;\n- default:\n- vidmem [((cursorY * sw + cursorX))*sd] = c;\n- vidmem [((cursorY * sw + cursorX))*sd+1] = b;\n- cursorX++; \n- break;\n-\t\n- }\n- if(cursorX >= sw) \n- {\n- cursorX = 0; \n- cursorY++; \n- }\n- updateCursor();\n- newLineCheck();\n-}\n-\n-void print (string ch,int bh)\n-{\n- uint16 i = 0;\n- uint8 length = strlength(ch)-1; \n- for(i;i<length;i++)\n- {\n- printch(ch[i],bh);\n- }\n-}\n-\n+\/\/end the if statment at the start of the file\n #endif\n-\n"} {"commit":"d8a9e0da79d63ecd92dfe5fc06ecaf0c07ab777e","subject":"Scheduler is working!","message":"Scheduler is working!\n\nNeeded to enable interrupts in the EFLAGS register for new threads.\n","repos":"zenhack\/zero,zenhack\/zero,zenhack\/zero","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- kernel\/x86\/thread.c\n+++ kernel\/x86\/thread.c\n@@ -5,6 +5,11 @@\n #include <kernel\/port\/panic.h>\n \n #include <kernel\/port\/string.h>\n+\n+\/* See [intel\/1\/3.4.3] *\/\n+#define EFLAGS_ALWAYS1 (1<<1)\n+#define EFLAGS_IF (1<<9)\n+\n \n typedef struct NewStack NewStack;\n struct NewStack {\n@@ -41,10 +46,10 @@\n \n \tstack_begin->saved_ctx.eip = (uint32_t)entry;\n \tstack_begin->saved_ctx.cs = SEGOFF(KCODE_SEGMENT);\n-\t\/* This is the on-boot value of the eflags register [intel\/3\/3.4.3]. We\n-\t * haven't done anything to modify it, so let's give new threads the\n-\t * same value: *\/\n-\tstack_begin->saved_ctx.eflags = 0x2;\n+\t\/* The on-boot value of eflags just has the one reserved bit set. The\n+\t * only modification we've made is to enable interrupts\n+\t * [intel\/1\/3.4.3]: *\/\n+\tstack_begin->saved_ctx.eflags = EFLAGS_ALWAYS1 | EFLAGS_IF;\n \tstack_begin->thread_ret = 0;\n \tstack_begin->thread_arg = (uint32_t)data;\n \tstack_begin->ebp_terminator = 0;\n"} {"commit":"f1f95787d13a41fd72db03c5db91471dc7a1f6d7","subject":"Fix not incrementing buffer pointer when reading a file","message":"Fix not incrementing buffer pointer when reading a file","repos":"deweerdt\/h2o,tamediadigital\/h2o,cwyang\/h2o,nkmideb\/h2o-server,tamediadigital\/h2o,rayrapetyan\/h2o,cubicdaiya\/h2o,lkwg82\/h2o,lkwg82\/h2o,h2o\/h2o,h2o\/h2o,cwyang\/h2o,i110\/h2o,cwyang\/h2o,cwyang\/h2o,lkwg82\/h2o,deweerdt\/h2o,zlm2012\/h2o,lkwg82\/h2o,tamediadigital\/h2o,deweerdt\/h2o,i110\/h2o,devnexen\/h2o,h2o\/h2o,devnexen\/h2o,i110\/h2o,deweerdt\/h2o,rayrapetyan\/h2o,deweerdt\/h2o,ntabee\/h2o-tile,devnexen\/h2o,cubicdaiya\/h2o,h2o\/h2o,rayrapetyan\/h2o,i110\/h2o,rayrapetyan\/h2o,tamediadigital\/h2o,zlm2012\/h2o,cwyang\/h2o,zlm2012\/h2o,lkwg82\/h2o,devnexen\/h2o,devnexen\/h2o,nkmideb\/h2o-server,cubicdaiya\/h2o,nkmideb\/h2o-server,ntabee\/h2o-tile,yannick\/h2o,yannick\/h2o,cubicdaiya\/h2o,rayrapetyan\/h2o,tamediadigital\/h2o,devnexen\/h2o,yannick\/h2o,ntabee\/h2o-tile,i110\/h2o,lkwg82\/h2o,rayrapetyan\/h2o,rayrapetyan\/h2o,ntabee\/h2o-tile,devnexen\/h2o,cwyang\/h2o,cubicdaiya\/h2o,h2o\/h2o,cwyang\/h2o,h2o\/h2o,rayrapetyan\/h2o,lkwg82\/h2o,zlm2012\/h2o,cubicdaiya\/h2o,rayrapetyan\/h2o,yannick\/h2o,i110\/h2o,nkmideb\/h2o-server,rayrapetyan\/h2o,deweerdt\/h2o,yannick\/h2o,yannick\/h2o,nkmideb\/h2o-server,tamediadigital\/h2o,ntabee\/h2o-tile,h2o\/h2o,i110\/h2o,zlm2012\/h2o,cwyang\/h2o,zlm2012\/h2o,devnexen\/h2o,nkmideb\/h2o-server,deweerdt\/h2o,tamediadigital\/h2o,yannick\/h2o,cubicdaiya\/h2o,lkwg82\/h2o,ntabee\/h2o-tile,i110\/h2o,h2o\/h2o,nkmideb\/h2o-server,h2o\/h2o,zlm2012\/h2o,zlm2012\/h2o,lkwg82\/h2o,deweerdt\/h2o,ntabee\/h2o-tile,ntabee\/h2o-tile,cubicdaiya\/h2o,nkmideb\/h2o-server,tamediadigital\/h2o,tamediadigital\/h2o,yannick\/h2o,yannick\/h2o,i110\/h2o,devnexen\/h2o,zlm2012\/h2o,deweerdt\/h2o,i110\/h2o","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/handler\/configurator\/mruby.c\n+++ lib\/handler\/configurator\/mruby.c\n@@ -83,7 +83,7 @@\n }\n while (!feof(fp)) {\n buf.base = h2o_mem_realloc(buf.base, buf.len + 65536);\n- buf.len += fread(buf.base, 1, 65536, fp);\n+ buf.len += fread(buf.base + buf.len, 1, 65536, fp);\n if (ferror(fp)) {\n h2o_configurator_errprintf(cmd, node, \"I\/O error occurred while reading file:%s:%s\", node->data.scalar,\n strerror(errno));\n"} {"commit":"79043f1e2706042f29f9f0dd3173cf722c1777d8","subject":"Seal priv pointer in GtkRecentManager.","message":"Seal priv pointer in GtkRecentManager.\n\nsvn path=\/trunk\/; revision=20579\n","repos":"nacho\/gtk-,grubersjoe\/adwaita,Adamovskiy\/gtk,Lyude\/gtk-,jadahl\/gtk,ahodesuka\/gtk,simokivimaki\/gtk,nacho\/gtk-,nacho\/gtk-,bratsche\/gtk-,ahodesuka\/gtk,jigpu\/gtk,bratsche\/gtk-,ebassi\/gtk,ebassi\/gtk,alexlarsson\/gtk,alexlarsson\/gtk,grubersjoe\/adwaita,Adamovskiy\/gtk,Lyude\/gtk-,Lyude\/gtk-,Unity-Technologies\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,zsx\/gtk,ahodesuka\/gtk,chergert\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,Sidnioulz\/SandboxGtk,grubersjoe\/adwaita,jadahl\/gtk,msteinert\/gtk,chergert\/gtk,jessevdk\/gtk,ebassi\/gtk,davidt\/gtk,bratsche\/gtk-,jessevdk\/gtk,johne53\/MB3Gtk-2,Distrotech\/gtk2,jadahl\/gtk,davidgumberg\/gtk,johne53\/MB3Gtk-2,jessevdk\/gtk,zsx\/gtk,davidgumberg\/gtk,ahodesuka\/gtk,davidt\/gtk,Lyude\/gtk-,Lyude\/gtk-,Lyude\/gtk-,Distrotech\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,bratsche\/gtk-,alexlarsson\/gtk,ahodesuka\/gtk,jadahl\/gtk,Distrotech\/gtk,zsx\/gtk,Distrotech\/gtk2,grubersjoe\/adwaita,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk,msteinert\/gtk,Distrotech\/gtk,alexlarsson\/gtk,jigpu\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,chergert\/gtk,chipx86\/gtk,jadahl\/gtk,grubersjoe\/adwaita,simokivimaki\/gtk,Distrotech\/gtk2,johne53\/MB3Gtk-2,Sidnioulz\/SandboxGtk,alexlarsson\/gtk,jadahl\/gtk,ebassi\/gtk,zsx\/gtk,jigpu\/gtk,chergert\/gtk,Distrotech\/gtk2,simokivimaki\/gtk,grubersjoe\/adwaita,alexlarsson\/gtk,ebassi\/gtk,jigpu\/gtk,Unity-Technologies\/gtk,Lyude\/gtk-,jigpu\/gtk,alexlarsson\/gtk,Unity-Technologies\/gtk,Distrotech\/gtk2,Distrotech\/gtk,johne53\/MB3Gtk-2,msteinert\/gtk,chipx86\/gtk,jessevdk\/gtk,Unity-Technologies\/gtk,nacho\/gtk-,chergert\/gtk,bratsche\/gtk-,simokivimaki\/gtk,Adamovskiy\/gtk,msteinert\/gtk,jessevdk\/gtk,zsx\/gtk,chergert\/gtk,Adamovskiy\/gtk,chipx86\/gtk,jigpu\/gtk,simokivimaki\/gtk,Distrotech\/gtk,Lyude\/gtk-,bratsche\/gtk-,davidgumberg\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,jigpu\/gtk,johne53\/MB3Gtk-2,nacho\/gtk-,davidgumberg\/gtk,simokivimaki\/gtk,chergert\/gtk,jessevdk\/gtk,davidgumberg\/gtk,jadahl\/gtk,davidgumberg\/gtk,msteinert\/gtk,ebassi\/gtk,jadahl\/gtk,jigpu\/gtk,chipx86\/gtk,alexlarsson\/gtk,davidgumberg\/gtk,chergert\/gtk,davidt\/gtk,Distrotech\/gtk2,davidt\/gtk,msteinert\/gtk,Unity-Technologies\/gtk,Sidnioulz\/SandboxGtk,ahodesuka\/gtk,davidt\/gtk,chipx86\/gtk,davidt\/gtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkrecentmanager.h\n+++ gtk\/gtkrecentmanager.h\n@@ -87,7 +87,7 @@\n \/*< private >*\/\n GObject parent_instance;\n \n- GtkRecentManagerPrivate *priv;\n+ GtkRecentManagerPrivate *GSEAL (priv);\n };\n \n struct _GtkRecentManagerClass\n"} {"commit":"9f0e993b6094505124edf96e7a9f687829311911","subject":"styleproperty: Use the new flags for inheritance","message":"styleproperty: Use the new flags for inheritance\n\nInstead of gtk_style_param_set_inherit()\n","repos":"jadahl\/gtk,davidt\/gtk,jadahl\/gtk,davidgumberg\/gtk,Lyude\/gtk-,grubersjoe\/adwaita,msteinert\/gtk,Adamovskiy\/gtk,jigpu\/gtk,grubersjoe\/adwaita,jigpu\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,Distrotech\/gtk2,ebassi\/gtk,alexlarsson\/gtk,bratsche\/gtk-,grubersjoe\/adwaita,jadahl\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,chergert\/gtk,ebassi\/gtk,grubersjoe\/adwaita,Lyude\/gtk-,Sidnioulz\/SandboxGtk,davidt\/gtk,chergert\/gtk,Adamovskiy\/gtk,alexlarsson\/gtk,chergert\/gtk,msteinert\/gtk,jessevdk\/gtk,jigpu\/gtk,grubersjoe\/adwaita,bratsche\/gtk-,jessevdk\/gtk,bratsche\/gtk-,Sidnioulz\/SandboxGtk,bratsche\/gtk-,davidt\/gtk,jigpu\/gtk,ebassi\/gtk,jessevdk\/gtk,Distrotech\/gtk2,davidgumberg\/gtk,alexlarsson\/gtk,jadahl\/gtk,Distrotech\/gtk2,ebassi\/gtk,ahodesuka\/gtk,ahodesuka\/gtk,Lyude\/gtk-,alexlarsson\/gtk,jadahl\/gtk,jessevdk\/gtk,grubersjoe\/adwaita,Sidnioulz\/SandboxGtk,davidgumberg\/gtk,davidgumberg\/gtk,Adamovskiy\/gtk,davidt\/gtk,msteinert\/gtk,ahodesuka\/gtk,jigpu\/gtk,Sidnioulz\/SandboxGtk,ebassi\/gtk,ebassi\/gtk,alexlarsson\/gtk,msteinert\/gtk,bratsche\/gtk-,Distrotech\/gtk2,jigpu\/gtk,grubersjoe\/adwaita,grubersjoe\/adwaita,alexlarsson\/gtk,jadahl\/gtk,chergert\/gtk,Sidnioulz\/SandboxGtk,jessevdk\/gtk,ahodesuka\/gtk,chergert\/gtk,alexlarsson\/gtk,jadahl\/gtk,Adamovskiy\/gtk,Adamovskiy\/gtk,Lyude\/gtk-,jessevdk\/gtk,chergert\/gtk,Distrotech\/gtk2,davidt\/gtk,Adamovskiy\/gtk,ahodesuka\/gtk,davidt\/gtk,jadahl\/gtk,jigpu\/gtk,chergert\/gtk,ahodesuka\/gtk,davidgumberg\/gtk,jigpu\/gtk,Lyude\/gtk-,bratsche\/gtk-,msteinert\/gtk,davidgumberg\/gtk,Lyude\/gtk-,msteinert\/gtk,Lyude\/gtk-,Adamovskiy\/gtk,jessevdk\/gtk,davidgumberg\/gtk,Lyude\/gtk-,chergert\/gtk,alexlarsson\/gtk,Adamovskiy\/gtk,Sidnioulz\/SandboxGtk","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- gtk\/gtkstyleproperty.c\n+++ gtk\/gtkstyleproperty.c\n@@ -1988,8 +1988,6 @@\n static void\n gtk_style_property_init (void)\n {\n- GParamSpec *pspec;\n-\n if (G_LIKELY (properties))\n return;\n \n@@ -1999,12 +1997,17 @@\n \/* note that gtk_style_properties_register_property() calls this function,\n * so make sure we're sanely inited to avoid infloops *\/\n \n- pspec = g_param_spec_boxed (\"color\",\n- \"Foreground color\",\n- \"Foreground color\",\n- GDK_TYPE_RGBA, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n+ _gtk_style_property_register (g_param_spec_boxed (\"color\",\n+ \"Foreground color\",\n+ \"Foreground color\",\n+ GDK_TYPE_RGBA, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n \n gtk_style_properties_register_property (NULL,\n g_param_spec_boxed (\"background-color\",\n@@ -2012,54 +2015,70 @@\n \"Background color\",\n GDK_TYPE_RGBA, 0));\n \n- pspec = g_param_spec_boxed (\"font-family\",\n- \"Font family\",\n- \"Font family\",\n- G_TYPE_STRV, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- _gtk_style_property_register (pspec,\n- 0,\n+ _gtk_style_property_register (g_param_spec_boxed (\"font-family\",\n+ \"Font family\",\n+ \"Font family\",\n+ G_TYPE_STRV, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n NULL,\n NULL,\n NULL,\n font_family_parse,\n font_family_value_print,\n NULL);\n- pspec = g_param_spec_enum (\"font-style\",\n- \"Font style\",\n- \"Font style\",\n- PANGO_TYPE_STYLE,\n- PANGO_STYLE_NORMAL, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n- pspec = g_param_spec_enum (\"font-variant\",\n- \"Font variant\",\n- \"Font variant\",\n- PANGO_TYPE_VARIANT,\n- PANGO_VARIANT_NORMAL, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n+ _gtk_style_property_register (g_param_spec_enum (\"font-style\",\n+ \"Font style\",\n+ \"Font style\",\n+ PANGO_TYPE_STYLE,\n+ PANGO_STYLE_NORMAL, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n+ _gtk_style_property_register (g_param_spec_enum (\"font-variant\",\n+ \"Font variant\",\n+ \"Font variant\",\n+ PANGO_TYPE_VARIANT,\n+ PANGO_VARIANT_NORMAL, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n \/* xxx: need to parse this properly, ie parse the numbers *\/\n- pspec = g_param_spec_enum (\"font-weight\",\n- \"Font weight\",\n- \"Font weight\",\n- PANGO_TYPE_WEIGHT,\n- PANGO_WEIGHT_NORMAL, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n- pspec = g_param_spec_double (\"font-size\",\n- \"Font size\",\n- \"Font size\",\n- 0, G_MAXDOUBLE, 0, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n- pspec = g_param_spec_boxed (\"font\",\n- \"Font Description\",\n- \"Font Description\",\n- PANGO_TYPE_FONT_DESCRIPTION, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- _gtk_style_property_register (pspec,\n- 0,\n+ _gtk_style_property_register (g_param_spec_enum (\"font-weight\",\n+ \"Font weight\",\n+ \"Font weight\",\n+ PANGO_TYPE_WEIGHT,\n+ PANGO_WEIGHT_NORMAL, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n+ _gtk_style_property_register (g_param_spec_double (\"font-size\",\n+ \"Font size\",\n+ \"Font size\",\n+ 0, G_MAXDOUBLE, 0, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n+ _gtk_style_property_register (g_param_spec_boxed (\"font\",\n+ \"Font Description\",\n+ \"Font Description\",\n+ PANGO_TYPE_FONT_DESCRIPTION, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n NULL,\n unpack_font_description,\n pack_font_description,\n@@ -2067,12 +2086,17 @@\n font_description_value_print,\n NULL);\n \n- pspec = g_param_spec_boxed (\"text-shadow\",\n- \"Text shadow\",\n- \"Text shadow\",\n- GTK_TYPE_SHADOW, 0);\n- gtk_style_param_set_inherit (pspec, TRUE);\n- gtk_style_properties_register_property (NULL, pspec);\n+ _gtk_style_property_register (g_param_spec_boxed (\"text-shadow\",\n+ \"Text shadow\",\n+ \"Text shadow\",\n+ GTK_TYPE_SHADOW, 0),\n+ GTK_STYLE_PROPERTY_INHERIT,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL);\n \n gtk_style_properties_register_property (NULL,\n g_param_spec_int (\"margin-top\",\n"} {"commit":"2f970cbcffb0629e884886d7e6e30dd3b559a5d1","subject":"Adding TODOs.","message":"Adding TODOs.\n\n","repos":"lento\/cortex,davidsminor\/cortex,appleseedhq\/cortex,davidsminor\/cortex,lento\/cortex,goddardl\/cortex,hradec\/cortex,davidsminor\/cortex,davidsminor\/cortex,appleseedhq\/cortex,appleseedhq\/cortex,danieldresser\/cortex,lento\/cortex,goddardl\/cortex,hradec\/cortex,danieldresser\/cortex,goddardl\/cortex,hradec\/cortex,danieldresser\/cortex,danieldresser\/cortex","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/IECore\/LevenbergMarquardt.h\n+++ include\/IECore\/LevenbergMarquardt.h\n@@ -79,6 +79,10 @@\n \/\/\/ static T tolerance(); \/\/\/ user defined tolerance\n \/\/\/ };\n \/\/\/\n+\/\/\/ \\todo Use max iterations instead of maxCalls on the error function.\n+\/\/\/ \\todo No need for TypedData. Template on vector iterators instead.\n+\/\/\/ \\todo Consider to pass the parameter changed when building the Jacobian. Most of the problems would not affect all the\n+\/\/\/ outputs when just one parameter changes. Some space for considerable optimization there.\n template<typename T, typename ErrorFn, template<typename> class Traits = DefaultLevenbergMarquardtTraits >\n class LevenbergMarquardt : public boost::noncopyable\n {\n"} {"commit":"9406f62399a837f17bc80620eacd4865f7485e6a","subject":"opps. typo.","message":"opps. typo.\n","repos":"sdd330\/sctp-refimpl,deepak899\/sctp-refimpl,xwhuang\/sctp-refimpl,TopPano\/sctp-refimpl,TopPano\/sctp-refimpl,sctplab\/sctp-refimpl,sctplab\/sctp-refimpl,ossy-szeged\/sctp-refimpl,sdd330\/sctp-refimpl,sdd330\/sctp-refimpl,sdd330\/sctp-refimpl,gale320\/sctp-refimpl,gale320\/sctp-refimpl,sctplab\/sctp-refimpl,gale320\/sctp-refimpl,xwhuang\/sctp-refimpl,sctplab\/sctp-refimpl,timsuchanek\/sctp-refimpl,gale320\/sctp-refimpl,xwhuang\/sctp-refimpl,ossy-szeged\/sctp-refimpl,tosakanth\/sctp-refimpl,TopPano\/sctp-refimpl,deepak899\/sctp-refimpl,tosakanth\/sctp-refimpl,tosakanth\/sctp-refimpl,ossy-szeged\/sctp-refimpl,sctplab\/sctp-refimpl,deepak899\/sctp-refimpl,gale320\/sctp-refimpl,tosakanth\/sctp-refimpl,xwhuang\/sctp-refimpl,timsuchanek\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,tosakanth\/sctp-refimpl,TopPano\/sctp-refimpl,sdd330\/sctp-refimpl,sdd330\/sctp-refimpl,tosakanth\/sctp-refimpl,gale320\/sctp-refimpl,gale320\/sctp-refimpl,ossy-szeged\/sctp-refimpl,sdd330\/sctp-refimpl,TopPano\/sctp-refimpl,timsuchanek\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,xwhuang\/sctp-refimpl,TopPano\/sctp-refimpl,gale320\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,xwhuang\/sctp-refimpl,tosakanth\/sctp-refimpl,deepak899\/sctp-refimpl,deepak899\/sctp-refimpl,TopPano\/sctp-refimpl,TopPano\/sctp-refimpl,deepak899\/sctp-refimpl,timsuchanek\/sctp-refimpl,sdd330\/sctp-refimpl,TopPano\/sctp-refimpl,ossy-szeged\/sctp-refimpl,gale320\/sctp-refimpl,sdd330\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,tosakanth\/sctp-refimpl,sctplab\/sctp-refimpl,tosakanth\/sctp-refimpl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- KERN\/netinet\/sctp_timer.c\n+++ KERN\/netinet\/sctp_timer.c\n@@ -31,7 +31,7 @@\n \/* $KAME: sctp_timer.c,v 1.29 2005\/03\/06 16:04:18 itojun Exp $\t *\/\n \n #ifdef __FreeBSD__\n-#include <sys\/cdefs.h\n+#include <sys\/cdefs.h>\n __FBSDID(\"$FreeBSD: src\/sys\/netinet\/sctp_timer.c,v 1.8 2007\/03\/15 11:27:13 rrs Exp $\");\n #endif\n \n"} {"commit":"513061150be68ce32ec6cbe5be24c25c8d782bb5","subject":"ia32: VCPU only needs kernelSP on ia32","message":"ia32: VCPU only needs kernelSP on ia32\n\nx86-64 has better ways (`swapgs`) of managing per core kernel stacks.\nThis commit hides the `kernelSP` member of a `vcpu_t` under x86-64\nso as not to cause confusion and accidental attempted usage\n","repos":"cmr\/seL4,cmr\/seL4,cmr\/seL4","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/arch\/x86\/arch\/object\/vcpu.h\n+++ include\/arch\/x86\/arch\/object\/vcpu.h\n@@ -268,7 +268,7 @@\n \/* General purpose registers that we have to save and restore as they\n * are not part of the vmcs *\/\n word_t gp_registers[n_vcpu_gp_register];\n-#if CONFIG_MAX_NUM_NODES > 1\n+#if CONFIG_MAX_NUM_NODES > 1 && defined(CONFIG_ARCH_IA32)\n word_t kernelSP;\n #endif\n \n"} {"commit":"210cd3945a360962ba94d52d701e5fcbc50e9319","subject":"posix\/termios.h: update for POSIX","message":"posix\/termios.h: update for POSIX\n","repos":"micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus,micro-os-plus\/cmsis-plus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/cmsis-plus\/posix\/termios.h\n+++ include\/cmsis-plus\/posix\/termios.h\n@@ -60,15 +60,13 @@\n {\n #endif\n \n-\/\/ ----------------------------------------------------------------------------\n-\n- \/*\n- * Special Control Characters\n- *\n- * Index into c_cc[] character array.\n- *\n- *\tName\t Subscript\tEnabled by\n- *\/\n+\/\/ http:\/\/pubs.opengroup.org\/onlinepubs\/9699919799\/basedefs\/termios.h.html\n+\n+\/\/ ----------------------------------------------------------------------------\n+\n+\/\/ Special Control Characters\n+\n+\/\/ The following subscript names are for the array c_cc.\n #define\tVEOF\t\t0\t\/* ICANON *\/\n #define\tVEOL\t\t1\t\/* ICANON *\/\n #if __BSD_VISIBLE\n@@ -83,7 +81,7 @@\n #define\tVREPRINT \t6\t\/* ICANON together with IEXTEN *\/\n #define\tVERASE2 \t7\t\/* ICANON *\/\n #endif\n- \/*\t\t\t7\t ex-spare 1 *\/\n+\/\/ 7\t ex-spare 1\n #define\tVINTR\t\t8\t\/* ISIG *\/\n #define\tVQUIT\t\t9\t\/* ISIG *\/\n #define\tVSUSP\t\t10\t\/* ISIG *\/\n@@ -100,18 +98,20 @@\n #define\tVTIME\t\t17\t\/* !ICANON *\/\n #if __BSD_VISIBLE\n #define\tVSTATUS\t\t18\t\/* ICANON together with IEXTEN *\/\n- \/*\t\t\t19\t spare 2 *\/\n-#endif\n- \/* Added 2017\/08\/18 (LNP) *\/\n+\/\/ 19\t spare 2\n+#endif\n+\n+\/\/ [LNP] Added 2017-08-18\n #define VTIME_MS 19 \/* !ICANON *\/\n- \/* End added *\/\n+\/\/ [LNP] End added\n+\n #define\tNCCS\t\t20\n \n #define\t_POSIX_VDISABLE\t0xff\n \n- \/*\n- * Input flags - software input processing\n- *\/\n+\/\/ Input Modes\n+\n+\/\/ The c_iflag field describes the basic terminal input control:\n #define\tIGNBRK\t\t0x00000001\t\/* ignore BREAK condition *\/\n #define\tBRKINT\t\t0x00000002\t\/* map BREAK to SIGINTR *\/\n #define\tIGNPAR\t\t0x00000004\t\/* ignore (discard) parity errors *\/\n@@ -123,16 +123,15 @@\n #define\tICRNL\t\t0x00000100\t\/* map CR to NL (ala CRMOD) *\/\n #define\tIXON\t\t0x00000200\t\/* enable output flow control *\/\n #define\tIXOFF\t\t0x00000400\t\/* enable input flow control *\/\n-#if __BSD_VISIBLE\n #define\tIXANY\t\t0x00000800\t\/* any char will restart after stop *\/\n+#if __BSD_VISIBLE\n #define\tIMAXBEL\t\t0x00002000\t\/* ring bell on input queue full *\/\n #endif\n \n- \/*\n- * Output flags - software output processing\n- *\/\n+\/\/ Output Modes\n+\n+\/\/ The c_oflag field specifies the system treatment of output:\n #define\tOPOST\t\t0x00000001\t\/* enable following output processing *\/\n-#if __BSD_VISIBLE\n #define\tONLCR\t\t0x00000002\t\/* map NL to CR-NL (ala CRMOD) *\/\n #define\tTABDLY\t\t0x00000004\t\/* tab delay mask *\/\n #define\t TAB0\t 0x00000000\t \/* no tab delay and expansion *\/\n@@ -141,71 +140,22 @@\n #define\tOCRNL\t\t0x00000010\t\/* map CR to NL on output *\/\n #define\tONOCR\t\t0x00000020\t\/* no CR output at column 0 *\/\n #define\tONLRET\t\t0x00000040\t\/* NL performs CR function *\/\n-#endif\n-\n- \/*\n- * Control flags - hardware control of terminal\n- *\/\n-#if __BSD_VISIBLE\n-#define\tCIGNORE\t\t0x00000001\t\/* ignore control flags *\/\n-#endif\n-#define\tCSIZE\t\t0x00000300\t\/* character size mask *\/\n-#define\t CS5\t\t 0x00000000\t \/* 5 bits (pseudo) *\/\n-#define\t CS6\t\t 0x00000100\t \/* 6 bits *\/\n-#define\t CS7\t\t 0x00000200\t \/* 7 bits *\/\n-#define\t CS8\t\t 0x00000300\t \/* 8 bits *\/\n-#define\tCSTOPB\t\t0x00000400\t\/* send 2 stop bits *\/\n-#define\tCREAD\t\t0x00000800\t\/* enable receiver *\/\n-#define\tPARENB\t\t0x00001000\t\/* parity enable *\/\n-#define\tPARODD\t\t0x00002000\t\/* odd parity, else even *\/\n-#define\tHUPCL\t\t0x00004000\t\/* hang up on last close *\/\n-#define\tCLOCAL\t\t0x00008000\t\/* ignore modem status lines *\/\n-#if __BSD_VISIBLE\n-#define\tCCTS_OFLOW\t0x00010000\t\/* CTS flow control of output *\/\n-#define\tCRTSCTS\t\t(CCTS_OFLOW | CRTS_IFLOW)\n-#define\tCRTS_IFLOW\t0x00020000\t\/* RTS flow control of input *\/\n-#define\tCDTR_IFLOW\t0x00040000\t\/* DTR flow control of input *\/\n-#define\tCDSR_OFLOW\t0x00080000\t\/* DSR flow control of output *\/\n-#define\tCCAR_OFLOW\t0x00100000\t\/* DCD flow control of output *\/\n-#endif\n-\n- \/*\n- * \"Local\" flags - dumping ground for other state\n- *\n- * Warning: some flags in this structure begin with\n- * the letter \"I\" and look like they belong in the\n- * input flag.\n- *\/\n-\n-#if __BSD_VISIBLE\n-#define\tECHOKE\t\t0x00000001\t\/* visual erase for line kill *\/\n-#endif\n-#define\tECHOE\t\t0x00000002\t\/* visually erase chars *\/\n-#define\tECHOK\t\t0x00000004\t\/* echo NL after line kill *\/\n-#define\tECHO\t\t0x00000008\t\/* enable echoing *\/\n-#define\tECHONL\t\t0x00000010\t\/* echo NL even if ECHO is off *\/\n-#if __BSD_VISIBLE\n-#define\tECHOPRT\t\t0x00000020\t\/* visual erase mode for hardcopy *\/\n-#define\tECHOCTL \t0x00000040\t\/* echo control chars as ^(Char) *\/\n-#endif\n-#define\tISIG\t\t0x00000080\t\/* enable signals INTR, QUIT, [D]SUSP *\/\n-#define\tICANON\t\t0x00000100\t\/* canonicalize input lines *\/\n-#if __BSD_VISIBLE\n-#define\tALTWERASE\t0x00000200\t\/* use alternate WERASE algorithm *\/\n-#endif\n-#define\tIEXTEN\t\t0x00000400\t\/* enable DISCARD and LNEXT *\/\n-#define\tEXTPROC 0x00000800 \/* external processing *\/\n-#define\tTOSTOP\t\t0x00400000\t\/* stop background jobs from output *\/\n-#if __BSD_VISIBLE\n-#define\tFLUSHO\t\t0x00800000\t\/* output being flushed (state) *\/\n-#define\tNOKERNINFO\t0x02000000\t\/* no kernel output from VSTATUS *\/\n-#define\tPENDIN\t\t0x20000000\t\/* XXX retype pending input (state) *\/\n-#endif\n-#define\tNOFLSH\t\t0x80000000\t\/* don't flush after interrupt *\/\n-\n- \/*\n- * Standard speeds\n- *\/\n+\n+\/\/ TODO: add\n+\/\/ OFILL\n+\/\/ NLDLY\n+\/\/ CRDLY\n+\/\/ TABDLY\n+\/\/ BSDLY\n+\/\/ VTDLY\n+\/\/ FFDLY\n+\n+\/\/ Baud Rate Selection\n+\n+\/\/ The input and output baud rates are stored in the termios structure.\n+\/\/ These are the valid values for objects of type speed_t. The following\n+\/\/ values shall be defined, but not all baud rates need be supported by\n+\/\/ the underlying hardware.\n #define\tB0\t0\n #define\tB50\t50\n #define\tB75\t75\n@@ -236,9 +186,69 @@\n #define\tEXTB\t38400\n #endif\n \n- \/*\n- * Commands passed to tcsetattr() for setting the termios structure.\n- *\/\n+\/\/ Control Modes\n+\n+\/\/ The c_cflag field describes the hardware control of the terminal;\n+\/\/ not all values specified are required to be supported by the\n+\/\/ underlying hardware.\n+#if __BSD_VISIBLE\n+#define CIGNORE 0x00000001 \/* ignore control flags *\/\n+#endif\n+#define CSIZE 0x00000300 \/* character size mask *\/\n+#define CS5 0x00000000 \/* 5 bits (pseudo) *\/\n+#define CS6 0x00000100 \/* 6 bits *\/\n+#define CS7 0x00000200 \/* 7 bits *\/\n+#define CS8 0x00000300 \/* 8 bits *\/\n+#define CSTOPB 0x00000400 \/* send 2 stop bits *\/\n+#define CREAD 0x00000800 \/* enable receiver *\/\n+#define PARENB 0x00001000 \/* parity enable *\/\n+#define PARODD 0x00002000 \/* odd parity, else even *\/\n+#define HUPCL 0x00004000 \/* hang up on last close *\/\n+#define CLOCAL 0x00008000 \/* ignore modem status lines *\/\n+#if __BSD_VISIBLE\n+#define CCTS_OFLOW 0x00010000 \/* CTS flow control of output *\/\n+#define CRTSCTS (CCTS_OFLOW | CRTS_IFLOW)\n+#define CRTS_IFLOW 0x00020000 \/* RTS flow control of input *\/\n+#define CDTR_IFLOW 0x00040000 \/* DTR flow control of input *\/\n+#define CDSR_OFLOW 0x00080000 \/* DSR flow control of output *\/\n+#define CCAR_OFLOW 0x00100000 \/* DCD flow control of output *\/\n+#endif\n+\n+\/\/ Local Modes\n+\n+\/\/ The c_lflag field of the argument structure is used to control\n+\/\/ various terminal functions.\n+\/\/ Warning: some flags in this structure begin with the letter \"I\"\n+\/\/ and look like they belong in the input flag.\n+#if __BSD_VISIBLE\n+#define ECHOKE 0x00000001 \/* visual erase for line kill *\/\n+#endif\n+#define ECHOE 0x00000002 \/* visually erase chars *\/\n+#define ECHOK 0x00000004 \/* echo NL after line kill *\/\n+#define ECHO 0x00000008 \/* enable echoing *\/\n+#define ECHONL 0x00000010 \/* echo NL even if ECHO is off *\/\n+#if __BSD_VISIBLE\n+#define ECHOPRT 0x00000020 \/* visual erase mode for hardcopy *\/\n+#define ECHOCTL 0x00000040 \/* echo control chars as ^(Char) *\/\n+#endif\n+#define ISIG 0x00000080 \/* enable signals INTR, QUIT, [D]SUSP *\/\n+#define ICANON 0x00000100 \/* canonicalize input lines *\/\n+#if __BSD_VISIBLE\n+#define ALTWERASE 0x00000200 \/* use alternate WERASE algorithm *\/\n+#endif\n+#define IEXTEN 0x00000400 \/* enable DISCARD and LNEXT *\/\n+#define EXTPROC 0x00000800 \/* external processing *\/\n+#define TOSTOP 0x00400000 \/* stop background jobs from output *\/\n+#if __BSD_VISIBLE\n+#define FLUSHO 0x00800000 \/* output being flushed (state) *\/\n+#define NOKERNINFO 0x02000000 \/* no kernel output from VSTATUS *\/\n+#define PENDIN 0x20000000 \/* XXX retype pending input (state) *\/\n+#endif\n+#define NOFLSH 0x80000000 \/* don't flush after interrupt *\/\n+\n+\/\/ Attribute Selection\n+\n+\/\/ The following symbolic constants are for use with tcsetattr().\n #define TCSANOW 0 \/* make change immediate *\/\n #define TCSADRAIN 1 \/* drain output, then change *\/\n #define TCSAFLUSH 2 \/* drain output, flush input *\/\n@@ -246,9 +256,14 @@\n #define TCSASOFT 0x10 \/* flag - don't alter h.w. state *\/\n #endif\n \n+\/\/ Line Control\n+\n+\/\/ The following symbolic constants are for use with tcflush().\n #define TCIFLUSH 1\n #define TCOFLUSH 2\n #define TCIOFLUSH 3\n+\n+\/\/ The following symbolic constants are for use with tcflow().\n #define TCOOFF 1\n #define TCOON 2\n #define TCIOFF 3\n@@ -256,17 +271,18 @@\n \n \/\/ ----------------------------------------------------------------------------\n \n- typedef unsigned int tcflag_t;\n- typedef unsigned char cc_t;\n- typedef unsigned int speed_t;\n+ typedef unsigned int tcflag_t; \/\/ Terminal modes.\n+ typedef unsigned char cc_t; \/\/ terminal special characters.\n+ typedef unsigned int speed_t; \/\/ Terminal baud rates.\n \n struct termios\n {\n- tcflag_t c_iflag; \/* input flags *\/\n- tcflag_t c_oflag; \/* output flags *\/\n- tcflag_t c_cflag; \/* control flags *\/\n- tcflag_t c_lflag; \/* local flags *\/\n+ tcflag_t c_iflag; \/* input modes *\/\n+ tcflag_t c_oflag; \/* output modes *\/\n+ tcflag_t c_cflag; \/* control modes *\/\n+ tcflag_t c_lflag; \/* local modes *\/\n cc_t c_cc[NCCS]; \/* control chars *\/\n+\n speed_t c_ispeed; \/* input speed *\/\n speed_t c_ospeed; \/* output speed *\/\n };\n"} {"commit":"7e1715270f75ca96850ccff60d014937166ab86c","subject":"And remove the flock default from here too..","message":"And remove the flock default from here too..\n\n--HG--\nbranch : HEAD\n","repos":"jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,jkerihuel\/dovecot,dscho\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,dscho\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/master\/master-settings.c\n+++ src\/master\/master-settings.c\n@@ -159,7 +159,7 @@\n \tMEMBER(mail_read_mmaped) FALSE,\n \tMEMBER(maildir_copy_with_hardlinks) FALSE,\n \tMEMBER(maildir_check_content_changes) FALSE,\n-\tMEMBER(mbox_locks) \"dotlock fcntl flock\",\n+\tMEMBER(mbox_locks) \"dotlock fcntl\",\n \tMEMBER(mbox_read_dotlock) FALSE,\n \tMEMBER(mbox_lock_timeout) 300,\n \tMEMBER(mbox_dotlock_change_timeout) 30,\n"} {"commit":"eb6fe3736ea55277d3205797b0b5b4646d2a8461","subject":"fd.o #21544: mcd-account-conditions: don't crash if the type is wrong when setting Condition","message":"fd.o #21544: mcd-account-conditions: don't crash if the type is wrong when setting Condition\n\nAlso, this probably ought to be validated according to the BNF in the\ninterface description, if anyone uses it.\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control,freedesktop-unofficial-mirror\/telepathy__telepathy-mission-control","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/mcd-account-conditions.c\n+++ src\/mcd-account-conditions.c\n@@ -64,6 +64,16 @@\n gchar **keys, **key;\n GHashTable *conditions;\n \n+ \/* FIXME: some sort of validation beyond just the type? *\/\n+\n+ if (!G_VALUE_HOLDS (value, TP_HASH_TYPE_STRING_STRING_MAP))\n+ {\n+ g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,\n+ \"Expected a{s:s} for Condition, but got %s\",\n+ G_VALUE_TYPE_NAME (value));\n+ return FALSE;\n+ }\n+\n keyfile = _mcd_account_get_keyfile (account);\n unique_name = mcd_account_get_unique_name (account);\n conditions = g_value_get_boxed (value);\n"} {"commit":"d404095c3db3a4abe3fb6d1ab1697ad9b58a8501","subject":"complete parsing of VP9 uncompressed header","message":"complete parsing of VP9 uncompressed header\n","repos":"rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/av_parsers.c\n+++ src\/media_tools\/av_parsers.c\n@@ -2094,9 +2094,19 @@\n \t}\n }\n \n+static void vp9_delta_q(GF_BitStream *bs) {\n+\tBool delta_coded = gf_bs_read_int_log(bs, 1, \"delta_coded\");\n+\tif (delta_coded) {\n+\t\tgf_bs_read_int_log(bs, 4, \"delta_q\");\n+\t}\n+}\n+\n static void vp9_quantization_params(GF_BitStream *bs)\n {\n \t\/*base_q_idx = *\/gf_bs_read_int_log(bs, 8, \"base_q_idx\");\n+\tvp9_delta_q(bs); \/\/ delta_q_y_dc\n+\tvp9_delta_q(bs); \/\/ delta_q_uv_dc\n+\tvp9_delta_q(bs); \/\/ delta_q_uv_ac\n }\n \n #define VP9_MAX_SEGMENTS 8\n@@ -2106,6 +2116,14 @@\n \n #define VP9_MIN_TILE_WIDTH_B64 4\n #define VP9_MAX_TILE_WIDTH_B64 64\n+\n+static void vp9_read_prob(GF_BitStream *bs)\n+{\n+\tBool prob_coded = gf_bs_read_int_log(bs, 1, \"prob_coded\");\n+\tif (prob_coded) {\n+\t\tgf_bs_read_int_log(bs, 8, \"prob\");\n+\t}\n+}\n \n static void vp9_segmentation_params(GF_BitStream *bs)\n {\n@@ -2114,11 +2132,15 @@\n \t\tint i;\n \t\tBool segmentation_update_map = gf_bs_read_int_log(bs, 1, \"segmentation_update_map\");\n \t\tif (segmentation_update_map) {\n-\t\t\tfor (i = 0; i < 7; i++)\n-\t\t\t\t\/*segmentation_tree_probs[i] = read_prob()*\/\n-\t\t\t\t\/*segmentation_temporal_update = *\/gf_bs_read_int_log(bs, 1, \"segmentation_temporal_update\");\n-\t\t\t\/*for (i = 0; i < 3; i++)\n-\t\t\t\tsegmentation_pred_prob[i] = segmentation_temporal_update ? read_prob() : 255*\/\n+\t\t\tfor (i = 0; i < 7; i++) {\n+\t\t\t\tvp9_read_prob(bs);\n+\t\t\t}\n+\t\t\tBool segmentation_temporal_update = gf_bs_read_int_log(bs, 1, \"segmentation_temporal_update\");\n+\t\t\tfor (i = 0; i < 3; i++) {\n+\t\t\t\tif (segmentation_temporal_update) {\n+\t\t\t\t\tvp9_read_prob(bs);\n+\t\t\t\t}\n+\t\t\t}\n \t\t}\n \t\tBool segmentation_update_data = gf_bs_read_int_log(bs, 1, \"segmentation_update_data\");\n \t\tif (segmentation_update_data == 1) {\n"} {"commit":"9b4e80d4e174b011b4bb6d93a61520f1ac06ed5d","subject":"additional def and include for windows","message":"additional def and include for windows\n","repos":"lstrojny\/php-cld,lstrojny\/php-cld,lstrojny\/php-cld,lstrojny\/php-cld","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- php_cld.h\n+++ php_cld.h\n@@ -70,6 +70,11 @@\n PHP_METHOD(cld_detector, getEncodingHint);\n PHP_METHOD(cld_detector, detectLanguage);\n \n+#ifdef PHP_WIN32\n+# include <BaseTsd.h>\n+# define _ALLOW_KEYWORD_MACROS\n+#endif\n+\n PHP_CLD_API char *cld_strtoupper(char *s, size_t len);\n PHP_CLD_API char *cld_strtolower(char *s, size_t len);\n PHP_CLD_API int cld_detect_language(zval **result, const char *text, int text_len, bool is_plain_text, int include_extended_languages, const char *top_level_domain_hint, int top_level_domain_hint_len, char *language_hint_name, int language_hint_name_len, long encoding_hint TSRMLS_DC);\n"} {"commit":"75d35c93cf8b938f28f06ceb8ffa2606d6e57d3b","subject":"m68knommu: remove sg_address()","message":"m68knommu: remove sg_address()\n\nI would have replaced it with sg_virt(), but it doesn't appear to be\nused at all.\n\nSigned-off-by: Jens Axboe <165ab144a3ccfd9429d5c6466b275f24fafdb114@oracle.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/asm-m68knommu\/scatterlist.h\n+++ include\/asm-m68knommu\/scatterlist.h\n@@ -14,7 +14,6 @@\n \tunsigned int\tlength;\n };\n \n-#define sg_address(sg)\t\t(page_address((sg)->page) + (sg)->offset)\n #define sg_dma_address(sg) ((sg)->dma_address)\n #define sg_dma_len(sg) ((sg)->length)\n \n"} {"commit":"cfd65afe0ebba922dc4a4de65c3f98051f55f0dd","subject":"Update FactoryMethod.h","message":"Update FactoryMethod.h","repos":"SMelanko\/Patterns,SMelanko\/Patterns","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/creational\/FactoryMethod.h\n+++ include\/creational\/FactoryMethod.h\n@@ -3,9 +3,18 @@\n #ifndef PATTERNS_CREATIONAL_FACTORY_METHOD_H\n #define PATTERNS_CREATIONAL_FACTORY_METHOD_H\n \n-\/\/\/\n-\/\/\/ Create an instance of several derived classes.\n-\/\/\/\n+\/*\n+\n+Intent:\n+\tDefine an interface for creating an object, but let subclasses decide which class to instantiate.\n+\tThe Factory method lets a class defer instantiation it uses to subclasses.\n+\n+Applicability:\n+\t- a class can't anticipate the class of objects it must create.\n+\t- a class wants its subclasses to specify the objects it creates.\n+\t- classes delegate responsibility to one of several helper classes, and\n+\t you want to localize the knowledge of which helper subclass is the delegate.\n+*\/\n \n #include <iostream>\n #include <map>\n"} {"commit":"606f65665421d594458e1409b4413005fb521c25","subject":"Remove some unnecessary reinterpret_cast.","message":"Remove some unnecessary reinterpret_cast.\n\ngit-svn-id: ffe668792ed300d6c2daa1f6eba2e0aa28d7ec6c@118775 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang,apple\/swift-clang,apple\/swift-clang,llvm-mirror\/clang,apple\/swift-clang,llvm-mirror\/clang,llvm-mirror\/clang","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/clang\/Sema\/Initialization.h\n+++ include\/clang\/Sema\/Initialization.h\n@@ -118,12 +118,12 @@\n \/\/\/ \\brief Create the initialization entity for a variable.\n InitializedEntity(VarDecl *Var)\n : Kind(EK_Variable), Parent(0), Type(Var->getType()),\n- VariableOrMember(reinterpret_cast<DeclaratorDecl*>(Var)) { }\n+ VariableOrMember(Var) { }\n \n \/\/\/ \\brief Create the initialization entity for a parameter.\n InitializedEntity(ParmVarDecl *Parm)\n : Kind(EK_Parameter), Parent(0), Type(Parm->getType().getUnqualifiedType()),\n- VariableOrMember(reinterpret_cast<DeclaratorDecl*>(Parm)) { }\n+ VariableOrMember(Parm) { }\n \n \/\/\/ \\brief Create the initialization entity for the result of a\n \/\/\/ function, throwing an object, performing an explicit cast, or\n@@ -139,7 +139,7 @@\n \/\/\/ \\brief Create the initialization entity for a member subobject.\n InitializedEntity(FieldDecl *Member, const InitializedEntity *Parent) \n : Kind(EK_Member), Parent(Parent), Type(Member->getType()),\n- VariableOrMember(reinterpret_cast<DeclaratorDecl*>(Member)) { }\n+ VariableOrMember(Member) { }\n \n \/\/\/ \\brief Create the initialization entity for an array element.\n InitializedEntity(ASTContext &Context, unsigned Index, \n"} {"commit":"59f939eda6b43e5367d2ca80806b51bc4709c554","subject":"Include SkTypes.h from SkDynamicAnnotations.h","message":"Include SkTypes.h from SkDynamicAnnotations.h\n\nThis allows us to control SK_DYNAMIC_ANNOTATIONS_ENABLED by Sk*Config.h files.\nThis is a no-op today, because we control it from the compiler command line.\n\nBUG=430815\n\nReview URL: https:\/\/codereview.chromium.org\/787003003\n","repos":"TeamExodus\/external_skia,tmpvar\/skia.cc,MinimalOS-AOSP\/platform_external_skia,google\/skia,UBERMALLOW\/external_skia,aosp-mirror\/platform_external_skia,nfxosp\/platform_external_skia,AOSPB\/external_skia,Hikari-no-Tenshi\/android_external_skia,TeamExodus\/external_skia,vanish87\/skia,UBERMALLOW\/external_skia,AOSPB\/external_skia,YUPlayGodDev\/platform_external_skia,rubenvb\/skia,AOSPB\/external_skia,TeamExodus\/external_skia,boulzordev\/android_external_skia,scroggo\/skia,HalCanary\/skia-hc,spezi77\/android_external_skia,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,spezi77\/android_external_skia,HalCanary\/skia-hc,PAC-ROM\/android_external_skia,TeamTwisted\/external_skia,MonkeyZZZZ\/platform_external_skia,aosp-mirror\/platform_external_skia,MinimalOS-AOSP\/platform_external_skia,Igalia\/skia,pcwalton\/skia,samuelig\/skia,timduru\/platform-external-skia,timduru\/platform-external-skia,geekboxzone\/mmallow_external_skia,geekboxzone\/mmallow_external_skia,jtg-gg\/skia,Hikari-no-Tenshi\/android_external_skia,MarshedOut\/android_external_skia,UBERMALLOW\/external_skia,TeamExodus\/external_skia,pcwalton\/skia,google\/skia,OneRom\/external_skia,jtg-gg\/skia,qrealka\/skia-hc,todotodoo\/skia,pcwalton\/skia,rubenvb\/skia,w3nd1go\/android_external_skia,MinimalOS-AOSP\/platform_external_skia,vanish87\/skia,TeamTwisted\/external_skia,MonkeyZZZZ\/platform_external_skia,amyvmiwei\/skia,Infinitive-OS\/platform_external_skia,vanish87\/skia,shahrzadmn\/skia,ominux\/skia,aosp-mirror\/platform_external_skia,Igalia\/skia,spezi77\/android_external_skia,YUPlayGodDev\/platform_external_skia,Igalia\/skia,PAC-ROM\/android_external_skia,rubenvb\/skia,boulzordev\/android_external_skia,google\/skia,TeamTwisted\/external_skia,invisiblek\/android_external_skia,PAC-ROM\/android_external_skia,TeamTwisted\/external_skia,Jichao\/skia,samuelig\/skia,samuelig\/skia,OneRom\/external_skia,OneRom\/external_skia,qrealka\/skia-hc,DiamondLovesYou\/skia-sys,vanish87\/skia,AOSP-YU\/platform_external_skia,shahrzadmn\/skia,qrealka\/skia-hc,scroggo\/skia,YUPlayGodDev\/platform_external_skia,UBERMALLOW\/external_skia,Infinitive-OS\/platform_external_skia,todotodoo\/skia,OneRom\/external_skia,spezi77\/android_external_skia,Jichao\/skia,AOSPB\/external_skia,DiamondLovesYou\/skia-sys,invisiblek\/android_external_skia,Infinitive-OS\/platform_external_skia,rubenvb\/skia,UBERMALLOW\/external_skia,samuelig\/skia,vanish87\/skia,Infinitive-OS\/platform_external_skia,BrokenROM\/external_skia,tmpvar\/skia.cc,TeamExodus\/external_skia,todotodoo\/skia,VRToxin-AOSP\/android_external_skia,geekboxzone\/mmallow_external_skia,YUPlayGodDev\/platform_external_skia,UBERMALLOW\/external_skia,pcwalton\/skia,w3nd1go\/android_external_skia,AOSPB\/external_skia,w3nd1go\/android_external_skia,Jichao\/skia,nvoron23\/skia,Hikari-no-Tenshi\/android_external_skia,samuelig\/skia,noselhq\/skia,MonkeyZZZZ\/platform_external_skia,TeamExodus\/external_skia,boulzordev\/android_external_skia,TeamTwisted\/external_skia,w3nd1go\/android_external_skia,shahrzadmn\/skia,vanish87\/skia,VRToxin-AOSP\/android_external_skia,BrokenROM\/external_skia,ominux\/skia,google\/skia,BrokenROM\/external_skia,aosp-mirror\/platform_external_skia,Infinitive-OS\/platform_external_skia,shahrzadmn\/skia,Hikari-no-Tenshi\/android_external_skia,geekboxzone\/mmallow_external_skia,Jichao\/skia,shahrzadmn\/skia,HalCanary\/skia-hc,qrealka\/skia-hc,timduru\/platform-external-skia,AOSPB\/external_skia,Jichao\/skia,Igalia\/skia,BrokenROM\/external_skia,google\/skia,MonkeyZZZZ\/platform_external_skia,MonkeyZZZZ\/platform_external_skia,todotodoo\/skia,HalCanary\/skia-hc,YUPlayGodDev\/platform_external_skia,aosp-mirror\/platform_external_skia,noselhq\/skia,MarshedOut\/android_external_skia,invisiblek\/android_external_skia,HalCanary\/skia-hc,OneRom\/external_skia,tmpvar\/skia.cc,MinimalOS-AOSP\/platform_external_skia,TeamExodus\/external_skia,tmpvar\/skia.cc,VRToxin-AOSP\/android_external_skia,rubenvb\/skia,MarshedOut\/android_external_skia,jtg-gg\/skia,jtg-gg\/skia,TeamTwisted\/external_skia,invisiblek\/android_external_skia,nfxosp\/platform_external_skia,todotodoo\/skia,MinimalOS-AOSP\/platform_external_skia,nvoron23\/skia,qrealka\/skia-hc,invisiblek\/android_external_skia,AOSPB\/external_skia,TeamTwisted\/external_skia,google\/skia,Jichao\/skia,shahrzadmn\/skia,samuelig\/skia,PAC-ROM\/android_external_skia,geekboxzone\/mmallow_external_skia,YUPlayGodDev\/platform_external_skia,MinimalOS-AOSP\/platform_external_skia,todotodoo\/skia,nvoron23\/skia,AOSP-YU\/platform_external_skia,invisiblek\/android_external_skia,noselhq\/skia,shahrzadmn\/skia,noselhq\/skia,nvoron23\/skia,HalCanary\/skia-hc,invisiblek\/android_external_skia,ominux\/skia,scroggo\/skia,amyvmiwei\/skia,PAC-ROM\/android_external_skia,ominux\/skia,shahrzadmn\/skia,TeamTwisted\/external_skia,OneRom\/external_skia,scroggo\/skia,jtg-gg\/skia,w3nd1go\/android_external_skia,boulzordev\/android_external_skia,amyvmiwei\/skia,w3nd1go\/android_external_skia,MonkeyZZZZ\/platform_external_skia,Igalia\/skia,VRToxin-AOSP\/android_external_skia,nfxosp\/platform_external_skia,HalCanary\/skia-hc,MinimalOS-AOSP\/platform_external_skia,TeamExodus\/external_skia,MonkeyZZZZ\/platform_external_skia,DiamondLovesYou\/skia-sys,UBERMALLOW\/external_skia,Hikari-no-Tenshi\/android_external_skia,Jichao\/skia,qrealka\/skia-hc,amyvmiwei\/skia,AOSP-YU\/platform_external_skia,jtg-gg\/skia,invisiblek\/android_external_skia,VRToxin-AOSP\/android_external_skia,OneRom\/external_skia,BrokenROM\/external_skia,aosp-mirror\/platform_external_skia,amyvmiwei\/skia,ominux\/skia,DiamondLovesYou\/skia-sys,AOSP-YU\/platform_external_skia,timduru\/platform-external-skia,tmpvar\/skia.cc,ominux\/skia,vanish87\/skia,rubenvb\/skia,UBERMALLOW\/external_skia,BrokenROM\/external_skia,DiamondLovesYou\/skia-sys,noselhq\/skia,jtg-gg\/skia,w3nd1go\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,pcwalton\/skia,geekboxzone\/mmallow_external_skia,Infinitive-OS\/platform_external_skia,vanish87\/skia,UBERMALLOW\/external_skia,Jichao\/skia,MarshedOut\/android_external_skia,noselhq\/skia,pcwalton\/skia,tmpvar\/skia.cc,tmpvar\/skia.cc,todotodoo\/skia,AOSP-YU\/platform_external_skia,Igalia\/skia,noselhq\/skia,AOSP-YU\/platform_external_skia,w3nd1go\/android_external_skia,HalCanary\/skia-hc,google\/skia,qrealka\/skia-hc,scroggo\/skia,google\/skia,nfxosp\/platform_external_skia,boulzordev\/android_external_skia,ominux\/skia,PAC-ROM\/android_external_skia,timduru\/platform-external-skia,boulzordev\/android_external_skia,nfxosp\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,noselhq\/skia,AOSP-YU\/platform_external_skia,ominux\/skia,Igalia\/skia,scroggo\/skia,rubenvb\/skia,nfxosp\/platform_external_skia,MonkeyZZZZ\/platform_external_skia,amyvmiwei\/skia,samuelig\/skia,AOSP-YU\/platform_external_skia,aosp-mirror\/platform_external_skia,tmpvar\/skia.cc,pcwalton\/skia,PAC-ROM\/android_external_skia,MarshedOut\/android_external_skia,scroggo\/skia,AOSPB\/external_skia,scroggo\/skia,timduru\/platform-external-skia,HalCanary\/skia-hc,MarshedOut\/android_external_skia,MarshedOut\/android_external_skia,DiamondLovesYou\/skia-sys,boulzordev\/android_external_skia,geekboxzone\/mmallow_external_skia,shahrzadmn\/skia,MarshedOut\/android_external_skia,noselhq\/skia,OneRom\/external_skia,nvoron23\/skia,Jichao\/skia,nfxosp\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,VRToxin-AOSP\/android_external_skia,rubenvb\/skia,timduru\/platform-external-skia,spezi77\/android_external_skia,todotodoo\/skia,MinimalOS-AOSP\/platform_external_skia,OneRom\/external_skia,qrealka\/skia-hc,nvoron23\/skia,TeamTwisted\/external_skia,AOSPB\/external_skia,nvoron23\/skia,MinimalOS-AOSP\/platform_external_skia,amyvmiwei\/skia,nfxosp\/platform_external_skia,Infinitive-OS\/platform_external_skia,PAC-ROM\/android_external_skia,boulzordev\/android_external_skia,Infinitive-OS\/platform_external_skia,amyvmiwei\/skia,MonkeyZZZZ\/platform_external_skia,YUPlayGodDev\/platform_external_skia,tmpvar\/skia.cc,BrokenROM\/external_skia,geekboxzone\/mmallow_external_skia,ominux\/skia,TeamExodus\/external_skia,pcwalton\/skia,nvoron23\/skia,nfxosp\/platform_external_skia,DiamondLovesYou\/skia-sys,w3nd1go\/android_external_skia,YUPlayGodDev\/platform_external_skia,aosp-mirror\/platform_external_skia,todotodoo\/skia,google\/skia,spezi77\/android_external_skia,nvoron23\/skia,rubenvb\/skia,VRToxin-AOSP\/android_external_skia,MarshedOut\/android_external_skia,vanish87\/skia,VRToxin-AOSP\/android_external_skia,Igalia\/skia,aosp-mirror\/platform_external_skia,PAC-ROM\/android_external_skia,samuelig\/skia,AOSP-YU\/platform_external_skia,Infinitive-OS\/platform_external_skia,VRToxin-AOSP\/android_external_skia,geekboxzone\/mmallow_external_skia,YUPlayGodDev\/platform_external_skia,boulzordev\/android_external_skia,pcwalton\/skia,BrokenROM\/external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/core\/SkDynamicAnnotations.h\n+++ include\/core\/SkDynamicAnnotations.h\n@@ -7,6 +7,9 @@\n \n #ifndef SkDynamicAnnotations_DEFINED\n #define SkDynamicAnnotations_DEFINED\n+\n+\/\/ Make sure we see anything set via SkUserConfig.h (e.g. SK_DYNAMIC_ANNOTATIONS_ENABLED).\n+#include \"SkTypes.h\"\n \n \/\/ This file contains macros used to send out-of-band signals to dynamic instrumentation systems,\n \/\/ namely thread sanitizer. This is a cut-down version of the full dynamic_annotations library with\n"} {"commit":"24a5880e62f146312dff02744b3813fd75ed3386","subject":"Update get_time() for 64-bit","message":"Update get_time() for 64-bit\n\nUpdates the rdtsc assembly in get_time() to work properly for a 64-bit\nbuild.\n\nReview-URL: https:\/\/codereview.appspot.com\/309830043\n","repos":"AmesianX\/dynamorio,AmesianX\/dynamorio,AmesianX\/dynamorio,AmesianX\/dynamorio,AmesianX\/dynamorio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/arch\/arch.c\n+++ core\/arch\/arch.c\n@@ -3399,9 +3399,9 @@\n #ifdef UNIX\n __inline__ uint64 get_time()\n {\n- uint64 x;\n- __asm__ volatile (\".byte 0x0f, 0x31\" : \"=A\" (x));\n- return x;\n+ uint64 res;\n+ RDTSC_LL(res);\n+ return res;\n }\n #else \/* WINDOWS *\/\n uint64 get_time()\n"} {"commit":"88d772c5b8e177afd571b7c68467fa428951f2d8","subject":"sync api needs last_observed state too","message":"sync api needs last_observed state too\n","repos":"jcanizales\/grpc,podsvirov\/grpc,grani\/grpc,fichter\/grpc,rjshade\/grpc,firebase\/grpc,stanley-cheung\/grpc,soltanmm\/grpc,firebase\/grpc,soltanmm-google\/grpc,leifurhauks\/grpc,rjshade\/grpc,ctiller\/grpc,grani\/grpc,muxi\/grpc,cgvarela\/grpc,thunderboltsid\/grpc,kskalski\/grpc,hstefan\/grpc,ejona86\/grpc,tamihiro\/grpc,baylabs\/grpc,simonkuang\/grpc,MakMukhi\/grpc,kskalski\/grpc,ipylypiv\/grpc,vjpai\/grpc,gpndata\/grpc,dgquintas\/grpc,yinsu\/grpc,pszemus\/grpc,leifurhauks\/grpc,tengyifei\/grpc,rjshade\/grpc,zhimingxie\/grpc,y-zeng\/grpc,podsvirov\/grpc,makdharma\/grpc,philcleveland\/grpc,ananthonline\/grpc,ofrobots\/grpc,apolcyn\/grpc,bjori\/grpc,pmarks-net\/grpc,pmarks-net\/grpc,wangyikai\/grpc,goldenbull\/grpc,kriswuollett\/grpc,JoeWoo\/grpc,tengyifei\/grpc,thinkerou\/grpc,jtattermusch\/grpc,leifurhauks\/grpc,firebase\/grpc,tempbottle\/grpc,JoeWoo\/grpc,wcevans\/grpc,yongni\/grpc,carl-mastrangelo\/grpc,baylabs\/grpc,tengyifei\/grpc,sreecha\/grpc,gpndata\/grpc,stanley-cheung\/grpc,a11r\/grpc,w4-sjcho\/grpc,kumaralokgithub\/grpc,andrewpollock\/grpc,ncteisen\/grpc,matt-kwong\/grpc,thunderboltsid\/grpc,geffzhang\/grpc,yang-g\/grpc,murgatroid99\/grpc,ppietrasa\/grpc,7anner\/grpc,ejona86\/grpc,Crevil\/grpc,thinkerou\/grpc,ipylypiv\/grpc,chrisdunelm\/grpc,kskalski\/grpc,grpc\/grpc,geffzhang\/grpc,soltanmm\/grpc,7anner\/grpc,dgquintas\/grpc,carl-mastrangelo\/grpc,dklempner\/grpc,wangyikai\/grpc,doubi-workshop\/grpc,dklempner\/grpc,leifurhauks\/grpc,makdharma\/grpc,bogdandrutu\/grpc,donnadionne\/grpc,miselin\/grpc,leifurhauks\/grpc,grpc\/grpc,simonkuang\/grpc,surround-io\/grpc,daniel-j-born\/grpc,quizlet\/grpc,hstefan\/grpc,sreecha\/grpc,kpayson64\/grpc,deepaklukose\/grpc,thinkerou\/grpc,donnadionne\/grpc,Vizerai\/grpc,jboeuf\/grpc,greasypizza\/grpc,soltanmm-google\/grpc,muxi\/grpc,msmania\/grpc,vsco\/grpc,ipylypiv\/grpc,fichter\/grpc,ppietrasa\/grpc,kumaralokgithub\/grpc,crast\/grpc,goldenbull\/grpc,infinit\/grpc,miselin\/grpc,ctiller\/grpc,kriswuollett\/grpc,carl-mastrangelo\/grpc,wangyikai\/grpc,dgquintas\/grpc,geffzhang\/grpc,jcanizales\/grpc,thunderboltsid\/grpc,infinit\/grpc,stanley-cheung\/grpc,jcanizales\/grpc,ncteisen\/grpc,hstefan\/grpc,adelez\/grpc,makdharma\/grpc,matt-kwong\/grpc,nicolasnoble\/grpc,ofrobots\/grpc,ipylypiv\/grpc,msmania\/grpc,kpayson64\/grpc,LuminateWireless\/grpc,sreecha\/grpc,vjpai\/grpc,philcleveland\/grpc,goldenbull\/grpc,msiedlarek\/grpc,doubi-workshop\/grpc,madongfly\/grpc,rjshade\/grpc,donnadionne\/grpc,grani\/grpc,ncteisen\/grpc,PeterFaiman\/ruby-grpc-minimal,ncteisen\/grpc,yugui\/grpc,stanley-cheung\/grpc,kskalski\/grpc,soltanmm-google\/grpc,mehrdada\/grpc,jboeuf\/grpc,yang-g\/grpc,greasypizza\/grpc,gpndata\/grpc,madongfly\/grpc,carl-mastrangelo\/grpc,leifurhauks\/grpc,PeterFaiman\/ruby-grpc-minimal,geffzhang\/grpc,surround-io\/grpc,tamihiro\/grpc,vjpai\/grpc,yinsu\/grpc,madongfly\/grpc,thinkerou\/grpc,kumaralokgithub\/grpc,thinkerou\/grpc,msiedlarek\/grpc,murgatroid99\/grpc,perumaalgoog\/grpc,malexzx\/grpc,w4-sjcho\/grpc,tamihiro\/grpc,yugui\/grpc,ejona86\/grpc,wcevans\/grpc,hstefan\/grpc,royalharsh\/grpc,daniel-j-born\/grpc,ctiller\/grpc,yugui\/grpc,dgquintas\/grpc,msiedlarek\/grpc,ejona86\/grpc,simonkuang\/grpc,goldenbull\/grpc,royalharsh\/grpc,soltanmm\/grpc,kskalski\/grpc,ppietrasa\/grpc,soltanmm-google\/grpc,tempbottle\/grpc,jcanizales\/grpc,maxwell-demon\/grpc,wcevans\/grpc,malexzx\/grpc,pszemus\/grpc,a11r\/grpc,yinsu\/grpc,quizlet\/grpc,royalharsh\/grpc,gpndata\/grpc,matt-kwong\/grpc,pszemus\/grpc,firebase\/grpc,mehrdada\/grpc,zhimingxie\/grpc,dgquintas\/grpc,ppietrasa\/grpc,mehrdada\/grpc,a-veitch\/grpc,goldenbull\/grpc,arkmaxim\/grpc,wcevans\/grpc,wangyikai\/grpc,carl-mastrangelo\/grpc,JoeWoo\/grpc,andrewpollock\/grpc,chrisdunelm\/grpc,PeterFaiman\/ruby-grpc-minimal,pmarks-net\/grpc,pmarks-net\/grpc,JoeWoo\/grpc,chrisdunelm\/grpc,rjshade\/grpc,ppietrasa\/grpc,bjori\/grpc,simonkuang\/grpc,kpayson64\/grpc,hstefan\/grpc,baylabs\/grpc,MakMukhi\/grpc,royalharsh\/grpc,w4-sjcho\/grpc,bjori\/grpc,muxi\/grpc,doubi-workshop\/grpc,wcevans\/grpc,miselin\/grpc,apolcyn\/grpc,kpayson64\/grpc,tengyifei\/grpc,msiedlarek\/grpc,vsco\/grpc,grani\/grpc,ejona86\/grpc,yang-g\/grpc,tengyifei\/grpc,yugui\/grpc,mehrdada\/grpc,deepaklukose\/grpc,apolcyn\/grpc,pszemus\/grpc,podsvirov\/grpc,ofrobots\/grpc,cgvarela\/grpc,podsvirov\/grpc,yinsu\/grpc,yang-g\/grpc,miselin\/grpc,muxi\/grpc,dklempner\/grpc,mehrdada\/grpc,perumaalgoog\/grpc,vsco\/grpc,w4-sjcho\/grpc,yongni\/grpc,grpc\/grpc,miselin\/grpc,ofrobots\/grpc,murgatroid99\/grpc,y-zeng\/grpc,adelez\/grpc,grani\/grpc,crast\/grpc,jboeuf\/grpc,kskalski\/grpc,maxwell-demon\/grpc,muxi\/grpc,a-veitch\/grpc,ncteisen\/grpc,larsonmpdx\/grpc,muxi\/grpc,adelez\/grpc,gpndata\/grpc,MakMukhi\/grpc,yongni\/grpc,vjpai\/grpc,deepaklukose\/grpc,thunderboltsid\/grpc,7anner\/grpc,ananthonline\/grpc,MakMukhi\/grpc,kriswuollett\/grpc,infinit\/grpc,soltanmm\/grpc,VcamX\/grpc,nicolasnoble\/grpc,LuminateWireless\/grpc,pmarks-net\/grpc,fuchsia-mirror\/third_party-grpc,donnadionne\/grpc,miselin\/grpc,cgvarela\/grpc,firebase\/grpc,mehrdada\/grpc,kriswuollett\/grpc,soltanmm-google\/grpc,surround-io\/grpc,kpayson64\/grpc,bogdandrutu\/grpc,philcleveland\/grpc,thunderboltsid\/grpc,grani\/grpc,carl-mastrangelo\/grpc,VcamX\/grpc,wcevans\/grpc,Vizerai\/grpc,hstefan\/grpc,jboeuf\/grpc,a11r\/grpc,kriswuollett\/grpc,apolcyn\/grpc,msiedlarek\/grpc,geffzhang\/grpc,dklempner\/grpc,w4-sjcho\/grpc,infinit\/grpc,zhimingxie\/grpc,infinit\/grpc,matt-kwong\/grpc,sreecha\/grpc,JoeWoo\/grpc,yinsu\/grpc,donnadionne\/grpc,philcleveland\/grpc,deepaklukose\/grpc,arkmaxim\/grpc,andrewpollock\/grpc,madongfly\/grpc,a-veitch\/grpc,wangyikai\/grpc,ejona86\/grpc,andrewpollock\/grpc,doubi-workshop\/grpc,PeterFaiman\/ruby-grpc-minimal,tamihiro\/grpc,kumaralokgithub\/grpc,jtattermusch\/grpc,greasypizza\/grpc,a11r\/grpc,msiedlarek\/grpc,PeterFaiman\/ruby-grpc-minimal,ctiller\/grpc,LuminateWireless\/grpc,yongni\/grpc,soltanmm\/grpc,Vizerai\/grpc,ncteisen\/grpc,msmania\/grpc,carl-mastrangelo\/grpc,greasypizza\/grpc,perumaalgoog\/grpc,donnadionne\/grpc,adelez\/grpc,a-veitch\/grpc,ctiller\/grpc,dgquintas\/grpc,Crevil\/grpc,pmarks-net\/grpc,JoeWoo\/grpc,vjpai\/grpc,goldenbull\/grpc,daniel-j-born\/grpc,7anner\/grpc,dklempner\/grpc,kskalski\/grpc,yang-g\/grpc,makdharma\/grpc,yang-g\/grpc,deepaklukose\/grpc,PeterFaiman\/ruby-grpc-minimal,sreecha\/grpc,philcleveland\/grpc,ppietrasa\/grpc,tempbottle\/grpc,makdharma\/grpc,fuchsia-mirror\/third_party-grpc,tamihiro\/grpc,ipylypiv\/grpc,perumaalgoog\/grpc,dgquintas\/grpc,yang-g\/grpc,Vizerai\/grpc,deepaklukose\/grpc,philcleveland\/grpc,simonkuang\/grpc,carl-mastrangelo\/grpc,tengyifei\/grpc,mehrdada\/grpc,vjpai\/grpc,Vizerai\/grpc,tempbottle\/grpc,zhimingxie\/grpc,doubi-workshop\/grpc,quizlet\/grpc,Crevil\/grpc,baylabs\/grpc,kumaralokgithub\/grpc,murgatroid99\/grpc,murgatroid99\/grpc,Crevil\/grpc,a-veitch\/grpc,7anner\/grpc,grpc\/grpc,baylabs\/grpc,miselin\/grpc,msiedlarek\/grpc,crast\/grpc,geffzhang\/grpc,adelez\/grpc,y-zeng\/grpc,larsonmpdx\/grpc,PeterFaiman\/ruby-grpc-minimal,andrewpollock\/grpc,jtattermusch\/grpc,jtattermusch\/grpc,fichter\/grpc,gpndata\/grpc,jtattermusch\/grpc,ppietrasa\/grpc,yongni\/grpc,matt-kwong\/grpc,w4-sjcho\/grpc,chrisdunelm\/grpc,stanley-cheung\/grpc,tengyifei\/grpc,ejona86\/grpc,doubi-workshop\/grpc,rjshade\/grpc,thinkerou\/grpc,crast\/grpc,grpc\/grpc,yongni\/grpc,cgvarela\/grpc,msiedlarek\/grpc,y-zeng\/grpc,wcevans\/grpc,adelez\/grpc,wangyikai\/grpc,grpc\/grpc,grani\/grpc,fuchsia-mirror\/third_party-grpc,pmarks-net\/grpc,bogdandrutu\/grpc,nicolasnoble\/grpc,podsvirov\/grpc,firebase\/grpc,JoeWoo\/grpc,tengyifei\/grpc,thinkerou\/grpc,infinit\/grpc,fuchsia-mirror\/third_party-grpc,a11r\/grpc,vsco\/grpc,soltanmm\/grpc,chrisdunelm\/grpc,tempbottle\/grpc,7anner\/grpc,kskalski\/grpc,murgatroid99\/grpc,stanley-cheung\/grpc,ctiller\/grpc,VcamX\/grpc,quizlet\/grpc,y-zeng\/grpc,thunderboltsid\/grpc,jboeuf\/grpc,donnadionne\/grpc,kskalski\/grpc,royalharsh\/grpc,mehrdada\/grpc,a11r\/grpc,bjori\/grpc,podsvirov\/grpc,LuminateWireless\/grpc,carl-mastrangelo\/grpc,ejona86\/grpc,msmania\/grpc,vjpai\/grpc,ananthonline\/grpc,Vizerai\/grpc,yang-g\/grpc,grpc\/grpc,perumaalgoog\/grpc,jcanizales\/grpc,simonkuang\/grpc,pmarks-net\/grpc,soltanmm-google\/grpc,firebase\/grpc,zhimingxie\/grpc,surround-io\/grpc,vsco\/grpc,grpc\/grpc,kriswuollett\/grpc,ejona86\/grpc,andrewpollock\/grpc,hstefan\/grpc,fuchsia-mirror\/third_party-grpc,msmania\/grpc,Crevil\/grpc,doubi-workshop\/grpc,mehrdada\/grpc,LuminateWireless\/grpc,maxwell-demon\/grpc,dklempner\/grpc,deepaklukose\/grpc,arkmaxim\/grpc,chrisdunelm\/grpc,fichter\/grpc,ofrobots\/grpc,sreecha\/grpc,larsonmpdx\/grpc,Vizerai\/grpc,donnadionne\/grpc,goldenbull\/grpc,thunderboltsid\/grpc,yongni\/grpc,doubi-workshop\/grpc,maxwell-demon\/grpc,fichter\/grpc,thinkerou\/grpc,ncteisen\/grpc,malexzx\/grpc,doubi-workshop\/grpc,Vizerai\/grpc,crast\/grpc,daniel-j-born\/grpc,chrisdunelm\/grpc,simonkuang\/grpc,grani\/grpc,greasypizza\/grpc,fichter\/grpc,wangyikai\/grpc,zhimingxie\/grpc,royalharsh\/grpc,PeterFaiman\/ruby-grpc-minimal,pszemus\/grpc,greasypizza\/grpc,greasypizza\/grpc,chrisdunelm\/grpc,yugui\/grpc,murgatroid99\/grpc,a11r\/grpc,kpayson64\/grpc,surround-io\/grpc,stanley-cheung\/grpc,miselin\/grpc,tempbottle\/grpc,PeterFaiman\/ruby-grpc-minimal,tengyifei\/grpc,sreecha\/grpc,grpc\/grpc,VcamX\/grpc,donnadionne\/grpc,arkmaxim\/grpc,arkmaxim\/grpc,firebase\/grpc,thunderboltsid\/grpc,yugui\/grpc,sreecha\/grpc,pmarks-net\/grpc,zhimingxie\/grpc,infinit\/grpc,soltanmm\/grpc,cgvarela\/grpc,a-veitch\/grpc,7anner\/grpc,ctiller\/grpc,surround-io\/grpc,stanley-cheung\/grpc,royalharsh\/grpc,apolcyn\/grpc,fuchsia-mirror\/third_party-grpc,adelez\/grpc,carl-mastrangelo\/grpc,jtattermusch\/grpc,Crevil\/grpc,MakMukhi\/grpc,vjpai\/grpc,w4-sjcho\/grpc,kpayson64\/grpc,grani\/grpc,ejona86\/grpc,vjpai\/grpc,daniel-j-born\/grpc,baylabs\/grpc,nicolasnoble\/grpc,a-veitch\/grpc,bogdandrutu\/grpc,MakMukhi\/grpc,thinkerou\/grpc,perumaalgoog\/grpc,tempbottle\/grpc,larsonmpdx\/grpc,tempbottle\/grpc,madongfly\/grpc,podsvirov\/grpc,nicolasnoble\/grpc,carl-mastrangelo\/grpc,jboeuf\/grpc,tamihiro\/grpc,quizlet\/grpc,surround-io\/grpc,y-zeng\/grpc,rjshade\/grpc,thinkerou\/grpc,pszemus\/grpc,daniel-j-born\/grpc,ipylypiv\/grpc,gpndata\/grpc,baylabs\/grpc,vjpai\/grpc,ppietrasa\/grpc,maxwell-demon\/grpc,7anner\/grpc,ncteisen\/grpc,daniel-j-born\/grpc,vjpai\/grpc,VcamX\/grpc,ananthonline\/grpc,apolcyn\/grpc,ctiller\/grpc,podsvirov\/grpc,Crevil\/grpc,ipylypiv\/grpc,dklempner\/grpc,donnadionne\/grpc,yinsu\/grpc,vsco\/grpc,bogdandrutu\/grpc,sreecha\/grpc,nicolasnoble\/grpc,thunderboltsid\/grpc,jcanizales\/grpc,pszemus\/grpc,larsonmpdx\/grpc,jcanizales\/grpc,larsonmpdx\/grpc,arkmaxim\/grpc,kpayson64\/grpc,bjori\/grpc,jtattermusch\/grpc,vjpai\/grpc,msmania\/grpc,sreecha\/grpc,kpayson64\/grpc,MakMukhi\/grpc,miselin\/grpc,ncteisen\/grpc,ofrobots\/grpc,soltanmm-google\/grpc,kriswuollett\/grpc,maxwell-demon\/grpc,simonkuang\/grpc,apolcyn\/grpc,matt-kwong\/grpc,cgvarela\/grpc,quizlet\/grpc,y-zeng\/grpc,muxi\/grpc,Vizerai\/grpc,yugui\/grpc,fichter\/grpc,apolcyn\/grpc,adelez\/grpc,philcleveland\/grpc,jtattermusch\/grpc,jboeuf\/grpc,ofrobots\/grpc,malexzx\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,apolcyn\/grpc,JoeWoo\/grpc,muxi\/grpc,deepaklukose\/grpc,bjori\/grpc,surround-io\/grpc,fichter\/grpc,jtattermusch\/grpc,dklempner\/grpc,muxi\/grpc,geffzhang\/grpc,malexzx\/grpc,crast\/grpc,ipylypiv\/grpc,larsonmpdx\/grpc,maxwell-demon\/grpc,kumaralokgithub\/grpc,larsonmpdx\/grpc,donnadionne\/grpc,LuminateWireless\/grpc,ejona86\/grpc,kriswuollett\/grpc,ctiller\/grpc,stanley-cheung\/grpc,firebase\/grpc,ctiller\/grpc,bogdandrutu\/grpc,jboeuf\/grpc,quizlet\/grpc,dklempner\/grpc,greasypizza\/grpc,podsvirov\/grpc,muxi\/grpc,philcleveland\/grpc,royalharsh\/grpc,msiedlarek\/grpc,kriswuollett\/grpc,msmania\/grpc,pszemus\/grpc,VcamX\/grpc,madongfly\/grpc,ipylypiv\/grpc,LuminateWireless\/grpc,jtattermusch\/grpc,baylabs\/grpc,thinkerou\/grpc,baylabs\/grpc,w4-sjcho\/grpc,sreecha\/grpc,sreecha\/grpc,nicolasnoble\/grpc,kumaralokgithub\/grpc,rjshade\/grpc,malexzx\/grpc,bogdandrutu\/grpc,madongfly\/grpc,soltanmm\/grpc,nicolasnoble\/grpc,malexzx\/grpc,arkmaxim\/grpc,fuchsia-mirror\/third_party-grpc,nicolasnoble\/grpc,ncteisen\/grpc,vsco\/grpc,donnadionne\/grpc,ananthonline\/grpc,VcamX\/grpc,Vizerai\/grpc,yongni\/grpc,bogdandrutu\/grpc,jboeuf\/grpc,kpayson64\/grpc,makdharma\/grpc,goldenbull\/grpc,daniel-j-born\/grpc,yongni\/grpc,arkmaxim\/grpc,y-zeng\/grpc,hstefan\/grpc,stanley-cheung\/grpc,leifurhauks\/grpc,mehrdada\/grpc,andrewpollock\/grpc,Crevil\/grpc,infinit\/grpc,jcanizales\/grpc,7anner\/grpc,daniel-j-born\/grpc,a11r\/grpc,dgquintas\/grpc,yinsu\/grpc,grpc\/grpc,fuchsia-mirror\/third_party-grpc,ofrobots\/grpc,MakMukhi\/grpc,infinit\/grpc,mehrdada\/grpc,crast\/grpc,tamihiro\/grpc,tamihiro\/grpc,msmania\/grpc,bjori\/grpc,malexzx\/grpc,larsonmpdx\/grpc,philcleveland\/grpc,soltanmm-google\/grpc,soltanmm-google\/grpc,makdharma\/grpc,chrisdunelm\/grpc,wcevans\/grpc,tamihiro\/grpc,nicolasnoble\/grpc,jboeuf\/grpc,mehrdada\/grpc,madongfly\/grpc,ofrobots\/grpc,dgquintas\/grpc,y-zeng\/grpc,muxi\/grpc,pszemus\/grpc,goldenbull\/grpc,firebase\/grpc,pszemus\/grpc,adelez\/grpc,dgquintas\/grpc,geffzhang\/grpc,leifurhauks\/grpc,chrisdunelm\/grpc,ncteisen\/grpc,perumaalgoog\/grpc,leifurhauks\/grpc,matt-kwong\/grpc,deepaklukose\/grpc,matt-kwong\/grpc,muxi\/grpc,ppietrasa\/grpc,perumaalgoog\/grpc,ctiller\/grpc,carl-mastrangelo\/grpc,wangyikai\/grpc,stanley-cheung\/grpc,ctiller\/grpc,msmania\/grpc,jcanizales\/grpc,bjori\/grpc,murgatroid99\/grpc,dgquintas\/grpc,yugui\/grpc,jboeuf\/grpc,PeterFaiman\/ruby-grpc-minimal,nicolasnoble\/grpc,hstefan\/grpc,soltanmm\/grpc,chrisdunelm\/grpc,yinsu\/grpc,malexzx\/grpc,Vizerai\/grpc,Crevil\/grpc,JoeWoo\/grpc,jboeuf\/grpc,vsco\/grpc,MakMukhi\/grpc,thinkerou\/grpc,VcamX\/grpc,grpc\/grpc,cgvarela\/grpc,ananthonline\/grpc,bogdandrutu\/grpc,royalharsh\/grpc,LuminateWireless\/grpc,andrewpollock\/grpc,a11r\/grpc,a-veitch\/grpc,VcamX\/grpc,firebase\/grpc,andrewpollock\/grpc,geffzhang\/grpc,fuchsia-mirror\/third_party-grpc,jtattermusch\/grpc,ncteisen\/grpc,ananthonline\/grpc,crast\/grpc,madongfly\/grpc,gpndata\/grpc,ejona86\/grpc,quizlet\/grpc,pszemus\/grpc,rjshade\/grpc,zhimingxie\/grpc,ananthonline\/grpc,maxwell-demon\/grpc,nicolasnoble\/grpc,matt-kwong\/grpc,greasypizza\/grpc,wcevans\/grpc,yugui\/grpc,pszemus\/grpc,w4-sjcho\/grpc,grpc\/grpc,kumaralokgithub\/grpc,arkmaxim\/grpc,simonkuang\/grpc,bjori\/grpc,yinsu\/grpc,quizlet\/grpc,yang-g\/grpc,vsco\/grpc,ananthonline\/grpc,perumaalgoog\/grpc,jtattermusch\/grpc,cgvarela\/grpc,a-veitch\/grpc,fuchsia-mirror\/third_party-grpc,maxwell-demon\/grpc,stanley-cheung\/grpc,kpayson64\/grpc,murgatroid99\/grpc,wangyikai\/grpc,murgatroid99\/grpc,firebase\/grpc,makdharma\/grpc,makdharma\/grpc,LuminateWireless\/grpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/grpc++\/channel_interface.h\n+++ include\/grpc++\/channel_interface.h\n@@ -67,7 +67,8 @@\n const T& deadline,\n CompletionQueue* cq, void* tag) = 0;\n template <typename T>\n- virtual bool WaitForStateChange(grpc_connectivity_state* new_state,\n+ virtual bool WaitForStateChange(grpc_connectivity_state last_observed,\n+ grpc_connectivity_state* new_state,\n const T& deadline) = 0;\n };\n \n"} {"commit":"1c1644844d122e03fa00041da64acde34e5e81d0","subject":"- Marten fixed stupid error due to uppercase header name.","message":"- Marten fixed stupid error due to uppercase header name.\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@26901 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/csutil\/scf_implementation.h\n+++ include\/csutil\/scf_implementation.h\n@@ -274,7 +274,7 @@\n \/\/ Generation is in separate file mostly for documentation generation purposes.\n #include \"scf_implgen.h\"\n #else\n- #include \"scf_implgen_P.h\"\n+ #include \"scf_implgen_p.h\"\n #endif\n \n #undef SCF_IN_IMPLEMENTATION_H\n"} {"commit":"9f0f2f9512c3c9dcf875efa490b587f010b260c1","subject":"mesa: use FLUSH_CURRENT and not FLUSH_VERTICES in _mesa_validate_*","message":"mesa: use FLUSH_CURRENT and not FLUSH_VERTICES in _mesa_validate_*\n\nASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL calls FLUSH_VERTICES, which\nis not what we want.\n\nThis fixes a breakage in classic drivers, introduced in:\n\n 62b971673950148eb949ba23d7fdc47debea16f0\n vbo: first ASSERT_OUTSIDE_BEGIN_END then FLUSH, not the other way around\n\nIt should fix:\n https:\/\/bugs.freedesktop.org\/show_bug.cgi?id=51629\n https:\/\/bugs.freedesktop.org\/show_bug.cgi?id=51642\n\nReviewed-by: Brian Paul <3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@vmware.com>\n","repos":"mapbox\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/main\/api_validate.c\n+++ src\/mesa\/main\/api_validate.c\n@@ -272,7 +272,8 @@\n \t\t\t GLenum mode, GLsizei count, GLenum type,\n \t\t\t const GLvoid *indices, GLint basevertex)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (count <= 0) {\n if (count < 0)\n@@ -330,7 +331,8 @@\n {\n unsigned i;\n \n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n for (i = 0; i < primcount; i++) {\n if (count[i] <= 0) {\n@@ -398,7 +400,8 @@\n \t\t\t\t GLsizei count, GLenum type,\n \t\t\t\t const GLvoid *indices, GLint basevertex)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (count <= 0) {\n if (count < 0)\n@@ -456,7 +459,8 @@\n _mesa_validate_DrawArrays(struct gl_context *ctx,\n \t\t\t GLenum mode, GLint start, GLsizei count)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (count <= 0) {\n if (count < 0)\n@@ -484,7 +488,8 @@\n _mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,\n GLsizei count, GLsizei numInstances)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (count <= 0) {\n if (count < 0)\n@@ -528,7 +533,8 @@\n const GLvoid *indices, GLsizei numInstances,\n GLint basevertex)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (count <= 0) {\n if (count < 0)\n@@ -589,7 +595,8 @@\n GLenum mode,\n struct gl_transform_feedback_object *obj)\n {\n- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, GL_FALSE);\n+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);\n+ FLUSH_CURRENT(ctx, 0);\n \n if (!_mesa_valid_prim_mode(ctx, mode, \"glDrawTransformFeedback\")) {\n return GL_FALSE;\n"} {"commit":"de1255af00682dcfb7a858cbc98e7ea2bfce324f","subject":"[auto][ci skip] Adding data files from Travis build #161","message":"[auto][ci skip] Adding data files from Travis build #161\n","repos":"openvenues\/libpostal,openvenues\/libpostal,openvenues\/libpostal,openvenues\/libpostal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/address_expansion_data.c\n+++ src\/address_expansion_data.c\n@@ -567,6 +567,10 @@\n \"\u00f6sterreichischer gebirgsverein\",\n \"\u00f6sterreichischer touristenklub\",\n \"wiener\",\n+ \"eiflerisch\",\n+ \"eiflerische\",\n+ \"eiflerischer\",\n+ \"eiflerisches\",\n \"abteilung\",\n \"nummer\",\n \"wohnung\",\n@@ -64029,7 +64033,6 @@\n {\"a.d.\", 1, {DICTIONARY_STOPWORD}, 496},\n {\"wiener\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"b\u00fcrgermeister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"zi\", 1, {DICTIONARY_UNIT}, 571},\n {\"magister\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"ufer\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"s\u00fcdlicher\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n@@ -64062,6 +64065,7 @@\n {\"bgm.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 375},\n {\"oberoesterreichisch\", 1, {DICTIONARY_TOPONYM}, 554},\n {\"nachst\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"#\", 1, {DICTIONARY_UNIT}, 572},\n {\"unteres\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"auf\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sudl\", 1, {DICTIONARY_DIRECTIONAL}, 404},\n@@ -64085,8 +64089,10 @@\n {\"hak\", 1, {DICTIONARY_PLACE_NAME}, 459},\n {\"osterreichischer gebirgsverein\", 1, {DICTIONARY_TOPONYM}, 564},\n {\"marktpl\", 1, {DICTIONARY_PLACE_NAME}, 472},\n+ {\"nr\", 1, {DICTIONARY_UNIT}, 572},\n {\"truppenub\u00fcngsplatz\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"nordoestliches\", 1, {DICTIONARY_DIRECTIONAL}, 395},\n+ {\"eiflerischer\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"gde\", 1, {DICTIONARY_QUALIFIER}, 493},\n {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"steg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -64133,6 +64139,7 @@\n {\"fh\", 1, {DICTIONARY_PLACE_NAME}, 451},\n {\"auf der\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"kino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"abt\", 1, {DICTIONARY_UNIT}, 571},\n {\"imbiss\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"beim\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"in\", 1, {DICTIONARY_STOPWORD}, -1},\n@@ -64151,6 +64158,7 @@\n {\"west\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"jhtt\", 1, {DICTIONARY_PLACE_NAME}, 466},\n {\"bh\", 1, {DICTIONARY_PLACE_NAME}, 445},\n+ {\"eifler\", 1, {DICTIONARY_TOPONYM}, 569},\n {\"offentlicher mkt\", 1, {DICTIONARY_PLACE_NAME}, 476},\n {\"sudostliche\", 1, {DICTIONARY_DIRECTIONAL}, 411},\n {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 408},\n@@ -64173,6 +64181,7 @@\n {\"q.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 379},\n {\"burgenlaendische\", 1, {DICTIONARY_TOPONYM}, 544},\n {\"s\u00fcdwestliche\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"eiflerische\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"bg\", 1, {DICTIONARY_PLACE_NAME}, 442},\n {\"kz.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 376},\n {\"mitglied des landtages\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n@@ -64199,7 +64208,6 @@\n {\"ph\", 1, {DICTIONARY_PLACE_NAME}, 477},\n {\"kamp\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sport platz\", 1, {DICTIONARY_PLACE_NAME}, 481},\n- {\"abt\", 1, {DICTIONARY_UNIT}, 567},\n {\"kg\", 1, {DICTIONARY_SYNONYM}, 373},\n {\"westliche\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"bank\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -64212,6 +64220,7 @@\n {\"h\", 1, {DICTIONARY_STREET_TYPE}, 520},\n {\"fussball club\", 1, {DICTIONARY_COMPANY_TYPE}, 365},\n {\"hst\", 1, {DICTIONARY_SYNONYM}, 528},\n+ {\"eiflerisches\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"str.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 383},\n {\"die\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"grosses\", 1, {DICTIONARY_STREET_TYPE}, 519},\n@@ -64225,12 +64234,10 @@\n {\"b\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"oberoesterreichische\", 1, {DICTIONARY_TOPONYM}, 555},\n {\"ff\", 1, {DICTIONARY_PLACE_NAME}, 453},\n- {\"#\", 1, {DICTIONARY_UNIT}, 568},\n {\"ogb\", 1, {DICTIONARY_TOPONYM}, 564},\n {\"\u00f6gb\", 1, {DICTIONARY_TOPONYM}, 564},\n {\"bez\", 1, {DICTIONARY_QUALIFIER}, 492},\n {\"untere\", 2, {DICTIONARY_CONCATENATED_PREFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"whg\", 1, {DICTIONARY_UNIT}, 569},\n {\"ub\", 1, {DICTIONARY_PLACE_NAME}, 487},\n {\"krankenhaus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"jungenherberge\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -64428,6 +64435,7 @@\n {\"nordostlich\", 1, {DICTIONARY_DIRECTIONAL}, 392},\n {\"schutzhutte\", 1, {DICTIONARY_PLACE_NAME}, 480},\n {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 516},\n+ {\"z\", 1, {DICTIONARY_UNIT}, 574},\n {\"hl\", 1, {DICTIONARY_PERSONAL_TITLE}, 428},\n {\"apotheke\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dipl kfm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 358},\n@@ -64447,13 +64455,13 @@\n {\"gro\u00dfe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"hptst\", 1, {DICTIONARY_QUALIFIER}, 494},\n {\"nordoestlich\", 1, {DICTIONARY_DIRECTIONAL}, 392},\n- {\"z\", 1, {DICTIONARY_UNIT}, 570},\n {\"hochschule\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"der jungere\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n {\"burg\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, -1},\n {\"i\", 1, {DICTIONARY_STOPWORD}, 499},\n {\"gro\u00dfser\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"n\u00f6rdliches\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"whg\", 1, {DICTIONARY_UNIT}, 573},\n {\"bundesrealgymnasium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"o\u00f6\", 1, {DICTIONARY_TOPONYM}, 553},\n {\"niederoesterreich\", 1, {DICTIONARY_TOPONYM}, 548},\n@@ -64464,6 +64472,7 @@\n {\"und\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"\u00f6sterreichisches\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"dt\", 1, {DICTIONARY_TOPONYM}, 546},\n+ {\"eiflerisch\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"postamt\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"haus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"allgemeiner deutscher automobil club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -64526,6 +64535,8 @@\n {\"kap\", 1, {DICTIONARY_PLACE_NAME}, 468},\n {\"z\", 1, {DICTIONARY_STOPWORD}, 507},\n {\"suedoestlicher\", 1, {DICTIONARY_DIRECTIONAL}, 412},\n+ {\"zi\", 1, {DICTIONARY_UNIT}, 575},\n+ {\"eifler\", 1, {DICTIONARY_TOPONYM}, 567},\n {\"ma\", 1, {DICTIONARY_PLACE_NAME}, 471},\n {\"gemeinde\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"hoersaele\", 1, {DICTIONARY_PLACE_NAME}, 464},\n@@ -64571,6 +64582,7 @@\n {\"unter\", 2, {DICTIONARY_CONCATENATED_PREFIX_SEPARABLE, DICTIONARY_STOPWORD}, -1},\n {\"stb\", 1, {DICTIONARY_PLACE_NAME}, 482},\n {\"htl\", 1, {DICTIONARY_PLACE_NAME}, 463},\n+ {\"eifler\", 1, {DICTIONARY_TOPONYM}, 568},\n {\"gefangnis\", 1, {DICTIONARY_PLACE_NAME}, 457},\n {\"westliches\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"hbf\", 1, {DICTIONARY_PLACE_NAME}, 461},\n@@ -64692,6 +64704,7 @@\n {\"sudwestliche\", 1, {DICTIONARY_DIRECTIONAL}, 417},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"wh\", 1, {DICTIONARY_PLACE_NAME}, 491},\n+ {\"eifler\", 1, {DICTIONARY_TOPONYM}, 570},\n {\"ostliche\", 1, {DICTIONARY_DIRECTIONAL}, 399},\n {\"\u00f6stl\", 1, {DICTIONARY_DIRECTIONAL}, 398},\n {\"buhl\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -64708,7 +64721,6 @@\n {\"dorf\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, -1},\n {\"nordwestliches\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"gasthof\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nr\", 1, {DICTIONARY_UNIT}, 568},\n {\"zu\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 386},\n {\"jagdhaus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -64738,5243 +64750,5243 @@\n {\"niederoesterreichisch\", 1, {DICTIONARY_TOPONYM}, 549},\n {\"plate\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"stratigo\u00fa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"\u03c3\u03c4\u03c1\u03b1\u03c4\u03b7\u03b3\u03bf\u03c5\", 1, {DICTIONARY_PERSONAL_TITLE}, 574},\n+ {\"\u03c0\u03bf\u03bb\u03c5\u03c4\u03b5\u03c7\u03bd\u03b5\u03af\u03bf\u03c5\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ag\u00edas\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"odos\", 1, {DICTIONARY_STREET_TYPE}, 578},\n- {\"\u03b1\u03b3\u03b9\u03bf\u03c5\", 1, {DICTIONARY_PERSONAL_TITLE}, 572},\n+ {\"plateia\", 1, {DICTIONARY_STREET_TYPE}, 584},\n {\"\u03c3\u03c4\u03c1\u03b1\u03c4\u03b7\u03b3\u03bf\u03cd\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"plateia\", 1, {DICTIONARY_STREET_TYPE}, 580},\n- {\"strati\u0331go\u00fa\", 1, {DICTIONARY_PERSONAL_TITLE}, 575},\n {\"\u03bb\u03b5\u03c9\u03c6\u03cc\u03c1\u03bf\u03c2\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u03c0\u03bf\u03bb\u03c5\u03c4\u03b5\u03c7\u03bd\u03b5\u03b9\u03bf\u03c5\", 1, {DICTIONARY_PLACE_NAME}, 576},\n- {\"\u03c0\u03bf\u03bb\u03c5\u03c4\u03b5\u03c7\u03bd\u03b5\u03af\u03bf\u03c5\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"strati\u0331go\u00fa\", 1, {DICTIONARY_PERSONAL_TITLE}, 579},\n+ {\"\u03b1\u03b3\u03b9\u03b1\u03c2\", 1, {DICTIONARY_PERSONAL_TITLE}, 577},\n+ {\"\u03c0\u03bf\u03bb\u03c5\u03c4\u03b5\u03c7\u03bd\u03b5\u03b9\u03bf\u03c5\", 1, {DICTIONARY_PLACE_NAME}, 580},\n {\"leoforos\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u03b1\u03b3\u03af\u03b1\u03c2\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"stratigou\", 1, {DICTIONARY_PERSONAL_TITLE}, 579},\n {\"agiou\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"polytechneiou\", 1, {DICTIONARY_PLACE_NAME}, 581},\n+ {\"\u03c0\u03bb\u03b1\u03c4\u03b5\u03b9\u03b1\", 1, {DICTIONARY_STREET_TYPE}, 583},\n+ {\"\u03c0\u03bb\u03b1\u03c4\u03b5\u03af\u03b1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"odhos\", 1, {DICTIONARY_STREET_TYPE}, 582},\n {\"\u03b1\u03b3\u03af\u03bf\u03c5\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"stratigou\", 1, {DICTIONARY_PERSONAL_TITLE}, 575},\n- {\"odhos\", 1, {DICTIONARY_STREET_TYPE}, 578},\n- {\"polytechneiou\", 1, {DICTIONARY_PLACE_NAME}, 577},\n- {\"\u03b1\u03b3\u03b9\u03b1\u03c2\", 1, {DICTIONARY_PERSONAL_TITLE}, 573},\n- {\"\u03c0\u03bb\u03b1\u03c4\u03b5\u03af\u03b1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u03c0\u03bb\u03b1\u03c4\u03b5\u03b9\u03b1\", 1, {DICTIONARY_STREET_TYPE}, 579},\n {\"polytechne\u00edou\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u03bf\u03b4\u03cc\u03c2\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u03b1\u03b3\u03af\u03b1\u03c2\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"\u03b1\u03b3\u03b9\u03bf\u03c5\", 1, {DICTIONARY_PERSONAL_TITLE}, 576},\n+ {\"\u03c3\u03c4\u03c1\u03b1\u03c4\u03b7\u03b3\u03bf\u03c5\", 1, {DICTIONARY_PERSONAL_TITLE}, 578},\n {\"od\u00f3s\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"military\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bc\", 1, {DICTIONARY_TOPONYM}, 1294},\n- {\"hngr\", 1, {DICTIONARY_UNIT}, 1369},\n- {\"vlls\", 1, {DICTIONARY_PLACE_NAME}, 883},\n- {\"btte\", 1, {DICTIONARY_STREET_TYPE}, 944},\n- {\"nt and sa\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n+ {\"odos\", 1, {DICTIONARY_STREET_TYPE}, 582},\n+ {\"btween\", 1, {DICTIONARY_STOPWORD}, 908},\n+ {\"c.h\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"norh eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"northwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"co op\", 1, {DICTIONARY_COMPANY_TYPE}, 636},\n+ {\"nrtestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"north eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"proprietary\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"cutting\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"south east\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"carvn\", 1, {DICTIONARY_PLACE_NAME}, 787},\n+ {\"md\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n+ {\"grd blvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"streets\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"srt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"hbr\", 1, {DICTIONARY_STREET_TYPE}, 1055},\n+ {\"piaz\", 1, {DICTIONARY_STREET_TYPE}, 1126},\n+ {\"bsn\", 1, {DICTIONARY_STREET_TYPE}, 925},\n {\"cemetery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"exts\", 1, {DICTIONARY_STREET_TYPE}, 1017},\n- {\"trafficway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"t.rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"pike\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"county touring route\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"branch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ltd liability company\", 1, {DICTIONARY_COMPANY_TYPE}, 650},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"ctrl\", 1, {DICTIONARY_DIRECTIONAL}, 681},\n+ {\"north dakota\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"townhouse\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"raod\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n- {\"doc\", 1, {DICTIONARY_PERSONAL_TITLE}, 725},\n- {\"cty.r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"inter change\", 1, {DICTIONARY_STREET_TYPE}, 1066},\n- {\"rtt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 866},\n+ {\"norh westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"cswy\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 1241},\n+ {\"ga\", 1, {DICTIONARY_TOPONYM}, 1305},\n {\"harbor\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"tshp r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n {\"showroom\", 1, {DICTIONARY_UNIT}, -1},\n- {\"t.hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"cmmn\", 1, {DICTIONARY_STREET_TYPE}, 965},\n+ {\"nort west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cntr\", 1, {DICTIONARY_STREET_TYPE}, 680},\n+ {\"prt\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 865},\n+ {\"rrrow\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n+ {\"norh eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"midl\", 1, {DICTIONARY_SYNONYM}, 686},\n {\"primary school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr bde\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"ms\", 1, {DICTIONARY_PLACE_NAME}, 853},\n {\"public sector unit\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"strands\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r o\", 1, {DICTIONARY_UNIT}, 1377},\n- {\"cpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 720},\n+ {\"gtwy\", 1, {DICTIONARY_STREET_TYPE}, 1045},\n+ {\"cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 720},\n {\"brooks\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"baracks\", 1, {DICTIONARY_PLACE_NAME}, 782},\n- {\"minnesota\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"aves\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"cntrl\", 1, {DICTIONARY_DIRECTIONAL}, 681},\n {\"br\", 1, {DICTIONARY_STREET_TYPE}, 937},\n- {\"attorney at law\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 581},\n+ {\"vlge\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n {\"store\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"lt commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n {\"his royal highness\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cage\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"lieut colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n+ {\"rdy\", 1, {DICTIONARY_STREET_TYPE}, 1171},\n+ {\"ms\", 1, {DICTIONARY_POST_OFFICE}, 898},\n+ {\"g blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"trailer park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctr\", 1, {DICTIONARY_DIRECTIONAL}, 678},\n+ {\"wrd\", 1, {DICTIONARY_UNIT}, 1392},\n {\"newfoundland\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"crss\", 1, {DICTIONARY_STREET_TYPE}, 990},\n- {\"gd bd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"hd\", 1, {DICTIONARY_STREET_TYPE}, 1058},\n+ {\"mailbag\", 1, {DICTIONARY_POST_OFFICE}, 892},\n {\"georgia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"bttm\", 1, {DICTIONARY_STREET_TYPE}, 929},\n- {\"s e\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"de\", 1, {DICTIONARY_TOPONYM}, 1302},\n+ {\"norhw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"ranae\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cway\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"parkland\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n- {\"rosebowl\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cvp\", 1, {DICTIONARY_PLACE_NAME}, 791},\n {\"nunavut\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"m b a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 587},\n- {\"con\", 1, {DICTIONARY_STREET_TYPE}, 969},\n+ {\"twpr\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"legum doctor\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 605},\n+ {\"ste\", 1, {DICTIONARY_UNIT}, 1388},\n+ {\"plc\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n+ {\"s.rte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"vlly\", 1, {DICTIONARY_STREET_TYPE}, 1242},\n {\"pre school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"rvwy\", 1, {DICTIONARY_STREET_TYPE}, 1162},\n- {\"apartement\", 1, {DICTIONARY_UNIT}, 1362},\n- {\"sth e\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"trwy\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n- {\"bl\", 1, {DICTIONARY_QUALIFIER}, 900},\n- {\"conc\", 1, {DICTIONARY_STREET_TYPE}, 968},\n- {\"strt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"drv\", 1, {DICTIONARY_STREET_TYPE}, 1005},\n- {\"cty hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"cttg\", 1, {DICTIONARY_STREET_TYPE}, 1002},\n+ {\"animal hosp\", 1, {DICTIONARY_PLACE_NAME}, 779},\n+ {\"nrt estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"snd\", 1, {DICTIONARY_STREET_TYPE}, 1189},\n+ {\"whf\", 1, {DICTIONARY_STREET_TYPE}, 1255},\n+ {\"aged care facilities\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"cmns\", 1, {DICTIONARY_STREET_TYPE}, 970},\n {\"lounge\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"commander\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mktpl\", 1, {DICTIONARY_PLACE_NAME}, 835},\n- {\"ibc\", 1, {DICTIONARY_COMPANY_TYPE}, 643},\n- {\"med\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 836},\n- {\"university\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nwra\", 1, {DICTIONARY_PLACE_NAME}, 852},\n- {\"fline\", 1, {DICTIONARY_STREET_TYPE}, 1025},\n- {\"southeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"northe\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"nrth east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"prrs\", 1, {DICTIONARY_STREET_TYPE}, 1141},\n+ {\"missouri\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n+ {\"cst\", 1, {DICTIONARY_PLACE_NAME}, 794},\n+ {\"south e\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"plns\", 1, {DICTIONARY_STREET_TYPE}, 1132},\n+ {\"hstl\", 1, {DICTIONARY_PLACE_NAME}, 827},\n+ {\"tshp rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"state rt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n {\"judge\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sth east\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"doctor of medicine\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 593},\n- {\"alee\", 1, {DICTIONARY_STREET_TYPE}, 908},\n- {\"drvwy\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n+ {\"i\", 1, {DICTIONARY_STREET_TYPE}, 1072},\n+ {\"s.h.\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"ky\", 1, {DICTIONARY_TOPONYM}, 1313},\n+ {\"ll m\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 599},\n+ {\"lp\", 1, {DICTIONARY_COMPANY_TYPE}, 657},\n+ {\"lby\", 1, {DICTIONARY_UNIT}, 1376},\n+ {\"c.r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"nestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"chair man\", 1, {DICTIONARY_PERSONAL_TITLE}, 725},\n+ {\"right hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"ally\", 1, {DICTIONARY_STREET_TYPE}, 912},\n {\"nv\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"day care\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cts\", 1, {DICTIONARY_STREET_TYPE}, 982},\n- {\"sth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"twr\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 621},\n- {\"ultd\", 1, {DICTIONARY_COMPANY_TYPE}, 675},\n- {\"sheriff's ofc\", 1, {DICTIONARY_PLACE_NAME}, 873},\n- {\"northestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"comm\", 1, {DICTIONARY_STREET_TYPE}, 965},\n- {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 842},\n- {\"sole proprietorship\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"cio\", 1, {DICTIONARY_COMPANY_TYPE}, 631},\n+ {\"nu\", 1, {DICTIONARY_TOPONYM}, 1338},\n+ {\"llp\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n+ {\"rdgwy\", 1, {DICTIONARY_STREET_TYPE}, 1163},\n+ {\"hllw\", 1, {DICTIONARY_STREET_TYPE}, 1067},\n+ {\"xway\", 1, {DICTIONARY_STREET_TYPE}, 998},\n+ {\"svcwy\", 1, {DICTIONARY_STREET_TYPE}, 1180},\n+ {\"jewish community centre\", 1, {DICTIONARY_PLACE_NAME}, 833},\n {\"highlands\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"major general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"thicket\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"carav park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"exten\", 1, {DICTIONARY_STREET_TYPE}, 1016},\n+ {\"ice cream\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"yd\", 1, {DICTIONARY_STREET_TYPE}, 1257},\n {\"limited\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"carvn park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"flts\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 816},\n- {\"d litt\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n- {\"sthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"nthwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"m s e\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n- {\"appartments\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 779},\n- {\"deputy pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 724},\n- {\"nthe\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"co r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"cineplex\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"intsctn\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"shors\", 1, {DICTIONARY_STREET_TYPE}, 1184},\n+ {\"aged care center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mailservice\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 1131},\n+ {\"pkt\", 1, {DICTIONARY_STREET_TYPE}, 1136},\n+ {\"icecream\", 1, {DICTIONARY_PLACE_NAME}, 830},\n+ {\"nt\", 1, {DICTIONARY_COMPANY_TYPE}, 648},\n+ {\"prts\", 1, {DICTIONARY_STREET_TYPE}, 1139},\n+ {\"nrt eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"lks\", 1, {DICTIONARY_SYNONYM}, 1274},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"pharm d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 611},\n {\"villa\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"strwy\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"lagoon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"llm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 599},\n+ {\"x-road\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"pz\", 1, {DICTIONARY_STREET_TYPE}, 1134},\n {\"kindergarten\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cov\", 1, {DICTIONARY_STREET_TYPE}, 984},\n- {\"cntn\", 1, {DICTIONARY_STREET_TYPE}, 970},\n- {\"nth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"est\", 1, {DICTIONARY_STREET_TYPE}, 1013},\n+ {\"caravan resort\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"nrthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"caravan par\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"t hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"grand boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"clr\", 1, {DICTIONARY_STREET_TYPE}, 967},\n {\"marina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"xroad\", 1, {DICTIONARY_STREET_TYPE}, 992},\n+ {\"trafficway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ml\", 1, {DICTIONARY_POST_OFFICE}, 897},\n {\"rise\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grdn\", 1, {DICTIONARY_STREET_TYPE}, 1037},\n- {\"caravn park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"limited duration company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 650},\n- {\"s.highway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"prrs\", 1, {DICTIONARY_STREET_TYPE}, 1137},\n- {\"bch\", 1, {DICTIONARY_STREET_TYPE}, 923},\n+ {\"new jersey\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"county\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ps\", 1, {DICTIONARY_PLACE_NAME}, 816},\n+ {\"dns\", 1, {DICTIONARY_STREET_TYPE}, 1008},\n+ {\"gr bld\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"county road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jcts\", 1, {DICTIONARY_STREET_TYPE}, 1072},\n+ {\"south estn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"nrtwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"undertakings for collective onvestment in transferable securities\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"bngw\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 610},\n- {\"thru\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n- {\"north dakota\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"vermont\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"branch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gro\", 1, {DICTIONARY_STREET_TYPE}, 1052},\n+ {\"ntheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"inlt\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n+ {\"cc\", 1, {DICTIONARY_COMPANY_TYPE}, 632},\n+ {\"convalescent hospital\", 1, {DICTIONARY_PLACE_NAME}, 803},\n {\"stairs\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"g bd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"thorough fare\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n {\"head\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"detn\", 1, {DICTIONARY_PLACE_NAME}, 807},\n- {\"gd bvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"rms box\", 1, {DICTIONARY_POST_OFFICE}, 896},\n- {\"vice chairman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mun\", 1, {DICTIONARY_SYNONYM}, 1277},\n- {\"tshp.rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"lgt\", 1, {DICTIONARY_STREET_TYPE}, 1082},\n- {\"ri\", 1, {DICTIONARY_STREET_TYPE}, 1161},\n- {\"rowy\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"spe\", 1, {DICTIONARY_COMPANY_TYPE}, 671},\n- {\"tas\", 1, {DICTIONARY_TOPONYM}, 1348},\n- {\"terrasse\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"strs\", 1, {DICTIONARY_STREET_TYPE}, 1192},\n- {\"tsar\", 1, {DICTIONARY_PERSONAL_TITLE}, 723},\n+ {\"ph m\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 606},\n+ {\"n west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"fls\", 1, {DICTIONARY_STREET_TYPE}, 1024},\n+ {\"convalescent home\", 1, {DICTIONARY_PLACE_NAME}, 803},\n+ {\"prc\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n+ {\"farm\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"litt d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n+ {\"strte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"r h\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"cul-de-sac\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n+ {\"nortwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"d sc\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n {\"river\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"hd\", 1, {DICTIONARY_STREET_TYPE}, 1054},\n- {\"ctyd\", 1, {DICTIONARY_STREET_TYPE}, 983},\n- {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"mktplc\", 1, {DICTIONARY_PLACE_NAME}, 839},\n+ {\"sth estn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"hgths\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n {\"northwestern\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"sdg\", 1, {DICTIONARY_STREET_TYPE}, 1182},\n+ {\"jctn\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n {\"home\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"roads\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"co hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"m s\", 1, {DICTIONARY_PLACE_NAME}, 849},\n- {\"right honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"rr row\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n- {\"s east\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"wtrs\", 1, {DICTIONARY_STREET_TYPE}, 1246},\n+ {\"strata unit\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"or\", 1, {DICTIONARY_TOPONYM}, 1342},\n {\"northeast\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"p s c\", 1, {DICTIONARY_COMPANY_TYPE}, 662},\n+ {\"x ing\", 1, {DICTIONARY_STREET_TYPE}, 995},\n+ {\"nt & sa\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n {\"professor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"dwy\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n+ {\"l l p\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n {\"slope\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"mws\", 1, {DICTIONARY_STREET_TYPE}, 1097},\n+ {\"s wstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"avnu\", 1, {DICTIONARY_STREET_TYPE}, 920},\n {\"grounds\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"siding\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nortestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"cmnty\", 1, {DICTIONARY_PLACE_NAME}, 798},\n+ {\"vic\", 1, {DICTIONARY_TOPONYM}, 1357},\n+ {\"trfy\", 1, {DICTIONARY_STREET_TYPE}, 1225},\n {\"quadrant\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"pzza\", 1, {DICTIONARY_STREET_TYPE}, 1122},\n- {\"mfa\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 592},\n- {\"c.hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"westrn\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n- {\"bluf\", 1, {DICTIONARY_STREET_TYPE}, 926},\n+ {\"cara park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"follow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"hbrs\", 1, {DICTIONARY_STREET_TYPE}, 1056},\n+ {\"p l c\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n+ {\"cncrd\", 1, {DICTIONARY_STREET_TYPE}, 971},\n+ {\"m p adm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n {\"court\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trl\", 1, {DICTIONARY_STREET_TYPE}, 1222},\n- {\"m s\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 588},\n- {\"pr c\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n- {\"ofc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 854},\n+ {\"lieut governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n+ {\"coop\", 1, {DICTIONARY_COMPANY_TYPE}, 636},\n+ {\"junct\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"ohio\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"rsv\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 623},\n+ {\"so eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"ctge\", 1, {DICTIONARY_BUILDING_TYPE}, 616},\n {\"limited liability limited partnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"c.r.\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"ctg\", 1, {DICTIONARY_BUILDING_TYPE}, 612},\n- {\"public school\", 1, {DICTIONARY_PLACE_NAME}, 812},\n- {\"n\/a\", 1, {DICTIONARY_NULL}, 710},\n- {\"uns\", 1, {DICTIONARY_STREET_TYPE}, 1234},\n- {\"crf\", 1, {DICTIONARY_STREET_TYPE}, 988},\n- {\"pth\", 1, {DICTIONARY_STREET_TYPE}, 1119},\n- {\"anx\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 608},\n- {\"cty r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"rmp\", 1, {DICTIONARY_STREET_TYPE}, 1148},\n- {\"ally\", 1, {DICTIONARY_STREET_TYPE}, 908},\n- {\"vice pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 772},\n- {\"roller rink\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"congress man\", 1, {DICTIONARY_PERSONAL_TITLE}, 721},\n+ {\"c\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_STREET_TYPE}, 680},\n+ {\"dvwy\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n+ {\"boulv\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"rdge\", 1, {DICTIONARY_STREET_TYPE}, 1161},\n+ {\"trace\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"yrd\", 1, {DICTIONARY_STREET_TYPE}, 1257},\n+ {\"hm\", 1, {DICTIONARY_PLACE_NAME}, 825},\n+ {\"st.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"oeic\", 1, {DICTIONARY_COMPANY_TYPE}, 663},\n+ {\"hvn\", 1, {DICTIONARY_STREET_TYPE}, 1057},\n+ {\"sec\", 1, {DICTIONARY_PERSONAL_TITLE}, 767},\n {\"aat\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cty.rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n+ {\"green\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"concert hall\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"crd\", 1, {DICTIONARY_STREET_TYPE}, 992},\n- {\"bluffs\", 1, {DICTIONARY_STREET_TYPE}, 926},\n- {\"sthw\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"fare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 954},\n- {\"theaters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fl\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1028},\n- {\"yt\", 1, {DICTIONARY_TOPONYM}, 1360},\n- {\"s wst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"ofc tower\", 1, {DICTIONARY_PLACE_NAME}, 856},\n- {\"lieut general\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n- {\"trktrl\", 1, {DICTIONARY_STREET_TYPE}, 1226},\n- {\"dwns\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1004},\n- {\"rvr\", 1, {DICTIONARY_SYNONYM}, 1282},\n- {\"views\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rang\", 1, {DICTIONARY_STREET_TYPE}, 1153},\n- {\"causewy\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"phm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n+ {\"shor\", 1, {DICTIONARY_STREET_TYPE}, 1183},\n+ {\"st.route\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"nv\", 1, {DICTIONARY_TOPONYM}, 1325},\n+ {\"nrt westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"p d\", 1, {DICTIONARY_PLACE_NAME}, 864},\n+ {\"so estn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"nort eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"lees\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 715},\n+ {\"thwy\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n+ {\"culdesac\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n+ {\"cpl\", 1, {DICTIONARY_PERSONAL_TITLE}, 723},\n+ {\"th d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 607},\n+ {\"road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grt\", 1, {DICTIONARY_SYNONYM}, 1268},\n+ {\"pk\", 1, {DICTIONARY_STREET_TYPE}, 1127},\n+ {\"smt\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n+ {\"south west\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"cty.rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n+ {\"lake\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ct\", 1, {DICTIONARY_TOPONYM}, 1301},\n {\"yukon\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"office tower\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prekindergarten\", 1, {DICTIONARY_PLACE_NAME}, 864},\n- {\"congressman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"low\", 1, {DICTIONARY_SYNONYM}, 681},\n- {\"northeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"co.hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"cor\", 1, {DICTIONARY_STREET_TYPE}, 973},\n- {\"crk\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 985},\n+ {\"msnt\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 622},\n+ {\"nthe\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"mezz\", 1, {DICTIONARY_LEVEL}, 708},\n+ {\"ar\", 1, {DICTIONARY_TOPONYM}, 1295},\n+ {\"bus prk\", 1, {DICTIONARY_PLACE_NAME}, 789},\n+ {\"g\", 1, {DICTIONARY_LEVEL}, 704},\n {\"new mexico\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 761},\n- {\"lgf\", 1, {DICTIONARY_LEVEL}, 703},\n- {\"south eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"alwy\", 1, {DICTIONARY_STREET_TYPE}, 909},\n- {\"fty\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 614},\n- {\"utah\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"terace\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"sme ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 676},\n {\"garden\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"jtty\", 1, {DICTIONARY_PLACE_NAME}, 834},\n {\"master of laws\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"s.hi\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"state rd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"plms\", 1, {DICTIONARY_STREET_TYPE}, 1111},\n- {\"whrf\", 1, {DICTIONARY_STREET_TYPE}, 1251},\n- {\"sth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"cirt\", 1, {DICTIONARY_STREET_TYPE}, 958},\n- {\"twp.r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"parkways\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ent\", 1, {DICTIONARY_STREET_TYPE}, 1011},\n- {\"nortwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"bhouse\", 1, {DICTIONARY_PLACE_NAME}, 783},\n- {\"thor\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 882},\n- {\"shun\", 1, {DICTIONARY_STREET_TYPE}, 1181},\n- {\"ambassador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"hwye\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"caf\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 790},\n+ {\"nursing h\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"orchard\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"nort w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 736},\n+ {\"us rte\", 1, {DICTIONARY_STREET_TYPE}, 1240},\n+ {\"cetr\", 1, {DICTIONARY_STREET_TYPE}, 680},\n+ {\"nwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"st route\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"ranch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"out\", 1, {DICTIONARY_STREET_TYPE}, 1110},\n {\"wa\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 883},\n- {\"barbeque\", 1, {DICTIONARY_PLACE_NAME}, 781},\n- {\"nrtheast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"twp.hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"ml\", 1, {DICTIONARY_STREET_TYPE}, 836},\n {\"dene\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"st hway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"st rd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"ridges\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"grill\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rh\", 1, {DICTIONARY_PLACE_NAME}, 870},\n- {\"community centre\", 1, {DICTIONARY_PLACE_NAME}, 797},\n+ {\"subdivision\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"elbow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d.o\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 606},\n- {\"n west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"service road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"vice chairperson\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"wa\", 1, {DICTIONARY_TOPONYM}, 1355},\n- {\"boulevarde\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"mead\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"norhwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"fit\", 1, {DICTIONARY_STREET_TYPE}, 1027},\n- {\"cors\", 1, {DICTIONARY_STREET_TYPE}, 974},\n- {\"ride\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apartment\", 1, {DICTIONARY_UNIT}, -1},\n- {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n- {\"mdw\", 1, {DICTIONARY_STREET_TYPE}, 1092},\n- {\"c rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"nortwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"via\", 1, {DICTIONARY_STREET_TYPE}, 1240},\n- {\"nc\", 1, {DICTIONARY_TOPONYM}, 1329},\n- {\"cmmns\", 1, {DICTIONARY_STREET_TYPE}, 966},\n- {\"t.rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"ma\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 590},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"l p\", 1, {DICTIONARY_COMPANY_TYPE}, 653},\n- {\"gly\", 1, {DICTIONARY_STREET_TYPE}, 1049},\n- {\"interchange\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ltd gte\", 1, {DICTIONARY_COMPANY_TYPE}, 651},\n+ {\"c hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"sherrifs department\", 1, {DICTIONARY_PLACE_NAME}, 876},\n+ {\"northwest territories\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"road side\", 1, {DICTIONARY_STREET_TYPE}, 1170},\n+ {\"carwash\", 1, {DICTIONARY_PLACE_NAME}, 793},\n+ {\"drov\", 1, {DICTIONARY_STREET_TYPE}, 1011},\n+ {\"super market\", 1, {DICTIONARY_PLACE_NAME}, 882},\n+ {\"soeast\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"wisconsin\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"pns\", 1, {DICTIONARY_STREET_TYPE}, 1129},\n+ {\"stor\", 1, {DICTIONARY_PLACE_NAME}, 881},\n+ {\"s h\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"dv\", 1, {DICTIONARY_STREET_TYPE}, 1009},\n+ {\"norheastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"hosp\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"norhwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"shoppingtown\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"ci\", 1, {DICTIONARY_STREET_TYPE}, 962},\n+ {\"sens\", 1, {DICTIONARY_PERSONAL_TITLE}, 771},\n+ {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 982},\n+ {\"s.hw\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"pediatric\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vl\", 1, {DICTIONARY_QUALIFIER}, 884},\n- {\"mb\", 1, {DICTIONARY_TOPONYM}, 1312},\n- {\"anex\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 608},\n+ {\"n\/f\/a\", 1, {DICTIONARY_NO_ADDRESS}, 713},\n+ {\"ce\", 1, {DICTIONARY_STREET_TYPE}, 988},\n+ {\"brow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bcorp\", 1, {DICTIONARY_COMPANY_TYPE}, 630},\n+ {\"youth centre\", 1, {DICTIONARY_PLACE_NAME}, 891},\n+ {\"sthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"btm\", 1, {DICTIONARY_STREET_TYPE}, 933},\n {\"land\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hbrs\", 1, {DICTIONARY_STREET_TYPE}, 1052},\n+ {\"n east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"bg\", 1, {DICTIONARY_STREET_TYPE}, 946},\n+ {\"hrh\", 1, {DICTIONARY_PERSONAL_TITLE}, 735},\n+ {\"aprt\", 1, {DICTIONARY_UNIT}, 1366},\n {\"unlimited\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"g bde\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"lt cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n- {\"ter\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"intchg\", 1, {DICTIONARY_STREET_TYPE}, 1066},\n- {\"psge\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"brdway\", 1, {DICTIONARY_STREET_TYPE}, 942},\n+ {\"pc ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n+ {\"mdr\", 1, {DICTIONARY_STREET_TYPE}, 1099},\n+ {\"m eng\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 608},\n+ {\"cmnty\", 1, {DICTIONARY_PLACE_NAME}, 802},\n+ {\"swst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"c.rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n {\"by\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ofc towers\", 1, {DICTIONARY_PLACE_NAME}, 857},\n- {\"british columbia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"nt\", 1, {DICTIONARY_TOPONYM}, 1331},\n+ {\"flt\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1032},\n+ {\"tun\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n+ {\"nrt estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"brks\", 1, {DICTIONARY_STREET_TYPE}, 944},\n+ {\"co\", 1, {DICTIONARY_SYNONYM}, 1260},\n+ {\"t.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"dell\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"stairway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"boulv\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"twp hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"north e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"locked bag\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"c h\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"creek\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n {\"theatres\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"barbecue\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"brth\", 1, {DICTIONARY_UNIT}, 1365},\n- {\"n\/f\/a\", 1, {DICTIONARY_NO_ADDRESS}, 709},\n+ {\"fd\", 1, {DICTIONARY_STREET_TYPE}, 1027},\n+ {\"st.hway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"studios\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nursing hom\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"lps\", 1, {DICTIONARY_STREET_TYPE}, 1094},\n {\"public limited company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"hi\", 1, {DICTIONARY_TOPONYM}, 1302},\n- {\"mw\", 1, {DICTIONARY_STREET_TYPE}, 1096},\n+ {\"wyn\", 1, {DICTIONARY_STREET_TYPE}, 1256},\n {\"connection\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shl\", 1, {DICTIONARY_STREET_TYPE}, 1177},\n- {\"pse\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n- {\"mpal\", 1, {DICTIONARY_SYNONYM}, 1277},\n- {\"nort eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"shwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"n westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"cttg\", 1, {DICTIONARY_STREET_TYPE}, 998},\n- {\"la\", 1, {DICTIONARY_STREET_TYPE}, 1080},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 725},\n- {\"ltc\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n- {\"book store\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"co r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n+ {\"lg\", 1, {DICTIONARY_LEVEL}, 707},\n+ {\"supermarket\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"i c v c\", 1, {DICTIONARY_COMPANY_TYPE}, 649},\n+ {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"s p\", 1, {DICTIONARY_COMPANY_TYPE}, 672},\n {\"sargeant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"rooftop\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"over bridge\", 1, {DICTIONARY_STREET_TYPE}, 1107},\n {\"pre-kindergarten\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nat'l pk\", 1, {DICTIONARY_PLACE_NAME}, 850},\n- {\"bottm\", 1, {DICTIONARY_STREET_TYPE}, 929},\n- {\"gd fl\", 1, {DICTIONARY_LEVEL}, 701},\n- {\"robt\", 1, {DICTIONARY_GIVEN_NAME}, 696},\n- {\"la\", 1, {DICTIONARY_TOPONYM}, 1310},\n- {\"x-rd\", 1, {DICTIONARY_STREET_TYPE}, 992},\n- {\"s.hway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"headquarters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"follow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"o e i c\", 1, {DICTIONARY_COMPANY_TYPE}, 659},\n- {\"ln\", 1, {DICTIONARY_STREET_TYPE}, 1080},\n+ {\"villag\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n+ {\"nrt east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"bldg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 613},\n+ {\"natl pk\", 1, {DICTIONARY_PLACE_NAME}, 854},\n+ {\"strm\", 1, {DICTIONARY_SYNONYM}, 1287},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 764},\n+ {\"rdg\", 1, {DICTIONARY_STREET_TYPE}, 1161},\n+ {\"mun building\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"jnct\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"mail service\", 1, {DICTIONARY_POST_OFFICE}, 898},\n+ {\"loops\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"viaduct\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sq\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n {\"haven\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"motorway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"major gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n- {\"t.r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"nrthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"stheast\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"md\", 1, {DICTIONARY_STREET_TYPE}, 1094},\n- {\"common\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"elb\", 1, {DICTIONARY_STREET_TYPE}, 1014},\n+ {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 832},\n+ {\"spgs\", 1, {DICTIONARY_STREET_TYPE}, 1192},\n+ {\"vllg\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n+ {\"cvan park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"norh\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"private bag\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"mtn\", 1, {DICTIONARY_SYNONYM}, 1275},\n- {\"pa\", 1, {DICTIONARY_TOPONYM}, 1339},\n- {\"norteastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nsg\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"nurse home\", 1, {DICTIONARY_PLACE_NAME}, 853},\n- {\"circt\", 1, {DICTIONARY_STREET_TYPE}, 958},\n- {\"staterd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"s hw\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"gd bvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"ft\", 1, {DICTIONARY_UNIT}, 1032},\n {\"outlook\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fld\", 1, {DICTIONARY_STREET_TYPE}, 1023},\n- {\"c i c\", 1, {DICTIONARY_COMPANY_TYPE}, 631},\n- {\"dlitt\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n- {\"crts\", 1, {DICTIONARY_STREET_TYPE}, 982},\n- {\"ldg\", 1, {DICTIONARY_PLACE_NAME}, 831},\n+ {\"m ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"c.hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"sect\", 1, {DICTIONARY_QUALIFIER}, 906},\n+ {\"n eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"distrib\", 1, {DICTIONARY_PLACE_NAME}, 812},\n+ {\"co\", 1, {DICTIONARY_TOPONYM}, 1300},\n+ {\"north westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"cliff\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ar\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1126},\n+ {\"neast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n {\"knoll\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gp\", 1, {DICTIONARY_COMPANY_TYPE}, 640},\n+ {\"mun\", 1, {DICTIONARY_SYNONYM}, 1281},\n {\"recycling\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gtes\", 1, {DICTIONARY_STREET_TYPE}, 1040},\n- {\"tshp.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"cty.rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"pobox\", 1, {DICTIONARY_POST_OFFICE}, 895},\n {\"bay\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fshr\", 1, {DICTIONARY_STREET_TYPE}, 1032},\n- {\"cseo\", 1, {DICTIONARY_STREET_TYPE}, 975},\n- {\"co hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"north w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"sheriff's dept\", 1, {DICTIONARY_PLACE_NAME}, 872},\n- {\"connector\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rserv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n- {\"ldc\", 1, {DICTIONARY_COMPANY_TYPE}, 649},\n- {\"thick\", 1, {DICTIONARY_STREET_TYPE}, 1209},\n- {\"mba\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 587},\n+ {\"mls\", 1, {DICTIONARY_STREET_TYPE}, 1104},\n+ {\"yukon territory\", 1, {DICTIONARY_TOPONYM}, 1364},\n+ {\"cors\", 1, {DICTIONARY_STREET_TYPE}, 978},\n+ {\"edc\", 1, {DICTIONARY_COMPANY_TYPE}, 639},\n {\"alberta\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"srte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"ba\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 582},\n- {\"docs\", 1, {DICTIONARY_PERSONAL_TITLE}, 726},\n- {\"vue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"qys\", 1, {DICTIONARY_STREET_TYPE}, 1144},\n- {\"id\", 1, {DICTIONARY_TOPONYM}, 1303},\n- {\"mi\", 1, {DICTIONARY_STREET_TYPE}, 1098},\n- {\"u c i t s\", 1, {DICTIONARY_COMPANY_TYPE}, 674},\n- {\"b ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 599},\n- {\"clubhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"norhwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"fawy\", 1, {DICTIONARY_STREET_TYPE}, 1022},\n+ {\"lld\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 605},\n+ {\"nort estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"ns\", 1, {DICTIONARY_TOPONYM}, 1336},\n+ {\"tpke\", 1, {DICTIONARY_STREET_TYPE}, 1235},\n+ {\"r hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"det\", 1, {DICTIONARY_PLACE_NAME}, 811},\n+ {\"entr\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n+ {\"maisonette\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"southwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"t r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"croft\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrsg\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"d \/ b \/ a\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n+ {\"nrthw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"mail\", 1, {DICTIONARY_POST_OFFICE}, -1},\n {\"golf course\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"art\", 1, {DICTIONARY_STREET_TYPE}, 915},\n- {\"st.rte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"mt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"crt\", 1, {DICTIONARY_STREET_TYPE}, 981},\n- {\"plt\", 1, {DICTIONARY_STREET_TYPE}, 1129},\n- {\"ext\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1016},\n- {\"dale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"un\", 1, {DICTIONARY_UNIT}, 1386},\n- {\"n a\", 1, {DICTIONARY_NULL}, 710},\n- {\"bg\", 1, {DICTIONARY_STREET_TYPE}, 942},\n+ {\"abbey\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mpal bldg\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"pde\", 1, {DICTIONARY_STREET_TYPE}, 1116},\n+ {\"levl\", 1, {DICTIONARY_LEVEL}, 706},\n+ {\"raod\", 1, {DICTIONARY_STREET_TYPE}, 1168},\n+ {\"jty\", 1, {DICTIONARY_PLACE_NAME}, 834},\n+ {\"workshop\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"s hwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 1198},\n+ {\"resv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n+ {\"ok\", 1, {DICTIONARY_TOPONYM}, 1340},\n+ {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1234},\n+ {\"twp rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"glade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"brewery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"stheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"registered nurse\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"ofcs\", 1, {DICTIONARY_PLACE_NAME}, 855},\n- {\"prde\", 1, {DICTIONARY_STREET_TYPE}, 1112},\n {\"vets\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n- {\"hs\", 1, {DICTIONARY_BUILDING_TYPE}, 617},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 916},\n {\"top\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ofcr\", 1, {DICTIONARY_PERSONAL_TITLE}, 749},\n- {\"shoals\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lmb\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"stu\", 1, {DICTIONARY_UNIT}, 1382},\n- {\"abby\", 1, {DICTIONARY_STREET_TYPE}, 905},\n+ {\"mdws\", 1, {DICTIONARY_STREET_TYPE}, 1097},\n+ {\"vst\", 1, {DICTIONARY_STREET_TYPE}, 1247},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 1135},\n+ {\"shls\", 1, {DICTIONARY_STREET_TYPE}, 1182},\n+ {\"pths\", 1, {DICTIONARY_UNIT}, 1379},\n+ {\"d lit\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n+ {\"off\", 1, {DICTIONARY_UNIT}, 858},\n+ {\"baech\", 1, {DICTIONARY_STREET_TYPE}, 927},\n+ {\"nrteast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n {\"cardinal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"glns\", 1, {DICTIONARY_SYNONYM}, 1263},\n- {\"sowest\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"clstr\", 1, {DICTIONARY_STREET_TYPE}, 963},\n- {\"p s u\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n- {\"brnch\", 1, {DICTIONARY_STREET_TYPE}, 934},\n- {\"isld\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n- {\"bar be que\", 1, {DICTIONARY_PLACE_NAME}, 781},\n- {\"mrs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"number\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"rds\", 1, {DICTIONARY_STREET_TYPE}, 1169},\n+ {\"gd bde\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"department\", 1, {DICTIONARY_UNIT}, -1},\n- {\"bunglow\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 610},\n- {\"lmts\", 1, {DICTIONARY_STREET_TYPE}, 1083},\n- {\"sd\", 1, {DICTIONARY_TOPONYM}, 1346},\n- {\"va\", 1, {DICTIONARY_STREET_TYPE}, 1237},\n+ {\"cty.hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"jr h s\", 1, {DICTIONARY_PLACE_NAME}, 851},\n {\"s corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"lllp\", 1, {DICTIONARY_COMPANY_TYPE}, 651},\n- {\"grns\", 1, {DICTIONARY_SYNONYM}, 1266},\n- {\"aly\", 1, {DICTIONARY_STREET_TYPE}, 908},\n- {\"ladr\", 1, {DICTIONARY_STREET_TYPE}, 1077},\n+ {\"us highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ri\", 1, {DICTIONARY_TOPONYM}, 1347},\n+ {\"communitycentre\", 1, {DICTIONARY_PLACE_NAME}, 801},\n {\"reach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"spa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nrt e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"carpark\", 1, {DICTIONARY_PLACE_NAME}, 788},\n+ {\"cve\", 1, {DICTIONARY_STREET_TYPE}, 1001},\n+ {\"prom\", 1, {DICTIONARY_STREET_TYPE}, 1143},\n {\"route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lieut cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n- {\"lp\", 1, {DICTIONARY_COMPANY_TYPE}, 653},\n- {\"delicatessen\", 1, {DICTIONARY_PLACE_NAME}, 806},\n- {\"nestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"new jersey\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"c.hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"twy\", 1, {DICTIONARY_STREET_TYPE}, 1217},\n+ {\"drvwy\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n+ {\"nrt west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"norte\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"g p\", 1, {DICTIONARY_COMPANY_TYPE}, 644},\n+ {\"nort eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"farmer's market\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"t rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"sowst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"gln\", 1, {DICTIONARY_STREET_TYPE}, 1043},\n+ {\"boulavard\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"cirs\", 1, {DICTIONARY_STREET_TYPE}, 960},\n+ {\"rr r \/ o \/ w\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n+ {\"jr hs\", 1, {DICTIONARY_PLACE_NAME}, 851},\n+ {\"mil\", 1, {DICTIONARY_SYNONYM}, 1277},\n+ {\"viad\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n {\"youth center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"doctors\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PLACE_NAME}, -1},\n- {\"ladder\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shopping town\", 1, {DICTIONARY_PLACE_NAME}, 874},\n- {\"jnct\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"so e\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"ml\", 1, {DICTIONARY_STREET_TYPE}, 1103},\n+ {\"icvc\", 1, {DICTIONARY_COMPANY_TYPE}, 649},\n+ {\"sts\", 1, {DICTIONARY_STREET_TYPE}, 1206},\n+ {\"b ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 603},\n {\"link\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vllys\", 1, {DICTIONARY_STREET_TYPE}, 1239},\n {\"institute\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tshp rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"hl\", 1, {DICTIONARY_STREET_TYPE}, 1061},\n- {\"lieut col\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n+ {\"betw\", 1, {DICTIONARY_STOPWORD}, 908},\n+ {\"o e i c\", 1, {DICTIONARY_COMPANY_TYPE}, 663},\n {\"reserve\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n {\"shoal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n f a\", 1, {DICTIONARY_NO_ADDRESS}, 709},\n+ {\"frm\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 619},\n {\"prison\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ferry\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cowy\", 1, {DICTIONARY_STREET_TYPE}, 994},\n- {\"cty.r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n+ {\"western australia\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"pty\", 1, {DICTIONARY_COMPANY_TYPE}, 667},\n {\"field\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"club house\", 1, {DICTIONARY_PLACE_NAME}, 796},\n- {\"prts\", 1, {DICTIONARY_STREET_TYPE}, 1135},\n- {\"m c\", 1, {DICTIONARY_POST_OFFICE}, 895},\n- {\"sth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"mse\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"skwy\", 1, {DICTIONARY_STREET_TYPE}, 1187},\n+ {\"ptwy\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n {\"national recreation area\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"stwy\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"rt\", 1, {DICTIONARY_LEVEL}, 707},\n- {\"shrm\", 1, {DICTIONARY_UNIT}, 1379},\n- {\"north west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"brdg\", 1, {DICTIONARY_STREET_TYPE}, 937},\n- {\"n eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"norteastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"appartment\", 1, {DICTIONARY_UNIT}, 1362},\n- {\"cn\", 1, {DICTIONARY_DIRECTIONAL}, 677},\n- {\"c.h.\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"qy\", 1, {DICTIONARY_STREET_TYPE}, 1147},\n+ {\"upr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 697},\n+ {\"strd\", 1, {DICTIONARY_STREET_TYPE}, 1202},\n+ {\"louisiana\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"soeastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"blck\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 904},\n+ {\"e e i g\", 1, {DICTIONARY_COMPANY_TYPE}, 641},\n+ {\"twp.hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"raods\", 1, {DICTIONARY_STREET_TYPE}, 1169},\n {\"health center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"po\", 1, {DICTIONARY_POST_OFFICE}, 899},\n- {\"pns\", 1, {DICTIONARY_STREET_TYPE}, 1125},\n- {\"t hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n+ {\"rocks\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sl\", 1, {DICTIONARY_UNIT}, 1384},\n+ {\"mphil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 606},\n+ {\"sp\", 1, {DICTIONARY_COMPANY_TYPE}, 672},\n+ {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 746},\n {\"stop\", 1, {DICTIONARY_UNIT}, -1},\n {\"railroad right of way\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"corporal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kentucky\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"lynn\", 1, {DICTIONARY_STREET_TYPE}, 1095},\n+ {\"wd\", 1, {DICTIONARY_UNIT}, 1392},\n+ {\"fmtn\", 1, {DICTIONARY_STREET_TYPE}, 1037},\n {\"hi\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ofc twr\", 1, {DICTIONARY_PLACE_NAME}, 856},\n- {\"& co\", 1, {DICTIONARY_COMPANY_TYPE}, 630},\n- {\"ps\", 1, {DICTIONARY_PLACE_NAME}, 812},\n- {\"ids\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n- {\"dns\", 1, {DICTIONARY_STREET_TYPE}, 1004},\n- {\"btwn\", 1, {DICTIONARY_STOPWORD}, 904},\n+ {\"mot\", 1, {DICTIONARY_PLACE_NAME}, 844},\n+ {\"allyway\", 1, {DICTIONARY_STREET_TYPE}, 913},\n+ {\"no fixed address\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n+ {\"twp.hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"showground\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"memorial\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"dup\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 613},\n- {\"rvra\", 1, {DICTIONARY_STREET_TYPE}, 1163},\n- {\"terrac\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n+ {\"tshp.hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"t.r.\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"state route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ambl\", 1, {DICTIONARY_STREET_TYPE}, 910},\n- {\"str\", 1, {DICTIONARY_STREET_TYPE}, 1201},\n+ {\"lt gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n+ {\"twp r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"twp.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"lodg\", 1, {DICTIONARY_PLACE_NAME}, 835},\n+ {\"twpr\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"vice chairwoman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"tshp.rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"nsw\", 1, {DICTIONARY_TOPONYM}, 1326},\n- {\"nrth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"rest\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"accs\", 1, {DICTIONARY_STREET_TYPE}, 906},\n- {\"sestn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"dr\", 1, {DICTIONARY_STREET_TYPE}, 1009},\n+ {\"dept\", 1, {DICTIONARY_UNIT}, 1372},\n+ {\"pa\", 1, {DICTIONARY_TOPONYM}, 1343},\n+ {\"in\", 1, {DICTIONARY_TOPONYM}, 1309},\n+ {\"chas\", 1, {DICTIONARY_STREET_TYPE}, 958},\n+ {\"c van\", 1, {DICTIONARY_STREET_TYPE}, 954},\n+ {\"south wstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n {\"night club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bk\", 1, {DICTIONARY_STREET_TYPE}, 919},\n+ {\"wm\", 1, {DICTIONARY_GIVEN_NAME}, 701},\n+ {\"littl\", 1, {DICTIONARY_SYNONYM}, 1090},\n+ {\"stheastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"apt\", 1, {DICTIONARY_UNIT}, 1366},\n {\"home for the aged\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"alleyway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bros\", 1, {DICTIONARY_SYNONYM}, 1258},\n {\"dip\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"strte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"nh\", 1, {DICTIONARY_TOPONYM}, 1327},\n+ {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"vws\", 1, {DICTIONARY_STREET_TYPE}, 1246},\n {\"european company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"to\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"exit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"hanger\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"so eastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cty hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"deli\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"oregon\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"crct\", 1, {DICTIONARY_STREET_TYPE}, 962},\n {\"ut\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"sec\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 902},\n- {\"pt\", 1, {DICTIONARY_STREET_TYPE}, 1133},\n- {\"hw\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n+ {\"site\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"pd\", 1, {DICTIONARY_LEVEL}, 710},\n+ {\"norh western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"units\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prd\", 1, {DICTIONARY_STREET_TYPE}, 1112},\n- {\"major general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sme pvt\", 1, {DICTIONARY_COMPANY_TYPE}, 676},\n {\"path\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kys\", 1, {DICTIONARY_STREET_TYPE}, 1074},\n- {\"eeig\", 1, {DICTIONARY_COMPANY_TYPE}, 637},\n- {\"us hwy\", 1, {DICTIONARY_STREET_TYPE}, 1235},\n- {\"co r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"ml\", 1, {DICTIONARY_POST_OFFICE}, 893},\n- {\"st rt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"alabama\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"bsm\", 1, {DICTIONARY_LEVEL}, 702},\n {\"dam\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"mnr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 833},\n- {\"rnge\", 1, {DICTIONARY_STREET_TYPE}, 1153},\n- {\"strata unit\", 1, {DICTIONARY_UNIT}, -1},\n- {\"bookstore\", 1, {DICTIONARY_PLACE_NAME}, 784},\n- {\"trak\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"hot\", 1, {DICTIONARY_PLACE_NAME}, 828},\n+ {\"gly\", 1, {DICTIONARY_STREET_TYPE}, 1053},\n+ {\"south wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"cp\", 1, {DICTIONARY_STREET_TYPE}, 951},\n+ {\"nfa\", 1, {DICTIONARY_NO_ADDRESS}, 713},\n+ {\"isld\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n+ {\"rst\", 1, {DICTIONARY_STREET_TYPE}, 1159},\n+ {\"co.hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"air national guard base\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pf\", 1, {DICTIONARY_LEVEL}, 705},\n+ {\"turn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"floor\", 1, {DICTIONARY_LEVEL}, -1},\n {\"theatre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"members of parliament\", 1, {DICTIONARY_PERSONAL_TITLE}, 745},\n- {\"township road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"seastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"masonic retirement village\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"bnglw\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 614},\n+ {\"iss\", 1, {DICTIONARY_STREET_TYPE}, 1074},\n {\"grange\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"esq\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 588},\n {\"belt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"norhwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"lc\", 1, {DICTIONARY_COMPANY_TYPE}, 648},\n+ {\"& company\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n {\"stadium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cs\", 1, {DICTIONARY_STREET_TYPE}, 990},\n+ {\"wys\", 1, {DICTIONARY_STREET_TYPE}, 1252},\n {\"dental\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rsve\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 619},\n- {\"ranch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"roadside mail box\", 1, {DICTIONARY_POST_OFFICE}, 896},\n- {\"tri\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1225},\n- {\"aged care centre\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"sth western\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"dvwy\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n+ {\"expressway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gra\", 1, {DICTIONARY_STREET_TYPE}, 1049},\n+ {\"nrt e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"s hway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"lp\", 1, {DICTIONARY_STREET_TYPE}, 1093},\n+ {\"crts\", 1, {DICTIONARY_STREET_TYPE}, 986},\n+ {\"h r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 735},\n {\"doctor of science\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"gway\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n- {\"row\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"court house\", 1, {DICTIONARY_PLACE_NAME}, 802},\n- {\"norte\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"ltd co\", 1, {DICTIONARY_COMPANY_TYPE}, 648},\n- {\"nort eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"bungalo\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 610},\n- {\"espl\", 1, {DICTIONARY_STREET_TYPE}, 1012},\n- {\"xrds\", 1, {DICTIONARY_STREET_TYPE}, 993},\n+ {\"nrsng hm\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"resv\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"bsment\", 1, {DICTIONARY_LEVEL}, 702},\n+ {\"srt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"under pass\", 1, {DICTIONARY_STREET_TYPE}, 1236},\n {\"quadrangle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ct\", 1, {DICTIONARY_TOPONYM}, 1297},\n- {\"st.route\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"nort wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"hotl\", 1, {DICTIONARY_PLACE_NAME}, 828},\n+ {\"nwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"esplanade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"isle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"crossway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"park lands\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n- {\"pkw\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n+ {\"serviceway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ftrk\", 1, {DICTIONARY_STREET_TYPE}, 1030},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n+ {\"mister\", 1, {DICTIONARY_PERSONAL_TITLE}, 750},\n+ {\"hds\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n+ {\"avnues\", 1, {DICTIONARY_STREET_TYPE}, 921},\n {\"federal credit union\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"padk\", 1, {DICTIONARY_STREET_TYPE}, 1110},\n {\"bungalow\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n- {\"convalescent\", 1, {DICTIONARY_PLACE_NAME}, 799},\n- {\"pub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sherrifs dept\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"grnds\", 1, {DICTIONARY_STREET_TYPE}, 1051},\n+ {\"s west\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"vl\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 628},\n+ {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 870},\n {\"nc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"abbey\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jewish community center\", 1, {DICTIONARY_PLACE_NAME}, 833},\n+ {\"and co\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n {\"center for the arts\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"div\", 1, {DICTIONARY_STREET_TYPE}, 1001},\n+ {\"mpp\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n+ {\"vlla\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 628},\n+ {\"jbt\", 1, {DICTIONARY_TOPONYM}, 1311},\n {\"nonprofit\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"jnc\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n- {\"scorp\", 1, {DICTIONARY_COMPANY_TYPE}, 667},\n- {\"cp\", 1, {DICTIONARY_SYNONYM}, 948},\n- {\"pthwy\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n+ {\"commons\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"his honour\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n+ {\"avenu\", 1, {DICTIONARY_STREET_TYPE}, 920},\n+ {\"crst\", 1, {DICTIONARY_STREET_TYPE}, 991},\n+ {\"bwk\", 1, {DICTIONARY_STREET_TYPE}, 931},\n {\"geriatric unit\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"centre for aged care\", 1, {DICTIONARY_PLACE_NAME}, 773},\n+ {\"west virginia\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"suite\", 1, {DICTIONARY_UNIT}, -1},\n- {\"intl\", 1, {DICTIONARY_SYNONYM}, 1268},\n- {\"private\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"arty\", 1, {DICTIONARY_STREET_TYPE}, 919},\n+ {\"locked mail bag\", 1, {DICTIONARY_POST_OFFICE}, 892},\n {\"lobby\", 2, {DICTIONARY_LEVEL, DICTIONARY_UNIT}, -1},\n {\"lower ground floor\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"vice chair person\", 1, {DICTIONARY_PERSONAL_TITLE}, 769},\n+ {\"bh\", 1, {DICTIONARY_PLACE_NAME}, 787},\n {\"secondary school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"van park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"lk\", 1, {DICTIONARY_STREET_TYPE}, 1085},\n- {\"g\", 1, {DICTIONARY_LEVEL}, 700},\n+ {\"corp\", 1, {DICTIONARY_COMPANY_TYPE}, 637},\n+ {\"dba\", 1, {DICTIONARY_COMPANY_TYPE}, 638},\n+ {\"c.r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"hangar\", 1, {DICTIONARY_UNIT}, -1},\n {\"pavilion\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"st hwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"offc\", 1, {DICTIONARY_UNIT}, 854},\n+ {\"new york\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"villg\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n {\"wade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd\", 1, {DICTIONARY_LEVEL}, 701},\n- {\"tshp.hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"quad\", 1, {DICTIONARY_QUALIFIER}, 901},\n- {\"amphitheater\", 1, {DICTIONARY_PLACE_NAME}, 774},\n- {\"gra\", 1, {DICTIONARY_STREET_TYPE}, 1045},\n- {\"fwy\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n+ {\"cliffs\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vsta\", 1, {DICTIONARY_STREET_TYPE}, 1247},\n+ {\"township road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"st.highway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"clnde\", 1, {DICTIONARY_STREET_TYPE}, 968},\n+ {\"sole proprietorship\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"nrtwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"vll\", 1, {DICTIONARY_PLACE_NAME}, 628},\n+ {\"rsrv\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 623},\n {\"retreat\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"sc\", 1, {DICTIONARY_TOPONYM}, 1345},\n- {\"greens\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"rmp\", 1, {DICTIONARY_STREET_TYPE}, 1152},\n+ {\"shoppingcentre\", 1, {DICTIONARY_PLACE_NAME}, 878},\n {\"queensland\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"blk\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 900},\n- {\"roadhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dstr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 808},\n- {\"avns\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"vy\", 1, {DICTIONARY_STREET_TYPE}, 1238},\n- {\"southwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"cty.hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"nestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"atty at law\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 585},\n+ {\"barbeque\", 1, {DICTIONARY_PLACE_NAME}, 785},\n+ {\"service rd\", 1, {DICTIONARY_STREET_TYPE}, 1179},\n+ {\"subdiv\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n+ {\"lt colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n+ {\"dorms\", 1, {DICTIONARY_PLACE_NAME}, 815},\n+ {\"lgt\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n+ {\"tshp r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"edge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"d.o\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 610},\n {\"private first class\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 732},\n- {\"dr\", 1, {DICTIONARY_STREET_TYPE}, 1005},\n- {\"nurses home\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ice cream\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gymnasium\", 1, {DICTIONARY_PLACE_NAME}, 823},\n+ {\"sthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"sbwy\", 1, {DICTIONARY_STREET_TYPE}, 1209},\n+ {\"sk\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"apartments\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"carp\", 1, {DICTIONARY_UNIT}, 1370},\n+ {\"s hi\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"ridgeway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lwr\", 3, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 681},\n- {\"jtn\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n- {\"norhe\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"vic\", 1, {DICTIONARY_TOPONYM}, 1353},\n- {\"bwk\", 1, {DICTIONARY_STREET_TYPE}, 927},\n- {\"nth w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"tshp.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"on\", 1, {DICTIONARY_TOPONYM}, 1341},\n+ {\"close\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"g bld\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"claim\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"stm\", 1, {DICTIONARY_SYNONYM}, 1283},\n- {\"reef\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrth western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"p s e\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n- {\"norheastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"i\", 1, {DICTIONARY_STREET_TYPE}, 1068},\n- {\"p l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 661},\n- {\"courtyard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cty hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"ll b\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 589},\n- {\"s eastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"part\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pla\", 1, {DICTIONARY_STREET_TYPE}, 1126},\n- {\"fcty\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 614},\n+ {\"t rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"carav park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"prarie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pkwys\", 1, {DICTIONARY_STREET_TYPE}, 1119},\n+ {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 681},\n+ {\"towers\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ma\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n+ {\"tshp.hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"township\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"southwst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"bway\", 1, {DICTIONARY_STREET_TYPE}, 942},\n {\"homes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"right and honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"road mailbox\", 1, {DICTIONARY_POST_OFFICE}, 896},\n- {\"aged care center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sign\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"app\", 1, {DICTIONARY_STREET_TYPE}, 916},\n+ {\"lr\", 1, {DICTIONARY_SYNONYM}, 685},\n+ {\"south carolina\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"mansion\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"mnt\", 1, {DICTIONARY_SYNONYM}, 1274},\n- {\"n east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"inter state\", 1, {DICTIONARY_STREET_TYPE}, 1068},\n- {\"bps\", 1, {DICTIONARY_STREET_TYPE}, 945},\n+ {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1176},\n {\"subway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trs\", 1, {DICTIONARY_STREET_TYPE}, 1224},\n- {\"fry\", 1, {DICTIONARY_STREET_TYPE}, 1022},\n- {\"co hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"trce\", 1, {DICTIONARY_STREET_TYPE}, 1223},\n+ {\"bl\", 1, {DICTIONARY_STREET_TYPE}, 936},\n {\"public school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"norhestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"convalescent centre\", 1, {DICTIONARY_PLACE_NAME}, 799},\n- {\"forest\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"piazza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apch\", 1, {DICTIONARY_STREET_TYPE}, 912},\n+ {\"ucits\", 1, {DICTIONARY_COMPANY_TYPE}, 678},\n {\"motel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"ra\", 1, {DICTIONARY_STREET_TYPE}, 1147},\n+ {\"svc road\", 1, {DICTIONARY_STREET_TYPE}, 1179},\n+ {\"twp rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"centers\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tun\", 1, {DICTIONARY_STREET_TYPE}, 1228},\n {\"crossroads\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hi\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n- {\"frds\", 1, {DICTIONARY_SYNONYM}, 1258},\n- {\"southe\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"sowestrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"shp \/ centre\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"lt\", 1, {DICTIONARY_STREET_TYPE}, 1090},\n+ {\"nrth west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 886},\n+ {\"community mail bag\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"fway\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n {\"riviera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"edge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"wls\", 1, {DICTIONARY_STREET_TYPE}, 1254},\n+ {\"co.rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"idaho\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"soestrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"nwt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"kitchen\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dentist\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mi\", 1, {DICTIONARY_TOPONYM}, 1315},\n- {\"stateroad\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"msn\", 1, {DICTIONARY_PLACE_NAME}, 838},\n- {\"nrsng hm\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"so west\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"tpke\", 1, {DICTIONARY_STREET_TYPE}, 1231},\n+ {\"mdl\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"european private company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"otlk\", 1, {DICTIONARY_STREET_TYPE}, 1110},\n+ {\"t hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"mnrs\", 1, {DICTIONARY_PLACE_NAME}, 838},\n {\"single member company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ltd \/ gte\", 1, {DICTIONARY_COMPANY_TYPE}, 647},\n+ {\"aged care\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"bdy\", 1, {DICTIONARY_STREET_TYPE}, 935},\n {\"arts center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nat'l\", 1, {DICTIONARY_SYNONYM}, 1278},\n- {\"pfc\", 1, {DICTIONARY_PERSONAL_TITLE}, 752},\n+ {\"business park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"norhwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"act\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"dle\", 1, {DICTIONARY_STREET_TYPE}, 999},\n- {\"cuwy\", 1, {DICTIONARY_STREET_TYPE}, 995},\n- {\"health centre\", 1, {DICTIONARY_PLACE_NAME}, 820},\n- {\"sw\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"bwy\", 1, {DICTIONARY_STREET_TYPE}, 942},\n+ {\"folw\", 1, {DICTIONARY_STREET_TYPE}, 1033},\n+ {\"north western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"brce\", 1, {DICTIONARY_STREET_TYPE}, 937},\n+ {\"vlg\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, 888},\n+ {\"t.hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"n l\", 1, {DICTIONARY_COMPANY_TYPE}, 661},\n {\"fireline\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"south w\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"sk\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"jr h s\", 1, {DICTIONARY_PLACE_NAME}, 847},\n- {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"norhwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"lieut\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n+ {\"ho\", 1, {DICTIONARY_BUILDING_TYPE}, 621},\n {\"national park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"st road\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"turnpike\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"artl\", 1, {DICTIONARY_STREET_TYPE}, 914},\n- {\"nthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"diner\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sxn\", 1, {DICTIONARY_QUALIFIER}, 906},\n+ {\"aly\", 1, {DICTIONARY_STREET_TYPE}, 912},\n+ {\"co hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"we\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 629},\n {\"attorney\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"nrt westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"gtr\", 1, {DICTIONARY_SYNONYM}, 1265},\n- {\"connecticut\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"st highway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"skwy\", 1, {DICTIONARY_STREET_TYPE}, 1183},\n- {\"nrth estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"rear of\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"swstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"nrthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"cvan\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 954},\n {\"jetty\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mail service\", 1, {DICTIONARY_POST_OFFICE}, 894},\n {\"airport\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"xwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 994},\n- {\"ny\", 1, {DICTIONARY_TOPONYM}, 1327},\n- {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"blg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 609},\n+ {\"tsse\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"s \/ centre\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"pb\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"cst\", 1, {DICTIONARY_STREET_TYPE}, 991},\n {\"frontage\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apparement\", 1, {DICTIONARY_UNIT}, 1362},\n- {\"co rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"res\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n- {\"so wst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"townhouses\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nrte\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"north eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"farms\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"general patnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"dsc\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n- {\"nat'l park\", 1, {DICTIONARY_PLACE_NAME}, 850},\n- {\"lgt general\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n- {\"d b a\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n+ {\"hwy\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"otlt\", 1, {DICTIONARY_STREET_TYPE}, 1109},\n+ {\"r m b\", 1, {DICTIONARY_POST_OFFICE}, 900},\n+ {\"divers\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n+ {\"mbth\", 1, {DICTIONARY_UNIT}, 1378},\n+ {\"jr high school\", 1, {DICTIONARY_PLACE_NAME}, 851},\n+ {\"meadow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mrkt\", 1, {DICTIONARY_PLACE_NAME}, 852},\n+ {\"roadside mailbox\", 1, {DICTIONARY_POST_OFFICE}, 900},\n {\"pei\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"union\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_STREET_TYPE}, -1},\n- {\"qd\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 901},\n+ {\"afb\", 1, {DICTIONARY_PLACE_NAME}, 780},\n+ {\"trn\", 1, {DICTIONARY_STREET_TYPE}, 1234},\n {\"market\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"member of parliament\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n- {\"hawaii\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"cls\", 1, {DICTIONARY_STREET_TYPE}, 962},\n+ {\"nrth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"southwstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"pharmd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 611},\n+ {\"se\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"bus pk\", 1, {DICTIONARY_PLACE_NAME}, 789},\n+ {\"nat'l\", 1, {DICTIONARY_SYNONYM}, 1282},\n+ {\"blt\", 1, {DICTIONARY_STREET_TYPE}, 928},\n {\"crest\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"twp.hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"ptway\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n- {\"lkt\", 1, {DICTIONARY_STREET_TYPE}, 1088},\n- {\"rear\", 1, {DICTIONARY_UNIT}, -1},\n- {\"so western\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"csway\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"glde\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n- {\"sce\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n- {\"l l l p\", 1, {DICTIONARY_COMPANY_TYPE}, 651},\n- {\"ky\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n- {\"ovrb\", 1, {DICTIONARY_STREET_TYPE}, 1107},\n- {\"acrs\", 1, {DICTIONARY_STREET_TYPE}, 907},\n+ {\"ran\", 1, {DICTIONARY_STREET_TYPE}, 1153},\n+ {\"c.rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"tshp.r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"resrv\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"cso\", 1, {DICTIONARY_STREET_TYPE}, 980},\n+ {\"hrh\", 1, {DICTIONARY_PERSONAL_TITLE}, 734},\n+ {\"statehighway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"st rte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"bowl\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tshp.r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"clde\", 1, {DICTIONARY_STREET_TYPE}, 968},\n+ {\"norhe\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n {\"saint\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"colorado\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"arch bishop\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s westrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"twp r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"mkt\", 1, {DICTIONARY_PLACE_NAME}, 848},\n+ {\"wl\", 1, {DICTIONARY_STREET_TYPE}, 1253},\n {\"access\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trlr\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 623},\n- {\"prarie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"south eastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"rapid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 795},\n- {\"rm\", 1, {DICTIONARY_UNIT}, 1378},\n- {\"rmd\", 1, {DICTIONARY_POST_OFFICE}, 898},\n- {\"g blvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"shrs\", 1, {DICTIONARY_STREET_TYPE}, 1184},\n+ {\"mp\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"centre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"norteastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"ne\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"near\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"showground\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cotts\", 1, {DICTIONARY_PLACE_NAME}, 800},\n- {\"cty rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"xrd\", 1, {DICTIONARY_STREET_TYPE}, 992},\n- {\"ohio\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"c.r.\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"hses\", 1, {DICTIONARY_PLACE_NAME}, 825},\n+ {\"blf\", 1, {DICTIONARY_STREET_TYPE}, 930},\n+ {\"mtel\", 1, {DICTIONARY_PLACE_NAME}, 844},\n+ {\"north estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"cntr\", 1, {DICTIONARY_STREET_TYPE}, 975},\n+ {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 990},\n+ {\"ma\", 1, {DICTIONARY_TOPONYM}, 1318},\n+ {\"bayoo\", 1, {DICTIONARY_STREET_TYPE}, 926},\n+ {\"str.way\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n+ {\"sister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"reverend\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bsmnt\", 1, {DICTIONARY_LEVEL}, 698},\n+ {\"hospice\", 1, {DICTIONARY_PLACE_NAME}, 826},\n {\"bottom\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"na\", 1, {DICTIONARY_NULL}, 710},\n- {\"center for the aged\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"so wstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"co\", 1, {DICTIONARY_COMPANY_TYPE}, 633},\n+ {\"public sector enterprise\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"courtyard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 770},\n+ {\"lagoon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"co r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"vl\", 1, {DICTIONARY_SYNONYM}, 1288},\n+ {\"basement\", 1, {DICTIONARY_LEVEL}, 702},\n+ {\"mississippi\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"fl\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"t rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"ret village\", 1, {DICTIONARY_PLACE_NAME}, 874},\n {\"southeastern\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"tshp.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"sherffis office\", 1, {DICTIONARY_PLACE_NAME}, 873},\n- {\"cnwy\", 1, {DICTIONARY_STREET_TYPE}, 953},\n- {\"grge\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 616},\n+ {\"ph\", 1, {DICTIONARY_UNIT}, 1379},\n {\"overbridge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"litt d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n- {\"avenus\", 1, {DICTIONARY_STREET_TYPE}, 917},\n+ {\"lgn\", 1, {DICTIONARY_STREET_TYPE}, 1082},\n+ {\"co.r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"nh\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"pd\", 1, {DICTIONARY_PLACE_NAME}, 860},\n {\"police station\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"tenancy\", 1, {DICTIONARY_UNIT}, -1},\n- {\"vista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nthestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"gr boul\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"range\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"approach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"st.h\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"jhs\", 1, {DICTIONARY_PLACE_NAME}, 847},\n+ {\"cty.rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"exp\", 1, {DICTIONARY_STREET_TYPE}, 1019},\n {\"acres\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"knls\", 1, {DICTIONARY_STREET_TYPE}, 1076},\n- {\"circel\", 1, {DICTIONARY_STREET_TYPE}, 955},\n- {\"state road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"township\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"nort western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"cottgs\", 1, {DICTIONARY_PLACE_NAME}, 800},\n- {\"g boul\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"nthwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"bsmt\", 1, {DICTIONARY_LEVEL}, 702},\n+ {\"gn\", 1, {DICTIONARY_STREET_TYPE}, 1050},\n+ {\"natl prk\", 1, {DICTIONARY_PLACE_NAME}, 854},\n {\"bachelor of education\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"bk\", 1, {DICTIONARY_STREET_TYPE}, 923},\n+ {\"b a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n {\"lynne\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"marketplace\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prek\", 1, {DICTIONARY_PLACE_NAME}, 864},\n- {\"p f c\", 1, {DICTIONARY_PERSONAL_TITLE}, 752},\n+ {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 698},\n+ {\"strd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"spring\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grn\", 1, {DICTIONARY_STREET_TYPE}, 1046},\n- {\"ex\", 1, {DICTIONARY_STREET_TYPE}, 1016},\n+ {\"vly\", 1, {DICTIONARY_STREET_TYPE}, 1242},\n+ {\"angb\", 1, {DICTIONARY_PLACE_NAME}, 781},\n+ {\"espl\", 1, {DICTIONARY_STREET_TYPE}, 1016},\n+ {\"hrd\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n+ {\"rnd\", 1, {DICTIONARY_STREET_TYPE}, 1175},\n {\"sisters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"annx\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 608},\n+ {\"military\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"lab\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"id\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"brgs\", 1, {DICTIONARY_STREET_TYPE}, 943},\n- {\"nrt west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"rty\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 867},\n+ {\"pway\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n {\"pope\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ltd liability co\", 1, {DICTIONARY_COMPANY_TYPE}, 650},\n- {\"lit d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n+ {\"prkwy\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n {\"cabin\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"nthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"penthouse\", 1, {DICTIONARY_UNIT}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1127},\n- {\"swest\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"nrthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"stateroute\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"bdwy\", 1, {DICTIONARY_STREET_TYPE}, 938},\n+ {\"sc d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n+ {\"limited duration company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"hs\", 1, {DICTIONARY_BUILDING_TYPE}, 621},\n {\"reservation\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"societa cooperativa europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n+ {\"hrbr\", 1, {DICTIONARY_STREET_TYPE}, 1055},\n+ {\"sportsground\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"junctions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"course\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"st.road\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"dd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 591},\n- {\"right honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"valleys\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"nrth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"null\", 1, {DICTIONARY_NULL}, -1},\n- {\"pthway\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n+ {\"office twrs\", 1, {DICTIONARY_PLACE_NAME}, 861},\n {\"dame\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ar\", 1, {DICTIONARY_TOPONYM}, 1291},\n+ {\"low\", 1, {DICTIONARY_SYNONYM}, 685},\n {\"elementary school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"exts\", 1, {DICTIONARY_STREET_TYPE}, 1021},\n+ {\"fl\", 1, {DICTIONARY_STREET_TYPE}, 1023},\n+ {\"s.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"us rte\", 1, {DICTIONARY_STREET_TYPE}, 1236},\n+ {\"r\", 1, {DICTIONARY_SYNONYM}, 1286},\n+ {\"m f a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n+ {\"avnue\", 1, {DICTIONARY_STREET_TYPE}, 920},\n {\"nook\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"circ\", 1, {DICTIONARY_STREET_TYPE}, 958},\n- {\"d lit\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n- {\"stheastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"master of philosophy\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"cntr\", 1, {DICTIONARY_STREET_TYPE}, 676},\n- {\"co.hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"key\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pobox\", 1, {DICTIONARY_POST_OFFICE}, 891},\n- {\"north eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"twpr\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"nrth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"comms\", 1, {DICTIONARY_STREET_TYPE}, 966},\n- {\"grd blvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"prt\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 861},\n+ {\"norh estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"apts\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 783},\n+ {\"biz pk\", 1, {DICTIONARY_PLACE_NAME}, 789},\n+ {\"sthwest\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"gd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"esmt\", 1, {DICTIONARY_STREET_TYPE}, 1012},\n+ {\"mw\", 1, {DICTIONARY_STREET_TYPE}, 1100},\n+ {\"norh wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"wv\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"blt\", 1, {DICTIONARY_STREET_TYPE}, 924},\n+ {\"ontario\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"ent\", 1, {DICTIONARY_COMPANY_TYPE}, 640},\n {\"officer\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 1134},\n- {\"psla\", 1, {DICTIONARY_STREET_TYPE}, 1121},\n- {\"sth\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n- {\"hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n- {\"dorm\", 1, {DICTIONARY_PLACE_NAME}, 810},\n+ {\"c r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"street\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ut\", 1, {DICTIONARY_TOPONYM}, 1351},\n+ {\"the yukon\", 1, {DICTIONARY_TOPONYM}, 1364},\n {\"section\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 753},\n- {\"lr\", 1, {DICTIONARY_SYNONYM}, 681},\n+ {\"po box\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"amphitheatre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"prince\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 865},\n {\"lane\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trce\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n- {\"fls\", 1, {DICTIONARY_STREET_TYPE}, 1020},\n- {\"ks\", 1, {DICTIONARY_TOPONYM}, 1308},\n+ {\"cty.hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"grdns\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n {\"masonic homes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"performing arts center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"of\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"mb\", 1, {DICTIONARY_UNIT}, 1374},\n- {\"lgt gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n- {\"xing\", 1, {DICTIONARY_STREET_TYPE}, 991},\n+ {\"break\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"townline\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"norh eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"co hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"incorporated\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"dve\", 1, {DICTIONARY_STREET_TYPE}, 1005},\n- {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 727},\n- {\"ci\", 1, {DICTIONARY_STREET_TYPE}, 958},\n- {\"in\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"twp\", 1, {DICTIONARY_QUALIFIER}, 903},\n- {\"cntrl\", 1, {DICTIONARY_DIRECTIONAL}, 677},\n- {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"nth east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"inc\", 1, {DICTIONARY_COMPANY_TYPE}, 646},\n+ {\"artery\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nsw\", 1, {DICTIONARY_TOPONYM}, 1330},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 761},\n+ {\"nrs\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"rserv\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"sa\", 1, {DICTIONARY_TOPONYM}, 1351},\n+ {\"concord\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"fy\", 1, {DICTIONARY_STREET_TYPE}, 1022},\n+ {\"nevada\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"rmd\", 1, {DICTIONARY_POST_OFFICE}, 902},\n {\"masonic home\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hous\", 1, {DICTIONARY_BUILDING_TYPE}, 617},\n- {\"cutt\", 1, {DICTIONARY_STREET_TYPE}, 998},\n- {\"brw\", 1, {DICTIONARY_STREET_TYPE}, 941},\n+ {\"centre\", 1, {DICTIONARY_STREET_TYPE}, 680},\n+ {\"tramway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cty rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n {\"wynd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"crcs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 794},\n- {\"basn\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"so westrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"ctr\", 1, {DICTIONARY_DIRECTIONAL}, 682},\n+ {\"roadside mail box\", 1, {DICTIONARY_POST_OFFICE}, 900},\n {\"colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"paddock\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rnch\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n- {\"norhw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"south estrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"mtns\", 1, {DICTIONARY_SYNONYM}, 1276},\n- {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"right and honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"ctg\", 1, {DICTIONARY_STREET_TYPE}, 1002},\n+ {\"stll\", 1, {DICTIONARY_UNIT}, 1384},\n+ {\"al\", 1, {DICTIONARY_TOPONYM}, 1291},\n+ {\"rt honorable\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 760},\n {\"broadway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"correctional facility\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"iss\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n- {\"resrv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n+ {\"trd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"master of engineering\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"vice chair man\", 1, {DICTIONARY_PERSONAL_TITLE}, 768},\n- {\"nightclub\", 1, {DICTIONARY_PLACE_NAME}, 843},\n- {\"sthestn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"nrth\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"st rt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"tunnel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"por\", 1, {DICTIONARY_UNIT}, 1380},\n+ {\"ksk\", 1, {DICTIONARY_UNIT}, 1374},\n {\"arms\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nthwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"s highway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"ofcs\", 1, {DICTIONARY_PLACE_NAME}, 859},\n {\"foundation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"nrt estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"tennessee\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"rightofway\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n+ {\"twp rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"spr\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n+ {\"grd bld\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"va\", 1, {DICTIONARY_STREET_TYPE}, 1241},\n+ {\"m s\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 592},\n {\"autoroute\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"national trust & savings association\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n- {\"lieut\", 1, {DICTIONARY_PERSONAL_TITLE}, 736},\n- {\"bttms\", 1, {DICTIONARY_STREET_TYPE}, 930},\n- {\"lnwy\", 1, {DICTIONARY_STREET_TYPE}, 1081},\n+ {\"srd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"over look\", 1, {DICTIONARY_STREET_TYPE}, 1112},\n+ {\"tlwy\", 1, {DICTIONARY_STREET_TYPE}, 1217},\n+ {\"med\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 840},\n {\"boarding house\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"csg\", 1, {DICTIONARY_STREET_TYPE}, 991},\n- {\"va\", 1, {DICTIONARY_TOPONYM}, 1354},\n- {\"n wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"fort\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"ind park\", 1, {DICTIONARY_PLACE_NAME}, 827},\n- {\"s rd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"southw\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"s wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"t.r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"kennel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m p a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n- {\"ky\", 1, {DICTIONARY_TOPONYM}, 1309},\n- {\"meadow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tunl\", 1, {DICTIONARY_STREET_TYPE}, 1228},\n- {\"twp.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"rserve\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n- {\"range\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"corseo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hrd\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n+ {\"vice chairman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"nrtwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"lockedbag\", 1, {DICTIONARY_POST_OFFICE}, 892},\n+ {\"cultural centre\", 1, {DICTIONARY_PLACE_NAME}, 808},\n+ {\"so east\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"north wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"rsrv\", 1, {DICTIONARY_PLACE_NAME}, 872},\n {\"velodrome\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 585},\n- {\"#\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n+ {\"twr\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 625},\n {\"mr\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cty hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n {\"doctor of laws\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"nwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"community mail bag\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"grtr\", 1, {DICTIONARY_SYNONYM}, 1269},\n+ {\"cp\", 1, {DICTIONARY_SYNONYM}, 952},\n {\"racecourse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"frd\", 1, {DICTIONARY_STREET_TYPE}, 1031},\n- {\"lt gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n+ {\"knl\", 1, {DICTIONARY_STREET_TYPE}, 1079},\n+ {\"m c\", 1, {DICTIONARY_POST_OFFICE}, 899},\n+ {\"ovlk\", 1, {DICTIONARY_STREET_TYPE}, 1112},\n {\"west\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"fire station\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"raceway\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vineyard\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"carp\", 1, {DICTIONARY_UNIT}, 1366},\n- {\"shor\", 1, {DICTIONARY_STREET_TYPE}, 1179},\n- {\"ctr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_STREET_TYPE}, 676},\n+ {\"ldg\", 1, {DICTIONARY_PLACE_NAME}, 835},\n+ {\"connector\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"x rd\", 1, {DICTIONARY_STREET_TYPE}, 996},\n {\"basement\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"sq\", 1, {DICTIONARY_STREET_TYPE}, 1190},\n- {\"tmwy\", 1, {DICTIONARY_STREET_TYPE}, 1223},\n- {\"t.r.\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"shctr\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"c h\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"california\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"pennsylvania\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"s.h\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"appr\", 1, {DICTIONARY_STREET_TYPE}, 912},\n- {\"vt\", 1, {DICTIONARY_TOPONYM}, 1352},\n {\"right of way\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fire trail\", 1, {DICTIONARY_STREET_TYPE}, 1027},\n- {\"grdbd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"cds\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"huf\", 1, {DICTIONARY_COMPANY_TYPE}, 645},\n+ {\"nt sa\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n {\"cultural center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"rpds\", 1, {DICTIONARY_STREET_TYPE}, 1152},\n- {\"sta\", 1, {DICTIONARY_PLACE_NAME}, 876},\n- {\"sgt\", 1, {DICTIONARY_PERSONAL_TITLE}, 762},\n- {\"cyn\", 1, {DICTIONARY_STREET_TYPE}, 949},\n+ {\"l\", 1, {DICTIONARY_LEVEL}, 706},\n+ {\"spc\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1190},\n {\"estate\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"twp.h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"estates\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cul\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"br\", 1, {DICTIONARY_STREET_TYPE}, 934},\n- {\"nr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n- {\"jewish community center\", 1, {DICTIONARY_PLACE_NAME}, 829},\n+ {\"northw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"hts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n+ {\"tshp.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"lf\", 1, {DICTIONARY_STREET_TYPE}, 1091},\n {\"illinois\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"pway\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n+ {\"co rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"national\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ste\", 1, {DICTIONARY_PERSONAL_TITLE}, 759},\n- {\"ms ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n- {\"pei\", 1, {DICTIONARY_TOPONYM}, 1340},\n- {\"sth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"southestn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"st.rd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 758},\n+ {\"wd\", 1, {DICTIONARY_SYNONYM}, 1289},\n {\"kiosk\", 1, {DICTIONARY_UNIT}, -1},\n- {\"t.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"snr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 712},\n- {\"gd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 646},\n+ {\"i\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n {\"county highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ovlk\", 1, {DICTIONARY_STREET_TYPE}, 1108},\n- {\"doing business as\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"nestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"pnt\", 1, {DICTIONARY_STREET_TYPE}, 1137},\n+ {\"ntsa\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n {\"passage\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lieut gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n {\"jail\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 1131},\n- {\"nt\", 1, {DICTIONARY_TOPONYM}, 1333},\n+ {\"triangle\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n {\"no liability\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"ward\", 1, {DICTIONARY_UNIT}, -1},\n {\"saints\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jnr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 711},\n- {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 720},\n+ {\"twp.rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"league\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"european private company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"l c\", 1, {DICTIONARY_COMPANY_TYPE}, 648},\n+ {\"cty.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"nursing\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"maj general\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n {\"sherrif's office\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"wi\", 1, {DICTIONARY_TOPONYM}, 1358},\n+ {\"so estrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"ht\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n+ {\"host\", 1, {DICTIONARY_PLACE_NAME}, 827},\n {\"lakes\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"elp\", 1, {DICTIONARY_COMPANY_TYPE}, 638},\n- {\"cul-de-sac\", 1, {DICTIONARY_STREET_TYPE}, 996},\n- {\"us highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"downes\", 1, {DICTIONARY_SYNONYM}, 1008},\n+ {\"ugf\", 1, {DICTIONARY_LEVEL}, 712},\n {\"bank\", 3, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"foot way\", 1, {DICTIONARY_STREET_TYPE}, 1030},\n- {\"vla\", 1, {DICTIONARY_PLACE_NAME}, 624},\n- {\"tasmania\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"ll d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n+ {\"m\", 1, {DICTIONARY_POST_OFFICE}, 897},\n+ {\"lgt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n+ {\"master in arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n+ {\"biz prk\", 1, {DICTIONARY_PLACE_NAME}, 789},\n {\"swimming pool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"berth\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"bottms\", 1, {DICTIONARY_STREET_TYPE}, 934},\n+ {\"pkld\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n {\"reservoir\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"byu\", 1, {DICTIONARY_STREET_TYPE}, 922},\n- {\"saloon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"d th\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 603},\n+ {\"h r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 734},\n+ {\"ky\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"dway\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n {\"b corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"l l p\", 1, {DICTIONARY_COMPANY_TYPE}, 652},\n- {\"int'l\", 1, {DICTIONARY_SYNONYM}, 1268},\n- {\"plz\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n- {\"is\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n- {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 639},\n- {\"bar be cue\", 1, {DICTIONARY_PLACE_NAME}, 781},\n- {\"sens\", 1, {DICTIONARY_PERSONAL_TITLE}, 767},\n- {\"hts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n- {\"sestrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"post office box\", 1, {DICTIONARY_POST_OFFICE}, 891},\n- {\"st wy\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"northwest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"m p adm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 1136},\n- {\"bot\", 1, {DICTIONARY_STREET_TYPE}, 929},\n- {\"cars\", 1, {DICTIONARY_UNIT}, 1367},\n- {\"qdgl\", 1, {DICTIONARY_STREET_TYPE}, 1142},\n+ {\"dwy\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n+ {\"h s\", 1, {DICTIONARY_PLACE_NAME}, 850},\n+ {\"pky\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"inter state\", 1, {DICTIONARY_STREET_TYPE}, 1072},\n+ {\"laneway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nort east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"part\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ft\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 821},\n+ {\"paddock\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"wstn\", 1, {DICTIONARY_DIRECTIONAL}, 699},\n+ {\"shoppingcenter\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"anx\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 612},\n+ {\"c rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"ia\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"strnd\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"devn\", 1, {DICTIONARY_STREET_TYPE}, 1004},\n+ {\"rw\", 1, {DICTIONARY_STREET_TYPE}, 1177},\n {\"international\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"nth western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"hall\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"nrth west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"ofc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 858},\n {\"little\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"gd boul\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"az\", 1, {DICTIONARY_TOPONYM}, 1290},\n+ {\"crse\", 1, {DICTIONARY_STREET_TYPE}, 984},\n+ {\"postoffice\", 1, {DICTIONARY_POST_OFFICE}, 903},\n {\"lookout\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mo\", 1, {DICTIONARY_TOPONYM}, 1318},\n- {\"twp.rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n+ {\"vlt\", 1, {DICTIONARY_UNIT}, 1391},\n+ {\"pde\", 1, {DICTIONARY_SYNONYM}, 1285},\n {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"prkway\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n {\"thoroughway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"look out\", 1, {DICTIONARY_STREET_TYPE}, 1088},\n- {\"north wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"aprt\", 1, {DICTIONARY_PLACE_NAME}, 778},\n- {\"nh\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"lgt cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n+ {\"vice pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 776},\n+ {\"nrt wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"houses\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"car wash\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nthw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"wksp\", 1, {DICTIONARY_UNIT}, 1389},\n- {\"nj\", 1, {DICTIONARY_TOPONYM}, 1324},\n- {\"bte\", 1, {DICTIONARY_STREET_TYPE}, 944},\n+ {\"common\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"estrn\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"tshp rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"grbd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"factory\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"seast\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"harbour\", 1, {DICTIONARY_STREET_TYPE}, 1055},\n {\"lt\", 1, {DICTIONARY_STREET_TYPE}, 1086},\n- {\"la\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"st\", 1, {DICTIONARY_STREET_TYPE}, 1201},\n {\"gulch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tx\", 1, {DICTIONARY_TOPONYM}, 1350},\n- {\"fy\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 614},\n- {\"wshp\", 1, {DICTIONARY_UNIT}, 1389},\n- {\"gdfl\", 1, {DICTIONARY_LEVEL}, 701},\n+ {\"southestrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"prde\", 1, {DICTIONARY_STREET_TYPE}, 1116},\n+ {\"vermont\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"grd\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n+ {\"rose bowl\", 1, {DICTIONARY_STREET_TYPE}, 1174},\n {\"doctor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"circle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d phil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n- {\"pnte\", 1, {DICTIONARY_STREET_TYPE}, 1134},\n+ {\"dm\", 1, {DICTIONARY_PLACE_NAME}, 809},\n+ {\"centre for the arts\", 1, {DICTIONARY_PLACE_NAME}, 795},\n+ {\"valley\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"co.rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n {\"shop\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"ugfl\", 1, {DICTIONARY_LEVEL}, 708},\n- {\"bachelor of art\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 582},\n- {\"concs\", 1, {DICTIONARY_STREET_TYPE}, 969},\n- {\"boulavard\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"natl wildlife refuge area\", 1, {DICTIONARY_PLACE_NAME}, 852},\n- {\"rks\", 1, {DICTIONARY_STREET_TYPE}, 1168},\n- {\"nth e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"country clb\", 1, {DICTIONARY_PLACE_NAME}, 801},\n- {\"lieut gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n- {\"trk\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"soc\", 1, {DICTIONARY_COMPANY_TYPE}, 677},\n+ {\"end\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rvr\", 1, {DICTIONARY_SYNONYM}, 1286},\n+ {\"& co\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n+ {\"nat'l prk\", 1, {DICTIONARY_PLACE_NAME}, 854},\n+ {\"ofc twrs\", 1, {DICTIONARY_PLACE_NAME}, 861},\n+ {\"utah\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"fd\", 1, {DICTIONARY_PLACE_NAME}, 818},\n+ {\"brk\", 1, {DICTIONARY_STREET_TYPE}, 943},\n {\"roadside delivery\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"bbq\", 1, {DICTIONARY_UNIT}, 1364},\n- {\"park land\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n- {\"societa privata europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 671},\n- {\"fire track\", 1, {DICTIONARY_STREET_TYPE}, 1026},\n+ {\"ride\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tshp hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"sumt\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n {\"arizona\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"strp\", 1, {DICTIONARY_STREET_TYPE}, 1203},\n- {\"c van park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"n a\", 1, {DICTIONARY_COMPANY_TYPE}, 655},\n- {\"tshp hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 678},\n- {\"i\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n+ {\"nth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"sth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"slpe\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1188},\n+ {\"trt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"nortwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 917},\n+ {\"hlds\", 1, {DICTIONARY_STREET_TYPE}, 1062},\n+ {\"bywy\", 1, {DICTIONARY_STREET_TYPE}, 950},\n {\"animal hospital\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"tn\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"t.rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"natl\", 1, {DICTIONARY_SYNONYM}, 1278},\n- {\"f\", 1, {DICTIONARY_UNIT}, 1028},\n+ {\"avens\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"nrtw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"shopping center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pharmd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 607},\n- {\"ksk\", 1, {DICTIONARY_UNIT}, 1370},\n- {\"gt\", 1, {DICTIONARY_SYNONYM}, 1264},\n+ {\"vice chair woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 774},\n+ {\"twp hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"auditorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"close\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r \/ o \/ w\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"swy\", 1, {DICTIONARY_STREET_TYPE}, 1176},\n- {\"n \/ f \/ a\", 1, {DICTIONARY_NO_ADDRESS}, 709},\n+ {\"mpal\", 1, {DICTIONARY_SYNONYM}, 1281},\n+ {\"wky\", 1, {DICTIONARY_STREET_TYPE}, 1249},\n+ {\"culture centre\", 1, {DICTIONARY_PLACE_NAME}, 807},\n {\"port\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n {\"down\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ltd gte\", 1, {DICTIONARY_COMPANY_TYPE}, 647},\n+ {\"str way\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n {\"platform\", 1, {DICTIONARY_LEVEL}, -1},\n+ {\"hme\", 1, {DICTIONARY_PLACE_NAME}, 825},\n+ {\"stps\", 1, {DICTIONARY_STREET_TYPE}, 1201},\n {\"mailcenter\", 1, {DICTIONARY_POST_OFFICE}, -1},\n {\"massachusetts\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"hglds\", 1, {DICTIONARY_STREET_TYPE}, 1058},\n- {\"bde\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"lookthrough company\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n- {\"investment company with variable capital\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"lse\", 1, {DICTIONARY_UNIT}, 1375},\n+ {\"parkway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rt honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"crematorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"lck\", 1, {DICTIONARY_SYNONYM}, 1275},\n {\"forge\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"n wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"no fixed address\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n+ {\"trlr\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 627},\n+ {\"turnpike\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cmmns\", 1, {DICTIONARY_STREET_TYPE}, 970},\n+ {\"concse\", 1, {DICTIONARY_STREET_TYPE}, 973},\n {\"extension\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n {\"hill\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"blf\", 1, {DICTIONARY_STREET_TYPE}, 926},\n- {\"rtn\", 1, {DICTIONARY_STREET_TYPE}, 1156},\n+ {\"bdg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 613},\n+ {\"norteast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"sthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n {\"joint venture\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"monument\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"rd\", 1, {DICTIONARY_STREET_TYPE}, 1168},\n {\"gate\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"lt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n- {\"esplanade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grd bde\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"music hall\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"num\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n {\"gully\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bend\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bri\", 1, {DICTIONARY_STREET_TYPE}, 937},\n- {\"otlk\", 1, {DICTIONARY_STREET_TYPE}, 1106},\n- {\"cliffs\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"thruway\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n- {\"ps\", 1, {DICTIONARY_PLACE_NAME}, 865},\n- {\"bachelor of science\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 583},\n- {\"so wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"pathway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tasmania\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"byp\", 1, {DICTIONARY_STREET_TYPE}, 949},\n+ {\"hngr\", 1, {DICTIONARY_UNIT}, 1373},\n+ {\"trwy\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"lnk\", 1, {DICTIONARY_STREET_TYPE}, 1089},\n+ {\"loc\", 1, {DICTIONARY_UNIT}, 1377},\n+ {\"roadhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"chambers\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"t r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n {\"public pool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vice chair\", 1, {DICTIONARY_PERSONAL_TITLE}, 769},\n {\"locked bag\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"nrteastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"business park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tshp.h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"d d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 595},\n+ {\"psu\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n {\"groves\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"diner\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1224},\n+ {\"north e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n {\"nb\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 922},\n+ {\"shp\", 1, {DICTIONARY_PLACE_NAME}, 879},\n+ {\"preschool\", 1, {DICTIONARY_PLACE_NAME}, 867},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 886},\n {\"dormitories\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"close corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"nursing centre\", 1, {DICTIONARY_PLACE_NAME}, 848},\n+ {\"clstr\", 1, {DICTIONARY_STREET_TYPE}, 967},\n {\"mps\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"no\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n {\"highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"back\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hi rd\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n- {\"rmbl\", 1, {DICTIONARY_STREET_TYPE}, 1147},\n- {\"north wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"st.wy\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"intg\", 1, {DICTIONARY_STREET_TYPE}, 1066},\n- {\"shrs\", 1, {DICTIONARY_STREET_TYPE}, 1180},\n- {\"tline\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n- {\"south wst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 1174},\n- {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"dstrb\", 1, {DICTIONARY_PLACE_NAME}, 808},\n- {\"p office box\", 1, {DICTIONARY_POST_OFFICE}, 891},\n+ {\"norhwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"h u f\", 1, {DICTIONARY_COMPANY_TYPE}, 645},\n+ {\"nth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"frnt\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1039},\n+ {\"sthe\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"nort e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"thruway\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"fitr\", 1, {DICTIONARY_STREET_TYPE}, 1031},\n {\"drove\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"junctions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mem\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 837},\n- {\"cty.hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"shopping\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"gdfl\", 1, {DICTIONARY_LEVEL}, 705},\n+ {\"hth\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n+ {\"nthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"m s ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"ltc\", 1, {DICTIONARY_COMPANY_TYPE}, 658},\n+ {\"gr blvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"st hw\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"enterprise\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"fore shore\", 1, {DICTIONARY_STREET_TYPE}, 1032},\n- {\"break\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"llc\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n+ {\"bs\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 587},\n {\"pharmacy\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"impasse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"terrace\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"llb\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 589},\n- {\"primary school\", 1, {DICTIONARY_PLACE_NAME}, 812},\n+ {\"nort wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"brook\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"emperor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"btw\", 1, {DICTIONARY_STOPWORD}, 904},\n- {\"co hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"sprngs\", 1, {DICTIONARY_STREET_TYPE}, 1188},\n+ {\"atty\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 585},\n+ {\"crecent\", 1, {DICTIONARY_STREET_TYPE}, 990},\n {\"pa\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"brig gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 714},\n- {\"plc\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n- {\"pst\", 1, {DICTIONARY_POST_OFFICE}, 899},\n- {\"nl\", 1, {DICTIONARY_COMPANY_TYPE}, 657},\n+ {\"nth e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"hieghts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n+ {\"hos\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"hway\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"vineyard\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"wa\", 1, {DICTIONARY_TOPONYM}, 1361},\n {\"proprietary limited\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"archbishop\", 1, {DICTIONARY_PERSONAL_TITLE}, 713},\n- {\"north wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"nrth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"s.route\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 828},\n+ {\"dd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 595},\n+ {\"ms\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 592},\n+ {\"rgwy\", 1, {DICTIONARY_STREET_TYPE}, 1163},\n+ {\"major gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 747},\n+ {\"vt\", 1, {DICTIONARY_TOPONYM}, 1356},\n {\"house\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"rang\", 1, {DICTIONARY_STREET_TYPE}, 1157},\n {\"strand\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fr\", 1, {DICTIONARY_PERSONAL_TITLE}, 728},\n- {\"cl\", 1, {DICTIONARY_STREET_TYPE}, 962},\n- {\"pass\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"md\", 1, {DICTIONARY_STREET_TYPE}, 1098},\n+ {\"n a\", 1, {DICTIONARY_COMPANY_TYPE}, 659},\n+ {\"st.hi\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"intg\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n {\"senator\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"amble\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ests\", 1, {DICTIONARY_STREET_TYPE}, 1014},\n- {\"ft\", 1, {DICTIONARY_UNIT}, 1028},\n- {\"lvel\", 1, {DICTIONARY_LEVEL}, 702},\n- {\"ok\", 1, {DICTIONARY_TOPONYM}, 1336},\n+ {\"prm\", 1, {DICTIONARY_STREET_TYPE}, 1143},\n+ {\"shnt\", 1, {DICTIONARY_STREET_TYPE}, 1185},\n+ {\"nrthwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cen\", 1, {DICTIONARY_STREET_TYPE}, 680},\n+ {\"over pass\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n+ {\"fds\", 1, {DICTIONARY_STREET_TYPE}, 1028},\n {\"aquarium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"concession\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sect\", 1, {DICTIONARY_QUALIFIER}, 902},\n+ {\"pklds\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n+ {\"s w\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n {\"carspace\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"midle\", 1, {DICTIONARY_DIRECTIONAL}, 682},\n- {\"north westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 679},\n- {\"neast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"rs\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"cr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 989},\n+ {\"tshp rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"rnch\", 1, {DICTIONARY_STREET_TYPE}, 1154},\n {\"lady\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"norh wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"wk\", 1, {DICTIONARY_STREET_TYPE}, 1248},\n {\"freeway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nort estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"dc\", 1, {DICTIONARY_TOPONYM}, 1299},\n- {\"rsbl\", 1, {DICTIONARY_STREET_TYPE}, 1170},\n- {\"cabn\", 1, {DICTIONARY_BUILDING_TYPE}, 611},\n- {\"htel\", 1, {DICTIONARY_PLACE_NAME}, 824},\n+ {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 1138},\n+ {\"waters\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"caratel\", 1, {DICTIONARY_PLACE_NAME}, 791},\n {\"bridge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"crief\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nursing ho\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"center for aged care\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"high road\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n- {\"extn\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1016},\n- {\"grdns\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n- {\"lt governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n- {\"qld\", 1, {DICTIONARY_TOPONYM}, 1342},\n- {\"mt\", 1, {DICTIONARY_SYNONYM}, 1274},\n- {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 729},\n- {\"ga\", 1, {DICTIONARY_TOPONYM}, 1301},\n- {\"southwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"nrtheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"norteast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"norh wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"nth west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"wy\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"norh w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"rofw\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"c.rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n+ {\"sqs\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"s eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"gdns\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n+ {\"tce\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"co.r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"nrthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"sowstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"ladr\", 1, {DICTIONARY_STREET_TYPE}, 1081},\n+ {\"fst\", 1, {DICTIONARY_SYNONYM}, 1261},\n+ {\"n t\", 1, {DICTIONARY_COMPANY_TYPE}, 648},\n+ {\"ntheastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"crt\", 1, {DICTIONARY_STREET_TYPE}, 985},\n+ {\"s.highway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"m phil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 606},\n+ {\"svwy\", 1, {DICTIONARY_STREET_TYPE}, 1180},\n+ {\"lt general\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n+ {\"cir\", 1, {DICTIONARY_STREET_TYPE}, 959},\n {\"ramble\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrt\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"pct\", 1, {DICTIONARY_PLACE_NAME}, 862},\n+ {\"mead\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"fl\", 1, {DICTIONARY_LEVEL}, 703},\n+ {\"nort\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"unvrsty\", 1, {DICTIONARY_PLACE_NAME}, 886},\n {\"convalescent center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"gte\", 1, {DICTIONARY_STREET_TYPE}, 1039},\n- {\"soeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cncd\", 1, {DICTIONARY_STREET_TYPE}, 971},\n+ {\"cty rd\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"al\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"northwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"retirement v\", 1, {DICTIONARY_PLACE_NAME}, 870},\n- {\"d d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 591},\n+ {\"ofcr\", 1, {DICTIONARY_PERSONAL_TITLE}, 753},\n {\"church\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sprng\", 1, {DICTIONARY_STREET_TYPE}, 1191},\n+ {\"pk\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 862},\n {\"veterinary\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"non profit\", 1, {DICTIONARY_COMPANY_TYPE}, 658},\n- {\"burg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"town houses\", 1, {DICTIONARY_PLACE_NAME}, 884},\n+ {\"stu\", 1, {DICTIONARY_UNIT}, 1386},\n+ {\"ups\", 1, {DICTIONARY_STREET_TYPE}, 1236},\n+ {\"wy\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"society\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1207},\n- {\"green\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apartments\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"preschool\", 1, {DICTIONARY_PLACE_NAME}, 863},\n+ {\"s.road\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"litl\", 1, {DICTIONARY_SYNONYM}, 1090},\n+ {\"chr\", 1, {DICTIONARY_PLACE_NAME}, 797},\n+ {\"general patnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"nrth w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"captain\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vis\", 1, {DICTIONARY_STREET_TYPE}, 1243},\n- {\"hosptl\", 1, {DICTIONARY_PLACE_NAME}, 822},\n- {\"cetr\", 1, {DICTIONARY_STREET_TYPE}, 676},\n- {\"wds\", 1, {DICTIONARY_SYNONYM}, 1286},\n- {\"gtway\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n- {\"cross roads\", 1, {DICTIONARY_STREET_TYPE}, 993},\n- {\"pkway\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"sh ctr\", 1, {DICTIONARY_PLACE_NAME}, 874},\n- {\"orch\", 1, {DICTIONARY_SYNONYM}, 1280},\n+ {\"intn\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"drwy\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n+ {\"nrteastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"pllc\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n+ {\"pne\", 1, {DICTIONARY_STREET_TYPE}, 1128},\n+ {\"b\/t\", 1, {DICTIONARY_STOPWORD}, 908},\n+ {\"cmmn\", 1, {DICTIONARY_STREET_TYPE}, 969},\n+ {\"phwy\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n+ {\"m b a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 591},\n {\"shunt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n {\"mn\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"xway\", 1, {DICTIONARY_STREET_TYPE}, 994},\n+ {\"hstel\", 1, {DICTIONARY_PLACE_NAME}, 827},\n {\"rhode island\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"nth\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n {\"fund\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"nvs\", 1, {DICTIONARY_STREET_TYPE}, 1102},\n- {\"heads\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"seastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"m\", 1, {DICTIONARY_POST_OFFICE}, 893},\n+ {\"carvn park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"rng\", 1, {DICTIONARY_STREET_TYPE}, 1157},\n+ {\"rosebowl\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"p s\", 1, {DICTIONARY_PLACE_NAME}, 816},\n+ {\"tennessee\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"fare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"view\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jr hs\", 1, {DICTIONARY_PLACE_NAME}, 847},\n- {\"lgt colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n+ {\"nd\", 1, {DICTIONARY_TOPONYM}, 1334},\n+ {\"beech\", 1, {DICTIONARY_STREET_TYPE}, 927},\n+ {\"viadct\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n+ {\"frg\", 1, {DICTIONARY_SYNONYM}, 1265},\n {\"paradise\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"hospital\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mr\", 1, {DICTIONARY_STREET_TYPE}, 1095},\n- {\"stair way\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"cty clb\", 1, {DICTIONARY_PLACE_NAME}, 801},\n- {\"cyd\", 1, {DICTIONARY_STREET_TYPE}, 983},\n- {\"maisonette\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"township highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"monastry\", 1, {DICTIONARY_PLACE_NAME}, 843},\n+ {\"mid\", 1, {DICTIONARY_SYNONYM}, 686},\n+ {\"square\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"municipal building\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"congresswoman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ntheast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"strd\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n- {\"nck\", 1, {DICTIONARY_SYNONYM}, 1279},\n- {\"pine\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mll\", 1, {DICTIONARY_PLACE_NAME}, 832},\n- {\"lgt gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n+ {\"c r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"sth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"nth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"nortwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"s.route\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"cottg\", 1, {DICTIONARY_PLACE_NAME}, 616},\n+ {\"lk\", 1, {DICTIONARY_STREET_TYPE}, 1089},\n {\"vt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"twp hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"c.h\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"pass\", 1, {DICTIONARY_STREET_TYPE}, 1122},\n+ {\"frms\", 1, {DICTIONARY_STREET_TYPE}, 1025},\n {\"tower\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"grn\", 1, {DICTIONARY_STREET_TYPE}, 1050},\n {\"dance studio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co op\", 1, {DICTIONARY_COMPANY_TYPE}, 632},\n- {\"inlet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pde\", 1, {DICTIONARY_SYNONYM}, 1281},\n- {\"pre k\", 1, {DICTIONARY_PLACE_NAME}, 864},\n- {\"south westrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"car park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"md\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 593},\n- {\"rev\", 1, {DICTIONARY_PERSONAL_TITLE}, 755},\n+ {\"t.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"vlls\", 1, {DICTIONARY_PLACE_NAME}, 887},\n+ {\"wv\", 1, {DICTIONARY_TOPONYM}, 1360},\n+ {\"sr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 716},\n+ {\"btte\", 1, {DICTIONARY_STREET_TYPE}, 948},\n+ {\"nt and sa\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n+ {\"sta\", 1, {DICTIONARY_PLACE_NAME}, 880},\n+ {\"g blvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"mt\", 1, {DICTIONARY_TOPONYM}, 1323},\n+ {\"res\", 1, {DICTIONARY_PLACE_NAME}, 873},\n {\"arts centre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"nd\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"lf\", 1, {DICTIONARY_STREET_TYPE}, 1087},\n {\"block\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n {\"ct\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"community centre\", 1, {DICTIONARY_PLACE_NAME}, 801},\n {\"boardwalk\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"divide\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"st.rd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"polytechnic\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"laboratory\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bdge\", 1, {DICTIONARY_STREET_TYPE}, 937},\n- {\"norh westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"maryland\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"avs\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"sce\", 1, {DICTIONARY_COMPANY_TYPE}, 673},\n+ {\"lvel\", 1, {DICTIONARY_LEVEL}, 706},\n+ {\"s.rd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"brigadier general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cswy\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"act\", 1, {DICTIONARY_TOPONYM}, 1293},\n- {\"r o w\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"n eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"shun\", 1, {DICTIONARY_STREET_TYPE}, 1185},\n+ {\"inter change\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n+ {\"rsd\", 1, {DICTIONARY_POST_OFFICE}, 901},\n+ {\"ambl\", 1, {DICTIONARY_STREET_TYPE}, 914},\n+ {\"office twr\", 1, {DICTIONARY_PLACE_NAME}, 860},\n+ {\"cooperative\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"golf club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr bd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"pdse\", 1, {DICTIONARY_SYNONYM}, 1281},\n- {\"s road\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"ms\", 1, {DICTIONARY_PLACE_NAME}, 849},\n- {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 711},\n- {\"gtwy\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n- {\"cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 716},\n- {\"oaks\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vlgs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 885},\n- {\"id\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n+ {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 719},\n+ {\"ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 650},\n+ {\"ldge\", 1, {DICTIONARY_PLACE_NAME}, 835},\n+ {\"views\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"junior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n+ {\"cpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 724},\n {\"harbors\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"south wstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"aves\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"b s\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 583},\n- {\"cty\", 1, {DICTIONARY_SYNONYM}, 1256},\n+ {\"st.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"terrac\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"sheriffs ofc\", 1, {DICTIONARY_PLACE_NAME}, 877},\n {\"p.o. box\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"nwt\", 1, {DICTIONARY_TOPONYM}, 1333},\n- {\"louisiana\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"t.r.\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n+ {\"cct\", 1, {DICTIONARY_STREET_TYPE}, 962},\n+ {\"cseo\", 1, {DICTIONARY_STREET_TYPE}, 979},\n {\"village\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, -1},\n- {\"lake\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"fire line\", 1, {DICTIONARY_STREET_TYPE}, 1029},\n+ {\"crss\", 1, {DICTIONARY_STREET_TYPE}, 994},\n {\"castle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"plc\", 1, {DICTIONARY_STREET_TYPE}, 1126},\n {\"brother\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pt\", 1, {DICTIONARY_STREET_TYPE}, 1137},\n+ {\"bttm\", 1, {DICTIONARY_STREET_TYPE}, 933},\n+ {\"crs\", 1, {DICTIONARY_STREET_TYPE}, 990},\n {\"middle school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sanct\", 1, {DICTIONARY_PLACE_NAME}, 871},\n {\"portion\", 1, {DICTIONARY_UNIT}, -1},\n {\"lord\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bbox\", 1, {DICTIONARY_UNIT}, 1363},\n- {\"cvp\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"unltd\", 1, {DICTIONARY_COMPANY_TYPE}, 675},\n- {\"ste\", 1, {DICTIONARY_UNIT}, 1384},\n- {\"s.rte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"cway\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"cxn\", 1, {DICTIONARY_STREET_TYPE}, 974},\n+ {\"qdrt\", 1, {DICTIONARY_STREET_TYPE}, 905},\n+ {\"con\", 1, {DICTIONARY_STREET_TYPE}, 973},\n {\"father\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"animal hosp\", 1, {DICTIONARY_PLACE_NAME}, 775},\n+ {\"mount\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"nth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"trnabt\", 1, {DICTIONARY_STREET_TYPE}, 1233},\n+ {\"quays\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"clubrooms\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"turnabout\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tshp.rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"nort east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"n estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"sth e\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"frds\", 1, {DICTIONARY_SYNONYM}, 1262},\n {\"district\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tram\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ph d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 590},\n {\"washington\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"new south wales\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"cst\", 1, {DICTIONARY_PLACE_NAME}, 790},\n- {\"south e\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"marine berth\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"congressman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"cres\", 1, {DICTIONARY_STREET_TYPE}, 990},\n+ {\"return\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gl\", 1, {DICTIONARY_STREET_TYPE}, 1046},\n+ {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 1202},\n+ {\"norhwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"parklands\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pls\", 1, {DICTIONARY_STREET_TYPE}, 1128},\n+ {\"fline\", 1, {DICTIONARY_STREET_TYPE}, 1029},\n {\"campus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"professors\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"australian capital territory\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"dn\", 1, {DICTIONARY_STREET_TYPE}, 1003},\n- {\"ll m\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 595},\n- {\"postbox\", 1, {DICTIONARY_POST_OFFICE}, 891},\n- {\"s estrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"so w\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"right hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 736},\n- {\"cross road\", 1, {DICTIONARY_STREET_TYPE}, 992},\n+ {\"m p p\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n+ {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 643},\n+ {\"nrthestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"stn\", 1, {DICTIONARY_PLACE_NAME}, 880},\n+ {\"wine bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"president\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"spur\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrt wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"air force base\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lit\", 1, {DICTIONARY_STREET_TYPE}, 1086},\n- {\"sumt\", 1, {DICTIONARY_STREET_TYPE}, 1206},\n- {\"thfr\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n- {\"frtg\", 1, {DICTIONARY_STREET_TYPE}, 1036},\n- {\"flne\", 1, {DICTIONARY_STREET_TYPE}, 1025},\n+ {\"cts\", 1, {DICTIONARY_STREET_TYPE}, 986},\n+ {\"societa europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 674},\n+ {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"nthw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"ultd\", 1, {DICTIONARY_COMPANY_TYPE}, 679},\n+ {\"wksp\", 1, {DICTIONARY_UNIT}, 1393},\n+ {\"sheriff's ofc\", 1, {DICTIONARY_PLACE_NAME}, 877},\n {\"academy\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hghlds\", 1, {DICTIONARY_STREET_TYPE}, 1058},\n- {\"svcwy\", 1, {DICTIONARY_STREET_TYPE}, 1176},\n- {\"pckt\", 1, {DICTIONARY_STREET_TYPE}, 1132},\n- {\"cic\", 1, {DICTIONARY_COMPANY_TYPE}, 631},\n+ {\"mndr\", 1, {DICTIONARY_STREET_TYPE}, 1099},\n {\"courts\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"master of public policy\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"on\", 1, {DICTIONARY_TOPONYM}, 1337},\n- {\"vl\", 1, {DICTIONARY_SYNONYM}, 1284},\n- {\"nat'l rec area\", 1, {DICTIONARY_PLACE_NAME}, 851},\n- {\"intsctn\", 1, {DICTIONARY_STREET_TYPE}, 1067},\n- {\"pent house\", 1, {DICTIONARY_UNIT}, 1375},\n+ {\"ntheast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"c rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"wshp\", 1, {DICTIONARY_UNIT}, 1393},\n+ {\"flts\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 820},\n+ {\"d litt\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n {\"offices\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"open ended investment company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 1127},\n+ {\"sowestern\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"bbq\", 1, {DICTIONARY_UNIT}, 1368},\n {\"pines\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"t hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"sk\", 1, {DICTIONARY_TOPONYM}, 1344},\n- {\"off\", 1, {DICTIONARY_UNIT}, 854},\n- {\"icecream\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"appartments\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 783},\n+ {\"cowy\", 1, {DICTIONARY_STREET_TYPE}, 998},\n+ {\"avn\", 1, {DICTIONARY_STREET_TYPE}, 920},\n {\"knob\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"motl\", 1, {DICTIONARY_PLACE_NAME}, 840},\n+ {\"jnc\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"islds\", 1, {DICTIONARY_STREET_TYPE}, 1074},\n+ {\"qc\", 1, {DICTIONARY_TOPONYM}, 1345},\n+ {\"cmn\", 1, {DICTIONARY_STREET_TYPE}, 969},\n {\"manitoba\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"dwns\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1008},\n {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"lieutenant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 751},\n- {\"sister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"llm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 595},\n- {\"northestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"rh\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"wm\", 1, {DICTIONARY_GIVEN_NAME}, 697},\n- {\"pvt ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n- {\"str.way\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"mp\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"caravan par\", 1, {DICTIONARY_PLACE_NAME}, 787},\n+ {\"circle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cps\", 1, {DICTIONARY_STREET_TYPE}, 976},\n+ {\"shoals\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"aven\", 1, {DICTIONARY_STREET_TYPE}, 920},\n+ {\"cov\", 1, {DICTIONARY_STREET_TYPE}, 988},\n {\"oklahoma\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"flats\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"postoffice\", 1, {DICTIONARY_POST_OFFICE}, 899},\n- {\"tncy\", 1, {DICTIONARY_UNIT}, 1385},\n- {\"childcare\", 1, {DICTIONARY_PLACE_NAME}, 792},\n- {\"clr\", 1, {DICTIONARY_STREET_TYPE}, 963},\n- {\"j d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 585},\n- {\"cause\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"ht\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n+ {\"c i o\", 1, {DICTIONARY_COMPANY_TYPE}, 631},\n+ {\"fy\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 618},\n {\"keys\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"clnde\", 1, {DICTIONARY_STREET_TYPE}, 964},\n- {\"trn\", 1, {DICTIONARY_STREET_TYPE}, 1230},\n- {\"wv\", 1, {DICTIONARY_TOPONYM}, 1356},\n- {\"towers\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"site\", 1, {DICTIONARY_UNIT}, -1},\n- {\"pkt\", 1, {DICTIONARY_STREET_TYPE}, 1132},\n- {\"cpe\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 948},\n- {\"gr bld\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"biz pk\", 1, {DICTIONARY_PLACE_NAME}, 785},\n- {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 1237},\n- {\"wisconsin\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"dist\", 1, {DICTIONARY_PLACE_NAME}, 809},\n- {\"litl\", 1, {DICTIONARY_SYNONYM}, 1086},\n- {\"gro\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n- {\"north east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"cc\", 1, {DICTIONARY_COMPANY_TYPE}, 628},\n- {\"atty at law\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 581},\n+ {\"gdn\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n+ {\"norh west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"n h\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"bch\", 1, {DICTIONARY_STREET_TYPE}, 927},\n+ {\"barbecue\", 1, {DICTIONARY_UNIT}, 1368},\n+ {\"theaters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"act\", 1, {DICTIONARY_TOPONYM}, 1297},\n+ {\"esp\", 1, {DICTIONARY_STREET_TYPE}, 1016},\n+ {\"dve\", 1, {DICTIONARY_STREET_TYPE}, 1009},\n {\"senior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n {\"prime minister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ph m\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n- {\"vlt\", 1, {DICTIONARY_UNIT}, 1387},\n+ {\"detn\", 1, {DICTIONARY_PLACE_NAME}, 811},\n {\"senators\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rms box\", 1, {DICTIONARY_POST_OFFICE}, 900},\n {\"nm\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"lvl\", 1, {DICTIONARY_LEVEL}, 702},\n- {\"qy\", 1, {DICTIONARY_STREET_TYPE}, 1143},\n+ {\"id\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n+ {\"southwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"near\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"twrs\", 1, {DICTIONARY_STREET_TYPE}, 1221},\n+ {\"strp\", 1, {DICTIONARY_STREET_TYPE}, 1207},\n {\"princess\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sbwy\", 1, {DICTIONARY_STREET_TYPE}, 1205},\n {\"doctor of philosophy\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"place\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"community center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tshp\", 1, {DICTIONARY_QUALIFIER}, 903},\n- {\"prc\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n- {\"cct\", 1, {DICTIONARY_STREET_TYPE}, 958},\n- {\"spg\", 1, {DICTIONARY_STREET_TYPE}, 1187},\n- {\"r h\", 1, {DICTIONARY_PLACE_NAME}, 870},\n- {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"frwy\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n- {\"mktplc\", 1, {DICTIONARY_PLACE_NAME}, 835},\n- {\"corner\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ri\", 1, {DICTIONARY_STREET_TYPE}, 1165},\n+ {\"tas\", 1, {DICTIONARY_TOPONYM}, 1352},\n+ {\"nth w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"state road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tsar\", 1, {DICTIONARY_PERSONAL_TITLE}, 727},\n+ {\"nrthwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"meander\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"j\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"b corp\", 1, {DICTIONARY_COMPANY_TYPE}, 626},\n- {\"m d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 593},\n- {\"tlwy\", 1, {DICTIONARY_STREET_TYPE}, 1213},\n- {\"orchard\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"terminal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"bot\", 1, {DICTIONARY_STREET_TYPE}, 933},\n+ {\"lock\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"m s\", 1, {DICTIONARY_PLACE_NAME}, 853},\n+ {\"right honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"s east\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"lttl\", 1, {DICTIONARY_SYNONYM}, 1090},\n+ {\"pla\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n+ {\"p s c\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n {\"quay\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"soestn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"brgs\", 1, {DICTIONARY_STREET_TYPE}, 947},\n+ {\"northwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"hospital for women\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"museum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"kg\", 1, {DICTIONARY_PERSONAL_TITLE}, 745},\n+ {\"st.rte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"rn\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 609},\n {\"vale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trfy\", 1, {DICTIONARY_STREET_TYPE}, 1221},\n- {\"nort westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 715},\n- {\"cara park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"str way\", 1, {DICTIONARY_STREET_TYPE}, 1193},\n- {\"st hi\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"byway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cnyn\", 1, {DICTIONARY_STREET_TYPE}, 953},\n+ {\"vice pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 775},\n+ {\"vil\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n+ {\"retirement home\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"la\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"nth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"nurs\", 1, {DICTIONARY_PLACE_NAME}, 849},\n {\"texas\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"loc\", 1, {DICTIONARY_UNIT}, 1373},\n+ {\"c.hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"westrn\", 1, {DICTIONARY_DIRECTIONAL}, 699},\n {\"podium\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"misses\", 1, {DICTIONARY_PERSONAL_TITLE}, 747},\n- {\"fd\", 1, {DICTIONARY_STREET_TYPE}, 1023},\n- {\"nth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"ms\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"coop\", 1, {DICTIONARY_COMPANY_TYPE}, 632},\n- {\"mpa\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n- {\"ne\", 1, {DICTIONARY_TOPONYM}, 1320},\n- {\"grnd\", 1, {DICTIONARY_STREET_TYPE}, 700},\n+ {\"pnes\", 1, {DICTIONARY_STREET_TYPE}, 1129},\n+ {\"norh e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"norhestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"movie theatre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"so eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"communitycenter\", 1, {DICTIONARY_PLACE_NAME}, 801},\n+ {\"pr c\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n {\"office towers\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"lgt governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n- {\"nat'l wildlife refuge area\", 1, {DICTIONARY_PLACE_NAME}, 852},\n- {\"parade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"clf\", 1, {DICTIONARY_STREET_TYPE}, 960},\n- {\"parkwy\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"wkwy\", 1, {DICTIONARY_STREET_TYPE}, 1245},\n- {\"rear of\", 1, {DICTIONARY_UNIT}, -1},\n- {\"esp\", 1, {DICTIONARY_STREET_TYPE}, 1012},\n+ {\"grd bd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"rightofway\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"c.r.\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"lieut commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n+ {\"carvn\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"nl\", 1, {DICTIONARY_COMPANY_TYPE}, 661},\n+ {\"r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"n\/a\", 1, {DICTIONARY_NULL}, 714},\n+ {\"c hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"ftwy\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n+ {\"pth\", 1, {DICTIONARY_STREET_TYPE}, 1123},\n {\"mezzanine\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"c.r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"shnt\", 1, {DICTIONARY_STREET_TYPE}, 1181},\n+ {\"city\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"msn\", 1, {DICTIONARY_PLACE_NAME}, 842},\n+ {\"mail centre\", 1, {DICTIONARY_POST_OFFICE}, 899},\n {\"roadside mail service\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"co.hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"il\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cvn\", 1, {DICTIONARY_STREET_TYPE}, 950},\n {\"restaurant\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"doctor of letters\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"shctr\", 1, {DICTIONARY_PLACE_NAME}, 874},\n- {\"pkwy\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"c rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"norhwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"st h\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"gwy\", 1, {DICTIONARY_STREET_TYPE}, 1045},\n {\"camp\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rnde\", 1, {DICTIONARY_STREET_TYPE}, 1169},\n+ {\"dle\", 1, {DICTIONARY_STREET_TYPE}, 1003},\n+ {\"private\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lgt commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n {\"thoroughfare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"landng\", 1, {DICTIONARY_STREET_TYPE}, 1079},\n- {\"culdesac\", 1, {DICTIONARY_STREET_TYPE}, 996},\n- {\"pre-k\", 1, {DICTIONARY_PLACE_NAME}, 864},\n- {\"centre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"s hway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"hghts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n+ {\"fl\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1032},\n+ {\"brw\", 1, {DICTIONARY_STREET_TYPE}, 945},\n+ {\"s wst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"ofc tower\", 1, {DICTIONARY_PLACE_NAME}, 860},\n+ {\"chair woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 726},\n {\"glen\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cnrs\", 1, {DICTIONARY_STREET_TYPE}, 974},\n+ {\"trktrl\", 1, {DICTIONARY_STREET_TYPE}, 1230},\n {\"master of public administration\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"south west\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"nova scotia\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"un\", 1, {DICTIONARY_STREET_TYPE}, 1237},\n {\"allotment\", 1, {DICTIONARY_UNIT}, -1},\n {\"pe\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"lndg\", 1, {DICTIONARY_STREET_TYPE}, 1079},\n- {\"islds\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n+ {\"ab\", 1, {DICTIONARY_TOPONYM}, 1292},\n {\"gateway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"msnt\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 618},\n- {\"swstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"cmb\", 1, {DICTIONARY_POST_OFFICE}, 889},\n- {\"bus prk\", 1, {DICTIONARY_PLACE_NAME}, 785},\n- {\"il\", 1, {DICTIONARY_TOPONYM}, 1304},\n+ {\"lit\", 1, {DICTIONARY_STREET_TYPE}, 1090},\n+ {\"primary school\", 1, {DICTIONARY_PLACE_NAME}, 816},\n+ {\"r of w\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 765},\n+ {\"northestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"lodge\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ny\", 1, {DICTIONARY_TOPONYM}, 1331},\n {\"quad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"commons\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ms\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 588},\n- {\"sthwst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"twrs\", 1, {DICTIONARY_STREET_TYPE}, 1217},\n- {\"ran\", 1, {DICTIONARY_STREET_TYPE}, 1149},\n+ {\"x way\", 1, {DICTIONARY_STREET_TYPE}, 998},\n+ {\"nortw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"overpass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bluf\", 1, {DICTIONARY_STREET_TYPE}, 930},\n+ {\"s.hi\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"park\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"twp.r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"nursing h\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"plms\", 1, {DICTIONARY_STREET_TYPE}, 1115},\n {\"substation\", 1, {DICTIONARY_UNIT}, -1},\n- {\"retirement village\", 1, {DICTIONARY_PLACE_NAME}, 870},\n- {\"gdn\", 1, {DICTIONARY_STREET_TYPE}, 1037},\n- {\"r \/ o\", 1, {DICTIONARY_UNIT}, 1377},\n- {\"jr high school\", 1, {DICTIONARY_PLACE_NAME}, 847},\n- {\"frg\", 1, {DICTIONARY_SYNONYM}, 1261},\n- {\"missouri\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"hsp\", 1, {DICTIONARY_PLACE_NAME}, 822},\n- {\"norh west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"pokt\", 1, {DICTIONARY_STREET_TYPE}, 1132},\n- {\"mwy\", 1, {DICTIONARY_STREET_TYPE}, 1101},\n- {\"nrt east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"mddl\", 1, {DICTIONARY_DIRECTIONAL}, 682},\n- {\"blvde\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"mailservice\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"grdn\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n+ {\"pharm\", 1, {DICTIONARY_PLACE_NAME}, 863},\n+ {\"ent\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n+ {\"university\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"bwlk\", 1, {DICTIONARY_STREET_TYPE}, 931},\n+ {\"clf\", 1, {DICTIONARY_STREET_TYPE}, 964},\n+ {\"is\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n+ {\"natl wildlife refuge area\", 1, {DICTIONARY_PLACE_NAME}, 856},\n+ {\"thor\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"cmty\", 1, {DICTIONARY_PLACE_NAME}, 802},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 886},\n+ {\"elp\", 1, {DICTIONARY_COMPANY_TYPE}, 642},\n+ {\"na\", 1, {DICTIONARY_NULL}, 714},\n {\"f\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"twp.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"cmb\", 1, {DICTIONARY_POST_OFFICE}, 893},\n+ {\"tshp.rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"ids\", 1, {DICTIONARY_STREET_TYPE}, 1074},\n+ {\"lgt gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n {\"on\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ford\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ml\", 1, {DICTIONARY_STREET_TYPE}, 832},\n- {\"s western\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n {\"springs\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"whs\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 625},\n- {\"nra\", 1, {DICTIONARY_PLACE_NAME}, 851},\n- {\"phd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n- {\"hostl\", 1, {DICTIONARY_PLACE_NAME}, 823},\n- {\"nortwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"arts gallery\", 1, {DICTIONARY_PLACE_NAME}, 780},\n- {\"lttl\", 1, {DICTIONARY_SYNONYM}, 1086},\n- {\"sherrifs department\", 1, {DICTIONARY_PLACE_NAME}, 872},\n- {\"s.rd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"nort estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"int'l\", 1, {DICTIONARY_SYNONYM}, 1272},\n+ {\"rh\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"gr blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"crc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 798},\n+ {\"lagn\", 1, {DICTIONARY_STREET_TYPE}, 1082},\n+ {\"gdbd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"ant\", 1, {DICTIONARY_UNIT}, 1365},\n+ {\"jtn\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n {\"shore\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"carwash\", 1, {DICTIONARY_PLACE_NAME}, 789},\n+ {\"roller rink\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"chartered\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"county\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n- {\"fords\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"tpk\", 1, {DICTIONARY_STREET_TYPE}, 1231},\n- {\"gdns\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n- {\"mpp\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n- {\"expwy\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n- {\"stor\", 1, {DICTIONARY_PLACE_NAME}, 877},\n- {\"subdivision\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"mun bldg\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"mdw\", 1, {DICTIONARY_STREET_TYPE}, 1096},\n+ {\"pre-school\", 1, {DICTIONARY_PLACE_NAME}, 867},\n+ {\"psge\", 1, {DICTIONARY_STREET_TYPE}, 1122},\n+ {\"doc\", 1, {DICTIONARY_PERSONAL_TITLE}, 729},\n {\"pursuit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sdng\", 1, {DICTIONARY_STREET_TYPE}, 1182},\n- {\"lodg\", 1, {DICTIONARY_PLACE_NAME}, 831},\n- {\"crns\", 1, {DICTIONARY_STREET_TYPE}, 974},\n- {\"dv\", 1, {DICTIONARY_STREET_TYPE}, 1005},\n- {\"fw\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n+ {\"lagon\", 1, {DICTIONARY_STREET_TYPE}, 1082},\n+ {\"brg\", 1, {DICTIONARY_STREET_TYPE}, 941},\n+ {\"sth west\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"np\", 1, {DICTIONARY_PLACE_NAME}, 854},\n+ {\"nrtheastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"greater\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"unt\", 1, {DICTIONARY_UNIT}, 1386},\n {\"parking\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"nbr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n- {\"ntheastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"hsptl\", 1, {DICTIONARY_PLACE_NAME}, 822},\n+ {\"lookthrough co\", 1, {DICTIONARY_COMPANY_TYPE}, 658},\n+ {\"victoria\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"norh wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"vl\", 1, {DICTIONARY_QUALIFIER}, 888},\n+ {\"allwy\", 1, {DICTIONARY_STREET_TYPE}, 913},\n {\"fairway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bcorp\", 1, {DICTIONARY_COMPANY_TYPE}, 626},\n- {\"lagn\", 1, {DICTIONARY_STREET_TYPE}, 1078},\n- {\"lowr\", 1, {DICTIONARY_DIRECTIONAL}, 681},\n- {\"square\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"co\", 1, {DICTIONARY_COMPANY_TYPE}, 629},\n- {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 766},\n- {\"x-way\", 1, {DICTIONARY_STREET_TYPE}, 994},\n- {\"clm\", 1, {DICTIONARY_STREET_TYPE}, 959},\n- {\"aprt\", 1, {DICTIONARY_UNIT}, 1362},\n- {\"brdway\", 1, {DICTIONARY_STREET_TYPE}, 938},\n- {\"clt\", 1, {DICTIONARY_STREET_TYPE}, 957},\n- {\"pc ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n+ {\"anex\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 612},\n+ {\"tunl\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n+ {\"me\", 1, {DICTIONARY_TOPONYM}, 1315},\n+ {\"post box\", 2, {DICTIONARY_POST_OFFICE, DICTIONARY_POST_OFFICE}, 895},\n+ {\"nthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"lt cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n+ {\"r o\", 1, {DICTIONARY_UNIT}, 1381},\n {\"northeastern\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"m eng\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"rdsd\", 1, {DICTIONARY_STREET_TYPE}, 1170},\n {\"labs\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ret village\", 1, {DICTIONARY_PLACE_NAME}, 870},\n+ {\"terr\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"kentucky\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"lieutenant general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"swst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"norh east\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"nort west\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"gte\", 1, {DICTIONARY_STREET_TYPE}, 1043},\n {\"precinct\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lgn\", 1, {DICTIONARY_STREET_TYPE}, 1078},\n- {\"communitycenter\", 1, {DICTIONARY_PLACE_NAME}, 797},\n- {\"town house\", 1, {DICTIONARY_PLACE_NAME}, 622},\n {\"king\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"complex\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hse\", 1, {DICTIONARY_BUILDING_TYPE}, 617},\n- {\"estn\", 1, {DICTIONARY_DIRECTIONAL}, 680},\n- {\"rf\", 1, {DICTIONARY_LEVEL}, 707},\n+ {\"spa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"casino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"rrrow\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n+ {\"twp hwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"northern territory\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"scd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n+ {\"ter\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n {\"south dakota\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"x-wy\", 1, {DICTIONARY_STREET_TYPE}, 998},\n {\"rapids\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"norh e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"mail centre\", 1, {DICTIONARY_POST_OFFICE}, 895},\n- {\"tshp hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"up\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 693},\n+ {\"junction\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bongalow\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 614},\n+ {\"corporal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"hi rd\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n {\"prairie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cty r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"hgts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n+ {\"cty hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"rsrve\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n {\"deputy prime minister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"wyn\", 1, {DICTIONARY_STREET_TYPE}, 1252},\n- {\"i b c\", 1, {DICTIONARY_COMPANY_TYPE}, 643},\n+ {\"strav\", 1, {DICTIONARY_STREET_TYPE}, 1204},\n+ {\"shl\", 1, {DICTIONARY_STREET_TYPE}, 1181},\n {\"rmb\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"junct\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n- {\"c hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"pse\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"twp hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"representative\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"shoppingcenter\", 1, {DICTIONARY_PLACE_NAME}, 874},\n {\"no\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"rt hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"expressway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"s estn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"flds\", 1, {DICTIONARY_STREET_TYPE}, 1024},\n+ {\"stl\", 1, {DICTIONARY_UNIT}, 1384},\n+ {\"cs\", 1, {DICTIONARY_STREET_TYPE}, 994},\n+ {\"road mail box\", 1, {DICTIONARY_POST_OFFICE}, 900},\n+ {\"apartement\", 1, {DICTIONARY_UNIT}, 1366},\n+ {\"la\", 1, {DICTIONARY_STREET_TYPE}, 1084},\n+ {\"tshp hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 729},\n+ {\"frk\", 1, {DICTIONARY_SYNONYM}, 1263},\n+ {\"s hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"trunkway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ak\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"p s\", 1, {DICTIONARY_PLACE_NAME}, 812},\n- {\"ca\", 1, {DICTIONARY_TOPONYM}, 1295},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"r of w\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"south western\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"pmb\", 1, {DICTIONARY_POST_OFFICE}, 892},\n- {\"rw\", 1, {DICTIONARY_STREET_TYPE}, 1173},\n- {\"shr\", 1, {DICTIONARY_STREET_TYPE}, 1179},\n- {\"bypa\", 1, {DICTIONARY_STREET_TYPE}, 945},\n- {\"strm\", 1, {DICTIONARY_SYNONYM}, 1283},\n- {\"uppr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 693},\n- {\"swestern\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"cnrs\", 1, {DICTIONARY_STREET_TYPE}, 978},\n+ {\"nvs\", 1, {DICTIONARY_STREET_TYPE}, 1106},\n+ {\"co.hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"greens\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"nat'l pk\", 1, {DICTIONARY_PLACE_NAME}, 854},\n+ {\"nortwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"berth\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"nwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"x-rd\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"industrial park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"stateroute\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"tshp hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"grave yard\", 1, {DICTIONARY_PLACE_NAME}, 822},\n+ {\"nwra\", 1, {DICTIONARY_PLACE_NAME}, 856},\n {\"peninsula\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"t hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"pine\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"societa cooperativa europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 673},\n {\"hub\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"elb\", 1, {DICTIONARY_STREET_TYPE}, 1010},\n- {\"rch\", 1, {DICTIONARY_STREET_TYPE}, 1154},\n- {\"road side\", 1, {DICTIONARY_STREET_TYPE}, 1166},\n+ {\"vlys\", 1, {DICTIONARY_STREET_TYPE}, 1243},\n+ {\"convalescent\", 1, {DICTIONARY_PLACE_NAME}, 803},\n {\"barn\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bnk\", 1, {DICTIONARY_STREET_TYPE}, 920},\n- {\"spgs\", 1, {DICTIONARY_STREET_TYPE}, 1188},\n- {\"hbr\", 1, {DICTIONARY_STREET_TYPE}, 1051},\n- {\"lcks\", 1, {DICTIONARY_SYNONYM}, 1272},\n- {\"tnhs\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 622},\n- {\"hls\", 1, {DICTIONARY_STREET_TYPE}, 1062},\n+ {\"gld\", 1, {DICTIONARY_STREET_TYPE}, 1046},\n+ {\"rr-row\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n+ {\"reps\", 1, {DICTIONARY_PERSONAL_TITLE}, 769},\n+ {\"mtn\", 1, {DICTIONARY_SYNONYM}, 1279},\n+ {\"hi.rd\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n+ {\"nwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"eastern\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"fr\", 1, {DICTIONARY_STREET_TYPE}, 1036},\n- {\"norheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"hom\", 1, {DICTIONARY_PLACE_NAME}, 821},\n- {\"rdw\", 1, {DICTIONARY_STREET_TYPE}, 1167},\n+ {\"bc\", 1, {DICTIONARY_TOPONYM}, 1298},\n+ {\"circles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"master of fine arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"m ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n- {\"sth wst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 612},\n+ {\"limits\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"dlitt\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n {\"master of education\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"distrib\", 1, {DICTIONARY_PLACE_NAME}, 808},\n- {\"c.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"inter section\", 1, {DICTIONARY_STREET_TYPE}, 1067},\n+ {\"gpo\", 1, {DICTIONARY_POST_OFFICE}, 894},\n+ {\"comms\", 1, {DICTIONARY_STREET_TYPE}, 970},\n {\"fire department\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"fountain\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mway\", 1, {DICTIONARY_STREET_TYPE}, 1101},\n+ {\"valleys\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"mountains\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cty.rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n+ {\"gp\", 1, {DICTIONARY_COMPANY_TYPE}, 644},\n+ {\"gtes\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n {\"sw\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cnctr\", 1, {DICTIONARY_STREET_TYPE}, 971},\n- {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n- {\"eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 680},\n- {\"s.rt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"levl\", 1, {DICTIONARY_LEVEL}, 702},\n- {\"yukon territory\", 1, {DICTIONARY_TOPONYM}, 1360},\n- {\"edc\", 1, {DICTIONARY_COMPANY_TYPE}, 635},\n- {\"clse\", 1, {DICTIONARY_STREET_TYPE}, 962},\n- {\"cnr\", 1, {DICTIONARY_STREET_TYPE}, 973},\n- {\"nort estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"frst\", 1, {DICTIONARY_SYNONYM}, 1257},\n- {\"ridge way\", 1, {DICTIONARY_STREET_TYPE}, 1159},\n+ {\"st.hw\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"fshr\", 1, {DICTIONARY_STREET_TYPE}, 1036},\n+ {\"tn\", 1, {DICTIONARY_TOPONYM}, 1353},\n+ {\"nortwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"in\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"wst\", 1, {DICTIONARY_DIRECTIONAL}, 698},\n+ {\"btms\", 1, {DICTIONARY_STREET_TYPE}, 934},\n+ {\"thick\", 1, {DICTIONARY_STREET_TYPE}, 1213},\n+ {\"mba\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 591},\n+ {\"l d c\", 1, {DICTIONARY_COMPANY_TYPE}, 653},\n {\"rotary\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"yard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bros\", 1, {DICTIONARY_SYNONYM}, 1254},\n- {\"r hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n+ {\"id\", 1, {DICTIONARY_TOPONYM}, 1307},\n {\"hills\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"western\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ville\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"state rte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 757},\n- {\"nrt wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"cty\", 1, {DICTIONARY_SYNONYM}, 1255},\n- {\"mpal bldg\", 1, {DICTIONARY_PLACE_NAME}, 841},\n- {\"blvrd\", 1, {DICTIONARY_STREET_TYPE}, 928},\n+ {\"unions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grd bvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 731},\n+ {\"co.rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"retirement\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"nrsg\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"art\", 1, {DICTIONARY_STREET_TYPE}, 919},\n+ {\"avnus\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"montana\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"burg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nth east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"c hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"prince edward island\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"grv\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"psc\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n+ {\"inlet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"marketplace\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cutt\", 1, {DICTIONARY_STREET_TYPE}, 1002},\n+ {\"prk\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 862},\n {\"meadows\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s hwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 1194},\n+ {\"n a\", 1, {DICTIONARY_NULL}, 714},\n {\"national trust and savings association\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"nrt eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nrth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"m a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 590},\n+ {\"t.h.\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"cross\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"convalescent centre\", 1, {DICTIONARY_PLACE_NAME}, 803},\n+ {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 1052},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 920},\n+ {\"strands\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cottage\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"tshp.h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"t r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"rt honorable\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"su\", 1, {DICTIONARY_UNIT}, 1381},\n- {\"city\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"crematorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"parkland\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n+ {\"town house\", 1, {DICTIONARY_PLACE_NAME}, 626},\n+ {\"interchange\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nrth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"board walk\", 1, {DICTIONARY_STREET_TYPE}, 927},\n+ {\"lmb\", 1, {DICTIONARY_POST_OFFICE}, 892},\n {\"stream\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"winebar\", 1, {DICTIONARY_PLACE_NAME}, 886},\n- {\"music hall\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"resv\", 1, {DICTIONARY_PLACE_NAME}, 868},\n+ {\"e l p\", 1, {DICTIONARY_COMPANY_TYPE}, 642},\n+ {\"headquarters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ring\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gd bld\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"crossroad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"caravan park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rd\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"pty ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 668},\n+ {\"sowest\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"nth estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"nthwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"brnch\", 1, {DICTIONARY_STREET_TYPE}, 938},\n {\"brothers\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"spr\", 1, {DICTIONARY_STREET_TYPE}, 1189},\n- {\"pn\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n- {\"pty\", 1, {DICTIONARY_COMPANY_TYPE}, 663},\n- {\"natl park\", 1, {DICTIONARY_PLACE_NAME}, 850},\n- {\"cty.hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"new hampshire\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"brow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ms\", 1, {DICTIONARY_TOPONYM}, 1317},\n+ {\"th\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"n estrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"tpk\", 1, {DICTIONARY_STREET_TYPE}, 1235},\n+ {\"lmts\", 1, {DICTIONARY_STREET_TYPE}, 1087},\n+ {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"concession\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"trust\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"fst\", 1, {DICTIONARY_SYNONYM}, 1257},\n+ {\"hs\", 1, {DICTIONARY_PLACE_NAME}, 850},\n+ {\"hird\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n+ {\"n wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"oval\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"s wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"pk\", 1, {DICTIONARY_STREET_TYPE}, 1123},\n- {\"cultural centre\", 1, {DICTIONARY_PLACE_NAME}, 804},\n- {\"sqr\", 1, {DICTIONARY_STREET_TYPE}, 1190},\n- {\"ak\", 1, {DICTIONARY_TOPONYM}, 1289},\n- {\"rsrv\", 1, {DICTIONARY_PLACE_NAME}, 868},\n- {\"strds\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n- {\"nwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"fern\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"viad\", 1, {DICTIONARY_STREET_TYPE}, 1240},\n+ {\"mail bag\", 1, {DICTIONARY_POST_OFFICE}, 892},\n+ {\"st.rt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"n western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"nck\", 1, {DICTIONARY_SYNONYM}, 1283},\n+ {\"nort wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"riv\", 1, {DICTIONARY_SYNONYM}, 1286},\n+ {\"farms\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nrthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"c.hi\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"vw\", 1, {DICTIONARY_STREET_TYPE}, 1245},\n+ {\"car park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"res\", 1, {DICTIONARY_PLACE_NAME}, 872},\n+ {\"frtg\", 1, {DICTIONARY_STREET_TYPE}, 1040},\n {\"arcade\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"ret vill\", 1, {DICTIONARY_PLACE_NAME}, 870},\n- {\"ml\", 1, {DICTIONARY_STREET_TYPE}, 1099},\n- {\"e d c\", 1, {DICTIONARY_COMPANY_TYPE}, 635},\n- {\"rdsd\", 1, {DICTIONARY_STREET_TYPE}, 1166},\n- {\"f d\", 1, {DICTIONARY_PLACE_NAME}, 814},\n+ {\"shopping town\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"oaks\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"byps\", 1, {DICTIONARY_STREET_TYPE}, 949},\n+ {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 762},\n {\"embassy\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"municipal bldg\", 1, {DICTIONARY_PLACE_NAME}, 845},\n {\"location\", 1, {DICTIONARY_UNIT}, -1},\n {\"jcc\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"lieut col\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n {\"islands\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ftrk\", 1, {DICTIONARY_STREET_TYPE}, 1026},\n- {\"jct\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"ctr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_STREET_TYPE}, 680},\n {\"professional limited liability company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"exempted limited partnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"frm\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 615},\n+ {\"tmwy\", 1, {DICTIONARY_STREET_TYPE}, 1227},\n+ {\"n f a\", 1, {DICTIONARY_NO_ADDRESS}, 713},\n+ {\"nt\", 1, {DICTIONARY_TOPONYM}, 1337},\n {\"ab\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"piaz\", 1, {DICTIONARY_STREET_TYPE}, 1122},\n- {\"btween\", 1, {DICTIONARY_STOPWORD}, 904},\n- {\"jewish community centre\", 1, {DICTIONARY_PLACE_NAME}, 829},\n- {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1230},\n+ {\"twp.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"cirt\", 1, {DICTIONARY_STREET_TYPE}, 962},\n {\"diversion\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s p e\", 1, {DICTIONARY_COMPANY_TYPE}, 671},\n- {\"northwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"neastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nrtestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"cps\", 1, {DICTIONARY_STREET_TYPE}, 972},\n+ {\"fr\", 1, {DICTIONARY_STREET_TYPE}, 1040},\n+ {\"her honour\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n+ {\"rdw\", 1, {DICTIONARY_STREET_TYPE}, 1171},\n+ {\"stwy\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n+ {\"nthestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"shrm\", 1, {DICTIONARY_UNIT}, 1383},\n+ {\"pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 755},\n+ {\"norh estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"fall\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"blck\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 900},\n- {\"raods\", 1, {DICTIONARY_STREET_TYPE}, 1165},\n+ {\"norteastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1211},\n+ {\"rvwy\", 1, {DICTIONARY_STREET_TYPE}, 1166},\n+ {\"south east\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"town hall\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"parkwy\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n {\"alaska\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"mphil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n- {\"ct\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"northwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"br\", 1, {DICTIONARY_STREET_TYPE}, 938},\n {\"va\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"lynn\", 1, {DICTIONARY_STREET_TYPE}, 1091},\n- {\"fmtn\", 1, {DICTIONARY_STREET_TYPE}, 1033},\n- {\"bsn\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"shopping centre\", 1, {DICTIONARY_PLACE_NAME}, 878},\n {\"yt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"svwy\", 1, {DICTIONARY_STREET_TYPE}, 1176},\n+ {\"ste\", 1, {DICTIONARY_PERSONAL_TITLE}, 763},\n+ {\"ofc twr\", 1, {DICTIONARY_PLACE_NAME}, 860},\n {\"crescent\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"ctrl\", 1, {DICTIONARY_DIRECTIONAL}, 677},\n+ {\"county touring route\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"c hw\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"ltd liability company\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n {\"cove\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n {\"md\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"master of business administration\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"maison\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lt gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n+ {\"cty.r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"rtt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 870},\n {\"avenue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"plaza\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"st route\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"qys\", 1, {DICTIONARY_STREET_TYPE}, 1148},\n {\"upper ground floor\", 1, {DICTIONARY_LEVEL}, -1},\n+ {\"north east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n {\"vennel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gaol\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"midl\", 1, {DICTIONARY_SYNONYM}, 682},\n- {\"dept\", 1, {DICTIONARY_UNIT}, 1368},\n+ {\"crd\", 1, {DICTIONARY_STREET_TYPE}, 996},\n {\"caravan\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"gbd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"truck trail\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"chas\", 1, {DICTIONARY_STREET_TYPE}, 954},\n- {\"c van\", 1, {DICTIONARY_STREET_TYPE}, 950},\n+ {\"nrs home\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"jnr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 715},\n {\"neck\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"throughway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"out\", 1, {DICTIONARY_STREET_TYPE}, 1106},\n- {\"grve\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"crv\", 1, {DICTIONARY_STREET_TYPE}, 1001},\n+ {\"maj general\", 1, {DICTIONARY_PERSONAL_TITLE}, 747},\n+ {\"br\", 1, {DICTIONARY_STREET_TYPE}, 941},\n {\"maine\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"apt\", 1, {DICTIONARY_UNIT}, 1362},\n- {\"lt commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n- {\"lieut colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n+ {\"attorney at law\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 585},\n+ {\"underpass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"chairwoman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"nh\", 1, {DICTIONARY_TOPONYM}, 1323},\n- {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"centre for the aged\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"de\", 1, {DICTIONARY_TOPONYM}, 1298},\n- {\"gr bvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"mailbag\", 1, {DICTIONARY_POST_OFFICE}, 888},\n+ {\"mn\", 1, {DICTIONARY_TOPONYM}, 1320},\n+ {\"maryland\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"r \/ o \/ w\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"pent house\", 1, {DICTIONARY_UNIT}, 1379},\n+ {\"m a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n+ {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"strip\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pd\", 1, {DICTIONARY_LEVEL}, 706},\n- {\"qd\", 1, {DICTIONARY_STREET_TYPE}, 1141},\n- {\"extensions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s corp\", 1, {DICTIONARY_COMPANY_TYPE}, 671},\n+ {\"key\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"robt\", 1, {DICTIONARY_GIVEN_NAME}, 700},\n {\"plateau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"twpr\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"legum doctor\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n- {\"bsm\", 1, {DICTIONARY_LEVEL}, 698},\n- {\"clfs\", 1, {DICTIONARY_STREET_TYPE}, 961},\n+ {\"stm\", 1, {DICTIONARY_SYNONYM}, 1287},\n+ {\"british columbia\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"lvl\", 1, {DICTIONARY_LEVEL}, 706},\n+ {\"nrtestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"gates\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"annexe\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"mnr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 837},\n {\"mo\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"brace\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"frk\", 1, {DICTIONARY_SYNONYM}, 1259},\n- {\"south wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"nort westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"nj\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cp\", 1, {DICTIONARY_STREET_TYPE}, 947},\n- {\"snd\", 1, {DICTIONARY_STREET_TYPE}, 1185},\n- {\"nth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"rst\", 1, {DICTIONARY_STREET_TYPE}, 1155},\n- {\"whf\", 1, {DICTIONARY_STREET_TYPE}, 1251},\n- {\"board house\", 1, {DICTIONARY_PLACE_NAME}, 783},\n- {\"sportsground\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"detention\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"extensions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bl\", 1, {DICTIONARY_QUALIFIER}, 904},\n+ {\"conc\", 1, {DICTIONARY_STREET_TYPE}, 972},\n+ {\"pf\", 1, {DICTIONARY_LEVEL}, 709},\n+ {\"cty hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"hostel\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, -1},\n- {\"cooperative\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"masonic retirement village\", 1, {DICTIONARY_PLACE_NAME}, 870},\n+ {\"grd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"hindu undivided family\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"bnglw\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 610},\n- {\"hs\", 1, {DICTIONARY_PLACE_NAME}, 846},\n- {\"esq\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 584},\n+ {\"mktpl\", 1, {DICTIONARY_PLACE_NAME}, 839},\n+ {\"parade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ibc\", 1, {DICTIONARY_COMPANY_TYPE}, 647},\n+ {\"seastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"beauty salon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"intermediary\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"lc\", 1, {DICTIONARY_COMPANY_TYPE}, 652},\n {\"his honor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"hstl\", 1, {DICTIONARY_PLACE_NAME}, 823},\n- {\"s rte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"north estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"crn\", 1, {DICTIONARY_STREET_TYPE}, 973},\n- {\"lp\", 1, {DICTIONARY_STREET_TYPE}, 1089},\n+ {\"southeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"rsve\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 623},\n+ {\"detention\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gd boul\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"sth east\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n+ {\"sth western\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"s road\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"doctor of medicine\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n {\"slip\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ia\", 1, {DICTIONARY_TOPONYM}, 1310},\n {\"between\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"isl\", 1, {DICTIONARY_STREET_TYPE}, 1069},\n {\"manors\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"chair man\", 1, {DICTIONARY_PERSONAL_TITLE}, 721},\n+ {\"nt\", 1, {DICTIONARY_TOPONYM}, 1335},\n+ {\"ltd co\", 1, {DICTIONARY_COMPANY_TYPE}, 652},\n {\"resort\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cio\", 1, {DICTIONARY_COMPANY_TYPE}, 627},\n- {\"under pass\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n+ {\"summit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"elm\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nort wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"round\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"post mail box\", 1, {DICTIONARY_POST_OFFICE}, 892},\n {\"national association\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"creek\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n+ {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 846},\n+ {\"park lands\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n+ {\"great\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"bachelor of laws\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"hway\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n+ {\"overlook\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"t hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"tx\", 1, {DICTIONARY_TOPONYM}, 1354},\n {\"sirs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"fitness centre\", 1, {DICTIONARY_PLACE_NAME}, 815},\n+ {\"exten\", 1, {DICTIONARY_STREET_TYPE}, 1020},\n {\"footway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"centreway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"centre for the arts\", 1, {DICTIONARY_PLACE_NAME}, 791},\n- {\"jbt\", 1, {DICTIONARY_TOPONYM}, 1307},\n- {\"cty.rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"hngr\", 1, {DICTIONARY_STREET_TYPE}, 1050},\n- {\"nt\", 1, {DICTIONARY_COMPANY_TYPE}, 644},\n+ {\"gtway\", 1, {DICTIONARY_STREET_TYPE}, 1045},\n+ {\"m s e\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"div\", 1, {DICTIONARY_STREET_TYPE}, 1005},\n+ {\"shp \/ centre\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"quy\", 1, {DICTIONARY_STREET_TYPE}, 1147},\n+ {\"lbby\", 1, {DICTIONARY_UNIT}, 1376},\n+ {\"cage\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"sd\", 1, {DICTIONARY_TOPONYM}, 1350},\n+ {\"state rte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n {\"limited partnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"vet\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"woods\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"lks\", 1, {DICTIONARY_SYNONYM}, 1270},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n- {\"arty\", 1, {DICTIONARY_STREET_TYPE}, 915},\n- {\"ctrs\", 1, {DICTIONARY_STREET_TYPE}, 952},\n+ {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"pthwy\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n+ {\"sowst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"gd fl\", 1, {DICTIONARY_LEVEL}, 705},\n+ {\"boul\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"co rte\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"swy\", 1, {DICTIONARY_STREET_TYPE}, 1180},\n+ {\"drs\", 1, {DICTIONARY_PERSONAL_TITLE}, 730},\n+ {\"state rd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"nsw\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"dba\", 1, {DICTIONARY_COMPANY_TYPE}, 634},\n {\"us route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"way\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"caravan resort\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"nrthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nortw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"mtns\", 1, {DICTIONARY_SYNONYM}, 1280},\n+ {\"tlpk\", 1, {DICTIONARY_PLACE_NAME}, 885},\n+ {\"cntn\", 1, {DICTIONARY_STREET_TYPE}, 974},\n {\"dormitory\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"villg\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n+ {\"st hwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"sqr\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"offc\", 1, {DICTIONARY_UNIT}, 858},\n {\"grove\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vsta\", 1, {DICTIONARY_STREET_TYPE}, 1243},\n- {\"st.highway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"strnds\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n- {\"rnd\", 1, {DICTIONARY_STREET_TYPE}, 1171},\n- {\"t.hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"western australia\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"whrf\", 1, {DICTIONARY_STREET_TYPE}, 1255},\n+ {\"dale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n+ {\"fwy\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n {\"ground floor\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"barracks\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"shoppingcentre\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"wtrs\", 1, {DICTIONARY_STREET_TYPE}, 1250},\n+ {\"sowstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"pei\", 1, {DICTIONARY_TOPONYM}, 1344},\n+ {\"mwy\", 1, {DICTIONARY_STREET_TYPE}, 1105},\n+ {\"rvra\", 1, {DICTIONARY_STREET_TYPE}, 1167},\n+ {\"jcts\", 1, {DICTIONARY_STREET_TYPE}, 1076},\n {\"country club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"wky\", 1, {DICTIONARY_STREET_TYPE}, 1245},\n+ {\"bngw\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 614},\n {\"space\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"str\", 1, {DICTIONARY_STREET_TYPE}, 1205},\n+ {\"xing\", 1, {DICTIONARY_STREET_TYPE}, 995},\n {\"czar\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"convalescent hospital\", 1, {DICTIONARY_PLACE_NAME}, 799},\n {\"township route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrs home\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"lgt\", 1, {DICTIONARY_PERSONAL_TITLE}, 736},\n- {\"tshp r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"wls\", 1, {DICTIONARY_STREET_TYPE}, 1250},\n+ {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 643},\n+ {\"vice chair man\", 1, {DICTIONARY_PERSONAL_TITLE}, 772},\n+ {\"dstr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 812},\n+ {\"n \/ f \/ a\", 1, {DICTIONARY_NO_ADDRESS}, 713},\n {\"middle\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, -1},\n+ {\"fw\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n+ {\"arts gallery\", 1, {DICTIONARY_PLACE_NAME}, 784},\n+ {\"ga\", 1, {DICTIONARY_STREET_TYPE}, 1043},\n+ {\"ltl\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1090},\n+ {\"lgt\", 1, {DICTIONARY_STREET_TYPE}, 1086},\n+ {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"tshp.rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 754},\n+ {\"duke\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rowy\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"tri\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1229},\n+ {\"terrasse\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n+ {\"strs\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"wi\", 1, {DICTIONARY_TOPONYM}, 1362},\n+ {\"crns\", 1, {DICTIONARY_STREET_TYPE}, 978},\n+ {\"c.r.\", 1, {DICTIONARY_STREET_TYPE}, 982},\n+ {\"slp\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1188},\n+ {\"priors\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nk\", 1, {DICTIONARY_STREET_TYPE}, 1107},\n+ {\"loop\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tkwy\", 1, {DICTIONARY_STREET_TYPE}, 1231},\n+ {\"co hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"federal savings bank\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"rr row\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n+ {\"x-ing\", 1, {DICTIONARY_STREET_TYPE}, 995},\n+ {\"fords\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"post mail box\", 1, {DICTIONARY_POST_OFFICE}, 896},\n+ {\"ri\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"nursing hom\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"hollow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mws\", 1, {DICTIONARY_STREET_TYPE}, 1101},\n+ {\"alee\", 1, {DICTIONARY_STREET_TYPE}, 912},\n+ {\"unt\", 1, {DICTIONARY_UNIT}, 1390},\n+ {\"villas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cusac\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n+ {\"mnt\", 1, {DICTIONARY_SYNONYM}, 1278},\n+ {\"bps\", 1, {DICTIONARY_STREET_TYPE}, 949},\n+ {\"pzza\", 1, {DICTIONARY_STREET_TYPE}, 1126},\n+ {\"trs\", 1, {DICTIONARY_STREET_TYPE}, 1228},\n+ {\"nursery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"co hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"board house\", 1, {DICTIONARY_PLACE_NAME}, 787},\n+ {\"bachelor of science\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 587},\n+ {\"gd bd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"vault\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"isl\", 1, {DICTIONARY_STREET_TYPE}, 1073},\n {\"easement\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"al\", 1, {DICTIONARY_TOPONYM}, 1287},\n- {\"n home\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"maj gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n- {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"rt honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"duke\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"tkwy\", 1, {DICTIONARY_STREET_TYPE}, 1227},\n- {\"pnt\", 1, {DICTIONARY_STREET_TYPE}, 1133},\n- {\"sth estn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"hgths\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n- {\"priors\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"loop\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"or\", 1, {DICTIONARY_TOPONYM}, 1338},\n- {\"federal savings bank\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"vdct\", 1, {DICTIONARY_STREET_TYPE}, 1240},\n- {\"bway\", 1, {DICTIONARY_STREET_TYPE}, 938},\n- {\"nt & sa\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n- {\"cottg\", 1, {DICTIONARY_PLACE_NAME}, 612},\n- {\"ri\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"hollow\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ofc twrs\", 1, {DICTIONARY_PLACE_NAME}, 857},\n- {\"avnu\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"villas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"master of arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"me\", 1, {DICTIONARY_TOPONYM}, 1311},\n- {\"lock\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"nursery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bl\", 1, {DICTIONARY_STREET_TYPE}, 932},\n- {\"esquire\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"vault\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"lieut governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 737},\n- {\"supermarket\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"plains\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"underpass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sthe\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 1178},\n+ {\"norh east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"apch\", 1, {DICTIONARY_STREET_TYPE}, 916},\n+ {\"quad\", 1, {DICTIONARY_QUALIFIER}, 905},\n+ {\"ra\", 1, {DICTIONARY_STREET_TYPE}, 1151},\n {\"ramp\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"norh wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 882},\n+ {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"southe\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"mew\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_STREET_TYPE}, 676},\n- {\"summit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"municipal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"turn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"co.rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"rte\", 1, {DICTIONARY_STREET_TYPE}, 1172},\n- {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 918},\n- {\"nrtwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"mdl\", 1, {DICTIONARY_DIRECTIONAL}, 682},\n+ {\"sowestrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"heads\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s rte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"ctg\", 1, {DICTIONARY_BUILDING_TYPE}, 616},\n+ {\"crn\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"uns\", 1, {DICTIONARY_STREET_TYPE}, 1238},\n+ {\"corseo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mi\", 1, {DICTIONARY_TOPONYM}, 1319},\n+ {\"cty r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"college\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"riverway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"chairman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"nrthwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"hm\", 1, {DICTIONARY_PLACE_NAME}, 821},\n- {\"st.hwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"t.r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"oeic\", 1, {DICTIONARY_COMPANY_TYPE}, 659},\n- {\"hvn\", 1, {DICTIONARY_STREET_TYPE}, 1053},\n- {\"norhwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"sec\", 1, {DICTIONARY_PERSONAL_TITLE}, 763},\n- {\"aged care\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"nu\", 1, {DICTIONARY_TOPONYM}, 1334},\n- {\"nth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"steakhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"so estn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"natl rec area\", 1, {DICTIONARY_PLACE_NAME}, 851},\n- {\"bwy\", 1, {DICTIONARY_STREET_TYPE}, 938},\n- {\"nhome\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"north western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"thwy\", 1, {DICTIONARY_STREET_TYPE}, 1211},\n+ {\"hawaii\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"crve\", 1, {DICTIONARY_STREET_TYPE}, 1001},\n+ {\"hsptl\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"clt\", 1, {DICTIONARY_STREET_TYPE}, 961},\n+ {\"north wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cnc\", 1, {DICTIONARY_STREET_TYPE}, 973},\n+ {\"mo\", 1, {DICTIONARY_TOPONYM}, 1322},\n+ {\"sthw\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"pfc\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n+ {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 958},\n+ {\"s rt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"chiropractic\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"colonnade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s west\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"ground\", 3, {DICTIONARY_LEVEL, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"n l\", 1, {DICTIONARY_COMPANY_TYPE}, 657},\n- {\"th d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 603},\n- {\"grt\", 1, {DICTIONARY_SYNONYM}, 1264},\n- {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 913},\n+ {\"theater\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ville\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"t.rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"southeast\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"slp\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1184},\n- {\"caus\", 1, {DICTIONARY_STREET_TYPE}, 951},\n- {\"nortwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"ca\", 1, {DICTIONARY_TOPONYM}, 1299},\n+ {\"phm\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 606},\n+ {\"artl\", 1, {DICTIONARY_STREET_TYPE}, 918},\n {\"limited liability company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"lieutenant commander\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ontario\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"intersection\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mezz\", 1, {DICTIONARY_LEVEL}, 704},\n- {\"gpo\", 1, {DICTIONARY_POST_OFFICE}, 890},\n- {\"mtwy\", 1, {DICTIONARY_STREET_TYPE}, 1101},\n+ {\"radl\", 1, {DICTIONARY_STREET_TYPE}, 1149},\n+ {\"j h s\", 1, {DICTIONARY_PLACE_NAME}, 851},\n+ {\"rep\", 1, {DICTIONARY_PERSONAL_TITLE}, 768},\n+ {\"gtr\", 1, {DICTIONARY_SYNONYM}, 1269},\n+ {\"reef\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"arc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"twy\", 1, {DICTIONARY_STREET_TYPE}, 1213},\n- {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"terace\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n+ {\"cross road\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"crk\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 989},\n+ {\"book store\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"bri\", 1, {DICTIONARY_STREET_TYPE}, 941},\n+ {\"st hi\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"south eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"fitness center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sme ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 672},\n- {\"ri\", 1, {DICTIONARY_TOPONYM}, 1343},\n+ {\"expy\", 1, {DICTIONARY_STREET_TYPE}, 1019},\n+ {\"xwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 998},\n+ {\"alwy\", 1, {DICTIONARY_STREET_TYPE}, 913},\n+ {\"nrt wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"shelter\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pb\", 1, {DICTIONARY_POST_OFFICE}, 891},\n- {\"cst\", 1, {DICTIONARY_STREET_TYPE}, 987},\n+ {\"blg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 613},\n {\"mi\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"hwye\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n+ {\"bde\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"apparement\", 1, {DICTIONARY_UNIT}, 1366},\n {\"nl\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"caf\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 786},\n- {\"r m b\", 1, {DICTIONARY_POST_OFFICE}, 896},\n- {\"delaware\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"nebraska\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"ia\", 1, {DICTIONARY_TOPONYM}, 1306},\n+ {\"t hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"hngr\", 1, {DICTIONARY_STREET_TYPE}, 1054},\n+ {\"so wst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"cft\", 1, {DICTIONARY_STREET_TYPE}, 993},\n+ {\"foot way\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n {\"jbt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"wlkwy\", 1, {DICTIONARY_STREET_TYPE}, 1245},\n+ {\"dsc\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n {\"culture center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"the\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"service road\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"roadside mailbox\", 1, {DICTIONARY_POST_OFFICE}, 896},\n- {\"lck\", 1, {DICTIONARY_SYNONYM}, 1271},\n- {\"afb\", 1, {DICTIONARY_PLACE_NAME}, 776},\n+ {\"twp r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"lgt general\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n+ {\"d b a\", 1, {DICTIONARY_COMPANY_TYPE}, 638},\n+ {\"st.h\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"corso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rdgs\", 1, {DICTIONARY_STREET_TYPE}, 1162},\n+ {\"grvs\", 1, {DICTIONARY_SYNONYM}, 1271},\n+ {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 887},\n {\"beach\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"gld\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n- {\"frks\", 1, {DICTIONARY_SYNONYM}, 1260},\n- {\"bus pk\", 1, {DICTIONARY_PLACE_NAME}, 785},\n- {\"mc\", 1, {DICTIONARY_POST_OFFICE}, 895},\n- {\"estates\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jtty\", 1, {DICTIONARY_PLACE_NAME}, 830},\n- {\"boul\", 1, {DICTIONARY_STREET_TYPE}, 928},\n- {\"c.rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n+ {\"nrtheast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"t hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"member of parliament\", 1, {DICTIONARY_PERSONAL_TITLE}, 748},\n+ {\"frwy\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n+ {\"ptway\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n+ {\"lkt\", 1, {DICTIONARY_STREET_TYPE}, 1092},\n {\"virginia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"j\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n- {\"c hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"statehighway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"so western\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"csway\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"glde\", 1, {DICTIONARY_STREET_TYPE}, 1046},\n {\"child care\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"northwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"downs\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 750},\n- {\"drov\", 1, {DICTIONARY_STREET_TYPE}, 1007},\n- {\"nm\", 1, {DICTIONARY_TOPONYM}, 1325},\n- {\"soeast\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"bnd\", 1, {DICTIONARY_STREET_TYPE}, 925},\n+ {\"n home\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"ky\", 1, {DICTIONARY_STREET_TYPE}, 1077},\n+ {\"nursing ho\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"fit\", 1, {DICTIONARY_STREET_TYPE}, 1031},\n+ {\"ovrb\", 1, {DICTIONARY_STREET_TYPE}, 1111},\n+ {\"c hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"so w\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"cnr\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"s westrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"c rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"via\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n+ {\"nc\", 1, {DICTIONARY_TOPONYM}, 1333},\n {\"secretary\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"swestrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"amphitheatre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nk\", 1, {DICTIONARY_STREET_TYPE}, 1103},\n- {\"c.r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n+ {\"mi\", 1, {DICTIONARY_STREET_TYPE}, 1102},\n+ {\"curv\", 1, {DICTIONARY_STREET_TYPE}, 1001},\n+ {\"s e\", 1, {DICTIONARY_COMPANY_TYPE}, 674},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"parking lot\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mbth\", 1, {DICTIONARY_UNIT}, 1374},\n- {\"shoppingtown\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"harbour\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cotts\", 1, {DICTIONARY_PLACE_NAME}, 804},\n+ {\"nrt wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"ldg\", 1, {DICTIONARY_STREET_TYPE}, 1083},\n {\"national wildlife refuge area\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 986},\n- {\"s.hw\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"bayoo\", 1, {DICTIONARY_STREET_TYPE}, 922},\n- {\"app\", 1, {DICTIONARY_STREET_TYPE}, 912},\n- {\"hospice\", 1, {DICTIONARY_PLACE_NAME}, 822},\n- {\"quays\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pllc\", 1, {DICTIONARY_COMPANY_TYPE}, 661},\n- {\"vw\", 1, {DICTIONARY_STREET_TYPE}, 1241},\n- {\"st h\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"hrh\", 1, {DICTIONARY_PERSONAL_TITLE}, 731},\n+ {\"station\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"ancg\", 1, {DICTIONARY_STREET_TYPE}, 915},\n+ {\"nth west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"ext\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1020},\n+ {\"norh w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"ports\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"neastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"crct\", 1, {DICTIONARY_STREET_TYPE}, 958},\n+ {\"center for the aged\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"g bde\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"nrth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"bachelor of arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"creamery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nrthe\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n {\"retirement home\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ns\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"valley\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"intchg\", 1, {DICTIONARY_STREET_TYPE}, 1070},\n+ {\"grge\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 620},\n+ {\"trk\", 1, {DICTIONARY_STREET_TYPE}, 1224},\n+ {\"na\", 1, {DICTIONARY_COMPANY_TYPE}, 659},\n {\"farmhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lg\", 1, {DICTIONARY_LEVEL}, 703},\n- {\"nrt estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"pnte\", 1, {DICTIONARY_STREET_TYPE}, 1138},\n+ {\"ofc towers\", 1, {DICTIONARY_PLACE_NAME}, 861},\n+ {\"nrthe\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"northwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"retirement v\", 1, {DICTIONARY_PLACE_NAME}, 874},\n {\"medical\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"brks\", 1, {DICTIONARY_STREET_TYPE}, 940},\n- {\"nrth estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"co\", 1, {DICTIONARY_SYNONYM}, 1256},\n+ {\"ests\", 1, {DICTIONARY_STREET_TYPE}, 1018},\n {\"william\", 1, {DICTIONARY_GIVEN_NAME}, -1},\n {\"zoo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"chalet\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"manor\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"carpark\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"locked bag\", 1, {DICTIONARY_POST_OFFICE}, 892},\n {\"oh\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"culture centre\", 1, {DICTIONARY_PLACE_NAME}, 803},\n- {\"nurses home\", 1, {DICTIONARY_PLACE_NAME}, 853},\n- {\"trace\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"curv\", 1, {DICTIONARY_STREET_TYPE}, 997},\n- {\"bsmt\", 1, {DICTIONARY_LEVEL}, 698},\n- {\"gn\", 1, {DICTIONARY_STREET_TYPE}, 1046},\n- {\"st.hway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"tlpk\", 1, {DICTIONARY_PLACE_NAME}, 881},\n- {\"lps\", 1, {DICTIONARY_STREET_TYPE}, 1090},\n- {\"drwy\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n- {\"loops\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jhs\", 1, {DICTIONARY_PLACE_NAME}, 851},\n+ {\"rdwy\", 1, {DICTIONARY_STREET_TYPE}, 1171},\n+ {\"island\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"circel\", 1, {DICTIONARY_STREET_TYPE}, 959},\n+ {\"hostl\", 1, {DICTIONARY_PLACE_NAME}, 827},\n+ {\"cottgs\", 1, {DICTIONARY_PLACE_NAME}, 804},\n+ {\"piont\", 1, {DICTIONARY_STREET_TYPE}, 1137},\n+ {\"hi\", 1, {DICTIONARY_TOPONYM}, 1306},\n {\"opera house\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ltl\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1086},\n+ {\"apartment\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"ug\", 1, {DICTIONARY_LEVEL}, 712},\n {\"sheriff's department\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"norheast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n {\"and company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"shwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"nhome\", 1, {DICTIONARY_PLACE_NAME}, 849},\n {\"ga\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"angb\", 1, {DICTIONARY_PLACE_NAME}, 777},\n- {\"ex services complex\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"island\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nth wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"woods\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"connecticut\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"tram\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"new brunswick\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"rocks\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cor\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"ex\", 1, {DICTIONARY_STREET_TYPE}, 1020},\n {\"community interest company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"expy\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n- {\"crst\", 1, {DICTIONARY_STREET_TYPE}, 987},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"annx\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 612},\n+ {\"boundary\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"over bridge\", 1, {DICTIONARY_STREET_TYPE}, 1111},\n {\"family practice\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pur\", 1, {DICTIONARY_STREET_TYPE}, 1140},\n+ {\"motorway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tshp h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"arterial\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cliff\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rty\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 871},\n {\"circuit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tshp hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"bldg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 609},\n- {\"natl pk\", 1, {DICTIONARY_PLACE_NAME}, 850},\n- {\"grd bvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n- {\"rdg\", 1, {DICTIONARY_STREET_TYPE}, 1157},\n- {\"monastry\", 1, {DICTIONARY_PLACE_NAME}, 839},\n- {\"mun building\", 1, {DICTIONARY_PLACE_NAME}, 841},\n- {\"s corp\", 1, {DICTIONARY_COMPANY_TYPE}, 667},\n- {\"hywy\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n- {\"isle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nebraska\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"bottm\", 1, {DICTIONARY_STREET_TYPE}, 933},\n+ {\"ltd liability co\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n+ {\"vet\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vill\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n+ {\"mtwy\", 1, {DICTIONARY_STREET_TYPE}, 1105},\n+ {\"rear\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"clfs\", 1, {DICTIONARY_STREET_TYPE}, 965},\n {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nrtwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"co rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n {\"ln\", 1, {DICTIONARY_STREET_TYPE}, 1084},\n- {\"artery\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"st.road\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"bnk\", 1, {DICTIONARY_STREET_TYPE}, 924},\n+ {\"pur\", 1, {DICTIONARY_STREET_TYPE}, 1144},\n {\"boathouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nortwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"shors\", 1, {DICTIONARY_STREET_TYPE}, 1180},\n- {\"brch\", 1, {DICTIONARY_STREET_TYPE}, 934},\n- {\"office twrs\", 1, {DICTIONARY_PLACE_NAME}, 857},\n- {\"quy\", 1, {DICTIONARY_STREET_TYPE}, 1143},\n- {\"right and honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"cvan park\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"return\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r\", 1, {DICTIONARY_SYNONYM}, 1282},\n+ {\"societa privata europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 675},\n+ {\"lev\", 1, {DICTIONARY_LEVEL}, 706},\n+ {\"nrthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"stheast\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"parish\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s hw\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"nm\", 1, {DICTIONARY_TOPONYM}, 1329},\n {\"development\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"her honour\", 1, {DICTIONARY_PERSONAL_TITLE}, 734},\n- {\"apts\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 779},\n- {\"c.hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"norh estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"littl\", 1, {DICTIONARY_SYNONYM}, 1086},\n+ {\"nurse home\", 1, {DICTIONARY_PLACE_NAME}, 857},\n+ {\"circt\", 1, {DICTIONARY_STREET_TYPE}, 962},\n+ {\"staterd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"sth eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"fern\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"social club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"south westrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n {\"studio\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"g bvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"esmt\", 1, {DICTIONARY_STREET_TYPE}, 1008},\n {\"medical doctor\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"ms\", 1, {DICTIONARY_TOPONYM}, 1321},\n+ {\"clm\", 1, {DICTIONARY_STREET_TYPE}, 963},\n {\"police department\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"overlook\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"junction\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"wkwy\", 1, {DICTIONARY_STREET_TYPE}, 1249},\n+ {\"vice chair person\", 1, {DICTIONARY_PERSONAL_TITLE}, 773},\n {\"room\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"s route\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"psla\", 1, {DICTIONARY_STREET_TYPE}, 1125},\n+ {\"sth\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"co hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"wells\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"avs\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"concord\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fd\", 1, {DICTIONARY_PLACE_NAME}, 814},\n- {\"po box\", 1, {DICTIONARY_POST_OFFICE}, 891},\n+ {\"north w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"sheriff's dept\", 1, {DICTIONARY_PLACE_NAME}, 876},\n+ {\"ldc\", 1, {DICTIONARY_COMPANY_TYPE}, 653},\n+ {\"rpd\", 1, {DICTIONARY_STREET_TYPE}, 1155},\n {\"club\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"fawy\", 1, {DICTIONARY_STREET_TYPE}, 1018},\n- {\"lld\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n- {\"fy\", 1, {DICTIONARY_STREET_TYPE}, 1022},\n+ {\"lk\", 1, {DICTIONARY_SYNONYM}, 1273},\n+ {\"n wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"chapel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cty.hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"overpass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"svc rd\", 1, {DICTIONARY_STREET_TYPE}, 1175},\n- {\"nevada\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"docs\", 1, {DICTIONARY_PERSONAL_TITLE}, 730},\n+ {\"lgt gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n+ {\"n eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"gr bd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"public market\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"det\", 1, {DICTIONARY_PLACE_NAME}, 807},\n- {\"nwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"st.rt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"nrs\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"causeway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"u c i t s\", 1, {DICTIONARY_COMPANY_TYPE}, 678},\n+ {\"mc\", 1, {DICTIONARY_POST_OFFICE}, 899},\n+ {\"townhouses\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"vice prime minister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"d \/ b \/ a\", 1, {DICTIONARY_COMPANY_TYPE}, 638},\n+ {\"vlgs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 889},\n+ {\"cty rt\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"twp\", 1, {DICTIONARY_QUALIFIER}, 907},\n {\"southern australia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"fy\", 1, {DICTIONARY_STREET_TYPE}, 1018},\n- {\"pde\", 1, {DICTIONARY_STREET_TYPE}, 1112},\n- {\"convalescent home\", 1, {DICTIONARY_PLACE_NAME}, 799},\n- {\"gd blvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"mississippi\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"t h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"plt\", 1, {DICTIONARY_STREET_TYPE}, 1133},\n+ {\"nwt\", 1, {DICTIONARY_TOPONYM}, 1337},\n+ {\"upass\", 1, {DICTIONARY_STREET_TYPE}, 1236},\n+ {\"hous\", 1, {DICTIONARY_BUILDING_TYPE}, 621},\n {\"firetrail\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gbd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"un\", 1, {DICTIONARY_UNIT}, 1390},\n {\"neaves\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"resv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n- {\"nrt w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"frnt\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1035},\n- {\"tramway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"stheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"ctg\", 1, {DICTIONARY_STREET_TYPE}, 998},\n- {\"na\", 1, {DICTIONARY_COMPANY_TYPE}, 655},\n+ {\"st.wy\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n+ {\"crsg\", 1, {DICTIONARY_STREET_TYPE}, 995},\n+ {\"hw\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n {\"salon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mdws\", 1, {DICTIONARY_STREET_TYPE}, 1093},\n- {\"vst\", 1, {DICTIONARY_STREET_TYPE}, 1243},\n- {\"qdrt\", 1, {DICTIONARY_STREET_TYPE}, 901},\n- {\"shls\", 1, {DICTIONARY_STREET_TYPE}, 1178},\n- {\"nrth\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n+ {\"resrv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n+ {\"pvt\", 1, {DICTIONARY_STREET_TYPE}, 1142},\n {\"qc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"baech\", 1, {DICTIONARY_STREET_TYPE}, 923},\n- {\"swstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"nightclub\", 1, {DICTIONARY_PLACE_NAME}, 847},\n+ {\"abby\", 1, {DICTIONARY_STREET_TYPE}, 909},\n+ {\"rnge\", 1, {DICTIONARY_STREET_TYPE}, 1157},\n+ {\"glns\", 1, {DICTIONARY_SYNONYM}, 1267},\n {\"robert\", 1, {DICTIONARY_GIVEN_NAME}, -1},\n- {\"rdwy\", 1, {DICTIONARY_STREET_TYPE}, 1167},\n+ {\"expwy\", 1, {DICTIONARY_STREET_TYPE}, 1019},\n+ {\"p s u\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n {\"trees\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"co.hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"gd bde\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"cirs\", 1, {DICTIONARY_STREET_TYPE}, 956},\n- {\"over look\", 1, {DICTIONARY_STREET_TYPE}, 1108},\n- {\"stl\", 1, {DICTIONARY_UNIT}, 1380},\n+ {\"bachelor of sciences\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"national trust & savings association\", 1, {DICTIONARY_COMPANY_TYPE}, 660},\n+ {\"bunglow\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 614},\n+ {\"bttms\", 1, {DICTIONARY_STREET_TYPE}, 934},\n+ {\"lllp\", 1, {DICTIONARY_COMPANY_TYPE}, 655},\n {\"brae\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n- {\"vge\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n+ {\"bluffs\", 1, {DICTIONARY_STREET_TYPE}, 930},\n+ {\"nrt w\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"north carolina\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"gardens\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trnabt\", 1, {DICTIONARY_STREET_TYPE}, 1229},\n- {\"southw\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"nortestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"ky\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"prom\", 1, {DICTIONARY_STREET_TYPE}, 1139},\n- {\"nrthestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nrth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"rep\", 1, {DICTIONARY_PERSONAL_TITLE}, 764},\n- {\"mount\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ind park\", 1, {DICTIONARY_PLACE_NAME}, 831},\n+ {\"juris doctor\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"northe\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"lieut cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n+ {\"grd boul\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"community\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"rserve\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n {\"indiana\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"gas station\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"g p\", 1, {DICTIONARY_COMPANY_TYPE}, 640},\n+ {\"rest\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"inter section\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"farmers market\", 1, {DICTIONARY_PLACE_NAME}, 817},\n+ {\"air force base\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bag\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"rr r \/ o \/ w\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n- {\"mil\", 1, {DICTIONARY_SYNONYM}, 1273},\n+ {\"#\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n {\"level\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"cv\", 1, {DICTIONARY_STREET_TYPE}, 984},\n- {\"so e\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n- {\"s wstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"gln\", 1, {DICTIONARY_STREET_TYPE}, 1047},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n+ {\"br\", 1, {DICTIONARY_STREET_TYPE}, 939},\n+ {\"frd\", 1, {DICTIONARY_STREET_TYPE}, 1035},\n {\"racing track\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"radl\", 1, {DICTIONARY_STREET_TYPE}, 1145},\n- {\"icvc\", 1, {DICTIONARY_COMPANY_TYPE}, 645},\n- {\"sts\", 1, {DICTIONARY_STREET_TYPE}, 1202},\n- {\"sth w\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"form\", 1, {DICTIONARY_STREET_TYPE}, 1033},\n- {\"x rd\", 1, {DICTIONARY_STREET_TYPE}, 992},\n- {\"betw\", 1, {DICTIONARY_STOPWORD}, 904},\n- {\"pathway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"sowestern\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"nl\", 1, {DICTIONARY_TOPONYM}, 1328},\n+ {\"bnd\", 1, {DICTIONARY_STREET_TYPE}, 929},\n+ {\"pckt\", 1, {DICTIONARY_STREET_TYPE}, 1136},\n+ {\"lgf\", 1, {DICTIONARY_LEVEL}, 707},\n+ {\"investment company with variable capital\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"nrtwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"cic\", 1, {DICTIONARY_COMPANY_TYPE}, 635},\n+ {\"nurses home\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"fitness centre\", 1, {DICTIONARY_PLACE_NAME}, 819},\n+ {\"mway\", 1, {DICTIONARY_STREET_TYPE}, 1105},\n+ {\"natl\", 1, {DICTIONARY_SYNONYM}, 1282},\n+ {\"close corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"frks\", 1, {DICTIONARY_SYNONYM}, 1264},\n+ {\"barracks\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cty.r\", 1, {DICTIONARY_STREET_TYPE}, 982},\n {\"district judge\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mse\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n- {\"ptwy\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n- {\"nt sa\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n- {\"locked mail bag\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"upr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 693},\n+ {\"forest\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"shd\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 624},\n+ {\"fire trail\", 1, {DICTIONARY_STREET_TYPE}, 1031},\n+ {\"grdbd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"cds\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n+ {\"rt\", 1, {DICTIONARY_LEVEL}, 711},\n+ {\"c.hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"rpds\", 1, {DICTIONARY_STREET_TYPE}, 1156},\n {\"m\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"soeastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"br\", 1, {DICTIONARY_STREET_TYPE}, 935},\n- {\"spc\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1186},\n- {\"aven\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"sl\", 1, {DICTIONARY_UNIT}, 1380},\n- {\"l\", 1, {DICTIONARY_STREET_TYPE}, 1080},\n- {\"mills\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"imp\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"ns\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"appartment\", 1, {DICTIONARY_UNIT}, 1366},\n+ {\"sgt\", 1, {DICTIONARY_PERSONAL_TITLE}, 766},\n+ {\"cyn\", 1, {DICTIONARY_STREET_TYPE}, 953},\n+ {\"strt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"nr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n {\"knolls\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 754},\n- {\"mot\", 1, {DICTIONARY_PLACE_NAME}, 840},\n- {\"throughfare\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n- {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"qld\", 1, {DICTIONARY_TOPONYM}, 1346},\n+ {\"ms ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 604},\n+ {\"fld\", 1, {DICTIONARY_STREET_TYPE}, 1027},\n {\"interstate\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n h\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"wd\", 1, {DICTIONARY_SYNONYM}, 1285},\n+ {\"southestn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"btwn\", 1, {DICTIONARY_STOPWORD}, 908},\n+ {\"dup\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 617},\n {\"australian antarctic territory\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"n wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"snr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 716},\n {\"queen\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"junior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"cncrd\", 1, {DICTIONARY_STREET_TYPE}, 967},\n+ {\"co\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"veterinarian\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ballroom\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ntsa\", 1, {DICTIONARY_COMPANY_TYPE}, 656},\n+ {\"md\", 1, {DICTIONARY_TOPONYM}, 1317},\n+ {\"lieut gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n {\"european economic interest grouping\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"wk\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n- {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 639},\n- {\"in\", 1, {DICTIONARY_TOPONYM}, 1305},\n- {\"pre-school\", 1, {DICTIONARY_PLACE_NAME}, 863},\n- {\"nmbr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n- {\"pvt\", 1, {DICTIONARY_STREET_TYPE}, 1138},\n- {\"cty.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"ga\", 1, {DICTIONARY_STREET_TYPE}, 1039},\n+ {\"upas\", 1, {DICTIONARY_STREET_TYPE}, 1236},\n+ {\"nrth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"lb\", 1, {DICTIONARY_POST_OFFICE}, 892},\n+ {\"dojo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"accs\", 1, {DICTIONARY_STREET_TYPE}, 910},\n+ {\"sestn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"l c\", 1, {DICTIONARY_COMPANY_TYPE}, 652},\n+ {\"p o box\", 1, {DICTIONARY_POST_OFFICE}, 895},\n {\"nursing center\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vlge\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n {\"circlet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vws\", 1, {DICTIONARY_STREET_TYPE}, 1242},\n- {\"g blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"quys\", 1, {DICTIONARY_STREET_TYPE}, 1144},\n- {\"tunnel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"strd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"master in arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 592},\n- {\"biz prk\", 1, {DICTIONARY_PLACE_NAME}, 785},\n- {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 979},\n+ {\"tshp\", 1, {DICTIONARY_QUALIFIER}, 907},\n+ {\"grds\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n+ {\"vllys\", 1, {DICTIONARY_STREET_TYPE}, 1243},\n+ {\"t.hw\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n {\"roundabout\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"stables\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"light\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"stall\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sme pvt\", 1, {DICTIONARY_COMPANY_TYPE}, 672},\n- {\"pwy\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"new york\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"bazaar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kg\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n- {\"hot\", 1, {DICTIONARY_PLACE_NAME}, 824},\n- {\"rn\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 605},\n+ {\"prd\", 1, {DICTIONARY_STREET_TYPE}, 1116},\n+ {\"kys\", 1, {DICTIONARY_STREET_TYPE}, 1078},\n+ {\"us hwy\", 1, {DICTIONARY_STREET_TYPE}, 1239},\n+ {\"jct\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"d th\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 607},\n+ {\"est\", 1, {DICTIONARY_STREET_TYPE}, 1017},\n+ {\"plz\", 1, {DICTIONARY_STREET_TYPE}, 1134},\n+ {\"ford\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"locks\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"stn\", 1, {DICTIONARY_PLACE_NAME}, 876},\n- {\"nrth e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"h s\", 1, {DICTIONARY_PLACE_NAME}, 846},\n- {\"pky\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"nurs\", 1, {DICTIONARY_PLACE_NAME}, 845},\n- {\"aged care facilities\", 1, {DICTIONARY_PLACE_NAME}, 773},\n- {\"pnes\", 1, {DICTIONARY_STREET_TYPE}, 1125},\n- {\"shd\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 620},\n- {\"cmns\", 1, {DICTIONARY_STREET_TYPE}, 966},\n- {\"wstn\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"steps\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bar be cue\", 1, {DICTIONARY_PLACE_NAME}, 785},\n+ {\"open ended investment company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"post office box\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"st wy\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n+ {\"bookstore\", 1, {DICTIONARY_PLACE_NAME}, 788},\n+ {\"trak\", 1, {DICTIONARY_STREET_TYPE}, 1224},\n+ {\"drv\", 1, {DICTIONARY_STREET_TYPE}, 1009},\n+ {\"frst\", 1, {DICTIONARY_SYNONYM}, 1261},\n+ {\"hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n+ {\"x road\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"members of parliament\", 1, {DICTIONARY_PERSONAL_TITLE}, 749},\n+ {\"s.hwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 1198},\n {\"gallery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"thro\", 1, {DICTIONARY_STREET_TYPE}, 1212},\n- {\"rr.row\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n+ {\"grnd\", 1, {DICTIONARY_STREET_TYPE}, 704},\n+ {\"nth western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"mb\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"circles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rr-row\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n- {\"state rt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n+ {\"crwy\", 1, {DICTIONARY_STREET_TYPE}, 999},\n+ {\"twp.r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"nat'l wildlife refuge area\", 1, {DICTIONARY_PLACE_NAME}, 856},\n+ {\"nrth east\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"thro\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"brdg\", 1, {DICTIONARY_STREET_TYPE}, 941},\n {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"steps\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s p\", 1, {DICTIONARY_COMPANY_TYPE}, 668},\n- {\"h r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 731},\n- {\"c.rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"nth wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"lgt cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n+ {\"nrtwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"twp.rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"cluster\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gway\", 1, {DICTIONARY_STREET_TYPE}, 1045},\n+ {\"court house\", 1, {DICTIONARY_PLACE_NAME}, 806},\n {\"vice president\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bsment\", 1, {DICTIONARY_LEVEL}, 698},\n- {\"plns\", 1, {DICTIONARY_STREET_TYPE}, 1128},\n+ {\"cvn\", 1, {DICTIONARY_STREET_TYPE}, 954},\n+ {\"bungalo\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 614},\n+ {\"st highway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"pthway\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n+ {\"xrds\", 1, {DICTIONARY_STREET_TYPE}, 997},\n {\"bakery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"llp\", 1, {DICTIONARY_COMPANY_TYPE}, 652},\n- {\"rdgwy\", 1, {DICTIONARY_STREET_TYPE}, 1159},\n+ {\"la\", 1, {DICTIONARY_TOPONYM}, 1314},\n {\"messrs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sign\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"plat\", 1, {DICTIONARY_STREET_TYPE}, 1133},\n+ {\"seast\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"villages\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"mister\", 1, {DICTIONARY_PERSONAL_TITLE}, 746},\n- {\"s rt\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"pz\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n+ {\"st\", 1, {DICTIONARY_STREET_TYPE}, 1205},\n {\"wharf\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"knol\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"landng\", 1, {DICTIONARY_STREET_TYPE}, 1083},\n+ {\"frgs\", 1, {DICTIONARY_SYNONYM}, 1266},\n {\"corners\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vl\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 624},\n- {\"rose bowl\", 1, {DICTIONARY_STREET_TYPE}, 1170},\n+ {\"edg\", 1, {DICTIONARY_STREET_TYPE}, 1013},\n+ {\"sherrifs dept\", 1, {DICTIONARY_PLACE_NAME}, 876},\n+ {\"throughway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ridge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dm\", 1, {DICTIONARY_PLACE_NAME}, 805},\n- {\"co.rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"vlla\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 624},\n- {\"causeway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"d phil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 590},\n+ {\"deputy pm\", 1, {DICTIONARY_PERSONAL_TITLE}, 728},\n+ {\"archbishop\", 1, {DICTIONARY_PERSONAL_TITLE}, 717},\n+ {\"co.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"ugfl\", 1, {DICTIONARY_LEVEL}, 712},\n {\"falls\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.h\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"scorp\", 1, {DICTIONARY_COMPANY_TYPE}, 671},\n+ {\"north wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"circ\", 1, {DICTIONARY_STREET_TYPE}, 962},\n {\"duplex\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n- {\"nat'l prk\", 1, {DICTIONARY_PLACE_NAME}, 850},\n {\"professional service corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"me\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"grnds\", 1, {DICTIONARY_STREET_TYPE}, 1047},\n- {\"bh\", 1, {DICTIONARY_PLACE_NAME}, 783},\n- {\"corp\", 1, {DICTIONARY_COMPANY_TYPE}, 633},\n- {\"alley\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrt wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"twp hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"cty hi\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 735},\n- {\"fl\", 1, {DICTIONARY_TOPONYM}, 1300},\n+ {\"intl\", 1, {DICTIONARY_SYNONYM}, 1272},\n+ {\"statert\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"rks\", 1, {DICTIONARY_STREET_TYPE}, 1172},\n+ {\"twp hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"tshp r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"van park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"clubhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"hl\", 1, {DICTIONARY_STREET_TYPE}, 1065},\n+ {\"fry\", 1, {DICTIONARY_STREET_TYPE}, 1026},\n+ {\"so eastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"nb\", 1, {DICTIONARY_TOPONYM}, 1326},\n {\"row\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"serviceway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gd\", 1, {DICTIONARY_LEVEL}, 705},\n+ {\"neastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"walkway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"amphitheater\", 1, {DICTIONARY_PLACE_NAME}, 778},\n {\"pond\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrtwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"vll\", 1, {DICTIONARY_PLACE_NAME}, 624},\n- {\"rsrv\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 619},\n {\"all\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"cmty\", 1, {DICTIONARY_PLACE_NAME}, 798},\n- {\"bywy\", 1, {DICTIONARY_STREET_TYPE}, 946},\n- {\"norh\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"se\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"sc\", 1, {DICTIONARY_TOPONYM}, 1349},\n+ {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 682},\n+ {\"ks\", 1, {DICTIONARY_TOPONYM}, 1312},\n {\"representatives\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ntheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"f\", 1, {DICTIONARY_UNIT}, 1032},\n+ {\"vge\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 888},\n {\"state highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pointe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"strwy\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n {\"doctor of pharmacy\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"kansas\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"lt colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n- {\"dorms\", 1, {DICTIONARY_PLACE_NAME}, 811},\n- {\"x-road\", 1, {DICTIONARY_STREET_TYPE}, 992},\n+ {\"road mailbox\", 1, {DICTIONARY_POST_OFFICE}, 900},\n+ {\"vy\", 1, {DICTIONARY_STREET_TYPE}, 1242},\n {\"track\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"anchorage\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gymnasium\", 1, {DICTIONARY_PLACE_NAME}, 819},\n- {\"hme\", 1, {DICTIONARY_PLACE_NAME}, 821},\n- {\"nrt western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"lse\", 1, {DICTIONARY_UNIT}, 1371},\n- {\"opas\", 1, {DICTIONARY_STREET_TYPE}, 1109},\n+ {\"so west\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"ex services complex\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"s hi\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"pt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 861},\n- {\"grd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"t rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"concse\", 1, {DICTIONARY_STREET_TYPE}, 969},\n- {\"pkwys\", 1, {DICTIONARY_STREET_TYPE}, 1115},\n- {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 677},\n- {\"tshp.hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"lwr\", 3, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 685},\n+ {\"wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 699},\n+ {\"opas\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n+ {\"mt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"c.h.\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"n wstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"ctyd\", 1, {DICTIONARY_STREET_TYPE}, 987},\n+ {\"p s e\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"t rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"bluff\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrtheastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"cty hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"ll b\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 593},\n {\"maze\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bachelor of sciences\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"upass\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n- {\"southwst\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"s eastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"heights\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"juris doctor\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"fcty\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 618},\n+ {\"run\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"row\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n {\"private limited company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"north estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"jty\", 1, {DICTIONARY_PLACE_NAME}, 830},\n- {\"avens\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"over pass\", 1, {DICTIONARY_STREET_TYPE}, 1109},\n- {\"byp\", 1, {DICTIONARY_STREET_TYPE}, 945},\n- {\"avnue\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"st.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"mpal building\", 1, {DICTIONARY_PLACE_NAME}, 841},\n+ {\"grd bde\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"nortestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"n.\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"neastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"nu\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"pe\", 1, {DICTIONARY_TOPONYM}, 1344},\n {\"trail\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 735},\n- {\"master of science\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"ucits\", 1, {DICTIONARY_COMPANY_TYPE}, 674},\n- {\"wkshp\", 1, {DICTIONARY_UNIT}, 1389},\n- {\"t hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"svc road\", 1, {DICTIONARY_STREET_TYPE}, 1175},\n+ {\"so wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"cars\", 1, {DICTIONARY_UNIT}, 1371},\n+ {\"bazaar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"bte\", 1, {DICTIONARY_STREET_TYPE}, 948},\n+ {\"l p\", 1, {DICTIONARY_COMPANY_TYPE}, 657},\n {\"bistro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctge\", 1, {DICTIONARY_BUILDING_TYPE}, 612},\n- {\"gr blvd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n+ {\"hi\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"delaware\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"bar be que\", 1, {DICTIONARY_PLACE_NAME}, 785},\n {\"ruins\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fway\", 1, {DICTIONARY_STREET_TYPE}, 1034},\n+ {\"tor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"soestrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"arkansas\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"cvan\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 950},\n- {\"shp\", 1, {DICTIONARY_PLACE_NAME}, 875},\n- {\"workshop\", 1, {DICTIONARY_UNIT}, -1},\n- {\"prkway\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"reps\", 1, {DICTIONARY_PERSONAL_TITLE}, 765},\n- {\"t h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"wy\", 1, {DICTIONARY_STREET_TYPE}, 1251},\n+ {\"congress woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 722},\n+ {\"stateroad\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"lieutenant colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sir\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"nth wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"winery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mnrs\", 1, {DICTIONARY_PLACE_NAME}, 834},\n+ {\"no\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n {\"doctor of divinity\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"butte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"h u f\", 1, {DICTIONARY_COMPANY_TYPE}, 641},\n- {\"tshp rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"rdy\", 1, {DICTIONARY_STREET_TYPE}, 1167},\n- {\"bdy\", 1, {DICTIONARY_STREET_TYPE}, 931},\n- {\"twp h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"tor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"wrd\", 1, {DICTIONARY_UNIT}, 1388},\n+ {\"t rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"norheast\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"drive\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tline\", 1, {DICTIONARY_STREET_TYPE}, 1222},\n+ {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"g boul\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n {\"credit union\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"drive\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rt hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n {\"firetrack\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"folw\", 1, {DICTIONARY_STREET_TYPE}, 1029},\n- {\"fitr\", 1, {DICTIONARY_STREET_TYPE}, 1027},\n- {\"brce\", 1, {DICTIONARY_STREET_TYPE}, 933},\n- {\"lgfl\", 1, {DICTIONARY_LEVEL}, 703},\n- {\"m s ed\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n- {\"promenade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"smt\", 1, {DICTIONARY_STREET_TYPE}, 1206},\n- {\"palms\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ho\", 1, {DICTIONARY_BUILDING_TYPE}, 617},\n- {\"t.rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"twp r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n+ {\"dstrb\", 1, {DICTIONARY_PLACE_NAME}, 812},\n+ {\"health centre\", 1, {DICTIONARY_PLACE_NAME}, 824},\n+ {\"xroad\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"aged care centre\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"lieut general\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n+ {\"south w\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"cty.hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"shopping\", 1, {DICTIONARY_PLACE_NAME}, 878},\n+ {\"p office box\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"fore shore\", 1, {DICTIONARY_STREET_TYPE}, 1036},\n+ {\"brewery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"causewy\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"norhestn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"south\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"societa europaea\", 1, {DICTIONARY_COMPANY_TYPE}, 670},\n+ {\"south western\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n {\"ok\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"we\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 625},\n- {\"atty\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 581},\n- {\"crecent\", 1, {DICTIONARY_STREET_TYPE}, 986},\n- {\"allwy\", 1, {DICTIONARY_STREET_TYPE}, 909},\n+ {\"sherffis office\", 1, {DICTIONARY_PLACE_NAME}, 877},\n+ {\"uppr\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 697},\n+ {\"sprngs\", 1, {DICTIONARY_STREET_TYPE}, 1192},\n+ {\"swestern\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"nrth estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"formation\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"plc\", 1, {DICTIONARY_COMPANY_TYPE}, 669},\n {\"i\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"sainte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s \/ centre\", 1, {DICTIONARY_PLACE_NAME}, 874},\n- {\"pths\", 1, {DICTIONARY_UNIT}, 1375},\n- {\"ring\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"lev\", 1, {DICTIONARY_LEVEL}, 702},\n- {\"hwy\", 1, {DICTIONARY_STREET_TYPE}, 1060},\n- {\"otlt\", 1, {DICTIONARY_STREET_TYPE}, 1105},\n- {\"divers\", 1, {DICTIONARY_STREET_TYPE}, 1002},\n+ {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 932},\n+ {\"nthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"csg\", 1, {DICTIONARY_STREET_TYPE}, 995},\n+ {\"veterinarians\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"fr\", 1, {DICTIONARY_PERSONAL_TITLE}, 732},\n+ {\"res\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n+ {\"cl\", 1, {DICTIONARY_STREET_TYPE}, 966},\n {\"florida\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"tce\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"prm\", 1, {DICTIONARY_STREET_TYPE}, 1139},\n- {\"nrthwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"mb\", 1, {DICTIONARY_TOPONYM}, 1316},\n {\"east\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"mrkt\", 1, {DICTIONARY_PLACE_NAME}, 848},\n- {\"nwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"ms\", 1, {DICTIONARY_POST_OFFICE}, 894},\n- {\"south estn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"promenade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"norheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"hom\", 1, {DICTIONARY_PLACE_NAME}, 825},\n+ {\"g bd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"nat'l park\", 1, {DICTIONARY_PLACE_NAME}, 854},\n {\"economic development corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"gap\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"southwstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"midle\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"bachelor of art\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n+ {\"twp.h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"subs\", 1, {DICTIONARY_UNIT}, 1387},\n+ {\"palms\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"vic\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"tshp.r\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"resrv\", 1, {DICTIONARY_PLACE_NAME}, 868},\n- {\"cso\", 1, {DICTIONARY_STREET_TYPE}, 976},\n- {\"cruiseway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"caratel\", 1, {DICTIONARY_PLACE_NAME}, 787},\n- {\"hrh\", 1, {DICTIONARY_PERSONAL_TITLE}, 730},\n- {\"community\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"wst\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n- {\"pocket\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grd bld\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"animal shelter\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cres\", 1, {DICTIONARY_STREET_TYPE}, 986},\n- {\"wd\", 1, {DICTIONARY_UNIT}, 1388},\n- {\"p l c\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n- {\"super market\", 1, {DICTIONARY_PLACE_NAME}, 878},\n- {\"nort e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"su\", 1, {DICTIONARY_UNIT}, 1385},\n+ {\"cabn\", 1, {DICTIONARY_BUILDING_TYPE}, 615},\n+ {\"nrt western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"l l l p\", 1, {DICTIONARY_COMPANY_TYPE}, 655},\n+ {\"center for aged care\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"acrs\", 1, {DICTIONARY_STREET_TYPE}, 911},\n+ {\"mfa\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 596},\n {\"primary care\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st road\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"chase\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"nrteast\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"llc\", 1, {DICTIONARY_COMPANY_TYPE}, 650},\n- {\"south eastern\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"northwest territories\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"hosp\", 1, {DICTIONARY_PLACE_NAME}, 822},\n- {\"nova scotia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"mtel\", 1, {DICTIONARY_PLACE_NAME}, 840},\n+ {\"ridge way\", 1, {DICTIONARY_STREET_TYPE}, 1163},\n+ {\"mkt\", 1, {DICTIONARY_PLACE_NAME}, 852},\n+ {\"lt governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n+ {\"mills\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 799},\n+ {\"raceway\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"csac\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n+ {\"esquire\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"nrtheastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"avenues\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n t\", 1, {DICTIONARY_COMPANY_TYPE}, 644},\n- {\"cntr\", 1, {DICTIONARY_STREET_TYPE}, 971},\n- {\"avnus\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"ma\", 1, {DICTIONARY_TOPONYM}, 1314},\n- {\"m phil\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 602},\n- {\"youth centre\", 1, {DICTIONARY_PLACE_NAME}, 887},\n- {\"lk\", 1, {DICTIONARY_SYNONYM}, 1269},\n- {\"sthwstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"public sector enterprise\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n- {\"industrial park\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"xrd\", 1, {DICTIONARY_STREET_TYPE}, 996},\n+ {\"nrth wst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"alley\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"hses\", 1, {DICTIONARY_PLACE_NAME}, 829},\n+ {\"inn\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"bsmnt\", 1, {DICTIONARY_LEVEL}, 702},\n+ {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"north estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 920},\n+ {\"nrt\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"central\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"barrack\", 1, {DICTIONARY_PLACE_NAME}, 782},\n- {\"unvrsty\", 1, {DICTIONARY_PLACE_NAME}, 882},\n- {\"basement\", 1, {DICTIONARY_LEVEL}, 698},\n+ {\"stair way\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n+ {\"squares\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"and\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"service rd\", 1, {DICTIONARY_STREET_TYPE}, 1175},\n- {\"dutchess\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cty rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"mn\", 1, {DICTIONARY_TOPONYM}, 1316},\n- {\"co.r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"rofw\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n- {\"st hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"blk\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 904},\n+ {\"soeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"wkshp\", 1, {DICTIONARY_UNIT}, 1393},\n+ {\"plains\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"highroad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pk\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 858},\n- {\"town houses\", 1, {DICTIONARY_PLACE_NAME}, 880},\n- {\"lease\", 1, {DICTIONARY_UNIT}, -1},\n- {\"nth estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"knl\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n- {\"intn\", 1, {DICTIONARY_STREET_TYPE}, 1067},\n- {\"cnc\", 1, {DICTIONARY_STREET_TYPE}, 969},\n+ {\"twp.hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"cty\", 1, {DICTIONARY_SYNONYM}, 1260},\n+ {\"brth\", 1, {DICTIONARY_UNIT}, 1369},\n+ {\"form\", 1, {DICTIONARY_STREET_TYPE}, 1037},\n {\"right honorable\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"t.h.\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"hosptl\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"nort western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n {\"post office\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_POST_OFFICE}, -1},\n- {\"nrteastrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"natl prk\", 1, {DICTIONARY_PLACE_NAME}, 850},\n {\"quebec\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"srd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"turnabout\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"look through company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"barbecue\", 1, {DICTIONARY_UNIT}, 1364},\n- {\"rsv\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 619},\n- {\"grds\", 1, {DICTIONARY_STREET_TYPE}, 1038},\n- {\"inn\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lees\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"phwy\", 1, {DICTIONARY_STREET_TYPE}, 1120},\n- {\"i c v c\", 1, {DICTIONARY_COMPANY_TYPE}, 645},\n+ {\"nthestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"grv\", 1, {DICTIONARY_STREET_TYPE}, 1052},\n+ {\"pkway\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"prek\", 1, {DICTIONARY_PLACE_NAME}, 868},\n+ {\"sh ctr\", 1, {DICTIONARY_PLACE_NAME}, 878},\n {\"lieutenant governor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sth wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"number\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"p f c\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n+ {\"nortestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"cottages\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"basin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rdge\", 1, {DICTIONARY_STREET_TYPE}, 1157},\n- {\"lby\", 1, {DICTIONARY_UNIT}, 1372},\n {\"jervis bay territory\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"st hw\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"nort wstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"limited liability partnership\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"lockedbag\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"villag\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n- {\"norhestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"nrthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"farmers market\", 1, {DICTIONARY_PLACE_NAME}, 813},\n- {\"cmn\", 1, {DICTIONARY_STREET_TYPE}, 965},\n- {\"prkwy\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n- {\"beech\", 1, {DICTIONARY_STREET_TYPE}, 923},\n+ {\"ltd \/ gte\", 1, {DICTIONARY_COMPANY_TYPE}, 651},\n+ {\"t.r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"miss\", 1, {DICTIONARY_PERSONAL_TITLE}, 752},\n {\"lower\", 3, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM, DICTIONARY_UNIT}, -1},\n- {\"sc d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n- {\"farm\", 4, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"lgt colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1131},\n+ {\"swest\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n {\"mill\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grvs\", 1, {DICTIONARY_SYNONYM}, 1267},\n- {\"crsg\", 1, {DICTIONARY_STREET_TYPE}, 991},\n- {\"t.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"hds\", 1, {DICTIONARY_STREET_TYPE}, 1055},\n- {\"post box\", 2, {DICTIONARY_POST_OFFICE, DICTIONARY_POST_OFFICE}, 891},\n- {\"hrbr\", 1, {DICTIONARY_STREET_TYPE}, 1051},\n+ {\"ret vill\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"bdwy\", 1, {DICTIONARY_STREET_TYPE}, 942},\n+ {\"cty clb\", 1, {DICTIONARY_PLACE_NAME}, 805},\n+ {\"cyd\", 1, {DICTIONARY_STREET_TYPE}, 987},\n {\"burgs\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"f d\", 1, {DICTIONARY_PLACE_NAME}, 818},\n+ {\"municipal\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"cape\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"e l p\", 1, {DICTIONARY_COMPANY_TYPE}, 638},\n- {\"conr\", 1, {DICTIONARY_STREET_TYPE}, 971},\n- {\"t.hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"vllg\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n- {\"s.h.\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"tshp.rt\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"ways\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"monastery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fl\", 1, {DICTIONARY_STREET_TYPE}, 1019},\n- {\"s.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"rch\", 1, {DICTIONARY_STREET_TYPE}, 1158},\n {\"nw\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"nrtwest\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"m f a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 592},\n- {\"his honour\", 1, {DICTIONARY_PERSONAL_TITLE}, 733},\n- {\"cottages\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"norh estrn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"crf\", 1, {DICTIONARY_STREET_TYPE}, 992},\n+ {\"ambassador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"appr\", 1, {DICTIONARY_STREET_TYPE}, 916},\n+ {\"nsg\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"wlkwy\", 1, {DICTIONARY_STREET_TYPE}, 1249},\n {\"circus\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"co\", 1, {DICTIONARY_TOPONYM}, 1296},\n {\"foreshore\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"sr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 712},\n- {\"frms\", 1, {DICTIONARY_STREET_TYPE}, 1021},\n {\"her honor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sthwest\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"c i c\", 1, {DICTIONARY_COMPANY_TYPE}, 635},\n {\"charitable incorporated organization\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"west virginia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"res\", 1, {DICTIONARY_PLACE_NAME}, 869},\n- {\"veterinarians\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"northwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"pre k\", 1, {DICTIONARY_PLACE_NAME}, 868},\n+ {\"vdct\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n+ {\"rev\", 1, {DICTIONARY_PERSONAL_TITLE}, 759},\n {\"wood\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"michigan\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"urgent care\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"norhwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"c r\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"ftwy\", 1, {DICTIONARY_STREET_TYPE}, 1030},\n- {\"nrth wst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"bwlk\", 1, {DICTIONARY_STREET_TYPE}, 927},\n- {\"jctn\", 1, {DICTIONARY_STREET_TYPE}, 1071},\n+ {\"hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"dorm\", 1, {DICTIONARY_PLACE_NAME}, 814},\n+ {\"bdge\", 1, {DICTIONARY_STREET_TYPE}, 941},\n+ {\"ut\", 1, {DICTIONARY_TOPONYM}, 1355},\n+ {\"grve\", 1, {DICTIONARY_STREET_TYPE}, 1052},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 757},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"north\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"art gallery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ns\", 1, {DICTIONARY_TOPONYM}, 1332},\n- {\"mail center\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"ba\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n {\"wi\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"rsd\", 1, {DICTIONARY_POST_OFFICE}, 897},\n- {\"office twr\", 1, {DICTIONARY_PLACE_NAME}, 856},\n- {\"oh\", 1, {DICTIONARY_TOPONYM}, 1335},\n+ {\"r o w\", 1, {DICTIONARY_STREET_TYPE}, 1164},\n+ {\"mrs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pdse\", 1, {DICTIONARY_SYNONYM}, 1285},\n+ {\"nrtwest\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n {\"curve\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"inc\", 1, {DICTIONARY_COMPANY_TYPE}, 642},\n {\"aerodome\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"mission\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"high school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nrthw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"rserv\", 1, {DICTIONARY_PLACE_NAME}, 868},\n {\"warehouse\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n- {\"sc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"crv\", 1, {DICTIONARY_STREET_TYPE}, 997},\n- {\"allyway\", 1, {DICTIONARY_STREET_TYPE}, 909},\n- {\"sheriffs ofc\", 1, {DICTIONARY_PLACE_NAME}, 873},\n- {\"centre\", 1, {DICTIONARY_STREET_TYPE}, 676},\n+ {\"ne\", 1, {DICTIONARY_TOPONYM}, 1324},\n+ {\"nj\", 1, {DICTIONARY_TOPONYM}, 1328},\n+ {\"b s\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 587},\n {\"point\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cty rte\", 1, {DICTIONARY_STREET_TYPE}, 979},\n+ {\"spe\", 1, {DICTIONARY_COMPANY_TYPE}, 675},\n+ {\"corner\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"southwest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"fire line\", 1, {DICTIONARY_STREET_TYPE}, 1025},\n- {\"so westrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"centre for the aged\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"crcs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 798},\n+ {\"sdng\", 1, {DICTIONARY_STREET_TYPE}, 1186},\n {\"distributor\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"gd bld\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"piont\", 1, {DICTIONARY_STREET_TYPE}, 1133},\n- {\"crwy\", 1, {DICTIONARY_STREET_TYPE}, 994},\n+ {\"gr bvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"basn\", 1, {DICTIONARY_STREET_TYPE}, 925},\n {\"library\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"crs\", 1, {DICTIONARY_STREET_TYPE}, 986},\n {\"shores\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"qc\", 1, {DICTIONARY_TOPONYM}, 1341},\n- {\"ent\", 1, {DICTIONARY_COMPANY_TYPE}, 636},\n- {\"terminal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"nrtestn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"sanct\", 1, {DICTIONARY_PLACE_NAME}, 875},\n+ {\"south estrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"line\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"unltd\", 1, {DICTIONARY_COMPANY_TYPE}, 679},\n {\"lot\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"vly\", 1, {DICTIONARY_STREET_TYPE}, 1238},\n- {\"cen\", 1, {DICTIONARY_STREET_TYPE}, 676},\n- {\"por\", 1, {DICTIONARY_UNIT}, 1376},\n- {\"p d\", 1, {DICTIONARY_PLACE_NAME}, 860},\n+ {\"gd blvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"bhouse\", 1, {DICTIONARY_PLACE_NAME}, 787},\n+ {\"sthestn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"madames\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vlly\", 1, {DICTIONARY_STREET_TYPE}, 1238},\n- {\"x road\", 1, {DICTIONARY_STREET_TYPE}, 992},\n+ {\"ct\", 1, {DICTIONARY_STREET_TYPE}, 985},\n+ {\"nrth e\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"s highway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n+ {\"rr.row\", 1, {DICTIONARY_STREET_TYPE}, 1150},\n {\"annex\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"stravenue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rds\", 1, {DICTIONARY_STREET_TYPE}, 1165},\n {\"tollway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"mall\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"ph d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 586},\n+ {\"knol\", 1, {DICTIONARY_STREET_TYPE}, 1079},\n+ {\"pmb\", 1, {DICTIONARY_POST_OFFICE}, 896},\n {\"committee\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grd boul\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"nb\", 1, {DICTIONARY_TOPONYM}, 1322},\n- {\"br\", 1, {DICTIONARY_STREET_TYPE}, 933},\n+ {\"lnwy\", 1, {DICTIONARY_STREET_TYPE}, 1085},\n+ {\"oregon\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"ronde\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gl\", 1, {DICTIONARY_STREET_TYPE}, 1042},\n {\"movie theater\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"va\", 1, {DICTIONARY_TOPONYM}, 1358},\n {\"via\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"e e i g\", 1, {DICTIONARY_COMPANY_TYPE}, 637},\n+ {\"pls\", 1, {DICTIONARY_STREET_TYPE}, 1132},\n {\"roadside\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cve\", 1, {DICTIONARY_STREET_TYPE}, 997},\n {\"international business company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"m p p\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 598},\n {\"doctor of osteopathic medicine\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"mdr\", 1, {DICTIONARY_STREET_TYPE}, 1095},\n- {\"m s\", 1, {DICTIONARY_POST_OFFICE}, 894},\n+ {\"m p a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n+ {\"carpark\", 1, {DICTIONARY_PLACE_NAME}, 792},\n+ {\"postbox\", 1, {DICTIONARY_POST_OFFICE}, 895},\n+ {\"natl rec area\", 1, {DICTIONARY_PLACE_NAME}, 855},\n {\"southwestern\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"nrtwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"so east\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"delicatessen\", 1, {DICTIONARY_PLACE_NAME}, 810},\n+ {\"lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n+ {\"steakhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"tas\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"rpd\", 1, {DICTIONARY_STREET_TYPE}, 1151},\n- {\"gr boul\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"mls\", 1, {DICTIONARY_STREET_TYPE}, 1100},\n- {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n- {\"grtr\", 1, {DICTIONARY_SYNONYM}, 1265},\n+ {\"jd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 589},\n+ {\"cty hway\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"barbeque\", 1, {DICTIONARY_UNIT}, -1},\n- {\"harbour\", 1, {DICTIONARY_STREET_TYPE}, 1051},\n- {\"twp hi\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"grand boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"yd\", 1, {DICTIONARY_STREET_TYPE}, 1253},\n- {\"chiropractic\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"nl\", 1, {DICTIONARY_TOPONYM}, 1332},\n+ {\"flne\", 1, {DICTIONARY_STREET_TYPE}, 1029},\n+ {\"roads\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"hghlds\", 1, {DICTIONARY_STREET_TYPE}, 1062},\n+ {\"throughfare\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"lt gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n+ {\"mll\", 1, {DICTIONARY_PLACE_NAME}, 836},\n+ {\"pwy\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"cuwy\", 1, {DICTIONARY_STREET_TYPE}, 999},\n {\"wyoming\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"corporation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"nat'l rec area\", 1, {DICTIONARY_PLACE_NAME}, 855},\n+ {\"st hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"deviation\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"clinic\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ma\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"t.r.\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"city hall\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tshp h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"tshp hgwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"club house\", 1, {DICTIONARY_PLACE_NAME}, 800},\n {\"walk\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"se\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"huf\", 1, {DICTIONARY_COMPANY_TYPE}, 641},\n- {\"cr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 985},\n- {\"yrd\", 1, {DICTIONARY_STREET_TYPE}, 1253},\n- {\"twp rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"motl\", 1, {DICTIONARY_PLACE_NAME}, 844},\n {\"forks\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"nwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"aat\", 1, {DICTIONARY_TOPONYM}, 1292},\n- {\"vlg\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, 884},\n- {\"l\", 1, {DICTIONARY_LEVEL}, 702},\n- {\"btm\", 1, {DICTIONARY_STREET_TYPE}, 929},\n- {\"drs\", 1, {DICTIONARY_PERSONAL_TITLE}, 726},\n- {\"triangle\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n+ {\"minnesota\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"north west\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"doing business as\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"sw\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n {\"mile\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"twp hway\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 1116},\n- {\"flt\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1028},\n- {\"northw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"sp\", 1, {DICTIONARY_COMPANY_TYPE}, 668},\n- {\"laneway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n- {\"theater\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c i o\", 1, {DICTIONARY_COMPANY_TYPE}, 627},\n- {\"co rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"bowl\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rh\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n+ {\"cn\", 1, {DICTIONARY_DIRECTIONAL}, 681},\n+ {\"pvt ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 664},\n+ {\"mpal building\", 1, {DICTIONARY_PLACE_NAME}, 845},\n+ {\"tncy\", 1, {DICTIONARY_UNIT}, 1389},\n+ {\"childcare\", 1, {DICTIONARY_PLACE_NAME}, 796},\n+ {\"j d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 589},\n+ {\"cause\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"aat\", 1, {DICTIONARY_TOPONYM}, 1296},\n+ {\"strnds\", 1, {DICTIONARY_STREET_TYPE}, 1203},\n {\"doctor of theology\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"sth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"pass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pier\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"sowstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"cpe\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 952},\n {\"ks\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"coffee\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"twp.rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"parkway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"twp.rte\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"cv\", 1, {DICTIONARY_STREET_TYPE}, 988},\n+ {\"dist\", 1, {DICTIONARY_PLACE_NAME}, 813},\n+ {\"wlk\", 1, {DICTIONARY_STREET_TYPE}, 1248},\n+ {\"ladder\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"co.hwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n {\"az\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"sound\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"thorough fare\", 1, {DICTIONARY_STREET_TYPE}, 1210},\n- {\"nrtwestern\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"fl\", 1, {DICTIONARY_TOPONYM}, 1304},\n {\"van\", 1, {DICTIONARY_UNIT}, -1},\n- {\"nthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"twp.rt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"so estrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"term\", 1, {DICTIONARY_PLACE_NAME}, 879},\n+ {\"t.hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"eeig\", 1, {DICTIONARY_COMPANY_TYPE}, 641},\n+ {\"sdg\", 1, {DICTIONARY_STREET_TYPE}, 1186},\n+ {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 724},\n+ {\"baracks\", 1, {DICTIONARY_PLACE_NAME}, 786},\n+ {\"nwstn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"mr\", 1, {DICTIONARY_STREET_TYPE}, 1099},\n+ {\"conr\", 1, {DICTIONARY_STREET_TYPE}, 975},\n {\"roadway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"frgs\", 1, {DICTIONARY_SYNONYM}, 1262},\n- {\"host\", 1, {DICTIONARY_PLACE_NAME}, 823},\n- {\"cty.hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"waters\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1222},\n- {\"ugf\", 1, {DICTIONARY_LEVEL}, 708},\n- {\"lgt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 738},\n- {\"sxn\", 1, {DICTIONARY_QUALIFIER}, 902},\n+ {\"maj gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 747},\n+ {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1121},\n+ {\"gr bde\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"sth w\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"spg\", 1, {DICTIONARY_STREET_TYPE}, 1191},\n+ {\"oh\", 1, {DICTIONARY_TOPONYM}, 1339},\n+ {\"s route\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"cruiseway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vla\", 1, {DICTIONARY_PLACE_NAME}, 628},\n+ {\"sec\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 906},\n+ {\"crwy\", 1, {DICTIONARY_STREET_TYPE}, 998},\n+ {\"ll d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 605},\n+ {\"b corp\", 1, {DICTIONARY_COMPANY_TYPE}, 630},\n+ {\"m d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 597},\n {\"mews\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bottms\", 1, {DICTIONARY_STREET_TYPE}, 930},\n- {\"pkld\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n+ {\"mb\", 1, {DICTIONARY_UNIT}, 1378},\n {\"front\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"h r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 730},\n- {\"dway\", 1, {DICTIONARY_STREET_TYPE}, 1006},\n- {\"township highway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"harbour\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"byu\", 1, {DICTIONARY_STREET_TYPE}, 926},\n+ {\"mountain\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"soestn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"ny\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"plza\", 1, {DICTIONARY_STREET_TYPE}, 1130},\n- {\"num\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1104},\n- {\"cusac\", 1, {DICTIONARY_STREET_TYPE}, 996},\n- {\"cnyn\", 1, {DICTIONARY_STREET_TYPE}, 949},\n- {\"statert\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"vice pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 771},\n- {\"vil\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n- {\"nrt eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"retirement home\", 1, {DICTIONARY_PLACE_NAME}, 870},\n+ {\"pocket\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nthwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"ms\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_PERSONAL_TITLE}, -1},\n {\"yoga\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nfa\", 1, {DICTIONARY_NO_ADDRESS}, 709},\n- {\"th\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"csac\", 1, {DICTIONARY_STREET_TYPE}, 996},\n- {\"s.road\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"t.h\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"ft\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 817},\n- {\"ce\", 1, {DICTIONARY_STREET_TYPE}, 984},\n- {\"wine bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"devn\", 1, {DICTIONARY_STREET_TYPE}, 1000},\n- {\"& company\", 1, {DICTIONARY_COMPANY_TYPE}, 630},\n+ {\"sestrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"srte\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"trl\", 1, {DICTIONARY_STREET_TYPE}, 1226},\n+ {\"intersection\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 1140},\n+ {\"misses\", 1, {DICTIONARY_PERSONAL_TITLE}, 751},\n+ {\"animal shelter\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mpa\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 601},\n+ {\"marine berth\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"qdgl\", 1, {DICTIONARY_STREET_TYPE}, 1146},\n+ {\"lgt governor\", 1, {DICTIONARY_PERSONAL_TITLE}, 741},\n {\"penitentiary\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grd bd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"crse\", 1, {DICTIONARY_STREET_TYPE}, 980},\n- {\"lieut commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 739},\n- {\"r h\", 1, {DICTIONARY_PERSONAL_TITLE}, 756},\n- {\"c hwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"pd\", 1, {DICTIONARY_PLACE_NAME}, 864},\n+ {\"nbr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n+ {\"az\", 1, {DICTIONARY_TOPONYM}, 1294},\n+ {\"rte\", 1, {DICTIONARY_STREET_TYPE}, 1176},\n {\"garage\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"congress woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 718},\n- {\"inlt\", 1, {DICTIONARY_STREET_TYPE}, 1065},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 882},\n- {\"meander\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"look out\", 1, {DICTIONARY_STREET_TYPE}, 1092},\n {\"trailer\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"crve\", 1, {DICTIONARY_STREET_TYPE}, 997},\n- {\"co.hway\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"byway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gwy\", 1, {DICTIONARY_STREET_TYPE}, 1041},\n- {\"sqs\", 1, {DICTIONARY_STREET_TYPE}, 1191},\n- {\"estrn\", 1, {DICTIONARY_DIRECTIONAL}, 680},\n- {\"lb\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"lt\", 1, {DICTIONARY_STREET_TYPE}, 1082},\n- {\"avnues\", 1, {DICTIONARY_STREET_TYPE}, 917},\n- {\"southestrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n- {\"wy\", 1, {DICTIONARY_STREET_TYPE}, 1247},\n- {\"grd\", 1, {DICTIONARY_STREET_TYPE}, 1037},\n- {\"chair woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 722},\n- {\"and co\", 1, {DICTIONARY_COMPANY_TYPE}, 630},\n+ {\"wy\", 1, {DICTIONARY_TOPONYM}, 1363},\n+ {\"aprt\", 1, {DICTIONARY_PLACE_NAME}, 782},\n+ {\"cineplex\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"high road\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n+ {\"union\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"brk\", 1, {DICTIONARY_STREET_TYPE}, 940},\n+ {\"thfr\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"pkwy\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"northestrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"twp hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"look through co\", 1, {DICTIONARY_COMPANY_TYPE}, 658},\n+ {\"rnde\", 1, {DICTIONARY_STREET_TYPE}, 1173},\n+ {\"s.rt\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"padk\", 1, {DICTIONARY_STREET_TYPE}, 1114},\n+ {\"lgt commander\", 1, {DICTIONARY_PERSONAL_TITLE}, 743},\n+ {\"vis\", 1, {DICTIONARY_STREET_TYPE}, 1247},\n+ {\"pre-k\", 1, {DICTIONARY_PLACE_NAME}, 868},\n+ {\"lgfl\", 1, {DICTIONARY_LEVEL}, 707},\n+ {\"hghts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n {\"de\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"d sc\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n- {\"un\", 1, {DICTIONARY_STREET_TYPE}, 1233},\n- {\"soc\", 1, {DICTIONARY_COMPANY_TYPE}, 673},\n- {\"avn\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"ab\", 1, {DICTIONARY_TOPONYM}, 1288},\n- {\"hos\", 1, {DICTIONARY_PLACE_NAME}, 822},\n- {\"nort w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"pub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"nmbr\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1108},\n+ {\"sk\", 1, {DICTIONARY_TOPONYM}, 1348},\n+ {\"lndg\", 1, {DICTIONARY_STREET_TYPE}, 1083},\n+ {\"caus\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"board walk\", 1, {DICTIONARY_STREET_TYPE}, 931},\n {\"well\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"avenu\", 1, {DICTIONARY_STREET_TYPE}, 916},\n- {\"j h s\", 1, {DICTIONARY_PLACE_NAME}, 847},\n- {\"sowstn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"cft\", 1, {DICTIONARY_STREET_TYPE}, 989},\n- {\"pharm d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 607},\n- {\"p o box\", 1, {DICTIONARY_POST_OFFICE}, 891},\n- {\"unit\", 1, {DICTIONARY_UNIT}, -1},\n- {\"brk\", 1, {DICTIONARY_STREET_TYPE}, 939},\n- {\"limits\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"x way\", 1, {DICTIONARY_STREET_TYPE}, 994},\n- {\"unions\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"concs\", 1, {DICTIONARY_STREET_TYPE}, 973},\n+ {\"svc rd\", 1, {DICTIONARY_STREET_TYPE}, 1179},\n+ {\"yt\", 1, {DICTIONARY_TOPONYM}, 1364},\n+ {\"centre for aged care\", 1, {DICTIONARY_PLACE_NAME}, 777},\n+ {\"btw\", 1, {DICTIONARY_STOPWORD}, 908},\n+ {\"nwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"ln\", 1, {DICTIONARY_STREET_TYPE}, 1088},\n+ {\"twp h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"il\", 1, {DICTIONARY_TOPONYM}, 1308},\n+ {\"country clb\", 1, {DICTIONARY_PLACE_NAME}, 805},\n+ {\"lieut gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 744},\n+ {\"fty\", 3, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 618},\n+ {\"parkways\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"park land\", 1, {DICTIONARY_STREET_TYPE}, 1117},\n+ {\"sthwst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n {\"upper\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, -1},\n- {\"montana\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"fire track\", 1, {DICTIONARY_STREET_TYPE}, 1030},\n {\"courthouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"slpe\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1184},\n- {\"pharm\", 1, {DICTIONARY_PLACE_NAME}, 859},\n- {\"trt\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n- {\"hlds\", 1, {DICTIONARY_STREET_TYPE}, 1058},\n+ {\"c van park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"retirement village\", 1, {DICTIONARY_PLACE_NAME}, 874},\n+ {\"r \/ o\", 1, {DICTIONARY_UNIT}, 1381},\n+ {\"new hampshire\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"hsp\", 1, {DICTIONARY_PLACE_NAME}, 826},\n+ {\"pokt\", 1, {DICTIONARY_STREET_TYPE}, 1136},\n+ {\"s p e\", 1, {DICTIONARY_COMPANY_TYPE}, 675},\n+ {\"imp\", 1, {DICTIONARY_STREET_TYPE}, 1068},\n+ {\"mddl\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n+ {\"blvde\", 1, {DICTIONARY_STREET_TYPE}, 932},\n {\"conservatory\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 693},\n {\"moor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nrtw\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"rdgs\", 1, {DICTIONARY_STREET_TYPE}, 1158},\n- {\"vice chair woman\", 1, {DICTIONARY_PERSONAL_TITLE}, 770},\n- {\"miss\", 1, {DICTIONARY_PERSONAL_TITLE}, 748},\n- {\"ldge\", 1, {DICTIONARY_PLACE_NAME}, 831},\n+ {\"thru\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"caravn park\", 1, {DICTIONARY_PLACE_NAME}, 791},\n+ {\"ctrs\", 1, {DICTIONARY_STREET_TYPE}, 956},\n+ {\"vue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"loaf\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"subdiv\", 1, {DICTIONARY_STREET_TYPE}, 1204},\n- {\"gr blvrd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"crc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 794},\n- {\"gdbd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"line\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"wys\", 1, {DICTIONARY_STREET_TYPE}, 1248},\n- {\"ant\", 1, {DICTIONARY_UNIT}, 1361},\n- {\"nwstn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"stps\", 1, {DICTIONARY_STREET_TYPE}, 1197},\n- {\"pne\", 1, {DICTIONARY_STREET_TYPE}, 1124},\n+ {\"gt\", 1, {DICTIONARY_SYNONYM}, 1268},\n+ {\"s western\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"whs\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 629},\n+ {\"avns\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"nra\", 1, {DICTIONARY_PLACE_NAME}, 855},\n+ {\"phd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 590},\n+ {\"j\", 1, {DICTIONARY_STREET_TYPE}, 1075},\n+ {\"term\", 1, {DICTIONARY_PLACE_NAME}, 883},\n+ {\"hglds\", 1, {DICTIONARY_STREET_TYPE}, 1062},\n {\"landing\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nv\", 1, {DICTIONARY_TOPONYM}, 1321},\n- {\"great\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"mun bldg\", 1, {DICTIONARY_PLACE_NAME}, 841},\n- {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n+ {\"lookthrough company\", 1, {DICTIONARY_COMPANY_TYPE}, 658},\n+ {\"fy\", 1, {DICTIONARY_STREET_TYPE}, 1026},\n {\"glens\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"twp.hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"lnk\", 1, {DICTIONARY_STREET_TYPE}, 1085},\n- {\"g bld\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"lagon\", 1, {DICTIONARY_STREET_TYPE}, 1078},\n- {\"brg\", 1, {DICTIONARY_STREET_TYPE}, 937},\n- {\"sth west\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n- {\"end\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"np\", 1, {DICTIONARY_PLACE_NAME}, 850},\n+ {\"saloon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"nrth western\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"lease\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"swestrn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"p l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 665},\n {\"or\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"bdg\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 609},\n- {\"sthwstrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n- {\"lookthrough co\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n- {\"ldg\", 1, {DICTIONARY_STREET_TYPE}, 1079},\n- {\"ancg\", 1, {DICTIONARY_STREET_TYPE}, 911},\n- {\"cir\", 1, {DICTIONARY_STREET_TYPE}, 955},\n+ {\"rsbl\", 1, {DICTIONARY_STREET_TYPE}, 1174},\n+ {\"master of arts\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"n westrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"nh\", 1, {DICTIONARY_PLACE_NAME}, 849},\n+ {\"bbq\", 1, {DICTIONARY_PLACE_NAME}, 785},\n+ {\"nortwst\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"quys\", 1, {DICTIONARY_STREET_TYPE}, 1148},\n+ {\"lt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 742},\n+ {\"lowr\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n+ {\"s.hway\", 1, {DICTIONARY_STREET_TYPE}, 1198},\n {\"distillery\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1172},\n- {\"mt\", 1, {DICTIONARY_TOPONYM}, 1319},\n- {\"t hwy\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"twp rd\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"sa\", 1, {DICTIONARY_TOPONYM}, 1347},\n- {\"station\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"nrt eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"x-way\", 1, {DICTIONARY_STREET_TYPE}, 998},\n+ {\"tshp hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"ps\", 1, {DICTIONARY_PLACE_NAME}, 869},\n+ {\"t.h\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"rserv\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 623},\n+ {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n+ {\"vice chair\", 1, {DICTIONARY_PERSONAL_TITLE}, 773},\n+ {\"nrteastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"gym\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tn\", 1, {DICTIONARY_TOPONYM}, 1349},\n- {\"congress man\", 1, {DICTIONARY_PERSONAL_TITLE}, 717},\n- {\"brk\", 1, {DICTIONARY_STREET_TYPE}, 936},\n- {\"psu\", 1, {DICTIONARY_COMPANY_TYPE}, 666},\n- {\"boundary\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"qd\", 1, {DICTIONARY_STREET_TYPE}, 1145},\n+ {\"hse\", 1, {DICTIONARY_BUILDING_TYPE}, 621},\n+ {\"estn\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"rf\", 1, {DICTIONARY_LEVEL}, 711},\n+ {\"public school\", 1, {DICTIONARY_PLACE_NAME}, 816},\n {\"tea\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"scd\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 594},\n+ {\"nurses home\", 1, {DICTIONARY_PLACE_NAME}, 857},\n {\"iowa\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"bongalow\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 610},\n- {\"nursing centre\", 1, {DICTIONARY_PLACE_NAME}, 844},\n- {\"wy\", 1, {DICTIONARY_TOPONYM}, 1359},\n+ {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 983},\n+ {\"po\", 1, {DICTIONARY_POST_OFFICE}, 903},\n+ {\"tshp hway\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"bishop\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"up\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_SYNONYM}, 697},\n {\"madame\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cty hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n {\"bayou\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rsrve\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 619},\n+ {\"l\", 1, {DICTIONARY_STREET_TYPE}, 1084},\n {\"nursing home\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, -1},\n- {\"strav\", 1, {DICTIONARY_STREET_TYPE}, 1200},\n- {\"alabama\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"rmbl\", 1, {DICTIONARY_STREET_TYPE}, 1151},\n+ {\"hgts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1061},\n+ {\"i b c\", 1, {DICTIONARY_COMPANY_TYPE}, 647},\n {\"fields\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ug\", 1, {DICTIONARY_LEVEL}, 708},\n- {\"wa\", 1, {DICTIONARY_TOPONYM}, 1357},\n {\"gpo box\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"look through co\", 1, {DICTIONARY_COMPANY_TYPE}, 654},\n- {\"the yukon\", 1, {DICTIONARY_TOPONYM}, 1360},\n- {\"downes\", 1, {DICTIONARY_SYNONYM}, 1004},\n- {\"road mail box\", 1, {DICTIONARY_POST_OFFICE}, 896},\n+ {\"south wst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"post mail box\", 1, {DICTIONARY_POST_OFFICE}, -1},\n {\"ca\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"not applicable\", 1, {DICTIONARY_NULL}, -1},\n- {\"hotl\", 1, {DICTIONARY_PLACE_NAME}, 824},\n+ {\"s estn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n {\"bathing box\", 1, {DICTIONARY_UNIT}, -1},\n- {\"cpl\", 1, {DICTIONARY_PERSONAL_TITLE}, 719},\n- {\"shopping centre\", 1, {DICTIONARY_PLACE_NAME}, 874},\n- {\"hth\", 1, {DICTIONARY_STREET_TYPE}, 1056},\n+ {\"flds\", 1, {DICTIONARY_STREET_TYPE}, 1028},\n {\"bottoms\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tshp hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n+ {\"mem\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 841},\n+ {\"n estn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1226},\n {\"office\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"bs\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 583},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n {\"radial\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nort wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"vill\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER}, 884},\n- {\"edg\", 1, {DICTIONARY_STREET_TYPE}, 1009},\n- {\"grbd\", 1, {DICTIONARY_STREET_TYPE}, 1044},\n- {\"twp rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"llb\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 593},\n+ {\"shr\", 1, {DICTIONARY_STREET_TYPE}, 1183},\n+ {\"bypa\", 1, {DICTIONARY_STREET_TYPE}, 949},\n+ {\"northeastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"driveway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grave yard\", 1, {DICTIONARY_PLACE_NAME}, 818},\n- {\"x ing\", 1, {DICTIONARY_STREET_TYPE}, 991},\n- {\"hieghts\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1057},\n+ {\"hywy\", 1, {DICTIONARY_STREET_TYPE}, 1064},\n+ {\"comm\", 1, {DICTIONARY_STREET_TYPE}, 969},\n+ {\"brig gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 718},\n {\"playhouse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tshp.r\", 1, {DICTIONARY_STREET_TYPE}, 1215},\n- {\"vlys\", 1, {DICTIONARY_STREET_TYPE}, 1239},\n+ {\"pst\", 1, {DICTIONARY_POST_OFFICE}, 903},\n {\"bypass\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"barrack\", 1, {DICTIONARY_PLACE_NAME}, 786},\n {\"dentistry\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"county route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"squares\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dojo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"south carolina\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"brch\", 1, {DICTIONARY_STREET_TYPE}, 938},\n+ {\"right and honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n {\"antenna\", 1, {DICTIONARY_UNIT}, -1},\n- {\"lbby\", 1, {DICTIONARY_UNIT}, 1372},\n- {\"st.hi\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"hi.rd\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n+ {\"lcks\", 1, {DICTIONARY_SYNONYM}, 1276},\n+ {\"tnhs\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, 626},\n+ {\"nrte\", 1, {DICTIONARY_DIRECTIONAL}, 688},\n+ {\"hls\", 1, {DICTIONARY_STREET_TYPE}, 1066},\n {\"sd\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"norh eastern\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"run\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"north eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n+ {\"plza\", 1, {DICTIONARY_STREET_TYPE}, 1134},\n+ {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 1204},\n {\"center\", 2, {DICTIONARY_DIRECTIONAL, DICTIONARY_STREET_TYPE}, -1},\n- {\"fds\", 1, {DICTIONARY_STREET_TYPE}, 1024},\n- {\"norh western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"wlk\", 1, {DICTIONARY_STREET_TYPE}, 1244},\n- {\"c hw\", 1, {DICTIONARY_STREET_TYPE}, 977},\n- {\"pklds\", 1, {DICTIONARY_STREET_TYPE}, 1113},\n- {\"s w\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"cls\", 1, {DICTIONARY_STREET_TYPE}, 966},\n+ {\"master of science\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n+ {\"pkw\", 1, {DICTIONARY_STREET_TYPE}, 1118},\n+ {\"strds\", 1, {DICTIONARY_STREET_TYPE}, 1203},\n+ {\"sth wst\", 1, {DICTIONARY_DIRECTIONAL}, 695},\n+ {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 616},\n+ {\"se\", 1, {DICTIONARY_COMPANY_TYPE}, 674},\n {\"european cooperative society\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"sanctuary\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rs\", 1, {DICTIONARY_PLACE_NAME}, 868},\n- {\"tshp rte\", 1, {DICTIONARY_STREET_TYPE}, 1216},\n+ {\"qd\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 905},\n+ {\"c.hgwy\", 1, {DICTIONARY_STREET_TYPE}, 981},\n+ {\"cross roads\", 1, {DICTIONARY_STREET_TYPE}, 997},\n+ {\"cnwy\", 1, {DICTIONARY_STREET_TYPE}, 957},\n {\"football club\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"district of columbia\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"st.hw\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"st hway\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n+ {\"dutchess\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"cnctr\", 1, {DICTIONARY_STREET_TYPE}, 975},\n+ {\"eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 684},\n+ {\"grns\", 1, {DICTIONARY_SYNONYM}, 1270},\n+ {\"htel\", 1, {DICTIONARY_PLACE_NAME}, 828},\n {\"cul de sac\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cluster\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"mansions\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"btms\", 1, {DICTIONARY_STREET_TYPE}, 930},\n- {\"st rd\", 1, {DICTIONARY_STREET_TYPE}, 1195},\n- {\"stll\", 1, {DICTIONARY_UNIT}, 1380},\n- {\"clde\", 1, {DICTIONARY_STREET_TYPE}, 964},\n+ {\"clse\", 1, {DICTIONARY_STREET_TYPE}, 966},\n {\"building\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n- {\"l d c\", 1, {DICTIONARY_COMPANY_TYPE}, 649},\n {\"concourse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.rd\", 1, {DICTIONARY_STREET_TYPE}, 978},\n- {\"s eastrn\", 1, {DICTIONARY_DIRECTIONAL}, 690},\n+ {\"extn\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1020},\n {\"tarn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"entr\", 1, {DICTIONARY_STREET_TYPE}, 1011},\n- {\"co.r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"nrthwestrn\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n- {\"mid\", 1, {DICTIONARY_SYNONYM}, 682},\n+ {\"norhwestern\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"mt\", 1, {DICTIONARY_SYNONYM}, 1278},\n {\"graveyard\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 733},\n {\"junior high school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"co.rt\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"retirement\", 1, {DICTIONARY_PLACE_NAME}, 870},\n {\"dc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"s rd\", 1, {DICTIONARY_STREET_TYPE}, 1199},\n {\"canyon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"x-ing\", 1, {DICTIONARY_STREET_TYPE}, 991},\n- {\"bbq\", 1, {DICTIONARY_PLACE_NAME}, 781},\n- {\"nortwst\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"c hgwy\", 1, {DICTIONARY_STREET_TYPE}, 977},\n+ {\"cty\", 1, {DICTIONARY_SYNONYM}, 1259},\n+ {\"sc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"blvrd\", 1, {DICTIONARY_STREET_TYPE}, 932},\n {\"shed\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_UNIT}, -1},\n- {\"psc\", 1, {DICTIONARY_COMPANY_TYPE}, 662},\n- {\"lt general\", 1, {DICTIONARY_PERSONAL_TITLE}, 740},\n {\"tx\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ph\", 1, {DICTIONARY_UNIT}, 1375},\n {\"tavern\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prk\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 858},\n- {\"fl\", 1, {DICTIONARY_LEVEL}, 699},\n- {\"hllw\", 1, {DICTIONARY_STREET_TYPE}, 1063},\n- {\"nort\", 1, {DICTIONARY_DIRECTIONAL}, 683},\n- {\"cncd\", 1, {DICTIONARY_STREET_TYPE}, 967},\n+ {\"pct\", 1, {DICTIONARY_PLACE_NAME}, 866},\n+ {\"so wstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"northwest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"cinemas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tshp.hi\", 1, {DICTIONARY_STREET_TYPE}, 1218},\n+ {\"wa\", 1, {DICTIONARY_TOPONYM}, 1359},\n {\"heath\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"md\", 1, {DICTIONARY_TOPONYM}, 1313},\n- {\"cxn\", 1, {DICTIONARY_STREET_TYPE}, 970},\n+ {\"avenus\", 1, {DICTIONARY_STREET_TYPE}, 921},\n+ {\"rtn\", 1, {DICTIONARY_STREET_TYPE}, 1160},\n {\"plain\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"terr\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"sprng\", 1, {DICTIONARY_STREET_TYPE}, 1187},\n+ {\"boulevarde\", 1, {DICTIONARY_STREET_TYPE}, 932},\n {\"copse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"skyway\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mountain\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 866},\n- {\"ups\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n- {\"mndr\", 1, {DICTIONARY_STREET_TYPE}, 1095},\n- {\"exp\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n- {\"pty ltd\", 1, {DICTIONARY_COMPANY_TYPE}, 664},\n- {\"chr\", 1, {DICTIONARY_PLACE_NAME}, 793},\n- {\"rgwy\", 1, {DICTIONARY_STREET_TYPE}, 1159},\n- {\"nrth w\", 1, {DICTIONARY_DIRECTIONAL}, 686},\n- {\"x-wy\", 1, {DICTIONARY_STREET_TYPE}, 994},\n+ {\"winebar\", 1, {DICTIONARY_PLACE_NAME}, 890},\n+ {\"rm\", 1, {DICTIONARY_UNIT}, 1382},\n+ {\"non profit\", 1, {DICTIONARY_COMPANY_TYPE}, 662},\n+ {\"expway\", 1, {DICTIONARY_STREET_TYPE}, 1019},\n+ {\"t r\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n+ {\"swstn\", 1, {DICTIONARY_DIRECTIONAL}, 696},\n+ {\"dn\", 1, {DICTIONARY_STREET_TYPE}, 1007},\n+ {\"knls\", 1, {DICTIONARY_STREET_TYPE}, 1080},\n+ {\"round\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"entrance\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"plat\", 1, {DICTIONARY_STREET_TYPE}, 1129},\n+ {\"pn\", 1, {DICTIONARY_STREET_TYPE}, 1128},\n+ {\"mail center\", 1, {DICTIONARY_POST_OFFICE}, 899},\n+ {\"downs\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n {\"saskatchewan\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"natl park\", 1, {DICTIONARY_PLACE_NAME}, 854},\n {\"forges\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s.hwy\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 1194},\n+ {\"unit\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"wds\", 1, {DICTIONARY_SYNONYM}, 1290},\n+ {\"cty r\", 1, {DICTIONARY_STREET_TYPE}, 983},\n {\"performing arts centre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"b\/t\", 1, {DICTIONARY_STOPWORD}, 904},\n- {\"b a\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 582},\n- {\"expway\", 1, {DICTIONARY_STREET_TYPE}, 1015},\n- {\"hird\", 1, {DICTIONARY_STREET_TYPE}, 1059},\n- {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n- {\"st rte\", 1, {DICTIONARY_STREET_TYPE}, 1196},\n- {\"mail bag\", 1, {DICTIONARY_POST_OFFICE}, 888},\n- {\"upas\", 1, {DICTIONARY_STREET_TYPE}, 1232},\n+ {\"dc\", 1, {DICTIONARY_TOPONYM}, 1303},\n+ {\"g bvd\", 1, {DICTIONARY_STREET_TYPE}, 1048},\n+ {\"norh wstrn\", 1, {DICTIONARY_DIRECTIONAL}, 691},\n+ {\"twp.r\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"orch\", 1, {DICTIONARY_SYNONYM}, 1284},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1220},\n {\"qld\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"n western\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n {\"fork\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"limited by guarantee\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"hstel\", 1, {DICTIONARY_PLACE_NAME}, 823},\n- {\"n estn\", 1, {DICTIONARY_DIRECTIONAL}, 685},\n- {\"post mail box\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"m s\", 1, {DICTIONARY_POST_OFFICE}, 898},\n+ {\"nth\", 1, {DICTIONARY_DIRECTIONAL}, 687},\n+ {\"nrth eastern\", 1, {DICTIONARY_DIRECTIONAL}, 689},\n {\"crossing\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"her royal highness\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"rng\", 1, {DICTIONARY_STREET_TYPE}, 1153},\n- {\"riv\", 1, {DICTIONARY_SYNONYM}, 1282},\n- {\"tshp.hw\", 1, {DICTIONARY_STREET_TYPE}, 1214},\n- {\"nd\", 1, {DICTIONARY_TOPONYM}, 1330},\n+ {\"bbox\", 1, {DICTIONARY_UNIT}, 1367},\n+ {\"seastern\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"prekindergarten\", 1, {DICTIONARY_PLACE_NAME}, 868},\n+ {\"ak\", 1, {DICTIONARY_TOPONYM}, 1293},\n+ {\"strnd\", 1, {DICTIONARY_STREET_TYPE}, 1202},\n+ {\"lit d\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 600},\n {\"opposite\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"viadct\", 1, {DICTIONARY_STREET_TYPE}, 1240},\n- {\"res\", 1, {DICTIONARY_PLACE_NAME}, 868},\n {\"limited company\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"flat\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"tsse\", 1, {DICTIONARY_STREET_TYPE}, 1208},\n- {\"communitycentre\", 1, {DICTIONARY_PLACE_NAME}, 797},\n- {\"byps\", 1, {DICTIONARY_STREET_TYPE}, 945},\n- {\"pe\", 1, {DICTIONARY_TOPONYM}, 1340},\n- {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 758},\n- {\"municipal bldg\", 1, {DICTIONARY_PLACE_NAME}, 841},\n- {\"c r\", 1, {DICTIONARY_STREET_TYPE}, 979},\n- {\"sth westrn\", 1, {DICTIONARY_DIRECTIONAL}, 692},\n+ {\"e d c\", 1, {DICTIONARY_COMPANY_TYPE}, 639},\n+ {\"right honourable\", 1, {DICTIONARY_PERSONAL_TITLE}, 760},\n {\"outlet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"wl\", 1, {DICTIONARY_STREET_TYPE}, 1249},\n- {\"s h\", 1, {DICTIONARY_STREET_TYPE}, 1194},\n- {\"crwy\", 1, {DICTIONARY_STREET_TYPE}, 995},\n- {\"victoria\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"subs\", 1, {DICTIONARY_UNIT}, 1383},\n- {\"secto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"hall\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"s estrn\", 1, {DICTIONARY_DIRECTIONAL}, 694},\n+ {\"t.rd\", 1, {DICTIONARY_STREET_TYPE}, 1219},\n+ {\"alferez\", 1, {DICTIONARY_PERSONAL_TITLE}, 1473},\n+ {\"s c l\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n+ {\"tte gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1583},\n {\"excelentisima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"feb.ro\", 1, {DICTIONARY_SYNONYM}, 1841},\n {\"colonia\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n+ {\"brig gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n {\"distrito federal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"jl\", 1, {DICTIONARY_SYNONYM}, 1844},\n- {\"cia ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n- {\"ctro medico\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n- {\"s.a.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n+ {\"pk\", 1, {DICTIONARY_QUALIFIER}, 1724},\n+ {\"s v\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"paso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sociedad por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n {\"muebles\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trvsal\", 1, {DICTIONARY_STREET_TYPE}, 1807},\n {\"complejo\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"parque municipal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"alf\u00e9rez\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cv\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n {\"estancias\", 1, {DICTIONARY_UNIT}, -1},\n {\"casa\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"pzo\", 1, {DICTIONARY_STREET_TYPE}, 1783},\n- {\"salon de acto\", 1, {DICTIONARY_PLACE_NAME}, 1692},\n+ {\"ctro deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1618},\n {\"paseo maritimo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ncleo\", 1, {DICTIONARY_UNIT}, 1892},\n+ {\"pol\u00edg ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n {\"rey\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"crrlo\", 1, {DICTIONARY_UNIT}, 1876},\n- {\"madrid\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"centro m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vst\", 1, {DICTIONARY_STREET_TYPE}, 1817},\n+ {\"calleja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sociedad an\u00f3nima laboral\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"cbo\", 1, {DICTIONARY_SYNONYM}, 1826},\n {\"autov\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n- {\"prolongacion\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n- {\"rescate de montana\", 1, {DICTIONARY_PLACE_NAME}, 1691},\n+ {\"coop\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1632},\n {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"sociedad civil\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"dqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1505},\n- {\"s l\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n- {\"consultorio medico\", 1, {DICTIONARY_PLACE_NAME}, 1625},\n- {\"d.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n- {\"ser.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1573},\n- {\"diaca\", 1, {DICTIONARY_PERSONAL_TITLE}, 1495},\n- {\"subte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1576},\n- {\"s.res\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n- {\"sedro\", 1, {DICTIONARY_STREET_TYPE}, 1804},\n- {\"bg gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"s en n c\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"trva\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n+ {\"p.r\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"ribr\", 1, {DICTIONARY_SYNONYM}, 1868},\n+ {\"psj\", 1, {DICTIONARY_STREET_TYPE}, 1788},\n+ {\"cmpos\", 1, {DICTIONARY_SYNONYM}, 1831},\n+ {\"gv\", 1, {DICTIONARY_STREET_TYPE}, 1778},\n+ {\"s.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n+ {\"ctr cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"rma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1558},\n+ {\"arboleda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n+ {\"laderas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n+ {\"vlle\", 1, {DICTIONARY_SYNONYM}, 1872},\n+ {\"n\u00famr\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"cs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n+ {\"administrador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"parvulario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"d\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n- {\"escalin\", 1, {DICTIONARY_UNIT}, 1884},\n+ {\"s n\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n {\"cacique\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"comte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1486},\n- {\"exc.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1508},\n- {\"do\u00f1a\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1548},\n- {\"cn\", 1, {DICTIONARY_STREET_TYPE}, 1751},\n- {\"mte\", 1, {DICTIONARY_SYNONYM}, 1852},\n- {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"gdor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1519},\n+ {\"s a d\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n+ {\"fc\u00ba\", 1, {DICTIONARY_GIVEN_NAME}, 1462},\n+ {\"lopez\", 1, {DICTIONARY_SURNAME}, 1819},\n+ {\"lgs\", 1, {DICTIONARY_SYNONYM}, 1850},\n {\"puerta\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"paso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"alquileres de vehiculos\", 1, {DICTIONARY_PLACE_NAME}, 1586},\n- {\"ctro juvenil\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n- {\"hernandez\", 1, {DICTIONARY_SURNAME}, 1816},\n {\"asuntos exteriores\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctro.cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"admor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1465},\n+ {\"dq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1508},\n {\"talleres\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"escritora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.g.r.\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n+ {\"rda\", 1, {DICTIONARY_STREET_TYPE}, 1804},\n+ {\"profa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n+ {\"p k\", 1, {DICTIONARY_QUALIFIER}, 1724},\n {\"gobernador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bqllo\", 1, {DICTIONARY_STREET_TYPE}, 1738},\n- {\"cpo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1603},\n- {\"fc\u00ba\", 1, {DICTIONARY_GIVEN_NAME}, 1457},\n- {\"guerra\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"s de r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"hnas\", 1, {DICTIONARY_PERSONAL_TITLE}, 1521},\n+ {\"clinica veterinaria\", 1, {DICTIONARY_PLACE_NAME}, 1623},\n+ {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n+ {\"cdesa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1493},\n {\"baronesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"rev\", 1, {DICTIONARY_SYNONYM}, 1863},\n- {\"mnts\", 1, {DICTIONARY_SYNONYM}, 1853},\n+ {\"mscal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1535},\n+ {\"ctr.cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 1659},\n {\"villa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c f\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n+ {\"extrm\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1776},\n+ {\"num\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n {\"madre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sociedad an\u00f3nima deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"sociedad an\u00f3nima cooperativa catalana limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ac\", 1, {DICTIONARY_COMPANY_TYPE}, 1399},\n- {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n+ {\"senor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1573},\n {\"puerto deportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"int\", 1, {DICTIONARY_UNIT}, 1892},\n+ {\"escas\", 1, {DICTIONARY_UNIT}, 1887},\n+ {\"plza\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n {\"campamento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"extension\", 1, {DICTIONARY_UNIT}, 1886},\n- {\"agto\", 1, {DICTIONARY_SYNONYM}, 1821},\n- {\"vla\", 1, {DICTIONARY_PLACE_NAME}, 1701},\n- {\"sociedad anonima cooperativa catalana limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n- {\"estrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"prof.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n- {\"profr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n- {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 1455},\n- {\"coop\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1628},\n- {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1530},\n- {\"de c v\", 1, {DICTIONARY_PLACE_NAME}, 1631},\n+ {\"s.g.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1568},\n+ {\"salon de acto\", 1, {DICTIONARY_PLACE_NAME}, 1696},\n+ {\"jdin\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1660},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 1738},\n+ {\"praje\", 1, {DICTIONARY_STREET_TYPE}, 1784},\n {\"sociedad limitada nueva empresa\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"horno\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"jf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1530},\n {\"zool\u00f3gico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 1450},\n- {\"p.o\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"sll\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n- {\"vice almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n- {\"vecin\", 1, {DICTIONARY_UNIT}, 1900},\n- {\"sanat\", 1, {DICTIONARY_PLACE_NAME}, 1695},\n+ {\"mtes\", 1, {DICTIONARY_SYNONYM}, 1857},\n+ {\"7 re\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"glez\", 1, {DICTIONARY_SURNAME}, 1821},\n+ {\"f.c\", 1, {DICTIONARY_PLACE_NAME}, 1647},\n+ {\"m.a\", 1, {DICTIONARY_GIVEN_NAME}, 1463},\n+ {\"ga\", 1, {DICTIONARY_SYNONYM}, 1844},\n+ {\"my brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1539},\n+ {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 1454},\n {\"copister\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"excelentisimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"est\", 1, {DICTIONARY_UNIT}, 1885},\n- {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n- {\"set\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"balnr\", 1, {DICTIONARY_PLACE_NAME}, 1597},\n- {\"v almte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n- {\"atlo\", 1, {DICTIONARY_PLACE_NAME}, 1596},\n- {\"noreste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"s.a.b.\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n+ {\"ldera\", 1, {DICTIONARY_STREET_TYPE}, 1779},\n+ {\"cd\", 1, {DICTIONARY_QUALIFIER}, 1716},\n+ {\"f c\", 1, {DICTIONARY_PLACE_NAME}, 1647},\n+ {\"entd\", 1, {DICTIONARY_UNIT}, 1885},\n+ {\"octubre\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"cintur\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 1605},\n+ {\"madrid\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"maria\", 1, {DICTIONARY_GIVEN_NAME}, -1},\n- {\"e i r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n- {\"p\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n+ {\"eno\", 1, {DICTIONARY_SYNONYM}, 1839},\n+ {\"pral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1552},\n+ {\"compl\", 1, {DICTIONARY_BUILDING_TYPE}, 1398},\n {\"joyer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cto com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"ministro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s\/n\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n {\"septiembre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 1491},\n+ {\"sep\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"feb.o\", 1, {DICTIONARY_SYNONYM}, 1841},\n+ {\"c.v.\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n {\"granja\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mansi\u00f3n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rio\", 1, {DICTIONARY_SYNONYM}, 1865},\n- {\"pa\", 1, {DICTIONARY_STOPWORD}, 1725},\n- {\"lcdo\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 1391},\n- {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 1450},\n- {\"cp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n- {\"ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1552},\n+ {\"dic.bre\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"club de futbol\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n+ {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n+ {\"emb\", 1, {DICTIONARY_PERSONAL_TITLE}, 1510},\n+ {\"profra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n {\"federico\", 1, {DICTIONARY_GIVEN_NAME}, -1},\n- {\"hnas\", 1, {DICTIONARY_PERSONAL_TITLE}, 1517},\n- {\"indep\", 1, {DICTIONARY_SYNONYM}, 1841},\n- {\"rch\", 1, {DICTIONARY_PLACE_NAME}, 1690},\n+ {\"sociedad anonima promotora de inversion\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n {\"mayor de brigada\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n- {\"tras\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1808},\n- {\"andad\", 1, {DICTIONARY_STREET_TYPE}, 1729},\n- {\"cp\", 1, {DICTIONARY_SYNONYM}, 1832},\n+ {\"p.r.\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"ctr comm\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"agencia de viajes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n- {\"c.ia\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n+ {\"cuadr\", 1, {DICTIONARY_UNIT}, 1881},\n+ {\"pte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n+ {\"sdad anon\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n+ {\"cllzo\", 1, {DICTIONARY_STREET_TYPE}, 1751},\n+ {\"n\u00famro\", 1, {DICTIONARY_UNIT}, 1897},\n {\"los\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n+ {\"s.l.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"sociedad an\u00f3nima inscrita de capital abierto\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"palacio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"mart\u00ednez\", 1, {DICTIONARY_SURNAME}, -1},\n- {\"s.c.c.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n {\"bodega\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 1449},\n- {\"sociedad anonima financiera de inversion\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n- {\"senor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"n.ro\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"my gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n+ {\"presid\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n {\"lo\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"dicbre\", 1, {DICTIONARY_SYNONYM}, 1840},\n {\"carretil\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1708},\n+ {\"ret\", 1, {DICTIONARY_STREET_TYPE}, 1801},\n {\"estaci\u00f3n de autobuses\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.g.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n- {\"voluntos\", 1, {DICTIONARY_SYNONYM}, 1870},\n- {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n- {\"po\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n+ {\"p\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"pres.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n+ {\"s.rta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1576},\n+ {\"sbida\", 1, {DICTIONARY_STREET_TYPE}, 1809},\n+ {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 1454},\n+ {\"barda\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1711},\n+ {\"merc p\u00fablico\", 1, {DICTIONARY_PLACE_NAME}, 1669},\n+ {\"sociedad anonima abierta\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n {\"arquitecta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"centro medico\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n- {\"sociedad gestora de instituciones de inversion colectiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n- {\"bar.na\", 1, {DICTIONARY_TOPONYM}, 1871},\n- {\"stn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1576},\n+ {\"pdre\", 1, {DICTIONARY_PERSONAL_TITLE}, 1547},\n+ {\"rincon\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n+ {\"res\", 1, {DICTIONARY_UNIT}, 1903},\n {\"vicealmirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"parti\", 1, {DICTIONARY_STREET_TYPE}, 1781},\n- {\"barrio\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.c.c.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n+ {\"cque\", 1, {DICTIONARY_PERSONAL_TITLE}, 1486},\n {\"trasera\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"y cia s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n- {\"prof.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n- {\"fbrca\", 1, {DICTIONARY_PLACE_NAME}, 1641},\n- {\"perif\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"peat\", 1, {DICTIONARY_STREET_TYPE}, 1792},\n+ {\"bg genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"sgto ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n+ {\"iglas\", 1, {DICTIONARY_PLACE_NAME}, 1658},\n {\"sociedad an\u00f3nima finciera de inversi\u00f3n\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"complj\", 1, {DICTIONARY_BUILDING_TYPE}, 1394},\n- {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 1461},\n+ {\"infa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1524},\n {\"corretaje\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"alteza\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sociedad an\u00f3nima bursatil\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"iunior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 1461},\n- {\"presid.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n+ {\"dice\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"ladera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"p.i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1499},\n+ {\"llanuras\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"pol\u00edg\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1721},\n+ {\"psaje\", 1, {DICTIONARY_STREET_TYPE}, 1788},\n {\"mansiones\", 1, {DICTIONARY_UNIT}, -1},\n- {\"oct\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"edfc\", 1, {DICTIONARY_BUILDING_TYPE}, 1396},\n {\"y\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"duquesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"trans\", 1, {DICTIONARY_STREET_TYPE}, 1810},\n {\"casa de cambio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.n\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n+ {\"s.a.p.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n {\"abril\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"admra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n {\"apostadero de caza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctro m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n {\"ba\u00f1os\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"profra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n+ {\"abl\", 1, {DICTIONARY_SYNONYM}, 1824},\n {\"sociedad limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"y cia sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"df\", 1, {DICTIONARY_SYNONYM}, 1833},\n- {\"pob\", 1, {DICTIONARY_UNIT}, 1793},\n+ {\"\u00e1rea de juegos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dir\", 1, {DICTIONARY_PERSONAL_TITLE}, 1501},\n+ {\"ca\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n {\"se\u00f1orita\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"zoologico\", 1, {DICTIONARY_PLACE_NAME}, 1705},\n+ {\"s.l.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n {\"secretaria\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ctro cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"expla\", 1, {DICTIONARY_STREET_TYPE}, 1771},\n+ {\"brrios\", 1, {DICTIONARY_QUALIFIER}, 1713},\n {\"casas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hipod\", 1, {DICTIONARY_PLACE_NAME}, 1651},\n {\"tienda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"czada\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n- {\"tn pro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1580},\n- {\"c \/\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n+ {\"cto\", 1, {DICTIONARY_STREET_TYPE}, 1767},\n+ {\"centro com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"de capital variable\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cno\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n- {\"arz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1474},\n- {\"adm.ora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1466},\n- {\"laderas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"loc\", 1, {DICTIONARY_PERSONAL_TITLE}, 1528},\n+ {\"7.bre\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 1452},\n+ {\"pantano\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pilar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"acces\", 1, {DICTIONARY_STREET_TYPE}, 1730},\n {\"colegio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pe\", 1, {DICTIONARY_PERSONAL_TITLE}, 1547},\n {\"empresa\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"feb.ro\", 1, {DICTIONARY_SYNONYM}, 1837},\n+ {\"polig\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1721},\n {\"burdel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.c.e.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n- {\"psmar\", 1, {DICTIONARY_STREET_TYPE}, 1786},\n- {\"8bre\", 1, {DICTIONARY_SYNONYM}, 1856},\n {\"convento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c\/priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"se\u00f1ores\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"insp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1528},\n {\"sociedad limitada laboral\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ctr comercial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 1554},\n+ {\"qbda\", 1, {DICTIONARY_UNIT}, 1902},\n+ {\"cnl\", 1, {DICTIONARY_SYNONYM}, 1832},\n+ {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n {\"camino hondo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rcnda\", 1, {DICTIONARY_STREET_TYPE}, 1799},\n- {\"circunvalacion\", 1, {DICTIONARY_STREET_TYPE}, 1764},\n- {\"izqa\", 1, {DICTIONARY_UNIT}, 1889},\n- {\"ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n+ {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 1459},\n+ {\"circunvalacion\", 1, {DICTIONARY_STREET_TYPE}, 1768},\n {\"barriada\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n {\"droguer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"srs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n- {\"s m\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n- {\"dulceria\", 1, {DICTIONARY_PLACE_NAME}, 1635},\n- {\"gdora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1514},\n- {\"vde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n- {\"compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n- {\"bibl\", 1, {DICTIONARY_PLACE_NAME}, 1599},\n- {\"s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"estto\", 1, {DICTIONARY_PLACE_NAME}, 1644},\n+ {\"dira\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n {\"nacional\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cto de salud\", 1, {DICTIONARY_PLACE_NAME}, 1613},\n- {\"ext\", 1, {DICTIONARY_UNIT}, 1886},\n- {\"lg\", 1, {DICTIONARY_SYNONYM}, 1845},\n- {\"cardenal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gv\", 1, {DICTIONARY_STREET_TYPE}, 1774},\n- {\"alf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n- {\"srta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1572},\n+ {\"carr\", 1, {DICTIONARY_STREET_TYPE}, 1760},\n+ {\"poligono\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1721},\n+ {\"s l\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n+ {\"nal\", 1, {DICTIONARY_SYNONYM}, 1858},\n+ {\"st\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n+ {\"calle priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"bg general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"dqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1509},\n {\"sal\u00f3n de acto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"administrador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"e.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n- {\"tintorer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.vre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"sal\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n- {\"arqs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1473},\n+ {\"plto flvial\", 1, {DICTIONARY_PERSONAL_TITLE}, 1548},\n+ {\"hosp\", 1, {DICTIONARY_PLACE_NAME}, 1656},\n+ {\"rcda\", 1, {DICTIONARY_STREET_TYPE}, 1803},\n {\"comandante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"inspector\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n+ {\"senores\", 1, {DICTIONARY_PERSONAL_TITLE}, 1575},\n+ {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"d\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n+ {\"alque\", 1, {DICTIONARY_STREET_TYPE}, 1732},\n {\"sociedad an\u00f3nima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n- {\"callejon\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n- {\"psllo\", 1, {DICTIONARY_STREET_TYPE}, 1787},\n- {\"sarg my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n- {\"sres\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n- {\"izqda\", 1, {DICTIONARY_UNIT}, 1889},\n+ {\"merc publico\", 1, {DICTIONARY_PLACE_NAME}, 1669},\n+ {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"mnez\", 1, {DICTIONARY_SURNAME}, 1822},\n {\"dentista\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sae\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n- {\"charcuteria\", 1, {DICTIONARY_PLACE_NAME}, 1617},\n- {\"entr\", 1, {DICTIONARY_UNIT}, 1881},\n+ {\"casino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"conj\", 1, {DICTIONARY_UNIT}, 1878},\n+ {\"arquitecto\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ccvcn\", 1, {DICTIONARY_STREET_TYPE}, 1768},\n+ {\"s a i c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n+ {\"abgda\", 1, {DICTIONARY_PERSONAL_TITLE}, 1467},\n+ {\"igla\", 1, {DICTIONARY_PLACE_NAME}, 1657},\n {\"principal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"num\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"s.g.r\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n- {\"genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1513},\n- {\"ag.to\", 1, {DICTIONARY_SYNONYM}, 1821},\n+ {\"saa\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n {\"condesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rta\", 1, {DICTIONARY_STREET_TYPE}, 1806},\n {\"boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rev\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1553},\n- {\"esca\", 1, {DICTIONARY_UNIT}, 1882},\n- {\"canton\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n+ {\"jardin\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1660},\n+ {\"pnta\", 1, {DICTIONARY_SYNONYM}, 1864},\n+ {\"p.\u00ba\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"s w\", 1, {DICTIONARY_DIRECTIONAL}, 1460},\n+ {\"custa\", 1, {DICTIONARY_STREET_TYPE}, 1771},\n+ {\"g\", 1, {DICTIONARY_STREET_TYPE}, 1777},\n+ {\"c \/\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n+ {\"sm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"perif\", 1, {DICTIONARY_STREET_TYPE}, 1793},\n {\"febrero\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"& compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n- {\"y compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"bloque\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"abr\", 1, {DICTIONARY_SYNONYM}, 1820},\n- {\"lderas\", 1, {DICTIONARY_STREET_TYPE}, 1776},\n- {\"ctro com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"dona\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n- {\"s.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n- {\"meull\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1668},\n- {\"rdo\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1553},\n+ {\"sca\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n+ {\"rl\", 1, {DICTIONARY_SYNONYM}, 1865},\n+ {\"ynfanta\", 1, {DICTIONARY_SYNONYM}, 1846},\n+ {\"estcn de tren\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n+ {\"nacl\", 1, {DICTIONARY_SYNONYM}, 1858},\n+ {\"santu\", 1, {DICTIONARY_PLACE_NAME}, 1700},\n {\"enfrente\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s.c.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n- {\"s.c.e.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n- {\"jn\", 1, {DICTIONARY_SYNONYM}, 1843},\n- {\"compa\u00f1ia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"tte gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1579},\n- {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 1449},\n- {\"ctrin\", 1, {DICTIONARY_STREET_TYPE}, 1758},\n- {\"plzla\", 1, {DICTIONARY_STREET_TYPE}, 1792},\n- {\"crrdo\", 1, {DICTIONARY_STREET_TYPE}, 1765},\n+ {\"profesor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"c.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n+ {\"c.v\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n+ {\"cinturon\", 1, {DICTIONARY_STREET_TYPE}, 1766},\n+ {\"cda\", 1, {DICTIONARY_STREET_TYPE}, 1765},\n+ {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 1459},\n {\"altura\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"santo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 1739},\n- {\"pol\u00edg res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n- {\"c.h.\", 1, {DICTIONARY_STREET_TYPE}, 1750},\n {\"residencial\", 1, {DICTIONARY_UNIT}, -1},\n- {\"uni\u00f3n deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sccl\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n- {\"ynfa\", 1, {DICTIONARY_SYNONYM}, 1842},\n+ {\"brig gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"lica\", 1, {DICTIONARY_PERSONAL_TITLE}, 1394},\n+ {\"brig gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n {\"cafeter\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"goba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1518},\n {\"enfermer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"st.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n- {\"bar\", 1, {DICTIONARY_PERSONAL_TITLE}, 1475},\n- {\"cmno\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n- {\"apdro\", 1, {DICTIONARY_STREET_TYPE}, 1731},\n+ {\"my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1538},\n+ {\"novbre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"cerrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"lavanderia\", 1, {DICTIONARY_PLACE_NAME}, 1664},\n {\"dehesa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"arb\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1592},\n- {\"sargto my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n+ {\"urbanizacion\", 1, {DICTIONARY_QUALIFIER}, 1727},\n+ {\"ministro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"corralillo\", 1, {DICTIONARY_UNIT}, -1},\n- {\"dtto\", 1, {DICTIONARY_QUALIFIER}, 1713},\n- {\"angta\", 1, {DICTIONARY_STREET_TYPE}, 1730},\n+ {\"arral\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1597},\n+ {\"empresa unipersonal\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"consejero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"corredor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"manses\", 1, {DICTIONARY_UNIT}, 1891},\n+ {\"c.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n+ {\"ctro comercial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"mzo\", 1, {DICTIONARY_SYNONYM}, 1853},\n {\"f\u00fatbol club\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"c\/\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n- {\"feb.o\", 1, {DICTIONARY_SYNONYM}, 1837},\n+ {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"debajo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sociedad de garantia reciproca\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"camino viejo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"contralmirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"caserio\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1392},\n- {\"almacen\", 1, {DICTIONARY_PLACE_NAME}, 1584},\n- {\"d\", 1, {DICTIONARY_UNIT}, 1880},\n+ {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n+ {\"dra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1504},\n+ {\"p.za\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n+ {\"palacs\", 1, {DICTIONARY_PLACE_NAME}, 1676},\n+ {\"c.t.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n+ {\"fabrica\", 1, {DICTIONARY_PLACE_NAME}, 1645},\n+ {\"alt\", 1, {DICTIONARY_SYNONYM}, 1826},\n {\"calle privada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"area de juegos\", 1, {DICTIONARY_PLACE_NAME}, 1588},\n- {\"dept\", 1, {DICTIONARY_UNIT}, 1879},\n- {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n+ {\"cllja\", 1, {DICTIONARY_STREET_TYPE}, 1747},\n+ {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 1533},\n+ {\"num.ro\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"rcho\", 1, {DICTIONARY_PLACE_NAME}, 1694},\n+ {\"9bre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"gta\", 1, {DICTIONARY_STREET_TYPE}, 1777},\n+ {\"ote\", 1, {DICTIONARY_DIRECTIONAL}, 1456},\n+ {\"s.a.b\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n+ {\"pobl\", 1, {DICTIONARY_UNIT}, 1797},\n {\"aparcamiento de bicicletas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sociedad comanditaria\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"10.bre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n- {\"sociedad anonima simplificada\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n+ {\"gobno\", 1, {DICTIONARY_SYNONYM}, 1842},\n+ {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 1754},\n+ {\"pso\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"int\", 1, {DICTIONARY_PERSONAL_TITLE}, 1529},\n {\"pol\u00edgono residencial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n- {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1557},\n- {\"abg.da\", 1, {DICTIONARY_PERSONAL_TITLE}, 1463},\n- {\"s.v\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n- {\"estda\", 1, {DICTIONARY_STREET_TYPE}, 1770},\n+ {\"alam\", 1, {DICTIONARY_STREET_TYPE}, 1731},\n+ {\"arqos\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n+ {\"area de picnic\", 1, {DICTIONARY_PLACE_NAME}, 1593},\n+ {\"compa\u00f1ia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"club atletico\", 1, {DICTIONARY_COMPANY_TYPE}, 1405},\n+ {\"escaleras\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"dir.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n+ {\"sociedad port acci\u00f3nes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"fdez\", 1, {DICTIONARY_SURNAME}, 1818},\n+ {\"compania anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n+ {\"teniente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"marzo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"jz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1527},\n- {\"nov.re\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"escaleras\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sociedad port acci\u00f3nes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"disco\", 1, {DICTIONARY_PLACE_NAME}, 1633},\n- {\"teniente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"d\", 1, {DICTIONARY_PERSONAL_TITLE}, 1501},\n- {\"concesionario de automoviles\", 1, {DICTIONARY_PLACE_NAME}, 1624},\n- {\"b.co\", 1, {DICTIONARY_COMPANY_TYPE}, 1400},\n {\"licenciado\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"scn\", 1, {DICTIONARY_QUALIFIER}, 1721},\n- {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n- {\"union deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n- {\"branc\", 1, {DICTIONARY_STREET_TYPE}, 1737},\n- {\"sep.bre\", 1, {DICTIONARY_SYNONYM}, 1866},\n+ {\"numero\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n {\"extrarradio\", 1, {DICTIONARY_UNIT}, -1},\n- {\"e.u\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n+ {\"sp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n {\"extensi\u00f3n\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sbida\", 1, {DICTIONARY_STREET_TYPE}, 1805},\n- {\"8 bre\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"lavanderia\", 1, {DICTIONARY_PLACE_NAME}, 1660},\n- {\"s.a.b\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n- {\"rguez\", 1, {DICTIONARY_SURNAME}, 1819},\n- {\"s.a.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n+ {\"lcda\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 1394},\n+ {\"bg gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"scoop\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n+ {\"u d\", 1, {DICTIONARY_COMPANY_TYPE}, 1447},\n {\"ruta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"subteniente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ferrocarril\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sec\", 1, {DICTIONARY_QUALIFIER}, 1721},\n {\"coronel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"peatonal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tintoreria\", 1, {DICTIONARY_PLACE_NAME}, 1698},\n+ {\"gasolinera\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ruinas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ayuntamiento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 1812},\n- {\"cdad\", 1, {DICTIONARY_QUALIFIER}, 1712},\n {\"majestad\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ctro de salud\", 1, {DICTIONARY_PLACE_NAME}, 1613},\n+ {\"pequeno supermercado\", 1, {DICTIONARY_PLACE_NAME}, 1685},\n+ {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 1761},\n {\"centro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"circunvalaci\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vdesa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1583},\n- {\"blq\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1710},\n- {\"s \/ n\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n- {\"pgind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n+ {\"clg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1489},\n+ {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 1533},\n+ {\"of\", 1, {DICTIONARY_UNIT}, 1898},\n+ {\"prision\", 1, {DICTIONARY_PLACE_NAME}, 1687},\n+ {\"s e\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n {\"monumento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n {\"motel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.l.n.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n- {\"s.l.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n- {\"cast\", 1, {DICTIONARY_PLACE_NAME}, 1609},\n- {\"trans\", 1, {DICTIONARY_STREET_TYPE}, 1806},\n- {\"empr\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n- {\"s.a.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n- {\"estcn\", 1, {DICTIONARY_PLACE_NAME}, 1637},\n- {\"drogueria\", 1, {DICTIONARY_PLACE_NAME}, 1634},\n- {\"carreter\u00edn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 1558},\n+ {\"uni\u00f3n deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"cabana\", 1, {DICTIONARY_PLACE_NAME}, 1604},\n+ {\"fco\", 1, {DICTIONARY_GIVEN_NAME}, 1462},\n+ {\"escal\", 1, {DICTIONARY_UNIT}, 1888},\n+ {\"cant\", 1, {DICTIONARY_STREET_TYPE}, 1759},\n+ {\"nbre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"cab\", 1, {DICTIONARY_PERSONAL_TITLE}, 1482},\n+ {\"c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1572},\n+ {\"chlet\", 1, {DICTIONARY_BUILDING_TYPE}, 1397},\n+ {\"s a l\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n+ {\"compa\u00f1ia an\u00f3nima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"gran via\", 1, {DICTIONARY_STREET_TYPE}, 1778},\n+ {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1801},\n+ {\"s.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"monasterio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"allende\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"torre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"punto kilometrico\", 1, {DICTIONARY_QUALIFIER}, 1720},\n- {\"marqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1533},\n- {\"s g r\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n+ {\"c.n.\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n+ {\"llnra\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1781},\n+ {\"setbre\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"zona militar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tn gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1583},\n+ {\"tn pro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1584},\n+ {\"cto comunitario\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n+ {\"fruteria\", 1, {DICTIONARY_PLACE_NAME}, 1650},\n {\"caballero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"terminal de ferry\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sin\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"lic\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1391},\n+ {\"fr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1515},\n {\"junio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"7bre\", 1, {DICTIONARY_SYNONYM}, 1866},\n {\"diacono\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jugueteria\", 1, {DICTIONARY_PLACE_NAME}, 1659},\n+ {\"set\", 1, {DICTIONARY_SYNONYM}, 1870},\n {\"d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"10bre\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"v almte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1585},\n {\"uni\u00f3n\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"libreria\", 1, {DICTIONARY_PLACE_NAME}, 1661},\n+ {\"embajada\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sargento mayor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"estacionamiento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"my gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n- {\"c \/ priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n+ {\"st.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n {\"zapater\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.f\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n- {\"pr\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n- {\"estcn de autobuses\", 1, {DICTIONARY_PLACE_NAME}, 1638},\n- {\"excma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1509},\n+ {\"interior\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"bloq\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1714},\n+ {\"febo\", 1, {DICTIONARY_SYNONYM}, 1841},\n {\"agrimensor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 1739},\n+ {\"rodriguez\", 1, {DICTIONARY_SURNAME}, 1823},\n+ {\"clb social\", 1, {DICTIONARY_PLACE_NAME}, 1625},\n {\"zona comercial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n- {\"ctro comun\", 1, {DICTIONARY_PLACE_NAME}, 1611},\n- {\"s coop\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n- {\"ctr.com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"gob.no\", 1, {DICTIONARY_SYNONYM}, 1838},\n+ {\"taller mecanico\", 1, {DICTIONARY_PLACE_NAME}, 1701},\n+ {\"circuito\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"calz\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n {\"vivero\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"almac\u00e9n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cjla\", 1, {DICTIONARY_STREET_TYPE}, 1750},\n {\"pabell\u00f3n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"do\u00f1a\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"camping\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"centro cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"s v\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n- {\"lica\", 1, {DICTIONARY_PERSONAL_TITLE}, 1390},\n- {\"s en nc\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n- {\"bv\", 1, {DICTIONARY_STREET_TYPE}, 1741},\n- {\"gdor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1515},\n- {\"brg gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n+ {\"sab\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n+ {\"bibl\", 1, {DICTIONARY_PLACE_NAME}, 1603},\n+ {\"demar\", 1, {DICTIONARY_UNIT}, 1882},\n+ {\"lpez\", 1, {DICTIONARY_SURNAME}, 1819},\n+ {\"hno\", 1, {DICTIONARY_PERSONAL_TITLE}, 1522},\n {\"serenisimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"brigada\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"csr\u00edo\", 1, {DICTIONARY_PLACE_NAME}, 1392},\n- {\"dbre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"escas\", 1, {DICTIONARY_UNIT}, 1883},\n- {\"u.d\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n- {\"callej\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n- {\"gasolinera\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"crn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1493},\n+ {\"dcha\", 1, {DICTIONARY_UNIT}, 1884},\n+ {\"ps mar\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n+ {\"slne\", 1, {DICTIONARY_COMPANY_TYPE}, 1444},\n {\"ingeniero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1557},\n- {\"cl priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"crril\", 1, {DICTIONARY_STREET_TYPE}, 1764},\n+ {\"e p\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"autop\", 1, {DICTIONARY_STREET_TYPE}, 1736},\n+ {\"heladeria\", 1, {DICTIONARY_PLACE_NAME}, 1654},\n+ {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"francisco\", 1, {DICTIONARY_GIVEN_NAME}, -1},\n- {\"cond\", 1, {DICTIONARY_BUILDING_TYPE}, 1395},\n- {\"ctra\", 1, {DICTIONARY_STREET_TYPE}, 1757},\n- {\"bazar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sr.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n+ {\"p\u00ba\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n+ {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n+ {\"gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1517},\n+ {\"& cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1449},\n {\"pescader\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n+ {\"cafeteria\", 1, {DICTIONARY_PLACE_NAME}, 1606},\n {\"escritor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vlle\", 1, {DICTIONARY_SYNONYM}, 1868},\n- {\"c.n\", 1, {DICTIONARY_STREET_TYPE}, 1751},\n- {\"lgs\", 1, {DICTIONARY_SYNONYM}, 1846},\n+ {\"abgdo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1468},\n+ {\"cuesta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rcon\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n+ {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n+ {\"senorita\", 1, {DICTIONARY_PERSONAL_TITLE}, 1576},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rpla\", 1, {DICTIONARY_STREET_TYPE}, 1796},\n- {\"n\u00facleo\", 1, {DICTIONARY_UNIT}, -1},\n- {\"s a i c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n- {\"s a a\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n- {\"bg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1476},\n- {\"ffcc\", 1, {DICTIONARY_PLACE_NAME}, 1644},\n- {\"union\", 1, {DICTIONARY_COMPANY_TYPE}, 1444},\n+ {\"malecon\", 1, {DICTIONARY_STREET_TYPE}, 1782},\n+ {\"scra\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n {\"notario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sgto my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n- {\"rmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n- {\"particular\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"consejo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1495},\n+ {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n {\"estaci\u00f3n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cmpo\", 1, {DICTIONARY_SYNONYM}, 1603},\n- {\"ptllo\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 1706},\n+ {\"f.c.\", 1, {DICTIONARY_PLACE_NAME}, 1647},\n {\"barrios\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"area de picnic\", 1, {DICTIONARY_PLACE_NAME}, 1589},\n+ {\"my\", 1, {DICTIONARY_SYNONYM}, 1854},\n+ {\"cjal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1494},\n+ {\"brig general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n+ {\"pblo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1689},\n {\"campo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"brig gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 1459},\n+ {\"jl\", 1, {DICTIONARY_SYNONYM}, 1848},\n {\"detras\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"febo\", 1, {DICTIONARY_SYNONYM}, 1837},\n- {\"area recreativa\", 1, {DICTIONARY_PLACE_NAME}, 1591},\n+ {\"& cia sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n {\"poniente\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 1700},\n+ {\"capitan\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n+ {\"campg\", 1, {DICTIONARY_STREET_TYPE}, 1758},\n {\"agosto\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"s de rl\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"rvdma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1558},\n+ {\"v alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1585},\n {\"apartamentos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"atletico\", 1, {DICTIONARY_PLACE_NAME}, 1596},\n- {\"lavander\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gonzalez\", 1, {DICTIONARY_SURNAME}, 1817},\n- {\"sociedad anonima deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n- {\"cia s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n- {\"n\u00fam\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"vst\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n- {\"nordeste\", 1, {DICTIONARY_DIRECTIONAL}, 1449},\n+ {\"no\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"a c\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n+ {\"psllo\", 1, {DICTIONARY_STREET_TYPE}, 1791},\n+ {\"dbre\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"sl\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n {\"encima\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pi\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"ep\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n- {\"gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1513},\n+ {\"doctora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1517},\n+ {\"may\", 1, {DICTIONARY_PERSONAL_TITLE}, 1538},\n+ {\"c.f\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n+ {\"crtjo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1633},\n+ {\"autovia\", 1, {DICTIONARY_STREET_TYPE}, 1737},\n {\"pasteler\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mrdor\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1666},\n+ {\"s en c por a\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n {\"centro de arte\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"diseminado\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n {\"diacona\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"c.h\", 1, {DICTIONARY_STREET_TYPE}, 1750},\n- {\"transito\", 1, {DICTIONARY_STREET_TYPE}, 1806},\n- {\"camino\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"abd\", 1, {DICTIONARY_PERSONAL_TITLE}, 1462},\n+ {\"sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"caser\u00edo\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n {\"rambla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"n.bre\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"abogado\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rguez\", 1, {DICTIONARY_SURNAME}, 1823},\n {\"intendente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"poligono industrial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n {\"montes\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dulcer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.a.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n {\"brazal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"templo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vecindario\", 1, {DICTIONARY_UNIT}, -1},\n {\"borda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"exc.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1512},\n {\"concesionario de autom\u00f3viles\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pque\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1675},\n+ {\"trans\", 1, {DICTIONARY_PLACE_NAME}, 1703},\n+ {\"sarg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n {\"oeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"lda\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1390},\n- {\"s l l\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n- {\"depto\", 1, {DICTIONARY_UNIT}, 1879},\n- {\"cll\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n- {\"sargento vice primero\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n- {\"s.a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n- {\"abga\", 1, {DICTIONARY_PERSONAL_TITLE}, 1463},\n+ {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n+ {\"cantina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c\/\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n+ {\"almte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1474},\n {\"sociedad cooperativa\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"crematorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trvs\u00eda\", 1, {DICTIONARY_STREET_TYPE}, 1809},\n- {\"cbtiz\", 1, {DICTIONARY_UNIT}, 1873},\n- {\"cap fed\", 1, {DICTIONARY_SYNONYM}, 1829},\n+ {\"infa\", 1, {DICTIONARY_SYNONYM}, 1846},\n+ {\"mts\", 1, {DICTIONARY_SYNONYM}, 1857},\n {\"distrito postal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s.c.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n- {\"s p a\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n- {\"s.l.n.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n- {\"s.g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n- {\"s.a.f.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n- {\"my brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1535},\n+ {\"junta\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"s.g.r.\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"secreta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n+ {\"salon de belleza\", 1, {DICTIONARY_PLACE_NAME}, 1697},\n+ {\"cto comun\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n+ {\"alquileres de veh\u00edculos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"arry\", 1, {DICTIONARY_PLACE_NAME}, 1598},\n+ {\"brrio\", 1, {DICTIONARY_QUALIFIER}, 1712},\n+ {\"edif\", 1, {DICTIONARY_BUILDING_TYPE}, 1400},\n {\"compras\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gta\", 1, {DICTIONARY_STREET_TYPE}, 1773},\n {\"mariscal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"cf\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n+ {\"librer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"fuente\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"alcde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1472},\n {\"con\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"bsq\", 1, {DICTIONARY_SYNONYM}, 1824},\n {\"mercado\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 1455},\n {\"costera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n- {\"s a de c v\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n {\"sociedad gestora de instituciones de inversi\u00f3n colectiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"cant\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u00e1rea recreacional\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n- {\"7 bre\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"disem\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1632},\n {\"vi\u00f1edo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"e u\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n- {\"v alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n- {\"rbla\", 1, {DICTIONARY_STREET_TYPE}, 1795},\n- {\"d p\", 1, {DICTIONARY_SYNONYM}, 1834},\n- {\"cuadra\", 1, {DICTIONARY_UNIT}, -1},\n- {\"s.m.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n+ {\"prof\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n+ {\"sargto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n+ {\"s.dad\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n+ {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n+ {\"prtal\", 1, {DICTIONARY_UNIT}, 1899},\n+ {\"excmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1514},\n+ {\"10 bre\", 1, {DICTIONARY_SYNONYM}, 1840},\n {\"almac\u00e9n general\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ciudad\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"cjto\", 1, {DICTIONARY_UNIT}, 1874},\n+ {\"slu\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n+ {\"cooperativa\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n {\"lago\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1476},\n- {\"c.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n+ {\"psmar\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n {\"reverendisimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1526},\n- {\"lcda\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 1390},\n- {\"crral\", 1, {DICTIONARY_UNIT}, 1875},\n- {\"sw\", 1, {DICTIONARY_DIRECTIONAL}, 1456},\n- {\"a en p\", 1, {DICTIONARY_COMPANY_TYPE}, 1398},\n- {\"emb\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n+ {\"baron\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n+ {\"crro\", 1, {DICTIONARY_SYNONYM}, 1835},\n+ {\"sargto ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n+ {\"jdins\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1661},\n+ {\"s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"s a f i\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n+ {\"cll\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n {\"sanatorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dic.e\", 1, {DICTIONARY_SYNONYM}, 1840},\n {\"sociedad del estado\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"nbre\", 1, {DICTIONARY_SYNONYM}, 1855},\n+ {\"cia sca\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n+ {\"p.k.\", 1, {DICTIONARY_QUALIFIER}, 1724},\n {\"sociedad cooperativa limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s.a.b.\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n- {\"jard\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1656},\n- {\"ene\", 1, {DICTIONARY_SYNONYM}, 1835},\n- {\"sarg ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n+ {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n {\"viviendas\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"eirl\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 1455},\n {\"castillo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"srra\", 1, {DICTIONARY_SYNONYM}, 1871},\n {\"norte\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"poligono residencial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n- {\"cpos\", 1, {DICTIONARY_SYNONYM}, 1827},\n- {\"casa senorial\", 1, {DICTIONARY_PLACE_NAME}, 1608},\n- {\"exca\", 1, {DICTIONARY_PERSONAL_TITLE}, 1508},\n- {\"infte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1521},\n- {\"s\/n\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n- {\"nal\", 1, {DICTIONARY_SYNONYM}, 1854},\n- {\"gob\", 1, {DICTIONARY_PERSONAL_TITLE}, 1515},\n+ {\"sedra\", 1, {DICTIONARY_STREET_TYPE}, 1807},\n+ {\"s.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n+ {\"punto kilom\u00e9trico\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"portillo\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"lda\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1394},\n+ {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n+ {\"gr\", 1, {DICTIONARY_SYNONYM}, 1843},\n+ {\"urbanizaci\u00f3n\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"ribera\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s a e\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n- {\"conj\", 1, {DICTIONARY_UNIT}, 1874},\n- {\"pta\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1687},\n {\"inmobiliaria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"malec\", 1, {DICTIONARY_STREET_TYPE}, 1782},\n {\"concesionario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"callejuela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c t\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n+ {\"ingo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1527},\n {\"taller\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gran via\", 1, {DICTIONARY_STREET_TYPE}, 1774},\n- {\"mts\", 1, {DICTIONARY_SYNONYM}, 1853},\n- {\"soc\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME}, 1411},\n- {\"vlcn\", 1, {DICTIONARY_SYNONYM}, 1869},\n+ {\"nucleo\", 1, {DICTIONARY_UNIT}, 1896},\n+ {\"enfermeria\", 1, {DICTIONARY_PLACE_NAME}, 1640},\n+ {\"cp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n+ {\"prtco\", 1, {DICTIONARY_UNIT}, 1900},\n {\"hermanos\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"cj\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n+ {\"priv\", 1, {DICTIONARY_SYNONYM}, 1863},\n {\"padre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 1527},\n {\"bajada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"brrio\", 1, {DICTIONARY_QUALIFIER}, 1708},\n+ {\"sold\", 1, {DICTIONARY_PERSONAL_TITLE}, 1579},\n {\"teniente coronel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"fernandez\", 1, {DICTIONARY_SURNAME}, 1814},\n+ {\"centro.cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"doctor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ferrocarriles\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"agt\", 1, {DICTIONARY_SYNONYM}, 1821},\n- {\"licoreria\", 1, {DICTIONARY_PLACE_NAME}, 1662},\n- {\"cnvto\", 1, {DICTIONARY_PLACE_NAME}, 1627},\n- {\"sect\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1722},\n- {\"s.dad\", 1, {DICTIONARY_COMPANY_TYPE}, 1411},\n+ {\"football club\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n {\"puente\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"secreto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n- {\"send\", 1, {DICTIONARY_STREET_TYPE}, 1804},\n+ {\"pqe\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1679},\n+ {\"cjon\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n {\"sociedad an\u00f3nima de capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"auto\", 1, {DICTIONARY_STREET_TYPE}, 1732},\n- {\"m\u00aa\", 1, {DICTIONARY_GIVEN_NAME}, 1459},\n- {\"pta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1556},\n- {\"mqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1533},\n+ {\"gonz\u00e1lez\", 1, {DICTIONARY_SURNAME}, -1},\n+ {\"s.l.u\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"empresa individual de responsabilidad limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"lic\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1395},\n+ {\"autov\", 1, {DICTIONARY_STREET_TYPE}, 1737},\n {\"rinc\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cabo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"senora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n- {\"vist\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n+ {\"pol\", 1, {DICTIONARY_QUALIFIER}, 1721},\n+ {\"asociacion en participacion\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n {\"taberna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"izquierda\", 1, {DICTIONARY_UNIT}, -1},\n- {\"prtl\", 1, {DICTIONARY_UNIT}, 1895},\n- {\"tte col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n- {\"comida rapida\", 1, {DICTIONARY_PLACE_NAME}, 1622},\n- {\"edifc\", 1, {DICTIONARY_BUILDING_TYPE}, 1396},\n- {\"& cia s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"secc\", 1, {DICTIONARY_QUALIFIER}, 1721},\n+ {\"c.t\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n+ {\"estanc\", 1, {DICTIONARY_UNIT}, 1889},\n+ {\"bo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1712},\n {\"teatro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pdte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n {\"piscina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rta\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n- {\"sa de cv\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n- {\"8.bre\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"febro\", 1, {DICTIONARY_SYNONYM}, 1837},\n+ {\"brig\", 1, {DICTIONARY_SYNONYM}, 1829},\n+ {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1542},\n+ {\"compj\", 1, {DICTIONARY_BUILDING_TYPE}, 1398},\n {\"jugueter\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pol.res\", 1, {DICTIONARY_QUALIFIER}, 1722},\n {\"el\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"dic.e\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"mar\", 1, {DICTIONARY_SYNONYM}, 1849},\n- {\"mtrio\", 1, {DICTIONARY_PLACE_NAME}, 1667},\n- {\"s.w.\", 1, {DICTIONARY_DIRECTIONAL}, 1456},\n+ {\"s p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n+ {\"cnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1488},\n+ {\"contralmirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 1454},\n {\"una\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"hipodromo\", 1, {DICTIONARY_PLACE_NAME}, 1651},\n- {\"ptilo\", 1, {DICTIONARY_UNIT}, 1897},\n- {\"cer\", 1, {DICTIONARY_STREET_TYPE}, 1761},\n+ {\"sae\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n {\"videotienda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cintur\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"albergue\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"licorer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"clb social\", 1, {DICTIONARY_PLACE_NAME}, 1621},\n+ {\"spa\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n+ {\"p.i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n {\"caminito\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"col\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1711},\n- {\"csrio\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1392},\n {\"barranquillo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sociedad anonima de capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n- {\"bg gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"zapateria\", 1, {DICTIONARY_PLACE_NAME}, 1704},\n+ {\"admr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n {\"casa se\u00f1orial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.\u00aa\", 1, {DICTIONARY_GIVEN_NAME}, 1459},\n- {\"ctro comunitaro\", 1, {DICTIONARY_PLACE_NAME}, 1611},\n {\"gimnasio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prdo\", 1, {DICTIONARY_SYNONYM}, 1857},\n- {\"cl\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n- {\"tn col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n {\"estado\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"monse\u00f1or\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n- {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n+ {\"vreda\", 1, {DICTIONARY_STREET_TYPE}, 1814},\n+ {\"s.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"srl\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1517},\n {\"reverendisima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"campos\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pq\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1675},\n+ {\"ferreteria\", 1, {DICTIONARY_PLACE_NAME}, 1646},\n {\"sociedad en nombre colectivo de responsabilidad limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"pol\u00edgono industrial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n- {\"octe\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"brg genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"oct.bre\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"7re\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"cto.cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"pant\", 1, {DICTIONARY_STREET_TYPE}, 1779},\n- {\"cto.com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"futbol club\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n+ {\"monsenor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n+ {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n+ {\"marqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1537},\n+ {\"czada\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n+ {\"pol res\", 1, {DICTIONARY_QUALIFIER}, 1722},\n+ {\"cllon\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n+ {\"pol ind\", 1, {DICTIONARY_QUALIFIER}, 1723},\n+ {\"barna\", 1, {DICTIONARY_TOPONYM}, 1875},\n {\"n\u00famero\", 1, {DICTIONARY_UNIT}, -1},\n- {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n- {\"embajada\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c v\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n+ {\"rvdo\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1557},\n+ {\"safi\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n {\"oficina\", 1, {DICTIONARY_UNIT}, -1},\n {\"arrabal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n {\"tr\u00e1nsito\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"llanura\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"s l u\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n- {\"cnl\", 1, {DICTIONARY_SYNONYM}, 1828},\n- {\"sermo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"soc cal\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n+ {\"dg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1507},\n+ {\"c priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"n\u00fam.ro\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"e i r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1411},\n+ {\"presa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n+ {\"peluqueria\", 1, {DICTIONARY_PLACE_NAME}, 1684},\n+ {\"d.bre\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"rcnda\", 1, {DICTIONARY_STREET_TYPE}, 1803},\n {\"este\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"funeraria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c n\", 1, {DICTIONARY_STREET_TYPE}, 1751},\n {\"cl\u00e9rigo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n- {\"m g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n {\"club de f\u00fatbol\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"calzada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"fc\", 1, {DICTIONARY_PLACE_NAME}, 1647},\n {\"polideportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"asociaci\u00f3n civil\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"bosque\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dela\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"vcto\", 1, {DICTIONARY_STREET_TYPE}, 1815},\n {\"pasillo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"estaci\u00f3n de tren\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nove\", 1, {DICTIONARY_SYNONYM}, 1855},\n+ {\"tn cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n+ {\"ldo\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1395},\n+ {\"atletico\", 1, {DICTIONARY_PLACE_NAME}, 1600},\n {\"carnicer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dir\", 1, {DICTIONARY_PERSONAL_TITLE}, 1497},\n+ {\"canal\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"numro\", 1, {DICTIONARY_UNIT}, 1897},\n {\"teniente general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"infta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1520},\n- {\"parque\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"n s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1541},\n- {\"brig gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n+ {\"iss\", 1, {DICTIONARY_QUALIFIER}, 1720},\n+ {\"lg\", 1, {DICTIONARY_SYNONYM}, 1849},\n+ {\"prol\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n+ {\"diac\", 1, {DICTIONARY_PERSONAL_TITLE}, 1498},\n+ {\"s.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n {\"sociedad en comandita port acci\u00f3nes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"al\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"bg general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"granj\", 1, {DICTIONARY_PLACE_NAME}, 1648},\n- {\"interior\", 1, {DICTIONARY_UNIT}, -1},\n- {\"pbdo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1793},\n- {\"rcda\", 1, {DICTIONARY_STREET_TYPE}, 1799},\n+ {\"cto\", 1, {DICTIONARY_UNIT}, 1878},\n+ {\"sccn\", 1, {DICTIONARY_QUALIFIER}, 1725},\n+ {\"cntro\", 1, {DICTIONARY_SYNONYM}, 1834},\n+ {\"compania por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n+ {\"cortijo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"col\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1715},\n {\"privada\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"infanter\u00eda\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"canal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"excmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1510},\n- {\"arqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1472},\n- {\"scel\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n+ {\"s r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n+ {\"dragoneante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"p i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n {\"sociedad limitada unipersonal\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"lic.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1395},\n+ {\"may\", 1, {DICTIONARY_SYNONYM}, 1854},\n {\"comisario de polic\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rl\", 1, {DICTIONARY_SYNONYM}, 1861},\n {\"hern\u00e1ndez\", 1, {DICTIONARY_SURNAME}, -1},\n- {\"enfa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1507},\n+ {\"ob\", 1, {DICTIONARY_PERSONAL_TITLE}, 1546},\n {\"playa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"abg.do\", 1, {DICTIONARY_PERSONAL_TITLE}, 1464},\n- {\"hda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1649},\n- {\"ccvcn\", 1, {DICTIONARY_STREET_TYPE}, 1764},\n+ {\"n.vre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"parque\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"vereda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"insp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1524},\n- {\"contralmte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1492},\n+ {\"en o\", 1, {DICTIONARY_SYNONYM}, 1839},\n {\"lagos\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"extramuros\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"merc\", 1, {DICTIONARY_PLACE_NAME}, 1664},\n- {\"saa\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n+ {\"inf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1525},\n {\"hospital\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tte cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n- {\"extrm\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1772},\n+ {\"principe\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n+ {\"madd\", 1, {DICTIONARY_TOPONYM}, 1876},\n {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s.a.f.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n- {\"sep\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"pnta\", 1, {DICTIONARY_SYNONYM}, 1860},\n- {\"optica\", 1, {DICTIONARY_PLACE_NAME}, 1669},\n- {\"ud\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n- {\"tte gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1579},\n- {\"seccion\", 1, {DICTIONARY_QUALIFIER}, 1721},\n- {\"scl\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n- {\"s cra\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n- {\"cptn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n- {\"pk\", 1, {DICTIONARY_QUALIFIER}, 1720},\n+ {\"cm\", 1, {DICTIONARY_STREET_TYPE}, 1753},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 1458},\n+ {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1497},\n+ {\"aa ee\", 1, {DICTIONARY_PLACE_NAME}, 1599},\n+ {\"& compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1449},\n+ {\"cll priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 1704},\n+ {\"tcnl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n+ {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 1692},\n+ {\"subte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1580},\n+ {\"residencia de estudiantes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dona\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n {\"minigolf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"apdo\", 1, {DICTIONARY_POST_OFFICE}, 1706},\n- {\"estcn de tren\", 1, {DICTIONARY_PLACE_NAME}, 1639},\n- {\"portcio\", 1, {DICTIONARY_UNIT}, 1896},\n- {\"rncn\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n- {\"ct\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n- {\"urb\", 1, {DICTIONARY_QUALIFIER}, 1723},\n+ {\"meull\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1672},\n+ {\"cv\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n+ {\"s.c.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n+ {\"pzo\", 1, {DICTIONARY_STREET_TYPE}, 1787},\n+ {\"s.n.\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n+ {\"v alte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1585},\n+ {\"estacion de tren\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n {\"fruter\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"parque de bomberos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pol\u00edg ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"p.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n {\"club atl\u00e9tico\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"r\u00edo\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ptda\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1786},\n+ {\"c p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n {\"instituto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"compania por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1405},\n- {\"cxa\", 1, {DICTIONARY_COMPANY_TYPE}, 1405},\n- {\"trva\", 1, {DICTIONARY_STREET_TYPE}, 1809},\n+ {\"cbo\", 1, {DICTIONARY_SYNONYM}, 1830},\n+ {\"polig ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n+ {\"s.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n+ {\"rescate de montana\", 1, {DICTIONARY_PLACE_NAME}, 1695},\n {\"balneario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"asociaci\u00f3n en participaci\u00f3n\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ribr\", 1, {DICTIONARY_SYNONYM}, 1864},\n- {\"psj\", 1, {DICTIONARY_STREET_TYPE}, 1784},\n- {\"cortijo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"circuito\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"g v\", 1, {DICTIONARY_STREET_TYPE}, 1774},\n+ {\"cto deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1618},\n+ {\"consultorio medico\", 1, {DICTIONARY_PLACE_NAME}, 1629},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n+ {\"s l n e\", 1, {DICTIONARY_COMPANY_TYPE}, 1444},\n {\"presidenta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"panaderia\", 1, {DICTIONARY_PLACE_NAME}, 1673},\n- {\"s.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n- {\"rma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1554},\n+ {\"ser.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1577},\n {\"hermano\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ag\", 1, {DICTIONARY_SYNONYM}, 1821},\n- {\"cs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n- {\"almacen general\", 1, {DICTIONARY_PLACE_NAME}, 1585},\n+ {\"st.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n+ {\"sedro\", 1, {DICTIONARY_STREET_TYPE}, 1808},\n+ {\"bg gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"izda\", 1, {DICTIONARY_UNIT}, 1893},\n+ {\"depto\", 1, {DICTIONARY_UNIT}, 1883},\n {\"rescate de monta\u00f1a\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"merc publico\", 1, {DICTIONARY_PLACE_NAME}, 1665},\n- {\"emp\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n- {\"parque acuatico\", 1, {DICTIONARY_PLACE_NAME}, 1676},\n- {\"cra\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n- {\"bda\", 1, {DICTIONARY_STREET_TYPE}, 1736},\n- {\"s.v.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n+ {\"bco\", 1, {DICTIONARY_COMPANY_TYPE}, 1404},\n+ {\"travesia\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n+ {\"almac\u00e9n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n+ {\"tn gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1583},\n {\"abad\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"presida\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n+ {\"alquileres de vehiculos\", 1, {DICTIONARY_PLACE_NAME}, 1590},\n {\"restaurante\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.l.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n+ {\"trvsia\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n+ {\"inga\", 1, {DICTIONARY_PERSONAL_TITLE}, 1526},\n+ {\"admor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n {\"embajador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"profa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n- {\"p k\", 1, {DICTIONARY_QUALIFIER}, 1720},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n+ {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"ptllo\", 1, {DICTIONARY_UNIT}, 1901},\n {\"atl\u00e9tico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"#\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"s de r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n- {\"slu\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n- {\"s a b\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n- {\"mstro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1530},\n- {\"sociedad anonima espanola\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n {\"plazuela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"set.bre\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"clinica veterinaria\", 1, {DICTIONARY_PLACE_NAME}, 1619},\n+ {\"cpo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1607},\n {\"centro comercial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"policia\", 1, {DICTIONARY_PLACE_NAME}, 1682},\n- {\"cdesa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1489},\n+ {\"7.re\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"fc\u00ba\", 1, {DICTIONARY_GIVEN_NAME}, 1461},\n+ {\"rev\", 1, {DICTIONARY_SYNONYM}, 1867},\n {\"abogada\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gobno\", 1, {DICTIONARY_SYNONYM}, 1838},\n- {\"brig genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n+ {\"10.bre\", 1, {DICTIONARY_SYNONYM}, 1840},\n+ {\"not\", 1, {DICTIONARY_PERSONAL_TITLE}, 1544},\n+ {\"sociedad anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"abg.da\", 1, {DICTIONARY_PERSONAL_TITLE}, 1467},\n {\"rancho\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"empresa publica\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"noroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"senador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.v\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"ctro.com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"marqs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n+ {\"jz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1531},\n {\"sargento primero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"brg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1476},\n- {\"escalinata\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sepe\", 1, {DICTIONARY_SYNONYM}, 1866},\n+ {\"ac\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n+ {\"extrr\", 1, {DICTIONARY_UNIT}, 1891},\n {\"capital federal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"int\", 1, {DICTIONARY_UNIT}, 1888},\n- {\"cjal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1490},\n- {\"v alte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n- {\"bos\", 1, {DICTIONARY_QUALIFIER}, 1709},\n- {\"sl\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n- {\"sociedad anonima bursatil\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"jul\", 1, {DICTIONARY_SYNONYM}, 1848},\n+ {\"pescaderia\", 1, {DICTIONARY_PLACE_NAME}, 1683},\n+ {\"avd\", 1, {DICTIONARY_STREET_TYPE}, 1738},\n+ {\"sociedad anonima cooperativa catalana limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n+ {\"zna\", 1, {DICTIONARY_QUALIFIER}, 1728},\n {\"occidente\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"s.a.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n+ {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1534},\n+ {\"c p\", 1, {DICTIONARY_SYNONYM}, 1836},\n {\"auzoa\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sargto ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n {\"pol\u00edgono\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n {\"poblado\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"7 re\", 1, {DICTIONARY_SYNONYM}, 1866},\n+ {\"clerigo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1489},\n {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"diag\", 1, {DICTIONARY_STREET_TYPE}, 1772},\n+ {\"cmt\", 1, {DICTIONARY_STREET_TYPE}, 1757},\n {\"condominio\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"sccn\", 1, {DICTIONARY_QUALIFIER}, 1721},\n- {\"m.a\", 1, {DICTIONARY_GIVEN_NAME}, 1459},\n- {\"ga\", 1, {DICTIONARY_SYNONYM}, 1840},\n- {\"jun\", 1, {DICTIONARY_SYNONYM}, 1843},\n- {\"parque tematico\", 1, {DICTIONARY_PLACE_NAME}, 1677},\n- {\"cto cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"alqueria\", 1, {DICTIONARY_STREET_TYPE}, 1728},\n- {\"is\", 1, {DICTIONARY_QUALIFIER}, 1715},\n- {\"ptda\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1782},\n- {\"ldera\", 1, {DICTIONARY_STREET_TYPE}, 1775},\n+ {\"febro\", 1, {DICTIONARY_SYNONYM}, 1841},\n+ {\"vice almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, 1585},\n+ {\"vdesa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1587},\n+ {\"m\u00aa\", 1, {DICTIONARY_GIVEN_NAME}, 1463},\n+ {\"rvdmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n+ {\"avda\", 1, {DICTIONARY_STREET_TYPE}, 1738},\n {\"la\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"isls\", 1, {DICTIONARY_QUALIFIER}, 1716},\n- {\"rvd\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1553},\n- {\"f c\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 1449},\n- {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 1601},\n- {\"s.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n+ {\"mans\", 1, {DICTIONARY_UNIT}, 1894},\n+ {\"entrada\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"mercado publico\", 1, {DICTIONARY_PLACE_NAME}, 1669},\n+ {\"franc\", 1, {DICTIONARY_GIVEN_NAME}, 1462},\n {\"f\u00e1brica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"compl\", 1, {DICTIONARY_BUILDING_TYPE}, 1394},\n+ {\"parq\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1679},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"sapi\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n- {\"copisteria\", 1, {DICTIONARY_PLACE_NAME}, 1626},\n- {\"resid\", 1, {DICTIONARY_UNIT}, 1899},\n- {\"c.v.\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n+ {\"adm.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n+ {\"ff cc\", 1, {DICTIONARY_PLACE_NAME}, 1648},\n+ {\"canti\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n {\"isla\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"vd\", 1, {DICTIONARY_STREET_TYPE}, 1811},\n- {\"dq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1504},\n+ {\"infanteria\", 1, {DICTIONARY_SYNONYM}, 1846},\n+ {\"plzta\", 1, {DICTIONARY_STREET_TYPE}, 1795},\n+ {\"novre\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"viaducto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"club de futbol\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n- {\"ctn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n- {\"lico\", 1, {DICTIONARY_PERSONAL_TITLE}, 1391},\n- {\"sociedad anonima promotora de inversion\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n- {\"aptos\", 1, {DICTIONARY_PLACE_NAME}, 1587},\n- {\"cte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1486},\n- {\"ctr comm\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n+ {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 1541},\n+ {\"ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1556},\n+ {\"rch\", 1, {DICTIONARY_PLACE_NAME}, 1694},\n+ {\"oct\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"milr\", 1, {DICTIONARY_SYNONYM}, 1855},\n+ {\"s g r\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"dp\", 1, {DICTIONARY_SYNONYM}, 1838},\n+ {\"empr\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n {\"residencia de la tercera edad\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"estacion de autobuses\", 1, {DICTIONARY_PLACE_NAME}, 1638},\n- {\"tn gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1579},\n {\"julio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cllzo\", 1, {DICTIONARY_STREET_TYPE}, 1747},\n+ {\"estrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n {\"cine\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cint\", 1, {DICTIONARY_STREET_TYPE}, 1762},\n+ {\"y cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1449},\n {\"capilla\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"repuestos automotrices\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"arboleda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"s.l.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n- {\"st.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n+ {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n {\"paseo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vinedo\", 1, {DICTIONARY_PLACE_NAME}, 1703},\n+ {\"carniceria\", 1, {DICTIONARY_PLACE_NAME}, 1611},\n {\"ferreter\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n- {\"pescaderia\", 1, {DICTIONARY_PLACE_NAME}, 1679},\n+ {\"pr\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n {\"parafarmacia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.c.c.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n {\"sal\u00f3n de belleza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"teniente primero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"c s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n+ {\"guerra\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"arzobispo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"mayor general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"y cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"gendarme\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"acceso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"crtil\", 1, {DICTIONARY_STREET_TYPE}, 1763},\n {\"subida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"secretario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"rinconada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ret\", 1, {DICTIONARY_STREET_TYPE}, 1797},\n {\"conjunto\", 1, {DICTIONARY_UNIT}, -1},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 1700},\n+ {\"secta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n+ {\"fernandez\", 1, {DICTIONARY_SURNAME}, 1818},\n {\"por\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"p.dre\", 1, {DICTIONARY_PERSONAL_TITLE}, 1547},\n {\"administradora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.a.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n- {\"clinica\", 1, {DICTIONARY_PLACE_NAME}, 1618},\n- {\"clerigo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n- {\"abg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1464},\n- {\"fco\", 1, {DICTIONARY_GIVEN_NAME}, 1457},\n- {\"res\", 1, {DICTIONARY_UNIT}, 1899},\n- {\"s.c.c.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n- {\"cque\", 1, {DICTIONARY_PERSONAL_TITLE}, 1482},\n- {\"rampla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sep.e\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"carra\", 1, {DICTIONARY_STREET_TYPE}, 1760},\n+ {\"po\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"centro medico\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n+ {\"gdme\", 1, {DICTIONARY_PERSONAL_TITLE}, 1516},\n+ {\"stn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1580},\n+ {\"brg general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"nove\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"calle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lpez\", 1, {DICTIONARY_SURNAME}, 1815},\n+ {\"y cia s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n+ {\"prof.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n {\"carrera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"edo\", 1, {DICTIONARY_QUALIFIER}, 1714},\n- {\"eslda\", 1, {DICTIONARY_STREET_TYPE}, 1769},\n+ {\"brg gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"sepbre\", 1, {DICTIONARY_SYNONYM}, 1870},\n {\"colegio mayor\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rodriguez\", 1, {DICTIONARY_SURNAME}, 1819},\n- {\"c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1404},\n- {\"infa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1520},\n- {\"entd\", 1, {DICTIONARY_UNIT}, 1881},\n+ {\"brio\", 1, {DICTIONARY_QUALIFIER}, 1712},\n+ {\"complj\", 1, {DICTIONARY_BUILDING_TYPE}, 1398},\n+ {\"s c c l\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n+ {\"s g i i c\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n {\"sal\u00f3n municipal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"paraje\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sdad\", 1, {DICTIONARY_COMPANY_TYPE}, 1411},\n- {\"pol\u00edg\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1717},\n- {\"ff cc\", 1, {DICTIONARY_PLACE_NAME}, 1644},\n- {\"psaje\", 1, {DICTIONARY_STREET_TYPE}, 1784},\n- {\"casino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"profr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n+ {\"c.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n+ {\"fca\", 1, {DICTIONARY_PLACE_NAME}, 1645},\n+ {\"tintorer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1503},\n+ {\"s.m\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"edfc\", 1, {DICTIONARY_BUILDING_TYPE}, 1400},\n {\"alquileres de bicicletas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"& compa\u00f1ia\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"arroyo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dna\", 1, {DICTIONARY_PERSONAL_TITLE}, 1502},\n- {\"cto medico\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n+ {\"cj\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n+ {\"cde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1492},\n+ {\"ctro m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n {\"duque\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cerrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sociedad en comandita por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n- {\"oct.e\", 1, {DICTIONARY_SYNONYM}, 1856},\n+ {\"& cia s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n+ {\"indep\", 1, {DICTIONARY_SYNONYM}, 1845},\n {\"campo de golf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"msnr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1539},\n- {\"rcon\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n+ {\"zoologico\", 1, {DICTIONARY_PLACE_NAME}, 1709},\n {\"serenisima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pzta\", 1, {DICTIONARY_STREET_TYPE}, 1791},\n+ {\"mq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n+ {\"cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1497},\n+ {\"se\", 1, {DICTIONARY_COMPANY_TYPE}, 1436},\n+ {\"d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n+ {\"expla\", 1, {DICTIONARY_STREET_TYPE}, 1775},\n {\"mansion\", 1, {DICTIONARY_UNIT}, -1},\n- {\"n.bre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"monasterio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr\", 1, {DICTIONARY_SYNONYM}, 1839},\n+ {\"e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"carreter\u00edn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sad\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n {\"vizconde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cto\", 1, {DICTIONARY_STREET_TYPE}, 1763},\n+ {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n+ {\"s a p i\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n+ {\"tn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1581},\n {\"mayo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n- {\"7.bre\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"pdta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n- {\"lgna\", 1, {DICTIONARY_SYNONYM}, 1847},\n- {\"c h\", 1, {DICTIONARY_STREET_TYPE}, 1750},\n- {\"pblo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1685},\n- {\"dg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1503},\n- {\"pto deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1689},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 1550},\n- {\"qbda\", 1, {DICTIONARY_UNIT}, 1898},\n- {\"s de rl\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n- {\"doctora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"martinez\", 1, {DICTIONARY_SURNAME}, 1822},\n+ {\"arz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1478},\n+ {\"extension\", 1, {DICTIONARY_UNIT}, 1890},\n+ {\"d\", 1, {DICTIONARY_PERSONAL_TITLE}, 1505},\n+ {\"s.c.e.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n+ {\"8bre\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 1704},\n+ {\"c\/priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"pg ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n+ {\"bazar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s c e l\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n+ {\"de cv\", 1, {DICTIONARY_PLACE_NAME}, 1635},\n+ {\"ctr comercial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"retorno\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c por a\", 1, {DICTIONARY_COMPANY_TYPE}, 1405},\n- {\"palac\", 1, {DICTIONARY_PLACE_NAME}, 1671},\n- {\"saica\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n- {\"estto\", 1, {DICTIONARY_PLACE_NAME}, 1640},\n- {\"librer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hdez\", 1, {DICTIONARY_SURNAME}, 1816},\n- {\"ver\", 1, {DICTIONARY_STREET_TYPE}, 1810},\n+ {\"cpo de folf\", 1, {DICTIONARY_PLACE_NAME}, 1608},\n+ {\"c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n+ {\"s m\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"dulceria\", 1, {DICTIONARY_PLACE_NAME}, 1639},\n+ {\"pi\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n+ {\"bjada\", 1, {DICTIONARY_STREET_TYPE}, 1739},\n+ {\"sll\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n+ {\"s.a.i.c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n+ {\"s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n {\"presidente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sendera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"fbrca\", 1, {DICTIONARY_PLACE_NAME}, 1645},\n+ {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 1743},\n+ {\"izq\", 1, {DICTIONARY_UNIT}, 1893},\n+ {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n {\"farmacia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"urbanizaci\u00f3n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"st\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n- {\"calle priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"p r\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"sect.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n+ {\"g v\", 1, {DICTIONARY_STREET_TYPE}, 1778},\n {\"helader\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"fray\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"proc\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n {\"sociedad colectiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"sociedad an\u00f3nima abierta\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"cmro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n- {\"profr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n- {\"dqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1505},\n+ {\"en\", 1, {DICTIONARY_SYNONYM}, 1839},\n {\"volcan\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"admora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1466},\n- {\"residencia de estudiantes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vvdas\", 1, {DICTIONARY_BUILDING_TYPE}, 1397},\n+ {\"sgto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n+ {\"sal\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n+ {\"poligono industrial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n {\"escuelas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"senores\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n- {\"y cia s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"s.a.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n- {\"cuesta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cmpos\", 1, {DICTIONARY_SYNONYM}, 1827},\n- {\"alque\", 1, {DICTIONARY_STREET_TYPE}, 1728},\n- {\"fabrica\", 1, {DICTIONARY_PLACE_NAME}, 1641},\n- {\"grande\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"monse\u00f1or\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"isl\", 1, {DICTIONARY_QUALIFIER}, 1715},\n- {\"dragoneante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"alferez\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n- {\"octbre\", 1, {DICTIONARY_SYNONYM}, 1856},\n- {\"rampa\", 1, {DICTIONARY_STREET_TYPE}, 1796},\n+ {\"sarg my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"enf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1511},\n+ {\"cto m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n+ {\"izqda\", 1, {DICTIONARY_UNIT}, 1893},\n+ {\"s.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n+ {\"charcuteria\", 1, {DICTIONARY_PLACE_NAME}, 1621},\n+ {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1573},\n+ {\"cto comercial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"c.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n {\"panader\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nuestra senora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1541},\n- {\"sg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n- {\"secreta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n+ {\"p.i.\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n+ {\"bv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"s.a.p.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n {\"consejal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jardin\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1656},\n- {\"p.\u00ba\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"edif\", 1, {DICTIONARY_BUILDING_TYPE}, 1396},\n- {\"pseo\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"pte\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n- {\"sm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n- {\"ctro de arte\", 1, {DICTIONARY_PLACE_NAME}, 1612},\n- {\"mq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1532},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 1448},\n- {\"brzal\", 1, {DICTIONARY_STREET_TYPE}, 1740},\n- {\"pdre\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n- {\"cllja\", 1, {DICTIONARY_STREET_TYPE}, 1743},\n+ {\"tte pro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1584},\n+ {\"rev\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1557},\n+ {\"brg gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"scel\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n+ {\"d f\", 1, {DICTIONARY_SYNONYM}, 1837},\n+ {\"canton\", 1, {DICTIONARY_STREET_TYPE}, 1759},\n+ {\"s.w\", 1, {DICTIONARY_DIRECTIONAL}, 1460},\n+ {\"secto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n {\"obispo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"portillo\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"lderas\", 1, {DICTIONARY_STREET_TYPE}, 1780},\n+ {\"ctro com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"sto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n {\"sociedad an\u00f3nima promotora de inversi\u00f3n\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sociedad por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n- {\"infanteria\", 1, {DICTIONARY_SYNONYM}, 1842},\n+ {\"ctro medico\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n+ {\"s.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n+ {\"rdo\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1557},\n {\"alameda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"area recreacional\", 1, {DICTIONARY_PLACE_NAME}, 1590},\n- {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1557},\n- {\"numr\", 1, {DICTIONARY_UNIT}, 1893},\n+ {\"club social\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"polig res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"acceso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.c.e.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n+ {\"jn\", 1, {DICTIONARY_SYNONYM}, 1847},\n {\"plaza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"camino nuevo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n- {\"c.v\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n- {\"cinturon\", 1, {DICTIONARY_STREET_TYPE}, 1762},\n+ {\"universidad\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"transito\", 1, {DICTIONARY_STREET_TYPE}, 1810},\n+ {\"crrdo\", 1, {DICTIONARY_STREET_TYPE}, 1769},\n {\"kiosko\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"prolongacion\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n+ {\"c.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n {\"charcuter\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"diputado\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ladera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pbla\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1684},\n- {\"sect.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"dqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1509},\n+ {\"gob\", 1, {DICTIONARY_SYNONYM}, 1842},\n {\"sector\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n {\"militar\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"parque acu\u00e1tico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c.h.\", 1, {DICTIONARY_STREET_TYPE}, 1754},\n {\"brigadier general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"centro juvenil\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"igl\", 1, {DICTIONARY_PLACE_NAME}, 1653},\n- {\"ctr cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"alte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n- {\"ser.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n- {\"novbre\", 1, {DICTIONARY_SYNONYM}, 1855},\n+ {\"sccl\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n+ {\"proc\", 1, {DICTIONARY_PERSONAL_TITLE}, 1553},\n+ {\"parque tematico\", 1, {DICTIONARY_PLACE_NAME}, 1681},\n+ {\"s.res\", 1, {DICTIONARY_PERSONAL_TITLE}, 1575},\n {\"polic\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"universidad\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"plto flvial\", 1, {DICTIONARY_PERSONAL_TITLE}, 1544},\n- {\"urbanizacion\", 1, {DICTIONARY_QUALIFIER}, 1723},\n- {\"pobl\", 1, {DICTIONARY_UNIT}, 1793},\n+ {\"bar\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n+ {\"cmno\", 1, {DICTIONARY_STREET_TYPE}, 1753},\n+ {\"apdro\", 1, {DICTIONARY_STREET_TYPE}, 1735},\n+ {\"s en n c\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n+ {\"comisario de policia\", 1, {DICTIONARY_PLACE_NAME}, 1627},\n+ {\"arb\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1596},\n+ {\"ctra\", 1, {DICTIONARY_STREET_TYPE}, 1761},\n+ {\"sargto my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"dtto\", 1, {DICTIONARY_QUALIFIER}, 1717},\n {\"excelencia\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ctro comercial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"mzo\", 1, {DICTIONARY_SYNONYM}, 1849},\n- {\"fc\u00ba\", 1, {DICTIONARY_GIVEN_NAME}, 1458},\n- {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"lopez\", 1, {DICTIONARY_SURNAME}, 1815},\n+ {\"sociedad anonima laboral\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n+ {\"manses\", 1, {DICTIONARY_UNIT}, 1895},\n+ {\"sapi\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n+ {\"pol.ind\", 1, {DICTIONARY_QUALIFIER}, 1723},\n+ {\"brg gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n {\"sociedad\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"dra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1500},\n- {\"palacs\", 1, {DICTIONARY_PLACE_NAME}, 1672},\n- {\"c.t.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n- {\"igla\", 1, {DICTIONARY_PLACE_NAME}, 1653},\n+ {\"poligono residencial\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"ctro.cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"entr\", 1, {DICTIONARY_UNIT}, 1885},\n {\"valle\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n- {\"rin\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n- {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 1655},\n- {\"sep.e\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1557},\n- {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 1529},\n- {\"rcho\", 1, {DICTIONARY_PLACE_NAME}, 1690},\n- {\"brios\", 1, {DICTIONARY_QUALIFIER}, 1709},\n- {\"mscal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1531},\n+ {\"sg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1568},\n+ {\"d\", 1, {DICTIONARY_UNIT}, 1884},\n+ {\"plta\", 1, {DICTIONARY_STREET_TYPE}, 1795},\n+ {\"nro\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"l\u00f3pez\", 1, {DICTIONARY_SURNAME}, -1},\n+ {\"nvre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"esca\", 1, {DICTIONARY_UNIT}, 1886},\n+ {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"eirl\", 1, {DICTIONARY_COMPANY_TYPE}, 1411},\n {\"cabo primero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pg res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n- {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 1750},\n- {\"ctr.cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n {\"zona\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"int\", 1, {DICTIONARY_PERSONAL_TITLE}, 1525},\n- {\"pnte\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1686},\n+ {\"sociedad anonima simplificada\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n {\"pr\u00edncipe\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"arq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1471},\n+ {\"c f\", 1, {DICTIONARY_COMPANY_TYPE}, 1406},\n {\"complejo en la playa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"mercado p\u00fablico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"club atletico\", 1, {DICTIONARY_COMPANY_TYPE}, 1401},\n {\"sureste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"autov\", 1, {DICTIONARY_STREET_TYPE}, 1733},\n- {\"cj\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n- {\"sdad ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n- {\"jdin\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1656},\n+ {\"disco\", 1, {DICTIONARY_PLACE_NAME}, 1637},\n+ {\"concesionario de automoviles\", 1, {DICTIONARY_PLACE_NAME}, 1628},\n+ {\"b.co\", 1, {DICTIONARY_COMPANY_TYPE}, 1404},\n+ {\"vla\", 1, {DICTIONARY_PLACE_NAME}, 1705},\n+ {\"vist\", 1, {DICTIONARY_STREET_TYPE}, 1817},\n {\"p\u00f3rtico\", 1, {DICTIONARY_UNIT}, -1},\n- {\"crtil\", 1, {DICTIONARY_STREET_TYPE}, 1759},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 1734},\n- {\"numero\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1577},\n+ {\"las\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"c x a\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n+ {\"branc\", 1, {DICTIONARY_STREET_TYPE}, 1741},\n {\"mas\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"cto comunitario\", 1, {DICTIONARY_PLACE_NAME}, 1611},\n+ {\"e.u\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n {\"avenida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"scoop\", 1, {DICTIONARY_COMPANY_TYPE}, 1427},\n+ {\"8 bre\", 1, {DICTIONARY_SYNONYM}, 1860},\n {\"puerto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"marquesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"brigadier\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"f.c\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n+ {\"sec\", 1, {DICTIONARY_QUALIFIER}, 1725},\n {\"suroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"pol.res\", 1, {DICTIONARY_QUALIFIER}, 1718},\n- {\"cnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n- {\"pgres\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n+ {\"p.o\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"tintoreria\", 1, {DICTIONARY_PLACE_NAME}, 1702},\n+ {\"hernandez\", 1, {DICTIONARY_SURNAME}, 1820},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 1816},\n+ {\"cdad\", 1, {DICTIONARY_QUALIFIER}, 1716},\n {\"villas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"blq\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1714},\n {\"cerro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"aldea\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"cd\", 1, {DICTIONARY_QUALIFIER}, 1712},\n- {\"prision\", 1, {DICTIONARY_PLACE_NAME}, 1683},\n- {\"cllon\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n- {\"eno\", 1, {DICTIONARY_SYNONYM}, 1835},\n- {\"dir.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1498},\n+ {\"balnr\", 1, {DICTIONARY_PLACE_NAME}, 1601},\n+ {\"cantr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1609},\n+ {\"s.l.n.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1444},\n+ {\"cto com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n {\"parque tem\u00e1tico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u00e1rea de juegos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"jardines de infancia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"occidental\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"cab\", 1, {DICTIONARY_PERSONAL_TITLE}, 1478},\n- {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1568},\n- {\"rncon\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n- {\"chlet\", 1, {DICTIONARY_BUILDING_TYPE}, 1393},\n- {\"s a l\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n- {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 1449},\n+ {\"bg gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 1495},\n+ {\"estacion\", 1, {DICTIONARY_PLACE_NAME}, 1641},\n+ {\"msnr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n+ {\"carreterin\", 1, {DICTIONARY_STREET_TYPE}, 1762},\n+ {\"s.a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n+ {\"lcdo\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 1395},\n {\"\u00f3ptica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n+ {\"estcn\", 1, {DICTIONARY_PLACE_NAME}, 1641},\n {\"sociedad an\u00f3nima espa\u00f1ola\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sgr\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n- {\"enfermeria\", 1, {DICTIONARY_PLACE_NAME}, 1636},\n- {\"vsta\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n- {\"tn gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1579},\n- {\"dhsa\", 1, {DICTIONARY_PLACE_NAME}, 1630},\n- {\"p.r.\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n+ {\"drogueria\", 1, {DICTIONARY_PLACE_NAME}, 1638},\n+ {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n+ {\"sargento vice primero\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"libreria\", 1, {DICTIONARY_PLACE_NAME}, 1665},\n+ {\"banos\", 1, {DICTIONARY_PLACE_NAME}, 1602},\n+ {\"andad\", 1, {DICTIONARY_STREET_TYPE}, 1733},\n {\"santuario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rda\", 1, {DICTIONARY_STREET_TYPE}, 1800},\n+ {\"cp\", 1, {DICTIONARY_SYNONYM}, 1836},\n {\"sargento viceprimero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"spa\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n- {\"p.za\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n- {\"pte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1546},\n- {\"sdad anon\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"cer\", 1, {DICTIONARY_STREET_TYPE}, 1765},\n+ {\"s \/ n\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n+ {\"s.v.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"7bre\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 1451},\n+ {\"jugueteria\", 1, {DICTIONARY_PLACE_NAME}, 1663},\n {\"museo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"mirador\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"peat\", 1, {DICTIONARY_STREET_TYPE}, 1788},\n- {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n- {\"se\u00f1or\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"barna\", 1, {DICTIONARY_TOPONYM}, 1871},\n- {\"my gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 1536},\n+ {\"c.ia\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"s.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n+ {\"ncleo\", 1, {DICTIONARY_UNIT}, 1896},\n+ {\"cementerio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c \/ priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"sociedad gestora de instituciones de inversion colectiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n+ {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n+ {\"cia ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n+ {\"sociedad anonima financiera de inversion\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n {\"infanta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"asociacion civil\", 1, {DICTIONARY_COMPANY_TYPE}, 1399},\n- {\"presid\", 1, {DICTIONARY_PERSONAL_TITLE}, 1546},\n+ {\"lavander\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"revolucion\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"marques\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"punto de reciclaje\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sold\", 1, {DICTIONARY_PERSONAL_TITLE}, 1575},\n- {\"taller mecanico\", 1, {DICTIONARY_PLACE_NAME}, 1697},\n- {\"d.bre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"pres.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n- {\"s.rta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1572},\n- {\"travesia\", 1, {DICTIONARY_STREET_TYPE}, 1809},\n- {\"barda\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1707},\n- {\"merc p\u00fablico\", 1, {DICTIONARY_PLACE_NAME}, 1665},\n- {\"sociedad anonima abierta\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n- {\"mnte\", 1, {DICTIONARY_SYNONYM}, 1852},\n- {\"sab\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"m.g.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n+ {\"golfito\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ctr.com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"rep\", 1, {DICTIONARY_SYNONYM}, 1866},\n+ {\"c n\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n+ {\"saica\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n+ {\"sdad ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1442},\n+ {\"sgiic\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n+ {\"parti\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n {\"gobernadora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"calleja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"may brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1539},\n+ {\"centro m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"departamento\", 1, {DICTIONARY_UNIT}, -1},\n- {\"10 bre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"demar\", 1, {DICTIONARY_UNIT}, 1878},\n- {\"hno\", 1, {DICTIONARY_PERSONAL_TITLE}, 1518},\n+ {\"s en nc\", 1, {DICTIONARY_COMPANY_TYPE}, 1439},\n {\"reverendo\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bg genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"sgto ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n {\"arquitectors\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"iglas\", 1, {DICTIONARY_PLACE_NAME}, 1654},\n {\"prisi\u00f3n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 1465},\n+ {\"cto juvenil\", 1, {DICTIONARY_PLACE_NAME}, 1619},\n+ {\"u.d\", 1, {DICTIONARY_COMPANY_TYPE}, 1447},\n {\"biblioteca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"crn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1497},\n {\"andador\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"crril\", 1, {DICTIONARY_STREET_TYPE}, 1760},\n- {\"heladeria\", 1, {DICTIONARY_PLACE_NAME}, 1650},\n- {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n+ {\"presid.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n {\"chalet\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"pros\", 1, {DICTIONARY_SYNONYM}, 1858},\n- {\"p\u00ba\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"p i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n- {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n- {\"alt\", 1, {DICTIONARY_SYNONYM}, 1822},\n+ {\"plzla\", 1, {DICTIONARY_STREET_TYPE}, 1796},\n+ {\"pg res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"cond\", 1, {DICTIONARY_BUILDING_TYPE}, 1399},\n+ {\"s.n\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n+ {\"grande\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"callizo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cafeteria\", 1, {DICTIONARY_PLACE_NAME}, 1602},\n- {\"abl\", 1, {DICTIONARY_SYNONYM}, 1820},\n- {\"llanuras\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"seccion\", 1, {DICTIONARY_QUALIFIER}, 1725},\n+ {\"mg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n+ {\"y cia sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n+ {\"ntra sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n+ {\"df\", 1, {DICTIONARY_SYNONYM}, 1837},\n {\"cl\u00ednica veterinaria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cto m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n {\"periferico\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"feb\", 1, {DICTIONARY_SYNONYM}, 1837},\n- {\"malecon\", 1, {DICTIONARY_STREET_TYPE}, 1778},\n- {\"scra\", 1, {DICTIONARY_COMPANY_TYPE}, 1426},\n- {\"brrios\", 1, {DICTIONARY_QUALIFIER}, 1709},\n- {\"s.a.p.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n- {\"s.a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n- {\"may brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1535},\n- {\"consejo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1491},\n- {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"centro com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"rtda\", 1, {DICTIONARY_STREET_TYPE}, 1801},\n- {\"club social\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mansion\", 1, {DICTIONARY_PLACE_NAME}, 1667},\n+ {\"9.bre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"ctro cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"ser.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n+ {\"rmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1559},\n+ {\"hipod\", 1, {DICTIONARY_PLACE_NAME}, 1655},\n+ {\"ctro\", 1, {DICTIONARY_SYNONYM}, 1834},\n+ {\"cmpo\", 1, {DICTIONARY_SYNONYM}, 1607},\n+ {\"pte\", 1, {DICTIONARY_DIRECTIONAL}, 1457},\n+ {\"ext\", 1, {DICTIONARY_UNIT}, 1890},\n+ {\"ctro de arte\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n+ {\"cno\", 1, {DICTIONARY_STREET_TYPE}, 1753},\n+ {\"cto de arte\", 1, {DICTIONARY_PLACE_NAME}, 1616},\n+ {\"adm.ora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n+ {\"loc\", 1, {DICTIONARY_PERSONAL_TITLE}, 1532},\n {\"parque infantil\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"acces\", 1, {DICTIONARY_STREET_TYPE}, 1726},\n- {\"pe\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n {\"cl\u00ednica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"polig\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1717},\n- {\"empresa unipersonal\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"& cia sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"ns\", 1, {DICTIONARY_PERSONAL_TITLE}, 1541},\n+ {\"centro.com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"scl\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n+ {\"s.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n+ {\"salon municipal\", 1, {DICTIONARY_PLACE_NAME}, 1698},\n+ {\"area recreativa\", 1, {DICTIONARY_PLACE_NAME}, 1595},\n {\"residencia de jubilados\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pabellon\", 1, {DICTIONARY_PLACE_NAME}, 1670},\n- {\"secta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n- {\"sect.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1567},\n- {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 1455},\n- {\"a c\", 1, {DICTIONARY_COMPANY_TYPE}, 1399},\n+ {\"rncn\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n+ {\"de c v\", 1, {DICTIONARY_PLACE_NAME}, 1635},\n+ {\"izqa\", 1, {DICTIONARY_UNIT}, 1893},\n {\"club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"entrada\", 1, {DICTIONARY_UNIT}, -1},\n- {\"hnos\", 1, {DICTIONARY_PERSONAL_TITLE}, 1519},\n- {\"estacion de tren\", 1, {DICTIONARY_PLACE_NAME}, 1639},\n+ {\"ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n+ {\"sociedad anonima deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n+ {\"dic\", 1, {DICTIONARY_SYNONYM}, 1840},\n {\"vizcondesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gonz\u00e1lez\", 1, {DICTIONARY_SURNAME}, -1},\n- {\"auditorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zona militar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"srs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1575},\n {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dira\", 1, {DICTIONARY_PERSONAL_TITLE}, 1498},\n- {\"polig ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"s en c por a\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n- {\"gale\", 1, {DICTIONARY_STREET_TYPE}, 1647},\n- {\"sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n- {\"s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n- {\"centro.com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"p r\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n+ {\"gdora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1518},\n+ {\"compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n+ {\"ep\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n+ {\"mrdor\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1670},\n+ {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n+ {\"particular\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ag\", 1, {DICTIONARY_SYNONYM}, 1825},\n+ {\"sociedad de capital e industria\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"s.l.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n+ {\"blev\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"e.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n {\"entre\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"almte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n- {\"cstan\", 1, {DICTIONARY_STREET_TYPE}, 1766},\n+ {\"arqs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n {\"diciembre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pequeno supermercado\", 1, {DICTIONARY_PLACE_NAME}, 1681},\n- {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n- {\"serma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1573},\n+ {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 1407},\n {\"transito\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trans\", 1, {DICTIONARY_PLACE_NAME}, 1699},\n- {\"pasteleria\", 1, {DICTIONARY_PLACE_NAME}, 1678},\n- {\"c.n.\", 1, {DICTIONARY_STREET_TYPE}, 1751},\n- {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n- {\"mnez\", 1, {DICTIONARY_SURNAME}, 1818},\n+ {\"\u00e1rea recreacional\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"callejon\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n+ {\"alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1474},\n+ {\"cuadra\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"sres\", 1, {DICTIONARY_PERSONAL_TITLE}, 1575},\n {\"cerca\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"llnras\", 1, {DICTIONARY_SYNONYM}, 1848},\n- {\"laguna\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"abgda\", 1, {DICTIONARY_PERSONAL_TITLE}, 1463},\n- {\"infa\", 1, {DICTIONARY_SYNONYM}, 1842},\n+ {\"9 bre\", 1, {DICTIONARY_SYNONYM}, 1859},\n+ {\"trvs\u00eda\", 1, {DICTIONARY_STREET_TYPE}, 1813},\n+ {\"cbtiz\", 1, {DICTIONARY_UNIT}, 1877},\n {\"comisario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"hasta\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"s.c.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n+ {\"centro de salud\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s p a\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n {\"sociedad de responsabilidad limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"galer\u00eda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"arry\", 1, {DICTIONARY_PLACE_NAME}, 1594},\n- {\"cmo\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n- {\"s w\", 1, {DICTIONARY_DIRECTIONAL}, 1456},\n- {\"custa\", 1, {DICTIONARY_STREET_TYPE}, 1767},\n- {\"caser\u00edo\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"compania anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 1404},\n- {\"dicbre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"s c l\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n- {\"sociedad anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n- {\"sca\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"arq\", 1, {DICTIONARY_PERSONAL_TITLE}, 1475},\n+ {\"s.a.f.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n+ {\"camino\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 1624},\n+ {\"y compania\", 1, {DICTIONARY_COMPANY_TYPE}, 1449},\n+ {\"bsq\", 1, {DICTIONARY_SYNONYM}, 1828},\n {\"autolavado\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"floristeria\", 1, {DICTIONARY_PLACE_NAME}, 1645},\n {\"peque\u00f1o supermercado\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cantera\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"ynfanta\", 1, {DICTIONARY_SYNONYM}, 1842},\n- {\"extrr\", 1, {DICTIONARY_UNIT}, 1887},\n+ {\"m.g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n+ {\"7 bre\", 1, {DICTIONARY_SYNONYM}, 1870},\n {\"y compa\u00f1ia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"prof\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1551},\n- {\"santu\", 1, {DICTIONARY_PLACE_NAME}, 1696},\n- {\"brio\", 1, {DICTIONARY_QUALIFIER}, 1708},\n {\"sociedad en comandita\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"rbla\", 1, {DICTIONARY_STREET_TYPE}, 1799},\n+ {\"bos\", 1, {DICTIONARY_QUALIFIER}, 1713},\n+ {\"rtda\", 1, {DICTIONARY_STREET_TYPE}, 1805},\n {\"junior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"ferreteria\", 1, {DICTIONARY_PLACE_NAME}, 1642},\n+ {\"sociedad anonima bursatil\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n+ {\"ctro comun\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n+ {\"crrlo\", 1, {DICTIONARY_UNIT}, 1880},\n+ {\"tte gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1583},\n+ {\"d p\", 1, {DICTIONARY_SYNONYM}, 1838},\n+ {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n {\"fern\u00e1ndez\", 1, {DICTIONARY_SURNAME}, -1},\n- {\"cda\", 1, {DICTIONARY_STREET_TYPE}, 1761},\n+ {\"ctrin\", 1, {DICTIONARY_STREET_TYPE}, 1762},\n {\"sargento\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n+ {\"s.m.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"papeleria\", 1, {DICTIONARY_PLACE_NAME}, 1678},\n {\"se\u00f1ora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p.r\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n+ {\"brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n {\"kiosko de prensa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"muelle\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"se\u00f1ores\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"las\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"primeros\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"u.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n+ {\"sw\", 1, {DICTIONARY_DIRECTIONAL}, 1460},\n+ {\"d.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n+ {\"a en p\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n {\"puebla\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"hip\u00f3dromo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"brig gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n+ {\"ynfa\", 1, {DICTIONARY_SYNONYM}, 1846},\n+ {\"diaca\", 1, {DICTIONARY_PERSONAL_TITLE}, 1499},\n {\"peluquer\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"nov.bre\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"alturas\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n {\"sierra\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"blev\", 1, {DICTIONARY_STREET_TYPE}, 1741},\n- {\"cia sca\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n- {\"p.k.\", 1, {DICTIONARY_QUALIFIER}, 1720},\n- {\"n\u00famr\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"avda\", 1, {DICTIONARY_STREET_TYPE}, 1734},\n- {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 1412},\n- {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 1451},\n+ {\"jard\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1660},\n+ {\"ene\", 1, {DICTIONARY_SYNONYM}, 1839},\n+ {\"rampla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"isls\", 1, {DICTIONARY_QUALIFIER}, 1720},\n+ {\"agrim\", 1, {DICTIONARY_PERSONAL_TITLE}, 1471},\n {\"piloto fluvial\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"arral\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 1593},\n- {\"s a d\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n- {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 1404},\n+ {\"angta\", 1, {DICTIONARY_STREET_TYPE}, 1734},\n+ {\"casa senorial\", 1, {DICTIONARY_PLACE_NAME}, 1612},\n+ {\"exca\", 1, {DICTIONARY_PERSONAL_TITLE}, 1512},\n+ {\"infte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1525},\n+ {\"cn\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n+ {\"gob\", 1, {DICTIONARY_PERSONAL_TITLE}, 1519},\n {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s a e\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n {\"consultorio m\u00e9dico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"malec\", 1, {DICTIONARY_STREET_TYPE}, 1778},\n- {\"ingo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1523},\n- {\"admra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1466},\n- {\"carreterin\", 1, {DICTIONARY_STREET_TYPE}, 1758},\n- {\"marqs\", 1, {DICTIONARY_PERSONAL_TITLE}, 1532},\n- {\"my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1534},\n- {\"cj\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n+ {\"& sucesores\", 1, {DICTIONARY_COMPANY_TYPE}, 1450},\n+ {\"sendera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"caserio\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1396},\n+ {\"almacen\", 1, {DICTIONARY_PLACE_NAME}, 1588},\n+ {\"alfz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1473},\n+ {\"soc\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME}, 1415},\n {\"y sucesores\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 1523},\n {\"hostal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sp\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n- {\"ote\", 1, {DICTIONARY_DIRECTIONAL}, 1452},\n- {\"cant\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n- {\"pso\", 1, {DICTIONARY_STREET_TYPE}, 1785},\n- {\"arqos\", 1, {DICTIONARY_PERSONAL_TITLE}, 1473},\n+ {\"7re\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"cte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1490},\n+ {\"eslda\", 1, {DICTIONARY_STREET_TYPE}, 1773},\n+ {\"sepe\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"cnvto\", 1, {DICTIONARY_PLACE_NAME}, 1631},\n+ {\"sect\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1726},\n+ {\"estacion de autobuses\", 1, {DICTIONARY_PLACE_NAME}, 1642},\n+ {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n+ {\"estda\", 1, {DICTIONARY_STREET_TYPE}, 1774},\n+ {\"sociedad anonima inscrita de capital abierto\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n {\"cabo tercero\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"banos\", 1, {DICTIONARY_PLACE_NAME}, 1598},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1560},\n {\"centro deportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n+ {\"licoreria\", 1, {DICTIONARY_PLACE_NAME}, 1666},\n+ {\"agt\", 1, {DICTIONARY_SYNONYM}, 1825},\n {\"infante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"monte\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"glez\", 1, {DICTIONARY_SURNAME}, 1817},\n- {\"lic.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1390},\n- {\"asociacion en participacion\", 1, {DICTIONARY_COMPANY_TYPE}, 1398},\n- {\"admr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1465},\n- {\"joyeria\", 1, {DICTIONARY_PLACE_NAME}, 1658},\n+ {\"ud\", 1, {DICTIONARY_COMPANY_TYPE}, 1447},\n+ {\"senora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"scn\", 1, {DICTIONARY_QUALIFIER}, 1725},\n+ {\"union deportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 1447},\n+ {\"noroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 1454},\n+ {\"se\u00f1or\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sep.bre\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"tte col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n {\"finca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"senador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u00e1rea recreativa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"maestro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"edifc\", 1, {DICTIONARY_BUILDING_TYPE}, 1400},\n+ {\"secc\", 1, {DICTIONARY_QUALIFIER}, 1725},\n+ {\"sociedad en nombre colectivo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"autoescuela\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"u d\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n- {\"compj\", 1, {DICTIONARY_BUILDING_TYPE}, 1394},\n- {\"sgiic\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n+ {\"crral\", 1, {DICTIONARY_UNIT}, 1879},\n+ {\"atlo\", 1, {DICTIONARY_PLACE_NAME}, 1600},\n+ {\"auditorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"profesora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cantina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"csr\u00edo\", 1, {DICTIONARY_PLACE_NAME}, 1396},\n {\"alquer\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1563},\n+ {\"escalinata\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"ctro de salud\", 1, {DICTIONARY_PLACE_NAME}, 1617},\n {\"demarcaci\u00f3n\", 1, {DICTIONARY_UNIT}, -1},\n {\"para\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 1529},\n+ {\"mtrio\", 1, {DICTIONARY_PLACE_NAME}, 1671},\n+ {\"s.w.\", 1, {DICTIONARY_DIRECTIONAL}, 1460},\n+ {\"llnras\", 1, {DICTIONARY_SYNONYM}, 1852},\n {\"malec\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 1464},\n {\"lado\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s e\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n- {\"cto juvenil\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n {\"traves\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"discoteca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"centro comunitario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bar\u00f3n\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"papeler\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cf\", 1, {DICTIONARY_COMPANY_TYPE}, 1402},\n+ {\"csrio\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1396},\n {\"oriental\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n+ {\"& compa\u00f1ia\", 1, {DICTIONARY_COMPANY_TYPE}, 1449},\n+ {\"cast\", 1, {DICTIONARY_PLACE_NAME}, 1613},\n {\"ministerio\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"9.bre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"dic.bre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"sociedad en nombre colectivo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"salon de belleza\", 1, {DICTIONARY_PLACE_NAME}, 1693},\n- {\"priv\", 1, {DICTIONARY_SYNONYM}, 1859},\n- {\"srl\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n- {\"gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1513},\n- {\"setbre\", 1, {DICTIONARY_SYNONYM}, 1866},\n+ {\"zapateria\", 1, {DICTIONARY_PLACE_NAME}, 1708},\n+ {\"m.\u00aa\", 1, {DICTIONARY_GIVEN_NAME}, 1463},\n+ {\"maestro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.a.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n+ {\"prdo\", 1, {DICTIONARY_SYNONYM}, 1861},\n+ {\"cl\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n+ {\"cra\", 1, {DICTIONARY_STREET_TYPE}, 1760},\n+ {\"punto kilometrico\", 1, {DICTIONARY_QUALIFIER}, 1724},\n {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"licenciada\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"llnra\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, 1777},\n- {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 1450},\n+ {\"vista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"feb\", 1, {DICTIONARY_SYNONYM}, 1841},\n {\"florister\u00eda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"pueblo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"monsenor\", 1, {DICTIONARY_PERSONAL_TITLE}, 1539},\n- {\"fr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1511},\n+ {\"abr\", 1, {DICTIONARY_SYNONYM}, 1824},\n {\"alcalde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"procurador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n {\"grandes almacenes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sad\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n+ {\"octe\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"oct.bre\", 1, {DICTIONARY_SYNONYM}, 1860},\n {\"autopista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pol res\", 1, {DICTIONARY_QUALIFIER}, 1718},\n- {\"s a p i\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n- {\"pol ind\", 1, {DICTIONARY_QUALIFIER}, 1719},\n+ {\"cardenal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pant\", 1, {DICTIONARY_STREET_TYPE}, 1783},\n {\"pasaje\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"futbol club\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"dept\", 1, {DICTIONARY_UNIT}, 1883},\n {\"estadio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nacl\", 1, {DICTIONARY_SYNONYM}, 1854},\n {\"compa\u00f1ia por acci\u00f3nes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"cto de arte\", 1, {DICTIONARY_PLACE_NAME}, 1612},\n+ {\"lgna\", 1, {DICTIONARY_SYNONYM}, 1851},\n+ {\"c h\", 1, {DICTIONARY_STREET_TYPE}, 1754},\n {\"apeadero\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.n.\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n- {\"junta\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"n.ro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"plta\", 1, {DICTIONARY_STREET_TYPE}, 1791},\n- {\"sargento segundo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"soc cal\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"mtes\", 1, {DICTIONARY_SYNONYM}, 1853},\n+ {\"estcn de autobuses\", 1, {DICTIONARY_PLACE_NAME}, 1642},\n+ {\"excma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1513},\n+ {\"lic.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1394},\n {\"\u00e1rea de picnic\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n- {\"noviembre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n+ {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 1743},\n+ {\"trval\", 1, {DICTIONARY_STREET_TYPE}, 1811},\n+ {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n+ {\"rodr\u00edguez\", 1, {DICTIONARY_SURNAME}, -1},\n+ {\"s l u\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n {\"sendero\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"peluqueria\", 1, {DICTIONARY_PLACE_NAME}, 1680},\n- {\"alts\", 1, {DICTIONARY_SYNONYM}, 1823},\n- {\"cpo de folf\", 1, {DICTIONARY_PLACE_NAME}, 1604},\n- {\"of\", 1, {DICTIONARY_UNIT}, 1894},\n- {\"calz\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n- {\"cjla\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n- {\"inga\", 1, {DICTIONARY_PERSONAL_TITLE}, 1522},\n- {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1538},\n- {\"fc\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n- {\"rincon\", 1, {DICTIONARY_STREET_TYPE}, 1798},\n+ {\"s coop\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n+ {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 1459},\n+ {\"bar.na\", 1, {DICTIONARY_TOPONYM}, 1875},\n {\"derecha\", 1, {DICTIONARY_UNIT}, -1},\n- {\"alquileres de veh\u00edculos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vcto\", 1, {DICTIONARY_STREET_TYPE}, 1811},\n- {\"bjada\", 1, {DICTIONARY_STREET_TYPE}, 1735},\n- {\"pantano\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"escalin\", 1, {DICTIONARY_UNIT}, 1888},\n+ {\"brg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n+ {\"centro cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"hna\", 1, {DICTIONARY_PERSONAL_TITLE}, 1520},\n {\"escalera\", 1, {DICTIONARY_UNIT}, -1},\n {\"cobertizo\", 1, {DICTIONARY_UNIT}, -1},\n- {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 1537},\n- {\"autovia\", 1, {DICTIONARY_STREET_TYPE}, 1733},\n+ {\"prof.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n {\"juzgado\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"iss\", 1, {DICTIONARY_QUALIFIER}, 1716},\n- {\"dcha\", 1, {DICTIONARY_UNIT}, 1880},\n- {\"prol\", 1, {DICTIONARY_STREET_TYPE}, 1794},\n+ {\"est\", 1, {DICTIONARY_UNIT}, 1889},\n+ {\"tte cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n {\"estudio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ps mar\", 1, {DICTIONARY_STREET_TYPE}, 1786},\n- {\"s.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n- {\"slne\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n- {\"c x a\", 1, {DICTIONARY_COMPANY_TYPE}, 1405},\n- {\"cto\", 1, {DICTIONARY_UNIT}, 1874},\n- {\"cntro\", 1, {DICTIONARY_SYNONYM}, 1830},\n- {\"autop\", 1, {DICTIONARY_STREET_TYPE}, 1732},\n+ {\"callej\", 1, {DICTIONARY_STREET_TYPE}, 1748},\n+ {\"cmro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1491},\n+ {\"iunior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 1465},\n+ {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1561},\n+ {\"cl priv\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n {\"hacienda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"pbdo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1797},\n+ {\"c por a\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n {\"jard\u00edn\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"s r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1431},\n+ {\"palac\", 1, {DICTIONARY_PLACE_NAME}, 1675},\n {\"callej\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"codigo postal\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1513},\n+ {\"sr.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n {\"sargento ayudante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"may\", 1, {DICTIONARY_SYNONYM}, 1850},\n- {\"cabana\", 1, {DICTIONARY_PLACE_NAME}, 1600},\n+ {\"demarcacion\", 1, {DICTIONARY_UNIT}, 1882},\n+ {\"noviembre\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"taller mec\u00e1nico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"abgdo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1464},\n- {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 1539},\n- {\"senorita\", 1, {DICTIONARY_PERSONAL_TITLE}, 1572},\n- {\"cuadr\", 1, {DICTIONARY_UNIT}, 1877},\n+ {\"enfa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1511},\n+ {\"c.n\", 1, {DICTIONARY_STREET_TYPE}, 1755},\n+ {\"abg.do\", 1, {DICTIONARY_PERSONAL_TITLE}, 1468},\n+ {\"agto\", 1, {DICTIONARY_SYNONYM}, 1825},\n+ {\"blque\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1714},\n {\"explanada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mntes\", 1, {DICTIONARY_SYNONYM}, 1853},\n+ {\"mqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1537},\n {\"hermana\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"c.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n- {\"demarcacion\", 1, {DICTIONARY_UNIT}, 1878},\n- {\"s g i i c\", 1, {DICTIONARY_COMPANY_TYPE}, 1437},\n- {\"tte pro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1580},\n+ {\"contralmte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1496},\n+ {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1416},\n+ {\"s a a\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 1704},\n+ {\"bg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n+ {\"union\", 1, {DICTIONARY_COMPANY_TYPE}, 1448},\n+ {\"sgto my\", 1, {DICTIONARY_PERSONAL_TITLE}, 1566},\n+ {\"s.a.f.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n+ {\"noreste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"caf\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"brg gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"f.c.\", 1, {DICTIONARY_PLACE_NAME}, 1643},\n- {\"de cv\", 1, {DICTIONARY_PLACE_NAME}, 1631},\n- {\"plzta\", 1, {DICTIONARY_STREET_TYPE}, 1791},\n+ {\"mansi\u00f3n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"reina\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"my\", 1, {DICTIONARY_SYNONYM}, 1850},\n- {\"partida\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"cll priv\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"brzal\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n {\"distrito\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 1700},\n- {\"tcnl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n- {\"cjon\", 1, {DICTIONARY_STREET_TYPE}, 1744},\n+ {\"barrio\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n+ {\"secreto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n+ {\"s cra\", 1, {DICTIONARY_COMPANY_TYPE}, 1430},\n+ {\"floristeria\", 1, {DICTIONARY_PLACE_NAME}, 1649},\n {\"gran v\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"capitan\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n- {\"campg\", 1, {DICTIONARY_STREET_TYPE}, 1754},\n+ {\"cptn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n+ {\"occidental\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"febr\", 1, {DICTIONARY_SYNONYM}, 1841},\n {\"cabo segundo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"nvre\", 1, {DICTIONARY_SYNONYM}, 1855},\n+ {\"area recreacional\", 1, {DICTIONARY_PLACE_NAME}, 1594},\n {\"portal\", 1, {DICTIONARY_UNIT}, -1},\n- {\"rvdma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1554},\n+ {\"alts\", 1, {DICTIONARY_SYNONYM}, 1827},\n {\"cama y desayuno\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"no\", 1, {DICTIONARY_UNIT}, 1893},\n+ {\"ct\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n {\"ingeniera\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"pasadizo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"carra\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n- {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 1455},\n- {\"estanc\", 1, {DICTIONARY_UNIT}, 1885},\n+ {\"gonzalez\", 1, {DICTIONARY_SURNAME}, 1821},\n+ {\"numr\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"cia s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n+ {\"p.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 1547},\n {\"enfermera\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"n\u00fam\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"emp\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n+ {\"nordeste\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n {\"aseos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"soldado\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"glorieta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c p\", 1, {DICTIONARY_PERSONAL_TITLE}, 1479},\n- {\"cr\", 1, {DICTIONARY_STREET_TYPE}, 1757},\n- {\"c v\", 1, {DICTIONARY_STREET_TYPE}, 1752},\n- {\"9bre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"poligono\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1717},\n- {\"cto deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n- {\"gob\", 1, {DICTIONARY_SYNONYM}, 1838},\n+ {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1490},\n+ {\"vde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1586},\n+ {\"vecin\", 1, {DICTIONARY_UNIT}, 1904},\n+ {\"pob\", 1, {DICTIONARY_UNIT}, 1797},\n+ {\"pros\", 1, {DICTIONARY_SYNONYM}, 1862},\n+ {\"gnal\", 1, {DICTIONARY_PERSONAL_TITLE}, 1517},\n+ {\"cto de salud\", 1, {DICTIONARY_PLACE_NAME}, 1617},\n+ {\"rio\", 1, {DICTIONARY_SYNONYM}, 1869},\n+ {\"pbla\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1688},\n {\"juez\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s l n e\", 1, {DICTIONARY_COMPANY_TYPE}, 1440},\n+ {\"serma\", 1, {DICTIONARY_PERSONAL_TITLE}, 1577},\n+ {\"c.h\", 1, {DICTIONARY_STREET_TYPE}, 1754},\n {\"reyes\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"mnte\", 1, {DICTIONARY_SYNONYM}, 1856},\n+ {\"panaderia\", 1, {DICTIONARY_PLACE_NAME}, 1677},\n+ {\"igl\", 1, {DICTIONARY_PLACE_NAME}, 1657},\n+ {\"cll\", 1, {DICTIONARY_STREET_TYPE}, 1746},\n {\"costanilla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"srta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1576},\n {\"espalda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jards\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1657},\n- {\"hosp\", 1, {DICTIONARY_PLACE_NAME}, 1652},\n {\"iglesia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"izda\", 1, {DICTIONARY_UNIT}, 1889},\n- {\"praje\", 1, {DICTIONARY_STREET_TYPE}, 1780},\n- {\"alfz\", 1, {DICTIONARY_PERSONAL_TITLE}, 1469},\n- {\"sociedad anonima laboral\", 1, {DICTIONARY_COMPANY_TYPE}, 1421},\n- {\"allende\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"bco\", 1, {DICTIONARY_COMPANY_TYPE}, 1400},\n- {\"numro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"sarg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1560},\n+ {\"almacen general\", 1, {DICTIONARY_PLACE_NAME}, 1589},\n+ {\"cmte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1490},\n+ {\"dna\", 1, {DICTIONARY_PERSONAL_TITLE}, 1506},\n+ {\"pa\", 1, {DICTIONARY_STOPWORD}, 1729},\n+ {\"pque\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1679},\n+ {\"alf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1473},\n {\"via\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 1546},\n- {\"pol.ind\", 1, {DICTIONARY_QUALIFIER}, 1719},\n- {\"brg gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"escal\", 1, {DICTIONARY_UNIT}, 1884},\n- {\"blque\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1710},\n- {\"arquitecto\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"trvsia\", 1, {DICTIONARY_STREET_TYPE}, 1809},\n+ {\"joyeria\", 1, {DICTIONARY_PLACE_NAME}, 1662},\n+ {\"bda\", 1, {DICTIONARY_STREET_TYPE}, 1740},\n+ {\"presida\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n+ {\"s.a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n+ {\"abga\", 1, {DICTIONARY_PERSONAL_TITLE}, 1467},\n+ {\"izquierda\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"s g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1568},\n {\"capit\u00e1n\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n- {\"octubre\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"n\u00facleo\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"cap fed\", 1, {DICTIONARY_SYNONYM}, 1833},\n+ {\"s.g.r\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n {\"enero\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"nro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"cto comun\", 1, {DICTIONARY_PLACE_NAME}, 1611},\n- {\"bulev\", 1, {DICTIONARY_STREET_TYPE}, 1741},\n- {\"g\", 1, {DICTIONARY_STREET_TYPE}, 1773},\n- {\"agrim\", 1, {DICTIONARY_PERSONAL_TITLE}, 1467},\n- {\"7.re\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"mansion\", 1, {DICTIONARY_PLACE_NAME}, 1663},\n+ {\"rin\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n+ {\"#\", 1, {DICTIONARY_UNIT}, 1897},\n+ {\"s.l.n.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1444},\n+ {\"sargento segundo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s a b\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n+ {\"mstro\", 1, {DICTIONARY_PERSONAL_TITLE}, 1534},\n+ {\"sociedad anonima espanola\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n+ {\"set.bre\", 1, {DICTIONARY_SYNONYM}, 1870},\n+ {\"brios\", 1, {DICTIONARY_QUALIFIER}, 1713},\n+ {\"vecindario\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"policia\", 1, {DICTIONARY_PLACE_NAME}, 1686},\n {\"apartado\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"not\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n- {\"ctro.com\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"zna\", 1, {DICTIONARY_QUALIFIER}, 1724},\n- {\"febr\", 1, {DICTIONARY_SYNONYM}, 1837},\n- {\"sargto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1560},\n+ {\"brig genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"pnte\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1690},\n+ {\"s a de c v\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n+ {\"s.a.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n+ {\"trvsal\", 1, {DICTIONARY_STREET_TYPE}, 1811},\n+ {\"disem\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1636},\n+ {\"e u\", 1, {DICTIONARY_COMPANY_TYPE}, 1413},\n {\"plazoleta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jul\", 1, {DICTIONARY_SYNONYM}, 1844},\n {\"escuela\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rodr\u00edguez\", 1, {DICTIONARY_SURNAME}, -1},\n {\"barranco\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"republica\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"avd\", 1, {DICTIONARY_STREET_TYPE}, 1734},\n- {\"prtal\", 1, {DICTIONARY_UNIT}, 1895},\n+ {\"nov.e\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"supermercado\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"galeria\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1651},\n {\"angosta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1486},\n- {\"s.a.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1418},\n- {\"c p\", 1, {DICTIONARY_SYNONYM}, 1832},\n- {\"baron\", 1, {DICTIONARY_PERSONAL_TITLE}, 1475},\n- {\"crro\", 1, {DICTIONARY_SYNONYM}, 1831},\n- {\"pdte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1546},\n+ {\"& cia s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n {\"hermanas\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"diag\", 1, {DICTIONARY_STREET_TYPE}, 1768},\n- {\"cmt\", 1, {DICTIONARY_STREET_TYPE}, 1753},\n- {\"jdins\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1657},\n- {\"s n\", 1, {DICTIONARY_NO_ADDRESS}, 1460},\n- {\"cm\", 1, {DICTIONARY_STREET_TYPE}, 1749},\n+ {\"pol\u00edg res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"cjto\", 1, {DICTIONARY_UNIT}, 1878},\n+ {\"jards\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1661},\n {\"banda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s a f i\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n+ {\"jun\", 1, {DICTIONARY_SYNONYM}, 1847},\n {\"aeropuerto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sermo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n {\"mayor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"may\", 1, {DICTIONARY_PERSONAL_TITLE}, 1534},\n- {\"aa ee\", 1, {DICTIONARY_PLACE_NAME}, 1595},\n- {\"rvdmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 1555},\n+ {\"cto cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"pgres\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1722},\n+ {\"alqueria\", 1, {DICTIONARY_STREET_TYPE}, 1732},\n+ {\"is\", 1, {DICTIONARY_QUALIFIER}, 1719},\n {\"iglesias\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dip\", 1, {DICTIONARY_PERSONAL_TITLE}, 1496},\n- {\"mans\", 1, {DICTIONARY_UNIT}, 1890},\n- {\"cmte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1486},\n- {\"srra\", 1, {DICTIONARY_SYNONYM}, 1867},\n- {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n- {\"sedra\", 1, {DICTIONARY_STREET_TYPE}, 1803},\n+ {\"sarg ay\", 1, {DICTIONARY_PERSONAL_TITLE}, 1565},\n+ {\"rvd\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1557},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 1453},\n+ {\"comte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1490},\n {\"refugio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"franc\", 1, {DICTIONARY_GIVEN_NAME}, 1458},\n- {\"cantr\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1605},\n- {\"parq\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1675},\n+ {\"cpos\", 1, {DICTIONARY_SYNONYM}, 1831},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"aparcamiento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1435},\n- {\"adm.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 1465},\n- {\"canti\", 1, {DICTIONARY_PLACE_NAME}, 1606},\n- {\"estacion\", 1, {DICTIONARY_PLACE_NAME}, 1637},\n+ {\"copisteria\", 1, {DICTIONARY_PLACE_NAME}, 1630},\n+ {\"resid\", 1, {DICTIONARY_UNIT}, 1903},\n+ {\"pta\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1691},\n+ {\"vd\", 1, {DICTIONARY_STREET_TYPE}, 1815},\n {\"voluntarios\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n- {\"c t\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n- {\"nucleo\", 1, {DICTIONARY_UNIT}, 1892},\n+ {\"vvdas\", 1, {DICTIONARY_BUILDING_TYPE}, 1401},\n+ {\"rncon\", 1, {DICTIONARY_STREET_TYPE}, 1802},\n+ {\"ctn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1487},\n {\"des\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"barcelona\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"papeleria\", 1, {DICTIONARY_PLACE_NAME}, 1674},\n {\"gobierno\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"prtco\", 1, {DICTIONARY_UNIT}, 1896},\n- {\"s.g.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1564},\n- {\"centro.cial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"num.ro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"cooperativa\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"cxa\", 1, {DICTIONARY_COMPANY_TYPE}, 1409},\n+ {\"lico\", 1, {DICTIONARY_PERSONAL_TITLE}, 1395},\n+ {\"sgr\", 1, {DICTIONARY_COMPANY_TYPE}, 1434},\n+ {\"sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1574},\n+ {\"vsta\", 1, {DICTIONARY_STREET_TYPE}, 1817},\n+ {\"mte\", 1, {DICTIONARY_SYNONYM}, 1856},\n+ {\"bulev\", 1, {DICTIONARY_STREET_TYPE}, 1745},\n+ {\"ciudad\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"area de juegos\", 1, {DICTIONARY_PLACE_NAME}, 1592},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"pub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"corral\", 1, {DICTIONARY_UNIT}, -1},\n- {\"dp\", 1, {DICTIONARY_SYNONYM}, 1834},\n- {\"football club\", 1, {DICTIONARY_COMPANY_TYPE}, 1410},\n {\"edificio\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"sociedad anonima inscrita de capital abierto\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n {\"oriente\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 1447},\n- {\"pqe\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1675},\n- {\"s.l.u\", 1, {DICTIONARY_COMPANY_TYPE}, 1441},\n+ {\"tras\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 1812},\n+ {\"brg genl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"send\", 1, {DICTIONARY_STREET_TYPE}, 1808},\n+ {\"auto\", 1, {DICTIONARY_STREET_TYPE}, 1736},\n+ {\"pta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n {\"sur\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"10bre\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"pg ind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 1741},\n+ {\"cint\", 1, {DICTIONARY_STREET_TYPE}, 1766},\n {\"ronda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 1483},\n {\"del\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"fdez\", 1, {DICTIONARY_SURNAME}, 1814},\n- {\"carniceria\", 1, {DICTIONARY_PLACE_NAME}, 1607},\n- {\"e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n+ {\"vinedo\", 1, {DICTIONARY_PLACE_NAME}, 1707},\n+ {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n {\"diagonal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pol\", 1, {DICTIONARY_QUALIFIER}, 1717},\n- {\"c.t\", 1, {DICTIONARY_PERSONAL_TITLE}, 1481},\n+ {\"bqllo\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n+ {\"asociacion civil\", 1, {DICTIONARY_COMPANY_TYPE}, 1403},\n {\"secci\u00f3n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"trval\", 1, {DICTIONARY_STREET_TYPE}, 1807},\n- {\"& sucesores\", 1, {DICTIONARY_COMPANY_TYPE}, 1446},\n+ {\"profr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1554},\n+ {\"prtl\", 1, {DICTIONARY_UNIT}, 1899},\n {\"sin numero\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n- {\"p.dre\", 1, {DICTIONARY_PERSONAL_TITLE}, 1543},\n- {\"rep\", 1, {DICTIONARY_SYNONYM}, 1862},\n- {\"nov.e\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"bg gn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"brig\", 1, {DICTIONARY_SYNONYM}, 1825},\n- {\"gdme\", 1, {DICTIONARY_PERSONAL_TITLE}, 1512},\n- {\"brg general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"nov.bre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"cementerio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hna\", 1, {DICTIONARY_PERSONAL_TITLE}, 1516},\n- {\"carr\", 1, {DICTIONARY_STREET_TYPE}, 1756},\n+ {\"comida rapida\", 1, {DICTIONARY_PLACE_NAME}, 1626},\n+ {\"u.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 1447},\n+ {\"s.a.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n+ {\"clinica\", 1, {DICTIONARY_PLACE_NAME}, 1622},\n+ {\"abg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1468},\n+ {\"fco\", 1, {DICTIONARY_GIVEN_NAME}, 1461},\n+ {\"sa de cv\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n+ {\"8.bre\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"my gral\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n+ {\"mar\", 1, {DICTIONARY_SYNONYM}, 1853},\n {\"locutor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"crtjo\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 1629},\n- {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 1450},\n- {\"clg\", 1, {DICTIONARY_PERSONAL_TITLE}, 1485},\n- {\"ob\", 1, {DICTIONARY_PERSONAL_TITLE}, 1542},\n- {\"sepbre\", 1, {DICTIONARY_SYNONYM}, 1866},\n- {\"mt\", 1, {DICTIONARY_SYNONYM}, 1852},\n- {\"s c c l\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n- {\"mercado publico\", 1, {DICTIONARY_PLACE_NAME}, 1665},\n+ {\"edo\", 1, {DICTIONARY_QUALIFIER}, 1718},\n+ {\"hipodromo\", 1, {DICTIONARY_PLACE_NAME}, 1655},\n+ {\"ptilo\", 1, {DICTIONARY_UNIT}, 1901},\n+ {\"pgind\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1723},\n+ {\"aptos\", 1, {DICTIONARY_PLACE_NAME}, 1591},\n {\"correos\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 1480},\n- {\"fca\", 1, {DICTIONARY_PLACE_NAME}, 1641},\n- {\"fco\", 1, {DICTIONARY_GIVEN_NAME}, 1458},\n- {\"s.m\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n- {\"n\u00famro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"cde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1488},\n- {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1797},\n- {\"sociedad de capital e industria\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"goba\", 1, {DICTIONARY_PERSONAL_TITLE}, 1514},\n- {\"& cia s en c\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n- {\"vreda\", 1, {DICTIONARY_STREET_TYPE}, 1810},\n- {\"s.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1570},\n- {\"ntra sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1541},\n- {\"centro de salud\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"brig general\", 1, {DICTIONARY_PERSONAL_TITLE}, 1477},\n- {\"milr\", 1, {DICTIONARY_SYNONYM}, 1851},\n- {\"s.a.i.c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n- {\"fruteria\", 1, {DICTIONARY_PLACE_NAME}, 1646},\n- {\"cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1493},\n- {\"se\", 1, {DICTIONARY_COMPANY_TYPE}, 1432},\n- {\"banco\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"sdad\", 1, {DICTIONARY_COMPANY_TYPE}, 1415},\n+ {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 1488},\n+ {\"sociedad anonima de capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n+ {\"gob.no\", 1, {DICTIONARY_SYNONYM}, 1842},\n+ {\"ctro comunitaro\", 1, {DICTIONARY_PLACE_NAME}, 1615},\n+ {\"cto medico\", 1, {DICTIONARY_PLACE_NAME}, 1620},\n+ {\"tn col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1582},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 1562},\n+ {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 1428},\n+ {\"s l l\", 1, {DICTIONARY_COMPANY_TYPE}, 1443},\n+ {\"sociedad en comandita por acciones\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n+ {\"oct.e\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"laguna\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"hasta\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"rpla\", 1, {DICTIONARY_STREET_TYPE}, 1800},\n+ {\"pq\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1679},\n {\"prado\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"conde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"vlcn\", 1, {DICTIONARY_SYNONYM}, 1873},\n {\"palacios\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"novre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n+ {\"ag.to\", 1, {DICTIONARY_SYNONYM}, 1825},\n {\"real\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"s.g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1568},\n {\"don\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"caba\u00f1a\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 1425},\n- {\"compa\u00f1ia an\u00f3nima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ctro\", 1, {DICTIONARY_SYNONYM}, 1830},\n- {\"tn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1577},\n- {\"martinez\", 1, {DICTIONARY_SURNAME}, 1818},\n- {\"rvdo\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PERSONAL_TITLE}, 1553},\n- {\"safi\", 1, {DICTIONARY_COMPANY_TYPE}, 1419},\n- {\"bloq\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 1710},\n- {\"e p\", 1, {DICTIONARY_COMPANY_TYPE}, 1408},\n- {\"salon municipal\", 1, {DICTIONARY_PLACE_NAME}, 1694},\n- {\"alcde\", 1, {DICTIONARY_PERSONAL_TITLE}, 1468},\n- {\"n\u00fam.ro\", 1, {DICTIONARY_UNIT}, 1893},\n- {\"presa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n- {\"s c e l\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n+ {\"cto.cial\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"cto.com\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"mntes\", 1, {DICTIONARY_SYNONYM}, 1857},\n+ {\"pdta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1549},\n+ {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 1414},\n+ {\"pzta\", 1, {DICTIONARY_STREET_TYPE}, 1795},\n+ {\"c s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1484},\n+ {\"pto deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1693},\n+ {\"ns\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n+ {\"pabellon\", 1, {DICTIONARY_PLACE_NAME}, 1674},\n+ {\"sect.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 1571},\n+ {\"voluntos\", 1, {DICTIONARY_SYNONYM}, 1874},\n {\"directora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ctro deportivo\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"hnos\", 1, {DICTIONARY_PERSONAL_TITLE}, 1523},\n+ {\"s.a.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1417},\n {\"islas\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"m g\", 1, {DICTIONARY_PERSONAL_TITLE}, 1540},\n {\"independencia\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dic\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"quebrada\", 1, {DICTIONARY_UNIT}, -1},\n- {\"polig res\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1718},\n- {\"l\u00f3pez\", 1, {DICTIONARY_SURNAME}, -1},\n- {\"profesor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.a.i.c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1420},\n- {\"tn cnel\", 1, {DICTIONARY_PERSONAL_TITLE}, 1578},\n+ {\"sanat\", 1, {DICTIONARY_PLACE_NAME}, 1699},\n+ {\"mnts\", 1, {DICTIONARY_SYNONYM}, 1857},\n+ {\"partida\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"abd\", 1, {DICTIONARY_PERSONAL_TITLE}, 1466},\n+ {\"hdez\", 1, {DICTIONARY_SURNAME}, 1820},\n+ {\"ver\", 1, {DICTIONARY_STREET_TYPE}, 1814},\n {\"transversal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ldo\", 2, {DICTIONARY_ACADEMIC_DEGREE, DICTIONARY_PERSONAL_TITLE}, 1391},\n+ {\"dip\", 1, {DICTIONARY_PERSONAL_TITLE}, 1500},\n {\"rotonda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"izq\", 1, {DICTIONARY_UNIT}, 1889},\n- {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 1433},\n- {\"comisario de policia\", 1, {DICTIONARY_PLACE_NAME}, 1623},\n- {\"galeria\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1647},\n+ {\"portcio\", 1, {DICTIONARY_UNIT}, 1900},\n+ {\"infta\", 1, {DICTIONARY_PERSONAL_TITLE}, 1524},\n+ {\"n s\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n {\"punta\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"diac\", 1, {DICTIONARY_PERSONAL_TITLE}, 1494},\n- {\"cll\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n- {\"dice\", 1, {DICTIONARY_SYNONYM}, 1836},\n- {\"en\", 1, {DICTIONARY_SYNONYM}, 1835},\n+ {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 1614},\n+ {\"gale\", 1, {DICTIONARY_STREET_TYPE}, 1651},\n+ {\"urb\", 1, {DICTIONARY_QUALIFIER}, 1727},\n+ {\"granj\", 1, {DICTIONARY_PLACE_NAME}, 1652},\n {\"carril\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n- {\"golfito\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sgto\", 1, {DICTIONARY_PERSONAL_TITLE}, 1560},\n+ {\"admora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1470},\n {\"bulevar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"zona industrial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mt\", 1, {DICTIONARY_SYNONYM}, 1856},\n+ {\"cstan\", 1, {DICTIONARY_STREET_TYPE}, 1770},\n+ {\"y cia s c\", 1, {DICTIONARY_COMPANY_TYPE}, 1429},\n {\"nuestra se\u00f1ora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.a.p.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1422},\n {\"prolongaci\u00f3n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"arqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 1476},\n {\"jefe\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"& cia\", 1, {DICTIONARY_COMPANY_TYPE}, 1445},\n- {\"lic.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 1391},\n- {\"s.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1438},\n+ {\"alte\", 1, {DICTIONARY_PERSONAL_TITLE}, 1474},\n+ {\"pasteleria\", 1, {DICTIONARY_PLACE_NAME}, 1682},\n {\"jardines\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"nov.re\", 1, {DICTIONARY_SYNONYM}, 1859},\n {\"director\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"enf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1507},\n- {\"ca\", 1, {DICTIONARY_STREET_TYPE}, 1742},\n+ {\"isl\", 1, {DICTIONARY_QUALIFIER}, 1719},\n {\"comida r\u00e1pida\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"d f\", 1, {DICTIONARY_SYNONYM}, 1833},\n- {\"punto kilom\u00e9trico\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1569},\n+ {\"ctro juvenil\", 1, {DICTIONARY_PLACE_NAME}, 1619},\n+ {\"hda\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 1653},\n+ {\"s.a.i.c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1424},\n+ {\"banco\", 2, {DICTIONARY_COMPANY_TYPE, DICTIONARY_PLACE_NAME}, -1},\n {\"sociedad an\u00f3nima simplificada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"plza\", 1, {DICTIONARY_STREET_TYPE}, 1790},\n- {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 1702},\n- {\"en o\", 1, {DICTIONARY_SYNONYM}, 1835},\n- {\"cto comercial\", 1, {DICTIONARY_PLACE_NAME}, 1610},\n- {\"inf\", 1, {DICTIONARY_PERSONAL_TITLE}, 1521},\n- {\"p.i.\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 1719},\n- {\"alam\", 1, {DICTIONARY_STREET_TYPE}, 1727},\n- {\"principe\", 1, {DICTIONARY_PERSONAL_TITLE}, 1547},\n- {\"madd\", 1, {DICTIONARY_TOPONYM}, 1872},\n- {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 1688},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 1454},\n- {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 1493},\n- {\"9 bre\", 1, {DICTIONARY_SYNONYM}, 1855},\n- {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 1423},\n+ {\"octbre\", 1, {DICTIONARY_SYNONYM}, 1860},\n+ {\"rampa\", 1, {DICTIONARY_STREET_TYPE}, 1800},\n+ {\"merc\", 1, {DICTIONARY_PLACE_NAME}, 1668},\n+ {\"apdo\", 1, {DICTIONARY_POST_OFFICE}, 1710},\n+ {\"nuestra senora\", 1, {DICTIONARY_PERSONAL_TITLE}, 1545},\n+ {\"ffcc\", 1, {DICTIONARY_PLACE_NAME}, 1648},\n+ {\"quebrada\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"cmo\", 1, {DICTIONARY_STREET_TYPE}, 1753},\n+ {\"parque acuatico\", 1, {DICTIONARY_PLACE_NAME}, 1680},\n+ {\"pseo\", 1, {DICTIONARY_STREET_TYPE}, 1789},\n+ {\"dhsa\", 1, {DICTIONARY_PLACE_NAME}, 1634},\n {\"carretera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.w\", 1, {DICTIONARY_DIRECTIONAL}, 1456},\n+ {\"optica\", 1, {DICTIONARY_PLACE_NAME}, 1673},\n {\"un\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"rmtkpl\", 1, {DICTIONARY_PLACE_NAME}, 1935},\n+ {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 1933},\n+ {\"kk\", 1, {DICTIONARY_PLACE_NAME}, 1934},\n {\"farmaatsia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"komp\", 1, {DICTIONARY_COMPANY_TYPE}, 1904},\n- {\"tu\", 1, {DICTIONARY_COMPANY_TYPE}, 1909},\n+ {\"a \/ s\", 1, {DICTIONARY_COMPANY_TYPE}, 1907},\n+ {\"tln\", 1, {DICTIONARY_TOPONYM}, 1952},\n+ {\"\u00fchisfirma\", 1, {DICTIONARY_COMPANY_TYPE}, 1914},\n+ {\"\u00fch\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"louna\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1917},\n- {\"pohja\", 1, {DICTIONARY_DIRECTIONAL}, 1914},\n+ {\"sm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1930},\n+ {\"mk\", 1, {DICTIONARY_QUALIFIER}, 1943},\n+ {\"riiklik aktsiaselts\", 1, {DICTIONARY_COMPANY_TYPE}, 1912},\n+ {\"kol.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1923},\n {\"raamatukogu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jaoskond\", 1, {DICTIONARY_UNIT}, -1},\n- {\"t\u00e4is\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1909},\n- {\"org\", 1, {DICTIONARY_PLACE_NAME}, 1933},\n+ {\"ko\", 1, {DICTIONARY_COMPANY_TYPE}, 1908},\n {\"t\u00fc\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"v-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1927},\n- {\"harra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1916},\n- {\"farm\", 1, {DICTIONARY_PLACE_NAME}, 1928},\n- {\"kol ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1919},\n- {\"p\", 1, {DICTIONARY_DIRECTIONAL}, 1914},\n- {\"min\", 1, {DICTIONARY_PLACE_NAME}, 1931},\n+ {\"l\", 1, {DICTIONARY_DIRECTIONAL}, 1917},\n {\"teatriala\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kagu\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"n ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1921},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 1924},\n- {\"osk\", 1, {DICTIONARY_UNIT}, 1952},\n- {\"prl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1923},\n+ {\"obs\", 1, {DICTIONARY_PLACE_NAME}, 1936},\n+ {\"raj\", 1, {DICTIONARY_QUALIFIER}, 1945},\n {\"esplanaadi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nr\", 1, {DICTIONARY_UNIT}, 1951},\n {\"instituut\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"pargi\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"p\u00fchak\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"n.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1925},\n {\"kooli\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kol.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1919},\n+ {\"\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1915},\n {\"kirde\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"noorem leitnant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"tl\", 1, {DICTIONARY_BUILDING_TYPE}, 1902},\n {\"loe\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 1929},\n- {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1946},\n {\"number\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"k\", 1, {DICTIONARY_UNIT}, 1954},\n {\"ehitusala\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"rdtj\", 1, {DICTIONARY_STREET_TYPE}, 1945},\n+ {\"komp\", 1, {DICTIONARY_COMPANY_TYPE}, 1908},\n {\"raudteejaam\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ko\", 1, {DICTIONARY_COMPANY_TYPE}, 1904},\n+ {\"no\", 1, {DICTIONARY_UNIT}, 1955},\n {\"mt\u00fc\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"teatr\", 1, {DICTIONARY_PLACE_NAME}, 1936},\n+ {\"osk\", 1, {DICTIONARY_UNIT}, 1956},\n {\"vanem leitnant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pohja\", 1, {DICTIONARY_DIRECTIONAL}, 1918},\n {\"oblast\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"usaldusuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1916},\n {\"kolonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1922},\n- {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u00fch\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"l\", 1, {DICTIONARY_DIRECTIONAL}, 1913},\n- {\"v.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1927},\n+ {\"v-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1931},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1919},\n+ {\"louna\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"farm\", 1, {DICTIONARY_PLACE_NAME}, 1932},\n+ {\"akadeemia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p\", 1, {DICTIONARY_DIRECTIONAL}, 1918},\n+ {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1924},\n {\"maantee\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1921},\n- {\"raj\", 1, {DICTIONARY_QUALIFIER}, 1941},\n- {\"kol\", 1, {DICTIONARY_PERSONAL_TITLE}, 1918},\n- {\"rdt\", 1, {DICTIONARY_STREET_TYPE}, 1944},\n- {\"fsk\", 1, {DICTIONARY_UNIT}, 1949},\n- {\"t\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 1928},\n+ {\"tu\", 1, {DICTIONARY_COMPANY_TYPE}, 1913},\n+ {\"prl\", 1, {DICTIONARY_PERSONAL_TITLE}, 1927},\n+ {\"kol ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1923},\n+ {\"kula\", 1, {DICTIONARY_QUALIFIER}, 1942},\n+ {\"hr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1920},\n+ {\"korp\", 1, {DICTIONARY_COMPANY_TYPE}, 1909},\n+ {\"puhak\", 1, {DICTIONARY_PERSONAL_TITLE}, 1929},\n+ {\"rmtkpl\", 1, {DICTIONARY_PLACE_NAME}, 1939},\n+ {\"jaoskond\", 1, {DICTIONARY_UNIT}, -1},\n {\"doktor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"rajoon\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"usaldusuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1912},\n- {\"tln\", 1, {DICTIONARY_TOPONYM}, 1948},\n- {\"pst\", 1, {DICTIONARY_STREET_TYPE}, 1943},\n- {\"mittetulundusuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1906},\n+ {\"t\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"tn\", 1, {DICTIONARY_STREET_TYPE}, 1950},\n+ {\"nr\", 1, {DICTIONARY_UNIT}, 1955},\n+ {\"kub\", 1, {DICTIONARY_QUALIFIER}, 1941},\n+ {\"rdtj\", 1, {DICTIONARY_STREET_TYPE}, 1949},\n+ {\"uhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1915},\n {\"raamatukauplus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"osauhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1911},\n {\"o\u00fc\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"k\", 1, {DICTIONARY_UNIT}, 1950},\n+ {\"teatr\", 1, {DICTIONARY_PLACE_NAME}, 1940},\n {\"korporatsioon\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"obs\", 1, {DICTIONARY_PLACE_NAME}, 1932},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1915},\n+ {\"korteer\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"kol-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1923},\n+ {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1926},\n+ {\"t\", 1, {DICTIONARY_STREET_TYPE}, 1951},\n+ {\"#\", 1, {DICTIONARY_UNIT}, 1955},\n {\"talu\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"aktsiaselts\", 1, {DICTIONARY_COMPANY_TYPE}, 1903},\n- {\"kol-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1919},\n- {\"uu\", 1, {DICTIONARY_COMPANY_TYPE}, 1912},\n- {\"t\", 1, {DICTIONARY_STREET_TYPE}, 1947},\n+ {\"org\", 1, {DICTIONARY_PLACE_NAME}, 1937},\n {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"n-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1925},\n+ {\"taisuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1913},\n+ {\"mittetulundus\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1910},\n {\"kubermang\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"usaldus\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1912},\n- {\"osa\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1907},\n+ {\"v ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1931},\n+ {\"obl\", 1, {DICTIONARY_QUALIFIER}, 1944},\n {\"u\u00fc\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"puiestee\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tallinn\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"korp\", 1, {DICTIONARY_COMPANY_TYPE}, 1905},\n {\"kolonelleitnant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"puhak\", 1, {DICTIONARY_PERSONAL_TITLE}, 1925},\n- {\"uhisfirma\", 1, {DICTIONARY_COMPANY_TYPE}, 1910},\n+ {\"ou\", 1, {DICTIONARY_COMPANY_TYPE}, 1911},\n+ {\"ehit\", 1, {DICTIONARY_BUILDING_TYPE}, 1905},\n+ {\"v.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1931},\n+ {\"tanav\", 1, {DICTIONARY_STREET_TYPE}, 1950},\n {\"edelasse\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"kub\", 1, {DICTIONARY_QUALIFIER}, 1937},\n+ {\"pst\", 1, {DICTIONARY_STREET_TYPE}, 1947},\n+ {\"mittetulundusuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1910},\n {\"ministeerium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"t\u00e4nav\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"preili\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kula\", 1, {DICTIONARY_QUALIFIER}, 1938},\n- {\"uhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1911},\n+ {\"mnt\", 1, {DICTIONARY_STREET_TYPE}, 1946},\n {\"seltsimees\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"osauhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1907},\n- {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1920},\n {\"raudtee\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u00fchisfirma\", 1, {DICTIONARY_COMPANY_TYPE}, 1910},\n- {\"sm\", 1, {DICTIONARY_PERSONAL_TITLE}, 1926},\n+ {\"fsk\", 1, {DICTIONARY_UNIT}, 1953},\n {\"osakond\", 1, {DICTIONARY_UNIT}, -1},\n- {\"korteer\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"t\u00e4is\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1913},\n+ {\"mtu\", 1, {DICTIONARY_COMPANY_TYPE}, 1910},\n {\"p\u00f5hja\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"rdt\", 1, {DICTIONARY_STREET_TYPE}, 1948},\n {\"kompanii\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"vald\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"kk\", 1, {DICTIONARY_PLACE_NAME}, 1930},\n+ {\"harra\", 1, {DICTIONARY_PERSONAL_TITLE}, 1920},\n {\"k\u00fcla\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ehit\", 1, {DICTIONARY_BUILDING_TYPE}, 1901},\n+ {\"tallinn\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"organisatsioon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"uu\", 1, {DICTIONARY_COMPANY_TYPE}, 1916},\n {\"maja\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 1921},\n {\"professor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mittetulundus\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1906},\n- {\"mk\", 1, {DICTIONARY_QUALIFIER}, 1939},\n- {\"riiklik aktsiaselts\", 1, {DICTIONARY_COMPANY_TYPE}, 1908},\n+ {\"kol\", 1, {DICTIONARY_PERSONAL_TITLE}, 1922},\n {\"proua\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"obl\", 1, {DICTIONARY_QUALIFIER}, 1940},\n+ {\"usaldus\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1916},\n+ {\"osa\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1911},\n {\"ras\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"observatoorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"l\u00e4\u00e4s\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"hr\", 1, {DICTIONARY_PERSONAL_TITLE}, 1916},\n {\"as\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ou\", 1, {DICTIONARY_COMPANY_TYPE}, 1907},\n {\"kapteen\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"plats\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"a \/ s\", 1, {DICTIONARY_COMPANY_TYPE}, 1903},\n+ {\"min\", 1, {DICTIONARY_PLACE_NAME}, 1935},\n {\"keskkool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"tanav\", 1, {DICTIONARY_STREET_TYPE}, 1946},\n- {\"taisuhing\", 1, {DICTIONARY_COMPANY_TYPE}, 1909},\n+ {\"n ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1925},\n+ {\"uhisfirma\", 1, {DICTIONARY_COMPANY_TYPE}, 1914},\n+ {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"maakond\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"ida\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"v ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1927},\n- {\"mnt\", 1, {DICTIONARY_STREET_TYPE}, 1942},\n- {\"#\", 1, {DICTIONARY_UNIT}, 1951},\n {\"\u00fcf\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"n.-ltn\", 1, {DICTIONARY_PERSONAL_TITLE}, 1921},\n- {\"\u00fching\", 1, {DICTIONARY_COMPANY_TYPE}, 1911},\n- {\"akadeemia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"no\", 1, {DICTIONARY_UNIT}, 1951},\n- {\"mtu\", 1, {DICTIONARY_COMPANY_TYPE}, 1906},\n- {\"rmtk\", 1, {DICTIONARY_PLACE_NAME}, 1934},\n+ {\"rmtk\", 1, {DICTIONARY_PLACE_NAME}, 1938},\n+ {\"aktsiaselts\", 1, {DICTIONARY_COMPANY_TYPE}, 1907},\n+ {\"tl\", 1, {DICTIONARY_BUILDING_TYPE}, 1906},\n {\"tee\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"h\u00e4rra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ibilbidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"izozkiak\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"antzokia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"super merkatu\", 1, {DICTIONARY_PLACE_NAME}, 1962},\n {\"auto garbiketa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"postetxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"pasealekua\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"diskoteka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"autobus geltoki\", 1, {DICTIONARY_PLACE_NAME}, 1953},\n {\"errauste labe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kasino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"udaletxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -69982,6 +69994,7 @@\n {\"birziklatze gune\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ezkerkada\", 1, {DICTIONARY_UNIT}, -1},\n {\"eskolaurre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"disko\", 1, {DICTIONARY_PLACE_NAME}, 1959},\n {\"polizia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"denda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -69995,18 +70008,14 @@\n {\"gimnasioa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dentista\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"err\", 1, {DICTIONARY_STREET_TYPE}, 1959},\n- {\"diru truke bulegoa\", 1, {DICTIONARY_PLACE_NAME}, 1954},\n- {\"gau klub\", 1, {DICTIONARY_PLACE_NAME}, 1956},\n {\"janari azkarra\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"gau-klub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"iturri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"banku\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"super merkatu\", 1, {DICTIONARY_PLACE_NAME}, 1958},\n+ {\"dirutruke bulegoa\", 1, {DICTIONARY_PLACE_NAME}, 1958},\n {\"bulego\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"enbaxada\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gauklub\", 1, {DICTIONARY_PLACE_NAME}, 1956},\n {\"etorbidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"plaza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"espetxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -70019,38 +70028,41 @@\n {\"eliza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"hiribidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"farmazia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"disko\", 1, {DICTIONARY_PLACE_NAME}, 1955},\n {\"aireportu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"supermerkatu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"unibertsitate\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ibilgailu alokairu\", 1, {DICTIONARY_PLACE_NAME}, 1957},\n- {\"dirutruke bulegoa\", 1, {DICTIONARY_PLACE_NAME}, 1954},\n {\"klinika\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"errepidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"k\", 1, {DICTIONARY_STREET_TYPE}, 1965},\n {\"txirrindu alokairua\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"diru truke bulegoa\", 1, {DICTIONARY_PLACE_NAME}, 1958},\n+ {\"gau klub\", 1, {DICTIONARY_PLACE_NAME}, 1960},\n {\"auzoa\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"jatetxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"etorb\", 1, {DICTIONARY_STREET_TYPE}, 1964},\n {\"bidexka\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"entzunareto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"err\", 1, {DICTIONARY_STREET_TYPE}, 1963},\n {\"autobus-geltoki\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"diru-truke bulegoa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"taberna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"suhiltzaileak\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"medikuak\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gauklub\", 1, {DICTIONARY_PLACE_NAME}, 1960},\n {\"kafetegi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"autobidea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ibilgailu alokairu\", 1, {DICTIONARY_PLACE_NAME}, 1961},\n {\"epaitegia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kalea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"hilerri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dorre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"liburutegia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"k\", 1, {DICTIONARY_STREET_TYPE}, 1961},\n {\"parke\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"merkatu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"etorb\", 1, {DICTIONARY_STREET_TYPE}, 1960},\n {\"putetxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ikastetxe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ospitalea\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"autobus geltoki\", 1, {DICTIONARY_PLACE_NAME}, 1957},\n {\"korridorea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"zinema\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"karrika\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -70075,1481 +70087,1482 @@\n {\"\u062e\u06cc\u0627\u0628\u0627\u0646\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0627\u0645\u0627\u0645\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u06a9\u0648\u06cc\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vlae\", 1, {DICTIONARY_STREET_TYPE}, 1981},\n {\"polku\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"p\", 1, {DICTIONARY_STREET_TYPE}, 1968},\n- {\"auk\", 1, {DICTIONARY_STREET_TYPE}, 1963},\n- {\"k.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1965},\n- {\"tvl\", 1, {DICTIONARY_STREET_TYPE}, 1974},\n- {\"vl\u00e4\", 1, {DICTIONARY_STREET_TYPE}, 1977},\n- {\"k\", 1, {DICTIONARY_STREET_TYPE}, 1965},\n- {\"auk.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1963},\n- {\"as\", 1, {DICTIONARY_UNIT}, 1979},\n+ {\"tvl\", 1, {DICTIONARY_STREET_TYPE}, 1978},\n+ {\"palveluta\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"t\", 1, {DICTIONARY_STREET_TYPE}, 1979},\n+ {\"r.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1975},\n+ {\"bst\", 1, {DICTIONARY_UNIT}, 1984},\n {\"bulevard\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"raitti\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"v\u00e4yl\u00e4\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"auk\", 1, {DICTIONARY_STREET_TYPE}, 1967},\n+ {\"k.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1969},\n {\"talo\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"puistotie\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"pko.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1973},\n+ {\"vl\u00e4\", 1, {DICTIONARY_STREET_TYPE}, 1981},\n {\"ranta\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"kj\", 1, {DICTIONARY_STREET_TYPE}, 1966},\n- {\"pgr\", 1, {DICTIONARY_STREET_TYPE}, 1967},\n+ {\"as\", 1, {DICTIONARY_UNIT}, 1983},\n+ {\"kri.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1968},\n+ {\"vlae.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1981},\n {\"porras\", 1, {DICTIONARY_UNIT}, -1},\n- {\"tori\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"kl\", 1, {DICTIONARY_SYNONYM}, 1978},\n- {\"aukio\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"pko.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1969},\n- {\"pko\", 1, {DICTIONARY_STREET_TYPE}, 1969},\n+ {\"rt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1976},\n+ {\"asunto\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"tr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1980},\n {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"tie\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"asunto\", 1, {DICTIONARY_UNIT}, -1},\n- {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1972},\n+ {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1974},\n+ {\"kri\", 1, {DICTIONARY_STREET_TYPE}, 1968},\n+ {\"al.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1966},\n+ {\"kl\", 1, {DICTIONARY_SYNONYM}, 1982},\n {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1976},\n- {\"ps\", 1, {DICTIONARY_STREET_TYPE}, 1970},\n+ {\"vaeylae\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 1981},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 1966},\n {\"alue\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"al.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1962},\n- {\"r\", 1, {DICTIONARY_STREET_TYPE}, 1971},\n- {\"kri\", 1, {DICTIONARY_STREET_TYPE}, 1964},\n- {\"kerostallo\", 1, {DICTIONARY_UNIT}, -1},\n- {\"kri.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1964},\n {\"puisto\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"r\", 1, {DICTIONARY_STREET_TYPE}, 1975},\n+ {\"tr\", 1, {DICTIONARY_STREET_TYPE}, 1980},\n+ {\"tori\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"taival\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"vl\u00e4.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1981},\n {\"koti\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"t\", 1, {DICTIONARY_STREET_TYPE}, 1975},\n- {\"kj.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1966},\n- {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 1973},\n- {\"p.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1968},\n+ {\"kyl\u00e4\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"aukio\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"k\", 1, {DICTIONARY_STREET_TYPE}, 1969},\n {\"bulevardi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"esplanadi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"puistikko\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"t.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1975},\n {\"t\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"kj.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1970},\n {\"kuja\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"rt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1972},\n- {\"vlae\", 1, {DICTIONARY_STREET_TYPE}, 1977},\n+ {\"p.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1972},\n+ {\"p\", 1, {DICTIONARY_STREET_TYPE}, 1972},\n+ {\"tvl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1978},\n+ {\"kj\", 1, {DICTIONARY_STREET_TYPE}, 1970},\n+ {\"pgr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1971},\n+ {\"kaari\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"huvila\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 1977},\n+ {\"rinne\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"rn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1977},\n+ {\"kerostallo\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"pko\", 1, {DICTIONARY_STREET_TYPE}, 1973},\n+ {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 1976},\n+ {\"t.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1979},\n {\"bostad\", 1, {DICTIONARY_UNIT}, -1},\n- {\"kaari\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vlae.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1977},\n- {\"huvila\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 1962},\n- {\"rinne\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vaeylae\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 1977},\n- {\"vl\u00e4.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1977},\n- {\"ps.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1970},\n- {\"tr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1976},\n- {\"tvl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1974},\n- {\"rn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1973},\n- {\"kyl\u00e4\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bst\", 1, {DICTIONARY_UNIT}, 1980},\n+ {\"ps.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1974},\n+ {\"pgr\", 1, {DICTIONARY_STREET_TYPE}, 1971},\n {\"katu\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"palveluta\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"puistotie\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"penger\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"r.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1971},\n- {\"pgr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1967},\n {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"auk.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 1967},\n {\"daan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kalye\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"lansangan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"soci\u00e9te a responsabilit\u00e9 limit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"am\", 1, {DICTIONARY_PERSONAL_TITLE}, 2029},\n {\"ponts\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"scs\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n- {\"societe privee a responsabilite limitee unipersonnelle\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"chs v\", 1, {DICTIONARY_STREET_TYPE}, 2207},\n+ {\"ld\", 1, {DICTIONARY_QUALIFIER}, 2166},\n+ {\"grdr\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"soci\u00e9te d' investissement a capital fix\u00e9\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n {\"groups\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"gdens\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n {\"cercle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p a\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n- {\"creme glacee\", 1, {DICTIONARY_PLACE_NAME}, 2093},\n+ {\"con\", 1, {DICTIONARY_QUALIFIER}, 2158},\n+ {\"mb\", 1, {DICTIONARY_TOPONYM}, 2335},\n {\"comte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"vallee\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n+ {\"presquile\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n {\"bureau de change\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"societe cooperative de production\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n {\"terrasses\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vche\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n- {\"chp\", 1, {DICTIONARY_PLACE_NAME}, 2087},\n- {\"s.a.r\", 1, {DICTIONARY_PERSONAL_TITLE}, 2066},\n- {\"vte\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"z u p\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 2031},\n+ {\"pt route\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n+ {\"za\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n {\"son excellence\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"\u00e9gl\", 1, {DICTIONARY_PLACE_NAME}, 2096},\n- {\"p a\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n- {\"rles\", 1, {DICTIONARY_STREET_TYPE}, 2294},\n- {\"viceamiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 2071},\n- {\"s c r i\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n+ {\"eurl\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n+ {\"v rte\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n+ {\"s.a.o.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n+ {\"z.i.\", 1, {DICTIONARY_PLACE_NAME}, 2153},\n+ {\"p rte\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n {\"\u00eele\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"hch\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n- {\"cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 2032},\n- {\"cale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"g en\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n- {\"porqs\", 1, {DICTIONARY_STREET_TYPE}, 2274},\n- {\"territoires du nord ouest\", 1, {DICTIONARY_TOPONYM}, 2335},\n- {\"enclos\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n- {\"m.f.\", 1, {DICTIONARY_PLACE_NAME}, 2115},\n- {\"mlns\", 1, {DICTIONARY_PLACE_NAME}, 2124},\n- {\"ple\", 1, {DICTIONARY_STREET_TYPE}, 2254},\n- {\"grd bde\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n+ {\"maison de retraite\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"cares\", 1, {DICTIONARY_STREET_TYPE}, 2196},\n+ {\"z a d\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n+ {\"ab\", 1, {DICTIONARY_TOPONYM}, 2333},\n+ {\"quai\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pltx\", 1, {DICTIONARY_STREET_TYPE}, 2275},\n+ {\"grd rs\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"gr en\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"e.u.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n+ {\"mte\", 1, {DICTIONARY_STREET_TYPE}, 2249},\n+ {\"mm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2057},\n+ {\"lt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2044},\n {\"dentiste\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ile du prince edouard\", 1, {DICTIONARY_TOPONYM}, 2338},\n+ {\"bulle a verre\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n+ {\"imm\", 1, {DICTIONARY_BUILDING_TYPE}, 1986},\n+ {\"ei\", 1, {DICTIONARY_COMPANY_TYPE}, 1989},\n+ {\"mars\", 1, {DICTIONARY_PLACE_NAME}, 2123},\n+ {\"beguinages\", 1, {DICTIONARY_PLACE_NAME}, 2082},\n+ {\"ven\", 1, {DICTIONARY_STREET_TYPE}, 2316},\n {\"capitaine\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"plat\", 1, {DICTIONARY_STREET_TYPE}, 2270},\n- {\"gd boul\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"c\u00f4te\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sem\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n+ {\"r p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2063},\n+ {\"f.c.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 1991},\n+ {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n {\"villa\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"r.n.\", 1, {DICTIONARY_STREET_TYPE}, 2291},\n- {\"ri\", 1, {DICTIONARY_COMPANY_TYPE}, 1994},\n- {\"societe en participation\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n- {\"s a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n- {\"crs\", 1, {DICTIONARY_STREET_TYPE}, 2208},\n- {\"a cote de\", 1, {DICTIONARY_STOPWORD}, 2168},\n+ {\"auto-ecole\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n+ {\"ptr\", 1, {DICTIONARY_STREET_TYPE}, 2267},\n+ {\"r.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n {\"voie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dig\", 1, {DICTIONARY_STREET_TYPE}, 2213},\n {\"orient\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"g bld\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n- {\"s e p\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n- {\"hlm\", 1, {DICTIONARY_PLACE_NAME}, 2104},\n- {\"g bd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"commandant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"ch v\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n+ {\"portq\", 1, {DICTIONARY_STREET_TYPE}, 2277},\n+ {\"bde\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"etablissement denseignement superieur\", 1, {DICTIONARY_PLACE_NAME}, 2101},\n+ {\"ctr cial\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"carrieres\", 1, {DICTIONARY_STREET_TYPE}, 2196},\n+ {\"chem\", 1, {DICTIONARY_STREET_TYPE}, 2205},\n+ {\"capte\", 1, {DICTIONARY_PERSONAL_TITLE}, 2034},\n+ {\"rpj\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n+ {\"cr\u00e8me glac\u00e9e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p allees\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n {\"palais\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grand'rue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n- {\"souslieutenant\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n- {\"z.a.\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n+ {\"g r\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"jrd\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2115},\n+ {\"chees\", 1, {DICTIONARY_STREET_TYPE}, 2202},\n+ {\"jards\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2117},\n {\"petite rue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"berges\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"arts\", 1, {DICTIONARY_STREET_TYPE}, 2173},\n- {\"h.l.m\", 1, {DICTIONARY_PLACE_NAME}, 2104},\n- {\"a\", 1, {DICTIONARY_STOPWORD}, 2167},\n- {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"begi\", 1, {DICTIONARY_PLACE_NAME}, 2081},\n+ {\"societe en nom collectif\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"levee\", 1, {DICTIONARY_STREET_TYPE}, 2248},\n {\"parvis\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"marches\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n- {\"zad\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n- {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n- {\"b ch\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n- {\"zone d'amenagement differe\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n- {\"chee\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n+ {\"bld\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"bc\", 1, {DICTIONARY_TOPONYM}, 2334},\n {\"porte\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n- {\"fos\", 1, {DICTIONARY_STREET_TYPE}, 2224},\n- {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 2125},\n- {\"bibliotheque\", 1, {DICTIONARY_PLACE_NAME}, 2079},\n- {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 2174},\n- {\"asbl\", 1, {DICTIONARY_COMPANY_TYPE}, 1984},\n- {\"qua\", 1, {DICTIONARY_QUALIFIER}, 2165},\n- {\"sicav\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"e.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1985},\n+ {\"rpt\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n+ {\"carref\", 1, {DICTIONARY_STREET_TYPE}, 2194},\n+ {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n {\"b\u00e9guinages\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trpl\", 1, {DICTIONARY_STREET_TYPE}, 2306},\n- {\"p im\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n+ {\"faugrb\", 1, {DICTIONARY_QUALIFIER}, 2163},\n+ {\"s.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n+ {\"hles\", 1, {DICTIONARY_PLACE_NAME}, 2110},\n {\"terrasse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"soci\u00e9te anonyme omanaise generale\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n- {\"t pl\", 1, {DICTIONARY_STREET_TYPE}, 2306},\n- {\"aven\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n- {\"cpg\", 1, {DICTIONARY_PLACE_NAME}, 2083},\n- {\"reverende pere jesuit\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n- {\"cloi\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n- {\"s.e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n- {\"petite avenue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 2141},\n+ {\"s.p.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2020},\n+ {\"scrl\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"cit\u00e9s\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"remp\", 1, {DICTIONARY_STREET_TYPE}, 2287},\n+ {\"gd rues\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"auto\u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n+ {\"rondpoint\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n+ {\"sq\", 1, {DICTIONARY_STREET_TYPE}, 2306},\n+ {\"auto \u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n {\"bas chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"lev\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"rotonde\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ab\", 1, {DICTIONARY_TOPONYM}, 2329},\n- {\"grd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n- {\"s.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n- {\"p impasse\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n- {\"parking\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"\u00e9tablissement denseignement sup\u00e9rieur\", 1, {DICTIONARY_PLACE_NAME}, 2101},\n+ {\"s.i.c.a.v.\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n+ {\"pr\u00e9scolaire\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"leve\", 1, {DICTIONARY_STREET_TYPE}, 2248},\n+ {\"departement\", 1, {DICTIONARY_UNIT}, 2347},\n+ {\"gpt\", 1, {DICTIONARY_COMPANY_TYPE}, 1994},\n {\"\u00e9cluse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"veterinaire\", 1, {DICTIONARY_PLACE_NAME}, 2142},\n- {\"cntre\", 1, {DICTIONARY_DIRECTIONAL}, 2020},\n- {\"l-dit\", 1, {DICTIONARY_QUALIFIER}, 2162},\n- {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 2092},\n+ {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"gd r\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"gr bde\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"dortoir\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"boucle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"val\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n+ {\"societe privee a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2020},\n+ {\"lieu dit\", 1, {DICTIONARY_QUALIFIER}, 2166},\n {\"location de voitures\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lots\", 1, {DICTIONARY_QUALIFIER}, 2164},\n- {\"mtes\", 1, {DICTIONARY_STREET_TYPE}, 2246},\n- {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 2291},\n+ {\"vam\", 1, {DICTIONARY_PERSONAL_TITLE}, 2075},\n+ {\"prv\", 1, {DICTIONARY_STREET_TYPE}, 2254},\n+ {\"m.f\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n {\"police\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bulle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mlles\", 1, {DICTIONARY_PERSONAL_TITLE}, 2045},\n- {\"leve\", 1, {DICTIONARY_STREET_TYPE}, 2244},\n+ {\"s.a.i\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"p chemin\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n {\"petite impasse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gr bd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"z a c\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n {\"nord est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"s.p.r.l.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"degre\", 1, {DICTIONARY_STREET_TYPE}, 2213},\n {\"soci\u00e9te priv\u00e9e a responsabilit\u00e9 limit\u00e9e unipersonnelle\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"racc\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 2269},\n {\"avec\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"g i e\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n {\"auto-\u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sar\", 1, {DICTIONARY_PERSONAL_TITLE}, 2066},\n- {\"rtd\", 1, {DICTIONARY_STREET_TYPE}, 2288},\n- {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n- {\"s.i.c.a.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"s.a.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n- {\"s.o.\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n+ {\"tsses\", 1, {DICTIONARY_STREET_TYPE}, 2309},\n+ {\"g rs\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"anciennes routes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"aeroport\", 1, {DICTIONARY_PLACE_NAME}, 2077},\n+ {\"sal\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n+ {\"cav\", 1, {DICTIONARY_STREET_TYPE}, 2198},\n {\"t'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"ples\", 1, {DICTIONARY_STREET_TYPE}, 2255},\n- {\"terr\", 1, {DICTIONARY_STREET_TYPE}, 2303},\n+ {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"bers\", 1, {DICTIONARY_STREET_TYPE}, 2186},\n+ {\"societe anonyme omanaise close\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n {\"h\u00f4tel de ville\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"alberta\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"societe anonyme\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n- {\"pt ch\", 1, {DICTIONARY_STREET_TYPE}, 2258},\n {\"\u00e9cole de conduite\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"grim\", 1, {DICTIONARY_STREET_TYPE}, 2240},\n {\"nord ouest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"societe simple\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"z.a\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ecluses\", 1, {DICTIONARY_STREET_TYPE}, 2217},\n {\"anse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cit\u00e9s\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ft\", 1, {DICTIONARY_PLACE_NAME}, 2102},\n+ {\"soci\u00e9te d' \u00e9conomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"gare ferroviaire\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"passage a niveau\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n {\"carri\u00e8res\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"routes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grd blvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"e.u.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1986},\n- {\"centre de sante\", 1, {DICTIONARY_PLACE_NAME}, 2086},\n- {\"groupement dinteret economique\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n- {\"grandrue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"devant\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"v ch\", 1, {DICTIONARY_STREET_TYPE}, 2319},\n+ {\"v che\", 1, {DICTIONARY_STREET_TYPE}, 2319},\n+ {\"pt ae\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"societe d' investissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"coteau\", 1, {DICTIONARY_STREET_TYPE}, 2191},\n+ {\"peristyle\", 1, {DICTIONARY_PLACE_NAME}, 2136},\n+ {\"s.c.r.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"cercl\", 1, {DICTIONARY_STREET_TYPE}, 2199},\n+ {\"grd boul\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 2096},\n {\"grand\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"riv\", 1, {DICTIONARY_SYNONYM}, 2326},\n+ {\"z.a.c.\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"gr ens\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n {\"p\u00e8re\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.i.c.a.v\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"jtes\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n- {\"universit\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"zone damenagement concerte\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"rd pt\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n {\"soci\u00e9te anonyme omanaise close\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"vrt\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"c'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"montees\", 1, {DICTIONARY_STREET_TYPE}, 2246},\n- {\"allee\", 1, {DICTIONARY_STREET_TYPE}, 2169},\n- {\"z a\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n- {\"a.s.b.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1984},\n- {\"g bde\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"s.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n+ {\"universite\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n+ {\"soci\u00e9te d' investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n+ {\"carr\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n+ {\"cte\", 1, {DICTIONARY_PERSONAL_TITLE}, 2038},\n {\"vieux chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"prq\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n {\"docteurs\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"m f\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n+ {\"zi\", 1, {DICTIONARY_PLACE_NAME}, 2153},\n {\"route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grbd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"s.e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"ach\", 1, {DICTIONARY_STREET_TYPE}, 2175},\n+ {\"p\u00e9ri\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n+ {\"societe interne\", 1, {DICTIONARY_COMPANY_TYPE}, 2010},\n+ {\"bres\", 1, {DICTIONARY_STREET_TYPE}, 2183},\n {\"\u00e9glise\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"impasses\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.c.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"sen\", 1, {DICTIONARY_STREET_TYPE}, 2302},\n+ {\"hs chs\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n+ {\"gr blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"quai\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"g\", 1, {DICTIONARY_SYNONYM}, 2324},\n- {\"rmpe\", 1, {DICTIONARY_STREET_TYPE}, 2282},\n- {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"enclos\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"prison\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lve\", 1, {DICTIONARY_STREET_TYPE}, 2244},\n- {\"lieu-dit\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"metro\", 1, {DICTIONARY_STREET_TYPE}, 2251},\n {\"ch\u00e2teau\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n- {\"s a o c\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n- {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"enterprise unipersonnelle a responsabilit\u00e9 limit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"bstd\", 1, {DICTIONARY_PLACE_NAME}, 2075},\n+ {\"n'\", 1, {DICTIONARY_ELISION}, -1},\n+ {\"marche public\", 1, {DICTIONARY_PLACE_NAME}, 2122},\n {\"bo\u00eete de nuit\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.p.r.l.u\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"gd blvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"fondation d'utilite publique\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 2272},\n+ {\"societe d' economie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n+ {\"s.a.i.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"g bvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"che\", 1, {DICTIONARY_STREET_TYPE}, 2203},\n+ {\"b.p.\", 1, {DICTIONARY_POST_OFFICE}, 2155},\n {\"sentier\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grd bvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"esc\", 1, {DICTIONARY_UNIT}, 2348},\n {\"\u00e9tang\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.a.o.g\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n- {\"montagne\", 1, {DICTIONARY_PLACE_NAME}, 2122},\n- {\"r n\", 1, {DICTIONARY_STREET_TYPE}, 2291},\n+ {\"grdbd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"avnus\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"yt\", 1, {DICTIONARY_TOPONYM}, 2345},\n+ {\"gdch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n {\"soci\u00e9te en commandite par actions\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"grd ch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n {\"monseigneur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"chs\", 1, {DICTIONARY_STREET_TYPE}, 2201},\n {\"voies\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mar public\", 1, {DICTIONARY_PLACE_NAME}, 2118},\n- {\"peri\", 1, {DICTIONARY_STREET_TYPE}, 2257},\n- {\"rpj\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n- {\"maison de retraite\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"plags\", 1, {DICTIONARY_STREET_TYPE}, 2272},\n+ {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 2086},\n+ {\"rpe\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n+ {\"societe dinvestissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n {\"domaines\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"parcs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"s.c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n+ {\"avnu\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n+ {\"s a i\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"rtnde\", 1, {DICTIONARY_STREET_TYPE}, 2292},\n {\"carreau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"agglomerati\u00f3n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n- {\"s em\", 1, {DICTIONARY_PERSONAL_TITLE}, 2067},\n+ {\"blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"sprlu\", 1, {DICTIONARY_COMPANY_TYPE}, 2021},\n {\"j'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"faub\", 1, {DICTIONARY_QUALIFIER}, 2159},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 2057},\n {\"presqu\u2019\u00eele\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"vice amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gr chemin\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"avnues\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"sal\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n- {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2058},\n+ {\"pour\", 1, {DICTIONARY_STREET_TYPE}, 2279},\n+ {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n {\"yukon\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"etang\", 1, {DICTIONARY_PLACE_NAME}, 2098},\n+ {\"g blvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"societe a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n {\"plage\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"avenu\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n- {\"bcle\", 1, {DICTIONARY_STREET_TYPE}, 2183},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2025},\n- {\"p avn\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n- {\"s.c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n- {\"gr\", 1, {DICTIONARY_SYNONYM}, 2324},\n+ {\"r.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2063},\n+ {\"a s b l\", 1, {DICTIONARY_COMPANY_TYPE}, 1988},\n+ {\"colis\", 1, {DICTIONARY_SYNONYM}, 2325},\n+ {\"mln\", 1, {DICTIONARY_PLACE_NAME}, 2127},\n+ {\"s.c.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"pere\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n+ {\"pt im\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n {\"grand rues\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n- {\"pch\", 1, {DICTIONARY_UNIT}, 2346},\n- {\"gr rues\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"dom\", 1, {DICTIONARY_QUALIFIER}, 2157},\n+ {\"c'\", 1, {DICTIONARY_ELISION}, -1},\n+ {\"chev\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n+ {\"arts\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n+ {\"m\u00e9t\", 1, {DICTIONARY_STREET_TYPE}, 2251},\n+ {\"peripherique\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n {\"centre artistique\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u00e9cls\", 1, {DICTIONARY_STREET_TYPE}, 2217},\n- {\"v route\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"gpes\", 1, {DICTIONARY_COMPANY_TYPE}, 1992},\n- {\"maitres\", 1, {DICTIONARY_PERSONAL_TITLE}, 2047},\n- {\"grand rue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r\u00e9s\", 1, {DICTIONARY_UNIT}, 2347},\n- {\"tpl\", 1, {DICTIONARY_STREET_TYPE}, 2306},\n- {\"gd ch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n+ {\"car\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n+ {\"dsgs\", 1, {DICTIONARY_STREET_TYPE}, 2216},\n+ {\"pat\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n+ {\"gri\", 1, {DICTIONARY_STREET_TYPE}, 2239},\n+ {\"parcs\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"g ch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n {\"jet\u00e9es\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"au\", 1, {DICTIONARY_STREET_TYPE}, 2279},\n- {\"enterprise unipersonnelle a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 1986},\n- {\"z.a.\", 1, {DICTIONARY_PLACE_NAME}, 2144},\n- {\"v chemin\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n+ {\"alls\", 1, {DICTIONARY_STREET_TYPE}, 2174},\n+ {\"s coop\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n+ {\"prcs\", 1, {DICTIONARY_STREET_TYPE}, 2253},\n+ {\"gd bd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"gden\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2032},\n {\"sk\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"garn\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n {\"r\u00e9v\u00e9rend\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"rondpoint\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n- {\"gd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"hls\", 1, {DICTIONARY_PLACE_NAME}, 2110},\n+ {\"degs\", 1, {DICTIONARY_STREET_TYPE}, 2214},\n {\"les\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"grd bd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"voi\", 1, {DICTIONARY_STREET_TYPE}, 2316},\n+ {\"ches\", 1, {DICTIONARY_STREET_TYPE}, 2206},\n {\"b\u00e2timent de ferme\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"banque\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pnte\", 1, {DICTIONARY_STREET_TYPE}, 2272},\n- {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n- {\"sta\", 1, {DICTIONARY_PLACE_NAME}, 2138},\n+ {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n+ {\"theatre\", 1, {DICTIONARY_PLACE_NAME}, 2144},\n+ {\"gr bld\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"baston\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"imp\", 1, {DICTIONARY_STREET_TYPE}, 2244},\n+ {\"faub\", 1, {DICTIONARY_QUALIFIER}, 2163},\n+ {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 2299},\n {\"groupes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"saoc\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n+ {\"nu\", 1, {DICTIONARY_TOPONYM}, 2340},\n+ {\"cite\", 1, {DICTIONARY_QUALIFIER}, 2159},\n+ {\"zone damenagement differe\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n {\"caserne de pompiers\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nt\", 1, {DICTIONARY_TOPONYM}, 2335},\n- {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n- {\"en\", 1, {DICTIONARY_SYNONYM}, 2322},\n+ {\"societe cooperative a responsabilite illimitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"gs ens\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n+ {\"fos\", 1, {DICTIONARY_STREET_TYPE}, 2227},\n {\"soci\u00e9te simple\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"frm\", 1, {DICTIONARY_PLACE_NAME}, 2103},\n {\"champ\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.a.o.g.\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n- {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"zac\", 1, {DICTIONARY_PLACE_NAME}, 2146},\n- {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 2289},\n- {\"batiment\", 1, {DICTIONARY_BUILDING_TYPE}, 1981},\n- {\"ecls\", 1, {DICTIONARY_STREET_TYPE}, 2217},\n- {\"carref\", 1, {DICTIONARY_STREET_TYPE}, 2190},\n+ {\"s.c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"c\u00f4te\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"maison de sante\", 1, {DICTIONARY_PLACE_NAME}, 2118},\n+ {\"blvde\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n {\"terminal de ferry\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"iles\", 1, {DICTIONARY_QUALIFIER}, 2161},\n- {\"sep\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n- {\"s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n+ {\"porq\", 1, {DICTIONARY_STREET_TYPE}, 2277},\n {\"pont\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"immeuble\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"gd chemin\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"a.s.b.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1984},\n+ {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 2019},\n {\"chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"b\u00e9guinage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"stde\", 1, {DICTIONARY_PLACE_NAME}, 2141},\n {\"son altesse imp\u00e9riale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.a.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n- {\"grs ens\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n- {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n- {\"salle polyvalente\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 2053},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n+ {\"gd rue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"gds ens\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n {\"residences\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"digs\", 1, {DICTIONARY_STREET_TYPE}, 2214},\n+ {\"hchs\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n+ {\"egl\", 1, {DICTIONARY_PLACE_NAME}, 2100},\n {\"cav\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trn\", 1, {DICTIONARY_STREET_TYPE}, 2303},\n- {\"chaussee\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n- {\"s coop\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 2066},\n+ {\"abbaye\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"quebec\", 1, {DICTIONARY_TOPONYM}, 2343},\n+ {\"mnt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2126},\n {\"porche\", 1, {DICTIONARY_UNIT}, -1},\n- {\"e.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1985},\n- {\"societe anonyme omanaise close\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n+ {\"degres\", 1, {DICTIONARY_STREET_TYPE}, 2214},\n+ {\"cht\", 1, {DICTIONARY_STREET_TYPE}, 2092},\n+ {\"ples\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n+ {\"societe d' investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n {\"soci\u00e9te d'investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s a l\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n- {\"prc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2128},\n+ {\"agglomeration\", 1, {DICTIONARY_QUALIFIER}, 2156},\n {\"saint\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s c a\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n {\"bourg\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, -1},\n- {\"grd r\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n {\"camping\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rte\", 1, {DICTIONARY_STREET_TYPE}, 2289},\n- {\"petites allees\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n- {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 2175},\n- {\"p.n\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n- {\"gare\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sentiers\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pal de justice\", 1, {DICTIONARY_PLACE_NAME}, 2127},\n- {\"vroute\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n+ {\"val\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n {\"r\u00e9v\u00e9rend p\u00e8re\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"groupement dint\u00e9r\u00eat \u00e9conomique\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n+ {\"jardin denfants\", 1, {DICTIONARY_PLACE_NAME}, 2116},\n+ {\"ber\", 1, {DICTIONARY_STREET_TYPE}, 2185},\n {\"col\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"colombie-britannique\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"z.a.c\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"esp\", 1, {DICTIONARY_STREET_TYPE}, 2221},\n+ {\"nt\", 1, {DICTIONARY_TOPONYM}, 2339},\n+ {\"s e p\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"raid\", 1, {DICTIONARY_STREET_TYPE}, 2285},\n+ {\"memorial\", 1, {DICTIONARY_PLACE_NAME}, 2125},\n+ {\"etablissement d'enseignement superieur\", 1, {DICTIONARY_PLACE_NAME}, 2101},\n+ {\"h ch\", 1, {DICTIONARY_STREET_TYPE}, 2242},\n+ {\"barriere\", 1, {DICTIONARY_STREET_TYPE}, 2182},\n+ {\"ecluse\", 1, {DICTIONARY_STREET_TYPE}, 2220},\n {\"soci\u00e9te interne\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"z a c\", 1, {DICTIONARY_PLACE_NAME}, 2146},\n- {\"ss\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"pe\", 1, {DICTIONARY_TOPONYM}, 2342},\n+ {\"g rue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n {\"bunker\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n- {\"carre\", 1, {DICTIONARY_STREET_TYPE}, 2193},\n+ {\"sai\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"bibliotheque\", 1, {DICTIONARY_PLACE_NAME}, 2083},\n {\"plaine\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"z i\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n {\"bo\u00eete postale\", 1, {DICTIONARY_POST_OFFICE}, -1},\n {\"mesdames\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"nb\", 1, {DICTIONARY_TOPONYM}, 2332},\n- {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"boite de nuit\", 1, {DICTIONARY_PLACE_NAME}, 2080},\n- {\"zone a urbaniser en priorite\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n- {\"gals\", 1, {DICTIONARY_STREET_TYPE}, 2227},\n- {\"chl\", 1, {DICTIONARY_STREET_TYPE}, 2196},\n- {\"dsg\", 1, {DICTIONARY_STREET_TYPE}, 2211},\n- {\"barrieres\", 1, {DICTIONARY_STREET_TYPE}, 2179},\n- {\"slt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"s p r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2020},\n+ {\"societe cooperative\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n+ {\"sens\", 1, {DICTIONARY_STREET_TYPE}, 2303},\n+ {\"gd bvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"covoiturage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rpe\", 1, {DICTIONARY_STREET_TYPE}, 2282},\n+ {\"r.p.j.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n+ {\"ecl\", 1, {DICTIONARY_STREET_TYPE}, 2220},\n {\"son altesse royale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s a r\", 1, {DICTIONARY_PERSONAL_TITLE}, 2070},\n {\"g\u00e9n\u00e9ral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"g.i.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n+ {\"s e\", 1, {DICTIONARY_PERSONAL_TITLE}, 2072},\n {\"palais de justice\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mte\", 1, {DICTIONARY_STREET_TYPE}, 2245},\n {\"ontario\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"gpe\", 1, {DICTIONARY_COMPANY_TYPE}, 1989},\n- {\"r\", 1, {DICTIONARY_STREET_TYPE}, 2292},\n- {\"societe en commandite par actions\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n+ {\"vla\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1987},\n+ {\"docteur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"berge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cit\u00e9\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2045},\n+ {\"gdsens\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n+ {\"chp\", 1, {DICTIONARY_PLACE_NAME}, 2091},\n {\"bulle \u00e0 verre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"levant\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"foss\", 1, {DICTIONARY_STREET_TYPE}, 2224},\n- {\"fcp\", 1, {DICTIONARY_COMPANY_TYPE}, 1987},\n- {\"r.n\", 1, {DICTIONARY_STREET_TYPE}, 2291},\n- {\"ma\u00eetre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"avn\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n+ {\"societe de fait\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n+ {\"mles\", 1, {DICTIONARY_PERSONAL_TITLE}, 2049},\n+ {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"r.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n+ {\"aves\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"rles\", 1, {DICTIONARY_STREET_TYPE}, 2298},\n+ {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n {\"colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"frms\", 1, {DICTIONARY_PLACE_NAME}, 2100},\n+ {\"boul\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n {\"groupe\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"maitresse\", 1, {DICTIONARY_PERSONAL_TITLE}, 2048},\n- {\"grd chemin\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"e i\", 1, {DICTIONARY_COMPANY_TYPE}, 1985},\n+ {\"auto ecole\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n+ {\"centre comm\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"cgne\", 1, {DICTIONARY_STREET_TYPE}, 2192},\n {\"soci\u00e9te coop\u00e9rative\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"auto ecole\", 1, {DICTIONARY_PLACE_NAME}, 2074},\n- {\"sprl\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n+ {\"zone dam\u00e9nagement diff\u00e9r\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n+ {\"marechal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2054},\n+ {\"g.i.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n {\"autoroute\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"scop\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n+ {\"ile\", 1, {DICTIONARY_QUALIFIER}, 2164},\n+ {\"hch\", 1, {DICTIONARY_STREET_TYPE}, 2242},\n {\"galerie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n {\"fort\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr en\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n- {\"zup\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n {\"soci\u00e9te en commandite\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"forum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"boulv\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"c cial\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"rocd\", 1, {DICTIONARY_STREET_TYPE}, 2284},\n- {\"chss\", 1, {DICTIONARY_STREET_TYPE}, 2198},\n- {\"platx\", 1, {DICTIONARY_STREET_TYPE}, 2271},\n- {\"pt as\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n- {\"montee\", 1, {DICTIONARY_STREET_TYPE}, 2245},\n- {\"begis\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n+ {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 2179},\n+ {\"batiment de ferme\", 1, {DICTIONARY_PLACE_NAME}, 2080},\n+ {\"chi\", 1, {DICTIONARY_SYNONYM}, 2323},\n+ {\"p allee\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n+ {\"lot\", 1, {DICTIONARY_QUALIFIER}, 2167},\n+ {\"gd boul\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"gdbd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"cau\", 1, {DICTIONARY_STREET_TYPE}, 2193},\n {\"sente\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"z.u.p.\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"sarl\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n+ {\"lieudit\", 1, {DICTIONARY_QUALIFIER}, 2166},\n+ {\"s.e.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2072},\n {\"soci\u00e9te en commandite simple\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"clos\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.c.r.i\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"vge\", 1, {DICTIONARY_SYNONYM}, 2331},\n {\"r\u00e9v\u00e9rend p\u00e8re j\u00e9suit\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"raison individuelle\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n- {\"agglom\", 1, {DICTIONARY_QUALIFIER}, 2152},\n+ {\"dig\", 1, {DICTIONARY_STREET_TYPE}, 2217},\n+ {\"rtes\", 1, {DICTIONARY_STREET_TYPE}, 2294},\n+ {\"g bld\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"s i c a f\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n {\"appartements\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"passage\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n- {\"grdch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"env\", 1, {DICTIONARY_STREET_TYPE}, 2218},\n- {\"scoop\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"mlle\", 1, {DICTIONARY_PERSONAL_TITLE}, 2048},\n+ {\"jetee\", 1, {DICTIONARY_STREET_TYPE}, 2246},\n+ {\"societe en commandite\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n {\"domaine\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"enc\", 1, {DICTIONARY_STREET_TYPE}, 2219},\n {\"sud\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ptas\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n- {\"supermarche\", 1, {DICTIONARY_PLACE_NAME}, 2139},\n+ {\"pt ave\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2025},\n+ {\"pt allees\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n+ {\"ctesse\", 1, {DICTIONARY_PERSONAL_TITLE}, 2039},\n+ {\"avens\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n {\"soci\u00e9te de fait\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"gal\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n {\"pres\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"cr\u00e8me glac\u00e9e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2055},\n- {\"bat\", 1, {DICTIONARY_BUILDING_TYPE}, 1981},\n- {\"pt allee\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n- {\"p n\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n+ {\"rmp\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n+ {\"societe deconomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n+ {\"s.a.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n+ {\"s.e.m.\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"ruelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sq\", 1, {DICTIONARY_STREET_TYPE}, 2302},\n- {\"societe d'economie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"beguinage\", 1, {DICTIONARY_PLACE_NAME}, 2077},\n- {\"\u00e9cl\", 1, {DICTIONARY_STREET_TYPE}, 2216},\n+ {\"carru\", 1, {DICTIONARY_STREET_TYPE}, 2193},\n+ {\"son altesse imperiale\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n+ {\"saog\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ctr comm\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"chi\", 1, {DICTIONARY_SYNONYM}, 2319},\n- {\"mis\", 1, {DICTIONARY_PERSONAL_TITLE}, 2051},\n+ {\"a\", 1, {DICTIONARY_STOPWORD}, 2171},\n+ {\"psg\", 1, {DICTIONARY_STREET_TYPE}, 2255},\n+ {\"f c p\", 1, {DICTIONARY_COMPANY_TYPE}, 1991},\n+ {\"marches\", 1, {DICTIONARY_PLACE_NAME}, 2123},\n+ {\"r p j\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n+ {\"p rue\", 1, {DICTIONARY_STREET_TYPE}, 2267},\n+ {\"frere\", 1, {DICTIONARY_PERSONAL_TITLE}, 2042},\n+ {\"mt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2126},\n {\"nord\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"colis\", 1, {DICTIONARY_SYNONYM}, 2321},\n- {\"super march\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2139},\n+ {\"s.c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"cote\", 1, {DICTIONARY_STREET_TYPE}, 2190},\n+ {\"tr pl\", 1, {DICTIONARY_STREET_TYPE}, 2310},\n+ {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 2129},\n {\"passes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"hle\", 1, {DICTIONARY_PLACE_NAME}, 2105},\n {\"chemin vicinal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sca\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n {\"centre commercial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"qua\", 1, {DICTIONARY_QUALIFIER}, 2169},\n {\"jet\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"z\", 1, {DICTIONARY_QUALIFIER}, 2166},\n+ {\"plages\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2031},\n {\"jardins\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"sicav\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n {\"mar\u00e9chal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"poterne\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"faugrb\", 1, {DICTIONARY_QUALIFIER}, 2159},\n- {\"anciennes routes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cotts\", 1, {DICTIONARY_PLACE_NAME}, 2092},\n+ {\"p route\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n+ {\"s i c a v\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n {\"auditorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fl\", 1, {DICTIONARY_SYNONYM}, 2323},\n+ {\"fon\", 1, {DICTIONARY_PLACE_NAME}, 2105},\n {\"rampe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"groupement d'interet economique\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n- {\"art\", 1, {DICTIONARY_STREET_TYPE}, 2172},\n- {\"foyr\", 1, {DICTIONARY_STREET_TYPE}, 2225},\n {\"port\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 2251},\n- {\"petite allee\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n- {\"vrte\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"rp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n- {\"f.c.p\", 1, {DICTIONARY_COMPANY_TYPE}, 1987},\n+ {\"ress\", 1, {DICTIONARY_STREET_TYPE}, 2301},\n+ {\"z.u.p\", 1, {DICTIONARY_PLACE_NAME}, 2154},\n {\"au\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"marche\", 1, {DICTIONARY_PLACE_NAME}, 2121},\n+ {\"ctre\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n {\"monument\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"esplanade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rnde\", 1, {DICTIONARY_STREET_TYPE}, 2285},\n- {\"societe en commandite simple\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n- {\"jetees\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n- {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n- {\"brg\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, 2153},\n- {\"ctrl\", 1, {DICTIONARY_DIRECTIONAL}, 2019},\n+ {\"prs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2062},\n+ {\"mf\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n+ {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"p n\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n+ {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n {\"le\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sa saintete\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"imps\", 1, {DICTIONARY_STREET_TYPE}, 2245},\n {\"route nationale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pharmacie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"terrain\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"escalier\", 1, {DICTIONARY_UNIT}, -1},\n- {\"gr bde\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"prch\", 1, {DICTIONARY_UNIT}, 2350},\n+ {\"r i\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n {\"nb\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cimetiere\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n- {\"s p r l u\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n- {\"vens\", 1, {DICTIONARY_STREET_TYPE}, 2313},\n- {\"h ch\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n- {\"societe d'investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"gr blvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"tsse\", 1, {DICTIONARY_STREET_TYPE}, 2304},\n- {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n+ {\"grd rue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"rem\", 1, {DICTIONARY_STREET_TYPE}, 2287},\n+ {\"grs\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"vve\", 1, {DICTIONARY_PERSONAL_TITLE}, 2074},\n+ {\"gr rue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n+ {\"trts\", 1, {DICTIONARY_STREET_TYPE}, 2312},\n+ {\"mal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2054},\n+ {\"gie\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n {\"corniche\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"impasse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"clo\u00eetre\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pkg\", 1, {DICTIONARY_PLACE_NAME}, 2129},\n- {\"p ch\", 1, {DICTIONARY_STREET_TYPE}, 2258},\n- {\"sents\", 1, {DICTIONARY_STREET_TYPE}, 2301},\n+ {\"roqt\", 1, {DICTIONARY_STREET_TYPE}, 2291},\n+ {\"nb\", 1, {DICTIONARY_TOPONYM}, 2336},\n+ {\"s c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"gr bd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"bordel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sentes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"che v\", 1, {DICTIONARY_STREET_TYPE}, 2200},\n- {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, 2109},\n+ {\"trvs\", 1, {DICTIONARY_STREET_TYPE}, 2313},\n+ {\"bch\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n {\"espace\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r.p.j.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n+ {\"p.n.\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n {\"place de march\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"societe d'investissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"societe momentanee\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n- {\"ldit\", 1, {DICTIONARY_QUALIFIER}, 2162},\n- {\"gr bvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"boulevarde\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"s.a.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"s.i.c.a.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"gd bld\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"ferme\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"maison de sant\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"v\u00e9t\u00e9rinaire\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"plan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n+ {\"grch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"cdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2037},\n+ {\"patio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"mont\u00e9es\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p ave\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n- {\"maison de sant\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, 2090},\n- {\"aires\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"se\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n- {\"m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2055},\n- {\"patio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"m\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"z.a.c\", 1, {DICTIONARY_PLACE_NAME}, 2146},\n- {\"ferme\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"zone d'amenagement concerte\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"\u00e9ch\", 1, {DICTIONARY_STREET_TYPE}, 2219},\n+ {\"mar\", 1, {DICTIONARY_PLACE_NAME}, 2121},\n {\"nunavut\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"pt ae\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n+ {\"chv\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n+ {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n+ {\"gdsen\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n+ {\"avenus\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"g rues\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"jard\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2111},\n+ {\"gr r\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"z.i\", 1, {DICTIONARY_PLACE_NAME}, 2153},\n {\"village\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dept\", 1, {DICTIONARY_UNIT}, 2343},\n- {\"gr ens\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n- {\"gch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"gr rs\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"grd rues\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"salle polyvalente\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"zone d'am\u00e9nagement concert\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n- {\"maison forestiere\", 1, {DICTIONARY_PLACE_NAME}, 2115},\n- {\"s.p.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n- {\"prom\", 1, {DICTIONARY_STREET_TYPE}, 2277},\n- {\"soci\u00e9te d' investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"pt chemin\", 1, {DICTIONARY_STREET_TYPE}, 2258},\n- {\"begi\", 1, {DICTIONARY_PLACE_NAME}, 2077},\n- {\"autoecole\", 1, {DICTIONARY_PLACE_NAME}, 2074},\n- {\"zi\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n- {\"s c o p\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n- {\"s.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n- {\"roquet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nouvelle-ecosse\", 1, {DICTIONARY_TOPONYM}, 2338},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2030},\n+ {\"s s\", 1, {DICTIONARY_COMPANY_TYPE}, 2022},\n+ {\"ste\", 1, {DICTIONARY_PERSONAL_TITLE}, 2067},\n+ {\"scri\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"plag\", 1, {DICTIONARY_STREET_TYPE}, 2271},\n+ {\"doms\", 1, {DICTIONARY_QUALIFIER}, 2162},\n+ {\"but\", 1, {DICTIONARY_STREET_TYPE}, 2189},\n+ {\"grd blvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"pt r\", 1, {DICTIONARY_STREET_TYPE}, 2267},\n {\"d\u00e9partement\", 1, {DICTIONARY_UNIT}, -1},\n- {\"square\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"residence\", 1, {DICTIONARY_UNIT}, 2347},\n- {\"boulavard\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n+ {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"g\", 1, {DICTIONARY_SYNONYM}, 2328},\n+ {\"batiment\", 1, {DICTIONARY_BUILDING_TYPE}, 1985},\n {\"grand chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"lavage de voitures\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"trt\", 1, {DICTIONARY_STREET_TYPE}, 2307},\n+ {\"lve\", 1, {DICTIONARY_STREET_TYPE}, 2248},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2026},\n+ {\"qu\", 1, {DICTIONARY_QUALIFIER}, 2169},\n+ {\"begis\", 1, {DICTIONARY_PLACE_NAME}, 2082},\n {\"\u00eele-du-prince-\u00e9douard\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"chs v\", 1, {DICTIONARY_STREET_TYPE}, 2203},\n- {\"g blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n {\"h\u00f4tel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u00eele du prince \u00e9douard\", 1, {DICTIONARY_TOPONYM}, 2338},\n- {\"rivi\u00e8re\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"che\", 1, {DICTIONARY_STREET_TYPE}, 2199},\n- {\"avns\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"nouvelle \u00e9cosse\", 1, {DICTIONARY_TOPONYM}, 2334},\n- {\"chaussees\", 1, {DICTIONARY_STREET_TYPE}, 2198},\n+ {\"societe privee a responsabilite limitee unipersonnelle\", 1, {DICTIONARY_COMPANY_TYPE}, 2021},\n+ {\"residences\", 1, {DICTIONARY_UNIT}, 2352},\n+ {\"res\", 1, {DICTIONARY_UNIT}, 2351},\n+ {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"gdens\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, 2113},\n+ {\"p a\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n+ {\"mle\", 1, {DICTIONARY_PERSONAL_TITLE}, 2048},\n {\"ma\u00eetresse\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"societe cooperative de production\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n- {\"qc\", 1, {DICTIONARY_TOPONYM}, 2339},\n- {\"faubg\", 1, {DICTIONARY_QUALIFIER}, 2159},\n- {\"v rte\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"nl\", 1, {DICTIONARY_TOPONYM}, 2333},\n- {\"societe cooperative a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n- {\"avs\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"gr boul\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"societe dinvestissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"vch\", 1, {DICTIONARY_STREET_TYPE}, 2319},\n+ {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n+ {\"ctr\", 1, {DICTIONARY_STREET_TYPE}, 2209},\n+ {\"vte\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n+ {\"z u p\", 1, {DICTIONARY_PLACE_NAME}, 2154},\n+ {\"c comm\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"p a\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n+ {\"mar public\", 1, {DICTIONARY_PLACE_NAME}, 2122},\n+ {\"s c r i\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"g boul\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"h l m\", 1, {DICTIONARY_PLACE_NAME}, 2108},\n {\"aux\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"zone artisanale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cor\", 1, {DICTIONARY_STREET_TYPE}, 2206},\n {\"fontaine\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"soci\u00e9te dinvestissement a capital fix\u00e9\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n {\"\u00e0\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"soci\u00e9te coop\u00e9rative a responsabilit\u00e9 illimit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"za\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n+ {\"porqs\", 1, {DICTIONARY_STREET_TYPE}, 2278},\n {\"chemins vicinaux\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"a ch\", 1, {DICTIONARY_STREET_TYPE}, 2171},\n- {\"pt rte\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n- {\"saog\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n+ {\"nl\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"rmpe\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n+ {\"m.f.\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n {\"r\u00e9sidence\", 1, {DICTIONARY_UNIT}, -1},\n- {\"e.u.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1986},\n- {\"s.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n {\"collines\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sicaf\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"medecin\", 1, {DICTIONARY_PLACE_NAME}, 2120},\n- {\"jrds\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2113},\n- {\"mm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2053},\n- {\"lt col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2040},\n- {\"l dit\", 1, {DICTIONARY_QUALIFIER}, 2162},\n- {\"bulle a verre\", 1, {DICTIONARY_PLACE_NAME}, 2081},\n+ {\"foyer\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ple\", 1, {DICTIONARY_STREET_TYPE}, 2258},\n+ {\"grd bde\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2040},\n {\"raccourci\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"car\", 1, {DICTIONARY_STREET_TYPE}, 2193},\n- {\"all\", 1, {DICTIONARY_STREET_TYPE}, 2169},\n- {\"g ch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"chsv\", 1, {DICTIONARY_STREET_TYPE}, 2203},\n+ {\"nouvelle ecosse\", 1, {DICTIONARY_TOPONYM}, 2338},\n+ {\"a\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"moulins\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gd ens\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n {\"fitness\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ven\", 1, {DICTIONARY_STREET_TYPE}, 2312},\n {\"colline\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pt im\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n {\"grands ensembles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n- {\"b p\", 1, {DICTIONARY_POST_OFFICE}, 2151},\n- {\"s.a.r.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2066},\n+ {\"portqs\", 1, {DICTIONARY_STREET_TYPE}, 2278},\n {\"commerce\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"f.c.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 1987},\n- {\"nouveau brunswick\", 1, {DICTIONARY_TOPONYM}, 2332},\n {\"manitoba\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 2023},\n {\"pour\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"sem\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"lieutenant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"du\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"riviere\", 1, {DICTIONARY_SYNONYM}, 2326},\n- {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2054},\n- {\"terre neuve et labrador\", 1, {DICTIONARY_TOPONYM}, 2333},\n- {\"v am\", 1, {DICTIONARY_PERSONAL_TITLE}, 2071},\n- {\"r.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1994},\n- {\"r.p.j\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n+ {\"ile-du-prince-edouard\", 1, {DICTIONARY_TOPONYM}, 2342},\n+ {\"ri\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n+ {\"cst\", 1, {DICTIONARY_PLACE_NAME}, 2088},\n+ {\"pae\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"pt avn\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2313},\n {\"amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bde\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"carrieres\", 1, {DICTIONARY_STREET_TYPE}, 2192},\n+ {\"chez\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n+ {\"cotts\", 1, {DICTIONARY_PLACE_NAME}, 2096},\n {\"val\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n- {\"chem\", 1, {DICTIONARY_STREET_TYPE}, 2201},\n+ {\"art\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n+ {\"e u r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n+ {\"jte\", 1, {DICTIONARY_STREET_TYPE}, 2246},\n {\"place\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"plci\", 1, {DICTIONARY_STREET_TYPE}, 2270},\n+ {\"hlm\", 1, {DICTIONARY_PLACE_NAME}, 2108},\n {\"messieurs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fond commun de placement\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"p allees\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"g bd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"medecin\", 1, {DICTIONARY_PLACE_NAME}, 2124},\n {\"une\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"digue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sous lieutenant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"rues\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"contour\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"g r\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n+ {\"rnde\", 1, {DICTIONARY_STREET_TYPE}, 2289},\n+ {\"chaussees\", 1, {DICTIONARY_STREET_TYPE}, 2202},\n+ {\"souslieutenant\", 1, {DICTIONARY_PERSONAL_TITLE}, 2073},\n {\"b\u00e2timent\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"sentiers\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"la\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"universite\", 1, {DICTIONARY_PLACE_NAME}, 2141},\n- {\"association sans but lucratif\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s.e.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n- {\"met\", 1, {DICTIONARY_STREET_TYPE}, 2247},\n- {\"z.a.d.\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"g boul\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"cavee\", 1, {DICTIONARY_STREET_TYPE}, 2194},\n+ {\"pn\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n {\"nouvelle route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"societe en nom collectif\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n- {\"levee\", 1, {DICTIONARY_STREET_TYPE}, 2244},\n- {\"gp\", 1, {DICTIONARY_COMPANY_TYPE}, 1988},\n+ {\"h.l.m\", 1, {DICTIONARY_PLACE_NAME}, 2108},\n {\"restaurant\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bld\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n+ {\"rtnd\", 1, {DICTIONARY_STREET_TYPE}, 2292},\n {\"l'\", 2, {DICTIONARY_ELISION, DICTIONARY_STOPWORD}, -1},\n {\"garenne\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"son eminence\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mln\", 1, {DICTIONARY_PLACE_NAME}, 2123},\n {\"camp\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"soci\u00e9te en nom collectif\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"p\", 1, {DICTIONARY_SYNONYM}, 2325},\n+ {\"rts\", 1, {DICTIONARY_STREET_TYPE}, 2294},\n+ {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"centre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"mairie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u00e9cluses\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"creme glacee\", 1, {DICTIONARY_PLACE_NAME}, 2097},\n+ {\"fos\", 1, {DICTIONARY_STREET_TYPE}, 2228},\n {\"pe\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"soci\u00e9te d\u00e9conomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"chemins\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd r\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"haut chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"eglise\", 1, {DICTIONARY_PLACE_NAME}, 2096},\n- {\"escs\", 1, {DICTIONARY_UNIT}, 2345},\n- {\"deg\", 1, {DICTIONARY_STREET_TYPE}, 2209},\n- {\"p.n.\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n- {\"rtnd\", 1, {DICTIONARY_STREET_TYPE}, 2288},\n+ {\"peri\", 1, {DICTIONARY_STREET_TYPE}, 2282},\n+ {\"grd bld\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"gal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2043},\n+ {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 2019},\n+ {\"zac\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"e.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 1989},\n+ {\"r.p.j\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n+ {\"on\", 1, {DICTIONARY_TOPONYM}, 2341},\n+ {\"s.o\", 1, {DICTIONARY_DIRECTIONAL}, 2032},\n+ {\"p im\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n+ {\"s em\", 1, {DICTIONARY_PERSONAL_TITLE}, 2071},\n {\"salle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 2062},\n+ {\"chaussee\", 1, {DICTIONARY_STREET_TYPE}, 2201},\n {\"on\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"carriere\", 1, {DICTIONARY_STREET_TYPE}, 2191},\n- {\"remp\", 1, {DICTIONARY_STREET_TYPE}, 2283},\n+ {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 2203},\n+ {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"t pl\", 1, {DICTIONARY_STREET_TYPE}, 2310},\n+ {\"aven\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n {\"qu\u00e9bec\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"fg\", 1, {DICTIONARY_QUALIFIER}, 2159},\n- {\"roqt\", 1, {DICTIONARY_STREET_TYPE}, 2287},\n+ {\"s a r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n+ {\"cpg\", 1, {DICTIONARY_PLACE_NAME}, 2087},\n {\"degr\u00e9s\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"b.p\", 1, {DICTIONARY_POST_OFFICE}, 2151},\n+ {\"colombie-britannique\", 1, {DICTIONARY_TOPONYM}, -1},\n+ {\"s.e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n {\"centre de sant\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"boite postale\", 1, {DICTIONARY_POST_OFFICE}, 2151},\n- {\"auto \u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, 2074},\n {\"chauss\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s exc\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n- {\"s.c.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n- {\"ns\", 1, {DICTIONARY_TOPONYM}, 2334},\n- {\"societe anonyme libanaise\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n- {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"grds ens\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n+ {\"parking\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"trvrs\", 1, {DICTIONARY_STREET_TYPE}, 2313},\n+ {\"res\", 1, {DICTIONARY_STREET_TYPE}, 2300},\n {\"all\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 2046},\n {\"m\u00e9tro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2032},\n- {\"gd rs\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"p rt\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n- {\"gpt\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n+ {\"r n\", 1, {DICTIONARY_STREET_TYPE}, 2295},\n {\"soci\u00e9te par actions simplifi\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"gdr\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"coli\", 1, {DICTIONARY_SYNONYM}, 2320},\n+ {\"pavs\", 1, {DICTIONARY_PLACE_NAME}, 2135},\n+ {\"l-dit\", 1, {DICTIONARY_QUALIFIER}, 2166},\n {\"casino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rtde\", 1, {DICTIONARY_STREET_TYPE}, 2288},\n- {\"vla\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, 1983},\n- {\"societe privee a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n- {\"lieu dit\", 1, {DICTIONARY_QUALIFIER}, 2162},\n- {\"abe\", 1, {DICTIONARY_PLACE_NAME}, 2072},\n- {\"ste\", 1, {DICTIONARY_PERSONAL_TITLE}, 2063},\n+ {\"gr chemin\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"avnues\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"tpl\", 1, {DICTIONARY_STREET_TYPE}, 2310},\n+ {\"mmes\", 1, {DICTIONARY_PERSONAL_TITLE}, 2047},\n {\"bureaux\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"zone artisanale commerciale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prv\", 1, {DICTIONARY_STREET_TYPE}, 2250},\n- {\"doms\", 1, {DICTIONARY_QUALIFIER}, 2158},\n- {\"m.f\", 1, {DICTIONARY_PLACE_NAME}, 2115},\n- {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 2091},\n- {\"nte\", 1, {DICTIONARY_STREET_TYPE}, 2248},\n+ {\"chz\", 1, {DICTIONARY_PERSONAL_TITLE}, 2035},\n+ {\"rn\", 1, {DICTIONARY_STREET_TYPE}, 2295},\n+ {\"allees\", 1, {DICTIONARY_STREET_TYPE}, 2174},\n+ {\"z i\", 1, {DICTIONARY_PLACE_NAME}, 2153},\n {\"soci\u00e9te coop\u00e9rative de production\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"professeur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"beguinages\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n- {\"s.c.o.p\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n- {\"chateau\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2088},\n+ {\"agl\", 1, {DICTIONARY_QUALIFIER}, 2156},\n+ {\"z a c\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"z.a.d.\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n+ {\"s.p.r.l.u.\", 1, {DICTIONARY_COMPANY_TYPE}, 2021},\n {\"degr\u00e9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"m\u00e9decin\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n+ {\"racc\", 1, {DICTIONARY_STREET_TYPE}, 2284},\n {\"vieille route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zone dam\u00e9nagement concert\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"g i e\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n- {\"tsses\", 1, {DICTIONARY_STREET_TYPE}, 2305},\n+ {\"plat\", 1, {DICTIONARY_STREET_TYPE}, 2274},\n+ {\"gd\", 1, {DICTIONARY_SYNONYM}, 2328},\n {\"nouveau-brunswick\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"g rs\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"s.o\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n- {\"centre cial\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"presqu\u00eele\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n+ {\"mlns\", 1, {DICTIONARY_PLACE_NAME}, 2128},\n+ {\"mme\", 1, {DICTIONARY_PERSONAL_TITLE}, 2046},\n+ {\"qrt\", 1, {DICTIONARY_QUALIFIER}, 2169},\n+ {\"am\", 1, {DICTIONARY_PERSONAL_TITLE}, 2033},\n+ {\"fg\", 1, {DICTIONARY_QUALIFIER}, 2163},\n {\"halle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prql\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n- {\"vlas\", 1, {DICTIONARY_PLACE_NAME}, 2143},\n+ {\"pt a\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n+ {\"grd chemin\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"hip\", 1, {DICTIONARY_PLACE_NAME}, 2111},\n+ {\"s e m\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"terte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ancien chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd bde\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"vges\", 1, {DICTIONARY_SYNONYM}, 2332},\n+ {\"ecluses\", 1, {DICTIONARY_STREET_TYPE}, 2221},\n+ {\"prescolaire\", 1, {DICTIONARY_PLACE_NAME}, 2140},\n {\"derriere\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"v ch\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n- {\"plages\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.c.r.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n+ {\"s.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 2072},\n+ {\"supermarch\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"colombie britannique\", 1, {DICTIONARY_TOPONYM}, 2334},\n+ {\"e.u.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n+ {\"s.i.c.a.f\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"frms\", 1, {DICTIONARY_PLACE_NAME}, 2104},\n+ {\"rle\", 1, {DICTIONARY_STREET_TYPE}, 2297},\n {\"cottage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"chauss\u00e9es\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grd boul\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"soci\u00e9te dinvestissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"z.a\", 1, {DICTIONARY_PLACE_NAME}, 2144},\n- {\"g chemin\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n+ {\"gbd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"nouvelle \u00e9cosse\", 1, {DICTIONARY_TOPONYM}, 2338},\n+ {\"vrt\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n {\"cin\u00e9ma\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pr\u00e9scolaire\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gr ch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"allee\", 1, {DICTIONARY_STREET_TYPE}, 2173},\n {\"salle de gymnastique\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"societe par actions simplifiee\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n- {\"carr\", 1, {DICTIONARY_STREET_TYPE}, 2193},\n- {\"v rt\", 1, {DICTIONARY_STREET_TYPE}, 2314},\n- {\"v\u00e9t\u00e9rinaire\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c\", 1, {DICTIONARY_DIRECTIONAL}, 2020},\n+ {\"a.s.b.l\", 1, {DICTIONARY_COMPANY_TYPE}, 1988},\n {\"th\u00e9\u00e2tre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"galeries\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cte\", 1, {DICTIONARY_PERSONAL_TITLE}, 2034},\n- {\"zone dactivites\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n- {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n- {\"m f\", 1, {DICTIONARY_PLACE_NAME}, 2115},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2021},\n- {\"s.e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n- {\"ach\", 1, {DICTIONARY_STREET_TYPE}, 2171},\n- {\"p\u00e9ri\", 1, {DICTIONARY_STREET_TYPE}, 2257},\n- {\"pass\", 1, {DICTIONARY_STREET_TYPE}, 2253},\n+ {\"man\", 1, {DICTIONARY_PLACE_NAME}, 2120},\n+ {\"maitres\", 1, {DICTIONARY_PERSONAL_TITLE}, 2051},\n {\"rond point\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.e.m\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n {\"arcade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sen\", 1, {DICTIONARY_STREET_TYPE}, 2298},\n- {\"gr blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"s lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2073},\n+ {\"z a\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n {\"portiques\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pt impasse\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n {\"ab\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"mnt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2122},\n- {\"ld\", 1, {DICTIONARY_QUALIFIER}, 2162},\n- {\"marche public\", 1, {DICTIONARY_PLACE_NAME}, 2118},\n- {\"grdr\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n+ {\"montee\", 1, {DICTIONARY_STREET_TYPE}, 2249},\n+ {\"nouveau brunswick\", 1, {DICTIONARY_TOPONYM}, 2336},\n+ {\"app\", 1, {DICTIONARY_UNIT}, 2346},\n {\"venelles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n- {\"pt rue\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n- {\"pim\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n- {\"con\", 1, {DICTIONARY_QUALIFIER}, 2154},\n- {\"mise\", 1, {DICTIONARY_PERSONAL_TITLE}, 2052},\n+ {\"z.u.p.\", 1, {DICTIONARY_PLACE_NAME}, 2154},\n+ {\"bre\", 1, {DICTIONARY_STREET_TYPE}, 2182},\n+ {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n {\"club social\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"yt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"mb\", 1, {DICTIONARY_TOPONYM}, 2331},\n {\"fondation privee\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"vallee\", 1, {DICTIONARY_STREET_TYPE}, 2311},\n {\"maison\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n- {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n {\"avenue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vche\", 1, {DICTIONARY_STREET_TYPE}, 2319},\n {\"quartier\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"petite all\u00e9es\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.a.r\", 1, {DICTIONARY_PERSONAL_TITLE}, 2070},\n {\"soci\u00e9te anonyme\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"refuge\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"za\", 1, {DICTIONARY_PLACE_NAME}, 2144},\n- {\"chs\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n+ {\"scoop\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n+ {\"\u00e9gl\", 1, {DICTIONARY_PLACE_NAME}, 2100},\n {\"manoir\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.a.o.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n+ {\"peri\", 1, {DICTIONARY_STREET_TYPE}, 2261},\n {\"dans\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"mle\", 1, {DICTIONARY_PERSONAL_TITLE}, 2044},\n- {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 2082},\n+ {\"ham\", 1, {DICTIONARY_STREET_TYPE}, 2241},\n+ {\"lieu-dit\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"bois\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"carrefour\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"fosse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"s a i\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n- {\"tr pl\", 1, {DICTIONARY_STREET_TYPE}, 2306},\n {\"plateau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 2036},\n {\"h\u00f4pital\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"carr\u00e9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"zone d'am\u00e9nagement diff\u00e9r\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"soci\u00e9te coop\u00e9rative a responsabilit\u00e9 limit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s.c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n {\"pourtour\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cares\", 1, {DICTIONARY_STREET_TYPE}, 2192},\n- {\"pour\", 1, {DICTIONARY_STREET_TYPE}, 2275},\n- {\"z a d\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n- {\"carru\", 1, {DICTIONARY_STREET_TYPE}, 2189},\n- {\"hschs\", 1, {DICTIONARY_STREET_TYPE}, 2239},\n- {\"grd rs\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n+ {\"veterinaire\", 1, {DICTIONARY_PLACE_NAME}, 2146},\n+ {\"chapelle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cours\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cites\", 1, {DICTIONARY_QUALIFIER}, 2156},\n- {\"societe a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n- {\"groupement\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"rtnde\", 1, {DICTIONARY_STREET_TYPE}, 2288},\n- {\"imm\", 1, {DICTIONARY_BUILDING_TYPE}, 1982},\n- {\"ei\", 1, {DICTIONARY_COMPANY_TYPE}, 1985},\n- {\"mars\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n- {\"pere\", 1, {DICTIONARY_PERSONAL_TITLE}, 2056},\n+ {\"square\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pass\", 1, {DICTIONARY_STREET_TYPE}, 2257},\n {\"rue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bureau de poste\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"chev\", 1, {DICTIONARY_STREET_TYPE}, 2200},\n- {\"societe dinvestissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"potrn\", 1, {DICTIONARY_PLACE_NAME}, 2134},\n- {\"gd rue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n+ {\"pch\", 1, {DICTIONARY_UNIT}, 2350},\n+ {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n+ {\"hopital\", 1, {DICTIONARY_PLACE_NAME}, 2112},\n+ {\"gr rues\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"r.n.\", 1, {DICTIONARY_STREET_TYPE}, 2295},\n+ {\"dom\", 1, {DICTIONARY_QUALIFIER}, 2161},\n {\"campagne\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dsgs\", 1, {DICTIONARY_STREET_TYPE}, 2212},\n- {\"auto-ecole\", 1, {DICTIONARY_PLACE_NAME}, 2074},\n- {\"passerelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sous\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"portq\", 1, {DICTIONARY_STREET_TYPE}, 2273},\n+ {\"z\", 1, {DICTIONARY_QUALIFIER}, 2170},\n+ {\"societe en participation\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"s a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n+ {\"v route\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n+ {\"crs\", 1, {DICTIONARY_STREET_TYPE}, 2212},\n+ {\"a cote de\", 1, {DICTIONARY_STOPWORD}, 2172},\n+ {\"boucle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"fondation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"rocade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zac\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"marche\", 1, {DICTIONARY_PLACE_NAME}, 2117},\n- {\"etablissement denseignement superieur\", 1, {DICTIONARY_PLACE_NAME}, 2097},\n+ {\"r\u00e9s\", 1, {DICTIONARY_UNIT}, 2351},\n+ {\"enterprise unipersonnelle a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 1990},\n {\"hameau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"faubourg\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"prcs\", 1, {DICTIONARY_STREET_TYPE}, 2249},\n- {\"fon\", 1, {DICTIONARY_PLACE_NAME}, 2101},\n- {\"gden\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n+ {\"groupement\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"mas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bast\", 1, {DICTIONARY_SYNONYM}, 2318},\n+ {\"v chemin\", 1, {DICTIONARY_STREET_TYPE}, 2319},\n+ {\"societe en commandite par actions\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n {\"darse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"degs\", 1, {DICTIONARY_STREET_TYPE}, 2210},\n- {\"hotel de ville\", 1, {DICTIONARY_PLACE_NAME}, 2110},\n- {\"ctr\", 1, {DICTIONARY_STREET_TYPE}, 2205},\n- {\"gri\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"voi\", 1, {DICTIONARY_STREET_TYPE}, 2320},\n {\"comtesse\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"theatre\", 1, {DICTIONARY_PLACE_NAME}, 2140},\n- {\"gr bld\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"imp\", 1, {DICTIONARY_STREET_TYPE}, 2240},\n+ {\"psty\", 1, {DICTIONARY_PLACE_NAME}, 2136},\n+ {\"s.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2022},\n+ {\"sta\", 1, {DICTIONARY_PLACE_NAME}, 2142},\n+ {\"grand'rue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"cor\", 1, {DICTIONARY_STREET_TYPE}, 2210},\n+ {\"fermes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sent\", 1, {DICTIONARY_STREET_TYPE}, 2304},\n+ {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n {\"villas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vois\", 1, {DICTIONARY_STREET_TYPE}, 2317},\n- {\"jards\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2113},\n+ {\"z.a.\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n+ {\"ns\", 1, {DICTIONARY_TOPONYM}, 2338},\n {\"fosses\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zone damenagement differe\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n+ {\"hschs\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n {\"\u00e9changeur\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"parc industriel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rac\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n+ {\"descentes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vens\", 1, {DICTIONARY_STREET_TYPE}, 2317},\n+ {\"cites\", 1, {DICTIONARY_QUALIFIER}, 2160},\n {\"a\u00e9roport\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"frm\", 1, {DICTIONARY_PLACE_NAME}, 2099},\n+ {\"maitre\", 1, {DICTIONARY_PERSONAL_TITLE}, 2050},\n {\"placis\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"soci\u00e9te d' investissement a capital fix\u00e9\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"jrd\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2111},\n- {\"bc\", 1, {DICTIONARY_TOPONYM}, 2330},\n- {\"vve\", 1, {DICTIONARY_PERSONAL_TITLE}, 2070},\n- {\"pt\", 1, {DICTIONARY_SYNONYM}, 2325},\n- {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 2269},\n- {\"ancienne route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"h l m\", 1, {DICTIONARY_PLACE_NAME}, 2104},\n- {\"porq\", 1, {DICTIONARY_STREET_TYPE}, 2273},\n+ {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n+ {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, 2043},\n+ {\"m'\", 1, {DICTIONARY_ELISION}, -1},\n+ {\"zac\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"chee\", 1, {DICTIONARY_STREET_TYPE}, 2201},\n+ {\"gr blvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"ecls\", 1, {DICTIONARY_STREET_TYPE}, 2221},\n+ {\"iles\", 1, {DICTIONARY_QUALIFIER}, 2165},\n+ {\"pot\", 1, {DICTIONARY_PLACE_NAME}, 2138},\n+ {\"asbl\", 1, {DICTIONARY_COMPANY_TYPE}, 1988},\n+ {\"sep\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n {\"professeurs\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"group\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"baronne\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n {\"rempart\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"stde\", 1, {DICTIONARY_PLACE_NAME}, 2137},\n- {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 2049},\n+ {\"s.a.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n {\"grand ensemble\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bch\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n- {\"s.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n+ {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n+ {\"trpl\", 1, {DICTIONARY_STREET_TYPE}, 2310},\n {\"fonds de placement\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"hles\", 1, {DICTIONARY_PLACE_NAME}, 2106},\n- {\"s.p.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n- {\"gd bld\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"scrl\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n- {\"degres\", 1, {DICTIONARY_STREET_TYPE}, 2210},\n+ {\"societe d'investissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"mise\", 1, {DICTIONARY_PERSONAL_TITLE}, 2056},\n+ {\"trt\", 1, {DICTIONARY_STREET_TYPE}, 2311},\n+ {\"gr bvd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"esplanades\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd rues\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"p\u00e9ristyle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"venelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"reverende pere jesuit\", 1, {DICTIONARY_PERSONAL_TITLE}, 2064},\n {\"mademoiselles\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"agglomeration\", 1, {DICTIONARY_QUALIFIER}, 2152},\n- {\"sk\", 1, {DICTIONARY_TOPONYM}, 2340},\n- {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 2023},\n+ {\"bast\", 1, {DICTIONARY_SYNONYM}, 2322},\n {\"petite all\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n {\"maison foresti\u00e8re\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"docteur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cloitre\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n- {\"z.a.d\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n- {\"maitre\", 1, {DICTIONARY_PERSONAL_TITLE}, 2046},\n- {\"\u00e9tablissement denseignement sup\u00e9rieur\", 1, {DICTIONARY_PLACE_NAME}, 2097},\n {\"march\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pal de justice\", 1, {DICTIONARY_PLACE_NAME}, 2131},\n+ {\"grd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n+ {\"vois\", 1, {DICTIONARY_STREET_TYPE}, 2321},\n+ {\"vroute\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n {\"\u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jardin denfants\", 1, {DICTIONARY_PLACE_NAME}, 2112},\n- {\"ber\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"groupement dint\u00e9r\u00eat \u00e9conomique\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n {\"enclave\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"jardin d'enfants\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"z.i\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n+ {\"cntre\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n {\"canton\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"etablissement d'enseignement superieur\", 1, {DICTIONARY_PLACE_NAME}, 2097},\n+ {\"dept\", 1, {DICTIONARY_UNIT}, 2347},\n {\"chalet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.a.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n+ {\"beguinage\", 1, {DICTIONARY_PLACE_NAME}, 2081},\n+ {\"esp\", 1, {DICTIONARY_STREET_TYPE}, 2225},\n {\"ouest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"barriere\", 1, {DICTIONARY_STREET_TYPE}, 2178},\n {\"peripherique\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"et\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"cimeti\u00e8re\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"z a c\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n {\"d'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"vam\", 1, {DICTIONARY_PERSONAL_TITLE}, 2071},\n- {\"g rue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"mles\", 1, {DICTIONARY_PERSONAL_TITLE}, 2045},\n- {\"s.a.i\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n+ {\"lots\", 1, {DICTIONARY_QUALIFIER}, 2168},\n+ {\"mtes\", 1, {DICTIONARY_STREET_TYPE}, 2250},\n+ {\"gd en\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"carre\", 1, {DICTIONARY_STREET_TYPE}, 2197},\n {\"territoires du nord-ouest\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"societe cooperative\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n- {\"p chemin\", 1, {DICTIONARY_STREET_TYPE}, 2258},\n- {\"sens\", 1, {DICTIONARY_STREET_TYPE}, 2299},\n- {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n- {\"sud ouest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"degre\", 1, {DICTIONARY_STREET_TYPE}, 2209},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2022},\n+ {\"z.a.c.\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"bp\", 1, {DICTIONARY_POST_OFFICE}, 2155},\n+ {\"devant\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"universit\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"platx\", 1, {DICTIONARY_STREET_TYPE}, 2275},\n+ {\"p.n\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n+ {\"boite de nuit\", 1, {DICTIONARY_PLACE_NAME}, 2084},\n+ {\"zone a urbaniser en priorite\", 1, {DICTIONARY_PLACE_NAME}, 2154},\n+ {\"gals\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n+ {\"presqu'ile\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n+ {\"jard\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2115},\n {\"vallon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"qu\", 1, {DICTIONARY_QUALIFIER}, 2165},\n {\"ruelles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"aeroport\", 1, {DICTIONARY_PLACE_NAME}, 2073},\n- {\"ecl\", 1, {DICTIONARY_STREET_TYPE}, 2216},\n+ {\"sar\", 1, {DICTIONARY_PERSONAL_TITLE}, 2070},\n+ {\"s.a.o.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n+ {\"rtd\", 1, {DICTIONARY_STREET_TYPE}, 2292},\n+ {\"g blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"s p r l u\", 1, {DICTIONARY_COMPANY_TYPE}, 2021},\n+ {\"rac\", 1, {DICTIONARY_STREET_TYPE}, 2284},\n {\"studio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cav\", 1, {DICTIONARY_STREET_TYPE}, 2194},\n- {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n {\"halles\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"avnue\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n- {\"g ens\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n {\"soci\u00e9te en participation\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"boite postale\", 1, {DICTIONARY_POST_OFFICE}, 2155},\n {\"bastide\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ham\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"super marche\", 1, {DICTIONARY_PLACE_NAME}, 2143},\n+ {\"pte\", 1, {DICTIONARY_PLACE_NAME}, 2139},\n+ {\"societe anonyme\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"pt ch\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n+ {\"societe simple\", 1, {DICTIONARY_COMPANY_TYPE}, 2022},\n {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gdsens\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n- {\"z.a\", 1, {DICTIONARY_PLACE_NAME}, 2145},\n {\"\u00e0 c\u00f4t\u00e9 de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"societe de fait\", 1, {DICTIONARY_COMPANY_TYPE}, 2010},\n- {\"soci\u00e9te d' \u00e9conomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"aves\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"v che\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n- {\"societe d' investissement a capital fixe\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"coteau\", 1, {DICTIONARY_STREET_TYPE}, 2187},\n- {\"peristyle\", 1, {DICTIONARY_PLACE_NAME}, 2132},\n- {\"cercl\", 1, {DICTIONARY_STREET_TYPE}, 2195},\n- {\"z.a.c.\", 1, {DICTIONARY_PLACE_NAME}, 2146},\n+ {\"faubg\", 1, {DICTIONARY_QUALIFIER}, 2163},\n+ {\"gps\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n+ {\"gare\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"crematorium\", 1, {DICTIONARY_PLACE_NAME}, 2098},\n+ {\"r.n\", 1, {DICTIONARY_STREET_TYPE}, 2295},\n+ {\"centre de sante\", 1, {DICTIONARY_PLACE_NAME}, 2090},\n+ {\"groupement dinteret economique\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n+ {\"grandrue\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"e i\", 1, {DICTIONARY_COMPANY_TYPE}, 1989},\n+ {\"mrs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2057},\n {\"qc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"riv\", 1, {DICTIONARY_SYNONYM}, 2330},\n {\"entre\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"zone damenagement concerte\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"rd pt\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n- {\"marechal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2050},\n- {\"ptr\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n- {\"abbaye\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ile\", 1, {DICTIONARY_QUALIFIER}, 2160},\n- {\"carf\", 1, {DICTIONARY_STREET_TYPE}, 2190},\n- {\"s.c.o.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n- {\"bres\", 1, {DICTIONARY_STREET_TYPE}, 2179},\n+ {\"jtes\", 1, {DICTIONARY_STREET_TYPE}, 2247},\n+ {\"drs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2041},\n+ {\"z a\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n+ {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n+ {\"pt rte\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n+ {\"g bde\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"zup\", 1, {DICTIONARY_PLACE_NAME}, 2154},\n+ {\"sicaf\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"ma\u00eetre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sous\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"hippodrome\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"a s b l\", 1, {DICTIONARY_COMPANY_TYPE}, 1984},\n- {\"place de marche\", 1, {DICTIONARY_PLACE_NAME}, 2133},\n- {\"hs chs\", 1, {DICTIONARY_STREET_TYPE}, 2239},\n+ {\"c cial\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n {\"march\u00e9s\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"p allee\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n+ {\"gd ens\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"chss\", 1, {DICTIONARY_STREET_TYPE}, 2202},\n {\"zone\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"lot\", 1, {DICTIONARY_QUALIFIER}, 2163},\n- {\"h chs\", 1, {DICTIONARY_STREET_TYPE}, 2239},\n+ {\"p ave\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"b p\", 1, {DICTIONARY_POST_OFFICE}, 2155},\n {\"parc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"gdbd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n+ {\"s a o c\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n {\"bureau\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cau\", 1, {DICTIONARY_STREET_TYPE}, 2189},\n- {\"plan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sarl\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"aires\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"m\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"ns\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"lieudit\", 1, {DICTIONARY_QUALIFIER}, 2162},\n {\"en face de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"allees\", 1, {DICTIONARY_STREET_TYPE}, 2170},\n- {\"pae\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n- {\"societe d' economie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"s.a.i.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n- {\"g bvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"vge\", 1, {DICTIONARY_SYNONYM}, 2327},\n- {\"b.p.\", 1, {DICTIONARY_POST_OFFICE}, 2151},\n+ {\"s.p.r.l.u\", 1, {DICTIONARY_COMPANY_TYPE}, 2021},\n+ {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2058},\n+ {\"terre neuve et labrador\", 1, {DICTIONARY_TOPONYM}, 2337},\n+ {\"pav\", 1, {DICTIONARY_PLACE_NAME}, 2134},\n+ {\"avnue\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n {\"biblioth\u00e8que\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"esc\", 1, {DICTIONARY_UNIT}, 2344},\n- {\"grdbd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"rtes\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n- {\"avnus\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"yt\", 1, {DICTIONARY_TOPONYM}, 2341},\n- {\"presquile\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n- {\"z.u.p\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n- {\"gdch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"pt route\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 2141},\n- {\"sca\", 1, {DICTIONARY_COMPANY_TYPE}, 2014},\n- {\"form\", 1, {DICTIONARY_PLACE_NAME}, 2103},\n+ {\"rivi\u00e8re\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"cloi\", 1, {DICTIONARY_STREET_TYPE}, 2208},\n+ {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 2031},\n+ {\"montagne\", 1, {DICTIONARY_PLACE_NAME}, 2126},\n+ {\"petite avenue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grdch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n {\"traverse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jetee\", 1, {DICTIONARY_STREET_TYPE}, 2242},\n- {\"chez\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"z.i.\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n- {\"p rte\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n- {\"p rue\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n- {\"pt ave\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n- {\"avnu\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n+ {\"ile du prince edouard\", 1, {DICTIONARY_TOPONYM}, 2342},\n+ {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 2178},\n+ {\"g chemin\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"fond commun de placement\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"viceamiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 2075},\n+ {\"espa\", 1, {DICTIONARY_STREET_TYPE}, 2224},\n {\"fleuve\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"cr\u00e9matorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pt allees\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n- {\"avens\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"ctr cial\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"gal\", 1, {DICTIONARY_STREET_TYPE}, 2226},\n- {\"r p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n- {\"blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"sprlu\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n- {\"supermarch\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"supermarche\", 1, {DICTIONARY_PLACE_NAME}, 2143},\n+ {\"haut chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n+ {\"g en\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 2061},\n {\"soci\u00e9te momentan\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"hotel de ville\", 1, {DICTIONARY_PLACE_NAME}, 2114},\n {\"mademoiselle\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"lotissement\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"groupement d'int\u00e9r\u00eat \u00e9conomique\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"sud est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"son altesse imperiale\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n+ {\"met\", 1, {DICTIONARY_STREET_TYPE}, 2251},\n+ {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2062},\n {\"mb\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"g blvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"etang\", 1, {DICTIONARY_PLACE_NAME}, 2102},\n+ {\"carf\", 1, {DICTIONARY_STREET_TYPE}, 2194},\n+ {\"avenu\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n+ {\"\u00e9cl\", 1, {DICTIONARY_STREET_TYPE}, 2220},\n {\"cheminement\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n+ {\"bcle\", 1, {DICTIONARY_STREET_TYPE}, 2187},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2029},\n+ {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"mis\", 1, {DICTIONARY_PERSONAL_TITLE}, 2055},\n {\"qu'\", 1, {DICTIONARY_ELISION}, -1},\n {\"marquis\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"en\", 1, {DICTIONARY_SYNONYM}, 2326},\n {\"villages\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"mt\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, 2122},\n- {\"cote\", 1, {DICTIONARY_STREET_TYPE}, 2186},\n- {\"nouvelle ecosse\", 1, {DICTIONARY_TOPONYM}, 2334},\n+ {\"p\", 1, {DICTIONARY_SYNONYM}, 2329},\n {\"soci\u00e9te d'\u00e9conomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"r.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2063},\n+ {\"hle\", 1, {DICTIONARY_PLACE_NAME}, 2109},\n {\"castel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m\u00e9t\", 1, {DICTIONARY_STREET_TYPE}, 2247},\n+ {\"bstd\", 1, {DICTIONARY_PLACE_NAME}, 2079},\n+ {\"passerelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"descente\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"peripherique\", 1, {DICTIONARY_STREET_TYPE}, 2257},\n- {\"grd bld\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"pat\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2027},\n+ {\"\u00e9cls\", 1, {DICTIONARY_STREET_TYPE}, 2221},\n {\"soci\u00e9te anonyme libanaise\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"z\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"p route\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n+ {\"gpes\", 1, {DICTIONARY_COMPANY_TYPE}, 1996},\n+ {\"gd ch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n {\"pointe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"alls\", 1, {DICTIONARY_STREET_TYPE}, 2170},\n- {\"ress\", 1, {DICTIONARY_STREET_TYPE}, 2297},\n- {\"hls\", 1, {DICTIONARY_PLACE_NAME}, 2106},\n+ {\"carriere\", 1, {DICTIONARY_STREET_TYPE}, 2195},\n+ {\"fl\", 1, {DICTIONARY_SYNONYM}, 2327},\n+ {\"foyr\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"dars\", 1, {DICTIONARY_PLACE_NAME}, 2099},\n+ {\"z.a.\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n+ {\"s.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n+ {\"nl\", 1, {DICTIONARY_TOPONYM}, 2337},\n+ {\"b.p\", 1, {DICTIONARY_POST_OFFICE}, 2155},\n+ {\"vrte\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n+ {\"rp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2063},\n {\"\u00e9tablissement d'enseignement sup\u00e9rieur\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ches\", 1, {DICTIONARY_STREET_TYPE}, 2202},\n- {\"espa\", 1, {DICTIONARY_STREET_TYPE}, 2220},\n- {\"trvrs\", 1, {DICTIONARY_STREET_TYPE}, 2309},\n- {\"ctre\", 1, {DICTIONARY_DIRECTIONAL}, 2020},\n+ {\"f.c.p\", 1, {DICTIONARY_COMPANY_TYPE}, 1991},\n+ {\"grd bd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"petites allees\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n+ {\"b ch\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n+ {\"s exc\", 1, {DICTIONARY_PERSONAL_TITLE}, 2072},\n+ {\"cloitre\", 1, {DICTIONARY_STREET_TYPE}, 2208},\n+ {\"pnte\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n+ {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n {\"veuve\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"fr\u00e8re\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"prs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2058},\n- {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 2295},\n- {\"mf\", 1, {DICTIONARY_PLACE_NAME}, 2115},\n+ {\"societe en commandite simple\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"jetees\", 1, {DICTIONARY_STREET_TYPE}, 2247},\n {\"centre pour la jeunesse\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"nu\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"saoc\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n- {\"nu\", 1, {DICTIONARY_TOPONYM}, 2336},\n- {\"cite\", 1, {DICTIONARY_QUALIFIER}, 2155},\n- {\"societe cooperative a responsabilite illimitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n- {\"imps\", 1, {DICTIONARY_STREET_TYPE}, 2241},\n- {\"fos\", 1, {DICTIONARY_STREET_TYPE}, 2223},\n- {\"prch\", 1, {DICTIONARY_UNIT}, 2346},\n- {\"r i\", 1, {DICTIONARY_COMPANY_TYPE}, 1994},\n+ {\"p rt\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n+ {\"forum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 2050},\n+ {\"boulv\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"cimetiere\", 1, {DICTIONARY_PLACE_NAME}, 2093},\n {\"enceinte\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"lieutenant colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"psg\", 1, {DICTIONARY_STREET_TYPE}, 2251},\n {\"zone a urbaniser en priorit\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grd rue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2180},\n+ {\"zad\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n+ {\"s.a.o.g.\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n {\"butte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"routes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"tertes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"care\", 1, {DICTIONARY_STREET_TYPE}, 2191},\n- {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2057},\n- {\"maison de sante\", 1, {DICTIONARY_PLACE_NAME}, 2114},\n- {\"chz\", 1, {DICTIONARY_PERSONAL_TITLE}, 2031},\n+ {\"zone d'amenagement differe\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n+ {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"digs\", 1, {DICTIONARY_STREET_TYPE}, 2218},\n+ {\"terr\", 1, {DICTIONARY_STREET_TYPE}, 2307},\n+ {\"rt\", 1, {DICTIONARY_STREET_TYPE}, 2293},\n+ {\"societe d'investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n {\"promenade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n+ {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 2032},\n {\"nouvelle-\u00e9cosse\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"pavillon\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"central\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"hopital\", 1, {DICTIONARY_PLACE_NAME}, 2108},\n- {\"s c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n+ {\"pkg\", 1, {DICTIONARY_PLACE_NAME}, 2133},\n+ {\"p ch\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n {\"petite\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sainte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n {\"barri\u00eares\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trvs\", 1, {DICTIONARY_STREET_TYPE}, 2309},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2023},\n- {\"gds ens\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"che v\", 1, {DICTIONARY_STREET_TYPE}, 2204},\n+ {\"chl\", 1, {DICTIONARY_STREET_TYPE}, 2200},\n+ {\"a.s.b.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 1988},\n+ {\"grs ens\", 1, {DICTIONARY_STREET_TYPE}, 2238},\n+ {\"s.a.o.g\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n {\"point de recyclage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ronde\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"egl\", 1, {DICTIONARY_PLACE_NAME}, 2096},\n- {\"qrt\", 1, {DICTIONARY_QUALIFIER}, 2165},\n {\"grille\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"quebec\", 1, {DICTIONARY_TOPONYM}, 2339},\n- {\"cht\", 1, {DICTIONARY_STREET_TYPE}, 2088},\n- {\"dars\", 1, {DICTIONARY_PLACE_NAME}, 2095},\n- {\"societe en commandite\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n+ {\"centre cial\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"e.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1989},\n+ {\"s c s\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"presqu\u00eele\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n {\"petite route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2036},\n- {\"pal\", 1, {DICTIONARY_PLACE_NAME}, 2126},\n+ {\"ctrl\", 1, {DICTIONARY_DIRECTIONAL}, 2023},\n+ {\"prc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2132},\n+ {\"m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2059},\n {\"zone industrielle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"cdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2033},\n- {\"blvde\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n+ {\"grd r\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n+ {\"rte\", 1, {DICTIONARY_STREET_TYPE}, 2293},\n+ {\"esps\", 1, {DICTIONARY_STREET_TYPE}, 2226},\n {\"avenues\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"association\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"\u00e9ch\", 1, {DICTIONARY_STREET_TYPE}, 2215},\n- {\"s.i.c.a.v.\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"mar\", 1, {DICTIONARY_PLACE_NAME}, 2117},\n- {\"chv\", 1, {DICTIONARY_STREET_TYPE}, 2200},\n- {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n+ {\"p impasse\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n {\"stade\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"departement\", 1, {DICTIONARY_UNIT}, 2343},\n {\"barri\u00eare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"societe anonyme omanaise generale\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n- {\"s.i.c.a.f\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n- {\"gr r\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"gbd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"raid\", 1, {DICTIONARY_STREET_TYPE}, 2281},\n- {\"memorial\", 1, {DICTIONARY_PLACE_NAME}, 2121},\n- {\"grd rues\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"ecluse\", 1, {DICTIONARY_STREET_TYPE}, 2216},\n- {\"nouvelle-ecosse\", 1, {DICTIONARY_TOPONYM}, 2334},\n+ {\"g rues\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"prql\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n+ {\"z.a.c\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"a ch\", 1, {DICTIONARY_STREET_TYPE}, 2175},\n+ {\"plt\", 1, {DICTIONARY_STREET_TYPE}, 2274},\n {\"soci\u00e9te d'investissement a capital fix\u00e9\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"pe\", 1, {DICTIONARY_TOPONYM}, 2338},\n- {\"s s\", 1, {DICTIONARY_COMPANY_TYPE}, 2018},\n+ {\"maison forestiere\", 1, {DICTIONARY_PLACE_NAME}, 2119},\n+ {\"s.p.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2020},\n+ {\"prom\", 1, {DICTIONARY_STREET_TYPE}, 2281},\n+ {\"ss\", 1, {DICTIONARY_COMPANY_TYPE}, 2022},\n {\"nurserie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gs ens\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n- {\"scri\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n- {\"man\", 1, {DICTIONARY_PLACE_NAME}, 2116},\n- {\"hip\", 1, {DICTIONARY_PLACE_NAME}, 2107},\n+ {\"pt chemin\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n+ {\"cale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cottages\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bc\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"but\", 1, {DICTIONARY_STREET_TYPE}, 2185},\n- {\"sai\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n- {\"s p r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2016},\n {\"residence\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2069},\n- {\"res\", 1, {DICTIONARY_STREET_TYPE}, 2296},\n+ {\"commandant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"boulavard\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n {\"caf\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"appartement\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"pt impasse\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n {\"corniches\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd bvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"app\", 1, {DICTIONARY_UNIT}, 2342},\n+ {\"dsg\", 1, {DICTIONARY_STREET_TYPE}, 2215},\n+ {\"barrieres\", 1, {DICTIONARY_STREET_TYPE}, 2183},\n+ {\"slt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2073},\n {\"salle communale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"residences\", 1, {DICTIONARY_UNIT}, 2348},\n- {\"res\", 1, {DICTIONARY_UNIT}, 2347},\n- {\"s a r\", 1, {DICTIONARY_PERSONAL_TITLE}, 2066},\n- {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n- {\"g.i.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n- {\"s e\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n+ {\"\u00eele du prince \u00e9douard\", 1, {DICTIONARY_TOPONYM}, 2342},\n+ {\"pt rue\", 1, {DICTIONARY_STREET_TYPE}, 2267},\n+ {\"s.a.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n+ {\"s.o.\", 1, {DICTIONARY_DIRECTIONAL}, 2032},\n {\"son altesse\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bers\", 1, {DICTIONARY_STREET_TYPE}, 2182},\n- {\"peri\", 1, {DICTIONARY_STREET_TYPE}, 2278},\n- {\"s c s\", 1, {DICTIONARY_COMPANY_TYPE}, 2013},\n+ {\"avns\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"gpe\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n+ {\"r\", 1, {DICTIONARY_STREET_TYPE}, 2296},\n {\"tour\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2041},\n- {\"vch\", 1, {DICTIONARY_STREET_TYPE}, 2315},\n+ {\"pal\", 1, {DICTIONARY_PLACE_NAME}, 2130},\n+ {\"qc\", 1, {DICTIONARY_TOPONYM}, 2343},\n {\"enterprise individuelle\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"z.a.c.\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"c comm\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"avn\", 1, {DICTIONARY_STREET_TYPE}, 2176},\n {\"restauration rapide\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"super marche\", 1, {DICTIONARY_PLACE_NAME}, 2139},\n- {\"bvd\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"r.i\", 1, {DICTIONARY_COMPANY_TYPE}, 1994},\n- {\"passe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gps\", 1, {DICTIONARY_COMPANY_TYPE}, 1991},\n- {\"grim\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n- {\"boul\", 1, {DICTIONARY_STREET_TYPE}, 2184},\n- {\"rdpt\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n+ {\"foss\", 1, {DICTIONARY_STREET_TYPE}, 2228},\n+ {\"fcp\", 1, {DICTIONARY_COMPANY_TYPE}, 1991},\n+ {\"ft\", 1, {DICTIONARY_PLACE_NAME}, 2106},\n+ {\"passage a niveau\", 1, {DICTIONARY_STREET_TYPE}, 2256},\n+ {\"societe cooperative a responsabilite limitee\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"avs\", 1, {DICTIONARY_STREET_TYPE}, 2181},\n+ {\"gr boul\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"societe anonyme omanaise generale\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n+ {\"s.c.o.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n+ {\"pim\", 1, {DICTIONARY_STREET_TYPE}, 2265},\n+ {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 1999},\n+ {\"maitresse\", 1, {DICTIONARY_PERSONAL_TITLE}, 2052},\n {\"terre plein\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"centre comm\", 1, {DICTIONARY_PLACE_NAME}, 2085},\n- {\"cgne\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n- {\"zone dam\u00e9nagement diff\u00e9r\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n- {\"plt\", 1, {DICTIONARY_STREET_TYPE}, 2270},\n- {\"g.i.e\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n- {\"scop\", 1, {DICTIONARY_COMPANY_TYPE}, 2002},\n+ {\"soci\u00e9te dinvestissement a capital fix\u00e9\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n+ {\"s.i.c.a.v\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n+ {\"sprl\", 1, {DICTIONARY_COMPANY_TYPE}, 2020},\n+ {\"za\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n+ {\"montees\", 1, {DICTIONARY_STREET_TYPE}, 2250},\n {\"p\u00e9riph\u00e9rique\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"c\u00f4teau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"marquise\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"plags\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n {\"via\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"prq\", 1, {DICTIONARY_STREET_TYPE}, 2280},\n+ {\"s.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2022},\n {\"magasin\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2024},\n {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"m'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"f c p\", 1, {DICTIONARY_COMPANY_TYPE}, 1987},\n+ {\"jrds\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, 2117},\n+ {\"clos\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"plateaux\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"societe interne\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n+ {\"grbd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"l dit\", 1, {DICTIONARY_QUALIFIER}, 2166},\n {\"petit chemin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"clinique\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pav\", 1, {DICTIONARY_PLACE_NAME}, 2130},\n+ {\"all\", 1, {DICTIONARY_STREET_TYPE}, 2173},\n {\"grand boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"portqs\", 1, {DICTIONARY_STREET_TYPE}, 2274},\n- {\"metro\", 1, {DICTIONARY_STREET_TYPE}, 2247},\n+ {\"chsv\", 1, {DICTIONARY_STREET_TYPE}, 2207},\n+ {\"rocd\", 1, {DICTIONARY_STREET_TYPE}, 2288},\n+ {\"pt as\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n+ {\"s.a.r.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2070},\n {\"est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"societe dinvestissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n+ {\"potrn\", 1, {DICTIONARY_PLACE_NAME}, 2138},\n {\"\u00eeles\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ile-du-prince-edouard\", 1, {DICTIONARY_TOPONYM}, 2338},\n- {\"gd blvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"cst\", 1, {DICTIONARY_PLACE_NAME}, 2084},\n+ {\"trn\", 1, {DICTIONARY_STREET_TYPE}, 2307},\n {\"escaliers\", 1, {DICTIONARY_UNIT}, -1},\n- {\"pt avn\", 1, {DICTIONARY_STREET_TYPE}, 2260},\n- {\"s.c.r.i\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n+ {\"riviere\", 1, {DICTIONARY_SYNONYM}, 2330},\n+ {\"v am\", 1, {DICTIONARY_PERSONAL_TITLE}, 2075},\n {\"dortoirs\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2309},\n- {\"grd bvd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n- {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2015},\n- {\"s i c a f\", 1, {DICTIONARY_COMPANY_TYPE}, 2004},\n+ {\"pt rt\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n+ {\"ancienne route\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"agglom\", 1, {DICTIONARY_QUALIFIER}, 2156},\n+ {\"form\", 1, {DICTIONARY_PLACE_NAME}, 2107},\n+ {\"impasses\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"charmille\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"grd ch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"e u r l\", 1, {DICTIONARY_COMPANY_TYPE}, 1986},\n- {\"jte\", 1, {DICTIONARY_STREET_TYPE}, 2242},\n- {\"plci\", 1, {DICTIONARY_STREET_TYPE}, 2266},\n- {\"chees\", 1, {DICTIONARY_STREET_TYPE}, 2198},\n- {\"s.a.o.c\", 1, {DICTIONARY_COMPANY_TYPE}, 1998},\n- {\"psty\", 1, {DICTIONARY_PLACE_NAME}, 2132},\n- {\"ctesse\", 1, {DICTIONARY_PERSONAL_TITLE}, 2035},\n- {\"mrs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2053},\n+ {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 2031},\n+ {\"env\", 1, {DICTIONARY_STREET_TYPE}, 2222},\n+ {\"enc\", 1, {DICTIONARY_STREET_TYPE}, 2223},\n+ {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, 2094},\n+ {\"ptas\", 1, {DICTIONARY_STREET_TYPE}, 2268},\n+ {\"musee\", 1, {DICTIONARY_PLACE_NAME}, 2129},\n+ {\"grand rue\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rdpt\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n {\"cour\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rmp\", 1, {DICTIONARY_STREET_TYPE}, 2282},\n- {\"pt rt\", 1, {DICTIONARY_STREET_TYPE}, 2262},\n {\"ma\u00eetres\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"societe deconomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"s.e.m.\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n+ {\"pt allee\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n {\"portique\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"foyer\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"a\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"s s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2065},\n+ {\"societe d'economie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"passage \u00e0 niveau\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cavee\", 1, {DICTIONARY_STREET_TYPE}, 2198},\n {\"s'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"eurl\", 1, {DICTIONARY_COMPANY_TYPE}, 1986},\n- {\"s a o g\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n+ {\"bat\", 1, {DICTIONARY_BUILDING_TYPE}, 1985},\n+ {\"mlles\", 1, {DICTIONARY_PERSONAL_TITLE}, 2049},\n+ {\"ctr comm\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"p avn\", 1, {DICTIONARY_STREET_TYPE}, 2264},\n+ {\"gp\", 1, {DICTIONARY_COMPANY_TYPE}, 1992},\n {\"digues\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"r p j\", 1, {DICTIONARY_PERSONAL_TITLE}, 2060},\n- {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, 2039},\n {\"des\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"frere\", 1, {DICTIONARY_PERSONAL_TITLE}, 2038},\n- {\"mairie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rts\", 1, {DICTIONARY_STREET_TYPE}, 2290},\n+ {\"care\", 1, {DICTIONARY_STREET_TYPE}, 2195},\n+ {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2019},\n+ {\"gr\", 1, {DICTIONARY_SYNONYM}, 2328},\n+ {\"pt\", 1, {DICTIONARY_SYNONYM}, 2329},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pot\", 1, {DICTIONARY_PLACE_NAME}, 2134},\n+ {\"super march\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2143},\n+ {\"soci\u00e9te d\u00e9conomie mixte\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n {\"mont\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n {\"habitation \u00e0 loyer mod\u00e9r\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sur\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"gal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2039},\n {\"m\u00e9morial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"on\", 1, {DICTIONARY_TOPONYM}, 2337},\n- {\"s i c a v\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n+ {\"eglise\", 1, {DICTIONARY_PLACE_NAME}, 2100},\n+ {\"escs\", 1, {DICTIONARY_UNIT}, 2349},\n+ {\"h chs\", 1, {DICTIONARY_STREET_TYPE}, 2243},\n+ {\"deg\", 1, {DICTIONARY_STREET_TYPE}, 2213},\n+ {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2019},\n {\"lotissements\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ch v\", 1, {DICTIONARY_STREET_TYPE}, 2200},\n- {\"ch\", 1, {DICTIONARY_STREET_TYPE}, 2199},\n- {\"gd bd\", 1, {DICTIONARY_STREET_TYPE}, 2229},\n+ {\"au\", 1, {DICTIONARY_STREET_TYPE}, 2283},\n+ {\"groupement d'interet economique\", 1, {DICTIONARY_COMPANY_TYPE}, 1997},\n {\"terre-neuve-et-labrador\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"hauts chemins\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s a r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2008},\n- {\"chapelle\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"garn\", 1, {DICTIONARY_STREET_TYPE}, 2228},\n+ {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 2255},\n+ {\"petite allee\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n {\"soci\u00e9te priv\u00e9e a responsabilit\u00e9 limit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"capte\", 1, {DICTIONARY_PERSONAL_TITLE}, 2030},\n- {\"nl\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 1995},\n- {\"musee\", 1, {DICTIONARY_PLACE_NAME}, 2125},\n+ {\"sk\", 1, {DICTIONARY_TOPONYM}, 2344},\n+ {\"enterprise unipersonnelle a responsabilit\u00e9 limit\u00e9e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"gd blvrd\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n {\"r\u00e9sidences\", 1, {DICTIONARY_UNIT}, -1},\n- {\"esps\", 1, {DICTIONARY_STREET_TYPE}, 2222},\n- {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 2023},\n+ {\"z.a.d\", 1, {DICTIONARY_PLACE_NAME}, 2152},\n {\"carri\u00e8re\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fermes\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grds ens\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"roquet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"societe anonyme libanaise\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n {\"pavillons\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n+ {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2036},\n+ {\"gd rs\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 2028},\n+ {\"brg\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_SYNONYM}, 2157},\n {\"all\u00e9es\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"station\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pavs\", 1, {DICTIONARY_PLACE_NAME}, 2131},\n- {\"cors\", 1, {DICTIONARY_STREET_TYPE}, 2207},\n+ {\"gdr\", 1, {DICTIONARY_STREET_TYPE}, 2236},\n {\"moulin\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"coli\", 1, {DICTIONARY_SYNONYM}, 2324},\n {\"grimpette\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bre\", 1, {DICTIONARY_STREET_TYPE}, 2178},\n- {\"batiment de ferme\", 1, {DICTIONARY_PLACE_NAME}, 2076},\n- {\"rem\", 1, {DICTIONARY_STREET_TYPE}, 2283},\n+ {\"rtde\", 1, {DICTIONARY_STREET_TYPE}, 2292},\n+ {\"s a o g\", 1, {DICTIONARY_COMPANY_TYPE}, 2001},\n+ {\"s a l\", 1, {DICTIONARY_COMPANY_TYPE}, 2000},\n {\"madame\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"grs\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n- {\"mmes\", 1, {DICTIONARY_PERSONAL_TITLE}, 2043},\n- {\"gr rue\", 1, {DICTIONARY_STREET_TYPE}, 2232},\n- {\"trts\", 1, {DICTIONARY_STREET_TYPE}, 2308},\n- {\"rpt\", 1, {DICTIONARY_STREET_TYPE}, 2286},\n- {\"mal\", 1, {DICTIONARY_PERSONAL_TITLE}, 2050},\n- {\"gd en\", 1, {DICTIONARY_STREET_TYPE}, 2231},\n- {\"gie\", 1, {DICTIONARY_COMPANY_TYPE}, 1993},\n+ {\"abe\", 1, {DICTIONARY_PLACE_NAME}, 2076},\n+ {\"tsse\", 1, {DICTIONARY_STREET_TYPE}, 2308},\n+ {\"s.c.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n+ {\"cott\", 1, {DICTIONARY_PLACE_NAME}, 2095},\n+ {\"nte\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n {\"aire\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"agl\", 1, {DICTIONARY_QUALIFIER}, 2152},\n- {\"bp\", 1, {DICTIONARY_POST_OFFICE}, 2151},\n- {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"presqu'ile\", 1, {DICTIONARY_STREET_TYPE}, 2276},\n+ {\"sud est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"s.c.o.p\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n+ {\"chateau\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2092},\n+ {\"gd chemin\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"soci\u00e9te en nom collectif\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"mont\u00e9e\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gd\", 1, {DICTIONARY_SYNONYM}, 2324},\n+ {\"zone dam\u00e9nagement concert\u00e9\", 1, {DICTIONARY_PLACE_NAME}, 2151},\n+ {\"sents\", 1, {DICTIONARY_STREET_TYPE}, 2305},\n+ {\"territoires du nord ouest\", 1, {DICTIONARY_TOPONYM}, 2339},\n {\"march\u00e9 public\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"scs\", 1, {DICTIONARY_COMPANY_TYPE}, 2017},\n {\"ambassade\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mme\", 1, {DICTIONARY_PERSONAL_TITLE}, 2042},\n- {\"pn\", 1, {DICTIONARY_STREET_TYPE}, 2252},\n+ {\"societe momentanee\", 1, {DICTIONARY_COMPANY_TYPE}, 2011},\n+ {\"ldit\", 1, {DICTIONARY_QUALIFIER}, 2166},\n+ {\"boulevarde\", 1, {DICTIONARY_STREET_TYPE}, 2188},\n+ {\"s.a.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2012},\n+ {\"sud ouest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"g ens\", 1, {DICTIONARY_STREET_TYPE}, 2235},\n {\"ruines\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pt a\", 1, {DICTIONARY_STREET_TYPE}, 2259},\n {\"raidillon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"jardin\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"pte\", 1, {DICTIONARY_PLACE_NAME}, 2135},\n- {\"hchs\", 1, {DICTIONARY_STREET_TYPE}, 2239},\n+ {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 2089},\n+ {\"se\", 1, {DICTIONARY_PERSONAL_TITLE}, 2072},\n {\"nt\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"monsieur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s e m\", 1, {DICTIONARY_COMPANY_TYPE}, 2003},\n- {\"zone d'amenagement concerte\", 1, {DICTIONARY_PLACE_NAME}, 2147},\n- {\"vges\", 1, {DICTIONARY_SYNONYM}, 2328},\n- {\"val\", 1, {DICTIONARY_STREET_TYPE}, 2311},\n- {\"prescolaire\", 1, {DICTIONARY_PLACE_NAME}, 2136},\n- {\"gdsen\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n- {\"colombie britannique\", 1, {DICTIONARY_TOPONYM}, 2330},\n- {\"avenus\", 1, {DICTIONARY_STREET_TYPE}, 2177},\n- {\"auto\u00e9cole\", 1, {DICTIONARY_PLACE_NAME}, 2074},\n- {\"crematorium\", 1, {DICTIONARY_PLACE_NAME}, 2094},\n+ {\"z.a.c\", 1, {DICTIONARY_PLACE_NAME}, 2150},\n+ {\"gd bde\", 1, {DICTIONARY_STREET_TYPE}, 2233},\n+ {\"passe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"association sans but lucratif\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"passerelles\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rle\", 1, {DICTIONARY_STREET_TYPE}, 2293},\n- {\"societe d' investissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2005},\n- {\"z a\", 1, {DICTIONARY_PLACE_NAME}, 2144},\n- {\"descentes\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"drs\", 1, {DICTIONARY_PERSONAL_TITLE}, 2037},\n+ {\"cors\", 1, {DICTIONARY_STREET_TYPE}, 2211},\n+ {\"soci\u00e9te dinvestissement a capital variable\", 1, {DICTIONARY_COMPANY_TYPE}, 2009},\n+ {\"z.a\", 1, {DICTIONARY_PLACE_NAME}, 2148},\n+ {\"gch\", 1, {DICTIONARY_STREET_TYPE}, 2234},\n+ {\"chemins\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gr rs\", 1, {DICTIONARY_STREET_TYPE}, 2237},\n+ {\"s.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2068},\n {\"saskatchewan\", 1, {DICTIONARY_TOPONYM}, -1},\n {\"mus\u00e9e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr ch\", 1, {DICTIONARY_STREET_TYPE}, 2230},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2026},\n {\"baron\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pltx\", 1, {DICTIONARY_STREET_TYPE}, 2271},\n- {\"sent\", 1, {DICTIONARY_STREET_TYPE}, 2300},\n- {\"plag\", 1, {DICTIONARY_STREET_TYPE}, 2267},\n- {\"mlle\", 1, {DICTIONARY_PERSONAL_TITLE}, 2044},\n+ {\"societe par actions simplifiee\", 1, {DICTIONARY_COMPANY_TYPE}, 2019},\n+ {\"v rt\", 1, {DICTIONARY_STREET_TYPE}, 2318},\n+ {\"autoecole\", 1, {DICTIONARY_PLACE_NAME}, 2078},\n+ {\"zone dactivites\", 1, {DICTIONARY_PLACE_NAME}, 2149},\n+ {\"s c o p\", 1, {DICTIONARY_COMPANY_TYPE}, 2006},\n {\"rang\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pt r\", 1, {DICTIONARY_STREET_TYPE}, 2263},\n- {\"val\", 1, {DICTIONARY_STREET_TYPE}, 2310},\n+ {\"s.e.m\", 1, {DICTIONARY_COMPANY_TYPE}, 2007},\n+ {\"place de marche\", 1, {DICTIONARY_PLACE_NAME}, 2137},\n+ {\"residence\", 1, {DICTIONARY_UNIT}, 2351},\n+ {\"agglomerati\u00f3n\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"zone d'activites\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 2273},\n {\"un\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"gleannt\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"earann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mairdiog\", 1, {DICTIONARY_STREET_TYPE}, 2389},\n- {\"ullord\", 1, {DICTIONARY_STREET_TYPE}, 2406},\n- {\"p\u00f3na\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"geata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pas\u00e1iste\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"iothlainn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bialann\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sraidbhaile\", 1, {DICTIONARY_STREET_TYPE}, 2402},\n {\"cnoc\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"goirt\u00edn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gleib\", 1, {DICTIONARY_STREET_TYPE}, 2388},\n {\"corr\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gaelscoil\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2405},\n- {\"dumhcha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bothar\", 1, {DICTIONARY_STREET_TYPE}, 2368},\n {\"scaireanna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ambasaid\", 1, {DICTIONARY_PLACE_NAME}, 2362},\n {\"b\u00f3ithr\u00edn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ros\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bri\", 1, {DICTIONARY_STREET_TYPE}, 2362},\n- {\"bulbhard\", 1, {DICTIONARY_STREET_TYPE}, 2365},\n+ {\"gleanntan\", 1, {DICTIONARY_STREET_TYPE}, 2386},\n+ {\"mull\u00e1in\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00f3sta\u00ed\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pasaiste\", 1, {DICTIONARY_STREET_TYPE}, 2396},\n- {\"clos\", 1, {DICTIONARY_STREET_TYPE}, 2368},\n+ {\"p\u00f3na\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e1ras\u00e1in\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"mionarasain\", 1, {DICTIONARY_BUILDING_TYPE}, 2350},\n+ {\"airse\", 1, {DICTIONARY_STREET_TYPE}, 2364},\n {\"duga\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pl\u00e1s\u00f3g\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"foirgnimh\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"mull\u00e1in\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"dumhcha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bailt\u00edn\u00ed\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"graig\", 1, {DICTIONARY_STREET_TYPE}, 2386},\n+ {\"pona\", 1, {DICTIONARY_STREET_TYPE}, 2404},\n+ {\"ullord\", 1, {DICTIONARY_STREET_TYPE}, 2410},\n+ {\"plas\", 1, {DICTIONARY_STREET_TYPE}, 2401},\n+ {\"c\u00e9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grainseach\", 1, {DICTIONARY_STREET_TYPE}, 2391},\n {\"roschoill\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"arasain\", 1, {DICTIONARY_BUILDING_TYPE}, 2351},\n- {\"corran\", 1, {DICTIONARY_STREET_TYPE}, 2371},\n- {\"c\u00e9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cnocan\", 1, {DICTIONARY_STREET_TYPE}, 2373},\n+ {\"ostai\", 1, {DICTIONARY_STREET_TYPE}, 2398},\n+ {\"moinear\", 1, {DICTIONARY_STREET_TYPE}, 2396},\n {\"taobh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pl\u00e1s\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"fothair\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -71557,383 +71570,382 @@\n {\"b\u00falbhard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"faiche\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"barra\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"paraid\", 1, {DICTIONARY_STREET_TYPE}, 2399},\n {\"rae\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gleanntan\", 1, {DICTIONARY_STREET_TYPE}, 2382},\n {\"scoil\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sraidbhaile\", 1, {DICTIONARY_STREET_TYPE}, 2406},\n {\"teaghaise\u00e1in\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"ostai\", 1, {DICTIONARY_STREET_TYPE}, 2394},\n+ {\"arasain\", 1, {DICTIONARY_BUILDING_TYPE}, 2355},\n {\"ard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"caolbhealach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lana\", 1, {DICTIONARY_STREET_TYPE}, 2388},\n+ {\"ce\", 1, {DICTIONARY_STREET_TYPE}, 2380},\n {\"cos\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"c\u00e9imeanna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"moinear\", 1, {DICTIONARY_STREET_TYPE}, 2392},\n+ {\"plasog\", 1, {DICTIONARY_STREET_TYPE}, 2402},\n+ {\"bri\", 1, {DICTIONARY_STREET_TYPE}, 2366},\n {\"gleann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"crosaire\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"leabharlann\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gairdini\", 1, {DICTIONARY_STREET_TYPE}, 2385},\n {\"maird\u00edog\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dim\u00e9in\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mairdiog\", 1, {DICTIONARY_STREET_TYPE}, 2393},\n {\"\u00e1ras\u00e1n\", 1, {DICTIONARY_UNIT}, -1},\n {\"par\u00e1id\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"geata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dimein\", 1, {DICTIONARY_STREET_TYPE}, 2378},\n- {\"airse\", 1, {DICTIONARY_STREET_TYPE}, 2360},\n- {\"sineadh\", 1, {DICTIONARY_STREET_TYPE}, 2404},\n+ {\"pairc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2363},\n+ {\"dionteach\", 1, {DICTIONARY_LEVEL}, 2361},\n+ {\"cosan\", 1, {DICTIONARY_STREET_TYPE}, 2376},\n {\"l\u00f3iste\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"tur\", 1, {DICTIONARY_BUILDING_TYPE}, 2359},\n+ {\"ardan\", 1, {DICTIONARY_STREET_TYPE}, 2365},\n {\"\u00fallord\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ambasaid\", 1, {DICTIONARY_PLACE_NAME}, 2358},\n- {\"cnocan\", 1, {DICTIONARY_STREET_TYPE}, 2369},\n+ {\"oile\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"promanaid\", 1, {DICTIONARY_STREET_TYPE}, 2403},\n+ {\"cumairin\", 1, {DICTIONARY_STREET_TYPE}, 2377},\n+ {\"dimein\", 1, {DICTIONARY_STREET_TYPE}, 2382},\n {\"bogha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"leithlanna\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"sr\u00e1idbhaile\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mointean\", 1, {DICTIONARY_STREET_TYPE}, 2391},\n- {\"rosan\", 1, {DICTIONARY_STREET_TYPE}, 2401},\n+ {\"ceimeanna\", 1, {DICTIONARY_STREET_TYPE}, 2379},\n {\"tr\u00e1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cnoc\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"coillte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"p\u00e1irc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"eastat\", 1, {DICTIONARY_STREET_TYPE}, 2384},\n {\"ceathr\u00fa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"paraid\", 1, {DICTIONARY_STREET_TYPE}, 2395},\n {\"c\u00fairt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"teaghaiseain\", 1, {DICTIONARY_BUILDING_TYPE}, 2353},\n {\"scabhat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gleib\", 1, {DICTIONARY_STREET_TYPE}, 2384},\n+ {\"arasan\", 1, {DICTIONARY_UNIT}, 2411},\n {\"ascaill\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bailtini\", 1, {DICTIONARY_BUILDING_TYPE}, 2360},\n {\"margadh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"b\u00f3thar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"trian\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"colunra\", 1, {DICTIONARY_STREET_TYPE}, 2374},\n {\"proman\u00e1id\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ceide\", 1, {DICTIONARY_STREET_TYPE}, 2374},\n- {\"halla\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"droichead\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"arais\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"c\u00e9ide\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cuirt\", 1, {DICTIONARY_STREET_TYPE}, 2377},\n {\"l\u00e1na\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pona\", 1, {DICTIONARY_STREET_TYPE}, 2400},\n {\"arda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ceathru\", 1, {DICTIONARY_STREET_TYPE}, 2371},\n {\"diamont\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"marglann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pairc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2359},\n {\"naomh\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"calafort\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cosan\", 1, {DICTIONARY_STREET_TYPE}, 2372},\n+ {\"halla\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"main\u00e9ar\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"tur\", 1, {DICTIONARY_BUILDING_TYPE}, 2355},\n- {\"ardan\", 1, {DICTIONARY_STREET_TYPE}, 2361},\n {\"meal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"teach\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"loiste\", 1, {DICTIONARY_BUILDING_TYPE}, 2356},\n+ {\"lana\", 1, {DICTIONARY_STREET_TYPE}, 2392},\n {\"scair\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"promanaid\", 1, {DICTIONARY_STREET_TYPE}, 2399},\n- {\"plas\", 1, {DICTIONARY_STREET_TYPE}, 2397},\n- {\"cumairin\", 1, {DICTIONARY_STREET_TYPE}, 2373},\n- {\"ce\", 1, {DICTIONARY_STREET_TYPE}, 2376},\n {\"bealach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e1irse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"oilean\", 1, {DICTIONARY_STREET_TYPE}, 2397},\n {\"ceapach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gleannan\", 1, {DICTIONARY_STREET_TYPE}, 2383},\n+ {\"rosan\", 1, {DICTIONARY_STREET_TYPE}, 2405},\n {\"gabhal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mainear\", 1, {DICTIONARY_BUILDING_TYPE}, 2354},\n- {\"dugai\", 1, {DICTIONARY_STREET_TYPE}, 2379},\n {\"gaird\u00edn\u00ed\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bothar\", 1, {DICTIONARY_STREET_TYPE}, 2364},\n {\"ard\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"eastat\", 1, {DICTIONARY_STREET_TYPE}, 2380},\n- {\"dionteach\", 1, {DICTIONARY_LEVEL}, 2357},\n+ {\"goirtin\", 1, {DICTIONARY_STREET_TYPE}, 2389},\n+ {\"teaghaiseain\", 1, {DICTIONARY_BUILDING_TYPE}, 2357},\n+ {\"teach\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_PLACE_NAME}, -1},\n+ {\"mullain\", 1, {DICTIONARY_STREET_TYPE}, 2394},\n {\"gort\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"arasan\", 1, {DICTIONARY_UNIT}, 2407},\n {\"m\u00f3in\u00e9ar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"boithrin\", 1, {DICTIONARY_STREET_TYPE}, 2367},\n {\"seamlas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"s\u00edneadh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"garda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"grainseach\", 1, {DICTIONARY_STREET_TYPE}, 2387},\n- {\"colunra\", 1, {DICTIONARY_STREET_TYPE}, 2370},\n+ {\"ceide\", 1, {DICTIONARY_STREET_TYPE}, 2378},\n {\"teaghais\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"ceimeanna\", 1, {DICTIONARY_STREET_TYPE}, 2375},\n {\"sr\u00e1id\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"iostain\", 1, {DICTIONARY_BUILDING_TYPE}, 2353},\n {\"fraoch\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gleann\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sraid\", 1, {DICTIONARY_STREET_TYPE}, 2407},\n {\"cluain\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trian\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cearnog\", 1, {DICTIONARY_STREET_TYPE}, 2366},\n+ {\"cuirt\", 1, {DICTIONARY_STREET_TYPE}, 2381},\n+ {\"bulbhard\", 1, {DICTIONARY_STREET_TYPE}, 2369},\n {\"feirm\", 2, {DICTIONARY_BUILDING_TYPE, DICTIONARY_STREET_TYPE}, -1},\n {\"gr\u00e1inseach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gr\u00e1ig\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"eaglais\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pasaiste\", 1, {DICTIONARY_STREET_TYPE}, 2400},\n {\"duga\u00ed\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gl\u00e9ib\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bruach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bailtini\", 1, {DICTIONARY_BUILDING_TYPE}, 2356},\n+ {\"mionarasain\", 1, {DICTIONARY_BUILDING_TYPE}, 2354},\n {\"cumair\u00edn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"plasog\", 1, {DICTIONARY_STREET_TYPE}, 2398},\n+ {\"sineadh\", 1, {DICTIONARY_STREET_TYPE}, 2408},\n {\"banc\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"d\u00edonteach\", 1, {DICTIONARY_LEVEL}, -1},\n {\"ubhchruth\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"loiste\", 1, {DICTIONARY_BUILDING_TYPE}, 2352},\n+ {\"mointean\", 1, {DICTIONARY_STREET_TYPE}, 2395},\n {\"raon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cl\u00f3s\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"m\u00f3inte\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"croit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"eachlann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"oilean\", 1, {DICTIONARY_STREET_TYPE}, 2393},\n {\"br\u00ed\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"oile\u00e1n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"goirtin\", 1, {DICTIONARY_STREET_TYPE}, 2385},\n+ {\"gleannan\", 1, {DICTIONARY_STREET_TYPE}, 2387},\n+ {\"mainear\", 1, {DICTIONARY_BUILDING_TYPE}, 2358},\n+ {\"clos\", 1, {DICTIONARY_STREET_TYPE}, 2372},\n+ {\"dugai\", 1, {DICTIONARY_STREET_TYPE}, 2383},\n {\"mion\u00e1ras\u00e1in\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"east\u00e1t\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mullain\", 1, {DICTIONARY_STREET_TYPE}, 2390},\n+ {\"graig\", 1, {DICTIONARY_STREET_TYPE}, 2390},\n+ {\"corran\", 1, {DICTIONARY_STREET_TYPE}, 2375},\n {\"tithe\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"boithrin\", 1, {DICTIONARY_STREET_TYPE}, 2363},\n+ {\"cearnog\", 1, {DICTIONARY_STREET_TYPE}, 2370},\n {\"radharc\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ceathru\", 1, {DICTIONARY_STREET_TYPE}, 2367},\n- {\"iostain\", 1, {DICTIONARY_BUILDING_TYPE}, 2349},\n {\"stuara\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sraid\", 1, {DICTIONARY_STREET_TYPE}, 2403},\n {\"t\u00far\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"scoile\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cearn\u00f3g\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ambas\u00e1id\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"iost\u00e1in\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"coill\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gairdini\", 1, {DICTIONARY_STREET_TYPE}, 2381},\n+ {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2409},\n {\"marclann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sgoil\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p\u00e0irc reic\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"t\u00f9r\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pairc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2417},\n {\"cuairt-rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tur\", 1, {DICTIONARY_PLACE_NAME}, 2414},\n {\"cnoc\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sgaoil rathad\", 1, {DICTIONARY_STREET_TYPE}, 2428},\n {\"bulabhard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"p\u00e0irc gn\u00ecomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"br\u00e0igh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"p\u00e0irc gnothachais\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"ceann rathaid\", 1, {DICTIONARY_STREET_TYPE}, 2421},\n {\"flataichean\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"pairc gniomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2408},\n {\"aitreabhan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"promanad\", 1, {DICTIONARY_STREET_TYPE}, 2426},\n {\"sealladh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"braigh\", 1, {DICTIONARY_STREET_TYPE}, 2420},\n+ {\"frith rathad\", 1, {DICTIONARY_STREET_TYPE}, 2426},\n {\"caigeann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ceann-rathaid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bothar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cearnag\", 1, {DICTIONARY_STREET_TYPE}, 2419},\n {\"airc\u00e8ad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"stuagh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cuirt\", 1, {DICTIONARY_STREET_TYPE}, 2421},\n {\"drochaid\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cearn\", 1, {DICTIONARY_STREET_TYPE}, 2422},\n+ {\"sraid\", 1, {DICTIONARY_STREET_TYPE}, 2434},\n {\"measlann\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pairc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2413},\n+ {\"aircead\", 1, {DICTIONARY_STREET_TYPE}, 2419},\n {\"caolraid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"seach rathad\", 1, {DICTIONARY_STREET_TYPE}, 2427},\n- {\"pairc gnothachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2409},\n {\"meadhain\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"iar\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"sgaoil-rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"leabharlann\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"p\u00e0irc reic\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"garradh\", 1, {DICTIONARY_STREET_TYPE}, 2427},\n+ {\"pairead\", 1, {DICTIONARY_STREET_TYPE}, 2429},\n {\"caisteal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cidhe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"slighe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"grainnseach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"raon gniomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2416},\n {\"sreath\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bruthach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bogha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"an\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"cearnag\", 1, {DICTIONARY_STREET_TYPE}, 2423},\n {\"meadhanach\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"p\u00e0irc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"sr\u00e0id\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ceann rathaid\", 1, {DICTIONARY_STREET_TYPE}, 2417},\n- {\"cearn\", 1, {DICTIONARY_STREET_TYPE}, 2418},\n- {\"snaidhm rathaid\", 1, {DICTIONARY_STREET_TYPE}, 2429},\n+ {\"cuirt\", 1, {DICTIONARY_STREET_TYPE}, 2425},\n+ {\"sgaoil rathad\", 1, {DICTIONARY_STREET_TYPE}, 2432},\n+ {\"cuairtrathad\", 1, {DICTIONARY_STREET_TYPE}, 2424},\n {\"uchd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"togalaichean\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"g\u00e0rradh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"c\u00f9irt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ear\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"seachrathad\", 1, {DICTIONARY_STREET_TYPE}, 2431},\n+ {\"seach rathad\", 1, {DICTIONARY_STREET_TYPE}, 2431},\n+ {\"iadh rathad\", 1, {DICTIONARY_STREET_TYPE}, 2428},\n+ {\"ceannrathaid\", 1, {DICTIONARY_STREET_TYPE}, 2421},\n+ {\"cuairt rathad\", 1, {DICTIONARY_STREET_TYPE}, 2424},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"garradh\", 1, {DICTIONARY_STREET_TYPE}, 2423},\n- {\"pairead\", 1, {DICTIONARY_STREET_TYPE}, 2425},\n+ {\"iadhrathad\", 1, {DICTIONARY_STREET_TYPE}, 2428},\n+ {\"sr\u00e0id\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cabhsair\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"promanad\", 1, {DICTIONARY_STREET_TYPE}, 2430},\n {\"loinn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cotaichean\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"stairean\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pairc reic\", 1, {DICTIONARY_BUILDING_TYPE}, 2415},\n+ {\"pairc gniomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2412},\n {\"bealach\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"taighean\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cadha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"crois\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ce\u00e0rn\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"seachrathad\", 1, {DICTIONARY_STREET_TYPE}, 2427},\n- {\"iadh rathad\", 1, {DICTIONARY_STREET_TYPE}, 2424},\n+ {\"stuagh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pairc malairt\", 1, {DICTIONARY_BUILDING_TYPE}, 2414},\n {\"meadhraid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"proman\u00e0d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"doire\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"raon gniomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2412},\n {\"barraid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"tuath\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"cearcall\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sgaoilrathad\", 1, {DICTIONARY_STREET_TYPE}, 2428},\n {\"p\u00e0irc malairt\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"ceannrathaid\", 1, {DICTIONARY_STREET_TYPE}, 2417},\n {\"raon gn\u00ecomhachais\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"cuairt rathad\", 1, {DICTIONARY_STREET_TYPE}, 2420},\n- {\"cuairtrathad\", 1, {DICTIONARY_STREET_TYPE}, 2420},\n- {\"iadhrathad\", 1, {DICTIONARY_STREET_TYPE}, 2424},\n- {\"sraid\", 1, {DICTIONARY_STREET_TYPE}, 2430},\n+ {\"snaidhmrathaid\", 1, {DICTIONARY_STREET_TYPE}, 2433},\n+ {\"sgaoilrathad\", 1, {DICTIONARY_STREET_TYPE}, 2432},\n {\"corran\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"craobhraid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"iadh-rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ce\u00e0rnag\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pairc reic\", 1, {DICTIONARY_BUILDING_TYPE}, 2411},\n+ {\"pairc gnothachais\", 1, {DICTIONARY_BUILDING_TYPE}, 2413},\n {\"croit\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ceum\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"snaidhm-rathaid\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"braigh\", 1, {DICTIONARY_STREET_TYPE}, 2416},\n+ {\"snaidhm rathaid\", 1, {DICTIONARY_STREET_TYPE}, 2433},\n {\"deas\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"pair\u00e8ad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"frith rathad\", 1, {DICTIONARY_STREET_TYPE}, 2422},\n- {\"pairc malairt\", 1, {DICTIONARY_BUILDING_TYPE}, 2410},\n- {\"aircead\", 1, {DICTIONARY_STREET_TYPE}, 2415},\n+ {\"tur\", 1, {DICTIONARY_PLACE_NAME}, 2418},\n+ {\"ear\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"seach-rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e0rainn\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u00e0ilean\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"frith-rathad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"malla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"clobhsa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"snaidhmrathaid\", 1, {DICTIONARY_STREET_TYPE}, 2429},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2433},\n+ {\"rda\", 1, {DICTIONARY_STREET_TYPE}, 2453},\n+ {\"travesia\", 1, {DICTIONARY_STREET_TYPE}, 2458},\n+ {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2444},\n {\"avenida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"avd\", 1, {DICTIONARY_STREET_TYPE}, 2443},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2436},\n+ {\"ruas\", 1, {DICTIONARY_STREET_TYPE}, 2456},\n+ {\"debaixo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"paseo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nordeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"nel\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2440},\n {\"nela\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"baixada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"suroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"rbla\", 1, {DICTIONARY_STREET_TYPE}, 2448},\n- {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 2445},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2447},\n {\"lo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"subida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rtda\", 1, {DICTIONARY_STREET_TYPE}, 2454},\n {\"o\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},\n {\"nelas\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2435},\n {\"esquerda\", 1, {DICTIONARY_UNIT}, -1},\n {\"ruela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"xunto\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"autovia\", 1, {DICTIONARY_STREET_TYPE}, 2445},\n {\"autov\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sueste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"los\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2436},\n {\"enriba\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"rda\", 1, {DICTIONARY_STREET_TYPE}, 2449},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2432},\n+ {\"pracina\", 1, {DICTIONARY_STREET_TYPE}, 2450},\n+ {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 2444},\n {\"r\u00faa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"auto\", 1, {DICTIONARY_STREET_TYPE}, 2442},\n {\"norte\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2437},\n+ {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"\u00e1\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"al lado\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"alameda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2443},\n+ {\"autop\", 1, {DICTIONARY_STREET_TYPE}, 2446},\n {\"praza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dela\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"enfronte\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"detras\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"sbida\", 1, {DICTIONARY_STREET_TYPE}, 2453},\n- {\"via\", 1, {DICTIONARY_STREET_TYPE}, 2455},\n+ {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 2456},\n {\"noroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"viela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00f3\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"do\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"entre\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"defronte\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"r\", 1, {DICTIONARY_STREET_TYPE}, 2451},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"leste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"trav\", 1, {DICTIONARY_STREET_TYPE}, 2454},\n {\"al\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 2440},\n {\"encima\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"suba\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pracina\", 1, {DICTIONARY_STREET_TYPE}, 2446},\n+ {\"este\", 1, {DICTIONARY_DIRECTIONAL}, 2435},\n+ {\"auto\", 1, {DICTIONARY_STREET_TYPE}, 2446},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2441},\n {\"cerca\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"con\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"autop\", 1, {DICTIONARY_STREET_TYPE}, 2442},\n+ {\"przla\", 1, {DICTIONARY_STREET_TYPE}, 2451},\n {\"para\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2442},\n {\"costa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"deles\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 2452},\n+ {\"via\", 1, {DICTIONARY_STREET_TYPE}, 2459},\n+ {\"suroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"y\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2438},\n {\"rotonda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2440},\n+ {\"unha\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"traves\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e9\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"delas\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"rambla\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2435},\n- {\"debaixo\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"r\", 1, {DICTIONARY_STREET_TYPE}, 2455},\n+ {\"avda\", 1, {DICTIONARY_STREET_TYPE}, 2447},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"rua\", 1, {DICTIONARY_STREET_TYPE}, 2451},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2443},\n+ {\"viela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"praci\u00f1a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 2449},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"sbida\", 1, {DICTIONARY_STREET_TYPE}, 2457},\n {\"cami\u00f1o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"trav\", 1, {DICTIONARY_STREET_TYPE}, 2458},\n+ {\"camino\", 1, {DICTIONARY_STREET_TYPE}, 2448},\n {\"prazuela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"la\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"glorieta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"encosta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"oeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"deles\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"neles\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"este\", 1, {DICTIONARY_DIRECTIONAL}, 2431},\n {\"estrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 2445},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2437},\n {\"sur\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"travesia\", 1, {DICTIONARY_STREET_TYPE}, 2454},\n- {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2440},\n {\"ronda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"r\u00faas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"przla\", 1, {DICTIONARY_STREET_TYPE}, 2447},\n {\"sendeiro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ruas\", 1, {DICTIONARY_STREET_TYPE}, 2452},\n {\"del\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"ata\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2444},\n {\"as\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2434},\n+ {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2444},\n+ {\"rbla\", 1, {DICTIONARY_STREET_TYPE}, 2452},\n {\"v\u00eda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"avda\", 1, {DICTIONARY_STREET_TYPE}, 2443},\n- {\"unha\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2439},\n- {\"rtda\", 1, {DICTIONARY_STREET_TYPE}, 2450},\n- {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2438},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2439},\n+ {\"avd\", 1, {DICTIONARY_STREET_TYPE}, 2447},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 2449},\n+ {\"rua\", 1, {DICTIONARY_STREET_TYPE}, 2455},\n {\"autopista\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2431},\n- {\"camino\", 1, {DICTIONARY_STREET_TYPE}, 2444},\n+ {\"con\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"os\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"autovia\", 1, {DICTIONARY_STREET_TYPE}, 2441},\n {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2440},\n {\"las\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"dereita\", 1, {DICTIONARY_UNIT}, -1},\n {\"un\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"wag\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2457},\n {\"waj\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"w\", 1, {DICTIONARY_STREET_TYPE}, 2457},\n {\"w\u00e4j\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"waeg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2461},\n {\"stross\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"waej\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2459},\n- {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2456},\n- {\"w\", 1, {DICTIONARY_STREET_TYPE}, 2458},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 2456},\n- {\"waeg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2457},\n- {\"w.\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2459},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 2460},\n+ {\"w.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2462},\n+ {\"w.\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2463},\n+ {\"waej\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2463},\n+ {\"w.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2461},\n {\"w\u00e4g\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"gass\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"w.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2458},\n+ {\"wag\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 2461},\n+ {\"g\u00e0ss\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"w\", 1, {DICTIONARY_STREET_TYPE}, 2461},\n {\"platz\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"hof\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"w.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2457},\n- {\"g\u00e0ss\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"w\", 1, {DICTIONARY_STREET_TYPE}, 2462},\n+ {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 2460},\n {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u05db\u05d9\u05db\u05e8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u05d4\u05e8\u05d1\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n@@ -71945,2017 +71957,2017 @@\n {\"\u05db\u05d1\u05d9\u05e9 \u05e8\u05d0\u05e9\u05d9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u05e9\u05d3\u05e8\u05d5\u05ea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u05e8\u05d1\u05d9\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bazar\", 1, {DICTIONARY_STREET_TYPE}, 2460},\n+ {\"bazar\", 1, {DICTIONARY_STREET_TYPE}, 2464},\n {\"marg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bazaar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nagar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"zgrada\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2463},\n {\"bulevar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"naselje\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"c\", 1, {DICTIONARY_STREET_TYPE}, 2465},\n {\"avenija\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"klanac\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 2461},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 2462},\n+ {\"c\", 1, {DICTIONARY_STREET_TYPE}, 2469},\n {\"aleja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 2467},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 2465},\n+ {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 2468},\n {\"kneza\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 2467},\n {\"\u0161etali\u0161te\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 2464},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 2471},\n {\"kraljice\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"trg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"most\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"put\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cesta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 2466},\n {\"stube\", 1, {DICTIONARY_UNIT}, -1},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"setaliste\", 1, {DICTIONARY_STREET_TYPE}, 2466},\n {\"kralja\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"prilaz\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"svetog\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"setaliste\", 1, {DICTIONARY_STREET_TYPE}, 2470},\n+ {\"eszaknyugat\", 1, {DICTIONARY_DIRECTIONAL}, 2476},\n {\"d\u00e9lnyugat\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"lejt\u0151\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"k\u00f6z\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"delnyugat\", 1, {DICTIONARY_DIRECTIONAL}, 2469},\n {\"t\u00e9r\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"korond\", 1, {DICTIONARY_STREET_TYPE}, 2478},\n- {\"krnd\", 1, {DICTIONARY_STREET_TYPE}, 2478},\n- {\"k\u00f6r\u00f6nd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"del\", 1, {DICTIONARY_DIRECTIONAL}, 2472},\n+ {\"korond\", 1, {DICTIONARY_STREET_TYPE}, 2482},\n+ {\"l\u00e9pcs\u0151\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"dulo\", 1, {DICTIONARY_STREET_TYPE}, 2481},\n {\"\u00e9s\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"\u00e9szakkeleti\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"park\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"az\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"d\u00e9l\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"rpt\", 1, {DICTIONARY_STREET_TYPE}, 2483},\n- {\"kert\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"u\", 1, {DICTIONARY_STREET_TYPE}, 2487},\n+ {\"korut\", 1, {DICTIONARY_STREET_TYPE}, 2483},\n+ {\"tere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nyugat\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"mezo\", 1, {DICTIONARY_STREET_TYPE}, 2482},\n+ {\"szt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2478},\n+ {\"mez\u0151\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"szent\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"arok\", 1, {DICTIONARY_STREET_TYPE}, 2476},\n {\"u\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"utca\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"szt\", 1, {DICTIONARY_PERSONAL_TITLE}, 2474},\n+ {\"eszak\", 1, {DICTIONARY_DIRECTIONAL}, 2475},\n+ {\"mezo\", 1, {DICTIONARY_STREET_TYPE}, 2486},\n+ {\"setany\", 1, {DICTIONARY_STREET_TYPE}, 2488},\n {\"\u00e9szak\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"d\u00e9lkeleti\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"utja\", 1, {DICTIONARY_STREET_TYPE}, 2489},\n- {\"sugarut\", 1, {DICTIONARY_STREET_TYPE}, 2485},\n {\"s\u00e9t\u00e1ny\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dulo\", 1, {DICTIONARY_STREET_TYPE}, 2477},\n- {\"setany\", 1, {DICTIONARY_STREET_TYPE}, 2484},\n- {\"ter\", 1, {DICTIONARY_STREET_TYPE}, 2486},\n- {\"\u00e1rok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"lejto\", 1, {DICTIONARY_STREET_TYPE}, 2485},\n+ {\"ter\", 1, {DICTIONARY_STREET_TYPE}, 2490},\n+ {\"es\", 1, {DICTIONARY_STOPWORD}, 2479},\n+ {\"sugarut\", 1, {DICTIONARY_STREET_TYPE}, 2489},\n {\"\u00fat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"liget\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"krt\", 1, {DICTIONARY_STREET_TYPE}, 2483},\n+ {\"krnd\", 1, {DICTIONARY_STREET_TYPE}, 2482},\n {\"\u00e9szaknyugat\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"es\", 1, {DICTIONARY_STOPWORD}, 2475},\n- {\"delkeleti\", 1, {DICTIONARY_DIRECTIONAL}, 2470},\n- {\"krt\", 1, {DICTIONARY_STREET_TYPE}, 2479},\n- {\"eszak\", 1, {DICTIONARY_DIRECTIONAL}, 2471},\n- {\"tere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"kert\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u00fatja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"k\u00f6r\u00fat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kelet\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"sug\u00e1r\u00fat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mez\u0151\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"koz\", 1, {DICTIONARY_STREET_TYPE}, 2484},\n {\"sor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"delkeleti\", 1, {DICTIONARY_DIRECTIONAL}, 2474},\n+ {\"utja\", 1, {DICTIONARY_STREET_TYPE}, 2493},\n {\"rakpart\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"koz\", 1, {DICTIONARY_STREET_TYPE}, 2480},\n {\"egy\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"l\u00e9pcs\u0151\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"k\u00f6r\u00f6nd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ut\", 1, {DICTIONARY_STREET_TYPE}, 2492},\n+ {\"d\u0171l\u0151\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"arok\", 1, {DICTIONARY_STREET_TYPE}, 2480},\n {\"fasor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"eszakkeleti\", 1, {DICTIONARY_DIRECTIONAL}, 2473},\n- {\"eszaknyugat\", 1, {DICTIONARY_DIRECTIONAL}, 2472},\n- {\"lejto\", 1, {DICTIONARY_STREET_TYPE}, 2481},\n- {\"\u00fatja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ut\", 1, {DICTIONARY_STREET_TYPE}, 2488},\n- {\"del\", 1, {DICTIONARY_DIRECTIONAL}, 2468},\n- {\"korut\", 1, {DICTIONARY_STREET_TYPE}, 2479},\n- {\"d\u0171l\u0151\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"k\u00f6r\u00fat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u00e1rok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"liget\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"delnyugat\", 1, {DICTIONARY_DIRECTIONAL}, 2473},\n+ {\"rpt\", 1, {DICTIONARY_STREET_TYPE}, 2487},\n+ {\"eszakkeleti\", 1, {DICTIONARY_DIRECTIONAL}, 2477},\n+ {\"u\", 1, {DICTIONARY_STREET_TYPE}, 2491},\n+ {\"jln poros\", 1, {DICTIONARY_STREET_TYPE}, 2503},\n {\"jalan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jl.poros\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n- {\"jln.poros\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n- {\"jl\", 1, {DICTIONARY_STREET_TYPE}, 2491},\n- {\"jln pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n+ {\"jl lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n+ {\"jl pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n {\"alun-alun\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jln.lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n+ {\"jln lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n {\"gang\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jl.pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n+ {\"jln\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n+ {\"jl.desa\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n+ {\"jl.utama\", 1, {DICTIONARY_STREET_TYPE}, 2506},\n {\"lorong\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tengah\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"jl raya\", 1, {DICTIONARY_STREET_TYPE}, 2504},\n+ {\"barat daya\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"jalan utama\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jl tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n- {\"jln.lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n- {\"barat daya\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jl.lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n- {\"jl pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n- {\"jl.lintas\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n- {\"tengah\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jln raya\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n- {\"jl.desa\", 1, {DICTIONARY_STREET_TYPE}, 2493},\n+ {\"jln besar\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n+ {\"jln.utama\", 1, {DICTIONARY_STREET_TYPE}, 2506},\n+ {\"jln utama\", 1, {DICTIONARY_STREET_TYPE}, 2506},\n {\"gedung\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"jl tol\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n- {\"jl desa\", 1, {DICTIONARY_STREET_TYPE}, 2493},\n+ {\"jl.pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n+ {\"jl.pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n+ {\"jln tol\", 1, {DICTIONARY_STREET_TYPE}, 2505},\n {\"jalur\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jln.poros\", 1, {DICTIONARY_STREET_TYPE}, 2503},\n {\"perkebunan\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"alunalun\", 1, {DICTIONARY_STREET_TYPE}, 2490},\n+ {\"jln pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n+ {\"jl.besar\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n+ {\"jln.tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n {\"timur\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jl pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n- {\"pulau\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"timur laut\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"utama\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"jln.besar\", 1, {DICTIONARY_STREET_TYPE}, 2492},\n- {\"jl besar\", 1, {DICTIONARY_STREET_TYPE}, 2492},\n+ {\"jembatan\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"jl.raya\", 1, {DICTIONARY_STREET_TYPE}, 2504},\n+ {\"jl desa\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n {\"jalan pedesaan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln poros\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n+ {\"jl pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n+ {\"jln.lintas\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n {\"jalan raya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n- {\"jl.tol\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n {\"jenderal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jln.pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n+ {\"jln lintas\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n {\"jalan besar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln utama\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n+ {\"jl.lintas\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n+ {\"jln.tol\", 1, {DICTIONARY_STREET_TYPE}, 2505},\n {\"pangeran\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jl.pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n+ {\"selatan\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"kampung\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"jl.lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n+ {\"jl.tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n+ {\"alunalun\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n {\"jalan tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln besar\", 1, {DICTIONARY_STREET_TYPE}, 2492},\n+ {\"jln desa\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n+ {\"jln.pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n {\"jalan pemukiman\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jembatan\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"jln tol\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n- {\"jl lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n+ {\"jln.raya\", 1, {DICTIONARY_STREET_TYPE}, 2504},\n+ {\"jl poros\", 1, {DICTIONARY_STREET_TYPE}, 2503},\n+ {\"jl lintas\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n+ {\"jl\", 1, {DICTIONARY_STREET_TYPE}, 2495},\n+ {\"jl tol\", 1, {DICTIONARY_STREET_TYPE}, 2505},\n {\"utara\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jl.tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n {\"jalan poros\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jln.pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n {\"puri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jl.raya\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n- {\"jln lintas\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n- {\"jln.tol\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n- {\"jl poros\", 1, {DICTIONARY_STREET_TYPE}, 2499},\n- {\"jl utama\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n- {\"jln.tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n- {\"jln desa\", 1, {DICTIONARY_STREET_TYPE}, 2493},\n- {\"selatan\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"jln pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2501},\n+ {\"jln.desa\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n+ {\"jl tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n+ {\"pulau\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"alun alun\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n {\"kota\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"jl.tol\", 1, {DICTIONARY_STREET_TYPE}, 2505},\n {\"jalan lingkar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln.pemukiman\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n {\"jalan desa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"alun alun\", 1, {DICTIONARY_STREET_TYPE}, 2490},\n- {\"jl.utama\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n- {\"jln.raya\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n {\"barat laut\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jl lintas\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n {\"mesjid\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"jl.poros\", 1, {DICTIONARY_STREET_TYPE}, 2503},\n {\"kompleks\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"blok\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"kampong\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"jln tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2494},\n {\"jalan lintas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jl.besar\", 1, {DICTIONARY_STREET_TYPE}, 2492},\n {\"raja\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sultan\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"tenggara\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"barat\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"imam\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"jln.desa\", 1, {DICTIONARY_STREET_TYPE}, 2493},\n {\"jalan tol\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jln raya\", 1, {DICTIONARY_STREET_TYPE}, 2504},\n {\"pondok\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jln\", 1, {DICTIONARY_STREET_TYPE}, 2491},\n- {\"jln pedesaan\", 1, {DICTIONARY_STREET_TYPE}, 2497},\n- {\"jl raya\", 1, {DICTIONARY_STREET_TYPE}, 2500},\n- {\"jln.lintas\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n+ {\"jl besar\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n+ {\"jln tol lingkar\", 1, {DICTIONARY_STREET_TYPE}, 2498},\n+ {\"jln.besar\", 1, {DICTIONARY_STREET_TYPE}, 2496},\n+ {\"jl utama\", 1, {DICTIONARY_STREET_TYPE}, 2506},\n {\"terowongan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln.utama\", 1, {DICTIONARY_STREET_TYPE}, 2502},\n+ {\"sel\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"h\u00e1ls\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"land\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"hl\u00ed\u00f0\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"sel\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"byggo\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2508},\n {\"vegur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"str\u00e6ti\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"bar\u00f0\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"fell\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"borg\", 3, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"byggo\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2504},\n {\"hjalli\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"m\u00fali\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"lundur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"torg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"hlio\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2507},\n- {\"tun\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2510},\n+ {\"baro\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2507},\n {\"nes\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"vegi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vangur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vellir\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"t\u00fan\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"muli\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2512},\n+ {\"straeti\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2513},\n+ {\"hlio\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2511},\n {\"sendi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"baro\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2503},\n {\"melur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"braut\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"bygg\u00f0\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"gata\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"hals\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2506},\n- {\"straeti\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2509},\n- {\"muli\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2508},\n+ {\"teigur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"vellir\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"hals\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2510},\n+ {\"t\u00fan\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"grund\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"holt\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"ger\u00f0i\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"borgir\", 3, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"geroi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2505},\n+ {\"tun\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2514},\n {\"hagi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"teigur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"vangur\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"geroi\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 2509},\n {\"tribunale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vta\", 1, {DICTIONARY_STREET_TYPE}, 2842},\n+ {\"g.i.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n {\"agenzia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"colonia\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"s.da\", 1, {DICTIONARY_STREET_TYPE}, 2786},\n- {\"grso\", 1, {DICTIONARY_SYNONYM}, 2901},\n- {\"svc\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n+ {\"nov\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"scrl\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n+ {\"pro\", 1, {DICTIONARY_STREET_TYPE}, 2775},\n {\"giulio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"str st\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"stt\", 1, {DICTIONARY_STREET_TYPE}, 2808},\n+ {\"localita\", 1, {DICTIONARY_STREET_TYPE}, 2763},\n+ {\"cda\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n {\"nel\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"dello\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"casa\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"str statale\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"anta\", 1, {DICTIONARY_SYNONYM}, 2847},\n- {\"p.za\", 1, {DICTIONARY_STREET_TYPE}, 2764},\n- {\"for\", 1, {DICTIONARY_STREET_TYPE}, 2741},\n+ {\"madne\", 1, {DICTIONARY_SYNONYM}, 2928},\n {\"cavaliere ufficiale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sig.na\", 1, {DICTIONARY_PERSONAL_TITLE}, 2581},\n {\"catacomba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"chetta\", 1, {DICTIONARY_PLACE_NAME}, 2635},\n- {\"fort.one\", 1, {DICTIONARY_PLACE_NAME}, 2655},\n- {\"ind.ia\", 1, {DICTIONARY_SYNONYM}, 2907},\n- {\"c.letto\", 1, {DICTIONARY_PLACE_NAME}, 2619},\n- {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n- {\"mri\", 1, {DICTIONARY_SYNONYM}, 2936},\n- {\"pzt\", 1, {DICTIONARY_STREET_TYPE}, 2766},\n- {\"std\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n- {\"inferiori\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"b.sa\", 1, {DICTIONARY_SYNONYM}, 2859},\n+ {\"accada\", 1, {DICTIONARY_PLACE_NAME}, 2591},\n+ {\"dec\", 1, {DICTIONARY_SYNONYM}, 2881},\n+ {\"snc\", 1, {DICTIONARY_NO_ADDRESS}, 2541},\n+ {\"frz\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n+ {\"gr.ta\", 1, {DICTIONARY_SYNONYM}, 2906},\n+ {\"prof.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2571},\n+ {\"tvc\", 1, {DICTIONARY_STREET_TYPE}, 2823},\n+ {\"s.a.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2528},\n+ {\"s.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2530},\n+ {\"cusa\", 1, {DICTIONARY_STREET_TYPE}, 2728},\n {\"nostra\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cat\", 1, {DICTIONARY_STREET_TYPE}, 2721},\n {\"allo\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"a.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2512},\n+ {\"occid.le\", 1, {DICTIONARY_DIRECTIONAL}, 2535},\n {\"cartiera\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gie\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n- {\"borg.a\", 1, {DICTIONARY_QUALIFIER}, 2688},\n- {\"alb.o\", 1, {DICTIONARY_PLACE_NAME}, 2595},\n- {\"p.cola\", 1, {DICTIONARY_SYNONYM}, 2951},\n- {\"madna\", 1, {DICTIONARY_SYNONYM}, 2923},\n- {\"s.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n- {\"clle\", 1, {DICTIONARY_SYNONYM}, 2870},\n+ {\"edif.o\", 1, {DICTIONARY_UNIT}, 2964},\n+ {\"bga\", 1, {DICTIONARY_STREET_TYPE}, 2692},\n+ {\"mlo\", 1, {DICTIONARY_STREET_TYPE}, 2764},\n+ {\"cav uff\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n+ {\"catt.le\", 1, {DICTIONARY_PLACE_NAME}, 2635},\n {\"cupa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pad.ne\", 1, {DICTIONARY_PLACE_NAME}, 2677},\n+ {\"g i e\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n {\"cappella\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"casma\", 1, {DICTIONARY_PLACE_NAME}, 2620},\n- {\"rp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2570},\n+ {\"fortzio\", 1, {DICTIONARY_PLACE_NAME}, 2660},\n {\"strada comunale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"forc.la\", 1, {DICTIONARY_STREET_TYPE}, 2740},\n {\"occidentale\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"discesa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fraz.e\", 1, {DICTIONARY_STREET_TYPE}, 2742},\n- {\"stc\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n- {\"strte\", 1, {DICTIONARY_STREET_TYPE}, 2811},\n+ {\"strada statale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"varco\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"frazi\", 1, {DICTIONARY_STREET_TYPE}, 2747},\n {\"da\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sca\", 1, {DICTIONARY_STREET_TYPE}, 2790},\n- {\"p.cole\", 1, {DICTIONARY_SYNONYM}, 2952},\n- {\"c.llo\", 1, {DICTIONARY_SYNONYM}, 2871},\n- {\"l.go\", 1, {DICTIONARY_STREET_TYPE}, 2750},\n- {\"caffe\", 1, {DICTIONARY_PLACE_NAME}, 2609},\n- {\"ghi\", 1, {DICTIONARY_SYNONYM}, 2889},\n- {\"altza\", 1, {DICTIONARY_SYNONYM}, 2845},\n- {\"nav.i\", 1, {DICTIONARY_SYNONYM}, 2938},\n- {\"aut.de\", 1, {DICTIONARY_STREET_TYPE}, 2709},\n- {\"profssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2567},\n- {\"vs\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n+ {\"rii\", 1, {DICTIONARY_STREET_TYPE}, 2781},\n+ {\"gall.a\", 1, {DICTIONARY_STREET_TYPE}, 2661},\n+ {\"sve\", 1, {DICTIONARY_STREET_TYPE}, 2808},\n+ {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 2547},\n+ {\"s.ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2586},\n+ {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 2548},\n+ {\"anfiteatro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"villa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"str prov\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"mrno\", 1, {DICTIONARY_SYNONYM}, 2929},\n {\"pontile\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"comunale\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"str reginale\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"cat.be\", 1, {DICTIONARY_PLACE_NAME}, 2630},\n+ {\"arcip.ghi\", 1, {DICTIONARY_SYNONYM}, 2856},\n+ {\"lagto\", 1, {DICTIONARY_SYNONYM}, 2921},\n {\"grandi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2533},\n {\"viscontessa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"v.p\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n {\"molino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"alz\", 1, {DICTIONARY_STREET_TYPE}, 2703},\n- {\"s.a.g.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n- {\"bn.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2542},\n- {\"fno\", 1, {DICTIONARY_PLACE_NAME}, 2653},\n- {\"camp.gio\", 1, {DICTIONARY_PLACE_NAME}, 2611},\n- {\"fatt.a\", 1, {DICTIONARY_PLACE_NAME}, 2645},\n+ {\"sudovest\", 1, {DICTIONARY_DIRECTIONAL}, 2540},\n+ {\"cla\", 1, {DICTIONARY_SYNONYM}, 2870},\n+ {\"sacca\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"biv\", 1, {DICTIONARY_STREET_TYPE}, 2716},\n {\"bagno\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ferrra\", 1, {DICTIONARY_PLACE_NAME}, 2646},\n- {\"pcolo\", 1, {DICTIONARY_SYNONYM}, 2954},\n- {\"anfit.i\", 1, {DICTIONARY_PLACE_NAME}, 2596},\n+ {\"f.lli\", 1, {DICTIONARY_SYNONYM}, 2891},\n+ {\"osteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"int.no\", 1, {DICTIONARY_SYNONYM}, 2920},\n {\"lungotevere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sda\", 1, {DICTIONARY_STREET_TYPE}, 2786},\n- {\"ministro\", 1, {DICTIONARY_PERSONAL_TITLE}, 2561},\n+ {\"sten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2586},\n+ {\"autale\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n+ {\"gr.po\", 1, {DICTIONARY_SYNONYM}, 2909},\n+ {\"lungo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n+ {\"osple\", 1, {DICTIONARY_PLACE_NAME}, 2679},\n+ {\"spa\", 1, {DICTIONARY_COMPANY_TYPE}, 2527},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n+ {\"serg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2581},\n+ {\"gge\", 1, {DICTIONARY_UNIT}, 2965},\n+ {\"pescheria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"militare\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"internazionali\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"pizzeria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p.le\", 1, {DICTIONARY_STREET_TYPE}, 2769},\n+ {\"contra'\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n {\"autostrade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n- {\"lungo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n- {\"v.s\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n- {\"fta\", 1, {DICTIONARY_STREET_TYPE}, 2737},\n- {\"internazionali\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"lag.to\", 1, {DICTIONARY_SYNONYM}, 2917},\n- {\"spd\", 1, {DICTIONARY_STREET_TYPE}, 2794},\n- {\"pizzeria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"l.go\", 1, {DICTIONARY_SYNONYM}, 2755},\n- {\"carc.e\", 1, {DICTIONARY_PLACE_NAME}, 2616},\n- {\"nve\", 1, {DICTIONARY_SYNONYM}, 2946},\n- {\"ferr.ria\", 1, {DICTIONARY_PLACE_NAME}, 2648},\n- {\"s.c\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n- {\"b.ghi\", 1, {DICTIONARY_QUALIFIER}, 2690},\n- {\"p.coli\", 1, {DICTIONARY_SYNONYM}, 2953},\n- {\"font.ile\", 1, {DICTIONARY_SYNONYM}, 2883},\n- {\"anfito\", 1, {DICTIONARY_PLACE_NAME}, 2597},\n- {\"distill.a\", 1, {DICTIONARY_PLACE_NAME}, 2641},\n- {\"comm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2548},\n- {\"gr uff\", 1, {DICTIONARY_PERSONAL_TITLE}, 2557},\n- {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"c.tina\", 1, {DICTIONARY_UNIT}, 2956},\n+ {\"distilla\", 1, {DICTIONARY_PLACE_NAME}, 2645},\n+ {\"b.mento\", 1, {DICTIONARY_PLACE_NAME}, 2604},\n+ {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n+ {\"dottore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"naz.li\", 1, {DICTIONARY_SYNONYM}, 2945},\n+ {\"str.te\", 1, {DICTIONARY_STREET_TYPE}, 2815},\n+ {\"ind.ali\", 1, {DICTIONARY_SYNONYM}, 2913},\n+ {\"bas.che\", 1, {DICTIONARY_PLACE_NAME}, 2608},\n {\"latteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"grpo\", 1, {DICTIONARY_SYNONYM}, 2905},\n- {\"vla\", 1, {DICTIONARY_STREET_TYPE}, 2838},\n+ {\"b.si\", 1, {DICTIONARY_SYNONYM}, 2860},\n {\"dormitori\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"via vecchia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gen.li\", 1, {DICTIONARY_PERSONAL_TITLE}, 2560},\n {\"rifugio per animali\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ostello\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"incoronata\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"polizia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vcn\", 1, {DICTIONARY_STREET_TYPE}, 2835},\n- {\"gr.de\", 1, {DICTIONARY_SYNONYM}, 2896},\n+ {\"a c\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n+ {\"carce\", 1, {DICTIONARY_PLACE_NAME}, 2620},\n {\"professore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"conservatorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sigg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2580},\n- {\"consrio\", 1, {DICTIONARY_PLACE_NAME}, 2638},\n {\"fuori\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"bet.a\", 1, {DICTIONARY_PLACE_NAME}, 2605},\n- {\"car.ggio\", 1, {DICTIONARY_PLACE_NAME}, 2617},\n- {\"str r\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"br.lle\", 1, {DICTIONARY_STREET_TYPE}, 2714},\n- {\"mass.a\", 1, {DICTIONARY_PLACE_NAME}, 2670},\n- {\"cav.ne\", 1, {DICTIONARY_SYNONYM}, 2864},\n+ {\"b.so\", 1, {DICTIONARY_SYNONYM}, 2861},\n+ {\"sdl\", 1, {DICTIONARY_STREET_TYPE}, 2810},\n+ {\"birr.e\", 1, {DICTIONARY_PLACE_NAME}, 2612},\n+ {\"intno\", 1, {DICTIONARY_SYNONYM}, 2920},\n+ {\"vla\", 1, {DICTIONARY_STREET_TYPE}, 2842},\n {\"imperatore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"p.zza\", 1, {DICTIONARY_STREET_TYPE}, 2768},\n+ {\"vc\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n {\"mandamento\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"birre\", 1, {DICTIONARY_PLACE_NAME}, 2608},\n- {\"c.zo\", 1, {DICTIONARY_SYNONYM}, 2873},\n- {\"birr.a\", 1, {DICTIONARY_PLACE_NAME}, 2607},\n- {\"f.so\", 1, {DICTIONARY_SYNONYM}, 2885},\n- {\"calzatcio\", 1, {DICTIONARY_PLACE_NAME}, 2610},\n- {\"mand.to\", 1, {DICTIONARY_SYNONYM}, 2926},\n- {\"pal.zi\", 1, {DICTIONARY_QUALIFIER}, 2696},\n- {\"cso\", 1, {DICTIONARY_STREET_TYPE}, 2728},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2574},\n- {\"sig.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 2578},\n- {\"centro comm.le\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n- {\"v.c.\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n+ {\"centro comm le\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"traversa nuova\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"v c\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n+ {\"gni\", 1, {DICTIONARY_SYNONYM}, 2896},\n+ {\"comunita\", 1, {DICTIONARY_SYNONYM}, 2880},\n+ {\"coopva\", 1, {DICTIONARY_COMPANY_TYPE}, 2518},\n+ {\"canli\", 1, {DICTIONARY_SYNONYM}, 2866},\n {\"gendarmeria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p.ta\", 1, {DICTIONARY_STREET_TYPE}, 2773},\n+ {\"flli\", 1, {DICTIONARY_SYNONYM}, 2891},\n {\"autolavaggio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.te\", 1, {DICTIONARY_STREET_TYPE}, 2729},\n- {\"str.r\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n+ {\"pcoli\", 1, {DICTIONARY_SYNONYM}, 2957},\n+ {\"sul\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"c d a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n {\"passaggio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2661},\n {\"fontana\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"br.lla\", 1, {DICTIONARY_STREET_TYPE}, 2717},\n {\"stradetta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p.le\", 1, {DICTIONARY_STREET_TYPE}, 2765},\n- {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n- {\"edif.o\", 1, {DICTIONARY_UNIT}, 2960},\n- {\"str.a\", 1, {DICTIONARY_STREET_TYPE}, 2797},\n- {\"lghi\", 1, {DICTIONARY_SYNONYM}, 2920},\n+ {\"maddna\", 1, {DICTIONARY_SYNONYM}, 2926},\n+ {\"fabbra\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n+ {\"p.ta\", 1, {DICTIONARY_STREET_TYPE}, 2770},\n {\"marinella\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"c.te\", 1, {DICTIONARY_PLACE_NAME}, 2622},\n- {\"arch\", 1, {DICTIONARY_PERSONAL_TITLE}, 2539},\n- {\"9 mbre\", 1, {DICTIONARY_SYNONYM}, 2944},\n- {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n+ {\"lug\", 1, {DICTIONARY_STREET_TYPE}, 2757},\n+ {\"c \/ o\", 1, {DICTIONARY_POST_OFFICE}, 2691},\n+ {\"nav.o\", 1, {DICTIONARY_SYNONYM}, 2943},\n {\"naviglio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"monast.o\", 1, {DICTIONARY_PLACE_NAME}, 2672},\n {\"bagni\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nazle\", 1, {DICTIONARY_SYNONYM}, 2940},\n- {\"pal.zo\", 1, {DICTIONARY_UNIT}, 2964},\n- {\"vil\", 1, {DICTIONARY_STREET_TYPE}, 2839},\n- {\"lagto\", 1, {DICTIONARY_SYNONYM}, 2917},\n- {\"s c\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n- {\"sud\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"c.tina\", 1, {DICTIONARY_UNIT}, 2960},\n+ {\"cpt\", 1, {DICTIONARY_POST_OFFICE}, 2690},\n+ {\"abbadia\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n+ {\"coop.vo\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n {\"genna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vpv\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n- {\"n\", 1, {DICTIONARY_UNIT}, 2962},\n- {\"cnt\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n+ {\"scl\", 1, {DICTIONARY_STREET_TYPE}, 2791},\n+ {\"intni\", 1, {DICTIONARY_SYNONYM}, 2919},\n+ {\"bsi\", 1, {DICTIONARY_SYNONYM}, 2860},\n+ {\"consrio\", 1, {DICTIONARY_PLACE_NAME}, 2642},\n {\"nord est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"gennaio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"p.o\", 1, {DICTIONARY_UNIT}, 2965},\n- {\"fattoria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"v.lo\", 1, {DICTIONARY_STREET_TYPE}, 2832},\n+ {\"obsco\", 1, {DICTIONARY_PLACE_NAME}, 2678},\n+ {\"9.bre\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"sv\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"ant.o\", 1, {DICTIONARY_SYNONYM}, 2854},\n+ {\"contr.a\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n+ {\"mass.a\", 1, {DICTIONARY_PLACE_NAME}, 2674},\n+ {\"r.m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n {\"ospedale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"albergo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"p.\u00ba\", 1, {DICTIONARY_UNIT}, 2965},\n- {\"cletto\", 1, {DICTIONARY_PLACE_NAME}, 2619},\n {\"convento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"galle\", 1, {DICTIONARY_STREET_TYPE}, 2744},\n- {\"bgno\", 1, {DICTIONARY_PLACE_NAME}, 2598},\n- {\"casto\", 1, {DICTIONARY_PLACE_NAME}, 2628},\n+ {\"mand.to\", 1, {DICTIONARY_SYNONYM}, 2930},\n {\"catacombe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bghi\", 1, {DICTIONARY_QUALIFIER}, 2690},\n {\"angolo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s s\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n+ {\"s.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2527},\n+ {\"p.za\", 1, {DICTIONARY_STREET_TYPE}, 2768},\n+ {\"str.ti\", 1, {DICTIONARY_STREET_TYPE}, 2816},\n {\"senatore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"maggio\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"v provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"rag\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 2515},\n {\"baracche\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"arcipelaghi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"z.i.\", 1, {DICTIONARY_STREET_TYPE}, 2843},\n+ {\"nazli\", 1, {DICTIONARY_SYNONYM}, 2945},\n {\"grossa\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"universita\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n- {\"scc\", 1, {DICTIONARY_STREET_TYPE}, 2784},\n+ {\"pcole\", 1, {DICTIONARY_SYNONYM}, 2956},\n+ {\"fabbr.a\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n+ {\"febbr\", 1, {DICTIONARY_SYNONYM}, 2886},\n {\"fabbrica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bmento\", 1, {DICTIONARY_PLACE_NAME}, 2600},\n- {\"aut.da\", 1, {DICTIONARY_STREET_TYPE}, 2707},\n- {\"signa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2581},\n- {\"pach.o\", 1, {DICTIONARY_PLACE_NAME}, 2678},\n- {\"r.m.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2569},\n+ {\"v.le\", 1, {DICTIONARY_STREET_TYPE}, 2833},\n+ {\"maritt.o\", 1, {DICTIONARY_SYNONYM}, 2934},\n+ {\"forcla\", 1, {DICTIONARY_STREET_TYPE}, 2744},\n+ {\"strti\", 1, {DICTIONARY_STREET_TYPE}, 2816},\n {\"societ\u00e0 a responsabilit\u00e0 limitata\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"borge\", 1, {DICTIONARY_QUALIFIER}, 2689},\n- {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"str.ta\", 1, {DICTIONARY_STREET_TYPE}, 2810},\n- {\"c \/ o\", 1, {DICTIONARY_POST_OFFICE}, 2687},\n- {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"coop.va\", 1, {DICTIONARY_COMPANY_TYPE}, 2514},\n- {\"acquari\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mil.re\", 1, {DICTIONARY_SYNONYM}, 2935},\n- {\"ang\", 1, {DICTIONARY_STREET_TYPE}, 2705},\n- {\"mec\", 1, {DICTIONARY_PLACE_NAME}, 2671},\n+ {\"str.a\", 1, {DICTIONARY_STREET_TYPE}, 2801},\n+ {\"fortezza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"abb.e\", 1, {DICTIONARY_PLACE_NAME}, 2590},\n+ {\"lno\", 1, {DICTIONARY_STREET_TYPE}, 2758},\n+ {\"badia\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n+ {\"birra\", 1, {DICTIONARY_PLACE_NAME}, 2611},\n+ {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 2533},\n+ {\"bia\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n+ {\"basca\", 1, {DICTIONARY_PLACE_NAME}, 2607},\n+ {\"acqrio\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, 2593},\n+ {\"metro\", 1, {DICTIONARY_SYNONYM}, 2938},\n {\"dentista\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"basiliche\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"via nuova\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cta\", 1, {DICTIONARY_PLACE_NAME}, 2621},\n- {\"a.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2512},\n- {\"r.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2570},\n- {\"ctta\", 1, {DICTIONARY_SYNONYM}, 2868},\n+ {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"societa a responsabilita limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2530},\n+ {\"dal\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"societa in accomandita per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, 2528},\n {\"madonna\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cooperativo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"padne\", 1, {DICTIONARY_PLACE_NAME}, 2681},\n {\"regione\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"l.etta\", 1, {DICTIONARY_PLACE_NAME}, 2665},\n {\"antica\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"metr.na\", 1, {DICTIONARY_SYNONYM}, 2934},\n+ {\"cola\", 1, {DICTIONARY_QUALIFIER}, 2698},\n {\"madonnetta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"beta\", 1, {DICTIONARY_PLACE_NAME}, 2605},\n- {\"bsa\", 1, {DICTIONARY_SYNONYM}, 2855},\n- {\"anti\", 1, {DICTIONARY_SYNONYM}, 2849},\n- {\"dott.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2552},\n- {\"plg\", 1, {DICTIONARY_STREET_TYPE}, 2772},\n- {\"ptl\", 1, {DICTIONARY_STREET_TYPE}, 2768},\n- {\"interne\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cht\", 1, {DICTIONARY_PLACE_NAME}, 2633},\n- {\"com.le\", 1, {DICTIONARY_SYNONYM}, 2875},\n+ {\"abb.a\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n+ {\"ant.i\", 1, {DICTIONARY_SYNONYM}, 2853},\n+ {\"anfiti\", 1, {DICTIONARY_PLACE_NAME}, 2600},\n+ {\"dipart.o\", 1, {DICTIONARY_UNIT}, 2963},\n+ {\"s c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n+ {\"s.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2527},\n {\"lungarno\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d.la\", 1, {DICTIONARY_STOPWORD}, 2697},\n {\"ditta individuale\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"gelateria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"var\", 1, {DICTIONARY_STREET_TYPE}, 2820},\n+ {\"giudice\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"lunghi\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"cda\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n+ {\"bdo\", 1, {DICTIONARY_STREET_TYPE}, 2714},\n+ {\"c.le\", 1, {DICTIONARY_SYNONYM}, 2871},\n {\"banca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lgv\", 1, {DICTIONARY_STREET_TYPE}, 2758},\n+ {\"f.ca\", 1, {DICTIONARY_STREET_TYPE}, 2743},\n {\"dall'\", 2, {DICTIONARY_ELISION, DICTIONARY_STOPWORD}, -1},\n- {\"s.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n- {\"lre\", 1, {DICTIONARY_STREET_TYPE}, 2757},\n- {\"negozio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 2767},\n- {\"circonve\", 1, {DICTIONARY_STREET_TYPE}, 2725},\n- {\"bli\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT, DICTIONARY_UNIT}, 2692},\n+ {\"int.ne\", 1, {DICTIONARY_SYNONYM}, 2918},\n+ {\"vicoletto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"societa a garanzia limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2529},\n {\"cattedrale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"santo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p.n\u00ba\", 1, {DICTIONARY_UNIT}, 2965},\n- {\"f.sa\", 1, {DICTIONARY_SYNONYM}, 2886},\n+ {\"galla\", 1, {DICTIONARY_STREET_TYPE}, 2661},\n+ {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n+ {\"no\", 1, {DICTIONARY_UNIT}, 2966},\n {\"fonte\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"gendria\", 1, {DICTIONARY_PLACE_NAME}, 2658},\n {\"ufficio postale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c\", 1, {DICTIONARY_UNIT}, 2957},\n- {\"g.ni\", 1, {DICTIONARY_SYNONYM}, 2892},\n- {\"birra\", 1, {DICTIONARY_PLACE_NAME}, 2607},\n- {\"cal\", 1, {DICTIONARY_STREET_TYPE}, 2717},\n- {\"lge\", 1, {DICTIONARY_STREET_TYPE}, 2751},\n- {\"rm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2569},\n+ {\"super mercato\", 1, {DICTIONARY_PLACE_NAME}, 2688},\n+ {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2534},\n {\"societ\u00e0\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"visconte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"f.ro\", 1, {DICTIONARY_PLACE_NAME}, 2644},\n- {\"ctina\", 1, {DICTIONARY_UNIT}, 2956},\n- {\"ca\", 1, {DICTIONARY_UNIT}, 2957},\n- {\"societa\", 1, {DICTIONARY_COMPANY_TYPE}, 2518},\n- {\"s p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2575},\n- {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n+ {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 2833},\n+ {\"s.p.\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"prco giochi\", 1, {DICTIONARY_PLACE_NAME}, 2684},\n+ {\"s.c\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"fortino\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2583},\n- {\"s a g l\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n- {\"cll.e\", 1, {DICTIONARY_SYNONYM}, 2870},\n+ {\"fca\", 1, {DICTIONARY_STREET_TYPE}, 2743},\n+ {\"distr.o\", 1, {DICTIONARY_SYNONYM}, 2883},\n+ {\"clt\", 1, {DICTIONARY_STREET_TYPE}, 2720},\n+ {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n+ {\"borga\", 1, {DICTIONARY_QUALIFIER}, 2692},\n {\"tenente colonnello\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"porta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"via vicinale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n- {\"aut.ale\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n+ {\"diga\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"fermata\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2766},\n- {\"pres emerito\", 1, {DICTIONARY_PERSONAL_TITLE}, 2565},\n- {\"dtro\", 1, {DICTIONARY_STOPWORD}, 2700},\n- {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 2576},\n- {\"pub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"strada statale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"minro\", 1, {DICTIONARY_PLACE_NAME}, 2561},\n- {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n- {\"rpe\", 1, {DICTIONARY_STREET_TYPE}, 2775},\n- {\"vvc\", 1, {DICTIONARY_STREET_TYPE}, 2828},\n- {\"mte\", 1, {DICTIONARY_STREET_TYPE}, 2761},\n- {\"co\", 1, {DICTIONARY_COMPANY_TYPE}, 2513},\n- {\"s.c.\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n- {\"str.st\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"padiglinoe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vicoletto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"palzi\", 1, {DICTIONARY_QUALIFIER}, 2696},\n+ {\"b.menti\", 1, {DICTIONARY_PLACE_NAME}, 2605},\n+ {\"maggio\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"min.ro\", 1, {DICTIONARY_PLACE_NAME}, 2565},\n+ {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 2687},\n+ {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 2540},\n+ {\"bnssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2546},\n {\"chiesetta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"maestra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2769},\n- {\"grse\", 1, {DICTIONARY_SYNONYM}, 2899},\n- {\"contra\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n+ {\"cle\", 1, {DICTIONARY_STREET_TYPE}, 2734},\n+ {\"c.usa\", 1, {DICTIONARY_STREET_TYPE}, 2728},\n+ {\"albi\", 1, {DICTIONARY_PLACE_NAME}, 2598},\n {\"obelisco\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"marzo\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sulla\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sup\", 1, {DICTIONARY_STREET_TYPE}, 2814},\n- {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 2561},\n- {\"lun\", 1, {DICTIONARY_STREET_TYPE}, 2755},\n- {\"sta\", 1, {DICTIONARY_STREET_TYPE}, 2796},\n- {\"industria\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"fort.zio\", 1, {DICTIONARY_PLACE_NAME}, 2656},\n- {\"bse\", 1, {DICTIONARY_SYNONYM}, 2858},\n- {\"alt\", 1, {DICTIONARY_STREET_TYPE}, 2702},\n- {\"off\", 1, {DICTIONARY_UNIT}, 2963},\n- {\"gni\", 1, {DICTIONARY_SYNONYM}, 2892},\n- {\"set\", 1, {DICTIONARY_SYNONYM}, 2955},\n- {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 2535},\n- {\"g.no\", 2, {DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 2891},\n- {\"comunita\", 1, {DICTIONARY_SYNONYM}, 2876},\n+ {\"cattle\", 1, {DICTIONARY_PLACE_NAME}, 2635},\n+ {\"dissal.ne\", 1, {DICTIONARY_PLACE_NAME}, 2644},\n+ {\"n.o\", 1, {DICTIONARY_UNIT}, 2966},\n+ {\"pn\u00ba\", 1, {DICTIONARY_UNIT}, 2969},\n+ {\"s r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2530},\n+ {\"l.ghi\", 1, {DICTIONARY_SYNONYM}, 2924},\n+ {\"fso\", 1, {DICTIONARY_SYNONYM}, 2889},\n+ {\"czo\", 1, {DICTIONARY_SYNONYM}, 2877},\n {\"distretto\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"str.vic\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n {\"club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"antico\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cna\", 1, {DICTIONARY_STREET_TYPE}, 2722},\n+ {\"rev\", 1, {DICTIONARY_PERSONAL_TITLE}, 2572},\n {\"vicolo privato\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ferr.a\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n- {\"clare\", 1, {DICTIONARY_PLACE_NAME}, 2624},\n- {\"dis\", 1, {DICTIONARY_STREET_TYPE}, 2735},\n+ {\"b.ne\", 1, {DICTIONARY_PERSONAL_TITLE}, 2545},\n+ {\"nvi\", 1, {DICTIONARY_SYNONYM}, 2951},\n+ {\"c\", 1, {DICTIONARY_UNIT}, 2961},\n+ {\"industria\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"n\", 1, {DICTIONARY_UNIT}, 2966},\n {\"vocabolo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fraz\", 1, {DICTIONARY_STREET_TYPE}, 2742},\n- {\"grdi\", 1, {DICTIONARY_SYNONYM}, 2897},\n+ {\"cassa\", 1, {DICTIONARY_PLACE_NAME}, 2631},\n+ {\"s.v.\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n {\"monumento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.ino\", 1, {DICTIONARY_SYNONYM}, 2929},\n- {\"ferr.rio\", 1, {DICTIONARY_PLACE_NAME}, 2649},\n {\"piazza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cimitero\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"panificio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"alimentari\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"frata\", 1, {DICTIONARY_STREET_TYPE}, 2736},\n+ {\"grpi\", 1, {DICTIONARY_SYNONYM}, 2908},\n+ {\"bretelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sant'\", 2, {DICTIONARY_ELISION, DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sts\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n {\"riviera\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vct\", 1, {DICTIONARY_STREET_TYPE}, 2831},\n- {\"fontile\", 1, {DICTIONARY_SYNONYM}, 2883},\n+ {\"edifo\", 1, {DICTIONARY_UNIT}, 2964},\n {\"fiera\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"campeggi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bl.o\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 2693},\n- {\"ch.sa\", 1, {DICTIONARY_PLACE_NAME}, 2634},\n+ {\"interni\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"salizada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pno\", 1, {DICTIONARY_UNIT}, 2969},\n {\"torre\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"genne\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"febbraio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"rtb\", 1, {DICTIONARY_STREET_TYPE}, 2782},\n- {\"med.a\", 1, {DICTIONARY_SYNONYM}, 2932},\n- {\"comm.le\", 1, {DICTIONARY_SYNONYM}, 2874},\n- {\"grta\", 1, {DICTIONARY_SYNONYM}, 2902},\n- {\"strta\", 1, {DICTIONARY_STREET_TYPE}, 2810},\n+ {\"lavanda\", 1, {DICTIONARY_PLACE_NAME}, 2667},\n+ {\"gh.i\", 1, {DICTIONARY_SYNONYM}, 2893},\n+ {\"pss\", 1, {DICTIONARY_STREET_TYPE}, 2767},\n+ {\"s n c\", 1, {DICTIONARY_NO_ADDRESS}, 2541},\n+ {\"milre\", 1, {DICTIONARY_SYNONYM}, 2939},\n+ {\"tintoria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s prov\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"inferiori\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"casolare\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"societa cooperativa a responsabilita limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n {\"area cani\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"anfiteatro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr.sa\", 1, {DICTIONARY_SYNONYM}, 2898},\n- {\"ri\", 1, {DICTIONARY_STREET_TYPE}, 2779},\n- {\"c.p.\", 1, {DICTIONARY_POST_OFFICE}, 2686},\n+ {\"cnl\", 1, {DICTIONARY_STREET_TYPE}, 2724},\n+ {\"professoressa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2575},\n+ {\"cle\", 1, {DICTIONARY_SYNONYM}, 2871},\n+ {\"str s\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"calzat.cio\", 1, {DICTIONARY_PLACE_NAME}, 2614},\n {\"palazzo\", 1, {DICTIONARY_UNIT}, -1},\n- {\"accademia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"loc.a\", 1, {DICTIONARY_PLACE_NAME}, 2664},\n- {\"fdo\", 1, {DICTIONARY_STREET_TYPE}, 2738},\n- {\"c.ile\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n- {\"s r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"vvc\", 1, {DICTIONARY_STREET_TYPE}, 2832},\n+ {\"s\", 1, {DICTIONARY_STREET_TYPE}, 2801},\n+ {\"bmenti\", 1, {DICTIONARY_PLACE_NAME}, 2605},\n+ {\"9bre\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"bra\", 1, {DICTIONARY_SYNONYM}, 2863},\n+ {\"carabri\", 1, {DICTIONARY_PLACE_NAME}, 2619},\n+ {\"chsa\", 1, {DICTIONARY_PLACE_NAME}, 2638},\n {\"gruppo\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"carabinieri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cdella\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n- {\"feb\", 1, {DICTIONARY_SYNONYM}, 2882},\n {\"porto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vlo\", 1, {DICTIONARY_STREET_TYPE}, 2832},\n- {\"madla\", 1, {DICTIONARY_PLACE_NAME}, 2666},\n- {\"crv\", 1, {DICTIONARY_STREET_TYPE}, 2725},\n- {\"contr.a\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n+ {\"gr.di\", 1, {DICTIONARY_SYNONYM}, 2901},\n+ {\"acq.rio\", 1, {DICTIONARY_PLACE_NAME}, 2593},\n {\"grosse\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"borgo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"barche\", 1, {DICTIONARY_PLACE_NAME}, 2602},\n- {\"rag\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 2511},\n+ {\"s.c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n {\"ottobre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cap.ta\", 1, {DICTIONARY_PLACE_NAME}, 2614},\n- {\"b.ne\", 1, {DICTIONARY_PERSONAL_TITLE}, 2541},\n- {\"bgni\", 1, {DICTIONARY_PLACE_NAME}, 2599},\n- {\"febbr\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2533},\n+ {\"gruppo d'interesse economico\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n {\"ghiacciai\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"aut sle\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n- {\"stl\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2534},\n+ {\"str vicinale\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"cat be\", 1, {DICTIONARY_PLACE_NAME}, 2634},\n+ {\"bar.che\", 1, {DICTIONARY_PLACE_NAME}, 2606},\n+ {\"fatta\", 1, {DICTIONARY_PLACE_NAME}, 2649},\n {\"tabaccheria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n {\"cavalcavia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"staz\", 1, {DICTIONARY_STREET_TYPE}, 2796},\n- {\"ghio\", 1, {DICTIONARY_SYNONYM}, 2890},\n- {\"b.ra\", 1, {DICTIONARY_SYNONYM}, 2859},\n- {\"m.nu\", 1, {DICTIONARY_SYNONYM}, 2927},\n+ {\"b.ia\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n {\"drogheria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c.p.\", 1, {DICTIONARY_POST_OFFICE}, 2690},\n {\"casella postale\", 1, {DICTIONARY_POST_OFFICE}, -1},\n- {\"f v\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n+ {\"mad.la\", 1, {DICTIONARY_PLACE_NAME}, 2670},\n {\"di\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"borg.e\", 1, {DICTIONARY_QUALIFIER}, 2689},\n+ {\"cta\", 1, {DICTIONARY_STREET_TYPE}, 2736},\n {\"rotabile\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"generali\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"spr\", 1, {DICTIONARY_STREET_TYPE}, 2801},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"indale\", 1, {DICTIONARY_SYNONYM}, 2908},\n- {\"vcm\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n- {\"imp.to\", 1, {DICTIONARY_PLACE_NAME}, 2659},\n- {\"autde\", 1, {DICTIONARY_STREET_TYPE}, 2709},\n- {\"carab.ri\", 1, {DICTIONARY_PLACE_NAME}, 2615},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 2555},\n+ {\"madonne\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"acq.ti\", 1, {DICTIONARY_PLACE_NAME}, 2595},\n+ {\"crocevia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"prete\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lno\", 1, {DICTIONARY_STREET_TYPE}, 2754},\n {\"blocco\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 2566},\n+ {\"a.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n {\"marittimo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"abbadie\", 1, {DICTIONARY_PLACE_NAME}, 2586},\n- {\"gen\", 1, {DICTIONARY_SYNONYM}, 2888},\n+ {\"societa semplice\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n+ {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 2562},\n+ {\"circonvallazione\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"casetto\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"accad.e\", 1, {DICTIONARY_PLACE_NAME}, 2592},\n {\"societ\u00e0 a garanzia limitata\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"fortza\", 1, {DICTIONARY_PLACE_NAME}, 2654},\n- {\"div.vo\", 1, {DICTIONARY_SYNONYM}, 2880},\n {\"campo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ufficio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ple\", 1, {DICTIONARY_STREET_TYPE}, 2765},\n- {\"localita\", 1, {DICTIONARY_STREET_TYPE}, 2759},\n- {\"dla\", 1, {DICTIONARY_STOPWORD}, 2697},\n+ {\"m.ri\", 1, {DICTIONARY_SYNONYM}, 2940},\n+ {\"intern.le\", 1, {DICTIONARY_SYNONYM}, 2916},\n {\"superstrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cda\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n- {\"9mbre\", 1, {DICTIONARY_SYNONYM}, 2944},\n {\"agosto\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"loc\", 1, {DICTIONARY_STREET_TYPE}, 2759},\n- {\"s p a\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n- {\"spa\", 1, {DICTIONARY_STREET_TYPE}, 2795},\n- {\"c.d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n+ {\"cllo\", 1, {DICTIONARY_SYNONYM}, 2875},\n+ {\"for\", 1, {DICTIONARY_STREET_TYPE}, 2745},\n {\"stradone\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"b.sa\", 1, {DICTIONARY_SYNONYM}, 2855},\n+ {\"n.vo\", 1, {DICTIONARY_SYNONYM}, 2952},\n+ {\"nordest\", 1, {DICTIONARY_DIRECTIONAL}, 2532},\n {\"contessa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"dr.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2552},\n- {\"sudest\", 1, {DICTIONARY_DIRECTIONAL}, 2535},\n- {\"d.le\", 1, {DICTIONARY_STOPWORD}, 2698},\n+ {\"v.p.\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"pte\", 1, {DICTIONARY_STREET_TYPE}, 2771},\n+ {\"cup\", 1, {DICTIONARY_STREET_TYPE}, 2738},\n+ {\"camp.gi\", 1, {DICTIONARY_PLACE_NAME}, 2616},\n+ {\"srl\", 1, {DICTIONARY_COMPANY_TYPE}, 2530},\n {\"prevosto\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ind.ali\", 1, {DICTIONARY_SYNONYM}, 2909},\n+ {\"d.lo\", 1, {DICTIONARY_STOPWORD}, 2703},\n {\"audostradale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 2568},\n {\"dalla\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"bgo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2695},\n {\"dai\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"lungadige\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"llg\", 1, {DICTIONARY_STREET_TYPE}, 2756},\n- {\"metrna\", 1, {DICTIONARY_SYNONYM}, 2934},\n- {\"vcp\", 1, {DICTIONARY_STREET_TYPE}, 2834},\n- {\"osteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2528},\n- {\"sant'\", 2, {DICTIONARY_ELISION, DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sdr\", 1, {DICTIONARY_STREET_TYPE}, 2791},\n- {\"c.ta\", 1, {DICTIONARY_PLACE_NAME}, 2621},\n- {\"giul\", 1, {DICTIONARY_SYNONYM}, 2894},\n- {\"canle\", 1, {DICTIONARY_SYNONYM}, 2720},\n+ {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 2689},\n+ {\"c.della\", 1, {DICTIONARY_PLACE_NAME}, 2640},\n+ {\"vcl\", 1, {DICTIONARY_STREET_TYPE}, 2837},\n+ {\"s s\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"f.rata\", 1, {DICTIONARY_STREET_TYPE}, 2740},\n+ {\"impto\", 1, {DICTIONARY_PLACE_NAME}, 2663},\n+ {\"monum.o\", 1, {DICTIONARY_PLACE_NAME}, 2677},\n+ {\"alimentari\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cantina\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"cast.o\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n+ {\"cavne\", 1, {DICTIONARY_SYNONYM}, 2868},\n+ {\"indale\", 1, {DICTIONARY_SYNONYM}, 2912},\n+ {\"cass.a\", 1, {DICTIONARY_PLACE_NAME}, 2631},\n+ {\"forc.la\", 1, {DICTIONARY_STREET_TYPE}, 2744},\n {\"centrale\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"crematorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"clla\", 1, {DICTIONARY_SYNONYM}, 2869},\n- {\"magg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2559},\n- {\"sps\", 1, {DICTIONARY_STREET_TYPE}, 2793},\n+ {\"ost.a\", 1, {DICTIONARY_PLACE_NAME}, 2680},\n+ {\"ferrria\", 1, {DICTIONARY_PLACE_NAME}, 2652},\n+ {\"alle\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"compagnia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"aut.sle\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n- {\"fso\", 1, {DICTIONARY_SYNONYM}, 2885},\n- {\"nra\", 1, {DICTIONARY_SYNONYM}, 2942},\n- {\"giardini\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"madd.na\", 1, {DICTIONARY_SYNONYM}, 2922},\n+ {\"nro\", 1, {DICTIONARY_SYNONYM}, 2947},\n+ {\"ch.etta\", 1, {DICTIONARY_PLACE_NAME}, 2639},\n+ {\"p.rco giochi\", 1, {DICTIONARY_PLACE_NAME}, 2684},\n {\"madonnella\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"piano\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"carggio\", 1, {DICTIONARY_PLACE_NAME}, 2621},\n+ {\"profssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2571},\n {\"con\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"on\", 1, {DICTIONARY_PERSONAL_TITLE}, 2563},\n- {\"autsle\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n- {\"p.rco acquatico\", 1, {DICTIONARY_PLACE_NAME}, 2681},\n+ {\"fev\", 1, {DICTIONARY_SYNONYM}, 2886},\n+ {\"societa in accomandita semplice\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n+ {\"parco\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dissalazione\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.da\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n- {\"marin.la\", 1, {DICTIONARY_SYNONYM}, 2928},\n+ {\"n.vi\", 1, {DICTIONARY_SYNONYM}, 2951},\n {\"sulle\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 2762},\n- {\"cat ba\", 1, {DICTIONARY_PLACE_NAME}, 2629},\n+ {\"s statale\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"b.se\", 1, {DICTIONARY_SYNONYM}, 2862},\n+ {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"s.n.c.\", 1, {DICTIONARY_NO_ADDRESS}, 2541},\n {\"caverne\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"nuove\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"navigli\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cas\", 1, {DICTIONARY_STREET_TYPE}, 2618},\n- {\"acqri\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, 2590},\n- {\"7bre\", 1, {DICTIONARY_SYNONYM}, 2955},\n+ {\"sta\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n+ {\"sudest\", 1, {DICTIONARY_DIRECTIONAL}, 2539},\n {\"ferriera\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"8.bre\", 1, {DICTIONARY_SYNONYM}, 2949},\n {\"cooperativa\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"lago\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ott\", 1, {DICTIONARY_SYNONYM}, 2953},\n+ {\"fanta\", 1, {DICTIONARY_SYNONYM}, 2885},\n+ {\"bl.i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 2696},\n {\"senza numero civico\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n- {\"fv\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n+ {\"n.ra\", 1, {DICTIONARY_SYNONYM}, 2946},\n {\"dormitorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ind.ale\", 1, {DICTIONARY_SYNONYM}, 2908},\n- {\"mas\", 1, {DICTIONARY_PLACE_NAME}, 2670},\n- {\"fant.a\", 1, {DICTIONARY_SYNONYM}, 2881},\n+ {\"8bre\", 1, {DICTIONARY_SYNONYM}, 2953},\n+ {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n+ {\"n.\u00ba\", 1, {DICTIONARY_UNIT}, 2966},\n {\"alberghi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dottssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2552},\n {\"forno\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.one\", 1, {DICTIONARY_PLACE_NAME}, 2625},\n- {\"x bre\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"s.s\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"intne\", 1, {DICTIONARY_SYNONYM}, 2914},\n- {\"societ\u00e0 in accomandit\u00e0 semplice\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"contra'\", 1, {DICTIONARY_STREET_TYPE}, 2726},\n- {\"acqrio\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, 2589},\n+ {\"s.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2577},\n+ {\"locta\", 1, {DICTIONARY_STREET_TYPE}, 2763},\n+ {\"cat.ba\", 1, {DICTIONARY_PLACE_NAME}, 2633},\n+ {\"dis\", 1, {DICTIONARY_STREET_TYPE}, 2739},\n+ {\"lag.to\", 1, {DICTIONARY_SYNONYM}, 2921},\n+ {\"c.etto\", 1, {DICTIONARY_UNIT}, 2962},\n+ {\"ch.t\", 1, {DICTIONARY_PLACE_NAME}, 2637},\n+ {\"cav\", 1, {DICTIONARY_PERSONAL_TITLE}, 2549},\n+ {\"r m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2539},\n {\"pelletteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mnu\", 1, {DICTIONARY_SYNONYM}, 2931},\n {\"ragioniere\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"giolleria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"distro\", 1, {DICTIONARY_SYNONYM}, 2879},\n- {\"gr.se\", 1, {DICTIONARY_SYNONYM}, 2899},\n- {\"fort.no\", 1, {DICTIONARY_QUALIFIER}, 2695},\n+ {\"e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"coll.io\", 1, {DICTIONARY_PLACE_NAME}, 2641},\n+ {\"g.na\", 1, {DICTIONARY_STREET_TYPE}, 2749},\n+ {\"grsa\", 1, {DICTIONARY_SYNONYM}, 2902},\n+ {\"osp.le\", 1, {DICTIONARY_PLACE_NAME}, 2679},\n {\"santi\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lab.o\", 1, {DICTIONARY_PLACE_NAME}, 2662},\n+ {\"str reg\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"capla\", 1, {DICTIONARY_PLACE_NAME}, 2617},\n {\"nord\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"abbazia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"conv.to\", 1, {DICTIONARY_PLACE_NAME}, 2643},\n+ {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 2532},\n {\"salita\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ergastolo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"centro comm\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n {\"collina\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"stazione\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"emiss.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n+ {\"sigg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2584},\n {\"calzolaio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p\u00ba\", 1, {DICTIONARY_UNIT}, 2969},\n+ {\"commle\", 1, {DICTIONARY_SYNONYM}, 2878},\n {\"industriali\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"b.gno\", 1, {DICTIONARY_PLACE_NAME}, 2598},\n- {\"c.zi\", 1, {DICTIONARY_SYNONYM}, 2872},\n+ {\"vic\", 1, {DICTIONARY_STREET_TYPE}, 2841},\n+ {\"bgt\", 1, {DICTIONARY_STREET_TYPE}, 2719},\n {\"nord ovest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ctrle\", 1, {DICTIONARY_SYNONYM}, 2865},\n {\"costa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gend.ria\", 1, {DICTIONARY_PLACE_NAME}, 2658},\n+ {\"acq.ri\", 1, {DICTIONARY_PLACE_NAME}, 2594},\n {\"cambiavalute\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"infe\", 1, {DICTIONARY_SYNONYM}, 2910},\n {\"grande ufficiale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"col.a\", 1, {DICTIONARY_QUALIFIER}, 2694},\n {\"gortte\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"v s\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n- {\"altze\", 1, {DICTIONARY_SYNONYM}, 2846},\n+ {\"fort.one\", 1, {DICTIONARY_PLACE_NAME}, 2659},\n {\"rampe\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"associazione calcio\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"arcipgho\", 1, {DICTIONARY_SYNONYM}, 2853},\n- {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 2562},\n {\"grossi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dal\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"dlo\", 1, {DICTIONARY_STOPWORD}, 2699},\n+ {\"infi\", 1, {DICTIONARY_SYNONYM}, 2915},\n+ {\"via nuova\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vle\", 1, {DICTIONARY_STREET_TYPE}, 2833},\n {\"teatro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"monsignore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"egregio\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"piscina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"voc\", 1, {DICTIONARY_STREET_TYPE}, 2841},\n+ {\"fon\", 1, {DICTIONARY_STREET_TYPE}, 2741},\n+ {\"cas.to\", 1, {DICTIONARY_PLACE_NAME}, 2630},\n+ {\"bna\", 1, {DICTIONARY_STREET_TYPE}, 2715},\n {\"largo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"flli\", 1, {DICTIONARY_SYNONYM}, 2887},\n- {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2536},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2555},\n+ {\"tnu\", 1, {DICTIONARY_STREET_TYPE}, 2820},\n {\"giardino\", 2, {DICTIONARY_SYNONYM, DICTIONARY_UNIT}, -1},\n+ {\"penis.a\", 1, {DICTIONARY_SYNONYM}, 2954},\n {\"riva\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"anto\", 1, {DICTIONARY_SYNONYM}, 2850},\n- {\"diga\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"anfit.o\", 1, {DICTIONARY_PLACE_NAME}, 2597},\n- {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 2549},\n+ {\"s vicinale\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"s.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2530},\n+ {\"acqto\", 1, {DICTIONARY_PLACE_NAME}, 2596},\n {\"fortilizio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gna\", 1, {DICTIONARY_STREET_TYPE}, 2745},\n+ {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 2577},\n+ {\"str.prov\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n {\"tangenziale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bet.e\", 1, {DICTIONARY_PLACE_NAME}, 2606},\n- {\"campgio\", 1, {DICTIONARY_PLACE_NAME}, 2611},\n- {\"p.ta\", 1, {DICTIONARY_STREET_TYPE}, 2766},\n- {\"abbe\", 1, {DICTIONARY_PLACE_NAME}, 2586},\n- {\"cte\", 1, {DICTIONARY_STREET_TYPE}, 2729},\n- {\"casino\", 1, {DICTIONARY_PLACE_NAME}, 2623},\n- {\"grd\", 1, {DICTIONARY_STREET_TYPE}, 2747},\n- {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2815},\n- {\"strto\", 1, {DICTIONARY_STREET_TYPE}, 2813},\n- {\"p.no\", 1, {DICTIONARY_UNIT}, 2965},\n+ {\"gr\", 1, {DICTIONARY_SYNONYM}, 2899},\n+ {\"g.ge\", 1, {DICTIONARY_UNIT}, 2965},\n+ {\"gne\", 1, {DICTIONARY_STREET_TYPE}, 2750},\n+ {\"czi\", 1, {DICTIONARY_SYNONYM}, 2876},\n+ {\"prco acquatico\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n+ {\"accademia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"gruppo di interesse economico\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ten col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2584},\n- {\"sp\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n+ {\"borgo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n+ {\"lungargine\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"castello\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2572},\n {\"calata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bsi\", 1, {DICTIONARY_SYNONYM}, 2856},\n+ {\"pal.zo\", 1, {DICTIONARY_UNIT}, 2968},\n {\"bealere\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ferrrio\", 1, {DICTIONARY_PLACE_NAME}, 2653},\n {\"alto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"egr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2553},\n- {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n- {\"capta\", 1, {DICTIONARY_PLACE_NAME}, 2614},\n+ {\"s c\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"quartiere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"societ\u00e0 in nome collettivo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"caserma\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.v\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"mar\", 1, {DICTIONARY_SYNONYM}, 2931},\n+ {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 2564},\n+ {\"v p\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"c.la\", 1, {DICTIONARY_SYNONYM}, 2870},\n+ {\"cra\", 1, {DICTIONARY_STREET_TYPE}, 2737},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"sottopassaggio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"grande\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"c.so\", 1, {DICTIONARY_STREET_TYPE}, 2728},\n- {\"sce\", 1, {DICTIONARY_STREET_TYPE}, 2788},\n- {\"professoressa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n+ {\"blo\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT, DICTIONARY_UNIT}, 2697},\n+ {\"pcola\", 1, {DICTIONARY_SYNONYM}, 2955},\n+ {\"p.o\", 1, {DICTIONARY_UNIT}, 2969},\n+ {\"societa per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, 2527},\n+ {\"p.colo\", 1, {DICTIONARY_SYNONYM}, 2958},\n+ {\"cap.la\", 1, {DICTIONARY_PLACE_NAME}, 2617},\n+ {\"ante\", 1, {DICTIONARY_SYNONYM}, 2852},\n+ {\"pzza\", 1, {DICTIONARY_STREET_TYPE}, 2768},\n+ {\"n.ro\", 1, {DICTIONARY_SYNONYM}, 2947},\n {\"localit\u00e0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"strada privata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apr\", 1, {DICTIONARY_SYNONYM}, 2851},\n- {\"gr.pi\", 1, {DICTIONARY_SYNONYM}, 2904},\n+ {\"ss\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n {\"sui\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s p\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"albo\", 1, {DICTIONARY_PLACE_NAME}, 2595},\n- {\"grde\", 1, {DICTIONARY_SYNONYM}, 2896},\n- {\"lag.a\", 1, {DICTIONARY_SYNONYM}, 2919},\n+ {\"associazione calcio\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"cp\", 1, {DICTIONARY_POST_OFFICE}, 2690},\n {\"fratelli\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_SYNONYM}, -1},\n- {\"coopvo\", 1, {DICTIONARY_COMPANY_TYPE}, 2515},\n- {\"fraze\", 1, {DICTIONARY_STREET_TYPE}, 2742},\n- {\"str vic\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"ott\", 1, {DICTIONARY_SYNONYM}, 2949},\n- {\"cavalca\", 1, {DICTIONARY_STREET_TYPE}, 2723},\n- {\"f.no\", 1, {DICTIONARY_PLACE_NAME}, 2653},\n+ {\"ses\", 1, {DICTIONARY_STREET_TYPE}, 2796},\n+ {\"ist\", 1, {DICTIONARY_PLACE_NAME}, 2665},\n+ {\"vnu\", 1, {DICTIONARY_STREET_TYPE}, 2827},\n {\"gallerie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"distilleria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"signorina\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"societa in accomandita per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n- {\"c p\", 1, {DICTIONARY_POST_OFFICE}, 2686},\n+ {\"internazionale\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dalle\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"vzo\", 1, {DICTIONARY_STREET_TYPE}, 2840},\n- {\"accad.a\", 1, {DICTIONARY_PLACE_NAME}, 2587},\n+ {\"str.to\", 1, {DICTIONARY_STREET_TYPE}, 2817},\n+ {\"marinla\", 1, {DICTIONARY_SYNONYM}, 2932},\n+ {\"madta\", 1, {DICTIONARY_PLACE_NAME}, 2671},\n {\"via provincale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lgo\", 1, {DICTIONARY_SYNONYM}, 2755},\n- {\"internazionale\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ss\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"ferr.ra\", 1, {DICTIONARY_PLACE_NAME}, 2650},\n {\"basso\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"campeggio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"palazzi\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"al\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"magazi\", 1, {DICTIONARY_PLACE_NAME}, 2668},\n- {\"dottore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.p\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n+ {\"s reginale\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"pach.o\", 1, {DICTIONARY_PLACE_NAME}, 2682},\n+ {\"g.ne\", 1, {DICTIONARY_STREET_TYPE}, 2750},\n+ {\"f.v.\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n {\"caffeteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctn\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n- {\"brlla\", 1, {DICTIONARY_STREET_TYPE}, 2713},\n- {\"erg.lo\", 1, {DICTIONARY_PLACE_NAME}, 2642},\n+ {\"c.lare\", 1, {DICTIONARY_PLACE_NAME}, 2628},\n+ {\"s a p a\", 1, {DICTIONARY_COMPANY_TYPE}, 2528},\n+ {\"ctile\", 1, {DICTIONARY_STREET_TYPE}, 2734},\n {\"bottega\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ambasciata\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 2770},\n {\"antichi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"n.\u00ba\", 1, {DICTIONARY_UNIT}, 2962},\n {\"gruppi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"casto\", 1, {DICTIONARY_PLACE_NAME}, 2626},\n- {\"mag\", 1, {DICTIONARY_SYNONYM}, 2921},\n+ {\"psi\", 1, {DICTIONARY_PLACE_NAME}, 2686},\n+ {\"circonv.e\", 1, {DICTIONARY_STREET_TYPE}, 2729},\n+ {\"mil.re\", 1, {DICTIONARY_SYNONYM}, 2939},\n+ {\"sapa\", 1, {DICTIONARY_COMPANY_TYPE}, 2528},\n {\"grosso\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bso\", 1, {DICTIONARY_SYNONYM}, 2857},\n- {\"c.le\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n- {\"r p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2570},\n- {\"zin\", 1, {DICTIONARY_STREET_TYPE}, 2843},\n- {\"bas.ca\", 1, {DICTIONARY_PLACE_NAME}, 2603},\n- {\"magg.ri\", 1, {DICTIONARY_SYNONYM}, 2925},\n+ {\"ant.a\", 1, {DICTIONARY_SYNONYM}, 2851},\n+ {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n {\"alla\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sigra\", 1, {DICTIONARY_PERSONAL_TITLE}, 2578},\n+ {\"monasto\", 1, {DICTIONARY_PLACE_NAME}, 2676},\n {\"avvocato\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"grotta\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"reg\", 1, {DICTIONARY_STREET_TYPE}, 2776},\n+ {\"c.na\", 1, {DICTIONARY_STREET_TYPE}, 2726},\n+ {\"acquari\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"societ\u00e0 cooperativa a responsabilit\u00e0 limitata\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 2707},\n- {\"can.le\", 1, {DICTIONARY_SYNONYM}, 2720},\n+ {\"gruppo d' interesse economico\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n {\"contrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"brigata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"reverendo madre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"fanteria\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"mad.ne\", 1, {DICTIONARY_SYNONYM}, 2924},\n- {\"intern.li\", 1, {DICTIONARY_SYNONYM}, 2913},\n- {\"ant.e\", 1, {DICTIONARY_SYNONYM}, 2848},\n- {\"cola\", 1, {DICTIONARY_QUALIFIER}, 2694},\n+ {\"fortno\", 1, {DICTIONARY_QUALIFIER}, 2699},\n+ {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 2801},\n+ {\"inf.i\", 1, {DICTIONARY_SYNONYM}, 2915},\n {\"baronessa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ag\", 1, {DICTIONARY_SYNONYM}, 2844},\n- {\"acc.so\", 1, {DICTIONARY_STREET_TYPE}, 2701},\n- {\"qua\", 1, {DICTIONARY_STREET_TYPE}, 2773},\n- {\"pzza\", 1, {DICTIONARY_STREET_TYPE}, 2764},\n+ {\"mannu\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"s.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2579},\n+ {\"plg\", 1, {DICTIONARY_STREET_TYPE}, 2776},\n+ {\"9 bre\", 1, {DICTIONARY_SYNONYM}, 2948},\n {\"penisola\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"alt.za\", 1, {DICTIONARY_SYNONYM}, 2845},\n {\"reverendo padre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"r.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2570},\n+ {\"svc\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"fontna\", 1, {DICTIONARY_PLACE_NAME}, 2655},\n+ {\"palzo\", 1, {DICTIONARY_UNIT}, 2968},\n {\"caverna\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"lgo\", 1, {DICTIONARY_STREET_TYPE}, 2750},\n+ {\"dle\", 1, {DICTIONARY_STOPWORD}, 2702},\n {\"pasticceria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dissalne\", 1, {DICTIONARY_PLACE_NAME}, 2640},\n {\"corte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"vicolo nuovo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n- {\"forcla\", 1, {DICTIONARY_STREET_TYPE}, 2740},\n- {\"cda\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n- {\"n.ra\", 1, {DICTIONARY_SYNONYM}, 2942},\n- {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 2764},\n- {\"mad.ta\", 1, {DICTIONARY_PLACE_NAME}, 2667},\n- {\"accada\", 1, {DICTIONARY_PLACE_NAME}, 2587},\n- {\"divvo\", 1, {DICTIONARY_SYNONYM}, 2880},\n- {\"monumo\", 1, {DICTIONARY_PLACE_NAME}, 2673},\n- {\"sdl\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n- {\"frz\", 1, {DICTIONARY_STREET_TYPE}, 2742},\n- {\"inf.e\", 1, {DICTIONARY_SYNONYM}, 2910},\n- {\"int.ne\", 1, {DICTIONARY_SYNONYM}, 2914},\n- {\"prof.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2567},\n- {\"tvc\", 1, {DICTIONARY_STREET_TYPE}, 2819},\n+ {\"str statale\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"int\", 1, {DICTIONARY_STREET_TYPE}, 2752},\n+ {\"chetta\", 1, {DICTIONARY_PLACE_NAME}, 2639},\n+ {\"vp\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"mri\", 1, {DICTIONARY_SYNONYM}, 2940},\n {\"masseria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.ro\", 1, {DICTIONARY_SYNONYM}, 2943},\n- {\"bretelle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"rva\", 1, {DICTIONARY_STREET_TYPE}, 2784},\n {\"nella\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 2710},\n+ {\"labo\", 1, {DICTIONARY_PLACE_NAME}, 2666},\n+ {\"cat\", 1, {DICTIONARY_STREET_TYPE}, 2725},\n {\"corpo d'armata\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p.rco\", 1, {DICTIONARY_PLACE_NAME}, 2679},\n- {\"scl\", 1, {DICTIONARY_STREET_TYPE}, 2787},\n- {\"fsa\", 1, {DICTIONARY_SYNONYM}, 2886},\n- {\"bga\", 1, {DICTIONARY_STREET_TYPE}, 2688},\n+ {\"a.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n+ {\"f.sa\", 1, {DICTIONARY_SYNONYM}, 2890},\n+ {\"gie\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n+ {\"loc.ta\", 1, {DICTIONARY_STREET_TYPE}, 2763},\n+ {\"ss\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n+ {\"p.cola\", 1, {DICTIONARY_SYNONYM}, 2955},\n+ {\"g.ni\", 1, {DICTIONARY_SYNONYM}, 2896},\n+ {\"calv.o\", 1, {DICTIONARY_SYNONYM}, 2865},\n {\"maresciallo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"c.etto\", 1, {DICTIONARY_UNIT}, 2958},\n- {\"n\u00ba\", 1, {DICTIONARY_UNIT}, 2962},\n- {\"c.p\", 1, {DICTIONARY_POST_OFFICE}, 2686},\n- {\"sal\", 1, {DICTIONARY_STREET_TYPE}, 2785},\n- {\"fortzio\", 1, {DICTIONARY_PLACE_NAME}, 2656},\n- {\"ac\", 1, {DICTIONARY_COMPANY_TYPE}, 2512},\n+ {\"s.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n+ {\"con\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n+ {\"rp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2574},\n+ {\"ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2587},\n+ {\"cavalc.a\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n {\"pompieri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"acqti\", 1, {DICTIONARY_PLACE_NAME}, 2591},\n- {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n- {\"dentro\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"fraz.e\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n+ {\"stc\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"abbazie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pre\", 1, {DICTIONARY_STREET_TYPE}, 2687},\n- {\"centro sportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"aut.ale\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n+ {\"sca\", 1, {DICTIONARY_STREET_TYPE}, 2794},\n {\"area di svago\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gno\", 2, {DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 2891},\n- {\"int.ni\", 1, {DICTIONARY_SYNONYM}, 2915},\n+ {\"inf.e\", 1, {DICTIONARY_SYNONYM}, 2914},\n+ {\"caffe\", 1, {DICTIONARY_PLACE_NAME}, 2613},\n {\"colline\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s.ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2582},\n- {\"inf.i\", 1, {DICTIONARY_SYNONYM}, 2911},\n {\"strada vicinale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bretella\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 2544},\n+ {\"ghi\", 1, {DICTIONARY_SYNONYM}, 2893},\n+ {\"nav.i\", 1, {DICTIONARY_SYNONYM}, 2942},\n {\"casone\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"borgate\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"off.a\", 1, {DICTIONARY_UNIT}, 2963},\n+ {\"sup\", 1, {DICTIONARY_STREET_TYPE}, 2818},\n+ {\"indali\", 1, {DICTIONARY_SYNONYM}, 2913},\n+ {\"str reginale\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"sc\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"ferramenta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cone\", 1, {DICTIONARY_PLACE_NAME}, 2625},\n- {\"fontanile\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"acq.ri\", 1, {DICTIONARY_PLACE_NAME}, 2590},\n- {\"stp\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"sudovest\", 1, {DICTIONARY_DIRECTIONAL}, 2536},\n+ {\"contra\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n+ {\"spr\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n+ {\"b.go\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2695},\n+ {\"v.p\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"infe\", 1, {DICTIONARY_SYNONYM}, 2914},\n {\"rampa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vic\", 1, {DICTIONARY_STREET_TYPE}, 2837},\n- {\"10.bre\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"biv\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n- {\"7 bre\", 1, {DICTIONARY_SYNONYM}, 2955},\n+ {\"pza\", 1, {DICTIONARY_STREET_TYPE}, 2768},\n+ {\"lgd\", 1, {DICTIONARY_STREET_TYPE}, 2756},\n+ {\"bn.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2546},\n+ {\"collegio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"fatt.a\", 1, {DICTIONARY_PLACE_NAME}, 2649},\n+ {\"ferrra\", 1, {DICTIONARY_PLACE_NAME}, 2650},\n {\"asilo infantile\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n+ {\"mar\", 1, {DICTIONARY_SYNONYM}, 2935},\n+ {\"c.so\", 1, {DICTIONARY_STREET_TYPE}, 2732},\n {\"ai\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"stradello\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sda\", 1, {DICTIONARY_STREET_TYPE}, 2790},\n+ {\"cat ba\", 1, {DICTIONARY_PLACE_NAME}, 2633},\n {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fraz.i\", 1, {DICTIONARY_STREET_TYPE}, 2743},\n {\"forcella\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"societ\u00e0 in accomandit\u00e0 per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"osple\", 1, {DICTIONARY_PLACE_NAME}, 2675},\n {\"societ\u00e0 semplice\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"spa\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n- {\"d.tro\", 1, {DICTIONARY_STOPWORD}, 2700},\n- {\"cpl\", 1, {DICTIONARY_STREET_TYPE}, 2718},\n- {\"gge\", 1, {DICTIONARY_UNIT}, 2961},\n+ {\"ferr.a\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n+ {\"v.s\", 1, {DICTIONARY_STREET_TYPE}, 2830},\n {\"fossa\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sergente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"monumo\", 1, {DICTIONARY_PLACE_NAME}, 2677},\n {\"la\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"incor.ta\", 1, {DICTIONARY_SYNONYM}, 2906},\n+ {\"spd\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n+ {\"calvario\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"console\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"brlle\", 1, {DICTIONARY_STREET_TYPE}, 2714},\n- {\"7.bre\", 1, {DICTIONARY_SYNONYM}, 2955},\n- {\"cavalc.a\", 1, {DICTIONARY_STREET_TYPE}, 2723},\n+ {\"s.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2579},\n+ {\"mec\", 1, {DICTIONARY_PLACE_NAME}, 2675},\n+ {\"re\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"accademie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dott\", 1, {DICTIONARY_PERSONAL_TITLE}, 2551},\n- {\"aerop.to\", 1, {DICTIONARY_PLACE_NAME}, 2593},\n+ {\"nve\", 1, {DICTIONARY_SYNONYM}, 2950},\n+ {\"p.coli\", 1, {DICTIONARY_SYNONYM}, 2957},\n+ {\"bne\", 1, {DICTIONARY_PERSONAL_TITLE}, 2545},\n+ {\"nva\", 1, {DICTIONARY_SYNONYM}, 2949},\n+ {\"anfito\", 1, {DICTIONARY_PLACE_NAME}, 2601},\n {\"il\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n- {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 2513},\n+ {\"distill.a\", 1, {DICTIONARY_PLACE_NAME}, 2645},\n+ {\"magg.re\", 1, {DICTIONARY_SYNONYM}, 2563},\n {\"bealera\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"societa a responsabilita limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n- {\"s.a.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n+ {\"comle\", 1, {DICTIONARY_SYNONYM}, 2879},\n+ {\"s.r.\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n {\"ferrata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"str.te\", 1, {DICTIONARY_STREET_TYPE}, 2811},\n- {\"vve\", 1, {DICTIONARY_STREET_TYPE}, 2827},\n- {\"dpmto\", 1, {DICTIONARY_UNIT}, 2959},\n- {\"lavanda\", 1, {DICTIONARY_PLACE_NAME}, 2663},\n- {\"b.re\", 1, {DICTIONARY_SYNONYM}, 2860},\n+ {\"lab.o\", 1, {DICTIONARY_PLACE_NAME}, 2666},\n+ {\"bete\", 1, {DICTIONARY_PLACE_NAME}, 2610},\n+ {\"grpo\", 1, {DICTIONARY_SYNONYM}, 2909},\n {\"duca\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"forni\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"caporale maggiore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"campgi\", 1, {DICTIONARY_PLACE_NAME}, 2616},\n {\"stretta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"a c\", 1, {DICTIONARY_COMPANY_TYPE}, 2512},\n {\"parco giochi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"str.reg\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"f.ni\", 1, {DICTIONARY_PLACE_NAME}, 2652},\n- {\"fro\", 1, {DICTIONARY_PLACE_NAME}, 2644},\n- {\"cantina\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"gr.de\", 1, {DICTIONARY_SYNONYM}, 2900},\n+ {\"s v\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"gno\", 2, {DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 2895},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 2532},\n+ {\"s.s.\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n {\"campiello\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tpr\", 1, {DICTIONARY_STREET_TYPE}, 2817},\n- {\"avv\", 1, {DICTIONARY_PERSONAL_TITLE}, 2540},\n+ {\"padiglinoe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"libreria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"car.ggio\", 1, {DICTIONARY_PLACE_NAME}, 2621},\n+ {\"str r\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"br.lle\", 1, {DICTIONARY_STREET_TYPE}, 2718},\n+ {\"autda\", 1, {DICTIONARY_STREET_TYPE}, 2711},\n+ {\"mro\", 1, {DICTIONARY_SYNONYM}, 2941},\n {\"imperatrice\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vc\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n- {\"centro comm le\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n+ {\"cav.ne\", 1, {DICTIONARY_SYNONYM}, 2868},\n+ {\"birre\", 1, {DICTIONARY_PLACE_NAME}, 2612},\n {\"fioraio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"strada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c.ale\", 1, {DICTIONARY_PLACE_NAME}, 2622},\n {\"basilica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"l\", 1, {DICTIONARY_SYNONYM}, 2918},\n {\"agli\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"cso\", 1, {DICTIONARY_STREET_TYPE}, 2732},\n {\"arco\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2578},\n+ {\"cdella\", 1, {DICTIONARY_PLACE_NAME}, 2640},\n {\"galleria\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"coopva\", 1, {DICTIONARY_COMPANY_TYPE}, 2514},\n+ {\"str provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"pub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"terminal traghetto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr\", 1, {DICTIONARY_SYNONYM}, 2895},\n- {\"cale\", 1, {DICTIONARY_PLACE_NAME}, 2618},\n+ {\"f.no\", 1, {DICTIONARY_PLACE_NAME}, 2657},\n {\"degli\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n- {\"pcoli\", 1, {DICTIONARY_SYNONYM}, 2953},\n+ {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 2542},\n+ {\"vlp\", 1, {DICTIONARY_STREET_TYPE}, 2834},\n {\"calle\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"str.s\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"mandto\", 1, {DICTIONARY_SYNONYM}, 2926},\n- {\"magaz.o\", 1, {DICTIONARY_PLACE_NAME}, 2669},\n- {\"tra s.s.\", 1, {DICTIONARY_STREET_TYPE}, 2818},\n- {\"c d a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n- {\"erglo\", 1, {DICTIONARY_PLACE_NAME}, 2642},\n- {\"gr.te\", 1, {DICTIONARY_SYNONYM}, 2903},\n+ {\"c.te\", 1, {DICTIONARY_STREET_TYPE}, 2733},\n+ {\"str.r\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n+ {\"gennaio\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"nazionale\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"br.lla\", 1, {DICTIONARY_STREET_TYPE}, 2713},\n+ {\"aut sle\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n {\"scali\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cll.a\", 1, {DICTIONARY_SYNONYM}, 2869},\n- {\"orrient.le\", 1, {DICTIONARY_DIRECTIONAL}, 2532},\n- {\"maddna\", 1, {DICTIONARY_SYNONYM}, 2922},\n- {\"indali\", 1, {DICTIONARY_SYNONYM}, 2909},\n- {\"vpr\", 1, {DICTIONARY_STREET_TYPE}, 2824},\n- {\"fabbra\", 1, {DICTIONARY_PLACE_NAME}, 2643},\n- {\"cons.rio\", 1, {DICTIONARY_PLACE_NAME}, 2638},\n- {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2547},\n+ {\"gr.si\", 1, {DICTIONARY_SYNONYM}, 2904},\n {\"antiche\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"rio tera'\", 1, {DICTIONARY_STREET_TYPE}, 2778},\n- {\"nav.o\", 1, {DICTIONARY_SYNONYM}, 2939},\n- {\"distr.o\", 1, {DICTIONARY_SYNONYM}, 2879},\n- {\"rit\", 1, {DICTIONARY_STREET_TYPE}, 2778},\n+ {\"aeropto\", 1, {DICTIONARY_PLACE_NAME}, 2597},\n+ {\"arch\", 1, {DICTIONARY_PERSONAL_TITLE}, 2543},\n+ {\"interne\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"ob.sco\", 1, {DICTIONARY_PLACE_NAME}, 2678},\n+ {\"monast.o\", 1, {DICTIONARY_PLACE_NAME}, 2676},\n {\"officina\", 1, {DICTIONARY_UNIT}, -1},\n- {\"basche\", 1, {DICTIONARY_PLACE_NAME}, 2604},\n- {\"gall.e\", 1, {DICTIONARY_STREET_TYPE}, 2744},\n- {\"v.s.\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n- {\"cta\", 1, {DICTIONARY_STREET_TYPE}, 2732},\n- {\"abbadia\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n- {\"alb.i\", 1, {DICTIONARY_PLACE_NAME}, 2594},\n- {\"ant.a\", 1, {DICTIONARY_SYNONYM}, 2847},\n- {\"f.te\", 1, {DICTIONARY_SYNONYM}, 2884},\n+ {\"abba\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n+ {\"s.a.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2528},\n+ {\"acq.to\", 1, {DICTIONARY_PLACE_NAME}, 2596},\n+ {\"dpmto\", 1, {DICTIONARY_UNIT}, 2963},\n+ {\"ctina\", 1, {DICTIONARY_UNIT}, 2960},\n+ {\"arcipghi\", 1, {DICTIONARY_SYNONYM}, 2856},\n+ {\"n.va\", 1, {DICTIONARY_SYNONYM}, 2949},\n+ {\"b.re\", 1, {DICTIONARY_SYNONYM}, 2864},\n+ {\"s a g l\", 1, {DICTIONARY_COMPANY_TYPE}, 2529},\n+ {\"ind.ia\", 1, {DICTIONARY_SYNONYM}, 2911},\n {\"agenzia immobiliare\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"intni\", 1, {DICTIONARY_SYNONYM}, 2915},\n- {\"f.ta\", 1, {DICTIONARY_STREET_TYPE}, 2737},\n- {\"societa in nome collettivo\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n+ {\"carab.ri\", 1, {DICTIONARY_PLACE_NAME}, 2619},\n+ {\"cnt\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n+ {\"medit.eo\", 1, {DICTIONARY_SYNONYM}, 2937},\n {\"calzaturificio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"obsco\", 1, {DICTIONARY_PLACE_NAME}, 2674},\n- {\"tintoria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ip.dromo\", 1, {DICTIONARY_PLACE_NAME}, 2664},\n+ {\"corpo darmata\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n {\"locanda\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.p.\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"snc\", 1, {DICTIONARY_NO_ADDRESS}, 2537},\n- {\"s.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2575},\n- {\"ipdromo\", 1, {DICTIONARY_PLACE_NAME}, 2660},\n- {\"s.prov\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"portici\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.a.g.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n+ {\"cletto\", 1, {DICTIONARY_PLACE_NAME}, 2623},\n+ {\"mas\", 1, {DICTIONARY_PLACE_NAME}, 2674},\n+ {\"galle\", 1, {DICTIONARY_STREET_TYPE}, 2748},\n+ {\"bgno\", 1, {DICTIONARY_PLACE_NAME}, 2602},\n+ {\"loc\", 1, {DICTIONARY_STREET_TYPE}, 2763},\n+ {\"lgo\", 1, {DICTIONARY_STREET_TYPE}, 2754},\n+ {\"tpr\", 1, {DICTIONARY_STREET_TYPE}, 2821},\n+ {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"in\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"10bre\", 1, {DICTIONARY_SYNONYM}, 2878},\n {\"blocchi\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n- {\"magg\", 1, {DICTIONARY_SYNONYM}, 2921},\n- {\"cas.ma\", 1, {DICTIONARY_PLACE_NAME}, 2620},\n+ {\"bghi\", 1, {DICTIONARY_QUALIFIER}, 2694},\n+ {\"strto\", 1, {DICTIONARY_STREET_TYPE}, 2817},\n+ {\"b.de\", 1, {DICTIONARY_SYNONYM}, 2858},\n {\"cortile\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"v provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n- {\"n.vo\", 1, {DICTIONARY_SYNONYM}, 2948},\n {\"signore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"fond.a\", 1, {DICTIONARY_PLACE_NAME}, 2654},\n+ {\"ang.\", 1, {DICTIONARY_STREET_TYPE}, 2709},\n+ {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n {\"nelle\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 2538},\n {\"presidente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"camp.gi\", 1, {DICTIONARY_PLACE_NAME}, 2612},\n- {\"fabbr.a\", 1, {DICTIONARY_PLACE_NAME}, 2643},\n+ {\"magaz.o\", 1, {DICTIONARY_PLACE_NAME}, 2673},\n {\"farmacia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"macelleria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"v.le\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n- {\"maritt.o\", 1, {DICTIONARY_SYNONYM}, 2930},\n- {\"ca'\", 1, {DICTIONARY_UNIT}, 2957},\n- {\"gh.io\", 1, {DICTIONARY_SYNONYM}, 2890},\n- {\"g.i.e\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n- {\"lungolago\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bmento\", 1, {DICTIONARY_PLACE_NAME}, 2604},\n+ {\"aut.da\", 1, {DICTIONARY_STREET_TYPE}, 2711},\n+ {\"metrna\", 1, {DICTIONARY_SYNONYM}, 2938},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"riv\", 1, {DICTIONARY_STREET_TYPE}, 2781},\n- {\"sig\", 1, {DICTIONARY_PERSONAL_TITLE}, 2579},\n- {\"p.te\", 1, {DICTIONARY_STREET_TYPE}, 2767},\n+ {\"r.m.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n+ {\"fte\", 1, {DICTIONARY_SYNONYM}, 2888},\n+ {\"borge\", 1, {DICTIONARY_QUALIFIER}, 2693},\n+ {\"autostrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"monastero\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"str.ta\", 1, {DICTIONARY_STREET_TYPE}, 2814},\n {\"supermercato\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"fortificazione\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"spadaria\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.della\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"and\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n+ {\"s r\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n {\"collo\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"supportico\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fort.za\", 1, {DICTIONARY_PLACE_NAME}, 2654},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gr.so\", 1, {DICTIONARY_SYNONYM}, 2901},\n- {\"sul\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"rtd\", 1, {DICTIONARY_STREET_TYPE}, 2787},\n+ {\"sdr\", 1, {DICTIONARY_STREET_TYPE}, 2795},\n+ {\"c.ta\", 1, {DICTIONARY_PLACE_NAME}, 2625},\n {\"regina\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"convto\", 1, {DICTIONARY_PLACE_NAME}, 2639},\n- {\"grte\", 1, {DICTIONARY_SYNONYM}, 2903},\n- {\"snu\", 1, {DICTIONARY_STREET_TYPE}, 2799},\n- {\"cast.o\", 1, {DICTIONARY_PLACE_NAME}, 2628},\n+ {\"#\", 1, {DICTIONARY_UNIT}, 2966},\n+ {\"s.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2577},\n+ {\"giul\", 1, {DICTIONARY_SYNONYM}, 2898},\n+ {\"ctta\", 1, {DICTIONARY_SYNONYM}, 2872},\n {\"alzaia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"laboratorio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"decembre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"gall.a\", 1, {DICTIONARY_STREET_TYPE}, 2657},\n+ {\"erglo\", 1, {DICTIONARY_PLACE_NAME}, 2646},\n {\"bassi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"madonne\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"m.ro\", 1, {DICTIONARY_SYNONYM}, 2941},\n+ {\"beta\", 1, {DICTIONARY_PLACE_NAME}, 2609},\n+ {\"bsa\", 1, {DICTIONARY_SYNONYM}, 2859},\n {\"vicolo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"g.i.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n- {\"abb.a\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n- {\"ant.i\", 1, {DICTIONARY_SYNONYM}, 2849},\n- {\"nov\", 1, {DICTIONARY_SYNONYM}, 2944},\n- {\"scrl\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n- {\"pro\", 1, {DICTIONARY_STREET_TYPE}, 2771},\n- {\"dipart.o\", 1, {DICTIONARY_UNIT}, 2959},\n- {\"can.li\", 1, {DICTIONARY_SYNONYM}, 2862},\n- {\"c.tta\", 1, {DICTIONARY_SYNONYM}, 2868},\n- {\"dec\", 1, {DICTIONARY_SYNONYM}, 2877},\n- {\"s.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n+ {\"anti\", 1, {DICTIONARY_SYNONYM}, 2853},\n+ {\"vta\", 1, {DICTIONARY_STREET_TYPE}, 2846},\n+ {\"dott.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2556},\n+ {\"borg.a\", 1, {DICTIONARY_QUALIFIER}, 2692},\n+ {\"s.da\", 1, {DICTIONARY_STREET_TYPE}, 2790},\n+ {\"gr uff\", 1, {DICTIONARY_PERSONAL_TITLE}, 2561},\n+ {\"grso\", 1, {DICTIONARY_SYNONYM}, 2905},\n+ {\"str st\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"c.da\", 1, {DICTIONARY_STREET_TYPE}, 2731},\n+ {\"strte\", 1, {DICTIONARY_STREET_TYPE}, 2815},\n+ {\"cht\", 1, {DICTIONARY_PLACE_NAME}, 2637},\n+ {\"com.le\", 1, {DICTIONARY_SYNONYM}, 2879},\n+ {\"s.c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n {\"cartoleria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"caporale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"vicolo vecchio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pensilina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"accesso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"interrato\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"f.ca\", 1, {DICTIONARY_STREET_TYPE}, 2739},\n- {\"crocevia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"lgv\", 1, {DICTIONARY_STREET_TYPE}, 2762},\n {\"dell'\", 2, {DICTIONARY_ELISION, DICTIONARY_STOPWORD}, -1},\n+ {\"v s\", 1, {DICTIONARY_STREET_TYPE}, 2830},\n {\"cardinale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"f.ni\", 1, {DICTIONARY_PLACE_NAME}, 2656},\n {\"barone\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"galla\", 1, {DICTIONARY_STREET_TYPE}, 2657},\n- {\"s.a.s\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n- {\"8bre\", 1, {DICTIONARY_SYNONYM}, 2949},\n+ {\"p.n\u00ba\", 1, {DICTIONARY_UNIT}, 2969},\n+ {\"fv\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n+ {\"std\", 1, {DICTIONARY_STREET_TYPE}, 2813},\n+ {\"cpo\", 1, {DICTIONARY_STREET_TYPE}, 2723},\n+ {\"ca'\", 1, {DICTIONARY_UNIT}, 2961},\n+ {\"piano\", 1, {DICTIONARY_UNIT}, -1},\n {\"volta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n+ {\"gendria\", 1, {DICTIONARY_PLACE_NAME}, 2662},\n+ {\"alb.o\", 1, {DICTIONARY_PLACE_NAME}, 2599},\n {\"sullo\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"bdo\", 1, {DICTIONARY_STREET_TYPE}, 2710},\n {\"caff\u00e8\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s a p a\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n- {\"mlo\", 1, {DICTIONARY_STREET_TYPE}, 2760},\n- {\"cav uff\", 1, {DICTIONARY_PERSONAL_TITLE}, 2546},\n+ {\"10 bre\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"madna\", 1, {DICTIONARY_SYNONYM}, 2927},\n+ {\"fortone\", 1, {DICTIONARY_PLACE_NAME}, 2659},\n+ {\"clle\", 1, {DICTIONARY_SYNONYM}, 2874},\n+ {\"v.c\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n+ {\"osta\", 1, {DICTIONARY_PLACE_NAME}, 2680},\n {\"su\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"pad.ne\", 1, {DICTIONARY_PLACE_NAME}, 2681},\n {\"generale\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"dagli\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"prco giochi\", 1, {DICTIONARY_PLACE_NAME}, 2680},\n- {\"militare\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"barbiere\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"coll.io\", 1, {DICTIONARY_PLACE_NAME}, 2637},\n- {\"s.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n- {\"clt\", 1, {DICTIONARY_STREET_TYPE}, 2716},\n- {\"borga\", 1, {DICTIONARY_QUALIFIER}, 2688},\n+ {\"lavand.a\", 1, {DICTIONARY_PLACE_NAME}, 2667},\n+ {\"fort.no\", 1, {DICTIONARY_QUALIFIER}, 2699},\n+ {\"naz.le\", 1, {DICTIONARY_SYNONYM}, 2944},\n {\"spalto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"frazi\", 1, {DICTIONARY_STREET_TYPE}, 2743},\n- {\"rii\", 1, {DICTIONARY_STREET_TYPE}, 2777},\n- {\"r.m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2569},\n- {\"maggiori\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bete\", 1, {DICTIONARY_PLACE_NAME}, 2606},\n+ {\"p.cole\", 1, {DICTIONARY_SYNONYM}, 2956},\n+ {\"sci\", 1, {DICTIONARY_STREET_TYPE}, 2793},\n+ {\"prco\", 1, {DICTIONARY_PLACE_NAME}, 2683},\n+ {\"metr.na\", 1, {DICTIONARY_SYNONYM}, 2938},\n {\"vigili del fuoco\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"strette\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 2683},\n- {\"f.v\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n- {\"circonvallazione\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"aut.de\", 1, {DICTIONARY_STREET_TYPE}, 2713},\n+ {\"vs\", 1, {DICTIONARY_STREET_TYPE}, 2830},\n+ {\"mte\", 1, {DICTIONARY_STREET_TYPE}, 2765},\n+ {\"fonderia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"co\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n+ {\"str prov\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"mrno\", 1, {DICTIONARY_SYNONYM}, 2933},\n+ {\"can.li\", 1, {DICTIONARY_SYNONYM}, 2866},\n+ {\"str.st\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n {\"trattoria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fatta\", 1, {DICTIONARY_PLACE_NAME}, 2645},\n- {\"cle\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n+ {\"avv\", 1, {DICTIONARY_PERSONAL_TITLE}, 2544},\n {\"lavanderia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"maggre\", 1, {DICTIONARY_SYNONYM}, 2559},\n- {\"albi\", 1, {DICTIONARY_PLACE_NAME}, 2594},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 2537},\n+ {\"comta\", 1, {DICTIONARY_SYNONYM}, 2880},\n+ {\"s.c.\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"rio ter\u00e0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"str.ti\", 1, {DICTIONARY_STREET_TYPE}, 2812},\n- {\"magaz.i\", 1, {DICTIONARY_PLACE_NAME}, 2668},\n- {\"cla\", 1, {DICTIONARY_SYNONYM}, 2866},\n+ {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 2565},\n+ {\"parrucchiere\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vct\", 1, {DICTIONARY_STREET_TYPE}, 2835},\n+ {\"fno\", 1, {DICTIONARY_PLACE_NAME}, 2657},\n+ {\"camp.gio\", 1, {DICTIONARY_PLACE_NAME}, 2615},\n {\"ghiacciaio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dissal.ne\", 1, {DICTIONARY_PLACE_NAME}, 2640},\n- {\"n.o\", 1, {DICTIONARY_UNIT}, 2962},\n+ {\"pcolo\", 1, {DICTIONARY_SYNONYM}, 2958},\n+ {\"anfit.i\", 1, {DICTIONARY_PLACE_NAME}, 2600},\n {\"scuola guida\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pn\u00ba\", 1, {DICTIONARY_UNIT}, 2965},\n {\"ponte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"strada provinciale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"conte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sten\", 1, {DICTIONARY_PERSONAL_TITLE}, 2582},\n- {\"autale\", 1, {DICTIONARY_STREET_TYPE}, 2708},\n- {\"rva\", 1, {DICTIONARY_STREET_TYPE}, 2780},\n- {\"bna\", 1, {DICTIONARY_STREET_TYPE}, 2711},\n+ {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 2539},\n+ {\"ministro\", 1, {DICTIONARY_PERSONAL_TITLE}, 2565},\n {\"dei\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"foro\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"s vicinale\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 2821},\n+ {\"collio\", 1, {DICTIONARY_PLACE_NAME}, 2641},\n+ {\"cna\", 1, {DICTIONARY_STREET_TYPE}, 2726},\n+ {\"calvo\", 1, {DICTIONARY_SYNONYM}, 2865},\n+ {\"lgt\", 1, {DICTIONARY_STREET_TYPE}, 2753},\n+ {\"isoletti\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"forti\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"mandto\", 1, {DICTIONARY_SYNONYM}, 2930},\n {\"scale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"via comunale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"10 bre\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"fca\", 1, {DICTIONARY_STREET_TYPE}, 2739},\n- {\"fortone\", 1, {DICTIONARY_PLACE_NAME}, 2655},\n+ {\"fta\", 1, {DICTIONARY_STREET_TYPE}, 2741},\n {\"municipio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2575},\n- {\"s.v.\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"societ\u00e0 per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"fraz\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n+ {\"gna\", 1, {DICTIONARY_STREET_TYPE}, 2749},\n+ {\"m.ino\", 1, {DICTIONARY_SYNONYM}, 2933},\n+ {\"ferr.rio\", 1, {DICTIONARY_PLACE_NAME}, 2653},\n+ {\"l.go\", 1, {DICTIONARY_SYNONYM}, 2759},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 2689},\n+ {\"carc.e\", 1, {DICTIONARY_PLACE_NAME}, 2620},\n {\"piazzetta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nro\", 1, {DICTIONARY_SYNONYM}, 2943},\n- {\"interni\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"edifo\", 1, {DICTIONARY_UNIT}, 2960},\n+ {\"bet.e\", 1, {DICTIONARY_PLACE_NAME}, 2610},\n+ {\"bl.o\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 2697},\n+ {\"ferr.ria\", 1, {DICTIONARY_PLACE_NAME}, 2652},\n+ {\"com.ta\", 1, {DICTIONARY_SYNONYM}, 2880},\n+ {\"b.ghi\", 1, {DICTIONARY_QUALIFIER}, 2694},\n {\"architetto\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"distilla\", 1, {DICTIONARY_PLACE_NAME}, 2641},\n- {\"b.mento\", 1, {DICTIONARY_PLACE_NAME}, 2600},\n- {\"campgi\", 1, {DICTIONARY_PLACE_NAME}, 2612},\n+ {\"mad.na\", 1, {DICTIONARY_SYNONYM}, 2927},\n+ {\"casino\", 1, {DICTIONARY_PLACE_NAME}, 2627},\n+ {\"font.ile\", 1, {DICTIONARY_SYNONYM}, 2887},\n+ {\"fontile\", 1, {DICTIONARY_SYNONYM}, 2887},\n {\"piccola\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bde\", 1, {DICTIONARY_SYNONYM}, 2854},\n- {\"drssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2552},\n- {\"b.si\", 1, {DICTIONARY_SYNONYM}, 2856},\n- {\"gh.i\", 1, {DICTIONARY_SYNONYM}, 2889},\n- {\"pss\", 1, {DICTIONARY_STREET_TYPE}, 2763},\n+ {\"b.gni\", 1, {DICTIONARY_PLACE_NAME}, 2603},\n+ {\"9.mbre\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"marino\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"rtb\", 1, {DICTIONARY_STREET_TYPE}, 2786},\n+ {\"med.a\", 1, {DICTIONARY_SYNONYM}, 2936},\n+ {\"anfit.o\", 1, {DICTIONARY_PLACE_NAME}, 2601},\n+ {\"capta\", 1, {DICTIONARY_PLACE_NAME}, 2618},\n {\"ferroviario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s n c\", 1, {DICTIONARY_NO_ADDRESS}, 2537},\n- {\"labo\", 1, {DICTIONARY_PLACE_NAME}, 2662},\n- {\"occid.le\", 1, {DICTIONARY_DIRECTIONAL}, 2531},\n- {\"g.ge\", 1, {DICTIONARY_UNIT}, 2961},\n- {\"carce\", 1, {DICTIONARY_PLACE_NAME}, 2616},\n+ {\"cta\", 1, {DICTIONARY_PLACE_NAME}, 2625},\n+ {\"str\", 1, {DICTIONARY_STREET_TYPE}, 2801},\n+ {\"8 bre\", 1, {DICTIONARY_SYNONYM}, 2953},\n+ {\"s.v\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"vcn\", 1, {DICTIONARY_STREET_TYPE}, 2839},\n+ {\"strta\", 1, {DICTIONARY_STREET_TYPE}, 2814},\n+ {\"int.ni\", 1, {DICTIONARY_SYNONYM}, 2919},\n {\"museo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rpa\", 1, {DICTIONARY_STREET_TYPE}, 2774},\n- {\"cle\", 1, {DICTIONARY_SYNONYM}, 2867},\n- {\"str s\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"b.so\", 1, {DICTIONARY_SYNONYM}, 2857},\n- {\"calzat.cio\", 1, {DICTIONARY_PLACE_NAME}, 2610},\n- {\"salone di bellezza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"birr.e\", 1, {DICTIONARY_PLACE_NAME}, 2608},\n- {\"naz.le\", 1, {DICTIONARY_SYNONYM}, 2940},\n- {\"intno\", 1, {DICTIONARY_SYNONYM}, 2916},\n+ {\"gr.sa\", 1, {DICTIONARY_SYNONYM}, 2902},\n+ {\"piccolo\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"cittadella\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ri\", 1, {DICTIONARY_STREET_TYPE}, 2783},\n {\"gentile\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bmenti\", 1, {DICTIONARY_PLACE_NAME}, 2601},\n+ {\"loc.a\", 1, {DICTIONARY_PLACE_NAME}, 2668},\n {\"corso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c.zo\", 1, {DICTIONARY_SYNONYM}, 2877},\n {\"curato\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"carabri\", 1, {DICTIONARY_PLACE_NAME}, 2615},\n+ {\"birr.a\", 1, {DICTIONARY_PLACE_NAME}, 2611},\n+ {\"f.so\", 1, {DICTIONARY_SYNONYM}, 2889},\n+ {\"calzatcio\", 1, {DICTIONARY_PLACE_NAME}, 2614},\n {\"negli\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"sta\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n+ {\"pal.zi\", 1, {DICTIONARY_QUALIFIER}, 2700},\n {\"laghetto\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"feb\", 1, {DICTIONARY_SYNONYM}, 2886},\n {\"signora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gr.di\", 1, {DICTIONARY_SYNONYM}, 2897},\n- {\"ist\", 1, {DICTIONARY_PLACE_NAME}, 2661},\n- {\"s.c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n- {\"p.ta\", 1, {DICTIONARY_STREET_TYPE}, 2769},\n+ {\"sig.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 2582},\n+ {\"centro comm.le\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"fraze\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n+ {\"maggiori\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"barche\", 1, {DICTIONARY_PLACE_NAME}, 2606},\n+ {\"ind.ale\", 1, {DICTIONARY_SYNONYM}, 2912},\n {\"istituto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"collio\", 1, {DICTIONARY_PLACE_NAME}, 2637},\n {\"campo da golf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pco\", 1, {DICTIONARY_PLACE_NAME}, 2683},\n+ {\"lag.a\", 1, {DICTIONARY_SYNONYM}, 2923},\n {\"autonoleggio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lgt\", 1, {DICTIONARY_STREET_TYPE}, 2749},\n {\"reverendo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ferr.ra\", 1, {DICTIONARY_PLACE_NAME}, 2646},\n+ {\"dic\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"x.bre\", 1, {DICTIONARY_SYNONYM}, 2882},\n {\"canale\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_SYNONYM}, -1},\n- {\"palzo\", 1, {DICTIONARY_UNIT}, 2964},\n- {\"c.po\", 1, {DICTIONARY_STREET_TYPE}, 2719},\n {\"biblioteca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cat be\", 1, {DICTIONARY_PLACE_NAME}, 2630},\n- {\"str provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n+ {\"pre\", 1, {DICTIONARY_STREET_TYPE}, 2691},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 2538},\n {\"marchesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sas\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n {\"capitano\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"chalet\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"lghi\", 1, {DICTIONARY_SYNONYM}, 2924},\n {\"impianto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lug\", 1, {DICTIONARY_STREET_TYPE}, 2753},\n- {\"b.ia\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n+ {\"staz\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n+ {\"distro\", 1, {DICTIONARY_SYNONYM}, 2883},\n+ {\"9 mbre\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n+ {\"lge\", 1, {DICTIONARY_STREET_TYPE}, 2755},\n {\"isolette\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"d'\", 2, {DICTIONARY_ELISION, DICTIONARY_STOPWORD}, -1},\n {\"onorevole\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"metropolitana\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"parcheggio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"coop.vo\", 1, {DICTIONARY_COMPANY_TYPE}, 2515},\n- {\"str.to\", 1, {DICTIONARY_STREET_TYPE}, 2813},\n+ {\"convto\", 1, {DICTIONARY_PLACE_NAME}, 2643},\n {\"ingegnere\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"borg.e\", 1, {DICTIONARY_QUALIFIER}, 2693},\n {\"novembre\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"frazioni\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"czo\", 1, {DICTIONARY_SYNONYM}, 2873},\n- {\"naz.li\", 1, {DICTIONARY_SYNONYM}, 2941},\n+ {\"bre\", 1, {DICTIONARY_SYNONYM}, 2864},\n+ {\"vcm\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n+ {\"imp.to\", 1, {DICTIONARY_PLACE_NAME}, 2663},\n+ {\"autde\", 1, {DICTIONARY_STREET_TYPE}, 2713},\n+ {\"vpv\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2531},\n {\"ristorante\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 2559},\n {\"basse\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"industriale\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"fortno\", 1, {DICTIONARY_QUALIFIER}, 2695},\n+ {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cav.na\", 1, {DICTIONARY_SYNONYM}, 2867},\n {\"dottoressa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"stra\", 1, {DICTIONARY_STREET_TYPE}, 2797},\n- {\"9.bre\", 1, {DICTIONARY_SYNONYM}, 2944},\n- {\"sv\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"societa semplice\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n- {\"ant.o\", 1, {DICTIONARY_SYNONYM}, 2850},\n- {\"giudice\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"int\", 1, {DICTIONARY_STREET_TYPE}, 2748},\n- {\"fonderia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"abbadie\", 1, {DICTIONARY_PLACE_NAME}, 2590},\n+ {\"ag\", 1, {DICTIONARY_SYNONYM}, 2848},\n+ {\"gen\", 1, {DICTIONARY_SYNONYM}, 2892},\n+ {\"negozio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"qua\", 1, {DICTIONARY_STREET_TYPE}, 2777},\n+ {\"v.lo\", 1, {DICTIONARY_STREET_TYPE}, 2836},\n+ {\"div.vo\", 1, {DICTIONARY_SYNONYM}, 2884},\n {\"cappelleria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.ri\", 1, {DICTIONARY_SYNONYM}, 2936},\n+ {\"p.\u00ba\", 1, {DICTIONARY_UNIT}, 2969},\n+ {\"s.a.g.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 2529},\n {\"interno\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ple\", 1, {DICTIONARY_STREET_TYPE}, 2769},\n+ {\"dla\", 1, {DICTIONARY_STOPWORD}, 2701},\n {\"ferrovia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sarto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nazli\", 1, {DICTIONARY_SYNONYM}, 2941},\n {\"viale privato\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s p a\", 1, {DICTIONARY_COMPANY_TYPE}, 2527},\n+ {\"rpa\", 1, {DICTIONARY_STREET_TYPE}, 2778},\n {\"sottotenente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ministero\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_PLACE_NAME}, -1},\n- {\"sto\", 1, {DICTIONARY_STREET_TYPE}, 2813},\n {\"birrerie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.p.a\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n- {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n+ {\"s s\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n {\"per\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nordest\", 1, {DICTIONARY_DIRECTIONAL}, 2528},\n- {\"v.p.\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n- {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 2558},\n+ {\"altze\", 1, {DICTIONARY_SYNONYM}, 2850},\n+ {\"c.d.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n {\"panetteria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pcole\", 1, {DICTIONARY_SYNONYM}, 2952},\n- {\"srl\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n- {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 2564},\n- {\"co\", 1, {DICTIONARY_POST_OFFICE}, 2687},\n- {\"vcv\", 1, {DICTIONARY_STREET_TYPE}, 2836},\n+ {\"dr.ssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2556},\n+ {\"scc\", 1, {DICTIONARY_STREET_TYPE}, 2788},\n+ {\"d.le\", 1, {DICTIONARY_STOPWORD}, 2702},\n+ {\"arcip.gho\", 1, {DICTIONARY_SYNONYM}, 2857},\n {\"campo sportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"scuola superiore\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"casetto\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"p.rco\", 1, {DICTIONARY_PLACE_NAME}, 2683},\n {\"contr\u00e0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"arcip.ghi\", 1, {DICTIONARY_SYNONYM}, 2852},\n+ {\"llg\", 1, {DICTIONARY_STREET_TYPE}, 2760},\n {\"piccoli\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"traversa privata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"fsa\", 1, {DICTIONARY_SYNONYM}, 2890},\n {\"nuovo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"abb.e\", 1, {DICTIONARY_PLACE_NAME}, 2586},\n- {\"s s\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"badia\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n {\"maddalena\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"f.rata\", 1, {DICTIONARY_STREET_TYPE}, 2736},\n- {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 2529},\n- {\"con\", 1, {DICTIONARY_STREET_TYPE}, 2726},\n- {\"bia\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n+ {\"coop.va\", 1, {DICTIONARY_COMPANY_TYPE}, 2518},\n {\"scalinata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"basca\", 1, {DICTIONARY_PLACE_NAME}, 2603},\n+ {\"ang\", 1, {DICTIONARY_STREET_TYPE}, 2709},\n+ {\"s s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2577},\n {\"passeggiata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nvi\", 1, {DICTIONARY_SYNONYM}, 2947},\n- {\"s.r\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n {\"aprile\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dicembre\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ost.a\", 1, {DICTIONARY_PLACE_NAME}, 2676},\n+ {\"canle\", 1, {DICTIONARY_SYNONYM}, 2724},\n+ {\"r.p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2574},\n+ {\"clla\", 1, {DICTIONARY_SYNONYM}, 2873},\n+ {\"dentro\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"stretti\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"viuzzo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"l.etta\", 1, {DICTIONARY_PLACE_NAME}, 2669},\n {\"emissario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ch.etta\", 1, {DICTIONARY_PLACE_NAME}, 2635},\n- {\"lungargine\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"comta\", 1, {DICTIONARY_SYNONYM}, 2876},\n- {\"fev\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"n.ve\", 1, {DICTIONARY_SYNONYM}, 2950},\n+ {\"magazo\", 1, {DICTIONARY_PLACE_NAME}, 2673},\n+ {\"ptl\", 1, {DICTIONARY_STREET_TYPE}, 2772},\n+ {\"co\", 1, {DICTIONARY_POST_OFFICE}, 2691},\n {\"universit\u00e0\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.vi\", 1, {DICTIONARY_SYNONYM}, 2947},\n- {\"s statale\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"b.se\", 1, {DICTIONARY_SYNONYM}, 2858},\n- {\"cp\", 1, {DICTIONARY_POST_OFFICE}, 2686},\n- {\"mannu\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sr\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n+ {\"marin.la\", 1, {DICTIONARY_SYNONYM}, 2932},\n+ {\"d.la\", 1, {DICTIONARY_STOPWORD}, 2701},\n+ {\"centro sportivo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"muri\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sett\", 1, {DICTIONARY_SYNONYM}, 2955},\n- {\"acq.rio\", 1, {DICTIONARY_PLACE_NAME}, 2589},\n- {\"c.le\", 1, {DICTIONARY_SYNONYM}, 2867},\n- {\"parrucchiere\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"var\", 1, {DICTIONARY_STREET_TYPE}, 2824},\n+ {\"sig.na\", 1, {DICTIONARY_PERSONAL_TITLE}, 2585},\n+ {\"magaz.i\", 1, {DICTIONARY_PLACE_NAME}, 2672},\n+ {\"s.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n+ {\"7bre\", 1, {DICTIONARY_SYNONYM}, 2959},\n {\"bettole\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"parco acquatico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr.ta\", 1, {DICTIONARY_SYNONYM}, 2902},\n- {\"nvo\", 1, {DICTIONARY_SYNONYM}, 2948},\n- {\"fni\", 1, {DICTIONARY_PLACE_NAME}, 2652},\n- {\"cusa\", 1, {DICTIONARY_STREET_TYPE}, 2724},\n+ {\"circonve\", 1, {DICTIONARY_STREET_TYPE}, 2729},\n+ {\"borgate\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"stt\", 1, {DICTIONARY_STREET_TYPE}, 2812},\n+ {\"alt.ze\", 1, {DICTIONARY_SYNONYM}, 2850},\n+ {\"fraz.i\", 1, {DICTIONARY_STREET_TYPE}, 2747},\n {\"forte\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"no\", 1, {DICTIONARY_UNIT}, 2962},\n {\"zona industriale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"scala\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"levante\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"c.te\", 1, {DICTIONARY_PLACE_NAME}, 2626},\n+ {\"d.tro\", 1, {DICTIONARY_STOPWORD}, 2704},\n {\"diversivo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cat.ba\", 1, {DICTIONARY_PLACE_NAME}, 2629},\n+ {\"riv\", 1, {DICTIONARY_STREET_TYPE}, 2785},\n {\"fondo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 2530},\n- {\"s.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2575},\n {\"cambia valute\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n- {\"catt.le\", 1, {DICTIONARY_PLACE_NAME}, 2631},\n- {\"g i e\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n+ {\"f.ro\", 1, {DICTIONARY_PLACE_NAME}, 2648},\n+ {\"s.s\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n+ {\"intne\", 1, {DICTIONARY_SYNONYM}, 2918},\n {\"acquedotto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"isole\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 2535},\n- {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"portici\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sig\", 1, {DICTIONARY_PERSONAL_TITLE}, 2583},\n+ {\"societa\", 1, {DICTIONARY_COMPANY_TYPE}, 2522},\n+ {\"s p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2579},\n+ {\"ago\", 1, {DICTIONARY_SYNONYM}, 2848},\n+ {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"c.letto\", 1, {DICTIONARY_PLACE_NAME}, 2623},\n {\"casotto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cavaliere\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"g.na\", 1, {DICTIONARY_STREET_TYPE}, 2745},\n- {\"str reg\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"sve\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n- {\"b.menti\", 1, {DICTIONARY_PLACE_NAME}, 2601},\n- {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 2543},\n- {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 2528},\n- {\"magazo\", 1, {DICTIONARY_PLACE_NAME}, 2669},\n- {\"str\", 1, {DICTIONARY_STREET_TYPE}, 2797},\n- {\"min.ro\", 1, {DICTIONARY_PLACE_NAME}, 2561},\n- {\"acq.ti\", 1, {DICTIONARY_PLACE_NAME}, 2591},\n- {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 2536},\n+ {\"lungolago\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"xbre\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2770},\n+ {\"pres emerito\", 1, {DICTIONARY_PERSONAL_TITLE}, 2569},\n+ {\"c.llo\", 1, {DICTIONARY_SYNONYM}, 2875},\n+ {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 2580},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 2689},\n+ {\"minro\", 1, {DICTIONARY_PLACE_NAME}, 2565},\n+ {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n+ {\"fortza\", 1, {DICTIONARY_PLACE_NAME}, 2658},\n+ {\"emiss.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 2558},\n {\"commendatore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bnssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2542},\n- {\"p\u00ba\", 1, {DICTIONARY_UNIT}, 2965},\n+ {\"palzi\", 1, {DICTIONARY_QUALIFIER}, 2700},\n {\"casaletto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"nuovi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"isoletti\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"c.usa\", 1, {DICTIONARY_STREET_TYPE}, 2724},\n+ {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 2773},\n+ {\"grse\", 1, {DICTIONARY_SYNONYM}, 2903},\n {\"gentili\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"mad.ne\", 1, {DICTIONARY_SYNONYM}, 2928},\n {\"monte\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"donna\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"banchina\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cittadella\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cattle\", 1, {DICTIONARY_PLACE_NAME}, 2631},\n+ {\"alz\", 1, {DICTIONARY_STREET_TYPE}, 2707},\n+ {\"alt.za\", 1, {DICTIONARY_SYNONYM}, 2849},\n+ {\"lun\", 1, {DICTIONARY_STREET_TYPE}, 2759},\n {\"veterinario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"strada nuova\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ang.\", 1, {DICTIONARY_STREET_TYPE}, 2705},\n- {\"f.lli\", 1, {DICTIONARY_SYNONYM}, 2887},\n- {\"int.no\", 1, {DICTIONARY_SYNONYM}, 2916},\n- {\"l.ghi\", 1, {DICTIONARY_SYNONYM}, 2920},\n- {\"s prov\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n- {\"bar.che\", 1, {DICTIONARY_PLACE_NAME}, 2602},\n+ {\"fort.zio\", 1, {DICTIONARY_PLACE_NAME}, 2660},\n+ {\"bse\", 1, {DICTIONARY_SYNONYM}, 2862},\n+ {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 2566},\n+ {\"set\", 1, {DICTIONARY_SYNONYM}, 2959},\n+ {\"dlo\", 1, {DICTIONARY_STOPWORD}, 2703},\n+ {\"g.no\", 2, {DICTIONARY_SYNONYM, DICTIONARY_UNIT}, 2895},\n+ {\"voc\", 1, {DICTIONARY_STREET_TYPE}, 2845},\n {\"ippodromo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bne\", 1, {DICTIONARY_PERSONAL_TITLE}, 2541},\n- {\"rev\", 1, {DICTIONARY_PERSONAL_TITLE}, 2568},\n- {\"tnu\", 1, {DICTIONARY_STREET_TYPE}, 2816},\n+ {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 2540},\n {\"cappelletta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"m.nu\", 1, {DICTIONARY_SYNONYM}, 2931},\n+ {\"ipdromo\", 1, {DICTIONARY_PLACE_NAME}, 2664},\n+ {\"anto\", 1, {DICTIONARY_SYNONYM}, 2854},\n {\"canali\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"clare\", 1, {DICTIONARY_PLACE_NAME}, 2628},\n+ {\"tra\", 1, {DICTIONARY_STREET_TYPE}, 2819},\n {\"baraccamento\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cassa\", 1, {DICTIONARY_PLACE_NAME}, 2627},\n+ {\"grdi\", 1, {DICTIONARY_SYNONYM}, 2901},\n {\"marchese\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gr.si\", 1, {DICTIONARY_SYNONYM}, 2900},\n- {\"grpi\", 1, {DICTIONARY_SYNONYM}, 2904},\n- {\"sts\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"calvario\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"czi\", 1, {DICTIONARY_SYNONYM}, 2872},\n+ {\"cll.a\", 1, {DICTIONARY_SYNONYM}, 2873},\n+ {\"c.po\", 1, {DICTIONARY_STREET_TYPE}, 2723},\n+ {\"frata\", 1, {DICTIONARY_STREET_TYPE}, 2740},\n+ {\"campgio\", 1, {DICTIONARY_PLACE_NAME}, 2615},\n+ {\"cat.be\", 1, {DICTIONARY_PLACE_NAME}, 2634},\n+ {\"ch.sa\", 1, {DICTIONARY_PLACE_NAME}, 2638},\n+ {\"abbe\", 1, {DICTIONARY_PLACE_NAME}, 2590},\n {\"traversa strada statale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"grd\", 1, {DICTIONARY_STREET_TYPE}, 2751},\n+ {\"p.no\", 1, {DICTIONARY_UNIT}, 2969},\n {\"maestro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ten col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2588},\n+ {\"comm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2552},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2576},\n {\"frazione\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"arcipghi\", 1, {DICTIONARY_SYNONYM}, 2852},\n- {\"pescheria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sud ovest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"cas.ma\", 1, {DICTIONARY_PLACE_NAME}, 2624},\n+ {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"fontanile\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"f.te\", 1, {DICTIONARY_SYNONYM}, 2888},\n+ {\"ottica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"comm.le\", 1, {DICTIONARY_SYNONYM}, 2878},\n+ {\"cassina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"acqti\", 1, {DICTIONARY_PLACE_NAME}, 2595},\n+ {\"lungomare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"via privata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"grta\", 1, {DICTIONARY_SYNONYM}, 2906},\n+ {\"bet.a\", 1, {DICTIONARY_PLACE_NAME}, 2609},\n+ {\"orientale\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"badde\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"gr.pi\", 1, {DICTIONARY_SYNONYM}, 2908},\n+ {\"casale\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"birreria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.a.g.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2529},\n+ {\"grde\", 1, {DICTIONARY_SYNONYM}, 2900},\n+ {\"fdo\", 1, {DICTIONARY_STREET_TYPE}, 2742},\n+ {\"c.ile\", 1, {DICTIONARY_STREET_TYPE}, 2734},\n+ {\"settembre\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"c p\", 1, {DICTIONARY_POST_OFFICE}, 2690},\n+ {\"magazzini\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bassa\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ottica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cassina\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 2560},\n- {\"lungomare\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.la\", 1, {DICTIONARY_SYNONYM}, 2866},\n- {\"cav.na\", 1, {DICTIONARY_SYNONYM}, 2863},\n- {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ip.dromo\", 1, {DICTIONARY_PLACE_NAME}, 2660},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2571},\n- {\"orientale\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"sci\", 1, {DICTIONARY_STREET_TYPE}, 2789},\n- {\"pcola\", 1, {DICTIONARY_SYNONYM}, 2951},\n- {\"p.colo\", 1, {DICTIONARY_SYNONYM}, 2954},\n- {\"ante\", 1, {DICTIONARY_SYNONYM}, 2848},\n- {\"badde\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s\", 1, {DICTIONARY_STREET_TYPE}, 2797},\n- {\"alle\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"9bre\", 1, {DICTIONARY_SYNONYM}, 2944},\n- {\"ss\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n- {\"chsa\", 1, {DICTIONARY_PLACE_NAME}, 2634},\n- {\"birreria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"v c\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n- {\"super mercato\", 1, {DICTIONARY_PLACE_NAME}, 2684},\n- {\"magazzini\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"anta\", 1, {DICTIONARY_SYNONYM}, 2851},\n {\"cortina\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vlo\", 1, {DICTIONARY_STREET_TYPE}, 2836},\n+ {\"cavna\", 1, {DICTIONARY_SYNONYM}, 2867},\n {\"senza numero\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n- {\"b.de\", 1, {DICTIONARY_SYNONYM}, 2854},\n- {\"canli\", 1, {DICTIONARY_SYNONYM}, 2862},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 2529},\n+ {\"madla\", 1, {DICTIONARY_PLACE_NAME}, 2670},\n+ {\"str vic\", 1, {DICTIONARY_STREET_TYPE}, 2809},\n+ {\"v.c.\", 1, {DICTIONARY_STREET_TYPE}, 2826},\n+ {\"acqri\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_PLACE_NAME}, 2594},\n+ {\"cavalca\", 1, {DICTIONARY_STREET_TYPE}, 2727},\n {\"ripa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"traversa vicinale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"accso\", 1, {DICTIONARY_STREET_TYPE}, 2701},\n {\"porto turistico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gruppo d'interesse economico\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n- {\"gen.li\", 1, {DICTIONARY_PERSONAL_TITLE}, 2556},\n- {\"madta\", 1, {DICTIONARY_PLACE_NAME}, 2667},\n- {\"s.a.p.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n- {\"collegio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cpl\", 1, {DICTIONARY_STREET_TYPE}, 2722},\n+ {\"7.bre\", 1, {DICTIONARY_SYNONYM}, 2959},\n+ {\"vzo\", 1, {DICTIONARY_STREET_TYPE}, 2844},\n+ {\"lgo\", 1, {DICTIONARY_SYNONYM}, 2759},\n {\"piccole\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sestiere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"stl\", 1, {DICTIONARY_STREET_TYPE}, 2811},\n+ {\"viale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gran\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"settembre\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"societ\u00e0 per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"isoletto\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"fortezza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s reginale\", 1, {DICTIONARY_STREET_TYPE}, 2802},\n- {\"centro commerciale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c \\\\ o\", 1, {DICTIONARY_POST_OFFICE}, 2691},\n {\"stradale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fte\", 1, {DICTIONARY_SYNONYM}, 2884},\n- {\"gal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 2657},\n- {\"n.ve\", 1, {DICTIONARY_SYNONYM}, 2946},\n+ {\"p.te\", 1, {DICTIONARY_STREET_TYPE}, 2771},\n+ {\"ctn\", 1, {DICTIONARY_STREET_TYPE}, 2735},\n+ {\"giardini\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"b.ra\", 1, {DICTIONARY_SYNONYM}, 2863},\n {\"piazzale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.prov\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n {\"delle\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"psi\", 1, {DICTIONARY_PLACE_NAME}, 2682},\n- {\"mad.la\", 1, {DICTIONARY_PLACE_NAME}, 2666},\n- {\"autostrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"casto\", 1, {DICTIONARY_PLACE_NAME}, 2630},\n+ {\"f v\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n {\"giornalaio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s s\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n {\"nello\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"via privata\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"monasto\", 1, {DICTIONARY_PLACE_NAME}, 2672},\n+ {\"c.le\", 1, {DICTIONARY_STREET_TYPE}, 2734},\n+ {\"bas.ca\", 1, {DICTIONARY_PLACE_NAME}, 2607},\n {\"mulino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"reg\", 1, {DICTIONARY_STREET_TYPE}, 2780},\n {\"cozzi\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sacca\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"aut\", 1, {DICTIONARY_STREET_TYPE}, 2711},\n {\"tabacchi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"acc.so\", 1, {DICTIONARY_STREET_TYPE}, 2705},\n {\"prolungamento\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sagl\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 2570},\n+ {\"ant.e\", 1, {DICTIONARY_SYNONYM}, 2852},\n {\"pista di ghiaccio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"carenaggio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"x bre\", 1, {DICTIONARY_SYNONYM}, 2882},\n {\"baraccamenti\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"accad.e\", 1, {DICTIONARY_PLACE_NAME}, 2588},\n- {\"9 bre\", 1, {DICTIONARY_SYNONYM}, 2944},\n+ {\"altza\", 1, {DICTIONARY_SYNONYM}, 2849},\n {\"colle\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"intern.le\", 1, {DICTIONARY_SYNONYM}, 2912},\n+ {\"giug\", 1, {DICTIONARY_SYNONYM}, 2897},\n {\"gradini\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"orologiaio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"r.p.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2574},\n {\"asilo nido\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fontna\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n+ {\"9mbre\", 1, {DICTIONARY_SYNONYM}, 2948},\n+ {\"c.tta\", 1, {DICTIONARY_SYNONYM}, 2872},\n {\"altezza\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dle\", 1, {DICTIONARY_STOPWORD}, 2698},\n+ {\"fattoria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"via statale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cllo\", 1, {DICTIONARY_SYNONYM}, 2871},\n- {\"parco\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n+ {\"casto\", 1, {DICTIONARY_PLACE_NAME}, 2632},\n+ {\"dissalne\", 1, {DICTIONARY_PLACE_NAME}, 2644},\n+ {\"spa\", 1, {DICTIONARY_STREET_TYPE}, 2799},\n+ {\"s a s\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"cavna\", 1, {DICTIONARY_SYNONYM}, 2863},\n {\"dipartimento\", 1, {DICTIONARY_UNIT}, -1},\n {\"bettola\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr.po\", 1, {DICTIONARY_SYNONYM}, 2905},\n+ {\"c.d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 2554},\n {\"borgata\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n+ {\"c.p\", 1, {DICTIONARY_POST_OFFICE}, 2690},\n+ {\"mad.ta\", 1, {DICTIONARY_PLACE_NAME}, 2671},\n {\"forca\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"divvo\", 1, {DICTIONARY_SYNONYM}, 2884},\n {\"area comune\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cup\", 1, {DICTIONARY_STREET_TYPE}, 2734},\n- {\"vp\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n {\"bivio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"infi\", 1, {DICTIONARY_SYNONYM}, 2911},\n {\"nazionali\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"androna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d.lo\", 1, {DICTIONARY_STOPWORD}, 2699},\n {\"scuola\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"arc\", 1, {DICTIONARY_STREET_TYPE}, 2706},\n- {\"mad.na\", 1, {DICTIONARY_SYNONYM}, 2923},\n- {\"bgo\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2691},\n+ {\"sud ovest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"provinciale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"loc.ta\", 1, {DICTIONARY_STREET_TYPE}, 2759},\n- {\"ss\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n+ {\"drssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2556},\n+ {\"maggri\", 1, {DICTIONARY_SYNONYM}, 2929},\n+ {\"signa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2585},\n {\"anfiteatri\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"calv.o\", 1, {DICTIONARY_SYNONYM}, 2861},\n- {\"vcl\", 1, {DICTIONARY_STREET_TYPE}, 2833},\n+ {\"vcp\", 1, {DICTIONARY_STREET_TYPE}, 2838},\n {\"isola\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"impto\", 1, {DICTIONARY_PLACE_NAME}, 2659},\n- {\"xbre\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"v.c\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n- {\"monum.o\", 1, {DICTIONARY_PLACE_NAME}, 2673},\n- {\"osta\", 1, {DICTIONARY_PLACE_NAME}, 2676},\n- {\"#\", 1, {DICTIONARY_UNIT}, 2962},\n+ {\"snu\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n+ {\"n\u00ba\", 1, {DICTIONARY_UNIT}, 2966},\n {\"via\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c \\\\ o\", 1, {DICTIONARY_POST_OFFICE}, 2687},\n- {\"metro\", 1, {DICTIONARY_SYNONYM}, 2934},\n- {\"ago\", 1, {DICTIONARY_SYNONYM}, 2844},\n+ {\"sal\", 1, {DICTIONARY_STREET_TYPE}, 2789},\n+ {\"universita\", 1, {DICTIONARY_PLACE_NAME}, 2689},\n {\"cantone\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lavand.a\", 1, {DICTIONARY_PLACE_NAME}, 2663},\n- {\"cass.a\", 1, {DICTIONARY_PLACE_NAME}, 2627},\n {\"rio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ferrria\", 1, {DICTIONARY_PLACE_NAME}, 2648},\n- {\"padne\", 1, {DICTIONARY_PLACE_NAME}, 2677},\n+ {\"ac\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n+ {\"sps\", 1, {DICTIONARY_STREET_TYPE}, 2797},\n {\"fosso\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"serg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2577},\n- {\"prco\", 1, {DICTIONARY_PLACE_NAME}, 2679},\n- {\"strada regionale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"aut.sle\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n {\"casetta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"vicolo largo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p.rco giochi\", 1, {DICTIONARY_PLACE_NAME}, 2680},\n+ {\"madd.na\", 1, {DICTIONARY_SYNONYM}, 2926},\n {\"ovest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"carggio\", 1, {DICTIONARY_PLACE_NAME}, 2617},\n {\"strada vecchia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"f.v\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n {\"est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"societa in accomandita semplice\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n- {\"centr.e\", 1, {DICTIONARY_SYNONYM}, 2865},\n- {\"anfiti\", 1, {DICTIONARY_PLACE_NAME}, 2596},\n- {\"cpt\", 1, {DICTIONARY_POST_OFFICE}, 2686},\n- {\"s c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n- {\"casale\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"sc\", 1, {DICTIONARY_STREET_TYPE}, 2798},\n- {\"9.mbre\", 1, {DICTIONARY_SYNONYM}, 2944},\n- {\"b.go\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 2691},\n- {\"s.n.c.\", 1, {DICTIONARY_NO_ADDRESS}, 2537},\n+ {\"on\", 1, {DICTIONARY_PERSONAL_TITLE}, 2567},\n+ {\"nuove\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"autsle\", 1, {DICTIONARY_STREET_TYPE}, 2712},\n+ {\"vcv\", 1, {DICTIONARY_STREET_TYPE}, 2840},\n+ {\"p.rco acquatico\", 1, {DICTIONARY_PLACE_NAME}, 2685},\n+ {\"off.a\", 1, {DICTIONARY_UNIT}, 2967},\n+ {\"societ\u00e0 in accomandit\u00e0 semplice\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"cone\", 1, {DICTIONARY_PLACE_NAME}, 2629},\n+ {\"nra\", 1, {DICTIONARY_SYNONYM}, 2946},\n+ {\"pas\", 1, {DICTIONARY_STREET_TYPE}, 2766},\n+ {\"sett\", 1, {DICTIONARY_SYNONYM}, 2959},\n+ {\"stp\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n {\"signori\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"nordovest\", 1, {DICTIONARY_DIRECTIONAL}, 2529},\n- {\"madne\", 1, {DICTIONARY_SYNONYM}, 2924},\n- {\"egregio\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lgd\", 1, {DICTIONARY_STREET_TYPE}, 2752},\n+ {\"cas\", 1, {DICTIONARY_STREET_TYPE}, 2622},\n+ {\"monsignore\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"acquario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cooperativo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"lre\", 1, {DICTIONARY_STREET_TYPE}, 2761},\n+ {\"font.na\", 1, {DICTIONARY_PLACE_NAME}, 2655},\n {\"lavanderia a gettone\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"societa a garanzia limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2525},\n+ {\"7 bre\", 1, {DICTIONARY_SYNONYM}, 2959},\n {\"stretto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"mediterraneo\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"cozzo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"fanta\", 1, {DICTIONARY_SYNONYM}, 2881},\n- {\"grsi\", 1, {DICTIONARY_SYNONYM}, 2900},\n- {\"bl.i\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 2692},\n+ {\"bli\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT, DICTIONARY_UNIT}, 2696},\n+ {\"10bre\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"off\", 1, {DICTIONARY_UNIT}, 2967},\n {\"faro\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"strti\", 1, {DICTIONARY_STREET_TYPE}, 2812},\n+ {\"gr.te\", 1, {DICTIONARY_SYNONYM}, 2907},\n {\"chiesa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"calvo\", 1, {DICTIONARY_SYNONYM}, 2861},\n+ {\"fant.a\", 1, {DICTIONARY_SYNONYM}, 2885},\n+ {\"dottssa\", 1, {DICTIONARY_PERSONAL_TITLE}, 2556},\n {\"inferiore\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"traversa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"locta\", 1, {DICTIONARY_STREET_TYPE}, 2759},\n+ {\"centr.e\", 1, {DICTIONARY_SYNONYM}, 2869},\n+ {\"c.one\", 1, {DICTIONARY_PLACE_NAME}, 2629},\n {\"villaggio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"font.na\", 1, {DICTIONARY_PLACE_NAME}, 2651},\n- {\"magg.re\", 1, {DICTIONARY_SYNONYM}, 2559},\n+ {\"sp\", 1, {DICTIONARY_PERSONAL_TITLE}, 2579},\n+ {\"incor.ta\", 1, {DICTIONARY_SYNONYM}, 2910},\n+ {\"ca\", 1, {DICTIONARY_UNIT}, 2961},\n+ {\"brlle\", 1, {DICTIONARY_STREET_TYPE}, 2718},\n {\"sugli\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ch.t\", 1, {DICTIONARY_PLACE_NAME}, 2633},\n- {\"cav\", 1, {DICTIONARY_PERSONAL_TITLE}, 2545},\n {\"muro\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"nordovest\", 1, {DICTIONARY_DIRECTIONAL}, 2533},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"r m\", 1, {DICTIONARY_PERSONAL_TITLE}, 2569},\n- {\"rtd\", 1, {DICTIONARY_STREET_TYPE}, 2783},\n- {\"mnu\", 1, {DICTIONARY_SYNONYM}, 2927},\n+ {\"casma\", 1, {DICTIONARY_PLACE_NAME}, 2624},\n+ {\"dott\", 1, {DICTIONARY_PERSONAL_TITLE}, 2555},\n {\"garage\", 1, {DICTIONARY_UNIT}, -1},\n- {\"cnl\", 1, {DICTIONARY_STREET_TYPE}, 2720},\n- {\"nva\", 1, {DICTIONARY_SYNONYM}, 2945},\n- {\"grsa\", 1, {DICTIONARY_SYNONYM}, 2898},\n- {\"osp.le\", 1, {DICTIONARY_PLACE_NAME}, 2675},\n- {\"comle\", 1, {DICTIONARY_SYNONYM}, 2875},\n+ {\"aerop.to\", 1, {DICTIONARY_PLACE_NAME}, 2597},\n+ {\"gr.se\", 1, {DICTIONARY_SYNONYM}, 2903},\n+ {\"cll.e\", 1, {DICTIONARY_SYNONYM}, 2874},\n {\"stadio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"b.gni\", 1, {DICTIONARY_PLACE_NAME}, 2599},\n- {\"conv.to\", 1, {DICTIONARY_PLACE_NAME}, 2639},\n+ {\"fort.za\", 1, {DICTIONARY_PLACE_NAME}, 2658},\n+ {\"bde\", 1, {DICTIONARY_SYNONYM}, 2858},\n+ {\"l.go\", 1, {DICTIONARY_STREET_TYPE}, 2754},\n+ {\"vve\", 1, {DICTIONARY_STREET_TYPE}, 2831},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"carcere\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"accade\", 1, {DICTIONARY_PLACE_NAME}, 2588},\n- {\"re\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"kebab\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"presso\", 2, {DICTIONARY_POST_OFFICE, DICTIONARY_STREET_TYPE}, -1},\n- {\"8 bre\", 1, {DICTIONARY_SYNONYM}, 2949},\n+ {\"centro comm\", 1, {DICTIONARY_PLACE_NAME}, 2636},\n {\"edificio\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"rpe\", 1, {DICTIONARY_STREET_TYPE}, 2779},\n+ {\"str.reg\", 1, {DICTIONARY_STREET_TYPE}, 2806},\n {\"altezze\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s v\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n {\"tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"prigione\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s.s.\", 1, {DICTIONARY_STREET_TYPE}, 2803},\n+ {\"magg\", 1, {DICTIONARY_PERSONAL_TITLE}, 2563},\n+ {\"fro\", 1, {DICTIONARY_PLACE_NAME}, 2648},\n+ {\"nvo\", 1, {DICTIONARY_SYNONYM}, 2952},\n {\"colletta\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"commle\", 1, {DICTIONARY_SYNONYM}, 2874},\n {\"vico\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"baluardo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bgt\", 1, {DICTIONARY_STREET_TYPE}, 2715},\n+ {\"b.gno\", 1, {DICTIONARY_PLACE_NAME}, 2602},\n+ {\"c.zi\", 1, {DICTIONARY_SYNONYM}, 2876},\n+ {\"ctrle\", 1, {DICTIONARY_SYNONYM}, 2869},\n {\"acquedotti\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"del\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"autda\", 1, {DICTIONARY_STREET_TYPE}, 2707},\n+ {\"vil\", 1, {DICTIONARY_STREET_TYPE}, 2843},\n+ {\"gend.ria\", 1, {DICTIONARY_PLACE_NAME}, 2662},\n {\"portico\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mro\", 1, {DICTIONARY_SYNONYM}, 2937},\n- {\"c.ale\", 1, {DICTIONARY_PLACE_NAME}, 2618},\n+ {\"col.a\", 1, {DICTIONARY_QUALIFIER}, 2698},\n+ {\"z.i.\", 1, {DICTIONARY_STREET_TYPE}, 2847},\n+ {\"sud\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"borghi\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sta\", 1, {DICTIONARY_COMPANY_TYPE}, 2518},\n+ {\"l\", 1, {DICTIONARY_SYNONYM}, 2922},\n+ {\"arcipgho\", 1, {DICTIONARY_SYNONYM}, 2857},\n+ {\"alt\", 1, {DICTIONARY_STREET_TYPE}, 2706},\n {\"ferroviaria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"alt.ze\", 1, {DICTIONARY_SYNONYM}, 2846},\n- {\"vle\", 1, {DICTIONARY_STREET_TYPE}, 2829},\n+ {\"fni\", 1, {DICTIONARY_PLACE_NAME}, 2656},\n {\"nei\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"fon\", 1, {DICTIONARY_STREET_TYPE}, 2737},\n- {\"cas.to\", 1, {DICTIONARY_PLACE_NAME}, 2626},\n- {\"str.vic\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2551},\n- {\"pco\", 1, {DICTIONARY_PLACE_NAME}, 2679},\n- {\"penis.a\", 1, {DICTIONARY_SYNONYM}, 2950},\n- {\"piccolo\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"vlp\", 1, {DICTIONARY_STREET_TYPE}, 2830},\n- {\"marino\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"acqto\", 1, {DICTIONARY_PLACE_NAME}, 2592},\n+ {\"cale\", 1, {DICTIONARY_PLACE_NAME}, 2622},\n+ {\"accso\", 1, {DICTIONARY_STREET_TYPE}, 2705},\n+ {\"8.bre\", 1, {DICTIONARY_SYNONYM}, 2953},\n+ {\"rm\", 1, {DICTIONARY_PERSONAL_TITLE}, 2573},\n+ {\"str.s\", 1, {DICTIONARY_STREET_TYPE}, 2807},\n {\"presidente emerito\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"salone di bellezza\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tra s.s.\", 1, {DICTIONARY_STREET_TYPE}, 2822},\n+ {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 2553},\n {\"arciprete\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"dic\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"str.prov\", 1, {DICTIONARY_STREET_TYPE}, 2800},\n {\"media\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"cpo\", 1, {DICTIONARY_STREET_TYPE}, 2719},\n {\"gli\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"gne\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n+ {\"orrient.le\", 1, {DICTIONARY_DIRECTIONAL}, 2536},\n+ {\"vpr\", 1, {DICTIONARY_STREET_TYPE}, 2828},\n+ {\"cons.rio\", 1, {DICTIONARY_PLACE_NAME}, 2642},\n+ {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 2551},\n+ {\"cte\", 1, {DICTIONARY_STREET_TYPE}, 2733},\n {\"della\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"aeropto\", 1, {DICTIONARY_PLACE_NAME}, 2593},\n- {\"prco acquatico\", 1, {DICTIONARY_PLACE_NAME}, 2681},\n+ {\"rio tera'\", 1, {DICTIONARY_STREET_TYPE}, 2782},\n+ {\"rit\", 1, {DICTIONARY_STREET_TYPE}, 2782},\n {\"numero\", 1, {DICTIONARY_UNIT}, -1},\n- {\"ob.sco\", 1, {DICTIONARY_PLACE_NAME}, 2674},\n- {\"cte\", 1, {DICTIONARY_PLACE_NAME}, 2622},\n- {\"x.bre\", 1, {DICTIONARY_SYNONYM}, 2878},\n- {\"abba\", 1, {DICTIONARY_PLACE_NAME}, 2585},\n- {\"pno\", 1, {DICTIONARY_UNIT}, 2965},\n+ {\"grte\", 1, {DICTIONARY_SYNONYM}, 2907},\n+ {\"basche\", 1, {DICTIONARY_PLACE_NAME}, 2608},\n+ {\"gall.e\", 1, {DICTIONARY_STREET_TYPE}, 2748},\n+ {\"sp\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"fondamenta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s provinciale\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"v.s.\", 1, {DICTIONARY_STREET_TYPE}, 2830},\n+ {\"ghio\", 1, {DICTIONARY_SYNONYM}, 2894},\n {\"casin\u00f2\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"acq.to\", 1, {DICTIONARY_PLACE_NAME}, 2592},\n {\"laguna\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"alb.i\", 1, {DICTIONARY_PLACE_NAME}, 2598},\n {\"lunetta\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bas.che\", 1, {DICTIONARY_PLACE_NAME}, 2604},\n- {\"ferrrio\", 1, {DICTIONARY_PLACE_NAME}, 2649},\n- {\"n.va\", 1, {DICTIONARY_SYNONYM}, 2945},\n- {\"bre\", 1, {DICTIONARY_SYNONYM}, 2860},\n- {\"milre\", 1, {DICTIONARY_SYNONYM}, 2935},\n+ {\"viuzzo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"magg.ri\", 1, {DICTIONARY_SYNONYM}, 2929},\n+ {\"egr\", 1, {DICTIONARY_PERSONAL_TITLE}, 2557},\n+ {\"accade\", 1, {DICTIONARY_PLACE_NAME}, 2592},\n {\"arcipelagho\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"traversa nuova\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 2527},\n- {\"v p\", 1, {DICTIONARY_STREET_TYPE}, 2825},\n {\"sud est\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"cavne\", 1, {DICTIONARY_SYNONYM}, 2864},\n- {\"medit.eo\", 1, {DICTIONARY_SYNONYM}, 2933},\n+ {\"societa cooperativa a responsabilita limitata\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n+ {\"f.ta\", 1, {DICTIONARY_STREET_TYPE}, 2741},\n+ {\"societa in nome collettivo\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"sagl\", 1, {DICTIONARY_COMPANY_TYPE}, 2529},\n {\"nostro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"don\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"corpo darmata\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n- {\"blo\", 3, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT, DICTIONARY_UNIT}, 2693},\n {\"colonnello\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"colla\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bra\", 1, {DICTIONARY_SYNONYM}, 2859},\n- {\"societa per azioni\", 1, {DICTIONARY_COMPANY_TYPE}, 2523},\n- {\"cap.la\", 1, {DICTIONARY_PLACE_NAME}, 2613},\n+ {\"sce\", 1, {DICTIONARY_STREET_TYPE}, 2792},\n+ {\"magazi\", 1, {DICTIONARY_PLACE_NAME}, 2672},\n {\"boutique\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"giug\", 1, {DICTIONARY_SYNONYM}, 2893},\n- {\"p.zza\", 1, {DICTIONARY_STREET_TYPE}, 2764},\n- {\"viale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 2526},\n+ {\"sestiere\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"10.bre\", 1, {DICTIONARY_SYNONYM}, 2882},\n+ {\"apr\", 1, {DICTIONARY_SYNONYM}, 2855},\n+ {\"nazle\", 1, {DICTIONARY_SYNONYM}, 2944},\n {\"enoteca\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"football club\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"grsi\", 1, {DICTIONARY_SYNONYM}, 2904},\n+ {\"s p\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n+ {\"albo\", 1, {DICTIONARY_PLACE_NAME}, 2599},\n+ {\"sto\", 1, {DICTIONARY_STREET_TYPE}, 2817},\n+ {\"magg\", 1, {DICTIONARY_SYNONYM}, 2925},\n+ {\"coopvo\", 1, {DICTIONARY_COMPANY_TYPE}, 2519},\n+ {\"crv\", 1, {DICTIONARY_STREET_TYPE}, 2729},\n {\"commerciale\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ses\", 1, {DICTIONARY_STREET_TYPE}, 2792},\n- {\"vnu\", 1, {DICTIONARY_STREET_TYPE}, 2823},\n- {\"fond.a\", 1, {DICTIONARY_PLACE_NAME}, 2650},\n+ {\"cap.ta\", 1, {DICTIONARY_PLACE_NAME}, 2618},\n {\"logge\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.d.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 2550},\n- {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 2517},\n+ {\"bgni\", 1, {DICTIONARY_PLACE_NAME}, 2603},\n {\"rotonda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"marinla\", 1, {DICTIONARY_SYNONYM}, 2928},\n+ {\"accad.a\", 1, {DICTIONARY_PLACE_NAME}, 2591},\n {\"mercato\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"arcip.gho\", 1, {DICTIONARY_SYNONYM}, 2853},\n- {\"capla\", 1, {DICTIONARY_PLACE_NAME}, 2613},\n- {\"str vicinale\", 1, {DICTIONARY_STREET_TYPE}, 2805},\n- {\"maggri\", 1, {DICTIONARY_SYNONYM}, 2925},\n+ {\"pzt\", 1, {DICTIONARY_STREET_TYPE}, 2770},\n+ {\"centro commerciale\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"strada regionale\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gh.io\", 1, {DICTIONARY_SYNONYM}, 2894},\n+ {\"dtro\", 1, {DICTIONARY_STOPWORD}, 2704},\n+ {\"g.i.e\", 1, {DICTIONARY_COMPANY_TYPE}, 2520},\n {\"cascina\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"duchessa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"g.ne\", 1, {DICTIONARY_STREET_TYPE}, 2746},\n- {\"f.v.\", 1, {DICTIONARY_PLACE_NAME}, 2647},\n {\"sdrucciolo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"maggiore\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_SYNONYM}, -1},\n- {\"com.ta\", 1, {DICTIONARY_SYNONYM}, 2876},\n+ {\"s.p\", 1, {DICTIONARY_STREET_TYPE}, 2804},\n {\"molo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c.lare\", 1, {DICTIONARY_PLACE_NAME}, 2624},\n- {\"ctile\", 1, {DICTIONARY_STREET_TYPE}, 2730},\n- {\"and\", 1, {DICTIONARY_STREET_TYPE}, 2704},\n- {\"cra\", 1, {DICTIONARY_STREET_TYPE}, 2733},\n+ {\"brlla\", 1, {DICTIONARY_STREET_TYPE}, 2717},\n+ {\"erg.lo\", 1, {DICTIONARY_PLACE_NAME}, 2646},\n+ {\"prt\", 1, {DICTIONARY_STREET_TYPE}, 2774},\n+ {\"cal\", 1, {DICTIONARY_STREET_TYPE}, 2721},\n {\"larghetto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"magazzino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"circonv.e\", 1, {DICTIONARY_STREET_TYPE}, 2725},\n+ {\"mag\", 1, {DICTIONARY_SYNONYM}, 2925},\n+ {\"maggre\", 1, {DICTIONARY_SYNONYM}, 2563},\n+ {\"gr.so\", 1, {DICTIONARY_SYNONYM}, 2905},\n {\"aeroporto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sapa\", 1, {DICTIONARY_COMPANY_TYPE}, 2524},\n- {\"fondamenta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.a.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 2521},\n+ {\"bso\", 1, {DICTIONARY_SYNONYM}, 2861},\n+ {\"r p\", 1, {DICTIONARY_PERSONAL_TITLE}, 2574},\n+ {\"zin\", 1, {DICTIONARY_STREET_TYPE}, 2847},\n {\"comunit\u00e0\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"c.na\", 1, {DICTIONARY_STREET_TYPE}, 2722},\n+ {\"sigra\", 1, {DICTIONARY_PERSONAL_TITLE}, 2582},\n {\"giugno\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"chiusa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gruppo d' interesse economico\", 1, {DICTIONARY_COMPANY_TYPE}, 2516},\n+ {\"cte\", 1, {DICTIONARY_PLACE_NAME}, 2626},\n {\"bordello\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"can.le\", 1, {DICTIONARY_SYNONYM}, 2724},\n {\"profumeria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"casette\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m.ro\", 1, {DICTIONARY_SYNONYM}, 2937},\n+ {\"intern.li\", 1, {DICTIONARY_SYNONYM}, 2917},\n {\"nuova\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"isoletta\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"santo padre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"hokuto\", 1, {DICTIONARY_DIRECTIONAL}, 2967},\n+ {\"fu\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u5357\u897f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5c0f\u5b57\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u8857\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\uff08\u4e00\u793e\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2996},\n+ {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2997},\n+ {\"\uff08\u4e00\u8ca1\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2998},\n {\"k\u014dzokud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"(\u6709)\", 1, {DICTIONARY_PLACE_NAME}, 2983},\n- {\"\uff08\u682a\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2978},\n- {\"banchino\", 1, {DICTIONARY_BUILDING_TYPE}, 2966},\n- {\"omotedori\", 1, {DICTIONARY_STREET_TYPE}, 3002},\n+ {\"\u8857\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u30d0\u30a4\u30d1\u30b9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gun\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"nansei\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"jidoshado\", 1, {DICTIONARY_STREET_TYPE}, 2995},\n- {\"(\u72ec)\", 1, {DICTIONARY_PLACE_NAME}, 2971},\n+ {\"\uff08\u533b\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2981},\n {\"ken\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u4e01\u76ee\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"(\u533b)\", 1, {DICTIONARY_PLACE_NAME}, 2977},\n+ {\"roji\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"minami\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\u5c0f\", 1, {DICTIONARY_PLACE_NAME}, 2982},\n- {\"kaido\", 1, {DICTIONARY_STREET_TYPE}, 2996},\n- {\"\uff08\u4e00\u8ca1\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2994},\n- {\"kanjo doro\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 2997},\n+ {\"kosoku doro\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n+ {\"\uff08\u540d\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2979},\n+ {\"haisutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n+ {\"yuryodoro\", 1, {DICTIONARY_STREET_TYPE}, 3019},\n {\"\u5927\u901a\u308a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gairo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"(\u4e00\u793e)\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n- {\"nanto\", 1, {DICTIONARY_DIRECTIONAL}, 2968},\n- {\"\u8857\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"k\u014dzoku d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n+ {\"merodirodo\", 1, {DICTIONARY_STREET_TYPE}, 3009},\n+ {\"\uff08\u4e3b\uff09\", 1, {DICTIONARY_STREET_TYPE}, 3013},\n+ {\"\u4e2d\u5b66\u6821\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2995},\n {\"\u756a\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"roji\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"son\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u014dd\u014dri\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\uff08\u5927\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2984},\n {\"\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"torimichi\", 1, {DICTIONARY_STREET_TYPE}, 3012},\n- {\"(\u5927)\", 1, {DICTIONARY_PLACE_NAME}, 2979},\n- {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2989},\n+ {\"\u8857\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"yuryo doro\", 1, {DICTIONARY_STREET_TYPE}, 3019},\n+ {\"\uff08\u5b66\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2976},\n {\"mura\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"hai\u00b7sutorito\", 1, {DICTIONARY_STREET_TYPE}, 2988},\n- {\"koen doro\", 1, {DICTIONARY_STREET_TYPE}, 2999},\n+ {\"toshikozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3017},\n+ {\"shukankosokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3012},\n+ {\"\u72ec\u7acb\u884c\u653f\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"burubaru\", 1, {DICTIONARY_STREET_TYPE}, 2990},\n+ {\"(\u8cc7)\", 1, {DICTIONARY_PLACE_NAME}, 2980},\n+ {\"kozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n {\"kokud\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u72ec\u7acb\u884c\u653f\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"hokutou\", 1, {DICTIONARY_DIRECTIONAL}, 2967},\n- {\"kodo\", 1, {DICTIONARY_STREET_TYPE}, 2998},\n {\"\u90fd\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"roma kaido\", 1, {DICTIONARY_STREET_TYPE}, 3006},\n+ {\"(\u8ca1)\", 1, {DICTIONARY_PLACE_NAME}, 2988},\n {\"\u9280\u884c\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\uff08\u72ec\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2971},\n {\"baipasu d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u4e2d\", 1, {DICTIONARY_PLACE_NAME}, 2969},\n- {\"\uff08\u5b66\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2972},\n- {\"baipasudoro\", 1, {DICTIONARY_STREET_TYPE}, 2985},\n- {\"kokudo\", 1, {DICTIONARY_STREET_TYPE}, 3000},\n- {\"\uff08\u540d\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2975},\n+ {\"(\u4e00\u8ca1)\", 1, {DICTIONARY_STREET_TYPE}, 2998},\n+ {\"mensutorito\", 1, {DICTIONARY_STREET_TYPE}, 3008},\n+ {\"michi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sutorito\", 1, {DICTIONARY_STREET_TYPE}, 3014},\n+ {\"romakaido\", 1, {DICTIONARY_STREET_TYPE}, 3010},\n {\"\u4e00\u822c\u90fd\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u770c\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u30e1\u30ed\u30c7\u30a3\u30fc\u30ed\u30fc\u30c9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u9053\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u4e00\u793e\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n {\"\u56fd\u7acb\u5927\u5b66\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2993},\n- {\"ts\u016bro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"(\u6709)\", 1, {DICTIONARY_PLACE_NAME}, 2987},\n {\"baipasu\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u8857\u533a\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"hai sutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, 2988},\n {\"\u4e00\u822c\u770c\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u56fd\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2991},\n- {\"shukankosokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3008},\n- {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2990},\n- {\"\u9280\", 1, {DICTIONARY_PLACE_NAME}, 2973},\n+ {\"\u90e1\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u30d0\u30a4\u30d1\u30b9 \u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u4e2d\u5b66\u6821\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"(\u72ec)\", 1, {DICTIONARY_PLACE_NAME}, 2975},\n+ {\"\u9ad8\", 1, {DICTIONARY_PLACE_NAME}, 2985},\n {\"t\u014drimichi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"(\u533b)\", 1, {DICTIONARY_PLACE_NAME}, 2981},\n {\"\u30e1\u30fc\u30f3\u30b9\u30c8\u30ea\u30fc\u30c8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kosoku doro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n+ {\"\u5c0f\", 1, {DICTIONARY_PLACE_NAME}, 2986},\n+ {\"toshi kozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3017},\n {\"\u516c\u7acb\u5927\u5b66\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tsuro\", 1, {DICTIONARY_STREET_TYPE}, 3014},\n+ {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2994},\n {\"\u6751\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u5408\u8cc7\u4f1a\u793e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\uff08\u4e3b\uff09\", 1, {DICTIONARY_STREET_TYPE}, 3009},\n- {\"\uff08\u5408\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2974},\n+ {\"hai sutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n+ {\"(\u4e00\u793e)\", 1, {DICTIONARY_STREET_TYPE}, 2996},\n+ {\"koendoro\", 1, {DICTIONARY_STREET_TYPE}, 3003},\n+ {\"nanto\", 1, {DICTIONARY_DIRECTIONAL}, 2972},\n {\"\u897f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"aza\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u5b57\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u682a\u5f0f\u4f1a\u793e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u5357\u6771\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\uff08\u5927\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2980},\n+ {\"nantou\", 1, {DICTIONARY_DIRECTIONAL}, 2972},\n {\"\u9ad8\u7b49\u5b66\u6821\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kurudosakku\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"tokubetsuku\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"odori\", 1, {DICTIONARY_STREET_TYPE}, 3007},\n+ {\"(\u5927)\", 1, {DICTIONARY_PLACE_NAME}, 2984},\n {\"nant\u014d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5927\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"burubaru\", 1, {DICTIONARY_STREET_TYPE}, 2986},\n+ {\"hokutou\", 1, {DICTIONARY_DIRECTIONAL}, 2971},\n {\"b\u016brub\u0101ru\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"(\u8cc7)\", 1, {DICTIONARY_PLACE_NAME}, 2976},\n+ {\"\u7d4c\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nishi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\u8868\u901a\u308a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u6709\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2983},\n- {\"do\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"haisutorito\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n+ {\"\uff08\u5408\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2978},\n+ {\"\uff08\u72ec\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2975},\n {\"\u7279\u5225\u533a\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\uff08\u8cc7\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2980},\n+ {\"toshik\u014dzokud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3017},\n {\"y\u016bry\u014d d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2990},\n- {\"sutorito\", 1, {DICTIONARY_STREET_TYPE}, 3010},\n+ {\"baipasudoro\", 1, {DICTIONARY_STREET_TYPE}, 2989},\n {\"merod\u012br\u014ddo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kanj\u014d d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"m\u0113nsutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u4e00\u822c\u8ca1\u56e3\u6cd5\u4eba\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"baipasu doro\", 1, {DICTIONARY_STREET_TYPE}, 2989},\n {\"hokusei\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5408\u540d\u4f1a\u793e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"baipasud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 2989},\n {\"\u9ad8\u901f\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u9ad8\", 1, {DICTIONARY_PLACE_NAME}, 2981},\n- {\"\u7d4c\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"kanj\u014dd\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n+ {\"k\u014den d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"kozoku doro\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n {\"oaza\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u79c1\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"koendoro\", 1, {DICTIONARY_STREET_TYPE}, 2999},\n+ {\"tori\", 1, {DICTIONARY_STREET_TYPE}, 3015},\n {\"gaiku\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"hai sutorito\", 1, {DICTIONARY_STREET_TYPE}, 2988},\n+ {\"ts\u016bro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u90fd\u5e02\u9ad8\u901f\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"t\u014dri\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shido\", 1, {DICTIONARY_STREET_TYPE}, 3007},\n- {\"k\u014dend\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 2999},\n- {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2991},\n+ {\"kodo\", 1, {DICTIONARY_STREET_TYPE}, 3002},\n+ {\"hai\u00b7sutorito\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n+ {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2997},\n+ {\"y\u016bry\u014dd\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3019},\n+ {\"(\u5408)\", 1, {DICTIONARY_PLACE_NAME}, 2978},\n {\"\u5927\u5b57\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u901a\u308a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kita\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5357\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kanj\u014dd\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 2997},\n+ {\"do\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"cho\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"higashi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5c0f\u5b66\u6821\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n+ {\"(\u682a)\", 1, {DICTIONARY_PLACE_NAME}, 2982},\n {\"koaza\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"toshi k\u014dzokud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u5dde\u9593\u9ad8\u901f\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nantou\", 1, {DICTIONARY_DIRECTIONAL}, 2968},\n {\"r\u014dma kaid\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u4e00\u822c\u9053\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u30ed\u30fc\u30de \u8857 \u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tsuro\", 1, {DICTIONARY_STREET_TYPE}, 3018},\n {\"\u516c\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"(\u5927)\", 1, {DICTIONARY_PLACE_NAME}, 2980},\n+ {\"doro\", 1, {DICTIONARY_STREET_TYPE}, 2991},\n {\"\u5317\u897f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"\uff08\u6709\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2987},\n+ {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2995},\n {\"\u901a\u308a\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u81ea\u52d5\u8eca\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"toshi kozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3013},\n+ {\"hai sutorito\", 1, {DICTIONARY_STREET_TYPE}, 2992},\n {\"tokubetsu ku\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"kaid\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u756a\u5730\u306e\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"(\u540d)\", 1, {DICTIONARY_PLACE_NAME}, 2975},\n- {\"\uff08\u8cc7\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2976},\n- {\"odori\", 1, {DICTIONARY_STREET_TYPE}, 3003},\n- {\"kozoku doro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n- {\"romakaido\", 1, {DICTIONARY_STREET_TYPE}, 3006},\n+ {\"\u5b66\u6821\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u8ca1\u56e3\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u30af\u30eb\u30c9\u30b5\u30c3\u30af\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\uff08\u5927\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2983},\n {\"\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"baipasu doro\", 1, {DICTIONARY_STREET_TYPE}, 2985},\n- {\"baipasud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 2985},\n {\"\u5e9c\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"jid\u014dshad\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"y\u016bry\u014dd\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3015},\n+ {\"kosukudoro\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n+ {\"r\u014dmakaid\u014d\", 1, {DICTIONARY_STREET_TYPE}, 3010},\n {\"to\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"(\u5b66)\", 1, {DICTIONARY_PLACE_NAME}, 2972},\n+ {\"(\u540d)\", 1, {DICTIONARY_PLACE_NAME}, 2979},\n {\"sutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u74b0\u72b6\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u8ca1\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2984},\n {\"\u533b\u7642\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"banchi no\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"(\u4e00\u8ca1)\", 1, {DICTIONARY_STREET_TYPE}, 2994},\n- {\"\u5927\", 1, {DICTIONARY_PLACE_NAME}, 2970},\n- {\"haisutorito\", 1, {DICTIONARY_STREET_TYPE}, 2988},\n+ {\"\u30b9\u30c8\u30ea\u30fc\u30c8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u8868\u901a\u308a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2993},\n- {\"k\u014dzoku d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n {\"\u9ad8\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"toshik\u014dzokud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3013},\n {\"\u6771\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"r\u014dmakaid\u014d\", 1, {DICTIONARY_STREET_TYPE}, 3006},\n+ {\"hokuto\", 1, {DICTIONARY_DIRECTIONAL}, 2971},\n {\"\u6709\u6599\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"banchi\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"yuryodoro\", 1, {DICTIONARY_STREET_TYPE}, 3015},\n- {\"mensutorito\", 1, {DICTIONARY_STREET_TYPE}, 3004},\n+ {\"kanjo doro\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_STREET_TYPE}, 3001},\n {\"k\u014dd\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"chome\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u90e1\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u9280\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u8def\u5730\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"tori\", 1, {DICTIONARY_STREET_TYPE}, 3011},\n- {\"shid\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u9280\", 1, {DICTIONARY_PLACE_NAME}, 2977},\n+ {\"banchino\", 1, {DICTIONARY_BUILDING_TYPE}, 2970},\n {\"omoted\u014dri\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"omotedori\", 1, {DICTIONARY_STREET_TYPE}, 3006},\n {\"\u4e00\u822c\u793e\u56e3\u6cd5\u4eba\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"merodirodo\", 1, {DICTIONARY_STREET_TYPE}, 3005},\n+ {\"shido\", 1, {DICTIONARY_STREET_TYPE}, 3011},\n {\"\u5c0f\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"keiro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"hokut\u014d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\uff08\u533b\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2977},\n {\"sh\u016bkank\u014dsokud\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"yuryo doro\", 1, {DICTIONARY_STREET_TYPE}, 3015},\n- {\"\u30d0\u30a4\u30d1\u30b9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"toshikozokudoro\", 1, {DICTIONARY_STREET_TYPE}, 3013},\n- {\"(\u5408)\", 1, {DICTIONARY_PLACE_NAME}, 2974},\n- {\"doro\", 1, {DICTIONARY_STREET_TYPE}, 2987},\n+ {\"\uff08\u682a\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2982},\n+ {\"jidoshado\", 1, {DICTIONARY_STREET_TYPE}, 2999},\n+ {\"koen doro\", 1, {DICTIONARY_STREET_TYPE}, 3003},\n {\"\u4e2d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u4e00\u822c\u5e9c\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"k\u014dend\u014dro\", 1, {DICTIONARY_STREET_TYPE}, 3003},\n+ {\"kaido\", 1, {DICTIONARY_STREET_TYPE}, 3000},\n+ {\"roma kaido\", 1, {DICTIONARY_STREET_TYPE}, 3010},\n+ {\"shid\u014d\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ban\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"(\u4e3b)\", 1, {DICTIONARY_STREET_TYPE}, 3009},\n {\"\u753a\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"fu\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"machi\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"k\u014den d\u014dro\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u8def\u5730\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u5927\u5b66\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"hai\u00b7sutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u901a\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u5927\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2979},\n {\"\u4e3b\u8981\u5730\u65b9\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u756a\u5730\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"\u30af\u30eb\u30c9\u30b5\u30c3\u30af\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u30cf\u30a4\u30fb\u30b9\u30c8\u30ea\u30fc\u30c8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u30b9\u30c8\u30ea\u30fc\u30c8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kosukudoro\", 1, {DICTIONARY_STREET_TYPE}, 3001},\n+ {\"kokudo\", 1, {DICTIONARY_STREET_TYPE}, 3004},\n+ {\"(\u5927)\", 1, {DICTIONARY_PLACE_NAME}, 2983},\n {\"\u516c\u5712\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u30d6\u30fc\u30eb\u30d0\u30fc\u30eb\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"shi\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u6709\u9650\u4f1a\u793e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"(\u682a)\", 1, {DICTIONARY_PLACE_NAME}, 2978},\n- {\"michi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u90fd\u5e02\u9ad8\u901f\u9053\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\uff08\u4e00\uff09\", 1, {DICTIONARY_STREET_TYPE}, 2989},\n+ {\"\uff08\u8ca1\uff09\", 1, {DICTIONARY_PLACE_NAME}, 2988},\n+ {\"(\u4e3b)\", 1, {DICTIONARY_STREET_TYPE}, 3013},\n+ {\"(\u4e00)\", 1, {DICTIONARY_STREET_TYPE}, 2994},\n+ {\"torimichi\", 1, {DICTIONARY_STREET_TYPE}, 3016},\n {\"\u5e02\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"haisutor\u012bto\", 1, {DICTIONARY_STREET_TYPE}, 2988},\n+ {\"\u5927\", 1, {DICTIONARY_PLACE_NAME}, 2974},\n {\"\u5408\u540c\u4f1a\u793e\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"(\u8ca1)\", 1, {DICTIONARY_PLACE_NAME}, 2984},\n- {\"\u5b66\u6821\u6cd5\u4eba\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"(\u5b66)\", 1, {DICTIONARY_PLACE_NAME}, 2976},\n {\"\u533a\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\u4e2d\", 1, {DICTIONARY_PLACE_NAME}, 2973},\n {\"ku\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u5317\u6771\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u10e5\u10e3\u10e9\u10d8\u10e1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -73964,25 +73976,25 @@\n {\"\u10e9\u10d8\u10ee\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10ee\u10d4\u10d8\u10d5\u10d0\u10dc\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10e1\u10d0\u10d3\u10d2\u10e3\u10e0\u10d8\u10e1\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u10e5\", 1, {DICTIONARY_STREET_TYPE}, 3016},\n {\"\u10d7\u10d4\u10d0\u10e2\u10e0\u10d8\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"\u10e5\", 1, {DICTIONARY_STREET_TYPE}, 3020},\n {\"\u10e0\u10d4\u10e1\u10e2\u10dd\u10e0\u10d0\u10dc\u10d8\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u10e5\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u10ee\u10d8\u10d3\u10d8\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n {\"\u10d3\u10d0\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"\u10e8\u10d4\u10e1\u10d0\u10ee\u10d5\u10d4\u10d5\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u10e8\u10d4\u10e1\", 1, {DICTIONARY_STREET_TYPE}, 3017},\n+ {\"\u10e5\u10e3\u10ea\u10d0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10d1\u10e3\u10da\u10d5\u10d0\u10e0\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10ec\u10db\u10d8\u10dc\u10d3\u10d0\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"\u10e8\u10d4\u10e1\", 1, {DICTIONARY_STREET_TYPE}, 3021},\n {\"universiteti\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u10db\u10d8\u10ee\u10d4\u10d8\u10da\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"\u10d2\u10d0\u10db\u10d6\", 1, {DICTIONARY_STREET_TYPE}, 3022},\n {\"\u10e5\u10e3\u10e9\u10d0\u10d6\u10d4\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10d2\u10d0\u10db\u10d6\u10d8\u10e0\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10db\u10d4\u10e4\u10d8\u10e1\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"\u10d2\u10d0\u10db\u10d6\", 1, {DICTIONARY_STREET_TYPE}, 3018},\n {\"\u10db\u10dd\u10d4\u10d3\u10d0\u10dc\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10d2\u10d6\u10d0\u10e2\u10d9\u10d4\u10ea\u10d8\u10da\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u10e5\u10e3\u10ea\u10d0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u10e8\u10d4\u10e1\u10d0\u10ee\u10d5\u10d4\u10d5\u10d8\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u10e3\u10dc\u10d8\u10d5\u10d4\u10e0\u10e1\u10d8\u10e2\u10d4\u10e2\u10d8\u10e1\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u10e5\u10e3\u10e9\u10d0\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"lo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -74035,247 +74047,251 @@\n {\"wee\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"gaass\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"strooss\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3027},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3029},\n {\"gyvenviet\u0117\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"r\", 1, {DICTIONARY_QUALIFIER}, 3024},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"prospektas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3032},\n {\"a\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"rajonas\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"miestelis\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"mstl\", 1, {DICTIONARY_QUALIFIER}, 3027},\n {\"gatv\u0117\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"kaimas\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3028},\n+ {\"k\", 1, {DICTIONARY_QUALIFIER}, 3025},\n+ {\"skersgatvis\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3033},\n {\"akligatvis\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"miestelis\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"miestas\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3026},\n {\"plentas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"skersgatvis\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"mstl\", 1, {DICTIONARY_QUALIFIER}, 3023},\n- {\"vienk\", 1, {DICTIONARY_BUILDING_TYPE}, 3019},\n+ {\"gyvenv\", 1, {DICTIONARY_QUALIFIER}, 3024},\n+ {\"vienk\", 1, {DICTIONARY_BUILDING_TYPE}, 3023},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3030},\n+ {\"a\", 1, {DICTIONARY_STREET_TYPE}, 3029},\n+ {\"gyvenviete\", 1, {DICTIONARY_QUALIFIER}, 3024},\n {\"vienkiemis\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"a\", 1, {DICTIONARY_STREET_TYPE}, 3025},\n {\"al\u0117ja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"aleja\", 1, {DICTIONARY_STREET_TYPE}, 3026},\n- {\"gyvenv\", 1, {DICTIONARY_QUALIFIER}, 3020},\n- {\"skg\", 1, {DICTIONARY_STREET_TYPE}, 3030},\n- {\"m\", 1, {DICTIONARY_QUALIFIER}, 3022},\n- {\"gyvenviete\", 1, {DICTIONARY_QUALIFIER}, 3020},\n- {\"k\", 1, {DICTIONARY_QUALIFIER}, 3021},\n- {\"aikste\", 1, {DICTIONARY_STREET_TYPE}, 3025},\n- {\"gatve\", 1, {DICTIONARY_STREET_TYPE}, 3027},\n+ {\"aikste\", 1, {DICTIONARY_STREET_TYPE}, 3029},\n+ {\"aleja\", 1, {DICTIONARY_STREET_TYPE}, 3030},\n+ {\"skg\", 1, {DICTIONARY_STREET_TYPE}, 3034},\n+ {\"m\", 1, {DICTIONARY_QUALIFIER}, 3026},\n+ {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3031},\n {\"m\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"aik\u0161t\u0117\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"gatve\", 1, {DICTIONARY_STREET_TYPE}, 3031},\n+ {\"r\", 1, {DICTIONARY_QUALIFIER}, 3028},\n {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"gatve\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cels\", 1, {DICTIONARY_STREET_TYPE}, 3032},\n+ {\"bulvaris\", 1, {DICTIONARY_STREET_TYPE}, 3035},\n {\"pils\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"cels\", 1, {DICTIONARY_STREET_TYPE}, 3036},\n {\"iela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"prospekts\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"skolas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bulv\u0101ris\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ce\u013c\u0161\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bulvaris\", 1, {DICTIONARY_STREET_TYPE}, 3031},\n {\"barat laut\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"kg\", 1, {DICTIONARY_STREET_TYPE}, 3037},\n- {\"dyg\", 1, {DICTIONARY_STREET_TYPE}, 3034},\n+ {\"jln\", 1, {DICTIONARY_STREET_TYPE}, 3040},\n+ {\"laluan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sngai\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"rapat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"jalan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nusa\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"sekolah\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"laluan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jl\", 1, {DICTIONARY_STREET_TYPE}, 3036},\n+ {\"lengkok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bulatan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"timur\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"spg\", 1, {DICTIONARY_STREET_TYPE}, 3043},\n {\"puteri\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"lebuhraya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dayang\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"timur laut\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"kampong\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pg\", 1, {DICTIONARY_STREET_TYPE}, 3038},\n+ {\"jl\", 1, {DICTIONARY_STREET_TYPE}, 3040},\n {\"tenggara\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"sg\", 1, {DICTIONARY_STREET_TYPE}, 3040},\n {\"barat\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"utara\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"spg\", 1, {DICTIONARY_STREET_TYPE}, 3039},\n {\"penampang\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"lorong\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sg\", 1, {DICTIONARY_STREET_TYPE}, 3044},\n+ {\"pg\", 1, {DICTIONARY_STREET_TYPE}, 3042},\n {\"lapangan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"masjid\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"pengiran\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"barat daya\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"linkaran\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lengkok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"denai\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"tengah\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"awg\", 1, {DICTIONARY_STREET_TYPE}, 3037},\n+ {\"hj\", 1, {DICTIONARY_STREET_TYPE}, 3039},\n {\"jelapang\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"haji\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pasar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"awg\", 1, {DICTIONARY_STREET_TYPE}, 3033},\n {\"pulau\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"hj\", 1, {DICTIONARY_STREET_TYPE}, 3035},\n+ {\"dyg\", 1, {DICTIONARY_STREET_TYPE}, 3038},\n {\"selatan\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"awang\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"simpang\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jln\", 1, {DICTIONARY_STREET_TYPE}, 3036},\n+ {\"kg\", 1, {DICTIONARY_STREET_TYPE}, 3041},\n {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"il\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"is\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"patri\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"triq\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"#\", 1, {DICTIONARY_UNIT}, 3045},\n+ {\"num\", 1, {DICTIONARY_UNIT}, 3045},\n {\"knisja\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"vjal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dun\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"trejqet\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"pjazza\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"#\", 1, {DICTIONARY_UNIT}, 3041},\n {\"dawret\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sqaq\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"numru\", 1, {DICTIONARY_UNIT}, -1},\n {\"isqof\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"tar\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"ta\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"num\", 1, {DICTIONARY_UNIT}, 3041},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"stredet\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vn\", 1, {DICTIONARY_STREET_TYPE}, 3052},\n+ {\"sv\", 1, {DICTIONARY_DIRECTIONAL}, 3066},\n {\"park\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"alleen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3048},\n+ {\"\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3061},\n {\"foran\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3045},\n+ {\"gt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3049},\n {\"stortorget\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3050},\n+ {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3048},\n {\"dei\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"gaard\", 1, {DICTIONARY_BUILDING_TYPE}, 3042},\n- {\"sondre\", 1, {DICTIONARY_DIRECTIONAL}, 3059},\n- {\"sdr\", 1, {DICTIONARY_DIRECTIONAL}, 3059},\n- {\"naermest\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3050},\n+ {\"s\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3065},\n+ {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3056},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"gt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3044},\n {\"vest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"vn\", 1, {DICTIONARY_STREET_TYPE}, 3050},\n {\"ein\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"n\u00e6rmest\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"vn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3052},\n {\"eit\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"veien\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"p\u00e5\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"bakken\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"\u00f8\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"nordvest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"gaarden\", 1, {DICTIONARY_BUILDING_TYPE}, 3047},\n {\"nord\u00f8st\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"gt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3048},\n+ {\"naer\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3058},\n+ {\"vn\", 1, {DICTIONARY_STREET_TYPE}, 3056},\n+ {\"overfor\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"plassen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3053},\n+ {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3054},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3056},\n {\"bukt\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"naer\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ostre\", 1, {DICTIONARY_DIRECTIONAL}, 3058},\n- {\"sv\", 1, {DICTIONARY_DIRECTIONAL}, 3062},\n- {\"flate\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"overfor\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ndr\", 1, {DICTIONARY_DIRECTIONAL}, 3053},\n- {\"plassen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3052},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3049},\n- {\"gt\", 1, {DICTIONARY_STREET_TYPE}, 3044},\n {\"\u00f8stre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"all\u00e8\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"fra\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ei\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"vn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3050},\n+ {\"gaard\", 1, {DICTIONARY_BUILDING_TYPE}, 3046},\n+ {\"gt\", 1, {DICTIONARY_STREET_TYPE}, 3049},\n+ {\"sdr\", 1, {DICTIONARY_DIRECTIONAL}, 3063},\n {\"kontoret\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"n\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3055},\n {\"e\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3051},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3057},\n+ {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3049},\n {\"nest\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"gaten\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"til\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"g\u00e5rd\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"og\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ndr\", 1, {DICTIONARY_DIRECTIONAL}, 3057},\n {\"bakerst\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"nv\", 1, {DICTIONARY_DIRECTIONAL}, 3056},\n+ {\"estasje\", 1, {DICTIONARY_LEVEL}, -1},\n+ {\"vn\", 1, {DICTIONARY_STREET_TYPE}, 3054},\n {\"ved siden av\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"for\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"gaarden\", 1, {DICTIONARY_BUILDING_TYPE}, 3043},\n+ {\"n\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3059},\n {\"nord\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"gt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3045},\n- {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3045},\n+ {\"ostre\", 1, {DICTIONARY_DIRECTIONAL}, 3062},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"paa\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"alle\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3051},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3054},\n {\"det\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"estasje\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"intil\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ost\", 1, {DICTIONARY_DIRECTIONAL}, 3061},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3064},\n {\"byen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3046},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3054},\n+ {\"gt\", 1, {DICTIONARY_STREET_TYPE}, 3048},\n+ {\"ei\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"ved\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"all\u00e8en\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"intil\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"lia\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"vn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3054},\n+ {\"vn.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3056},\n+ {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3055},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3055},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3061},\n {\"sydvest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"gata\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"nv\", 1, {DICTIONARY_DIRECTIONAL}, 3060},\n {\"n\u00e6r\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"syd\u00f8st\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"med\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3046},\n- {\"alle\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3047},\n+ {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3049},\n+ {\"naermest\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"veg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ost\", 1, {DICTIONARY_DIRECTIONAL}, 3057},\n {\"dalen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"v\", 1, {DICTIONARY_DIRECTIONAL}, 3067},\n {\"g\u00e5rden\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3060},\n+ {\"flate\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"den\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3044},\n+ {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3050},\n {\"av\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"over\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3044},\n {\"bak\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"paa\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"\u00f8st\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"vei\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"gate\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3057},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3051},\n {\"nordre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"vestre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"mellom\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"s\u00f8ndre\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"imellom\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"et\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s\u00f8\", 1, {DICTIONARY_DIRECTIONAL}, 3061},\n- {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3052},\n+ {\"sondre\", 1, {DICTIONARY_DIRECTIONAL}, 3063},\n+ {\"alleen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3052},\n+ {\"for\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"syd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3050},\n {\"vegen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"v\", 1, {DICTIONARY_DIRECTIONAL}, 3063},\n {\"svingen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3049},\n- {\"gt\", 1, {DICTIONARY_STREET_TYPE}, 3045},\n- {\"vlt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3077},\n+ {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3048},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3053},\n+ {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3097},\n+ {\"v d\", 1, {DICTIONARY_STOPWORD}, 3138},\n+ {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n {\"koning\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"van den\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"park\", 3, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3070},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3080},\n- {\"z.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3089},\n+ {\"gebr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3100},\n {\"jonkheer\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"pastoor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"generaal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"hogeschool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 3118},\n {\"'t\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"noordoost\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"autoverhuur\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 3126},\n- {\"z\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n+ {\"vd\", 1, {DICTIONARY_STOPWORD}, 3136},\n+ {\"mkt\", 1, {DICTIONARY_PLACE_NAME}, 3075},\n {\"fietsenstalling\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pk.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3065},\n+ {\"super markt\", 1, {DICTIONARY_PLACE_NAME}, 3129},\n {\"bunker\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"nz\", 1, {DICTIONARY_QUALIFIER}, 3131},\n+ {\"str\", 1, {DICTIONARY_STREET_TYPE}, 3078},\n {\"van\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"rijschool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kasteel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -74283,1997 +74299,1993 @@\n {\"dwarsstraat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"me\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"kunstcollectief\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"z.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n+ {\"zw\", 1, {DICTIONARY_DIRECTIONAL}, 3092},\n {\"zij\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"veerterminal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vrouwe\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"jeugdcentrum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"disco\", 1, {DICTIONARY_PLACE_NAME}, 3122},\n+ {\"z\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 3070},\n {\"recyclingpunt\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"casino\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"o l v\", 1, {DICTIONARY_PERSONAL_TITLE}, 3112},\n- {\"plnts\", 1, {DICTIONARY_STREET_TYPE}, 3140},\n+ {\"prs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3120},\n+ {\"kte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3107},\n {\"verpleeghuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"singel\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"minister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"of\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"o z\", 1, {DICTIONARY_QUALIFIER}, 3128},\n- {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 3082},\n+ {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3114},\n {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"n.z.\", 1, {DICTIONARY_QUALIFIER}, 3127},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n+ {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n {\"noord\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"hem\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"begraafplaats\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"weg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"kardinaal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"gevangenis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"v d\", 1, {DICTIONARY_STOPWORD}, 3136},\n+ {\"k\", 1, {DICTIONARY_PERSONAL_TITLE}, 3106},\n {\"nu\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pk\", 1, {DICTIONARY_STREET_TYPE}, 3065},\n+ {\"z w\", 1, {DICTIONARY_DIRECTIONAL}, 3092},\n+ {\"oz\", 1, {DICTIONARY_QUALIFIER}, 3132},\n {\"mij\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"w.z\", 1, {DICTIONARY_QUALIFIER}, 3129},\n- {\"stwg\", 1, {DICTIONARY_STREET_TYPE}, 3075},\n+ {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n+ {\"zo\", 1, {DICTIONARY_DIRECTIONAL}, 3091},\n {\"zuidzijde\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"vr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3119},\n+ {\"w.z.\", 1, {DICTIONARY_QUALIFIER}, 3133},\n+ {\"openbare mkt\", 1, {DICTIONARY_PLACE_NAME}, 3128},\n {\"school\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3082},\n {\"ijs\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zw\", 1, {DICTIONARY_DIRECTIONAL}, 3089},\n {\"zuidoosten\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"studentenhuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 3130},\n+ {\"luit\", 1, {DICTIONARY_PERSONAL_TITLE}, 3110},\n {\"in\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"dwwg\", 1, {DICTIONARY_STREET_TYPE}, 3137},\n+ {\"olv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3116},\n+ {\"z.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3091},\n {\"toren\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 3114},\n- {\"z.w\", 1, {DICTIONARY_DIRECTIONAL}, 3088},\n- {\"mkt\", 1, {DICTIONARY_PLACE_NAME}, 3071},\n {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"hoofdstraat\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"rusthuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zz\", 1, {DICTIONARY_QUALIFIER}, 3130},\n {\"mevrouw\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"west\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"o.z\", 1, {DICTIONARY_QUALIFIER}, 3128},\n- {\"mevr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3109},\n+ {\"marktpln\", 1, {DICTIONARY_PLACE_NAME}, 3127},\n {\"dit\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"kon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3104},\n- {\"z.z.\", 1, {DICTIONARY_QUALIFIER}, 3130},\n- {\"professor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pln.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3076},\n+ {\"kleine\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"kapel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n+ {\"n z\", 1, {DICTIONARY_QUALIFIER}, 3131},\n {\"crematorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bejaardentehuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"noord oost\", 1, {DICTIONARY_DIRECTIONAL}, 3080},\n- {\"openbare mkt\", 1, {DICTIONARY_PLACE_NAME}, 3124},\n- {\"h.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3067},\n+ {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n+ {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n+ {\"president\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"n.z\", 1, {DICTIONARY_QUALIFIER}, 3131},\n+ {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n+ {\"kon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3109},\n+ {\"kl\", 1, {DICTIONARY_SYNONYM}, 3145},\n+ {\"z z\", 1, {DICTIONARY_QUALIFIER}, 3134},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3121},\n+ {\"noord oosten\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n+ {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 3089},\n+ {\"lang\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"zuid\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"v\", 1, {DICTIONARY_STOPWORD}, 3131},\n- {\"v d\", 1, {DICTIONARY_STOPWORD}, 3134},\n- {\"vlt\", 1, {DICTIONARY_STREET_TYPE}, 3077},\n- {\"vd\", 1, {DICTIONARY_STOPWORD}, 3133},\n- {\"ons\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"z o\", 1, {DICTIONARY_DIRECTIONAL}, 3091},\n+ {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 3095},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3088},\n+ {\"z.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3092},\n {\"burgermeester\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"l.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3070},\n+ {\"zuid oosten\", 1, {DICTIONARY_DIRECTIONAL}, 3091},\n+ {\"autowasstraat\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bank\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"peuterspeelzaal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bij\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"z.o\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n- {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3115},\n+ {\"dk\", 1, {DICTIONARY_STREET_TYPE}, 3139},\n+ {\"mevr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3113},\n+ {\"gemeentehuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"die\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3081},\n- {\"zo\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n+ {\"mkt pln\", 1, {DICTIONARY_PLACE_NAME}, 3127},\n {\"kleuterschool\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"lang\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n+ {\"luchthaven\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vd\", 1, {DICTIONARY_STOPWORD}, 3138},\n+ {\"zuid oost\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n {\"leane\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"was\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3111},\n- {\"n.z\", 1, {DICTIONARY_QUALIFIER}, 3127},\n- {\"kl\", 1, {DICTIONARY_SYNONYM}, 3141},\n+ {\"bgm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3096},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 3130},\n+ {\"onzelievevrouwe\", 1, {DICTIONARY_PERSONAL_TITLE}, 3116},\n+ {\"z\", 1, {DICTIONARY_DIRECTIONAL}, 3094},\n {\"huizen\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"winkelen\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3066},\n {\"bordeel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"wg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3078},\n- {\"nz\", 1, {DICTIONARY_QUALIFIER}, 3127},\n- {\"z.z\", 1, {DICTIONARY_QUALIFIER}, 3130},\n- {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 3121},\n+ {\"mr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3111},\n {\"commandant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"kol\", 1, {DICTIONARY_PERSONAL_TITLE}, 3104},\n {\"dijk\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"berg\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, -1},\n {\"caf\u00e9\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mkt plein\", 1, {DICTIONARY_PLACE_NAME}, 3123},\n+ {\"wz\", 1, {DICTIONARY_QUALIFIER}, 3133},\n+ {\"l.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3073},\n {\"der\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"recyclage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3101},\n {\"korte\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"wg\", 1, {DICTIONARY_STREET_TYPE}, 3078},\n- {\"gr\", 1, {DICTIONARY_STREET_TYPE}, 3066},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3079},\n- {\"stwg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3075},\n+ {\"markt plein\", 1, {DICTIONARY_PLACE_NAME}, 3127},\n+ {\"o l v\", 1, {DICTIONARY_PERSONAL_TITLE}, 3116},\n+ {\"plnts\", 1, {DICTIONARY_STREET_TYPE}, 3144},\n {\"aan\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"westzijde\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3115},\n {\"hoe\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3081},\n- {\"ir\", 1, {DICTIONARY_PERSONAL_TITLE}, 3098},\n- {\"ln\", 1, {DICTIONARY_STREET_TYPE}, 3068},\n+ {\"ln.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3072},\n {\"auditorium\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"h\", 1, {DICTIONARY_STREET_TYPE}, 3067},\n+ {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n {\"onze lieve vrouwe\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"universiteit\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"noordzijde\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"z w\", 1, {DICTIONARY_DIRECTIONAL}, 3089},\n- {\"v d\", 1, {DICTIONARY_STOPWORD}, 3132},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3081},\n+ {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"o z\", 1, {DICTIONARY_QUALIFIER}, 3132},\n+ {\"n.z.\", 1, {DICTIONARY_QUALIFIER}, 3131},\n+ {\"wg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3082},\n {\"straat\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"vliet\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"kard\", 1, {DICTIONARY_PERSONAL_TITLE}, 3105},\n {\"beschutting\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dierenarts\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"politie\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"van der\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"markt\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_PLACE_NAME}, -1},\n- {\"z o\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n- {\"oz\", 1, {DICTIONARY_QUALIFIER}, 3128},\n+ {\"str.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3078},\n+ {\"pk\", 1, {DICTIONARY_STREET_TYPE}, 3069},\n {\"brandweer\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sint\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n- {\"zuid oost\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n- {\"kleine\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sngl\", 1, {DICTIONARY_STREET_TYPE}, 3073},\n- {\"past\", 1, {DICTIONARY_PERSONAL_TITLE}, 3113},\n- {\"vrouwe\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 3126},\n- {\"mkt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3071},\n+ {\"w.z\", 1, {DICTIONARY_QUALIFIER}, 3133},\n+ {\"z.w\", 1, {DICTIONARY_DIRECTIONAL}, 3093},\n+ {\"stwg\", 1, {DICTIONARY_STREET_TYPE}, 3079},\n+ {\"wg\", 1, {DICTIONARY_STREET_TYPE}, 3082},\n+ {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3074},\n+ {\"veerterminal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"vlt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3081},\n+ {\"sngl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3077},\n {\"zuster\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"z.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n- {\"generaal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"dwwg\", 1, {DICTIONARY_STREET_TYPE}, 3141},\n+ {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n+ {\"zw\", 1, {DICTIONARY_DIRECTIONAL}, 3093},\n {\"oost\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"bioscoop\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3080},\n {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n+ {\"zz\", 1, {DICTIONARY_QUALIFIER}, 3134},\n {\"wel\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"marktpln\", 1, {DICTIONARY_PLACE_NAME}, 3123},\n- {\"zr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3120},\n+ {\"ln\", 1, {DICTIONARY_STREET_TYPE}, 3072},\n+ {\"o.z\", 1, {DICTIONARY_QUALIFIER}, 3132},\n {\"gracht\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"pln.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3072},\n- {\"z\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"jhr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3099},\n {\"noordwest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"kade\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dwstr\", 1, {DICTIONARY_STREET_TYPE}, 3136},\n- {\"n z\", 1, {DICTIONARY_QUALIFIER}, 3127},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3098},\n+ {\"ds\", 1, {DICTIONARY_PERSONAL_TITLE}, 3099},\n {\"plein\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n {\"nog\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"verl\", 1, {DICTIONARY_STREET_TYPE}, 3080},\n {\"af\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3110},\n- {\"kon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3105},\n- {\"prs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3116},\n+ {\"supermkt\", 1, {DICTIONARY_PLACE_NAME}, 3129},\n+ {\"recyclage\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"z.o\", 1, {DICTIONARY_DIRECTIONAL}, 3091},\n {\"zou\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"van 't\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"noord oosten\", 1, {DICTIONARY_DIRECTIONAL}, 3081},\n- {\"noord westen\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n- {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3069},\n- {\"z.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3088},\n+ {\"burg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3096},\n+ {\"noordzijde\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"v d\", 1, {DICTIONARY_STOPWORD}, 3137},\n+ {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n {\"theater\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mkt.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3075},\n {\"met\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"kerk\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"super mkt\", 1, {DICTIONARY_PLACE_NAME}, 3125},\n {\"het\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"zuidwesten\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3119},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 3082},\n+ {\"weg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"prinses\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3083},\n- {\"mkt pln\", 1, {DICTIONARY_PLACE_NAME}, 3123},\n {\"al\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"wisselkantoor\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dominee\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"koningin\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bgm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3092},\n {\"winkel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"openbare markt\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"onzelievevrouwe\", 1, {DICTIONARY_PERSONAL_TITLE}, 3112},\n {\"marktplein\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kliniek\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3073},\n {\"monseigneur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"stadion\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"noord west\", 1, {DICTIONARY_DIRECTIONAL}, 3082},\n- {\"mr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3107},\n {\"zuidwest\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"w z\", 1, {DICTIONARY_QUALIFIER}, 3129},\n {\"fontein\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ln.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3068},\n+ {\"z.z\", 1, {DICTIONARY_QUALIFIER}, 3134},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"cafe\", 1, {DICTIONARY_PLACE_NAME}, 3125},\n {\"boerderij\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"en\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"busstation\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"wz\", 1, {DICTIONARY_QUALIFIER}, 3129},\n+ {\"super mkt\", 1, {DICTIONARY_PLACE_NAME}, 3129},\n {\"ver\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"k\", 1, {DICTIONARY_PERSONAL_TITLE}, 3102},\n+ {\"mkt plein\", 1, {DICTIONARY_PLACE_NAME}, 3127},\n {\"gebroeders\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3093},\n {\"postkantoor\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"lange\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3097},\n- {\"o.z.\", 1, {DICTIONARY_QUALIFIER}, 3128},\n- {\"vd\", 1, {DICTIONARY_STOPWORD}, 3132},\n- {\"gebr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3096},\n- {\"markt plein\", 1, {DICTIONARY_PLACE_NAME}, 3123},\n+ {\"ons\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"professor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n+ {\"z.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3093},\n+ {\"stwg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3079},\n {\"uit\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"l.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3069},\n+ {\"mej\", 1, {DICTIONARY_PERSONAL_TITLE}, 3112},\n {\"fitnesscentrum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"loane\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3080},\n- {\"van de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"w\", 1, {DICTIONARY_DIRECTIONAL}, 3085},\n- {\"autowasstraat\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ir\", 1, {DICTIONARY_PERSONAL_TITLE}, 3102},\n+ {\"h\", 1, {DICTIONARY_STREET_TYPE}, 3071},\n+ {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n+ {\"z w\", 1, {DICTIONARY_DIRECTIONAL}, 3093},\n+ {\"pk.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3069},\n {\"meester\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"str\", 1, {DICTIONARY_STREET_TYPE}, 3074},\n+ {\"zo\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n+ {\"vd\", 1, {DICTIONARY_STOPWORD}, 3137},\n {\"rechtbank\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"cinema\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"prins\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"zuidoost\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"str.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3074},\n- {\"zw\", 1, {DICTIONARY_DIRECTIONAL}, 3088},\n- {\"z.w\", 1, {DICTIONARY_DIRECTIONAL}, 3089},\n+ {\"z.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n {\"noordwesten\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"disco\", 1, {DICTIONARY_PLACE_NAME}, 3126},\n+ {\"sngl\", 1, {DICTIONARY_STREET_TYPE}, 3077},\n {\"studio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mej\", 1, {DICTIONARY_PERSONAL_TITLE}, 3108},\n+ {\"past\", 1, {DICTIONARY_PERSONAL_TITLE}, 3117},\n+ {\"van de\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"kort\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"tandarts\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3103},\n- {\"sngl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3073},\n {\"discotheek\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"club\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"h\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"kd\", 1, {DICTIONARY_STREET_TYPE}, 3138},\n {\"ingenieur\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"oostzijde\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"president\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zuid oosten\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n- {\"verl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3076},\n- {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3080},\n+ {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n+ {\"bg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3068},\n+ {\"nw\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n+ {\"n.w\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n {\"kolonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"dk\", 1, {DICTIONARY_STREET_TYPE}, 3135},\n- {\"gemeentehuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"zr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3124},\n+ {\"kon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3108},\n {\"kan\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"baan\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"jhr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3103},\n {\"bibliotheek\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3094},\n- {\"ds\", 1, {DICTIONARY_PERSONAL_TITLE}, 3095},\n- {\"z w\", 1, {DICTIONARY_DIRECTIONAL}, 3088},\n- {\"v d\", 1, {DICTIONARY_STOPWORD}, 3133},\n- {\"verl\", 1, {DICTIONARY_STREET_TYPE}, 3076},\n- {\"vd\", 1, {DICTIONARY_STOPWORD}, 3134},\n+ {\"dwstr\", 1, {DICTIONARY_STREET_TYPE}, 3140},\n {\"als\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"ambassade\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"w.z.\", 1, {DICTIONARY_QUALIFIER}, 3129},\n {\"steenweg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"supermkt\", 1, {DICTIONARY_PLACE_NAME}, 3125},\n+ {\"vr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3123},\n {\"dokter\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"een\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"z.o\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n {\"tot\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"autodelen\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"luit\", 1, {DICTIONARY_PERSONAL_TITLE}, 3106},\n- {\"burg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3092},\n {\"verlengde\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"olv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3112},\n {\"supermarkt\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zo\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n- {\"z o\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n- {\"n w\", 1, {DICTIONARY_DIRECTIONAL}, 3082},\n+ {\"noord westen\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n+ {\"z.w\", 1, {DICTIONARY_DIRECTIONAL}, 3092},\n {\"dokters\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 3122},\n+ {\"verl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3080},\n {\"spoorwegstation\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kard\", 1, {DICTIONARY_PERSONAL_TITLE}, 3101},\n+ {\"sauna\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"hof\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"z.z.\", 1, {DICTIONARY_QUALIFIER}, 3134},\n {\"fietsverhuur\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"kantoor\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"o.z.\", 1, {DICTIONARY_QUALIFIER}, 3132},\n {\"nachtclub\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"n.w.\", 1, {DICTIONARY_DIRECTIONAL}, 3087},\n {\"luitenant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3081},\n {\"plain\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, -1},\n {\"laan\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"hal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"den\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"rvt\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"luchthaven\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"gr.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3070},\n+ {\"noord oost\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n {\"baron\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"dwarsweg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"broeder\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"z z\", 1, {DICTIONARY_QUALIFIER}, 3130},\n+ {\"l.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3074},\n+ {\"h.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3071},\n {\"plantsoen\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"gemeenschapscentrum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3117},\n {\"restaurant\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"super markt\", 1, {DICTIONARY_PLACE_NAME}, 3125},\n {\"noordoosten\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"kd\", 1, {DICTIONARY_STREET_TYPE}, 3142},\n {\"gezondheidscentrum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"peuterspeelzaal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"bg.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3064},\n- {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 3091},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3084},\n- {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 3118},\n- {\"pln\", 1, {DICTIONARY_STREET_TYPE}, 3139},\n- {\"kol\", 1, {DICTIONARY_PERSONAL_TITLE}, 3100},\n+ {\"z o\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n+ {\"noord west\", 1, {DICTIONARY_DIRECTIONAL}, 3086},\n+ {\"v\", 1, {DICTIONARY_STOPWORD}, 3135},\n+ {\"vlt\", 1, {DICTIONARY_STREET_TYPE}, 3081},\n+ {\"w z\", 1, {DICTIONARY_QUALIFIER}, 3133},\n {\"mejuffrouw\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"huis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"ziekenhuis\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"z.o\", 1, {DICTIONARY_DIRECTIONAL}, 3090},\n {\"te\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"apotheek\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"carri\u00e8ra\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"plc\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n {\"dera\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"deu\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pl\u00e7\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n {\"dei\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"del\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"lo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"l'\", 1, {DICTIONARY_ELISION}, -1},\n {\"e\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"placa\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n+ {\"pca\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n+ {\"pl\u00e7\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n {\"et\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"deus\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"p\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n {\"pas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"carriera\", 1, {DICTIONARY_STREET_TYPE}, 3142},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n {\"camin\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n+ {\"p\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n {\"avenguda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"placa\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pca\", 1, {DICTIONARY_STREET_TYPE}, 3143},\n+ {\"plc\", 1, {DICTIONARY_STREET_TYPE}, 3147},\n {\"dal\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"la\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"pla\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"al\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"carriera\", 1, {DICTIONARY_STREET_TYPE}, 3146},\n {\"las\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"san\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"kaya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kaminda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sekt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3203},\n- {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3194},\n- {\"techn\", 1, {DICTIONARY_PLACE_NAME}, 3233},\n- {\"kom\", 1, {DICTIONARY_PERSONAL_TITLE}, 3190},\n- {\"p\u0142n zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"dziel\", 1, {DICTIONARY_QUALIFIER}, 3238},\n- {\"zakl\", 1, {DICTIONARY_PLACE_NAME}, 3235},\n- {\"m\", 1, {DICTIONARY_UNIT}, 3269},\n- {\"muzeum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pln.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"\u015bw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3215},\n+ {\"pn zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"kpr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3185},\n+ {\"wiceadm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3217},\n+ {\"admiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3166},\n+ {\"kontradmiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3190},\n+ {\"lek\", 1, {DICTIONARY_PERSONAL_TITLE}, 3196},\n+ {\"bka\", 1, {DICTIONARY_PLACE_NAME}, 3220},\n+ {\"polnoc\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n+ {\"cie\u015bn\", 1, {DICTIONARY_SYNONYM}, 3259},\n+ {\"op\", 1, {DICTIONARY_PLACE_NAME}, 3232},\n {\"pu\u0142kownik\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"magister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"po\u0142udniowy wsch\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"pd\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n+ {\"m\u0142\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3163},\n+ {\"p\u0142d.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"szer\", 1, {DICTIONARY_SYNONYM}, 3270},\n {\"droga\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"departament\", 1, {DICTIONARY_UNIT}, -1},\n {\"dyrektor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"hotel\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"komandor porucznik\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"d-ca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3171},\n {\"\u015bwi\u0119ty\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mn\", 1, {DICTIONARY_PLACE_NAME}, 3227},\n+ {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 3227},\n+ {\"b-ka\", 1, {DICTIONARY_PLACE_NAME}, 3220},\n {\"m\u0142odszy\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n {\"kwarta\u0142\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"gm\", 1, {DICTIONARY_QUALIFIER}, 3239},\n- {\"p\u0142n\", 1, {DICTIONARY_DIRECTIONAL}, 3150},\n+ {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3208},\n {\"republika\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"p\u00f3\u0142noc\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"oddzia\u0142\", 1, {DICTIONARY_UNIT}, -1},\n- {\"centralny\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"bczka\", 1, {DICTIONARY_PLACE_NAME}, 3222},\n {\"starszy\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"wiceadm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3213},\n {\"wie\u015b\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"brygada\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sierz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3205},\n+ {\"bn\", 1, {DICTIONARY_PLACE_NAME}, 3221},\n {\"technikum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rz\", 1, {DICTIONARY_SYNONYM}, 3263},\n- {\"st sierz sztab\", 1, {DICTIONARY_PERSONAL_TITLE}, 3209},\n+ {\"zaklad\", 1, {DICTIONARY_PLACE_NAME}, 3239},\n {\"administracja\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"kol\", 1, {DICTIONARY_PLACE_NAME}, 3224},\n+ {\"marsz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3200},\n {\"minister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"zak\u0142\", 1, {DICTIONARY_PLACE_NAME}, 3239},\n {\"skrytka pocztowa\", 1, {DICTIONARY_POST_OFFICE}, -1},\n+ {\"swiety\", 1, {DICTIONARY_PERSONAL_TITLE}, 3215},\n {\"w\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"biblioteczka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"kier\", 1, {DICTIONARY_PERSONAL_TITLE}, 3185},\n- {\"bn\", 1, {DICTIONARY_SYNONYM}, 3250},\n {\"obwodnica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p\u0142d.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"p\u0142d-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n {\"batalion\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pld\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n- {\"pld-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"narodowy\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"amb\", 1, {DICTIONARY_PERSONAL_TITLE}, 3163},\n- {\"pn-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n- {\"p\u0142d\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n- {\"adm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3162},\n+ {\"f-ka\", 1, {DICTIONARY_PLACE_NAME}, 3224},\n+ {\"akad\", 1, {DICTIONARY_PLACE_NAME}, 3219},\n+ {\"nar\", 1, {DICTIONARY_SYNONYM}, 3264},\n+ {\"pln wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"kadm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3190},\n+ {\"muzeum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pn.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"pa\u0144stw\", 1, {DICTIONARY_SYNONYM}, 3265},\n+ {\"kwartal\", 1, {DICTIONARY_QUALIFIER}, 3244},\n+ {\"pln-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n {\"biblioteka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s-ka akc\", 1, {DICTIONARY_COMPANY_TYPE}, 3147},\n- {\"dziek\", 1, {DICTIONARY_PERSONAL_TITLE}, 3173},\n+ {\"pn-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"federacja\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"b-cia\", 1, {DICTIONARY_SYNONYM}, 3252},\n- {\"bosm sztab\", 1, {DICTIONARY_PERSONAL_TITLE}, 3168},\n- {\"kard\", 1, {DICTIONARY_PERSONAL_TITLE}, 3184},\n- {\"ks\", 1, {DICTIONARY_PERSONAL_TITLE}, 3191},\n {\"okr\u0119g\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3202},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3247},\n- {\"ok\", 1, {DICTIONARY_QUALIFIER}, 3241},\n {\"blok\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"marszalka\", 1, {DICTIONARY_PERSONAL_TITLE}, 3196},\n {\"siostry\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pd.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"dca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3175},\n+ {\"pld.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"kmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3194},\n+ {\"kosciol\", 1, {DICTIONARY_PLACE_NAME}, 3229},\n+ {\"p\u0142k\", 1, {DICTIONARY_PERSONAL_TITLE}, 3203},\n+ {\"bryg\", 1, {DICTIONARY_SYNONYM}, 3257},\n+ {\"oddz\", 1, {DICTIONARY_UNIT}, 3274},\n+ {\"p\u0142d wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"g\", 1, {DICTIONARY_SYNONYM}, 3262},\n {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"strz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3207},\n- {\"podofic\", 1, {DICTIONARY_PERSONAL_TITLE}, 3200},\n- {\"kontradm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3186},\n+ {\"dln\", 1, {DICTIONARY_SYNONYM}, 3260},\n+ {\"arch\", 1, {DICTIONARY_PERSONAL_TITLE}, 3168},\n+ {\"st strz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3214},\n+ {\"pn-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n {\"admira\u0142\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"hr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3179},\n- {\"in\u017c\", 1, {DICTIONARY_PERSONAL_TITLE}, 3180},\n- {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3193},\n {\"autostrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jez\", 1, {DICTIONARY_SYNONYM}, 3259},\n- {\"bl\", 1, {DICTIONARY_QUALIFIER}, 3237},\n- {\"p\u0142n.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n+ {\"pld.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n {\"bracia\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"lic\", 1, {DICTIONARY_PLACE_NAME}, 3226},\n- {\"kwartal\", 1, {DICTIONARY_QUALIFIER}, 3240},\n- {\"polnocny zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3174},\n+ {\"bud\", 1, {DICTIONARY_BUILDING_TYPE}, 3149},\n+ {\"ss\", 1, {DICTIONARY_SYNONYM}, 3268},\n {\"parkowa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sp\u00f3\u0142dzielnia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"adr\", 1, {DICTIONARY_SYNONYM}, 3249},\n- {\"bosman sztabowy\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"szeregowy\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sp\u00f3\u0142ka\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"ks\", 1, {DICTIONARY_PERSONAL_TITLE}, 3195},\n+ {\"st\", 1, {DICTIONARY_SYNONYM}, 3269},\n+ {\"bcia\", 1, {DICTIONARY_SYNONYM}, 3256},\n {\"genera\u0142 dywizji\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pn.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n {\"podsekretarz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"wwa\", 1, {DICTIONARY_TOPONYM}, 3267},\n- {\"os\", 1, {DICTIONARY_QUALIFIER}, 3242},\n- {\"bosm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3167},\n- {\"st bosm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3206},\n+ {\"st\", 1, {DICTIONARY_PLACE_NAME}, 3235},\n {\"p\u00f3\u0142nocny zach\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"bank\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pd zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n {\"kapral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kardynala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3184},\n- {\"plac\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gosp\", 1, {DICTIONARY_PLACE_NAME}, 3222},\n+ {\"hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3182},\n+ {\"admin\", 1, {DICTIONARY_SYNONYM}, 3252},\n+ {\"strz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3211},\n {\"wiceminister\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"\u015bw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3211},\n+ {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3198},\n+ {\"narodowy\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"in\u017cynier\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"admiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3162},\n- {\"pln-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n+ {\"mn\", 1, {DICTIONARY_PLACE_NAME}, 3231},\n+ {\"pok\", 1, {DICTIONARY_UNIT}, 3275},\n {\"lekarz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"poludniowy wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"bka\", 1, {DICTIONARY_PLACE_NAME}, 3216},\n- {\"polnoc\", 1, {DICTIONARY_DIRECTIONAL}, 3150},\n- {\"arcybiskup\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cie\u015bn\", 1, {DICTIONARY_SYNONYM}, 3255},\n+ {\"stary\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"woj\", 1, {DICTIONARY_QUALIFIER}, 3247},\n {\"muzeum narodowe\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"m\u0142\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3159},\n {\"zaulek\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bryg\", 1, {DICTIONARY_SYNONYM}, 3253},\n- {\"szer\", 1, {DICTIONARY_SYNONYM}, 3266},\n- {\"pln-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"pd-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"pd\", 1, {DICTIONARY_DIRECTIONAL}, 3158},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3178},\n {\"genera\u0142 broni\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"stow\", 1, {DICTIONARY_COMPANY_TYPE}, 3153},\n {\"akademia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"st\", 1, {DICTIONARY_PLACE_NAME}, 3231},\n- {\"kmdr por\", 1, {DICTIONARY_PERSONAL_TITLE}, 3188},\n- {\"adm\", 1, {DICTIONARY_SYNONYM}, 3248},\n- {\"p\", 1, {DICTIONARY_LEVEL}, 3158},\n+ {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3201},\n+ {\"adj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3165},\n+ {\"bosm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3171},\n {\"wielebny\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"wicemin\", 1, {DICTIONARY_PERSONAL_TITLE}, 3214},\n {\"dziekan\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ambasador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pld-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n- {\"rep\", 1, {DICTIONARY_SYNONYM}, 3262},\n+ {\"arcybiskup\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"wyspa\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"dowodca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3171},\n {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"bazylika\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pok\", 1, {DICTIONARY_UNIT}, 3271},\n- {\"bn\", 1, {DICTIONARY_PLACE_NAME}, 3217},\n+ {\"sierz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3209},\n+ {\"sw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3215},\n+ {\"b-czka\", 1, {DICTIONARY_PLACE_NAME}, 3222},\n {\"starszy bosman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ojciec\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"katedra\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"rz\", 1, {DICTIONARY_SYNONYM}, 3267},\n {\"opat\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st sierz sztab\", 1, {DICTIONARY_PERSONAL_TITLE}, 3213},\n {\"gospodarka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"uniwersytet\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zak\u0142\", 1, {DICTIONARY_PLACE_NAME}, 3235},\n- {\"wiceadmiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3213},\n- {\"k\", 1, {DICTIONARY_STOPWORD}, 3244},\n {\"pi\u0119tro\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"swiety\", 1, {DICTIONARY_PERSONAL_TITLE}, 3211},\n {\"marynarz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kpt mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3183},\n {\"komendant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ptr\", 1, {DICTIONARY_LEVEL}, 3162},\n {\"dzielnica\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"kier\", 1, {DICTIONARY_PERSONAL_TITLE}, 3189},\n {\"rynek\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kolejowy\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"p\u0142n-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n- {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3182},\n- {\"p\u0142n.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n+ {\"kmdr ppor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3193},\n+ {\"kmdr por\", 1, {DICTIONARY_PERSONAL_TITLE}, 3192},\n {\"kierownik\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"dep\", 1, {DICTIONARY_UNIT}, 3268},\n- {\"f-ka\", 1, {DICTIONARY_PLACE_NAME}, 3220},\n+ {\"pld\", 1, {DICTIONARY_DIRECTIONAL}, 3158},\n+ {\"p\", 1, {DICTIONARY_LEVEL}, 3162},\n+ {\"pld-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n {\"aleja\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dow\u00f3dca\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p\u0142d-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"pln wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n- {\"kadm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3186},\n- {\"p\u0142d zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"p\u0142n.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"amb\", 1, {DICTIONARY_PERSONAL_TITLE}, 3167},\n+ {\"wielmozny\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n {\"stacja\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pld wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"pd wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"pln\", 1, {DICTIONARY_DIRECTIONAL}, 3150},\n- {\"wojewodztwo\", 1, {DICTIONARY_QUALIFIER}, 3243},\n- {\"zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3157},\n+ {\"bot\", 1, {DICTIONARY_SYNONYM}, 3255},\n+ {\"marsza\u0142ka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"p\u0142d\", 1, {DICTIONARY_DIRECTIONAL}, 3158},\n+ {\"adm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3166},\n {\"politechnika\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"o\u015br\", 1, {DICTIONARY_PLACE_NAME}, 3230},\n {\"g\u00f3rny\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3174},\n- {\"dyr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3172},\n- {\"st sierz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3208},\n- {\"podoficer\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"podsekr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3201},\n+ {\"b-cia\", 1, {DICTIONARY_SYNONYM}, 3256},\n+ {\"kard\", 1, {DICTIONARY_PERSONAL_TITLE}, 3188},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3206},\n+ {\"w\", 1, {DICTIONARY_PERSONAL_TITLE}, 3216},\n {\"sier\u017cant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gimnazjum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3164},\n {\"adjunkt\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sp\u00f3\u0142dz\", 1, {DICTIONARY_COMPANY_TYPE}, 3148},\n {\"ko\u015bci\u00f3\u0142\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"adwokat\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"bpa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3169},\n- {\"dca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3171},\n- {\"centr\", 1, {DICTIONARY_SYNONYM}, 3254},\n+ {\"kpt mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3187},\n+ {\"centralny\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"u\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"gmina\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"na\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"kosciol\", 1, {DICTIONARY_PLACE_NAME}, 3225},\n+ {\"pn.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"jezioro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"p\u0142d wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"dln\", 1, {DICTIONARY_SYNONYM}, 3256},\n+ {\"poludnie\", 1, {DICTIONARY_DIRECTIONAL}, 3158},\n+ {\"fed\", 1, {DICTIONARY_SYNONYM}, 3261},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"st strz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3210},\n- {\"gen broni\", 1, {DICTIONARY_PERSONAL_TITLE}, 3175},\n- {\"farm\", 1, {DICTIONARY_PLACE_NAME}, 3219},\n- {\"szeregowy\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"podofic\", 1, {DICTIONARY_PERSONAL_TITLE}, 3204},\n+ {\"kontradm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3190},\n+ {\"bosman sztabowy\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"hr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3183},\n {\"senator\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"mgr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3197},\n+ {\"jez\", 1, {DICTIONARY_SYNONYM}, 3263},\n {\"kontradmira\u0142\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"bl\", 1, {DICTIONARY_QUALIFIER}, 3241},\n {\"stowarzyszenie\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"sp\u00f3\u0142ka akcyjna\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"asystent\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"rondo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3170},\n- {\"s-ka\", 1, {DICTIONARY_COMPANY_TYPE}, 3146},\n+ {\"generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3178},\n+ {\"st kol\", 1, {DICTIONARY_PLACE_NAME}, 3236},\n {\"strzelec\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3195},\n {\"komandor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"st\", 1, {DICTIONARY_SYNONYM}, 3265},\n- {\"bcia\", 1, {DICTIONARY_SYNONYM}, 3252},\n- {\"pn wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3249},\n {\"po\u0142udniowy zach\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"p\u0142n wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n- {\"o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3198},\n- {\"boczna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3187},\n+ {\"polnocny wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"gosp\", 1, {DICTIONARY_PLACE_NAME}, 3226},\n+ {\"kw\", 1, {DICTIONARY_QUALIFIER}, 3244},\n+ {\"p\u0142n\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n+ {\"gen dyw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3181},\n+ {\"gen broni\", 1, {DICTIONARY_PERSONAL_TITLE}, 3179},\n {\"ko\u0142o\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"wielmozny\", 1, {DICTIONARY_ACADEMIC_DEGREE}, -1},\n- {\"un\", 1, {DICTIONARY_PLACE_NAME}, 3234},\n+ {\"pd-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"poludniowy wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n {\"dolny\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pln zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"woj\", 1, {DICTIONARY_QUALIFIER}, 3243},\n+ {\"bibl\", 1, {DICTIONARY_PLACE_NAME}, 3220},\n {\"starszy strzelec\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"u\", 1, {DICTIONARY_PLACE_NAME}, 3238},\n {\"liceum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3174},\n- {\"pln.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n+ {\"pln-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"uniw\", 1, {DICTIONARY_PLACE_NAME}, 3238},\n+ {\"sp\u00f3\u0142dz\", 1, {DICTIONARY_COMPANY_TYPE}, 3152},\n+ {\"pd-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n {\"wsch\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"botanika\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"gen bryg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3176},\n- {\"spnia\", 1, {DICTIONARY_COMPANY_TYPE}, 3148},\n- {\"wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3153},\n {\"biskupa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"adj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3161},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3250},\n+ {\"p\u0142n wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"adm\", 1, {DICTIONARY_SYNONYM}, 3252},\n+ {\"as\", 1, {DICTIONARY_PERSONAL_TITLE}, 3170},\n+ {\"organ\", 1, {DICTIONARY_PLACE_NAME}, 3233},\n {\"warszawa\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"stow\", 1, {DICTIONARY_COMPANY_TYPE}, 3149},\n- {\"p\u0142n-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"w-wa\", 1, {DICTIONARY_TOPONYM}, 3267},\n- {\"organ\", 1, {DICTIONARY_PLACE_NAME}, 3229},\n+ {\"baon\", 1, {DICTIONARY_SYNONYM}, 3254},\n+ {\"boczna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"wicemin\", 1, {DICTIONARY_PERSONAL_TITLE}, 3218},\n {\"zak\u0142ad\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pld-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n+ {\"sekt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3207},\n {\"p\u00f3\u0142nocny wsch\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"bczka\", 1, {DICTIONARY_PLACE_NAME}, 3218},\n+ {\"dowodca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3175},\n+ {\"pld zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n+ {\"adw\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 3148},\n {\"kapitan marynarki\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pn zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"kontradmiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3186},\n- {\"sw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3211},\n- {\"lek\", 1, {DICTIONARY_PERSONAL_TITLE}, 3192},\n+ {\"p\u0142n zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"zakl\", 1, {DICTIONARY_PLACE_NAME}, 3239},\n {\"bulwar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"b-czka\", 1, {DICTIONARY_PLACE_NAME}, 3218},\n+ {\"o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3202},\n+ {\"m\", 1, {DICTIONARY_UNIT}, 3273},\n+ {\"gim\", 1, {DICTIONARY_PLACE_NAME}, 3225},\n {\"pa\u0144stwowy\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"gimnazjum\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"genera\u0142 brygady\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p\u0142d.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n {\"osiedle\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"ksi\u0105dz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"organizacja\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ptr\", 1, {DICTIONARY_LEVEL}, 3158},\n- {\"p\u0142k\", 1, {DICTIONARY_PERSONAL_TITLE}, 3199},\n+ {\"abp\", 1, {DICTIONARY_PERSONAL_TITLE}, 3169},\n {\"hrabia\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"komandor podporucznik\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kmdr ppor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3189},\n- {\"ss\", 1, {DICTIONARY_SYNONYM}, 3264},\n+ {\"p\u0142n.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"kapitan\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"marsz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3196},\n- {\"abp\", 1, {DICTIONARY_PERSONAL_TITLE}, 3165},\n- {\"skr poczt\", 1, {DICTIONARY_POST_OFFICE}, 3236},\n- {\"b-ka\", 1, {DICTIONARY_PLACE_NAME}, 3216},\n {\"szosa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"dep\", 1, {DICTIONARY_UNIT}, 3272},\n {\"genera\u0142a\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"p\u0142d-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"p\u0142d zach\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n {\"pok\u00f3j\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3204},\n- {\"szereg\", 1, {DICTIONARY_SYNONYM}, 3266},\n- {\"bot\", 1, {DICTIONARY_SYNONYM}, 3251},\n- {\"akad\", 1, {DICTIONARY_PLACE_NAME}, 3215},\n- {\"pld zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"in\u017c\", 1, {DICTIONARY_PERSONAL_TITLE}, 3184},\n+ {\"pld wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"szereg\", 1, {DICTIONARY_SYNONYM}, 3270},\n+ {\"pd wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"plac\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pln\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n {\"wiceadmira\u0142\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"kmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3190},\n+ {\"wojewodztwo\", 1, {DICTIONARY_QUALIFIER}, 3247},\n+ {\"zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3161},\n {\"szko\u0142a\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dyr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3176},\n {\"po\u0142udnie\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"gim\", 1, {DICTIONARY_PLACE_NAME}, 3221},\n {\"stacja kolejowa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zaklad\", 1, {DICTIONARY_PLACE_NAME}, 3235},\n- {\"st\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3160},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3246},\n+ {\"techn\", 1, {DICTIONARY_PLACE_NAME}, 3237},\n+ {\"kol\", 1, {DICTIONARY_PLACE_NAME}, 3228},\n+ {\"podsekr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3205},\n+ {\"d-ca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3175},\n+ {\"bpa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3173},\n+ {\"bn\", 1, {DICTIONARY_SYNONYM}, 3254},\n+ {\"centr\", 1, {DICTIONARY_SYNONYM}, 3258},\n+ {\"gen bryg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3180},\n {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"p\u0142d-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n- {\"pn.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"poludnie\", 1, {DICTIONARY_DIRECTIONAL}, 3154},\n- {\"fed\", 1, {DICTIONARY_SYNONYM}, 3257},\n- {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 3223},\n+ {\"p\u0142d.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n+ {\"skr poczt\", 1, {DICTIONARY_POST_OFFICE}, 3240},\n+ {\"farm\", 1, {DICTIONARY_PLACE_NAME}, 3223},\n+ {\"st sierz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3212},\n {\"budowa\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"pd.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n+ {\"spnia\", 1, {DICTIONARY_COMPANY_TYPE}, 3152},\n+ {\"rep\", 1, {DICTIONARY_SYNONYM}, 3266},\n {\"cie\u015bnina\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"marsza\u0142ka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"adres\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"kpr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3181},\n {\"starszy sier\u017cant sztabowy\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"st kol\", 1, {DICTIONARY_PLACE_NAME}, 3232},\n+ {\"poludniowy zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3160},\n+ {\"s-ka akc\", 1, {DICTIONARY_COMPANY_TYPE}, 3151},\n+ {\"dziek\", 1, {DICTIONARY_PERSONAL_TITLE}, 3177},\n {\"starszy sier\u017cant\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s-ka\", 1, {DICTIONARY_COMPANY_TYPE}, 3150},\n {\"mieszkanie\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3199},\n+ {\"o\u015br\", 1, {DICTIONARY_PLACE_NAME}, 3234},\n+ {\"bosm sztab\", 1, {DICTIONARY_PERSONAL_TITLE}, 3172},\n {\"sekretarz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"as\", 1, {DICTIONARY_PERSONAL_TITLE}, 3166},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3245},\n+ {\"pn wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"k\", 1, {DICTIONARY_STOPWORD}, 3248},\n+ {\"ok\", 1, {DICTIONARY_QUALIFIER}, 3245},\n {\"profesor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"doktora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"polnocny zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"zach\u00f3d\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"pld.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"polnocny wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n+ {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3186},\n {\"o\u015brodek\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"oddz\", 1, {DICTIONARY_UNIT}, 3270},\n- {\"kw\", 1, {DICTIONARY_QUALIFIER}, 3240},\n- {\"g\", 1, {DICTIONARY_SYNONYM}, 3258},\n- {\"pln.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3151},\n- {\"gen dyw\", 1, {DICTIONARY_PERSONAL_TITLE}, 3177},\n+ {\"pd.-wsch.\", 1, {DICTIONARY_DIRECTIONAL}, 3159},\n+ {\"podoficer\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"kmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3191},\n {\"rzeka\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"kom\", 1, {DICTIONARY_PERSONAL_TITLE}, 3194},\n {\"m\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"pn-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3152},\n- {\"pd.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n- {\"pd-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n- {\"op\", 1, {DICTIONARY_PLACE_NAME}, 3228},\n {\"honorowy\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"dziel\", 1, {DICTIONARY_QUALIFIER}, 3242},\n {\"architekt\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pld.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"un\", 1, {DICTIONARY_PLACE_NAME}, 3238},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3197},\n- {\"poludniowy zachod\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n- {\"bibl\", 1, {DICTIONARY_PLACE_NAME}, 3216},\n- {\"pa\u0144stw\", 1, {DICTIONARY_SYNONYM}, 3261},\n- {\"u\", 1, {DICTIONARY_PLACE_NAME}, 3234},\n- {\"bud\", 1, {DICTIONARY_BUILDING_TYPE}, 3145},\n+ {\"lic\", 1, {DICTIONARY_PLACE_NAME}, 3230},\n+ {\"pln zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"biblioteka narodowa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"uniw\", 1, {DICTIONARY_PLACE_NAME}, 3234},\n- {\"instytut\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"adw\", 1, {DICTIONARY_ACADEMIC_DEGREE}, 3144},\n+ {\"wiceadmiral\", 1, {DICTIONARY_PERSONAL_TITLE}, 3217},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3251},\n+ {\"adr\", 1, {DICTIONARY_SYNONYM}, 3253},\n+ {\"p\u0142n-zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n {\"wojew\u00f3dztwo\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"w\", 1, {DICTIONARY_PERSONAL_TITLE}, 3212},\n {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"wschod\", 1, {DICTIONARY_DIRECTIONAL}, 3157},\n {\"fabryka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"farmacja\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nar\", 1, {DICTIONARY_SYNONYM}, 3260},\n+ {\"instytut\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"p\u0142n-wsch\", 1, {DICTIONARY_DIRECTIONAL}, 3155},\n+ {\"wwa\", 1, {DICTIONARY_TOPONYM}, 3271},\n+ {\"os\", 1, {DICTIONARY_QUALIFIER}, 3246},\n {\"bosman\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"stary\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"pd zach\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n- {\"baon\", 1, {DICTIONARY_SYNONYM}, 3250},\n- {\"arch\", 1, {DICTIONARY_PERSONAL_TITLE}, 3164},\n- {\"hon\", 1, {DICTIONARY_PERSONAL_TITLE}, 3178},\n+ {\"st bosm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3210},\n+ {\"kardynala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3188},\n {\"kardyna\u0142a\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"admin\", 1, {DICTIONARY_SYNONYM}, 3248},\n- {\"pc\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n- {\"tte cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n- {\"estacao de onibus\", 1, {DICTIONARY_PLACE_NAME}, 3436},\n- {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n+ {\"marszalka\", 1, {DICTIONARY_PERSONAL_TITLE}, 3200},\n+ {\"gm\", 1, {DICTIONARY_QUALIFIER}, 3243},\n+ {\"w-wa\", 1, {DICTIONARY_TOPONYM}, 3271},\n+ {\"pln.-zach.\", 1, {DICTIONARY_DIRECTIONAL}, 3156},\n+ {\"p.s.p\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n+ {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n+ {\"s.a.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n+ {\"9bro\", 1, {DICTIONARY_SYNONYM}, 3529},\n {\"almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ribr.o\", 1, {DICTIONARY_SYNONYM}, 3528},\n+ {\"a.c.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n+ {\"ljs\", 1, {DICTIONARY_UNIT}, 3545},\n+ {\"cambio\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n+ {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 3339},\n {\"medico\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"azinhaga\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"b v\", 1, {DICTIONARY_PLACE_NAME}, 3422},\n- {\"bar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3321},\n- {\"inform\", 1, {DICTIONARY_SYNONYM}, 3517},\n- {\"ve\", 1, {DICTIONARY_STREET_TYPE}, 3510},\n- {\"7bro\", 1, {DICTIONARY_SYNONYM}, 3529},\n- {\"p j\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n+ {\"s.c.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"dtto\", 1, {DICTIONARY_QUALIFIER}, 3459},\n+ {\"lug\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n {\"excelentissima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"noredeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"escola basica\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n {\"futebol clube\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"diac\", 1, {DICTIONARY_PERSONAL_TITLE}, 3341},\n- {\"a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3277},\n- {\"pailhao\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n- {\"estacao de tratamento de aguas residuais\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n- {\"dom\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n- {\"em.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"transversal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"governador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"d.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n+ {\"esquerdo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n+ {\"arcebispo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.f\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n+ {\"viela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"setembro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"volta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s \/ n\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"sargento ajudante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lugar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"minist\u00e9rio\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"eng.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n- {\"rvia\", 1, {DICTIONARY_STREET_TYPE}, 3500},\n- {\"enf\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n- {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n- {\"cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n- {\"educacao\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"bpo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3322},\n- {\"policia de seguranca publica\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n- {\"presid\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n- {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 3442},\n- {\"adv.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3317},\n- {\"u.l.d.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 3315},\n+ {\"terminal rodoviario\", 1, {DICTIONARY_PLACE_NAME}, 3456},\n+ {\"c.m.\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3427},\n+ {\"s.r\", 1, {DICTIONARY_PERSONAL_TITLE}, 3407},\n+ {\"nsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"med\", 1, {DICTIONARY_PERSONAL_TITLE}, 3380},\n+ {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 3316},\n+ {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n+ {\"secretario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.r\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"castelo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s.n\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"rod\", 1, {DICTIONARY_STREET_TYPE}, 3504},\n+ {\"bv\", 1, {DICTIONARY_PLACE_NAME}, 3426},\n+ {\"lxa\", 1, {DICTIONARY_TOPONYM}, 3534},\n+ {\"junior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3320},\n+ {\"e t a r\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n+ {\"sr.ta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3411},\n+ {\"rev.da\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n+ {\"d\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n+ {\"br\", 1, {DICTIONARY_PLACE_NAME}, 3425},\n+ {\"as\", 1, {DICTIONARY_STOPWORD}, 3466},\n+ {\"ex.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n {\"ribeira\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sr.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"s.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n- {\"sociedade anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"mar\", 1, {DICTIONARY_SYNONYM}, 3521},\n- {\"beco\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"p l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n+ {\"estrada municipal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n+ {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"departamento\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"e\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},\n+ {\"edf\", 1, {DICTIONARY_BUILDING_TYPE}, 3277},\n {\"alferes\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pnte\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n- {\"c.m\", 1, {DICTIONARY_PLACE_NAME}, 3423},\n+ {\"terminal rodovi\u00e1rio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"s ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"ret\", 1, {DICTIONARY_STREET_TYPE}, 3503},\n {\"ilustrissima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3403},\n- {\"e m\", 1, {DICTIONARY_STREET_TYPE}, 3483},\n- {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n- {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n- {\"cast\", 1, {DICTIONARY_PLACE_NAME}, 3426},\n- {\"c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3282},\n- {\"riba\", 1, {DICTIONARY_SYNONYM}, 3527},\n- {\"ministerio\", 1, {DICTIONARY_PERSONAL_TITLE}, 3379},\n+ {\"ilma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"sr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3407},\n+ {\"ribeiro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sociedade em nome coletivo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"capit\u00e3o de corveta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"maj brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3371},\n- {\"imo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"camara municipal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3427},\n+ {\"bro\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3425},\n+ {\"inf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3368},\n {\"empresa p\u00fablica\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"enf\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n- {\"as\", 1, {DICTIONARY_STOPWORD}, 3462},\n- {\"b\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3421},\n+ {\"sr.tas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3412},\n+ {\"tesoureiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"p.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3387},\n {\"\u00e1\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"arc.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3320},\n- {\"e r\", 1, {DICTIONARY_STREET_TYPE}, 3485},\n- {\"a c e\", 1, {DICTIONARY_COMPANY_TYPE}, 3276},\n- {\"e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n- {\"etar\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n+ {\"c.e.b.\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n+ {\"ccnh\", 1, {DICTIONARY_STREET_TYPE}, 3481},\n+ {\"associa\u00e7\u00e3o desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"b.po\", 1, {DICTIONARY_PERSONAL_TITLE}, 3326},\n+ {\"firma individual\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n {\"sociedade fechada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"itinerario complementar\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3403},\n- {\"cam\", 1, {DICTIONARY_STREET_TYPE}, 3478},\n- {\"f.te\", 1, {DICTIONARY_PLACE_NAME}, 3439},\n- {\"das\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"escola basica\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n- {\"sub cave\", 1, {DICTIONARY_UNIT}, -1},\n- {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"o.s.c.i.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n+ {\"zn\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3465},\n+ {\"e.i.r.e.l.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n+ {\"vigario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3493},\n+ {\"s lda\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"fundacao privada\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n+ {\"policia de seguranca publica\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n+ {\"monsenhor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"r\u00e9s do ch\u00e3o\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3306},\n+ {\"sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"estr n\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n+ {\"loteam\", 1, {DICTIONARY_UNIT}, 3548},\n+ {\"mstra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n+ {\"c d\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n+ {\"10br.o\", 1, {DICTIONARY_SYNONYM}, 3518},\n {\"cacique\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"revmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3398},\n {\"infante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"liberdade\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"govdor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n- {\"sem\", 1, {DICTIONARY_PLACE_NAME}, 3453},\n {\"vila\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bispo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"btl\", 1, {DICTIONARY_UNIT}, 3532},\n- {\"exm\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n {\"avenida marginal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"enf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n+ {\"s.rs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3408},\n+ {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n {\"urbanizacao\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"caminho\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cdessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3334},\n- {\"mte\", 1, {DICTIONARY_SYNONYM}, 3523},\n- {\"s.n.\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"c.e.b\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n- {\"caclcadinha\", 1, {DICTIONARY_STREET_TYPE}, 3477},\n- {\"trav\", 1, {DICTIONARY_STREET_TYPE}, 3506},\n- {\"sto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n- {\"trv\", 1, {DICTIONARY_STREET_TYPE}, 3506},\n- {\"em\", 1, {DICTIONARY_STREET_TYPE}, 3483},\n+ {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n+ {\"dq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3351},\n+ {\"advo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3321},\n+ {\"n\u00aa\", 1, {DICTIONARY_STOPWORD}, 3471},\n+ {\"itinerario principal\", 1, {DICTIONARY_STREET_TYPE}, 3492},\n+ {\"part\", 1, {DICTIONARY_STREET_TYPE}, 3496},\n+ {\"vigo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3418},\n+ {\"res\", 1, {DICTIONARY_UNIT}, 3552},\n+ {\"ex\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n+ {\"enf.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n {\"batalhao\", 1, {DICTIONARY_UNIT}, -1},\n- {\"duque\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"8.bro\", 1, {DICTIONARY_SYNONYM}, 3526},\n- {\"empresa publica\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n- {\"s.g.p.s\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n+ {\"capitao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n+ {\"c alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3341},\n+ {\"rc\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n+ {\"alameda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"no\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"eng.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n- {\"sf\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n- {\"e t a r\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n- {\"sr.ta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3407},\n- {\"mnte\", 1, {DICTIONARY_SYNONYM}, 3523},\n- {\"estrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lexa\", 1, {DICTIONARY_TOPONYM}, 3530},\n- {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"calcada\", 1, {DICTIONARY_STREET_TYPE}, 3476},\n+ {\"bo\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3425},\n+ {\"c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 3286},\n+ {\"autoestrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"res do chao\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"escnh\", 1, {DICTIONARY_UNIT}, 3541},\n+ {\"irm\u00e3\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"retorno\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"r c\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"ad\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n {\"sociedade an\u00f3nima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 3308},\n+ {\"frei\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"e.i.r.e.l.i\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n {\"bairro\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"c e b\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n+ {\"g n r\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n+ {\"sociedade gestora de participacoes socials\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"8b.ro\", 1, {DICTIONARY_SYNONYM}, 3530},\n+ {\"enfa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"pct\", 1, {DICTIONARY_STREET_TYPE}, 3499},\n+ {\"arq.o\", 1, {DICTIONARY_PLACE_NAME}, 3424},\n {\"filho\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"eng.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n+ {\"u.l.d.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3309},\n+ {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 3515},\n {\"pol\u00edcia judici\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"baronesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"diacona\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"funda\u00e7\u00e3o p\u00fablica\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n- {\"associacao desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 3277},\n {\"para\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"jardim\", 1, {DICTIONARY_UNIT}, -1},\n- {\"s.a.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n- {\"camara municipal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3423},\n- {\"inf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3364},\n- {\"r\", 1, {DICTIONARY_STOPWORD}, 3469},\n- {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3286},\n+ {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 3308},\n+ {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n+ {\"m.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n {\"informacao\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ao\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ruinas\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n- {\"n.s.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 3454},\n+ {\"perto\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ministerio\", 1, {DICTIONARY_PERSONAL_TITLE}, 3383},\n+ {\"g.al\", 1, {DICTIONARY_PERSONAL_TITLE}, 3364},\n+ {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3394},\n+ {\"liberdade\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"outubro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"esta\u00e7\u00e3o de camionagem\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ago\", 1, {DICTIONARY_SYNONYM}, 3513},\n+ {\"da\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n {\"madre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"brg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3323},\n- {\"nmro\", 1, {DICTIONARY_UNIT}, 3543},\n- {\"p.j.\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n- {\"companhia anonima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"q\", 1, {DICTIONARY_QUALIFIER}, 3457},\n- {\"s c p\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n- {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3370},\n- {\"emb\", 1, {DICTIONARY_PERSONAL_TITLE}, 3349},\n- {\"fundacao privada\", 1, {DICTIONARY_COMPANY_TYPE}, 3286},\n- {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n- {\"ex.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3308},\n+ {\"n e\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n+ {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n+ {\"p.j\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n+ {\"associa\u00e7\u00e3o em sentido estrito\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n+ {\"ribra\", 1, {DICTIONARY_SYNONYM}, 3531},\n+ {\"im\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n+ {\"s n\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"n.s.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"noredeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"revdo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n+ {\"b\u00ba\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3425},\n {\"doutor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"pe\", 1, {DICTIONARY_PERSONAL_TITLE}, 3383},\n- {\"tesoureiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"monsenhor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3310},\n- {\"policia judiciaria\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n+ {\"en\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n+ {\"mta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n+ {\"autoestr\", 1, {DICTIONARY_STREET_TYPE}, 3475},\n+ {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n+ {\"pllc\", 1, {DICTIONARY_COMPANY_TYPE}, 3307},\n+ {\"qta\", 1, {DICTIONARY_STREET_TYPE}, 3502},\n+ {\"exm\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n+ {\"minist\u00e9rio\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3313},\n+ {\"ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n {\"em\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"oeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"cap m g\", 1, {DICTIONARY_PERSONAL_TITLE}, 3328},\n- {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n- {\"enga\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3311},\n+ {\"estacao rodoviaria\", 1, {DICTIONARY_PLACE_NAME}, 3442},\n+ {\"estrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"maestro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"lj\", 1, {DICTIONARY_UNIT}, 3540},\n- {\"fr\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, 3359},\n- {\"jan\", 1, {DICTIONARY_SYNONYM}, 3518},\n- {\"n sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"ep\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n+ {\"sto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n+ {\"sgps\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n+ {\"visconde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"senhor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"10br.o\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n- {\"s.c.s\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n- {\"pont\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n- {\"bv\", 1, {DICTIONARY_PLACE_NAME}, 3422},\n- {\"dtto\", 1, {DICTIONARY_QUALIFIER}, 3455},\n- {\"ret\", 1, {DICTIONARY_STREET_TYPE}, 3499},\n+ {\"empresa publica\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n+ {\"mtra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n+ {\"jrd\", 1, {DICTIONARY_UNIT}, 3543},\n+ {\"s.g.p.s\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n+ {\"pref\", 1, {DICTIONARY_PERSONAL_TITLE}, 3389},\n {\"lisboa\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"associa\u00e7\u00e3o em sentido estrito\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"auto estrada\", 1, {DICTIONARY_STREET_TYPE}, 3471},\n- {\"no\", 1, {DICTIONARY_UNIT}, 3543},\n+ {\"s\/n\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"c. m.\", 1, {DICTIONARY_STREET_TYPE}, 3427},\n+ {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n+ {\"psp\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3407},\n {\"junta\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"castelo\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"b.o\", 1, {DICTIONARY_PLACE_NAME}, 3421},\n- {\"cde\", 1, {DICTIONARY_PERSONAL_TITLE}, 3333},\n+ {\"p.te\", 1, {DICTIONARY_PLACE_NAME}, 3452},\n+ {\"crl\", 1, {DICTIONARY_COMPANY_TYPE}, 3286},\n+ {\"capitao de mar e guerra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n+ {\"trv\", 1, {DICTIONARY_STREET_TYPE}, 3510},\n {\"senhorita\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"c.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n+ {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n {\"presidente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p.s.p\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n- {\"andar\", 1, {DICTIONARY_UNIT}, -1},\n- {\"n\u00aa s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"organizacao da sociedade civil de interesse publico\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n- {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n- {\"pcta\", 1, {DICTIONARY_STREET_TYPE}, 3495},\n- {\"ip\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n- {\"tenente coronel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"slj\", 1, {DICTIONARY_UNIT}, 3549},\n- {\"terreiro\", 1, {DICTIONARY_UNIT}, -1},\n- {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n- {\"alf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3318},\n+ {\"sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"sargto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3402},\n+ {\"t.te\", 1, {DICTIONARY_PERSONAL_TITLE}, 3413},\n+ {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n+ {\"capitao de corveta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3330},\n {\"senhoras\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sociedade por acoes\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"edif\", 1, {DICTIONARY_BUILDING_TYPE}, 3273},\n- {\"mar\u00e7o\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"eng\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n- {\"sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"e p\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3470},\n- {\"c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n- {\"escola\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"r\u00e9sdoch\u00e3o\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n- {\"pte\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n- {\"jan.ro\", 1, {DICTIONARY_SYNONYM}, 3518},\n- {\"estr r\", 1, {DICTIONARY_STREET_TYPE}, 3485},\n- {\"lote\", 1, {DICTIONARY_UNIT}, -1},\n- {\"im\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n+ {\"ponto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ciclo do ensino basico\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n+ {\"vice almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"pe\", 1, {DICTIONARY_PERSONAL_TITLE}, 3387},\n+ {\"cm\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3427},\n+ {\"arq\", 1, {DICTIONARY_PLACE_NAME}, 3424},\n+ {\"n\u00aas\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"dezb.ro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"c\u00e2mara municipal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"s.o\", 1, {DICTIONARY_DIRECTIONAL}, 3316},\n+ {\"diaca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3346},\n+ {\"n.s.a.\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"gal\", 1, {DICTIONARY_PERSONAL_TITLE}, 3364},\n+ {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n+ {\"8bro\", 1, {DICTIONARY_SYNONYM}, 3530},\n+ {\"d\", 1, {DICTIONARY_PERSONAL_TITLE}, 3347},\n+ {\"p\u00e7\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n+ {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 3476},\n+ {\"secr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n+ {\"csl\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n+ {\"educ\", 1, {DICTIONARY_SYNONYM}, 3519},\n {\"companhia\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"revma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3393},\n- {\"il.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n- {\"cv\", 1, {DICTIONARY_UNIT}, 3533},\n- {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n- {\"tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"m.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n- {\"agencia bancaria\", 1, {DICTIONARY_PLACE_NAME}, 3418},\n- {\"comend\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n- {\"gal\", 1, {DICTIONARY_PLACE_NAME}, 3440},\n- {\"ave marg\", 1, {DICTIONARY_STREET_TYPE}, 3473},\n- {\"scs\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n- {\"9b.ro\", 1, {DICTIONARY_SYNONYM}, 3525},\n- {\"im\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"liberd.e\", 1, {DICTIONARY_SYNONYM}, 3528},\n+ {\"arqo\", 1, {DICTIONARY_PLACE_NAME}, 3424},\n+ {\"irma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n+ {\"prof\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n+ {\"sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"cave\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"jul\", 1, {DICTIONARY_SYNONYM}, 3524},\n+ {\"s.g.p.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n {\"sobre\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"bloco\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n {\"rampa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"e.i.r.e.l.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n- {\"rdv\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n- {\"e.b\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n- {\"m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n- {\"n.a\", 1, {DICTIONARY_STOPWORD}, 3467},\n- {\"urb\", 1, {DICTIONARY_QUALIFIER}, 3460},\n- {\"secr.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n- {\"cap ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n- {\"e i\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n- {\"sociedade por quotas limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"habita\u00e7\u00e3o\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"enf.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"arco\", 1, {DICTIONARY_PERSONAL_TITLE}, 3324},\n+ {\"s.q\", 1, {DICTIONARY_QUALIFIER}, 3463},\n+ {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 3334},\n+ {\"s.a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n+ {\"e.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n+ {\"policia judiciaria\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n+ {\"calcada\", 1, {DICTIONARY_STREET_TYPE}, 3480},\n+ {\"educacao\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"diac\", 1, {DICTIONARY_PERSONAL_TITLE}, 3345},\n {\"viaduto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"capitao de corveta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3326},\n+ {\"exmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n {\"mestre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"qt\", 1, {DICTIONARY_UNIT}, 3546},\n- {\"bco\", 1, {DICTIONARY_STREET_TYPE}, 3475},\n- {\"janero\", 1, {DICTIONARY_SYNONYM}, 3518},\n- {\"p\u00e1tio\", 1, {DICTIONARY_UNIT}, -1},\n- {\"estrada municipal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"f.o\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3319},\n+ {\"conselheiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3364},\n {\"sociedade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"estrada nacional\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"jd\", 1, {DICTIONARY_UNIT}, 3539},\n- {\"er\", 1, {DICTIONARY_STREET_TYPE}, 3485},\n- {\"esta\u00e7\u00e3o de autocarros\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n- {\"o.n.g\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n- {\"psp\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n- {\"ong\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n- {\"qu\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n- {\"pra\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s.c.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n- {\"rev.do\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n- {\"st\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n- {\"marques\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n+ {\"n\u00famero\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"im\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n+ {\"s l\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"prof.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n+ {\"novembro\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"ilustrissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"nosso senhor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"av\", 1, {DICTIONARY_STREET_TYPE}, 3476},\n+ {\"ten c.el\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n+ {\"srtas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3412},\n+ {\"lg\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n+ {\"sociedade anonima desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n+ {\"enf.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"gnr\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n {\"sociedade em conta de participacao\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"reverendissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ex.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n+ {\"proj\", 1, {DICTIONARY_STREET_TYPE}, 3500},\n+ {\"az\", 1, {DICTIONARY_STREET_TYPE}, 3478},\n {\"ruela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lex.a\", 1, {DICTIONARY_TOPONYM}, 3530},\n- {\"estacao de autocarros\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n- {\"camno\", 1, {DICTIONARY_STREET_TYPE}, 3478},\n- {\"sargto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3398},\n- {\"alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3319},\n- {\"8b.ro\", 1, {DICTIONARY_SYNONYM}, 3526},\n+ {\"s \/ a\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n+ {\"n\u00aa s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"pnto\", 1, {DICTIONARY_STREET_TYPE}, 3497},\n+ {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 3379},\n+ {\"il.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3367},\n+ {\"st\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n {\"capit\u00e3o tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3379},\n+ {\"deptos\", 1, {DICTIONARY_UNIT}, 3539},\n+ {\"p s p\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n {\"irm\u00e3o\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n- {\"des.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3340},\n- {\"patio\", 1, {DICTIONARY_UNIT}, 3545},\n+ {\"cv\", 1, {DICTIONARY_UNIT}, 3537},\n+ {\"st.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n+ {\"ceb\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n {\"fevereiro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"n\u00famero\", 1, {DICTIONARY_UNIT}, -1},\n- {\"lx.a\", 1, {DICTIONARY_TOPONYM}, 3530},\n- {\"estr m\", 1, {DICTIONARY_STREET_TYPE}, 3483},\n- {\"s.a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n- {\"c a\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n+ {\"mqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3378},\n {\"advogado\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sarg aj.te\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n- {\"il.m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n+ {\"pct\u00aa\", 1, {DICTIONARY_STREET_TYPE}, 3499},\n {\"b\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"8bro\", 1, {DICTIONARY_SYNONYM}, 3526},\n- {\"cal\u00e7adinha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"8br.o\", 1, {DICTIONARY_SYNONYM}, 3530},\n+ {\"tenente coronel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"norte\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"vivenda\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"rpart\", 1, {DICTIONARY_STREET_TYPE}, 3503},\n- {\"p\u00e7\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n+ {\"superquadra\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n {\"companhia de responsabilidao limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"d.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n+ {\"nr\u00ba\", 1, {DICTIONARY_UNIT}, 3547},\n {\"cambista\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n\", 1, {DICTIONARY_UNIT}, 3543},\n {\"pavilh\u00e3o\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"exma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"cap corv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3330},\n+ {\"tr\", 1, {DICTIONARY_BUILDING_TYPE}, 3278},\n+ {\"em.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n {\"capit\u00e3o de fragata\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s e\", 1, {DICTIONARY_DIRECTIONAL}, 3311},\n+ {\"comend\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n {\"estrada regional\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"secra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n- {\"s.r\", 1, {DICTIONARY_PERSONAL_TITLE}, 3403},\n+ {\"pca\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n {\"frente\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"s.g.p.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n- {\"s o\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n- {\"res-do-chao\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"irmao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n- {\"nsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3316},\n- {\"dist\", 1, {DICTIONARY_QUALIFIER}, 3455},\n- {\"s limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"e\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},\n+ {\"dom\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"enf\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"maj brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3375},\n+ {\"cmdr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n {\"esta\u00e7\u00e3o\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"estacao rodoviaria\", 1, {DICTIONARY_PLACE_NAME}, 3438},\n- {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n- {\"dqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n- {\"l\", 1, {DICTIONARY_STREET_TYPE}, 3489},\n- {\"junior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3316},\n- {\"d\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n- {\"marqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3374},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3387},\n- {\"retorno\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"urb\", 1, {DICTIONARY_QUALIFIER}, 3464},\n+ {\"bpo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3326},\n+ {\"b.o\", 1, {DICTIONARY_PLACE_NAME}, 3425},\n+ {\"n sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"s.c.s\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"u.l.d.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3309},\n+ {\"n.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n {\"contra almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sociedade gestora de participacoes socials\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"7.bro\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"s.f.\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n+ {\"sociedade anonima\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n {\"do\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"dto\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3479},\n- {\"cap corv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3326},\n+ {\"mar\", 1, {DICTIONARY_SYNONYM}, 3525},\n {\"padre\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"edf\", 1, {DICTIONARY_BUILDING_TYPE}, 3273},\n- {\"ljs\", 1, {DICTIONARY_UNIT}, 3541},\n- {\"mto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n- {\"s l\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"s.q.\", 1, {DICTIONARY_QUALIFIER}, 3463},\n+ {\"secra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3404},\n {\"clube desportivo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"numero\", 1, {DICTIONARY_UNIT}, 3543},\n+ {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3379},\n+ {\"pnte\", 1, {DICTIONARY_PLACE_NAME}, 3452},\n {\"reverenda\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bo\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3421},\n- {\"desa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3340},\n- {\"7b.ro\", 1, {DICTIONARY_SYNONYM}, 3529},\n- {\"ilma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n+ {\"e m\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n+ {\"i c\", 1, {DICTIONARY_STREET_TYPE}, 3491},\n {\"esta\u00e7\u00e3o ferrovi\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ponto\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lt.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n- {\"c\u00e2mara municipal\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n- {\"vice almirante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"esta\u00e7\u00e3o rodovi\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"habita\u00e7\u00e3o\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"s.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3308},\n+ {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 3315},\n+ {\"c.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3286},\n+ {\"edif\", 1, {DICTIONARY_BUILDING_TYPE}, 3277},\n+ {\"empresa individual de responsabilidade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"marques\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n+ {\"sec\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n+ {\"imo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3370},\n+ {\"capitao de fragata\", 1, {DICTIONARY_PERSONAL_TITLE}, 3331},\n+ {\"mte\", 1, {DICTIONARY_SYNONYM}, 3527},\n {\"sul\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"departamentos\", 1, {DICTIONARY_UNIT}, -1},\n- {\"conselheiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"p.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3383},\n- {\"s l.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"astrada marginal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ex.m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n- {\"sem numero\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"depto\", 1, {DICTIONARY_UNIT}, 3534},\n- {\"s.ras\", 1, {DICTIONARY_PERSONAL_TITLE}, 3406},\n- {\"firma individual\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n- {\"div\", 1, {DICTIONARY_QUALIFIER}, 3456},\n- {\"ex.m\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n- {\"vv\", 1, {DICTIONARY_BUILDING_TYPE}, 3275},\n- {\"e.b.\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n- {\"zn\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3461},\n- {\"av marg\", 1, {DICTIONARY_STREET_TYPE}, 3473},\n+ {\"enf\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"mestra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 3315},\n+ {\"riba\", 1, {DICTIONARY_SYNONYM}, 3531},\n+ {\"arc.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3324},\n+ {\"em\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n+ {\"e.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n+ {\"fte\", 1, {DICTIONARY_PLACE_NAME}, 3443},\n+ {\"cd\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3317},\n+ {\"hab\", 1, {DICTIONARY_UNIT}, 3542},\n {\"desembargador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"revda\", 1, {DICTIONARY_PERSONAL_TITLE}, 3391},\n+ {\"des.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n+ {\"s.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n {\"quarto\", 1, {DICTIONARY_UNIT}, -1},\n {\"sitio\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ciclo do ensino b\u00e1sico\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ceb\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n- {\"s lda\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n {\"distrito\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"r\u00e9s do ch\u00e3o\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n- {\"a d\", 1, {DICTIONARY_COMPANY_TYPE}, 3277},\n- {\"ciclo do ensino basico\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n- {\"mstra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3368},\n+ {\"auto estrada\", 1, {DICTIONARY_STREET_TYPE}, 3475},\n+ {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 3453},\n+ {\"pcta\", 1, {DICTIONARY_STREET_TYPE}, 3499},\n {\"tunel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"8br.o\", 1, {DICTIONARY_SYNONYM}, 3526},\n- {\"c.e.b.\", 1, {DICTIONARY_PLACE_NAME}, 3428},\n+ {\"atras\", 1, {DICTIONARY_STOPWORD}, 3468},\n+ {\"pc\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n+ {\"transv\", 1, {DICTIONARY_STREET_TYPE}, 3509},\n+ {\"o.s.c.i.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"lugar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ima\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n {\"senhoritas\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"esta\u00e7\u00e3o de \u00f4nibus\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"condominio\", 1, {DICTIONARY_UNIT}, -1},\n- {\"p\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n- {\"excelencia\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"secretario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.rs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3404},\n- {\"ca\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n- {\"dq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3347},\n- {\"advo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3317},\n- {\"em.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3351},\n- {\"n\u00aa\", 1, {DICTIONARY_STOPWORD}, 3467},\n- {\"v.dessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3416},\n- {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n- {\"cap mg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3328},\n- {\"rev.da\", 1, {DICTIONARY_PERSONAL_TITLE}, 3391},\n+ {\"sr.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"e b\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n+ {\"e i\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n+ {\"lda\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n+ {\"o.n.g.\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n+ {\"enf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"organizacao nao governamental\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n+ {\"liberde\", 1, {DICTIONARY_SYNONYM}, 3528},\n+ {\"mai\", 1, {DICTIONARY_SYNONYM}, 3526},\n+ {\"cdessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3338},\n+ {\"sociedade em comandita simples\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"r\", 1, {DICTIONARY_STREET_TYPE}, 3506},\n+ {\"s.n.\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"abril\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"r.o\", 1, {DICTIONARY_SYNONYM}, 3532},\n+ {\"trav\", 1, {DICTIONARY_STREET_TYPE}, 3510},\n {\"seminario\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"pto\", 1, {DICTIONARY_STREET_TYPE}, 3497},\n {\"limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"enf.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n- {\"nosso\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"esc\", 1, {DICTIONARY_UNIT}, 3536},\n- {\"eng.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n- {\"ver\", 1, {DICTIONARY_PERSONAL_TITLE}, 3412},\n- {\"f.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n- {\"des\", 1, {DICTIONARY_PERSONAL_TITLE}, 3339},\n- {\"pnto\", 1, {DICTIONARY_STREET_TYPE}, 3493},\n- {\"bombeiros voluntarios\", 1, {DICTIONARY_PLACE_NAME}, 3422},\n- {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3384},\n- {\"oscip\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n- {\"r\", 1, {DICTIONARY_STREET_TYPE}, 3502},\n- {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ic\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n+ {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n+ {\"st.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n+ {\"com\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ribr.a\", 1, {DICTIONARY_SYNONYM}, 3531},\n+ {\"s a r l\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n+ {\"e.b\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n+ {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n+ {\"ava\", 1, {DICTIONARY_STREET_TYPE}, 3476},\n+ {\"pte\", 1, {DICTIONARY_PLACE_NAME}, 3452},\n {\"r\u00e9s-do-ch\u00e3o\", 1, {DICTIONARY_UNIT}, -1},\n- {\"bl\", 1, {DICTIONARY_BUILDING_TYPE}, 3272},\n- {\"escnh\", 1, {DICTIONARY_UNIT}, 3537},\n- {\"estr marg\", 1, {DICTIONARY_STREET_TYPE}, 3482},\n+ {\"ei\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n+ {\"fr\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, 3363},\n+ {\"sec\", 1, {DICTIONARY_QUALIFIER}, 3462},\n+ {\"dist\", 1, {DICTIONARY_QUALIFIER}, 3459},\n+ {\"s lt.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"p.s.p.\", 1, {DICTIONARY_PLACE_NAME}, 3450},\n {\"guarda nacional republicana\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"r c\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"mnt\", 1, {DICTIONARY_SYNONYM}, 3523},\n- {\"ilmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3363},\n- {\"auto estr\", 1, {DICTIONARY_STREET_TYPE}, 3471},\n- {\"s.q.\", 1, {DICTIONARY_QUALIFIER}, 3459},\n- {\"prq\", 1, {DICTIONARY_PLACE_NAME}, 3444},\n+ {\"e.t.a.r\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n+ {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n+ {\"instituto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"secretaria\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"professores\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"g.al\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n- {\"cc\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n+ {\"s.c.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n+ {\"c e b\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n+ {\"v.de\", 1, {DICTIONARY_PERSONAL_TITLE}, 3419},\n+ {\"sarg ajte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3403},\n+ {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 3310},\n {\"sociedade an\u00f3nima de responsabilidade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"em ft de\", 1, {DICTIONARY_STOPWORD}, 3466},\n- {\"enfa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n- {\"largo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sgto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3398},\n- {\"arq.o\", 1, {DICTIONARY_PLACE_NAME}, 3420},\n+ {\"jan\", 1, {DICTIONARY_SYNONYM}, 3522},\n+ {\"sarl\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n+ {\"inf\", 1, {DICTIONARY_SYNONYM}, 3521},\n+ {\"dep\", 1, {DICTIONARY_UNIT}, 3538},\n+ {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3335},\n {\"comendador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vl\", 1, {DICTIONARY_STREET_TYPE}, 3511},\n- {\"e.i\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n- {\"secao\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3402},\n- {\"gnr\", 1, {DICTIONARY_PLACE_NAME}, 3441},\n+ {\"sl\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"scp\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"ltda\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n+ {\"associacao desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n {\"deputado\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"duquesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"c.r.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3282},\n {\"quadra\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"beco\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"zona\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n+ {\"visc\", 1, {DICTIONARY_PERSONAL_TITLE}, 3419},\n+ {\"a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n+ {\"ex.m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n+ {\"rodoviaria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"dez.bro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"ago\", 1, {DICTIONARY_SYNONYM}, 3517},\n+ {\"escola\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"brg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3327},\n+ {\"nmro\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"r \/ c\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"edificio\", 1, {DICTIONARY_BUILDING_TYPE}, 3277},\n+ {\"s\u00e3o\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"q\", 1, {DICTIONARY_QUALIFIER}, 3461},\n+ {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3374},\n+ {\"s.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3316},\n+ {\"major brigadeiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rodovia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"maio\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"rua particular\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"janr.o\", 1, {DICTIONARY_SYNONYM}, 3522},\n+ {\"nro\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"lojas\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n+ {\"exa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n+ {\"os\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"vereador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"il.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"sociedade simples\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3314},\n+ {\"dez\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"via\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"lt\", 1, {DICTIONARY_UNIT}, 3546},\n {\"itiner\u00e1rio complementar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"govd.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n- {\"zona\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, -1},\n- {\"t.te c.el\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n- {\"m.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n- {\"sarl\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n- {\"rdvia\", 1, {DICTIONARY_STREET_TYPE}, 3500},\n- {\"abr\", 1, {DICTIONARY_SYNONYM}, 3512},\n- {\"rodoviaria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"fte\", 1, {DICTIONARY_PLACE_NAME}, 3439},\n- {\"p s p\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n- {\"da\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n- {\"il.m\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3363},\n- {\"s.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n- {\"s.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"sociedade em comandita simples\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3378},\n- {\"a.c.e.\", 1, {DICTIONARY_COMPANY_TYPE}, 3276},\n- {\"cave\", 1, {DICTIONARY_UNIT}, -1},\n- {\"nr\u00ba\", 1, {DICTIONARY_UNIT}, 3543},\n- {\"n.s.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"comor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n- {\"aos\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"cor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n- {\"rodovia\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rev.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3393},\n- {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3325},\n- {\"rua particular\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"apartamento\", 1, {DICTIONARY_UNIT}, -1},\n- {\"vd\", 1, {DICTIONARY_STREET_TYPE}, 3509},\n- {\"qd\", 1, {DICTIONARY_QUALIFIER}, 3457},\n- {\"lojas\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"s n c\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n- {\"ne\", 1, {DICTIONARY_DIRECTIONAL}, 3308},\n- {\"p.l.l.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n- {\"os\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"e n\", 1, {DICTIONARY_STREET_TYPE}, 3484},\n- {\"d.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3346},\n- {\"sq\", 1, {DICTIONARY_QUALIFIER}, 3459},\n- {\"sociedade simples\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"no\", 1, {DICTIONARY_DIRECTIONAL}, 3309},\n- {\"ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n- {\"abril\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"via\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"resdochao\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"associa\u00e7\u00e3o desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3307},\n+ {\"atr\u00e1s\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"enga\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n {\"condessa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 3308},\n- {\"vigario\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"esta\u00e7\u00e3o de comboios\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"escadas\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"er\", 1, {DICTIONARY_STREET_TYPE}, 3489},\n+ {\"pto\", 1, {DICTIONARY_UNIT}, 3549},\n {\"r\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"st.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n- {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 3454},\n- {\"mtra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3368},\n+ {\"n.a\", 1, {DICTIONARY_STOPWORD}, 3471},\n+ {\"p.j.\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n+ {\"janro\", 1, {DICTIONARY_SYNONYM}, 3522},\n {\"um\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"c. m.\", 1, {DICTIONARY_STREET_TYPE}, 3423},\n+ {\"gov.dor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n {\"rio\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"apto\", 1, {DICTIONARY_UNIT}, 3531},\n+ {\"pont\", 1, {DICTIONARY_PLACE_NAME}, 3452},\n+ {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3313},\n {\"ponte\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s\/n\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"estacao de camionagem\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n+ {\"emmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n+ {\"abr\", 1, {DICTIONARY_SYNONYM}, 3516},\n+ {\"avenida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"s lt.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"ex.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"secao\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3512},\n {\"debaixo\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"apt\", 1, {DICTIONARY_UNIT}, 3531},\n- {\"pda\", 1, {DICTIONARY_STREET_TYPE}, 3491},\n+ {\"desa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3344},\n+ {\"set\", 1, {DICTIONARY_SYNONYM}, 3533},\n+ {\"ulda\", 1, {DICTIONARY_COMPANY_TYPE}, 3309},\n {\"organiza\u00e7\u00e3o nao governamental\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"se\", 1, {DICTIONARY_DIRECTIONAL}, 3311},\n- {\"e.t.a.r\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n {\"marquesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n- {\"c.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3279},\n+ {\"9.bro\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"rev.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3398},\n {\"ruas\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"proj\", 1, {DICTIONARY_STREET_TYPE}, 3496},\n- {\"cc\", 1, {DICTIONARY_STREET_TYPE}, 3476},\n- {\"en\", 1, {DICTIONARY_STREET_TYPE}, 3484},\n+ {\"museu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"10b.ro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3313},\n+ {\"mto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n+ {\"deps\", 1, {DICTIONARY_UNIT}, 3539},\n+ {\"sobre loja\", 1, {DICTIONARY_UNIT}, -1},\n {\"na\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"outubro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"t.te\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n- {\"estacao de comboios\", 1, {DICTIONARY_PLACE_NAME}, 3434},\n+ {\"capitao tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, 3333},\n+ {\"ip\", 1, {DICTIONARY_STREET_TYPE}, 3492},\n+ {\"sgto\", 1, {DICTIONARY_PERSONAL_TITLE}, 3402},\n {\"\u00e1s\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ft\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3486},\n- {\"n s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n- {\"parq\", 1, {DICTIONARY_PLACE_NAME}, 3444},\n+ {\"s c\", 1, {DICTIONARY_COMPANY_TYPE}, 3308},\n+ {\"alf\", 1, {DICTIONARY_PERSONAL_TITLE}, 3322},\n+ {\"jun\", 1, {DICTIONARY_SYNONYM}, 3523},\n+ {\"jard\", 1, {DICTIONARY_UNIT}, 3543},\n+ {\"o.s.c.i.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n {\"marechal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"o\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},\n- {\"s q\", 1, {DICTIONARY_QUALIFIER}, 3459},\n- {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 3380},\n- {\"fev\", 1, {DICTIONARY_SYNONYM}, 3516},\n- {\"atras\", 1, {DICTIONARY_STOPWORD}, 3464},\n- {\"n\u00aas\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"r part\", 1, {DICTIONARY_STREET_TYPE}, 3503},\n- {\"dezb.ro\", 1, {DICTIONARY_SYNONYM}, 3514},\n+ {\"andar\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"ilm\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n+ {\"urbanizacao\", 1, {DICTIONARY_QUALIFIER}, 3464},\n+ {\"n.\u00aa\", 1, {DICTIONARY_STOPWORD}, 3471},\n+ {\"vig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3418},\n+ {\"engo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3359},\n+ {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3306},\n+ {\"e p\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n+ {\"n\", 1, {DICTIONARY_STOPWORD}, 3472},\n+ {\"s a d\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n+ {\"c.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n+ {\"ex.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n+ {\"estrada nacional\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"r\u00e9sdoch\u00e3o\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3327},\n+ {\"d.r\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"sem\", 1, {DICTIONARY_PLACE_NAME}, 3457},\n+ {\"eng.\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3359},\n+ {\"emb\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n+ {\"comandante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"comor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n+ {\"c.c.\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n+ {\"associacao em sentido estrito\", 1, {DICTIONARY_COMPANY_TYPE}, 3282},\n+ {\"marq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n+ {\"nos\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"gal\", 1, {DICTIONARY_PLACE_NAME}, 3444},\n+ {\"res-do-chao\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"scs\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"rodoanel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"astrada marginal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cam\", 1, {DICTIONARY_STREET_TYPE}, 3482},\n+ {\"prof.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n+ {\"p.l.l.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3307},\n+ {\"rdv\", 1, {DICTIONARY_PLACE_NAME}, 3454},\n+ {\"exma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n+ {\"vdessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3420},\n+ {\"bombeiros voluntarios\", 1, {DICTIONARY_PLACE_NAME}, 3426},\n+ {\"secr.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3404},\n+ {\"n.e.\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n+ {\"7br.o\", 1, {DICTIONARY_SYNONYM}, 3533},\n+ {\"este\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"enfo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"sociedade por quotas limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"ao\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ribro\", 1, {DICTIONARY_SYNONYM}, 3532},\n+ {\"bco\", 1, {DICTIONARY_STREET_TYPE}, 3479},\n+ {\"esta\u00e7\u00e3o de comboios\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"arquitecto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"o s c i p\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"c c\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n+ {\"jd\", 1, {DICTIONARY_UNIT}, 3543},\n+ {\"pol\u00edcia de seguran\u00e7a p\u00fablica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"dela\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ribo\", 1, {DICTIONARY_SYNONYM}, 3528},\n- {\"9bro\", 1, {DICTIONARY_SYNONYM}, 3525},\n- {\"ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n- {\"vigo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n- {\"fc\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n- {\"cia\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n- {\"nosso senhor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sl\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n- {\"profa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3388},\n- {\"sr.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n- {\"vig.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n- {\"pto\", 1, {DICTIONARY_UNIT}, 3545},\n- {\"liberd.e\", 1, {DICTIONARY_SYNONYM}, 3524},\n- {\"comandante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"arqo\", 1, {DICTIONARY_PLACE_NAME}, 3420},\n- {\"irma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n- {\"tv\", 1, {DICTIONARY_STREET_TYPE}, 3506},\n- {\"10.bro\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"nos\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pref\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n- {\"lg\", 1, {DICTIONARY_STREET_TYPE}, 3489},\n- {\"empresa individual de responsabilidade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"rodoanel\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ass\", 1, {DICTIONARY_PLACE_NAME}, 3419},\n- {\"dra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3346},\n- {\"cac\", 1, {DICTIONARY_PERSONAL_TITLE}, 3324},\n- {\"pca\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n- {\"eng\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n- {\"pllc\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n- {\"dep\", 1, {DICTIONARY_PERSONAL_TITLE}, 3338},\n- {\"s a r l\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n- {\"enf.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n- {\"s.q\", 1, {DICTIONARY_QUALIFIER}, 3459},\n- {\"estacao ferroviaria\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n- {\"s.a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n- {\"e.i.\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n- {\"s f\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n- {\"esq\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3480},\n- {\"l.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n- {\"este\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ns\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n- {\"organizacao nao governamental\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n- {\"cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n- {\"o n g\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n- {\"arquitecto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jun\", 1, {DICTIONARY_SYNONYM}, 3519},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n- {\"eireli\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n- {\"u l d a\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n- {\"pol\u00edcia de seguran\u00e7a p\u00fablica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"emmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3351},\n- {\"s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"prof.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3388},\n- {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n- {\"enf.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n- {\"dep\", 1, {DICTIONARY_UNIT}, 3534},\n- {\"dr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3346},\n+ {\"santa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sarg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3402},\n+ {\"c.m\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n+ {\"o.n.g\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n+ {\"estr marg\", 1, {DICTIONARY_STREET_TYPE}, 3486},\n {\"monte\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"av\", 1, {DICTIONARY_STREET_TYPE}, 3472},\n- {\"ten c.el\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n- {\"s.a.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n- {\"enf.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n- {\"sad\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"c\u00e2mbio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"rev.do\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n+ {\"prolng\", 1, {DICTIONARY_STREET_TYPE}, 3501},\n {\"rotunda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sobre loja\", 1, {DICTIONARY_UNIT}, -1},\n- {\"esquerdo\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"viela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"rc\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"estacao de comboios\", 1, {DICTIONARY_PLACE_NAME}, 3438},\n+ {\"ema\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n+ {\"lex.a\", 1, {DICTIONARY_TOPONYM}, 3534},\n+ {\"br\u00ba\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3425},\n+ {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 3458},\n {\"j\u00fanior\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"projectada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s g p s\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n- {\"urb\", 1, {DICTIONARY_STREET_TYPE}, 3507},\n+ {\"caclcadinha\", 1, {DICTIONARY_STREET_TYPE}, 3481},\n+ {\"alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3323},\n+ {\"vde\", 1, {DICTIONARY_PERSONAL_TITLE}, 3419},\n+ {\"excelentissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 3508},\n {\"defronte\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"parque\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"csl\", 1, {DICTIONARY_PLACE_NAME}, 3425},\n+ {\"estacao de camionagem\", 1, {DICTIONARY_PLACE_NAME}, 3437},\n+ {\"sad\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"n sra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n+ {\"prolongamento\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nas\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"d'\", 1, {DICTIONARY_STOPWORD}, 3465},\n- {\"nmr\u00ba\", 1, {DICTIONARY_UNIT}, 3543},\n- {\"urbanizacao\", 1, {DICTIONARY_QUALIFIER}, 3460},\n- {\"vig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n+ {\"agosto\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"patio\", 1, {DICTIONARY_UNIT}, 3549},\n+ {\"f.te\", 1, {DICTIONARY_PLACE_NAME}, 3443},\n+ {\"10.bro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"lx.a\", 1, {DICTIONARY_TOPONYM}, 3534},\n+ {\"estr m\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n+ {\"s.a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n {\"neto\", 1, {DICTIONARY_PERSONAL_SUFFIX}, -1},\n- {\"sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"diaca\", 1, {DICTIONARY_PERSONAL_TITLE}, 3342},\n- {\"mai\", 1, {DICTIONARY_SYNONYM}, 3522},\n- {\"n\", 1, {DICTIONARY_STOPWORD}, 3468},\n- {\"s.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n+ {\"cac\", 1, {DICTIONARY_PERSONAL_TITLE}, 3328},\n+ {\"sarg aj.te\", 1, {DICTIONARY_PERSONAL_TITLE}, 3403},\n+ {\"il.m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n+ {\"caminho\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"mstro\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n {\"travessa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"capit\u00e3o\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"major brigadeiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"exm\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"sudeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"estr\", 1, {DICTIONARY_STREET_TYPE}, 3485},\n+ {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n+ {\"sec.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3404},\n {\"nossa\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ilm\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3363},\n- {\"janro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"camno\", 1, {DICTIONARY_STREET_TYPE}, 3482},\n+ {\"e r\", 1, {DICTIONARY_STREET_TYPE}, 3489},\n {\"galeria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3279},\n- {\"rot\", 1, {DICTIONARY_STREET_TYPE}, 3501},\n- {\"tr\", 1, {DICTIONARY_BUILDING_TYPE}, 3274},\n- {\"escadas\", 1, {DICTIONARY_UNIT}, -1},\n- {\"c.m.\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3423},\n- {\"marq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n- {\"maio\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"p.to\", 1, {DICTIONARY_PLACE_NAME}, 3449},\n+ {\"eb\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n+ {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"exm\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n+ {\"out\", 1, {DICTIONARY_SYNONYM}, 3530},\n+ {\"tte cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n+ {\"numero\", 1, {DICTIONARY_UNIT}, 3547},\n {\"marqu\u00eas\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"e i r e l i\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n {\"agrupamento complementar de empresas\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"autoestr\", 1, {DICTIONARY_STREET_TYPE}, 3471},\n- {\"10bro\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"pq\", 1, {DICTIONARY_PLACE_NAME}, 3444},\n- {\"praca\", 1, {DICTIONARY_STREET_TYPE}, 3494},\n- {\"pj\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n- {\"p.s.p.\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n- {\"excelentissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"n\u00aa sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"irmao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3370},\n+ {\"jr\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3320},\n+ {\"s limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"sq\", 1, {DICTIONARY_QUALIFIER}, 3463},\n+ {\"b v\", 1, {DICTIONARY_PLACE_NAME}, 3426},\n+ {\"pres\", 1, {DICTIONARY_PERSONAL_TITLE}, 3390},\n+ {\"n.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n+ {\"cap tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3333},\n+ {\"terreiro\", 1, {DICTIONARY_UNIT}, -1},\n {\"organiza\u00e7\u00e3o da sociedade civil de interesse p\u00fablico\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"praceta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"acad\", 1, {DICTIONARY_PLACE_NAME}, 3417},\n- {\"habitacao\", 1, {DICTIONARY_UNIT}, 3538},\n- {\"st.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n- {\"s.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"n.s.\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n- {\"s c s\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n- {\"e.t.a.r.\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n- {\"ad\", 1, {DICTIONARY_COMPANY_TYPE}, 3277},\n- {\"mqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3374},\n- {\"sras\", 1, {DICTIONARY_PERSONAL_TITLE}, 3406},\n- {\"c m\", 1, {DICTIONARY_PLACE_NAME}, 3423},\n- {\"9.bro\", 1, {DICTIONARY_SYNONYM}, 3525},\n- {\"nro\", 1, {DICTIONARY_UNIT}, 3543},\n- {\"uni\", 1, {DICTIONARY_PLACE_NAME}, 3454},\n- {\"prof\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3387},\n+ {\"ns\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3391},\n+ {\"ic\", 1, {DICTIONARY_STREET_TYPE}, 3491},\n+ {\"p\u00e1tio\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"auto estr\", 1, {DICTIONARY_STREET_TYPE}, 3475},\n+ {\"7.bro\", 1, {DICTIONARY_SYNONYM}, 3533},\n+ {\"9br.o\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"e n\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n+ {\"eireli\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n+ {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3401},\n+ {\"m.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n+ {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3376},\n+ {\"revda\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n+ {\"associacao\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"sudoeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ava marg\", 1, {DICTIONARY_STREET_TYPE}, 3473},\n+ {\"excelencia\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"s\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"parq\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n {\"santo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"enfermeira\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"eminentissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"departamento\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"7b.ro\", 1, {DICTIONARY_SYNONYM}, 3533},\n {\"sociedade em comum\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"uma\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n- {\"v alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3413},\n- {\"liberde\", 1, {DICTIONARY_SYNONYM}, 3524},\n- {\"sec\", 1, {DICTIONARY_PERSONAL_TITLE}, 3401},\n- {\"ema\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"lt.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n+ {\"c m\", 1, {DICTIONARY_PLACE_NAME}, 3427},\n+ {\"projectada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"condominio\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"largo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sub cave\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"eng\", 1, {DICTIONARY_PERSONAL_TITLE}, 3359},\n {\"engenheiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"reverendo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ate\", 1, {DICTIONARY_STOPWORD}, 3463},\n- {\"maestra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"janr.o\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"qto\", 1, {DICTIONARY_UNIT}, 3550},\n+ {\"esta\u00e7\u00e3o de trem\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"depto\", 1, {DICTIONARY_UNIT}, 3538},\n {\"brigadeiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"irm\u00e3\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vde\", 1, {DICTIONARY_PERSONAL_TITLE}, 3415},\n- {\"gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n- {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"s l.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"r part\", 1, {DICTIONARY_STREET_TYPE}, 3507},\n+ {\"esc\", 1, {DICTIONARY_UNIT}, 3540},\n+ {\"sem numero\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"fonte\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ribr.a\", 1, {DICTIONARY_SYNONYM}, 3527},\n- {\"cap frag\", 1, {DICTIONARY_PERSONAL_TITLE}, 3327},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3313},\n- {\"hab\", 1, {DICTIONARY_UNIT}, 3538},\n- {\"ilm\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n- {\"n\u00ba\", 1, {DICTIONARY_UNIT}, 3543},\n- {\"jrd\", 1, {DICTIONARY_UNIT}, 3539},\n- {\"srs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3404},\n- {\"u.l.d.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n- {\"cambio\", 1, {DICTIONARY_PLACE_NAME}, 3424},\n- {\"cons\", 1, {DICTIONARY_PERSONAL_TITLE}, 3335},\n- {\"terminal rodoviario\", 1, {DICTIONARY_PLACE_NAME}, 3452},\n+ {\"duque\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n+ {\"vv\", 1, {DICTIONARY_BUILDING_TYPE}, 3279},\n+ {\"e.b.\", 1, {DICTIONARY_PLACE_NAME}, 3433},\n+ {\"av marg\", 1, {DICTIONARY_STREET_TYPE}, 3477},\n+ {\"qd\", 1, {DICTIONARY_QUALIFIER}, 3461},\n+ {\"9b.ro\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"rot\", 1, {DICTIONARY_STREET_TYPE}, 3505},\n {\"eminencia\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s.c.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n- {\"br\", 1, {DICTIONARY_PLACE_NAME}, 3421},\n+ {\"bar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3325},\n+ {\"a d\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n {\"professor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"associacao em sentido estrito\", 1, {DICTIONARY_COMPANY_TYPE}, 3278},\n- {\"transv\", 1, {DICTIONARY_STREET_TYPE}, 3505},\n- {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n- {\"dezbr.o\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"autoestrada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"e b\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n+ {\"nov\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"s.l.\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n+ {\"p.l.l.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3307},\n+ {\"rpart\", 1, {DICTIONARY_STREET_TYPE}, 3507},\n+ {\"ex.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n+ {\"nosso\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"empresa individual\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"lda\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n- {\"o.n.g.\", 1, {DICTIONARY_COMPANY_TYPE}, 3290},\n- {\"s.f\", 1, {DICTIONARY_COMPANY_TYPE}, 3299},\n- {\"eb\", 1, {DICTIONARY_PLACE_NAME}, 3429},\n- {\"sa\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"ccnh\", 1, {DICTIONARY_STREET_TYPE}, 3477},\n- {\"out\", 1, {DICTIONARY_SYNONYM}, 3526},\n- {\"visconde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"fev\", 1, {DICTIONARY_SYNONYM}, 3520},\n+ {\"7bro\", 1, {DICTIONARY_SYNONYM}, 3533},\n+ {\"esta\u00e7\u00e3o de autocarros\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"sargento ajudante\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"reverendissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"d.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n+ {\"em.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3354},\n+ {\"lexa\", 1, {DICTIONARY_TOPONYM}, 3534},\n+ {\"nmr\u00ba\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"s \/ n\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"v.dessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3420},\n {\"embaixador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"comp\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n {\"urbaniza\u00e7\u00e3o\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ilustrissimo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"med\", 1, {DICTIONARY_PERSONAL_TITLE}, 3376},\n- {\"profas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3389},\n- {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 3378},\n- {\"capitao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3325},\n- {\"s.n.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n- {\"mal\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n- {\"d'\", 1, {DICTIONARY_ELISION}, -1},\n- {\"s.n\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"mestra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"cap mg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n+ {\"eng.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n+ {\"s q\", 1, {DICTIONARY_QUALIFIER}, 3463},\n+ {\"eng\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3359},\n+ {\"f.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3292},\n+ {\"eng.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n+ {\"c a\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n {\"escadinhas\", 1, {DICTIONARY_UNIT}, -1},\n- {\"m.al\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n- {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"ava\", 1, {DICTIONARY_STREET_TYPE}, 3472},\n+ {\"des\", 1, {DICTIONARY_PERSONAL_TITLE}, 3343},\n+ {\"pr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3388},\n {\"senhores\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"7br.o\", 1, {DICTIONARY_SYNONYM}, 3529},\n- {\"com\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"ei\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n- {\"avenida\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sec\", 1, {DICTIONARY_QUALIFIER}, 3458},\n+ {\"oscip\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"presid\", 1, {DICTIONARY_PERSONAL_TITLE}, 3390},\n+ {\"sao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3401},\n+ {\"inst\", 1, {DICTIONARY_PLACE_NAME}, 3446},\n+ {\"bl\", 1, {DICTIONARY_BUILDING_TYPE}, 3276},\n {\"at\u00e9\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"instituto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n {\"janeiro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"estr n\", 1, {DICTIONARY_STREET_TYPE}, 3484},\n- {\"s.n.c\", 1, {DICTIONARY_COMPANY_TYPE}, 3296},\n- {\"com.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n+ {\"im\", 1, {DICTIONARY_PERSONAL_TITLE}, 3370},\n {\"cal\u00e7ada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sala\", 1, {DICTIONARY_UNIT}, -1},\n- {\"9br.o\", 1, {DICTIONARY_SYNONYM}, 3525},\n- {\"arq\", 1, {DICTIONARY_PLACE_NAME}, 3420},\n {\"praia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ace\", 1, {DICTIONARY_COMPANY_TYPE}, 3276},\n- {\"m.e\", 1, {DICTIONARY_PERSONAL_TITLE}, 3375},\n- {\"s.c.p.\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n- {\"sarg ajte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n- {\"e\", 1, {DICTIONARY_DIRECTIONAL}, 3306},\n- {\"res\", 1, {DICTIONARY_UNIT}, 3548},\n- {\"de\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"museu\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dezbro\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"scp\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n- {\"lug\", 1, {DICTIONARY_STREET_TYPE}, 3490},\n+ {\"p.to\", 1, {DICTIONARY_PLACE_NAME}, 3453},\n+ {\"residencia\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"cde\", 1, {DICTIONARY_PERSONAL_TITLE}, 3337},\n+ {\"r\", 1, {DICTIONARY_STOPWORD}, 3473},\n+ {\"em ft de\", 1, {DICTIONARY_STOPWORD}, 3470},\n+ {\"g.n.r\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n+ {\"tes\", 1, {DICTIONARY_PERSONAL_TITLE}, 3415},\n+ {\"ribo\", 1, {DICTIONARY_SYNONYM}, 3532},\n+ {\"mtro\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n+ {\"btl\", 1, {DICTIONARY_UNIT}, 3536},\n+ {\"lote\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"e.i\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n+ {\"capit\u00e3o\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3406},\n+ {\"pav\", 1, {DICTIONARY_PLACE_NAME}, 3449},\n+ {\"p\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n {\"ru\u00ednas\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"dez\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"s \/ a\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n- {\"nov\", 1, {DICTIONARY_SYNONYM}, 3525},\n+ {\"resdochao\", 1, {DICTIONARY_UNIT}, 3551},\n+ {\"mnt\", 1, {DICTIONARY_SYNONYM}, 3527},\n+ {\"govd.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n {\"barao\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sr.tas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3408},\n- {\"c\u00e2mbio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"me\", 1, {DICTIONARY_PERSONAL_TITLE}, 3375},\n- {\"lxa\", 1, {DICTIONARY_TOPONYM}, 3530},\n- {\"b.po\", 1, {DICTIONARY_PERSONAL_TITLE}, 3322},\n- {\"sudeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"cm\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3423},\n+ {\"t.te c.el\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n+ {\"i p\", 1, {DICTIONARY_STREET_TYPE}, 3492},\n+ {\"esq\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3484},\n+ {\"univers\", 1, {DICTIONARY_PLACE_NAME}, 3458},\n+ {\"s.a.\", 1, {DICTIONARY_COMPANY_TYPE}, 3306},\n {\"sport clube\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"dez.bro\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"transversal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d\", 1, {DICTIONARY_PERSONAL_TITLE}, 3343},\n- {\"edificio\", 1, {DICTIONARY_BUILDING_TYPE}, 3273},\n+ {\"fevro\", 1, {DICTIONARY_SYNONYM}, 3520},\n+ {\"il.m\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3367},\n+ {\"profas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3393},\n {\"pastor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"srs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3408},\n {\"da\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"s.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n- {\"frei\", 2, {DICTIONARY_PERSONAL_TITLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"r.o\", 1, {DICTIONARY_SYNONYM}, 3528},\n- {\"inf\", 1, {DICTIONARY_SYNONYM}, 3517},\n- {\"p.l.l.c.\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n- {\"ex.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n- {\"prof.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3388},\n+ {\"maestra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"prq\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n+ {\"cor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3340},\n+ {\"rev.ma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3397},\n+ {\"acad\", 1, {DICTIONARY_PLACE_NAME}, 3421},\n+ {\"qu\", 1, {DICTIONARY_STREET_TYPE}, 3502},\n+ {\"govdor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n {\"doutora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"a.c.e\", 1, {DICTIONARY_COMPANY_TYPE}, 3276},\n- {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"mus\", 1, {DICTIONARY_PLACE_NAME}, 3443},\n+ {\"d.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"scv\", 1, {DICTIONARY_UNIT}, 3554},\n+ {\"apto\", 1, {DICTIONARY_UNIT}, 3535},\n {\"quarta\", 1, {DICTIONARY_UNIT}, -1},\n- {\"estr\", 1, {DICTIONARY_STREET_TYPE}, 3481},\n- {\"lt\", 1, {DICTIONARY_UNIT}, 3542},\n+ {\"cast\", 1, {DICTIONARY_PLACE_NAME}, 3430},\n {\"desembargadora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"im\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n+ {\"sn\", 1, {DICTIONARY_NO_ADDRESS}, 3318},\n+ {\"porto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"apartamento\", 1, {DICTIONARY_UNIT}, -1},\n {\"universidade\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"porto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"itinerario principal\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n- {\"part\", 1, {DICTIONARY_STREET_TYPE}, 3492},\n- {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 3325},\n- {\"n sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"governador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"prolongamento\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"c alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3337},\n- {\"cd\", 1, {DICTIONARY_COMPANY_TYPE}, 3279},\n- {\"gov.dor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3361},\n- {\"g.n.r.\", 1, {DICTIONARY_PLACE_NAME}, 3441},\n- {\"mar\", 1, {DICTIONARY_PERSONAL_TITLE}, 3372},\n- {\"c r l\", 1, {DICTIONARY_COMPANY_TYPE}, 3282},\n- {\"sao\", 1, {DICTIONARY_PERSONAL_TITLE}, 3397},\n+ {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 3315},\n+ {\"esta\u00e7\u00e3o rodovi\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"8.bro\", 1, {DICTIONARY_SYNONYM}, 3530},\n+ {\"janero\", 1, {DICTIONARY_SYNONYM}, 3522},\n+ {\"edif\u00edcio\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"enfermeiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"sras\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n+ {\"qt\", 1, {DICTIONARY_UNIT}, 3550},\n+ {\"sf\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n+ {\"tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3413},\n {\"q\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"res do chao\", 1, {DICTIONARY_UNIT}, 3547},\n- {\"tes\", 1, {DICTIONARY_PERSONAL_TITLE}, 3411},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3508},\n- {\"set\", 1, {DICTIONARY_SYNONYM}, 3529},\n+ {\"mnte\", 1, {DICTIONARY_SYNONYM}, 3527},\n+ {\"ten cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3414},\n+ {\"d'\", 1, {DICTIONARY_ELISION}, -1},\n+ {\"das\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"vdto\", 1, {DICTIONARY_STREET_TYPE}, 3513},\n+ {\"cal\u00e7adinha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"capit\u00e3o de mar e guerra\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ulda\", 1, {DICTIONARY_COMPANY_TYPE}, 3305},\n- {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"e.i.r.e.l.i\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n+ {\"ver\", 1, {DICTIONARY_PERSONAL_TITLE}, 3416},\n+ {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3313},\n+ {\"srta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3411},\n+ {\"ace\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n+ {\"dqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n {\"funda\u00e7\u00e3o privada\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"10b.ro\", 1, {DICTIONARY_SYNONYM}, 3514},\n- {\"n o\", 1, {DICTIONARY_DIRECTIONAL}, 3309},\n- {\"ten cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n+ {\"cc\", 1, {DICTIONARY_STREET_TYPE}, 3480},\n {\"quinta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bc\", 1, {DICTIONARY_STREET_TYPE}, 3475},\n+ {\"habitacao\", 1, {DICTIONARY_UNIT}, 3542},\n {\"conde\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"coronel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pct\", 1, {DICTIONARY_STREET_TYPE}, 3495},\n+ {\"b\", 3, {DICTIONARY_PLACE_NAME, DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3425},\n {\"centro comercial\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"arcebispo\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"deptos\", 1, {DICTIONARY_UNIT}, 3535},\n- {\"scv\", 1, {DICTIONARY_UNIT}, 3550},\n- {\"jard\", 1, {DICTIONARY_UNIT}, 3539},\n- {\"o.s.c.i.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n- {\"s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3397},\n- {\"terminal rodovi\u00e1rio\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"super quadra\", 1, {DICTIONARY_QUALIFIER}, 3459},\n+ {\"eng.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3359},\n+ {\"n s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3386},\n+ {\"s.a.r.l\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n+ {\"fundacao publica\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n+ {\"mons\", 1, {DICTIONARY_PERSONAL_TITLE}, 3384},\n+ {\"lj\", 1, {DICTIONARY_UNIT}, 3544},\n {\"particular\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sc\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n- {\"f c\", 1, {DICTIONARY_COMPANY_TYPE}, 3288},\n- {\"n.\u00aa\", 1, {DICTIONARY_STOPWORD}, 3467},\n- {\"engo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n- {\"s.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"praca\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n+ {\"super quadra\", 1, {DICTIONARY_QUALIFIER}, 3463},\n+ {\"n\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"professora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cmdt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3331},\n+ {\"ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 3413},\n {\"juiz\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"noroeste\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"senador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"semin\", 1, {DICTIONARY_PLACE_NAME}, 3453},\n- {\"brig\", 1, {DICTIONARY_PERSONAL_TITLE}, 3323},\n- {\"d.r\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3346},\n- {\"st\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n- {\"p.j\", 1, {DICTIONARY_PLACE_NAME}, 3447},\n- {\"ra\", 1, {DICTIONARY_SYNONYM}, 3527},\n- {\"ribra\", 1, {DICTIONARY_SYNONYM}, 3527},\n+ {\"prof\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3391},\n+ {\"profa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n+ {\"estacao de onibus\", 1, {DICTIONARY_PLACE_NAME}, 3440},\n+ {\"mq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3377},\n+ {\"s c p\", 1, {DICTIONARY_COMPANY_TYPE}, 3301},\n {\"entre\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sociedade aberta\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"s n\", 1, {DICTIONARY_NO_ADDRESS}, 3314},\n- {\"prof\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3388},\n- {\"revdo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3392},\n- {\"enfermeiro\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"qto\", 1, {DICTIONARY_UNIT}, 3546},\n- {\"pto\", 1, {DICTIONARY_STREET_TYPE}, 3493},\n- {\"agosto\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"vd\", 1, {DICTIONARY_STREET_TYPE}, 3513},\n+ {\"dezbro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3297},\n+ {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n+ {\"tv\", 1, {DICTIONARY_STREET_TYPE}, 3510},\n+ {\"ra\", 1, {DICTIONARY_SYNONYM}, 3531},\n+ {\"dto\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3483},\n+ {\"m.al\", 1, {DICTIONARY_PERSONAL_TITLE}, 3376},\n+ {\"lg\", 1, {DICTIONARY_STREET_TYPE}, 3493},\n+ {\"ag\u00eancia banc\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"academia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ribeiro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"g n r\", 1, {DICTIONARY_PLACE_NAME}, 3441},\n- {\"mta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3368},\n- {\"srtas\", 1, {DICTIONARY_PERSONAL_TITLE}, 3408},\n- {\"associacao\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"pct\u00aa\", 1, {DICTIONARY_STREET_TYPE}, 3495},\n+ {\"ass\", 1, {DICTIONARY_PLACE_NAME}, 3423},\n+ {\"no\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"dra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"estr r\", 1, {DICTIONARY_STREET_TYPE}, 3489},\n+ {\"a.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3281},\n+ {\"ro\", 1, {DICTIONARY_SYNONYM}, 3532},\n+ {\"a.c.e\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n+ {\"mal\", 1, {DICTIONARY_PERSONAL_TITLE}, 3376},\n+ {\"dep\", 1, {DICTIONARY_PERSONAL_TITLE}, 3342},\n {\"esta\u00e7\u00e3o de tratamento de \u00e1guas residuais\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"rod\", 1, {DICTIONARY_STREET_TYPE}, 3500},\n+ {\"vig.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3418},\n {\"acesso\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"vdessa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3416},\n+ {\"estacao ferroviaria\", 1, {DICTIONARY_PLACE_NAME}, 3439},\n {\"bombeiros volunt\u00e1rios\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"novembro\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"fevro\", 1, {DICTIONARY_SYNONYM}, 3516},\n- {\"pav\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n- {\"enfo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3353},\n- {\"sgps\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n- {\"exa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n- {\"superquadra\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ribro\", 1, {DICTIONARY_SYNONYM}, 3528},\n- {\"o s c i p\", 1, {DICTIONARY_COMPANY_TYPE}, 3291},\n+ {\"ilmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3367},\n+ {\"cap m g\", 1, {DICTIONARY_PERSONAL_TITLE}, 3332},\n+ {\"so\", 1, {DICTIONARY_DIRECTIONAL}, 3316},\n+ {\"s f\", 1, {DICTIONARY_COMPANY_TYPE}, 3303},\n+ {\"l.da\", 1, {DICTIONARY_COMPANY_TYPE}, 3293},\n+ {\"ong\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n+ {\"cap\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n+ {\"rvia\", 1, {DICTIONARY_STREET_TYPE}, 3504},\n+ {\"n sa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"n sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3385},\n+ {\"ep\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n+ {\"cel\", 1, {DICTIONARY_PERSONAL_TITLE}, 3340},\n+ {\"o n g\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3349},\n+ {\"snc\", 1, {DICTIONARY_COMPANY_TYPE}, 3300},\n {\"sem n\u00famero\", 1, {DICTIONARY_NO_ADDRESS}, -1},\n {\"torre\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"prolng\", 1, {DICTIONARY_STREET_TYPE}, 3497},\n- {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n- {\"sarg\", 1, {DICTIONARY_PERSONAL_TITLE}, 3398},\n- {\"i p\", 1, {DICTIONARY_STREET_TYPE}, 3488},\n- {\"s.o\", 1, {DICTIONARY_DIRECTIONAL}, 3312},\n- {\"e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n- {\"visc\", 1, {DICTIONARY_PERSONAL_TITLE}, 3415},\n- {\"p.te\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n- {\"crl\", 1, {DICTIONARY_COMPANY_TYPE}, 3282},\n- {\"estacao de trem\", 1, {DICTIONARY_PLACE_NAME}, 3437},\n- {\"capitao de mar e guerra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3328},\n- {\"estacao\", 1, {DICTIONARY_PLACE_NAME}, 3430},\n- {\"srta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3407},\n- {\"junho\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"dqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3348},\n- {\"jz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3367},\n+ {\"u l d a\", 1, {DICTIONARY_COMPANY_TYPE}, 3309},\n+ {\"s a\", 1, {DICTIONARY_COMPANY_TYPE}, 3306},\n+ {\"enf.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3357},\n+ {\"dr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3350},\n+ {\"im\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3370},\n+ {\"sr.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"bar\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"div\", 1, {DICTIONARY_QUALIFIER}, 3460},\n+ {\"etar\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n+ {\"estacao de trem\", 1, {DICTIONARY_PLACE_NAME}, 3441},\n+ {\"fev.ro\", 1, {DICTIONARY_SYNONYM}, 3520},\n+ {\"r.a\", 1, {DICTIONARY_SYNONYM}, 3531},\n+ {\"c.e.b\", 1, {DICTIONARY_PLACE_NAME}, 3432},\n {\"engenheira\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"s\u00e3o\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"g.n.r\", 1, {DICTIONARY_PLACE_NAME}, 3441},\n- {\"s.e.\", 1, {DICTIONARY_DIRECTIONAL}, 3311},\n- {\"atr\u00e1s\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"rs\", 1, {DICTIONARY_STREET_TYPE}, 3504},\n- {\"b\u00ba\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3421},\n+ {\"organizacao da sociedade civil de interesse publico\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"n\u00ba\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"aos\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"s g p s\", 1, {DICTIONARY_COMPANY_TYPE}, 3304},\n+ {\"urb\", 1, {DICTIONARY_STREET_TYPE}, 3511},\n {\"diacono\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ro\", 1, {DICTIONARY_SYNONYM}, 3528},\n- {\"s a d\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n- {\"fundacao publica\", 1, {DICTIONARY_COMPANY_TYPE}, 3287},\n- {\"profs\", 1, {DICTIONARY_PERSONAL_TITLE}, 3390},\n- {\"vereador\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"ex.m\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3362},\n+ {\"pra\u00e7a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"dqsa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3352},\n+ {\"univ\", 1, {DICTIONARY_PLACE_NAME}, 3458},\n {\"d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"d'\", 1, {DICTIONARY_STOPWORD}, 3469},\n {\"sociedade an\u00f3nima desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"dezembro\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dos\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"qta\", 1, {DICTIONARY_STREET_TYPE}, 3498},\n+ {\"apt.o\", 1, {DICTIONARY_UNIT}, 3535},\n {\"cardeal\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pto\", 1, {DICTIONARY_PLACE_NAME}, 3449},\n+ {\"mar\u00e7o\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"dona\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"sociedade anonima de responsabilidade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3294},\n- {\"a.d\", 1, {DICTIONARY_COMPANY_TYPE}, 3277},\n+ {\"eng\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n+ {\"rdvia\", 1, {DICTIONARY_STREET_TYPE}, 3504},\n {\"nossa senhora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"mstro\", 1, {DICTIONARY_PERSONAL_TITLE}, 3369},\n- {\"perto\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"p j\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3474},\n+ {\"semin\", 1, {DICTIONARY_PLACE_NAME}, 3457},\n {\"escola b\u00e1sica\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"i c\", 1, {DICTIONARY_STREET_TYPE}, 3487},\n- {\"gal\", 1, {DICTIONARY_PERSONAL_TITLE}, 3360},\n- {\"ima\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n- {\"revmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3394},\n+ {\"apt\", 1, {DICTIONARY_UNIT}, 3535},\n+ {\"c.c\", 1, {DICTIONARY_PLACE_NAME}, 3431},\n {\"loja\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_UNIT}, -1},\n- {\"sec.a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3400},\n- {\"im\", 1, {DICTIONARY_PERSONAL_TITLE}, 3366},\n- {\"mq\", 1, {DICTIONARY_PERSONAL_TITLE}, 3373},\n- {\"ave\", 1, {DICTIONARY_STREET_TYPE}, 3472},\n- {\"secr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3401},\n- {\"educ\", 1, {DICTIONARY_SYNONYM}, 3515},\n- {\"loteam\", 1, {DICTIONARY_UNIT}, 3544},\n- {\"deps\", 1, {DICTIONARY_UNIT}, 3535},\n+ {\"com.or\", 1, {DICTIONARY_PERSONAL_TITLE}, 3336},\n+ {\"jan.ro\", 1, {DICTIONARY_SYNONYM}, 3522},\n+ {\"ilm\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3367},\n+ {\"junho\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"sociedade anonima de responsabilidade limitada\", 1, {DICTIONARY_COMPANY_TYPE}, 3298},\n+ {\"estacao de tratamento de aguas residuais\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n+ {\"revma\", 1, {DICTIONARY_PERSONAL_TITLE}, 3397},\n+ {\"g.n.r.\", 1, {DICTIONARY_PLACE_NAME}, 3445},\n+ {\"c.d.\", 1, {DICTIONARY_COMPANY_TYPE}, 3283},\n {\"reverendissima\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"unipessoal lda\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"c d\", 1, {DICTIONARY_COMPANY_TYPE}, 3279},\n+ {\"inform\", 1, {DICTIONARY_SYNONYM}, 3521},\n+ {\"agencia bancaria\", 1, {DICTIONARY_PLACE_NAME}, 3422},\n+ {\"ve\", 1, {DICTIONARY_STREET_TYPE}, 3514},\n {\"casal\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"jul\", 1, {DICTIONARY_SYNONYM}, 3520},\n+ {\"ave marg\", 1, {DICTIONARY_STREET_TYPE}, 3477},\n {\"em frente de\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"professoras\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"e i r e l i\", 1, {DICTIONARY_COMPANY_TYPE}, 3284},\n {\"prefeito\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"parada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n\u00aa sr\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n- {\"s.r\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3405},\n- {\"s.e\", 1, {DICTIONARY_DIRECTIONAL}, 3311},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3345},\n- {\"arco\", 1, {DICTIONARY_PERSONAL_TITLE}, 3320},\n- {\"rev.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3394},\n- {\"residencia\", 1, {DICTIONARY_UNIT}, -1},\n- {\"card\", 1, {DICTIONARY_PERSONAL_TITLE}, 3330},\n- {\"n.s\", 1, {DICTIONARY_PERSONAL_TITLE}, 3382},\n- {\"cap tte\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n- {\"v.de\", 1, {DICTIONARY_PERSONAL_TITLE}, 3415},\n+ {\"10bro\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"pq\", 1, {DICTIONARY_PLACE_NAME}, 3448},\n+ {\"cap frag\", 1, {DICTIONARY_PERSONAL_TITLE}, 3331},\n+ {\"estacao de autocarros\", 1, {DICTIONARY_PLACE_NAME}, 3436},\n+ {\"pj\", 1, {DICTIONARY_PLACE_NAME}, 3451},\n+ {\"m\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3381},\n+ {\"ribr.o\", 1, {DICTIONARY_SYNONYM}, 3532},\n+ {\"pailhao\", 1, {DICTIONARY_PLACE_NAME}, 3449},\n {\"aeroporto\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"capitao de fragata\", 1, {DICTIONARY_PERSONAL_TITLE}, 3327},\n+ {\"cap ten\", 1, {DICTIONARY_PERSONAL_TITLE}, 3333},\n+ {\"adv.o\", 1, {DICTIONARY_PERSONAL_TITLE}, 3321},\n {\"loteamento\", 1, {DICTIONARY_UNIT}, -1},\n {\"sargento\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"fev.ro\", 1, {DICTIONARY_SYNONYM}, 3516},\n {\"viscondesa\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"br\u00ba\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3421},\n- {\"exmo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n- {\"edif\u00edcio\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"f.o\", 1, {DICTIONARY_PERSONAL_SUFFIX}, 3315},\n- {\"apt.o\", 1, {DICTIONARY_UNIT}, 3531},\n+ {\"itinerario complementar\", 1, {DICTIONARY_STREET_TYPE}, 3491},\n+ {\"s c s\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"e.t.a.r.\", 1, {DICTIONARY_PLACE_NAME}, 3435},\n {\"banco\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"n.o.\", 1, {DICTIONARY_DIRECTIONAL}, 3309},\n- {\"ex\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3356},\n+ {\"na\", 1, {DICTIONARY_STOPWORD}, 3471},\n {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"n.o\", 1, {DICTIONARY_DIRECTIONAL}, 3309},\n- {\"n.e\", 1, {DICTIONARY_DIRECTIONAL}, 3308},\n- {\"r \/ c\", 1, {DICTIONARY_UNIT}, 3547},\n+ {\"p l l c\", 1, {DICTIONARY_COMPANY_TYPE}, 3307},\n+ {\"s.ra\", 1, {DICTIONARY_PERSONAL_TITLE}, 3409},\n+ {\"ava marg\", 1, {DICTIONARY_STREET_TYPE}, 3477},\n {\"julho\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"ag\u00eancia banc\u00e1ria\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"c.a\", 1, {DICTIONARY_COMPANY_TYPE}, 3285},\n {\"senhora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vdto\", 1, {DICTIONARY_STREET_TYPE}, 3509},\n- {\"esta\u00e7\u00e3o de trem\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"st.\u00aa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3399},\n+ {\"ft\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, 3490},\n+ {\"e.p\", 1, {DICTIONARY_COMPANY_TYPE}, 3289},\n+ {\"companhia anonima\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"direito\", 2, {DICTIONARY_STREET_TYPE, DICTIONARY_UNIT}, -1},\n- {\"alameda\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"lg\", 1, {DICTIONARY_STREET_TYPE}, 3490},\n- {\"sociedade anonima desportiva\", 1, {DICTIONARY_COMPANY_TYPE}, 3295},\n+ {\"s.ras\", 1, {DICTIONARY_PERSONAL_TITLE}, 3410},\n+ {\"s.c.s.\", 1, {DICTIONARY_COMPANY_TYPE}, 3302},\n+ {\"estacao\", 1, {DICTIONARY_PLACE_NAME}, 3434},\n+ {\"v alm\", 1, {DICTIONARY_PERSONAL_TITLE}, 3417},\n {\"rua\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ex.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3358},\n- {\"r.a\", 1, {DICTIONARY_SYNONYM}, 3527},\n- {\"eng\", 1, {DICTIONARY_PERSONAL_TITLE}, 3355},\n- {\"az\", 1, {DICTIONARY_STREET_TYPE}, 3474},\n- {\"bro\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_STREET_TYPE}, 3421},\n+ {\"jz\", 1, {DICTIONARY_PERSONAL_TITLE}, 3371},\n+ {\"dezbr.o\", 1, {DICTIONARY_SYNONYM}, 3518},\n+ {\"ate\", 1, {DICTIONARY_STOPWORD}, 3467},\n+ {\"bc\", 1, {DICTIONARY_STREET_TYPE}, 3479},\n {\"itiner\u00e1rio principal\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"na\", 1, {DICTIONARY_STOPWORD}, 3467},\n- {\"capitao tenente\", 1, {DICTIONARY_PERSONAL_TITLE}, 3329},\n- {\"il.mo\", 1, {DICTIONARY_PERSONAL_TITLE}, 3363},\n- {\"st\u00ba\", 1, {DICTIONARY_PERSONAL_TITLE}, 3396},\n+ {\"ruinas\", 1, {DICTIONARY_PLACE_NAME}, 3455},\n+ {\"marqa\", 1, {DICTIONARY_PERSONAL_TITLE}, 3378},\n+ {\"gov\", 1, {DICTIONARY_PERSONAL_TITLE}, 3365},\n+ {\"a c e\", 1, {DICTIONARY_COMPANY_TYPE}, 3280},\n+ {\"slj\", 1, {DICTIONARY_UNIT}, 3553},\n {\"divisao\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3395},\n- {\"\u0219os\", 1, {DICTIONARY_STREET_TYPE}, 3568},\n- {\"pia\u021b\u0103\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n- {\"bdul\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"alea\", 1, {DICTIONARY_STREET_TYPE}, 3559},\n- {\"fundatura\", 1, {DICTIONARY_STREET_TYPE}, 3562},\n- {\"p-ta\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n+ {\"pda\", 1, {DICTIONARY_STREET_TYPE}, 3495},\n+ {\"min\", 1, {DICTIONARY_PERSONAL_TITLE}, 3383},\n+ {\"v\u00e2rful\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bl\", 1, {DICTIONARY_BUILDING_TYPE}, 3555},\n+ {\"varful\", 1, {DICTIONARY_STREET_TYPE}, 3574},\n+ {\"p-\u0163a\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n {\"c\u0103pitan\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"str-la\", 1, {DICTIONARY_STREET_TYPE}, 3567},\n- {\"bulevard\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n+ {\"spl\", 1, {DICTIONARY_STREET_TYPE}, 3573},\n+ {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"alea\", 1, {DICTIONARY_STREET_TYPE}, 3563},\n+ {\"fundatura\", 1, {DICTIONARY_STREET_TYPE}, 3566},\n+ {\"p\u0163a\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n+ {\"sc\", 1, {DICTIONARY_UNIT}, 3576},\n+ {\"piata\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n {\"bulevardul\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"v\u00e2rful\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"varf\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n- {\"p-\u0163a\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3559},\n- {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 3554},\n- {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"virful\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n- {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3557},\n+ {\"int\", 1, {DICTIONARY_STREET_TYPE}, 3568},\n+ {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n {\"aleea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sc\", 1, {DICTIONARY_UNIT}, 3572},\n- {\"v\u00eerful\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3563},\n+ {\"col\", 1, {DICTIONARY_PERSONAL_TITLE}, 3558},\n+ {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n {\"sublocotenent\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"soseaua\", 1, {DICTIONARY_STREET_TYPE}, 3568},\n- {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n+ {\"intr\", 1, {DICTIONARY_STREET_TYPE}, 3568},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3560},\n {\"locotenent\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"vice amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"blochaus\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"bulevardu\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3555},\n- {\"str\", 1, {DICTIONARY_STREET_TYPE}, 3566},\n- {\"sdla\", 1, {DICTIONARY_STREET_TYPE}, 3567},\n- {\"strada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bulev\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"fnd\", 1, {DICTIONARY_STREET_TYPE}, 3566},\n+ {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"\u0219os\", 1, {DICTIONARY_STREET_TYPE}, 3572},\n+ {\"vf\", 1, {DICTIONARY_STREET_TYPE}, 3574},\n {\"profesor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"pia\u0163a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"fundacul\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"fnd\", 1, {DICTIONARY_STREET_TYPE}, 3562},\n- {\"bd\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"int\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"bulevard\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"p-ta\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3559},\n+ {\"maj\", 1, {DICTIONARY_PERSONAL_TITLE}, 3561},\n+ {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3557},\n {\"calea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0219oseaua\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"splaiul\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ale\", 1, {DICTIONARY_STREET_TYPE}, 3559},\n- {\"sp\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n- {\"b.dul\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"capt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3553},\n+ {\"bulevardu\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"varf\", 1, {DICTIONARY_STREET_TYPE}, 3574},\n+ {\"et\", 1, {DICTIONARY_LEVEL}, 3556},\n+ {\"strada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"general\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"major\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vf\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n- {\"p\u0163a\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n- {\"intr\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n- {\"et\", 1, {DICTIONARY_LEVEL}, 3552},\n- {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n+ {\"sdla\", 1, {DICTIONARY_STREET_TYPE}, 3571},\n+ {\"str\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n+ {\"fdc\", 1, {DICTIONARY_STREET_TYPE}, 3567},\n+ {\"apartament\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"pia\u021b\u0103\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n+ {\"sp\", 1, {DICTIONARY_STREET_TYPE}, 3573},\n+ {\"scara\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"str-la\", 1, {DICTIONARY_STREET_TYPE}, 3571},\n+ {\"sos\", 1, {DICTIONARY_STREET_TYPE}, 3572},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3562},\n+ {\"contra amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"virful\", 1, {DICTIONARY_STREET_TYPE}, 3574},\n+ {\"v\u00eerful\", 1, {DICTIONARY_STREET_TYPE}, 3574},\n+ {\"ale\", 1, {DICTIONARY_STREET_TYPE}, 3563},\n+ {\"cel\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"b-dul\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n {\"stradela\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"scara\", 1, {DICTIONARY_UNIT}, -1},\n- {\"b-dul\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"piata\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n- {\"varful\", 1, {DICTIONARY_STREET_TYPE}, 3570},\n- {\"contra amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"pta\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n- {\"ap\", 1, {DICTIONARY_UNIT}, 3571},\n- {\"bulev\", 1, {DICTIONARY_STREET_TYPE}, 3560},\n- {\"cel\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sos\", 1, {DICTIONARY_STREET_TYPE}, 3568},\n- {\"apartament\", 1, {DICTIONARY_UNIT}, -1},\n- {\"capitan\", 1, {DICTIONARY_PERSONAL_TITLE}, 3553},\n- {\"fdc\", 1, {DICTIONARY_STREET_TYPE}, 3563},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3558},\n- {\"bl\", 1, {DICTIONARY_BUILDING_TYPE}, 3551},\n- {\"cal\", 1, {DICTIONARY_STREET_TYPE}, 3561},\n+ {\"b.dul\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n+ {\"soseaua\", 1, {DICTIONARY_STREET_TYPE}, 3572},\n {\"drumul\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"intrarea\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"doctor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"amiral\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"comandor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"capitan\", 1, {DICTIONARY_PERSONAL_TITLE}, 3557},\n+ {\"bdul\", 1, {DICTIONARY_STREET_TYPE}, 3564},\n {\"etaj\", 1, {DICTIONARY_LEVEL}, -1},\n {\"locotenent colonel\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3556},\n- {\"spl\", 1, {DICTIONARY_STREET_TYPE}, 3569},\n+ {\"ap\", 1, {DICTIONARY_UNIT}, 3575},\n+ {\"cal\", 1, {DICTIONARY_STREET_TYPE}, 3565},\n {\"fund\u0103tura\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"sergent\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, 3633},\n+ {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3627},\n+ {\"linya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0434\u043e\u043c\", 1, {DICTIONARY_UNIT}, -1},\n- {\"\u043a\", 1, {DICTIONARY_BUILDING_TYPE}, 3573},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3629},\n {\"nko\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"der\", 1, {DICTIONARY_QUALIFIER}, 3596},\n+ {\"\u043b\u0438\u043d\u0438\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"oao\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n- {\"\u0441\u0435\u0432\u0435\u0440\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3613},\n+ {\"otkrytoye aktsionernoye obshchestvo\", 1, {DICTIONARY_COMPANY_TYPE}, 3583},\n+ {\"\u0431\u0443\u043b\u044c\u0432\u0430\u0440\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ano\", 1, {DICTIONARY_COMPANY_TYPE}, 3579},\n {\"sever\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"d\", 1, {DICTIONARY_UNIT}, 3639},\n+ {\"\u0441\u0435\u0432\u0435\u0440\u043e \u0417\u0430\u043f\u0430\u0434\", 1, {DICTIONARY_DIRECTIONAL}, 3588},\n {\"pereulok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0441\u0432\", 1, {DICTIONARY_PERSONAL_TITLE}, 3592},\n- {\"\u043f\u043e\u0441\", 1, {DICTIONARY_QUALIFIER}, 3601},\n+ {\"\u043b\u0438\u043d\", 1, {DICTIONARY_STREET_TYPE}, 3630},\n+ {\"\u043f\u0440\u043e\u0441\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3628},\n {\"vostok\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"pos\", 1, {DICTIONARY_QUALIFIER}, 3609},\n- {\"yugo vostoku\", 1, {DICTIONARY_DIRECTIONAL}, 3587},\n+ {\"severo vostoku\", 1, {DICTIONARY_DIRECTIONAL}, 3587},\n+ {\"obl\", 1, {DICTIONARY_QUALIFIER}, 3604},\n {\"gmina\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"nab\", 1, {DICTIONARY_STREET_TYPE}, 3618},\n- {\"tupik\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043f\u043e\u0441\u0435\u043b\u043e\u043a\", 1, {DICTIONARY_QUALIFIER}, 3608},\n+ {\"\u0448\", 1, {DICTIONARY_STREET_TYPE}, 3632},\n+ {\"severo zapad\", 1, {DICTIONARY_DIRECTIONAL}, 3589},\n+ {\"gm\", 1, {DICTIONARY_QUALIFIER}, 3602},\n+ {\"pos\", 1, {DICTIONARY_QUALIFIER}, 3613},\n {\"ooo\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043d\u0435\u043a\u043e\u043c\u043c\u0435\u0440\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f\", 1, {DICTIONARY_COMPANY_TYPE}, 3575},\n- {\"\u0433\u043c\", 1, {DICTIONARY_QUALIFIER}, 3597},\n- {\"\u043b\u0438\u043d\u0438\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nab\", 1, {DICTIONARY_STREET_TYPE}, 3622},\n+ {\"\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3636},\n+ {\"\u043f\u043e\u0441\", 1, {DICTIONARY_QUALIFIER}, 3612},\n {\"zavodskaya\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"prospekt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"proyezd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0435 \u0430\u043a\u0446\u0438\u043e\u043d\u0435\u0440\u043d\u043e\u0435 \u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, 3578},\n+ {\"\u043e\", 1, {DICTIONARY_QUALIFIER}, 3606},\n+ {\"\u0440\u0430\u0438\u043e\u043d\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u043a\u043e\u0440\u043f\u0443\u0441\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n+ {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3617},\n {\"derevnya\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"lin\", 1, {DICTIONARY_STREET_TYPE}, 3631},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3597},\n {\"\u0434\u0435\u0440\u0435\u0432\u043d\u044f\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\u0433\", 1, {DICTIONARY_QUALIFIER}, 3608},\n {\"severo-vostoku\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"g\", 1, {DICTIONARY_QUALIFIER}, 3605},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3611},\n+ {\"per\", 1, {DICTIONARY_STREET_TYPE}, 3624},\n {\"\u0437\u0430\u0432\u043e\u0434\u0441\u043a\u0430\u044f\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"tup\", 1, {DICTIONARY_STREET_TYPE}, 3635},\n {\"bulvar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"akademika\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"shosseynaya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ploshchad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0448\u043e\u0441\u0441\u0435\u0439\u043d\u0430\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"otkrytoye aktsionernoye obshchestvo\", 1, {DICTIONARY_COMPANY_TYPE}, 3579},\n {\"shosse\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d\", 1, {DICTIONARY_UNIT}, 3635},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3595},\n+ {\"obshchestvo s ogranichennoy otvetstvennostyu\", 1, {DICTIONARY_COMPANY_TYPE}, 3585},\n {\"\u0430\u043d\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n+ {\"\u0441\u0432\", 1, {DICTIONARY_PERSONAL_TITLE}, 3596},\n {\"\u043c\u043e\u0441\u0442\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u043f\u0440\u043e\u0441\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3624},\n+ {\"\u043f\u043e\u0441\", 1, {DICTIONARY_QUALIFIER}, 3605},\n {\"oblast\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\u043f\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3625},\n {\"\u043e\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u0430\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3610},\n- {\"obl\", 1, {DICTIONARY_QUALIFIER}, 3600},\n- {\"\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u044c\u044e\", 1, {DICTIONARY_COMPANY_TYPE}, 3580},\n+ {\"yugo vostoku\", 1, {DICTIONARY_DIRECTIONAL}, 3591},\n+ {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"yugo-vostoku\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u0433\u043c\u0438\u043d\u0430\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"doroga\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"severo zapad\", 1, {DICTIONARY_DIRECTIONAL}, 3585},\n- {\"\u043d\u0435\u043a\u043e\u043c\u043c\u0435\u0440\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f\", 1, {DICTIONARY_COMPANY_TYPE}, 3577},\n+ {\"shkolnaya\", 1, {DICTIONARY_PLACE_NAME}, 3598},\n+ {\"\u043a\", 1, {DICTIONARY_BUILDING_TYPE}, 3577},\n {\"yugo-zapadu\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u0430\u043a\u0430\u0434\u0435\u043c\u0438\u043a\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"dom\", 1, {DICTIONARY_UNIT}, -1},\n- {\"\u0434\u0435\u0440\", 1, {DICTIONARY_QUALIFIER}, 3595},\n- {\"\u0434\u043e\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3614},\n+ {\"\u043f\u043e\u0441\u0435\u043b\u043e\u043a\", 1, {DICTIONARY_QUALIFIER}, 3612},\n+ {\"gorod\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u0430\u044f \u043d\u0435\u043a\u043e\u043c\u043c\u0435\u0440\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f\", 1, {DICTIONARY_COMPANY_TYPE}, 3579},\n+ {\"ploshchad\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u044e\u0433\u043e-\u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"kv\", 1, {DICTIONARY_UNIT}, 3637},\n- {\"\u043e\", 1, {DICTIONARY_QUALIFIER}, 3602},\n+ {\"r-n\", 1, {DICTIONARY_QUALIFIER}, 3611},\n+ {\"kv\", 1, {DICTIONARY_UNIT}, 3641},\n {\"kol'tsevaya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0443\u043b\u0438\u0446\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043a\u0432\u0430\u0440\u0442\u0438\u0440\u0430\", 1, {DICTIONARY_UNIT}, -1},\n {\"\u043e\u0431\u043b\u0430\u0441\u0442\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u043f\u043e\u0441\u0431\u043b\u043e\u043a\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3593},\n- {\"\u0440-\u043d\", 1, {DICTIONARY_QUALIFIER}, 3606},\n- {\"\u0433\", 1, {DICTIONARY_QUALIFIER}, 3604},\n+ {\"yugo zapadu\", 1, {DICTIONARY_DIRECTIONAL}, 3593},\n+ {\"\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0439 \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u044c\u044e\", 1, {DICTIONARY_COMPANY_TYPE}, 3584},\n {\"\u043f\u0440\u043e\u0441\u043f\u0435\u043a\u0442\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ulitsa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tupik\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043d\u0430\u0431\u0435\u0440\u0435\u0436\u043d\u0430\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0442\u0443\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3630},\n+ {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3628},\n {\"shkol'naya\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"\u044e\u0433\u043e \u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3586},\n+ {\"\u043d\u043a\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"\u0434\u043e\u0440\u043e\u0433\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043a\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u043e\u0431\u043b\", 1, {DICTIONARY_QUALIFIER}, 3599},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3633},\n {\"\u043f\u0440\u043e\u0435\u0437\u0434\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0448\u043e\u0441\u0441\u0435\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gm\", 1, {DICTIONARY_QUALIFIER}, 3598},\n+ {\"\u0441\u0435\u0432\u0435\u0440\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u043e\u0441\u0442\u0440\u043e\u0432\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u043d\u0430\u0431\", 1, {DICTIONARY_STREET_TYPE}, 3617},\n+ {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 3633},\n {\"\u0434\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"o\", 1, {DICTIONARY_QUALIFIER}, 3603},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3591},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3622},\n- {\"\u043b\u0438\u043d\", 1, {DICTIONARY_STREET_TYPE}, 3626},\n- {\"\u043a\u0432\", 1, {DICTIONARY_UNIT}, 3636},\n+ {\"g\", 1, {DICTIONARY_QUALIFIER}, 3609},\n+ {\"\u0430\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3614},\n+ {\"k\", 1, {DICTIONARY_BUILDING_TYPE}, 3578},\n+ {\"nekommercheskaya organizatsiya\", 1, {DICTIONARY_COMPANY_TYPE}, 3580},\n+ {\"\u0441\u0435\u0432\u0435\u0440\u043e \u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3586},\n+ {\"\u0434\u0435\u0440\", 1, {DICTIONARY_QUALIFIER}, 3599},\n {\"\u0441\u0435\u0432\u0435\u0440\u043e-\u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u043f\u043e\u0441\u0451\u043b\u043e\u043a\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"mikrorayon\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3625},\n- {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 3629},\n+ {\"\u043f\u0435\u0440\u0435\u0443\u043b\u043e\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"o\", 1, {DICTIONARY_QUALIFIER}, 3607},\n+ {\"\u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0435 \u0430\u043a\u0446\u0438\u043e\u043d\u0435\u0440\u043d\u043e\u0435 \u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, 3582},\n {\"raion\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"dor\", 1, {DICTIONARY_STREET_TYPE}, 3615},\n {\"\u043e\u0430\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"posblok\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"\u043f\u0435\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3623},\n {\"kooperativ\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"svyatoy\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u0448\", 1, {DICTIONARY_STREET_TYPE}, 3628},\n+ {\"\u0433\u0435\u043d\", 1, {DICTIONARY_PERSONAL_TITLE}, 3594},\n {\"d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u043f\u043b\u043e\u0449\u0430\u0434\u044c\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0440\u0430\u0438\u043e\u043d\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3624},\n- {\"obshchestvo s ogranichennoy otvetstvennostyu\", 1, {DICTIONARY_COMPANY_TYPE}, 3581},\n- {\"\u043f\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3621},\n- {\"koltsevaya\", 1, {DICTIONARY_STREET_TYPE}, 3616},\n+ {\"\u0442\u0443\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3634},\n+ {\"\u043d\u0435\u043a\u043e\u043c\u043c\u0435\u0440\u0447\u0435\u0441\u043a\u0430\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f\", 1, {DICTIONARY_COMPANY_TYPE}, 3581},\n+ {\"\u042e\u0436\u043d\u0430\u044f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"\u044e\u0433\u043e \u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3590},\n+ {\"\u0434\", 1, {DICTIONARY_UNIT}, 3638},\n+ {\"\u044e\u0433\u043e \u0437\u0430\u043f\u0430\u0434\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3592},\n+ {\"\u043e\u0431\u043b\", 1, {DICTIONARY_QUALIFIER}, 3603},\n {\"\u043e\u043e\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"alleya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ano\", 1, {DICTIONARY_COMPANY_TYPE}, 3575},\n- {\"ulitsa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3637},\n+ {\"\u043d\u0430\u0431\", 1, {DICTIONARY_STREET_TYPE}, 3621},\n {\"\u0433\u0435\u043d\u0435\u0440\u0430\u043b\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"yugo zapadu\", 1, {DICTIONARY_DIRECTIONAL}, 3589},\n {\"\u0433\u043e\u0440\u043e\u0434\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u0441\u0435\u0432\u0435\u0440\u043e-\u0417\u0430\u043f\u0430\u0434\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"lin\", 1, {DICTIONARY_STREET_TYPE}, 3627},\n {\"\u043a\u043e\u043e\u043f\u0435\u0440\u0430\u0442\u0438\u0432\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"korpus\", 1, {DICTIONARY_BUILDING_TYPE}, -1},\n- {\"nekommercheskaya organizatsiya\", 1, {DICTIONARY_COMPANY_TYPE}, 3576},\n+ {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, 3637},\n+ {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"poselok\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u0442\u0443\u043f\u0438\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3632},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3626},\n {\"\u0448\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u0430\u043b\u043b\u0435\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3612},\n- {\"\u042e\u0436\u043d\u0430\u044f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u0433\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"tup\", 1, {DICTIONARY_STREET_TYPE}, 3631},\n- {\"\u0441\u0435\u0432\u0435\u0440\u043e \u0432\u043e\u0441\u0442\u043e\u043a\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3582},\n+ {\"\u043a\u0432\", 1, {DICTIONARY_UNIT}, 3640},\n {\"kvartira\", 1, {DICTIONARY_UNIT}, -1},\n {\"yuzhnaya\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"blok\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u0441\u0435\u0432\u0435\u0440\u043e \u0417\u0430\u043f\u0430\u0434\", 1, {DICTIONARY_DIRECTIONAL}, 3584},\n {\"naberezhnaya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"linya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3616},\n {\"generala\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"dor\", 1, {DICTIONARY_STREET_TYPE}, 3619},\n {\"\u043c\u0438\u043a\u0440\u043e\u0440\u0430\u0439\u043e\u043d\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u043f\u0435\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3619},\n- {\"\u043d\u043a\u043e\", 1, {DICTIONARY_COMPANY_TYPE}, -1},\n {\"\u0431\u043b\u043e\u043a\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"per\", 1, {DICTIONARY_STREET_TYPE}, 3620},\n- {\"k\", 1, {DICTIONARY_BUILDING_TYPE}, 3574},\n+ {\"\u0434\u043e\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3618},\n {\"ostrov\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u0431\u0443\u043b\u044c\u0432\u0430\u0440\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"gorod\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"der\", 1, {DICTIONARY_QUALIFIER}, 3600},\n {\"severo-zapad\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"most\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"severo vostoku\", 1, {DICTIONARY_DIRECTIONAL}, 3583},\n- {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"\u043f\u043e\u0441\", 1, {DICTIONARY_QUALIFIER}, 3608},\n+ {\"\u0433\u043c\", 1, {DICTIONARY_QUALIFIER}, 3601},\n {\"\u044e\u0433\u043e-\u0437\u0430\u043f\u0430\u0434\u0443\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\u0434\", 1, {DICTIONARY_UNIT}, 3634},\n- {\"\u044e\u0433\u043e \u0437\u0430\u043f\u0430\u0434\u0443\", 1, {DICTIONARY_DIRECTIONAL}, 3588},\n- {\"\u043f\u0435\u0440\u0435\u0443\u043b\u043e\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3623},\n+ {\"koltsevaya\", 1, {DICTIONARY_STREET_TYPE}, 3620},\n {\"\u0448\u043a\u043e\u043b\u044c\u043d\u0430\u044f\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"\u0440-\u043d\", 1, {DICTIONARY_QUALIFIER}, 3610},\n {\"\u0441\u0432\u044f\u0442\u043e\u0439\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"r-n\", 1, {DICTIONARY_QUALIFIER}, 3607},\n {\"\u043a\u043e\u043b\u044c\u0446\u0435\u0432\u0430\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shkolnaya\", 1, {DICTIONARY_PLACE_NAME}, 3594},\n- {\"\u0433\u0435\u043d\", 1, {DICTIONARY_PERSONAL_TITLE}, 3590},\n+ {\"proyezd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"doroga\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3615},\n {\"\u0432\u043e\u0441\u0442\u043e\u043a\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"tara\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"bank eka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"apana sala\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"mw\", 1, {DICTIONARY_STREET_TYPE}, 3638},\n {\"mawatha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"tota\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"duwa\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"kopi\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"mw\", 1, {DICTIONARY_STREET_TYPE}, 3642},\n {\"para\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"nuwara\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"bet sappuwa\", 1, {DICTIONARY_PLACE_NAME}, -1},\n@@ -76281,486 +76293,486 @@\n {\"pura\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"vihara\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"gama\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3685},\n {\"v\u00fdchodn\u00fd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"juhozapad\", 1, {DICTIONARY_DIRECTIONAL}, 3648},\n {\"sv\u00e4ty\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"podplukovn\u00edka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"inziniera\", 1, {DICTIONARY_PERSONAL_TITLE}, 3661},\n+ {\"podporucika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3673},\n {\"park\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"okolo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sever\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"pplk\", 1, {DICTIONARY_PERSONAL_TITLE}, 3667},\n+ {\"csl\", 1, {DICTIONARY_TOPONYM}, 3691},\n+ {\"podplukovnika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3671},\n {\"hradska\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"vychodne\", 1, {DICTIONARY_DIRECTIONAL}, 3656},\n {\"gener\u00e1la\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"so\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"zapadna\", 1, {DICTIONARY_DIRECTIONAL}, 3655},\n- {\"nabrezie\", 1, {DICTIONARY_STREET_TYPE}, 3682},\n {\"na\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"zapadne\", 1, {DICTIONARY_DIRECTIONAL}, 3656},\n- {\"porucika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3668},\n- {\"v\u00fdchodn\u00e1\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"severne\", 1, {DICTIONARY_DIRECTIONAL}, 3646},\n- {\"plukovnika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3666},\n- {\"korzo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"svateho\", 1, {DICTIONARY_PERSONAL_TITLE}, 3672},\n+ {\"skolska\", 1, {DICTIONARY_PLACE_NAME}, 3678},\n+ {\"v\u00fdchod\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"ved\u013aa\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3668},\n+ {\"trat\", 1, {DICTIONARY_STREET_TYPE}, 3688},\n+ {\"juh\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"armadneho generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3662},\n {\"o\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"terasa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"juzna\", 1, {DICTIONARY_DIRECTIONAL}, 3640},\n- {\"severny\", 1, {DICTIONARY_DIRECTIONAL}, 3647},\n+ {\"stred\", 1, {DICTIONARY_QUALIFIER}, 3680},\n+ {\"vychodna\", 1, {DICTIONARY_DIRECTIONAL}, 3655},\n+ {\"n\u00e1m\", 1, {DICTIONARY_STREET_TYPE}, 3687},\n {\"naproti\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"plukovn\u00edka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"sv\u00e4t\u00e9ho\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"krala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3663},\n- {\"juhovychod\", 1, {DICTIONARY_DIRECTIONAL}, 3643},\n+ {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3664},\n {\"ju\u017en\u00e9\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ulicka\", 1, {DICTIONARY_STREET_TYPE}, 3686},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3672},\n+ {\"nabr\", 1, {DICTIONARY_STREET_TYPE}, 3686},\n {\"poru\u010d\u00edka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"trh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"zapad\", 1, {DICTIONARY_DIRECTIONAL}, 3658},\n {\"nadvorie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"por\", 1, {DICTIONARY_PERSONAL_TITLE}, 3672},\n {\"severoz\u00e1pad\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"z\u00e1padn\u00e9\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"severne\", 1, {DICTIONARY_DIRECTIONAL}, 3650},\n {\"pre\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"alej\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"s\u00eddl\", 1, {DICTIONARY_QUALIFIER}, 3675},\n+ {\"namestie\", 1, {DICTIONARY_STREET_TYPE}, 3687},\n {\"centrum\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"podporu\u010d\u00edka\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"br\u00e1na\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"z\u00e1pad\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3660},\n+ {\"zapadny\", 1, {DICTIONARY_DIRECTIONAL}, 3661},\n+ {\"\u010dsl\", 1, {DICTIONARY_TOPONYM}, 3691},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3675},\n+ {\"pplk\", 1, {DICTIONARY_PERSONAL_TITLE}, 3671},\n+ {\"blizko\", 1, {DICTIONARY_STOPWORD}, 3681},\n {\"tra\u0165\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"uli\u010dka\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"chodnik\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"k\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3689},\n {\"z\u00e1padn\u00fd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"cez\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"skolska\", 1, {DICTIONARY_PLACE_NAME}, 3674},\n- {\"chodnick\", 1, {DICTIONARY_STREET_TYPE}, 3680},\n- {\"blizko\", 1, {DICTIONARY_STOPWORD}, 3677},\n- {\"sidlisko\", 1, {DICTIONARY_QUALIFIER}, 3675},\n- {\"ved\u013aa\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"zapadne\", 1, {DICTIONARY_DIRECTIONAL}, 3660},\n+ {\"arm gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3662},\n+ {\"severozapad\", 1, {DICTIONARY_DIRECTIONAL}, 3653},\n {\"juhov\u00fdchod\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"z\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"molo\", 1, {DICTIONARY_STREET_TYPE}, 3681},\n- {\"armadneho generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3658},\n- {\"severna\", 1, {DICTIONARY_DIRECTIONAL}, 3645},\n- {\"vychodna\", 1, {DICTIONARY_DIRECTIONAL}, 3651},\n- {\"ppor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3669},\n+ {\"plukovnika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3670},\n+ {\"juzna\", 1, {DICTIONARY_DIRECTIONAL}, 3644},\n {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n\u00e1m\", 1, {DICTIONARY_STREET_TYPE}, 3683},\n {\"vo\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"sv\u00e4t\u00e1\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"pri\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"nabr\", 1, {DICTIONARY_STREET_TYPE}, 3682},\n {\"mimo\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"porucika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3672},\n {\"do\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"oproti\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"namestie\", 1, {DICTIONARY_STREET_TYPE}, 3683},\n+ {\"vychod\", 1, {DICTIONARY_DIRECTIONAL}, 3654},\n {\"cesta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"por\", 1, {DICTIONARY_PERSONAL_TITLE}, 3668},\n- {\"u\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"smerom\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"v\u00fdchodn\u00e9\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"s\u00eddl\", 1, {DICTIONARY_QUALIFIER}, 3679},\n {\"\u0161kolsk\u00e1\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"zod\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"zapadny\", 1, {DICTIONARY_DIRECTIONAL}, 3657},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3671},\n+ {\"nam\", 1, {DICTIONARY_STREET_TYPE}, 3687},\n+ {\"ulicka\", 1, {DICTIONARY_STREET_TYPE}, 3690},\n {\"n\u00e1mestie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"centr\", 1, {DICTIONARY_DIRECTIONAL}, 3639},\n+ {\"plk\", 1, {DICTIONARY_PERSONAL_TITLE}, 3670},\n+ {\"kapitana\", 1, {DICTIONARY_PERSONAL_TITLE}, 3666},\n+ {\"u\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"severov\u00fdchod\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"kapit\u00e1na\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"profesora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"vedla\", 1, {DICTIONARY_STOPWORD}, 3682},\n {\"a\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"kral'a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3663},\n {\"severn\u00e9\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"stred\", 1, {DICTIONARY_QUALIFIER}, 3676},\n- {\"severozapad\", 1, {DICTIONARY_DIRECTIONAL}, 3649},\n- {\"\u010dsl\", 1, {DICTIONARY_TOPONYM}, 3687},\n+ {\"molo\", 1, {DICTIONARY_STREET_TYPE}, 3685},\n+ {\"sidlisko\", 1, {DICTIONARY_QUALIFIER}, 3679},\n+ {\"severny\", 1, {DICTIONARY_DIRECTIONAL}, 3651},\n+ {\"svaty\", 1, {DICTIONARY_PERSONAL_TITLE}, 3675},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3674},\n {\"sv\u00e4tej\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"juhoz\u00e1pad\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 3661},\n- {\"gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3660},\n+ {\"krala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3667},\n {\"s\u00eddlisko\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"juhozapad\", 1, {DICTIONARY_DIRECTIONAL}, 3644},\n+ {\"ponad\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"osada\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"doktora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"ponad\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"terasa\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"generala\", 1, {DICTIONARY_PERSONAL_TITLE}, 3664},\n {\"pole\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"br\u00e1na\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"svata\", 1, {DICTIONARY_PERSONAL_TITLE}, 3674},\n+ {\"n\u00e1br\", 1, {DICTIONARY_STREET_TYPE}, 3686},\n+ {\"severn\u00fd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"ing\", 1, {DICTIONARY_PERSONAL_TITLE}, 3665},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3677},\n+ {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3669},\n+ {\"s\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"vychodny\", 1, {DICTIONARY_DIRECTIONAL}, 3657},\n+ {\"chodnick\", 1, {DICTIONARY_STREET_TYPE}, 3684},\n+ {\"popri\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ppor\", 1, {DICTIONARY_PERSONAL_TITLE}, 3673},\n+ {\"z\u00e1pad\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u010deskoslovenskej\", 1, {DICTIONARY_TOPONYM}, -1},\n- {\"ceskoslovenskej\", 1, {DICTIONARY_TOPONYM}, 3687},\n- {\"nam\", 1, {DICTIONARY_STREET_TYPE}, 3683},\n- {\"severovychod\", 1, {DICTIONARY_DIRECTIONAL}, 3648},\n- {\"promenada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"severn\u00fd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"svatej\", 1, {DICTIONARY_PERSONAL_TITLE}, 3673},\n- {\"vychod\", 1, {DICTIONARY_DIRECTIONAL}, 3650},\n- {\"n\u00e1br\", 1, {DICTIONARY_STREET_TYPE}, 3682},\n- {\"juzne\", 1, {DICTIONARY_DIRECTIONAL}, 3641},\n- {\"s\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"arm gen\", 1, {DICTIONARY_PERSONAL_TITLE}, 3658},\n- {\"popri\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"juzny\", 1, {DICTIONARY_DIRECTIONAL}, 3642},\n- {\"podporucika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3669},\n- {\"csl\", 1, {DICTIONARY_TOPONYM}, 3687},\n- {\"plk\", 1, {DICTIONARY_PERSONAL_TITLE}, 3666},\n- {\"kapitana\", 1, {DICTIONARY_PERSONAL_TITLE}, 3662},\n- {\"vychodne\", 1, {DICTIONARY_DIRECTIONAL}, 3652},\n- {\"brana\", 1, {DICTIONARY_STREET_TYPE}, 3679},\n+ {\"ceskoslovenskej\", 1, {DICTIONARY_TOPONYM}, 3691},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3663},\n+ {\"v\u00fdchodn\u00e1\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"centr\", 1, {DICTIONARY_DIRECTIONAL}, 3643},\n {\"kr\u00e1\u013ea\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"kopec\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bli\u017eko\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"juh\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"severna\", 1, {DICTIONARY_DIRECTIONAL}, 3649},\n {\"arm\u00e1dneho gener\u00e1la\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"svaty\", 1, {DICTIONARY_PERSONAL_TITLE}, 3671},\n {\"majora\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"trat\", 1, {DICTIONARY_STREET_TYPE}, 3684},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3670},\n+ {\"korzo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"v\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"podplukovnika\", 1, {DICTIONARY_PERSONAL_TITLE}, 3667},\n+ {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3666},\n {\"haj\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"dvor\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pod\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"pred\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"m\u00f3lo\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"n\u00e1bre\u017eie\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"z\u00e1padn\u00e1\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"trh\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"prof\", 1, {DICTIONARY_PERSONAL_TITLE}, 3665},\n+ {\"zapadna\", 1, {DICTIONARY_DIRECTIONAL}, 3659},\n+ {\"nabrezie\", 1, {DICTIONARY_STREET_TYPE}, 3686},\n+ {\"severovychod\", 1, {DICTIONARY_DIRECTIONAL}, 3652},\n+ {\"kral'a\", 1, {DICTIONARY_PERSONAL_TITLE}, 3667},\n+ {\"juzne\", 1, {DICTIONARY_DIRECTIONAL}, 3645},\n+ {\"svatej\", 1, {DICTIONARY_PERSONAL_TITLE}, 3677},\n {\"ju\u017en\u00e1\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3673},\n- {\"mjr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3664},\n- {\"vychodny\", 1, {DICTIONARY_DIRECTIONAL}, 3653},\n- {\"smerom\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"inziniera\", 1, {DICTIONARY_PERSONAL_TITLE}, 3665},\n+ {\"promenada\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"svateho\", 1, {DICTIONARY_PERSONAL_TITLE}, 3676},\n {\"severn\u00e1\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"juzny\", 1, {DICTIONARY_DIRECTIONAL}, 3646},\n {\"medzi\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"vedla\", 1, {DICTIONARY_STOPWORD}, 3678},\n- {\"svata\", 1, {DICTIONARY_PERSONAL_TITLE}, 3670},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3659},\n {\"stredisko\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"kpt\", 1, {DICTIONARY_PERSONAL_TITLE}, 3662},\n- {\"v\u00fdchod\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"zapad\", 1, {DICTIONARY_DIRECTIONAL}, 3654},\n+ {\"juhovychod\", 1, {DICTIONARY_DIRECTIONAL}, 3647},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3676},\n+ {\"pod\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"brana\", 1, {DICTIONARY_STREET_TYPE}, 3683},\n {\"za\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"in\u017einiera\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"ju\u017en\u00fd\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"ku\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"c\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3693},\n {\"grajska\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"zgornje\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"v\", 1, {DICTIONARY_SYNONYM}, 3702},\n+ {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 3692},\n+ {\"sr\", 1, {DICTIONARY_SYNONYM}, 3702},\n {\"spodnji\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sr\", 1, {DICTIONARY_SYNONYM}, 3698},\n {\"pot\", 2, {DICTIONARY_STOPWORD, DICTIONARY_STREET_TYPE}, -1},\n- {\"br\", 1, {DICTIONARY_PERSONAL_TITLE}, 3688},\n- {\"sp\", 1, {DICTIONARY_SYNONYM}, 3694},\n+ {\"zg\", 1, {DICTIONARY_SYNONYM}, 3707},\n+ {\"v\", 1, {DICTIONARY_SYNONYM}, 3706},\n {\"ob\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"velika\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sp\", 1, {DICTIONARY_SYNONYM}, 3695},\n+ {\"sp\", 1, {DICTIONARY_SYNONYM}, 3699},\n {\"v\", 2, {DICTIONARY_AMBIGUOUS_EXPANSION, DICTIONARY_STOPWORD}, -1},\n {\"spodnje\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"vas\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"sr\", 1, {DICTIONARY_SYNONYM}, 3701},\n {\"spodnja\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"c\", 1, {DICTIONARY_STREET_TYPE}, 3691},\n {\"zgornja\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"sveti\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"v\", 1, {DICTIONARY_SYNONYM}, 3701},\n {\"na\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sr\", 1, {DICTIONARY_SYNONYM}, 3697},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3692},\n+ {\"zgornje\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"c\", 1, {DICTIONARY_STREET_TYPE}, 3695},\n+ {\"sp\", 1, {DICTIONARY_SYNONYM}, 3698},\n {\"velike\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sp\", 1, {DICTIONARY_SYNONYM}, 3693},\n+ {\"srednji\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"sr\", 1, {DICTIONARY_SYNONYM}, 3700},\n {\"trg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"v\", 1, {DICTIONARY_SYNONYM}, 3700},\n+ {\"zg\", 1, {DICTIONARY_SYNONYM}, 3709},\n {\"veliki\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"sr\", 1, {DICTIONARY_SYNONYM}, 3696},\n {\"srednje\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"pri\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3689},\n- {\"zg\", 1, {DICTIONARY_SYNONYM}, 3705},\n- {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3690},\n- {\"v\", 1, {DICTIONARY_SYNONYM}, 3699},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3696},\n+ {\"v\", 1, {DICTIONARY_SYNONYM}, 3704},\n {\"cesta\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sp\", 1, {DICTIONARY_SYNONYM}, 3697},\n {\"zgornji\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"sv\", 1, {DICTIONARY_PERSONAL_TITLE}, 3694},\n {\"veliko\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"bratov\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"zg\", 1, {DICTIONARY_SYNONYM}, 3703},\n+ {\"zg\", 1, {DICTIONARY_SYNONYM}, 3708},\n+ {\"v\", 1, {DICTIONARY_SYNONYM}, 3703},\n {\"srednja\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"zg\", 1, {DICTIONARY_SYNONYM}, 3704},\n {\"sveta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"srednji\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"v\", 1, {DICTIONARY_SYNONYM}, 3705},\n {\"obilaznica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bulevar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3710},\n+ {\"\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3713},\n {\"\u0431\u0443\u043b\u0435\u0432\u0430\u0440\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3712},\n {\"\u043a\u0440\u0430\u0459\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u0442\u0440\u0433\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3709},\n {\"ulica\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043f\u0440\u0438\u043b\u0430\u0437\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"ul\", 1, {DICTIONARY_STREET_TYPE}, 3714},\n {\"\u0433\u0435\u043d\u0435\u0440\u0430\u043b\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"trg\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"bulevardi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0443\u043b\u0438\u0446\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043c\u0430\u0433\u0438\u0441\u0442\u0440\u0430\u043b\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0432\u043b\u0430\u0434\u0438\u043a\u0435\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3708},\n- {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3707},\n+ {\"\u0434\u0440\", 1, {DICTIONARY_PERSONAL_TITLE}, 3710},\n {\"\u0434\u043e\u043a\u0442\u043e\u0440\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u043e\u0431\u0438\u043b\u0430\u0437\u043d\u0438\u0446\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0434\u0440\", 1, {DICTIONARY_PERSONAL_TITLE}, 3706},\n {\"\u0432\u0438\u043d\u043e\u0433\u0440\u0430\u0434\u0441\u043a\u0430\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"prilaz\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"magistrala\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3711},\n {\"\u0432\u043e\u0458\u0432\u043e\u0434\u0435\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u0448\u043a\u043e\u043b\u0441\u043a\u0430\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u043a\u043d\u0435\u0437\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"graenden\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3716},\n+ {\"oever\", 1, {DICTIONARY_STOPWORD}, 3735},\n+ {\"\u00f6\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n {\"v\u00e4stra\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"paa andra sidan\", 1, {DICTIONARY_STOPWORD}, 3737},\n {\"motliggande\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"l\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"s:a\", 1, {DICTIONARY_DIRECTIONAL}, 3724},\n+ {\"laang\", 1, {DICTIONARY_SYNONYM}, 3740},\n {\"\u00f6\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"ostra\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n+ {\"s:t\", 1, {DICTIONARY_PERSONAL_TITLE}, 3727},\n {\"aat\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"fraan\", 1, {DICTIONARY_STOPWORD}, 3726},\n+ {\"framfoer\", 1, {DICTIONARY_STOPWORD}, 3731},\n {\"sankt\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"stig\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"l\", 1, {DICTIONARY_SYNONYM}, 3737},\n- {\"vagen\", 1, {DICTIONARY_STREET_TYPE}, 3717},\n+ {\"st\", 1, {DICTIONARY_STREET_TYPE}, 3719},\n+ {\"vag\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3720},\n+ {\"alle\", 1, {DICTIONARY_STREET_TYPE}, 3738},\n {\"v\u00e4gen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e5t\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"ostra\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n {\"o\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"gr\u00e4nden\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, -1},\n- {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3716},\n- {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3713},\n- {\"foer\", 1, {DICTIONARY_STOPWORD}, 3725},\n- {\"v\", 1, {DICTIONARY_DIRECTIONAL}, 3721},\n- {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3718},\n+ {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3717},\n {\"f\u00f6re\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"g:la\", 1, {DICTIONARY_SYNONYM}, 3739},\n {\"l\u00e5ng\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"p\u00e5\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"foere\", 1, {DICTIONARY_STOPWORD}, 3732},\n+ {\"\u00f6:a\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n {\"emellan\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3714},\n- {\"graenden\", 1, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE}, 3712},\n+ {\"vaestra\", 1, {DICTIONARY_DIRECTIONAL}, 3725},\n {\"intill\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"oever\", 1, {DICTIONARY_STOPWORD}, 3731},\n- {\"\u00f6\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n {\"fr\u00e5n\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"bakom\", 1, {DICTIONARY_STOPWORD}, -1},\n+ {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3724},\n {\"all\u00e9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"foer\", 1, {DICTIONARY_STOPWORD}, 3729},\n+ {\"fraan\", 1, {DICTIONARY_STOPWORD}, 3730},\n+ {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3726},\n {\"s\u00f6dra\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"gamla\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"st\", 1, {DICTIONARY_STREET_TYPE}, 3715},\n- {\"vag\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3716},\n- {\"alle\", 1, {DICTIONARY_STREET_TYPE}, 3734},\n+ {\"stora\", 1, {DICTIONARY_SYNONYM}, -1},\n+ {\"v:a\", 1, {DICTIONARY_DIRECTIONAL}, 3725},\n {\"\u00f6ver\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n- {\"oestra\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n+ {\"v.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3720},\n+ {\"g\", 1, {DICTIONARY_STREET_TYPE}, 3717},\n+ {\"st.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3719},\n+ {\"s:ta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3728},\n {\"sankta\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"foere\", 1, {DICTIONARY_STOPWORD}, 3728},\n {\"doktor\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"vaestra\", 1, {DICTIONARY_DIRECTIONAL}, 3721},\n+ {\"vaegen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3721},\n {\"under\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"vastra\", 1, {DICTIONARY_DIRECTIONAL}, 3721},\n {\"norra\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"n\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"till\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"stora\", 1, {DICTIONARY_SYNONYM}, -1},\n- {\"s\", 1, {DICTIONARY_DIRECTIONAL}, 3720},\n+ {\"sodra\", 1, {DICTIONARY_DIRECTIONAL}, 3724},\n {\"v\u00e4g\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"paa andra sidan\", 1, {DICTIONARY_STOPWORD}, 3733},\n- {\"\u00f6:a\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n- {\"dr\", 1, {DICTIONARY_PERSONAL_TITLE}, 3722},\n+ {\"graend\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 3715},\n {\"in\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"v:a\", 1, {DICTIONARY_DIRECTIONAL}, 3721},\n+ {\"o:a\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n+ {\"vaeg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3720},\n+ {\"i naerheten\", 1, {DICTIONARY_STOPWORD}, 3733},\n {\"p\u00e5 andra sidan\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"paa\", 1, {DICTIONARY_STOPWORD}, 3732},\n- {\"naermast\", 1, {DICTIONARY_STOPWORD}, 3730},\n- {\"st.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3715},\n- {\"s:ta\", 1, {DICTIONARY_PERSONAL_TITLE}, 3724},\n- {\"sodra\", 1, {DICTIONARY_DIRECTIONAL}, 3720},\n+ {\"o\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n {\"gata\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n {\"liden\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vaeg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3716},\n+ {\"vagen\", 1, {DICTIONARY_STREET_TYPE}, 3721},\n+ {\"vastra\", 1, {DICTIONARY_DIRECTIONAL}, 3725},\n+ {\"l\", 1, {DICTIONARY_SYNONYM}, 3741},\n {\"s\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3716},\n {\"n\u00e4rmast\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"plan\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"graend\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, 3711},\n+ {\"oestra\", 1, {DICTIONARY_DIRECTIONAL}, 3723},\n+ {\"n:a\", 1, {DICTIONARY_DIRECTIONAL}, 3722},\n {\"av\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"bak\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3714},\n- {\"o:a\", 1, {DICTIONARY_DIRECTIONAL}, 3719},\n+ {\"pl.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3718},\n+ {\"st\", 1, {DICTIONARY_SYNONYM}, 3742},\n {\"g\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"via\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"i naerheten\", 1, {DICTIONARY_STOPWORD}, 3729},\n {\"v\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n+ {\"naermast\", 1, {DICTIONARY_STOPWORD}, 3734},\n {\"stigen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"s:a\", 1, {DICTIONARY_DIRECTIONAL}, 3720},\n {\"torg\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"laang\", 1, {DICTIONARY_SYNONYM}, 3736},\n- {\"s:t\", 1, {DICTIONARY_PERSONAL_TITLE}, 3723},\n+ {\"n\", 1, {DICTIONARY_DIRECTIONAL}, 3722},\n {\"f\u00f6r\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g:la\", 1, {DICTIONARY_SYNONYM}, 3735},\n {\"i n\u00e4rheten\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"mellan\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"framme\", 1, {DICTIONARY_STOPWORD}, -1},\n {\"plats\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n+ {\"soedra\", 1, {DICTIONARY_DIRECTIONAL}, 3724},\n {\"\u00f6stra\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"lilla\", 1, {DICTIONARY_SYNONYM}, -1},\n {\"i\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"g.\", 1, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE}, 3713},\n+ {\"paa\", 1, {DICTIONARY_STOPWORD}, 3736},\n+ {\"v\", 1, {DICTIONARY_DIRECTIONAL}, 3725},\n {\"gr\u00e4nd\", 2, {DICTIONARY_CONCATENATED_SUFFIX_INSEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"vaegen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, 3717},\n+ {\"v\", 1, {DICTIONARY_STREET_TYPE}, 3720},\n {\"platsen\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"framfoer\", 1, {DICTIONARY_STOPWORD}, 3727},\n {\"framf\u00f6r\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"soedra\", 1, {DICTIONARY_DIRECTIONAL}, 3720},\n- {\"n:a\", 1, {DICTIONARY_DIRECTIONAL}, 3718},\n {\"gatan\", 2, {DICTIONARY_CONCATENATED_SUFFIX_SEPARABLE, DICTIONARY_STREET_TYPE}, -1},\n- {\"st\", 1, {DICTIONARY_SYNONYM}, 3738},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3718},\n {\"\u0e0b\u0e2d\u0e22\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0e0b\u0e2d\u0e22\u0e40\u0e17\u0e28\u0e1a\u0e32\u0e25\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0e44\u0e2e\u0e40\u0e27\u0e22\u0e4c\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trxk\", 1, {DICTIONARY_STREET_TYPE}, 3742},\n {\"\u0e16\u0e19\u0e19\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"soi thetsaban\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"thnn\", 1, {DICTIONARY_STREET_TYPE}, 3741},\n+ {\"\u0e44\u0e2e\u0e40\u0e27\u0e22\u0e4c\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sxy\", 1, {DICTIONARY_STREET_TYPE}, 3743},\n+ {\"t\u0304hnn\", 1, {DICTIONARY_STREET_TYPE}, 3745},\n+ {\"soi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"thnn\", 1, {DICTIONARY_STREET_TYPE}, 3745},\n {\"\u0e15\u0e23\u0e2d\u0e01\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sxy the\u1e63\u0304b\u0101l\", 1, {DICTIONARY_STREET_TYPE}, 3740},\n- {\"soi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sxy tesbal\", 1, {DICTIONARY_STREET_TYPE}, 3740},\n- {\"sxy\", 1, {DICTIONARY_STREET_TYPE}, 3739},\n+ {\"trok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"trxk\", 1, {DICTIONARY_STREET_TYPE}, 3746},\n {\"\u0e17\u0e32\u0e07\u0e14\u0e48\u0e27\u0e19\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"trok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"t\u0304hnn\", 1, {DICTIONARY_STREET_TYPE}, 3741},\n+ {\"sxy the\u1e63\u0304b\u0101l\", 1, {DICTIONARY_STREET_TYPE}, 3744},\n {\"thanon\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"cad\", 1, {DICTIONARY_STREET_TYPE}, 3750},\n+ {\"sxy tesbal\", 1, {DICTIONARY_STREET_TYPE}, 3744},\n {\"caddesi\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"sok\", 1, {DICTIONARY_STREET_TYPE}, 3754},\n- {\"sk\", 1, {DICTIONARY_STREET_TYPE}, 3753},\n- {\"ilce\", 1, {DICTIONARY_QUALIFIER}, 3745},\n+ {\"yol\", 1, {DICTIONARY_STREET_TYPE}, 3759},\n {\"yolu\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"d\", 1, {DICTIONARY_UNIT}, 3757},\n- {\"hanim\", 1, {DICTIONARY_PERSONAL_TITLE}, 3743},\n- {\"koprusu\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3744},\n- {\"daire\", 1, {DICTIONARY_UNIT}, -1},\n- {\"cevreyolu\", 1, {DICTIONARY_STREET_TYPE}, 3752},\n+ {\"bulvari\", 1, {DICTIONARY_STREET_TYPE}, 3753},\n+ {\"cd\", 1, {DICTIONARY_STREET_TYPE}, 3755},\n+ {\"sok\", 1, {DICTIONARY_STREET_TYPE}, 3758},\n+ {\"sk\", 1, {DICTIONARY_STREET_TYPE}, 3758},\n {\"han\u0131m\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n+ {\"koprusu\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, 3748},\n+ {\"otoyolu\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"no:\", 1, {DICTIONARY_UNIT}, 3763},\n {\"k\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"sokagi\", 1, {DICTIONARY_STREET_TYPE}, 3754},\n- {\"\u00e7evreyolu\", 1, {DICTIONARY_STREET_TYPE}, 3752},\n {\"mimar\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 3749},\n {\"cadde\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bulvari\", 1, {DICTIONARY_STREET_TYPE}, 3749},\n- {\"no\", 1, {DICTIONARY_UNIT}, 3759},\n+ {\"cd\", 1, {DICTIONARY_STREET_TYPE}, 3754},\n+ {\"sokagi\", 1, {DICTIONARY_STREET_TYPE}, 3758},\n {\"il\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"sultan\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"k\", 1, {DICTIONARY_UNIT}, 3758},\n- {\"cd\", 1, {DICTIONARY_STREET_TYPE}, 3751},\n+ {\"cevre yolu\", 1, {DICTIONARY_STREET_TYPE}, 3756},\n {\"apartman\", 1, {DICTIONARY_UNIT}, -1},\n- {\"sokak\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"koyu\", 1, {DICTIONARY_QUALIFIER}, 3750},\n+ {\"mah\", 1, {DICTIONARY_QUALIFIER}, 3752},\n {\"mahallesi\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"soka\u011f\u0131\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cad\", 1, {DICTIONARY_STREET_TYPE}, 3755},\n {\"kat\", 1, {DICTIONARY_UNIT}, -1},\n- {\"koyu\", 1, {DICTIONARY_QUALIFIER}, 3746},\n- {\"mah\", 1, {DICTIONARY_QUALIFIER}, 3748},\n+ {\"apt\", 1, {DICTIONARY_UNIT}, 3760},\n+ {\"k\", 1, {DICTIONARY_UNIT}, 3762},\n+ {\"d\", 1, {DICTIONARY_UNIT}, 3761},\n {\"mahalle\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"nolu\", 1, {DICTIONARY_UNIT}, 3760},\n- {\"yol\", 1, {DICTIONARY_STREET_TYPE}, 3755},\n- {\"apt\", 1, {DICTIONARY_UNIT}, 3756},\n+ {\"blv\", 1, {DICTIONARY_STREET_TYPE}, 3753},\n+ {\"numara\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"ilce\", 1, {DICTIONARY_QUALIFIER}, 3749},\n {\"il\u00e7e\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"cevreyolu\", 1, {DICTIONARY_STREET_TYPE}, 3756},\n+ {\"sokak\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u00e7evre yolu\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"cami\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sok\", 1, {DICTIONARY_STREET_TYPE}, 3753},\n- {\"sk\", 1, {DICTIONARY_STREET_TYPE}, 3754},\n+ {\"cad\", 1, {DICTIONARY_STREET_TYPE}, 3754},\n+ {\"nolu\", 1, {DICTIONARY_UNIT}, 3764},\n {\"d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"numarala\", 1, {DICTIONARY_UNIT}, -1},\n- {\"cad\", 1, {DICTIONARY_STREET_TYPE}, 3751},\n- {\"cevre yolu\", 1, {DICTIONARY_STREET_TYPE}, 3752},\n+ {\"no :\", 1, {DICTIONARY_UNIT}, 3763},\n+ {\"daire\", 1, {DICTIONARY_UNIT}, -1},\n {\"k\u00f6pr\u00fcs\u00fc\", 2, {DICTIONARY_PLACE_NAME, DICTIONARY_STREET_TYPE}, -1},\n+ {\"sok\", 1, {DICTIONARY_STREET_TYPE}, 3757},\n {\"bulvar\u0131\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"no:\", 1, {DICTIONARY_UNIT}, 3759},\n- {\"cd\", 1, {DICTIONARY_STREET_TYPE}, 3750},\n- {\"otoyolu\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"no :\", 1, {DICTIONARY_UNIT}, 3759},\n- {\"numara\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"hanim\", 1, {DICTIONARY_PERSONAL_TITLE}, 3747},\n+ {\"\u00e7evreyolu\", 1, {DICTIONARY_STREET_TYPE}, 3756},\n+ {\"mah\", 1, {DICTIONARY_QUALIFIER}, 3751},\n+ {\"bl\", 1, {DICTIONARY_STREET_TYPE}, 3753},\n+ {\"no\", 1, {DICTIONARY_UNIT}, 3763},\n {\"bulvar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"k\u00f6y\u00fc\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"mah\", 1, {DICTIONARY_QUALIFIER}, 3747},\n- {\"bl\", 1, {DICTIONARY_STREET_TYPE}, 3749},\n+ {\"sk\", 1, {DICTIONARY_STREET_TYPE}, 3757},\n {\"bey\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"\u043b\u043e\u043c\u043e\u043d\u043e\u0441\u043e\u0432\u0430\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u043f\u0440\u043e\u0435\u0437\u0434\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"kvartal\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 3767},\n- {\"vul\", 1, {DICTIONARY_STREET_TYPE}, 3786},\n- {\"doroha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u0431\u0443\u043b\u044c\u0432\u0430\u0440\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"pro\", 1, {DICTIONARY_STREET_TYPE}, 3777},\n+ {\"lin\", 1, {DICTIONARY_STREET_TYPE}, 3784},\n+ {\"ploshcha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"blvd\", 1, {DICTIONARY_STREET_TYPE}, 3771},\n+ {\"shkilna\", 1, {DICTIONARY_PLACE_NAME}, 3765},\n {\"\u043b\u0438\u043d\u0438\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0434\u043e\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3768},\n+ {\"\u0442\u0443\u043f\u0438\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0430\u043a\u0430\u0434\u0435\u043c\u0456\u043a\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"shose\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0448\u043e\u0441\u0435\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0442\u0443\u043f\u0438\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0431\u0443\u043b\u044c\u0432\u0430\u0440\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u043f\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3778},\n+ {\"kvartal\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u0448\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n {\"\u0430\u043b\u043b\u0435\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"provulok\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"kimnata\", 1, {DICTIONARY_UNIT}, -1},\n- {\"pro\", 1, {DICTIONARY_STREET_TYPE}, 3773},\n- {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3776},\n- {\"\u043f\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3774},\n- {\"\u0432\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3785},\n- {\"\u043a\u0432\", 1, {DICTIONARY_UNIT}, 3787},\n- {\"lin\", 1, {DICTIONARY_STREET_TYPE}, 3780},\n- {\"\u043d\u0430\u0431\", 1, {DICTIONARY_STREET_TYPE}, 3770},\n+ {\"\u0434\u043e\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3772},\n+ {\"\u0430\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3767},\n+ {\"zavodska\", 1, {DICTIONARY_PLACE_NAME}, 3766},\n+ {\"linya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"tup\", 1, {DICTIONARY_STREET_TYPE}, 3788},\n+ {\"dor\", 1, {DICTIONARY_STREET_TYPE}, 3773},\n+ {\"\u043a\u0432\u0430\u0440\u0442\u0438\u0440\u0430\", 1, {DICTIONARY_UNIT}, -1},\n {\"kvartyra\", 1, {DICTIONARY_UNIT}, -1},\n- {\"zavodska\", 1, {DICTIONARY_PLACE_NAME}, 3762},\n+ {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3780},\n {\"\u043d\u0430\u0431\u0435\u0440\u0435\u0436\u043d\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"linya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043f\u0440\u043e\u0441\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3777},\n+ {\"\u043b\u0438\u043d\", 1, {DICTIONARY_STREET_TYPE}, 3783},\n+ {\"\u043f\u0440\u043e\u0432\u0443\u043b\u043e\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"zavods'ka\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"naberezhna\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043f\u0440\u043e\u0432\u0443\u043b\u043e\u043a\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u043d\u0430\u0431\", 1, {DICTIONARY_STREET_TYPE}, 3774},\n {\"\u043a\u0432\u0430\u0440\u0442\u0430\u043b\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"ploshcha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043a\u043c\", 1, {DICTIONARY_UNIT}, 3789},\n- {\"\u043b\u0438\u043d\", 1, {DICTIONARY_STREET_TYPE}, 3779},\n- {\"nab\", 1, {DICTIONARY_STREET_TYPE}, 3771},\n- {\"\u043a\u0432\u0430\u0440\u0442\u0438\u0440\u0430\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"nab\", 1, {DICTIONARY_STREET_TYPE}, 3775},\n+ {\"\u043f\u0440\u043e\u0441\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3781},\n+ {\"\u0442\u0443\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3787},\n+ {\"tupik\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u043a\u043c\", 1, {DICTIONARY_UNIT}, 3793},\n+ {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3781},\n {\"shkil'na\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"kv\", 1, {DICTIONARY_UNIT}, 3792},\n {\"vulytsya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3766},\n- {\"\u043f\u0440\u043e\u0441\u043f\u0435\u043a\u0442\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0442\u0443\u043f\", 1, {DICTIONARY_STREET_TYPE}, 3783},\n {\"\u0437\u0430\u0432\u043e\u0434\u0441\u044c\u043a\u0430\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u043c\u0430\u0440\u0448\u0430\u043b\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n {\"boulevard\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u043a\u0456\u043c\u043d\u0430\u0442\u0430\", 1, {DICTIONARY_UNIT}, -1},\n {\"prospekt\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u043f\u0440\u043e\u0432\", 1, {DICTIONARY_STREET_TYPE}, 3772},\n+ {\"\u0432\u0443\u043b\u0438\u0446\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"proyezd\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3775},\n- {\"km\", 1, {DICTIONARY_UNIT}, 3790},\n+ {\"\u0432\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3789},\n+ {\"vul\", 1, {DICTIONARY_STREET_TYPE}, 3790},\n {\"\u0448\u043a\u0456\u043b\u044c\u043d\u0430\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3764},\n- {\"tup\", 1, {DICTIONARY_STREET_TYPE}, 3784},\n- {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3778},\n- {\"\u043f\u043b\u043e\u0449\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 3786},\n+ {\"\u043a\u0432\", 1, {DICTIONARY_UNIT}, 3791},\n+ {\"\u043f\u0440\u043e\u0432\", 1, {DICTIONARY_STREET_TYPE}, 3776},\n+ {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3769},\n+ {\"\u043f\u0440\u043e\u0441\u043f\u0435\u043a\u0442\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"lomonosova\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"sh\", 1, {DICTIONARY_STREET_TYPE}, 3782},\n- {\"\u043f\u0440\", 1, {DICTIONARY_STREET_TYPE}, 3777},\n- {\"kv\", 1, {DICTIONARY_UNIT}, 3788},\n- {\"tupik\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0431\u0443\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3765},\n- {\"\u0432\u0443\u043b\u0438\u0446\u044f\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"prkt\", 1, {DICTIONARY_STREET_TYPE}, 3778},\n+ {\"al\", 1, {DICTIONARY_STREET_TYPE}, 3768},\n+ {\"pr\", 1, {DICTIONARY_STREET_TYPE}, 3782},\n+ {\"pl\", 1, {DICTIONARY_STREET_TYPE}, 3779},\n+ {\"bul\", 1, {DICTIONARY_STREET_TYPE}, 3770},\n+ {\"doroha\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u0448\", 1, {DICTIONARY_STREET_TYPE}, 3785},\n {\"alleya\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dor\", 1, {DICTIONARY_STREET_TYPE}, 3769},\n+ {\"km\", 1, {DICTIONARY_UNIT}, 3794},\n {\"bulvar\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0433\u0435\u043d\u0435\u0440\u0430\u043b\u0430\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"\u0448\", 1, {DICTIONARY_STREET_TYPE}, 3781},\n- {\"\u0430\u043b\", 1, {DICTIONARY_STREET_TYPE}, 3763},\n+ {\"prkt\", 1, {DICTIONARY_STREET_TYPE}, 3782},\n+ {\"\u043f\u043b\u043e\u0449\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0434\u043e\u0440\u043e\u0433\u0430\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shkilna\", 1, {DICTIONARY_PLACE_NAME}, 3761},\n {\"\u0644\u06cc\u0646\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u06c1\u0627\u0626\u06cc \u0648\u06d2\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0634\u0627\u06c1\u0631\u0627\u06c1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n@@ -76768,309 +76780,309 @@\n {\"\u0631\u0648\u0688\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0627\u06cc\u06a9\u0633\u067e\u0631\u06cc\u0633 \u0648\u06d2\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u0633\u0691\u06a9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"q t\", 1, {DICTIONARY_STREET_TYPE}, 3832},\n- {\"tinh lo\", 1, {DICTIONARY_STREET_TYPE}, 3834},\n- {\"cong ty co phan\", 1, {DICTIONARY_PLACE_NAME}, 3794},\n- {\"cv\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n- {\"qt\", 1, {DICTIONARY_STREET_TYPE}, 3832},\n- {\"quang truong\", 1, {DICTIONARY_STREET_TYPE}, 3832},\n- {\"rh\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n- {\"v\u01b0\u01a1n qu\u1ed1c gia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c v\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n+ {\"cty c p\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n+ {\"thcs\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n+ {\"cong ty\", 1, {DICTIONARY_PLACE_NAME}, 3799},\n+ {\"d\", 1, {DICTIONARY_STREET_TYPE}, 3832},\n+ {\"tong cong ty\", 1, {DICTIONARY_PLACE_NAME}, 3822},\n+ {\"t l\", 1, {DICTIONARY_STREET_TYPE}, 3838},\n {\"s\u00e2n bay qu\u1ed1c t\u1ebf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nh\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n- {\"nha tho\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n- {\"q l\", 1, {DICTIONARY_STREET_TYPE}, 3833},\n- {\"cong truong\", 1, {DICTIONARY_STREET_TYPE}, 3826},\n- {\"\u0111\u01b0\u1eddng h\u1ebbm\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0111l\", 1, {DICTIONARY_STREET_TYPE}, 3827},\n- {\"vbt\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n- {\"d\", 1, {DICTIONARY_STREET_TYPE}, 3828},\n- {\"c c k q\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n- {\"nha thi dau\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n+ {\"kdl\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n+ {\"tl\", 1, {DICTIONARY_STREET_TYPE}, 3838},\n+ {\"tcty\", 1, {DICTIONARY_PLACE_NAME}, 3822},\n+ {\"svd\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n+ {\"tieu hoc\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n+ {\"s v d\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n+ {\"t x\", 1, {DICTIONARY_QUALIFIER}, 3828},\n {\"c\u00f4ng vi\u00ean\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"vqg\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n- {\"trung h\u1ecdc c\u01a1 s\u1edf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"khu cong nghiep\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n- {\"t h c s\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n- {\"vuon quoc gia\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n- {\"vien bao tang\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n+ {\"cckq\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n+ {\"n t d\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n+ {\"th\u00e0nh ph\u1ed1\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"tttm\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n+ {\"tp\", 1, {DICTIONARY_QUALIFIER}, 3827},\n {\"nh\u00e0 th\u1edd\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"qu\u1ea3ng tr\u01b0\u1eddng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"quan\", 1, {DICTIONARY_QUALIFIER}, 3822},\n- {\"khach san\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n- {\"cty cp\", 1, {DICTIONARY_PLACE_NAME}, 3794},\n- {\"c t\", 1, {DICTIONARY_STREET_TYPE}, 3826},\n- {\"thpt\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n- {\"dh\", 1, {DICTIONARY_PLACE_NAME}, 3799},\n- {\"n t\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n- {\"duong sat\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n- {\"thanh pho\", 1, {DICTIONARY_QUALIFIER}, 3823},\n- {\"p t\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n- {\"duong pho\", 1, {DICTIONARY_STREET_TYPE}, 3831},\n- {\"t l\", 1, {DICTIONARY_STREET_TYPE}, 3834},\n- {\"c\u00e2u l\u1ea1c b\u1ed9 \", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ql\", 1, {DICTIONARY_STREET_TYPE}, 3833},\n- {\"duong hem\", 1, {DICTIONARY_STREET_TYPE}, 3829},\n- {\"cty c p\", 1, {DICTIONARY_PLACE_NAME}, 3794},\n- {\"kcn\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n+ {\"nt\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n+ {\"t p\", 1, {DICTIONARY_QUALIFIER}, 3827},\n+ {\"tt\", 1, {DICTIONARY_QUALIFIER}, 3829},\n+ {\"tct\", 1, {DICTIONARY_PLACE_NAME}, 3822},\n+ {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n+ {\"vuon quoc gia\", 1, {DICTIONARY_PLACE_NAME}, 3824},\n+ {\"r h\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n+ {\"nh\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n+ {\"trung tam\", 1, {DICTIONARY_PLACE_NAME}, 3821},\n+ {\"duong hem\", 1, {DICTIONARY_STREET_TYPE}, 3833},\n+ {\"ph\u01b0\u1eddng\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"cvvh\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n+ {\"phi trong\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n+ {\"k c n\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n+ {\"tx\", 1, {DICTIONARY_QUALIFIER}, 3828},\n+ {\"trung hoc co so\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n+ {\"c d\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n+ {\"cong ty co phan\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n {\"ti\u1ec3u h\u1ecdc\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cong vien\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n- {\"rap hat\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n- {\"\u0111\u01b0\u1eddng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"d h\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n+ {\"ds\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n+ {\"n t\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n+ {\"quang truong\", 1, {DICTIONARY_STREET_TYPE}, 3836},\n {\"q\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"sbqt\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n- {\"tl\", 1, {DICTIONARY_STREET_TYPE}, 3834},\n+ {\"c v\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n+ {\"\u0111\u1ea1i h\u1ecdc\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ks\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n {\"trung h\u1ecdc ph\u1ed5 th\u00f4ng\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"p\", 1, {DICTIONARY_QUALIFIER}, 3821},\n- {\"sb\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n- {\"t x\", 1, {DICTIONARY_QUALIFIER}, 3824},\n+ {\"nha tho\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n+ {\"q l\", 1, {DICTIONARY_STREET_TYPE}, 3837},\n+ {\"th\u1ecb x\u00e3\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"thi xa\", 1, {DICTIONARY_QUALIFIER}, 3828},\n {\"c\u00f4ng ty\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"qu\u1eadn\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u0111\u01b0\u1eddng ph\u1ed1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"thcs\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n- {\"th\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n- {\"ks\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n- {\"khu nghi mat\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n- {\"t t\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n- {\"cong vien van hoa\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n- {\"t t\", 1, {DICTIONARY_QUALIFIER}, 3825},\n- {\"s\u00e2n bay\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"t h\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n- {\"t t t m\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n- {\"svd\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n- {\"tt\", 1, {DICTIONARY_QUALIFIER}, 3825},\n- {\"trung tam thuong mai\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n- {\"dai hoc\", 1, {DICTIONARY_PLACE_NAME}, 3799},\n- {\"s v d\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n- {\"pt\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n+ {\"v\u01b0\u01a1n qu\u1ed1c gia\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"rap hat\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n+ {\"khu ngh\u1ec9 m\u00e1t\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"san bay quoc te\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n+ {\"quan\", 1, {DICTIONARY_QUALIFIER}, 3826},\n+ {\"v b t\", 1, {DICTIONARY_PLACE_NAME}, 3823},\n+ {\"cty cp\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n+ {\"cd\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n+ {\"th\u1ecb tr\u1ea5n\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"th\u00e1nh\", 1, {DICTIONARY_PERSONAL_TITLE}, -1},\n- {\"cckq\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n- {\"phi trong\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n- {\"c d\", 1, {DICTIONARY_PLACE_NAME}, 3792},\n- {\"trung hoc pho thong\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n+ {\"dai lo\", 1, {DICTIONARY_STREET_TYPE}, 3831},\n+ {\"\u0111\u1ea1i l\u1ed9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"duong sat\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n+ {\"\u0111\u01b0\u1eddng h\u1ebbm\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c v v h\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n {\"nh\u00e0 thi \u0111\u1ea5u\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"k d l\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n- {\"duong\", 1, {DICTIONARY_STREET_TYPE}, 3828},\n- {\"ds\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n- {\"thi xa\", 1, {DICTIONARY_QUALIFIER}, 3824},\n+ {\"t h\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n+ {\"kcn\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n+ {\"cao dang\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n+ {\"d s\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n+ {\"dh\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n+ {\"t h c s\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n+ {\"sbqt\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n {\"trung t\u00e2m th\u01b0\u01a1ng m\u1ea1i\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"\u0111\u01b0\u1eddng s\u1eaft\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"quoc lo\", 1, {DICTIONARY_STREET_TYPE}, 3833},\n- {\"tong cong ty\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n+ {\"s b\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n+ {\"tt\", 1, {DICTIONARY_PLACE_NAME}, 3821},\n+ {\"k n m\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n {\"khu c\u00f4ng nghi\u1ec7p\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"duong nho\", 1, {DICTIONARY_STREET_TYPE}, 3830},\n- {\"thanh\", 1, {DICTIONARY_PERSONAL_TITLE}, 3791},\n- {\"cvvh\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n- {\"t h p t\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n+ {\"sb\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n+ {\"\u0111\u01b0\u1eddng ph\u1ed1\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"t\u1ed5ng c\u00f4ng ty\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nt\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n- {\"d h\", 1, {DICTIONARY_PLACE_NAME}, 3799},\n- {\"san bay\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n+ {\"s\u00e2n bay\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"ql\", 1, {DICTIONARY_STREET_TYPE}, 3837},\n+ {\"khu nghi mat\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n+ {\"cong vien van hoa\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n {\"p\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"k \/ s\", 1, {DICTIONARY_PLACE_NAME}, 3804},\n- {\"san bay quoc te\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n- {\"n t d\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n- {\"v b t\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n- {\"c l b\", 1, {DICTIONARY_PLACE_NAME}, 3793},\n- {\"cd\", 1, {DICTIONARY_PLACE_NAME}, 3792},\n- {\"d l\", 1, {DICTIONARY_STREET_TYPE}, 3827},\n- {\"dai lo\", 1, {DICTIONARY_STREET_TYPE}, 3827},\n- {\"t p\", 1, {DICTIONARY_QUALIFIER}, 3823},\n+ {\"v q g\", 1, {DICTIONARY_PLACE_NAME}, 3824},\n+ {\"t t\", 1, {DICTIONARY_QUALIFIER}, 3829},\n+ {\"ph\", 1, {DICTIONARY_QUALIFIER}, 3825},\n+ {\"k \/ s\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n+ {\"dai hoc\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n+ {\"san van dong\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n+ {\"pt\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n+ {\"n h\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n {\"c\u0103n c\u1ee9 kh\u00f4ng qu\u00e2n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"san van dong\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n {\"t\u1ec9nh l\u1ed9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u0111\u1ea1i h\u1ecdc\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"thanh pho\", 1, {DICTIONARY_QUALIFIER}, 3827},\n+ {\"th\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n {\"r\u1ea1p h\u00e1t\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ctcp\", 1, {DICTIONARY_PLACE_NAME}, 3794},\n- {\"thi tran\", 1, {DICTIONARY_QUALIFIER}, 3825},\n- {\"q\", 1, {DICTIONARY_QUALIFIER}, 3822},\n {\"\u0111\u01b0\u1eddng nh\u1ecf\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"knm\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n+ {\"trung h\u1ecdc c\u01a1 s\u1edf\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"k d l\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n {\"d\", 1, {DICTIONARY_AMBIGUOUS_EXPANSION}, -1},\n- {\"c t c p\", 1, {DICTIONARY_PLACE_NAME}, 3794},\n- {\"khu du lich\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n- {\"cao dang\", 1, {DICTIONARY_PLACE_NAME}, 3792},\n- {\"d s\", 1, {DICTIONARY_PLACE_NAME}, 3800},\n+ {\"can cu khong quan\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n+ {\"c\u00e2u l\u1ea1c b\u1ed9 \", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"nh\u00e0 h\u00e1t\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"s b q t\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n- {\"tttm\", 1, {DICTIONARY_PLACE_NAME}, 3816},\n- {\"th\u00e0nh ph\u1ed1\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"s b\", 1, {DICTIONARY_PLACE_NAME}, 3811},\n- {\"tt\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n- {\"k n m\", 1, {DICTIONARY_PLACE_NAME}, 3803},\n- {\"cau lac bo\", 1, {DICTIONARY_PLACE_NAME}, 3793},\n- {\"tieu hoc\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n+ {\"p\", 1, {DICTIONARY_QUALIFIER}, 3825},\n+ {\"duong\", 1, {DICTIONARY_STREET_TYPE}, 3832},\n+ {\"quoc lo\", 1, {DICTIONARY_STREET_TYPE}, 3837},\n+ {\"vqg\", 1, {DICTIONARY_PLACE_NAME}, 3824},\n+ {\"t t t m\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n+ {\"cty\", 1, {DICTIONARY_PLACE_NAME}, 3799},\n {\"qu\u1ed1c l\u1ed9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"q t\", 1, {DICTIONARY_STREET_TYPE}, 3836},\n {\"c\u00f4ng tr\u01b0\u1eddng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"vi\u1ec7n b\u1ea3o t\u00e0ng\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"c v v h\", 1, {DICTIONARY_PLACE_NAME}, 3796},\n- {\"trung tam\", 1, {DICTIONARY_PLACE_NAME}, 3817},\n- {\"cong ty\", 1, {DICTIONARY_PLACE_NAME}, 3795},\n- {\"th\u1ecb tr\u1ea5n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"th\u1ecb x\u00e3\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"tinh lo\", 1, {DICTIONARY_STREET_TYPE}, 3838},\n+ {\"cv\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n {\"khu du l\u1ecbch\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ph\", 1, {DICTIONARY_QUALIFIER}, 3821},\n+ {\"qt\", 1, {DICTIONARY_STREET_TYPE}, 3836},\n+ {\"san bay\", 1, {DICTIONARY_PLACE_NAME}, 3815},\n+ {\"rh\", 1, {DICTIONARY_PLACE_NAME}, 3813},\n+ {\"trung hoc pho thong\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n {\"c\u00f4ng vi\u00ean v\u0103n h\u00f3a\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"nha hat\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n- {\"kdl\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n {\"cao \u0111\u1eb3ng\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"tcty\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n+ {\"c l b\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n+ {\"trung tam thuong mai\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n+ {\"thpt\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n+ {\"cong truong\", 1, {DICTIONARY_STREET_TYPE}, 3830},\n+ {\"d l\", 1, {DICTIONARY_STREET_TYPE}, 3831},\n {\"phi tr\u01b0\u1eddng\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ct\", 1, {DICTIONARY_STREET_TYPE}, 3826},\n+ {\"khach san\", 1, {DICTIONARY_PLACE_NAME}, 3808},\n+ {\"ntd\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n+ {\"vbt\", 1, {DICTIONARY_PLACE_NAME}, 3823},\n+ {\"duong nho\", 1, {DICTIONARY_STREET_TYPE}, 3834},\n {\"s\u00e2n v\u1eadn \u0111\u1ed9ng\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ph\u01b0\u1eddng\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"tct\", 1, {DICTIONARY_PLACE_NAME}, 3818},\n- {\"ntd\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n- {\"khu ngh\u1ec9 m\u00e1t\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"cty\", 1, {DICTIONARY_PLACE_NAME}, 3795},\n- {\"v q g\", 1, {DICTIONARY_PLACE_NAME}, 3820},\n- {\"trung hoc co so\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n- {\"tp\", 1, {DICTIONARY_QUALIFIER}, 3823},\n+ {\"nha hat\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n+ {\"c c k q\", 1, {DICTIONARY_PLACE_NAME}, 3802},\n+ {\"nha thi dau\", 1, {DICTIONARY_PLACE_NAME}, 3810},\n+ {\"thanh\", 1, {DICTIONARY_PERSONAL_TITLE}, 3795},\n+ {\"duong pho\", 1, {DICTIONARY_STREET_TYPE}, 3835},\n+ {\"ctcp\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n+ {\"khu cong nghiep\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n+ {\"thi tran\", 1, {DICTIONARY_QUALIFIER}, 3829},\n+ {\"\u0111\u01b0\u1eddng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"\u0111l\", 1, {DICTIONARY_STREET_TYPE}, 3831},\n+ {\"knm\", 1, {DICTIONARY_PLACE_NAME}, 3807},\n+ {\"ct\", 1, {DICTIONARY_STREET_TYPE}, 3830},\n+ {\"vien bao tang\", 1, {DICTIONARY_PLACE_NAME}, 3823},\n+ {\"c t c p\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n+ {\"khu du lich\", 1, {DICTIONARY_PLACE_NAME}, 3806},\n {\"trung t\u00e2m\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"can cu khong quan\", 1, {DICTIONARY_PLACE_NAME}, 3798},\n- {\"clb\", 1, {DICTIONARY_PLACE_NAME}, 3793},\n- {\"r h\", 1, {DICTIONARY_PLACE_NAME}, 3809},\n- {\"\u0111\u1ea1i l\u1ed9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"c t\", 1, {DICTIONARY_STREET_TYPE}, 3830},\n+ {\"cong vien\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n+ {\"t h p t\", 1, {DICTIONARY_PLACE_NAME}, 3819},\n+ {\"s b q t\", 1, {DICTIONARY_PLACE_NAME}, 3814},\n+ {\"t t\", 1, {DICTIONARY_PLACE_NAME}, 3821},\n {\"ng\u00f5\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"n h\", 1, {DICTIONARY_PLACE_NAME}, 3805},\n+ {\"p t\", 1, {DICTIONARY_PLACE_NAME}, 3812},\n+ {\"cau lac bo\", 1, {DICTIONARY_PLACE_NAME}, 3797},\n {\"kh\u00e1ch s\u1ea1n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"c\u00f4ng ty c\u1ed5 ph\u1ea7n\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"k c n\", 1, {DICTIONARY_PLACE_NAME}, 3801},\n- {\"tx\", 1, {DICTIONARY_QUALIFIER}, 3824},\n+ {\"q\", 1, {DICTIONARY_QUALIFIER}, 3826},\n {\"du\u00e0n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"xi\u00e0n d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"xinan\", 1, {DICTIONARY_DIRECTIONAL}, 3841},\n+ {\"xiang\", 1, {DICTIONARY_STREET_TYPE}, 3874},\n+ {\"dao\", 1, {DICTIONARY_STREET_TYPE}, 3866},\n {\"\u90ae\u7f16\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"nan\", 1, {DICTIONARY_DIRECTIONAL}, 3837},\n+ {\"\u80e1\u540c\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u5927\u8857\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"l\u00f9\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u8857\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"shi\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 3851},\n- {\"dongnan\", 1, {DICTIONARY_DIRECTIONAL}, 3845},\n {\"\u7e23\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"xi\u00e0n\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u9109\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"lin\", 1, {DICTIONARY_QUALIFIER}, 3861},\n {\"n\u00e1n\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\u80e1\u540c\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"x\u012b b\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"shengdao\", 1, {DICTIONARY_STREET_TYPE}, 3868},\n- {\"guodao\", 1, {DICTIONARY_STREET_TYPE}, 3864},\n- {\"hao\", 1, {DICTIONARY_UNIT}, 3874},\n- {\"qiao\", 1, {DICTIONARY_PLACE_NAME}, 3848},\n- {\"youbian\", 1, {DICTIONARY_QUALIFIER}, 3858},\n- {\"xi bei\", 1, {DICTIONARY_DIRECTIONAL}, 3840},\n+ {\"xiang\", 1, {DICTIONARY_QUALIFIER}, 3858},\n+ {\"xi\", 1, {DICTIONARY_DIRECTIONAL}, 3842},\n+ {\"dong nan\", 1, {DICTIONARY_DIRECTIONAL}, 3850},\n+ {\"xi\u0101ng d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"xiang dao\", 1, {DICTIONARY_STREET_TYPE}, 3875},\n+ {\"\u6a13\", 1, {DICTIONARY_LEVEL}, -1},\n+ {\"c\u016bnd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3863},\n {\"\u9130\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u6865\", 1, {DICTIONARY_PLACE_NAME}, -1},\n+ {\"h\u00e0o\", 2, {DICTIONARY_STOPWORD, DICTIONARY_UNIT}, -1},\n {\"\u5927\u9662\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zhi\", 1, {DICTIONARY_UNIT}, 3875},\n+ {\"xiandao\", 1, {DICTIONARY_STREET_TYPE}, 3873},\n {\"sh\u011bng\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"bei\", 1, {DICTIONARY_DIRECTIONAL}, 3835},\n- {\"sheng dao\", 1, {DICTIONARY_STREET_TYPE}, 3868},\n- {\"sh\u011bngd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3868},\n+ {\"\u658b\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"xinan\", 1, {DICTIONARY_DIRECTIONAL}, 3845},\n {\"zh\u0101i\", 1, {DICTIONARY_UNIT}, -1},\n {\"\u56fd\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"d\u014dngn\u00e1n\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"dajie\", 1, {DICTIONARY_STREET_TYPE}, 3861},\n {\"q\u016b\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u53bf\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"shi\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, 3855},\n {\"\u4e61\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zh\u00e8n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"cun\", 1, {DICTIONARY_QUALIFIER}, 3856},\n- {\"lin\", 1, {DICTIONARY_QUALIFIER}, 3857},\n+ {\"youbian\", 1, {DICTIONARY_QUALIFIER}, 3862},\n+ {\"sh\u011bng d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"nan\", 1, {DICTIONARY_DIRECTIONAL}, 3841},\n+ {\"xian dao\", 1, {DICTIONARY_STREET_TYPE}, 3873},\n {\"\u6751\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u93ae\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"x\u012bb\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"qu\", 1, {DICTIONARY_QUALIFIER}, 3856},\n {\"d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"xiang\", 1, {DICTIONARY_STREET_TYPE}, 3870},\n {\"\u897f\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u91cc\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"d\u00e0ji\u0113\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u6a13\", 1, {DICTIONARY_LEVEL}, -1},\n- {\"h\u00e0o\", 2, {DICTIONARY_STOPWORD, DICTIONARY_UNIT}, -1},\n- {\"sheng\", 1, {DICTIONARY_QUALIFIER}, 3849},\n+ {\"zhen\", 1, {DICTIONARY_QUALIFIER}, 3857},\n+ {\"\u6865\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"d\u00e0d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"xian\", 1, {DICTIONARY_QUALIFIER}, 3854},\n {\"c\u016bn\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"\u8def\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u4e4b\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"lou\", 1, {DICTIONARY_LEVEL}, 3851},\n+ {\"dongbei\", 1, {DICTIONARY_DIRECTIONAL}, 3847},\n+ {\"xi\u00e0nd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3873},\n {\"\u897f\u5357\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u865f\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"qiao\", 1, {DICTIONARY_PLACE_NAME}, 3852},\n+ {\"x\u012b\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"dong\", 1, {DICTIONARY_DIRECTIONAL}, 3840},\n+ {\"cundao\", 1, {DICTIONARY_STREET_TYPE}, 3863},\n+ {\"zhi\", 1, {DICTIONARY_UNIT}, 3879},\n+ {\"b\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"\u6bb5\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"cun dao\", 1, {DICTIONARY_STREET_TYPE}, 3863},\n+ {\"ji\u0113\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"bei\", 1, {DICTIONARY_DIRECTIONAL}, 3839},\n+ {\"d\u014dng b\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"\u897f\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"cun\", 1, {DICTIONARY_QUALIFIER}, 3860},\n {\"y\u00f3ubi\u0101n\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u4e1c\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"c\u016bnd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3859},\n- {\"cun dao\", 1, {DICTIONARY_STREET_TYPE}, 3859},\n- {\"\u4e1c\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"xi\u00e0nd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3869},\n- {\"\u6bb5\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"xi\", 1, {DICTIONARY_DIRECTIONAL}, 3838},\n- {\"qi\u00e1o\", 1, {DICTIONARY_PLACE_NAME}, -1},\n- {\"ji\u0113\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"qu\", 1, {DICTIONARY_QUALIFIER}, 3852},\n- {\"dong bei\", 1, {DICTIONARY_DIRECTIONAL}, 3844},\n- {\"d\u014dng b\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"dong nan\", 1, {DICTIONARY_DIRECTIONAL}, 3846},\n- {\"xiangdao\", 1, {DICTIONARY_STREET_TYPE}, 3871},\n- {\"lu\", 1, {DICTIONARY_STREET_TYPE}, 3867},\n- {\"\u897f\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"\u658b\", 1, {DICTIONARY_UNIT}, -1},\n {\"\u5df7\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"dong\", 1, {DICTIONARY_DIRECTIONAL}, 3836},\n {\"\u4e1c\u5357\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5357\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5ba4\", 1, {DICTIONARY_UNIT}, -1},\n- {\"xiang dao\", 1, {DICTIONARY_STREET_TYPE}, 3871},\n- {\"xi\u0101ng d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"x\u012b\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"xi\u0101ngd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3871},\n- {\"c\u016bn d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"dayuan\", 1, {DICTIONARY_STREET_TYPE}, 3867},\n+ {\"xibei\", 1, {DICTIONARY_DIRECTIONAL}, 3843},\n+ {\"\u4e1c\u5317\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"gu\u00f3d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"xian\", 1, {DICTIONARY_QUALIFIER}, 3850},\n- {\"lou\", 1, {DICTIONARY_LEVEL}, 3847},\n- {\"dongbei\", 1, {DICTIONARY_DIRECTIONAL}, 3843},\n+ {\"sheng\", 1, {DICTIONARY_QUALIFIER}, 3853},\n+ {\"li\", 1, {DICTIONARY_QUALIFIER}, 3859},\n+ {\"\u53bf\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"x\u012bn\u00e1n\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"d\u014dngb\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n- {\"xiandao\", 1, {DICTIONARY_STREET_TYPE}, 3869},\n- {\"xiang\", 1, {DICTIONARY_QUALIFIER}, 3854},\n- {\"cundao\", 1, {DICTIONARY_STREET_TYPE}, 3859},\n+ {\"xi nan\", 1, {DICTIONARY_DIRECTIONAL}, 3846},\n+ {\"zhai\", 1, {DICTIONARY_UNIT}, 3880},\n+ {\"jie\", 1, {DICTIONARY_STREET_TYPE}, 3870},\n+ {\"duan\", 1, {DICTIONARY_STREET_TYPE}, 3876},\n+ {\"hutong\", 1, {DICTIONARY_STREET_TYPE}, 3869},\n {\"l\u01d0\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"nong\", 1, {DICTIONARY_STREET_TYPE}, 3873},\n- {\"dao\", 1, {DICTIONARY_STREET_TYPE}, 3862},\n- {\"b\u011bi\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n+ {\"xiangdao\", 1, {DICTIONARY_STREET_TYPE}, 3875},\n+ {\"\u4e1c\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"h\u00fat\u00f2ng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u7701\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"jie\", 1, {DICTIONARY_STREET_TYPE}, 3866},\n+ {\"sh\u011bngd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3872},\n {\"\u53f7\", 1, {DICTIONARY_STOPWORD}, -1},\n- {\"xibei\", 1, {DICTIONARY_DIRECTIONAL}, 3839},\n- {\"dayuan\", 1, {DICTIONARY_STREET_TYPE}, 3863},\n+ {\"lu\", 1, {DICTIONARY_STREET_TYPE}, 3871},\n+ {\"dadao\", 1, {DICTIONARY_STREET_TYPE}, 3864},\n+ {\"xi bei\", 1, {DICTIONARY_DIRECTIONAL}, 3844},\n+ {\"\u5e02\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"qi\u00e1o\", 1, {DICTIONARY_PLACE_NAME}, -1},\n {\"d\u014dng\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"l\u00edn\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"sheng dao\", 1, {DICTIONARY_STREET_TYPE}, 3872},\n {\"xi\u00e0ng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n+ {\"shengdao\", 1, {DICTIONARY_STREET_TYPE}, 3872},\n+ {\"dong bei\", 1, {DICTIONARY_DIRECTIONAL}, 3848},\n+ {\"dongnan\", 1, {DICTIONARY_DIRECTIONAL}, 3849},\n {\"\u7701\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u5927\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"d\u00e0 yu\u00e0n\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"\u5f04\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"zhen\", 1, {DICTIONARY_QUALIFIER}, 3853},\n- {\"xi nan\", 1, {DICTIONARY_DIRECTIONAL}, 3842},\n- {\"sh\u011bng d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"duan\", 1, {DICTIONARY_STREET_TYPE}, 3872},\n- {\"hutong\", 1, {DICTIONARY_STREET_TYPE}, 3865},\n+ {\"\u4e4b\", 1, {DICTIONARY_UNIT}, -1},\n+ {\"xi\u0101ngd\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, 3875},\n {\"d\u014dng n\u00e1n\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"zh\u012b\", 1, {DICTIONARY_UNIT}, -1},\n- {\"xian dao\", 1, {DICTIONARY_STREET_TYPE}, 3869},\n+ {\"nong\", 1, {DICTIONARY_STREET_TYPE}, 3877},\n+ {\"guodao\", 1, {DICTIONARY_STREET_TYPE}, 3868},\n {\"x\u012b n\u00e1n\", 1, {DICTIONARY_DIRECTIONAL}, -1},\n {\"\u5340\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"li\", 1, {DICTIONARY_QUALIFIER}, 3855},\n+ {\"c\u016bn d\u00e0o\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"l\u00f3u\", 1, {DICTIONARY_LEVEL}, -1},\n {\"sh\u00ec\", 2, {DICTIONARY_QUALIFIER, DICTIONARY_UNIT}, -1},\n+ {\"hao\", 1, {DICTIONARY_UNIT}, 3878},\n {\"\u6751\u9053\", 1, {DICTIONARY_STREET_TYPE}, -1},\n {\"n\u00f2ng\", 1, {DICTIONARY_STREET_TYPE}, -1},\n- {\"\u5e02\", 1, {DICTIONARY_QUALIFIER}, -1},\n+ {\"dajie\", 1, {DICTIONARY_STREET_TYPE}, 3865},\n+ {\"zh\u00e8n\", 1, {DICTIONARY_QUALIFIER}, -1},\n {\"xi\u0101ng\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"\u533a\", 1, {DICTIONARY_QUALIFIER}, -1},\n- {\"zhai\", 1, {DICTIONARY_UNIT}, 3876},\n- {\"dadao\", 1, {DICTIONARY_STREET_TYPE}, 3860}\n+ {\"\u533a\", 1, {DICTIONARY_QUALIFIER}, -1}\n };\n \n address_language_index_t expansion_languages[] = {\n@@ -77086,52 +77098,52 @@\n {\"cs\", 59961, 9},\n {\"cy\", 59970, 44},\n {\"da\", 60014, 111},\n- {\"de\", 60125, 731},\n- {\"el\", 60856, 25},\n- {\"en\", 60881, 3256},\n- {\"es\", 64137, 1805},\n- {\"et\", 65942, 144},\n- {\"eu\", 66086, 93},\n- {\"fa\", 66179, 16},\n- {\"fi\", 66195, 71},\n- {\"fil\", 66266, 3},\n- {\"fr\", 66269, 1366},\n- {\"ga\", 67635, 180},\n- {\"gd\", 67815, 104},\n- {\"gl\", 67919, 117},\n- {\"gsw\", 68036, 19},\n- {\"he\", 68055, 10},\n- {\"hi\", 68065, 4},\n- {\"hr\", 68069, 26},\n- {\"hu\", 68095, 59},\n- {\"id\", 68154, 92},\n- {\"is\", 68246, 37},\n- {\"it\", 68283, 1564},\n- {\"ja\", 69847, 231},\n- {\"ka\", 70078, 27},\n- {\"ko\", 70105, 47},\n- {\"lb\", 70152, 3},\n- {\"lt\", 70155, 34},\n- {\"lv\", 70189, 9},\n- {\"ms\", 70198, 43},\n- {\"mt\", 70241, 20},\n- {\"nb\", 70261, 116},\n- {\"nl\", 70377, 344},\n- {\"oc\", 70721, 27},\n- {\"pap\", 70748, 4},\n- {\"pl\", 70752, 354},\n- {\"pt\", 71106, 1032},\n- {\"ro\", 72138, 81},\n- {\"ru\", 72219, 167},\n- {\"si\", 72386, 15},\n- {\"sk\", 72401, 161},\n- {\"sl\", 72562, 45},\n- {\"sr\", 72607, 26},\n- {\"sv\", 72633, 103},\n- {\"th\", 72736, 16},\n- {\"tr\", 72752, 56},\n- {\"uk\", 72808, 73},\n- {\"ur\", 72881, 7},\n- {\"vi\", 72888, 170},\n- {\"zh\", 73058, 133}\n+ {\"de\", 60125, 739},\n+ {\"el\", 60864, 25},\n+ {\"en\", 60889, 3256},\n+ {\"es\", 64145, 1805},\n+ {\"et\", 65950, 144},\n+ {\"eu\", 66094, 93},\n+ {\"fa\", 66187, 16},\n+ {\"fi\", 66203, 71},\n+ {\"fil\", 66274, 3},\n+ {\"fr\", 66277, 1366},\n+ {\"ga\", 67643, 180},\n+ {\"gd\", 67823, 104},\n+ {\"gl\", 67927, 117},\n+ {\"gsw\", 68044, 19},\n+ {\"he\", 68063, 10},\n+ {\"hi\", 68073, 4},\n+ {\"hr\", 68077, 26},\n+ {\"hu\", 68103, 59},\n+ {\"id\", 68162, 92},\n+ {\"is\", 68254, 37},\n+ {\"it\", 68291, 1564},\n+ {\"ja\", 69855, 231},\n+ {\"ka\", 70086, 27},\n+ {\"ko\", 70113, 47},\n+ {\"lb\", 70160, 3},\n+ {\"lt\", 70163, 34},\n+ {\"lv\", 70197, 9},\n+ {\"ms\", 70206, 43},\n+ {\"mt\", 70249, 20},\n+ {\"nb\", 70269, 116},\n+ {\"nl\", 70385, 344},\n+ {\"oc\", 70729, 27},\n+ {\"pap\", 70756, 4},\n+ {\"pl\", 70760, 354},\n+ {\"pt\", 71114, 1032},\n+ {\"ro\", 72146, 81},\n+ {\"ru\", 72227, 167},\n+ {\"si\", 72394, 15},\n+ {\"sk\", 72409, 161},\n+ {\"sl\", 72570, 45},\n+ {\"sr\", 72615, 26},\n+ {\"sv\", 72641, 103},\n+ {\"th\", 72744, 16},\n+ {\"tr\", 72760, 56},\n+ {\"uk\", 72816, 73},\n+ {\"ur\", 72889, 7},\n+ {\"vi\", 72896, 170},\n+ {\"zh\", 73066, 133}\n };\n"} {"commit":"060733c1ca78d9ec1a708e4bfadd1ad53efd58e1","subject":"Core: Factory update with variadic arguments for create in the standard factory","message":"Core: Factory update with variadic arguments for create in the standard factory\r\n\r\n","repos":"inviwo\/inviwo,inviwo\/inviwo,inviwo\/inviwo,Sparkier\/inviwo,Sparkier\/inviwo,inviwo\/inviwo,inviwo\/inviwo,Sparkier\/inviwo,Sparkier\/inviwo,inviwo\/inviwo,Sparkier\/inviwo","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/inviwo\/core\/util\/factory.h\n+++ include\/inviwo\/core\/util\/factory.h\n@@ -84,8 +84,8 @@\n * M Models a object with a function create(K key) that can create objects of type T\n * M would usually be a \"factory object\" type\n *\/\n-template <typename T, typename M, typename K = const std::string&>\n-class StandardFactory : public Factory<T, K> {\n+template <typename T, typename M, typename K = const std::string&, typename... Args>\n+class StandardFactory : public Factory<T, K, Args...> {\n public:\n using Key = typename std::remove_cv<typename std::remove_reference<K>::type>::type;\n using Map = std::unordered_map<Key, M*>;\n@@ -96,7 +96,7 @@\n virtual bool registerObject(M* obj);\n virtual bool unRegisterObject(M* obj);\n \n- virtual std::unique_ptr<T> create(K key) const override;\n+ virtual std::unique_ptr<T> create(K key, Args... args) const override;\n virtual bool hasKey(K key) const override;\n virtual std::vector<Key> getKeys() const;\n \n@@ -104,8 +104,8 @@\n Map map_;\n };\n \n-template <typename T, typename M, typename K>\n-inline bool StandardFactory<T, M, K>::registerObject(M* obj) {\n+template <typename T, typename M, typename K, typename... Args>\n+inline bool StandardFactory<T, M, K, Args...>::registerObject(M* obj) {\n if (util::insert_unique(map_, obj->getClassIdentifier(), obj)) {\n return true;\n } else {\n@@ -114,31 +114,32 @@\n return false;\n }\n }\n-template <typename T, typename M, typename K>\n-inline bool StandardFactory<T, M, K>::unRegisterObject(M* obj) {\n+\n+template <typename T, typename M, typename K, typename... Args>\n+inline bool StandardFactory<T, M, K, Args...>::unRegisterObject(M* obj) {\n size_t removed = util::map_erase_remove_if(\n map_, [obj](typename Map::value_type& elem) { return elem.second == obj; });\n \n return removed > 0;\n }\n \n-template <typename T, typename M, typename K>\n-std::unique_ptr<T> StandardFactory<T, M, K>::create(K key) const {\n+template <typename T, typename M, typename K, typename... Args>\n+std::unique_ptr<T> StandardFactory<T, M, K, Args...>::create(K key, Args... args) const {\n auto it = map_.find(key);\n if (it != end(map_)) {\n- return it->second->create();\n+ return it->second->create(args...);\n } else {\n return nullptr;\n }\n }\n \n-template <typename T, typename M, typename K>\n-bool StandardFactory<T, M, K>::hasKey(K key) const {\n+template <typename T, typename M, typename K, typename... Args>\n+bool StandardFactory<T, M, K, Args...>::hasKey(K key) const {\n return util::has_key(map_, key);\n }\n \n-template <typename T, typename M, typename K>\n-auto StandardFactory<T, M, K>::getKeys() const -> std::vector<Key> {\n+template <typename T, typename M, typename K, typename... Args>\n+auto StandardFactory<T, M, K, Args...>::getKeys() const -> std::vector<Key> {\n auto res = std::vector<Key>();\n for (auto& elem : map_) res.push_back(elem.first);\n return res;\n"} {"commit":"d2d25e5daa21591d7d1ef4fea38dc2f23582906d","subject":"tweaks to initial window mapping time","message":"tweaks to initial window mapping time\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/afterstep\/add_window.c\n+++ src\/afterstep\/add_window.c\n@@ -263,9 +263,9 @@\n \n \t\/* add the window into the afterstep list *\/\n enlist_aswindow( tmp_win );\n- redecorate_window ( tmp_win, False );\n+ redecorate_window (tmp_win, False );\n \/* saving window management properties : *\/\n- set_client_desktop( tmp_win->w, ASWIN_DESK(tmp_win) );\n+ set_client_desktop( tmp_win->w, ASWIN_DESK(tmp_win));\n \n \t\/* we have to set shape on frame window. If window has title - \n \t * on_window_title_changed will take care of it - otherwise we force it\n@@ -278,7 +278,9 @@\n \t\tSetShape( tmp_win, 0 );\n \t\/* Must do it now or else Java will freak out !!! *\/\n XMapRaised (dpy, tmp_win->w);\n-\tRaiseWindow(tmp_win);\n+ XMapRaised (dpy, tmp_win->frame);\n+\tRaiseWindow (tmp_win);\n+\tASSync(False);\n \n \/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ End Grab ^^^^^^^^^^^^^^^^^^^^ *\/\n \tungrab_server();\n"} {"commit":"54781a31f257290ea1b8d8c0c5825da34ba833d7","subject":"core\/cc\/target.h: Add XXX_ONLY macros.","message":"core\/cc\/target.h: Add XXX_ONLY macros.\n\nMakes platform-dependent one-liners more readable.\n","repos":"Qining\/gapid,ek9852\/gapid,baldwinn860\/gapid,Qining\/gapid,dsrbecky\/gapid,dsrbecky\/gapid,dsrbecky\/gapid,pmuetschard\/gapid,google\/agi,baldwinn860\/gapid,google\/gapid,Qining\/gapid,baldwinn860\/gapid,Qining\/gapid,dsrbecky\/gapid,ek9852\/gapid,baldwinn860\/gapid,pmuetschard\/gapid,google\/gapid,google\/agi,ek9852\/gapid,google\/agi,dsrbecky\/gapid,pmuetschard\/gapid,baldwinn860\/gapid,google\/agi,ek9852\/gapid,baldwinn860\/gapid,pmuetschard\/gapid,Qining\/gapid,google\/agi,google\/gapid,google\/agi,google\/gapid,dsrbecky\/gapid,baldwinn860\/gapid,google\/gapid,google\/agi,baldwinn860\/gapid,ek9852\/gapid,Qining\/gapid,pmuetschard\/gapid,ek9852\/gapid,pmuetschard\/gapid,dsrbecky\/gapid,pmuetschard\/gapid,google\/gapid,pmuetschard\/gapid,ek9852\/gapid,google\/agi,ek9852\/gapid,google\/gapid,Qining\/gapid,Qining\/gapid,google\/gapid,dsrbecky\/gapid","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/cc\/target.h\n+++ core\/cc\/target.h\n@@ -22,12 +22,19 @@\n #define GAPID_OS_WINDOWS 3\n #define GAPID_OS_ANDROID 4\n \n+#define LINUX_ONLY(x)\n+#define OSX_ONLY(x)\n+#define WINDOWS_ONLY(x)\n+#define ANDROID_ONLY(x)\n+\n #if defined(TARGET_OS_LINUX)\n # define TARGET_OS GAPID_OS_LINUX\n # define STDCALL\n # define EXPORT __attribute__ ((visibility (\"default\")))\n # define PATH_DELIMITER '\/'\n # define PATH_DELIMITER_STR \"\/\"\n+# undef LINUX_ONLY\n+# define LINUX_ONLY(x) x\n #endif\n \n #if defined(TARGET_OS_OSX)\n@@ -36,6 +43,8 @@\n # define EXPORT __attribute__ ((visibility (\"default\")))\n # define PATH_DELIMITER '\/'\n # define PATH_DELIMITER_STR \"\/\"\n+# undef OSX_ONLY\n+# define OSX_ONLY(x) x\n # include <stdint.h>\n using size_val = uint64_t;\n #else \/\/ defined(TARGET_OS_OSX)\n@@ -49,6 +58,8 @@\n # define EXPORT __attribute__ ((visibility (\"default\")))\n # define PATH_DELIMITER '\/'\n # define PATH_DELIMITER_STR \"\/\"\n+# undef ANDROID_ONLY\n+# define ANDROID_ONLY(x) x\n #endif\n \n #if defined(TARGET_OS_WINDOWS)\n@@ -57,6 +68,8 @@\n # define EXPORT __declspec(dllexport)\n # define PATH_DELIMITER '\\\\'\n # define PATH_DELIMITER_STR \"\\\\\"\n+# undef WINDOWS_ONLY\n+# define WINDOWS_ONLY(x) x\n #endif\n \n #ifndef TARGET_OS\n"} {"commit":"306f0df62f0cc0c358c8222b62e3666248b6f430","subject":"test all pointers before using","message":"test all pointers before using\n","repos":"GeeXboX\/libplayer,GeeXboX\/libplayer,GeeXboX\/libplayer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/wrapper_mplayer.c\n+++ src\/wrapper_mplayer.c\n@@ -1481,6 +1481,10 @@\n state_mp = &list[i].state_mp;\n state_lib = &list[i].state_lib;\n str = list[i].str;\n+\n+ if (!str || !state_mp || !state_lib)\n+ continue;\n+\n state_libplayer = *state_lib & ALL_ITEM_STATES;\n \n if (strchr (str, '\/'))\n"} {"commit":"5c376190d11070942d8d04743d09851a01a99e85","subject":"Add export","message":"Add export\n","repos":"ajanson\/SCIRun,ajanson\/SCIRun,collint8\/SCIRun,ajanson\/SCIRun,jcollfont\/SCIRun,collint8\/SCIRun,moritzdannhauer\/SCIRunGUIPrototype,moritzdannhauer\/SCIRunGUIPrototype,ajanson\/SCIRun,jcollfont\/SCIRun,moritzdannhauer\/SCIRunGUIPrototype,collint8\/SCIRun,collint8\/SCIRun,jcollfont\/SCIRun,collint8\/SCIRun,jessdtate\/SCIRun,collint8\/SCIRun,jcollfont\/SCIRun,collint8\/SCIRun,ajanson\/SCIRun,ajanson\/SCIRun,moritzdannhauer\/SCIRunGUIPrototype,jcollfont\/SCIRun,jcollfont\/SCIRun,jessdtate\/SCIRun,moritzdannhauer\/SCIRunGUIPrototype,moritzdannhauer\/SCIRunGUIPrototype,jcollfont\/SCIRun,jessdtate\/SCIRun,moritzdannhauer\/SCIRunGUIPrototype,jessdtate\/SCIRun,jessdtate\/SCIRun,jessdtate\/SCIRun,jessdtate\/SCIRun,jessdtate\/SCIRun,ajanson\/SCIRun,collint8\/SCIRun","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Core\/GeometryPrimitives\/Point.h\n+++ src\/Core\/GeometryPrimitives\/Point.h\n@@ -53,7 +53,7 @@\n inline explicit Point(const Vector& v);\n inline Point(double x, double y, double z)\n { d_[0] = x; d_[1] = y; d_[2] = z; }\n- Point(double, double, double, double);\n+ SCISHARE Point(double, double, double, double);\n inline Point(const Point&);\n inline Point();\n inline Point& operator=(const Point&);\n"} {"commit":"ae36cfc65eac19281b5ad338e4095008dc69ab21","subject":"s\/SUB\/BGNSUB\/","message":"s\/SUB\/BGNSUB\/\n","repos":"KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/shader\/prog_print.c\n+++ src\/mesa\/shader\/prog_print.c\n@@ -629,7 +629,7 @@\n break;\n \n case OPCODE_BGNSUB:\n- _mesa_printf(\"SUB\");\n+ _mesa_printf(\"BGNSUB\");\n print_comment(inst);\n return indent + 3;\n case OPCODE_ENDSUB:\n"} {"commit":"9b42e713761a43e9ade3965285f077e2ba25bbb7","subject":"Don't leave behind junk nbtree pages during split.","message":"Don't leave behind junk nbtree pages during split.\n\nCommit 8fa30f906be reduced the elevel of a number of \"can't happen\"\n_bt_split() errors from PANIC to ERROR. At the same time, the new right\npage buffer for the split could continue to be acquired well before the\ncritical section. This was possible because it was relatively\nstraightforward to make sure that _bt_split() could not throw an error,\nwith a few specific exceptions. The exceptional cases were safe because\nthey involved specific, well understood errors, making it possible to\nconsistently zero the right page before actually raising an error using\nelog(). There was no danger of leaving around a junk page, provided\n_bt_split() stuck to this coding rule.\n\nCommit 8224de4f, which introduced INCLUDE indexes, added code to make\n_bt_split() truncate away non-key attributes. This happened at a point\nthat broke the rule around zeroing the right page in _bt_split(). If\ntruncation failed (perhaps due to palloc() failure), that would result\nin an errant right page buffer with junk contents. This could confuse\nVACUUM when it attempted to delete the page, and should be avoided on\ngeneral principle.\n\nTo fix, reorganize _bt_split() so that truncation occurs before the new\nright page buffer is even acquired. A junk page\/buffer will not be left\nbehind if _bt_nonkey_truncate()\/_bt_truncate() raise an error.\n\nDiscussion: 91be870bcd98be5981de1580063adc6455fdb14a@mail.gmail.com\nBackpatch: 11-, where INCLUDE indexes were introduced.\n","repos":"50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,50wu\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,50wu\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,50wu\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,adam8157\/gpdb,adam8157\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/access\/nbtree\/nbtinsert.c\n+++ src\/backend\/access\/nbtree\/nbtinsert.c\n@@ -49,8 +49,8 @@\n \t\t\t OffsetNumber newitemoff,\n \t\t\t bool split_only_page);\n static Buffer _bt_split(Relation rel, BTScanInsert itup_key, Buffer buf,\n-\t\t Buffer cbuf, OffsetNumber firstright, OffsetNumber newitemoff,\n-\t\t Size newitemsz, IndexTuple newitem, bool newitemonleft);\n+\t\t Buffer cbuf, OffsetNumber newitemoff, Size newitemsz,\n+\t\t IndexTuple newitem);\n static void _bt_insert_parent(Relation rel, Buffer buf, Buffer rbuf,\n \t\t\t\t BTStack stack, bool is_root, bool is_only);\n static bool _bt_pgaddtup(Page page, Size itemsize, IndexTuple itup,\n@@ -943,7 +943,6 @@\n {\n \tPage\t\tpage;\n \tBTPageOpaque lpageop;\n-\tOffsetNumber firstright = InvalidOffsetNumber;\n \tSize\t\titemsz;\n \n \tpage = BufferGetPage(buf);\n@@ -979,7 +978,6 @@\n \t{\n \t\tbool\t\tis_root = P_ISROOT(lpageop);\n \t\tbool\t\tis_only = P_LEFTMOST(lpageop) && P_RIGHTMOST(lpageop);\n-\t\tbool\t\tnewitemonleft;\n \t\tBuffer\t\trbuf;\n \n \t\t\/*\n@@ -1000,14 +998,8 @@\n \t\tAssert(!(P_ISLEAF(lpageop) &&\n \t\t\t\t BlockNumberIsValid(RelationGetTargetBlock(rel))));\n \n-\t\t\/* Choose the split point *\/\n-\t\tfirstright = _bt_findsplitloc(rel, page,\n-\t\t\t\t\t\t\t\t\t newitemoff, itemsz, itup,\n-\t\t\t\t\t\t\t\t\t &newitemonleft);\n-\n \t\t\/* split the buffer into left and right halves *\/\n-\t\trbuf = _bt_split(rel, itup_key, buf, cbuf, firstright, newitemoff,\n-\t\t\t\t\t\t itemsz, itup, newitemonleft);\n+\t\trbuf = _bt_split(rel, itup_key, buf, cbuf, newitemoff, itemsz, itup);\n \t\tPredicateLockPageSplit(rel,\n \t\t\t\t\t\t\t BufferGetBlockNumber(buf),\n \t\t\t\t\t\t\t BufferGetBlockNumber(rbuf));\n@@ -1211,9 +1203,8 @@\n *\t_bt_split() -- split a page in the btree.\n *\n *\t\tOn entry, buf is the page to split, and is pinned and write-locked.\n- *\t\tfirstright is the item index of the first item to be moved to the\n- *\t\tnew right page. newitemoff etc. tell us about the new item that\n- *\t\tmust be inserted along with the data from the old page.\n+ *\t\tnewitemoff etc. tell us about the new item that must be inserted\n+ *\t\talong with the data from the original page.\n *\n *\t\titup_key is used for suffix truncation on leaf pages (internal\n *\t\tpage callers pass NULL). When splitting a non-leaf page, 'cbuf'\n@@ -1226,8 +1217,7 @@\n *\/\n static Buffer\n _bt_split(Relation rel, BTScanInsert itup_key, Buffer buf, Buffer cbuf,\n-\t\t OffsetNumber firstright, OffsetNumber newitemoff, Size newitemsz,\n-\t\t IndexTuple newitem, bool newitemonleft)\n+\t\t OffsetNumber newitemoff, Size newitemsz, IndexTuple newitem)\n {\n \tBuffer\t\trbuf;\n \tPage\t\torigpage;\n@@ -1246,36 +1236,67 @@\n \tIndexTuple\titem;\n \tOffsetNumber leftoff,\n \t\t\t\trightoff;\n+\tOffsetNumber firstright;\n \tOffsetNumber maxoff;\n \tOffsetNumber i;\n-\tbool\t\tisleaf;\n+\tbool\t\tnewitemonleft,\n+\t\t\t\tisleaf;\n \tIndexTuple\tlefthikey;\n \tint\t\t\tindnatts = IndexRelationGetNumberOfAttributes(rel);\n \tint\t\t\tindnkeyatts = IndexRelationGetNumberOfKeyAttributes(rel);\n \n-\t\/* Acquire a new page to split into *\/\n-\trbuf = _bt_getbuf(rel, P_NEW, BT_WRITE);\n-\n \t\/*\n \t * origpage is the original page to be split. leftpage is a temporary\n \t * buffer that receives the left-sibling data, which will be copied back\n-\t * into origpage on success. rightpage is the new page that receives the\n-\t * right-sibling data. If we fail before reaching the critical section,\n-\t * origpage hasn't been modified and leftpage is only workspace. In\n-\t * principle we shouldn't need to worry about rightpage either, because it\n-\t * hasn't been linked into the btree page structure; but to avoid leaving\n-\t * possibly-confusing junk behind, we are careful to rewrite rightpage as\n-\t * zeroes before throwing any error.\n+\t * into origpage on success. rightpage is the new page that will receive\n+\t * the right-sibling data.\n+\t *\n+\t * leftpage is allocated after choosing a split point. rightpage's new\n+\t * buffer isn't acquired until after leftpage is initialized and has new\n+\t * high key, the last point where splitting the page may fail (barring\n+\t * corruption). Failing before acquiring new buffer won't have lasting\n+\t * consequences, since origpage won't have been modified and leftpage is\n+\t * only workspace.\n \t *\/\n \torigpage = BufferGetPage(buf);\n+\toopaque = (BTPageOpaque) PageGetSpecialPointer(origpage);\n+\torigpagenumber = BufferGetBlockNumber(buf);\n+\n+\t\/*\n+\t * Choose a point to split origpage at.\n+\t *\n+\t * A split point can be thought of as a point _between_ two existing\n+\t * tuples on origpage (lastleft and firstright tuples), provided you\n+\t * pretend that the new item that didn't fit is already on origpage.\n+\t *\n+\t * Since origpage does not actually contain newitem, the representation of\n+\t * split points needs to work with two boundary cases: splits where\n+\t * newitem is lastleft, and splits where newitem is firstright.\n+\t * newitemonleft resolves the ambiguity that would otherwise exist when\n+\t * newitemoff == firstright. In all other cases it's clear which side of\n+\t * the split every tuple goes on from context. newitemonleft is usually\n+\t * (but not always) redundant information.\n+\t *\/\n+\tfirstright = _bt_findsplitloc(rel, origpage, newitemoff, newitemsz,\n+\t\t\t\t\t\t\t\t newitem, &newitemonleft);\n+\n+\t\/* Allocate temp buffer for leftpage *\/\n \tleftpage = PageGetTempPage(origpage);\n-\trightpage = BufferGetPage(rbuf);\n-\n-\torigpagenumber = BufferGetBlockNumber(buf);\n-\trightpagenumber = BufferGetBlockNumber(rbuf);\n-\n \t_bt_pageinit(leftpage, BufferGetPageSize(buf));\n-\t\/* rightpage was already initialized by _bt_getbuf *\/\n+\tlopaque = (BTPageOpaque) PageGetSpecialPointer(leftpage);\n+\n+\t\/*\n+\t * leftpage won't be the root when we're done. Also, clear the SPLIT_END\n+\t * and HAS_GARBAGE flags.\n+\t *\/\n+\tlopaque->btpo_flags = oopaque->btpo_flags;\n+\tlopaque->btpo_flags &= ~(BTP_ROOT | BTP_SPLIT_END | BTP_HAS_GARBAGE);\n+\t\/* set flag in leftpage indicating that rightpage has no downlink yet *\/\n+\tlopaque->btpo_flags |= BTP_INCOMPLETE_SPLIT;\n+\tlopaque->btpo_prev = oopaque->btpo_prev;\n+\t\/* handle btpo_next after rightpage buffer acquired *\/\n+\tlopaque->btpo.level = oopaque->btpo.level;\n+\t\/* handle btpo_cycleid after rightpage buffer acquired *\/\n \n \t\/*\n \t * Copy the original page's LSN into leftpage, which will become the\n@@ -1283,62 +1304,12 @@\n \t * examine the LSN and possibly dump it in a page image.\n \t *\/\n \tPageSetLSN(leftpage, PageGetLSN(origpage));\n-\n-\t\/* init btree private data *\/\n-\toopaque = (BTPageOpaque) PageGetSpecialPointer(origpage);\n-\tlopaque = (BTPageOpaque) PageGetSpecialPointer(leftpage);\n-\tropaque = (BTPageOpaque) PageGetSpecialPointer(rightpage);\n-\n \tisleaf = P_ISLEAF(oopaque);\n \n-\t\/* if we're splitting this page, it won't be the root when we're done *\/\n-\t\/* also, clear the SPLIT_END and HAS_GARBAGE flags in both pages *\/\n-\tlopaque->btpo_flags = oopaque->btpo_flags;\n-\tlopaque->btpo_flags &= ~(BTP_ROOT | BTP_SPLIT_END | BTP_HAS_GARBAGE);\n-\tropaque->btpo_flags = lopaque->btpo_flags;\n-\t\/* set flag in left page indicating that the right page has no downlink *\/\n-\tlopaque->btpo_flags |= BTP_INCOMPLETE_SPLIT;\n-\tlopaque->btpo_prev = oopaque->btpo_prev;\n-\tlopaque->btpo_next = rightpagenumber;\n-\tropaque->btpo_prev = origpagenumber;\n-\tropaque->btpo_next = oopaque->btpo_next;\n-\tlopaque->btpo.level = ropaque->btpo.level = oopaque->btpo.level;\n-\t\/* Since we already have write-lock on both pages, ok to read cycleid *\/\n-\tlopaque->btpo_cycleid = _bt_vacuum_cycleid(rel);\n-\tropaque->btpo_cycleid = lopaque->btpo_cycleid;\n-\n-\t\/*\n-\t * If the page we're splitting is not the rightmost page at its level in\n-\t * the tree, then the first entry on the page is the high key for the\n-\t * page. We need to copy that to the right half. Otherwise (meaning the\n-\t * rightmost page case), all the items on the right half will be user\n-\t * data.\n-\t *\/\n-\trightoff = P_HIKEY;\n-\n-\tif (!P_RIGHTMOST(oopaque))\n-\t{\n-\t\titemid = PageGetItemId(origpage, P_HIKEY);\n-\t\titemsz = ItemIdGetLength(itemid);\n-\t\titem = (IndexTuple) PageGetItem(origpage, itemid);\n-\t\tAssert(BTreeTupleGetNAtts(item, rel) > 0);\n-\t\tAssert(BTreeTupleGetNAtts(item, rel) <= indnkeyatts);\n-\t\tif (PageAddItem(rightpage, (Item) item, itemsz, rightoff,\n-\t\t\t\t\t\tfalse, false) == InvalidOffsetNumber)\n-\t\t{\n-\t\t\tmemset(rightpage, 0, BufferGetPageSize(rbuf));\n-\t\t\telog(ERROR, \"failed to add hikey to the right sibling\"\n-\t\t\t\t \" while splitting block %u of index \\\"%s\\\"\",\n-\t\t\t\t origpagenumber, RelationGetRelationName(rel));\n-\t\t}\n-\t\trightoff = OffsetNumberNext(rightoff);\n-\t}\n-\n \t\/*\n \t * The \"high key\" for the new left page will be the first key that's going\n-\t * to go into the new right page, or possibly a truncated version if this\n-\t * is a leaf page split. This might be either the existing data item at\n-\t * position firstright, or the incoming tuple.\n+\t * to go into the new right page, or a truncated version if this is a leaf\n+\t * page split.\n \t *\n \t * The high key for the left page is formed using the first item on the\n \t * right page, which may seem to be contrary to Lehman & Yao's approach of\n@@ -1360,7 +1331,6 @@\n \t * tuple could be physically larger despite being opclass-equal in respect\n \t * of all attributes prior to the heap TID attribute.)\n \t *\/\n-\tleftoff = P_HIKEY;\n \tif (!newitemonleft && newitemoff == firstright)\n \t{\n \t\t\/* incoming tuple will become first on right page *\/\n@@ -1416,23 +1386,91 @@\n \telse\n \t\tlefthikey = item;\n \n+\t\/*\n+\t * Add new high key to leftpage\n+\t *\/\n+\tleftoff = P_HIKEY;\n+\n \tAssert(BTreeTupleGetNAtts(lefthikey, rel) > 0);\n \tAssert(BTreeTupleGetNAtts(lefthikey, rel) <= indnkeyatts);\n \tif (PageAddItem(leftpage, (Item) lefthikey, itemsz, leftoff,\n \t\t\t\t\tfalse, false) == InvalidOffsetNumber)\n-\t{\n-\t\tmemset(rightpage, 0, BufferGetPageSize(rbuf));\n \t\telog(ERROR, \"failed to add hikey to the left sibling\"\n \t\t\t \" while splitting block %u of index \\\"%s\\\"\",\n \t\t\t origpagenumber, RelationGetRelationName(rel));\n-\t}\n \tleftoff = OffsetNumberNext(leftoff);\n \t\/* be tidy *\/\n \tif (lefthikey != item)\n \t\tpfree(lefthikey);\n \n \t\/*\n-\t * Now transfer all the data items to the appropriate page.\n+\t * Acquire a new right page to split into, now that left page has a new\n+\t * high key. From here on, it's not okay to throw an error without\n+\t * zeroing rightpage first. This coding rule ensures that we won't\n+\t * confuse future VACUUM operations, which might otherwise try to re-find\n+\t * a downlink to a leftover junk page as the page undergoes deletion.\n+\t *\n+\t * It would be reasonable to start the critical section just after the new\n+\t * rightpage buffer is acquired instead; that would allow us to avoid\n+\t * leftover junk pages without bothering to zero rightpage. We do it this\n+\t * way because it avoids an unnecessary PANIC when either origpage or its\n+\t * existing sibling page are corrupt.\n+\t *\/\n+\trbuf = _bt_getbuf(rel, P_NEW, BT_WRITE);\n+\trightpage = BufferGetPage(rbuf);\n+\trightpagenumber = BufferGetBlockNumber(rbuf);\n+\t\/* rightpage was initialized by _bt_getbuf *\/\n+\tropaque = (BTPageOpaque) PageGetSpecialPointer(rightpage);\n+\n+\t\/*\n+\t * Finish off remaining leftpage special area fields. They cannot be set\n+\t * before both origpage (leftpage) and rightpage buffers are acquired and\n+\t * locked.\n+\t *\/\n+\tlopaque->btpo_next = rightpagenumber;\n+\tlopaque->btpo_cycleid = _bt_vacuum_cycleid(rel);\n+\n+\t\/*\n+\t * rightpage won't be the root when we're done. Also, clear the SPLIT_END\n+\t * and HAS_GARBAGE flags.\n+\t *\/\n+\tropaque->btpo_flags = oopaque->btpo_flags;\n+\tropaque->btpo_flags &= ~(BTP_ROOT | BTP_SPLIT_END | BTP_HAS_GARBAGE);\n+\tropaque->btpo_prev = origpagenumber;\n+\tropaque->btpo_next = oopaque->btpo_next;\n+\tropaque->btpo.level = oopaque->btpo.level;\n+\tropaque->btpo_cycleid = lopaque->btpo_cycleid;\n+\n+\t\/*\n+\t * Add new high key to rightpage where necessary.\n+\t *\n+\t * If the page we're splitting is not the rightmost page at its level in\n+\t * the tree, then the first entry on the page is the high key from\n+\t * origpage.\n+\t *\/\n+\trightoff = P_HIKEY;\n+\n+\tif (!P_RIGHTMOST(oopaque))\n+\t{\n+\t\titemid = PageGetItemId(origpage, P_HIKEY);\n+\t\titemsz = ItemIdGetLength(itemid);\n+\t\titem = (IndexTuple) PageGetItem(origpage, itemid);\n+\t\tAssert(BTreeTupleGetNAtts(item, rel) > 0);\n+\t\tAssert(BTreeTupleGetNAtts(item, rel) <= indnkeyatts);\n+\t\tif (PageAddItem(rightpage, (Item) item, itemsz, rightoff,\n+\t\t\t\t\t\tfalse, false) == InvalidOffsetNumber)\n+\t\t{\n+\t\t\tmemset(rightpage, 0, BufferGetPageSize(rbuf));\n+\t\t\telog(ERROR, \"failed to add hikey to the right sibling\"\n+\t\t\t\t \" while splitting block %u of index \\\"%s\\\"\",\n+\t\t\t\t origpagenumber, RelationGetRelationName(rel));\n+\t\t}\n+\t\trightoff = OffsetNumberNext(rightoff);\n+\t}\n+\n+\t\/*\n+\t * Now transfer all the data items (non-pivot tuples in isleaf case, or\n+\t * additional pivot tuples in !isleaf case) to the appropriate page.\n \t *\n \t * Note: we *must* insert at least the right page's items in item-number\n \t * order, for the benefit of _bt_restore_page().\n@@ -1450,6 +1488,7 @@\n \t\t{\n \t\t\tif (newitemonleft)\n \t\t\t{\n+\t\t\t\tAssert(newitemoff <= firstright);\n \t\t\t\tif (!_bt_pgaddtup(leftpage, newitemsz, newitem, leftoff))\n \t\t\t\t{\n \t\t\t\t\tmemset(rightpage, 0, BufferGetPageSize(rbuf));\n@@ -1461,6 +1500,7 @@\n \t\t\t}\n \t\t\telse\n \t\t\t{\n+\t\t\t\tAssert(newitemoff >= firstright);\n \t\t\t\tif (!_bt_pgaddtup(rightpage, newitemsz, newitem, rightoff))\n \t\t\t\t{\n \t\t\t\t\tmemset(rightpage, 0, BufferGetPageSize(rbuf));\n@@ -1523,7 +1563,6 @@\n \t * all readers release locks on a page before trying to fetch its\n \t * neighbors.\n \t *\/\n-\n \tif (!P_RIGHTMOST(oopaque))\n \t{\n \t\tsbuf = _bt_getbuf(rel, oopaque->btpo_next, BT_WRITE);\n"} {"commit":"73a956d48de7dcb286214b456e2166c90ae71bd1","subject":"device: check version info of the device when it gets opened","message":"device: check version info of the device when it gets opened\n\nIf the device doesn't reply properly to the version info request, the open\noperation will get failed.\n","repos":"roland-wilhelm\/libqmi,roland-wilhelm\/libqmi,roland-wilhelm\/libqmi,roland-wilhelm\/libqmi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qmi-device.c\n+++ src\/qmi-device.c\n@@ -23,9 +23,10 @@\n #include <gio\/gio.h>\n \n #include \"qmi-device.h\"\n-#include \"qmi-message.h\"\n+#include \"qmi-message-ctl.h\"\n #include \"qmi-utils.h\"\n #include \"qmi-error-types.h\"\n+#include \"qmi-enum-types.h\"\n \n static void async_initable_iface_init (GAsyncInitableIface *iface);\n \n@@ -53,6 +54,9 @@\n \n \/* HT to keep track of ongoing transactions *\/\n GHashTable *transactions;\n+\n+ \/* Transaction ID for the CTL service *\/\n+ guint8 ctl_transaction_id;\n };\n \n #define BUFFER_SIZE 2048\n@@ -170,6 +174,24 @@\n g_hash_table_remove (self->priv->transactions, key);\n \n return tr;\n+}\n+\n+\/*****************************************************************************\/\n+\n+static guint8\n+device_get_ctl_transaction_id (QmiDevice *self)\n+{\n+ guint8 next;\n+\n+ next = self->priv->ctl_transaction_id;\n+\n+ \/* Don't go further than 8bits in the CTL service *\/\n+ if (self->priv->ctl_transaction_id == G_MAXUINT8)\n+ self->priv->ctl_transaction_id = 0x01;\n+ else\n+ self->priv->ctl_transaction_id++;\n+\n+ return next;\n }\n \n \/*****************************************************************************\/\n@@ -454,6 +476,56 @@\n return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);\n }\n \n+static void\n+version_info_ready (QmiDevice *self,\n+ GAsyncResult *res,\n+ GSimpleAsyncResult *simple)\n+{\n+ GError *error = NULL;\n+ QmiMessage *reply;\n+ GArray *services;\n+\n+ reply = qmi_device_command_finish (self, res, &error);\n+\n+ if (!reply) {\n+ g_prefix_error (&error, \"Version info check failed: \");\n+ g_simple_async_result_take_error (simple, error);\n+ g_simple_async_result_complete (simple);\n+ g_object_unref (simple);\n+ return;\n+ }\n+\n+ \/* Parse version reply *\/\n+ services = qmi_message_ctl_version_info_reply_parse (reply, &error);\n+ if (!services) {\n+ g_prefix_error (&error, \"Version info reply parsing failed: \");\n+ g_simple_async_result_take_error (simple, error);\n+ } else {\n+ guint i;\n+\n+ g_debug (\"[%s] QMI Device supports %u services:\",\n+ self->priv->path_display,\n+ services->len);\n+ for (i = 0; i < services->len; i++) {\n+ QmiCtlVersionInfoService *service;\n+\n+ service = &g_array_index (services, QmiCtlVersionInfoService, i);\n+ g_debug (\"[%s] %s (%u.%u)\",\n+ self->priv->path_display,\n+ qmi_service_get_string (service->service_type),\n+ service->major_version,\n+ service->minor_version);\n+ }\n+\n+ g_array_unref (services);\n+ g_simple_async_result_set_op_res_gboolean (simple, TRUE);\n+ }\n+\n+ g_simple_async_result_complete (simple);\n+ g_object_unref (simple);\n+ qmi_message_unref (reply);\n+}\n+\n \/**\n * qmi_device_open:\n * @self: a #QmiDevice.\n@@ -471,6 +543,7 @@\n {\n GSimpleAsyncResult *result;\n GError *error = NULL;\n+ QmiMessage *version_info_request;\n \n g_return_if_fail (QMI_IS_DEVICE (self));\n \n@@ -488,11 +561,14 @@\n return;\n }\n \n- \/* TODO: run version check *\/\n-\n- g_simple_async_result_set_op_res_gboolean (result, TRUE);\n- g_simple_async_result_complete_in_idle (result);\n- g_object_unref (result);\n+ \/* Send version info check *\/\n+ g_debug (\"Checking version info...\");\n+ version_info_request = qmi_message_ctl_version_info_new (device_get_ctl_transaction_id (self));\n+ qmi_device_command (self,\n+ version_info_request,\n+ cancellable,\n+ (GAsyncReadyCallback)version_info_ready,\n+ result);\n }\n \n \/*****************************************************************************\/\n@@ -839,6 +915,7 @@\n self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self),\n QMI_TYPE_DEVICE,\n QmiDevicePrivate);\n+ self->priv->ctl_transaction_id = 0x01;\n }\n \n static void\n"} {"commit":"d9acc95c8d22daa95106fe4a1ded7bcc4a125424","subject":"spice: make reading from client cancellable","message":"spice: make reading from client cancellable\n\nIf we don't pass a GCancellable to g_input_stream_read_async(),\nthe operation can only be intrrupted by closing the stream.\n\nSigned-off-by: Jakub Jank\u016f <e6d62f7189d9c45efd907e4f2baf6f535f551138@redhat.com>\n","repos":"GNOME\/phodav,GNOME\/phodav","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- spice\/spice-webdavd.c\n+++ spice\/spice-webdavd.c\n@@ -323,7 +323,7 @@\n g_debug (\"start read client %p\", client);\n g_input_stream_read_async (istream,\n client->mux.buf, G_MAXUINT16, G_PRIORITY_DEFAULT,\n- NULL, client_read_cb, client);\n+ cancel, client_read_cb, client);\n }\n \n static gboolean\n"} {"commit":"bf9cc5dcc70a8e7ddd56ad768eef1a73f8ee571d","subject":"Minor tweak - lock bmap before continue","message":"Minor tweak - lock bmap before continue\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/mds.c\n+++ slashd\/mds.c\n@@ -2155,8 +2155,12 @@\n \t\t\tif (bml->bml_exp == NULL)\n \t\t\t\tcontinue;\n \t\t\tcsvc = slm_getclcsvc(bml->bml_exp);\n-\t\t\tif (csvc == NULL)\n+\t\t\tif (csvc == NULL) {\n+\t\t\t\tpsclog_warnx(\"Unable to get csvc: %p\", \n+\t\t\t\t bml->bml_exp);\n+\t\t\t\tBMAP_LOCK(b);\n \t\t\t\tcontinue;\n+\t\t\t}\n \t\t\trc = SL_RSX_NEWREQ(csvc, SRMT_RELEASEBMAP,\n \t\t\t\trq, mq, mp);\n \t\t\tif (!rc) {\n"} {"commit":"2f5d6436f9371d2075709dd56e803629d8ee731d","subject":"check the return value of `prctl`","message":"check the return value of `prctl`\n","repos":"ifduyue\/playpen,waneck\/openjail,thestinger\/playpen","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- playpen.c\n+++ playpen.c\n@@ -360,7 +360,7 @@\n \/\/ Kill this process if the parent dies. This is not a replacement for killing the sandboxed\n \/\/ processes via a control group as it is not inherited by child processes, but is more\n \/\/ robust when the sandboxed process is not allowed to fork.\n- prctl(PR_SET_PDEATHSIG, SIGKILL);\n+ check_posix(prctl(PR_SET_PDEATHSIG, SIGKILL), \"prctl\");\n \n \/\/ Wait until the scope unit is set up before moving on. This also ensures that the parent\n \/\/ didn't die before `prctl` was called.\n"} {"commit":"b1c31ced58cab7d71de514665fa7cbbe78224387","subject":"Bluetooth: tester: Fix supported_settings to be sent in le order","message":"Bluetooth: tester: Fix supported_settings to be sent in le order\n\nAll the data shall be sent in little-endian byte order.\n\nChange-Id: I6d4ab0760f92e202ddcb348d30f0d1f208f84f1d\nSigned-off-by: Mariusz Skamra <c73850bd0bf85e95dce44c2ce1418ca55c1b6c5d@tieto.com>\n","repos":"32bitmicro\/zephyr,holtmann\/zephyr,runchip\/zephyr-cc3220,punitvara\/zephyr,rsalveti\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,mirzak\/zephyr-os,tidyjiang8\/zephyr-doc,aceofall\/zephyr-iotos,pklazy\/zephyr,rsalveti\/zephyr,ldts\/zephyr,fractalclone\/zephyr-riscv,jamesonwilliams\/zephyr-kernel,mbolivar\/zephyr,erwango\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200,holtmann\/zephyr,zephyriot\/zephyr,kraj\/zephyr,rsalveti\/zephyr,bboozzoo\/zephyr,punitvara\/zephyr,punitvara\/zephyr,32bitmicro\/zephyr,GiulianoFranchetto\/zephyr,fbsder\/zephyr,punitvara\/zephyr,finikorg\/zephyr,kraj\/zephyr,zephyrproject-rtos\/zephyr,tidyjiang8\/zephyr-doc,Vudentz\/zephyr,ldts\/zephyr,fbsder\/zephyr,GiulianoFranchetto\/zephyr,pklazy\/zephyr,explora26\/zephyr,erwango\/zephyr,pklazy\/zephyr,mirzak\/zephyr-os,holtmann\/zephyr,erwango\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,kraj\/zephyr,mirzak\/zephyr-os,galak\/zephyr,rsalveti\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,bigdinotech\/zephyr,galak\/zephyr,ldts\/zephyr,mbolivar\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,Vudentz\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3220,tidyjiang8\/zephyr-doc,explora26\/zephyr,fractalclone\/zephyr-riscv,mbolivar\/zephyr,nashif\/zephyr,coldnew\/zephyr-project-fork,zephyriot\/zephyr,coldnew\/zephyr-project-fork,nashif\/zephyr,32bitmicro\/zephyr,nashif\/zephyr,holtmann\/zephyr,mirzak\/zephyr-os,32bitmicro\/zephyr,coldnew\/zephyr-project-fork,bigdinotech\/zephyr,sharronliu\/zephyr,erwango\/zephyr,ldts\/zephyr,bboozzoo\/zephyr,tidyjiang8\/zephyr-doc,explora26\/zephyr,mbolivar\/zephyr,fbsder\/zephyr,GiulianoFranchetto\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3220,rsalveti\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3220,finikorg\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,mirzak\/zephyr-os,fbsder\/zephyr,zephyriot\/zephyr,galak\/zephyr,coldnew\/zephyr-project-fork,holtmann\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3220,jamesonwilliams\/zephyr-kernel,jamesonwilliams\/zephyr-kernel,fractalclone\/zephyr-riscv,fbsder\/zephyr,aceofall\/zephyr-iotos,bboozzoo\/zephyr,bigdinotech\/zephyr,jamesonwilliams\/zephyr-kernel,coldnew\/zephyr-project-fork,tidyjiang8\/zephyr-doc,fractalclone\/zephyr-riscv,erwango\/zephyr,finikorg\/zephyr,explora26\/zephyr,jamesonwilliams\/zephyr-kernel,nashif\/zephyr,sharronliu\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3200,pklazy\/zephyr,kraj\/zephyr,sharronliu\/zephyr,ldts\/zephyr,galak\/zephyr,pklazy\/zephyr,mbolivar\/zephyr,Vudentz\/zephyr,aceofall\/zephyr-iotos,bigdinotech\/zephyr,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos,sharronliu\/zephyr,aceofall\/zephyr-iotos,32bitmicro\/zephyr,runchip\/zephyr-cc3200,Vudentz\/zephyr,sharronliu\/zephyr,punitvara\/zephyr,GiulianoFranchetto\/zephyr,fractalclone\/zephyr-riscv","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- samples\/bluetooth\/tester\/src\/gap.c\n+++ samples\/bluetooth\/tester\/src\/gap.c\n@@ -135,16 +135,18 @@\n static void controller_info(uint8_t *data, uint16_t len)\n {\n \tstruct gap_read_controller_info_rp rp;\n+\tuint32_t supported_settings;\n \n \tmemset(&rp, 0, sizeof(rp));\n \tmemcpy(rp.address, CONTROLLER_ADDR, sizeof(bt_addr_t));\n \n-\trp.supported_settings = 1 << GAP_SETTINGS_POWERED;\n-\trp.supported_settings |= 1 << GAP_SETTINGS_CONNECTABLE;\n-\trp.supported_settings |= 1 << GAP_SETTINGS_BONDABLE;\n-\trp.supported_settings |= 1 << GAP_SETTINGS_LE;\n-\trp.supported_settings |= 1 << GAP_SETTINGS_ADVERTISING;\n-\n+\tsupported_settings = 1 << GAP_SETTINGS_POWERED;\n+\tsupported_settings |= 1 << GAP_SETTINGS_CONNECTABLE;\n+\tsupported_settings |= 1 << GAP_SETTINGS_BONDABLE;\n+\tsupported_settings |= 1 << GAP_SETTINGS_LE;\n+\tsupported_settings |= 1 << GAP_SETTINGS_ADVERTISING;\n+\n+\trp.supported_settings = sys_cpu_to_le32(supported_settings);\n \trp.current_settings = sys_cpu_to_le32(current_settings);\n \n \tmemcpy(rp.name, CONTROLLER_NAME, sizeof(CONTROLLER_NAME));\n"} {"commit":"07f71cd17706093ca6b1507c41609356d479ae9f","subject":"python: Fix import.","message":"python: Fix import.\n\n* lang\/python\/helpers.c (pygpgme_exception_init): Make module import\nrelative.\n\nSigned-off-by: Justus Winter <4d1bd7a5ca1cd26bee0df05b6801a6ce9a22196e@gnupg.org>\n","repos":"gpg\/gpgme,gpg\/gpgme,gpg\/gpgme,gpg\/gpgme,gpg\/gpgme,gpg\/gpgme,gpg\/gpgme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lang\/python\/helpers.c\n+++ lang\/python\/helpers.c\n@@ -29,7 +29,10 @@\n void pygpgme_exception_init(void) {\n if (GPGMEError == NULL) {\n PyObject *errors;\n- errors = PyImport_ImportModule(\"errors\");\n+ PyObject *from_list = PyList_New(0);\n+ errors = PyImport_ImportModuleLevel(\"errors\", PyEval_GetGlobals(),\n+ PyEval_GetLocals(), from_list, 1);\n+ Py_XDECREF(from_list);\n if (errors) {\n GPGMEError=PyDict_GetItemString(PyModule_GetDict(errors), \"GPGMEError\");\n Py_XINCREF(GPGMEError);\n"} {"commit":"68cd946994313a2005a289fe5eda2c9a616c7e67","subject":"Add MIN_TX_SIZE definition","message":"Add MIN_TX_SIZE definition\n\nChange-Id: I399d601d40827ac383a6687cbeaec59e9a9c63e4\n","repos":"smarter\/aom,smarter\/aom,luctrudeau\/aom,mbebenita\/aom,GrokImageCompression\/aom,mbebenita\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,GrokImageCompression\/aom,mbebenita\/aom,smarter\/aom,mbebenita\/aom,mbebenita\/aom,GrokImageCompression\/aom,mbebenita\/aom,luctrudeau\/aom,mbebenita\/aom,luctrudeau\/aom,mbebenita\/aom,GrokImageCompression\/aom,luctrudeau\/aom,smarter\/aom,mbebenita\/aom,smarter\/aom,smarter\/aom,luctrudeau\/aom,luctrudeau\/aom","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp10\/common\/enums.h\n+++ vp10\/common\/enums.h\n@@ -139,12 +139,16 @@\n \n #define MAX_TX_SIZE_LOG2 5\n #define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2)\n+#define MIN_TX_SIZE_LOG2 2\n+#define MIN_TX_SIZE (1 << MIN_TX_SIZE_LOG2)\n #define MAX_TX_SQUARE (MAX_TX_SIZE * MAX_TX_SIZE)\n \n \/\/ Number of maxium size transform blocks in the maximum size superblock\n #define MAX_TX_BLOCKS_IN_MAX_SB_LOG2 \\\n ((MAX_SB_SIZE_LOG2 - MAX_TX_SIZE_LOG2) * 2)\n #define MAX_TX_BLOCKS_IN_MAX_SB (1 << MAX_TX_BLOCKS_IN_MAX_SB_LOG2)\n+\n+#define MAX_NUM_TXB (1 << (MAX_SB_SIZE_LOG2 - MIN_TX_SIZE_LOG2))\n \n \/\/ frame transform mode\n typedef enum {\n"} {"commit":"47939f67252edc6295268dfebff24b5450eaba85","subject":"coverity: debugfs devfip remove comparisons to LONG_MAX","message":"coverity: debugfs devfip remove comparisons to LONG_MAX\n\nCID 353228: Integer handling issues (CONSTANT_EXPRESSION_RESULT)\n\nThe checks on size and offset_address in get_entry always resolve to\nfalse provided those fields are long long int and cannot be greater\nthan LONG_MAX.\n\nSigned-off-by: Olivier Deprez <a71d93c73db536dc855a04902dabc350f140693d@arm.com>\nChange-Id: I0fac485a39ac4a40ae8c0d25a706ad74c795e130\n","repos":"achingupta\/arm-trusted-firmware,achingupta\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/debugfs\/devfip.c\n+++ lib\/debugfs\/devfip.c\n@@ -1,5 +1,5 @@\n \/*\n- * Copyright (c) 2019, Arm Limited. All rights reserved.\n+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.\n *\n * SPDX-License-Identifier: BSD-3-Clause\n *\/\n@@ -103,10 +103,6 @@\n \t\treturn -1;\n \t}\n \n-\tif ((entry->size > LONG_MAX) || (entry->offset_address > LONG_MAX)) {\n-\t\treturn -1;\n-\t}\n-\n \tif (entry->size == 0) {\n \t\treturn 0;\n \t}\n"} {"commit":"c20cc2bd8a018f078e3916e01579df8faab66f92","subject":"Add Wait() for reshape_op","message":"Add Wait() for reshape_op\n","repos":"luotao1\/Paddle,PaddlePaddle\/Paddle,Canpio\/Paddle,QiJune\/Paddle,jacquesqiao\/Paddle,tensor-tang\/Paddle,QiJune\/Paddle,lcy-seso\/Paddle,luotao1\/Paddle,QiJune\/Paddle,lcy-seso\/Paddle,Canpio\/Paddle,chengduoZH\/Paddle,reyoung\/Paddle,baidu\/Paddle,Canpio\/Paddle,Canpio\/Paddle,Canpio\/Paddle,baidu\/Paddle,baidu\/Paddle,lcy-seso\/Paddle,luotao1\/Paddle,pkuyym\/Paddle,lcy-seso\/Paddle,putcn\/Paddle,putcn\/Paddle,chengduoZH\/Paddle,putcn\/Paddle,QiJune\/Paddle,putcn\/Paddle,baidu\/Paddle,chengduoZH\/Paddle,pkuyym\/Paddle,PaddlePaddle\/Paddle,jacquesqiao\/Paddle,putcn\/Paddle,PaddlePaddle\/Paddle,putcn\/Paddle,lcy-seso\/Paddle,reyoung\/Paddle,QiJune\/Paddle,jacquesqiao\/Paddle,pkuyym\/Paddle,tensor-tang\/Paddle,pkuyym\/Paddle,PaddlePaddle\/Paddle,chengduoZH\/Paddle,Canpio\/Paddle,reyoung\/Paddle,pkuyym\/Paddle,tensor-tang\/Paddle,luotao1\/Paddle,chengduoZH\/Paddle,jacquesqiao\/Paddle,luotao1\/Paddle,baidu\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,tensor-tang\/Paddle,jacquesqiao\/Paddle,reyoung\/Paddle,QiJune\/Paddle,jacquesqiao\/Paddle,lcy-seso\/Paddle,reyoung\/Paddle,pkuyym\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,tensor-tang\/Paddle,Canpio\/Paddle,reyoung\/Paddle,Canpio\/Paddle,luotao1\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/fluid\/operators\/reshape_op.h\n+++ paddle\/fluid\/operators\/reshape_op.h\n@@ -147,6 +147,7 @@\n if (!inplace) {\n out->mutable_data<T>(ctx.GetPlace());\n framework::TensorCopy(*in, ctx.GetPlace(), ctx.device_context(), out);\n+ ctx.device_context().Wait();\n \/\/ TensorCopy will resize to in_dims.\n out->Resize(out_dims);\n } else {\n@@ -169,6 +170,7 @@\n auto in_dims = d_x->dims();\n if (!inplace) {\n framework::TensorCopy(*d_out, ctx.GetPlace(), ctx.device_context(), d_x);\n+ ctx.device_context().Wait();\n d_x->Resize(in_dims);\n } else {\n d_x->ShareDataWith(*d_out);\n"} {"commit":"4de08a322742aab1a9d7f3b17c130d5120e98511","subject":"fix handling SIGTRAP in the learning mode","message":"fix handling SIGTRAP in the learning mode\n","repos":"ifduyue\/playpen,thestinger\/playpen","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- playpen.c\n+++ playpen.c\n@@ -281,10 +281,7 @@\n \n int inject_signal = 0;\n if (*trace_init) {\n- int signal = WSTOPSIG(status);\n- if (signal != SIGTRAP || !(status & PTRACE_EVENT_SECCOMP))\n- inject_signal = signal;\n- else {\n+ if (status >> 8 == (SIGTRAP | PTRACE_EVENT_SECCOMP << 8)) {\n errno = 0;\n #ifdef __x86_64__\n long syscall = ptrace(PTRACE_PEEKUSER, si->ssi_pid, sizeof(long) * ORIG_RAX);\n@@ -332,6 +329,8 @@\n fprintf(whitelist, \"%s\\n\", rule);\n free(rule);\n }\n+ } else {\n+ inject_signal = WSTOPSIG(status);\n }\n } else {\n check_posix(ptrace(PTRACE_SETOPTIONS, si->ssi_pid, 0, PTRACE_O_TRACESECCOMP), \"ptrace\");\n"} {"commit":"45d8ed51628d5f95a5a43316b8eb22fee81aebb3","subject":"Unconditionaly initialize any spin lock passed to pthread_spin_init(). While makeing sure the spinlock isn't already in use might be a nice feature to have in theory, it's hard to implement in practice since the passed in pointer may not be NULL, but still be an invalid value (i.e. 1..2..3.. etc).","message":"Unconditionaly initialize any spin lock passed to pthread_spin_init(). While\nmakeing sure the spinlock isn't already in use might be a nice feature to\nhave in theory, it's hard to implement in practice since the passed in\npointer may not be NULL, but still be an invalid value (i.e. 1..2..3.. etc).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libthr\/thread\/thr_spinlock.c\n+++ lib\/libthr\/thread\/thr_spinlock.c\n@@ -80,10 +80,6 @@\n {\n \tstruct pthread_spinlock *s;\n \n-\tif (*lock != NULL) {\n-\t\tif ((*lock)->s_magic == THR_SPIN_MAGIC)\n-\t\t\treturn (EBUSY);\n-\t}\n \ts = (struct pthread_spinlock *)malloc(sizeof(struct pthread_spinlock));\n \tif (s == NULL)\n \t\treturn (ENOMEM);\n"} {"commit":"8932ff2db1c87cf1a84390fb313588c7d926edc0","subject":"GetName: always try to read the stored name first","message":"GetName: always try to read the stored name first\n","repos":"pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,mapfau\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hcid\/dbus-adapter.c\n+++ hcid\/dbus-adapter.c\n@@ -878,21 +878,15 @@\n \tstruct hci_dbus_data *dbus_data = data;\n \tDBusMessage *reply;\n \tchar str[249], *str_ptr = str;\n-\tint err = -1;\n-\tstruct hci_dev_info di;\n+\tint err;\n+\tbdaddr_t ba;\n \n \tif (!dbus_message_has_signature(msg, DBUS_TYPE_INVALID_AS_STRING))\n \t\treturn error_invalid_arguments(conn, msg);\n \n-\t\/* If the device is DOWN, try to read the name from storage file *\/\n-\tif (hci_devinfo(dbus_data->dev_id, &di) == 0 && !hci_test_bit(HCI_UP, &di.flags)) {\n-\t\tbdaddr_t ba;\n-\n-\t\tstr2ba(dbus_data->address, &ba);\n-\n-\t\terr = read_local_name(&ba, str);\n-\t}\n-\n+\tstr2ba(dbus_data->address, &ba);\n+\n+\terr = read_local_name(&ba, str);\n \tif (err < 0)\n \t\terr = get_device_name(dbus_data->dev_id, str, sizeof(str));\n \n"} {"commit":"113de97365e811b02846ab6a387e3af065a7e2d1","subject":"[clangd] Added missing #includes to Function.h","message":"[clangd] Added missing #includes to Function.h\n\ngit-svn-id: a34e9779ed74578ad5922b3306b3d80a0c825546@315324 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/clang-tools-extra,llvm-mirror\/clang-tools-extra,llvm-mirror\/clang-tools-extra,llvm-mirror\/clang-tools-extra","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- clangd\/Function.h\n+++ clangd\/Function.h\n@@ -14,6 +14,9 @@\n #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_FUNCTION_H\n #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_FUNCTION_H\n \n+#include \"llvm\/ADT\/STLExtras.h\"\n+#include <cassert>\n+#include <memory>\n #include <tuple>\n #include <type_traits>\n #include <utility>\n"} {"commit":"9bb5724fc00f3d22a9588c36fbb7f0c7e12482a4","subject":"Move the processing prompt to the title line.","message":"Move the processing prompt to the title line.\n\nDon't ask, it simply looks nicer this way. Feel free to convince me\notherwise.\n","repos":"google\/xsecurelock,google\/xsecurelock","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- helpers\/auth_pam_x11.c\n+++ helpers\/auth_pam_x11.c\n@@ -585,7 +585,7 @@\n }\n \n \/\/ We're returning to PAM, so let's show the processing prompt.\n- display_string(\"\", \"Processing...\");\n+ display_string(\"Processing...\", \"\");\n \n return PAM_SUCCESS;\n }\n@@ -599,7 +599,7 @@\n conv_error = 0;\n \n \/\/ We're entering PAM, so let's show a processing prompt.\n- display_string(\"\", \"Processing...\");\n+ display_string(\"Processing...\", \"\");\n \n int status = pam_call(pam, flags);\n if (conv_error) { \/\/ Timeout or escape.\n"} {"commit":"06f13bebc70fb2c97932ac0ab67cba372b29d941","subject":"perception; fix lint and style with clang-format","message":"perception; fix lint and style with clang-format\n","repos":"ApolloAuto\/apollo,jinghaomiao\/apollo,ycool\/apollo,ApolloAuto\/apollo,jinghaomiao\/apollo,wanglei828\/apollo,wanglei828\/apollo,xiaoxq\/apollo,wanglei828\/apollo,ApolloAuto\/apollo,jinghaomiao\/apollo,ApolloAuto\/apollo,ycool\/apollo,wanglei828\/apollo,jinghaomiao\/apollo,ycool\/apollo,ApolloAuto\/apollo,xiaoxq\/apollo,ycool\/apollo,xiaoxq\/apollo,xiaoxq\/apollo,ycool\/apollo,xiaoxq\/apollo,wanglei828\/apollo,ycool\/apollo,wanglei828\/apollo,jinghaomiao\/apollo,xiaoxq\/apollo,ApolloAuto\/apollo,jinghaomiao\/apollo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/perception\/obstacle\/camera\/common\/visual_object.h\n+++ modules\/perception\/obstacle\/camera\/common\/visual_object.h\n@@ -17,6 +17,7 @@\n #ifndef MODULES_PERCEPTION_OBSTACLE_CAMERA_COMMON_VISUAL_OBJECT_H\n #define MODULES_PERCEPTION_OBSTACLE_CAMERA_COMMON_VISUAL_OBJECT_H\n \n+#include <memory>\n #include <vector>\n \n #include \"Eigen\/Core\"\n@@ -27,57 +28,56 @@\n namespace perception {\n \n struct alignas(16) VisualObject {\n+ \/\/ Per-frame object id, assigned from detection\n+ int id = 0;\n+ \/\/ Confidence of objectness, ranging as [0, 1]\n+ float score = 0.0f;\n \n- \/\/ Per-frame object id, assigned from detection\n- int id = 0;\n- \/\/ Confidence of objectness, ranging as [0, 1]\n- float score = 0.0f;\n+ \/\/ [pixel] 2D bounding box\n+ \/\/ upper-left corner: x1, y1\n+ Eigen::Vector2f upper_left;\n+ \/\/ lower-right corner: x2, y2\n+ Eigen::Vector2f lower_right;\n \n- \/\/ [pixel] 2D bounding box\n- \/\/ upper-left corner: x1, y1\n- Eigen::Vector2f upper_left;\n- \/\/ lower-right corner: x2, y2\n- Eigen::Vector2f lower_right;\n+ \/\/ 2D bounding box truncation ratio, for out-of-image objects\n+ float trunc_width = 0.0f;\n+ float trunc_height = 0.0f;\n \n- \/\/ 2D bounding box truncation ratio, for out-of-image objects\n- float trunc_width = 0.0f;\n- float trunc_height = 0.0f;\n+ \/\/ Object type from detection\n+ ObjectType type = UNKNOWN;\n+ \/\/ Probability of each object type\n+ std::vector<float> type_probs;\n \n- \/\/ Object type from detection\n- ObjectType type = UNKNOWN;\n- \/\/ Probability of each object type\n- std::vector<float> type_probs;\n+ \/\/ ROI pooling feature from layers of deep learning detection model\n+ std::vector<float> dl_roi_feature;\n \n- \/\/ ROI pooling feature from layers of deep learning detection model\n- std::vector<float> dl_roi_feature;\n+ \/\/ [meter] physical size of 3D oriented bounding box\n+ \/\/ length is the size in the main direction\n+ float length = 0.0f;\n+ float width = 0.0f;\n+ float height = 0.0f;\n \n- \/\/ [meter] physical size of 3D oriented bounding box\n- \/\/ length is the size in the main direction\n- float length = 0.0f;\n- float width = 0.0f;\n- float height = 0.0f;\n+ \/\/ [radian] observation angle of object, ranging as [-pi, pi]\n+ float alpha = 0.0f;\n+ \/\/ [radian] Rotation around the vertical axis, ranging as [-pi, pi]\n+ \/\/ the yaw angle, theta = 0.0f means direction = (1, 0, 0)\n+ float theta = 0.0f;\n+ \/\/ main direction\n+ Eigen::Vector3f direction = Eigen::Vector3f(1.0f, 0.0f, 0.0f);\n \n- \/\/ [radian] observation angle of object, ranging as [-pi, pi]\n- float alpha = 0.0f;\n- \/\/ [radian] Rotation around the vertical axis, ranging as [-pi, pi]\n- \/\/ the yaw angle, theta = 0.0f means direction = (1, 0, 0)\n- float theta = 0.0f;\n- \/\/ main direction\n- Eigen::Vector3f direction = Eigen::Vector3f(1.0f, 0.0f, 0.0f);\n+ \/\/ [meter] physical center of the object, (cx, cy, cz)\n+ Eigen::Vector3f center = Eigen::Vector3f::Zero();\n+ \/\/ [meter] distance to object physical center from camera origin\n+ float distance = 0.0f;\n+ \/\/ [meter \/ second] physical velocity of the object, (vx, vy, vz)\n+ Eigen::Vector3f velocity = Eigen::Vector3f::Zero();\n \n- \/\/ [meter] physical center of the object, (cx, cy, cz)\n- Eigen::Vector3f center = Eigen::Vector3f::Zero();\n- \/\/ [meter] distance to object physical center from camera origin\n- float distance = 0.0f;\n- \/\/ [meter \/ second] physical velocity of the object, (vx, vy, vz)\n- Eigen::Vector3f velocity = Eigen::Vector3f::Zero();\n-\n- \/\/ globally unique tracking id for camera visual objects\n- int track_id = 0;\n- \/\/ [second] age of the tracked object\n- float track_age = 0.0f;\n- \/\/ [second] the last observed timestamp\n- float last_track_timestamp = 0.0f;\n+ \/\/ globally unique tracking id for camera visual objects\n+ int track_id = 0;\n+ \/\/ [second] age of the tracked object\n+ float track_age = 0.0f;\n+ \/\/ [second] the last observed timestamp\n+ float last_track_timestamp = 0.0f;\n };\n \n typedef std::shared_ptr<VisualObject> VisualObjectPtr;\n"} {"commit":"e3d4998c96519f4a950e8c708765d97ff01a9b70","subject":"Adds support for death tests in OpenBSD (by Pawe\u0142 Hajdan Jr.)","message":"Adds support for death tests in OpenBSD (by Pawe\u0142 Hajdan Jr.)","repos":"amitkr\/googletest,marcossilvadecastro\/googletest,marcossilvadecastro\/googletest,amitkr\/googletest,amitkr\/googletest,marcossilvadecastro\/googletest,marcossilvadecastro\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -91,6 +91,7 @@\n \/\/ GTEST_OS_LINUX_ANDROID - Google Android\n \/\/ GTEST_OS_MAC - Mac OS X\n \/\/ GTEST_OS_NACL - Google Native Client (NaCl)\n+\/\/ GTEST_OS_OPENBSD - OpenBSD\n \/\/ GTEST_OS_SOLARIS - Sun Solaris\n \/\/ GTEST_OS_SYMBIAN - Symbian\n \/\/ GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile)\n@@ -242,6 +243,8 @@\n # define GTEST_OS_HPUX 1\n #elif defined __native_client__\n # define GTEST_OS_NACL 1\n+#elif defined __OpenBSD__\n+# define GTEST_OS_OPENBSD 1\n #endif \/\/ __CYGWIN__\n \n \/\/ Brings in definitions for functions used in the testing::internal::posix\n@@ -540,7 +543,8 @@\n \/\/ pops up a dialog window that cannot be suppressed programmatically.\n #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \\\n (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \\\n- GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX)\n+ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \\\n+ GTEST_OS_OPENBSD)\n # define GTEST_HAS_DEATH_TEST 1\n # include <vector> \/\/ NOLINT\n #endif\n"} {"commit":"14d4074f118a0c1b87be7548db765dc6801021a4","subject":"[Core\/MCD] fixed pending level 1 interrupts when GFX interrupt is disabled (fixes random freezes out of \"Batman Returns\" option menu)","message":"[Core\/MCD] fixed pending level 1 interrupts when GFX interrupt is disabled (fixes random freezes out of \"Batman Returns\" option menu)\n","repos":"frangarcj\/Genesis-Plus-GX,frangarcj\/Genesis-Plus-GX,Oggom\/Genesis-Plus-GX,DavidKnight247\/Genesis-Plus-GX,frangarcj\/Genesis-Plus-GX,Oggom\/Genesis-Plus-GX,Oggom\/Genesis-Plus-GX,DavidKnight247\/Genesis-Plus-GX,Oggom\/Genesis-Plus-GX,DavidKnight247\/Genesis-Plus-GX,frangarcj\/Genesis-Plus-GX,DavidKnight247\/Genesis-Plus-GX","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- core\/cd_hw\/scd.c\n+++ core\/cd_hw\/scd.c\n@@ -739,7 +739,10 @@\n \n \/* update IEN2 flag *\/\n scd.regs[0x00].byte.h = (scd.regs[0x00].byte.h & 0x7f) | ((data & 0x04) << 5);\n- \n+\n+ \/* clear level 1 interrupt if disabled (\"Batman Returns\" option menu) *\/\n+ scd.pending &= ~(data & 0x02);\n+\n \/* update IRQ level *\/\n s68k_update_irq((scd.pending & data) >> 1);\n return;\n@@ -1025,6 +1028,9 @@\n \n \/* update IEN2 flag *\/\n scd.regs[0x00].byte.h = (scd.regs[0x00].byte.h & 0x7f) | ((data & 0x04) << 5);\n+\n+ \/* clear pending level 1 interrupt if disabled (\"Batman Returns\" option menu) *\/\n+ scd.pending &= ~(data & 0x02);\n \n \/* update IRQ level *\/\n s68k_update_irq((scd.pending & data) >> 1);\n"} {"commit":"8ed6de3605630370a3d6b175f7d91237296b9ee4","subject":"simplify a bit some parts","message":"simplify a bit some parts\n","repos":"GeeXboX\/libplayer,GeeXboX\/libplayer,GeeXboX\/libplayer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/wrapper_mplayer.c\n+++ src\/wrapper_mplayer.c\n@@ -1257,13 +1257,7 @@\n \n size++;\n uri = malloc (size);\n- if (!uri)\n- {\n- if (device)\n- free (device);\n- return NULL;\n- }\n-\n+ if (uri)\n snprintf (uri, size, \"%s%s%s%s%s\",\n protocol, track_start, track_end, speed, device ? device : \"\");\n \n@@ -1306,13 +1300,7 @@\n \n size++;\n uri = malloc (size);\n- if (!uri)\n- {\n- if (device)\n- free (device);\n- return NULL;\n- }\n-\n+ if (uri)\n snprintf (uri, size, \"%s%s%s%s\",\n protocol, title_start, title_end, device ? device : \"\");\n \n@@ -1345,13 +1333,7 @@\n \n size++;\n uri = malloc (size);\n- if (!uri)\n- {\n- if (device)\n- free (device);\n- return NULL;\n- }\n-\n+ if (uri)\n snprintf (uri, size, \"%s%s%s\", protocol, track_start, device ? device : \"\");\n \n if (device)\n@@ -1396,12 +1378,7 @@\n \n size++;\n uri = malloc (size);\n- if (!uri)\n- {\n- free (host_file);\n- return NULL;\n- }\n-\n+ if (uri)\n snprintf (uri, size, \"%s%s%s\", protocol, at, host_file);\n \n free (host_file);\n"} {"commit":"ca308f0a1a0169990ea9bcdc8f8580634686bc6a","subject":"-VER: elastix version -> 4.406","message":"-VER: elastix version -> 4.406\n\n","repos":"SuperElastix\/elastix,SuperElastix\/elastix,SuperElastix\/elastix,SuperElastix\/elastix,SuperElastix\/elastix","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/Core\/Install\/elxBaseComponent.h\n+++ src\/Core\/Install\/elxBaseComponent.h\n@@ -37,7 +37,7 @@\n #include <sstream>\n \n \/** The current elastix version. *\/\n-#define __ELASTIX_VERSION 4.405\n+#define __ELASTIX_VERSION 4.406\n \n \/** All elastix components should be in namespace elastix. *\/\n namespace elastix\n"} {"commit":"eeb03faadc7e677f69aaf82aef2786c39faa4b76","subject":"Fix several bugs relating to uniforms and attributes in GLSL API","message":"Fix several bugs relating to uniforms and attributes in GLSL API\n\n- fix sizes for GL_FLOAT_MAT2x3 and GL_FLOAT_MAT4x3 in sizeof_glsl_type\n- fix size returns in _mesa_get_active_attrib\n- fix out-of-bounds array access to vec_types in _mesa_get_active_attrib\n- fix queries of matrix uniforms in _mesa_get_uniformfv\n- fix _mesa_get_uniformfv to only return one base, even from an array\n- allow location == -1 in _mesa_uniform\n- validate types in _mesa_uniform\n- allow array overruns in _mesa_uniform\n","repos":"dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/shader\/shader_api.c\n+++ src\/mesa\/shader\/shader_api.c\n@@ -399,7 +399,7 @@\n case GL_FLOAT_MAT4:\n return 16;\n case GL_FLOAT_MAT2x3:\n- return 6;\n+ return 8; \/* 2 rows of 4, actually *\/\n case GL_FLOAT_MAT2x4:\n return 8;\n case GL_FLOAT_MAT3x2:\n@@ -409,7 +409,7 @@\n case GL_FLOAT_MAT4x2:\n return 16; \/* 4 rows of 4, actually *\/\n case GL_FLOAT_MAT4x3:\n- return 12;\n+ return 16; \/* 4 rows of 4, actually *\/\n default:\n return 0; \/* error *\/\n }\n@@ -680,9 +680,9 @@\n shProg->Attributes->Parameters[index].Name);\n sz = shProg->Attributes->Parameters[index].Size;\n if (size)\n- *size = sz;\n- if (type)\n- *type = vec_types[sz]; \/* XXX this is a temporary hack *\/\n+ *size = 1; \/* attributes may not be arrays *\/\n+ if (type && sz > 0 && sz <= 4) \/* XXX this is a temporary hack *\/\n+ *type = vec_types[sz - 1];\n }\n \n \n@@ -954,9 +954,40 @@\n if (shProg) {\n GLint i;\n if (location >= 0 && location < shProg->Uniforms->NumParameters) {\n- for (i = 0; i < shProg->Uniforms->Parameters[location].Size; i++) {\n- params[i] = shProg->Uniforms->ParameterValues[location][i];\n+ GLuint uSize;\n+ GLenum uType;\n+ GLint rows = 0;\n+ uType = shProg->Uniforms->Parameters[location].DataType;\n+ uSize = sizeof_glsl_type(uType);\n+ \/* Matrix types need special handling, because they span several\n+ * parameters, and may also not be fully packed.\n+ *\/\n+ switch (shProg->Uniforms->Parameters[location].DataType) {\n+ case GL_FLOAT_MAT2:\n+ case GL_FLOAT_MAT3x2:\n+ case GL_FLOAT_MAT4x2:\n+ rows = 2;\n+ break;\n+ case GL_FLOAT_MAT2x3:\n+ case GL_FLOAT_MAT3:\n+ case GL_FLOAT_MAT4x3:\n+ rows = 3;\n+ break;\n+ case GL_FLOAT_MAT2x4:\n+ case GL_FLOAT_MAT3x4:\n+ case GL_FLOAT_MAT4:\n+ rows = 4;\n }\n+ if (rows != 0) {\n+ GLint r, c;\n+ for (c = 0, i = 0; c * 4 < uSize; c++)\n+ for (r = 0; r < rows; r++, i++)\n+ params[i] = shProg->Uniforms->ParameterValues[location + c][r];\n+ }\n+ else\n+ for (i = 0; i < uSize; i++) {\n+ params[i] = shProg->Uniforms->ParameterValues[location][i];\n+ }\n }\n else {\n _mesa_error(ctx, GL_INVALID_VALUE, \"glGetUniformfv(location)\");\n@@ -1110,12 +1141,17 @@\n {\n struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;\n GLint elems, i, k;\n+ GLenum uType;\n+ GLsizei maxCount;\n \n if (!shProg || !shProg->LinkStatus) {\n _mesa_error(ctx, GL_INVALID_OPERATION, \"glUniform(program not linked)\");\n return;\n }\n \n+ if (location == -1)\n+ return; \/* The standard specifies this as a no-op *\/\n+\n if (location < 0 || location >= (GLint) shProg->Uniforms->NumParameters) {\n _mesa_error(ctx, GL_INVALID_VALUE, \"glUniform(location)\");\n return;\n@@ -1123,10 +1159,11 @@\n \n FLUSH_VERTICES(ctx, _NEW_PROGRAM);\n \n+ uType = shProg->Uniforms->Parameters[location].Type;\n \/*\n * If we're setting a sampler, we must use glUniformi1()!\n *\/\n- if (shProg->Uniforms->Parameters[location].Type == PROGRAM_SAMPLER) {\n+ if (uType == PROGRAM_SAMPLER) {\n GLint unit;\n if (type != GL_INT || count != 1) {\n _mesa_error(ctx, GL_INVALID_OPERATION,\n@@ -1170,10 +1207,35 @@\n return;\n }\n \n- if (count * elems > shProg->Uniforms->Parameters[location].Size) {\n- _mesa_error(ctx, GL_INVALID_OPERATION, \"glUniform(count too large)\");\n- return;\n- }\n+ \/* OpenGL requires types to match exactly, except that one can convert\n+ * float or int array to boolean array.\n+ *\/\n+ switch (uType)\n+ {\n+ case GL_BOOL:\n+ case GL_BOOL_VEC2:\n+ case GL_BOOL_VEC3:\n+ case GL_BOOL_VEC4:\n+ if (elems != sizeof_glsl_type(shProg->Uniforms->Parameters[location].DataType)) {\n+ _mesa_error(ctx, GL_INVALID_OPERATION, \"glUniform(count mismatch)\");\n+ }\n+ break;\n+ case PROGRAM_SAMPLER:\n+ break;\n+ default:\n+ if (uType != type) {\n+ _mesa_error(ctx, GL_INVALID_OPERATION, \"glUniform(type mismatch)\");\n+ }\n+ break;\n+ }\n+\n+ \/* XXX if this is a base type, then count must equal 1. However, we\n+ * don't have enough information from the compiler to distinguish a\n+ * base type from a 1-element array of that type. The standard allows\n+ * count to overrun an array, in which case the overflow is ignored.\n+ *\/\n+ maxCount = shProg->Uniforms->Parameters[location].Size \/ elems;\n+ if (count > maxCount) count = maxCount;\n \n for (k = 0; k < count; k++) {\n GLfloat *uniformVal = shProg->Uniforms->ParameterValues[location + k];\n"} {"commit":"b8a9339f6dc76b8980c936ed69169f41833ed068","subject":"SFINAE test to detect allowed bitdield structure.","message":"SFINAE test to detect allowed bitdield structure.\n","repos":"FrankStain\/jnipp,FrankStain\/jnipp","returncode":1,"stderr":"error: pathspec 'include\/jnipp\/utils\/HasBitsField.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- include\/jnipp\/utils\/HasBitsField.h\n+++ include\/jnipp\/utils\/HasBitsField.h\n@@ -0,0 +1,18 @@\n+\/\/ Copyright since 2016 : Evgenii Shatunov (github.com\/FrankStain\/jnipp)\r\n+\/\/ Apache 2.0 License\r\n+#pragma once\r\n+\r\n+\r\n+namespace Jni\r\n+{\r\n+namespace Utils\r\n+{\r\n+\t\/\/\/ @brief\tCheck that the class `TBitfieldType` has member-field named `bits`.\r\n+\ttemplate< typename TBitfieldType, typename = int >\r\n+\tstruct HasBitsField : std::false_type {};\r\n+\r\n+\t\/\/\/ @brief\tCheck that the class `TBitfieldType` has member-field named `bits`.\r\n+\ttemplate< typename TBitfieldType >\r\n+\tstruct HasBitsField<TBitfieldType, decltype( (void)TBitfieldType::bits, 0 )> : std::true_type {};\r\n+}\r\n+}\r\n"} {"commit":"4d29b4a768d092e7ee56136a385e272450bc9ff6","subject":"Error out when an N-way join cannot be found","message":"Error out when an N-way join cannot be found\n\nFollowing the change in 8fcd3fddd6337f8150981ed0518c28259cf6d219\nto cost-based enable GUCs, failing to find a way to construct an\nN-way join should be an error rather than debug (as in upstream).\n\nReported-by: Heikki Linnakangas <9304c20251d03f4d84fc732cc8196e9ef6638e64@pivotal.io>\n","repos":"greenplum-db\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,adam8157\/gpdb,50wu\/gpdb,adam8157\/gpdb,50wu\/gpdb,ashwinstar\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/optimizer\/path\/joinrels.c\n+++ src\/backend\/optimizer\/path\/joinrels.c\n@@ -234,7 +234,7 @@\n \t\t *----------\n \t\t *\/\n \t\tif (joinrels[level] == NIL && root->join_info_list == NIL)\n-\t\t\telog(DEBUG1, \"failed to build any %d-way joins\", level);\n+\t\t\telog(ERROR, \"failed to build any %d-way joins\", level);\n \t}\n }\n \n"} {"commit":"53e76fbae40507ccbb88ea0bf1fac16d84ce42af","subject":"Update guiutil.h","message":"Update guiutil.h","repos":"fastcoinproject\/fastcoin,fastcoinproject\/fastcoin,fastcoinproject\/fastcoin,fastcoinproject\/fastcoin,fastcoinproject\/fastcoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/qt\/guiutil.h\n+++ src\/qt\/guiutil.h\n@@ -206,3 +206,4 @@\n } \/\/ namespace GUIUtil\n \n #endif \/\/ BITCOIN_QT_GUIUTIL_H\n+\n"} {"commit":"92c3bed7024e117097a64653d285f6a2d00ab5f1","subject":"get attrs for directories too","message":"get attrs for directories too\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@7655 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/rmc.c\n+++ slashd\/rmc.c\n@@ -344,13 +344,14 @@\n \tstruct srm_opendir_req *mq;\n \tstruct srm_opendir_rep *mp;\n \tstruct slash_fidgen fg;\n+\tstruct stat stb;\n \tvoid *data;\n \n \tENTRY;\n \n \tRSX_ALLOCREP(rq, mq, mp);\n \tmp->rc = zfsslash2_opendir(zfsVfs, mq->ino, &mq->creds, &fg,\n-\t\t\t\t &data);\n+\t\t\t\t &stb, &data);\n \n \tpsc_info(\"zfs opendir data (%p)\", data);\n \n@@ -358,7 +359,7 @@\n \t\textern struct cfdops mdsCfdOps;\n \t\tstruct cfdent *cfd;\n \n-\t\tmp->rc = slrmc_inode_cacheput(&fg, NULL, &mq->creds);\n+\t\tmp->rc = slrmc_inode_cacheput(&fg, &stb, &mq->creds);\n \t\tif (!mp->rc) {\n \t\t\tmp->rc = cfdnew(fg.fg_fid, rq->rq_export,\n \t\t\t\tdata, &cfd, &mdsCfdOps, CFD_DIR);\n@@ -499,48 +500,21 @@\n \tf = m->mexpfcm_fcmh;\n \tpsc_assert(f->fcmh_fcoo);\n \n-\ti = f->fcmh_fcoo->fcoo_pri;\n+\ti = fcmh_2_fmdsi(f);\n \n \tMEXPFCM_LOCK(m);\n \tpsc_assert(m->mexpfcm_fcmh);\n \t\/* Prevent others from trying to access the mexpfcm.\n \t *\/\n \tm->mexpfcm_flags |= MEXPFCM_CLOSING;\n-\tmexpfcm_release_brefs(m);\n \tMEXPFCM_ULOCK(m);\n \n \trc = cfdfree(rq->rq_export, cfd);\n \tpsc_info(\"cfdfree() cfd %\"PRId64\" rc=%d\",\n \t\t cfd, rc);\n-\t\/* Serialize the test for releasing the zfs inode so that this \n-\t * segment is not re-entered. Also, note that 'm' may have \n-\t * been freed already.\n-\t *\/\n-\tspinlock(&f->fcmh_lock);\n-\n-\tDEBUG_FCMH(PLL_DEBUG, f, \"slrmc_release i->fmdsi_ref (%d) (oref=%d)\",\n-\t\t atomic_read(&i->fmdsi_ref), f->fcmh_fcoo->fcoo_oref_rw[0]);\n-\n-\tif (atomic_dec_and_test(&i->fmdsi_ref)) {\n-\t\tpsc_assert(SPLAY_EMPTY(&i->fmdsi_exports));\n-\t\tf->fcmh_state |= FCMH_FCOO_CLOSING;\n-\n-\t\tDEBUG_FCMH(PLL_DEBUG, f, \"calling zfsslash2_release\");\n-\t\tmp->rc = zfsslash2_release(zfsVfs, fg.fg_fid, &mq->creds,\n-\t\t\t\t\t i->fmdsi_data);\n-\t\t\/* Remove the fcoo but first make sure the open ref's\n-\t\t * are ok. This value is bogus, fmdsi_ref has the\n-\t\t * the real open ref.\n-\t\t *\/\n-\t\tPSCFREE(i);\n-\t\tf->fcmh_fcoo->fcoo_pri = NULL;\n-\t\tf->fcmh_fcoo->fcoo_oref_rw[0] = 0;\n-\t\tfreelock(&f->fcmh_lock);\n-\t\tfidc_fcoo_remove(f);\n-\t} else {\n-\t\tmp->rc = 0;\n-\t\tfreelock(&f->fcmh_lock);\n-\t}\n+\t\n+\tmp->rc = mds_inode_release(f);\n+\n \tRETURN(0);\n }\n \n"} {"commit":"34f3fe951254c85abd848441c3cc87bd5e24413b","subject":"Move member functions up in simple_encode.h","message":"Move member functions up in simple_encode.h\n\nChange-Id: I9c5c74ab52361bcd73aef110729c6e332066c2af\n","repos":"webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,webmproject\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/simple_encode.h\n+++ vp9\/simple_encode.h\n@@ -297,7 +297,7 @@\n \/\/ Therefore it also determines the group of picture size.\n \/\/ If set, VP9 will use the external arf index to make decision.\n \/\/ This function should be called only once after ComputeFirstPassStats(),\n- \/\/ before StartEncde().\n+ \/\/ before StartEncode().\n void SetExternalGroupOfPicture(std::vector<int> external_arf_indexes);\n \n \/\/ Initializes the encoder for actual encoding.\n@@ -340,6 +340,15 @@\n uint64_t GetFramePixelCount() const;\n \n private:\n+ \/\/ Updates key_frame_group_size_, reset key_frame_group_index_ and init\n+ \/\/ ref_frame_info_.\n+ void UpdateKeyFrameGroup(int key_frame_show_index);\n+\n+ \/\/ Update key_frame_group_index_.\n+ void PostUpdateKeyFrameGroupIndex(FrameType frame_type);\n+\n+ void PostUpdateState(const EncodeFrameResult &encode_frame_result);\n+\n class EncodeImpl;\n \n int frame_width_; \/\/ frame width in pixels.\n@@ -358,19 +367,12 @@\n \n \/\/ The key frame group size includes one key frame plus the number of\n \/\/ following inter frames. Note that the key frame group size only counts the\n- \/\/ show frames. The number of no show frames like alternate refereces are not\n+ \/\/ show frames. The number of no show frames like alternate references are not\n \/\/ counted.\n int key_frame_group_size_;\n \n \/\/ The index for the to-be-coded show frame in the key frame group.\n int key_frame_group_index_;\n-\n- \/\/ Update key_frame_group_size_, reset key_frame_group_index_ and init\n- \/\/ ref_frame_info_.\n- void UpdateKeyFrameGroup(int key_frame_show_index);\n-\n- \/\/ Update key_frame_group_index_.\n- void PostUpdateKeyFrameGroupIndex(FrameType frame_type);\n \n \/\/ Each show or no show frame is assigned with a coding index based on its\n \/\/ coding order (starting from zero) in the coding process of the entire\n@@ -384,8 +386,6 @@\n \/\/ frame appears?\n \/\/ Reference frames info of the to-be-coded frame.\n RefFrameInfo ref_frame_info_;\n-\n- void PostUpdateState(const EncodeFrameResult &encode_frame_result);\n };\n \n } \/\/ namespace vp9\n"} {"commit":"511351cdd61b5922c37618c80b5797648726e917","subject":"Forgot to document these.","message":"Forgot to document these.\n","repos":"arcemu\/arcemu,arcemu\/arcemu,arcemu\/arcemu,arcemu\/arcemu,arcemu\/arcemu,arcemu\/arcemu","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/arcemu-world\/Messenger.h\n+++ src\/arcemu-world\/Messenger.h\n@@ -116,8 +116,10 @@\n \t\/\/\/ Disables flight in the client\n \tstatic void SendDisableFlightMessage( Unit* unit );\n \n+\t\/\/\/ Sends aura log entry to the client ( abc suffers N school damage from xyz's spell )\n \tstatic void SendPeriodicAuraLog( const WoWGuid & CasterGUID, Unit* target, uint32 SpellID, uint32 School, uint32 Amount, uint32 abs_dmg, uint32 resisted_damage, uint32 Flags, bool is_critical );\n \n+\t\/\/\/ Sends a heal aura log entry to the client ( abc gains N heealth from xyz's spell )\n \tstatic void SendPeriodicHealAuraLog( const WoWGuid & CasterGUID, Unit* target, uint32 SpellID, uint32 healed, uint32 over_healed, bool is_critical );\n \n \t\/\/\/ Hop on vehicle animation\n"} {"commit":"9b52c538efda68d9550c19e54d44169b89604a45","subject":"GP11: TEE_AllocateOperation panic reason","message":"GP11: TEE_AllocateOperation panic reason\n\nSigned-off-by: Cedric Chaumont <8e86d8823993508e2add6a996501a29b179cbfca@st.com>\nReviewed-by: Pascal Brand <0b55292d2562685bad4ce52d64f802e8f1cd299e@linaro.org>\nReviewed-by: Jens Wiklander <7706914404370d7502c27a0eff493dcf491feb51@linaro.org>\nReviewed-by: Joakim Bech <741f90e2a7f4d9afbad8bd50be20560f4cf38962@linaro.org>\nTested-by: Cedric Chaumont <8e86d8823993508e2add6a996501a29b179cbfca@linaro.org> (STM boards)\nTested-by: Cedric Chaumont <8e86d8823993508e2add6a996501a29b179cbfca@linaro.org> (ARM Juno board)\n","repos":"cedric-chaumont-st-dev\/optee_os,cedric-chaumont-st-dev\/optee_os,matt2048\/optee_os,chshxi1989\/optee_os,BreezeWu\/optee_os,cedric-chaumont-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,pascal-brand-st-dev\/optee_os,Microsoft\/optee_os,pascal-brand-st-dev\/optee_os,chshxi1989\/optee_os,chshxi1989\/optee_os,Microsoft\/optee_os,matt2048\/optee_os,Microsoft\/optee_os,cedric-chaumont-st-dev\/optee_os,chshxi1989\/optee_os,matt2048\/optee_os,Microsoft\/optee_os,BreezeWu\/optee_os,Microsoft\/optee_os,pascal-brand-st-dev\/optee_os,BreezeWu\/optee_os,chshxi1989\/optee_os,BreezeWu\/optee_os,matt2048\/optee_os,BreezeWu\/optee_os","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/libutee\/tee_api_operations.c\n+++ lib\/libutee\/tee_api_operations.c\n@@ -63,7 +63,7 @@\n \tbool with_private_key = false;\n \tbool buffer_two_blocks = false;\n \n-\tif (operation == NULL)\n+\tif (!operation)\n \t\tTEE_Panic(0);\n \n \tif (algorithm == TEE_ALG_AES_XTS)\n@@ -266,7 +266,7 @@\n \t}\n \n \top = TEE_Malloc(sizeof(*op), 0);\n-\tif (op == NULL)\n+\tif (!op)\n \t\treturn TEE_ERROR_OUT_OF_MEMORY;\n \n \top->info.algorithm = algorithm;\n@@ -282,11 +282,11 @@\n \t\tif (buffer_two_blocks)\n \t\t\tbuffer_size *= 2;\n \n-\t\top->buffer =\n-\t\t TEE_Malloc(buffer_size, TEE_USER_MEM_HINT_NO_FILL_ZERO);\n+\t\top->buffer = TEE_Malloc(buffer_size,\n+\t\t\t\t\tTEE_USER_MEM_HINT_NO_FILL_ZERO);\n \t\tif (op->buffer == NULL) {\n \t\t\tres = TEE_ERROR_OUT_OF_MEMORY;\n-\t\t\tgoto out;\n+\t\t\tgoto err0;\n \t\t}\n \t}\n \top->block_size = block_size;\n@@ -306,34 +306,43 @@\n \n \t\tres = TEE_AllocateTransientObject(key_type, mks, &op->key1);\n \t\tif (res != TEE_SUCCESS)\n-\t\t\tgoto out;\n+\t\t\tgoto err1;\n \n \t\tif ((op->info.handleState & TEE_HANDLE_FLAG_EXPECT_TWO_KEYS) !=\n \t\t 0) {\n-\t\t\tres =\n-\t\t\t TEE_AllocateTransientObject(key_type, mks,\n-\t\t\t\t\t\t\t&op->key2);\n+\t\t\tres = TEE_AllocateTransientObject(key_type, mks,\n+\t\t\t\t\t\t\t &op->key2);\n \t\t\tif (res != TEE_SUCCESS)\n-\t\t\t\tgoto out;\n+\t\t\t\tgoto err2;\n \t\t}\n \t}\n \n \tres = utee_cryp_state_alloc(algorithm, mode, (uint32_t) op->key1,\n \t\t\t\t (uint32_t) op->key2, &op->state);\n-\tif (res != TEE_SUCCESS)\n-\t\tgoto out;\n+\tif (res != TEE_SUCCESS) {\n+\t\tif ((op->info.handleState &\n+\t\t TEE_HANDLE_FLAG_EXPECT_TWO_KEYS) != 0)\n+\t\t\tgoto err2;\n+\t\tgoto err1;\n+\t}\n \n \t\/* For multi-stage operation do an \"init\". *\/\n \tTEE_ResetOperation(op);\n \t*operation = op;\n-\n+\tgoto out;\n+\n+err2:\n+\tTEE_FreeTransientObject(op->key2);\n+err1:\n+\tTEE_FreeTransientObject(op->key1);\n+err0:\n+\tTEE_FreeOperation(op);\n+\n+\tif (res != TEE_SUCCESS &&\n+\t res != TEE_ERROR_OUT_OF_MEMORY &&\n+\t res != TEE_ERROR_NOT_SUPPORTED)\n+\t\tTEE_Panic(0);\n out:\n-\tif (res != TEE_SUCCESS) {\n-\t\tTEE_FreeTransientObject(op->key1);\n-\t\tTEE_FreeTransientObject(op->key2);\n-\t\tTEE_FreeOperation(op);\n-\t}\n-\n \treturn res;\n }\n \n"} {"commit":"92261164bbe863141b88817eaaec2e79b3df7a90","subject":"Check for PID before sending SIGTERM","message":"Check for PID before sending SIGTERM\n","repos":"pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,mapfau\/bluez,pkarasev3\/bluez,mapfau\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,mapfau\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- hcid\/dbus-service.c\n+++ hcid\/dbus-service.c\n@@ -322,7 +322,7 @@\n \n static void stop_service(struct service *service, gboolean remove)\n {\n-\tif (kill(service->pid, SIGTERM) < 0)\n+\tif (service->pid > 0 && kill(service->pid, SIGTERM) < 0)\n \t\terror(\"kill(%d, SIGTERM): %s (%d)\", service->pid,\n \t\t\t\tstrerror(errno), errno);\n \n"} {"commit":"41fd67b99ee5928ccb746be6513716d4ef5ec873","subject":"plumbing_show_pipes now can display ugen names and not just numbers","message":"plumbing_show_pipes now can display ugen names and not just numbers\n","repos":"PaulBatchelor\/Sporth,aure\/Sporth,aure\/Sporth,aure\/Sporth,PaulBatchelor\/Sporth,aure\/Sporth,aure\/Sporth,PaulBatchelor\/Sporth,PaulBatchelor\/Sporth,PaulBatchelor\/Sporth","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- plumber.c\n+++ plumber.c\n@@ -140,10 +140,10 @@\n \n void plumber_show_pipes(plumber_data *plumb)\n {\n- return plumbing_show_pipes(plumb->pipes);\n-}\n-\n-void plumbing_show_pipes(plumbing *pipes)\n+ return plumbing_show_pipes(plumb, plumb->pipes);\n+}\n+\n+void plumbing_show_pipes(plumber_data *plumb, plumbing *pipes)\n {\n fprintf(stderr, \"\\nShowing pipes: \\n\");\n uint32_t n;\n@@ -151,7 +151,20 @@\n pipe = pipes->root.next;\n for(n = 0; n < pipes->npipes; n++) {\n next = pipe->next;\n- fprintf(stderr, \"\\ttype = %d\\n\", pipe->type);\n+ fprintf(stderr, \"\\ttype = %d \", pipe->type);\n+ switch(pipe->type) {\n+ case SPORTH_FLOAT:\n+ fprintf(stderr, \"(float)\\n\");\n+ break;\n+ case SPORTH_STRING:\n+ fprintf(stderr, \"(string)\\n\");\n+ break;\n+ default:\n+ fprintf(stderr, \"(%s)\\n\", \n+ plumb->sporth.flist[pipe->type - SPORTH_FOFFSET].name);\n+ break;\n+ }\n+\n pipe = next;\n }\n fprintf(stderr, \"%d pipes total. \\n\\n\", pipes->npipes);\n"} {"commit":"cfb40870bc74dc57616e286461a89c9f259b349d","subject":"Locking for Notification class.","message":"Locking for Notification class.\n","repos":"xShaneSong\/googletest,nanliu0408\/googletest,vmcpherson\/googletest,cwilkinson76\/googletest,Chilledheart\/googletest,dhood\/googletest,hammondt\/googletest,lagner\/googletest,cangtian\/googletest,terencewei\/googletest,HolidayXue\/googletest,JieweiWei\/googletest,wenmengzhou\/googletest,xuyongli73\/googletest,amiragha\/googletest,lvfangmin\/googletest,wangyu5\/googletest,joydeeps\/googletest,gtxmobile\/googletest,cppguy\/googletest,leolounz\/googletest,jettang\/googletest,JiujiangZhu\/googletest,joohoonl\/googletest,nrclark\/googletest,superlyb\/googletest,wangyu5\/googletest,venkatesh81290\/googletest,mittalnishit\/googletest,Hex-iang\/googletest,tzudot\/googletest,gghyoo\/googletest,ceubanks\/googletest,daboluo\/googletest,abroskin\/googletest,cloudrain21\/googletest,mythfish\/googletest,kookie424\/googletest,zling2001\/googletest,AK3331\/googletest,cangtian\/googletest,7kbird\/GTest,empiredan\/googletest,gcode-mirror\/googletest,jacklicn\/googletest,directivegames\/googletest,nanliu0408\/googletest,wenmengzhou\/googletest,switchkiller\/googletest,tedddybear\/googletest,alex970448359\/googletest,jacklicn\/googletest,tomzhang\/googletest,superlyb\/googletest,matheusabrantesgadelha\/googletest,arorasaurabh82\/googletest,LevinJ\/googletest,LiuS-NUDT\/googletest,scmcom\/googletest,wangyu5\/googletest,Abce\/googletest,mpherg\/googletest,gcode-mirror\/googletest,kgashok\/googletest,quintablet\/googletest,chyh1990\/googletest,skulbrane\/googletest,ashokpant\/googletest,xuyongli73\/googletest,pekingduck\/googletest,mbarnach\/googletest,chuck-lee\/googletest,ssalbiz\/googletest,wingo1990\/googletest,ramrengaswamy\/googletest,xkvyor\/googletest,frankee\/googletest,jiffwan\/googletest,Frankenmint\/googletest,superupon\/googletest,lawishere\/googletest,ahbeck\/googletest,LujunWeng\/googletest,Hadatko\/googletest,strrchr\/googletest,gianricardo\/googletest,ayenter\/googletest,ashokpant\/googletest,fuchsia-mirror\/third_party-googletest,Avvys\/googletest,ahbeck\/googletest,vok1980\/googletest,zbcwilliam\/googletest,zhoushun\/googletest,Hexiang-Hu\/googletest,amitchhabra\/googletest,xuyongli73\/googletest,meyburgh\/googletest,quintablet\/googletest,adishavit\/googletest,newmind\/googletest,geoffviola\/googletest,kiwifig\/googletest,cwilkinson76\/googletest,7kbird\/GTest,greyg00s\/googletest,fnz\/googletest,bogan87\/googletest,switchkiller\/googletest,Chilledheart\/googletest,gcode-mirror\/googletest,meyburgh\/googletest,clm971910\/googletest,AK3331\/googletest,qiuqiyuan\/googletest,cfy-github\/googletest,haizan2\/googletest,matheusabrantesgadelha\/googletest,YongCHN\/googletest,avikalpa\/googletest,hxfxjun\/googletest,hammondt\/googletest,quintablet\/googletest,jiffwan\/googletest,bogan87\/googletest,Gakaza\/googletest,wingo1990\/googletest,kookie424\/googletest,CaptainTrunky\/googletest,superupon\/googletest,reignofmiracle\/googletest,jlanecox\/googletest,pramod493\/googletest,xLiaox\/googletest,lawishere\/googletest,LiuS-NUDT\/googletest,A1bertYu\/googletest,joekirk\/googletest,wenmengzhou\/googletest,ashokpant\/googletest,wangweitl81\/googletest,inim4\/googletest,google\/googletest,bfgorski\/googletest,macanjang\/googletest,wingo1990\/googletest,tomzhang\/googletest,DavidYen\/googletest,Hexiang-Hu\/googletest,arielm\/googletest,tedddybear\/googletest,daboluo\/googletest,guiquanz\/googletest,chechunli\/googletest,Frankenmint\/googletest,antidotcb\/googletest,xtopsoft\/googletest,jacklicn\/googletest,ChenglongChen\/googletest,arielm\/googletest,dgiunchi\/googletest,ddmbr\/googletest,hammondt\/googletest,bogan87\/googletest,zhiguangq\/googletest,chuck-lee\/googletest,matheusabrantesgadelha\/googletest,bittnt\/googletest,AK3331\/googletest,mbarnach\/googletest,kiwifig\/googletest,strrchr\/googletest,xLiaox\/googletest,HolidayXue\/googletest,ac0x\/googletest,nrclark\/googletest,jlanecox\/googletest,rsalsamendi\/googletest,adishavit\/googletest,richardvida\/googletest,johnbellessa\/googletest,lvfangmin\/googletest,lvfangmin\/googletest,newmind\/googletest,Anomander\/googletest,rafaeldelucena\/googletest,hiberabyss\/googletest,ashwininetharaman\/googletest,adishavit\/googletest,asteever\/thirdparty_gtest,chyh1990\/googletest,alex970448359\/googletest,captainwong\/googletest,ayenter\/googletest,Anomander\/googletest,comipayan\/googletest,ramrengaswamy\/googletest,Hexiang-Hu\/googletest,venkatesh81290\/googletest,BaiGang\/googletest,mythfish\/googletest,dezGusty\/googletest,zhoushun\/googletest,Gakaza\/googletest,frankee\/googletest,hxfxjun\/googletest,sentient-energy\/googletest,jnufish\/googletest,xShaneSong\/googletest,briansmith\/googletest,adishavit\/googletest,sutong\/googletest,Hex-iang\/googletest,A1bertYu\/googletest,antidotcb\/googletest,wenmengzhou\/googletest,zjx20\/googletest,code-mx\/googletest,cloudrain21\/googletest,guiquanz\/googletest,psmason\/googletest,meyburgh\/googletest,LevinJ\/googletest,cloudrain21\/googletest,jjangjong\/googletest,JieweiWei\/googletest,Chilledheart\/googletest,alex-dengx\/googletest,emaste\/googletest,ceubanks\/googletest,gghyoo\/googletest,empiredan\/googletest,gtxmobile\/googletest,Hadatko\/googletest,cirocosta\/googletest,hxfxjun\/googletest,dhood\/googletest,ashwininetharaman\/googletest,gabr1e11\/googletest,bfgorski\/googletest,jameszhao00\/googletest,ddmbr\/googletest,guiquanz\/googletest,ac0x\/googletest,greyg00s\/googletest,sentient-energy\/googletest,tfhq\/googletest,LBiv\/googletest,daboluo\/googletest,hitHlb\/googletest,jeremija\/googletest,fuchsia-mirror\/third_party-googletest,reignofmiracle\/googletest,zbcwilliam\/googletest,bittnt\/googletest,rafaeldelucena\/googletest,mpherg\/googletest,amiragha\/googletest,qiuqiyuan\/googletest,alex-dengx\/googletest,mythfish\/googletest,henrywoo\/googletest,Hex-iang\/googletest,ssalbiz\/googletest,xnagireddy\/googletest,gabr1e11\/googletest,asteever\/thirdparty_gtest,shaohulu\/googletest,johnbellessa\/googletest,gtxmobile\/googletest,terencewei\/googletest,berkoo\/googletest,newmind\/googletest,lagner\/googletest,venkatesh81290\/googletest,xShaneSong\/googletest,captainwong\/googletest,KambalinaAlyona\/googletest,richardvida\/googletest,Frankenmint\/googletest,yquant\/gtest,nguyentu1602\/googletest,chronos38\/googletest,leolounz\/googletest,emkatsom\/googletest,qiuqiyuan\/googletest,adargel\/googletest,emkatsom\/googletest,switchkiller\/googletest,bfgorski\/googletest,mittalnishit\/googletest,Jet-Streaming\/googletest,ahbeck\/googletest,leolounz\/googletest,avikalpa\/googletest,joohoonl\/googletest,antidotcb\/googletest,gauravkumar1987\/googletest,bigdavedev\/googletest,amiragha\/googletest,ssalbiz\/googletest,frankee\/googletest,alex970448359\/googletest,pramod493\/googletest,Gakaza\/googletest,jettang\/googletest,zling2001\/googletest,bigdavedev\/googletest,3upperm2n\/googletest,Avvys\/googletest,chechunli\/googletest,asteever\/thirdparty_gtest,sutong\/googletest,bfgorski\/googletest,fcode520\/googletest,calvert1991\/googletest,geoffviola\/googletest,joohoonl\/googletest,nrclark\/googletest,rsalsamendi\/googletest,amitchhabra\/googletest,emaste\/googletest,alexzzp\/googletest,A1bertYu\/googletest,sutong\/googletest,fovecifer\/googletest,curtpm\/googletest,ruoka\/googletest,guiquanz\/googletest,xkvyor\/googletest,vok1980\/googletest,ruoka\/googletest,ac0x\/googletest,rsalsamendi\/googletest,tzudot\/googletest,vmcpherson\/googletest,pramod493\/googletest,cfy-github\/googletest,xtopsoft\/googletest,LBiv\/googletest,empiredan\/googletest,wangweitl81\/googletest,qiuqiyuan\/googletest,hitHlb\/googletest,pramod493\/googletest,chronos38\/googletest,hitHlb\/googletest,lagner\/googletest,sergiohs84\/googletest,shaobozi\/googletest,adargel\/googletest,arorasaurabh82\/googletest,kiwifig\/googletest,haizan2\/googletest,leolounz\/googletest,google\/googletest,JieweiWei\/googletest,yquant\/gtest,horatii\/googletest,berkoo\/googletest,nguyentu1602\/googletest,Hadatko\/googletest,nguyentu1602\/googletest,jlanecox\/googletest,ruoka\/googletest,sergiohs84\/googletest,haizan2\/googletest,3upperm2n\/googletest,kgashok\/googletest,LujunWeng\/googletest,gtxmobile\/googletest,cloudrain21\/googletest,CaptainTrunky\/googletest,cppguy\/googletest,bittnt\/googletest,shaobozi\/googletest,jlanecox\/googletest,namewr\/googletest,frankee\/googletest,Jet-Streaming\/googletest,cfy-github\/googletest,ashwininetharaman\/googletest,LujunWeng\/googletest,lvfangmin\/googletest,7kbird\/GTest,zjx20\/googletest,xLiaox\/googletest,gabr1e11\/googletest,mittalnishit\/googletest,JiujiangZhu\/googletest,pekingduck\/googletest,curtpm\/googletest,pokowaka\/googletest,sergiohs84\/googletest,citrontyan\/googletest,horatii\/googletest,sentient-energy\/googletest,psmason\/googletest,CaptainTrunky\/googletest,xkvyor\/googletest,macanjang\/googletest,wingo1990\/googletest,asteever\/thirdparty_gtest,7kbird\/GTest,Frankenmint\/googletest,fcode520\/googletest,citrontyan\/googletest,pekingduck\/googletest,vmcpherson\/googletest,code-mx\/googletest,tomzhang\/googletest,zhiguangq\/googletest,jettang\/googletest,sidsarasvati\/googletest,DavidYen\/googletest,arielm\/googletest,zhoushun\/googletest,gghyoo\/googletest,sergiohs84\/googletest,chronos38\/googletest,rsalsamendi\/googletest,cirocosta\/googletest,jjangjong\/googletest,richardvida\/googletest,jnufish\/googletest,daboluo\/googletest,BaiGang\/googletest,alex-dengx\/googletest,shaohulu\/googletest,bigdavedev\/googletest,emkatsom\/googletest,amitchhabra\/googletest,hankyupark\/googletest,hiberabyss\/googletest,jeremija\/googletest,alex970448359\/googletest,wxthon\/googletest,pradeepbn\/googletest,hankyupark\/googletest,rafaeldelucena\/googletest,johnbellessa\/googletest,joekirk\/googletest,vmcpherson\/googletest,LBiv\/googletest,scmcom\/googletest,comipayan\/googletest,ddmbr\/googletest,pradeepbn\/googletest,xnagireddy\/googletest,LujunWeng\/googletest,zling2001\/googletest,xnagireddy\/googletest,gauravkumar1987\/googletest,pokowaka\/googletest,joydeeps\/googletest,gauravkumar1987\/googletest,captainwong\/googletest,sutong\/googletest,cppguy\/googletest,vvtam\/googletest,zhoushun\/googletest,dezGusty\/googletest,alexzzp\/googletest,tzudot\/googletest,Gakaza\/googletest,briansmith\/googletest,captainwong\/googletest,JiujiangZhu\/googletest,yquant\/gtest,henrywoo\/googletest,ceubanks\/googletest,xnagireddy\/googletest,wangweitl81\/googletest,tfhq\/googletest,cwilkinson76\/googletest,avikalpa\/googletest,namewr\/googletest,Avvys\/googletest,hankyupark\/googletest,switchkiller\/googletest,vvtam\/googletest,chuck-lee\/googletest,hammondt\/googletest,moonblue333\/googletest,cirocosta\/googletest,LevinJ\/googletest,skulbrane\/googletest,LiJiefei\/googletest,dhood\/googletest,tedddybear\/googletest,Jet-Streaming\/googletest,ChenglongChen\/googletest,mpherg\/googletest,kiwifig\/googletest,jjangjong\/googletest,xLiaox\/googletest,berkoo\/googletest,emaste\/googletest,wxthon\/googletest,strrchr\/googletest,skulbrane\/googletest,ruoka\/googletest,sentient-energy\/googletest,tfhq\/googletest,fovecifer\/googletest,wxthon\/googletest,jiffwan\/googletest,geoffviola\/googletest,lawishere\/googletest,3upperm2n\/googletest,LiJiefei\/googletest,joohoonl\/googletest,sidsarasvati\/googletest,ddmbr\/googletest,gianricardo\/googletest,ceubanks\/googletest,fovecifer\/googletest,BaiGang\/googletest,curtpm\/googletest,shaobozi\/googletest,calvert1991\/googletest,emaste\/googletest,jjangjong\/googletest,KambalinaAlyona\/googletest,tfhq\/googletest,zjx20\/googletest,fovecifer\/googletest,ramrengaswamy\/googletest,LiJiefei\/googletest,joydeeps\/googletest,fuchsia-mirror\/third_party-googletest,ChenglongChen\/googletest,richardvida\/googletest,mbarnach\/googletest,superlyb\/googletest,LBiv\/googletest,KambalinaAlyona\/googletest,fuchsia-mirror\/third_party-googletest,Jet-Streaming\/googletest,KambalinaAlyona\/googletest,xtopsoft\/googletest,briansmith\/googletest,dhood\/googletest,zbcwilliam\/googletest,vvtam\/googletest,lawishere\/googletest,venkatesh81290\/googletest,quintablet\/googletest,tedddybear\/googletest,clm971910\/googletest,joydeeps\/googletest,A1bertYu\/googletest,hcu5555\/googletest,gghyoo\/googletest,hitHlb\/googletest,jameszhao00\/googletest,HolidayXue\/googletest,sidsarasvati\/googletest,moonblue333\/googletest,directivegames\/googletest,cangtian\/googletest,strrchr\/googletest,jeremija\/googletest,vok1980\/googletest,reignofmiracle\/googletest,vok1980\/googletest,namewr\/googletest,JieweiWei\/googletest,kgashok\/googletest,lagner\/googletest,emkatsom\/googletest,mythfish\/googletest,antidotcb\/googletest,arorasaurabh82\/googletest,clm971910\/googletest,YongCHN\/googletest,Abce\/googletest,fcode520\/googletest,terencewei\/googletest,skulbrane\/googletest,wangweitl81\/googletest,joekirk\/googletest,chuck-lee\/googletest,fcode520\/googletest,Hexiang-Hu\/googletest,google\/googletest,namewr\/googletest,kookie424\/googletest,dezGusty\/googletest,amitchhabra\/googletest,hiberabyss\/googletest,superlyb\/googletest,superupon\/googletest,mittalnishit\/googletest,hcu5555\/googletest,ChenglongChen\/googletest,hcu5555\/googletest,gianricardo\/googletest,adargel\/googletest,LiuS-NUDT\/googletest,greyg00s\/googletest,ashokpant\/googletest,xShaneSong\/googletest,Anomander\/googletest,moonblue333\/googletest,rafaeldelucena\/googletest,chyh1990\/googletest,Chilledheart\/googletest,Hex-iang\/googletest,dgiunchi\/googletest,geoffviola\/googletest,greyg00s\/googletest,terencewei\/googletest,nanliu0408\/googletest,jameszhao00\/googletest,dgiunchi\/googletest,macanjang\/googletest,cwilkinson76\/googletest,ahbeck\/googletest,pradeepbn\/googletest,comipayan\/googletest,alex-dengx\/googletest,DavidYen\/googletest,abroskin\/googletest,HolidayXue\/googletest,ayenter\/googletest,psmason\/googletest,cfy-github\/googletest,nrclark\/googletest,henrywoo\/googletest,kookie424\/googletest,horatii\/googletest,inim4\/googletest,zhiguangq\/googletest,google\/googletest,cangtian\/googletest,CaptainTrunky\/googletest,YongCHN\/googletest,gcode-mirror\/googletest,fnz\/googletest,scmcom\/googletest,ayenter\/googletest,directivegames\/googletest,calvert1991\/googletest,xtopsoft\/googletest,citrontyan\/googletest,inim4\/googletest,alexzzp\/googletest,scmcom\/googletest,shaohulu\/googletest,jnufish\/googletest,ssalbiz\/googletest,adargel\/googletest,LiuS-NUDT\/googletest,matheusabrantesgadelha\/googletest,yquant\/gtest,pokowaka\/googletest,macanjang\/googletest,vvtam\/googletest,code-mx\/googletest,chechunli\/googletest,fnz\/googletest,code-mx\/googletest,jiffwan\/googletest,arorasaurabh82\/googletest,nguyentu1602\/googletest,Abce\/googletest,reignofmiracle\/googletest,hiberabyss\/googletest,Abce\/googletest,abroskin\/googletest,fnz\/googletest,JiujiangZhu\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -1102,22 +1102,37 @@\n \/\/ use it in user tests, either directly or indirectly.\n class Notification {\n public:\n- Notification() : notified_(false) {}\n+ Notification() : notified_(false) {\n+ GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL));\n+ }\n+ ~Notification() {\n+ pthread_mutex_destroy(&mutex_);\n+ }\n \n \/\/ Notifies all threads created with this notification to start. Must\n \/\/ be called from the controller thread.\n- void Notify() { notified_ = true; }\n+ void Notify() {\n+ pthread_mutex_lock(&mutex_);\n+ notified_ = true;\n+ pthread_mutex_unlock(&mutex_);\n+ }\n \n \/\/ Blocks until the controller thread notifies. Must be called from a test\n \/\/ thread.\n void WaitForNotification() {\n- while (!notified_) {\n+ for (;;) {\n+ pthread_mutex_lock(&mutex_);\n+ const bool notified = notified_;\n+ pthread_mutex_unlock(&mutex_);\n+ if (notified)\n+ break;\n SleepMilliseconds(10);\n }\n }\n \n private:\n- volatile bool notified_;\n+ pthread_mutex_t mutex_;\n+ bool notified_;\n \n GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);\n };\n"} {"commit":"fc47a475f780f46c975e3c22d0b1b409d64c1a35","subject":"TripBoard and Alight functions both set the trip_id property of the travel_state. Useful for building narratives","message":"TripBoard and Alight functions both set the trip_id property of the travel_state. Useful for building narratives\n","repos":"brendannee\/Bikesy-Backend,brendannee\/Bikesy-Backend,jeriksson\/graphserver,jeriksson\/graphserver,jeriksson\/graphserver,bmander\/graphserver,bmander\/graphserver,brendannee\/Bikesy-Backend,brendannee\/Bikesy-Backend,jeriksson\/graphserver,graphserver\/graphserver,brendannee\/Bikesy-Backend,jeriksson\/graphserver,graphserver\/graphserver","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/edgetypes.c\n+++ core\/edgetypes.c\n@@ -597,6 +597,8 @@\n ret->time += wait;\n ret->weight += wait + 1; \/\/transfer penalty\n \n+ ret->trip_id = this->trip_ids[next_boarding_index];\n+ \n \/\/ Make sure the service period caches are updated if we've traveled over a service period boundary\n int i;\n for(i=0; i<params->n_agencies; i++) {\n@@ -792,7 +794,10 @@\n \n inline State*\n alWalk(EdgePayload* this, State* params, int transferPenalty) {\n- return stateDup( params );\n+ State* ret = stateDup( params );\n+ ret->trip_id = NULL;\n+ \n+ return ret;\n }\n \n \/\/TRIPHOP FUNCTIONS\n"} {"commit":"c71fa34728ef4eddd074aeb2bee49ae6a7acb3d1","subject":"added null texObj ptr check (bug 15567)","message":"added null texObj ptr check (bug 15567)\n","repos":"jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/swrast\/s_fragprog.c\n+++ src\/mesa\/swrast\/s_fragprog.c\n@@ -44,7 +44,8 @@\n SWcontext *swrast = SWRAST_CONTEXT(ctx);\n const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;\n \n- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);\n+ if (texObj)\n+ lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);\n \n \/* XXX use a float-valued TextureSample routine here!!! *\/\n swrast->TextureSample[unit](ctx, texObj, 1, (const GLfloat (*)[4]) texcoord,\n@@ -68,20 +69,23 @@\n {\n SWcontext *swrast = SWRAST_CONTEXT(ctx);\n const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;\n- const struct gl_texture_image *texImg = texObj->Image[0][texObj->BaseLevel];\n- const GLfloat texW = (GLfloat) texImg->WidthScale;\n- const GLfloat texH = (GLfloat) texImg->HeightScale;\n+ GLfloat lambda;\n GLchan rgba[4];\n \n- GLfloat lambda\n- = _swrast_compute_lambda(texdx[0], texdy[0], \/* ds\/dx, ds\/dy *\/\n- texdx[1], texdy[1], \/* dt\/dx, dt\/dy *\/\n- texdx[3], texdy[2], \/* dq\/dx, dq\/dy *\/\n- texW, texH,\n- texcoord[0], texcoord[1], texcoord[3],\n- 1.0F \/ texcoord[3]) + lodBias;\n-\n- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);\n+ if (texObj) {\n+ const struct gl_texture_image *texImg = texObj->Image[0][texObj->BaseLevel];\n+ const GLfloat texW = (GLfloat) texImg->WidthScale;\n+ const GLfloat texH = (GLfloat) texImg->HeightScale;\n+\n+ lambda = _swrast_compute_lambda(texdx[0], texdy[0], \/* ds\/dx, ds\/dy *\/\n+ texdx[1], texdy[1], \/* dt\/dx, dt\/dy *\/\n+ texdx[3], texdy[2], \/* dq\/dx, dq\/dy *\/\n+ texW, texH,\n+ texcoord[0], texcoord[1], texcoord[3],\n+ 1.0F \/ texcoord[3]) + lodBias;\n+\n+ lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);\n+ }\n \n swrast->TextureSample[unit](ctx, texObj, 1, (const GLfloat (*)[4]) texcoord,\n &lambda, &rgba);\n"} {"commit":"4ca5753576933d8b1f1a8244331f22b9c09e2bdd","subject":"Remove DAIF bits handling macros","message":"Remove DAIF bits handling macros\n\nThese macros are unused and redundant with other CPU system registers\nfunctions.\n\nMoreover enable_serror() function implementation may not reach its purpose\nbecause it does not handle the value of SCR_EL3.EA.\n\nSigned-off-by: Gerald Lejeune <c2e7e2e77e4c7cdb56493a39270c2ac295e4da56@st.com>\n","repos":"sandrine-bailleux-arm\/arm-trusted-firmware,sandrine-bailleux-arm\/arm-trusted-firmware,lsigithub\/arm-trusted-firmware_public,davwan01\/arm-trusted-firmware,sbranden\/arm-trusted-firmware,achingupta\/arm-trusted-firmware,davwan01\/arm-trusted-firmware,lsigithub\/arm-trusted-firmware_public,sandrine-bailleux\/arm-trusted-firmware,sbranden\/arm-trusted-firmware,achingupta\/arm-trusted-firmware,sandrine-bailleux\/arm-trusted-firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/lib\/aarch64\/arch_helpers.h\n+++ include\/lib\/aarch64\/arch_helpers.h\n@@ -168,15 +168,6 @@\n DEFINE_SYSREG_WRITE_CONST_FUNC(daifset)\n DEFINE_SYSREG_WRITE_CONST_FUNC(daifclr)\n \n-#define enable_irq()\t\t\twrite_daifclr(DAIF_IRQ_BIT)\n-#define enable_fiq()\t\t\twrite_daifclr(DAIF_FIQ_BIT)\n-#define enable_serror()\t\t\twrite_daifclr(DAIF_ABT_BIT)\n-#define enable_debug_exceptions()\twrite_daifclr(DAIF_DBG_BIT)\n-#define disable_irq()\t\t\twrite_daifset(DAIF_IRQ_BIT)\n-#define disable_fiq()\t\t\twrite_daifset(DAIF_FIQ_BIT)\n-#define disable_serror()\t\twrite_daifset(DAIF_ABT_BIT)\n-#define disable_debug_exceptions()\twrite_daifset(DAIF_DBG_BIT)\n-\n DEFINE_SYSREG_READ_FUNC(par_el1)\n DEFINE_SYSREG_READ_FUNC(id_pfr1_el1)\n DEFINE_SYSREG_READ_FUNC(id_aa64pfr0_el1)\n"} {"commit":"8b3096cfa4af6bc86a852bf1c773acb097a2789f","subject":"swrast: Silence many \"warning: unused parameter \u2018ctx\u2019\"","message":"swrast: Silence many \"warning: unused parameter \u2018ctx\u2019\"\n\nNot all drivers use ctx in LOCAL_VARS, so '(void) ctx;' is added to\nall the function templates to make GCC happy.\n","repos":"jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/swrast\/s_spantemp.h\n+++ src\/mesa\/swrast\/s_spantemp.h\n@@ -65,6 +65,7 @@\n INC_PIXEL_PTR(pixel);\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -82,6 +83,7 @@\n FETCH_PIXEL(dest[i], pixel);\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -111,6 +113,7 @@\n }\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -136,6 +139,7 @@\n INC_PIXEL_PTR(pixel);\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -165,6 +169,7 @@\n }\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -186,6 +191,7 @@\n }\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n@@ -207,6 +213,7 @@\n }\n }\n (void) rb;\n+ (void) ctx;\n }\n \n \n"} {"commit":"302a4b3247f62988de8668229f9bac6e60eb1889","subject":"Updates Radio Oper State before sending the message.","message":"Updates Radio Oper State before sending the message.\n\nFossilOrigin-Name: 22bd2eaceba40b09743b72e66d14bc0659a5e7c620506aa193b50a545b2a105d","repos":"7u83\/actube,7u83\/actube,7u83\/actube,7u83\/actube,7u83\/actube","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/wtp\/changestate.c\n+++ src\/wtp\/changestate.c\n@@ -1,15 +1,22 @@\n #include \"capwap\/capwap.h\"\n #include \"capwap\/conn.h\"\n+#include \"capwap\/radio.h\"\n+\n #include \"wtp_interface.h\"\n-\n \n int changestate()\n {\n \n \n \tstruct conn * conn = get_conn();\n+\n+\t\/* Update operational states, so they will be included\n+\t in the change Change State Event Request message. *\/\n+\tcw_radio_update_oper_states(conn->radios,0);\n+\n+\t\n+\t\/* Change State ... *\/\n \tint rc = cw_send_request(conn,CW_MSG_CHANGE_STATE_EVENT_REQUEST);\n-\n \tif ( !cw_rcok(rc) ) {\n \t\tcw_strresult(rc);\n \t\treturn 0;\n"} {"commit":"0aa9f0007231b0802de1742a80ffa588ad09ffda","subject":"Improved header file","message":"Improved header file\n","repos":"dhkris\/fastarm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- header\/fa_simplef.h\n+++ header\/fa_simplef.h\n@@ -1,18 +1,61 @@\n+\/\/ Fastarm 1.0\n+\/\/ Copyright (c) David H. Christensen, 2015.\n+\/\/ Licensed under the MIT license\n+\/\/\n+\/\/ fa_simple.h contains C function signatures for all \"basic\" or\n+\/\/ \"building-block\" functions, mostly optimized arithmetic functions,\n+\/\/ including a lot of vector floating point (32-bit) operations.\n+\n #ifndef FASTARM_SIMPLE_FP32\n-#define FASTARM_SIMPLE_Fp32\n+#define FASTARM_SIMPLE_FP32\n \n+\/**\n+\tCompute and return the average of the data stored in the array |data|.\n+\tAverage = Sum(data) \/ len\n+*\/\n float fa_avgf(float* data, unsigned len);\n+\n+\/**\n+\tCompute the sum of all numbers stored in the array |data|.\n+*\/\n float fa_sumf(float* data, unsigned len);\n+\n+\/**\n+\tCompute the product of all the numbers stored in the array |data|.\n+*\/\n float fa_productf(float* data, unsigned len);\n+\n+\/**\n+\tFind and return the highest number stored in the array |data|.\n+*\/\n float fa_maximumf(float* data, unsigned len);\n+\n+\/**\n+\tFind and return the lowest (-1 < 0 < 1) number stored in the array |data|.\n+*\/\n float fa_minimumf(float* data, unsigned len);\n \n+\/**\n+\tFast-compute the integer square root of the supplied number.\n+*\/\n unsigned fa_sqrt32(unsigned number);\n+\n+\/**\n+\tCompute and return the inverse square root of number.\n+\tIs slower than fa_isqrtf_fast, but is much more accurate (several orders of magnitude).\n+*\/\n float fa_isqrtf(float number);\n+\n+\/**\n+\tCompute and return the inverse square root of number.\n+\tIs considerably faster than fa_isqrtf, but has a much larger error margin.\n+*\/\n float fa_isqrtf_fast(float number);\n \n \n-\/\/\/ destination = |a_i * b_i| for i from 0 to length\n+\/**\n+destination = |a_i * b_i| for i from 0 to length\n+*\/\n void fa_vecmultiplyf(float* a, float* b, float* destination, unsigned length);\n \n \/\/\/ a = |a_i + (b_i * c_i)| for i from 0 to length\n"} {"commit":"6b516f59517450f9a3590338e995de22b22a9335","subject":"Fix performance problems in TOAST compressor. The management of search lists was broken in such a way that only the most recent instance of a given hash code would ever be searched, thus possibly missing longer matches further back. Fixing this gave 5 to 10% compression improvement on some text test cases. Additional small tweaks to improve speed of inner loops a little bit. There is no compatibility issue created by this change, since the compressed data format and decompression algorithm don't change.","message":"Fix performance problems in TOAST compressor. The management of\nsearch lists was broken in such a way that only the most recent\ninstance of a given hash code would ever be searched, thus possibly\nmissing longer matches further back. Fixing this gave 5 to 10%\ncompression improvement on some text test cases. Additional small\ntweaks to improve speed of inner loops a little bit. There is no\ncompatibility issue created by this change, since the compressed data\nformat and decompression algorithm don't change.\n","repos":"janebeckman\/gpdb,jmcatamney\/gpdb,arcivanov\/postgres-xl,Postgres-XL\/Postgres-XL,arcivanov\/postgres-xl,lintzc\/gpdb,rubikloud\/gpdb,ahachete\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,Postgres-XL\/Postgres-XL,greenplum-db\/gpdb,janebeckman\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,CraigHarris\/gpdb,tpostgres-projects\/tPostgres,CraigHarris\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,arcivanov\/postgres-xl,atris\/gpdb,CraigHarris\/gpdb,randomtask1155\/gpdb,Quikling\/gpdb,jmcatamney\/gpdb,yuanzhao\/gpdb,adam8157\/gpdb,Chibin\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,kmjungersen\/PostgresXL,zaksoup\/gpdb,foyzur\/gpdb,50wu\/gpdb,lintzc\/gpdb,tangp3\/gpdb,xinzweb\/gpdb,rvs\/gpdb,lpetrov-pivotal\/gpdb,Chibin\/gpdb,Quikling\/gpdb,kaknikhil\/gpdb,kaknikhil\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,atris\/gpdb,ahachete\/gpdb,snaga\/postgres-xl,rubikloud\/gpdb,xuegang\/gpdb,postmind-net\/postgres-xl,xinzweb\/gpdb,pavanvd\/postgres-xl,royc1\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,foyzur\/gpdb,kmjungersen\/PostgresXL,oberstet\/postgres-xl,xinzweb\/gpdb,zeroae\/postgres-xl,pavanvd\/postgres-xl,janebeckman\/gpdb,edespino\/gpdb,ovr\/postgres-xl,cjcjameson\/gpdb,chrishajas\/gpdb,lpetrov-pivotal\/gpdb,xinzweb\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,zaksoup\/gpdb,kaknikhil\/gpdb,janebeckman\/gpdb,snaga\/postgres-xl,atris\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,edespino\/gpdb,Quikling\/gpdb,lintzc\/gpdb,lpetrov-pivotal\/gpdb,randomtask1155\/gpdb,chrishajas\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,lintzc\/gpdb,ahachete\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,rvs\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,xuegang\/gpdb,50wu\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,royc1\/gpdb,postmind-net\/postgres-xl,rvs\/gpdb,0x0FFF\/gpdb,0x0FFF\/gpdb,Quikling\/gpdb,lpetrov-pivotal\/gpdb,randomtask1155\/gpdb,ovr\/postgres-xl,yazun\/postgres-xl,atris\/gpdb,ovr\/postgres-xl,techdragon\/Postgres-XL,ashwinstar\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,xinzweb\/gpdb,janebeckman\/gpdb,oberstet\/postgres-xl,tpostgres-projects\/tPostgres,atris\/gpdb,rubikloud\/gpdb,ovr\/postgres-xl,ahachete\/gpdb,kaknikhil\/gpdb,atris\/gpdb,foyzur\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,0x0FFF\/gpdb,techdragon\/Postgres-XL,randomtask1155\/gpdb,lpetrov-pivotal\/gpdb,Quikling\/gpdb,rvs\/gpdb,atris\/gpdb,janebeckman\/gpdb,CraigHarris\/gpdb,CraigHarris\/gpdb,kmjungersen\/PostgresXL,chrishajas\/gpdb,greenplum-db\/gpdb,rvs\/gpdb,arcivanov\/postgres-xl,Quikling\/gpdb,foyzur\/gpdb,ahachete\/gpdb,Chibin\/gpdb,lintzc\/gpdb,zaksoup\/gpdb,greenplum-db\/gpdb,rubikloud\/gpdb,jmcatamney\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,0x0FFF\/gpdb,Quikling\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,tangp3\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,royc1\/gpdb,rvs\/gpdb,xuegang\/gpdb,rubikloud\/gpdb,oberstet\/postgres-xl,ashwinstar\/gpdb,pavanvd\/postgres-xl,yazun\/postgres-xl,0x0FFF\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,snaga\/postgres-xl,ahachete\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,xinzweb\/gpdb,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,techdragon\/Postgres-XL,CraigHarris\/gpdb,edespino\/gpdb,zeroae\/postgres-xl,royc1\/gpdb,adam8157\/gpdb,rvs\/gpdb,zaksoup\/gpdb,Quikling\/gpdb,xuegang\/gpdb,ashwinstar\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,Chibin\/gpdb,postmind-net\/postgres-xl,arcivanov\/postgres-xl,Postgres-XL\/Postgres-XL,randomtask1155\/gpdb,rubikloud\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,kaknikhil\/gpdb,pavanvd\/postgres-xl,janebeckman\/gpdb,tangp3\/gpdb,zaksoup\/gpdb,chrishajas\/gpdb,techdragon\/Postgres-XL,rvs\/gpdb,xuegang\/gpdb,yuanzhao\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,jmcatamney\/gpdb,snaga\/postgres-xl,janebeckman\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,Postgres-XL\/Postgres-XL,foyzur\/gpdb,edespino\/gpdb,tangp3\/gpdb,edespino\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,royc1\/gpdb,50wu\/gpdb,chrishajas\/gpdb,50wu\/gpdb,tangp3\/gpdb,edespino\/gpdb,Quikling\/gpdb,lintzc\/gpdb,adam8157\/gpdb,foyzur\/gpdb,yazun\/postgres-xl,postmind-net\/postgres-xl,royc1\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,atris\/gpdb,lisakowen\/gpdb,tpostgres-projects\/tPostgres,Chibin\/gpdb,CraigHarris\/gpdb,yuanzhao\/gpdb,yuanzhao\/gpdb,zeroae\/postgres-xl,adam8157\/gpdb,oberstet\/postgres-xl,tangp3\/gpdb,randomtask1155\/gpdb,chrishajas\/gpdb,lisakowen\/gpdb,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,randomtask1155\/gpdb,oberstet\/postgres-xl,kaknikhil\/gpdb,xuegang\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,chrishajas\/gpdb,techdragon\/Postgres-XL,yazun\/postgres-xl,zaksoup\/gpdb,xuegang\/gpdb,lisakowen\/gpdb,ovr\/postgres-xl,yazun\/postgres-xl,Chibin\/gpdb,ashwinstar\/gpdb,kmjungersen\/PostgresXL,snaga\/postgres-xl,ahachete\/gpdb,janebeckman\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,tangp3\/gpdb,tangp3\/gpdb,rvs\/gpdb,tpostgres-projects\/tPostgres,yuanzhao\/gpdb,lpetrov-pivotal\/gpdb,tpostgres-projects\/tPostgres,randomtask1155\/gpdb,pavanvd\/postgres-xl,yuanzhao\/gpdb,Chibin\/gpdb,arcivanov\/postgres-xl,greenplum-db\/gpdb,postmind-net\/postgres-xl,jmcatamney\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/adt\/pg_lzcompress.c\n+++ src\/backend\/utils\/adt\/pg_lzcompress.c\n@@ -1,7 +1,7 @@\n \/* ----------\n * pg_lzcompress.c -\n *\n- * $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/pg_lzcompress.c,v 1.13 2001\/10\/25 05:49:45 momjian Exp $\n+ * $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/pg_lzcompress.c,v 1.14 2001\/11\/17 06:09:30 tgl Exp $\n *\n *\t\tThis is an implementation of LZ compression for PostgreSQL.\n *\t\tIt uses a simple history table and generates 2-3 byte tags\n@@ -89,7 +89,7 @@\n *\t\t\tThis limits the offset to 1-4095 (12 bits) and the length\n *\t\t\tto 3-18 (4 bits) because 3 is allways added to it. To emit\n *\t\t\ta tag of 2 bytes with a length of 2 only saves one control\n- *\t\t\tbit. But we loose one byte in the possible length of a tag.\n+ *\t\t\tbit. But we lose one byte in the possible length of a tag.\n *\n *\t\t\tIn the actual implementation, the 2 byte tag's length is\n *\t\t\tlimited to 3-17, because the value 0xF in the length nibble\n@@ -116,16 +116,17 @@\n *\t\t\t1K and 1M. For smaller items there's not that much chance of\n *\t\t\tredundancy in the character sequence (except for large areas\n *\t\t\tof identical bytes like trailing spaces) and for bigger ones\n- *\t\t\tthe allocation of the history table is expensive (it needs\n- *\t\t\t8 times the size of the input!).\n+ *\t\t\tour 4K maximum look-back distance is too small.\n *\n *\t\t\tThe compressor creates a table for 8192 lists of positions.\n *\t\t\tFor each input position (except the last 3), a hash key is\n- *\t\t\tbuilt from the 4 next input bytes and the posiiton remembered\n+ *\t\t\tbuilt from the 4 next input bytes and the position remembered\n *\t\t\tin the appropriate list. Thus, the table points to linked\n *\t\t\tlists of likely to be at least in the first 4 characters\n *\t\t\tmatching strings. This is done on the fly while the input\n- *\t\t\tis compressed into the output area.\n+ *\t\t\tis compressed into the output area. Table entries are only\n+ *\t\t\tkept for the last 4096 input positions, since we cannot use\n+ *\t\t\tback-pointers larger than that anyway.\n *\n *\t\t\tFor each byte in the input, it's hash key (built from this\n *\t\t\tbyte and the next 3) is used to find the appropriate list\n@@ -170,14 +171,12 @@\n *\t\t\tJan Wieck\n * ----------\n *\/\n-#include <stdio.h>\n-#include <stdlib.h>\n+#include \"postgres.h\"\n+\n #include <unistd.h>\n #include <fcntl.h>\n-#include <string.h>\n #include <errno.h>\n \n-#include \"postgres.h\"\n #include \"utils\/pg_lzcompress.h\"\n \n \n@@ -185,8 +184,8 @@\n * Local definitions\n * ----------\n *\/\n-#define PGLZ_HISTORY_LISTS\t\t8192\n-#define PGLZ_HISTORY_MASK\t\t0x1fff\n+#define PGLZ_HISTORY_LISTS\t\t8192 \/* must be power of 2 *\/\n+#define PGLZ_HISTORY_MASK\t\t(PGLZ_HISTORY_LISTS - 1)\n #define PGLZ_HISTORY_SIZE\t\t4096\n #define PGLZ_MAX_MATCH\t\t\t273\n \n@@ -195,13 +194,18 @@\n * PGLZ_HistEntry -\n *\n *\t\tLinked list for the backward history lookup\n+ *\n+ * All the entries sharing a hash key are linked in a doubly linked list.\n+ * This makes it easy to remove an entry when it's time to recycle it\n+ * (because it's more than 4K positions old).\n * ----------\n *\/\n typedef struct PGLZ_HistEntry\n {\n-\tstruct PGLZ_HistEntry *next;\n+\tstruct PGLZ_HistEntry *next; \/* links for my hash key's list *\/\n \tstruct PGLZ_HistEntry *prev;\n-\tchar\t *pos;\n+\tint\t\t\thindex;\t\t\t\/* my current hash key *\/\n+\tchar\t *pos;\t\t\t\/* my input position *\/\n } PGLZ_HistEntry;\n \n \n@@ -249,7 +253,7 @@\n PGLZ_Strategy *PGLZ_strategy_never = &strategy_never_data;\n \n \/* ----------\n- * Global arrays for history\n+ * Statically allocated work arrays for history\n * ----------\n *\/\n static PGLZ_HistEntry *hist_start[PGLZ_HISTORY_LISTS];\n@@ -261,48 +265,55 @@\n *\n *\t\tComputes the history table slot for the lookup by the next 4\n *\t\tcharacters in the input.\n- * ----------\n- *\/\n-#if 1\n+ *\n+ * NB: because we use the next 4 characters, we are not guaranteed to\n+ * find 3-character matches; they very possibly will be in the wrong\n+ * hash list. This seems an acceptable tradeoff for spreading out the\n+ * hash keys more.\n+ * ----------\n+ *\/\n #define pglz_hist_idx(_s,_e) (\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t(((_e) - (_s)) < 4) ? 0 :\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t((((_s)[0] << 9) ^ ((_s)[1] << 6) ^\t\t\t\t\t\t\t\t\\\n-\t\t\t((_s)[2] << 3) ^ (_s)[3]) & (PGLZ_HISTORY_MASK))\t\t\t\t\\\n+\t\t\t((((_e) - (_s)) < 4) ? (int) (_s)[0] :\t\t\t\t\t\t\t\\\n+\t\t\t (((_s)[0] << 9) ^ ((_s)[1] << 6) ^\t\t\t\t\t\t\t\t\\\n+\t\t\t ((_s)[2] << 3) ^ (_s)[3])) & (PGLZ_HISTORY_MASK)\t\t\t\t\\\n \t\t)\n-#else\n-#define pglz_hist_idx(_s,_e) (\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t(((_e) - (_s)) < 2) ? 0 :\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t((((_s)[0] << 8) ^ (_s)[1]) & (PGLZ_HISTORY_MASK))\t\t\t\t\\\n-\t\t)\n-#endif\n \n \n \/* ----------\n * pglz_hist_add -\n *\n *\t\tAdds a new entry to the history table.\n- * ----------\n- *\/\n-#define pglz_hist_add(_hs,_he,_hn,_s,_e) \\\n+ *\n+ * If _recycle is true, then we are recycling a previously used entry,\n+ * and must first delink it from its old hashcode's linked list.\n+ *\n+ * NOTE: beware of multiple evaluations of macro's arguments, and note that\n+ * _hn and _recycle are modified in the macro.\n+ * ----------\n+ *\/\n+#define pglz_hist_add(_hs,_he,_hn,_recycle,_s,_e) \\\n do {\t\t\t\t\t\t\t\t\t\\\n \t\t\tint __hindex = pglz_hist_idx((_s),(_e));\t\t\t\t\t\t\\\n-\t\t\tif ((_he)[(_hn)].prev == NULL) {\t\t\t\t\t\t\t\t\\\n-\t\t\t\t(_hs)[__hindex] = (_he)[(_hn)].next;\t\t\t\t\t\t\\\n-\t\t\t} else {\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t(_he)[(_hn)].prev->next = (_he)[(_hn)].next;\t\t\t\t\\\n+\t\t\tPGLZ_HistEntry **__myhsp = &(_hs)[__hindex];\t\t\t\t\t\\\n+\t\t\tPGLZ_HistEntry *__myhe = &(_he)[_hn];\t\t\t\t\t\t\t\\\n+\t\t\tif (_recycle) {\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\tif (__myhe->prev == NULL)\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t\t(_hs)[__myhe->hindex] = __myhe->next;\t\t\t\t\t\\\n+\t\t\t\telse\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t\t__myhe->prev->next = __myhe->next;\t\t\t\t\t\t\\\n+\t\t\t\tif (__myhe->next != NULL)\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t\t__myhe->next->prev = __myhe->prev;\t\t\t\t\t\t\\\n \t\t\t}\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\tif ((_he)[(_hn)].next != NULL) {\t\t\t\t\t\t\t\t\\\n-\t\t\t\t(_he)[(_hn)].next->prev = (_he)[(_hn)].prev;\t\t\t\t\\\n-\t\t\t}\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t(_he)[(_hn)].next = (_hs)[__hindex];\t\t\t\t\t\t\t\\\n-\t\t\t(_he)[(_hn)].prev = NULL;\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t(_he)[(_hn)].pos = (_s);\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\tif ((_hs)[__hindex] != NULL) {\t\t\t\t\t\t\t\t\t\\\n-\t\t\t\t(_hs)[__hindex]->prev = &((_he)[(_hn)]);\t\t\t\t\t\\\n-\t\t\t}\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n-\t\t\t(_hs)[__hindex] = &((_he)[(_hn)]);\t\t\t\t\t\t\t\t\\\n+\t\t\t__myhe->next = *__myhsp;\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t__myhe->prev = NULL;\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t__myhe->hindex = __hindex;\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t__myhe->pos = (_s);\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\tif (*__myhsp != NULL)\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t(*__myhsp)->prev = __myhe;\t\t\t\t\t\t\t\t\t\\\n+\t\t\t*__myhsp = __myhe;\t\t\t\t\t\t\t\t\t\t\t\t\\\n \t\t\tif (++(_hn) >= PGLZ_HISTORY_SIZE) {\t\t\t\t\t\t\t\t\\\n \t\t\t\t(_hn) = 0;\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n+\t\t\t\t(_recycle) = true;\t\t\t\t\t\t\t\t\t\t\t\\\n \t\t\t}\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\\\n } while (0)\n \n@@ -382,27 +393,23 @@\n \tPGLZ_HistEntry *hent;\n \tint32\t\tlen = 0;\n \tint32\t\toff = 0;\n-\tint32\t\tthislen;\n-\tint32\t\tthisoff;\n-\tchar\t *ip;\n-\tchar\t *hp;\n \n \t\/*\n \t * Traverse the linked history list until a good enough match is\n \t * found.\n \t *\/\n \thent = hstart[pglz_hist_idx(input, end)];\n-\twhile (hent && len < good_match)\n-\t{\n-\t\t\/*\n-\t\t * Be happy with lesser good matches the more entries we visited.\n-\t\t *\/\n-\t\tgood_match -= (good_match * good_drop) \/ 100;\n+\twhile (hent)\n+\t{\n+\t\tchar\t *ip = input;\n+\t\tchar\t *hp = hent->pos;\n+\t\tint32\t\tthisoff;\n+\t\tint32\t\tthislen;\n \n \t\t\/*\n \t\t * Stop if the offset does not fit into our tag anymore.\n \t\t *\/\n-\t\tthisoff = (ip = input) - (hp = hent->pos);\n+\t\tthisoff = ip - hp;\n \t\tif (thisoff >= 0x0fff)\n \t\t\tbreak;\n \n@@ -411,27 +418,33 @@\n \t\t * the best so far. And if we already have a match of 16 or more\n \t\t * bytes, it's worth the call overhead to use memcmp() to check if\n \t\t * this match is equal for the same size. After that we must\n-\t\t * fallback to character by character comparision to know the\n+\t\t * fallback to character by character comparison to know the\n \t\t * exact position where the diff occured.\n \t\t *\/\n+\t\tthislen = 0;\n \t\tif (len >= 16)\n \t\t{\n-\t\t\tif (memcmp(ip, hp, len) != 0)\n+\t\t\tif (memcmp(ip, hp, len) == 0)\n \t\t\t{\n-\t\t\t\thent = hent->next;\n-\t\t\t\tcontinue;\n+\t\t\t\tthislen = len;\n+\t\t\t\tip += len;\n+\t\t\t\thp += len;\n+\t\t\t\twhile (ip < end && *ip == *hp && thislen < PGLZ_MAX_MATCH)\n+\t\t\t\t{\n+\t\t\t\t\tthislen++;\n+\t\t\t\t\tip++;\n+\t\t\t\t\thp++;\n+\t\t\t\t}\n \t\t\t}\n-\t\t\tthislen = len;\n-\t\t\tip += len;\n-\t\t\thp += len;\n \t\t}\n \t\telse\n-\t\t\tthislen = 0;\n-\t\twhile (ip < end && *ip == *hp && thislen < PGLZ_MAX_MATCH)\n \t\t{\n-\t\t\tthislen++;\n-\t\t\tip++;\n-\t\t\thp++;\n+\t\t\twhile (ip < end && *ip == *hp && thislen < PGLZ_MAX_MATCH)\n+\t\t\t{\n+\t\t\t\tthislen++;\n+\t\t\t\tip++;\n+\t\t\t\thp++;\n+\t\t\t}\n \t\t}\n \n \t\t\/*\n@@ -447,6 +460,17 @@\n \t\t * Advance to the next history entry\n \t\t *\/\n \t\thent = hent->next;\n+\n+\t\t\/*\n+\t\t * Be happy with lesser good matches the more entries we visited.\n+\t\t * But no point in doing calculation if we're at end of list.\n+\t\t *\/\n+\t\tif (hent)\n+\t\t{\n+\t\t\tif (len >= good_match)\n+\t\t\t\tbreak;\n+\t\t\tgood_match -= (good_match * good_drop) \/ 100;\n+\t\t}\n \t}\n \n \t\/*\n@@ -473,10 +497,10 @@\n int\n pglz_compress(char *source, int32 slen, PGLZ_Header *dest, PGLZ_Strategy *strategy)\n {\n-\tint\t\t\thist_next = 0;\n-\n \tunsigned char *bp = ((unsigned char *) dest) + sizeof(PGLZ_Header);\n \tunsigned char *bstart = bp;\n+\tint\t\t\thist_next = 0;\n+\tbool\t\thist_recycle = false;\n \tchar\t *dp = source;\n \tchar\t *dend = source + slen;\n \tunsigned char ctrl_dummy = 0;\n@@ -535,12 +559,11 @@\n \t\tgood_drop = 100;\n \n \t\/*\n-\t * Initialize the history tables. For inputs smaller than\n-\t * PGLZ_HISTORY_SIZE, we already have a big enough history table on\n-\t * the stack frame.\n+\t * Initialize the history lists to empty. We do not need to zero\n+\t * the hist_entries[] array; its entries are initialized as they\n+\t * are used.\n \t *\/\n \tmemset((void *) hist_start, 0, sizeof(hist_start));\n-\tmemset((void *) hist_entries, 0, sizeof(hist_entries));\n \n \t\/*\n \t * Compute the maximum result size allowed by the strategy. If the\n@@ -588,7 +611,9 @@\n \t\t\tpglz_out_tag(ctrlp, ctrlb, ctrl, bp, match_len, match_off);\n \t\t\twhile (match_len--)\n \t\t\t{\n-\t\t\t\tpglz_hist_add(hist_start, hist_entries, hist_next, dp, dend);\n+\t\t\t\tpglz_hist_add(hist_start, hist_entries,\n+\t\t\t\t\t\t\t hist_next, hist_recycle,\n+\t\t\t\t\t\t\t dp, dend);\n \t\t\t\tdp++;\t\t\t\/* Do not do this ++ in the line above!\t\t*\/\n \t\t\t\t\/* The macro would do it four times - Jan.\t*\/\n \t\t\t}\n@@ -599,7 +624,9 @@\n \t\t\t * No match found. Copy one literal byte.\n \t\t\t *\/\n \t\t\tpglz_out_literal(ctrlp, ctrlb, ctrl, bp, *dp);\n-\t\t\tpglz_hist_add(hist_start, hist_entries, hist_next, dp, dend);\n+\t\t\tpglz_hist_add(hist_start, hist_entries,\n+\t\t\t\t\t\t hist_next, hist_recycle,\n+\t\t\t\t\t\t dp, dend);\n \t\t\tdp++;\t\t\t\t\/* Do not do this ++ in the line above!\t\t*\/\n \t\t\t\/* The macro would do it four times - Jan.\t*\/\n \t\t}\n"} {"commit":"602ae87f27784e19101e864908cb09d2d97eb996","subject":"add RMA sync ops","message":"add RMA sync ops\n","repos":"jeffhammond\/plumber","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- plumber.c\n+++ plumber.c\n@@ -84,94 +84,120 @@\n MAX_COMMTYPE = 44\n } plumber_commtype_t;\n \n-char plumber_commtype_names[MAX_COMMTYPE][32] = {\n-\"MPI_Send\",\n-\"MPI_Bsend\",\n-\"MPI_Ssend\",\n-\"MPI_Rsend\",\n-\"MPI_Isend\",\n-\"MPI_Ibsend\",\n-\"MPI_Issend\",\n-\"MPI_Irsend\",\n-\"MPI_Recv\",\n-\"MPI_Irecv\",\n-\"MPI_Mrecv\",\n-\"MPI_Imrecv\",\n-\"MPI_Bcast\",\n-\"MPI_Reduce\",\n-\"MPI_Allreduce\",\n-\"MPI_Alltoall\",\n-\"MPI_Alltoallv\",\n-\"MPI_Gather\",\n-\"MPI_Allgather\",\n-\"MPI_Scatter\",\n-\"MPI_Gatherv\",\n-\"MPI_Allgatherv\",\n-\"MPI_Scatterv\",\n-\"MPI_Reduce_scatter\",\n-\"MPI_Reduce_scatter_block\",\n-\"MPI_Alltoallw\",\n-\"MPI_Fetch_and_op\",\n-\"MPI_Compare_and_swap\",\n-\"MPI_Accumulate\",\n-\"MPI_Get\",\n-\"MPI_Put\",\n-\"MPI_Get_accumulate\"\n+char plumber_commtype_names[MAX_COMMTYPE][21] = {\n+\"Send\",\n+\"Bsend\",\n+\"Ssend\",\n+\"Rsend\",\n+\"Isend\",\n+\"Ibsend\",\n+\"Issend\",\n+\"Irsend\",\n+\"Recv\",\n+\"Irecv\",\n+\"Mrecv\",\n+\"Imrecv\",\n+\"Bcast\",\n+\"Reduce\",\n+\"Allreduce\",\n+\"Alltoall\",\n+\"Alltoallv\",\n+\"Gather\",\n+\"Allgather\",\n+\"Scatter\",\n+\"Gatherv\",\n+\"Allgatherv\",\n+\"Scatterv\",\n+\"Reduce_scatter\",\n+\"Reduce_scatter_block\",\n+\"Alltoallw\",\n+\"Fetch_and_op\",\n+\"Compare_and_swap\",\n+\"Accumulate\",\n+\"Get\",\n+\"Put\",\n+\"Get_accumulate\"\n };\n \n typedef enum {\n \/* request completion *\/\n- WAIT = 0,\n- WAITANY = 1,\n- WAITSOME = 2,\n- WAITALL = 3,\n- TEST = 4,\n- TESTANY = 5,\n- TESTSOME = 6,\n- TESTALL = 7,\n+ WAIT = 0,\n+ WAITANY = 1,\n+ WAITSOME = 2,\n+ WAITALL = 3,\n+ TEST = 4,\n+ TESTANY = 5,\n+ TESTSOME = 6,\n+ TESTALL = 7,\n \/* collectives *\/\n- BARRIER = 8,\n- COMMDUP = 9,\n- COMMCREATE = 10,\n- COMMSPLIT = 11,\n- COMMFREE = 12,\n+ BARRIER = 8,\n+ COMMDUP = 9,\n+ COMMCREATE = 10,\n+ COMMSPLIT = 11,\n+ COMMFREE = 12,\n \/* RMA *\/\n- WINCREATE = 13,\n- WINALLOC = 14,\n- WINALLOCSH = 15,\n- WINCREATEDYN = 16,\n- WINATTACH = 17,\n- WINDETACH = 18,\n- WINFREE = 19,\n- WINFENCE = 20,\n- WINSYNC = 21,\n+ WINCREATE = 13,\n+ WINALLOC = 14,\n+ WINALLOCSH = 15,\n+ WINCREATEDYN = 16,\n+ WINATTACH = 17,\n+ WINDETACH = 18,\n+ WINFREE = 19,\n+ WINFENCE = 20,\n+ WINSYNC = 21,\n+ WINLOCK = 22,\n+ WINUNLOCK = 23,\n+ WINLOCKALL = 24,\n+ WINUNLOCKALL = 25,\n+ WINFLUSH = 27,\n+ WINFLUSHALL = 28,\n+ WINFLUSHLOCAL = 29,\n+ WINFLUSHLOCALALL = 30,\n+ WINPOST = 31,\n+ WINSTART = 32,\n+ WINCOMPLETE = 33,\n+ WINWAIT = 34,\n+ WINTEST = 35,\n \/* the end *\/\n- MAX_UTILTYPE = 22\n+ MAX_UTILTYPE = 36\n } plumber_utiltype_t;\n \n-char plumber_utiltype_names[MAX_UTILTYPE][32] = {\n-\"MPI_Wait\",\n-\"MPI_Waitany\",\n-\"MPI_Waitsome\",\n-\"MPI_Waitall\",\n-\"MPI_Test\",\n-\"MPI_Testany\",\n-\"MPI_Testsome\",\n-\"MPI_Testall\",\n-\"MPI_Barrier\",\n-\"MPI_Comm_dup\",\n-\"MPI_Comm_create\",\n-\"MPI_Comm_split\",\n-\"MPI_Comm_free\",\n-\"MPI_Win_create\",\n-\"MPI_Win_allocate\",\n-\"MPI_Win_allocate_shared\",\n-\"MPI_Win_create_dynamic\",\n-\"MPI_Win_attach\",\n-\"MPI_Win_detach\",\n-\"MPI_Win_free\",\n-\"MPI_Win_fence\",\n-\"MPI_Win_sync\"\n+char plumber_utiltype_names[MAX_UTILTYPE][20] = {\n+\"Wait\",\n+\"Waitany\",\n+\"Waitsome\",\n+\"Waitall\",\n+\"Test\",\n+\"Testany\",\n+\"Testsome\",\n+\"Testall\",\n+\"Barrier\",\n+\"Comm_dup\",\n+\"Comm_create\",\n+\"Comm_split\",\n+\"Comm_free\",\n+\"Win_create\",\n+\"Win_allocate\",\n+\"Win_allocate_shared\",\n+\"Win_create_dynamic\",\n+\"Win_attach\",\n+\"Win_detach\",\n+\"Win_free\",\n+\"Win_fence\",\n+\"Win_sync\",\n+\"Win_lock\",\n+\"Win_unlock\",\n+\"Win_lock_all\",\n+\"Win_unlock_all\",\n+\"Win_flush\",\n+\"Win_flush_all\",\n+\"Win_flush_local\",\n+\"Win_flush_local_all\",\n+\"Win_post\",\n+\"Win_start\",\n+\"Win_complete\",\n+\"Win_wait\",\n+\"Win_test\"\n };\n \n typedef unsigned long long int myu64_t;\n@@ -402,7 +428,7 @@\n fprintf(rankfile, \"%32s %20s %30s %20s\\n\", \"function\", \"calls\", \"time\", \"bytes\");\n for (int i=0; i<MAX_COMMTYPE; i++) {\n if (plumber_commtype_count[i] > 0) {\n- fprintf(rankfile, \"%32s %20llu %30.14lf %20llu\\n\",\n+ fprintf(rankfile, \"MPI_%21s %20llu %30.14lf %20llu\\n\",\n plumber_commtype_names[i],\n plumber_commtype_count[i],\n plumber_commtype_timer[i],\n@@ -411,7 +437,7 @@\n }\n for (int i=0; i<MAX_UTILTYPE; i++) {\n if (plumber_utiltype_count[i] > 0) {\n- fprintf(rankfile, \"%32s %20llu %30.14lf\\n\",\n+ fprintf(rankfile, \"MPI_%20s %20llu %30.14lf\\n\",\n plumber_utiltype_names[i],\n plumber_utiltype_count[i],\n plumber_utiltype_timer[i]);\n@@ -510,7 +536,7 @@\n fprintf(rankfile, \"%32s %20s %30s %20s\\n\", \"function\", \"calls\", \"time\", \"bytes\");\n for (int i=0; i<MAX_COMMTYPE; i++) {\n if (total_commtype_count[i] > 0) {\n- fprintf(rankfile, \"%32s %20llu %30.14lf %20llu\\n\",\n+ fprintf(rankfile, \"MPI_%21s %20llu %30.14lf %20llu\\n\",\n plumber_commtype_names[i],\n total_commtype_count[i],\n total_commtype_timer[i],\n@@ -519,7 +545,7 @@\n }\n for (int i=0; i<MAX_UTILTYPE; i++) {\n if (total_utiltype_count[i] > 0) {\n- fprintf(rankfile, \"%32s %20llu %30.14lf\\n\",\n+ fprintf(rankfile, \"MPI_%20s %20llu %30.14lf\\n\",\n plumber_utiltype_names[i],\n total_utiltype_count[i],\n total_utiltype_timer[i]);\n@@ -1836,21 +1862,186 @@\n return rc;\n }\n \n-int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win);\n-int MPI_Win_unlock(int rank, MPI_Win win);\n-int MPI_Win_lock_all(int assert, MPI_Win win);\n-int MPI_Win_unlock_all(MPI_Win win);\n-int MPI_Win_flush(int rank, MPI_Win win);\n-int MPI_Win_flush_all(MPI_Win win);\n-int MPI_Win_flush_local(int rank, MPI_Win win);\n-int MPI_Win_flush_local_all(MPI_Win win);\n-\n-#if 0\n+int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_lock(lock_type, rank, assert, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINLOCK;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_unlock(int rank, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_unlock(rank, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINUNLOCK;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_lock_all(int assert, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_lock_all(assert, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINLOCKALL;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_unlock_all(MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_unlock_all(win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINUNLOCKALL;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_flush(int rank, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_flush(rank, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINFLUSH;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_flush_all(MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_flush_all(win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINFLUSHALL;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_flush_local(int rank, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_flush_local(rank, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINFLUSHLOCAL;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_flush_local_all(MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_flush_local_all(win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINFLUSHLOCALALL;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n \/* PSCW *\/\n-int MPI_Win_post(MPI_Group group, int assert, MPI_Win win);\n-int MPI_Win_start(MPI_Group group, int assert, MPI_Win win);\n-int MPI_Win_complete(MPI_Win win);\n-int MPI_Win_wait(MPI_Win win);\n-int MPI_Win_test(MPI_Win win, int *flag);\n-#endif\n-\n+int MPI_Win_post(MPI_Group group, int assert, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_post(group, assert, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINPOST;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_start(MPI_Group group, int assert, MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_start(group, assert, win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINSTART;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_complete(MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_complete(win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINCOMPLETE;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_wait(MPI_Win win)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_wait(win);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINWAIT;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n+int MPI_Win_test(MPI_Win win, int *flag)\n+{\n+ double t0 = PLUMBER_wtime();\n+ int rc = PMPI_Win_test(win, flag);\n+ double t1 = PLUMBER_wtime();\n+ if (plumber_profiling_active) {\n+ plumber_utiltype_t offset = WINTEST;\n+ PLUMBER_add2( &plumber_utiltype_count[offset],\n+ &plumber_utiltype_timer[offset],\n+ 1, t1-t0);\n+ }\n+ return rc;\n+}\n+\n"} {"commit":"e18f30300c1a10e924c302535b2a17c9cead4ded","subject":"planning: added side pass stage definition.","message":"planning: added side pass stage definition.\n","repos":"msbeta\/apollo,msbeta\/apollo,msbeta\/apollo,msbeta\/apollo,msbeta\/apollo,msbeta\/apollo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- modules\/planning\/scenarios\/side_pass\/side_pass_scenario.h\n+++ modules\/planning\/scenarios\/side_pass\/side_pass_scenario.h\n@@ -55,6 +55,14 @@\n const Frame& frame) const override;\n \n private:\n+ enum SidePassStage {\n+ OBSTACLE_APPROACH = 1,\n+ PATH_GENERATION = 2,\n+ WAITPOINT_STOP = 3,\n+ SAFETY_DETECTION = 4,\n+ OBSTACLE_PASS = 5,\n+ };\n+\n void RegisterTasks();\n \n apollo::common::util::Factory<TaskType, Task> task_factory_;\n@@ -64,6 +72,8 @@\n ScenarioConfig config_;\n \n SpeedProfileGenerator speed_profile_generator_;\n+\n+ SidePassStage stage_ = OBSTACLE_APPROACH;\n };\n \n } \/\/ namespace planning\n"} {"commit":"a892609fec37ad138782b0218c707abc129171d1","subject":"Check that pmt_to_bmp returns a valid pointer","message":"Check that pmt_to_bmp returns a valid pointer\n","repos":"sadkingbilly\/pmt2bmp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pmt2bmp.c\n+++ pmt2bmp.c\n@@ -310,6 +310,10 @@\n }\n \n uint8_t *out_ptr = pmt_to_bmp(argv[1], bmp_pixel_array, &bmp_color_table);\n+ if (!out_ptr) {\n+ printf(\"ERROR: conversion failed.\\n\");\n+ return 1;\n+ }\n if ((out_ptr - bmp_pixel_array) != BMP_PIXEL_ARRAY_SIZE) {\n printf(\"ERROR: unexpected number of bytes in pixel array.\\n\");\n return 1;\n"} {"commit":"9f093f3e8e9cb74c610de5441d05f18c8a75c6e3","subject":"additional board\/alight accessibility checks","message":"additional board\/alight accessibility checks\n","repos":"jeriksson\/graphserver,jeriksson\/graphserver,jeriksson\/graphserver,jeriksson\/graphserver,jeriksson\/graphserver","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/edgetypes.c\n+++ core\/edgetypes.c\n@@ -277,6 +277,9 @@\n return NULL;\n }\n }\n+ else if ( (this->type == PL_ALIGHT) && (options->with_wheelchair == 1) && (((Alight*)this)->wheelchair_boarding == 0) ) {\n+ return NULL;\n+ }\n else if ( (this->type == PL_HEADWAYBOARD) && ((options->transit_types & (1 << ((HeadwayBoard*)this)->route_type)) == 0) ) {\n \treturn NULL;\n }\n@@ -302,6 +305,9 @@\n return NULL;\n }\n }\n+ else if ( (this->type == PL_TRIPBOARD) && (options->with_wheelchair == 1) && (((TripBoard*)this)->wheelchair_boarding == 0) ) {\n+ return NULL;\n+ }\n else if ( (this->type == PL_HEADWAYALIGHT) && ((options->transit_types & (1 << ((HeadwayAlight*)this)->route_type)) == 0) ) {\n \treturn NULL;\n }\n"} {"commit":"876e18f3852c0a167c7880d064c52055e407bc7f","subject":"remove done, slash2 self-builds","message":"remove done, slash2 self-builds\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@22850 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- slashd\/rmc.c\n+++ slashd\/rmc.c\n@@ -791,22 +791,19 @@\n {\n \tstruct slm_wkdata_readdir *wk;\n \tstruct slm_exp_cli *mexpc;\n-\tint done = 1;\n \n \tif (eof)\n \t\treturn;\n \n \tEXPORT_LOCK(exp);\n \tmexpc = sl_exp_getpri_cli(exp);\n-\tif (mexpc->mexpc_readdir_nra < SLM_EXPC_READDIR_MAXNRA) {\n-\t\tdone = 0;\n+\tif (mexpc->mexpc_readdir_nra >= SLM_EXPC_READDIR_MAXNRA) {\n+\t\tEXPORT_ULOCK(exp);\n+\t\treturn;\n+\t} else{\n \t\tmexpc->mexpc_readdir_nra++;\n-\t}\n-\n-\tEXPORT_ULOCK(exp);\n-\n-\tif (done)\n-\t\treturn;\n+\t\tEXPORT_ULOCK(exp);\n+\t}\n \n \twk = pfl_workq_getitem(slm_readdir_ra_issue,\n \t struct slm_wkdata_readdir);\n"} {"commit":"5fb00c5893ab62bc2c2ea6ae972d8841b6cc9add","subject":"Make sure any client of Dominators.h links in Dominators.cpp","message":"Make sure any client of Dominators.h links in Dominators.cpp\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@16986 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/Analysis\/Dominators.h\n+++ include\/llvm\/Analysis\/Dominators.h\n@@ -268,6 +268,9 @@\n AU.addRequired<ImmediateDominators>();\n AU.setPreservesAll();\n }\n+\n+ \/\/ stub - dummy function, just ignore it\n+ static void stub();\n };\n \n \n@@ -506,6 +509,9 @@\n const DominatorTree::Node *Node);\n };\n \n+\/\/ Make sure that any clients of this file link in Dominators.cpp\n+static IncludeFile\n+DOMINATORS_INCLUDE_FILE((void*)&DominatorSet::stub);\n } \/\/ End llvm namespace\n \n #endif\n"} {"commit":"f59307f55a3c5c6b3103ec49210d27ec9c5c23fc","subject":"Correctly use atomic variable in ResGroupControl.freeChunks. (#8434)","message":"Correctly use atomic variable in ResGroupControl.freeChunks. (#8434)\n\nThis variable was used mixing with atomic api functions and direct access.\r\nThis is not wrong usually in real scenario but is not a good implementation\r\nsince 1) that depends on compiler and H\/W to ensure the correctness of direct\r\naccess. 2) code is not graceful.\r\n\r\nChanging to all use atomic api functions.\r\n\r\nReviewed-by: Georgios Kokolatos <fb0a81d6f2289dcfccc66052970aff598555e263@pivotal.io>","repos":"xinzweb\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,adam8157\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/resgroup\/resgroup.c\n+++ src\/backend\/utils\/resgroup\/resgroup.c\n@@ -218,7 +218,7 @@\n struct ResGroupControl\n {\n \tint32\t\t\ttotalChunks;\t\/* total memory chunks on this segment *\/\n-\tvolatile int32\tfreeChunks;\t\t\/* memory chunks not allocated to any group,\n+\tpg_atomic_uint32 freeChunks;\t\/* memory chunks not allocated to any group,\n \t\t\t\t\t\t\t\t\twill be used for the query which group share\n \t\t\t\t\t\t\t\t\tmemory is not enough*\/\n \n@@ -472,7 +472,7 @@\n pResGroupControl->loaded = false;\n pResGroupControl->nGroups = MaxResourceGroups;\n \tpResGroupControl->totalChunks = 0;\n-\tpResGroupControl->freeChunks = 0;\n+\tpg_atomic_init_u32(&pResGroupControl->freeChunks, 0);\n \tpResGroupControl->chunkSizeInBits = BITS_IN_MB;\n \n \tfor (i = 0; i < MaxResourceGroups; i++)\n@@ -555,7 +555,7 @@\n \n \t\/* These initialization must be done before createGroup() *\/\n \tdecideTotalChunks(&pResGroupControl->totalChunks, &pResGroupControl->chunkSizeInBits);\n-\tpResGroupControl->freeChunks = pResGroupControl->totalChunks;\n+\tpg_atomic_write_u32(&pResGroupControl->freeChunks, pResGroupControl->totalChunks);\n \tif (pResGroupControl->totalChunks == 0)\n \t\tereport(PANIC,\n \t\t\t\t(errcode(ERRCODE_INSUFFICIENT_RESOURCES),\n@@ -1378,8 +1378,7 @@\n \t\tint32 deltaGlobalSharedMemUsage = Max(0, deltaSharedMemUsage - oldSharedFree);\n \n \t\t\/* freeChunks -= deltaGlobalSharedMemUsage and get the new value *\/\n-\t\tint32 newFreeChunks = pg_atomic_sub_fetch_u32((pg_atomic_uint32 *)\n-\t\t\t\t\t\t\t\t\t\t\t\t\t &pResGroupControl->freeChunks,\n+\t\tint32 newFreeChunks = pg_atomic_sub_fetch_u32(&pResGroupControl->freeChunks,\n \t\t\t\t\t\t\t\t\t\t\t\t\t deltaGlobalSharedMemUsage);\n \t\t\/* calculate the total over used chunks of global share *\/\n \t\tglobalOveruse = Max(0, 0 - newFreeChunks);\n@@ -1430,8 +1429,7 @@\n \t\t\/* calculate the global share usage of current release *\/\n \t\tint32 deltaGlobalSharedMemUsage = Min(grpTotalGlobalUsage, deltaSharedMemUsage);\n \t\t\/* add chunks to global shared memory *\/\n-\t\tpg_atomic_add_fetch_u32((pg_atomic_uint32 *)\n-\t\t\t\t\t\t\t\t&pResGroupControl->freeChunks,\n+\t\tpg_atomic_add_fetch_u32(&pResGroupControl->freeChunks,\n \t\t\t\t\t\t\t\tdeltaGlobalSharedMemUsage);\n \t\treturn deltaGlobalSharedMemUsage;\n \t}\n@@ -1902,14 +1900,12 @@\n \t\/* Compare And Save to avoid concurrency problem without using lock *\/\n \twhile (true)\n \t{\n-\t\toldFreeChunks = pg_atomic_read_u32((pg_atomic_uint32 *)\n-\t\t\t\t\t\t\t\t\t\t &pResGroupControl->freeChunks);\n+\t\toldFreeChunks = pg_atomic_read_u32(&pResGroupControl->freeChunks);\n \t\treserved = Min(Max(0, oldFreeChunks), chunks);\n \t\tnewFreeChunks = oldFreeChunks - reserved;\n \t\tif (reserved == 0)\n \t\t\tbreak;\n-\t\tif (pg_atomic_compare_exchange_u32((pg_atomic_uint32 *)\n-\t\t\t\t\t\t\t\t\t\t &pResGroupControl->freeChunks,\n+\t\tif (pg_atomic_compare_exchange_u32(&pResGroupControl->freeChunks,\n \t\t\t\t\t\t\t\t\t\t (uint32 *) &oldFreeChunks,\n \t\t\t\t\t\t\t\t\t\t (uint32) newFreeChunks))\n \t\t\tbreak;\n@@ -1934,8 +1930,7 @@\n \tAssert(LWLockHeldExclusiveByMe(ResGroupLock));\n \tAssert(chunks >= 0);\n \n-\tnewFreeChunks = pg_atomic_add_fetch_u32((pg_atomic_uint32 *)\n-\t\t\t\t\t\t\t\t\t\t\t&pResGroupControl->freeChunks,\n+\tnewFreeChunks = pg_atomic_add_fetch_u32(&pResGroupControl->freeChunks,\n \t\t\t\t\t\t\t\t\t\t\tchunks);\n \n \tLOG_RESGROUP_DEBUG(LOG, \"free %u to pool(%u) chunks from group %d\",\n@@ -2167,7 +2162,7 @@\n \t\tif (group->groupMemOps->group_mem_on_notify)\n \t\t\tgroup->groupMemOps->group_mem_on_notify(group);\n \n-\t\tif (!pResGroupControl->freeChunks)\n+\t\tif (!pg_atomic_read_u32(&pResGroupControl->freeChunks))\n \t\t\tbreak;\n \t}\n }\n@@ -3515,7 +3510,7 @@\n \tappendStringInfo(str, \"\\\"segmentsOnMaster\\\":%d,\", pResGroupControl->segmentsOnMaster);\n \tappendStringInfo(str, \"\\\"loaded\\\":%s,\", pResGroupControl->loaded ? \"true\" : \"false\");\n \tappendStringInfo(str, \"\\\"totalChunks\\\":%d,\", pResGroupControl->totalChunks);\n-\tappendStringInfo(str, \"\\\"freeChunks\\\":%d,\", pResGroupControl->freeChunks);\n+\tappendStringInfo(str, \"\\\"freeChunks\\\":%d,\", pg_atomic_read_u32(&pResGroupControl->freeChunks));\n \tappendStringInfo(str, \"\\\"chunkSizeInBits\\\":%d,\", pResGroupControl->chunkSizeInBits);\n \t\n \t\/* dump each group *\/\n"} {"commit":"0476e154db5fab1721c2a0f32abf4aa773679b52","subject":"Additional changes, to add support for Windows Phone and Windows RT","message":"Additional changes, to add support for Windows Phone and Windows RT\n\n\ngit-svn-id: 2c9a99be47d0e569b9832cc4192b2d4c0ac487c7@690 861a406c-534a-0410-8894-cb66d6ee9925\n","repos":"open-eid\/googletest,bpsinc-native\/src_testing_gtest,svn2github\/googletest,dreamer-dead\/google-test,r12f\/googletest,abyss7\/googletest,svn2github\/chromium-gtest,ttyangf\/pdfium_gtest,bpsinc-native\/src_testing_gtest,android-ia\/platform_external_chromium_org_testing_gtest,RLovelett\/googletest,grumpycoders\/googletest,svn2github\/gtest,scudette\/gtest,martindam\/googletest,MoonCollider\/googletest,dreamer-dead\/google-test,open-eid\/googletest,cpp-mirrors\/gtest,scudette\/gtest,plexinc\/googletest,Luxoft\/gtest,abyss7\/googletest,svn2github\/googletest,duanhjlt\/gtest,maolin-cdzl\/googletest,adblockplus\/googletest,openpeer\/gtest,open-eid\/googletest,MoonCollider\/googletest,inexor-game\/googletest,grumpycoders\/googletest,maolin-cdzl\/googletest,RLovelett\/googletest,dreamer-dead\/google-test,svn2github\/googletest,scudette\/gtest,bpsinc-native\/src_testing_gtest,RLovelett\/googletest,stp\/googletest,android-ia\/platform_external_chromium_org_testing_gtest,bmatheny\/gtest,MoonCollider\/googletest,svn2github\/googletest,cpp-mirrors\/gtest,geekboxzone\/lollipop_external_chromium_org_testing_gtest,r12f\/googletest,xin3liang\/platform_external_chromium_org_testing_gtest,Omegaphora\/external_chromium_org_testing_gtest,svn2github\/chromium-gtest,xin3liang\/platform_external_chromium_org_testing_gtest,open-eid\/googletest,plexinc\/googletest,liquid-mirror\/googletest,dreamer-dead\/google-test,svn2github\/gtest,ttyangf\/pdfium_gtest,duanhjlt\/gtest,axiak\/googletest,stp\/googletest,svn2github\/chromium-gtest,Omegaphora\/external_chromium_org_testing_gtest,inexor-game\/googletest,inexor-game\/googletest,liquid-mirror\/googletest,openpeer\/gtest,Omegaphora\/external_chromium_org_testing_gtest,plexinc\/googletest,liquid-mirror\/googletest,svn2github\/gtest,cpp-mirrors\/gtest,inexor-game\/googletest,Luxoft\/gtest,stp\/googletest,istarc\/googletest,xin3liang\/platform_external_chromium_org_testing_gtest,grumpycoders\/googletest,duanhjlt\/gtest,stp\/googletest,RLovelett\/googletest,plexinc\/googletest,svn2github\/chromium-gtest,istarc\/googletest,bmatheny\/gtest,geekboxzone\/lollipop_external_chromium_org_testing_gtest,maolin-cdzl\/googletest,android-ia\/platform_external_chromium_org_testing_gtest,martindam\/googletest,axiak\/googletest,cpp-mirrors\/gtest,bmatheny\/gtest,martindam\/googletest,geekboxzone\/lollipop_external_chromium_org_testing_gtest,openpeer\/gtest,abyss7\/googletest,r12f\/googletest,maolin-cdzl\/googletest,istarc\/googletest,adblockplus\/googletest,adblockplus\/googletest,bmatheny\/gtest,xin3liang\/platform_external_chromium_org_testing_gtest,ttyangf\/pdfium_gtest,grumpycoders\/googletest,Luxoft\/gtest,liquid-mirror\/googletest,svn2github\/gtest,MoonCollider\/googletest,axiak\/googletest","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/gtest\/internal\/gtest-port.h\n+++ include\/gtest\/internal\/gtest-port.h\n@@ -917,7 +917,9 @@\n # endif\n \n #define GTEST_IS_THREADSAFE \\\n- (GTEST_OS_WINDOWS || GTEST_HAS_PTHREAD)\n+ (0 \\\n+ || (GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT) \\\n+ || GTEST_HAS_PTHREAD)\n \n #endif \/\/ GTEST_HAS_SEH\n \n@@ -1465,7 +1467,7 @@\n GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification);\n };\n \n-# elif GTEST_OS_WINDOWS\n+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT\n \n GTEST_API_ void SleepMilliseconds(int n);\n \n@@ -1600,7 +1602,7 @@\n # endif \/\/ GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW\n \n # if 0 \/\/ OS detection\n-# elif GTEST_OS_WINDOWS\n+# elif GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT\n \n \/\/ Mutex implements mutex on Windows platforms. It is used in conjunction\n \/\/ with class MutexLock:\n"} {"commit":"7c6ad0c06e911159979c994625fd82c6b8c4b242","subject":"Fixed serious bug in BatchReadOwnedPtrs where in a chain of calls to deserialize objects if BatchReadOwnedPtrs was called more than once in the same call chain then the second call would overwrite the SerializedPtrIDs being used by the first call. Solved this problem by making the vector that holds the pointer IDs local to a function call. Now BatchReadOwnedPtrs is reentrant.","message":"Fixed serious bug in BatchReadOwnedPtrs where in a chain of calls to\ndeserialize objects if BatchReadOwnedPtrs was called more than once in the\nsame call chain then the second call would overwrite the SerializedPtrIDs\nbeing used by the first call. Solved this problem by making the vector that\nholds the pointer IDs local to a function call. Now BatchReadOwnedPtrs is\nreentrant.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@44152 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Bitcode\/Deserialize.h\n+++ include\/llvm\/Bitcode\/Deserialize.h\n@@ -126,7 +126,6 @@\n unsigned AbbrevNo;\n unsigned RecordCode;\n Location StreamStart;\n- std::vector<SerializedPtrID> BatchIDVec;\n \n \/\/===----------------------------------------------------------===\/\/\n \/\/ Public Interface.\n@@ -213,7 +212,7 @@\n \n template <typename T>\n void BatchReadOwnedPtrs(unsigned NumPtrs, T** Ptrs, bool AutoRegister=true) {\n- BatchIDVec.clear();\n+ llvm::SmallVector<SerializedPtrID,10> BatchIDVec;\n \n for (unsigned i = 0; i < NumPtrs; ++i)\n BatchIDVec.push_back(ReadPtrID());\n@@ -234,8 +233,8 @@\n void BatchReadOwnedPtrs(unsigned NumT1Ptrs, T1** Ptrs, T2*& P2,\n bool A1=true, bool A2=true) {\n \n- BatchIDVec.clear();\n- \n+ llvm::SmallVector<SerializedPtrID,10> BatchIDVec;\n+\n for (unsigned i = 0; i < NumT1Ptrs; ++i)\n BatchIDVec.push_back(ReadPtrID());\n \n@@ -261,7 +260,7 @@\n T2*& P2, T3*& P3,\n bool A1=true, bool A2=true, bool A3=true) {\n \n- BatchIDVec.clear();\n+ llvm::SmallVector<SerializedPtrID,10> BatchIDVec;\n \n for (unsigned i = 0; i < NumT1Ptrs; ++i)\n BatchIDVec.push_back(ReadPtrID());\n"} {"commit":"716c2838f83430a6a07b1391c3b345ea107fff00","subject":"x86: Correct compile error with -O3","message":"x86: Correct compile error with -O3\n","repos":"zhicheng\/seL4,cmr\/seL4,cmr\/seL4,zhicheng\/seL4,cmr\/seL4,zhicheng\/seL4","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/arch\/x86\/machine\/capdl.c\n+++ src\/arch\/x86\/machine\/capdl.c\n@@ -52,6 +52,8 @@\n default:\n if (c >= 20 && c < 40) {\n *result = c - 20;\n+ } else {\n+ return 1;\n }\n }\n return 0;\n"} {"commit":"6df4e32cabcce5d63065efe15c0b72835b65b58d","subject":"update comments to match code","message":"update comments to match code\n","repos":"xalt\/xalt,xalt\/xalt,xalt\/xalt,xalt\/xalt,xalt\/xalt,xalt\/xalt,xalt\/xalt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/xalt_initialize.c\n+++ src\/xalt_initialize.c\n@@ -341,7 +341,7 @@\n \n \n \/***********************************************************\n- * Test 0: MPI Rank > 0?:\n+ * Test 2: MPI Rank > 0?:\n * Stop tracking if my mpi rank is not zero\n ***********************************************************\/\n \n@@ -770,7 +770,7 @@\n \/************************************************************\n * Register a signal handler wrapper_for_myfini for all the\n * important signals. This way a program terminated by\n- * ^C, SIGFPE, SIGSEGV, etc will produce an end record.\n+ * SIGFPE, SIGSEGV, etc will produce an end record.\n *********************************************************\/\n v = getenv(\"XALT_SIGNAL_HANDLER\");\n if (!v || strcmp(v,\"no\") != 0)\n"} {"commit":"6209a6230cce6c9b1af3c699f0f18335e820e1ea","subject":"Bug 584328 \u2013 Persian sample text is not good","message":"Bug 584328 \u2013 Persian sample text is not good\n\nRemove Alef Maksura from sample text.\n","repos":"kari-lentz\/alpha-pango,zsx\/pango,kari-lentz\/alpha-pango,OpenInkpot-archive\/iplinux-pango1.0,Distrotech\/pango,zsx\/pango,zsx\/pango,Distrotech\/pango,OpenInkpot-archive\/iplinux-pango1.0,kari-lentz\/alpha-pango,kari-lentz\/alpha-pango,danny-ku\/pango,danny-ku\/pango,danny-ku\/pango,Distrotech\/pango,zsx\/pango,OpenInkpot-archive\/iplinux-pango1.0","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pango\/pango-language-sample-table.h\n+++ pango\/pango-language-sample-table.h\n@@ -183,7 +183,7 @@\n LANGUAGE(\n \t fa\t\/* Persian *\/,\n \t MISC\t\/* Behdad Esfahbod (#548730) *\/,\n-\t \"\u00ab\u0627\u0644\u0627 \u06cc\u0627 \u0627\u064e\u06cc\u0651\u064f\u0647\u0627 \u0627\u0644\u0633\u0651\u0627\u0642\u06cc! \u0627\u064e\u062f\u0650\u0631\u0652 \u06a9\u064e\u0627\u0654\u0633\u0627\u064b \u0648\u064e \u0646\u0627\u0648\u0650\u0644\u0652\u0647\u0670\u0627!\u00bb \u06a9\u0647 \u0639\u0634\u0642 \u0622\u0633\u0627\u0646 \u0646\u0645\u0648\u062f \u0627\u0648\u0651\u0644\u060c \u0648\u0644\u06cc \u0627\u0641\u062a\u0627\u062f \u0645\u0634\u06a9\u0644\u200c\u0647\u0627!\"\n+\t \"\u00ab\u0627\u0644\u0627 \u06cc\u0627 \u0627\u064e\u06cc\u0651\u064f\u0647\u0627 \u0627\u0644\u0633\u0651\u0627\u0642\u06cc! \u0627\u064e\u062f\u0650\u0631\u0652 \u06a9\u064e\u0627\u0654\u0633\u0627\u064b \u0648\u064e \u0646\u0627\u0648\u0650\u0644\u0652\u0647\u0627!\u00bb \u06a9\u0647 \u0639\u0634\u0642 \u0622\u0633\u0627\u0646 \u0646\u0645\u0648\u062f \u0627\u0648\u0651\u0644\u060c \u0648\u0644\u06cc \u0627\u0641\u062a\u0627\u062f \u0645\u0634\u06a9\u0644\u200c\u0647\u0627!\"\n \t)\n LANGUAGE(\n \t fi\t\/* Finnish *\/,\n"} {"commit":"08fa3f52b2d2b6311f339249ba9146794848eeaf","subject":"PCH fix","message":"PCH fix\r\n\r\n","repos":"inviwo\/inviwo,Sparkier\/inviwo,Sparkier\/inviwo,inviwo\/inviwo,Sparkier\/inviwo,inviwo\/inviwo,Sparkier\/inviwo,Sparkier\/inviwo,inviwo\/inviwo,inviwo\/inviwo,inviwo\/inviwo","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/inviwo\/core\/util\/observer.h\n+++ include\/inviwo\/core\/util\/observer.h\n@@ -33,6 +33,7 @@\n #include <inviwo\/core\/common\/inviwocoredefine.h>\n #include <set>\n #include <functional>\n+#include <algorithm>\n \n namespace inviwo {\n \/\/ Forward declaration\n"} {"commit":"5bfe3bbc4729db3672eb33b34ea6770c36c8d372","subject":"[ptr-traits] Sink several in-body method definitions to be out-of-line inline definitions after the mutually recursive pair of types have been defined. The two types mutually recurse specifically through abstractions that require pointer traits which makes this kind of mutual recursion especially tricky to get right in terms of ordering.","message":"[ptr-traits] Sink several in-body method definitions to be out-of-line\ninline definitions after the mutually recursive pair of types have been\ndefined. The two types mutually recurse specifically through\nabstractions that require pointer traits which makes this kind of mutual\nrecursion especially tricky to get right in terms of ordering.\n\nThis is part of a series of patches to allow LLVM to check for complete\npointee types when computing its pointer traits. This is absolutely\nnecessary to get correct (or reproducible) results for things like how\nmany low bits are guaranteed to be zero.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@256551 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/CodeGen\/ScheduleDAG.h\n+++ include\/llvm\/CodeGen\/ScheduleDAG.h\n@@ -122,18 +122,7 @@\n }\n \n \/\/\/ Return true if the specified SDep is equivalent except for latency.\n- bool overlaps(const SDep &Other) const {\n- if (Dep != Other.Dep) return false;\n- switch (Dep.getInt()) {\n- case Data:\n- case Anti:\n- case Output:\n- return Contents.Reg == Other.Contents.Reg;\n- case Order:\n- return Contents.OrdKind == Other.Contents.OrdKind;\n- }\n- llvm_unreachable(\"Invalid dependency kind!\");\n- }\n+ bool overlaps(const SDep &Other) const;\n \n bool operator==(const SDep &Other) const {\n return overlaps(Other) && Latency == Other.Latency;\n@@ -157,19 +146,13 @@\n }\n \n \/\/\/\/ getSUnit - Return the SUnit to which this edge points.\n- SUnit *getSUnit() const {\n- return Dep.getPointer();\n- }\n+ SUnit *getSUnit() const;\n \n \/\/\/\/ setSUnit - Assign the SUnit to which this edge points.\n- void setSUnit(SUnit *SU) {\n- Dep.setPointer(SU);\n- }\n+ void setSUnit(SUnit *SU);\n \n \/\/\/ getKind - Return an enum value representing the kind of the dependence.\n- Kind getKind() const {\n- return Dep.getInt();\n- }\n+ Kind getKind() const;\n \n \/\/\/ isCtrl - Shorthand for getKind() != SDep::Data.\n bool isCtrl() const {\n@@ -490,6 +473,30 @@\n void ComputeHeight();\n };\n \n+ \/\/\/ Return true if the specified SDep is equivalent except for latency.\n+ inline bool SDep::overlaps(const SDep &Other) const {\n+ if (Dep != Other.Dep)\n+ return false;\n+ switch (Dep.getInt()) {\n+ case Data:\n+ case Anti:\n+ case Output:\n+ return Contents.Reg == Other.Contents.Reg;\n+ case Order:\n+ return Contents.OrdKind == Other.Contents.OrdKind;\n+ }\n+ llvm_unreachable(\"Invalid dependency kind!\");\n+ }\n+\n+ \/\/\/\/ getSUnit - Return the SUnit to which this edge points.\n+ inline SUnit *SDep::getSUnit() const { return Dep.getPointer(); }\n+\n+ \/\/\/\/ setSUnit - Assign the SUnit to which this edge points.\n+ inline void SDep::setSUnit(SUnit *SU) { Dep.setPointer(SU); }\n+\n+ \/\/\/ getKind - Return an enum value representing the kind of the dependence.\n+ inline SDep::Kind SDep::getKind() const { return Dep.getInt(); }\n+\n \/\/===--------------------------------------------------------------------===\/\/\n \/\/\/ SchedulingPriorityQueue - This interface is used to plug different\n \/\/\/ priorities computation algorithms into the list scheduler. It implements\n"} {"commit":"b095ba439ddc9199d2340e55b29a93050fae7639","subject":"remove dead variable, patch by Nathan Howell!","message":"remove dead variable, patch by Nathan Howell!\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@98704 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"dslab-epfl\/asap,dslab-epfl\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/llvm\/Target\/TargetOptions.h\n+++ include\/llvm\/Target\/TargetOptions.h\n@@ -144,11 +144,6 @@\n \/\/\/ wth earlier copy coalescing.\n extern bool StrongPHIElim;\n \n- \/\/\/ DisableScheduling - This flag disables instruction scheduling. In\n- \/\/\/ particular, it assigns an ordering to the SDNodes, which the scheduler\n- \/\/\/ uses instead of its normal heuristics to perform scheduling.\n- extern bool DisableScheduling;\n-\n } \/\/ End llvm namespace\n \n #endif\n"} {"commit":"ab6acef5317656212d80c289ea5b07c9deb30da0","subject":"DebugInfo: Add equality operators and default constructor to DILineInfo.","message":"DebugInfo: Add equality operators and default constructor to DILineInfo.\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@140223 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,chubbymaggie\/asap,dslab-epfl\/asap,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/DebugInfo\/DIContext.h\n+++ include\/llvm\/DebugInfo\/DIContext.h\n@@ -17,6 +17,7 @@\n \n #include \"llvm\/ADT\/StringRef.h\"\n #include \"llvm\/Support\/DataTypes.h\"\n+#include <cstring>\n \n namespace llvm {\n \n@@ -28,12 +29,21 @@\n uint32_t Line;\n uint32_t Column;\n public:\n+ DILineInfo() : FileName(\"<invalid>\"), Line(0), Column(0) {}\n DILineInfo(const char *fileName, uint32_t line, uint32_t column)\n : FileName(fileName), Line(line), Column(column) {}\n \n const char *getFileName() const { return FileName; }\n uint32_t getLine() const { return Line; }\n uint32_t getColumn() const { return Column; }\n+\n+ bool operator==(const DILineInfo &RHS) const {\n+ return Line == RHS.Line && Column == RHS.Column &&\n+ std::strcmp(FileName, RHS.FileName) == 0;\n+ }\n+ bool operator!=(const DILineInfo &RHS) const {\n+ return !(*this == RHS);\n+ }\n };\n \n class DIContext {\n"} {"commit":"df7783f81b675571857461b590a8c7c0f631e200","subject":"Have a working MPI-2 VectorValue<> implementation, need to check other types and MPI implementations.","message":"Have a working MPI-2 VectorValue<> implementation, need to check other types and MPI implementations.\n","repos":"cahaynes\/libmesh,giorgiobornia\/libmesh,markcmiller86\/libmesh_silo,karpeev\/libmesh,roystgnr\/libmesh,roystgnr\/libmesh,pbauman\/libmesh,90jrong\/libmesh,salazardetroya\/libmesh,friedmud\/libmesh,BalticPinguin\/libmesh,karpeev\/libmesh,jwpeterson\/libmesh,balborian\/libmesh,aeslaughter\/libmesh,pbauman\/libmesh,dmcdougall\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,Mbewu\/libmesh,karpeev\/libmesh,Mbewu\/libmesh,hrittich\/libmesh,salazardetroya\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,pbauman\/libmesh,dschwen\/libmesh,coreymbryant\/libmesh,Mbewu\/libmesh,svallaghe\/libmesh,libMesh\/libmesh,coreymbryant\/libmesh,benkirk\/libmesh,benkirk\/libmesh,markcmiller86\/libmesh_silo,svallaghe\/libmesh,permcody\/libmesh,permcody\/libmesh,benkirk\/libmesh,salazardetroya\/libmesh,markcmiller86\/libmesh_silo,dmcdougall\/libmesh,roystgnr\/libmesh,dmcdougall\/libmesh,jwpeterson\/libmesh,BalticPinguin\/libmesh,giorgiobornia\/libmesh,friedmud\/libmesh,permcody\/libmesh,pbauman\/libmesh,dknez\/libmesh,benkirk\/libmesh,aeslaughter\/libmesh,aeslaughter\/libmesh,90jrong\/libmesh,svallaghe\/libmesh,libMesh\/libmesh,friedmud\/libmesh,svallaghe\/libmesh,markcmiller86\/libmesh_silo,balborian\/libmesh,benkirk\/libmesh,giorgiobornia\/libmesh,jwpeterson\/libmesh,dmcdougall\/libmesh,benkirk\/libmesh,svallaghe\/libmesh,vikramvgarg\/libmesh,hrittich\/libmesh,markcmiller86\/libmesh_silo,karpeev\/libmesh,90jrong\/libmesh,jiangwen84\/libmesh,jwpeterson\/libmesh,hrittich\/libmesh,hrittich\/libmesh,karpeev\/libmesh,markcmiller86\/libmesh_silo,BalticPinguin\/libmesh,dmcdougall\/libmesh,karpeev\/libmesh,permcody\/libmesh,90jrong\/libmesh,vikramvgarg\/libmesh,friedmud\/libmesh,roystgnr\/libmesh,benkirk\/libmesh,dknez\/libmesh,dschwen\/libmesh,dschwen\/libmesh,friedmud\/libmesh,Mbewu\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,coreymbryant\/libmesh,jwpeterson\/libmesh,jiangwen84\/libmesh,friedmud\/libmesh,svallaghe\/libmesh,balborian\/libmesh,libMesh\/libmesh,balborian\/libmesh,cahaynes\/libmesh,dknez\/libmesh,capitalaslash\/libmesh,dknez\/libmesh,hrittich\/libmesh,BalticPinguin\/libmesh,permcody\/libmesh,jwpeterson\/libmesh,giorgiobornia\/libmesh,BalticPinguin\/libmesh,90jrong\/libmesh,Mbewu\/libmesh,capitalaslash\/libmesh,friedmud\/libmesh,vikramvgarg\/libmesh,roystgnr\/libmesh,dmcdougall\/libmesh,Mbewu\/libmesh,svallaghe\/libmesh,Mbewu\/libmesh,BalticPinguin\/libmesh,BalticPinguin\/libmesh,benkirk\/libmesh,dschwen\/libmesh,dschwen\/libmesh,permcody\/libmesh,cahaynes\/libmesh,pbauman\/libmesh,jiangwen84\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,pbauman\/libmesh,coreymbryant\/libmesh,benkirk\/libmesh,jiangwen84\/libmesh,Mbewu\/libmesh,aeslaughter\/libmesh,friedmud\/libmesh,aeslaughter\/libmesh,markcmiller86\/libmesh_silo,jwpeterson\/libmesh,jiangwen84\/libmesh,balborian\/libmesh,coreymbryant\/libmesh,capitalaslash\/libmesh,pbauman\/libmesh,dknez\/libmesh,aeslaughter\/libmesh,salazardetroya\/libmesh,karpeev\/libmesh,cahaynes\/libmesh,vikramvgarg\/libmesh,balborian\/libmesh,friedmud\/libmesh,dschwen\/libmesh,aeslaughter\/libmesh,salazardetroya\/libmesh,salazardetroya\/libmesh,90jrong\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,giorgiobornia\/libmesh,libMesh\/libmesh,jiangwen84\/libmesh,aeslaughter\/libmesh,permcody\/libmesh,libMesh\/libmesh,coreymbryant\/libmesh,libMesh\/libmesh,balborian\/libmesh,roystgnr\/libmesh,aeslaughter\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,roystgnr\/libmesh,permcody\/libmesh,giorgiobornia\/libmesh,capitalaslash\/libmesh,cahaynes\/libmesh,svallaghe\/libmesh,capitalaslash\/libmesh,dknez\/libmesh,dknez\/libmesh,salazardetroya\/libmesh,karpeev\/libmesh,coreymbryant\/libmesh,hrittich\/libmesh,capitalaslash\/libmesh,capitalaslash\/libmesh,jiangwen84\/libmesh,cahaynes\/libmesh,hrittich\/libmesh,dmcdougall\/libmesh,90jrong\/libmesh,vikramvgarg\/libmesh,salazardetroya\/libmesh,jiangwen84\/libmesh,90jrong\/libmesh,90jrong\/libmesh,roystgnr\/libmesh,hrittich\/libmesh,giorgiobornia\/libmesh,libMesh\/libmesh,dschwen\/libmesh,vikramvgarg\/libmesh,svallaghe\/libmesh,markcmiller86\/libmesh_silo,jwpeterson\/libmesh,Mbewu\/libmesh,cahaynes\/libmesh,cahaynes\/libmesh,dmcdougall\/libmesh,pbauman\/libmesh,coreymbryant\/libmesh,dknez\/libmesh,vikramvgarg\/libmesh,hrittich\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/parallel\/parallel_algebra.h\n+++ include\/parallel\/parallel_algebra.h\n@@ -157,8 +157,7 @@\n MPI_Aint start, later;\n \n MPI_Address(ex, &start);\n- blockle\n-\t ngths[0] = 1;\n+ blocklengths[0] = 1;\n displs[0] = 0;\n types[0] = MPI_LB;\n for (unsigned int i=0; i != LIBMESH_DIM; ++i)\n@@ -177,28 +176,26 @@\n \n #else \/\/ MPI_VERSION >= 2\n \n- int blocklengths[LIBMESH_DIM+2];\n- MPI_Aint displs[LIBMESH_DIM+2];\n- MPI_Datatype types[LIBMESH_DIM+2];\n- MPI_Aint start, later;\n-\n- MPI_Get_address(ex, &start);\n- blocklengths[0] = 1;\n- displs[0] = 0;\n- types[0] = MPI_LB;\n+ int blocklengths[LIBMESH_DIM];\n+ MPI_Aint displs[LIBMESH_DIM];\n+ MPI_Datatype types[LIBMESH_DIM], tmptype;\n+\t MPI_Aint start, later;\n+\n+\t MPI_Get_address (ex, &start);\n+\t MPI_Get_address (ex+1, &later);\n+\n for (unsigned int i=0; i != LIBMESH_DIM; ++i)\n {\n- MPI_Get_address(&((*ex)(i)), &later);\n- blocklengths[i+1] = 1;\n- displs[i+1] = later - start;\n- types[i+1] = T_type;\n+ MPI_Get_address(&((*ex)(i)), &displs[i]);\n+ \/\/ subtract off offset\n+\t displs[i] -= start;\n+ blocklengths[i] = 1;\n+ types[i] = T_type;\n }\n- MPI_Get_address((ex+1), &later);\n- blocklengths[LIBMESH_DIM+1] = 1;\n- displs[LIBMESH_DIM+1] = later - start;\n- types[LIBMESH_DIM+1] = MPI_UB;\n-\n- MPI_Type_create_struct (LIBMESH_DIM+2, blocklengths, displs, types, &_static_type);\n+\n+\t MPI_Type_create_struct (LIBMESH_DIM, blocklengths, displs, types, &tmptype);\n+\n+\t MPI_Type_create_resized (tmptype, 0, (later-start), &_static_type);\n #endif\n \n MPI_Type_commit (&_static_type);\n"} {"commit":"8a207c16d2eb44ebcf94b13b0db047e46b7b0d30","subject":"Make sure a variable is initialized before use to clean up a warning from GCC 4.0.0 in release build.","message":"Make sure a variable is initialized before use to clean up a warning from\nGCC 4.0.0 in release build.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@22248 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Support\/CommandLine.h\n+++ include\/llvm\/Support\/CommandLine.h\n@@ -894,7 +894,8 @@\n \n virtual bool handleOccurrence(unsigned pos, const char *ArgName,\n const std::string &Arg) {\n- typename ParserClass::parser_data_type Val;\n+ typename ParserClass::parser_data_type Val =\n+ typename ParserClass::parser_data_type();\n if (Parser.parse(*this, ArgName, Arg, Val))\n return true; \/\/ Parse Error!\n addValue(Val);\n"} {"commit":"0bf5589c746342cde6a1016436775ebe569f2c1b","subject":"Fix compaction_filter.h typos","message":"Fix compaction_filter.h typos\n","repos":"sorphi\/rocksdb,alihalabyah\/rocksdb,JackLian\/rocksdb,vmx\/rocksdb,flabby\/rocksdb,msb-at-yahoo\/rocksdb,wskplho\/rocksdb,luckywhu\/rocksdb,bbiao\/rocksdb,geraldoandradee\/rocksdb,temicai\/rocksdb,JoeWoo\/rocksdb,wat-ze-hex\/rocksdb,JackLian\/rocksdb,ryneli\/rocksdb,lgscofield\/rocksdb,rDSN-Projects\/rocksdb.replicated,SunguckLee\/RocksDB,flabby\/rocksdb,ryneli\/rocksdb,jalexanderqed\/rocksdb,lgscofield\/rocksdb,hobinyoon\/rocksdb,JackLian\/rocksdb,bbiao\/rocksdb,tizzybec\/rocksdb,flabby\/rocksdb,fengshao0907\/rocksdb,fengshao0907\/rocksdb,Vaisman\/rocksdb,anagav\/rocksdb,virtdb\/rocksdb,wskplho\/rocksdb,hobinyoon\/rocksdb,JohnPJenkins\/rocksdb,kaschaeffer\/rocksdb,NickCis\/rocksdb,vmx\/rocksdb,JoeWoo\/rocksdb,NickCis\/rocksdb,tizzybec\/rocksdb,Vaisman\/rocksdb,Applied-Duality\/rocksdb,RyanTech\/rocksdb,amyvmiwei\/rocksdb,makelivedotnet\/rocksdb,lgscofield\/rocksdb,tschottdorf\/rocksdb,hobinyoon\/rocksdb,RyanTech\/rocksdb,sorphi\/rocksdb,biddyweb\/rocksdb,RyanTech\/rocksdb,dkorolev\/rocksdb,tizzybec\/rocksdb,zhangpng\/rocksdb,rDSN-Projects\/rocksdb.replicated,kaschaeffer\/rocksdb,luckywhu\/rocksdb,jalexanderqed\/rocksdb,tsheasha\/rocksdb,NickCis\/rocksdb,tsheasha\/rocksdb,biddyweb\/rocksdb,facebook\/rocksdb,Vaisman\/rocksdb,NickCis\/rocksdb,sorphi\/rocksdb,amyvmiwei\/rocksdb,mbarbon\/rocksdb,biddyweb\/rocksdb,zhangpng\/rocksdb,Applied-Duality\/rocksdb,tschottdorf\/rocksdb,skunkwerks\/rocksdb,vmx\/rocksdb,OverlordQ\/rocksdb,fengshao0907\/rocksdb,JackLian\/rocksdb,JoeWoo\/rocksdb,JackLian\/rocksdb,tsheasha\/rocksdb,Andymic\/rocksdb,temicai\/rocksdb,SunguckLee\/RocksDB,anagav\/rocksdb,lgscofield\/rocksdb,siddhartharay007\/rocksdb,fengshao0907\/rocksdb,OverlordQ\/rocksdb,caijieming-baidu\/rocksdb,facebook\/rocksdb,siddhartharay007\/rocksdb,makelivedotnet\/rocksdb,lgscofield\/rocksdb,norton\/rocksdb,bbiao\/rocksdb,ylong\/rocksdb,msb-at-yahoo\/rocksdb,IMCG\/RcoksDB,caijieming-baidu\/rocksdb,jalexanderqed\/rocksdb,anagav\/rocksdb,facebook\/rocksdb,wat-ze-hex\/rocksdb,tizzybec\/rocksdb,jalexanderqed\/rocksdb,IMCG\/RcoksDB,caijieming-baidu\/rocksdb,wat-ze-hex\/rocksdb,alihalabyah\/rocksdb,ylong\/rocksdb,mbarbon\/rocksdb,bbiao\/rocksdb,tsheasha\/rocksdb,skunkwerks\/rocksdb,Vaisman\/rocksdb,temicai\/rocksdb,alihalabyah\/rocksdb,norton\/rocksdb,Andymic\/rocksdb,zhangpng\/rocksdb,NickCis\/rocksdb,RyanTech\/rocksdb,wenduo\/rocksdb,tschottdorf\/rocksdb,caijieming-baidu\/rocksdb,facebook\/rocksdb,vmx\/rocksdb,SunguckLee\/RocksDB,Vaisman\/rocksdb,wat-ze-hex\/rocksdb,wlqGit\/rocksdb,wlqGit\/rocksdb,temicai\/rocksdb,msb-at-yahoo\/rocksdb,vmx\/rocksdb,IMCG\/RcoksDB,OverlordQ\/rocksdb,hobinyoon\/rocksdb,flabby\/rocksdb,rDSN-Projects\/rocksdb.replicated,tschottdorf\/rocksdb,JohnPJenkins\/rocksdb,virtdb\/rocksdb,JohnPJenkins\/rocksdb,luckywhu\/rocksdb,anagav\/rocksdb,SunguckLee\/RocksDB,ylong\/rocksdb,luckywhu\/rocksdb,geraldoandradee\/rocksdb,Andymic\/rocksdb,sorphi\/rocksdb,RyanTech\/rocksdb,OverlordQ\/rocksdb,Andymic\/rocksdb,ryneli\/rocksdb,wenduo\/rocksdb,biddyweb\/rocksdb,geraldoandradee\/rocksdb,wlqGit\/rocksdb,mbarbon\/rocksdb,zhangpng\/rocksdb,fengshao0907\/rocksdb,rDSN-Projects\/rocksdb.replicated,biddyweb\/rocksdb,facebook\/rocksdb,wlqGit\/rocksdb,JohnPJenkins\/rocksdb,msb-at-yahoo\/rocksdb,RyanTech\/rocksdb,luckywhu\/rocksdb,anagav\/rocksdb,geraldoandradee\/rocksdb,lgscofield\/rocksdb,vmx\/rocksdb,siddhartharay007\/rocksdb,Applied-Duality\/rocksdb,IMCG\/RcoksDB,JoeWoo\/rocksdb,Andymic\/rocksdb,tschottdorf\/rocksdb,vmx\/rocksdb,tsheasha\/rocksdb,JackLian\/rocksdb,Applied-Duality\/rocksdb,dkorolev\/rocksdb,tsheasha\/rocksdb,bbiao\/rocksdb,dkorolev\/rocksdb,wskplho\/rocksdb,SunguckLee\/RocksDB,amyvmiwei\/rocksdb,zhangpng\/rocksdb,facebook\/rocksdb,siddhartharay007\/rocksdb,mbarbon\/rocksdb,hobinyoon\/rocksdb,wlqGit\/rocksdb,norton\/rocksdb,luckywhu\/rocksdb,kaschaeffer\/rocksdb,wenduo\/rocksdb,vashstorm\/rocksdb,rDSN-Projects\/rocksdb.replicated,ryneli\/rocksdb,temicai\/rocksdb,ylong\/rocksdb,wenduo\/rocksdb,JackLian\/rocksdb,Vaisman\/rocksdb,NickCis\/rocksdb,vashstorm\/rocksdb,dkorolev\/rocksdb,tizzybec\/rocksdb,JohnPJenkins\/rocksdb,rDSN-Projects\/rocksdb.replicated,anagav\/rocksdb,geraldoandradee\/rocksdb,sorphi\/rocksdb,vashstorm\/rocksdb,siddhartharay007\/rocksdb,wenduo\/rocksdb,jalexanderqed\/rocksdb,virtdb\/rocksdb,makelivedotnet\/rocksdb,fengshao0907\/rocksdb,wlqGit\/rocksdb,IMCG\/RcoksDB,amyvmiwei\/rocksdb,mbarbon\/rocksdb,facebook\/rocksdb,ylong\/rocksdb,temicai\/rocksdb,dkorolev\/rocksdb,ryneli\/rocksdb,Andymic\/rocksdb,wskplho\/rocksdb,kaschaeffer\/rocksdb,alihalabyah\/rocksdb,ylong\/rocksdb,alihalabyah\/rocksdb,norton\/rocksdb,tsheasha\/rocksdb,tsheasha\/rocksdb,biddyweb\/rocksdb,rDSN-Projects\/rocksdb.replicated,flabby\/rocksdb,Andymic\/rocksdb,norton\/rocksdb,bbiao\/rocksdb,amyvmiwei\/rocksdb,alihalabyah\/rocksdb,wenduo\/rocksdb,msb-at-yahoo\/rocksdb,OverlordQ\/rocksdb,wskplho\/rocksdb,wat-ze-hex\/rocksdb,makelivedotnet\/rocksdb,ryneli\/rocksdb,mbarbon\/rocksdb,wskplho\/rocksdb,wenduo\/rocksdb,amyvmiwei\/rocksdb,caijieming-baidu\/rocksdb,SunguckLee\/RocksDB,fengshao0907\/rocksdb,IMCG\/RcoksDB,OverlordQ\/rocksdb,norton\/rocksdb,makelivedotnet\/rocksdb,jalexanderqed\/rocksdb,Vaisman\/rocksdb,vashstorm\/rocksdb,skunkwerks\/rocksdb,vashstorm\/rocksdb,siddhartharay007\/rocksdb,tizzybec\/rocksdb,vmx\/rocksdb,wat-ze-hex\/rocksdb,skunkwerks\/rocksdb,dkorolev\/rocksdb,makelivedotnet\/rocksdb,siddhartharay007\/rocksdb,kaschaeffer\/rocksdb,hobinyoon\/rocksdb,wskplho\/rocksdb,amyvmiwei\/rocksdb,JohnPJenkins\/rocksdb,NickCis\/rocksdb,SunguckLee\/RocksDB,wlqGit\/rocksdb,msb-at-yahoo\/rocksdb,jalexanderqed\/rocksdb,geraldoandradee\/rocksdb,JoeWoo\/rocksdb,Applied-Duality\/rocksdb,geraldoandradee\/rocksdb,biddyweb\/rocksdb,Applied-Duality\/rocksdb,vashstorm\/rocksdb,dkorolev\/rocksdb,OverlordQ\/rocksdb,ylong\/rocksdb,IMCG\/RcoksDB,sorphi\/rocksdb,facebook\/rocksdb,Andymic\/rocksdb,Applied-Duality\/rocksdb,tizzybec\/rocksdb,temicai\/rocksdb,caijieming-baidu\/rocksdb,makelivedotnet\/rocksdb,norton\/rocksdb,hobinyoon\/rocksdb,norton\/rocksdb,vashstorm\/rocksdb,wat-ze-hex\/rocksdb,luckywhu\/rocksdb,flabby\/rocksdb,hobinyoon\/rocksdb,kaschaeffer\/rocksdb,lgscofield\/rocksdb,bbiao\/rocksdb,SunguckLee\/RocksDB,virtdb\/rocksdb,virtdb\/rocksdb,virtdb\/rocksdb,tschottdorf\/rocksdb,kaschaeffer\/rocksdb,skunkwerks\/rocksdb,bbiao\/rocksdb,flabby\/rocksdb,JoeWoo\/rocksdb,zhangpng\/rocksdb,mbarbon\/rocksdb,zhangpng\/rocksdb,wat-ze-hex\/rocksdb,JoeWoo\/rocksdb,alihalabyah\/rocksdb,skunkwerks\/rocksdb,skunkwerks\/rocksdb,JohnPJenkins\/rocksdb,sorphi\/rocksdb,wenduo\/rocksdb,ryneli\/rocksdb,RyanTech\/rocksdb,caijieming-baidu\/rocksdb,anagav\/rocksdb,virtdb\/rocksdb","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/rocksdb\/compaction_filter.h\n+++ include\/rocksdb\/compaction_filter.h\n@@ -86,7 +86,7 @@\n \/\/\n \/\/ Each entry in the return vector indicates if the corresponding kv should\n \/\/ be preserved in the output of this compaction run. The application can\n- \/\/ inspect the exisitng values of the keys and make decision based on it.\n+ \/\/ inspect the existing values of the keys and make decision based on it.\n \/\/\n \/\/ When a value is to be preserved, the application has the option\n \/\/ to modify the entry in existing_values and pass it back through an entry\n@@ -108,7 +108,7 @@\n };\n \n \/\/ Each compaction will create a new CompactionFilter allowing the\n-\/\/ application to know about different campactions\n+\/\/ application to know about different compactions\n class CompactionFilterFactory {\n public:\n virtual ~CompactionFilterFactory() { }\n@@ -120,7 +120,7 @@\n virtual const char* Name() const = 0;\n };\n \n-\/\/ Default implementaion of CompactionFilterFactory which does not\n+\/\/ Default implementation of CompactionFilterFactory which does not\n \/\/ return any filter\n class DefaultCompactionFilterFactory : public CompactionFilterFactory {\n public:\n@@ -175,7 +175,7 @@\n const SliceTransform* prefix_extractor_;\n };\n \n-\/\/ Default implementaion of CompactionFilterFactoryV2 which does not\n+\/\/ Default implementation of CompactionFilterFactoryV2 which does not\n \/\/ return any filter\n class DefaultCompactionFilterFactoryV2 : public CompactionFilterFactoryV2 {\n public:\n"} {"commit":"c39b80fdfc606f5df118288f4fc6b5e9c0b5ee41","subject":"raw_ostream: Return '*this' explicitly (instead of implicitly via write) to expose more alias information.","message":"raw_ostream: Return '*this' explicitly (instead of implicitly via\nwrite) to expose more alias information.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@67070 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,chubbymaggie\/asap,dslab-epfl\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Support\/raw_ostream.h\n+++ include\/llvm\/Support\/raw_ostream.h\n@@ -119,11 +119,13 @@\n }\n \n raw_ostream &operator<<(const char *Str) {\n- return write(Str, strlen(Str));\n+ write(Str, strlen(Str));\n+ return *this;\n }\n \n raw_ostream &operator<<(const std::string& Str) {\n- return write(Str.data(), Str.length());\n+ write(Str.data(), Str.length());\n+ return *this;\n }\n \n raw_ostream &operator<<(unsigned long N);\n@@ -132,15 +134,18 @@\n raw_ostream &operator<<(long long N);\n raw_ostream &operator<<(const void *P);\n raw_ostream &operator<<(unsigned int N) {\n- return this->operator<<(static_cast<unsigned long>(N));\n+ this->operator<<(static_cast<unsigned long>(N));\n+ return *this;\n }\n \n raw_ostream &operator<<(int N) {\n- return this->operator<<(static_cast<long>(N));\n+ this->operator<<(static_cast<long>(N));\n+ return *this;\n }\n \n raw_ostream &operator<<(double N) {\n- return this->operator<<(ftostr(N));\n+ this->operator<<(ftostr(N));\n+ return *this;\n }\n \n raw_ostream &write(unsigned char C);\n"} {"commit":"b659f0a973e1bd391e10de5557e29979a7535243","subject":"document use of return values from user decoded callback","message":"document use of return values from user decoded callback\n","repos":"kfish\/libshcodecs,kfish\/libshcodecs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/shcodecs\/shcodecs_decoder.h\n+++ include\/shcodecs\/shcodecs_decoder.h\n@@ -38,13 +38,15 @@\n \n \/**\n * Signature of a callback for libshcodecs to call when it has decoded\n- * YUV 4:2:0 data.\n+ * YUV 4:2:0 data. To pause decoding, return 1 from this callback.\n * \\param decoder The SHCodecs_Decoder* handle\n * \\param y_buf The decoded Y plane\n * \\param y_size The size in bytes of the decoded Y data\n * \\param c_buf The decoded C plane\n * \\param c_size The size in bytes of the decoded C data\n * \\param user_data Arbitrary data supplied by user\n+ * \\retval 0 Continue decoding\n+ * \\retval 1 Pause decoding, return from shcodecs_decode()\n *\/\n typedef int (*SHCodecs_Decoded_Callback) (SHCodecs_Decoder * decoder,\n unsigned char * y_buf, int y_size,\n@@ -95,11 +97,16 @@\n \n \/**\n * Decode a buffer of input data. This function will call the previously\n- * registered callback each time it has decoded a complete frame.\n+ * registered callback each time it has decoded a complete frame. If that\n+ * callback returns 1, decoding is paused and shcodecs_decode() will\n+ * return immediately. The decode state will be retained between successive\n+ * calls.\n * \\param decoder The SHCodecs_Decoder* handle\n * \\param data A memory buffer containing compressed video data\n * \\param len The length in bytes of the data\n- * \\returns The number of bytes of input that were used.\n+ * \\returns The number of bytes of input that were used. Note that this\n+ * may be zero even if frames were decoded, in the case that the decoder\n+ * was previously paused and is being resumed.\n *\/\n int\n shcodecs_decode (SHCodecs_Decoder * decoder, unsigned char * data, int len);\n"} {"commit":"efb70fea3df01c46fee599a7dddf4d3579f60aed","subject":"protect the nm defines.","message":"protect the nm defines.\n","repos":"qtproject\/qt-mobility,qtproject\/qt-mobility,tmcguire\/qt-mobility,qtproject\/qt-mobility,kaltsi\/qt-mobility,enthought\/qt-mobility,kaltsi\/qt-mobility,KDE\/android-qt-mobility,enthought\/qt-mobility,tmcguire\/qt-mobility,KDE\/android-qt-mobility,KDE\/android-qt-mobility,qtproject\/qt-mobility,qtproject\/qt-mobility,kaltsi\/qt-mobility,kaltsi\/qt-mobility,qtproject\/qt-mobility,enthought\/qt-mobility,enthought\/qt-mobility,kaltsi\/qt-mobility,KDE\/android-qt-mobility,tmcguire\/qt-mobility,tmcguire\/qt-mobility,enthought\/qt-mobility,tmcguire\/qt-mobility,kaltsi\/qt-mobility,enthought\/qt-mobility","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bearer\/qnetworkmanagerservice_p.h\n+++ src\/bearer\/qnetworkmanagerservice_p.h\n@@ -70,6 +70,7 @@\n #include <QMap>\n #include \"qnmdbushelper_p.h\"\n \n+#ifndef NETWORK_MANAGER_H\n \/*\n * Types of NetworkManager devices\n *\/\n@@ -122,6 +123,7 @@\n \n #define NM_802_11_AP_FLAGS_NONE\t\t\t\t0x00000000\n #define NM_802_11_AP_FLAGS_PRIVACY\t\t\t0x00000001\n+#endif\n \n QTM_BEGIN_NAMESPACE\n typedef QMap< QString, QMap<QString,QVariant> > QNmSettingsMap;\n"} {"commit":"d26a56af8ef82f122fccc90b1c337897e9f554b2","subject":"revert","message":"revert\n","repos":"swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src,LinkedDestiny\/swoole-src,LinkedDestiny\/swoole-src,swoole\/swoole-src","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/network\/ReactorProcess.c\n+++ src\/network\/ReactorProcess.c\n@@ -138,7 +138,6 @@\n {\n swProcessPool_add_worker(&serv->gs->event_workers, &serv->gs->task_workers.workers[i]);\n }\n- serv->gs->task_workers.map = NULL;\n }\n \n \/**\n"} {"commit":"277adac1a501ac573632dce49d1ab8dec6b6fbe8","subject":"minor refactor : more accurate variable scope","message":"minor refactor : more accurate variable scope\n","repos":"Cyan4973\/FiniteStateEntropy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/fse_decompress.c\n+++ lib\/fse_decompress.c\n@@ -111,18 +111,13 @@\n size_t FSE_buildDTable(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog)\n {\n FSE_DTableHeader DTableH;\n- void* const tdPtr = dt+1; \/* because dt is unsigned, 32-bits aligned on 32-bits *\/\n+ void* const tdPtr = dt+1; \/* because *dt is unsigned, 32-bits aligned on 32-bits *\/\n FSE_DECODE_TYPE* const tableDecode = (FSE_DECODE_TYPE*) (tdPtr);\n- const U32 tableSize = 1 << tableLog;\n- const U32 tableMask = tableSize-1;\n- const U32 step = FSE_TABLESTEP(tableSize);\n U16 symbolNext[FSE_MAX_SYMBOL_VALUE+1];\n \n U32 const maxSV1 = maxSymbolValue + 1;\n+ U32 const tableSize = 1 << tableLog;\n U32 highThreshold = tableSize-1;\n- S16 const largeLimit= (S16)(1 << (tableLog-1));\n- U32 noLarge = 1;\n- U32 s;\n \n \/* Sanity Checks *\/\n if (maxSymbolValue > FSE_MAX_SYMBOL_VALUE) return ERROR(maxSymbolValue_tooLarge);\n@@ -130,17 +125,23 @@\n \n \/* Init, lay down lowprob symbols *\/\n DTableH.tableLog = (U16)tableLog;\n- for (s=0; s<maxSV1; s++) {\n- if (normalizedCounter[s]==-1) {\n- tableDecode[highThreshold--].symbol = (FSE_FUNCTION_TYPE)s;\n- symbolNext[s] = 1;\n- } else {\n- if (normalizedCounter[s] >= largeLimit) noLarge=0;\n- symbolNext[s] = normalizedCounter[s];\n- } }\n+ DTableH.fastMode = 1;\n+ { S16 const largeLimit= (S16)(1 << (tableLog-1));\n+ U32 s;\n+ for (s=0; s<maxSV1; s++) {\n+ if (normalizedCounter[s]==-1) {\n+ tableDecode[highThreshold--].symbol = (FSE_FUNCTION_TYPE)s;\n+ symbolNext[s] = 1;\n+ } else {\n+ if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;\n+ symbolNext[s] = normalizedCounter[s];\n+ } } }\n+ memcpy(dt, &DTableH, sizeof(DTableH));\n \n \/* Spread symbols *\/\n- { U32 position = 0;\n+ { U32 const tableMask = tableSize-1;\n+ U32 const step = FSE_TABLESTEP(tableSize);\n+ U32 s, position = 0;\n for (s=0; s<maxSV1; s++) {\n int i;\n for (i=0; i<normalizedCounter[s]; i++) {\n@@ -162,8 +163,6 @@\n tableDecode[u].newState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);\n } }\n \n- DTableH.fastMode = (U16)noLarge;\n- memcpy(dt, &DTableH, sizeof(DTableH));\n return 0;\n }\n \n"} {"commit":"bc1647a6dcd4d07f316adbbbcac5f59f72809a1c","subject":"Use vsnprintf instead of vsprintf in Portability.h (#39366)","message":"Use vsnprintf instead of vsprintf in Portability.h (#39366)\n\n","repos":"xwu\/swift,ahoppen\/swift,xwu\/swift,ahoppen\/swift,glessard\/swift,xwu\/swift,glessard\/swift,xwu\/swift,roambotics\/swift,rudkx\/swift,benlangmuir\/swift,rudkx\/swift,glessard\/swift,ahoppen\/swift,rudkx\/swift,gregomni\/swift,benlangmuir\/swift,JGiola\/swift,rudkx\/swift,roambotics\/swift,gregomni\/swift,rudkx\/swift,ahoppen\/swift,roambotics\/swift,atrick\/swift,atrick\/swift,apple\/swift,glessard\/swift,JGiola\/swift,rudkx\/swift,glessard\/swift,atrick\/swift,xwu\/swift,JGiola\/swift,JGiola\/swift,ahoppen\/swift,JGiola\/swift,benlangmuir\/swift,xwu\/swift,JGiola\/swift,gregomni\/swift,benlangmuir\/swift,roambotics\/swift,benlangmuir\/swift,apple\/swift,atrick\/swift,roambotics\/swift,xwu\/swift,gregomni\/swift,apple\/swift,atrick\/swift,apple\/swift,gregomni\/swift,atrick\/swift,benlangmuir\/swift,ahoppen\/swift,roambotics\/swift,gregomni\/swift,glessard\/swift,apple\/swift,apple\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/Runtime\/Portability.h\n+++ include\/swift\/Runtime\/Portability.h\n@@ -46,7 +46,7 @@\n char *buffer = reinterpret_cast<char *>(malloc(len + 1));\n if (!buffer)\n return -1;\n- int result = vsprintf(buffer, fmt, args);\n+ int result = vsnprintf(buffer, len + 1, fmt, args);\n if (result < 0) {\n free(buffer);\n return -1;\n"} {"commit":"b9440d8287841aee2687812965f4b836eec03efa","subject":"Check redis command replies","message":"Check redis command replies\n","repos":"mythagel\/redis_vtbl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/redis_vtbl.c\n+++ src\/redis_vtbl.c\n@@ -573,12 +573,33 @@\n \n list_init(&replies, freeReplyObject);\n redis_n_replies(vtab->c, 4, &replies);\n- \/* todo check replies *\/\n+ \n+ err = redis_check_expected(&replies, \n+ \/* MULTI *\/ redis_status_reply_p,\n+ \/* HMSET *\/ redis_status_queued_reply_p,\n+ \/* ZADD *\/ redis_status_queued_reply_p,\n+ \/* EXEC *\/ redis_bulk_reply_p);\n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ \n+ } else {\n+ redisReply *exec_reply;\n+ exec_reply = list_get(&replies, 3);\n+ err = redis_check_expected_bulk(exec_reply,\n+ \/* HMSET *\/ redis_status_reply_p,\n+ \/* ZADD *\/ redis_integer_reply_p);\n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ }\n+ }\n list_free(&replies);\n \n return SQLITE_OK;\n }\n static int redis_vtbl_exec_update(redis_vtbl_vtab *vtab, int argc, sqlite3_value **argv) {\n+ int err;\n sqlite3_int64 row_id;\n list_t args;\n char *str;\n@@ -618,12 +639,37 @@\n \n list_init(&replies, freeReplyObject);\n redis_n_replies(vtab->c, 4, &replies);\n- \/* todo check replies *\/\n+ \n+ err = redis_check_expected(&replies, \n+ \/* WATCH *\/ redis_status_reply_p,\n+ \/* MULTI *\/ redis_status_reply_p,\n+ \/* HMSET *\/ redis_status_queued_reply_p,\n+ \/* EXEC *\/ redis_bulk_reply_p);\n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ \n+ } else {\n+ redisReply *exec_reply;\n+ exec_reply = list_get(&replies, 3);\n+ err = redis_check_expected_bulk(exec_reply,\n+ \/* HMSET *\/ redis_status_reply_p);\n+ \n+ \/* null response to EXEC means that the transaction was aborted. *\/\n+ if(exec_reply->elements == 0)\n+ err = 1;\n+ \n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ }\n+ }\n list_free(&replies);\n \n return SQLITE_OK;\n }\n static int redis_vtbl_exec_delete(redis_vtbl_vtab *vtab, sqlite3_int64 row_id) {\n+ int err;\n list_t replies;\n \n redisAppendCommand(vtab->c, \"MULTI\");\n@@ -632,9 +678,29 @@\n \/* todo *\/ \/* erase from indexes *\/\n redisAppendCommand(vtab->c, \"EXEC\");\n \n- list_init(&replies, freeReplyObject); \n+ list_init(&replies, freeReplyObject);\n redis_n_replies(vtab->c, 4, &replies);\n- \/* todo check replies *\/\n+ \n+ err = redis_check_expected(&replies, \n+ \/* MULTI *\/ redis_status_reply_p,\n+ \/* DEL *\/ redis_status_queued_reply_p,\n+ \/* ZREM *\/ redis_status_queued_reply_p,\n+ \/* EXEC *\/ redis_bulk_reply_p);\n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ \n+ } else {\n+ redisReply *exec_reply;\n+ exec_reply = list_get(&replies, 3);\n+ err = redis_check_expected_bulk(exec_reply,\n+ \/* DEL *\/ redis_integer_reply_p,\n+ \/* ZREM *\/ redis_integer_reply_p);\n+ if(err) {\n+ list_free(&replies);\n+ return SQLITE_ERROR;\n+ }\n+ }\n list_free(&replies);\n \n return SQLITE_OK;\n"} {"commit":"681e775893cc85c5f0c7dd48e30494323fff1580","subject":"[asan] one more change missed at r171198","message":"[asan] one more change missed at r171198\n\ngit-svn-id: c199f293c43da69278bea8e88f92242bf3aa95f7@171199 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt,llvm-mirror\/compiler-rt","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/sanitizer\/asan_interface.h\n+++ include\/sanitizer\/asan_interface.h\n@@ -117,6 +117,11 @@\n bool __asan_address_is_poisoned(void const volatile *addr)\n SANITIZER_INTERFACE_ATTRIBUTE;\n \n+ \/\/ If at least on byte in [beg, beg+size) is poisoned, return the address\n+ \/\/ of the first such byte. Otherwise return 0.\n+ uptr __asan_region_is_poisoned(uptr beg, uptr size)\n+ SANITIZER_INTERFACE_ATTRIBUTE;\n+\n \/\/ This is an internal function that is called to report an error.\n \/\/ However it is still a part of the interface because users may want to\n \/\/ set a breakpoint on this function in a debugger.\n"} {"commit":"2e9117822b874d1fcebdad25c5287da53abfec24","subject":"Workaround for DNSA<bool> bug","message":"Workaround for DNSA<bool> bug\n\nFor some reason DynamicSparseNumberArray isn't playing nicely with\noperator||; the compiler thinks that the question of whether to use\nDNSA||DNSA or bool||bool is ambiguous. In this case either would\nwork, so we can disambiguate by explicitly casting to bool.\n","repos":"balborian\/libmesh,jwpeterson\/libmesh,giorgiobornia\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,jwpeterson\/libmesh,90jrong\/libmesh,hrittich\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,balborian\/libmesh,pbauman\/libmesh,jwpeterson\/libmesh,balborian\/libmesh,dschwen\/libmesh,hrittich\/libmesh,roystgnr\/libmesh,hrittich\/libmesh,capitalaslash\/libmesh,pbauman\/libmesh,giorgiobornia\/libmesh,jwpeterson\/libmesh,dschwen\/libmesh,hrittich\/libmesh,dschwen\/libmesh,roystgnr\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,capitalaslash\/libmesh,roystgnr\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,jwpeterson\/libmesh,roystgnr\/libmesh,roystgnr\/libmesh,libMesh\/libmesh,libMesh\/libmesh,90jrong\/libmesh,pbauman\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,roystgnr\/libmesh,capitalaslash\/libmesh,giorgiobornia\/libmesh,capitalaslash\/libmesh,90jrong\/libmesh,balborian\/libmesh,capitalaslash\/libmesh,dschwen\/libmesh,balborian\/libmesh,pbauman\/libmesh,hrittich\/libmesh,BalticPinguin\/libmesh,pbauman\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,90jrong\/libmesh,capitalaslash\/libmesh,capitalaslash\/libmesh,hrittich\/libmesh,jwpeterson\/libmesh,balborian\/libmesh,pbauman\/libmesh,pbauman\/libmesh,BalticPinguin\/libmesh,giorgiobornia\/libmesh,dschwen\/libmesh,giorgiobornia\/libmesh,balborian\/libmesh,jwpeterson\/libmesh,BalticPinguin\/libmesh,libMesh\/libmesh,giorgiobornia\/libmesh,hrittich\/libmesh,BalticPinguin\/libmesh,BalticPinguin\/libmesh,hrittich\/libmesh,libMesh\/libmesh,BalticPinguin\/libmesh,90jrong\/libmesh,90jrong\/libmesh,hrittich\/libmesh,balborian\/libmesh,libMesh\/libmesh,dschwen\/libmesh,libMesh\/libmesh,pbauman\/libmesh,dschwen\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/systems\/generic_projector.h\n+++ include\/systems\/generic_projector.h\n@@ -1135,8 +1135,8 @@\n for (unsigned int i=0; i != free_dofs; ++i)\n {\n FValue & ui = Ue(side_dofs[free_dof[i]]);\n- libmesh_assert(std::abs(ui) < TOLERANCE ||\n- std::abs(ui - Uedge(i)) < TOLERANCE);\n+ libmesh_assert(bool(std::abs(ui) < TOLERANCE) ||\n+ bool(std::abs(ui - Uedge(i)) < TOLERANCE));\n ui = Uedge(i);\n dof_is_fixed[side_dofs[free_dof[i]]] = true;\n }\n@@ -1309,8 +1309,8 @@\n for (unsigned int i=0; i != free_dofs; ++i)\n {\n FValue & ui = Ue(side_dofs[free_dof[i]]);\n- libmesh_assert(std::abs(ui) < TOLERANCE ||\n- std::abs(ui - Uside(i)) < TOLERANCE);\n+ libmesh_assert(bool(std::abs(ui) < TOLERANCE) ||\n+ bool(std::abs(ui - Uside(i)) < TOLERANCE));\n ui = Uside(i);\n dof_is_fixed[side_dofs[free_dof[i]]] = true;\n }\n@@ -1443,8 +1443,8 @@\n for (unsigned int i=0; i != free_dofs; ++i)\n {\n FValue & ui = Ue(free_dof[i]);\n- libmesh_assert(std::abs(ui) < TOLERANCE ||\n- std::abs(ui - Uint(i)) < TOLERANCE);\n+ libmesh_assert(bool(std::abs(ui) < TOLERANCE) ||\n+ bool(std::abs(ui - Uint(i)) < TOLERANCE));\n ui = Uint(i);\n dof_is_fixed[free_dof[i]] = true;\n }\n"} {"commit":"c0b5b94cfce501c9c5ada93bb614b64cc195b771","subject":"Move SelectValueInst to where the rest of the Select*Inst instructions are, not next to the switch instructions. NFC.","message":"Move SelectValueInst to where the rest of the Select*Inst instructions are, not next to the switch instructions. NFC.\n\nSwift SVN r23934\n","repos":"JaSpa\/swift,felix91gr\/swift,slavapestov\/swift,uasys\/swift,jopamer\/swift,johnno1962d\/swift,airspeedswift\/swift,uasys\/swift,austinzheng\/swift,MukeshKumarS\/Swift,therealbnut\/swift,sschiau\/swift,rudkx\/swift,sschiau\/swift,natecook1000\/swift,ahoppen\/swift,jmgc\/swift,roambotics\/swift,lorentey\/swift,tkremenek\/swift,SwiftAndroid\/swift,tjw\/swift,manavgabhawala\/swift,kperryua\/swift,alblue\/swift,djwbrown\/swift,swiftix\/swift,khizkhiz\/swift,amraboelela\/swift,JaSpa\/swift,zisko\/swift,huonw\/swift,shahmishal\/swift,jmgc\/swift,zisko\/swift,apple\/swift,IngmarStein\/swift,practicalswift\/swift,glessard\/swift,djwbrown\/swift,tardieu\/swift,johnno1962d\/swift,modocache\/swift,IngmarStein\/swift,JGiola\/swift,swiftix\/swift.old,ben-ng\/swift,gregomni\/swift,kstaring\/swift,austinzheng\/swift,sdulal\/swift,tinysun212\/swift-windows,arvedviehweger\/swift,SwiftAndroid\/swift,devincoughlin\/swift,CodaFi\/swift,atrick\/swift,khizkhiz\/swift,russbishop\/swift,tjw\/swift,emilstahl\/swift,hughbe\/swift,brentdax\/swift,rudkx\/swift,gribozavr\/swift,return\/swift,practicalswift\/swift,hooman\/swift,tkremenek\/swift,aschwaighofer\/swift,manavgabhawala\/swift,jckarter\/swift,practicalswift\/swift,gregomni\/swift,devincoughlin\/swift,allevato\/swift,deyton\/swift,ken0nek\/swift,airspeedswift\/swift,gribozavr\/swift,huonw\/swift,stephentyrone\/swift,OscarSwanros\/swift,KrishMunot\/swift,ken0nek\/swift,sdulal\/swift,aschwaighofer\/swift,jmgc\/swift,practicalswift\/swift,bitjammer\/swift,cbrentharris\/swift,tinysun212\/swift-windows,shajrawi\/swift,CodaFi\/swift,benlangmuir\/swift,rudkx\/swift,gottesmm\/swift,ahoppen\/swift,cbrentharris\/swift,harlanhaskins\/swift,khizkhiz\/swift,aschwaighofer\/swift,emilstahl\/swift,codestergit\/swift,JaSpa\/swift,calebd\/swift,Ivacker\/swift,frootloops\/swift,swiftix\/swift.old,jmgc\/swift,ahoppen\/swift,johnno1962d\/swift,gmilos\/swift,glessard\/swift,harlanhaskins\/swift,danielmartin\/swift,dduan\/swift,devincoughlin\/swift,gottesmm\/swift,swiftix\/swift.old,amraboelela\/swift,gregomni\/swift,nathawes\/swift,therealbnut\/swift,harlanhaskins\/swift,milseman\/swift,xedin\/swift,manavgabhawala\/swift,gottesmm\/swift,milseman\/swift,MukeshKumarS\/Swift,IngmarStein\/swift,return\/swift,shahmishal\/swift,lorentey\/swift,benlangmuir\/swift,airspeedswift\/swift,return\/swift,gottesmm\/swift,shahmishal\/swift,hughbe\/swift,khizkhiz\/swift,amraboelela\/swift,devincoughlin\/swift,gottesmm\/swift,ahoppen\/swift,mightydeveloper\/swift,shajrawi\/swift,kentya6\/swift,lorentey\/swift,hughbe\/swift,xwu\/swift,MukeshKumarS\/Swift,sdulal\/swift,MukeshKumarS\/Swift,djwbrown\/swift,dduan\/swift,cbrentharris\/swift,ben-ng\/swift,airspeedswift\/swift,khizkhiz\/swift,parkera\/swift,tinysun212\/swift-windows,glessard\/swift,swiftix\/swift.old,ben-ng\/swift,SwiftAndroid\/swift,stephentyrone\/swift,danielmartin\/swift,uasys\/swift,stephentyrone\/swift,jtbandes\/swift,atrick\/swift,ben-ng\/swift,atrick\/swift,gribozavr\/swift,hooman\/swift,KrishMunot\/swift,parkera\/swift,gmilos\/swift,devincoughlin\/swift,amraboelela\/swift,swiftix\/swift.old,LeoShimonaka\/swift,hughbe\/swift,sdulal\/swift,modocache\/swift,jopamer\/swift,xedin\/swift,adrfer\/swift,allevato\/swift,MukeshKumarS\/Swift,codestergit\/swift,atrick\/swift,uasys\/swift,Ivacker\/swift,slavapestov\/swift,therealbnut\/swift,roambotics\/swift,alblue\/swift,harlanhaskins\/swift,kusl\/swift,practicalswift\/swift,milseman\/swift,adrfer\/swift,ben-ng\/swift,shajrawi\/swift,gribozavr\/swift,adrfer\/swift,xwu\/swift,modocache\/swift,tardieu\/swift,felix91gr\/swift,ken0nek\/swift,lorentey\/swift,allevato\/swift,roambotics\/swift,kperryua\/swift,khizkhiz\/swift,hughbe\/swift,parkera\/swift,swiftix\/swift.old,cbrentharris\/swift,tardieu\/swift,mightydeveloper\/swift,hughbe\/swift,gribozavr\/swift,shajrawi\/swift,tjw\/swift,jopamer\/swift,hughbe\/swift,jopamer\/swift,jckarter\/swift,danielmartin\/swift,felix91gr\/swift,lorentey\/swift,shahmishal\/swift,emilstahl\/swift,SwiftAndroid\/swift,Jnosh\/swift,xedin\/swift,calebd\/swift,manavgabhawala\/swift,natecook1000\/swift,swiftix\/swift.old,amraboelela\/swift,kstaring\/swift,jtbandes\/swift,shajrawi\/swift,stephentyrone\/swift,JaSpa\/swift,arvedviehweger\/swift,sdulal\/swift,mightydeveloper\/swift,dreamsxin\/swift,austinzheng\/swift,emilstahl\/swift,huonw\/swift,jckarter\/swift,natecook1000\/swift,JGiola\/swift,shajrawi\/swift,jtbandes\/swift,bitjammer\/swift,amraboelela\/swift,jckarter\/swift,codestergit\/swift,SwiftAndroid\/swift,gregomni\/swift,KrishMunot\/swift,ken0nek\/swift,Jnosh\/swift,brentdax\/swift,russbishop\/swift,jopamer\/swift,cbrentharris\/swift,karwa\/swift,dduan\/swift,return\/swift,CodaFi\/swift,danielmartin\/swift,sdulal\/swift,gottesmm\/swift,practicalswift\/swift,natecook1000\/swift,cbrentharris\/swift,deyton\/swift,frootloops\/swift,xedin\/swift,shahmishal\/swift,kusl\/swift,tkremenek\/swift,IngmarStein\/swift,apple\/swift,KrishMunot\/swift,allevato\/swift,kusl\/swift,deyton\/swift,austinzheng\/swift,shahmishal\/swift,Ivacker\/swift,nathawes\/swift,jmgc\/swift,harlanhaskins\/swift,uasys\/swift,nathawes\/swift,mightydeveloper\/swift,hooman\/swift,russbishop\/swift,nathawes\/swift,gregomni\/swift,adrfer\/swift,milseman\/swift,adrfer\/swift,kusl\/swift,dreamsxin\/swift,lorentey\/swift,MukeshKumarS\/Swift,tkremenek\/swift,slavapestov\/swift,rudkx\/swift,sschiau\/swift,rudkx\/swift,therealbnut\/swift,felix91gr\/swift,atrick\/swift,kperryua\/swift,deyton\/swift,LeoShimonaka\/swift,tinysun212\/swift-windows,JGiola\/swift,calebd\/swift,frootloops\/swift,bitjammer\/swift,tardieu\/swift,return\/swift,JaSpa\/swift,adrfer\/swift,modocache\/swift,tjw\/swift,jckarter\/swift,return\/swift,kusl\/swift,khizkhiz\/swift,mightydeveloper\/swift,JGiola\/swift,nathawes\/swift,roambotics\/swift,manavgabhawala\/swift,aschwaighofer\/swift,shajrawi\/swift,kstaring\/swift,xedin\/swift,bitjammer\/swift,arvedviehweger\/swift,xedin\/swift,tinysun212\/swift-windows,gmilos\/swift,jckarter\/swift,dduan\/swift,tkremenek\/swift,kentya6\/swift,xwu\/swift,frootloops\/swift,xwu\/swift,adrfer\/swift,felix91gr\/swift,kperryua\/swift,brentdax\/swift,brentdax\/swift,kperryua\/swift,emilstahl\/swift,airspeedswift\/swift,johnno1962d\/swift,jtbandes\/swift,gribozavr\/swift,milseman\/swift,LeoShimonaka\/swift,karwa\/swift,alblue\/swift,lorentey\/swift,natecook1000\/swift,bitjammer\/swift,sschiau\/swift,CodaFi\/swift,sschiau\/swift,swiftix\/swift,jopamer\/swift,SwiftAndroid\/swift,arvedviehweger\/swift,airspeedswift\/swift,tardieu\/swift,swiftix\/swift,gottesmm\/swift,karwa\/swift,hooman\/swift,frootloops\/swift,shahmishal\/swift,apple\/swift,stephentyrone\/swift,practicalswift\/swift,calebd\/swift,hooman\/swift,stephentyrone\/swift,benlangmuir\/swift,devincoughlin\/swift,cbrentharris\/swift,emilstahl\/swift,LeoShimonaka\/swift,apple\/swift,gribozavr\/swift,tkremenek\/swift,huonw\/swift,tardieu\/swift,calebd\/swift,tinysun212\/swift-windows,apple\/swift,manavgabhawala\/swift,Ivacker\/swift,kperryua\/swift,kusl\/swift,tinysun212\/swift-windows,therealbnut\/swift,karwa\/swift,therealbnut\/swift,ahoppen\/swift,SwiftAndroid\/swift,austinzheng\/swift,aschwaighofer\/swift,deyton\/swift,cbrentharris\/swift,natecook1000\/swift,alblue\/swift,austinzheng\/swift,Jnosh\/swift,glessard\/swift,felix91gr\/swift,swiftix\/swift.old,xedin\/swift,glessard\/swift,slavapestov\/swift,zisko\/swift,zisko\/swift,mightydeveloper\/swift,swiftix\/swift,gmilos\/swift,LeoShimonaka\/swift,karwa\/swift,rudkx\/swift,aschwaighofer\/swift,codestergit\/swift,OscarSwanros\/swift,benlangmuir\/swift,djwbrown\/swift,sschiau\/swift,Jnosh\/swift,frootloops\/swift,frootloops\/swift,ken0nek\/swift,nathawes\/swift,gmilos\/swift,jtbandes\/swift,stephentyrone\/swift,djwbrown\/swift,OscarSwanros\/swift,Ivacker\/swift,uasys\/swift,brentdax\/swift,kstaring\/swift,modocache\/swift,kentya6\/swift,JGiola\/swift,CodaFi\/swift,alblue\/swift,russbishop\/swift,jckarter\/swift,Jnosh\/swift,MukeshKumarS\/Swift,emilstahl\/swift,IngmarStein\/swift,tjw\/swift,harlanhaskins\/swift,swiftix\/swift,jtbandes\/swift,dduan\/swift,devincoughlin\/swift,kusl\/swift,deyton\/swift,roambotics\/swift,therealbnut\/swift,slavapestov\/swift,austinzheng\/swift,Jnosh\/swift,xedin\/swift,johnno1962d\/swift,aschwaighofer\/swift,kstaring\/swift,parkera\/swift,manavgabhawala\/swift,ben-ng\/swift,JaSpa\/swift,KrishMunot\/swift,sdulal\/swift,IngmarStein\/swift,kperryua\/swift,brentdax\/swift,codestergit\/swift,tjw\/swift,lorentey\/swift,tardieu\/swift,amraboelela\/swift,benlangmuir\/swift,huonw\/swift,johnno1962d\/swift,sschiau\/swift,allevato\/swift,dduan\/swift,LeoShimonaka\/swift,apple\/swift,jtbandes\/swift,mightydeveloper\/swift,codestergit\/swift,modocache\/swift,danielmartin\/swift,zisko\/swift,russbishop\/swift,karwa\/swift,OscarSwanros\/swift,codestergit\/swift,hooman\/swift,KrishMunot\/swift,Ivacker\/swift,airspeedswift\/swift,kentya6\/swift,ben-ng\/swift,danielmartin\/swift,tjw\/swift,ken0nek\/swift,kentya6\/swift,tkremenek\/swift,gribozavr\/swift,milseman\/swift,shahmishal\/swift,russbishop\/swift,karwa\/swift,kstaring\/swift,deyton\/swift,parkera\/swift,xwu\/swift,roambotics\/swift,bitjammer\/swift,milseman\/swift,mightydeveloper\/swift,swiftix\/swift,nathawes\/swift,brentdax\/swift,slavapestov\/swift,sdulal\/swift,devincoughlin\/swift,gmilos\/swift,jopamer\/swift,calebd\/swift,kentya6\/swift,practicalswift\/swift,kentya6\/swift,kentya6\/swift,huonw\/swift,natecook1000\/swift,jmgc\/swift,return\/swift,JaSpa\/swift,emilstahl\/swift,arvedviehweger\/swift,JGiola\/swift,huonw\/swift,alblue\/swift,kusl\/swift,jmgc\/swift,KrishMunot\/swift,Ivacker\/swift,ken0nek\/swift,harlanhaskins\/swift,danielmartin\/swift,djwbrown\/swift,Jnosh\/swift,arvedviehweger\/swift,benlangmuir\/swift,atrick\/swift,arvedviehweger\/swift,OscarSwanros\/swift,LeoShimonaka\/swift,parkera\/swift,gmilos\/swift,zisko\/swift,kstaring\/swift,Ivacker\/swift,allevato\/swift,hooman\/swift,sschiau\/swift,CodaFi\/swift,felix91gr\/swift,slavapestov\/swift,ahoppen\/swift,parkera\/swift,karwa\/swift,johnno1962d\/swift,bitjammer\/swift,calebd\/swift,dduan\/swift,glessard\/swift,allevato\/swift,uasys\/swift,LeoShimonaka\/swift,xwu\/swift,parkera\/swift,CodaFi\/swift,OscarSwanros\/swift,russbishop\/swift,djwbrown\/swift,modocache\/swift,swiftix\/swift,alblue\/swift,zisko\/swift,xwu\/swift,shajrawi\/swift,IngmarStein\/swift,OscarSwanros\/swift,gregomni\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/swift\/SIL\/SILInstruction.h\n+++ include\/swift\/SIL\/SILInstruction.h\n@@ -2048,6 +2048,42 @@\n }\n };\n \n+\/\/\/ Select on a value of a builtin integer type.\n+class SelectValueInst : public SelectInstBase<SelectValueInst, SILValue> {\n+ SelectValueInst(SILLocation Loc, SILValue Operand,\n+ SILType Type,\n+ SILValue DefaultResult,\n+ ArrayRef<SILValue> CaseValuesAndResults);\n+\n+ OperandValueArrayRef getCaseBuf() const {\n+ return Operands.getDynamicValuesAsArray();\n+ }\n+\n+public:\n+ ~SelectValueInst();\n+\n+ static SelectValueInst *\n+ create(SILLocation Loc, SILValue Operand, SILType Type,\n+ SILValue DefaultValue,\n+ ArrayRef<std::pair<SILValue, SILValue>> CaseValues,\n+ SILFunction &F);\n+\n+ std::pair<SILValue, SILValue>\n+ getCase(unsigned i) const {\n+ assert(i < NumCases && \"case out of bounds\");\n+ return {getCaseBuf()[i*2], getCaseBuf()[i*2+1]};\n+ }\n+\n+ SILValue getDefaultResult() const {\n+ assert(HasDefault && \"doesn't have a default\");\n+ return getCaseBuf()[NumCases*2];\n+ }\n+\n+ static bool classof(const ValueBase *V) {\n+ return V->getKind() == ValueKind::SelectValueInst;\n+ }\n+};\n+\n \/\/\/ MetatypeInst - Represents the production of an instance of a given metatype\n \/\/\/ named statically.\n class MetatypeInst : public SILInstruction {\n@@ -3127,42 +3163,6 @@\n }\n };\n \n-\/\/\/ Select on a value of a builtin integer type.\n-class SelectValueInst : public SelectInstBase<SelectValueInst, SILValue> {\n- SelectValueInst(SILLocation Loc, SILValue Operand,\n- SILType Type,\n- SILValue DefaultResult,\n- ArrayRef<SILValue> CaseValuesAndResults);\n-\n- OperandValueArrayRef getCaseBuf() const {\n- return Operands.getDynamicValuesAsArray();\n- }\n-\n-public:\n- ~SelectValueInst();\n-\n- static SelectValueInst *\n- create(SILLocation Loc, SILValue Operand, SILType Type,\n- SILValue DefaultValue,\n- ArrayRef<std::pair<SILValue, SILValue>> CaseValues,\n- SILFunction &F);\n-\n- std::pair<SILValue, SILValue>\n- getCase(unsigned i) const {\n- assert(i < NumCases && \"case out of bounds\");\n- return {getCaseBuf()[i*2], getCaseBuf()[i*2+1]};\n- }\n-\n- SILValue getDefaultResult() const {\n- assert(HasDefault && \"doesn't have a default\");\n- return getCaseBuf()[NumCases*2];\n- }\n-\n- static bool classof(const ValueBase *V) {\n- return V->getKind() == ValueKind::SelectValueInst;\n- }\n-};\n-\n \/\/\/ A switch on a value of a builtin type.\n class SwitchValueInst : public TermInst {\n unsigned NumCases : 31;\n"} {"commit":"be0d17b7591ef323f257a87d98e18c6f218c2899","subject":"Suppress RapidJSON warning to allow gcc>=8 compilation (#9)","message":"Suppress RapidJSON warning to allow gcc>=8 compilation (#9)\n\n* Disable warning to work around RapidJSON issue\r\n\r\nDisable class-memaccess warning where RapidJSON is invoked in order to\r\navoid warning raised by gcc>7 which prevents compilation\r\n\r\n* Update ignored warning string\r\n\r\n* Move ignore to correct location\r\n\r\n* Move comment\r\n\r\n* Suppress change for gcc<8","repos":"triton-inference-server\/common,triton-inference-server\/common,triton-inference-server\/common","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/triton\/common\/triton_json.h\n+++ include\/triton\/common\/triton_json.h\n@@ -25,7 +25,15 @@\n \/\/ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n #pragma once\n \n+\/\/ Disable class-memaccess warning to facilitate compilation with gcc>7\n+\/\/ https:\/\/github.com\/Tencent\/rapidjson\/issues\/1700\n+#pragma GCC diagnostic push\n+#if defined(__GNUC__) && __GNUC__ >= 8\n+#pragma GCC diagnostic ignored \"-Wclass-memaccess\"\n+#endif\n #include <rapidjson\/document.h>\n+#pragma GCC diagnostic pop\n+\n #include <rapidjson\/error\/en.h>\n #include <rapidjson\/prettywriter.h>\n #include <rapidjson\/rapidjson.h>\n"} {"commit":"13d3edf1ad94f4a959afef01033506b967840d84","subject":"Reinstate torture_api -i option, as a no-op.","message":"Reinstate torture_api -i option, as a no-op.\n","repos":"aeg-aeg\/pcpfans,ryandoyle\/pcp_original,tjanez\/pcp,mbaldessari\/pcp,ryandoyle\/pcp_original,adfernandes\/pcp,wuliming\/pcp,prasincs\/pcp,adfernandes\/pcp,andyvand\/cygpcpfans,prasincs\/pcp,ryandoyle\/pcp_original,ryandoyle\/pcp_original,prasincs\/pcp,aeg-aeg\/pcpfans,wuliming\/pcp,tjanez\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,aeg-aeg\/pcpfans,andyvand\/cygpcpfans,adfernandes\/pcp,andyvand\/cygpcpfans,wuliming\/pcp,aeg-aeg\/pcpfans,mbaldessari\/pcp,edwardt\/pcp,edwardt\/pcp,mbaldessari\/pcp,wuliming\/pcp,ryandoyle\/pcp_original,prasincs\/pcp,adfernandes\/pcp,tjanez\/pcp,adfernandes\/pcp,ryandoyle\/pcp_original,andyvand\/cygpcpfans,edwardt\/pcp,edwardt\/pcp,tjanez\/pcp,wuliming\/pcp,adfernandes\/pcp,edwardt\/pcp,wuliming\/pcp,tjanez\/pcp,aeg-aeg\/pcpfans,wuliming\/pcp,mbaldessari\/pcp,andyvand\/cygpcpfans,aeg-aeg\/pcpfans,edwardt\/pcp,prasincs\/pcp,ryandoyle\/pcp_original,prasincs\/pcp,ryandoyle\/pcp_original,adfernandes\/pcp,andyvand\/cygpcpfans,aeg-aeg\/pcpfans,wuliming\/pcp,edwardt\/pcp,prasincs\/pcp,andyvand\/cygpcpfans,mbaldessari\/pcp,prasincs\/pcp,tjanez\/pcp,mbaldessari\/pcp,tjanez\/pcp,edwardt\/pcp,andyvand\/cygpcpfans,adfernandes\/pcp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src-oss\/torture_api.c\n+++ src-oss\/torture_api.c\n@@ -213,6 +213,9 @@\n \t }\n \t context_type = PM_CONTEXT_HOST;\n \t context_name = optarg;\n+\t break;\n+\n+\tcase 'i':\t\/* non-IRIX names (always true now) *\/\n \t break;\n \n \tcase 'L':\t\/* LOCAL context *\/\n"} {"commit":"6f38a389b3d6bd89cc471ca6474cdb00167c00f2","subject":"Added energy values to high precision","message":"Added energy values to high precision\n","repos":"votca\/tools,votca\/tools,votca\/tools,votca\/tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/votca\/tools\/unitconverter.h\n+++ include\/votca\/tools\/unitconverter.h\n@@ -127,12 +127,18 @@\n \/\/\/ All energies in terms of electron volts\n constexpr double getEnergyValue_(const EnergyUnit& enum_type) const noexcept {\n switch (enum_type) {\n+ case EnergyUnit::kilojoules_per_mole:\n+ return 96.4853074993;\n+ case EnergyUnit::joules_per_mole:\n+ return 96.4853074993E3;\n+ case EnergyUnit::kilocalories_per_mole:\n+ return 23.061;\n case EnergyUnit::kilocalories:\n return 2.613195131836172E22;\n case EnergyUnit::joules:\n- return 6.242E18;\n+ return 6.2415097E18;\n case EnergyUnit::hartrees:\n- return 27.2114;\n+ return 27.211368602;\n case EnergyUnit::electron_volts:\n return 1.0;\n }\n"} {"commit":"fbb25bc48c4cdc2f5a784271332fc012cfbcca6a","subject":"minor fixes","message":"minor fixes\n\n","repos":"freewebsys\/rfc5766-turn-server,freewebsys\/rfc5766-turn-server,freewebsys\/rfc5766-turn-server,freewebsys\/rfc5766-turn-server","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/apps\/relay\/netengine.c\n+++ src\/apps\/relay\/netengine.c\n@@ -42,8 +42,8 @@\n #define get_real_general_relay_servers_number() (turn_params.general_relay_servers_number > 1 ? turn_params.general_relay_servers_number : 1)\n #define get_real_udp_relay_servers_number() (turn_params.udp_relay_servers_number > 1 ? turn_params.udp_relay_servers_number : 1)\n \n-static struct relay_server **general_relay_servers = NULL;\n-static struct relay_server **udp_relay_servers = NULL;\n+static struct relay_server *general_relay_servers[(turnserver_id)-1];\n+static struct relay_server *udp_relay_servers[(turnserver_id)-1];\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \n@@ -894,7 +894,6 @@\n \n \t{\n \t\tif (!turn_params.no_udp || !turn_params.no_dtls) {\n-\t\t\tudp_relay_servers = (struct relay_server**) allocate_super_memory_engine(turn_params.listener.ioa_eng, sizeof(struct relay_server *)*get_real_udp_relay_servers_number());\n \n \t\t\tfor (i = 0; i < get_real_udp_relay_servers_number(); i++) {\n \n@@ -1422,8 +1421,6 @@\n {\n \tsize_t i = 0;\n \n-\tgeneral_relay_servers = (struct relay_server**)allocate_super_memory_engine(turn_params.listener.ioa_eng, sizeof(struct relay_server *)*get_real_general_relay_servers_number());\n-\n \tfor(i=0;i<get_real_general_relay_servers_number();i++) {\n \n \t\tif(turn_params.general_relay_servers_number == 0) {\n"} {"commit":"0cd1c3bb066f67ac21f1ce8730eaefc5541c1082","subject":"Make init.templatedir work","message":"Make init.templatedir work\n","repos":"mingyaaaa\/libgit2,sygool\/libgit2,jflesch\/libgit2-mariadb,magnus98\/TEST,kenprice\/libgit2,yosefhackmon\/libgit2,jflesch\/libgit2-mariadb,since2014\/libgit2,Tousiph\/Demo1,yosefhackmon\/libgit2,Snazz2001\/libgit2,Corillian\/libgit2,sim0629\/libgit2,stewid\/libgit2,mrksrm\/Mingijura,MrHacky\/libgit2,ardumont\/libgit2,yongthecoder\/libgit2,JIghtuse\/libgit2,jflesch\/libgit2-mariadb,sygool\/libgit2,leoyanggit\/libgit2,Corillian\/libgit2,since2014\/libgit2,linquize\/libgit2,leoyanggit\/libgit2,jflesch\/libgit2-mariadb,rcorre\/libgit2,leoyanggit\/libgit2,KTXSoftware\/libgit2,whoisj\/libgit2,mingyaaaa\/libgit2,chiayolin\/libgit2,iankronquist\/libgit2,sim0629\/libgit2,jeffhostetler\/public_libgit2,jeffhostetler\/public_libgit2,MrHacky\/libgit2,maxiaoqian\/libgit2,Tousiph\/Demo1,JIghtuse\/libgit2,mcanthony\/libgit2,iankronquist\/libgit2,claudelee\/libgit2,Tousiph\/Demo1,MrHacky\/libgit2,stewid\/libgit2,saurabhsuniljain\/libgit2,leoyanggit\/libgit2,whoisj\/libgit2,joshtriplett\/libgit2,chiayolin\/libgit2,chiayolin\/libgit2,nokiddin\/libgit2,oaastest\/libgit2,sygool\/libgit2,Aorjoa\/libgit2_maked_lib,rcorre\/libgit2,magnus98\/TEST,maxiaoqian\/libgit2,kenprice\/libgit2,ardumont\/libgit2,ardumont\/libgit2,mcanthony\/libgit2,saurabhsuniljain\/libgit2,sim0629\/libgit2,amyvmiwei\/libgit2,joshtriplett\/libgit2,JIghtuse\/libgit2,falqas\/libgit2,mhp\/libgit2,skabel\/manguse,swisspol\/DEMO-libgit2,Aorjoa\/libgit2_maked_lib,mrksrm\/Mingijura,iankronquist\/libgit2,skabel\/manguse,rcorre\/libgit2,mingyaaaa\/libgit2,spraints\/libgit2,spraints\/libgit2,Tousiph\/Demo1,whoisj\/libgit2,kissthink\/libgit2,whoisj\/libgit2,amyvmiwei\/libgit2,whoisj\/libgit2,dleehr\/libgit2,JIghtuse\/libgit2,since2014\/libgit2,nokiddin\/libgit2,oaastest\/libgit2,yongthecoder\/libgit2,jflesch\/libgit2-mariadb,sim0629\/libgit2,dleehr\/libgit2,mrksrm\/Mingijura,since2014\/libgit2,stewid\/libgit2,claudelee\/libgit2,Tousiph\/Demo1,ardumont\/libgit2,falqas\/libgit2,oaastest\/libgit2,mhp\/libgit2,joshtriplett\/libgit2,falqas\/libgit2,KTXSoftware\/libgit2,kissthink\/libgit2,amyvmiwei\/libgit2,raybrad\/libit2,maxiaoqian\/libgit2,linquize\/libgit2,Snazz2001\/libgit2,swisspol\/DEMO-libgit2,spraints\/libgit2,mhp\/libgit2,jflesch\/libgit2-mariadb,kenprice\/libgit2,t0xicCode\/libgit2,JIghtuse\/libgit2,Snazz2001\/libgit2,raybrad\/libit2,ardumont\/libgit2,joshtriplett\/libgit2,raybrad\/libit2,kissthink\/libgit2,claudelee\/libgit2,linquize\/libgit2,mrksrm\/Mingijura,t0xicCode\/libgit2,nokiddin\/libgit2,mcanthony\/libgit2,mcanthony\/libgit2,mcanthony\/libgit2,magnus98\/TEST,falqas\/libgit2,claudelee\/libgit2,raybrad\/libit2,magnus98\/TEST,Corillian\/libgit2,joshtriplett\/libgit2,stewid\/libgit2,claudelee\/libgit2,raybrad\/libit2,t0xicCode\/libgit2,falqas\/libgit2,yosefhackmon\/libgit2,dleehr\/libgit2,jeffhostetler\/public_libgit2,nokiddin\/libgit2,maxiaoqian\/libgit2,rcorre\/libgit2,yongthecoder\/libgit2,mcanthony\/libgit2,jeffhostetler\/public_libgit2,falqas\/libgit2,Aorjoa\/libgit2_maked_lib,Snazz2001\/libgit2,mhp\/libgit2,dleehr\/libgit2,dleehr\/libgit2,mhp\/libgit2,magnus98\/TEST,sim0629\/libgit2,spraints\/libgit2,sygool\/libgit2,oaastest\/libgit2,yosefhackmon\/libgit2,linquize\/libgit2,mrksrm\/Mingijura,iankronquist\/libgit2,leoyanggit\/libgit2,JIghtuse\/libgit2,mrksrm\/Mingijura,saurabhsuniljain\/libgit2,jeffhostetler\/public_libgit2,nokiddin\/libgit2,yongthecoder\/libgit2,magnus98\/TEST,KTXSoftware\/libgit2,mingyaaaa\/libgit2,sygool\/libgit2,swisspol\/DEMO-libgit2,sim0629\/libgit2,iankronquist\/libgit2,kenprice\/libgit2,t0xicCode\/libgit2,saurabhsuniljain\/libgit2,t0xicCode\/libgit2,linquize\/libgit2,saurabhsuniljain\/libgit2,yongthecoder\/libgit2,linquize\/libgit2,kissthink\/libgit2,swisspol\/DEMO-libgit2,since2014\/libgit2,amyvmiwei\/libgit2,joshtriplett\/libgit2,nokiddin\/libgit2,chiayolin\/libgit2,swisspol\/DEMO-libgit2,claudelee\/libgit2,skabel\/manguse,MrHacky\/libgit2,amyvmiwei\/libgit2,skabel\/manguse,kissthink\/libgit2,yongthecoder\/libgit2,MrHacky\/libgit2,rcorre\/libgit2,Aorjoa\/libgit2_maked_lib,whoisj\/libgit2,skabel\/manguse,t0xicCode\/libgit2,spraints\/libgit2,yosefhackmon\/libgit2,iankronquist\/libgit2,KTXSoftware\/libgit2,yosefhackmon\/libgit2,Aorjoa\/libgit2_maked_lib,jeffhostetler\/public_libgit2,oaastest\/libgit2,sygool\/libgit2,Corillian\/libgit2,maxiaoqian\/libgit2,mingyaaaa\/libgit2,oaastest\/libgit2,ardumont\/libgit2,KTXSoftware\/libgit2,KTXSoftware\/libgit2,leoyanggit\/libgit2,chiayolin\/libgit2,saurabhsuniljain\/libgit2,rcorre\/libgit2,Snazz2001\/libgit2,Corillian\/libgit2,kissthink\/libgit2,kenprice\/libgit2,kenprice\/libgit2,chiayolin\/libgit2,stewid\/libgit2,MrHacky\/libgit2,mingyaaaa\/libgit2,stewid\/libgit2,Corillian\/libgit2,Snazz2001\/libgit2,mhp\/libgit2,since2014\/libgit2,skabel\/manguse,amyvmiwei\/libgit2,dleehr\/libgit2,Tousiph\/Demo1,maxiaoqian\/libgit2,swisspol\/DEMO-libgit2,spraints\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/repository.c\n+++ src\/repository.c\n@@ -1132,44 +1132,39 @@\n \n \t\/* Copy external template if requested *\/\n \tif (external_tpl) {\n-\t\tgit_config *cfg;\n-\t\tconst char *tdir;\n+\t\tgit_config *cfg = NULL;\n+\t\tconst char *tdir = NULL;\n+\t\tbool default_template = false;\n \t\tgit_buf template_buf = GIT_BUF_INIT;\n-\n-\t\tgit_futils_find_template_dir(&template_buf);\n \n \t\tif (opts->template_path)\n \t\t\ttdir = opts->template_path;\n-\t\telse if ((error = git_config_open_default(&cfg)) < 0)\n-\t\t\treturn error;\n-\t\telse {\n+\t\telse if ((error = git_config_open_default(&cfg)) >= 0) {\n \t\t\terror = git_config_get_string(&tdir, cfg, \"init.templatedir\");\n-\n-\t\t\tgit_config_free(cfg);\n-\n-\t\t\tif (error && error != GIT_ENOTFOUND)\n-\t\t\t\treturn error;\n-\n \t\t\tgiterr_clear();\n+\t\t}\n+\n+\t\tif (!tdir) {\n+\t\t\tgit_futils_find_template_dir(&template_buf);\n \t\t\ttdir = template_buf.ptr;\n+\t\t\tdefault_template = true;\n \t\t}\n \n \t\terror = git_futils_cp_r(tdir, repo_dir,\n \t\t\tGIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_CHMOD_DIRS |\n \t\t\tGIT_CPDIR_SIMPLE_TO_MODE, dmode);\n \n+\t\tgit_buf_free(&template_buf);\n+\t\tgit_config_free(cfg);\n \t\tif (error < 0) {\n-\t\t\tif (strcmp(tdir, template_buf.ptr) != 0) {\n-\t\t\t\tgit_buf_free(&template_buf);\n+\t\t\tif (!default_template)\n \t\t\t\treturn error;\n-\t\t\t}\n \n \t\t\t\/* if template was default, ignore error and use internal *\/\n \t\t\tgiterr_clear();\n \t\t\texternal_tpl = false;\n \t\t\terror = 0;\n \t\t}\n-\t\tgit_buf_free(&template_buf);\n \t}\n \n \t\/* Copy internal template\n"} {"commit":"e5be0988b264f9751b283b3d0087acb0086fe54f","subject":"spacing","message":"spacing\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@8985 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- sliod\/slvr.c\n+++ sliod\/slvr.c\n@@ -37,17 +37,17 @@\n \tpsc_assert(s->slvr_flags & SLVR_PINNED);\n \n \t\/* SLVR_FAULTING implies that we're bringing this data buffer\n-\t * in from the filesystem. \n-\t * SLVR_CRCDIRTY means that DATARDY has been set and that \n+\t * in from the filesystem.\n+\t * SLVR_CRCDIRTY means that DATARDY has been set and that\n \t * a write dirtied the buffer and invalidated the crc.\n \t *\/\n-\tpsc_assert(s->slvr_flags & SLVR_FAULTING || \n+\tpsc_assert(s->slvr_flags & SLVR_FAULTING ||\n \t\t s->slvr_flags & SLVR_CRCDIRTY);\n-\t\n+\n \tif (s->slvr_flags & SLVR_FAULTING) {\n \t\tif (!s->slvr_pndgreads) {\n-\t\t\t\/* Small RMW workaround \n-\t\t\t *\/ \n+\t\t\t\/* Small RMW workaround\n+\t\t\t *\/\n \t\t\tpsc_assert(s->slvr_pndgwrts);\n \t\t\treturn(1);\n \t\t}\n@@ -55,23 +55,23 @@\n \t\tpsc_assert(!(s->slvr_flags & SLVR_DATARDY));\n \n \t\t\/* This thread holds faulting status so all others are\n-\t\t * waiting on us which means that exclusive access to \n+\t\t * waiting on us which means that exclusive access to\n \t\t * slvr contents is ours until we set SLVR_DATARDY.\n-\t\t *\/\t\t\n-\t\t\/\/ XXX for now assert that all blocks are being processed, \n+\t\t *\/\n+\t\t\/\/ XXX for now assert that all blocks are being processed,\n \t\t\/\/ otherwise there's no guarantee that the entire slvr\n \t\t\/\/ was read.\n \t\tpsc_assert(!vbitmap_nfree(s->slvr_slab->slb_inuse));\n \t\tpsc_assert(slvr_2_biodi_wire(s));\n-\t\t\n+\n \t\tif ((slvr_2_crcbits(s) & BMAP_SLVR_DATA) &&\n \t\t (slvr_2_crcbits(s) & BMAP_SLVR_CRC)) {\n-\t\t\t\n-\t\t\tpsc_crc_calc(&s->slvr_crc, slvr_2_buf(s, 0), \n+\n+\t\t\tpsc_crc_calc(&s->slvr_crc, slvr_2_buf(s, 0),\n \t\t\t\t SL_CRC_SIZE);\n \t\t\tif (s->slvr_crc != slvr_2_crc(s)) {\n \t\t\t\tDEBUG_SLVR(PLL_ERROR, s, \"crc failed want=%\"\n-\t\t\t\t\t PRIx64\" got=%\"PRIx64, \n+\t\t\t\t\t PRIx64\" got=%\"PRIx64,\n \t\t\t\t\t slvr_2_crc(s), s->slvr_crc);\n \t\t\t\treturn (-EINVAL);\n \t\t\t}\n@@ -80,22 +80,22 @@\n \n \t} else if (s->slvr_flags & SLVR_CRCDIRTY) {\n \t\tpsc_assert(s->slvr_flags & SLVR_CRCING);\n-\t\t\n+\n \t\tpsc_crc_calc(&s->slvr_crc, slvr_2_buf(s, 0), SL_CRC_SIZE);\n \n \t\tDEBUG_SLVR(PLL_TRACE, s, \"crc=%\"PRIx64, s->slvr_crc);\n \n \t\tSLVR_LOCK(s);\n- s->slvr_flags &= ~(SLVR_CRCING|SLVR_CRCDIRTY);\n+\t\ts->slvr_flags &= ~(SLVR_CRCING|SLVR_CRCDIRTY);\n \t\tif (slvr_2_biodi_wire(s)) {\n \t\t\tslvr_2_crc(s) = s->slvr_crc;\n \t\t\tslvr_2_crcbits(s) |= (BMAP_SLVR_DATA|BMAP_SLVR_CRC);\n \t\t}\n- SLVR_ULOCK(s);\n-\n-\t} else \n+\t\tSLVR_ULOCK(s);\n+\n+\t} else\n \t\tabort();\n-\t \n+\n \treturn (1);\n }\n \n@@ -104,14 +104,14 @@\n {\n \tstruct sl_buffer *slb;\n \n-\tpsc_assert(s->slvr_flags & SLVR_PINNED);\t\t \n+\tpsc_assert(s->slvr_flags & SLVR_PINNED);\n \tpsc_assert(s->slvr_flags & SLVR_GETSLAB);\n \tpsc_assert(!s->slvr_slab);\n-\t\n+\n \tslb = psc_pool_get(slBufsPool);\n \tsl_buffer_fresh_assertions(slb);\n \n-\tSLVR_LOCK(s);\t\n+\tSLVR_LOCK(s);\n \ts->slvr_slab = slb;\n \ts->slvr_flags &= ~SLVR_GETSLAB;\n \ts->slvr_flags |= SLVR_LRU;\n@@ -121,7 +121,7 @@\n \tif (!s->slvr_slab)\n \t\tabort();\n \t\/* Until the slab is added to the sliver, the sliver is private\n-\t * to the bmap's biod_slvrtree. \n+\t * to the bmap's biod_slvrtree.\n \t *\/\n \tlc_addtail(&lruSlvrs, s);\n \n@@ -139,20 +139,20 @@\n \n \tnblks = (size + SLASH_SLVR_BLKSZ-1) \/ SLASH_SLVR_BLKSZ;\n \n-\tpsc_assert(s->slvr_flags & SLVR_PINNED); \t\t \n- psc_assert(rw == SL_READ || rw == SL_WRITE);\n+\tpsc_assert(s->slvr_flags & SLVR_PINNED);\n+\tpsc_assert(rw == SL_READ || rw == SL_WRITE);\n \n \tif (rw == SL_READ) {\n \t\tpsc_assert(s->slvr_flags & SLVR_FAULTING);\n \t\trc = pread(slvr_2_fd(s), slvr_2_buf(s, blk), size,\n-\t\t\t slvr_2_fileoff(s, blk));\t\t\n+\t\t\t slvr_2_fileoff(s, blk));\n \t\tsave_errno = errno;\n \n \t\t\/* XXX this is a bit of a hack. Here we'll check crc's\n \t\t * only when nblks == an entire sliver. Only RMW will\n \t\t * have their checks bypassed. This should probably be\n \t\t * handled more cleanly, like checking for RMW and then\n-\t\t * grabbing the crc table, we use the 1MB buffer in \n+\t\t * grabbing the crc table, we use the 1MB buffer in\n \t\t * either case.\n \t\t *\/\n \n@@ -163,30 +163,30 @@\n \n \t\t\tcrc_rc = slvr_do_crc(s);\n \t\t\tif (crc_rc == -EINVAL) {\n-\t\t\t\tDEBUG_SLVR(PLL_ERROR, s, \n-\t\t\t\t\t \"bad crc blks=%d off=%\"PRIx64, \n+\t\t\t\tDEBUG_SLVR(PLL_ERROR, s,\n+\t\t\t\t\t \"bad crc blks=%d off=%\"PRIx64,\n \t\t\t\t\t nblks, slvr_2_fileoff(s, blk));\n \t\t\t\treturn (crc_rc);\n \t\t\t}\n \t\t}\n-\t\t\n+\n \t} else {\n \n-\t\t\/* Denote that this block(s) have been synced to the \n+\t\t\/* Denote that this block(s) have been synced to the\n \t\t * filesystem.\n \t\t * Should this check and set of the block bits be\n \t\t * done for read also? Probably not because the fs\n-\t\t * is only read once and that's protected by the \n-\t\t * FAULT bit. Also, we need to know which blocks \n+\t\t * is only read once and that's protected by the\n+\t\t * FAULT bit. Also, we need to know which blocks\n \t\t * to mark as dirty after an RPC.\n \t\t *\/\n \t\tSLVR_LOCK(s);\n \t\tfor (i = 0; i < nblks; i++) {\n-\t\t\t\/\/psc_assert(vbitmap_get(s->slvr_slab->slb_inuse, \n+\t\t\t\/\/psc_assert(vbitmap_get(s->slvr_slab->slb_inuse,\n \t\t\t\/\/\t blk + i));\n \t\t\tvbitmap_unset(s->slvr_slab->slb_inuse, blk + i);\n-\t\t}\t\t\n-\t\trc = pwrite(slvr_2_fd(s), slvr_2_buf(s, blk), size, \n+\t\t}\n+\t\trc = pwrite(slvr_2_fd(s), slvr_2_buf(s, blk), size,\n \t\t\t slvr_2_fileoff(s, blk));\n \t\tSLVR_ULOCK(s);\n \n@@ -195,18 +195,18 @@\n \n \tif (rc < 0)\n \t\tDEBUG_SLVR(PLL_ERROR, s, \"failed (rc=%zd, size=%u) \"\n-\t\t\t \"%s blks=%d off=%\"PRIx64\" errno=%d\", \n+\t\t\t \"%s blks=%d off=%\"PRIx64\" errno=%d\",\n \t\t\t rc, size, (rw == SL_WRITE ? \"SL_WRITE\" : \"SL_READ\"),\n \t\t\t nblks, slvr_2_fileoff(s, blk), save_errno);\n \n \telse if (rc != size)\n \t\tDEBUG_SLVR(PLL_ERROR, s, \"short io (rc=%zd, size=%u) \"\n-\t\t\t \"%s blks=%d off=%\"PRIu64\" errno=%d\", \n+\t\t\t \"%s blks=%d off=%\"PRIu64\" errno=%d\",\n \t\t\t rc, size, (rw == SL_WRITE ? \"SL_WRITE\" : \"SL_READ\"),\n \t\t\t nblks, slvr_2_fileoff(s, blk), save_errno);\n \telse {\n \t\tDEBUG_SLVR(PLL_INFO, s, \"ok %s size=%u off=%\"PRIu64\" rc=%zd nblks=%d\",\n-\t\t\t (rw == SL_WRITE ? \"SL_WRITE\" : \"SL_READ\"), size, \n+\t\t\t (rw == SL_WRITE ? \"SL_WRITE\" : \"SL_READ\"), size,\n \t\t\t slvr_2_fileoff(s, blk), rc, nblks);\n \t\trc = 0;\n \t}\n@@ -217,7 +217,7 @@\n }\n \n \/**\n- * slvr_fsbytes_get - read in the blocks which have their respective bits set \n+ * slvr_fsbytes_get - read in the blocks which have their respective bits set\n * in slab bitmap, trying to coalesce where possible.\n * @s: the sliver.\n *\/\n@@ -227,14 +227,14 @@\n \tint nblks, blk, rc;\n \tsize_t i;\n \n-\tpsc_trace(\"vbitmap_nfree() = %d\", \n+\tpsc_trace(\"vbitmap_nfree() = %d\",\n \t\t vbitmap_nfree(s->slvr_slab->slb_inuse));\n \n \tif (!(s->slvr_flags & SLVR_DATARDY))\n \t\tpsc_assert(s->slvr_flags & SLVR_FAULTING);\n \n \tpsc_assert(s->slvr_flags & SLVR_PINNED);\n- \n+\n \trc = 0;\n \tfor (i = 0, nblks = 0; i < SLASH_BLKS_PER_SLVR; i++) {\n \t\tif (vbitmap_get(s->slvr_slab->slb_inuse, i)) {\n@@ -274,7 +274,7 @@\n {\n \tSLVR_LOCK(s);\n \t\/* Set the pin bit no matter what, but first set the correct\n-\t * pndg op refcnt so that the slvr can't be freed from \n+\t * pndg op refcnt so that the slvr can't be freed from\n \t * underneath us.\n \t *\/\n \tif (rw == SL_WRITE)\n@@ -295,13 +295,13 @@\n \tif (s->slvr_flags & SLVR_NEW) {\n \t\ts->slvr_flags &= ~SLVR_NEW;\n \t\tslvr_slab_prep_getslab;\n-\t\t\n+\n \t} else if (!s->slvr_slab) {\n \t\tif (s->slvr_flags & SLVR_GETSLAB)\n \t\t\tSLVR_WAIT_SLAB(s);\n \t\telse {\n \t\t\tslvr_slab_prep_getslab;\n-\t\t}\t\t\t\n+\t\t}\n \t}\n \tpsc_assert(s->slvr_slab);\n \tSLVR_ULOCK(s);\n@@ -315,10 +315,10 @@\n \tsize_t i;\n \n \tSLVR_LOCK(s);\n- psc_assert(s->slvr_flags & SLVR_PINNED);\n+\tpsc_assert(s->slvr_flags & SLVR_PINNED);\n \n \t\/*\n-\t * Common courtesy requires us to wait for another threads' work FIRST. \n+\t * Common courtesy requires us to wait for another threads' work FIRST.\n \t * Otherwise, we could bail out prematurely when the data is ready without\n \t * considering the range we want to write.\n \t *\n@@ -334,20 +334,20 @@\n \t\tpsc_assert(psclist_conjoint(&s->slvr_lentry));\n \t}\n \n-\tDEBUG_SLVR(PLL_INFO, s, \"slvrno=%hu off=%u size=%u rw=%o\", \n+\tDEBUG_SLVR(PLL_INFO, s, \"slvrno=%hu off=%u size=%u rw=%o\",\n \t\t s->slvr_num, offset, size, rw);\n \n-\t\/* Don't bother marking the bit in the slash_bmap_wire structure, \n-\t * in fact slash_bmap_wire may not even be present for this \n-\t * sliver. Just mark the bit in the sliver itself in \n-\t * anticipation of the pending write. The pndgwrts counter \n+\t\/* Don't bother marking the bit in the slash_bmap_wire structure,\n+\t * in fact slash_bmap_wire may not even be present for this\n+\t * sliver. Just mark the bit in the sliver itself in\n+\t * anticipation of the pending write. The pndgwrts counter\n \t * cannot be used because it's decremented once the write\n \t * completes but prior the re-calculation of the slvr's crc\n \t * which is done asynchronously.\n \t *\/\n \tif (rw == SL_WRITE) {\n \t\ts->slvr_flags |= SLVR_CRCDIRTY;\n-\t\t\n+\n \t\tif (s->slvr_flags & SLVR_DATARDY)\n \t\t\t\/* Either read or write ops can just proceed if\n \t\t\t * SLVR_DATARDY is set, the sliver is prepared.\n@@ -375,16 +375,16 @@\n \n \tif (!offset && size == SLASH_SLVR_SIZE) {\n \t\t\/* Full sliver write, no need to read blocks from disk.\n-\t\t * All blocks will be dirtied by the incoming network IO. \n+\t\t * All blocks will be dirtied by the incoming network IO.\n \t\t *\/\n \t\tvbitmap_setall(s->slvr_slab->slb_inuse);\n \t\tgoto out;\n \t}\n \t\/*\n-\t * Prepare the sliver for a read-modify-write. Mark the blocks \n+\t * Prepare the sliver for a read-modify-write. Mark the blocks\n \t * that need to be read as 1 so that they can be faulted in by\n \t * slvr_fsbytes_io(). We can have at most two unaligned writes.\n-\t *\/\t\t\n+\t *\/\n \tif (offset) {\n \t\tblks = (offset \/ SLASH_SLVR_BLKSZ);\n \t\tif (offset & SLASH_SLVR_BLKMASK) {\n@@ -405,15 +405,15 @@\n \t}\n \t\/* We must have found some work to do.\n \t *\/\n-\tpsc_assert(vbitmap_nfree(s->slvr_slab->slb_inuse) < \n+\tpsc_assert(vbitmap_nfree(s->slvr_slab->slb_inuse) <\n \t\t (int)SLASH_BLKS_PER_SLVR);\n-\t\n+\n \tpsc_info(\"vbitmap_nfree()=%d\", vbitmap_nfree(s->slvr_slab->slb_inuse));\n \n-\tvbitmap_printbin1(s->slvr_slab->slb_inuse);\t\n+\tvbitmap_printbin1(s->slvr_slab->slb_inuse);\n \n \tif (s->slvr_flags & SLVR_DATARDY)\n- goto invert;\n+\t\tgoto invert;\n \n do_read:\n \tSLVR_ULOCK(s);\n@@ -427,10 +427,10 @@\n \tif (rw == SL_READ) {\n \t\tSLVR_LOCK(s);\n \t\tpsc_assert(!(s->slvr_flags & SLVR_DATARDY));\n-\t\t\n+\n \t\ts->slvr_flags |= SLVR_DATARDY;\n \t\ts->slvr_flags &= ~SLVR_FAULTING;\n-\t\t\n+\n \t\tvbitmap_invert(s->slvr_slab->slb_inuse);\n \t\tvbitmap_printbin1(s->slvr_slab->slb_inuse);\n \t\tDEBUG_SLVR(PLL_INFO, s, \"FAULTING -> DATARDY\");\n@@ -439,8 +439,8 @@\n \n \t\treturn (0);\n \n-\t} else {\t\t\n-\t\t\/* Above, the bits were set for the RMW blocks, now \n+\t} else {\n+\t\t\/* Above, the bits were set for the RMW blocks, now\n \t\t * that they have been read, invert the bitmap so that\n \t\t * it properly represents the blocks to be dirtied by\n \t\t * the rpc.\n@@ -450,13 +450,13 @@\n \t\tvbitmap_invert(s->slvr_slab->slb_inuse);\n \t\tif (unaligned[0] >= 0)\n \t\t\tvbitmap_set(s->slvr_slab->slb_inuse, unaligned[0]);\n-\t\t\n+\n \t\tif (unaligned[1] >= 0)\n \t\t\tvbitmap_set(s->slvr_slab->slb_inuse, unaligned[1]);\n \t\tvbitmap_printbin1(s->slvr_slab->slb_inuse);\n \tout:\n \t\tSLVR_ULOCK(s);\n-\t} \n+\t}\n \n \treturn (0);\n }\n@@ -465,10 +465,10 @@\n slvr_rio_done(struct slvr_ref *s)\n {\n \tSLVR_LOCK(s);\n-\t\n+\n \ts->slvr_pndgreads--;\n \tif (!s->slvr_pndgreads && !s->slvr_pndgwrts && (s->slvr_flags & SLVR_LRU)) {\n-\t\t\/* Requeue does a listcache operation but using trylock so \n+\t\t\/* Requeue does a listcache operation but using trylock so\n \t\t * no deadlock should occur on its behalf.\n \t\t *\/\n \t\tslvr_lru_requeue(s);\n@@ -484,35 +484,35 @@\n slvr_try_rpcqueue(struct slvr_ref *s)\n {\n \tSLVR_LOCK(s);\n-\t\n- psc_assert(s->slvr_flags & SLVR_PINNED);\n- \n+\n+\tpsc_assert(s->slvr_flags & SLVR_PINNED);\n+\n \n \tpsc_assert(s->slvr_flags & SLVR_CRCDIRTY);\n \n \tDEBUG_SLVR(PLL_INFO, s, \"try to queue for rpc\");\n \n \tif (s->slvr_flags & SLVR_RPCPNDG) {\n-\t\t\/* It's already here or it's in the process of being \n+\t\t\/* It's already here or it's in the process of being\n \t\t * moved.\n \t\t *\/\n \t\tSLVR_ULOCK(s);\n \t\treturn;\n \t}\n \n-\tif (!s->slvr_pndgwrts) { \n-\t\t\/* No writes are pending, perform the move to the rpcq \n+\tif (!s->slvr_pndgwrts) {\n+\t\t\/* No writes are pending, perform the move to the rpcq\n \t\t * list. Set the bit first then drop the lock.\n \t\t *\/\n-\t\ts->slvr_flags |= SLVR_RPCPNDG;\t\t\n-\t\tSLVR_ULOCK(s);\n-\t\t\n+\t\ts->slvr_flags |= SLVR_RPCPNDG;\n+\t\tSLVR_ULOCK(s);\n+\n \t\tlc_remove(&lruSlvrs, s);\n-\t\t\/* Don't drop the SLVR_LRU bit until the sliver has been \n+\t\t\/* Don't drop the SLVR_LRU bit until the sliver has been\n \t\t * removed.\n \t\t *\/\n \t\tSLVR_LOCK(s);\n-\t\t\/* If we set SLVR_RPCPNDG then no one else may have \n+\t\t\/* If we set SLVR_RPCPNDG then no one else may have\n \t\t * unset SLVR_LRU.\n \t\t *\/\n \t\tpsc_assert(s->slvr_flags & SLVR_LRU);\n@@ -527,16 +527,16 @@\n \n \/**\n * slvr_wio_done - called after a write rpc has completed. The sliver may\n- * be FAULTING which is handled separately from DATARDY. If FAULTING, \n+ * be FAULTING which is handled separately from DATARDY. If FAULTING,\n * this thread must wake up sleepers on the bmap waitq.\n- * Notes: conforming with standard lock ordering, this routine drops \n+ * Notes: conforming with standard lock ordering, this routine drops\n * the sliver lock prior to performing list operations.\n *\/\n-void \n+void\n slvr_wio_done(struct slvr_ref *s)\n {\n \tSLVR_LOCK(s);\n-\tpsc_assert(s->slvr_flags & SLVR_PINNED); \n+\tpsc_assert(s->slvr_flags & SLVR_PINNED);\n \tpsc_assert(s->slvr_pndgwrts > 0);\n \t\/* CRCDIRTY must have been marked and could not have been unset\n \t * because we have yet to pass this slvr to the crc processing\n@@ -551,29 +551,29 @@\n \tif (s->slvr_flags & SLVR_FAULTING) {\n \t\t\/* This sliver was being paged-in over the network.\n \t\t *\/\n- psc_assert(!(s->slvr_flags & SLVR_DATARDY));\n+\t\tpsc_assert(!(s->slvr_flags & SLVR_DATARDY));\n \n \t\ts->slvr_flags |= SLVR_DATARDY;\n \t\ts->slvr_flags &= ~SLVR_FAULTING;\n \n \t\tDEBUG_SLVR(PLL_INFO, s, \"FAULTING -> DATARDY\");\n-\t\t\/* Other threads may be waiting for DATARDY to either \n-\t\t * read or write to this sliver. At this point it's \n+\t\t\/* Other threads may be waiting for DATARDY to either\n+\t\t * read or write to this sliver. At this point it's\n \t\t * safe to wake them up.\n-\t\t * Note: when iterating over the lru list for reclaiming, \n+\t\t * Note: when iterating over the lru list for reclaiming,\n \t\t * slvrs with pending writes must be skipped.\n \t\t *\/\n \t\tSLVR_WAKEUP(s);\n \n- } else {\n+\t} else {\n \t\tpsc_assert(s->slvr_flags & SLVR_DATARDY);\n \t\tDEBUG_SLVR(PLL_INFO, s, \"DATARDY\");\n \n-\t\tif ((s->slvr_flags & SLVR_LRU) && \n+\t\tif ((s->slvr_flags & SLVR_LRU) &&\n \t\t s->slvr_pndgwrts > 1)\n \t\t\tslvr_lru_requeue(s);\n-\t} \n-\t\t\n+\t}\n+\n \tif (--s->slvr_pndgwrts == 0 && !s->slvr_flags & SLVR_RPCPNDG) {\n \t\t\/* No more pending writes, try to schedule the buffer\n \t\t * to be crc'd.\n@@ -587,19 +587,19 @@\n struct slvr_ref *\n slvr_lookup(uint16_t num, struct bmap_iod_info *b, int op)\n {\n- struct slvr_ref *s, ts;\n-\n- psc_assert(b->biod_bmap);\n- ts.slvr_num = num;\n+\tstruct slvr_ref *s, ts;\n+\n+\tpsc_assert(b->biod_bmap);\n+\tts.slvr_num = num;\n retry:\n- spinlock(&b->biod_lock);\n-\n- s = SPLAY_FIND(biod_slvrtree, &b->biod_slvrs, &ts);\n+\tspinlock(&b->biod_lock);\n+\n+\ts = SPLAY_FIND(biod_slvrtree, &b->biod_slvrs, &ts);\n \t\/* Note, slvr lock and biod lock are the same.\n \t *\/\n \tif (s && (s->slvr_flags & SLVR_FREEING)) {\n-\t\tif (op == SLVR_LOOKUP_DEL) \n-\t\t\tpsc_assert(SPLAY_REMOVE(biod_slvrtree, \n+\t\tif (op == SLVR_LOOKUP_DEL)\n+\t\t\tpsc_assert(SPLAY_REMOVE(biod_slvrtree,\n \t\t\t\t\t&b->biod_slvrs, s));\n \t\telse {\n \t\t\tfreelock(&b->biod_lock);\n@@ -607,7 +607,7 @@\n \t\t\tgoto retry;\n \t\t}\n \n- } else if (!s && (op == SLVR_LOOKUP_ADD)) {\n+\t} else if (!s && (op == SLVR_LOOKUP_ADD)) {\n \t\ts = PSCALLOC(sizeof(*s));\n \n \t\ts->slvr_num = num;\n@@ -616,11 +616,11 @@\n \t\ts->slvr_slab = NULL;\n \t\tINIT_PSCLIST_ENTRY(&s->slvr_lentry);\n \n- SPLAY_INSERT(biod_slvrtree, &b->biod_slvrs, s);\n- }\n- freelock(&b->biod_lock);\n-\n- return (s);\n+\t\tSPLAY_INSERT(biod_slvrtree, &b->biod_slvrs, s);\n+\t}\n+\tfreelock(&b->biod_lock);\n+\n+\treturn (s);\n }\n \n __static void\n@@ -631,13 +631,13 @@\n \t\/* Slvr should be detached from any listheads.\n \t *\/\n \tpsc_assert(psclist_disjoint(&s->slvr_lentry));\n-\tpsc_assert(s == slvr_lookup(s->slvr_num, slvr_2_biod(s), \n+\tpsc_assert(s == slvr_lookup(s->slvr_num, slvr_2_biod(s),\n \t\t\t\t SLVR_LOOKUP_DEL));\n \tPSCFREE(s);\n }\n \n-\/* \n- * The reclaim function for the slBufsPoolMaster pool. Note that our caller psc_pool_get() \n+\/*\n+ * The reclaim function for the slBufsPoolMaster pool. Note that our caller psc_pool_get()\n * ensures that we are called exclusviely.\n *\/\n static int\n@@ -658,7 +658,7 @@\n \t\tSLVR_LOCK(s);\n \t\tDEBUG_SLVR(PLL_INFO, s, \"considering for reap\");\n \n-\t\t\/* Look for slvrs which can be freed, slvr_lru_freeable() \n+\t\t\/* Look for slvrs which can be freed, slvr_lru_freeable()\n \t\t * returning true means that no slab is attached.\n \t\t *\/\n \t\tif (slvr_lru_freeable(s)) {\n@@ -666,13 +666,13 @@\n \t\t\ts->slvr_flags |= SLVR_FREEING;\n \t\t\tlc_del(&s->slvr_lentry, &lruSlvrs);\n \t\t\tgoto ulock;\n-\t\t}\t\t\t\n+\t\t}\n \n \t\tpsc_assert(s->slvr_slab);\n \n \t\tif (slvr_lru_slab_freeable(s)) {\n-\t\t\t\/* At this point we know that the slab can be \n-\t\t\t * reclaimed, however the slvr itself may \n+\t\t\t\/* At this point we know that the slab can be\n+\t\t\t * reclaimed, however the slvr itself may\n \t\t\t * have to stay.\n \t\t\t *\/\n \t\t\tdynarray_add(&a, s);\n@@ -688,9 +688,9 @@\n \tLIST_CACHE_ULOCK(&lruSlvrs);\n \n \tfor (i = 0; i < dynarray_len(&a); i++) {\n- s = dynarray_getpos(&a, i);\n-\n-\t\tif (s->slvr_flags & SLVR_SLBFREEING) {\t\t\t\n+\t\ts = dynarray_getpos(&a, i);\n+\n+\t\tif (s->slvr_flags & SLVR_SLBFREEING) {\n \n \t\t\tpsc_assert(!(s->slvr_flags & SLVR_FREEING));\n \t\t\tpsc_assert(s->slvr_slab);\n@@ -706,7 +706,7 @@\n \t\t\tpsc_assert(!s->slvr_slab);\n \t\t\tslvr_remove(s);\n \t\t}\n- }\n+\t}\n \tdynarray_free(&a);\n \n \treturn (n);\n@@ -718,11 +718,11 @@\n \tlc_reginit(&lruSlvrs, struct slvr_ref, slvr_lentry, \"lruSlvrs\");\n \tlc_reginit(&rpcqSlvrs, struct slvr_ref, slvr_lentry, \"rpcqSlvrs\");\n \n-\tpsc_poolmaster_init(&slBufsPoolMaster, struct sl_buffer, \n-\t\t slb_mgmt_lentry, PPMF_AUTO, 64, 64, 128, \n-\t\t sl_buffer_init, sl_buffer_destroy, slvr_buffer_reap, \n+\tpsc_poolmaster_init(&slBufsPoolMaster, struct sl_buffer,\n+\t\t slb_mgmt_lentry, PPMF_AUTO, 64, 64, 128,\n+\t\t sl_buffer_init, sl_buffer_destroy, slvr_buffer_reap,\n \t\t \"svlr_slab\", NULL);\n- slBufsPool = psc_poolmaster_getmgr(&slBufsPoolMaster);\n+\tslBufsPool = psc_poolmaster_getmgr(&slBufsPoolMaster);\n \n \tslvr_worker_init();\n }\n"} {"commit":"e5a635be6cfc3ffab5e00f2313e8581c6bd9bcea","subject":"added the original read file to get the notification","message":"added the original read file to get the notification\n","repos":"chava33\/coturn,chava33\/coturn,chava33\/coturn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/apps\/uclient\/uclient.c\n+++ src\/apps\/uclient\/uclient.c\n@@ -63,6 +63,7 @@\n static char buffer_to_send[MAX_STUN_MESSAGE_SIZE]=\"\\0\";\n \n static int total_clients = 0;\n+static int Logical = 1;\n \n \/* Patch for unlimited number of clients provided by ucudbm@gmail.com *\/\n #define SLEEP_INTERVAL (234)\n@@ -161,8 +162,8 @@\n while (left > 0) {\n do {\n rc = send(fd, buffer, left, 0);\n- printf(\"left %d\\n\",left);\n- printf(\"send buffer \\n %s\\n\",buffer);\n+ \/\/printf(\"left %d\\n\",left);\n+ \/\/printf(\"send buffer \\n %s\\n\",buffer); \/\/GOOD\n } while (rc < 0 && ((errno == EINTR) || (errno == ENOBUFS)));\n if (rc > 0) {\n left -= (size_t) rc;\n@@ -243,6 +244,214 @@\n \treturn rc;\n }\n \n+\n+static int client_read(app_ur_session *elem, int is_tcp_data, app_tcp_conn_info *atc) {\n+\n+\tif (!elem)\n+\t\treturn -1;\n+\n+\tif (elem->state != UR_STATE_READY)\n+\t\treturn -1;\n+\n+\telem->ctime = current_time;\n+\n+\tapp_ur_conn_info *clnet_info = &(elem->pinfo);\n+\tint err_code = 0;\n+\tu08bits err_msg[129];\n+\tint rc = 0;\n+\tint applen = 0;\n+\n+\/\/\tif (clnet_verbose && verbose_packets) {\n+\/\/\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, \"before read ...\\n\");\n+\/\/\t}\n+\n+\trc = recv_buffer(clnet_info, &(elem->in_buffer), 0, is_tcp_data, atc, NULL);\n+\n+\/\/\tif (clnet_verbose && verbose_packets) {\n+\/\/\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, \"read %d bytes\\n\", (int) rc);\n+\/\/\t}\n+\n+\tif (rc > 0) {\n+\n+\t\telem->in_buffer.len = rc;\n+\n+\t\tuint16_t chnumber = 0;\n+\n+\t\tconst message_info *mi = NULL;\n+\n+\t\tsize_t buffers = 1;\n+\n+\t\tif(is_tcp_data) {\n+\t\t if ((int)elem->in_buffer.len == clmessage_length) {\n+\t\t mi = (message_info*)(elem->in_buffer.buf);\n+\t\t }\n+\t\t} else if (stun_is_indication(&(elem->in_buffer))) {\n+\t\t\t\tif(Logical)\n+\t\t\t\tprintf(\"---------->stun_is_indication: line number %d in file %s\\n\", __LINE__, __FILE__);\n+\n+\t\t\tuint16_t method = stun_get_method(&elem->in_buffer);\n+\n+\t\t\tif((method == STUN_METHOD_CONNECTION_ATTEMPT)&& is_TCP_relay()) {\n+\t\t\tif(Logical)\n+\t\t\t\tprintf(\"---------->STUN_METHOD_CONNECTION_ATTEMPT: line number %d in file %s\\n\", __LINE__, __FILE__);\n+\t\t\t stun_attr_ref sar = stun_attr_get_first(&(elem->in_buffer));\n+\t\t\t u32bits cid = 0;\n+\t\t\t while(sar) {\n+\t\t\t\t int attr_type = stun_attr_get_type(sar);\n+\t\t\t\t printf(\"---------->attr_type %d\\n\",attr_type);\n+\t\t\t\t if(attr_type == STUN_ATTRIBUTE_CONNECTION_ID) {\n+\t\t\t\t\t cid = *((const u32bits*)stun_attr_get_value(sar));\n+\t\t\t\t\t break;\n+\t\t\t\t }\n+\t\t\t\t sar = stun_attr_get_next_str(elem->in_buffer.buf,elem->in_buffer.len,sar);\n+\t\t\t }\n+\t\t\t if(negative_test) {\n+\t\t\t\t tcp_data_connect(elem,(u64bits)random());\n+\t\t\t } else {\n+\t\t\t\t \/* positive test *\/\n+\t\t\t\t tcp_data_connect(elem,cid);\n+\t\t\t }\n+\t\t\t return rc;\n+\t\t\t} else if (method != STUN_METHOD_DATA) {\n+\t\t\t\tTURN_LOG_FUNC(\n+\t\t\t\t\t\tTURN_LOG_LEVEL_INFO,\n+\t\t\t\t\t\t\"ERROR: received indication message has wrong method: 0x%x\\n\",\n+\t\t\t\t\t\t(int) method);\n+\t\t\t\treturn rc;\n+\t\t\t} else {\n+\t\t\tif(Logical)\n+\t\t\t\tprintf(\"---------->error in client read: line number %d in file %s\\n\", __LINE__, __FILE__);\n+\n+\t\t\t\tstun_attr_ref sar = stun_attr_get_first_by_type(&(elem->in_buffer), STUN_ATTRIBUTE_DATA);\n+\t\t\t\tif (!sar) {\n+\t\t\t\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, \"ERROR: received DATA message has no data, size=%d\\n\", rc);\n+\t\t\t\t\treturn rc;\n+\t\t\t\t}\n+\n+\t\t\t\tint rlen = stun_attr_get_len(sar);\n+\t\t\t\tapplen = rlen;\n+\t\t\t\tif (rlen != clmessage_length) {\n+\t\t\t\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, \"ERROR: received DATA message has wrong len: %d, must be %d\\n\", rlen, clmessage_length);\n+\t\t\t\t\ttot_recv_bytes += applen;\n+\t\t\t\t\treturn rc;\n+\t\t\t\t}\n+\n+\t\t\t\tconst u08bits* data = stun_attr_get_value(sar);\n+\n+\t\t\t\tmi = (const message_info*) data;\n+\t\t\t}\n+\n+\t\t} else if (stun_is_success_response(&(elem->in_buffer))) {\n+\t\tif(Logical)\n+\t\t\t\tprintf(\"stun_is_success_response: line number %d in file %s\\n\", __LINE__, __FILE__);\n+\n+\t\t\tif(elem->pinfo.nonce[0]) {\n+\/\/\t\t\t\tif(check_integrity(&(elem->pinfo), &(elem->in_buffer))<0)\n+\/\/\t\t\t\t\treturn -1;\n+\t\t\t}\n+\n+\t\t\tif(is_TCP_relay() && (stun_get_method(&(elem->in_buffer)) == STUN_METHOD_CONNECT)) {\n+\t\t\t\tstun_attr_ref sar = stun_attr_get_first(&(elem->in_buffer));\n+\t\t\t\tu32bits cid = 0;\n+\t\t\t\twhile(sar) {\n+\t\t\t\t int attr_type = stun_attr_get_type(sar);\n+\t\t\t\t if(attr_type == STUN_ATTRIBUTE_CONNECTION_ID) {\n+\t\t\t\t\t cid = *((const u32bits*)stun_attr_get_value(sar));\n+\t\t\t\t\t break;\n+\t\t\t\t }\n+\t\t\t\t sar = stun_attr_get_next_str(elem->in_buffer.buf,elem->in_buffer.len,sar);\n+\t\t\t\t}\n+\t\t\t\ttcp_data_connect(elem,cid);\n+\t\t\t}\n+\n+\t\t\treturn rc;\n+\t\t} else if (stun_is_challenge_response_str(elem->in_buffer.buf, (size_t)elem->in_buffer.len,\n+\t\t\t\t\t\t\t&err_code,err_msg,sizeof(err_msg),\n+\t\t\t\t\t\t\tclnet_info->realm,clnet_info->nonce,\n+\t\t\t\t\t\t\tclnet_info->server_name, &(clnet_info->oauth))) {\n+\t\t\tif(is_TCP_relay() && (stun_get_method(&(elem->in_buffer)) == STUN_METHOD_CONNECT)) {\n+\t\t\t\tturn_tcp_connect(&(elem->pinfo), &(elem->pinfo.peer_addr));\n+\t\t\t} else if(stun_get_method(&(elem->in_buffer)) == STUN_METHOD_REFRESH) {\n+\t\t\t\trefresh_channel(elem, stun_get_method(&elem->in_buffer),600);\n+\t\t\t}\n+\t\t\treturn rc;\n+\t\t} else if (stun_is_error_response(&(elem->in_buffer), NULL,NULL,0)) {\n+\t\t\treturn rc;\n+\t\t} else if (stun_is_channel_message(&(elem->in_buffer), &chnumber, use_tcp)) {\n+\t\t\tif (elem->chnum != chnumber) {\n+\t\t\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,\n+\t\t\t\t\t\t\"ERROR: received message has wrong channel: %d\\n\",\n+\t\t\t\t\t\t(int) chnumber);\n+\t\t\t\treturn rc;\n+\t\t\t}\n+\n+\t\t\tif (elem->in_buffer.len >= 4) {\n+\t\t\t\tif (((int)(elem->in_buffer.len-4) < clmessage_length) ||\n+\t\t\t\t\t((int)(elem->in_buffer.len-4) > clmessage_length + 3)) {\n+\t\t\t\t\tTURN_LOG_FUNC(\n+\t\t\t\t\t\t\tTURN_LOG_LEVEL_INFO,\n+\t\t\t\t\t\t\t\"ERROR: received buffer have wrong length: %d, must be %d, len=%d\\n\",\n+\t\t\t\t\t\t\trc, clmessage_length + 4,(int)elem->in_buffer.len);\n+\t\t\t\t\treturn rc;\n+\t\t\t\t}\n+\n+\t\t\t\tmi = (message_info*)(elem->in_buffer.buf + 4);\n+\t\t\t\tapplen = elem->in_buffer.len -4;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tTURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,\n+\t\t\t\t\t\"ERROR: Unknown message received of size: %d\\n\",(int)(elem->in_buffer.len));\n+\t\t\treturn rc;\n+\t\t}\n+\n+\t\tif(mi) {\n+\t\t\t\/*\n+\t\t\tprintf(\"%s: 111.111: msgnum=%d, rmsgnum=%d, sent=%lu, recv=%lu\\n\",__FUNCTION__,\n+\t\t\t\tmi->msgnum,elem->recvmsgnum,(unsigned long)mi->mstime,(unsigned long)current_mstime);\n+\t\t\t\t*\/\n+\t\t\tif(mi->msgnum != elem->recvmsgnum+1)\n+\t\t\t\t++(elem->loss);\n+\t\t\telse {\n+\t\t\t u64bits clatency = (u64bits)time_minus(current_mstime,mi->mstime);\n+\t\t\t if(clatency>max_latency)\n+\t\t\t max_latency = clatency;\n+\t\t\t if(clatency<min_latency)\n+\t\t\t min_latency = clatency;\n+\t\t\t elem->latency += clatency;\n+\t\t\t if(elem->rmsgnum>0) {\n+\t\t\t u64bits cjitter = abs((int)(current_mstime-elem->recvtimems)-RTP_PACKET_INTERVAL);\n+\n+\t\t\t if(cjitter>max_jitter)\n+\t\t\t max_jitter = cjitter;\n+\t\t\t if(cjitter<min_jitter)\n+\t\t\t min_jitter = cjitter;\n+\n+\t\t\t elem->jitter += cjitter;\n+\t\t\t }\n+\t\t\t}\n+\n+\t\t\telem->recvmsgnum = mi->msgnum;\n+\t\t}\n+\n+\t\telem->rmsgnum+=buffers;\n+\t\ttot_recv_messages+=buffers;\n+\t\tif(applen > 0)\n+\t\t\ttot_recv_bytes += applen;\n+\t\telse\n+\t\t\ttot_recv_bytes += elem->in_buffer.len;\n+\t\telem->recvtimems=current_mstime;\n+\t\telem->wait_cycles = 0;\n+\n+\t} else if(rc == 0) {\n+\t\treturn 0;\n+\t} else {\n+\t\treturn -1;\n+\t}\n+\n+\treturn rc;\n+}\n+\n+\/*\n static int client_read(app_ur_session *elem, int is_tcp_data, app_tcp_conn_info *atc)\n {\n \n@@ -296,7 +505,7 @@\n sar = stun_attr_get_next_str(elem->in_buffer.buf,elem->in_buffer.len,sar);\n }\n \n- \/* positive test *\/\n+ \/\/ positive test\n tcp_data_connect(elem, cid);\n \n } else if (stun_is_success_response(&(elem->in_buffer))) {\n@@ -317,6 +526,8 @@\n \n \treturn rc;\n }\n+\n+*\/\n \n static int client_shutdown(app_ur_session *elem)\n {\n@@ -698,9 +909,9 @@\n \t\t\tcount++;\n \t\t\tprintf(\"\\nIn while loop %d\\n\",count);\n \t\t\tsleep(1);\n-\t\t\trc = recv(fd_web, buffer, sizeof(buffer) - 1,0);\n- printf(\"read from web server %d \\n\", sizeof(buffer));\n-\t\t\tprintf(\"read from web server \\n %s\\n\", buffer);\n+ rc = recv(fd_web, buffer, sizeof(buffer) - 1,0);\n+ \/\/printf(\"read from web server %d \\n\", sizeof(buffer));\n+\t\t\t\/\/printf(\"read from web server \\n %s\\n\", buffer); \/\/GOOD\n \t\t\tif ((rc < 0) && (errno == EAGAIN) && sync) {\n \t\t\t\terror(\"ERROR reading from socket\");\n \t\t\t\terrno = EINTR;\n@@ -738,9 +949,10 @@\n \t\/\/event_base_dispatch(base_sen);\n \/\/getchar();\n \t\/\/run_event(1);\n- time_t t = time(NULL);\n- struct tm tm = *localtime(&t);\n- printf(\"now: %d-%d-%d %d:%d:%d\\n\", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);\n+\n+ \/\/ time_t t = time(NULL);\n+ \/\/struct tm tm = *localtime(&t);\n+ \/\/printf(\"now: %d-%d-%d %d:%d:%d\\n\", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);\n refresh_channel(&session, 0, 6000);\n \tshutdown(fd_web, SHUT_RDWR);\n \tclose(fd_web);\n"} {"commit":"43ae5d792f30839acfbdaf5ad5404151b9747c4c","subject":"enable node moving","message":"enable node moving\n","repos":"tangrams\/yaml-cpp,tangrams\/yaml-cpp,tangrams\/yaml-cpp,tangrams\/yaml-cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/yaml-cpp\/node\/detail\/node.h\n+++ include\/yaml-cpp\/node\/detail\/node.h\n@@ -21,6 +21,7 @@\n \/\/ required for bucket reserve\n node(node&&) = default;\n node& operator=(const node&) = delete;\n+ node& operator=(node&&) = default;\n \n bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; }\n const node_data* ref() const { return m_pRef.get(); }\n"} {"commit":"1a9e406c218e3d5a174bc4f8dce0333d73d7bbff","subject":"minor missing error message","message":"minor missing error message\n","repos":"Snazz2001\/libgit2,rcorre\/libgit2,mingyaaaa\/libgit2,Aorjoa\/libgit2_maked_lib,amyvmiwei\/libgit2,Tousiph\/Demo1,whoisj\/libgit2,sim0629\/libgit2,Corillian\/libgit2,Aorjoa\/libgit2_maked_lib,mingyaaaa\/libgit2,yongthecoder\/libgit2,mcanthony\/libgit2,chiayolin\/libgit2,jflesch\/libgit2-mariadb,kenprice\/libgit2,kenprice\/libgit2,Corillian\/libgit2,Tousiph\/Demo1,rcorre\/libgit2,ardumont\/libgit2,linquize\/libgit2,rcorre\/libgit2,joshtriplett\/libgit2,ardumont\/libgit2,rcorre\/libgit2,mrksrm\/Mingijura,JIghtuse\/libgit2,mhp\/libgit2,mhp\/libgit2,MrHacky\/libgit2,stewid\/libgit2,magnus98\/TEST,sim0629\/libgit2,t0xicCode\/libgit2,magnus98\/TEST,linquize\/libgit2,joshtriplett\/libgit2,claudelee\/libgit2,sygool\/libgit2,jeffhostetler\/public_libgit2,since2014\/libgit2,raybrad\/libit2,JIghtuse\/libgit2,nokiddin\/libgit2,kissthink\/libgit2,chiayolin\/libgit2,jflesch\/libgit2-mariadb,zodiac\/libgit2.js,nokiddin\/libgit2,kissthink\/libgit2,ardumont\/libgit2,raybrad\/libit2,whoisj\/libgit2,jflesch\/libgit2-mariadb,MrHacky\/libgit2,yosefhackmon\/libgit2,stewid\/libgit2,joshtriplett\/libgit2,spraints\/libgit2,t0xicCode\/libgit2,swisspol\/DEMO-libgit2,nokiddin\/libgit2,mcanthony\/libgit2,Corillian\/libgit2,sim0629\/libgit2,Corillian\/libgit2,Tousiph\/Demo1,JIghtuse\/libgit2,mcanthony\/libgit2,zodiac\/libgit2.js,mhp\/libgit2,mingyaaaa\/libgit2,oaastest\/libgit2,yosefhackmon\/libgit2,maxiaoqian\/libgit2,spraints\/libgit2,KTXSoftware\/libgit2,skabel\/manguse,oaastest\/libgit2,jeffhostetler\/public_libgit2,oaastest\/libgit2,rcorre\/libgit2,since2014\/libgit2,MrHacky\/libgit2,whoisj\/libgit2,evhan\/libgit2,iankronquist\/libgit2,linquize\/libgit2,magnus98\/TEST,mrksrm\/Mingijura,kissthink\/libgit2,t0xicCode\/libgit2,nokiddin\/libgit2,mrksrm\/Mingijura,mcanthony\/libgit2,swisspol\/DEMO-libgit2,iankronquist\/libgit2,evhan\/libgit2,maxiaoqian\/libgit2,dleehr\/libgit2,leoyanggit\/libgit2,JIghtuse\/libgit2,zodiac\/libgit2.js,swisspol\/DEMO-libgit2,falqas\/libgit2,chiayolin\/libgit2,KTXSoftware\/libgit2,amyvmiwei\/libgit2,leoyanggit\/libgit2,mcanthony\/libgit2,yosefhackmon\/libgit2,yongthecoder\/libgit2,stewid\/libgit2,chiayolin\/libgit2,sygool\/libgit2,sim0629\/libgit2,spraints\/libgit2,since2014\/libgit2,JIghtuse\/libgit2,rcorre\/libgit2,maxiaoqian\/libgit2,iankronquist\/libgit2,joshtriplett\/libgit2,jeffhostetler\/public_libgit2,falqas\/libgit2,kissthink\/libgit2,since2014\/libgit2,mhp\/libgit2,evhan\/libgit2,iankronquist\/libgit2,skabel\/manguse,t0xicCode\/libgit2,saurabhsuniljain\/libgit2,jeffhostetler\/public_libgit2,chiayolin\/libgit2,saurabhsuniljain\/libgit2,kenprice\/libgit2,swisspol\/DEMO-libgit2,whoisj\/libgit2,MrHacky\/libgit2,Snazz2001\/libgit2,yongthecoder\/libgit2,magnus98\/TEST,kissthink\/libgit2,yongthecoder\/libgit2,spraints\/libgit2,falqas\/libgit2,since2014\/libgit2,claudelee\/libgit2,jflesch\/libgit2-mariadb,swisspol\/DEMO-libgit2,KTXSoftware\/libgit2,since2014\/libgit2,MrHacky\/libgit2,saurabhsuniljain\/libgit2,kenprice\/libgit2,amyvmiwei\/libgit2,mhp\/libgit2,mingyaaaa\/libgit2,Snazz2001\/libgit2,whoisj\/libgit2,claudelee\/libgit2,raybrad\/libit2,linquize\/libgit2,falqas\/libgit2,sim0629\/libgit2,joshtriplett\/libgit2,iankronquist\/libgit2,saurabhsuniljain\/libgit2,mhp\/libgit2,zodiac\/libgit2.js,saurabhsuniljain\/libgit2,leoyanggit\/libgit2,dleehr\/libgit2,Snazz2001\/libgit2,sygool\/libgit2,Tousiph\/Demo1,skabel\/manguse,sygool\/libgit2,jflesch\/libgit2-mariadb,yongthecoder\/libgit2,nokiddin\/libgit2,jflesch\/libgit2-mariadb,kenprice\/libgit2,nokiddin\/libgit2,sim0629\/libgit2,t0xicCode\/libgit2,whoisj\/libgit2,KTXSoftware\/libgit2,skabel\/manguse,oaastest\/libgit2,amyvmiwei\/libgit2,evhan\/libgit2,KTXSoftware\/libgit2,Snazz2001\/libgit2,mrksrm\/Mingijura,spraints\/libgit2,Aorjoa\/libgit2_maked_lib,maxiaoqian\/libgit2,mingyaaaa\/libgit2,mrksrm\/Mingijura,dleehr\/libgit2,mrksrm\/Mingijura,ardumont\/libgit2,t0xicCode\/libgit2,yosefhackmon\/libgit2,oaastest\/libgit2,sygool\/libgit2,Corillian\/libgit2,magnus98\/TEST,iankronquist\/libgit2,linquize\/libgit2,yosefhackmon\/libgit2,Tousiph\/Demo1,skabel\/manguse,Aorjoa\/libgit2_maked_lib,amyvmiwei\/libgit2,ardumont\/libgit2,amyvmiwei\/libgit2,jeffhostetler\/public_libgit2,leoyanggit\/libgit2,chiayolin\/libgit2,ardumont\/libgit2,joshtriplett\/libgit2,skabel\/manguse,falqas\/libgit2,raybrad\/libit2,maxiaoqian\/libgit2,leoyanggit\/libgit2,swisspol\/DEMO-libgit2,mingyaaaa\/libgit2,MrHacky\/libgit2,dleehr\/libgit2,claudelee\/libgit2,raybrad\/libit2,mcanthony\/libgit2,stewid\/libgit2,stewid\/libgit2,KTXSoftware\/libgit2,leoyanggit\/libgit2,Aorjoa\/libgit2_maked_lib,oaastest\/libgit2,yongthecoder\/libgit2,falqas\/libgit2,kenprice\/libgit2,claudelee\/libgit2,sygool\/libgit2,yosefhackmon\/libgit2,Tousiph\/Demo1,claudelee\/libgit2,dleehr\/libgit2,linquize\/libgit2,saurabhsuniljain\/libgit2,jeffhostetler\/public_libgit2,spraints\/libgit2,JIghtuse\/libgit2,magnus98\/TEST,kissthink\/libgit2,Corillian\/libgit2,Snazz2001\/libgit2,dleehr\/libgit2,zodiac\/libgit2.js,stewid\/libgit2,maxiaoqian\/libgit2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/repository.c\n+++ src\/repository.c\n@@ -1598,6 +1598,7 @@\n \tif ((error = p_stat(git_buf_cstr(&path), &st)) < 0) {\n \t\tif (errno == ENOENT)\n \t\t\terror = GIT_ENOTFOUND;\n+\t\tgiterr_set(GITERR_OS, \"Could not access message file\");\n \t}\n \telse if (buffer != NULL) {\n \t\terror = git_futils_readbuffer(&buf, git_buf_cstr(&path));\n"} {"commit":"9527b3697f84714fbe3a0e602065cf7b7718792d","subject":"toString Works !!","message":"toString Works !!\n\nclosed #23\n","repos":"UTBroM\/GeometricLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- polygon.c\n+++ polygon.c\n@@ -465,44 +465,37 @@\n * This function is like printPolygon but it's a function\n * inpoly - Polygon\n * Return a char* (string)\n+ * \/!\\ We have a buffer and we can't manage double wich are greater than the lenght of the BUFFER\n **\/\n char* toString(Polygon inpoly)\n {\n-\tchar *string;\n+\tchar* string;\n+\tchar BUFFER[1000];\n \tdouble x, y;\n-\t\/*char x1[50];\n-\tchar y1[50];*\/\n-\tint i;\n-\n-\tstring = (char*)malloc(sizeof(char)*100);\n+\tint i;\n+\n+\tstring = (char*)malloc(sizeof(char)*2);\n \tstring[0] = '[';\n-\t\/*length = 0;*\/\n-\n-\tfor (i=1; i<inpoly.size-1; i++)\n+\tstring[1] = '\\0';\n+\n+\tfor (i=1; i<inpoly.size; i++)\n \t{\n \t\tx = inpoly.head->value.x;\n \t\ty = inpoly.head->value.y;\n \n-\t\t\/*length = length + sprintf(x1, \"%.2f\", x);\n-\t\tlength = length + sprintf(y1, \"%.2f\", y);\n-\n-\t\tstring = realloc(string, sizeof(char)*(length+4));*\/\n-\n-\t\tsprintf(string, \"[%.2f,%.2f],\", x, y);\n-\n-\t\tinpoly.head = inpoly.head->next;\n-\t\t\/*x1[0] = '\\0';\n-\t\ty1[0] = '\\0';*\/\n-\t}\n-\n- \t\/*x = inpoly.head->value.x;\n-\tlength = length + sprintf(x1, \"%.2f\", x);\n+\t\tstring = realloc(string, sizeof(char)*(strlen(string)+strlen(BUFFER)+1));\n+\n+\t\tsprintf(BUFFER, \"[%.2f,%.2f],\", x, y);\n+\t\tstrcat(string,BUFFER);\n+\t\tinpoly.head = inpoly.head->next;\n+\t}\n+\tx = inpoly.head->value.x;\n \ty = inpoly.head->value.y;\n-\tlength = length + sprintf(y1, \"%.2f\", y);\n-\n-\tstring = realloc(string, sizeof(char)*(length+4));*\/\n-\n-\tsprintf(string, \"[%.2f,%.2f]]\", x, y);\n+\n+\tstring = realloc(string, sizeof(char)*(strlen(string)+strlen(BUFFER)+1));\n+\n+\tsprintf(BUFFER, \"[%.2f,%.2f]]\", x, y);\n+\tstrcat(string,BUFFER);\n \t\n \treturn string;\n }\n"} {"commit":"659fa151f53374d36ed6bd7b19fd51ba79b30a6b","subject":"Published redraw on MRBlurView","message":"Published redraw on MRBlurView\n","repos":"zaubara\/MRProgress,mrackwitz\/MRProgress,hanangellove\/MRProgress,yarry\/MRProgress,odyth\/MRProgress,yungfan\/MRProgress,jackywpy\/MRProgress,odyth\/MRProgress,yungfan\/MRProgress,zaubara\/MRProgress,hanangellove\/MRProgress,AddAloner\/MRProgress,colemancda\/MRProgress,mrackwitz\/MRProgress,boherna\/MRProgress,colemancda\/MRProgress,AddAloner\/MRProgress,jackywpy\/MRProgress,AlexanderMazaletskiy\/MRProgress,yarry\/MRProgress,zaubara\/MRProgress,AlexanderMazaletskiy\/MRProgress,boherna\/MRProgress","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Blur\/MRBlurView.h\n+++ src\/Blur\/MRBlurView.h\n@@ -10,9 +10,13 @@\n \n \n \/**\n- Simple blur implementation based on an UIImageView, which displays a blurred image screenshot of the window cropped to\n- its absolute frame.\n+ Blur implementation, which displays a blurred image screenshot of the window cropped to its absolute frame.\n *\/\n @interface MRBlurView : UIImageView\n \n+\/**\n+ Force redraw\n+ *\/\n+- (void)redraw;\n+\n @end\n"} {"commit":"ca40bfac8b53974c2e1bcde37b1a63f895beaad1","subject":"fix up style","message":"fix up style\n","repos":"cubicdaiya\/mruby_nginx_module,cubicdaiya\/mruby_nginx_module","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ngx_http_mruby_request.c\n+++ src\/ngx_http_mruby_request.c\n@@ -119,11 +119,11 @@\n \n static mrb_value ngx_mrb_get_request_header(mrb_state *mrb, ngx_list_t *headers)\n {\n- mrb_value mrb_key;\n- u_char *key;\n- ngx_uint_t i;\n- ngx_list_part_t *part;\n- ngx_table_elt_t *header;\n+ mrb_value mrb_key;\n+ u_char *key;\n+ ngx_uint_t i;\n+ ngx_list_part_t *part;\n+ ngx_table_elt_t *header;\n \n mrb_get_args(mrb, \"o\", &mrb_key);\n \n"} {"commit":"108245e41c84fe3abc803f396e5d0f2f490be6ba","subject":"xqpString const-ness issues","message":"xqpString const-ness issues\n","repos":"bgarrels\/zorba,bgarrels\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,cezarfx\/zorba,bgarrels\/zorba,cezarfx\/zorba,28msec\/zorba,28msec\/zorba,28msec\/zorba,cezarfx\/zorba,bgarrels\/zorba,bgarrels\/zorba,28msec\/zorba,28msec\/zorba,cezarfx\/zorba,cezarfx\/zorba,28msec\/zorba,28msec\/zorba,28msec\/zorba,28msec\/zorba,bgarrels\/zorba,bgarrels\/zorba","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/zorba\/util\/utf8\/xqpString.h\n+++ include\/zorba\/util\/utf8\/xqpString.h\n@@ -79,7 +79,7 @@\n \/**Construct a xqpString as a wrapper of an existing xqpStringStore\n * @param src A source UTF-8 encoded string\n *\/\n- xqpString(const xqpStringStore_t& other) : theStrStore(other.get_ptr()) {}\n+ xqpString(const xqpStringStore_t &other) : theStrStore(other) {}\n \n \/**Construct a xqpString given a std::string\n * @param src A source std::string containin ASCII characters\n@@ -93,7 +93,8 @@\n \n ~xqpString(){};\n \n- xqpStringStore* getStore() const { return theStrStore.get_ptr(); }\n+ const xqpStringStore* getStore() const { return theStrStore.get_ptr(); }\n+ xqpStringStore* getStore() { return theStrStore.get_ptr(); }\n \n \/\/xqpString::operator=()\n xqpString&operator=(xqpString src)\n@@ -370,3 +371,8 @@\n \n #endif\n \n+\/*\n+ * Local variables:\n+ * mode: c++\n+ * End:\n+ *\/\n"} {"commit":"480860edfab53094a8b45882687178ff75362caf","subject":"auth: Added SHA512 and SSHA512 password schemes. Based on patch by Mark Washenberger.","message":"auth: Added SHA512 and SSHA512 password schemes.\nBased on patch by Mark Washenberger.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/password-scheme.c\n+++ src\/auth\/password-scheme.c\n@@ -395,6 +395,19 @@\n }\n \n static void\n+sha512_generate(const char *plaintext, const char *user ATTR_UNUSED,\n+\t\tconst unsigned char **raw_password_r, size_t *size_r)\n+{\n+\tunsigned char *digest;\n+\n+\tdigest = t_malloc(SHA512_RESULTLEN);\n+\tsha512_get_digest(plaintext, strlen(plaintext), digest);\n+\n+\t*raw_password_r = digest;\n+\t*size_r = SHA512_RESULTLEN;\n+}\n+\n+static void\n ssha_generate(const char *plaintext, const char *user ATTR_UNUSED,\n \t const unsigned char **raw_password_r, size_t *size_r)\n {\n@@ -473,6 +486,47 @@\n \t\t size - SHA256_RESULTLEN);\n \tsha256_result(&ctx, sha256_digest);\n \treturn memcmp(sha256_digest, raw_password, SHA256_RESULTLEN) == 0;\n+}\n+\n+static void\n+ssha512_generate(const char *plaintext, const char *user ATTR_UNUSED,\n+\t\t const unsigned char **raw_password_r, size_t *size_r)\n+{\n+#define SSHA512_SALT_LEN 4\n+\tunsigned char *digest, *salt;\n+\tstruct sha512_ctx ctx;\n+\n+\tdigest = t_malloc(SHA512_RESULTLEN + SSHA512_SALT_LEN);\n+\tsalt = digest + SHA512_RESULTLEN;\n+\trandom_fill(salt, SSHA512_SALT_LEN);\n+\n+\tsha512_init(&ctx);\n+\tsha512_loop(&ctx, plaintext, strlen(plaintext));\n+\tsha512_loop(&ctx, salt, SSHA512_SALT_LEN);\n+\tsha512_result(&ctx, digest);\n+\n+\t*raw_password_r = digest;\n+\t*size_r = SHA512_RESULTLEN + SSHA512_SALT_LEN;\n+}\n+\n+static bool ssha512_verify(const char *plaintext, const char *user,\n+\t\t\t const unsigned char *raw_password, size_t size)\n+{\n+\tunsigned char sha512_digest[SHA512_RESULTLEN];\n+\tstruct sha512_ctx ctx;\n+\n+\t\/* format: <SHA512 hash><salt> *\/\n+\tif (size <= SHA512_RESULTLEN) {\n+\t\ti_error(\"ssha512_verify(%s): SSHA512 password too short\", user);\n+\t\treturn FALSE;\n+\t}\n+\n+\tsha512_init(&ctx);\n+\tsha512_loop(&ctx, plaintext, strlen(plaintext));\n+\tsha512_loop(&ctx, raw_password + SHA512_RESULTLEN,\n+\t\t size - SHA512_RESULTLEN);\n+\tsha512_result(&ctx, sha512_digest);\n+\treturn memcmp(sha512_digest, raw_password, SHA512_RESULTLEN) == 0;\n }\n \n static void\n@@ -675,9 +729,12 @@\n \t{ \"SHA1\", PW_ENCODING_BASE64, SHA1_RESULTLEN, NULL, sha1_generate },\n \t{ \"SHA256\", PW_ENCODING_BASE64, SHA256_RESULTLEN,\n \t NULL, sha256_generate },\n+ \t{ \"SHA512\", PW_ENCODING_BASE64, SHA512_RESULTLEN,\n+\t NULL, sha512_generate },\n \t{ \"SMD5\", PW_ENCODING_BASE64, 0, smd5_verify, smd5_generate },\n \t{ \"SSHA\", PW_ENCODING_BASE64, 0, ssha_verify, ssha_generate },\n \t{ \"SSHA256\", PW_ENCODING_BASE64, 0, ssha256_verify, ssha256_generate },\n+\t{ \"SSHA512\", PW_ENCODING_BASE64, 0, ssha512_verify, ssha512_generate },\n \t{ \"PLAIN\", PW_ENCODING_NONE, 0, NULL, plain_generate },\n \t{ \"CLEARTEXT\", PW_ENCODING_NONE, 0, NULL, plain_generate },\n \t{ \"CRAM-MD5\", PW_ENCODING_HEX, CRAM_MD5_CONTEXTLEN,\n"} {"commit":"dd341f96d5e2f400dde95d2e2f4993a6c278228a","subject":"Re-use existing functions, they are faster and it's cleaner.","message":"Re-use existing functions, they are faster and it's cleaner.\n","repos":"nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl,nfrechette\/acl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- includes\/acl\/math\/vector4_packing.h\n+++ includes\/acl\/math\/vector4_packing.h\n@@ -309,14 +309,8 @@\n \t\/\/ Assumes the 'vector_data' is padded in order to load up to 16 bytes from it\n \tinline Vector4_32 ACL_SIMD_CALL unpack_vector3_s48_unsafe(const uint8_t* vector_data)\n \t{\n-\t\tconst uint16_t* data_ptr_u16 = safe_ptr_cast<const uint16_t>(vector_data);\n-\t\tuint16_t x16 = data_ptr_u16[0];\n-\t\tuint16_t y16 = data_ptr_u16[1];\n-\t\tuint16_t z16 = data_ptr_u16[2];\n-\t\tfloat x = unpack_scalar_signed(x16, 16);\n-\t\tfloat y = unpack_scalar_signed(y16, 16);\n-\t\tfloat z = unpack_scalar_signed(z16, 16);\n-\t\treturn vector_set(x, y, z);\n+\t\tVector4_32 unsigned_value = unpack_vector3_u48_unsafe(vector_data);\n+\t\treturn vector_sub(vector_mul(unsigned_value, 2.0f), vector_set(1.0f));\n \t}\n \n \tACL_DEPRECATED(\"Use unpack_vector3_u48_unsafe and unpack_vector3_s48_unsafe instead, to be removed in v2.0\")\n@@ -443,13 +437,8 @@\n \t\/\/ Assumes the 'vector_data' is padded in order to load up to 16 bytes from it\n \tinline Vector4_32 ACL_SIMD_CALL unpack_vector3_s24_unsafe(const uint8_t* vector_data)\n \t{\n-\t\tuint8_t x8 = vector_data[0];\n-\t\tuint8_t y8 = vector_data[1];\n-\t\tuint8_t z8 = vector_data[2];\n-\t\tfloat x = unpack_scalar_signed(x8, 8);\n-\t\tfloat y = unpack_scalar_signed(y8, 8);\n-\t\tfloat z = unpack_scalar_signed(z8, 8);\n-\t\treturn vector_set(x, y, z);\n+\t\tVector4_32 unsigned_value = unpack_vector3_u24_unsafe(vector_data);\n+\t\treturn vector_sub(vector_mul(unsigned_value, 2.0f), vector_set(1.0f));\n \t}\n \n \tACL_DEPRECATED(\"Use unpack_vector3_u24_unsafe and unpack_vector3_s24_unsafe instead, to be removed in v2.0\")\n"} {"commit":"f735d5539d6ff29ac548ab77097b9417bcf5cfe9","subject":"0.1.3 309 #fix check for assertion before assignment","message":"0.1.3 309 #fix check for assertion before assignment\n","repos":"spinlockirqsave\/rsyncme,spinlockirqsave\/rsyncme","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/rm_session.c\n+++ src\/rm_session.c\n@@ -470,13 +470,6 @@\n \t}\n assert((prvt_local != NULL) ^ (prvt_tx != NULL));\n \n- assert((s->type == RM_PUSH_LOCAL && f_y != NULL) || s->type == RM_PUSH_TX);\n- assert((s->type == RM_PUSH_LOCAL && f_z != NULL) || s->type == RM_PUSH_TX);\n- if (s->type == RM_PUSH_LOCAL && (f_y == NULL || f_z == NULL)) {\n- status = RM_RX_STATUS_INTERNAL_ERR;\n- goto err_exit;\n- }\n-\n \tif (s->type == RM_PUSH_LOCAL) {\n \t\tbytes_to_rx = s->f_x_sz;\n \t\tf_y = s->f_y;\n@@ -487,6 +480,13 @@\n \t}\n rec_ctx.L = s->rec_ctx.L;\t\t\t\t\t\t\t\t\/* init reconstruction context *\/\n pthread_mutex_unlock(&s->mutex);\n+\n+ assert((s->type == RM_PUSH_LOCAL && f_y != NULL) || s->type == RM_PUSH_TX);\n+ assert((s->type == RM_PUSH_LOCAL && f_z != NULL) || s->type == RM_PUSH_TX);\n+ if (s->type == RM_PUSH_LOCAL && (f_y == NULL || f_z == NULL)) {\n+ status = RM_RX_STATUS_INTERNAL_ERR;\n+ goto err_exit;\n+ }\n \n if (bytes_to_rx == 0)\n goto done;\n"} {"commit":"f690acf1044b823edbe85a67f5503a4c111bff2e","subject":"Async_NotifyHandler must save and restore ImmediateInterruptOK. Fixes known problem with failure to respond to 'pg_ctl stop -m fast', and probable problems if SIGINT or SIGTERM arrives while processing a SIGUSR2 interrupt that arrived while waiting for a new client query.","message":"Async_NotifyHandler must save and restore ImmediateInterruptOK. Fixes\nknown problem with failure to respond to 'pg_ctl stop -m fast', and\nprobable problems if SIGINT or SIGTERM arrives while processing a\nSIGUSR2 interrupt that arrived while waiting for a new client query.\n","repos":"royc1\/gpdb,xuegang\/gpdb,lisakowen\/gpdb,Quikling\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,edespino\/gpdb,snaga\/postgres-xl,randomtask1155\/gpdb,CraigHarris\/gpdb,50wu\/gpdb,Chibin\/gpdb,Quikling\/gpdb,xuegang\/gpdb,pavanvd\/postgres-xl,snaga\/postgres-xl,kaknikhil\/gpdb,edespino\/gpdb,0x0FFF\/gpdb,cjcjameson\/gpdb,kaknikhil\/gpdb,ovr\/postgres-xl,Quikling\/gpdb,foyzur\/gpdb,yazun\/postgres-xl,Postgres-XL\/Postgres-XL,Quikling\/gpdb,kmjungersen\/PostgresXL,Quikling\/gpdb,xinzweb\/gpdb,50wu\/gpdb,royc1\/gpdb,royc1\/gpdb,ahachete\/gpdb,arcivanov\/postgres-xl,randomtask1155\/gpdb,tpostgres-projects\/tPostgres,adam8157\/gpdb,foyzur\/gpdb,lpetrov-pivotal\/gpdb,xinzweb\/gpdb,tangp3\/gpdb,rubikloud\/gpdb,xuegang\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,xinzweb\/gpdb,rubikloud\/gpdb,tangp3\/gpdb,chrishajas\/gpdb,lpetrov-pivotal\/gpdb,edespino\/gpdb,snaga\/postgres-xl,zeroae\/postgres-xl,xinzweb\/gpdb,tpostgres-projects\/tPostgres,lpetrov-pivotal\/gpdb,lintzc\/gpdb,Chibin\/gpdb,techdragon\/Postgres-XL,kaknikhil\/gpdb,rvs\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,adam8157\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,kaknikhil\/gpdb,arcivanov\/postgres-xl,pavanvd\/postgres-xl,adam8157\/gpdb,50wu\/gpdb,zaksoup\/gpdb,ovr\/postgres-xl,atris\/gpdb,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,randomtask1155\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,zaksoup\/gpdb,rvs\/gpdb,lintzc\/gpdb,ashwinstar\/gpdb,ahachete\/gpdb,tpostgres-projects\/tPostgres,Quikling\/gpdb,postmind-net\/postgres-xl,Quikling\/gpdb,rvs\/gpdb,pavanvd\/postgres-xl,Chibin\/gpdb,chrishajas\/gpdb,greenplum-db\/gpdb,pavanvd\/postgres-xl,kaknikhil\/gpdb,foyzur\/gpdb,rvs\/gpdb,xuegang\/gpdb,tangp3\/gpdb,royc1\/gpdb,CraigHarris\/gpdb,ahachete\/gpdb,kmjungersen\/PostgresXL,kaknikhil\/gpdb,postmind-net\/postgres-xl,janebeckman\/gpdb,Quikling\/gpdb,techdragon\/Postgres-XL,kaknikhil\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,Quikling\/gpdb,zaksoup\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,techdragon\/Postgres-XL,rubikloud\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,50wu\/gpdb,yuanzhao\/gpdb,atris\/gpdb,lpetrov-pivotal\/gpdb,kaknikhil\/gpdb,Chibin\/gpdb,tangp3\/gpdb,rubikloud\/gpdb,Postgres-XL\/Postgres-XL,ashwinstar\/gpdb,zeroae\/postgres-xl,xuegang\/gpdb,edespino\/gpdb,ashwinstar\/gpdb,chrishajas\/gpdb,janebeckman\/gpdb,zaksoup\/gpdb,yazun\/postgres-xl,janebeckman\/gpdb,0x0FFF\/gpdb,xuegang\/gpdb,lintzc\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,Chibin\/gpdb,snaga\/postgres-xl,xuegang\/gpdb,50wu\/gpdb,randomtask1155\/gpdb,chrishajas\/gpdb,0x0FFF\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,randomtask1155\/gpdb,yazun\/postgres-xl,0x0FFF\/gpdb,atris\/gpdb,ovr\/postgres-xl,oberstet\/postgres-xl,greenplum-db\/gpdb,CraigHarris\/gpdb,CraigHarris\/gpdb,jmcatamney\/gpdb,janebeckman\/gpdb,royc1\/gpdb,cjcjameson\/gpdb,cjcjameson\/gpdb,yazun\/postgres-xl,oberstet\/postgres-xl,rvs\/gpdb,50wu\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,royc1\/gpdb,foyzur\/gpdb,kmjungersen\/PostgresXL,Chibin\/gpdb,zeroae\/postgres-xl,techdragon\/Postgres-XL,cjcjameson\/gpdb,xuegang\/gpdb,50wu\/gpdb,rvs\/gpdb,ahachete\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,postmind-net\/postgres-xl,cjcjameson\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,atris\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,chrishajas\/gpdb,zaksoup\/gpdb,lintzc\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,kmjungersen\/PostgresXL,Postgres-XL\/Postgres-XL,chrishajas\/gpdb,lintzc\/gpdb,lpetrov-pivotal\/gpdb,CraigHarris\/gpdb,ovr\/postgres-xl,0x0FFF\/gpdb,rvs\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,ahachete\/gpdb,atris\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,janebeckman\/gpdb,royc1\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,edespino\/gpdb,oberstet\/postgres-xl,arcivanov\/postgres-xl,greenplum-db\/gpdb,greenplum-db\/gpdb,randomtask1155\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,foyzur\/gpdb,kmjungersen\/PostgresXL,ashwinstar\/gpdb,snaga\/postgres-xl,ovr\/postgres-xl,Chibin\/gpdb,chrishajas\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,edespino\/gpdb,royc1\/gpdb,oberstet\/postgres-xl,janebeckman\/gpdb,atris\/gpdb,rubikloud\/gpdb,50wu\/gpdb,yuanzhao\/gpdb,ashwinstar\/gpdb,lintzc\/gpdb,atris\/gpdb,rvs\/gpdb,greenplum-db\/gpdb,zeroae\/postgres-xl,tangp3\/gpdb,tangp3\/gpdb,Quikling\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,ahachete\/gpdb,zeroae\/postgres-xl,foyzur\/gpdb,Postgres-XL\/Postgres-XL,0x0FFF\/gpdb,ahachete\/gpdb,jmcatamney\/gpdb,postmind-net\/postgres-xl,xinzweb\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,atris\/gpdb,techdragon\/Postgres-XL,lpetrov-pivotal\/gpdb,lisakowen\/gpdb,arcivanov\/postgres-xl,jmcatamney\/gpdb,greenplum-db\/gpdb,ahachete\/gpdb,0x0FFF\/gpdb,lpetrov-pivotal\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,postmind-net\/postgres-xl,rubikloud\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,tangp3\/gpdb,oberstet\/postgres-xl,cjcjameson\/gpdb,lisakowen\/gpdb,rubikloud\/gpdb,kaknikhil\/gpdb,yazun\/postgres-xl,lisakowen\/gpdb,lintzc\/gpdb,yuanzhao\/gpdb,chrishajas\/gpdb,tpostgres-projects\/tPostgres,Chibin\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/commands\/async.c\n+++ src\/backend\/commands\/async.c\n@@ -7,7 +7,7 @@\n * Portions Copyright (c) 1994, Regents of the University of California\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/commands\/async.c,v 1.91 2002\/09\/16 01:24:41 tgl Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/commands\/async.c,v 1.92 2003\/02\/18 02:53:29 tgl Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -599,6 +599,16 @@\n \n \tif (notifyInterruptEnabled)\n \t{\n+\t\tbool\t\tsave_ImmediateInterruptOK = ImmediateInterruptOK;\n+\n+\t\t\/*\n+\t\t * We may be called while ImmediateInterruptOK is true; turn it off\n+\t\t * while messing with the NOTIFY state. (We would have to save\n+\t\t * and restore it anyway, because PGSemaphore operations inside\n+\t\t * ProcessIncomingNotify() might reset it.)\n+\t\t *\/\n+\t\tImmediateInterruptOK = false;\n+\n \t\t\/*\n \t\t * I'm not sure whether some flavors of Unix might allow another\n \t\t * SIGUSR2 occurrence to recursively interrupt this routine. To\n@@ -626,6 +636,13 @@\n \t\t\t\t\telog(LOG, \"Async_NotifyHandler: done\");\n \t\t\t}\n \t\t}\n+\n+\t\t\/*\n+\t\t * Restore ImmediateInterruptOK, and check for interrupts if needed.\n+\t\t *\/\n+\t\tImmediateInterruptOK = save_ImmediateInterruptOK;\n+\t\tif (save_ImmediateInterruptOK)\n+\t\t\tCHECK_FOR_INTERRUPTS();\n \t}\n \telse\n \t{\n"} {"commit":"3af536a15b64b9cfd8464af2032ccf5e66e79439","subject":"RelationForgetRelation not needed in heap_destroy().","message":"RelationForgetRelation not needed in heap_destroy().\n\nVadim.\n","repos":"randomtask1155\/gpdb,ashwinstar\/gpdb,Quikling\/gpdb,50wu\/gpdb,lpetrov-pivotal\/gpdb,arcivanov\/postgres-xl,chrishajas\/gpdb,rvs\/gpdb,royc1\/gpdb,cjcjameson\/gpdb,cjcjameson\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,foyzur\/gpdb,Chibin\/gpdb,rubikloud\/gpdb,0x0FFF\/gpdb,randomtask1155\/gpdb,xuegang\/gpdb,pavanvd\/postgres-xl,Quikling\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,0x0FFF\/gpdb,adam8157\/gpdb,kmjungersen\/PostgresXL,greenplum-db\/gpdb,atris\/gpdb,janebeckman\/gpdb,CraigHarris\/gpdb,ovr\/postgres-xl,yuanzhao\/gpdb,greenplum-db\/gpdb,kmjungersen\/PostgresXL,xuegang\/gpdb,rvs\/gpdb,lintzc\/gpdb,greenplum-db\/gpdb,Chibin\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,rvs\/gpdb,cjcjameson\/gpdb,snaga\/postgres-xl,rubikloud\/gpdb,oberstet\/postgres-xl,edespino\/gpdb,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,edespino\/gpdb,xuegang\/gpdb,yazun\/postgres-xl,tangp3\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,pavanvd\/postgres-xl,greenplum-db\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,royc1\/gpdb,tpostgres-projects\/tPostgres,royc1\/gpdb,rvs\/gpdb,ahachete\/gpdb,ahachete\/gpdb,cjcjameson\/gpdb,zaksoup\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,xuegang\/gpdb,ovr\/postgres-xl,jmcatamney\/gpdb,lisakowen\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,ahachete\/gpdb,yuanzhao\/gpdb,postmind-net\/postgres-xl,lisakowen\/gpdb,xuegang\/gpdb,foyzur\/gpdb,ovr\/postgres-xl,kaknikhil\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,lintzc\/gpdb,royc1\/gpdb,edespino\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,randomtask1155\/gpdb,ahachete\/gpdb,pavanvd\/postgres-xl,rvs\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,royc1\/gpdb,ahachete\/gpdb,tpostgres-projects\/tPostgres,yazun\/postgres-xl,lisakowen\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,kaknikhil\/gpdb,snaga\/postgres-xl,xinzweb\/gpdb,kmjungersen\/PostgresXL,lintzc\/gpdb,adam8157\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,Postgres-XL\/Postgres-XL,pavanvd\/postgres-xl,yuanzhao\/gpdb,ovr\/postgres-xl,cjcjameson\/gpdb,Chibin\/gpdb,yazun\/postgres-xl,zeroae\/postgres-xl,zeroae\/postgres-xl,Quikling\/gpdb,zeroae\/postgres-xl,zeroae\/postgres-xl,rubikloud\/gpdb,rubikloud\/gpdb,zaksoup\/gpdb,ahachete\/gpdb,atris\/gpdb,chrishajas\/gpdb,techdragon\/Postgres-XL,foyzur\/gpdb,techdragon\/Postgres-XL,chrishajas\/gpdb,Postgres-XL\/Postgres-XL,atris\/gpdb,tangp3\/gpdb,jmcatamney\/gpdb,chrishajas\/gpdb,postmind-net\/postgres-xl,snaga\/postgres-xl,50wu\/gpdb,CraigHarris\/gpdb,randomtask1155\/gpdb,foyzur\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,oberstet\/postgres-xl,Chibin\/gpdb,yazun\/postgres-xl,atris\/gpdb,edespino\/gpdb,arcivanov\/postgres-xl,adam8157\/gpdb,xinzweb\/gpdb,Chibin\/gpdb,Quikling\/gpdb,rvs\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,50wu\/gpdb,randomtask1155\/gpdb,adam8157\/gpdb,50wu\/gpdb,chrishajas\/gpdb,adam8157\/gpdb,foyzur\/gpdb,yuanzhao\/gpdb,yazun\/postgres-xl,lintzc\/gpdb,arcivanov\/postgres-xl,greenplum-db\/gpdb,Quikling\/gpdb,tpostgres-projects\/tPostgres,tangp3\/gpdb,xuegang\/gpdb,zeroae\/postgres-xl,arcivanov\/postgres-xl,ahachete\/gpdb,ashwinstar\/gpdb,CraigHarris\/gpdb,ashwinstar\/gpdb,ovr\/postgres-xl,rvs\/gpdb,jmcatamney\/gpdb,janebeckman\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,snaga\/postgres-xl,postmind-net\/postgres-xl,rubikloud\/gpdb,atris\/gpdb,janebeckman\/gpdb,tangp3\/gpdb,ahachete\/gpdb,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,foyzur\/gpdb,jmcatamney\/gpdb,chrishajas\/gpdb,Quikling\/gpdb,oberstet\/postgres-xl,techdragon\/Postgres-XL,50wu\/gpdb,lpetrov-pivotal\/gpdb,rvs\/gpdb,janebeckman\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,rubikloud\/gpdb,randomtask1155\/gpdb,chrishajas\/gpdb,lintzc\/gpdb,ashwinstar\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,Postgres-XL\/Postgres-XL,lpetrov-pivotal\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,adam8157\/gpdb,postmind-net\/postgres-xl,CraigHarris\/gpdb,zaksoup\/gpdb,xuegang\/gpdb,rvs\/gpdb,xuegang\/gpdb,royc1\/gpdb,oberstet\/postgres-xl,0x0FFF\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,kmjungersen\/PostgresXL,50wu\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lpetrov-pivotal\/gpdb,tangp3\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,lisakowen\/gpdb,lpetrov-pivotal\/gpdb,janebeckman\/gpdb,CraigHarris\/gpdb,techdragon\/Postgres-XL,lpetrov-pivotal\/gpdb,lisakowen\/gpdb,tangp3\/gpdb,adam8157\/gpdb,atris\/gpdb,janebeckman\/gpdb,oberstet\/postgres-xl,zaksoup\/gpdb,CraigHarris\/gpdb,cjcjameson\/gpdb,lisakowen\/gpdb,kmjungersen\/PostgresXL,arcivanov\/postgres-xl,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,edespino\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,lisakowen\/gpdb,atris\/gpdb,edespino\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,chrishajas\/gpdb,Quikling\/gpdb,edespino\/gpdb,foyzur\/gpdb,cjcjameson\/gpdb,tpostgres-projects\/tPostgres,xinzweb\/gpdb,xinzweb\/gpdb,tpostgres-projects\/tPostgres,50wu\/gpdb,royc1\/gpdb,postmind-net\/postgres-xl,techdragon\/Postgres-XL,foyzur\/gpdb,snaga\/postgres-xl,Chibin\/gpdb,lintzc\/gpdb,CraigHarris\/gpdb,kaknikhil\/gpdb,50wu\/gpdb,zaksoup\/gpdb,adam8157\/gpdb,pavanvd\/postgres-xl,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,0x0FFF\/gpdb,atris\/gpdb,yuanzhao\/gpdb,tangp3\/gpdb,kaknikhil\/gpdb,Quikling\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/catalog\/heap.c\n+++ src\/backend\/catalog\/heap.c\n@@ -7,7 +7,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/catalog\/heap.c,v 1.49 1998\/06\/13 20:22:53 momjian Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/catalog\/heap.c,v 1.50 1998\/06\/14 13:31:07 momjian Exp $\n *\n * INTERFACE ROUTINES\n *\t\theap_create()\t\t\t- Create an uncataloged heap relation\n@@ -1370,7 +1370,6 @@\n \trdesc->rd_tmpunlinked = TRUE;\n \theap_close(rdesc);\n \tRemoveFromTempRelList(rdesc);\n-\tRelationForgetRelation(rdesc->rd_id);\n }\n \n \n"} {"commit":"976b3862ce8f4f6c9c7bdc7e21010ffe39dba504","subject":"Currently, building on any platform that hasn't got getrusage() requires manual editing of src\/backend\/port\/getrusage.c, because its substitute version of getrusage is #if'd out.","message":"Currently, building on any platform that hasn't got getrusage()\nrequires manual editing of src\/backend\/port\/getrusage.c, because\nits substitute version of getrusage is #if'd out.\n\nThere is no good reason for that, because configure won't even\ninclude the file into the Makefile unless the platform hasn't got\ngetrusage. Furthermore, we only have one working substitute version\nof getrusage --- the alleged HPUX syscall-based code doesn't work.\n(It causes a coredump because the syscall returns a struct rusage\nthat's much larger than the stub struct defined in\nsrc\/include\/rusagestub.h.) The times()-based emulation works fine\non HPUX, however.\n\nI propose, therefore, that getrusage.c should just unconditionally\ncompile the times-based version, and rely on configure to include\nthe file only if needed. This will be one less manual configuration\nstep on all platforms that need this code.\n\nPatch attached.\n\nTom Lane.\n","repos":"royc1\/gpdb,adam8157\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,ashwinstar\/gpdb,zeroae\/postgres-xl,tangp3\/gpdb,xuegang\/gpdb,Quikling\/gpdb,ahachete\/gpdb,chrishajas\/gpdb,atris\/gpdb,lpetrov-pivotal\/gpdb,lpetrov-pivotal\/gpdb,xuegang\/gpdb,yuanzhao\/gpdb,snaga\/postgres-xl,lintzc\/gpdb,Quikling\/gpdb,adam8157\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,techdragon\/Postgres-XL,janebeckman\/gpdb,Postgres-XL\/Postgres-XL,foyzur\/gpdb,foyzur\/gpdb,greenplum-db\/gpdb,Chibin\/gpdb,edespino\/gpdb,lpetrov-pivotal\/gpdb,postmind-net\/postgres-xl,CraigHarris\/gpdb,ahachete\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,foyzur\/gpdb,Chibin\/gpdb,rubikloud\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,atris\/gpdb,royc1\/gpdb,randomtask1155\/gpdb,ahachete\/gpdb,royc1\/gpdb,lpetrov-pivotal\/gpdb,0x0FFF\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,lintzc\/gpdb,royc1\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,ahachete\/gpdb,yazun\/postgres-xl,chrishajas\/gpdb,cjcjameson\/gpdb,techdragon\/Postgres-XL,rubikloud\/gpdb,rubikloud\/gpdb,chrishajas\/gpdb,Postgres-XL\/Postgres-XL,janebeckman\/gpdb,Chibin\/gpdb,tangp3\/gpdb,arcivanov\/postgres-xl,tangp3\/gpdb,zeroae\/postgres-xl,techdragon\/Postgres-XL,lisakowen\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,oberstet\/postgres-xl,rubikloud\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,rubikloud\/gpdb,greenplum-db\/gpdb,tpostgres-projects\/tPostgres,rubikloud\/gpdb,xinzweb\/gpdb,janebeckman\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,postmind-net\/postgres-xl,50wu\/gpdb,Quikling\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,edespino\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,tangp3\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,rubikloud\/gpdb,postmind-net\/postgres-xl,yuanzhao\/gpdb,xuegang\/gpdb,arcivanov\/postgres-xl,xinzweb\/gpdb,jmcatamney\/gpdb,royc1\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,Quikling\/gpdb,Postgres-XL\/Postgres-XL,rvs\/gpdb,chrishajas\/gpdb,xinzweb\/gpdb,pavanvd\/postgres-xl,zaksoup\/gpdb,yuanzhao\/gpdb,randomtask1155\/gpdb,foyzur\/gpdb,ahachete\/gpdb,xuegang\/gpdb,pavanvd\/postgres-xl,postmind-net\/postgres-xl,kaknikhil\/gpdb,xinzweb\/gpdb,rvs\/gpdb,rvs\/gpdb,arcivanov\/postgres-xl,atris\/gpdb,pavanvd\/postgres-xl,janebeckman\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,arcivanov\/postgres-xl,tangp3\/gpdb,oberstet\/postgres-xl,Postgres-XL\/Postgres-XL,0x0FFF\/gpdb,atris\/gpdb,atris\/gpdb,kmjungersen\/PostgresXL,edespino\/gpdb,atris\/gpdb,zaksoup\/gpdb,lpetrov-pivotal\/gpdb,lpetrov-pivotal\/gpdb,0x0FFF\/gpdb,pavanvd\/postgres-xl,edespino\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,zeroae\/postgres-xl,adam8157\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,ashwinstar\/gpdb,Chibin\/gpdb,ahachete\/gpdb,Quikling\/gpdb,50wu\/gpdb,xinzweb\/gpdb,chrishajas\/gpdb,techdragon\/Postgres-XL,cjcjameson\/gpdb,greenplum-db\/gpdb,lintzc\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,kmjungersen\/PostgresXL,ashwinstar\/gpdb,yazun\/postgres-xl,jmcatamney\/gpdb,greenplum-db\/gpdb,CraigHarris\/gpdb,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,tpostgres-projects\/tPostgres,pavanvd\/postgres-xl,yuanzhao\/gpdb,lintzc\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,lisakowen\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,randomtask1155\/gpdb,kmjungersen\/PostgresXL,jmcatamney\/gpdb,zaksoup\/gpdb,ovr\/postgres-xl,ovr\/postgres-xl,janebeckman\/gpdb,adam8157\/gpdb,lintzc\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,50wu\/gpdb,rvs\/gpdb,Chibin\/gpdb,chrishajas\/gpdb,CraigHarris\/gpdb,ahachete\/gpdb,rvs\/gpdb,royc1\/gpdb,tpostgres-projects\/tPostgres,Chibin\/gpdb,0x0FFF\/gpdb,edespino\/gpdb,tangp3\/gpdb,CraigHarris\/gpdb,royc1\/gpdb,chrishajas\/gpdb,kmjungersen\/PostgresXL,xinzweb\/gpdb,tpostgres-projects\/tPostgres,edespino\/gpdb,50wu\/gpdb,atris\/gpdb,yazun\/postgres-xl,CraigHarris\/gpdb,lintzc\/gpdb,techdragon\/Postgres-XL,CraigHarris\/gpdb,edespino\/gpdb,chrishajas\/gpdb,zeroae\/postgres-xl,janebeckman\/gpdb,cjcjameson\/gpdb,snaga\/postgres-xl,Quikling\/gpdb,0x0FFF\/gpdb,snaga\/postgres-xl,rubikloud\/gpdb,cjcjameson\/gpdb,lpetrov-pivotal\/gpdb,ashwinstar\/gpdb,ovr\/postgres-xl,50wu\/gpdb,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,zaksoup\/gpdb,randomtask1155\/gpdb,arcivanov\/postgres-xl,snaga\/postgres-xl,kmjungersen\/PostgresXL,edespino\/gpdb,rvs\/gpdb,foyzur\/gpdb,rvs\/gpdb,Chibin\/gpdb,adam8157\/gpdb,kaknikhil\/gpdb,oberstet\/postgres-xl,oberstet\/postgres-xl,lintzc\/gpdb,kaknikhil\/gpdb,xuegang\/gpdb,royc1\/gpdb,tangp3\/gpdb,ovr\/postgres-xl,yazun\/postgres-xl,kaknikhil\/gpdb,xuegang\/gpdb,foyzur\/gpdb,ahachete\/gpdb,rvs\/gpdb,randomtask1155\/gpdb,postmind-net\/postgres-xl,CraigHarris\/gpdb,foyzur\/gpdb,oberstet\/postgres-xl,randomtask1155\/gpdb,zaksoup\/gpdb,50wu\/gpdb,0x0FFF\/gpdb,ovr\/postgres-xl,cjcjameson\/gpdb,foyzur\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,snaga\/postgres-xl,greenplum-db\/gpdb,CraigHarris\/gpdb,atris\/gpdb,lintzc\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,yazun\/postgres-xl,zeroae\/postgres-xl,edespino\/gpdb,rvs\/gpdb,50wu\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/port\/getrusage.c\n+++ src\/backend\/port\/getrusage.c\n@@ -1,16 +1,20 @@\n-\/* $Id: getrusage.c,v 1.8 1998\/06\/19 02:55:04 momjian Exp $ *\/\n-\n-#include <math.h>\t\t\t\t\/* for pow() prototype *\/\n+\/* $Id: getrusage.c,v 1.9 1998\/07\/13 16:39:07 momjian Exp $ *\/\n \n #include <errno.h>\n #include \"rusagestub.h\"\n \n-#if 0\t\t\t\t\t\t\t\/* this is from univel port ... how does\n-\t\t\t\t\t\t\t\t * compiler define? *\/\n- \/* same for solaris_i386 port ... how does compiler define? *\/\n- \/* same for sco port ... how does compiler define? *\/\n- \/* same for solaris_sparc port ... how does compiler define? *\/\n- \/* same for svr4 port ... how does compiler define? *\/\n+\/* This code works on:\n+ *\t\tunivel\n+ *\t\tsolaris_i386\n+ *\t\tsco\n+ *\t\tsolaris_sparc\n+ *\t\tsvr4\n+ *\t\thpux 9.*\n+ * which currently is all the supported platforms that don't have a\n+ * native version of getrusage(). So, if configure decides to compile\n+ * this file at all, we just use this version unconditionally.\n+ *\/\n+\n int\n getrusage(int who, struct rusage * rusage)\n {\n@@ -51,14 +55,3 @@\n \trusage->ru_stime.tv_usec = TICK_TO_USEC(u, tick_rate);\n \treturn (0);\n }\n-\n-#endif\n-\n-#if 0\t\t\t\t\t\t\t\/* this is for hpux port ... how does\n-\t\t\t\t\t\t\t\t * compiler define? *\/\n-getrusage(int who, struct rusage * ru)\n-{\n-\treturn (syscall(SYS_GETRUSAGE, who, ru));\n-}\n-\n-#endif\n"} {"commit":"6085ff59cb5f0275563086db2736faf8df312774","subject":"reduce num of tuples per tile group","message":"reduce num of tuples per tile group\n","repos":"Ghatage\/peloton,amaliujia\/peloton,amaliujia\/peloton,Ghatage\/peloton,Ghatage\/peloton,Ghatage\/peloton,amaliujia\/peloton,Ghatage\/peloton,amaliujia\/peloton,amaliujia\/peloton,amaliujia\/peloton,Ghatage\/peloton,amaliujia\/peloton,Ghatage\/peloton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/common\/types.h\n+++ src\/backend\/common\/types.h\n@@ -55,7 +55,7 @@\n #define DEFAULT_DB_ID 12345\n #define DEFAULT_DB_NAME \"default\"\n \n-#define DEFAULT_TUPLES_PER_TILEGROUP 1000\n+#define DEFAULT_TUPLES_PER_TILEGROUP 10\n \n \/\/===--------------------------------------------------------------------===\/\/\n \/\/ Other Constants\n"} {"commit":"332c694085611df78ddc58dfcd46f43e6bb088aa","subject":"Fix nasty little order-of-operations bug in _SPI_cursor_operation. Per report from Mendola Gaetano.","message":"Fix nasty little order-of-operations bug in _SPI_cursor_operation.\nPer report from Mendola Gaetano.\n","repos":"oberstet\/postgres-xl,Chibin\/gpdb,xinzweb\/gpdb,lpetrov-pivotal\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,pavanvd\/postgres-xl,rvs\/gpdb,ahachete\/gpdb,xuegang\/gpdb,xuegang\/gpdb,oberstet\/postgres-xl,ovr\/postgres-xl,0x0FFF\/gpdb,ovr\/postgres-xl,tangp3\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,pavanvd\/postgres-xl,ahachete\/gpdb,janebeckman\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,rubikloud\/gpdb,janebeckman\/gpdb,arcivanov\/postgres-xl,postmind-net\/postgres-xl,CraigHarris\/gpdb,Quikling\/gpdb,postmind-net\/postgres-xl,cjcjameson\/gpdb,lintzc\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,yuanzhao\/gpdb,rubikloud\/gpdb,royc1\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,foyzur\/gpdb,royc1\/gpdb,foyzur\/gpdb,xuegang\/gpdb,greenplum-db\/gpdb,rvs\/gpdb,0x0FFF\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,50wu\/gpdb,arcivanov\/postgres-xl,lisakowen\/gpdb,ovr\/postgres-xl,tpostgres-projects\/tPostgres,lpetrov-pivotal\/gpdb,zaksoup\/gpdb,lpetrov-pivotal\/gpdb,kmjungersen\/PostgresXL,CraigHarris\/gpdb,0x0FFF\/gpdb,janebeckman\/gpdb,oberstet\/postgres-xl,ahachete\/gpdb,Postgres-XL\/Postgres-XL,ahachete\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,royc1\/gpdb,Postgres-XL\/Postgres-XL,kmjungersen\/PostgresXL,yazun\/postgres-xl,0x0FFF\/gpdb,jmcatamney\/gpdb,xuegang\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,kaknikhil\/gpdb,arcivanov\/postgres-xl,adam8157\/gpdb,zaksoup\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,zeroae\/postgres-xl,arcivanov\/postgres-xl,pavanvd\/postgres-xl,tpostgres-projects\/tPostgres,rvs\/gpdb,postmind-net\/postgres-xl,tpostgres-projects\/tPostgres,atris\/gpdb,ashwinstar\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,xuegang\/gpdb,50wu\/gpdb,Quikling\/gpdb,techdragon\/Postgres-XL,rvs\/gpdb,randomtask1155\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,randomtask1155\/gpdb,Chibin\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,edespino\/gpdb,rvs\/gpdb,cjcjameson\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,atris\/gpdb,lintzc\/gpdb,techdragon\/Postgres-XL,lisakowen\/gpdb,tangp3\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,royc1\/gpdb,janebeckman\/gpdb,edespino\/gpdb,0x0FFF\/gpdb,rvs\/gpdb,zaksoup\/gpdb,edespino\/gpdb,rubikloud\/gpdb,edespino\/gpdb,lpetrov-pivotal\/gpdb,lpetrov-pivotal\/gpdb,adam8157\/gpdb,randomtask1155\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,royc1\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,foyzur\/gpdb,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,CraigHarris\/gpdb,Postgres-XL\/Postgres-XL,postmind-net\/postgres-xl,Chibin\/gpdb,ashwinstar\/gpdb,ovr\/postgres-xl,xuegang\/gpdb,kaknikhil\/gpdb,snaga\/postgres-xl,Quikling\/gpdb,Quikling\/gpdb,50wu\/gpdb,kaknikhil\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,zeroae\/postgres-xl,adam8157\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,oberstet\/postgres-xl,arcivanov\/postgres-xl,jmcatamney\/gpdb,tangp3\/gpdb,lintzc\/gpdb,pavanvd\/postgres-xl,rvs\/gpdb,lpetrov-pivotal\/gpdb,randomtask1155\/gpdb,yuanzhao\/gpdb,pavanvd\/postgres-xl,ovr\/postgres-xl,CraigHarris\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,xuegang\/gpdb,Chibin\/gpdb,0x0FFF\/gpdb,snaga\/postgres-xl,zaksoup\/gpdb,oberstet\/postgres-xl,chrishajas\/gpdb,royc1\/gpdb,chrishajas\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,Quikling\/gpdb,CraigHarris\/gpdb,lpetrov-pivotal\/gpdb,atris\/gpdb,ahachete\/gpdb,lintzc\/gpdb,arcivanov\/postgres-xl,cjcjameson\/gpdb,greenplum-db\/gpdb,Postgres-XL\/Postgres-XL,cjcjameson\/gpdb,kmjungersen\/PostgresXL,xinzweb\/gpdb,yazun\/postgres-xl,Chibin\/gpdb,rubikloud\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,snaga\/postgres-xl,50wu\/gpdb,rubikloud\/gpdb,janebeckman\/gpdb,adam8157\/gpdb,lpetrov-pivotal\/gpdb,tangp3\/gpdb,adam8157\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,postmind-net\/postgres-xl,snaga\/postgres-xl,yuanzhao\/gpdb,greenplum-db\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,kmjungersen\/PostgresXL,yazun\/postgres-xl,greenplum-db\/gpdb,tangp3\/gpdb,lintzc\/gpdb,atris\/gpdb,atris\/gpdb,Chibin\/gpdb,cjcjameson\/gpdb,royc1\/gpdb,chrishajas\/gpdb,50wu\/gpdb,edespino\/gpdb,lisakowen\/gpdb,techdragon\/Postgres-XL,50wu\/gpdb,zeroae\/postgres-xl,tangp3\/gpdb,ahachete\/gpdb,greenplum-db\/gpdb,chrishajas\/gpdb,cjcjameson\/gpdb,tangp3\/gpdb,CraigHarris\/gpdb,xuegang\/gpdb,foyzur\/gpdb,rubikloud\/gpdb,greenplum-db\/gpdb,rubikloud\/gpdb,Chibin\/gpdb,ahachete\/gpdb,Quikling\/gpdb,50wu\/gpdb,foyzur\/gpdb,randomtask1155\/gpdb,tpostgres-projects\/tPostgres,Quikling\/gpdb,royc1\/gpdb,rvs\/gpdb,kaknikhil\/gpdb,ahachete\/gpdb,atris\/gpdb,foyzur\/gpdb,lintzc\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,lintzc\/gpdb,zeroae\/postgres-xl,jmcatamney\/gpdb,ashwinstar\/gpdb,foyzur\/gpdb,CraigHarris\/gpdb,jmcatamney\/gpdb,snaga\/postgres-xl,zaksoup\/gpdb,xuegang\/gpdb,atris\/gpdb,randomtask1155\/gpdb,lintzc\/gpdb,jmcatamney\/gpdb,cjcjameson\/gpdb,xinzweb\/gpdb,atris\/gpdb,Postgres-XL\/Postgres-XL,yuanzhao\/gpdb,techdragon\/Postgres-XL,yazun\/postgres-xl,50wu\/gpdb,chrishajas\/gpdb,chrishajas\/gpdb,edespino\/gpdb,jmcatamney\/gpdb,edespino\/gpdb,yuanzhao\/gpdb,kaknikhil\/gpdb,lisakowen\/gpdb,yazun\/postgres-xl,Quikling\/gpdb,zeroae\/postgres-xl,yuanzhao\/gpdb,zaksoup\/gpdb,tangp3\/gpdb,adam8157\/gpdb,foyzur\/gpdb,chrishajas\/gpdb,edespino\/gpdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/backend\/executor\/spi.c\n+++ src\/backend\/executor\/spi.c\n@@ -8,7 +8,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/executor\/spi.c,v 1.101 2003\/08\/04 02:39:59 momjian Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/executor\/spi.c,v 1.102 2003\/08\/08 19:18:21 tgl Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -1263,6 +1263,8 @@\n _SPI_cursor_operation(Portal portal, bool forward, int count,\n \t\t\t\t\t DestReceiver *dest)\n {\n+\tlong\tnfetched;\n+\n \t\/* Check that the portal is valid *\/\n \tif (!PortalIsValid(portal))\n \t\telog(ERROR, \"invalid portal in SPI cursor operation\");\n@@ -1277,11 +1279,20 @@\n \t_SPI_current->tuptable = NULL;\n \n \t\/* Run the cursor *\/\n-\t_SPI_current->processed =\n-\t\tPortalRunFetch(portal,\n-\t\t\t\t\t forward ? FETCH_FORWARD : FETCH_BACKWARD,\n-\t\t\t\t\t (long) count,\n-\t\t\t\t\t dest);\n+\tnfetched = PortalRunFetch(portal,\n+\t\t\t\t\t\t\t forward ? FETCH_FORWARD : FETCH_BACKWARD,\n+\t\t\t\t\t\t\t (long) count,\n+\t\t\t\t\t\t\t dest);\n+\n+\t\/*\n+\t * Think not to combine this store with the preceding function call.\n+\t * If the portal contains calls to functions that use SPI, then\n+\t * SPI_stack is likely to move around while the portal runs. When\n+\t * control returns, _SPI_current will point to the correct stack entry...\n+\t * but the pointer may be different than it was beforehand. So we must\n+\t * be sure to re-fetch the pointer after the function call completes.\n+\t *\/\n+\t_SPI_current->processed = nfetched;\n \n \tif (dest->mydest == SPI && _SPI_checktuples())\n \t\telog(ERROR, \"consistency check on SPI tuple count failed\");\n"} {"commit":"28f95668e070d4cbe81c48f22e0a931e23ab4919","subject":"Revert \"AVX-512: Handle curly braces in multi-line macro parameters\"","message":"Revert \"AVX-512: Handle curly braces in multi-line macro parameters\"\n\nThis reverts commit a800aed7b75d56114f2e1e4928cbc48ecf96a4a0.\n\nAs recommended by the community, braces inside a group parameter\nof multi-line macro should be parsed without a need of a leading\nescape character such as \"\\{ab,c\\}\".\n\nSigned-off-by: Jin Kyu Song <636a629b48a15ad840070a3dd8c6df980563dd68@intel.com>\n","repos":"techkey\/nasm,projedi\/nasm,projedi\/nasm,techkey\/nasm,techkey\/nasm,projedi\/nasm,projedi\/nasm,projedi\/nasm,techkey\/nasm,techkey\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- preproc.c\n+++ preproc.c\n@@ -208,7 +208,6 @@\n TOK_PREPROC_Q, TOK_PREPROC_QQ,\n TOK_PASTE, \/* %+ *\/\n TOK_INDIRECT, \/* %[...] *\/\n- TOK_BRACE, \/* \\{...\\} *\/\n TOK_SMAC_PARAM, \/* MUST BE LAST IN THE LIST!!! *\/\n TOK_MAX = INT_MAX \/* Keep compiler from reducing the range *\/\n };\n@@ -1104,10 +1103,6 @@\n type = TOK_COMMENT;\n while (*p)\n p++;\n- } else if (p[0] == '\\\\' && (p[1] == '{' || p[1] == '}')) {\n- type = TOK_BRACE;\n- p += 2;\n- line++;\n } else {\n \/*\n * Anything else is an operator of some kind. We check\n"} {"commit":"cc8dc825d8c39e8afc9709e7400a973147786284","subject":"Fix typo for default units for timespan input. Place single-ticks around bad argument in elog messages. Fix tabbing of large lookup tables (ugh).","message":"Fix typo for default units for timespan input.\nPlace single-ticks around bad argument in elog messages.\nFix tabbing of large lookup tables (ugh).\n","repos":"xinzweb\/gpdb,edespino\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,greenplum-db\/gpdb,lpetrov-pivotal\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,chrishajas\/gpdb,ahachete\/gpdb,lpetrov-pivotal\/gpdb,pavanvd\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,yazun\/postgres-xl,atris\/gpdb,ovr\/postgres-xl,rvs\/gpdb,rvs\/gpdb,50wu\/gpdb,royc1\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,xuegang\/gpdb,lintzc\/gpdb,50wu\/gpdb,techdragon\/Postgres-XL,janebeckman\/gpdb,janebeckman\/gpdb,rubikloud\/gpdb,lisakowen\/gpdb,chrishajas\/gpdb,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,arcivanov\/postgres-xl,jmcatamney\/gpdb,oberstet\/postgres-xl,edespino\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,zaksoup\/gpdb,pavanvd\/postgres-xl,rubikloud\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,Quikling\/gpdb,pavanvd\/postgres-xl,tangp3\/gpdb,tangp3\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,50wu\/gpdb,atris\/gpdb,rvs\/gpdb,atris\/gpdb,tangp3\/gpdb,royc1\/gpdb,edespino\/gpdb,randomtask1155\/gpdb,Chibin\/gpdb,postmind-net\/postgres-xl,50wu\/gpdb,ahachete\/gpdb,kmjungersen\/PostgresXL,ashwinstar\/gpdb,postmind-net\/postgres-xl,greenplum-db\/gpdb,CraigHarris\/gpdb,tangp3\/gpdb,jmcatamney\/gpdb,royc1\/gpdb,Postgres-XL\/Postgres-XL,kmjungersen\/PostgresXL,xuegang\/gpdb,kaknikhil\/gpdb,ovr\/postgres-xl,yuanzhao\/gpdb,zeroae\/postgres-xl,rvs\/gpdb,ovr\/postgres-xl,Chibin\/gpdb,oberstet\/postgres-xl,yuanzhao\/gpdb,CraigHarris\/gpdb,zeroae\/postgres-xl,atris\/gpdb,tangp3\/gpdb,0x0FFF\/gpdb,lintzc\/gpdb,edespino\/gpdb,tpostgres-projects\/tPostgres,yazun\/postgres-xl,rubikloud\/gpdb,arcivanov\/postgres-xl,Chibin\/gpdb,ashwinstar\/gpdb,janebeckman\/gpdb,randomtask1155\/gpdb,kaknikhil\/gpdb,rubikloud\/gpdb,yazun\/postgres-xl,yuanzhao\/gpdb,kmjungersen\/PostgresXL,xuegang\/gpdb,lpetrov-pivotal\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,royc1\/gpdb,chrishajas\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,adam8157\/gpdb,arcivanov\/postgres-xl,foyzur\/gpdb,xuegang\/gpdb,janebeckman\/gpdb,techdragon\/Postgres-XL,ovr\/postgres-xl,greenplum-db\/gpdb,lpetrov-pivotal\/gpdb,snaga\/postgres-xl,yuanzhao\/gpdb,zaksoup\/gpdb,randomtask1155\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,rvs\/gpdb,oberstet\/postgres-xl,jmcatamney\/gpdb,ahachete\/gpdb,kaknikhil\/gpdb,lintzc\/gpdb,CraigHarris\/gpdb,ahachete\/gpdb,CraigHarris\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,lpetrov-pivotal\/gpdb,greenplum-db\/gpdb,rvs\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,Postgres-XL\/Postgres-XL,0x0FFF\/gpdb,foyzur\/gpdb,zeroae\/postgres-xl,janebeckman\/gpdb,foyzur\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,Quikling\/gpdb,foyzur\/gpdb,randomtask1155\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,yazun\/postgres-xl,rubikloud\/gpdb,rubikloud\/gpdb,adam8157\/gpdb,ahachete\/gpdb,ahachete\/gpdb,atris\/gpdb,greenplum-db\/gpdb,kaknikhil\/gpdb,royc1\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,royc1\/gpdb,adam8157\/gpdb,zaksoup\/gpdb,adam8157\/gpdb,Chibin\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,pavanvd\/postgres-xl,edespino\/gpdb,edespino\/gpdb,Chibin\/gpdb,jmcatamney\/gpdb,Quikling\/gpdb,edespino\/gpdb,janebeckman\/gpdb,royc1\/gpdb,ahachete\/gpdb,snaga\/postgres-xl,tpostgres-projects\/tPostgres,Postgres-XL\/Postgres-XL,Quikling\/gpdb,xuegang\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,tpostgres-projects\/tPostgres,CraigHarris\/gpdb,edespino\/gpdb,chrishajas\/gpdb,tangp3\/gpdb,Chibin\/gpdb,jmcatamney\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,CraigHarris\/gpdb,edespino\/gpdb,xinzweb\/gpdb,chrishajas\/gpdb,oberstet\/postgres-xl,Chibin\/gpdb,50wu\/gpdb,tpostgres-projects\/tPostgres,yuanzhao\/gpdb,cjcjameson\/gpdb,rvs\/gpdb,pavanvd\/postgres-xl,kmjungersen\/PostgresXL,tangp3\/gpdb,snaga\/postgres-xl,0x0FFF\/gpdb,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,lintzc\/gpdb,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,xuegang\/gpdb,Quikling\/gpdb,yazun\/postgres-xl,ashwinstar\/gpdb,edespino\/gpdb,CraigHarris\/gpdb,zaksoup\/gpdb,jmcatamney\/gpdb,snaga\/postgres-xl,Postgres-XL\/Postgres-XL,techdragon\/Postgres-XL,lisakowen\/gpdb,kmjungersen\/PostgresXL,kaknikhil\/gpdb,atris\/gpdb,snaga\/postgres-xl,kaknikhil\/gpdb,zeroae\/postgres-xl,ahachete\/gpdb,xuegang\/gpdb,kaknikhil\/gpdb,zeroae\/postgres-xl,rvs\/gpdb,0x0FFF\/gpdb,50wu\/gpdb,tangp3\/gpdb,techdragon\/Postgres-XL,0x0FFF\/gpdb,0x0FFF\/gpdb,yuanzhao\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,Quikling\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,foyzur\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,Postgres-XL\/Postgres-XL,lpetrov-pivotal\/gpdb,arcivanov\/postgres-xl,zaksoup\/gpdb,atris\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,randomtask1155\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,oberstet\/postgres-xl,xinzweb\/gpdb,arcivanov\/postgres-xl,Quikling\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,postmind-net\/postgres-xl,atris\/gpdb,foyzur\/gpdb,50wu\/gpdb,postmind-net\/postgres-xl,Quikling\/gpdb,chrishajas\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,arcivanov\/postgres-xl,rvs\/gpdb,kaknikhil\/gpdb,foyzur\/gpdb,xuegang\/gpdb,greenplum-db\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,janebeckman\/gpdb,jmcatamney\/gpdb,chrishajas\/gpdb,ashwinstar\/gpdb,techdragon\/Postgres-XL,kaknikhil\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/adt\/dt.c\n+++ src\/backend\/utils\/adt\/dt.c\n@@ -7,7 +7,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/Attic\/dt.c,v 1.40 1997\/09\/08 21:48:23 momjian Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/Attic\/dt.c,v 1.41 1997\/09\/20 16:20:29 thomas Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -115,7 +115,7 @@\n \n \tif ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf) != 0)\n \t || (DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tz) != 0))\n-\t\telog(WARN, \"Bad datetime external representation %s\", str);\n+\t\telog(WARN, \"Bad datetime external representation '%s'\", str);\n \n \tresult = PALLOCTYPE(DateTime);\n \n@@ -123,7 +123,7 @@\n \t{\n \t\tcase DTK_DATE:\n \t\t\tif (tm2datetime(tm, fsec, &tz, result) != 0)\n-\t\t\t\telog(WARN, \"Datetime out of range %s\", str);\n+\t\t\t\telog(WARN, \"Datetime out of range '%s'\", str);\n \n #ifdef DATEDEBUG\n \t\t\tprintf(\"datetime_in- date is %f\\n\", *result);\n@@ -243,7 +243,7 @@\n #if FALSE\n \t\t\t\tTIMESPAN_INVALID(span);\n #endif\n-\t\t\t\telog(WARN, \"Bad timespan external representation %s\", str);\n+\t\t\t\telog(WARN, \"Bad timespan external representation '%s'\", str);\n \t\t\t}\n \t\t\tbreak;\n \n@@ -1488,7 +1488,7 @@\n \t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\telog(WARN, \"Datetime units %s not supported\", lowunits);\n+\t\t\t\t\telog(WARN, \"Datetime units '%s' not supported\", lowunits);\n \t\t\t\t\tresult = NULL;\n \t\t\t}\n \n@@ -1521,7 +1521,7 @@\n \t\t\t}\n \n \t\t\tif (tm2datetime(tm, fsec, &tz, result) != 0)\n-\t\t\t\telog(WARN, \"Unable to truncate datetime to %s\", lowunits);\n+\t\t\t\telog(WARN, \"Unable to truncate datetime to '%s'\", lowunits);\n \n #if FALSE\n \t\t}\n@@ -1534,7 +1534,7 @@\n \t\t}\n \t\telse\n \t\t{\n-\t\t\telog(WARN, \"Datetime units %s not recognized\", lowunits);\n+\t\t\telog(WARN, \"Datetime units '%s' not recognized\", lowunits);\n \t\t\tresult = NULL;\n \t\t}\n \t}\n@@ -1631,12 +1631,12 @@\n \t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\telog(WARN, \"Timespan units %s not supported\", lowunits);\n+\t\t\t\t\telog(WARN, \"Timespan units '%s' not supported\", lowunits);\n \t\t\t\t\tresult = NULL;\n \t\t\t}\n \n \t\t\tif (tm2timespan(tm, fsec, result) != 0)\n-\t\t\t\telog(WARN, \"Unable to truncate timespan to %s\", lowunits);\n+\t\t\t\telog(WARN, \"Unable to truncate timespan to '%s'\", lowunits);\n \n \t\t}\n \t\telse\n@@ -1660,7 +1660,7 @@\n \t}\n \telse\n \t{\n-\t\telog(WARN, \"Timespan units %s not recognized\", units);\n+\t\telog(WARN, \"Timespan units '%s' not recognized\", units);\n \t\tresult = NULL;\n \t}\n \n@@ -1782,7 +1782,7 @@\n \t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\telog(WARN, \"Datetime units %s not supported\", lowunits);\n+\t\t\t\t\telog(WARN, \"Datetime units '%s' not supported\", lowunits);\n \t\t\t\t\t*result = 0;\n \t\t\t}\n \n@@ -1804,14 +1804,14 @@\n \t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\telog(WARN, \"Datetime units %s not supported\", lowunits);\n+\t\t\t\t\telog(WARN, \"Datetime units '%s' not supported\", lowunits);\n \t\t\t\t\t*result = 0;\n \t\t\t}\n \n \t\t}\n \t\telse\n \t\t{\n-\t\t\telog(WARN, \"Datetime units %s not recognized\", lowunits);\n+\t\t\telog(WARN, \"Datetime units '%s' not recognized\", lowunits);\n \t\t\t*result = 0;\n \t\t}\n \t}\n@@ -1925,7 +1925,7 @@\n \t\t\t\t\tbreak;\n \n \t\t\t\tdefault:\n-\t\t\t\t\telog(WARN, \"Timespan units %s not yet supported\", units);\n+\t\t\t\t\telog(WARN, \"Timespan units '%s' not yet supported\", units);\n \t\t\t\t\tresult = NULL;\n \t\t\t}\n \n@@ -1949,7 +1949,7 @@\n \t}\n \telse\n \t{\n-\t\telog(WARN, \"Timespan units %s not recognized\", units);\n+\t\telog(WARN, \"Timespan units '%s' not recognized\", units);\n \t\t*result = 0;\n \t}\n \n@@ -2039,7 +2039,7 @@\n \t}\n \telse\n \t{\n-\t\telog(WARN, \"Time zone %s not recognized\", lowzone);\n+\t\telog(WARN, \"Time zone '%s' not recognized\", lowzone);\n \t\tresult = NULL;\n \t}\n \n@@ -2066,237 +2066,221 @@\n *\/\n static datetkn datetktbl[] = {\n \/*\t\ttext\t\t\ttoken\tlexval *\/\n-\t{EARLY, RESERV, DTK_EARLY}, \/* \"-infinity\" reserved for \"early time\" *\/\n-\t{\"acsst\", DTZ, 63},\t\t\t\/* Cent. Australia *\/\n-\t{\"acst\", TZ, 57},\t\t\t\/* Cent. Australia *\/\n-\t{DA_D, ADBC, AD},\t\t\t\/* \"ad\" for years >= 0 *\/\n-\t{\"abstime\", IGNORE, 0},\t\t\/* \"abstime\" for pre-v6.1 \"Invalid\n-\t\t\t\t\t\t\t\t * Abstime\" *\/\n-\t{\"adt\", DTZ, NEG(18)},\t\t\/* Atlantic Daylight Time *\/\n-\t{\"aesst\", DTZ, 66},\t\t\t\/* E. Australia *\/\n-\t{\"aest\", TZ, 60},\t\t\t\/* Australia Eastern Std Time *\/\n-\t{\"ahst\", TZ, 60},\t\t\t\/* Alaska-Hawaii Std Time *\/\n-\t{\"allballs\", RESERV, DTK_ZULU},\t\t\/* 00:00:00 *\/\n-\t{\"am\", AMPM, AM},\n-\t{\"apr\", MONTH, 4},\n-\t{\"april\", MONTH, 4},\n-\t{\"ast\", TZ, NEG(24)},\t\t\/* Atlantic Std Time (Canada) *\/\n-\t{\"at\", IGNORE, 0},\t\t\t\/* \"at\" (throwaway) *\/\n-\t{\"aug\", MONTH, 8},\n-\t{\"august\", MONTH, 8},\n-\t{\"awsst\", DTZ, 54},\t\t\t\/* W. Australia *\/\n-\t{\"awst\", TZ, 48},\t\t\t\/* W. Australia *\/\n-\t{DB_C, ADBC, BC},\t\t\t\/* \"bc\" for years < 0 *\/\n-\t{\"bst\", TZ, 6},\t\t\t\t\/* British Summer Time *\/\n-\t{\"bt\", TZ, 18},\t\t\t\t\/* Baghdad Time *\/\n-\t{\"cadt\", DTZ, 63},\t\t\t\/* Central Australian DST *\/\n-\t{\"cast\", TZ, 57},\t\t\t\/* Central Australian ST *\/\n-\t{\"cat\", TZ, NEG(60)},\t\t\/* Central Alaska Time *\/\n-\t{\"cct\", TZ, 48},\t\t\t\/* China Coast *\/\n-\t{\"cdt\", DTZ, NEG(30)},\t\t\/* Central Daylight Time *\/\n-\t{\"cet\", TZ, 6},\t\t\t\t\/* Central European Time *\/\n-\t{\"cetdst\", DTZ, 12},\t\t\/* Central European Dayl.Time *\/\n-\t{\"cst\", TZ, NEG(36)},\t\t\/* Central Standard Time *\/\n-\t{DCURRENT, RESERV, DTK_CURRENT},\t\/* \"current\" is always now *\/\n-\t{\"dec\", MONTH, 12},\n-\t{\"december\", MONTH, 12},\n-\t{\"dnt\", TZ, 6},\t\t\t\t\/* Dansk Normal Tid *\/\n-\t{\"dow\", RESERV, DTK_DOW},\t\/* day of week *\/\n-\t{\"dst\", DTZMOD, 6},\n-\t{\"east\", TZ, NEG(60)},\t\t\/* East Australian Std Time *\/\n-\t{\"edt\", DTZ, NEG(24)},\t\t\/* Eastern Daylight Time *\/\n-\t{\"eet\", TZ, 12},\t\t\t\/* East. Europe, USSR Zone 1 *\/\n-\t{\"eetdst\", DTZ, 18},\t\t\/* Eastern Europe *\/\n-\t{EPOCH, RESERV, DTK_EPOCH}, \/* \"epoch\" reserved for system epoch time *\/\n+\t{EARLY,\t\t\tRESERV,\t\tDTK_EARLY},\t\t\/* \"-infinity\" reserved for \"early time\" *\/\n+\t{\"acsst\",\t\tDTZ,\t\t63},\t\t\t\/* Cent. Australia *\/\n+\t{\"acst\",\t\tTZ,\t\t\t57},\t\t\t\/* Cent. Australia *\/\n+\t{DA_D,\t\t\tADBC,\t\tAD},\t\t\t\/* \"ad\" for years >= 0 *\/\n+\t{\"abstime\",\t\tIGNORE,\t\t0},\t\t\t\t\/* \"abstime\" for pre-v6.1 \"Invalid Abstime\" *\/\n+\t{\"adt\",\t\t\tDTZ,\t\tNEG(18)},\t\t\/* Atlantic Daylight Time *\/\n+\t{\"aesst\",\t\tDTZ,\t\t66},\t\t\t\/* E. Australia *\/\n+\t{\"aest\",\t\tTZ,\t\t\t60},\t\t\t\/* Australia Eastern Std Time *\/\n+\t{\"ahst\",\t\tTZ,\t\t\t60},\t\t\t\/* Alaska-Hawaii Std Time *\/\n+\t{\"allballs\",\tRESERV,\t\tDTK_ZULU},\t\t\/* 00:00:00 *\/\n+\t{\"am\",\t\t\tAMPM,\t\tAM},\n+\t{\"apr\",\t\t\tMONTH,\t\t4},\n+\t{\"april\",\t\tMONTH,\t\t4},\n+\t{\"ast\",\t\t\tTZ,\t\t\tNEG(24)},\t\t\/* Atlantic Std Time (Canada) *\/\n+\t{\"at\",\t\t\tIGNORE,\t\t0},\t\t\t\t\/* \"at\" (throwaway) *\/\n+\t{\"aug\",\t\t\tMONTH,\t\t8},\n+\t{\"august\",\t\tMONTH,\t\t8},\n+\t{\"awsst\",\t\tDTZ,\t\t54},\t\t\t\/* W. Australia *\/\n+\t{\"awst\",\t\tTZ,\t\t\t48},\t\t\t\/* W. Australia *\/\n+\t{DB_C,\t\t\tADBC,\t\tBC},\t\t\t\/* \"bc\" for years < 0 *\/\n+\t{\"bst\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* British Summer Time *\/\n+\t{\"bt\",\t\t\tTZ,\t\t\t18},\t\t\t\/* Baghdad Time *\/\n+\t{\"cadt\",\t\tDTZ,\t\t63},\t\t\t\/* Central Australian DST *\/\n+\t{\"cast\",\t\tTZ,\t\t\t57},\t\t\t\/* Central Australian ST *\/\n+\t{\"cat\",\t\t\tTZ,\t\t\tNEG(60)},\t\t\/* Central Alaska Time *\/\n+\t{\"cct\",\t\t\tTZ,\t\t\t48},\t\t\t\/* China Coast *\/\n+\t{\"cdt\",\t\t\tDTZ,\t\tNEG(30)},\t\t\/* Central Daylight Time *\/\n+\t{\"cet\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Central European Time *\/\n+\t{\"cetdst\",\t\tDTZ,\t\t12},\t\t\t\/* Central European Dayl.Time *\/\n+\t{\"cst\",\t\t\tTZ,\t\t\tNEG(36)},\t\t\/* Central Standard Time *\/\n+\t{DCURRENT,\t\tRESERV,\t\tDTK_CURRENT},\t\/* \"current\" is always now *\/\n+\t{\"dec\",\t\t\tMONTH,\t\t12},\n+\t{\"december\",\tMONTH,\t\t12},\n+\t{\"dnt\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Dansk Normal Tid *\/\n+\t{\"dow\",\t\t\tRESERV,\t\tDTK_DOW},\t\t\/* day of week *\/\n+\t{\"dst\",\t\t\tDTZMOD,\t\t6},\n+\t{\"east\",\t\tTZ,\t\t\tNEG(60)},\t\t\/* East Australian Std Time *\/\n+\t{\"edt\",\t\t\tDTZ,\t\tNEG(24)},\t\t\/* Eastern Daylight Time *\/\n+\t{\"eet\",\t\t\tTZ,\t\t\t12},\t\t\t\/* East. Europe, USSR Zone 1 *\/\n+\t{\"eetdst\",\t\tDTZ,\t\t18},\t\t\t\/* Eastern Europe *\/\n+\t{EPOCH,\t\t\tRESERV,\t\tDTK_EPOCH},\t\t\/* \"epoch\" reserved for system epoch time *\/\n #if USE_AUSTRALIAN_RULES\n-\t{\"est\", TZ, 60},\t\t\t\/* Australia Eastern Std Time *\/\n+\t{\"est\",\t\t\tTZ,\t\t\t60},\t\t\t\/* Australia Eastern Std Time *\/\n #else\n-\t{\"est\", TZ, NEG(30)},\t\t\/* Eastern Standard Time *\/\n-#endif\n-\t{\"feb\", MONTH, 2},\n-\t{\"february\", MONTH, 2},\n-\t{\"fri\", DOW, 5},\n-\t{\"friday\", DOW, 5},\n-\t{\"fst\", TZ, 6},\t\t\t\t\/* French Summer Time *\/\n-\t{\"fwt\", DTZ, 12},\t\t\t\/* French Winter Time *\/\n-\t{\"gmt\", TZ, 0},\t\t\t\t\/* Greenwish Mean Time *\/\n-\t{\"gst\", TZ, 60},\t\t\t\/* Guam Std Time, USSR Zone 9 *\/\n-\t{\"hdt\", DTZ, NEG(54)},\t\t\/* Hawaii\/Alaska *\/\n-\t{\"hmt\", DTZ, 18},\t\t\t\/* Hellas ? ? *\/\n-\t{\"hst\", TZ, NEG(60)},\t\t\/* Hawaii Std Time *\/\n-\t{\"idle\", TZ, 72},\t\t\t\/* Intl. Date Line, East *\/\n-\t{\"idlw\", TZ, NEG(72)},\t\t\/* Intl. Date Line, West *\/\n-\t{LATE, RESERV, DTK_LATE},\t\/* \"infinity\" reserved for \"late time\" *\/\n-\t{INVALID, RESERV, DTK_INVALID},\t\t\/* \"invalid\" reserved for invalid\n-\t\t\t\t\t\t\t\t\t\t * time *\/\n-\t{\"ist\", TZ, 12},\t\t\t\/* Israel *\/\n-\t{\"it\", TZ, 22},\t\t\t\t\/* Iran Time *\/\n-\t{\"jan\", MONTH, 1},\n-\t{\"january\", MONTH, 1},\n-\t{\"jst\", TZ, 54},\t\t\t\/* Japan Std Time,USSR Zone 8 *\/\n-\t{\"jt\", TZ, 45},\t\t\t\t\/* Java Time *\/\n-\t{\"jul\", MONTH, 7},\n-\t{\"july\", MONTH, 7},\n-\t{\"jun\", MONTH, 6},\n-\t{\"june\", MONTH, 6},\n-\t{\"kst\", TZ, 54},\t\t\t\/* Korea Standard Time *\/\n-\t{\"ligt\", TZ, 60},\t\t\t\/* From Melbourne, Australia *\/\n-\t{\"mar\", MONTH, 3},\n-\t{\"march\", MONTH, 3},\n-\t{\"may\", MONTH, 5},\n-\t{\"mdt\", DTZ, NEG(36)},\t\t\/* Mountain Daylight Time *\/\n-\t{\"mest\", DTZ, 12},\t\t\t\/* Middle Europe Summer Time *\/\n-\t{\"met\", TZ, 6},\t\t\t\t\/* Middle Europe Time *\/\n-\t{\"metdst\", DTZ, 12},\t\t\/* Middle Europe Daylight Time *\/\n-\t{\"mewt\", TZ, 6},\t\t\t\/* Middle Europe Winter Time *\/\n-\t{\"mez\", TZ, 6},\t\t\t\t\/* Middle Europe Zone *\/\n-\t{\"mon\", DOW, 1},\n-\t{\"monday\", DOW, 1},\n-\t{\"mst\", TZ, NEG(42)},\t\t\/* Mountain Standard Time *\/\n-\t{\"mt\", TZ, 51},\t\t\t\t\/* Moluccas Time *\/\n-\t{\"ndt\", DTZ, NEG(15)},\t\t\/* Nfld. Daylight Time *\/\n-\t{\"nft\", TZ, NEG(21)},\t\t\/* Newfoundland Standard Time *\/\n-\t{\"nor\", TZ, 6},\t\t\t\t\/* Norway Standard Time *\/\n-\t{\"nov\", MONTH, 11},\n-\t{\"november\", MONTH, 11},\n-\t{NOW, RESERV, DTK_NOW},\t\t\/* current transaction time *\/\n-\t{\"nst\", TZ, NEG(21)},\t\t\/* Nfld. Standard Time *\/\n-\t{\"nt\", TZ, NEG(66)},\t\t\/* Nome Time *\/\n-\t{\"nzdt\", DTZ, 78},\t\t\t\/* New Zealand Daylight Time *\/\n-\t{\"nzst\", TZ, 72},\t\t\t\/* New Zealand Standard Time *\/\n-\t{\"nzt\", TZ, 72},\t\t\t\/* New Zealand Time *\/\n-\t{\"oct\", MONTH, 10},\n-\t{\"october\", MONTH, 10},\n-\t{\"on\", IGNORE, 0},\t\t\t\/* \"on\" (throwaway) *\/\n-\t{\"pdt\", DTZ, NEG(42)},\t\t\/* Pacific Daylight Time *\/\n-\t{\"pm\", AMPM, PM},\n-\t{\"pst\", TZ, NEG(48)},\t\t\/* Pacific Standard Time *\/\n-\t{\"sadt\", DTZ, 63},\t\t\t\/* S. Australian Dayl. Time *\/\n-\t{\"sast\", TZ, 57},\t\t\t\/* South Australian Std Time *\/\n-\t{\"sat\", DOW, 6},\n-\t{\"saturday\", DOW, 6},\n-\t{\"sep\", MONTH, 9},\n-\t{\"sept\", MONTH, 9},\n-\t{\"september\", MONTH, 9},\n-\t{\"set\", TZ, NEG(6)},\t\t\/* Seychelles Time ?? *\/\n-\t{\"sst\", DTZ, 12},\t\t\t\/* Swedish Summer Time *\/\n-\t{\"sun\", DOW, 0},\n-\t{\"sunday\", DOW, 0},\n-\t{\"swt\", TZ, 6},\t\t\t\t\/* Swedish Winter Time\t*\/\n-\t{\"thu\", DOW, 4},\n-\t{\"thur\", DOW, 4},\n-\t{\"thurs\", DOW, 4},\n-\t{\"thursday\", DOW, 4},\n-\t{TODAY, RESERV, DTK_TODAY}, \/* midnight *\/\n-\t{TOMORROW, RESERV, DTK_TOMORROW},\t\/* tomorrow midnight *\/\n-\t{\"tue\", DOW, 2},\n-\t{\"tues\", DOW, 2},\n-\t{\"tuesday\", DOW, 2},\n-\t{\"undefined\", RESERV, DTK_INVALID}, \/* \"undefined\" pre-v6.1 invalid\n-\t\t\t\t\t\t\t\t\t\t * time *\/\n-\t{\"ut\", TZ, 0},\n-\t{\"utc\", TZ, 0},\n-\t{\"wadt\", DTZ, 48},\t\t\t\/* West Australian DST *\/\n-\t{\"wast\", TZ, 42},\t\t\t\/* West Australian Std Time *\/\n-\t{\"wat\", TZ, NEG(6)},\t\t\/* West Africa Time *\/\n-\t{\"wdt\", DTZ, 54},\t\t\t\/* West Australian DST *\/\n-\t{\"wed\", DOW, 3},\n-\t{\"wednesday\", DOW, 3},\n-\t{\"weds\", DOW, 3},\n-\t{\"wet\", TZ, 0},\t\t\t\t\/* Western Europe *\/\n-\t{\"wetdst\", DTZ, 6},\t\t\t\/* Western Europe *\/\n-\t{\"wst\", TZ, 48},\t\t\t\/* West Australian Std Time *\/\n-\t{\"ydt\", DTZ, NEG(48)},\t\t\/* Yukon Daylight Time *\/\n-\t{YESTERDAY, RESERV, DTK_YESTERDAY}, \/* yesterday midnight *\/\n-\t{\"yst\", TZ, NEG(54)},\t\t\/* Yukon Standard Time *\/\n-\t{\"zp4\", TZ, NEG(24)},\t\t\/* GMT +4 hours. *\/\n-\t{\"zp5\", TZ, NEG(30)},\t\t\/* GMT +5 hours. *\/\n-\t{\"zp6\", TZ, NEG(36)},\t\t\/* GMT +6 hours. *\/\n-\t{\"z\", RESERV, DTK_ZULU},\t\/* 00:00:00 *\/\n-\t{ZULU, RESERV, DTK_ZULU},\t\/* 00:00:00 *\/\n+\t{\"est\",\t\t\tTZ,\t\t\tNEG(30)},\t\t\/* Eastern Standard Time *\/\n+#endif\n+\t{\"feb\",\t\t\tMONTH,\t\t2},\n+\t{\"february\",\tMONTH,\t\t2},\n+\t{\"fri\",\t\t\tDOW,\t\t5},\n+\t{\"friday\",\t\tDOW,\t\t5},\n+\t{\"fst\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* French Summer Time *\/\n+\t{\"fwt\",\t\t\tDTZ,\t\t12},\t\t\t\/* French Winter Time *\/\n+\t{\"gmt\",\t\t\tTZ,\t\t\t0},\t\t\t\t\/* Greenwish Mean Time *\/\n+\t{\"gst\",\t\t\tTZ,\t\t\t60},\t\t\t\/* Guam Std Time, USSR Zone 9 *\/\n+\t{\"hdt\",\t\t\tDTZ,\t\tNEG(54)},\t\t\/* Hawaii\/Alaska *\/\n+\t{\"hmt\",\t\t\tDTZ,\t\t18},\t\t\t\/* Hellas ? ? *\/\n+\t{\"hst\",\t\t\tTZ,\t\t\tNEG(60)},\t\t\/* Hawaii Std Time *\/\n+\t{\"idle\",\t\tTZ,\t\t\t72},\t\t\t\/* Intl. Date Line,\tEast *\/\n+\t{\"idlw\",\t\tTZ,\t\t\tNEG(72)},\t\t\/* Intl. Date Line,,\test *\/\n+\t{LATE,\t\t\tRESERV,\t\tDTK_LATE},\t\t\/* \"infinity\" reserved for \"late time\" *\/\n+\t{INVALID,\t\tRESERV,\t\tDTK_INVALID},\t\/* \"invalid\" reserved for invalid time *\/\n+\t{\"ist\",\t\t\tTZ,\t\t\t12},\t\t\t\/* Israel *\/\n+\t{\"it\",\t\t\tTZ,\t\t\t22},\t\t\t\/* Iran Time *\/\n+\t{\"jan\",\t\t\tMONTH,\t\t1},\n+\t{\"january\",\t\tMONTH,\t\t1},\n+\t{\"jst\",\t\t\tTZ,\t\t\t54},\t\t\t\/* Japan Std Time,USSR Zone 8 *\/\n+\t{\"jt\",\t\t\tTZ,\t\t\t45},\t\t\t\/* Java Time *\/\n+\t{\"jul\",\t\t\tMONTH,\t\t7},\n+\t{\"july\",\t\tMONTH,\t\t7},\n+\t{\"jun\",\t\t\tMONTH,\t\t6},\n+\t{\"june\",\t\tMONTH,\t\t6},\n+\t{\"kst\",\t\t\tTZ,\t\t\t54},\t\t\t\/* Korea Standard Time *\/\n+\t{\"ligt\",\t\tTZ,\t\t\t60},\t\t\t\/* From Melbourne, Australia *\/\n+\t{\"mar\",\t\t\tMONTH,\t\t3},\n+\t{\"march\",\t\tMONTH,\t\t3},\n+\t{\"may\",\t\t\tMONTH,\t\t5},\n+\t{\"mdt\",\t\t\tDTZ,\t\tNEG(36)},\t\t\/* Mountain Daylight Time *\/\n+\t{\"mest\",\t\tDTZ,\t\t12},\t\t\t\/* Middle Europe Summer Time *\/\n+\t{\"met\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Middle Europe Time *\/\n+\t{\"metdst\",\t\tDTZ,\t\t12},\t\t\t\/* Middle Europe Daylight Time *\/\n+\t{\"mewt\",\t\tTZ,\t\t\t6},\t\t\t\t\/* Middle Europe Winter Time *\/\n+\t{\"mez\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Middle Europe Zone *\/\n+\t{\"mon\",\t\t\tDOW,\t\t1},\n+\t{\"monday\",\t\tDOW,\t\t1},\n+\t{\"mst\",\t\t\tTZ,\t\t\tNEG(42)},\t\t\/* Mountain Standard Time *\/\n+\t{\"mt\",\t\t\tTZ,\t\t\t51},\t\t\t\/* Moluccas Time *\/\n+\t{\"ndt\",\t\t\tDTZ,\t\tNEG(15)},\t\t\/* Nfld. Daylight Time *\/\n+\t{\"nft\",\t\t\tTZ,\t\t\tNEG(21)},\t\t\/* Newfoundland Standard Time *\/\n+\t{\"nor\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Norway Standard Time *\/\n+\t{\"nov\",\t\t\tMONTH,\t\t11},\n+\t{\"november\",\tMONTH,\t\t11},\n+\t{NOW,\t\t\tRESERV,\t\tDTK_NOW},\t\t\/* current transaction time *\/\n+\t{\"nst\",\t\t\tTZ,\t\t\tNEG(21)},\t\t\/* Nfld. Standard Time *\/\n+\t{\"nt\",\t\t\tTZ,\t\t\tNEG(66)},\t\t\/* Nome Time *\/\n+\t{\"nzdt\",\t\tDTZ,\t\t78},\t\t\t\/* New Zealand Daylight Time *\/\n+\t{\"nzst\",\t\tTZ,\t\t\t72},\t\t\t\/* New Zealand Standard Time *\/\n+\t{\"nzt\",\t\t\tTZ,\t\t\t72},\t\t\t\/* New Zealand Time *\/\n+\t{\"oct\",\t\t\tMONTH,\t\t10},\n+\t{\"october\",\t\tMONTH,\t\t10},\n+\t{\"on\",\t\t\tIGNORE,\t\t0},\t\t\t\t\/* \"on\" (throwaway) *\/\n+\t{\"pdt\",\t\t\tDTZ,\t\tNEG(42)},\t\t\/* Pacific Daylight Time *\/\n+\t{\"pm\",\t\t\tAMPM,\t\tPM},\n+\t{\"pst\",\t\t\tTZ,\t\t\tNEG(48)},\t\t\/* Pacific Standard Time *\/\n+\t{\"sadt\",\t\tDTZ,\t\t63},\t\t\t\/* S. Australian Dayl. Time *\/\n+\t{\"sast\",\t\tTZ,\t\t\t57},\t\t\t\/* South Australian Std Time *\/\n+\t{\"sat\",\t\t\tDOW,\t\t6},\n+\t{\"saturday\",\tDOW,\t\t6},\n+\t{\"sep\",\t\t\tMONTH,\t\t9},\n+\t{\"sept\",\t\tMONTH,\t\t9},\n+\t{\"september\",\tMONTH,\t\t9},\n+\t{\"set\",\t\t\tTZ,\t\t\tNEG(6)},\t\t\/* Seychelles Time ?? *\/\n+\t{\"sst\",\t\t\tDTZ,\t\t12},\t\t\t\/* Swedish Summer Time *\/\n+\t{\"sun\",\t\t\tDOW,\t\t0},\n+\t{\"sunday\",\t\tDOW,\t\t0},\n+\t{\"swt\",\t\t\tTZ,\t\t\t6},\t\t\t\t\/* Swedish Winter Time\t*\/\n+\t{\"thu\",\t\t\tDOW,\t\t4},\n+\t{\"thur\",\t\tDOW,\t\t4},\n+\t{\"thurs\",\t\tDOW,\t\t4},\n+\t{\"thursday\",\tDOW,\t\t4},\n+\t{TODAY,\t\t\tRESERV,\t\tDTK_TODAY},\t\t\/* midnight *\/\n+\t{TOMORROW,\t\tRESERV,\t\tDTK_TOMORROW},\t\/* tomorrow midnight *\/\n+\t{\"tue\",\t\t\tDOW,\t\t2},\n+\t{\"tues\",\t\tDOW,\t\t2},\n+\t{\"tuesday\",\t\tDOW,\t\t2},\n+\t{\"undefined\",\tRESERV,\t\tDTK_INVALID},\t\/* \"undefined\" pre-v6.1 invalid time *\/\n+\t{\"ut\",\t\t\tTZ,\t\t\t0},\n+\t{\"utc\",\t\t\tTZ,\t\t\t0},\n+\t{\"wadt\",\t\tDTZ,\t\t48},\t\t\t\/* West Australian DST *\/\n+\t{\"wast\",\t\tTZ,\t\t\t42},\t\t\t\/* West Australian Std Time *\/\n+\t{\"wat\",\t\t\tTZ,\t\t\tNEG(6)},\t\t\/* West Africa Time *\/\n+\t{\"wdt\",\t\t\tDTZ,\t\t54},\t\t\t\/* West Australian DST *\/\n+\t{\"wed\",\t\t\tDOW,\t\t3},\n+\t{\"wednesday\",\tDOW,\t\t3},\n+\t{\"weds\",\t\tDOW,\t\t3},\n+\t{\"wet\",\t\t\tTZ,\t\t\t0},\t\t\t\t\/* Western Europe *\/\n+\t{\"wetdst\",\t\tDTZ,\t\t6},\t\t\t\t\/* Western Europe *\/\n+\t{\"wst\",\t\t\tTZ,\t\t\t48},\t\t\t\/* West Australian Std Time *\/\n+\t{\"ydt\",\t\t\tDTZ,\t\tNEG(48)},\t\t\/* Yukon Daylight Time *\/\n+\t{YESTERDAY,\t\tRESERV,\t\tDTK_YESTERDAY},\t\/* yesterday midnight *\/\n+\t{\"yst\",\t\t\tTZ,\t\t\tNEG(54)},\t\t\/* Yukon Standard Time *\/\n+\t{\"zp4\",\t\t\tTZ,\t\t\tNEG(24)},\t\t\/* GMT +4 hours. *\/\n+\t{\"zp5\",\t\t\tTZ,\t\t\tNEG(30)},\t\t\/* GMT +5 hours. *\/\n+\t{\"zp6\",\t\t\tTZ,\t\t\tNEG(36)},\t\t\/* GMT +6 hours. *\/\n+\t{\"z\",\t\t\tRESERV,\t\tDTK_ZULU},\t\t\/* 00:00:00 *\/\n+\t{ZULU,\t\t\tRESERV,\t\tDTK_ZULU},\t\t\/* 00:00:00 *\/\n };\n \n static unsigned int szdatetktbl = sizeof datetktbl \/ sizeof datetktbl[0];\n \n static datetkn deltatktbl[] = {\n \/*\t\ttext\t\t\ttoken\tlexval *\/\n-\t{\"@\", IGNORE, 0},\t\t\t\/* postgres relative time prefix *\/\n-\t{DAGO, AGO, 0},\t\t\t\t\/* \"ago\" indicates negative time offset *\/\n-\t{\"c\", UNITS, DTK_CENTURY},\t\/* \"century\" relative time units *\/\n-\t{\"cent\", UNITS, DTK_CENTURY},\t\t\/* \"century\" relative time units *\/\n-\t{\"centuries\", UNITS, DTK_CENTURY},\t\/* \"centuries\" relative time units *\/\n-\t{DCENTURY, UNITS, DTK_CENTURY},\t\t\/* \"century\" relative time units *\/\n-\t{\"d\", UNITS, DTK_DAY},\t\t\/* \"day\" relative time units *\/\n-\t{DDAY, UNITS, DTK_DAY},\t\t\/* \"day\" relative time units *\/\n-\t{\"days\", UNITS, DTK_DAY},\t\/* \"days\" relative time units *\/\n-\t{\"dec\", UNITS, DTK_DECADE}, \/* \"decade\" relative time units *\/\n-\t{\"decs\", UNITS, DTK_DECADE},\/* \"decades\" relative time units *\/\n-\t{DDECADE, UNITS, DTK_DECADE},\t\t\/* \"decade\" relative time units *\/\n-\t{\"decades\", UNITS, DTK_DECADE},\t\t\/* \"decades\" relative time units *\/\n-\t{\"h\", UNITS, DTK_HOUR},\t\t\/* \"hour\" relative time units *\/\n-\t{DHOUR, UNITS, DTK_HOUR},\t\/* \"hour\" relative time units *\/\n-\t{\"hours\", UNITS, DTK_HOUR}, \/* \"hours\" relative time units *\/\n-\t{\"hr\", UNITS, DTK_HOUR},\t\/* \"hour\" relative time units *\/\n-\t{\"hrs\", UNITS, DTK_HOUR},\t\/* \"hours\" relative time units *\/\n-\t{INVALID, RESERV, DTK_INVALID},\t\t\/* \"invalid\" reserved for invalid\n-\t\t\t\t\t\t\t\t\t\t * time *\/\n-\t{\"m\", UNITS, DTK_MINUTE},\t\/* \"minute\" relative time units *\/\n-\t{\"microsecon\", UNITS, DTK_MILLISEC},\t\t\/* \"microsecond\" relative\n-\t\t\t\t\t\t\t\t\t\t\t\t * time units *\/\n-\t{\"mil\", UNITS, DTK_MILLENIUM},\t\t\/* \"millenium\" relative time units *\/\n-\t{\"mils\", UNITS, DTK_MILLENIUM},\t\t\/* \"millenia\" relative time units *\/\n-\t{\"millenia\", UNITS, DTK_MILLENIUM}, \/* \"millenia\" relative time units *\/\n-\t{DMILLENIUM, UNITS, DTK_MILLENIUM}, \/* \"millenium\" relative time units *\/\n-\t{\"millisecon\", UNITS, DTK_MILLISEC},\t\t\/* \"millisecond\" relative\n-\t\t\t\t\t\t\t\t\t\t\t\t * time units *\/\n-\t{\"min\", UNITS, DTK_MINUTE}, \/* \"minute\" relative time units *\/\n-\t{\"mins\", UNITS, DTK_MINUTE},\/* \"minutes\" relative time units *\/\n-\t{\"mins\", UNITS, DTK_MINUTE},\/* \"minutes\" relative time units *\/\n-\t{DMINUTE, UNITS, DTK_MINUTE},\t\t\/* \"minute\" relative time units *\/\n-\t{\"minutes\", UNITS, DTK_MINUTE},\t\t\/* \"minutes\" relative time units *\/\n-\t{\"mon\", UNITS, DTK_MONTH},\t\/* \"months\" relative time units *\/\n-\t{\"mons\", UNITS, DTK_MONTH}, \/* \"months\" relative time units *\/\n-\t{DMONTH, UNITS, DTK_MONTH}, \/* \"month\" relative time units *\/\n-\t{\"months\", UNITS, DTK_MONTH},\t\t\/* \"months\" relative time units *\/\n-\t{\"ms\", UNITS, DTK_MILLISEC},\/* \"millisecond\" relative time units *\/\n-\t{\"msec\", UNITS, DTK_MILLISEC},\t\t\/* \"millisecond\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{DMILLISEC, UNITS, DTK_MILLISEC},\t\/* \"millisecond\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"mseconds\", UNITS, DTK_MILLISEC},\t\/* \"milliseconds\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"msecs\", UNITS, DTK_MILLISEC},\t\t\/* \"milliseconds\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"qtr\", UNITS, DTK_QUARTER},\/* \"quarter\" relative time units *\/\n-\t{DQUARTER, UNITS, DTK_QUARTER},\t\t\/* \"quarter\" relative time units *\/\n-\t{\"reltime\", IGNORE, 0},\t\t\/* \"reltime\" for pre-v6.1 \"Undefined\n-\t\t\t\t\t\t\t\t * Reltime\" *\/\n-\t{\"s\", UNITS, DTK_SECOND},\t\/* \"second\" relative time units *\/\n-\t{\"sec\", UNITS, DTK_SECOND}, \/* \"second\" relative time units *\/\n-\t{DSECOND, UNITS, DTK_SECOND},\t\t\/* \"second\" relative time units *\/\n-\t{\"seconds\", UNITS, DTK_SECOND},\t\t\/* \"seconds\" relative time units *\/\n-\t{\"secs\", UNITS, DTK_SECOND},\/* \"seconds\" relative time units *\/\n-\t{DTIMEZONE, UNITS, DTK_TZ}, \/* \"timezone\" time offset *\/\n-\t{\"tz\", UNITS, DTK_TZ},\t\t\/* \"timezone\" time offset *\/\n-\t{\"undefined\", RESERV, DTK_INVALID}, \/* \"undefined\" pre-v6.1 invalid\n-\t\t\t\t\t\t\t\t\t\t * time *\/\n-\t{\"us\", UNITS, DTK_MICROSEC},\/* \"microsecond\" relative time units *\/\n-\t{\"usec\", UNITS, DTK_MICROSEC},\t\t\/* \"microsecond\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{DMICROSEC, UNITS, DTK_MICROSEC},\t\/* \"microsecond\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"useconds\", UNITS, DTK_MICROSEC},\t\/* \"microseconds\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"usecs\", UNITS, DTK_MICROSEC},\t\t\/* \"microseconds\" relative time\n-\t\t\t\t\t\t\t\t\t\t * units *\/\n-\t{\"w\", UNITS, DTK_WEEK},\t\t\/* \"week\" relative time units *\/\n-\t{DWEEK, UNITS, DTK_WEEK},\t\/* \"week\" relative time units *\/\n-\t{\"weeks\", UNITS, DTK_WEEK}, \/* \"weeks\" relative time units *\/\n-\t{\"y\", UNITS, DTK_YEAR},\t\t\/* \"year\" relative time units *\/\n-\t{DYEAR, UNITS, DTK_YEAR},\t\/* \"year\" relative time units *\/\n-\t{\"years\", UNITS, DTK_YEAR}, \/* \"years\" relative time units *\/\n-\t{\"yr\", UNITS, DTK_YEAR},\t\/* \"year\" relative time units *\/\n-\t{\"yrs\", UNITS, DTK_YEAR},\t\/* \"years\" relative time units *\/\n+\t{\"@\",\t\t\tIGNORE,\t\t0},\t\t\t\t\/* postgres relative time prefix *\/\n+\t{DAGO,\t\t\tAGO,\t\t0},\t\t\t\t\/* \"ago\" indicates negative time offset *\/\n+\t{\"c\",\t\t\tUNITS,\t\tDTK_CENTURY},\t\/* \"century\" relative time units *\/\n+\t{\"cent\",\t\tUNITS,\t\tDTK_CENTURY},\t\/* \"century\" relative time units *\/\n+\t{\"centuries\",\tUNITS,\t\tDTK_CENTURY},\t\/* \"centuries\" relative time units *\/\n+\t{DCENTURY,\t\tUNITS,\t\tDTK_CENTURY},\t\/* \"century\" relative time units *\/\n+\t{\"d\",\t\t\tUNITS,\t\tDTK_DAY},\t\t\/* \"day\" relative time units *\/\n+\t{DDAY,\t\t\tUNITS,\t\tDTK_DAY},\t\t\/* \"day\" relative time units *\/\n+\t{\"days\",\t\tUNITS,\t\tDTK_DAY},\t\t\/* \"days\" relative time units *\/\n+\t{\"dec\",\t\t\tUNITS,\t\tDTK_DECADE},\t\/* \"decade\" relative time units *\/\n+\t{\"decs\",\t\tUNITS,\t\tDTK_DECADE},\t\/* \"decades\" relative time units *\/\n+\t{DDECADE,\t\tUNITS,\t\tDTK_DECADE},\t\/* \"decade\" relative time units *\/\n+\t{\"decades\",\t\tUNITS,\t\tDTK_DECADE},\t\/* \"decades\" relative time units *\/\n+\t{\"h\",\t\t\tUNITS,\t\tDTK_HOUR},\t\t\/* \"hour\" relative time units *\/\n+\t{DHOUR,\t\t\tUNITS,\t\tDTK_HOUR},\t\t\/* \"hour\" relative time units *\/\n+\t{\"hours\",\t\tUNITS,\t\tDTK_HOUR},\t\t\/* \"hours\" relative time units *\/\n+\t{\"hr\",\t\t\tUNITS,\t\tDTK_HOUR},\t\t\/* \"hour\" relative time units *\/\n+\t{\"hrs\",\t\t\tUNITS,\t\tDTK_HOUR},\t\t\/* \"hours\" relative time units *\/\n+\t{INVALID,\t\tRESERV,\t\tDTK_INVALID},\t\/* \"invalid\" reserved for invalid time *\/\n+\t{\"m\",\t\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minute\" relative time units *\/\n+\t{\"microsecon\",\tUNITS,\t\tDTK_MILLISEC},\t\/* \"microsecond\" relative time units *\/\n+\t{\"mil\",\t\t\tUNITS,\t\tDTK_MILLENIUM},\t\/* \"millenium\" relative time units *\/\n+\t{\"mils\",\t\tUNITS,\t\tDTK_MILLENIUM},\t\/* \"millenia\" relative time units *\/\n+\t{\"millenia\",\tUNITS,\t\tDTK_MILLENIUM},\t\/* \"millenia\" relative time units *\/\n+\t{DMILLENIUM,\tUNITS,\t\tDTK_MILLENIUM},\t\/* \"millenium\" relative time units *\/\n+\t{\"millisecon\",\tUNITS,\t\tDTK_MILLISEC},\t\/* \"millisecond\" relative time units *\/\n+\t{\"min\",\t\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minute\" relative time units *\/\n+\t{\"mins\",\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minutes\" relative time units *\/\n+\t{\"mins\",\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minutes\" relative time units *\/\n+\t{DMINUTE,\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minute\" relative time units *\/\n+\t{\"minutes\",\t\tUNITS,\t\tDTK_MINUTE},\t\/* \"minutes\" relative time units *\/\n+\t{\"mon\",\t\t\tUNITS,\t\tDTK_MONTH},\t\t\/* \"months\" relative time units *\/\n+\t{\"mons\",\t\tUNITS,\t\tDTK_MONTH},\t\t\/* \"months\" relative time units *\/\n+\t{DMONTH,\t\tUNITS,\t\tDTK_MONTH},\t\t\/* \"month\" relative time units *\/\n+\t{\"months\",\t\tUNITS,\t\tDTK_MONTH},\t\t\/* \"months\" relative time units *\/\n+\t{\"ms\",\t\t\tUNITS,\t\tDTK_MILLISEC},\t\/* \"millisecond\" relative time units *\/\n+\t{\"msec\",\t\tUNITS,\t\tDTK_MILLISEC},\t\/* \"millisecond\" relative time units *\/\n+\t{DMILLISEC,\t\tUNITS,\t\tDTK_MILLISEC},\t\/* \"millisecond\" relative time units *\/\n+\t{\"mseconds\",\tUNITS,\t\tDTK_MILLISEC},\t\/* \"milliseconds\" relative time units *\/\n+\t{\"msecs\",\t\tUNITS,\t\tDTK_MILLISEC},\t\/* \"milliseconds\" relative time units *\/\n+\t{\"qtr\",\t\t\tUNITS,\t\tDTK_QUARTER},\t\/* \"quarter\" relative time units *\/\n+\t{DQUARTER,\t\tUNITS,\t\tDTK_QUARTER},\t\/* \"quarter\" relative time units *\/\n+\t{\"reltime\",\t\tIGNORE,\t\t0},\t\t\t\t\/* \"reltime\" for pre-v6.1 \"Undefined Reltime\" *\/\n+\t{\"s\",\t\t\tUNITS,\t\tDTK_SECOND},\t\/* \"second\" relative time units *\/\n+\t{\"sec\",\t\t\tUNITS,\t\tDTK_SECOND},\t\/* \"second\" relative time units *\/\n+\t{DSECOND,\t\tUNITS,\t\tDTK_SECOND},\t\/* \"second\" relative time units *\/\n+\t{\"seconds\",\t\tUNITS,\t\tDTK_SECOND},\t\/* \"seconds\" relative time units *\/\n+\t{\"secs\",\t\tUNITS,\t\tDTK_SECOND},\t\/* \"seconds\" relative time units *\/\n+\t{DTIMEZONE,\t\tUNITS,\t\tDTK_TZ},\t\t\/* \"timezone\" time offset *\/\n+\t{\"tz\",\t\t\tUNITS,\t\tDTK_TZ},\t\t\/* \"timezone\" time offset *\/\n+\t{\"undefined\",\tRESERV,\t\tDTK_INVALID},\t\/* \"undefined\" pre-v6.1 invalid time *\/\n+\t{\"us\",\t\t\tUNITS,\t\tDTK_MICROSEC},\t\/* \"microsecond\" relative time units *\/\n+\t{\"usec\",\t\tUNITS,\t\tDTK_MICROSEC},\t\/* \"microsecond\" relative time units *\/\n+\t{DMICROSEC,\t\tUNITS,\t\tDTK_MICROSEC},\t\/* \"microsecond\" relative time units *\/\n+\t{\"useconds\",\tUNITS,\t\tDTK_MICROSEC},\t\/* \"microseconds\" relative time units *\/\n+\t{\"usecs\",\t\tUNITS,\t\tDTK_MICROSEC},\t\/* \"microseconds\" relative time units *\/\n+\t{\"w\",\t\t\tUNITS,\t\tDTK_WEEK},\t\t\/* \"week\" relative time units *\/\n+\t{DWEEK,\t\t\tUNITS,\t\tDTK_WEEK},\t\t\/* \"week\" relative time units *\/\n+\t{\"weeks\",\t\tUNITS,\t\tDTK_WEEK},\t\t\/* \"weeks\" relative time units *\/\n+\t{\"y\",\t\t\tUNITS,\t\tDTK_YEAR},\t\t\/* \"year\" relative time units *\/\n+\t{DYEAR,\t\t\tUNITS,\t\tDTK_YEAR},\t\t\/* \"year\" relative time units *\/\n+\t{\"years\",\t\tUNITS,\t\tDTK_YEAR},\t\t\/* \"years\" relative time units *\/\n+\t{\"yr\",\t\t\tUNITS,\t\tDTK_YEAR},\t\t\/* \"year\" relative time units *\/\n+\t{\"yrs\",\t\t\tUNITS,\t\tDTK_YEAR},\t\t\/* \"years\" relative time units *\/\n };\n \n static unsigned int szdeltatktbl = sizeof deltatktbl \/ sizeof deltatktbl[0];\n@@ -3719,7 +3703,6 @@\n \n #if READ_FORWARD\n \tint\t\t\tis_neg = FALSE;\n-\n #endif\n \n \tint\t\t\tfmask = 0,\n@@ -3734,7 +3717,7 @@\n \n \t*dtype = DTK_DELTA;\n \n-\ttype = SECOND;\n+\ttype = DTK_SECOND;\n \ttm->tm_year = 0;\n \ttm->tm_mon = 0;\n \ttm->tm_mday = 0;\n"} {"commit":"0b7d19d35cd6a042bb4c0fa89a658c8cec0a29f1","subject":"preproc: BR 2222615: fix segfault on bogus %ifmacro","message":"preproc: BR 2222615: fix segfault on bogus %ifmacro\n\nBR 2222615: Fix segmentation fault on %ifmacro without an argument.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\n","repos":"projedi\/nasm,turingstudio\/nasm,letolabs\/nasm,Distrotech\/nasm,techkey\/nasm,techkey\/nasm,Distrotech\/nasm,letolabs\/nasm,techkey\/nasm,projedi\/nasm,projedi\/nasm,projedi\/nasm,turingstudio\/nasm,Distrotech\/nasm,techkey\/nasm,Distrotech\/nasm,turingstudio\/nasm,projedi\/nasm,turingstudio\/nasm,techkey\/nasm,letolabs\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- preproc.c\n+++ preproc.c\n@@ -1584,7 +1584,6 @@\n bool found = false;\n MMacro searching, *mmac;\n \n- tline = tline->next;\n skip_white_(tline);\n tline = expand_id(tline);\n if (!tok_type_(tline, TOK_ID)) {\n"} {"commit":"8ea373c76d380c33140f8bf2e1158908c5f86742","subject":"change storage => bitmapData, refactor","message":"change storage => bitmapData, refactor\n","repos":"Sometrik\/canvas,Sometrik\/canvas,rekola\/canvas,rekola\/canvas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ContextQuartz2D.h\n+++ src\/ContextQuartz2D.h\n@@ -72,10 +72,10 @@\n \tmemcpy(bitmapData, image.getData(), bitmapByteCount);\n } else {\n \tfor (unsigned int i = 0; i < getActualWidth() * getActualHeight(); i++) {\n-\t storage[4 * i + 0] = image.getData()[3 * i + 2];\n-\t storage[4 * i + 1] = image.getData()[3 * i + 1];\n-\t storage[4 * i + 2] = image.getData()[3 * i + 0];\n-\t storage[4 * i + 3] = 255;\n+\t bitmapData[4 * i + 0] = image.getData()[3 * i + 2];\n+\t bitmapData[4 * i + 1] = image.getData()[3 * i + 1];\n+\t bitmapData[4 * i + 2] = image.getData()[3 * i + 0];\n+\t bitmapData[4 * i + 3] = 255;\n \t}\n }\n }\n@@ -203,11 +203,12 @@\n }\n void drawImage(const Image & _img, double x, double y, double w, double h, float alpha = 1.0f, bool imageSmoothingEnabled = true) {\n initializeContext();\n- std::cerr << \"trying to draw image \" << _img.getWidth() << \" \" << _img.getHeight() << \" \" << _img.hasAlpha() << std::endl;\n- CGDataProviderRef provider = CGDataProviderCreateWithData(0, _img.getData(), _img.getFormat().getBytesPerPixel() * _img.getWidth() * _img.getHeight(), 0);\n- assert(_img.getFormat().getBytesPerPixel() == 4);\n- auto f = (_img.getFormat().hasAlpha() ? kCGImageAlphaPremultipliedLast : kCGImageAlphaNoneSkipLast);\n- CGImageRef img = CGImageCreate(_img.getWidth(), _img.getHeight(), 8, img.getBytesPerPixel() * 8, _img.getBytesPerPixel() * _img.getWidth(), colorspace, f, provider, 0, true, kCGRenderingIntentDefault);\n+ auto format = _img.getFormat();\n+ std::cerr << \"trying to draw image \" << _img.getWidth() << \" \" << _img.getHeight() << \" \" << format.hasAlpha() << std::endl;\n+ CGDataProviderRef provider = CGDataProviderCreateWithData(0, _img.getData(), format.getBytesPerPixel() * _img.getWidth() * _img.getHeight(), 0);\n+ assert(format.getBytesPerPixel() == 4);\n+ auto f = (format.hasAlpha() ? kCGImageAlphaPremultipliedLast : kCGImageAlphaNoneSkipLast);\n+ CGImageRef img = CGImageCreate(_img.getWidth(), _img.getHeight(), 8, format.getBytesPerPixel() * 8, format.getBytesPerPixel() * _img.getWidth(), colorspace, f, provider, 0, true, kCGRenderingIntentDefault);\n assert(img);\n CGContextDrawImage(gc, CGRectMake(x, y, w, h), img);\n CGDataProviderRelease(provider);\n"} {"commit":"85eb1cb82fdce53eecae9412c9e979114da65502","subject":"Be able to turn basic settings off","message":"Be able to turn basic settings off\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_int_border_locks.c\n+++ src\/bin\/e_int_border_locks.c\n@@ -147,41 +147,38 @@\n static int\n _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)\n {\n+ int flag;\n \/* Actually take our cfdata settings and apply them in real life *\/\n \n- if (cfdata->do_what_i_say)\n- {\n-\tcfdata->border->lock_client_location = 1;\n-\tcfdata->border->lock_client_size = 1;\n-\tcfdata->border->lock_client_stacking = 1;\n-\tcfdata->border->lock_client_iconify = 1;\n-\tcfdata->border->lock_client_desk = 0;\n-\tcfdata->border->lock_client_sticky = 1;\n-\tcfdata->border->lock_client_shade = 1;\n-\tcfdata->border->lock_client_maximize = 1;\n-\tcfdata->border->lock_client_fullscreen = 1;\n- }\n- if (cfdata->protect_from_me)\n- {\n-\tcfdata->border->lock_user_location = 1;\n-\tcfdata->border->lock_user_size = 1;\n-\tcfdata->border->lock_user_stacking = 1;\n-\tcfdata->border->lock_user_iconify = 1;\n-\tcfdata->border->lock_user_desk = 0;\n-\tcfdata->border->lock_user_sticky = 1;\n-\tcfdata->border->lock_user_shade = 1;\n-\tcfdata->border->lock_user_maximize = 1;\n-\tcfdata->border->lock_user_fullscreen = 1;\n- }\n- if (cfdata->important_window)\n- {\n-\tcfdata->border->lock_close = 1;\n-\tcfdata->border->lock_life = 1;\n- }\n- if (cfdata->keep_my_border)\n- {\n-\tcfdata->border->lock_border = 1;\n- }\n+ flag = cfdata->do_what_i_say;\n+ cfdata->border->lock_client_location = flag;\n+ cfdata->border->lock_client_size = flag;\n+ cfdata->border->lock_client_stacking = flag;\n+ cfdata->border->lock_client_iconify = flag;\n+ cfdata->border->lock_client_desk = 0;\n+ cfdata->border->lock_client_sticky = flag;\n+ cfdata->border->lock_client_shade = flag;\n+ cfdata->border->lock_client_maximize = flag;\n+ cfdata->border->lock_client_fullscreen = flag;\n+\n+ flag = cfdata->protect_from_me;\n+ cfdata->border->lock_user_location = flag;\n+ cfdata->border->lock_user_size = flag;\n+ cfdata->border->lock_user_stacking = flag;\n+ cfdata->border->lock_user_iconify = flag;\n+ cfdata->border->lock_user_desk = 0;\n+ cfdata->border->lock_user_sticky = flag;\n+ cfdata->border->lock_user_shade = flag;\n+ cfdata->border->lock_user_maximize = flag;\n+ cfdata->border->lock_user_fullscreen = flag;\n+\n+ flag = cfdata->important_window;\n+ cfdata->border->lock_close = flag;\n+ cfdata->border->lock_life = flag;\n+ \n+ flag = cfdata->keep_my_border;\n+ cfdata->border->lock_border = flag;\n+ \n \/* FIXME: need to check if the remember stuff will actually work or not\n * (see e_int_border_remember.c where it checks and warns) *\/\n if (cfdata->remember_locks)\n"} {"commit":"00c3c107c31bb6405e01b436d934a8f310a154d9","subject":"Forgot to import string.h in wshc main.c","message":"Forgot to import string.h in wshc main.c\n","repos":"elentar\/wsh,worr\/wsh,elentar\/wsh,worr\/wsh,elentar\/wsh,worr\/wsh","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- client\/src\/main.c\n+++ client\/src\/main.c\n@@ -1,5 +1,6 @@\n #include <glib.h>\n #include <stdlib.h>\n+#include <string.h>\n \n #ifdef RANGE\n # include \"range_expansion.h\"\n"} {"commit":"a3e5a3877cd3e735b073a8fed5984bc0a6f91ef7","subject":"E style","message":"E style\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@24270 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_int_config_shelf.c\n+++ src\/bin\/e_int_config_shelf.c\n@@ -26,16 +26,13 @@\n E_Config_Dialog_View *v;\n \n v = E_NEW(E_Config_Dialog_View, 1);\n- if (v) \n- {\n-\tv->create_cfdata = _create_data;\n-\tv->free_cfdata = _free_data;\n-\tv->basic.create_widgets = _basic_create_widgets;\n-\t\n-\tcfd = e_config_dialog_new(con, _(\"Shelf Settings\"), \"enlightenment\/shelf\", 0, v, NULL);\n-\treturn cfd;\n- }\n- return NULL;\n+ if (!v) return NULL; \n+ v->create_cfdata = _create_data;\n+ v->free_cfdata = _free_data;\n+ v->basic.create_widgets = _basic_create_widgets;\n+\n+ cfd = e_config_dialog_new(con, _(\"Shelf Settings\"), \"enlightenment\/shelf\", 0, v, NULL);\n+ return cfd;\n }\n \n static void *\n"} {"commit":"0eb5ca21653344cf4a333685bb0df3780d496529","subject":"Fix discrepancy in bn inference","message":"Fix discrepancy in bn inference\n","repos":"jnbraun\/bcnn,jnbraun\/bcnn","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/bcnn_batchnorm_layer.c\n+++ src\/bcnn_batchnorm_layer.c\n@@ -132,7 +132,7 @@\n for (j = 0; j < c; ++j) {\n for (i = 0; i < wxh; ++i) {\n ind = k * c * wxh + j * wxh + i;\n- x[ind] = (x[ind] - mean[j]) \/ (sqrtf(variance[j]) + 0.000001f);\n+ x[ind] = (x[ind] - mean[j]) \/ (sqrtf(variance[j] + 0.000001f));\n }\n }\n }\n"} {"commit":"f0d2ba4700ba526f054572254553688d1cd321ee","subject":"Remove useless variable.","message":"Remove useless variable.\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@29804 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_int_config_theme.c\n+++ src\/bin\/e_int_config_theme.c\n@@ -339,7 +339,7 @@\n {\n Evas_Object *o, *ot, *of, *il, *ol;\n char path[4096];\n- const char *f, *homedir;\n+ const char *homedir;\n E_Fm2_Config fmc;\n E_Zone *z;\n E_Radio_Group *rg;\n@@ -436,10 +436,7 @@\n o = e_widget_preview_add(evas, mw, mh);\n cfdata->o_preview = o;\n if (cfdata->theme) \n-\t{\n-\t f = cfdata->theme;\n-\t e_widget_preview_edje_set(o, f, \"e\/desktop\/background\");\n-\t}\n+\te_widget_preview_edje_set(o, cfdata->theme, \"e\/desktop\/background\");\n e_widget_aspect_child_set(oa, o);\n e_widget_list_object_append(of, oa, 1, 1, 0);\n \n"} {"commit":"692fd7f5d079216a767ed2047c002c2b9707bc9d","subject":" Add support for home and end keys to toolbar widget.","message":" Add support for home and end keys to toolbar widget.\n\n\ngit-svn-id: 6ac5796aeae0cef97fb47bcc287d4ce899c6fa6e@37791 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_widget_toolbar.c\n+++ src\/bin\/e_widget_toolbar.c\n@@ -310,7 +310,31 @@\n }\n }\n }\n- if ((it) && (it2))\n+ else if ((!strcmp(ev->keyname, \"Home\")) || (!strcmp(ev->keyname, \"KP_Home\")))\n+ {\n+\tfor (l = wd->items; l; l = l->next)\n+\t {\n+\t it = l->data;\n+\t if (it->selected)\n+\t {\n+\t\t it2 = wd->items->data;\n+\t\t break;\n+\t }\n+\t }\n+ }\n+ else if ((!strcmp(ev->keyname, \"End\")) || (!strcmp(ev->keyname, \"KP_End\")))\n+ {\n+\tfor (l = wd->items; l; l = l->next)\n+\t {\n+\t it = l->data;\n+\t if (it->selected)\n+\t {\n+\t\t it2 = eina_list_last(wd->items)->data;\n+\t\t break;\n+\t }\n+\t }\n+ }\n+ if ((it) && (it2) && (it != it2))\n {\n it->selected = 0;\n edje_object_signal_emit(it->o_base, \"e,state,unselected\", \"e\");\n"} {"commit":"e01300b36e295a9440c6e3df00c240f06d5800a8","subject":"ISOfy functions, sort headers and mark unused arguments.","message":"ISOfy functions, sort headers and mark unused arguments.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libc\/gen\/crypt.c\n+++ lib\/libc\/gen\/crypt.c\n@@ -37,12 +37,13 @@\n #if defined(LIBC_SCCS) && !defined(lint)\n \/* from static char sccsid[] = \"@(#)crypt.c\t5.11 (Berkeley) 6\/25\/91\"; *\/\n #endif \/* LIBC_SCCS and not lint *\/\n+\n #include <sys\/cdefs.h>\n __FBSDID(\"$FreeBSD$\");\n \n-#include <unistd.h>\n #include <stdio.h>\n #include <string.h>\n+#include <unistd.h>\n \n \/*\n * UNIX password, and DES, encryption.\n@@ -55,8 +56,7 @@\n \t\"WARNING! des_setkey(3) not present in the system!\");\n \n int\n-des_setkey(key)\n-\tconst char *key;\n+des_setkey(const char *key __unused)\n {\n \tfprintf(stderr, \"WARNING! des_setkey(3) not present in the system!\\n\");\n \treturn (0);\n@@ -66,11 +66,7 @@\n \t\"WARNING! des_cipher(3) not present in the system!\");\n \n int\n-des_cipher(in, out, salt, num_iter)\n-\tconst char *in;\n-\tchar *out;\n-\tlong salt;\n-\tint num_iter;\n+des_cipher(const char *in, char *out, long salt __unused, int num_iter __unused)\n {\n \tfprintf(stderr, \"WARNING! des_cipher(3) not present in the system!\\n\");\n \tbcopy(in, out, 8);\n@@ -81,8 +77,7 @@\n \t\"WARNING! setkey(3) not present in the system!\");\n \n int\n-setkey(key)\n-\tconst char *key;\n+setkey(const char *key __unused)\n {\n \tfprintf(stderr, \"WARNING! setkey(3) not present in the system!\\n\");\n \treturn (0);\n@@ -92,9 +87,7 @@\n \t\"WARNING! encrypt(3) not present in the system!\");\n \n int\n-encrypt(block, flag)\n-\tchar *block;\n-\tint flag;\n+encrypt(char *block __unused, int flag __unused)\n {\n \tfprintf(stderr, \"WARNING! encrypt(3) not present in the system!\\n\");\n \treturn (0);\n"} {"commit":"2953cd6d17210935098c803c52c6df5b12a725b9","subject":"Only quote libpq connection string values that need quoting.","message":"Only quote libpq connection string values that need quoting.\n\nThere's no harm in excessive quoting per se, but it makes the strings nicer\nto read. The values can get quite unwieldy, when they're first quoted within\nwithin single-quotes when included in the connection string, and then all\nthe single-quotes are escaped when the connection string is passed as a\nshell argument.\n","repos":"pavanvd\/postgres-xl,Postgres-XL\/Postgres-XL,zeroae\/postgres-xl,xinzweb\/gpdb,xinzweb\/gpdb,oberstet\/postgres-xl,50wu\/gpdb,Postgres-XL\/Postgres-XL,oberstet\/postgres-xl,oberstet\/postgres-xl,lisakowen\/gpdb,50wu\/gpdb,yazun\/postgres-xl,50wu\/gpdb,xinzweb\/gpdb,ovr\/postgres-xl,lisakowen\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,ovr\/postgres-xl,greenplum-db\/gpdb,yazun\/postgres-xl,yazun\/postgres-xl,techdragon\/Postgres-XL,Postgres-XL\/Postgres-XL,ashwinstar\/gpdb,ovr\/postgres-xl,jmcatamney\/gpdb,pavanvd\/postgres-xl,jmcatamney\/gpdb,50wu\/gpdb,oberstet\/postgres-xl,ashwinstar\/gpdb,ovr\/postgres-xl,Postgres-XL\/Postgres-XL,jmcatamney\/gpdb,zeroae\/postgres-xl,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,ashwinstar\/gpdb,greenplum-db\/gpdb,jmcatamney\/gpdb,zeroae\/postgres-xl,techdragon\/Postgres-XL,jmcatamney\/gpdb,techdragon\/Postgres-XL,greenplum-db\/gpdb,pavanvd\/postgres-xl,xinzweb\/gpdb,ovr\/postgres-xl,pavanvd\/postgres-xl,zeroae\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,techdragon\/Postgres-XL,adam8157\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,oberstet\/postgres-xl,adam8157\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,zeroae\/postgres-xl,adam8157\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,yazun\/postgres-xl,lisakowen\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,ashwinstar\/gpdb,adam8157\/gpdb,yazun\/postgres-xl,xinzweb\/gpdb,jmcatamney\/gpdb,techdragon\/Postgres-XL,lisakowen\/gpdb,ashwinstar\/gpdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/bin\/pg_dump\/pg_dumpall.c\n+++ src\/bin\/pg_dump\/pg_dumpall.c\n@@ -2038,15 +2038,40 @@\n static void\n doConnStrQuoting(PQExpBuffer buf, const char *str)\n {\n-\twhile (*str)\n-\t{\n-\t\t\/* ' and \\ must be escaped by to \\' and \\\\ *\/\n-\t\tif (*str == '\\'' || *str == '\\\\')\n-\t\t\tappendPQExpBufferChar(buf, '\\\\');\n-\n-\t\tappendPQExpBufferChar(buf, *str);\n-\t\tstr++;\n-\t}\n+\tconst char *s;\n+\tbool needquotes;\n+\n+\t\/*\n+\t * If the string consists entirely of plain ASCII characters, no need to\n+\t * quote it. This is quite conservative, but better safe than sorry.\n+\t *\/\n+\tneedquotes = false;\n+\tfor (s = str; *s; s++)\n+\t{\n+\t\tif (!((*s >= 'a' && *s <= 'z') || (*s >= 'A' && *s <= 'Z') ||\n+\t\t\t (*s >= '0' && *s <= '9') || *s == '_' || *s == '.'))\n+\t\t{\n+\t\t\tneedquotes = true;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (needquotes)\n+\t{\n+\t\tappendPQExpBufferChar(buf, '\\'');\n+\t\twhile (*str)\n+\t\t{\n+\t\t\t\/* ' and \\ must be escaped by to \\' and \\\\ *\/\n+\t\t\tif (*str == '\\'' || *str == '\\\\')\n+\t\t\t\tappendPQExpBufferChar(buf, '\\\\');\n+\n+\t\t\tappendPQExpBufferChar(buf, *str);\n+\t\t\tstr++;\n+\t\t}\n+\t\tappendPQExpBufferChar(buf, '\\'');\n+\t}\n+\telse\n+\t\tappendPQExpBufferStr(buf, str);\n }\n \n \/*\n"} {"commit":"40bbd11b839b3d66b8e094be94a06270e975ca5d","subject":"dg: add removeBlock() method","message":"dg: add removeBlock() method\n\nwe need to have a way how to remove some block we added\n\nSigned-off-by: Marek Chalupa <a05df156a69ad59faa9af9b666ef78009594c145@gmail.com>\n","repos":"mchalupa\/dg,mchalupa\/dg,mchalupa\/dg,mchalupa\/dg","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/DependenceGraph.h\n+++ src\/DependenceGraph.h\n@@ -422,7 +422,15 @@\n BBlocksMapT& getBlocks() { return blocks; }\n const BBlocksMapT& getBlocks() const { return blocks; }\n \/\/ add block to this graph\n- bool addBlock(KeyT *key, BBlock<NodeT> *B) { return blocks.insert(B).second; }\n+ bool addBlock(KeyT key, BBlock<NodeT> *B)\n+ {\n+ return blocks.insert(std::make_pair(key, B)).second;\n+ }\n+\n+ bool removeBlock(KeyT key)\n+ {\n+ return blocks.erase(key) == 1;\n+ }\n \n BBlock<NodeT> *getPostDominatorTreeRoot() const { return PDTreeRoot; }\n void setPostDominatorTreeRoot(BBlock<NodeT> *r)\n"} {"commit":"8442dae903cfcc5af74a824edd2d62b202b8eb69","subject":"Fix warning for not found gettimeofday in memstat","message":"Fix warning for not found gettimeofday in memstat\n","repos":"trondn\/libmemcached,trondn\/libmemcached,trondn\/libmemcached,trondn\/libmemcached,trondn\/libmemcached","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- clients\/memstat.c\n+++ clients\/memstat.c\n@@ -6,6 +6,7 @@\n #include <fcntl.h>\n #include <string.h>\n #include <getopt.h>\n+#include <sys\/time.h>\n \n #include <libmemcached\/memcached.h>\n \n"} {"commit":"3d32a931a1a2fa6cbcda4ecc497192795994945f","subject":"Disable destination address selection support of getipnodebyname(1). RFC 2553 mentions IPv6 addresses are returned 1st.","message":"Disable destination address selection support of\ngetipnodebyname(1). RFC 2553 mentions IPv6 addresses\nare returned 1st.\n\nSpotted by:\tuqs\nMFC after:\t1 week\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/libc\/net\/name6.c\n+++ lib\/libc\/net\/name6.c\n@@ -200,6 +200,7 @@\n #endif\n static struct\t hostent *_hpsort(struct hostent *, res_state);\n \n+#ifdef ENABLE_IP6ADDRCTL\n static struct\t hostent *_hpreorder(struct hostent *);\n static int\t get_addrselectpolicy(struct policyhead *);\n static void\t free_addrselectpolicy(struct policyhead *);\n@@ -209,6 +210,7 @@\n static int\t matchlen(struct sockaddr *, struct sockaddr *);\n static int\t comp_dst(const void *, const void *);\n static int\t gai_addr2scopetype(struct sockaddr *);\n+#endif\n \n \/*\n * Functions defined in RFC2553\n@@ -309,7 +311,11 @@\n \t\t*errp = statp->res_h_errno;\n \t\n \tstatp->options = options;\n+#ifdef ENABLE_IP6ADDRCTL\n \treturn _hpreorder(_hpsort(hp, statp));\n+#else\n+\treturn _hpsort(hp, statp);\n+#endif\n }\n \n struct hostent *\n@@ -632,6 +638,7 @@\n \treturn hp;\n }\n \n+#ifdef ENABLE_IP6ADDRCTL\n \/*\n * _hpreorder: sort address by default address selection\n *\/\n@@ -1109,3 +1116,4 @@\n \t\treturn(-1);\n \t}\n }\n+#endif\n"} {"commit":"4d38b4c8486c2ab56c0a30cf5d77db3c03354d07","subject":"srv_sftp: Set error messages in sftp_get_client_message().","message":"srv_sftp: Set error messages in sftp_get_client_message().\n","repos":"mwgoldsmith\/libssh,substack\/libssh,mwgoldsmith\/libssh,mwgoldsmith\/libssh,nviennot\/libssh,DouglasHeriot\/libssh,jahrome\/libssh,mwgoldsmith\/libssh,bigcat26\/libssh-mod,DouglasHeriot\/libssh,pouete\/libssh,bigcat26\/libssh-mod,Distrotech\/libssh,sebadoom\/libssh,elastichosts\/libssh,jt1\/honeypot-libssh,jt1\/honeypot-libssh,sebadoom\/libssh,mwgoldsmith\/ssh,taikoo\/libssh,robxu9\/libssh,kedazo\/libssh,jt1\/honeypot-libssh,taikoo\/libssh,wangshawn\/libssh,substack\/libssh,wangshawn\/libssh,jahrome\/libssh,mwgoldsmith\/ssh,mwgoldsmith\/ssh,wangshawn\/libssh,pouete\/libssh,bigcat26\/libssh-mod,elastichosts\/libssh,substack\/libssh,pouete\/libssh,Distrotech\/libssh,kedazo\/libssh,robxu9\/libssh,nviennot\/libssh,jahrome\/libssh,nviennot\/libssh,rofl0r\/libssh,bigcat26\/libssh-mod,jahrome\/libssh,sebadoom\/libssh,taikoo\/libssh,sebadoom\/libssh,Distrotech\/libssh,robxu9\/libssh,DouglasHeriot\/libssh,jt1\/honeypot-libssh,taikoo\/libssh,substack\/libssh,pouete\/libssh,rofl0r\/libssh,elastichosts\/libssh,robxu9\/libssh,Distrotech\/libssh,kedazo\/libssh,wangshawn\/libssh,kedazo\/libssh,rofl0r\/libssh,rofl0r\/libssh,DouglasHeriot\/libssh,mwgoldsmith\/ssh,nviennot\/libssh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/sftpserver.c\n+++ src\/sftpserver.c\n@@ -37,6 +37,7 @@\n #include \"libssh\/misc.h\"\n \n sftp_client_message sftp_get_client_message(sftp_session sftp) {\n+ ssh_session session = sftp->session;\n sftp_packet packet;\n sftp_client_message msg;\n ssh_buffer payload;\n@@ -44,12 +45,14 @@\n \n msg = malloc(sizeof (struct sftp_client_message_struct));\n if (msg == NULL) {\n+ ssh_set_error_oom(session);\n return NULL;\n }\n ZERO_STRUCTP(msg);\n \n packet = sftp_packet_read(sftp);\n if (packet == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -65,6 +68,7 @@\n case SSH_FXP_READDIR:\n msg->handle = buffer_get_ssh_string(payload);\n if (msg->handle == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -72,6 +76,7 @@\n case SSH_FXP_READ:\n msg->handle = buffer_get_ssh_string(payload);\n if (msg->handle == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -81,12 +86,14 @@\n case SSH_FXP_WRITE:\n msg->handle = buffer_get_ssh_string(payload);\n if (msg->handle == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n buffer_get_u64(payload, &msg->offset);\n msg->data = buffer_get_ssh_string(payload);\n if (msg->data == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -98,12 +105,14 @@\n case SSH_FXP_REALPATH:\n tmp = buffer_get_ssh_string(payload);\n if (tmp == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->filename = ssh_string_to_char(tmp);\n ssh_string_free(tmp);\n if (msg->filename == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -112,17 +121,20 @@\n case SSH_FXP_SYMLINK:\n tmp = buffer_get_ssh_string(payload);\n if (tmp == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->filename = ssh_string_to_char(tmp);\n ssh_string_free(tmp);\n if (msg->filename == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->data = buffer_get_ssh_string(payload);\n if (msg->data == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -131,17 +143,20 @@\n case SSH_FXP_SETSTAT:\n tmp = buffer_get_ssh_string(payload);\n if (tmp == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->filename=ssh_string_to_char(tmp);\n ssh_string_free(tmp);\n if (msg->filename == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->attr = sftp_parse_attr(sftp, payload, 0);\n if (msg->attr == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -149,11 +164,13 @@\n case SSH_FXP_FSETSTAT:\n msg->handle = buffer_get_ssh_string(payload);\n if (msg->handle == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->attr = sftp_parse_attr(sftp, payload, 0);\n if (msg->attr == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -162,12 +179,14 @@\n case SSH_FXP_STAT:\n tmp = buffer_get_ssh_string(payload);\n if (tmp == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->filename = ssh_string_to_char(tmp);\n ssh_string_free(tmp);\n if (msg->filename == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n@@ -178,31 +197,38 @@\n case SSH_FXP_OPEN:\n tmp=buffer_get_ssh_string(payload);\n if (tmp == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n msg->filename = ssh_string_to_char(tmp);\n ssh_string_free(tmp);\n if (msg->filename == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n buffer_get_u32(payload,&msg->flags);\n msg->attr = sftp_parse_attr(sftp, payload, 0);\n if (msg->attr == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n case SSH_FXP_FSTAT:\n msg->handle = buffer_get_ssh_string(payload);\n if (msg->handle == NULL) {\n+ ssh_set_error_oom(session);\n sftp_client_message_free(msg);\n return NULL;\n }\n buffer_get_u32(payload, &msg->flags);\n break;\n default:\n- fprintf(stderr, \"Received unhandled sftp message %d\\n\", msg->type);\n+ ssh_set_error(sftp->session, SSH_FATAL,\n+ \"Received unhandled sftp message %d\\n\", msg->type);\n+ sftp_client_message_free(msg);\n+ return NULL;\n }\n \n msg->flags = ntohl(msg->flags);\n"} {"commit":"29efee49d74a56caacfa8c63c517a393d185391d","subject":"dg: add\/change few comments","message":"dg: add\/change few comments\n\nwe really lack the documentation\n\nSigned-off-by: Marek Chalupa <a05df156a69ad59faa9af9b666ef78009594c145@gmail.com>\n","repos":"mchalupa\/dg,mchalupa\/dg,mchalupa\/dg,mchalupa\/dg","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/DependenceGraph.h\n+++ src\/DependenceGraph.h\n@@ -18,53 +18,122 @@\n \n namespace dg {\n \n-\/\/ --------------------------------------------------------\n-\/\/ --- DependenceGraph\n-\/\/ --------------------------------------------------------\n+\/\/ -------------------------------------------------------------------\n+\/\/ -- DependenceGraph\n+\/\/\n+\/\/ This is a base template for a dependence graphs. Every concrete\n+\/\/ dependence graph will inherit from instance of this template.\n+\/\/ Dependece graph has a map of nodes that it contains (each node\n+\/\/ is required to have a unique key). Actually, there are two maps.\n+\/\/ One for nodes that are local to the graph and one for nodes that\n+\/\/ are global and can be shared between graphs.\n+\/\/ Concrete dependence graph may not use all attributes of this class\n+\/\/ and it is free to use them as it needs (e.g. it may use only\n+\/\/ global nodes and thus share them between all graphs)\n+\/\/ -------------------------------------------------------------------\n template <typename NodeT>\n class DependenceGraph\n {\n public:\n+ \/\/ type of key that is used in nodes\n typedef typename NodeT::KeyType KeyT;\n+ \/\/ type of this dependence graph - so that we can refer to it in the code\n+ typedef typename NodeT::DependenceGraphType DependenceGraphT;\n+\n typedef std::map<KeyT, NodeT *> ContainerType;\n typedef typename ContainerType::iterator iterator;\n typedef typename ContainerType::const_iterator const_iterator;\n- typedef typename NodeT::DependenceGraphType DependenceGraphT;\n-\n+\n+private:\n+ \/\/ entry and exit nodes of the graph\n+ NodeT *entryNode;\n+ NodeT *exitNode;\n+\n+ \/\/ Formal parameters of the graph. Every graph is a graph of some function\n+ \/\/ and formal parameters are parameters from its prototype, i. e. for\n+ \/\/ foo(int a, int b) we have formal parameters 'a' and 'b'. Actual parameters\n+ \/\/ are the values that are passed to function call, so for foo(3, x) the actual\n+ \/\/ parameters are '3' and 'x'. Actual parameters are stored in the call node.\n+ \/\/ Graph can have none or one formal parameters.\n+ DGParameters<NodeT> *formalParameters;\n+\n+ \/\/ call-sites (nodes) that are calling this graph\n+ DGContainer<NodeT> callers;\n+\n+ \/\/ how many nodes keeps pointer to this graph?\n+ int refcount;\n+ \/\/ global nodes are a pointer to dynamically allocated container.\n+ \/\/ Graph that allocated this container has this variable set to true,\n+ \/\/ so that it knows that it is also responsible for deleting the container.\n+ \/\/ It is usually the graph for entry function\n+ bool own_global_nodes;\n+\n+ \/\/ is the graph in some slice?\n+ uint64_t slice_id;\n+\n+#ifdef ENABLE_CFG\n+ \/\/ if we want to keep CFG information in the dependence graph,\n+ \/\/ these are entry and exit basic blocks\n+ BBlock<NodeT> *entryBB;\n+ BBlock<NodeT> *exitBB;\n+\n+ \/\/ root of post-dominator tree\n+ BBlock<NodeT> *PDTreeRoot;\n+#endif \/\/ ENABLE_CFG\n+\n+protected:\n+ \/\/ nodes contained in this dg. They are protected, so that\n+ \/\/ child classes can access them directly\n+ ContainerType nodes;\n+ \/\/ container that can be shared accross the graphs\n+ \/\/ (therefore it is a pointer)\n+ ContainerType *global_nodes;\n+\n+public:\n DependenceGraph<NodeT>()\n- : global_nodes(nullptr), entryNode(nullptr), exitNode(nullptr),\n- formalParameters(nullptr), refcount(1), own_global_nodes(false),\n- slice_id(0)\n+ : entryNode(nullptr), exitNode(nullptr), formalParameters(nullptr),\n+ refcount(1), own_global_nodes(false), slice_id(0)\n #ifdef ENABLE_CFG\n- , entryBB(nullptr), exitBB(nullptr), PDTreeRoot(nullptr)\n+ , entryBB(nullptr), exitBB(nullptr), PDTreeRoot(nullptr)\n #endif\n+ , global_nodes(nullptr)\n {\n }\n \n \/\/ TODO add copy constructor for cloning graph\n-\n virtual ~DependenceGraph<NodeT>()\n {\n if (own_global_nodes)\n delete global_nodes;\n }\n \n- \/\/ iterators\n+ \/\/ iterators for local nodes\n iterator begin(void) { return nodes.begin(); }\n const_iterator begin(void) const { return nodes.begin(); }\n iterator end(void) { return nodes.end(); }\n const_iterator end(void) const { return nodes.end(); }\n \n+ \/\/ operator [] for local nodes\n NodeT *operator[](KeyT k) { return nodes[k]; }\n const NodeT *operator[](KeyT k) const { return nodes[k]; }\n+\n \/\/ reference getter for fast include-if-null operation\n NodeT *& getRef(KeyT k) { return nodes[k]; }\n+\n+ \/\/ do we have a local node with this key?\n bool contains(KeyT k) const { return nodes.count(k) != 0; }\n+\n+ \/\/ get iterator to a local node with key 'k'. If there is no\n+ \/\/ such a node, return end()\n iterator find(KeyT k) { return nodes.find(k); }\n const_iterator find(KeyT k) const { return nodes.find(k); }\n \n+ \/\/ get formal parameters of this graph\n DGParameters<NodeT> *getParameters() { return formalParameters;}\n DGParameters<NodeT> *getParameters() const { return formalParameters;}\n+\n+ \/\/ set new parameters of this graph.\n+ \/\/ \\return old parameters of the graph\n DGParameters<NodeT> *setParameters(DGParameters<NodeT> *p)\n {\n DGParameters<NodeT> *old = formalParameters;\n@@ -72,9 +141,8 @@\n return old;\n }\n \n- \/\/ Get node from graph for key.\n- \/\/ The function searches in nodes,\n- \/\/ global nodes and formal parameters.\n+ \/\/ Get node from graph for key. The function searches in nodes,\n+ \/\/ formal parameters and global nodes (in this order)\n \/\/ Return nullptr if no such node exists\n NodeT *getNode(KeyT k)\n {\n@@ -91,6 +159,8 @@\n return getGlobalNode(k);\n }\n \n+ \/\/ get global node with given key or null if there's\n+ \/\/ not such node\n NodeT *getGlobalNode(KeyT k)\n {\n if (global_nodes) {\n@@ -102,6 +172,7 @@\n return nullptr;\n }\n \n+ \/\/ number of local nodes\n size_t size() const\n {\n return nodes.size();\n@@ -129,8 +200,8 @@\n \/\/ dependence graph can be shared between more call-sites that\n \/\/ has references to this graph. When destroying graph, we\n \/\/ must be sure do delete it just once, so count references\n- \/\/ XXX this is up to user if she uses ref()\/unref() methods\n- \/\/ or handle these stuff some other way\n+ \/\/ This is up to concrete DG implementation if it uses\n+ \/\/ ref()\/unref() methods or handle these stuff some other way\n int ref()\n {\n ++refcount;\n@@ -152,34 +223,6 @@\n return refcount;\n }\n \n-#ifdef ENABLE_CFG\n- BBlock<NodeT> *getPostDominatorTreeRoot() const { return PDTreeRoot; }\n- void setPostDominatorTreeRoot(BBlock<NodeT> *r)\n- {\n- assert(!PDTreeRoot && \"Already has a post-dominator tree root\");\n- PDTreeRoot = r;\n- }\n-\n- BBlock<NodeT> *getEntryBB() const { return entryBB; }\n- BBlock<NodeT> *getExitBB() const { return exitBB; }\n-\n- BBlock<NodeT> *setEntryBB(BBlock<NodeT> *nbb)\n- {\n- BBlock<NodeT> *old = entryBB;\n- entryBB = nbb;\n-\n- return old;\n- }\n-\n- BBlock<NodeT> *setExitBB(BBlock<NodeT> *nbb)\n- {\n- BBlock<NodeT> *old = exitBB;\n- exitBB = nbb;\n-\n- return old;\n- }\n-\n-#endif \/\/ ENABLE_CFG\n ContainerType *setGlobalNodes(ContainerType *ngn)\n {\n ContainerType *old = global_nodes;\n@@ -253,6 +296,10 @@\n owner = static_cast<DependenceGraphT *>(this);\n else {\n \/\/ FIXME what if the container is empty?\n+ \/\/ make own_global_nodes variable a pointer to\n+ \/\/ the owner of the nodes so that instead of\n+ \/\/ (own_global_nodes == true) we'll have (this == global_nodes_owner)\n+ \/\/ and we will have the owner directly\n NodeT* tmp = global_nodes->begin()->second;\n owner = tmp->getDG();\n }\n@@ -364,13 +411,34 @@\n \n uint64_t getSlice() const { return slice_id; }\n \n-protected:\n- \/\/ nodes contained in this dg. They are protected, so that\n- \/\/ child classes can access them directly\n- ContainerType nodes;\n- \/\/ container that can be shared accross the graphs\n- \/\/ (therefore it is a pointer)\n- ContainerType *global_nodes;\n+#ifdef ENABLE_CFG\n+ BBlock<NodeT> *getPostDominatorTreeRoot() const { return PDTreeRoot; }\n+ void setPostDominatorTreeRoot(BBlock<NodeT> *r)\n+ {\n+ assert(!PDTreeRoot && \"Already has a post-dominator tree root\");\n+ PDTreeRoot = r;\n+ }\n+\n+ BBlock<NodeT> *getEntryBB() const { return entryBB; }\n+ BBlock<NodeT> *getExitBB() const { return exitBB; }\n+\n+ BBlock<NodeT> *setEntryBB(BBlock<NodeT> *nbb)\n+ {\n+ BBlock<NodeT> *old = entryBB;\n+ entryBB = nbb;\n+\n+ return old;\n+ }\n+\n+ BBlock<NodeT> *setExitBB(BBlock<NodeT> *nbb)\n+ {\n+ BBlock<NodeT> *old = exitBB;\n+ exitBB = nbb;\n+\n+ return old;\n+ }\n+\n+#endif \/\/ ENABLE_CFG\n \n private:\n \n@@ -392,25 +460,6 @@\n \/\/ remove and re-connect edges\n return _removeNode(it, cont);\n }\n-\n- NodeT *entryNode;\n- NodeT *exitNode;\n-\n- DGParameters<NodeT> *formalParameters;\n-\n- \/\/ call-sites that are calling this graph\n- DGContainer<NodeT> callers;\n-\n- \/\/ how many nodes keeps pointer to this graph?\n- int refcount;\n- bool own_global_nodes;\n- uint64_t slice_id;\n-\n-#ifdef ENABLE_CFG\n- BBlock<NodeT> *entryBB;\n- BBlock<NodeT> *exitBB;\n- BBlock<NodeT> *PDTreeRoot;\n-#endif \/\/ ENABLE_CFG\n };\n \n } \/\/ namespace dg\n"} {"commit":"f753b02aec69561ea4b7940ab88ca08116d9ff40","subject":"rewind the Link_map to get all loaded modules","message":"rewind the Link_map to get all loaded modules\n","repos":"scouter-project\/sigar,racker\/sigar,OlegYch\/sigar,ruleless\/sigar,kaustavha\/sigar,formicary\/sigar,monicasarbu\/sigar,lsjeng\/sigar,cit-lab\/sigar,abhinavmishra14\/sigar,ChunPIG\/sigar,kaustavha\/sigar,formicary\/sigar,monicasarbu\/sigar,kaustavha\/sigar,abhinavmishra14\/sigar,racker\/sigar,racker\/sigar,ruleless\/sigar,hyperic\/sigar,OlegYch\/sigar,abhinavmishra14\/sigar,ruleless\/sigar,kaustavha\/sigar,kaustavha\/sigar,hyperic\/sigar,boundary\/sigar,hyperic\/sigar,formicary\/sigar,ChunPIG\/sigar,boundary\/sigar,ChunPIG\/sigar,boundary\/sigar,OlegYch\/sigar,boundary\/sigar,racker\/sigar,ruleless\/sigar,ChunPIG\/sigar,cit-lab\/sigar,abhinavmishra14\/sigar,lsjeng\/sigar,formicary\/sigar,lsjeng\/sigar,monicasarbu\/sigar,kaustavha\/sigar,formicary\/sigar,OlegYch\/sigar,racker\/sigar,scouter-project\/sigar,couchbase\/sigar,abhinavmishra14\/sigar,ruleless\/sigar,hyperic\/sigar,cit-lab\/sigar,scouter-project\/sigar,monicasarbu\/sigar,abhinavmishra14\/sigar,abhinavmishra14\/sigar,hyperic\/sigar,formicary\/sigar,abhinavmishra14\/sigar,hyperic\/sigar,abhinavmishra14\/sigar,kaustavha\/sigar,ruleless\/sigar,lsjeng\/sigar,ChunPIG\/sigar,formicary\/sigar,cit-lab\/sigar,monicasarbu\/sigar,OlegYch\/sigar,boundary\/sigar,ruleless\/sigar,cit-lab\/sigar,ruleless\/sigar,monicasarbu\/sigar,formicary\/sigar,racker\/sigar,ruleless\/sigar,cit-lab\/sigar,kaustavha\/sigar,racker\/sigar,boundary\/sigar,hyperic\/sigar,OlegYch\/sigar,formicary\/sigar,abhinavmishra14\/sigar,racker\/sigar,hyperic\/sigar,OlegYch\/sigar,lsjeng\/sigar,monicasarbu\/sigar,boundary\/sigar,cit-lab\/sigar,ruleless\/sigar,boundary\/sigar,hyperic\/sigar,monicasarbu\/sigar,lsjeng\/sigar,cit-lab\/sigar,scouter-project\/sigar,couchbase\/sigar,scouter-project\/sigar,monicasarbu\/sigar,cit-lab\/sigar,hyperic\/sigar,formicary\/sigar,scouter-project\/sigar,scouter-project\/sigar,lsjeng\/sigar,kaustavha\/sigar,kaustavha\/sigar,scouter-project\/sigar,ChunPIG\/sigar,kaustavha\/sigar,ChunPIG\/sigar,scouter-project\/sigar,monicasarbu\/sigar,racker\/sigar,cit-lab\/sigar,monicasarbu\/sigar,abhinavmishra14\/sigar,lsjeng\/sigar,ChunPIG\/sigar,lsjeng\/sigar,boundary\/sigar,OlegYch\/sigar,OlegYch\/sigar,hyperic\/sigar,scouter-project\/sigar,scouter-project\/sigar,OlegYch\/sigar,boundary\/sigar,cit-lab\/sigar,lsjeng\/sigar,ChunPIG\/sigar,racker\/sigar,ChunPIG\/sigar","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/sigar_util.c\n+++ src\/sigar_util.c\n@@ -826,6 +826,10 @@\n return status;\n }\n \n+ while (map->l_prev != NULL) {\n+ map = map->l_prev;\n+ }\n+\n do {\n int status = \n procmods->module_getter(procmods->data,\n"} {"commit":"187c72fa96c90c90dee1d19da07b1725bc897df9","subject":"sighandler: only display on active outputs","message":"sighandler: only display on active outputs\n","repos":"strake\/i3,drbig\/i3,strake\/i3,strake\/i3,pronobis\/i3,pronobis\/i3,tommie\/i3,avrelaun\/i3,sideffect0\/i3wm,gigawhitlocks\/i3-hacking,renlinx007\/i3wm,Airblader\/i3,Kaligule\/i3,Phlogistique\/i3,Azkae\/i3,tcreech\/i3,acrisci\/i3,simonnagl\/i3,dtomasiewicz\/i3,avrelaun\/i3,renlinx007\/i3wm,DSMan195276\/i3,Zopieux\/i3,acrisci\/i3,ccryx\/i3,sideffect0\/i3wm,Chr1stoph\/i3,dg-ratiodata\/i3,Airblader\/i3-original,sideffect0\/i3wm,i3\/i3,netzverweigerer\/i3,Matmusia\/i3,FauxFaux\/i3,Chr1stoph\/i3,MForster\/i3,tommie\/i3,renlinx007\/i3wm,pablospe\/i3,netzverweigerer\/i3,DSMan195276\/i3,yin\/i3,Eelis\/i3,dtomasiewicz\/i3,cornerman\/i3,gigawhitlocks\/i3-hacking,mh21\/i3,pronobis\/i3,dg-ratiodata\/i3,netzverweigerer\/i3,renlinx007\/i3wm,pablospe\/i3,mh21\/i3,avrelaun\/i3,ccryx\/i3,i3\/i3,mariusmuja\/i3wm,simonnagl\/i3,Zopieux\/i3,stapelberg\/i3,saksham0808\/i3,drbig\/i3,Azkae\/i3,Matmusia\/i3,dg-ratiodata\/i3,mariusmuja\/i3wm,smrt28\/i3,stfnm\/i3,Chr1stoph\/i3,mh21\/i3,stfnm\/i3,acrisci\/i3,strake\/i3,acrisci\/i3,yin\/i3,tcreech\/i3,sa1\/i3,acrisci\/i3,FauxFaux\/i3,cornerman\/i3,EvilPudding\/i3,MForster\/i3,cornerman\/i3,mariusmuja\/i3wm,Airblader\/i3,cornerman\/i3,EvilPudding\/i3,Phlogistique\/i3,gnomus\/i3-wm-gap,pronobis\/i3,MForster\/i3,isharp\/i3,netzverweigerer\/i3,strake\/i3,smrt28\/i3,jubalh\/i3,avrelaun\/i3,Kaligule\/i3,Kaligule\/i3,yin\/i3,FauxFaux\/i3,FauxFaux\/i3,jubalh\/i3,Matmusia\/i3,Azkae\/i3,pablospe\/i3,shdown\/i3,gigawhitlocks\/i3-hacking,simonnagl\/i3,Zopieux\/i3,tcreech\/i3,drbig\/i3,shdown\/i3,EvilPudding\/i3,Airblader\/i3-original,jubalh\/i3,smrt28\/i3,Airblader\/i3,i3\/i3,EvilPudding\/i3,sa1\/i3,shdown\/i3,drbig\/i3,Matmusia\/i3,Eelis\/i3,ccryx\/i3,saksham0808\/i3,Zopieux\/i3,gigawhitlocks\/i3-hacking,i3\/i3,gnomus\/i3-wm-gap,gnomus\/i3-wm-gap,dg-ratiodata\/i3,Kaligule\/i3,DSMan195276\/i3,dtomasiewicz\/i3,saksham0808\/i3,stapelberg\/i3,stfnm\/i3,Eelis\/i3,Phlogistique\/i3,Eelis\/i3,simonnagl\/i3,Airblader\/i3-original,pablospe\/i3,Chr1stoph\/i3,yin\/i3,Airblader\/i3-original,Azkae\/i3,Airblader\/i3,sideffect0\/i3wm,stapelberg\/i3,jubalh\/i3,ccryx\/i3,smrt28\/i3,gnomus\/i3-wm-gap,MForster\/i3,shdown\/i3,stapelberg\/i3,saksham0808\/i3,DSMan195276\/i3,sa1\/i3,isharp\/i3,mariusmuja\/i3wm,isharp\/i3,sa1\/i3,stfnm\/i3,tcreech\/i3,Airblader\/i3-original,isharp\/i3,mh21\/i3,dtomasiewicz\/i3","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/sighandler.c\n+++ src\/sighandler.c\n@@ -173,6 +173,8 @@\n Output *screen;\n xcb_window_t win;\n TAILQ_FOREACH(screen, &outputs, outputs) {\n+ if (!screen->active)\n+ continue;\n win = open_input_window(conn, screen->rect, width, height);\n \n \/* Create pixmap *\/\n"} {"commit":"2b85c12f59265c51f1100e7ee0bed31d9ec0f8ab","subject":"Fix buffer underflow in _vsb_indent","message":"Fix buffer underflow in _vsb_indent\n\nIf s_indent > 0 and the buffer is empty, it would check s_buf[-1] for\nthe '\\n' character.\n\nNow it will indent either on previous character being a newline, or on\nempty buffer. This allows indenting also the very first line of a\nbuffer.\n","repos":"gquintard\/Varnish-Cache,zhoualbeart\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,chrismoulton\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gquintard\/Varnish-Cache,zhoualbeart\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,chrismoulton\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gquintard\/Varnish-Cache,varnish\/Varnish-Cache,zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,franciscovg\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,chrismoulton\/Varnish-Cache,chrismoulton\/Varnish-Cache,chrismoulton\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,gquintard\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/libvarnish\/vsb.c\n+++ lib\/libvarnish\/vsb.c\n@@ -159,7 +159,7 @@\n _vsb_indent(struct vsb *s)\n {\n \tif (s->s_indent == 0 || s->s_error != 0 ||\n-\t s->s_buf[s->s_len - 1] != '\\n')\n+\t (s->s_len > 0 && s->s_buf[s->s_len - 1] != '\\n'))\n \t\treturn;\n \tif (VSB_FREESPACE(s) <= s->s_indent &&\n \t VSB_extend(s, s->s_indent) < 0) {\n"} {"commit":"86b25f6d9904c9d1705de905035708e3c1611f72","subject":"Correction so that uninitialized warning does not show up any more.","message":"Correction so that uninitialized warning does not show up any more.\n","repos":"mzemp\/profile","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- profile.c\n+++ profile.c\n@@ -1081,6 +1081,8 @@\n \t radius[1] = pa[l][j].rm;\n \t rhoenc[0] = 4*M_PI*(pa[l][j-1].Mtot\/pa[l][j-1].vol)*pa[l][j-1].rm*pa[l][j-1].rm*pa[l][j-1].rm;\n \t rhoenc[1] = 4*M_PI*(pa[l][j].Mtot\/pa[l][j].vol)*pa[l][j].rm*pa[l][j].rm*pa[l][j].rm;\n+\t Menc[0] = 0;\n+\t Menc[1] = 0;\n \t if (gridtype == 0) {\n \t\tm = (pa[l][j-1].Menctot-pa[l][j-2].Menctot)\/(pa[l][j-1].ro-pa[l][j-2].ro);\n \t\td = radius[0]-pa[l][j-2].ro;\n"} {"commit":"8c363610f79f0460a55e2b7f1017921574f30450","subject":"Insignificant memory leak.","message":"Insignificant memory leak.\n\nSpotted by:\tCoverity\n","repos":"zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,alarky\/varnish-cache-doc-ja,gquintard\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,gquintard\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,alarky\/varnish-cache-doc-ja,alarky\/varnish-cache-doc-ja,chrismoulton\/Varnish-Cache,zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,varnish\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,franciscovg\/Varnish-Cache,chrismoulton\/Varnish-Cache,mrhmouse\/Varnish-Cache,gquintard\/Varnish-Cache,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,feld\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,varnish\/Varnish-Cache,alarky\/varnish-cache-doc-ja,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,chrismoulton\/Varnish-Cache,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,gquintard\/Varnish-Cache,chrismoulton\/Varnish-Cache,franciscovg\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,zhoualbeart\/Varnish-Cache,alarky\/varnish-cache-doc-ja","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/libvarnish\/vss.c\n+++ lib\/libvarnish\/vss.c\n@@ -149,9 +149,12 @@\n \tif (adp == NULL)\n \t\tret = getaddrinfo(addr, port, &hints, &res0);\n \telse {\n-\t\tptst = strtol(adp,NULL,10);\n-\t\tif (ptst < 0 || ptst > 65535)\n+\t\tptst = strtol(adp, NULL, 10);\n+\t\tif (ptst < 0 || ptst > 65535) {\n+\t\t\tfree(hop);\n+\t\t\tfree(adp);\n \t\t\treturn(0);\n+\t\t}\n \t\tret = getaddrinfo(hop, adp, &hints, &res0);\n \t}\n \n"} {"commit":"e68312b1d4b04315a89673e53ab888dc79329662","subject":"broken after added command to set threshold","message":"broken after added command to set threshold\n","repos":"beckdac\/IoT_led_strip,beckdac\/IoT_led_strip,beckdac\/IoT_led_strip","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- program.c\n+++ program.c\n@@ -145,6 +145,10 @@\n #define PROGRAM_COMMAND_OFF_LENGTH 3\n #define PROGRAM_COMMAND_LHZ \"LHZ\"\n #define PROGRAM_COMMAND_LHZ_LENGTH 3\n+#define PROGRAM_COMMAND_LHZEN \"LHZEN\"\n+#define PROGRAM_COMMAND_LHZEN_LENGTH 5\n+#define PROGRAM_COMMAND_DUMP \"DUMP\"\n+#define PROGRAM_COMMAND_DUMP_LENGTH 4\n \/\/#define PROGRAM_COMMAND_\n \/\/#define PROGRAM_COMMAND__LENGTH\n \n@@ -152,6 +156,7 @@\n \tchar *buf = usart_command, *endptr = NULL;\n \tuint8_t invalidate_program = 0;\n \n+\tprintf_P(PSTR(\"% \"));\n \tif (buf[0] == '\\0' || buf[0] == '\\n' || buf[0] == '\\r' || buf[0] == ' ' || buf[0] == '\\t') {\n \t\tusart_command_available = 0;\n \t\treturn;\n@@ -296,9 +301,25 @@\n \t\t} else {\n \t\tprintf_P(PSTR(\"currently in programming mode!\\nERROR\\n\"));\n \t\t}\n+\t} else if (strncmp(usart_command, PROGRAM_COMMAND_LHZEN, PROGRAM_COMMAND_LHZEN_LENGTH) == 0) {\n+\t\tbuf = &usart_command[PROGRAM_COMMAND_LHZEN_LENGTH];\n+\t\tuint16_t lhz_enable = strtoul(buf, &endptr, 10);\n+\t\tif (*buf != endptr) {\n+\t\t\tuint16_t location = PROGRAM_ICP_HZ_ENABLE_LOCATION;\n+\t\t\tprintf_P(PSTR(\"light frequency HZ enable threshold = %\" PRIu16 \"\\n\"), lhz_enable);\n+\t\t\teeprom_update_word((uint16_t *)location, lhz_enable);\n+\t\t\tprogram_icp_hz_enable = lhz_enable;\n+\t\t\tinvalidate_program = 1;\n+\t\t\tprintf_P(PSTR(\"OK\\n\"));\n+\t\t} else {\n+\t\t\tprintf_P(PSTR(\"invalid light frequency Hz enable threshold\\nERROR\\n\"));\n+\t\t}\n \t} else if (strncmp(usart_command, PROGRAM_COMMAND_LHZ, PROGRAM_COMMAND_LHZ_LENGTH) == 0) {\n \t\tprintf_P(PSTR(\"light frequency:\\t%d\\n\"), icp_hz);\n \t\tprintf_P(PSTR(\"OK\\n\"));\n+\t} else if (strncmp(usart_command, PROGRAM_COMMAND_DUMP, PROGRAM_COMMAND_DUMP_LENGTH) == 0) {\n+\t\tprintf_P(PSTR(\"not implemented\\n\"));\n+\t\tprintf_P(PSTR(\"OK\\n\"));\n \t} else {\n \t\tprintf_P(PSTR(\"unrecognized command\\nERROR\\n\"));\n \t}\n"} {"commit":"f46183c2eed1d69dde1684951e32a8167910b980","subject":"proto_2: Make cam_mat_update logic inline.","message":"proto_2: Make cam_mat_update logic inline.\n","repos":"tanosysoft\/sokoban-3d,sokoban-3d\/game,tanosysoft\/sokoban-3d,tanosysoft\/sokoban-3d,sokoban-3d\/game,sokoban-3d\/game","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- proto_2.c\n+++ proto_2.c\n@@ -53,13 +53,6 @@\n s3d_mat4 mat;\n } cam;\n \n-void cam_mat_update() {\n- s3d_perspective(cam.mat, cam.fov, s3d_ratio(wnd_sz), 0.1, 100);\n-\n- s3d_translate(cam.mat, cam.pos);\n- s3d_euler_rot(cam.mat, cam.rot);\n-}\n-\n struct {\n unsigned id;\n \n@@ -136,8 +129,6 @@\n \n glfwGetWindowSize(s3d_gl_wnd, &wnd_sz[0], &wnd_sz[1]);\n \n- cam_mat_update();\n-\n glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\n \n {\n@@ -145,6 +136,15 @@\n glEnable(GL_DEPTH_TEST);\n \n glUseProgram(main_prog.id);\n+\n+ {\n+ s3d_perspective(\n+ cam.mat, cam.fov, s3d_ratio(wnd_sz), 0.1, 100\n+ );\n+\n+ s3d_translate(cam.mat, cam.pos);\n+ s3d_euler_rot(cam.mat, cam.rot);\n+ }\n \n static s3d_mat4 mvp;\n \n"} {"commit":"6fa97537ffd01421fe64b09d3c9d70946c9f4b76","subject":"Fix decode_path","message":"Fix decode_path\n","repos":"chaoskagami\/ftpde,chaoskagami\/ftpde,chaoskagami\/ftpde","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- source\/ftp.c\n+++ source\/ftp.c\n@@ -739,34 +739,21 @@\n \/*! decode a path\n *\n * @param[in] session ftp session\n+ * @param[in] len command length\n *\/\n static void\n-decode_path(ftp_session_t *session)\n-{\n- size_t in, out;\n- size_t diff = 0;\n+decode_path(ftp_session_t *session,\n+ size_t len)\n+{\n+ size_t i;\n \n \/* decode \\0 from the first command *\/\n- for(in = out = 0; in < session->cmd_buffersize && session->cmd_buffer[in] != 0; ++in)\n- {\n- if(session->cmd_buffer[in] == 0)\n- {\n- \/* this is an encoded \\r *\/\n- session->cmd_buffer[out++] = session->cmd_buffer[in++];\n- ++diff;\n- }\n- else\n- {\n- session->cmd_buffer[out++] = session->cmd_buffer[in];\n- }\n- }\n-\n- \/* copy remaining buffer *\/\n- if(diff > 0)\n- memmove(session->cmd_buffer + out, session->cmd_buffer + in, session->cmd_buffersize - in);\n-\n- \/* adjust the buffer size *\/\n- session->cmd_buffersize -= diff;\n+ for(i = 0; i < len; ++i)\n+ {\n+ \/* this is an encoded \\n *\/\n+ if(session->cmd_buffer[i] == 0)\n+ session->cmd_buffer[i] = '\\n';\n+ }\n }\n \n \/*! send a response on the command socket\n@@ -1213,7 +1200,7 @@\n return;\n \n \/* decode the command *\/\n- decode_path(session);\n+ decode_path(session, i);\n \n \/* split command from arguments *\/\n args = buffer = session->cmd_buffer;\n"} {"commit":"485460deefc5b93f94bc1a3696c00d7181278a78","subject":"basic types, errors and device struct","message":"basic types, errors and device struct\n","repos":"inclooder\/snfd,inclooder\/snfd,inclooder\/snfd","returncode":1,"stderr":"error: pathspec 'src\/snfd_types.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src\/snfd_types.h\n+++ src\/snfd_types.h\n@@ -0,0 +1,49 @@\n+#ifndef SNFD_TYPES_H\n+#define SNFD_TYPES_H\n+\n+\/\/ Basic types\n+\n+#ifndef SNFD_INIT32\n+#define SNFD_INT32 int\n+#endif\n+\n+#ifndef SNFD_UINT32\n+#define SNFD_UINT32 unsigned int\n+#endif\n+\n+#ifndef SNFD_INT16\n+#define SNFD_INT16 short\n+#endif\n+\n+#ifndef SNFD_UINT16\n+#define SNFD_UINT16 unsigned short\n+#endif\n+\n+#ifndef SNFD_INT8\n+#define SNFD_INT8 char\n+#endif\n+\n+#ifndef SNFD_UINT8\n+#define SNFD_UINT8 unsigned char\n+#endif\n+\n+\n+\/\/ Errors\n+\n+#define SNFD_ERROR SNFD_UINT16\n+#define SNFD_ERROR_NO_ERROR 0\n+#define SNFD_ERROR_INVALID_PARAM 1\n+\n+\/\/ Direct functions\n+typedef SNFD_ERROR (*SNFD_DIRECT_WRITE_FUNC)\n+(\n+\t\tSNFD_UINT32 destination, \n+\t\tSNFD_UINT8 * source_buffer, \n+\t\tSNFD_UINT32 count\n+);\n+\n+typedef struct {\n+\tSNFD_DIRECT_WRITE_FUNC direct_write_func;\n+} SNFD_DEVICE;\n+\n+#endif \/* end of include guard: SNFD_TYPES_H *\/\n"} {"commit":"45046cd0e1d48b3d0a80d9927b62a384e6886b34","subject":"Flushing clears event queue, handles resize events etc","message":"Flushing clears event queue, handles resize events etc\n\nWithout this, a program that reads no events will never register window\nsize changes.\n","repos":"rsaarelm\/sodna,rsaarelm\/sodna","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/sodna_sdl2.c\n+++ src\/sodna_sdl2.c\n@@ -197,29 +197,6 @@\n }\n out_rect->x = (viewport.w - out_rect->w) \/ 2;\n out_rect->y = (viewport.h - out_rect->h) \/ 2;\n-}\n-\n-void sodna_flush() {\n- int x, y;\n- SDL_Rect target;\n- sodna_Cell* cells = sodna_cells();\n- \/* XXX: Always repaints all cells, even if there was no change from\n- * previous frame. Could use a twin cell buffer and check for change\n- * from previous frame to see if we can skip draw_cell.\n- *\/\n- for (y = 0; y < sodna_height(); y++)\n- for (x = 0; x < sodna_width(); x++) {\n- sodna_Cell cell = cells[x + sodna_width() * y];\n- Uint32 fore = convert_color(cell.fore);\n- Uint32 back = convert_color(cell.back);\n- draw_cell(x * g_font_w, y * g_font_h, fore, back, cell.symbol);\n- }\n- SDL_RenderClear(g_rend);\n- SDL_UpdateTexture(g_texture, NULL, g_pixels, window_w() * sizeof(Uint32));\n-\n- pixel_perfect_target_rect(&target, window_w(), window_h(), g_rend);\n- SDL_RenderCopy(g_rend, g_texture, NULL, &target);\n- SDL_RenderPresent(g_rend);\n }\n \n int sodna_width() { return g_columns; }\n@@ -604,6 +581,33 @@\n return ret;\n }\n \n+void sodna_flush() {\n+ int x, y;\n+ SDL_Rect target;\n+ sodna_Cell* cells = sodna_cells();\n+ \/* Flush the events the user didn't look into, there might be resize events. *\/\n+ SDL_Event event;\n+ while (SDL_PollEvent(&event)) { process_event(&event); }\n+\n+ \/* XXX: Always repaints all cells, even if there was no change from\n+ * previous frame. Could use a twin cell buffer and check for change\n+ * from previous frame to see if we can skip draw_cell.\n+ *\/\n+ for (y = 0; y < sodna_height(); y++)\n+ for (x = 0; x < sodna_width(); x++) {\n+ sodna_Cell cell = cells[x + sodna_width() * y];\n+ Uint32 fore = convert_color(cell.fore);\n+ Uint32 back = convert_color(cell.back);\n+ draw_cell(x * g_font_w, y * g_font_h, fore, back, cell.symbol);\n+ }\n+ SDL_RenderClear(g_rend);\n+ SDL_UpdateTexture(g_texture, NULL, g_pixels, window_w() * sizeof(Uint32));\n+\n+ pixel_perfect_target_rect(&target, window_w(), window_h(), g_rend);\n+ SDL_RenderCopy(g_rend, g_texture, NULL, &target);\n+ SDL_RenderPresent(g_rend);\n+}\n+\n sodna_Event sodna_wait_event(int timeout_ms) {\n SDL_Event event;\n int start_time = SDL_GetTicks();\n"} {"commit":"f87cb4198ca7c96939b8410ac7813bc366f5571d","subject":"Change the length of basis vector convention of Pbca (61) to a as the minimum","message":"Change the length of basis vector convention of Pbca (61) to a as the minimum\n","repos":"atztogo\/spglib,jochym\/spglib,jochym\/spglib,atztogo\/spglib,jochym\/spglib,atztogo\/spglib,atztogo\/spglib,atztogo\/spglib,jochym\/spglib","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/spacegroup.c\n+++ src\/spacegroup.c\n@@ -808,7 +808,7 @@\n \tfor (k = 0; k < 3; k++) {vec[k] = changed_lattice[k][j];}\n \tnorms[j] = mat_norm_squared_d3(vec);\n }\n- if (norms[2] < norms[0] || norms[2] < norms[1]) {continue;}\n+ if (norms[0] > norms[1] || norms[0] > norms[2]) {continue;}\n }\n \n if (num_free_axes == 6) {\n"} {"commit":"04209591c8c874d5125dd442d72eab528c5d2e1a","subject":"Remove functions that are not used. Fix comment.","message":"Remove functions that are not used. Fix comment.\n","repos":"R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone,R1dO\/scintilla_clone","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- lexlib\/StyleContext.h\n+++ lexlib\/StyleContext.h\n@@ -1,5 +1,5 @@\n \/\/ Scintilla source code edit control\n-\/** @file StyleContext.cxx\n+\/** @file StyleContext.h\n ** Lexer infrastructure.\n **\/\n \/\/ Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>\n@@ -17,30 +17,6 @@\n \t\treturn ch;\n \telse\n \t\treturn ch - 'A' + 'a';\n-}\n-\n-inline int UnicodeCodePoint(const unsigned char *us) {\n-\tif (us[0] < 0xC2) {\n-\t\treturn us[0];\n-\t} else if (us[0] < 0xE0) {\n-\t\treturn ((us[0] & 0x1F) << 6) + (us[1] & 0x3F);\n-\t} else if (us[0] < 0xF0) {\n-\t\treturn ((us[0] & 0xF) << 12) + ((us[1] & 0x3F) << 6) + (us[2] & 0x3F);\n-\t} else if (us[0] < 0xF5) {\n-\t\treturn ((us[0] & 0x7) << 18) + ((us[1] & 0x3F) << 12) + ((us[2] & 0x3F) << 6) + (us[3] & 0x3F);\n-\t}\n-\treturn us[0];\n-}\n-\n-inline int BytesInUnicodeCodePoint(int codePoint) {\n-\tif (codePoint < 0x80)\n-\t\treturn 1;\n-\telse if (codePoint < 0x800)\n-\t\treturn 2;\n-\telse if (codePoint < 0x10000)\n-\t\treturn 3;\n-\telse\n-\t\treturn 4;\n }\n \n \/\/ All languages handled so far can treat all characters >= 0x80 as one class\n"} {"commit":"c61122dddedfe92300366cb8668184ae29691b1e","subject":"spawn-fcgi: Initialize socket address struct to zero","message":"spawn-fcgi: Initialize socket address struct to zero\n\n\ngit-svn-id: c4e9838fefcfae554524937a357000afc2bbf25b@2348 152afb58-edef-0310-8abb-c4023f1b3aa9\n","repos":"mkschreder\/juci-lighttpd,Andrew-liu\/lighttpd1.4,lighttpd\/lighttpd1.4,gstrauss\/lighttpd1.4,PatchyFog\/lighttpd1.4-mbedtls,PatchyFog\/lighttpd1.4-mbedtls,lighttpd\/lighttpd1.4,Juniper\/lighttpd-for-juise,kaleb-himes\/lighttpd1.4,loganaden\/lighttpd1.4,mkschreder\/juci-lighttpd,ya1gaurav\/lighttpd1.4,HitoriSensei\/lighttpd,PatchyFog\/lighttpd1.4-mbedtls,ya1gaurav\/lighttpd1.4,lighttpd\/lighttpd1.4,kaleb-himes\/lighttpd1.4,gstrauss\/lighttpd1.4,loganaden\/lighttpd1.4,benegon\/lighttpd-1.4,HitoriSensei\/lighttpd,kaleb-himes\/lighttpd1.4,Juniper\/lighttpd-for-juise,Juniper\/lighttpd-for-juise,lighttpd\/lighttpd1.4,Andrew-liu\/lighttpd1.4,ya1gaurav\/lighttpd1.4,HitoriSensei\/lighttpd,lighttpd\/lighttpd1.4,PatchyFog\/lighttpd1.4-mbedtls,gstrauss\/lighttpd1.4,Andrew-liu\/lighttpd1.4,loganaden\/lighttpd1.4,kaleb-himes\/lighttpd1.4,ya1gaurav\/lighttpd1.4,mkschreder\/juci-lighttpd,lighttpd\/lighttpd1.4,Juniper\/lighttpd-for-juise,mkschreder\/juci-lighttpd,gstrauss\/lighttpd1.4,Andrew-liu\/lighttpd1.4,benegon\/lighttpd-1.4,mkschreder\/juci-lighttpd,PatchyFog\/lighttpd1.4-mbedtls,Andrew-liu\/lighttpd1.4,PatchyFog\/lighttpd1.4-mbedtls,Juniper\/lighttpd-for-juise,kaleb-himes\/lighttpd1.4,loganaden\/lighttpd1.4,gstrauss\/lighttpd1.4,PatchyFog\/lighttpd1.4-mbedtls,ya1gaurav\/lighttpd1.4,benegon\/lighttpd-1.4,kaleb-himes\/lighttpd1.4,Andrew-liu\/lighttpd1.4,mkschreder\/juci-lighttpd,Juniper\/lighttpd-for-juise,gstrauss\/lighttpd1.4,ya1gaurav\/lighttpd1.4,HitoriSensei\/lighttpd,loganaden\/lighttpd1.4,HitoriSensei\/lighttpd,loganaden\/lighttpd1.4,benegon\/lighttpd-1.4","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/spawn-fcgi.c\n+++ src\/spawn-fcgi.c\n@@ -58,7 +58,7 @@\n \n \n \tif (unixsocket) {\n-\t\tmemset(&fcgi_addr, 0, sizeof(fcgi_addr));\n+\t\tmemset(&fcgi_addr_un, 0, sizeof(fcgi_addr_un));\n \n \t\tfcgi_addr_un.sun_family = AF_UNIX;\n \t\tstrcpy(fcgi_addr_un.sun_path, unixsocket);\n@@ -72,12 +72,13 @@\n \t\tsocket_type = AF_UNIX;\n \t\tfcgi_addr = (struct sockaddr *) &fcgi_addr_un;\n \t} else {\n+\t\tmemset(&fcgi_addr_in, 0, sizeof(fcgi_addr_in));\n \t\tfcgi_addr_in.sin_family = AF_INET;\n- if (addr != NULL) {\n- fcgi_addr_in.sin_addr.s_addr = inet_addr(addr);\n- } else {\n- fcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY);\n- }\n+\t\tif (addr != NULL) {\n+\t\t\tfcgi_addr_in.sin_addr.s_addr = inet_addr(addr);\n+\t\t} else {\n+\t\t\tfcgi_addr_in.sin_addr.s_addr = htonl(INADDR_ANY);\n+\t\t}\n \t\tfcgi_addr_in.sin_port = htons(port);\n \t\tservlen = sizeof(fcgi_addr_in);\n \n"} {"commit":"5ca7b19dfc0df4979f4ab200f9e5afcc309bcf05","subject":"hfuzz-cc: try clang-12 first","message":"hfuzz-cc: try clang-12 first\n","repos":"google\/honggfuzz,google\/honggfuzz,google\/honggfuzz","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- hfuzz_cc\/hfuzz-cc.c\n+++ hfuzz_cc\/hfuzz-cc.c\n@@ -162,6 +162,9 @@\n if (isCXX) {\n \/* Try the default one, then the newest ones (hopefully) in order *\/\n hf_execvp(\"clang++\", argv);\n+ hf_execvp(\"clang++-12.0\", argv);\n+ hf_execvp(\"clang++-12\", argv);\n+ hf_execvp(\"clang++12\", argv);\n hf_execvp(\"clang++-11.0\", argv);\n hf_execvp(\"clang++-11\", argv);\n hf_execvp(\"clang++11\", argv);\n@@ -181,6 +184,9 @@\n } else {\n \/* Try the default one, then the newest ones (hopefully) in order *\/\n hf_execvp(\"clang\", argv);\n+ hf_execvp(\"clang-12.0\", argv);\n+ hf_execvp(\"clang-12\", argv);\n+ hf_execvp(\"clang12\", argv);\n hf_execvp(\"clang-11.0\", argv);\n hf_execvp(\"clang-11\", argv);\n hf_execvp(\"clang11\", argv);\n"} {"commit":"7c7fe5be286397c4568a259a343daacbe2397543","subject":"[cage] Don't use multiplication to change sign in str_to_num. Just change sign.","message":"[cage] Don't use multiplication to change sign in str_to_num. Just change sign.\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@39538 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/string\/api.c\n+++ src\/string\/api.c\n@@ -2319,7 +2319,8 @@\n f = mantissa + (1.0 * d \/ powl(10, d_length));\n }\n \n- f = f * sign;\n+ if (sign < 0)\n+ f = -f;\n \n if (e) {\n if (e_sign == 1)\n"} {"commit":"a1f59f0fd86bab4de0d9a09ae4bfe5fff2084e49","subject":"Changing construct to use while instead","message":"Changing construct to use while instead\n","repos":"ansilove\/ansilove,ansilove\/AnsiLove-C","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/strtolower.c\n+++ src\/strtolower.c\n@@ -13,10 +13,12 @@\n \n char *strtolower(char *str)\n {\n- char *p;\n- for (p = str; *p != '\\0'; ++p) \n- {\n+ char *p = str;\n+\n+ while (*p) {\n *p = tolower((unsigned char) *p);\n+ p++;\n }\n+\n return str;\n }\n"} {"commit":"ba73b56cebee261e7c228b429bafb50661694488","subject":"bdd: fix some bugs","message":"bdd: fix some bugs\n","repos":"trolando\/sylvan,Meijuh\/sylvan,utwente-fmt\/sylvan,Meijuh\/sylvan,bernied\/sylvan,bernied\/sylvan,utwente-fmt\/sylvan,trolando\/sylvan","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/sylvan_bdd.c\n+++ src\/sylvan_bdd.c\n@@ -78,7 +78,7 @@\n static inline int\n bddnode_getmark(bddnode_t n)\n {\n- return n->a & 0x2000000000000000;\n+ return n->a & 0x2000000000000000 ? 1 : 0;\n }\n \n static inline void\n@@ -1290,7 +1290,7 @@\n \/* check if level < s\/t *\/\n if (level < vv) break;\n vars = node_high(vars, nv); \/\/ get next in vars\n- if (sylvan_set_isempty(vars)) return a;\n+ if (sylvan_set_isempty(vars)) return b;\n nv = GETNODE(vars);\n }\n }\n@@ -1667,7 +1667,7 @@\n {\n if (sylvan_isconst(a)) return;\n bddnode_t na = GETNODE(a);\n- if (bddnode_getmark(na)) return;\n+ if (!bddnode_getmark(na)) return;\n bddnode_setmark(na, 0);\n sylvan_nodecount_do_2(bddnode_getlow(na));\n sylvan_nodecount_do_2(bddnode_gethigh(na));\n@@ -1959,12 +1959,12 @@\n return;\n }\n \n- BDD var = sylvan_var(vars);\n+ BDDVAR var = sylvan_var(vars);\n vars = sylvan_set_next(vars);\n- BDD bdd_var = sylvan_var(bdd);\n+ BDDVAR bdd_var = sylvan_var(bdd);\n \n \/* assert var <= bdd_var *\/\n- if (var < bdd_var) {\n+ if (bdd == sylvan_true || var < bdd_var) {\n struct bdd_path pp0 = (struct bdd_path){path, var, 0};\n CALL(sylvan_enum_do, bdd, vars, cb, context, &pp0);\n struct bdd_path pp1 = (struct bdd_path){path, var, 1};\n@@ -1975,6 +1975,7 @@\n struct bdd_path pp1 = (struct bdd_path){path, var, 1};\n CALL(sylvan_enum_do, sylvan_high(bdd), vars, cb, context, &pp1);\n } else {\n+ printf(\"var %u not expected (expecting %u)!\\n\", bdd_var, var);\n assert(var <= bdd_var);\n }\n }\n"} {"commit":"4266b27944f00cdc2f0747509524fa273a8865b1","subject":"updated calls to the removed getSomeMemory function","message":"updated calls to the removed getSomeMemory function\n","repos":"Distrotech\/trousers,emilcondrea\/trousers,emilcondrea\/trousers,Distrotech\/trousers,emilcondrea\/trousers,Distrotech\/trousers","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/tcs\/tcskcm.c\n+++ src\/tcs\/tcskcm.c\n@@ -126,7 +126,7 @@\n \n \t\t\/* malloc a structure for each of them *\/\n \t\tif (count != 0) {\n-\t\t\tret = getSomeMemory((count * sizeof(TSS_KM_KEYINFO)), hContext);\n+\t\t\tret = calloc(count, sizeof(TSS_KM_KEYINFO));\n \t\t\tif (ret == NULL) {\n \t\t\t\tLogError(\"malloc of %zd bytes failed.\",\n \t\t\t\t\t\t(count * sizeof(TSS_KM_KEYINFO)));\n@@ -196,7 +196,7 @@\n \n \t\t\/* malloc a structure for each of them *\/\n \t\tif (count != 0) {\n-\t\t\tret = getSomeMemory((count * sizeof(TSS_KM_KEYINFO)), hContext);\n+\t\t\tret = calloc(count, sizeof(TSS_KM_KEYINFO));\n \t\t\tif (ret == NULL) {\n \t\t\t\tLogError(\"malloc of %zd bytes failed.\",\n \t\t\t\t\t\t(count * sizeof(TSS_KM_KEYINFO)));\n@@ -305,17 +305,17 @@\n )\n {\n \tUINT16 keySize;\n-\tBYTE buffer[1024];\n+\tBYTE buffer[4096];\n \tTSS_RESULT result;\n \n \tif ((result = ctx_verify_context(hContext)))\n \t\treturn result;\n \n-\tkeySize = sizeof (buffer);\n+\tkeySize = sizeof(buffer);\n \tif ((result = ps_get_key_by_uuid(KeyUUID, buffer, &keySize)))\n \t\treturn TCSERR(TSS_E_PS_KEY_NOTFOUND);\n \n-\t*prgbKey = getSomeMemory(keySize, hContext);\n+\t*prgbKey = calloc(1, keySize);\n \tif (*prgbKey == NULL) {\n \t\tLogError(\"malloc of %d bytes failed.\", keySize);\n \t\treturn TCSERR(TSS_E_OUTOFMEMORY);\n@@ -709,7 +709,7 @@\n \t\t\/*===\tHere's how big it is *\/\n \t\t*keyDataSize = offset - 10;\n \t\t\/*===\tmalloc the outBuffer *\/\n-\t\t*keyData = getSomeMemory(*keyDataSize, hContext);\n+\t\t*keyData = calloc(1, *keyDataSize);\n \t\tif (*keyData == NULL) {\n \t\t\tLogError(\"malloc of %d bytes failed.\", *keyDataSize);\n \t\t\tresult = TCSERR(TSS_E_OUTOFMEMORY);\n@@ -784,7 +784,7 @@\n \tif (!result) {\n \t\tUnloadBlob_PUBKEY(&offset, txBlob, &pubContainer);\n \t\t*pcPubKeySize = offset - 10;\n-\t\t*prgbPubKey = getSomeMemory(*pcPubKeySize, hContext);\n+\t\t*prgbPubKey = calloc(1, *pcPubKeySize);\n \t\tif (*prgbPubKey == NULL) {\n \t\t\tLogError(\"malloc of %d bytes failed.\", *pcPubKeySize);\n \t\t\tresult = TCSERR(TSS_E_OUTOFMEMORY);\n@@ -957,7 +957,7 @@\n \tif (!result) {\n \t\tUnloadBlob_KEY(&offset, txBlob, &idKeyContainer);\n \t\t*idKeySize = offset - 10;\n-\t\t*idKey = getSomeMemory(*idKeySize, hContext);\n+\t\t*idKey = calloc(1, *idKeySize);\n \t\tif (*idKey == NULL) {\n \t\t\tLogError(\"malloc of %d bytes failed.\", *idKeySize);\n \t\t\tresult = TCSERR(TSS_E_OUTOFMEMORY);\n@@ -967,7 +967,7 @@\n \t\t}\n \n \t\tUnloadBlob_UINT32(&offset, pcIdentityBindingSize, txBlob, \"bind size\");\n-\t\t*prgbIdentityBinding = getSomeMemory(*pcIdentityBindingSize, hContext);\n+\t\t*prgbIdentityBinding = calloc(1, *pcIdentityBindingSize);\n \t\tif (*prgbIdentityBinding == NULL) {\n \t\t\tfree(*idKey);\n \t\t\t*idKeySize = 0;\n"} {"commit":"7e6b2f7acebca558b4825af6699a1318ea10e578","subject":"I#60 - Messages deleted in public folders cannot be moved to Deleted Items","message":"I#60 - Messages deleted in public folders cannot be moved to Deleted Items\n\nCloses https:\/\/gitlab.gnome.org\/GNOME\/evolution-ews\/issues\/60\n","repos":"GNOME\/evolution-ews,GNOME\/evolution-ews","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/camel\/camel-ews-folder.c\n+++ src\/camel\/camel-ews-folder.c\n@@ -1510,6 +1510,29 @@\n \tg_free (folder_id);\n \n \treturn is_of_type;\n+}\n+\n+static gboolean\n+ews_folder_is_public_or_foreign (CamelFolder *folder)\n+{\n+\tCamelStore *parent_store;\n+\tCamelEwsStore *ews_store;\n+\tgboolean res;\n+\tgchar *folder_id;\n+\n+\tg_return_val_if_fail (folder != NULL, FALSE);\n+\n+\tparent_store = camel_folder_get_parent_store (folder);\n+\tews_store = CAMEL_EWS_STORE (parent_store);\n+\n+\tg_return_val_if_fail (ews_store != NULL, FALSE);\n+\n+\tfolder_id = camel_ews_store_summary_get_folder_id_from_name (ews_store->summary, camel_folder_get_full_name (folder));\n+\tres = folder_id && (camel_ews_store_summary_get_public (ews_store->summary, folder_id, NULL) ||\n+\t\tcamel_ews_store_summary_get_foreign (ews_store->summary, folder_id, NULL));\n+\tg_free (folder_id);\n+\n+\treturn res;\n }\n \n static gboolean\n@@ -2765,6 +2788,9 @@\n \tif (!camel_ews_store_connected (ews_store, cancellable, error))\n \t\treturn FALSE;\n \n+\tif (!expunge)\n+\t\texpunge = ews_folder_is_public_or_foreign (folder);\n+\n \tews_delete_messages_from_server (\n \t\tews_store,\n \t\tdeleted_items,\n"} {"commit":"bc21dfe390fb35e5621b5573a34e448585103d9f","subject":"intermediate MRLComm.c","message":"intermediate MRLComm.c","repos":"MyRobotLab\/pyrobotlab,MyRobotLab\/pyrobotlab,MyRobotLab\/pyrobotlab,MyRobotLab\/pyrobotlab,MyRobotLab\/pyrobotlab","returncode":1,"stderr":"error: pathspec 'home\/GroG\/MRLComm.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- home\/GroG\/MRLComm.c\n+++ home\/GroG\/MRLComm.c\n@@ -0,0 +1,1820 @@\n+\/**\r\n+*\r\n+* MRLComm.c\r\n+* -----------------\r\n+*\r\n+* This file is part of MyRobotLab.\r\n+* (myrobotlab.org)\r\n+*\r\n+* Enjoy !\r\n+* @authors\r\n+* GroG\r\n+* Kwatters\r\n+* Mats\r\n+* and many others...\r\n+*\r\n+* MRL Protocol definition\r\n+* -----------------\r\n+* MAGIC_NUMBER|NUM_BYTES|FUNCTION|DATA0|DATA1|....|DATA(N)\r\n+* NUM_BYTES - is the number of bytes after NUM_BYTES to the end\r\n+*\r\n+* more info - http:\/\/myrobotlab.org\/content\/myrobotlab-api\r\n+*\r\n+*\r\n+* General Concept\r\n+* -----------------\r\n+* Arduino is a slave process to MyRobotLab Arduino Service - this file receives\r\n+* commands and sends back data.\r\n+* Refactoring has made MRLComm.c far more general\r\n+* there are only 2 \"types\" of things - controllers and pins - or writers and readers\r\n+* each now will have sub-types\r\n+*\r\n+* Controllers\r\n+* -----------------\r\n+* digital pins, pwm, pwm\/dir dc motors, pwm\/pwm dc motors\r\n+*\r\n+* Sensors\r\n+* -----------------\r\n+* digital polling pins, analog polling pins, range pins, oscope, trigger events\r\n+*\r\n+* Combination\r\n+* -----------------\r\n+* pingdar, non-blocking pulsin\r\n+*\r\n+* Requirements: MyRobotLab running on a computer & a serial connection\r\n+*\r\n+*\/\r\n+\r\n+\/\/ FIXME FIXME FIXME - ALL defines are defined ONLY in Java - all other files need to be\r\n+\/\/ generated (INO, PYTHON, ETC) 1 - control definition to rule them all !\r\n+\/\/ TODO - getBoardInfo() - returns board info !\r\n+\/\/ TODO - getPinInfo() - returns pin info !\r\n+\r\n+\/\/ Included as a 3rd party arduino library from here: https:\/\/github.com\/ivanseidel\/LinkedList\/\r\n+\/\/ #include <LinkedList.h>\r\n+\/*\r\n+ LinkedList.h - V1.1 - Generic LinkedList implementation\r\n+ Works better with FIFO, because LIFO will need to\r\n+ search the entire List to find the last one;\r\n+\r\n+ For instructions, go to https:\/\/github.com\/ivanseidel\/LinkedList\r\n+\r\n+ Created by Ivan Seidel Gomes, March, 2013.\r\n+ Released into the public domain.\r\n+*\/\r\n+\r\n+\r\n+#ifndef LinkedList_h\r\n+#define LinkedList_h\r\n+\r\n+template<class T>\r\n+struct ListNode\r\n+{\r\n+ T data;\r\n+ ListNode<T> *next;\r\n+};\r\n+\r\n+template <typename T>\r\n+class LinkedList{\r\n+\r\n+protected:\r\n+ int _size;\r\n+ ListNode<T> *root;\r\n+ ListNode<T> *last;\r\n+\r\n+ \/\/ Helps \"get\" method, by saving last position\r\n+ ListNode<T> *lastNodeGot;\r\n+ int lastIndexGot;\r\n+ \/\/ isCached should be set to FALSE\r\n+ \/\/ everytime the list suffer changes\r\n+ bool isCached;\r\n+\r\n+ ListNode<T>* getNode(int index);\r\n+\r\n+public:\r\n+ LinkedList();\r\n+ ~LinkedList();\r\n+\r\n+ \/*\r\n+ Returns current size of LinkedList\r\n+ *\/\r\n+ virtual int size();\r\n+ \/*\r\n+ Adds a T object in the specified index;\r\n+ Unlink and link the LinkedList correcly;\r\n+ Increment _size\r\n+ *\/\r\n+ virtual bool add(int index, T);\r\n+ \/*\r\n+ Adds a T object in the end of the LinkedList;\r\n+ Increment _size;\r\n+ *\/\r\n+ virtual bool add(T);\r\n+ \/*\r\n+ Adds a T object in the start of the LinkedList;\r\n+ Increment _size;\r\n+ *\/\r\n+ virtual bool unshift(T);\r\n+ \/*\r\n+ Set the object at index, with T;\r\n+ Increment _size;\r\n+ *\/\r\n+ virtual bool set(int index, T);\r\n+ \/*\r\n+ Remove object at index;\r\n+ If index is not reachable, returns false;\r\n+ else, decrement _size\r\n+ *\/\r\n+ virtual T remove(int index);\r\n+ \/*\r\n+ Remove last object;\r\n+ *\/\r\n+ virtual T pop();\r\n+ \/*\r\n+ Remove first object;\r\n+ *\/\r\n+ virtual T shift();\r\n+ \/*\r\n+ Get the index'th element on the list;\r\n+ Return Element if accessible,\r\n+ else, return false;\r\n+ *\/\r\n+ virtual T get(int index);\r\n+\r\n+ \/*\r\n+ Clear the entire array\r\n+ *\/\r\n+ virtual void clear();\r\n+\r\n+};\r\n+\r\n+\/\/ Initialize LinkedList with false values\r\n+template<typename T>\r\n+LinkedList<T>::LinkedList()\r\n+{\r\n+ root=false;\r\n+ last=false;\r\n+ _size=0;\r\n+\r\n+ lastNodeGot = root;\r\n+ lastIndexGot = 0;\r\n+ isCached = false;\r\n+}\r\n+\r\n+\/\/ Clear Nodes and free Memory\r\n+template<typename T>\r\n+LinkedList<T>::~LinkedList()\r\n+{\r\n+ ListNode<T>* tmp;\r\n+ while(root!=false)\r\n+ {\r\n+ tmp=root;\r\n+ root=root->next;\r\n+ delete tmp;\r\n+ }\r\n+ last = false;\r\n+ _size=0;\r\n+ isCached = false;\r\n+}\r\n+\r\n+\/*\r\n+ Actualy \"logic\" coding\r\n+*\/\r\n+\r\n+template<typename T>\r\n+ListNode<T>* LinkedList<T>::getNode(int index){\r\n+\r\n+ int _pos = 0;\r\n+ ListNode<T>* current = root;\r\n+\r\n+ \/\/ Check if the node trying to get is\r\n+ \/\/ immediatly AFTER the previous got one\r\n+ if(isCached && lastIndexGot <= index){\r\n+ _pos = lastIndexGot;\r\n+ current = lastNodeGot;\r\n+ }\r\n+\r\n+ while(_pos < index && current){\r\n+ current = current->next;\r\n+\r\n+ _pos++;\r\n+ }\r\n+\r\n+ \/\/ Check if the object index got is the same as the required\r\n+ if(_pos == index){\r\n+ isCached = true;\r\n+ lastIndexGot = index;\r\n+ lastNodeGot = current;\r\n+\r\n+ return current;\r\n+ }\r\n+\r\n+ return false;\r\n+}\r\n+\r\n+template<typename T>\r\n+int LinkedList<T>::size(){\r\n+ return _size;\r\n+}\r\n+\r\n+template<typename T>\r\n+bool LinkedList<T>::add(int index, T _t){\r\n+\r\n+ if(index >= _size)\r\n+ return add(_t);\r\n+\r\n+ if(index == 0)\r\n+ return unshift(_t);\r\n+\r\n+ ListNode<T> *tmp = new ListNode<T>(),\r\n+ *_prev = getNode(index-1);\r\n+ tmp->data = _t;\r\n+ tmp->next = _prev->next;\r\n+ _prev->next = tmp;\r\n+\r\n+ _size++;\r\n+ isCached = false;\r\n+\r\n+ return true;\r\n+}\r\n+\r\n+template<typename T>\r\n+bool LinkedList<T>::add(T _t){\r\n+\r\n+ ListNode<T> *tmp = new ListNode<T>();\r\n+ tmp->data = _t;\r\n+ tmp->next = false;\r\n+\r\n+ if(root){\r\n+ \/\/ Already have elements inserted\r\n+ last->next = tmp;\r\n+ last = tmp;\r\n+ }else{\r\n+ \/\/ First element being inserted\r\n+ root = tmp;\r\n+ last = tmp;\r\n+ }\r\n+\r\n+ _size++;\r\n+ isCached = false;\r\n+\r\n+ return true;\r\n+}\r\n+\r\n+template<typename T>\r\n+bool LinkedList<T>::unshift(T _t){\r\n+\r\n+ if(_size == 0)\r\n+ return add(_t);\r\n+\r\n+ ListNode<T> *tmp = new ListNode<T>();\r\n+ tmp->next = root;\r\n+ tmp->data = _t;\r\n+ root = tmp;\r\n+\r\n+ _size++;\r\n+ isCached = false;\r\n+\r\n+ return true;\r\n+}\r\n+\r\n+template<typename T>\r\n+bool LinkedList<T>::set(int index, T _t){\r\n+ \/\/ Check if index position is in bounds\r\n+ if(index < 0 || index >= _size)\r\n+ return false;\r\n+\r\n+ getNode(index)->data = _t;\r\n+ return true;\r\n+}\r\n+\r\n+template<typename T>\r\n+T LinkedList<T>::pop(){\r\n+ if(_size <= 0)\r\n+ return T();\r\n+\r\n+ isCached = false;\r\n+\r\n+ if(_size >= 2){\r\n+ ListNode<T> *tmp = getNode(_size - 2);\r\n+ T ret = tmp->next->data;\r\n+ delete(tmp->next);\r\n+ tmp->next = false;\r\n+ last = tmp;\r\n+ _size--;\r\n+ return ret;\r\n+ }else{\r\n+ \/\/ Only one element left on the list\r\n+ T ret = root->data;\r\n+ delete(root);\r\n+ root = false;\r\n+ last = false;\r\n+ _size = 0;\r\n+ return ret;\r\n+ }\r\n+}\r\n+\r\n+template<typename T>\r\n+T LinkedList<T>::shift(){\r\n+ if(_size <= 0)\r\n+ return T();\r\n+\r\n+ if(_size > 1){\r\n+ ListNode<T> *_next = root->next;\r\n+ T ret = root->data;\r\n+ delete(root);\r\n+ root = _next;\r\n+ _size --;\r\n+ isCached = false;\r\n+\r\n+ return ret;\r\n+ }else{\r\n+ \/\/ Only one left, then pop()\r\n+ return pop();\r\n+ }\r\n+\r\n+}\r\n+\r\n+template<typename T>\r\n+T LinkedList<T>::remove(int index){\r\n+ if (index < 0 || index >= _size)\r\n+ {\r\n+ return T();\r\n+ }\r\n+\r\n+ if(index == 0)\r\n+ return shift();\r\n+\r\n+ if (index == _size-1)\r\n+ {\r\n+ return pop();\r\n+ }\r\n+\r\n+ ListNode<T> *tmp = getNode(index - 1);\r\n+ ListNode<T> *toDelete = tmp->next;\r\n+ T ret = toDelete->data;\r\n+ tmp->next = tmp->next->next;\r\n+ delete(toDelete);\r\n+ _size--;\r\n+ isCached = false;\r\n+ return ret;\r\n+}\r\n+\r\n+\r\n+template<typename T>\r\n+T LinkedList<T>::get(int index){\r\n+ ListNode<T> *tmp = getNode(index);\r\n+\r\n+ return (tmp ? tmp->data : T());\r\n+}\r\n+\r\n+template<typename T>\r\n+void LinkedList<T>::clear(){\r\n+ while(size() > 0)\r\n+ shift();\r\n+}\r\n+\r\n+#endif\r\n+\r\n+\r\n+\r\n+\r\n+#include <Servo.h>\r\n+#define WIRE Wire\r\n+#include <Wire.h>\r\n+\r\n+\/\/ TODO: this isn't ready for an official bump to mrl comm 35\r\n+\/\/ when it's ready we can update ArduinoMsgCodec (also need to see why it's not publishing \"goodtimes\" anymore.)\r\n+#define MRLCOMM_VERSION 35\r\n+\r\n+\/\/ serial protocol functions\r\n+#define MAGIC_NUMBER 170 \/\/ 10101010\r\n+\r\n+\/\/ FIXME - first rule of generate club is: whole file should be generated\r\n+\/\/ so this needs to be turned itno a .h if necessary - but the manual munge\r\n+\/\/ should be replaced\r\n+\/\/ ----- MRLCOMM FUNCTION GENERATED INTERFACE BEGIN -----------\r\n+\/\/\/\/\/ INO GENERATED DEFINITION BEGIN \/\/\/\/\/\/\r\n+\/\/ {publishMRLCommError Integer}\r\n+#define PUBLISH_MRLCOMM_ERROR\t\t1\r\n+\/\/ {getVersion}\r\n+#define GET_VERSION\t\t2\r\n+\/\/ {publishVersion Integer}\r\n+#define PUBLISH_VERSION\t\t3\r\n+\/\/ {analogReadPollingStart Integer Integer}\r\n+#define ANALOG_READ_POLLING_START\t\t4\r\n+\/\/ {analogReadPollingStop int}\r\n+#define ANALOG_READ_POLLING_STOP\t\t5\r\n+\/\/ {analogWrite int int}\r\n+#define ANALOG_WRITE\t\t6\r\n+\/\/ {createDevice int int String}\r\n+#define CREATE_DEVICE\t\t7\r\n+\/\/ {digitalReadPollingStart Integer Integer}\r\n+#define DIGITAL_READ_POLLING_START\t\t8\r\n+\/\/ {digitalReadPollingStop int}\r\n+#define DIGITAL_READ_POLLING_STOP\t\t9\r\n+\/\/ {digitalWrite int int}\r\n+#define DIGITAL_WRITE\t\t10\r\n+\/\/ {fixPinOffset Integer}\r\n+#define FIX_PIN_OFFSET\t\t11\r\n+\/\/ {i2cRead int int byte[] int}\r\n+#define I2C_READ\t\t12\r\n+\/\/ {i2cWrite int int byte[] int}\r\n+#define I2C_WRITE\t\t13\r\n+\/\/ {i2cWriteRead int int byte[] int byte[] int}\r\n+#define I2C_WRITE_READ\t\t14\r\n+\/\/ {motorAttach MotorControl int}\r\n+#define MOTOR_ATTACH\t\t15\r\n+\/\/ {motorDetach MotorControl}\r\n+#define MOTOR_DETACH\t\t16\r\n+\/\/ {motorMove MotorControl}\r\n+#define MOTOR_MOVE\t\t17\r\n+\/\/ {motorMoveTo MotorControl}\r\n+#define MOTOR_MOVE_TO\t\t18\r\n+\/\/ {motorReset MotorControl}\r\n+#define MOTOR_RESET\t\t19\r\n+\/\/ {motorStop MotorControl}\r\n+#define MOTOR_STOP\t\t20\r\n+\/\/ {pinMode Integer Integer}\r\n+#define PIN_MODE\t\t21\r\n+\/\/ {publishDebug String}\r\n+#define PUBLISH_DEBUG\t\t22\r\n+\/\/ {publishLoadTimingEvent Long}\r\n+#define PUBLISH_LOAD_TIMING_EVENT\t\t23\r\n+\/\/ {publishMessageAck}\r\n+#define PUBLISH_MESSAGE_ACK\t\t24\r\n+\/\/ {publishPin Pin}\r\n+#define PUBLISH_PIN\t\t25\r\n+\/\/ {publishPulse Long}\r\n+#define PUBLISH_PULSE\t\t26\r\n+\/\/ {publishPulseStop Integer}\r\n+#define PUBLISH_PULSE_STOP\t\t27\r\n+\/\/ {publishSensorData Object}\r\n+#define PUBLISH_SENSOR_DATA\t\t28\r\n+\/\/ {publishServoEvent Integer}\r\n+#define PUBLISH_SERVO_EVENT\t\t29\r\n+\/\/ {publishTrigger Pin}\r\n+#define PUBLISH_TRIGGER\t\t30\r\n+\/\/ {pulse int int int int}\r\n+#define PULSE\t\t31\r\n+\/\/ {pulseStop}\r\n+#define PULSE_STOP\t\t32\r\n+\/\/ {releaseDevice int int}\r\n+#define RELEASE_DEVICE\t\t33\r\n+\/\/ {resolveSensorData SensorDataPublisher int[]}\r\n+#define RESOLVE_SENSOR_DATA\t\t34\r\n+\/\/ {sensorAttach SensorDataPublisher}\r\n+#define SENSOR_ATTACH\t\t35\r\n+\/\/ {sensorPollingStart String int}\r\n+#define SENSOR_POLLING_START\t\t36\r\n+\/\/ {sensorPollingStop String}\r\n+#define SENSOR_POLLING_STOP\t\t37\r\n+\/\/ {servoAttach Servo Integer}\r\n+#define SERVO_ATTACH\t\t38\r\n+\/\/ {servoDetach Servo}\r\n+#define SERVO_DETACH\t\t39\r\n+\/\/ {servoEventsEnabled Servo}\r\n+#define SERVO_EVENTS_ENABLED\t\t40\r\n+\/\/ {servoSweepStart Servo}\r\n+#define SERVO_SWEEP_START\t\t41\r\n+\/\/ {servoSweepStop Servo}\r\n+#define SERVO_SWEEP_STOP\t\t42\r\n+\/\/ {servoWrite Servo}\r\n+#define SERVO_WRITE\t\t43\r\n+\/\/ {servoWriteMicroseconds Servo}\r\n+#define SERVO_WRITE_MICROSECONDS\t\t44\r\n+\/\/ {setDebounce int}\r\n+#define SET_DEBOUNCE\t\t45\r\n+\/\/ {setDebug boolean}\r\n+#define SET_DEBUG\t\t46\r\n+\/\/ {setDigitalTriggerOnly Boolean}\r\n+#define SET_DIGITAL_TRIGGER_ONLY\t\t47\r\n+\/\/ {setLoadTimingEnabled boolean}\r\n+#define SET_LOAD_TIMING_ENABLED\t\t48\r\n+\/\/ {setPWMFrequency Integer Integer}\r\n+#define SET_PWMFREQUENCY\t\t49\r\n+\/\/ {setSampleRate int}\r\n+#define SET_SAMPLE_RATE\t\t50\r\n+\/\/ {setSerialRate int}\r\n+#define SET_SERIAL_RATE\t\t51\r\n+\/\/ {setServoSpeed Servo}\r\n+#define SET_SERVO_SPEED\t\t52\r\n+\/\/ {setTrigger int int int}\r\n+#define SET_TRIGGER\t\t53\r\n+\/\/ {softReset}\r\n+#define SOFT_RESET\t\t54\r\n+\/\/\/\/\/ INO GENERATED DEFINITION END \/\/\/\/\/\/\r\n+\r\n+\/\/ ----- MRLCOMM FUNCTION GENERATED INTERFACE END -----------\r\n+\r\n+\/\/ Start of Adafruit16CServoDriver defines\r\n+\/\/ FIXME : MOVING AF_BEGIN to 70 for some room to not collide with the bindings generator\r\n+\/\/ Mats has said he will convert to I2C reads and writes and these will be removed...\r\n+\/\/ FIXME - remove AF DEFINES\r\n+#define AF_BEGIN 70\r\n+#define AF_SET_PWM_FREQ 71\r\n+#define AF_SET_PWM 72\r\n+#define AF_SET_SERVO 73\r\n+\r\n+#define SERVOMIN 150 \/\/ this is the 'minimum' pulse length count (out of 4096)\r\n+#define SERVOMAX 600 \/\/ this is the 'maximum' pulse length count (out of 4096)\r\n+#define PCA9685_MODE1 0x0\r\n+#define PCA9685_PRESCALE 0xFE\r\n+#define LED0_ON_L 0x6\r\n+\/\/ End of Adafruit16CServoDriver defines\r\n+\r\n+#define SERVO_EVENT_STOPPED 1\r\n+#define SERVO_EVENT_POSITION_UPDATE 2\r\n+\r\n+\/\/ ------ error types ------\r\n+#define ERROR_SERIAL 1\r\n+#define ERROR_UNKOWN_CMD 2\r\n+#define ERROR_ALREADY_EXISTS 3\r\n+#define ERROR_DOES_NOT_EXIST 4\r\n+#define ERROR_UNKOWN_SENSOR 5\r\n+\r\n+\r\n+\/\/ ------ sensor types ------\r\n+\/\/ refer to - org.myrobotlab.service.interfaces.SensorDataSink\r\n+\/\/ TODO: fully flush these out. digita\/analog pin etc..\r\n+\/\/ there are multiple references to this.\r\n+\/\/ if it's in here, it should be in the arduino msg codec...\r\n+#define SENSOR_TYPE_PIN 0\r\n+#define SENSOR_TYPE_ULTRASONIC 4\r\n+#define SENSOR_TYPE_PULSE 2\r\n+\r\n+\/\/ need a method to identify type of board\r\n+\/\/ http:\/\/forum.arduino.cc\/index.php?topic=100557.0\r\n+\r\n+#define COMMUNICATION_RESET 252\r\n+#define PUBLISH_MESSAGE_ACK 127\r\n+#define PUBLISH_DEBUG 126\r\n+#define NOP 255\r\n+\r\n+\/\/ ---------- MRLCOMM FUNCTION INTERFACE END -----------\r\n+\r\n+\/\/ MAX definitions\r\n+\/\/ MAX_SERVOS defined by boardtype\/library\r\n+\/\/ TODO - BOARD IDENTIFICATION - PIN IDENTIFICATION\r\n+\/\/ #define NUM_DIGITAL_PINS 20\r\n+\/\/ #define NUM_ANALOG_INPUTS 6\r\n+\r\n+\/\/ #define SENSORS_MAX NUM_DIGITAL_PINS \/\/ this is max number of pins (analog included)\r\n+\/\/ TODO: Setting to value larger than 32 causes TX\/RX errors in MRL. (Make sensor loop faster to fix.)\r\n+#define SENSORS_MAX 3\r\n+\r\n+#define DIGITAL_PIN_COUNT\r\n+\r\n+\/\/ ECHO FINITE STATE MACHINE - NON BLOCKING PULSIN\r\n+#define ECHO_STATE_START 1\r\n+#define ECHO_STATE_TRIG_PULSE_BEGIN 2\r\n+#define ECHO_STATE_TRIG_PULSE_END 3\r\n+#define ECHO_STATE_MIN_PAUSE_PRE_LISTENING 4\r\n+#define ECHO_STATE_LISTENING 5\r\n+#define ECHO_STATE_GOOD_RANGE 6\r\n+#define ECHO_STATE_TIMEOUT 7\r\n+\r\n+#define SENSOR_TYPE_ANALOG_PIN_READER 3\r\n+#define SENSOR_TYPE_DIGITAL_PIN_READER 1\r\n+\r\n+int msgSize = 0; \/\/ the NUM_BYTES of current message\r\n+unsigned int debounceDelay = 50; \/\/ in ms\r\n+byte msgBuf[64];\r\n+\r\n+\/\/ FIXME - make union of struct pins\r\n+\/\/ all start with general \/ common section - with \"type\" :)\r\n+typedef struct\r\n+{\r\n+ \/\/ general\r\n+ int sensorIndex; \/\/ the all important index of the sensor - equivalent to the \"name\" - used in callbacks\r\n+ \/\/ FIXME - THIS NEEDS TO BE NORMALIZED IN CODE GENERATOR \/ BINDER\r\n+ int sensorType; \/\/ SENSOR_TYPE_DIGITAL_PIN_READER | SENSOR_TYPE_ANALOG_PIN_READER | SENSOR_TYPE_DIGITAL_PIN | SENSOR_TYPE_PULSE | SENSOR_TYPE_ULTRASONIC\r\n+ int address; \/\/ pin #\r\n+ int state; \/\/ state - single at the moment to handle all the finite states of the sensor\r\n+ int value;\r\n+\r\n+ \/\/ FYI - creating unions \"might\" make things a little more readable\r\n+ \/\/ MAKE NOTE !! - Pins will need to \"reference\" one another\r\n+ \/\/ so that when they are processed the \"lead\" pin in say a stepper\r\n+ \/\/ will \"activate\" the next pin in sequence so that the correct sequence will be\r\n+ \/\/ pulsed\r\n+\r\n+ \/\/ int mode; \/\/ input or output - not needed - Arduino service should handle it\r\n+ bool isActive;\r\n+ int rateModulus; \/\/ sample rate or feedback control with modulus\r\n+ int debounce; \/\/ long lastDebounceTime - minDebounceTime\r\n+ int rate;\r\n+ unsigned long count;\r\n+ unsigned long target;\r\n+\r\n+ \/\/ next pin in a multi-pin process - e.g.\r\n+ \/\/ UltrasonicSensor - trigger pin's nextPin would be the echo pin\r\n+ int nextPin;\r\n+\r\n+ \/\/ srf05\r\n+ int trigPin;\r\n+ int echoPin;\r\n+ int timeoutUS;\r\n+ unsigned long ts;\r\n+ unsigned long lastValue;\r\n+\r\n+} pin_type;\r\n+\r\n+pin_type pins[SENSORS_MAX];\r\n+\r\n+typedef struct\r\n+{\r\n+ int index;\r\n+ LinkedList<pin_type> pins;\r\n+} sensor;\r\n+\r\n+LinkedList<sensor> sensorList = LinkedList<sensor>();\r\n+\r\n+\r\n+\/\/ Servos\r\n+typedef struct\r\n+{\r\n+ Servo* servo;\r\n+ int index; \/\/ index of this servo\r\n+ int speed;\r\n+ int targetPos;\r\n+ int currentPos;\r\n+ bool isMoving;\r\n+\r\n+ int step; \/\/ affects speed usually 1\r\n+\r\n+ \/\/ sweep related\r\n+ int min;\r\n+ int max;\r\n+ \/\/ int delay; - related to speed\r\n+ int increment;\r\n+ bool isSweeping;\r\n+\r\n+ \/\/ event related\r\n+ bool eventsEnabled;\r\n+} servo_type;\r\n+\r\n+\r\n+servo_type servos[MAX_SERVOS];\r\n+\r\n+unsigned long loopCount = 0;\r\n+unsigned long lastMicros = 0;\r\n+int byteCount = 0;\r\n+unsigned char newByte = 0;\r\n+unsigned char ioCmd[64]; \/\/ message buffer for all inbound messages\r\n+int readValue;\r\n+\r\n+\/\/ FIXME - normalize with sampleRate ..\r\n+int loadTimingModulus = 1000;\r\n+\r\n+\/\/ load timing related\r\n+bool loadTimingEnabled = false;\r\n+unsigned long loadTime = 0;\r\n+\r\n+\/\/ sensor sample rate\r\n+unsigned int sampleRate = 1; \/\/ 1 - 65,535 modulus of the loopcount - allowing you to sample less\r\n+\r\n+\/\/ define any functions that pass structs into them.\r\n+void sendServoEvent(servo_type& s, int eventType);\r\n+unsigned long getUltrasonicRange(pin_type& pin);\r\n+void handleUltrasonicPing(pin_type& pin, unsigned long ts);\r\n+void handlePulseType(pin_type& pin);\r\n+\r\n+bool debug = false;\r\n+\r\n+void setup() {\r\n+ Serial.begin(115200); \/\/ connect to the serial port\r\n+ while (!Serial){};\r\n+ \/\/ TODO: do this before we start the serial port?\r\n+ softReset();\r\n+ \/\/ wait for the serial port a bit extra..\r\n+ \/\/ delay(100);\r\n+ \/\/ publish version on startup so it's immediately available for mrl.\r\n+ Serial.flush();\r\n+ publishVersion();\r\n+ Serial.flush();\r\n+ \/\/ TODO: see if we can publish the board type (uno\/mega?)\r\n+}\r\n+\r\n+\/\/ This is the main loop that the arduino runs.\r\n+void loop() {\r\n+\r\n+ \/\/ increment how many times we've run\r\n+ ++loopCount;\r\n+ publishDebug(\"Main\" + String(loopCount));\r\n+ \/\/ get a command and process it from the serial port (if available.)\r\n+ if (getCommand()) {\r\n+ publishDebug(\"GotCMD\");\r\n+ processCommand();\r\n+ publishDebug(\"ProcCMD\");\r\n+ }\r\n+ \/\/ update servo positions\r\n+ publishDebug(\"UpdateServos\");\r\n+ updateServos();\r\n+ \/\/ publishDebug(\"UpdateServos\");\r\n+ \/\/ update analog sensor data stuffs\r\n+ \/\/ updateSensors();\r\n+ publishDebug(\"UpdateSensors Start\");\r\n+ updateSensorsNew();\r\n+ publishDebug(\"UpdateSensors End\");\r\n+ \/\/ publishDebug(\"UpdateSensors\");\r\n+\r\n+ \/\/ update and report timing metrics\r\n+ updateStats();\r\n+ \/\/ publishDebug(\"UpdatedStat\");\r\n+ \/\/ Serial.flush();\r\n+} \/\/ end of big loop\r\n+\r\n+void softReset() {\r\n+ for (int i = 0; i < MAX_SERVOS - 1; ++i) {\r\n+ servo_type& s = servos[i];\r\n+ s.speed = 100;\r\n+ if (s.servo != 0) {\r\n+ s.servo->detach();\r\n+ }\r\n+ }\r\n+ for (int i = 0; i < SENSORS_MAX - 1; ++i) {\r\n+ resetPin(i);\r\n+ }\r\n+ loopCount = 0;\r\n+}\r\n+\r\n+void resetPin(int pinIndex) {\r\n+ pin_type& pin = pins[pinIndex];\r\n+ pin.isActive = false;\r\n+ pin.address = pinIndex; \/\/ pin #\r\n+ pin.sensorIndex = 0; \/\/ all pins initially belong to Arduino service\r\n+ pin.rateModulus = 1; \/\/ full feedback\/sample rate\r\n+ pin.count = 0;\r\n+ pin.target = 0;\r\n+ pin.nextPin = -1;\r\n+}\r\n+\r\n+unsigned long toUnsignedLongfromBigEndian(unsigned char* buffer, int start) {\r\n+ return (((unsigned long)buffer[start] << 24) + ((unsigned long)buffer[start + 1] << 16) + (buffer[start + 2] << 8) + buffer[start + 3]);\r\n+}\r\n+\r\n+\/**\r\n+* checks the existence of the searched value in the array\r\n+* - good for not adding to a dynamic list of values if it\r\n+* already exists\r\n+*\/\r\n+bool exists(int array[], int len, int searchValue) {\r\n+ for (int i = 0; i < len; ++i) {\r\n+ if (searchValue == array[i]) {\r\n+ return true;\r\n+ }\r\n+ }\r\n+ return false;\r\n+}\r\n+\r\n+\/**\r\n+* adds new value to a pseudo dynamic array\/list\r\n+* if successful - if value already exists on list\r\n+* sends back an error\r\n+*\/\r\n+bool addNewValue(int array[], int& len, int addValue) {\r\n+ if (!exists(array, len, addValue)) {\r\n+ array[len] = addValue;\r\n+ ++len;\r\n+ return true;\r\n+ } else {\r\n+ sendError(ERROR_ALREADY_EXISTS);\r\n+ return false;\r\n+ }\r\n+}\r\n+\r\n+\/\/ Will Be Depricated\r\n+bool removeAndShift(int array[], int& len, int removeValue) {\r\n+ if (!exists(array, len, removeValue)) {\r\n+ sendError(ERROR_DOES_NOT_EXIST);\r\n+ return false;\r\n+ }\r\n+ int pos = -1;\r\n+ if (len == 0) {\r\n+ \/\/ \"should\" never happen\r\n+ \/\/ would be calling remove on an empty list\r\n+ \/\/ the error ERROR_DOES_NOT_EXIST - \"should\" be called\r\n+ return true;\r\n+ }\r\n+ \/\/ find position of value\r\n+ for (int i = 0; i < len; ++i) {\r\n+ if (removeValue == array[i]) {\r\n+ pos = i;\r\n+ break;\r\n+ }\r\n+ }\r\n+ \/\/ if at the end just decrement size\r\n+ if (pos == len - 1) {\r\n+ --len;\r\n+ return true;\r\n+ }\r\n+\r\n+ \/\/ if found somewhere else shift left\r\n+ if (pos < len && pos > -1) {\r\n+ for (int j = pos; j < len - 1; ++j) {\r\n+ array[j] = array[j + 1];\r\n+ }\r\n+ --len;\r\n+ }\r\n+ return true;\r\n+}\r\n+\r\n+bool getCommand() {\r\n+ \/\/ handle serial data begin\r\n+ int bytesAvailable = Serial.available();\r\n+ if (bytesAvailable > 0) {\r\n+ publishDebug(\"RXBUFF:\" + String(bytesAvailable));\r\n+ \/\/ now we should loop over the available bytes .. not just read one by one.\r\n+ for (int i = 0 ; i < bytesAvailable; i++) {\r\n+ \/\/ read the incoming byte:\r\n+ newByte = Serial.read();\r\n+ publishDebug(\"RX:\" + String(newByte));\r\n+ ++byteCount;\r\n+ \/\/ checking first byte - beginning of message?\r\n+ if (byteCount == 1 && newByte != MAGIC_NUMBER) {\r\n+ sendError(ERROR_SERIAL);\r\n+ \/\/ reset - try again\r\n+ byteCount = 0;\r\n+ \/\/ return false;\r\n+ }\r\n+ if (byteCount == 2) {\r\n+ \/\/ get the size of message\r\n+ \/\/ todo check msg < 64 (MAX_MSG_SIZE)\r\n+ if (newByte > 64){\r\n+ \/\/ TODO - send error back\r\n+ byteCount = 0;\r\n+ continue; \/\/ GroG - I guess we continue now vs return false on error conditions?\r\n+ }\r\n+ msgSize = newByte;\r\n+ }\r\n+ if (byteCount > 2) {\r\n+ \/\/ fill in msg data - (2) headbytes -1 (offset)\r\n+ ioCmd[byteCount - 3] = newByte;\r\n+ }\r\n+ \/\/ if received header + msg\r\n+ if (byteCount == 2 + msgSize) {\r\n+ \/\/ we've reach the end of the command, just return true .. we've got it\r\n+ return true;\r\n+ }\r\n+ }\r\n+ } \/\/ if Serial.available\r\n+ \/\/ we only partially read a command. (or nothing at all.)\r\n+ return false;\r\n+}\r\n+\r\n+\/\/ This function will switch the current command and call\r\n+\/\/ the associated function with the command\r\n+void processCommand() {\r\n+ switch (ioCmd[0]) {\r\n+ \/\/ === system pass through begin ===\r\n+ case DIGITAL_WRITE:\r\n+ digitalWrite(ioCmd[1], ioCmd[2]);\r\n+ break;\r\n+ case ANALOG_WRITE:\r\n+ publishDebug(\"AW\");\r\n+ analogWrite(ioCmd[1], ioCmd[2]);\r\n+ break;\r\n+ case PIN_MODE:\r\n+ publishDebug(\"PM\");\r\n+ pinMode(ioCmd[1], ioCmd[2]);\r\n+ break;\r\n+ case SERVO_ATTACH:\r\n+ servoAttach();\r\n+ break;\r\n+ case SERVO_SWEEP_START:\r\n+ servoStartSweep();\r\n+ break;\r\n+ case SERVO_SWEEP_STOP:\r\n+ servoStopSweep();\r\n+ break;\r\n+ case SERVO_EVENTS_ENABLED:\r\n+ servoEventsEnabled();\r\n+ break;\r\n+ case SERVO_WRITE:\r\n+ servoWrite();\r\n+ break;\r\n+ case PUBLISH_SERVO_EVENT:\r\n+ publishServoEvent();\r\n+ break;\r\n+ case SERVO_WRITE_MICROSECONDS:\r\n+ servoWriteMicroseconds();\r\n+ break;\r\n+ case SET_SERVO_SPEED:\r\n+ setServoSpeed();\r\n+ break;\r\n+ case SERVO_DETACH:\r\n+ servoDetach();\r\n+ break;\r\n+ case SET_LOAD_TIMING_ENABLED:\r\n+ setLoadTimingEnabled();\r\n+ break;\r\n+ case SET_PWMFREQUENCY:\r\n+ setPWMFrequency(ioCmd[1], ioCmd[2]);\r\n+ break;\r\n+ case ANALOG_READ_POLLING_START:\r\n+ analogReadPollingStartNew();\r\n+ break;\r\n+ case ANALOG_READ_POLLING_STOP:\r\n+ analogReadPollingStop();\r\n+ break;\r\n+ case DIGITAL_READ_POLLING_START:\r\n+ digitalReadPollingStart();\r\n+ break;\r\n+ case DIGITAL_READ_POLLING_STOP:\r\n+ digitalReadPollingStop();\r\n+ case PULSE:\r\n+ pulse();\r\n+ break;\r\n+ case PULSE_STOP:\r\n+ pulseStop();\r\n+ break;\r\n+ case SET_TRIGGER:\r\n+ setTrigger();\r\n+ break;\r\n+ case SET_DEBOUNCE:\r\n+ setDebounce();\r\n+ break;\r\n+ case SET_DIGITAL_TRIGGER_ONLY:\r\n+ setDigitalTriggerOnly();\r\n+ break;\r\n+ case SET_SERIAL_RATE:\r\n+ setSerialRate();\r\n+ break;\r\n+ case GET_VERSION:\r\n+ getVersion();\r\n+ break;\r\n+ case SET_SAMPLE_RATE:\r\n+ setSampleRate();\r\n+ break;\r\n+ case SOFT_RESET:\r\n+ softReset();\r\n+ break;\r\n+ case SENSOR_ATTACH:\r\n+ publishDebug(\"SA_NEW_BEGIN\");\r\n+ sensorAttachNew();\r\n+ publishDebug(\"SA_NEW_END\");\r\n+ break;\r\n+ case SENSOR_POLLING_START:\r\n+ sensorPollingStart();\r\n+ break;\r\n+ case SENSOR_POLLING_STOP:\r\n+ sensorPollingStop();\r\n+ break;\r\n+ \/\/ Start of Adafruit16CServoDriver commands\r\n+ case AF_BEGIN:\r\n+ afBegin();\r\n+ break;\r\n+ case AF_SET_PWM_FREQ:\r\n+ afSetPWMFREQ();\r\n+ break;\r\n+ case AF_SET_PWM:\r\n+ afSetPWM();\r\n+ break;\r\n+ case AF_SET_SERVO:\r\n+ afSetServo();\r\n+ break;\r\n+ case NOP:\r\n+ \/\/ No Operation\r\n+ break;\r\n+ case SET_DEBUG:\r\n+ debug = ioCmd[1];\r\n+ if (debug)\r\n+ {\r\n+ publishDebug(\"Debug logging enabled.\");\r\n+ }\r\n+ break;\r\n+ default:\r\n+ sendError(ERROR_UNKOWN_CMD);\r\n+ break;\r\n+ } \/\/ end switch\r\n+\r\n+ \/\/ ack that we got a command (should we ack it first? or after we process the command?)\r\n+ sendCommandAck();\r\n+\r\n+ publishDebug(\"Ack Sent.\");\r\n+\r\n+ \/\/ reset command buffer to be ready to receive the next command.\r\n+ memset(ioCmd, 0, sizeof(ioCmd));\r\n+ byteCount = 0;\r\n+\r\n+ publishDebug(\"buffer cleared.\");\r\n+} \/\/ process Command\r\n+\r\n+\/\/ This function handles updating the servo angles (mostly for sweeping?)\r\n+void updateServos() {\r\n+ \/\/ update moving servos - send events if required\r\n+ for (int i = 0; i < MAX_SERVOS; ++i) {\r\n+ servo_type& s = servos[i];\r\n+ if (s.isMoving && s.servo != 0) {\r\n+ if (s.currentPos != s.targetPos) {\r\n+ \/\/ caclulate the appropriate modulus to drive\r\n+ \/\/ the servo to the next position\r\n+ \/\/ TODO - check for speed > 0 && speed < 100 - send ERROR back?\r\n+ int speedModulus = (100 - s.speed) * 10;\r\n+ if (loopCount % speedModulus == 0) {\r\n+ int increment = s.step * ((s.currentPos < s.targetPos) ? 1 : -1);\r\n+ \/\/ move the servo an increment\r\n+ s.currentPos = s.currentPos + increment;\r\n+ s.servo->write(s.currentPos);\r\n+ if (s.eventsEnabled) sendServoEvent(s, SERVO_EVENT_POSITION_UPDATE);\r\n+ }\r\n+ } else {\r\n+ if (s.isSweeping) {\r\n+ if (s.targetPos == s.min) {\r\n+ s.targetPos = s.max;\r\n+ } else {\r\n+ s.targetPos = s.min;\r\n+ }\r\n+ } else {\r\n+ if (s.eventsEnabled)\r\n+ sendServoEvent(s, SERVO_EVENT_STOPPED);\r\n+ s.isMoving = false;\r\n+ }\r\n+ }\r\n+ }\r\n+ }\r\n+}\r\n+\r\n+void updateSensorsNew() {\r\n+ \/\/ TODO: publish data from pins that are publishing data.\r\n+ \/\/ TODO: I'd much prefer use an iterator over the linked list of sensors!\r\n+\r\n+ int numSensors = sensorList.size();\r\n+ if (numSensors > 0) {\r\n+ publishDebug(\"Update Sensors : \" + String(numSensors));\r\n+ }\r\n+ for (int sIdx = 0; sIdx < numSensors; sIdx++) {\r\n+ publishDebug(\"Update Sensor \" + String(sIdx));\r\n+ sensor s = sensorList.get(sIdx);\r\n+ \/\/ update the values of the pins for each sensor we have.\r\n+ int numPins = s.pins.size();\r\n+ for (int pIdx = 0; pIdx < numPins; pIdx++) {\r\n+ pin_type pin = s.pins.get(pIdx);\r\n+ switch (pin.sensorType) {\r\n+ case SENSOR_TYPE_ANALOG_PIN_READER:\r\n+ publishDebug(\"ANALOG_PIN UPDATE\");\r\n+ pin.value = analogRead(pin.address);\r\n+ break;\r\n+ case SENSOR_TYPE_DIGITAL_PIN_READER:\r\n+ publishDebug(\"DIGITAL PIN UPDATE\");\r\n+ pin.value = digitalRead(pin.address);\r\n+ break;\r\n+ default:\r\n+ \/\/ TODO: maybe publish debug?\r\n+ publishDebug(\"UNKNOWN_SENSOR_TYPE\");\r\n+ }\r\n+ }\r\n+ \/\/ TODO: what if the pins are not active?\r\n+ publishSensor(s);\r\n+ }\r\n+}\r\n+\r\n+\/\/ This function updates the sensor data (both analog and digital reading here.)\r\n+void updateSensors() {\r\n+ unsigned long ts;\r\n+ for (int i = 0; i < SENSORS_MAX; i++) {\r\n+ pin_type& pin = pins[i];\r\n+ if (!pin.isActive) {\r\n+ continue;\r\n+ }\r\n+ publishDebug(\"INDX:\" + String(i) + \" ADDR:\" + String(pin.address));\r\n+ switch (pin.sensorType) {\r\n+ case SENSOR_TYPE_ANALOG_PIN_READER:\r\n+ publishDebug(\"AR1\" + String(pin.address));\r\n+ pin.value = analogRead(pin.address);\r\n+ \/\/ pin.value = analogRead(pin.address);\r\n+ publishDebug(\"AR2:\" + String(pin.sensorIndex));\r\n+ publishDebug(\"AR3:\" + String(pin.address));\r\n+ publishDebug(\"AR4:\" + String(pin.value));\r\n+ publishSensor(pin.sensorIndex, pin.sensorType, pin.address, pin.value);\r\n+ \/\/Serial.flush();\r\n+ \/\/Serial.write(MAGIC_NUMBER);\r\n+ \/\/Serial.write(5); \/\/ size\r\n+ \/\/Serial.write(PUBLISH_SENSOR_DATA);\r\n+ \/\/Serial.write((byte)pin.sensorIndex);\r\n+ \/\/Serial.write((byte)14);\r\n+ \/\/Serial.write((byte)0);\r\n+ \/\/Serial.write((byte)123);\r\n+ \/\/Serial.write(sensorIndex);\r\n+ \/\/Serial.write(address);\r\n+ \/\/ Serial.write(value >> 8); \/\/ MSB\r\n+ \/\/Serial.write(value & 0xff); \/\/ LSB\r\n+ Serial.flush();\r\n+ publishDebug(\"AR5:\" + String(pin.address));\r\n+ break;\r\n+ case SENSOR_TYPE_DIGITAL_PIN_READER:\r\n+ publishDebug(\"DR1\");\r\n+ \/\/ read the pin\r\n+ pin.value = digitalRead(pin.address);\r\n+ publishDebug(\"DR2\");\r\n+ publishSensor(pin.sensorIndex, pin.sensorType, pin.address, pin.value);\r\n+ publishDebug(\"DR3\");\r\n+ break;\r\n+ \/\/ if my value is different from last time - send it\r\n+ \/\/ if (pin.lastValue != pin.value || !pin.s) \/\/TODO - SEND_DELTA_MIN_DIFF\r\n+ \/\/if (pin.lastValue != pin.value || (loopCount%pin.rateModulus) == 0) {\r\n+ \/\/sendMsg(4, ANALOG_VALUE, analogReadPin[i], readValue >> 8, readValue & 0xff);\r\n+ \/\/publishSensorData(pin.sensorIndex, pin.address, pin.value);\r\n+ \/\/}\r\n+ \/\/ set the last input value of this pin (This is a type cast error?! why cast to unsigned long here?)\r\n+ \/\/pin.lastValue = pin.value;\r\n+ \/\/ publishDebug(\"PUBDONE\");\r\n+\r\n+ case SENSOR_TYPE_ULTRASONIC:\r\n+ publishDebug(\"US1\");\r\n+ \/\/ FIXME - handle in own function - the overhead is worth not having\r\n+ \/\/ 200+ lines of code inlined here !\r\n+ \/\/ we are running & have an ultrasonic (ping) pin\r\n+ \/\/ check to see what state we are in\r\n+ handleUltrasonicPing(pin, ts);\r\n+ publishDebug(\"US2\");\r\n+ break;\r\n+ \/\/ because pin pulse & pulsing are so closely linked\r\n+ \/\/ the pulse will be handled here as well even if the\r\n+ \/\/ read data sent back on serial is disabled\r\n+ case SENSOR_TYPE_PULSE:\r\n+ publishDebug(\"PT1\");\r\n+ \/\/ TODO - implement - rate = modulo speed\r\n+ \/\/ if (loopCount%rate == 0) {\r\n+ \/\/ toggle pin state\r\n+ handlePulseType(pin);\r\n+ publishDebug(\"PT2\");\r\n+ break;\r\n+ default:\r\n+ publishDebug(\"UNK1\");\r\n+ sendError(ERROR_UNKOWN_SENSOR);\r\n+ publishDebug(\"UNK2\");\r\n+ break;\r\n+ }\r\n+ \/\/publishDebug(\"SPD \" + String(i));\r\n+ } \/\/ end for each pin\r\n+ publishDebug(\"USDONE\");\r\n+}\r\n+\r\n+\r\n+\/\/ This function updates how long it took to run this loop\r\n+\/\/ and reports it back to the serial port if desired.\r\n+void updateStats() {\r\n+ \/\/ FIXME - fix overflow with getDiff() method !!!\r\n+ unsigned long now = micros();\r\n+ loadTime = now - lastMicros; \/\/ avg outside\r\n+ lastMicros = now;\r\n+ \/\/ report load time\r\n+ if (loadTimingEnabled && (loopCount%loadTimingModulus == 0)) {\r\n+ \/\/ send it\r\n+ publishLoadTimingEvent(loadTime);\r\n+ }\r\n+}\r\n+\r\n+unsigned long getUltrasonicRange(pin_type& pin) {\r\n+ \/\/ added for pins which have single pin !\r\n+ pinMode(pin.trigPin, OUTPUT);\r\n+ digitalWrite(pin.trigPin, LOW);\r\n+ delayMicroseconds(2);\r\n+ digitalWrite(pin.trigPin, HIGH);\r\n+ delayMicroseconds(10);\r\n+ digitalWrite(pin.trigPin, LOW);\r\n+ \/\/ added for pins which have single pin !\r\n+ pinMode(pin.echoPin, INPUT);\r\n+ \/\/ CHECKING return pulseIn(pin.echoPin, HIGH, pin.timeoutUS);\r\n+ \/\/ TODO - adaptive timeout ? - start big - pull in until valid value - push out if range is coming close\r\n+ return pulseIn(pin.echoPin, HIGH);\r\n+}\r\n+\r\n+\/\/ Start of Adafruit16CServoDriver methods\r\n+\/\/ I2C write\r\n+void write8(uint8_t i2caddr, uint8_t addr, uint8_t d) {\r\n+ WIRE.beginTransmission(i2caddr);\r\n+ WIRE.write(addr);\r\n+ WIRE.write(d);\r\n+ WIRE.endTransmission();\r\n+}\r\n+\r\n+\/\/ I2C Read\r\n+uint8_t read8(uint8_t i2caddr, uint8_t addr) {\r\n+ WIRE.beginTransmission(i2caddr);\r\n+ WIRE.write(addr);\r\n+ WIRE.endTransmission();\r\n+ WIRE.requestFrom((uint8_t)i2caddr, (uint8_t)1);\r\n+ return WIRE.read();\r\n+}\r\n+\r\n+void setPWM(uint8_t i2caddr, uint8_t num, uint16_t on, uint16_t off) {\r\n+ WIRE.beginTransmission(i2caddr);\r\n+ WIRE.write(LED0_ON_L+4*num);\r\n+ WIRE.write(on);\r\n+ WIRE.write(on>>8);\r\n+ WIRE.write(off);\r\n+ WIRE.write(off>>8);\r\n+ WIRE.endTransmission();\r\n+}\r\n+\/\/ End of Adafruit16CServoDriver methods\r\n+\r\n+\/\/ MRL Command helper methods below:\r\n+\/\/ GET_VERSION\r\n+void getVersion() {\r\n+ \/\/ call publish version to talk to the serial port.\r\n+ publishVersion();\r\n+}\r\n+\r\n+\/\/ SERVO_ATTACH\r\n+void servoAttach() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ s.index = ioCmd[1];\r\n+ if (s.servo == NULL) {\r\n+ s.servo = new Servo();\r\n+ }\r\n+ s.servo->attach(ioCmd[2]);\r\n+ s.step = 1;\r\n+ s.eventsEnabled = false;\r\n+}\r\n+\r\n+\/\/ SERVO_START_SWEEP\r\n+void servoStartSweep() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ s.min = ioCmd[2];\r\n+ s.max = ioCmd[3];\r\n+ s.step = ioCmd[4];\r\n+ s.isMoving = true;\r\n+ s.isSweeping = true;\r\n+}\r\n+\r\n+\/\/ SERVO_STOP_SWEEP\r\n+void servoStopSweep() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ s.isMoving = false;\r\n+ s.isSweeping = false;\r\n+}\r\n+\r\n+\/\/ SERVO_EVENTS_ENABLED\r\n+void servoEventsEnabled() {\r\n+ \/\/ Not implemented.\r\n+}\r\n+\r\n+\/\/ SERVO_WRITE\r\n+void servoWrite() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ if (s.speed == 100 && s.servo != 0) {\r\n+ \/\/ move at regular\/full 100% speed\r\n+ s.targetPos = ioCmd[2];\r\n+ s.currentPos = ioCmd[2];\r\n+ s.isMoving = false;\r\n+ s.servo->write(ioCmd[2]);\r\n+ if (s.eventsEnabled) sendServoEvent(s, SERVO_EVENT_STOPPED);\r\n+ } else if (s.speed < 100 && s.speed > 0) {\r\n+ s.targetPos = ioCmd[2];\r\n+ s.isMoving = true;\r\n+ }\r\n+}\r\n+\r\n+\/\/ PUBLISH_SERVO_EVENT\r\n+void publishServoEvent() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ s.eventsEnabled = ioCmd[2];\r\n+}\r\n+\r\n+\/\/ SERVO_WRITE_MICROSECONDS\r\n+void servoWriteMicroseconds() {\r\n+ \/\/ TODO - incorporate into speed control etc\r\n+ \/\/ normalize - currently by itself doesn't effect events\r\n+ \/\/ nor is it involved in speed control\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ if (s.servo != 0) {\r\n+ \/\/ 1500 midpoint\r\n+ s.servo->writeMicroseconds(ioCmd[2]);\r\n+ }\r\n+}\r\n+\r\n+\/\/ SET_SERVO_SPEED\r\n+void setServoSpeed() {\r\n+ \/\/ setting the speed of a servo\r\n+ servo_type& servo = servos[ioCmd[1]];\r\n+ servo.speed = ioCmd[2];\r\n+}\r\n+\r\n+\/\/ SERVO_DETACH\r\n+void servoDetach() {\r\n+ servo_type& s = servos[ioCmd[1]];\r\n+ if (s.servo != 0) {\r\n+ s.servo->detach();\r\n+ }\r\n+}\r\n+\r\n+\/\/ SET_LOAD_TIMING_ENABLED\r\n+void setLoadTimingEnabled() {\r\n+ loadTimingEnabled = ioCmd[1];\r\n+ \/\/loadTimingModulus = ioCmd[2];\r\n+ loadTimingModulus = 1;\r\n+}\r\n+\r\n+\/\/ SET_PWMFREQUENCY\r\n+void setPWMFrequency(int address, int prescalar) {\r\n+ \/\/ FIXME - different boards have different timers\r\n+ \/\/ sets frequency of pwm of analog\r\n+ \/\/ FIXME - us ifdef appropriate uC which\r\n+ \/\/ support these clocks TCCR0B\r\n+ int clearBits = 0x07;\r\n+ if (address == 0x25) {\r\n+ TCCR0B &= ~clearBits;\r\n+ TCCR0B |= prescalar;\r\n+ } else if (address == 0x2E) {\r\n+ TCCR1B &= ~clearBits;\r\n+ TCCR1B |= prescalar;\r\n+ } else if (address == 0xA1) {\r\n+ TCCR2B &= ~clearBits;\r\n+ TCCR2B |= prescalar;\r\n+ }\r\n+}\r\n+\r\n+\r\n+void analogReadPollingStartNew() {\r\n+\r\n+ \/\/ TODO: do we care about this pinIndex at all?\r\n+ int sensorIndex = ioCmd[1]; \/\/ + DIGITAL_PIN_COUNT \/ DIGITAL_PIN_OFFSET\r\n+ \/\/ create a new sensor with 1 pin.\r\n+ sensor s = sensor();\r\n+ s.index = sensorIndex;\r\n+ \/\/ create the pin for this sensor\r\n+ pin_type p = pin_type();\r\n+ p.isActive = true;\r\n+ p.address = ioCmd[2];\r\n+ \/\/ add the pin to the sensor\r\n+ s.pins.add(p);\r\n+ \/\/ add the sensor to the global list of sensors.\r\n+ sensorList.add(s);\r\n+}\r\n+\/\/ ANALOG_READ_POLLING_START\r\n+void analogReadPollingStart() {\r\n+\r\n+ int pinIndex = ioCmd[1]; \/\/ + DIGITAL_PIN_COUNT \/ DIGITAL_PIN_OFFSET\r\n+ pin_type& pin = pins[pinIndex];\r\n+ \/\/ TODO: remove this method and only use sensorAttach ..\r\n+ pin.sensorIndex = 0; \/\/ FORCE ARDUINO TO BE OUR SERVICE - DUNNO IF THIS IS GOOD\/BAD\r\n+ pin.sensorType = SENSOR_TYPE_ANALOG_PIN_READER; \/\/ WIERD - mushing of roles\/responsibilities\r\n+ pin.isActive = true;\r\n+ pin.rateModulus= (ioCmd[2] << 8)+ioCmd[3];\r\n+}\r\n+\r\n+\/\/ ANALOG_READ_POLLING_STOP\r\n+void analogReadPollingStop() {\r\n+ pin_type& pin = pins[ioCmd[1]];\r\n+ pin.isActive = false;\r\n+}\r\n+\r\n+\/\/ DIGITAL_READ_POLLING_START\r\n+void digitalReadPollingStart() {\r\n+ int pinIndex = ioCmd[1]; \/\/ + DIGITAL_PIN_COUNT \/ DIGITAL_PIN_OFFSET\r\n+ pin_type& pin = pins[pinIndex];\r\n+ pin.sensorIndex = 0; \/\/ FORCE ARDUINO TO BE OUR SERVICE - DUNNO IF THIS IS GOOD\/BAD\r\n+ pin.sensorType = SENSOR_TYPE_DIGITAL_PIN_READER; \/\/ WIERD - mushing of roles\/responsibilities\r\n+ pin.isActive = true;\r\n+ pin.rateModulus=(ioCmd[2] << 8) + ioCmd[3];\r\n+}\r\n+\r\n+\/\/ PULSE\r\n+void pulse() {\r\n+ \/\/ get pin from index\r\n+ pin_type& pin = pins[ioCmd[1]];\r\n+ \/\/ FIXME - this has to unload a Long !!!\r\n+ pin.count = 0;\r\n+ pin.target = toUnsignedLongfromBigEndian(ioCmd, 2);\r\n+ pin.rate = ioCmd[6];\r\n+ pin.rateModulus = ioCmd[7];\r\n+ pin.isActive = true;\r\n+ pin.state = PUBLISH_SENSOR_DATA;\r\n+ \/\/addNewValue(activePins, activePinCount, ioCmd[1]);\r\n+ \/\/int pin = ioCmd[1];\r\n+ \/\/addNewValue(digitalReadPin, digitalReadPollingPinCount, pin);\r\n+ \/\/ this is the same as digitalWrite except\r\n+ \/\/ we can keep track of the number of pulses\r\n+ \/\/break;\r\n+}\r\n+\r\n+\/\/ PULSE\r\n+void pulseStop() {\r\n+ pin_type& pin = pins[ioCmd[1]];\r\n+ \/\/ FIXME - this has to unload a Long !!!\r\n+ pin.state = PUBLISH_PULSE_STOP;\r\n+ \/\/removeAndShift(activePins, activePinCount, ioCmd[1]);\r\n+}\r\n+\r\n+\/\/ digital_READ_POLLING_STOP\r\n+void digitalReadPollingStop() {\r\n+ pin_type& pin = pins[ioCmd[1]];\r\n+ pin.isActive = false;\r\n+ \/\/int pin = ioCmd[1];\r\n+ \/\/removeAndShift(digitalReadPin, digitalReadPollingPinCount, pin);\r\n+ \/\/break;\r\n+ \/\/ FIXME - these should just be attributes of the pin\r\n+}\r\n+\r\n+\/\/ SET_TRIGGER\r\n+void setTrigger() {\r\n+ \/\/ NOT IMPLEMENTED\r\n+ \/\/ FIXME !!! - you need 1. a complete pin list !!! analog & digital should be defined by attribute not\r\n+ \/\/ data structure !!! if (pin.type == ??? if needed\r\n+ \/\/ TODO - if POLLING ALREADY DON'T RE-ADD - MAKE RE-ENTRANT\r\n+ \/\/analogReadPin[analogReadPollingPinCount] = ioCmd[1]; \/\/ put on polling read list\r\n+ \/\/++analogReadPollingPinCount;\r\n+}\r\n+\r\n+\/\/ SET_DEBOUNCE\r\n+void setDebounce() {\r\n+ \/\/ default debounceDelay = 50;\r\n+ debounceDelay = ((ioCmd[1] << 8) + ioCmd[2]);\r\n+}\r\n+\r\n+\/\/ SET_DIGITAL_TRIGGER_ONLY\r\n+void setDigitalTriggerOnly() {\r\n+ \/\/ NOT IMPLEMENTED\r\n+ \/\/digitalTriggerOnly = ioCmd[1];\r\n+}\r\n+\r\n+\/\/ SET_SERIAL_RATE\r\n+void setSerialRate() {\r\n+ Serial.end();\r\n+ delay(500);\r\n+ Serial.begin(ioCmd[1]);\r\n+}\r\n+\r\n+\/\/ SET_SAMPLE_RATE\r\n+void setSampleRate() {\r\n+ \/\/ 2 byte int - valid range 1-65,535\r\n+ sampleRate = (ioCmd[1] << 8) + ioCmd[2];\r\n+ if (sampleRate == 0) {\r\n+ sampleRate = 1;\r\n+ } \/\/ avoid \/0 error - FIXME - time estimate param\r\n+}\r\n+\r\n+\/\/ SENSOR_ATTACH\r\n+void sensorAttachNew() {\r\n+\r\n+ int sensorIndex = ioCmd[1];\r\n+ int sensorType = ioCmd[2];\r\n+ int pinCount = ioCmd[3];\r\n+\r\n+ \/\/ for loop grabbing all pins for this sensor\r\n+ publishDebug(\"S_ATTACH: \" + String(sensorIndex) + \" type:\" + String(sensorType) + \" count:\" + String(pinCount));\r\n+\r\n+ sensor s = sensor();\r\n+ s.index = sensorIndex;\r\n+ LinkedList<pin_type> sensorPins = LinkedList<pin_type>();\r\n+ \/\/ TODO: support an arbitrary list of pins being passed in\r\n+ \/\/ right now, the pins are contigious\r\n+ for (int ordinal = 0; ordinal < pinCount; ordinal++){\r\n+ publishDebug(\"PINADD\" + String(ordinal) + \" TO \" + String(pinCount));\r\n+ pin_type sensorPin = pin_type();\r\n+ sensorPin.address = ordinal;\r\n+ \/\/ TODO: rename this analog\/digital ?\r\n+ sensorPin.sensorType = sensorType;\r\n+ sensorPin.isActive = true;\r\n+ sensorPins.add(sensorPin);\r\n+ \/\/ TODO: special considerations based on the type of sensor to\r\n+ \/\/ setup the pins correctly for multi-pin sensors\r\n+ }\r\n+ publishDebug(\"adding pins.\");\r\n+ s.pins = sensorPins;\r\n+ publishDebug(\"Adding sensors\");\r\n+ sensorList.add(s);\r\n+ publishDebug(\"NUM SENS:\"+String(sensorList.size()));\r\n+ publishDebug(\"Done with sensor attach.\");\r\n+}\r\n+\r\n+\/\/ SENSOR_ATTACH\r\n+void sensorAttach() {\r\n+ \/\/ THIS WILL BE THE NEW BIG-KAHUNA\r\n+ \/\/ INITIAL REQUEST - SENSOR GRABS ALL PINs IT NEEDS\r\n+ \/\/ IT THEN POPULATES each of the PINs with its sensorIndex\r\n+ \/\/ the uC (Arduino) - does not grab any - because it will\r\n+ \/\/ always take\/recieve any non-reserved pin (softReset) Pin\r\n+ publishDebug(\"BSAM\");\r\n+ int sensorIndex = ioCmd[1];\r\n+ int sensorType = ioCmd[2];\r\n+ int pinCount = ioCmd[3];\r\n+ \/\/ for loop grabbing all pins for this sensor\r\n+ for (int ordinal = 0; ordinal < pinCount; ordinal++){\r\n+ \/\/ grab the pin - assign the sensorIndex & sensorType\r\n+ publishDebug(\"WHICH:\" + String(ioCmd[4 + ordinal]));\r\n+ pin_type& pin = pins[sensorIndex];\r\n+ pin.sensorIndex = sensorIndex;\r\n+ pin.sensorType = sensorType;\r\n+ if (pin.sensorType == SENSOR_TYPE_ULTRASONIC && ordinal == 0) {\r\n+ publishDebug(\"ULTRAS\");\r\n+ \/\/ pin.trigPin = ioCmd[3];\r\n+ \/\/ pin.echoPin = ioCmd[4];\r\n+ pinMode(pin.trigPin, OUTPUT); \/\/ WTF about wiring which has single pin ! :P\r\n+ pinMode(pin.echoPin, INPUT);\r\n+ \/\/pin.ping = new NewPing(pin.trigPin, pin.echoPin, 100);\r\n+ \/\/ triggerPin's next pin is the echo pin\r\n+ pin.nextPin = ioCmd[5 + ordinal];\r\n+ } else if (pin.sensorType == SENSOR_TYPE_PULSE) {\r\n+ publishDebug(\"PULSETYP\");\r\n+ pin.address = ioCmd[3];\r\n+ } else if (pin.sensorType == SENSOR_TYPE_PIN) {\r\n+ \/\/ TODO: ?!\r\n+ publishDebug(\"PINTYPE:\" + String(ioCmd[1]) + \" \" + String(ioCmd[2]) + \" \" + String(ioCmd[3]) + \" \" + String(ioCmd[4]));\r\n+ pin.address = ioCmd[4];\r\n+ pin.isActive = true;\r\n+ \/\/ we're reading form this pin now.\r\n+ pinMode(pin.address, INPUT);\r\n+ } else {\r\n+ publishDebug(\"UNKNTYPE\" + String(pin.sensorType));\r\n+ }\r\n+ }\r\n+ publishDebug(\"ESAM\");\r\n+}\r\n+\r\n+\/\/ SENSOR_POLLING_START\r\n+void sensorPollingStart() {\r\n+ \/\/ FIXME - this is the same as DIGITAL PIN POLLING START\r\n+ int sensorIndex = ioCmd[1];\r\n+ pin_type& pin = pins[sensorIndex];\r\n+ pin.isActive = true;\r\n+ \/\/ I'm used to ms - and would need to change some\r\n+ \/\/ interfaces if i was to support inbound longs\r\n+ \/\/pin.timeoutUS = ioCmd[2] * 1000;\r\n+ pin.timeoutUS = 20000; \/\/ 20 ms\r\n+ pin.state = ECHO_STATE_START;\r\n+}\r\n+\r\n+\/\/ SENSOR_POLLING_STOP\r\n+void sensorPollingStop() {\r\n+ int sensorIndex = ioCmd[1];\r\n+ pin_type& pin = pins[sensorIndex];\r\n+ pin.isActive = false;\r\n+}\r\n+\r\n+\/\/ Adafruit commands\r\n+\/\/ AF_BEGIN\r\n+void afBegin() {\r\n+ WIRE.begin();\r\n+ write8(ioCmd[1],PCA9685_MODE1, 0x0);\r\n+}\r\n+\r\n+\/\/ AF_SET_PWM_FREQ\r\n+void afSetPWMFREQ() {\r\n+ \/\/ioCmd[1] is the I2C address\r\n+ \/\/ioCmd[2] is the freqency value\r\n+ int freq = 0.9 * ioCmd[2]; \/\/ Correct for overshoot in the frequency setting (see issue #11).\r\n+ float prescaleval = 25000000;\r\n+ prescaleval \/= 4096;\r\n+ prescaleval \/= freq;\r\n+ prescaleval -= 1;\r\n+ uint8_t prescale = floor(prescaleval + 0.5);\r\n+ uint8_t oldmode = read8(ioCmd[1],PCA9685_MODE1);\r\n+ uint8_t newmode = (oldmode&0x7F) | 0x10; \/\/ sleep\r\n+ write8(ioCmd[1],PCA9685_MODE1, newmode); \/\/ go to sleep\r\n+ write8(ioCmd[1],PCA9685_PRESCALE, prescale); \/\/ set the prescaler\r\n+ write8(ioCmd[1],PCA9685_MODE1, oldmode);\r\n+ delay(5);\r\n+ write8(ioCmd[1],PCA9685_MODE1, oldmode | 0xa1); \/\/ This sets the MODE1 register to turn on auto increment.\r\n+ \/\/ This is why the beginTransmission below was not working.\r\n+}\r\n+\r\n+\/\/ AF_SET_PWM\r\n+void afSetPWM() {\r\n+ setPWM(ioCmd[1], ioCmd[2], ioCmd[3], ioCmd[4]);\r\n+}\r\n+\r\n+\/\/ AF_SET_SERVO\r\n+void afSetServo() {\r\n+ setPWM(ioCmd[1], ioCmd[2], 0, (ioCmd[3] << 8) + ioCmd[4]);\r\n+}\r\n+\r\n+void handlePulseType(pin_type& pin) {\r\n+ pin.lastValue = (pin.lastValue == 0) ? 1 : 0;\r\n+ \/\/ leading edge ... 0 to 1\r\n+ if (pin.lastValue == 1) {\r\n+ pin.count++;\r\n+ if (pin.count >= pin.target) {\r\n+ pin.state = PUBLISH_PULSE_STOP;\r\n+ }\r\n+ }\r\n+ \/\/ change state of pin\r\n+ digitalWrite(pin.address, pin.lastValue);\r\n+ \/\/ move counter\/current position\r\n+ \/\/ see if feedback rate is valid\r\n+ \/\/ if time to send feedback do it\r\n+ \/\/ if (loopCount%feedbackRate == 0)\r\n+ \/\/ 0--to-->1 counting leading edge only\r\n+ \/\/ pin.method == PUBLISH_PULSE_PIN &&\r\n+ \/\/ stopped on the leading edge\r\n+ if (pin.state != PUBLISH_PULSE_STOP && pin.lastValue == 1) {\r\n+ publishPulseStop(pin.state, pin.sensorIndex, pin.address, pin.count);\r\n+ \/\/ deactivate\r\n+ \/\/ lastDebounceTime[digitalReadPin[i]] = millis();\r\n+ }\r\n+ if (pin.state == PUBLISH_PULSE_STOP) {\r\n+ pin.isActive = false;\r\n+ }\r\n+ \/\/ publish the pulse!\r\n+ publishPulse(pin.state, pin.sensorIndex, pin.address, pin.count);\r\n+\r\n+}\r\n+\r\n+\r\n+void handleUltrasonicPing(pin_type& pin, unsigned long ts) {\r\n+ if (pin.state == ECHO_STATE_START) {\r\n+ \/\/ trigPin prepare - start low for an\r\n+ \/\/ upcoming high pulse\r\n+ pinMode(pin.trigPin, OUTPUT);\r\n+ digitalWrite(pin.trigPin, LOW);\r\n+ \/\/ put the echopin into a high state\r\n+ \/\/ is this necessary ???\r\n+ pinMode(pin.echoPin, OUTPUT);\r\n+ digitalWrite(pin.echoPin, HIGH);\r\n+ ts = micros();\r\n+ if (ts - pin.ts > 2) {\r\n+ pin.ts = ts;\r\n+ pin.state = ECHO_STATE_TRIG_PULSE_BEGIN;\r\n+ }\r\n+ } else if (pin.state == ECHO_STATE_TRIG_PULSE_BEGIN) {\r\n+ \/\/ begin high pulse for at least 10 us\r\n+ pinMode(pin.trigPin, OUTPUT);\r\n+ digitalWrite(pin.trigPin, HIGH);\r\n+ ts = micros();\r\n+ if (ts - pin.ts > 10) {\r\n+ pin.ts = ts;\r\n+ pin.state = ECHO_STATE_TRIG_PULSE_END;\r\n+ }\r\n+ } else if (pin.state == ECHO_STATE_TRIG_PULSE_END) {\r\n+ \/\/ end of pulse\r\n+ pinMode(pin.trigPin, OUTPUT);\r\n+ digitalWrite(pin.trigPin, LOW);\r\n+ pin.state = ECHO_STATE_MIN_PAUSE_PRE_LISTENING;\r\n+ pin.ts = micros();\r\n+ } else if (pin.state == ECHO_STATE_MIN_PAUSE_PRE_LISTENING) {\r\n+ ts = micros();\r\n+ if (ts - pin.ts > 1500) {\r\n+ pin.ts = ts;\r\n+ \/\/ putting echo pin into listen mode\r\n+ pinMode(pin.echoPin, OUTPUT);\r\n+ digitalWrite(pin.echoPin, HIGH);\r\n+ pinMode(pin.echoPin, INPUT);\r\n+ pin.state = ECHO_STATE_LISTENING;\r\n+ }\r\n+ } else if (pin.state == ECHO_STATE_LISTENING) {\r\n+ \/\/ timeout or change states..\r\n+ int value = digitalRead(pin.echoPin);\r\n+ ts = micros();\r\n+ if (value == LOW) {\r\n+ pin.lastValue = ts - pin.ts;\r\n+ pin.ts = ts;\r\n+ pin.state = ECHO_STATE_GOOD_RANGE;\r\n+ } else if (ts - pin.ts > pin.timeoutUS) {\r\n+ pin.state = ECHO_STATE_TIMEOUT;\r\n+ pin.ts = ts;\r\n+ pin.lastValue = 0;\r\n+ }\r\n+ } else if (pin.state == ECHO_STATE_GOOD_RANGE || pin.state == ECHO_STATE_TIMEOUT) {\r\n+ publishSensorDataLong(pin.address, pin.lastValue);\r\n+ pin.state = ECHO_STATE_START;\r\n+ } \/\/ end else if\r\n+}\r\n+\r\n+\r\n+\/\/ send an error message\/code back to MRL.\r\n+void sendError(int type) {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(2); \/\/ size = 1 FN + 1 TYPE\r\n+ Serial.write(PUBLISH_MRLCOMM_ERROR);\r\n+ Serial.write(type);\r\n+}\r\n+\r\n+\/\/ publish a servo event.\r\n+void sendServoEvent(servo_type& s, int eventType) {\r\n+ \/\/ check type of event - STOP vs CURRENT POS\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(5); \/\/ size = 1 FN + 1 INDEX + 1 eventType + 1 curPos\r\n+ Serial.write(PUBLISH_SERVO_EVENT);\r\n+ Serial.write(s.index); \/\/ send my index\r\n+ \/\/ write the long value out\r\n+ Serial.write(eventType);\r\n+ Serial.write(s.currentPos);\r\n+ Serial.write(s.targetPos);\r\n+}\r\n+\r\n+void publishVersion() {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(2); \/\/ size\r\n+ Serial.write(PUBLISH_VERSION);\r\n+ Serial.write((byte)MRLCOMM_VERSION);\r\n+ Serial.flush();\r\n+\r\n+}\r\n+\r\n+\r\n+void publishSensor(sensor s) {\r\n+ int numPins = s.pins.size();\r\n+ \/\/ sensor data will be\r\n+ \/\/ magic + size\r\n+ \/\/ publish_sensor_data\r\n+ \/\/ index\r\n+ \/\/ int array (10 bit values = 2 bytes per pin are returned.)\r\n+\r\n+ int msgSize = 2 + numPins*2;\r\n+\r\n+ Serial.flush();\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(msgSize); \/\/size\r\n+ Serial.write(PUBLISH_SENSOR_DATA);\r\n+ Serial.write(s.index);\r\n+ for (int i = 0; i < numPins; i++) {\r\n+ pin_type pin = s.pins.get(i);\r\n+ Serial.write(pin.value >> 8); \/\/ MSB\r\n+ Serial.write(pin.value & 0xff); \/\/ LSB\r\n+ }\r\n+ Serial.flush();\r\n+\r\n+}\r\n+\r\n+\/\/ PUBLISH_SENSOR_DATA\r\n+void publishSensor(int sensorIndex, int sensorType, int address, int value) {\r\n+ Serial.flush();\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(6); \/\/size\r\n+ Serial.write(PUBLISH_SENSOR_DATA);\r\n+ Serial.write(sensorIndex);\r\n+ Serial.write(sensorType);\r\n+ Serial.write(address);\r\n+ Serial.write(value >> 8); \/\/ MSB\r\n+ Serial.write(value & 0xff); \/\/ LSB\r\n+ Serial.flush();\r\n+}\r\n+\r\n+\/\/ TODO: maybe this can be merged with above?\r\n+void publishSensorDataLong(int address, unsigned long lastValue) {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(6); \/\/ size 1 FN + 4 bytes of unsigned long\r\n+ Serial.write(PUBLISH_SENSOR_DATA);\r\n+ Serial.write(address);\r\n+ \/\/ write the long value out\r\n+ Serial.write((byte)(lastValue >> 24));\r\n+ Serial.write((byte)(lastValue >> 16));\r\n+ Serial.write((byte)(lastValue >> 8));\r\n+ Serial.write((byte)lastValue & 0xff);\r\n+}\r\n+\r\n+void publishPulseStop(int state, int sensorIndex, int address, unsigned long count) {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(7); \/\/ size\r\n+ \/\/Serial.write(PUBLISH_PULSE_STOP); ?!?! commented out?\r\n+ Serial.write(state);\r\n+ Serial.write(sensorIndex); \/\/ pin service\r\n+ Serial.write(address); \/\/ Pin#\r\n+ Serial.write(count >> 24); \/\/ MSB zoddly\r\n+ Serial.write(count >> 16); \/\/ MSB\r\n+ Serial.write(count >> 8); \/\/ MSB\r\n+ Serial.write(count & 0xff); \/\/ LSB\r\n+}\r\n+\r\n+void publishPulse(int state, int sensorIndex, int address, unsigned long count) {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(7); \/\/ size\r\n+ \/\/Serial.write(PUBLISH_PULSE); commented out ?!?!\r\n+ Serial.write(state);\r\n+ Serial.write(sensorIndex);\/\/ pin service\r\n+ Serial.write(address);\/\/ Pin#\r\n+ Serial.write(count >> 24); \/\/ MSB zoddly\r\n+ Serial.write(count >> 16); \/\/ MSB\r\n+ Serial.write(count >> 8); \/\/ MSB\r\n+ Serial.write(count & 0xff); \/\/ LSB\r\n+}\r\n+\r\n+void publishLoadTimingEvent(unsigned long loadTime) {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(5); \/\/ size 1 FN + 4 bytes of unsigned long\r\n+ Serial.write(PUBLISH_LOAD_TIMING_EVENT);\r\n+ \/\/ write the long value out\r\n+ Serial.write((byte)(loadTime >> 24));\r\n+ Serial.write((byte)(loadTime >> 16));\r\n+ Serial.write((byte)(loadTime >> 8));\r\n+ Serial.write((byte)loadTime & 0xff);\r\n+}\r\n+\r\n+void sendCommandAck() {\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(2); \/\/ size 1 FN + 1 bytes (the function that we're acking.)\r\n+ Serial.write(PUBLISH_MESSAGE_ACK);\r\n+ \/\/ the function that we're ack-ing\r\n+ Serial.write(ioCmd[0]);\r\n+ Serial.flush();\r\n+}\r\n+\r\n+\/\/ This method will publish a string back to the Arduino service\r\n+\/\/ for debugging purproses.\r\n+\/\/ NOTE: If this method gets called excessively\r\n+\/\/ I have seen memory corruption in the arduino where\r\n+\/\/ it seems to be getting a null string passed in as \"message\"\r\n+\/\/ very very very very very odd.. I suspect a bug in the arduino hard\/software\r\n+void publishDebug(String message) {\r\n+ if (debug) {\r\n+ Serial.flush();\r\n+ Serial.write(MAGIC_NUMBER);\r\n+ Serial.write(1+message.length());\r\n+ Serial.write(PUBLISH_DEBUG);\r\n+ Serial.print(message);\r\n+ Serial.flush();\r\n+ }\r\n+}\r\n"} {"commit":"4b9dac8778e90ed249b0ea93748d0f33bf1b2998","subject":"Replace random UID in meeting message and meeting response mime content with AssociatedCalendarItemId.","message":"Replace random UID in meeting message and meeting response mime content with AssociatedCalendarItemId.\n","repos":"GNOME\/evolution-ews,GNOME\/evolution-ews","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/camel\/camel-ews-folder.c\n+++ src\/camel\/camel-ews-folder.c\n@@ -381,7 +381,9 @@\n \t AssociatedCalendarItemId, replace the random UID with this ItemId,\n \t And save updated message data to a new temp file *\/\n \tif (e_ews_item_get_item_type (items->data) == E_EWS_ITEM_TYPE_MEETING_REQUEST ||\n-\t\te_ews_item_get_item_type (items->data) == E_EWS_ITEM_TYPE_MEETING_CANCELLATION) {\n+\t\te_ews_item_get_item_type (items->data) == E_EWS_ITEM_TYPE_MEETING_CANCELLATION ||\n+\t\te_ews_item_get_item_type (items->data) == E_EWS_ITEM_TYPE_MEETING_MESSAGE ||\n+\t\te_ews_item_get_item_type (items->data) == E_EWS_ITEM_TYPE_MEETING_RESPONSE) {\n \t\tGSList *items_req = NULL;\n \t\tconst EwsId *associated_calendar_id;\n \n"} {"commit":"c404afff88cdca6d2b57e62ca97e14048c300e36","subject":"Bug #234","message":"Bug #234\n","repos":"endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- cpmsrv\/cltexec.c\n+++ cpmsrv\/cltexec.c\n@@ -333,8 +333,10 @@\n ndrx_stopwatch_reset(&t);\n do\n {\n- \/* sign_chld_handler(0); *\/\n-\n+#ifdef EX_CPM_NO_THREADS \/* Bug #234 - have feedback at shutdown when no threads used *\/\n+ \/* Process any dead child... *\/\n+ sign_chld_handler(SIGCHLD);\n+#endif\n EXHASH_ITER(hh, G_clt_config, c, ct)\n {\n if (CLT_STATE_STARTED==c->dyn.cur_state)\n@@ -392,6 +394,10 @@\n ndrx_stopwatch_reset(&t);\n do\n {\n+#ifdef EX_CPM_NO_THREADS \/* Bug #234 - have feedback at shutdown when no threads used *\/\n+ \/* Process any dead child... *\/\n+ sign_chld_handler(SIGCHLD);\n+#endif\n \/* sign_chld_handler(0); *\/\n if (CLT_STATE_STARTED==c->dyn.cur_state)\n {\n@@ -425,6 +431,10 @@\n ndrx_stopwatch_reset(&t);\n do\n {\n+#ifdef EX_CPM_NO_THREADS \/* Bug #234 - have feedback at shutdown when no threads used *\/\n+ \/* Process any dead child... *\/\n+ sign_chld_handler(SIGCHLD);\n+#endif\n \/* sign_chld_handler(0); *\/\n if (CLT_STATE_STARTED==c->dyn.cur_state)\n {\n@@ -465,7 +475,10 @@\n ndrx_stopwatch_reset(&t);\n do\n {\n- \/* sign_chld_handler(0); *\/\n+#ifdef EX_CPM_NO_THREADS \/* Bug #234 - have feedback at shutdown when no threads used *\/\n+ \/* Process any dead child... *\/\n+ sign_chld_handler(SIGCHLD);\n+#endif\n if (CLT_STATE_STARTED==c->dyn.cur_state)\n {\n usleep(CLT_STEP_INTERVAL);\n@@ -518,7 +531,7 @@\n \/* some small delay so that parent gets time for PIDhash setup! *\/\n usleep(9000);\n \n- strcpy(cmd_str, c->stat.command_line);\n+ NDRX_STRCPY_SAFE(cmd_str, c->stat.command_line);\n \n token = strtok(cmd_str, separators);\n while( token != NULL )\n"} {"commit":"88eecd2280754f1602bbaf58af020be5672e5a0c","subject":"trivial: Do not leak the entry if the file cannot be read","message":"trivial: Do not leak the entry if the file cannot be read\n\nI'm not sure how you can hit this, but it was noticed by Coverity.\n","repos":"ximion\/appstream-glib,ximion\/appstream-glib,hughsie\/appstream-glib,hughsie\/appstream-glib,ximion\/appstream-glib,hughsie\/appstream-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libappstream-builder\/asb-utils.c\n+++ libappstream-builder\/asb-utils.c\n@@ -444,8 +444,10 @@\n \t\tarchive_entry_set_perm (entry, 0644);\n \t\tarchive_write_header (a, entry);\n \t\tret = g_file_get_contents (filename_full, &data, &len, error);\n-\t\tif (!ret)\n-\t\t\tgoto out;\n+\t\tif (!ret) {\n+\t\t\tarchive_entry_free (entry);\n+\t\t\tbreak;\n+\t\t}\n \t\tarchive_write_data (a, data, len);\n \t\tarchive_entry_free (entry);\n \t}\n"} {"commit":"e0126a21c86e4700b21d50261d14124d7c338002","subject":"Added the \"reserved\" msgelem.","message":"Added the \"reserved\" msgelem.\n\nFossilOrigin-Name: e33b98e5c4d737ec81a0bb9f06181b852c6607a9281954e7cf7e9488b9da6b38","repos":"7u83\/actube,7u83\/actube,7u83\/actube,7u83\/actube,7u83\/actube","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/capwap\/cw_msgelemtostr.c\n+++ src\/capwap\/cw_msgelemtostr.c\n@@ -105,12 +105,9 @@\n *\/\n \t\tcase CWMSGELEM_WTP_FRAME_TUNNEL_MODE:\n \t\t\treturn \"frame tunnel mode\";\n-\/* \n- Reserved 42\n \n-\n-\n-*\/\n+\t\tcase CWMSGELEM_RESERVED_1:\n+\t\t\treturn \"reserved (42)\";\n \/*\n Reserved 43\n *\/ \n"} {"commit":"e5cde2eb0ed7df9416fdd6070af07c8448c72a30","subject":"mips: Remove duplicate macro definitions","message":"mips: Remove duplicate macro definitions\n\nThe INLINE_SYSCALL, INTERNAL_SYSCALL*, and internal_syscall* macros\nare defined for MIPS in both libc\/sysdeps\/linux\/mips\/sysdep.h and\nlibc\/sysdeps\/linux\/mips\/bits\/syscalls.h. The macros are the same\nin both cases except that syscalls.h defines internal_syscalls[567]\nthe same for N32 and N64 ABIs and has a different definition for O32.\nI believe that is correct. The sysdep.h header uses the O32 versions\nfor N32 and has different definitions for N64. I think that is wrong\nand that N32 and N64 should share the same definition (modulo the\ntype 'long' vs. 'long long' for the arguments. This setup (from\nsysdep.h) now agrees with what glibc has.\n\nI am not positive about which header (sysdep.h vs syscalls.h) is\nreally the right one to have these definitions in but using sysdep.h\nseems to work for all my builds.\n\nSigned-off-by: Steve Ellcey <58e44b16da8d1ba5deee3fef1ace346b22796c9f@mips.com>\nSigned-off-by: Bernhard Reutner-Fischer <ce1ac9e9ad16abccd7821f371ad381197b4768ac@gmail.com>\n","repos":"wbx-github\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,majek\/uclibc-vx32,groundwater\/uClibc,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,kraj\/uclibc-ng,majek\/uclibc-vx32,wbx-github\/uclibc-ng,groundwater\/uClibc,majek\/uclibc-vx32,kraj\/uclibc-ng,wbx-github\/uclibc-ng,brgl\/uclibc-ng,groundwater\/uClibc,brgl\/uclibc-ng,foss-for-synopsys-dwc-arc-processors\/uClibc,majek\/uclibc-vx32,brgl\/uclibc-ng,kraj\/uClibc,wbx-github\/uclibc-ng,groundwater\/uClibc,brgl\/uclibc-ng,kraj\/uClibc,kraj\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,kraj\/uclibc-ng,kraj\/uclibc-ng,kraj\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/sysdeps\/linux\/mips\/sysdep.h\n+++ libc\/sysdeps\/linux\/mips\/sysdep.h\n@@ -130,321 +130,6 @@\n \n #else \/* ! __ASSEMBLER__ *\/\n \n-\/* Define a macro which expands into the inline wrapper code for a system\n- call. *\/\n-#undef INLINE_SYSCALL\n-#define INLINE_SYSCALL(name, nr, args...)\t\t\t\t\\\n- ({ INTERNAL_SYSCALL_DECL(err);\t\t\t\t\t\\\n- long result_var = INTERNAL_SYSCALL (name, err, nr, args);\t\t\\\n- if ( INTERNAL_SYSCALL_ERROR_P (result_var, err) )\t\t\t\\\n- {\t\t\t\t\t\t\t\t\\\n-\t __set_errno (INTERNAL_SYSCALL_ERRNO (result_var, err));\t\\\n-\t result_var = -1L;\t\t\t\t\t\t\\\n- }\t\t\t\t\t\t\t\t\\\n- result_var; })\n-\n-#undef INTERNAL_SYSCALL_DECL\n-#define INTERNAL_SYSCALL_DECL(err) long err attribute_unused\n-\n-#undef INTERNAL_SYSCALL_ERROR_P\n-#define INTERNAL_SYSCALL_ERROR_P(val, err) ((long) (err))\n-\n-#undef INTERNAL_SYSCALL_ERRNO\n-#define INTERNAL_SYSCALL_ERRNO(val, err) (val)\n-\n-#undef INTERNAL_SYSCALL\n-#define INTERNAL_SYSCALL(name, err, nr, args...) \\\n-\tinternal_syscall##nr (, \"li\\t$2, %2\\t\\t\\t# \" #name \"\\n\\t\",\t\\\n-\t\t\t \"i\" (SYS_ify (name)), err, args)\n-\n-#undef INTERNAL_SYSCALL_NCS\n-#define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \\\n-\tinternal_syscall##nr (= number, , \"r\" (__v0), err, args)\n-#undef internal_syscall0\n-#define internal_syscall0(ncs_init, cs_init, input, err, dummy...)\t\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\");\t\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\".set reorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"=r\" (__a3)\t\t\t\t\t\\\n-\t: input\t\t\t\t\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall1\n-#define internal_syscall1(ncs_init, cs_init, input, err, arg1)\t\t\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\");\t\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\".set reorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"=r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0)\t\t\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall2\n-#define internal_syscall2(ncs_init, cs_init, input, err, arg1, arg2)\t\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\");\t\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"=r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1)\t\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall3\n-#define internal_syscall3(ncs_init, cs_init, input, err, arg1, arg2, arg3)\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\");\t\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"=r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2)\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall4\n-#define internal_syscall4(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4)\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4;\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2)\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32\n-\n-\/* We need to use a frame pointer for the functions in which we\n- adjust $sp around the syscall, or debug information and unwind\n- information will be $sp relative and thus wrong during the syscall. As\n- of GCC 3.4.3, this is sufficient. *\/\n-#define FORCE_FRAME_POINTER alloca (4)\n-\n-#undef internal_syscall5\n-#define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\tFORCE_FRAME_POINTER;\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4;\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\t\"subu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%6, 16($29)\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\"addiu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2),\t\t\t\\\n-\t \"r\" ((long)arg5)\t\t\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall6\n-#define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6)\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\tFORCE_FRAME_POINTER;\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4;\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\t\"subu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%6, 16($29)\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%7, 20($29)\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\"addiu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2),\t\t\t\\\n-\t \"r\" ((long)arg5), \"r\" ((long)arg6)\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall7\n-#define internal_syscall7(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\\\n-({\t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\tFORCE_FRAME_POINTER;\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1;\t\t\t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2;\t\t\t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3;\t\t\t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4;\t\t\t\\\n-\t__asm__ __volatile__ (\t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\"\t\t\t\t\t\t\\\n-\t\"subu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%6, 16($29)\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%7, 20($29)\\n\\t\"\t\t\t\t\t\t\\\n-\t\"sw\\t%8, 24($29)\\n\\t\"\t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\"\t\t\t\t\t\t\t\\\n-\t\"addiu\\t$29, 32\\n\\t\"\t\t\t\t\t\t\\\n-\t\".set\\treorder\"\t\t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3)\t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2),\t\t\t\\\n-\t \"r\" ((long)arg5), \"r\" ((long)arg6), \"r\" ((long)arg7)\t\t\\\n-\t: __SYSCALL_CLOBBERS);\t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef __SYSCALL_CLOBBERS\n-#define __SYSCALL_CLOBBERS \"$1\", \"$3\", \"$8\", \"$9\", \"$10\", \"$11\", \"$12\", \"$13\", \\\n-\t\"$14\", \"$15\", \"$24\", \"$25\", \"memory\"\n-\n-#else \/* N64 *\/\n-\n-#undef internal_syscall5\n-#define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5) \\\n-({ \t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1; \t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2; \t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3; \t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4; \t\\\n-\tregister long __a4 __asm__(\"$8\") = (long) arg5; \t\\\n-\t__asm__ __volatile__ ( \t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\" \t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\" \t\t\t\t\t\t\t\\\n-\t\".set\\treorder\" \t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3) \t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2), \"r\" (__a4)\t\t\\\n-\t: __SYSCALL_CLOBBERS); \t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#undef internal_syscall6\n-#define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6) \\\n-({ \t\t\t\t\t\t\t\t\t\\\n-\tlong _sys_result;\t\t\t\t\t\t\\\n-\t\t\t\t\t\t\t\t\t\\\n-\t{\t\t\t\t\t\t\t\t\\\n-\tregister long __v0 __asm__(\"$2\") ncs_init;\t\t\t\\\n-\tregister long __a0 __asm__(\"$4\") = (long) arg1; \t\\\n-\tregister long __a1 __asm__(\"$5\") = (long) arg2; \t\\\n-\tregister long __a2 __asm__(\"$6\") = (long) arg3; \t\\\n-\tregister long __a3 __asm__(\"$7\") = (long) arg4; \t\\\n-\tregister long __a4 __asm__(\"$8\") = (long) arg5; \t\\\n-\tregister long __a5 __asm__(\"$9\") = (long) arg6; \t\\\n-\t__asm__ __volatile__ ( \t\t\t\t\t\t\\\n-\t\".set\\tnoreorder\\n\\t\" \t\t\t\t\t\t\\\n-\tcs_init\t\t\t\t\t\t\t\t\\\n-\t\"syscall\\n\\t\" \t\t\t\t\t\t\t\\\n-\t\".set\\treorder\" \t\t\t\t\t\t\\\n-\t: \"=r\" (__v0), \"+r\" (__a3) \t\t\t\t\t\\\n-\t: input, \"r\" (__a0), \"r\" (__a1), \"r\" (__a2), \"r\" (__a4),\t\\\n-\t \"r\" (__a5)\t\t\t\t\t\t\t\\\n-\t: __SYSCALL_CLOBBERS); \t\t\t\t\t\t\\\n-\terr = __a3;\t\t\t\t\t\t\t\\\n-\t_sys_result = __v0;\t\t\t\t\t\t\\\n-\t}\t\t\t\t\t\t\t\t\\\n-\t_sys_result;\t\t\t\t\t\t\t\\\n-})\n-\n-#define __SYSCALL_CLOBBERS \"$1\", \"$3\", \"$10\", \"$11\", \"$12\", \"$13\", \\\n-\t\"$14\", \"$15\", \"$24\", \"$25\", \"hi\", \"lo\", \"memory\"\n-\n-#endif\n-\n \/* Pointer mangling is not yet supported for MIPS. *\/\n #define PTR_MANGLE(var) (void) (var)\n #define PTR_DEMANGLE(var) (void) (var)\n"} {"commit":"6105e384884eab908203f363e66b0aaf44c74868","subject":"rename panic() to panic1() because of conflict on Darwin with \/usr\/include\/mach\/mach.h:79","message":"rename panic() to panic1() because of conflict on Darwin with \/usr\/include\/mach\/mach.h:79\n","repos":"BMJHayward\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,kbrock\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,MjAbuz\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,pixelglow\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,tkelman\/graphviz,tkelman\/graphviz,jho1965us\/graphviz,ellson\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,ellson\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,jho1965us\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,jho1965us\/graphviz,ellson\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,ellson\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,tkelman\/graphviz,ellson\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,pixelglow\/graphviz,ellson\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,kbrock\/graphviz,kbrock\/graphviz,kbrock\/graphviz,tkelman\/graphviz,kbrock\/graphviz,ellson\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,BMJHayward\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- cmd\/lefty\/lefty.c\n+++ cmd\/lefty\/lefty.c\n@@ -451,7 +451,7 @@\n fp = stdin;\n else {\n if ((fp = fopen (argv[0], \"r\")) == NULL)\n- panic (POS, \"main\", \"cannot open input file: %s\", argv[0]);\n+ panic1 (POS, \"main\", \"cannot open input file: %s\", argv[0]);\n }\n argv++, argc--;\n }\n"} {"commit":"43e13bdfac262e29e0fdb90ee415c456d71d599e","subject":"Fixed all integer conversion warnings for OpenH264.","message":"Fixed all integer conversion warnings for OpenH264.\n\nAdded range checks and casts to integer where necessary\nto remove warnings.\n","repos":"ivan-83\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,mfleisz\/FreeRDP,chipitsine\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,cloudbase\/FreeRDP-dev,akallabeth\/FreeRDP,cedrozor\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,ivan-83\/FreeRDP,akallabeth\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,FreeRDP\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,cedrozor\/FreeRDP,cedrozor\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,ivan-83\/FreeRDP,cloudbase\/FreeRDP-dev,erbth\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,awakecoding\/FreeRDP,cedrozor\/FreeRDP,cloudbase\/FreeRDP-dev,chipitsine\/FreeRDP,cloudbase\/FreeRDP-dev,cedrozor\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,cedrozor\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,chipitsine\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/codec\/h264_openh264.c\n+++ libfreerdp\/codec\/h264_openh264.c\n@@ -171,8 +171,15 @@\n \tif (!pYUVData[0] || !pYUVData[1] || !pYUVData[2])\n \t\treturn -1;\n \n-\tif ((sys->EncParamExt.iPicWidth != h264->width)\n-\t || (sys->EncParamExt.iPicHeight != h264->height))\n+\tif ((h264->width > INT_MAX) || (h264->height > INT_MAX))\n+\t\treturn -1;\n+\n+\tif ((h264->FrameRate > INT_MAX) || (h264->NumberOfThreads > INT_MAX) ||\n+\t\t(h264->BitRate > INT_MAX) || (h264->QP > INT_MAX))\n+\t\treturn -1;\n+\n+\tif ((sys->EncParamExt.iPicWidth != (int)h264->width)\n+\t\t|| (sys->EncParamExt.iPicHeight != (int)h264->height))\n \t{\n \t\tstatus = (*sys->pEncoder)->GetDefaultParams(sys->pEncoder, &sys->EncParamExt);\n \n@@ -183,15 +190,15 @@\n \t\t}\n \n \t\tsys->EncParamExt.iUsageType = SCREEN_CONTENT_REAL_TIME;\n-\t\tsys->EncParamExt.iPicWidth = h264->width;\n-\t\tsys->EncParamExt.iPicHeight = h264->height;\n-\t\tsys->EncParamExt.fMaxFrameRate = h264->FrameRate;\n+\t\tsys->EncParamExt.iPicWidth = (int)h264->width;\n+\t\tsys->EncParamExt.iPicHeight = (int)h264->height;\n+\t\tsys->EncParamExt.fMaxFrameRate = (int)h264->FrameRate;\n \t\tsys->EncParamExt.iMaxBitrate = UNSPECIFIED_BIT_RATE;\n \t\tsys->EncParamExt.bEnableDenoise = 0;\n \t\tsys->EncParamExt.bEnableLongTermReference = 0;\n \t\tsys->EncParamExt.bEnableFrameSkip = 0;\n \t\tsys->EncParamExt.iSpatialLayerNum = 1;\n-\t\tsys->EncParamExt.iMultipleThreadIdc = h264->NumberOfThreads;\n+\t\tsys->EncParamExt.iMultipleThreadIdc = (int)h264->NumberOfThreads;\n \t\tsys->EncParamExt.sSpatialLayers[0].fFrameRate = h264->FrameRate;\n \t\tsys->EncParamExt.sSpatialLayers[0].iVideoWidth = sys->EncParamExt.iPicWidth;\n \t\tsys->EncParamExt.sSpatialLayers[0].iVideoHeight = sys->EncParamExt.iPicHeight;\n@@ -202,14 +209,14 @@\n \t\t{\n \t\t\tcase H264_RATECONTROL_VBR:\n \t\t\t\tsys->EncParamExt.iRCMode = RC_BITRATE_MODE;\n-\t\t\t\tsys->EncParamExt.iTargetBitrate = h264->BitRate;\n+\t\t\t\tsys->EncParamExt.iTargetBitrate = (int)h264->BitRate;\n \t\t\t\tsys->EncParamExt.sSpatialLayers[0].iSpatialBitrate =\n \t\t\t\t sys->EncParamExt.iTargetBitrate;\n \t\t\t\tbreak;\n \n \t\t\tcase H264_RATECONTROL_CQP:\n \t\t\t\tsys->EncParamExt.iRCMode = RC_OFF_MODE;\n-\t\t\t\tsys->EncParamExt.sSpatialLayers[0].iDLayerQp = h264->QP;\n+\t\t\t\tsys->EncParamExt.sSpatialLayers[0].iDLayerQp = (int)h264->QP;\n \t\t\t\tbreak;\n \t\t}\n \n@@ -246,11 +253,11 @@\n \t\tswitch (h264->RateControlMode)\n \t\t{\n \t\t\tcase H264_RATECONTROL_VBR:\n-\t\t\t\tif (sys->EncParamExt.iTargetBitrate != h264->BitRate)\n+\t\t\t\tif (sys->EncParamExt.iTargetBitrate != (int)h264->BitRate)\n \t\t\t\t{\n-\t\t\t\t\tsys->EncParamExt.iTargetBitrate = h264->BitRate;\n+\t\t\t\t\tsys->EncParamExt.iTargetBitrate = (int)h264->BitRate;\n \t\t\t\t\tbitrate.iLayer = SPATIAL_LAYER_ALL;\n-\t\t\t\t\tbitrate.iBitrate = h264->BitRate;\n+\t\t\t\t\tbitrate.iBitrate = (int)h264->BitRate;\n \t\t\t\t\tstatus = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_BITRATE,\n \t\t\t\t\t &bitrate);\n \n@@ -261,9 +268,9 @@\n \t\t\t\t\t}\n \t\t\t\t}\n \n-\t\t\t\tif (sys->EncParamExt.fMaxFrameRate != h264->FrameRate)\n+\t\t\t\tif (sys->EncParamExt.fMaxFrameRate != (int)h264->FrameRate)\n \t\t\t\t{\n-\t\t\t\t\tsys->EncParamExt.fMaxFrameRate = h264->FrameRate;\n+\t\t\t\t\tsys->EncParamExt.fMaxFrameRate = (int)h264->FrameRate;\n \t\t\t\t\tstatus = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_FRAME_RATE,\n \t\t\t\t\t &sys->EncParamExt.fMaxFrameRate);\n \n@@ -277,9 +284,9 @@\n \t\t\t\tbreak;\n \n \t\t\tcase H264_RATECONTROL_CQP:\n-\t\t\t\tif (sys->EncParamExt.sSpatialLayers[0].iDLayerQp != h264->QP)\n+\t\t\t\tif (sys->EncParamExt.sSpatialLayers[0].iDLayerQp != (int)h264->QP)\n \t\t\t\t{\n-\t\t\t\t\tsys->EncParamExt.sSpatialLayers[0].iDLayerQp = h264->QP;\n+\t\t\t\t\tsys->EncParamExt.sSpatialLayers[0].iDLayerQp = (int)h264->QP;\n \t\t\t\t\tstatus = (*sys->pEncoder)->SetOption(sys->pEncoder,\n \t\t\t\t\t ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,\n \t\t\t\t\t &sys->EncParamExt);\n"} {"commit":"31cad06f3c9d2e8a80d624ca36901b6ef6f00647","subject":"Update vendor\/illumos\/dist and vendor-sys\/illumos\/dist to illumos-gate 13849:3468a95b27cd (illumos ZFS issues #3145, #3212, #3258)","message":"Update vendor\/illumos\/dist and vendor-sys\/illumos\/dist\nto illumos-gate 13849:3468a95b27cd\n(illumos ZFS issues #3145, #3212, #3258)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cmd\/ztest\/ztest.c\n+++ cmd\/ztest\/ztest.c\n@@ -119,8 +119,8 @@\n #include <sys\/fs\/zfs.h>\n #include <libnvpair.h>\n \n-#define\tZTEST_FD_DATA 3\n-#define\tZTEST_FD_RAND 4\n+static int ztest_fd_data = -1;\n+static int ztest_fd_rand = -1;\n \n typedef struct ztest_shared_hdr {\n \tuint64_t\tzh_hdr_size;\n@@ -708,14 +708,17 @@\n \t UINT64_MAX >> 2);\n \n \tif (strlen(altdir) > 0) {\n-\t\tchar cmd[MAXNAMELEN];\n-\t\tchar realaltdir[MAXNAMELEN];\n+\t\tchar *cmd;\n+\t\tchar *realaltdir;\n \t\tchar *bin;\n \t\tchar *ztest;\n \t\tchar *isa;\n \t\tint isalen;\n \n-\t\t(void) realpath(getexecname(), cmd);\n+\t\tcmd = umem_alloc(MAXPATHLEN, UMEM_NOFAIL);\n+\t\trealaltdir = umem_alloc(MAXPATHLEN, UMEM_NOFAIL);\n+\n+\t\tVERIFY(NULL != realpath(getexecname(), cmd));\n \t\tif (0 != access(altdir, F_OK)) {\n \t\t\tztest_dump_core = B_FALSE;\n \t\t\tfatal(B_TRUE, \"invalid alternate ztest path: %s\",\n@@ -746,6 +749,9 @@\n \t\t\tfatal(B_TRUE, \"invalid alternate lib directory %s\",\n \t\t\t zo->zo_alt_libpath);\n \t\t}\n+\n+\t\tumem_free(cmd, MAXPATHLEN);\n+\t\tumem_free(realaltdir, MAXPATHLEN);\n \t}\n }\n \n@@ -762,10 +768,12 @@\n {\n \tuint64_t r;\n \n+\tASSERT3S(ztest_fd_rand, >=, 0);\n+\n \tif (range == 0)\n \t\treturn (0);\n \n-\tif (read(ZTEST_FD_RAND, &r, sizeof (r)) != sizeof (r))\n+\tif (read(ztest_fd_rand, &r, sizeof (r)) != sizeof (r))\n \t\tfatal(1, \"short read from \/dev\/urandom\");\n \n \treturn (r % range);\n@@ -4695,7 +4703,18 @@\n \t\t\tif (islog)\n \t\t\t\t(void) rw_unlock(&ztest_name_lock);\n \t\t} else {\n+\t\t\t\/*\n+\t\t\t * Ideally we would like to be able to randomly\n+\t\t\t * call vdev_[on|off]line without holding locks\n+\t\t\t * to force unpredictable failures but the side\n+\t\t\t * effects of vdev_[on|off]line prevent us from\n+\t\t\t * doing so. We grab the ztest_vdev_lock here to\n+\t\t\t * prevent a race between injection testing and\n+\t\t\t * aux_vdev removal.\n+\t\t\t *\/\n+\t\t\tVERIFY(mutex_lock(&ztest_vdev_lock) == 0);\n \t\t\t(void) vdev_online(spa, guid0, 0, NULL);\n+\t\t\tVERIFY(mutex_unlock(&ztest_vdev_lock) == 0);\n \t\t}\n \t}\n \n@@ -5650,19 +5669,15 @@\n }\n \n static void\n-setup_fds(void)\n-{\n-\tint fd;\n-\n-\tchar *tmp = tempnam(NULL, NULL);\n-\tfd = open(tmp, O_RDWR | O_CREAT, 0700);\n-\tASSERT3U(fd, ==, ZTEST_FD_DATA);\n-\t(void) unlink(tmp);\n-\tfree(tmp);\n-\n-\tfd = open(\"\/dev\/urandom\", O_RDONLY);\n-\tASSERT3U(fd, ==, ZTEST_FD_RAND);\n-}\n+setup_data_fd(void)\n+{\n+\tstatic char ztest_name_data[] = \"\/tmp\/ztest.data.XXXXXX\";\n+\n+\tztest_fd_data = mkstemp(ztest_name_data);\n+\tASSERT3S(ztest_fd_data, >=, 0);\n+\t(void) unlink(ztest_name_data);\n+}\n+\n \n static int\n shared_data_size(ztest_shared_hdr_t *hdr)\n@@ -5685,10 +5700,10 @@\n \tztest_shared_hdr_t *hdr;\n \n \thdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()),\n-\t PROT_READ | PROT_WRITE, MAP_SHARED, ZTEST_FD_DATA, 0);\n+\t PROT_READ | PROT_WRITE, MAP_SHARED, ztest_fd_data, 0);\n \tASSERT(hdr != MAP_FAILED);\n \n-\tVERIFY3U(0, ==, ftruncate(ZTEST_FD_DATA, sizeof (ztest_shared_hdr_t)));\n+\tVERIFY3U(0, ==, ftruncate(ztest_fd_data, sizeof (ztest_shared_hdr_t)));\n \n \thdr->zh_hdr_size = sizeof (ztest_shared_hdr_t);\n \thdr->zh_opts_size = sizeof (ztest_shared_opts_t);\n@@ -5699,7 +5714,7 @@\n \thdr->zh_ds_count = ztest_opts.zo_datasets;\n \n \tsize = shared_data_size(hdr);\n-\tVERIFY3U(0, ==, ftruncate(ZTEST_FD_DATA, size));\n+\tVERIFY3U(0, ==, ftruncate(ztest_fd_data, size));\n \n \t(void) munmap((caddr_t)hdr, P2ROUNDUP(sizeof (*hdr), getpagesize()));\n }\n@@ -5712,14 +5727,14 @@\n \tuint8_t *buf;\n \n \thdr = (void *)mmap(0, P2ROUNDUP(sizeof (*hdr), getpagesize()),\n-\t PROT_READ, MAP_SHARED, ZTEST_FD_DATA, 0);\n+\t PROT_READ, MAP_SHARED, ztest_fd_data, 0);\n \tASSERT(hdr != MAP_FAILED);\n \n \tsize = shared_data_size(hdr);\n \n \t(void) munmap((caddr_t)hdr, P2ROUNDUP(sizeof (*hdr), getpagesize()));\n \thdr = ztest_shared_hdr = (void *)mmap(0, P2ROUNDUP(size, getpagesize()),\n-\t PROT_READ | PROT_WRITE, MAP_SHARED, ZTEST_FD_DATA, 0);\n+\t PROT_READ | PROT_WRITE, MAP_SHARED, ztest_fd_data, 0);\n \tASSERT(hdr != MAP_FAILED);\n \tbuf = (uint8_t *)hdr;\n \n@@ -5738,12 +5753,13 @@\n {\n \tpid_t pid;\n \tint status;\n-\tchar cmdbuf[MAXPATHLEN];\n+\tchar *cmdbuf = NULL;\n \n \tpid = fork();\n \n \tif (cmd == NULL) {\n-\t\t(void) strlcpy(cmdbuf, getexecname(), sizeof (cmdbuf));\n+\t\tcmdbuf = umem_alloc(MAXPATHLEN, UMEM_NOFAIL);\n+\t\t(void) strlcpy(cmdbuf, getexecname(), MAXPATHLEN);\n \t\tcmd = cmdbuf;\n \t}\n \n@@ -5752,15 +5768,27 @@\n \n \tif (pid == 0) {\t\/* child *\/\n \t\tchar *emptyargv[2] = { cmd, NULL };\n+\t\tchar fd_data_str[12];\n \n \t\tstruct rlimit rl = { 1024, 1024 };\n \t\t(void) setrlimit(RLIMIT_NOFILE, &rl);\n+\n+\t\t(void) close(ztest_fd_rand);\n+\t\tVERIFY3U(11, >=,\n+\t\t snprintf(fd_data_str, 12, \"%d\", ztest_fd_data));\n+\t\tVERIFY0(setenv(\"ZTEST_FD_DATA\", fd_data_str, 1));\n+\n \t\t(void) enable_extended_FILE_stdio(-1, -1);\n \t\tif (libpath != NULL)\n \t\t\tVERIFY(0 == setenv(\"LD_LIBRARY_PATH\", libpath, 1));\n \t\t(void) execv(cmd, emptyargv);\n \t\tztest_dump_core = B_FALSE;\n \t\tfatal(B_TRUE, \"exec failed: %s\", cmd);\n+\t}\n+\n+\tif (cmdbuf != NULL) {\n+\t\tumem_free(cmdbuf, MAXPATHLEN);\n+\t\tcmd = NULL;\n \t}\n \n \twhile (waitpid(pid, &status, 0) != pid)\n@@ -5827,39 +5855,41 @@\n \tchar timebuf[100];\n \tchar numbuf[6];\n \tspa_t *spa;\n-\tchar cmd[MAXNAMELEN];\n+\tchar *cmd;\n \tboolean_t hasalt;\n-\n-\tboolean_t ischild = (0 == lseek(ZTEST_FD_DATA, 0, SEEK_CUR));\n-\tASSERT(ischild || errno == EBADF);\n+\tchar *fd_data_str = getenv(\"ZTEST_FD_DATA\");\n \n \t(void) setvbuf(stdout, NULL, _IOLBF, 0);\n \n \tdprintf_setup(&argc, argv);\n \n-\tif (!ischild) {\n+\tztest_fd_rand = open(\"\/dev\/urandom\", O_RDONLY);\n+\tASSERT3S(ztest_fd_rand, >=, 0);\n+\n+\tif (!fd_data_str) {\n \t\tprocess_options(argc, argv);\n \n-\t\tsetup_fds();\n+\t\tsetup_data_fd();\n \t\tsetup_hdr();\n \t\tsetup_data();\n \t\tbcopy(&ztest_opts, ztest_shared_opts,\n \t\t sizeof (*ztest_shared_opts));\n \t} else {\n+\t\tztest_fd_data = atoi(fd_data_str);\n \t\tsetup_data();\n \t\tbcopy(ztest_shared_opts, &ztest_opts, sizeof (ztest_opts));\n \t}\n \tASSERT3U(ztest_opts.zo_datasets, ==, ztest_shared_hdr->zh_ds_count);\n \n \t\/* Override location of zpool.cache *\/\n-\t(void) asprintf((char **)&spa_config_path, \"%s\/zpool.cache\",\n-\t ztest_opts.zo_dir);\n+\tVERIFY3U(asprintf((char **)&spa_config_path, \"%s\/zpool.cache\",\n+\t ztest_opts.zo_dir), !=, -1);\n \n \tztest_ds = umem_alloc(ztest_opts.zo_datasets * sizeof (ztest_ds_t),\n \t UMEM_NOFAIL);\n \tzs = ztest_shared;\n \n-\tif (ischild) {\n+\tif (fd_data_str) {\n \t\tmetaslab_gang_bang = ztest_opts.zo_metaslab_gang_bang;\n \t\tmetaslab_df_alloc_threshold =\n \t\t zs->zs_metaslab_df_alloc_threshold;\n@@ -5882,7 +5912,8 @@\n \t\t (u_longlong_t)ztest_opts.zo_time);\n \t}\n \n-\t(void) strlcpy(cmd, getexecname(), sizeof (cmd));\n+\tcmd = umem_alloc(MAXNAMELEN, UMEM_NOFAIL);\n+\t(void) strlcpy(cmd, getexecname(), MAXNAMELEN);\n \n \tzs->zs_do_init = B_TRUE;\n \tif (strlen(ztest_opts.zo_alt_ztest) != 0) {\n@@ -6023,5 +6054,7 @@\n \t\t kills, iters - kills, (100.0 * kills) \/ MAX(1, iters));\n \t}\n \n+\tumem_free(cmd, MAXNAMELEN);\n+\n \treturn (0);\n }\n"} {"commit":"a39d1ad52474b76dbdf88c291d38e1616e5118c7","subject":"mrb: add Column#table","message":"mrb: add Column#table\n","repos":"naoa\/groonga,hiroyuki-sato\/groonga,komainu8\/groonga,redfigure\/groonga,redfigure\/groonga,kenhys\/groonga,hiroyuki-sato\/groonga,cosmo0920\/groonga,kenhys\/groonga,kenhys\/groonga,komainu8\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,komainu8\/groonga,hiroyuki-sato\/groonga,kenhys\/groonga,naoa\/groonga,hiroyuki-sato\/groonga,naoa\/groonga,kenhys\/groonga,redfigure\/groonga,hiroyuki-sato\/groonga,hiroyuki-sato\/groonga,redfigure\/groonga,komainu8\/groonga,cosmo0920\/groonga,groonga\/groonga,naoa\/groonga,cosmo0920\/groonga,groonga\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,cosmo0920\/groonga,kenhys\/groonga,cosmo0920\/groonga,naoa\/groonga,groonga\/groonga,hiroyuki-sato\/groonga,groonga\/groonga,groonga\/groonga,cosmo0920\/groonga,redfigure\/groonga,redfigure\/groonga,naoa\/groonga,redfigure\/groonga,komainu8\/groonga,redfigure\/groonga,groonga\/groonga,komainu8\/groonga,komainu8\/groonga,naoa\/groonga,kenhys\/groonga,cosmo0920\/groonga,komainu8\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/mrb\/mrb_column.c\n+++ lib\/mrb\/mrb_column.c\n@@ -25,6 +25,7 @@\n \n #include \"mrb_ctx.h\"\n #include \"mrb_column.h\"\n+#include \"mrb_converter.h\"\n \n static mrb_value\n mrb_grn_column_is_locked(mrb_state *mrb, mrb_value self)\n@@ -36,6 +37,20 @@\n grn_mrb_ctx_check(mrb);\n \n return mrb_bool_value(is_locked != 0);\n+}\n+\n+static mrb_value\n+mrb_grn_column_get_table(mrb_state *mrb, mrb_value self)\n+{\n+ grn_ctx *ctx = (grn_ctx *)mrb->ud;\n+ grn_obj *table;\n+\n+ table = grn_column_table(ctx, DATA_PTR(self));\n+ if (!table) {\n+ return mrb_nil_value();\n+ }\n+\n+ return grn_mrb_value_from_grn_obj(mrb, table);\n }\n \n void\n@@ -52,5 +67,8 @@\n \n mrb_define_method(mrb, klass, \"locked?\",\n mrb_grn_column_is_locked, MRB_ARGS_NONE());\n+\n+ mrb_define_method(mrb, klass, \"table\",\n+ mrb_grn_column_get_table, MRB_ARGS_NONE());\n }\n #endif\n"} {"commit":"b5e30231aa7ce771a3db82c465aea3ca91f24ab6","subject":"use baidu code style","message":"use baidu code style\n","repos":"hongliuliao\/ehttp,hongliuliao\/ehttp,hongliuliao\/simple_server,hongliuliao\/ehttp,hongliuliao\/ehttp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/threadpool.h\n+++ src\/threadpool.h\n@@ -12,28 +12,28 @@\n class Mutex {\n public:\n Mutex() {\n- pthread_mutex_init(&m_lock, NULL);\n- is_locked = false;\n+ pthread_mutex_init(&_lock, NULL);\n+ _is_locked = false;\n }\n ~Mutex() {\n- while(is_locked);\n+ while(_is_locked);\n unlock(); \/\/ Unlock Mutex after shared resource is safe\n- pthread_mutex_destroy(&m_lock);\n+ pthread_mutex_destroy(&_lock);\n }\n void lock() {\n- pthread_mutex_lock(&m_lock);\n- is_locked = true;\n+ pthread_mutex_lock(&_lock);\n+ _is_locked = true;\n }\n void unlock() {\n- is_locked = false; \/\/ do it BEFORE unlocking to avoid race condition\n- pthread_mutex_unlock(&m_lock);\n+ _is_locked = false; \/\/ do it BEFORE unlocking to avoid race condition\n+ pthread_mutex_unlock(&_lock);\n }\n pthread_mutex_t* get_mutex_ptr() {\n- return &m_lock;\n+ return &_lock;\n }\n private:\n- pthread_mutex_t m_lock;\n- volatile bool is_locked;\n+ pthread_mutex_t _lock;\n+ volatile bool _is_locked;\n };\n \n class CondVar {\n"} {"commit":"d65dfa3b01207016dde1e4985fccd6059167a9c5","subject":"Update misleading debug messages for directio checker","message":"Update misleading debug messages for directio checker\n\nio_getevents returns the number of events received, so '1'\nis actual a success. And calling 'strerror(errno)' unconditionally\nhere will lead to false errors as the errno value won't be\nupdated then.\n\nSigned-off-by: Hannes Reinecke <b0d1e9e4a4e27620745ff49be9000da3174a4cc6@suse.de>\n","repos":"grzn\/multipath-tools-explained,vijaychauhan\/multipath-tools,gebi\/multipath-tools,unakatsuo\/multipath-tools,unakatsuo\/multipath-tools,unakatsuo\/multipath-tools,vijaychauhan\/multipath-tools,grzn\/multipath-tools-explained","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmultipath\/checkers\/directio.c\n+++ libmultipath\/checkers\/directio.c\n@@ -149,14 +149,19 @@\n \tct->running++;\n \n \tr = io_getevents(ct->ioctx, 1L, 1L, &event, &timeout);\n-\tLOG(3, \"async io getevents returns %li (errno=%s)\", r, strerror(errno));\n-\n-\tif (r < 1L) {\n+\n+\tif (r < 0 ) {\n+\t\tLOG(3, \"async io getevents returned %li (errno=%s)\", r,\n+\t\t strerror(errno));\n+\t\trc = PATH_UNCHECKED;\n+\t} else if (r < 1L) {\n \t\tif (ct->running > ASYNC_TIMEOUT_SEC || sync) {\n \t\t\tLOG(3, \"abort check on timeout\");\n \t\t\trc = PATH_DOWN;\n-\t\t} else\n+\t\t} else {\n+\t\t\tLOG(3, \"async io pending\");\n \t\t\trc = PATH_PENDING;\n+\t\t}\n \t} else {\n \t\tLOG(3, \"io finished %lu\/%lu\", event.res, event.res2);\n \t\tct->running = 0;\n"} {"commit":"5f846c0490c53530cad8a29e92c8f199d9dc9de1","subject":"Unused include","message":"Unused include\n","repos":"jedisct1\/MLVPN,jedisct1\/MLVPN,zehome\/MLVPN,zehome\/MLVPN,jedisct1\/MLVPN","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- privsep.c\n+++ privsep.c\n@@ -20,7 +20,6 @@\n #define _GNU_SOURCE\n #include <sys\/ioctl.h>\n #include <sys\/param.h>\n-#include <sys\/queue.h>\n #include <sys\/wait.h>\n #include <sys\/types.h>\n #include <sys\/socket.h>\n"} {"commit":"4d590e7278cda29d656f1c4a37f0f4162ae7a83f","subject":"remove prototypes that are never defined from Bounds.h (bounds_of_expr() and Interval::Interval())","message":"remove prototypes that are never defined from Bounds.h (bounds_of_expr() and Interval::Interval())\n","repos":"gchauras\/Halide,fengzhyuan\/Halide,lglucin\/Halide,dan-tull\/Halide,gchauras\/Halide,aam\/Halide,dougkwan\/Halide,lglucin\/Halide,ronen\/Halide,delcypher\/Halide,jiawen\/Halide,gchauras\/Halide,gchauras\/Halide,kgnk\/Halide,damienfir\/Halide,smxlong\/Halide,dougkwan\/Halide,delcypher\/Halide,adasworks\/Halide,ayanazmat\/Halide,adasworks\/Halide,dan-tull\/Halide,mikeseven\/Halide,ayanazmat\/Halide,jiawen\/Halide,fengzhyuan\/Halide,psuriana\/Halide,mcanthony\/Halide,smxlong\/Halide,smxlong\/Halide,mikeseven\/Halide,rodrigob\/Halide,mcanthony\/Halide,tdenniston\/Halide,tdenniston\/Halide,mcanthony\/Halide,ayanazmat\/Halide,fengzhyuan\/Halide,tdenniston\/Halide,dougkwan\/Halide,dougkwan\/Halide,fengzhyuan\/Halide,smxlong\/Halide,jiawen\/Halide,kenkuang1213\/Halide,dougkwan\/Halide,dan-tull\/Halide,mcanthony\/Halide,ayanazmat\/Halide,tdenniston\/Halide,adasworks\/Halide,damienfir\/Halide,kgnk\/Halide,delcypher\/Halide,ayanazmat\/Halide,aam\/Halide,ronen\/Halide,mikeseven\/Halide,mcanthony\/Halide,delcypher\/Halide,dan-tull\/Halide,jiawen\/Halide,ayanazmat\/Halide,kenkuang1213\/Halide,kgnk\/Halide,delcypher\/Halide,rodrigob\/Halide,smxlong\/Halide,psuriana\/Halide,fengzhyuan\/Halide,tdenniston\/Halide,fengzhyuan\/Halide,dougkwan\/Halide,damienfir\/Halide,delcypher\/Halide,rodrigob\/Halide,lglucin\/Halide,adasworks\/Halide,kenkuang1213\/Halide,dougkwan\/Halide,smxlong\/Halide,dan-tull\/Halide,aam\/Halide,psuriana\/Halide,kgnk\/Halide,rodrigob\/Halide,adasworks\/Halide,tdenniston\/Halide,gchauras\/Halide,ayanazmat\/Halide,ronen\/Halide,aam\/Halide,gchauras\/Halide,tdenniston\/Halide,aam\/Halide,kgnk\/Halide,rodrigob\/Halide,lglucin\/Halide,myrtleTree33\/Halide,damienfir\/Halide,ayanazmat\/Halide,rodrigob\/Halide,smxlong\/Halide,ronen\/Halide,myrtleTree33\/Halide,mikeseven\/Halide,aam\/Halide,myrtleTree33\/Halide,delcypher\/Halide,myrtleTree33\/Halide,mcanthony\/Halide,dan-tull\/Halide,ronen\/Halide,mcanthony\/Halide,adasworks\/Halide,ronen\/Halide,jiawen\/Halide,damienfir\/Halide,dougkwan\/Halide,fengzhyuan\/Halide,aam\/Halide,ronen\/Halide,jiawen\/Halide,tdenniston\/Halide,ronen\/Halide,kenkuang1213\/Halide,dan-tull\/Halide,mcanthony\/Halide,adasworks\/Halide,damienfir\/Halide,rodrigob\/Halide,lglucin\/Halide,myrtleTree33\/Halide,psuriana\/Halide,mikeseven\/Halide,myrtleTree33\/Halide,psuriana\/Halide,damienfir\/Halide,jiawen\/Halide,adasworks\/Halide,delcypher\/Halide,kgnk\/Halide,kenkuang1213\/Halide,dan-tull\/Halide,psuriana\/Halide,fengzhyuan\/Halide,kenkuang1213\/Halide,smxlong\/Halide,rodrigob\/Halide,kgnk\/Halide,kenkuang1213\/Halide,damienfir\/Halide,myrtleTree33\/Halide,kenkuang1213\/Halide,lglucin\/Halide,psuriana\/Halide,myrtleTree33\/Halide,kgnk\/Halide,lglucin\/Halide","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/Bounds.h\n+++ src\/Bounds.h\n@@ -18,7 +18,6 @@\n struct Interval {\n Expr min, max;\n Interval(Expr min, Expr max) : min(min), max(max) {}\n- Interval();\n };\n \n \/** Given an expression in some variables, and a map from those\n@@ -32,9 +31,6 @@\n * loaded by a chunk of code.\n *\/\n Interval bounds_of_expr_in_scope(Expr expr, const Scope<Interval> &scope); \n-\n-\/** Call bounds_of_expr_in_scope with an empty scope *\/\n-Interval bounds_of_expr(Expr expr);\n \n \/** Compute rectangular domains large enough to cover all the 'Call's\n * to each function that occurs within a given statement. This is\n"} {"commit":"cc5dff8f369c52e823ed75ac729f85de4f3a9a66","subject":"Make tinyformat errors raise an exception instead of assert()ing","message":"Make tinyformat errors raise an exception instead of assert()ing\n\nBy default tinyformat errors such as 'wrong number of conversion\nspecifiers in format string' cause an assertion failure.\n\nRaise an exception instead so that error handling can recover or can\nshow an appropriate error.\n","repos":"pinkmagicdev\/SwagBucks,som4paul\/BolieC,CoinBlack\/bitcoin,AquariusNetwork\/ARCO,Whitecoin-org\/Whitecoin,landcoin-ldc\/landcoin,dopecoin-dev\/DopeCoinGold,iadix\/iadixcoin,elambert2014\/cbx2,dopecoin-dev\/DopeCoinGold,Whitecoin-org\/Whitecoin,AquariusNetwork\/ARCOv2,VsyncCrypto\/Vsync,TheoremCrypto\/TheoremCoin,CoinBlack\/blackcoin,landcoin-ldc\/landcoin,ALEXIUMCOIN\/alexium,rat4\/blackcoin,CoinBlack\/bitcoin,LanaCoin\/lanacoin,AquariusNetwork\/ARCO,landcoin-ldc\/landcoin,som4paul\/BolieC,valorbit\/valorbit-oss,VsyncCrypto\/Vsync,CoinBlack\/blackcoin,dopecoin-dev\/DopeCoinGold,som4paul\/BolieC,CoinBlack\/blackcoin,prodigal-son\/blackcoin,greencoin-dev\/GreenCoinV2,valorbit\/valorbit-oss,CoinBlack\/blackcoin,rat4\/blackcoin,CoinBlack\/bitcoin,lateminer\/DopeCoinGold,landcoin-ldc\/landcoin,prodigal-son\/blackcoin,ALEXIUMCOIN\/alexium,som4paul\/BolieC,dopecoin-dev\/DopeCoinGold,xranby\/blackcoin,LanaCoin\/lanacoin,prodigal-son\/blackcoin,blackcoinhelp\/blackcoin,landcoin-ldc\/landcoin,LanaCoin\/lanacoin,xranby\/blackcoin,ALEXIUMCOIN\/alexium,TheoremCrypto\/TheoremCoin,iadix\/iadixcoin,iadix\/iadixcoin,valorbit\/valorbit-oss,ALEXIUMCOIN\/alexium,dopecoin-dev\/DopeCoinGold,elambert2014\/cbx2,Whitecoin-org\/Whitecoin,lateminer\/DopeCoinGold,valorbit\/valorbit,TheoremCrypto\/TheoremCoin,elambert2014\/cbx2,iadix\/iadixcoin,vectorcoindev\/Vector,pinkmagicdev\/SwagBucks,valorbit\/valorbit,xranby\/blackcoin,AquariusNetwork\/ARCOv2,elambert2014\/cbx2,iadix\/iadixcoin,Whitecoin-org\/Whitecoin,AquariusNetwork\/ARCOv2,TheoremCrypto\/TheoremCoin,ALEXIUMCOIN\/alexium,vectorcoindev\/Vector,valorbit\/valorbit,rat4\/blackcoin,vectorcoindev\/Vector,iadix\/iadixcoin,blackcoinhelp\/blackcoin,VsyncCrypto\/Vsync,AquariusNetwork\/ARCO,vectorcoindev\/Vector,iadix\/iadixcoin,lateminer\/DopeCoinGold,CoinBlack\/bitcoin,rat4\/blackcoin,VsyncCrypto\/Vsync,pinkmagicdev\/SwagBucks,vectorcoindev\/Vector,prodigal-son\/blackcoin,greencoin-dev\/GreenCoinV2,lateminer\/DopeCoinGold,pinkmagicdev\/SwagBucks,greencoin-dev\/GreenCoinV2,TheoremCrypto\/TheoremCoin,valorbit\/valorbit-oss,AquariusNetwork\/ARCOv2,valorbit\/valorbit,xranby\/blackcoin,valorbit\/valorbit,AquariusNetwork\/ARCO,greencoin-dev\/GreenCoinV2,rat4\/blackcoin,iadix\/iadixcoin,som4paul\/BolieC,VsyncCrypto\/Vsync,AquariusNetwork\/ARCO,iadix\/iadixcoin,iadix\/iadixcoin,elambert2014\/cbx2,greencoin-dev\/GreenCoinV2,LanaCoin\/lanacoin,CoinBlack\/bitcoin,valorbit\/valorbit-oss,blackcoinhelp\/blackcoin,AquariusNetwork\/ARCOv2,LanaCoin\/lanacoin,blackcoinhelp\/blackcoin,lateminer\/DopeCoinGold,CoinBlack\/bitcoin,CoinBlack\/blackcoin,prodigal-son\/blackcoin,Whitecoin-org\/Whitecoin,pinkmagicdev\/SwagBucks,iadix\/iadixcoin,blackcoinhelp\/blackcoin","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/tinyformat.h\n+++ src\/tinyformat.h\n@@ -109,7 +109,7 @@\n namespace tfm = tinyformat;\n \n \/\/ Error handling; calls assert() by default.\n-\/\/ #define TINYFORMAT_ERROR(reasonString) your_error_handler(reasonString)\n+#define TINYFORMAT_ERROR(reasonString) throw std::runtime_error(reasonString)\n \n \/\/ Define for C++11 variadic templates which make the code shorter & more\n \/\/ general. If you don't define this, C++11 support is autodetected below.\n@@ -121,6 +121,7 @@\n #include <cassert>\n #include <iostream>\n #include <sstream>\n+#include <stdexcept>\n \n #ifndef TINYFORMAT_ERROR\n # define TINYFORMAT_ERROR(reason) assert(0 && reason)\n"} {"commit":"e96f44a6b7f6201fb9af2b0398ea40c7896defb3","subject":"optimize ","message":"optimize ","repos":"zsummer\/proto4z,zsummer\/proto4z,zsummer\/proto4z","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- proto4z.h\n+++ proto4z.h\n@@ -354,11 +354,15 @@\n {\n \tInteger totalCount = 0;\n \trs >> totalCount;\n-\tfor (Integer i = 0; i < totalCount; ++i)\n-\t{\n-\t\tT t;\n-\t\trs >> t;\n-\t\tvct.push_back(t);\n+\tif (totalCount > 0)\n+\t{\n+\t\tvct.reserve(totalCount);\n+\t\tfor (Integer i = 0; i < totalCount; ++i)\n+\t\t{\n+\t\t\tT t;\n+\t\t\trs >> t;\n+\t\t\tvct.push_back(t);\n+\t\t}\n \t}\n \treturn rs;\n }\n"} {"commit":"e26b5ffdb33fb9e9d3ffd3fe6829ebc376d52afd","subject":"Munge OpenCL program further.","message":"Munge OpenCL program further.\n\nAfter some eyeballing, seeing how stream processing is \/massively SIMD\/,\nhaving the leader\/local scenario is massively unoptimal.\n","repos":"jmorse\/worms,jmorse\/worms","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- program.c\n+++ program.c\n@@ -1,28 +1,12 @@\n-void group_leader(__global char *match_configs, __global char *output)\n+__kernel void start_trampoline(__global char *match_configs,\n+\t\t\t\t__global char *output)\n {\n+\n \t__private unsigned int i;\n \tfor (i = 0; i < 256; i++) {\n \t\toutput[i] = i;\n \t}\n \twrite_mem_fence(CLK_GLOBAL_MEM_FENCE);\n \treturn;\n+\n }\n-\n-void group_worker(__global char *match_configs)\n-{\n-\treturn;\n-}\n-\n-__kernel void start_trampoline(__global char *match_configs,\n-\t\t\t\t__global char *output)\n-{\n-\t__local char rts[760];\n-\t__local char cts[760];\n-\n-\tif (get_local_id(0) == 0)\n-\t\tgroup_leader(match_configs, output);\n-\telse\n-\t\tgroup_worker(match_configs);\n-\n-\treturn;\n-}\n"} {"commit":"43b3640836a877db63c1397d059ad62b40925de2","subject":"Slight code cleanup","message":"Slight code cleanup\n","repos":"icing\/nghttp2,dxq-git\/nghttp2,minhoryang\/nghttp2,minhoryang\/nghttp2,lukw00\/nghttp2,bxshi\/nghttp2,icing\/nghttp2,mixianghang\/nghttp2,ohyeah521\/nghttp2,mixianghang\/nghttp2,yuki-kodama\/nghttp2,bxshi\/nghttp2,icing\/nghttp2,kelbyludwig\/nghttp2,thinred\/nghttp2,ohyeah521\/nghttp2,thinred\/nghttp2,shines77\/nghttp2,yuki-kodama\/nghttp2,dxq-git\/nghttp2,thinred\/nghttp2,minhoryang\/nghttp2,mixianghang\/nghttp2,wzyboy\/nghttp2,wzyboy\/nghttp2,yuki-kodama\/nghttp2,mixianghang\/nghttp2,ohyeah521\/nghttp2,mixianghang\/nghttp2,wzyboy\/nghttp2,kelbyludwig\/nghttp2,dxq-git\/nghttp2,serioussam\/nghttp2,thinred\/nghttp2,wzyboy\/nghttp2,minhoryang\/nghttp2,mixianghang\/nghttp2,icing\/nghttp2,icing\/nghttp2,icing\/nghttp2,ohyeah521\/nghttp2,minhoryang\/nghttp2,dxq-git\/nghttp2,icing\/nghttp2,bxshi\/nghttp2,kelbyludwig\/nghttp2,serioussam\/nghttp2,shines77\/nghttp2,ohyeah521\/nghttp2,serioussam\/nghttp2,kelbyludwig\/nghttp2,lukw00\/nghttp2,lukw00\/nghttp2,serioussam\/nghttp2,shines77\/nghttp2,dxq-git\/nghttp2,lukw00\/nghttp2,shines77\/nghttp2,ohyeah521\/nghttp2,thinred\/nghttp2,bxshi\/nghttp2,lukw00\/nghttp2,wzyboy\/nghttp2,serioussam\/nghttp2,shines77\/nghttp2,wzyboy\/nghttp2,bxshi\/nghttp2,thinred\/nghttp2,yuki-kodama\/nghttp2,yuki-kodama\/nghttp2,kelbyludwig\/nghttp2,wzyboy\/nghttp2,thinred\/nghttp2,dxq-git\/nghttp2,yuki-kodama\/nghttp2,lukw00\/nghttp2,minhoryang\/nghttp2,kelbyludwig\/nghttp2,bxshi\/nghttp2,shines77\/nghttp2,lukw00\/nghttp2,serioussam\/nghttp2,serioussam\/nghttp2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/nghttp2_stream.c\n+++ lib\/nghttp2_stream.c\n@@ -202,9 +202,9 @@\n if (si->dpri != NGHTTP2_STREAM_DPRI_REST) {\n si->effective_weight =\n nghttp2_stream_dep_distributed_effective_weight(stream, si->weight);\n- }\n-\n- stream_update_dep_effective_weight(si);\n+\n+ stream_update_dep_effective_weight(si);\n+ }\n }\n }\n \n@@ -311,7 +311,6 @@\n *\/\n static int stream_update_dep_sum_norest_weight(nghttp2_stream *stream) {\n nghttp2_stream *si;\n- int rv;\n \n stream->sum_norest_weight = 0;\n \n@@ -323,17 +322,14 @@\n return 0;\n }\n \n- rv = 0;\n-\n for (si = stream->dep_next; si; si = si->sib_next) {\n \n if (stream_update_dep_sum_norest_weight(si)) {\n- rv = 1;\n stream->sum_norest_weight += si->weight;\n }\n }\n \n- return rv;\n+ return stream->sum_norest_weight > 0;\n }\n \n static int stream_update_dep_on_attach_item(nghttp2_stream *stream,\n"} {"commit":"92a73a9a543e9ec8b1697e71b71e8f3ac1f6ab06","subject":"lib\/package_unpack.c: remove redundant assertions.","message":"lib\/package_unpack.c: remove redundant assertions.\n","repos":"datenwolf\/xbps,datenwolf\/xbps,ebfe\/xbps,ebfe\/xbps,ebfe\/xbps,datenwolf\/xbps,stpx\/xbps,stpx\/xbps,stpx\/xbps","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/package_unpack.c\n+++ lib\/package_unpack.c\n@@ -68,8 +68,6 @@\n \tconst char *pkgfile, *tgt = NULL;\n \tchar *rfile;\n \n-\tassert(d);\n-\n \tlinks = xbps_dictionary_get(d, \"links\");\n \tfor (unsigned int i = 0; i < xbps_array_count(links); i++) {\n \t\trfile = strchr(file, '.') + 1;\n@@ -181,9 +179,6 @@\n \tbool preserve, update, conf_file, file_exists, skip_obsoletes;\n \tbool skip_extract, force, metafile, xucd_stats;\n \tuid_t euid;\n-\n-\tassert(xbps_object_type(pkg_repod) == XBPS_TYPE_DICTIONARY);\n-\tassert(ar != NULL);\n \n \tpropsd = filesd = old_filesd = NULL;\n \tforce = preserve = update = conf_file = file_exists = false;\n"} {"commit":"357885808d7427ae706389cf3021bf44411744a1","subject":"NIST SP800-126 errata unified namespaces for arf vocabulary, let's use the new variant","message":"NIST SP800-126 errata unified namespaces for arf vocabulary, let's use the new variant\n\nResolves:\nWARN : SCHEMATRON - [G2.R3010.results_arf.xml] NIST SP800-126 errata has updated the \"arf-rel\" namespace to http:\/\/scap.nist.gov\/specifications\/arf\/vocabulary\/relationships\/1.0# The original namespace of http:\/\/scap.nist.gov\/vocabulary\/arf\/relationships\/1.0# has been detected.\n","repos":"Hexadorsimal\/openscap,Hexadorsimal\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,mpreisler\/openscap,OpenSCAP\/openscap,redhatrises\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,mpreisler\/openscap,OpenSCAP\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,mpreisler\/openscap,redhatrises\/openscap,redhatrises\/openscap,redhatrises\/openscap,mpreisler\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/DS\/rds.c\n+++ src\/DS\/rds.c\n@@ -53,7 +53,6 @@\n static const char* arf_ns_uri = \"http:\/\/scap.nist.gov\/schema\/asset-reporting-format\/1.1\";\n static const char* core_ns_uri = \"http:\/\/scap.nist.gov\/schema\/reporting-core\/1.1\";\n static const char* arfvocab_ns_uri = \"http:\/\/scap.nist.gov\/specifications\/arf\/vocabulary\/relationships\/1.0#\";\n-static const char* arfrel_ns_uri = \"http:\/\/scap.nist.gov\/vocabulary\/arf\/relationships\/1.0#\";\n static const char* ai_ns_uri = \"http:\/\/scap.nist.gov\/schema\/asset-identification\/1.1\";\n \n xmlNode *ds_rds_lookup_container(xmlDocPtr doc, const char *container_name)\n@@ -608,7 +607,7 @@\n \n \t\txmlNodePtr asset = ds_rds_add_ai_from_xccdf_results(doc, assets, xccdf_result_file_doc);\n \t\tchar* asset_id = (char*)xmlGetProp(asset, BAD_CAST \"id\");\n-\t\tds_rds_add_relationship(doc, relationships, \"arfrel:isAbout\",\n+\t\tds_rds_add_relationship(doc, relationships, \"arfvocab:isAbout\",\n \t\t\t\t\"xccdf1\", asset_id);\n \n \t\t\/\/ We deliberately don't act on errors in inject refs as\n@@ -652,7 +651,7 @@\n \n \t\t\txmlNodePtr asset = ds_rds_add_ai_from_xccdf_results(doc, assets, wrap_doc);\n \t\t\tchar* asset_id = (char*)xmlGetProp(asset, BAD_CAST \"id\");\n-\t\t\tds_rds_add_relationship(doc, relationships, \"arfrel:isAbout\",\n+\t\t\tds_rds_add_relationship(doc, relationships, \"arfvocab:isAbout\",\n \t\t\t\t\treport_id, asset_id);\n \n \t\t\t\/\/ We deliberately don't act on errors in inject ref as\n@@ -694,7 +693,6 @@\n \n \txmlNodePtr relationships = xmlNewNode(core_ns, BAD_CAST \"relationships\");\n \txmlNewNs(relationships, BAD_CAST arfvocab_ns_uri, BAD_CAST \"arfvocab\");\n-\txmlNewNs(relationships, BAD_CAST arfrel_ns_uri, BAD_CAST \"arfrel\");\n \txmlAddChild(root, relationships);\n \n \txmlNodePtr report_requests = xmlNewNode(arf_ns, BAD_CAST \"report-requests\");\n"} {"commit":"78d554bd49c40b8ca7218db3e87f9d8722e0cf31","subject":"Added name mangling for file paths in SDS composition","message":"Added name mangling for file paths in SDS composition\n\nThis should deal with all the cases where path separators \"leak\" into\nthe component or component-ref ids. We do not demangle these mangled\nids! Since the paths are taken from catalog there is no need for\ndemangling except for the source XCCDF.\n","repos":"postfix\/openscap,ybznek\/openscap,redhatrises\/openscap,ybznek\/openscap,isimluk\/openscap,openprivacy\/openscap,postfix\/openscap,Hexadorsimal\/openscap,mpreisler\/openscap,mpreisler\/openscap,isimluk\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,isimluk\/openscap,openprivacy\/openscap,openprivacy\/openscap,redhatrises\/openscap,isimluk\/openscap,ybznek\/openscap,redhatrises\/openscap,isimluk\/openscap,OpenSCAP\/openscap,mpreisler\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,postfix\/openscap,mpreisler\/openscap,jan-cerny\/openscap,postfix\/openscap,openprivacy\/openscap,ybznek\/openscap,ybznek\/openscap,postfix\/openscap,postfix\/openscap,redhatrises\/openscap,openprivacy\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,redhatrises\/openscap,isimluk\/openscap,Hexadorsimal\/openscap,mpreisler\/openscap,OpenSCAP\/openscap,OpenSCAP\/openscap,jan-cerny\/openscap,openprivacy\/openscap,ybznek\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,jan-cerny\/openscap,redhatrises\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/DS\/sds.c\n+++ src\/DS\/sds.c\n@@ -583,6 +583,40 @@\n \treturn result;\n }\n \n+\/\/ takes given relative filepath and mangles it so that it's acceptable\n+\/\/ as a component id\n+static char* ds_sds_mangle_filepath(const char* filepath)\n+{\n+\tif (filepath == NULL)\n+\t\treturn NULL;\n+\n+\t\/\/ the string will grow 2x the size in the worst case (every char is \/)\n+\t\/\/ TODO: We can do better than this by counting the slashes\n+\tchar* ret = oscap_alloc(strlen(filepath) * sizeof(char) * 2);\n+\n+\tconst char* src_it = filepath;\n+\tchar* dst_it = ret;\n+\n+\twhile (*src_it)\n+\t{\n+\t\tif (*src_it == '\/')\n+\t\t{\n+\t\t\t*dst_it++ = '-';\n+\t\t\t*dst_it++ = '-';\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\t*dst_it++ = *src_it;\n+\t\t}\n+\n+\t\tsrc_it++;\n+\t}\n+\n+\t*dst_it = '\\0';\n+\n+\treturn ret;\n+}\n+\n static int ds_sds_compose_add_component_with_ref(xmlDocPtr doc, xmlNodePtr datastream, const char* filepath, const char* cref_id);\n \n static int ds_sds_compose_add_xccdf_dependencies(xmlDocPtr doc, xmlNodePtr datastream, const char* filepath, xmlNodePtr catalog)\n@@ -641,7 +675,10 @@\n \t\t\t\tchar* real_path = (strcmp(dir, \"\") == 0 || strcmp(dir, \".\") == 0) ?\n \t\t\t\t\toscap_strdup(href) : oscap_sprintf(\"%s\/%s\", dir, href);\n \n-\t\t\t\tchar* cref_id = oscap_sprintf(\"scap_org.open-scap_cref_%s\", real_path);\n+\t\t\t\tchar* mangled_path = ds_sds_mangle_filepath(real_path);\n+\t\t\t\tchar* cref_id = oscap_sprintf(\"scap_org.open-scap_cref_%s\", mangled_path);\n+\t\t\t\toscap_free(mangled_path);\n+\n \t\t\t\tchar* uri = oscap_sprintf(\"#%s\", cref_id);\n \n \t\t\t\t\/\/ we don't want duplicated uri elements in the catalog\n@@ -756,7 +793,10 @@\n \t\treturn -1;\n \t}\n \n-\tchar* comp_id = oscap_sprintf(\"scap_org.open-scap_comp_%s\", filepath);\n+\tchar* mangled_filepath = ds_sds_mangle_filepath(filepath);\n+\tchar* comp_id = oscap_sprintf(\"scap_org.open-scap_comp_%s\", mangled_filepath);\n+\toscap_free(mangled_filepath);\n+\n \tds_sds_compose_add_component(doc, datastream, filepath, comp_id);\n \n \txmlNodePtr cref = xmlNewNode(ds_ns, BAD_CAST \"component-ref\");\n@@ -821,7 +861,8 @@\n \t\/\/ component-ref\n \txmlNewNs(root, BAD_CAST xlink_ns_uri, BAD_CAST \"xlink\");\n \n-\tchar* collection_id = oscap_sprintf(\"scap_org.open-scap_collection_from_xccdf_%s\", xccdf_file);\n+\tchar* mangled_xccdf_file = ds_sds_mangle_filepath(xccdf_file);\n+\tchar* collection_id = oscap_sprintf(\"scap_org.open-scap_collection_from_xccdf_%s\", mangled_xccdf_file);\n \txmlSetProp(root, BAD_CAST \"id\", BAD_CAST collection_id);\n \toscap_free(collection_id);\n \n@@ -834,7 +875,7 @@\n \txmlNodePtr datastream = xmlNewNode(ds_ns, BAD_CAST \"data-stream\");\n \txmlAddChild(root, datastream);\n \n-\tchar* datastream_id = oscap_sprintf(\"scap_org.open-scap_datastream_from_xccdf_%s\", xccdf_file);\n+\tchar* datastream_id = oscap_sprintf(\"scap_org.open-scap_datastream_from_xccdf_%s\", mangled_xccdf_file);\n \txmlSetProp(datastream, BAD_CAST \"id\", BAD_CAST datastream_id);\n \toscap_free(datastream_id);\n \n@@ -854,7 +895,7 @@\n \txmlNodePtr extended_components = xmlNewNode(ds_ns, BAD_CAST \"extended-components\");\n \txmlAddChild(datastream, extended_components);\n \n-\tchar* cref_id = oscap_sprintf(\"scap_org.open-scap_cref_%s\", xccdf_file);\n+\tchar* cref_id = oscap_sprintf(\"scap_org.open-scap_cref_%s\", mangled_xccdf_file);\n \tif (ds_sds_compose_add_component_with_ref(doc, datastream, xccdf_file, cref_id) != 0)\n \t{\n \t\t\/\/ oscap_seterr already called\n@@ -888,6 +929,8 @@\n \t\txmlFreeNode(extended_components);\n \t}\n \n+\toscap_free(mangled_xccdf_file);\n+\n \tif (xmlSaveFileEnc(target_datastream, doc, \"utf-8\") == -1)\n \t{\n \t\toscap_seterr(OSCAP_EFAMILY_GLIBC, \"Error saving source datastream to '%s'.\", target_datastream);\n"} {"commit":"e1a2c7feff4e2952bd7a54919569690aa4139295","subject":"Define a ${pwd} macro, it's usefull for ad-hoc tests","message":"Define a ${pwd} macro, it's usefull for ad-hoc tests\n","repos":"wikimedia\/operations-debs-varnish,1HLtd\/Varnish-Cache,ssm\/pkg-varnish,zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,ambernetas\/varnish-cache,alarky\/varnish-cache-doc-ja,1HLtd\/Varnish-Cache,zhoualbeart\/Varnish-Cache,feld\/Varnish-Cache,alarky\/varnish-cache-doc-ja,gquintard\/Varnish-Cache,wikimedia\/operations-debs-varnish,gquintard\/Varnish-Cache,mrhmouse\/Varnish-Cache,ambernetas\/varnish-cache,franciscovg\/Varnish-Cache,drwilco\/varnish-cache-drwilco,ssm\/pkg-varnish,feld\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,alarky\/varnish-cache-doc-ja,chrismoulton\/Varnish-Cache,1HLtd\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,varnish\/Varnish-Cache,drwilco\/varnish-cache-old,alarky\/varnish-cache-doc-ja,feld\/Varnish-Cache,gquintard\/Varnish-Cache,mrhmouse\/Varnish-Cache,ssm\/pkg-varnish,franciscovg\/Varnish-Cache,drwilco\/varnish-cache-drwilco,ssm\/pkg-varnish,mrhmouse\/Varnish-Cache,1HLtd\/Varnish-Cache,wikimedia\/operations-debs-varnish,gauthier-delacroix\/Varnish-Cache,varnish\/Varnish-Cache,drwilco\/varnish-cache-drwilco,ambernetas\/varnish-cache,varnish\/Varnish-Cache,chrismoulton\/Varnish-Cache,alarky\/varnish-cache-doc-ja,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,zhoualbeart\/Varnish-Cache,wikimedia\/operations-debs-varnish,drwilco\/varnish-cache-old,wikimedia\/operations-debs-varnish,zhoualbeart\/Varnish-Cache,zhoualbeart\/Varnish-Cache,drwilco\/varnish-cache-old,varnish\/Varnish-Cache,ssm\/pkg-varnish,gquintard\/Varnish-Cache,franciscovg\/Varnish-Cache,mrhmouse\/Varnish-Cache,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,chrismoulton\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- bin\/varnishtest\/vtc.c\n+++ bin\/varnishtest\/vtc.c\n@@ -492,6 +492,9 @@\n \tbprintf(topbuild, \"%s\/%s\", cwd, TOP_BUILDDIR);\n \tmacro_def(vltop, NULL, \"topbuild\", topbuild);\n \n+\tAN(getcwd(topbuild, sizeof topbuild));\n+\tmacro_def(vltop, NULL, \"pwd\", topbuild);\n+\n \tmacro_def(vltop, NULL, \"bad_ip\", \"10.255.255.255\");\n \n \t\/* Move into our tmpdir *\/\n"} {"commit":"e52bf1d1644867f2b8d94a5894b5e3052deb02ed","subject":"Bug 629816: Add a comment to explain the max oid length of 9. r=rrelyea.","message":"Bug 629816: Add a comment to explain the max oid length of 9. r=rrelyea.\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- lib\/pkcs7\/certread.c\n+++ lib\/pkcs7\/certread.c\n@@ -168,6 +168,7 @@\n * reference in the code below:\n * 0x30 0x84 l1 l2 l3 l4 +\n * tag 9 o1 o2 o3 o4 o5 o6 o7 o8 o9\n+ * where 9 is the longest length of the expected oids we are testing.\n * 6 + 11 = 17. 17 bytes is clearly too small to code any kind of\n * certificate (a 128 bit ECC certificate contains at least an 8 byte\n * key and a 16 byte signature, plus coding overhead). Typically a cert\n@@ -258,9 +259,11 @@\n \t \n \t switch ( oiddata->offset ) {\n \t case SEC_OID_PKCS7_SIGNED_DATA:\n+\t\t\/* oid: 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02 *\/\n \t\treturn(SEC_ReadPKCS7Certs(&certitem, f, arg));\n \t\tbreak;\n \t case SEC_OID_NS_TYPE_CERT_SEQUENCE:\n+\t\t\/* oid: 0x60, 0x86, 0x48, 0x01, 0x86, 0xf8, 0x42, 0x02, 0x05 *\/\n \t\treturn(SEC_ReadCertSequence(&certitem, f, arg));\n \t\tbreak;\n \t default:\n"} {"commit":"032c8cacc702da8a53c24d24a4e3c3a572a34078","subject":"crypto: testmgr - remove double execution of the same test suite","message":"crypto: testmgr - remove double execution of the same test suite\n\nThis patch removes redundant execution of the same test suite in cases\nwhere alg and driver variables are the same (e.g. when alg_test is\ncalled from tcrypt_test)\n\nSigned-off-by: Cristian Stoica <9690e45bc497604079ad964f33a740f6fe85c6ed@freescale.com>\nReviewed-by: Horia Geanta <6135224f23789828bd8d3b771a2745286516a2b5@freescale.com>\nReviewed-by: Ruchika Gupta <7453943058cfffff716a48744f199da12f4a1770@freescale.com>\nSigned-off-by: Herbert Xu <ef65de1c7be0aa837fe7b25ba9a7739905af6a55@gondor.apana.org.au>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- crypto\/testmgr.c\n+++ crypto\/testmgr.c\n@@ -3234,7 +3234,7 @@\n \tif (i >= 0)\n \t\trc |= alg_test_descs[i].test(alg_test_descs + i, driver,\n \t\t\t\t\t type, mask);\n-\tif (j >= 0)\n+\tif (j >= 0 && j != i)\n \t\trc |= alg_test_descs[j].test(alg_test_descs + j, driver,\n \t\t\t\t\t type, mask);\n \n"} {"commit":"369806216adcc44c4e0eef908eed7f3d113ca31f","subject":"Moved a part of the set_auto_path function back into plserver.c where it belonged (adding directories to auto_path based on an input flag).","message":"Moved a part of the set_auto_path function back into plserver.c where\nit belonged (adding directories to auto_path based on an input flag).\n\nsvn path=\/trunk\/; revision=634\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- bindings\/tk\/tkshell.c\n+++ bindings\/tk\/tkshell.c\n@@ -1,6 +1,10 @@\n \/* $Id$\n * $Log$\n- * Revision 1.7 1993\/12\/15 09:05:43 mjl\n+ * Revision 1.8 1993\/12\/21 10:32:04 mjl\n+ * Moved a part of the set_auto_path function back into plserver.c where\n+ * it belonged (adding directories to auto_path based on an input flag).\n+ *\n+ * Revision 1.7 1993\/12\/15 09:05:43 mjl\n * Added functions Tcl_AppInit() and set_autoload(), to be shared by both\n * the plserver and tk driver interpreter startup code. Changes to\n * Tcl_AppInit() to support Tcl-DP style communication (taken from Tcl-DP\n@@ -157,8 +161,7 @@\n \n #if (TK_MAJOR_VERSION <= 3) && (TK_MINOR_VERSION <= 2)\n if (tk_source(w, interp, \"$tk_library\/wish.tcl\")) {\n-\tabort_session(\"\");\n-\tTcl_Eval(interp, \"exit\");\n+\treturn TCL_ERROR;\n }\n #else\n if (Tcl_Init(interp) == TCL_ERROR) {\n@@ -262,10 +265,9 @@\n \n \/* Add cwd *\/\n \n- if (getcwd(buf, 256) == NULL) {\n-\tabort_session(\"could not determine cwd\");\n-\tTcl_Eval(interp, \"exit\");\n- }\n+ if (getcwd(buf, 256) == NULL) \n+\treturn TCL_ERROR;\n+\n Tcl_SetVar(interp, \"dir\", buf, 0);\n if (tcl_cmd(interp, \"set auto_path \\\"$dir $auto_path\\\"\") == TCL_ERROR)\n \treturn TCL_ERROR;\n@@ -276,19 +278,6 @@\n fprintf(stderr, \"auto_path is %s\\n\", path);\n #endif\n \n-\/* Add user-specified directory(s) *\/\n-\/*\n- if (auto_path != NULL) {\n-\tTcl_SetVar(interp, \"dir\", auto_path, 0);\n-\tif (tcl_cmd(interp, \"set auto_path \\\"$dir $auto_path\\\"\") == TCL_ERROR)\n-\t return TCL_ERROR;\n-#ifdef DEBUG\n-\tfprintf(stderr, \"adding %s to auto_path\\n\", auto_path);\n-\tpath = Tcl_GetVar(interp, \"auto_path\", 0);\n-\tfprintf(stderr, \"auto_path is %s\\n\", path);\n-#endif\n- }\n-*\/\n free_mem(buf);\n free_mem(ptr);\n \n@@ -306,11 +295,11 @@\n {\n dbug_enter(\"tcl_cmd\");\n #ifdef DEBUG_ENTER\n- fprintf(stderr, \"plserver: evaluating command %s\\n\", cmd);\n+ fprintf(stderr, \"evaluating command %s\\n\", cmd);\n #endif\n \n if (tcl_eval(interp, cmd)) {\n-\tfprintf(stderr, \"plserver: TCL command \\\"%s\\\" failed:\\n\\t %s\\n\",\n+\tfprintf(stderr, \"TCL command \\\"%s\\\" failed:\\n\\t %s\\n\",\n \t\tcmd, interp->result);\n \treturn TCL_ERROR;\n }\n"} {"commit":"04470fc794e738d45b4218f653bf81831b467bde","subject":"basetransform: use new _caps_can_intersect()","message":"basetransform: use new _caps_can_intersect()\n","repos":"centricular\/gstreamer,lubosz\/gstreamer,collects\/gstreamer,mrchapp\/gstreamer,shelsonjava\/gstreamer,ensonic\/gstreamer,shelsonjava\/gstreamer,lubosz\/gstreamer,cablelabs\/gstreamer,collects\/gstreamer,ensonic\/gstreamer,StreamUtils\/gstreamer,collects\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,lubosz\/gstreamer,jpxiong\/gstreamer,StreamUtils\/gstreamer,drothlis\/gstreamer,shelsonjava\/gstreamer,drothlis\/gstreamer,cfoch\/gstreamer,justinjoy\/gstreamer,ylatuya\/gstreamer,lubosz\/gstreamer,mrchapp\/gstreamer,jpxiong\/gstreamer,krichter722\/gstreamer,jpakkane\/gstreamer,shelsonjava\/gstreamer,shelsonjava\/gstreamer,jpakkane\/gstreamer,krieger-od\/gstreamer,cfoch\/gstreamer,surround-io\/gstreamer,Distrotech\/gstreamer,surround-io\/gstreamer,cfoch\/gstreamer,StreamUtils\/gstreamer,krichter722\/gstreamer,ylatuya\/gstreamer,surround-io\/gstreamer,krichter722\/gstreamer,lovebug356\/gstreamer,magcius\/gstreamer,cfoch\/gstreamer,justinjoy\/gstreamer,krieger-od\/gstreamer,mparis\/gstreamer,centricular\/gstreamer,drothlis\/gstreamer,surround-io\/gstreamer,ylatuya\/gstreamer,lovebug356\/gstreamer,collects\/gstreamer,Lachann\/gstreamer,StreamUtils\/gstreamer,justinjoy\/gstreamer,ensonic\/gstreamer,jpakkane\/gstreamer,jpakkane\/gstreamer,magcius\/gstreamer,justinjoy\/gstreamer,lovebug356\/gstreamer,Lachann\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,cablelabs\/gstreamer,mrchapp\/gstreamer,mparis\/gstreamer,Distrotech\/gstreamer,Distrotech\/gstreamer,cablelabs\/gstreamer,mrchapp\/gstreamer,Lachann\/gstreamer,mparis\/gstreamer,centricular\/gstreamer,krichter722\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,jpxiong\/gstreamer,krieger-od\/gstreamer,krichter722\/gstreamer,magcius\/gstreamer,Lachann\/gstreamer,ensonic\/gstreamer,StreamUtils\/gstreamer,magcius\/gstreamer,centricular\/gstreamer,mparis\/gstreamer,magcius\/gstreamer,drothlis\/gstreamer,Distrotech\/gstreamer,jpxiong\/gstreamer,lovebug356\/gstreamer,ensonic\/gstreamer,krieger-od\/gstreamer,jpxiong\/gstreamer,Lachann\/gstreamer,mrchapp\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,cablelabs\/gstreamer,ahmedammar\/platform_external_gst_gstreamer,drothlis\/gstreamer,lubosz\/gstreamer,ylatuya\/gstreamer,mparis\/gstreamer,surround-io\/gstreamer,ylatuya\/gstreamer,krieger-od\/gstreamer,justinjoy\/gstreamer,cfoch\/gstreamer,Distrotech\/gstreamer,lovebug356\/gstreamer,jpakkane\/gstreamer,centricular\/gstreamer,cablelabs\/gstreamer,collects\/gstreamer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/gst\/base\/gstbasetransform.c\n+++ libs\/gst\/base\/gstbasetransform.c\n@@ -719,7 +719,7 @@\n goto no_transform;\n \n \/* check if the out caps is a subset of the othercaps *\/\n- if (!gst_caps_is_subset (out, othercaps))\n+ if (!gst_caps_can_intersect (out, othercaps))\n goto no_subset;\n \n if (othercaps)\n@@ -814,43 +814,36 @@\n * fixed caps *\/\n is_fixed = gst_caps_is_fixed (othercaps);\n if (!is_fixed) {\n- GstCaps *temp;\n-\n GST_DEBUG_OBJECT (trans,\n \"transform returned non fixed %\" GST_PTR_FORMAT, othercaps);\n \n \/* see if the target caps are a superset of the source caps, in this\n * case we can try to perform passthrough *\/\n- temp = gst_caps_intersect (othercaps, caps);\n- GST_DEBUG_OBJECT (trans, \"intersect returned %\" GST_PTR_FORMAT, temp);\n- if (temp) {\n- if (!gst_caps_is_empty (temp)) {\n- GST_DEBUG_OBJECT (trans, \"try passthrough with %\" GST_PTR_FORMAT, caps);\n- if (otherpeer) {\n- \/* try passthrough. we know it's fixed, because caps is fixed *\/\n- if (gst_pad_accept_caps (otherpeer, caps)) {\n- GST_DEBUG_OBJECT (trans, \"peer accepted %\" GST_PTR_FORMAT, caps);\n- \/* peer accepted unmodified caps, we free the original non-fixed\n- * caps and work with the passthrough caps *\/\n- gst_caps_unref (othercaps);\n- othercaps = gst_caps_ref (caps);\n- is_fixed = TRUE;\n- \/* mark that we checked othercaps with the peer, this\n- * makes sure we don't call accept_caps again with these same\n- * caps *\/\n- peer_checked = TRUE;\n- } else {\n- GST_DEBUG_OBJECT (trans,\n- \"peer did not accept %\" GST_PTR_FORMAT, caps);\n- }\n- } else {\n- GST_DEBUG_OBJECT (trans, \"no peer, doing passthrough\");\n+ if (gst_caps_can_intersect (othercaps, caps)) {\n+ GST_DEBUG_OBJECT (trans, \"try passthrough with %\" GST_PTR_FORMAT, caps);\n+ if (otherpeer) {\n+ \/* try passthrough. we know it's fixed, because caps is fixed *\/\n+ if (gst_pad_accept_caps (otherpeer, caps)) {\n+ GST_DEBUG_OBJECT (trans, \"peer accepted %\" GST_PTR_FORMAT, caps);\n+ \/* peer accepted unmodified caps, we free the original non-fixed\n+ * caps and work with the passthrough caps *\/\n gst_caps_unref (othercaps);\n othercaps = gst_caps_ref (caps);\n is_fixed = TRUE;\n+ \/* mark that we checked othercaps with the peer, this\n+ * makes sure we don't call accept_caps again with these same\n+ * caps *\/\n+ peer_checked = TRUE;\n+ } else {\n+ GST_DEBUG_OBJECT (trans,\n+ \"peer did not accept %\" GST_PTR_FORMAT, caps);\n }\n+ } else {\n+ GST_DEBUG_OBJECT (trans, \"no peer, doing passthrough\");\n+ gst_caps_unref (othercaps);\n+ othercaps = gst_caps_ref (caps);\n+ is_fixed = TRUE;\n }\n- gst_caps_unref (temp);\n }\n }\n \n@@ -1004,7 +997,7 @@\n if (!gst_caps_is_fixed (caps))\n #endif\n {\n- GstCaps *allowed, *intersect;\n+ GstCaps *allowed;\n \n GST_DEBUG_OBJECT (pad, \"non fixed accept caps %\" GST_PTR_FORMAT, caps);\n \n@@ -1018,13 +1011,7 @@\n GST_DEBUG_OBJECT (pad, \"allowed caps %\" GST_PTR_FORMAT, allowed);\n \n \/* intersect with the requested format *\/\n- intersect = gst_caps_intersect (allowed, caps);\n-\n- GST_DEBUG_OBJECT (pad, \"intersection %\" GST_PTR_FORMAT, intersect);\n-\n- \/* we can accept if the intersection is not empty *\/\n- ret = !gst_caps_is_empty (intersect);\n- gst_caps_unref (intersect);\n+ ret = gst_caps_can_intersect (allowed, caps);\n gst_caps_unref (allowed);\n \n if (!ret)\n@@ -1560,10 +1547,6 @@\n size_suggest = size;\n suggest = FALSE;\n } else {\n- GstCaps *temp;\n- const GstCaps *templ;\n- gboolean empty;\n-\n GST_DEBUG_OBJECT (trans, \"new format %p %\" GST_PTR_FORMAT, caps, caps);\n \n \/* if we have a suggestion, pretend we got these as input *\/\n@@ -1588,13 +1571,9 @@\n \n \/* check if we actually handle this format on the sinkpad *\/\n if (sink_suggest) {\n- templ = gst_pad_get_pad_template_caps (pad);\n- temp = gst_caps_intersect (sink_suggest, templ);\n-\n- empty = gst_caps_is_empty (temp);\n- gst_caps_unref (temp);\n-\n- if (empty)\n+ const GstCaps *templ = gst_pad_get_pad_template_caps (pad);\n+\n+ if (!gst_caps_can_intersect (sink_suggest, templ))\n goto not_supported;\n }\n \n"} {"commit":"7bbe57e875f29026e008eef9456a20e629f1a84f","subject":"soa\/soa_static.c: fixed whitespace","message":"soa\/soa_static.c: fixed whitespace\n\ndarcs-hash:20081127130425-db55f-9e79c650aec1cbde156471cc83bd27c2fc868c9e.gz\n","repos":"erdincay\/sofia-sip,unispeech\/sofia-sip,unispeech\/sofia-sip,jart\/sofia-sip,xhook\/sofia-sip,jart\/sofia-sip,BelledonneCommunications\/sofia-sip,unispeech\/sofia-sip,xhook\/sofia-sip,xhook\/sofia-sip,erdincay\/sofia-sip,unispeech\/sofia-sip,erdincay\/sofia-sip,jart\/sofia-sip,xhook\/sofia-sip,BelledonneCommunications\/sofia-sip,erdincay\/sofia-sip,BelledonneCommunications\/sofia-sip,xhook\/sofia-sip,BelledonneCommunications\/sofia-sip","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsofia-sip-ua\/soa\/soa_static.c\n+++ libsofia-sip-ua\/soa\/soa_static.c\n@@ -35,11 +35,11 @@\n * a) generating offer (upgrade with user-SDP)\n * b) generating answer (upgrade with remote-SDP, rejects with user-SDP)\n * 2. session exists\n- * a) generating offer: \n+ * a) generating offer:\n * upgrades with user-SDP\n- * b) generating answer: \n+ * b) generating answer:\n * upgrades with remote-SDP, rejects with user-SDP\n- * c) processing answer: \n+ * c) processing answer:\n * rejects with user-SDP, no upgrades\n *\n * Upgrading session with user SDP:\n@@ -101,16 +101,16 @@\n static int soa_static_set_params(soa_session_t *ss, tagi_t const *tags);\n static int soa_static_get_params(soa_session_t const *ss, tagi_t *tags);\n static tagi_t *soa_static_get_paramlist(soa_session_t const *ss,\n-\t\t\t\t\ttag_type_t tag, tag_value_t value, \n+\t\t\t\t\ttag_type_t tag, tag_value_t value,\n \t\t\t\t\t...);\n-static int soa_static_set_capability_sdp(soa_session_t *ss, \n+static int soa_static_set_capability_sdp(soa_session_t *ss,\n \t\t\t\t sdp_session_t *sdp,\n \t\t\t\t char const *, isize_t);\n-static int soa_static_set_remote_sdp(soa_session_t *ss, \n+static int soa_static_set_remote_sdp(soa_session_t *ss,\n \t\t\t\t int new_version,\n \t\t\t\t sdp_session_t *sdp,\n \t\t\t\t char const *, isize_t);\n-static int soa_static_set_user_sdp(soa_session_t *ss, \n+static int soa_static_set_user_sdp(soa_session_t *ss,\n \t\t\t\t sdp_session_t *sdp,\n \t\t\t\t char const *, isize_t);\n static int soa_static_generate_offer(soa_session_t *ss, soa_callback_f *);\n@@ -122,7 +122,7 @@\n static int soa_static_deactivate(soa_session_t *ss, char const *option);\n static void soa_static_terminate(soa_session_t *ss, char const *option);\n \n-struct soa_session_actions const soa_default_actions = \n+struct soa_session_actions const soa_default_actions =\n {\n (sizeof soa_default_actions),\n sizeof (struct soa_static_session),\n@@ -213,7 +213,7 @@\n }\n \n static tagi_t *soa_static_get_paramlist(soa_session_t const *ss,\n-\t\t\t\t\ttag_type_t tag, tag_value_t value, \n+\t\t\t\t\ttag_type_t tag, tag_value_t value,\n \t\t\t\t\t...)\n {\n soa_static_session_t *sss = (soa_static_session_t *)ss;\n@@ -237,28 +237,28 @@\n return tl;\n }\n \n-static int soa_static_set_capability_sdp(soa_session_t *ss, \n+static int soa_static_set_capability_sdp(soa_session_t *ss,\n \t\t\t\t\t sdp_session_t *sdp,\n-\t\t\t\t\t char const *sdp_str, \n+\t\t\t\t\t char const *sdp_str,\n \t\t\t\t\t isize_t sdp_len)\n {\n return soa_base_set_capability_sdp(ss, sdp, sdp_str, sdp_len);\n }\n \n \n-static int soa_static_set_remote_sdp(soa_session_t *ss, \n+static int soa_static_set_remote_sdp(soa_session_t *ss,\n \t\t\t\t int new_version,\n \t\t\t\t sdp_session_t *sdp,\n-\t\t\t\t char const *sdp_str, \n+\t\t\t\t char const *sdp_str,\n \t\t\t\t isize_t sdp_len)\n {\n return soa_base_set_remote_sdp(ss, new_version, sdp, sdp_str, sdp_len);\n }\n \n \n-static int soa_static_set_user_sdp(soa_session_t *ss, \n+static int soa_static_set_user_sdp(soa_session_t *ss,\n \t\t\t\t sdp_session_t *sdp,\n-\t\t\t\t char const *sdp_str, \n+\t\t\t\t char const *sdp_str,\n \t\t\t\t isize_t sdp_len)\n {\n return soa_base_set_user_sdp(ss, sdp, sdp_str, sdp_len);\n@@ -266,7 +266,7 @@\n \n \/** Generate a rejected m= line *\/\n static\n-sdp_media_t *soa_sdp_make_rejected_media(su_home_t *home, \n+sdp_media_t *soa_sdp_make_rejected_media(su_home_t *home,\n \t\t\t\t\t sdp_media_t const *m,\n \t\t\t\t\t sdp_session_t *sdp,\n \t\t\t\t\t int include_all_codecs)\n@@ -317,7 +317,7 @@\n return expanded;\n }\n \n-\/** Check if @a session should be upgraded with @a remote *\/ \n+\/** Check if @a session should be upgraded with @a remote *\/\n int soa_sdp_upgrade_is_needed(sdp_session_t const *session,\n \t\t\t sdp_session_t const *remote)\n {\n@@ -328,7 +328,7 @@\n if (!session)\n return 1;\n \n- for (rm = remote->sdp_media, lm = session->sdp_media; \n+ for (rm = remote->sdp_media, lm = session->sdp_media;\n rm && lm ; rm = rm->m_next, lm = lm->m_next) {\n if (rm->m_rejected)\n continue;\n@@ -394,12 +394,12 @@\n \n \/** Find first matching media in table @a mm.\n *\n- * - if allow_rtp_mismatch == 0, search for a matching codec \n+ * - if allow_rtp_mismatch == 0, search for a matching codec\n * - if allow_rtp_mismatch == 1, prefer m=line with matching codec\n * - if allow_rtp_mismatch > 1, ignore codecs\n *\/\n static\n-int soa_sdp_matching_mindex(soa_session_t *ss, \n+int soa_sdp_matching_mindex(soa_session_t *ss,\n \t\t\t sdp_media_t *mm[],\n \t\t\t sdp_media_t const *with,\n \t\t\t int *return_codec_mismatch)\n@@ -425,11 +425,11 @@\n \n if (!sdp_media_match_with(mm[i], with))\n continue;\n- \n+\n if (!rtp)\n break;\n \n- if (soa_sdp_media_matching_rtpmap(with->m_rtpmaps, \n+ if (soa_sdp_media_matching_rtpmap(with->m_rtpmaps,\n \t\t\t\t mm[i]->m_rtpmaps,\n \t\t\t\t auxiliary))\n break;\n@@ -445,11 +445,11 @@\n }\n \n \/** Set payload types in @a l_m according to the values in @a r_m.\n- * \n+ *\n * @retval number of common codecs\n *\/\n static\n-int soa_sdp_set_rtpmap_pt(sdp_media_t *l_m, \n+int soa_sdp_set_rtpmap_pt(sdp_media_t *l_m,\n \t\t\t sdp_media_t const *r_m)\n {\n sdp_rtpmap_t *lrm, **next_lrm;\n@@ -489,7 +489,7 @@\n lrm->rm_any = 1;\n }\n }\n- \n+\n if (local_codecs == common_codecs)\n return common_codecs;\n \n@@ -511,7 +511,7 @@\n next_lrm = &lrm->rm_next;\n continue;\n }\n- \n+\n lrm->rm_any = 0;\n \n pt = lrm->rm_pt;\n@@ -520,7 +520,7 @@\n for (pt = 96; pt < 128; pt++)\n if (!dynamic_pt[pt])\n break;\n- \n+\n if (pt == 128) {\n for (pt = 0; pt < 128; pt++)\n if (!sdp_rtpmap_well_known[pt] && !dynamic_pt[pt])\n@@ -544,7 +544,7 @@\n }\n \n dynamic_pt[pt] = 1;\n- \n+\n next_lrm = &lrm->rm_next;\n }\n \n@@ -557,7 +557,7 @@\n * @return Number of common codecs\n *\/\n static\n-int soa_sdp_sort_rtpmap(sdp_rtpmap_t **inout_list, \n+int soa_sdp_sort_rtpmap(sdp_rtpmap_t **inout_list,\n \t\t\tsdp_rtpmap_t const *rrm,\n \t\t\tchar const *auxiliary)\n {\n@@ -611,7 +611,7 @@\n * @return Number of common codecs\n *\/\n static\n-int soa_sdp_select_rtpmap(sdp_rtpmap_t **inout_list, \n+int soa_sdp_select_rtpmap(sdp_rtpmap_t **inout_list,\n \t\t\t sdp_rtpmap_t const *rrm,\n \t\t\t char const *auxiliary,\n \t\t\t int select_single)\n@@ -628,7 +628,7 @@\n for (left = inout_list; *left; ) {\n if (auxiliary && soa_sdp_is_auxiliary_codec(*left, auxiliary))\n \/* Insert into list of auxiliary codecs *\/\n- *next_aux = *left, *left = (*left)->rm_next, \n+ *next_aux = *left, *left = (*left)->rm_next,\n \tnext_aux = &(*next_aux)->rm_next;\n else if (!(select_single && common_codecs > 0)\n \t && sdp_rtpmap_find_matching(rrm, (*left)))\n@@ -645,7 +645,7 @@\n }\n \n \n-\/** Sort and select rtpmaps *\/ \n+\/** Sort and select rtpmaps *\/\n static\n int soa_sdp_media_upgrade_rtpmaps(soa_session_t *ss,\n \t\t\t\t sdp_media_t *sm,\n@@ -660,7 +660,7 @@\n if (rm->m_type == sdp_media_audio)\n auxiliary = sss->sss_audio_aux;\n \n- if (ss->ss_rtp_sort == SOA_RTP_SORT_REMOTE || \n+ if (ss->ss_rtp_sort == SOA_RTP_SORT_REMOTE ||\n (ss->ss_rtp_sort == SOA_RTP_SORT_DEFAULT &&\n rm->m_mode == sdp_recvonly)) {\n soa_sdp_sort_rtpmap(&sm->m_rtpmaps, rm->m_rtpmaps, auxiliary);\n@@ -679,7 +679,7 @@\n }\n \n \n-\/** Sort and select rtpmaps within session *\/ \n+\/** Sort and select rtpmaps within session *\/\n static\n int soa_sdp_session_upgrade_rtpmaps(soa_session_t *ss,\n \t\t\t\t sdp_session_t *session,\n@@ -688,8 +688,8 @@\n sdp_media_t *sm;\n sdp_media_t const *rm;\n \n- for (sm = session->sdp_media, rm = remote->sdp_media; \n- sm && rm; \n+ for (sm = session->sdp_media, rm = remote->sdp_media;\n+ sm && rm;\n sm = sm->m_next, rm = rm->m_next) {\n if (!sm->m_rejected && sdp_media_uses_rtp(sm))\n soa_sdp_media_upgrade_rtpmaps(ss, sm, rm);\n@@ -698,7 +698,7 @@\n return 0;\n }\n \n-\/** Upgrade m= lines within session *\/ \n+\/** Upgrade m= lines within session *\/\n static\n int soa_sdp_upgrade(soa_session_t *ss,\n \t\t su_home_t *home,\n@@ -737,7 +737,7 @@\n if (!s_media || !o_media || !u_media || !r_media)\n return -1;\n \n- um = sdp_media_dup_all(home, user->sdp_media, session); \n+ um = sdp_media_dup_all(home, user->sdp_media, session);\n if (!um && user->sdp_media)\n return -1;\n \n@@ -819,7 +819,7 @@\n \tfor (i = 0; i < Ns; i++) {\n \t if (s_media[i])\n \t continue;\n-\t s_media[i] = \n+\t s_media[i] =\n \t soa_sdp_make_rejected_media(home, o_media[i], session, 0);\n \t}\n }\n@@ -905,7 +905,7 @@\n return NULL;\n }\n \n-\/** Check if @a session contains media that are rejected by @a remote. *\/ \n+\/** Check if @a session contains media that are rejected by @a remote. *\/\n static\n int soa_sdp_reject_is_needed(sdp_session_t const *session,\n \t\t\t sdp_session_t const *remote)\n@@ -917,7 +917,7 @@\n if (!session)\n return 0;\n \n- for (sm = session->sdp_media, rm = remote->sdp_media; \n+ for (sm = session->sdp_media, rm = remote->sdp_media;\n sm && rm; sm = sm->m_next, rm = rm->m_next) {\n if (rm->m_rejected) {\n if (!sm->m_rejected)\n@@ -937,7 +937,7 @@\n return 0;\n }\n \n-\/** If m= line is rejected by remote mark m= line rejected within session *\/ \n+\/** If m= line is rejected by remote mark m= line rejected within session *\/\n static\n int soa_sdp_reject(su_home_t *home,\n \t\t sdp_session_t *session,\n@@ -983,7 +983,7 @@\n * @sa soatag_hold\n *\n * @retval 1 if session was changed (or to be changed, if @a dryrun is nonzero)\n- *\/ \n+ *\/\n static\n int soa_sdp_mode_set(sdp_session_t const *user,\n \t\t int const *s2u,\n@@ -1129,7 +1129,7 @@\n if (local && remote) switch (action) {\n case generate_answer:\n case process_answer:\n- if (sdp_media_count(remote, sdp_media_any, \"*\", 0, 0) < \n+ if (sdp_media_count(remote, sdp_media_any, \"*\", 0, 0) <\n \tsdp_media_count(local, sdp_media_any, \"*\", 0, 0)) {\n SU_DEBUG_5((\"%s: remote %s is truncated: expanding\\n\",\n \t\t by, action == generate_answer ? \"offer\" : \"answer\"));\n@@ -1140,7 +1140,7 @@\n default:\n break;\n }\n- \n+\n \/* Step A: Create local SDP session (based on user-supplied SDP) *\/\n if (local == NULL) switch (action) {\n case generate_offer:\n@@ -1156,7 +1156,7 @@\n \/* o->o_address = local->sdp_origin->o_address; *\/\n }\n if (!o->o_address)\n- o->o_address = c0; \n+ o->o_address = c0;\n local->sdp_origin = o;\n \n if (soa_init_sdp_origin(ss, o, c_address) < 0) {\n@@ -1179,7 +1179,7 @@\n break;\n if (local != local0)\n *local0 = *local, local = local0;\n- SU_DEBUG_7((\"soa_static(%p, %s): %s\\n\", (void *)ss, by, \n+ SU_DEBUG_7((\"soa_static(%p, %s): %s\\n\", (void *)ss, by,\n \t\t\"upgrade with local description\"));\n if (soa_sdp_upgrade(ss, tmphome, local, user, NULL, &u2s, &s2u) < 0)\n goto internal_error;\n@@ -1226,7 +1226,7 @@\n \t} while (0)\n \tDUP_LOCAL(local);\n }\n- SU_DEBUG_7((\"soa_static(%p, %s): %s\\n\", (void *)ss, by, \n+ SU_DEBUG_7((\"soa_static(%p, %s): %s\\n\", (void *)ss, by,\n \t\t \"marking rejected media\"));\n soa_sdp_reject(tmphome, local, remote);\n }\n@@ -1269,7 +1269,7 @@\n SU_DEBUG_7((\"soa_static(%p, %s): %s\\n\", (void *)ss, by,\n \t\t \"upgrade codecs with remote description\"));\n if (local != local0) {\n-\t*local0 = *local, local = local0; \n+\t*local0 = *local, local = local0;\n \tDUP_LOCAL(local);\n }\n soa_sdp_session_upgrade_rtpmaps(ss, local, remote);\n@@ -1281,7 +1281,7 @@\n break;\n }\n \n- \/* Step F: Update c= line *\/ \n+ \/* Step F: Update c= line *\/\n switch (action) {\n case generate_offer:\n case generate_answer:\n@@ -1290,12 +1290,12 @@\n \tlocal->sdp_connection)\n break;\n \n- if (local->sdp_connection == NULL || \n-\t(user->sdp_connection != NULL && \n+ if (local->sdp_connection == NULL ||\n+\t(user->sdp_connection != NULL &&\n \t sdp_connection_cmp(local->sdp_connection, user->sdp_connection))) {\n sdp_media_t *m;\n \n- \/* Every m= line (even rejected one) must have a c= line \n+ \/* Every m= line (even rejected one) must have a c= line\n * or there must be a c= line at session level\n *\/\n if (user->sdp_connection)\n@@ -1309,7 +1309,7 @@\n \n if (m) {\n \tif (local != local0) {\n-\t *local0 = *local, local = local0; \n+\t *local0 = *local, local = local0;\n \t DUP_LOCAL(local);\n \t}\n \tlocal->sdp_connection = c;\n@@ -1324,7 +1324,7 @@\n soa_description_free(ss, ss->ss_previous);\n \n if (u2s) {\n- u2s = u2s_alloc(ss->ss_home, u2s); \n+ u2s = u2s_alloc(ss->ss_home, u2s);\n s2u = u2s_alloc(ss->ss_home, s2u);\n if (!u2s || !s2u)\n goto internal_error;\n@@ -1379,7 +1379,7 @@\n \tss->ss_previous_user_version = 0;\n \tss->ss_previous_remote_version = 0;\n }\n- \n+\n su_free(ss->ss_home, u2s), su_free(ss->ss_home, s2u);\n \n goto internal_error;\n@@ -1444,7 +1444,7 @@\n {\n \/* NOTE:\n * - local SDP might have changed\n- * - remote SDP might have been updated \n+ * - remote SDP might have been updated\n *\/\n \n if (offer_answer_step(ss, generate_answer, \"soa_generate_answer\") < 0)\n@@ -1459,7 +1459,7 @@\n \/* NOTE:\n * - both local and remote information is available\n * - local SDP might have changed\n- * - remote SDP might have been updated \n+ * - remote SDP might have been updated\n *\/\n if (offer_answer_step(ss, process_answer, \"soa_process_answer\") < 0)\n return -1;\n"} {"commit":"c87287939471e8cf2b2bc899471902c71b537149","subject":"removing logs","message":"removing logs\n","repos":"nanopack\/narc,nanopack\/narc,pagodabox\/narc,nanobox-io\/narc,nanopack\/narc,nanobox-io\/narc,pagodabox\/narc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/udp_client.c\n+++ src\/udp_client.c\n@@ -119,7 +119,7 @@\n \thints.ai_flags = 0;\n \tnarc_log(NARC_WARNING, \"server resolving: %s\", server.host);\n \tnarc_udp_client *client = (narc_udp_client *)server.client;\n-\tuv_getaddrinfo(server.loop, &client->resolver, handle_udp_resolved, server.host, server.port, &hints);\n+\tuv_getaddrinfo(server.loop, &client->resolver, handle_udp_resolved, server.host, itoa(server.port), &hints);\n }\n \n void\n"} {"commit":"1b210a8974442e2cc9520f791a97220ebbf71d5f","subject":"H7: remove manual bus off handling (#1062)","message":"H7: remove manual bus off handling (#1062)\n\nremove this","repos":"commaai\/panda,commaai\/panda,commaai\/panda,commaai\/panda","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- board\/drivers\/fdcan.h\n+++ board\/drivers\/fdcan.h\n@@ -3,9 +3,6 @@\n \/\/ FDCAN3_IT0, FDCAN3_IT1\n \n #define CANFD\n-\n-#define BUS_OFF_FAIL_LIMIT 2U\n-uint8_t bus_off_err[] = {0U, 0U, 0U};\n \n typedef struct {\n volatile uint32_t header[2];\n@@ -32,20 +29,6 @@\n void can_set_gmlan(uint8_t bus) {\n UNUSED(bus);\n puts(\"GMLAN not available on red panda\\n\");\n-}\n-\n-void cycle_transceiver(uint8_t can_number) {\n- \/\/ FDCAN1 = trans 1, FDCAN3 = trans 3, FDCAN2 = trans 2 normal or 4 flipped harness\n- uint8_t transceiver_number = can_number;\n- if (can_number == 2U) {\n- uint8_t flip = (car_harness_status == HARNESS_STATUS_FLIPPED) ? 2U : 0U;\n- transceiver_number += flip;\n- }\n- current_board->enable_can_transceiver(transceiver_number, false);\n- delay(20000);\n- current_board->enable_can_transceiver(transceiver_number, true);\n- bus_off_err[can_number] = 0U;\n- puts(\"Cycled transceiver number: \"); puth(transceiver_number); puts(\"\\n\");\n }\n \n \/\/ ***************************** CAN *****************************\n@@ -96,27 +79,6 @@\n }\n }\n \n- \/\/ Recover after Bus-off state\n- if (((CANx->PSR & FDCAN_PSR_BO) != 0) && ((CANx->CCCR & FDCAN_CCCR_INIT) != 0)) {\n- bus_off_err[can_number] += 1U;\n- puts(\"CAN is in Bus_Off state! Resetting... CAN number: \"); puth(can_number); puts(\"\\n\");\n- if (bus_off_err[can_number] > BUS_OFF_FAIL_LIMIT) {\n- cycle_transceiver(can_number);\n- }\n- CANx->IR = 0xFFC60000U; \/\/ Reset all flags(Only errors!)\n- CANx->CCCR &= ~(FDCAN_CCCR_INIT);\n- uint32_t timeout_counter = 0U;\n- while((CANx->CCCR & FDCAN_CCCR_INIT) != 0) {\n- \/\/ Delay for about 1ms\n- delay(10000);\n- timeout_counter++;\n-\n- if(timeout_counter >= CAN_INIT_TIMEOUT_MS){\n- puts(CAN_NAME_FROM_CANIF(CANx)); puts(\" Bus_Off reset timed out!\\n\");\n- break;\n- }\n- }\n- }\n EXIT_CRITICAL();\n }\n }\n"} {"commit":"f5ca979aaa6d8aa104fa559979e88a34b7dd0232","subject":"bug in hest usage","message":"bug in hest usage\n\n\ngit-svn-id: 9e9401559e51101c165cdce4d49b411eb20436ed@1721 3d70eeeb-363e-0410-a505-8a46323a89f2\n","repos":"BRAINSia\/teem,Slicer\/teem,Slicer\/teem,BRAINSia\/teem,BRAINSia\/teem,BRAINSia\/teem,Slicer\/teem,Slicer\/teem,BRAINSia\/teem,Slicer\/teem","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/unrrdu\/3op.c\n+++ src\/unrrdu\/3op.c\n@@ -44,7 +44,7 @@\n \t \"\\b\\bo \\\"clamp\\\": second value is clamped to range between \"\n \t \"the first and the third\\n \"\n \t \"\\b\\bo \\\"ifelse\\\": if 1st value non-zero, then 2nd value, else \"\n-\t \"3rd value\",\n+\t \"3rd value\"\n \t \"\\b\\bo \\\"lerp\\\": linear interpolation between the 2nd and \"\n \t \"3rd values, as the 1st value varies between 0.0 and 1.0, \"\n \t \"respectively\\n \"\n"} {"commit":"b29260ff385a34b1deb3844a1a88778e9e3effee","subject":"more","message":"more\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/utils\/init.c\n+++ src\/utils\/init.c\n@@ -11,10 +11,24 @@\n \n job_init(&job, workers, JOBSIZE);\n job_parse(&job, mdata, msize);\n- job_spawn(&job);\n- job_listen(&job, EVENT_DATA);\n- job_pipe(&job, EVENT_DATA);\n- job_run(&job);\n+\n+ if (job_spawn(&job))\n+ {\n+\n+ job_listen(&job, EVENT_CLOSE);\n+ job_listen(&job, EVENT_ERROR);\n+ job_listen(&job, EVENT_DATA);\n+ job_pipe(&job, EVENT_DATA);\n+ job_run(&job);\n+\n+ }\n+\n+ else\n+ {\n+\n+ job_killall(&job);\n+\n+ }\n \n }\n \n@@ -27,7 +41,9 @@\n {\n \n channel_bind(EVENT_DATA, ondata);\n+ channel_redirectback(id, EVENT_CLOSE);\n channel_redirectback(id, EVENT_DATA);\n+ channel_redirectback(id, EVENT_ERROR);\n channel_sendstringzto(id, EVENT_PATH, \"\/config\/base.slang\");\n channel_sendstringzto(id, EVENT_PATH, \"\/config\/arch.slang\");\n channel_sendstringzto(id, EVENT_PATH, \"\/config\/init.slang\");\n"} {"commit":"0fe9d08a7c35c0510b80adcfd8f51aa5df3aeeef","subject":"Bug fix","message":"Bug fix\n\n\ngit-svn-id: 51d371801c0de2a0625fbca80cd99d181c32913f@13032 dc4e9af1-7f46-4ead-bba6-71afc04862de\n","repos":"JohnPJenkins\/swift-t,blue42u\/swift-t,basheersubei\/swift-t,JohnPJenkins\/swift-t,blue42u\/swift-t,blue42u\/swift-t,blue42u\/swift-t,JohnPJenkins\/swift-t,blue42u\/swift-t,swift-lang\/swift-t,JohnPJenkins\/swift-t,basheersubei\/swift-t,JohnPJenkins\/swift-t,JohnPJenkins\/swift-t,swift-lang\/swift-t,basheersubei\/swift-t,swift-lang\/swift-t,basheersubei\/swift-t,JohnPJenkins\/swift-t,blue42u\/swift-t,swift-lang\/swift-t,swift-lang\/swift-t,basheersubei\/swift-t,basheersubei\/swift-t,blue42u\/swift-t,swift-lang\/swift-t,swift-lang\/swift-t,basheersubei\/swift-t","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- code\/src\/server.c\n+++ code\/src\/server.c\n@@ -27,7 +27,7 @@\n #include <mpi.h>\n \n #include <list_i.h>\n-#include <memory.h>\n+#include <exm-memory.h>\n #include <tools.h>\n \n #include \"adlb.h\"\n"} {"commit":"27996c714f7fd6a7686f2d4a3552efbc1e54c2c7","subject":"Enabling booster after port to work with changed libglusterfsclient interface.","message":"Enabling booster after port to work with changed libglusterfsclient interface.\n\nSigned-off-by: Anand V. Avati <6a1810c170bd423868ce2e225ecea39d80cade0f@amp.gluster.com>\n","repos":"Kaushikbv\/Gluster,Kaushikbv\/Gluster,Kaushikbv\/Gluster","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- booster\/src\/booster.c\n+++ booster\/src\/booster.c\n@@ -0,0 +1,929 @@\n+\/*\n+ Copyright (c) 2007-2009 Z RESEARCH, Inc. <http:\/\/www.zresearch.com>\n+ This file is part of GlusterFS.\n+\n+ GlusterFS is free software; you can redistribute it and\/or modify\n+ it under the terms of the GNU General Public License as published\n+ by the Free Software Foundation; either version 3 of the License,\n+ or (at your option) any later version.\n+\n+ GlusterFS is distributed in the hope that it will be useful, but\n+ WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License\n+ along with this program. If not, see\n+ <http:\/\/www.gnu.org\/licenses\/>.\n+*\/\n+\n+#ifndef _CONFIG_H\n+#define _CONFIG_H\n+#include \"config.h\"\n+#endif\n+\n+#include <dlfcn.h>\n+#include <sys\/types.h>\n+#include <sys\/stat.h>\n+#include <sys\/uio.h>\n+#include <stdio.h>\n+#include <stdarg.h>\n+#include <stdlib.h>\n+#include <inttypes.h>\n+#include <libglusterfsclient.h>\n+#include <list.h>\n+#include <pthread.h>\n+#include <fcntl.h>\n+#include <sys\/xattr.h>\n+#include <string.h>\n+#include <assert.h>\n+#include <errno.h>\n+\n+#ifndef GF_UNIT_KB\n+#define GF_UNIT_KB 1024\n+#endif\n+\n+#ifndef UNIX_PATH_MAX\n+#define UNIX_PATH_MAX 108\n+#endif\n+\n+struct _inode;\n+struct _dict;\n+struct _fd {\n+ pid_t pid;\n+ struct list_head inode_list;\n+ struct _inode *inode;\n+ struct _dict *ctx;\n+ int32_t refcount;\n+};\n+\n+typedef struct _fdtable fdtable_t;\n+typedef struct _fd fd_t;\n+\n+\n+inline void \n+gf_fd_put (struct _fdtable *fdtable, int64_t fd);\n+\n+struct _fd *\n+gf_fd_fdptr_get (struct _fdtable *fdtable, int64_t fd);\n+\n+struct _fdtable *\n+gf_fd_fdtable_alloc (void);\n+\n+void\n+gf_fd_fdtable_destroy (struct _fdtable *);\n+\n+int32_t \n+gf_fd_unused_get (struct _fdtable *fdtable, struct _fd *fdptr);\n+\n+int32_t \n+gf_fd_unused_get2 (struct _fdtable *fdtable, struct _fd *fdptr, int64_t fd);\n+\n+void\n+fd_unref (struct _fd *fd);\n+\n+fd_t *\n+fd_ref (struct _fd *fd);\n+\n+pid_t\n+getpid (void);\n+\n+ssize_t\n+write (int fd, const void *buf, size_t count);\n+\n+\/* open, open64, creat *\/\n+static int (*real_open) (const char *pathname, int flags, ...);\n+static int (*real_open64) (const char *pathname, int flags, ...);\n+static int (*real_creat) (const char *pathname, mode_t mode);\n+\n+\/* read, readv, pread, pread64 *\/\n+static ssize_t (*real_read) (int fd, void *buf, size_t count);\n+static ssize_t (*real_readv) (int fd, const struct iovec *vector, int count);\n+static ssize_t (*real_pread) (int fd, void *buf, size_t count,\n+ unsigned long offset);\n+static ssize_t (*real_pread64) (int fd, void *buf, size_t count,\n+ uint64_t offset);\n+\n+\/* write, writev, pwrite, pwrite64 *\/\n+static ssize_t (*real_write) (int fd, const void *buf, size_t count);\n+static ssize_t (*real_writev) (int fd, const struct iovec *vector, int count);\n+static ssize_t (*real_pwrite) (int fd, const void *buf, size_t count,\n+ unsigned long offset);\n+static ssize_t (*real_pwrite64) (int fd, const void *buf, size_t count,\n+ uint64_t offset);\n+\n+\/* lseek, llseek, lseek64 *\/\n+static off_t (*real_lseek) (int fildes, unsigned long offset, int whence);\n+static off_t (*real_lseek64) (int fildes, uint64_t offset, int whence);\n+\n+\/* close *\/\n+static int (*real_close) (int fd);\n+\n+\/* dup dup2 *\/\n+static int (*real_dup) (int fd);\n+static int (*real_dup2) (int oldfd, int newfd);\n+\n+static pid_t (*real_fork) (void);\n+\n+#define RESOLVE(sym) do { \\\n+ if (!real_##sym) \\\n+ real_##sym = dlsym (RTLD_NEXT, #sym); \\\n+ } while (0)\n+\n+\/*TODO: set proper value *\/\n+#define MOUNT_HASH_SIZE 256\n+\n+struct booster_mount {\n+ dev_t st_dev;\n+ glusterfs_handle_t handle;\n+ struct list_head device_list;\n+};\n+typedef struct booster_mount booster_mount_t;\n+\n+struct booster_mount_table {\n+ pthread_mutex_t lock;\n+ struct list_head *mounts;\n+ int32_t hash_size;\n+};\n+typedef struct booster_mount_table booster_mount_table_t;\n+\n+static fdtable_t *booster_glfs_fdtable = NULL;\n+static booster_mount_table_t *booster_mount_table = NULL;\n+\n+static int32_t \n+booster_put_handle (booster_mount_table_t *table,\n+ dev_t st_dev,\n+ glusterfs_handle_t handle)\n+{\n+ int32_t hash = 0;\n+ booster_mount_t *mount = NULL, *tmp = NULL;\n+\tint32_t ret = 0;\n+\n+ mount = calloc (1, sizeof (*mount));\n+\tif (!mount) {\n+\t\treturn -1;\n+\t}\n+\n+ \/\/ ERR_ABORT (mount);\n+ INIT_LIST_HEAD (&mount->device_list);\n+ mount->st_dev = st_dev;\n+ mount->handle = handle;\n+\n+ hash = st_dev % table->hash_size;\n+\n+ pthread_mutex_lock (&table->lock);\n+ {\n+ list_for_each_entry (tmp, &table->mounts[hash], device_list) {\n+ if (tmp->st_dev == st_dev) {\n+\t\t\t\tret = -1;\n+\t\t\t\terrno = EEXIST;\n+\t\t\t\tgoto unlock;\n+ }\n+ }\n+\n+ list_add (&mount->device_list, &table->mounts[hash]);\n+ }\n+unlock:\n+ pthread_mutex_unlock (&table->lock);\n+ \n+ return ret;\n+}\n+\n+\n+static inline glusterfs_file_t\n+booster_get_glfs_fd (fdtable_t *fdtable, int fd)\n+{\n+ fd_t *glfs_fd = NULL;\n+\n+ glfs_fd = gf_fd_fdptr_get (fdtable, fd);\n+ return glfs_fd;\n+}\n+\n+\n+static inline void\n+booster_put_glfs_fd (glusterfs_file_t glfs_fd)\n+{\n+ fd_unref ((fd_t *)glfs_fd);\n+}\n+\n+\n+static inline int32_t\n+booster_get_unused_fd (fdtable_t *fdtable, glusterfs_file_t glfs_fd, int fd)\n+{\n+ int32_t ret = -1;\n+ ret = gf_fd_unused_get2 (fdtable, (fd_t *)glfs_fd, fd);\n+ return ret;\n+}\n+\n+\n+static inline void\n+booster_put_fd (fdtable_t *fdtable, int fd)\n+{\n+ gf_fd_put (fdtable, fd);\n+}\n+\n+\n+static glusterfs_handle_t \n+booster_get_handle (booster_mount_table_t *table, dev_t st_dev)\n+{\n+ int32_t hash = 0;\n+ booster_mount_t *mount = NULL;\n+ glusterfs_handle_t handle = NULL;\n+\n+ hash = st_dev % table->hash_size; \n+\n+ pthread_mutex_lock (&table->lock);\n+ {\n+ list_for_each_entry (mount, &table->mounts[hash], device_list) {\n+ if (mount->st_dev == st_dev) {\n+ handle = mount->handle;\n+ break;\n+ }\n+ }\n+ }\n+ pthread_mutex_unlock (&table->lock);\n+ \n+ return handle;\n+}\n+\n+\n+void\n+do_open (int fd, int flags, mode_t mode)\n+{\n+ char *specfile = NULL;\n+ glusterfs_handle_t handle;\n+ int32_t file_size;\n+ struct stat st = {0,};\n+ int32_t ret = -1;\n+\n+ ret = fstat (fd, &st);\n+ if (ret == -1) {\n+ return;\n+ }\n+\n+ if (!booster_mount_table) {\n+ return;\n+ }\n+\n+\thandle = booster_get_handle (booster_mount_table, st.st_dev);\n+\tif (!handle) {\n+\t\tFILE *specfp = NULL;\n+\t\t\n+\t\tglusterfs_init_params_t ctx = {\n+\t\t\t.loglevel = \"critical\",\n+\t\t\t.lookup_timeout = 600,\n+\t\t\t.stat_timeout = 600,\n+\t\t};\n+ \n+\t\tfile_size = fgetxattr (fd, \"user.glusterfs-booster-volfile\",\n+ NULL, 0);\n+\t\tif (file_size == -1) {\n+\t\t\treturn;\n+\t\t}\n+\t\t\n+\t\tspecfile = calloc (1, file_size);\n+\t\tif (!specfile) {\n+\t\t\tfprintf (stderr, \"cannot allocate memory: %s\\n\",\n+ strerror (errno));\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tret = fgetxattr (fd, \"user.glusterfs-booster-volfile\", specfile,\n+ file_size);\n+\t\tif (ret == -1) {\n+\t\t\tfree (specfile);\n+\t\t\treturn ;\n+\t\t}\n+ \n+\t\tspecfp = tmpfile ();\n+\t\tif (!specfp) {\n+\t\t\tfree (specfile);\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tret = fwrite (specfile, file_size, 1, specfp);\n+\t\tif (ret != 1) {\n+\t\t\tfclose (specfp);\n+\t\t\tfree (specfile);\n+\t\t}\n+\t\t\n+\t\tfseek (specfp, 0L, SEEK_SET);\n+\t\t\n+\t\tctx.logfile = getenv (\"GLFS_BOOSTER_LOGFILE\");\n+\t\tctx.specfp = specfp;\n+\n+\t\thandle = glusterfs_init (&ctx);\n+\t\t\n+\t\tfree (specfile);\n+\t\tfclose (specfp);\n+\t\t\n+\t\tif (!handle) {\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tret = booster_put_handle (booster_mount_table, st.st_dev,\n+ handle);\n+\t\tif (ret == -1) {\n+\t\t\tglusterfs_fini (handle);\n+\t\t\tif (errno != EEXIST) {\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t}\n+\t}\n+ \n+ if (handle) {\n+ glusterfs_file_t glfs_fd;\n+ char path [UNIX_PATH_MAX];\n+ ret = fgetxattr (fd, \"user.glusterfs-booster-path\", path,\n+ UNIX_PATH_MAX);\n+ if (ret == -1) {\n+ return;\n+ }\n+\n+ glfs_fd = glusterfs_open (handle, path, flags, mode);\n+ if (glfs_fd) {\n+ ret = booster_get_unused_fd (booster_glfs_fdtable,\n+ glfs_fd, fd);\n+ if (ret == -1) {\n+ glusterfs_close (glfs_fd);\n+ return;\n+ } \n+ }\n+ } \n+\n+ return;\n+}\n+\n+#ifndef __USE_FILE_OFFSET64\n+int\n+open (const char *pathname, int flags, ...)\n+{\n+ int ret;\n+\tmode_t mode = 0;\n+\tva_list ap;\n+\n+\tif (flags & O_CREAT) {\n+\t\tva_start (ap, flags);\n+\t\tmode = va_arg (ap, mode_t);\n+\t\tva_end (ap);\n+\n+\t\tret = real_open (pathname, flags, mode);\n+\t} else {\n+\t\tret = real_open (pathname, flags);\n+\t}\n+\n+ if (ret != -1) {\n+ flags &= ~ O_CREAT;\n+ do_open (ret, flags, mode);\n+ }\n+\n+ return ret;\n+}\n+#endif\n+\n+#if defined (__USE_LARGEFILE64) || !defined (__USE_FILE_OFFSET64)\n+int\n+open64 (const char *pathname, int flags, ...)\n+{\n+ int ret;\n+\tmode_t mode = 0;\n+\tva_list ap;\n+\n+\tif (flags & O_CREAT) {\n+\t\tva_start (ap, flags);\n+\t\tmode = va_arg (ap, mode_t);\n+\t\tva_end (ap);\n+\n+\t\tret = real_open64 (pathname, flags, mode);\n+\t} else {\n+\t\tret = real_open64 (pathname, flags);\n+\t}\n+\n+ if (ret != -1) {\n+ flags &= ~O_CREAT;\n+ do_open (ret, flags, mode);\n+ }\n+\n+ return ret;\n+}\n+#endif\n+\n+int\n+creat (const char *pathname, mode_t mode)\n+{\n+ int ret;\n+\n+ ret = real_creat (pathname, mode);\n+\n+ if (ret != -1) {\n+ do_open (ret, O_WRONLY | O_TRUNC, mode);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+\/* pread *\/\n+\n+ssize_t\n+pread (int fd, void *buf, size_t count, unsigned long offset)\n+{\n+ ssize_t ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ if (!glfs_fd) { \n+ ret = real_pread (fd, buf, count, offset);\n+ } else {\n+ ret = glusterfs_pread (glfs_fd, buf, count, offset);\n+ if (ret == -1) {\n+ ret = real_pread (fd, buf, count, offset);\n+ }\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+pread64 (int fd, void *buf, size_t count, uint64_t offset)\n+{\n+ ssize_t ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ if (!glfs_fd) { \n+ ret = real_pread (fd, buf, count, offset);\n+ } else {\n+ ret = glusterfs_pread (glfs_fd, buf, count, offset);\n+ if (ret == -1) {\n+ ret = real_pread (fd, buf, count, offset);\n+ }\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+read (int fd, void *buf, size_t count)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ if (!glfs_fd) {\n+ ret = real_read (fd, buf, count);\n+ } else {\n+ uint64_t offset = 0;\n+ offset = real_lseek64 (fd, 0L, SEEK_CUR);\n+ if ((int64_t)offset != -1) {\n+ ret = glusterfs_lseek (glfs_fd, offset, SEEK_SET);\n+ if (ret != -1) {\n+ ret = glusterfs_read (glfs_fd, buf, count);\n+ }\n+ } else {\n+ ret = -1;\n+ }\n+\n+ if (ret == -1) {\n+ ret = real_read (fd, buf, count);\n+ }\n+\n+ if (ret > 0 && ((int64_t) offset) >= 0) {\n+ real_lseek64 (fd, ret + offset, SEEK_SET);\n+\t\t}\n+\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+readv (int fd, const struct iovec *vector, int count)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ if (!glfs_fd) {\n+ ret = real_readv (fd, vector, count);\n+ } else {\n+\t\tuint64_t offset = 0;\n+ offset = real_lseek64 (fd, 0L, SEEK_CUR);\n+ if ((int64_t)offset != -1) {\n+ ret = glusterfs_lseek (glfs_fd, offset, SEEK_SET);\n+ if (ret != -1) {\n+ ret = glusterfs_readv (glfs_fd, vector, count);\n+ }\n+ } else {\n+ ret = -1;\n+\t\t} \n+\n+\t\tret = glusterfs_readv (glfs_fd, vector, count);\n+ if (ret > 0) {\n+ real_lseek64 (fd, offset + ret, SEEK_SET);\n+\t\t} \n+\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+write (int fd, const void *buf, size_t count)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+\n+ if (!glfs_fd) {\n+ ret = real_write (fd, buf, count);\n+ } else {\n+\t\tuint64_t offset = 0;\n+ offset = real_lseek64 (fd, 0L, SEEK_CUR);\n+ if (((int64_t) offset) != -1) {\n+ ret = glusterfs_lseek (glfs_fd, offset, SEEK_SET);\n+ if (ret != -1) { \n+ ret = glusterfs_write (glfs_fd, buf, count);\n+ }\n+ } else {\n+ ret = -1;\n+\t\t}\n+\n+ if (ret == -1) {\n+ ret = real_write (fd, buf, count);\n+ }\n+\n+ if (ret > 0 && ((int64_t) offset) >= 0) {\n+ real_lseek64 (fd, offset + ret, SEEK_SET);\n+\t\t}\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+ \n+ return ret;\n+}\n+\n+ssize_t\n+writev (int fd, const struct iovec *vector, int count)\n+{\n+ int ret = 0;\n+ glusterfs_file_t glfs_fd = 0; \n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+\n+ if (!glfs_fd) {\n+ ret = real_writev (fd, vector, count);\n+ } else {\n+ uint64_t offset = 0;\n+ offset = real_lseek64 (fd, 0L, SEEK_CUR);\n+\n+ if (((int64_t) offset) != -1) {\n+ ret = glusterfs_lseek (glfs_fd, offset, SEEK_SET);\n+ if (ret != -1) {\n+ ret = glusterfs_writev (glfs_fd, vector, count);\n+ }\n+ } else {\n+ ret = -1;\n+\t\t\t} \n+\n+\/*\t\tret = glusterfs_writev (glfs_fd, vector, count); *\/\n+ if (ret == -1) {\n+ ret = real_writev (fd, vector, count);\n+ }\n+\n+ if (ret > 0 && ((int64_t)offset) >= 0) {\n+ real_lseek64 (fd, offset + ret, SEEK_SET);\n+ }\n+\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+pwrite (int fd, const void *buf, size_t count, unsigned long offset)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ assert (real_pwrite != NULL);\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+\n+ if (!glfs_fd) {\n+ ret = real_pwrite (fd, buf, count, offset);\n+ } else {\n+ ret = glusterfs_pwrite (glfs_fd, buf, count, offset);\n+ if (ret == -1) {\n+ ret = real_pwrite (fd, buf, count, offset);\n+ }\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+ssize_t\n+pwrite64 (int fd, const void *buf, size_t count, uint64_t offset)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ \n+ if (!glfs_fd) {\n+ ret = real_pwrite64 (fd, buf, count, offset);\n+ } else {\n+ ret = glusterfs_pwrite (glfs_fd, buf, count, offset);\n+ if (ret == -1) {\n+ ret = real_pwrite64 (fd, buf, count, offset);\n+ }\n+ }\n+\n+ return ret;\n+}\n+\n+\n+int\n+close (int fd)\n+{\n+ int ret = -1;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+\tglfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, fd);\n+ \n+\tif (glfs_fd) {\n+\t\tbooster_put_fd (booster_glfs_fdtable, fd);\n+\t\tret = glusterfs_close (glfs_fd);\n+\t\tbooster_put_glfs_fd (glfs_fd);\n+\t}\n+\n+ ret = real_close (fd);\n+\n+ return ret;\n+}\n+\n+#ifndef _LSEEK_DECLARED\n+#define _LSEEK_DECLARED\n+off_t\n+lseek (int filedes, unsigned long offset, int whence)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ ret = real_lseek (filedes, offset, whence);\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, filedes);\n+ if (glfs_fd) {\n+ ret = glusterfs_lseek (glfs_fd, offset, whence);\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+#endif\n+\n+off_t\n+lseek64 (int filedes, uint64_t offset, int whence)\n+{\n+ int ret;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ ret = real_lseek64 (filedes, offset, whence);\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, filedes);\n+ if (glfs_fd) {\n+ ret = glusterfs_lseek (glfs_fd, offset, whence);\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+int \n+dup (int oldfd)\n+{\n+ int ret = -1, new_fd = -1;\n+ glusterfs_file_t glfs_fd = 0;\n+\n+ glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, oldfd);\n+ new_fd = real_dup (oldfd);\n+\n+ if (new_fd >=0 && glfs_fd) {\n+ ret = booster_get_unused_fd (booster_glfs_fdtable, glfs_fd,\n+ new_fd);\n+ fd_ref ((fd_t *)glfs_fd);\n+ if (ret == -1) {\n+ real_close (new_fd);\n+ } \n+ }\n+\n+ if (glfs_fd) {\n+ booster_put_glfs_fd (glfs_fd);\n+ }\n+\n+ return new_fd;\n+}\n+\n+\n+int \n+dup2 (int oldfd, int newfd)\n+{\n+ int ret = -1;\n+ glusterfs_file_t old_glfs_fd = NULL, new_glfs_fd = NULL;\n+\n+ if (oldfd == newfd) {\n+ return newfd;\n+ }\n+\n+ old_glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, oldfd);\n+ new_glfs_fd = booster_get_glfs_fd (booster_glfs_fdtable, newfd);\n+ \n+ ret = real_dup2 (oldfd, newfd); \n+ if (ret >= 0) {\n+ if (new_glfs_fd) {\n+ glusterfs_close (new_glfs_fd);\n+ booster_put_glfs_fd (new_glfs_fd);\n+ booster_put_fd (booster_glfs_fdtable, newfd);\n+ new_glfs_fd = 0;\n+ }\n+\n+ if (old_glfs_fd) {\n+ ret = booster_get_unused_fd (booster_glfs_fdtable,\n+ old_glfs_fd, newfd);\n+ fd_ref ((fd_t *)old_glfs_fd);\n+ if (ret == -1) {\n+ real_close (newfd);\n+ }\n+ }\n+ } \n+\n+ if (old_glfs_fd) {\n+ booster_put_glfs_fd (old_glfs_fd);\n+ }\n+\n+ if (new_glfs_fd) {\n+ booster_put_glfs_fd (new_glfs_fd);\n+ }\n+\n+ return ret;\n+}\n+\n+\n+#define MOUNT_TABLE_HASH_SIZE 256\n+\n+\n+static int \n+booster_init (void)\n+{\n+ int i = 0;\n+ booster_glfs_fdtable = gf_fd_fdtable_alloc ();\n+ if (!booster_glfs_fdtable) {\n+ fprintf (stderr, \"cannot allocate fdtable: %s\\n\",\n+ strerror (errno));\n+\t\tgoto err;\n+ }\n+ \n+ booster_mount_table = calloc (1, sizeof (*booster_mount_table));\n+ if (!booster_mount_table) {\n+ fprintf (stderr, \"cannot allocate memory: %s\\n\",\n+ strerror (errno));\n+\t\tgoto err;\n+ }\n+\n+ pthread_mutex_init (&booster_mount_table->lock, NULL);\n+ booster_mount_table->hash_size = MOUNT_TABLE_HASH_SIZE;\n+ booster_mount_table->mounts = calloc (booster_mount_table->hash_size,\n+ sizeof (*booster_mount_table->mounts));\n+ if (!booster_mount_table->mounts) {\n+ fprintf (stderr, \"cannot allocate memory: %s\\n\",\n+ strerror (errno));\n+\t\tgoto err;\n+ }\n+ \n+ for (i = 0; i < booster_mount_table->hash_size; i++) \n+ {\n+ INIT_LIST_HEAD (&booster_mount_table->mounts[i]);\n+ }\n+\n+\treturn 0;\n+\n+err:\n+\tif (booster_glfs_fdtable) {\n+\t\tgf_fd_fdtable_destroy (booster_glfs_fdtable);\n+\t\tbooster_glfs_fdtable = NULL;\n+\t}\n+\n+\tif (booster_mount_table) {\n+\t\tif (booster_mount_table->mounts) {\n+\t\t\tfree (booster_mount_table->mounts);\n+\t\t}\n+\n+\t\tfree (booster_mount_table);\n+\t\tbooster_mount_table = NULL;\n+\t}\n+\treturn -1; \n+}\n+\n+\n+static void\n+booster_cleanup (void)\n+{\n+\tint i;\n+\tbooster_mount_t *mount = NULL, *tmp = NULL;\n+\t\n+\t\/* gf_fd_fdtable_destroy (booster_glfs_fdtable);*\/\n+\t\/*for (i=0; i < booster_glfs_fdtable->max_fds; i++) {\n+\t\tif (booster_glfs_fdtable->fds[i]) {\n+\t\t\tfd_t *fd = booster_glfs_fdtable->fds[i];\n+\t\t\tfree (fd);\t\t\t \n+\t\t}\n+\t\t}*\/\n+\n+\tfree (booster_glfs_fdtable);\n+\tbooster_glfs_fdtable = NULL;\n+\n+ pthread_mutex_lock (&booster_mount_table->lock);\n+ {\n+\t\tfor (i = 0; i < booster_mount_table->hash_size; i++) \n+\t\t{\n+\t\t\tlist_for_each_entry_safe (mount, tmp, \n+\t\t\t\t\t\t &booster_mount_table->mounts[i], device_list) {\n+\t\t\t\tlist_del (&mount->device_list);\n+\t\t\t\tglusterfs_fini (mount->handle);\n+\t\t\t\tfree (mount);\n+\t\t\t}\n+ }\n+\t\tfree (booster_mount_table->mounts);\n+ }\n+ pthread_mutex_unlock (&booster_mount_table->lock);\n+\n+\tglusterfs_reset ();\n+\tfree (booster_mount_table);\n+\tbooster_mount_table = NULL;\n+}\n+\n+\n+\n+pid_t \n+fork (void)\n+{\n+\tpid_t pid = 0;\n+\tchar child = 0;\n+\n+\tglusterfs_log_lock ();\n+\t{\n+\t\tpid = real_fork ();\n+\t}\n+\tglusterfs_log_unlock ();\n+\n+\tchild = (pid == 0);\n+\tif (child) {\n+\t\tbooster_cleanup ();\n+\t\tbooster_init ();\n+\t}\n+\n+\treturn pid;\n+}\n+\n+\n+void\n+_init (void)\n+{\n+\tbooster_init ();\n+\n+ RESOLVE (open);\n+ RESOLVE (open64);\n+ RESOLVE (creat);\n+\n+ RESOLVE (read);\n+ RESOLVE (readv);\n+ RESOLVE (pread);\n+ RESOLVE (pread64);\n+\n+ RESOLVE (write);\n+ RESOLVE (writev);\n+ RESOLVE (pwrite);\n+ RESOLVE (pwrite64);\n+\n+ RESOLVE (lseek);\n+ RESOLVE (lseek64);\n+\n+ RESOLVE (close);\n+\n+ RESOLVE (dup);\n+ RESOLVE (dup2);\n+\n+\tRESOLVE (fork); \n+}\n+\n"} {"commit":"e7be63086c560e85c92fc22c51edc7a7306c9524","subject":"Fixed unpack order.","message":"Fixed unpack order.\n","repos":"fintler\/tomatodb,fintler\/tomatodb,fintler\/tomatodb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/common\/pack\/append_msg.c\n+++ src\/common\/pack\/append_msg.c\n@@ -79,8 +79,8 @@\n \n data->leader_term = root.via.array.ptr[1].via.u64;\n data->commit_index = root.via.array.ptr[2].via.u64;\n- data->prev_log_index = root.via.array.ptr[2].via.u64;\n- data->prev_log_term = root.via.array.ptr[2].via.u64;\n+ data->prev_log_index = root.via.array.ptr[3].via.u64;\n+ data->prev_log_term = root.via.array.ptr[4].via.u64;\n \n \/\/ TODO: unpack leader uuid\n \/\/ TODO: unpack append entries\n"} {"commit":"b080c00ec6df817a70f9f2bd381b9f94637c6626","subject":"constify: RFC3095: remove deprecated TODO comments","message":"constify: RFC3095: remove deprecated TODO comments\n","repos":"didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc,didier-barvaux\/rohc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/comp\/schemes\/comp_list.c\n+++ src\/comp\/schemes\/comp_list.c\n@@ -256,8 +256,6 @@\n \t\tassert(index_table >= 0 && ((size_t) index_table) < ROHC_LIST_MAX_ITEM);\n \n \t\t\/* update item in translation table if it changed *\/\n-\t\t\/* TODO: context should not be overwritten until compression is fully OK *\/\n-\t\t\/* TODO: put comp const in params once context is not overwritten any more *\/\n \t\tret = rohc_list_item_update_if_changed(comp->cmp_item,\n \t\t &(exts_changes->trans_table[index_table]),\n \t\t ext->type, ext->data, ext->len);\n"} {"commit":"caa623eeaad5fa5a733e83507d18daedf96f1427","subject":"Implement a connect timeout for connecting to Redis, defaulting to 200ms","message":"Implement a connect timeout for connecting to Redis, defaulting to 200ms\n\nUse redisConnectWithTimeout() instead of redisConnect() to prevent\nhanging for minutes when the host is down (i.e, not responding).\n\nThe default timeout is set to 200ms via REDIS_TIMEOUT_MS in vmod_redis.c.\n\nSigned-off-by: Noah Williamsson <01479f9bf7817090e07c55bace445c48178b77b4@gmail.com>\n","repos":"brandonwamboldt\/libvmod-redis,brandonwamboldt\/libvmod-redis,SBRDevelopment\/libvmod-redis,SBRDevelopment\/libvmod-redis,zephirworks\/libvmod-redis,zephirworks\/libvmod-redis","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/vmod_redis.c\n+++ src\/vmod_redis.c\n@@ -1,5 +1,6 @@\n #include <stdlib.h>\n #include <stdio.h>\n+#include <sys\/time.h>\n \n #include \"vrt.h\"\n #include \"bin\/varnishd\/cache.h\"\n@@ -8,6 +9,9 @@\n \n #include <pthread.h>\n #include <hiredis\/hiredis.h>\n+\n+\n+#define REDIS_TIMEOUT_MS\t200\t\/* 200 milliseconds *\/\n \n \n #define\tLOG_E(...) fprintf(stderr, __VA_ARGS__);\n@@ -20,6 +24,7 @@\n typedef struct redisConfig {\n \tchar *host;\n \tint port;\n+\tstruct timeval timeout;\n } config_t;\n \n static pthread_key_t redis_key;\n@@ -59,6 +64,8 @@\n \t\tpriv->free = free;\n \t\tcfg->host = strdup(\"127.0.0.1\");\n \t\tcfg->port = 6379;\n+\t\tcfg->timeout.tv_sec = REDIS_TIMEOUT_MS \/ 1000;\n+\t\tcfg->timeout.tv_usec = (REDIS_TIMEOUT_MS % 1000) * 1000;\n \t}\n \n \treturn (0);\n@@ -74,7 +81,7 @@\n \tLOG_T(\"redis(%x): running %s %p\\n\", pthread_self(), command, priv->priv);\n \n \tif ((c = pthread_getspecific(redis_key)) == NULL) {\n-\t\tc = redisConnect(cfg->host, cfg->port);\n+\t\tc = redisConnectWithTimeout(cfg->host, cfg->port, cfg->timeout);\n \t\tif (c->err) {\n \t\t\tLOG_E(\"redis error (connect): %s\\n\", c->errstr);\n \t\t}\n@@ -83,7 +90,7 @@\n \n \treply = redisCommand(c, command);\n \tif (reply == NULL && c->err == REDIS_ERR_EOF) {\n-\t\tc = redisConnect(cfg->host, cfg->port);\n+\t\tc = redisConnectWithTimeout(cfg->host, cfg->port, cfg->timeout);\n \t\tif (c->err) {\n \t\t\tLOG_E(\"redis error (reconnect): %s\\n\", c->errstr);\n \t\t\tredisFree(c);\n"} {"commit":"ab16bb266676b3df29d7efee52e82bcd3b806123","subject":"added low and idx fields to MDPNode for use by HDP","message":"added low and idx fields to MDPNode for use by HDP\n\n\ngit-svn-id: c57083cae03de9a0803956a3abd65044d17a906b@312 3bbcab3b-a713-480a-a40a-1fdaa183d0c8\n","repos":"trey0\/zmdp,trey0\/zmdp,abhishekcs\/RLFD-Project,trey0\/zmdp,abhishekcs\/RLFD-Project,abhishekcs\/RLFD-Project,abhishekcs\/RLFD-Project,trey0\/zmdp,trey0\/zmdp,abhishekcs\/RLFD-Project","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/MDPCache.h\n+++ common\/MDPCache.h\n@@ -1,5 +1,5 @@\n \/********** tell emacs we use -*- c++ -*- style comments *******************\n- $Revision: 1.3 $ $Author: trey $ $Date: 2006-02-13 21:47:53 $\n+ $Revision: 1.4 $ $Author: trey $ $Date: 2006-02-17 18:10:05 $\n \n @file MDPCache.h\n @brief Data structures for caching the explicit search graph\n@@ -60,8 +60,9 @@\n bool isTerminal;\n std::vector<MDPQEntry> Q;\n double lbVal, ubVal;\n- bool isSolved; \/\/ used by LRTDP\n+ bool isSolved; \/\/ used by LRTDP and HDP\n double prio; \/\/ used by FRTDP\n+ int low, idx; \/\/ used by HDP\n \n bool isFringe(void) const { return Q.empty(); }\n size_t getNumActions(void) const { return Q.size(); }\n@@ -77,6 +78,9 @@\n \/***************************************************************************\n * REVISION HISTORY:\n * $Log: not supported by cvs2svn $\n+ * Revision 1.3 2006\/02\/13 21:47:53 trey\n+ * added prio field in MDPNode\n+ *\n * Revision 1.2 2006\/02\/13 19:07:22 trey\n * added MDPNode::getNextState() convenience method\n *\n"} {"commit":"72f0b4e2133ba1d65147d06016c0b6d2202235ca","subject":"[PATCH] disable debugging version of write_lock()","message":"[PATCH] disable debugging version of write_lock()\n\nWe've confirmed that the debug version of write_lock() can get stuck for long\nenough to cause NMI watchdog timeouts and hence a crash.\n\nWe don't know why, yet. Disable it for now.\n\nAlso disable the similar read_lock() code. Just in case.\n\nThanks to Dave Olson <olson@unixfolk.com> for reporting and testing.\n\nAcked-by: Ingo Molnar <9dbbbf0688fedc85ad4da37637f1a64b8c718ee2@elte.hu>\nCc: <4fbacc2fa0ffdbb11bf1ad6925b886ebd08dd15f@kernel.org>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@osdl.org>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/spinlock_debug.c\n+++ lib\/spinlock_debug.c\n@@ -162,6 +162,7 @@\n \n #define RWLOCK_BUG_ON(cond, lock, msg) if (unlikely(cond)) rwlock_bug(lock, msg)\n \n+#if 0\t\t\/* __write_lock_debug() can lock up - maybe this can too? *\/\n static void __read_lock_debug(rwlock_t *lock)\n {\n \tint print_once = 1;\n@@ -184,12 +185,12 @@\n \t\t}\n \t}\n }\n+#endif\n \n void _raw_read_lock(rwlock_t *lock)\n {\n \tRWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, \"bad magic\");\n-\tif (unlikely(!__raw_read_trylock(&lock->raw_lock)))\n-\t\t__read_lock_debug(lock);\n+\t__raw_read_lock(&lock->raw_lock);\n }\n \n int _raw_read_trylock(rwlock_t *lock)\n@@ -235,6 +236,7 @@\n \tlock->owner_cpu = -1;\n }\n \n+#if 0\t\t\/* This can cause lockups *\/\n static void __write_lock_debug(rwlock_t *lock)\n {\n \tint print_once = 1;\n@@ -257,12 +259,12 @@\n \t\t}\n \t}\n }\n+#endif\n \n void _raw_write_lock(rwlock_t *lock)\n {\n \tdebug_write_lock_before(lock);\n-\tif (unlikely(!__raw_write_trylock(&lock->raw_lock)))\n-\t\t__write_lock_debug(lock);\n+\t__raw_write_lock(&lock->raw_lock);\n \tdebug_write_lock_after(lock);\n }\n \n"} {"commit":"644f4e7025866bf0fe8099b37155827b4a7cb6c7","subject":"Improve ssl error logging.","message":"Improve ssl error logging.\n\n* buckets\/ssl_buckets.c\n (validate_server_certificate): Log depth of cert in case of unknown failures.\n","repos":"jandre\/serf,jandre\/serf,jandre\/serf,jandre\/serf","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- buckets\/ssl_buckets.c\n+++ buckets\/ssl_buckets.c\n@@ -486,7 +486,7 @@\n serf__log(LOGLVL_WARNING, LOGCOMP_SSL, __FILE__,\n ctx->config,\n \"validate_server_certificate, unknown cert \"\n- \"failure %d\\n\", err);\n+ \"failure %d at depth %d.\\n\", err, depth);\n failures |= SERF_SSL_CERT_UNKNOWN_FAILURE;\n break;\n }\n"} {"commit":"389507a0d30fc69008e2c9481cd1fd9ec889c37d","subject":"set_connector_hash(): Encode first word with less overhead","message":"set_connector_hash(): Encode first word with less overhead\n\nSince the first byte is skipped anyway, there is actually no need to\navoid the CONSEP value in it.\n","repos":"linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/parse\/preparation.c\n+++ link-grammar\/parse\/preparation.c\n@@ -161,8 +161,7 @@\n * starting connector of each such sequence.\n * In order to save the need to cache the endpoint word numbers the\n * connector identifiers are not shared between words. To that end the\n- * word number is prepended to the said strings. It is done using 2 bytes\n- * for convenient (mainly to easily avoid the CONSEP value).\n+ * word number is prepended to the said strings.\n *\/\n #define WORD_OFFSET 256 \/* Reserved for null connectors. *\/\n static void set_connector_hash(Sentence sent)\n@@ -202,9 +201,8 @@\n \t\tfor (size_t w = 0; w < sent->length; w++)\n \t\t{\n \t\t\t\/\/printf(\"WORD %zu\\n\", w);\n-\t\t\tcstr[0] = (char)(w & 0xFF) + WORDENC_ADD;\n-\t\t\tcstr[1] = (char)((w>>4) & 0xFF) + WORDENC_ADD;\n-\t\t\tconst int wpreflen = 2;\n+\t\t\tcstr[0] = (char)(w +1); \/* Avoid '\\0' by adding 1. *\/\n+\t\t\tconst int wpreflen = 1;\n \n \t\t\tfor (Disjunct *d = sent->word[w].d; d != NULL; d = d->next)\n \t\t\t{\n@@ -226,7 +224,7 @@\n \t\t\t\t\/\/print_connector_list(d->word_string, \"LEFT\", d->left);\n \t\t\t\tfor (Connector *c = d->left; NULL != c; c = c->next)\n \t\t\t\t{\n-\t\t\t\t\ts++;\n+\t\t\t\t\ts++; \/* Skip word number encoding or CONSEP. *\/\n \t\t\t\t\tint id = string_id_add(s, ssid) + WORD_OFFSET;\n \t\t\t\t\tc->suffix_id = id;\n \t\t\t\t\t\/\/printf(\"ID %d pref=%s\\n\", id, s);\n@@ -247,7 +245,7 @@\n \t\t\t\t\/\/print_connector_list(d->word_string, \"RIGHT\", d->right);\n \t\t\t\tfor (Connector *c = d->right; NULL != c; c = c->next)\n \t\t\t\t{\n-\t\t\t\t\ts++;\n+\t\t\t\t\ts++; \/* Skip word number encoding or CONSEP. *\/\n \t\t\t\t\tint id = string_id_add(s, ssid) + WORD_OFFSET;\n \t\t\t\t\tc->suffix_id = id;\n \t\t\t\t\t\/\/printf(\"ID %d pref=%s\\n\", id, s);\n"} {"commit":"3f3b5bb6e191d23e21edded536ba59099dadfa64","subject":"set_connector_hash(): Explicitly return after setting dummy suffix_id's","message":"set_connector_hash(): Explicitly return after setting dummy suffix_id's\n\nThis prevents extra code indentation.\n","repos":"ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,linas\/link-grammar,opencog\/link-grammar,linas\/link-grammar,opencog\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/parse\/preparation.c\n+++ link-grammar\/parse\/preparation.c\n@@ -201,6 +201,7 @@\n \n \tif (sent->length < min_sent_len_trailing_hash)\n \t{\n+\t\t\/* Set dummy suffix_id's and return. *\/\n \t\tint id = WORD_OFFSET;\n \t\tfor (size_t w = 0; w < sent->length; w++)\n \t\t{\n@@ -216,96 +217,96 @@\n \t\t\t\t}\n \t\t\t}\n \t\t}\n-\t}\n-\telse\n-\t{\n-\t\tlgdebug(D_PREP, \"Debug: Using trailing hash (Sentence length %zu)\\n\",\n-\t\t sent->length);\n+\n+\t\treturn;\n+\t}\n+\n+\tlgdebug(D_PREP, \"Debug: Using trailing hash (Sentence length %zu)\\n\",\n+\t\t sent->length);\n #define CONSEP '&' \/* Connector string separator in the suffix sequence .*\/\n #define MAX_LINK_NAME_LENGTH 10 \/\/ XXX Use a global definition.\n #define MAX_GWORD_ENCODING 16 \/* Up to 64^15 ... *\/\n-\t\tchar cstr[(MAX_LINK_NAME_LENGTH + MAX_GWORD_ENCODING) * 20];\n-\t\tString_id *csid;\n-\n-\t\tif (NULL == sent->connector_suffix_id)\n-\t\t\tsent->connector_suffix_id = string_id_create();\n-\t\tcsid = sent->connector_suffix_id;\n-\n-\t\tint cnum[2] = { 0 }; \/* Connector counts stats for debug. *\/\n-\n-\t\tfor (size_t w = 0; w < sent->length; w++)\n-\t\t{\n-\t\t\t\/\/printf(\"WORD %zu\\n\", w);\n-\n-\t\t\tfor (Disjunct *d = sent->word[w].d; d != NULL; d = d->next)\n-\t\t\t{\n-\t\t\t\tint l;\n-\t\t\t\tchar *s;\n-\n-\t\t\t\t\/* Generate a string with the disjunct Gword number(s). It\n-\t\t\t\t * makes unique trailing connector sequences of different\n-\t\t\t\t * alternatives, so they will get their own suffix_id. *\/\n+\tchar cstr[(MAX_LINK_NAME_LENGTH + MAX_GWORD_ENCODING) * 20];\n+\tString_id *csid;\n+\n+\tif (NULL == sent->connector_suffix_id)\n+\t\tsent->connector_suffix_id = string_id_create();\n+\tcsid = sent->connector_suffix_id;\n+\n+\tint cnum[2] = { 0 }; \/* Connector counts stats for debug. *\/\n+\n+\tfor (size_t w = 0; w < sent->length; w++)\n+\t{\n+\t\t\/\/printf(\"WORD %zu\\n\", w);\n+\n+\t\tfor (Disjunct *d = sent->word[w].d; d != NULL; d = d->next)\n+\t\t{\n+\t\t\tint l;\n+\t\t\tchar *s;\n+\n+\t\t\t\/* Generate a string with the disjunct Gword number(s). It\n+\t\t\t * makes unique trailing connector sequences of different\n+\t\t\t * alternatives, so they will get their own suffix_id. *\/\n+\t\t\tl = 0;\n+\t\t\tchar gword_num[MAX_GWORD_ENCODING];\n+#define MAX_DIFFERENT_GWORDS 6 \/* More than 3 have not been seen yet. *\/\n+\t\t\tchar gword_nums[MAX_GWORD_ENCODING * MAX_DIFFERENT_GWORDS];\n+\t\t\tfor (const gword_set *g = d->originating_gword; NULL != g; g = g->next)\n+\t\t\t{\n+\t\t\t\titoa_compact(gword_num, g->o_gword->node_num);\n+\t\t\t\tl += lg_strlcpy(gword_nums+l, gword_num, sizeof(gword_nums)-l);\n+\t\t\t\tcstr[l++] = ',';\n+\t\t\t}\n+\t\t\tif (l > (int)sizeof(gword_nums)-2)\n+\t\t\t{\n+\t\t\t\t\/* Overflow. Never observed, maybe cannot happen. Tag it with\n+\t\t\t\t * a unique identifier so it will get its own suffix_id. *\/\n+#ifdef DEBUG\n+\t\t\t\tprt_error(\"Warning: set_connector_hash(): \"\n+\t\t\t\t\t\t\t \"Token %s: Gword overflow: %s\\n\",\n+\t\t\t\t\t\t\t d->word_string, gword_nums);\n+#endif\n+\t\t\t\tsprintf(gword_nums, \"Gword overflow(%p)\\n\", d);\n+\t\t\t}\n+\t\t\t\/\/printf(\"w=%zu, token=%s: GWORD_NUMS: %s\\n\",\n+\t\t\t\/\/ w, d->word_string, gword_nums);\n+\n+\t\t\tfor (int dir = 0; dir < 2; dir ++)\n+\t\t\t{\n+\t\t\t\tConnector *first_c = (0 == dir) ? d->left : d->right;\n+\n \t\t\t\tl = 0;\n-\t\t\t\tchar gword_num[MAX_GWORD_ENCODING];\n-#define MAX_DIFFERENT_GWORDS 6 \/* More than 3 have not been seen yet. *\/\n-\t\t\t\tchar gword_nums[MAX_GWORD_ENCODING * MAX_DIFFERENT_GWORDS];\n-\t\t\t\tfor (const gword_set *g = d->originating_gword; NULL != g; g = g->next)\n+\t\t\t\tfor (Connector *c = first_c; NULL != c; c = c->next)\n \t\t\t\t{\n-\t\t\t\t\titoa_compact(gword_num, g->o_gword->node_num);\n-\t\t\t\t\tl += lg_strlcpy(gword_nums+l, gword_num, sizeof(gword_nums)-l);\n+\t\t\t\t\tcnum[dir]++;\n+\t\t\t\t\tl += lg_strlcpy(cstr+l, gword_num, sizeof(cstr)-l);\n \t\t\t\t\tcstr[l++] = ',';\n+\t\t\t\t\tif (c->multi) cstr[l++] = '@'; \/* May have different linkages. *\/\n+\t\t\t\t\tl += lg_strlcpy(cstr+l, connector_string(c), sizeof(cstr)-l);\n+\t\t\t\t\tcstr[l++] = CONSEP;\n \t\t\t\t}\n-\t\t\t\tif (l > (int)sizeof(gword_nums)-2)\n+\t\t\t\t\/* XXX Check overflow. *\/\n+\t\t\t\tcstr[l] = '\\0';\n+\n+\t\t\t\ts = cstr;\n+\t\t\t\t\/\/print_connector_list(d->word_string, dir?\"RIGHT\":\"LEFT\", first_c);\n+\t\t\t\tfor (Connector *c = first_c; NULL != c; c = c->next)\n \t\t\t\t{\n-\t\t\t\t\t\/* Overflow. Never observed, maybe cannot happen. Tag it with\n-\t\t\t\t\t * a unique identifier so it will get its own suffix_id. *\/\n-#ifdef DEBUG\n-\t\t\t\t\tprt_error(\"Warning: set_connector_hash(): \"\n-\t\t\t\t\t \"Token %s: Gword overflow: %s\\n\",\n-\t\t\t\t\t d->word_string, gword_nums);\n-#endif\n-\t\t\t\t\tsprintf(gword_nums, \"Gword overflow(%p)\\n\", d);\n+\t\t\t\t\tint id = string_id_add(s, csid) + WORD_OFFSET;\n+\t\t\t\t\tc->suffix_id = id;\n+\t\t\t\t\t\/\/printf(\"ID %d trail=%s\\n\", id, s);\n+\t\t\t\t\ts = memchr(s, CONSEP, sizeof(cstr));\n+\t\t\t\t\ts++;\n \t\t\t\t}\n-\t\t\t\t\/\/printf(\"w=%zu, token=%s: GWORD_NUMS: %s\\n\",\n-\t\t\t\t\/\/ w, d->word_string, gword_nums);\n-\n-\t\t\t\tfor (int dir = 0; dir < 2; dir ++)\n-\t\t\t\t{\n-\t\t\t\t\tConnector *first_c = (0 == dir) ? d->left : d->right;\n-\n-\t\t\t\t\tl = 0;\n-\t\t\t\t\tfor (Connector *c = first_c; NULL != c; c = c->next)\n-\t\t\t\t\t{\n-\t\t\t\t\t\tcnum[dir]++;\n-\t\t\t\t\t\tl += lg_strlcpy(cstr+l, gword_num, sizeof(cstr)-l);\n-\t\t\t\t\t\tcstr[l++] = ',';\n-\t\t\t\t\t\tif (c->multi) cstr[l++] = '@'; \/* May have different linkages. *\/\n-\t\t\t\t\t\tl += lg_strlcpy(cstr+l, connector_string(c), sizeof(cstr)-l);\n-\t\t\t\t\t\tcstr[l++] = CONSEP;\n-\t\t\t\t\t}\n-\t\t\t\t\t\/* XXX Check overflow. *\/\n-\t\t\t\t\tcstr[l] = '\\0';\n-\n-\t\t\t\t\ts = cstr;\n-\t\t\t\t\t\/\/print_connector_list(d->word_string, dir?\"RIGHT\":\"LEFT\", first_c);\n-\t\t\t\t\tfor (Connector *c = first_c; NULL != c; c = c->next)\n-\t\t\t\t\t{\n-\t\t\t\t\t\tint id = string_id_add(s, csid) + WORD_OFFSET;\n-\t\t\t\t\t\tc->suffix_id = id;\n-\t\t\t\t\t\t\/\/printf(\"ID %d trail=%s\\n\", id, s);\n-\t\t\t\t\t\ts = memchr(s, CONSEP, sizeof(cstr));\n-\t\t\t\t\t\ts++;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (verbosity_level(D_PREP))\n-\t\t{\n-\t\t\tint maxid = string_id_add(\"MAXID\", csid) + WORD_OFFSET - 1;\n-\t\t\tprt_error(\"Debug: suffix_id %d, %d (%d+,%d-) connectors\\n\",\n-\t\t\t maxid, cnum[1]+cnum[0], cnum[1], cnum[0]);\n-\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (verbosity_level(D_PREP))\n+\t{\n+\t\tint maxid = string_id_add(\"MAXID\", csid) + WORD_OFFSET - 1;\n+\t\tprt_error(\"Debug: suffix_id %d, %d (%d+,%d-) connectors\\n\",\n+\t\t\t\t\t maxid, cnum[1]+cnum[0], cnum[1], cnum[0]);\n \t}\n }\n \n"} {"commit":"c485fb33da49dfee73388ec465c216eaa669166b","subject":"fix","message":"fix\n\nSigned-off-by: Jens Nyberg <7200009990a46d4bb36e24284136c70d739d75fd@gmail.com>\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/wm2\/render.c\n+++ src\/wm2\/render.c\n@@ -450,7 +450,7 @@\n \n struct widget *child = current->data;\n \n- paintwidget(display, child, y);\n+ paintwidgets(display, child, y);\n \n }\n \n"} {"commit":"2e45850d38c5fe26b76621f9d84671a91a44a647","subject":"OTHER: xforms aren't forced to have a 'destroy' method anymore.","message":"OTHER: xforms aren't forced to have a 'destroy' method anymore.\n\nWe might want to issue a warning if it's missing though, since in most\ncases it will be a bug.\n","repos":"xmms2\/xmms2-stable,dreamerc\/xmms2,theeternalsw0rd\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,xmms2\/xmms2-stable,chrippa\/xmms2,six600110\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,theefer\/xmms2,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman,xmms2\/xmms2-stable,dreamerc\/xmms2,oneman\/xmms2-oneman,dreamerc\/xmms2,chrippa\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman-old,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,theefer\/xmms2,six600110\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,theefer\/xmms2,oneman\/xmms2-oneman,six600110\/xmms2,dreamerc\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,chrippa\/xmms2,krad-radio\/xmms2-krad,dreamerc\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/xmms\/xform.c\n+++ src\/xmms\/xform.c\n@@ -298,7 +298,8 @@\n \n \tXMMS_DBG (\"Freeing xform '%s'\", xmms_xform_shortname (xform));\n \n-\tif (xform->plugin && xform->entry) {\n+\t\/* The 'destroy' method is not mandatory *\/\n+\tif (xform->plugin && xform->plugin->methods.destroy && xform->entry) {\n \t\txform->plugin->methods.destroy (xform);\n \t}\n \n"} {"commit":"416684edb7afc070e72f5fd738d32869111adf3f","subject":"Removed extra blank line at start","message":"Removed extra blank line at start\n","repos":"jemc\/czmq,twhittock\/czmq,eburkitt\/czmq,modulexcite\/czmq,mhaberler\/czmq,portworx\/czmq,QbaseLLC\/czmq,modulexcite\/czmq,soumith\/czmq,awynne\/czmq,c-rack\/czmq,portworx\/czmq,modulexcite\/czmq,hintjens\/czmq,saki4510t\/czmq,pmienk\/czmq,evoskuil\/czmq,saki4510t\/czmq,tberkey\/czmq,portworx\/czmq,opedroso\/czmq,taotetek\/czmq,zeromq\/czmq,trevorbernard\/czmq,evoskuil\/czmq,maxkozlovsky\/czmq,mhaberler\/czmq,maxkozlovsky\/czmq,superjudge\/czmq,soumith\/czmq,soumith\/czmq,twhittock\/czmq,twhittock\/czmq,jemc\/czmq,twhittock\/czmq,maxkozlovsky\/czmq,mhaberler\/czmq,taotetek\/czmq,QbaseLLC\/czmq,ritchiecarroll\/czmq,saki4510t\/czmq,tberkey\/czmq,soumith\/czmq,trevorbernard\/czmq,QbaseLLC\/czmq,portworx\/czmq,hintjens\/czmq,oikosdev\/czmq,superjudge\/czmq,awynne\/czmq,taotetek\/czmq,soumith\/czmq,ritchiecarroll\/czmq,superjudge\/czmq,keent\/czmq,ritchiecarroll\/czmq,maxkozlovsky\/czmq,keent\/czmq,oikosdev\/czmq,zeromq\/czmq,tberkey\/czmq,opedroso\/czmq,evoskuil\/czmq,eburkitt\/czmq,Asmod4n\/czmq,mhaberler\/czmq,opedroso\/czmq,hintjens\/czmq,maxkozlovsky\/czmq,oikosdev\/czmq,awynne\/czmq,tberkey\/czmq,saki4510t\/czmq,taotetek\/czmq,Asmod4n\/czmq,opedroso\/czmq,awynne\/czmq,tberkey\/czmq,ritchiecarroll\/czmq,hintjens\/czmq,portworx\/czmq,pmienk\/czmq,keent\/czmq,eburkitt\/czmq,opedroso\/czmq,opedroso\/czmq,jemc\/czmq,hintjens\/czmq,superjudge\/czmq,eburkitt\/czmq,twhittock\/czmq,superjudge\/czmq,taotetek\/czmq,hintjens\/czmq,hintjens\/czmq,trevorbernard\/czmq,maxkozlovsky\/czmq,Asmod4n\/czmq,superjudge\/czmq,jemc\/czmq,awynne\/czmq,saki4510t\/czmq,soumith\/czmq,oikosdev\/czmq,trevorbernard\/czmq,taotetek\/czmq,QbaseLLC\/czmq,QbaseLLC\/czmq,twhittock\/czmq,oikosdev\/czmq,c-rack\/czmq,mhaberler\/czmq,evoskuil\/czmq,c-rack\/czmq,twhittock\/czmq,jemc\/czmq,eburkitt\/czmq,pmienk\/czmq,saki4510t\/czmq,maxkozlovsky\/czmq,portworx\/czmq,keent\/czmq,awynne\/czmq,zeromq\/czmq,eburkitt\/czmq,c-rack\/czmq,pmienk\/czmq,ritchiecarroll\/czmq,Asmod4n\/czmq,oikosdev\/czmq,pmienk\/czmq,awynne\/czmq,trevorbernard\/czmq,zeromq\/czmq,keent\/czmq,taotetek\/czmq,evoskuil\/czmq,c-rack\/czmq,c-rack\/czmq,eburkitt\/czmq,pmienk\/czmq,pmienk\/czmq,c-rack\/czmq,opedroso\/czmq,soumith\/czmq,oikosdev\/czmq,jemc\/czmq,eburkitt\/czmq,ritchiecarroll\/czmq,keent\/czmq,modulexcite\/czmq,trevorbernard\/czmq,maxkozlovsky\/czmq,c-rack\/czmq,oikosdev\/czmq,opedroso\/czmq,modulexcite\/czmq,evoskuil\/czmq,opedroso\/czmq,Asmod4n\/czmq,pmienk\/czmq,zeromq\/czmq,saki4510t\/czmq,ritchiecarroll\/czmq,hintjens\/czmq,saki4510t\/czmq,modulexcite\/czmq,taotetek\/czmq,tberkey\/czmq,twhittock\/czmq,twhittock\/czmq,evoskuil\/czmq,portworx\/czmq,superjudge\/czmq,taotetek\/czmq,QbaseLLC\/czmq,zeromq\/czmq,Asmod4n\/czmq,jemc\/czmq,modulexcite\/czmq,portworx\/czmq,ritchiecarroll\/czmq,awynne\/czmq,zeromq\/czmq,mhaberler\/czmq,keent\/czmq,evoskuil\/czmq,evoskuil\/czmq,saki4510t\/czmq,eburkitt\/czmq,zeromq\/czmq,trevorbernard\/czmq,keent\/czmq,trevorbernard\/czmq","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/zbeacon_v2.c\n+++ src\/zbeacon_v2.c\n@@ -1,4 +1,3 @@\n-\n \/* =========================================================================\n zbeacon - LAN discovery and presence (deprecated)\n \n"} {"commit":"23be8cb1c817a71039c63f75fa0d9d771d1f396c","subject":"Fixed text rendering when font has a big box that covers rounded corner.","message":"Fixed text rendering when font has a big box that covers rounded corner.\n","repos":"AlynxZhou\/flipclock","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- srcs\/flipclock.c\n+++ srcs\/flipclock.c\n@@ -489,10 +489,18 @@\n \t\texit(EXIT_FAILURE);\n \t}\n \tSDL_SetRenderTarget(app->clocks[clock_index].renderer, target_texture);\n+\t\/* We render text every minute, so we don't need cache. *\/\n \tfor (int i = 0; i < len; i++) {\n-\t\t\/* We render text every minute, so we don't need cache. *\/\n-\t\tSDL_Surface *text_surface = TTF_RenderGlyph_Shaded(\n-\t\t\tfont, text[i], app->colors.font, app->colors.rect);\n+\t\t\/*\n+\t\t * See https:\/\/www.libsdl.org\/projects\/SDL_ttf\/docs\/SDL_ttf_42.html#SEC42\n+\t\t * Normally Shaded is enough, however we have a rounded box,\n+\t\t * and many fonts' boxes are too big compared with their\n+\t\t * characters, they just cover the rounded corner.\n+\t\t * So I have to use blended mode, because solid mode does not\n+\t\t * have anti-alias.\n+\t\t *\/\n+\t\tSDL_Surface *text_surface = TTF_RenderGlyph_Blended(\n+\t\t\tfont, text[i], app->colors.font);\n \t\tif (text_surface == NULL) {\n \t\t\tLOG_ERROR(\"%s\\n\", SDL_GetError());\n \t\t\texit(EXIT_FAILURE);\n"} {"commit":"a353dfd21a25a57b34345caf4ae9780d7e35a5c0","subject":"Support '-?' for help as well.","message":"Support '-?' for help as well.\n","repos":"mortbauer\/tinynotify-send,mortbauer\/libtinynotify","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/tinynotify-cli.c\n+++ lib\/tinynotify-cli.c\n@@ -19,12 +19,12 @@\n \/* remember to keep all option-related stuff in the same order! *\/\n \n static const char* const _option_descs[] = {\n-\t\"ICON\", \"application icon (name or path)\",\n-\tNULL, \"show help message\",\n+\t\" ICON\", \"application icon (name or path)\",\n+\t\", -?\", \"show help message\",\n \tNULL, \"output version information\"\n };\n \n-static const char* const _getopt_optstring = \"i:hV\";\n+static const char* const _getopt_optstring = \"i:h?V\";\n \n static void _handle_help(const char *argv0) {\n \tconst char* opt;\n@@ -36,9 +36,9 @@\n \n \tfor (opt = _getopt_optstring, desc = _option_descs;\n \t\t\t*opt; opt++, desc++) {\n-\t\tif (*opt == ':')\n+\t\tif (*opt == ':' || *opt == '?')\n \t\t\topt++; \/* last will be 'V', so we don't need to recheck *opt *\/\n-\t\tsprintf(buf, \"-%c %s\", *opt, *desc ? *desc : \"\");\n+\t\tsprintf(buf, \"-%c%s\", *opt, *desc ? *desc : \"\");\n \t\tfprintf(stderr, \" %-20s %s\\n\", buf, *(++desc));\n \t}\n }\n"} {"commit":"f31f1fbae6c52c7dd2a0368cf8d4afdf0e1ab026","subject":"[core] Applied clang-format on buffer.h.","message":"[core] Applied clang-format on buffer.h.\n\nFixed Doxygen comments alignment","repos":"ethouris\/srt,Cinegy\/srt,Cinegy\/srt,Cinegy\/srt,Haivision\/srt,ethouris\/srt,ethouris\/srt,Haivision\/srt,Cinegy\/srt,Haivision\/srt,ethouris\/srt,Haivision\/srt","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- srtcore\/buffer.h\n+++ srtcore\/buffer.h\n@@ -1,11 +1,11 @@\n \/*\n * SRT - Secure, Reliable, Transport\n * Copyright (c) 2018 Haivision Systems Inc.\n- * \n+ *\n * This Source Code Form is subject to the terms of the Mozilla Public\n * License, v. 2.0. If a copy of the MPL was not distributed with this\n * file, You can obtain one at http:\/\/mozilla.org\/MPL\/2.0\/.\n- * \n+ *\n *\/\n \n \/*****************************************************************************\n@@ -53,7 +53,6 @@\n #ifndef INC_SRT_BUFFER_H\n #define INC_SRT_BUFFER_H\n \n-\n #include \"udt.h\"\n #include \"list.h\"\n #include \"queue.h\"\n@@ -82,7 +81,8 @@\n : m_dBytesCountMAvg(0.0)\n , m_dCountMAvg(0.0)\n , m_dTimespanMAvg(0.0)\n- { }\n+ {\n+ }\n \n public:\n bool isTimeToUpdate(const time_point& now) const;\n@@ -100,531 +100,486 @@\n double m_dTimespanMAvg;\n };\n \n-\n class CSndBuffer\n {\n- typedef srt::sync::steady_clock::time_point time_point;\n- typedef srt::sync::steady_clock::duration duration;\n-\n-public:\n-\n- \/\/ XXX There's currently no way to access the socket ID set for\n- \/\/ whatever the buffer is currently working for. Required to find\n- \/\/ some way to do this, possibly by having a \"reverse pointer\".\n- \/\/ Currently just \"unimplemented\".\n- std::string CONID() const { return \"\"; }\n-\n- CSndBuffer(int size = 32, int mss = 1500);\n- ~CSndBuffer();\n-\n-public:\n-\n- \/\/\/ Insert a user buffer into the sending list.\n- \/\/\/ For @a w_mctrl the following fields are used:\n- \/\/\/ INPUT:\n- \/\/\/ - msgttl: timeout for retransmitting the message, if lost\n- \/\/\/ - inorder: request to deliver the message in order of sending\n- \/\/\/ - srctime: local time as a base for packet's timestamp (0 if unused)\n- \/\/\/ - pktseq: sequence number to be stamped on the packet (-1 if unused)\n- \/\/\/ - msgno: message number to be stamped on the packet (-1 if unused)\n- \/\/\/ OUTPUT:\n- \/\/\/ - srctime: local time stamped on the packet (same as input, if input wasn't 0)\n- \/\/\/ - pktseq: sequence number to be stamped on the next packet\n- \/\/\/ - msgno: message number stamped on the packet\n- \/\/\/ @param [in] data pointer to the user data block.\n- \/\/\/ @param [in] len size of the block.\n- \/\/\/ @param [inout] w_mctrl Message control data\n- void addBuffer(const char* data, int len, SRT_MSGCTRL& w_mctrl);\n-\n- \/\/\/ Read a block of data from file and insert it into the sending list.\n- \/\/\/ @param [in] ifs input file stream.\n- \/\/\/ @param [in] len size of the block.\n- \/\/\/ @return actual size of data added from the file.\n-\n- int addBufferFromFile(std::fstream& ifs, int len);\n-\n- \/\/\/ Find data position to pack a DATA packet from the furthest reading point.\n- \/\/\/ @param [out] data the pointer to the data position.\n- \/\/\/ @param [out] msgno message number of the packet.\n- \/\/\/ @param [out] origintime origin time stamp of the message\n- \/\/\/ @param [in] kflags Odd|Even crypto key flag\n- \/\/\/ @return Actual length of data read.\n-\n- int readData(CPacket& w_packet, time_point& w_origintime, int kflgs);\n-\n- \/\/\/ Find data position to pack a DATA packet for a retransmission.\n- \/\/\/ @param [out] data the pointer to the data position.\n- \/\/\/ @param [in] offset offset from the last ACK point (backward sequence number difference)\n- \/\/\/ @param [out] msgno message number of the packet.\n- \/\/\/ @param [out] origintime origin time stamp of the message\n- \/\/\/ @param [out] msglen length of the message\n- \/\/\/ @return Actual length of data read.\n-\n- int readData(const int offset, CPacket& w_packet, time_point& w_origintime, int& w_msglen);\n-\n- \/\/\/ Get the time of the last retransmission (if any) of the DATA packet.\n- \/\/\/ @param [in] offset offset from the last ACK point (backward sequence number difference)\n- \/\/\/\n- \/\/\/ @return Last time of the last retransmission event for the corresponding DATA packet.\n-\n- time_point getPacketRexmitTime(const int offset);\n-\n- \/\/\/ Update the ACK point and may release\/unmap\/return the user data according to the flag.\n- \/\/\/ @param [in] offset number of packets acknowledged.\n-\n- int32_t getMsgNoAt(const int offset);\n-\n- void ackData(int offset);\n-\n- \/\/\/ Read size of data still in the sending list.\n- \/\/\/ @return Current size of the data in the sending list.\n-\n- int getCurrBufSize() const;\n-\n- int dropLateData(int& bytes, int32_t& w_first_msgno, const time_point& too_late_time);\n-\n- void updAvgBufSize(const time_point& time);\n- int getAvgBufSize(int& bytes, int& timespan);\n- int getCurrBufSize(int& bytes, int& timespan);\n-\n- uint64_t getInRatePeriod() const { return m_InRatePeriod; }\n-\n- \/\/\/ Retrieve input bitrate in bytes per second\n- int getInputRate() const { return m_iInRateBps; }\n-\n- \/\/\/ Update input rate calculation.\n- \/\/\/ @param [in] time current time in microseconds\n- \/\/\/ @param [in] pkts number of packets newly added to the buffer\n- \/\/\/ @param [in] bytes number of payload bytes in those newly added packets\n- \/\/\/\n- \/\/\/ @return Current size of the data in the sending list.\n- void updateInputRate(const time_point& time, int pkts = 0, int bytes = 0);\n-\n-\n- void resetInputRateSmpPeriod(bool disable = false)\n- {\n- setInputRateSmpPeriod(disable ? 0 : INPUTRATE_FAST_START_US);\n- }\n-\n-private:\n- void increase();\n- void setInputRateSmpPeriod(int period);\n-\n- struct Block; \/\/ Defined below\n- static time_point getSourceTime(const CSndBuffer::Block& block);\n-\n-private: \/\/ Constants\n-\n- static const uint64_t INPUTRATE_FAST_START_US = 500000; \/\/ 500 ms\n- static const uint64_t INPUTRATE_RUNNING_US = 1000000; \/\/ 1000 ms\n- static const int64_t INPUTRATE_MAX_PACKETS = 2000; \/\/ ~ 21 Mbps of 1316 bytes payload\n+ typedef srt::sync::steady_clock::time_point time_point;\n+ typedef srt::sync::steady_clock::duration duration;\n+\n+public:\n+ \/\/ XXX There's currently no way to access the socket ID set for\n+ \/\/ whatever the buffer is currently working for. Required to find\n+ \/\/ some way to do this, possibly by having a \"reverse pointer\".\n+ \/\/ Currently just \"unimplemented\".\n+ std::string CONID() const { return \"\"; }\n+\n+ CSndBuffer(int size = 32, int mss = 1500);\n+ ~CSndBuffer();\n+\n+public:\n+ \/\/\/ Insert a user buffer into the sending list.\n+ \/\/\/ For @a w_mctrl the following fields are used:\n+ \/\/\/ INPUT:\n+ \/\/\/ - msgttl: timeout for retransmitting the message, if lost\n+ \/\/\/ - inorder: request to deliver the message in order of sending\n+ \/\/\/ - srctime: local time as a base for packet's timestamp (0 if unused)\n+ \/\/\/ - pktseq: sequence number to be stamped on the packet (-1 if unused)\n+ \/\/\/ - msgno: message number to be stamped on the packet (-1 if unused)\n+ \/\/\/ OUTPUT:\n+ \/\/\/ - srctime: local time stamped on the packet (same as input, if input wasn't 0)\n+ \/\/\/ - pktseq: sequence number to be stamped on the next packet\n+ \/\/\/ - msgno: message number stamped on the packet\n+ \/\/\/ @param [in] data pointer to the user data block.\n+ \/\/\/ @param [in] len size of the block.\n+ \/\/\/ @param [inout] w_mctrl Message control data\n+ void addBuffer(const char* data, int len, SRT_MSGCTRL& w_mctrl);\n+\n+ \/\/\/ Read a block of data from file and insert it into the sending list.\n+ \/\/\/ @param [in] ifs input file stream.\n+ \/\/\/ @param [in] len size of the block.\n+ \/\/\/ @return actual size of data added from the file.\n+ int addBufferFromFile(std::fstream& ifs, int len);\n+\n+ \/\/\/ Find data position to pack a DATA packet from the furthest reading point.\n+ \/\/\/ @param [out] data the pointer to the data position.\n+ \/\/\/ @param [out] msgno message number of the packet.\n+ \/\/\/ @param [out] origintime origin time stamp of the message\n+ \/\/\/ @param [in] kflags Odd|Even crypto key flag\n+ \/\/\/ @return Actual length of data read.\n+ int readData(CPacket& w_packet, time_point& w_origintime, int kflgs);\n+\n+ \/\/\/ Find data position to pack a DATA packet for a retransmission.\n+ \/\/\/ @param [out] data the pointer to the data position.\n+ \/\/\/ @param [in] offset offset from the last ACK point (backward sequence number difference)\n+ \/\/\/ @param [out] msgno message number of the packet.\n+ \/\/\/ @param [out] origintime origin time stamp of the message\n+ \/\/\/ @param [out] msglen length of the message\n+ \/\/\/ @return Actual length of data read.\n+ int readData(const int offset, CPacket& w_packet, time_point& w_origintime, int& w_msglen);\n+\n+ \/\/\/ Get the time of the last retransmission (if any) of the DATA packet.\n+ \/\/\/ @param [in] offset offset from the last ACK point (backward sequence number difference)\n+ \/\/\/\n+ \/\/\/ @return Last time of the last retransmission event for the corresponding DATA packet.\n+ time_point getPacketRexmitTime(const int offset);\n+\n+ \/\/\/ Update the ACK point and may release\/unmap\/return the user data according to the flag.\n+ \/\/\/ @param [in] offset number of packets acknowledged.\n+ int32_t getMsgNoAt(const int offset);\n+\n+ void ackData(int offset);\n+\n+ \/\/\/ Read size of data still in the sending list.\n+ \/\/\/ @return Current size of the data in the sending list.\n+ int getCurrBufSize() const;\n+\n+ int dropLateData(int& bytes, int32_t& w_first_msgno, const time_point& too_late_time);\n+\n+ void updAvgBufSize(const time_point& time);\n+ int getAvgBufSize(int& bytes, int& timespan);\n+ int getCurrBufSize(int& bytes, int& timespan);\n+\n+ uint64_t getInRatePeriod() const { return m_InRatePeriod; }\n+\n+ \/\/\/ Retrieve input bitrate in bytes per second\n+ int getInputRate() const { return m_iInRateBps; }\n+\n+ \/\/\/ Update input rate calculation.\n+ \/\/\/ @param [in] time current time in microseconds\n+ \/\/\/ @param [in] pkts number of packets newly added to the buffer\n+ \/\/\/ @param [in] bytes number of payload bytes in those newly added packets\n+ \/\/\/\n+ \/\/\/ @return Current size of the data in the sending list.\n+ void updateInputRate(const time_point& time, int pkts = 0, int bytes = 0);\n+\n+ void resetInputRateSmpPeriod(bool disable = false) { setInputRateSmpPeriod(disable ? 0 : INPUTRATE_FAST_START_US); }\n+\n+private:\n+ void increase();\n+ void setInputRateSmpPeriod(int period);\n+\n+ struct Block; \/\/ Defined below\n+ static time_point getSourceTime(const CSndBuffer::Block& block);\n+\n+private: \/\/ Constants\n+ static const uint64_t INPUTRATE_FAST_START_US = 500000; \/\/ 500 ms\n+ static const uint64_t INPUTRATE_RUNNING_US = 1000000; \/\/ 1000 ms\n+ static const int64_t INPUTRATE_MAX_PACKETS = 2000; \/\/ ~ 21 Mbps of 1316 bytes payload\n static const int INPUTRATE_INITIAL_BYTESPS = BW_INFINITE;\n \n private:\n- srt::sync::Mutex m_BufLock; \/\/ used to synchronize buffer operation\n-\n- struct Block\n- {\n- char* m_pcData; \/\/ pointer to the data block\n- int m_iLength; \/\/ length of the block\n-\n- int32_t m_iMsgNoBitset; \/\/ message number\n- int32_t m_iSeqNo; \/\/ sequence number for scheduling\n- time_point m_tsOriginTime; \/\/ original request time\n- time_point m_tsRexmitTime; \/\/ packet retransmission time\n- uint64_t m_llSourceTime_us;\n- int m_iTTL; \/\/ time to live (milliseconds)\n-\n- Block* m_pNext; \/\/ next block\n-\n- int32_t getMsgSeq()\n- {\n- \/\/ NOTE: this extracts message ID with regard to REXMIT flag.\n- \/\/ This is valid only for message ID that IS GENERATED in this instance,\n- \/\/ not provided by the peer. This can be otherwise sent to the peer - it doesn't matter\n- \/\/ for the peer that it uses LESS bits to represent the message.\n- return m_iMsgNoBitset & MSGNO_SEQ::mask;\n- }\n-\n- } *m_pBlock, *m_pFirstBlock, *m_pCurrBlock, *m_pLastBlock;\n-\n- \/\/ m_pBlock: The head pointer\n- \/\/ m_pFirstBlock: The first block\n- \/\/ m_pCurrBlock:\tThe current block\n- \/\/ m_pLastBlock: The last block (if first == last, buffer is empty)\n-\n- struct Buffer\n- {\n- char* m_pcData; \/\/ buffer\n- int m_iSize; \/\/ size\n- Buffer* m_pNext; \/\/ next buffer\n- } *m_pBuffer; \/\/ physical buffer\n-\n- int32_t m_iNextMsgNo; \/\/ next message number\n-\n- int m_iSize; \/\/ buffer size (number of packets)\n- int m_iMSS; \/\/ maximum seqment\/packet size\n-\n- int m_iCount; \/\/ number of used blocks\n-\n- int m_iBytesCount; \/\/ number of payload bytes in queue\n- time_point m_tsLastOriginTime;\n-\n- AvgBufSize m_mavg;\n-\n- int m_iInRatePktsCount; \/\/ number of payload bytes added since InRateStartTime\n- int m_iInRateBytesCount; \/\/ number of payload bytes added since InRateStartTime\n- time_point m_tsInRateStartTime;\n- uint64_t m_InRatePeriod; \/\/ usec\n- int m_iInRateBps; \/\/ Input Rate in Bytes\/sec\n- int m_iAvgPayloadSz; \/\/ Average packet payload size\n-\n-private:\n- CSndBuffer(const CSndBuffer&);\n- CSndBuffer& operator=(const CSndBuffer&);\n+ srt::sync::Mutex m_BufLock; \/\/ used to synchronize buffer operation\n+\n+ struct Block\n+ {\n+ char* m_pcData; \/\/ pointer to the data block\n+ int m_iLength; \/\/ length of the block\n+\n+ int32_t m_iMsgNoBitset; \/\/ message number\n+ int32_t m_iSeqNo; \/\/ sequence number for scheduling\n+ time_point m_tsOriginTime; \/\/ original request time\n+ time_point m_tsRexmitTime; \/\/ packet retransmission time\n+ uint64_t m_llSourceTime_us;\n+ int m_iTTL; \/\/ time to live (milliseconds)\n+\n+ Block* m_pNext; \/\/ next block\n+\n+ int32_t getMsgSeq()\n+ {\n+ \/\/ NOTE: this extracts message ID with regard to REXMIT flag.\n+ \/\/ This is valid only for message ID that IS GENERATED in this instance,\n+ \/\/ not provided by the peer. This can be otherwise sent to the peer - it doesn't matter\n+ \/\/ for the peer that it uses LESS bits to represent the message.\n+ return m_iMsgNoBitset & MSGNO_SEQ::mask;\n+ }\n+\n+ } * m_pBlock, *m_pFirstBlock, *m_pCurrBlock, *m_pLastBlock;\n+\n+ \/\/ m_pBlock: The head pointer\n+ \/\/ m_pFirstBlock: The first block\n+ \/\/ m_pCurrBlock:\tThe current block\n+ \/\/ m_pLastBlock: The last block (if first == last, buffer is empty)\n+\n+ struct Buffer\n+ {\n+ char* m_pcData; \/\/ buffer\n+ int m_iSize; \/\/ size\n+ Buffer* m_pNext; \/\/ next buffer\n+ } * m_pBuffer; \/\/ physical buffer\n+\n+ int32_t m_iNextMsgNo; \/\/ next message number\n+\n+ int m_iSize; \/\/ buffer size (number of packets)\n+ int m_iMSS; \/\/ maximum seqment\/packet size\n+\n+ int m_iCount; \/\/ number of used blocks\n+\n+ int m_iBytesCount; \/\/ number of payload bytes in queue\n+ time_point m_tsLastOriginTime;\n+\n+ AvgBufSize m_mavg;\n+\n+ int m_iInRatePktsCount; \/\/ number of payload bytes added since InRateStartTime\n+ int m_iInRateBytesCount; \/\/ number of payload bytes added since InRateStartTime\n+ time_point m_tsInRateStartTime;\n+ uint64_t m_InRatePeriod; \/\/ usec\n+ int m_iInRateBps; \/\/ Input Rate in Bytes\/sec\n+ int m_iAvgPayloadSz; \/\/ Average packet payload size\n+\n+private:\n+ CSndBuffer(const CSndBuffer&);\n+ CSndBuffer& operator=(const CSndBuffer&);\n };\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n-\n \n class CRcvBuffer\n {\n typedef srt::sync::steady_clock::time_point time_point;\n- typedef srt::sync::steady_clock::duration duration;\n-\n-public:\n-\n+ typedef srt::sync::steady_clock::duration duration;\n+\n+public:\n \/\/ XXX There's currently no way to access the socket ID set for\n \/\/ whatever the queue is currently working for. Required to find\n \/\/ some way to do this, possibly by having a \"reverse pointer\".\n \/\/ Currently just \"unimplemented\".\n std::string CONID() const { return \"\"; }\n \n- static const int DEFAULT_SIZE = 65536;\n- \/\/\/ Construct the buffer.\n- \/\/\/ @param [in] queue CUnitQueue that actually holds the units (packets)\n- \/\/\/ @param [in] bufsize_pkts in units (packets)\n- CRcvBuffer(CUnitQueue* queue, int bufsize_pkts = DEFAULT_SIZE);\n- ~CRcvBuffer();\n-\n-\n-public:\n-\n- \/\/\/ Write data into the buffer.\n- \/\/\/ @param [in] unit pointer to a data unit containing new packet\n- \/\/\/ @param [in] offset offset from last ACK point.\n- \/\/\/ @return 0 is success, -1 if data is repeated.\n-\n- int addData(CUnit* unit, int offset);\n-\n- \/\/\/ Read data into a user buffer.\n- \/\/\/ @param [in] data pointer to user buffer.\n- \/\/\/ @param [in] len length of user buffer.\n- \/\/\/ @return size of data read.\n-\n- int readBuffer(char* data, int len);\n-\n- \/\/\/ Read data directly into file.\n- \/\/\/ @param [in] file C++ file stream.\n- \/\/\/ @param [in] len expected length of data to write into the file.\n- \/\/\/ @return size of data read.\n-\n- int readBufferToFile(std::fstream& ofs, int len);\n-\n- \/\/\/ Update the ACK point of the buffer.\n- \/\/\/ @param [in] len number of units to be acknowledged.\n- \/\/\/ @return 1 if a user buffer is fulfilled, otherwise 0.\n-\n- int ackData(int len);\n-\n- \/\/\/ Query how many buffer space left for data receiving.\n- \/\/\/ Actually only acknowledged packets, that are still in the buffer,\n- \/\/\/ are considered to take buffer space.\n- \/\/\/\n- \/\/\/ @return size of available buffer space (including user buffer) for data receiving.\n- \/\/\/ Not counting unacknowledged packets.\n-\n- int getAvailBufSize() const;\n-\n- \/\/\/ Query how many data has been continuously received (for reading) and ready to play (tsbpdtime < now).\n- \/\/\/ @return size of valid (continous) data for reading.\n-\n- int getRcvDataSize() const;\n-\n- \/\/\/ Query how many data was received and acknowledged.\n- \/\/\/ @param [out] bytes bytes\n- \/\/\/ @param [out] spantime spantime\n- \/\/\/ @return size in pkts of acked data.\n-\n- int getRcvDataSize(int& bytes, int &spantime);\n-\n- \/\/\/ Query a 1 sec moving average of how many data was received and acknowledged.\n- \/\/\/ @param [out] bytes bytes\n- \/\/\/ @param [out] spantime spantime\n- \/\/\/ @return size in pkts of acked data.\n-\n- int getRcvAvgDataSize(int& bytes, int& spantime);\n-\n- \/\/\/ Query how many data of the receive buffer is acknowledged.\n- \/\/\/ @param [in] now current time in us.\n- \/\/\/ @return none.\n-\n- void updRcvAvgDataSize(const time_point& now);\n-\n- \/\/\/ Query the received average payload size.\n- \/\/\/ @return size (bytes) of payload size\n-\n- unsigned getRcvAvgPayloadSize() const;\n-\n-\n- \/\/\/ Mark the message to be dropped from the message list.\n- \/\/\/ @param [in] msgno message number.\n- \/\/\/ @param [in] using_rexmit_flag whether the MSGNO field uses rexmit flag (if not, one more bit is part of the msgno value)\n-\n- void dropMsg(int32_t msgno, bool using_rexmit_flag);\n-\n- \/\/\/ read a message.\n- \/\/\/ @param [out] data buffer to write the message into.\n- \/\/\/ @param [in] len size of the buffer.\n- \/\/\/ @return actuall size of data read.\n-\n- int readMsg(char* data, int len);\n+ static const int DEFAULT_SIZE = 65536;\n+ \/\/\/ Construct the buffer.\n+ \/\/\/ @param [in] queue CUnitQueue that actually holds the units (packets)\n+ \/\/\/ @param [in] bufsize_pkts in units (packets)\n+ CRcvBuffer(CUnitQueue* queue, int bufsize_pkts = DEFAULT_SIZE);\n+ ~CRcvBuffer();\n+\n+public:\n+ \/\/\/ Write data into the buffer.\n+ \/\/\/ @param [in] unit pointer to a data unit containing new packet\n+ \/\/\/ @param [in] offset offset from last ACK point.\n+ \/\/\/ @return 0 is success, -1 if data is repeated.\n+ int addData(CUnit* unit, int offset);\n+\n+ \/\/\/ Read data into a user buffer.\n+ \/\/\/ @param [in] data pointer to user buffer.\n+ \/\/\/ @param [in] len length of user buffer.\n+ \/\/\/ @return size of data read.\n+ int readBuffer(char* data, int len);\n+\n+ \/\/\/ Read data directly into file.\n+ \/\/\/ @param [in] file C++ file stream.\n+ \/\/\/ @param [in] len expected length of data to write into the file.\n+ \/\/\/ @return size of data read.\n+ int readBufferToFile(std::fstream& ofs, int len);\n+\n+ \/\/\/ Update the ACK point of the buffer.\n+ \/\/\/ @param [in] len number of units to be acknowledged.\n+ \/\/\/ @return 1 if a user buffer is fulfilled, otherwise 0.\n+ int ackData(int len);\n+\n+ \/\/\/ Query how many buffer space left for data receiving.\n+ \/\/\/ Actually only acknowledged packets, that are still in the buffer,\n+ \/\/\/ are considered to take buffer space.\n+ \/\/\/\n+ \/\/\/ @return size of available buffer space (including user buffer) for data receiving.\n+ \/\/\/ Not counting unacknowledged packets.\n+ int getAvailBufSize() const;\n+\n+ \/\/\/ Query how many data has been continuously received (for reading) and ready to play (tsbpdtime < now).\n+ \/\/\/ @return size of valid (continous) data for reading.\n+ int getRcvDataSize() const;\n+\n+ \/\/\/ Query how many data was received and acknowledged.\n+ \/\/\/ @param [out] bytes bytes\n+ \/\/\/ @param [out] spantime spantime\n+ \/\/\/ @return size in pkts of acked data.\n+ int getRcvDataSize(int& bytes, int& spantime);\n+\n+ \/\/\/ Query a 1 sec moving average of how many data was received and acknowledged.\n+ \/\/\/ @param [out] bytes bytes\n+ \/\/\/ @param [out] spantime spantime\n+ \/\/\/ @return size in pkts of acked data.\n+ int getRcvAvgDataSize(int& bytes, int& spantime);\n+\n+ \/\/\/ Query how many data of the receive buffer is acknowledged.\n+ \/\/\/ @param [in] now current time in us.\n+ \/\/\/ @return none.\n+ void updRcvAvgDataSize(const time_point& now);\n+\n+ \/\/\/ Query the received average payload size.\n+ \/\/\/ @return size (bytes) of payload size\n+ unsigned getRcvAvgPayloadSize() const;\n+\n+ \/\/\/ Mark the message to be dropped from the message list.\n+ \/\/\/ @param [in] msgno message number.\n+ \/\/\/ @param [in] using_rexmit_flag whether the MSGNO field uses rexmit flag (if not, one more bit is part of the\n+ \/\/\/ msgno value)\n+ void dropMsg(int32_t msgno, bool using_rexmit_flag);\n+\n+ \/\/\/ read a message.\n+ \/\/\/ @param [out] data buffer to write the message into.\n+ \/\/\/ @param [in] len size of the buffer.\n+ \/\/\/ @return actuall size of data read.\n+ int readMsg(char* data, int len);\n \n #if ENABLE_HEAVY_LOGGING\n- void readMsgHeavyLogging(int p);\n+ void readMsgHeavyLogging(int p);\n #endif\n \n- \/\/\/ read a message.\n- \/\/\/ @param [out] data buffer to write the message into.\n- \/\/\/ @param [in] len size of the buffer.\n- \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay\n- \/\/\/ @return actuall size of data read.\n-\n- int readMsg(char* data, int len, SRT_MSGCTRL& w_mctrl, int upto);\n- \/\/\/ Query if data is ready to read (tsbpdtime <= now if TsbPD is active).\n- \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay\n- \/\/\/ of next packet in recv buffer, ready or not.\n- \/\/\/ @param [out] curpktseq Sequence number of the packet if there is one ready to play\n- \/\/\/ @return true if ready to play, false otherwise (tsbpdtime may be !0 in\n- \/\/\/ both cases).\n-\n- bool isRcvDataReady(time_point& w_tsbpdtime, int32_t& w_curpktseq, int32_t seqdistance);\n+ \/\/\/ read a message.\n+ \/\/\/ @param [out] data buffer to write the message into.\n+ \/\/\/ @param [in] len size of the buffer.\n+ \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay\n+ \/\/\/ @return actuall size of data read.\n+ int readMsg(char* data, int len, SRT_MSGCTRL& w_mctrl, int upto);\n+\n+ \/\/\/ Query if data is ready to read (tsbpdtime <= now if TsbPD is active).\n+ \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay\n+ \/\/\/ of next packet in recv buffer, ready or not.\n+ \/\/\/ @param [out] curpktseq Sequence number of the packet if there is one ready to play\n+ \/\/\/ @return true if ready to play, false otherwise (tsbpdtime may be !0 in\n+ \/\/\/ both cases).\n+ bool isRcvDataReady(time_point& w_tsbpdtime, int32_t& w_curpktseq, int32_t seqdistance);\n \n #ifdef SRT_DEBUG_TSBPD_OUTJITTER\n- void debugTraceJitter(int64_t);\n+ void debugTraceJitter(int64_t);\n #else\n- void debugTraceJitter(int64_t) {}\n-#endif \/* SRT_DEBUG_TSBPD_OUTJITTER *\/\n-\n- bool isRcvDataReady();\n- bool isRcvDataAvailable()\n- {\n- return m_iLastAckPos != m_iStartPos;\n- }\n- CPacket* getRcvReadyPacket(int32_t seqdistance);\n-\n- \/\/\/ Set TimeStamp-Based Packet Delivery Rx Mode\n- \/\/\/ @param [in] timebase localtime base (uSec) of packet time stamps including buffering delay\n- \/\/\/ @param [in] delay aggreed TsbPD delay\n- \/\/\/ @return 0\n-\n- int setRcvTsbPdMode(const time_point& timebase, const duration& delay);\n-\n- \/\/\/ Add packet timestamp for drift caclculation and compensation\n- \/\/\/ @param [in] timestamp packet time stamp\n- \/\/\/ @param [ref] lock Mutex that should be locked for the operation\n-\n- bool addRcvTsbPdDriftSample(uint32_t timestamp, srt::sync::Mutex& mutex_to_lock,\n- duration& w_udrift, time_point& w_newtimebase);\n+ void debugTraceJitter(int64_t) {}\n+#endif \/* SRT_DEBUG_TSBPD_OUTJITTER *\/\n+\n+ bool isRcvDataReady();\n+ bool isRcvDataAvailable() { return m_iLastAckPos != m_iStartPos; }\n+ CPacket* getRcvReadyPacket(int32_t seqdistance);\n+\n+ \/\/\/ Set TimeStamp-Based Packet Delivery Rx Mode\n+ \/\/\/ @param [in] timebase localtime base (uSec) of packet time stamps including buffering delay\n+ \/\/\/ @param [in] delay aggreed TsbPD delay\n+ \/\/\/ @return 0\n+ int setRcvTsbPdMode(const time_point& timebase, const duration& delay);\n+\n+ \/\/\/ Add packet timestamp for drift caclculation and compensation\n+ \/\/\/ @param [in] timestamp packet time stamp\n+ \/\/\/ @param [ref] lock Mutex that should be locked for the operation\n+ bool addRcvTsbPdDriftSample(uint32_t timestamp,\n+ srt::sync::Mutex& mutex_to_lock,\n+ duration& w_udrift,\n+ time_point& w_newtimebase);\n \n #ifdef SRT_DEBUG_TSBPD_DRIFT\n- void printDriftHistogram(int64_t iDrift);\n- void printDriftOffset(int tsbPdOffset, int tsbPdDriftAvg);\n+ void printDriftHistogram(int64_t iDrift);\n+ void printDriftOffset(int tsbPdOffset, int tsbPdDriftAvg);\n #endif\n \n- \/\/\/ Get information on the 1st message in queue.\n- \/\/ Parameters (of the 1st packet queue, ready to play or not):\n- \/\/\/ @param [out] w_tsbpdtime localtime-based (uSec) packet time stamp including buffering delay of 1st packet or 0 if none\n- \/\/\/ @param [out] w_passack true if 1st ready packet is not yet acknowleged (allowed to be delivered to the app)\n- \/\/\/ @param [out] w_skipseqno SRT_SEQNO_NONE or seq number of 1st unacknowledged pkt ready to play preceeded by missing packets.\n- \/\/\/ @retval true 1st packet ready to play (tsbpdtime <= now). Not yet acknowledged if passack == true\n- \/\/\/ @retval false IF tsbpdtime = 0: rcv buffer empty; ELSE:\n- \/\/\/ IF skipseqno != SRT_SEQNO_NONE, packet ready to play preceeded by missing packets.;\n- \/\/\/ IF skipseqno == SRT_SEQNO_NONE, no missing packet but 1st not ready to play.\n-\n-\n- bool getRcvFirstMsg(time_point& w_tsbpdtime, bool& w_passack, int32_t& w_skipseqno, int32_t& w_curpktseq);\n-\n- \/\/\/ Update the ACK point of the buffer.\n- \/\/\/ @param [in] len size of data to be skip & acknowledged.\n-\n- void skipData(int len);\n+ \/\/\/ Get information on the 1st message in queue.\n+ \/\/ Parameters (of the 1st packet queue, ready to play or not):\n+ \/\/\/ @param [out] w_tsbpdtime localtime-based (uSec) packet time stamp including buffering delay of 1st packet or 0\n+ \/\/\/ if none\n+ \/\/\/ @param [out] w_passack true if 1st ready packet is not yet acknowleged (allowed to be delivered to the app)\n+ \/\/\/ @param [out] w_skipseqno SRT_SEQNO_NONE or seq number of 1st unacknowledged pkt ready to play preceeded by\n+ \/\/\/ missing packets.\n+ \/\/\/ @retval true 1st packet ready to play (tsbpdtime <= now). Not yet acknowledged if passack == true\n+ \/\/\/ @retval false IF tsbpdtime = 0: rcv buffer empty; ELSE:\n+ \/\/\/ IF skipseqno != SRT_SEQNO_NONE, packet ready to play preceeded by missing packets.;\n+ \/\/\/ IF skipseqno == SRT_SEQNO_NONE, no missing packet but 1st not ready to play.\n+ bool getRcvFirstMsg(time_point& w_tsbpdtime, bool& w_passack, int32_t& w_skipseqno, int32_t& w_curpktseq);\n+\n+ \/\/\/ Update the ACK point of the buffer.\n+ \/\/\/ @param [in] len size of data to be skip & acknowledged.\n+ void skipData(int len);\n \n #if ENABLE_HEAVY_LOGGING\n- void reportBufferStats() const; \/\/ Heavy logging Debug only\n+ void reportBufferStats() const; \/\/ Heavy logging Debug only\n #endif\n- bool empty() const\n- {\n- \/\/ This will not always return the intended value,\n- \/\/ that is, it may return false when the buffer really is\n- \/\/ empty - but it will return true then in one of next calls.\n- \/\/ This function will be always called again at some point\n- \/\/ if it returned false, and on true the connection\n- \/\/ is going to be broken - so this behavior is acceptable.\n- return m_iStartPos == m_iLastAckPos;\n- }\n- bool full() const { return m_iStartPos == (m_iLastAckPos+1)%m_iSize; }\n- int capacity() const { return m_iSize; }\n-\n-\n-private:\n- \/\/\/ This gives up unit at index p. The unit is given back to the\n- \/\/\/ free unit storage for further assignment for the new incoming\n- \/\/\/ data.\n- size_t freeUnitAt(size_t p)\n- {\n- CUnit* u = m_pUnit[p];\n- m_pUnit[p] = NULL;\n- size_t rmbytes = u->m_Packet.getLength();\n- m_pUnitQueue->makeUnitFree(u);\n- return rmbytes;\n- }\n-\n- \/\/\/ Adjust receive queue to 1st ready to play message (tsbpdtime < now).\n- \/\/ Parameters (of the 1st packet queue, ready to play or not):\n- \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay of 1st packet or 0 if none\n- \/\/\/ @retval true 1st packet ready to play without discontinuity (no hole)\n- \/\/\/ @retval false tsbpdtime = 0: no packet ready to play\n-\n-\n- bool getRcvReadyMsg(time_point& w_tsbpdtime, int32_t& w_curpktseq, int upto);\n-\n-public:\n-\n- \/\/ (This is exposed as used publicly in logs)\n- \/\/\/ Get packet delivery local time base (adjusted for wrap around)\n- \/\/\/ @param [in] timestamp packet timestamp (relative to peer StartTime), wrapping around every ~72 min\n- \/\/\/ @return local delivery time (usec)\n-\n- time_point getTsbPdTimeBase(uint32_t timestamp_us);\n-\n- int64_t getDrift() const { return m_DriftTracer.drift(); }\n-\n-public:\n- int32_t getTopMsgno() const;\n-\n- \/\/ @return Wrap check value\n- bool getInternalTimeBase(time_point& w_tb, duration& w_udrift);\n-\n- void applyGroupTime(const time_point& timebase, bool wrapcheck, uint32_t delay, const duration& udrift);\n- void applyGroupDrift(const time_point& timebase, bool wrapcheck, const duration& udrift);\n- time_point getPktTsbPdTime(uint32_t timestamp);\n- int debugGetSize() const;\n- time_point debugGetDeliveryTime(int offset);\n-\n- size_t dropData(int len);\n-\n-private:\n- int extractData(char *data, int len, int p, int q, bool passack);\n- bool accessMsg(int& w_p, int& w_q, bool& w_passack, int64_t& w_playtime, int upto);\n-\n- \/\/\/ Describes the state of the first N packets\n- std::string debugTimeState(size_t first_n_pkts) const;\n- \n- \/\/\/ thread safe bytes counter of the Recv & Ack buffer\n- \/\/\/ @param [in] pkts acked or removed pkts from rcv buffer (used with acked = true)\n- \/\/\/ @param [in] bytes number of bytes added\/delete (if negative) to\/from rcv buffer.\n- \/\/\/ @param [in] acked true when adding new pkt in RcvBuffer; false when acking\/removing pkts to\/from buffer\n-\n- void countBytes(int pkts, int bytes, bool acked = false);\n-\n-private:\n- bool scanMsg(int& w_start, int& w_end, bool& w_passack);\n-\n- int shift(int basepos, int shift) const\n- {\n- return (basepos + shift) % m_iSize;\n- }\n-\n- \/\/ Simplified versions with ++ and --; avoid using division instruction\n- int shiftFwd(int basepos) const\n- {\n- if (++basepos == m_iSize)\n- return 0;\n- return basepos;\n- }\n-\n- int shiftBack(int basepos) const\n- {\n- if (basepos == 0)\n- return m_iSize-1;\n- return --basepos;\n- }\n-\n-private:\n- CUnit** m_pUnit; \/\/ Array of pointed units collected in the buffer\n- const int m_iSize; \/\/ Size of the internal array of CUnit* items\n- CUnitQueue* m_pUnitQueue; \/\/ the shared unit queue\n-\n- int m_iStartPos; \/\/ HEAD: first packet available for reading\n- int m_iLastAckPos; \/\/ the last ACKed position (exclusive), follows the last readable\n- \/\/ EMPTY: m_iStartPos = m_iLastAckPos FULL: m_iStartPos = m_iLastAckPos + 1\n- int m_iMaxPos; \/\/ delta between acked-TAIL and reception-TAIL\n-\n-\n- int m_iNotch; \/\/ the starting read point of the first unit\n- \/\/ (this is required for stream reading mode; it's\n- \/\/ the position in the first unit in the list\n- \/\/ up to which data are already retrieved;\n- \/\/ in message reading mode it's unused and always 0)\n-\n- srt::sync::Mutex m_BytesCountLock; \/\/ used to protect counters operations\n- int m_iBytesCount; \/\/ Number of payload bytes in the buffer\n- int m_iAckedPktsCount; \/\/ Number of acknowledged pkts in the buffer\n- int m_iAckedBytesCount; \/\/ Number of acknowledged payload bytes in the buffer\n- unsigned m_uAvgPayloadSz; \/\/ Average payload size for dropped bytes estimation\n-\n- bool m_bTsbPdMode; \/\/ true: apply TimeStamp-Based Rx Mode\n- duration m_tdTsbPdDelay; \/\/ aggreed delay\n- time_point m_tsTsbPdTimeBase; \/\/ localtime base for TsbPd mode\n- \/\/ Note: m_tsTsbPdTimeBase cumulates values from:\n- \/\/ 1. Initial SRT_CMD_HSREQ packet returned value diff to current time:\n- \/\/ == (NOW - PACKET_TIMESTAMP), at the time of HSREQ reception\n- \/\/ 2. Timestamp overflow (@c CRcvBuffer::getTsbPdTimeBase), when overflow on packet detected\n- \/\/ += CPacket::MAX_TIMESTAMP+1 (it's a hex round value, usually 0x1*e8).\n- \/\/ 3. Time drift (CRcvBuffer::addRcvTsbPdDriftSample, executed exclusively\n- \/\/ from UMSG_ACKACK handler). This is updated with (positive or negative) TSBPD_DRIFT_MAX_VALUE\n- \/\/ once the value of average drift exceeds this value in whatever direction.\n- \/\/ += (+\/-)CRcvBuffer::TSBPD_DRIFT_MAX_VALUE\n- \/\/\n- \/\/ XXX Application-supplied timestamps won't work therefore. This requires separate\n- \/\/ calculation of all these things above.\n-\n- bool m_bTsbPdWrapCheck; \/\/ true: check packet time stamp wrap around\n- static const uint32_t TSBPD_WRAP_PERIOD = (30*1000000); \/\/30 seconds (in usec)\n-\n- \/\/\/ Max drift (usec) above which TsbPD Time Offset is adjusted\n- static const int TSBPD_DRIFT_MAX_VALUE = 5000;\n- \/\/\/ Number of samples (UMSG_ACKACK packets) to perform drift caclulation and compensation\n- static const int TSBPD_DRIFT_MAX_SAMPLES = 1000;\n- DriftTracer<TSBPD_DRIFT_MAX_SAMPLES, TSBPD_DRIFT_MAX_VALUE> m_DriftTracer;\n- AvgBufSize m_mavg;\n+ bool empty() const\n+ {\n+ \/\/ This will not always return the intended value,\n+ \/\/ that is, it may return false when the buffer really is\n+ \/\/ empty - but it will return true then in one of next calls.\n+ \/\/ This function will be always called again at some point\n+ \/\/ if it returned false, and on true the connection\n+ \/\/ is going to be broken - so this behavior is acceptable.\n+ return m_iStartPos == m_iLastAckPos;\n+ }\n+ bool full() const { return m_iStartPos == (m_iLastAckPos + 1) % m_iSize; }\n+ int capacity() const { return m_iSize; }\n+\n+private:\n+ \/\/\/ This gives up unit at index p. The unit is given back to the\n+ \/\/\/ free unit storage for further assignment for the new incoming\n+ \/\/\/ data.\n+ size_t freeUnitAt(size_t p)\n+ {\n+ CUnit* u = m_pUnit[p];\n+ m_pUnit[p] = NULL;\n+ size_t rmbytes = u->m_Packet.getLength();\n+ m_pUnitQueue->makeUnitFree(u);\n+ return rmbytes;\n+ }\n+\n+ \/\/\/ Adjust receive queue to 1st ready to play message (tsbpdtime < now).\n+ \/\/\/ Parameters (of the 1st packet queue, ready to play or not):\n+ \/\/\/ @param [out] tsbpdtime localtime-based (uSec) packet time stamp including buffering delay of 1st packet or 0 if\n+ \/\/\/ none\n+ \/\/\/ @retval true 1st packet ready to play without discontinuity (no hole)\n+ \/\/\/ @retval false tsbpdtime = 0: no packet ready to play\n+ bool getRcvReadyMsg(time_point& w_tsbpdtime, int32_t& w_curpktseq, int upto);\n+\n+public:\n+ \/\/\/ Get packet delivery local time base (adjusted for wrap around)\n+ \/\/\/ (Exposed as used publicly in logs)\n+ \/\/\/ @param [in] timestamp packet timestamp (relative to peer StartTime), wrapping around every ~72 min\n+ \/\/\/ @return local delivery time (usec)\n+ time_point getTsbPdTimeBase(uint32_t timestamp_us);\n+\n+ int64_t getDrift() const { return m_DriftTracer.drift(); }\n+\n+public:\n+ int32_t getTopMsgno() const;\n+\n+ \/\/ @return Wrap check value\n+ bool getInternalTimeBase(time_point& w_tb, duration& w_udrift);\n+\n+ void applyGroupTime(const time_point& timebase, bool wrapcheck, uint32_t delay, const duration& udrift);\n+ void applyGroupDrift(const time_point& timebase, bool wrapcheck, const duration& udrift);\n+ time_point getPktTsbPdTime(uint32_t timestamp);\n+ int debugGetSize() const;\n+ time_point debugGetDeliveryTime(int offset);\n+\n+ size_t dropData(int len);\n+\n+private:\n+ int extractData(char* data, int len, int p, int q, bool passack);\n+ bool accessMsg(int& w_p, int& w_q, bool& w_passack, int64_t& w_playtime, int upto);\n+\n+ \/\/\/ Describes the state of the first N packets\n+ std::string debugTimeState(size_t first_n_pkts) const;\n+\n+ \/\/\/ thread safe bytes counter of the Recv & Ack buffer\n+ \/\/\/ @param [in] pkts acked or removed pkts from rcv buffer (used with acked = true)\n+ \/\/\/ @param [in] bytes number of bytes added\/delete (if negative) to\/from rcv buffer.\n+ \/\/\/ @param [in] acked true when adding new pkt in RcvBuffer; false when acking\/removing pkts to\/from buffer\n+ void countBytes(int pkts, int bytes, bool acked = false);\n+\n+private:\n+ bool scanMsg(int& w_start, int& w_end, bool& w_passack);\n+\n+ int shift(int basepos, int shift) const { return (basepos + shift) % m_iSize; }\n+\n+ \/\/\/ Simplified versions with ++ and --; avoid using division instruction\n+ int shiftFwd(int basepos) const\n+ {\n+ if (++basepos == m_iSize)\n+ return 0;\n+ return basepos;\n+ }\n+\n+ int shiftBack(int basepos) const\n+ {\n+ if (basepos == 0)\n+ return m_iSize - 1;\n+ return --basepos;\n+ }\n+\n+private:\n+ CUnit** m_pUnit; \/\/ Array of pointed units collected in the buffer\n+ const int m_iSize; \/\/ Size of the internal array of CUnit* items\n+ CUnitQueue* m_pUnitQueue; \/\/ the shared unit queue\n+\n+ int m_iStartPos; \/\/ HEAD: first packet available for reading\n+ int m_iLastAckPos; \/\/ the last ACKed position (exclusive), follows the last readable\n+ \/\/ EMPTY: m_iStartPos = m_iLastAckPos FULL: m_iStartPos = m_iLastAckPos + 1\n+ int m_iMaxPos; \/\/ delta between acked-TAIL and reception-TAIL\n+\n+ int m_iNotch; \/\/ the starting read point of the first unit\n+ \/\/ (this is required for stream reading mode; it's\n+ \/\/ the position in the first unit in the list\n+ \/\/ up to which data are already retrieved;\n+ \/\/ in message reading mode it's unused and always 0)\n+\n+ srt::sync::Mutex m_BytesCountLock; \/\/ used to protect counters operations\n+ int m_iBytesCount; \/\/ Number of payload bytes in the buffer\n+ int m_iAckedPktsCount; \/\/ Number of acknowledged pkts in the buffer\n+ int m_iAckedBytesCount; \/\/ Number of acknowledged payload bytes in the buffer\n+ unsigned m_uAvgPayloadSz; \/\/ Average payload size for dropped bytes estimation\n+\n+ bool m_bTsbPdMode; \/\/ true: apply TimeStamp-Based Rx Mode\n+ duration m_tdTsbPdDelay; \/\/ aggreed delay\n+ time_point m_tsTsbPdTimeBase; \/\/ localtime base for TsbPd mode\n+ \/\/ Note: m_tsTsbPdTimeBase cumulates values from:\n+ \/\/ 1. Initial SRT_CMD_HSREQ packet returned value diff to current time:\n+ \/\/ == (NOW - PACKET_TIMESTAMP), at the time of HSREQ reception\n+ \/\/ 2. Timestamp overflow (@c CRcvBuffer::getTsbPdTimeBase), when overflow on packet detected\n+ \/\/ += CPacket::MAX_TIMESTAMP+1 (it's a hex round value, usually 0x1*e8).\n+ \/\/ 3. Time drift (CRcvBuffer::addRcvTsbPdDriftSample, executed exclusively\n+ \/\/ from UMSG_ACKACK handler). This is updated with (positive or negative) TSBPD_DRIFT_MAX_VALUE\n+ \/\/ once the value of average drift exceeds this value in whatever direction.\n+ \/\/ += (+\/-)CRcvBuffer::TSBPD_DRIFT_MAX_VALUE\n+ \/\/\n+ \/\/ XXX Application-supplied timestamps won't work therefore. This requires separate\n+ \/\/ calculation of all these things above.\n+\n+ bool m_bTsbPdWrapCheck; \/\/ true: check packet time stamp wrap around\n+ static const uint32_t TSBPD_WRAP_PERIOD = (30 * 1000000); \/\/ 30 seconds (in usec)\n+\n+ \/\/\/ Max drift (usec) above which TsbPD Time Offset is adjusted\n+ static const int TSBPD_DRIFT_MAX_VALUE = 5000;\n+ \/\/\/ Number of samples (UMSG_ACKACK packets) to perform drift caclulation and compensation\n+ static const int TSBPD_DRIFT_MAX_SAMPLES = 1000;\n+ DriftTracer<TSBPD_DRIFT_MAX_SAMPLES, TSBPD_DRIFT_MAX_VALUE> m_DriftTracer;\n+ AvgBufSize m_mavg;\n #ifdef SRT_DEBUG_TSBPD_DRIFT\n- int m_TsbPdDriftHisto100us[22]; \/\/ Histogram of 100us TsbPD drift (-1.0 .. +1.0 ms in 0.1ms increment)\n- int m_TsbPdDriftHisto1ms[22]; \/\/ Histogram of TsbPD drift (-10.0 .. +10.0 ms, in 1.0 ms increment)\n- int m_iTsbPdDriftNbSamples = 0; \/\/ Number of samples in sum and histogram\n- static const int TSBPD_DRIFT_PRT_SAMPLES = 200; \/\/ Number of samples (UMSG_ACKACK packets) to print hostogram\n-#endif \/* SRT_DEBUG_TSBPD_DRIFT *\/\n+ int m_TsbPdDriftHisto100us[22]; \/\/ Histogram of 100us TsbPD drift (-1.0 .. +1.0 ms in 0.1ms increment)\n+ int m_TsbPdDriftHisto1ms[22]; \/\/ Histogram of TsbPD drift (-10.0 .. +10.0 ms, in 1.0 ms increment)\n+ int m_iTsbPdDriftNbSamples = 0; \/\/ Number of samples in sum and histogram\n+ static const int TSBPD_DRIFT_PRT_SAMPLES = 200; \/\/ Number of samples (UMSG_ACKACK packets) to print hostogram\n+#endif \/* SRT_DEBUG_TSBPD_DRIFT *\/\n \n #ifdef SRT_DEBUG_TSBPD_OUTJITTER\n- unsigned long m_ulPdHisto[4][10];\n+ unsigned long m_ulPdHisto[4][10];\n #endif \/* SRT_DEBUG_TSBPD_OUTJITTER *\/\n \n private:\n- CRcvBuffer();\n- CRcvBuffer(const CRcvBuffer&);\n- CRcvBuffer& operator=(const CRcvBuffer&);\n+ CRcvBuffer();\n+ CRcvBuffer(const CRcvBuffer&);\n+ CRcvBuffer& operator=(const CRcvBuffer&);\n };\n \n-\n #endif\n"} {"commit":"36e72f7a7e96f234d8686e5af3a1adc313489657","subject":"Added --multiplier option","message":"Added --multiplier option\n","repos":"dwalton76\/rubiks-cube-NxNxN-solver,dwalton76\/rubiks-cube-NxNxN-solver,dwalton76\/rubiks-cube-NxNxN-solver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ida_search_via_graph.c\n+++ ida_search_via_graph.c\n@@ -14,8 +14,8 @@\n #include \"rotate_xxx.h\"\n \n \n-unsigned long ida_count = 0;\n-unsigned long ida_count_total = 0;\n+unsigned long long ida_count = 0;\n+unsigned long long ida_count_total = 0;\n struct key_value_pair *ida_explored = NULL;\n unsigned char legal_move_count = 0;\n unsigned char threshold = 0;\n@@ -31,6 +31,7 @@\n unsigned char COST_LENGTH = 1;\n unsigned char STATE_LENGTH = 4;\n unsigned char ROW_LENGTH = 0;\n+float cost_to_goal_multiplier = 0.0;\n move_type legal_moves[MOVE_MAX];\n move_type move_matrix[MOVE_MAX][MOVE_MAX];\n move_type same_face_and_layer_matrix[MOVE_MAX][MOVE_MAX];\n@@ -378,6 +379,10 @@\n cost_to_goal = (pt1_cost > cost_to_goal) ? pt1_cost : cost_to_goal;\n cost_to_goal = (pt0_cost > cost_to_goal) ? pt0_cost : cost_to_goal;\n \n+ if (cost_to_goal_multiplier) {\n+ cost_to_goal = (unsigned char) cost_to_goal * cost_to_goal_multiplier;\n+ }\n+\n if (main_table) {\n struct key_value_pair *main_table_node = NULL;\n unsigned char STATE_SIZE = 48;\n@@ -412,6 +417,10 @@\n cost_to_goal = (pt1_cost > cost_to_goal) ? pt1_cost : cost_to_goal;\n cost_to_goal = (pt0_cost > cost_to_goal) ? pt0_cost : cost_to_goal;\n \n+ if (cost_to_goal_multiplier) {\n+ cost_to_goal = (unsigned char) cost_to_goal * cost_to_goal_multiplier;\n+ }\n+\n if (main_table) {\n struct key_value_pair *main_table_node = NULL;\n unsigned char STATE_SIZE = 48;\n@@ -443,6 +452,10 @@\n cost_to_goal = (pt1_cost > cost_to_goal) ? pt1_cost : cost_to_goal;\n cost_to_goal = (pt0_cost > cost_to_goal) ? pt0_cost : cost_to_goal;\n \n+ if (cost_to_goal_multiplier) {\n+ cost_to_goal = (unsigned char) cost_to_goal * cost_to_goal_multiplier;\n+ }\n+\n if (main_table) {\n struct key_value_pair *main_table_node = NULL;\n unsigned char STATE_SIZE = 48;\n@@ -470,6 +483,11 @@\n \n cost_to_goal = (pt1_cost > pt0_cost) ? pt1_cost : pt0_cost;\n \n+ if (cost_to_goal_multiplier) {\n+ cost_to_goal = (unsigned char) cost_to_goal * cost_to_goal_multiplier;\n+ }\n+\n+\n if (main_table) {\n struct key_value_pair *main_table_node = NULL;\n unsigned char STATE_SIZE = 48;\n@@ -495,6 +513,10 @@\n \n cost_to_goal = pt0_cost;\n \n+ if (cost_to_goal_multiplier) {\n+ cost_to_goal = (unsigned char) cost_to_goal * cost_to_goal_multiplier;\n+ }\n+\n if (main_table) {\n struct key_value_pair *main_table_node = NULL;\n unsigned char STATE_SIZE = 48;\n@@ -520,7 +542,7 @@\n \n if (cost_to_goal == 0) {\n \/\/ We are finished!!\n- LOG(\"IDA count %'d, f_cost %d vs threshold %d (cost_to_here %d, cost_to_goal %d)\\n\",\n+ LOG(\"IDA count %'llu, f_cost %d vs threshold %d (cost_to_here %d, cost_to_goal %d)\\n\",\n ida_count, f_cost, threshold, cost_to_here, cost_to_goal);\n print_moves(moves_to_here, cost_to_here);\n search_result.found_solution = 1;\n@@ -744,13 +766,13 @@\n float nodes_per_ms = ida_count \/ ms;\n unsigned int nodes_per_sec = nodes_per_ms * 1000;\n \n- LOG(\"IDA threshold %d, explored %'d nodes, took %.3fs, %'d nodes-per-sec\\n\", threshold, ida_count, ms \/ 1000, nodes_per_sec);\n+ LOG(\"IDA threshold %d, explored %'llu nodes, took %.3fs, %'d nodes-per-sec\\n\", threshold, ida_count, ms \/ 1000, nodes_per_sec);\n \n if (search_result.found_solution) {\n float ms = ((stop.tv_sec - start.tv_sec) * 1000) + ((stop.tv_usec - start.tv_usec) \/ 1000);\n float nodes_per_ms = ida_count_total \/ ms;\n unsigned int nodes_per_sec = nodes_per_ms * 1000;\n- LOG(\"IDA found solution, explored %'d total nodes, took %.3fs, %'d nodes-per-sec\\n\",\n+ LOG(\"IDA found solution, explored %'llu total nodes, took %.3fs, %'d nodes-per-sec\\n\",\n ida_count_total, ms \/ 1000, nodes_per_sec);\n return 1;\n }\n@@ -919,6 +941,10 @@\n } else if (strmatch(argv[i], \"--main-table-state-length\")) {\n i++;\n main_table_state_length = atoi(argv[i]);\n+\n+ } else if (strmatch(argv[i], \"--multiplier\")) {\n+ i++;\n+ cost_to_goal_multiplier = atof(argv[i]);\n \n } else if (strmatch(argv[i], \"--legal-moves\")) {\n i++;\n"} {"commit":"e7c6d48988752dd14a1be90e1e8f44d72435b3b8","subject":"Revert \"Revert \"Revert \"Revert \"Revert \"Revert \"Revert \"fix indentation\"\"\"\"\"\"\"","message":"Revert \"Revert \"Revert \"Revert \"Revert \"Revert \"Revert \"fix indentation\"\"\"\"\"\"\"\n\nThis reverts commit 3f08901266e541e5ebfdbdbf98367988509c8844.\n","repos":"zeliard\/grpc,zeliard\/grpc,zeliard\/grpc,zeliard\/grpc,zeliard\/grpc,zeliard\/grpc,zeliard\/grpc,zeliard\/grpc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/core\/iomgr\/tcp_windows.c\n+++ src\/core\/iomgr\/tcp_windows.c\n@@ -234,8 +234,8 @@\n At this situation, we should just do close the connection and free\n the resources. *\/\n \n- tcp->outstanding_read = 0;\n- gpr_slice_unref(tcp->read_slice);\n+\ttcp->outstanding_read = 0;\n+\tgpr_slice_unref(tcp->read_slice);\n tcp_unref(tcp);\n cb(arg, NULL, 0, GRPC_ENDPOINT_CB_ERROR);\n \/* Per the comment above, I'm going to treat that case as a hard failure\n"} {"commit":"893be4a6d89a648d25f93f24fa5e8f6a874250a2","subject":"lib\/tree: add check for huge items in leaf_insert","message":"lib\/tree: add check for huge items in leaf_insert\n","repos":"jgottula\/jgfs2,jgottula\/jgfs2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/tree\/node_leaf.c\n+++ lib\/tree\/node_leaf.c\n@@ -136,6 +136,12 @@\n }\n \n bool leaf_insert(leaf_ptr node, const key *key, struct item_data item) {\n+\tif (sizeof(item_ref) + item.len >\n+\t\tnode_size_byte() - sizeof(struct node_hdr)) {\n+\t\terrx(1, \"%s: will never fit: node %08\" PRIx32 \" %s len %\" PRIu32,\n+\t\t\t__func__, node->hdr.this, key_str(key), item.len);\n+\t}\n+\t\n \t\/* the caller needs to make space if necessary *\/\n \tif (leaf_free(node) < sizeof(item_ref) + item.len) {\n \t\treturn false;\n"} {"commit":"8915520fc985763035d4d52680d155dc6c904383","subject":"Fixed a linkage issue preventing WindowsNamedPipeConnection from being instantiated.","message":"Fixed a linkage issue preventing WindowsNamedPipeConnection from being\ninstantiated.\n\n\ngit-svn-id: 1a57124bbb9aca193a920d0ffd753d488afb922b@1761 5946f024-35f4-0310-b1b3-9a3be3380cfb\n","repos":"veprbl\/mysqlpp,veprbl\/mysqlpp,veprbl\/mysqlpp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/wnp_connection.h\n+++ lib\/wnp_connection.h\n@@ -36,7 +36,7 @@\n \/\/\/ This class just simplifies the connection creation interface of\n \/\/\/ \\c Connection. It does not add new functionality.\n \n-class WindowsNamedPipeConnection : public Connection\n+class MYSQLPP_EXPORT WindowsNamedPipeConnection : public Connection\n {\n public:\n \t\/\/\/ \\brief Create object without connecting it to the MySQL server.\n@@ -52,8 +52,9 @@\n \t\/\/\/ \\param user user name to log in under, or 0 to use the user\n \t\/\/\/\t\tname the program is running under\n \t\/\/\/ \\param password password to use when logging in\n-\tWindowsNamedPipeConnection(cchar* db = 0, cchar* user = 0,\n-\t\t\tcchar* password = 0)\n+\tWindowsNamedPipeConnection(cchar* db, cchar* user = 0,\n+\t\t\tcchar* password = 0) :\n+\tConnection()\n \t{\n \t\tconnect(db, user, password);\n \t}\n"} {"commit":"4504095c8f0d0b11fc2fffe4b86be84fc21ed646","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libAfterBase\/trace.h\n+++ libAfterBase\/trace.h\n@@ -33,7 +33,7 @@\n \n \/* afterstep functions *\/\n #undef TRACE_AddWindow\n-#undef TRACE_SetFocus\n+#define TRACE_SetFocus\n #undef TRACE_SetupFrame\n #undef TRACE_ResizeFrame \/* both ResizeFrame and ResizeClent *\/ \n #define TRACE_DispatchEvent \/* see also EVENT_TRACE_MASK above *\/\n"} {"commit":"827a116ff112e62613f15ca42e822f57c27a69ad","subject":"new image formats - suppressed ill defined formats (endianness, unless specified, is always the one of the CPU) - added avcodec_get_pix_fmt_name()","message":"new image formats - suppressed ill defined formats (endianness, unless specified, is always the one of the CPU) - added avcodec_get_pix_fmt_name()\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@1429 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/avcodec.h\n+++ libavcodec\/avcodec.h\n@@ -62,21 +62,19 @@\n enum PixelFormat {\n PIX_FMT_YUV420P,\n PIX_FMT_YUV422,\n- PIX_FMT_RGB24,\n- PIX_FMT_BGR24,\n+ PIX_FMT_RGB24, \/* 3 bytes, R is first *\/\n+ PIX_FMT_BGR24, \/* 3 bytes, B is first *\/\n PIX_FMT_YUV422P,\n PIX_FMT_YUV444P,\n- PIX_FMT_RGBA32,\n- PIX_FMT_BGRA32,\n+ PIX_FMT_RGBA32, \/* always stored in cpu endianness *\/\n PIX_FMT_YUV410P,\n PIX_FMT_YUV411P,\n- PIX_FMT_RGB565,\n- PIX_FMT_RGB555,\n-\/\/ PIX_FMT_RGB5551,\n- PIX_FMT_BGR565,\n- PIX_FMT_BGR555,\n-\/\/ PIX_FMT_GBR565,\n-\/\/ PIX_FMT_GBR555\n+ PIX_FMT_RGB565, \/* always stored in cpu endianness *\/\n+ PIX_FMT_RGB555, \/* always stored in cpu endianness, most significant bit to 1 *\/\n+ PIX_FMT_GRAY8,\n+ PIX_FMT_MONOWHITE, \/* 0 is white *\/\n+ PIX_FMT_MONOBLACK, \/* 0 is black *\/\n+ PIX_FMT_NB,\n };\n \n \/* currently unused, may be used if 24\/32 bits samples ever supported *\/\n@@ -1052,7 +1050,8 @@\n void avpicture_fill(AVPicture *picture, UINT8 *ptr,\n int pix_fmt, int width, int height);\n int avpicture_get_size(int pix_fmt, int width, int height);\n-void avcodec_get_chroma_sub_sample(int fmt, int *h_shift, int *v_shift);\n+void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift);\n+const char *avcodec_get_pix_fmt_name(int pix_fmt);\n \n \/* convert among pixel formats *\/\n int img_convert(AVPicture *dst, int dst_pix_fmt,\n"} {"commit":"e84157de307c5a754003e1f07d1f5583cae7b862","subject":"2.5x faster compute_autocorr() overall flac encoding: 15-50% faster on core2, 8-30% on k8, 2-20% on p4 (depending on compression_level)","message":"2.5x faster compute_autocorr()\noverall flac encoding: 15-50% faster on core2, 8-30% on k8, 2-20% on p4 (depending on compression_level)\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@10606 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/flacenc.c\n+++ libavcodec\/flacenc.c\n@@ -607,21 +607,30 @@\n static void compute_autocorr(const int32_t *data, int len, int lag,\n double *autoc)\n {\n- int i, lag_ptr;\n+ int i, j;\n double tmp[len + lag];\n double *data1= tmp + lag;\n \n apply_welch_window(data, len, data1);\n \n- for(i=0; i<lag; i++){\n- autoc[i] = 1.0;\n- data1[i-lag]= 0.0;\n- }\n-\n- for(i=0; i<len; i++){\n- for(lag_ptr= i-lag; lag_ptr<=i; lag_ptr++){\n- autoc[i-lag_ptr] += data1[i] * data1[lag_ptr];\n- }\n+ for(j=0; j<lag; j++)\n+ data1[j-lag]= 0.0;\n+\n+ for(j=0; j<lag; j+=2){\n+ double sum0 = 1.0, sum1 = 1.0;\n+ for(i=0; i<len; i++){\n+ sum0 += data1[i] * data1[i-j];\n+ sum1 += data1[i] * data1[i-j-1];\n+ }\n+ autoc[j ] = sum0;\n+ autoc[j+1] = sum1;\n+ }\n+\n+ if(j==lag){\n+ double sum = 1.0;\n+ for(i=0; i<len; i++)\n+ sum += data1[i] * data1[i-j];\n+ autoc[j] = sum;\n }\n }\n \n"} {"commit":"6d1d5cac8e1e10d10bca4a4ae85998d72cd2af06","subject":"dont use memcpy for copying structs","message":"dont use memcpy for copying structs\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@5574 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/flacenc.c\n+++ libavcodec\/flacenc.c\n@@ -529,7 +529,7 @@\n bits[i] = calc_optimal_rice_params(&tmp_rc, i, sums[i], n, pred_order);\n if(bits[i] <= bits[opt_porder]) {\n opt_porder = i;\n- memcpy(rc, &tmp_rc, sizeof(RiceContext));\n+ *rc= tmp_rc;\n }\n }\n \n"} {"commit":"183e18ef76fbea0ced175590ea70723b3984b2ff","subject":"Add HW acceleration hooks for MPEG-4 \/ H.263 decoding. Patch by Gwenole Beauchesne.","message":"Add HW acceleration hooks for MPEG-4 \/ H.263 decoding.\nPatch by Gwenole Beauchesne.\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@17637 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/h263dec.c\n+++ libavcodec\/h263dec.c\n@@ -161,8 +161,12 @@\n \n ff_set_qscale(s, s->qscale);\n \n- if (s->avctx->hwaccel)\n- return 0;\n+ if (s->avctx->hwaccel) {\n+ const uint8_t *start= s->gb.buffer + get_bits_count(&s->gb)\/8;\n+ const uint8_t *end = ff_h263_find_resync_marker(start + 1, s->gb.buffer_end);\n+ skip_bits_long(&s->gb, 8*(end - start));\n+ return s->avctx->hwaccel->decode_slice(s->avctx, start, end - start);\n+ }\n \n if(s->partitioned_frame){\n const int qscale= s->qscale;\n@@ -616,6 +620,11 @@\n \n if(MPV_frame_start(s, avctx) < 0)\n return -1;\n+\n+ if (avctx->hwaccel) {\n+ if (avctx->hwaccel->start_frame(avctx, buf, buf_size) < 0)\n+ return -1;\n+ }\n \n #ifdef DEBUG\n av_log(avctx, AV_LOG_DEBUG, \"qscale=%d\\n\", s->qscale);\n"} {"commit":"ba48970cf63811da5726eb416875042cdba0493d","subject":"fix flvdec.c file description comment","message":"fix flvdec.c file description comment\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@6773 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/flvdec.c\n+++ libavformat\/flvdec.c\n@@ -1,5 +1,5 @@\n \/*\n- * FLV encoder.\n+ * FLV decoder.\n * Copyright (c) 2003 The FFmpeg Project.\n *\n * This file is part of FFmpeg.\n"} {"commit":"f0905f7410d31f535ae00a98bfb6160c14a8cd31","subject":"sync to libnut, nom->num","message":"sync to libnut, nom->num\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@7367 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/libnut.c\n+++ libavformat\/libnut.c\n@@ -48,7 +48,7 @@\n AVCodecContext * codec = avf->streams[i]->codec;\n int j;\n int fourcc = 0;\n- int nom, denom, ssize;\n+ int num, denom, ssize;\n \n s[i].type = codec->codec_type == CODEC_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS;\n \n@@ -64,11 +64,11 @@\n s[i].fourcc = av_malloc(s[i].fourcc_len);\n for (j = 0; j < s[i].fourcc_len; j++) s[i].fourcc[j] = (fourcc >> (j*8)) & 0xFF;\n \n- ff_parse_specific_params(codec, &nom, &ssize, &denom);\n- av_set_pts_info(avf->streams[i], 60, denom, nom);\n-\n- s[i].time_base.nom = denom;\n- s[i].time_base.den = nom;\n+ ff_parse_specific_params(codec, &num, &ssize, &denom);\n+ av_set_pts_info(avf->streams[i], 60, denom, num);\n+\n+ s[i].time_base.num = denom;\n+ s[i].time_base.den = num;\n \n s[i].fixed_fps = 0;\n s[i].decode_delay = codec->has_b_frames;\n@@ -82,7 +82,7 @@\n s[i].sample_height = 0;\n s[i].colorspace_type = 0;\n } else {\n- s[i].samplerate_nom = codec->sample_rate;\n+ s[i].samplerate_num = codec->sample_rate;\n s[i].samplerate_denom = 1;\n s[i].channel_count = codec->channels;\n }\n@@ -199,7 +199,7 @@\n memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size);\n }\n \n- av_set_pts_info(avf->streams[i], 60, s[i].time_base.nom, s[i].time_base.den);\n+ av_set_pts_info(avf->streams[i], 60, s[i].time_base.num, s[i].time_base.den);\n st->start_time = 0;\n st->duration = s[i].max_pts;\n \n@@ -211,7 +211,7 @@\n if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_wav_id(st->codec->codec_tag);\n \n st->codec->channels = s[i].channel_count;\n- st->codec->sample_rate = s[i].samplerate_nom \/ s[i].samplerate_denom;\n+ st->codec->sample_rate = s[i].samplerate_num \/ s[i].samplerate_denom;\n break;\n case NUT_VIDEO_CLASS:\n st->codec->codec_type = CODEC_TYPE_VIDEO;\n@@ -255,7 +255,7 @@\n static int nut_read_seek(AVFormatContext * avf, int stream_index, int64_t target_ts, int flags) {\n NUTContext * priv = avf->priv_data;\n int active_streams[] = { stream_index, -1 };\n- double time_pos = target_ts * priv->s[stream_index].time_base.nom \/ (double)priv->s[stream_index].time_base.den;\n+ double time_pos = target_ts * priv->s[stream_index].time_base.num \/ (double)priv->s[stream_index].time_base.den;\n \n if (nut_seek(priv->nut, time_pos, 2*!(flags & AVSEEK_FLAG_BACKWARD), active_streams)) return -1;\n \n"} {"commit":"f1e0b3343cfda14f5c8d90453a8d5486265efb18","subject":"fix psp muxing (probably this fix is wrong but its better then nothing)","message":"fix psp muxing (probably this fix is wrong but its better then nothing)\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@4086 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/movenc.c\n+++ libavformat\/movenc.c\n@@ -1539,7 +1539,7 @@\n mov_write_header,\n mov_write_packet,\n mov_write_trailer,\n- .flags = AVFMT_GLOBALHEADER,\n+\/\/ .flags = AVFMT_GLOBALHEADER,\n };\n \n static AVOutputFormat _3g2_oformat = {\n"} {"commit":"9528b97672e94876095de56fdba994f6eb85a4e9","subject":"more FIXME","message":"more FIXME\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@10044 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/nutenc.c\n+++ libavformat\/nutenc.c\n@@ -379,7 +379,7 @@\n \n put_flush_packet(bc);\n \n- \/\/FIXME info header, header repeation, ...\n+ \/\/FIXME info header, header repeation, index\n \n return 0;\n }\n"} {"commit":"d95fee520b686b6dd3e3560e60cf26fd0fda6b61","subject":"I should also test w\/ ipv6, missed that, thx SpanKY","message":"I should also test w\/ ipv6, missed that, thx SpanKY\n","repos":"m-labs\/uclibc-lm32,foss-for-synopsys-dwc-arc-processors\/uClibc,brgl\/uclibc-ng,ndmsystems\/uClibc,hjl-tools\/uClibc,ddcc\/klee-uclibc-0.9.33.2,OpenInkpot-archive\/iplinux-uclibc,majek\/uclibc-vx32,m-labs\/uclibc-lm32,klee\/klee-uclibc,ddcc\/klee-uclibc-0.9.33.2,hwoarang\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,brgl\/uclibc-ng,foss-xtensa\/uClibc,ffainelli\/uClibc,foss-xtensa\/uClibc,gittup\/uClibc,groundwater\/uClibc,klee\/klee-uclibc,majek\/uclibc-vx32,atgreen\/uClibc-moxie,atgreen\/uClibc-moxie,groundwater\/uClibc,skristiansson\/uClibc-or1k,mephi42\/uClibc,wbx-github\/uclibc-ng,kraj\/uclibc-ng,hwoarang\/uClibc,kraj\/uclibc-ng,hjl-tools\/uClibc,foss-xtensa\/uClibc,kraj\/uclibc-ng,ysat0\/uClibc,waweber\/uclibc-clang,gittup\/uClibc,czankel\/xtensa-uclibc,OpenInkpot-archive\/iplinux-uclibc,hwoarang\/uClibc,ChickenRunjyd\/klee-uclibc,wbx-github\/uclibc-ng,wbx-github\/uclibc-ng,brgl\/uclibc-ng,ffainelli\/uClibc,ffainelli\/uClibc,foss-xtensa\/uClibc,hjl-tools\/uClibc,mephi42\/uClibc,brgl\/uclibc-ng,klee\/klee-uclibc,skristiansson\/uClibc-or1k,skristiansson\/uClibc-or1k,czankel\/xtensa-uclibc,groundwater\/uClibc,atgreen\/uClibc-moxie,m-labs\/uclibc-lm32,kraj\/uclibc-ng,hjl-tools\/uClibc,kraj\/uClibc,wbx-github\/uclibc-ng,mephi42\/uClibc,ChickenRunjyd\/klee-uclibc,waweber\/uclibc-clang,m-labs\/uclibc-lm32,ysat0\/uClibc,groundwater\/uClibc,foss-for-synopsys-dwc-arc-processors\/uClibc,gittup\/uClibc,ndmsystems\/uClibc,ffainelli\/uClibc,ffainelli\/uClibc,gittup\/uClibc,majek\/uclibc-vx32,hjl-tools\/uClibc,kraj\/uClibc,atgreen\/uClibc-moxie,foss-for-synopsys-dwc-arc-processors\/uClibc,kraj\/uClibc,mephi42\/uClibc,ChickenRunjyd\/klee-uclibc,majek\/uclibc-vx32,ysat0\/uClibc,ddcc\/klee-uclibc-0.9.33.2,OpenInkpot-archive\/iplinux-uclibc,OpenInkpot-archive\/iplinux-uclibc,waweber\/uclibc-clang,hwoarang\/uClibc,klee\/klee-uclibc,waweber\/uclibc-clang,ChickenRunjyd\/klee-uclibc,czankel\/xtensa-uclibc,groundwater\/uClibc,skristiansson\/uClibc-or1k,ndmsystems\/uClibc,ndmsystems\/uClibc,kraj\/uClibc,czankel\/xtensa-uclibc,ddcc\/klee-uclibc-0.9.33.2,ysat0\/uClibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/inet\/in6_addr.c\n+++ libc\/inet\/in6_addr.c\n@@ -26,9 +26,9 @@\n { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };\n \/\/libc_hidden_proto(in6addr_any)\n \/\/libc_hidden_def(in6addr_any)\n+libc_hidden_proto(in6addr_loopback)\n const struct in6_addr in6addr_loopback =\n { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };\n-libc_hidden_proto(in6addr_loopback)\n libc_hidden_def(in6addr_loopback)\n #endif \/* __UCLIBC_HAS_IPV6__ *\/\n \n"} {"commit":"6b1e5aace3ecd10c0c529549481253b0368632b0","subject":"make sure the returned string is zero terminated","message":"make sure the returned string is zero terminated\n","repos":"wang-bin\/libexif-port,wang-bin\/libexif-port","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libexif\/exif-entry.c\n+++ libexif\/exif-entry.c\n@@ -1095,6 +1095,7 @@\n \t\t}\n \t}\n \n+\tval[maxlen-1] = '\\0'; \/* make sure the returned string is zero terminated *\/\n \treturn val;\n }\n \n"} {"commit":"79ebcde6dc655dee188921c35098f6a57b4dde97","subject":"Log possible extensions of filenames of files not found on search path","message":"Log possible extensions of filenames of files not found on search path\n","repos":"dkogan\/notion,knixeur\/notion,raboof\/notion,dkogan\/notion,dkogan\/notion.xfttest,dkogan\/notion.xfttest,dkogan\/notion.xfttest,p5n\/notion,anoduck\/notion,knixeur\/notion,raboof\/notion,raboof\/notion,anoduck\/notion,anoduck\/notion,raboof\/notion,dkogan\/notion,neg-serg\/notion,neg-serg\/notion,neg-serg\/notion,neg-serg\/notion,p5n\/notion,knixeur\/notion,anoduck\/notion,dkogan\/notion,anoduck\/notion,p5n\/notion,p5n\/notion,knixeur\/notion,knixeur\/notion,p5n\/notion,dkogan\/notion.xfttest,dkogan\/notion","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libextl\/readconfig.c\n+++ libextl\/readconfig.c\n@@ -385,7 +385,8 @@\n EXTL_COMPILED_EXTENSION, EXTL_EXTENSION);\n \n if(retval==EXTL_TRYCONFIG_NOTFOUND && warn_nx)\n- extl_warn(TR(\"Unable to find '%s' on search path.\"), file);\n+ extl_warn(TR(\"Unable to find '%s.%s' or '%s.%s' on search path.\"), \n+ file, EXTL_COMPILED_EXTENSION, file, EXTL_EXTENSION);\n \n return (retval==EXTL_TRYCONFIG_OK);\n }\n"} {"commit":"6525a564f1628ab6852a757663cb4b8be71240cd","subject":"Fixed 24bit color format.","message":"Fixed 24bit color format.\n","repos":"ivan-83\/FreeRDP,mfleisz\/FreeRDP,realjiangms\/FreeRDP,cedrozor\/FreeRDP,nfedera\/FreeRDP,FreeRDP\/FreeRDP,eledoux\/FreeRDP,cloudbase\/FreeRDP-dev,Devolutions\/FreeRDP,akallabeth\/FreeRDP,realjiangms\/FreeRDP,ivan-83\/FreeRDP,bjcollins\/FreeRDP,rjcorrig\/FreeRDP,bmiklautz\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,nanxiongchao\/FreeRDP,xproax\/FreeRDP,bjcollins\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,nfedera\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,eledoux\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,akallabeth\/FreeRDP,eledoux\/FreeRDP,realjiangms\/FreeRDP,cedrozor\/FreeRDP,ilammy\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,cedrozor\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,rjcorrig\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,nanxiongchao\/FreeRDP,nfedera\/FreeRDP,ilammy\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,rjcorrig\/FreeRDP,rjcorrig\/FreeRDP,RangeeGmbH\/FreeRDP,nanxiongchao\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,xhaakon\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,xhaakon\/FreeRDP,eledoux\/FreeRDP,nanxiongchao\/FreeRDP,cedrozor\/FreeRDP,Devolutions\/FreeRDP,ivan-83\/FreeRDP,bjcollins\/FreeRDP,yurashek\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,ondrejholy\/FreeRDP,cloudbase\/FreeRDP-dev,nanxiongchao\/FreeRDP,akallabeth\/FreeRDP,oshogbo\/FreeRDP,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,realjiangms\/FreeRDP,cloudbase\/FreeRDP-dev,awakecoding\/FreeRDP,yurashek\/FreeRDP,ondrejholy\/FreeRDP,xproax\/FreeRDP,oshogbo\/FreeRDP,ilammy\/FreeRDP,awakecoding\/FreeRDP,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,cedrozor\/FreeRDP,nanxiongchao\/FreeRDP,ondrejholy\/FreeRDP,Devolutions\/FreeRDP,rjcorrig\/FreeRDP,nfedera\/FreeRDP,xhaakon\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,yurashek\/FreeRDP,bmiklautz\/FreeRDP,xproax\/FreeRDP,xproax\/FreeRDP,oshogbo\/FreeRDP,realjiangms\/FreeRDP,chipitsine\/FreeRDP,bjcollins\/FreeRDP,nfedera\/FreeRDP,ilammy\/FreeRDP,mfleisz\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,RangeeGmbH\/FreeRDP,ivan-83\/FreeRDP,ivan-83\/FreeRDP,cloudbase\/FreeRDP-dev,awakecoding\/FreeRDP,rjcorrig\/FreeRDP,yurashek\/FreeRDP,ivan-83\/FreeRDP,eledoux\/FreeRDP,xproax\/FreeRDP,ilammy\/FreeRDP,bjcollins\/FreeRDP,mfleisz\/FreeRDP,chipitsine\/FreeRDP,eledoux\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,mfleisz\/FreeRDP,awakecoding\/FreeRDP,bmiklautz\/FreeRDP,realjiangms\/FreeRDP,rjcorrig\/FreeRDP,xhaakon\/FreeRDP,xproax\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,awakecoding\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,ondrejholy\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,yurashek\/FreeRDP,akallabeth\/FreeRDP,ondrejholy\/FreeRDP,yurashek\/FreeRDP,realjiangms\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,ilammy\/FreeRDP,cedrozor\/FreeRDP,ondrejholy\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,bmiklautz\/FreeRDP,realjiangms\/FreeRDP,rjcorrig\/FreeRDP,akallabeth\/FreeRDP,Devolutions\/FreeRDP,oshogbo\/FreeRDP,bjcollins\/FreeRDP,ondrejholy\/FreeRDP,nanxiongchao\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,mfleisz\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,bmiklautz\/FreeRDP,xhaakon\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,xproax\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,xhaakon\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,xhaakon\/FreeRDP,awakecoding\/FreeRDP,eledoux\/FreeRDP,nanxiongchao\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,awakecoding\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,ilammy\/FreeRDP,xproax\/FreeRDP,DavBfr\/FreeRDP,ondrejholy\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/gdi\/gdi.c\n+++ libfreerdp\/gdi\/gdi.c\n@@ -335,7 +335,7 @@\n \t\t\tbreak;\n \n \t\tcase 24:\n-\t\t\tformat = vFlip ? PIXEL_FORMAT_RGB24_VF : PIXEL_FORMAT_RGB24;\n+\t\t\tformat = vFlip ? PIXEL_FORMAT_BGR24_VF : PIXEL_FORMAT_BGR24;\n \t\t\tbreak;\n \n \t\tcase 16:\n"} {"commit":"8845b3ffa29b0f48d0f58ff241db73b79c6a7578","subject":"Added warning for unsupported color depth.","message":"Added warning for unsupported color depth.\n","repos":"yurashek\/FreeRDP,cedrozor\/FreeRDP,nfedera\/FreeRDP,cloudbase\/FreeRDP-dev,bmiklautz\/FreeRDP,eledoux\/FreeRDP,cloudbase\/FreeRDP-dev,RangeeGmbH\/FreeRDP,oshogbo\/FreeRDP,ivan-83\/FreeRDP,RangeeGmbH\/FreeRDP,ondrejholy\/FreeRDP,rjcorrig\/FreeRDP,erbth\/FreeRDP,bmiklautz\/FreeRDP,ilammy\/FreeRDP,bmiklautz\/FreeRDP,awakecoding\/FreeRDP,oshogbo\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,ivan-83\/FreeRDP,eledoux\/FreeRDP,ilammy\/FreeRDP,nanxiongchao\/FreeRDP,bmiklautz\/FreeRDP,eledoux\/FreeRDP,yurashek\/FreeRDP,cedrozor\/FreeRDP,FreeRDP\/FreeRDP,nanxiongchao\/FreeRDP,awakecoding\/FreeRDP,ondrejholy\/FreeRDP,yurashek\/FreeRDP,mfleisz\/FreeRDP,RangeeGmbH\/FreeRDP,bjcollins\/FreeRDP,Devolutions\/FreeRDP,oshogbo\/FreeRDP,DavBfr\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,ilammy\/FreeRDP,FreeRDP\/FreeRDP,nanxiongchao\/FreeRDP,ondrejholy\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,erbth\/FreeRDP,nfedera\/FreeRDP,rjcorrig\/FreeRDP,nanxiongchao\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,oshogbo\/FreeRDP,rjcorrig\/FreeRDP,FreeRDP\/FreeRDP,rjcorrig\/FreeRDP,bmiklautz\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,FreeRDP\/FreeRDP,ondrejholy\/FreeRDP,bmiklautz\/FreeRDP,ivan-83\/FreeRDP,eledoux\/FreeRDP,bjcollins\/FreeRDP,Devolutions\/FreeRDP,nfedera\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,ilammy\/FreeRDP,FreeRDP\/FreeRDP,bjcollins\/FreeRDP,cedrozor\/FreeRDP,nfedera\/FreeRDP,yurashek\/FreeRDP,FreeRDP\/FreeRDP,ondrejholy\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,akallabeth\/FreeRDP,DavBfr\/FreeRDP,akallabeth\/FreeRDP,awakecoding\/FreeRDP,akallabeth\/FreeRDP,RangeeGmbH\/FreeRDP,yurashek\/FreeRDP,chipitsine\/FreeRDP,Devolutions\/FreeRDP,cloudbase\/FreeRDP-dev,ivan-83\/FreeRDP,rjcorrig\/FreeRDP,nfedera\/FreeRDP,Devolutions\/FreeRDP,cedrozor\/FreeRDP,bmiklautz\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,nanxiongchao\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,nfedera\/FreeRDP,bjcollins\/FreeRDP,yurashek\/FreeRDP,nanxiongchao\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,eledoux\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,mfleisz\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,mfleisz\/FreeRDP,mfleisz\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,chipitsine\/FreeRDP,yurashek\/FreeRDP,nanxiongchao\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,ondrejholy\/FreeRDP,rjcorrig\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,mfleisz\/FreeRDP,rjcorrig\/FreeRDP,bmiklautz\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,chipitsine\/FreeRDP,akallabeth\/FreeRDP,ivan-83\/FreeRDP,nanxiongchao\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,cloudbase\/FreeRDP-dev,ilammy\/FreeRDP,cedrozor\/FreeRDP,RangeeGmbH\/FreeRDP,rjcorrig\/FreeRDP,cloudbase\/FreeRDP-dev,bjcollins\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,yurashek\/FreeRDP,ilammy\/FreeRDP,oshogbo\/FreeRDP,mfleisz\/FreeRDP,akallabeth\/FreeRDP,akallabeth\/FreeRDP,cedrozor\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,eledoux\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,awakecoding\/FreeRDP,ondrejholy\/FreeRDP,chipitsine\/FreeRDP,nfedera\/FreeRDP,cloudbase\/FreeRDP-dev,erbth\/FreeRDP,mfleisz\/FreeRDP,bjcollins\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libfreerdp\/gdi\/gdi.c\n+++ libfreerdp\/gdi\/gdi.c\n@@ -393,6 +393,7 @@\n \t\t\tbreak;\n \n \t\tdefault:\n+\t\t\tWLog_ERR(TAG, \"Unsupported color depth %\"PRIu32, bitsPerPixel);\n \t\t\tformat = 0;\n \t\t\tbreak;\n \t}\n"} {"commit":"cabe8facb7ac93a5286c00a0deb5f6954abb69c5","subject":"runtime: For g0 set stack_size to 0 when not -fsplit-stack.","message":"runtime: For g0 set stack_size to 0 when not -fsplit-stack.\n\nR=iant\nCC=gofrontend-dev\nhttps:\/\/golang.org\/cl\/5653058\n","repos":"qskycolor\/gofrontend,anlhord\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,golang\/gofrontend,golang\/gofrontend,qskycolor\/gofrontend,golang\/gofrontend","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libgo\/runtime\/proc.c\n+++ libgo\/runtime\/proc.c\n@@ -909,7 +909,9 @@\n \t__splitstack_getcontext(&g->stack_context[0]);\n #else\n \tg->gcinitial_sp = ∓\n-\tg->gcstack_size = StackMin;\n+\t\/\/ Setting gcstack_size to 0 is a marker meaning that gcinitial_sp\n+\t\/\/ is the top of the stack, not the bottom.\n+\tg->gcstack_size = 0;\n \tg->gcnext_sp = ∓\n #endif\n \tgetcontext(&g->context);\n@@ -1267,6 +1269,8 @@\n #else\n \t\tsp = newg->gcinitial_sp;\n \t\tspsize = newg->gcstack_size;\n+\t\tif(spsize == 0)\n+\t\t\truntime_throw(\"bad spsize in __go_go\");\n \t\tnewg->gcnext_sp = sp;\n #endif\n \t} else {\n"} {"commit":"5cbfac5854fcba969c18eea4259cac6942a56559","subject":"runtime: Comment out code adding TLS size to stack size.","message":"runtime: Comment out code adding TLS size to stack size.\n\nR=iant\nCC=gofrontend-dev\nhttps:\/\/golang.org\/cl\/6302043\n","repos":"qskycolor\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,anlhord\/gofrontend,anlhord\/gofrontend,qskycolor\/gofrontend,golang\/gofrontend,anlhord\/gofrontend,golang\/gofrontend,qskycolor\/gofrontend,qskycolor\/gofrontend,golang\/gofrontend,anlhord\/gofrontend","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libgo\/runtime\/proc.c\n+++ libgo\/runtime\/proc.c\n@@ -1122,6 +1122,7 @@\n \n \tstacksize = PTHREAD_STACK_MIN;\n \n+#if 0\n #ifdef HAVE__DL_GET_TLS_STATIC_INFO\n \t{\n \t\t\/* On GNU\/Linux the static TLS size is taken out of\n@@ -1141,6 +1142,7 @@\n \t\t_dl_get_tls_static_info(&tlssize, &tlsalign);\n \t\tstacksize += tlssize;\n \t}\n+#endif\n #endif\n \n \tif(pthread_attr_setstacksize(&attr, stacksize) != 0)\n"} {"commit":"35ff24868740187e19cc99048632559797cae6bd","subject":"Fix pool bounds.","message":"Fix pool bounds.\n","repos":"massuda-marcelo\/guacamole-server,abligh\/guacamole-server,qiangyee\/guacamole-server,apache\/guacamole-server,AIexandr\/guacamole-server,TheAxnJaxn\/guacamole-server,glyptodon\/guacamole-server,hernan604\/guacamole-server,hernan604\/guacamole-server,AIexandr\/guacamole-server,wcypierre\/guacamole-server,mike-jumper\/incubator-guacamole-server,flangelo\/guacamole-server,glyptodon\/guacamole-server,wcypierre\/guacamole-server,abligh\/guacamole-server,mike-jumper\/incubator-guacamole-server,qiangyee\/guacamole-server,TheAxnJaxn\/guacamole-server,TribeMedia\/guacamole-server,wcypierre\/guacamole-server,hernan604\/guacamole-server,AIexandr\/guacamole-server,massuda-marcelo\/guacamole-server,massuda-marcelo\/guacamole-server,hernan604\/guacamole-server,apache\/guacamole-server,flangelo\/guacamole-server,abligh\/guacamole-server,flangelo\/guacamole-server,TribeMedia\/guacamole-server,mike-jumper\/incubator-guacamole-server,abligh\/guacamole-server,massuda-marcelo\/guacamole-server,TheAxnJaxn\/guacamole-server,TheAxnJaxn\/guacamole-server,glyptodon\/guacamole-server,TribeMedia\/guacamole-server,qiangyee\/guacamole-server,apache\/guacamole-server,AIexandr\/guacamole-server,mike-jumper\/incubator-guacamole-server,flangelo\/guacamole-server,qiangyee\/guacamole-server,wcypierre\/guacamole-server,TribeMedia\/guacamole-server","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libguac\/src\/client.c\n+++ libguac\/src\/client.c\n@@ -62,7 +62,7 @@\n guac_layer* allocd_layer;\n \n \/* If available layers, pop off first available layer *\/\n- if (client->__next_layer_index >= GUAC_BUFFER_POOL_INITIAL_SIZE &&\n+ if (client->__next_layer_index > GUAC_BUFFER_POOL_INITIAL_SIZE &&\n client->__available_layers != NULL) {\n \n allocd_layer = client->__available_layers;\n@@ -96,7 +96,7 @@\n guac_layer* allocd_layer;\n \n \/* If available layers, pop off first available buffer *\/\n- if (client->__next_buffer_index <= -GUAC_BUFFER_POOL_INITIAL_SIZE &&\n+ if (client->__next_buffer_index < -GUAC_BUFFER_POOL_INITIAL_SIZE &&\n client->__available_buffers != NULL) {\n \n allocd_layer = client->__available_buffers;\n"} {"commit":"44580b0867e4d50be33a20ede2003bb96992942e","subject":"GetInstance() in DevicePool returns an instance for invalid refs.","message":"GetInstance() in DevicePool returns an instance for invalid refs.\n\nIf a ref with a correct InstanceID but non-matching classname is passed, GetInstance() returns an instance that matches the InstanceID. This should return an error.\n\nAdd cu_compare_ref() after retrieving the instance to make sure ref is valid.\n\nFailing query:\nwbemcli gi 'http:\/\/localhost:5988\/root\/virt:Xen_ProcessorPool.InstanceID=\"MemoryPool\/0\"'\n\nSigned-off-by: Kaitlin Rupert <karupert@us.ibm.com>\n\n Virt_DevicePool.c | 7 +++++++\n 1 file changed, 7 insertions(+)\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Virt_DevicePool.c\n+++ src\/Virt_DevicePool.c\n@@ -739,6 +739,7 @@\n CMPIInstance *inst;\n virConnectPtr conn = NULL;\n const char *id = NULL;\n+ const char *prop;\n \n if (cu_get_str_path(reference, \"InstanceID\", &id) != CMPI_RC_OK) {\n cu_statusf(_BROKER, &s,\n@@ -753,6 +754,12 @@\n \n inst = get_pool_by_id(_BROKER, conn, id, NAMESPACE(reference));\n if (inst) {\n+ prop = cu_compare_ref(reference, inst);\n+ if (prop != NULL) {\n+ cu_statusf(broker, &s,\n+ CMPI_RC_ERR_NOT_FOUND,\n+ \"No such ResourcePool instance (%s)\", prop);\n+ }\n CMReturnInstance(results, inst);\n CMSetStatus(&s, CMPI_RC_OK);\n } else {\n"} {"commit":"0024d2e19ddd5b24e9c6819db786a7444835df9e","subject":"Use WCOREDUMP() only if it's available","message":"Use WCOREDUMP() only if it's available\n\ndarcs-hash:20050728185313-d2b6d-d70c0473ddd0b0aeb9f3f5574bcc326602eec089.gz\n","repos":"neg-serg\/notion,raboof\/notion,dkogan\/notion,dkogan\/notion,anoduck\/notion,neg-serg\/notion,p5n\/notion,neg-serg\/notion,knixeur\/notion,neg-serg\/notion,knixeur\/notion,dkogan\/notion,p5n\/notion,p5n\/notion,dkogan\/notion.xfttest,p5n\/notion,knixeur\/notion,dkogan\/notion,p5n\/notion,anoduck\/notion,dkogan\/notion,raboof\/notion,dkogan\/notion.xfttest,anoduck\/notion,knixeur\/notion,knixeur\/notion,raboof\/notion,anoduck\/notion,anoduck\/notion,raboof\/notion,dkogan\/notion.xfttest,dkogan\/notion.xfttest","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libmainloop\/signal.c\n+++ libmainloop\/signal.c\n@@ -111,7 +111,9 @@\n if(WIFSIGNALED(p->code)){\n extl_table_sets_b(t, \"signaled\", TRUE);\n extl_table_sets_i(t, \"termsig\", WTERMSIG(p->code));\n+#ifdef WCOREDUMP \n extl_table_sets_i(t, \"coredump\", WCOREDUMP(p->code));\n+#endif\n }\n if(WIFSTOPPED(p->code)){\n extl_table_sets_b(t, \"stopped\", TRUE);\n"} {"commit":"f1ab80448c375dba25bbc5cd2ac1f87dfa854fb8","subject":"check endpoint desc status only once per second, and move the corresponding code in a separated omx__check_endpoint_desc function","message":"check endpoint desc status only once per second, and move the corresponding code in a separated omx__check_endpoint_desc function\n\ngit-svn-id: 29c1264a5cf5e3532df57b06678e7347571c1a3c@713 f1ba3bf5-cb5c-402b-92a9-7c6bdc83a356\n","repos":"ananos\/xen2mx,ananos\/open-mx,ananos\/xen2mx,ananos\/xen2mx,ananos\/open-mx,ananos\/xen2mx,ananos\/open-mx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libopen-mx\/omx_lib.c\n+++ libopen-mx\/omx_lib.c\n@@ -167,11 +167,40 @@\n * Progression\n *\/\n \n+static INLINE void\n+omx__check_endpoint_desc(struct omx_endpoint * ep)\n+{\n+ static uint64_t last_check = 0;\n+ uint64_t now = omx__driver_desc->jiffies;\n+ uint64_t driver_status;\n+\n+ \/* check once every second *\/\n+ if (now - last_check < omx__driver_desc->hz)\n+ return;\n+\n+ driver_status = ep->desc->status;\n+ if (!driver_status)\n+ return;\n+\n+ if (driver_status & OMX_ENDPOINT_DESC_STATUS_EXP_EVENTQ_FULL) {\n+ printf(\"Driver reporting expected event queue full\\n\");\n+ assert(0);\n+ }\n+ if (driver_status & OMX_ENDPOINT_DESC_STATUS_UNEXP_EVENTQ_FULL) {\n+ printf(\"Driver reporting unexpected event queue full\\n\");\n+ printf(\"Some packets are being dropped, they will be resent by the sender\\n\");\n+ }\n+\n+ \/* could be racy... could be fixed using atomic ops... *\/\n+ ep->desc->status = 0;\n+\n+ last_check = now;\n+}\n+\n omx_return_t\n omx__progress(struct omx_endpoint * ep)\n {\n union omx_request *req , *next;\n- uint64_t driver_status;\n \n if (unlikely(ep->in_handler))\n return OMX_SUCCESS;\n@@ -251,18 +280,7 @@\n }\n }\n \n- driver_status = ep->desc->status;\n- if (driver_status) {\n- if (driver_status & OMX_ENDPOINT_DESC_STATUS_EXP_EVENTQ_FULL) {\n- printf(\"Driver reporting expected event queue full\\n\");\n- assert(0);\n- }\n- if (driver_status & OMX_ENDPOINT_DESC_STATUS_UNEXP_EVENTQ_FULL) {\n- printf(\"Driver reporting unexpected event queue full\\n\");\n- printf(\"Some packets are being dropped, they will be resent by the sender\\n\");\n- }\n- ep->desc->status = 0;\n- }\n+ omx__check_endpoint_desc(ep);\n \n return OMX_SUCCESS;\n }\n"} {"commit":"e0161dfa30355e09b1098e0ba7ddd3e0bc0c172e","subject":"completed debugging of fast desktop switching using pixmap caching on server","message":"completed debugging of fast desktop switching using pixmap caching on server\n","repos":"born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel,born2late\/afterstep-devel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/afterstep\/pager.c\n+++ src\/afterstep\/pager.c\n@@ -757,6 +757,7 @@\n #endif\n \tif( back->loaded_pixmap && (forget || Scr.Feel.conserve_memory > 0) ) \n \t{\n+\t\tLOCAL_DEBUG_OUT( \"ROOT_PIXMAP = %lX at %d\", Scr.RootBackground->pmap, __LINE__ );\n \t\tif( Scr.RootBackground->pmap == back->loaded_pixmap ) \n \t\t\tScr.RootBackground->pmap = None ;\n \t\tLOCAL_DEBUG_OUT( \"destroying pixmap %lX\", back->loaded_pixmap );\n@@ -1008,12 +1009,20 @@\n \n cover_desktop();\n display_progress( True, \"Changing background for desktop #%d ...\", desk);\n+\t\n+ if( Scr.RootBackground != NULL )\n+\t{\t\n+\t\tLOCAL_DEBUG_OUT( \"ROOT_PIXMAP = %lX at %d\", Scr.RootBackground->pmap, __LINE__ );\n+\t}\n \n #ifdef LOCAL_DEBUG\n LOCAL_DEBUG_OUT( \"syncing %s\",\"\");\n ASSync(False);\n #endif\n- release_old_background( old_desk, (desk==old_desk) );\n+\tif( old_back ) \n+\t{LOCAL_DEBUG_OUT( \"old_back>>> desk = %d, ptr = %p, loaded_im_name = \\\"%s\\\", pixmap = %lX\", old_desk, old_back, old_back->loaded_im_name, old_back->loaded_pixmap );}\n+\tif( new_back ) \n+\t{LOCAL_DEBUG_OUT( \"new_back>>> desk = %d, ptr = %p, loaded_im_name = \\\"%s\\\", pixmap = %lX\", desk, new_back, new_back->loaded_im_name, new_back->loaded_pixmap );}\n if( Scr.RootBackground == NULL )\n Scr.RootBackground = safecalloc( 1, sizeof(ASBackgroundHandler));\n else\n@@ -1023,6 +1032,7 @@\n Scr.RootBackground->cmd_pid = 0;\n Scr.RootBackground->im = NULL ;\n }\n+ release_old_background( old_desk, (desk==old_desk) );\n \tif( new_back->loaded_pixmap ) \n \t{\n \t\tASBackgroundHandler *bh = Scr.RootBackground ;\t\t\t\n@@ -1034,7 +1044,7 @@\n \t\t\tbh->pmap_width = width ;\n \tbh->pmap_height = height ;\n \tbh->im = NULL;\n-\n+\t\t\tbh->pmap = new_back->loaded_pixmap ;\n \t\t\tXSetWindowBackgroundPixmap( dpy, Scr.Root, new_back->loaded_pixmap );\n \t\t\tXClearWindow( dpy, Scr.Root );\n \t\t\tset_xrootpmap_id (Scr.wmprops, new_back->loaded_pixmap );\n@@ -1060,6 +1070,7 @@\n char *new_imname = make_myback_image_name( &(Scr.Look), new_back->name );\n store_asimage( Scr.image_manager, new_im, new_imname );\n }\n+\t\tLOCAL_DEBUG_OUT( \"ROOT_PIXMAP = %lX at %d\", Scr.RootBackground->pmap, __LINE__ );\n \t\tif( old_back && bh->pmap == old_back->loaded_pixmap)\n \t\t{\n \t\t\tif( Scr.Feel.conserve_memory == 0 )\n@@ -1067,7 +1078,7 @@\n \t\t\telse\n \t\t\t\told_back->loaded_pixmap = None ;\n \t\t}\n-\t\t\n+\t\tLOCAL_DEBUG_OUT( \"ROOT_PIXMAP = %lX at %d\", Scr.RootBackground->pmap, __LINE__ );\n \t\told_pmap = bh->pmap ;\n if( bh->pmap && (new_im->width != bh->pmap_width ||\n new_im->height != bh->pmap_height) )\n@@ -1079,7 +1090,8 @@\n LOCAL_DEBUG_OUT( \"root pixmap with id %lX destroyed\", bh->pmap );\n bh->pmap = None ;\n }\n- if( bh->pmap == None )\n+ LOCAL_DEBUG_OUT( \"ROOT_PIXMAP = %lX at %d\", Scr.RootBackground->pmap, __LINE__ );\n+\t\tif( bh->pmap == None )\n \t\t{\n bh->pmap = create_visual_pixmap( Scr.asv, Scr.Root, new_im->width, new_im->height, 0 );\n LOCAL_DEBUG_OUT( \"new root pixmap created with id %lX and size %dx%d\", bh->pmap, new_im->width, new_im->height );\n@@ -1094,6 +1106,10 @@\n \t\t\/*print_asimage( new_im, 0xFFFFFFFF, __FUNCTION__, __LINE__ );*\/\n ASSync(False);\n LOCAL_DEBUG_OUT( \"width(%d)->height(%d)->pixmap(%lX\/%lu)\", new_im->width, new_im->height, bh->pmap, bh->pmap );\n+\t\tif( old_back ) \n+\t\t{LOCAL_DEBUG_OUT( \"old_back>>>#2 desk = %d, ptr = %p, loaded_im_name = \\\"%s\\\", pixmap = %lX\", old_desk, old_back, old_back->loaded_im_name, old_back->loaded_pixmap );}\n+\t\tif( new_back ) \n+\t\t{LOCAL_DEBUG_OUT( \"new_back>>>#2 desk = %d, ptr = %p, loaded_im_name = \\\"%s\\\", pixmap = %lX\", desk, new_back, new_back->loaded_im_name, new_back->loaded_pixmap );}\n \t\t\n \t\t\/* cancel last background xfer is there was any *\/\n \t\tif( last_back_xfer )\n"} {"commit":"fb5f71704aa737cfa473497bba10cd7761e6cfa7","subject":"Issue #86: removed debug output from IObservable","message":"Issue #86: removed debug output from IObservable\n","repos":"gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab,gift-surg\/GIFT-Grab","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/api\/iobservable.h\n+++ src\/api\/iobservable.h\n@@ -85,8 +85,6 @@\n {\n for (IObserver & observer : _observers)\n {\n- printf(\"%p observer is of type %s\\n\",\n- &observer, typeid(observer).name());\n observer.update(frame);\n }\n }\n"} {"commit":"d23fb810a6a7b6f1904362ee8eeb68ead10f6073","subject":"auth: Make sure auth cache doesn't break if any cache keys have TABs.","message":"auth: Make sure auth cache doesn't break if any cache keys have TABs.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/auth\/auth-cache.c\n+++ src\/auth\/auth-cache.c\n@@ -207,6 +207,15 @@\n \thash_table_clear(cache->hash, FALSE);\n }\n \n+static const char *\n+auth_cache_escape(const char *string,\n+\t\t const struct auth_request *auth_request ATTR_UNUSED)\n+{\n+\t\/* cache key %variables are separated by tabs, make sure that there\n+\t are no tabs in the string *\/\n+\treturn str_tabescape(string);\n+}\n+\n const char *\n auth_cache_lookup(struct auth_cache *cache, const struct auth_request *request,\n \t\t const char *key, struct auth_cache_node **node_r,\n@@ -225,7 +234,7 @@\n \tstr = t_str_new(256);\n \tvar_expand(str, t_strconcat(request->userdb_lookup ? \"U\" : \"P\",\n \t\t\t\t \"%!\/\", key, NULL),\n-\t\t auth_request_get_var_expand_table(request, NULL));\n+\t\t auth_request_get_var_expand_table(request, auth_cache_escape));\n \n \tnode = hash_table_lookup(cache->hash, str_c(str));\n \tif (node == NULL) {\n@@ -281,7 +290,7 @@\n \tstr = t_str_new(256);\n \tvar_expand(str, t_strconcat(request->userdb_lookup ? \"U\" : \"P\",\n \t\t\t\t \"%!\/\", key, NULL),\n-\t\t auth_request_get_var_expand_table(request, NULL));\n+\t\t auth_request_get_var_expand_table(request, auth_cache_escape));\n \n \trequest->user = current_username;\n \n@@ -330,7 +339,7 @@\n \n \tstr = t_str_new(256);\n \tvar_expand(str, key,\n-\t\t auth_request_get_var_expand_table(request, NULL));\n+\t\t auth_request_get_var_expand_table(request, auth_cache_escape));\n \n \tnode = hash_table_lookup(cache->hash, str_c(str));\n \tif (node == NULL)\n"} {"commit":"77dc07935b2014cf2398ca25360ef8519cc82870","subject":"Attempt some order to the chaos that is Configuration Panel","message":"Attempt some order to the chaos that is Configuration Panel\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@19355 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bin\/e_configure.c\n+++ src\/bin\/e_configure.c\n@@ -61,14 +61,14 @@\n edje_object_part_text_set(eco->edje, \"title\", _(\"Configuration Panel\"));\n \n \/* add items here *\/\n- e_configure_standard_item_add(eco, \"enlightenment\/e\", _(\"Focus Settings\"), e_int_config_focus);\n- e_configure_standard_item_add(eco, \"enlightenment\/desktops\", _(\"Desktop Settings\"), e_int_config_desks);\n- e_configure_standard_item_add(eco, \"enlightenment\/favorites\", _(\"Menu Settings\"), e_int_config_menus);\n- e_configure_standard_item_add(eco, \"enlightenment\/windows\", _(\"Window Manipulation\"), e_int_config_window_manipulation);\n- e_configure_standard_item_add(eco, \"enlightenment\/windows\", _(\"Window Display\"), e_int_config_window_display);\n e_configure_standard_item_add(eco, \"enlightenment\/desktops\", _(\"Background Settings\"), e_int_config_background);\n e_configure_standard_item_add(eco, \"enlightenment\/themes\", _(\"Theme Selector\"), e_int_config_theme); \n e_configure_standard_item_add(eco, \"enlightenment\/modules\", _(\"Module Settings\"), e_int_config_modules);\n+ e_configure_standard_item_add(eco, \"enlightenment\/favorites\", _(\"Menu Settings\"), e_int_config_menus);\n+ e_configure_standard_item_add(eco, \"enlightenment\/desktops\", _(\"Desktop Settings\"), e_int_config_desks);\n+ e_configure_standard_item_add(eco, \"enlightenment\/e\", _(\"Focus Settings\"), e_int_config_focus);\n+ e_configure_standard_item_add(eco, \"enlightenment\/windows\", _(\"Window Display\"), e_int_config_window_display);\n+ e_configure_standard_item_add(eco, \"enlightenment\/windows\", _(\"Window Manipulation\"), e_int_config_window_manipulation);\n \n \/* FIXME: we should have a way for modules to hook in here and add their\n * own entries\n"} {"commit":"117db1062ae5fff8d4d84f8d0fe20fc32a85a1f9","subject":"restorer--","message":"restorer--\n\n\n\nSVN revision: 40134\n","repos":"rvandegrift\/elementary,tasn\/elementary,FlorentRevest\/Elementary,tasn\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,rvandegrift\/elementary,FlorentRevest\/Elementary,tasn\/elementary,FlorentRevest\/Elementary,FlorentRevest\/Elementary,tasn\/elementary,tasn\/elementary","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bin\/quicklaunch.c\n+++ src\/bin\/quicklaunch.c\n@@ -154,92 +154,80 @@\n elm_quicklaunch_init(argc, argv);\n restart_time = ecore_time_get();\n \n- action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n+ memset(&action, 0, sizeof(struct sigaction));\n+ action.sa_handler = SIG_DFL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGINT, &action, &old_sigint);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGTERM, &action, &old_sigterm);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGQUIT, &action, &old_sigquit);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGALRM, &action, &old_sigalrm);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGUSR1, &action, &old_sigusr1);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGUSR2, &action, &old_sigusr2);\n \n action.sa_handler = SIG_DFL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = NULL;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGHUP, &action, &old_sighup);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = child_handler;\n action.sa_flags = SA_RESTART | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGCHLD, &action, &old_sigchld);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = crash_handler;\n action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGSEGV, &action, &old_sigsegv);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = crash_handler;\n action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGILL, &action, &old_sigill);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = crash_handler;\n action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGFPE, &action, &old_sigfpe);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = crash_handler;\n action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n sigaction(SIGBUS, &action, &old_sigbus);\n \n action.sa_handler = NULL;\n- action.sa_restorer = NULL;\n action.sa_sigaction = crash_handler;\n action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;\n sigemptyset(&action.sa_mask);\n@@ -259,10 +247,14 @@\n {\n int bytes;\n char line[4096];\n-\n- read(fd, &bytes, sizeof(unsigned long));\n- ecore_app_args_set(argc, (const char **)argv);\n- handle_run(fd, bytes);\n+ int num;\n+ \n+ num = read(fd, &bytes, sizeof(unsigned long));\n+ if (num == sizeof(unsigned long))\n+ {\n+ ecore_app_args_set(argc, (const char **)argv);\n+ handle_run(fd, bytes);\n+ }\n }\n elm_quicklaunch_sub_shutdown();\n }\n"} {"commit":"f01a7cbb63de5804d0b1ede485ab41a9b037cbbf","subject":"Make codegenerator work correctly ... FUCK YEAH!","message":"Make codegenerator work correctly ... FUCK YEAH!\n","repos":"flimberger\/sysprog,flimberger\/sysprog","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/bin\/spc\/codegen.c\n+++ src\/bin\/spc\/codegen.c\n@@ -77,11 +77,15 @@\n void\n genstatements(Node *node)\n {\n+\t\/*\n+\t * Fuck the specs, who needs NOPs?\n+\t * if (node == NULL)\n+\t *\tbprintf(out, \"%s\\n\", spvm_op[NOP]);\n+\t *\/\n \tif ((node == NULL) || (node->left == NULL))\n \t\treturn;\n \tgenstatement(node->left);\n \tgenstatements(node->right);\n-\t\/* Fuck the specs, who needs NOPs? *\/\n }\n \n static\n@@ -95,7 +99,7 @@\n \tswitch(node->left->type) {\n \tcase NODE_IDENT:\n \t\tgenexp(node->right->right);\n-\t\tbprintf(out, \"%s $%s \", spvm_op[LA], node->left->data.sym->lexem);\n+\t\tbprintf(out, \"%s $%s\\n\", spvm_op[LA], node->left->data.sym->lexem);\n \t\tgenindex(node->right->left);\n \t\tbprintf(out, \"%s\\n\", spvm_op[STR]);\n \t\tbreak;\n@@ -104,7 +108,7 @@\n \t\tbprintf(out, \"%s\\n\", spvm_op[PRI]);\n \t\tbreak;\n \tcase NODE_READ:\n-\t\tbprintf(out, \"%s\\n%s $%S \", spvm_op[REA], spvm_op[LA],\n+\t\tbprintf(out, \"%s\\n%s $%s\\n\", spvm_op[REA], spvm_op[LA],\n \t\t node->left->left->data.sym->lexem);\n \t\tgenindex(node->left->right);\n \t\tbprintf(out, \"%s\\n\", spvm_op[STR]);\n@@ -132,7 +136,7 @@\n \t\tgenexp(node->right);\n \t\tbprintf(out, \"%s #%s\\n\", spvm_op[JIN], lbl2);\n \t\tgenstatement(node->left->left);\n-\t\tbprintf(out, \"%s #%s\\n#%s %s\", spvm_op[JMP], lbl1, lbl2,\n+\t\tbprintf(out, \"%s #%s\\n#%s %s\\n\", spvm_op[JMP], lbl1, lbl2,\n \t\t spvm_op[NOP]);\n \t\tfree(lbl2);\n \t\tfree(lbl1);\n@@ -160,7 +164,6 @@\n \t\tif (node->right->left->data.op == OP_UNEQ)\n \t\t\tbprintf(out, \"%s\\n\", spvm_op[NOT]);\n \t}\n-\t\n }\n \n static\n@@ -181,7 +184,7 @@\n \t\tpanic(\"Unexpected nullpointer in genexp2().\");\n \tswitch (node->left->type) {\n \tcase NODE_IDENT:\n-\t\tbprintf(out, \"%s $%s \", spvm_op[LA],\n+\t\tbprintf(out, \"%s $%s\\n\", spvm_op[LA],\n \t\t node->left->data.sym->lexem);\n \t\tgenindex(node->right);\n \t\tbprintf(out, \"%s\\n\", spvm_op[LV]);\n@@ -214,8 +217,8 @@\n {\n \tif (node == NULL)\n \t\treturn;\n+\tgenexp(node->right);\n \tgenop(node->left);\n-\tgenexp(node->right);\n }\n \n static\n"} {"commit":"84d670d20c910b263e26177c41311e47b932108b","subject":"Make psa_hash_compare go through hash_compute","message":"Make psa_hash_compare go through hash_compute\n\nIt's more efficient when dealing with hardware drivers.\n\nSigned-off-by: Steven Cooreman <3aba90f1d379733e8874f60494a9cbe19be366cb@silabs.com>\n","repos":"Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- library\/psa_crypto.c\n+++ library\/psa_crypto.c\n@@ -2298,25 +2298,18 @@\n const uint8_t *input, size_t input_length,\n const uint8_t *hash, size_t hash_length )\n {\n- psa_hash_operation_t operation = PSA_HASH_OPERATION_INIT;\n- psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;\n-\n- status = psa_hash_setup( &operation, alg );\n- if( status != PSA_SUCCESS )\n- goto exit;\n- status = psa_hash_update( &operation, input, input_length );\n- if( status != PSA_SUCCESS )\n- goto exit;\n- status = psa_hash_verify( &operation, hash, hash_length );\n- if( status != PSA_SUCCESS )\n- goto exit;\n-\n-exit:\n- if( status == PSA_SUCCESS )\n- status = psa_hash_abort( &operation );\n- else\n- psa_hash_abort( &operation );\n- return( status );\n+ uint8_t actual_hash[MBEDTLS_MD_MAX_SIZE];\n+ size_t actual_hash_length;\n+ psa_status_t status = psa_hash_compute( alg, input, input_length,\n+ actual_hash, sizeof(actual_hash),\n+ &actual_hash_length );\n+ if( status != PSA_SUCCESS )\n+ return( status );\n+ if( actual_hash_length != hash_length )\n+ return( PSA_ERROR_INVALID_SIGNATURE );\n+ if( safer_memcmp( hash, actual_hash, actual_hash_length ) != 0 )\n+ return( PSA_ERROR_INVALID_SIGNATURE );\n+ return( PSA_SUCCESS );\n }\n \n psa_status_t psa_hash_clone( const psa_hash_operation_t *source_operation,\n"} {"commit":"8ef5b5f6bb29f6785c896506122fc8eae86b2ea9","subject":"Check for corner cases earlier.","message":"Check for corner cases earlier.\n","repos":"tfar\/relic,ace0\/relic,OlegHahm\/relic,ace0\/relic,sruesch\/relic,ukscone\/relic,OlegHahm\/relic,ace0\/relic,sruesch\/relic,tfar\/relic,ukscone\/relic,ace0\/relic,OlegHahm\/relic,tfar\/relic,ukscone\/relic,sruesch\/relic","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bn\/relic_bn_gcd.c\n+++ src\/bn\/relic_bn_gcd.c\n@@ -40,18 +40,18 @@\n void bn_gcd_basic(bn_t c, const bn_t a, const bn_t b) {\n \tbn_t u, v;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\treturn;\n+\t}\n+\n \tbn_null(u);\n \tbn_null(v);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(u);\n@@ -77,30 +77,30 @@\n void bn_gcd_ext_basic(bn_t c, bn_t d, bn_t e, const bn_t a, const bn_t b) {\n \tbn_t u, v, x_1, y_1, q, r;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\tbn_zero(d);\n+\t\tif (e != NULL) {\n+\t\t\tbn_set_dig(e, 1);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\tbn_set_dig(d, 1);\n+\t\tif (e != NULL) {\n+\t\t\tbn_zero(e);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n \tbn_null(u);\n \tbn_null(v);\n \tbn_null(x_1);\n \tbn_null(y_1);\n \tbn_null(q);\n \tbn_null(r);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\tbn_zero(d);\n-\t\tif (e != NULL) {\n-\t\t\tbn_set_dig(e, 1);\n-\t\t}\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\tbn_set_dig(d, 1);\n-\t\tif (e != NULL) {\n-\t\t\tbn_zero(e);\n-\t\t}\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(u);\n@@ -174,6 +174,16 @@\n \tbn_t x, y, u, v, t0, t1, t2, t3;\n \tdig_t _x, _y, q, _q, t, _t;\n \tdis_t _a, _b, _c, _d;\n+\n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\treturn;\n+\t}\n \n \tbn_null(x);\n \tbn_null(y);\n@@ -183,16 +193,6 @@\n \tbn_null(t1);\n \tbn_null(t2);\n \tbn_null(t3);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\treturn;\n-\t}\n \n \t\/*\n \t * Taken from Handbook of Hyperelliptic and Elliptic Cryptography.\n@@ -357,6 +357,24 @@\n \tdis_t _a, _b, _c, _d;\n \tint swap;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\tbn_zero(d);\n+\t\tif (e != NULL) {\n+\t\t\tbn_set_dig(e, 1);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\tbn_set_dig(d, 1);\n+\t\tif (e != NULL) {\n+\t\t\tbn_zero(e);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n \tbn_null(x);\n \tbn_null(y);\n \tbn_null(u);\n@@ -366,24 +384,6 @@\n \tbn_null(t2);\n \tbn_null(t3);\n \tbn_null(t4);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\tbn_zero(d);\n-\t\tif (e != NULL) {\n-\t\t\tbn_set_dig(e, 1);\n-\t\t}\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\tbn_set_dig(d, 1);\n-\t\tif (e != NULL) {\n-\t\t\tbn_zero(e);\n-\t\t}\n-\t\treturn;\n-\t}\n \n \t\/*\n \t * Taken from Handbook of Hyperelliptic and Elliptic Cryptography.\n@@ -613,19 +613,19 @@\n \tbn_t u, v, t;\n \tint shift;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\treturn;\n+\t}\n+\n \tbn_null(u);\n \tbn_null(v);\n \tbn_null(t);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(u);\n@@ -673,6 +673,24 @@\n \tbn_t x, y, u, v, _a, _b, _e;\n \tint shift, found;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\tbn_zero(d);\n+\t\tif (e != NULL) {\n+\t\t\tbn_set_dig(e, 1);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\tbn_set_dig(d, 1);\n+\t\tif (e != NULL) {\n+\t\t\tbn_zero(e);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n \tbn_null(x);\n \tbn_null(y);\n \tbn_null(u);\n@@ -680,24 +698,6 @@\n \tbn_null(_a);\n \tbn_null(_b);\n \tbn_null(_e);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\tbn_zero(d);\n-\t\tif (e != NULL) {\n-\t\t\tbn_set_dig(e, 1);\n-\t\t}\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\tbn_set_dig(d, 1);\n-\t\tif (e != NULL) {\n-\t\t\tbn_zero(e);\n-\t\t}\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(x);\n@@ -802,6 +802,20 @@\n \tbn_t q, r, s, t, u, v, x, w, y, z;\n \tint stop;\n \n+\tif (bn_is_zero(a)) {\n+\t\tbn_abs(c, b);\n+\t\tbn_zero(d);\n+\t\tbn_zero(e);\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(b)) {\n+\t\tbn_abs(c, a);\n+\t\tbn_set_dig(d, 1);\n+\t\tbn_set_dig(e, 1);\n+\t\treturn;\n+\t}\n+\n \tbn_null(q);\n \tbn_null(r);\n \tbn_null(s);\n@@ -812,20 +826,6 @@\n \tbn_null(w);\n \tbn_null(y);\n \tbn_null(z);\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_abs(c, b);\n-\t\tbn_zero(d);\n-\t\tbn_zero(e);\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(b)) {\n-\t\tbn_abs(c, a);\n-\t\tbn_set_dig(d, 1);\n-\t\tbn_set_dig(e, 1);\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(q);\n@@ -938,35 +938,35 @@\n \tbn_t u, v, x1, y1, q, r;\n \tdig_t _v, _q, _t, _u;\n \n+\tif (d == NULL && e == NULL) {\n+\t\tbn_gcd_dig(c, a, b);\n+\t\treturn;\n+\t}\n+\n+\tif (bn_is_zero(a)) {\n+\t\tbn_set_dig(c, b);\n+\t\tbn_zero(d);\n+\t\tif (e != NULL) {\n+\t\t\tbn_set_dig(e, 1);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n+\tif (b == 0) {\n+\t\tbn_abs(c, a);\n+\t\tbn_set_dig(d, 1);\n+\t\tif (e != NULL) {\n+\t\t\tbn_zero(e);\n+\t\t}\n+\t\treturn;\n+\t}\n+\n \tbn_null(u);\n \tbn_null(v);\n \tbn_null(x1);\n \tbn_null(y1);\n \tbn_null(q);\n \tbn_null(r);\n-\n-\tif (d == NULL && e == NULL) {\n-\t\tbn_gcd_dig(c, a, b);\n-\t\treturn;\n-\t}\n-\n-\tif (bn_is_zero(a)) {\n-\t\tbn_set_dig(c, b);\n-\t\tbn_zero(d);\n-\t\tif (e != NULL) {\n-\t\t\tbn_set_dig(e, 1);\n-\t\t}\n-\t\treturn;\n-\t}\n-\n-\tif (b == 0) {\n-\t\tbn_abs(c, a);\n-\t\tbn_set_dig(d, 1);\n-\t\tif (e != NULL) {\n-\t\t\tbn_zero(e);\n-\t\t}\n-\t\treturn;\n-\t}\n \n \tTRY {\n \t\tbn_new(u);\n"} {"commit":"9f310179563c29ec3ebc9b4c8e89b409ec3266d5","subject":"psa: aead: Remove key slot from operation context","message":"psa: aead: Remove key slot from operation context\n\nSigned-off-by: Ronald Cron <b35ff5b7ca26c4ae9b66b92f2cf34224c8e26b08@arm.com>\n","repos":"NXPmicro\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- library\/psa_crypto.c\n+++ library\/psa_crypto.c\n@@ -561,17 +561,6 @@\n return( PSA_ERROR_INVALID_ARGUMENT );\n \n return( PSA_SUCCESS );\n-}\n-\n-\/** Return the size of the key in the given slot, in bits.\n- *\n- * \\param[in] slot A key slot.\n- *\n- * \\return The key size in bits, read from the metadata in the slot.\n- *\/\n-static inline size_t psa_get_key_slot_bits( const psa_key_slot_t *slot )\n-{\n- return( slot->attr.bits );\n }\n \n \/** Check whether a given key type is valid for use with a given MAC algorithm\n@@ -3522,7 +3511,6 @@\n \n typedef struct\n {\n- psa_key_slot_t *slot;\n const mbedtls_cipher_info_t *cipher_info;\n union\n {\n@@ -3542,7 +3530,7 @@\n uint8_t tag_length;\n } aead_operation_t;\n \n-#define AEAD_OPERATION_INIT {0, 0, {0}, 0, 0, 0}\n+#define AEAD_OPERATION_INIT {0, {0}, 0, 0, 0}\n \n static void psa_aead_abort_internal( aead_operation_t *operation )\n {\n@@ -3561,17 +3549,20 @@\n }\n }\n \n-static psa_status_t psa_aead_setup( aead_operation_t *operation,\n- psa_algorithm_t alg )\n+static psa_status_t psa_aead_setup(\n+ aead_operation_t *operation,\n+ const psa_key_attributes_t *attributes,\n+ const uint8_t *key_buffer,\n+ psa_algorithm_t alg )\n {\n psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;\n size_t key_bits;\n mbedtls_cipher_id_t cipher_id;\n \n- key_bits = psa_get_key_slot_bits( operation->slot );\n+ key_bits = attributes->core.bits;\n \n operation->cipher_info =\n- mbedtls_cipher_info_from_psa( alg, operation->slot->attr.type, key_bits,\n+ mbedtls_cipher_info_from_psa( alg, attributes->core.type, key_bits,\n &cipher_id );\n if( operation->cipher_info == NULL )\n return( PSA_ERROR_NOT_SUPPORTED );\n@@ -3585,14 +3576,13 @@\n \/* CCM allows the following tag lengths: 4, 6, 8, 10, 12, 14, 16.\n * The call to mbedtls_ccm_encrypt_and_tag or\n * mbedtls_ccm_auth_decrypt will validate the tag length. *\/\n- if( PSA_BLOCK_CIPHER_BLOCK_LENGTH( operation->slot->attr.type ) != 16 )\n+ if( PSA_BLOCK_CIPHER_BLOCK_LENGTH( attributes->core.type ) != 16 )\n return( PSA_ERROR_INVALID_ARGUMENT );\n \n mbedtls_ccm_init( &operation->ctx.ccm );\n status = mbedtls_to_psa_error(\n mbedtls_ccm_setkey( &operation->ctx.ccm, cipher_id,\n- operation->slot->key.data,\n- (unsigned int) key_bits ) );\n+ key_buffer, (unsigned int) key_bits ) );\n if( status != PSA_SUCCESS )\n return( status );\n break;\n@@ -3605,14 +3595,13 @@\n \/* GCM allows the following tag lengths: 4, 8, 12, 13, 14, 15, 16.\n * The call to mbedtls_gcm_crypt_and_tag or\n * mbedtls_gcm_auth_decrypt will validate the tag length. *\/\n- if( PSA_BLOCK_CIPHER_BLOCK_LENGTH( operation->slot->attr.type ) != 16 )\n+ if( PSA_BLOCK_CIPHER_BLOCK_LENGTH( attributes->core.type ) != 16 )\n return( PSA_ERROR_INVALID_ARGUMENT );\n \n mbedtls_gcm_init( &operation->ctx.gcm );\n status = mbedtls_to_psa_error(\n mbedtls_gcm_setkey( &operation->ctx.gcm, cipher_id,\n- operation->slot->key.data,\n- (unsigned int) key_bits ) );\n+ key_buffer, (unsigned int) key_bits ) );\n if( status != PSA_SUCCESS )\n return( status );\n break;\n@@ -3629,7 +3618,7 @@\n mbedtls_chachapoly_init( &operation->ctx.chachapoly );\n status = mbedtls_to_psa_error(\n mbedtls_chachapoly_setkey( &operation->ctx.chachapoly,\n- operation->slot->key.data ) );\n+ key_buffer ) );\n if( status != PSA_SUCCESS )\n return( status );\n break;\n@@ -3660,17 +3649,22 @@\n size_t *ciphertext_length )\n {\n psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;\n+ psa_key_slot_t *slot;\n aead_operation_t operation = AEAD_OPERATION_INIT;\n uint8_t *tag;\n \n *ciphertext_length = 0;\n \n status = psa_get_and_lock_transparent_key_slot_with_policy(\n- key, &operation.slot, PSA_KEY_USAGE_ENCRYPT, alg );\n+ key, &slot, PSA_KEY_USAGE_ENCRYPT, alg );\n if( status != PSA_SUCCESS )\n return( status );\n \n- status = psa_aead_setup( &operation, alg );\n+ psa_key_attributes_t attributes = {\n+ .core = slot->attr\n+ };\n+\n+ status = psa_aead_setup( &operation, &attributes, slot->key.data, alg );\n if( status != PSA_SUCCESS )\n goto exit;\n \n@@ -3740,9 +3734,8 @@\n memset( ciphertext, 0, ciphertext_size );\n \n exit:\n- psa_unlock_key_slot( operation.slot );\n psa_aead_abort_internal( &operation );\n- \n+ psa_unlock_key_slot( slot );\n \n if( status == PSA_SUCCESS )\n *ciphertext_length = plaintext_length + operation.tag_length;\n@@ -3783,17 +3776,22 @@\n size_t *plaintext_length )\n {\n psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;\n+ psa_key_slot_t *slot;\n aead_operation_t operation = AEAD_OPERATION_INIT;\n const uint8_t *tag = NULL;\n \n *plaintext_length = 0;\n \n status = psa_get_and_lock_transparent_key_slot_with_policy(\n- key, &operation.slot, PSA_KEY_USAGE_DECRYPT, alg );\n+ key, &slot, PSA_KEY_USAGE_DECRYPT, alg );\n if( status != PSA_SUCCESS )\n return( status );\n \n- status = psa_aead_setup( &operation, alg );\n+ psa_key_attributes_t attributes = {\n+ .core = slot->attr\n+ };\n+\n+ status = psa_aead_setup( &operation, &attributes, slot->key.data, alg );\n if( status != PSA_SUCCESS )\n goto exit;\n \n@@ -3859,9 +3857,9 @@\n memset( plaintext, 0, plaintext_size );\n \n exit:\n- psa_unlock_key_slot( operation.slot );\n psa_aead_abort_internal( &operation );\n- \n+ psa_unlock_key_slot( slot );\n+\n if( status == PSA_SUCCESS )\n *plaintext_length = ciphertext_length - operation.tag_length;\n return( status );\n"} {"commit":"6b83e0f5dc2a187a1f111ee426778dfe26516acd","subject":"polish comments on LOG*","message":"polish comments on LOG*\n","repos":"brpc\/brpc,brpc\/brpc,brpc\/brpc,brpc\/brpc,brpc\/brpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/brpc\/controller.h\n+++ src\/brpc\/controller.h\n@@ -810,7 +810,8 @@\n \n } \/\/ namespace brpc\n \n-\/\/ Print contextual logs\n+\/\/ Print logs appended with @rid which is got from \"x-request-id\"(set \n+\/\/ -request_id_header to change) in http header by default\n #define LOGD(cntl) LOG(DEBUG) << (cntl)->LogPostfix()\n #define LOGI(cntl) LOG(INFO) << (cntl)->LogPostfix()\n #define LOGW(cntl) LOG(WARNING) << (cntl)->LogPostfix()\n"} {"commit":"c2f7b75a71e6d8da7c2204e2a053acf1d095521a","subject":"mbedtls_ssl_cookie_check: zeroize expected cookie on cookie mismatch","message":"mbedtls_ssl_cookie_check: zeroize expected cookie on cookie mismatch\n\nSigned-off-by: Gilles Peskine <f805f64266d288fc5467baa7be6cd0ff366f477b@arm.com>\n","repos":"ARMmbed\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,Mbed-TLS\/mbedtls,NXPmicro\/mbedtls,NXPmicro\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls,Mbed-TLS\/mbedtls,ARMmbed\/mbedtls,ARMmbed\/mbedtls,NXPmicro\/mbedtls","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- library\/ssl_cookie.c\n+++ library\/ssl_cookie.c\n@@ -217,15 +217,20 @@\n \n #if defined(MBEDTLS_THREADING_C)\n if( mbedtls_mutex_unlock( &ctx->mutex ) != 0 )\n- return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_SSL_INTERNAL_ERROR,\n- MBEDTLS_ERR_THREADING_MUTEX_ERROR ) );\n+ {\n+ ret = MBEDTLS_ERROR_ADD( MBEDTLS_ERR_SSL_INTERNAL_ERROR,\n+ MBEDTLS_ERR_THREADING_MUTEX_ERROR );\n+ }\n #endif\n \n if( ret != 0 )\n- return( ret );\n+ goto exit;\n \n if( mbedtls_ct_memcmp( cookie + 4, ref_hmac, sizeof( ref_hmac ) ) != 0 )\n- return( -1 );\n+ {\n+ ret = -1;\n+ goto exit;\n+ }\n \n #if defined(MBEDTLS_HAVE_TIME)\n cur_time = (unsigned long) mbedtls_time( NULL );\n@@ -239,8 +244,13 @@\n ( (unsigned long) cookie[3] );\n \n if( ctx->timeout != 0 && cur_time - cookie_time > ctx->timeout )\n- return( -1 );\n-\n- return( 0 );\n+ {\n+ ret = -1;\n+ goto exit;\n+ }\n+\n+exit:\n+ mbedtls_platform_zeroize( ref_hmac, sizeof( ref_hmac ) );\n+ return( ret );\n }\n #endif \/* MBEDTLS_SSL_COOKIE_C *\/\n"} {"commit":"f4ecefd9b3c9fd7304a90a24af6dc536227c2aae","subject":"Fixed type mismatch","message":"Fixed type mismatch\n\nWhen assigning a signed value to an unsigned variable, it cannot be\nnegative afterwards.\n","repos":"lavabit\/libdime,lavabit\/libdime,lavabit\/libdime,lavabit\/libdime,greyg00s\/libdime,greyg00s\/libdime","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- libs\/dmessage\/dmsg.c\n+++ libs\/dmessage\/dmsg.c\n@@ -658,7 +658,8 @@\n \tdmime_chunk_key_t *key;\n \tdmime_keyslot_t *keyslot, temp;\n \tint slot_count = 0;\n-\tsize_t data_size, res;\n+\tsize_t data_size;\n+\tint res;\n \tunsigned char *outbuf;\n \n \tif(!chunk || !keks) {\n@@ -703,7 +704,7 @@\n \tif((res = _encrypt_aes_256(outbuf, &(chunk->data[0]), data_size, temp.aes_key, temp.iv)) < 0) {\n \t\t_secure_wipe((unsigned char *)&temp, sizeof(temp));\n \t\tRET_ERROR_INT(ERR_UNSPEC, \"error encrypting data\");\n-\t} else if(res != data_size) {\n+\t} else if((size_t)res != data_size) {\n \t\tRET_ERROR_INT(ERR_UNSPEC, \"encrypted an unexpected number of bytes\");\n \t}\n \n@@ -2086,7 +2087,8 @@\n \tdmime_keyslot_t *keyslot_enc, keyslot_dec;\n \tdmime_message_chunk_t *result;\n \tint keyslot_num;\n-\tsize_t payload_size, res;\n+\tsize_t payload_size;\n+\tint res;\n \tunsigned char *data;\n \n \tif(!chunk || !kek) {\n@@ -2173,7 +2175,7 @@\n \t\t_secure_wipe(&keyslot_dec, sizeof(dmime_keyslot_t));\n \t\tfree(data);\n \t\tRET_ERROR_PTR(ERR_UNSPEC, \"an error occurred while decrypting a chunk payload\");\n-\t} else if(res != payload_size) {\n+\t} else if((size_t)res != payload_size) {\n \t\t_secure_wipe(&keyslot_dec, sizeof(dmime_keyslot_t));\n \t\tfree(data);\n \t\tRET_ERROR_PTR(ERR_UNSPEC, \"decrypted an unexpected number of bytes\");\n"} {"commit":"7184d0505e2bd158c0463a773465129ebabb14ff","subject":"\u0421o\u0437\u0434\u0430\u043d \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u0447\u043d\u044b\u0439 \u0444\u0430\u0439\u043b","message":"\u0421o\u0437\u0434\u0430\u043d \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u0447\u043d\u044b\u0439 \u0444\u0430\u0439\u043b\n","repos":"andrey-terekhov\/RuC,andrey-terekhov\/RuC,andrey-terekhov\/RuC","returncode":1,"stderr":"error: pathspec 'libs\/utils\/strings.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- libs\/utils\/strings.h\n+++ libs\/utils\/strings.h\n@@ -0,0 +1,112 @@\n+\/*\n+ *\tCopyright 2021 Andrey Terekhov, Victor Y. Fadeev, Dmitrii Davladov\n+ *\n+ *\tLicensed under the Apache License, Version 2.0 (the \"License\");\n+ *\tyou may not use this file except in compliance with the License.\n+ *\tYou may obtain a copy of the License at\n+ *\n+ *\t\thttp:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ *\tUnless required by applicable law or agreed to in writing, software\n+ *\tdistributed under the License is distributed on an \"AS IS\" BASIS,\n+ *\tWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ *\tSee the License for the specific language governing permissions and\n+ *\tlimitations under the License.\n+ *\/\n+\n+#pragma once\n+\n+#include <stdbool.h>\n+#include <stddef.h>\n+#include \"dll.h\"\n+\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+\n+\/** Strings structure *\/\n+typedef struct strings\n+{\n+\tchar *all_strings;\t\t\t\t\/**< Strings storage *\/\n+\tsize_t all_strings_size;\t\t\/**< Size of strings storage *\/\n+\tsize_t all_strings_alloc;\t\t\/**< Allocated size of strings storage *\/\n+\n+\tsize_t *indexes;\t\t\t\t\/**< Indexes array *\/\n+\tsize_t indexes_size;\t\t\t\/**< Size of indexes *\/\n+\tsize_t indexes_alloc;\t\t\t\/**< Allocated size of indexes *\/\n+} strings;\n+\n+\n+\/**\n+ *\tCreate new strings structure\n+ *\n+ *\t@param\talloc\t\t\tInitializer of allocated size\n+ *\n+ *\t@return\tVector structure\n+ *\/\n+EXPORTED strings strings_create(const size_t alloc);\n+\n+\n+\/**\n+ *\tAdd new value\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\t@param\tvalue\t\t\tValue\n+ *\n+ *\t@return\tIndex, @c SIZE_MAX on failure\n+ *\/\n+EXPORTED size_t strings_add(strings *const vec, const char *const value);\n+\n+\/**\n+ *\tGet string\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\t@param\tindex\t\t\tIndex\n+ *\n+ *\t@return\tString, @c NULL on failure\n+ *\/\n+EXPORTED const char *strings_get(const strings *const vec, const size_t index);\n+\n+\/**\n+ *\tRemove last string\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\n+ *\t@return\tDeleted string, @c NULL on failure\n+ *\/\n+EXPORTED strings strings_remove(strings *const vec);\n+\n+\n+\/**\n+ *\tGet strings structure size\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\n+ *\t@return\tSize of strings structure, @c SIZE_MAX on failure\n+ *\/\n+EXPORTED size_t strings_size(const strings *const vec);\n+\n+\/**\n+ *\tCheck that strings structure is correct\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\n+ *\t@return\t@c 1 on true, @c 0 on false\n+ *\/\n+EXPORTED bool strings_is_correct(const strings *const vec);\n+\n+\n+\/**\n+ *\tFree allocated memory\n+ *\n+ *\t@param\tvec\t\t\t\tStrings structure\n+ *\n+ *\t@return\t@c 0 on success, @c -1 on failure\n+ *\/\n+EXPORTED int strings_clear(strings *const vec);\n+\n+#ifdef __cplusplus\n+} \/* extern \"C\" *\/\n+#endif\n"} {"commit":"e7e80ea703391d970230b210f6298b2f3989644e","subject":"libseed: Pass this as an argument to constructors in addition to as this. Calling it self provides a quick solution to capturing this in closures.","message":"libseed: Pass this as an argument to constructors in addition to as this. Calling it self provides a quick solution to capturing this in closures.\n","repos":"danilocesar\/seed,danilocesar\/seed,danilocesar\/seed,danilocesar\/seed,danilocesar\/seed","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libseed\/seed-gtype.c\n+++ libseed\/seed-gtype.c\n@@ -297,7 +297,7 @@\n {\n JSContextRef ctx;\n JSObjectRef func, this_object;\n- JSValueRef exception = NULL;\n+ JSValueRef exception = NULL, args[1];\n GObject *object;\n GType parent;\n GObjectClass *parent_class;\n@@ -318,8 +318,9 @@\n SEED_NOTE (GTYPE, \"Handling constructor for: %p with type: %s\",\n \t\t object, g_type_name (type));\n this_object = (JSObjectRef) seed_value_from_object (ctx, object, NULL);\n- \n- JSObjectCallAsFunction (ctx, func, this_object, 0, 0, &exception);\n+ args[0] = this_object;\n+ \n+ JSObjectCallAsFunction (ctx, func, this_object, 1, args, &exception);\n if (exception)\n \t{\n \t gchar *mes = seed_exception_to_string (ctx, exception);\n"} {"commit":"22b8c97f41c9741fc2e97540fbbf87c1d798ca33","subject":"Cache must not return a cached resource with \"no-cache\" directive","message":"Cache must not return a cached resource with \"no-cache\" directive\n\nIf \"Pragma: no-cache\" or \"Cache-Control: no-cache\" do exist in a request then\nthe cache must not return a cached resource but reload the resource from the\noriginal server.\n\nA \"Cache-Control: max-age=0\" should also force the cache to revalidate its\nentries against the original server.\n","repos":"ahmedammar\/platform_external_gst_libsoup,fanc999\/libsoup,Distrotech\/libsoup,Distrotech\/libsoup,ahmedammar\/platform_external_gst_libsoup,ahmedammar\/platform_external_gst_libsoup,jwendell\/libsoup,fanc999\/libsoup,fanc999\/libsoup,jwendell\/libsoup,Distrotech\/libsoup,jwendell\/libsoup,fanc999\/libsoup,jwendell\/libsoup,Distrotech\/libsoup,jwendell\/libsoup,Distrotech\/libsoup,fanc999\/libsoup","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libsoup\/soup-cache.c\n+++ libsoup\/soup-cache.c\n@@ -1252,7 +1252,7 @@\n {\n \tchar *key;\n \tSoupCacheEntry *entry;\n-\tconst char *cache_control;\n+\tconst char *cache_control, *pragma;\n \tgpointer value;\n \tgboolean must_revalidate;\n \tint max_age, max_stale, min_fresh;\n@@ -1315,6 +1315,12 @@\n \tmust_revalidate = FALSE;\n \tmax_age = max_stale = min_fresh = -1;\n \n+\t\/* For HTTP 1.0 compatibility. RFC2616 section 14.9.4\n+\t *\/\n+\tpragma = soup_message_headers_get (msg->request_headers, \"Pragma\");\n+\tif (pragma && soup_header_contains (pragma, \"no-cache\"))\n+\t\treturn SOUP_CACHE_RESPONSE_STALE;\n+\n \tcache_control = soup_message_headers_get (msg->request_headers, \"Cache-Control\");\n \tif (cache_control) {\n \t\tGHashTable *hash = soup_header_parse_param_list (cache_control);\n@@ -1325,11 +1331,16 @@\n \t\t}\n \n \t\tif (g_hash_table_lookup_extended (hash, \"no-cache\", NULL, NULL)) {\n-\t\t\tentry->must_revalidate = TRUE;\n+\t\t\tsoup_header_free_param_list (hash);\n+\t\t\treturn SOUP_CACHE_RESPONSE_STALE;\n \t\t}\n \n \t\tif (g_hash_table_lookup_extended (hash, \"max-age\", NULL, &value)) {\n \t\t\tmax_age = (int)MIN (g_ascii_strtoll (value, NULL, 10), G_MAXINT32);\n+\t\t\t\/* Forcing cache revalidaton\n+\t\t\t *\/\n+\t\t\tif (!max_age)\n+\t\t\t\tentry->must_revalidate = TRUE;\n \t\t}\n \n \t\t\/* max-stale can have no value set, we need to use _extended *\/\n@@ -1346,7 +1357,7 @@\n \n \t\tsoup_header_free_param_list (hash);\n \n-\t\tif (max_age != -1) {\n+\t\tif (max_age > 0) {\n \t\t\tguint current_age = soup_cache_entry_get_current_age (entry);\n \n \t\t\t\/* If we are over max-age and max-stale is not\n"} {"commit":"66e14ae62a35aefc7df171885fcee142888fd33e","subject":"Linux proc scanning: Read entire lines from \/proc\/$PID\/maps (#1472)","message":"Linux proc scanning: Read entire lines from \/proc\/$PID\/maps (#1472)\n\nEntries in \/proc\/$PID\/maps may contain long filenames. Skip over those\r\nif they haven't been fully read.","repos":"VirusTotal\/yara,VirusTotal\/yara,VirusTotal\/yara,pombredanne\/yara,hillu\/yara,pombredanne\/yara,wxsBSD\/yara,VirusTotal\/yara,hillu\/yara,wxsBSD\/yara,hillu\/yara,pombredanne\/yara,pombredanne\/yara,wxsBSD\/yara,pombredanne\/yara,VirusTotal\/yara,hillu\/yara,wxsBSD\/yara,wxsBSD\/yara,hillu\/yara","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libyara\/proc\/linux.c\n+++ libyara\/proc\/linux.c\n@@ -154,6 +154,7 @@\n \n char buffer[256];\n uint64_t begin, end;\n+ int c;\n \n if (fgets(buffer, sizeof(buffer), proc_info->maps) != NULL)\n {\n@@ -163,6 +164,12 @@\n context->current_block.size = end - begin;\n result = &context->current_block;\n }\n+ \/* if we haven't read the whole line, skip over the rest *\/\n+ if (strrchr(buffer, '\\n') == NULL)\n+ do\n+ {\n+ c = fgetc(proc_info->maps);\n+ } while (c >= 0 && c != '\\n');\n \n iterator->last_error = ERROR_SUCCESS;\n \n"} {"commit":"e8cf63b10a72003a120b091640c758337b3cfae4","subject":"var name","message":"var name\n","repos":"CauldronDevelopmentLLC\/cbang,CauldronDevelopmentLLC\/cbang,CauldronDevelopmentLLC\/cbang,CauldronDevelopmentLLC\/cbang","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/cbang\/util\/Rate.h\n+++ src\/cbang\/util\/Rate.h\n@@ -81,10 +81,10 @@\n \n \n void event(double value = 1, uint64_t now = Time::now()) {\n- unsigned bucket = now \/ period;\n+ unsigned time = now \/ period;\n \n if (last) {\n- unsigned delta = bucket - last;\n+ unsigned delta = time - last;\n \n \/\/ Advance, clearing any expired buckets along the way\n for (unsigned i = 0; i < delta && i < buckets.size(); i++) {\n@@ -95,7 +95,7 @@\n }\n \n buckets[head] += value; \/\/ Sum event\n- last = bucket;\n+ last = time;\n }\n };\n }\n"} {"commit":"d352cf84d4bf993648a2c8a2a4b5ef181fff9799","subject":"Add fix16_mul()","message":"Add fix16_mul()\n","repos":"ijacquez\/libyaul,ijacquez\/libyaul,ijacquez\/libyaul,ijacquez\/libyaul","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libyaul\/math\/fix16.h\n+++ libyaul\/math\/fix16.h\n@@ -141,6 +141,26 @@\n return degrees * fix16_deg2rad;\n }\n \n+static inline uint32_t __always_inline\n+fix16_mul(const fix16_t a, const fix16_t b)\n+{\n+ register uint32_t mach;\n+ register fix16_t out;\n+\n+ __asm__ volatile (\"\\tdmuls.l %[a], %[b]\\n\"\n+ \"\\tsts mach, %[mach]\\n\"\n+ \"\\tsts macl, %[out]\\n\"\n+ \"\\nxtrct %[mach], %[out]\"\n+ \/* Output *\/\n+ : [mach] \"=&r\" (mach),\n+ [out] \"=&r\" (out)\n+ \/* Input *\/\n+ : [a] \"r\" (a),\n+ [b] \"r\" (b)\n+ : \"mach\", \"macl\");\n+\n+ return out;\n+}\n \n extern fix16_t fix16_overflow_add(const fix16_t, const fix16_t) FIXMATH_FUNC_ATTRS;\n extern fix16_t fix16_overflow_sub(const fix16_t, const fix16_t) FIXMATH_FUNC_ATTRS;\n"} {"commit":"4f154487baa9712b57391f20d6bf75b0dc4d9b00","subject":"Cleanly draw tail","message":"Cleanly draw tail\n","repos":"dvberkel\/chicken-o-clock,dvberkel\/chicken-o-clock","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/chicken-o-clock.c\n+++ src\/chicken-o-clock.c\n@@ -95,7 +95,11 @@\n \n GPoint tail_start = GPoint(chicken.x + chicken.radius, chicken.y);\n GPoint tail_tip = GPoint(chicken.x + chicken.radius, chicken.y - chicken.tail_height);\n- GPoint tail_end = GPoint(chicken.x, chicken.y);\n+\n+ int tail_angle = atan2_lookup(chicken.radius, tail_tip.y);\n+ GPoint tail_end = GPoint(\n+ chicken.x + chicken.radius * cos_lookup(tail_angle)\/TRIG_MAX_RATIO,\n+ chicken.y - chicken.radius * sin_lookup(tail_angle)\/TRIG_MAX_RATIO);\n \n graphics_draw_line(ctx, tail_start, tail_tip);\n graphics_draw_line(ctx, tail_tip, tail_end);\n@@ -113,7 +117,6 @@\n \n GPoint origin = GPoint(chicken.x, chicken.y);\n \n- graphics_fill_circle(ctx, origin, chicken.radius);\n graphics_draw_circle(ctx, origin, chicken.radius);\n }\n \n"} {"commit":"837d92890f929208be5d9f20b89ef8087782b471","subject":"Update: Sorting method redudancies refactored","message":"Update: Sorting method redudancies refactored\n","repos":"theck01\/offbrand_lib,theck01\/offbrand_lib,theck01\/offbrand_lib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/classes\/OBDeque.c\n+++ src\/classes\/OBDeque.c\n@@ -250,20 +250,7 @@\n \n \n void sortDeque(OBDeque *deque, int8_t order){\n-\n- OBDeque sorted; \/* stack variable to remove internal memory management\n- burden *\/\n-\n- assert(deque);\n- assert(order == OB_LEAST_TO_GREATEST || order == OB_GREATEST_TO_LEAST);\n-\n- sorted = recursiveSort(*deque, order, &compare);\n-\n- \/* connect head and tail of newly sorted list to deque *\/\n- deque->head = sorted.head;\n- deque->tail = sorted.tail;\n-\n- return;\n+ sortDequeWithFunct(deque, order, &compare);\n }\n \n \n"} {"commit":"2c8b39bf6bfda3c065579e8fcb999d8614984a05","subject":"start migrating global variables into a local structure","message":"start migrating global variables into a local structure\n\n\ngit-svn-id: fc35eccb03ccef1c432fd0fcf5295fcceaca86a6@23582 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6\n","repos":"linas\/link-grammar,MadBomber\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,ampli\/link-grammar,opencog\/link-grammar,linas\/link-grammar,ampli\/link-grammar,linas\/link-grammar,linas\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,linas\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,linas\/link-grammar,ampli\/link-grammar,ampli\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar,MadBomber\/link-grammar,opencog\/link-grammar,ampli\/link-grammar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- link-grammar\/prune.c\n+++ link-grammar\/prune.c\n@@ -16,6 +16,13 @@\n static char ** deletable;\n static char ** effective_dist;\n static int null_links;\n+\n+typedef struct prune_context_s prune_context;\n+struct prune_context_s {\n+\tint power_cost;\n+};\n+\n+static int power_prune_mode; \/* either GENTLE or RUTHLESS *\/\n \n \/*\n \n@@ -993,10 +1000,6 @@\n deletable, this is equivalent to RUTHLESS. --DS, 7\/97\n *\/\n \n-static int power_cost;\n-static int power_prune_mode; \/* either GENTLE or RUTHLESS *\/\n-\t\t\t\t\t\t\t \/* obviates excessive paramater passing *\/\n-\n static int left_connector_count(Disjunct * d) {\n \/* returns the number of connectors in the left lists of the disjuncts. *\/\n \tConnector *c;\n@@ -1267,25 +1270,27 @@\n }\n #endif\n \n-static int left_connector_list_update(Connector *c, int word_c, int w, int shallow) {\n-\/* take this connector list, and try to match it with the words\n- w-1, w-2, w-3...Returns the word to which the first connector of the\n- list could possibly be matched. If c is NULL, returns w. If there\n- is no way to match this list, it returns a negative number.\n- If it does find a way to match it, it updates the c->word fields\n- correctly.\n-*\/\n+\/**\n+ * take this connector list, and try to match it with the words\n+ * w-1, w-2, w-3...Returns the word to which the first connector of the\n+ * list could possibly be matched. If c is NULL, returns w. If there\n+ * is no way to match this list, it returns a negative number.\n+ * If it does find a way to match it, it updates the c->word fields\n+ * correctly.\n+ *\/\n+static int left_connector_list_update(prune_context *pc, Connector *c, int word_c, int w, int shallow)\n+{\n \tint n;\n \tint foundmatch;\n \n \tif (c==NULL) return w;\n-\tn = left_connector_list_update(c->next, word_c, w, FALSE) - 1;\n+\tn = left_connector_list_update(pc, c->next, word_c, w, FALSE) - 1;\n \tif (((int) c->word) < n) n = c->word;\n \n \t\/* n is now the rightmost word we need to check *\/\n \tfoundmatch = FALSE;\n \tfor (; (n >= 0) && ((w-n) <= MAX_SENTENCE); n--) {\n-\t\tpower_cost++;\n+\t\tpc->power_cost++;\n \t\tif (right_table_search(n, c, shallow, word_c)) {\n \t\t\tfoundmatch = TRUE;\n \t\t\tbreak;\n@@ -1298,25 +1303,28 @@\n \treturn (foundmatch ? n : -1);\n }\n \n-static int right_connector_list_update(Sentence sent, Connector *c, int word_c, int w, int shallow) {\n-\/* take this connector list, and try to match it with the words\n- w+1, w+2, w+3...Returns the word to which the first connector of the\n- list could possibly be matched. If c is NULL, returns w. If there\n- is no way to match this list, it returns a number greater than N_words-1\n- If it does find a way to match it, it updates the c->word fields\n- correctly.\n-*\/\n+\/**\n+ * take this connector list, and try to match it with the words\n+ * w+1, w+2, w+3...Returns the word to which the first connector of the\n+ * list could possibly be matched. If c is NULL, returns w. If there\n+ * is no way to match this list, it returns a number greater than N_words-1\n+ * If it does find a way to match it, it updates the c->word fields\n+ * correctly.\n+ *\/\n+static int right_connector_list_update(prune_context *pc, Sentence sent, Connector *c, \n+ int word_c, int w, int shallow)\n+{\n \tint n;\n \tint foundmatch;\n \n \tif (c==NULL) return w;\n-\tn = right_connector_list_update(sent, c->next, word_c, w, FALSE) + 1;\n+\tn = right_connector_list_update(pc, sent, c->next, word_c, w, FALSE) + 1;\n \tif (c->word > n) n = c->word;\n \n \t\/* n is now the leftmost word we need to check *\/\n \tfoundmatch = FALSE;\n \tfor (; (n < sent->length) && ((n-w) <= MAX_SENTENCE); n++) {\n-\t\tpower_cost++;\n+\t\tpc->power_cost++;\n \t\tif (left_table_search(n, c, shallow, word_c)) {\n \t\t\tfoundmatch = TRUE;\n \t\t\tbreak;\n@@ -1335,6 +1343,9 @@\n \tDisjunct *d, *free_later, *dx, *nd;\n \tConnector *c;\n \tint w, N_deleted, total_deleted;\n+\n+\tprune_context *pc = (prune_context *) malloc (sizeof(prune_context));\n+\tpc->power_cost = 0;\n \n \tpower_prune_mode = mode; \/* this global variable avoids lots of\n \t\t\t\t\t\t\t\tparameter passing *\/\n@@ -1342,7 +1353,6 @@\n \tcount_set_effective_distance(sent);\n \n \tinit_power(sent);\n-\tpower_cost = 0;\n \tfree_later = NULL;\n \tN_changed = 1; \/* forces it always to make at least two passes *\/\n \tN_deleted = 0;\n@@ -1356,7 +1366,7 @@\n \t\t\tif (parse_options_resources_exhausted(opts)) break;\n \t\t\tfor (d = sent->word[w].d; d != NULL; d = d->next) {\n \t\t\t\tif (d->left == NULL) continue;\n-\t\t\t\tif (left_connector_list_update(d->left, w, w, TRUE) < 0) {\n+\t\t\t\tif (left_connector_list_update(pc, d->left, w, w, TRUE) < 0) {\n \t\t\t\t\tfor (c=d->left ;c!=NULL; c = c->next) c->word = BAD_WORD;\n \t\t\t\t\tfor (c=d->right ;c!=NULL; c = c->next) c->word = BAD_WORD;\n \t\t\t\t\tN_deleted++;\n@@ -1391,7 +1401,7 @@\n \t\t\tif (parse_options_resources_exhausted(opts)) break;\n \t\t\tfor (d = sent->word[w].d; d != NULL; d = d->next) {\n \t\t\t\tif (d->right == NULL) continue;\n-\t\t\t\tif (right_connector_list_update(sent, d->right,w,w,TRUE) >= sent->length){\n+\t\t\t\tif (right_connector_list_update(pc, sent, d->right,w,w,TRUE) >= sent->length){\n \t\t\t\t\tfor (c=d->right;c!=NULL; c = c->next) c->word = BAD_WORD;\n \t\t\t\t\tfor (c=d->left ;c!=NULL; c = c->next) c->word = BAD_WORD;\n \t\t\t\t\tN_deleted++;\n@@ -1422,7 +1432,7 @@\n \t}\n \tfree_disjuncts(free_later);\n \tfree_power_tables(sent);\n-\tif (verbosity > 2) printf(\"%d power prune cost:\\n\", power_cost);\n+\tif (verbosity > 2) printf(\"%d power prune cost:\\n\", pc->power_cost);\n \n \tif (mode == RUTHLESS) {\n \t\tprint_time(opts, \"power pruned (ruthless)\");\n@@ -1439,6 +1449,7 @@\n \t\tprint_disjunct_counts(sent);\n \t}\n \n+\tfree(pc);\n \treturn total_deleted;\n }\n \n"} {"commit":"4268adc559303653575c4dbe2504f1a9ec3d2170","subject":"lispd: warn when no petr configured, as per gh-38","message":"lispd: warn when no petr configured, as per gh-38\n\nWarn users of potential consequences that a missing PETR configuration\nhas.\n","repos":"Lluiso\/oor,OpenOverlayRouter\/oor,OpenOverlayRouter\/oor,OpenOverlayRouter\/oor,OpenOverlayRouter\/oor,Lluiso\/oor,Lluiso\/oor,OpenOverlayRouter\/oor,Lluiso\/oor,Lluiso\/oor,OpenOverlayRouter\/oor,OpenOverlayRouter\/oor","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lispd\/lispd_config.c\n+++ lispd\/lispd_config.c\n@@ -179,6 +179,9 @@\n #ifdef DEBUG\n syslog(LOG_DAEMON, \"Added %s to proxy-etr list\", proxy_etr);\n #endif\n+ } else {\n+ syslog(LOG_DAEMON, \"Warning: No Proxy-ETR defined. Packets to non-LISP destinations will be forwarded natively (no LISP encapsulation). This may prevent mobility in some scenarios.\");\n+ sleep(1);\n }\n \n \/*\n"} {"commit":"f091485f998c8def407af9026aa218a32d338ac9","subject":"stdout line buffering (#25)","message":"stdout line buffering (#25)\n\n","repos":"ShadenSmith\/splatt,ShadenSmith\/splatt,ShadenSmith\/splatt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cmds\/splatt_bin.c\n+++ src\/cmds\/splatt_bin.c\n@@ -77,6 +77,8 @@\n int argc,\n char **argv)\n {\n+ setvbuf(stdout, NULL, _IOLBF, 0);\n+\n int rank = 0;\n #ifdef SPLATT_USE_MPI\n MPI_Init(&argc, &argv);\n"} {"commit":"3918026e5cec3f39bb0b0f3b6f06ae1de919a019","subject":"common: Create a header for generic handle-related things.","message":"common: Create a header for generic handle-related things.\n\nThese are often needed in our utilities and layers,\nand are also the source of compatibility issues on 32-bit systems\nif development is mainly on 64-bit.\n","repos":"KhronosGroup\/OpenXR-SDK,KhronosGroup\/OpenXR-SDK,KhronosGroup\/OpenXR-SDK","returncode":1,"stderr":"error: pathspec 'src\/common\/xr_utils.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- src\/common\/xr_utils.h\n+++ src\/common\/xr_utils.h\n@@ -0,0 +1,146 @@\n+\/\/ Copyright (c) 2017-2019 The Khronos Group Inc.\n+\/\/ Copyright (c) 2017-2019 Valve Corporation\n+\/\/ Copyright (c) 2017-2019 LunarG, Inc.\n+\/\/ Copyright (c) 2019 Collabora, Ltd.\n+\/\/\n+\/\/ Licensed under the Apache License, Version 2.0 (the \"License\");\n+\/\/ you may not use this file except in compliance with the License.\n+\/\/ You may obtain a copy of the License at\n+\/\/\n+\/\/ http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+\/\/\n+\/\/ Unless required by applicable law or agreed to in writing, software\n+\/\/ distributed under the License is distributed on an \"AS IS\" BASIS,\n+\/\/ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+\/\/ See the License for the specific language governing permissions and\n+\/\/ limitations under the License.\n+\/\/\n+\/\/ Author: Ryan Pavlik <ryan.pavlik@collabora.com>\n+\/\/\n+\n+\/*!\n+ * @file\n+ *\n+ * Some utilities, primarily for working with OpenXR handles in a generic way.\n+ *\n+ * Most are trivial and inlined by default, but a few involve some non-trivial standard headers:\n+ * the various `...ToHexString`functions.\n+ * If you want those, you have two ways of using this header:\n+ *\n+ * - Out-of-line implementation: Just include this header where you need it, then\n+ * in one .cpp file, define XR_UTILS_INCLUDE_IMPLEMENTATION before you include it\n+ * to compile the implementation in that file.\n+ * - Inline implementation: Increases the number of includes, but you don't have to\n+ * worry about how many files have defined XR_UTILS_INCLUDE_IMPLEMENTATION.\n+ * Define XR_UTILS_INLINE_IMPLEMENTATION in every file before including this.\n+ *\/\n+\n+#pragma once\n+\n+#include <openxr\/openxr.h>\n+\n+#include <string>\n+\n+#if defined(XR_UTILS_INLINE_IMPLEMENTATION) && defined(XR_UTILS_INCLUDE_IMPLEMENTATION)\n+#error \"Cannot define both XR_UTILS_INLINE_IMPLEMENTATION and XR_UTILS_INCLUDE_IMPLEMENTATION\"\n+#endif\n+\n+#if XR_PTR_SIZE == 8\n+\/\/\/ Convert a handle into a same-sized integer.\n+template <typename T>\n+static inline uint64_t MakeHandleGeneric(T handle) {\n+ return reinterpret_cast<uint64_t>(handle);\n+}\n+\n+\/\/\/ Treat an integer as a handle\n+template <typename T>\n+static inline T& TreatIntegerAsHandle(uint64_t& handle) {\n+ return reinterpret_cast<T&>(handle);\n+}\n+\n+\/\/\/ @overload\n+template <typename T>\n+static inline T const& TreatIntegerAsHandle(uint64_t const& handle) {\n+ return reinterpret_cast<T const&>(handle);\n+}\n+\n+\/\/\/ Does a correctly-sized integer represent a null handle?\n+static inline bool IsIntegerNullHandle(uint64_t handle) { return XR_NULL_HANDLE == reinterpret_cast<void*>(handle); }\n+\n+#else\n+\n+\/\/\/ Convert a handle into a same-sized integer: no-op on 32-bit systems\n+static inline uint64_t MakeHandleGeneric(uint64_t handle) { return handle; }\n+\n+\/\/\/ Treat an integer as a handle: no-op on 32-bit systems\n+template <typename T>\n+static inline T& TreatIntegerAsHandle(uint64_t& handle) {\n+ return handle;\n+}\n+\n+\/\/\/ @overload\n+template <typename T>\n+static inline T const& TreatIntegerAsHandle(uint64_t const& handle) {\n+ return handle;\n+}\n+\n+\/\/\/ Does a correctly-sized integer represent a null handle?\n+static inline bool IsIntegerNullHandle(uint64_t handle) { return XR_NULL_HANDLE == handle; }\n+\n+#endif\n+\n+#ifdef XR_UTILS_INLINE_IMPLEMENTATION\n+#define XR_UTILS_STATIC_INLINE static inline\n+#else\n+#define XR_UTILS_STATIC_INLINE\n+#endif\n+\n+\/\/\/ Turns a uint64_t into a string formatted as hex.\n+\/\/\/\n+\/\/\/ The core of the HandleToHexString implementation is in here.\n+XR_UTILS_STATIC_INLINE std::string Uint64ToHexString(uint64_t val);\n+\n+\/\/\/ Turns a uint32_t into a string formatted as hex.\n+XR_UTILS_STATIC_INLINE std::string Uint32ToHexString(uint32_t val);\n+\n+\/\/\/ Turns an OpenXR handle into a string formatted as hex.\n+template <typename T>\n+static inline std::string HandleToHexString(T handle) {\n+ return Uint64ToHexString(MakeHandleGeneric(handle));\n+}\n+\n+#if XR_PTR_SIZE == 8\n+\/\/\/ Turns a pointer-sized integer into a string formatted as hex.\n+static inline std::string UintptrToHexString(uintptr_t val) { return Uint64ToHexString(val); }\n+#else\n+\/\/\/ Turns a pointer-sized integer into a string formatted as hex.\n+static inline std::string UintptrToHexString(uintptr_t val) { return Uint32ToHexString(val); }\n+#endif\n+\n+\/\/\/ Convert a pointer to a string formatted as hex.\n+template <typename T>\n+static inline std::string PointerToHexString(T const* ptr) {\n+ return UintptrToHexString(reinterpret_cast<uintptr_t>(ptr));\n+}\n+\n+\/\/ Define this only once in your project, in a non-header-file, to include the implementation.\n+#if defined(XR_UTILS_INCLUDE_IMPLEMENTATION) || defined(XR_UTILS_INLINE_IMPLEMENTATION)\n+\n+#include <sstream>\n+#include <iomanip>\n+\n+XR_UTILS_STATIC_INLINE std::string Uint64ToHexString(uint64_t val) {\n+ std::ostringstream oss;\n+ oss << \"0x\";\n+ oss << std::hex << std::setw(16) << std::setfill('0') << val;\n+ return oss.str();\n+}\n+\n+XR_UTILS_STATIC_INLINE std::string Uint32ToHexString(uint32_t val) {\n+ std::ostringstream oss;\n+ oss << \"0x\";\n+ oss << std::hex << std::setw(8) << std::setfill('0') << val;\n+ return oss.str();\n+}\n+\n+#endif \/\/ defined(XR_UTILS_INCLUDE_IMPLEMENTATION) || defined(XR_UTILS_INLINE_IMPLEMENTATION)\n"} {"commit":"d8ff6192cf775d67c6bd830f97438c9629f70aa6","subject":"Cast AND operation to bool","message":"Cast AND operation to bool\n","repos":"lkundrak\/wlc,Earnestly\/wlc,vially\/wlc,UIKit0\/wlc,scarabeusiv\/wlc,Earnestly\/wlc,ss1h2a3tw\/wlc,Enerccio\/ewlc,SirCmpwn\/wlc,Cloudef\/wlc,ammen99\/wlc,yohanesu75\/wlc,gpyh\/wlc,UIKit0\/wlc,vially\/wlc,lkundrak\/wlc,scarabeusiv\/wlc,ss1h2a3tw\/wlc,gpyh\/wlc,ammen99\/wlc,Enerccio\/ewlc,SirCmpwn\/wlc,Cloudef\/wlc,yohanesu75\/wlc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/compositor\/view.c\n+++ src\/compositor\/view.c\n@@ -224,7 +224,7 @@\n void\n wlc_view_request_state(struct wlc_view *view, enum wlc_view_state_bit state, bool toggle)\n {\n- if (!view->created || !view->compositor->interface.view.request.state || (view->pending.state & state) == toggle)\n+ if (!view->created || !view->compositor->interface.view.request.state || (bool)(view->pending.state & state) == toggle)\n return;\n \n view->compositor->interface.view.request.state(view->compositor, view, state, toggle);\n"} {"commit":"28f2ba2450a3a95afe0b2b57041a1aff19388c80","subject":"add -fno-tree-dominator-opts and -fno-aggressive-loop-optimizations everywhere for gfortran 6 and 7","message":"add -fno-tree-dominator-opts and -fno-aggressive-loop-optimizations everywhere for gfortran 6 and 7\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -930,12 +930,15 @@\n ifeq ($(GNU_GE_4_8),true)\n FDEBUG += -fno-aggressive-loop-optimizations\n FOPTIMIZE +=-fno-aggressive-loop-optimizations\n+ FOPTIONS +=-fno-aggressive-loop-optimizations\n FFLAGS_FORGA += -fno-aggressive-loop-optimizations\n \n FOPTIONS += -Warray-bounds\n endif\n ifeq ($(GNU_GE_6),true)\n FOPTIMIZE += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FOPTIONS += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FDEBUG += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n endif\n ifdef USE_OPENMP\n FOPTIONS += -fopenmp\n@@ -1094,11 +1097,14 @@\n ifeq ($(GNU_GE_4_8),true)\n FDEBUG += -fno-aggressive-loop-optimizations\n FOPTIMIZE +=-fno-aggressive-loop-optimizations\n+ FOPTIONS +=-fno-aggressive-loop-optimizations\n FFLAGS_FORGA += -fno-aggressive-loop-optimizations\n FOPTIONS += -Warray-bounds\n endif # GNU_GE_4_8\n ifeq ($(GNU_GE_6),true)\n FOPTIMIZE += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FOPTIONS += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FDEBUG += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n endif\n endif # GNUMAJOR\n \n@@ -1276,6 +1282,8 @@\n endif\n ifeq ($(GNU_GE_6),true)\n FOPTIMIZE += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FOPTIONS += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FDEBUG += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n endif\n endif\n endif\n@@ -2078,6 +2086,8 @@\n FOPTIMIZE += -mfpmath=sse # \n ifeq ($(GNU_GE_6),true)\n FOPTIMIZE += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FOPTIONS += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n+ FDEBUG += -fno-tree-dominator-opts # solvation\/hnd_cosmo_lib breaks\n endif\n \n ifndef USE_FPE\n"} {"commit":"78bff0263aa19424fcc0a7aed18425cf4345a5d2","subject":"Linux ppc64 xlf changes","message":"Linux ppc64 xlf changes\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n #\n-# $Id: makefile.h,v 1.432 2003-10-23 19:45:15 edo Exp $\n+# $Id: makefile.h,v 1.433 2003-10-25 00:10:24 edo Exp $\n #\n \n # Common definitions for all makefiles ... these can be overridden\n@@ -1304,7 +1304,7 @@\n # this are for PowerPC\n ifeq ($(FC),xlf)\n FOPTIONS = -q32 -qextname -qfixed -qnosave -qsmallstack -qalign=4k\n- FOPTIONS += -NQ40000 -NT80000 -NS2048 -qmaxmem=8192\n+ FOPTIONS += -NQ40000 -NT80000 -NS2048 -qmaxmem=8192 -qsigtrap\n FOPTIMIZE= -O3 -qstrict -qarch=auto -qtune=auto\n FDEBUG= -O2 -g\n EXPLICITF = TRUE\n@@ -1321,12 +1321,12 @@\n COPTIONS = -Wall\n COPTIMIZE = -g -O2\n endif\n- LDOPTIONS = -v\n+ LDOPTIONS += -v\n endif\n \n \n \n- LINK.f = $(FC) $(LDFLAGS) \n+ LINK.f = $(FC) $(FOPTIONS) $(LDFLAGS) \n ifeq ($(LINUXCPU),x86)\n ifeq ($(FC),pgf77)\n LDOPTIONS=-g\n@@ -1493,11 +1493,14 @@\n endif\n \n ifeq ($(_CPU),ppc64)\n+ FC=xlf\n+ CC=\/opt\/cross\/bin\/powerpc64-linux-gcc\n ifeq ($(FC),xlf)\n FOPTIONS = -q64 -qextname -qfixed -qnosave -qalign=4k\n FOPTIONS += -NQ40000 -NT80000 -qmaxmem=8192\n ifdef USE_GPROF\n FOPTIONS += -pg\n+ COPTIONS += -pg\n endif\n FOPTIMIZE= -O3 -qstrict -qarch=auto -qtune=auto -qfloat=rsqrt:fltint\n # FVECTORIZE = -O5 -qhot -qfloat=fltint \n"} {"commit":"c4b0484b155153ed8c83080183166e21205a796d","subject":"added CHKUNDFLW for pgf90","message":"added CHKUNDFLW for pgf90\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,5 +1,5 @@\n #\n-# $Id: makefile.h,v 1.448 2004-02-20 08:37:56 edo Exp $\n+# $Id: makefile.h,v 1.449 2004-03-10 17:16:55 edo Exp $\n #\n \n # Common definitions for all makefiles ... these can be overridden\n@@ -1495,8 +1495,10 @@\n \n ifeq ($(FC),pgf90)\n FOPTIONS += -Mrecursive -Mdalign -Mllalign -Kieee \n-# FOPTIONS += -tp k8-64 \n- FOPTIMIZE = -fastsse -O3 \n+ FOPTIONS += -tp k8-64 \n+ FOPTIMIZE = -fast -fastsse -O3 -Mipa=fast\n+ DEFINES += -DCHKUNDFLW\n+ FVECTORIZE = -fast -fastsse -O4 -Mipa=fast\n FDEBUG = -g -O0\n DEFINES += -DPGLINUX\n LDOPTIONS = #-g77libs \n"} {"commit":"ddd9b5318ca34ffef5d44f68762fefc0bcb74f0a","subject":"flag needed to compile nwargos on SGI r4400","message":"flag needed to compile nwargos on SGI r4400\n\n\n","repos":"rangsimanketkaew\/NWChem","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/config\/makefile.h\n+++ src\/config\/makefile.h\n@@ -1,4 +1,4 @@\n-# $Id: makefile.h,v 1.219 1997-03-14 21:13:09 d3e129 Exp $\n+# $Id: makefile.h,v 1.220 1997-03-18 10:05:42 d3e129 Exp $\n \n # Common definitions for all makefiles ... these can be overridden\n # either in each makefile by putting additional definitions below the\n@@ -565,7 +565,7 @@\n MAKEFLAGS = -j 4 --no-print-directory\n DEFINES = -DSGI\n \n- FOPTIONS = # -mips3\n+ FOPTIONS = -Nn10000 # -mips3\n COPTIONS = -fullwarn #-mips3\n FOPTIMIZE = -O2\n COPTIMIZE = -O2\n"} {"commit":"0a66d1b1fde6d2185b968ca88b5a50c98058e180","subject":"if pcre-support is missing, complain if the configfile uses a regex-conditional","message":"if pcre-support is missing, complain if the configfile uses a regex-conditional\n\n","repos":"deba12\/lighttpd-1.5,deba12\/lighttpd-1.5,deba12\/lighttpd-1.5,deba12\/lighttpd-1.5","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/configfile-glue.c\n+++ src\/configfile-glue.c\n@@ -188,9 +188,10 @@\n \t\t\treturn (dc->cond == CONFIG_COND_EQ) ? 0 : 1;\n \t\t}\n \t\tbreak;\n-#ifdef HAVE_PCRE_H\n+\n \tcase CONFIG_COND_NOMATCH:\n \tcase CONFIG_COND_MATCH: {\n+#ifdef HAVE_PCRE_H\n #define N 10\n \t\tint ovec[N * 3];\n \t\tint n;\n@@ -202,10 +203,13 @@\n \t\t} else {\n \t\t\treturn (dc->cond == CONFIG_COND_MATCH) ? 0 : 1;\n \t\t}\n-\t\t\n+#else\n+\t\tlog_error_write(srv, __FILE__, __LINE__, \"s\", \"ERROR: using a condition like =~ or !~ but not compiled with pcre support\");\n+\t\treturn 0;\n+#endif\t\t\n \t\tbreak;\n \t}\n-#endif\n+\n \tdefault:\n \t\t\/* no way *\/\n \t\tbreak;\n"} {"commit":"6a377e629dc93e9d2cede4082a43e9f723f968e4","subject":"SkBSwap32","message":"SkBSwap32\n\nSeems handy.\n\nBUG=skia:\nGOLD_TRYBOT_URL= https:\/\/gold.skia.org\/search2?unt=true&query=source_type%3Dgm&master=false&issue=1619923002\n\nReview URL: https:\/\/codereview.chromium.org\/1619923002\n","repos":"HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,tmpvar\/skia.cc,rubenvb\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,qrealka\/skia-hc,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,rubenvb\/skia,google\/skia,tmpvar\/skia.cc,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,qrealka\/skia-hc,tmpvar\/skia.cc,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,qrealka\/skia-hc,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,tmpvar\/skia.cc,qrealka\/skia-hc,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,tmpvar\/skia.cc,qrealka\/skia-hc,google\/skia,HalCanary\/skia-hc,tmpvar\/skia.cc,aosp-mirror\/platform_external_skia,tmpvar\/skia.cc,google\/skia,tmpvar\/skia.cc,rubenvb\/skia,google\/skia,rubenvb\/skia,google\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,HalCanary\/skia-hc,qrealka\/skia-hc,HalCanary\/skia-hc,qrealka\/skia-hc,aosp-mirror\/platform_external_skia,google\/skia,google\/skia,rubenvb\/skia,HalCanary\/skia-hc,HalCanary\/skia-hc,google\/skia,google\/skia,rubenvb\/skia,tmpvar\/skia.cc,qrealka\/skia-hc,aosp-mirror\/platform_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/core\/SkMathPriv.h\n+++ src\/core\/SkMathPriv.h\n@@ -82,4 +82,14 @@\n return SkTMin(SkTMax(x, 0.0f), 1.0f);\n }\n \n+\/**\n+ * Swap byte order of a 4-byte value, e.g. 0xaarrggbb -> 0xbbggrraa.\n+ *\/\n+#if defined(_MSC_VER)\n+ #include <intrin.h>\n+ static inline uint32_t SkBSwap32(uint32_t v) { return _byteswap_ulong(v); }\n+#else\n+ static inline uint32_t SkBSwap32(uint32_t v) { return __builtin_bswap32(v); }\n #endif\n+\n+#endif\n"} {"commit":"192a10efbffe85b81a6675e8517baeb0f5f1fa73","subject":"core: force non-secure fusion","message":"core: force non-secure fusion\n","repos":"mtsekm\/test,kevleyski\/DirectFB-1,kevleyski\/directfb,lancebaiyouview\/DirectFB,sklnet\/DirectFB,kevleyski\/DirectFB-1,deniskropp\/DirectFB,Distrotech\/DirectFB,kevleyski\/DirectFB-1,deniskropp\/DirectFB,kevleyski\/directfb,kaostao\/directfb,djbclark\/directfb-core-DirectFB,dfbdok\/DirectFB1,kevleyski\/directfb,sklnet\/DirectFB,dfbdok\/DirectFB1,deniskropp\/DirectFB,kevleyski\/directfb,Distrotech\/DirectFB,lancebaiyouview\/DirectFB,jcdubois\/DirectFB,djbclark\/directfb-core-DirectFB,DirectFB\/directfb,dfbdok\/DirectFB1,djbclark\/directfb-core-DirectFB,DirectFB\/directfb,lancebaiyouview\/DirectFB,lancebaiyouview\/DirectFB,djbclark\/directfb-core-DirectFB,mtsekm\/test,kaostao\/directfb,Distrotech\/DirectFB,deniskropp\/DirectFB,mtsekm\/test,DirectFB\/directfb,jcdubois\/DirectFB,sklnet\/DirectFB,sklnet\/DirectFB,kevleyski\/DirectFB-1,kaostao\/directfb,jcdubois\/DirectFB","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/core\/core_sound.c\n+++ src\/core\/core_sound.c\n@@ -193,7 +193,10 @@\n return DR_NOLOCALMEMORY;\n }\n \n+ bool old_secure = fusion_config->secure_fusion;\n+ fusion_config->secure_fusion = false;\n ret = fusion_enter( fs_config->session, FUSIONSOUND_CORE_ABI, FER_ANY, &core->world );\n+ fusion_config->secure_fusion = old_secure;\n if (ret) {\n D_FREE( core );\n pthread_mutex_unlock( &core_sound_lock );\n"} {"commit":"ed0de0c8e57d42c32d28e8ea5c8a65c835d0da2a","subject":"Use proper typecast for quark.","message":"Use proper typecast for quark.\n","repos":"GNOME\/orca,GNOME\/orca,pvagner\/orca,pvagner\/orca,pvagner\/orca,GNOME\/orca,h4ck3rm1k3\/orca-sonar,chrys87\/orca-beep,chrys87\/orca-beep,pvagner\/orca,h4ck3rm1k3\/orca-sonar,h4ck3rm1k3\/orca-sonar,GNOME\/orca,chrys87\/orca-beep,chrys87\/orca-beep","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/core\/coremodule.c\n+++ src\/core\/coremodule.c\n@@ -240,7 +240,7 @@\n \t\/* Do we already have a listener registered for this event type? \n \t *\/\n type_quark = g_quark_from_string (event_name);\n-\tel = g_hash_table_lookup (listeners, (gpointer) type_quark);\n+\tel = g_hash_table_lookup (listeners, GUINT_TO_POINTER(type_quark));\n \tif (!el) {\n \t\t\/* Create the bonobo event listener and register it with\n \t\t * at-spi.\n"} {"commit":"96c0d7c413e4e5c8d540e255fcb695f415eaeb52","subject":"Core: Fix guess search resulting in tons of zeroes","message":"Core: Fix guess search resulting in tons of zeroes\n","repos":"Iniquitatis\/mgba,Iniquitatis\/mgba,Anty-Lemon\/mgba,Anty-Lemon\/mgba,Iniquitatis\/mgba,fr500\/mgba,mgba-emu\/mgba,libretro\/mgba,mgba-emu\/mgba,libretro\/mgba,fr500\/mgba,libretro\/mgba,fr500\/mgba,libretro\/mgba,Anty-Lemon\/mgba,mgba-emu\/mgba,mgba-emu\/mgba,fr500\/mgba,Iniquitatis\/mgba,Anty-Lemon\/mgba,libretro\/mgba","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/core\/mem-search.c\n+++ src\/core\/mem-search.c\n@@ -272,7 +272,7 @@\n \n \t\/\/ Decimal:\n \tvalue = strtoull(valueStr, &end, 10);\n-\tif (end) {\n+\tif (end && !end[0]) {\n \t\tif (value > 0x10000) {\n \t\t\tfound += _search32(mem, size, block, value, out, limit ? limit - found : 0);\n \t\t} else if (value > 0x100) {\n@@ -305,7 +305,7 @@\n \n \t\/\/ Hex:\n \tvalue = strtoull(valueStr, &end, 16);\n-\tif (end) {\n+\tif (end && !end[0]) {\n \t\tif (value > 0x10000) {\n \t\t\tfound += _search32(mem, size, block, value, out, limit ? limit - found : 0);\n \t\t} else if (value > 0x100) {\n"} {"commit":"8cb2551ef183b2cf1837e64710bf24d164192cff","subject":"The 4.0 series of VMs defaults to OpenGL as the 3D support of choice.","message":"The 4.0 series of VMs defaults to OpenGL as the 3D support of choice.\n\ngit-svn-id: f18ccec24f938f15aa42574278fe0cc52f637e81@2170 fa1542d4-bde8-0310-ad64-8ed1123d492a\n","repos":"peteruhnak\/pharo-vm,OpenSmalltalk\/vm,bencoman\/pharo-vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,timfel\/squeakvm,OpenSmalltalk\/vm,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,timfel\/squeakvm,bencoman\/pharo-vm,OpenSmalltalk\/vm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm,bencoman\/pharo-vm,timfel\/squeakvm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,bencoman\/pharo-vm,peteruhnak\/pharo-vm,peteruhnak\/pharo-vm,bencoman\/pharo-vm,timfel\/squeakvm,OpenSmalltalk\/vm,timfel\/squeakvm,peteruhnak\/pharo-vm,OpenSmalltalk\/vm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- B3DAcceleratorPlugin\/sqWin32DualB3DX.c\n+++ B3DAcceleratorPlugin\/sqWin32DualB3DX.c\n@@ -3,11 +3,7 @@\n \n extern struct VirtualMachine *interpreterProxy;\n \n-#ifdef CROQUET\n int glMode = 1; \/* default to OpenGL *\/\n-#else\n-int glMode = 0; \/* default to D3D *\/\n-#endif\n \n int b3dxInitialize(void) {\n int *ptr;\n"} {"commit":"72043ec08223cee6a062e3dd05931d81b9d7f19a","subject":"Update 3.0.3: Accelerations reworked","message":"Update 3.0.3: Accelerations reworked\n\nBetter performance\n","repos":"reprapbcn\/BCN3D-Firmware,BCN3D\/BCN3D-Firmware,BCN3D\/BCN3D-Firmware,reprapbcn\/BCN3D-Firmware","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- BCN3D+\/BCN3D_v3_0_2x01\/Configuration.h\n+++ BCN3D+\/BCN3D_v3_0_2x01\/Configuration.h\n@@ -351,10 +351,10 @@\n \/\/ default settings\n \n #define DEFAULT_AXIS_STEPS_PER_UNIT {80.19,80.43,2560,458.3} \/\/ default steps per unit for Ultimaker\n-#define DEFAULT_MAX_FEEDRATE {250, 250, 3.5, 25} \/\/ (mm\/sec)\n-#define DEFAULT_MAX_ACCELERATION {1500,1500,100,100} \/\/ X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.\n-\n-#define DEFAULT_ACCELERATION 1500 \/\/ X, Y, Z and E max acceleration in mm\/s^2 for printing moves\n+#define DEFAULT_MAX_FEEDRATE {250, 250, 3.5, 100} \/\/ (mm\/sec)\n+#define DEFAULT_MAX_ACCELERATION {1000,1000,500,500} \/\/ X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.\n+\n+#define DEFAULT_ACCELERATION 1000 \/\/ X, Y, Z and E max acceleration in mm\/s^2 for printing moves\n #define DEFAULT_RETRACT_ACCELERATION 2000 \/\/ X, Y, Z and E max acceleration in mm\/s^2 for retracts\n \n \/\/ Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).\n"} {"commit":"5a5529db48c630cc569ce40cd35a1750a3d53a57","subject":"bump patch version to 1.8.13","message":"bump patch version to 1.8.13\n","repos":"BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- BBFrameworks\/BBFrameworksConstants.h\n+++ BBFrameworks\/BBFrameworksConstants.h\n@@ -20,7 +20,7 @@\n \n static NSInteger const BBFrameworksVersionMajor = 1;\n static NSInteger const BBFrameworksVersionMinor = 8;\n-static NSInteger const BBFrameworksVersionPatch = 12;\n+static NSInteger const BBFrameworksVersionPatch = 13;\n \n static NSString *const BBFrameworksResourcesBundleName = @\"BBFrameworksResources.bundle\";\n \n"} {"commit":"7b5ae2f07786b6cc6de29467cc08be718d6d08af","subject":"Implement cpuArchBaseline in generic CPU driver","message":"Implement cpuArchBaseline in generic CPU driver\n","repos":"taget\/libvirt,danwent\/libvirt-ovs,zhlcindy\/libvirt-1.1.4-maintain,bjzhang\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,jeckersb\/libvirt,zippy2\/libvirt,rmarwaha\/libvirt,eskultety\/libvirt,jeckersb\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,siboulet\/libvirt-openvz,jardasgit\/libvirt,warewolf\/libvirt,jardasgit\/libvirt,siboulet\/libvirt-openvz,emaste\/libvirt,wiedi\/libvirt,bjzhang\/libvirt,rmarwaha\/libvirt,foomango\/libvirt,rbu\/libvirt,emaste\/libvirt,warewolf\/libvirt,iam-TJ\/libvirt,warewolf\/libvirt,shugaoye\/libvirt,iam-TJ\/libvirt,eskultety\/libvirt,emaste\/libvirt,soulxu\/libvirt-xuhj,rmarwaha\/libvirt1,kantai\/libvirt-vfork,elmarco\/libvirt,foomango\/libvirt,amery\/libvirt-vserver,rmarwaha\/libvirt,agx\/libvirt,trainstack\/libvirt,agx\/libvirt,kantai\/libvirt-vfork,bjzhang\/libvirt,datto\/libvirt,crobinso\/libvirt,siboulet\/libvirt-openvz,fabianfreyer\/libvirt,jardasgit\/libvirt,iam-TJ\/libvirt,taget\/libvirt,agx\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,wiedi\/libvirt,kantai\/libvirt-vfork,zippy2\/libvirt,siboulet\/libvirt-openvz,leilihh\/libvirt,agx\/libvirt,usc-isi\/libvirt,wiedi\/libvirt,rmarwaha\/libvirt1,danwent\/libvirt-ovs,elmarco\/libvirt,trainstack\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,VenkatDatta\/libvirt,warewolf\/libvirt,rmarwaha\/libvirt,amery\/libvirt-vserver,jardasgit\/libvirt,zippy2\/libvirt,taget\/libvirt,rmarwaha\/libvirt1,warewolf\/libvirt,libvirt\/libvirt,VenkatDatta\/libvirt,rbu\/libvirt,novel\/fbsd-libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,shugaoye\/libvirt,crobinso\/libvirt,eskultety\/libvirt,dumbbell\/libvirt,bjzhang\/libvirt,soulxu\/libvirt-xuhj,dumbbell\/libvirt,foomango\/libvirt,dumbbell\/libvirt,eskultety\/libvirt,wiedi\/libvirt,iam-TJ\/libvirt,trainstack\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,jeckersb\/libvirt,cbosdo\/libvirt,VenkatDatta\/libvirt,taget\/libvirt,elmarco\/libvirt,jfehlig\/libvirt,rmarwaha\/libvirt1,rmarwaha\/libvirt,leilihh\/libvirt,trainstack\/libvirt,iam-TJ\/libvirt,wiedi\/libvirt,amery\/libvirt-vserver,sshah-solarflare\/Libvirt-PCI-passthrough-,andreabolognani\/libvirt,jeckersb\/libvirt,danwent\/libvirt-ovs,andreabolognani\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,kantai\/libvirt-vfork,olafhering\/libvirt,elmarco\/libvirt,wiedi\/libvirt,VenkatDatta\/libvirt,olafhering\/libvirt,datto\/libvirt,agx\/libvirt,libvirt\/libvirt,rlaager\/libvirt,novel\/fbsd-libvirt,shugaoye\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,rlaager\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,VenkatDatta\/libvirt,rbu\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,novel\/fbsd-libvirt,libvirt\/libvirt,shugaoye\/libvirt,warewolf\/libvirt,danwent\/libvirt-ovs,warewolf\/libvirt,leilihh\/libvirt,rlaager\/libvirt,foomango\/libvirt,danwent\/libvirt-ovs,cbosdo\/libvirt,jfehlig\/libvirt,datto\/libvirt,libvirt\/libvirt,novel\/fbsd-libvirt,trainstack\/libvirt,emaste\/libvirt,andreabolognani\/libvirt,dumbbell\/libvirt,datto\/libvirt,soulxu\/libvirt-xuhj,amery\/libvirt-vserver,rmarwaha\/libvirt1,elmarco\/libvirt,andreabolognani\/libvirt,kantai\/libvirt-vfork,novel\/fbsd-libvirt,usc-isi\/libvirt,rmarwaha\/libvirt1,soulxu\/libvirt-xuhj,shugaoye\/libvirt,trainstack\/libvirt,crobinso\/libvirt,amery\/libvirt-vserver,jeckersb\/libvirt,usc-isi\/libvirt,cbosdo\/libvirt,nertpinx\/libvirt,foomango\/libvirt,taget\/libvirt,iam-TJ\/libvirt,dumbbell\/libvirt,rbu\/libvirt,leilihh\/libvirt,siboulet\/libvirt-openvz,cbosdo\/libvirt,emaste\/libvirt,jeckersb\/libvirt,nertpinx\/libvirt,novel\/fbsd-libvirt,novel\/fbsd-libvirt,novel\/fbsd-libvirt,rmarwaha\/libvirt,fabianfreyer\/libvirt,leilihh\/libvirt,zhlcindy\/libvirt-1.1.4-maintain,olafhering\/libvirt,rlaager\/libvirt,bjzhang\/libvirt,fabianfreyer\/libvirt,emaste\/libvirt,rbu\/libvirt,soulxu\/libvirt-xuhj,dumbbell\/libvirt,usc-isi\/libvirt,cbosdo\/libvirt,fabianfreyer\/libvirt,jeckersb\/libvirt,rlaager\/libvirt,leilihh\/libvirt,sshah-solarflare\/Libvirt-PCI-passthrough-,wiedi\/libvirt,zippy2\/libvirt,novel\/fbsd-libvirt,jardasgit\/libvirt,trainstack\/libvirt,nertpinx\/libvirt,usc-isi\/libvirt,emaste\/libvirt,iam-TJ\/libvirt,datto\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/cpu\/cpu_generic.c\n+++ src\/cpu\/cpu_generic.c\n@@ -2,7 +2,7 @@\n * cpu_generic.c: CPU manipulation driver for architectures which are not\n * handled by their own driver\n *\n- * Copyright (C) 2009 Red Hat, Inc.\n+ * Copyright (C) 2009--2010 Red Hat, Inc.\n *\n * This library is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU Lesser General Public\n@@ -24,6 +24,7 @@\n \n #include <config.h>\n \n+#include \"memory.h\"\n #include \"hash.h\"\n #include \"cpu.h\"\n #include \"cpu_generic.h\"\n@@ -106,6 +107,104 @@\n cleanup:\n virHashFree(hash, NULL);\n return ret;\n+}\n+\n+\n+static virCPUDefPtr\n+genericBaseline(virCPUDefPtr *cpus,\n+ unsigned int ncpus,\n+ const char **models,\n+ unsigned int nmodels)\n+{\n+ virCPUDefPtr cpu = NULL;\n+ virCPUFeatureDefPtr features = NULL;\n+ unsigned int nfeatures;\n+ unsigned int count;\n+ unsigned int i, j;\n+\n+ if (models) {\n+ bool found = false;\n+ for (i = 0; i < nmodels; i++) {\n+ if (STREQ(cpus[0]->model, models[i])) {\n+ found = true;\n+ break;\n+ }\n+ }\n+ if (!found) {\n+ virCPUReportError(VIR_ERR_INTERNAL_ERROR,\n+ _(\"CPU model '%s' is not support by hypervisor\"),\n+ cpus[0]->model);\n+ goto error;\n+ }\n+ }\n+\n+ if (VIR_ALLOC(cpu) < 0 ||\n+ !(cpu->arch = strdup(cpus[0]->arch)) ||\n+ !(cpu->model = strdup(cpus[0]->model)) ||\n+ VIR_ALLOC_N(features, cpus[0]->nfeatures) < 0)\n+ goto no_memory;\n+\n+ cpu->type = VIR_CPU_TYPE_HOST;\n+\n+ count = nfeatures = cpus[0]->nfeatures;\n+ for (i = 0; i < nfeatures; i++)\n+ features[i].name = cpus[0]->features[i].name;\n+\n+ for (i = 1; i < ncpus; i++) {\n+ virHashTablePtr hash;\n+\n+ if (STRNEQ(cpu->arch, cpus[i]->arch)) {\n+ virCPUReportError(VIR_ERR_INTERNAL_ERROR,\n+ _(\"CPUs have incompatible architectures: '%s' != '%s'\"),\n+ cpu->arch, cpus[i]->arch);\n+ goto error;\n+ }\n+\n+ if (STRNEQ(cpu->model, cpus[i]->model)) {\n+ virCPUReportError(VIR_ERR_INTERNAL_ERROR,\n+ _(\"CPU models don't match: '%s' != '%s'\"),\n+ cpu->model, cpus[i]->model);\n+ goto error;\n+ }\n+\n+ if (!(hash = genericHashFeatures(cpus[i])))\n+ goto no_memory;\n+\n+ for (j = 0; j < nfeatures; j++) {\n+ if (features[j].name &&\n+ !virHashLookup(hash, features[j].name)) {\n+ features[j].name = NULL;\n+ count--;\n+ }\n+ }\n+\n+ virHashFree(hash, NULL);\n+ }\n+\n+ if (VIR_ALLOC_N(cpu->features, count) < 0)\n+ goto no_memory;\n+ cpu->nfeatures = count;\n+\n+ j = 0;\n+ for (i = 0; i < nfeatures; i++) {\n+ if (!features[i].name)\n+ continue;\n+\n+ if (!(cpu->features[j++].name = strdup(features[i].name)))\n+ goto no_memory;\n+ }\n+\n+cleanup:\n+ VIR_FREE(features);\n+\n+ return cpu;\n+\n+no_memory:\n+ virReportOOMError();\n+error:\n+ virCPUDefFree(cpu);\n+ cpu = NULL;\n+ goto cleanup;\n }\n \n \n@@ -119,5 +218,5 @@\n .free = NULL,\n .nodeData = NULL,\n .guestData = NULL,\n- .baseline = NULL,\n+ .baseline = genericBaseline,\n };\n"} {"commit":"d983ebe8f058b6cdbeb039b88ecb95ebffeed590","subject":"bump minor version to 10 and patch version to 0","message":"bump minor version to 10 and patch version to 0\n","repos":"BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks,BionBilateral\/BBFrameworks","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- BBFrameworks\/BBFrameworksConstants.h\n+++ BBFrameworks\/BBFrameworksConstants.h\n@@ -19,8 +19,8 @@\n #import <Foundation\/NSString.h>\n \n static NSInteger const BBFrameworksVersionMajor = 0;\n-static NSInteger const BBFrameworksVersionMinor = 9;\n-static NSInteger const BBFrameworksVersionPatch = 15;\n+static NSInteger const BBFrameworksVersionMinor = 10;\n+static NSInteger const BBFrameworksVersionPatch = 0;\n \n static NSString *const BBFrameworksResourcesBundleName = @\"BBFrameworksResources.bundle\";\n \n"} {"commit":"249c14462bfcfc9ac51ab6cc43efcd00fc8912ac","subject":"STYLE: Testing pre-commit check","message":"STYLE: Testing pre-commit check\n","repos":"wkjeong\/ITK,LucasGandel\/ITK,itkvideo\/ITK,paulnovo\/ITK,hendradarwin\/ITK,LucHermitte\/ITK,GEHC-Surgery\/ITK,daviddoria\/itkHoughTransform,BRAINSia\/ITK,biotrump\/ITK,stnava\/ITK,wkjeong\/ITK,jcfr\/ITK,hendradarwin\/ITK,hinerm\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,heimdali\/ITK,msmolens\/ITK,CapeDrew\/DITK,LucasGandel\/ITK,richardbeare\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,cpatrick\/ITK-RemoteIO,fbudin69500\/ITK,eile\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,jmerkow\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,BRAINSia\/ITK,hendradarwin\/ITK,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,thewtex\/ITK,atsnyder\/ITK,malaterre\/ITK,blowekamp\/ITK,BRAINSia\/ITK,stnava\/ITK,zachary-williamson\/ITK,stnava\/ITK,fbudin69500\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,malaterre\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,fbudin69500\/ITK,fuentesdt\/InsightToolkit-dev,eile\/ITK,blowekamp\/ITK,LucasGandel\/ITK,fedral\/ITK,CapeDrew\/DITK,msmolens\/ITK,LucHermitte\/ITK,atsnyder\/ITK,spinicist\/ITK,cpatrick\/ITK-RemoteIO,daviddoria\/itkHoughTransform,paulnovo\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,CapeDrew\/DITK,vfonov\/ITK,hjmjohnson\/ITK,stnava\/ITK,blowekamp\/ITK,jmerkow\/ITK,ajjl\/ITK,spinicist\/ITK,fedral\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,PlutoniumHeart\/ITK,CapeDrew\/DITK,rhgong\/itk-with-dom,BRAINSia\/ITK,rhgong\/itk-with-dom,paulnovo\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,blowekamp\/ITK,hinerm\/ITK,hjmjohnson\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,hendradarwin\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,daviddoria\/itkHoughTransform,vfonov\/ITK,malaterre\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,eile\/ITK,BlueBrain\/ITK,fedral\/ITK,malaterre\/ITK,heimdali\/ITK,BlueBrain\/ITK,hinerm\/ITK,msmolens\/ITK,biotrump\/ITK,malaterre\/ITK,jcfr\/ITK,spinicist\/ITK,CapeDrew\/DCMTK-ITK,jcfr\/ITK,thewtex\/ITK,zachary-williamson\/ITK,fbudin69500\/ITK,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,fedral\/ITK,rhgong\/itk-with-dom,fedral\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DCMTK-ITK,vfonov\/ITK,spinicist\/ITK,jmerkow\/ITK,jcfr\/ITK,fedral\/ITK,itkvideo\/ITK,biotrump\/ITK,LucHermitte\/ITK,jcfr\/ITK,BlueBrain\/ITK,thewtex\/ITK,CapeDrew\/DCMTK-ITK,itkvideo\/ITK,biotrump\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,BlueBrain\/ITK,vfonov\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,itkvideo\/ITK,eile\/ITK,CapeDrew\/DITK,rhgong\/itk-with-dom,heimdali\/ITK,LucasGandel\/ITK,hinerm\/ITK,wkjeong\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,stnava\/ITK,richardbeare\/ITK,ajjl\/ITK,fbudin69500\/ITK,stnava\/ITK,thewtex\/ITK,hinerm\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,blowekamp\/ITK,hendradarwin\/ITK,biotrump\/ITK,malaterre\/ITK,malaterre\/ITK,ajjl\/ITK,hinerm\/ITK,stnava\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,heimdali\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,wkjeong\/ITK,blowekamp\/ITK,paulnovo\/ITK,ajjl\/ITK,atsnyder\/ITK,richardbeare\/ITK,jmerkow\/ITK,eile\/ITK,zachary-williamson\/ITK,Kitware\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,Kitware\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,cpatrick\/ITK-RemoteIO,InsightSoftwareConsortium\/ITK,msmolens\/ITK,BRAINSia\/ITK,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,fedral\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,jcfr\/ITK,ajjl\/ITK,richardbeare\/ITK,atsnyder\/ITK,spinicist\/ITK,stnava\/ITK,BlueBrain\/ITK,blowekamp\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,malaterre\/ITK,hendradarwin\/ITK,ajjl\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,atsnyder\/ITK,itkvideo\/ITK,spinicist\/ITK,paulnovo\/ITK,Kitware\/ITK,cpatrick\/ITK-RemoteIO,PlutoniumHeart\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DITK,PlutoniumHeart\/ITK,jcfr\/ITK,biotrump\/ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,heimdali\/ITK,fbudin69500\/ITK,BRAINSia\/ITK,paulnovo\/ITK,CapeDrew\/DITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,wkjeong\/ITK,itkvideo\/ITK,BlueBrain\/ITK,heimdali\/ITK,fbudin69500\/ITK,vfonov\/ITK,richardbeare\/ITK,GEHC-Surgery\/ITK,eile\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,jmerkow\/ITK,LucasGandel\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,PlutoniumHeart\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,thewtex\/ITK,LucasGandel\/ITK,ajjl\/ITK,heimdali\/ITK,jmerkow\/ITK,PlutoniumHeart\/ITK,eile\/ITK,CapeDrew\/DCMTK-ITK,PlutoniumHeart\/ITK,zachary-williamson\/ITK,msmolens\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,wkjeong\/ITK,eile\/ITK,hinerm\/ITK,atsnyder\/ITK,thewtex\/ITK,Kitware\/ITK,hinerm\/ITK,paulnovo\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,blowekamp\/ITK,Kitware\/ITK,rhgong\/itk-with-dom,heimdali\/ITK,zachary-williamson\/ITK,wkjeong\/ITK,hendradarwin\/ITK,ajjl\/ITK,eile\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Review\/itkAnchorErodeDilateLine.h\n+++ Code\/Review\/itkAnchorErodeDilateLine.h\n@@ -17,6 +17,11 @@\n \n #ifndef __itkAnchorErodeDilateLine_h\n #define __itkAnchorErodeDilateLine_h\n+\n+\n+\n+\n+\n \n #include \"itkAnchorHistogram.h\"\n #include \"itkIndent.h\"\n"} {"commit":"c6d8853dff22b57b81f3f0e901915965538d77d1","subject":"The counters are unsigned.","message":"The counters are unsigned.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@129380 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"apple\/swift-llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,chubbymaggie\/asap,apple\/swift-llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,apple\/swift-llvm,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,apple\/swift-llvm,chubbymaggie\/asap,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,chubbymaggie\/asap,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,apple\/swift-llvm,dslab-epfl\/asap,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- runtime\/libprofile\/LineProfiling.c\n+++ runtime\/libprofile\/LineProfiling.c\n@@ -28,7 +28,7 @@\n \/* Emit data about a counter to the data file. *\/\n void llvm_prof_linectr_emit_counter(const char *dir, const char *file,\n uint32_t line, uint32_t column,\n- int64_t *counter) {\n+ uint64_t *counter) {\n printf(\"%s\/%s:%u:%u %lu\\n\", dir, file, line, column, *counter);\n }\n \n"} {"commit":"c3697e221afbe97e61bdbed452d01bf54a4c9217","subject":"add comment for findRecords()","message":"add comment for findRecords()\n","repos":"JamisHoo\/OurSQL-DBMS","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/db_tablemanager.h\n+++ src\/db_tablemanager.h\n@@ -394,6 +394,7 @@\n \/\/ find record(s) that field[field_id] == key\n \/\/ return RIDs of the records\n \/\/ assert file is open\n+ \/\/ assert there's already index for this field\n std::vector<RID> findRecords(const uint64 field_id, const char* key) {\n \n }\n@@ -401,6 +402,7 @@\n \/\/ find record(s) that lb <= field[field_id] < ub\n \/\/ return RIDs of the records\n \/\/ assert file is open\n+ \/\/ assert there's already index for this field\n std::vector<RID> findRecords(const uint64 field_id, const char* lb, const char* ub) {\n \n }\n"} {"commit":"83b4bba3c782a19bed1477605a988db9e0901a04","subject":"If the first line begins with \"From \", ignore it.","message":"If the first line begins with \"From \", ignore it.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/deliver\/deliver.c\n+++ src\/deliver\/deliver.c\n@@ -17,6 +17,7 @@\n #include \"strescape.h\"\n #include \"var-expand.h\"\n #include \"message-address.h\"\n+#include \"message-header-parser.h\"\n #include \"istream-header-filter.h\"\n #include \"mbox-storage.h\"\n #include \"mail-namespace.h\"\n@@ -409,10 +410,22 @@\n \treturn ret;\n }\n \n+\n+static void save_header_callback(struct message_header_line *hdr,\n+\t\t\t\t bool *matched, bool *first)\n+{\n+\tif (*first) {\n+\t\t*first = FALSE;\n+\t\tif (hdr != NULL && strncmp(hdr->name, \"From \", 5) == 0)\n+\t\t\t*matched = TRUE;\n+\t}\n+}\n+\n static struct istream *create_mbox_stream(int fd, const char *envelope_sender)\n {\n \tconst char *mbox_hdr;\n \tstruct istream *input_list[4], *input, *input_filter;\n+\tbool first = TRUE;\n \n \tfd_set_nonblock(fd, FALSE);\n \n@@ -426,8 +439,8 @@\n \t\t\t\t\t HEADER_FILTER_NO_CR,\n \t\t\t\t\t mbox_hide_headers,\n \t\t\t\t\t mbox_hide_headers_count,\n-\t\t\t\t\t null_header_filter_callback,\n-\t\t\t\t\t NULL);\n+\t\t\t\t\t save_header_callback,\n+\t\t\t\t\t &first);\n \ti_stream_unref(&input);\n \n \tinput_list[0] = i_stream_create_from_data(mbox_hdr, strlen(mbox_hdr));\n"} {"commit":"90598fa29b05e127c40ff1e81a5b10ca02263d32","subject":"Load id file","message":"Load id file\n","repos":"golems\/reflex,golems\/reflex,golems\/reflex,golems\/reflex,golems\/reflex","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/demo\/rfx-camcal.c\n+++ src\/demo\/rfx-camcal.c\n@@ -49,6 +49,7 @@\n const char *opt_file_cam = NULL;\n const char *opt_file_fk = NULL;\n const char *opt_file_out = NULL;\n+const char *opt_file_id = NULL;\n size_t opt_test = 0;\n int opt_verbosity = 0;\n double opt_d_theta = 0;\n@@ -57,14 +58,14 @@\n double opt_zmax_theta = 1;\n double opt_zmax_x = 1;\n \n-\n static ssize_t\n-read_tfs( const char *name, double **A );\n+read_mat( const char *name, size_t n, double **A );\n \n static void\n write_tfs(const char *comment, const char *name, size_t n, double *A );\n \n \n+\n static void\n write_tf(FILE *tf, const char *comment, double *E );\n \n@@ -78,6 +79,22 @@\n void gentest( void );\n \n FILE *global_output = NULL;\n+\n+struct tf_cor {\n+ double id;\n+ double X[7];\n+ double Y[7];\n+};\n+\n+#define TF_COR_LD (sizeof(struct tf_cor)\/sizeof(double))\n+\n+static int tf_cor_compar( const void *_a, const void *_b ) {\n+ struct tf_cor *a = (struct tf_cor*)_a;\n+ struct tf_cor *b = (struct tf_cor*)_b;\n+ if( a->id < b->id ) return -1;\n+ if( a->id > b->id ) return 1;\n+ return 0;\n+}\n \n enum tf_cor_opts {\n TF_COR_O_TRANS_MEDIAN = 0x1,\n@@ -90,12 +107,14 @@\n \n \/\/ Find TF from correspondences\n static void tf_cor( int opts, size_t n,\n- const double *qx, size_t ldqx,\n- const double *vx, size_t ldvx,\n- const double *qy, size_t ldqy,\n- const double *vy, size_t ldvy,\n+ struct tf_cor *cor,\n double *Z )\n {\n+ const double *qx = cor[0].X; size_t ldqx = TF_COR_LD;\n+ const double *vx = cor[0].X+4; size_t ldvx = TF_COR_LD;\n+ const double *qy = cor[0].Y; size_t ldqy = TF_COR_LD;\n+ const double *vy = cor[0].Y+4; size_t ldvy = TF_COR_LD;\n+\n double *top = AA_MEM_REGION_LOCAL_NEW_N( double, 1 );\n \n \/*-- Orientation --*\/\n@@ -117,8 +136,6 @@\n q );\n aa_tf_qminimize(q);\n }\n-\n-\n \n if( opts & TF_COR_O_ROT_DAVENPORT )\n aa_tf_quat_davenport( n, NULL, Qrel, 4, q_fit[n_fit++] );\n@@ -183,7 +200,7 @@\n int main( int argc, char **argv )\n {\n \/* Parse *\/\n- for( int c; -1 != (c = getopt(argc, argv, \"c:k:o:t:d:x:v?\")); ) {\n+ for( int c; -1 != (c = getopt(argc, argv, \"c:k:i:o:t:d:x:v?\")); ) {\n switch(c) {\n case 'v':\n opt_verbosity++;\n@@ -193,6 +210,9 @@\n break;\n case 'k':\n opt_file_fk = optarg;\n+ break;\n+ case 'i':\n+ opt_file_id = optarg;\n break;\n case 'o':\n opt_file_out = optarg;\n@@ -213,6 +233,7 @@\n \"Options:\\n\"\n \" -k FILENAME, Forward Kinematics Pose File\\n\"\n \" -c FILENAME, Camera Marker Pose File\\n\"\n+ \" -i ID-FILE, Frame id file\\n\"\n \" -o FILENAME, Output file\\n\"\n \" -t POSE_COUNT, Generate test data\\n\"\n \" -d DEGREES, Corrupt test data rotation by max DEGREES\\n\"\n@@ -261,43 +282,52 @@\n \n \n \/* Read points *\/\n- double *E_cam=NULL, *E_fk=NULL;\n- ssize_t lines_cam = read_tfs( opt_file_cam, &E_cam );\n- ssize_t lines_fk = read_tfs( opt_file_fk, &E_fk );\n- if( lines_cam != lines_fk ) {\n- fprintf(stderr, \"Differing line count between `%s' and `%s'\\n\",\n- opt_file_cam, opt_file_fk );\n+ double *E_cam=NULL, *E_fk=NULL, *ids=NULL;\n+ \/\/return 0;\n+ ssize_t lines_cam = read_mat( opt_file_cam, 7, &E_cam );\n+ ssize_t lines_fk = read_mat( opt_file_fk, 7, &E_fk );\n+ ssize_t lines_id = read_mat( opt_file_id, 1, &ids );\n+ if( lines_cam != lines_fk || lines_id != lines_cam ) {\n+ fprintf(stderr, \"Differing line count between `%s', `%s', and `%s'\\n\",\n+ opt_file_cam, opt_file_fk, opt_file_id );\n exit(EXIT_FAILURE);\n }\n \n size_t count = (size_t)lines_cam;\n+\n+ struct tf_cor *cor = AA_NEW_AR( struct tf_cor, count );\n+ AA_MEM_ZERO(cor, count);\n+ aa_cla_dlacpy( ' ', 7, (int)count, E_fk, 7, cor[0].X, TF_COR_LD );\n+ aa_cla_dlacpy( ' ', 7, (int)count, E_cam, 7, cor[0].Y, TF_COR_LD );\n+ aa_cla_dlacpy( ' ', 1, (int)count, ids, 1, &cor[0].id, TF_COR_LD );\n+ aa_aheap_sort( cor, count, sizeof(*cor), &tf_cor_compar );\n \n \/\/ tf correspondences\n double E[7];\n tf_cor( TF_COR_O_ROT_UMEYAMA | TF_COR_O_TRANS_MEAN,\n- count,\n- E_fk, 7, E_fk+4, 7,\n- E_cam, 7, E_cam+4, 7,\n- E );\n+ count, cor, E );\n write_tf( global_output, \"Umeyama Mean\", E );\n \n tf_cor( TF_COR_O_ROT_DAVENPORT | TF_COR_O_TRANS_MEAN,\n- count,\n- E_fk, 7, E_fk+4, 7,\n- E_cam, 7, E_cam+4, 7,\n- E );\n+ count, cor, E );\n write_tf( global_output, \"Davenport Mean\", E );\n \n- tf_cor( TF_COR_O_ROT_MEDIAN | TF_COR_O_TRANS_MEDIAN,\n- count,\n- E_fk, 7, E_fk+4, 7,\n- E_cam, 7, E_cam+4, 7,\n- E );\n- write_tf( global_output, \"Median\", E );\n-}\n+ \/\/ TODO: correspondence EM\n+ \/\/ iterate between computing registraton and frame offsets\n+ \/\/ registration: tf_cor()\n+ \/\/ offset: per-frame inverse correspondences\n+\n+ \/* tf_cor( TF_COR_O_ROT_MEDIAN | TF_COR_O_TRANS_MEDIAN, *\/\n+ \/* count, *\/\n+ \/* E_fk, 7, E_fk+4, 7, *\/\n+ \/* E_cam, 7, E_cam+4, 7, *\/\n+ \/* E ); *\/\n+ \/* write_tf( global_output, \"Median\", E ); *\/\n+}\n+\n \n static ssize_t\n-read_tfs( const char *name, double **A )\n+read_mat( const char *name, size_t n, double **A )\n {\n \n FILE *f = fopen( name, \"r\" );\n@@ -306,7 +336,7 @@\n exit(EXIT_FAILURE);\n }\n size_t elts = 0;\n- ssize_t lines = aa_io_fread_matrix_heap( f, 7, A, &elts );\n+ ssize_t lines = aa_io_fread_matrix_heap( f, n, A, &elts );\n if( lines < 0 ) {\n fprintf(stderr, \"Error in file `%s' on line %ld.\\n\", name, lines );\n exit(EXIT_FAILURE);\n"} {"commit":"1062ecfc53622ff42edef5af63ace39c23dd3b49","subject":"wrap128.c: Fix Doxygen comments","message":"wrap128.c: Fix Doxygen comments\n\nReviewed-by: Stephen Henson <9ce5770b3bb4b2a1d59be2d97e34379cd192299f@openssl.org>\nReviewed-by: Emilia K\u00e4sper <6521fc25e7624eef7c3a0d89b71de7e612d27d37@openssl.org>\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/modes\/wrap128.c\n+++ crypto\/modes\/wrap128.c\n@@ -81,9 +81,9 @@\n *\n * @param[in] key Key value.\n * @param[in] iv IV value. Length = 8 bytes. NULL = use default_iv.\n- * @param[in] in Plain text as n 64-bit blocks, n >= 2.\n- * @param[in] inlen Length of in.\n- * @param[out] out Cipher text. Minimal buffer length = (inlen + 8) bytes.\n+ * @param[in] in Plaintext as n 64-bit blocks, n >= 2.\n+ * @param[in] inlen Length of in.\n+ * @param[out] out Ciphertext. Minimal buffer length = (inlen + 8) bytes.\n * Input and output buffers can overlap if block function\n * supports that.\n * @param[in] block Block processing function.\n@@ -127,19 +127,19 @@\n }\n \n \/** Unwrapping according to RFC 3394 section 2.2.2 steps 1-2.\n- * IV check (step 3) is responsibility of the caller.\n+ * The IV check (step 3) is responsibility of the caller.\n *\n * @param[in] key Key value.\n * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes.\n- * @param[out] out Plain text without IV.\n+ * @param[out] out Plaintext without IV.\n * Minimal buffer length = (inlen - 8) bytes.\n * Input and output buffers can overlap if block function\n * supports that.\n- * @param[in] in Ciphertext text as n 64-bit blocks\n+ * @param[in] in Ciphertext as n 64-bit blocks.\n * @param[in] inlen Length of in.\n * @param[in] block Block processing function.\n * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX]\n- * or if inlen is not multiply of 8.\n+ * or if inlen is not a multiple of 8.\n * Output length otherwise.\n *\/\n static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,\n@@ -174,21 +174,22 @@\n return inlen;\n }\n \n-\/** Unwrapping according to RFC 3394 section 2.2.2 including IV check.\n- * First block of plain text have to match supplied IV otherwise an error is\n- * returned.\n- *\n- * @param[in] key Key value.\n- * @param[out] iv Unchecked IV value. Minimal buffer length = 8 bytes.\n- * @param[out] out Plain text without IV.\n+\/** Unwrapping according to RFC 3394 section 2.2.2, including the IV check.\n+ * The first block of plaintext has to match the supplied IV, otherwise an\n+ * error is returned.\n+ *\n+ * @param[in] key Key value.\n+ * @param[out] iv IV value to match against. Length = 8 bytes.\n+ * NULL = use default_iv.\n+ * @param[out] out Plaintext without IV.\n * Minimal buffer length = (inlen - 8) bytes.\n * Input and output buffers can overlap if block function\n * supports that.\n- * @param[in] in Ciphertext text as n 64-bit blocks\n+ * @param[in] in Ciphertext as n 64-bit blocks.\n * @param[in] inlen Length of in.\n * @param[in] block Block processing function.\n * @return 0 if inlen is out of range [24, CRYPTO128_WRAP_MAX]\n- * or if inlen is not multiply of 8\n+ * or if inlen is not a multiple of 8\n * or if IV doesn't match expected value.\n * Output length otherwise.\n *\/\n@@ -216,10 +217,10 @@\n *\n * @param[in] key Key value.\n * @param[in] icv (Non-standard) IV, 4 bytes. NULL = use default_aiv.\n- * @param[out] out Cipher text. Minimal buffer length = (inlen + 15) bytes.\n- * Input and output buffers can overlap if block function\n- * supports that.\n- * @param[in] in Plain text as n 64-bit blocks, n >= 2.\n+ * @param[out] out Ciphertext. Minimal buffer length = (inlen + 15) bytes.\n+ * Input and output buffers can overlap if block function\n+ * supports that.\n+ * @param[in] in Plaintext as n 64-bit blocks, n >= 2.\n * @param[in] inlen Length of in.\n * @param[in] block Block processing function.\n * @return 0 if inlen is out of range [1, CRYPTO128_WRAP_MAX].\n@@ -282,14 +283,14 @@\n *\n * @param[in] key Key value.\n * @param[in] icv (Non-standard) IV, 4 bytes. NULL = use default_aiv.\n- * @param[out] out Plain text. Minimal buffer length = inlen bytes.\n- * Input and output buffers can overlap if block function\n- * supports that.\n- * @param[in] in Ciphertext text as n 64-bit blocks\n+ * @param[out] out Plaintext. Minimal buffer length = inlen bytes.\n+ * Input and output buffers can overlap if block function\n+ * supports that.\n+ * @param[in] in Ciphertext as n 64-bit blocks.\n * @param[in] inlen Length of in.\n * @param[in] block Block processing function.\n * @return 0 if inlen is out of range [16, CRYPTO128_WRAP_MAX],\n- * or if inlen is not multiply of 8\n+ * or if inlen is not a multiple of 8\n * or if IV and message length indicator doesn't match.\n * Output length if unwrapping succeeded and IV matches.\n *\/\n@@ -308,7 +309,7 @@\n static unsigned char zeros[8] = { 0x0 };\n size_t ret;\n \n- \/* Section 4.2: Cipher text length has to be (n+1) 64-bit blocks. *\/\n+ \/* Section 4.2: Ciphertext length has to be (n+1) 64-bit blocks. *\/\n if ((inlen & 0x7) != 0 || inlen < 16 || inlen >= CRYPTO128_WRAP_MAX)\n return 0;\n \n"} {"commit":"0943d5dd6179e2e824ec9a38b7ea6caa17a84ebd","subject":"Add SM2 specific parameter and key generation","message":"Add SM2 specific parameter and key generation\n\nThis makes it possible to generate SM2 parameters and keys like this:\n\n EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_SM2);\n EVP_PKEY *pkey = EVP_PKEY_new();\n\n EVP_PKEY_keygen_init(pctx);\n EVP_PKEY_keygen(pctx, pkey);\n\nReviewed-by: Matt Caswell <1fa2ef4755a9226cb9a0a4840bd89b158ac71391@openssl.org>\nReviewed-by: Dmitry Belyavskiy <38c64d6e24766247aad56af3a6ddb0056ad36a44@gmail.com>\n(Merged from https:\/\/github.com\/openssl\/openssl\/pull\/10942)\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/sm2\/sm2_pmeth.c\n+++ crypto\/sm2\/sm2_pmeth.c\n@@ -18,8 +18,6 @@\n \/* EC pkey context structure *\/\n \n typedef struct {\n- \/* Key and paramgen group *\/\n- EC_GROUP *gen_group;\n \/* message digest *\/\n const EVP_MD *md;\n \/* Distinguishing Identifier, ISO\/IEC 15946-3 *\/\n@@ -47,7 +45,6 @@\n SM2_PKEY_CTX *smctx = ctx->data;\n \n if (smctx != NULL) {\n- EC_GROUP_free(smctx->gen_group);\n OPENSSL_free(smctx->id);\n OPENSSL_free(smctx);\n ctx->data = NULL;\n@@ -62,13 +59,6 @@\n return 0;\n sctx = src->data;\n dctx = dst->data;\n- if (sctx->gen_group != NULL) {\n- dctx->gen_group = EC_GROUP_dup(sctx->gen_group);\n- if (dctx->gen_group == NULL) {\n- pkey_sm2_cleanup(dst);\n- return 0;\n- }\n- }\n if (sctx->id != NULL) {\n dctx->id = OPENSSL_malloc(sctx->id_len);\n if (dctx->id == NULL) {\n@@ -163,26 +153,21 @@\n static int pkey_sm2_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)\n {\n SM2_PKEY_CTX *smctx = ctx->data;\n- EC_GROUP *group;\n uint8_t *tmp_id;\n \n switch (type) {\n case EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID:\n- group = EC_GROUP_new_by_curve_name(p1);\n- if (group == NULL) {\n+ \/*\n+ * This control could be removed, which would signal it being\n+ * unsupported. However, that means that when the caller uses\n+ * the correct curve, it may interpret the unsupported signal\n+ * as an error, so it's better to accept the control, check the\n+ * value and return a corresponding value.\n+ *\/\n+ if (p1 != NID_sm2) {\n SM2err(SM2_F_PKEY_SM2_CTRL, SM2_R_INVALID_CURVE);\n return 0;\n }\n- EC_GROUP_free(smctx->gen_group);\n- smctx->gen_group = group;\n- return 1;\n-\n- case EVP_PKEY_CTRL_EC_PARAM_ENC:\n- if (smctx->gen_group == NULL) {\n- SM2err(SM2_F_PKEY_SM2_CTRL, SM2_R_NO_PARAMETERS_SET);\n- return 0;\n- }\n- EC_GROUP_set_asn1_flag(smctx->gen_group, p1);\n return 1;\n \n case EVP_PKEY_CTRL_MD:\n@@ -309,6 +294,38 @@\n return EVP_DigestUpdate(mctx, z, (size_t)mdlen);\n }\n \n+static int pkey_sm2_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)\n+{\n+ EC_KEY *ec = NULL;\n+ int ret;\n+\n+ ec = EC_KEY_new_by_curve_name(NID_sm2);\n+ if (ec == NULL)\n+ return 0;\n+ if (!ossl_assert(ret = EVP_PKEY_assign_EC_KEY(pkey, ec)))\n+ EC_KEY_free(ec);\n+ return ret;\n+}\n+\n+static int pkey_sm2_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)\n+{\n+ EC_KEY *ec = NULL;\n+\n+ ec = EC_KEY_new_by_curve_name(NID_sm2);\n+ if (ec == NULL)\n+ return 0;\n+ if (!ossl_assert(EVP_PKEY_assign_EC_KEY(pkey, ec))) {\n+ EC_KEY_free(ec);\n+ return 0;\n+ }\n+ \/* Note: if error is returned, we count on caller to free pkey->pkey.ec *\/\n+ if (ctx->pkey != NULL\n+ && !EVP_PKEY_copy_parameters(pkey, ctx->pkey))\n+ return 0;\n+\n+ return EC_KEY_generate_key(ec);\n+}\n+\n static const EVP_PKEY_METHOD sm2_pkey_meth = {\n EVP_PKEY_SM2,\n 0,\n@@ -317,10 +334,10 @@\n pkey_sm2_cleanup,\n \n 0,\n- 0,\n-\n- 0,\n- 0,\n+ pkey_sm2_paramgen,\n+\n+ 0,\n+ pkey_sm2_keygen,\n \n 0,\n pkey_sm2_sign,\n"} {"commit":"33862b90bb97316806532c4e1b95514066d7d02d","subject":"Add an entry for X509_TRUST_OBJECT_SIGN in trstandard[]. PR: 617","message":"Add an entry for X509_TRUST_OBJECT_SIGN in trstandard[].\nPR: 617\n","repos":"openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl,openssl\/openssl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- crypto\/x509\/x509_trs.c\n+++ crypto\/x509\/x509_trs.c\n@@ -82,6 +82,7 @@\n {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, \"SSL Client\", NID_client_auth, NULL},\n {X509_TRUST_SSL_SERVER, 0, trust_1oidany, \"SSL Server\", NID_server_auth, NULL},\n {X509_TRUST_EMAIL, 0, trust_1oidany, \"S\/MIME email\", NID_email_protect, NULL},\n+{X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, \"Object Signer\", NID_code_sign, NULL},\n {X509_TRUST_OCSP_SIGN, 0, trust_1oid, \"OCSP responder\", NID_OCSP_sign, NULL},\n {X509_TRUST_OCSP_REQUEST, 0, trust_1oid, \"OCSP request\", NID_ad_OCSP, NULL}\n };\n"} {"commit":"74dee4426ca96fec500d63c572371350459c0866","subject":"Change test function;","message":"Change test function;\n","repos":"Saroth\/debug,Saroth\/sdb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- test_debug.c\n+++ test_debug.c\n@@ -107,7 +107,7 @@\n \n \n \/\/ \u6a21\u5757\u6d4b\u8bd5\n-int test_debug(void)\n+int test_debug(void *p)\n {\n dbg_test_setlist(\n { \"dbg_out_*\", NULL, test_output, },\n@@ -130,7 +130,7 @@\n \/\/ \u6a21\u5757\u6d4b\u8bd5\u5165\u53e3\n int __entry_test_debug__(void)\n {\n- test_debug();\n+ test_debug(NULL);\n exit(0); \n }\n \n"} {"commit":"614b6c0a8d1c7621b423228a4bf4d1761503b148","subject":"Untangle the Jump\/CJump interpreter instructions.","message":"Untangle the Jump\/CJump interpreter instructions.\n\nShrinks the instruction size of a Jump a bit.\n\nChange-Id: I1a6b043d13e8493d8b0d23011141d46c10414fa8\nReviewed-by: Lars Knoll <a812617a4072dcbeb80684eca0f369f0083af109@digia.com>\n","repos":"matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,mgrunditz\/qtdeclarative-2d,qmlc\/qtdeclarative,matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,mgrunditz\/qtdeclarative-2d,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,mgrunditz\/qtdeclarative-2d,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,qmlc\/qtdeclarative,mgrunditz\/qtdeclarative-2d,matthewvogt\/qtdeclarative,matthewvogt\/qtdeclarative,mgrunditz\/qtdeclarative-2d,qmlc\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative,qmlc\/qtdeclarative","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- moth\/qv4instr_moth_p.h\n+++ moth\/qv4instr_moth_p.h\n@@ -32,7 +32,7 @@\n F(CreateProperty, createProperty) \\\n F(CreateActivationProperty, createActivationProperty) \\\n F(Jump, jump) \\\n- F(CJump, jump) \\\n+ F(CJump, cjump) \\\n F(Unop, unop) \\\n F(Binop, binop) \\\n F(LoadThis, loadThis) \\\n@@ -229,6 +229,10 @@\n struct instr_jump {\n MOTH_INSTR_HEADER\n ptrdiff_t offset; \n+ };\n+ struct instr_cjump {\n+ MOTH_INSTR_HEADER\n+ ptrdiff_t offset;\n int tempIndex;\n };\n struct instr_unop {\n@@ -299,6 +303,7 @@\n instr_createProperty createProperty;\n instr_createActivationProperty createActivationProperty;\n instr_jump jump;\n+ instr_cjump cjump;\n instr_unop unop;\n instr_binop binop;\n instr_loadThis loadThis;\n"} {"commit":"04ec6e9a15eab1683a3f8daeab31dbf3acd5e917","subject":"refs #100256 Correct the rate calculation to account for 2 Hz sampling window.","message":"refs #100256 Correct the rate calculation to account for 2 Hz sampling window.\n","repos":"ebollens\/ccnmp,svartika\/ccnx,ebollens\/ccnmp,cawka\/ndnx,svartika\/ccnx,svartika\/ccnx,cawka\/ndnx,svartika\/ccnx,svartika\/ccnx,ebollens\/ccnmp,ebollens\/ccnmp,cawka\/ndnx,cawka\/ndnx,cawka\/ndnx,svartika\/ccnx,svartika\/ccnx","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- csrc\/ccnd\/ccnd_stats.c\n+++ csrc\/ccnd\/ccnd_stats.c\n@@ -589,7 +589,7 @@\n if (m == NULL)\n return(0);\n ccnd_meter_bump(h, m, 0);\n- return ((m->rate + 3) \/ 6);\n+ return ((m->rate + 2) \/ 3);\n }\n \n \/**\n"} {"commit":"29a86f1ed1018f8a6f6dae0e37037f8faa6d7922","subject":"layers: Added mutext to DrawState to guard global linked-lists.","message":"layers: Added mutext to DrawState to guard global linked-lists.\n","repos":"KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- layers\/draw_state.c\n+++ layers\/draw_state.c\n@@ -33,6 +33,8 @@\n static XGL_LAYER_DISPATCH_TABLE nextTable;\n static XGL_BASE_LAYER_OBJECT *pCurObj;\n static pthread_once_t tabOnce = PTHREAD_ONCE_INIT;\n+\/\/ Could be smarter about locking with unique locks for various tasks, but just using one for now\n+pthread_mutex_t globalLock = PTHREAD_MUTEX_INITIALIZER;\n \/\/ Ptr to LL of dbg functions\n static XGL_LAYER_DBG_FUNCTION_NODE *pDbgFunctionHead = NULL;\n \/\/ Utility function to handle reporting\n@@ -45,6 +47,7 @@\n const XGL_CHAR* pLayerPrefix,\n const XGL_CHAR* pMsg)\n {\n+ pthread_mutex_lock(&globalLock);\n XGL_LAYER_DBG_FUNCTION_NODE *pTrav = pDbgFunctionHead;\n if (pTrav) {\n while (pTrav) {\n@@ -68,6 +71,7 @@\n break;\n }\n }\n+ pthread_mutex_unlock(&globalLock);\n }\n \/\/ Return the size of the underlying struct based on struct type\n static XGL_SIZE sTypeStructSize(XGL_STRUCTURE_TYPE sType)\n@@ -224,6 +228,7 @@\n \/\/ Viewport state create info doesn't have sType so we have to pass in BIND_POINT\n static void insertDynamicState(const XGL_STATE_OBJECT state, const PIPELINE_LL_HEADER* pCreateInfo, const XGL_STATE_BIND_POINT sType)\n {\n+ pthread_mutex_lock(&globalLock);\n \/\/ Insert new node at head of appropriate LL\n DYNAMIC_STATE_NODE* pStateNode = (DYNAMIC_STATE_NODE*)malloc(sizeof(DYNAMIC_STATE_NODE));\n pStateNode->pNext = pDynamicStateHead[sType];\n@@ -232,11 +237,13 @@\n pStateNode->sType = sType;\n pStateNode->pCreateInfo = (PIPELINE_LL_HEADER*)malloc(dynStateCreateInfoSize(sType));\n memcpy(pStateNode->pCreateInfo, pCreateInfo, dynStateCreateInfoSize(sType));\n+ pthread_mutex_unlock(&globalLock);\n }\n \/\/ Set the last bound dynamic state of given type\n \/\/ TODO : Need to track this per cmdBuffer and correlate cmdBuffer for Draw w\/ last bound for that cmdBuffer?\n static void setLastBoundDynamicState(const XGL_STATE_OBJECT state, const XGL_STATE_BIND_POINT sType)\n {\n+ pthread_mutex_lock(&globalLock);\n DYNAMIC_STATE_NODE* pTrav = pDynamicStateHead[sType];\n while (pTrav && (state != pTrav->stateObj)) {\n pTrav = pTrav->pNext;\n@@ -247,10 +254,12 @@\n layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, state, 0, DRAWSTATE_INVALID_DYNAMIC_STATE_OBJECT, \"DS\", str);\n }\n pLastBoundDynamicState[sType] = pTrav;\n+ pthread_mutex_unlock(&globalLock);\n }\n \/\/ Print the last bound dynamic state\n static void printDynamicState()\n {\n+ pthread_mutex_lock(&globalLock);\n char str[1024];\n for (uint32_t i = 0; i < XGL_NUM_STATE_BIND_POINT; i++) {\n if (pLastBoundDynamicState[i]) {\n@@ -271,32 +280,42 @@\n layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, \"DS\", str);\n }\n }\n+ pthread_mutex_unlock(&globalLock);\n }\n \/\/ Retrieve pipeline node ptr for given pipeline object\n static PIPELINE_NODE *getPipeline(XGL_PIPELINE pipeline)\n {\n+ pthread_mutex_lock(&globalLock);\n PIPELINE_NODE *pTrav = pPipelineHead;\n while (pTrav) {\n- if (pTrav->pipeline == pipeline)\n+ if (pTrav->pipeline == pipeline) {\n+ pthread_mutex_unlock(&globalLock);\n return pTrav;\n+ }\n pTrav = pTrav->pNext;\n }\n+ pthread_mutex_unlock(&globalLock);\n return NULL;\n }\n \n \/\/ For given sampler, return a ptr to its Create Info struct, or NULL if sampler not found\n static XGL_SAMPLER_CREATE_INFO* getSamplerCreateInfo(const XGL_SAMPLER sampler)\n {\n+ pthread_mutex_lock(&globalLock);\n SAMPLER_NODE *pTrav = pSamplerHead;\n while (pTrav) {\n- if (sampler == pTrav->sampler)\n+ if (sampler == pTrav->sampler) {\n+ pthread_mutex_unlock(&globalLock);\n return &pTrav->createInfo;\n+ }\n pTrav = pTrav->pNext;\n }\n+ pthread_mutex_unlock(&globalLock);\n return NULL;\n }\n \n \/\/ Init the pipeline mapping info based on pipeline create info LL tree\n+\/\/ Threading note : Calls to this function should wrapped in mutex\n static void initPipeline(PIPELINE_NODE *pPipeline, const XGL_GRAPHICS_PIPELINE_CREATE_INFO* pCreateInfo)\n {\n \/\/ First init create info, we'll shadow the structs as we go down the tree\n@@ -393,12 +412,16 @@\n \/\/ Return DS Head ptr for specified ds or else NULL\n static DS_LL_HEAD* getDS(XGL_DESCRIPTOR_SET ds)\n {\n+ pthread_mutex_lock(&globalLock);\n DS_LL_HEAD *pTrav = pDSHead;\n while (pTrav) {\n- if (pTrav->dsID == ds)\n+ if (pTrav->dsID == ds) {\n+ pthread_mutex_unlock(&globalLock);\n return pTrav;\n+ }\n pTrav = pTrav->pNextDS;\n }\n+ pthread_mutex_unlock(&globalLock);\n return NULL;\n }\n \n@@ -421,17 +444,20 @@\n }\n \n \/\/ Clear specified slotCount DS Slots starting at startSlot\n-\/\/ Return XGL_TRUE if DS is within a xglBeginDescriptorSetUpdate() call sequence, otherwise XGL_FALSE\n+\/\/ Return XGL_TRUE if DS exists and is successfully cleared to 0s\n static XGL_BOOL clearDS(XGL_DESCRIPTOR_SET descriptorSet, XGL_UINT startSlot, XGL_UINT slotCount)\n {\n DS_LL_HEAD *pTrav = getDS(descriptorSet);\n+ pthread_mutex_lock(&globalLock);\n if (!pTrav || ((startSlot + slotCount) > pTrav->numSlots)) {\n \/\/ TODO : Log more meaningful error here\n+ pthread_mutex_unlock(&globalLock);\n return XGL_FALSE;\n }\n for (uint32_t i = startSlot; i < slotCount; i++) {\n memset((void*)&pTrav->dsSlot[i], 0, sizeof(DS_SLOT));\n }\n+ pthread_mutex_unlock(&globalLock);\n return XGL_TRUE;\n }\n \n@@ -561,6 +587,7 @@\n }\n else {\n \/\/ Synch Descriptor Set Mapping\n+ pthread_mutex_lock(&globalLock);\n for (uint32_t i = 0; i < XGL_MAX_DESCRIPTOR_SETS; i++) {\n DS_LL_HEAD *pDS;\n if (lastBoundDS[i]) {\n@@ -612,6 +639,7 @@\n free(tmpStr);\n }\n }\n+ pthread_mutex_unlock(&globalLock);\n }\n }\n \n@@ -660,6 +688,7 @@\n uint32_t skipUnusedCount = 0; \/\/ track consecutive unused slots for minimal reporting\n char tmp_str[1024];\n char ds_config_str[1024*256] = {0}; \/\/ TODO : Currently making this buffer HUGE w\/o overrun protection. Need to be smarter, start smaller, and grow as needed.\n+ pthread_mutex_lock(&globalLock);\n for (uint32_t i = 0; i < XGL_MAX_DESCRIPTOR_SETS; i++) {\n if (lastBoundDS[i]) {\n DS_LL_HEAD *pDS = getDS(lastBoundDS[i]);\n@@ -727,6 +756,7 @@\n }\n }\n }\n+ pthread_mutex_unlock(&globalLock);\n layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_NONE, \"DS\", ds_config_str);\n }\n \n@@ -1298,6 +1328,7 @@\n char str[1024];\n sprintf(str, \"Created Gfx Pipeline %p\", (void*)*pPipeline);\n layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pPipeline, 0, DRAWSTATE_NONE, \"DS\", str);\n+ pthread_mutex_lock(&globalLock);\n PIPELINE_NODE *pTrav = pPipelineHead;\n if (pTrav) {\n while (pTrav->pNext)\n@@ -1312,6 +1343,7 @@\n memset((void*)pTrav, 0, sizeof(PIPELINE_NODE));\n pTrav->pipeline = *pPipeline;\n initPipeline(pTrav, pCreateInfo);\n+ pthread_mutex_unlock(&globalLock);\n return result;\n }\n \n@@ -1342,12 +1374,13 @@\n XGL_LAYER_EXPORT XGL_RESULT XGLAPI xglCreateSampler(XGL_DEVICE device, const XGL_SAMPLER_CREATE_INFO* pCreateInfo, XGL_SAMPLER* pSampler)\n {\n XGL_RESULT result = nextTable.CreateSampler(device, pCreateInfo, pSampler);\n- \/\/ TODO : Save sampler create info here and associate it with SAMPLER\n+ pthread_mutex_lock(&globalLock);\n SAMPLER_NODE *pNewNode = (SAMPLER_NODE*)malloc(sizeof(SAMPLER_NODE));\n pNewNode->sampler = *pSampler;\n memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_SAMPLER_CREATE_INFO));\n pNewNode->pNext = pSamplerHead;\n pSamplerHead = pNewNode;\n+ pthread_mutex_unlock(&globalLock);\n return result;\n }\n \n@@ -1358,6 +1391,7 @@\n char str[1024];\n sprintf(str, \"Created Descriptor Set (DS) %p\", (void*)*pDescriptorSet);\n layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorSet, 0, DRAWSTATE_NONE, \"DS\", str);\n+ pthread_mutex_lock(&globalLock);\n DS_LL_HEAD *pTrav = pDSHead;\n if (pTrav) {\n \/\/ Grow existing list\n@@ -1376,6 +1410,7 @@\n pTrav->pNextDS = NULL;\n pTrav->updateActive = XGL_FALSE;\n initDS(pTrav);\n+ pthread_mutex_unlock(&globalLock);\n return result;\n }\n \n@@ -1586,8 +1621,10 @@\n {\n if (getDS(descriptorSet)) {\n assert(index < XGL_MAX_DESCRIPTOR_SETS);\n+ pthread_mutex_lock(&globalLock);\n lastBoundDS[index] = descriptorSet;\n lastBoundSlotOffset[index] = slotOffset;\n+ pthread_mutex_unlock(&globalLock);\n char str[1024];\n sprintf(str, \"DS %p bound to DS index %u on pipeline %s\", (void*)descriptorSet, index, string_XGL_PIPELINE_BIND_POINT(pipelineBindPoint));\n layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_NONE, \"DS\", str);\n"} {"commit":"75bc63a4b9fbd4b06de6acb16118714616c76f52","subject":"COMP: Initialize function should not be virtual","message":"COMP: Initialize function should not be virtual\n\nChange-Id: I3e5d14bfeea08198fa073717fc59667f041a4d49\n","repos":"matthieuheitz\/TubeTK,sumedhasingla\/TubeTK,aylward\/ITKTubeTK,sumedhasingla\/TubeTK,KitwareMedical\/TubeTK,matthieuheitz\/TubeTK,cdeepakroy\/TubeTK,aylward\/ITKTubeTK,KitwareMedical\/TubeTK,KitwareMedical\/ITKTubeTK,sumedhasingla\/TubeTK,LucasGandel\/TubeTK,KitwareMedical\/ITKTubeTK,matthieuheitz\/TubeTK,cdeepakroy\/TubeTK,KitwareMedical\/ITKTubeTK,LucasGandel\/TubeTK,thewtex\/TubeTK,KitwareMedical\/ITKTubeTK,KitwareMedical\/TubeTK,thewtex\/TubeTK,KitwareMedical\/TubeTK,LucasGandel\/TubeTK,thewtex\/TubeTK,aylward\/ITKTubeTK,matthieuheitz\/TubeTK,aylward\/ITKTubeTK,sumedhasingla\/TubeTK,cdeepakroy\/TubeTK,thewtex\/TubeTK,cdeepakroy\/TubeTK,LucasGandel\/TubeTK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Base\/IO\/itkTubeMetaLDA.h\n+++ Base\/IO\/itkTubeMetaLDA.h\n@@ -91,7 +91,7 @@\n \n virtual void Clear( void );\n \n- virtual bool InitializeEssential( const LDAValuesType & _ldaValues,\n+ bool InitializeEssential( const LDAValuesType & _ldaValues,\n const LDAMatrixType & _ldaMatrix, const ValueListType & _whitenMeans,\n const ValueListType & _whitenStdDevs );\n \n"} {"commit":"eff1c723c754386249048dbbc6606650c153d57e","subject":"Add of ctable_batch.c","message":"Add of ctable_batch.c\n","repos":"flightaware\/speedtables,flightaware\/speedtables,flightaware\/speedtables,flightaware\/speedtables","returncode":1,"stderr":"error: pathspec 'ctables\/ctable_batch.c' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- ctables\/ctable_batch.c\n+++ ctables\/ctable_batch.c\n@@ -0,0 +1,100 @@\n+\n+\/*\n+ * Ctable batch routines\n+ *\n+ * $Id$\n+ *\n+ *\/\n+\n+\/\/\n+\/\/ ctable_RunBatch - Run a batch of ctable commands without invoking the\n+\/\/ Tcl interpreter. \n+\/\/\n+\/\/ Any commands that return non-empty results or have error results get\n+\/\/ accumulated into a result list that gets returned.\n+\/\/\n+\/\/ Returned is a list of lists, one per non-empty or error result, where\n+\/\/ the first element is the index number of the list element that got\n+\/\/ the error or non-empty result, whether it's an error or OK return,\n+\/\/ (the actual Tcl result code as in return -code), and the result or\n+\/\/ error message.\n+\/\/\n+static int\n+ctable_RunBatch (Tcl_Interp *interp, CTable *ctable, Tcl_Obj *tableCmdObj, Tcl_Obj *batchListObj) {\n+ int listObjc;\n+ Tcl_Obj **listObjv;\n+\n+ int i;\n+ int commandResult = TCL_ERROR;\n+\n+ Tcl_Obj *resultListObj = Tcl_NewObj ();\n+\n+ Tcl_Obj *commandResultObj;\n+\n+ Tcl_Obj *oneResultObj[2];\n+ Tcl_Obj *oneResultValueObj[2];\n+\n+ if (Tcl_ListObjGetElements (interp, batchListObj, &listObjc, &listObjv) == TCL_ERROR) {\n+\tTcl_AppendResult (interp, \" while processing batch list\", (char *)NULL);\n+\treturn TCL_ERROR;\n+ }\n+\n+ \/\/ nothing to do? ok, you get a nice, pristine, empty result\n+ if (listObjc == 0) {\n+ return TCL_OK;\n+ }\n+\n+ for (i = 0; i < listObjc; i++) {\n+ int cmdObjc;\n+ Tcl_Obj **cmdObjv;\n+\n+\tTcl_Obj *batchCmdObj;\n+\n+\tbatchCmdObj = listObjv[i];\n+\tif (Tcl_IsShared (batchCmdObj)) {\n+\t batchCmdObj = Tcl_DuplicateObj (batchCmdObj);\n+\t}\n+\n+\tif (Tcl_ListObjReplace (interp, batchCmdObj, 0, 0, 1, &tableCmdObj) == TCL_ERROR) {\n+\t commandResult = TCL_ERROR;\n+\t goto accumulate_result;\n+\t}\n+\n+\tif (Tcl_ListObjGetElements (interp, batchCmdObj, &cmdObjc, &cmdObjv) == TCL_ERROR) {\n+\t commandResult = TCL_ERROR;\n+\t goto accumulate_result;\n+\t}\n+\n+ \/\/ reset the result since the command we're about to invoke sets\n+\t\/\/ stuff into the result. we make arrangements to copy out the\n+\t\/\/ result if anything's there after executing the command.\n+\n+ Tcl_ResetResult (interp);\n+ commandResult = ctable->creatorTable->command (ctable, interp, cmdObjc, cmdObjv);\n+\tcommandResultObj = Tcl_GetObjResult (interp);\n+\n+ \/\/ if we got an OK result and nothing in the result object, there's\n+\t\/\/ nothing to accumulate in our result list\n+\tif ((commandResult == TCL_OK) && (commandResultObj->typePtr == NULL && commandResultObj->length == 0)) continue;\n+\n+ accumulate_result:\n+\n+ \/\/ each result sublist is {indexNumber {tclResultNumber tclResultValue}}\n+\n+ oneResultObj[0] = Tcl_NewIntObj (i);\n+\n+\toneResultValueObj[0] = Tcl_NewIntObj (commandResult);\n+\toneResultValueObj[1] = Tcl_GetObjResult (interp);\n+\n+\toneResultObj[1] = Tcl_NewListObj (2, oneResultValueObj);\n+\n+\tif (Tcl_ListObjAppendElement (interp, resultListObj, Tcl_NewListObj (2, oneResultObj))) {\n+\t Tcl_AppendResult (interp, \" while appending a command result\", (char *)NULL);\n+\t return TCL_ERROR;\n+\t}\n+ }\n+\n+ Tcl_SetObjResult (interp, resultListObj);\n+ return TCL_OK;\n+}\n+\n"} {"commit":"1f684de1105deac37ca00e6d0277aad17669f842","subject":"try to fix #2: missing definition of GLintptr","message":"try to fix #2: missing definition of GLintptr\n\nperhaps the fix for https:\/\/github.com\/hashdist\/hashstack\/pull\/571 also works for virvo - not checked\n","repos":"deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox,deskvox\/deskvox","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- virvo\/virvo\/vvopengl.h\n+++ virvo\/virvo\/vvopengl.h\n@@ -39,6 +39,9 @@\n #include <GL\/gl.h>\n #include <GL\/glu.h>\n #ifndef _WIN32\n+#ifndef GLX_GLEXT_LEGACY\n+# define GLX_GLEXT_LEGACY 1\n+#endif\n #include <GL\/glx.h>\n #endif\n #endif\n"} {"commit":"71787db4deb2810c971a7a156759ed9e8999c622","subject":"Reorder some functions within the Java bindings. (dm)","message":"Reorder some functions within the Java bindings. (dm)\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Bindings\/Java\/bindings.c\n+++ Bindings\/Java\/bindings.c\n@@ -42,22 +42,111 @@\n brlapi_getLibraryVersion(&majorVersion, &minorVersion, &revision);\n }\n \n-JAVA_STATIC_METHOD(\n- org_a11y_brlapi_Version, getMajor, jint\n-) {\n- return majorVersion;\n-}\n-\n-JAVA_STATIC_METHOD(\n- org_a11y_brlapi_Version, getMinor, jint\n-) {\n- return minorVersion;\n-}\n-\n-JAVA_STATIC_METHOD(\n- org_a11y_brlapi_Version, getRevision, jint\n-) {\n- return revision;\n+static void\n+logJavaVirtualMachineError (jint error, const char *method) {\n+ const char *message;\n+\n+ switch (error) {\n+ case JNI_OK:\n+ message = \"success\";\n+ break;\n+\n+ default:\n+#ifdef JNI_ERR\n+ case JNI_ERR:\n+#endif \/* JNI_ERR *\/\n+ message = \"unknown error\";\n+ break;\n+\n+#ifdef JNI_EDETACHED\n+ case JNI_EDETACHED:\n+ message = \"thread not attached to virtual machine\";\n+ break;\n+#endif \/* JNI_EDETACHED *\/\n+\n+#ifdef JNI_EVERSION\n+ case JNI_EVERSION:\n+ message = \"version error\";\n+ break;\n+#endif \/* JNI_EVERSION *\/\n+\n+#ifdef JNI_ENOMEM\n+ case JNI_ENOMEM:\n+ message = \"not enough memory\";\n+ break;\n+#endif \/* JNI_ENOMEM *\/\n+\n+#ifdef JNI_EEXIST\n+ case JNI_EEXIST:\n+ message = \"virtual machine already created\";\n+ break;\n+#endif \/* JNI_EEXIST *\/\n+\n+#ifdef JNI_EINVAL\n+ case JNI_EINVAL:\n+ message = \"invalid argument\";\n+ break;\n+#endif \/* JNI_EINVAL *\/\n+ }\n+\n+ fprintf(stderr, \"Java virtual machine error %d in %s: %s\\n\", error, method, message);\n+}\n+\n+static JNIEnv *\n+getJavaEnvironment (brlapi_handle_t *handle) {\n+ JavaVM *vm = brlapi__getClientData(handle);\n+ void *env = NULL;\n+\n+ if (vm) {\n+ jint result = (*vm)->GetEnv(vm, &env, jniVersion);\n+\n+ if (result != JNI_OK) {\n+ if (result == JNI_EDETACHED) {\n+ JavaVMAttachArgs args = {\n+ .version = jniVersion,\n+ .name = NULL,\n+ .group = NULL\n+ };\n+\n+ if ((result = (*vm)->AttachCurrentThread(vm, &env, &args)) != JNI_OK) {\n+ logJavaVirtualMachineError(result, \"AttachCurrentThread\");\n+ }\n+ } else {\n+ logJavaVirtualMachineError(result, \"GetEnv\");\n+ }\n+ }\n+ }\n+\n+ return env;\n+}\n+\n+static void BRLAPI_STDCALL\n+handleConnectionException (brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size) {\n+ JNIEnv *env = getJavaEnvironment(handle);\n+\n+ jbyteArray jPacket = (*env)->NewByteArray(env, size);\n+ if (!jPacket) return;\n+ (*env)->SetByteArrayRegion(env, jPacket, 0, size, (jbyte *) packet);\n+\n+ jclass class = (*env)->FindClass(env, BRLAPI_OBJECT(\"ConnectionException\"));\n+ if (!class) return;\n+\n+ jmethodID constructor = JAVA_GET_CONSTRUCTOR(env, class,\n+ JAVA_SIG_LONG \/\/ handle\n+ JAVA_SIG_INT \/\/ error\n+ JAVA_SIG_INT \/\/ type\n+ JAVA_SIG_ARRAY(JAVA_SIG_BYTE) \/\/ packet\n+ );\n+ if (!constructor) return;\n+\n+ jclass object = (*env)->NewObject(\n+ env, class, constructor,\n+ (jlong) (intptr_t) handle, error, type, jPacket\n+ );\n+ if (!object) return;\n+\n+ (*env)->ExceptionClear(env);\n+ (*env)->Throw(env, object);\n }\n \n static void\n@@ -104,6 +193,24 @@\n } else if (jFunction) {\n (*env)->ReleaseStringUTFChars(env, jFunction, brlapi_errfun);\n }\n+}\n+\n+JAVA_STATIC_METHOD(\n+ org_a11y_brlapi_Version, getMajor, jint\n+) {\n+ return majorVersion;\n+}\n+\n+JAVA_STATIC_METHOD(\n+ org_a11y_brlapi_Version, getMinor, jint\n+) {\n+ return minorVersion;\n+}\n+\n+JAVA_STATIC_METHOD(\n+ org_a11y_brlapi_Version, getRevision, jint\n+) {\n+ return revision;\n }\n \n #define GET_CLASS(env, class, object, ret) \\\n@@ -138,113 +245,6 @@\n FIND_CONNECTION_HANDLE((env), (object), ret); \\\n JAVA_SET_FIELD((env), Long, (object), field, (jlong) (intptr_t) (value)); \\\n } while (0)\n-\n-static void\n-logJavaVirtualMachineError (jint error, const char *method) {\n- const char *message;\n-\n- switch (error) {\n- case JNI_OK:\n- message = \"success\";\n- break;\n-\n- default:\n-#ifdef JNI_ERR\n- case JNI_ERR:\n-#endif \/* JNI_ERR *\/\n- message = \"unknown error\";\n- break;\n-\n-#ifdef JNI_EDETACHED\n- case JNI_EDETACHED:\n- message = \"thread not attached to virtual machine\";\n- break;\n-#endif \/* JNI_EDETACHED *\/\n-\n-#ifdef JNI_EVERSION\n- case JNI_EVERSION:\n- message = \"version error\";\n- break;\n-#endif \/* JNI_EVERSION *\/\n-\n-#ifdef JNI_ENOMEM\n- case JNI_ENOMEM:\n- message = \"not enough memory\";\n- break;\n-#endif \/* JNI_ENOMEM *\/\n-\n-#ifdef JNI_EEXIST\n- case JNI_EEXIST:\n- message = \"virtual machine already created\";\n- break;\n-#endif \/* JNI_EEXIST *\/\n-\n-#ifdef JNI_EINVAL\n- case JNI_EINVAL:\n- message = \"invalid argument\";\n- break;\n-#endif \/* JNI_EINVAL *\/\n- }\n-\n- fprintf(stderr, \"Java virtual machine error %d in %s: %s\\n\", error, method, message);\n-}\n-\n-static JNIEnv *\n-getJavaEnvironment (brlapi_handle_t *handle) {\n- JavaVM *vm = brlapi__getClientData(handle);\n- void *env = NULL;\n-\n- if (vm) {\n- jint result = (*vm)->GetEnv(vm, &env, jniVersion);\n-\n- if (result != JNI_OK) {\n- if (result == JNI_EDETACHED) {\n- JavaVMAttachArgs args = {\n- .version = jniVersion,\n- .name = NULL,\n- .group = NULL\n- };\n-\n- if ((result = (*vm)->AttachCurrentThread(vm, &env, &args)) != JNI_OK) {\n- logJavaVirtualMachineError(result, \"AttachCurrentThread\");\n- }\n- } else {\n- logJavaVirtualMachineError(result, \"GetEnv\");\n- }\n- }\n- }\n-\n- return env;\n-}\n-\n-static void BRLAPI_STDCALL\n-handleConnectionException (brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size) {\n- JNIEnv *env = getJavaEnvironment(handle);\n-\n- jbyteArray jPacket = (*env)->NewByteArray(env, size);\n- if (!jPacket) return;\n- (*env)->SetByteArrayRegion(env, jPacket, 0, size, (jbyte *) packet);\n-\n- jclass class = (*env)->FindClass(env, BRLAPI_OBJECT(\"ConnectionException\"));\n- if (!class) return;\n-\n- jmethodID constructor = JAVA_GET_CONSTRUCTOR(env, class,\n- JAVA_SIG_LONG \/\/ handle\n- JAVA_SIG_INT \/\/ error\n- JAVA_SIG_INT \/\/ type\n- JAVA_SIG_ARRAY(JAVA_SIG_BYTE) \/\/ packet\n- );\n- if (!constructor) return;\n-\n- jclass object = (*env)->NewObject(\n- env, class, constructor,\n- (jlong) (intptr_t) handle, error, type, jPacket\n- );\n- if (!object) return;\n-\n- (*env)->ExceptionClear(env);\n- (*env)->Throw(env, object);\n-}\n \n JAVA_INSTANCE_METHOD(\n org_a11y_brlapi_BasicConnection, openConnection, jint,\n"} {"commit":"3a52cf577a058c676d35be1c24ab9275e9a0a7a3","subject":"Fix issue where double array was not fetched from CBOR correctly.","message":"Fix issue where double array was not fetched from CBOR correctly.\n\nChange-Id: I7d7f9ac4fe216d883ddb26d624136d098a8a7a14\nSigned-off-by: Joseph Morrow <74b1946a3796b7d1c8ad79fee44616e505fb0cee@intel.com>\nReviewed-on: https:\/\/gerrit.iotivity.org\/gerrit\/9101\nTested-by: jenkins-iotivity <09cb29e8a2b473a2c978382eec13ee06fa017bda@opendaylight.org>\nReviewed-by: Mandeep Shetty <9576c34ab780cbbd29c2639a47eb90b07da66bfe@intel.com>\nReviewed-by: Ziran Sun <3baa2a3e3c6d96dba4b6f1736d53815847db9a07@samsung.com>\nReviewed-by: Habib Virji <40be98b50fb6c4d79bd282a617e2cc82e300d47f@samsung.com>\n","repos":"iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- resource\/csdk\/stack\/src\/ocpayload.c\n+++ resource\/csdk\/stack\/src\/ocpayload.c\n@@ -983,7 +983,7 @@\n return false;\n }\n \n- if (val->arr.type != OCREP_PROP_DOUBLE)\n+ if (val->arr.type == OCREP_PROP_DOUBLE)\n {\n memcpy(*array, val->arr.dArray, dimTotal * sizeof(double));\n }\n"} {"commit":"da9542fa51821480684decabcb463908974e37ac","subject":"Changes json_string to typed_string_to_json in tests\/argv.c","message":"Changes json_string to typed_string_to_json in tests\/argv.c\n","repos":"kwlzn\/watchman,facebook\/watchman,facebook\/watchman,wez\/watchman,facebook\/watchman,facebook\/watchman,wez\/watchman,wez\/watchman,kwlzn\/watchman,nodakai\/watchman,kwlzn\/watchman,wez\/watchman,nodakai\/watchman,kwlzn\/watchman,nodakai\/watchman,facebook\/watchman,nodakai\/watchman,wez\/watchman,facebook\/watchman,nodakai\/watchman,facebook\/watchman,kwlzn\/watchman,facebook\/watchman,facebook\/watchman,nodakai\/watchman,nodakai\/watchman,wez\/watchman,kwlzn\/watchman,kwlzn\/watchman,wez\/watchman,wez\/watchman,wez\/watchman,nodakai\/watchman,nodakai\/watchman","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/argv.c\n+++ tests\/argv.c\n@@ -14,8 +14,8 @@\n plan_tests(8);\n \n args = json_array();\n- json_array_append_new(args, json_string(\"one\"));\n- json_array_append_new(args, json_string(\"two\"));\n+ json_array_append_new(args, typed_string_to_json(\"one\", W_STRING_UNICODE));\n+ json_array_append_new(args, typed_string_to_json(\"two\", W_STRING_UNICODE));\n ok(json_array_size(args) == 2, \"sanity check array size\");\n \n dupd = w_argv_copy_from_json(args, 0);\n"} {"commit":"b7cb7132a24d7562fa7897468feb5b370af8c36d","subject":"Delete deprecated `::sandbox2::Sandbox2::WaitForTsan` and its remaining call sites.","message":"Delete deprecated `::sandbox2::Sandbox2::WaitForTsan` and its remaining call sites.\n\nPiperOrigin-RevId: 426195145\nChange-Id: Ia7c8116a0fb08e2f425d9b89406b446edcf7850a\n","repos":"google\/sandboxed-api,google\/sandboxed-api,google\/sandboxed-api,google\/sandboxed-api","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- sandboxed_api\/sandbox2\/sanitizer.h\n+++ sandboxed_api\/sandbox2\/sanitizer.h\n@@ -50,9 +50,6 @@\n \/\/ under a sanitizer.\n void WaitForSanitizer();\n \n-ABSL_DEPRECATED(\"Use `sandbox2::sanitizer::WaitForSanitizer()`.\")\n-inline void WaitForTsan() { WaitForSanitizer(); }\n-\n \/\/ Sanitizes current process (which will not execve a sandboxed binary).\n \/\/ File-descriptors in fd_exceptions will be either closed\n \/\/ (close_fds == true), or marked as close-on-exec (close_fds == false).\n"} {"commit":"a38cad9de14a00ebdf8e712b572b37825d408655","subject":"tests: improve code coverage for fake camera","message":"tests: improve code coverage for fake camera\n","repos":"AravisProject\/aravis,AravisProject\/aravis,AravisProject\/aravis,AravisProject\/aravis,AravisProject\/aravis","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/fake.c\n+++ tests\/fake.c\n@@ -260,9 +260,19 @@\n }\n \n static void\n+fill_pattern_cb (ArvBuffer *buffer, void *fill_pattern_data, guint32 exposure_time_us, guint32 gain, ArvPixelFormat pixel_format)\n+{\n+\tgint *counter = fill_pattern_data;\n+\n+\t(*counter)++;\n+}\n+\n+static void\n fake_stream_test (void)\n {\n \tArvCamera *camera;\n+\tArvDevice *device;\n+\tArvFakeCamera *fake_camera;\n \tArvStream *stream;\n \tArvBuffer *buffer;\n \tguint64 n_completed_buffers;\n@@ -271,12 +281,21 @@\n \tgint n_input_buffers;\n \tgint n_output_buffers;\n \tgint payload;\n+\tgint counter = 0;\n \n \tcamera = arv_camera_new (\"Fake_1\");\n \tg_assert (ARV_IS_CAMERA (camera));\n \n+\tdevice = arv_camera_get_device (camera);\n+\tg_assert (ARV_IS_DEVICE (device));\n+\n+\tfake_camera = arv_fake_device_get_fake_camera (ARV_FAKE_DEVICE (device));\n+\tg_assert (ARV_IS_FAKE_CAMERA (fake_camera));\n+\n \tstream = arv_camera_create_stream (camera, NULL, NULL);\n \tg_assert (ARV_IS_STREAM (stream));\n+\n+\tarv_fake_camera_set_fill_pattern (fake_camera, fill_pattern_cb, &counter);\n \n \tpayload = arv_camera_get_payload (camera);\n \tarv_stream_push_buffer (stream, arv_buffer_new (payload, NULL));\n@@ -285,6 +304,10 @@\n \tbuffer = arv_stream_pop_buffer (stream);\n \tarv_camera_stop_acquisition (camera);\n \n+\tarv_fake_camera_set_fill_pattern (fake_camera, NULL, NULL);\n+\n+\tg_assert_cmpint (counter, ==, 1);\n+\n \tg_assert (ARV_IS_BUFFER (buffer));\n \n \tarv_stream_get_statistics (stream, &n_completed_buffers, &n_failures, &n_underruns);\n"} {"commit":"bd1478fd45ec2bfa21b80aa75345e7386d452954","subject":"t1ha-mera: add MFC0 and RDHWR clock-sources for MIPS.","message":"t1ha-mera: add MFC0 and RDHWR clock-sources for MIPS.\n","repos":"leo-yuriev\/libfpta,leo-yuriev\/libfpta","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- tests\/mera.c\n+++ tests\/mera.c\n@@ -689,14 +689,49 @@\n }\n #endif \/* __aarch64__ || __ARM_ARCH > 7 || _M_ARM64 *\/\n \n-#if defined(__mips__) && defined(PROT_READ) && defined(MAP_SHARED)\n+#if defined(__mips__) || defined(__mips)\n+\n+#if defined(PROT_READ) && defined(MAP_SHARED)\n static volatile uint64_t *mips_tsc_addr;\n-\n static unsigned clock_zbustimer(timestamp_t *now) {\n compiler_barrier();\n *now = *mips_tsc_addr;\n compiler_barrier();\n return 0;\n+}\n+#endif \/* PROT_READ && MAP_SHARED *\/\n+\n+static unsigned clock_mfc0_25(timestamp_t *now) {\n+ compiler_barrier();\n+ unsigned long count;\n+ __asm __volatile(\"mfc0 %0, $25, 1\" : \"=r\"(count));\n+ *now = count;\n+ compiler_barrier();\n+ return 0;\n+}\n+\n+static unsigned clock_mfc0_9(timestamp_t *now) {\n+ compiler_barrier();\n+ unsigned long count;\n+ __asm __volatile(\"mfc0 %0, $9, 1\" : \"=r\"(count));\n+ *now = count;\n+ compiler_barrier();\n+ return 0;\n+}\n+\n+static unsigned mips_rdhwr_resolution;\n+static unsigned clock_rdhwr(timestamp_t *now) {\n+ compiler_barrier();\n+ unsigned long count;\n+ unsigned coreid;\n+ __asm __volatile(\"rdhwr %0, $2; rdhwr %0, $1\" : \"=r\"(count), \"=r\"(coreid));\n+ *now = count;\n+ compiler_barrier();\n+ return coreid;\n+}\n+\n+static double convert_rdhwr(timestamp_t timestamp) {\n+ return (double)timestamp * mips_rdhwr_resolution;\n }\n \n #endif \/* MIPS *\/\n@@ -1154,7 +1189,29 @@\n \"CNTVCT_EL0\", \"tick\");\n #endif \/* __aarch64__ || __ARM_ARCH > 7 || _M_ARM64 *\/\n \n-#if defined(__mips__) && defined(PROT_READ) && defined(MAP_SHARED)\n+#if defined(__mips__) || defined(__mips)\n+\n+ \/* LY: assume _MIPS_ISA >= 2 *\/\n+ probe(clock_mfc0_9, clock_mfc0_9, convert_1to1,\n+ timestamp_clock_stable | timestamp_clock_cheap | timestamp_cycles,\n+ \"MFC0(9)\", \"cycle\");\n+\n+ if (probe(clock_rdhwr, clock_rdhwr, convert_rdhwr,\n+ timestamp_clock_stable | timestamp_clock_cheap | timestamp_cycles,\n+ \"RDHWR(2)\", \"cycle\")) {\n+ unsigned rdhwr_3;\n+ __asm(\"rdhwr %0, $3\" : \"=r\"(rdhwr_3));\n+ mips_rdhwr_resolution = rdhwr_3;\n+ if (mips_rdhwr_resolution < 2)\n+ mera.convert = convert_1to1;\n+ }\n+\n+ \/* LY: only MIPS32_34K with echo \"3 0x1f 0\" > \/proc\/perf *\/\n+ probe(clock_mfc0_25, clock_mfc0_25, convert_1to1,\n+ timestamp_clock_stable | timestamp_clock_cheap | timestamp_ticks,\n+ \"MFC0(25)\", \"tick\");\n+\n+#if defined(PROT_READ) && defined(MAP_SHARED)\n uint64_t *mips_tsc_addr;\n int mem_fd = open(\"\/dev\/mem\", O_RDONLY | O_SYNC, 0);\n \n@@ -1182,6 +1239,8 @@\n }\n }\n }\n+#endif \/* PROT_READ && MAP_SHARED *\/\n+\n #endif \/* __mips__ *\/\n \n #if defined(__ia32__)\n"} {"commit":"6c50fd163cb7ce67147c8f345d9232d29d91faf7","subject":"performance: add messaging rate at different levels","message":"performance: add messaging rate at different levels\n\nSigned-off-by: S\u00e9bastien Boisvert <1a4d2e25eb5ba040b6ad5779a730a1a8a0ff9bc5@anl.gov>\n","repos":"GeneAssembly\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,GeneAssembly\/biosal,GeneAssembly\/biosal,sebhtml\/biosal,sebhtml\/biosal,sebhtml\/biosal,sebhtml\/biosal,GeneAssembly\/biosal","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- performance\/latency_probe\/process.c\n+++ performance\/latency_probe\/process.c\n@@ -149,12 +149,16 @@\n printf(\"%d nodes, %d worker threads (%d * %d), %d actors (%d * %d)\\n\",\n nodes, workers, nodes, workers_per_node,\n number_of_actors, workers, actors_per_worker);\n- printf(\"Total sent message count: %\" PRIu64 \" (%d * %d) in %\" PRIu64 \" nanoseconds (%f s)\\n\",\n+ printf(\"Total sent message count: %\" PRIu64 \" (%d * %d)\\n\"\n+ \"Time: %\" PRIu64 \" nanoseconds (%f s)\\n\",\n total, number_of_actors,\n EVENT_COUNT, elapsed_time, elapsed_seconds);\n rate = (total + 0.0) \/ elapsed_seconds;\n \n- printf(\"Messaging rate: %f messages \/ second\\n\", rate);\n+ printf(\"Computation messaging rate: %f messages \/ second\\n\", rate);\n+ printf(\"Node messaging rate: %f messages \/ second\\n\", rate \/ nodes);\n+ printf(\"Worker messaging rate: %f messages \/ second\\n\", rate \/ workers);\n+ printf(\"Actor messaging rate: %f messages \/ second\\n\", rate \/ number_of_actors);\n }\n \n printf(\"%d receives ACTION_ASK_TO_STOP\\n\", thorium_actor_name(self));\n"} {"commit":"85bc384554a99df3b864546d182e37b71fa7b881","subject":"Noticed the following error message:","message":"Noticed the following error message:\n\nmount_msdosfs: \/dev\/cf0s1: : Operation not supported by device\n\nand thought I'd fix it to be:\n\nmount_msdosfs: \/dev\/cf0s1: Operation not supported by device\n\nNot sure why errmsg isn't getting filled in, or why this error is even\nhappening at all... (fsck_msdosfs is clean, and I can mount this same\nCF elsewhere).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sbin\/mount_msdosfs\/mount_msdosfs.c\n+++ sbin\/mount_msdosfs\/mount_msdosfs.c\n@@ -218,8 +218,12 @@\n \tbuild_iovec_argf(&iov, &iovlen, \"mask\", \"%u\", mask);\n \tbuild_iovec_argf(&iov, &iovlen, \"dirmask\", \"%u\", dirmask);\n \n-\tif (nmount(iov, iovlen, mntflags) < 0)\n-\t\terr(1, \"%s: %s\", dev, errmsg);\n+\tif (nmount(iov, iovlen, mntflags) < 0) {\n+\t\tif (errmsg[0])\n+\t\t\terr(1, \"%s: %s\", dev, errmsg);\n+\t\telse\n+\t\t\terr(1, \"%s\", dev);\n+\t}\n \n \texit (0);\n }\n"} {"commit":"aefadd1cbaf0bce69ee8760735b659aaeb03bee5","subject":"Move assert to after NULL check, otherwise we deref NULL in the assert.","message":"Move assert to after NULL check, otherwise we deref NULL in the assert.\n\nKlocwork #307\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/_ctypes\/stgdict.c\n+++ Modules\/_ctypes\/stgdict.c\n@@ -208,12 +208,12 @@\n \t\t\tcontinue;\n \t\t}\n \t\tnew_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&CField_Type, NULL);\n-\t\tassert(new_descr->ob_type == &CField_Type);\n \t\tif (new_descr == NULL) {\n \t\t\tPy_DECREF(fdescr);\n \t\t\tPy_DECREF(fieldlist);\n \t\t\treturn -1;\n \t\t}\n+\t\tassert(new_descr->ob_type == &CField_Type);\n \t\tnew_descr->size = fdescr->size;\n \t\tnew_descr->offset = fdescr->offset + offset;\n \t\tnew_descr->index = fdescr->index + index;\n"} {"commit":"029d150c61e967828b91808bf6c3637c776d15b6","subject":"1998-07-14 Ben Elliston <bje@cygnus.com>","message":"1998-07-14 Ben Elliston <bje@cygnus.com>\n\n\t* pthread.h (pthread_attr_init): Add function prototype.\n\t(pthread_attr_destroy): Likewise.\n\t(pthread_attr_setstacksize): Likewise.\n\t(pthread_attr_getstacksize): Likewise.\n\t(pthread_attr_setstackaddr): Likewise.\n\t(pthread_attr_getstackaddr): Likewise.\n","repos":"nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pthread.h\n+++ pthread.h\n@@ -47,6 +47,24 @@\n int pthread_equal(pthread_t t1, pthread_t t2);\n \n int pthread_join(pthread_t thread, void ** valueptr);\n+\n+\/* Functions for manipulating thread attribute objects. *\/\n+\n+int pthread_attr_init(pthread_attr_t *attr);\n+\n+int pthread_attr_destroy(pthread_attr_t *attr);\n+\n+int pthread_attr_setstacksize(pthread_attr_t *attr,\n+\t\t\t size_t stacksize);\n+\n+int pthread_attr_getstacksize(const pthread_attr_t *attr,\n+\t\t\t size_t *stacksize);\n+\n+int pthread_attr_setstackaddr(pthread_attr_t *attr,\n+\t\t\t void *stackaddr);\n+\n+int pthread_attr_getstackaddr(const pthread_attr_t *attr,\n+\t\t\t void **stackaddr);\n \n \/* Functions for manipulating cond. var. attribute objects. *\/\n \n"} {"commit":"22c592f46d618f8178456702d5b85c41af38e3e3","subject":"setTimer etc: actually enable\/disable a timer as per \"enabled\" argument.","message":"setTimer etc: actually enable\/disable a timer as per \"enabled\" argument.\n","repos":"davmac314\/dasynq,davmac314\/dasynq","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- dasynq-timerfd.h\n+++ dasynq-timerfd.h\n@@ -72,6 +72,8 @@\n return 0;\n }\n \n+ \/\/ Set the timerfd timeout to match the first timer in the queue (disable the timerfd\n+ \/\/ if there are no active timers).\n void set_timer_from_queue()\n {\n struct itimerspec newtime;\n@@ -187,9 +189,8 @@\n auto &ts = timer_queue.node_data(timer_id);\n ts.interval_time = interval;\n ts.expiry_count = 0;\n-\n- \/\/ TODO also update interval \/ enabled\n- \n+ ts.enabled = enable;\n+\n if (timer_queue.is_queued(timer_id)) {\n \/\/ Already queued; alter timeout\n if (timer_queue.set_priority(timer_id, timeout)) {\n"} {"commit":"090f72c0368108d035b5ae79ed49fcaa8a777fc9","subject":"added LibraryPtr declaration","message":"added LibraryPtr declaration\n","repos":"whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux,whoozle\/android-file-transfer-linux","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mtp\/metadata\/Library.h\n+++ mtp\/metadata\/Library.h\n@@ -76,6 +76,7 @@\n \t\tAlbumPtr CreateAlbum(ArtistPtr artist, std::string name, int year);\n \t\tObjectId CreateTrack(ArtistPtr artist, AlbumPtr album, ObjectFormat type, std::string name, const std::string & genre, int trackIndex, const std::string &filename, size_t size);\n \t};\n+\tDECLARE_PTR(Library);\n }\n \n #endif\n"} {"commit":"b9252faa24edfb204abfd5d8b1a8d741e041b95f","subject":"Testing of Heawood graph.","message":"Testing of Heawood graph.\n","repos":"MHenderson\/graphs-collection,MHenderson\/graphs-collection","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- tests\/test.c\n+++ tests\/test.c\n@@ -114,6 +114,34 @@\n }\n }\n \n+int init_suite_heawood(void)\n+{\n+ json_error_t error;\n+ if (NULL == (i_file = fopen(\"..\/src\/Classic\/Heawood\/heawood.gml\", \"r\")) ||\n+ (NULL == (json = json_load_file(\"..\/src\/Classic\/Heawood\/heawood_properties.json\", 0, &error)))) {\n+ return -1;\n+ }\n+\n+ else {\n+ igraph_read_graph_gml(&g, i_file);\n+ get_parameter_data();\n+ compute_distance_parameters();\n+ return 0;\n+ }\n+}\n+\n+int clean_suite_heawood(void)\n+{\n+ if (0 != fclose(i_file)) {\n+ return -1;\n+ }\n+ else {\n+ igraph_destroy(&g);\n+ i_file = NULL;\n+ return 0;\n+ }\n+}\n+\n void test_basic_parameters(void)\n {\n CU_ASSERT_EQUAL(igraph_vcount(&g), json_integer_value(vcount));\n@@ -132,6 +160,7 @@\n CU_pSuite pSuite_chvatal = NULL;\n CU_pSuite pSuite_desargues = NULL;\n CU_pSuite pSuite_frucht = NULL;\n+ CU_pSuite pSuite_heawood = NULL;\n \n \/* initialize the CUnit test registry *\/\n if (CUE_SUCCESS != CU_initialize_registry())\n@@ -141,14 +170,16 @@\n pSuite_chvatal = CU_add_suite(\"Chvatal Graph\", init_suite_chvatal, clean_suite_chvatal);\n pSuite_desargues = CU_add_suite(\"Desargues Graph\", init_suite_desargues, clean_suite_desargues);\n pSuite_frucht = CU_add_suite(\"Frucht Graph\", init_suite_frucht, clean_suite_frucht);\n+ pSuite_heawood = CU_add_suite(\"Heawood Graph\", init_suite_heawood, clean_suite_heawood);\n if (NULL == pSuite_chvatal ||\n NULL == pSuite_desargues ||\n- NULL == pSuite_frucht) {\n- CU_cleanup_registry();\n- return CU_get_error();\n- }\n-\n- \/* add the tests to the suite *\/\n+ NULL == pSuite_frucht ||\n+ NULL == pSuite_heawood) {\n+ CU_cleanup_registry();\n+ return CU_get_error();\n+ }\n+\n+ \/* add the tests to the Chvatal suite *\/\n if ((NULL == CU_add_test(pSuite_chvatal, \"Test basic parameters.\", test_basic_parameters)) ||\n (NULL == CU_add_test(pSuite_chvatal, \"Test distance paramters.\", test_distances)))\n {\n@@ -156,7 +187,7 @@\n return CU_get_error();\n }\n \n- \/* add the tests to the suite *\/\n+ \/* add the tests to the Desargues suite *\/\n if ((NULL == CU_add_test(pSuite_desargues, \"Test basic parameters.\", test_basic_parameters)) ||\n (NULL == CU_add_test(pSuite_desargues, \"Test distance paramters.\", test_distances)))\n {\n@@ -164,7 +195,7 @@\n return CU_get_error();\n }\n \n- \/* add the tests to the suite *\/\n+ \/* add the tests to the Frucht suite *\/\n if ((NULL == CU_add_test(pSuite_frucht, \"Test basic parameters.\", test_basic_parameters)) ||\n (NULL == CU_add_test(pSuite_frucht, \"Test distance paramters.\", test_distances)))\n {\n@@ -172,6 +203,13 @@\n return CU_get_error();\n }\n \n+ \/* add the tests to the Heawood suite *\/\n+ if ((NULL == CU_add_test(pSuite_heawood, \"Test basic parameters.\", test_basic_parameters)) ||\n+ (NULL == CU_add_test(pSuite_heawood, \"Test distance paramters.\", test_distances)))\n+ {\n+ CU_cleanup_registry();\n+ return CU_get_error();\n+ }\n \/* Run all tests using the CUnit Basic interface *\/\n CU_basic_set_mode(CU_BRM_VERBOSE);\n CU_curses_run_tests();\n"} {"commit":"f17b00a3d6b47ef20aad796a9201bc37a9d547f2","subject":"tests: Update the sync test with the photo images","message":"tests: Update the sync test with the photo images","repos":"GNOME\/libgfbgraph,GNOME\/libgfbgraph,alvaropg\/gfbgraph,alvaropg\/gfbgraph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- tests\/test.c\n+++ tests\/test.c\n@@ -10,6 +10,11 @@\n gchar *me_name;\n GError *error = NULL;\n GList *albums;\n+ GFBGraphPhoto *photo;\n+ GInputStream *in_stream;\n+ GOutputStream *out_stream;\n+ GFile *out_file;\n+ GFBGraphPhotoImage *smaller;\n \n g_type_init ();\n \n@@ -46,6 +51,36 @@\n albums = g_list_next (albums);\n }\n \n+ photo = gfbgraph_photo_new_from_id (GFBGRAPH_AUTHORIZER (authorizer), \"553619791342827\", &error);\n+ if (error != NULL) {\n+ g_print (\"Error getting photo\\n\");\n+ return -1;\n+ }\n+\n+ smaller = gfbgraph_photo_get_image_near_width (photo, 1);\n+ if (smaller == NULL)\n+ g_error (\"Can't get the smaller image\\n\");\n+ else\n+ g_print (\"%dx%d %s\", smaller->width, smaller->height, smaller->source);\n+\n+ in_stream = gfbgraph_photo_download_default_size (photo, GFBGRAPH_AUTHORIZER (authorizer), NULL);\n+ out_file = g_file_new_for_path (\"\/tmp\/facebook.jpeg\");\n+ out_stream = G_OUTPUT_STREAM (g_file_create (out_file, G_FILE_CREATE_PRIVATE, NULL, &error));\n+ if (error != NULL) {\n+ g_print (\"Error creating temp file\\n\");\n+ return -1;\n+ }\n+\n+ g_output_stream_splice (G_OUTPUT_STREAM (out_stream), in_stream,\n+ G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,\n+ NULL, &error);\n+ if (error != NULL) {\n+ g_print (\"Error splicing streams\\n\");\n+ return -1;\n+ }\n+\n+ g_list_free_full (albums, g_object_unref);\n+ g_clear_object (&me);\n g_clear_object (&authorizer);\n \n return 0;\n"} {"commit":"5bcb782b8aa22e552f3b0cc61f30a2975d073177","subject":"RooObjWrap: avoid putting null pointers into a RooLinkedList","message":"RooObjWrap: avoid putting null pointers into a RooLinkedList\n","repos":"tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot,tc3t\/qoot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- roofit\/roofitcore\/inc\/RooTObjWrap.h\n+++ roofit\/roofitcore\/inc\/RooTObjWrap.h\n@@ -24,7 +24,7 @@\n public:\n \n RooTObjWrap(Bool_t isArray=kFALSE) : _isArray(isArray), _owning(kFALSE) {} ;\n- RooTObjWrap(TObject* inObj, Bool_t isArray=kFALSE) : TNamed(), _isArray(isArray), _owning(kFALSE) { _list.Add(inObj) ; } \n+ RooTObjWrap(TObject* inObj, Bool_t isArray=kFALSE) : TNamed(), _isArray(isArray), _owning(kFALSE) { if (inObj) _list.Add(inObj) ; } \n RooTObjWrap(const RooTObjWrap& other) : TNamed(other), _isArray(other._isArray), _owning(kFALSE), _list(other._list) {}\n virtual ~RooTObjWrap() { if (_owning) _list.Delete() ; } ;\n \n@@ -36,7 +36,7 @@\n if (!_isArray) {\n _list.Clear() ;\n }\n- _list.Add(inObj) ; \n+ if (inObj) _list.Add(inObj) ; \n }\n \n protected:\n"} {"commit":"2f41e08c81f98a769faba2facee0b21847ec844f","subject":"Implement method","message":"Implement method\n","repos":"byeolbit\/3-2_Algorithm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- maxHeap\/maxHeap\/main.c\n+++ maxHeap\/maxHeap\/main.c\n@@ -8,29 +8,33 @@\n \n #include \"Heap.h\"\n \n-void get_menu(struct priority_queue p_queue);\n+void get_menu(struct priority_queue *p_queue);\n struct node get_node();\n \n-int do_insert_node(struct priority_queue p_queue);\n-void do_get_max();\n-void do_extract_max();\n-void do_increase_key();\n-void do_h_delete();\n-\n+int do_insert_node(struct priority_queue *p_queue);\n+int do_get_max(struct priority_queue *p_queue);\n+int do_extract_max(struct priority_queue *p_queue);\n+int do_increase_key(struct priority_queue *p_queue);\n+int do_h_delete(struct priority_queue *p_queue);\n+int check_queue(struct priority_queue *p_queue);\n+int check_exist(struct node target_node);\n \n int main(int argc, const char * argv[]) {\n \n struct priority_queue p_queue;\n \n- p_queue = build_heap_data(open_file(\"\/Users\/josanggyeong\/Dropbox\/\u1112\u1161\u11a8\u1100\u116d\/2016\u1102\u1167\u11ab 3\u1112\u1161\u11a8\u1102\u1167\u11ab 2\u1112\u1161\u11a8\u1100\u1175\/3-2_Algorithm\/maxHeap\/maxHeap\/data03.txt\", \"r+\"));\n- \n- build_max_heap(p_queue);\n- \n- print_queue(p_queue);\n- get_menu(p_queue);\n+ p_queue = build_heap_data(open_file(\"data03.txt\", \"r+\"));\n+ build_max_heap(&p_queue);\n+ print_queue(&p_queue);\n+ printf(\"\\n\uc6d0\ud558\ub294 \uba54\ub274\uc5d0 \ud574\ub2f9\ud558\ub294 \uc22b\uc790\ub97c \uc785\ub825\ud558\uc138\uc694\");\n+ printf(\"\\n--------------------------------------------------------\\n\");\n+ printf(\"1. \uc791\uc5c5 \ucd94\uac00\\t\\t2. \ucd5c\ub300\uac12\\t\\t3. \ucd5c\ub300 \uc6b0\uc120\uc21c\uc704 \uc791\uc5c5 \ucc98\ub9ac\\n\");\n+ printf(\"4. \uc6d0\uc18c \ud0a4\uac12 \uc99d\uac00\\t5. \uc791\uc5c5\uc81c\uac70\\t6. \uc885\ub8cc\\n\");\n+ printf(\"--------------------------------------------------------\\n\");\n+ get_menu(&p_queue);\n }\n \n-void get_menu(struct priority_queue p_queue){\n+void get_menu(struct priority_queue *p_queue){\n int menu_num = -1;\n scanf(\"%d\",&menu_num);\n \n@@ -40,27 +44,30 @@\n menu_num = do_insert_node(p_queue);\n break;\n case 2 :\n- do_get_max();\n- menu_num = -1;\n+ menu_num = do_get_max(p_queue);\n break;\n case 3 :\n- do_extract_max();\n- menu_num = -1;\n+ menu_num = do_extract_max(p_queue);\n break;\n case 4 :\n- do_increase_key();\n- menu_num = -1;\n+ menu_num = do_increase_key(p_queue);\n break;\n case 5:\n- do_h_delete();\n- menu_num = -1;\n+ menu_num = do_h_delete(p_queue);\n break;\n case 6:\n+ free(p_queue->heap);\n exit(0);\n+ case 0:\n+ printf(\"\\n\uc6d0\ud558\ub294 \uba54\ub274\uc5d0 \ud574\ub2f9\ud558\ub294 \uc22b\uc790\ub97c \uc785\ub825\ud558\uc138\uc694\");\n+ printf(\"\\n--------------------------------------------------------\\n\");\n+ printf(\"1. \uc791\uc5c5 \ucd94\uac00\\t\\t2. \ucd5c\ub300\uac12\\t\\t3. \ucd5c\ub300 \uc6b0\uc120\uc21c\uc704 \uc791\uc5c5 \ucc98\ub9ac\\n\");\n+ printf(\"4. \uc6d0\uc18c \ud0a4\uac12 \uc99d\uac00\\t5. \uc791\uc5c5\uc81c\uac70\\t6. \uc885\ub8cc\\n\");\n+ printf(\"--------------------------------------------------------\\n\");\n+ scanf(\"%d\",&menu_num);\n break;\n- case -1:\n- printf(\"\\n\uc785\ub825 \uc624\ub958\uc785\ub2c8\ub2e4. \uc6d0\ud558\ub294 \uba54\ub274\uc5d0 \ud574\ub2f9\ud558\ub294 \uc22b\uc790\ub97c \uc785\ub825\ud558\uc138\uc694\");\n default:\n+ printf(\"\\n\uc798\ubabb\ub41c \uc785\ub825\uc785\ub2c8\ub2e4. \uc6d0\ud558\ub294 \uba54\ub274\uc5d0 \ud574\ub2f9\ud558\ub294 \uc22b\uc790\ub97c \uc785\ub825\ud558\uc138\uc694\");\n printf(\"\\n--------------------------------------------------------\\n\");\n printf(\"1. \uc791\uc5c5 \ucd94\uac00\\t\\t2. \ucd5c\ub300\uac12\\t\\t3. \ucd5c\ub300 \uc6b0\uc120\uc21c\uc704 \uc791\uc5c5 \ucc98\ub9ac\\n\");\n printf(\"4. \uc6d0\uc18c \ud0a4\uac12 \uc99d\uac00\\t5. \uc791\uc5c5\uc81c\uac70\\t6. \uc885\ub8cc\\n\");\n@@ -68,7 +75,7 @@\n scanf(\"%d\",&menu_num);\n break;\n }\n- } while (menu_num == -1);\n+ } while (1);\n \n }\n \n@@ -80,26 +87,101 @@\n return new_node;\n }\n \n-int do_insert_node(struct priority_queue p_queue){\n+int do_insert_node(struct priority_queue *p_queue){\n \n int new_key;\n char new_value[4096];\n \n- printf(\"\ub2e4\uc74c\uc758 \ud615\uc2dd\uc73c\ub85c \ucd94\uac00\ud560 \uc791\uc5c5\uc744 \uc785\ub825\ud574\uc8fc\uc138\uc694. \uc6b0\uc120\uc21c\uc704, \uc791\uc5c5\uc774\ub984\\n\");\n+ printf(\"\ub2e4\uc74c\uc758 \ud615\uc2dd\uc73c\ub85c \ucd94\uac00\ud560 \uc791\uc5c5\uc744 \uc785\ub825\ud574\uc8fc\uc138\uc694.\\n\ud615\uc2dd : \uc6b0\uc120\uc21c\uc704, \uc791\uc5c5\uc774\ub984\\n\");\n scanf(\"%d, %s\",&new_key, new_value);\n insert(p_queue, get_node(new_key, new_value));\n+ print_queue(p_queue);\n \n- return 1;\n+ return 0;\n }\n-void do_get_max(){\n+\n+int do_get_max(struct priority_queue *p_queue){\n+ \n+ if(check_queue(p_queue)) return 0;\n+ \n+ printf(\"\ucd5c\ub300 \uc6b0\uc120\uc21c\uc704 \uc791\uc5c5\uc740 : %d, %s \uc785\ub2c8\ub2e4.\\n\\n\",max(p_queue).key, max(p_queue).value);\n+ print_queue(p_queue);\n+ \n+ return 0;\n \n }\n-void do_extract_max(){\n+\n+int do_extract_max(struct priority_queue *p_queue){\n+ \n+ if(check_queue(p_queue)) return 0;\n+ \n+ struct node extracted = extract_max(p_queue);\n+ \n+ printf(\"\ucc98\ub9ac\ub41c \uc791\uc5c5 : %d, %s\\n\", extracted.key, extracted.value);\n+ print_queue(p_queue);\n+ \n+ return 0;\n \n }\n-void do_increase_key(){\n+\n+int do_increase_key(struct priority_queue *p_queue){\n+ \n+ if(check_queue(p_queue)) return 0;\n+ \n+ struct node increased;\n+ \n+ int key;\n+ int inc;\n+ \n+ printf(\"\uc6b0\uc120\uc21c\uc704\ub97c \uc99d\uac00\uc2dc\ud0a4\uace0 \uc2f6\uc740 \uc791\uc5c5\uc758 \uc6b0\uc120\uc21c\uc704\uc640, \uc99d\uac00\uce58\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.\\n\ud615\uc2dd : \uc6b0\uc120\uc21c\uc704, \uc99d\uac00\ub7c9\\n\");\n+ scanf(\"%d, %d\",&key, &inc);\n+ increased = increase_key(p_queue, key, inc);\n+ \n+ if(check_exist(increased)) return 0;\n+ \n+ printf(\"\uc791\uc5c5 \uacb0\uacfc : %d, %s\\n\",increased.key, increased.value);\n+ \n+ print_queue(p_queue);\n+ \n+ return 0;\n+\n+}\n+\n+int check_exist(struct node target_node) {\n+ if(target_node.key == -1){\n+ printf(\"\uc874\uc7ac\ud558\uc9c0 \uc54a\ub294 \uc791\uc5c5\uc785\ub2c8\ub2e4.\\n\");\n+ return 1;\n+ }\n+ \n+ return 0;\n+}\n+\n+int do_h_delete(struct priority_queue *p_queue){\n+ \n+ if(check_queue(p_queue)) return 0;\n+\n+ struct node deleted;\n+ \n+ int key;\n+ \n+ printf(\"\uc0ad\uc81c\ud558\uace0 \uc2f6\uc740 \uc791\uc5c5\uc758 \uc6b0\uc120\uc21c\uc704\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.\\n\");\n+ scanf(\"%d\",&key);\n+ deleted = h_delete(p_queue, key);\n+ \n+ if(check_exist(deleted)) return 0;\n+ \n+ printf(\"\uc0ad\uc81c\ub41c \uc791\uc5c5 : %d, %s\\n\",deleted.key, deleted.value);\n+ \n+ print_queue(p_queue);\n+ \n+ return 0;\n \n }\n-void do_h_delete(){\n- \n+\n+int check_queue(struct priority_queue *p_queue) {\n+ if(p_queue->size == 0){\n+ printf(\"\ub354 \uc774\uc0c1 \ucc98\ub9ac\ud560 \uc791\uc5c5\ubaa9\ub85d\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.\\n\");\n+ return 1;\n+ }\n+ return 0;\n }\n"} {"commit":"cf96be60dc225603b14c97570596db4f482ef070","subject":"py\/misc.h: Typo fix in comment.","message":"py\/misc.h: Typo fix in comment.\n","repos":"MrSurly\/micropython,infinnovation\/micropython,deshipu\/micropython,micropython\/micropython-esp32,micropython\/micropython-esp32,toolmacher\/micropython,torwag\/micropython,pramasoul\/micropython,toolmacher\/micropython,pozetroninc\/micropython,torwag\/micropython,chrisdearman\/micropython,henriknelson\/micropython,TDAbboud\/micropython,MrSurly\/micropython-esp32,ryannathans\/micropython,pfalcon\/micropython,MrSurly\/micropython,Peetz0r\/micropython-esp32,oopy\/micropython,adafruit\/micropython,selste\/micropython,bvernoux\/micropython,cwyark\/micropython,MrSurly\/micropython,PappaPeppar\/micropython,pramasoul\/micropython,selste\/micropython,SHA2017-badge\/micropython-esp32,adafruit\/micropython,trezor\/micropython,deshipu\/micropython,kerneltask\/micropython,SHA2017-badge\/micropython-esp32,dmazzella\/micropython,blazewicz\/micropython,henriknelson\/micropython,tobbad\/micropython,ryannathans\/micropython,chrisdearman\/micropython,blazewicz\/micropython,dmazzella\/micropython,mhoffma\/micropython,TDAbboud\/micropython,HenrikSolver\/micropython,adafruit\/micropython,torwag\/micropython,ryannathans\/micropython,puuu\/micropython,pfalcon\/micropython,HenrikSolver\/micropython,adafruit\/circuitpython,alex-robbins\/micropython,swegener\/micropython,SHA2017-badge\/micropython-esp32,Peetz0r\/micropython-esp32,Timmenem\/micropython,MrSurly\/micropython-esp32,SHA2017-badge\/micropython-esp32,torwag\/micropython,adafruit\/circuitpython,selste\/micropython,oopy\/micropython,dmazzella\/micropython,Peetz0r\/micropython-esp32,oopy\/micropython,infinnovation\/micropython,deshipu\/micropython,swegener\/micropython,lowRISC\/micropython,ryannathans\/micropython,trezor\/micropython,ryannathans\/micropython,tobbad\/micropython,alex-robbins\/micropython,pramasoul\/micropython,pfalcon\/micropython,toolmacher\/micropython,pozetroninc\/micropython,TDAbboud\/micropython,hiway\/micropython,Peetz0r\/micropython-esp32,MrSurly\/micropython,toolmacher\/micropython,PappaPeppar\/micropython,AriZuu\/micropython,HenrikSolver\/micropython,hiway\/micropython,dmazzella\/micropython,Peetz0r\/micropython-esp32,oopy\/micropython,PappaPeppar\/micropython,tuc-osg\/micropython,cwyark\/micropython,lowRISC\/micropython,tobbad\/micropython,TDAbboud\/micropython,infinnovation\/micropython,MrSurly\/micropython-esp32,mhoffma\/micropython,SHA2017-badge\/micropython-esp32,swegener\/micropython,selste\/micropython,pramasoul\/micropython,micropython\/micropython-esp32,tralamazza\/micropython,swegener\/micropython,chrisdearman\/micropython,puuu\/micropython,HenrikSolver\/micropython,infinnovation\/micropython,hiway\/micropython,bvernoux\/micropython,tralamazza\/micropython,chrisdearman\/micropython,cwyark\/micropython,chrisdearman\/micropython,bvernoux\/micropython,tobbad\/micropython,AriZuu\/micropython,adafruit\/circuitpython,henriknelson\/micropython,oopy\/micropython,pozetroninc\/micropython,selste\/micropython,TDAbboud\/micropython,tuc-osg\/micropython,alex-robbins\/micropython,PappaPeppar\/micropython,henriknelson\/micropython,MrSurly\/micropython-esp32,bvernoux\/micropython,MrSurly\/micropython,Timmenem\/micropython,adafruit\/micropython,AriZuu\/micropython,infinnovation\/micropython,bvernoux\/micropython,micropython\/micropython-esp32,deshipu\/micropython,mhoffma\/micropython,swegener\/micropython,PappaPeppar\/micropython,pozetroninc\/micropython,pfalcon\/micropython,lowRISC\/micropython,tuc-osg\/micropython,HenrikSolver\/micropython,trezor\/micropython,hiway\/micropython,kerneltask\/micropython,lowRISC\/micropython,alex-robbins\/micropython,puuu\/micropython,blazewicz\/micropython,henriknelson\/micropython,puuu\/micropython,alex-robbins\/micropython,AriZuu\/micropython,Timmenem\/micropython,cwyark\/micropython,tuc-osg\/micropython,tralamazza\/micropython,adafruit\/circuitpython,Timmenem\/micropython,torwag\/micropython,mhoffma\/micropython,cwyark\/micropython,puuu\/micropython,blazewicz\/micropython,tralamazza\/micropython,adafruit\/micropython,AriZuu\/micropython,toolmacher\/micropython,mhoffma\/micropython,deshipu\/micropython,kerneltask\/micropython,adafruit\/circuitpython,trezor\/micropython,adafruit\/circuitpython,kerneltask\/micropython,Timmenem\/micropython,pfalcon\/micropython,tuc-osg\/micropython,micropython\/micropython-esp32,trezor\/micropython,blazewicz\/micropython,pramasoul\/micropython,tobbad\/micropython,MrSurly\/micropython-esp32,hiway\/micropython,kerneltask\/micropython,pozetroninc\/micropython,lowRISC\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- py\/misc.h\n+++ py\/misc.h\n@@ -46,7 +46,7 @@\n #define MAX(x, y) ((x) > (y) ? (x) : (y))\n #endif\n \n-\/** memomry allocation ******************************************\/\n+\/** memory allocation ******************************************\/\n \n \/\/ TODO make a lazy m_renew that can increase by a smaller amount than requested (but by at least 1 more element)\n \n"} {"commit":"3a072a6a909c3f3070ad5d73972c7cc8188ed83e","subject":"Use the correct enums in struct sysinit.","message":"Use the correct enums in struct sysinit.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/sys\/kernel.h\n+++ sys\/sys\/kernel.h\n@@ -203,8 +203,8 @@\n typedef void (*sysinit_cfunc_t) __P((const void *));\n \n struct sysinit {\n-\tunsigned int\tsubsystem;\t\t\/* subsystem identifier*\/\n-\tunsigned int\torder;\t\t\t\/* init order within subsystem*\/\n+\tenum sysinit_sub_id\tsubsystem;\t\/* subsystem identifier*\/\n+\tenum sysinit_elem_order\torder;\t\t\/* init order within subsystem*\/\n \tsysinit_cfunc_t func;\t\t\t\/* function\t\t*\/\n \tconst void\t*udata;\t\t\t\/* multiplexer\/argument *\/\n };\n"} {"commit":"ada22b6b57ed791e8f62fb6331426894e56c89aa","subject":"Add fprintf test","message":"Add fprintf test\n","repos":"anpar\/lingi1141-projet","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- chat\/read_write_loop.c\n+++ chat\/read_write_loop.c\n@@ -60,6 +60,7 @@\n fprintf(stderr, \"Reading from the socket and writing on stdout.\\n\");\n fwrite(buf, 1, 1, f);\n }\n+ fprintf(stderr, \"Stop writing on stdout.\\n\");\n \n fclose(f);\n }\n@@ -70,14 +71,15 @@\n fprintf(stderr, \"Reading from stdin and writing on the socket.\\n\");\n write(sfd, buf, 1);\n }\n- \n+ fprintf(stderr, \"Stop writing on the socket.\\n\");\n+\n eof_reached = 1;\n fclose(f);\n }\n }\n \n \/* Un fd est disponible en \u00e9criture *\/\n- if(fds[i].revents & POLLOUT) {\n+ if(fds[i].revents & POLLWRNORM) {\n fprintf(stderr, \"fd[%d] disponible en \u00e9criture.\\n\", i);\n \/* Ce fd est le socket *\/\n if(i == 0) {\n@@ -86,6 +88,7 @@\n fprintf(stderr, \"Reading from stdin and writing on socket.\\n\");\n write(sfd, buf, 1);\n }\n+ fprintf(stderr, \"Stop writing on socket.\\n\"); \n \n eof_reached = 1;\n fclose(f);\n@@ -97,6 +100,7 @@\n fprintf(stderr, \"Reading from socket and writing on stdout.\\n\");\n fwrite(buf, 1, 1, f);\n }\n+ fprintf(stderr, \"Stop writing on stdout.\\n\"); \n \n fclose(f);\n }\n"} {"commit":"dd0730bca0487a0ff532f4a8be60fc1a5aee0dcf","subject":"Added Transform conversion operator","message":"Added Transform conversion operator\n","repos":"luky1971\/DiamondUtils,luky1971\/DiamondUtils","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/D_Transform2.h\n+++ include\/D_Transform2.h\n@@ -27,14 +27,22 @@\n RTYPE rotation;\n \n Transform2() : position(), rotation() {}\n- Transform2(Vector2<PTYPE> position) : position(position), rotation() {}\n- Transform2(Vector2<PTYPE> position, RTYPE rotation) : position(position), rotation(rotation) {}\n+ Transform2(Vector2<PTYPE> position) \n+ : position(position), rotation() {}\n+ Transform2(Vector2<PTYPE> position, RTYPE rotation) \n+ : position(position), rotation(rotation) {}\n \n \n void reset() {\n position = Vector2<PTYPE>();\n rotation = RTYPE();\n }\n+\n+ \/\/ Conversion operator\n+ template <typename P, typename R>\n+ operator Transform2<P, R>() const { \n+ return Transform2<P, R>(position, rotation);\n+ }\n };\n }\n \n"} {"commit":"d7cfcb763504a847465122e34d3e0f020a60fc80","subject":"Converted indents to spaces","message":"Converted indents to spaces\n","repos":"luky1971\/DiamondUtils,luky1971\/DiamondUtils","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/D_swapvector.h\n+++ include\/D_swapvector.h\n@@ -21,12 +21,12 @@\n #include \"D_typedefs.h\"\n \n namespace Diamond {\n-\t\/**\n-\t A contiguous vector data structure with O(1) deletion at any point and \n+ \/**\n+ A contiguous vector data structure with O(1) deletion at any point and \n ID references that are guaranteed valid for the lifetime of a referred element.\n-\t Access is O(1) but with higher constant factor than std::vector.\n-\t Does not maintain order of elements, and uses O(n) auxiliary space.\n-\t*\/\n+ Access is O(1) but with higher constant factor than std::vector.\n+ Does not maintain order of elements, and uses O(n) auxiliary space.\n+ *\/\n template <class T>\n class swapvector {\n public:\n"} {"commit":"df2b869d9c7603789b11648452e3063e16d7bcca","subject":"Give each task its own task ID.","message":"Give each task its own task ID.\n\nThis corresponds roughly to, and was inspired by, r18815 for FIFO tasking. It\nmakes the main task's ID distinct from the ID corresponding to no task and,\nmore importantly, it gives each task its own ID. (A program's tasks should\ncertainly have individual IDs, whether or not the tasking layer can run said\ntasks in parallel.)\n\n\ngit-svn-id: 88467cb1fb04b8a755be7e1ee1026be4190196ef@18818 3a8e244f-b0f2-452b-bcba-4c88e055c3ca\n","repos":"chizarlicious\/chapel,CoryMcCartan\/chapel,hildeth\/chapel,sungeunchoi\/chapel,hildeth\/chapel,CoryMcCartan\/chapel,sungeunchoi\/chapel,chizarlicious\/chapel,chizarlicious\/chapel,CoryMcCartan\/chapel,sungeunchoi\/chapel,CoryMcCartan\/chapel,chizarlicious\/chapel,chizarlicious\/chapel,CoryMcCartan\/chapel,CoryMcCartan\/chapel,sungeunchoi\/chapel,hildeth\/chapel,chizarlicious\/chapel,sungeunchoi\/chapel,hildeth\/chapel,CoryMcCartan\/chapel,chizarlicious\/chapel,hildeth\/chapel,sungeunchoi\/chapel,sungeunchoi\/chapel,sungeunchoi\/chapel,hildeth\/chapel,hildeth\/chapel","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- runtime\/src\/tasks\/none\/tasks-none.c\n+++ runtime\/src\/tasks\/none\/tasks-none.c\n@@ -21,9 +21,10 @@\n typedef struct chpl_pool_struct* chpl_task_pool_p;\n \n typedef struct chpl_pool_struct {\n+ chpl_taskID_t id; \/\/ task identifier\n chpl_fn_p fun; \/\/ function to call for task\n void* arg; \/\/ argument to the function\n- chpl_bool serial_state; \/\/ whether new threads can be created while executing fun\n+ chpl_bool serial_state; \/\/ whether new tasks can be created while executing fun\n chpl_task_pool_p next;\n } task_pool_t;\n \n@@ -81,6 +82,8 @@\n \n \/\/ Tasks\n \n+static chpl_taskID_t next_taskID = chpl_nullTaskID + 1;\n+static chpl_taskID_t curr_taskID;\n static chpl_bool serial_state;\n static uint64_t taskCallStackSize = 0;\n \n@@ -115,8 +118,10 @@\n }\n taskCallStackSize = callStackSize;\n \n+ curr_taskID = next_taskID++;\n+ serial_state = false;\n+\n task_pool_head = task_pool_tail = NULL;\n- serial_state = false;\n queued_cnt = 0;\n }\n \n@@ -149,9 +154,11 @@\n \/\/ save and restore current task's serial state before and after\n \/\/ invoking new task\n \/\/\n+ chpl_taskID_t saved_taskID = curr_taskID;\n chpl_bool saved_serial_state = chpl_task_getSerial();\n (*fp)(a);\n chpl_task_setSerial(saved_serial_state);\n+ curr_taskID = saved_taskID;\n } else {\n \/\/ create a task from the given function pointer and arguments\n \/\/ and append it to the end of the task pool for later execution\n@@ -160,6 +167,7 @@\n task = (chpl_task_pool_p)chpl_alloc(sizeof(task_pool_t),\n CHPL_RT_MD_TASK_DESCRIPTOR,\n 0, 0);\n+ task->id = next_taskID++;\n task->fun = fp;\n task->arg = a;\n task->serial_state = serial_state;\n@@ -176,7 +184,7 @@\n }\n }\n \n-chpl_taskID_t chpl_task_getId(void) { return 0; }\n+chpl_taskID_t chpl_task_getId(void) { return curr_taskID; }\n \n void chpl_task_yield(void) {\n }\n@@ -208,6 +216,7 @@\n \n static chpl_bool\n launch_next_task(void) {\n+ chpl_taskID_t saved_taskID;\n chpl_bool saved_serial_state;\n \n if (task_pool_head) {\n@@ -221,8 +230,9 @@\n queued_cnt--;\n \n \/\/\n- \/\/ reset serial state\n- \/\/\n+ \/\/ set state to reflect new state\n+ \/\/\n+ saved_taskID = curr_taskID;\n saved_serial_state = chpl_task_getSerial();\n chpl_task_setSerial(task->serial_state);\n \n@@ -230,9 +240,10 @@\n chpl_free(task, 0, 0);\n \n \/\/\n- \/\/ restore serial state\n+ \/\/ restore state\n \/\/\n chpl_task_setSerial(saved_serial_state);\n+ curr_taskID = saved_taskID;\n \n return true;\n } else {\n"} {"commit":"af3519a3850d971fda76954afd2084a6e830d25c","subject":"Change the use of a reserved color space entry","message":"Change the use of a reserved color space entry\n\nThis commit rename a reserved color space entry to BT_2020, it intends\nto provide support for VP9 bitstream to pass along the color space\ntype defined in BT.2020(Rec.2020)\n\nplease note this entry does not have any effect on encoding\/decoding\nbehavior, but allow applications to the pass the information along\nfrom encoding end to decoding end.\n\nChange-Id: I4678520e89141ea5e8900f7bd1c0e95b710b7091\n","repos":"kleopatra999\/webm.libvpx,thdav\/aom,running770\/libvpx,openpeer\/libvpx_new,VTCSecureLLC\/libvpx,abwiz0086\/webm.libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/libvpx,matanbs\/webm.libvpx,kleopatra999\/webm.libvpx,hsueceumd\/test_hui,Laknot\/libvpx,mwgoldsmith\/libvpx,liqianggao\/libvpx,pcwalton\/libvpx,abwiz0086\/webm.libvpx,Laknot\/libvpx,jmvalin\/aom,felipebetancur\/libvpx,altogother\/webm.libvpx,Topopiccione\/libvpx,shacklettbp\/aom,shyamalschandra\/libvpx,thdav\/aom,charup\/https---github.com-webmproject-libvpx-,kim42083\/webm.libvpx,matanbs\/webm.libvpx,mwgoldsmith\/vpx,kalli123\/webm.libvpx,mwgoldsmith\/vpx,Maria1099\/webm.libvpx,kim42083\/webm.libvpx,pcwalton\/libvpx,shyamalschandra\/libvpx,luctrudeau\/aom,pcwalton\/libvpx,shyamalschandra\/libvpx,running770\/libvpx,mbebenita\/aom,stewnorriss\/libvpx,felipebetancur\/libvpx,goodleixiao\/vpx,matanbs\/vp982,openpeer\/libvpx_new,goodleixiao\/vpx,webmproject\/libvpx,mwgoldsmith\/vpx,Acidburn0zzz\/webm.libvpx,jmvalin\/aom,altogother\/webm.libvpx,GrokImageCompression\/aom,zofuthan\/libvpx,Suvarna1488\/webm.libvpx,Topopiccione\/libvpx,luctrudeau\/aom,mwgoldsmith\/vpx,Acidburn0zzz\/webm.libvpx,shyamalschandra\/libvpx,webmproject\/libvpx,luctrudeau\/aom,lyx2014\/libvpx_c,mbebenita\/aom,jdm\/libvpx,kalli123\/webm.libvpx,smarter\/aom,Topopiccione\/libvpx,shareefalis\/libvpx,stewnorriss\/libvpx,liqianggao\/libvpx,GrokImageCompression\/aom,mbebenita\/aom,kalli123\/webm.libvpx,mbebenita\/aom,liqianggao\/libvpx,mbebenita\/aom,Suvarna1488\/webm.libvpx,ShiftMediaProject\/libvpx,iniwf\/webm.libvpx,stewnorriss\/libvpx,iniwf\/webm.libvpx,ShiftMediaProject\/libvpx,matanbs\/vp982,matanbs\/webm.libvpx,zofuthan\/libvpx,abwiz0086\/webm.libvpx,mwgoldsmith\/vpx,Acidburn0zzz\/webm.libvpx,stewnorriss\/libvpx,shyamalschandra\/libvpx,webmproject\/libvpx,zofuthan\/libvpx,altogother\/webm.libvpx,gshORTON\/webm.libvpx,altogother\/webm.libvpx,ShiftMediaProject\/libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,goodleixiao\/vpx,running770\/libvpx,felipebetancur\/libvpx,altogother\/webm.libvpx,matanbs\/webm.libvpx,mbebenita\/aom,reimaginemedia\/webm.libvpx,VTCSecureLLC\/libvpx,kim42083\/webm.libvpx,kim42083\/webm.libvpx,mbebenita\/aom,reimaginemedia\/webm.libvpx,thdav\/aom,Laknot\/libvpx,jacklicn\/webm.libvpx,gshORTON\/webm.libvpx,jmvalin\/aom,jmvalin\/aom,mbebenita\/aom,webmproject\/libvpx,jacklicn\/webm.libvpx,Distrotech\/libvpx,mwgoldsmith\/libvpx,VTCSecureLLC\/libvpx,GrokImageCompression\/aom,goodleixiao\/vpx,Topopiccione\/libvpx,smarter\/aom,shacklettbp\/aom,running770\/libvpx,thdav\/aom,Maria1099\/webm.libvpx,lyx2014\/libvpx_c,felipebetancur\/libvpx,goodleixiao\/vpx,ShiftMediaProject\/libvpx,matanbs\/vp982,ittiamvpx\/libvpx-1,lyx2014\/libvpx_c,Suvarna1488\/webm.libvpx,kleopatra999\/webm.libvpx,pcwalton\/libvpx,charup\/https---github.com-webmproject-libvpx-,kalli123\/webm.libvpx,hsueceumd\/test_hui,matanbs\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,shareefalis\/libvpx,kim42083\/webm.libvpx,webmproject\/libvpx,matanbs\/vp982,lyx2014\/libvpx_c,jdm\/libvpx,charup\/https---github.com-webmproject-libvpx-,Topopiccione\/libvpx,stewnorriss\/libvpx,iniwf\/webm.libvpx,Maria1099\/webm.libvpx,liqianggao\/libvpx,VTCSecureLLC\/libvpx,openpeer\/libvpx_new,ShiftMediaProject\/libvpx,lyx2014\/libvpx_c,Distrotech\/libvpx,mwgoldsmith\/libvpx,kim42083\/webm.libvpx,gshORTON\/webm.libvpx,GrokImageCompression\/aom,jdm\/libvpx,shacklettbp\/aom,ittiamvpx\/libvpx-1,Suvarna1488\/webm.libvpx,Acidburn0zzz\/webm.libvpx,stewnorriss\/libvpx,VTCSecureLLC\/libvpx,matanbs\/vp982,charup\/https---github.com-webmproject-libvpx-,hsueceumd\/test_hui,jdm\/libvpx,zofuthan\/libvpx,hsueceumd\/test_hui,shareefalis\/libvpx,ittiamvpx\/libvpx-1,matanbs\/webm.libvpx,GrokImageCompression\/aom,kleopatra999\/webm.libvpx,gshORTON\/webm.libvpx,felipebetancur\/libvpx,luctrudeau\/aom,reimaginemedia\/webm.libvpx,goodleixiao\/vpx,jmvalin\/aom,liqianggao\/libvpx,gshORTON\/webm.libvpx,liqianggao\/libvpx,openpeer\/libvpx_new,smarter\/aom,lyx2014\/libvpx_c,GrokImageCompression\/aom,shyamalschandra\/libvpx,smarter\/aom,thdav\/aom,shareefalis\/libvpx,jacklicn\/webm.libvpx,hsueceumd\/test_hui,jmvalin\/aom,Laknot\/libvpx,running770\/libvpx,kalli123\/webm.libvpx,mwgoldsmith\/vpx,VTCSecureLLC\/libvpx,altogother\/webm.libvpx,webmproject\/libvpx,iniwf\/webm.libvpx,kalli123\/webm.libvpx,Topopiccione\/libvpx,Distrotech\/libvpx,smarter\/aom,openpeer\/libvpx_new,Acidburn0zzz\/webm.libvpx,reimaginemedia\/webm.libvpx,smarter\/aom,shareefalis\/libvpx,openpeer\/libvpx_new,Suvarna1488\/webm.libvpx,abwiz0086\/webm.libvpx,abwiz0086\/webm.libvpx,Laknot\/libvpx,jdm\/libvpx,shacklettbp\/aom,gshORTON\/webm.libvpx,ittiamvpx\/libvpx-1,zofuthan\/libvpx,Distrotech\/libvpx,ittiamvpx\/libvpx-1,Laknot\/libvpx,jacklicn\/webm.libvpx,jacklicn\/webm.libvpx,shacklettbp\/aom,ittiamvpx\/libvpx-1,jdm\/libvpx,thdav\/aom,zofuthan\/libvpx,mbebenita\/aom,charup\/https---github.com-webmproject-libvpx-,pcwalton\/libvpx,shacklettbp\/aom,matanbs\/vp982,running770\/libvpx,Suvarna1488\/webm.libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,Maria1099\/webm.libvpx,matanbs\/vp982,reimaginemedia\/webm.libvpx,mwgoldsmith\/libvpx,Maria1099\/webm.libvpx,Acidburn0zzz\/webm.libvpx,jacklicn\/webm.libvpx,reimaginemedia\/webm.libvpx,hsueceumd\/test_hui,Maria1099\/webm.libvpx,pcwalton\/libvpx,Distrotech\/libvpx,felipebetancur\/libvpx,kleopatra999\/webm.libvpx,abwiz0086\/webm.libvpx,Distrotech\/libvpx,kleopatra999\/webm.libvpx,shareefalis\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp9\/common\/vp9_enums.h\n+++ vp9\/common\/vp9_enums.h\n@@ -104,7 +104,7 @@\n BT_709 = 2, \/\/ YUV\n SMPTE_170 = 3, \/\/ YUV\n SMPTE_240 = 4, \/\/ YUV\n- RESERVED_1 = 5,\n+ BT_2020 = 5, \/\/ YUV\n RESERVED_2 = 6,\n SRGB = 7 \/\/ RGB\n } COLOR_SPACE;\n"} {"commit":"36f83d06b50ff9a8bd1dec1a6c8a558b0e2472d0","subject":"Argument promotion for function calls","message":"Argument promotion for function calls\n","repos":"bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler,bobrippling\/ucc-c-compiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/cc1\/ops\/expr_funcall.c\n+++ src\/cc1\/ops\/expr_funcall.c\n@@ -203,12 +203,21 @@\n \t\t\tgen_expr(e->expr, stab);\n \n \t\tif(e->funcargs){\n+\t\t\tdecl *dint = decl_new_type(type_int);\n+\t\t\tconst int int_sz = decl_size(dint);\n \t\t\texpr **aiter;\n \n \t\t\tfor(aiter = e->funcargs; *aiter; aiter++, nargs++);\n \n-\t\t\tfor(aiter--; aiter >= e->funcargs; aiter--)\n-\t\t\t\tgen_expr(*aiter, stab);\n+\t\t\tfor(aiter--; aiter >= e->funcargs; aiter--){\n+\t\t\t\texpr *earg = *aiter;\n+\n+\t\t\t\tgen_expr(earg, stab);\n+\n+\t\t\t\t\/* each arg needs casting up to int size, if smaller *\/\n+\t\t\t\tif(decl_size(earg->tree_type) < int_sz)\n+\t\t\t\t\tout_cast(earg->tree_type, dint);\n+\t\t\t}\n \t\t}\n \n \t\tout_call(nargs, e->tree_type);\n"} {"commit":"805fb7699df246a608fae602d2a508983d94d52e","subject":"Reserve extra byte in LoadDataFromFile() in case caller wants to append '\\0'","message":"Reserve extra byte in LoadDataFromFile() in case caller wants to append '\\0'\n","repos":"amitdo\/tesseract,amitdo\/tesseract,tesseract-ocr\/tesseract,tesseract-ocr\/tesseract,tesseract-ocr\/tesseract,UB-Mannheim\/tesseract,amitdo\/tesseract,UB-Mannheim\/tesseract,UB-Mannheim\/tesseract,amitdo\/tesseract,jbarlow83\/tesseract,stweil\/tesseract,stweil\/tesseract,UB-Mannheim\/tesseract,jbarlow83\/tesseract,amitdo\/tesseract,tesseract-ocr\/tesseract,tesseract-ocr\/tesseract,stweil\/tesseract,stweil\/tesseract,stweil\/tesseract,jbarlow83\/tesseract,jbarlow83\/tesseract,UB-Mannheim\/tesseract,jbarlow83\/tesseract","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/ccutil\/genericvector.h\n+++ src\/ccutil\/genericvector.h\n@@ -375,6 +375,8 @@\n fseek(fp, 0, SEEK_SET);\n \/\/ Trying to open a directory on Linux sets size to LONG_MAX. Catch it here.\n if (size > 0 && size < LONG_MAX) {\n+ \/\/ reserve an extra byte in case caller wants to append a '\\0' character\r\n+ data->reserve(size + 1);\r\n data->resize_no_init(size);\n result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size;\n }\n"} {"commit":"8ab8eab662df7841f355a347d1063b3b767bf6ae","subject":"* killed a compiler warning","message":"* killed a compiler warning\n","repos":"duydb2\/olsr,diogomg\/olsrd-binary-heap,brabander\/olsr,zioproto\/olsrd-gsoc2012,zioproto\/olsrd-gsoc2012,cl4u2\/olsrd-wot-pgp,ninuxorg\/olsrd,duydb2\/olsr,zioproto\/olsrd-gsoc2012,acinonyx\/olsrd,sebkur\/olsrd,servalproject\/olsr,duydb2\/olsr,zioproto\/olsrd-gsoc2012,zioproto\/olsrd,sebkur\/olsrd,diogomg\/olsrd,sauloqueiroz\/incremental-spf,ninuxorg\/olsrd,duydb2\/olsr,zioproto\/olsrd-gsoc2012,sebkur\/olsrd,sauloqueiroz\/incremental-spf,sebkur\/olsrd,nolith\/olsrd,diogomg\/olsrd,zioproto\/olsrd,duydb2\/olsr,ralisi\/olsrd_cl_roam,zioproto\/olsrd-gsoc2012,duydb2\/olsr,diogomg\/olsrd,tdz\/olsrd,tdz\/olsrd,cholin\/olsrd,ninuxorg\/olsrd,diogomg\/olsrd,duydb2\/olsr,ralisi\/olsrd_cl_roam,diogomg\/olsrd,zioproto\/olsrd,diogomg\/olsrd-binary-heap,cl4u2\/olsrd-wot-pgp,ralisi\/olsrd_cl_roam,diogomg\/olsrd,acinonyx\/olsrd,servalproject\/olsr,acinonyx\/olsrd,duydb2\/olsr,servalproject\/olsr,zioproto\/olsrd,cholin\/olsrd,cl4u2\/olsrd-wot-pgp,diogomg\/olsrd-binary-heap,diogomg\/olsrd-binary-heap,sauloqueiroz\/incremental-spf,cholin\/olsrd,nolith\/olsrd,servalproject\/olsr,brabander\/olsr,ninuxorg\/olsrd,nolith\/olsrd,ralisi\/olsrd_cl_roam,brabander\/olsr,ninuxorg\/olsrd,nolith\/olsrd,servalproject\/olsr,sauloqueiroz\/incremental-spf,acinonyx\/olsrd,cholin\/olsrd,diogomg\/olsrd-binary-heap,cholin\/olsrd,servalproject\/olsr,zioproto\/olsrd,cl4u2\/olsrd-wot-pgp,tdz\/olsrd,diogomg\/olsrd-binary-heap,nolith\/olsrd,acinonyx\/olsrd,brabander\/olsr,cl4u2\/olsrd-wot-pgp,tdz\/olsrd,tdz\/olsrd,sebkur\/olsrd,sebkur\/olsrd,diogomg\/olsrd-binary-heap,diogomg\/olsrd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/cfgparser\/olsrd_conf.c\n+++ src\/cfgparser\/olsrd_conf.c\n@@ -36,7 +36,7 @@\n * to the project. For more information see the website or contact\n * the copyright holders.\n *\n- * $Id: olsrd_conf.c,v 1.50 2006\/09\/14 08:03:29 kattemat Exp $\n+ * $Id: olsrd_conf.c,v 1.51 2007\/03\/14 13:59:30 bernd67 Exp $\n *\/\n \n \n@@ -103,7 +103,7 @@\n struct olsr_if *in, *new_ifqueue, *in_tmp;\n \n \/* Stop the compiler from complaining *\/\n- strlen(copyright_string);\n+ (void)strlen(copyright_string);\n \n cnf = malloc(sizeof(struct olsrd_config));\n if (cnf == NULL)\n"} {"commit":"fd6cf9010b522019a4434ebd02fb447b567e7131","subject":"Turn transmit fifo overwritable in no DTR mode","message":"Turn transmit fifo overwritable in no DTR mode\n","repos":"hathach\/tinyusb,hathach\/tinyusb,hathach\/tinyusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/class\/cdc\/cdc_device.c\n+++ src\/class\/cdc\/cdc_device.c\n@@ -197,7 +197,7 @@\n \n \/\/ config fifo\n tu_fifo_config(&p_cdc->rx_ff, p_cdc->rx_ff_buf, TU_ARRAY_SIZE(p_cdc->rx_ff_buf), 1, false);\n- tu_fifo_config(&p_cdc->tx_ff, p_cdc->tx_ff_buf, TU_ARRAY_SIZE(p_cdc->tx_ff_buf), 1, false);\n+ tu_fifo_config(&p_cdc->tx_ff, p_cdc->tx_ff_buf, TU_ARRAY_SIZE(p_cdc->tx_ff_buf), 1, true);\n \n #if CFG_FIFO_MUTEX\n tu_fifo_config_mutex(&p_cdc->rx_ff, osal_mutex_create(&p_cdc->rx_ff_mutex));\n@@ -354,6 +354,9 @@\n bool const rts = tu_bit_test(request->wValue, 1);\n \n p_cdc->line_state = (uint8_t) request->wValue;\n+\n+ \/\/ Disable fifo overwriting if DTR bit is set\n+ p_cdc->tx_ff.overwritable = dtr ? false : true;\n \n TU_LOG2(\" Set Control Line State: DTR = %d, RTS = %d\\r\\n\", dtr, rts);\n \n"} {"commit":"e54d9d10af40f4d83410f1e9cd94c47138c7fe7f","subject":"Add const","message":"Add const\n","repos":"hathach\/tinyusb,hathach\/tinyusb,hathach\/tinyusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/class\/dfu\/dfu_device.c\n+++ src\/class\/dfu\/dfu_device.c\n@@ -158,7 +158,7 @@\n {\n if (_dfu_state_ctx.state == APP_DETACH)\n {\n- _dfu_state_ctx.state = DFU_IDLE;\n+ _dfu_state_ctx.state = DFU_IDLE;\n } else {\n switch (_dfu_state_ctx.state)\n {\n@@ -210,7 +210,7 @@\n \n if ( TUSB_DESC_FUNCTIONAL == tu_desc_type(p_desc) )\n {\n- tusb_desc_dfu_functional_t *dfu_desc = (tusb_desc_dfu_functional_t *)p_desc;\n+ tusb_desc_dfu_functional_t const *dfu_desc = (tusb_desc_dfu_functional_t const *)p_desc;\n _dfu_state_ctx.attrs = (uint8_t)dfu_desc->bAttributes;\n \n drv_len += tu_desc_len(p_desc);\n"} {"commit":"f050d3e5b5628c58792e827674d10f6ae317f1aa","subject":"Removed C++11 dependency","message":"Removed C++11 dependency\n","repos":"rjhogan\/Adept-2,rjhogan\/Adept-2,rjhogan\/Adept-2","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/adept\/reduce.h\n+++ include\/adept\/reduce.h\n@@ -105,6 +105,8 @@\n \/\/ Sum enables the \"sum\" function that sums its arguments.\n template <typename T>\n struct Sum {\n+ \/\/ What is the type of the running total?\n+ typedef T total_type;\n \/\/ Do we need to do anything to the final summed value(s)?\n static const bool finish_needed = false;\n \/\/ Do we need to do anything to the final summed value(s) in the\n@@ -142,6 +144,7 @@\n \/\/ dividing the final result by the number of elements averaged.\n template <typename T>\n struct Mean {\n+ typedef T total_type;\n static const bool finish_needed = true;\n static const bool active_finish_needed = true;\n const char* name() { return \"mean\"; }\n@@ -165,6 +168,7 @@\n \/\/ arguments together.\n template <typename T>\n struct Product {\n+ typedef T total_type;\n static const bool finish_needed = false;\n static const bool active_finish_needed = false;\n const char* name() { return \"product\"; }\n@@ -189,6 +193,7 @@\n \/\/ MaxVal enables the \"maxval\" function that returns the maximum value\n template <typename T>\n struct MaxVal {\n+ typedef T total_type;\n static const bool finish_needed = false;\n static const bool active_finish_needed = false;\n const char* name() { return \"maxval\"; }\n@@ -217,6 +222,7 @@\n \/\/ MinVal enables the \"minval\" function that returns the minimum value\n template <typename T>\n struct MinVal {\n+ typedef T total_type;\n static const bool finish_needed = false;\n static const bool active_finish_needed = false;\n const char* name() { return \"minval\"; }\n@@ -238,11 +244,12 @@\n void finish(X& total, const Index& n) { }\n void finish_active(Active<T>& total, const Index& n) { }\n };\n-\n+ \n \/\/ Norm2 enables the \"norm2\" function that returns the L-2 norm of\n \/\/ its arguments, equal to sqrt(sum(rhs*rhs))\n template <typename T>\n struct Norm2 {\n+ typedef T total_type;\n static const bool finish_needed = true;\n static const bool active_finish_needed = true;\n const char* name() { return \"norm2\"; }\n@@ -278,6 +285,7 @@\n \/\/ the bool elements of the right hand side are true. It would be\n \/\/ faster if it could quit after finding the first \"false\".\n struct All {\n+ typedef bool total_type;\n static const bool finish_needed = false;\n const char* name() { return \"all\"; }\n bool first_value() { return true; }\n@@ -291,6 +299,7 @@\n \/\/ the bool elements of the right hand side are true. It would be\n \/\/ faster if it could quite after finding the first \"true\".\n struct Any {\n+ typedef bool total_type;\n static const bool finish_needed = false;\n const char* name() { return \"any\"; }\n bool first_value() { return false; }\n@@ -303,6 +312,7 @@\n \/\/ Count enables the \"count\" function that returns the number of\n \/\/ \"true\" elements in a bool array.\n struct Count {\n+ typedef Index total_type;\n static const bool finish_needed = false;\n const char* name() { return \"count\"; }\n Index first_value() { return 0; }\n@@ -317,10 +327,10 @@\n \/\/ -------------------------------------------------------------------\n \n \/\/ Reduce an entire inactive array\n- template <class Func, typename Type, class E, typename TotalType = Type>\n+ template <class Func, typename Type, class E>\n inline\n- TotalType reduce(const Expression<Type, E>& rhs) {\n- TotalType total;\n+ typename Func::total_type reduce(const Expression<Type, E>& rhs) {\n+ typename Func::total_type total;\n Func f;\n ExpressionSize<E::rank> dims;\n \/\/ Check right hand side is a valid expression\n@@ -364,10 +374,10 @@\n }\n \n \/\/ Reduce the specified dimension of an inactive array of rank > 1\n- template <class Func, typename Type, class E, typename TotalType>\n+ template <class Func, typename Type, class E>\n inline\n void reduce(const Expression<Type, E>& rhs, int reduce_dim,\n-\t\tArray<E::rank-1,TotalType,false>& total) {\n+\t\tArray<E::rank-1,typename Func::total_type,false>& total) {\n Func f;\n ExpressionSize<E::rank> dims;\n if (!rhs.get_dimensions(dims)) {\n@@ -713,7 +723,7 @@\n \/\/ Index\n template <class E>\n inline Index count(const Expression<bool, E>& rhs)\n- { return reduce<Count,bool,E,Index>(rhs); }\n+ { return reduce<Count>(rhs); }\n \n template <class E>\n inline Array<E::rank-1,Index,false>\n"} {"commit":"458fe633df7827f5b74c034026b6b67045c1e610","subject":"data-device: fix memory leak","message":"data-device: fix memory leak\n","repos":"swaywm\/wlroots,SirCmpwn\/wlroots,ascent12\/wlroots,swaywm\/wlroots,ascent12\/wlroots","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- types\/wlr_data_device.c\n+++ types\/wlr_data_device.c\n@@ -645,6 +645,7 @@\n \t}\n \n \tif (!drag->is_pointer_grab && !is_touch_grab) {\n+\t\tfree(drag);\n \t\treturn true;\n \t}\n \n"} {"commit":"643862995b841add74fe42d76fec7c1d75ea787f","subject":"Added Color(A)::hex(A) static creation methods","message":"Added Color(A)::hex(A) static creation methods\n","repos":"morbozoo\/sonyHeadphones,morbozoo\/sonyHeadphones,sosolimited\/Cinder,sosolimited\/Cinder,2666hz\/Cinder,2666hz\/Cinder,morbozoo\/sonyHeadphones,2666hz\/Cinder,sosolimited\/Cinder,2666hz\/Cinder,morbozoo\/sonyHeadphones,sosolimited\/Cinder","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/cinder\/Color.h\n+++ include\/cinder\/Color.h\n@@ -182,6 +182,15 @@\n \t\treturn ColorT<T>( value, value, value );\n \t}\n \n+\t\/\/! Returns a color from a hexadecimal-encoded RGB triple. For example, red is 0xFF0000\n+\tstatic ColorT<T> hex( uint32_t hexValue )\n+\t{\n+\t\tuint8_t red = ( hexValue >> 16 ) & 255;\n+\t\tuint8_t green = ( hexValue >> 8 ) & 255;\n+\t\tuint8_t blue = hexValue & 255;\t\t\n+\t\treturn ColorT<T>( CHANTRAIT<T>::convert( red ), CHANTRAIT<T>::convert( green ), CHANTRAIT<T>::convert( blue ) );\n+\t}\n+\n \toperator T*(){ return (T*) this; }\n \toperator const T*() const { return (const T*) this; }\n };\n@@ -327,9 +336,28 @@\n \t\treturn ColorAT<T>( CHANTRAIT<T>::max(), CHANTRAIT<T>::max(), CHANTRAIT<T>::max(), CHANTRAIT<T>::max() );\n \t}\n \n-\tstatic ColorAT<T> gray( T value )\n-\t{\n-\t\treturn ColorAT<T>( value, value, value, CHANTRAIT<T>::max() );\n+\tstatic ColorAT<T> gray( T value, T alpha = CHANTRAIT<T>::max() )\n+\t{\n+\t\treturn ColorAT<T>( value, value, value, alpha );\n+\t}\n+\n+\t\/\/! Returns a ColorA from a hexadecimal-encoded RGB triple. For example, red is 0xFF0000\n+\tstatic ColorAT<T> hex( uint32_t hexValue )\n+\t{\n+\t\tuint8_t red = ( hexValue >> 16 ) & 255;\n+\t\tuint8_t green = ( hexValue >> 8 ) & 255;\n+\t\tuint8_t blue = hexValue & 255;\t\t\n+\t\treturn ColorAT<T>( CHANTRAIT<T>::convert( red ), CHANTRAIT<T>::convert( green ), CHANTRAIT<T>::convert( blue ), CHANTRAIT<T>::max() );\n+\t}\n+\n+\t\/\/! Returns a ColorA from a hexadecimal-encoded ARGB ordering. For example, 50% transparent red is 0x80FF0000\n+\tstatic ColorAT<T> hexA( uint32_t hexValue )\n+\t{\n+\t\tuint8_t alpha = ( hexValue >> 24 ) & 255;;\n+\t\tuint8_t red = ( hexValue >> 16 ) & 255;\n+\t\tuint8_t green = ( hexValue >> 8 ) & 255;\n+\t\tuint8_t blue = hexValue & 255;\n+\t\treturn ColorAT<T>( CHANTRAIT<T>::convert( red ), CHANTRAIT<T>::convert( green ), CHANTRAIT<T>::convert( blue ), CHANTRAIT<T>::convert( alpha ) );\n \t}\n \n \toperator T*(){ return (T*) this; }\n"} {"commit":"8be835a0287ddd4fb0b61438eb7c5182b64ff4ae","subject":"Fix stack API prototypes","message":"Fix stack API prototypes\n","repos":"rsfreitas\/libcollections,rsfreitas\/libcollections,rsfreitas\/libcollections,rsfreitas\/libcollections,rsfreitas\/libcollections,rsfreitas\/libcollections","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/cl\/cl_cstack.h\n+++ include\/cl\/cl_cstack.h\n@@ -34,7 +34,7 @@\n #endif\n \n \/**\n- * @name cl_cstack_stack_ref\n+ * @name cl_cstack_ref\n * @brief Increases the reference count for a cl_cstack_t item.\n *\n * @param [in,out] cstack: The circular stack item.\n@@ -42,10 +42,10 @@\n * @return On success returns the item itself with its reference count\n * increased or NULL otherwise.\n *\/\n-cl_cstack_t *cl_cstack_stack_ref(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_unref\n+cl_cstack_t *cl_cstack_ref(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_unref\n * @brief Decreases the reference count for a cl_cstack_t item.\n *\n * When its reference count drops to 0, the item is finalized (its memory is\n@@ -55,10 +55,10 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_unref(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_create\n+int cl_cstack_unref(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_create\n * @brief Creates a new circular stack object.\n *\n * This function creates a new circular stack to manipulate all kind of data\n@@ -92,16 +92,16 @@\n *\n * @return On success a void object will be returned or NULL otherwise.\n *\/\n-cl_cstack_t *cl_cstack_stack_create(unsigned int size,\n- void (*unref_node)(void *),\n- int (*compare_to)(cl_stack_node_t *,\n- cl_stack_node_t *),\n- int (*filter)(cl_stack_node_t *, void *),\n- int (*equals)(cl_stack_node_t *,\n- cl_stack_node_t *));\n-\n-\/**\n- * @name cl_cstack_stack_destroy\n+cl_cstack_t *cl_cstack_create(unsigned int size,\n+ void (*unref_node)(void *),\n+ int (*compare_to)(cl_stack_node_t *,\n+ cl_stack_node_t *),\n+ int (*filter)(cl_stack_node_t *, void *),\n+ int (*equals)(cl_stack_node_t *,\n+ cl_stack_node_t *));\n+\n+\/**\n+ * @name cl_cstack_destroy\n * @brief Releases a void from memory.\n *\n * When releasing a node from the stack, the \\a free_data function passed while\n@@ -111,20 +111,20 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_destroy(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_size\n+int cl_cstack_destroy(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_size\n * @brief Gets the circular stack size.\n *\n * @param [in] cstack: The circular stack object.\n *\n * @return On success returns the size of the stack or -1 otherwise.\n *\/\n-int cl_cstack_stack_size(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_push\n+int cl_cstack_size(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_push\n * @brief Inserts an element into the circular stack.\n *\n * Whe the circular stack reaches its limit, the older element will be removed\n@@ -136,11 +136,11 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_push(cl_cstack_t *cstack, const void *data,\n- unsigned int data_size);\n-\n-\/**\n- * @name cl_cstack_stack_pop\n+int cl_cstack_push(cl_cstack_t *cstack, const void *data,\n+ unsigned int data_size);\n+\n+\/**\n+ * @name cl_cstack_pop\n * @brief Retrieves and removes the head of the circular stack.\n *\n * @param [in,out] cstack: The circular stack object.\n@@ -148,10 +148,10 @@\n * @return On success returns the node shifted off the stack, and the user is\n * responsible for releasing it, or NULL otherwise.\n *\/\n-cl_stack_node_t *cl_cstack_stack_pop(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_map\n+cl_stack_node_t *cl_cstack_pop(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_map\n * @brief Maps a function to every node on a circular stack.\n *\n * The \\a foo function receives as arguments a node from the stack and some\n@@ -167,12 +167,12 @@\n * @return If \\a foo returns a non-zero returns a new reference to the current\n * node. If not returns NULL.\n *\/\n-cl_stack_node_t *cl_cstack_stack_map(cl_cstack_t *cstack,\n- int (*foo)(cl_stack_node_t *, void *),\n- void *data);\n-\n-\/**\n- * @name cl_cstack_stack_map_indexed\n+cl_stack_node_t *cl_cstack_map(cl_cstack_t *cstack,\n+ int (*foo)(cl_stack_node_t *, void *),\n+ void *data);\n+\n+\/**\n+ * @name cl_cstack_map_indexed\n * @brief Maps a function to every node on a circular stack.\n *\n * The \\a foo function receives as arguments the current node index inside the\n@@ -188,14 +188,14 @@\n * @return If \\a foo returns a non-zero returns a new reference to the current\n * node. If not returns NULL.\n *\/\n-cl_stack_node_t *cl_cstack_stack_map_indexed(cl_cstack_t *cstack,\n- int (*foo)(unsigned int,\n- cl_stack_node_t *,\n- void *),\n- void *data);\n-\n-\/**\n- * @name cl_cstack_stack_map_reverse\n+cl_stack_node_t *cl_cstack_map_indexed(cl_cstack_t *cstack,\n+ int (*foo)(unsigned int,\n+ cl_stack_node_t *,\n+ void *),\n+ void *data);\n+\n+\/**\n+ * @name cl_cstack_map_reverse\n * @brief Maps a functions to every onde on a circular stack from the end to\n * the top.\n *\n@@ -212,13 +212,13 @@\n * @return If \\a foo returns a non-zero returns a new reference to the current\n * node. If not returns NULL.\n *\/\n-cl_stack_node_t *cl_cstack_stack_map_reverse(cl_cstack_t *cstack,\n- int (*foo)(cl_stack_node_t *,\n- void *),\n- void *data);\n-\n-\/**\n- * @name cl_cstack_stack_map_reverse_indexed\n+cl_stack_node_t *cl_cstack_map_reverse(cl_cstack_t *cstack,\n+ int (*foo)(cl_stack_node_t *,\n+ void *),\n+ void *data);\n+\n+\/**\n+ * @name cl_cstack_map_reverse_indexed\n * @brief Maps a function to every node on a circular stack from the end to the\n * top.\n *\n@@ -235,14 +235,14 @@\n * @return If \\a foo returns a non-zero returns a new reference to the current\n * node. If not returns NULL.\n *\/\n-cl_stack_node_t *cl_cstack_stack_map_reverse_indexed(cl_cstack_t *cstack,\n- int (*foo)(unsigned int,\n- cl_stack_node_t *,\n- void *),\n- void *data);\n-\n-\/**\n- * @name cl_cstack_stack_at\n+cl_stack_node_t *cl_cstack_map_reverse_indexed(cl_cstack_t *cstack,\n+ int (*foo)(unsigned int,\n+ cl_stack_node_t *,\n+ void *),\n+ void *data);\n+\n+\/**\n+ * @name cl_cstack_at\n * @brief Gets a pointer to a specific node inside a circular stack.\n *\n * On a successful call the node reference must be 'unreferenced'.\n@@ -252,10 +252,10 @@\n *\n * @return On success returns a reference to the node or NULL otherwise.\n *\/\n-cl_stack_node_t *cl_cstack_stack_at(cl_cstack_t *cstack, unsigned int index);\n-\n-\/**\n- * @name cl_cstack_stack_delete\n+cl_stack_node_t *cl_cstack_at(cl_cstack_t *cstack, unsigned int index);\n+\n+\/**\n+ * @name cl_cstack_delete\n * @brief Deletes elements from a circular stack according a specific filter\n * function.\n *\n@@ -268,10 +268,10 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_delete(cl_cstack_t *cstack, void *data);\n-\n-\/**\n- * @name cl_cstack_stack_delete_indexed\n+int cl_cstack_delete(cl_cstack_t *cstack, void *data);\n+\n+\/**\n+ * @name cl_cstack_delete_indexed\n * @brief Deletes an element from a circular stack at a specific position.\n *\n * @param [in,out] cstack: The circular stack object.\n@@ -279,20 +279,20 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_delete_indexed(cl_cstack_t *cstack, unsigned int index);\n-\n-\/**\n- * @name cl_cstack_stack_move\n+int cl_cstack_delete_indexed(cl_cstack_t *cstack, unsigned int index);\n+\n+\/**\n+ * @name cl_cstack_move\n * @brief Moves all elements from a circular stack to another.\n *\n * @param [in] cstack: The original void object.\n *\n * @return Returns the new circular stack.\n *\/\n-cl_cstack_t *cl_cstack_stack_move(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_filter\n+cl_cstack_t *cl_cstack_move(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_filter\n * @brief Extracts elements from a circular stack according a specific filter.\n *\n * If the filter function returns a positive value the element will be extracted.\n@@ -305,10 +305,10 @@\n * @return Returns a circular stack containing all extracted elements from the\n * original stack.\n *\/\n-cl_cstack_t *cl_cstack_stack_filter(cl_cstack_t *cstack, void *data);\n-\n-\/**\n- * @name cl_cstack_stack_sort\n+cl_cstack_t *cl_cstack_filter(cl_cstack_t *cstack, void *data);\n+\n+\/**\n+ * @name cl_cstack_sort\n * @brief Sort all elements from a circular stack.\n *\n * This function uses the \\a compare_to function to compare two elements from\n@@ -318,10 +318,10 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_sort(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_indexof\n+int cl_cstack_sort(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_indexof\n * @brief Gets the index of the first occurrence of an element inside the\n * circular stack.\n *\n@@ -333,11 +333,10 @@\n *\n * @return Returns the element index or -1 if it is not found.\n *\/\n-int cl_cstack_stack_indexof(cl_cstack_t *cstack, void *element,\n- unsigned int size);\n-\n-\/**\n- * @name cl_cstack_stack_last_indexof\n+int cl_cstack_indexof(cl_cstack_t *cstack, void *element, unsigned int size);\n+\n+\/**\n+ * @name cl_cstack_last_indexof\n * @brief Gets the index of the last occurrence of an element inside the\n * circular stack.\n *\n@@ -349,11 +348,11 @@\n *\n * @return Returns the element index or -1 if it is not found.\n *\/\n-int cl_cstack_stack_last_indexof(cl_cstack_t *cstack, void *element,\n- unsigned int size);\n-\n-\/**\n- * @name cl_cstack_stack_contains\n+int cl_cstack_last_indexof(cl_cstack_t *cstack, void *element,\n+ unsigned int size);\n+\n+\/**\n+ * @name cl_cstack_contains\n * @brief Checks if a circular stack contains a specific element.\n *\n * This function uses the \\a equals function to compare objects from the stack.\n@@ -364,11 +363,10 @@\n *\n * @return Returns true if the element is found or false otherwise.\n *\/\n-bool cl_cstack_stack_contains(cl_cstack_t *cstack, void *element,\n- unsigned int size);\n-\n-\/**\n- * @name cl_cstack_stack_peek\n+bool cl_cstack_contains(cl_cstack_t *cstack, void *element, unsigned int size);\n+\n+\/**\n+ * @name cl_cstack_peek\n * @brief Retrieves, but does not remove, the head of the circular stack.\n *\n * On a successful call the node reference must be 'unreferenced'.\n@@ -378,20 +376,20 @@\n * @return Returns NULL if the stack is empty or a new reference to the head\n * of it.\n *\/\n-cl_stack_node_t *cl_cstack_stack_peek(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_is_empty\n+cl_stack_node_t *cl_cstack_peek(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_is_empty\n * @brief Tests to see if the circular stack is empty or not.\n *\n * @param [in] cstack: The circular stack object.\n *\n * @return Returns true if the stack is empty or false otherwise.\n *\/\n-bool cl_cstack_stack_is_empty(cl_cstack_t *cstack);\n-\n-\/**\n- * @name cl_cstack_stack_set_compare_to\n+bool cl_cstack_is_empty(cl_cstack_t *cstack);\n+\n+\/**\n+ * @name cl_cstack_set_compare_to\n * @brief Updates the internal object compare function.\n *\n * @param [in] cstack: The circular stack object.\n@@ -399,12 +397,12 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_set_compare_to(cl_cstack_t *cstack,\n- int (*compare_to)(cl_stack_node_t *,\n- cl_stack_node_t *));\n-\n-\/**\n- * @name cl_cstack_stack_set_filter\n+int cl_cstack_set_compare_to(cl_cstack_t *cstack,\n+ int (*compare_to)(cl_stack_node_t *,\n+ cl_stack_node_t *));\n+\n+\/**\n+ * @name cl_cstack_set_filter\n * @brief Updates the internal filter function.\n *\n * @param [in] cstack: The circular stack object.\n@@ -412,11 +410,11 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_set_filter(cl_cstack_t *cstack,\n- int (*filter)(cl_stack_node_t *, void *));\n-\n-\/**\n- * @name cl_cstack_stack_set_equals\n+int cl_cstack_set_filter(cl_cstack_t *cstack,\n+ int (*filter)(cl_stack_node_t *, void *));\n+\n+\/**\n+ * @name cl_cstack_set_equals\n * @brief Updates the internal equals function.\n *\n * @param [in] cstack: The circular stack object.\n@@ -424,9 +422,8 @@\n *\n * @return On success returns 0 or -1 otherwise.\n *\/\n-int cl_cstack_stack_set_equals(cl_cstack_t *cstack,\n- int (*equals)(cl_stack_node_t *,\n- cl_stack_node_t *));\n+int cl_cstack_set_equals(cl_cstack_t *cstack,\n+ int (*equals)(cl_stack_node_t *, cl_stack_node_t *));\n \n #endif\n \n"} {"commit":"289ccde0c4f576a485afd63da09de6fdcbcd6496","subject":"Change name of enum's value due to clash with ncurses define","message":"Change name of enum's value due to clash with ncurses define\n","repos":"newsboat\/newsboat,newsboat\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,newsboat\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,der-lyse\/newsboat,newsboat\/newsboat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/configparser.h\n+++ include\/configparser.h\n@@ -9,7 +9,7 @@\n namespace newsboat {\n \n enum class action_handler_status {\n-\tOK = 0,\n+\tVALID = 0,\n \tINVALID_PARAMS,\n \tTOO_FEW_PARAMS,\n \tINVALID_COMMAND,\n"} {"commit":"73329c8df9d59691a8be642f7b07a93ae92b9962","subject":"remove alignenum flag -- rely on clients to add it as needed","message":"remove alignenum flag -- rely on clients to add it as needed\n\nBug: skia:\nChange-Id: Ic4ee895c3d04c7d22aee026859f84c65e1252505\nReviewed-on: https:\/\/skia-review.googlesource.com\/c\/166563\nCommit-Queue: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\nReviewed-by: Mike Reed <f5cabf8735907151a446812c9875d6c0c712d847@google.com>\n","repos":"Hikari-no-Tenshi\/android_external_skia,google\/skia,Hikari-no-Tenshi\/android_external_skia,google\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,google\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,rubenvb\/skia,google\/skia,HalCanary\/skia-hc,google\/skia,rubenvb\/skia,aosp-mirror\/platform_external_skia,rubenvb\/skia,HalCanary\/skia-hc,google\/skia,aosp-mirror\/platform_external_skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,Hikari-no-Tenshi\/android_external_skia,HalCanary\/skia-hc,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,rubenvb\/skia,rubenvb\/skia,google\/skia,google\/skia,HalCanary\/skia-hc,aosp-mirror\/platform_external_skia,HalCanary\/skia-hc,rubenvb\/skia,Hikari-no-Tenshi\/android_external_skia,Hikari-no-Tenshi\/android_external_skia,aosp-mirror\/platform_external_skia,google\/skia,HalCanary\/skia-hc,google\/skia,Hikari-no-Tenshi\/android_external_skia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/core\/SkPaint.h\n+++ include\/core\/SkPaint.h\n@@ -50,8 +50,6 @@\n class SkTextBlobRunIterator;\n class SkTypeface;\n \n-#define SK_SUPPORT_LEGACY_PAINTALIGNENUM\n-\n \/** \\class SkPaint\n SkPaint controls options applied when drawing and measuring. SkPaint collects all\n options outside of the SkCanvas clip and SkCanvas matrix.\n"} {"commit":"92b4486abb1fc496ced208887ad029cdc42c7427","subject":"mmc_device_darwin: Use IO_OBJECT_NULL","message":"mmc_device_darwin: Use IO_OBJECT_NULL\n\nWhere appropriate use IO_OBJECT_NULL instead of 0.\n","repos":"ShiftMediaProject\/libaacs,ShiftMediaProject\/libaacs","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/file\/mmc_device_darwin.c\n+++ src\/file\/mmc_device_darwin.c\n@@ -279,7 +279,7 @@\n \n assert (NULL != servp);\n \n- *servp = 0;\n+ *servp = IO_OBJECT_NULL;\n \n if (!matchingDict) {\n BD_DEBUG(DBG_MMC, \"Could not create a matching dictionary for IOBDServices\\n\");\n@@ -315,7 +315,7 @@\n \n *servp = service;\n \n- return (service) ? 0 : -1;\n+ return (service != IO_OBJECT_NULL) ? 0 : -1;\n }\n \n static int iokit_find_interfaces (MMCDEV *mmc, io_service_t service) {\n"} {"commit":"8719499679a393ed575d17758e6b19fdbf467b2b","subject":"Was unneccessarily including apps\/support\/command.h and thus causing an unnecessary dependency on application-specific code from within a library.","message":"Was unneccessarily including apps\/support\/command.h and thus causing an\nunnecessary dependency on application-specific code from within a library.\n\n\ngit-svn-id: 28d9401aa571d5108e51b194aae6f24ca5964c06@1035 8cc4aa7f-3514-0410-904f-f2cc9021211c\n","repos":"crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS,crystalspace\/CS","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/csws\/cswsaux.h\n+++ include\/csws\/cswsaux.h\n@@ -27,7 +27,6 @@\n #include <string.h>\n \n #include \"version.h\"\n-#include \"apps\/support\/command.h\"\n #include \"csengine\/camera.h\"\n #include \"csengine\/polygon.h\"\n #include \"csengine\/sector.h\"\n"} {"commit":"744f5b2648c8d6a1f2afea37ce77040f399d8d5c","subject":"update","message":"update\n","repos":"oska874\/cCode,oska874\/cCode,oska874\/cCode,oska874\/cCode,oska874\/cCode","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- time\/time1.c\n+++ time\/time1.c\n@@ -32,7 +32,19 @@\n struct tms tms0;\n time_t te0;\n int ret;\n+ int i;\n+ struct timespec timeres[10];\n+ struct timespec timeres2[10];\n \n+ clockid_t clocks[] = {\n+ CLOCK_REALTIME,\n+ CLOCK_MONOTONIC,\/*\u5355\u8c03\u65f6\u95f4\uff0c\u4f46\u662f\u53d7ntp\u5f71\u54cd\uff08adjtime\uff09*\/\n+ CLOCK_MONOTONIC_RAW,\/*\u57fa\u4e8e\u786c\u4ef6\u65f6\u95f4\u7684\u539f\u59cb\u65f6\u95f4\uff0c\u7edd\u5bf9\u5355\u8c03*\/\n+ CLOCK_MONOTONIC_COARSE,\/*\u4f4e\u7cbe\u5ea6\u5355\u8c03\u65f6\u95f4*\/\n+ CLOCK_PROCESS_CPUTIME_ID,\/*\u672c\u8fdb\u7a0b\u5230\u5f53\u524d\u4ee3\u7801\u7cfb\u7edfCPU\u82b1\u8d39\u7684\u65f6\u95f4*\/\n+ CLOCK_THREAD_CPUTIME_ID,\n+ (clockid_t) -1 };\n+\n te0 = time(NULL);\n \n ret = gettimeofday(&tv0,NULL);\n@@ -44,7 +56,7 @@\n if ((clock_t)ret == -1)\n perror(\"clock gettime fail \");\n \n- printf(\"clk per sec %d\\n\",sysconf(_SC_CLK_TCK));\n+ printf(\"clk per sec %ld\\n\",sysconf(_SC_CLK_TCK));\n ret = times(&tms0);\n if(ret<0)\n perror(\"times fail \");\n@@ -54,30 +66,33 @@\n printf(\"tp sec %ld nsec %ld\\n\",tp0.tv_sec,tp0.tv_nsec);\n printf(\"tms sec %ld usec %ld\\n\",tms0.tms_utime,tms0.tms_stime);\n \n- clockid_t clocks[] = {\n- CLOCK_REALTIME,\n- CLOCK_MONOTONIC,\n- CLOCK_PROCESS_CPUTIME_ID,\n- CLOCK_THREAD_CPUTIME_ID,\n- (clockid_t) -1 };\n-\n- int i;\n+ for (i = 0; clocks[i] != (clockid_t) -1; i++) {\n+ struct timespec res;\n+ int ret;\n+ ret = clock_getres (clocks[i], &res);\n+ if (ret)\n+ perror (\"clock_getres\");\n+ else\n+ printf (\"%d clock=%d sec=%ld nsec=%ld\\n\", i, clocks[i], res.tv_sec, res.tv_nsec);\n+ }\n+ for (i = 0; clocks[i] != (clockid_t) -1; i++) {\n+ ret = clock_gettime(clocks[i],&timeres[i]);\n+ if((clock_t)ret == -1){\n+ perror(\"gettime fail\");\n+ printf(\"%d %d\\n\",i,ret);\n+ }\n+ }\n+ sleep(5);\n+ for (i = 0; clocks[i] != (clockid_t) -1; i++) {\n+ ret = clock_gettime(clocks[i],&timeres2[i]);\n+ if((clock_t)ret == -1){\n+ perror(\"gettime fail\");\n+ printf(\"%d %d\\n\",i,ret);\n+ }\n+ }\n \n for (i = 0; clocks[i] != (clockid_t) -1; i++) {\n- struct timespec res;\n-\n- int ret;\n-\n- ret = clock_getres (clocks[i], &res);\n-\n- if (ret)\n-\n- perror (\"clock_getres\");\n-\n- else\n-\n- printf (\"clock=%d sec=%ld nsec=%ld\\n\", clocks[i], res.tv_sec, res.tv_nsec);\n-\n+ printf(\"%d | %d | %ld %ld \\n\",i,clocks[i],timeres2[i].tv_sec-timeres[i].tv_sec,timeres2[i].tv_nsec-timeres[i].tv_nsec);\n }\n \n return 0;\n"} {"commit":"eebf66a267e0acdf8b791e541b24ab701557135e","subject":"Use _DEFAULT_SOURCE instead of _BSD_SOURCE","message":"Use _DEFAULT_SOURCE instead of _BSD_SOURCE\n\nSince glibc 2.20, using _BSD_SOURCE triggers a warning, and since czmq\nuses -Werror, it aborts the build:\n\n CC zchunk.lo\nIn file included from \/home\/thomas\/projets\/buildroot\/output\/host\/usr\/nios2-buildroot-linux-gnu\/sysroot\/usr\/include\/ctype.h:25:0,\n from ..\/include\/czmq_prelude.h:203,\n from ..\/include\/czmq.h:19,\n from zauth.c:25:\n\/home\/thomas\/projets\/buildroot\/output\/host\/usr\/nios2-buildroot-linux-gnu\/sysroot\/usr\/include\/features.h:148:3: error: #warning \"_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE\" [-Werror=cpp]\n # warning \"_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE\"\n ^\n\nSee the glibc 2.20 release notes, https:\/\/lwn.net\/Articles\/611162\/,\nexplaining the change about _BSD_SOURCE:\n\n* The _BSD_SOURCE and _SVID_SOURCE feature test macros are no longer\n supported; they now act the same as _DEFAULT_SOURCE (but generate a\n warning). Except for cases where _BSD_SOURCE enabled BSD interfaces that\n conflicted with POSIX (support for which was removed in 2.19), the\n interfaces those macros enabled remain available when compiling with\n _GNU_SOURCE defined, with _DEFAULT_SOURCE defined, or without any feature\n test macros defined.\n\nSigned-off-by: Thomas Petazzoni <a5d87d2bd7c424ee5cbdb4e978635bf653d5a005@free-electrons.com>\n","repos":"trevorbernard\/czmq,saki4510t\/czmq,awynne\/czmq,c-rack\/czmq,soumith\/czmq,keent\/czmq,portworx\/czmq,hintjens\/czmq,maxkozlovsky\/czmq,pmienk\/czmq,pmienk\/czmq,mhaberler\/czmq,maxkozlovsky\/czmq,jemc\/czmq,eburkitt\/czmq,taotetek\/czmq,soumith\/czmq,tberkey\/czmq,taotetek\/czmq,jemc\/czmq,opedroso\/czmq,twhittock\/czmq,maxkozlovsky\/czmq,tberkey\/czmq,twhittock\/czmq,oikosdev\/czmq,eburkitt\/czmq,keent\/czmq,QbaseLLC\/czmq,evoskuil\/czmq,portworx\/czmq,saki4510t\/czmq,evoskuil\/czmq,trevorbernard\/czmq,opedroso\/czmq,modulexcite\/czmq,c-rack\/czmq,pmienk\/czmq,ritchiecarroll\/czmq,jemc\/czmq,c-rack\/czmq,twhittock\/czmq,soumith\/czmq,eburkitt\/czmq,modulexcite\/czmq,ritchiecarroll\/czmq,taotetek\/czmq,portworx\/czmq,trevorbernard\/czmq,taotetek\/czmq,evoskuil\/czmq,pmienk\/czmq,mhaberler\/czmq,saki4510t\/czmq,QbaseLLC\/czmq,keent\/czmq,hintjens\/czmq,trevorbernard\/czmq,awynne\/czmq,mhaberler\/czmq,hintjens\/czmq,ritchiecarroll\/czmq,superjudge\/czmq,hintjens\/czmq,jemc\/czmq,evoskuil\/czmq,QbaseLLC\/czmq,jemc\/czmq,twhittock\/czmq,maxkozlovsky\/czmq,saki4510t\/czmq,portworx\/czmq,portworx\/czmq,keent\/czmq,tberkey\/czmq,saki4510t\/czmq,opedroso\/czmq,modulexcite\/czmq,modulexcite\/czmq,tberkey\/czmq,twhittock\/czmq,evoskuil\/czmq,eburkitt\/czmq,evoskuil\/czmq,zeromq\/czmq,eburkitt\/czmq,oikosdev\/czmq,zeromq\/czmq,taotetek\/czmq,zeromq\/czmq,saki4510t\/czmq,jemc\/czmq,soumith\/czmq,evoskuil\/czmq,ritchiecarroll\/czmq,Asmod4n\/czmq,pmienk\/czmq,c-rack\/czmq,eburkitt\/czmq,portworx\/czmq,hintjens\/czmq,c-rack\/czmq,Asmod4n\/czmq,superjudge\/czmq,QbaseLLC\/czmq,zeromq\/czmq,maxkozlovsky\/czmq,ritchiecarroll\/czmq,ritchiecarroll\/czmq,saki4510t\/czmq,awynne\/czmq,evoskuil\/czmq,twhittock\/czmq,modulexcite\/czmq,saki4510t\/czmq,superjudge\/czmq,opedroso\/czmq,zeromq\/czmq,awynne\/czmq,pmienk\/czmq,hintjens\/czmq,keent\/czmq,Asmod4n\/czmq,oikosdev\/czmq,QbaseLLC\/czmq,QbaseLLC\/czmq,evoskuil\/czmq,twhittock\/czmq,trevorbernard\/czmq,superjudge\/czmq,maxkozlovsky\/czmq,jemc\/czmq,portworx\/czmq,saki4510t\/czmq,keent\/czmq,mhaberler\/czmq,superjudge\/czmq,mhaberler\/czmq,Asmod4n\/czmq,Asmod4n\/czmq,oikosdev\/czmq,soumith\/czmq,trevorbernard\/czmq,opedroso\/czmq,c-rack\/czmq,keent\/czmq,tberkey\/czmq,superjudge\/czmq,awynne\/czmq,maxkozlovsky\/czmq,superjudge\/czmq,ritchiecarroll\/czmq,zeromq\/czmq,oikosdev\/czmq,hintjens\/czmq,oikosdev\/czmq,keent\/czmq,opedroso\/czmq,opedroso\/czmq,twhittock\/czmq,awynne\/czmq,hintjens\/czmq,awynne\/czmq,ritchiecarroll\/czmq,pmienk\/czmq,taotetek\/czmq,oikosdev\/czmq,tberkey\/czmq,eburkitt\/czmq,portworx\/czmq,oikosdev\/czmq,awynne\/czmq,taotetek\/czmq,c-rack\/czmq,maxkozlovsky\/czmq,taotetek\/czmq,Asmod4n\/czmq,c-rack\/czmq,taotetek\/czmq,soumith\/czmq,opedroso\/czmq,pmienk\/czmq,modulexcite\/czmq,twhittock\/czmq,soumith\/czmq,modulexcite\/czmq,mhaberler\/czmq,trevorbernard\/czmq,zeromq\/czmq,trevorbernard\/czmq,opedroso\/czmq,eburkitt\/czmq,eburkitt\/czmq,zeromq\/czmq","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/czmq_prelude.h\n+++ include\/czmq_prelude.h\n@@ -153,8 +153,8 @@\n # ifndef __NO_CTYPE\n # define __NO_CTYPE \/\/ Suppress warnings on tolower()\n # endif\n-# ifndef _BSD_SOURCE\n-# define _BSD_SOURCE \/\/ Include stuff from 4.3 BSD Unix\n+# ifndef _DEFAULT_SOURCE\n+# define _DEFAULT_SOURCE \/\/ Include stuff from 4.3 BSD Unix\n # endif\n #elif (defined (Mips))\n # define __UTYPE_MIPS\n"} {"commit":"6b8d5f7bb92383a51cef2b94f5ae3250259300f6","subject":"introduce time related macros","message":"introduce time related macros\n","repos":"ciminaghi\/libdfu,ciminaghi\/libdfu,ciminaghi\/libdfu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/dfu-internal.h\n+++ include\/dfu-internal.h\n@@ -10,6 +10,23 @@\n #ifndef min\n #define min(a,b) ((a) < (b) ? (a) : (b))\n #endif \/* min *\/\n+\n+\/* The following ones come from the kernel, but simplified *\/\n+#ifndef time_after\n+#define time_after(a,b) \\\n+ ((long)(b) - (long)(a) < 0)\n+#endif\n+#define time_before(a,b) time_after(b,a)\n+#ifndef time_after_eq\n+#define time_after_eq(a,b) \\\n+ ((long)(a) - (long)(b) >= 0)\n+#endif\n+#define time_before_eq(a,b) time_after_eq(b,a)\n+\n+#define time_in_range(a,b,c) \\\n+ (time_after_eq(a,b) && \\\n+ time_before_eq(a,c))\n+\n \n \/* 32 bits targets supported *\/\n typedef uint32_t phys_addr_t;\n"} {"commit":"ba4284bcc3c1317f22487db2e6c72a29f1b8e22a","subject":"drivers: lora: fix NOTSUP vs NOSYS usage","message":"drivers: lora: fix NOTSUP vs NOSYS usage\n\nReturn -ENOSYS when implementation is missing and -ENOTSUP if the\nfeature is not supported. Those are 2 things. Missing implementation\n(-ENOSYS) means that the driver is lacking support for the feature,\n-ENOTSUP means we have an implementation but some parameters or\nconditions makes the request unsupported.\n\nSigned-off-by: Anas Nashif <0d9952ec84ac43c159f6b7e7ed99a9080c00dd6e@intel.com>\n","repos":"zephyrproject-rtos\/zephyr,nashif\/zephyr,nashif\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,galak\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,finikorg\/zephyr,finikorg\/zephyr,finikorg\/zephyr,nashif\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,galak\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/drivers\/lora.h\n+++ include\/drivers\/lora.h\n@@ -176,8 +176,8 @@\n \tconst struct lora_driver_api *api =\n \t\t(const struct lora_driver_api *)dev->api;\n \n-\tif (!api->test_cw) {\n-\t\treturn -ENOTSUP;\n+\tif (api->test_cw == NULL) {\n+\t\treturn -ENOSYS;\n \t}\n \n \treturn api->test_cw(dev, frequency, tx_power, duration);\n"} {"commit":"92b2994335201ff561c90e71c1e5bfc08f1fbeac","subject":"include: Add initial LoRa API","message":"include: Add initial LoRa API\n\nAdd initial LoRa API for P2P mode.\n\nSigned-off-by: Manivannan Sadhasivam <c29222e98de6437a383e8d946a9b202298e0aa3a@kernel.org>\n","repos":"galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,nashif\/zephyr,nashif\/zephyr,Vudentz\/zephyr,finikorg\/zephyr,nashif\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,galak\/zephyr,Vudentz\/zephyr,galak\/zephyr,galak\/zephyr,finikorg\/zephyr,nashif\/zephyr,nashif\/zephyr,finikorg\/zephyr","returncode":1,"stderr":"error: pathspec 'include\/drivers\/lora.h' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- include\/drivers\/lora.h\n+++ include\/drivers\/lora.h\n@@ -0,0 +1,140 @@\n+\/*\n+ * Copyright (c) 2019 Manivannan Sadhasivam\n+ *\n+ * SPDX-License-Identifier: Apache-2.0\n+ *\/\n+\n+#ifndef ZEPHYR_INCLUDE_DRIVERS_LORA_H_\n+#define ZEPHYR_INCLUDE_DRIVERS_LORA_H_\n+\n+\/**\n+ * @file\n+ * @brief Public LoRa APIs\n+ *\/\n+\n+#include <zephyr\/types.h>\n+#include <device.h>\n+\n+enum lora_signal_bandwidth {\n+\tBW_125_KHZ = 0,\n+\tBW_250_KHZ,\n+\tBW_500_KHZ,\n+};\n+\n+enum lora_datarate {\n+\tSF_6 = 6,\n+\tSF_7,\n+\tSF_8,\n+\tSF_9,\n+\tSF_10,\n+\tSF_11,\n+\tSF_12,\n+};\n+\n+enum lora_coding_rate {\n+\tCR_4_5 = 1,\n+\tCR_4_6 = 2,\n+\tCR_4_7 = 3,\n+\tCR_4_8 = 4,\n+};\n+\n+struct lora_modem_config {\n+\tu32_t frequency;\n+\tenum lora_signal_bandwidth bandwidth;\n+\tenum lora_datarate datarate;\n+\tenum lora_coding_rate coding_rate;\n+\tu16_t preamble_len;\n+\ts8_t tx_power;\n+\tbool tx;\n+};\n+\n+\/**\n+ * @typedef lora_api_config()\n+ * @brief Callback API for configuring the LoRa module\n+ *\n+ * @see lora_config() for argument descriptions.\n+ *\/\n+typedef int (*lora_api_config)(struct device *dev,\n+\t\t\t struct lora_modem_config *config);\n+\n+\/**\n+ * @typedef lora_api_send()\n+ * @brief Callback API for sending data over LoRa\n+ *\n+ * @see lora_send() for argument descriptions.\n+ *\/\n+typedef int (*lora_api_send)(struct device *dev,\n+\t\t\t u8_t *data, u32_t data_len);\n+\n+\/**\n+ * @typedef lora_api_recv()\n+ * @brief Callback API for receiving data over LoRa\n+ *\n+ * @see lora_recv() for argument descriptions.\n+ *\/\n+typedef int (*lora_api_recv)(struct device *dev, u8_t *data, u8_t size,\n+\t\t\t s32_t timeout);\n+\n+struct lora_driver_api {\n+\tlora_api_config config;\n+\tlora_api_send\tsend;\n+\tlora_api_recv\trecv;\n+};\n+\n+\/**\n+ * @brief Configure the LoRa modem\n+ *\n+ * @param dev LoRa device\n+ * @param config Data structure containing the intended configuration for the\n+\t\t modem\n+ * @return 0 on success, negative on error\n+ *\/\n+static inline int lora_config(struct device *dev,\n+\t\t\t struct lora_modem_config *config)\n+{\n+\tconst struct lora_driver_api *api = dev->driver_api;\n+\n+\treturn api->config(dev, config);\n+}\n+\n+\/**\n+ * @brief Send data over LoRa\n+ *\n+ * @note This is a non-blocking call.\n+ *\n+ * @param dev LoRa device\n+ * @param data Data to be sent\n+ * @param data_len Length of the data to be sent\n+ * @return 0 on success, negative on error\n+ *\/\n+static inline int lora_send(struct device *dev,\n+\t\t\t u8_t *data, u32_t data_len)\n+{\n+\tconst struct lora_driver_api *api = dev->driver_api;\n+\n+\treturn api->send(dev, data, data_len);\n+}\n+\n+\/**\n+ * @brief Receive data over LoRa\n+ *\n+ * @note This is a blocking call.\n+ *\n+ * @param dev LoRa device\n+ * @param data Buffer to hold received data\n+ * @param size Size of the buffer to hold the received data. Max size\n+\t\t allowed is 255.\n+ * @param timeout Timeout value in milliseconds. API also accepts, K_NO_WAIT\n+\t\t for no wait time and K_FOREVER for blocking until\n+\t\t data arrives.\n+ * @return Length of the data received on success, negative on error\n+ *\/\n+static inline int lora_recv(struct device *dev, u8_t *data, u8_t size,\n+\t\t\t s32_t timeout)\n+{\n+\tconst struct lora_driver_api *api = dev->driver_api;\n+\n+\treturn api->recv(dev, data, size, timeout);\n+}\n+\n+#endif\t\/* ZEPHYR_INCLUDE_DRIVERS_LORA_H_ *\/\n"} {"commit":"282cf44e742c3db26a53e8a254ca00b95a4cae1a","subject":"minor: cmds: Clean net\/httpd","message":"minor: cmds: Clean net\/httpd\n","repos":"embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/cmds\/net\/httpd\/httpd.c\n+++ src\/cmds\/net\/httpd\/httpd.c\n@@ -88,7 +88,6 @@\n \tconst char *basedir;\n #if USE_IP_VER == 4\n \tstruct sockaddr_in inaddr;\n-\tconst size_t inaddrlen = sizeof(inaddr);\n \tconst int family = AF_INET;\n \n \tinaddr.sin_family = AF_INET;\n@@ -96,7 +95,6 @@\n \tinaddr.sin_addr.s_addr = htonl(INADDR_ANY);\n #elif USE_IP_VER == 6\n \tstruct sockaddr_in6 inaddr;\n-\tconst size_t inaddrlen = sizeof(inaddr);\n \tconst int family = AF_INET6;\n \n \tinaddr.sin6_family = AF_INET6;\n@@ -114,7 +112,7 @@\n \t\treturn -errno;\n \t}\n \n-\tif (-1 == bind(host, (struct sockaddr *) &inaddr, inaddrlen)) {\n+\tif (-1 == bind(host, (struct sockaddr *) &inaddr, sizeof(inaddr))) {\n \t\thttpd_error(\"bind() failure: %s\", strerror(errno));\n \t\tclose(host);\n \t\treturn -errno;\n@@ -129,7 +127,7 @@\n \twhile (1) {\n \t\tstruct client_info ci;\n \n-\t\tci.ci_addrlen = inaddrlen;\n+\t\tci.ci_addrlen = sizeof(inaddr);\n \t\tci.ci_sock = accept(host, &ci.ci_addr, &ci.ci_addrlen);\n \t\tif (ci.ci_sock == -1) {\n \t\t\tif (errno != EINTR) {\n@@ -138,7 +136,7 @@\n \t\t\t}\n \t\t\tcontinue;\n \t\t}\n-\t\tassert(ci.ci_addrlen == inaddrlen);\n+\t\tassert(ci.ci_addrlen == sizeof(inaddr));\n \t\tci.ci_basedir = basedir;\n \n \t\tif (USE_PARALLEL_CGI) {\n"} {"commit":"0b47a95cdd8f4ea89d94090ff0540de468883eb0","subject":"large number operations in C","message":"large number operations in C","repos":"IEEE-NITK\/Daedalus,IEEE-NITK\/Daedalus,IEEE-NITK\/Daedalus,chinmaydd\/NITK_IEEE_SaS","returncode":1,"stderr":"error: pathspec 'warmup2\/large_num_op.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- warmup2\/large_num_op.c\n+++ warmup2\/large_num_op.c\n@@ -0,0 +1,110 @@\n+#include<stdio.h>\n+#include<stdlib.h>\n+#define CHAR_SIZE sizeof(char)\n+\n+\n+int str_to_int(char str[]){\n+\tint i=0;\n+\tint num=0;\n+\twhile(str[i]){\n+\t\tnum=(10*num)+str[i]-'0';\n+\t\ti++;\n+\t}\t\n+\treturn num;\n+}\n+\n+void add(char *a,char *b,char *sum,int N){\n+ int i,j=0,carry=0;\n+ for(i=N-1;i>=0;i--){\n+ sum[j]=a[i]-'0'+b[i]-'0'+carry;\n+ carry=sum[j]\/10;\n+ sum[j]=sum[j]%10;\n+ j++;\n+ }\n+ sum[j]=carry;\n+ while(sum[j]==0){\n+ j--;\n+ }\n+ printf(\"\\nSum is\\n\");\n+\tfor(j;j>=0;j--){\n+ printf(\"%d\",sum[j]);\n+ }\n+ printf(\"\\n\");\n+}\n+\n+void multiply(char *a,char *b,char *prod,int N){\n+ int i,j,k,l,carry,p;\n+ for(i=N-1;i>=0;i--){\n+ l=k;\n+ carry=0;\n+ for(j=N-1;j>=0;j--){\n+ p=(a[i]-'0')*(b[j]-'0');\n+ prod[l]+=(p+carry);\n+ carry=prod[l]\/10;\n+ prod[l]=prod[l]%10;\n+ l++;\n+ }\n+ prod[l]=carry;\n+ k++;\n+ }\n+\tprintf(\"\\nProduct is \\n\");\n+ while(prod[l]==0)\n+ l--;\n+ for(;l>=0;l--)\n+ printf(\"%d\",prod[l]);\n+ printf(\"\\n\");\n+\n+}\n+\n+\n+int main(int argc,char *argv[]){\n+\tif(argc!=5){\n+\t\tprintf(\"Format is %s <sizeof_num1> <sizeof_num2> <num1> <num2>\\n\",argv[0]);\n+\t}\n+\telse{\n+\t\tint N,m,n,i;\n+ char *a,*b;\n+ \n+\t\tm=str_to_int(argv[1]);\n+\t\tn=str_to_int(argv[2]);\n+ if(m>n){\n+ N=m;\n+ }else{\n+ N=n;\n+ }\n+ char *prod,*sum;\n+ a=(char *)calloc(N,CHAR_SIZE);\n+ b=(char *)calloc(N,CHAR_SIZE);\n+ prod=(char *)calloc(m+n,CHAR_SIZE);\n+ sum=(char *)calloc(N+1,CHAR_SIZE);\n+ \n+ \n+ char *e=argv[3];\n+ char *f=argv[4];\n+ if(m>n){\n+ for(i=0;e[i];i++){\n+ a[i]=e[i];\n+ }\n+ for(i=0;i<m-n;i++){\n+ b[i]='0';\n+ }\n+ for(i=0;f[i];i++){\n+ b[i+m-n]=f[i];\n+ }\n+ }\n+ else{\n+ for(i=0;i<n-m;i++){\n+ a[i]='0';\n+ }\n+ for(i=0;e[i];i++){\n+ a[i+n-m]=e[i];\n+ }\n+ for(i=0;f[i];i++){\n+ b[i]=f[i];\n+ }\n+ }\n+ multiply(a,b,prod,N);\n+ add(a,b,sum,N);\n+ }\n+\treturn 0;\n+}\n"} {"commit":"a7b7df8acceb0afbbfe5ba05ed5c858a8f2f2192","subject":"removed gphoto2-port.h from gphoto2 include","message":"removed gphoto2-port.h from gphoto2 include\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@1528 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"jbreeden\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/gphoto2-port.h\n+++ include\/gphoto2-port.h\n@@ -1,12 +0,0 @@\n-\/* \tHeader file for gPhoto2\n-\n-\tAuthor: Scott Fritzinger <scottf@unr.edu>\n-\n-\tThis library is covered by the LGPL.\n-*\/\n-\n-int gp_port_count ();\n- \n-int gp_port_info (int port_number, CameraPortInfo *info);\n-\n-\n"} {"commit":"ec057b18c29c00d5686dd6c2749e490c4b0e5749","subject":"Rename `helpstr' to `usage'","message":"Rename `helpstr' to `usage'\n","repos":"cmotc\/ratox,pranomostro\/ratox,kytvi2p\/ratox,insanity54\/batox,pranomostro\/ratox,cmotc\/ratox","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- ratatox.c\n+++ ratatox.c\n@@ -569,11 +569,11 @@\n struct cmd {\n \tconst char *cmd;\n \tint (*cb)(char *, size_t);\n-\tconst char *helpstr;\n+\tconst char *usage;\n } cmds[] = {\n-\t{ .cmd = \"a\", .cb = doaccept, .helpstr = \"usage: a [ID]\\tAccept or list pending requests\\n\" },\n-\t{ .cmd = \"f\", .cb = dofriend, .helpstr = \"usage: f ID\\tSend friend request to ID\\n\" },\n-\t{ .cmd = \"h\", .cb = dohelp, .helpstr = NULL },\n+\t{ .cmd = \"a\", .cb = doaccept, .usage = \"usage: a [ID]\\tAccept or list pending requests\\n\" },\n+\t{ .cmd = \"f\", .cb = dofriend, .usage = \"usage: f ID\\tSend friend request to ID\\n\" },\n+\t{ .cmd = \"h\", .cb = dohelp, .usage = NULL },\n };\n \n static int\n@@ -657,8 +657,8 @@\n \tsize_t i;\n \n \tfor (i = 0; i < LEN(cmds); i++)\n-\t\tif (cmds[i].helpstr)\n-\t\t\tprintf(\"%s\", cmds[i].helpstr);\n+\t\tif (cmds[i].usage)\n+\t\t\tprintf(\"%s\", cmds[i].usage);\n \treturn 0;\n }\n \n"} {"commit":"0cd81111c7429150683e134b4b5b9dee40727d65","subject":"synch: add CONDTIMEDWAIT_SEC","message":"synch: add CONDTIMEDWAIT_SEC\n\nFor convenience.\n\nSigned-off-by: Josef 'Jeff' Sipek <a620f141433c70aa9e43778305a6c68cbfadfb25@josefsipek.net>\n","repos":"jeffpc\/libjeffpc,jeffpc\/libjeffpc,jeffpc\/libjeffpc,jeffpc\/libjeffpc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/jeffpc\/synch.h\n+++ include\/jeffpc\/synch.h\n@@ -175,6 +175,8 @@\n \t\t\t\t}; \\\n \t\t\t\tcondtimedwait(&cond_ctx, (c), (m), (t)); \\\n \t\t\t} while (0)\n+#define CONDTIMEDWAIT_SEC(c, m, t) \\\n+\t\t\tCONDTIMEDWAIT_NSEC((c), (m), (t) * 1000000000ull)\n #define CONDTIMEDWAIT_SPEC(c, m, t) \\\n \t\t\tdo { \\\n \t\t\t\tstruct time_spec tmp = *(t); \\\n"} {"commit":"a7db716712165438c1c9b01a2af58e6962d67103","subject":"Implemented --target-property in the garbage collector","message":"Implemented --target-property in the garbage collector\n","repos":"svanderburg\/disnix,svanderburg\/disnix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/collect-garbage\/main.c\n+++ src\/collect-garbage\/main.c\n@@ -12,7 +12,7 @@\n static void print_usage()\n {\n fprintf(stderr, \"Usage:\\n\");\n- fprintf(stderr, \"disnix-collect-garbage [--interface interface] [-d|--delete-old] infrastructure_expr\\n\");\n+ fprintf(stderr, \"disnix-collect-garbage [--interface interface] [--target-property targetProperty] [-d|--delete-old] infrastructure_expr\\n\");\n fprintf(stderr, \"disnix-activate {-h | --help}\\n\");\n }\n \n@@ -99,12 +99,14 @@\n struct option long_options[] =\n {\n \t{\"interface\", required_argument, 0, 'i'},\n+\t{\"target-property\", required_argument, 0, 't'},\n \t{\"delete-old\", no_argument, 0, 'd'},\n \t{\"help\", no_argument, 0, 'h'},\n \t{0, 0, 0, 0}\n };\n gchar *interface = \"disnix-client\";\n char *delete_old_arg = \"\";\n+ char *targetProperty = \"hostname\";\n \n \/* Parse command-line options *\/\n while((c = getopt_long(argc, argv, \"dh\", long_options, &option_index)) != -1)\n@@ -113,6 +115,9 @@\n \t{\n \t case 'i':\n \t\tinterface = optarg;\n+\t\tbreak;\n+\t case 't':\n+\t\ttargetProperty = optarg;\n \t\tbreak;\n \t case 'd':\n \t delete_old_arg = \"-d\";\n@@ -158,7 +163,7 @@\n \n \t\/* Iterate over all targets *\/\n \n-\tresult = query_targets(doc, \"hostname\");\n+\tresult = query_targets(doc, targetProperty);\n \n \tif(result)\n \t{\n"} {"commit":"d60bf742c32ae7809e8118d76f3a5d6e59e8affe","subject":"Renamed alloc\/free functions","message":"Renamed alloc\/free functions\n\nalloc function does also initialization, so it should be named \"new\". To\nfit this scheme, the free function should be named \"destroy\"\n","repos":"waysome\/libreset,waysome\/libreset","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/libreset\/set.h\n+++ include\/libreset\/set.h\n@@ -18,12 +18,12 @@\n \n \n \/**\n- * Allocate a set object\n+ * Allocate and initialize set object\n *\n * @return A pointer to the set object or NULL on failure\n *\/\n struct r_set*\n-r_set_alloc(\n+r_set_new(\n struct r_set_cfg const* cfg \/\/!< configuration for the set object\n );\n \n@@ -32,7 +32,7 @@\n * Remove a set object from memory\n *\/\n void\n-r_set_free(\n+r_set_destroy(\n struct r_set* set \/\/!< Set to remove\n );\n \n"} {"commit":"4ccb457966391295bd9b3644f6bdc9ddd97b6051","subject":"dynamic debug: resurrect old pr_debug() semantics as pr_devel()","message":"dynamic debug: resurrect old pr_debug() semantics as pr_devel()\n\npr_debug() used to produce zero code unless DEBUG was #defined. This is\nnow no longer the case in practice[1].\n\nThere are places where it's useful to have debugging printks, but we don't\nwant them to generate any code in production kernels.\n\nSo add a new macro, pr_devel(), for _devel_opment, to provide the old\nsemantics, ie. if the programmer doesn't explicitly enable debugging, no\ncode is produced.\n\n[1]: You can turn CONFIG_DYNAMIC_DEBUG off, but it's enabled in at least\n one distro kernel, so it's not really a solution.\n\nSigned-off-by: Michael Ellerman <17b9e1c64588c7fa6419b4d29dc1f4426279ba01@ellerman.id.au>\nCc: Jason Baron <af9bd1db766a43cb09b647251c97dbddcd2e59dc@redhat.com>\nCc: Greg Banks <3c474cf4bdc26bce6c823d6384748a5a3679f008@sgi.com>\nSigned-off-by: Andrew Morton <5c1e68b099950c134891f0b6e179498a8ebe9cf9@linux-foundation.org>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/kernel.h\n+++ include\/linux\/kernel.h\n@@ -377,6 +377,15 @@\n #define pr_cont(fmt, ...) \\\n \tprintk(KERN_CONT fmt, ##__VA_ARGS__)\n \n+\/* pr_devel() should produce zero code unless DEBUG is defined *\/\n+#ifdef DEBUG\n+#define pr_devel(fmt, ...) \\\n+\tprintk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)\n+#else\n+#define pr_devel(fmt, ...) \\\n+\t({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; })\n+#endif\n+\n \/* If you are writing a driver, please use dev_dbg instead *\/\n #if defined(DEBUG)\n #define pr_debug(fmt, ...) \\\n"} {"commit":"fd68cba04e2f0d899dc18534e103f6904c0ceb0f","subject":"simplify Functor::operator== implementation. Thanks to Eric Beyeler","message":"simplify Functor::operator== implementation. Thanks to Eric Beyeler\n\n\ngit-svn-id: 2bceadd671bcc8d4f7a34159d1bc3b98592acb3b@676 7ec92016-0320-0410-acc4-a06ded1c099a\n","repos":"Streamlet\/ZLibWrap,Streamlet\/ZLibWrap,Streamlet\/ZLibWrap,Streamlet\/ZLibWrap,Streamlet\/ZLibWrap","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/loki\/Functor.h\n+++ include\/loki\/Functor.h\n@@ -38,7 +38,6 @@\n \/\/#define LOKI_FUNCTORS_ARE_COMPARABLE\n #endif\n \n-\/\/#define LOKI_FUNCTOR_DEBUG\n \n \/\/\/ \\namespace Loki\n \/\/\/ All classes of Loki are in the Loki namespace\n@@ -92,11 +91,7 @@\n static U* Clone(U* pObj)\n {\n if (!pObj) return 0;\n-#ifdef LOKI_FUNCTOR_DEBUG\n- U* pClone = dynamic_cast<U*>(pObj->DoClone());\n-#else\n U* pClone = static_cast<U*>(pObj->DoClone());\n-#endif\n assert(typeid(*pClone) == typeid(*pObj));\n return pClone;\n }\n@@ -105,10 +100,7 @@\n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n \n virtual bool operator==(const FunctorImplBase&) const = 0;\n- \n- \/\/ there is no static information if Functor holds a member function \n- \/\/ or a free function; this is the main difference to tr1::function\n- virtual bool isMemberFuncPtr() const = 0;\n+ \n #endif \n \n };\n@@ -961,20 +953,15 @@\n \n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n \n- bool isMemberFuncPtr() const\n- { \n- return false; \n- }\n \n bool operator==(const typename Base::FunctorImplBaseType& rhs) const\n {\n- if( rhs.isMemberFuncPtr() )\n- return false; \/\/ cannot be equal \n-#ifdef LOKI_FUNCTOR_DEBUG\n- const FunctorHandler& fh = dynamic_cast<const FunctorHandler&>(rhs);\n-#else\n+ \/\/ there is no static information if Functor holds a member function \n+ \/\/ or a free function; this is the main difference to tr1::function\n+ if(typeid(*this) != typeid(rhs))\n+ return false; \/\/ cannot be equal\n+\n const FunctorHandler& fh = static_cast<const FunctorHandler&>(rhs);\n-#endif\n \/\/ if this line gives a compiler error, you are using a function object.\n \/\/ you need to implement bool MyFnObj::operator == (const MyFnObj&) const;\n return f_==fh.f_;\n@@ -1092,21 +1079,12 @@\n \n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n \n- bool isMemberFuncPtr() const \n- { \n- return true; \n- }\n-\n bool operator==(const typename Base::FunctorImplBaseType& rhs) const\n {\n- if(!rhs.isMemberFuncPtr())\n- return false; \n- \n-#ifdef LOKI_FUNCTOR_DEBUG\n- const MemFunHandler& mfh = dynamic_cast<const MemFunHandler&>(rhs);\n-#else\n+ if(typeid(*this) != typeid(rhs))\n+ return false; \/\/ cannot be equal \n+\n const MemFunHandler& mfh = static_cast<const MemFunHandler&>(rhs);\n-#endif\n \/\/ if this line gives a compiler error, you are using a function object.\n \/\/ you need to implement bool MyFnObj::operator == (const MyFnObj&) const;\n return pObj_==mfh.pObj_ && pMemFn_==mfh.pMemFn_;\n@@ -1315,14 +1293,6 @@\n #endif\n \n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n-\n- bool isMemberFuncPtr() const\n- {\n- if(spImpl_.get()!=0)\n- return spImpl_.get()->isMemberFuncPtr();\n- else\n- return false;\n- }\n \n bool operator==(const Functor& rhs) const\n {\n@@ -1556,24 +1526,14 @@\n \n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n \n- bool isMemberFuncPtr() const\n- {\n- return f_.isMemberFuncPtr();\n- }\n-\n bool operator==(const typename Base::FunctorImplBaseType& rhs) const\n {\n- isMemberFuncPtr();\n+ if(typeid(*this) != typeid(rhs))\n+ return false; \/\/ cannot be equal \n \/\/ if this line gives a compiler error, you are using a function object.\n \/\/ you need to implement bool MyFnObj::operator == (const MyFnObj&) const;\n-#ifdef LOKI_FUNCTOR_DEBUG \n- return f_ == ((dynamic_cast<const BinderFirst&> (rhs)).f_) &&\n- b_ == ((dynamic_cast<const BinderFirst&> (rhs)).b_);\n-\n-#else\n return f_ == ((static_cast<const BinderFirst&> (rhs)).f_) &&\n b_ == ((static_cast<const BinderFirst&> (rhs)).b_);\n-#endif\n }\n #endif\n \n@@ -1698,24 +1658,14 @@\n \n #ifdef LOKI_FUNCTORS_ARE_COMPARABLE\n \n- bool isMemberFuncPtr() const\n- {\n- assert(0);\n- return false;\n- }\n-\n bool operator==(const typename Base::Impl::FunctorImplBaseType& rhs) const\n {\n+ if(typeid(*this) != typeid(rhs))\n+ return false; \/\/ cannot be equal \n \/\/ if this line gives a compiler error, you are using a function object.\n \/\/ you need to implement bool MyFnObj::operator == (const MyFnObj&) const;\n-#ifdef LOKI_FUNCTOR_DEBUG\n- return f1_ == ((dynamic_cast<const Chainer&> (rhs)).f2_) &&\n- f2_ == ((dynamic_cast<const Chainer&> (rhs)).f1_);\n-\n-#else\n return f1_ == ((static_cast<const Chainer&> (rhs)).f2_) &&\n f2_ == ((static_cast<const Chainer&> (rhs)).f1_);\n-#endif\n }\n #endif\n \n@@ -1845,6 +1795,9 @@\n #endif \/\/ FUNCTOR_INC_\n \n \/\/ $Log$\n+\/\/ Revision 1.22 2006\/06\/09 12:58:44 syntheticpp\n+\/\/ simplify Functor::operator== implementation. Thanks to Eric Beyeler\n+\/\/\n \/\/ Revision 1.21 2006\/06\/01 12:33:05 syntheticpp\n \/\/ add operator== to Functor, initiated by Eric Beyeler\n \/\/\n"} {"commit":"35091d4c4db74e5df8abadabd0c541505f42e76d","subject":"Platform identification header","message":"Platform identification header\n","repos":"justinsaunders\/lxt_math","returncode":1,"stderr":"error: pathspec 'include\/lxt_platform.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- include\/lxt_platform.h\n+++ include\/lxt_platform.h\n@@ -0,0 +1,57 @@\n+\/*\n+ * LXT math platform definitions.\n+ *\n+ * After including this file, inspect:\n+ * LXT_MATH_ARCH_CURRENT, LXT_MATH_PLATFORM_CURRENT to see current platform.\n+ *\n+ * Copyright (c) 2011 Justin Saunders.\n+ *\n+ *\/\n+\n+#ifndef _LXT_MATH_PLATFORM_H_\n+#define\t_LXT_MATH_PLATFORM_H_\n+\n+\/\/ Supported architectures\n+#define LXT_MATH_ARCH_UNKNOWN -1\n+#define LXT_MATH_ARCH_ARM\t\t0\n+#define LXT_MATH_ARCH_X86\t\t1\n+#define LXT_MATH_ARCH_PPC\t\t2\n+\n+#if defined ( __i386__ )\n+ #define LXT_MATH_ARCH_CURRENT LXT_MATH_ARCH_X86\n+#elif defined ( __arm__ )\n+ #define LXT_MATH_ARCH_CURRENT LXT_MATH_ARCH_ARM\n+#elif defined ( __ppc__ )\n+ #define LXT_MATH_ARCH_CURRENT LXT_MATH_ARCH_PPC\n+#endif\n+\n+#if !defined( LXT_MATH_ARCH_CURRENT )\n+ #define LXT_MATH_ARCH_CURRENT LXT_MATH_ARCH_UNKNOWN\n+ #error \"Unsupported architecture for LXT math.\"\n+#endif\n+\n+\/\/ Supported operating systems\n+#define LXT_MATH_OS_UNKNOWN -1\n+#define LXT_MATH_OS_IOS 0\n+#define LXT_MATH_OS_OSX 1\n+#define LXT_MATH_OS_WINDOWS 2\n+#define LXT_MATH_OS_LINUX 3\n+\n+#if defined ( __APPLE__ ) && defined ( __MACH__ )\n+\t#if TARGET_OS_IPHONE\n+\t\t#define LXT_MATH_OS_CURRENT LXT_MATH_OS_IOS\n+\t#else\n+\t\t#define LXT_MATH_OS_CURRENT LXT_MATH_OS_OSX\n+\t#endif\n+#endif\n+\n+#if !defined ( LXT_MATH_OS_CURRENT )\n+\t#error \"Unsupported platform for LXT math.\"\n+#endif\n+\n+\/\/ Debugging enabled (non release build)\n+#if !defined ( NDEBUG )\n+ #define LXT_MATH_DEBUG\n+#endif\n+\n+#endif \/\/ _LXT_MATH_PLATFORM_H_\n"} {"commit":"de57d6ada5d3b2c91e56bbc466ac3daf308b4e88","subject":"Fix GCC 8 -Wstringop-truncation","message":"Fix GCC 8 -Wstringop-truncation\n\nIf strncpy() truncates the string due to insufficient destination\nbuffer, it will not NUL-terminate the destination string.\n9faaea38bc23abc76ca8e449754c38d92361cff2 ensured that the\ndestination string will always be NUL-terminated, by writing a NUL to\nthe end of the buffer.\n\nBut, it failed to silence a -Wstringop-truncation warning.\nThis fix (which should be non-functional) actually does that.\n","repos":"MariaDB\/mariadb-connector-c,ottok\/mariadb-connector-c,MariaDB\/mariadb-connector-c,ottok\/mariadb-connector-c,MariaDB\/mariadb-connector-c,ottok\/mariadb-connector-c","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/mariadb_stmt.h\n+++ include\/mariadb_stmt.h\n@@ -39,7 +39,7 @@\n (a)->last_errno= (b);\\\n strncpy((a)->sqlstate, (c), SQLSTATE_LENGTH);\\\n (a)->sqlstate[SQLSTATE_LENGTH]= 0;\\\n- strncpy((a)->last_error, (d) ? (d) : ER((b)), MYSQL_ERRMSG_SIZE - 1);\\\n+ strncpy((a)->last_error, (d) ? (d) : ER((b)), MYSQL_ERRMSG_SIZE);\\\n (a)->last_error[MYSQL_ERRMSG_SIZE - 1]= 0;\\\n }\n \n"} {"commit":"5f4161e2a315fbf46527030fd10aa8faddcb72ef","subject":"More precise delta robot reachable volume","message":"More precise delta robot reachable volume\n","repos":"dsharlet\/ev3cv","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/math\/vector3.h\n+++ include\/math\/vector3.h\n@@ -17,8 +17,8 @@\n template <typename U> vector3<T> &operator \/= (U r) { x \/= r; y \/= r; z \/= r; return *this; }\n \n \/\/ Vector products are pointwise.\n- template <typename U> vector3<T> &operator *= (const vector3<U> &r) { x *= r.x; y *= r.y; return *this; }\n- template <typename U> vector3<T> &operator \/= (const vector3<U> &r) { x \/= r.x; y \/= r.y; return *this; }\n+ template <typename U> vector3<T> &operator *= (const vector3<U> &r) { x *= r.x; y *= r.y; z *= r.z; return *this; }\n+ template <typename U> vector3<T> &operator \/= (const vector3<U> &r) { x \/= r.x; y \/= r.y; z \/= r.z; return *this; }\n \n vector3<T> operator - () const { return vector3<T>(-x, -y, -z); }\n };\n"} {"commit":"aca5c257d10eba8c79d83540f41f38f1c16eb9d9","subject":"Update version number","message":"Update version number\n","repos":"Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,Acidburn0zzz\/sdk,meganz\/sdk,meganz\/sdk,meganz\/sdk","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/mega\/version.h\n+++ include\/mega\/version.h\n@@ -5,5 +5,5 @@\n #define MEGA_MINOR_VERSION 2\n #endif\n #ifndef MEGA_MICRO_VERSION\n-#define MEGA_MICRO_VERSION 0\n+#define MEGA_MICRO_VERSION 1\n #endif\n"} {"commit":"ad047657b89eea3ddbc92c7402cc29917d05f9e9","subject":"evaluator","message":"evaluator\n","repos":"newenclave\/mico,newenclave\/mico,newenclave\/mico","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/mico\/objects.h\n+++ include\/mico\/objects.h\n@@ -10,14 +10,13 @@\n namespace mico { namespace objects {\n \n enum class type {\n- BASE = 0,\n+ NULL_OBJ = 0,\n BOOLEAN,\n INTEGER,\n FLOAT,\n STRING,\n TABLE,\n ARRAY,\n- NULL_OBJ,\n };\n \n struct cast {\n@@ -242,14 +241,14 @@\n static\n bool compare_numbers( const sptr &lft, const sptr &rght )\n {\n- using signed_int = primitive<type::INTEGER>;\n- using floating = primitive<type::FLOAT>;\n+ using integer = primitive<type::INTEGER>;\n+ using floating = primitive<type::FLOAT>;\n \n auto lval = cast::to<LeftT>(lft.get( ));\n switch (rght->get_type( )) {\n case type::INTEGER:\n return lval->value( ) < static_cast<typename LeftT::value_type>\n- (cast::to<signed_int>(rght.get( ))->value( ));\n+ (cast::to<integer>(rght.get( ))->value( ));\n case type::FLOAT:\n return lval->value( ) < static_cast<typename LeftT::value_type>\n (cast::to<floating>(rght.get( ))->value( ));\n@@ -260,16 +259,16 @@\n \n bool operator ( )( const sptr &lft, const sptr &rght ) const\n {\n- using boolean = primitive<type::BOOLEAN>;\n- using signed_int = primitive<type::INTEGER>;\n- using floating = primitive<type::FLOAT>;\n+ using boolean = primitive<type::BOOLEAN>;\n+ using integer = primitive<type::INTEGER>;\n+ using floating = primitive<type::FLOAT>;\n \n if( lft->get_type( ) == rght->get_type( ) ) {\n switch (lft->get_type( )) {\n case type::BOOLEAN:\n return compare<boolean>( lft, rght );\n case type::INTEGER:\n- return compare<signed_int>( lft, rght );\n+ return compare<integer>( lft, rght );\n case type::FLOAT:\n return compare<floating>( lft, rght );\n case type::STRING:\n@@ -279,13 +278,12 @@\n case type::TABLE:\n return compare<table>( lft, rght );\n case type::NULL_OBJ:\n- case type::BASE:\n return false;\n }\n } else if( comparable(lft->get_type( ), rght->get_type( ) ) ){\n switch ( lft->get_type( ) ) {\n case type::INTEGER:\n- return compare_numbers<signed_int>( lft, rght );\n+ return compare_numbers<integer>( lft, rght );\n case type::FLOAT:\n return compare_numbers<floating>( lft, rght );\n default:\n"} {"commit":"e7ee72a444beaeaa9b52b2b6bf6a8a4c05c64107","subject":"Add types for TI c6x compiler","message":"Add types for TI c6x compiler\n\n\ngit-svn-id: a21e2c1a9f1a66aa2b49a2fb7314df0f83771e9b@16649 0101bb08-14d6-0310-b084-bc0e0c8e3800\n","repos":"libninjam\/libogg,Distrotech\/libogg,pcwalton\/ogg,KTXSoftware\/ogg,Rillke\/libogg,OffByOneStudios\/ogg,pcwalton\/ogg,pcwalton\/ogg,ahmedammar\/platform_external_gst_ogg,Rillke\/libogg,gcp\/libogg,Distrotech\/libogg,KTXSoftware\/ogg,wighawag\/ogg,oss-forks\/libogg,TechSmith\/libogg,OffByOneStudios\/ogg,oss-forks\/libogg,TitaniumEagle\/libogg,TitaniumEagle\/libogg,ahmedammar\/platform_external_gst_ogg,oss-forks\/libogg,spritebuilder\/ogg,ShiftMediaProject\/ogg,wighawag\/ogg,gcp\/libogg,spritebuilder\/ogg,TechSmith\/libogg,libninjam\/libogg,ShiftMediaProject\/ogg","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/ogg\/os_types.h\n+++ include\/ogg\/os_types.h\n@@ -129,6 +129,15 @@\n typedef unsigned int ogg_uint32_t;\n typedef long long int ogg_int64_t;\n \n+#elif defined(__TMS320C6X__)\n+\n+ \/* TI C64x compiler *\/\n+ typedef signed short ogg_int16_t;\n+ typedef unsigned short ogg_uint16_t;\n+ typedef signed int ogg_int32_t;\n+ typedef unsigned int ogg_uint32_t;\n+ typedef long long int ogg_int64_t;\n+\n #else\n \n # include <sys\/types.h>\n"} {"commit":"6e7c1cdf3288986a28977f1a7e15c492156cdfb6","subject":"Fix doxygen string in core.h causing `make docs` to fail (#2585)","message":"Fix doxygen string in core.h causing `make docs` to fail (#2585)\n\n","repos":"justintime32\/osquery,tburgin\/osquery,friedbutter\/osquery,jacknagz\/osquery,jacknagz\/osquery,hackgnar\/osquery,friedbutter\/osquery,hackgnar\/osquery,PoppySeedPlehzr\/osquery,trizt\/osquery,hackgnar\/osquery,PoppySeedPlehzr\/osquery,justintime32\/osquery,jedi22\/osquery,friedbutter\/osquery,pathcl\/osquery,pathcl\/osquery,PoppySeedPlehzr\/osquery,jacknagz\/osquery,tburgin\/osquery,justintime32\/osquery,tburgin\/osquery,pathcl\/osquery,trizt\/osquery,jedi22\/osquery,jedi22\/osquery,trizt\/osquery","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/osquery\/core.h\n+++ include\/osquery\/core.h\n@@ -148,7 +148,7 @@\n extern const std::string kSDKVersion;\n \n \/**\n- * @breif Compare osquery SDK\/extenion\/core version strings.\n+ * @brief Compare osquery SDK\/extenion\/core version strings.\n *\n * SDK versions are in major.minor.patch-commit-hash form. We provide a helper\n * method for performing version comparisons to allow gating and compatibility\n"} {"commit":"52d9cb66e73e753ddee606d7b90399f25b63afa3","subject":"disable gc by default. all the modules that require backend thread execution face the same problem -- data table can be deconstructed before the thread get joined.","message":"disable gc by default. all the modules that require backend thread execution face the same problem -- data table can be deconstructed before the thread get joined.\n","repos":"jessesleeping\/iso_peloton,PauloAmora\/peloton,vittvolt\/15721-peloton,yingjunwu\/peloton,apavlo\/peloton,seojungmin\/peloton,wangziqi2016\/peloton,eric-haibin-lin\/peloton-1,prashasthip\/peloton,ShuxinLin\/peloton,jessesleeping\/iso_peloton,apavlo\/peloton,vittvolt\/15721-peloton,AngLi-Leon\/peloton,seojungmin\/peloton,yingjunwu\/peloton,seojungmin\/peloton,wangziqi2016\/peloton,wangziqi2016\/peloton,AngLi-Leon\/peloton,ShuxinLin\/peloton,PauloAmora\/peloton,vittvolt\/15721-peloton,phisiart\/peloton-p3,wangziqi2016\/peloton,cmu-db\/peloton,malin1993ml\/peloton,AllisonWang\/peloton,haojin2\/peloton,eric-haibin-lin\/peloton-1,yingjunwu\/peloton,jessesleeping\/iso_peloton,malin1993ml\/peloton,AllisonWang\/peloton,vittvolt\/peloton,yingjunwu\/peloton,phisiart\/peloton-p3,phisiart\/peloton-p3,AngLi-Leon\/peloton,apavlo\/peloton,haojin2\/peloton,jessesleeping\/iso_peloton,eric-haibin-lin\/peloton-1,apavlo\/peloton,AllisonWang\/peloton,malin1993ml\/peloton,cmu-db\/peloton,malin1993ml\/peloton,yingjunwu\/peloton,vittvolt\/peloton,vittvolt\/peloton,AllisonWang\/peloton,seojungmin\/peloton,AngLi-Leon\/peloton,ShuxinLin\/peloton,eric-haibin-lin\/peloton-1,wangziqi2016\/peloton,vittvolt\/peloton,ShuxinLin\/peloton,apavlo\/peloton,malin1993ml\/peloton,wangziqi2016\/peloton,AngLi-Leon\/peloton,jessesleeping\/iso_peloton,phisiart\/peloton-p3,malin1993ml\/peloton,AngLi-Leon\/peloton,seojungmin\/peloton,cmu-db\/peloton,prashasthip\/peloton,AllisonWang\/peloton,phisiart\/peloton-p3,cmu-db\/peloton,PauloAmora\/peloton,prashasthip\/peloton,ShuxinLin\/peloton,cmu-db\/peloton,cmu-db\/peloton,haojin2\/peloton,AllisonWang\/peloton,haojin2\/peloton,vittvolt\/15721-peloton,haojin2\/peloton,vittvolt\/peloton,PauloAmora\/peloton,PauloAmora\/peloton,prashasthip\/peloton,jessesleeping\/iso_peloton,ShuxinLin\/peloton,seojungmin\/peloton,vittvolt\/peloton,PauloAmora\/peloton,jessesleeping\/iso_peloton,prashasthip\/peloton,prashasthip\/peloton,phisiart\/peloton-p3,vittvolt\/15721-peloton,haojin2\/peloton,eric-haibin-lin\/peloton-1,yingjunwu\/peloton,apavlo\/peloton,vittvolt\/15721-peloton,eric-haibin-lin\/peloton-1","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/gc\/gc_manager_factory.h\n+++ src\/backend\/gc\/gc_manager_factory.h\n@@ -19,7 +19,7 @@\n class GCManagerFactory {\n public:\n static GCManager &GetInstance() {\n- static GCManager gc_manager(GC_TYPE_ON);\n+ static GCManager gc_manager(GC_TYPE_OFF);\n return gc_manager;\n }\n \n"} {"commit":"5b63bcb2ee5091ed50dfd67bb8db2ee26c29239e","subject":"Fix for 125373 - crash in crlutil","message":"Fix for 125373 - crash in crlutil\n","repos":"nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/crlutil\/crlutil.c\n+++ security\/nss\/cmd\/crlutil\/crlutil.c\n@@ -195,7 +195,7 @@\n \tconst char *errString;\n \n \terrString = SECU_Strerror(PORT_GetError());\n-\tif (PORT_Strlen (errString) == 0)\n+\tif ( errString && PORT_Strlen (errString) == 0)\n \t SECU_PrintError\n \t\t (progName, \"CRL is not import (error: input CRL is not up to date.)\");\n \telse \n"} {"commit":"1e1b6f2edf823d92b082408703ac84ece72c0209","subject":"Add in one further missing PLDLLIMPEXP macro for plplplotcanvas.h.","message":"Add in one further missing PLDLLIMPEXP macro for plplplotcanvas.h.\n\n\nsvn path=\/trunk\/; revision=9326\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/plplotcanvas.h\n+++ include\/plplotcanvas.h\n@@ -64,7 +64,7 @@\n GnomeCanvasClass parent;\n };\n \n-GType plplot_canvas_get_type();\n+PLDLLIMPEXP_GNOME2 GType plplot_canvas_get_type();\n \n PLDLLIMPEXP_GNOME2 PlplotCanvas* plplot_canvas_new();\n PLDLLIMPEXP_GNOME2 void plplot_canvas_devinit(PlplotCanvas* self);\n"} {"commit":"da1a9d0f5bed1f93908be9233a4fef39b988e505","subject":"Clamp autovacuum launcher sleep time to 5 minutes","message":"Clamp autovacuum launcher sleep time to 5 minutes\n\nThis avoids the problem that it might go to sleep for an unreasonable\namount of time in unusual conditions like the server clock moving\nbackwards an unreasonable amount of time.\n\n(Simply moving the server clock forward again doesn't solve the problem\nunless you wake up the autovacuum launcher manually, say by sending it\nSIGHUP).\n\nPer trouble report from Prakash Itnal in\nhttps:\/\/www.postgresql.org\/message-id\/CAHC5u79-UqbapAABH2t4Rh2eYdyge0Zid-X=Xz-ZWZCBK42S0Q@mail.gmail.com\n\nAnalyzed independently by Haribabu Kommi and Tom Lane.\n","repos":"Postgres-XL\/Postgres-XL,lisakowen\/gpdb,zeroae\/postgres-xl,oberstet\/postgres-xl,lisakowen\/gpdb,zeroae\/postgres-xl,ashwinstar\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,yazun\/postgres-xl,zeroae\/postgres-xl,adam8157\/gpdb,oberstet\/postgres-xl,greenplum-db\/gpdb,adam8157\/gpdb,zeroae\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,ovr\/postgres-xl,xinzweb\/gpdb,oberstet\/postgres-xl,jmcatamney\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,50wu\/gpdb,yazun\/postgres-xl,greenplum-db\/gpdb,yazun\/postgres-xl,greenplum-db\/gpdb,ovr\/postgres-xl,pavanvd\/postgres-xl,techdragon\/Postgres-XL,xinzweb\/gpdb,greenplum-db\/gpdb,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,pavanvd\/postgres-xl,Postgres-XL\/Postgres-XL,adam8157\/gpdb,Postgres-XL\/Postgres-XL,ashwinstar\/gpdb,yazun\/postgres-xl,pavanvd\/postgres-xl,greenplum-db\/gpdb,jmcatamney\/gpdb,techdragon\/Postgres-XL,oberstet\/postgres-xl,jmcatamney\/gpdb,Postgres-XL\/Postgres-XL,xinzweb\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,oberstet\/postgres-xl,xinzweb\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,pavanvd\/postgres-xl,ovr\/postgres-xl,ovr\/postgres-xl,jmcatamney\/gpdb,lisakowen\/gpdb,ovr\/postgres-xl,zeroae\/postgres-xl,pavanvd\/postgres-xl,techdragon\/Postgres-XL,techdragon\/Postgres-XL,50wu\/gpdb,50wu\/gpdb,techdragon\/Postgres-XL,50wu\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,yazun\/postgres-xl,adam8157\/gpdb,50wu\/gpdb,adam8157\/gpdb,50wu\/gpdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/backend\/postmaster\/autovacuum.c\n+++ src\/backend\/postmaster\/autovacuum.c\n@@ -128,6 +128,7 @@\n \n \/* the minimum allowed time between two awakenings of the launcher *\/\n #define MIN_AUTOVAC_SLEEPTIME 100.0\t\t\/* milliseconds *\/\n+#define MAX_AUTOVAC_SLEEPTIME 300\t\t\/* seconds *\/\n \n \/* Flags to tell if we are in an autovacuum process *\/\n static bool am_autovacuum_launcher = false;\n@@ -844,6 +845,15 @@\n \t\tnap->tv_sec = 0;\n \t\tnap->tv_usec = MIN_AUTOVAC_SLEEPTIME * 1000;\n \t}\n+\n+\t\/*\n+\t * If the sleep time is too large, clamp it to an arbitrary maximum (plus\n+\t * any fractional seconds, for simplicity). This avoids an essentially\n+\t * infinite sleep in strange cases like the system clock going backwards a\n+\t * few years.\n+\t *\/\n+\tif (nap->tv_sec > MAX_AUTOVAC_SLEEPTIME)\n+\t\tnap->tv_sec = MAX_AUTOVAC_SLEEPTIME;\n }\n \n \/*\n"} {"commit":"4f20897276afdd015e6996963ca45d39bf5d01c4","subject":"fix for bug 287625: rsaperf should run multithreaded","message":"fix for bug 287625: rsaperf should run multithreaded\n","repos":"ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/rsaperf\/rsaperf.c\n+++ security\/nss\/cmd\/rsaperf\/rsaperf.c\n@@ -47,6 +47,7 @@\n #define MAX_RSA_MODULUS_BYTES (1024\/8)\n #define DEFAULT_ITERS 10\n #define DEFAULT_DURATION 10\n+#define DEFAULT_THREADS 1\n \n extern NSSLOWKEYPrivateKey * getDefaultRSAPrivateKey(void);\n extern NSSLOWKEYPublicKey * getDefaultRSAPublicKey(void);\n@@ -54,9 +55,9 @@\n typedef struct TimingContextStr TimingContext;\n \n struct TimingContextStr {\n- int64 start;\n- int64 end;\n- int64 interval;\n+ PRTime start;\n+ PRTime end;\n+ PRTime interval;\n \n long days; \n int hours; \n@@ -66,20 +67,20 @@\n };\n \n TimingContext *CreateTimingContext(void) {\n- return PR_Malloc(sizeof(TimingContext));\n+ return PORT_Alloc(sizeof(TimingContext));\n }\n \n void DestroyTimingContext(TimingContext *ctx) {\n- PR_Free(ctx);\n-}\n-\n-void TimingBegin(TimingContext *ctx) {\n- ctx->start = PR_Now();\n+ PORT_Free(ctx);\n+}\n+\n+void TimingBegin(TimingContext *ctx, PRTime begin) {\n+ ctx->start = begin;\n }\n \n static void timingUpdate(TimingContext *ctx) {\n- int64 tmp, remaining;\n- int64 L1000,L60,L24;\n+ PRInt64 tmp, remaining;\n+ PRInt64 L1000,L60,L24;\n \n LL_I2L(L1000,1000);\n LL_I2L(L60,60);\n@@ -101,15 +102,15 @@\n LL_L2I(ctx->days, remaining);\n }\n \n-void TimingEnd(TimingContext *ctx) {\n- ctx->end = PR_Now();\n+void TimingEnd(TimingContext *ctx, PRTime end) {\n+ ctx->end = end;\n LL_SUB(ctx->interval, ctx->end, ctx->start);\n PORT_Assert(LL_GE_ZERO(ctx->interval));\n timingUpdate(ctx);\n }\n \n void TimingDivide(TimingContext *ctx, int divisor) {\n- int64 tmp;\n+ PRInt64 tmp;\n \n LL_I2L(tmp, divisor);\n LL_DIV(ctx->interval, ctx->interval, tmp);\n@@ -151,8 +152,8 @@\n void\n Usage(char *progName)\n {\n- fprintf(stderr, \"Usage: %s [-d certdir] [-i iterations | -p period] [-s | -e]\"\n-\t \" -n nickname\\n\",\n+ fprintf(stderr, \"Usage: %s [-d certdir] [-t threads] [-i iterations | -p period] \"\n+\t \"[-s | -e] -n nickname\\n\",\n \t progName);\n fprintf(stderr, \"%-20s Cert database directory (default is ~\/.netscape)\\n\",\n \t \"-d certdir\");\n@@ -160,6 +161,7 @@\n fprintf(stderr, \"%-20s How many seconds to run\\n\", \"-p period\");\n fprintf(stderr, \"%-20s Perform signing (private key) operations\\n\", \"-s\");\n fprintf(stderr, \"%-20s Perform encryption (public key) operations\\n\", \"-e\");\n+ fprintf(stderr, \"%-20s Number of execution threads\\n\", \"-t threads(default 1)\");\n fprintf(stderr, \"%-20s Nickname of certificate or key\\n\", \"-n nickname\");\n exit(-1);\n }\n@@ -226,6 +228,57 @@\n \t\t\t unsigned char * output,\n \t\t unsigned char * input);\n \n+typedef struct ThreadRunDataStr ThreadRunData;\n+\n+struct ThreadRunDataStr {\n+ const PRBool *doIters;\n+ const void *rsaKey;\n+ const unsigned char *buf;\n+ RSAOp fn;\n+ int seconds;\n+ long iters;\n+ long iterRes;\n+ PRErrorCode errNum;\n+ SECStatus status;\n+ PRTime tstart;\n+ PRTime tstop;\n+};\n+\n+\n+void ThreadExecFunction(void *data)\n+{\n+ ThreadRunData *tdata = (ThreadRunData*)data;\n+ unsigned char buf2[1024];\n+\n+ tdata->status = SECSuccess;\n+ tdata->tstart = PR_Now();\n+ if (*tdata->doIters) {\n+ long i = tdata->iters;\n+ tdata->iterRes = tdata->iters;\n+ while (i--) {\n+ SECStatus rv = tdata->fn((void*)tdata->rsaKey, buf2, (unsigned char*)tdata->buf);\n+ if (rv != SECSuccess) {\n+ tdata->errNum = PORT_GetError();\n+ tdata->status = rv;\n+ return;\n+ }\n+ }\n+ } else {\n+ PRIntervalTime total = PR_SecondsToInterval(tdata->seconds);\n+ PRIntervalTime start = PR_IntervalNow();\n+ tdata->iterRes = 0;\n+ while (PR_IntervalNow() - start < total) {\n+ SECStatus rv = tdata->fn((void*)tdata->rsaKey, buf2, (unsigned char*)tdata->buf);\n+ if (rv != SECSuccess) {\n+ tdata->errNum = PORT_GetError();\n+ tdata->status = rv;\n+ return;\n+ }\n+ tdata->iterRes++;\n+ }\n+ }\n+ tdata->tstop = PR_Now();\n+}\n \n int\n main(int argc, char **argv)\n@@ -253,13 +306,19 @@\n int seconds = DEFAULT_DURATION;\n PRBool doIters = PR_FALSE;\n PRBool doTime = PR_FALSE;\n+ int threadNum = DEFAULT_THREADS;\n+ ThreadRunData ** runDataArr = NULL;\n+ PRThread ** threadsArr = NULL;\n+ int calcThreads = 0;\n+ PRTime startTimeAcc = 0;\n+ PRTime stopTimeAcc = 0;\n \n progName = strrchr(argv[0], '\/');\n if (!progName)\n \tprogName = strrchr(argv[0], '\\\\');\n progName = progName ? progName+1 : argv[0];\n \n- optstate = PL_CreateOptState(argc, argv, \"d:i:sen:p:\");\n+ optstate = PL_CreateOptState(argc, argv, \"d:i:sen:p:t:\");\n while ((optstatus = PL_GetNextOpt(optstate)) == PL_OPT_OK) {\n \tswitch (optstate->option) {\n \tcase '?':\n@@ -285,6 +344,9 @@\n seconds = (atol(optstate->value)>0?atol(optstate->value):DEFAULT_DURATION);\n doTime = PR_TRUE;\n break;\n+\tcase 't':\n+\t threadNum = (atoi(optstate->value) > 0) ? atoi(optstate->value) : DEFAULT_THREADS;\n+\t break;\n \t}\n }\n if (optstatus == PL_OPT_BAD)\n@@ -381,7 +443,7 @@\n \tPRErrorCode errNum;\n \tconst char * errStr = NULL;\n \n-\terrNum = PR_GetError();\n+\terrNum = PORT_GetError();\n \tif (errNum)\n \t errStr = SECU_Strerror(errNum);\n \telse\n@@ -393,38 +455,53 @@\n }\n \n \/* printf(\"START\\n\");\t*\/\n+ threadsArr = (PRThread**)PORT_Alloc(threadNum*sizeof(PRThread*));\n+ runDataArr = (ThreadRunData**)PORT_Alloc(threadNum*sizeof(ThreadRunData*));\n+ for (i = 0;i < threadNum;i++) {\n+ runDataArr[i] = (ThreadRunData*)PORT_Alloc(sizeof(ThreadRunData));\n+ runDataArr[i]->fn = fn;\n+ runDataArr[i]->buf = buf;\n+ runDataArr[i]->doIters = &doIters;\n+ runDataArr[i]->rsaKey = rsaKey;\n+ runDataArr[i]->seconds = seconds;\n+ runDataArr[i]->iters = iters;\n+ threadsArr[i] = \n+ PR_CreateThread(PR_USER_THREAD,\n+ ThreadExecFunction,\n+ (void*) runDataArr[i],\n+ PR_PRIORITY_NORMAL,\n+ PR_GLOBAL_THREAD,\n+ PR_JOINABLE_THREAD,\n+ 0);\n+ }\n+ iters = 0;\n+ calcThreads = 0;\n+ stopTimeAcc = startTimeAcc = 0;\n+ for (i = 0;i < threadNum;i++, calcThreads++)\n+ {\n+ PR_JoinThread(threadsArr[i]);\n+ if (runDataArr[i]->status != SECSuccess) {\n+ const char * errStr = SECU_Strerror(runDataArr[i]->errNum);\n+ fprintf(stderr, \"Thread %d: Error in RSA operation: %d : %s\\n\", \n+ i, runDataArr[i]->errNum, errStr);\n+ calcThreads -= 1;\n+ } else {\n+ startTimeAcc += runDataArr[i]->tstart;\n+ stopTimeAcc += runDataArr[i]->tstop;\n+ iters += runDataArr[i]->iterRes;\n+ }\n+ PORT_Free((void*)runDataArr[i]);\n+ }\n+ PORT_Free(runDataArr);\n+ PORT_Free(threadsArr);\n+ \n+ LL_DIV(startTimeAcc, startTimeAcc, (PRInt64)calcThreads);\n+ LL_DIV(stopTimeAcc, stopTimeAcc, (PRInt64)calcThreads);\n \n timeCtx = CreateTimingContext();\n- TimingBegin(timeCtx);\n- if (doIters) {\n- i = iters;\n- while (i--) {\n- rv = fn(rsaKey, buf2, buf);\n- if (rv != SECSuccess) {\n- PRErrorCode errNum = PR_GetError();\n- const char * errStr = SECU_Strerror(errNum);\n- fprintf(stderr, \"Error in RSA operation: %d : %s\\n\", \n- errNum, errStr);\n- exit(1);\n- }\n- }\n- } else {\n- PRIntervalTime total = PR_SecondsToInterval(seconds);\n- PRIntervalTime start = PR_IntervalNow();\n- iters = 0;\n- while (PR_IntervalNow() - start < total) {\n- rv = fn(rsaKey, buf2, buf);\n- if (rv != SECSuccess) {\n- PRErrorCode errNum = PR_GetError();\n- const char * errStr = SECU_Strerror(errNum);\n- fprintf(stderr, \"Error in RSA operation: %d : %s\\n\", \n- errNum, errStr);\n- exit(1);\n- }\n- iters++;\n- }\n- }\n- TimingEnd(timeCtx);\n+ TimingBegin(timeCtx, startTimeAcc);\n+ TimingEnd(timeCtx, stopTimeAcc);\n+ \n printf(\"%ld iterations in %s\\n\",\n \t iters, TimingGenerateString(timeCtx));\n printf(\"%.2f operations\/s .\\n\", ((double)(iters)*(double)1000000.0) \/ (double)timeCtx->interval );\n"} {"commit":"29906411142b472f2e79673773d91e47bea39dd2","subject":"Renamed enums values, typo fix in jpegenc.h.","message":"Renamed enums values, typo fix in jpegenc.h.\n","repos":"Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,Rinnegatamante\/vita-headers,Rinnegatamante\/vita-headers,vitasdk\/vita-headers,vitasdk\/vita-headers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/psp2\/jpegenc.h\n+++ include\/psp2\/jpegenc.h\n@@ -13,7 +13,7 @@\n typedef enum SceJpegEncErrorCode {\n \tSCE_JPEGENC_ERROR_IMAGE_SIZE = 0x80650200,\n \tSCE_JPEGENC_ERROR_INSUFFICIENT_BUFFER = 0x80650201,\n-\tSCE_JPEGNEC_ERROR_INVALID_COMPRATIO = 0x80650202,\n+\tSCE_JPEGENC_ERROR_INVALID_COMPRATIO = 0x80650202,\n \tSCE_JPEGENC_ERROR_INVALID_PIXELFORMAT = 0x80650203,\n \tSCE_JPEGENC_ERROR_INVALID_HEADER_MODE = 0x80650204,\n \tSCE_JPEGENC_ERROR_INVALID_POINTER = 0x80650205,\n@@ -21,15 +21,15 @@\n } SceJpegEncErrorCode;\n \n typedef enum SceJpegEncoderPixelFormat {\n-\tPIXELFORMAT_ARGB8888 = 0, \/\/!< ARGB8888 format\n-\tPIXELFORMAT_YCBCR420 = 8, \/\/!< YCbCr420 format\n-\tPIXELFORMAT_YCBCR422 = 9, \/\/!< YCbCr422 format\n-\tPIXELFORMAT_CSC_ARGB_YCBCR = 16 \/\/!< ARGB to YCbCr color conversion flag\n+\tSCE_JPEGENC_PIXELFORMAT_ARGB8888 = 0, \/\/!< ARGB8888 format\n+\tSCE_JPEGENC_PIXELFORMAT_YCBCR420 = 8, \/\/!< YCbCr420 format\n+\tSCE_JPEGENC_PIXELFORMAT_YCBCR422 = 9, \/\/!< YCbCr422 format\n+\tSCE_JPEGENC_PIXELFORMAT_CSC_ARGB_YCBCR = 16 \/\/!< ARGB to YCbCr color conversion flag\n } SceJpegEncoderPixelFormat;\n \n typedef enum SceJpegEncoderHeaderMode {\n-\tHEADER_MODE_JPEG = 0, \/\/!< JPEG header mode\n-\tHEADER_MODE_MJPEG = 1 \/\/!< MJPEG header mode\n+\tSCE_JPEGENC_HEADER_MODE_JPEG = 0, \/\/!< JPEG header mode\n+\tSCE_JPEGENC_HEADER_MODE_MJPEG = 1 \/\/!< MJPEG header mode\n } SceJpegEncoderHeaderMode;\n \n \/**\n"} {"commit":"615704af1e5868c6fc9001ee5daef68db6d10f76","subject":"More fixes for shutdown during recovery.","message":"More fixes for shutdown during recovery.\n\n1. If we receive a fast shutdown request while in the PM_STARTUP state,\nprocess it just as we would in PM_RECOVERY, PM_HOT_STANDBY, or PM_RUN.\nWithout this change, an early fast shutdown followed by Hot Standby causes\nthe database to get stuck in a state where a shutdown is pending (so no new\nconnections are allowed) but the shutdown request is never processed unless\nwe end Hot Standby and enter normal running.\n\n2. Avoid removing the backup label file when a smart or fast shutdown occurs\nduring recovery. It makes sense to do this once we've reached normal running,\nsince we must be taking a backup which now won't be valid. But during\nrecovery we must be recovering from a previously taken backup, and any backup\nlabel file is needed to restart recovery from the right place.\n\nFujii Masao and Robert Haas\n","repos":"jmcatamney\/gpdb,lisakowen\/gpdb,snaga\/postgres-xl,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,zeroae\/postgres-xl,lisakowen\/gpdb,kmjungersen\/PostgresXL,50wu\/gpdb,ovr\/postgres-xl,50wu\/gpdb,lisakowen\/gpdb,50wu\/gpdb,arcivanov\/postgres-xl,Postgres-XL\/Postgres-XL,zeroae\/postgres-xl,ovr\/postgres-xl,jmcatamney\/gpdb,adam8157\/gpdb,Postgres-XL\/Postgres-XL,pavanvd\/postgres-xl,snaga\/postgres-xl,xinzweb\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,techdragon\/Postgres-XL,arcivanov\/postgres-xl,postmind-net\/postgres-xl,jmcatamney\/gpdb,greenplum-db\/gpdb,yazun\/postgres-xl,adam8157\/gpdb,postmind-net\/postgres-xl,xinzweb\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,arcivanov\/postgres-xl,ashwinstar\/gpdb,oberstet\/postgres-xl,greenplum-db\/gpdb,jmcatamney\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,zeroae\/postgres-xl,50wu\/gpdb,pavanvd\/postgres-xl,oberstet\/postgres-xl,kmjungersen\/PostgresXL,tpostgres-projects\/tPostgres,pavanvd\/postgres-xl,xinzweb\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,kmjungersen\/PostgresXL,greenplum-db\/gpdb,techdragon\/Postgres-XL,kmjungersen\/PostgresXL,ashwinstar\/gpdb,ovr\/postgres-xl,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,yazun\/postgres-xl,pavanvd\/postgres-xl,ashwinstar\/gpdb,postmind-net\/postgres-xl,lisakowen\/gpdb,postmind-net\/postgres-xl,arcivanov\/postgres-xl,zeroae\/postgres-xl,lisakowen\/gpdb,arcivanov\/postgres-xl,greenplum-db\/gpdb,xinzweb\/gpdb,oberstet\/postgres-xl,snaga\/postgres-xl,greenplum-db\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,oberstet\/postgres-xl,yazun\/postgres-xl,adam8157\/gpdb,techdragon\/Postgres-XL,snaga\/postgres-xl,yazun\/postgres-xl,greenplum-db\/gpdb,ovr\/postgres-xl,techdragon\/Postgres-XL,50wu\/gpdb,50wu\/gpdb,techdragon\/Postgres-XL,pavanvd\/postgres-xl,kmjungersen\/PostgresXL,Postgres-XL\/Postgres-XL,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,arcivanov\/postgres-xl,yazun\/postgres-xl,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,tpostgres-projects\/tPostgres,jmcatamney\/gpdb,Postgres-XL\/Postgres-XL,ovr\/postgres-xl,snaga\/postgres-xl,postmind-net\/postgres-xl,adam8157\/gpdb,jmcatamney\/gpdb,tpostgres-projects\/tPostgres,ashwinstar\/gpdb,oberstet\/postgres-xl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/postmaster\/postmaster.c\n+++ src\/backend\/postmaster\/postmaster.c\n@@ -37,7 +37,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $PostgreSQL: pgsql\/src\/backend\/postmaster\/postmaster.c,v 1.608 2010\/05\/15 20:01:32 rhaas Exp $\n+ *\t $PostgreSQL: pgsql\/src\/backend\/postmaster\/postmaster.c,v 1.609 2010\/05\/26 12:32:41 rhaas Exp $\n *\n * NOTES\n *\n@@ -286,6 +286,8 @@\n } PMState;\n \n static PMState pmState = PM_INIT;\n+\n+static bool ReachedNormalRunning = false;\t\/* T if we've reached PM_RUN *\/\n \n bool\t\tClientAuthInProgress = false;\t\t\/* T during new-client\n \t\t\t\t\t\t\t\t\t\t\t\t * authentication *\/\n@@ -2168,7 +2170,7 @@\n \t\t\t\t\t(errmsg(\"received smart shutdown request\")));\n \n \t\t\tif (pmState == PM_RUN || pmState == PM_RECOVERY ||\n-\t\t\t\tpmState == PM_HOT_STANDBY)\n+\t\t\t\tpmState == PM_HOT_STANDBY || pmState == PM_STARTUP)\n \t\t\t{\n \t\t\t\t\/* autovacuum workers are told to shut down immediately *\/\n \t\t\t\tSignalAutovacWorkers(SIGTERM);\n@@ -2370,6 +2372,7 @@\n \t\t\t * Startup succeeded, commence normal operations\n \t\t\t *\/\n \t\t\tFatalError = false;\n+\t\t\tReachedNormalRunning = true;\n \t\t\tpmState = PM_RUN;\n \n \t\t\t\/*\n@@ -3028,9 +3031,15 @@\n \t\t{\n \t\t\t\/*\n \t\t\t * Terminate backup mode to avoid recovery after a clean fast\n-\t\t\t * shutdown.\n+\t\t\t * shutdown. Since a backup can only be taken during normal\n+\t\t\t * running (and not, for example, while running under Hot Standby)\n+\t\t\t * it only makes sense to do this if we reached normal running.\n+\t\t\t * If we're still in recovery, the backup file is one we're\n+\t\t\t * recovering *from*, and we must keep it around so that recovery\n+\t\t\t * restarts from the right place.\n \t\t\t *\/\n-\t\t\tCancelBackup();\n+\t\t\tif (ReachedNormalRunning)\n+\t\t\t\tCancelBackup();\n \n \t\t\t\/* Normal exit from the postmaster is here *\/\n \t\t\tExitPostmaster(0);\n"} {"commit":"d0966cdf32c1dc2f006eee98f9cca56ccfa239d8","subject":"common.h: RL_MEMTRACK defined\/undefined to be friendly to ctags\/cscope","message":"common.h: RL_MEMTRACK defined\/undefined to be friendly to ctags\/cscope\n","repos":"autrimpo\/rlite,vmaffione\/rlite,vmaffione\/rlite,autrimpo\/rlite,autrimpo\/rlite,vmaffione\/rlite,autrimpo\/rlite,vmaffione\/rlite","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/rlite\/common.h\n+++ include\/rlite\/common.h\n@@ -267,8 +267,9 @@\n #define RL_VERB_DBG 4\n #define RL_VERB_VERY 5\n \n-\/* Memtrack machinery *\/\n-\/\/#define RL_MEMTRACK\n+\/* Memtrack machinery, disabled by default. *\/\n+#define RL_MEMTRACK\n+#undef RL_MEMTRACK\n \n #ifdef __cplusplus\n }\n"} {"commit":"7ced34995a8af3c84b4b8366aa89b13bc512ebf8","subject":"Added SG_CALL, deprecated SG_EXPORT.","message":"Added SG_CALL, deprecated SG_EXPORT.\n","repos":"SIEGE\/siege,SIEGE\/siege,SIEGE\/siege,SIEGE\/siege","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/siege\/common.h\n+++ include\/siege\/common.h\n@@ -118,18 +118,24 @@\n *\/\n #define SIEGE_TEST\n \n-#ifndef SG_EXPORT\n+#ifndef SG_CALL\n #\tif defined(__WIN32)\n-#\t\tdefine SG_EXPORT __cdecl\n+# define SG_CALL __cdecl\n #\telse\n \/**\n * \\brief Exported in siege calling convention\n *\n * This is used in all SIEGE functions. SIEGE currently uses the cdecl calling convention.\n *\/\n-#\t\tdefine SG_EXPORT\n+# define SG_CALL\n #\tendif \/\/ defined(__WIN32)\n #endif \/\/ defined(SG_EXPORT)\n+\n+\/**\n+ * WARNING: SG_EXPORT IS DEPRECATED*, USE SG_CALL INSTEAD\n+ * (* will be reintroduced with a different meaning later on)\n+ *\/\n+#define SG_EXPORT SG_CALL\n \n \/**\n * \\name Version information\n"} {"commit":"68f9e185895a404e1d733809dd0aaff847bc6419","subject":"Implement lcurve and rcurve.","message":"Implement lcurve and rcurve.\n","repos":"kbrock\/graphviz,jho1965us\/graphviz,ellson\/graphviz,kbrock\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,kbrock\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,kbrock\/graphviz,tkelman\/graphviz,ellson\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,kbrock\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,tkelman\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,ellson\/graphviz,pixelglow\/graphviz,kbrock\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,BMJHayward\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,ellson\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,pixelglow\/graphviz,pixelglow\/graphviz,tkelman\/graphviz,kbrock\/graphviz,MjAbuz\/graphviz,pixelglow\/graphviz,BMJHayward\/graphviz,jho1965us\/graphviz,kbrock\/graphviz,jho1965us\/graphviz,ellson\/graphviz,pixelglow\/graphviz,MjAbuz\/graphviz,jho1965us\/graphviz,jho1965us\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,MjAbuz\/graphviz,tkelman\/graphviz,MjAbuz\/graphviz,kbrock\/graphviz,ellson\/graphviz,BMJHayward\/graphviz,pixelglow\/graphviz","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- lib\/common\/arrows.c\n+++ lib\/common\/arrows.c\n@@ -636,6 +636,10 @@\n AF[2].y = AF[3].y - w.y * 4.0 \/ 3.0;\n \n gvrender_polyline(job, a, 2);\n+ if (flag & ARR_MOD_LEFT)\n+\tBezier(AF, 3, 0.5, NULL, AF);\n+ else if (flag & ARR_MOD_RIGHT)\n+\tBezier(AF, 3, 0.5, AF, NULL);\n gvrender_beziercurve(job, AF, sizeof(AF) \/ sizeof(pointf), FALSE, FALSE, FALSE);\n }\n \n"} {"commit":"2a3039f870912c5fb3d96326d921a77c98e0ab52","subject":"fix cpio header documentation format","message":"fix cpio header documentation format\n","repos":"kyuba\/curie,kyuba\/curie","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/sievert\/cpio.h\n+++ include\/sievert\/cpio.h\n@@ -1,22 +1,29 @@\n-\/*\n- * This file is part of the becquerel.org Curie project.\n- * See the appropriate repository at http:\/\/git.becquerel.org\/ for exact file\n- * modification records.\n-*\/\n-\n-\/*\n+\/**\\file\n+ * \\brief CPIO Archive Support\n+ *\n+ * CPIO is a very simple archive format used in unix environments. Supporting\n+ * an archive format is useful in certain contexts, such as when it would be\n+ * beneficial to include several data or source files in a created binary.\n+ *\n+ * The CPIO format was chosen due to its simplicity. Technically it would've\n+ * been possible to strip the data even further since most of the file header\n+ * information in this format is rather useless to curie applications, but that\n+ * would have required inventing yet another new archive file format, so\n+ * choosing the simplest archive format in actual use seemed more logical.\n+ *\n+ * \\copyright\n * Copyright (c) 2008-2014, Kyuba Project Members\n- *\n+ * \\copyright\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n- *\n+ * \\copyright\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n- *\n+ * \\copyright\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n@@ -24,20 +31,9 @@\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n-*\/\n-\n-\/*! \\file\n- * \\brief CPIO Archive Support\n *\n- * CPIO is a very simple archive format used in unix environments. Supporting\n- * an archive format is useful in certain contexts, such as when it would be\n- * beneficial to include several data or source files in a created binary.\n- *\n- * The CPIO format was chosen due to its simplicity. Technically it would've\n- * been possible to strip the data even further since most of the file header\n- * information in this format is rather useless to curie applications, but that\n- * would have required inventing yet another new archive file format, so\n- * choosing the simplest archive format in actual use seemed more logical.\n+ * \\see Project Documentation: http:\/\/ef.gy\/documentation\/curie\n+ * \\see Project Source Code: http:\/\/git.becquerel.org\/kyuba\/curie.git\n *\/\n \n #ifndef LIBSIEVERT_CPIO_H\n@@ -48,57 +44,57 @@\n #endif\n \n #include <sievert\/metadata.h>\n-#include <curie\/io.h>\n \n-\/*! \\brief CPIO Archive Handle\n+\/**\\brief CPIO Archive Handle\n *\n- * This structure is used to keep track of the state of a created archive. The\n- * contents are not really important to users, so the struct's definition is\n- * hidden.\n+ * This structure is used to keep track of the state of a created archive. The\n+ * contents are not really important to users, so the struct's definition is\n+ * hidden.\n *\/\n struct cpio;\n \n-\/*! \\brief Initialise the CPIO Multiplexer\n+\/**\\brief Initialise the CPIO Multiplexer\n *\n- * As is customary with curie, the CPIO code is designed as a stream processor.\n- * This function will make sure the main multiplexer is set up to work properly\n- * with the CPIO code.\n+ * As is customary with curie, the CPIO code is designed as a stream processor.\n+ * This function will make sure the main multiplexer is set up to work properly\n+ * with the CPIO code.\n *\n- * \\note It's perfectly legitimate to omit the call to multiplex_cpio() if you\n- * only intend to use iot_buffer type I\/O structures, as these don't\n- * actually operate on streams.\n+ * \\note It's perfectly legitimate to omit the call to multiplex_cpio() if you\n+ * only intend to use iot_buffer type I\/O structures, as these don't\n+ * actually operate on streams.\n *\/\n void multiplex_cpio\n ( void );\n \n-\/*! \\brief Read a CPIO Archive\n- * \\param[in] io The archive to read.\n- * \\param[in] regex Whitelist for filenames.\n- * \\param[in] on_new_file Callback when a new file is found.\n- * \\param[in] on_end_of_archive Callback when the archive has ended.\n- * \\param[in] aux Auxiliary data for the callbacks.\n+\/**\\brief Read a CPIO Archive\n *\n- * This will read a CPIO archive, given as a struct io. Whenever a new file\n- * header is read from the io struct, its filename is matched against the\n- * passed regex. If it matches, on_new_file() is called with a struct io\n- * containing the file data and the file's name. Once the end of the archive\n- * is read, on_end_of_archive() is called. After this last call, iot_buffer\n- * type io structures passed to on_new_file() may have their data buffers\n- * invalidated.\n+ * \\param[in] io The archive to read.\n+ * \\param[in] regex Whitelist for filenames.\n+ * \\param[in] on_new_file Callback when a new file is found.\n+ * \\param[in] on_end_of_archive Callback when the archive has ended.\n+ * \\param[in] aux Auxiliary data for the callbacks.\n *\n- * \\note A further note on that last bit; if you actually pass an iot_buffer\n- * type io struct as the first parameter to this function, you don't\n- * have to worry about some remaining buffers getting invalidated halfway\n- * through being processed since you need to free the passed buffer\n- * yourself. On the other hand, when passing a stream, you need to make\n- * sure that you weren't passed an iot_buffer in your on_new_file()\n- * function and accidentally try to use it after you get the\n- * on_end_of_archive() event, or anywhere after that for that matter.\n+ * This will read a CPIO archive, given as a struct io. Whenever a new file\n+ * header is read from the io struct, its filename is matched against the\n+ * passed regex. If it matches, on_new_file() is called with a struct io\n+ * containing the file data and the file's name. Once the end of the archive\n+ * is read, on_end_of_archive() is called. After this last call, iot_buffer\n+ * type io structures passed to on_new_file() may have their data buffers\n+ * invalidated.\n *\n- * \\note The file name and metadata passed to the on_new_file() function are\n- * volatile, meaning that you may only use them before returning from\n- * this function. Afterwards, these pointers will quite likely contain\n- * garbage.\n+ * \\note A further note on that last bit; if you actually pass an iot_buffer\n+ * type io struct as the first parameter to this function, you don't\n+ * have to worry about some remaining buffers getting invalidated halfway\n+ * through being processed since you need to free the passed buffer\n+ * yourself. On the other hand, when passing a stream, you need to make\n+ * sure that you weren't passed an iot_buffer in your on_new_file()\n+ * function and accidentally try to use it after you get the\n+ * on_end_of_archive() event, or anywhere after that for that matter.\n+ *\n+ * \\note The file name and metadata passed to the on_new_file() function are\n+ * volatile, meaning that you may only use them before returning from\n+ * this function. Afterwards, these pointers will quite likely contain\n+ * garbage.\n *\/\n void cpio_read_archive\n ( struct io *io, const char *regex,\n@@ -107,43 +103,45 @@\n void (*on_end_of_archive) (void *aux),\n void *aux );\n \n-\/*! \\brief Create a CPIO Archive\n- * \\param[out] out Output file.\n- * \\return The new cpio structure.\n+\/**\\brief Create a CPIO Archive\n+ * \\param[out] out Output file.\n+ * \\return The new cpio structure.\n *\n- * Creates a new CPIO handle that will write its data to the given output\n- * file.\n+ * Creates a new CPIO handle that will write its data to the given output\n+ * file.\n *\/\n struct cpio *cpio_create_archive\n ( struct io *out );\n \n-\/*! \\brief Add a File to a CPIO Archive\n- * \\param[out] cpio The archive to add the file to.\n- * \\param[in] filename Name of the file to create.\n- * \\param[in] metadata File attributes. May be 0 for \"sane\" defaults.\n- * \\param[in] file File data to fill the file with.\n+\/**\\brief Add a File to a CPIO Archive\n *\n- * Use this function to add a file to a CPIO archive. Most file metadata is\n- * stubbed with more or less sane defaults if you pass a 0-pointer instead of\n- * an actual metadata struct. The file data is added immediately if file is an\n- * iot_buffer type structure, otherwise it is added with the next call to\n- * cpio_close() or cpio_next_file().\n+ * \\param[out] cpio The archive to add the file to.\n+ * \\param[in] filename Name of the file to create.\n+ * \\param[in] metadata File attributes. May be 0 for \"sane\" defaults.\n+ * \\param[in] file File data to fill the file with.\n *\n- * Make sure filename is not made unavailable until the data is written, if\n- * need be, use the str_immutable() function. The same applies to the metadata\n- * struct if you pass one. Also note that this function will call io_close() on\n- * the file when appropriate, so do not manually close the file after passing\n- * it to this function.\n+ * Use this function to add a file to a CPIO archive. Most file metadata is\n+ * stubbed with more or less sane defaults if you pass a 0-pointer instead of\n+ * an actual metadata struct. The file data is added immediately if file is an\n+ * iot_buffer type structure, otherwise it is added with the next call to\n+ * cpio_close() or cpio_next_file().\n+ *\n+ * Make sure filename is not made unavailable until the data is written, if\n+ * need be, use the str_immutable() function. The same applies to the metadata\n+ * struct if you pass one. Also note that this function will call io_close() on\n+ * the file when appropriate, so do not manually close the file after passing\n+ * it to this function.\n *\/\n void cpio_next_file\n ( struct cpio *cpio, const char *filename, struct metadata *metadata,\n struct io *file );\n \n-\/*! \\brief Finalise a CPIO Archive\n- * \\param[in] cpio The archive to close.\n+\/**\\brief Finalise a CPIO Archive\n *\n- * This will write the archive's trailer, flush all data and close the output\n- * stream.\n+ * \\param[in] cpio The archive to close.\n+ *\n+ * This will write the archive's trailer, flush all data and close the output\n+ * stream.\n *\/\n void cpio_close\n ( struct cpio *cpio );\n"} {"commit":"9fc9e7d0d498e435ee27913d7f5714000fc82ad5","subject":"Add short descriptions","message":"Add short descriptions\n","repos":"chrismoulton\/Varnish-Cache,varnish\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,alarky\/varnish-cache-doc-ja,1HLtd\/Varnish-Cache,alarky\/varnish-cache-doc-ja,franciscovg\/Varnish-Cache,1HLtd\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,mrhmouse\/Varnish-Cache,mrhmouse\/Varnish-Cache,1HLtd\/Varnish-Cache,chrismoulton\/Varnish-Cache,mrhmouse\/Varnish-Cache,varnish\/Varnish-Cache,franciscovg\/Varnish-Cache,gquintard\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,alarky\/varnish-cache-doc-ja,zhoualbeart\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,alarky\/varnish-cache-doc-ja,feld\/Varnish-Cache,gquintard\/Varnish-Cache,mrhmouse\/Varnish-Cache,alarky\/varnish-cache-doc-ja,ajasty-cavium\/Varnish-Cache,franciscovg\/Varnish-Cache,varnish\/Varnish-Cache,gquintard\/Varnish-Cache,gquintard\/Varnish-Cache,zhoualbeart\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,1HLtd\/Varnish-Cache,zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,chrismoulton\/Varnish-Cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,franciscovg\/Varnish-Cache,chrismoulton\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,zhoualbeart\/Varnish-Cache,feld\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/tbl\/vsl_tags.h\n+++ include\/tbl\/vsl_tags.h\n@@ -43,20 +43,20 @@\n \n SLTM(Debug, \"\", \"\")\n SLTM(Error, \"\", \"\")\n-SLTM(CLI, \"\", \"\")\n-SLTM(StatSess, \"\", \"\")\n-SLTM(ReqEnd, \"\", \"\")\n-SLTM(SessionOpen, \"\", \"\")\n-SLTM(SessionClose, \"\", \"\")\n-SLTM(BackendOpen, \"\", \"\")\n-SLTM(BackendXID, \"\", \"\")\n-SLTM(BackendReuse, \"\", \"\")\n-SLTM(BackendClose, \"\", \"\")\n+SLTM(CLI, \"CLI communication\", \"CLI communication between master and child process.\")\n+SLTM(StatSess, \"Session statistics\", \"\")\n+SLTM(ReqEnd, \"Client request end\", \"\")\n+SLTM(SessionOpen, \"Client connection opened\", \"\")\n+SLTM(SessionClose, \"Client connection closed\", \"\")\n+SLTM(BackendOpen, \"Backend connection opened\", \"\")\n+SLTM(BackendXID, \"The unique ID of the backend transaction\", \"\")\n+SLTM(BackendReuse, \"Backend connection reused\", \"\")\n+SLTM(BackendClose, \"Backend connection closed\", \"\")\n SLTM(HttpGarbage, \"\", \"\")\n-SLTM(Backend, \"\", \"\")\n-SLTM(Length, \"\", \"\")\n+SLTM(Backend, \"Backend selected\", \"\")\n+SLTM(Length, \"Size of object body\", \"\")\n \n-SLTM(FetchError, \"\", \"\")\n+SLTM(FetchError, \"Error while fetching object\", \"\")\n \n #define SLTH(aa, bb)\tSLTM(Req##aa, \"\", \"\")\n #include \"tbl\/vsl_tags_http.h\"\n@@ -80,28 +80,28 @@\n \n SLTM(LostHeader, \"\", \"\")\n \n-SLTM(TTL, \"\", \"\")\n-SLTM(Fetch_Body, \"\", \"\")\n+SLTM(TTL, \"TTL set on object\", \"\")\n+SLTM(Fetch_Body, \"Body fetched from backend\", \"\")\n SLTM(VCL_acl, \"\", \"\")\n-SLTM(VCL_call, \"\", \"\")\n-SLTM(VCL_trace, \"\", \"\")\n-SLTM(VCL_return, \"\", \"\")\n-SLTM(VCL_error, \"\", \"\")\n-SLTM(ReqStart, \"\", \"\")\n-SLTM(Hit, \"\", \"\")\n-SLTM(HitPass, \"\", \"\")\n-SLTM(ExpBan, \"\", \"\")\n-SLTM(ExpKill, \"\", \"\")\n+SLTM(VCL_call, \"VCL method called\", \"\")\n+SLTM(VCL_trace, \"VCL trace data\", \"\")\n+SLTM(VCL_return, \"VCL method return value\", \"\")\n+SLTM(VCL_error, \"Unused\", \"\")\n+SLTM(ReqStart, \"Client request start\", \"\")\n+SLTM(Hit, \"Hit object in cache\", \"\")\n+SLTM(HitPass, \"Hit for pass object in cache\", \"\")\n+SLTM(ExpBan, \"Object evicted due to ban\", \"\")\n+SLTM(ExpKill, \"Object expired\", \"\")\n SLTM(WorkThread, \"\", \"\")\n \n-SLTM(ESI_xmlerror, \"\", \"\")\n+SLTM(ESI_xmlerror, \"Error while parsing ESI tags\", \"\")\n \n-SLTM(Hash, \"\", \"\")\n+SLTM(Hash, \"Value added to hash\", \"\")\n \n-SLTM(Backend_health, \"\", \"\")\n+SLTM(Backend_health, \"Backend health check\", \"\")\n \n-SLTM(VCL_Debug, \"\", \"\")\n-SLTM(VCL_Log, \"\", \"\")\n+SLTM(VCL_Debug, \"Unused\", \"\")\n+SLTM(VCL_Log, \"Log statement from VCL\", \"\")\n SLTM(VCL_Error, \"\", \"\")\n \n-SLTM(Gzip, \"\", \"\")\n+SLTM(Gzip, \"G(un)zip performed on object\", \"\")\n"} {"commit":"92f69b2ec818e2df067987f88288f7e58178e9d1","subject":"freebsd optimalizations","message":"freebsd optimalizations\n","repos":"tomaspavlin\/mitm,tomaspavlin\/mitm","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- rawsock.c\n+++ rawsock.c\n@@ -188,7 +188,7 @@\n }\n \n rawsock_t\n-_rawsocket(const car * ifname)\n+_rawsocket(const char * ifname)\n {\n \tint fd = open(\"\/dev\/bpf\", O_RDWR);\/\/|O_APPEND|O_CREAT)\n \n@@ -269,7 +269,7 @@\n \n \tif(ret > 0)\n \t\tprintf(\"Sock len: %d\\n\", ret);\n-\t\n+\n \treturn ret;\n }\n \n"} {"commit":"7608168d548f1f4c835cc914f8c7e91fa31d74c2","subject":"Reformat the log record long descriptions.","message":"Reformat the log record long descriptions.\n\nFormat the long log record descriptions for use with pre-formatted\ntext style.\n","repos":"alarky\/varnish-cache-doc-ja,chrismoulton\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,varnish\/Varnish-Cache,mrhmouse\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,zhoualbeart\/Varnish-Cache,chrismoulton\/Varnish-Cache,franciscovg\/Varnish-Cache,mrhmouse\/Varnish-Cache,varnish\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,alarky\/varnish-cache-doc-ja,mrhmouse\/Varnish-Cache,gquintard\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,alarky\/varnish-cache-doc-ja,varnish\/Varnish-Cache,alarky\/varnish-cache-doc-ja,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,mrhmouse\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gquintard\/Varnish-Cache,franciscovg\/Varnish-Cache,gquintard\/Varnish-Cache,franciscovg\/Varnish-Cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,feld\/Varnish-Cache,chrismoulton\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,varnish\/Varnish-Cache,feld\/Varnish-Cache,zhoualbeart\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,alarky\/varnish-cache-doc-ja,ajasty-cavium\/Varnish-Cache,feld\/Varnish-Cache,gquintard\/Varnish-Cache,zhoualbeart\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/tbl\/vsl_tags.h\n+++ include\/tbl\/vsl_tags.h\n@@ -55,11 +55,12 @@\n \n SLTM(ReqEnd, \"Client request end\",\n \t\"Marks the end of client request.\\n\\n\"\n-\t\"Trxd\\n Timestamp when the request started.\\n\\n\"\n-\t\"Tidle\\n Timestamp when the request ended.\\n\\n\"\n-\t\"dTrx\\n Time to receive request\\n\\n\"\n-\t\"dTproc\\n Time to process request\\n\\n\"\n-\t\"dTtx\\n Time to transmit response\\n\\n\"\n+\t\"Fields:\\n\"\n+\t\" Trxd Timestamp when the request started.\\n\"\n+\t\" Tidle Timestamp when the request ended.\\n\"\n+\t\" dTrx Time to receive request.\\n\"\n+\t\" dTproc Time to process request.\\n\"\n+\t\" dTtx Time to transmit response.\\n\"\n )\n \n \/*---------------------------------------------------------------------*\/\n@@ -67,12 +68,13 @@\n SLTM(SessOpen, \"Client connection opened\",\n \t\"The first record for a client connection, with the\\n\"\n \t\"socket-endpoints of the connection.\\n\\n\"\n-\t\"caddr\\n Client IPv4\/6 address\\n\\n\"\n-\t\"cport\\n Client TCP port\\n\\n\"\n-\t\"lsock\\n Listen socket\\n\\n\"\n-\t\"laddr\\n Local IPv4\/6 address ('-' if !$log_local_addr)\\n\\n\"\n-\t\"lport\\n Local TCP port ('-' if !$log_local_addr)\\n\\n\"\n-\t\"fd\\n File descriptor number\"\n+\t\"Fields:\\n\"\n+\t\" caddr Client IPv4\/6 address.\\n\"\n+\t\" cport Client TCP port.\\n\"\n+\t\" lsock Listen socket.\\n\"\n+\t\" laddr Local IPv4\/6 address ('-' if !$log_local_addr).\\n\"\n+\t\" lport Local TCP port ('-' if !$log_local_addr).\\n\"\n+\t\" fd File descriptor number.\\n\"\n )\n \n \/*\n@@ -87,14 +89,15 @@\n \n SLTM(SessClose, \"Client connection closed\",\n \t\"SessionClose is the last record for any client connection.\\n\\n\"\n-\t\"reason\\n Why the connection closed.\\n\\n\"\n-\t\"duration\\n How long the session were open.\\n\\n\"\n-\t\"Nreq\\n How many requests on session.\\n\\n\"\n-\t\"Npipe\\n If 'pipe' were used on session.\\n\\n\"\n-\t\"Npass\\n Requests handled with pass.\\n\\n\"\n-\t\"Nfetch\\n Backend fetches by session.\\n\\n\"\n-\t\"Bhdr\\n Header bytes sent on session.\\n\\n\"\n-\t\"Bbody\\n Body bytes sent on session.\\n\\n\"\n+\t\"Fields:\\n\"\n+\t\" reason Why the connection closed.\\n\"\n+\t\" duration How long the session were open.\\n\"\n+\t\" Nreq How many requests on session.\\n\"\n+\t\" Npipe If 'pipe' were used on session.\\n\"\n+\t\" Npass Requests handled with pass.\\n\"\n+\t\" Nfetch Backend fetches by session.\\n\"\n+\t\" Bhdr Header bytes sent on session.\\n\"\n+\t\" Bbody Body bytes sent on session.\\n\"\n )\n \n \/*---------------------------------------------------------------------*\/\n@@ -130,8 +133,9 @@\n #undef SLTH\n \n SLTM(BogoHeader, \"Bogus HTTP received\",\n-\t\"Contains the first 20 characters of received HTTP headers we could\"\n-\t\" not make sense of. Applies to both req.http and beres.http.\"\n+\t\"Contains the first 20 characters of received HTTP headers we\\n\"\n+\t\"could not make sense of. Applies to both req.http and\\n\"\n+\t\"beres.http.\\n\"\n )\n SLTM(LostHeader, \"Failed attempt to set HTTP header\", \"\")\n \n@@ -161,30 +165,24 @@\n SLTM(Gzip, \"G(un)zip performed on object\", \"\")\n \n SLTM(Link, \"Links to a child VXID\",\n-\t\"Links this VXID to any child VXID it initiates\\n\"\n-\t\"The first field gives the type of the child:\\n\"\n-\t\" req Request\\n\"\n-\t\" bereq Backend request\\n\"\n-\t\" esireq ESI subrequest\\n\"\n-\t\"The second field gives the VXID of the child.\\n\"\n+\t\"Links this VXID to any child VXID it initiates\\n\\n\"\n+\t\"Fields:\\n\"\n+\t\" ctype Child type (req, bereq or esireq).\\n\"\n+\t\" cvxid Child vxid.\\n\"\n )\n \n SLTM(Begin, \"Marks the start of a VXID\",\n- \"The first record of a VXID transaction.\\n\"\n- \"The first field gives the type of the transaction:\\n\"\n- \" sess\tSession\\n\"\n- \" req\tRequest\\n\"\n- \" bereq\tBackend request\\n\"\n- \" esireq\tESI subrequest\\n\"\n- \"The second field gives the VXID of the parent that initiated this\"\n- \" transaction. For Session transactions this field is blank.\\n\"\n+\t\"The first record of a VXID transaction.\\n\\n\"\n+\t\"Fields:\\n\"\n+\t\" type Transaction type (sess, req, bereq or esireq).\\n\"\n+\t\" pvxid Parent vxid.\\n\"\n )\n \n SLTM(End, \"Marks the end of a VXID\",\n- \"The last record of a VXID transaction.\\n\"\n+\t\"The last record of a VXID transaction.\\n\"\n )\n \n-SLTM(VSL, \"Internally generated VSL API warnings and error message\",\n- \"Warnings and error messages genererated by the VSL API while reading the\"\n- \" shared memory log\"\n+SLTM(VSL, \"VSL API warnings and error message\",\n+\t\"Warnings and error messages genererated by the VSL API while\\n\"\n+\t\"reading the shared memory log.\\n\"\n )\n"} {"commit":"f7eec293db5a0c289b39170ba8a5fb3a77a6a5a5","subject":"Refs #2276. Refs[t:2276]","message":"Refs #2276. Refs[t:2276]\n\ngit-svn-id: b5c078ec0b4d3a50497e9dd3081db18a5b4f16e5@16734 c7de825b-a66e-492c-adef-691d508d4ae1\n","repos":"natsys\/mariadb_10.2,BohuTANG\/ft-index,kuszmaul\/PerconaFT-tmp,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,kuszmaul\/PerconaFT,ollie314\/server,flynn1973\/mariadb-aix,ottok\/PerconaFT,ottok\/PerconaFT,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,ottok\/PerconaFT,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,BohuTANG\/ft-index,percona\/PerconaFT,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,kuszmaul\/PerconaFT-tmp,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,kuszmaul\/PerconaFT-tmp,natsys\/mariadb_10.2,percona\/PerconaFT,davidl-zend\/zenddbi,percona\/PerconaFT,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,kuszmaul\/PerconaFT,kuszmaul\/PerconaFT-tmp,slanterns\/server,BohuTANG\/ft-index,percona\/PerconaFT,BohuTANG\/ft-index,ollie314\/server,ollie314\/server,kuszmaul\/PerconaFT,ottok\/PerconaFT,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,kuszmaul\/PerconaFT","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/tdb-internal.h\n+++ include\/tdb-internal.h\n@@ -7,7 +7,7 @@\n \/\/ the types DB_TXN and so forth have been defined.\n \n \/\/ This list structure is repeated here (from toku_list.h) so that the db.h file will be standalone. Any code that depends on this list matching the structure in toku_list.h\n-\/\/ will get flagged by the compiler if someone changes one but not the other.\n+\/\/ will get flagged by the compiler if someone changes one but not the other. See #2276.\n struct toku_list {\n struct toku_list *next, *prev;\n };\n"} {"commit":"e4dd120c2f1bf04e69cb58ccf28817ad459cdc45","subject":"Fixed line endings to LF again","message":"Fixed line endings to LF again\n\nSee #195\n","repos":"GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator,GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/vk_mem_alloc.h\n+++ include\/vk_mem_alloc.h\n@@ -1,19439 +1,19439 @@\n-\/\/\r\n-\/\/ Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.\r\n-\/\/\r\n-\/\/ Permission is hereby granted, free of charge, to any person obtaining a copy\r\n-\/\/ of this software and associated documentation files (the \"Software\"), to deal\r\n-\/\/ in the Software without restriction, including without limitation the rights\r\n-\/\/ to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\r\n-\/\/ copies of the Software, and to permit persons to whom the Software is\r\n-\/\/ furnished to do so, subject to the following conditions:\r\n-\/\/\r\n-\/\/ The above copyright notice and this permission notice shall be included in\r\n-\/\/ all copies or substantial portions of the Software.\r\n-\/\/\r\n-\/\/ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\n-\/\/ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\n-\/\/ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\n-\/\/ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\n-\/\/ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\n-\/\/ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r\n-\/\/ THE SOFTWARE.\r\n-\/\/\r\n-\r\n-#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H\r\n-#define AMD_VULKAN_MEMORY_ALLOCATOR_H\r\n-\r\n-\/** \\mainpage Vulkan Memory Allocator\r\n-\r\n-<b>Version 3.0.0-development<\/b>\r\n-\r\n-Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved. \\n\r\n-License: MIT\r\n-\r\n-<b>API documentation divided into groups:<\/b> [Modules](modules.html)\r\n-\r\n-\\section main_table_of_contents Table of contents\r\n-\r\n-- <b>User guide<\/b>\r\n- - \\subpage quick_start\r\n- - [Project setup](@ref quick_start_project_setup)\r\n- - [Initialization](@ref quick_start_initialization)\r\n- - [Resource allocation](@ref quick_start_resource_allocation)\r\n- - \\subpage choosing_memory_type\r\n- - [Usage](@ref choosing_memory_type_usage)\r\n- - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)\r\n- - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)\r\n- - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)\r\n- - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations)\r\n- - \\subpage memory_mapping\r\n- - [Mapping functions](@ref memory_mapping_mapping_functions)\r\n- - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)\r\n- - [Cache flush and invalidate](@ref memory_mapping_cache_control)\r\n- - \\subpage staying_within_budget\r\n- - [Querying for budget](@ref staying_within_budget_querying_for_budget)\r\n- - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage)\r\n- - \\subpage resource_aliasing\r\n- - \\subpage custom_memory_pools\r\n- - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)\r\n- - [Linear allocation algorithm](@ref linear_algorithm)\r\n- - [Free-at-once](@ref linear_algorithm_free_at_once)\r\n- - [Stack](@ref linear_algorithm_stack)\r\n- - [Double stack](@ref linear_algorithm_double_stack)\r\n- - [Ring buffer](@ref linear_algorithm_ring_buffer)\r\n- - \\subpage defragmentation\r\n- - \\subpage statistics\r\n- - [Numeric statistics](@ref statistics_numeric_statistics)\r\n- - [JSON dump](@ref statistics_json_dump)\r\n- - \\subpage allocation_annotation\r\n- - [Allocation user data](@ref allocation_user_data)\r\n- - [Allocation names](@ref allocation_names)\r\n- - \\subpage virtual_allocator\r\n- - \\subpage debugging_memory_usage\r\n- - [Memory initialization](@ref debugging_memory_usage_initialization)\r\n- - [Margins](@ref debugging_memory_usage_margins)\r\n- - [Corruption detection](@ref debugging_memory_usage_corruption_detection)\r\n- - \\subpage opengl_interop\r\n-- \\subpage usage_patterns\r\n- - [GPU-only resource](@ref usage_patterns_gpu_only)\r\n- - [Staging copy for upload](@ref usage_patterns_staging_copy_upload)\r\n- - [Readback](@ref usage_patterns_readback)\r\n- - [Advanced data uploading](@ref usage_patterns_advanced_data_uploading)\r\n- - [Other use cases](@ref usage_patterns_other_use_cases)\r\n-- \\subpage configuration\r\n- - [Pointers to Vulkan functions](@ref config_Vulkan_functions)\r\n- - [Custom host memory allocator](@ref custom_memory_allocator)\r\n- - [Device memory allocation callbacks](@ref allocation_callbacks)\r\n- - [Device heap memory limit](@ref heap_memory_limit)\r\n-- <b>Extension support<\/b>\r\n- - \\subpage vk_khr_dedicated_allocation\r\n- - \\subpage enabling_buffer_device_address\r\n- - \\subpage vk_ext_memory_priority\r\n- - \\subpage vk_amd_device_coherent_memory\r\n-- \\subpage general_considerations\r\n- - [Thread safety](@ref general_considerations_thread_safety)\r\n- - [Versioning and compatibility](@ref general_considerations_versioning_and_compatibility)\r\n- - [Validation layer warnings](@ref general_considerations_validation_layer_warnings)\r\n- - [Allocation algorithm](@ref general_considerations_allocation_algorithm)\r\n- - [Features not supported](@ref general_considerations_features_not_supported)\r\n-\r\n-\\section main_see_also See also\r\n-\r\n-- [**Product page on GPUOpen**](https:\/\/gpuopen.com\/gaming-product\/vulkan-memory-allocator\/)\r\n-- [**Source repository on GitHub**](https:\/\/github.com\/GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator)\r\n-\r\n-\\defgroup group_init Library initialization\r\n-\r\n-\\brief API elements related to the initialization and management of the entire library, especially #VmaAllocator object.\r\n-\r\n-\\defgroup group_alloc Memory allocation\r\n-\r\n-\\brief API elements related to the allocation, deallocation, and management of Vulkan memory, buffers, images.\r\n-Most basic ones being: vmaCreateBuffer(), vmaCreateImage().\r\n-\r\n-\\defgroup group_virtual Virtual allocator\r\n-\r\n-\\brief API elements related to the mechanism of \\ref virtual_allocator - using the core allocation algorithm\r\n-for user-defined purpose without allocating any real GPU memory.\r\n-\r\n-\\defgroup group_stats Statistics\r\n-\r\n-\\brief API elements that query current status of the allocator, from memory usage, budget, to full dump of the internal state in JSON format.\r\n-See documentation chapter: \\ref statistics.\r\n-*\/\r\n-\r\n-\r\n-#ifdef __cplusplus\r\n-extern \"C\" {\r\n-#endif\r\n-\r\n-#ifndef VULKAN_H_\r\n- #include <vulkan\/vulkan.h>\r\n-#endif\r\n-\r\n-\/\/ Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,\r\n-\/\/ where AAA = major, BBB = minor, CCC = patch.\r\n-\/\/ If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion.\r\n-#if !defined(VMA_VULKAN_VERSION)\r\n- #if defined(VK_VERSION_1_3)\r\n- #define VMA_VULKAN_VERSION 1003000\r\n- #elif defined(VK_VERSION_1_2)\r\n- #define VMA_VULKAN_VERSION 1002000\r\n- #elif defined(VK_VERSION_1_1)\r\n- #define VMA_VULKAN_VERSION 1001000\r\n- #else\r\n- #define VMA_VULKAN_VERSION 1000000\r\n- #endif\r\n-#endif\r\n-\r\n-#if defined(__ANDROID__) && defined(VK_NO_PROTOTYPES) && VMA_STATIC_VULKAN_FUNCTIONS\r\n- extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;\r\n- extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr;\r\n- extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;\r\n- extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;\r\n- extern PFN_vkAllocateMemory vkAllocateMemory;\r\n- extern PFN_vkFreeMemory vkFreeMemory;\r\n- extern PFN_vkMapMemory vkMapMemory;\r\n- extern PFN_vkUnmapMemory vkUnmapMemory;\r\n- extern PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges;\r\n- extern PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges;\r\n- extern PFN_vkBindBufferMemory vkBindBufferMemory;\r\n- extern PFN_vkBindImageMemory vkBindImageMemory;\r\n- extern PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements;\r\n- extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;\r\n- extern PFN_vkCreateBuffer vkCreateBuffer;\r\n- extern PFN_vkDestroyBuffer vkDestroyBuffer;\r\n- extern PFN_vkCreateImage vkCreateImage;\r\n- extern PFN_vkDestroyImage vkDestroyImage;\r\n- extern PFN_vkCmdCopyBuffer vkCmdCopyBuffer;\r\n- #if VMA_VULKAN_VERSION >= 1001000\r\n- extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2;\r\n- extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2;\r\n- extern PFN_vkBindBufferMemory2 vkBindBufferMemory2;\r\n- extern PFN_vkBindImageMemory2 vkBindImageMemory2;\r\n- extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;\r\n- #endif \/\/ #if VMA_VULKAN_VERSION >= 1001000\r\n-#endif \/\/ #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES\r\n-\r\n-#if !defined(VMA_DEDICATED_ALLOCATION)\r\n- #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation\r\n- #define VMA_DEDICATED_ALLOCATION 1\r\n- #else\r\n- #define VMA_DEDICATED_ALLOCATION 0\r\n- #endif\r\n-#endif\r\n-\r\n-#if !defined(VMA_BIND_MEMORY2)\r\n- #if VK_KHR_bind_memory2\r\n- #define VMA_BIND_MEMORY2 1\r\n- #else\r\n- #define VMA_BIND_MEMORY2 0\r\n- #endif\r\n-#endif\r\n-\r\n-#if !defined(VMA_MEMORY_BUDGET)\r\n- #if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000)\r\n- #define VMA_MEMORY_BUDGET 1\r\n- #else\r\n- #define VMA_MEMORY_BUDGET 0\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ Defined to 1 when VK_KHR_buffer_device_address device extension or equivalent core Vulkan 1.2 feature is defined in its headers.\r\n-#if !defined(VMA_BUFFER_DEVICE_ADDRESS)\r\n- #if VK_KHR_buffer_device_address || VMA_VULKAN_VERSION >= 1002000\r\n- #define VMA_BUFFER_DEVICE_ADDRESS 1\r\n- #else\r\n- #define VMA_BUFFER_DEVICE_ADDRESS 0\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ Defined to 1 when VK_EXT_memory_priority device extension is defined in Vulkan headers.\r\n-#if !defined(VMA_MEMORY_PRIORITY)\r\n- #if VK_EXT_memory_priority\r\n- #define VMA_MEMORY_PRIORITY 1\r\n- #else\r\n- #define VMA_MEMORY_PRIORITY 0\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ Defined to 1 when VK_KHR_external_memory device extension is defined in Vulkan headers.\r\n-#if !defined(VMA_EXTERNAL_MEMORY)\r\n- #if VK_KHR_external_memory\r\n- #define VMA_EXTERNAL_MEMORY 1\r\n- #else\r\n- #define VMA_EXTERNAL_MEMORY 0\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ Define these macros to decorate all public functions with additional code,\r\n-\/\/ before and after returned type, appropriately. This may be useful for\r\n-\/\/ exporting the functions when compiling VMA as a separate library. Example:\r\n-\/\/ #define VMA_CALL_PRE __declspec(dllexport)\r\n-\/\/ #define VMA_CALL_POST __cdecl\r\n-#ifndef VMA_CALL_PRE\r\n- #define VMA_CALL_PRE\r\n-#endif\r\n-#ifndef VMA_CALL_POST\r\n- #define VMA_CALL_POST\r\n-#endif\r\n-\r\n-\/\/ Define this macro to decorate pointers with an attribute specifying the\r\n-\/\/ length of the array they point to if they are not null.\r\n-\/\/\r\n-\/\/ The length may be one of\r\n-\/\/ - The name of another parameter in the argument list where the pointer is declared\r\n-\/\/ - The name of another member in the struct where the pointer is declared\r\n-\/\/ - The name of a member of a struct type, meaning the value of that member in\r\n-\/\/ the context of the call. For example\r\n-\/\/ VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\"),\r\n-\/\/ this means the number of memory heaps available in the device associated\r\n-\/\/ with the VmaAllocator being dealt with.\r\n-#ifndef VMA_LEN_IF_NOT_NULL\r\n- #define VMA_LEN_IF_NOT_NULL(len)\r\n-#endif\r\n-\r\n-\/\/ The VMA_NULLABLE macro is defined to be _Nullable when compiling with Clang.\r\n-\/\/ see: https:\/\/clang.llvm.org\/docs\/AttributeReference.html#nullable\r\n-#ifndef VMA_NULLABLE\r\n- #ifdef __clang__\r\n- #define VMA_NULLABLE _Nullable\r\n- #else\r\n- #define VMA_NULLABLE\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ The VMA_NOT_NULL macro is defined to be _Nonnull when compiling with Clang.\r\n-\/\/ see: https:\/\/clang.llvm.org\/docs\/AttributeReference.html#nonnull\r\n-#ifndef VMA_NOT_NULL\r\n- #ifdef __clang__\r\n- #define VMA_NOT_NULL _Nonnull\r\n- #else\r\n- #define VMA_NOT_NULL\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ If non-dispatchable handles are represented as pointers then we can give\r\n-\/\/ then nullability annotations\r\n-#ifndef VMA_NOT_NULL_NON_DISPATCHABLE\r\n- #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)\r\n- #define VMA_NOT_NULL_NON_DISPATCHABLE VMA_NOT_NULL\r\n- #else\r\n- #define VMA_NOT_NULL_NON_DISPATCHABLE\r\n- #endif\r\n-#endif\r\n-\r\n-#ifndef VMA_NULLABLE_NON_DISPATCHABLE\r\n- #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)\r\n- #define VMA_NULLABLE_NON_DISPATCHABLE VMA_NULLABLE\r\n- #else\r\n- #define VMA_NULLABLE_NON_DISPATCHABLE\r\n- #endif\r\n-#endif\r\n-\r\n-#ifndef VMA_STATS_STRING_ENABLED\r\n- #define VMA_STATS_STRING_ENABLED 1\r\n-#endif\r\n-\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/ \r\n-\/\/ INTERFACE\r\n-\/\/ \r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\r\n-\/\/ Sections for managing code placement in file, only for development purposes e.g. for convenient folding inside an IDE.\r\n-#ifndef _VMA_ENUM_DECLARATIONS\r\n-\r\n-\/**\r\n-\\addtogroup group_init\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Flags for created #VmaAllocator.\r\n-typedef enum VmaAllocatorCreateFlagBits\r\n-{\r\n- \/** \\brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you.\r\n-\r\n- Using this flag may increase performance because internal mutexes are not used.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001,\r\n- \/** \\brief Enables usage of VK_KHR_dedicated_allocation extension.\r\n-\r\n- The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.\r\n- When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.\r\n-\r\n- Using this extension will automatically allocate dedicated blocks of memory for\r\n- some buffers and images instead of suballocating place for them out of bigger\r\n- memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT\r\n- flag) when it is recommended by the driver. It may improve performance on some\r\n- GPUs.\r\n-\r\n- You may set this flag only if you found out that following device extensions are\r\n- supported, you enabled them while creating Vulkan device passed as\r\n- VmaAllocatorCreateInfo::device, and you want them to be used internally by this\r\n- library:\r\n-\r\n- - VK_KHR_get_memory_requirements2 (device extension)\r\n- - VK_KHR_dedicated_allocation (device extension)\r\n-\r\n- When this flag is set, you can experience following warnings reported by Vulkan\r\n- validation layer. You can ignore them.\r\n-\r\n- > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002,\r\n- \/**\r\n- Enables usage of VK_KHR_bind_memory2 extension.\r\n-\r\n- The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.\r\n- When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.\r\n-\r\n- You may set this flag only if you found out that this device extension is supported,\r\n- you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\r\n- and you want it to be used internally by this library.\r\n-\r\n- The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`,\r\n- which allow to pass a chain of `pNext` structures while binding.\r\n- This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2().\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004,\r\n- \/**\r\n- Enables usage of VK_EXT_memory_budget extension.\r\n-\r\n- You may set this flag only if you found out that this device extension is supported,\r\n- you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\r\n- and you want it to be used internally by this library, along with another instance extension\r\n- VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted).\r\n-\r\n- The extension provides query for current memory usage and budget, which will probably\r\n- be more accurate than an estimation used by the library otherwise.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008,\r\n- \/**\r\n- Enables usage of VK_AMD_device_coherent_memory extension.\r\n-\r\n- You may set this flag only if you:\r\n-\r\n- - found out that this device extension is supported and enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\r\n- - checked that `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true and set it while creating the Vulkan device,\r\n- - want it to be used internally by this library.\r\n-\r\n- The extension and accompanying device feature provide access to memory types with\r\n- `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flags.\r\n- They are useful mostly for writing breadcrumb markers - a common method for debugging GPU crash\/hang\/TDR.\r\n-\r\n- When the extension is not enabled, such memory types are still enumerated, but their usage is illegal.\r\n- To protect from this error, if you don't create the allocator with this flag, it will refuse to allocate any memory or create a custom pool in such memory type,\r\n- returning `VK_ERROR_FEATURE_NOT_PRESENT`.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT = 0x00000010,\r\n- \/**\r\n- Enables usage of \"buffer device address\" feature, which allows you to use function\r\n- `vkGetBufferDeviceAddress*` to get raw GPU pointer to a buffer and pass it for usage inside a shader.\r\n-\r\n- You may set this flag only if you:\r\n-\r\n- 1. (For Vulkan version < 1.2) Found as available and enabled device extension\r\n- VK_KHR_buffer_device_address.\r\n- This extension is promoted to core Vulkan 1.2.\r\n- 2. Found as available and enabled device feature `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress`.\r\n-\r\n- When this flag is set, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT` using VMA.\r\n- The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT` to\r\n- allocated memory blocks wherever it might be needed.\r\n-\r\n- For more information, see documentation chapter \\ref enabling_buffer_device_address.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = 0x00000020,\r\n- \/**\r\n- Enables usage of VK_EXT_memory_priority extension in the library.\r\n-\r\n- You may set this flag only if you found available and enabled this device extension,\r\n- along with `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE`,\r\n- while creating Vulkan device passed as VmaAllocatorCreateInfo::device.\r\n-\r\n- When this flag is used, VmaAllocationCreateInfo::priority and VmaPoolCreateInfo::priority\r\n- are used to set priorities of allocated Vulkan memory. Without it, these variables are ignored.\r\n-\r\n- A priority must be a floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.\r\n- Larger values are higher priority. The granularity of the priorities is implementation-dependent.\r\n- It is automatically passed to every call to `vkAllocateMemory` done by the library using structure `VkMemoryPriorityAllocateInfoEXT`.\r\n- The value to be used for default priority is 0.5.\r\n- For more details, see the documentation of the VK_EXT_memory_priority extension.\r\n- *\/\r\n- VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = 0x00000040,\r\n-\r\n- VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaAllocatorCreateFlagBits;\r\n-\/\/\/ See #VmaAllocatorCreateFlagBits.\r\n-typedef VkFlags VmaAllocatorCreateFlags;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ \\brief Intended usage of the allocated memory.\r\n-typedef enum VmaMemoryUsage\r\n-{\r\n- \/** No intended memory usage specified.\r\n- Use other members of VmaAllocationCreateInfo to specify your requirements.\r\n- *\/\r\n- VMA_MEMORY_USAGE_UNKNOWN = 0,\r\n- \/**\r\n- \\deprecated Obsolete, preserved for backward compatibility.\r\n- Prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\r\n- *\/\r\n- VMA_MEMORY_USAGE_GPU_ONLY = 1,\r\n- \/**\r\n- \\deprecated Obsolete, preserved for backward compatibility.\r\n- Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`.\r\n- *\/\r\n- VMA_MEMORY_USAGE_CPU_ONLY = 2,\r\n- \/**\r\n- \\deprecated Obsolete, preserved for backward compatibility.\r\n- Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\r\n- *\/\r\n- VMA_MEMORY_USAGE_CPU_TO_GPU = 3,\r\n- \/**\r\n- \\deprecated Obsolete, preserved for backward compatibility.\r\n- Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`.\r\n- *\/\r\n- VMA_MEMORY_USAGE_GPU_TO_CPU = 4,\r\n- \/**\r\n- \\deprecated Obsolete, preserved for backward compatibility.\r\n- Prefers not `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\r\n- *\/\r\n- VMA_MEMORY_USAGE_CPU_COPY = 5,\r\n- \/**\r\n- Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`.\r\n- Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation.\r\n-\r\n- Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`.\r\n-\r\n- Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n- *\/\r\n- VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6,\r\n- \/**\r\n- Selects best memory type automatically.\r\n- This flag is recommended for most common use cases.\r\n-\r\n- When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\r\n- you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\r\n- in VmaAllocationCreateInfo::flags.\r\n- \r\n- It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\r\n- vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\r\n- and not with generic memory allocation functions.\r\n- *\/\r\n- VMA_MEMORY_USAGE_AUTO = 7,\r\n- \/**\r\n- Selects best memory type automatically with preference for GPU (device) memory.\r\n-\r\n- When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\r\n- you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\r\n- in VmaAllocationCreateInfo::flags.\r\n-\r\n- It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\r\n- vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\r\n- and not with generic memory allocation functions.\r\n- *\/\r\n- VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE = 8,\r\n- \/**\r\n- Selects best memory type automatically with preference for CPU (host) memory.\r\n-\r\n- When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\r\n- you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\r\n- in VmaAllocationCreateInfo::flags.\r\n-\r\n- It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\r\n- vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\r\n- and not with generic memory allocation functions.\r\n- *\/\r\n- VMA_MEMORY_USAGE_AUTO_PREFER_HOST = 9,\r\n-\r\n- VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaMemoryUsage;\r\n-\r\n-\/\/\/ Flags to be passed as VmaAllocationCreateInfo::flags.\r\n-typedef enum VmaAllocationCreateFlagBits\r\n-{\r\n- \/** \\brief Set this flag if the allocation should have its own memory block.\r\n-\r\n- Use it for special, big resources, like fullscreen images used as attachments.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001,\r\n-\r\n- \/** \\brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block.\r\n-\r\n- If new allocation cannot be placed in any of the existing blocks, allocation\r\n- fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error.\r\n-\r\n- You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and\r\n- #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002,\r\n- \/** \\brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it.\r\n-\r\n- Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData.\r\n-\r\n- It is valid to use this flag for allocation made from memory type that is not\r\n- `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is\r\n- useful if you need an allocation that is efficient to use on GPU\r\n- (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that\r\n- support it (e.g. Intel GPU).\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004,\r\n- \/** \\deprecated Preserved for backward compatibility. Consider using vmaSetAllocationName() instead.\r\n- \r\n- Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a\r\n- null-terminated string. Instead of copying pointer value, a local copy of the\r\n- string is made and stored in allocation's `pName`. The string is automatically\r\n- freed together with the allocation. It is also used in vmaBuildStatsString().\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020,\r\n- \/** Allocation will be created from upper stack in a double stack pool.\r\n-\r\n- This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040,\r\n- \/** Create both buffer\/image and allocation, but don't bind them together.\r\n- It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions.\r\n- The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage().\r\n- Otherwise it is ignored.\r\n-\r\n- If you want to make sure the new buffer\/image is not tied to the new memory allocation\r\n- through `VkMemoryDedicatedAllocateInfoKHR` structure in case the allocation ends up in its own memory block,\r\n- use also flag #VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080,\r\n- \/** Create allocation only if additional device memory required for it, if any, won't exceed\r\n- memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100,\r\n- \/** \\brief Set this flag if the allocated memory will have aliasing resources.\r\n- \r\n- Usage of this flag prevents supplying `VkMemoryDedicatedAllocateInfoKHR` when #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT is specified.\r\n- Otherwise created dedicated memory will not be suitable for aliasing resources, resulting in Vulkan Validation Layer errors.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT = 0x00000200,\r\n- \/**\r\n- Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT).\r\n- \r\n- - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value,\r\n- you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect.\r\n- - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`.\r\n- This includes allocations created in \\ref custom_memory_pools.\r\n-\r\n- Declares that mapped memory will only be written sequentially, e.g. using `memcpy()` or a loop writing number-by-number,\r\n- never read or accessed randomly, so a memory type can be selected that is uncached and write-combined.\r\n-\r\n- \\warning Violating this declaration may work correctly, but will likely be very slow.\r\n- Watch out for implicit reads introduced by doing e.g. `pMappedData[i] += x;`\r\n- Better prepare your data in a local variable and `memcpy()` it to the mapped pointer all at once.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT = 0x00000400,\r\n- \/**\r\n- Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT).\r\n- \r\n- - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value,\r\n- you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect.\r\n- - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`.\r\n- This includes allocations created in \\ref custom_memory_pools.\r\n-\r\n- Declares that mapped memory can be read, written, and accessed in random order,\r\n- so a `HOST_CACHED` memory type is required.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT = 0x00000800,\r\n- \/**\r\n- Together with #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT,\r\n- it says that despite request for host access, a not-`HOST_VISIBLE` memory type can be selected\r\n- if it may improve performance.\r\n-\r\n- By using this flag, you declare that you will check if the allocation ended up in a `HOST_VISIBLE` memory type\r\n- (e.g. using vmaGetAllocationMemoryProperties()) and if not, you will create some \"staging\" buffer and\r\n- issue an explicit transfer to write\/read your data.\r\n- To prepare for this possibility, don't forget to add appropriate flags like\r\n- `VK_BUFFER_USAGE_TRANSFER_DST_BIT`, `VK_BUFFER_USAGE_TRANSFER_SRC_BIT` to the parameters of created buffer or image.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT = 0x00001000,\r\n- \/** Allocation strategy that chooses smallest possible free range for the allocation\r\n- to minimize memory usage and fragmentation, possibly at the expense of allocation time.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = 0x00010000,\r\n- \/** Allocation strategy that chooses first suitable free range for the allocation -\r\n- not necessarily in terms of the smallest offset but the one that is easiest and fastest to find\r\n- to minimize allocation time, possibly at the expense of allocation quality.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = 0x00020000,\r\n- \/** Allocation strategy that chooses always the lowest offset in available space.\r\n- This is not the most efficient strategy but achieves highly packed data.\r\n- Used internally by defragmentation, not recomended in typical usage.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = 0x00040000,\r\n- \/** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,\r\n- \/** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,\r\n- \/** A bit mask to extract only `STRATEGY` bits from entire set of flags.\r\n- *\/\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MASK =\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT |\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT |\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\r\n-\r\n- VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaAllocationCreateFlagBits;\r\n-\/\/\/ See #VmaAllocationCreateFlagBits.\r\n-typedef VkFlags VmaAllocationCreateFlags;\r\n-\r\n-\/\/\/ Flags to be passed as VmaPoolCreateInfo::flags.\r\n-typedef enum VmaPoolCreateFlagBits\r\n-{\r\n- \/** \\brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored.\r\n-\r\n- This is an optional optimization flag.\r\n-\r\n- If you always allocate using vmaCreateBuffer(), vmaCreateImage(),\r\n- vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator\r\n- knows exact type of your allocations so it can handle Buffer-Image Granularity\r\n- in the optimal way.\r\n-\r\n- If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(),\r\n- exact type of such allocations is not known, so allocator must be conservative\r\n- in handling Buffer-Image Granularity, which can lead to suboptimal allocation\r\n- (wasted memory). In that case, if you can make sure you always allocate only\r\n- buffers and linear images or only optimal images out of this pool, use this flag\r\n- to make allocator disregard Buffer-Image Granularity and so make allocations\r\n- faster and more optimal.\r\n- *\/\r\n- VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002,\r\n-\r\n- \/** \\brief Enables alternative, linear allocation algorithm in this pool.\r\n-\r\n- Specify this flag to enable linear allocation algorithm, which always creates\r\n- new allocations after last one and doesn't reuse space from allocations freed in\r\n- between. It trades memory consumption for simplified algorithm and data\r\n- structure, which has better performance and uses less memory for metadata.\r\n-\r\n- By using this flag, you can achieve behavior of free-at-once, stack,\r\n- ring buffer, and double stack.\r\n- For details, see documentation chapter \\ref linear_algorithm.\r\n- *\/\r\n- VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004,\r\n-\r\n- \/** Bit mask to extract only `ALGORITHM` bits from entire set of flags.\r\n- *\/\r\n- VMA_POOL_CREATE_ALGORITHM_MASK =\r\n- VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT,\r\n-\r\n- VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaPoolCreateFlagBits;\r\n-\/\/\/ Flags to be passed as VmaPoolCreateInfo::flags. See #VmaPoolCreateFlagBits.\r\n-typedef VkFlags VmaPoolCreateFlags;\r\n-\r\n-\/\/\/ Flags to be passed as VmaDefragmentationInfo::flags.\r\n-typedef enum VmaDefragmentationFlagBits\r\n-{\r\n- \/* \\brief Use simple but fast algorithm for defragmentation.\r\n- May not achieve best results but will require least time to compute and least allocations to copy.\r\n- *\/\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT = 0x1,\r\n- \/* \\brief Default defragmentation algorithm, applied also when no `ALGORITHM` flag is specified.\r\n- Offers a balance between defragmentation quality and the amount of allocations and bytes that need to be moved.\r\n- *\/\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT = 0x2,\r\n- \/* \\brief Perform full defragmentation of memory.\r\n- Can result in notably more time to compute and allocations to copy, but will achieve best memory packing.\r\n- *\/\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT = 0x4,\r\n- \/** \\brief Use the most roboust algorithm at the cost of time to compute and number of copies to make.\r\n- Only available when bufferImageGranularity is greater than 1, since it aims to reduce\r\n- alignment issues between different types of resources.\r\n- Otherwise falls back to same behavior as #VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT.\r\n- *\/\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT = 0x8,\r\n-\r\n- \/\/\/ A bit mask to extract only `ALGORITHM` bits from entire set of flags.\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK = \r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT |\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT |\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT |\r\n- VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT,\r\n-\r\n- VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaDefragmentationFlagBits;\r\n-\/\/\/ See #VmaDefragmentationFlagBits.\r\n-typedef VkFlags VmaDefragmentationFlags;\r\n-\r\n-\/\/\/ Operation performed on single defragmentation move. See structure #VmaDefragmentationMove.\r\n-typedef enum VmaDefragmentationMoveOperation\r\n-{\r\n- \/\/\/ Buffer\/image has been recreated at `dstTmpAllocation`, data has been copied, old buffer\/image has been destroyed. `srcAllocation` should be changed to point to the new place. This is the default value set by vmaBeginDefragmentationPass().\r\n- VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY = 0,\r\n- \/\/\/ Set this value if you cannot move the allocation. New place reserved at `dstTmpAllocation` will be freed. `srcAllocation` will remain unchanged.\r\n- VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE = 1,\r\n- \/\/\/ Set this value if you decide to abandon the allocation and you destroyed the buffer\/image. New place reserved at `dstTmpAllocation` will be freed, along with `srcAllocation`, which will be destroyed.\r\n- VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY = 2,\r\n-} VmaDefragmentationMoveOperation;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_virtual\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Flags to be passed as VmaVirtualBlockCreateInfo::flags.\r\n-typedef enum VmaVirtualBlockCreateFlagBits\r\n-{\r\n- \/** \\brief Enables alternative, linear allocation algorithm in this virtual block.\r\n-\r\n- Specify this flag to enable linear allocation algorithm, which always creates\r\n- new allocations after last one and doesn't reuse space from allocations freed in\r\n- between. It trades memory consumption for simplified algorithm and data\r\n- structure, which has better performance and uses less memory for metadata.\r\n-\r\n- By using this flag, you can achieve behavior of free-at-once, stack,\r\n- ring buffer, and double stack.\r\n- For details, see documentation chapter \\ref linear_algorithm.\r\n- *\/\r\n- VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT = 0x00000001,\r\n-\r\n- \/** \\brief Bit mask to extract only `ALGORITHM` bits from entire set of flags.\r\n- *\/\r\n- VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK =\r\n- VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT,\r\n-\r\n- VMA_VIRTUAL_BLOCK_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaVirtualBlockCreateFlagBits;\r\n-\/\/\/ Flags to be passed as VmaVirtualBlockCreateInfo::flags. See #VmaVirtualBlockCreateFlagBits.\r\n-typedef VkFlags VmaVirtualBlockCreateFlags;\r\n-\r\n-\/\/\/ Flags to be passed as VmaVirtualAllocationCreateInfo::flags.\r\n-typedef enum VmaVirtualAllocationCreateFlagBits\r\n-{\r\n- \/** \\brief Allocation will be created from upper stack in a double stack pool.\r\n-\r\n- This flag is only allowed for virtual blocks created with #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT flag.\r\n- *\/\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT,\r\n- \/** \\brief Allocation strategy that tries to minimize memory usage.\r\n- *\/\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,\r\n- \/** \\brief Allocation strategy that tries to minimize allocation time.\r\n- *\/\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,\r\n- \/** Allocation strategy that chooses always the lowest offset in available space.\r\n- This is not the most efficient strategy but achieves highly packed data.\r\n- *\/\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\r\n- \/** \\brief A bit mask to extract only `STRATEGY` bits from entire set of flags.\r\n-\r\n- These strategy flags are binary compatible with equivalent flags in #VmaAllocationCreateFlagBits.\r\n- *\/\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK = VMA_ALLOCATION_CREATE_STRATEGY_MASK,\r\n-\r\n- VMA_VIRTUAL_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\r\n-} VmaVirtualAllocationCreateFlagBits;\r\n-\/\/\/ Flags to be passed as VmaVirtualAllocationCreateInfo::flags. See #VmaVirtualAllocationCreateFlagBits.\r\n-typedef VkFlags VmaVirtualAllocationCreateFlags;\r\n-\r\n-\/** @} *\/\r\n-\r\n-#endif \/\/ _VMA_ENUM_DECLARATIONS\r\n-\r\n-#ifndef _VMA_DATA_TYPES_DECLARATIONS\r\n-\r\n-\/**\r\n-\\addtogroup group_init\r\n-@{ *\/\r\n-\r\n-\/** \\struct VmaAllocator\r\n-\\brief Represents main object of this library initialized.\r\n-\r\n-Fill structure #VmaAllocatorCreateInfo and call function vmaCreateAllocator() to create it.\r\n-Call function vmaDestroyAllocator() to destroy it.\r\n-\r\n-It is recommended to create just one object of this type per `VkDevice` object,\r\n-right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed.\r\n-*\/\r\n-VK_DEFINE_HANDLE(VmaAllocator)\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\struct VmaPool\r\n-\\brief Represents custom memory pool\r\n-\r\n-Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it.\r\n-Call function vmaDestroyPool() to destroy it.\r\n-\r\n-For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools).\r\n-*\/\r\n-VK_DEFINE_HANDLE(VmaPool)\r\n-\r\n-\/** \\struct VmaAllocation\r\n-\\brief Represents single memory allocation.\r\n-\r\n-It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type\r\n-plus unique offset.\r\n-\r\n-There are multiple ways to create such object.\r\n-You need to fill structure VmaAllocationCreateInfo.\r\n-For more information see [Choosing memory type](@ref choosing_memory_type).\r\n-\r\n-Although the library provides convenience functions that create Vulkan buffer or image,\r\n-allocate memory for it and bind them together,\r\n-binding of the allocation to a buffer or an image is out of scope of the allocation itself.\r\n-Allocation object can exist without buffer\/image bound,\r\n-binding can be done manually by the user, and destruction of it can be done\r\n-independently of destruction of the allocation.\r\n-\r\n-The object also remembers its size and some other information.\r\n-To retrieve this information, use function vmaGetAllocationInfo() and inspect\r\n-returned structure VmaAllocationInfo.\r\n-*\/\r\n-VK_DEFINE_HANDLE(VmaAllocation)\r\n-\r\n-\/** \\struct VmaDefragmentationContext\r\n-\\brief An opaque object that represents started defragmentation process.\r\n-\r\n-Fill structure #VmaDefragmentationInfo and call function vmaBeginDefragmentation() to create it.\r\n-Call function vmaEndDefragmentation() to destroy it.\r\n-*\/\r\n-VK_DEFINE_HANDLE(VmaDefragmentationContext)\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_virtual\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\struct VmaVirtualAllocation\r\n-\\brief Represents single memory allocation done inside VmaVirtualBlock.\r\n-\r\n-Use it as a unique identifier to virtual allocation within the single block.\r\n-\r\n-Use value `VK_NULL_HANDLE` to represent a null\/invalid allocation.\r\n-*\/\r\n-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaVirtualAllocation);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_virtual\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\struct VmaVirtualBlock\r\n-\\brief Handle to a virtual block object that allows to use core allocation algorithm without allocating any real GPU memory.\r\n-\r\n-Fill in #VmaVirtualBlockCreateInfo structure and use vmaCreateVirtualBlock() to create it. Use vmaDestroyVirtualBlock() to destroy it.\r\n-For more information, see documentation chapter \\ref virtual_allocator.\r\n-\r\n-This object is not thread-safe - should not be used from multiple threads simultaneously, must be synchronized externally.\r\n-*\/\r\n-VK_DEFINE_HANDLE(VmaVirtualBlock)\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_init\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Callback function called after successful vkAllocateMemory.\r\n-typedef void (VKAPI_PTR* PFN_vmaAllocateDeviceMemoryFunction)(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t memoryType,\r\n- VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory,\r\n- VkDeviceSize size,\r\n- void* VMA_NULLABLE pUserData);\r\n-\r\n-\/\/\/ Callback function called before vkFreeMemory.\r\n-typedef void (VKAPI_PTR* PFN_vmaFreeDeviceMemoryFunction)(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t memoryType,\r\n- VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory,\r\n- VkDeviceSize size,\r\n- void* VMA_NULLABLE pUserData);\r\n-\r\n-\/** \\brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`.\r\n-\r\n-Provided for informative purpose, e.g. to gather statistics about number of\r\n-allocations or total amount of memory allocated in Vulkan.\r\n-\r\n-Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.\r\n-*\/\r\n-typedef struct VmaDeviceMemoryCallbacks\r\n-{\r\n- \/\/\/ Optional, can be null.\r\n- PFN_vmaAllocateDeviceMemoryFunction VMA_NULLABLE pfnAllocate;\r\n- \/\/\/ Optional, can be null.\r\n- PFN_vmaFreeDeviceMemoryFunction VMA_NULLABLE pfnFree;\r\n- \/\/\/ Optional, can be null.\r\n- void* VMA_NULLABLE pUserData;\r\n-} VmaDeviceMemoryCallbacks;\r\n-\r\n-\/** \\brief Pointers to some Vulkan functions - a subset used by the library.\r\n-\r\n-Used in VmaAllocatorCreateInfo::pVulkanFunctions.\r\n-*\/\r\n-typedef struct VmaVulkanFunctions\r\n-{\r\n- \/\/\/ Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS.\r\n- PFN_vkGetInstanceProcAddr VMA_NULLABLE vkGetInstanceProcAddr;\r\n- \/\/\/ Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS.\r\n- PFN_vkGetDeviceProcAddr VMA_NULLABLE vkGetDeviceProcAddr;\r\n- PFN_vkGetPhysicalDeviceProperties VMA_NULLABLE vkGetPhysicalDeviceProperties;\r\n- PFN_vkGetPhysicalDeviceMemoryProperties VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties;\r\n- PFN_vkAllocateMemory VMA_NULLABLE vkAllocateMemory;\r\n- PFN_vkFreeMemory VMA_NULLABLE vkFreeMemory;\r\n- PFN_vkMapMemory VMA_NULLABLE vkMapMemory;\r\n- PFN_vkUnmapMemory VMA_NULLABLE vkUnmapMemory;\r\n- PFN_vkFlushMappedMemoryRanges VMA_NULLABLE vkFlushMappedMemoryRanges;\r\n- PFN_vkInvalidateMappedMemoryRanges VMA_NULLABLE vkInvalidateMappedMemoryRanges;\r\n- PFN_vkBindBufferMemory VMA_NULLABLE vkBindBufferMemory;\r\n- PFN_vkBindImageMemory VMA_NULLABLE vkBindImageMemory;\r\n- PFN_vkGetBufferMemoryRequirements VMA_NULLABLE vkGetBufferMemoryRequirements;\r\n- PFN_vkGetImageMemoryRequirements VMA_NULLABLE vkGetImageMemoryRequirements;\r\n- PFN_vkCreateBuffer VMA_NULLABLE vkCreateBuffer;\r\n- PFN_vkDestroyBuffer VMA_NULLABLE vkDestroyBuffer;\r\n- PFN_vkCreateImage VMA_NULLABLE vkCreateImage;\r\n- PFN_vkDestroyImage VMA_NULLABLE vkDestroyImage;\r\n- PFN_vkCmdCopyBuffer VMA_NULLABLE vkCmdCopyBuffer;\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- \/\/\/ Fetch \"vkGetBufferMemoryRequirements2\" on Vulkan >= 1.1, fetch \"vkGetBufferMemoryRequirements2KHR\" when using VK_KHR_dedicated_allocation extension.\r\n- PFN_vkGetBufferMemoryRequirements2KHR VMA_NULLABLE vkGetBufferMemoryRequirements2KHR;\r\n- \/\/\/ Fetch \"vkGetImageMemoryRequirements 2\" on Vulkan >= 1.1, fetch \"vkGetImageMemoryRequirements2KHR\" when using VK_KHR_dedicated_allocation extension.\r\n- PFN_vkGetImageMemoryRequirements2KHR VMA_NULLABLE vkGetImageMemoryRequirements2KHR;\r\n-#endif\r\n-#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\r\n- \/\/\/ Fetch \"vkBindBufferMemory2\" on Vulkan >= 1.1, fetch \"vkBindBufferMemory2KHR\" when using VK_KHR_bind_memory2 extension.\r\n- PFN_vkBindBufferMemory2KHR VMA_NULLABLE vkBindBufferMemory2KHR;\r\n- \/\/\/ Fetch \"vkBindImageMemory2\" on Vulkan >= 1.1, fetch \"vkBindImageMemory2KHR\" when using VK_KHR_bind_memory2 extension.\r\n- PFN_vkBindImageMemory2KHR VMA_NULLABLE vkBindImageMemory2KHR;\r\n-#endif\r\n-#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000\r\n- PFN_vkGetPhysicalDeviceMemoryProperties2KHR VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties2KHR;\r\n-#endif\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- \/\/\/ Fetch from \"vkGetDeviceBufferMemoryRequirements\" on Vulkan >= 1.3, but you can also fetch it from \"vkGetDeviceBufferMemoryRequirementsKHR\" if you enabled extension VK_KHR_maintenance4.\r\n- PFN_vkGetDeviceBufferMemoryRequirements VMA_NULLABLE vkGetDeviceBufferMemoryRequirements;\r\n- \/\/\/ Fetch from \"vkGetDeviceImageMemoryRequirements\" on Vulkan >= 1.3, but you can also fetch it from \"vkGetDeviceImageMemoryRequirementsKHR\" if you enabled extension VK_KHR_maintenance4.\r\n- PFN_vkGetDeviceImageMemoryRequirements VMA_NULLABLE vkGetDeviceImageMemoryRequirements;\r\n-#endif\r\n-} VmaVulkanFunctions;\r\n-\r\n-\/\/\/ Description of a Allocator to be created.\r\n-typedef struct VmaAllocatorCreateInfo\r\n-{\r\n- \/\/\/ Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum.\r\n- VmaAllocatorCreateFlags flags;\r\n- \/\/\/ Vulkan physical device.\r\n- \/** It must be valid throughout whole lifetime of created allocator. *\/\r\n- VkPhysicalDevice VMA_NOT_NULL physicalDevice;\r\n- \/\/\/ Vulkan device.\r\n- \/** It must be valid throughout whole lifetime of created allocator. *\/\r\n- VkDevice VMA_NOT_NULL device;\r\n- \/\/\/ Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional.\r\n- \/** Set to 0 to use default, which is currently 256 MiB. *\/\r\n- VkDeviceSize preferredLargeHeapBlockSize;\r\n- \/\/\/ Custom CPU memory allocation callbacks. Optional.\r\n- \/** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. *\/\r\n- const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks;\r\n- \/\/\/ Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional.\r\n- \/** Optional, can be null. *\/\r\n- const VmaDeviceMemoryCallbacks* VMA_NULLABLE pDeviceMemoryCallbacks;\r\n- \/** \\brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap.\r\n-\r\n- If not NULL, it must be a pointer to an array of\r\n- `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on\r\n- maximum number of bytes that can be allocated out of particular Vulkan memory\r\n- heap.\r\n-\r\n- Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that\r\n- heap. This is also the default in case of `pHeapSizeLimit` = NULL.\r\n-\r\n- If there is a limit defined for a heap:\r\n-\r\n- - If user tries to allocate more memory from that heap using this allocator,\r\n- the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n- - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the\r\n- value of this limit will be reported instead when using vmaGetMemoryProperties().\r\n-\r\n- Warning! Using this feature may not be equivalent to installing a GPU with\r\n- smaller amount of memory, because graphics driver doesn't necessary fail new\r\n- allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is\r\n- exceeded. It may return success and just silently migrate some device memory\r\n- blocks to system RAM. This driver behavior can also be controlled using\r\n- VK_AMD_memory_overallocation_behavior extension.\r\n- *\/\r\n- const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\") pHeapSizeLimit;\r\n-\r\n- \/** \\brief Pointers to Vulkan functions. Can be null.\r\n-\r\n- For details see [Pointers to Vulkan functions](@ref config_Vulkan_functions).\r\n- *\/\r\n- const VmaVulkanFunctions* VMA_NULLABLE pVulkanFunctions;\r\n- \/** \\brief Handle to Vulkan instance object.\r\n-\r\n- Starting from version 3.0.0 this member is no longer optional, it must be set!\r\n- *\/\r\n- VkInstance VMA_NOT_NULL instance;\r\n- \/** \\brief Optional. The highest version of Vulkan that the application is designed to use.\r\n-\r\n- It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`.\r\n- The patch version number specified is ignored. Only the major and minor versions are considered.\r\n- It must be less or equal (preferably equal) to value as passed to `vkCreateInstance` as `VkApplicationInfo::apiVersion`.\r\n- Only versions 1.0, 1.1, 1.2, 1.3 are supported by the current implementation.\r\n- Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`.\r\n- *\/\r\n- uint32_t vulkanApiVersion;\r\n-#if VMA_EXTERNAL_MEMORY\r\n- \/** \\brief Either null or a pointer to an array of external memory handle types for each Vulkan memory type.\r\n-\r\n- If not NULL, it must be a pointer to an array of `VkPhysicalDeviceMemoryProperties::memoryTypeCount`\r\n- elements, defining external memory handle types of particular Vulkan memory type,\r\n- to be passed using `VkExportMemoryAllocateInfoKHR`.\r\n-\r\n- Any of the elements may be equal to 0, which means not to use `VkExportMemoryAllocateInfoKHR` on this memory type.\r\n- This is also the default in case of `pTypeExternalMemoryHandleTypes` = NULL.\r\n- *\/\r\n- const VkExternalMemoryHandleTypeFlagsKHR* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryTypeCount\") pTypeExternalMemoryHandleTypes;\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-} VmaAllocatorCreateInfo;\r\n-\r\n-\/\/\/ Information about existing #VmaAllocator object.\r\n-typedef struct VmaAllocatorInfo\r\n-{\r\n- \/** \\brief Handle to Vulkan instance object.\r\n-\r\n- This is the same value as has been passed through VmaAllocatorCreateInfo::instance.\r\n- *\/\r\n- VkInstance VMA_NOT_NULL instance;\r\n- \/** \\brief Handle to Vulkan physical device object.\r\n-\r\n- This is the same value as has been passed through VmaAllocatorCreateInfo::physicalDevice.\r\n- *\/\r\n- VkPhysicalDevice VMA_NOT_NULL physicalDevice;\r\n- \/** \\brief Handle to Vulkan device object.\r\n-\r\n- This is the same value as has been passed through VmaAllocatorCreateInfo::device.\r\n- *\/\r\n- VkDevice VMA_NOT_NULL device;\r\n-} VmaAllocatorInfo;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_stats\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Calculated statistics of memory usage e.g. in a specific memory type, heap, custom pool, or total.\r\n-\r\n-These are fast to calculate.\r\n-See functions: vmaGetHeapBudgets(), vmaGetPoolStatistics().\r\n-*\/\r\n-typedef struct VmaStatistics\r\n-{\r\n- \/** \\brief Number of `VkDeviceMemory` objects - Vulkan memory blocks allocated.\r\n- *\/\r\n- uint32_t blockCount;\r\n- \/** \\brief Number of #VmaAllocation objects allocated.\r\n- \r\n- Dedicated allocations have their own blocks, so each one adds 1 to `allocationCount` as well as `blockCount`.\r\n- *\/\r\n- uint32_t allocationCount;\r\n- \/** \\brief Number of bytes allocated in `VkDeviceMemory` blocks.\r\n- \r\n- \\note To avoid confusion, please be aware that what Vulkan calls an \"allocation\" - a whole `VkDeviceMemory` object\r\n- (e.g. as in `VkPhysicalDeviceLimits::maxMemoryAllocationCount`) is called a \"block\" in VMA, while VMA calls\r\n- \"allocation\" a #VmaAllocation object that represents a memory region sub-allocated from such block, usually for a single buffer or image.\r\n- *\/\r\n- VkDeviceSize blockBytes;\r\n- \/** \\brief Total number of bytes occupied by all #VmaAllocation objects.\r\n- \r\n- Always less or equal than `blockBytes`.\r\n- Difference `(blockBytes - allocationBytes)` is the amount of memory allocated from Vulkan\r\n- but unused by any #VmaAllocation.\r\n- *\/\r\n- VkDeviceSize allocationBytes;\r\n-} VmaStatistics;\r\n-\r\n-\/** \\brief More detailed statistics than #VmaStatistics.\r\n-\r\n-These are slower to calculate. Use for debugging purposes.\r\n-See functions: vmaCalculateStatistics(), vmaCalculatePoolStatistics().\r\n-\r\n-Previous version of the statistics API provided averages, but they have been removed\r\n-because they can be easily calculated as:\r\n-\r\n-\\code\r\n-VkDeviceSize allocationSizeAvg = detailedStats.statistics.allocationBytes \/ detailedStats.statistics.allocationCount;\r\n-VkDeviceSize unusedBytes = detailedStats.statistics.blockBytes - detailedStats.statistics.allocationBytes;\r\n-VkDeviceSize unusedRangeSizeAvg = unusedBytes \/ detailedStats.unusedRangeCount;\r\n-\\endcode\r\n-*\/\r\n-typedef struct VmaDetailedStatistics\r\n-{\r\n- \/\/\/ Basic statistics.\r\n- VmaStatistics statistics;\r\n- \/\/\/ Number of free ranges of memory between allocations.\r\n- uint32_t unusedRangeCount;\r\n- \/\/\/ Smallest allocation size. `VK_WHOLE_SIZE` if there are 0 allocations.\r\n- VkDeviceSize allocationSizeMin;\r\n- \/\/\/ Largest allocation size. 0 if there are 0 allocations.\r\n- VkDeviceSize allocationSizeMax;\r\n- \/\/\/ Smallest empty range size. `VK_WHOLE_SIZE` if there are 0 empty ranges.\r\n- VkDeviceSize unusedRangeSizeMin;\r\n- \/\/\/ Largest empty range size. 0 if there are 0 empty ranges.\r\n- VkDeviceSize unusedRangeSizeMax;\r\n-} VmaDetailedStatistics;\r\n-\r\n-\/** \\brief General statistics from current state of the Allocator -\r\n-total memory usage across all memory heaps and types.\r\n-\r\n-These are slower to calculate. Use for debugging purposes.\r\n-See function vmaCalculateStatistics().\r\n-*\/\r\n-typedef struct VmaTotalStatistics\r\n-{\r\n- VmaDetailedStatistics memoryType[VK_MAX_MEMORY_TYPES];\r\n- VmaDetailedStatistics memoryHeap[VK_MAX_MEMORY_HEAPS];\r\n- VmaDetailedStatistics total;\r\n-} VmaTotalStatistics;\r\n-\r\n-\/** \\brief Statistics of current memory usage and available budget for a specific memory heap.\r\n-\r\n-These are fast to calculate.\r\n-See function vmaGetHeapBudgets().\r\n-*\/\r\n-typedef struct VmaBudget\r\n-{\r\n- \/** \\brief Statistics fetched from the library.\r\n- *\/\r\n- VmaStatistics statistics;\r\n- \/** \\brief Estimated current memory usage of the program, in bytes.\r\n-\r\n- Fetched from system using VK_EXT_memory_budget extension if enabled.\r\n-\r\n- It might be different than `statistics.blockBytes` (usually higher) due to additional implicit objects\r\n- also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or\r\n- `VkDeviceMemory` blocks allocated outside of this library, if any.\r\n- *\/\r\n- VkDeviceSize usage;\r\n- \/** \\brief Estimated amount of memory available to the program, in bytes.\r\n-\r\n- Fetched from system using VK_EXT_memory_budget extension if enabled.\r\n-\r\n- It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors\r\n- external to the program, decided by the operating system.\r\n- Difference `budget - usage` is the amount of additional memory that can probably\r\n- be allocated without problems. Exceeding the budget may result in various problems.\r\n- *\/\r\n- VkDeviceSize budget;\r\n-} VmaBudget;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Parameters of new #VmaAllocation.\r\n-\r\n-To be used with functions like vmaCreateBuffer(), vmaCreateImage(), and many others.\r\n-*\/\r\n-typedef struct VmaAllocationCreateInfo\r\n-{\r\n- \/\/\/ Use #VmaAllocationCreateFlagBits enum.\r\n- VmaAllocationCreateFlags flags;\r\n- \/** \\brief Intended usage of memory.\r\n-\r\n- You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \\n\r\n- If `pool` is not null, this member is ignored.\r\n- *\/\r\n- VmaMemoryUsage usage;\r\n- \/** \\brief Flags that must be set in a Memory Type chosen for an allocation.\r\n-\r\n- Leave 0 if you specify memory requirements in other way. \\n\r\n- If `pool` is not null, this member is ignored.*\/\r\n- VkMemoryPropertyFlags requiredFlags;\r\n- \/** \\brief Flags that preferably should be set in a memory type chosen for an allocation.\r\n-\r\n- Set to 0 if no additional flags are preferred. \\n\r\n- If `pool` is not null, this member is ignored. *\/\r\n- VkMemoryPropertyFlags preferredFlags;\r\n- \/** \\brief Bitmask containing one bit set for every memory type acceptable for this allocation.\r\n-\r\n- Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if\r\n- it meets other requirements specified by this structure, with no further\r\n- restrictions on memory type index. \\n\r\n- If `pool` is not null, this member is ignored.\r\n- *\/\r\n- uint32_t memoryTypeBits;\r\n- \/** \\brief Pool that this allocation should be created in.\r\n-\r\n- Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members:\r\n- `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored.\r\n- *\/\r\n- VmaPool VMA_NULLABLE pool;\r\n- \/** \\brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData().\r\n-\r\n- If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either\r\n- null or pointer to a null-terminated string. The string will be then copied to\r\n- internal buffer, so it doesn't need to be valid after allocation call.\r\n- *\/\r\n- void* VMA_NULLABLE pUserData;\r\n- \/** \\brief A floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.\r\n-\r\n- It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object\r\n- and this allocation ends up as dedicated or is explicitly forced as dedicated using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n- Otherwise, it has the priority of a memory block where it is placed and this variable is ignored.\r\n- *\/\r\n- float priority;\r\n-} VmaAllocationCreateInfo;\r\n-\r\n-\/\/\/ Describes parameter of created #VmaPool.\r\n-typedef struct VmaPoolCreateInfo\r\n-{\r\n- \/** \\brief Vulkan memory type index to allocate this pool from.\r\n- *\/\r\n- uint32_t memoryTypeIndex;\r\n- \/** \\brief Use combination of #VmaPoolCreateFlagBits.\r\n- *\/\r\n- VmaPoolCreateFlags flags;\r\n- \/** \\brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional.\r\n-\r\n- Specify nonzero to set explicit, constant size of memory blocks used by this\r\n- pool.\r\n-\r\n- Leave 0 to use default and let the library manage block sizes automatically.\r\n- Sizes of particular blocks may vary.\r\n- In this case, the pool will also support dedicated allocations.\r\n- *\/\r\n- VkDeviceSize blockSize;\r\n- \/** \\brief Minimum number of blocks to be always allocated in this pool, even if they stay empty.\r\n-\r\n- Set to 0 to have no preallocated blocks and allow the pool be completely empty.\r\n- *\/\r\n- size_t minBlockCount;\r\n- \/** \\brief Maximum number of blocks that can be allocated in this pool. Optional.\r\n-\r\n- Set to 0 to use default, which is `SIZE_MAX`, which means no limit.\r\n-\r\n- Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated\r\n- throughout whole lifetime of this pool.\r\n- *\/\r\n- size_t maxBlockCount;\r\n- \/** \\brief A floating-point value between 0 and 1, indicating the priority of the allocations in this pool relative to other memory allocations.\r\n-\r\n- It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object.\r\n- Otherwise, this variable is ignored.\r\n- *\/\r\n- float priority;\r\n- \/** \\brief Additional minimum alignment to be used for all allocations created from this pool. Can be 0.\r\n-\r\n- Leave 0 (default) not to impose any additional alignment. If not 0, it must be a power of two.\r\n- It can be useful in cases where alignment returned by Vulkan by functions like `vkGetBufferMemoryRequirements` is not enough,\r\n- e.g. when doing interop with OpenGL.\r\n- *\/\r\n- VkDeviceSize minAllocationAlignment;\r\n- \/** \\brief Additional `pNext` chain to be attached to `VkMemoryAllocateInfo` used for every allocation made by this pool. Optional.\r\n-\r\n- Optional, can be null. If not null, it must point to a `pNext` chain of structures that can be attached to `VkMemoryAllocateInfo`.\r\n- It can be useful for special needs such as adding `VkExportMemoryAllocateInfoKHR`.\r\n- Structures pointed by this member must remain alive and unchanged for the whole lifetime of the custom pool.\r\n-\r\n- Please note that some structures, e.g. `VkMemoryPriorityAllocateInfoEXT`, `VkMemoryDedicatedAllocateInfoKHR`,\r\n- can be attached automatically by this library when using other, more convenient of its features.\r\n- *\/\r\n- void* VMA_NULLABLE pMemoryAllocateNext;\r\n-} VmaPoolCreateInfo;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo().\r\n-typedef struct VmaAllocationInfo\r\n-{\r\n- \/** \\brief Memory type index that this allocation was allocated from.\r\n-\r\n- It never changes.\r\n- *\/\r\n- uint32_t memoryType;\r\n- \/** \\brief Handle to Vulkan memory object.\r\n-\r\n- Same memory object can be shared by multiple allocations.\r\n-\r\n- It can change after the allocation is moved during \\ref defragmentation.\r\n- *\/\r\n- VkDeviceMemory VMA_NULLABLE_NON_DISPATCHABLE deviceMemory;\r\n- \/** \\brief Offset in `VkDeviceMemory` object to the beginning of this allocation, in bytes. `(deviceMemory, offset)` pair is unique to this allocation.\r\n-\r\n- You usually don't need to use this offset. If you create a buffer or an image together with the allocation using e.g. function\r\n- vmaCreateBuffer(), vmaCreateImage(), functions that operate on these resources refer to the beginning of the buffer or image,\r\n- not entire device memory block. Functions like vmaMapMemory(), vmaBindBufferMemory() also refer to the beginning of the allocation\r\n- and apply this offset automatically.\r\n-\r\n- It can change after the allocation is moved during \\ref defragmentation.\r\n- *\/\r\n- VkDeviceSize offset;\r\n- \/** \\brief Size of this allocation, in bytes.\r\n-\r\n- It never changes.\r\n-\r\n- \\note Allocation size returned in this variable may be greater than the size\r\n- requested for the resource e.g. as `VkBufferCreateInfo::size`. Whole size of the\r\n- allocation is accessible for operations on memory e.g. using a pointer after\r\n- mapping with vmaMapMemory(), but operations on the resource e.g. using\r\n- `vkCmdCopyBuffer` must be limited to the size of the resource.\r\n- *\/\r\n- VkDeviceSize size;\r\n- \/** \\brief Pointer to the beginning of this allocation as mapped data.\r\n-\r\n- If the allocation hasn't been mapped using vmaMapMemory() and hasn't been\r\n- created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value is null.\r\n-\r\n- It can change after call to vmaMapMemory(), vmaUnmapMemory().\r\n- It can also change after the allocation is moved during \\ref defragmentation.\r\n- *\/\r\n- void* VMA_NULLABLE pMappedData;\r\n- \/** \\brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData().\r\n-\r\n- It can change after call to vmaSetAllocationUserData() for this allocation.\r\n- *\/\r\n- void* VMA_NULLABLE pUserData;\r\n- \/** \\brief Custom allocation name that was set with vmaSetAllocationName().\r\n- \r\n- It can change after call to vmaSetAllocationName() for this allocation.\r\n- \r\n- Another way to set custom name is to pass it in VmaAllocationCreateInfo::pUserData with\r\n- additional flag #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT set [DEPRECATED].\r\n- *\/\r\n- const char* VMA_NULLABLE pName;\r\n-} VmaAllocationInfo;\r\n-\r\n-\/** \\brief Parameters for defragmentation.\r\n-\r\n-To be used with function vmaBeginDefragmentation().\r\n-*\/\r\n-typedef struct VmaDefragmentationInfo\r\n-{\r\n- \/\/\/ \\brief Use combination of #VmaDefragmentationFlagBits.\r\n- VmaDefragmentationFlags flags;\r\n- \/** \\brief Custom pool to be defragmented.\r\n-\r\n- If null then default pools will undergo defragmentation process.\r\n- *\/\r\n- VmaPool VMA_NULLABLE pool;\r\n- \/** \\brief Maximum numbers of bytes that can be copied during single pass, while moving allocations to different places.\r\n-\r\n- `0` means no limit.\r\n- *\/\r\n- VkDeviceSize maxBytesPerPass;\r\n- \/** \\brief Maximum number of allocations that can be moved during single pass to a different place.\r\n-\r\n- `0` means no limit.\r\n- *\/\r\n- uint32_t maxAllocationsPerPass;\r\n-} VmaDefragmentationInfo;\r\n-\r\n-\/\/\/ Single move of an allocation to be done for defragmentation.\r\n-typedef struct VmaDefragmentationMove\r\n-{\r\n- \/\/\/ Operation to be performed on the allocation by vmaEndDefragmentationPass(). Default value is #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY. You can modify it.\r\n- VmaDefragmentationMoveOperation operation;\r\n- \/\/\/ Allocation that should be moved.\r\n- VmaAllocation VMA_NOT_NULL srcAllocation;\r\n- \/** \\brief Temporary allocation pointing to destination memory that will replace `srcAllocation`.\r\n- \r\n- \\warning Do not store this allocation in your data structures! It exists only temporarily, for the duration of the defragmentation pass,\r\n- to be used for binding new buffer\/image to the destination memory using e.g. vmaBindBufferMemory().\r\n- vmaEndDefragmentationPass() will destroy it and make `srcAllocation` point to this memory.\r\n- *\/\r\n- VmaAllocation VMA_NOT_NULL dstTmpAllocation;\r\n-} VmaDefragmentationMove;\r\n-\r\n-\/** \\brief Parameters for incremental defragmentation steps.\r\n-\r\n-To be used with function vmaBeginDefragmentationPass().\r\n-*\/\r\n-typedef struct VmaDefragmentationPassMoveInfo\r\n-{\r\n- \/\/\/ Number of elements in the `pMoves` array.\r\n- uint32_t moveCount;\r\n- \/** \\brief Array of moves to be performed by the user in the current defragmentation pass.\r\n- \r\n- Pointer to an array of `moveCount` elements, owned by VMA, created in vmaBeginDefragmentationPass(), destroyed in vmaEndDefragmentationPass().\r\n-\r\n- For each element, you should:\r\n- \r\n- 1. Create a new buffer\/image in the place pointed by VmaDefragmentationMove::dstMemory + VmaDefragmentationMove::dstOffset.\r\n- 2. Copy data from the VmaDefragmentationMove::srcAllocation e.g. using `vkCmdCopyBuffer`, `vkCmdCopyImage`.\r\n- 3. Make sure these commands finished executing on the GPU.\r\n- 4. Destroy the old buffer\/image.\r\n- \r\n- Only then you can finish defragmentation pass by calling vmaEndDefragmentationPass().\r\n- After this call, the allocation will point to the new place in memory.\r\n-\r\n- Alternatively, if you cannot move specific allocation, you can set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\r\n-\r\n- Alternatively, if you decide you want to completely remove the allocation:\r\n-\r\n- 1. Destroy its buffer\/image.\r\n- 2. Set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY.\r\n-\r\n- Then, after vmaEndDefragmentationPass() the allocation will be freed.\r\n- *\/\r\n- VmaDefragmentationMove* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(moveCount) pMoves;\r\n-} VmaDefragmentationPassMoveInfo;\r\n-\r\n-\/\/\/ Statistics returned for defragmentation process in function vmaEndDefragmentation().\r\n-typedef struct VmaDefragmentationStats\r\n-{\r\n- \/\/\/ Total number of bytes that have been copied while moving allocations to different places.\r\n- VkDeviceSize bytesMoved;\r\n- \/\/\/ Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects.\r\n- VkDeviceSize bytesFreed;\r\n- \/\/\/ Number of allocations that have been moved to different places.\r\n- uint32_t allocationsMoved;\r\n- \/\/\/ Number of empty `VkDeviceMemory` objects that have been released to the system.\r\n- uint32_t deviceMemoryBlocksFreed;\r\n-} VmaDefragmentationStats;\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_virtual\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Parameters of created #VmaVirtualBlock object to be passed to vmaCreateVirtualBlock().\r\n-typedef struct VmaVirtualBlockCreateInfo\r\n-{\r\n- \/** \\brief Total size of the virtual block.\r\n-\r\n- Sizes can be expressed in bytes or any units you want as long as you are consistent in using them.\r\n- For example, if you allocate from some array of structures, 1 can mean single instance of entire structure.\r\n- *\/\r\n- VkDeviceSize size;\r\n-\r\n- \/** \\brief Use combination of #VmaVirtualBlockCreateFlagBits.\r\n- *\/\r\n- VmaVirtualBlockCreateFlags flags;\r\n-\r\n- \/** \\brief Custom CPU memory allocation callbacks. Optional.\r\n-\r\n- Optional, can be null. When specified, they will be used for all CPU-side memory allocations.\r\n- *\/\r\n- const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks;\r\n-} VmaVirtualBlockCreateInfo;\r\n-\r\n-\/\/\/ Parameters of created virtual allocation to be passed to vmaVirtualAllocate().\r\n-typedef struct VmaVirtualAllocationCreateInfo\r\n-{\r\n- \/** \\brief Size of the allocation.\r\n-\r\n- Cannot be zero.\r\n- *\/\r\n- VkDeviceSize size;\r\n- \/** \\brief Required alignment of the allocation. Optional.\r\n-\r\n- Must be power of two. Special value 0 has the same meaning as 1 - means no special alignment is required, so allocation can start at any offset.\r\n- *\/\r\n- VkDeviceSize alignment;\r\n- \/** \\brief Use combination of #VmaVirtualAllocationCreateFlagBits.\r\n- *\/\r\n- VmaVirtualAllocationCreateFlags flags;\r\n- \/** \\brief Custom pointer to be associated with the allocation. Optional.\r\n-\r\n- It can be any value and can be used for user-defined purposes. It can be fetched or changed later.\r\n- *\/\r\n- void* VMA_NULLABLE pUserData;\r\n-} VmaVirtualAllocationCreateInfo;\r\n-\r\n-\/\/\/ Parameters of an existing virtual allocation, returned by vmaGetVirtualAllocationInfo().\r\n-typedef struct VmaVirtualAllocationInfo\r\n-{\r\n- \/** \\brief Offset of the allocation.\r\n- \r\n- Offset at which the allocation was made.\r\n- *\/\r\n- VkDeviceSize offset;\r\n- \/** \\brief Size of the allocation.\r\n-\r\n- Same value as passed in VmaVirtualAllocationCreateInfo::size.\r\n- *\/\r\n- VkDeviceSize size;\r\n- \/** \\brief Custom pointer associated with the allocation.\r\n-\r\n- Same value as passed in VmaVirtualAllocationCreateInfo::pUserData or to vmaSetVirtualAllocationUserData().\r\n- *\/\r\n- void* VMA_NULLABLE pUserData;\r\n-} VmaVirtualAllocationInfo;\r\n-\r\n-\/** @} *\/\r\n-\r\n-#endif \/\/ _VMA_DATA_TYPES_DECLARATIONS\r\n-\r\n-#ifndef _VMA_FUNCTION_HEADERS\r\n-\r\n-\/**\r\n-\\addtogroup group_init\r\n-@{\r\n-*\/\r\n-\r\n-\/\/\/ Creates #VmaAllocator object.\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(\r\n- const VmaAllocatorCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaAllocator VMA_NULLABLE* VMA_NOT_NULL pAllocator);\r\n-\r\n-\/\/\/ Destroys allocator object.\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(\r\n- VmaAllocator VMA_NULLABLE allocator);\r\n-\r\n-\/** \\brief Returns information about existing #VmaAllocator object - handle to Vulkan device etc.\r\n-\r\n-It might be useful if you want to keep just the #VmaAllocator handle and fetch other required handles to\r\n-`VkPhysicalDevice`, `VkDevice` etc. every time using this function.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocatorInfo* VMA_NOT_NULL pAllocatorInfo);\r\n-\r\n-\/**\r\n-PhysicalDeviceProperties are fetched from physicalDevice by the allocator.\r\n-You can access it here, without fetching it again on your own.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkPhysicalDeviceProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceProperties);\r\n-\r\n-\/**\r\n-PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator.\r\n-You can access it here, without fetching it again on your own.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkPhysicalDeviceMemoryProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceMemoryProperties);\r\n-\r\n-\/**\r\n-\\brief Given Memory Type Index, returns Property Flags of this memory type.\r\n-\r\n-This is just a convenience function. Same information can be obtained using\r\n-vmaGetMemoryProperties().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t memoryTypeIndex,\r\n- VkMemoryPropertyFlags* VMA_NOT_NULL pFlags);\r\n-\r\n-\/** \\brief Sets index of the current frame.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t frameIndex);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_stats\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Retrieves statistics from current state of the Allocator.\r\n-\r\n-This function is called \"calculate\" not \"get\" because it has to traverse all\r\n-internal data structures, so it may be quite slow. Use it for debugging purposes.\r\n-For faster but more brief statistics suitable to be called every frame or every allocation,\r\n-use vmaGetHeapBudgets().\r\n-\r\n-Note that when using allocator from multiple threads, returned information may immediately\r\n-become outdated.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaTotalStatistics* VMA_NOT_NULL pStats);\r\n-\r\n-\/** \\brief Retrieves information about current memory usage and budget for all memory heaps.\r\n-\r\n-\\param allocator\r\n-\\param[out] pBudgets Must point to array with number of elements at least equal to number of memory heaps in physical device used.\r\n-\r\n-This function is called \"get\" not \"calculate\" because it is very fast, suitable to be called\r\n-every frame or every allocation. For more detailed statistics use vmaCalculateStatistics().\r\n-\r\n-Note that when using allocator from multiple threads, returned information may immediately\r\n-become outdated.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaBudget* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\") pBudgets);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/**\r\n-\\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.\r\n-\r\n-This algorithm tries to find a memory type that:\r\n-\r\n-- Is allowed by memoryTypeBits.\r\n-- Contains all the flags from pAllocationCreateInfo->requiredFlags.\r\n-- Matches intended usage.\r\n-- Has as many flags from pAllocationCreateInfo->preferredFlags as possible.\r\n-\r\n-\\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result\r\n-from this function or any other allocating function probably means that your\r\n-device doesn't support any memory type with requested features for the specific\r\n-type of resource you want to use it for. Please check parameters of your\r\n-resource, like image layout (OPTIMAL versus LINEAR) or mip level count.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t memoryTypeBits,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\r\n-\r\n-\/**\r\n-\\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo.\r\n-\r\n-It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.\r\n-It internally creates a temporary, dummy buffer that never has memory bound.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\r\n-\r\n-\/**\r\n-\\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo.\r\n-\r\n-It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.\r\n-It internally creates a temporary, dummy image that never has memory bound.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\r\n-\r\n-\/** \\brief Allocates Vulkan device memory and creates #VmaPool object.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param pCreateInfo Parameters of pool to create.\r\n-\\param[out] pPool Handle to created pool.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VmaPoolCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaPool VMA_NULLABLE* VMA_NOT_NULL pPool);\r\n-\r\n-\/** \\brief Destroys #VmaPool object and frees Vulkan device memory.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NULLABLE pool);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_stats\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Retrieves statistics of existing #VmaPool object.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param pool Pool object.\r\n-\\param[out] pPoolStats Statistics of specified pool.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NOT_NULL pool,\r\n- VmaStatistics* VMA_NOT_NULL pPoolStats);\r\n-\r\n-\/** \\brief Retrieves detailed statistics of existing #VmaPool object.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param pool Pool object.\r\n-\\param[out] pPoolStats Statistics of specified pool.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NOT_NULL pool,\r\n- VmaDetailedStatistics* VMA_NOT_NULL pPoolStats);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_alloc\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Checks magic number in margins around all allocations in given memory pool in search for corruptions.\r\n-\r\n-Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,\r\n-`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is\r\n-`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).\r\n-\r\n-Possible return values:\r\n-\r\n-- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool.\r\n-- `VK_SUCCESS` - corruption detection has been performed and succeeded.\r\n-- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations.\r\n- `VMA_ASSERT` is also fired in that case.\r\n-- Other value: Error returned by Vulkan, e.g. memory mapping failure.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NOT_NULL pool);\r\n-\r\n-\/** \\brief Retrieves name of a custom pool.\r\n-\r\n-After the call `ppName` is either null or points to an internally-owned null-terminated string\r\n-containing name of the pool that was previously set. The pointer becomes invalid when the pool is\r\n-destroyed or its name is changed using vmaSetPoolName().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NOT_NULL pool,\r\n- const char* VMA_NULLABLE* VMA_NOT_NULL ppName);\r\n-\r\n-\/** \\brief Sets name of a custom pool.\r\n-\r\n-`pName` can be either null or pointer to a null-terminated string with new name for the pool.\r\n-Function makes internal copy of the string, so it can be changed or freed immediately after this call.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaPool VMA_NOT_NULL pool,\r\n- const char* VMA_NULLABLE pName);\r\n-\r\n-\/** \\brief General purpose memory allocation.\r\n-\r\n-\\param allocator\r\n-\\param pVkMemoryRequirements\r\n-\\param pCreateInfo\r\n-\\param[out] pAllocation Handle to allocated memory.\r\n-\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\r\n-\r\n-You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().\r\n-\r\n-It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(),\r\n-vmaCreateBuffer(), vmaCreateImage() instead whenever possible.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkMemoryRequirements* VMA_NOT_NULL pVkMemoryRequirements,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief General purpose memory allocation for multiple allocation objects at once.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param pVkMemoryRequirements Memory requirements for each allocation.\r\n-\\param pCreateInfo Creation parameters for each allocation.\r\n-\\param allocationCount Number of allocations to make.\r\n-\\param[out] pAllocations Pointer to array that will be filled with handles to created allocations.\r\n-\\param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.\r\n-\r\n-You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().\r\n-\r\n-Word \"pages\" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding.\r\n-It is just a general purpose allocation function able to make multiple allocations at once.\r\n-It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times.\r\n-\r\n-All allocations are made using same parameters. All of them are created out of the same memory pool and type.\r\n-If any allocation fails, all allocations already made within this function call are also freed, so that when\r\n-returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkMemoryRequirements* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pVkMemoryRequirements,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pCreateInfo,\r\n- size_t allocationCount,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations,\r\n- VmaAllocationInfo* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationInfo);\r\n-\r\n-\/** \\brief Allocates memory suitable for given `VkBuffer`.\r\n-\r\n-\\param allocator\r\n-\\param buffer\r\n-\\param pCreateInfo\r\n-\\param[out] pAllocation Handle to allocated memory.\r\n-\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\r\n-\r\n-It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindBufferMemory().\r\n-\r\n-This is a special-purpose function. In most cases you should use vmaCreateBuffer().\r\n-\r\n-You must free the allocation using vmaFreeMemory() when no longer needed.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief Allocates memory suitable for given `VkImage`.\r\n-\r\n-\\param allocator\r\n-\\param image\r\n-\\param pCreateInfo\r\n-\\param[out] pAllocation Handle to allocated memory.\r\n-\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\r\n-\r\n-It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindImageMemory().\r\n-\r\n-This is a special-purpose function. In most cases you should use vmaCreateImage().\r\n-\r\n-You must free the allocation using vmaFreeMemory() when no longer needed.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VkImage VMA_NOT_NULL_NON_DISPATCHABLE image,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage().\r\n-\r\n-Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VmaAllocation VMA_NULLABLE allocation);\r\n-\r\n-\/** \\brief Frees memory and destroys multiple allocations.\r\n-\r\n-Word \"pages\" is just a suggestion to use this function to free pieces of memory used for sparse binding.\r\n-It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(),\r\n-vmaAllocateMemoryPages() and other functions.\r\n-It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times.\r\n-\r\n-Allocations in `pAllocations` array can come from any memory pools and types.\r\n-Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- size_t allocationCount,\r\n- const VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations);\r\n-\r\n-\/** \\brief Returns current information about specified allocation.\r\n-\r\n-Current paramteres of given allocation are returned in `pAllocationInfo`.\r\n-\r\n-Although this function doesn't lock any mutex, so it should be quite efficient,\r\n-you should avoid calling it too often.\r\n-You can retrieve same VmaAllocationInfo structure while creating your resource, from function\r\n-vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change\r\n-(e.g. due to defragmentation).\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VmaAllocationInfo* VMA_NOT_NULL pAllocationInfo);\r\n-\r\n-\/** \\brief Sets pUserData in given allocation to new value.\r\n-\r\n-The value of pointer `pUserData` is copied to allocation's `pUserData`.\r\n-It is opaque, so you can use it however you want - e.g.\r\n-as a pointer, ordinal number or some handle to you own data.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- void* VMA_NULLABLE pUserData);\r\n-\r\n-\/** \\brief Sets pName in given allocation to new value.\r\n-\r\n-`pName` must be either null, or pointer to a null-terminated string. The function\r\n-makes local copy of the string and sets it as allocation's `pName`. String\r\n-passed as pName doesn't need to be valid for whole lifetime of the allocation -\r\n-you can free it after this call. String previously pointed by allocation's\r\n-`pName` is freed from memory.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- const char* VMA_NULLABLE pName);\r\n-\r\n-\/**\r\n-\\brief Given an allocation, returns Property Flags of its memory type.\r\n-\r\n-This is just a convenience function. Same information can be obtained using\r\n-vmaGetAllocationInfo() + vmaGetMemoryProperties().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkMemoryPropertyFlags* VMA_NOT_NULL pFlags);\r\n-\r\n-\/** \\brief Maps memory represented by given allocation and returns pointer to it.\r\n-\r\n-Maps memory represented by given allocation to make it accessible to CPU code.\r\n-When succeeded, `*ppData` contains pointer to first byte of this memory.\r\n-\r\n-\\warning\r\n-If the allocation is part of a bigger `VkDeviceMemory` block, returned pointer is\r\n-correctly offsetted to the beginning of region assigned to this particular allocation.\r\n-Unlike the result of `vkMapMemory`, it points to the allocation, not to the beginning of the whole block.\r\n-You should not add VmaAllocationInfo::offset to it!\r\n-\r\n-Mapping is internally reference-counted and synchronized, so despite raw Vulkan\r\n-function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory`\r\n-multiple times simultaneously, it is safe to call this function on allocations\r\n-assigned to the same memory block. Actual Vulkan memory will be mapped on first\r\n-mapping and unmapped on last unmapping.\r\n-\r\n-If the function succeeded, you must call vmaUnmapMemory() to unmap the\r\n-allocation when mapping is no longer needed or before freeing the allocation, at\r\n-the latest.\r\n-\r\n-It also safe to call this function multiple times on the same allocation. You\r\n-must call vmaUnmapMemory() same number of times as you called vmaMapMemory().\r\n-\r\n-It is also safe to call this function on allocation created with\r\n-#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time.\r\n-You must still call vmaUnmapMemory() same number of times as you called\r\n-vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the\r\n-\"0-th\" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag.\r\n-\r\n-This function fails when used on allocation made in memory type that is not\r\n-`HOST_VISIBLE`.\r\n-\r\n-This function doesn't automatically flush or invalidate caches.\r\n-If the allocation is made from a memory types that is not `HOST_COHERENT`,\r\n-you also need to use vmaInvalidateAllocation() \/ vmaFlushAllocation(), as required by Vulkan specification.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- void* VMA_NULLABLE* VMA_NOT_NULL ppData);\r\n-\r\n-\/** \\brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory().\r\n-\r\n-For details, see description of vmaMapMemory().\r\n-\r\n-This function doesn't automatically flush or invalidate caches.\r\n-If the allocation is made from a memory types that is not `HOST_COHERENT`,\r\n-you also need to use vmaInvalidateAllocation() \/ vmaFlushAllocation(), as required by Vulkan specification.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation);\r\n-\r\n-\/** \\brief Flushes memory of given allocation.\r\n-\r\n-Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation.\r\n-It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`.\r\n-Unmap operation doesn't do that automatically.\r\n-\r\n-- `offset` must be relative to the beginning of allocation.\r\n-- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.\r\n-- `offset` and `size` don't have to be aligned.\r\n- They are internally rounded down\/up to multiply of `nonCoherentAtomSize`.\r\n-- If `size` is 0, this call is ignored.\r\n-- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,\r\n- this call is ignored.\r\n-\r\n-Warning! `offset` and `size` are relative to the contents of given `allocation`.\r\n-If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.\r\n-Do not pass allocation's offset as `offset`!!!\r\n-\r\n-This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is\r\n-called, otherwise `VK_SUCCESS`.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkDeviceSize offset,\r\n- VkDeviceSize size);\r\n-\r\n-\/** \\brief Invalidates memory of given allocation.\r\n-\r\n-Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation.\r\n-It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`.\r\n-Map operation doesn't do that automatically.\r\n-\r\n-- `offset` must be relative to the beginning of allocation.\r\n-- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.\r\n-- `offset` and `size` don't have to be aligned.\r\n- They are internally rounded down\/up to multiply of `nonCoherentAtomSize`.\r\n-- If `size` is 0, this call is ignored.\r\n-- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,\r\n- this call is ignored.\r\n-\r\n-Warning! `offset` and `size` are relative to the contents of given `allocation`.\r\n-If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.\r\n-Do not pass allocation's offset as `offset`!!!\r\n-\r\n-This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if\r\n-it is called, otherwise `VK_SUCCESS`.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkDeviceSize offset,\r\n- VkDeviceSize size);\r\n-\r\n-\/** \\brief Flushes memory of given set of allocations.\r\n-\r\n-Calls `vkFlushMappedMemoryRanges()` for memory associated with given ranges of given allocations.\r\n-For more information, see documentation of vmaFlushAllocation().\r\n-\r\n-\\param allocator\r\n-\\param allocationCount\r\n-\\param allocations\r\n-\\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero.\r\n-\\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations.\r\n-\r\n-This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is\r\n-called, otherwise `VK_SUCCESS`.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t allocationCount,\r\n- const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations,\r\n- const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets,\r\n- const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes);\r\n-\r\n-\/** \\brief Invalidates memory of given set of allocations.\r\n-\r\n-Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given ranges of given allocations.\r\n-For more information, see documentation of vmaInvalidateAllocation().\r\n-\r\n-\\param allocator\r\n-\\param allocationCount\r\n-\\param allocations\r\n-\\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero.\r\n-\\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations.\r\n-\r\n-This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if it is\r\n-called, otherwise `VK_SUCCESS`.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t allocationCount,\r\n- const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations,\r\n- const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets,\r\n- const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes);\r\n-\r\n-\/** \\brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions.\r\n-\r\n-\\param allocator\r\n-\\param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked.\r\n-\r\n-Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,\r\n-`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are\r\n-`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).\r\n-\r\n-Possible return values:\r\n-\r\n-- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types.\r\n-- `VK_SUCCESS` - corruption detection has been performed and succeeded.\r\n-- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations.\r\n- `VMA_ASSERT` is also fired in that case.\r\n-- Other value: Error returned by Vulkan, e.g. memory mapping failure.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- uint32_t memoryTypeBits);\r\n-\r\n-\/** \\brief Begins defragmentation process.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param pInfo Structure filled with parameters of defragmentation.\r\n-\\param[out] pContext Context object that must be passed to vmaEndDefragmentation() to finish defragmentation.\r\n-\\returns\r\n-- `VK_SUCCESS` if defragmentation can begin.\r\n-- `VK_ERROR_FEATURE_NOT_PRESENT` if defragmentation is not supported.\r\n-\r\n-For more information about defragmentation, see documentation chapter:\r\n-[Defragmentation](@ref defragmentation).\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VmaDefragmentationInfo* VMA_NOT_NULL pInfo,\r\n- VmaDefragmentationContext VMA_NULLABLE* VMA_NOT_NULL pContext);\r\n-\r\n-\/** \\brief Ends defragmentation process.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param context Context object that has been created by vmaBeginDefragmentation().\r\n-\\param[out] pStats Optional stats for the defragmentation. Can be null.\r\n-\r\n-Use this function to finish defragmentation started by vmaBeginDefragmentation().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaDefragmentationContext VMA_NOT_NULL context,\r\n- VmaDefragmentationStats* VMA_NULLABLE pStats);\r\n-\r\n-\/** \\brief Starts single defragmentation pass.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param context Context object that has been created by vmaBeginDefragmentation().\r\n-\\param[out] pPassInfo Computed informations for current pass.\r\n-\\returns\r\n-- `VK_SUCCESS` if no more moves are possible. Then you can omit call to vmaEndDefragmentationPass() and simply end whole defragmentation.\r\n-- `VK_INCOMPLETE` if there are pending moves returned in `pPassInfo`. You need to perform them, call vmaEndDefragmentationPass(),\r\n- and then preferably try another pass with vmaBeginDefragmentationPass().\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaDefragmentationContext VMA_NOT_NULL context,\r\n- VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo);\r\n-\r\n-\/** \\brief Ends single defragmentation pass.\r\n-\r\n-\\param allocator Allocator object.\r\n-\\param context Context object that has been created by vmaBeginDefragmentation().\r\n-\\param pPassInfo Computed informations for current pass filled by vmaBeginDefragmentationPass() and possibly modified by you.\r\n-\r\n-Returns `VK_SUCCESS` if no more moves are possible or `VK_INCOMPLETE` if more defragmentations are possible.\r\n-\r\n-Ends incremental defragmentation pass and commits all defragmentation moves from `pPassInfo`.\r\n-After this call:\r\n-\r\n-- Allocations at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY\r\n- (which is the default) will be pointing to the new destination place.\r\n-- Allocation at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY\r\n- will be freed.\r\n-\r\n-If no more moves are possible you can end whole defragmentation.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaDefragmentationContext VMA_NOT_NULL context,\r\n- VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo);\r\n-\r\n-\/** \\brief Binds buffer to allocation.\r\n-\r\n-Binds specified buffer to region of memory represented by specified allocation.\r\n-Gets `VkDeviceMemory` handle and offset from the allocation.\r\n-If you want to create a buffer, allocate memory for it and bind them together separately,\r\n-you should use this function for binding instead of standard `vkBindBufferMemory()`,\r\n-because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple\r\n-allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously\r\n-(which is illegal in Vulkan).\r\n-\r\n-It is recommended to use function vmaCreateBuffer() instead of this one.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer);\r\n-\r\n-\/** \\brief Binds buffer to allocation with additional parameters.\r\n-\r\n-\\param allocator\r\n-\\param allocation\r\n-\\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0.\r\n-\\param buffer\r\n-\\param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null.\r\n-\r\n-This function is similar to vmaBindBufferMemory(), but it provides additional parameters.\r\n-\r\n-If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag\r\n-or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer,\r\n- const void* VMA_NULLABLE pNext);\r\n-\r\n-\/** \\brief Binds image to allocation.\r\n-\r\n-Binds specified image to region of memory represented by specified allocation.\r\n-Gets `VkDeviceMemory` handle and offset from the allocation.\r\n-If you want to create an image, allocate memory for it and bind them together separately,\r\n-you should use this function for binding instead of standard `vkBindImageMemory()`,\r\n-because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple\r\n-allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously\r\n-(which is illegal in Vulkan).\r\n-\r\n-It is recommended to use function vmaCreateImage() instead of this one.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkImage VMA_NOT_NULL_NON_DISPATCHABLE image);\r\n-\r\n-\/** \\brief Binds image to allocation with additional parameters.\r\n-\r\n-\\param allocator\r\n-\\param allocation\r\n-\\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0.\r\n-\\param image\r\n-\\param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null.\r\n-\r\n-This function is similar to vmaBindImageMemory(), but it provides additional parameters.\r\n-\r\n-If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag\r\n-or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage VMA_NOT_NULL_NON_DISPATCHABLE image,\r\n- const void* VMA_NULLABLE pNext);\r\n-\r\n-\/** \\brief Creates a new `VkBuffer`, allocates and binds memory for it.\r\n-\r\n-\\param allocator\r\n-\\param pBufferCreateInfo\r\n-\\param pAllocationCreateInfo\r\n-\\param[out] pBuffer Buffer that was created.\r\n-\\param[out] pAllocation Allocation that was created.\r\n-\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\r\n-\r\n-This function automatically:\r\n-\r\n--# Creates buffer.\r\n--# Allocates appropriate memory for it.\r\n--# Binds the buffer with the memory.\r\n-\r\n-If any of these operations fail, buffer and allocation are not created,\r\n-returned value is negative error code, *pBuffer and *pAllocation are null.\r\n-\r\n-If the function succeeded, you must destroy both buffer and allocation when you\r\n-no longer need them using either convenience function vmaDestroyBuffer() or\r\n-separately, using `vkDestroyBuffer()` and vmaFreeMemory().\r\n-\r\n-If #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used,\r\n-VK_KHR_dedicated_allocation extension is used internally to query driver whether\r\n-it requires or prefers the new buffer to have dedicated allocation. If yes,\r\n-and if dedicated allocation is possible\r\n-(#VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated\r\n-allocation for this buffer, just like when using\r\n-#VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n-\r\n-\\note This function creates a new `VkBuffer`. Sub-allocation of parts of one large buffer,\r\n-although recommended as a good practice, is out of scope of this library and could be implemented\r\n-by the user as a higher-level logic on top of VMA.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief Creates a buffer with additional minimum alignment.\r\n-\r\n-Similar to vmaCreateBuffer() but provides additional parameter `minAlignment` which allows to specify custom,\r\n-minimum alignment to be used when placing the buffer inside a larger memory block, which may be needed e.g.\r\n-for interop with OpenGL.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- VkDeviceSize minAlignment,\r\n- VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief Destroys Vulkan buffer and frees allocated memory.\r\n-\r\n-This is just a convenience function equivalent to:\r\n-\r\n-\\code\r\n-vkDestroyBuffer(device, buffer, allocationCallbacks);\r\n-vmaFreeMemory(allocator, allocation);\r\n-\\endcode\r\n-\r\n-It it safe to pass null as buffer and\/or allocation.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VkBuffer VMA_NULLABLE_NON_DISPATCHABLE buffer,\r\n- VmaAllocation VMA_NULLABLE allocation);\r\n-\r\n-\/\/\/ Function similar to vmaCreateBuffer().\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo,\r\n- const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\r\n- VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage,\r\n- VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\r\n- VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\r\n-\r\n-\/** \\brief Destroys Vulkan image and frees allocated memory.\r\n-\r\n-This is just a convenience function equivalent to:\r\n-\r\n-\\code\r\n-vkDestroyImage(device, image, allocationCallbacks);\r\n-vmaFreeMemory(allocator, allocation);\r\n-\\endcode\r\n-\r\n-It it safe to pass null as image and\/or allocation.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VkImage VMA_NULLABLE_NON_DISPATCHABLE image,\r\n- VmaAllocation VMA_NULLABLE allocation);\r\n-\r\n-\/** @} *\/\r\n-\r\n-\/**\r\n-\\addtogroup group_virtual\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Creates new #VmaVirtualBlock object.\r\n-\r\n-\\param pCreateInfo Parameters for creation.\r\n-\\param[out] pVirtualBlock Returned virtual block object or `VMA_NULL` if creation failed.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(\r\n- const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaVirtualBlock VMA_NULLABLE* VMA_NOT_NULL pVirtualBlock);\r\n-\r\n-\/** \\brief Destroys #VmaVirtualBlock object.\r\n-\r\n-Please note that you should consciously handle virtual allocations that could remain unfreed in the block.\r\n-You should either free them individually using vmaVirtualFree() or call vmaClearVirtualBlock()\r\n-if you are sure this is what you want. If you do neither, an assert is called.\r\n-\r\n-If you keep pointers to some additional metadata associated with your virtual allocations in their `pUserData`,\r\n-don't forget to free them.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(\r\n- VmaVirtualBlock VMA_NULLABLE virtualBlock);\r\n-\r\n-\/** \\brief Returns true of the #VmaVirtualBlock is empty - contains 0 virtual allocations and has all its space available for new allocations.\r\n-*\/\r\n-VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock);\r\n-\r\n-\/** \\brief Returns information about a specific virtual allocation within a virtual block, like its size and `pUserData` pointer.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo);\r\n-\r\n-\/** \\brief Allocates new virtual allocation inside given #VmaVirtualBlock.\r\n-\r\n-If the allocation fails due to not enough free space available, `VK_ERROR_OUT_OF_DEVICE_MEMORY` is returned\r\n-(despite the function doesn't ever allocate actual GPU memory).\r\n-`pAllocation` is then set to `VK_NULL_HANDLE` and `pOffset`, if not null, it set to `UINT64_MAX`.\r\n-\r\n-\\param virtualBlock Virtual block\r\n-\\param pCreateInfo Parameters for the allocation\r\n-\\param[out] pAllocation Returned handle of the new allocation\r\n-\\param[out] pOffset Returned offset of the new allocation. Optional, can be null.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation,\r\n- VkDeviceSize* VMA_NULLABLE pOffset);\r\n-\r\n-\/** \\brief Frees virtual allocation inside given #VmaVirtualBlock.\r\n-\r\n-It is correct to call this function with `allocation == VK_NULL_HANDLE` - it does nothing.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation);\r\n-\r\n-\/** \\brief Frees all virtual allocations inside given #VmaVirtualBlock.\r\n-\r\n-You must either call this function or free each virtual allocation individually with vmaVirtualFree()\r\n-before destroying a virtual block. Otherwise, an assert is called.\r\n-\r\n-If you keep pointer to some additional metadata associated with your virtual allocation in its `pUserData`,\r\n-don't forget to free it as well.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock);\r\n-\r\n-\/** \\brief Changes custom pointer associated with given virtual allocation.\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation,\r\n- void* VMA_NULLABLE pUserData);\r\n-\r\n-\/** \\brief Calculates and returns statistics about virtual allocations and memory usage in given #VmaVirtualBlock.\r\n-\r\n-This function is fast to call. For more detailed statistics, see vmaCalculateVirtualBlockStatistics().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaStatistics* VMA_NOT_NULL pStats);\r\n-\r\n-\/** \\brief Calculates and returns detailed statistics about virtual allocations and memory usage in given #VmaVirtualBlock.\r\n-\r\n-This function is slow to call. Use for debugging purposes.\r\n-For less detailed statistics, see vmaGetVirtualBlockStatistics().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaDetailedStatistics* VMA_NOT_NULL pStats);\r\n-\r\n-\/** @} *\/\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-\/**\r\n-\\addtogroup group_stats\r\n-@{\r\n-*\/\r\n-\r\n-\/** \\brief Builds and returns a null-terminated string in JSON format with information about given #VmaVirtualBlock.\r\n-\\param virtualBlock Virtual block.\r\n-\\param[out] ppStatsString Returned string.\r\n-\\param detailedMap Pass `VK_FALSE` to only obtain statistics as returned by vmaCalculateVirtualBlockStatistics(). Pass `VK_TRUE` to also obtain full list of allocations and free spaces.\r\n-\r\n-Returned string must be freed using vmaFreeVirtualBlockStatsString().\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString,\r\n- VkBool32 detailedMap);\r\n-\r\n-\/\/\/ Frees a string returned by vmaBuildVirtualBlockStatsString().\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(\r\n- VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- char* VMA_NULLABLE pStatsString);\r\n-\r\n-\/** \\brief Builds and returns statistics as a null-terminated string in JSON format.\r\n-\\param allocator\r\n-\\param[out] ppStatsString Must be freed using vmaFreeStatsString() function.\r\n-\\param detailedMap\r\n-*\/\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString,\r\n- VkBool32 detailedMap);\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- char* VMA_NULLABLE pStatsString);\r\n-\r\n-\/** @} *\/\r\n-\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-#endif \/\/ _VMA_FUNCTION_HEADERS\r\n-\r\n-#ifdef __cplusplus\r\n-}\r\n-#endif\r\n-\r\n-#endif \/\/ AMD_VULKAN_MEMORY_ALLOCATOR_H\r\n-\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/ \r\n-\/\/ IMPLEMENTATION\r\n-\/\/ \r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\r\n-\/\/ For Visual Studio IntelliSense.\r\n-#if defined(__cplusplus) && defined(__INTELLISENSE__)\r\n-#define VMA_IMPLEMENTATION\r\n-#endif\r\n-\r\n-#ifdef VMA_IMPLEMENTATION\r\n-#undef VMA_IMPLEMENTATION\r\n-\r\n-#include <cstdint>\r\n-#include <cstdlib>\r\n-#include <cstring>\r\n-#include <utility>\r\n-\r\n-#ifdef _MSC_VER\r\n- #include <intrin.h> \/\/ For functions like __popcnt, _BitScanForward etc.\r\n-#endif\r\n-\r\n-\/*******************************************************************************\r\n-CONFIGURATION SECTION\r\n-\r\n-Define some of these macros before each #include of this header or change them\r\n-here if you need other then default behavior depending on your environment.\r\n-*\/\r\n-#ifndef _VMA_CONFIGURATION\r\n-\r\n-\/*\r\n-Define this macro to 1 to make the library fetch pointers to Vulkan functions\r\n-internally, like:\r\n-\r\n- vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;\r\n-*\/\r\n-#if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES)\r\n- #define VMA_STATIC_VULKAN_FUNCTIONS 1\r\n-#endif\r\n-\r\n-\/*\r\n-Define this macro to 1 to make the library fetch pointers to Vulkan functions\r\n-internally, like:\r\n-\r\n- vulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkGetDeviceProcAddr(device, \"vkAllocateMemory\");\r\n-\r\n-To use this feature in new versions of VMA you now have to pass\r\n-VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as\r\n-VmaAllocatorCreateInfo::pVulkanFunctions. Other members can be null.\r\n-*\/\r\n-#if !defined(VMA_DYNAMIC_VULKAN_FUNCTIONS)\r\n- #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1\r\n-#endif\r\n-\r\n-#ifndef VMA_USE_STL_SHARED_MUTEX\r\n- \/\/ Compiler conforms to C++17.\r\n- #if __cplusplus >= 201703L\r\n- #define VMA_USE_STL_SHARED_MUTEX 1\r\n- \/\/ Visual studio defines __cplusplus properly only when passed additional parameter: \/Zc:__cplusplus\r\n- \/\/ Otherwise it is always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2.\r\n- #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L\r\n- #define VMA_USE_STL_SHARED_MUTEX 1\r\n- #else\r\n- #define VMA_USE_STL_SHARED_MUTEX 0\r\n- #endif\r\n-#endif\r\n-\r\n-\/*\r\n-Define this macro to include custom header files without having to edit this file directly, e.g.:\r\n-\r\n- \/\/ Inside of \"my_vma_configuration_user_includes.h\":\r\n-\r\n- #include \"my_custom_assert.h\" \/\/ for MY_CUSTOM_ASSERT\r\n- #include \"my_custom_min.h\" \/\/ for my_custom_min\r\n- #include <algorithm>\r\n- #include <mutex>\r\n-\r\n- \/\/ Inside a different file, which includes \"vk_mem_alloc.h\":\r\n-\r\n- #define VMA_CONFIGURATION_USER_INCLUDES_H \"my_vma_configuration_user_includes.h\"\r\n- #define VMA_ASSERT(expr) MY_CUSTOM_ASSERT(expr)\r\n- #define VMA_MIN(v1, v2) (my_custom_min(v1, v2))\r\n- #include \"vk_mem_alloc.h\"\r\n- ...\r\n-\r\n-The following headers are used in this CONFIGURATION section only, so feel free to\r\n-remove them if not needed.\r\n-*\/\r\n-#if !defined(VMA_CONFIGURATION_USER_INCLUDES_H)\r\n- #include <cassert> \/\/ for assert\r\n- #include <algorithm> \/\/ for min, max\r\n- #include <mutex>\r\n-#else\r\n- #include VMA_CONFIGURATION_USER_INCLUDES_H\r\n-#endif\r\n-\r\n-#ifndef VMA_NULL\r\n- \/\/ Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.\r\n- #define VMA_NULL nullptr\r\n-#endif\r\n-\r\n-#if defined(__ANDROID_API__) && (__ANDROID_API__ < 16)\r\n-#include <cstdlib>\r\n-static void* vma_aligned_alloc(size_t alignment, size_t size)\r\n-{\r\n- \/\/ alignment must be >= sizeof(void*)\r\n- if(alignment < sizeof(void*))\r\n- {\r\n- alignment = sizeof(void*);\r\n- }\r\n-\r\n- return memalign(alignment, size);\r\n-}\r\n-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))\r\n-#include <cstdlib>\r\n-\r\n-#if defined(__APPLE__)\r\n-#include <AvailabilityMacros.h>\r\n-#endif\r\n-\r\n-static void* vma_aligned_alloc(size_t alignment, size_t size)\r\n-{\r\n- \/\/ Unfortunately, aligned_alloc causes VMA to crash due to it returning null pointers. (At least under 11.4)\r\n- \/\/ Therefore, for now disable this specific exception until a proper solution is found.\r\n- \/\/#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0))\r\n- \/\/#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0\r\n- \/\/ \/\/ For C++14, usr\/include\/malloc\/_malloc.h declares aligned_alloc()) only\r\n- \/\/ \/\/ with the MacOSX11.0 SDK in Xcode 12 (which is what adds\r\n- \/\/ \/\/ MAC_OS_X_VERSION_10_16), even though the function is marked\r\n- \/\/ \/\/ availabe for 10.15. That is why the preprocessor checks for 10.16 but\r\n- \/\/ \/\/ the __builtin_available checks for 10.15.\r\n- \/\/ \/\/ People who use C++17 could call aligned_alloc with the 10.15 SDK already.\r\n- \/\/ if (__builtin_available(macOS 10.15, iOS 13, *))\r\n- \/\/ return aligned_alloc(alignment, size);\r\n- \/\/#endif\r\n- \/\/#endif\r\n-\r\n- \/\/ alignment must be >= sizeof(void*)\r\n- if(alignment < sizeof(void*))\r\n- {\r\n- alignment = sizeof(void*);\r\n- }\r\n-\r\n- void *pointer;\r\n- if(posix_memalign(&pointer, alignment, size) == 0)\r\n- return pointer;\r\n- return VMA_NULL;\r\n-}\r\n-#elif defined(_WIN32)\r\n-static void* vma_aligned_alloc(size_t alignment, size_t size)\r\n-{\r\n- return _aligned_malloc(size, alignment);\r\n-}\r\n-#else\r\n-static void* vma_aligned_alloc(size_t alignment, size_t size)\r\n-{\r\n- return aligned_alloc(alignment, size);\r\n-}\r\n-#endif\r\n-\r\n-#if defined(_WIN32)\r\n-static void vma_aligned_free(void* ptr)\r\n-{\r\n- _aligned_free(ptr);\r\n-}\r\n-#else\r\n-static void vma_aligned_free(void* VMA_NULLABLE ptr)\r\n-{\r\n- free(ptr);\r\n-}\r\n-#endif\r\n-\r\n-\/\/ If your compiler is not compatible with C++11 and definition of\r\n-\/\/ aligned_alloc() function is missing, uncommeting following line may help:\r\n-\r\n-\/\/#include <malloc.h>\r\n-\r\n-\/\/ Normal assert to check for programmer's errors, especially in Debug configuration.\r\n-#ifndef VMA_ASSERT\r\n- #ifdef NDEBUG\r\n- #define VMA_ASSERT(expr)\r\n- #else\r\n- #define VMA_ASSERT(expr) assert(expr)\r\n- #endif\r\n-#endif\r\n-\r\n-\/\/ Assert that will be called very often, like inside data structures e.g. operator[].\r\n-\/\/ Making it non-empty can make program slow.\r\n-#ifndef VMA_HEAVY_ASSERT\r\n- #ifdef NDEBUG\r\n- #define VMA_HEAVY_ASSERT(expr)\r\n- #else\r\n- #define VMA_HEAVY_ASSERT(expr) \/\/VMA_ASSERT(expr)\r\n- #endif\r\n-#endif\r\n-\r\n-#ifndef VMA_ALIGN_OF\r\n- #define VMA_ALIGN_OF(type) (__alignof(type))\r\n-#endif\r\n-\r\n-#ifndef VMA_SYSTEM_ALIGNED_MALLOC\r\n- #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) vma_aligned_alloc((alignment), (size))\r\n-#endif\r\n-\r\n-#ifndef VMA_SYSTEM_ALIGNED_FREE\r\n- \/\/ VMA_SYSTEM_FREE is the old name, but might have been defined by the user\r\n- #if defined(VMA_SYSTEM_FREE)\r\n- #define VMA_SYSTEM_ALIGNED_FREE(ptr) VMA_SYSTEM_FREE(ptr)\r\n- #else\r\n- #define VMA_SYSTEM_ALIGNED_FREE(ptr) vma_aligned_free(ptr)\r\n- #endif\r\n-#endif\r\n-\r\n-#ifndef VMA_COUNT_BITS_SET\r\n- \/\/ Returns number of bits set to 1 in (v)\r\n- #define VMA_COUNT_BITS_SET(v) VmaCountBitsSet(v)\r\n-#endif\r\n-\r\n-#ifndef VMA_BITSCAN_LSB\r\n- \/\/ Scans integer for index of first nonzero value from the Least Significant Bit (LSB). If mask is 0 then returns UINT8_MAX\r\n- #define VMA_BITSCAN_LSB(mask) VmaBitScanLSB(mask)\r\n-#endif\r\n-\r\n-#ifndef VMA_BITSCAN_MSB\r\n- \/\/ Scans integer for index of first nonzero value from the Most Significant Bit (MSB). If mask is 0 then returns UINT8_MAX\r\n- #define VMA_BITSCAN_MSB(mask) VmaBitScanMSB(mask)\r\n-#endif\r\n-\r\n-#ifndef VMA_MIN\r\n- #define VMA_MIN(v1, v2) ((std::min)((v1), (v2)))\r\n-#endif\r\n-\r\n-#ifndef VMA_MAX\r\n- #define VMA_MAX(v1, v2) ((std::max)((v1), (v2)))\r\n-#endif\r\n-\r\n-#ifndef VMA_SWAP\r\n- #define VMA_SWAP(v1, v2) std::swap((v1), (v2))\r\n-#endif\r\n-\r\n-#ifndef VMA_SORT\r\n- #define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_LOG\r\n- #define VMA_DEBUG_LOG(format, ...)\r\n- \/*\r\n- #define VMA_DEBUG_LOG(format, ...) do { \\\r\n- printf(format, __VA_ARGS__); \\\r\n- printf(\"\\n\"); \\\r\n- } while(false)\r\n- *\/\r\n-#endif\r\n-\r\n-\/\/ Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.\r\n-#if VMA_STATS_STRING_ENABLED\r\n- static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)\r\n- {\r\n- snprintf(outStr, strLen, \"%u\", static_cast<unsigned int>(num));\r\n- }\r\n- static inline void VmaUint64ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint64_t num)\r\n- {\r\n- snprintf(outStr, strLen, \"%llu\", static_cast<unsigned long long>(num));\r\n- }\r\n- static inline void VmaPtrToStr(char* VMA_NOT_NULL outStr, size_t strLen, const void* ptr)\r\n- {\r\n- snprintf(outStr, strLen, \"%p\", ptr);\r\n- }\r\n-#endif\r\n-\r\n-#ifndef VMA_MUTEX\r\n- class VmaMutex\r\n- {\r\n- public:\r\n- void Lock() { m_Mutex.lock(); }\r\n- void Unlock() { m_Mutex.unlock(); }\r\n- bool TryLock() { return m_Mutex.try_lock(); }\r\n- private:\r\n- std::mutex m_Mutex;\r\n- };\r\n- #define VMA_MUTEX VmaMutex\r\n-#endif\r\n-\r\n-\/\/ Read-write mutex, where \"read\" is shared access, \"write\" is exclusive access.\r\n-#ifndef VMA_RW_MUTEX\r\n- #if VMA_USE_STL_SHARED_MUTEX\r\n- \/\/ Use std::shared_mutex from C++17.\r\n- #include <shared_mutex>\r\n- class VmaRWMutex\r\n- {\r\n- public:\r\n- void LockRead() { m_Mutex.lock_shared(); }\r\n- void UnlockRead() { m_Mutex.unlock_shared(); }\r\n- bool TryLockRead() { return m_Mutex.try_lock_shared(); }\r\n- void LockWrite() { m_Mutex.lock(); }\r\n- void UnlockWrite() { m_Mutex.unlock(); }\r\n- bool TryLockWrite() { return m_Mutex.try_lock(); }\r\n- private:\r\n- std::shared_mutex m_Mutex;\r\n- };\r\n- #define VMA_RW_MUTEX VmaRWMutex\r\n- #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600\r\n- \/\/ Use SRWLOCK from WinAPI.\r\n- \/\/ Minimum supported client = Windows Vista, server = Windows Server 2008.\r\n- class VmaRWMutex\r\n- {\r\n- public:\r\n- VmaRWMutex() { InitializeSRWLock(&m_Lock); }\r\n- void LockRead() { AcquireSRWLockShared(&m_Lock); }\r\n- void UnlockRead() { ReleaseSRWLockShared(&m_Lock); }\r\n- bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; }\r\n- void LockWrite() { AcquireSRWLockExclusive(&m_Lock); }\r\n- void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); }\r\n- bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; }\r\n- private:\r\n- SRWLOCK m_Lock;\r\n- };\r\n- #define VMA_RW_MUTEX VmaRWMutex\r\n- #else\r\n- \/\/ Less efficient fallback: Use normal mutex.\r\n- class VmaRWMutex\r\n- {\r\n- public:\r\n- void LockRead() { m_Mutex.Lock(); }\r\n- void UnlockRead() { m_Mutex.Unlock(); }\r\n- bool TryLockRead() { return m_Mutex.TryLock(); }\r\n- void LockWrite() { m_Mutex.Lock(); }\r\n- void UnlockWrite() { m_Mutex.Unlock(); }\r\n- bool TryLockWrite() { return m_Mutex.TryLock(); }\r\n- private:\r\n- VMA_MUTEX m_Mutex;\r\n- };\r\n- #define VMA_RW_MUTEX VmaRWMutex\r\n- #endif \/\/ #if VMA_USE_STL_SHARED_MUTEX\r\n-#endif \/\/ #ifndef VMA_RW_MUTEX\r\n-\r\n-\/*\r\n-If providing your own implementation, you need to implement a subset of std::atomic.\r\n-*\/\r\n-#ifndef VMA_ATOMIC_UINT32\r\n- #include <atomic>\r\n- #define VMA_ATOMIC_UINT32 std::atomic<uint32_t>\r\n-#endif\r\n-\r\n-#ifndef VMA_ATOMIC_UINT64\r\n- #include <atomic>\r\n- #define VMA_ATOMIC_UINT64 std::atomic<uint64_t>\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY\r\n- \/**\r\n- Every allocation will have its own memory block.\r\n- Define to 1 for debugging purposes only.\r\n- *\/\r\n- #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_MIN_ALIGNMENT\r\n- \/**\r\n- Minimum alignment of all allocations, in bytes.\r\n- Set to more than 1 for debugging purposes. Must be power of two.\r\n- *\/\r\n- #ifdef VMA_DEBUG_ALIGNMENT \/\/ Old name\r\n- #define VMA_MIN_ALIGNMENT VMA_DEBUG_ALIGNMENT\r\n- #else\r\n- #define VMA_MIN_ALIGNMENT (1)\r\n- #endif\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_MARGIN\r\n- \/**\r\n- Minimum margin after every allocation, in bytes.\r\n- Set nonzero for debugging purposes only.\r\n- *\/\r\n- #define VMA_DEBUG_MARGIN (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS\r\n- \/**\r\n- Define this macro to 1 to automatically fill new allocations and destroyed\r\n- allocations with some bit pattern.\r\n- *\/\r\n- #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_DETECT_CORRUPTION\r\n- \/**\r\n- Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to\r\n- enable writing magic value to the margin after every allocation and\r\n- validating it, so that memory corruptions (out-of-bounds writes) are detected.\r\n- *\/\r\n- #define VMA_DEBUG_DETECT_CORRUPTION (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_GLOBAL_MUTEX\r\n- \/**\r\n- Set this to 1 for debugging purposes only, to enable single mutex protecting all\r\n- entry calls to the library. Can be useful for debugging multithreading issues.\r\n- *\/\r\n- #define VMA_DEBUG_GLOBAL_MUTEX (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY\r\n- \/**\r\n- Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity.\r\n- Set to more than 1 for debugging purposes only. Must be power of two.\r\n- *\/\r\n- #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT\r\n- \/*\r\n- Set this to 1 to make VMA never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount\r\n- and return error instead of leaving up to Vulkan implementation what to do in such cases.\r\n- *\/\r\n- #define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (0)\r\n-#endif\r\n-\r\n-#ifndef VMA_SMALL_HEAP_MAX_SIZE\r\n- \/\/\/ Maximum size of a memory heap in Vulkan to consider it \"small\".\r\n- #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024)\r\n-#endif\r\n-\r\n-#ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE\r\n- \/\/\/ Default size of a block allocated as single VkDeviceMemory from a \"large\" heap.\r\n- #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024)\r\n-#endif\r\n-\r\n-\/*\r\n-Mapping hysteresis is a logic that launches when vmaMapMemory\/vmaUnmapMemory is called\r\n-or a persistently mapped allocation is created and destroyed several times in a row.\r\n-It keeps additional +1 mapping of a device memory block to prevent calling actual\r\n-vkMapMemory\/vkUnmapMemory too many times, which may improve performance and help\r\n-tools like RenderDOc.\r\n-*\/\r\n-#ifndef VMA_MAPPING_HYSTERESIS_ENABLED\r\n- #define VMA_MAPPING_HYSTERESIS_ENABLED 1\r\n-#endif\r\n-\r\n-#ifndef VMA_CLASS_NO_COPY\r\n- #define VMA_CLASS_NO_COPY(className) \\\r\n- private: \\\r\n- className(const className&) = delete; \\\r\n- className& operator=(const className&) = delete;\r\n-#endif\r\n-\r\n-#define VMA_VALIDATE(cond) do { if(!(cond)) { \\\r\n- VMA_ASSERT(0 && \"Validation failed: \" #cond); \\\r\n- return false; \\\r\n- } } while(false)\r\n-\r\n-\/*******************************************************************************\r\n-END OF CONFIGURATION\r\n-*\/\r\n-#endif \/\/ _VMA_CONFIGURATION\r\n-\r\n-\r\n-static const uint8_t VMA_ALLOCATION_FILL_PATTERN_CREATED = 0xDC;\r\n-static const uint8_t VMA_ALLOCATION_FILL_PATTERN_DESTROYED = 0xEF;\r\n-\/\/ Decimal 2139416166, float NaN, little-endian binary 66 E6 84 7F.\r\n-static const uint32_t VMA_CORRUPTION_DETECTION_MAGIC_VALUE = 0x7F84E666;\r\n-\r\n-\/\/ Copy of some Vulkan definitions so we don't need to check their existence just to handle few constants.\r\n-static const uint32_t VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY = 0x00000040;\r\n-static const uint32_t VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY = 0x00000080;\r\n-static const uint32_t VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY = 0x00020000;\r\n-static const uint32_t VK_IMAGE_CREATE_DISJOINT_BIT_COPY = 0x00000200;\r\n-static const int32_t VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY = 1000158000;\r\n-static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;\r\n-static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32;\r\n-static const uint32_t VMA_VENDOR_ID_AMD = 4098;\r\n-\r\n-\/\/ This one is tricky. Vulkan specification defines this code as available since\r\n-\/\/ Vulkan 1.0, but doesn't actually define it in Vulkan SDK earlier than 1.2.131.\r\n-\/\/ See pull request #207.\r\n-#define VK_ERROR_UNKNOWN_COPY ((VkResult)-13)\r\n-\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-\/\/ Correspond to values of enum VmaSuballocationType.\r\n-static const char* VMA_SUBALLOCATION_TYPE_NAMES[] =\r\n-{\r\n- \"FREE\",\r\n- \"UNKNOWN\",\r\n- \"BUFFER\",\r\n- \"IMAGE_UNKNOWN\",\r\n- \"IMAGE_LINEAR\",\r\n- \"IMAGE_OPTIMAL\",\r\n-};\r\n-#endif\r\n-\r\n-static VkAllocationCallbacks VmaEmptyAllocationCallbacks =\r\n- { VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL };\r\n-\r\n-\r\n-#ifndef _VMA_ENUM_DECLARATIONS\r\n-\r\n-enum VmaSuballocationType\r\n-{\r\n- VMA_SUBALLOCATION_TYPE_FREE = 0,\r\n- VMA_SUBALLOCATION_TYPE_UNKNOWN = 1,\r\n- VMA_SUBALLOCATION_TYPE_BUFFER = 2,\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3,\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4,\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5,\r\n- VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF\r\n-};\r\n-\r\n-enum VMA_CACHE_OPERATION\r\n-{\r\n- VMA_CACHE_FLUSH,\r\n- VMA_CACHE_INVALIDATE\r\n-};\r\n-\r\n-enum class VmaAllocationRequestType\r\n-{\r\n- Normal,\r\n- TLSF,\r\n- \/\/ Used by \"Linear\" algorithm.\r\n- UpperAddress,\r\n- EndOf1st,\r\n- EndOf2nd,\r\n-};\r\n-\r\n-#endif \/\/ _VMA_ENUM_DECLARATIONS\r\n-\r\n-#ifndef _VMA_FORWARD_DECLARATIONS\r\n-\/\/ Opaque handle used by allocation algorithms to identify single allocation in any conforming way.\r\n-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaAllocHandle);\r\n-\r\n-struct VmaMutexLock;\r\n-struct VmaMutexLockRead;\r\n-struct VmaMutexLockWrite;\r\n-\r\n-template<typename T>\r\n-struct AtomicTransactionalIncrement;\r\n-\r\n-template<typename T>\r\n-struct VmaStlAllocator;\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-class VmaVector;\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-class VmaSmallVector;\r\n-\r\n-template<typename T>\r\n-class VmaPoolAllocator;\r\n-\r\n-template<typename T>\r\n-struct VmaListItem;\r\n-\r\n-template<typename T>\r\n-class VmaRawList;\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-class VmaList;\r\n-\r\n-template<typename ItemTypeTraits>\r\n-class VmaIntrusiveLinkedList;\r\n-\r\n-\/\/ Unused in this version\r\n-#if 0\r\n-template<typename T1, typename T2>\r\n-struct VmaPair;\r\n-template<typename FirstT, typename SecondT>\r\n-struct VmaPairFirstLess;\r\n-\r\n-template<typename KeyT, typename ValueT>\r\n-class VmaMap;\r\n-#endif\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-class VmaStringBuilder;\r\n-class VmaJsonWriter;\r\n-#endif\r\n-\r\n-class VmaDeviceMemoryBlock;\r\n-\r\n-struct VmaDedicatedAllocationListItemTraits;\r\n-class VmaDedicatedAllocationList;\r\n-\r\n-struct VmaSuballocation;\r\n-struct VmaSuballocationOffsetLess;\r\n-struct VmaSuballocationOffsetGreater;\r\n-struct VmaSuballocationItemSizeLess;\r\n-\r\n-typedef VmaList<VmaSuballocation, VmaStlAllocator<VmaSuballocation>> VmaSuballocationList;\r\n-\r\n-struct VmaAllocationRequest;\r\n-\r\n-class VmaBlockMetadata;\r\n-class VmaBlockMetadata_Linear;\r\n-class VmaBlockMetadata_TLSF;\r\n-\r\n-class VmaBlockVector;\r\n-\r\n-struct VmaPoolListItemTraits;\r\n-\r\n-struct VmaCurrentBudgetData;\r\n-\r\n-class VmaAllocationObjectAllocator;\r\n-\r\n-#endif \/\/ _VMA_FORWARD_DECLARATIONS\r\n-\r\n-\r\n-#ifndef _VMA_FUNCTIONS\r\n-\r\n-\/*\r\n-Returns number of bits set to 1 in (v).\r\n-\r\n-On specific platforms and compilers you can use instrinsics like:\r\n-\r\n-Visual Studio:\r\n- return __popcnt(v);\r\n-GCC, Clang:\r\n- return static_cast<uint32_t>(__builtin_popcount(v));\r\n-\r\n-Define macro VMA_COUNT_BITS_SET to provide your optimized implementation.\r\n-But you need to check in runtime whether user's CPU supports these, as some old processors don't.\r\n-*\/\r\n-static inline uint32_t VmaCountBitsSet(uint32_t v)\r\n-{\r\n- uint32_t c = v - ((v >> 1) & 0x55555555);\r\n- c = ((c >> 2) & 0x33333333) + (c & 0x33333333);\r\n- c = ((c >> 4) + c) & 0x0F0F0F0F;\r\n- c = ((c >> 8) + c) & 0x00FF00FF;\r\n- c = ((c >> 16) + c) & 0x0000FFFF;\r\n- return c;\r\n-}\r\n-\r\n-static inline uint8_t VmaBitScanLSB(uint64_t mask)\r\n-{\r\n-#if defined(_MSC_VER) && defined(_WIN64)\r\n- unsigned long pos;\r\n- if (_BitScanForward64(&pos, mask))\r\n- return static_cast<uint8_t>(pos);\r\n- return UINT8_MAX;\r\n-#elif defined __GNUC__ || defined __clang__\r\n- return static_cast<uint8_t>(__builtin_ffsll(mask)) - 1U;\r\n-#else\r\n- uint8_t pos = 0;\r\n- uint64_t bit = 1;\r\n- do\r\n- {\r\n- if (mask & bit)\r\n- return pos;\r\n- bit <<= 1;\r\n- } while (pos++ < 63);\r\n- return UINT8_MAX;\r\n-#endif\r\n-}\r\n-\r\n-static inline uint8_t VmaBitScanLSB(uint32_t mask)\r\n-{\r\n-#ifdef _MSC_VER\r\n- unsigned long pos;\r\n- if (_BitScanForward(&pos, mask))\r\n- return static_cast<uint8_t>(pos);\r\n- return UINT8_MAX;\r\n-#elif defined __GNUC__ || defined __clang__\r\n- return static_cast<uint8_t>(__builtin_ffs(mask)) - 1U;\r\n-#else\r\n- uint8_t pos = 0;\r\n- uint32_t bit = 1;\r\n- do\r\n- {\r\n- if (mask & bit)\r\n- return pos;\r\n- bit <<= 1;\r\n- } while (pos++ < 31);\r\n- return UINT8_MAX;\r\n-#endif\r\n-}\r\n-\r\n-static inline uint8_t VmaBitScanMSB(uint64_t mask)\r\n-{\r\n-#if defined(_MSC_VER) && defined(_WIN64)\r\n- unsigned long pos;\r\n- if (_BitScanReverse64(&pos, mask))\r\n- return static_cast<uint8_t>(pos);\r\n-#elif defined __GNUC__ || defined __clang__\r\n- if (mask)\r\n- return 63 - static_cast<uint8_t>(__builtin_clzll(mask));\r\n-#else\r\n- uint8_t pos = 63;\r\n- uint64_t bit = 1ULL << 63;\r\n- do\r\n- {\r\n- if (mask & bit)\r\n- return pos;\r\n- bit >>= 1;\r\n- } while (pos-- > 0);\r\n-#endif\r\n- return UINT8_MAX;\r\n-}\r\n-\r\n-static inline uint8_t VmaBitScanMSB(uint32_t mask)\r\n-{\r\n-#ifdef _MSC_VER\r\n- unsigned long pos;\r\n- if (_BitScanReverse(&pos, mask))\r\n- return static_cast<uint8_t>(pos);\r\n-#elif defined __GNUC__ || defined __clang__\r\n- if (mask)\r\n- return 31 - static_cast<uint8_t>(__builtin_clz(mask));\r\n-#else\r\n- uint8_t pos = 31;\r\n- uint32_t bit = 1UL << 31;\r\n- do\r\n- {\r\n- if (mask & bit)\r\n- return pos;\r\n- bit >>= 1;\r\n- } while (pos-- > 0);\r\n-#endif\r\n- return UINT8_MAX;\r\n-}\r\n-\r\n-\/*\r\n-Returns true if given number is a power of two.\r\n-T must be unsigned integer number or signed integer but always nonnegative.\r\n-For 0 returns true.\r\n-*\/\r\n-template <typename T>\r\n-inline bool VmaIsPow2(T x)\r\n-{\r\n- return (x & (x - 1)) == 0;\r\n-}\r\n-\r\n-\/\/ Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16.\r\n-\/\/ Use types like uint32_t, uint64_t as T.\r\n-template <typename T>\r\n-static inline T VmaAlignUp(T val, T alignment)\r\n-{\r\n- VMA_HEAVY_ASSERT(VmaIsPow2(alignment));\r\n- return (val + alignment - 1) & ~(alignment - 1);\r\n-}\r\n-\r\n-\/\/ Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8.\r\n-\/\/ Use types like uint32_t, uint64_t as T.\r\n-template <typename T>\r\n-static inline T VmaAlignDown(T val, T alignment)\r\n-{\r\n- VMA_HEAVY_ASSERT(VmaIsPow2(alignment));\r\n- return val & ~(alignment - 1);\r\n-}\r\n-\r\n-\/\/ Division with mathematical rounding to nearest number.\r\n-template <typename T>\r\n-static inline T VmaRoundDiv(T x, T y)\r\n-{\r\n- return (x + (y \/ (T)2)) \/ y;\r\n-}\r\n-\r\n-\/\/ Divide by 'y' and round up to nearest integer.\r\n-template <typename T>\r\n-static inline T VmaDivideRoundingUp(T x, T y)\r\n-{\r\n- return (x + y - (T)1) \/ y;\r\n-}\r\n-\r\n-\/\/ Returns smallest power of 2 greater or equal to v.\r\n-static inline uint32_t VmaNextPow2(uint32_t v)\r\n-{\r\n- v--;\r\n- v |= v >> 1;\r\n- v |= v >> 2;\r\n- v |= v >> 4;\r\n- v |= v >> 8;\r\n- v |= v >> 16;\r\n- v++;\r\n- return v;\r\n-}\r\n-\r\n-static inline uint64_t VmaNextPow2(uint64_t v)\r\n-{\r\n- v--;\r\n- v |= v >> 1;\r\n- v |= v >> 2;\r\n- v |= v >> 4;\r\n- v |= v >> 8;\r\n- v |= v >> 16;\r\n- v |= v >> 32;\r\n- v++;\r\n- return v;\r\n-}\r\n-\r\n-\/\/ Returns largest power of 2 less or equal to v.\r\n-static inline uint32_t VmaPrevPow2(uint32_t v)\r\n-{\r\n- v |= v >> 1;\r\n- v |= v >> 2;\r\n- v |= v >> 4;\r\n- v |= v >> 8;\r\n- v |= v >> 16;\r\n- v = v ^ (v >> 1);\r\n- return v;\r\n-}\r\n-\r\n-static inline uint64_t VmaPrevPow2(uint64_t v)\r\n-{\r\n- v |= v >> 1;\r\n- v |= v >> 2;\r\n- v |= v >> 4;\r\n- v |= v >> 8;\r\n- v |= v >> 16;\r\n- v |= v >> 32;\r\n- v = v ^ (v >> 1);\r\n- return v;\r\n-}\r\n-\r\n-static inline bool VmaStrIsEmpty(const char* pStr)\r\n-{\r\n- return pStr == VMA_NULL || *pStr == '\\0';\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-static const char* VmaAlgorithmToStr(uint32_t algorithm)\r\n-{\r\n- switch (algorithm)\r\n- {\r\n- case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:\r\n- return \"Linear\";\r\n- case 0:\r\n- return \"TLSF\";\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return \"\";\r\n- }\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-#ifndef VMA_SORT\r\n-template<typename Iterator, typename Compare>\r\n-Iterator VmaQuickSortPartition(Iterator beg, Iterator end, Compare cmp)\r\n-{\r\n- Iterator centerValue = end; --centerValue;\r\n- Iterator insertIndex = beg;\r\n- for (Iterator memTypeIndex = beg; memTypeIndex < centerValue; ++memTypeIndex)\r\n- {\r\n- if (cmp(*memTypeIndex, *centerValue))\r\n- {\r\n- if (insertIndex != memTypeIndex)\r\n- {\r\n- VMA_SWAP(*memTypeIndex, *insertIndex);\r\n- }\r\n- ++insertIndex;\r\n- }\r\n- }\r\n- if (insertIndex != centerValue)\r\n- {\r\n- VMA_SWAP(*insertIndex, *centerValue);\r\n- }\r\n- return insertIndex;\r\n-}\r\n-\r\n-template<typename Iterator, typename Compare>\r\n-void VmaQuickSort(Iterator beg, Iterator end, Compare cmp)\r\n-{\r\n- if (beg < end)\r\n- {\r\n- Iterator it = VmaQuickSortPartition<Iterator, Compare>(beg, end, cmp);\r\n- VmaQuickSort<Iterator, Compare>(beg, it, cmp);\r\n- VmaQuickSort<Iterator, Compare>(it + 1, end, cmp);\r\n- }\r\n-}\r\n-\r\n-#define VMA_SORT(beg, end, cmp) VmaQuickSort(beg, end, cmp)\r\n-#endif \/\/ VMA_SORT\r\n-\r\n-\/*\r\n-Returns true if two memory blocks occupy overlapping pages.\r\n-ResourceA must be in less memory offset than ResourceB.\r\n-\r\n-Algorithm is based on \"Vulkan 1.0.39 - A Specification (with all registered Vulkan extensions)\"\r\n-chapter 11.6 \"Resource Memory Association\", paragraph \"Buffer-Image Granularity\".\r\n-*\/\r\n-static inline bool VmaBlocksOnSamePage(\r\n- VkDeviceSize resourceAOffset,\r\n- VkDeviceSize resourceASize,\r\n- VkDeviceSize resourceBOffset,\r\n- VkDeviceSize pageSize)\r\n-{\r\n- VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0);\r\n- VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1;\r\n- VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1);\r\n- VkDeviceSize resourceBStart = resourceBOffset;\r\n- VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1);\r\n- return resourceAEndPage == resourceBStartPage;\r\n-}\r\n-\r\n-\/*\r\n-Returns true if given suballocation types could conflict and must respect\r\n-VkPhysicalDeviceLimits::bufferImageGranularity. They conflict if one is buffer\r\n-or linear image and another one is optimal image. If type is unknown, behave\r\n-conservatively.\r\n-*\/\r\n-static inline bool VmaIsBufferImageGranularityConflict(\r\n- VmaSuballocationType suballocType1,\r\n- VmaSuballocationType suballocType2)\r\n-{\r\n- if (suballocType1 > suballocType2)\r\n- {\r\n- VMA_SWAP(suballocType1, suballocType2);\r\n- }\r\n-\r\n- switch (suballocType1)\r\n- {\r\n- case VMA_SUBALLOCATION_TYPE_FREE:\r\n- return false;\r\n- case VMA_SUBALLOCATION_TYPE_UNKNOWN:\r\n- return true;\r\n- case VMA_SUBALLOCATION_TYPE_BUFFER:\r\n- return\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\r\n- case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN:\r\n- return\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR ||\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\r\n- case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR:\r\n- return\r\n- suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\r\n- case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL:\r\n- return false;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return true;\r\n- }\r\n-}\r\n-\r\n-static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)\r\n-{\r\n-#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION\r\n- uint32_t* pDst = (uint32_t*)((char*)pData + offset);\r\n- const size_t numberCount = VMA_DEBUG_MARGIN \/ sizeof(uint32_t);\r\n- for (size_t i = 0; i < numberCount; ++i, ++pDst)\r\n- {\r\n- *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;\r\n- }\r\n-#else\r\n- \/\/ no-op\r\n-#endif\r\n-}\r\n-\r\n-static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)\r\n-{\r\n-#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION\r\n- const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);\r\n- const size_t numberCount = VMA_DEBUG_MARGIN \/ sizeof(uint32_t);\r\n- for (size_t i = 0; i < numberCount; ++i, ++pSrc)\r\n- {\r\n- if (*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n-#endif\r\n- return true;\r\n-}\r\n-\r\n-\/*\r\n-Fills structure with parameters of an example buffer to be used for transfers\r\n-during GPU memory defragmentation.\r\n-*\/\r\n-static void VmaFillGpuDefragmentationBufferCreateInfo(VkBufferCreateInfo& outBufCreateInfo)\r\n-{\r\n- memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo));\r\n- outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;\r\n- outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n- outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; \/\/ Example size.\r\n-}\r\n-\r\n-\r\n-\/*\r\n-Performs binary search and returns iterator to first element that is greater or\r\n-equal to (key), according to comparison (cmp).\r\n-\r\n-Cmp should return true if first argument is less than second argument.\r\n-\r\n-Returned value is the found element, if present in the collection or place where\r\n-new element with value (key) should be inserted.\r\n-*\/\r\n-template <typename CmpLess, typename IterT, typename KeyT>\r\n-static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp)\r\n-{\r\n- size_t down = 0, up = (end - beg);\r\n- while (down < up)\r\n- {\r\n- const size_t mid = down + (up - down) \/ 2; \/\/ Overflow-safe midpoint calculation\r\n- if (cmp(*(beg + mid), key))\r\n- {\r\n- down = mid + 1;\r\n- }\r\n- else\r\n- {\r\n- up = mid;\r\n- }\r\n- }\r\n- return beg + down;\r\n-}\r\n-\r\n-template<typename CmpLess, typename IterT, typename KeyT>\r\n-IterT VmaBinaryFindSorted(const IterT& beg, const IterT& end, const KeyT& value, const CmpLess& cmp)\r\n-{\r\n- IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>(\r\n- beg, end, value, cmp);\r\n- if (it == end ||\r\n- (!cmp(*it, value) && !cmp(value, *it)))\r\n- {\r\n- return it;\r\n- }\r\n- return end;\r\n-}\r\n-\r\n-\/*\r\n-Returns true if all pointers in the array are not-null and unique.\r\n-Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.\r\n-T must be pointer type, e.g. VmaAllocation, VmaPool.\r\n-*\/\r\n-template<typename T>\r\n-static bool VmaValidatePointerArray(uint32_t count, const T* arr)\r\n-{\r\n- for (uint32_t i = 0; i < count; ++i)\r\n- {\r\n- const T iPtr = arr[i];\r\n- if (iPtr == VMA_NULL)\r\n- {\r\n- return false;\r\n- }\r\n- for (uint32_t j = i + 1; j < count; ++j)\r\n- {\r\n- if (iPtr == arr[j])\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n- }\r\n- return true;\r\n-}\r\n-\r\n-template<typename MainT, typename NewT>\r\n-static inline void VmaPnextChainPushFront(MainT* mainStruct, NewT* newStruct)\r\n-{\r\n- newStruct->pNext = mainStruct->pNext;\r\n- mainStruct->pNext = newStruct;\r\n-}\r\n-\r\n-\/\/ This is the main algorithm that guides the selection of a memory type best for an allocation -\r\n-\/\/ converts usage to required\/preferred\/not preferred flags.\r\n-static bool FindMemoryPreferences(\r\n- bool isIntegratedGPU,\r\n- const VmaAllocationCreateInfo& allocCreateInfo,\r\n- VkFlags bufImgUsage, \/\/ VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown.\r\n- VkMemoryPropertyFlags& outRequiredFlags,\r\n- VkMemoryPropertyFlags& outPreferredFlags,\r\n- VkMemoryPropertyFlags& outNotPreferredFlags)\r\n-{\r\n- outRequiredFlags = allocCreateInfo.requiredFlags;\r\n- outPreferredFlags = allocCreateInfo.preferredFlags;\r\n- outNotPreferredFlags = 0;\r\n-\r\n- switch(allocCreateInfo.usage)\r\n- {\r\n- case VMA_MEMORY_USAGE_UNKNOWN:\r\n- break;\r\n- case VMA_MEMORY_USAGE_GPU_ONLY:\r\n- if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\r\n- {\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- break;\r\n- case VMA_MEMORY_USAGE_CPU_ONLY:\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;\r\n- break;\r\n- case VMA_MEMORY_USAGE_CPU_TO_GPU:\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n- if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\r\n- {\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- break;\r\n- case VMA_MEMORY_USAGE_GPU_TO_CPU:\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\r\n- break;\r\n- case VMA_MEMORY_USAGE_CPU_COPY:\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- break;\r\n- case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED:\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;\r\n- break;\r\n- case VMA_MEMORY_USAGE_AUTO:\r\n- case VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE:\r\n- case VMA_MEMORY_USAGE_AUTO_PREFER_HOST:\r\n- {\r\n- if(bufImgUsage == UINT32_MAX)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_MEMORY_USAGE_AUTO* values can only be used with functions like vmaCreateBuffer, vmaCreateImage so that the details of the created resource are known.\");\r\n- return false;\r\n- }\r\n- \/\/ This relies on values of VK_IMAGE_USAGE_TRANSFER* being the same VK_BUFFER_IMAGE_TRANSFER*.\r\n- const bool deviceAccess = (bufImgUsage & ~(VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT)) != 0;\r\n- const bool hostAccessSequentialWrite = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT) != 0;\r\n- const bool hostAccessRandom = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) != 0;\r\n- const bool hostAccessAllowTransferInstead = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) != 0;\r\n- const bool preferDevice = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;\r\n- const bool preferHost = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST;\r\n-\r\n- \/\/ CPU random access - e.g. a buffer written to or transferred from GPU to read back on CPU.\r\n- if(hostAccessRandom)\r\n- {\r\n- if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost)\r\n- {\r\n- \/\/ Nice if it will end up in HOST_VISIBLE, but more importantly prefer DEVICE_LOCAL.\r\n- \/\/ Omitting HOST_VISIBLE here is intentional.\r\n- \/\/ In case there is DEVICE_LOCAL | HOST_VISIBLE | HOST_CACHED, it will pick that one.\r\n- \/\/ Otherwise, this will give same weight to DEVICE_LOCAL as HOST_VISIBLE | HOST_CACHED and select the former if occurs first on the list.\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\r\n- }\r\n- else\r\n- {\r\n- \/\/ Always CPU memory, cached.\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\r\n- }\r\n- }\r\n- \/\/ CPU sequential write - may be CPU or host-visible GPU memory, uncached and write-combined.\r\n- else if(hostAccessSequentialWrite)\r\n- {\r\n- \/\/ Want uncached and write-combined.\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\r\n-\r\n- if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost)\r\n- {\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n- }\r\n- else\r\n- {\r\n- outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n- \/\/ Direct GPU access, CPU sequential write (e.g. a dynamic uniform buffer updated every frame)\r\n- if(deviceAccess)\r\n- {\r\n- \/\/ Could go to CPU memory or GPU BAR\/unified. Up to the user to decide. If no preference, choose GPU memory.\r\n- if(preferHost)\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- else\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- \/\/ GPU no direct access, CPU sequential write (e.g. an upload buffer to be transferred to the GPU)\r\n- else\r\n- {\r\n- \/\/ Could go to CPU memory or GPU BAR\/unified. Up to the user to decide. If no preference, choose CPU memory.\r\n- if(preferDevice)\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- else\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- }\r\n- }\r\n- \/\/ No CPU access\r\n- else\r\n- {\r\n- \/\/ GPU access, no CPU access (e.g. a color attachment image) - prefer GPU memory\r\n- if(deviceAccess)\r\n- {\r\n- \/\/ ...unless there is a clear preference from the user not to do so.\r\n- if(preferHost)\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- else\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- \/\/ No direct GPU access, no CPU access, just transfers.\r\n- \/\/ It may be staging copy intended for e.g. preserving image for next frame (then better GPU memory) or\r\n- \/\/ a \"swap file\" copy to free some GPU memory (then better CPU memory).\r\n- \/\/ Up to the user to decide. If no preferece, assume the former and choose GPU memory.\r\n- if(preferHost)\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- else\r\n- outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n- }\r\n- break;\r\n- }\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-\r\n- \/\/ Avoid DEVICE_COHERENT unless explicitly requested.\r\n- if(((allocCreateInfo.requiredFlags | allocCreateInfo.preferredFlags) &\r\n- (VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY)) == 0)\r\n- {\r\n- outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY;\r\n- }\r\n-\r\n- return true;\r\n-}\r\n-\r\n-\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n-\/\/ Memory allocation\r\n-\r\n-static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment)\r\n-{\r\n- void* result = VMA_NULL;\r\n- if ((pAllocationCallbacks != VMA_NULL) &&\r\n- (pAllocationCallbacks->pfnAllocation != VMA_NULL))\r\n- {\r\n- result = (*pAllocationCallbacks->pfnAllocation)(\r\n- pAllocationCallbacks->pUserData,\r\n- size,\r\n- alignment,\r\n- VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);\r\n- }\r\n- else\r\n- {\r\n- result = VMA_SYSTEM_ALIGNED_MALLOC(size, alignment);\r\n- }\r\n- VMA_ASSERT(result != VMA_NULL && \"CPU memory allocation failed.\");\r\n- return result;\r\n-}\r\n-\r\n-static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr)\r\n-{\r\n- if ((pAllocationCallbacks != VMA_NULL) &&\r\n- (pAllocationCallbacks->pfnFree != VMA_NULL))\r\n- {\r\n- (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr);\r\n- }\r\n- else\r\n- {\r\n- VMA_SYSTEM_ALIGNED_FREE(ptr);\r\n- }\r\n-}\r\n-\r\n-template<typename T>\r\n-static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)\r\n-{\r\n- return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T));\r\n-}\r\n-\r\n-template<typename T>\r\n-static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)\r\n-{\r\n- return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T));\r\n-}\r\n-\r\n-#define vma_new(allocator, type) new(VmaAllocate<type>(allocator))(type)\r\n-\r\n-#define vma_new_array(allocator, type, count) new(VmaAllocateArray<type>((allocator), (count)))(type)\r\n-\r\n-template<typename T>\r\n-static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)\r\n-{\r\n- ptr->~T();\r\n- VmaFree(pAllocationCallbacks, ptr);\r\n-}\r\n-\r\n-template<typename T>\r\n-static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)\r\n-{\r\n- if (ptr != VMA_NULL)\r\n- {\r\n- for (size_t i = count; i--; )\r\n- {\r\n- ptr[i].~T();\r\n- }\r\n- VmaFree(pAllocationCallbacks, ptr);\r\n- }\r\n-}\r\n-\r\n-static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr)\r\n-{\r\n- if (srcStr != VMA_NULL)\r\n- {\r\n- const size_t len = strlen(srcStr);\r\n- char* const result = vma_new_array(allocs, char, len + 1);\r\n- memcpy(result, srcStr, len + 1);\r\n- return result;\r\n- }\r\n- return VMA_NULL;\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen)\r\n-{\r\n- if (srcStr != VMA_NULL)\r\n- {\r\n- char* const result = vma_new_array(allocs, char, strLen + 1);\r\n- memcpy(result, srcStr, strLen);\r\n- result[strLen] = '\\0';\r\n- return result;\r\n- }\r\n- return VMA_NULL;\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str)\r\n-{\r\n- if (str != VMA_NULL)\r\n- {\r\n- const size_t len = strlen(str);\r\n- vma_delete_array(allocs, str, len + 1);\r\n- }\r\n-}\r\n-\r\n-template<typename CmpLess, typename VectorT>\r\n-size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value)\r\n-{\r\n- const size_t indexToInsert = VmaBinaryFindFirstNotLess(\r\n- vector.data(),\r\n- vector.data() + vector.size(),\r\n- value,\r\n- CmpLess()) - vector.data();\r\n- VmaVectorInsert(vector, indexToInsert, value);\r\n- return indexToInsert;\r\n-}\r\n-\r\n-template<typename CmpLess, typename VectorT>\r\n-bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value)\r\n-{\r\n- CmpLess comparator;\r\n- typename VectorT::iterator it = VmaBinaryFindFirstNotLess(\r\n- vector.begin(),\r\n- vector.end(),\r\n- value,\r\n- comparator);\r\n- if ((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it))\r\n- {\r\n- size_t indexToRemove = it - vector.begin();\r\n- VmaVectorRemove(vector, indexToRemove);\r\n- return true;\r\n- }\r\n- return false;\r\n-}\r\n-#endif \/\/ _VMA_FUNCTIONS\r\n-\r\n-#ifndef _VMA_STATISTICS_FUNCTIONS\r\n-\r\n-static void VmaClearStatistics(VmaStatistics& outStats)\r\n-{\r\n- outStats.blockCount = 0;\r\n- outStats.allocationCount = 0;\r\n- outStats.blockBytes = 0;\r\n- outStats.allocationBytes = 0;\r\n-}\r\n-\r\n-static void VmaAddStatistics(VmaStatistics& inoutStats, const VmaStatistics& src)\r\n-{\r\n- inoutStats.blockCount += src.blockCount;\r\n- inoutStats.allocationCount += src.allocationCount;\r\n- inoutStats.blockBytes += src.blockBytes;\r\n- inoutStats.allocationBytes += src.allocationBytes;\r\n-}\r\n-\r\n-static void VmaClearDetailedStatistics(VmaDetailedStatistics& outStats)\r\n-{\r\n- VmaClearStatistics(outStats.statistics);\r\n- outStats.unusedRangeCount = 0;\r\n- outStats.allocationSizeMin = VK_WHOLE_SIZE;\r\n- outStats.allocationSizeMax = 0;\r\n- outStats.unusedRangeSizeMin = VK_WHOLE_SIZE;\r\n- outStats.unusedRangeSizeMax = 0;\r\n-}\r\n-\r\n-static void VmaAddDetailedStatisticsAllocation(VmaDetailedStatistics& inoutStats, VkDeviceSize size)\r\n-{\r\n- inoutStats.statistics.allocationCount++;\r\n- inoutStats.statistics.allocationBytes += size;\r\n- inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, size);\r\n- inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, size);\r\n-}\r\n-\r\n-static void VmaAddDetailedStatisticsUnusedRange(VmaDetailedStatistics& inoutStats, VkDeviceSize size)\r\n-{\r\n- inoutStats.unusedRangeCount++;\r\n- inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, size);\r\n- inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, size);\r\n-}\r\n-\r\n-static void VmaAddDetailedStatistics(VmaDetailedStatistics& inoutStats, const VmaDetailedStatistics& src)\r\n-{\r\n- VmaAddStatistics(inoutStats.statistics, src.statistics);\r\n- inoutStats.unusedRangeCount += src.unusedRangeCount;\r\n- inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, src.allocationSizeMin);\r\n- inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, src.allocationSizeMax);\r\n- inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, src.unusedRangeSizeMin);\r\n- inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, src.unusedRangeSizeMax);\r\n-}\r\n-\r\n-#endif \/\/ _VMA_STATISTICS_FUNCTIONS\r\n-\r\n-#ifndef _VMA_MUTEX_LOCK\r\n-\/\/ Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope).\r\n-struct VmaMutexLock\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaMutexLock)\r\n-public:\r\n- VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) :\r\n- m_pMutex(useMutex ? &mutex : VMA_NULL)\r\n- {\r\n- if (m_pMutex) { m_pMutex->Lock(); }\r\n- }\r\n- ~VmaMutexLock() { if (m_pMutex) { m_pMutex->Unlock(); } }\r\n-\r\n-private:\r\n- VMA_MUTEX* m_pMutex;\r\n-};\r\n-\r\n-\/\/ Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading.\r\n-struct VmaMutexLockRead\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaMutexLockRead)\r\n-public:\r\n- VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) :\r\n- m_pMutex(useMutex ? &mutex : VMA_NULL)\r\n- {\r\n- if (m_pMutex) { m_pMutex->LockRead(); }\r\n- }\r\n- ~VmaMutexLockRead() { if (m_pMutex) { m_pMutex->UnlockRead(); } }\r\n-\r\n-private:\r\n- VMA_RW_MUTEX* m_pMutex;\r\n-};\r\n-\r\n-\/\/ Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing.\r\n-struct VmaMutexLockWrite\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaMutexLockWrite)\r\n-public:\r\n- VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex)\r\n- : m_pMutex(useMutex ? &mutex : VMA_NULL)\r\n- {\r\n- if (m_pMutex) { m_pMutex->LockWrite(); }\r\n- }\r\n- ~VmaMutexLockWrite() { if (m_pMutex) { m_pMutex->UnlockWrite(); } }\r\n-\r\n-private:\r\n- VMA_RW_MUTEX* m_pMutex;\r\n-};\r\n-\r\n-#if VMA_DEBUG_GLOBAL_MUTEX\r\n- static VMA_MUTEX gDebugGlobalMutex;\r\n- #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true);\r\n-#else\r\n- #define VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-#endif\r\n-#endif \/\/ _VMA_MUTEX_LOCK\r\n-\r\n-#ifndef _VMA_ATOMIC_TRANSACTIONAL_INCREMENT\r\n-\/\/ An object that increments given atomic but decrements it back in the destructor unless Commit() is called.\r\n-template<typename T>\r\n-struct AtomicTransactionalIncrement\r\n-{\r\n-public:\r\n- typedef std::atomic<T> AtomicT;\r\n-\r\n- ~AtomicTransactionalIncrement()\r\n- {\r\n- if(m_Atomic)\r\n- --(*m_Atomic);\r\n- }\r\n-\r\n- void Commit() { m_Atomic = nullptr; }\r\n- T Increment(AtomicT* atomic)\r\n- {\r\n- m_Atomic = atomic;\r\n- return m_Atomic->fetch_add(1);\r\n- }\r\n-\r\n-private:\r\n- AtomicT* m_Atomic = nullptr;\r\n-};\r\n-#endif \/\/ _VMA_ATOMIC_TRANSACTIONAL_INCREMENT\r\n-\r\n-#ifndef _VMA_STL_ALLOCATOR\r\n-\/\/ STL-compatible allocator.\r\n-template<typename T>\r\n-struct VmaStlAllocator\r\n-{\r\n- const VkAllocationCallbacks* const m_pCallbacks;\r\n- typedef T value_type;\r\n-\r\n- VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {}\r\n- template<typename U>\r\n- VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) {}\r\n- VmaStlAllocator(const VmaStlAllocator&) = default;\r\n- VmaStlAllocator& operator=(const VmaStlAllocator&) = delete;\r\n-\r\n- T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); }\r\n- void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); }\r\n-\r\n- template<typename U>\r\n- bool operator==(const VmaStlAllocator<U>& rhs) const\r\n- {\r\n- return m_pCallbacks == rhs.m_pCallbacks;\r\n- }\r\n- template<typename U>\r\n- bool operator!=(const VmaStlAllocator<U>& rhs) const\r\n- {\r\n- return m_pCallbacks != rhs.m_pCallbacks;\r\n- }\r\n-};\r\n-#endif \/\/ _VMA_STL_ALLOCATOR\r\n-\r\n-#ifndef _VMA_VECTOR\r\n-\/* Class with interface compatible with subset of std::vector.\r\n-T must be POD because constructors and destructors are not called and memcpy is\r\n-used for these objects. *\/\r\n-template<typename T, typename AllocatorT>\r\n-class VmaVector\r\n-{\r\n-public:\r\n- typedef T value_type;\r\n- typedef T* iterator;\r\n- typedef const T* const_iterator;\r\n-\r\n- VmaVector(const AllocatorT& allocator);\r\n- VmaVector(size_t count, const AllocatorT& allocator);\r\n- \/\/ This version of the constructor is here for compatibility with pre-C++14 std::vector.\r\n- \/\/ value is unused.\r\n- VmaVector(size_t count, const T& value, const AllocatorT& allocator) : VmaVector(count, allocator) {}\r\n- VmaVector(const VmaVector<T, AllocatorT>& src);\r\n- VmaVector& operator=(const VmaVector& rhs);\r\n- ~VmaVector() { VmaFree(m_Allocator.m_pCallbacks, m_pArray); }\r\n-\r\n- bool empty() const { return m_Count == 0; }\r\n- size_t size() const { return m_Count; }\r\n- T* data() { return m_pArray; }\r\n- T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; }\r\n- T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; }\r\n- const T* data() const { return m_pArray; }\r\n- const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; }\r\n- const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; }\r\n-\r\n- iterator begin() { return m_pArray; }\r\n- iterator end() { return m_pArray + m_Count; }\r\n- const_iterator cbegin() const { return m_pArray; }\r\n- const_iterator cend() const { return m_pArray + m_Count; }\r\n- const_iterator begin() const { return cbegin(); }\r\n- const_iterator end() const { return cend(); }\r\n-\r\n- void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); }\r\n- void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); }\r\n- void push_front(const T& src) { insert(0, src); }\r\n-\r\n- void push_back(const T& src);\r\n- void reserve(size_t newCapacity, bool freeMemory = false);\r\n- void resize(size_t newCount);\r\n- void clear() { resize(0); }\r\n- void shrink_to_fit();\r\n- void insert(size_t index, const T& src);\r\n- void remove(size_t index);\r\n-\r\n- T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; }\r\n- const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; }\r\n-\r\n-private:\r\n- AllocatorT m_Allocator;\r\n- T* m_pArray;\r\n- size_t m_Count;\r\n- size_t m_Capacity;\r\n-};\r\n-\r\n-#ifndef _VMA_VECTOR_FUNCTIONS\r\n-template<typename T, typename AllocatorT>\r\n-VmaVector<T, AllocatorT>::VmaVector(const AllocatorT& allocator)\r\n- : m_Allocator(allocator),\r\n- m_pArray(VMA_NULL),\r\n- m_Count(0),\r\n- m_Capacity(0) {}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-VmaVector<T, AllocatorT>::VmaVector(size_t count, const AllocatorT& allocator)\r\n- : m_Allocator(allocator),\r\n- m_pArray(count ? (T*)VmaAllocateArray<T>(allocator.m_pCallbacks, count) : VMA_NULL),\r\n- m_Count(count),\r\n- m_Capacity(count) {}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-VmaVector<T, AllocatorT>::VmaVector(const VmaVector& src)\r\n- : m_Allocator(src.m_Allocator),\r\n- m_pArray(src.m_Count ? (T*)VmaAllocateArray<T>(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL),\r\n- m_Count(src.m_Count),\r\n- m_Capacity(src.m_Count)\r\n-{\r\n- if (m_Count != 0)\r\n- {\r\n- memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T));\r\n- }\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-VmaVector<T, AllocatorT>& VmaVector<T, AllocatorT>::operator=(const VmaVector& rhs)\r\n-{\r\n- if (&rhs != this)\r\n- {\r\n- resize(rhs.m_Count);\r\n- if (m_Count != 0)\r\n- {\r\n- memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T));\r\n- }\r\n- }\r\n- return *this;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::push_back(const T& src)\r\n-{\r\n- const size_t newIndex = size();\r\n- resize(newIndex + 1);\r\n- m_pArray[newIndex] = src;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::reserve(size_t newCapacity, bool freeMemory)\r\n-{\r\n- newCapacity = VMA_MAX(newCapacity, m_Count);\r\n-\r\n- if ((newCapacity < m_Capacity) && !freeMemory)\r\n- {\r\n- newCapacity = m_Capacity;\r\n- }\r\n-\r\n- if (newCapacity != m_Capacity)\r\n- {\r\n- T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator, newCapacity) : VMA_NULL;\r\n- if (m_Count != 0)\r\n- {\r\n- memcpy(newArray, m_pArray, m_Count * sizeof(T));\r\n- }\r\n- VmaFree(m_Allocator.m_pCallbacks, m_pArray);\r\n- m_Capacity = newCapacity;\r\n- m_pArray = newArray;\r\n- }\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::resize(size_t newCount)\r\n-{\r\n- size_t newCapacity = m_Capacity;\r\n- if (newCount > m_Capacity)\r\n- {\r\n- newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 \/ 2, (size_t)8));\r\n- }\r\n-\r\n- if (newCapacity != m_Capacity)\r\n- {\r\n- T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL;\r\n- const size_t elementsToCopy = VMA_MIN(m_Count, newCount);\r\n- if (elementsToCopy != 0)\r\n- {\r\n- memcpy(newArray, m_pArray, elementsToCopy * sizeof(T));\r\n- }\r\n- VmaFree(m_Allocator.m_pCallbacks, m_pArray);\r\n- m_Capacity = newCapacity;\r\n- m_pArray = newArray;\r\n- }\r\n-\r\n- m_Count = newCount;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::shrink_to_fit()\r\n-{\r\n- if (m_Capacity > m_Count)\r\n- {\r\n- T* newArray = VMA_NULL;\r\n- if (m_Count > 0)\r\n- {\r\n- newArray = VmaAllocateArray<T>(m_Allocator.m_pCallbacks, m_Count);\r\n- memcpy(newArray, m_pArray, m_Count * sizeof(T));\r\n- }\r\n- VmaFree(m_Allocator.m_pCallbacks, m_pArray);\r\n- m_Capacity = m_Count;\r\n- m_pArray = newArray;\r\n- }\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::insert(size_t index, const T& src)\r\n-{\r\n- VMA_HEAVY_ASSERT(index <= m_Count);\r\n- const size_t oldCount = size();\r\n- resize(oldCount + 1);\r\n- if (index < oldCount)\r\n- {\r\n- memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T));\r\n- }\r\n- m_pArray[index] = src;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-void VmaVector<T, AllocatorT>::remove(size_t index)\r\n-{\r\n- VMA_HEAVY_ASSERT(index < m_Count);\r\n- const size_t oldCount = size();\r\n- if (index < oldCount - 1)\r\n- {\r\n- memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T));\r\n- }\r\n- resize(oldCount - 1);\r\n-}\r\n-#endif \/\/ _VMA_VECTOR_FUNCTIONS\r\n-\r\n-template<typename T, typename allocatorT>\r\n-static void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)\r\n-{\r\n- vec.insert(index, item);\r\n-}\r\n-\r\n-template<typename T, typename allocatorT>\r\n-static void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)\r\n-{\r\n- vec.remove(index);\r\n-}\r\n-#endif \/\/ _VMA_VECTOR\r\n-\r\n-#ifndef _VMA_SMALL_VECTOR\r\n-\/*\r\n-This is a vector (a variable-sized array), optimized for the case when the array is small.\r\n-\r\n-It contains some number of elements in-place, which allows it to avoid heap allocation\r\n-when the actual number of elements is below that threshold. This allows normal \"small\"\r\n-cases to be fast without losing generality for large inputs.\r\n-*\/\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-class VmaSmallVector\r\n-{\r\n-public:\r\n- typedef T value_type;\r\n- typedef T* iterator;\r\n-\r\n- VmaSmallVector(const AllocatorT& allocator);\r\n- VmaSmallVector(size_t count, const AllocatorT& allocator);\r\n- template<typename SrcT, typename SrcAllocatorT, size_t SrcN>\r\n- VmaSmallVector(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;\r\n- template<typename SrcT, typename SrcAllocatorT, size_t SrcN>\r\n- VmaSmallVector<T, AllocatorT, N>& operator=(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;\r\n- ~VmaSmallVector() = default;\r\n-\r\n- bool empty() const { return m_Count == 0; }\r\n- size_t size() const { return m_Count; }\r\n- T* data() { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; }\r\n- T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; }\r\n- T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; }\r\n- const T* data() const { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; }\r\n- const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; }\r\n- const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; }\r\n-\r\n- iterator begin() { return data(); }\r\n- iterator end() { return data() + m_Count; }\r\n-\r\n- void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); }\r\n- void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); }\r\n- void push_front(const T& src) { insert(0, src); }\r\n-\r\n- void push_back(const T& src);\r\n- void resize(size_t newCount, bool freeMemory = false);\r\n- void clear(bool freeMemory = false);\r\n- void insert(size_t index, const T& src);\r\n- void remove(size_t index);\r\n-\r\n- T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; }\r\n- const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; }\r\n-\r\n-private:\r\n- size_t m_Count;\r\n- T m_StaticArray[N]; \/\/ Used when m_Size <= N\r\n- VmaVector<T, AllocatorT> m_DynamicArray; \/\/ Used when m_Size > N\r\n-};\r\n-\r\n-#ifndef _VMA_SMALL_VECTOR_FUNCTIONS\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-VmaSmallVector<T, AllocatorT, N>::VmaSmallVector(const AllocatorT& allocator)\r\n- : m_Count(0),\r\n- m_DynamicArray(allocator) {}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-VmaSmallVector<T, AllocatorT, N>::VmaSmallVector(size_t count, const AllocatorT& allocator)\r\n- : m_Count(count),\r\n- m_DynamicArray(count > N ? count : 0, allocator) {}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-void VmaSmallVector<T, AllocatorT, N>::push_back(const T& src)\r\n-{\r\n- const size_t newIndex = size();\r\n- resize(newIndex + 1);\r\n- data()[newIndex] = src;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-void VmaSmallVector<T, AllocatorT, N>::resize(size_t newCount, bool freeMemory)\r\n-{\r\n- if (newCount > N && m_Count > N)\r\n- {\r\n- \/\/ Any direction, staying in m_DynamicArray\r\n- m_DynamicArray.resize(newCount);\r\n- if (freeMemory)\r\n- {\r\n- m_DynamicArray.shrink_to_fit();\r\n- }\r\n- }\r\n- else if (newCount > N && m_Count <= N)\r\n- {\r\n- \/\/ Growing, moving from m_StaticArray to m_DynamicArray\r\n- m_DynamicArray.resize(newCount);\r\n- if (m_Count > 0)\r\n- {\r\n- memcpy(m_DynamicArray.data(), m_StaticArray, m_Count * sizeof(T));\r\n- }\r\n- }\r\n- else if (newCount <= N && m_Count > N)\r\n- {\r\n- \/\/ Shrinking, moving from m_DynamicArray to m_StaticArray\r\n- if (newCount > 0)\r\n- {\r\n- memcpy(m_StaticArray, m_DynamicArray.data(), newCount * sizeof(T));\r\n- }\r\n- m_DynamicArray.resize(0);\r\n- if (freeMemory)\r\n- {\r\n- m_DynamicArray.shrink_to_fit();\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Any direction, staying in m_StaticArray - nothing to do here\r\n- }\r\n- m_Count = newCount;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-void VmaSmallVector<T, AllocatorT, N>::clear(bool freeMemory)\r\n-{\r\n- m_DynamicArray.clear();\r\n- if (freeMemory)\r\n- {\r\n- m_DynamicArray.shrink_to_fit();\r\n- }\r\n- m_Count = 0;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-void VmaSmallVector<T, AllocatorT, N>::insert(size_t index, const T& src)\r\n-{\r\n- VMA_HEAVY_ASSERT(index <= m_Count);\r\n- const size_t oldCount = size();\r\n- resize(oldCount + 1);\r\n- T* const dataPtr = data();\r\n- if (index < oldCount)\r\n- {\r\n- \/\/ I know, this could be more optimal for case where memmove can be memcpy directly from m_StaticArray to m_DynamicArray.\r\n- memmove(dataPtr + (index + 1), dataPtr + index, (oldCount - index) * sizeof(T));\r\n- }\r\n- dataPtr[index] = src;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT, size_t N>\r\n-void VmaSmallVector<T, AllocatorT, N>::remove(size_t index)\r\n-{\r\n- VMA_HEAVY_ASSERT(index < m_Count);\r\n- const size_t oldCount = size();\r\n- if (index < oldCount - 1)\r\n- {\r\n- \/\/ I know, this could be more optimal for case where memmove can be memcpy directly from m_DynamicArray to m_StaticArray.\r\n- T* const dataPtr = data();\r\n- memmove(dataPtr + index, dataPtr + (index + 1), (oldCount - index - 1) * sizeof(T));\r\n- }\r\n- resize(oldCount - 1);\r\n-}\r\n-#endif \/\/ _VMA_SMALL_VECTOR_FUNCTIONS\r\n-#endif \/\/ _VMA_SMALL_VECTOR\r\n-\r\n-#ifndef _VMA_POOL_ALLOCATOR\r\n-\/*\r\n-Allocator for objects of type T using a list of arrays (pools) to speed up\r\n-allocation. Number of elements that can be allocated is not bounded because\r\n-allocator can create multiple blocks.\r\n-*\/\r\n-template<typename T>\r\n-class VmaPoolAllocator\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaPoolAllocator)\r\n-public:\r\n- VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity);\r\n- ~VmaPoolAllocator();\r\n- template<typename... Types> T* Alloc(Types&&... args);\r\n- void Free(T* ptr);\r\n-\r\n-private:\r\n- union Item\r\n- {\r\n- uint32_t NextFreeIndex;\r\n- alignas(T) char Value[sizeof(T)];\r\n- };\r\n- struct ItemBlock\r\n- {\r\n- Item* pItems;\r\n- uint32_t Capacity;\r\n- uint32_t FirstFreeIndex;\r\n- };\r\n-\r\n- const VkAllocationCallbacks* m_pAllocationCallbacks;\r\n- const uint32_t m_FirstBlockCapacity;\r\n- VmaVector<ItemBlock, VmaStlAllocator<ItemBlock>> m_ItemBlocks;\r\n-\r\n- ItemBlock& CreateNewBlock();\r\n-};\r\n-\r\n-#ifndef _VMA_POOL_ALLOCATOR_FUNCTIONS\r\n-template<typename T>\r\n-VmaPoolAllocator<T>::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity)\r\n- : m_pAllocationCallbacks(pAllocationCallbacks),\r\n- m_FirstBlockCapacity(firstBlockCapacity),\r\n- m_ItemBlocks(VmaStlAllocator<ItemBlock>(pAllocationCallbacks))\r\n-{\r\n- VMA_ASSERT(m_FirstBlockCapacity > 1);\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaPoolAllocator<T>::~VmaPoolAllocator()\r\n-{\r\n- for (size_t i = m_ItemBlocks.size(); i--;)\r\n- vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity);\r\n- m_ItemBlocks.clear();\r\n-}\r\n-\r\n-template<typename T>\r\n-template<typename... Types> T* VmaPoolAllocator<T>::Alloc(Types&&... args)\r\n-{\r\n- for (size_t i = m_ItemBlocks.size(); i--; )\r\n- {\r\n- ItemBlock& block = m_ItemBlocks[i];\r\n- \/\/ This block has some free items: Use first one.\r\n- if (block.FirstFreeIndex != UINT32_MAX)\r\n- {\r\n- Item* const pItem = &block.pItems[block.FirstFreeIndex];\r\n- block.FirstFreeIndex = pItem->NextFreeIndex;\r\n- T* result = (T*)&pItem->Value;\r\n- new(result)T(std::forward<Types>(args)...); \/\/ Explicit constructor call.\r\n- return result;\r\n- }\r\n- }\r\n-\r\n- \/\/ No block has free item: Create new one and use it.\r\n- ItemBlock& newBlock = CreateNewBlock();\r\n- Item* const pItem = &newBlock.pItems[0];\r\n- newBlock.FirstFreeIndex = pItem->NextFreeIndex;\r\n- T* result = (T*)&pItem->Value;\r\n- new(result) T(std::forward<Types>(args)...); \/\/ Explicit constructor call.\r\n- return result;\r\n-}\r\n-\r\n-template<typename T>\r\n-void VmaPoolAllocator<T>::Free(T* ptr)\r\n-{\r\n- \/\/ Search all memory blocks to find ptr.\r\n- for (size_t i = m_ItemBlocks.size(); i--; )\r\n- {\r\n- ItemBlock& block = m_ItemBlocks[i];\r\n-\r\n- \/\/ Casting to union.\r\n- Item* pItemPtr;\r\n- memcpy(&pItemPtr, &ptr, sizeof(pItemPtr));\r\n-\r\n- \/\/ Check if pItemPtr is in address range of this block.\r\n- if ((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity))\r\n- {\r\n- ptr->~T(); \/\/ Explicit destructor call.\r\n- const uint32_t index = static_cast<uint32_t>(pItemPtr - block.pItems);\r\n- pItemPtr->NextFreeIndex = block.FirstFreeIndex;\r\n- block.FirstFreeIndex = index;\r\n- return;\r\n- }\r\n- }\r\n- VMA_ASSERT(0 && \"Pointer doesn't belong to this memory pool.\");\r\n-}\r\n-\r\n-template<typename T>\r\n-typename VmaPoolAllocator<T>::ItemBlock& VmaPoolAllocator<T>::CreateNewBlock()\r\n-{\r\n- const uint32_t newBlockCapacity = m_ItemBlocks.empty() ?\r\n- m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 \/ 2;\r\n-\r\n- const ItemBlock newBlock =\r\n- {\r\n- vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity),\r\n- newBlockCapacity,\r\n- 0\r\n- };\r\n-\r\n- m_ItemBlocks.push_back(newBlock);\r\n-\r\n- \/\/ Setup singly-linked list of all free items in this block.\r\n- for (uint32_t i = 0; i < newBlockCapacity - 1; ++i)\r\n- newBlock.pItems[i].NextFreeIndex = i + 1;\r\n- newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX;\r\n- return m_ItemBlocks.back();\r\n-}\r\n-#endif \/\/ _VMA_POOL_ALLOCATOR_FUNCTIONS\r\n-#endif \/\/ _VMA_POOL_ALLOCATOR\r\n-\r\n-#ifndef _VMA_RAW_LIST\r\n-template<typename T>\r\n-struct VmaListItem\r\n-{\r\n- VmaListItem* pPrev;\r\n- VmaListItem* pNext;\r\n- T Value;\r\n-};\r\n-\r\n-\/\/ Doubly linked list.\r\n-template<typename T>\r\n-class VmaRawList\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaRawList)\r\n-public:\r\n- typedef VmaListItem<T> ItemType;\r\n-\r\n- VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);\r\n- \/\/ Intentionally not calling Clear, because that would be unnecessary\r\n- \/\/ computations to return all items to m_ItemAllocator as free.\r\n- ~VmaRawList() = default;\r\n-\r\n- size_t GetCount() const { return m_Count; }\r\n- bool IsEmpty() const { return m_Count == 0; }\r\n-\r\n- ItemType* Front() { return m_pFront; }\r\n- ItemType* Back() { return m_pBack; }\r\n- const ItemType* Front() const { return m_pFront; }\r\n- const ItemType* Back() const { return m_pBack; }\r\n-\r\n- ItemType* PushFront();\r\n- ItemType* PushBack();\r\n- ItemType* PushFront(const T& value);\r\n- ItemType* PushBack(const T& value);\r\n- void PopFront();\r\n- void PopBack();\r\n-\r\n- \/\/ Item can be null - it means PushBack.\r\n- ItemType* InsertBefore(ItemType* pItem);\r\n- \/\/ Item can be null - it means PushFront.\r\n- ItemType* InsertAfter(ItemType* pItem);\r\n- ItemType* InsertBefore(ItemType* pItem, const T& value);\r\n- ItemType* InsertAfter(ItemType* pItem, const T& value);\r\n-\r\n- void Clear();\r\n- void Remove(ItemType* pItem);\r\n-\r\n-private:\r\n- const VkAllocationCallbacks* const m_pAllocationCallbacks;\r\n- VmaPoolAllocator<ItemType> m_ItemAllocator;\r\n- ItemType* m_pFront;\r\n- ItemType* m_pBack;\r\n- size_t m_Count;\r\n-};\r\n-\r\n-#ifndef _VMA_RAW_LIST_FUNCTIONS\r\n-template<typename T>\r\n-VmaRawList<T>::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks)\r\n- : m_pAllocationCallbacks(pAllocationCallbacks),\r\n- m_ItemAllocator(pAllocationCallbacks, 128),\r\n- m_pFront(VMA_NULL),\r\n- m_pBack(VMA_NULL),\r\n- m_Count(0) {}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::PushFront()\r\n-{\r\n- ItemType* const pNewItem = m_ItemAllocator.Alloc();\r\n- pNewItem->pPrev = VMA_NULL;\r\n- if (IsEmpty())\r\n- {\r\n- pNewItem->pNext = VMA_NULL;\r\n- m_pFront = pNewItem;\r\n- m_pBack = pNewItem;\r\n- m_Count = 1;\r\n- }\r\n- else\r\n- {\r\n- pNewItem->pNext = m_pFront;\r\n- m_pFront->pPrev = pNewItem;\r\n- m_pFront = pNewItem;\r\n- ++m_Count;\r\n- }\r\n- return pNewItem;\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::PushBack()\r\n-{\r\n- ItemType* const pNewItem = m_ItemAllocator.Alloc();\r\n- pNewItem->pNext = VMA_NULL;\r\n- if(IsEmpty())\r\n- {\r\n- pNewItem->pPrev = VMA_NULL;\r\n- m_pFront = pNewItem;\r\n- m_pBack = pNewItem;\r\n- m_Count = 1;\r\n- }\r\n- else\r\n- {\r\n- pNewItem->pPrev = m_pBack;\r\n- m_pBack->pNext = pNewItem;\r\n- m_pBack = pNewItem;\r\n- ++m_Count;\r\n- }\r\n- return pNewItem;\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::PushFront(const T& value)\r\n-{\r\n- ItemType* const pNewItem = PushFront();\r\n- pNewItem->Value = value;\r\n- return pNewItem;\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::PushBack(const T& value)\r\n-{\r\n- ItemType* const pNewItem = PushBack();\r\n- pNewItem->Value = value;\r\n- return pNewItem;\r\n-}\r\n-\r\n-template<typename T>\r\n-void VmaRawList<T>::PopFront()\r\n-{\r\n- VMA_HEAVY_ASSERT(m_Count > 0);\r\n- ItemType* const pFrontItem = m_pFront;\r\n- ItemType* const pNextItem = pFrontItem->pNext;\r\n- if (pNextItem != VMA_NULL)\r\n- {\r\n- pNextItem->pPrev = VMA_NULL;\r\n- }\r\n- m_pFront = pNextItem;\r\n- m_ItemAllocator.Free(pFrontItem);\r\n- --m_Count;\r\n-}\r\n-\r\n-template<typename T>\r\n-void VmaRawList<T>::PopBack()\r\n-{\r\n- VMA_HEAVY_ASSERT(m_Count > 0);\r\n- ItemType* const pBackItem = m_pBack;\r\n- ItemType* const pPrevItem = pBackItem->pPrev;\r\n- if(pPrevItem != VMA_NULL)\r\n- {\r\n- pPrevItem->pNext = VMA_NULL;\r\n- }\r\n- m_pBack = pPrevItem;\r\n- m_ItemAllocator.Free(pBackItem);\r\n- --m_Count;\r\n-}\r\n-\r\n-template<typename T>\r\n-void VmaRawList<T>::Clear()\r\n-{\r\n- if (IsEmpty() == false)\r\n- {\r\n- ItemType* pItem = m_pBack;\r\n- while (pItem != VMA_NULL)\r\n- {\r\n- ItemType* const pPrevItem = pItem->pPrev;\r\n- m_ItemAllocator.Free(pItem);\r\n- pItem = pPrevItem;\r\n- }\r\n- m_pFront = VMA_NULL;\r\n- m_pBack = VMA_NULL;\r\n- m_Count = 0;\r\n- }\r\n-}\r\n-\r\n-template<typename T>\r\n-void VmaRawList<T>::Remove(ItemType* pItem)\r\n-{\r\n- VMA_HEAVY_ASSERT(pItem != VMA_NULL);\r\n- VMA_HEAVY_ASSERT(m_Count > 0);\r\n-\r\n- if(pItem->pPrev != VMA_NULL)\r\n- {\r\n- pItem->pPrev->pNext = pItem->pNext;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_pFront == pItem);\r\n- m_pFront = pItem->pNext;\r\n- }\r\n-\r\n- if(pItem->pNext != VMA_NULL)\r\n- {\r\n- pItem->pNext->pPrev = pItem->pPrev;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_pBack == pItem);\r\n- m_pBack = pItem->pPrev;\r\n- }\r\n-\r\n- m_ItemAllocator.Free(pItem);\r\n- --m_Count;\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem)\r\n-{\r\n- if(pItem != VMA_NULL)\r\n- {\r\n- ItemType* const prevItem = pItem->pPrev;\r\n- ItemType* const newItem = m_ItemAllocator.Alloc();\r\n- newItem->pPrev = prevItem;\r\n- newItem->pNext = pItem;\r\n- pItem->pPrev = newItem;\r\n- if(prevItem != VMA_NULL)\r\n- {\r\n- prevItem->pNext = newItem;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_pFront == pItem);\r\n- m_pFront = newItem;\r\n- }\r\n- ++m_Count;\r\n- return newItem;\r\n- }\r\n- else\r\n- return PushBack();\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem)\r\n-{\r\n- if(pItem != VMA_NULL)\r\n- {\r\n- ItemType* const nextItem = pItem->pNext;\r\n- ItemType* const newItem = m_ItemAllocator.Alloc();\r\n- newItem->pNext = nextItem;\r\n- newItem->pPrev = pItem;\r\n- pItem->pNext = newItem;\r\n- if(nextItem != VMA_NULL)\r\n- {\r\n- nextItem->pPrev = newItem;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_pBack == pItem);\r\n- m_pBack = newItem;\r\n- }\r\n- ++m_Count;\r\n- return newItem;\r\n- }\r\n- else\r\n- return PushFront();\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem, const T& value)\r\n-{\r\n- ItemType* const newItem = InsertBefore(pItem);\r\n- newItem->Value = value;\r\n- return newItem;\r\n-}\r\n-\r\n-template<typename T>\r\n-VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem, const T& value)\r\n-{\r\n- ItemType* const newItem = InsertAfter(pItem);\r\n- newItem->Value = value;\r\n- return newItem;\r\n-}\r\n-#endif \/\/ _VMA_RAW_LIST_FUNCTIONS\r\n-#endif \/\/ _VMA_RAW_LIST\r\n-\r\n-#ifndef _VMA_LIST\r\n-template<typename T, typename AllocatorT>\r\n-class VmaList\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaList)\r\n-public:\r\n- class reverse_iterator;\r\n- class const_iterator;\r\n- class const_reverse_iterator;\r\n-\r\n- class iterator\r\n- {\r\n- friend class const_iterator;\r\n- friend class VmaList<T, AllocatorT>;\r\n- public:\r\n- iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\r\n- iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n-\r\n- T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\r\n- T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\r\n-\r\n- bool operator==(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\r\n- bool operator!=(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\r\n-\r\n- iterator operator++(int) { iterator result = *this; ++*this; return result; }\r\n- iterator operator--(int) { iterator result = *this; --*this; return result; }\r\n-\r\n- iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }\r\n- iterator& operator--();\r\n-\r\n- private:\r\n- VmaRawList<T>* m_pList;\r\n- VmaListItem<T>* m_pItem;\r\n-\r\n- iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\r\n- };\r\n- class reverse_iterator\r\n- {\r\n- friend class const_reverse_iterator;\r\n- friend class VmaList<T, AllocatorT>;\r\n- public:\r\n- reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\r\n- reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n-\r\n- T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\r\n- T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\r\n-\r\n- bool operator==(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\r\n- bool operator!=(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\r\n-\r\n- reverse_iterator operator++(int) { reverse_iterator result = *this; ++* this; return result; }\r\n- reverse_iterator operator--(int) { reverse_iterator result = *this; --* this; return result; }\r\n-\r\n- reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }\r\n- reverse_iterator& operator--();\r\n-\r\n- private:\r\n- VmaRawList<T>* m_pList;\r\n- VmaListItem<T>* m_pItem;\r\n-\r\n- reverse_iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\r\n- };\r\n- class const_iterator\r\n- {\r\n- friend class VmaList<T, AllocatorT>;\r\n- public:\r\n- const_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\r\n- const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n- const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n-\r\n- iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }\r\n-\r\n- const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\r\n- const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\r\n-\r\n- bool operator==(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\r\n- bool operator!=(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\r\n-\r\n- const_iterator operator++(int) { const_iterator result = *this; ++* this; return result; }\r\n- const_iterator operator--(int) { const_iterator result = *this; --* this; return result; }\r\n-\r\n- const_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }\r\n- const_iterator& operator--();\r\n-\r\n- private:\r\n- const VmaRawList<T>* m_pList;\r\n- const VmaListItem<T>* m_pItem;\r\n-\r\n- const_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\r\n- };\r\n- class const_reverse_iterator\r\n- {\r\n- friend class VmaList<T, AllocatorT>;\r\n- public:\r\n- const_reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\r\n- const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n- const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\r\n-\r\n- reverse_iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }\r\n-\r\n- const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\r\n- const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\r\n-\r\n- bool operator==(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\r\n- bool operator!=(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\r\n-\r\n- const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++* this; return result; }\r\n- const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --* this; return result; }\r\n-\r\n- const_reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }\r\n- const_reverse_iterator& operator--();\r\n-\r\n- private:\r\n- const VmaRawList<T>* m_pList;\r\n- const VmaListItem<T>* m_pItem;\r\n-\r\n- const_reverse_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\r\n- };\r\n-\r\n- VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {}\r\n-\r\n- bool empty() const { return m_RawList.IsEmpty(); }\r\n- size_t size() const { return m_RawList.GetCount(); }\r\n-\r\n- iterator begin() { return iterator(&m_RawList, m_RawList.Front()); }\r\n- iterator end() { return iterator(&m_RawList, VMA_NULL); }\r\n-\r\n- const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); }\r\n- const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); }\r\n-\r\n- const_iterator begin() const { return cbegin(); }\r\n- const_iterator end() const { return cend(); }\r\n-\r\n- reverse_iterator rbegin() { return reverse_iterator(&m_RawList, m_RawList.Back()); }\r\n- reverse_iterator rend() { return reverse_iterator(&m_RawList, VMA_NULL); }\r\n-\r\n- const_reverse_iterator crbegin() const { return const_reverse_iterator(&m_RawList, m_RawList.Back()); }\r\n- const_reverse_iterator crend() const { return const_reverse_iterator(&m_RawList, VMA_NULL); }\r\n-\r\n- const_reverse_iterator rbegin() const { return crbegin(); }\r\n- const_reverse_iterator rend() const { return crend(); }\r\n-\r\n- void push_back(const T& value) { m_RawList.PushBack(value); }\r\n- iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); }\r\n-\r\n- void clear() { m_RawList.Clear(); }\r\n- void erase(iterator it) { m_RawList.Remove(it.m_pItem); }\r\n-\r\n-private:\r\n- VmaRawList<T> m_RawList;\r\n-};\r\n-\r\n-#ifndef _VMA_LIST_FUNCTIONS\r\n-template<typename T, typename AllocatorT>\r\n-typename VmaList<T, AllocatorT>::iterator& VmaList<T, AllocatorT>::iterator::operator--()\r\n-{\r\n- if (m_pItem != VMA_NULL)\r\n- {\r\n- m_pItem = m_pItem->pPrev;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\r\n- m_pItem = m_pList->Back();\r\n- }\r\n- return *this;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-typename VmaList<T, AllocatorT>::reverse_iterator& VmaList<T, AllocatorT>::reverse_iterator::operator--()\r\n-{\r\n- if (m_pItem != VMA_NULL)\r\n- {\r\n- m_pItem = m_pItem->pNext;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\r\n- m_pItem = m_pList->Front();\r\n- }\r\n- return *this;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-typename VmaList<T, AllocatorT>::const_iterator& VmaList<T, AllocatorT>::const_iterator::operator--()\r\n-{\r\n- if (m_pItem != VMA_NULL)\r\n- {\r\n- m_pItem = m_pItem->pPrev;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\r\n- m_pItem = m_pList->Back();\r\n- }\r\n- return *this;\r\n-}\r\n-\r\n-template<typename T, typename AllocatorT>\r\n-typename VmaList<T, AllocatorT>::const_reverse_iterator& VmaList<T, AllocatorT>::const_reverse_iterator::operator--()\r\n-{\r\n- if (m_pItem != VMA_NULL)\r\n- {\r\n- m_pItem = m_pItem->pNext;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\r\n- m_pItem = m_pList->Back();\r\n- }\r\n- return *this;\r\n-}\r\n-#endif \/\/ _VMA_LIST_FUNCTIONS\r\n-#endif \/\/ _VMA_LIST\r\n-\r\n-#ifndef _VMA_INTRUSIVE_LINKED_LIST\r\n-\/*\r\n-Expected interface of ItemTypeTraits:\r\n-struct MyItemTypeTraits\r\n-{\r\n- typedef MyItem ItemType;\r\n- static ItemType* GetPrev(const ItemType* item) { return item->myPrevPtr; }\r\n- static ItemType* GetNext(const ItemType* item) { return item->myNextPtr; }\r\n- static ItemType*& AccessPrev(ItemType* item) { return item->myPrevPtr; }\r\n- static ItemType*& AccessNext(ItemType* item) { return item->myNextPtr; }\r\n-};\r\n-*\/\r\n-template<typename ItemTypeTraits>\r\n-class VmaIntrusiveLinkedList\r\n-{\r\n-public:\r\n- typedef typename ItemTypeTraits::ItemType ItemType;\r\n- static ItemType* GetPrev(const ItemType* item) { return ItemTypeTraits::GetPrev(item); }\r\n- static ItemType* GetNext(const ItemType* item) { return ItemTypeTraits::GetNext(item); }\r\n-\r\n- \/\/ Movable, not copyable.\r\n- VmaIntrusiveLinkedList() = default;\r\n- VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src);\r\n- VmaIntrusiveLinkedList(const VmaIntrusiveLinkedList&) = delete;\r\n- VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src);\r\n- VmaIntrusiveLinkedList& operator=(const VmaIntrusiveLinkedList&) = delete;\r\n- ~VmaIntrusiveLinkedList() { VMA_HEAVY_ASSERT(IsEmpty()); }\r\n- \r\n- size_t GetCount() const { return m_Count; }\r\n- bool IsEmpty() const { return m_Count == 0; }\r\n- ItemType* Front() { return m_Front; }\r\n- ItemType* Back() { return m_Back; }\r\n- const ItemType* Front() const { return m_Front; }\r\n- const ItemType* Back() const { return m_Back; }\r\n-\r\n- void PushBack(ItemType* item);\r\n- void PushFront(ItemType* item);\r\n- ItemType* PopBack();\r\n- ItemType* PopFront();\r\n-\r\n- \/\/ MyItem can be null - it means PushBack.\r\n- void InsertBefore(ItemType* existingItem, ItemType* newItem);\r\n- \/\/ MyItem can be null - it means PushFront.\r\n- void InsertAfter(ItemType* existingItem, ItemType* newItem);\r\n- void Remove(ItemType* item);\r\n- void RemoveAll();\r\n-\r\n-private:\r\n- ItemType* m_Front = VMA_NULL;\r\n- ItemType* m_Back = VMA_NULL;\r\n- size_t m_Count = 0;\r\n-};\r\n-\r\n-#ifndef _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS\r\n-template<typename ItemTypeTraits>\r\n-VmaIntrusiveLinkedList<ItemTypeTraits>::VmaIntrusiveLinkedList(VmaIntrusiveLinkedList&& src)\r\n- : m_Front(src.m_Front), m_Back(src.m_Back), m_Count(src.m_Count)\r\n-{\r\n- src.m_Front = src.m_Back = VMA_NULL;\r\n- src.m_Count = 0;\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-VmaIntrusiveLinkedList<ItemTypeTraits>& VmaIntrusiveLinkedList<ItemTypeTraits>::operator=(VmaIntrusiveLinkedList&& src)\r\n-{\r\n- if (&src != this)\r\n- {\r\n- VMA_HEAVY_ASSERT(IsEmpty());\r\n- m_Front = src.m_Front;\r\n- m_Back = src.m_Back;\r\n- m_Count = src.m_Count;\r\n- src.m_Front = src.m_Back = VMA_NULL;\r\n- src.m_Count = 0;\r\n- }\r\n- return *this;\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::PushBack(ItemType* item)\r\n-{\r\n- VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL);\r\n- if (IsEmpty())\r\n- {\r\n- m_Front = item;\r\n- m_Back = item;\r\n- m_Count = 1;\r\n- }\r\n- else\r\n- {\r\n- ItemTypeTraits::AccessPrev(item) = m_Back;\r\n- ItemTypeTraits::AccessNext(m_Back) = item;\r\n- m_Back = item;\r\n- ++m_Count;\r\n- }\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::PushFront(ItemType* item)\r\n-{\r\n- VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL);\r\n- if (IsEmpty())\r\n- {\r\n- m_Front = item;\r\n- m_Back = item;\r\n- m_Count = 1;\r\n- }\r\n- else\r\n- {\r\n- ItemTypeTraits::AccessNext(item) = m_Front;\r\n- ItemTypeTraits::AccessPrev(m_Front) = item;\r\n- m_Front = item;\r\n- ++m_Count;\r\n- }\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-typename VmaIntrusiveLinkedList<ItemTypeTraits>::ItemType* VmaIntrusiveLinkedList<ItemTypeTraits>::PopBack()\r\n-{\r\n- VMA_HEAVY_ASSERT(m_Count > 0);\r\n- ItemType* const backItem = m_Back;\r\n- ItemType* const prevItem = ItemTypeTraits::GetPrev(backItem);\r\n- if (prevItem != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessNext(prevItem) = VMA_NULL;\r\n- }\r\n- m_Back = prevItem;\r\n- --m_Count;\r\n- ItemTypeTraits::AccessPrev(backItem) = VMA_NULL;\r\n- ItemTypeTraits::AccessNext(backItem) = VMA_NULL;\r\n- return backItem;\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-typename VmaIntrusiveLinkedList<ItemTypeTraits>::ItemType* VmaIntrusiveLinkedList<ItemTypeTraits>::PopFront()\r\n-{\r\n- VMA_HEAVY_ASSERT(m_Count > 0);\r\n- ItemType* const frontItem = m_Front;\r\n- ItemType* const nextItem = ItemTypeTraits::GetNext(frontItem);\r\n- if (nextItem != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessPrev(nextItem) = VMA_NULL;\r\n- }\r\n- m_Front = nextItem;\r\n- --m_Count;\r\n- ItemTypeTraits::AccessPrev(frontItem) = VMA_NULL;\r\n- ItemTypeTraits::AccessNext(frontItem) = VMA_NULL;\r\n- return frontItem;\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::InsertBefore(ItemType* existingItem, ItemType* newItem)\r\n-{\r\n- VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL);\r\n- if (existingItem != VMA_NULL)\r\n- {\r\n- ItemType* const prevItem = ItemTypeTraits::GetPrev(existingItem);\r\n- ItemTypeTraits::AccessPrev(newItem) = prevItem;\r\n- ItemTypeTraits::AccessNext(newItem) = existingItem;\r\n- ItemTypeTraits::AccessPrev(existingItem) = newItem;\r\n- if (prevItem != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessNext(prevItem) = newItem;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_Front == existingItem);\r\n- m_Front = newItem;\r\n- }\r\n- ++m_Count;\r\n- }\r\n- else\r\n- PushBack(newItem);\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::InsertAfter(ItemType* existingItem, ItemType* newItem)\r\n-{\r\n- VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL);\r\n- if (existingItem != VMA_NULL)\r\n- {\r\n- ItemType* const nextItem = ItemTypeTraits::GetNext(existingItem);\r\n- ItemTypeTraits::AccessNext(newItem) = nextItem;\r\n- ItemTypeTraits::AccessPrev(newItem) = existingItem;\r\n- ItemTypeTraits::AccessNext(existingItem) = newItem;\r\n- if (nextItem != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessPrev(nextItem) = newItem;\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_Back == existingItem);\r\n- m_Back = newItem;\r\n- }\r\n- ++m_Count;\r\n- }\r\n- else\r\n- return PushFront(newItem);\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::Remove(ItemType* item)\r\n-{\r\n- VMA_HEAVY_ASSERT(item != VMA_NULL && m_Count > 0);\r\n- if (ItemTypeTraits::GetPrev(item) != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessNext(ItemTypeTraits::AccessPrev(item)) = ItemTypeTraits::GetNext(item);\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_Front == item);\r\n- m_Front = ItemTypeTraits::GetNext(item);\r\n- }\r\n-\r\n- if (ItemTypeTraits::GetNext(item) != VMA_NULL)\r\n- {\r\n- ItemTypeTraits::AccessPrev(ItemTypeTraits::AccessNext(item)) = ItemTypeTraits::GetPrev(item);\r\n- }\r\n- else\r\n- {\r\n- VMA_HEAVY_ASSERT(m_Back == item);\r\n- m_Back = ItemTypeTraits::GetPrev(item);\r\n- }\r\n- ItemTypeTraits::AccessPrev(item) = VMA_NULL;\r\n- ItemTypeTraits::AccessNext(item) = VMA_NULL;\r\n- --m_Count;\r\n-}\r\n-\r\n-template<typename ItemTypeTraits>\r\n-void VmaIntrusiveLinkedList<ItemTypeTraits>::RemoveAll()\r\n-{\r\n- if (!IsEmpty())\r\n- {\r\n- ItemType* item = m_Back;\r\n- while (item != VMA_NULL)\r\n- {\r\n- ItemType* const prevItem = ItemTypeTraits::AccessPrev(item);\r\n- ItemTypeTraits::AccessPrev(item) = VMA_NULL;\r\n- ItemTypeTraits::AccessNext(item) = VMA_NULL;\r\n- item = prevItem;\r\n- }\r\n- m_Front = VMA_NULL;\r\n- m_Back = VMA_NULL;\r\n- m_Count = 0;\r\n- }\r\n-}\r\n-#endif \/\/ _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS\r\n-#endif \/\/ _VMA_INTRUSIVE_LINKED_LIST\r\n-\r\n-\/\/ Unused in this version.\r\n-#if 0\r\n-\r\n-#ifndef _VMA_PAIR\r\n-template<typename T1, typename T2>\r\n-struct VmaPair\r\n-{\r\n- T1 first;\r\n- T2 second;\r\n-\r\n- VmaPair() : first(), second() {}\r\n- VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) {}\r\n-};\r\n-\r\n-template<typename FirstT, typename SecondT>\r\n-struct VmaPairFirstLess\r\n-{\r\n- bool operator()(const VmaPair<FirstT, SecondT>& lhs, const VmaPair<FirstT, SecondT>& rhs) const\r\n- {\r\n- return lhs.first < rhs.first;\r\n- }\r\n- bool operator()(const VmaPair<FirstT, SecondT>& lhs, const FirstT& rhsFirst) const\r\n- {\r\n- return lhs.first < rhsFirst;\r\n- }\r\n-};\r\n-#endif \/\/ _VMA_PAIR\r\n-\r\n-#ifndef _VMA_MAP\r\n-\/* Class compatible with subset of interface of std::unordered_map.\r\n-KeyT, ValueT must be POD because they will be stored in VmaVector.\r\n-*\/\r\n-template<typename KeyT, typename ValueT>\r\n-class VmaMap\r\n-{\r\n-public:\r\n- typedef VmaPair<KeyT, ValueT> PairType;\r\n- typedef PairType* iterator;\r\n-\r\n- VmaMap(const VmaStlAllocator<PairType>& allocator) : m_Vector(allocator) {}\r\n-\r\n- iterator begin() { return m_Vector.begin(); }\r\n- iterator end() { return m_Vector.end(); }\r\n- size_t size() { return m_Vector.size(); }\r\n-\r\n- void insert(const PairType& pair);\r\n- iterator find(const KeyT& key);\r\n- void erase(iterator it);\r\n-\r\n-private:\r\n- VmaVector< PairType, VmaStlAllocator<PairType>> m_Vector;\r\n-};\r\n-\r\n-#ifndef _VMA_MAP_FUNCTIONS\r\n-template<typename KeyT, typename ValueT>\r\n-void VmaMap<KeyT, ValueT>::insert(const PairType& pair)\r\n-{\r\n- const size_t indexToInsert = VmaBinaryFindFirstNotLess(\r\n- m_Vector.data(),\r\n- m_Vector.data() + m_Vector.size(),\r\n- pair,\r\n- VmaPairFirstLess<KeyT, ValueT>()) - m_Vector.data();\r\n- VmaVectorInsert(m_Vector, indexToInsert, pair);\r\n-}\r\n-\r\n-template<typename KeyT, typename ValueT>\r\n-VmaPair<KeyT, ValueT>* VmaMap<KeyT, ValueT>::find(const KeyT& key)\r\n-{\r\n- PairType* it = VmaBinaryFindFirstNotLess(\r\n- m_Vector.data(),\r\n- m_Vector.data() + m_Vector.size(),\r\n- key,\r\n- VmaPairFirstLess<KeyT, ValueT>());\r\n- if ((it != m_Vector.end()) && (it->first == key))\r\n- {\r\n- return it;\r\n- }\r\n- else\r\n- {\r\n- return m_Vector.end();\r\n- }\r\n-}\r\n-\r\n-template<typename KeyT, typename ValueT>\r\n-void VmaMap<KeyT, ValueT>::erase(iterator it)\r\n-{\r\n- VmaVectorRemove(m_Vector, it - m_Vector.begin());\r\n-}\r\n-#endif \/\/ _VMA_MAP_FUNCTIONS\r\n-#endif \/\/ _VMA_MAP\r\n-\r\n-#endif \/\/ #if 0\r\n-\r\n-#if !defined(_VMA_STRING_BUILDER) && VMA_STATS_STRING_ENABLED\r\n-class VmaStringBuilder\r\n-{\r\n-public:\r\n- VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator<char>(allocationCallbacks)) {}\r\n- ~VmaStringBuilder() = default;\r\n-\r\n- size_t GetLength() const { return m_Data.size(); }\r\n- const char* GetData() const { return m_Data.data(); }\r\n- void AddNewLine() { Add('\\n'); }\r\n- void Add(char ch) { m_Data.push_back(ch); }\r\n-\r\n- void Add(const char* pStr);\r\n- void AddNumber(uint32_t num);\r\n- void AddNumber(uint64_t num);\r\n- void AddPointer(const void* ptr);\r\n-\r\n-private:\r\n- VmaVector<char, VmaStlAllocator<char>> m_Data;\r\n-};\r\n-\r\n-#ifndef _VMA_STRING_BUILDER_FUNCTIONS\r\n-void VmaStringBuilder::Add(const char* pStr)\r\n-{\r\n- const size_t strLen = strlen(pStr);\r\n- if (strLen > 0)\r\n- {\r\n- const size_t oldCount = m_Data.size();\r\n- m_Data.resize(oldCount + strLen);\r\n- memcpy(m_Data.data() + oldCount, pStr, strLen);\r\n- }\r\n-}\r\n-\r\n-void VmaStringBuilder::AddNumber(uint32_t num)\r\n-{\r\n- char buf[11];\r\n- buf[10] = '\\0';\r\n- char* p = &buf[10];\r\n- do\r\n- {\r\n- *--p = '0' + (num % 10);\r\n- num \/= 10;\r\n- } while (num);\r\n- Add(p);\r\n-}\r\n-\r\n-void VmaStringBuilder::AddNumber(uint64_t num)\r\n-{\r\n- char buf[21];\r\n- buf[20] = '\\0';\r\n- char* p = &buf[20];\r\n- do\r\n- {\r\n- *--p = '0' + (num % 10);\r\n- num \/= 10;\r\n- } while (num);\r\n- Add(p);\r\n-}\r\n-\r\n-void VmaStringBuilder::AddPointer(const void* ptr)\r\n-{\r\n- char buf[21];\r\n- VmaPtrToStr(buf, sizeof(buf), ptr);\r\n- Add(buf);\r\n-}\r\n-#endif \/\/_VMA_STRING_BUILDER_FUNCTIONS\r\n-#endif \/\/ _VMA_STRING_BUILDER\r\n-\r\n-#if !defined(_VMA_JSON_WRITER) && VMA_STATS_STRING_ENABLED\r\n-\/*\r\n-Allows to conveniently build a correct JSON document to be written to the\r\n-VmaStringBuilder passed to the constructor.\r\n-*\/\r\n-class VmaJsonWriter\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaJsonWriter)\r\n-public:\r\n- \/\/ sb - string builder to write the document to. Must remain alive for the whole lifetime of this object.\r\n- VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb);\r\n- ~VmaJsonWriter();\r\n-\r\n- \/\/ Begins object by writing \"{\".\r\n- \/\/ Inside an object, you must call pairs of WriteString and a value, e.g.:\r\n- \/\/ j.BeginObject(true); j.WriteString(\"A\"); j.WriteNumber(1); j.WriteString(\"B\"); j.WriteNumber(2); j.EndObject();\r\n- \/\/ Will write: { \"A\": 1, \"B\": 2 }\r\n- void BeginObject(bool singleLine = false);\r\n- \/\/ Ends object by writing \"}\".\r\n- void EndObject();\r\n-\r\n- \/\/ Begins array by writing \"[\".\r\n- \/\/ Inside an array, you can write a sequence of any values.\r\n- void BeginArray(bool singleLine = false);\r\n- \/\/ Ends array by writing \"[\".\r\n- void EndArray();\r\n-\r\n- \/\/ Writes a string value inside \"\".\r\n- \/\/ pStr can contain any ANSI characters, including '\"', new line etc. - they will be properly escaped.\r\n- void WriteString(const char* pStr);\r\n- \r\n- \/\/ Begins writing a string value.\r\n- \/\/ Call BeginString, ContinueString, ContinueString, ..., EndString instead of\r\n- \/\/ WriteString to conveniently build the string content incrementally, made of\r\n- \/\/ parts including numbers.\r\n- void BeginString(const char* pStr = VMA_NULL);\r\n- \/\/ Posts next part of an open string.\r\n- void ContinueString(const char* pStr);\r\n- \/\/ Posts next part of an open string. The number is converted to decimal characters.\r\n- void ContinueString(uint32_t n);\r\n- void ContinueString(uint64_t n);\r\n- \/\/ Posts next part of an open string. Pointer value is converted to characters\r\n- \/\/ using \"%p\" formatting - shown as hexadecimal number, e.g.: 000000081276Ad00\r\n- void ContinueString_Pointer(const void* ptr);\r\n- \/\/ Ends writing a string value by writing '\"'.\r\n- void EndString(const char* pStr = VMA_NULL);\r\n-\r\n- \/\/ Writes a number value.\r\n- void WriteNumber(uint32_t n);\r\n- void WriteNumber(uint64_t n);\r\n- \/\/ Writes a boolean value - false or true.\r\n- void WriteBool(bool b);\r\n- \/\/ Writes a null value.\r\n- void WriteNull();\r\n-\r\n-private:\r\n- enum COLLECTION_TYPE\r\n- {\r\n- COLLECTION_TYPE_OBJECT,\r\n- COLLECTION_TYPE_ARRAY,\r\n- };\r\n- struct StackItem\r\n- {\r\n- COLLECTION_TYPE type;\r\n- uint32_t valueCount;\r\n- bool singleLineMode;\r\n- };\r\n-\r\n- static const char* const INDENT;\r\n-\r\n- VmaStringBuilder& m_SB;\r\n- VmaVector< StackItem, VmaStlAllocator<StackItem> > m_Stack;\r\n- bool m_InsideString;\r\n-\r\n- void BeginValue(bool isString);\r\n- void WriteIndent(bool oneLess = false);\r\n-};\r\n-const char* const VmaJsonWriter::INDENT = \" \";\r\n-\r\n-#ifndef _VMA_JSON_WRITER_FUNCTIONS\r\n-VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb)\r\n- : m_SB(sb),\r\n- m_Stack(VmaStlAllocator<StackItem>(pAllocationCallbacks)),\r\n- m_InsideString(false) {}\r\n-\r\n-VmaJsonWriter::~VmaJsonWriter()\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n- VMA_ASSERT(m_Stack.empty());\r\n-}\r\n-\r\n-void VmaJsonWriter::BeginObject(bool singleLine)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n-\r\n- BeginValue(false);\r\n- m_SB.Add('{');\r\n-\r\n- StackItem item;\r\n- item.type = COLLECTION_TYPE_OBJECT;\r\n- item.valueCount = 0;\r\n- item.singleLineMode = singleLine;\r\n- m_Stack.push_back(item);\r\n-}\r\n-\r\n-void VmaJsonWriter::EndObject()\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n-\r\n- WriteIndent(true);\r\n- m_SB.Add('}');\r\n-\r\n- VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT);\r\n- m_Stack.pop_back();\r\n-}\r\n-\r\n-void VmaJsonWriter::BeginArray(bool singleLine)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n-\r\n- BeginValue(false);\r\n- m_SB.Add('[');\r\n-\r\n- StackItem item;\r\n- item.type = COLLECTION_TYPE_ARRAY;\r\n- item.valueCount = 0;\r\n- item.singleLineMode = singleLine;\r\n- m_Stack.push_back(item);\r\n-}\r\n-\r\n-void VmaJsonWriter::EndArray()\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n-\r\n- WriteIndent(true);\r\n- m_SB.Add(']');\r\n-\r\n- VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY);\r\n- m_Stack.pop_back();\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteString(const char* pStr)\r\n-{\r\n- BeginString(pStr);\r\n- EndString();\r\n-}\r\n-\r\n-void VmaJsonWriter::BeginString(const char* pStr)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n-\r\n- BeginValue(true);\r\n- m_SB.Add('\"');\r\n- m_InsideString = true;\r\n- if (pStr != VMA_NULL && pStr[0] != '\\0')\r\n- {\r\n- ContinueString(pStr);\r\n- }\r\n-}\r\n-\r\n-void VmaJsonWriter::ContinueString(const char* pStr)\r\n-{\r\n- VMA_ASSERT(m_InsideString);\r\n-\r\n- const size_t strLen = strlen(pStr);\r\n- for (size_t i = 0; i < strLen; ++i)\r\n- {\r\n- char ch = pStr[i];\r\n- if (ch == '\\\\')\r\n- {\r\n- m_SB.Add(\"\\\\\\\\\");\r\n- }\r\n- else if (ch == '\"')\r\n- {\r\n- m_SB.Add(\"\\\\\\\"\");\r\n- }\r\n- else if (ch >= 32)\r\n- {\r\n- m_SB.Add(ch);\r\n- }\r\n- else switch (ch)\r\n- {\r\n- case '\\b':\r\n- m_SB.Add(\"\\\\b\");\r\n- break;\r\n- case '\\f':\r\n- m_SB.Add(\"\\\\f\");\r\n- break;\r\n- case '\\n':\r\n- m_SB.Add(\"\\\\n\");\r\n- break;\r\n- case '\\r':\r\n- m_SB.Add(\"\\\\r\");\r\n- break;\r\n- case '\\t':\r\n- m_SB.Add(\"\\\\t\");\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0 && \"Character not currently supported.\");\r\n- break;\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaJsonWriter::ContinueString(uint32_t n)\r\n-{\r\n- VMA_ASSERT(m_InsideString);\r\n- m_SB.AddNumber(n);\r\n-}\r\n-\r\n-void VmaJsonWriter::ContinueString(uint64_t n)\r\n-{\r\n- VMA_ASSERT(m_InsideString);\r\n- m_SB.AddNumber(n);\r\n-}\r\n-\r\n-void VmaJsonWriter::ContinueString_Pointer(const void* ptr)\r\n-{\r\n- VMA_ASSERT(m_InsideString);\r\n- m_SB.AddPointer(ptr);\r\n-}\r\n-\r\n-void VmaJsonWriter::EndString(const char* pStr)\r\n-{\r\n- VMA_ASSERT(m_InsideString);\r\n- if (pStr != VMA_NULL && pStr[0] != '\\0')\r\n- {\r\n- ContinueString(pStr);\r\n- }\r\n- m_SB.Add('\"');\r\n- m_InsideString = false;\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteNumber(uint32_t n)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n- BeginValue(false);\r\n- m_SB.AddNumber(n);\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteNumber(uint64_t n)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n- BeginValue(false);\r\n- m_SB.AddNumber(n);\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteBool(bool b)\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n- BeginValue(false);\r\n- m_SB.Add(b ? \"true\" : \"false\");\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteNull()\r\n-{\r\n- VMA_ASSERT(!m_InsideString);\r\n- BeginValue(false);\r\n- m_SB.Add(\"null\");\r\n-}\r\n-\r\n-void VmaJsonWriter::BeginValue(bool isString)\r\n-{\r\n- if (!m_Stack.empty())\r\n- {\r\n- StackItem& currItem = m_Stack.back();\r\n- if (currItem.type == COLLECTION_TYPE_OBJECT &&\r\n- currItem.valueCount % 2 == 0)\r\n- {\r\n- VMA_ASSERT(isString);\r\n- }\r\n-\r\n- if (currItem.type == COLLECTION_TYPE_OBJECT &&\r\n- currItem.valueCount % 2 != 0)\r\n- {\r\n- m_SB.Add(\": \");\r\n- }\r\n- else if (currItem.valueCount > 0)\r\n- {\r\n- m_SB.Add(\", \");\r\n- WriteIndent();\r\n- }\r\n- else\r\n- {\r\n- WriteIndent();\r\n- }\r\n- ++currItem.valueCount;\r\n- }\r\n-}\r\n-\r\n-void VmaJsonWriter::WriteIndent(bool oneLess)\r\n-{\r\n- if (!m_Stack.empty() && !m_Stack.back().singleLineMode)\r\n- {\r\n- m_SB.AddNewLine();\r\n-\r\n- size_t count = m_Stack.size();\r\n- if (count > 0 && oneLess)\r\n- {\r\n- --count;\r\n- }\r\n- for (size_t i = 0; i < count; ++i)\r\n- {\r\n- m_SB.Add(INDENT);\r\n- }\r\n- }\r\n-}\r\n-#endif \/\/ _VMA_JSON_WRITER_FUNCTIONS\r\n-\r\n-static void VmaPrintDetailedStatistics(VmaJsonWriter& json, const VmaDetailedStatistics& stat)\r\n-{\r\n- json.BeginObject();\r\n-\r\n- json.WriteString(\"BlockCount\");\r\n- json.WriteNumber(stat.statistics.blockCount);\r\n-\r\n- json.WriteString(\"AllocationCount\");\r\n- json.WriteNumber(stat.statistics.allocationCount);\r\n-\r\n- json.WriteString(\"UnusedRangeCount\");\r\n- json.WriteNumber(stat.unusedRangeCount);\r\n-\r\n- json.WriteString(\"BlockBytes\");\r\n- json.WriteNumber(stat.statistics.blockBytes);\r\n-\r\n- json.WriteString(\"AllocationBytes\");\r\n- json.WriteNumber(stat.statistics.allocationBytes);\r\n-\r\n- if (stat.statistics.allocationCount > 1)\r\n- {\r\n- json.WriteString(\"AllocationSize\");\r\n- json.BeginObject(true);\r\n- json.WriteString(\"Min\");\r\n- json.WriteNumber(stat.allocationSizeMin);\r\n- json.WriteString(\"Max\");\r\n- json.WriteNumber(stat.allocationSizeMax);\r\n- json.EndObject();\r\n- }\r\n-\r\n- if (stat.unusedRangeCount > 1)\r\n- {\r\n- json.WriteString(\"UnusedRangeSize\");\r\n- json.BeginObject(true);\r\n- json.WriteString(\"Min\");\r\n- json.WriteNumber(stat.unusedRangeSizeMin);\r\n- json.WriteString(\"Max\");\r\n- json.WriteNumber(stat.unusedRangeSizeMax);\r\n- json.EndObject();\r\n- }\r\n-\r\n- json.EndObject();\r\n-}\r\n-#endif \/\/ _VMA_JSON_WRITER\r\n-\r\n-#ifndef _VMA_MAPPING_HYSTERESIS\r\n-\r\n-class VmaMappingHysteresis\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaMappingHysteresis)\r\n-public:\r\n- VmaMappingHysteresis() = default;\r\n-\r\n- uint32_t GetExtraMapping() const { return m_ExtraMapping; }\r\n-\r\n- \/\/ Call when Map was called.\r\n- \/\/ Returns true if switched to extra +1 mapping reference count.\r\n- bool PostMap()\r\n- {\r\n-#if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- if(m_ExtraMapping == 0)\r\n- {\r\n- ++m_MajorCounter;\r\n- if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING)\r\n- {\r\n- m_ExtraMapping = 1;\r\n- m_MajorCounter = 0;\r\n- m_MinorCounter = 0;\r\n- return true;\r\n- }\r\n- }\r\n- else \/\/ m_ExtraMapping == 1\r\n- PostMinorCounter();\r\n-#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- return false;\r\n- }\r\n-\r\n- \/\/ Call when Unmap was called.\r\n- void PostUnmap()\r\n- {\r\n-#if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- if(m_ExtraMapping == 0)\r\n- ++m_MajorCounter;\r\n- else \/\/ m_ExtraMapping == 1\r\n- PostMinorCounter();\r\n-#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- }\r\n-\r\n- \/\/ Call when allocation was made from the memory block.\r\n- void PostAlloc()\r\n- {\r\n-#if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- if(m_ExtraMapping == 1)\r\n- ++m_MajorCounter;\r\n- else \/\/ m_ExtraMapping == 0\r\n- PostMinorCounter();\r\n-#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- }\r\n-\r\n- \/\/ Call when allocation was freed from the memory block.\r\n- \/\/ Returns true if switched to extra -1 mapping reference count.\r\n- bool PostFree()\r\n- {\r\n-#if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- if(m_ExtraMapping == 1)\r\n- {\r\n- ++m_MajorCounter;\r\n- if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING &&\r\n- m_MajorCounter > m_MinorCounter + 1)\r\n- {\r\n- m_ExtraMapping = 0;\r\n- m_MajorCounter = 0;\r\n- m_MinorCounter = 0;\r\n- return true;\r\n- }\r\n- }\r\n- else \/\/ m_ExtraMapping == 0\r\n- PostMinorCounter();\r\n-#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\r\n- return false;\r\n- }\r\n-\r\n-private:\r\n- static const int32_t COUNTER_MIN_EXTRA_MAPPING = 7;\r\n-\r\n- uint32_t m_MinorCounter = 0;\r\n- uint32_t m_MajorCounter = 0;\r\n- uint32_t m_ExtraMapping = 0; \/\/ 0 or 1.\r\n-\r\n- void PostMinorCounter()\r\n- {\r\n- if(m_MinorCounter < m_MajorCounter)\r\n- ++m_MinorCounter;\r\n- else if(m_MajorCounter > 0)\r\n- --m_MajorCounter, --m_MinorCounter;\r\n- }\r\n-};\r\n-\r\n-#endif \/\/ _VMA_MAPPING_HYSTERESIS\r\n-\r\n-#ifndef _VMA_DEVICE_MEMORY_BLOCK\r\n-\/*\r\n-Represents a single block of device memory (`VkDeviceMemory`) with all the\r\n-data about its regions (aka suballocations, #VmaAllocation), assigned and free.\r\n-\r\n-Thread-safety:\r\n-- Access to m_pMetadata must be externally synchronized.\r\n-- Map, Unmap, Bind* are synchronized internally.\r\n-*\/\r\n-class VmaDeviceMemoryBlock\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock)\r\n-public:\r\n- VmaBlockMetadata* m_pMetadata;\r\n-\r\n- VmaDeviceMemoryBlock(VmaAllocator hAllocator);\r\n- ~VmaDeviceMemoryBlock();\r\n-\r\n- \/\/ Always call after construction.\r\n- void Init(\r\n- VmaAllocator hAllocator,\r\n- VmaPool hParentPool,\r\n- uint32_t newMemoryTypeIndex,\r\n- VkDeviceMemory newMemory,\r\n- VkDeviceSize newSize,\r\n- uint32_t id,\r\n- uint32_t algorithm,\r\n- VkDeviceSize bufferImageGranularity);\r\n- \/\/ Always call before destruction.\r\n- void Destroy(VmaAllocator allocator);\r\n-\r\n- VmaPool GetParentPool() const { return m_hParentPool; }\r\n- VkDeviceMemory GetDeviceMemory() const { return m_hMemory; }\r\n- uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\r\n- uint32_t GetId() const { return m_Id; }\r\n- void* GetMappedData() const { return m_pMappedData; }\r\n- uint32_t GetMapRefCount() const { return m_MapCount; }\r\n-\r\n- \/\/ Call when allocation\/free was made from m_pMetadata.\r\n- \/\/ Used for m_MappingHysteresis.\r\n- void PostAlloc() { m_MappingHysteresis.PostAlloc(); }\r\n- void PostFree(VmaAllocator hAllocator);\r\n-\r\n- \/\/ Validates all data structures inside this object. If not valid, returns false.\r\n- bool Validate() const;\r\n- VkResult CheckCorruption(VmaAllocator hAllocator);\r\n-\r\n- \/\/ ppData can be null.\r\n- VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData);\r\n- void Unmap(VmaAllocator hAllocator, uint32_t count);\r\n-\r\n- VkResult WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);\r\n- VkResult ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);\r\n-\r\n- VkResult BindBufferMemory(\r\n- const VmaAllocator hAllocator,\r\n- const VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer hBuffer,\r\n- const void* pNext);\r\n- VkResult BindImageMemory(\r\n- const VmaAllocator hAllocator,\r\n- const VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage hImage,\r\n- const void* pNext);\r\n-\r\n-private:\r\n- VmaPool m_hParentPool; \/\/ VK_NULL_HANDLE if not belongs to custom pool.\r\n- uint32_t m_MemoryTypeIndex;\r\n- uint32_t m_Id;\r\n- VkDeviceMemory m_hMemory;\r\n-\r\n- \/*\r\n- Protects access to m_hMemory so it is not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory.\r\n- Also protects m_MapCount, m_pMappedData.\r\n- Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex.\r\n- *\/\r\n- VMA_MUTEX m_MapAndBindMutex;\r\n- VmaMappingHysteresis m_MappingHysteresis;\r\n- uint32_t m_MapCount;\r\n- void* m_pMappedData;\r\n-};\r\n-#endif \/\/ _VMA_DEVICE_MEMORY_BLOCK\r\n-\r\n-#ifndef _VMA_ALLOCATION_T\r\n-struct VmaAllocation_T\r\n-{\r\n- friend struct VmaDedicatedAllocationListItemTraits;\r\n-\r\n- enum FLAGS\r\n- {\r\n- FLAG_PERSISTENT_MAP = 0x01,\r\n- FLAG_MAPPING_ALLOWED = 0x02,\r\n- };\r\n-\r\n-public:\r\n- enum ALLOCATION_TYPE\r\n- {\r\n- ALLOCATION_TYPE_NONE,\r\n- ALLOCATION_TYPE_BLOCK,\r\n- ALLOCATION_TYPE_DEDICATED,\r\n- };\r\n-\r\n- \/\/ This struct is allocated using VmaPoolAllocator.\r\n- VmaAllocation_T(bool mappingAllowed);\r\n- ~VmaAllocation_T();\r\n-\r\n- void InitBlockAllocation(\r\n- VmaDeviceMemoryBlock* block,\r\n- VmaAllocHandle allocHandle,\r\n- VkDeviceSize alignment,\r\n- VkDeviceSize size,\r\n- uint32_t memoryTypeIndex,\r\n- VmaSuballocationType suballocationType,\r\n- bool mapped);\r\n- \/\/ pMappedData not null means allocation is created with MAPPED flag.\r\n- void InitDedicatedAllocation(\r\n- VmaPool hParentPool,\r\n- uint32_t memoryTypeIndex,\r\n- VkDeviceMemory hMemory,\r\n- VmaSuballocationType suballocationType,\r\n- void* pMappedData,\r\n- VkDeviceSize size);\r\n-\r\n- ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; }\r\n- VkDeviceSize GetAlignment() const { return m_Alignment; }\r\n- VkDeviceSize GetSize() const { return m_Size; }\r\n- void* GetUserData() const { return m_pUserData; }\r\n- const char* GetName() const { return m_pName; }\r\n- VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; }\r\n-\r\n- VmaDeviceMemoryBlock* GetBlock() const { VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); return m_BlockAllocation.m_Block; }\r\n- uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\r\n- bool IsPersistentMap() const { return (m_Flags & FLAG_PERSISTENT_MAP) != 0; }\r\n- bool IsMappingAllowed() const { return (m_Flags & FLAG_MAPPING_ALLOWED) != 0; }\r\n-\r\n- void SetUserData(VmaAllocator hAllocator, void* pUserData) { m_pUserData = pUserData; }\r\n- void SetName(VmaAllocator hAllocator, const char* pName);\r\n- void FreeName(VmaAllocator hAllocator);\r\n- uint8_t SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation);\r\n- VmaAllocHandle GetAllocHandle() const;\r\n- VkDeviceSize GetOffset() const;\r\n- VmaPool GetParentPool() const;\r\n- VkDeviceMemory GetMemory() const;\r\n- void* GetMappedData() const;\r\n-\r\n- void BlockAllocMap();\r\n- void BlockAllocUnmap();\r\n- VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData);\r\n- void DedicatedAllocUnmap(VmaAllocator hAllocator);\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; }\r\n-\r\n- void InitBufferImageUsage(uint32_t bufferImageUsage);\r\n- void PrintParameters(class VmaJsonWriter& json) const;\r\n-#endif\r\n-\r\n-private:\r\n- \/\/ Allocation out of VmaDeviceMemoryBlock.\r\n- struct BlockAllocation\r\n- {\r\n- VmaDeviceMemoryBlock* m_Block;\r\n- VmaAllocHandle m_AllocHandle;\r\n- };\r\n- \/\/ Allocation for an object that has its own private VkDeviceMemory.\r\n- struct DedicatedAllocation\r\n- {\r\n- VmaPool m_hParentPool; \/\/ VK_NULL_HANDLE if not belongs to custom pool.\r\n- VkDeviceMemory m_hMemory;\r\n- void* m_pMappedData; \/\/ Not null means memory is mapped.\r\n- VmaAllocation_T* m_Prev;\r\n- VmaAllocation_T* m_Next;\r\n- };\r\n- union\r\n- {\r\n- \/\/ Allocation out of VmaDeviceMemoryBlock.\r\n- BlockAllocation m_BlockAllocation;\r\n- \/\/ Allocation for an object that has its own private VkDeviceMemory.\r\n- DedicatedAllocation m_DedicatedAllocation;\r\n- };\r\n-\r\n- VkDeviceSize m_Alignment;\r\n- VkDeviceSize m_Size;\r\n- void* m_pUserData;\r\n- char* m_pName;\r\n- uint32_t m_MemoryTypeIndex;\r\n- uint8_t m_Type; \/\/ ALLOCATION_TYPE\r\n- uint8_t m_SuballocationType; \/\/ VmaSuballocationType\r\n- \/\/ Reference counter for vmaMapMemory()\/vmaUnmapMemory().\r\n- uint8_t m_MapCount;\r\n- uint8_t m_Flags; \/\/ enum FLAGS\r\n-#if VMA_STATS_STRING_ENABLED\r\n- uint32_t m_BufferImageUsage; \/\/ 0 if unknown.\r\n-#endif\r\n-};\r\n-#endif \/\/ _VMA_ALLOCATION_T\r\n-\r\n-#ifndef _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS\r\n-struct VmaDedicatedAllocationListItemTraits\r\n-{\r\n- typedef VmaAllocation_T ItemType;\r\n-\r\n- static ItemType* GetPrev(const ItemType* item)\r\n- {\r\n- VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\r\n- return item->m_DedicatedAllocation.m_Prev;\r\n- }\r\n- static ItemType* GetNext(const ItemType* item)\r\n- {\r\n- VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\r\n- return item->m_DedicatedAllocation.m_Next;\r\n- }\r\n- static ItemType*& AccessPrev(ItemType* item)\r\n- {\r\n- VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\r\n- return item->m_DedicatedAllocation.m_Prev;\r\n- }\r\n- static ItemType*& AccessNext(ItemType* item)\r\n- {\r\n- VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\r\n- return item->m_DedicatedAllocation.m_Next;\r\n- }\r\n-};\r\n-#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS\r\n-\r\n-#ifndef _VMA_DEDICATED_ALLOCATION_LIST\r\n-\/*\r\n-Stores linked list of VmaAllocation_T objects.\r\n-Thread-safe, synchronized internally.\r\n-*\/\r\n-class VmaDedicatedAllocationList\r\n-{\r\n-public:\r\n- VmaDedicatedAllocationList() {}\r\n- ~VmaDedicatedAllocationList();\r\n-\r\n- void Init(bool useMutex) { m_UseMutex = useMutex; }\r\n- bool Validate();\r\n-\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats);\r\n- void AddStatistics(VmaStatistics& inoutStats);\r\n-#if VMA_STATS_STRING_ENABLED\r\n- \/\/ Writes JSON array with the list of allocations.\r\n- void BuildStatsString(VmaJsonWriter& json);\r\n-#endif\r\n-\r\n- bool IsEmpty();\r\n- void Register(VmaAllocation alloc);\r\n- void Unregister(VmaAllocation alloc);\r\n-\r\n-private:\r\n- typedef VmaIntrusiveLinkedList<VmaDedicatedAllocationListItemTraits> DedicatedAllocationLinkedList;\r\n-\r\n- bool m_UseMutex = true;\r\n- VMA_RW_MUTEX m_Mutex;\r\n- DedicatedAllocationLinkedList m_AllocationList;\r\n-};\r\n-\r\n-#ifndef _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS\r\n-\r\n-VmaDedicatedAllocationList::~VmaDedicatedAllocationList()\r\n-{\r\n- VMA_HEAVY_ASSERT(Validate());\r\n-\r\n- if (!m_AllocationList.IsEmpty())\r\n- {\r\n- VMA_ASSERT(false && \"Unfreed dedicated allocations found!\");\r\n- }\r\n-}\r\n-\r\n-bool VmaDedicatedAllocationList::Validate()\r\n-{\r\n- const size_t declaredCount = m_AllocationList.GetCount();\r\n- size_t actualCount = 0;\r\n- VmaMutexLockRead lock(m_Mutex, m_UseMutex);\r\n- for (VmaAllocation alloc = m_AllocationList.Front();\r\n- alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc))\r\n- {\r\n- ++actualCount;\r\n- }\r\n- VMA_VALIDATE(actualCount == declaredCount);\r\n-\r\n- return true;\r\n-}\r\n-\r\n-void VmaDedicatedAllocationList::AddDetailedStatistics(VmaDetailedStatistics& inoutStats)\r\n-{\r\n- for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item))\r\n- {\r\n- const VkDeviceSize size = item->GetSize();\r\n- inoutStats.statistics.blockCount++;\r\n- inoutStats.statistics.blockBytes += size;\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, item->GetSize());\r\n- }\r\n-}\r\n-\r\n-void VmaDedicatedAllocationList::AddStatistics(VmaStatistics& inoutStats)\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_UseMutex);\r\n-\r\n- const uint32_t allocCount = (uint32_t)m_AllocationList.GetCount();\r\n- inoutStats.blockCount += allocCount;\r\n- inoutStats.allocationCount += allocCount;\r\n-\r\n- for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item))\r\n- {\r\n- const VkDeviceSize size = item->GetSize();\r\n- inoutStats.blockBytes += size;\r\n- inoutStats.allocationBytes += size;\r\n- }\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaDedicatedAllocationList::BuildStatsString(VmaJsonWriter& json)\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_UseMutex);\r\n- json.BeginArray();\r\n- for (VmaAllocation alloc = m_AllocationList.Front();\r\n- alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc))\r\n- {\r\n- json.BeginObject(true);\r\n- alloc->PrintParameters(json);\r\n- json.EndObject();\r\n- }\r\n- json.EndArray();\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-bool VmaDedicatedAllocationList::IsEmpty()\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_UseMutex);\r\n- return m_AllocationList.IsEmpty();\r\n-}\r\n-\r\n-void VmaDedicatedAllocationList::Register(VmaAllocation alloc)\r\n-{\r\n- VmaMutexLockWrite lock(m_Mutex, m_UseMutex);\r\n- m_AllocationList.PushBack(alloc);\r\n-}\r\n-\r\n-void VmaDedicatedAllocationList::Unregister(VmaAllocation alloc)\r\n-{\r\n- VmaMutexLockWrite lock(m_Mutex, m_UseMutex);\r\n- m_AllocationList.Remove(alloc);\r\n-}\r\n-#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS\r\n-#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST\r\n-\r\n-#ifndef _VMA_SUBALLOCATION\r\n-\/*\r\n-Represents a region of VmaDeviceMemoryBlock that is either assigned and returned as\r\n-allocated memory block or free.\r\n-*\/\r\n-struct VmaSuballocation\r\n-{\r\n- VkDeviceSize offset;\r\n- VkDeviceSize size;\r\n- void* userData;\r\n- VmaSuballocationType type;\r\n-};\r\n-\r\n-\/\/ Comparator for offsets.\r\n-struct VmaSuballocationOffsetLess\r\n-{\r\n- bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const\r\n- {\r\n- return lhs.offset < rhs.offset;\r\n- }\r\n-};\r\n-\r\n-struct VmaSuballocationOffsetGreater\r\n-{\r\n- bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const\r\n- {\r\n- return lhs.offset > rhs.offset;\r\n- }\r\n-};\r\n-\r\n-struct VmaSuballocationItemSizeLess\r\n-{\r\n- bool operator()(const VmaSuballocationList::iterator lhs,\r\n- const VmaSuballocationList::iterator rhs) const\r\n- {\r\n- return lhs->size < rhs->size;\r\n- }\r\n-\r\n- bool operator()(const VmaSuballocationList::iterator lhs,\r\n- VkDeviceSize rhsSize) const\r\n- {\r\n- return lhs->size < rhsSize;\r\n- }\r\n-};\r\n-#endif \/\/ _VMA_SUBALLOCATION\r\n-\r\n-#ifndef _VMA_ALLOCATION_REQUEST\r\n-\/*\r\n-Parameters of planned allocation inside a VmaDeviceMemoryBlock.\r\n-item points to a FREE suballocation.\r\n-*\/\r\n-struct VmaAllocationRequest\r\n-{\r\n- VmaAllocHandle allocHandle;\r\n- VkDeviceSize size;\r\n- VmaSuballocationList::iterator item;\r\n- void* customData;\r\n- uint64_t algorithmData;\r\n- VmaAllocationRequestType type;\r\n-};\r\n-#endif \/\/ _VMA_ALLOCATION_REQUEST\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA\r\n-\/*\r\n-Data structure used for bookkeeping of allocations and unused ranges of memory\r\n-in a single VkDeviceMemory block.\r\n-*\/\r\n-class VmaBlockMetadata\r\n-{\r\n-public:\r\n- \/\/ pAllocationCallbacks, if not null, must be owned externally - alive and unchanged for the whole lifetime of this object.\r\n- VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual);\r\n- virtual ~VmaBlockMetadata() = default;\r\n-\r\n- virtual void Init(VkDeviceSize size) { m_Size = size; }\r\n- bool IsVirtual() const { return m_IsVirtual; }\r\n- VkDeviceSize GetSize() const { return m_Size; }\r\n-\r\n- \/\/ Validates all data structures inside this object. If not valid, returns false.\r\n- virtual bool Validate() const = 0;\r\n- virtual size_t GetAllocationCount() const = 0;\r\n- virtual size_t GetFreeRegionsCount() const = 0;\r\n- virtual VkDeviceSize GetSumFreeSize() const = 0;\r\n- \/\/ Returns true if this block is empty - contains only single free suballocation.\r\n- virtual bool IsEmpty() const = 0;\r\n- virtual void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) = 0;\r\n- virtual VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const = 0;\r\n- virtual void* GetAllocationUserData(VmaAllocHandle allocHandle) const = 0;\r\n-\r\n- virtual VmaAllocHandle GetAllocationListBegin() const = 0;\r\n- virtual VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const = 0;\r\n- virtual VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const = 0;\r\n-\r\n- \/\/ Shouldn't modify blockCount.\r\n- virtual void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const = 0;\r\n- virtual void AddStatistics(VmaStatistics& inoutStats) const = 0;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- \/\/ mapRefCount == UINT32_MAX means unspecified.\r\n- virtual void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const = 0;\r\n-#endif\r\n-\r\n- \/\/ Tries to find a place for suballocation with given parameters inside this block.\r\n- \/\/ If succeeded, fills pAllocationRequest and returns true.\r\n- \/\/ If failed, returns false.\r\n- virtual bool CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- \/\/ Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags.\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest) = 0;\r\n-\r\n- virtual VkResult CheckCorruption(const void* pBlockData) = 0;\r\n-\r\n- \/\/ Makes actual allocation based on request. Request must already be checked and valid.\r\n- virtual void Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData) = 0;\r\n-\r\n- \/\/ Frees suballocation assigned to given memory region.\r\n- virtual void Free(VmaAllocHandle allocHandle) = 0;\r\n-\r\n- \/\/ Frees all allocations.\r\n- \/\/ Careful! Don't call it if there are VmaAllocation objects owned by userData of cleared allocations!\r\n- virtual void Clear() = 0;\r\n-\r\n- virtual void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) = 0;\r\n- virtual void DebugLogAllAllocations() const = 0;\r\n-\r\n-protected:\r\n- const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; }\r\n- VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }\r\n- VkDeviceSize GetDebugMargin() const { return IsVirtual() ? 0 : VMA_DEBUG_MARGIN; }\r\n-\r\n- void DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const;\r\n-#if VMA_STATS_STRING_ENABLED\r\n- \/\/ mapRefCount == UINT32_MAX means unspecified.\r\n- void PrintDetailedMap_Begin(class VmaJsonWriter& json,\r\n- VkDeviceSize unusedBytes,\r\n- size_t allocationCount,\r\n- size_t unusedRangeCount,\r\n- uint32_t mapRefCount) const;\r\n- void PrintDetailedMap_Allocation(class VmaJsonWriter& json,\r\n- VkDeviceSize offset, VkDeviceSize size, void* userData) const;\r\n- void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,\r\n- VkDeviceSize offset,\r\n- VkDeviceSize size) const;\r\n- void PrintDetailedMap_End(class VmaJsonWriter& json) const;\r\n-#endif\r\n-\r\n-private:\r\n- VkDeviceSize m_Size;\r\n- const VkAllocationCallbacks* m_pAllocationCallbacks;\r\n- const VkDeviceSize m_BufferImageGranularity;\r\n- const bool m_IsVirtual;\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_FUNCTIONS\r\n-VmaBlockMetadata::VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual)\r\n- : m_Size(0),\r\n- m_pAllocationCallbacks(pAllocationCallbacks),\r\n- m_BufferImageGranularity(bufferImageGranularity),\r\n- m_IsVirtual(isVirtual) {}\r\n-\r\n-void VmaBlockMetadata::DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const\r\n-{\r\n- if (IsVirtual())\r\n- {\r\n- VMA_DEBUG_LOG(\"UNFREED VIRTUAL ALLOCATION; Offset: %llu; Size: %llu; UserData: %p\", offset, size, userData);\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(userData != VMA_NULL);\r\n- VmaAllocation allocation = reinterpret_cast<VmaAllocation>(userData);\r\n-\r\n- userData = allocation->GetUserData();\r\n- const char* name = allocation->GetName();\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- VMA_DEBUG_LOG(\"UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %s; Usage: %u\",\r\n- offset, size, userData, name ? name : \"vma_empty\",\r\n- VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()],\r\n- allocation->GetBufferImageUsage());\r\n-#else\r\n- VMA_DEBUG_LOG(\"UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %u\",\r\n- offset, size, userData, name ? name : \"vma_empty\",\r\n- (uint32_t)allocation->GetSuballocationType());\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n- }\r\n- \r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json,\r\n- VkDeviceSize unusedBytes, size_t allocationCount, size_t unusedRangeCount, uint32_t mapRefCount) const\r\n-{\r\n- json.BeginObject();\r\n-\r\n- json.WriteString(\"TotalBytes\");\r\n- json.WriteNumber(GetSize());\r\n-\r\n- json.WriteString(\"UnusedBytes\");\r\n- json.WriteNumber(unusedBytes);\r\n-\r\n- json.WriteString(\"Allocations\");\r\n- json.WriteNumber((uint64_t)allocationCount);\r\n-\r\n- json.WriteString(\"UnusedRanges\");\r\n- json.WriteNumber((uint64_t)unusedRangeCount);\r\n-\r\n- if(mapRefCount != UINT32_MAX)\r\n- {\r\n- json.WriteString(\"MapRefCount\");\r\n- json.WriteNumber(mapRefCount);\r\n- }\r\n-\r\n- json.WriteString(\"Suballocations\");\r\n- json.BeginArray();\r\n-}\r\n-\r\n-void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json,\r\n- VkDeviceSize offset, VkDeviceSize size, void* userData) const\r\n-{\r\n- json.BeginObject(true);\r\n-\r\n- json.WriteString(\"Offset\");\r\n- json.WriteNumber(offset);\r\n-\r\n- if (IsVirtual())\r\n- {\r\n- json.WriteString(\"Type\");\r\n- json.WriteString(\"VirtualAllocation\");\r\n-\r\n- json.WriteString(\"Size\");\r\n- json.WriteNumber(size);\r\n-\r\n- if (userData != VMA_NULL)\r\n- {\r\n- json.WriteString(\"UserData\");\r\n- json.BeginString();\r\n- json.ContinueString_Pointer(userData);\r\n- json.EndString();\r\n- }\r\n- }\r\n- else\r\n- {\r\n- ((VmaAllocation)userData)->PrintParameters(json);\r\n- }\r\n-\r\n- json.EndObject();\r\n-}\r\n-\r\n-void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,\r\n- VkDeviceSize offset, VkDeviceSize size) const\r\n-{\r\n- json.BeginObject(true);\r\n-\r\n- json.WriteString(\"Offset\");\r\n- json.WriteNumber(offset);\r\n-\r\n- json.WriteString(\"Type\");\r\n- json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]);\r\n-\r\n- json.WriteString(\"Size\");\r\n- json.WriteNumber(size);\r\n-\r\n- json.EndObject();\r\n-}\r\n-\r\n-void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const\r\n-{\r\n- json.EndArray();\r\n- json.EndObject();\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-#endif \/\/ _VMA_BLOCK_METADATA_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_METADATA\r\n-\r\n-#ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY\r\n-\/\/ Before deleting object of this class remember to call 'Destroy()'\r\n-class VmaBlockBufferImageGranularity final\r\n-{\r\n-public:\r\n- struct ValidationContext\r\n- {\r\n- const VkAllocationCallbacks* allocCallbacks;\r\n- uint16_t* pageAllocs;\r\n- };\r\n-\r\n- VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity);\r\n- ~VmaBlockBufferImageGranularity();\r\n-\r\n- bool IsEnabled() const { return m_BufferImageGranularity > MAX_LOW_BUFFER_IMAGE_GRANULARITY; }\r\n-\r\n- void Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size);\r\n- \/\/ Before destroying object you must call free it's memory\r\n- void Destroy(const VkAllocationCallbacks* pAllocationCallbacks);\r\n-\r\n- void RoundupAllocRequest(VmaSuballocationType allocType,\r\n- VkDeviceSize& inOutAllocSize,\r\n- VkDeviceSize& inOutAllocAlignment) const;\r\n-\r\n- bool CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset,\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize blockOffset,\r\n- VkDeviceSize blockSize,\r\n- VmaSuballocationType allocType) const;\r\n-\r\n- void AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size);\r\n- void FreePages(VkDeviceSize offset, VkDeviceSize size);\r\n- void Clear();\r\n-\r\n- ValidationContext StartValidation(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- bool isVirutal) const;\r\n- bool Validate(ValidationContext& ctx, VkDeviceSize offset, VkDeviceSize size) const;\r\n- bool FinishValidation(ValidationContext& ctx) const;\r\n-\r\n-private:\r\n- static const uint16_t MAX_LOW_BUFFER_IMAGE_GRANULARITY = 256;\r\n-\r\n- struct RegionInfo\r\n- {\r\n- uint8_t allocType;\r\n- uint16_t allocCount;\r\n- };\r\n-\r\n- VkDeviceSize m_BufferImageGranularity;\r\n- uint32_t m_RegionCount;\r\n- RegionInfo* m_RegionInfo;\r\n-\r\n- uint32_t GetStartPage(VkDeviceSize offset) const { return OffsetToPageIndex(offset & ~(m_BufferImageGranularity - 1)); }\r\n- uint32_t GetEndPage(VkDeviceSize offset, VkDeviceSize size) const { return OffsetToPageIndex((offset + size - 1) & ~(m_BufferImageGranularity - 1)); }\r\n-\r\n- uint32_t OffsetToPageIndex(VkDeviceSize offset) const;\r\n- void AllocPage(RegionInfo& page, uint8_t allocType);\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS\r\n-VmaBlockBufferImageGranularity::VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity)\r\n- : m_BufferImageGranularity(bufferImageGranularity),\r\n- m_RegionCount(0),\r\n- m_RegionInfo(VMA_NULL) {}\r\n-\r\n-VmaBlockBufferImageGranularity::~VmaBlockBufferImageGranularity()\r\n-{\r\n- VMA_ASSERT(m_RegionInfo == VMA_NULL && \"Free not called before destroying object!\");\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size)\r\n-{\r\n- if (IsEnabled())\r\n- {\r\n- m_RegionCount = static_cast<uint32_t>(VmaDivideRoundingUp(size, m_BufferImageGranularity));\r\n- m_RegionInfo = vma_new_array(pAllocationCallbacks, RegionInfo, m_RegionCount);\r\n- memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo));\r\n- }\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::Destroy(const VkAllocationCallbacks* pAllocationCallbacks)\r\n-{\r\n- if (m_RegionInfo)\r\n- {\r\n- vma_delete_array(pAllocationCallbacks, m_RegionInfo, m_RegionCount);\r\n- m_RegionInfo = VMA_NULL;\r\n- }\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::RoundupAllocRequest(VmaSuballocationType allocType,\r\n- VkDeviceSize& inOutAllocSize,\r\n- VkDeviceSize& inOutAllocAlignment) const\r\n-{\r\n- if (m_BufferImageGranularity > 1 &&\r\n- m_BufferImageGranularity <= MAX_LOW_BUFFER_IMAGE_GRANULARITY)\r\n- {\r\n- if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||\r\n- allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\r\n- allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)\r\n- {\r\n- inOutAllocAlignment = VMA_MAX(inOutAllocAlignment, m_BufferImageGranularity);\r\n- inOutAllocSize = VmaAlignUp(inOutAllocSize, m_BufferImageGranularity);\r\n- }\r\n- }\r\n-}\r\n-\r\n-bool VmaBlockBufferImageGranularity::CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset,\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize blockOffset,\r\n- VkDeviceSize blockSize,\r\n- VmaSuballocationType allocType) const\r\n-{\r\n- if (IsEnabled())\r\n- {\r\n- uint32_t startPage = GetStartPage(inOutAllocOffset);\r\n- if (m_RegionInfo[startPage].allocCount > 0 &&\r\n- VmaIsBufferImageGranularityConflict(static_cast<VmaSuballocationType>(m_RegionInfo[startPage].allocType), allocType))\r\n- {\r\n- inOutAllocOffset = VmaAlignUp(inOutAllocOffset, m_BufferImageGranularity);\r\n- if (blockSize < allocSize + inOutAllocOffset - blockOffset)\r\n- return true;\r\n- ++startPage;\r\n- }\r\n- uint32_t endPage = GetEndPage(inOutAllocOffset, allocSize);\r\n- if (endPage != startPage &&\r\n- m_RegionInfo[endPage].allocCount > 0 &&\r\n- VmaIsBufferImageGranularityConflict(static_cast<VmaSuballocationType>(m_RegionInfo[endPage].allocType), allocType))\r\n- {\r\n- return true;\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size)\r\n-{\r\n- if (IsEnabled())\r\n- {\r\n- uint32_t startPage = GetStartPage(offset);\r\n- AllocPage(m_RegionInfo[startPage], allocType);\r\n-\r\n- uint32_t endPage = GetEndPage(offset, size);\r\n- if (startPage != endPage)\r\n- AllocPage(m_RegionInfo[endPage], allocType);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::FreePages(VkDeviceSize offset, VkDeviceSize size)\r\n-{\r\n- if (IsEnabled())\r\n- {\r\n- uint32_t startPage = GetStartPage(offset);\r\n- --m_RegionInfo[startPage].allocCount;\r\n- if (m_RegionInfo[startPage].allocCount == 0)\r\n- m_RegionInfo[startPage].allocType = VMA_SUBALLOCATION_TYPE_FREE;\r\n- uint32_t endPage = GetEndPage(offset, size);\r\n- if (startPage != endPage)\r\n- {\r\n- --m_RegionInfo[endPage].allocCount;\r\n- if (m_RegionInfo[endPage].allocCount == 0)\r\n- m_RegionInfo[endPage].allocType = VMA_SUBALLOCATION_TYPE_FREE;\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::Clear()\r\n-{\r\n- if (m_RegionInfo)\r\n- memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo));\r\n-}\r\n-\r\n-VmaBlockBufferImageGranularity::ValidationContext VmaBlockBufferImageGranularity::StartValidation(\r\n- const VkAllocationCallbacks* pAllocationCallbacks, bool isVirutal) const\r\n-{\r\n- ValidationContext ctx{ pAllocationCallbacks, VMA_NULL };\r\n- if (!isVirutal && IsEnabled())\r\n- {\r\n- ctx.pageAllocs = vma_new_array(pAllocationCallbacks, uint16_t, m_RegionCount);\r\n- memset(ctx.pageAllocs, 0, m_RegionCount * sizeof(uint16_t));\r\n- }\r\n- return ctx;\r\n-}\r\n-\r\n-bool VmaBlockBufferImageGranularity::Validate(ValidationContext& ctx,\r\n- VkDeviceSize offset, VkDeviceSize size) const\r\n-{\r\n- if (IsEnabled())\r\n- {\r\n- uint32_t start = GetStartPage(offset);\r\n- ++ctx.pageAllocs[start];\r\n- VMA_VALIDATE(m_RegionInfo[start].allocCount > 0);\r\n-\r\n- uint32_t end = GetEndPage(offset, size);\r\n- if (start != end)\r\n- {\r\n- ++ctx.pageAllocs[end];\r\n- VMA_VALIDATE(m_RegionInfo[end].allocCount > 0);\r\n- }\r\n- }\r\n- return true;\r\n-}\r\n-\r\n-bool VmaBlockBufferImageGranularity::FinishValidation(ValidationContext& ctx) const\r\n-{\r\n- \/\/ Check proper page structure\r\n- if (IsEnabled())\r\n- {\r\n- VMA_ASSERT(ctx.pageAllocs != VMA_NULL && \"Validation context not initialized!\");\r\n-\r\n- for (uint32_t page = 0; page < m_RegionCount; ++page)\r\n- {\r\n- VMA_VALIDATE(ctx.pageAllocs[page] == m_RegionInfo[page].allocCount);\r\n- }\r\n- vma_delete_array(ctx.allocCallbacks, ctx.pageAllocs, m_RegionCount);\r\n- ctx.pageAllocs = VMA_NULL;\r\n- }\r\n- return true;\r\n-}\r\n-\r\n-uint32_t VmaBlockBufferImageGranularity::OffsetToPageIndex(VkDeviceSize offset) const\r\n-{\r\n- return static_cast<uint32_t>(offset >> VMA_BITSCAN_MSB(m_BufferImageGranularity));\r\n-}\r\n-\r\n-void VmaBlockBufferImageGranularity::AllocPage(RegionInfo& page, uint8_t allocType)\r\n-{\r\n- \/\/ When current alloc type is free then it can be overriden by new type\r\n- if (page.allocCount == 0 || (page.allocCount > 0 && page.allocType == VMA_SUBALLOCATION_TYPE_FREE))\r\n- page.allocType = allocType;\r\n-\r\n- ++page.allocCount;\r\n-}\r\n-#endif \/\/ _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY\r\n-\r\n-#if 0\r\n-#ifndef _VMA_BLOCK_METADATA_GENERIC\r\n-class VmaBlockMetadata_Generic : public VmaBlockMetadata\r\n-{\r\n- friend class VmaDefragmentationAlgorithm_Generic;\r\n- friend class VmaDefragmentationAlgorithm_Fast;\r\n- VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic)\r\n-public:\r\n- VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual);\r\n- virtual ~VmaBlockMetadata_Generic() = default;\r\n-\r\n- size_t GetAllocationCount() const override { return m_Suballocations.size() - m_FreeCount; }\r\n- VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }\r\n- bool IsEmpty() const override { return (m_Suballocations.size() == 1) && (m_FreeCount == 1); }\r\n- void Free(VmaAllocHandle allocHandle) override { FreeSuballocation(FindAtOffset((VkDeviceSize)allocHandle - 1)); }\r\n- VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\r\n-\r\n- void Init(VkDeviceSize size) override;\r\n- bool Validate() const override;\r\n-\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\r\n- void AddStatistics(VmaStatistics& inoutStats) const override;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\r\n-#endif\r\n-\r\n- bool CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest) override;\r\n-\r\n- VkResult CheckCorruption(const void* pBlockData) override;\r\n-\r\n- void Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData) override;\r\n-\r\n- void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\r\n- void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\r\n- VmaAllocHandle GetAllocationListBegin() const override;\r\n- VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\r\n- void Clear() override;\r\n- void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\r\n- void DebugLogAllAllocations() const override;\r\n-\r\n-private:\r\n- uint32_t m_FreeCount;\r\n- VkDeviceSize m_SumFreeSize;\r\n- VmaSuballocationList m_Suballocations;\r\n- \/\/ Suballocations that are free. Sorted by size, ascending.\r\n- VmaVector<VmaSuballocationList::iterator, VmaStlAllocator<VmaSuballocationList::iterator>> m_FreeSuballocationsBySize;\r\n-\r\n- VkDeviceSize AlignAllocationSize(VkDeviceSize size) const { return IsVirtual() ? size : VmaAlignUp(size, (VkDeviceSize)16); }\r\n-\r\n- VmaSuballocationList::iterator FindAtOffset(VkDeviceSize offset) const;\r\n- bool ValidateFreeSuballocationList() const;\r\n-\r\n- \/\/ Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem.\r\n- \/\/ If yes, fills pOffset and returns true. If no, returns false.\r\n- bool CheckAllocation(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- VmaSuballocationList::const_iterator suballocItem,\r\n- VmaAllocHandle* pAllocHandle) const;\r\n-\r\n- \/\/ Given free suballocation, it merges it with following one, which must also be free.\r\n- void MergeFreeWithNext(VmaSuballocationList::iterator item);\r\n- \/\/ Releases given suballocation, making it free.\r\n- \/\/ Merges it with adjacent free suballocations if applicable.\r\n- \/\/ Returns iterator to new free suballocation at this place.\r\n- VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem);\r\n- \/\/ Given free suballocation, it inserts it into sorted list of\r\n- \/\/ m_FreeSuballocationsBySize if it is suitable.\r\n- void RegisterFreeSuballocation(VmaSuballocationList::iterator item);\r\n- \/\/ Given free suballocation, it removes it from sorted list of\r\n- \/\/ m_FreeSuballocationsBySize if it is suitable.\r\n- void UnregisterFreeSuballocation(VmaSuballocationList::iterator item);\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS\r\n-VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual)\r\n- : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\r\n- m_FreeCount(0),\r\n- m_SumFreeSize(0),\r\n- m_Suballocations(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n- m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(pAllocationCallbacks)) {}\r\n-\r\n-void VmaBlockMetadata_Generic::Init(VkDeviceSize size)\r\n-{\r\n- VmaBlockMetadata::Init(size);\r\n-\r\n- m_FreeCount = 1;\r\n- m_SumFreeSize = size;\r\n-\r\n- VmaSuballocation suballoc = {};\r\n- suballoc.offset = 0;\r\n- suballoc.size = size;\r\n- suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n-\r\n- m_Suballocations.push_back(suballoc);\r\n- m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Generic::Validate() const\r\n-{\r\n- VMA_VALIDATE(!m_Suballocations.empty());\r\n-\r\n- \/\/ Expected offset of new suballocation as calculated from previous ones.\r\n- VkDeviceSize calculatedOffset = 0;\r\n- \/\/ Expected number of free suballocations as calculated from traversing their list.\r\n- uint32_t calculatedFreeCount = 0;\r\n- \/\/ Expected sum size of free suballocations as calculated from traversing their list.\r\n- VkDeviceSize calculatedSumFreeSize = 0;\r\n- \/\/ Expected number of free suballocations that should be registered in\r\n- \/\/ m_FreeSuballocationsBySize calculated from traversing their list.\r\n- size_t freeSuballocationsToRegister = 0;\r\n- \/\/ True if previous visited suballocation was free.\r\n- bool prevFree = false;\r\n-\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n-\r\n- for (const auto& subAlloc : m_Suballocations)\r\n- {\r\n- \/\/ Actual offset of this suballocation doesn't match expected one.\r\n- VMA_VALIDATE(subAlloc.offset == calculatedOffset);\r\n-\r\n- const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n- \/\/ Two adjacent free suballocations are invalid. They should be merged.\r\n- VMA_VALIDATE(!prevFree || !currFree);\r\n-\r\n- VmaAllocation alloc = (VmaAllocation)subAlloc.userData;\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\r\n- }\r\n-\r\n- if (currFree)\r\n- {\r\n- calculatedSumFreeSize += subAlloc.size;\r\n- ++calculatedFreeCount;\r\n- ++freeSuballocationsToRegister;\r\n-\r\n- \/\/ Margin required between allocations - every free space must be at least that large.\r\n- VMA_VALIDATE(subAlloc.size >= debugMargin);\r\n- }\r\n- else\r\n- {\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == subAlloc.offset + 1);\r\n- VMA_VALIDATE(alloc->GetSize() == subAlloc.size);\r\n- }\r\n-\r\n- \/\/ Margin required between allocations - previous allocation must be free.\r\n- VMA_VALIDATE(debugMargin == 0 || prevFree);\r\n- }\r\n-\r\n- calculatedOffset += subAlloc.size;\r\n- prevFree = currFree;\r\n- }\r\n-\r\n- \/\/ Number of free suballocations registered in m_FreeSuballocationsBySize doesn't\r\n- \/\/ match expected one.\r\n- VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister);\r\n-\r\n- VkDeviceSize lastSize = 0;\r\n- for (size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i)\r\n- {\r\n- VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i];\r\n-\r\n- \/\/ Only free suballocations can be registered in m_FreeSuballocationsBySize.\r\n- VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n- \/\/ They must be sorted by size ascending.\r\n- VMA_VALIDATE(suballocItem->size >= lastSize);\r\n-\r\n- lastSize = suballocItem->size;\r\n- }\r\n-\r\n- \/\/ Check if totals match calculated values.\r\n- VMA_VALIDATE(ValidateFreeSuballocationList());\r\n- VMA_VALIDATE(calculatedOffset == GetSize());\r\n- VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize);\r\n- VMA_VALIDATE(calculatedFreeCount == m_FreeCount);\r\n-\r\n- return true;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\r\n-{\r\n- const uint32_t rangeCount = (uint32_t)m_Suballocations.size();\r\n- inoutStats.statistics.blockCount++;\r\n- inoutStats.statistics.blockBytes += GetSize();\r\n-\r\n- for (const auto& suballoc : m_Suballocations)\r\n- {\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\r\n- else\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, suballoc.size);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::AddStatistics(VmaStatistics& inoutStats) const\r\n-{\r\n- inoutStats.blockCount++;\r\n- inoutStats.allocationCount += (uint32_t)m_Suballocations.size() - m_FreeCount;\r\n- inoutStats.blockBytes += GetSize();\r\n- inoutStats.allocationBytes += GetSize() - m_SumFreeSize;\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\r\n-{\r\n- PrintDetailedMap_Begin(json,\r\n- m_SumFreeSize, \/\/ unusedBytes\r\n- m_Suballocations.size() - (size_t)m_FreeCount, \/\/ allocationCount\r\n- m_FreeCount, \/\/ unusedRangeCount\r\n- mapRefCount);\r\n-\r\n- for (const auto& suballoc : m_Suballocations)\r\n- {\r\n- if (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- PrintDetailedMap_UnusedRange(json, suballoc.offset, suballoc.size);\r\n- }\r\n- else\r\n- {\r\n- PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\r\n- }\r\n- }\r\n-\r\n- PrintDetailedMap_End(json);\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-bool VmaBlockMetadata_Generic::CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- VMA_ASSERT(allocSize > 0);\r\n- VMA_ASSERT(!upperAddress);\r\n- VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_ASSERT(pAllocationRequest != VMA_NULL);\r\n- VMA_HEAVY_ASSERT(Validate());\r\n-\r\n- allocSize = AlignAllocationSize(allocSize);\r\n-\r\n- pAllocationRequest->type = VmaAllocationRequestType::Normal;\r\n- pAllocationRequest->size = allocSize;\r\n-\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n-\r\n- \/\/ There is not enough total free space in this block to fulfill the request: Early return.\r\n- if (m_SumFreeSize < allocSize + debugMargin)\r\n- {\r\n- return false;\r\n- }\r\n-\r\n- \/\/ New algorithm, efficiently searching freeSuballocationsBySize.\r\n- const size_t freeSuballocCount = m_FreeSuballocationsBySize.size();\r\n- if (freeSuballocCount > 0)\r\n- {\r\n- if (strategy == 0 ||\r\n- strategy == VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT)\r\n- {\r\n- \/\/ Find first free suballocation with size not less than allocSize + debugMargin.\r\n- VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(\r\n- m_FreeSuballocationsBySize.data(),\r\n- m_FreeSuballocationsBySize.data() + freeSuballocCount,\r\n- allocSize + debugMargin,\r\n- VmaSuballocationItemSizeLess());\r\n- size_t index = it - m_FreeSuballocationsBySize.data();\r\n- for (; index < freeSuballocCount; ++index)\r\n- {\r\n- if (CheckAllocation(\r\n- allocSize,\r\n- allocAlignment,\r\n- allocType,\r\n- m_FreeSuballocationsBySize[index],\r\n- &pAllocationRequest->allocHandle))\r\n- {\r\n- pAllocationRequest->item = m_FreeSuballocationsBySize[index];\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- else if (strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET)\r\n- {\r\n- for (VmaSuballocationList::iterator it = m_Suballocations.begin();\r\n- it != m_Suballocations.end();\r\n- ++it)\r\n- {\r\n- if (it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation(\r\n- allocSize,\r\n- allocAlignment,\r\n- allocType,\r\n- it,\r\n- &pAllocationRequest->allocHandle))\r\n- {\r\n- pAllocationRequest->item = it;\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(strategy & (VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT | VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT ));\r\n- \/\/ Search staring from biggest suballocations.\r\n- for (size_t index = freeSuballocCount; index--; )\r\n- {\r\n- if (CheckAllocation(\r\n- allocSize,\r\n- allocAlignment,\r\n- allocType,\r\n- m_FreeSuballocationsBySize[index],\r\n- &pAllocationRequest->allocHandle))\r\n- {\r\n- pAllocationRequest->item = m_FreeSuballocationsBySize[index];\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- }\r\n-\r\n- return false;\r\n-}\r\n-\r\n-VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData)\r\n-{\r\n- for (auto& suballoc : m_Suballocations)\r\n- {\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\r\n- {\r\n- VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\r\n- return VK_ERROR_UNKNOWN_COPY;\r\n- }\r\n- }\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData)\r\n-{\r\n- VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);\r\n- VMA_ASSERT(request.item != m_Suballocations.end());\r\n- VmaSuballocation& suballoc = *request.item;\r\n- \/\/ Given suballocation is a free block.\r\n- VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- \/\/ Given offset is inside this suballocation.\r\n- VMA_ASSERT((VkDeviceSize)request.allocHandle - 1 >= suballoc.offset);\r\n- const VkDeviceSize paddingBegin = (VkDeviceSize)request.allocHandle - suballoc.offset - 1;\r\n- VMA_ASSERT(suballoc.size >= paddingBegin + request.size);\r\n- const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - request.size;\r\n-\r\n- \/\/ Unregister this free suballocation from m_FreeSuballocationsBySize and update\r\n- \/\/ it to become used.\r\n- UnregisterFreeSuballocation(request.item);\r\n-\r\n- suballoc.offset = (VkDeviceSize)request.allocHandle - 1;\r\n- suballoc.size = request.size;\r\n- suballoc.type = type;\r\n- suballoc.userData = userData;\r\n-\r\n- \/\/ If there are any free bytes remaining at the end, insert new free suballocation after current one.\r\n- if (paddingEnd)\r\n- {\r\n- VmaSuballocation paddingSuballoc = {};\r\n- paddingSuballoc.offset = suballoc.offset + suballoc.size;\r\n- paddingSuballoc.size = paddingEnd;\r\n- paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- VmaSuballocationList::iterator next = request.item;\r\n- ++next;\r\n- const VmaSuballocationList::iterator paddingEndItem =\r\n- m_Suballocations.insert(next, paddingSuballoc);\r\n- RegisterFreeSuballocation(paddingEndItem);\r\n- }\r\n-\r\n- \/\/ If there are any free bytes remaining at the beginning, insert new free suballocation before current one.\r\n- if (paddingBegin)\r\n- {\r\n- VmaSuballocation paddingSuballoc = {};\r\n- paddingSuballoc.offset = suballoc.offset - paddingBegin;\r\n- paddingSuballoc.size = paddingBegin;\r\n- paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- const VmaSuballocationList::iterator paddingBeginItem =\r\n- m_Suballocations.insert(request.item, paddingSuballoc);\r\n- RegisterFreeSuballocation(paddingBeginItem);\r\n- }\r\n-\r\n- \/\/ Update totals.\r\n- m_FreeCount = m_FreeCount - 1;\r\n- if (paddingBegin > 0)\r\n- {\r\n- ++m_FreeCount;\r\n- }\r\n- if (paddingEnd > 0)\r\n- {\r\n- ++m_FreeCount;\r\n- }\r\n- m_SumFreeSize -= request.size;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\r\n-{\r\n- outInfo.offset = (VkDeviceSize)allocHandle - 1;\r\n- const VmaSuballocation& suballoc = *FindAtOffset(outInfo.offset);\r\n- outInfo.size = suballoc.size;\r\n- outInfo.pUserData = suballoc.userData;\r\n-}\r\n-\r\n-void* VmaBlockMetadata_Generic::GetAllocationUserData(VmaAllocHandle allocHandle) const\r\n-{\r\n- return FindAtOffset((VkDeviceSize)allocHandle - 1)->userData;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Generic::GetAllocationListBegin() const\r\n-{\r\n- if (IsEmpty())\r\n- return VK_NULL_HANDLE;\r\n-\r\n- for (const auto& suballoc : m_Suballocations)\r\n- {\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- return (VmaAllocHandle)(suballoc.offset + 1);\r\n- }\r\n- VMA_ASSERT(false && \"Should contain at least 1 allocation!\");\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Generic::GetNextAllocation(VmaAllocHandle prevAlloc) const\r\n-{\r\n- VmaSuballocationList::const_iterator prev = FindAtOffset((VkDeviceSize)prevAlloc - 1);\r\n-\r\n- for (VmaSuballocationList::const_iterator it = ++prev; it != m_Suballocations.end(); ++it)\r\n- {\r\n- if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- return (VmaAllocHandle)(it->offset + 1);\r\n- }\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::Clear()\r\n-{\r\n- const VkDeviceSize size = GetSize();\r\n-\r\n- VMA_ASSERT(IsVirtual());\r\n- m_FreeCount = 1;\r\n- m_SumFreeSize = size;\r\n- m_Suballocations.clear();\r\n- m_FreeSuballocationsBySize.clear();\r\n-\r\n- VmaSuballocation suballoc = {};\r\n- suballoc.offset = 0;\r\n- suballoc.size = size;\r\n- suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- m_Suballocations.push_back(suballoc);\r\n-\r\n- m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\r\n-{\r\n- VmaSuballocation& suballoc = *FindAtOffset((VkDeviceSize)allocHandle - 1);\r\n- suballoc.userData = userData;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::DebugLogAllAllocations() const\r\n-{\r\n- for (const auto& suballoc : m_Suballocations)\r\n- {\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- DebugLogAllocation(suballoc.offset, suballoc.size, suballoc.userData);\r\n- }\r\n-}\r\n-\r\n-VmaSuballocationList::iterator VmaBlockMetadata_Generic::FindAtOffset(VkDeviceSize offset) const\r\n-{\r\n- VMA_HEAVY_ASSERT(!m_Suballocations.empty());\r\n- const VkDeviceSize last = m_Suballocations.rbegin()->offset;\r\n- if (last == offset)\r\n- return m_Suballocations.rbegin().drop_const();\r\n- const VkDeviceSize first = m_Suballocations.begin()->offset;\r\n- if (first == offset)\r\n- return m_Suballocations.begin().drop_const();\r\n-\r\n- const size_t suballocCount = m_Suballocations.size();\r\n- const VkDeviceSize step = (last - first + m_Suballocations.begin()->size) \/ suballocCount;\r\n- auto findSuballocation = [&](auto begin, auto end) -> VmaSuballocationList::iterator\r\n- {\r\n- for (auto suballocItem = begin;\r\n- suballocItem != end;\r\n- ++suballocItem)\r\n- {\r\n- if (suballocItem->offset == offset)\r\n- return suballocItem.drop_const();\r\n- }\r\n- VMA_ASSERT(false && \"Not found!\");\r\n- return m_Suballocations.end().drop_const();\r\n- };\r\n- \/\/ If requested offset is closer to the end of range, search from the end\r\n- if (offset - first > suballocCount * step \/ 2)\r\n- {\r\n- return findSuballocation(m_Suballocations.rbegin(), m_Suballocations.rend());\r\n- }\r\n- return findSuballocation(m_Suballocations.begin(), m_Suballocations.end());\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const\r\n-{\r\n- VkDeviceSize lastSize = 0;\r\n- for (size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i)\r\n- {\r\n- const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i];\r\n-\r\n- VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_VALIDATE(it->size >= lastSize);\r\n- lastSize = it->size;\r\n- }\r\n- return true;\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Generic::CheckAllocation(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- VmaSuballocationList::const_iterator suballocItem,\r\n- VmaAllocHandle* pAllocHandle) const\r\n-{\r\n- VMA_ASSERT(allocSize > 0);\r\n- VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_ASSERT(suballocItem != m_Suballocations.cend());\r\n- VMA_ASSERT(pAllocHandle != VMA_NULL);\r\n-\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n- const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\r\n-\r\n- const VmaSuballocation& suballoc = *suballocItem;\r\n- VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- \/\/ Size of this suballocation is too small for this request: Early return.\r\n- if (suballoc.size < allocSize)\r\n- {\r\n- return false;\r\n- }\r\n-\r\n- \/\/ Start from offset equal to beginning of this suballocation.\r\n- VkDeviceSize offset = suballoc.offset + (suballocItem == m_Suballocations.cbegin() ? 0 : GetDebugMargin());\r\n-\r\n- \/\/ Apply debugMargin from the end of previous alloc.\r\n- if (debugMargin > 0)\r\n- {\r\n- offset += debugMargin;\r\n- }\r\n-\r\n- \/\/ Apply alignment.\r\n- offset = VmaAlignUp(offset, allocAlignment);\r\n-\r\n- \/\/ Check previous suballocations for BufferImageGranularity conflicts.\r\n- \/\/ Make bigger alignment if necessary.\r\n- if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)\r\n- {\r\n- bool bufferImageGranularityConflict = false;\r\n- VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;\r\n- while (prevSuballocItem != m_Suballocations.cbegin())\r\n- {\r\n- --prevSuballocItem;\r\n- const VmaSuballocation& prevSuballoc = *prevSuballocItem;\r\n- if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, offset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\r\n- {\r\n- bufferImageGranularityConflict = true;\r\n- break;\r\n- }\r\n- }\r\n- else\r\n- \/\/ Already on previous page.\r\n- break;\r\n- }\r\n- if (bufferImageGranularityConflict)\r\n- {\r\n- offset = VmaAlignUp(offset, bufferImageGranularity);\r\n- }\r\n- }\r\n-\r\n- \/\/ Calculate padding at the beginning based on current offset.\r\n- const VkDeviceSize paddingBegin = offset - suballoc.offset;\r\n-\r\n- \/\/ Fail if requested size plus margin after is bigger than size of this suballocation.\r\n- if (paddingBegin + allocSize + debugMargin > suballoc.size)\r\n- {\r\n- return false;\r\n- }\r\n-\r\n- \/\/ Check next suballocations for BufferImageGranularity conflicts.\r\n- \/\/ If conflict exists, allocation cannot be made here.\r\n- if (allocSize % bufferImageGranularity || offset % bufferImageGranularity)\r\n- {\r\n- VmaSuballocationList::const_iterator nextSuballocItem = suballocItem;\r\n- ++nextSuballocItem;\r\n- while (nextSuballocItem != m_Suballocations.cend())\r\n- {\r\n- const VmaSuballocation& nextSuballoc = *nextSuballocItem;\r\n- if (VmaBlocksOnSamePage(offset, allocSize, nextSuballoc.offset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Already on next page.\r\n- break;\r\n- }\r\n- ++nextSuballocItem;\r\n- }\r\n- }\r\n-\r\n- *pAllocHandle = (VmaAllocHandle)(offset + 1);\r\n- \/\/ All tests passed: Success. pAllocHandle is already filled.\r\n- return true;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item)\r\n-{\r\n- VMA_ASSERT(item != m_Suballocations.end());\r\n- VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- VmaSuballocationList::iterator nextItem = item;\r\n- ++nextItem;\r\n- VMA_ASSERT(nextItem != m_Suballocations.end());\r\n- VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- item->size += nextItem->size;\r\n- --m_FreeCount;\r\n- m_Suballocations.erase(nextItem);\r\n-}\r\n-\r\n-VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem)\r\n-{\r\n- \/\/ Change this suballocation to be marked as free.\r\n- VmaSuballocation& suballoc = *suballocItem;\r\n- suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- suballoc.userData = VMA_NULL;\r\n-\r\n- \/\/ Update totals.\r\n- ++m_FreeCount;\r\n- m_SumFreeSize += suballoc.size;\r\n-\r\n- \/\/ Merge with previous and\/or next suballocation if it's also free.\r\n- bool mergeWithNext = false;\r\n- bool mergeWithPrev = false;\r\n-\r\n- VmaSuballocationList::iterator nextItem = suballocItem;\r\n- ++nextItem;\r\n- if ((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE))\r\n- {\r\n- mergeWithNext = true;\r\n- }\r\n-\r\n- VmaSuballocationList::iterator prevItem = suballocItem;\r\n- if (suballocItem != m_Suballocations.begin())\r\n- {\r\n- --prevItem;\r\n- if (prevItem->type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- mergeWithPrev = true;\r\n- }\r\n- }\r\n-\r\n- if (mergeWithNext)\r\n- {\r\n- UnregisterFreeSuballocation(nextItem);\r\n- MergeFreeWithNext(suballocItem);\r\n- }\r\n-\r\n- if (mergeWithPrev)\r\n- {\r\n- UnregisterFreeSuballocation(prevItem);\r\n- MergeFreeWithNext(prevItem);\r\n- RegisterFreeSuballocation(prevItem);\r\n- return prevItem;\r\n- }\r\n- else\r\n- {\r\n- RegisterFreeSuballocation(suballocItem);\r\n- return suballocItem;\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item)\r\n-{\r\n- VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_ASSERT(item->size > 0);\r\n-\r\n- \/\/ You may want to enable this validation at the beginning or at the end of\r\n- \/\/ this function, depending on what do you want to check.\r\n- VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\r\n-\r\n- if (m_FreeSuballocationsBySize.empty())\r\n- {\r\n- m_FreeSuballocationsBySize.push_back(item);\r\n- }\r\n- else\r\n- {\r\n- VmaVectorInsertSorted<VmaSuballocationItemSizeLess>(m_FreeSuballocationsBySize, item);\r\n- }\r\n-\r\n- \/\/VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\r\n-}\r\n-\r\n-void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item)\r\n-{\r\n- VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_ASSERT(item->size > 0);\r\n-\r\n- \/\/ You may want to enable this validation at the beginning or at the end of\r\n- \/\/ this function, depending on what do you want to check.\r\n- VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\r\n-\r\n- VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(\r\n- m_FreeSuballocationsBySize.data(),\r\n- m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(),\r\n- item,\r\n- VmaSuballocationItemSizeLess());\r\n- for (size_t index = it - m_FreeSuballocationsBySize.data();\r\n- index < m_FreeSuballocationsBySize.size();\r\n- ++index)\r\n- {\r\n- if (m_FreeSuballocationsBySize[index] == item)\r\n- {\r\n- VmaVectorRemove(m_FreeSuballocationsBySize, index);\r\n- return;\r\n- }\r\n- VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && \"Not found.\");\r\n- }\r\n- VMA_ASSERT(0 && \"Not found.\");\r\n-\r\n- \/\/VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\r\n-}\r\n-#endif \/\/ _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_METADATA_GENERIC\r\n-#endif \/\/ #if 0\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_LINEAR\r\n-\/*\r\n-Allocations and their references in internal data structure look like this:\r\n-\r\n-if(m_2ndVectorMode == SECOND_VECTOR_EMPTY):\r\n-\r\n- 0 +-------+\r\n- | |\r\n- | |\r\n- | |\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount]\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount + 1]\r\n- +-------+\r\n- | ... |\r\n- +-------+\r\n- | Alloc | 1st[1st.size() - 1]\r\n- +-------+\r\n- | |\r\n- | |\r\n- | |\r\n-GetSize() +-------+\r\n-\r\n-if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER):\r\n-\r\n- 0 +-------+\r\n- | Alloc | 2nd[0]\r\n- +-------+\r\n- | Alloc | 2nd[1]\r\n- +-------+\r\n- | ... |\r\n- +-------+\r\n- | Alloc | 2nd[2nd.size() - 1]\r\n- +-------+\r\n- | |\r\n- | |\r\n- | |\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount]\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount + 1]\r\n- +-------+\r\n- | ... |\r\n- +-------+\r\n- | Alloc | 1st[1st.size() - 1]\r\n- +-------+\r\n- | |\r\n-GetSize() +-------+\r\n-\r\n-if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK):\r\n-\r\n- 0 +-------+\r\n- | |\r\n- | |\r\n- | |\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount]\r\n- +-------+\r\n- | Alloc | 1st[m_1stNullItemsBeginCount + 1]\r\n- +-------+\r\n- | ... |\r\n- +-------+\r\n- | Alloc | 1st[1st.size() - 1]\r\n- +-------+\r\n- | |\r\n- | |\r\n- | |\r\n- +-------+\r\n- | Alloc | 2nd[2nd.size() - 1]\r\n- +-------+\r\n- | ... |\r\n- +-------+\r\n- | Alloc | 2nd[1]\r\n- +-------+\r\n- | Alloc | 2nd[0]\r\n-GetSize() +-------+\r\n-\r\n-*\/\r\n-class VmaBlockMetadata_Linear : public VmaBlockMetadata\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear)\r\n-public:\r\n- VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual);\r\n- virtual ~VmaBlockMetadata_Linear() = default;\r\n-\r\n- VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }\r\n- bool IsEmpty() const override { return GetAllocationCount() == 0; }\r\n- VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\r\n-\r\n- void Init(VkDeviceSize size) override;\r\n- bool Validate() const override;\r\n- size_t GetAllocationCount() const override;\r\n- size_t GetFreeRegionsCount() const override;\r\n-\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\r\n- void AddStatistics(VmaStatistics& inoutStats) const override;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\r\n-#endif\r\n-\r\n- bool CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest) override;\r\n-\r\n- VkResult CheckCorruption(const void* pBlockData) override;\r\n-\r\n- void Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData) override;\r\n-\r\n- void Free(VmaAllocHandle allocHandle) override;\r\n- void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\r\n- void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\r\n- VmaAllocHandle GetAllocationListBegin() const override;\r\n- VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\r\n- VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override;\r\n- void Clear() override;\r\n- void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\r\n- void DebugLogAllAllocations() const override;\r\n-\r\n-private:\r\n- \/*\r\n- There are two suballocation vectors, used in ping-pong way.\r\n- The one with index m_1stVectorIndex is called 1st.\r\n- The one with index (m_1stVectorIndex ^ 1) is called 2nd.\r\n- 2nd can be non-empty only when 1st is not empty.\r\n- When 2nd is not empty, m_2ndVectorMode indicates its mode of operation.\r\n- *\/\r\n- typedef VmaVector<VmaSuballocation, VmaStlAllocator<VmaSuballocation>> SuballocationVectorType;\r\n-\r\n- enum SECOND_VECTOR_MODE\r\n- {\r\n- SECOND_VECTOR_EMPTY,\r\n- \/*\r\n- Suballocations in 2nd vector are created later than the ones in 1st, but they\r\n- all have smaller offset.\r\n- *\/\r\n- SECOND_VECTOR_RING_BUFFER,\r\n- \/*\r\n- Suballocations in 2nd vector are upper side of double stack.\r\n- They all have offsets higher than those in 1st vector.\r\n- Top of this stack means smaller offsets, but higher indices in this vector.\r\n- *\/\r\n- SECOND_VECTOR_DOUBLE_STACK,\r\n- };\r\n-\r\n- VkDeviceSize m_SumFreeSize;\r\n- SuballocationVectorType m_Suballocations0, m_Suballocations1;\r\n- uint32_t m_1stVectorIndex;\r\n- SECOND_VECTOR_MODE m_2ndVectorMode;\r\n- \/\/ Number of items in 1st vector with hAllocation = null at the beginning.\r\n- size_t m_1stNullItemsBeginCount;\r\n- \/\/ Number of other items in 1st vector with hAllocation = null somewhere in the middle.\r\n- size_t m_1stNullItemsMiddleCount;\r\n- \/\/ Number of items in 2nd vector with hAllocation = null.\r\n- size_t m_2ndNullItemsCount;\r\n-\r\n- SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }\r\n- SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }\r\n- const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }\r\n- const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }\r\n-\r\n- VmaSuballocation& FindSuballocation(VkDeviceSize offset) const;\r\n- bool ShouldCompact1st() const;\r\n- void CleanupAfterFree();\r\n-\r\n- bool CreateAllocationRequest_LowerAddress(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest);\r\n- bool CreateAllocationRequest_UpperAddress(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest);\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS\r\n-VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual)\r\n- : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\r\n- m_SumFreeSize(0),\r\n- m_Suballocations0(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n- m_Suballocations1(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\r\n- m_1stVectorIndex(0),\r\n- m_2ndVectorMode(SECOND_VECTOR_EMPTY),\r\n- m_1stNullItemsBeginCount(0),\r\n- m_1stNullItemsMiddleCount(0),\r\n- m_2ndNullItemsCount(0) {}\r\n-\r\n-void VmaBlockMetadata_Linear::Init(VkDeviceSize size)\r\n-{\r\n- VmaBlockMetadata::Init(size);\r\n- m_SumFreeSize = size;\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Linear::Validate() const\r\n-{\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY));\r\n- VMA_VALIDATE(!suballocations1st.empty() ||\r\n- suballocations2nd.empty() ||\r\n- m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER);\r\n-\r\n- if (!suballocations1st.empty())\r\n- {\r\n- \/\/ Null item at the beginning should be accounted into m_1stNullItemsBeginCount.\r\n- VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].type != VMA_SUBALLOCATION_TYPE_FREE);\r\n- \/\/ Null item at the end should be just pop_back().\r\n- VMA_VALIDATE(suballocations1st.back().type != VMA_SUBALLOCATION_TYPE_FREE);\r\n- }\r\n- if (!suballocations2nd.empty())\r\n- {\r\n- \/\/ Null item at the end should be just pop_back().\r\n- VMA_VALIDATE(suballocations2nd.back().type != VMA_SUBALLOCATION_TYPE_FREE);\r\n- }\r\n-\r\n- VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size());\r\n- VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size());\r\n-\r\n- VkDeviceSize sumUsedSize = 0;\r\n- const size_t suballoc1stCount = suballocations1st.size();\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n- VkDeviceSize offset = 0;\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- const size_t suballoc2ndCount = suballocations2nd.size();\r\n- size_t nullItem2ndCount = 0;\r\n- for (size_t i = 0; i < suballoc2ndCount; ++i)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[i];\r\n- const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\r\n- }\r\n- VMA_VALIDATE(suballoc.offset >= offset);\r\n-\r\n- if (!currFree)\r\n- {\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\r\n- VMA_VALIDATE(alloc->GetSize() == suballoc.size);\r\n- }\r\n- sumUsedSize += suballoc.size;\r\n- }\r\n- else\r\n- {\r\n- ++nullItem2ndCount;\r\n- }\r\n-\r\n- offset = suballoc.offset + suballoc.size + debugMargin;\r\n- }\r\n-\r\n- VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);\r\n- }\r\n-\r\n- for (size_t i = 0; i < m_1stNullItemsBeginCount; ++i)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[i];\r\n- VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE &&\r\n- suballoc.userData == VMA_NULL);\r\n- }\r\n-\r\n- size_t nullItem1stCount = m_1stNullItemsBeginCount;\r\n-\r\n- for (size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[i];\r\n- const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\r\n- }\r\n- VMA_VALIDATE(suballoc.offset >= offset);\r\n- VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree);\r\n-\r\n- if (!currFree)\r\n- {\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\r\n- VMA_VALIDATE(alloc->GetSize() == suballoc.size);\r\n- }\r\n- sumUsedSize += suballoc.size;\r\n- }\r\n- else\r\n- {\r\n- ++nullItem1stCount;\r\n- }\r\n-\r\n- offset = suballoc.offset + suballoc.size + debugMargin;\r\n- }\r\n- VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount);\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- const size_t suballoc2ndCount = suballocations2nd.size();\r\n- size_t nullItem2ndCount = 0;\r\n- for (size_t i = suballoc2ndCount; i--; )\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[i];\r\n- const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\r\n-\r\n- VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\r\n- }\r\n- VMA_VALIDATE(suballoc.offset >= offset);\r\n-\r\n- if (!currFree)\r\n- {\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\r\n- VMA_VALIDATE(alloc->GetSize() == suballoc.size);\r\n- }\r\n- sumUsedSize += suballoc.size;\r\n- }\r\n- else\r\n- {\r\n- ++nullItem2ndCount;\r\n- }\r\n-\r\n- offset = suballoc.offset + suballoc.size + debugMargin;\r\n- }\r\n-\r\n- VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);\r\n- }\r\n-\r\n- VMA_VALIDATE(offset <= GetSize());\r\n- VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize);\r\n-\r\n- return true;\r\n-}\r\n-\r\n-size_t VmaBlockMetadata_Linear::GetAllocationCount() const\r\n-{\r\n- return AccessSuballocations1st().size() - m_1stNullItemsBeginCount - m_1stNullItemsMiddleCount +\r\n- AccessSuballocations2nd().size() - m_2ndNullItemsCount;\r\n-}\r\n-\r\n-size_t VmaBlockMetadata_Linear::GetFreeRegionsCount() const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- VMA_ASSERT(0);\r\n- return SIZE_MAX;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\r\n-{\r\n- const VkDeviceSize size = GetSize();\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- const size_t suballoc1stCount = suballocations1st.size();\r\n- const size_t suballoc2ndCount = suballocations2nd.size();\r\n-\r\n- inoutStats.statistics.blockCount++;\r\n- inoutStats.statistics.blockBytes += size;\r\n-\r\n- VkDeviceSize lastOffset = 0;\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\r\n- size_t nextAlloc2ndIndex = 0;\r\n- while (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc2ndIndex < suballoc2ndCount &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex < suballoc2ndCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\r\n- if (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace2ndTo1stEnd;\r\n- }\r\n- }\r\n- }\r\n-\r\n- size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\r\n- const VkDeviceSize freeSpace1stTo2ndEnd =\r\n- m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\r\n- while (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc1stIndex < suballoc1stCount &&\r\n- suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc1stIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc1stIndex < suballoc1stCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc1stIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\r\n- if (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace1stTo2ndEnd;\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\r\n- while (lastOffset < size)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc2ndIndex != SIZE_MAX &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- --nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex != SIZE_MAX)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- --nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- \/\/ There is free space from lastOffset to size.\r\n- if (lastOffset < size)\r\n- {\r\n- const VkDeviceSize unusedRangeSize = size - lastOffset;\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = size;\r\n- }\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::AddStatistics(VmaStatistics& inoutStats) const\r\n-{\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- const VkDeviceSize size = GetSize();\r\n- const size_t suballoc1stCount = suballocations1st.size();\r\n- const size_t suballoc2ndCount = suballocations2nd.size();\r\n-\r\n- inoutStats.blockCount++;\r\n- inoutStats.blockBytes += size;\r\n- inoutStats.allocationBytes += size - m_SumFreeSize;\r\n-\r\n- VkDeviceSize lastOffset = 0;\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\r\n- size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount;\r\n- while (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex < suballoc2ndCount &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex < suballoc2ndCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++inoutStats.allocationCount;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\r\n- const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace2ndTo1stEnd;\r\n- }\r\n- }\r\n- }\r\n-\r\n- size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\r\n- const VkDeviceSize freeSpace1stTo2ndEnd =\r\n- m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\r\n- while (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc1stIndex < suballoc1stCount &&\r\n- suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc1stIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc1stIndex < suballoc1stCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++inoutStats.allocationCount;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc1stIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\r\n- const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace1stTo2ndEnd;\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\r\n- while (lastOffset < size)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex != SIZE_MAX &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- --nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex != SIZE_MAX)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++inoutStats.allocationCount;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- --nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < size)\r\n- {\r\n- \/\/ There is free space from lastOffset to size.\r\n- const VkDeviceSize unusedRangeSize = size - lastOffset;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = size;\r\n- }\r\n- }\r\n- }\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\r\n-{\r\n- const VkDeviceSize size = GetSize();\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- const size_t suballoc1stCount = suballocations1st.size();\r\n- const size_t suballoc2ndCount = suballocations2nd.size();\r\n-\r\n- \/\/ FIRST PASS\r\n-\r\n- size_t unusedRangeCount = 0;\r\n- VkDeviceSize usedBytes = 0;\r\n-\r\n- VkDeviceSize lastOffset = 0;\r\n-\r\n- size_t alloc2ndCount = 0;\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\r\n- size_t nextAlloc2ndIndex = 0;\r\n- while (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex < suballoc2ndCount &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex < suballoc2ndCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++alloc2ndCount;\r\n- usedBytes += suballoc.size;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace2ndTo1stEnd;\r\n- }\r\n- }\r\n- }\r\n-\r\n- size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\r\n- size_t alloc1stCount = 0;\r\n- const VkDeviceSize freeSpace1stTo2ndEnd =\r\n- m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\r\n- while (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc1stIndex < suballoc1stCount &&\r\n- suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc1stIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc1stIndex < suballoc1stCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++alloc1stCount;\r\n- usedBytes += suballoc.size;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc1stIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < size)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace1stTo2ndEnd;\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\r\n- while (lastOffset < size)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex != SIZE_MAX &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- --nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex != SIZE_MAX)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- ++alloc2ndCount;\r\n- usedBytes += suballoc.size;\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- --nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < size)\r\n- {\r\n- \/\/ There is free space from lastOffset to size.\r\n- ++unusedRangeCount;\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = size;\r\n- }\r\n- }\r\n- }\r\n-\r\n- const VkDeviceSize unusedBytes = size - usedBytes;\r\n- PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount, mapRefCount);\r\n-\r\n- \/\/ SECOND PASS\r\n- lastOffset = 0;\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\r\n- size_t nextAlloc2ndIndex = 0;\r\n- while (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex < suballoc2ndCount &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex < suballoc2ndCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < freeSpace2ndTo1stEnd)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\r\n- const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace2ndTo1stEnd;\r\n- }\r\n- }\r\n- }\r\n-\r\n- nextAlloc1stIndex = m_1stNullItemsBeginCount;\r\n- while (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAllocIndex to the end.\r\n- while (nextAlloc1stIndex < suballoc1stCount &&\r\n- suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\r\n- {\r\n- ++nextAlloc1stIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc1stIndex < suballoc1stCount)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- ++nextAlloc1stIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < freeSpace1stTo2ndEnd)\r\n- {\r\n- \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\r\n- const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = freeSpace1stTo2ndEnd;\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\r\n- while (lastOffset < size)\r\n- {\r\n- \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\r\n- while (nextAlloc2ndIndex != SIZE_MAX &&\r\n- suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\r\n- {\r\n- --nextAlloc2ndIndex;\r\n- }\r\n-\r\n- \/\/ Found non-null allocation.\r\n- if (nextAlloc2ndIndex != SIZE_MAX)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\r\n-\r\n- \/\/ 1. Process free space before this allocation.\r\n- if (lastOffset < suballoc.offset)\r\n- {\r\n- \/\/ There is free space from lastOffset to suballoc.offset.\r\n- const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ 2. Process this allocation.\r\n- \/\/ There is allocation with suballoc.offset, suballoc.size.\r\n- PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\r\n-\r\n- \/\/ 3. Prepare for next iteration.\r\n- lastOffset = suballoc.offset + suballoc.size;\r\n- --nextAlloc2ndIndex;\r\n- }\r\n- \/\/ We are at the end.\r\n- else\r\n- {\r\n- if (lastOffset < size)\r\n- {\r\n- \/\/ There is free space from lastOffset to size.\r\n- const VkDeviceSize unusedRangeSize = size - lastOffset;\r\n- PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\r\n- }\r\n-\r\n- \/\/ End of loop.\r\n- lastOffset = size;\r\n- }\r\n- }\r\n- }\r\n-\r\n- PrintDetailedMap_End(json);\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-bool VmaBlockMetadata_Linear::CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- VMA_ASSERT(allocSize > 0);\r\n- VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\r\n- VMA_ASSERT(pAllocationRequest != VMA_NULL);\r\n- VMA_HEAVY_ASSERT(Validate());\r\n- pAllocationRequest->size = allocSize;\r\n- return upperAddress ?\r\n- CreateAllocationRequest_UpperAddress(\r\n- allocSize, allocAlignment, allocType, strategy, pAllocationRequest) :\r\n- CreateAllocationRequest_LowerAddress(\r\n- allocSize, allocAlignment, allocType, strategy, pAllocationRequest);\r\n-}\r\n-\r\n-VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData)\r\n-{\r\n- VMA_ASSERT(!IsVirtual());\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- for (size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations1st[i];\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\r\n- {\r\n- VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\r\n- return VK_ERROR_UNKNOWN_COPY;\r\n- }\r\n- }\r\n- }\r\n-\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- for (size_t i = 0, count = suballocations2nd.size(); i < count; ++i)\r\n- {\r\n- const VmaSuballocation& suballoc = suballocations2nd[i];\r\n- if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\r\n- {\r\n- VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\r\n- return VK_ERROR_UNKNOWN_COPY;\r\n- }\r\n- }\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData)\r\n-{\r\n- const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1;\r\n- const VmaSuballocation newSuballoc = { offset, request.size, userData, type };\r\n-\r\n- switch (request.type)\r\n- {\r\n- case VmaAllocationRequestType::UpperAddress:\r\n- {\r\n- VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER &&\r\n- \"CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer.\");\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- suballocations2nd.push_back(newSuballoc);\r\n- m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK;\r\n- }\r\n- break;\r\n- case VmaAllocationRequestType::EndOf1st:\r\n- {\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n-\r\n- VMA_ASSERT(suballocations1st.empty() ||\r\n- offset >= suballocations1st.back().offset + suballocations1st.back().size);\r\n- \/\/ Check if it fits before the end of the block.\r\n- VMA_ASSERT(offset + request.size <= GetSize());\r\n-\r\n- suballocations1st.push_back(newSuballoc);\r\n- }\r\n- break;\r\n- case VmaAllocationRequestType::EndOf2nd:\r\n- {\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- \/\/ New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector.\r\n- VMA_ASSERT(!suballocations1st.empty() &&\r\n- offset + request.size <= suballocations1st[m_1stNullItemsBeginCount].offset);\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- switch (m_2ndVectorMode)\r\n- {\r\n- case SECOND_VECTOR_EMPTY:\r\n- \/\/ First allocation from second part ring buffer.\r\n- VMA_ASSERT(suballocations2nd.empty());\r\n- m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER;\r\n- break;\r\n- case SECOND_VECTOR_RING_BUFFER:\r\n- \/\/ 2-part ring buffer is already started.\r\n- VMA_ASSERT(!suballocations2nd.empty());\r\n- break;\r\n- case SECOND_VECTOR_DOUBLE_STACK:\r\n- VMA_ASSERT(0 && \"CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack.\");\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-\r\n- suballocations2nd.push_back(newSuballoc);\r\n- }\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0 && \"CRITICAL INTERNAL ERROR.\");\r\n- }\r\n-\r\n- m_SumFreeSize -= newSuballoc.size;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::Free(VmaAllocHandle allocHandle)\r\n-{\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- VkDeviceSize offset = (VkDeviceSize)allocHandle - 1;\r\n-\r\n- if (!suballocations1st.empty())\r\n- {\r\n- \/\/ First allocation: Mark it as next empty at the beginning.\r\n- VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];\r\n- if (firstSuballoc.offset == offset)\r\n- {\r\n- firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- firstSuballoc.userData = VMA_NULL;\r\n- m_SumFreeSize += firstSuballoc.size;\r\n- ++m_1stNullItemsBeginCount;\r\n- CleanupAfterFree();\r\n- return;\r\n- }\r\n- }\r\n-\r\n- \/\/ Last allocation in 2-part ring buffer or top of upper stack (same logic).\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ||\r\n- m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- VmaSuballocation& lastSuballoc = suballocations2nd.back();\r\n- if (lastSuballoc.offset == offset)\r\n- {\r\n- m_SumFreeSize += lastSuballoc.size;\r\n- suballocations2nd.pop_back();\r\n- CleanupAfterFree();\r\n- return;\r\n- }\r\n- }\r\n- \/\/ Last allocation in 1st vector.\r\n- else if (m_2ndVectorMode == SECOND_VECTOR_EMPTY)\r\n- {\r\n- VmaSuballocation& lastSuballoc = suballocations1st.back();\r\n- if (lastSuballoc.offset == offset)\r\n- {\r\n- m_SumFreeSize += lastSuballoc.size;\r\n- suballocations1st.pop_back();\r\n- CleanupAfterFree();\r\n- return;\r\n- }\r\n- }\r\n-\r\n- VmaSuballocation refSuballoc;\r\n- refSuballoc.offset = offset;\r\n- \/\/ Rest of members stays uninitialized intentionally for better performance.\r\n-\r\n- \/\/ Item from the middle of 1st vector.\r\n- {\r\n- const SuballocationVectorType::iterator it = VmaBinaryFindSorted(\r\n- suballocations1st.begin() + m_1stNullItemsBeginCount,\r\n- suballocations1st.end(),\r\n- refSuballoc,\r\n- VmaSuballocationOffsetLess());\r\n- if (it != suballocations1st.end())\r\n- {\r\n- it->type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- it->userData = VMA_NULL;\r\n- ++m_1stNullItemsMiddleCount;\r\n- m_SumFreeSize += it->size;\r\n- CleanupAfterFree();\r\n- return;\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode != SECOND_VECTOR_EMPTY)\r\n- {\r\n- \/\/ Item from the middle of 2nd vector.\r\n- const SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?\r\n- VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) :\r\n- VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater());\r\n- if (it != suballocations2nd.end())\r\n- {\r\n- it->type = VMA_SUBALLOCATION_TYPE_FREE;\r\n- it->userData = VMA_NULL;\r\n- ++m_2ndNullItemsCount;\r\n- m_SumFreeSize += it->size;\r\n- CleanupAfterFree();\r\n- return;\r\n- }\r\n- }\r\n-\r\n- VMA_ASSERT(0 && \"Allocation to free not found in linear allocator!\");\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\r\n-{\r\n- outInfo.offset = (VkDeviceSize)allocHandle - 1;\r\n- VmaSuballocation& suballoc = FindSuballocation(outInfo.offset);\r\n- outInfo.size = suballoc.size;\r\n- outInfo.pUserData = suballoc.userData;\r\n-}\r\n-\r\n-void* VmaBlockMetadata_Linear::GetAllocationUserData(VmaAllocHandle allocHandle) const\r\n-{\r\n- return FindSuballocation((VkDeviceSize)allocHandle - 1).userData;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Linear::GetAllocationListBegin() const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- VMA_ASSERT(0);\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Linear::GetNextAllocation(VmaAllocHandle prevAlloc) const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- VMA_ASSERT(0);\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VkDeviceSize VmaBlockMetadata_Linear::GetNextFreeRegionSize(VmaAllocHandle alloc) const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- VMA_ASSERT(0);\r\n- return 0;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::Clear()\r\n-{\r\n- m_SumFreeSize = GetSize();\r\n- m_Suballocations0.clear();\r\n- m_Suballocations1.clear();\r\n- \/\/ Leaving m_1stVectorIndex unchanged - it doesn't matter.\r\n- m_2ndVectorMode = SECOND_VECTOR_EMPTY;\r\n- m_1stNullItemsBeginCount = 0;\r\n- m_1stNullItemsMiddleCount = 0;\r\n- m_2ndNullItemsCount = 0;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\r\n-{\r\n- VmaSuballocation& suballoc = FindSuballocation((VkDeviceSize)allocHandle - 1);\r\n- suballoc.userData = userData;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::DebugLogAllAllocations() const\r\n-{\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- for (auto it = suballocations1st.begin() + m_1stNullItemsBeginCount; it != suballocations1st.end(); ++it)\r\n- if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- DebugLogAllocation(it->offset, it->size, it->userData);\r\n-\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n- for (auto it = suballocations2nd.begin(); it != suballocations2nd.end(); ++it)\r\n- if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\r\n- DebugLogAllocation(it->offset, it->size, it->userData);\r\n-}\r\n-\r\n-VmaSuballocation& VmaBlockMetadata_Linear::FindSuballocation(VkDeviceSize offset) const\r\n-{\r\n- const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- VmaSuballocation refSuballoc;\r\n- refSuballoc.offset = offset;\r\n- \/\/ Rest of members stays uninitialized intentionally for better performance.\r\n-\r\n- \/\/ Item from the 1st vector.\r\n- {\r\n- SuballocationVectorType::const_iterator it = VmaBinaryFindSorted(\r\n- suballocations1st.begin() + m_1stNullItemsBeginCount,\r\n- suballocations1st.end(),\r\n- refSuballoc,\r\n- VmaSuballocationOffsetLess());\r\n- if (it != suballocations1st.end())\r\n- {\r\n- return const_cast<VmaSuballocation&>(*it);\r\n- }\r\n- }\r\n-\r\n- if (m_2ndVectorMode != SECOND_VECTOR_EMPTY)\r\n- {\r\n- \/\/ Rest of members stays uninitialized intentionally for better performance.\r\n- SuballocationVectorType::const_iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?\r\n- VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) :\r\n- VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater());\r\n- if (it != suballocations2nd.end())\r\n- {\r\n- return const_cast<VmaSuballocation&>(*it);\r\n- }\r\n- }\r\n-\r\n- VMA_ASSERT(0 && \"Allocation not found in linear allocator!\");\r\n- return const_cast<VmaSuballocation&>(suballocations1st.back()); \/\/ Should never occur.\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Linear::ShouldCompact1st() const\r\n-{\r\n- const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;\r\n- const size_t suballocCount = AccessSuballocations1st().size();\r\n- return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Linear::CleanupAfterFree()\r\n-{\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- if (IsEmpty())\r\n- {\r\n- suballocations1st.clear();\r\n- suballocations2nd.clear();\r\n- m_1stNullItemsBeginCount = 0;\r\n- m_1stNullItemsMiddleCount = 0;\r\n- m_2ndNullItemsCount = 0;\r\n- m_2ndVectorMode = SECOND_VECTOR_EMPTY;\r\n- }\r\n- else\r\n- {\r\n- const size_t suballoc1stCount = suballocations1st.size();\r\n- const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;\r\n- VMA_ASSERT(nullItem1stCount <= suballoc1stCount);\r\n-\r\n- \/\/ Find more null items at the beginning of 1st vector.\r\n- while (m_1stNullItemsBeginCount < suballoc1stCount &&\r\n- suballocations1st[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- ++m_1stNullItemsBeginCount;\r\n- --m_1stNullItemsMiddleCount;\r\n- }\r\n-\r\n- \/\/ Find more null items at the end of 1st vector.\r\n- while (m_1stNullItemsMiddleCount > 0 &&\r\n- suballocations1st.back().type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- --m_1stNullItemsMiddleCount;\r\n- suballocations1st.pop_back();\r\n- }\r\n-\r\n- \/\/ Find more null items at the end of 2nd vector.\r\n- while (m_2ndNullItemsCount > 0 &&\r\n- suballocations2nd.back().type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- --m_2ndNullItemsCount;\r\n- suballocations2nd.pop_back();\r\n- }\r\n-\r\n- \/\/ Find more null items at the beginning of 2nd vector.\r\n- while (m_2ndNullItemsCount > 0 &&\r\n- suballocations2nd[0].type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- --m_2ndNullItemsCount;\r\n- VmaVectorRemove(suballocations2nd, 0);\r\n- }\r\n-\r\n- if (ShouldCompact1st())\r\n- {\r\n- const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount;\r\n- size_t srcIndex = m_1stNullItemsBeginCount;\r\n- for (size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex)\r\n- {\r\n- while (suballocations1st[srcIndex].type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- ++srcIndex;\r\n- }\r\n- if (dstIndex != srcIndex)\r\n- {\r\n- suballocations1st[dstIndex] = suballocations1st[srcIndex];\r\n- }\r\n- ++srcIndex;\r\n- }\r\n- suballocations1st.resize(nonNullItemCount);\r\n- m_1stNullItemsBeginCount = 0;\r\n- m_1stNullItemsMiddleCount = 0;\r\n- }\r\n-\r\n- \/\/ 2nd vector became empty.\r\n- if (suballocations2nd.empty())\r\n- {\r\n- m_2ndVectorMode = SECOND_VECTOR_EMPTY;\r\n- }\r\n-\r\n- \/\/ 1st vector became empty.\r\n- if (suballocations1st.size() - m_1stNullItemsBeginCount == 0)\r\n- {\r\n- suballocations1st.clear();\r\n- m_1stNullItemsBeginCount = 0;\r\n-\r\n- if (!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- \/\/ Swap 1st with 2nd. Now 2nd is empty.\r\n- m_2ndVectorMode = SECOND_VECTOR_EMPTY;\r\n- m_1stNullItemsMiddleCount = m_2ndNullItemsCount;\r\n- while (m_1stNullItemsBeginCount < suballocations2nd.size() &&\r\n- suballocations2nd[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE)\r\n- {\r\n- ++m_1stNullItemsBeginCount;\r\n- --m_1stNullItemsMiddleCount;\r\n- }\r\n- m_2ndNullItemsCount = 0;\r\n- m_1stVectorIndex ^= 1;\r\n- }\r\n- }\r\n- }\r\n-\r\n- VMA_HEAVY_ASSERT(Validate());\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Linear::CreateAllocationRequest_LowerAddress(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- const VkDeviceSize blockSize = GetSize();\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n- const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- \/\/ Try to allocate at the end of 1st vector.\r\n-\r\n- VkDeviceSize resultBaseOffset = 0;\r\n- if (!suballocations1st.empty())\r\n- {\r\n- const VmaSuballocation& lastSuballoc = suballocations1st.back();\r\n- resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin;\r\n- }\r\n-\r\n- \/\/ Start from offset equal to beginning of free space.\r\n- VkDeviceSize resultOffset = resultBaseOffset;\r\n-\r\n- \/\/ Apply alignment.\r\n- resultOffset = VmaAlignUp(resultOffset, allocAlignment);\r\n-\r\n- \/\/ Check previous suballocations for BufferImageGranularity conflicts.\r\n- \/\/ Make bigger alignment if necessary.\r\n- if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations1st.empty())\r\n- {\r\n- bool bufferImageGranularityConflict = false;\r\n- for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )\r\n- {\r\n- const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];\r\n- if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\r\n- {\r\n- bufferImageGranularityConflict = true;\r\n- break;\r\n- }\r\n- }\r\n- else\r\n- \/\/ Already on previous page.\r\n- break;\r\n- }\r\n- if (bufferImageGranularityConflict)\r\n- {\r\n- resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);\r\n- }\r\n- }\r\n-\r\n- const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ?\r\n- suballocations2nd.back().offset : blockSize;\r\n-\r\n- \/\/ There is enough free space at the end after alignment.\r\n- if (resultOffset + allocSize + debugMargin <= freeSpaceEnd)\r\n- {\r\n- \/\/ Check next suballocations for BufferImageGranularity conflicts.\r\n- \/\/ If conflict exists, allocation cannot be made here.\r\n- if ((allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\r\n- {\r\n- for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )\r\n- {\r\n- const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];\r\n- if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Already on previous page.\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ All tests passed: Success.\r\n- pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\r\n- \/\/ pAllocationRequest->item, customData unused.\r\n- pAllocationRequest->type = VmaAllocationRequestType::EndOf1st;\r\n- return true;\r\n- }\r\n- }\r\n-\r\n- \/\/ Wrap-around to end of 2nd vector. Try to allocate there, watching for the\r\n- \/\/ beginning of 1st vector as the end of free space.\r\n- if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- VMA_ASSERT(!suballocations1st.empty());\r\n-\r\n- VkDeviceSize resultBaseOffset = 0;\r\n- if (!suballocations2nd.empty())\r\n- {\r\n- const VmaSuballocation& lastSuballoc = suballocations2nd.back();\r\n- resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin;\r\n- }\r\n-\r\n- \/\/ Start from offset equal to beginning of free space.\r\n- VkDeviceSize resultOffset = resultBaseOffset;\r\n-\r\n- \/\/ Apply alignment.\r\n- resultOffset = VmaAlignUp(resultOffset, allocAlignment);\r\n-\r\n- \/\/ Check previous suballocations for BufferImageGranularity conflicts.\r\n- \/\/ Make bigger alignment if necessary.\r\n- if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())\r\n- {\r\n- bool bufferImageGranularityConflict = false;\r\n- for (size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; )\r\n- {\r\n- const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex];\r\n- if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\r\n- {\r\n- bufferImageGranularityConflict = true;\r\n- break;\r\n- }\r\n- }\r\n- else\r\n- \/\/ Already on previous page.\r\n- break;\r\n- }\r\n- if (bufferImageGranularityConflict)\r\n- {\r\n- resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);\r\n- }\r\n- }\r\n-\r\n- size_t index1st = m_1stNullItemsBeginCount;\r\n-\r\n- \/\/ There is enough free space at the end after alignment.\r\n- if ((index1st == suballocations1st.size() && resultOffset + allocSize + debugMargin <= blockSize) ||\r\n- (index1st < suballocations1st.size() && resultOffset + allocSize + debugMargin <= suballocations1st[index1st].offset))\r\n- {\r\n- \/\/ Check next suballocations for BufferImageGranularity conflicts.\r\n- \/\/ If conflict exists, allocation cannot be made here.\r\n- if (allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity)\r\n- {\r\n- for (size_t nextSuballocIndex = index1st;\r\n- nextSuballocIndex < suballocations1st.size();\r\n- nextSuballocIndex++)\r\n- {\r\n- const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex];\r\n- if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Already on next page.\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ All tests passed: Success.\r\n- pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\r\n- pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd;\r\n- \/\/ pAllocationRequest->item, customData unused.\r\n- return true;\r\n- }\r\n- }\r\n-\r\n- return false;\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- const VkDeviceSize blockSize = GetSize();\r\n- const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\r\n- SuballocationVectorType& suballocations1st = AccessSuballocations1st();\r\n- SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\r\n-\r\n- if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\r\n- {\r\n- VMA_ASSERT(0 && \"Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer.\");\r\n- return false;\r\n- }\r\n-\r\n- \/\/ Try to allocate before 2nd.back(), or end of block if 2nd.empty().\r\n- if (allocSize > blockSize)\r\n- {\r\n- return false;\r\n- }\r\n- VkDeviceSize resultBaseOffset = blockSize - allocSize;\r\n- if (!suballocations2nd.empty())\r\n- {\r\n- const VmaSuballocation& lastSuballoc = suballocations2nd.back();\r\n- resultBaseOffset = lastSuballoc.offset - allocSize;\r\n- if (allocSize > lastSuballoc.offset)\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n-\r\n- \/\/ Start from offset equal to end of free space.\r\n- VkDeviceSize resultOffset = resultBaseOffset;\r\n-\r\n- const VkDeviceSize debugMargin = GetDebugMargin();\r\n-\r\n- \/\/ Apply debugMargin at the end.\r\n- if (debugMargin > 0)\r\n- {\r\n- if (resultOffset < debugMargin)\r\n- {\r\n- return false;\r\n- }\r\n- resultOffset -= debugMargin;\r\n- }\r\n-\r\n- \/\/ Apply alignment.\r\n- resultOffset = VmaAlignDown(resultOffset, allocAlignment);\r\n-\r\n- \/\/ Check next suballocations from 2nd for BufferImageGranularity conflicts.\r\n- \/\/ Make bigger alignment if necessary.\r\n- if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())\r\n- {\r\n- bool bufferImageGranularityConflict = false;\r\n- for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )\r\n- {\r\n- const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];\r\n- if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType))\r\n- {\r\n- bufferImageGranularityConflict = true;\r\n- break;\r\n- }\r\n- }\r\n- else\r\n- \/\/ Already on previous page.\r\n- break;\r\n- }\r\n- if (bufferImageGranularityConflict)\r\n- {\r\n- resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity);\r\n- }\r\n- }\r\n-\r\n- \/\/ There is enough free space.\r\n- const VkDeviceSize endOf1st = !suballocations1st.empty() ?\r\n- suballocations1st.back().offset + suballocations1st.back().size :\r\n- 0;\r\n- if (endOf1st + debugMargin <= resultOffset)\r\n- {\r\n- \/\/ Check previous suballocations for BufferImageGranularity conflicts.\r\n- \/\/ If conflict exists, allocation cannot be made here.\r\n- if (bufferImageGranularity > 1)\r\n- {\r\n- for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )\r\n- {\r\n- const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];\r\n- if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\r\n- {\r\n- if (VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type))\r\n- {\r\n- return false;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Already on next page.\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ All tests passed: Success.\r\n- pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\r\n- \/\/ pAllocationRequest->item unused.\r\n- pAllocationRequest->type = VmaAllocationRequestType::UpperAddress;\r\n- return true;\r\n- }\r\n-\r\n- return false;\r\n-}\r\n-#endif \/\/ _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_METADATA_LINEAR\r\n-\r\n-#if 0\r\n-#ifndef _VMA_BLOCK_METADATA_BUDDY\r\n-\/*\r\n-- GetSize() is the original size of allocated memory block.\r\n-- m_UsableSize is this size aligned down to a power of two.\r\n- All allocations and calculations happen relative to m_UsableSize.\r\n-- GetUnusableSize() is the difference between them.\r\n- It is reported as separate, unused range, not available for allocations.\r\n-\r\n-Node at level 0 has size = m_UsableSize.\r\n-Each next level contains nodes with size 2 times smaller than current level.\r\n-m_LevelCount is the maximum number of levels to use in the current object.\r\n-*\/\r\n-class VmaBlockMetadata_Buddy : public VmaBlockMetadata\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy)\r\n-public:\r\n- VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual);\r\n- virtual ~VmaBlockMetadata_Buddy();\r\n-\r\n- size_t GetAllocationCount() const override { return m_AllocationCount; }\r\n- VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize + GetUnusableSize(); }\r\n- bool IsEmpty() const override { return m_Root->type == Node::TYPE_FREE; }\r\n- VkResult CheckCorruption(const void* pBlockData) override { return VK_ERROR_FEATURE_NOT_PRESENT; }\r\n- VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\r\n- void DebugLogAllAllocations() const override { DebugLogAllAllocationNode(m_Root, 0); }\r\n-\r\n- void Init(VkDeviceSize size) override;\r\n- bool Validate() const override;\r\n-\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\r\n- void AddStatistics(VmaStatistics& inoutStats) const override;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\r\n-#endif\r\n-\r\n- bool CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest) override;\r\n-\r\n- void Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData) override;\r\n-\r\n- void Free(VmaAllocHandle allocHandle) override;\r\n- void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\r\n- void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\r\n- VmaAllocHandle GetAllocationListBegin() const override;\r\n- VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\r\n- void Clear() override;\r\n- void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\r\n-\r\n-private:\r\n- static const size_t MAX_LEVELS = 48;\r\n-\r\n- struct ValidationContext\r\n- {\r\n- size_t calculatedAllocationCount = 0;\r\n- size_t calculatedFreeCount = 0;\r\n- VkDeviceSize calculatedSumFreeSize = 0;\r\n- };\r\n- struct Node\r\n- {\r\n- VkDeviceSize offset;\r\n- enum TYPE\r\n- {\r\n- TYPE_FREE,\r\n- TYPE_ALLOCATION,\r\n- TYPE_SPLIT,\r\n- TYPE_COUNT\r\n- } type;\r\n- Node* parent;\r\n- Node* buddy;\r\n-\r\n- union\r\n- {\r\n- struct\r\n- {\r\n- Node* prev;\r\n- Node* next;\r\n- } free;\r\n- struct\r\n- {\r\n- void* userData;\r\n- } allocation;\r\n- struct\r\n- {\r\n- Node* leftChild;\r\n- } split;\r\n- };\r\n- };\r\n-\r\n- \/\/ Size of the memory block aligned down to a power of two.\r\n- VkDeviceSize m_UsableSize;\r\n- uint32_t m_LevelCount;\r\n- VmaPoolAllocator<Node> m_NodeAllocator;\r\n- Node* m_Root;\r\n- struct\r\n- {\r\n- Node* front;\r\n- Node* back;\r\n- } m_FreeList[MAX_LEVELS];\r\n-\r\n- \/\/ Number of nodes in the tree with type == TYPE_ALLOCATION.\r\n- size_t m_AllocationCount;\r\n- \/\/ Number of nodes in the tree with type == TYPE_FREE.\r\n- size_t m_FreeCount;\r\n- \/\/ Doesn't include space wasted due to internal fragmentation - allocation sizes are just aligned up to node sizes.\r\n- \/\/ Doesn't include unusable size.\r\n- VkDeviceSize m_SumFreeSize;\r\n-\r\n- VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; }\r\n- VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; }\r\n-\r\n- VkDeviceSize AlignAllocationSize(VkDeviceSize size) const\r\n- {\r\n- if (!IsVirtual())\r\n- {\r\n- size = VmaAlignUp(size, (VkDeviceSize)16);\r\n- }\r\n- return VmaNextPow2(size);\r\n- }\r\n- Node* FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const;\r\n- void DeleteNodeChildren(Node* node);\r\n- bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const;\r\n- uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const;\r\n- void AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const;\r\n- \/\/ Adds node to the front of FreeList at given level.\r\n- \/\/ node->type must be FREE.\r\n- \/\/ node->free.prev, next can be undefined.\r\n- void AddToFreeListFront(uint32_t level, Node* node);\r\n- \/\/ Removes node from FreeList at given level.\r\n- \/\/ node->type must be FREE.\r\n- \/\/ node->free.prev, next stay untouched.\r\n- void RemoveFromFreeList(uint32_t level, Node* node);\r\n- void DebugLogAllAllocationNode(Node* node, uint32_t level) const;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const;\r\n-#endif\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS\r\n-VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual)\r\n- : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\r\n- m_NodeAllocator(pAllocationCallbacks, 32), \/\/ firstBlockCapacity\r\n- m_Root(VMA_NULL),\r\n- m_AllocationCount(0),\r\n- m_FreeCount(1),\r\n- m_SumFreeSize(0)\r\n-{\r\n- memset(m_FreeList, 0, sizeof(m_FreeList));\r\n-}\r\n-\r\n-VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy()\r\n-{\r\n- DeleteNodeChildren(m_Root);\r\n- m_NodeAllocator.Free(m_Root);\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)\r\n-{\r\n- VmaBlockMetadata::Init(size);\r\n-\r\n- m_UsableSize = VmaPrevPow2(size);\r\n- m_SumFreeSize = m_UsableSize;\r\n-\r\n- \/\/ Calculate m_LevelCount.\r\n- const VkDeviceSize minNodeSize = IsVirtual() ? 1 : 16;\r\n- m_LevelCount = 1;\r\n- while (m_LevelCount < MAX_LEVELS &&\r\n- LevelToNodeSize(m_LevelCount) >= minNodeSize)\r\n- {\r\n- ++m_LevelCount;\r\n- }\r\n-\r\n- Node* rootNode = m_NodeAllocator.Alloc();\r\n- rootNode->offset = 0;\r\n- rootNode->type = Node::TYPE_FREE;\r\n- rootNode->parent = VMA_NULL;\r\n- rootNode->buddy = VMA_NULL;\r\n-\r\n- m_Root = rootNode;\r\n- AddToFreeListFront(0, rootNode);\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Buddy::Validate() const\r\n-{\r\n- \/\/ Validate tree.\r\n- ValidationContext ctx;\r\n- if (!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0)))\r\n- {\r\n- VMA_VALIDATE(false && \"ValidateNode failed.\");\r\n- }\r\n- VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount);\r\n- VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize);\r\n-\r\n- \/\/ Validate free node lists.\r\n- for (uint32_t level = 0; level < m_LevelCount; ++level)\r\n- {\r\n- VMA_VALIDATE(m_FreeList[level].front == VMA_NULL ||\r\n- m_FreeList[level].front->free.prev == VMA_NULL);\r\n-\r\n- for (Node* node = m_FreeList[level].front;\r\n- node != VMA_NULL;\r\n- node = node->free.next)\r\n- {\r\n- VMA_VALIDATE(node->type == Node::TYPE_FREE);\r\n-\r\n- if (node->free.next == VMA_NULL)\r\n- {\r\n- VMA_VALIDATE(m_FreeList[level].back == node);\r\n- }\r\n- else\r\n- {\r\n- VMA_VALIDATE(node->free.next->free.prev == node);\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ Validate that free lists ar higher levels are empty.\r\n- for (uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level)\r\n- {\r\n- VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL);\r\n- }\r\n-\r\n- return true;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\r\n-{\r\n- inoutStats.statistics.blockCount++;\r\n- inoutStats.statistics.blockBytes += GetSize();\r\n-\r\n- AddNodeToDetailedStatistics(inoutStats, m_Root, LevelToNodeSize(0));\r\n-\r\n- const VkDeviceSize unusableSize = GetUnusableSize();\r\n- if (unusableSize > 0)\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, unusableSize);\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::AddStatistics(VmaStatistics& inoutStats) const\r\n-{\r\n- inoutStats.blockCount++;\r\n- inoutStats.allocationCount += (uint32_t)m_AllocationCount;\r\n- inoutStats.blockBytes += GetSize();\r\n- inoutStats.allocationBytes += GetSize() - m_SumFreeSize;\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\r\n-{\r\n- VmaDetailedStatistics stats;\r\n- VmaClearDetailedStatistics(stats);\r\n- AddDetailedStatistics(stats);\r\n-\r\n- PrintDetailedMap_Begin(\r\n- json,\r\n- stats.statistics.blockBytes - stats.statistics.allocationBytes,\r\n- stats.statistics.allocationCount,\r\n- stats.unusedRangeCount,\r\n- mapRefCount);\r\n-\r\n- PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0));\r\n-\r\n- const VkDeviceSize unusableSize = GetUnusableSize();\r\n- if (unusableSize > 0)\r\n- {\r\n- PrintDetailedMap_UnusedRange(json,\r\n- m_UsableSize, \/\/ offset\r\n- unusableSize); \/\/ size\r\n- }\r\n-\r\n- PrintDetailedMap_End(json);\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-bool VmaBlockMetadata_Buddy::CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- VMA_ASSERT(!upperAddress && \"VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.\");\r\n-\r\n- allocSize = AlignAllocationSize(allocSize);\r\n-\r\n- \/\/ Simple way to respect bufferImageGranularity. May be optimized some day.\r\n- \/\/ Whenever it might be an OPTIMAL image...\r\n- if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||\r\n- allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\r\n- allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)\r\n- {\r\n- allocAlignment = VMA_MAX(allocAlignment, GetBufferImageGranularity());\r\n- allocSize = VmaAlignUp(allocSize, GetBufferImageGranularity());\r\n- }\r\n-\r\n- if (allocSize > m_UsableSize)\r\n- {\r\n- return false;\r\n- }\r\n-\r\n- const uint32_t targetLevel = AllocSizeToLevel(allocSize);\r\n- for (uint32_t level = targetLevel; level--; )\r\n- {\r\n- for (Node* freeNode = m_FreeList[level].front;\r\n- freeNode != VMA_NULL;\r\n- freeNode = freeNode->free.next)\r\n- {\r\n- if (freeNode->offset % allocAlignment == 0)\r\n- {\r\n- pAllocationRequest->type = VmaAllocationRequestType::Normal;\r\n- pAllocationRequest->allocHandle = (VmaAllocHandle)(freeNode->offset + 1);\r\n- pAllocationRequest->size = allocSize;\r\n- pAllocationRequest->customData = (void*)(uintptr_t)level;\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n-\r\n- return false;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData)\r\n-{\r\n- VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);\r\n-\r\n- const uint32_t targetLevel = AllocSizeToLevel(request.size);\r\n- uint32_t currLevel = (uint32_t)(uintptr_t)request.customData;\r\n-\r\n- Node* currNode = m_FreeList[currLevel].front;\r\n- VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);\r\n- const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1;\r\n- while (currNode->offset != offset)\r\n- {\r\n- currNode = currNode->free.next;\r\n- VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);\r\n- }\r\n-\r\n- \/\/ Go down, splitting free nodes.\r\n- while (currLevel < targetLevel)\r\n- {\r\n- \/\/ currNode is already first free node at currLevel.\r\n- \/\/ Remove it from list of free nodes at this currLevel.\r\n- RemoveFromFreeList(currLevel, currNode);\r\n-\r\n- const uint32_t childrenLevel = currLevel + 1;\r\n-\r\n- \/\/ Create two free sub-nodes.\r\n- Node* leftChild = m_NodeAllocator.Alloc();\r\n- Node* rightChild = m_NodeAllocator.Alloc();\r\n-\r\n- leftChild->offset = currNode->offset;\r\n- leftChild->type = Node::TYPE_FREE;\r\n- leftChild->parent = currNode;\r\n- leftChild->buddy = rightChild;\r\n-\r\n- rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel);\r\n- rightChild->type = Node::TYPE_FREE;\r\n- rightChild->parent = currNode;\r\n- rightChild->buddy = leftChild;\r\n-\r\n- \/\/ Convert current currNode to split type.\r\n- currNode->type = Node::TYPE_SPLIT;\r\n- currNode->split.leftChild = leftChild;\r\n-\r\n- \/\/ Add child nodes to free list. Order is important!\r\n- AddToFreeListFront(childrenLevel, rightChild);\r\n- AddToFreeListFront(childrenLevel, leftChild);\r\n-\r\n- ++m_FreeCount;\r\n- ++currLevel;\r\n- currNode = m_FreeList[currLevel].front;\r\n-\r\n- \/*\r\n- We can be sure that currNode, as left child of node previously split,\r\n- also fulfills the alignment requirement.\r\n- *\/\r\n- }\r\n-\r\n- \/\/ Remove from free list.\r\n- VMA_ASSERT(currLevel == targetLevel &&\r\n- currNode != VMA_NULL &&\r\n- currNode->type == Node::TYPE_FREE);\r\n- RemoveFromFreeList(currLevel, currNode);\r\n-\r\n- \/\/ Convert to allocation node.\r\n- currNode->type = Node::TYPE_ALLOCATION;\r\n- currNode->allocation.userData = userData;\r\n-\r\n- ++m_AllocationCount;\r\n- --m_FreeCount;\r\n- m_SumFreeSize -= request.size;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\r\n-{\r\n- uint32_t level = 0;\r\n- outInfo.offset = (VkDeviceSize)allocHandle - 1;\r\n- const Node* const node = FindAllocationNode(outInfo.offset, level);\r\n- outInfo.size = LevelToNodeSize(level);\r\n- outInfo.pUserData = node->allocation.userData;\r\n-}\r\n-\r\n-void* VmaBlockMetadata_Buddy::GetAllocationUserData(VmaAllocHandle allocHandle) const\r\n-{\r\n- uint32_t level = 0;\r\n- const Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\r\n- return node->allocation.userData;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Buddy::GetAllocationListBegin() const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_Buddy::GetNextAllocation(VmaAllocHandle prevAlloc) const\r\n-{\r\n- \/\/ Function only used for defragmentation, which is disabled for this algorithm\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::DeleteNodeChildren(Node* node)\r\n-{\r\n- if (node->type == Node::TYPE_SPLIT)\r\n- {\r\n- DeleteNodeChildren(node->split.leftChild->buddy);\r\n- DeleteNodeChildren(node->split.leftChild);\r\n- const VkAllocationCallbacks* allocationCallbacks = GetAllocationCallbacks();\r\n- m_NodeAllocator.Free(node->split.leftChild->buddy);\r\n- m_NodeAllocator.Free(node->split.leftChild);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::Clear()\r\n-{\r\n- DeleteNodeChildren(m_Root);\r\n- m_Root->type = Node::TYPE_FREE;\r\n- m_AllocationCount = 0;\r\n- m_FreeCount = 1;\r\n- m_SumFreeSize = m_UsableSize;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\r\n-{\r\n- uint32_t level = 0;\r\n- Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\r\n- node->allocation.userData = userData;\r\n-}\r\n-\r\n-VmaBlockMetadata_Buddy::Node* VmaBlockMetadata_Buddy::FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const\r\n-{\r\n- Node* node = m_Root;\r\n- VkDeviceSize nodeOffset = 0;\r\n- outLevel = 0;\r\n- VkDeviceSize levelNodeSize = LevelToNodeSize(0);\r\n- while (node->type == Node::TYPE_SPLIT)\r\n- {\r\n- const VkDeviceSize nextLevelNodeSize = levelNodeSize >> 1;\r\n- if (offset < nodeOffset + nextLevelNodeSize)\r\n- {\r\n- node = node->split.leftChild;\r\n- }\r\n- else\r\n- {\r\n- node = node->split.leftChild->buddy;\r\n- nodeOffset += nextLevelNodeSize;\r\n- }\r\n- ++outLevel;\r\n- levelNodeSize = nextLevelNodeSize;\r\n- }\r\n-\r\n- VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);\r\n- return node;\r\n-}\r\n-\r\n-bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const\r\n-{\r\n- VMA_VALIDATE(level < m_LevelCount);\r\n- VMA_VALIDATE(curr->parent == parent);\r\n- VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL));\r\n- VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr);\r\n- switch (curr->type)\r\n- {\r\n- case Node::TYPE_FREE:\r\n- \/\/ curr->free.prev, next are validated separately.\r\n- ctx.calculatedSumFreeSize += levelNodeSize;\r\n- ++ctx.calculatedFreeCount;\r\n- break;\r\n- case Node::TYPE_ALLOCATION:\r\n- ++ctx.calculatedAllocationCount;\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(curr->allocation.userData != VMA_NULL);\r\n- }\r\n- break;\r\n- case Node::TYPE_SPLIT:\r\n- {\r\n- const uint32_t childrenLevel = level + 1;\r\n- const VkDeviceSize childrenLevelNodeSize = levelNodeSize >> 1;\r\n- const Node* const leftChild = curr->split.leftChild;\r\n- VMA_VALIDATE(leftChild != VMA_NULL);\r\n- VMA_VALIDATE(leftChild->offset == curr->offset);\r\n- if (!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize))\r\n- {\r\n- VMA_VALIDATE(false && \"ValidateNode for left child failed.\");\r\n- }\r\n- const Node* const rightChild = leftChild->buddy;\r\n- VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize);\r\n- if (!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize))\r\n- {\r\n- VMA_VALIDATE(false && \"ValidateNode for right child failed.\");\r\n- }\r\n- }\r\n- break;\r\n- default:\r\n- return false;\r\n- }\r\n-\r\n- return true;\r\n-}\r\n-\r\n-uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const\r\n-{\r\n- \/\/ I know this could be optimized somehow e.g. by using std::log2p1 from C++20.\r\n- uint32_t level = 0;\r\n- VkDeviceSize currLevelNodeSize = m_UsableSize;\r\n- VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1;\r\n- while (allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount)\r\n- {\r\n- ++level;\r\n- currLevelNodeSize >>= 1;\r\n- nextLevelNodeSize >>= 1;\r\n- }\r\n- return level;\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::Free(VmaAllocHandle allocHandle)\r\n-{\r\n- uint32_t level = 0;\r\n- Node* node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\r\n-\r\n- ++m_FreeCount;\r\n- --m_AllocationCount;\r\n- m_SumFreeSize += LevelToNodeSize(level);\r\n-\r\n- node->type = Node::TYPE_FREE;\r\n-\r\n- \/\/ Join free nodes if possible.\r\n- while (level > 0 && node->buddy->type == Node::TYPE_FREE)\r\n- {\r\n- RemoveFromFreeList(level, node->buddy);\r\n- Node* const parent = node->parent;\r\n-\r\n- m_NodeAllocator.Free(node->buddy);\r\n- m_NodeAllocator.Free(node);\r\n- parent->type = Node::TYPE_FREE;\r\n-\r\n- node = parent;\r\n- --level;\r\n- --m_FreeCount;\r\n- }\r\n-\r\n- AddToFreeListFront(level, node);\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const\r\n-{\r\n- switch (node->type)\r\n- {\r\n- case Node::TYPE_FREE:\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, levelNodeSize);\r\n- break;\r\n- case Node::TYPE_ALLOCATION:\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, levelNodeSize);\r\n- break;\r\n- case Node::TYPE_SPLIT:\r\n- {\r\n- const VkDeviceSize childrenNodeSize = levelNodeSize \/ 2;\r\n- const Node* const leftChild = node->split.leftChild;\r\n- AddNodeToDetailedStatistics(inoutStats, leftChild, childrenNodeSize);\r\n- const Node* const rightChild = leftChild->buddy;\r\n- AddNodeToDetailedStatistics(inoutStats, rightChild, childrenNodeSize);\r\n- }\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node)\r\n-{\r\n- VMA_ASSERT(node->type == Node::TYPE_FREE);\r\n-\r\n- \/\/ List is empty.\r\n- Node* const frontNode = m_FreeList[level].front;\r\n- if (frontNode == VMA_NULL)\r\n- {\r\n- VMA_ASSERT(m_FreeList[level].back == VMA_NULL);\r\n- node->free.prev = node->free.next = VMA_NULL;\r\n- m_FreeList[level].front = m_FreeList[level].back = node;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(frontNode->free.prev == VMA_NULL);\r\n- node->free.prev = VMA_NULL;\r\n- node->free.next = frontNode;\r\n- frontNode->free.prev = node;\r\n- m_FreeList[level].front = node;\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node)\r\n-{\r\n- VMA_ASSERT(m_FreeList[level].front != VMA_NULL);\r\n-\r\n- \/\/ It is at the front.\r\n- if (node->free.prev == VMA_NULL)\r\n- {\r\n- VMA_ASSERT(m_FreeList[level].front == node);\r\n- m_FreeList[level].front = node->free.next;\r\n- }\r\n- else\r\n- {\r\n- Node* const prevFreeNode = node->free.prev;\r\n- VMA_ASSERT(prevFreeNode->free.next == node);\r\n- prevFreeNode->free.next = node->free.next;\r\n- }\r\n-\r\n- \/\/ It is at the back.\r\n- if (node->free.next == VMA_NULL)\r\n- {\r\n- VMA_ASSERT(m_FreeList[level].back == node);\r\n- m_FreeList[level].back = node->free.prev;\r\n- }\r\n- else\r\n- {\r\n- Node* const nextFreeNode = node->free.next;\r\n- VMA_ASSERT(nextFreeNode->free.prev == node);\r\n- nextFreeNode->free.prev = node->free.prev;\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_Buddy::DebugLogAllAllocationNode(Node* node, uint32_t level) const\r\n-{\r\n- switch (node->type)\r\n- {\r\n- case Node::TYPE_FREE:\r\n- break;\r\n- case Node::TYPE_ALLOCATION:\r\n- DebugLogAllocation(node->offset, LevelToNodeSize(level), node->allocation.userData);\r\n- break;\r\n- case Node::TYPE_SPLIT:\r\n- {\r\n- ++level;\r\n- DebugLogAllAllocationNode(node->split.leftChild, level);\r\n- DebugLogAllAllocationNode(node->split.leftChild->buddy, level);\r\n- }\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const\r\n-{\r\n- switch (node->type)\r\n- {\r\n- case Node::TYPE_FREE:\r\n- PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize);\r\n- break;\r\n- case Node::TYPE_ALLOCATION:\r\n- PrintDetailedMap_Allocation(json, node->offset, levelNodeSize, node->allocation.userData);\r\n- break;\r\n- case Node::TYPE_SPLIT:\r\n- {\r\n- const VkDeviceSize childrenNodeSize = levelNodeSize \/ 2;\r\n- const Node* const leftChild = node->split.leftChild;\r\n- PrintDetailedMapNode(json, leftChild, childrenNodeSize);\r\n- const Node* const rightChild = leftChild->buddy;\r\n- PrintDetailedMapNode(json, rightChild, childrenNodeSize);\r\n- }\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-#endif \/\/ _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_METADATA_BUDDY\r\n-#endif \/\/ #if 0\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_TLSF\r\n-\/\/ To not search current larger region if first allocation won't succeed and skip to smaller range\r\n-\/\/ use with VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT as strategy in CreateAllocationRequest().\r\n-\/\/ When fragmentation and reusal of previous blocks doesn't matter then use with\r\n-\/\/ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT for fastest alloc time possible.\r\n-class VmaBlockMetadata_TLSF : public VmaBlockMetadata\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaBlockMetadata_TLSF)\r\n-public:\r\n- VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual);\r\n- virtual ~VmaBlockMetadata_TLSF();\r\n-\r\n- size_t GetAllocationCount() const override { return m_AllocCount; }\r\n- size_t GetFreeRegionsCount() const override { return m_BlocksFreeCount + 1; }\r\n- VkDeviceSize GetSumFreeSize() const override { return m_BlocksFreeSize + m_NullBlock->size; }\r\n- bool IsEmpty() const override { return m_NullBlock->offset == 0; }\r\n- VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return ((Block*)allocHandle)->offset; };\r\n-\r\n- void Init(VkDeviceSize size) override;\r\n- bool Validate() const override;\r\n-\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\r\n- void AddStatistics(VmaStatistics& inoutStats) const override;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\r\n-#endif\r\n-\r\n- bool CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest) override;\r\n-\r\n- VkResult CheckCorruption(const void* pBlockData) override;\r\n- void Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData) override;\r\n-\r\n- void Free(VmaAllocHandle allocHandle) override;\r\n- void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\r\n- void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\r\n- VmaAllocHandle GetAllocationListBegin() const override;\r\n- VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\r\n- VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override;\r\n- void Clear() override;\r\n- void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\r\n- void DebugLogAllAllocations() const override;\r\n-\r\n-private:\r\n- \/\/ According to original paper it should be preferable 4 or 5:\r\n- \/\/ M. Masmano, I. Ripoll, A. Crespo, and J. Real \"TLSF: a New Dynamic Memory Allocator for Real-Time Systems\"\r\n- \/\/ http:\/\/www.gii.upv.es\/tlsf\/files\/ecrts04_tlsf.pdf\r\n- static const uint8_t SECOND_LEVEL_INDEX = 5;\r\n- static const uint16_t SMALL_BUFFER_SIZE = 256;\r\n- static const uint32_t INITIAL_BLOCK_ALLOC_COUNT = 16;\r\n- static const uint8_t MEMORY_CLASS_SHIFT = 7;\r\n- static const uint8_t MAX_MEMORY_CLASSES = 65 - MEMORY_CLASS_SHIFT;\r\n-\r\n- class Block\r\n- {\r\n- public:\r\n- VkDeviceSize offset;\r\n- VkDeviceSize size;\r\n- Block* prevPhysical;\r\n- Block* nextPhysical;\r\n-\r\n- void MarkFree() { prevFree = VMA_NULL; }\r\n- void MarkTaken() { prevFree = this; }\r\n- bool IsFree() const { return prevFree != this; }\r\n- void*& UserData() { VMA_HEAVY_ASSERT(!IsFree()); return userData; }\r\n- Block*& PrevFree() { return prevFree; }\r\n- Block*& NextFree() { VMA_HEAVY_ASSERT(IsFree()); return nextFree; }\r\n-\r\n- private:\r\n- Block* prevFree; \/\/ Address of the same block here indicates that block is taken\r\n- union\r\n- {\r\n- Block* nextFree;\r\n- void* userData;\r\n- };\r\n- };\r\n-\r\n- size_t m_AllocCount;\r\n- \/\/ Total number of free blocks besides null block\r\n- size_t m_BlocksFreeCount;\r\n- \/\/ Total size of free blocks excluding null block\r\n- VkDeviceSize m_BlocksFreeSize;\r\n- uint32_t m_IsFreeBitmap;\r\n- uint8_t m_MemoryClasses;\r\n- uint32_t m_InnerIsFreeBitmap[MAX_MEMORY_CLASSES];\r\n- uint32_t m_ListsCount;\r\n- \/*\r\n- * 0: 0-3 lists for small buffers\r\n- * 1+: 0-(2^SLI-1) lists for normal buffers\r\n- *\/\r\n- Block** m_FreeList;\r\n- VmaPoolAllocator<Block> m_BlockAllocator;\r\n- Block* m_NullBlock;\r\n- VmaBlockBufferImageGranularity m_GranularityHandler;\r\n-\r\n- uint8_t SizeToMemoryClass(VkDeviceSize size) const;\r\n- uint16_t SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const;\r\n- uint32_t GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const;\r\n- uint32_t GetListIndex(VkDeviceSize size) const;\r\n-\r\n- void RemoveFreeBlock(Block* block);\r\n- void InsertFreeBlock(Block* block);\r\n- void MergeBlock(Block* block, Block* prev);\r\n-\r\n- Block* FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const;\r\n- bool CheckBlock(\r\n- Block& block,\r\n- uint32_t listIndex,\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- VmaAllocationRequest* pAllocationRequest);\r\n-};\r\n-\r\n-#ifndef _VMA_BLOCK_METADATA_TLSF_FUNCTIONS\r\n-VmaBlockMetadata_TLSF::VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks,\r\n- VkDeviceSize bufferImageGranularity, bool isVirtual)\r\n- : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\r\n- m_AllocCount(0),\r\n- m_BlocksFreeCount(0),\r\n- m_BlocksFreeSize(0),\r\n- m_IsFreeBitmap(0),\r\n- m_MemoryClasses(0),\r\n- m_ListsCount(0),\r\n- m_FreeList(VMA_NULL),\r\n- m_BlockAllocator(pAllocationCallbacks, INITIAL_BLOCK_ALLOC_COUNT),\r\n- m_NullBlock(VMA_NULL),\r\n- m_GranularityHandler(bufferImageGranularity) {}\r\n-\r\n-VmaBlockMetadata_TLSF::~VmaBlockMetadata_TLSF()\r\n-{\r\n- if (m_FreeList)\r\n- vma_delete_array(GetAllocationCallbacks(), m_FreeList, m_ListsCount);\r\n- m_GranularityHandler.Destroy(GetAllocationCallbacks());\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::Init(VkDeviceSize size)\r\n-{\r\n- VmaBlockMetadata::Init(size);\r\n-\r\n- if (!IsVirtual())\r\n- m_GranularityHandler.Init(GetAllocationCallbacks(), size);\r\n-\r\n- m_NullBlock = m_BlockAllocator.Alloc();\r\n- m_NullBlock->size = size;\r\n- m_NullBlock->offset = 0;\r\n- m_NullBlock->prevPhysical = VMA_NULL;\r\n- m_NullBlock->nextPhysical = VMA_NULL;\r\n- m_NullBlock->MarkFree();\r\n- m_NullBlock->NextFree() = VMA_NULL;\r\n- m_NullBlock->PrevFree() = VMA_NULL;\r\n- uint8_t memoryClass = SizeToMemoryClass(size);\r\n- uint16_t sli = SizeToSecondIndex(size, memoryClass);\r\n- m_ListsCount = (memoryClass == 0 ? 0 : (memoryClass - 1) * (1UL << SECOND_LEVEL_INDEX) + sli) + 1;\r\n- if (IsVirtual())\r\n- m_ListsCount += 1UL << SECOND_LEVEL_INDEX;\r\n- else\r\n- m_ListsCount += 4;\r\n-\r\n- m_MemoryClasses = memoryClass + 2;\r\n- memset(m_InnerIsFreeBitmap, 0, MAX_MEMORY_CLASSES * sizeof(uint32_t));\r\n-\r\n- m_FreeList = vma_new_array(GetAllocationCallbacks(), Block*, m_ListsCount);\r\n- memset(m_FreeList, 0, m_ListsCount * sizeof(Block*));\r\n-}\r\n-\r\n-bool VmaBlockMetadata_TLSF::Validate() const\r\n-{\r\n- VMA_VALIDATE(GetSumFreeSize() <= GetSize());\r\n-\r\n- VkDeviceSize calculatedSize = m_NullBlock->size;\r\n- VkDeviceSize calculatedFreeSize = m_NullBlock->size;\r\n- size_t allocCount = 0;\r\n- size_t freeCount = 0;\r\n-\r\n- \/\/ Check integrity of free lists\r\n- for (uint32_t list = 0; list < m_ListsCount; ++list)\r\n- {\r\n- Block* block = m_FreeList[list];\r\n- if (block != VMA_NULL)\r\n- {\r\n- VMA_VALIDATE(block->IsFree());\r\n- VMA_VALIDATE(block->PrevFree() == VMA_NULL);\r\n- while (block->NextFree())\r\n- {\r\n- VMA_VALIDATE(block->NextFree()->IsFree());\r\n- VMA_VALIDATE(block->NextFree()->PrevFree() == block);\r\n- block = block->NextFree();\r\n- }\r\n- }\r\n- }\r\n-\r\n- VkDeviceSize nextOffset = m_NullBlock->offset;\r\n- auto validateCtx = m_GranularityHandler.StartValidation(GetAllocationCallbacks(), IsVirtual());\r\n-\r\n- VMA_VALIDATE(m_NullBlock->nextPhysical == VMA_NULL);\r\n- if (m_NullBlock->prevPhysical)\r\n- {\r\n- VMA_VALIDATE(m_NullBlock->prevPhysical->nextPhysical == m_NullBlock);\r\n- }\r\n- \/\/ Check all blocks\r\n- for (Block* prev = m_NullBlock->prevPhysical; prev != VMA_NULL; prev = prev->prevPhysical)\r\n- {\r\n- VMA_VALIDATE(prev->offset + prev->size == nextOffset);\r\n- nextOffset = prev->offset;\r\n- calculatedSize += prev->size;\r\n-\r\n- uint32_t listIndex = GetListIndex(prev->size);\r\n- if (prev->IsFree())\r\n- {\r\n- ++freeCount;\r\n- \/\/ Check if free block belongs to free list\r\n- Block* freeBlock = m_FreeList[listIndex];\r\n- VMA_VALIDATE(freeBlock != VMA_NULL);\r\n-\r\n- bool found = false;\r\n- do\r\n- {\r\n- if (freeBlock == prev)\r\n- found = true;\r\n-\r\n- freeBlock = freeBlock->NextFree();\r\n- } while (!found && freeBlock != VMA_NULL);\r\n-\r\n- VMA_VALIDATE(found);\r\n- calculatedFreeSize += prev->size;\r\n- }\r\n- else\r\n- {\r\n- ++allocCount;\r\n- \/\/ Check if taken block is not on a free list\r\n- Block* freeBlock = m_FreeList[listIndex];\r\n- while (freeBlock)\r\n- {\r\n- VMA_VALIDATE(freeBlock != prev);\r\n- freeBlock = freeBlock->NextFree();\r\n- }\r\n-\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(m_GranularityHandler.Validate(validateCtx, prev->offset, prev->size));\r\n- }\r\n- }\r\n-\r\n- if (prev->prevPhysical)\r\n- {\r\n- VMA_VALIDATE(prev->prevPhysical->nextPhysical == prev);\r\n- }\r\n- }\r\n-\r\n- if (!IsVirtual())\r\n- {\r\n- VMA_VALIDATE(m_GranularityHandler.FinishValidation(validateCtx));\r\n- }\r\n-\r\n- VMA_VALIDATE(nextOffset == 0);\r\n- VMA_VALIDATE(calculatedSize == GetSize());\r\n- VMA_VALIDATE(calculatedFreeSize == GetSumFreeSize());\r\n- VMA_VALIDATE(allocCount == m_AllocCount);\r\n- VMA_VALIDATE(freeCount == m_BlocksFreeCount);\r\n-\r\n- return true;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\r\n-{\r\n- inoutStats.statistics.blockCount++;\r\n- inoutStats.statistics.blockBytes += GetSize();\r\n- if (m_NullBlock->size > 0)\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, m_NullBlock->size);\r\n-\r\n- for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\r\n- {\r\n- if (block->IsFree())\r\n- VmaAddDetailedStatisticsUnusedRange(inoutStats, block->size);\r\n- else\r\n- VmaAddDetailedStatisticsAllocation(inoutStats, block->size);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::AddStatistics(VmaStatistics& inoutStats) const\r\n-{\r\n- inoutStats.blockCount++;\r\n- inoutStats.allocationCount += (uint32_t)m_AllocCount;\r\n- inoutStats.blockBytes += GetSize();\r\n- inoutStats.allocationBytes += GetSize() - GetSumFreeSize();\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockMetadata_TLSF::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\r\n-{\r\n- size_t blockCount = m_AllocCount + m_BlocksFreeCount;\r\n- VmaStlAllocator<Block*> allocator(GetAllocationCallbacks());\r\n- VmaVector<Block*, VmaStlAllocator<Block*>> blockList(blockCount, allocator);\r\n-\r\n- size_t i = blockCount;\r\n- for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\r\n- {\r\n- blockList[--i] = block;\r\n- }\r\n- VMA_ASSERT(i == 0);\r\n-\r\n- VmaDetailedStatistics stats;\r\n- VmaClearDetailedStatistics(stats);\r\n- AddDetailedStatistics(stats);\r\n-\r\n- PrintDetailedMap_Begin(\r\n- json,\r\n- stats.statistics.blockBytes - stats.statistics.allocationBytes,\r\n- stats.statistics.allocationCount,\r\n- stats.unusedRangeCount,\r\n- mapRefCount);\r\n-\r\n- for (; i < blockCount; ++i)\r\n- {\r\n- Block* block = blockList[i];\r\n- if (block->IsFree())\r\n- PrintDetailedMap_UnusedRange(json, block->offset, block->size);\r\n- else\r\n- PrintDetailedMap_Allocation(json, block->offset, block->size, block->UserData());\r\n- }\r\n- if (m_NullBlock->size > 0)\r\n- PrintDetailedMap_UnusedRange(json, m_NullBlock->offset, m_NullBlock->size);\r\n-\r\n- PrintDetailedMap_End(json);\r\n-}\r\n-#endif\r\n-\r\n-bool VmaBlockMetadata_TLSF::CreateAllocationRequest(\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- bool upperAddress,\r\n- VmaSuballocationType allocType,\r\n- uint32_t strategy,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- VMA_ASSERT(allocSize > 0 && \"Cannot allocate empty block!\");\r\n- VMA_ASSERT(!upperAddress && \"VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.\");\r\n-\r\n- \/\/ For small granularity round up\r\n- if (!IsVirtual())\r\n- m_GranularityHandler.RoundupAllocRequest(allocType, allocSize, allocAlignment);\r\n-\r\n- allocSize += GetDebugMargin();\r\n- \/\/ Quick check for too small pool\r\n- if (allocSize > GetSumFreeSize())\r\n- return false;\r\n-\r\n- \/\/ If no free blocks in pool then check only null block\r\n- if (m_BlocksFreeCount == 0)\r\n- return CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest);\r\n-\r\n- \/\/ Round up to the next block\r\n- VkDeviceSize sizeForNextList = allocSize;\r\n- VkDeviceSize smallSizeStep = SMALL_BUFFER_SIZE \/ (IsVirtual() ? 1 << SECOND_LEVEL_INDEX : 4);\r\n- if (allocSize > SMALL_BUFFER_SIZE)\r\n- {\r\n- sizeForNextList += (1ULL << (VMA_BITSCAN_MSB(allocSize) - SECOND_LEVEL_INDEX));\r\n- }\r\n- else if (allocSize > SMALL_BUFFER_SIZE - smallSizeStep)\r\n- sizeForNextList = SMALL_BUFFER_SIZE + 1;\r\n- else\r\n- sizeForNextList += smallSizeStep;\r\n-\r\n- uint32_t nextListIndex = 0;\r\n- uint32_t prevListIndex = 0;\r\n- Block* nextListBlock = VMA_NULL;\r\n- Block* prevListBlock = VMA_NULL;\r\n-\r\n- \/\/ Check blocks according to strategies\r\n- if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT)\r\n- {\r\n- \/\/ Quick check for larger block first\r\n- nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\r\n- if (nextListBlock != VMA_NULL && CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n-\r\n- \/\/ If not fitted then null block\r\n- if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n-\r\n- \/\/ Null block failed, search larger bucket\r\n- while (nextListBlock)\r\n- {\r\n- if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- nextListBlock = nextListBlock->NextFree();\r\n- }\r\n-\r\n- \/\/ Failed again, check best fit bucket\r\n- prevListBlock = FindFreeBlock(allocSize, prevListIndex);\r\n- while (prevListBlock)\r\n- {\r\n- if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- prevListBlock = prevListBlock->NextFree();\r\n- }\r\n- }\r\n- else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT)\r\n- {\r\n- \/\/ Check best fit bucket\r\n- prevListBlock = FindFreeBlock(allocSize, prevListIndex);\r\n- while (prevListBlock)\r\n- {\r\n- if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- prevListBlock = prevListBlock->NextFree();\r\n- }\r\n-\r\n- \/\/ If failed check null block\r\n- if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n-\r\n- \/\/ Check larger bucket\r\n- nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\r\n- while (nextListBlock)\r\n- {\r\n- if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- nextListBlock = nextListBlock->NextFree();\r\n- }\r\n- }\r\n- else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT )\r\n- {\r\n- \/\/ Perform search from the start\r\n- VmaStlAllocator<Block*> allocator(GetAllocationCallbacks());\r\n- VmaVector<Block*, VmaStlAllocator<Block*>> blockList(m_BlocksFreeCount, allocator);\r\n-\r\n- size_t i = m_BlocksFreeCount;\r\n- for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\r\n- {\r\n- if (block->IsFree() && block->size >= allocSize)\r\n- blockList[--i] = block;\r\n- }\r\n-\r\n- for (; i < m_BlocksFreeCount; ++i)\r\n- {\r\n- Block& block = *blockList[i];\r\n- if (CheckBlock(block, GetListIndex(block.size), allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- }\r\n-\r\n- \/\/ If failed check null block\r\n- if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n-\r\n- \/\/ Whole range searched, no more memory\r\n- return false;\r\n- }\r\n- else\r\n- {\r\n- \/\/ Check larger bucket\r\n- nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\r\n- while (nextListBlock)\r\n- {\r\n- if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- nextListBlock = nextListBlock->NextFree();\r\n- }\r\n-\r\n- \/\/ If failed check null block\r\n- if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n-\r\n- \/\/ Check best fit bucket\r\n- prevListBlock = FindFreeBlock(allocSize, prevListIndex);\r\n- while (prevListBlock)\r\n- {\r\n- if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- prevListBlock = prevListBlock->NextFree();\r\n- }\r\n- }\r\n-\r\n- \/\/ Worst case, full search has to be done\r\n- while (++nextListIndex < m_ListsCount)\r\n- {\r\n- nextListBlock = m_FreeList[nextListIndex];\r\n- while (nextListBlock)\r\n- {\r\n- if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\r\n- return true;\r\n- nextListBlock = nextListBlock->NextFree();\r\n- }\r\n- }\r\n-\r\n- \/\/ No more memory sadly\r\n- return false;\r\n-}\r\n-\r\n-VkResult VmaBlockMetadata_TLSF::CheckCorruption(const void* pBlockData)\r\n-{\r\n- for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\r\n- {\r\n- if (!block->IsFree())\r\n- {\r\n- if (!VmaValidateMagicValue(pBlockData, block->offset + block->size))\r\n- {\r\n- VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\r\n- return VK_ERROR_UNKNOWN_COPY;\r\n- }\r\n- }\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::Alloc(\r\n- const VmaAllocationRequest& request,\r\n- VmaSuballocationType type,\r\n- void* userData)\r\n-{\r\n- VMA_ASSERT(request.type == VmaAllocationRequestType::TLSF);\r\n-\r\n- \/\/ Get block and pop it from the free list\r\n- Block* currentBlock = (Block*)request.allocHandle;\r\n- VkDeviceSize offset = request.algorithmData;\r\n- VMA_ASSERT(currentBlock != VMA_NULL);\r\n- VMA_ASSERT(currentBlock->offset <= offset);\r\n-\r\n- if (currentBlock != m_NullBlock)\r\n- RemoveFreeBlock(currentBlock);\r\n-\r\n- VkDeviceSize debugMargin = GetDebugMargin();\r\n- VkDeviceSize misssingAlignment = offset - currentBlock->offset;\r\n-\r\n- \/\/ Append missing alignment to prev block or create new one\r\n- if (misssingAlignment)\r\n- {\r\n- Block* prevBlock = currentBlock->prevPhysical;\r\n- VMA_ASSERT(prevBlock != VMA_NULL && \"There should be no missing alignment at offset 0!\");\r\n-\r\n- if (prevBlock->IsFree() && prevBlock->size != debugMargin)\r\n- {\r\n- uint32_t oldList = GetListIndex(prevBlock->size);\r\n- prevBlock->size += misssingAlignment;\r\n- \/\/ Check if new size crosses list bucket\r\n- if (oldList != GetListIndex(prevBlock->size))\r\n- {\r\n- prevBlock->size -= misssingAlignment;\r\n- RemoveFreeBlock(prevBlock);\r\n- prevBlock->size += misssingAlignment;\r\n- InsertFreeBlock(prevBlock);\r\n- }\r\n- else\r\n- m_BlocksFreeSize += misssingAlignment;\r\n- }\r\n- else\r\n- {\r\n- Block* newBlock = m_BlockAllocator.Alloc();\r\n- currentBlock->prevPhysical = newBlock;\r\n- prevBlock->nextPhysical = newBlock;\r\n- newBlock->prevPhysical = prevBlock;\r\n- newBlock->nextPhysical = currentBlock;\r\n- newBlock->size = misssingAlignment;\r\n- newBlock->offset = currentBlock->offset;\r\n- newBlock->MarkTaken();\r\n-\r\n- InsertFreeBlock(newBlock);\r\n- }\r\n-\r\n- currentBlock->size -= misssingAlignment;\r\n- currentBlock->offset += misssingAlignment;\r\n- }\r\n-\r\n- VkDeviceSize size = request.size + debugMargin;\r\n- if (currentBlock->size == size)\r\n- {\r\n- if (currentBlock == m_NullBlock)\r\n- {\r\n- \/\/ Setup new null block\r\n- m_NullBlock = m_BlockAllocator.Alloc();\r\n- m_NullBlock->size = 0;\r\n- m_NullBlock->offset = currentBlock->offset + size;\r\n- m_NullBlock->prevPhysical = currentBlock;\r\n- m_NullBlock->nextPhysical = VMA_NULL;\r\n- m_NullBlock->MarkFree();\r\n- m_NullBlock->PrevFree() = VMA_NULL;\r\n- m_NullBlock->NextFree() = VMA_NULL;\r\n- currentBlock->nextPhysical = m_NullBlock;\r\n- currentBlock->MarkTaken();\r\n- }\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(currentBlock->size > size && \"Proper block already found, shouldn't find smaller one!\");\r\n-\r\n- \/\/ Create new free block\r\n- Block* newBlock = m_BlockAllocator.Alloc();\r\n- newBlock->size = currentBlock->size - size;\r\n- newBlock->offset = currentBlock->offset + size;\r\n- newBlock->prevPhysical = currentBlock;\r\n- newBlock->nextPhysical = currentBlock->nextPhysical;\r\n- currentBlock->nextPhysical = newBlock;\r\n- currentBlock->size = size;\r\n-\r\n- if (currentBlock == m_NullBlock)\r\n- {\r\n- m_NullBlock = newBlock;\r\n- m_NullBlock->MarkFree();\r\n- m_NullBlock->NextFree() = VMA_NULL;\r\n- m_NullBlock->PrevFree() = VMA_NULL;\r\n- currentBlock->MarkTaken();\r\n- }\r\n- else\r\n- {\r\n- newBlock->nextPhysical->prevPhysical = newBlock;\r\n- newBlock->MarkTaken();\r\n- InsertFreeBlock(newBlock);\r\n- }\r\n- }\r\n- currentBlock->UserData() = userData;\r\n-\r\n- if (debugMargin > 0)\r\n- {\r\n- currentBlock->size -= debugMargin;\r\n- Block* newBlock = m_BlockAllocator.Alloc();\r\n- newBlock->size = debugMargin;\r\n- newBlock->offset = currentBlock->offset + currentBlock->size;\r\n- newBlock->prevPhysical = currentBlock;\r\n- newBlock->nextPhysical = currentBlock->nextPhysical;\r\n- newBlock->MarkTaken();\r\n- currentBlock->nextPhysical->prevPhysical = newBlock;\r\n- currentBlock->nextPhysical = newBlock;\r\n- InsertFreeBlock(newBlock);\r\n- }\r\n-\r\n- if (!IsVirtual())\r\n- m_GranularityHandler.AllocPages((uint8_t)(uintptr_t)request.customData,\r\n- currentBlock->offset, currentBlock->size);\r\n- ++m_AllocCount;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::Free(VmaAllocHandle allocHandle)\r\n-{\r\n- Block* block = (Block*)allocHandle;\r\n- Block* next = block->nextPhysical;\r\n- VMA_ASSERT(!block->IsFree() && \"Block is already free!\");\r\n-\r\n- if (!IsVirtual())\r\n- m_GranularityHandler.FreePages(block->offset, block->size);\r\n- --m_AllocCount;\r\n-\r\n- VkDeviceSize debugMargin = GetDebugMargin();\r\n- if (debugMargin > 0)\r\n- {\r\n- RemoveFreeBlock(next);\r\n- MergeBlock(next, block);\r\n- block = next;\r\n- next = next->nextPhysical;\r\n- }\r\n-\r\n- \/\/ Try merging\r\n- Block* prev = block->prevPhysical;\r\n- if (prev != VMA_NULL && prev->IsFree() && prev->size != debugMargin)\r\n- {\r\n- RemoveFreeBlock(prev);\r\n- MergeBlock(block, prev);\r\n- }\r\n-\r\n- if (!next->IsFree())\r\n- InsertFreeBlock(block);\r\n- else if (next == m_NullBlock)\r\n- MergeBlock(m_NullBlock, block);\r\n- else\r\n- {\r\n- RemoveFreeBlock(next);\r\n- MergeBlock(next, block);\r\n- InsertFreeBlock(next);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\r\n-{\r\n- Block* block = (Block*)allocHandle;\r\n- VMA_ASSERT(!block->IsFree() && \"Cannot get allocation info for free block!\");\r\n- outInfo.offset = block->offset;\r\n- outInfo.size = block->size;\r\n- outInfo.pUserData = block->UserData();\r\n-}\r\n-\r\n-void* VmaBlockMetadata_TLSF::GetAllocationUserData(VmaAllocHandle allocHandle) const\r\n-{\r\n- Block* block = (Block*)allocHandle;\r\n- VMA_ASSERT(!block->IsFree() && \"Cannot get user data for free block!\");\r\n- return block->UserData();\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_TLSF::GetAllocationListBegin() const\r\n-{\r\n- if (m_AllocCount == 0)\r\n- return VK_NULL_HANDLE;\r\n-\r\n- for (Block* block = m_NullBlock->prevPhysical; block; block = block->prevPhysical)\r\n- {\r\n- if (!block->IsFree())\r\n- return (VmaAllocHandle)block;\r\n- }\r\n- VMA_ASSERT(false && \"If m_AllocCount > 0 then should find any allocation!\");\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VmaAllocHandle VmaBlockMetadata_TLSF::GetNextAllocation(VmaAllocHandle prevAlloc) const\r\n-{\r\n- Block* startBlock = (Block*)prevAlloc;\r\n- VMA_ASSERT(!startBlock->IsFree() && \"Incorrect block!\");\r\n-\r\n- for (Block* block = startBlock->prevPhysical; block; block = block->prevPhysical)\r\n- {\r\n- if (!block->IsFree())\r\n- return (VmaAllocHandle)block;\r\n- }\r\n- return VK_NULL_HANDLE;\r\n-}\r\n-\r\n-VkDeviceSize VmaBlockMetadata_TLSF::GetNextFreeRegionSize(VmaAllocHandle alloc) const\r\n-{\r\n- Block* block = (Block*)alloc;\r\n- VMA_ASSERT(!block->IsFree() && \"Incorrect block!\");\r\n-\r\n- if (block->prevPhysical)\r\n- return block->prevPhysical->IsFree() ? block->prevPhysical->size : 0;\r\n- return 0;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::Clear()\r\n-{\r\n- m_AllocCount = 0;\r\n- m_BlocksFreeCount = 0;\r\n- m_BlocksFreeSize = 0;\r\n- m_IsFreeBitmap = 0;\r\n- m_NullBlock->offset = 0;\r\n- m_NullBlock->size = GetSize();\r\n- Block* block = m_NullBlock->prevPhysical;\r\n- m_NullBlock->prevPhysical = VMA_NULL;\r\n- while (block)\r\n- {\r\n- Block* prev = block->prevPhysical;\r\n- m_BlockAllocator.Free(block);\r\n- block = prev;\r\n- }\r\n- memset(m_FreeList, 0, m_ListsCount * sizeof(Block*));\r\n- memset(m_InnerIsFreeBitmap, 0, m_MemoryClasses * sizeof(uint32_t));\r\n- m_GranularityHandler.Clear();\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\r\n-{\r\n- Block* block = (Block*)allocHandle;\r\n- VMA_ASSERT(!block->IsFree() && \"Trying to set user data for not allocated block!\");\r\n- block->UserData() = userData;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::DebugLogAllAllocations() const\r\n-{\r\n- for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\r\n- if (!block->IsFree())\r\n- DebugLogAllocation(block->offset, block->size, block->UserData());\r\n-}\r\n-\r\n-uint8_t VmaBlockMetadata_TLSF::SizeToMemoryClass(VkDeviceSize size) const\r\n-{\r\n- if (size > SMALL_BUFFER_SIZE)\r\n- return VMA_BITSCAN_MSB(size) - MEMORY_CLASS_SHIFT;\r\n- return 0;\r\n-}\r\n-\r\n-uint16_t VmaBlockMetadata_TLSF::SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const\r\n-{\r\n- if (memoryClass == 0)\r\n- {\r\n- if (IsVirtual())\r\n- return static_cast<uint16_t>((size - 1) \/ 8);\r\n- else\r\n- return static_cast<uint16_t>((size - 1) \/ 64);\r\n- }\r\n- return static_cast<uint16_t>((size >> (memoryClass + MEMORY_CLASS_SHIFT - SECOND_LEVEL_INDEX)) ^ (1U << SECOND_LEVEL_INDEX));\r\n-}\r\n-\r\n-uint32_t VmaBlockMetadata_TLSF::GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const\r\n-{\r\n- if (memoryClass == 0)\r\n- return secondIndex;\r\n-\r\n- const uint32_t index = static_cast<uint32_t>(memoryClass - 1) * (1 << SECOND_LEVEL_INDEX) + secondIndex;\r\n- if (IsVirtual())\r\n- return index + (1 << SECOND_LEVEL_INDEX);\r\n- else\r\n- return index + 4;\r\n-}\r\n-\r\n-uint32_t VmaBlockMetadata_TLSF::GetListIndex(VkDeviceSize size) const\r\n-{\r\n- uint8_t memoryClass = SizeToMemoryClass(size);\r\n- return GetListIndex(memoryClass, SizeToSecondIndex(size, memoryClass));\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::RemoveFreeBlock(Block* block)\r\n-{\r\n- VMA_ASSERT(block != m_NullBlock);\r\n- VMA_ASSERT(block->IsFree());\r\n-\r\n- if (block->NextFree() != VMA_NULL)\r\n- block->NextFree()->PrevFree() = block->PrevFree();\r\n- if (block->PrevFree() != VMA_NULL)\r\n- block->PrevFree()->NextFree() = block->NextFree();\r\n- else\r\n- {\r\n- uint8_t memClass = SizeToMemoryClass(block->size);\r\n- uint16_t secondIndex = SizeToSecondIndex(block->size, memClass);\r\n- uint32_t index = GetListIndex(memClass, secondIndex);\r\n- VMA_ASSERT(m_FreeList[index] == block);\r\n- m_FreeList[index] = block->NextFree();\r\n- if (block->NextFree() == VMA_NULL)\r\n- {\r\n- m_InnerIsFreeBitmap[memClass] &= ~(1U << secondIndex);\r\n- if (m_InnerIsFreeBitmap[memClass] == 0)\r\n- m_IsFreeBitmap &= ~(1UL << memClass);\r\n- }\r\n- }\r\n- block->MarkTaken();\r\n- block->UserData() = VMA_NULL;\r\n- --m_BlocksFreeCount;\r\n- m_BlocksFreeSize -= block->size;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::InsertFreeBlock(Block* block)\r\n-{\r\n- VMA_ASSERT(block != m_NullBlock);\r\n- VMA_ASSERT(!block->IsFree() && \"Cannot insert block twice!\");\r\n-\r\n- uint8_t memClass = SizeToMemoryClass(block->size);\r\n- uint16_t secondIndex = SizeToSecondIndex(block->size, memClass);\r\n- uint32_t index = GetListIndex(memClass, secondIndex);\r\n- VMA_ASSERT(index < m_ListsCount);\r\n- block->PrevFree() = VMA_NULL;\r\n- block->NextFree() = m_FreeList[index];\r\n- m_FreeList[index] = block;\r\n- if (block->NextFree() != VMA_NULL)\r\n- block->NextFree()->PrevFree() = block;\r\n- else\r\n- {\r\n- m_InnerIsFreeBitmap[memClass] |= 1U << secondIndex;\r\n- m_IsFreeBitmap |= 1UL << memClass;\r\n- }\r\n- ++m_BlocksFreeCount;\r\n- m_BlocksFreeSize += block->size;\r\n-}\r\n-\r\n-void VmaBlockMetadata_TLSF::MergeBlock(Block* block, Block* prev)\r\n-{\r\n- VMA_ASSERT(block->prevPhysical == prev && \"Cannot merge seperate physical regions!\");\r\n- VMA_ASSERT(!prev->IsFree() && \"Cannot merge block that belongs to free list!\");\r\n-\r\n- block->offset = prev->offset;\r\n- block->size += prev->size;\r\n- block->prevPhysical = prev->prevPhysical;\r\n- if (block->prevPhysical)\r\n- block->prevPhysical->nextPhysical = block;\r\n- m_BlockAllocator.Free(prev);\r\n-}\r\n-\r\n-VmaBlockMetadata_TLSF::Block* VmaBlockMetadata_TLSF::FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const\r\n-{\r\n- uint8_t memoryClass = SizeToMemoryClass(size);\r\n- uint32_t innerFreeMap = m_InnerIsFreeBitmap[memoryClass] & (~0U << SizeToSecondIndex(size, memoryClass));\r\n- if (!innerFreeMap)\r\n- {\r\n- \/\/ Check higher levels for avaiable blocks\r\n- uint32_t freeMap = m_IsFreeBitmap & (~0UL << (memoryClass + 1));\r\n- if (!freeMap)\r\n- return VMA_NULL; \/\/ No more memory avaible\r\n-\r\n- \/\/ Find lowest free region\r\n- memoryClass = VMA_BITSCAN_LSB(freeMap);\r\n- innerFreeMap = m_InnerIsFreeBitmap[memoryClass];\r\n- VMA_ASSERT(innerFreeMap != 0);\r\n- }\r\n- \/\/ Find lowest free subregion\r\n- listIndex = GetListIndex(memoryClass, VMA_BITSCAN_LSB(innerFreeMap));\r\n- VMA_ASSERT(m_FreeList[listIndex]);\r\n- return m_FreeList[listIndex];\r\n-}\r\n-\r\n-bool VmaBlockMetadata_TLSF::CheckBlock(\r\n- Block& block,\r\n- uint32_t listIndex,\r\n- VkDeviceSize allocSize,\r\n- VkDeviceSize allocAlignment,\r\n- VmaSuballocationType allocType,\r\n- VmaAllocationRequest* pAllocationRequest)\r\n-{\r\n- VMA_ASSERT(block.IsFree() && \"Block is already taken!\");\r\n-\r\n- VkDeviceSize alignedOffset = VmaAlignUp(block.offset, allocAlignment);\r\n- if (block.size < allocSize + alignedOffset - block.offset)\r\n- return false;\r\n-\r\n- \/\/ Check for granularity conflicts\r\n- if (!IsVirtual() &&\r\n- m_GranularityHandler.CheckConflictAndAlignUp(alignedOffset, allocSize, block.offset, block.size, allocType))\r\n- return false;\r\n-\r\n- \/\/ Alloc successful\r\n- pAllocationRequest->type = VmaAllocationRequestType::TLSF;\r\n- pAllocationRequest->allocHandle = (VmaAllocHandle)█\r\n- pAllocationRequest->size = allocSize - GetDebugMargin();\r\n- pAllocationRequest->customData = (void*)allocType;\r\n- pAllocationRequest->algorithmData = alignedOffset;\r\n-\r\n- \/\/ Place block at the start of list if it's normal block\r\n- if (listIndex != m_ListsCount && block.PrevFree())\r\n- {\r\n- block.PrevFree()->NextFree() = block.NextFree();\r\n- if (block.NextFree())\r\n- block.NextFree()->PrevFree() = block.PrevFree();\r\n- block.PrevFree() = VMA_NULL;\r\n- block.NextFree() = m_FreeList[listIndex];\r\n- m_FreeList[listIndex] = █\r\n- if (block.NextFree())\r\n- block.NextFree()->PrevFree() = █\r\n- }\r\n-\r\n- return true;\r\n-}\r\n-#endif \/\/ _VMA_BLOCK_METADATA_TLSF_FUNCTIONS\r\n-#endif \/\/ _VMA_BLOCK_METADATA_TLSF\r\n-\r\n-#ifndef _VMA_BLOCK_VECTOR\r\n-\/*\r\n-Sequence of VmaDeviceMemoryBlock. Represents memory blocks allocated for a specific\r\n-Vulkan memory type.\r\n-\r\n-Synchronized internally with a mutex.\r\n-*\/\r\n-class VmaBlockVector\r\n-{\r\n- friend struct VmaDefragmentationContext_T;\r\n- VMA_CLASS_NO_COPY(VmaBlockVector)\r\n-public:\r\n- VmaBlockVector(\r\n- VmaAllocator hAllocator,\r\n- VmaPool hParentPool,\r\n- uint32_t memoryTypeIndex,\r\n- VkDeviceSize preferredBlockSize,\r\n- size_t minBlockCount,\r\n- size_t maxBlockCount,\r\n- VkDeviceSize bufferImageGranularity,\r\n- bool explicitBlockSize,\r\n- uint32_t algorithm,\r\n- float priority,\r\n- VkDeviceSize minAllocationAlignment,\r\n- void* pMemoryAllocateNext);\r\n- ~VmaBlockVector();\r\n-\r\n- VmaAllocator GetAllocator() const { return m_hAllocator; }\r\n- VmaPool GetParentPool() const { return m_hParentPool; }\r\n- bool IsCustomPool() const { return m_hParentPool != VMA_NULL; }\r\n- uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\r\n- VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; }\r\n- VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }\r\n- uint32_t GetAlgorithm() const { return m_Algorithm; }\r\n- bool HasExplicitBlockSize() const { return m_ExplicitBlockSize; }\r\n- float GetPriority() const { return m_Priority; }\r\n- void* const GetAllocationNextPtr() const { return m_pMemoryAllocateNext; }\r\n- \/\/ To be used only while the m_Mutex is locked. Used during defragmentation.\r\n- size_t GetBlockCount() const { return m_Blocks.size(); }\r\n- \/\/ To be used only while the m_Mutex is locked. Used during defragmentation.\r\n- VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; }\r\n- VMA_RW_MUTEX &GetMutex() { return m_Mutex; }\r\n-\r\n- VkResult CreateMinBlocks();\r\n- void AddStatistics(VmaStatistics& inoutStats);\r\n- void AddDetailedStatistics(VmaDetailedStatistics& inoutStats);\r\n- bool IsEmpty();\r\n- bool IsCorruptionDetectionEnabled() const;\r\n-\r\n- VkResult Allocate(\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations);\r\n-\r\n- void Free(const VmaAllocation hAllocation, bool incrementalSort = true);\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json);\r\n-#endif\r\n-\r\n- VkResult CheckCorruption();\r\n-\r\n-private:\r\n- const VmaAllocator m_hAllocator;\r\n- const VmaPool m_hParentPool;\r\n- const uint32_t m_MemoryTypeIndex;\r\n- const VkDeviceSize m_PreferredBlockSize;\r\n- const size_t m_MinBlockCount;\r\n- const size_t m_MaxBlockCount;\r\n- const VkDeviceSize m_BufferImageGranularity;\r\n- const bool m_ExplicitBlockSize;\r\n- const uint32_t m_Algorithm;\r\n- const float m_Priority;\r\n- const VkDeviceSize m_MinAllocationAlignment;\r\n-\r\n- void* const m_pMemoryAllocateNext;\r\n- VMA_RW_MUTEX m_Mutex;\r\n- \/\/ Incrementally sorted by sumFreeSize, ascending.\r\n- VmaVector<VmaDeviceMemoryBlock*, VmaStlAllocator<VmaDeviceMemoryBlock*>> m_Blocks;\r\n- uint32_t m_NextBlockId;\r\n-\r\n- VkDeviceSize CalcMaxBlockSize() const;\r\n- \/\/ Finds and removes given block from vector.\r\n- void Remove(VmaDeviceMemoryBlock* pBlock);\r\n- \/\/ Performs single step in sorting m_Blocks. They may not be fully sorted\r\n- \/\/ after this call.\r\n- void IncrementallySortBlocks();\r\n- void SortByFreeSize();\r\n-\r\n- VkResult AllocatePage(\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- VmaAllocation* pAllocation);\r\n-\r\n- VkResult AllocateFromBlock(\r\n- VmaDeviceMemoryBlock* pBlock,\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- VmaAllocationCreateFlags allocFlags,\r\n- void* pUserData,\r\n- VmaSuballocationType suballocType,\r\n- uint32_t strategy,\r\n- VmaAllocation* pAllocation);\r\n-\r\n- VkResult CommitAllocationRequest(\r\n- VmaAllocationRequest& allocRequest,\r\n- VmaDeviceMemoryBlock* pBlock,\r\n- VkDeviceSize alignment,\r\n- VmaAllocationCreateFlags allocFlags,\r\n- void* pUserData,\r\n- VmaSuballocationType suballocType,\r\n- VmaAllocation* pAllocation);\r\n-\r\n- VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex);\r\n- bool HasEmptyBlock();\r\n-};\r\n-#endif \/\/ _VMA_BLOCK_VECTOR\r\n-\r\n-#ifndef _VMA_DEFRAGMENTATION_CONTEXT\r\n-struct VmaDefragmentationContext_T\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaDefragmentationContext_T)\r\n-public:\r\n- VmaDefragmentationContext_T(\r\n- VmaAllocator hAllocator,\r\n- const VmaDefragmentationInfo& info);\r\n- ~VmaDefragmentationContext_T();\r\n-\r\n- void GetStats(VmaDefragmentationStats& outStats) { outStats = m_GlobalStats; }\r\n-\r\n- VkResult DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo);\r\n- VkResult DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo);\r\n-\r\n-private:\r\n- \/\/ Max number of allocations to ignore due to size constraints before ending single pass\r\n- static const uint8_t MAX_ALLOCS_TO_IGNORE = 16;\r\n- enum class CounterStatus { Pass, Ignore, End };\r\n-\r\n- struct FragmentedBlock\r\n- {\r\n- uint32_t data;\r\n- VmaDeviceMemoryBlock* block;\r\n- };\r\n- struct StateBalanced\r\n- {\r\n- VkDeviceSize avgFreeSize = 0;\r\n- VkDeviceSize avgAllocSize = UINT64_MAX;\r\n- };\r\n- struct StateExtensive\r\n- {\r\n- enum class Operation : uint8_t\r\n- {\r\n- FindFreeBlockBuffer, FindFreeBlockTexture, FindFreeBlockAll,\r\n- MoveBuffers, MoveTextures, MoveAll,\r\n- Cleanup, Done\r\n- };\r\n-\r\n- Operation operation = Operation::FindFreeBlockTexture;\r\n- size_t firstFreeBlock = SIZE_MAX;\r\n- };\r\n- struct MoveAllocationData\r\n- {\r\n- VkDeviceSize size;\r\n- VkDeviceSize alignment;\r\n- VmaSuballocationType type;\r\n- VmaAllocationCreateFlags flags;\r\n- VmaDefragmentationMove move = {};\r\n- };\r\n-\r\n- const VkDeviceSize m_MaxPassBytes;\r\n- const uint32_t m_MaxPassAllocations;\r\n-\r\n- VmaStlAllocator<VmaDefragmentationMove> m_MoveAllocator;\r\n- VmaVector<VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove>> m_Moves;\r\n-\r\n- uint8_t m_IgnoredAllocs = 0;\r\n- uint32_t m_Algorithm;\r\n- uint32_t m_BlockVectorCount;\r\n- VmaBlockVector* m_PoolBlockVector;\r\n- VmaBlockVector** m_pBlockVectors;\r\n- size_t m_ImmovableBlockCount = 0;\r\n- VmaDefragmentationStats m_GlobalStats = { 0 };\r\n- VmaDefragmentationStats m_PassStats = { 0 };\r\n- void* m_AlgorithmState = VMA_NULL;\r\n-\r\n- static MoveAllocationData GetMoveData(VmaAllocHandle handle, VmaBlockMetadata* metadata);\r\n- CounterStatus CheckCounters(VkDeviceSize bytes);\r\n- bool IncrementCounters(VkDeviceSize bytes);\r\n- bool ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block);\r\n- bool AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector);\r\n-\r\n- bool ComputeDefragmentation(VmaBlockVector& vector, size_t index);\r\n- bool ComputeDefragmentation_Fast(VmaBlockVector& vector);\r\n- bool ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update);\r\n- bool ComputeDefragmentation_Full(VmaBlockVector& vector);\r\n- bool ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index);\r\n-\r\n- void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state);\r\n- bool MoveDataToFreeBlocks(VmaSuballocationType currentType,\r\n- VmaBlockVector& vector, size_t firstFreeBlock,\r\n- bool& texturePresent, bool& bufferPresent, bool& otherPresent);\r\n-};\r\n-#endif \/\/ _VMA_DEFRAGMENTATION_CONTEXT\r\n-\r\n-#ifndef _VMA_POOL_T\r\n-struct VmaPool_T\r\n-{\r\n- friend struct VmaPoolListItemTraits;\r\n- VMA_CLASS_NO_COPY(VmaPool_T)\r\n-public:\r\n- VmaBlockVector m_BlockVector;\r\n- VmaDedicatedAllocationList m_DedicatedAllocations;\r\n-\r\n- VmaPool_T(\r\n- VmaAllocator hAllocator,\r\n- const VmaPoolCreateInfo& createInfo,\r\n- VkDeviceSize preferredBlockSize);\r\n- ~VmaPool_T();\r\n-\r\n- uint32_t GetId() const { return m_Id; }\r\n- void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; }\r\n-\r\n- const char* GetName() const { return m_Name; }\r\n- void SetName(const char* pName);\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- \/\/void PrintDetailedMap(class VmaStringBuilder& sb);\r\n-#endif\r\n-\r\n-private:\r\n- uint32_t m_Id;\r\n- char* m_Name;\r\n- VmaPool_T* m_PrevPool = VMA_NULL;\r\n- VmaPool_T* m_NextPool = VMA_NULL;\r\n-};\r\n-\r\n-struct VmaPoolListItemTraits\r\n-{\r\n- typedef VmaPool_T ItemType;\r\n-\r\n- static ItemType* GetPrev(const ItemType* item) { return item->m_PrevPool; }\r\n- static ItemType* GetNext(const ItemType* item) { return item->m_NextPool; }\r\n- static ItemType*& AccessPrev(ItemType* item) { return item->m_PrevPool; }\r\n- static ItemType*& AccessNext(ItemType* item) { return item->m_NextPool; }\r\n-};\r\n-#endif \/\/ _VMA_POOL_T\r\n-\r\n-#ifndef _VMA_CURRENT_BUDGET_DATA\r\n-struct VmaCurrentBudgetData\r\n-{\r\n- VMA_ATOMIC_UINT32 m_BlockCount[VK_MAX_MEMORY_HEAPS];\r\n- VMA_ATOMIC_UINT32 m_AllocationCount[VK_MAX_MEMORY_HEAPS];\r\n- VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS];\r\n- VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS];\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch;\r\n- VMA_RW_MUTEX m_BudgetMutex;\r\n- uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS];\r\n- uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS];\r\n- uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS];\r\n-#endif \/\/ VMA_MEMORY_BUDGET\r\n-\r\n- VmaCurrentBudgetData();\r\n-\r\n- void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize);\r\n- void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize);\r\n-};\r\n-\r\n-#ifndef _VMA_CURRENT_BUDGET_DATA_FUNCTIONS\r\n-VmaCurrentBudgetData::VmaCurrentBudgetData()\r\n-{\r\n- for (uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex)\r\n- {\r\n- m_BlockCount[heapIndex] = 0;\r\n- m_AllocationCount[heapIndex] = 0;\r\n- m_BlockBytes[heapIndex] = 0;\r\n- m_AllocationBytes[heapIndex] = 0;\r\n-#if VMA_MEMORY_BUDGET\r\n- m_VulkanUsage[heapIndex] = 0;\r\n- m_VulkanBudget[heapIndex] = 0;\r\n- m_BlockBytesAtBudgetFetch[heapIndex] = 0;\r\n-#endif\r\n- }\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- m_OperationsSinceBudgetFetch = 0;\r\n-#endif\r\n-}\r\n-\r\n-void VmaCurrentBudgetData::AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)\r\n-{\r\n- m_AllocationBytes[heapIndex] += allocationSize;\r\n- ++m_AllocationCount[heapIndex];\r\n-#if VMA_MEMORY_BUDGET\r\n- ++m_OperationsSinceBudgetFetch;\r\n-#endif\r\n-}\r\n-\r\n-void VmaCurrentBudgetData::RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)\r\n-{\r\n- VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize);\r\n- m_AllocationBytes[heapIndex] -= allocationSize;\r\n- VMA_ASSERT(m_AllocationCount[heapIndex] > 0);\r\n- --m_AllocationCount[heapIndex];\r\n-#if VMA_MEMORY_BUDGET\r\n- ++m_OperationsSinceBudgetFetch;\r\n-#endif\r\n-}\r\n-#endif \/\/ _VMA_CURRENT_BUDGET_DATA_FUNCTIONS\r\n-#endif \/\/ _VMA_CURRENT_BUDGET_DATA\r\n-\r\n-#ifndef _VMA_ALLOCATION_OBJECT_ALLOCATOR\r\n-\/*\r\n-Thread-safe wrapper over VmaPoolAllocator free list, for allocation of VmaAllocation_T objects.\r\n-*\/\r\n-class VmaAllocationObjectAllocator\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaAllocationObjectAllocator)\r\n-public:\r\n- VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks)\r\n- : m_Allocator(pAllocationCallbacks, 1024) {}\r\n-\r\n- template<typename... Types> VmaAllocation Allocate(Types&&... args);\r\n- void Free(VmaAllocation hAlloc);\r\n-\r\n-private:\r\n- VMA_MUTEX m_Mutex;\r\n- VmaPoolAllocator<VmaAllocation_T> m_Allocator;\r\n-};\r\n-\r\n-template<typename... Types>\r\n-VmaAllocation VmaAllocationObjectAllocator::Allocate(Types&&... args)\r\n-{\r\n- VmaMutexLock mutexLock(m_Mutex);\r\n- return m_Allocator.Alloc<Types...>(std::forward<Types>(args)...);\r\n-}\r\n-\r\n-void VmaAllocationObjectAllocator::Free(VmaAllocation hAlloc)\r\n-{\r\n- VmaMutexLock mutexLock(m_Mutex);\r\n- m_Allocator.Free(hAlloc);\r\n-}\r\n-#endif \/\/ _VMA_ALLOCATION_OBJECT_ALLOCATOR\r\n-\r\n-#ifndef _VMA_VIRTUAL_BLOCK_T\r\n-struct VmaVirtualBlock_T\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaVirtualBlock_T)\r\n-public:\r\n- const bool m_AllocationCallbacksSpecified;\r\n- const VkAllocationCallbacks m_AllocationCallbacks;\r\n-\r\n- VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo);\r\n- ~VmaVirtualBlock_T();\r\n-\r\n- VkResult Init() { return VK_SUCCESS; }\r\n- bool IsEmpty() const { return m_Metadata->IsEmpty(); }\r\n- void Free(VmaVirtualAllocation allocation) { m_Metadata->Free((VmaAllocHandle)allocation); }\r\n- void SetAllocationUserData(VmaVirtualAllocation allocation, void* userData) { m_Metadata->SetAllocationUserData((VmaAllocHandle)allocation, userData); }\r\n- void Clear() { m_Metadata->Clear(); }\r\n-\r\n- const VkAllocationCallbacks* GetAllocationCallbacks() const;\r\n- void GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo);\r\n- VkResult Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation,\r\n- VkDeviceSize* outOffset);\r\n- void GetStatistics(VmaStatistics& outStats) const;\r\n- void CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const;\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const;\r\n-#endif\r\n-\r\n-private:\r\n- VmaBlockMetadata* m_Metadata;\r\n-};\r\n-\r\n-#ifndef _VMA_VIRTUAL_BLOCK_T_FUNCTIONS\r\n-VmaVirtualBlock_T::VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo)\r\n- : m_AllocationCallbacksSpecified(createInfo.pAllocationCallbacks != VMA_NULL),\r\n- m_AllocationCallbacks(createInfo.pAllocationCallbacks != VMA_NULL ? *createInfo.pAllocationCallbacks : VmaEmptyAllocationCallbacks)\r\n-{\r\n- const uint32_t algorithm = createInfo.flags & VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK;\r\n- switch (algorithm)\r\n- {\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case 0:\r\n- m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_TLSF)(VK_NULL_HANDLE, 1, true);\r\n- break;\r\n- case VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT:\r\n- m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_Linear)(VK_NULL_HANDLE, 1, true);\r\n- break;\r\n- }\r\n-\r\n- m_Metadata->Init(createInfo.size);\r\n-}\r\n-\r\n-VmaVirtualBlock_T::~VmaVirtualBlock_T()\r\n-{\r\n- \/\/ Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations\r\n- if (!m_Metadata->IsEmpty())\r\n- m_Metadata->DebugLogAllAllocations();\r\n- \/\/ This is the most important assert in the entire library.\r\n- \/\/ Hitting it means you have some memory leak - unreleased virtual allocations.\r\n- VMA_ASSERT(m_Metadata->IsEmpty() && \"Some virtual allocations were not freed before destruction of this virtual block!\");\r\n-\r\n- vma_delete(GetAllocationCallbacks(), m_Metadata);\r\n-}\r\n-\r\n-const VkAllocationCallbacks* VmaVirtualBlock_T::GetAllocationCallbacks() const\r\n-{\r\n- return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL;\r\n-}\r\n-\r\n-void VmaVirtualBlock_T::GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo)\r\n-{\r\n- m_Metadata->GetAllocationInfo((VmaAllocHandle)allocation, outInfo);\r\n-}\r\n-\r\n-VkResult VmaVirtualBlock_T::Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation,\r\n- VkDeviceSize* outOffset)\r\n-{\r\n- VmaAllocationRequest request = {};\r\n- if (m_Metadata->CreateAllocationRequest(\r\n- createInfo.size, \/\/ allocSize\r\n- VMA_MAX(createInfo.alignment, (VkDeviceSize)1), \/\/ allocAlignment\r\n- (createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, \/\/ upperAddress\r\n- VMA_SUBALLOCATION_TYPE_UNKNOWN, \/\/ allocType - unimportant\r\n- createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK, \/\/ strategy\r\n- &request))\r\n- {\r\n- m_Metadata->Alloc(request,\r\n- VMA_SUBALLOCATION_TYPE_UNKNOWN, \/\/ type - unimportant\r\n- createInfo.pUserData);\r\n- outAllocation = (VmaVirtualAllocation)request.allocHandle;\r\n- if(outOffset)\r\n- *outOffset = m_Metadata->GetAllocationOffset(request.allocHandle);\r\n- return VK_SUCCESS;\r\n- }\r\n- outAllocation = (VmaVirtualAllocation)VK_NULL_HANDLE;\r\n- if (outOffset)\r\n- *outOffset = UINT64_MAX;\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n-}\r\n-\r\n-void VmaVirtualBlock_T::GetStatistics(VmaStatistics& outStats) const\r\n-{\r\n- VmaClearStatistics(outStats);\r\n- m_Metadata->AddStatistics(outStats);\r\n-}\r\n-\r\n-void VmaVirtualBlock_T::CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const\r\n-{\r\n- VmaClearDetailedStatistics(outStats);\r\n- m_Metadata->AddDetailedStatistics(outStats);\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaVirtualBlock_T::BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const\r\n-{\r\n- VmaJsonWriter json(GetAllocationCallbacks(), sb);\r\n- json.BeginObject();\r\n-\r\n- VmaDetailedStatistics stats;\r\n- CalculateDetailedStatistics(stats);\r\n-\r\n- json.WriteString(\"Stats\");\r\n- VmaPrintDetailedStatistics(json, stats);\r\n-\r\n- if (detailedMap)\r\n- {\r\n- json.WriteString(\"Details\");\r\n- m_Metadata->PrintDetailedMap(json,\r\n- UINT32_MAX); \/\/ mapRefCount\r\n- }\r\n-\r\n- json.EndObject();\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-#endif \/\/ _VMA_VIRTUAL_BLOCK_T_FUNCTIONS\r\n-#endif \/\/ _VMA_VIRTUAL_BLOCK_T\r\n-\r\n-\r\n-\/\/ Main allocator object.\r\n-struct VmaAllocator_T\r\n-{\r\n- VMA_CLASS_NO_COPY(VmaAllocator_T)\r\n-public:\r\n- bool m_UseMutex;\r\n- uint32_t m_VulkanApiVersion;\r\n- bool m_UseKhrDedicatedAllocation; \/\/ Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).\r\n- bool m_UseKhrBindMemory2; \/\/ Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).\r\n- bool m_UseExtMemoryBudget;\r\n- bool m_UseAmdDeviceCoherentMemory;\r\n- bool m_UseKhrBufferDeviceAddress;\r\n- bool m_UseExtMemoryPriority;\r\n- VkDevice m_hDevice;\r\n- VkInstance m_hInstance;\r\n- bool m_AllocationCallbacksSpecified;\r\n- VkAllocationCallbacks m_AllocationCallbacks;\r\n- VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks;\r\n- VmaAllocationObjectAllocator m_AllocationObjectAllocator;\r\n-\r\n- \/\/ Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size.\r\n- uint32_t m_HeapSizeLimitMask;\r\n-\r\n- VkPhysicalDeviceProperties m_PhysicalDeviceProperties;\r\n- VkPhysicalDeviceMemoryProperties m_MemProps;\r\n-\r\n- \/\/ Default pools.\r\n- VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES];\r\n- VmaDedicatedAllocationList m_DedicatedAllocations[VK_MAX_MEMORY_TYPES];\r\n-\r\n- VmaCurrentBudgetData m_Budget;\r\n- VMA_ATOMIC_UINT32 m_DeviceMemoryCount; \/\/ Total number of VkDeviceMemory objects.\r\n-\r\n- VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);\r\n- VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo);\r\n- ~VmaAllocator_T();\r\n-\r\n- const VkAllocationCallbacks* GetAllocationCallbacks() const\r\n- {\r\n- return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL;\r\n- }\r\n- const VmaVulkanFunctions& GetVulkanFunctions() const\r\n- {\r\n- return m_VulkanFunctions;\r\n- }\r\n-\r\n- VkPhysicalDevice GetPhysicalDevice() const { return m_PhysicalDevice; }\r\n-\r\n- VkDeviceSize GetBufferImageGranularity() const\r\n- {\r\n- return VMA_MAX(\r\n- static_cast<VkDeviceSize>(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY),\r\n- m_PhysicalDeviceProperties.limits.bufferImageGranularity);\r\n- }\r\n-\r\n- uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; }\r\n- uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; }\r\n-\r\n- uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const\r\n- {\r\n- VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount);\r\n- return m_MemProps.memoryTypes[memTypeIndex].heapIndex;\r\n- }\r\n- \/\/ True when specific memory type is HOST_VISIBLE but not HOST_COHERENT.\r\n- bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const\r\n- {\r\n- return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) ==\r\n- VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n- }\r\n- \/\/ Minimum alignment for all allocations in specific memory type.\r\n- VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const\r\n- {\r\n- return IsMemoryTypeNonCoherent(memTypeIndex) ?\r\n- VMA_MAX((VkDeviceSize)VMA_MIN_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) :\r\n- (VkDeviceSize)VMA_MIN_ALIGNMENT;\r\n- }\r\n-\r\n- bool IsIntegratedGpu() const\r\n- {\r\n- return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;\r\n- }\r\n-\r\n- uint32_t GetGlobalMemoryTypeBits() const { return m_GlobalMemoryTypeBits; }\r\n-\r\n- void GetBufferMemoryRequirements(\r\n- VkBuffer hBuffer,\r\n- VkMemoryRequirements& memReq,\r\n- bool& requiresDedicatedAllocation,\r\n- bool& prefersDedicatedAllocation) const;\r\n- void GetImageMemoryRequirements(\r\n- VkImage hImage,\r\n- VkMemoryRequirements& memReq,\r\n- bool& requiresDedicatedAllocation,\r\n- bool& prefersDedicatedAllocation) const;\r\n- VkResult FindMemoryTypeIndex(\r\n- uint32_t memoryTypeBits,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- VkFlags bufImgUsage, \/\/ VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown.\r\n- uint32_t* pMemoryTypeIndex) const;\r\n-\r\n- \/\/ Main allocation function.\r\n- VkResult AllocateMemory(\r\n- const VkMemoryRequirements& vkMemReq,\r\n- bool requiresDedicatedAllocation,\r\n- bool prefersDedicatedAllocation,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage, \/\/ UINT32_MAX if unknown.\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations);\r\n-\r\n- \/\/ Main deallocation function.\r\n- void FreeMemory(\r\n- size_t allocationCount,\r\n- const VmaAllocation* pAllocations);\r\n-\r\n- void CalculateStatistics(VmaTotalStatistics* pStats);\r\n-\r\n- void GetHeapBudgets(\r\n- VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount);\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- void PrintDetailedMap(class VmaJsonWriter& json);\r\n-#endif\r\n-\r\n- void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);\r\n-\r\n- VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool);\r\n- void DestroyPool(VmaPool pool);\r\n- void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats);\r\n- void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats);\r\n-\r\n- void SetCurrentFrameIndex(uint32_t frameIndex);\r\n- uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }\r\n-\r\n- VkResult CheckPoolCorruption(VmaPool hPool);\r\n- VkResult CheckCorruption(uint32_t memoryTypeBits);\r\n-\r\n- \/\/ Call to Vulkan function vkAllocateMemory with accompanying bookkeeping.\r\n- VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory);\r\n- \/\/ Call to Vulkan function vkFreeMemory with accompanying bookkeeping.\r\n- void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory);\r\n- \/\/ Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR.\r\n- VkResult BindVulkanBuffer(\r\n- VkDeviceMemory memory,\r\n- VkDeviceSize memoryOffset,\r\n- VkBuffer buffer,\r\n- const void* pNext);\r\n- \/\/ Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR.\r\n- VkResult BindVulkanImage(\r\n- VkDeviceMemory memory,\r\n- VkDeviceSize memoryOffset,\r\n- VkImage image,\r\n- const void* pNext);\r\n-\r\n- VkResult Map(VmaAllocation hAllocation, void** ppData);\r\n- void Unmap(VmaAllocation hAllocation);\r\n-\r\n- VkResult BindBufferMemory(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer hBuffer,\r\n- const void* pNext);\r\n- VkResult BindImageMemory(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage hImage,\r\n- const void* pNext);\r\n-\r\n- VkResult FlushOrInvalidateAllocation(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize offset, VkDeviceSize size,\r\n- VMA_CACHE_OPERATION op);\r\n- VkResult FlushOrInvalidateAllocations(\r\n- uint32_t allocationCount,\r\n- const VmaAllocation* allocations,\r\n- const VkDeviceSize* offsets, const VkDeviceSize* sizes,\r\n- VMA_CACHE_OPERATION op);\r\n-\r\n- void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern);\r\n-\r\n- \/*\r\n- Returns bit mask of memory types that can support defragmentation on GPU as\r\n- they support creation of required buffer for copy operations.\r\n- *\/\r\n- uint32_t GetGpuDefragmentationMemoryTypeBits();\r\n-\r\n-#if VMA_EXTERNAL_MEMORY\r\n- VkExternalMemoryHandleTypeFlagsKHR GetExternalMemoryHandleTypeFlags(uint32_t memTypeIndex) const\r\n- {\r\n- return m_TypeExternalMemoryHandleTypes[memTypeIndex];\r\n- }\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-\r\n-private:\r\n- VkDeviceSize m_PreferredLargeHeapBlockSize;\r\n-\r\n- VkPhysicalDevice m_PhysicalDevice;\r\n- VMA_ATOMIC_UINT32 m_CurrentFrameIndex;\r\n- VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; \/\/ UINT32_MAX means uninitialized.\r\n-#if VMA_EXTERNAL_MEMORY\r\n- VkExternalMemoryHandleTypeFlagsKHR m_TypeExternalMemoryHandleTypes[VK_MAX_MEMORY_TYPES];\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-\r\n- VMA_RW_MUTEX m_PoolsMutex;\r\n- typedef VmaIntrusiveLinkedList<VmaPoolListItemTraits> PoolList;\r\n- \/\/ Protected by m_PoolsMutex.\r\n- PoolList m_Pools;\r\n- uint32_t m_NextPoolId;\r\n-\r\n- VmaVulkanFunctions m_VulkanFunctions;\r\n-\r\n- \/\/ Global bit mask AND-ed with any memoryTypeBits to disallow certain memory types.\r\n- uint32_t m_GlobalMemoryTypeBits;\r\n-\r\n- void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);\r\n-\r\n-#if VMA_STATIC_VULKAN_FUNCTIONS == 1\r\n- void ImportVulkanFunctions_Static();\r\n-#endif\r\n-\r\n- void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions);\r\n-\r\n-#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\r\n- void ImportVulkanFunctions_Dynamic();\r\n-#endif\r\n-\r\n- void ValidateVulkanFunctions();\r\n-\r\n- VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);\r\n-\r\n- VkResult AllocateMemoryOfType(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- bool dedicatedPreferred,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- uint32_t memTypeIndex,\r\n- VmaSuballocationType suballocType,\r\n- VmaDedicatedAllocationList& dedicatedAllocations,\r\n- VmaBlockVector& blockVector,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations);\r\n-\r\n- \/\/ Helper function only to be used inside AllocateDedicatedMemory.\r\n- VkResult AllocateDedicatedMemoryPage(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VmaSuballocationType suballocType,\r\n- uint32_t memTypeIndex,\r\n- const VkMemoryAllocateInfo& allocInfo,\r\n- bool map,\r\n- bool isUserDataString,\r\n- bool isMappingAllowed,\r\n- void* pUserData,\r\n- VmaAllocation* pAllocation);\r\n-\r\n- \/\/ Allocates and registers new VkDeviceMemory specifically for dedicated allocations.\r\n- VkResult AllocateDedicatedMemory(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VmaSuballocationType suballocType,\r\n- VmaDedicatedAllocationList& dedicatedAllocations,\r\n- uint32_t memTypeIndex,\r\n- bool map,\r\n- bool isUserDataString,\r\n- bool isMappingAllowed,\r\n- bool canAliasMemory,\r\n- void* pUserData,\r\n- float priority,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations,\r\n- const void* pNextChain = nullptr);\r\n-\r\n- void FreeDedicatedMemory(const VmaAllocation allocation);\r\n-\r\n- VkResult CalcMemTypeParams(\r\n- VmaAllocationCreateInfo& outCreateInfo,\r\n- uint32_t memTypeIndex,\r\n- VkDeviceSize size,\r\n- size_t allocationCount);\r\n- VkResult CalcAllocationParams(\r\n- VmaAllocationCreateInfo& outCreateInfo,\r\n- bool dedicatedRequired,\r\n- bool dedicatedPreferred);\r\n-\r\n- \/*\r\n- Calculates and returns bit mask of memory types that can support defragmentation\r\n- on GPU as they support creation of required buffer for copy operations.\r\n- *\/\r\n- uint32_t CalculateGpuDefragmentationMemoryTypeBits() const;\r\n- uint32_t CalculateGlobalMemoryTypeBits() const;\r\n-\r\n- bool GetFlushOrInvalidateRange(\r\n- VmaAllocation allocation,\r\n- VkDeviceSize offset, VkDeviceSize size,\r\n- VkMappedMemoryRange& outRange) const;\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- void UpdateVulkanBudget();\r\n-#endif \/\/ #if VMA_MEMORY_BUDGET\r\n-};\r\n-\r\n-\r\n-#ifndef _VMA_MEMORY_FUNCTIONS\r\n-static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment)\r\n-{\r\n- return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment);\r\n-}\r\n-\r\n-static void VmaFree(VmaAllocator hAllocator, void* ptr)\r\n-{\r\n- VmaFree(&hAllocator->m_AllocationCallbacks, ptr);\r\n-}\r\n-\r\n-template<typename T>\r\n-static T* VmaAllocate(VmaAllocator hAllocator)\r\n-{\r\n- return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T));\r\n-}\r\n-\r\n-template<typename T>\r\n-static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)\r\n-{\r\n- return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T));\r\n-}\r\n-\r\n-template<typename T>\r\n-static void vma_delete(VmaAllocator hAllocator, T* ptr)\r\n-{\r\n- if(ptr != VMA_NULL)\r\n- {\r\n- ptr->~T();\r\n- VmaFree(hAllocator, ptr);\r\n- }\r\n-}\r\n-\r\n-template<typename T>\r\n-static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)\r\n-{\r\n- if(ptr != VMA_NULL)\r\n- {\r\n- for(size_t i = count; i--; )\r\n- ptr[i].~T();\r\n- VmaFree(hAllocator, ptr);\r\n- }\r\n-}\r\n-#endif \/\/ _VMA_MEMORY_FUNCTIONS\r\n-\r\n-#ifndef _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS\r\n-VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)\r\n- : m_pMetadata(VMA_NULL),\r\n- m_MemoryTypeIndex(UINT32_MAX),\r\n- m_Id(0),\r\n- m_hMemory(VK_NULL_HANDLE),\r\n- m_MapCount(0),\r\n- m_pMappedData(VMA_NULL) {}\r\n-\r\n-VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()\r\n-{\r\n- VMA_ASSERT(m_MapCount == 0 && \"VkDeviceMemory block is being destroyed while it is still mapped.\");\r\n- VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);\r\n-}\r\n-\r\n-void VmaDeviceMemoryBlock::Init(\r\n- VmaAllocator hAllocator,\r\n- VmaPool hParentPool,\r\n- uint32_t newMemoryTypeIndex,\r\n- VkDeviceMemory newMemory,\r\n- VkDeviceSize newSize,\r\n- uint32_t id,\r\n- uint32_t algorithm,\r\n- VkDeviceSize bufferImageGranularity)\r\n-{\r\n- VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);\r\n-\r\n- m_hParentPool = hParentPool;\r\n- m_MemoryTypeIndex = newMemoryTypeIndex;\r\n- m_Id = id;\r\n- m_hMemory = newMemory;\r\n-\r\n- switch (algorithm)\r\n- {\r\n- case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:\r\n- m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator->GetAllocationCallbacks(),\r\n- bufferImageGranularity, false); \/\/ isVirtual\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- \/\/ Fall-through.\r\n- case 0:\r\n- m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_TLSF)(hAllocator->GetAllocationCallbacks(),\r\n- bufferImageGranularity, false); \/\/ isVirtual\r\n- }\r\n- m_pMetadata->Init(newSize);\r\n-}\r\n-\r\n-void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator)\r\n-{\r\n- \/\/ Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations\r\n- if (!m_pMetadata->IsEmpty())\r\n- m_pMetadata->DebugLogAllAllocations();\r\n- \/\/ This is the most important assert in the entire library.\r\n- \/\/ Hitting it means you have some memory leak - unreleased VmaAllocation objects.\r\n- VMA_ASSERT(m_pMetadata->IsEmpty() && \"Some allocations were not freed before destruction of this memory block!\");\r\n-\r\n- VMA_ASSERT(m_hMemory != VK_NULL_HANDLE);\r\n- allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory);\r\n- m_hMemory = VK_NULL_HANDLE;\r\n-\r\n- vma_delete(allocator, m_pMetadata);\r\n- m_pMetadata = VMA_NULL;\r\n-}\r\n-\r\n-void VmaDeviceMemoryBlock::PostFree(VmaAllocator hAllocator)\r\n-{\r\n- if(m_MappingHysteresis.PostFree())\r\n- {\r\n- VMA_ASSERT(m_MappingHysteresis.GetExtraMapping() == 0);\r\n- if (m_MapCount == 0)\r\n- {\r\n- m_pMappedData = VMA_NULL;\r\n- (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);\r\n- }\r\n- }\r\n-}\r\n-\r\n-bool VmaDeviceMemoryBlock::Validate() const\r\n-{\r\n- VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) &&\r\n- (m_pMetadata->GetSize() != 0));\r\n-\r\n- return m_pMetadata->Validate();\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator)\r\n-{\r\n- void* pData = nullptr;\r\n- VkResult res = Map(hAllocator, 1, &pData);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n-\r\n- res = m_pMetadata->CheckCorruption(pData);\r\n-\r\n- Unmap(hAllocator, 1);\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData)\r\n-{\r\n- if (count == 0)\r\n- {\r\n- return VK_SUCCESS;\r\n- }\r\n-\r\n- VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\r\n- const uint32_t oldTotalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping();\r\n- m_MappingHysteresis.PostMap();\r\n- if (oldTotalMapCount != 0)\r\n- {\r\n- m_MapCount += count;\r\n- VMA_ASSERT(m_pMappedData != VMA_NULL);\r\n- if (ppData != VMA_NULL)\r\n- {\r\n- *ppData = m_pMappedData;\r\n- }\r\n- return VK_SUCCESS;\r\n- }\r\n- else\r\n- {\r\n- VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(\r\n- hAllocator->m_hDevice,\r\n- m_hMemory,\r\n- 0, \/\/ offset\r\n- VK_WHOLE_SIZE,\r\n- 0, \/\/ flags\r\n- &m_pMappedData);\r\n- if (result == VK_SUCCESS)\r\n- {\r\n- if (ppData != VMA_NULL)\r\n- {\r\n- *ppData = m_pMappedData;\r\n- }\r\n- m_MapCount = count;\r\n- }\r\n- return result;\r\n- }\r\n-}\r\n-\r\n-void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count)\r\n-{\r\n- if (count == 0)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\r\n- if (m_MapCount >= count)\r\n- {\r\n- m_MapCount -= count;\r\n- const uint32_t totalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping();\r\n- if (totalMapCount == 0)\r\n- {\r\n- m_pMappedData = VMA_NULL;\r\n- (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);\r\n- }\r\n- m_MappingHysteresis.PostUnmap();\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"VkDeviceMemory block is being unmapped while it was not previously mapped.\");\r\n- }\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)\r\n-{\r\n- VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);\r\n-\r\n- void* pData;\r\n- VkResult res = Map(hAllocator, 1, &pData);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n-\r\n- VmaWriteMagicValue(pData, allocOffset + allocSize);\r\n-\r\n- Unmap(hAllocator, 1);\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)\r\n-{\r\n- VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);\r\n-\r\n- void* pData;\r\n- VkResult res = Map(hAllocator, 1, &pData);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n-\r\n- if (!VmaValidateMagicValue(pData, allocOffset + allocSize))\r\n- {\r\n- VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!\");\r\n- }\r\n-\r\n- Unmap(hAllocator, 1);\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::BindBufferMemory(\r\n- const VmaAllocator hAllocator,\r\n- const VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer hBuffer,\r\n- const void* pNext)\r\n-{\r\n- VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&\r\n- hAllocation->GetBlock() == this);\r\n- VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&\r\n- \"Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?\");\r\n- const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;\r\n- \/\/ This lock is important so that we don't call vkBind... and\/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.\r\n- VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\r\n- return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext);\r\n-}\r\n-\r\n-VkResult VmaDeviceMemoryBlock::BindImageMemory(\r\n- const VmaAllocator hAllocator,\r\n- const VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage hImage,\r\n- const void* pNext)\r\n-{\r\n- VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&\r\n- hAllocation->GetBlock() == this);\r\n- VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&\r\n- \"Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?\");\r\n- const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;\r\n- \/\/ This lock is important so that we don't call vkBind... and\/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.\r\n- VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\r\n- return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext);\r\n-}\r\n-#endif \/\/ _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS\r\n-\r\n-#ifndef _VMA_ALLOCATION_T_FUNCTIONS\r\n-VmaAllocation_T::VmaAllocation_T(bool mappingAllowed)\r\n- : m_Alignment{ 1 },\r\n- m_Size{ 0 },\r\n- m_pUserData{ VMA_NULL },\r\n- m_pName{ VMA_NULL },\r\n- m_MemoryTypeIndex{ 0 },\r\n- m_Type{ (uint8_t)ALLOCATION_TYPE_NONE },\r\n- m_SuballocationType{ (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN },\r\n- m_MapCount{ 0 },\r\n- m_Flags{ 0 }\r\n-{\r\n- if(mappingAllowed)\r\n- m_Flags |= (uint8_t)FLAG_MAPPING_ALLOWED;\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- m_BufferImageUsage = 0;\r\n-#endif\r\n-}\r\n-\r\n-VmaAllocation_T::~VmaAllocation_T()\r\n-{\r\n- VMA_ASSERT(m_MapCount == 0 && \"Allocation was not unmapped before destruction.\");\r\n-\r\n- \/\/ Check if owned string was freed.\r\n- VMA_ASSERT(m_pName == VMA_NULL);\r\n-}\r\n-\r\n-void VmaAllocation_T::InitBlockAllocation(\r\n- VmaDeviceMemoryBlock* block,\r\n- VmaAllocHandle allocHandle,\r\n- VkDeviceSize alignment,\r\n- VkDeviceSize size,\r\n- uint32_t memoryTypeIndex,\r\n- VmaSuballocationType suballocationType,\r\n- bool mapped)\r\n-{\r\n- VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);\r\n- VMA_ASSERT(block != VMA_NULL);\r\n- m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;\r\n- m_Alignment = alignment;\r\n- m_Size = size;\r\n- m_MemoryTypeIndex = memoryTypeIndex;\r\n- if(mapped)\r\n- {\r\n- VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\r\n- m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP;\r\n- }\r\n- m_SuballocationType = (uint8_t)suballocationType;\r\n- m_BlockAllocation.m_Block = block;\r\n- m_BlockAllocation.m_AllocHandle = allocHandle;\r\n-}\r\n-\r\n-void VmaAllocation_T::InitDedicatedAllocation(\r\n- VmaPool hParentPool,\r\n- uint32_t memoryTypeIndex,\r\n- VkDeviceMemory hMemory,\r\n- VmaSuballocationType suballocationType,\r\n- void* pMappedData,\r\n- VkDeviceSize size)\r\n-{\r\n- VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);\r\n- VMA_ASSERT(hMemory != VK_NULL_HANDLE);\r\n- m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED;\r\n- m_Alignment = 0;\r\n- m_Size = size;\r\n- m_MemoryTypeIndex = memoryTypeIndex;\r\n- m_SuballocationType = (uint8_t)suballocationType;\r\n- if(pMappedData != VMA_NULL)\r\n- {\r\n- VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\r\n- m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP;\r\n- }\r\n- m_DedicatedAllocation.m_hParentPool = hParentPool;\r\n- m_DedicatedAllocation.m_hMemory = hMemory;\r\n- m_DedicatedAllocation.m_pMappedData = pMappedData;\r\n- m_DedicatedAllocation.m_Prev = VMA_NULL;\r\n- m_DedicatedAllocation.m_Next = VMA_NULL;\r\n-}\r\n-\r\n-void VmaAllocation_T::SetName(VmaAllocator hAllocator, const char* pName)\r\n-{\r\n- VMA_ASSERT(pName == VMA_NULL || pName != m_pName);\r\n-\r\n- FreeName(hAllocator);\r\n-\r\n- if (pName != VMA_NULL)\r\n- m_pName = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), pName);\r\n-}\r\n-\r\n-uint8_t VmaAllocation_T::SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocation != VMA_NULL);\r\n- VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);\r\n- VMA_ASSERT(allocation->m_Type == ALLOCATION_TYPE_BLOCK);\r\n-\r\n- m_MapCount = allocation->m_MapCount;\r\n- if (m_MapCount != 0)\r\n- m_BlockAllocation.m_Block->Unmap(hAllocator, m_MapCount);\r\n- allocation->m_MapCount = 0;\r\n-\r\n- m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, allocation);\r\n- VMA_SWAP(m_BlockAllocation, allocation->m_BlockAllocation);\r\n- m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, this);\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n- VMA_SWAP(m_BufferImageUsage, allocation->m_BufferImageUsage);\r\n-#endif\r\n- return m_MapCount;\r\n-}\r\n-\r\n-VmaAllocHandle VmaAllocation_T::GetAllocHandle() const\r\n-{\r\n- switch (m_Type)\r\n- {\r\n- case ALLOCATION_TYPE_BLOCK:\r\n- return m_BlockAllocation.m_AllocHandle;\r\n- case ALLOCATION_TYPE_DEDICATED:\r\n- return VK_NULL_HANDLE;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return VK_NULL_HANDLE;\r\n- }\r\n-}\r\n-\r\n-VkDeviceSize VmaAllocation_T::GetOffset() const\r\n-{\r\n- switch (m_Type)\r\n- {\r\n- case ALLOCATION_TYPE_BLOCK:\r\n- return m_BlockAllocation.m_Block->m_pMetadata->GetAllocationOffset(m_BlockAllocation.m_AllocHandle);\r\n- case ALLOCATION_TYPE_DEDICATED:\r\n- return 0;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return 0;\r\n- }\r\n-}\r\n-\r\n-VmaPool VmaAllocation_T::GetParentPool() const\r\n-{\r\n- switch (m_Type)\r\n- {\r\n- case ALLOCATION_TYPE_BLOCK:\r\n- return m_BlockAllocation.m_Block->GetParentPool();\r\n- case ALLOCATION_TYPE_DEDICATED:\r\n- return m_DedicatedAllocation.m_hParentPool;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return VK_NULL_HANDLE;\r\n- }\r\n-}\r\n-\r\n-VkDeviceMemory VmaAllocation_T::GetMemory() const\r\n-{\r\n- switch (m_Type)\r\n- {\r\n- case ALLOCATION_TYPE_BLOCK:\r\n- return m_BlockAllocation.m_Block->GetDeviceMemory();\r\n- case ALLOCATION_TYPE_DEDICATED:\r\n- return m_DedicatedAllocation.m_hMemory;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return VK_NULL_HANDLE;\r\n- }\r\n-}\r\n-\r\n-void* VmaAllocation_T::GetMappedData() const\r\n-{\r\n- switch (m_Type)\r\n- {\r\n- case ALLOCATION_TYPE_BLOCK:\r\n- if (m_MapCount != 0 || IsPersistentMap())\r\n- {\r\n- void* pBlockData = m_BlockAllocation.m_Block->GetMappedData();\r\n- VMA_ASSERT(pBlockData != VMA_NULL);\r\n- return (char*)pBlockData + GetOffset();\r\n- }\r\n- else\r\n- {\r\n- return VMA_NULL;\r\n- }\r\n- break;\r\n- case ALLOCATION_TYPE_DEDICATED:\r\n- VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0 || IsPersistentMap()));\r\n- return m_DedicatedAllocation.m_pMappedData;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return VMA_NULL;\r\n- }\r\n-}\r\n-\r\n-void VmaAllocation_T::BlockAllocMap()\r\n-{\r\n- VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);\r\n- VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\r\n-\r\n- if (m_MapCount < 0xFF)\r\n- {\r\n- ++m_MapCount;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"Allocation mapped too many times simultaneously.\");\r\n- }\r\n-}\r\n-\r\n-void VmaAllocation_T::BlockAllocUnmap()\r\n-{\r\n- VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);\r\n-\r\n- if (m_MapCount > 0)\r\n- {\r\n- --m_MapCount;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"Unmapping allocation not previously mapped.\");\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData)\r\n-{\r\n- VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);\r\n- VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\r\n-\r\n- if (m_MapCount != 0 || IsPersistentMap())\r\n- {\r\n- if (m_MapCount < 0xFF)\r\n- {\r\n- VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL);\r\n- *ppData = m_DedicatedAllocation.m_pMappedData;\r\n- ++m_MapCount;\r\n- return VK_SUCCESS;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"Dedicated allocation mapped too many times simultaneously.\");\r\n- return VK_ERROR_MEMORY_MAP_FAILED;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(\r\n- hAllocator->m_hDevice,\r\n- m_DedicatedAllocation.m_hMemory,\r\n- 0, \/\/ offset\r\n- VK_WHOLE_SIZE,\r\n- 0, \/\/ flags\r\n- ppData);\r\n- if (result == VK_SUCCESS)\r\n- {\r\n- m_DedicatedAllocation.m_pMappedData = *ppData;\r\n- m_MapCount = 1;\r\n- }\r\n- return result;\r\n- }\r\n-}\r\n-\r\n-void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)\r\n-{\r\n- VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);\r\n-\r\n- if (m_MapCount > 0)\r\n- {\r\n- --m_MapCount;\r\n- if (m_MapCount == 0 && !IsPersistentMap())\r\n- {\r\n- m_DedicatedAllocation.m_pMappedData = VMA_NULL;\r\n- (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(\r\n- hAllocator->m_hDevice,\r\n- m_DedicatedAllocation.m_hMemory);\r\n- }\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"Unmapping dedicated allocation not previously mapped.\");\r\n- }\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaAllocation_T::InitBufferImageUsage(uint32_t bufferImageUsage)\r\n-{\r\n- VMA_ASSERT(m_BufferImageUsage == 0);\r\n- m_BufferImageUsage = bufferImageUsage;\r\n-}\r\n-\r\n-void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const\r\n-{\r\n- json.WriteString(\"Type\");\r\n- json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]);\r\n-\r\n- json.WriteString(\"Size\");\r\n- json.WriteNumber(m_Size);\r\n-\r\n- if (m_pUserData != VMA_NULL)\r\n- {\r\n- json.WriteString(\"UserData\");\r\n- json.BeginString();\r\n- json.ContinueString_Pointer(m_pUserData);\r\n- json.EndString();\r\n- }\r\n- if (m_pName != VMA_NULL)\r\n- {\r\n- json.WriteString(\"Name\");\r\n- json.WriteString(m_pName);\r\n- }\r\n-\r\n- if (m_BufferImageUsage != 0)\r\n- {\r\n- json.WriteString(\"Usage\");\r\n- json.WriteNumber(m_BufferImageUsage);\r\n- }\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-void VmaAllocation_T::FreeName(VmaAllocator hAllocator)\r\n-{\r\n- if(m_pName)\r\n- {\r\n- VmaFreeString(hAllocator->GetAllocationCallbacks(), m_pName);\r\n- m_pName = VMA_NULL;\r\n- }\r\n-}\r\n-#endif \/\/ _VMA_ALLOCATION_T_FUNCTIONS\r\n-\r\n-#ifndef _VMA_BLOCK_VECTOR_FUNCTIONS\r\n-VmaBlockVector::VmaBlockVector(\r\n- VmaAllocator hAllocator,\r\n- VmaPool hParentPool,\r\n- uint32_t memoryTypeIndex,\r\n- VkDeviceSize preferredBlockSize,\r\n- size_t minBlockCount,\r\n- size_t maxBlockCount,\r\n- VkDeviceSize bufferImageGranularity,\r\n- bool explicitBlockSize,\r\n- uint32_t algorithm,\r\n- float priority,\r\n- VkDeviceSize minAllocationAlignment,\r\n- void* pMemoryAllocateNext)\r\n- : m_hAllocator(hAllocator),\r\n- m_hParentPool(hParentPool),\r\n- m_MemoryTypeIndex(memoryTypeIndex),\r\n- m_PreferredBlockSize(preferredBlockSize),\r\n- m_MinBlockCount(minBlockCount),\r\n- m_MaxBlockCount(maxBlockCount),\r\n- m_BufferImageGranularity(bufferImageGranularity),\r\n- m_ExplicitBlockSize(explicitBlockSize),\r\n- m_Algorithm(algorithm),\r\n- m_Priority(priority),\r\n- m_MinAllocationAlignment(minAllocationAlignment),\r\n- m_pMemoryAllocateNext(pMemoryAllocateNext),\r\n- m_Blocks(VmaStlAllocator<VmaDeviceMemoryBlock*>(hAllocator->GetAllocationCallbacks())),\r\n- m_NextBlockId(0) {}\r\n-\r\n-VmaBlockVector::~VmaBlockVector()\r\n-{\r\n- for (size_t i = m_Blocks.size(); i--; )\r\n- {\r\n- m_Blocks[i]->Destroy(m_hAllocator);\r\n- vma_delete(m_hAllocator, m_Blocks[i]);\r\n- }\r\n-}\r\n-\r\n-VkResult VmaBlockVector::CreateMinBlocks()\r\n-{\r\n- for (size_t i = 0; i < m_MinBlockCount; ++i)\r\n- {\r\n- VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n- }\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaBlockVector::AddStatistics(VmaStatistics& inoutStats)\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n-\r\n- const size_t blockCount = m_Blocks.size();\r\n- for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)\r\n- {\r\n- const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pBlock);\r\n- VMA_HEAVY_ASSERT(pBlock->Validate());\r\n- pBlock->m_pMetadata->AddStatistics(inoutStats);\r\n- }\r\n-}\r\n-\r\n-void VmaBlockVector::AddDetailedStatistics(VmaDetailedStatistics& inoutStats)\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n-\r\n- const size_t blockCount = m_Blocks.size();\r\n- for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)\r\n- {\r\n- const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pBlock);\r\n- VMA_HEAVY_ASSERT(pBlock->Validate());\r\n- pBlock->m_pMetadata->AddDetailedStatistics(inoutStats);\r\n- }\r\n-}\r\n-\r\n-bool VmaBlockVector::IsEmpty()\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n- return m_Blocks.empty();\r\n-}\r\n-\r\n-bool VmaBlockVector::IsCorruptionDetectionEnabled() const\r\n-{\r\n- const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;\r\n- return (VMA_DEBUG_DETECT_CORRUPTION != 0) &&\r\n- (VMA_DEBUG_MARGIN > 0) &&\r\n- (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) &&\r\n- (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags;\r\n-}\r\n-\r\n-VkResult VmaBlockVector::Allocate(\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations)\r\n-{\r\n- size_t allocIndex;\r\n- VkResult res = VK_SUCCESS;\r\n-\r\n- alignment = VMA_MAX(alignment, m_MinAllocationAlignment);\r\n-\r\n- if (IsCorruptionDetectionEnabled())\r\n- {\r\n- size = VmaAlignUp<VkDeviceSize>(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));\r\n- alignment = VmaAlignUp<VkDeviceSize>(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));\r\n- }\r\n-\r\n- {\r\n- VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n- for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\r\n- {\r\n- res = AllocatePage(\r\n- size,\r\n- alignment,\r\n- createInfo,\r\n- suballocType,\r\n- pAllocations + allocIndex);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- \/\/ Free all already created allocations.\r\n- while (allocIndex--)\r\n- Free(pAllocations[allocIndex]);\r\n- memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\r\n- }\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaBlockVector::AllocatePage(\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- VmaAllocation* pAllocation)\r\n-{\r\n- const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;\r\n-\r\n- VkDeviceSize freeMemory;\r\n- {\r\n- const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);\r\n- VmaBudget heapBudget = {};\r\n- m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1);\r\n- freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0;\r\n- }\r\n-\r\n- const bool canFallbackToDedicated = !HasExplicitBlockSize() &&\r\n- (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0;\r\n- const bool canCreateNewBlock =\r\n- ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) &&\r\n- (m_Blocks.size() < m_MaxBlockCount) &&\r\n- (freeMemory >= size || !canFallbackToDedicated);\r\n- uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK;\r\n-\r\n- \/\/ Upper address can only be used with linear allocator and within single memory block.\r\n- if (isUpperAddress &&\r\n- (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1))\r\n- {\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n-\r\n- \/\/ Early reject: requested allocation size is larger that maximum block size for this block vector.\r\n- if (size + VMA_DEBUG_MARGIN > m_PreferredBlockSize)\r\n- {\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n-\r\n- \/\/ 1. Search existing allocations. Try to allocate.\r\n- if (m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\r\n- {\r\n- \/\/ Use only last block.\r\n- if (!m_Blocks.empty())\r\n- {\r\n- VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back();\r\n- VMA_ASSERT(pCurrBlock);\r\n- VkResult res = AllocateFromBlock(\r\n- pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VMA_DEBUG_LOG(\" Returned from last block #%u\", pCurrBlock->GetId());\r\n- IncrementallySortBlocks();\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- }\r\n- else\r\n- {\r\n- if (strategy != VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) \/\/ MIN_MEMORY or default\r\n- {\r\n- const bool isHostVisible =\r\n- (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;\r\n- if(isHostVisible)\r\n- {\r\n- const bool isMappingAllowed = (createInfo.flags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0;\r\n- \/*\r\n- For non-mappable allocations, check blocks that are not mapped first.\r\n- For mappable allocations, check blocks that are already mapped first.\r\n- This way, having many blocks, we will separate mappable and non-mappable allocations,\r\n- hopefully limiting the number of blocks that are mapped, which will help tools like RenderDoc.\r\n- *\/\r\n- for(size_t mappingI = 0; mappingI < 2; ++mappingI)\r\n- {\r\n- \/\/ Forward order in m_Blocks - prefer blocks with smallest amount of free space.\r\n- for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\r\n- {\r\n- VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pCurrBlock);\r\n- const bool isBlockMapped = pCurrBlock->GetMappedData() != VMA_NULL;\r\n- if((mappingI == 0) == (isMappingAllowed == isBlockMapped))\r\n- {\r\n- VkResult res = AllocateFromBlock(\r\n- pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\r\n- IncrementallySortBlocks();\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- else\r\n- {\r\n- \/\/ Forward order in m_Blocks - prefer blocks with smallest amount of free space.\r\n- for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\r\n- {\r\n- VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pCurrBlock);\r\n- VkResult res = AllocateFromBlock(\r\n- pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\r\n- IncrementallySortBlocks();\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- else \/\/ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT\r\n- {\r\n- \/\/ Backward order in m_Blocks - prefer blocks with largest amount of free space.\r\n- for (size_t blockIndex = m_Blocks.size(); blockIndex--; )\r\n- {\r\n- VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pCurrBlock);\r\n- VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\r\n- IncrementallySortBlocks();\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ 2. Try to create new block.\r\n- if (canCreateNewBlock)\r\n- {\r\n- \/\/ Calculate optimal size for new block.\r\n- VkDeviceSize newBlockSize = m_PreferredBlockSize;\r\n- uint32_t newBlockSizeShift = 0;\r\n- const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3;\r\n-\r\n- if (!m_ExplicitBlockSize)\r\n- {\r\n- \/\/ Allocate 1\/8, 1\/4, 1\/2 as first blocks.\r\n- const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize();\r\n- for (uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i)\r\n- {\r\n- const VkDeviceSize smallerNewBlockSize = newBlockSize \/ 2;\r\n- if (smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2)\r\n- {\r\n- newBlockSize = smallerNewBlockSize;\r\n- ++newBlockSizeShift;\r\n- }\r\n- else\r\n- {\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- size_t newBlockIndex = 0;\r\n- VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?\r\n- CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- \/\/ Allocation of this size failed? Try 1\/2, 1\/4, 1\/8 of m_PreferredBlockSize.\r\n- if (!m_ExplicitBlockSize)\r\n- {\r\n- while (res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)\r\n- {\r\n- const VkDeviceSize smallerNewBlockSize = newBlockSize \/ 2;\r\n- if (smallerNewBlockSize >= size)\r\n- {\r\n- newBlockSize = smallerNewBlockSize;\r\n- ++newBlockSizeShift;\r\n- res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?\r\n- CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n- else\r\n- {\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex];\r\n- VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size);\r\n-\r\n- res = AllocateFromBlock(\r\n- pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\r\n- if (res == VK_SUCCESS)\r\n- {\r\n- VMA_DEBUG_LOG(\" Created new block #%u Size=%llu\", pBlock->GetId(), newBlockSize);\r\n- IncrementallySortBlocks();\r\n- return VK_SUCCESS;\r\n- }\r\n- else\r\n- {\r\n- \/\/ Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n- }\r\n- }\r\n-\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n-}\r\n-\r\n-void VmaBlockVector::Free(\r\n- const VmaAllocation hAllocation,\r\n- bool incrementalSort)\r\n-{\r\n- VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL;\r\n-\r\n- bool budgetExceeded = false;\r\n- {\r\n- const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);\r\n- VmaBudget heapBudget = {};\r\n- m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1);\r\n- budgetExceeded = heapBudget.usage >= heapBudget.budget;\r\n- }\r\n-\r\n- \/\/ Scope for lock.\r\n- {\r\n- VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n-\r\n- VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();\r\n-\r\n- if (IsCorruptionDetectionEnabled())\r\n- {\r\n- VkResult res = pBlock->ValidateMagicValueAfterAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize());\r\n- VMA_ASSERT(res == VK_SUCCESS && \"Couldn't map block memory to validate magic value.\");\r\n- }\r\n-\r\n- if (hAllocation->IsPersistentMap())\r\n- {\r\n- pBlock->Unmap(m_hAllocator, 1);\r\n- }\r\n-\r\n- const bool hadEmptyBlockBeforeFree = HasEmptyBlock();\r\n- pBlock->m_pMetadata->Free(hAllocation->GetAllocHandle());\r\n- pBlock->PostFree(m_hAllocator);\r\n- VMA_HEAVY_ASSERT(pBlock->Validate());\r\n-\r\n- VMA_DEBUG_LOG(\" Freed from MemoryTypeIndex=%u\", m_MemoryTypeIndex);\r\n-\r\n- const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount;\r\n- \/\/ pBlock became empty after this deallocation.\r\n- if (pBlock->m_pMetadata->IsEmpty())\r\n- {\r\n- \/\/ Already had empty block. We don't want to have two, so delete this one.\r\n- if ((hadEmptyBlockBeforeFree || budgetExceeded) && canDeleteBlock)\r\n- {\r\n- pBlockToDelete = pBlock;\r\n- Remove(pBlock);\r\n- }\r\n- \/\/ else: We now have one empty block - leave it. A hysteresis to avoid allocating whole block back and forth.\r\n- }\r\n- \/\/ pBlock didn't become empty, but we have another empty block - find and free that one.\r\n- \/\/ (This is optional, heuristics.)\r\n- else if (hadEmptyBlockBeforeFree && canDeleteBlock)\r\n- {\r\n- VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back();\r\n- if (pLastBlock->m_pMetadata->IsEmpty())\r\n- {\r\n- pBlockToDelete = pLastBlock;\r\n- m_Blocks.pop_back();\r\n- }\r\n- }\r\n-\r\n- if (incrementalSort)\r\n- IncrementallySortBlocks();\r\n- }\r\n-\r\n- \/\/ Destruction of a free block. Deferred until this point, outside of mutex\r\n- \/\/ lock, for performance reason.\r\n- if (pBlockToDelete != VMA_NULL)\r\n- {\r\n- VMA_DEBUG_LOG(\" Deleted empty block #%u\", pBlockToDelete->GetId());\r\n- pBlockToDelete->Destroy(m_hAllocator);\r\n- vma_delete(m_hAllocator, pBlockToDelete);\r\n- }\r\n-\r\n- m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());\r\n- m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);\r\n-}\r\n-\r\n-VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const\r\n-{\r\n- VkDeviceSize result = 0;\r\n- for (size_t i = m_Blocks.size(); i--; )\r\n- {\r\n- result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize());\r\n- if (result >= m_PreferredBlockSize)\r\n- {\r\n- break;\r\n- }\r\n- }\r\n- return result;\r\n-}\r\n-\r\n-void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock)\r\n-{\r\n- for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\r\n- {\r\n- if (m_Blocks[blockIndex] == pBlock)\r\n- {\r\n- VmaVectorRemove(m_Blocks, blockIndex);\r\n- return;\r\n- }\r\n- }\r\n- VMA_ASSERT(0);\r\n-}\r\n-\r\n-void VmaBlockVector::IncrementallySortBlocks()\r\n-{\r\n- if (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\r\n- {\r\n- \/\/ Bubble sort only until first swap.\r\n- for (size_t i = 1; i < m_Blocks.size(); ++i)\r\n- {\r\n- if (m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize())\r\n- {\r\n- VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]);\r\n- return;\r\n- }\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaBlockVector::SortByFreeSize()\r\n-{\r\n- VMA_SORT(m_Blocks.begin(), m_Blocks.end(),\r\n- [](auto* b1, auto* b2)\r\n- {\r\n- return b1->m_pMetadata->GetSumFreeSize() < b2->m_pMetadata->GetSumFreeSize();\r\n- });\r\n-}\r\n-\r\n-VkResult VmaBlockVector::AllocateFromBlock(\r\n- VmaDeviceMemoryBlock* pBlock,\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- VmaAllocationCreateFlags allocFlags,\r\n- void* pUserData,\r\n- VmaSuballocationType suballocType,\r\n- uint32_t strategy,\r\n- VmaAllocation* pAllocation)\r\n-{\r\n- const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;\r\n-\r\n- VmaAllocationRequest currRequest = {};\r\n- if (pBlock->m_pMetadata->CreateAllocationRequest(\r\n- size,\r\n- alignment,\r\n- isUpperAddress,\r\n- suballocType,\r\n- strategy,\r\n- &currRequest))\r\n- {\r\n- return CommitAllocationRequest(currRequest, pBlock, alignment, allocFlags, pUserData, suballocType, pAllocation);\r\n- }\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n-}\r\n-\r\n-VkResult VmaBlockVector::CommitAllocationRequest(\r\n- VmaAllocationRequest& allocRequest,\r\n- VmaDeviceMemoryBlock* pBlock,\r\n- VkDeviceSize alignment,\r\n- VmaAllocationCreateFlags allocFlags,\r\n- void* pUserData,\r\n- VmaSuballocationType suballocType,\r\n- VmaAllocation* pAllocation)\r\n-{\r\n- const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;\r\n- const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;\r\n- const bool isMappingAllowed = (allocFlags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0;\r\n-\r\n- pBlock->PostAlloc();\r\n- \/\/ Allocate from pCurrBlock.\r\n- if (mapped)\r\n- {\r\n- VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n- }\r\n-\r\n- *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(isMappingAllowed);\r\n- pBlock->m_pMetadata->Alloc(allocRequest, suballocType, *pAllocation);\r\n- (*pAllocation)->InitBlockAllocation(\r\n- pBlock,\r\n- allocRequest.allocHandle,\r\n- alignment,\r\n- allocRequest.size, \/\/ Not size, as actual allocation size may be larger than requested!\r\n- m_MemoryTypeIndex,\r\n- suballocType,\r\n- mapped);\r\n- VMA_HEAVY_ASSERT(pBlock->Validate());\r\n- if (isUserDataString)\r\n- (*pAllocation)->SetName(m_hAllocator, (const char*)pUserData);\r\n- else\r\n- (*pAllocation)->SetUserData(m_hAllocator, pUserData);\r\n- m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), allocRequest.size);\r\n- if (VMA_DEBUG_INITIALIZE_ALLOCATIONS)\r\n- {\r\n- m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);\r\n- }\r\n- if (IsCorruptionDetectionEnabled())\r\n- {\r\n- VkResult res = pBlock->WriteMagicValueAfterAllocation(m_hAllocator, (*pAllocation)->GetOffset(), allocRequest.size);\r\n- VMA_ASSERT(res == VK_SUCCESS && \"Couldn't map block memory to write magic value.\");\r\n- }\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)\r\n-{\r\n- VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };\r\n- allocInfo.pNext = m_pMemoryAllocateNext;\r\n- allocInfo.memoryTypeIndex = m_MemoryTypeIndex;\r\n- allocInfo.allocationSize = blockSize;\r\n-\r\n-#if VMA_BUFFER_DEVICE_ADDRESS\r\n- \/\/ Every standalone block can potentially contain a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT - always enable the feature.\r\n- VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR };\r\n- if (m_hAllocator->m_UseKhrBufferDeviceAddress)\r\n- {\r\n- allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR;\r\n- VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo);\r\n- }\r\n-#endif \/\/ VMA_BUFFER_DEVICE_ADDRESS\r\n-\r\n-#if VMA_MEMORY_PRIORITY\r\n- VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };\r\n- if (m_hAllocator->m_UseExtMemoryPriority)\r\n- {\r\n- VMA_ASSERT(m_Priority >= 0.f && m_Priority <= 1.f);\r\n- priorityInfo.priority = m_Priority;\r\n- VmaPnextChainPushFront(&allocInfo, &priorityInfo);\r\n- }\r\n-#endif \/\/ VMA_MEMORY_PRIORITY\r\n-\r\n-#if VMA_EXTERNAL_MEMORY\r\n- \/\/ Attach VkExportMemoryAllocateInfoKHR if necessary.\r\n- VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR };\r\n- exportMemoryAllocInfo.handleTypes = m_hAllocator->GetExternalMemoryHandleTypeFlags(m_MemoryTypeIndex);\r\n- if (exportMemoryAllocInfo.handleTypes != 0)\r\n- {\r\n- VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo);\r\n- }\r\n-#endif \/\/ VMA_EXTERNAL_MEMORY\r\n-\r\n- VkDeviceMemory mem = VK_NULL_HANDLE;\r\n- VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem);\r\n- if (res < 0)\r\n- {\r\n- return res;\r\n- }\r\n-\r\n- \/\/ New VkDeviceMemory successfully created.\r\n-\r\n- \/\/ Create new Allocation for it.\r\n- VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator);\r\n- pBlock->Init(\r\n- m_hAllocator,\r\n- m_hParentPool,\r\n- m_MemoryTypeIndex,\r\n- mem,\r\n- allocInfo.allocationSize,\r\n- m_NextBlockId++,\r\n- m_Algorithm,\r\n- m_BufferImageGranularity);\r\n-\r\n- m_Blocks.push_back(pBlock);\r\n- if (pNewBlockIndex != VMA_NULL)\r\n- {\r\n- *pNewBlockIndex = m_Blocks.size() - 1;\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-bool VmaBlockVector::HasEmptyBlock()\r\n-{\r\n- for (size_t index = 0, count = m_Blocks.size(); index < count; ++index)\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = m_Blocks[index];\r\n- if (pBlock->m_pMetadata->IsEmpty())\r\n- {\r\n- return true;\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json)\r\n-{\r\n- VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n-\r\n- if (IsCustomPool())\r\n- {\r\n- const char* poolName = m_hParentPool->GetName();\r\n- if (poolName != VMA_NULL && poolName[0] != '\\0')\r\n- {\r\n- json.WriteString(\"Name\");\r\n- json.WriteString(poolName);\r\n- }\r\n-\r\n- json.WriteString(\"MemoryTypeIndex\");\r\n- json.WriteNumber(m_MemoryTypeIndex);\r\n-\r\n- json.WriteString(\"BlockSize\");\r\n- json.WriteNumber(m_PreferredBlockSize);\r\n-\r\n- json.WriteString(\"BlockCount\");\r\n- json.BeginObject(true);\r\n- if (m_MinBlockCount > 0)\r\n- {\r\n- json.WriteString(\"Min\");\r\n- json.WriteNumber((uint64_t)m_MinBlockCount);\r\n- }\r\n- if (m_MaxBlockCount < SIZE_MAX)\r\n- {\r\n- json.WriteString(\"Max\");\r\n- json.WriteNumber((uint64_t)m_MaxBlockCount);\r\n- }\r\n- json.WriteString(\"Cur\");\r\n- json.WriteNumber((uint64_t)m_Blocks.size());\r\n- json.EndObject();\r\n-\r\n- if (m_Algorithm != 0)\r\n- {\r\n- json.WriteString(\"Algorithm\");\r\n- json.WriteString(VmaAlgorithmToStr(m_Algorithm));\r\n- }\r\n- }\r\n- else\r\n- {\r\n- json.WriteString(\"PreferredBlockSize\");\r\n- json.WriteNumber(m_PreferredBlockSize);\r\n- }\r\n-\r\n- json.WriteString(\"Blocks\");\r\n- json.BeginObject();\r\n- for (size_t i = 0; i < m_Blocks.size(); ++i)\r\n- {\r\n- json.BeginString();\r\n- json.ContinueString(m_Blocks[i]->GetId());\r\n- json.EndString();\r\n-\r\n- m_Blocks[i]->m_pMetadata->PrintDetailedMap(json, m_Blocks[i]->GetMapRefCount());\r\n- }\r\n- json.EndObject();\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-VkResult VmaBlockVector::CheckCorruption()\r\n-{\r\n- if (!IsCorruptionDetectionEnabled())\r\n- {\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n-\r\n- VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\r\n- for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\r\n- VMA_ASSERT(pBlock);\r\n- VkResult res = pBlock->CheckCorruption(m_hAllocator);\r\n- if (res != VK_SUCCESS)\r\n- {\r\n- return res;\r\n- }\r\n- }\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-#endif \/\/ _VMA_BLOCK_VECTOR_FUNCTIONS\r\n-\r\n-#ifndef _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS\r\n-VmaDefragmentationContext_T::VmaDefragmentationContext_T(\r\n- VmaAllocator hAllocator,\r\n- const VmaDefragmentationInfo& info)\r\n- : m_MaxPassBytes(info.maxBytesPerPass == 0 ? VK_WHOLE_SIZE : info.maxBytesPerPass),\r\n- m_MaxPassAllocations(info.maxAllocationsPerPass == 0 ? UINT32_MAX : info.maxAllocationsPerPass),\r\n- m_MoveAllocator(hAllocator->GetAllocationCallbacks()),\r\n- m_Moves(m_MoveAllocator)\r\n-{\r\n- m_Algorithm = info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK;\r\n-\r\n- if (info.pool != VMA_NULL)\r\n- {\r\n- m_BlockVectorCount = 1;\r\n- m_PoolBlockVector = &info.pool->m_BlockVector;\r\n- m_pBlockVectors = &m_PoolBlockVector;\r\n- m_PoolBlockVector->SortByFreeSize();\r\n- }\r\n- else\r\n- {\r\n- m_BlockVectorCount = hAllocator->GetMemoryTypeCount();\r\n- m_PoolBlockVector = VMA_NULL;\r\n- m_pBlockVectors = hAllocator->m_pBlockVectors;\r\n- for (uint32_t i = 0; i < m_BlockVectorCount; ++i)\r\n- {\r\n- VmaBlockVector* vector = m_pBlockVectors[i];\r\n- if (vector != VMA_NULL)\r\n- vector->SortByFreeSize();\r\n- }\r\n- }\r\n- \r\n- switch (m_Algorithm)\r\n- {\r\n- case 0: \/\/ Default algorithm\r\n- m_Algorithm = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT;\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\r\n- {\r\n- m_AlgorithmState = vma_new_array(hAllocator, StateBalanced, m_BlockVectorCount);\r\n- break;\r\n- }\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\r\n- {\r\n- if (hAllocator->GetBufferImageGranularity() > 1)\r\n- {\r\n- m_AlgorithmState = vma_new_array(hAllocator, StateExtensive, m_BlockVectorCount);\r\n- }\r\n- break;\r\n- }\r\n- }\r\n-}\r\n-\r\n-VmaDefragmentationContext_T::~VmaDefragmentationContext_T()\r\n-{\r\n- if (m_AlgorithmState)\r\n- {\r\n- switch (m_Algorithm)\r\n- {\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\r\n- vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast<StateBalanced*>(m_AlgorithmState), m_BlockVectorCount);\r\n- break;\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\r\n- vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast<StateExtensive*>(m_AlgorithmState), m_BlockVectorCount);\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- }\r\n-}\r\n-\r\n-VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo)\r\n-{\r\n- if (m_PoolBlockVector != VMA_NULL)\r\n- {\r\n- VmaMutexLockWrite lock(m_PoolBlockVector->GetMutex(), m_PoolBlockVector->GetAllocator()->m_UseMutex);\r\n-\r\n- if (m_PoolBlockVector->GetBlockCount() > 1)\r\n- ComputeDefragmentation(*m_PoolBlockVector, 0);\r\n- else if (m_PoolBlockVector->GetBlockCount() == 1)\r\n- ReallocWithinBlock(*m_PoolBlockVector, m_PoolBlockVector->GetBlock(0));\r\n- }\r\n- else\r\n- {\r\n- for (uint32_t i = 0; i < m_BlockVectorCount; ++i)\r\n- {\r\n- if (m_pBlockVectors[i] != VMA_NULL)\r\n- {\r\n- VmaMutexLockWrite lock(m_pBlockVectors[i]->GetMutex(), m_pBlockVectors[i]->GetAllocator()->m_UseMutex);\r\n-\r\n- if (m_pBlockVectors[i]->GetBlockCount() > 1)\r\n- {\r\n- if (ComputeDefragmentation(*m_pBlockVectors[i], i))\r\n- break;\r\n- }\r\n- else if (m_pBlockVectors[i]->GetBlockCount() == 1)\r\n- {\r\n- if (ReallocWithinBlock(*m_pBlockVectors[i], m_pBlockVectors[i]->GetBlock(0)))\r\n- break;\r\n- }\r\n- }\r\n- }\r\n- }\r\n-\r\n- moveInfo.moveCount = static_cast<uint32_t>(m_Moves.size());\r\n- if (moveInfo.moveCount > 0)\r\n- {\r\n- moveInfo.pMoves = m_Moves.data();\r\n- return VK_INCOMPLETE;\r\n- }\r\n-\r\n- moveInfo.pMoves = VMA_NULL;\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo)\r\n-{\r\n- VMA_ASSERT(moveInfo.moveCount > 0 ? moveInfo.pMoves != VMA_NULL : true);\r\n-\r\n- VkResult result = VK_SUCCESS;\r\n- VmaStlAllocator<FragmentedBlock> blockAllocator(m_MoveAllocator.m_pCallbacks);\r\n- VmaVector<FragmentedBlock, VmaStlAllocator<FragmentedBlock>> immovableBlocks(blockAllocator);\r\n- VmaVector<FragmentedBlock, VmaStlAllocator<FragmentedBlock>> mappedBlocks(blockAllocator);\r\n-\r\n- VmaAllocator allocator = VMA_NULL;\r\n- for (uint32_t i = 0; i < moveInfo.moveCount; ++i)\r\n- {\r\n- VmaDefragmentationMove& move = moveInfo.pMoves[i];\r\n- size_t prevCount = 0, currentCount = 0;\r\n- VkDeviceSize freedBlockSize = 0;\r\n-\r\n- uint32_t vectorIndex;\r\n- VmaBlockVector* vector;\r\n- if (m_PoolBlockVector != VMA_NULL)\r\n- {\r\n- vectorIndex = 0;\r\n- vector = m_PoolBlockVector;\r\n- }\r\n- else\r\n- {\r\n- vectorIndex = move.srcAllocation->GetMemoryTypeIndex();\r\n- vector = m_pBlockVectors[vectorIndex];\r\n- VMA_ASSERT(vector != VMA_NULL);\r\n- }\r\n- \r\n- switch (move.operation)\r\n- {\r\n- case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY:\r\n- {\r\n- uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);\r\n- if (mapCount > 0)\r\n- {\r\n- allocator = vector->m_hAllocator;\r\n- VmaDeviceMemoryBlock* newMapBlock = move.srcAllocation->GetBlock();\r\n- bool notPresent = true;\r\n- for (FragmentedBlock& block : mappedBlocks)\r\n- {\r\n- if (block.block == newMapBlock)\r\n- {\r\n- notPresent = false;\r\n- block.data += mapCount;\r\n- break;\r\n- }\r\n- }\r\n- if (notPresent)\r\n- mappedBlocks.push_back({ mapCount, newMapBlock });\r\n- }\r\n-\r\n- \/\/ Scope for locks, Free have it's own lock\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- prevCount = vector->GetBlockCount();\r\n- freedBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize();\r\n- }\r\n- vector->Free(move.dstTmpAllocation, false);\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- currentCount = vector->GetBlockCount();\r\n- }\r\n-\r\n- result = VK_INCOMPLETE;\r\n- break;\r\n- }\r\n- case VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE:\r\n- {\r\n- m_PassStats.bytesMoved -= move.srcAllocation->GetSize();\r\n- --m_PassStats.allocationsMoved;\r\n- vector->Free(move.dstTmpAllocation, false);\r\n-\r\n- VmaDeviceMemoryBlock* newBlock = move.srcAllocation->GetBlock();\r\n- bool notPresent = true;\r\n- for (const FragmentedBlock& block : immovableBlocks)\r\n- {\r\n- if (block.block == newBlock)\r\n- {\r\n- notPresent = false;\r\n- break;\r\n- }\r\n- }\r\n- if (notPresent)\r\n- immovableBlocks.push_back({ vectorIndex, newBlock });\r\n- break;\r\n- }\r\n- case VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY:\r\n- {\r\n- m_PassStats.bytesMoved -= move.srcAllocation->GetSize();\r\n- --m_PassStats.allocationsMoved;\r\n- \/\/ Scope for locks, Free have it's own lock\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- prevCount = vector->GetBlockCount();\r\n- freedBlockSize = move.srcAllocation->GetBlock()->m_pMetadata->GetSize();\r\n- }\r\n- vector->Free(move.srcAllocation, false);\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- currentCount = vector->GetBlockCount();\r\n- }\r\n- freedBlockSize *= prevCount - currentCount;\r\n-\r\n- VkDeviceSize dstBlockSize;\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- dstBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize();\r\n- }\r\n- vector->Free(move.dstTmpAllocation, false);\r\n- {\r\n- VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n- freedBlockSize += dstBlockSize * (currentCount - vector->GetBlockCount());\r\n- currentCount = vector->GetBlockCount();\r\n- }\r\n-\r\n- result = VK_INCOMPLETE;\r\n- break;\r\n- }\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-\r\n- if (prevCount > currentCount)\r\n- {\r\n- size_t freedBlocks = prevCount - currentCount;\r\n- m_PassStats.deviceMemoryBlocksFreed += static_cast<uint32_t>(freedBlocks);\r\n- m_PassStats.bytesFreed += freedBlockSize;\r\n- }\r\n-\r\n- switch (m_Algorithm)\r\n- {\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\r\n- {\r\n- if (m_AlgorithmState != VMA_NULL)\r\n- {\r\n- \/\/ Avoid unnecessary tries to allocate when new free block is avaiable\r\n- StateExtensive& state = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[vectorIndex];\r\n- if (state.firstFreeBlock != SIZE_MAX)\r\n- {\r\n- state.firstFreeBlock -= prevCount - currentCount;\r\n- if (state.firstFreeBlock != 0)\r\n- state.firstFreeBlock -= vector->GetBlock(state.firstFreeBlock - 1)->m_pMetadata->IsEmpty();\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- moveInfo.moveCount = 0;\r\n- moveInfo.pMoves = VMA_NULL;\r\n- m_Moves.clear();\r\n-\r\n- \/\/ Update stats\r\n- m_GlobalStats.allocationsMoved += m_PassStats.allocationsMoved;\r\n- m_GlobalStats.bytesFreed += m_PassStats.bytesFreed;\r\n- m_GlobalStats.bytesMoved += m_PassStats.bytesMoved;\r\n- m_GlobalStats.deviceMemoryBlocksFreed += m_PassStats.deviceMemoryBlocksFreed;\r\n- m_PassStats = { 0 };\r\n-\r\n- \/\/ Move blocks with immovable allocations according to algorithm\r\n- if (immovableBlocks.size() > 0)\r\n- {\r\n- switch (m_Algorithm)\r\n- {\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\r\n- {\r\n- if (m_AlgorithmState != VMA_NULL)\r\n- {\r\n- bool swapped = false;\r\n- \/\/ Move to the start of free blocks range\r\n- for (const FragmentedBlock& block : immovableBlocks)\r\n- {\r\n- StateExtensive& state = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[block.data];\r\n- if (state.operation != StateExtensive::Operation::Cleanup)\r\n- {\r\n- VmaBlockVector* vector = m_pBlockVectors[block.data];\r\n- VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n-\r\n- for (size_t i = 0, count = vector->GetBlockCount() - m_ImmovableBlockCount; i < count; ++i)\r\n- {\r\n- if (vector->GetBlock(i) == block.block)\r\n- {\r\n- VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[vector->GetBlockCount() - ++m_ImmovableBlockCount]);\r\n- if (state.firstFreeBlock != SIZE_MAX)\r\n- {\r\n- if (i < state.firstFreeBlock - 1)\r\n- {\r\n- VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[--state.firstFreeBlock]);\r\n- }\r\n- }\r\n- swapped = true;\r\n- break;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- if (swapped)\r\n- result = VK_INCOMPLETE;\r\n- break;\r\n- }\r\n- }\r\n- default:\r\n- {\r\n- \/\/ Move to the begining\r\n- for (const FragmentedBlock& block : immovableBlocks)\r\n- {\r\n- VmaBlockVector* vector = m_pBlockVectors[block.data];\r\n- VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\r\n-\r\n- for (size_t i = m_ImmovableBlockCount; i < vector->GetBlockCount(); ++i)\r\n- {\r\n- if (vector->GetBlock(i) == block.block)\r\n- {\r\n- VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[m_ImmovableBlockCount++]);\r\n- break;\r\n- }\r\n- }\r\n- }\r\n- break;\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ Bulk-map destination blocks\r\n- for (const FragmentedBlock& block : mappedBlocks)\r\n- {\r\n- VkResult res = block.block->Map(allocator, block.data, VMA_NULL);\r\n- VMA_ASSERT(res == VK_SUCCESS);\r\n- }\r\n- return result;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ComputeDefragmentation(VmaBlockVector& vector, size_t index)\r\n-{\r\n- switch (m_Algorithm)\r\n- {\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT:\r\n- return ComputeDefragmentation_Fast(vector);\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\r\n- return ComputeDefragmentation_Balanced(vector, index, true);\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT:\r\n- return ComputeDefragmentation_Full(vector);\r\n- case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\r\n- return ComputeDefragmentation_Extensive(vector, index);\r\n- }\r\n-}\r\n-\r\n-VmaDefragmentationContext_T::MoveAllocationData VmaDefragmentationContext_T::GetMoveData(\r\n- VmaAllocHandle handle, VmaBlockMetadata* metadata)\r\n-{\r\n- MoveAllocationData moveData;\r\n- moveData.move.srcAllocation = (VmaAllocation)metadata->GetAllocationUserData(handle);\r\n- moveData.size = moveData.move.srcAllocation->GetSize();\r\n- moveData.alignment = moveData.move.srcAllocation->GetAlignment();\r\n- moveData.type = moveData.move.srcAllocation->GetSuballocationType();\r\n- moveData.flags = 0;\r\n-\r\n- if (moveData.move.srcAllocation->IsPersistentMap())\r\n- moveData.flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n- if (moveData.move.srcAllocation->IsMappingAllowed())\r\n- moveData.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;\r\n-\r\n- return moveData;\r\n-}\r\n-\r\n-VmaDefragmentationContext_T::CounterStatus VmaDefragmentationContext_T::CheckCounters(VkDeviceSize bytes)\r\n-{\r\n- \/\/ Ignore allocation if will exceed max size for copy\r\n- if (m_PassStats.bytesMoved + bytes > m_MaxPassBytes)\r\n- {\r\n- if (++m_IgnoredAllocs < MAX_ALLOCS_TO_IGNORE)\r\n- return CounterStatus::Ignore;\r\n- else\r\n- return CounterStatus::End;\r\n- }\r\n- return CounterStatus::Pass;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::IncrementCounters(VkDeviceSize bytes)\r\n-{\r\n- m_PassStats.bytesMoved += bytes;\r\n- \/\/ Early return when max found\r\n- if (++m_PassStats.allocationsMoved >= m_MaxPassAllocations || m_PassStats.bytesMoved >= m_MaxPassBytes)\r\n- {\r\n- VMA_ASSERT(m_PassStats.allocationsMoved == m_MaxPassAllocations ||\r\n- m_PassStats.bytesMoved == m_MaxPassBytes && \"Exceeded maximal pass threshold!\");\r\n- return true;\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block)\r\n-{\r\n- VmaBlockMetadata* metadata = block->m_pMetadata;\r\n-\r\n- for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = metadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, metadata);\r\n- \/\/ Ignore newly created allocations by defragmentation algorithm\r\n- if (moveData.move.srcAllocation->GetUserData() == this)\r\n- continue;\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n- \r\n- VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\r\n- if (offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\r\n- {\r\n- VmaAllocationRequest request = {};\r\n- if (metadata->CreateAllocationRequest(\r\n- moveData.size,\r\n- moveData.alignment,\r\n- false,\r\n- moveData.type,\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\r\n- &request))\r\n- {\r\n- if (metadata->GetAllocationOffset(request.allocHandle) < offset)\r\n- {\r\n- if (vector.CommitAllocationRequest(\r\n- request,\r\n- block,\r\n- moveData.alignment,\r\n- moveData.flags,\r\n- this,\r\n- moveData.type,\r\n- &moveData.move.dstTmpAllocation) == VK_SUCCESS)\r\n- {\r\n- m_Moves.push_back(moveData.move);\r\n- if (IncrementCounters(moveData.size))\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector)\r\n-{\r\n- for (; start < end; ++start)\r\n- {\r\n- VmaDeviceMemoryBlock* dstBlock = vector.GetBlock(start);\r\n- if (dstBlock->m_pMetadata->GetSumFreeSize() >= data.size)\r\n- {\r\n- if (vector.AllocateFromBlock(dstBlock,\r\n- data.size,\r\n- data.alignment,\r\n- data.flags,\r\n- this,\r\n- data.type,\r\n- 0,\r\n- &data.move.dstTmpAllocation) == VK_SUCCESS)\r\n- {\r\n- m_Moves.push_back(data.move);\r\n- if (IncrementCounters(data.size))\r\n- return true;\r\n- break;\r\n- }\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ComputeDefragmentation_Fast(VmaBlockVector& vector)\r\n-{\r\n- \/\/ Move only between blocks\r\n-\r\n- \/\/ Go through allocations in last blocks and try to fit them inside first ones\r\n- for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\r\n- {\r\n- VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata;\r\n-\r\n- for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = metadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, metadata);\r\n- \/\/ Ignore newly created allocations by defragmentation algorithm\r\n- if (moveData.move.srcAllocation->GetUserData() == this)\r\n- continue;\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n-\r\n- \/\/ Check all previous blocks for free space\r\n- if (AllocInOtherBlock(0, i, moveData, vector))\r\n- return true;\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update)\r\n-{\r\n- \/\/ Go over every allocation and try to fit it in previous blocks at lowest offsets,\r\n- \/\/ if not possible: realloc within single block to minimize offset (exclude offset == 0),\r\n- \/\/ but only if there are noticable gaps between them (some heuristic, ex. average size of allocation in block)\r\n- VMA_ASSERT(m_AlgorithmState != VMA_NULL);\r\n-\r\n- StateBalanced& vectorState = reinterpret_cast<StateBalanced*>(m_AlgorithmState)[index];\r\n- if (update && vectorState.avgAllocSize == UINT64_MAX)\r\n- UpdateVectorStatistics(vector, vectorState);\r\n-\r\n- const size_t startMoveCount = m_Moves.size();\r\n- VkDeviceSize minimalFreeRegion = vectorState.avgFreeSize \/ 2;\r\n- for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\r\n- {\r\n- VmaDeviceMemoryBlock* block = vector.GetBlock(i);\r\n- VmaBlockMetadata* metadata = block->m_pMetadata;\r\n- VkDeviceSize prevFreeRegionSize = 0;\r\n-\r\n- for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = metadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, metadata);\r\n- \/\/ Ignore newly created allocations by defragmentation algorithm\r\n- if (moveData.move.srcAllocation->GetUserData() == this)\r\n- continue;\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n-\r\n- \/\/ Check all previous blocks for free space\r\n- const size_t prevMoveCount = m_Moves.size();\r\n- if (AllocInOtherBlock(0, i, moveData, vector))\r\n- return true;\r\n-\r\n- VkDeviceSize nextFreeRegionSize = metadata->GetNextFreeRegionSize(handle);\r\n- \/\/ If no room found then realloc within block for lower offset\r\n- VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\r\n- if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\r\n- {\r\n- \/\/ Check if realloc will make sense\r\n- if (prevFreeRegionSize >= minimalFreeRegion ||\r\n- nextFreeRegionSize >= minimalFreeRegion ||\r\n- moveData.size <= vectorState.avgFreeSize ||\r\n- moveData.size <= vectorState.avgAllocSize)\r\n- {\r\n- VmaAllocationRequest request = {};\r\n- if (metadata->CreateAllocationRequest(\r\n- moveData.size,\r\n- moveData.alignment,\r\n- false,\r\n- moveData.type,\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\r\n- &request))\r\n- {\r\n- if (metadata->GetAllocationOffset(request.allocHandle) < offset)\r\n- {\r\n- if (vector.CommitAllocationRequest(\r\n- request,\r\n- block,\r\n- moveData.alignment,\r\n- moveData.flags,\r\n- this,\r\n- moveData.type,\r\n- &moveData.move.dstTmpAllocation) == VK_SUCCESS)\r\n- {\r\n- m_Moves.push_back(moveData.move);\r\n- if (IncrementCounters(moveData.size))\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- prevFreeRegionSize = nextFreeRegionSize;\r\n- }\r\n- }\r\n- \r\n- \/\/ No moves perfomed, update statistics to current vector state\r\n- if (startMoveCount == m_Moves.size() && !update)\r\n- {\r\n- vectorState.avgAllocSize = UINT64_MAX;\r\n- return ComputeDefragmentation_Balanced(vector, index, false);\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ComputeDefragmentation_Full(VmaBlockVector& vector)\r\n-{\r\n- \/\/ Go over every allocation and try to fit it in previous blocks at lowest offsets,\r\n- \/\/ if not possible: realloc within single block to minimize offset (exclude offset == 0)\r\n-\r\n- for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\r\n- {\r\n- VmaDeviceMemoryBlock* block = vector.GetBlock(i);\r\n- VmaBlockMetadata* metadata = block->m_pMetadata;\r\n-\r\n- for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = metadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, metadata);\r\n- \/\/ Ignore newly created allocations by defragmentation algorithm\r\n- if (moveData.move.srcAllocation->GetUserData() == this)\r\n- continue;\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n-\r\n- \/\/ Check all previous blocks for free space\r\n- const size_t prevMoveCount = m_Moves.size();\r\n- if (AllocInOtherBlock(0, i, moveData, vector))\r\n- return true;\r\n-\r\n- \/\/ If no room found then realloc within block for lower offset\r\n- VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\r\n- if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\r\n- {\r\n- VmaAllocationRequest request = {};\r\n- if (metadata->CreateAllocationRequest(\r\n- moveData.size,\r\n- moveData.alignment,\r\n- false,\r\n- moveData.type,\r\n- VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\r\n- &request))\r\n- {\r\n- if (metadata->GetAllocationOffset(request.allocHandle) < offset)\r\n- {\r\n- if (vector.CommitAllocationRequest(\r\n- request,\r\n- block,\r\n- moveData.alignment,\r\n- moveData.flags,\r\n- this,\r\n- moveData.type,\r\n- &moveData.move.dstTmpAllocation) == VK_SUCCESS)\r\n- {\r\n- m_Moves.push_back(moveData.move);\r\n- if (IncrementCounters(moveData.size))\r\n- return true;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index)\r\n-{\r\n- \/\/ First free single block, then populate it to the brim, then free another block, and so on\r\n-\r\n- \/\/ Fallback to previous algorithm since without granularity conflicts it can achieve max packing\r\n- if (vector.m_BufferImageGranularity == 1)\r\n- return ComputeDefragmentation_Full(vector);\r\n-\r\n- VMA_ASSERT(m_AlgorithmState != VMA_NULL);\r\n-\r\n- StateExtensive& vectorState = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[index];\r\n-\r\n- bool texturePresent = false, bufferPresent = false, otherPresent = false;\r\n- switch (vectorState.operation)\r\n- {\r\n- case StateExtensive::Operation::Done: \/\/ Vector defragmented\r\n- return false;\r\n- case StateExtensive::Operation::FindFreeBlockBuffer:\r\n- case StateExtensive::Operation::FindFreeBlockTexture:\r\n- case StateExtensive::Operation::FindFreeBlockAll:\r\n- {\r\n- \/\/ No free blocks, have to clear last one\r\n- size_t last = (vectorState.firstFreeBlock == SIZE_MAX ? vector.GetBlockCount() : vectorState.firstFreeBlock) - 1;\r\n- VmaBlockMetadata* freeMetadata = vector.GetBlock(last)->m_pMetadata;\r\n-\r\n- const size_t prevMoveCount = m_Moves.size();\r\n- for (VmaAllocHandle handle = freeMetadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = freeMetadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, freeMetadata);\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n-\r\n- \/\/ Check all previous blocks for free space\r\n- if (AllocInOtherBlock(0, last, moveData, vector))\r\n- {\r\n- \/\/ Full clear performed already\r\n- if (prevMoveCount != m_Moves.size() && freeMetadata->GetNextAllocation(handle) == VK_NULL_HANDLE)\r\n- reinterpret_cast<size_t*>(m_AlgorithmState)[index] = last;\r\n- return true;\r\n- }\r\n- }\r\n-\r\n- if (prevMoveCount == m_Moves.size())\r\n- {\r\n- \/\/ Cannot perform full clear, have to move data in other blocks around\r\n- if (last != 0)\r\n- {\r\n- for (size_t i = last - 1; i; --i)\r\n- {\r\n- if (ReallocWithinBlock(vector, vector.GetBlock(i)))\r\n- return true;\r\n- }\r\n- }\r\n-\r\n- if (prevMoveCount == m_Moves.size())\r\n- {\r\n- \/\/ No possible reallocs within blocks, try to move them around fast\r\n- return ComputeDefragmentation_Fast(vector);\r\n- }\r\n- }\r\n- else\r\n- {\r\n- switch (vectorState.operation)\r\n- {\r\n- case StateExtensive::Operation::FindFreeBlockBuffer:\r\n- vectorState.operation = StateExtensive::Operation::MoveBuffers;\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case StateExtensive::Operation::FindFreeBlockTexture:\r\n- vectorState.operation = StateExtensive::Operation::MoveTextures;\r\n- break;\r\n- case StateExtensive::Operation::FindFreeBlockAll:\r\n- vectorState.operation = StateExtensive::Operation::MoveAll;\r\n- break;\r\n- }\r\n- vectorState.firstFreeBlock = last;\r\n- \/\/ Nothing done, block found without reallocations, can perform another reallocs in same pass\r\n- if (prevMoveCount == m_Moves.size())\r\n- return ComputeDefragmentation_Extensive(vector, index);\r\n- }\r\n- break;\r\n- }\r\n- case StateExtensive::Operation::MoveTextures:\r\n- {\r\n- if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL, vector,\r\n- vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\r\n- {\r\n- if (texturePresent)\r\n- {\r\n- vectorState.operation = StateExtensive::Operation::FindFreeBlockTexture;\r\n- return ComputeDefragmentation_Extensive(vector, index);\r\n- }\r\n-\r\n- if (!bufferPresent && !otherPresent)\r\n- {\r\n- vectorState.operation = StateExtensive::Operation::Cleanup;\r\n- break;\r\n- }\r\n-\r\n- \/\/ No more textures to move, check buffers\r\n- vectorState.operation = StateExtensive::Operation::MoveBuffers;\r\n- bufferPresent = false;\r\n- otherPresent = false;\r\n- }\r\n- else\r\n- break;\r\n- }\r\n- case StateExtensive::Operation::MoveBuffers:\r\n- {\r\n- if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_BUFFER, vector,\r\n- vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\r\n- {\r\n- if (bufferPresent)\r\n- {\r\n- vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer;\r\n- return ComputeDefragmentation_Extensive(vector, index);\r\n- }\r\n-\r\n- if (!otherPresent)\r\n- {\r\n- vectorState.operation = StateExtensive::Operation::Cleanup;\r\n- break;\r\n- }\r\n-\r\n- \/\/ No more buffers to move, check all others\r\n- vectorState.operation = StateExtensive::Operation::MoveAll;\r\n- otherPresent = false;\r\n- }\r\n- else\r\n- break;\r\n- }\r\n- case StateExtensive::Operation::MoveAll:\r\n- {\r\n- if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_FREE, vector,\r\n- vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\r\n- {\r\n- if (otherPresent)\r\n- {\r\n- vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer;\r\n- return ComputeDefragmentation_Extensive(vector, index);\r\n- }\r\n- \/\/ Everything moved\r\n- vectorState.operation = StateExtensive::Operation::Cleanup;\r\n- }\r\n- break;\r\n- }\r\n- }\r\n-\r\n- if (vectorState.operation == StateExtensive::Operation::Cleanup)\r\n- {\r\n- \/\/ All other work done, pack data in blocks even tighter if possible\r\n- const size_t prevMoveCount = m_Moves.size();\r\n- for (size_t i = 0; i < vector.GetBlockCount(); ++i)\r\n- {\r\n- if (ReallocWithinBlock(vector, vector.GetBlock(i)))\r\n- return true;\r\n- }\r\n-\r\n- if (prevMoveCount == m_Moves.size())\r\n- vectorState.operation = StateExtensive::Operation::Done;\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-void VmaDefragmentationContext_T::UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state)\r\n-{\r\n- size_t allocCount = 0;\r\n- size_t freeCount = 0;\r\n- state.avgFreeSize = 0;\r\n- state.avgAllocSize = 0;\r\n-\r\n- for (size_t i = 0; i < vector.GetBlockCount(); ++i)\r\n- {\r\n- VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata;\r\n-\r\n- allocCount += metadata->GetAllocationCount();\r\n- freeCount += metadata->GetFreeRegionsCount();\r\n- state.avgFreeSize += metadata->GetSumFreeSize();\r\n- state.avgAllocSize += metadata->GetSize();\r\n- }\r\n-\r\n- state.avgAllocSize = (state.avgAllocSize - state.avgFreeSize) \/ allocCount;\r\n- state.avgFreeSize \/= freeCount;\r\n-}\r\n-\r\n-bool VmaDefragmentationContext_T::MoveDataToFreeBlocks(VmaSuballocationType currentType, \r\n- VmaBlockVector& vector, size_t firstFreeBlock,\r\n- bool& texturePresent, bool& bufferPresent, bool& otherPresent)\r\n-{\r\n- const size_t prevMoveCount = m_Moves.size();\r\n- for (size_t i = firstFreeBlock ; i;)\r\n- {\r\n- VmaDeviceMemoryBlock* block = vector.GetBlock(--i);\r\n- VmaBlockMetadata* metadata = block->m_pMetadata;\r\n-\r\n- for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\r\n- handle != VK_NULL_HANDLE;\r\n- handle = metadata->GetNextAllocation(handle))\r\n- {\r\n- MoveAllocationData moveData = GetMoveData(handle, metadata);\r\n- \/\/ Ignore newly created allocations by defragmentation algorithm\r\n- if (moveData.move.srcAllocation->GetUserData() == this)\r\n- continue;\r\n- switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\r\n- {\r\n- case CounterStatus::Ignore:\r\n- continue;\r\n- case CounterStatus::End:\r\n- return true;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- case CounterStatus::Pass:\r\n- break;\r\n- }\r\n-\r\n- \/\/ Move only single type of resources at once\r\n- if (!VmaIsBufferImageGranularityConflict(moveData.type, currentType))\r\n- {\r\n- \/\/ Try to fit allocation into free blocks\r\n- if (AllocInOtherBlock(firstFreeBlock, vector.GetBlockCount(), moveData, vector))\r\n- return false;\r\n- }\r\n-\r\n- if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL))\r\n- texturePresent = true;\r\n- else if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_BUFFER))\r\n- bufferPresent = true;\r\n- else\r\n- otherPresent = true;\r\n- }\r\n- }\r\n- return prevMoveCount == m_Moves.size();\r\n-}\r\n-#endif \/\/ _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS\r\n-\r\n-#ifndef _VMA_POOL_T_FUNCTIONS\r\n-VmaPool_T::VmaPool_T(\r\n- VmaAllocator hAllocator,\r\n- const VmaPoolCreateInfo& createInfo,\r\n- VkDeviceSize preferredBlockSize)\r\n- : m_BlockVector(\r\n- hAllocator,\r\n- this, \/\/ hParentPool\r\n- createInfo.memoryTypeIndex,\r\n- createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize,\r\n- createInfo.minBlockCount,\r\n- createInfo.maxBlockCount,\r\n- (createInfo.flags& VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),\r\n- createInfo.blockSize != 0, \/\/ explicitBlockSize\r\n- createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK, \/\/ algorithm\r\n- createInfo.priority,\r\n- VMA_MAX(hAllocator->GetMemoryTypeMinAlignment(createInfo.memoryTypeIndex), createInfo.minAllocationAlignment),\r\n- createInfo.pMemoryAllocateNext),\r\n- m_Id(0),\r\n- m_Name(VMA_NULL) {}\r\n-\r\n-VmaPool_T::~VmaPool_T()\r\n-{\r\n- VMA_ASSERT(m_PrevPool == VMA_NULL && m_NextPool == VMA_NULL);\r\n-}\r\n-\r\n-void VmaPool_T::SetName(const char* pName)\r\n-{\r\n- const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks();\r\n- VmaFreeString(allocs, m_Name);\r\n-\r\n- if (pName != VMA_NULL)\r\n- {\r\n- m_Name = VmaCreateStringCopy(allocs, pName);\r\n- }\r\n- else\r\n- {\r\n- m_Name = VMA_NULL;\r\n- }\r\n-}\r\n-#endif \/\/ _VMA_POOL_T_FUNCTIONS\r\n-\r\n-#ifndef _VMA_ALLOCATOR_T_FUNCTIONS\r\n-VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :\r\n- m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0),\r\n- m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0),\r\n- m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0),\r\n- m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0),\r\n- m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0),\r\n- m_UseAmdDeviceCoherentMemory((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT) != 0),\r\n- m_UseKhrBufferDeviceAddress((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT) != 0),\r\n- m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0),\r\n- m_hDevice(pCreateInfo->device),\r\n- m_hInstance(pCreateInfo->instance),\r\n- m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),\r\n- m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ?\r\n- *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks),\r\n- m_AllocationObjectAllocator(&m_AllocationCallbacks),\r\n- m_HeapSizeLimitMask(0),\r\n- m_DeviceMemoryCount(0),\r\n- m_PreferredLargeHeapBlockSize(0),\r\n- m_PhysicalDevice(pCreateInfo->physicalDevice),\r\n- m_GpuDefragmentationMemoryTypeBits(UINT32_MAX),\r\n- m_NextPoolId(0),\r\n- m_GlobalMemoryTypeBits(UINT32_MAX)\r\n-{\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- m_UseKhrDedicatedAllocation = false;\r\n- m_UseKhrBindMemory2 = false;\r\n- }\r\n-\r\n- if(VMA_DEBUG_DETECT_CORRUPTION)\r\n- {\r\n- \/\/ Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it.\r\n- VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0);\r\n- }\r\n-\r\n- VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device && pCreateInfo->instance);\r\n-\r\n- if(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n-#if !(VMA_DEDICATED_ALLOCATION)\r\n- if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros.\");\r\n- }\r\n-#endif\r\n-#if !(VMA_BIND_MEMORY2)\r\n- if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros.\");\r\n- }\r\n-#endif\r\n- }\r\n-#if !(VMA_MEMORY_BUDGET)\r\n- if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros.\");\r\n- }\r\n-#endif\r\n-#if !(VMA_BUFFER_DEVICE_ADDRESS)\r\n- if(m_UseKhrBufferDeviceAddress)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT is set but required extension or Vulkan 1.2 is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.\");\r\n- }\r\n-#endif\r\n-#if VMA_VULKAN_VERSION < 1002000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 2, 0))\r\n- {\r\n- VMA_ASSERT(0 && \"vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros.\");\r\n- }\r\n-#endif\r\n-#if VMA_VULKAN_VERSION < 1001000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- VMA_ASSERT(0 && \"vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.\");\r\n- }\r\n-#endif\r\n-#if !(VMA_MEMORY_PRIORITY)\r\n- if(m_UseExtMemoryPriority)\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.\");\r\n- }\r\n-#endif\r\n-\r\n- memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));\r\n- memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));\r\n- memset(&m_MemProps, 0, sizeof(m_MemProps));\r\n-\r\n- memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors));\r\n- memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions));\r\n-\r\n-#if VMA_EXTERNAL_MEMORY\r\n- memset(&m_TypeExternalMemoryHandleTypes, 0, sizeof(m_TypeExternalMemoryHandleTypes));\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-\r\n- if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL)\r\n- {\r\n- m_DeviceMemoryCallbacks.pUserData = pCreateInfo->pDeviceMemoryCallbacks->pUserData;\r\n- m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate;\r\n- m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree;\r\n- }\r\n-\r\n- ImportVulkanFunctions(pCreateInfo->pVulkanFunctions);\r\n-\r\n- (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties);\r\n- (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps);\r\n-\r\n- VMA_ASSERT(VmaIsPow2(VMA_MIN_ALIGNMENT));\r\n- VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY));\r\n- VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity));\r\n- VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize));\r\n-\r\n- m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ?\r\n- pCreateInfo->preferredLargeHeapBlockSize : static_cast<VkDeviceSize>(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);\r\n-\r\n- m_GlobalMemoryTypeBits = CalculateGlobalMemoryTypeBits();\r\n-\r\n-#if VMA_EXTERNAL_MEMORY\r\n- if(pCreateInfo->pTypeExternalMemoryHandleTypes != VMA_NULL)\r\n- {\r\n- memcpy(m_TypeExternalMemoryHandleTypes, pCreateInfo->pTypeExternalMemoryHandleTypes,\r\n- sizeof(VkExternalMemoryHandleTypeFlagsKHR) * GetMemoryTypeCount());\r\n- }\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-\r\n- if(pCreateInfo->pHeapSizeLimit != VMA_NULL)\r\n- {\r\n- for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)\r\n- {\r\n- const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex];\r\n- if(limit != VK_WHOLE_SIZE)\r\n- {\r\n- m_HeapSizeLimitMask |= 1u << heapIndex;\r\n- if(limit < m_MemProps.memoryHeaps[heapIndex].size)\r\n- {\r\n- m_MemProps.memoryHeaps[heapIndex].size = limit;\r\n- }\r\n- }\r\n- }\r\n- }\r\n-\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- \/\/ Create only supported types\r\n- if((m_GlobalMemoryTypeBits & (1u << memTypeIndex)) != 0)\r\n- {\r\n- const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex);\r\n- m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)(\r\n- this,\r\n- VK_NULL_HANDLE, \/\/ hParentPool\r\n- memTypeIndex,\r\n- preferredBlockSize,\r\n- 0,\r\n- SIZE_MAX,\r\n- GetBufferImageGranularity(),\r\n- false, \/\/ explicitBlockSize\r\n- 0, \/\/ algorithm\r\n- 0.5f, \/\/ priority (0.5 is the default per Vulkan spec)\r\n- GetMemoryTypeMinAlignment(memTypeIndex), \/\/ minAllocationAlignment\r\n- VMA_NULL); \/\/ \/\/ pMemoryAllocateNext\r\n- \/\/ No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,\r\n- \/\/ becase minBlockCount is 0.\r\n- }\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo)\r\n-{\r\n- VkResult res = VK_SUCCESS;\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- if(m_UseExtMemoryBudget)\r\n- {\r\n- UpdateVulkanBudget();\r\n- }\r\n-#endif \/\/ #if VMA_MEMORY_BUDGET\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VmaAllocator_T::~VmaAllocator_T()\r\n-{\r\n- VMA_ASSERT(m_Pools.IsEmpty());\r\n-\r\n- for(size_t memTypeIndex = GetMemoryTypeCount(); memTypeIndex--; )\r\n- {\r\n- vma_delete(this, m_pBlockVectors[memTypeIndex]);\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions)\r\n-{\r\n-#if VMA_STATIC_VULKAN_FUNCTIONS == 1\r\n- ImportVulkanFunctions_Static();\r\n-#endif\r\n-\r\n- if(pVulkanFunctions != VMA_NULL)\r\n- {\r\n- ImportVulkanFunctions_Custom(pVulkanFunctions);\r\n- }\r\n-\r\n-#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\r\n- ImportVulkanFunctions_Dynamic();\r\n-#endif\r\n-\r\n- ValidateVulkanFunctions();\r\n-}\r\n-\r\n-#if VMA_STATIC_VULKAN_FUNCTIONS == 1\r\n-\r\n-void VmaAllocator_T::ImportVulkanFunctions_Static()\r\n-{\r\n- \/\/ Vulkan 1.0\r\n- m_VulkanFunctions.vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vkGetInstanceProcAddr;\r\n- m_VulkanFunctions.vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vkGetDeviceProcAddr;\r\n- m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties;\r\n- m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties;\r\n- m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;\r\n- m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory;\r\n- m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory;\r\n- m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory;\r\n- m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges;\r\n- m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges;\r\n- m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory;\r\n- m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory;\r\n- m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements;\r\n- m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements;\r\n- m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer;\r\n- m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer;\r\n- m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage;\r\n- m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage;\r\n- m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer;\r\n-\r\n- \/\/ Vulkan 1.1\r\n-#if VMA_VULKAN_VERSION >= 1001000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = (PFN_vkGetBufferMemoryRequirements2)vkGetBufferMemoryRequirements2;\r\n- m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = (PFN_vkGetImageMemoryRequirements2)vkGetImageMemoryRequirements2;\r\n- m_VulkanFunctions.vkBindBufferMemory2KHR = (PFN_vkBindBufferMemory2)vkBindBufferMemory2;\r\n- m_VulkanFunctions.vkBindImageMemory2KHR = (PFN_vkBindImageMemory2)vkBindImageMemory2;\r\n- m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = (PFN_vkGetPhysicalDeviceMemoryProperties2)vkGetPhysicalDeviceMemoryProperties2;\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\r\n- {\r\n- m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements = (PFN_vkGetDeviceBufferMemoryRequirements)vkGetDeviceBufferMemoryRequirements;\r\n- m_VulkanFunctions.vkGetDeviceImageMemoryRequirements = (PFN_vkGetDeviceImageMemoryRequirements)vkGetDeviceImageMemoryRequirements;\r\n- }\r\n-#endif\r\n-}\r\n-\r\n-#endif \/\/ VMA_STATIC_VULKAN_FUNCTIONS == 1\r\n-\r\n-void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions)\r\n-{\r\n- VMA_ASSERT(pVulkanFunctions != VMA_NULL);\r\n-\r\n-#define VMA_COPY_IF_NOT_NULL(funcName) \\\r\n- if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName;\r\n-\r\n- VMA_COPY_IF_NOT_NULL(vkGetInstanceProcAddr);\r\n- VMA_COPY_IF_NOT_NULL(vkGetDeviceProcAddr);\r\n- VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties);\r\n- VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties);\r\n- VMA_COPY_IF_NOT_NULL(vkAllocateMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkFreeMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkMapMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkUnmapMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges);\r\n- VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges);\r\n- VMA_COPY_IF_NOT_NULL(vkBindBufferMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkBindImageMemory);\r\n- VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements);\r\n- VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements);\r\n- VMA_COPY_IF_NOT_NULL(vkCreateBuffer);\r\n- VMA_COPY_IF_NOT_NULL(vkDestroyBuffer);\r\n- VMA_COPY_IF_NOT_NULL(vkCreateImage);\r\n- VMA_COPY_IF_NOT_NULL(vkDestroyImage);\r\n- VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer);\r\n-\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR);\r\n- VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR);\r\n-#endif\r\n-\r\n-#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\r\n- VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR);\r\n- VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR);\r\n-#endif\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR);\r\n-#endif\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- VMA_COPY_IF_NOT_NULL(vkGetDeviceBufferMemoryRequirements);\r\n- VMA_COPY_IF_NOT_NULL(vkGetDeviceImageMemoryRequirements);\r\n-#endif\r\n-\r\n-#undef VMA_COPY_IF_NOT_NULL\r\n-}\r\n-\r\n-#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\r\n-\r\n-void VmaAllocator_T::ImportVulkanFunctions_Dynamic()\r\n-{\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetInstanceProcAddr && m_VulkanFunctions.vkGetDeviceProcAddr &&\r\n- \"To use VMA_DYNAMIC_VULKAN_FUNCTIONS in new versions of VMA you now have to pass \"\r\n- \"VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as VmaAllocatorCreateInfo::pVulkanFunctions. \"\r\n- \"Other members can be null.\");\r\n-\r\n-#define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \\\r\n- if(m_VulkanFunctions.memberName == VMA_NULL) \\\r\n- m_VulkanFunctions.memberName = \\\r\n- (functionPointerType)m_VulkanFunctions.vkGetInstanceProcAddr(m_hInstance, functionNameString);\r\n-#define VMA_FETCH_DEVICE_FUNC(memberName, functionPointerType, functionNameString) \\\r\n- if(m_VulkanFunctions.memberName == VMA_NULL) \\\r\n- m_VulkanFunctions.memberName = \\\r\n- (functionPointerType)m_VulkanFunctions.vkGetDeviceProcAddr(m_hDevice, functionNameString);\r\n-\r\n- VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceProperties, PFN_vkGetPhysicalDeviceProperties, \"vkGetPhysicalDeviceProperties\");\r\n- VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties, PFN_vkGetPhysicalDeviceMemoryProperties, \"vkGetPhysicalDeviceMemoryProperties\");\r\n- VMA_FETCH_DEVICE_FUNC(vkAllocateMemory, PFN_vkAllocateMemory, \"vkAllocateMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkFreeMemory, PFN_vkFreeMemory, \"vkFreeMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkMapMemory, PFN_vkMapMemory, \"vkMapMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkUnmapMemory, PFN_vkUnmapMemory, \"vkUnmapMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkFlushMappedMemoryRanges, PFN_vkFlushMappedMemoryRanges, \"vkFlushMappedMemoryRanges\");\r\n- VMA_FETCH_DEVICE_FUNC(vkInvalidateMappedMemoryRanges, PFN_vkInvalidateMappedMemoryRanges, \"vkInvalidateMappedMemoryRanges\");\r\n- VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory, PFN_vkBindBufferMemory, \"vkBindBufferMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkBindImageMemory, PFN_vkBindImageMemory, \"vkBindImageMemory\");\r\n- VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements, PFN_vkGetBufferMemoryRequirements, \"vkGetBufferMemoryRequirements\");\r\n- VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements, PFN_vkGetImageMemoryRequirements, \"vkGetImageMemoryRequirements\");\r\n- VMA_FETCH_DEVICE_FUNC(vkCreateBuffer, PFN_vkCreateBuffer, \"vkCreateBuffer\");\r\n- VMA_FETCH_DEVICE_FUNC(vkDestroyBuffer, PFN_vkDestroyBuffer, \"vkDestroyBuffer\");\r\n- VMA_FETCH_DEVICE_FUNC(vkCreateImage, PFN_vkCreateImage, \"vkCreateImage\");\r\n- VMA_FETCH_DEVICE_FUNC(vkDestroyImage, PFN_vkDestroyImage, \"vkDestroyImage\");\r\n- VMA_FETCH_DEVICE_FUNC(vkCmdCopyBuffer, PFN_vkCmdCopyBuffer, \"vkCmdCopyBuffer\");\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1001000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2, \"vkGetBufferMemoryRequirements2\");\r\n- VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2, \"vkGetImageMemoryRequirements2\");\r\n- VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2, \"vkBindBufferMemory2\");\r\n- VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2, \"vkBindImageMemory2\");\r\n- VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2, \"vkGetPhysicalDeviceMemoryProperties2\");\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_DEDICATED_ALLOCATION\r\n- if(m_UseKhrDedicatedAllocation)\r\n- {\r\n- VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2KHR, \"vkGetBufferMemoryRequirements2KHR\");\r\n- VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2KHR, \"vkGetImageMemoryRequirements2KHR\");\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_BIND_MEMORY2\r\n- if(m_UseKhrBindMemory2)\r\n- {\r\n- VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2KHR, \"vkBindBufferMemory2KHR\");\r\n- VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2KHR, \"vkBindImageMemory2KHR\");\r\n- }\r\n-#endif \/\/ #if VMA_BIND_MEMORY2\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- if(m_UseExtMemoryBudget)\r\n- {\r\n- VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, \"vkGetPhysicalDeviceMemoryProperties2KHR\");\r\n- }\r\n-#endif \/\/ #if VMA_MEMORY_BUDGET\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\r\n- {\r\n- VMA_FETCH_DEVICE_FUNC(vkGetDeviceBufferMemoryRequirements, PFN_vkGetDeviceBufferMemoryRequirements, \"vkGetDeviceBufferMemoryRequirements\");\r\n- VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirements, \"vkGetDeviceImageMemoryRequirements\");\r\n- }\r\n-#endif\r\n-\r\n-#undef VMA_FETCH_DEVICE_FUNC\r\n-#undef VMA_FETCH_INSTANCE_FUNC\r\n-}\r\n-\r\n-#endif \/\/ VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\r\n-\r\n-void VmaAllocator_T::ValidateVulkanFunctions()\r\n-{\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL);\r\n-\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation)\r\n- {\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL);\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2)\r\n- {\r\n- VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL);\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000\r\n- if(m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL);\r\n- }\r\n-#endif\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\r\n- {\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements != VMA_NULL);\r\n- VMA_ASSERT(m_VulkanFunctions.vkGetDeviceImageMemoryRequirements != VMA_NULL);\r\n- }\r\n-#endif\r\n-}\r\n-\r\n-VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex)\r\n-{\r\n- const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);\r\n- const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;\r\n- const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE;\r\n- return VmaAlignUp(isSmallHeap ? (heapSize \/ 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32);\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::AllocateMemoryOfType(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VkDeviceSize alignment,\r\n- bool dedicatedPreferred,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- uint32_t memTypeIndex,\r\n- VmaSuballocationType suballocType,\r\n- VmaDedicatedAllocationList& dedicatedAllocations,\r\n- VmaBlockVector& blockVector,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations)\r\n-{\r\n- VMA_ASSERT(pAllocations != VMA_NULL);\r\n- VMA_DEBUG_LOG(\" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu\", memTypeIndex, allocationCount, size);\r\n-\r\n- VmaAllocationCreateInfo finalCreateInfo = createInfo;\r\n- VkResult res = CalcMemTypeParams(\r\n- finalCreateInfo,\r\n- memTypeIndex,\r\n- size,\r\n- allocationCount);\r\n- if(res != VK_SUCCESS)\r\n- return res;\r\n-\r\n- if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)\r\n- {\r\n- return AllocateDedicatedMemory(\r\n- pool,\r\n- size,\r\n- suballocType,\r\n- dedicatedAllocations,\r\n- memTypeIndex,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\r\n- (finalCreateInfo.flags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\r\n- finalCreateInfo.pUserData,\r\n- finalCreateInfo.priority,\r\n- dedicatedBuffer,\r\n- dedicatedImage,\r\n- dedicatedBufferImageUsage,\r\n- allocationCount,\r\n- pAllocations,\r\n- blockVector.GetAllocationNextPtr());\r\n- }\r\n- else\r\n- {\r\n- const bool canAllocateDedicated =\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&\r\n- (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize());\r\n-\r\n- if(canAllocateDedicated)\r\n- {\r\n- \/\/ Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.\r\n- if(size > blockVector.GetPreferredBlockSize() \/ 2)\r\n- {\r\n- dedicatedPreferred = true;\r\n- }\r\n- \/\/ Protection against creating each allocation as dedicated when we reach or exceed heap size\/budget,\r\n- \/\/ which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above\r\n- \/\/ 3\/4 of the maximum allocation count.\r\n- if(m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 \/ 4)\r\n- {\r\n- dedicatedPreferred = false;\r\n- }\r\n-\r\n- if(dedicatedPreferred)\r\n- {\r\n- res = AllocateDedicatedMemory(\r\n- pool,\r\n- size,\r\n- suballocType,\r\n- dedicatedAllocations,\r\n- memTypeIndex,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\r\n- (finalCreateInfo.flags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\r\n- finalCreateInfo.pUserData,\r\n- finalCreateInfo.priority,\r\n- dedicatedBuffer,\r\n- dedicatedImage,\r\n- dedicatedBufferImageUsage,\r\n- allocationCount,\r\n- pAllocations,\r\n- blockVector.GetAllocationNextPtr());\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- \/\/ Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.\r\n- VMA_DEBUG_LOG(\" Allocated as DedicatedMemory\");\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- }\r\n-\r\n- res = blockVector.Allocate(\r\n- size,\r\n- alignment,\r\n- finalCreateInfo,\r\n- suballocType,\r\n- allocationCount,\r\n- pAllocations);\r\n- if(res == VK_SUCCESS)\r\n- return VK_SUCCESS;\r\n-\r\n- \/\/ Try dedicated memory.\r\n- if(canAllocateDedicated && !dedicatedPreferred)\r\n- {\r\n- res = AllocateDedicatedMemory(\r\n- pool,\r\n- size,\r\n- suballocType,\r\n- dedicatedAllocations,\r\n- memTypeIndex,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\r\n- (finalCreateInfo.flags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\r\n- (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\r\n- finalCreateInfo.pUserData,\r\n- finalCreateInfo.priority,\r\n- dedicatedBuffer,\r\n- dedicatedImage,\r\n- dedicatedBufferImageUsage,\r\n- allocationCount,\r\n- pAllocations,\r\n- blockVector.GetAllocationNextPtr());\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- \/\/ Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.\r\n- VMA_DEBUG_LOG(\" Allocated as DedicatedMemory\");\r\n- return VK_SUCCESS;\r\n- }\r\n- }\r\n- \/\/ Everything failed: Return error code.\r\n- VMA_DEBUG_LOG(\" vkAllocateMemory FAILED\");\r\n- return res;\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::AllocateDedicatedMemory(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VmaSuballocationType suballocType,\r\n- VmaDedicatedAllocationList& dedicatedAllocations,\r\n- uint32_t memTypeIndex,\r\n- bool map,\r\n- bool isUserDataString,\r\n- bool isMappingAllowed,\r\n- bool canAliasMemory,\r\n- void* pUserData,\r\n- float priority,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations,\r\n- const void* pNextChain)\r\n-{\r\n- VMA_ASSERT(allocationCount > 0 && pAllocations);\r\n-\r\n- VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };\r\n- allocInfo.memoryTypeIndex = memTypeIndex;\r\n- allocInfo.allocationSize = size;\r\n- allocInfo.pNext = pNextChain;\r\n-\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };\r\n- if(!canAliasMemory)\r\n- {\r\n- if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- if(dedicatedBuffer != VK_NULL_HANDLE)\r\n- {\r\n- VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE);\r\n- dedicatedAllocInfo.buffer = dedicatedBuffer;\r\n- VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo);\r\n- }\r\n- else if(dedicatedImage != VK_NULL_HANDLE)\r\n- {\r\n- dedicatedAllocInfo.image = dedicatedImage;\r\n- VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo);\r\n- }\r\n- }\r\n- }\r\n-#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n-\r\n-#if VMA_BUFFER_DEVICE_ADDRESS\r\n- VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR };\r\n- if(m_UseKhrBufferDeviceAddress)\r\n- {\r\n- bool canContainBufferWithDeviceAddress = true;\r\n- if(dedicatedBuffer != VK_NULL_HANDLE)\r\n- {\r\n- canContainBufferWithDeviceAddress = dedicatedBufferImageUsage == UINT32_MAX || \/\/ Usage flags unknown\r\n- (dedicatedBufferImageUsage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT) != 0;\r\n- }\r\n- else if(dedicatedImage != VK_NULL_HANDLE)\r\n- {\r\n- canContainBufferWithDeviceAddress = false;\r\n- }\r\n- if(canContainBufferWithDeviceAddress)\r\n- {\r\n- allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR;\r\n- VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo);\r\n- }\r\n- }\r\n-#endif \/\/ #if VMA_BUFFER_DEVICE_ADDRESS\r\n-\r\n-#if VMA_MEMORY_PRIORITY\r\n- VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };\r\n- if(m_UseExtMemoryPriority)\r\n- {\r\n- VMA_ASSERT(priority >= 0.f && priority <= 1.f);\r\n- priorityInfo.priority = priority;\r\n- VmaPnextChainPushFront(&allocInfo, &priorityInfo);\r\n- }\r\n-#endif \/\/ #if VMA_MEMORY_PRIORITY\r\n-\r\n-#if VMA_EXTERNAL_MEMORY\r\n- \/\/ Attach VkExportMemoryAllocateInfoKHR if necessary.\r\n- VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR };\r\n- exportMemoryAllocInfo.handleTypes = GetExternalMemoryHandleTypeFlags(memTypeIndex);\r\n- if(exportMemoryAllocInfo.handleTypes != 0)\r\n- {\r\n- VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo);\r\n- }\r\n-#endif \/\/ #if VMA_EXTERNAL_MEMORY\r\n-\r\n- size_t allocIndex;\r\n- VkResult res = VK_SUCCESS;\r\n- for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\r\n- {\r\n- res = AllocateDedicatedMemoryPage(\r\n- pool,\r\n- size,\r\n- suballocType,\r\n- memTypeIndex,\r\n- allocInfo,\r\n- map,\r\n- isUserDataString,\r\n- isMappingAllowed,\r\n- pUserData,\r\n- pAllocations + allocIndex);\r\n- if(res != VK_SUCCESS)\r\n- {\r\n- break;\r\n- }\r\n- }\r\n-\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\r\n- {\r\n- dedicatedAllocations.Register(pAllocations[allocIndex]);\r\n- }\r\n- VMA_DEBUG_LOG(\" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u\", allocationCount, memTypeIndex);\r\n- }\r\n- else\r\n- {\r\n- \/\/ Free all already created allocations.\r\n- while(allocIndex--)\r\n- {\r\n- VmaAllocation currAlloc = pAllocations[allocIndex];\r\n- VkDeviceMemory hMemory = currAlloc->GetMemory();\r\n-\r\n- \/*\r\n- There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory\r\n- before vkFreeMemory.\r\n-\r\n- if(currAlloc->GetMappedData() != VMA_NULL)\r\n- {\r\n- (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);\r\n- }\r\n- *\/\r\n-\r\n- FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory);\r\n- m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize());\r\n- m_AllocationObjectAllocator.Free(currAlloc);\r\n- }\r\n-\r\n- memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\r\n- }\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::AllocateDedicatedMemoryPage(\r\n- VmaPool pool,\r\n- VkDeviceSize size,\r\n- VmaSuballocationType suballocType,\r\n- uint32_t memTypeIndex,\r\n- const VkMemoryAllocateInfo& allocInfo,\r\n- bool map,\r\n- bool isUserDataString,\r\n- bool isMappingAllowed,\r\n- void* pUserData,\r\n- VmaAllocation* pAllocation)\r\n-{\r\n- VkDeviceMemory hMemory = VK_NULL_HANDLE;\r\n- VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory);\r\n- if(res < 0)\r\n- {\r\n- VMA_DEBUG_LOG(\" vkAllocateMemory FAILED\");\r\n- return res;\r\n- }\r\n-\r\n- void* pMappedData = VMA_NULL;\r\n- if(map)\r\n- {\r\n- res = (*m_VulkanFunctions.vkMapMemory)(\r\n- m_hDevice,\r\n- hMemory,\r\n- 0,\r\n- VK_WHOLE_SIZE,\r\n- 0,\r\n- &pMappedData);\r\n- if(res < 0)\r\n- {\r\n- VMA_DEBUG_LOG(\" vkMapMemory FAILED\");\r\n- FreeVulkanMemory(memTypeIndex, size, hMemory);\r\n- return res;\r\n- }\r\n- }\r\n-\r\n- *pAllocation = m_AllocationObjectAllocator.Allocate(isMappingAllowed);\r\n- (*pAllocation)->InitDedicatedAllocation(pool, memTypeIndex, hMemory, suballocType, pMappedData, size);\r\n- if (isUserDataString)\r\n- (*pAllocation)->SetName(this, (const char*)pUserData);\r\n- else\r\n- (*pAllocation)->SetUserData(this, pUserData);\r\n- m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size);\r\n- if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)\r\n- {\r\n- FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaAllocator_T::GetBufferMemoryRequirements(\r\n- VkBuffer hBuffer,\r\n- VkMemoryRequirements& memReq,\r\n- bool& requiresDedicatedAllocation,\r\n- bool& prefersDedicatedAllocation) const\r\n-{\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR };\r\n- memReqInfo.buffer = hBuffer;\r\n-\r\n- VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };\r\n-\r\n- VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };\r\n- VmaPnextChainPushFront(&memReq2, &memDedicatedReq);\r\n-\r\n- (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);\r\n-\r\n- memReq = memReq2.memoryRequirements;\r\n- requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);\r\n- prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- {\r\n- (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq);\r\n- requiresDedicatedAllocation = false;\r\n- prefersDedicatedAllocation = false;\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::GetImageMemoryRequirements(\r\n- VkImage hImage,\r\n- VkMemoryRequirements& memReq,\r\n- bool& requiresDedicatedAllocation,\r\n- bool& prefersDedicatedAllocation) const\r\n-{\r\n-#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\r\n- {\r\n- VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR };\r\n- memReqInfo.image = hImage;\r\n-\r\n- VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };\r\n-\r\n- VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };\r\n- VmaPnextChainPushFront(&memReq2, &memDedicatedReq);\r\n-\r\n- (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);\r\n-\r\n- memReq = memReq2.memoryRequirements;\r\n- requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);\r\n- prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\r\n- {\r\n- (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq);\r\n- requiresDedicatedAllocation = false;\r\n- prefersDedicatedAllocation = false;\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::FindMemoryTypeIndex(\r\n- uint32_t memoryTypeBits,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- VkFlags bufImgUsage,\r\n- uint32_t* pMemoryTypeIndex) const\r\n-{\r\n- memoryTypeBits &= GetGlobalMemoryTypeBits();\r\n-\r\n- if(pAllocationCreateInfo->memoryTypeBits != 0)\r\n- {\r\n- memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits;\r\n- }\r\n-\r\n- VkMemoryPropertyFlags requiredFlags = 0, preferredFlags = 0, notPreferredFlags = 0;\r\n- if(!FindMemoryPreferences(\r\n- IsIntegratedGpu(),\r\n- *pAllocationCreateInfo,\r\n- bufImgUsage,\r\n- requiredFlags, preferredFlags, notPreferredFlags))\r\n- {\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n-\r\n- *pMemoryTypeIndex = UINT32_MAX;\r\n- uint32_t minCost = UINT32_MAX;\r\n- for(uint32_t memTypeIndex = 0, memTypeBit = 1;\r\n- memTypeIndex < GetMemoryTypeCount();\r\n- ++memTypeIndex, memTypeBit <<= 1)\r\n- {\r\n- \/\/ This memory type is acceptable according to memoryTypeBits bitmask.\r\n- if((memTypeBit & memoryTypeBits) != 0)\r\n- {\r\n- const VkMemoryPropertyFlags currFlags =\r\n- m_MemProps.memoryTypes[memTypeIndex].propertyFlags;\r\n- \/\/ This memory type contains requiredFlags.\r\n- if((requiredFlags & ~currFlags) == 0)\r\n- {\r\n- \/\/ Calculate cost as number of bits from preferredFlags not present in this memory type.\r\n- uint32_t currCost = VMA_COUNT_BITS_SET(preferredFlags & ~currFlags) +\r\n- VMA_COUNT_BITS_SET(currFlags & notPreferredFlags);\r\n- \/\/ Remember memory type with lowest cost.\r\n- if(currCost < minCost)\r\n- {\r\n- *pMemoryTypeIndex = memTypeIndex;\r\n- if(currCost == 0)\r\n- {\r\n- return VK_SUCCESS;\r\n- }\r\n- minCost = currCost;\r\n- }\r\n- }\r\n- }\r\n- }\r\n- return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::CalcMemTypeParams(\r\n- VmaAllocationCreateInfo& inoutCreateInfo,\r\n- uint32_t memTypeIndex,\r\n- VkDeviceSize size,\r\n- size_t allocationCount)\r\n-{\r\n- \/\/ If memory type is not HOST_VISIBLE, disable MAPPED.\r\n- if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&\r\n- (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\r\n- {\r\n- inoutCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n- }\r\n-\r\n- if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&\r\n- (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0)\r\n- {\r\n- const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);\r\n- VmaBudget heapBudget = {};\r\n- GetHeapBudgets(&heapBudget, heapIndex, 1);\r\n- if(heapBudget.usage + size * allocationCount > heapBudget.budget)\r\n- {\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n- }\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::CalcAllocationParams(\r\n- VmaAllocationCreateInfo& inoutCreateInfo,\r\n- bool dedicatedRequired,\r\n- bool dedicatedPreferred)\r\n-{\r\n- VMA_ASSERT((inoutCreateInfo.flags &\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) !=\r\n- (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) &&\r\n- \"Specifying both flags VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT and VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT is incorrect.\");\r\n- VMA_ASSERT((((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) == 0 ||\r\n- (inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0)) &&\r\n- \"Specifying VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT requires also VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\");\r\n- if(inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST)\r\n- {\r\n- if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0)\r\n- {\r\n- VMA_ASSERT((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0 &&\r\n- \"When using VMA_ALLOCATION_CREATE_MAPPED_BIT and usage = VMA_MEMORY_USAGE_AUTO*, you must also specify VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\");\r\n- }\r\n- }\r\n-\r\n- \/\/ If memory is lazily allocated, it should be always dedicated.\r\n- if(dedicatedRequired ||\r\n- inoutCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED)\r\n- {\r\n- inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\r\n- }\r\n-\r\n- if(inoutCreateInfo.pool != VK_NULL_HANDLE)\r\n- {\r\n- if(inoutCreateInfo.pool->m_BlockVector.HasExplicitBlockSize() &&\r\n- (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)\r\n- {\r\n- VMA_ASSERT(0 && \"Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT while current custom pool doesn't support dedicated allocations.\");\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n- inoutCreateInfo.priority = inoutCreateInfo.pool->m_BlockVector.GetPriority();\r\n- }\r\n-\r\n- if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&\r\n- (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)\r\n- {\r\n- VMA_ASSERT(0 && \"Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense.\");\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n-\r\n- if(VMA_DEBUG_ALWAYS_DEDICATED_MEMORY &&\r\n- (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)\r\n- {\r\n- inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\r\n- }\r\n-\r\n- \/\/ Non-auto USAGE values imply HOST_ACCESS flags.\r\n- \/\/ And so does VMA_MEMORY_USAGE_UNKNOWN because it is used with custom pools.\r\n- \/\/ Which specific flag is used doesn't matter. They change things only when used with VMA_MEMORY_USAGE_AUTO*.\r\n- \/\/ Otherwise they just protect from assert on mapping.\r\n- if(inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO &&\r\n- inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE &&\r\n- inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_HOST)\r\n- {\r\n- if((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) == 0)\r\n- {\r\n- inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;\r\n- }\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::AllocateMemory(\r\n- const VkMemoryRequirements& vkMemReq,\r\n- bool requiresDedicatedAllocation,\r\n- bool prefersDedicatedAllocation,\r\n- VkBuffer dedicatedBuffer,\r\n- VkImage dedicatedImage,\r\n- VkFlags dedicatedBufferImageUsage,\r\n- const VmaAllocationCreateInfo& createInfo,\r\n- VmaSuballocationType suballocType,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations)\r\n-{\r\n- memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\r\n-\r\n- VMA_ASSERT(VmaIsPow2(vkMemReq.alignment));\r\n-\r\n- if(vkMemReq.size == 0)\r\n- {\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n-\r\n- VmaAllocationCreateInfo createInfoFinal = createInfo;\r\n- VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation, prefersDedicatedAllocation);\r\n- if(res != VK_SUCCESS)\r\n- return res;\r\n-\r\n- if(createInfoFinal.pool != VK_NULL_HANDLE)\r\n- {\r\n- VmaBlockVector& blockVector = createInfoFinal.pool->m_BlockVector;\r\n- return AllocateMemoryOfType(\r\n- createInfoFinal.pool,\r\n- vkMemReq.size,\r\n- vkMemReq.alignment,\r\n- prefersDedicatedAllocation,\r\n- dedicatedBuffer,\r\n- dedicatedImage,\r\n- dedicatedBufferImageUsage,\r\n- createInfoFinal,\r\n- blockVector.GetMemoryTypeIndex(),\r\n- suballocType,\r\n- createInfoFinal.pool->m_DedicatedAllocations,\r\n- blockVector,\r\n- allocationCount,\r\n- pAllocations);\r\n- }\r\n- else\r\n- {\r\n- \/\/ Bit mask of memory Vulkan types acceptable for this allocation.\r\n- uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;\r\n- uint32_t memTypeIndex = UINT32_MAX;\r\n- res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);\r\n- \/\/ Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.\r\n- if(res != VK_SUCCESS)\r\n- return res;\r\n- do\r\n- {\r\n- VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex];\r\n- VMA_ASSERT(blockVector && \"Trying to use unsupported memory type!\");\r\n- res = AllocateMemoryOfType(\r\n- VK_NULL_HANDLE,\r\n- vkMemReq.size,\r\n- vkMemReq.alignment,\r\n- requiresDedicatedAllocation || prefersDedicatedAllocation,\r\n- dedicatedBuffer,\r\n- dedicatedImage,\r\n- dedicatedBufferImageUsage,\r\n- createInfoFinal,\r\n- memTypeIndex,\r\n- suballocType,\r\n- m_DedicatedAllocations[memTypeIndex],\r\n- *blockVector,\r\n- allocationCount,\r\n- pAllocations);\r\n- \/\/ Allocation succeeded\r\n- if(res == VK_SUCCESS)\r\n- return VK_SUCCESS;\r\n-\r\n- \/\/ Remove old memTypeIndex from list of possibilities.\r\n- memoryTypeBits &= ~(1u << memTypeIndex);\r\n- \/\/ Find alternative memTypeIndex.\r\n- res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);\r\n- } while(res == VK_SUCCESS);\r\n-\r\n- \/\/ No other matching memory type index could be found.\r\n- \/\/ Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::FreeMemory(\r\n- size_t allocationCount,\r\n- const VmaAllocation* pAllocations)\r\n-{\r\n- VMA_ASSERT(pAllocations);\r\n-\r\n- for(size_t allocIndex = allocationCount; allocIndex--; )\r\n- {\r\n- VmaAllocation allocation = pAllocations[allocIndex];\r\n-\r\n- if(allocation != VK_NULL_HANDLE)\r\n- {\r\n- if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)\r\n- {\r\n- FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED);\r\n- }\r\n-\r\n- allocation->FreeName(this);\r\n-\r\n- switch(allocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- VmaBlockVector* pBlockVector = VMA_NULL;\r\n- VmaPool hPool = allocation->GetParentPool();\r\n- if(hPool != VK_NULL_HANDLE)\r\n- {\r\n- pBlockVector = &hPool->m_BlockVector;\r\n- }\r\n- else\r\n- {\r\n- const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\r\n- pBlockVector = m_pBlockVectors[memTypeIndex];\r\n- VMA_ASSERT(pBlockVector && \"Trying to free memory of unsupported type!\");\r\n- }\r\n- pBlockVector->Free(allocation);\r\n- }\r\n- break;\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- FreeDedicatedMemory(allocation);\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::CalculateStatistics(VmaTotalStatistics* pStats)\r\n-{\r\n- \/\/ Initialize.\r\n- VmaClearDetailedStatistics(pStats->total);\r\n- for(uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i)\r\n- VmaClearDetailedStatistics(pStats->memoryType[i]);\r\n- for(uint32_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i)\r\n- VmaClearDetailedStatistics(pStats->memoryHeap[i]);\r\n-\r\n- \/\/ Process default pools.\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];\r\n- if (pBlockVector != VMA_NULL)\r\n- pBlockVector->AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\r\n- }\r\n-\r\n- \/\/ Process custom pools.\r\n- {\r\n- VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\r\n- for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\r\n- {\r\n- VmaBlockVector& blockVector = pool->m_BlockVector;\r\n- const uint32_t memTypeIndex = blockVector.GetMemoryTypeIndex();\r\n- blockVector.AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\r\n- pool->m_DedicatedAllocations.AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\r\n- }\r\n- }\r\n-\r\n- \/\/ Process dedicated allocations.\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- m_DedicatedAllocations[memTypeIndex].AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\r\n- }\r\n-\r\n- \/\/ Sum from memory types to memory heaps.\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- const uint32_t memHeapIndex = m_MemProps.memoryTypes[memTypeIndex].heapIndex;\r\n- VmaAddDetailedStatistics(pStats->memoryHeap[memHeapIndex], pStats->memoryType[memTypeIndex]);\r\n- }\r\n-\r\n- \/\/ Sum from memory heaps to total.\r\n- for(uint32_t memHeapIndex = 0; memHeapIndex < GetMemoryHeapCount(); ++memHeapIndex)\r\n- VmaAddDetailedStatistics(pStats->total, pStats->memoryHeap[memHeapIndex]);\r\n-\r\n- VMA_ASSERT(pStats->total.statistics.allocationCount == 0 ||\r\n- pStats->total.allocationSizeMax >= pStats->total.allocationSizeMin);\r\n- VMA_ASSERT(pStats->total.unusedRangeCount == 0 ||\r\n- pStats->total.unusedRangeSizeMax >= pStats->total.unusedRangeSizeMin);\r\n-}\r\n-\r\n-void VmaAllocator_T::GetHeapBudgets(VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount)\r\n-{\r\n-#if VMA_MEMORY_BUDGET\r\n- if(m_UseExtMemoryBudget)\r\n- {\r\n- if(m_Budget.m_OperationsSinceBudgetFetch < 30)\r\n- {\r\n- VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex);\r\n- for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets)\r\n- {\r\n- const uint32_t heapIndex = firstHeap + i;\r\n-\r\n- outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex];\r\n- outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex];\r\n- outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex];\r\n- outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex];\r\n-\r\n- if(m_Budget.m_VulkanUsage[heapIndex] + outBudgets->statistics.blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex])\r\n- {\r\n- outBudgets->usage = m_Budget.m_VulkanUsage[heapIndex] +\r\n- outBudgets->statistics.blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex];\r\n- }\r\n- else\r\n- {\r\n- outBudgets->usage = 0;\r\n- }\r\n-\r\n- \/\/ Have to take MIN with heap size because explicit HeapSizeLimit is included in it.\r\n- outBudgets->budget = VMA_MIN(\r\n- m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size);\r\n- }\r\n- }\r\n- else\r\n- {\r\n- UpdateVulkanBudget(); \/\/ Outside of mutex lock\r\n- GetHeapBudgets(outBudgets, firstHeap, heapCount); \/\/ Recursion\r\n- }\r\n- }\r\n- else\r\n-#endif\r\n- {\r\n- for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets)\r\n- {\r\n- const uint32_t heapIndex = firstHeap + i;\r\n-\r\n- outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex];\r\n- outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex];\r\n- outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex];\r\n- outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex];\r\n-\r\n- outBudgets->usage = outBudgets->statistics.blockBytes;\r\n- outBudgets->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 \/ 10; \/\/ 80% heuristics.\r\n- }\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();\r\n- pAllocationInfo->deviceMemory = hAllocation->GetMemory();\r\n- pAllocationInfo->offset = hAllocation->GetOffset();\r\n- pAllocationInfo->size = hAllocation->GetSize();\r\n- pAllocationInfo->pMappedData = hAllocation->GetMappedData();\r\n- pAllocationInfo->pUserData = hAllocation->GetUserData();\r\n- pAllocationInfo->pName = hAllocation->GetName();\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool)\r\n-{\r\n- VMA_DEBUG_LOG(\" CreatePool: MemoryTypeIndex=%u, flags=%u\", pCreateInfo->memoryTypeIndex, pCreateInfo->flags);\r\n-\r\n- VmaPoolCreateInfo newCreateInfo = *pCreateInfo;\r\n-\r\n- \/\/ Protection against uninitialized new structure member. If garbage data are left there, this pointer dereference would crash.\r\n- if(pCreateInfo->pMemoryAllocateNext)\r\n- {\r\n- VMA_ASSERT(((const VkBaseInStructure*)pCreateInfo->pMemoryAllocateNext)->sType != 0);\r\n- }\r\n-\r\n- if(newCreateInfo.maxBlockCount == 0)\r\n- {\r\n- newCreateInfo.maxBlockCount = SIZE_MAX;\r\n- }\r\n- if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount)\r\n- {\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n- \/\/ Memory type index out of range or forbidden.\r\n- if(pCreateInfo->memoryTypeIndex >= GetMemoryTypeCount() ||\r\n- ((1u << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0)\r\n- {\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n- if(newCreateInfo.minAllocationAlignment > 0)\r\n- {\r\n- VMA_ASSERT(VmaIsPow2(newCreateInfo.minAllocationAlignment));\r\n- }\r\n-\r\n- const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex);\r\n-\r\n- *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize);\r\n-\r\n- VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks();\r\n- if(res != VK_SUCCESS)\r\n- {\r\n- vma_delete(this, *pPool);\r\n- *pPool = VMA_NULL;\r\n- return res;\r\n- }\r\n-\r\n- \/\/ Add to m_Pools.\r\n- {\r\n- VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);\r\n- (*pPool)->SetId(m_NextPoolId++);\r\n- m_Pools.PushBack(*pPool);\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-void VmaAllocator_T::DestroyPool(VmaPool pool)\r\n-{\r\n- \/\/ Remove from m_Pools.\r\n- {\r\n- VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);\r\n- m_Pools.Remove(pool);\r\n- }\r\n-\r\n- vma_delete(this, pool);\r\n-}\r\n-\r\n-void VmaAllocator_T::GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats)\r\n-{\r\n- VmaClearStatistics(*pPoolStats);\r\n- pool->m_BlockVector.AddStatistics(*pPoolStats);\r\n- pool->m_DedicatedAllocations.AddStatistics(*pPoolStats);\r\n-}\r\n-\r\n-void VmaAllocator_T::CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats)\r\n-{\r\n- VmaClearDetailedStatistics(*pPoolStats);\r\n- pool->m_BlockVector.AddDetailedStatistics(*pPoolStats);\r\n- pool->m_DedicatedAllocations.AddDetailedStatistics(*pPoolStats);\r\n-}\r\n-\r\n-void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex)\r\n-{\r\n- m_CurrentFrameIndex.store(frameIndex);\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n- if(m_UseExtMemoryBudget)\r\n- {\r\n- UpdateVulkanBudget();\r\n- }\r\n-#endif \/\/ #if VMA_MEMORY_BUDGET\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool)\r\n-{\r\n- return hPool->m_BlockVector.CheckCorruption();\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)\r\n-{\r\n- VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT;\r\n-\r\n- \/\/ Process default pools.\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];\r\n- if(pBlockVector != VMA_NULL)\r\n- {\r\n- VkResult localRes = pBlockVector->CheckCorruption();\r\n- switch(localRes)\r\n- {\r\n- case VK_ERROR_FEATURE_NOT_PRESENT:\r\n- break;\r\n- case VK_SUCCESS:\r\n- finalRes = VK_SUCCESS;\r\n- break;\r\n- default:\r\n- return localRes;\r\n- }\r\n- }\r\n- }\r\n-\r\n- \/\/ Process custom pools.\r\n- {\r\n- VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\r\n- for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\r\n- {\r\n- if(((1u << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)\r\n- {\r\n- VkResult localRes = pool->m_BlockVector.CheckCorruption();\r\n- switch(localRes)\r\n- {\r\n- case VK_ERROR_FEATURE_NOT_PRESENT:\r\n- break;\r\n- case VK_SUCCESS:\r\n- finalRes = VK_SUCCESS;\r\n- break;\r\n- default:\r\n- return localRes;\r\n- }\r\n- }\r\n- }\r\n- }\r\n-\r\n- return finalRes;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory)\r\n-{\r\n- AtomicTransactionalIncrement<uint32_t> deviceMemoryCountIncrement;\r\n- const uint64_t prevDeviceMemoryCount = deviceMemoryCountIncrement.Increment(&m_DeviceMemoryCount);\r\n-#if VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT\r\n- if(prevDeviceMemoryCount >= m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount)\r\n- {\r\n- return VK_ERROR_TOO_MANY_OBJECTS;\r\n- }\r\n-#endif\r\n-\r\n- const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);\r\n-\r\n- \/\/ HeapSizeLimit is in effect for this heap.\r\n- if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0)\r\n- {\r\n- const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;\r\n- VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex];\r\n- for(;;)\r\n- {\r\n- const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize;\r\n- if(blockBytesAfterAllocation > heapSize)\r\n- {\r\n- return VK_ERROR_OUT_OF_DEVICE_MEMORY;\r\n- }\r\n- if(m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation))\r\n- {\r\n- break;\r\n- }\r\n- }\r\n- }\r\n- else\r\n- {\r\n- m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize;\r\n- }\r\n- ++m_Budget.m_BlockCount[heapIndex];\r\n-\r\n- \/\/ VULKAN CALL vkAllocateMemory.\r\n- VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory);\r\n-\r\n- if(res == VK_SUCCESS)\r\n- {\r\n-#if VMA_MEMORY_BUDGET\r\n- ++m_Budget.m_OperationsSinceBudgetFetch;\r\n-#endif\r\n-\r\n- \/\/ Informative callback.\r\n- if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL)\r\n- {\r\n- (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize, m_DeviceMemoryCallbacks.pUserData);\r\n- }\r\n-\r\n- deviceMemoryCountIncrement.Commit();\r\n- }\r\n- else\r\n- {\r\n- --m_Budget.m_BlockCount[heapIndex];\r\n- m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize;\r\n- }\r\n-\r\n- return res;\r\n-}\r\n-\r\n-void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory)\r\n-{\r\n- \/\/ Informative callback.\r\n- if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL)\r\n- {\r\n- (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size, m_DeviceMemoryCallbacks.pUserData);\r\n- }\r\n-\r\n- \/\/ VULKAN CALL vkFreeMemory.\r\n- (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks());\r\n-\r\n- const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memoryType);\r\n- --m_Budget.m_BlockCount[heapIndex];\r\n- m_Budget.m_BlockBytes[heapIndex] -= size;\r\n-\r\n- --m_DeviceMemoryCount;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::BindVulkanBuffer(\r\n- VkDeviceMemory memory,\r\n- VkDeviceSize memoryOffset,\r\n- VkBuffer buffer,\r\n- const void* pNext)\r\n-{\r\n- if(pNext != VMA_NULL)\r\n- {\r\n-#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\r\n- if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&\r\n- m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL)\r\n- {\r\n- VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR };\r\n- bindBufferMemoryInfo.pNext = pNext;\r\n- bindBufferMemoryInfo.buffer = buffer;\r\n- bindBufferMemoryInfo.memory = memory;\r\n- bindBufferMemoryInfo.memoryOffset = memoryOffset;\r\n- return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\r\n- {\r\n- return VK_ERROR_EXTENSION_NOT_PRESENT;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset);\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::BindVulkanImage(\r\n- VkDeviceMemory memory,\r\n- VkDeviceSize memoryOffset,\r\n- VkImage image,\r\n- const void* pNext)\r\n-{\r\n- if(pNext != VMA_NULL)\r\n- {\r\n-#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\r\n- if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&\r\n- m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL)\r\n- {\r\n- VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR };\r\n- bindBufferMemoryInfo.pNext = pNext;\r\n- bindBufferMemoryInfo.image = image;\r\n- bindBufferMemoryInfo.memory = memory;\r\n- bindBufferMemoryInfo.memoryOffset = memoryOffset;\r\n- return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_BIND_MEMORY2\r\n- {\r\n- return VK_ERROR_EXTENSION_NOT_PRESENT;\r\n- }\r\n- }\r\n- else\r\n- {\r\n- return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset);\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)\r\n-{\r\n- switch(hAllocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\r\n- char *pBytes = VMA_NULL;\r\n- VkResult res = pBlock->Map(this, 1, (void**)&pBytes);\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset();\r\n- hAllocation->BlockAllocMap();\r\n- }\r\n- return res;\r\n- }\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- return hAllocation->DedicatedAllocMap(this, ppData);\r\n- default:\r\n- VMA_ASSERT(0);\r\n- return VK_ERROR_MEMORY_MAP_FAILED;\r\n- }\r\n-}\r\n-\r\n-void VmaAllocator_T::Unmap(VmaAllocation hAllocation)\r\n-{\r\n- switch(hAllocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\r\n- hAllocation->BlockAllocUnmap();\r\n- pBlock->Unmap(this, 1);\r\n- }\r\n- break;\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- hAllocation->DedicatedAllocUnmap(this);\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::BindBufferMemory(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer hBuffer,\r\n- const void* pNext)\r\n-{\r\n- VkResult res = VK_SUCCESS;\r\n- switch(hAllocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext);\r\n- break;\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\r\n- VMA_ASSERT(pBlock && \"Binding buffer to allocation that doesn't belong to any block.\");\r\n- res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext);\r\n- break;\r\n- }\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::BindImageMemory(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage hImage,\r\n- const void* pNext)\r\n-{\r\n- VkResult res = VK_SUCCESS;\r\n- switch(hAllocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext);\r\n- break;\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();\r\n- VMA_ASSERT(pBlock && \"Binding image to allocation that doesn't belong to any block.\");\r\n- res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext);\r\n- break;\r\n- }\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::FlushOrInvalidateAllocation(\r\n- VmaAllocation hAllocation,\r\n- VkDeviceSize offset, VkDeviceSize size,\r\n- VMA_CACHE_OPERATION op)\r\n-{\r\n- VkResult res = VK_SUCCESS;\r\n-\r\n- VkMappedMemoryRange memRange = {};\r\n- if(GetFlushOrInvalidateRange(hAllocation, offset, size, memRange))\r\n- {\r\n- switch(op)\r\n- {\r\n- case VMA_CACHE_FLUSH:\r\n- res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange);\r\n- break;\r\n- case VMA_CACHE_INVALIDATE:\r\n- res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange);\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- }\r\n- \/\/ else: Just ignore this call.\r\n- return res;\r\n-}\r\n-\r\n-VkResult VmaAllocator_T::FlushOrInvalidateAllocations(\r\n- uint32_t allocationCount,\r\n- const VmaAllocation* allocations,\r\n- const VkDeviceSize* offsets, const VkDeviceSize* sizes,\r\n- VMA_CACHE_OPERATION op)\r\n-{\r\n- typedef VmaStlAllocator<VkMappedMemoryRange> RangeAllocator;\r\n- typedef VmaSmallVector<VkMappedMemoryRange, RangeAllocator, 16> RangeVector;\r\n- RangeVector ranges = RangeVector(RangeAllocator(GetAllocationCallbacks()));\r\n-\r\n- for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\r\n- {\r\n- const VmaAllocation alloc = allocations[allocIndex];\r\n- const VkDeviceSize offset = offsets != VMA_NULL ? offsets[allocIndex] : 0;\r\n- const VkDeviceSize size = sizes != VMA_NULL ? sizes[allocIndex] : VK_WHOLE_SIZE;\r\n- VkMappedMemoryRange newRange;\r\n- if(GetFlushOrInvalidateRange(alloc, offset, size, newRange))\r\n- {\r\n- ranges.push_back(newRange);\r\n- }\r\n- }\r\n-\r\n- VkResult res = VK_SUCCESS;\r\n- if(!ranges.empty())\r\n- {\r\n- switch(op)\r\n- {\r\n- case VMA_CACHE_FLUSH:\r\n- res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data());\r\n- break;\r\n- case VMA_CACHE_INVALIDATE:\r\n- res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data());\r\n- break;\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- }\r\n- \/\/ else: Just ignore this call.\r\n- return res;\r\n-}\r\n-\r\n-void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\r\n-\r\n- const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\r\n- VmaPool parentPool = allocation->GetParentPool();\r\n- if(parentPool == VK_NULL_HANDLE)\r\n- {\r\n- \/\/ Default pool\r\n- m_DedicatedAllocations[memTypeIndex].Unregister(allocation);\r\n- }\r\n- else\r\n- {\r\n- \/\/ Custom pool\r\n- parentPool->m_DedicatedAllocations.Unregister(allocation);\r\n- }\r\n-\r\n- VkDeviceMemory hMemory = allocation->GetMemory();\r\n-\r\n- \/*\r\n- There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory\r\n- before vkFreeMemory.\r\n-\r\n- if(allocation->GetMappedData() != VMA_NULL)\r\n- {\r\n- (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);\r\n- }\r\n- *\/\r\n-\r\n- FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);\r\n-\r\n- m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize());\r\n- m_AllocationObjectAllocator.Free(allocation);\r\n-\r\n- VMA_DEBUG_LOG(\" Freed DedicatedMemory MemoryTypeIndex=%u\", memTypeIndex);\r\n-}\r\n-\r\n-uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const\r\n-{\r\n- VkBufferCreateInfo dummyBufCreateInfo;\r\n- VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo);\r\n-\r\n- uint32_t memoryTypeBits = 0;\r\n-\r\n- \/\/ Create buffer.\r\n- VkBuffer buf = VK_NULL_HANDLE;\r\n- VkResult res = (*GetVulkanFunctions().vkCreateBuffer)(\r\n- m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf);\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- \/\/ Query for supported memory types.\r\n- VkMemoryRequirements memReq;\r\n- (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq);\r\n- memoryTypeBits = memReq.memoryTypeBits;\r\n-\r\n- \/\/ Destroy buffer.\r\n- (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks());\r\n- }\r\n-\r\n- return memoryTypeBits;\r\n-}\r\n-\r\n-uint32_t VmaAllocator_T::CalculateGlobalMemoryTypeBits() const\r\n-{\r\n- \/\/ Make sure memory information is already fetched.\r\n- VMA_ASSERT(GetMemoryTypeCount() > 0);\r\n-\r\n- uint32_t memoryTypeBits = UINT32_MAX;\r\n-\r\n- if(!m_UseAmdDeviceCoherentMemory)\r\n- {\r\n- \/\/ Exclude memory types that have VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD.\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- if((m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0)\r\n- {\r\n- memoryTypeBits &= ~(1u << memTypeIndex);\r\n- }\r\n- }\r\n- }\r\n-\r\n- return memoryTypeBits;\r\n-}\r\n-\r\n-bool VmaAllocator_T::GetFlushOrInvalidateRange(\r\n- VmaAllocation allocation,\r\n- VkDeviceSize offset, VkDeviceSize size,\r\n- VkMappedMemoryRange& outRange) const\r\n-{\r\n- const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\r\n- if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex))\r\n- {\r\n- const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;\r\n- const VkDeviceSize allocationSize = allocation->GetSize();\r\n- VMA_ASSERT(offset <= allocationSize);\r\n-\r\n- outRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;\r\n- outRange.pNext = VMA_NULL;\r\n- outRange.memory = allocation->GetMemory();\r\n-\r\n- switch(allocation->GetType())\r\n- {\r\n- case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\r\n- outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);\r\n- if(size == VK_WHOLE_SIZE)\r\n- {\r\n- outRange.size = allocationSize - outRange.offset;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(offset + size <= allocationSize);\r\n- outRange.size = VMA_MIN(\r\n- VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize),\r\n- allocationSize - outRange.offset);\r\n- }\r\n- break;\r\n- case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\r\n- {\r\n- \/\/ 1. Still within this allocation.\r\n- outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);\r\n- if(size == VK_WHOLE_SIZE)\r\n- {\r\n- size = allocationSize - offset;\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(offset + size <= allocationSize);\r\n- }\r\n- outRange.size = VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize);\r\n-\r\n- \/\/ 2. Adjust to whole block.\r\n- const VkDeviceSize allocationOffset = allocation->GetOffset();\r\n- VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0);\r\n- const VkDeviceSize blockSize = allocation->GetBlock()->m_pMetadata->GetSize();\r\n- outRange.offset += allocationOffset;\r\n- outRange.size = VMA_MIN(outRange.size, blockSize - outRange.offset);\r\n-\r\n- break;\r\n- }\r\n- default:\r\n- VMA_ASSERT(0);\r\n- }\r\n- return true;\r\n- }\r\n- return false;\r\n-}\r\n-\r\n-#if VMA_MEMORY_BUDGET\r\n-void VmaAllocator_T::UpdateVulkanBudget()\r\n-{\r\n- VMA_ASSERT(m_UseExtMemoryBudget);\r\n-\r\n- VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR };\r\n-\r\n- VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT };\r\n- VmaPnextChainPushFront(&memProps, &budgetProps);\r\n-\r\n- GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps);\r\n-\r\n- {\r\n- VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex);\r\n-\r\n- for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)\r\n- {\r\n- m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex];\r\n- m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex];\r\n- m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load();\r\n-\r\n- \/\/ Some bugged drivers return the budget incorrectly, e.g. 0 or much bigger than heap size.\r\n- if(m_Budget.m_VulkanBudget[heapIndex] == 0)\r\n- {\r\n- m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size * 8 \/ 10; \/\/ 80% heuristics.\r\n- }\r\n- else if(m_Budget.m_VulkanBudget[heapIndex] > m_MemProps.memoryHeaps[heapIndex].size)\r\n- {\r\n- m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size;\r\n- }\r\n- if(m_Budget.m_VulkanUsage[heapIndex] == 0 && m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] > 0)\r\n- {\r\n- m_Budget.m_VulkanUsage[heapIndex] = m_Budget.m_BlockBytesAtBudgetFetch[heapIndex];\r\n- }\r\n- }\r\n- m_Budget.m_OperationsSinceBudgetFetch = 0;\r\n- }\r\n-}\r\n-#endif \/\/ VMA_MEMORY_BUDGET\r\n-\r\n-void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern)\r\n-{\r\n- if(VMA_DEBUG_INITIALIZE_ALLOCATIONS &&\r\n- (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)\r\n- {\r\n- void* pData = VMA_NULL;\r\n- VkResult res = Map(hAllocation, &pData);\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- memset(pData, (int)pattern, (size_t)hAllocation->GetSize());\r\n- FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH);\r\n- Unmap(hAllocation);\r\n- }\r\n- else\r\n- {\r\n- VMA_ASSERT(0 && \"VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation.\");\r\n- }\r\n- }\r\n-}\r\n-\r\n-uint32_t VmaAllocator_T::GetGpuDefragmentationMemoryTypeBits()\r\n-{\r\n- uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load();\r\n- if(memoryTypeBits == UINT32_MAX)\r\n- {\r\n- memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits();\r\n- m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits);\r\n- }\r\n- return memoryTypeBits;\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)\r\n-{\r\n- bool dedicatedAllocationsStarted = false;\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- VmaDedicatedAllocationList& dedicatedAllocList = m_DedicatedAllocations[memTypeIndex];\r\n- if(!dedicatedAllocList.IsEmpty())\r\n- {\r\n- if(dedicatedAllocationsStarted == false)\r\n- {\r\n- dedicatedAllocationsStarted = true;\r\n- json.WriteString(\"DedicatedAllocations\");\r\n- json.BeginObject();\r\n- }\r\n-\r\n- json.BeginString(\"Type \");\r\n- json.ContinueString(memTypeIndex);\r\n- json.EndString();\r\n-\r\n- dedicatedAllocList.BuildStatsString(json);\r\n- }\r\n- }\r\n- if(dedicatedAllocationsStarted)\r\n- {\r\n- json.EndObject();\r\n- }\r\n-\r\n- {\r\n- bool allocationsStarted = false;\r\n- for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\r\n- {\r\n- VmaBlockVector* pBlockVector = m_pBlockVectors[memTypeIndex];\r\n- if(pBlockVector != VMA_NULL)\r\n- {\r\n- if (pBlockVector->IsEmpty() == false)\r\n- {\r\n- if (allocationsStarted == false)\r\n- {\r\n- allocationsStarted = true;\r\n- json.WriteString(\"DefaultPools\");\r\n- json.BeginObject();\r\n- }\r\n-\r\n- json.BeginString(\"Type \");\r\n- json.ContinueString(memTypeIndex);\r\n- json.EndString();\r\n-\r\n- json.BeginObject();\r\n- pBlockVector->PrintDetailedMap(json);\r\n- json.EndObject();\r\n- }\r\n- }\r\n- }\r\n- if(allocationsStarted)\r\n- {\r\n- json.EndObject();\r\n- }\r\n- }\r\n-\r\n- \/\/ Custom pools\r\n- {\r\n- VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\r\n- if(!m_Pools.IsEmpty())\r\n- {\r\n- json.WriteString(\"Pools\");\r\n- json.BeginObject();\r\n- for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\r\n- {\r\n- json.BeginString();\r\n- json.ContinueString(pool->GetId());\r\n- json.EndString();\r\n-\r\n- json.BeginObject();\r\n- pool->m_BlockVector.PrintDetailedMap(json);\r\n-\r\n- if (!pool->m_DedicatedAllocations.IsEmpty())\r\n- {\r\n- json.WriteString(\"DedicatedAllocations\");\r\n- pool->m_DedicatedAllocations.BuildStatsString(json);\r\n- }\r\n- json.EndObject();\r\n- }\r\n- json.EndObject();\r\n- }\r\n- }\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-#endif \/\/ _VMA_ALLOCATOR_T_FUNCTIONS\r\n-\r\n-\r\n-#ifndef _VMA_PUBLIC_INTERFACE\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(\r\n- const VmaAllocatorCreateInfo* pCreateInfo,\r\n- VmaAllocator* pAllocator)\r\n-{\r\n- VMA_ASSERT(pCreateInfo && pAllocator);\r\n- VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 ||\r\n- (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 3));\r\n- VMA_DEBUG_LOG(\"vmaCreateAllocator\");\r\n- *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo);\r\n- VkResult result = (*pAllocator)->Init(pCreateInfo);\r\n- if(result < 0)\r\n- {\r\n- vma_delete(pCreateInfo->pAllocationCallbacks, *pAllocator);\r\n- *pAllocator = VK_NULL_HANDLE;\r\n- }\r\n- return result;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(\r\n- VmaAllocator allocator)\r\n-{\r\n- if(allocator != VK_NULL_HANDLE)\r\n- {\r\n- VMA_DEBUG_LOG(\"vmaDestroyAllocator\");\r\n- VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks; \/\/ Have to copy the callbacks when destroying.\r\n- vma_delete(&allocationCallbacks, allocator);\r\n- }\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo(VmaAllocator allocator, VmaAllocatorInfo* pAllocatorInfo)\r\n-{\r\n- VMA_ASSERT(allocator && pAllocatorInfo);\r\n- pAllocatorInfo->instance = allocator->m_hInstance;\r\n- pAllocatorInfo->physicalDevice = allocator->GetPhysicalDevice();\r\n- pAllocatorInfo->device = allocator->m_hDevice;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(\r\n- VmaAllocator allocator,\r\n- const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties)\r\n-{\r\n- VMA_ASSERT(allocator && ppPhysicalDeviceProperties);\r\n- *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(\r\n- VmaAllocator allocator,\r\n- const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties)\r\n-{\r\n- VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties);\r\n- *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(\r\n- VmaAllocator allocator,\r\n- uint32_t memoryTypeIndex,\r\n- VkMemoryPropertyFlags* pFlags)\r\n-{\r\n- VMA_ASSERT(allocator && pFlags);\r\n- VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount());\r\n- *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(\r\n- VmaAllocator allocator,\r\n- uint32_t frameIndex)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->SetCurrentFrameIndex(frameIndex);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(\r\n- VmaAllocator allocator,\r\n- VmaTotalStatistics* pStats)\r\n-{\r\n- VMA_ASSERT(allocator && pStats);\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n- allocator->CalculateStatistics(pStats);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(\r\n- VmaAllocator allocator,\r\n- VmaBudget* pBudgets)\r\n-{\r\n- VMA_ASSERT(allocator && pBudgets);\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n- allocator->GetHeapBudgets(pBudgets, 0, allocator->GetMemoryHeapCount());\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(\r\n- VmaAllocator allocator,\r\n- char** ppStatsString,\r\n- VkBool32 detailedMap)\r\n-{\r\n- VMA_ASSERT(allocator && ppStatsString);\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VmaStringBuilder sb(allocator->GetAllocationCallbacks());\r\n- {\r\n- VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb);\r\n- json.BeginObject();\r\n-\r\n- VmaBudget budgets[VK_MAX_MEMORY_HEAPS];\r\n- allocator->GetHeapBudgets(budgets, 0, allocator->GetMemoryHeapCount());\r\n-\r\n- VmaTotalStatistics stats;\r\n- allocator->CalculateStatistics(&stats);\r\n-\r\n- json.WriteString(\"Total\");\r\n- VmaPrintDetailedStatistics(json, stats.total);\r\n-\r\n- for(uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex)\r\n- {\r\n- json.BeginString(\"Heap \");\r\n- json.ContinueString(heapIndex);\r\n- json.EndString();\r\n- json.BeginObject();\r\n-\r\n- json.WriteString(\"Size\");\r\n- json.WriteNumber(allocator->m_MemProps.memoryHeaps[heapIndex].size);\r\n-\r\n- json.WriteString(\"Flags\");\r\n- json.BeginArray(true);\r\n- if((allocator->m_MemProps.memoryHeaps[heapIndex].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0)\r\n- {\r\n- json.WriteString(\"DEVICE_LOCAL\");\r\n- }\r\n- json.EndArray();\r\n-\r\n- json.WriteString(\"Budget\");\r\n- json.BeginObject();\r\n- {\r\n- json.WriteString(\"BlockBytes\");\r\n- json.WriteNumber(budgets[heapIndex].statistics.blockBytes);\r\n- json.WriteString(\"AllocationBytes\");\r\n- json.WriteNumber(budgets[heapIndex].statistics.allocationBytes);\r\n- json.WriteString(\"BlockCount\");\r\n- json.WriteNumber(budgets[heapIndex].statistics.blockCount);\r\n- json.WriteString(\"AllocationCount\");\r\n- json.WriteNumber(budgets[heapIndex].statistics.allocationCount);\r\n- json.WriteString(\"Usage\");\r\n- json.WriteNumber(budgets[heapIndex].usage);\r\n- json.WriteString(\"Budget\");\r\n- json.WriteNumber(budgets[heapIndex].budget);\r\n- }\r\n- json.EndObject();\r\n-\r\n- if(stats.memoryHeap[heapIndex].statistics.blockCount > 0)\r\n- {\r\n- json.WriteString(\"Stats\");\r\n- VmaPrintDetailedStatistics(json, stats.memoryHeap[heapIndex]);\r\n- }\r\n-\r\n- for(uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex)\r\n- {\r\n- if(allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex)\r\n- {\r\n- json.BeginString(\"Type \");\r\n- json.ContinueString(typeIndex);\r\n- json.EndString();\r\n-\r\n- json.BeginObject();\r\n-\r\n- json.WriteString(\"Flags\");\r\n- json.BeginArray(true);\r\n- VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags;\r\n- if((flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0)\r\n- {\r\n- json.WriteString(\"DEVICE_LOCAL\");\r\n- }\r\n- if((flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)\r\n- {\r\n- json.WriteString(\"HOST_VISIBLE\");\r\n- }\r\n- if((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0)\r\n- {\r\n- json.WriteString(\"HOST_COHERENT\");\r\n- }\r\n- if((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0)\r\n- {\r\n- json.WriteString(\"HOST_CACHED\");\r\n- }\r\n- if((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0)\r\n- {\r\n- json.WriteString(\"LAZILY_ALLOCATED\");\r\n- }\r\n-#if VMA_VULKAN_VERSION >= 1001000\r\n- if((flags & VK_MEMORY_PROPERTY_PROTECTED_BIT) != 0)\r\n- {\r\n- json.WriteString(\"PROTECTED\");\r\n- }\r\n-#endif \/\/ #if VMA_VULKAN_VERSION >= 1001000\r\n-#if VK_AMD_device_coherent_memory\r\n- if((flags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0)\r\n- {\r\n- json.WriteString(\"DEVICE_COHERENT\");\r\n- }\r\n- if((flags & VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY) != 0)\r\n- {\r\n- json.WriteString(\"DEVICE_UNCACHED\");\r\n- }\r\n-#endif \/\/ #if VK_AMD_device_coherent_memory\r\n- json.EndArray();\r\n-\r\n- if(stats.memoryType[typeIndex].statistics.blockCount > 0)\r\n- {\r\n- json.WriteString(\"Stats\");\r\n- VmaPrintDetailedStatistics(json, stats.memoryType[typeIndex]);\r\n- }\r\n-\r\n- json.EndObject();\r\n- }\r\n- }\r\n-\r\n- json.EndObject();\r\n- }\r\n- if(detailedMap == VK_TRUE)\r\n- {\r\n- allocator->PrintDetailedMap(json);\r\n- }\r\n-\r\n- json.EndObject();\r\n- }\r\n-\r\n- *ppStatsString = VmaCreateStringCopy(allocator->GetAllocationCallbacks(), sb.GetData(), sb.GetLength());\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(\r\n- VmaAllocator allocator,\r\n- char* pStatsString)\r\n-{\r\n- if(pStatsString != VMA_NULL)\r\n- {\r\n- VMA_ASSERT(allocator);\r\n- VmaFreeString(allocator->GetAllocationCallbacks(), pStatsString);\r\n- }\r\n-}\r\n-\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-\r\n-\/*\r\n-This function is not protected by any mutex because it just reads immutable data.\r\n-*\/\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(\r\n- VmaAllocator allocator,\r\n- uint32_t memoryTypeBits,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- uint32_t* pMemoryTypeIndex)\r\n-{\r\n- VMA_ASSERT(allocator != VK_NULL_HANDLE);\r\n- VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\r\n- VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\r\n-\r\n- return allocator->FindMemoryTypeIndex(memoryTypeBits, pAllocationCreateInfo, UINT32_MAX, pMemoryTypeIndex);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(\r\n- VmaAllocator allocator,\r\n- const VkBufferCreateInfo* pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- uint32_t* pMemoryTypeIndex)\r\n-{\r\n- VMA_ASSERT(allocator != VK_NULL_HANDLE);\r\n- VMA_ASSERT(pBufferCreateInfo != VMA_NULL);\r\n- VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\r\n- VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\r\n-\r\n- const VkDevice hDev = allocator->m_hDevice;\r\n- const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();\r\n- VkResult res;\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- if(funcs->vkGetDeviceBufferMemoryRequirements)\r\n- {\r\n- \/\/ Can query straight from VkBufferCreateInfo :)\r\n- VkDeviceBufferMemoryRequirements devBufMemReq = {VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS};\r\n- devBufMemReq.pCreateInfo = pBufferCreateInfo;\r\n-\r\n- VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2};\r\n- (*funcs->vkGetDeviceBufferMemoryRequirements)(hDev, &devBufMemReq, &memReq);\r\n-\r\n- res = allocator->FindMemoryTypeIndex(\r\n- memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_VULKAN_VERSION >= 1003000\r\n- {\r\n- \/\/ Must create a dummy buffer to query :(\r\n- VkBuffer hBuffer = VK_NULL_HANDLE;\r\n- res = funcs->vkCreateBuffer(\r\n- hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer);\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- VkMemoryRequirements memReq = {};\r\n- funcs->vkGetBufferMemoryRequirements(hDev, hBuffer, &memReq);\r\n-\r\n- res = allocator->FindMemoryTypeIndex(\r\n- memReq.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex);\r\n-\r\n- funcs->vkDestroyBuffer(\r\n- hDev, hBuffer, allocator->GetAllocationCallbacks());\r\n- }\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(\r\n- VmaAllocator allocator,\r\n- const VkImageCreateInfo* pImageCreateInfo,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- uint32_t* pMemoryTypeIndex)\r\n-{\r\n- VMA_ASSERT(allocator != VK_NULL_HANDLE);\r\n- VMA_ASSERT(pImageCreateInfo != VMA_NULL);\r\n- VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\r\n- VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\r\n-\r\n- const VkDevice hDev = allocator->m_hDevice;\r\n- const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();\r\n- VkResult res;\r\n-\r\n-#if VMA_VULKAN_VERSION >= 1003000\r\n- if(funcs->vkGetDeviceImageMemoryRequirements)\r\n- {\r\n- \/\/ Can query straight from VkImageCreateInfo :)\r\n- VkDeviceImageMemoryRequirements devImgMemReq = {VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS};\r\n- devImgMemReq.pCreateInfo = pImageCreateInfo;\r\n- VMA_ASSERT(pImageCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY && (pImageCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT_COPY) == 0 &&\r\n- \"Cannot use this VkImageCreateInfo with vmaFindMemoryTypeIndexForImageInfo as I don't know what to pass as VkDeviceImageMemoryRequirements::planeAspect.\");\r\n-\r\n- VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2};\r\n- (*funcs->vkGetDeviceImageMemoryRequirements)(hDev, &devImgMemReq, &memReq);\r\n-\r\n- res = allocator->FindMemoryTypeIndex(\r\n- memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex);\r\n- }\r\n- else\r\n-#endif \/\/ #if VMA_VULKAN_VERSION >= 1003000\r\n- {\r\n- \/\/ Must create a dummy image to query :(\r\n- VkImage hImage = VK_NULL_HANDLE;\r\n- res = funcs->vkCreateImage(\r\n- hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage);\r\n- if(res == VK_SUCCESS)\r\n- {\r\n- VkMemoryRequirements memReq = {};\r\n- funcs->vkGetImageMemoryRequirements(hDev, hImage, &memReq);\r\n-\r\n- res = allocator->FindMemoryTypeIndex(\r\n- memReq.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex);\r\n-\r\n- funcs->vkDestroyImage(\r\n- hDev, hImage, allocator->GetAllocationCallbacks());\r\n- }\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(\r\n- VmaAllocator allocator,\r\n- const VmaPoolCreateInfo* pCreateInfo,\r\n- VmaPool* pPool)\r\n-{\r\n- VMA_ASSERT(allocator && pCreateInfo && pPool);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCreatePool\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->CreatePool(pCreateInfo, pPool);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(\r\n- VmaAllocator allocator,\r\n- VmaPool pool)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(pool == VK_NULL_HANDLE)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaDestroyPool\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->DestroyPool(pool);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(\r\n- VmaAllocator allocator,\r\n- VmaPool pool,\r\n- VmaStatistics* pPoolStats)\r\n-{\r\n- VMA_ASSERT(allocator && pool && pPoolStats);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->GetPoolStatistics(pool, pPoolStats);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics(\r\n- VmaAllocator allocator,\r\n- VmaPool pool,\r\n- VmaDetailedStatistics* pPoolStats)\r\n-{\r\n- VMA_ASSERT(allocator && pool && pPoolStats);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->CalculatePoolStatistics(pool, pPoolStats);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool)\r\n-{\r\n- VMA_ASSERT(allocator && pool);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCheckPoolCorruption\");\r\n-\r\n- return allocator->CheckPoolCorruption(pool);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(\r\n- VmaAllocator allocator,\r\n- VmaPool pool,\r\n- const char** ppName)\r\n-{\r\n- VMA_ASSERT(allocator && pool && ppName);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaGetPoolName\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- *ppName = pool->GetName();\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(\r\n- VmaAllocator allocator,\r\n- VmaPool pool,\r\n- const char* pName)\r\n-{\r\n- VMA_ASSERT(allocator && pool);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaSetPoolName\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- pool->SetName(pName);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(\r\n- VmaAllocator allocator,\r\n- const VkMemoryRequirements* pVkMemoryRequirements,\r\n- const VmaAllocationCreateInfo* pCreateInfo,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaAllocateMemory\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VkResult result = allocator->AllocateMemory(\r\n- *pVkMemoryRequirements,\r\n- false, \/\/ requiresDedicatedAllocation\r\n- false, \/\/ prefersDedicatedAllocation\r\n- VK_NULL_HANDLE, \/\/ dedicatedBuffer\r\n- VK_NULL_HANDLE, \/\/ dedicatedImage\r\n- UINT32_MAX, \/\/ dedicatedBufferImageUsage\r\n- *pCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_UNKNOWN,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return result;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(\r\n- VmaAllocator allocator,\r\n- const VkMemoryRequirements* pVkMemoryRequirements,\r\n- const VmaAllocationCreateInfo* pCreateInfo,\r\n- size_t allocationCount,\r\n- VmaAllocation* pAllocations,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- if(allocationCount == 0)\r\n- {\r\n- return VK_SUCCESS;\r\n- }\r\n-\r\n- VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaAllocateMemoryPages\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VkResult result = allocator->AllocateMemory(\r\n- *pVkMemoryRequirements,\r\n- false, \/\/ requiresDedicatedAllocation\r\n- false, \/\/ prefersDedicatedAllocation\r\n- VK_NULL_HANDLE, \/\/ dedicatedBuffer\r\n- VK_NULL_HANDLE, \/\/ dedicatedImage\r\n- UINT32_MAX, \/\/ dedicatedBufferImageUsage\r\n- *pCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_UNKNOWN,\r\n- allocationCount,\r\n- pAllocations);\r\n-\r\n- if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)\r\n- {\r\n- for(size_t i = 0; i < allocationCount; ++i)\r\n- {\r\n- allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i);\r\n- }\r\n- }\r\n-\r\n- return result;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(\r\n- VmaAllocator allocator,\r\n- VkBuffer buffer,\r\n- const VmaAllocationCreateInfo* pCreateInfo,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaAllocateMemoryForBuffer\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VkMemoryRequirements vkMemReq = {};\r\n- bool requiresDedicatedAllocation = false;\r\n- bool prefersDedicatedAllocation = false;\r\n- allocator->GetBufferMemoryRequirements(buffer, vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation);\r\n-\r\n- VkResult result = allocator->AllocateMemory(\r\n- vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation,\r\n- buffer, \/\/ dedicatedBuffer\r\n- VK_NULL_HANDLE, \/\/ dedicatedImage\r\n- UINT32_MAX, \/\/ dedicatedBufferImageUsage\r\n- *pCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_BUFFER,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(pAllocationInfo && result == VK_SUCCESS)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return result;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(\r\n- VmaAllocator allocator,\r\n- VkImage image,\r\n- const VmaAllocationCreateInfo* pCreateInfo,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaAllocateMemoryForImage\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- VkMemoryRequirements vkMemReq = {};\r\n- bool requiresDedicatedAllocation = false;\r\n- bool prefersDedicatedAllocation = false;\r\n- allocator->GetImageMemoryRequirements(image, vkMemReq,\r\n- requiresDedicatedAllocation, prefersDedicatedAllocation);\r\n-\r\n- VkResult result = allocator->AllocateMemory(\r\n- vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation,\r\n- VK_NULL_HANDLE, \/\/ dedicatedBuffer\r\n- image, \/\/ dedicatedImage\r\n- UINT32_MAX, \/\/ dedicatedBufferImageUsage\r\n- *pCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(pAllocationInfo && result == VK_SUCCESS)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return result;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(allocation == VK_NULL_HANDLE)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaFreeMemory\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- &allocation);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(\r\n- VmaAllocator allocator,\r\n- size_t allocationCount,\r\n- const VmaAllocation* pAllocations)\r\n-{\r\n- if(allocationCount == 0)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VMA_ASSERT(allocator);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaFreeMemoryPages\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->FreeMemory(allocationCount, pAllocations);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && pAllocationInfo);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->GetAllocationInfo(allocation, pAllocationInfo);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- void* pUserData)\r\n-{\r\n- VMA_ASSERT(allocator && allocation);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocation->SetUserData(allocator, pUserData);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- const char* VMA_NULLABLE pName)\r\n-{\r\n- allocation->SetName(allocator, pName);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaAllocation VMA_NOT_NULL allocation,\r\n- VkMemoryPropertyFlags* VMA_NOT_NULL pFlags)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && pFlags);\r\n- const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\r\n- *pFlags = allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- void** ppData)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && ppData);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->Map(allocation, ppData);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocator && allocation);\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- allocator->Unmap(allocation);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkDeviceSize offset,\r\n- VkDeviceSize size)\r\n-{\r\n- VMA_ASSERT(allocator && allocation);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaFlushAllocation\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH);\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkDeviceSize offset,\r\n- VkDeviceSize size)\r\n-{\r\n- VMA_ASSERT(allocator && allocation);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaInvalidateAllocation\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE);\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations(\r\n- VmaAllocator allocator,\r\n- uint32_t allocationCount,\r\n- const VmaAllocation* allocations,\r\n- const VkDeviceSize* offsets,\r\n- const VkDeviceSize* sizes)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(allocationCount == 0)\r\n- {\r\n- return VK_SUCCESS;\r\n- }\r\n-\r\n- VMA_ASSERT(allocations);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaFlushAllocations\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_FLUSH);\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations(\r\n- VmaAllocator allocator,\r\n- uint32_t allocationCount,\r\n- const VmaAllocation* allocations,\r\n- const VkDeviceSize* offsets,\r\n- const VkDeviceSize* sizes)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(allocationCount == 0)\r\n- {\r\n- return VK_SUCCESS;\r\n- }\r\n-\r\n- VMA_ASSERT(allocations);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaInvalidateAllocations\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_INVALIDATE);\r\n-\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(\r\n- VmaAllocator allocator,\r\n- uint32_t memoryTypeBits)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCheckCorruption\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->CheckCorruption(memoryTypeBits);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation(\r\n- VmaAllocator allocator,\r\n- const VmaDefragmentationInfo* pInfo,\r\n- VmaDefragmentationContext* pContext)\r\n-{\r\n- VMA_ASSERT(allocator && pInfo && pContext);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBeginDefragmentation\");\r\n-\r\n- if (pInfo->pool != VMA_NULL)\r\n- {\r\n- \/\/ Check if run on supported algorithms\r\n- if (pInfo->pool->m_BlockVector.GetAlgorithm() & VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\r\n- return VK_ERROR_FEATURE_NOT_PRESENT;\r\n- }\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- *pContext = vma_new(allocator, VmaDefragmentationContext_T)(allocator, *pInfo);\r\n- return VK_SUCCESS;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation(\r\n- VmaAllocator allocator,\r\n- VmaDefragmentationContext context,\r\n- VmaDefragmentationStats* pStats)\r\n-{\r\n- VMA_ASSERT(allocator && context);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaEndDefragmentation\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- if (pStats)\r\n- context->GetStats(*pStats);\r\n- vma_delete(allocator, context);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaDefragmentationContext VMA_NOT_NULL context,\r\n- VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo)\r\n-{\r\n- VMA_ASSERT(context && pPassInfo);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBeginDefragmentationPass\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return context->DefragmentPassBegin(*pPassInfo);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(\r\n- VmaAllocator VMA_NOT_NULL allocator,\r\n- VmaDefragmentationContext VMA_NOT_NULL context,\r\n- VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo)\r\n-{\r\n- VMA_ASSERT(context && pPassInfo);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaEndDefragmentationPass\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return context->DefragmentPassEnd(*pPassInfo);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkBuffer buffer)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && buffer);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBindBufferMemory\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkBuffer buffer,\r\n- const void* pNext)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && buffer);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBindBufferMemory2\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkImage image)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && image);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBindImageMemory\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->BindImageMemory(allocation, 0, image, VMA_NULL);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(\r\n- VmaAllocator allocator,\r\n- VmaAllocation allocation,\r\n- VkDeviceSize allocationLocalOffset,\r\n- VkImage image,\r\n- const void* pNext)\r\n-{\r\n- VMA_ASSERT(allocator && allocation && image);\r\n-\r\n- VMA_DEBUG_LOG(\"vmaBindImageMemory2\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(\r\n- VmaAllocator allocator,\r\n- const VkBufferCreateInfo* pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- VkBuffer* pBuffer,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation);\r\n-\r\n- if(pBufferCreateInfo->size == 0)\r\n- {\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n- if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 &&\r\n- !allocator->m_UseKhrBufferDeviceAddress)\r\n- {\r\n- VMA_ASSERT(0 && \"Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used.\");\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCreateBuffer\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- *pAllocation = VK_NULL_HANDLE;\r\n-\r\n- \/\/ 1. Create VkBuffer.\r\n- VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(\r\n- allocator->m_hDevice,\r\n- pBufferCreateInfo,\r\n- allocator->GetAllocationCallbacks(),\r\n- pBuffer);\r\n- if(res >= 0)\r\n- {\r\n- \/\/ 2. vkGetBufferMemoryRequirements.\r\n- VkMemoryRequirements vkMemReq = {};\r\n- bool requiresDedicatedAllocation = false;\r\n- bool prefersDedicatedAllocation = false;\r\n- allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,\r\n- requiresDedicatedAllocation, prefersDedicatedAllocation);\r\n-\r\n- \/\/ 3. Allocate memory using allocator.\r\n- res = allocator->AllocateMemory(\r\n- vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation,\r\n- *pBuffer, \/\/ dedicatedBuffer\r\n- VK_NULL_HANDLE, \/\/ dedicatedImage\r\n- pBufferCreateInfo->usage, \/\/ dedicatedBufferImageUsage\r\n- *pAllocationCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_BUFFER,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(res >= 0)\r\n- {\r\n- \/\/ 3. Bind buffer with memory.\r\n- if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\r\n- {\r\n- res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL);\r\n- }\r\n- if(res >= 0)\r\n- {\r\n- \/\/ All steps succeeded.\r\n- #if VMA_STATS_STRING_ENABLED\r\n- (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);\r\n- #endif\r\n- if(pAllocationInfo != VMA_NULL)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n- }\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n- *pAllocation = VK_NULL_HANDLE;\r\n- (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment(\r\n- VmaAllocator allocator,\r\n- const VkBufferCreateInfo* pBufferCreateInfo,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- VkDeviceSize minAlignment,\r\n- VkBuffer* pBuffer,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && VmaIsPow2(minAlignment) && pBuffer && pAllocation);\r\n-\r\n- if(pBufferCreateInfo->size == 0)\r\n- {\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n- if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 &&\r\n- !allocator->m_UseKhrBufferDeviceAddress)\r\n- {\r\n- VMA_ASSERT(0 && \"Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used.\");\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCreateBufferWithAlignment\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- *pAllocation = VK_NULL_HANDLE;\r\n-\r\n- \/\/ 1. Create VkBuffer.\r\n- VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(\r\n- allocator->m_hDevice,\r\n- pBufferCreateInfo,\r\n- allocator->GetAllocationCallbacks(),\r\n- pBuffer);\r\n- if(res >= 0)\r\n- {\r\n- \/\/ 2. vkGetBufferMemoryRequirements.\r\n- VkMemoryRequirements vkMemReq = {};\r\n- bool requiresDedicatedAllocation = false;\r\n- bool prefersDedicatedAllocation = false;\r\n- allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,\r\n- requiresDedicatedAllocation, prefersDedicatedAllocation);\r\n-\r\n- \/\/ 2a. Include minAlignment\r\n- vkMemReq.alignment = VMA_MAX(vkMemReq.alignment, minAlignment);\r\n-\r\n- \/\/ 3. Allocate memory using allocator.\r\n- res = allocator->AllocateMemory(\r\n- vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation,\r\n- *pBuffer, \/\/ dedicatedBuffer\r\n- VK_NULL_HANDLE, \/\/ dedicatedImage\r\n- pBufferCreateInfo->usage, \/\/ dedicatedBufferImageUsage\r\n- *pAllocationCreateInfo,\r\n- VMA_SUBALLOCATION_TYPE_BUFFER,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(res >= 0)\r\n- {\r\n- \/\/ 3. Bind buffer with memory.\r\n- if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\r\n- {\r\n- res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL);\r\n- }\r\n- if(res >= 0)\r\n- {\r\n- \/\/ All steps succeeded.\r\n- #if VMA_STATS_STRING_ENABLED\r\n- (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);\r\n- #endif\r\n- if(pAllocationInfo != VMA_NULL)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n- }\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n- *pAllocation = VK_NULL_HANDLE;\r\n- (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\r\n- *pBuffer = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(\r\n- VmaAllocator allocator,\r\n- VkBuffer buffer,\r\n- VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaDestroyBuffer\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- if(buffer != VK_NULL_HANDLE)\r\n- {\r\n- (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks());\r\n- }\r\n-\r\n- if(allocation != VK_NULL_HANDLE)\r\n- {\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- &allocation);\r\n- }\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(\r\n- VmaAllocator allocator,\r\n- const VkImageCreateInfo* pImageCreateInfo,\r\n- const VmaAllocationCreateInfo* pAllocationCreateInfo,\r\n- VkImage* pImage,\r\n- VmaAllocation* pAllocation,\r\n- VmaAllocationInfo* pAllocationInfo)\r\n-{\r\n- VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation);\r\n-\r\n- if(pImageCreateInfo->extent.width == 0 ||\r\n- pImageCreateInfo->extent.height == 0 ||\r\n- pImageCreateInfo->extent.depth == 0 ||\r\n- pImageCreateInfo->mipLevels == 0 ||\r\n- pImageCreateInfo->arrayLayers == 0)\r\n- {\r\n- return VK_ERROR_INITIALIZATION_FAILED;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaCreateImage\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- *pImage = VK_NULL_HANDLE;\r\n- *pAllocation = VK_NULL_HANDLE;\r\n-\r\n- \/\/ 1. Create VkImage.\r\n- VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)(\r\n- allocator->m_hDevice,\r\n- pImageCreateInfo,\r\n- allocator->GetAllocationCallbacks(),\r\n- pImage);\r\n- if(res >= 0)\r\n- {\r\n- VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ?\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL :\r\n- VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR;\r\n-\r\n- \/\/ 2. Allocate memory using allocator.\r\n- VkMemoryRequirements vkMemReq = {};\r\n- bool requiresDedicatedAllocation = false;\r\n- bool prefersDedicatedAllocation = false;\r\n- allocator->GetImageMemoryRequirements(*pImage, vkMemReq,\r\n- requiresDedicatedAllocation, prefersDedicatedAllocation);\r\n-\r\n- res = allocator->AllocateMemory(\r\n- vkMemReq,\r\n- requiresDedicatedAllocation,\r\n- prefersDedicatedAllocation,\r\n- VK_NULL_HANDLE, \/\/ dedicatedBuffer\r\n- *pImage, \/\/ dedicatedImage\r\n- pImageCreateInfo->usage, \/\/ dedicatedBufferImageUsage\r\n- *pAllocationCreateInfo,\r\n- suballocType,\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n-\r\n- if(res >= 0)\r\n- {\r\n- \/\/ 3. Bind image with memory.\r\n- if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\r\n- {\r\n- res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL);\r\n- }\r\n- if(res >= 0)\r\n- {\r\n- \/\/ All steps succeeded.\r\n- #if VMA_STATS_STRING_ENABLED\r\n- (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage);\r\n- #endif\r\n- if(pAllocationInfo != VMA_NULL)\r\n- {\r\n- allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\r\n- }\r\n-\r\n- return VK_SUCCESS;\r\n- }\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- pAllocation);\r\n- *pAllocation = VK_NULL_HANDLE;\r\n- (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());\r\n- *pImage = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());\r\n- *pImage = VK_NULL_HANDLE;\r\n- return res;\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(\r\n- VmaAllocator allocator,\r\n- VkImage image,\r\n- VmaAllocation allocation)\r\n-{\r\n- VMA_ASSERT(allocator);\r\n-\r\n- if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)\r\n- {\r\n- return;\r\n- }\r\n-\r\n- VMA_DEBUG_LOG(\"vmaDestroyImage\");\r\n-\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK\r\n-\r\n- if(image != VK_NULL_HANDLE)\r\n- {\r\n- (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks());\r\n- }\r\n- if(allocation != VK_NULL_HANDLE)\r\n- {\r\n- allocator->FreeMemory(\r\n- 1, \/\/ allocationCount\r\n- &allocation);\r\n- }\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(\r\n- const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo,\r\n- VmaVirtualBlock VMA_NULLABLE * VMA_NOT_NULL pVirtualBlock)\r\n-{\r\n- VMA_ASSERT(pCreateInfo && pVirtualBlock);\r\n- VMA_ASSERT(pCreateInfo->size > 0);\r\n- VMA_DEBUG_LOG(\"vmaCreateVirtualBlock\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- *pVirtualBlock = vma_new(pCreateInfo->pAllocationCallbacks, VmaVirtualBlock_T)(*pCreateInfo);\r\n- VkResult res = (*pVirtualBlock)->Init();\r\n- if(res < 0)\r\n- {\r\n- vma_delete(pCreateInfo->pAllocationCallbacks, *pVirtualBlock);\r\n- *pVirtualBlock = VK_NULL_HANDLE;\r\n- }\r\n- return res;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(VmaVirtualBlock VMA_NULLABLE virtualBlock)\r\n-{\r\n- if(virtualBlock != VK_NULL_HANDLE)\r\n- {\r\n- VMA_DEBUG_LOG(\"vmaDestroyVirtualBlock\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- VkAllocationCallbacks allocationCallbacks = virtualBlock->m_AllocationCallbacks; \/\/ Have to copy the callbacks when destroying.\r\n- vma_delete(&allocationCallbacks, virtualBlock);\r\n- }\r\n-}\r\n-\r\n-VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty(VmaVirtualBlock VMA_NOT_NULL virtualBlock)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\r\n- VMA_DEBUG_LOG(\"vmaIsVirtualBlockEmpty\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- return virtualBlock->IsEmpty() ? VK_TRUE : VK_FALSE;\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pVirtualAllocInfo != VMA_NULL);\r\n- VMA_DEBUG_LOG(\"vmaGetVirtualAllocationInfo\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->GetAllocationInfo(allocation, *pVirtualAllocInfo);\r\n-}\r\n-\r\n-VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation,\r\n- VkDeviceSize* VMA_NULLABLE pOffset)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pCreateInfo != VMA_NULL && pAllocation != VMA_NULL);\r\n- VMA_DEBUG_LOG(\"vmaVirtualAllocate\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- return virtualBlock->Allocate(*pCreateInfo, *pAllocation, pOffset);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree(VmaVirtualBlock VMA_NOT_NULL virtualBlock, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation)\r\n-{\r\n- if(allocation != VK_NULL_HANDLE)\r\n- {\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\r\n- VMA_DEBUG_LOG(\"vmaVirtualFree\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->Free(allocation);\r\n- }\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock(VmaVirtualBlock VMA_NOT_NULL virtualBlock)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\r\n- VMA_DEBUG_LOG(\"vmaClearVirtualBlock\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->Clear();\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, void* VMA_NULLABLE pUserData)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\r\n- VMA_DEBUG_LOG(\"vmaSetVirtualAllocationUserData\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->SetAllocationUserData(allocation, pUserData);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaStatistics* VMA_NOT_NULL pStats)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL);\r\n- VMA_DEBUG_LOG(\"vmaGetVirtualBlockStatistics\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->GetStatistics(*pStats);\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- VmaDetailedStatistics* VMA_NOT_NULL pStats)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL);\r\n- VMA_DEBUG_LOG(\"vmaCalculateVirtualBlockStatistics\");\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- virtualBlock->CalculateDetailedStatistics(*pStats);\r\n-}\r\n-\r\n-#if VMA_STATS_STRING_ENABLED\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- char* VMA_NULLABLE * VMA_NOT_NULL ppStatsString, VkBool32 detailedMap)\r\n-{\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && ppStatsString != VMA_NULL);\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- const VkAllocationCallbacks* allocationCallbacks = virtualBlock->GetAllocationCallbacks();\r\n- VmaStringBuilder sb(allocationCallbacks);\r\n- virtualBlock->BuildStatsString(detailedMap != VK_FALSE, sb);\r\n- *ppStatsString = VmaCreateStringCopy(allocationCallbacks, sb.GetData(), sb.GetLength());\r\n-}\r\n-\r\n-VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\r\n- char* VMA_NULLABLE pStatsString)\r\n-{\r\n- if(pStatsString != VMA_NULL)\r\n- {\r\n- VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\r\n- VMA_DEBUG_GLOBAL_MUTEX_LOCK;\r\n- VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString);\r\n- }\r\n-}\r\n-#endif \/\/ VMA_STATS_STRING_ENABLED\r\n-#endif \/\/ _VMA_PUBLIC_INTERFACE\r\n-#endif \/\/ VMA_IMPLEMENTATION\r\n-\r\n-\/**\r\n-\\page quick_start Quick start\r\n-\r\n-\\section quick_start_project_setup Project setup\r\n-\r\n-Vulkan Memory Allocator comes in form of a \"stb-style\" single header file.\r\n-You don't need to build it as a separate library project.\r\n-You can add this file directly to your project and submit it to code repository next to your other source files.\r\n-\r\n-\"Single header\" doesn't mean that everything is contained in C\/C++ declarations,\r\n-like it tends to be in case of inline functions or C++ templates.\r\n-It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro.\r\n-If you don't do it properly, you will get linker errors.\r\n-\r\n-To do it properly:\r\n-\r\n--# Include \"vk_mem_alloc.h\" file in each CPP file where you want to use the library.\r\n- This includes declarations of all members of the library.\r\n--# In exactly one CPP file define following macro before this include.\r\n- It enables also internal definitions.\r\n-\r\n-\\code\r\n-#define VMA_IMPLEMENTATION\r\n-#include \"vk_mem_alloc.h\"\r\n-\\endcode\r\n-\r\n-It may be a good idea to create dedicated CPP file just for this purpose.\r\n-\r\n-This library includes header `<vulkan\/vulkan.h>`, which in turn\r\n-includes `<windows.h>` on Windows. If you need some specific macros defined\r\n-before including these headers (like `WIN32_LEAN_AND_MEAN` or\r\n-`WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define\r\n-them before every `#include` of this library.\r\n-\r\n-\\note This library is written in C++, but has C-compatible interface.\r\n-Thus you can include and use vk_mem_alloc.h in C or C++ code, but full\r\n-implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C.\r\n-\r\n-\r\n-\\section quick_start_initialization Initialization\r\n-\r\n-At program startup:\r\n-\r\n--# Initialize Vulkan to have `VkPhysicalDevice`, `VkDevice` and `VkInstance` object.\r\n--# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by\r\n- calling vmaCreateAllocator().\r\n-\r\n-Only members `physicalDevice`, `device`, `instance` are required.\r\n-However, you should inform the library which Vulkan version do you use by setting\r\n-VmaAllocatorCreateInfo::vulkanApiVersion and which extensions did you enable\r\n-by setting VmaAllocatorCreateInfo::flags (like #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT for VK_KHR_buffer_device_address).\r\n-Otherwise, VMA would use only features of Vulkan 1.0 core with no extensions.\r\n-\r\n-You may need to configure importing Vulkan functions. There are 3 ways to do this:\r\n-\r\n--# **If you link with Vulkan static library** (e.g. \"vulkan-1.lib\" on Windows):\r\n- - You don't need to do anything.\r\n- - VMA will use these, as macro `VMA_STATIC_VULKAN_FUNCTIONS` is defined to 1 by default.\r\n--# **If you want VMA to fetch pointers to Vulkan functions dynamically** using `vkGetInstanceProcAddr`,\r\n- `vkGetDeviceProcAddr` (this is the option presented in the example below):\r\n- - Define `VMA_STATIC_VULKAN_FUNCTIONS` to 0, `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 1.\r\n- - Provide pointers to these two functions via VmaVulkanFunctions::vkGetInstanceProcAddr,\r\n- VmaVulkanFunctions::vkGetDeviceProcAddr.\r\n- - The library will fetch pointers to all other functions it needs internally.\r\n--# **If you fetch pointers to all Vulkan functions in a custom way**, e.g. using some loader like\r\n- [Volk](https:\/\/github.com\/zeux\/volk):\r\n- - Define `VMA_STATIC_VULKAN_FUNCTIONS` and `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 0.\r\n- - Pass these pointers via structure #VmaVulkanFunctions.\r\n-\r\n-\\code\r\n-VmaVulkanFunctions vulkanFunctions = {};\r\n-vulkanFunctions.vkGetInstanceProcAddr = &vkGetInstanceProcAddr;\r\n-vulkanFunctions.vkGetDeviceProcAddr = &vkGetDeviceProcAddr;\r\n-\r\n-VmaAllocatorCreateInfo allocatorCreateInfo = {};\r\n-allocatorCreateInfo.vulkanApiVersion = VK_API_VERSION_1_2;\r\n-allocatorCreateInfo.physicalDevice = physicalDevice;\r\n-allocatorCreateInfo.device = device;\r\n-allocatorCreateInfo.instance = instance;\r\n-allocatorCreateInfo.pVulkanFunctions = &vulkanFunctions;\r\n-\r\n-VmaAllocator allocator;\r\n-vmaCreateAllocator(&allocatorCreateInfo, &allocator);\r\n-\\endcode\r\n-\r\n-\r\n-\\section quick_start_resource_allocation Resource allocation\r\n-\r\n-When you want to create a buffer or image:\r\n-\r\n--# Fill `VkBufferCreateInfo` \/ `VkImageCreateInfo` structure.\r\n--# Fill VmaAllocationCreateInfo structure.\r\n--# Call vmaCreateBuffer() \/ vmaCreateImage() to get `VkBuffer`\/`VkImage` with memory\r\n- already allocated and bound to it, plus #VmaAllocation objects that represents its underlying memory.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufferInfo.size = 65536;\r\n-bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocInfo = {};\r\n-allocInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-\r\n-VkBuffer buffer;\r\n-VmaAllocation allocation;\r\n-vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\r\n-\\endcode\r\n-\r\n-Don't forget to destroy your objects when no longer needed:\r\n-\r\n-\\code\r\n-vmaDestroyBuffer(allocator, buffer, allocation);\r\n-vmaDestroyAllocator(allocator);\r\n-\\endcode\r\n-\r\n-\r\n-\\page choosing_memory_type Choosing memory type\r\n-\r\n-Physical devices in Vulkan support various combinations of memory heaps and\r\n-types. Help with choosing correct and optimal memory type for your specific\r\n-resource is one of the key features of this library. You can use it by filling\r\n-appropriate members of VmaAllocationCreateInfo structure, as described below.\r\n-You can also combine multiple methods.\r\n-\r\n--# If you just want to find memory type index that meets your requirements, you\r\n- can use function: vmaFindMemoryTypeIndexForBufferInfo(),\r\n- vmaFindMemoryTypeIndexForImageInfo(), vmaFindMemoryTypeIndex().\r\n--# If you want to allocate a region of device memory without association with any\r\n- specific image or buffer, you can use function vmaAllocateMemory(). Usage of\r\n- this function is not recommended and usually not needed.\r\n- vmaAllocateMemoryPages() function is also provided for creating multiple allocations at once,\r\n- which may be useful for sparse binding.\r\n--# If you already have a buffer or an image created, you want to allocate memory\r\n- for it and then you will bind it yourself, you can use function\r\n- vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage().\r\n- For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory()\r\n- or their extended versions: vmaBindBufferMemory2(), vmaBindImageMemory2().\r\n--# **This is the easiest and recommended way to use this library:**\r\n- If you want to create a buffer or an image, allocate memory for it and bind\r\n- them together, all in one call, you can use function vmaCreateBuffer(),\r\n- vmaCreateImage().\r\n-\r\n-When using 3. or 4., the library internally queries Vulkan for memory types\r\n-supported for that buffer or image (function `vkGetBufferMemoryRequirements()`)\r\n-and uses only one of these types.\r\n-\r\n-If no memory type can be found that meets all the requirements, these functions\r\n-return `VK_ERROR_FEATURE_NOT_PRESENT`.\r\n-\r\n-You can leave VmaAllocationCreateInfo structure completely filled with zeros.\r\n-It means no requirements are specified for memory type.\r\n-It is valid, although not very useful.\r\n-\r\n-\\section choosing_memory_type_usage Usage\r\n-\r\n-The easiest way to specify memory requirements is to fill member\r\n-VmaAllocationCreateInfo::usage using one of the values of enum #VmaMemoryUsage.\r\n-It defines high level, common usage types.\r\n-Since version 3 of the library, it is recommended to use #VMA_MEMORY_USAGE_AUTO to let it select best memory type for your resource automatically.\r\n-\r\n-For example, if you want to create a uniform buffer that will be filled using\r\n-transfer only once or infrequently and then used for rendering every frame as a uniform buffer, you can\r\n-do it using following code. The buffer will most likely end up in a memory type with\r\n-`VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT` to be fast to access by the GPU device.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufferInfo.size = 65536;\r\n-bufferInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocInfo = {};\r\n-allocInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-\r\n-VkBuffer buffer;\r\n-VmaAllocation allocation;\r\n-vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\r\n-\\endcode\r\n-\r\n-If you have a preference for putting the resource in GPU (device) memory or CPU (host) memory\r\n-on systems with discrete graphics card that have the memories separate, you can use\r\n-#VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE or #VMA_MEMORY_USAGE_AUTO_PREFER_HOST.\r\n-\r\n-When using `VMA_MEMORY_USAGE_AUTO*` while you want to map the allocated memory,\r\n-you also need to specify one of the host access flags:\r\n-#VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\r\n-This will help the library decide about preferred memory type to ensure it has `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`\r\n-so you can map it.\r\n-\r\n-For example, a staging buffer that will be filled via mapped pointer and then\r\n-used as a source of transfer to the buffer decribed previously can be created like this.\r\n-It will likely and up in a memory type that is `HOST_VISIBLE` and `HOST_COHERENT`\r\n-but not `HOST_CACHED` (meaning uncached, write-combined) and not `DEVICE_LOCAL` (meaning system RAM).\r\n-\r\n-\\code\r\n-VkBufferCreateInfo stagingBufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-stagingBufferInfo.size = 65536;\r\n-stagingBufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\r\n-\r\n-VmaAllocationCreateInfo stagingAllocInfo = {};\r\n-stagingAllocInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-stagingAllocInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;\r\n-\r\n-VkBuffer stagingBuffer;\r\n-VmaAllocation stagingAllocation;\r\n-vmaCreateBuffer(allocator, &stagingBufferInfo, &stagingAllocInfo, &stagingBuffer, &stagingAllocation, nullptr);\r\n-\\endcode\r\n-\r\n-For more examples of creating different kinds of resources, see chapter \\ref usage_patterns.\r\n-\r\n-Usage values `VMA_MEMORY_USAGE_AUTO*` are legal to use only when the library knows\r\n-about the resource being created by having `VkBufferCreateInfo` \/ `VkImageCreateInfo` passed,\r\n-so they work with functions like: vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo() etc.\r\n-If you allocate raw memory using function vmaAllocateMemory(), you have to use other means of selecting\r\n-memory type, as decribed below.\r\n-\r\n-\\note\r\n-Old usage values (`VMA_MEMORY_USAGE_GPU_ONLY`, `VMA_MEMORY_USAGE_CPU_ONLY`,\r\n-`VMA_MEMORY_USAGE_CPU_TO_GPU`, `VMA_MEMORY_USAGE_GPU_TO_CPU`, `VMA_MEMORY_USAGE_CPU_COPY`)\r\n-are still available and work same way as in previous versions of the library\r\n-for backward compatibility, but they are not recommended.\r\n-\r\n-\\section choosing_memory_type_required_preferred_flags Required and preferred flags\r\n-\r\n-You can specify more detailed requirements by filling members\r\n-VmaAllocationCreateInfo::requiredFlags and VmaAllocationCreateInfo::preferredFlags\r\n-with a combination of bits from enum `VkMemoryPropertyFlags`. For example,\r\n-if you want to create a buffer that will be persistently mapped on host (so it\r\n-must be `HOST_VISIBLE`) and preferably will also be `HOST_COHERENT` and `HOST_CACHED`,\r\n-use following code:\r\n-\r\n-\\code\r\n-VmaAllocationCreateInfo allocInfo = {};\r\n-allocInfo.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\r\n-allocInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\r\n-allocInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n-\r\n-VkBuffer buffer;\r\n-VmaAllocation allocation;\r\n-vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\r\n-\\endcode\r\n-\r\n-A memory type is chosen that has all the required flags and as many preferred\r\n-flags set as possible.\r\n-\r\n-Value passed in VmaAllocationCreateInfo::usage is internally converted to a set of required and preferred flags,\r\n-plus some extra \"magic\" (heuristics).\r\n-\r\n-\\section choosing_memory_type_explicit_memory_types Explicit memory types\r\n-\r\n-If you inspected memory types available on the physical device and you have\r\n-a preference for memory types that you want to use, you can fill member\r\n-VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set\r\n-means that a memory type with that index is allowed to be used for the\r\n-allocation. Special value 0, just like `UINT32_MAX`, means there are no\r\n-restrictions to memory type index.\r\n-\r\n-Please note that this member is NOT just a memory type index.\r\n-Still you can use it to choose just one, specific memory type.\r\n-For example, if you already determined that your buffer should be created in\r\n-memory type 2, use following code:\r\n-\r\n-\\code\r\n-uint32_t memoryTypeIndex = 2;\r\n-\r\n-VmaAllocationCreateInfo allocInfo = {};\r\n-allocInfo.memoryTypeBits = 1u << memoryTypeIndex;\r\n-\r\n-VkBuffer buffer;\r\n-VmaAllocation allocation;\r\n-vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\r\n-\\endcode\r\n-\r\n-\r\n-\\section choosing_memory_type_custom_memory_pools Custom memory pools\r\n-\r\n-If you allocate from custom memory pool, all the ways of specifying memory\r\n-requirements described above are not applicable and the aforementioned members\r\n-of VmaAllocationCreateInfo structure are ignored. Memory type is selected\r\n-explicitly when creating the pool and then used to make all the allocations from\r\n-that pool. For further details, see \\ref custom_memory_pools.\r\n-\r\n-\\section choosing_memory_type_dedicated_allocations Dedicated allocations\r\n-\r\n-Memory for allocations is reserved out of larger block of `VkDeviceMemory`\r\n-allocated from Vulkan internally. That is the main feature of this whole library.\r\n-You can still request a separate memory block to be created for an allocation,\r\n-just like you would do in a trivial solution without using any allocator.\r\n-In that case, a buffer or image is always bound to that memory at offset 0.\r\n-This is called a \"dedicated allocation\".\r\n-You can explicitly request it by using flag #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n-The library can also internally decide to use dedicated allocation in some cases, e.g.:\r\n-\r\n-- When the size of the allocation is large.\r\n-- When [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension is enabled\r\n- and it reports that dedicated allocation is required or recommended for the resource.\r\n-- When allocation of next big memory block fails due to not enough device memory,\r\n- but allocation with the exact requested size succeeds.\r\n-\r\n-\r\n-\\page memory_mapping Memory mapping\r\n-\r\n-To \"map memory\" in Vulkan means to obtain a CPU pointer to `VkDeviceMemory`,\r\n-to be able to read from it or write to it in CPU code.\r\n-Mapping is possible only of memory allocated from a memory type that has\r\n-`VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag.\r\n-Functions `vkMapMemory()`, `vkUnmapMemory()` are designed for this purpose.\r\n-You can use them directly with memory allocated by this library,\r\n-but it is not recommended because of following issue:\r\n-Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed.\r\n-This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan.\r\n-Because of this, Vulkan Memory Allocator provides following facilities:\r\n-\r\n-\\note If you want to be able to map an allocation, you need to specify one of the flags\r\n-#VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\r\n-in VmaAllocationCreateInfo::flags. These flags are required for an allocation to be mappable\r\n-when using #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` enum values.\r\n-For other usage values they are ignored and every such allocation made in `HOST_VISIBLE` memory type is mappable,\r\n-but they can still be used for consistency.\r\n-\r\n-\\section memory_mapping_mapping_functions Mapping functions\r\n-\r\n-The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory().\r\n-They are safer and more convenient to use than standard Vulkan functions.\r\n-You can map an allocation multiple times simultaneously - mapping is reference-counted internally.\r\n-You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block.\r\n-The way it is implemented is that the library always maps entire memory block, not just region of the allocation.\r\n-For further details, see description of vmaMapMemory() function.\r\n-Example:\r\n-\r\n-\\code\r\n-\/\/ Having these objects initialized:\r\n-struct ConstantBuffer\r\n-{\r\n- ...\r\n-};\r\n-ConstantBuffer constantBufferData = ...\r\n-\r\n-VmaAllocator allocator = ...\r\n-VkBuffer constantBuffer = ...\r\n-VmaAllocation constantBufferAllocation = ...\r\n-\r\n-\/\/ You can map and fill your buffer using following code:\r\n-\r\n-void* mappedData;\r\n-vmaMapMemory(allocator, constantBufferAllocation, &mappedData);\r\n-memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));\r\n-vmaUnmapMemory(allocator, constantBufferAllocation);\r\n-\\endcode\r\n-\r\n-When mapping, you may see a warning from Vulkan validation layer similar to this one:\r\n-\r\n-<i>Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.<\/i>\r\n-\r\n-It happens because the library maps entire `VkDeviceMemory` block, where different\r\n-types of images and buffers may end up together, especially on GPUs with unified memory like Intel.\r\n-You can safely ignore it if you are sure you access only memory of the intended\r\n-object that you wanted to map.\r\n-\r\n-\r\n-\\section memory_mapping_persistently_mapped_memory Persistently mapped memory\r\n-\r\n-Kepping your memory persistently mapped is generally OK in Vulkan.\r\n-You don't need to unmap it before using its data on the GPU.\r\n-The library provides a special feature designed for that:\r\n-Allocations made with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag set in\r\n-VmaAllocationCreateInfo::flags stay mapped all the time,\r\n-so you can just access CPU pointer to it any time\r\n-without a need to call any \"map\" or \"unmap\" function.\r\n-Example:\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufCreateInfo.size = sizeof(ConstantBuffer);\r\n-bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n-\r\n-VkBuffer buf;\r\n-VmaAllocation alloc;\r\n-VmaAllocationInfo allocInfo;\r\n-vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\r\n-\r\n-\/\/ Buffer is already mapped. You can access its memory.\r\n-memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));\r\n-\\endcode\r\n-\r\n-\\note #VMA_ALLOCATION_CREATE_MAPPED_BIT by itself doesn't guarantee that the allocation will end up\r\n-in a mappable memory type.\r\n-For this, you need to also specify #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or\r\n-#VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\r\n-#VMA_ALLOCATION_CREATE_MAPPED_BIT only guarantees that if the memory is `HOST_VISIBLE`, the allocation will be mapped on creation.\r\n-For an example of how to make use of this fact, see section \\ref usage_patterns_advanced_data_uploading.\r\n-\r\n-\\section memory_mapping_cache_control Cache flush and invalidate\r\n-\r\n-Memory in Vulkan doesn't need to be unmapped before using it on GPU,\r\n-but unless a memory types has `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` flag set,\r\n-you need to manually **invalidate** cache before reading of mapped pointer\r\n-and **flush** cache after writing to mapped pointer.\r\n-Map\/unmap operations don't do that automatically.\r\n-Vulkan provides following functions for this purpose `vkFlushMappedMemoryRanges()`,\r\n-`vkInvalidateMappedMemoryRanges()`, but this library provides more convenient\r\n-functions that refer to given allocation object: vmaFlushAllocation(),\r\n-vmaInvalidateAllocation(),\r\n-or multiple objects at once: vmaFlushAllocations(), vmaInvalidateAllocations().\r\n-\r\n-Regions of memory specified for flush\/invalidate must be aligned to\r\n-`VkPhysicalDeviceLimits::nonCoherentAtomSize`. This is automatically ensured by the library.\r\n-In any memory type that is `HOST_VISIBLE` but not `HOST_COHERENT`, all allocations\r\n-within blocks are aligned to this value, so their offsets are always multiply of\r\n-`nonCoherentAtomSize` and two different allocations never share same \"line\" of this size.\r\n-\r\n-Also, Windows drivers from all 3 PC GPU vendors (AMD, Intel, NVIDIA)\r\n-currently provide `HOST_COHERENT` flag on all memory types that are\r\n-`HOST_VISIBLE`, so on PC you may not need to bother.\r\n-\r\n-\r\n-\\page staying_within_budget Staying within budget\r\n-\r\n-When developing a graphics-intensive game or program, it is important to avoid allocating\r\n-more GPU memory than it is physically available. When the memory is over-committed,\r\n-various bad things can happen, depending on the specific GPU, graphics driver, and\r\n-operating system:\r\n-\r\n-- It may just work without any problems.\r\n-- The application may slow down because some memory blocks are moved to system RAM\r\n- and the GPU has to access them through PCI Express bus.\r\n-- A new allocation may take very long time to complete, even few seconds, and possibly\r\n- freeze entire system.\r\n-- The new allocation may fail with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n-- It may even result in GPU crash (TDR), observed as `VK_ERROR_DEVICE_LOST`\r\n- returned somewhere later.\r\n-\r\n-\\section staying_within_budget_querying_for_budget Querying for budget\r\n-\r\n-To query for current memory usage and available budget, use function vmaGetHeapBudgets().\r\n-Returned structure #VmaBudget contains quantities expressed in bytes, per Vulkan memory heap.\r\n-\r\n-Please note that this function returns different information and works faster than\r\n-vmaCalculateStatistics(). vmaGetHeapBudgets() can be called every frame or even before every\r\n-allocation, while vmaCalculateStatistics() is intended to be used rarely,\r\n-only to obtain statistical information, e.g. for debugging purposes.\r\n-\r\n-It is recommended to use <b>VK_EXT_memory_budget<\/b> device extension to obtain information\r\n-about the budget from Vulkan device. VMA is able to use this extension automatically.\r\n-When not enabled, the allocator behaves same way, but then it estimates current usage\r\n-and available budget based on its internal information and Vulkan memory heap sizes,\r\n-which may be less precise. In order to use this extension:\r\n-\r\n-1. Make sure extensions VK_EXT_memory_budget and VK_KHR_get_physical_device_properties2\r\n- required by it are available and enable them. Please note that the first is a device\r\n- extension and the second is instance extension!\r\n-2. Use flag #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT when creating #VmaAllocator object.\r\n-3. Make sure to call vmaSetCurrentFrameIndex() every frame. Budget is queried from\r\n- Vulkan inside of it to avoid overhead of querying it with every allocation.\r\n-\r\n-\\section staying_within_budget_controlling_memory_usage Controlling memory usage\r\n-\r\n-There are many ways in which you can try to stay within the budget.\r\n-\r\n-First, when making new allocation requires allocating a new memory block, the library\r\n-tries not to exceed the budget automatically. If a block with default recommended size\r\n-(e.g. 256 MB) would go over budget, a smaller block is allocated, possibly even\r\n-dedicated memory for just this resource.\r\n-\r\n-If the size of the requested resource plus current memory usage is more than the\r\n-budget, by default the library still tries to create it, leaving it to the Vulkan\r\n-implementation whether the allocation succeeds or fails. You can change this behavior\r\n-by using #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag. With it, the allocation is\r\n-not made if it would exceed the budget or if the budget is already exceeded.\r\n-VMA then tries to make the allocation from the next eligible Vulkan memory type.\r\n-The all of them fail, the call then fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n-Example usage pattern may be to pass the #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag\r\n-when creating resources that are not essential for the application (e.g. the texture\r\n-of a specific object) and not to pass it when creating critically important resources\r\n-(e.g. render targets).\r\n-\r\n-On AMD graphics cards there is a custom vendor extension available: <b>VK_AMD_memory_overallocation_behavior<\/b>\r\n-that allows to control the behavior of the Vulkan implementation in out-of-memory cases -\r\n-whether it should fail with an error code or still allow the allocation.\r\n-Usage of this extension involves only passing extra structure on Vulkan device creation,\r\n-so it is out of scope of this library.\r\n-\r\n-Finally, you can also use #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT flag to make sure\r\n-a new allocation is created only when it fits inside one of the existing memory blocks.\r\n-If it would require to allocate a new block, if fails instead with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n-This also ensures that the function call is very fast because it never goes to Vulkan\r\n-to obtain a new block.\r\n-\r\n-\\note Creating \\ref custom_memory_pools with VmaPoolCreateInfo::minBlockCount\r\n-set to more than 0 will currently try to allocate memory blocks without checking whether they\r\n-fit within budget.\r\n-\r\n-\r\n-\\page resource_aliasing Resource aliasing (overlap)\r\n-\r\n-New explicit graphics APIs (Vulkan and Direct3D 12), thanks to manual memory\r\n-management, give an opportunity to alias (overlap) multiple resources in the\r\n-same region of memory - a feature not available in the old APIs (Direct3D 11, OpenGL).\r\n-It can be useful to save video memory, but it must be used with caution.\r\n-\r\n-For example, if you know the flow of your whole render frame in advance, you\r\n-are going to use some intermediate textures or buffers only during a small range of render passes,\r\n-and you know these ranges don't overlap in time, you can bind these resources to\r\n-the same place in memory, even if they have completely different parameters (width, height, format etc.).\r\n-\r\n-![Resource aliasing (overlap)](..\/gfx\/Aliasing.png)\r\n-\r\n-Such scenario is possible using VMA, but you need to create your images manually.\r\n-Then you need to calculate parameters of an allocation to be made using formula:\r\n-\r\n-- allocation size = max(size of each image)\r\n-- allocation alignment = max(alignment of each image)\r\n-- allocation memoryTypeBits = bitwise AND(memoryTypeBits of each image)\r\n-\r\n-Following example shows two different images bound to the same place in memory,\r\n-allocated to fit largest of them.\r\n-\r\n-\\code\r\n-\/\/ A 512x512 texture to be sampled.\r\n-VkImageCreateInfo img1CreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\r\n-img1CreateInfo.imageType = VK_IMAGE_TYPE_2D;\r\n-img1CreateInfo.extent.width = 512;\r\n-img1CreateInfo.extent.height = 512;\r\n-img1CreateInfo.extent.depth = 1;\r\n-img1CreateInfo.mipLevels = 10;\r\n-img1CreateInfo.arrayLayers = 1;\r\n-img1CreateInfo.format = VK_FORMAT_R8G8B8A8_SRGB;\r\n-img1CreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\r\n-img1CreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\r\n-img1CreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;\r\n-img1CreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\r\n-\r\n-\/\/ A full screen texture to be used as color attachment.\r\n-VkImageCreateInfo img2CreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\r\n-img2CreateInfo.imageType = VK_IMAGE_TYPE_2D;\r\n-img2CreateInfo.extent.width = 1920;\r\n-img2CreateInfo.extent.height = 1080;\r\n-img2CreateInfo.extent.depth = 1;\r\n-img2CreateInfo.mipLevels = 1;\r\n-img2CreateInfo.arrayLayers = 1;\r\n-img2CreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\r\n-img2CreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\r\n-img2CreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\r\n-img2CreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\r\n-img2CreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\r\n-\r\n-VkImage img1;\r\n-res = vkCreateImage(device, &img1CreateInfo, nullptr, &img1);\r\n-VkImage img2;\r\n-res = vkCreateImage(device, &img2CreateInfo, nullptr, &img2);\r\n-\r\n-VkMemoryRequirements img1MemReq;\r\n-vkGetImageMemoryRequirements(device, img1, &img1MemReq);\r\n-VkMemoryRequirements img2MemReq;\r\n-vkGetImageMemoryRequirements(device, img2, &img2MemReq);\r\n-\r\n-VkMemoryRequirements finalMemReq = {};\r\n-finalMemReq.size = std::max(img1MemReq.size, img2MemReq.size);\r\n-finalMemReq.alignment = std::max(img1MemReq.alignment, img2MemReq.alignment);\r\n-finalMemReq.memoryTypeBits = img1MemReq.memoryTypeBits & img2MemReq.memoryTypeBits;\r\n-\/\/ Validate if(finalMemReq.memoryTypeBits != 0)\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\r\n-\r\n-VmaAllocation alloc;\r\n-res = vmaAllocateMemory(allocator, &finalMemReq, &allocCreateInfo, &alloc, nullptr);\r\n-\r\n-res = vmaBindImageMemory(allocator, alloc, img1);\r\n-res = vmaBindImageMemory(allocator, alloc, img2);\r\n-\r\n-\/\/ You can use img1, img2 here, but not at the same time!\r\n-\r\n-vmaFreeMemory(allocator, alloc);\r\n-vkDestroyImage(allocator, img2, nullptr);\r\n-vkDestroyImage(allocator, img1, nullptr);\r\n-\\endcode\r\n-\r\n-Remember that using resources that alias in memory requires proper synchronization.\r\n-You need to issue a memory barrier to make sure commands that use `img1` and `img2`\r\n-don't overlap on GPU timeline.\r\n-You also need to treat a resource after aliasing as uninitialized - containing garbage data.\r\n-For example, if you use `img1` and then want to use `img2`, you need to issue\r\n-an image memory barrier for `img2` with `oldLayout` = `VK_IMAGE_LAYOUT_UNDEFINED`.\r\n-\r\n-Additional considerations:\r\n-\r\n-- Vulkan also allows to interpret contents of memory between aliasing resources consistently in some cases.\r\n-See chapter 11.8. \"Memory Aliasing\" of Vulkan specification or `VK_IMAGE_CREATE_ALIAS_BIT` flag.\r\n-- You can create more complex layout where different images and buffers are bound\r\n-at different offsets inside one large allocation. For example, one can imagine\r\n-a big texture used in some render passes, aliasing with a set of many small buffers\r\n-used between in some further passes. To bind a resource at non-zero offset in an allocation,\r\n-use vmaBindBufferMemory2() \/ vmaBindImageMemory2().\r\n-- Before allocating memory for the resources you want to alias, check `memoryTypeBits`\r\n-returned in memory requirements of each resource to make sure the bits overlap.\r\n-Some GPUs may expose multiple memory types suitable e.g. only for buffers or\r\n-images with `COLOR_ATTACHMENT` usage, so the sets of memory types supported by your\r\n-resources may be disjoint. Aliasing them is not possible in that case.\r\n-\r\n-\r\n-\\page custom_memory_pools Custom memory pools\r\n-\r\n-A memory pool contains a number of `VkDeviceMemory` blocks.\r\n-The library automatically creates and manages default pool for each memory type available on the device.\r\n-Default memory pool automatically grows in size.\r\n-Size of allocated blocks is also variable and managed automatically.\r\n-\r\n-You can create custom pool and allocate memory out of it.\r\n-It can be useful if you want to:\r\n-\r\n-- Keep certain kind of allocations separate from others.\r\n-- Enforce particular, fixed size of Vulkan memory blocks.\r\n-- Limit maximum amount of Vulkan memory allocated for that pool.\r\n-- Reserve minimum or fixed amount of Vulkan memory always preallocated for that pool.\r\n-- Use extra parameters for a set of your allocations that are available in #VmaPoolCreateInfo but not in\r\n- #VmaAllocationCreateInfo - e.g., custom minimum alignment, custom `pNext` chain.\r\n-- Perform defragmentation on a specific subset of your allocations.\r\n-\r\n-To use custom memory pools:\r\n-\r\n--# Fill VmaPoolCreateInfo structure.\r\n--# Call vmaCreatePool() to obtain #VmaPool handle.\r\n--# When making an allocation, set VmaAllocationCreateInfo::pool to this handle.\r\n- You don't need to specify any other parameters of this structure, like `usage`.\r\n-\r\n-Example:\r\n-\r\n-\\code\r\n-\/\/ Find memoryTypeIndex for the pool.\r\n-VkBufferCreateInfo sampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-sampleBufCreateInfo.size = 0x10000; \/\/ Doesn't matter.\r\n-sampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo sampleAllocCreateInfo = {};\r\n-sampleAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-\r\n-uint32_t memTypeIndex;\r\n-VkResult res = vmaFindMemoryTypeIndexForBufferInfo(allocator,\r\n- &sampleBufCreateInfo, &sampleAllocCreateInfo, &memTypeIndex);\r\n-\/\/ Check res...\r\n-\r\n-\/\/ Create a pool that can have at most 2 blocks, 128 MiB each.\r\n-VmaPoolCreateInfo poolCreateInfo = {};\r\n-poolCreateInfo.memoryTypeIndex = memTypeIndex;\r\n-poolCreateInfo.blockSize = 128ull * 1024 * 1024;\r\n-poolCreateInfo.maxBlockCount = 2;\r\n-\r\n-VmaPool pool;\r\n-res = vmaCreatePool(allocator, &poolCreateInfo, &pool);\r\n-\/\/ Check res...\r\n-\r\n-\/\/ Allocate a buffer out of it.\r\n-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufCreateInfo.size = 1024;\r\n-bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.pool = pool;\r\n-\r\n-VkBuffer buf;\r\n-VmaAllocation alloc;\r\n-res = vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, nullptr);\r\n-\/\/ Check res...\r\n-\\endcode\r\n-\r\n-You have to free all allocations made from this pool before destroying it.\r\n-\r\n-\\code\r\n-vmaDestroyBuffer(allocator, buf, alloc);\r\n-vmaDestroyPool(allocator, pool);\r\n-\\endcode\r\n-\r\n-New versions of this library support creating dedicated allocations in custom pools.\r\n-It is supported only when VmaPoolCreateInfo::blockSize = 0.\r\n-To use this feature, set VmaAllocationCreateInfo::pool to the pointer to your custom pool and\r\n-VmaAllocationCreateInfo::flags to #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n-\r\n-\\note Excessive use of custom pools is a common mistake when using this library.\r\n-Custom pools may be useful for special purposes - when you want to\r\n-keep certain type of resources separate e.g. to reserve minimum amount of memory\r\n-for them or limit maximum amount of memory they can occupy. For most\r\n-resources this is not needed and so it is not recommended to create #VmaPool\r\n-objects and allocations out of them. Allocating from the default pool is sufficient.\r\n-\r\n-\r\n-\\section custom_memory_pools_MemTypeIndex Choosing memory type index\r\n-\r\n-When creating a pool, you must explicitly specify memory type index.\r\n-To find the one suitable for your buffers or images, you can use helper functions\r\n-vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo().\r\n-You need to provide structures with example parameters of buffers or images\r\n-that you are going to create in that pool.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-exampleBufCreateInfo.size = 1024; \/\/ Doesn't matter\r\n-exampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-\r\n-uint32_t memTypeIndex;\r\n-vmaFindMemoryTypeIndexForBufferInfo(allocator, &exampleBufCreateInfo, &allocCreateInfo, &memTypeIndex);\r\n-\r\n-VmaPoolCreateInfo poolCreateInfo = {};\r\n-poolCreateInfo.memoryTypeIndex = memTypeIndex;\r\n-\/\/ ...\r\n-\\endcode\r\n-\r\n-When creating buffers\/images allocated in that pool, provide following parameters:\r\n-\r\n-- `VkBufferCreateInfo`: Prefer to pass same parameters as above.\r\n- Otherwise you risk creating resources in a memory type that is not suitable for them, which may result in undefined behavior.\r\n- Using different `VK_BUFFER_USAGE_` flags may work, but you shouldn't create images in a pool intended for buffers\r\n- or the other way around.\r\n-- VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member.\r\n- Other members are ignored anyway.\r\n-\r\n-\\section linear_algorithm Linear allocation algorithm\r\n-\r\n-Each Vulkan memory block managed by this library has accompanying metadata that\r\n-keeps track of used and unused regions. By default, the metadata structure and\r\n-algorithm tries to find best place for new allocations among free regions to\r\n-optimize memory usage. This way you can allocate and free objects in any order.\r\n-\r\n-![Default allocation algorithm](..\/gfx\/Linear_allocator_1_algo_default.png)\r\n-\r\n-Sometimes there is a need to use simpler, linear allocation algorithm. You can\r\n-create custom pool that uses such algorithm by adding flag\r\n-#VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating\r\n-#VmaPool object. Then an alternative metadata management is used. It always\r\n-creates new allocations after last one and doesn't reuse free regions after\r\n-allocations freed in the middle. It results in better allocation performance and\r\n-less memory consumed by metadata.\r\n-\r\n-![Linear allocation algorithm](..\/gfx\/Linear_allocator_2_algo_linear.png)\r\n-\r\n-With this one flag, you can create a custom pool that can be used in many ways:\r\n-free-at-once, stack, double stack, and ring buffer. See below for details.\r\n-You don't need to specify explicitly which of these options you are going to use - it is detected automatically.\r\n-\r\n-\\subsection linear_algorithm_free_at_once Free-at-once\r\n-\r\n-In a pool that uses linear algorithm, you still need to free all the allocations\r\n-individually, e.g. by using vmaFreeMemory() or vmaDestroyBuffer(). You can free\r\n-them in any order. New allocations are always made after last one - free space\r\n-in the middle is not reused. However, when you release all the allocation and\r\n-the pool becomes empty, allocation starts from the beginning again. This way you\r\n-can use linear algorithm to speed up creation of allocations that you are going\r\n-to release all at once.\r\n-\r\n-![Free-at-once](..\/gfx\/Linear_allocator_3_free_at_once.png)\r\n-\r\n-This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount\r\n-value that allows multiple memory blocks.\r\n-\r\n-\\subsection linear_algorithm_stack Stack\r\n-\r\n-When you free an allocation that was created last, its space can be reused.\r\n-Thanks to this, if you always release allocations in the order opposite to their\r\n-creation (LIFO - Last In First Out), you can achieve behavior of a stack.\r\n-\r\n-![Stack](..\/gfx\/Linear_allocator_4_stack.png)\r\n-\r\n-This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount\r\n-value that allows multiple memory blocks.\r\n-\r\n-\\subsection linear_algorithm_double_stack Double stack\r\n-\r\n-The space reserved by a custom pool with linear algorithm may be used by two\r\n-stacks:\r\n-\r\n-- First, default one, growing up from offset 0.\r\n-- Second, \"upper\" one, growing down from the end towards lower offsets.\r\n-\r\n-To make allocation from the upper stack, add flag #VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT\r\n-to VmaAllocationCreateInfo::flags.\r\n-\r\n-![Double stack](..\/gfx\/Linear_allocator_7_double_stack.png)\r\n-\r\n-Double stack is available only in pools with one memory block -\r\n-VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.\r\n-\r\n-When the two stacks' ends meet so there is not enough space between them for a\r\n-new allocation, such allocation fails with usual\r\n-`VK_ERROR_OUT_OF_DEVICE_MEMORY` error.\r\n-\r\n-\\subsection linear_algorithm_ring_buffer Ring buffer\r\n-\r\n-When you free some allocations from the beginning and there is not enough free space\r\n-for a new one at the end of a pool, allocator's \"cursor\" wraps around to the\r\n-beginning and starts allocation there. Thanks to this, if you always release\r\n-allocations in the same order as you created them (FIFO - First In First Out),\r\n-you can achieve behavior of a ring buffer \/ queue.\r\n-\r\n-![Ring buffer](..\/gfx\/Linear_allocator_5_ring_buffer.png)\r\n-\r\n-Ring buffer is available only in pools with one memory block -\r\n-VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.\r\n-\r\n-\\note \\ref defragmentation is not supported in custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT.\r\n-\r\n-\r\n-\\page defragmentation Defragmentation\r\n-\r\n-Interleaved allocations and deallocations of many objects of varying size can\r\n-cause fragmentation over time, which can lead to a situation where the library is unable\r\n-to find a continuous range of free memory for a new allocation despite there is\r\n-enough free space, just scattered across many small free ranges between existing\r\n-allocations.\r\n-\r\n-To mitigate this problem, you can use defragmentation feature.\r\n-It doesn't happen automatically though and needs your cooperation,\r\n-because VMA is a low level library that only allocates memory.\r\n-It cannot recreate buffers and images in a new place as it doesn't remember the contents of `VkBufferCreateInfo` \/ `VkImageCreateInfo` structures.\r\n-It cannot copy their contents as it doesn't record any commands to a command buffer.\r\n-\r\n-Example:\r\n-\r\n-\\code\r\n-VmaDefragmentationInfo defragInfo = {};\r\n-defragInfo.pool = myPool;\r\n-defragInfo.flags = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT;\r\n-\r\n-VmaDefragmentationContext defragCtx;\r\n-VkResult res = vmaBeginDefragmentation(allocator, &defragInfo, &defragCtx);\r\n-\/\/ Check res...\r\n-\r\n-for(;;)\r\n-{\r\n- VmaDefragmentationPassMoveInfo pass;\r\n- res = vmaBeginDefragmentationPass(allocator, defragCtx, &pass);\r\n- if(res == VK_SUCCESS)\r\n- break;\r\n- else if(res != VK_INCOMPLETE)\r\n- \/\/ Handle error...\r\n-\r\n- for(uint32_t i = 0; i < pass.moveCount; ++i)\r\n- {\r\n- \/\/ Inspect pass.pMoves[i].srcAllocation, identify what buffer\/image it represents.\r\n- VmaAllocationInfo allocInfo;\r\n- vmaGetAllocationInfo(allocator, pMoves[i].srcAllocation, &allocInfo);\r\n- MyEngineResourceData* resData = (MyEngineResourceData*)allocInfo.pUserData;\r\n- \r\n- \/\/ Recreate and bind this buffer\/image at: pass.pMoves[i].dstMemory, pass.pMoves[i].dstOffset.\r\n- VkImageCreateInfo imgCreateInfo = ...\r\n- VkImage newImg;\r\n- res = vkCreateImage(device, &imgCreateInfo, nullptr, &newImg);\r\n- \/\/ Check res...\r\n- res = vmaBindImageMemory(allocator, pMoves[i].dstTmpAllocation, newImg);\r\n- \/\/ Check res...\r\n-\r\n- \/\/ Issue a vkCmdCopyBuffer\/vkCmdCopyImage to copy its content to the new place.\r\n- vkCmdCopyImage(cmdBuf, resData->img, ..., newImg, ...);\r\n- }\r\n- \r\n- \/\/ Make sure the copy commands finished executing.\r\n- vkWaitForFences(...);\r\n-\r\n- \/\/ Destroy old buffers\/images bound with pass.pMoves[i].srcAllocation.\r\n- for(uint32_t i = 0; i < pass.moveCount; ++i)\r\n- {\r\n- \/\/ ...\r\n- vkDestroyImage(device, resData->img, nullptr);\r\n- }\r\n-\r\n- \/\/ Update appropriate descriptors to point to the new places...\r\n- \r\n- res = vmaEndDefragmentationPass(allocator, defragCtx, &pass);\r\n- if(res == VK_SUCCESS)\r\n- break;\r\n- else if(res != VK_INCOMPLETE)\r\n- \/\/ Handle error...\r\n-}\r\n-\r\n-vmaEndDefragmentation(allocator, defragCtx, nullptr);\r\n-\\endcode\r\n-\r\n-Although functions like vmaCreateBuffer(), vmaCreateImage(), vmaDestroyBuffer(), vmaDestroyImage()\r\n-create\/destroy an allocation and a buffer\/image at once, these are just a shortcut for\r\n-creating the resource, allocating memory, and binding them together.\r\n-Defragmentation works on memory allocations only. You must handle the rest manually.\r\n-Defragmentation is an iterative process that should repreat \"passes\" as long as related functions\r\n-return `VK_INCOMPLETE` not `VK_SUCCESS`.\r\n-In each pass:\r\n-\r\n-1. vmaBeginDefragmentationPass() function call:\r\n- - Calculates and returns the list of allocations to be moved in this pass.\r\n- Note this can be a time-consuming process.\r\n- - Reserves destination memory for them by creating temporary destination allocations\r\n- that you can query for their `VkDeviceMemory` + offset using vmaGetAllocationInfo().\r\n-2. Inside the pass, **you should**:\r\n- - Inspect the returned list of allocations to be moved.\r\n- - Create new buffers\/images and bind them at the returned destination temporary allocations.\r\n- - Copy data from source to destination resources if necessary.\r\n- - Destroy the source buffers\/images, but NOT their allocations.\r\n-3. vmaEndDefragmentationPass() function call:\r\n- - Frees the source memory reserved for the allocations that are moved.\r\n- - Modifies source #VmaAllocation objects that are moved to point to the destination reserved memory.\r\n- - Frees `VkDeviceMemory` blocks that became empty.\r\n-\r\n-Unlike in previous iterations of the defragmentation API, there is no list of \"movable\" allocations passed as a parameter.\r\n-Defragmentation algorithm tries to move all suitable allocations.\r\n-You can, however, refuse to move some of them inside a defragmentation pass, by setting\r\n-`pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\r\n-This is not recommended and may result in suboptimal packing of the allocations after defragmentation.\r\n-If you cannot ensure any allocation can be moved, it is better to keep movable allocations separate in a custom pool.\r\n-\r\n-Inside a pass, for each allocation that should be moved:\r\n-\r\n-- You should copy its data from the source to the destination place by calling e.g. `vkCmdCopyBuffer()`, `vkCmdCopyImage()`.\r\n- - You need to make sure these commands finished executing before destroying the source buffers\/images and before calling vmaEndDefragmentationPass().\r\n-- If a resource doesn't contain any meaningful data, e.g. it is a transient color attachment image to be cleared,\r\n- filled, and used temporarily in each rendering frame, you can just recreate this image\r\n- without copying its data.\r\n-- If the resource is in `HOST_VISIBLE` and `HOST_COHERENT` memory, you can copy its data on the CPU\r\n- using `memcpy()`.\r\n-- If you cannot move the allocation, you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\r\n- This will cancel the move.\r\n- - vmaEndDefragmentationPass() will then free the destination memory\r\n- not the source memory of the allocation, leaving it unchanged.\r\n-- If you decide the allocation is unimportant and can be destroyed instead of moved (e.g. it wasn't used for long time),\r\n- you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY.\r\n- - vmaEndDefragmentationPass() will then free both source and destination memory, and will destroy the source #VmaAllocation object.\r\n-\r\n-You can defragment a specific custom pool by setting VmaDefragmentationInfo::pool\r\n-(like in the example above) or all the default pools by setting this member to null.\r\n-\r\n-Defragmentation is always performed in each pool separately.\r\n-Allocations are never moved between different Vulkan memory types.\r\n-The size of the destination memory reserved for a moved allocation is the same as the original one.\r\n-Alignment of an allocation as it was determined using `vkGetBufferMemoryRequirements()` etc. is also respected after defragmentation.\r\n-Buffers\/images should be recreated with the same `VkBufferCreateInfo` \/ `VkImageCreateInfo` parameters as the original ones.\r\n-\r\n-You can perform the defragmentation incrementally to limit the number of allocations and bytes to be moved\r\n-in each pass, e.g. to call it in sync with render frames and not to experience too big hitches.\r\n-See members: VmaDefragmentationInfo::maxBytesPerPass, VmaDefragmentationInfo::maxAllocationsPerPass.\r\n-\r\n-It is also safe to perform the defragmentation asynchronously to render frames and other Vulkan and VMA\r\n-usage, possibly from multiple threads, with the exception that allocations\r\n-returned in VmaDefragmentationPassMoveInfo::pMoves shouldn't be destroyed until the defragmentation pass is ended.\r\n-\r\n-<b>Mapping<\/b> is preserved on allocations that are moved during defragmentation.\r\n-Whether through #VMA_ALLOCATION_CREATE_MAPPED_BIT or vmaMapMemory(), the allocations\r\n-are mapped at their new place. Of course, pointer to the mapped data changes, so it needs to be queried\r\n-using VmaAllocationInfo::pMappedData.\r\n-\r\n-\\note Defragmentation is not supported in custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT.\r\n-\r\n-\r\n-\\page statistics Statistics\r\n-\r\n-This library contains several functions that return information about its internal state,\r\n-especially the amount of memory allocated from Vulkan.\r\n-\r\n-\\section statistics_numeric_statistics Numeric statistics\r\n-\r\n-If you need to obtain basic statistics about memory usage per heap, together with current budget,\r\n-you can call function vmaGetHeapBudgets() and inspect structure #VmaBudget.\r\n-This is useful to keep track of memory usage and stay withing budget\r\n-(see also \\ref staying_within_budget).\r\n-Example:\r\n-\r\n-\\code\r\n-uint32_t heapIndex = ...\r\n-\r\n-VmaBudget budgets[VK_MAX_MEMORY_HEAPS];\r\n-vmaGetHeapBudgets(allocator, budgets);\r\n-\r\n-printf(\"My heap currently has %u allocations taking %llu B,\\n\",\r\n- budgets[heapIndex].statistics.allocationCount,\r\n- budgets[heapIndex].statistics.allocationBytes);\r\n-printf(\"allocated out of %u Vulkan device memory blocks taking %llu B,\\n\",\r\n- budgets[heapIndex].statistics.blockCount,\r\n- budgets[heapIndex].statistics.blockBytes);\r\n-printf(\"Vulkan reports total usage %llu B with budget %llu B.\\n\",\r\n- budgets[heapIndex].usage,\r\n- budgets[heapIndex].budget);\r\n-\\endcode\r\n-\r\n-You can query for more detailed statistics per memory heap, type, and totals,\r\n-including minimum and maximum allocation size and unused range size,\r\n-by calling function vmaCalculateStatistics() and inspecting structure #VmaTotalStatistics.\r\n-This function is slower though, as it has to traverse all the internal data structures,\r\n-so it should be used only for debugging purposes.\r\n-\r\n-You can query for statistics of a custom pool using function vmaGetPoolStatistics()\r\n-or vmaCalculatePoolStatistics().\r\n-\r\n-You can query for information about a specific allocation using function vmaGetAllocationInfo().\r\n-It fill structure #VmaAllocationInfo.\r\n-\r\n-\\section statistics_json_dump JSON dump\r\n-\r\n-You can dump internal state of the allocator to a string in JSON format using function vmaBuildStatsString().\r\n-The result is guaranteed to be correct JSON.\r\n-It uses ANSI encoding.\r\n-Any strings provided by user (see [Allocation names](@ref allocation_names))\r\n-are copied as-is and properly escaped for JSON, so if they use UTF-8, ISO-8859-2 or any other encoding,\r\n-this JSON string can be treated as using this encoding.\r\n-It must be freed using function vmaFreeStatsString().\r\n-\r\n-The format of this JSON string is not part of official documentation of the library,\r\n-but it will not change in backward-incompatible way without increasing library major version number\r\n-and appropriate mention in changelog.\r\n-\r\n-The JSON string contains all the data that can be obtained using vmaCalculateStatistics().\r\n-It can also contain detailed map of allocated memory blocks and their regions -\r\n-free and occupied by allocations.\r\n-This allows e.g. to visualize the memory or assess fragmentation.\r\n-\r\n-\r\n-\\page allocation_annotation Allocation names and user data\r\n-\r\n-\\section allocation_user_data Allocation user data\r\n-\r\n-You can annotate allocations with your own information, e.g. for debugging purposes.\r\n-To do that, fill VmaAllocationCreateInfo::pUserData field when creating\r\n-an allocation. It is an opaque `void*` pointer. You can use it e.g. as a pointer,\r\n-some handle, index, key, ordinal number or any other value that would associate\r\n-the allocation with your custom metadata.\r\n-It it useful to identify appropriate data structures in your engine given #VmaAllocation,\r\n-e.g. when doing \\ref defragmentation.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufCreateInfo = ...\r\n-\r\n-MyBufferMetadata* pMetadata = CreateBufferMetadata();\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.pUserData = pMetadata;\r\n-\r\n-VkBuffer buffer;\r\n-VmaAllocation allocation;\r\n-vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buffer, &allocation, nullptr);\r\n-\\endcode\r\n-\r\n-The pointer may be later retrieved as VmaAllocationInfo::pUserData:\r\n-\r\n-\\code\r\n-VmaAllocationInfo allocInfo;\r\n-vmaGetAllocationInfo(allocator, allocation, &allocInfo);\r\n-MyBufferMetadata* pMetadata = (MyBufferMetadata*)allocInfo.pUserData;\r\n-\\endcode\r\n-\r\n-It can also be changed using function vmaSetAllocationUserData().\r\n-\r\n-Values of (non-zero) allocations' `pUserData` are printed in JSON report created by\r\n-vmaBuildStatsString() in hexadecimal form.\r\n-\r\n-\\section allocation_names Allocation names\r\n-\r\n-An allocation can also carry a null-terminated string, giving a name to the allocation.\r\n-To set it, call vmaSetAllocationName().\r\n-The library creates internal copy of the string, so the pointer you pass doesn't need\r\n-to be valid for whole lifetime of the allocation. You can free it after the call.\r\n-\r\n-\\code\r\n-std::string imageName = \"Texture: \";\r\n-imageName += fileName;\r\n-vmaSetAllocationName(allocator, allocation, imageName.c_str());\r\n-\\endcode\r\n-\r\n-The string can be later retrieved by inspecting VmaAllocationInfo::pName.\r\n-It is also printed in JSON report created by vmaBuildStatsString().\r\n-\r\n-\\note Setting string name to VMA allocation doesn't automatically set it to the Vulkan buffer or image created with it.\r\n-You must do it manually using an extension like VK_EXT_debug_utils, which is independent of this library.\r\n-\r\n-\r\n-\\page virtual_allocator Virtual allocator\r\n-\r\n-As an extra feature, the core allocation algorithm of the library is exposed through a simple and convenient API of \"virtual allocator\".\r\n-It doesn't allocate any real GPU memory. It just keeps track of used and free regions of a \"virtual block\".\r\n-You can use it to allocate your own memory or other objects, even completely unrelated to Vulkan.\r\n-A common use case is sub-allocation of pieces of one large GPU buffer.\r\n-\r\n-\\section virtual_allocator_creating_virtual_block Creating virtual block\r\n-\r\n-To use this functionality, there is no main \"allocator\" object.\r\n-You don't need to have #VmaAllocator object created.\r\n-All you need to do is to create a separate #VmaVirtualBlock object for each block of memory you want to be managed by the allocator:\r\n-\r\n--# Fill in #VmaVirtualBlockCreateInfo structure.\r\n--# Call vmaCreateVirtualBlock(). Get new #VmaVirtualBlock object.\r\n-\r\n-Example:\r\n-\r\n-\\code\r\n-VmaVirtualBlockCreateInfo blockCreateInfo = {};\r\n-blockCreateInfo.size = 1048576; \/\/ 1 MB\r\n-\r\n-VmaVirtualBlock block;\r\n-VkResult res = vmaCreateVirtualBlock(&blockCreateInfo, &block);\r\n-\\endcode\r\n-\r\n-\\section virtual_allocator_making_virtual_allocations Making virtual allocations\r\n-\r\n-#VmaVirtualBlock object contains internal data structure that keeps track of free and occupied regions\r\n-using the same code as the main Vulkan memory allocator.\r\n-Similarly to #VmaAllocation for standard GPU allocations, there is #VmaVirtualAllocation type\r\n-that represents an opaque handle to an allocation withing the virtual block.\r\n-\r\n-In order to make such allocation:\r\n-\r\n--# Fill in #VmaVirtualAllocationCreateInfo structure.\r\n--# Call vmaVirtualAllocate(). Get new #VmaVirtualAllocation object that represents the allocation.\r\n- You can also receive `VkDeviceSize offset` that was assigned to the allocation.\r\n-\r\n-Example:\r\n-\r\n-\\code\r\n-VmaVirtualAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.size = 4096; \/\/ 4 KB\r\n-\r\n-VmaVirtualAllocation alloc;\r\n-VkDeviceSize offset;\r\n-res = vmaVirtualAllocate(block, &allocCreateInfo, &alloc, &offset);\r\n-if(res == VK_SUCCESS)\r\n-{\r\n- \/\/ Use the 4 KB of your memory starting at offset.\r\n-}\r\n-else\r\n-{\r\n- \/\/ Allocation failed - no space for it could be found. Handle this error!\r\n-}\r\n-\\endcode\r\n-\r\n-\\section virtual_allocator_deallocation Deallocation\r\n-\r\n-When no longer needed, an allocation can be freed by calling vmaVirtualFree().\r\n-You can only pass to this function an allocation that was previously returned by vmaVirtualAllocate()\r\n-called for the same #VmaVirtualBlock.\r\n-\r\n-When whole block is no longer needed, the block object can be released by calling vmaDestroyVirtualBlock().\r\n-All allocations must be freed before the block is destroyed, which is checked internally by an assert.\r\n-However, if you don't want to call vmaVirtualFree() for each allocation, you can use vmaClearVirtualBlock() to free them all at once -\r\n-a feature not available in normal Vulkan memory allocator. Example:\r\n-\r\n-\\code\r\n-vmaVirtualFree(block, alloc);\r\n-vmaDestroyVirtualBlock(block);\r\n-\\endcode\r\n-\r\n-\\section virtual_allocator_allocation_parameters Allocation parameters\r\n-\r\n-You can attach a custom pointer to each allocation by using vmaSetVirtualAllocationUserData().\r\n-Its default value is null.\r\n-It can be used to store any data that needs to be associated with that allocation - e.g. an index, a handle, or a pointer to some\r\n-larger data structure containing more information. Example:\r\n-\r\n-\\code\r\n-struct CustomAllocData\r\n-{\r\n- std::string m_AllocName;\r\n-};\r\n-CustomAllocData* allocData = new CustomAllocData();\r\n-allocData->m_AllocName = \"My allocation 1\";\r\n-vmaSetVirtualAllocationUserData(block, alloc, allocData);\r\n-\\endcode\r\n-\r\n-The pointer can later be fetched, along with allocation offset and size, by passing the allocation handle to function\r\n-vmaGetVirtualAllocationInfo() and inspecting returned structure #VmaVirtualAllocationInfo.\r\n-If you allocated a new object to be used as the custom pointer, don't forget to delete that object before freeing the allocation!\r\n-Example:\r\n-\r\n-\\code\r\n-VmaVirtualAllocationInfo allocInfo;\r\n-vmaGetVirtualAllocationInfo(block, alloc, &allocInfo);\r\n-delete (CustomAllocData*)allocInfo.pUserData;\r\n-\r\n-vmaVirtualFree(block, alloc);\r\n-\\endcode\r\n-\r\n-\\section virtual_allocator_alignment_and_units Alignment and units\r\n-\r\n-It feels natural to express sizes and offsets in bytes.\r\n-If an offset of an allocation needs to be aligned to a multiply of some number (e.g. 4 bytes), you can fill optional member\r\n-VmaVirtualAllocationCreateInfo::alignment to request it. Example:\r\n-\r\n-\\code\r\n-VmaVirtualAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.size = 4096; \/\/ 4 KB\r\n-allocCreateInfo.alignment = 4; \/\/ Returned offset must be a multiply of 4 B\r\n-\r\n-VmaVirtualAllocation alloc;\r\n-res = vmaVirtualAllocate(block, &allocCreateInfo, &alloc, nullptr);\r\n-\\endcode\r\n-\r\n-Alignments of different allocations made from one block may vary.\r\n-However, if all alignments and sizes are always multiply of some size e.g. 4 B or `sizeof(MyDataStruct)`,\r\n-you can express all sizes, alignments, and offsets in multiples of that size instead of individual bytes.\r\n-It might be more convenient, but you need to make sure to use this new unit consistently in all the places:\r\n-\r\n-- VmaVirtualBlockCreateInfo::size\r\n-- VmaVirtualAllocationCreateInfo::size and VmaVirtualAllocationCreateInfo::alignment\r\n-- Using offset returned by vmaVirtualAllocate() or in VmaVirtualAllocationInfo::offset\r\n-\r\n-\\section virtual_allocator_statistics Statistics\r\n-\r\n-You can obtain statistics of a virtual block using vmaGetVirtualBlockStatistics()\r\n-(to get brief statistics that are fast to calculate)\r\n-or vmaCalculateVirtualBlockStatistics() (to get more detailed statistics, slower to calculate).\r\n-The functions fill structures #VmaStatistics, #VmaDetailedStatistics respectively - same as used by the normal Vulkan memory allocator.\r\n-Example:\r\n-\r\n-\\code\r\n-VmaStatistics stats;\r\n-vmaGetVirtualBlockStatistics(block, &stats);\r\n-printf(\"My virtual block has %llu bytes used by %u virtual allocations\\n\",\r\n- stats.allocationBytes, stats.allocationCount);\r\n-\\endcode\r\n-\r\n-You can also request a full list of allocations and free regions as a string in JSON format by calling\r\n-vmaBuildVirtualBlockStatsString().\r\n-Returned string must be later freed using vmaFreeVirtualBlockStatsString().\r\n-The format of this string differs from the one returned by the main Vulkan allocator, but it is similar.\r\n-\r\n-\\section virtual_allocator_additional_considerations Additional considerations\r\n-\r\n-The \"virtual allocator\" functionality is implemented on a level of individual memory blocks.\r\n-Keeping track of a whole collection of blocks, allocating new ones when out of free space,\r\n-deleting empty ones, and deciding which one to try first for a new allocation must be implemented by the user.\r\n-\r\n-Alternative allocation algorithms are supported, just like in custom pools of the real GPU memory.\r\n-See enum #VmaVirtualBlockCreateFlagBits to learn how to specify them (e.g. #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT).\r\n-You can find their description in chapter \\ref custom_memory_pools.\r\n-Allocation strategies are also supported.\r\n-See enum #VmaVirtualAllocationCreateFlagBits to learn how to specify them (e.g. #VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT).\r\n-\r\n-Following features are supported only by the allocator of the real GPU memory and not by virtual allocations:\r\n-buffer-image granularity, `VMA_DEBUG_MARGIN`, `VMA_MIN_ALIGNMENT`.\r\n-\r\n-\r\n-\\page debugging_memory_usage Debugging incorrect memory usage\r\n-\r\n-If you suspect a bug with memory usage, like usage of uninitialized memory or\r\n-memory being overwritten out of bounds of an allocation,\r\n-you can use debug features of this library to verify this.\r\n-\r\n-\\section debugging_memory_usage_initialization Memory initialization\r\n-\r\n-If you experience a bug with incorrect and nondeterministic data in your program and you suspect uninitialized memory to be used,\r\n-you can enable automatic memory initialization to verify this.\r\n-To do it, define macro `VMA_DEBUG_INITIALIZE_ALLOCATIONS` to 1.\r\n-\r\n-\\code\r\n-#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1\r\n-#include \"vk_mem_alloc.h\"\r\n-\\endcode\r\n-\r\n-It makes memory of all new allocations initialized to bit pattern `0xDCDCDCDC`.\r\n-Before an allocation is destroyed, its memory is filled with bit pattern `0xEFEFEFEF`.\r\n-Memory is automatically mapped and unmapped if necessary.\r\n-\r\n-If you find these values while debugging your program, good chances are that you incorrectly\r\n-read Vulkan memory that is allocated but not initialized, or already freed, respectively.\r\n-\r\n-Memory initialization works only with memory types that are `HOST_VISIBLE`.\r\n-It works also with dedicated allocations.\r\n-\r\n-\\section debugging_memory_usage_margins Margins\r\n-\r\n-By default, allocations are laid out in memory blocks next to each other if possible\r\n-(considering required alignment, `bufferImageGranularity`, and `nonCoherentAtomSize`).\r\n-\r\n-![Allocations without margin](..\/gfx\/Margins_1.png)\r\n-\r\n-Define macro `VMA_DEBUG_MARGIN` to some non-zero value (e.g. 16) to enforce specified\r\n-number of bytes as a margin after every allocation.\r\n-\r\n-\\code\r\n-#define VMA_DEBUG_MARGIN 16\r\n-#include \"vk_mem_alloc.h\"\r\n-\\endcode\r\n-\r\n-![Allocations with margin](..\/gfx\/Margins_2.png)\r\n-\r\n-If your bug goes away after enabling margins, it means it may be caused by memory\r\n-being overwritten outside of allocation boundaries. It is not 100% certain though.\r\n-Change in application behavior may also be caused by different order and distribution\r\n-of allocations across memory blocks after margins are applied.\r\n-\r\n-Margins work with all types of memory.\r\n-\r\n-Margin is applied only to allocations made out of memory blocks and not to dedicated\r\n-allocations, which have their own memory block of specific size.\r\n-It is thus not applied to allocations made using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag\r\n-or those automatically decided to put into dedicated allocations, e.g. due to its\r\n-large size or recommended by VK_KHR_dedicated_allocation extension.\r\n-\r\n-Margins appear in [JSON dump](@ref statistics_json_dump) as part of free space.\r\n-\r\n-Note that enabling margins increases memory usage and fragmentation.\r\n-\r\n-Margins do not apply to \\ref virtual_allocator.\r\n-\r\n-\\section debugging_memory_usage_corruption_detection Corruption detection\r\n-\r\n-You can additionally define macro `VMA_DEBUG_DETECT_CORRUPTION` to 1 to enable validation\r\n-of contents of the margins.\r\n-\r\n-\\code\r\n-#define VMA_DEBUG_MARGIN 16\r\n-#define VMA_DEBUG_DETECT_CORRUPTION 1\r\n-#include \"vk_mem_alloc.h\"\r\n-\\endcode\r\n-\r\n-When this feature is enabled, number of bytes specified as `VMA_DEBUG_MARGIN`\r\n-(it must be multiply of 4) after every allocation is filled with a magic number.\r\n-This idea is also know as \"canary\".\r\n-Memory is automatically mapped and unmapped if necessary.\r\n-\r\n-This number is validated automatically when the allocation is destroyed.\r\n-If it is not equal to the expected value, `VMA_ASSERT()` is executed.\r\n-It clearly means that either CPU or GPU overwritten the memory outside of boundaries of the allocation,\r\n-which indicates a serious bug.\r\n-\r\n-You can also explicitly request checking margins of all allocations in all memory blocks\r\n-that belong to specified memory types by using function vmaCheckCorruption(),\r\n-or in memory blocks that belong to specified custom pool, by using function\r\n-vmaCheckPoolCorruption().\r\n-\r\n-Margin validation (corruption detection) works only for memory types that are\r\n-`HOST_VISIBLE` and `HOST_COHERENT`.\r\n-\r\n-\r\n-\\page opengl_interop OpenGL Interop\r\n-\r\n-VMA provides some features that help with interoperability with OpenGL.\r\n-\r\n-\\section opengl_interop_exporting_memory Exporting memory\r\n-\r\n-If you want to attach `VkExportMemoryAllocateInfoKHR` structure to `pNext` chain of memory allocations made by the library:\r\n-\r\n-It is recommended to create \\ref custom_memory_pools for such allocations.\r\n-Define and fill in your `VkExportMemoryAllocateInfoKHR` structure and attach it to VmaPoolCreateInfo::pMemoryAllocateNext\r\n-while creating the custom pool.\r\n-Please note that the structure must remain alive and unchanged for the whole lifetime of the #VmaPool,\r\n-not only while creating it, as no copy of the structure is made,\r\n-but its original pointer is used for each allocation instead.\r\n-\r\n-If you want to export all memory allocated by the library from certain memory types,\r\n-also dedicated allocations or other allocations made from default pools,\r\n-an alternative solution is to fill in VmaAllocatorCreateInfo::pTypeExternalMemoryHandleTypes.\r\n-It should point to an array with `VkExternalMemoryHandleTypeFlagsKHR` to be automatically passed by the library\r\n-through `VkExportMemoryAllocateInfoKHR` on each allocation made from a specific memory type.\r\n-Please note that new versions of the library also support dedicated allocations created in custom pools.\r\n-\r\n-You should not mix these two methods in a way that allows to apply both to the same memory type.\r\n-Otherwise, `VkExportMemoryAllocateInfoKHR` structure would be attached twice to the `pNext` chain of `VkMemoryAllocateInfo`.\r\n-\r\n-\r\n-\\section opengl_interop_custom_alignment Custom alignment\r\n-\r\n-Buffers or images exported to a different API like OpenGL may require a different alignment,\r\n-higher than the one used by the library automatically, queried from functions like `vkGetBufferMemoryRequirements`.\r\n-To impose such alignment:\r\n-\r\n-It is recommended to create \\ref custom_memory_pools for such allocations.\r\n-Set VmaPoolCreateInfo::minAllocationAlignment member to the minimum alignment required for each allocation\r\n-to be made out of this pool.\r\n-The alignment actually used will be the maximum of this member and the alignment returned for the specific buffer or image\r\n-from a function like `vkGetBufferMemoryRequirements`, which is called by VMA automatically.\r\n-\r\n-If you want to create a buffer with a specific minimum alignment out of default pools,\r\n-use special function vmaCreateBufferWithAlignment(), which takes additional parameter `minAlignment`.\r\n-\r\n-Note the problem of alignment affects only resources placed inside bigger `VkDeviceMemory` blocks and not dedicated\r\n-allocations, as these, by definition, always have alignment = 0 because the resource is bound to the beginning of its dedicated block.\r\n-Contrary to Direct3D 12, Vulkan doesn't have a concept of alignment of the entire memory block passed on its allocation.\r\n-\r\n-\r\n-\\page usage_patterns Recommended usage patterns\r\n-\r\n-Vulkan gives great flexibility in memory allocation.\r\n-This chapter shows the most common patterns.\r\n-\r\n-See also slides from talk:\r\n-[Sawicki, Adam. Advanced Graphics Techniques Tutorial: Memory management in Vulkan and DX12. Game Developers Conference, 2018](https:\/\/www.gdcvault.com\/play\/1025458\/Advanced-Graphics-Techniques-Tutorial-New)\r\n-\r\n-\r\n-\\section usage_patterns_gpu_only GPU-only resource\r\n-\r\n-<b>When:<\/b>\r\n-Any resources that you frequently write and read on GPU,\r\n-e.g. images used as color attachments (aka \"render targets\"), depth-stencil attachments,\r\n-images\/buffers used as storage image\/buffer (aka \"Unordered Access View (UAV)\").\r\n-\r\n-<b>What to do:<\/b>\r\n-Let the library select the optimal memory type, which will likely have `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\r\n-\r\n-\\code\r\n-VkImageCreateInfo imgCreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\r\n-imgCreateInfo.imageType = VK_IMAGE_TYPE_2D;\r\n-imgCreateInfo.extent.width = 3840;\r\n-imgCreateInfo.extent.height = 2160;\r\n-imgCreateInfo.extent.depth = 1;\r\n-imgCreateInfo.mipLevels = 1;\r\n-imgCreateInfo.arrayLayers = 1;\r\n-imgCreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\r\n-imgCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\r\n-imgCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\r\n-imgCreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\r\n-imgCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\r\n-allocCreateInfo.priority = 1.0f;\r\n-\r\n-VkImage img;\r\n-VmaAllocation alloc;\r\n-vmaCreateImage(allocator, &imgCreateInfo, &allocCreateInfo, &img, &alloc, nullptr);\r\n-\\endcode\r\n-\r\n-<b>Also consider:<\/b>\r\n-Consider creating them as dedicated allocations using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT,\r\n-especially if they are large or if you plan to destroy and recreate them with different sizes\r\n-e.g. when display resolution changes.\r\n-Prefer to create such resources first and all other GPU resources (like textures and vertex buffers) later.\r\n-When VK_EXT_memory_priority extension is enabled, it is also worth setting high priority to such allocation\r\n-to decrease chances to be evicted to system memory by the operating system.\r\n-\r\n-\\section usage_patterns_staging_copy_upload Staging copy for upload\r\n-\r\n-<b>When:<\/b>\r\n-A \"staging\" buffer than you want to map and fill from CPU code, then use as a source od transfer\r\n-to some GPU resource.\r\n-\r\n-<b>What to do:<\/b>\r\n-Use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT.\r\n-Let the library select the optimal memory type, which will always have `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufCreateInfo.size = 65536;\r\n-bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n-\r\n-VkBuffer buf;\r\n-VmaAllocation alloc;\r\n-VmaAllocationInfo allocInfo;\r\n-vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\r\n-\r\n-...\r\n-\r\n-memcpy(allocInfo.pMappedData, myData, myDataSize);\r\n-\\endcode\r\n-\r\n-<b>Also consider:<\/b>\r\n-You can map the allocation using vmaMapMemory() or you can create it as persistenly mapped\r\n-using #VMA_ALLOCATION_CREATE_MAPPED_BIT, as in the example above.\r\n-\r\n-\r\n-\\section usage_patterns_readback Readback\r\n-\r\n-<b>When:<\/b>\r\n-Buffers for data written by or transferred from the GPU that you want to read back on the CPU,\r\n-e.g. results of some computations.\r\n-\r\n-<b>What to do:<\/b>\r\n-Use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\r\n-Let the library select the optimal memory type, which will always have `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`\r\n-and `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufCreateInfo.size = 65536;\r\n-bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT |\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n-\r\n-VkBuffer buf;\r\n-VmaAllocation alloc;\r\n-VmaAllocationInfo allocInfo;\r\n-vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\r\n-\r\n-...\r\n-\r\n-const float* downloadedData = (const float*)allocInfo.pMappedData;\r\n-\\endcode\r\n-\r\n-\r\n-\\section usage_patterns_advanced_data_uploading Advanced data uploading\r\n-\r\n-For resources that you frequently write on CPU via mapped pointer and\r\n-freqnently read on GPU e.g. as a uniform buffer (also called \"dynamic\"), multiple options are possible:\r\n-\r\n--# Easiest solution is to have one copy of the resource in `HOST_VISIBLE` memory,\r\n- even if it means system RAM (not `DEVICE_LOCAL`) on systems with a discrete graphics card,\r\n- and make the device reach out to that resource directly.\r\n- - Reads performed by the device will then go through PCI Express bus.\r\n- The performace of this access may be limited, but it may be fine depending on the size\r\n- of this resource (whether it is small enough to quickly end up in GPU cache) and the sparsity\r\n- of access.\r\n--# On systems with unified memory (e.g. AMD APU or Intel integrated graphics, mobile chips),\r\n- a memory type may be available that is both `HOST_VISIBLE` (available for mapping) and `DEVICE_LOCAL`\r\n- (fast to access from the GPU). Then, it is likely the best choice for such type of resource.\r\n--# Systems with a discrete graphics card and separate video memory may or may not expose\r\n- a memory type that is both `HOST_VISIBLE` and `DEVICE_LOCAL`, also known as Base Address Register (BAR).\r\n- If they do, it represents a piece of VRAM (or entire VRAM, if ReBAR is enabled in the motherboard BIOS)\r\n- that is available to CPU for mapping.\r\n- - Writes performed by the host to that memory go through PCI Express bus.\r\n- The performance of these writes may be limited, but it may be fine, especially on PCIe 4.0,\r\n- as long as rules of using uncached and write-combined memory are followed - only sequential writes and no reads.\r\n--# Finally, you may need or prefer to create a separate copy of the resource in `DEVICE_LOCAL` memory,\r\n- a separate \"staging\" copy in `HOST_VISIBLE` memory and perform an explicit transfer command between them.\r\n-\r\n-Thankfully, VMA offers an aid to create and use such resources in the the way optimal\r\n-for the current Vulkan device. To help the library make the best choice,\r\n-use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT together with\r\n-#VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT.\r\n-It will then prefer a memory type that is both `DEVICE_LOCAL` and `HOST_VISIBLE` (integrated memory or BAR),\r\n-but if no such memory type is available or allocation from it fails\r\n-(PC graphics cards have only 256 MB of BAR by default, unless ReBAR is supported and enabled in BIOS),\r\n-it will fall back to `DEVICE_LOCAL` memory for fast GPU access.\r\n-It is then up to you to detect that the allocation ended up in a memory type that is not `HOST_VISIBLE`,\r\n-so you need to create another \"staging\" allocation and perform explicit transfers.\r\n-\r\n-\\code\r\n-VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n-bufCreateInfo.size = 65536;\r\n-bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\r\n- \r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\r\n- VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT |\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n- \r\n-VkBuffer buf;\r\n-VmaAllocation alloc;\r\n-VmaAllocationInfo allocInfo;\r\n-vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\r\n-\r\n-VkMemoryPropertyFlags memPropFlags;\r\n-vmaGetAllocationMemoryProperties(allocator, alloc, &memPropFlags);\r\n-\r\n-if(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)\r\n-{\r\n- \/\/ Allocation ended up in a mappable memory and is already mapped - write to it directly.\r\n-\r\n- \/\/ [Executed in runtime]:\r\n- memcpy(allocInfo.pMappedData, myData, myDataSize);\r\n-}\r\n-else\r\n-{\r\n- \/\/ Allocation ended up in a non-mappable memory - need to transfer.\r\n- VkBufferCreateInfo stagingBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\r\n- stagingBufCreateInfo.size = 65536;\r\n- stagingBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\r\n-\r\n- VmaAllocationCreateInfo stagingAllocCreateInfo = {};\r\n- stagingAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n- stagingAllocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\r\n- VMA_ALLOCATION_CREATE_MAPPED_BIT;\r\n-\r\n- VkBuffer stagingBuf;\r\n- VmaAllocation stagingAlloc;\r\n- VmaAllocationInfo stagingAllocInfo;\r\n- vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo,\r\n- &stagingBuf, &stagingAlloc, stagingAllocInfo);\r\n-\r\n- \/\/ [Executed in runtime]:\r\n- memcpy(stagingAllocInfo.pMappedData, myData, myDataSize);\r\n- \/\/vkCmdPipelineBarrier: VK_ACCESS_HOST_WRITE_BIT --> VK_ACCESS_TRANSFER_READ_BIT\r\n- VkBufferCopy bufCopy = {\r\n- 0, \/\/ srcOffset\r\n- 0, \/\/ dstOffset,\r\n- myDataSize); \/\/ size\r\n- vkCmdCopyBuffer(cmdBuf, stagingBuf, buf, 1, &bufCopy);\r\n-}\r\n-\\endcode\r\n-\r\n-\\section usage_patterns_other_use_cases Other use cases\r\n-\r\n-Here are some other, less obvious use cases and their recommended settings:\r\n-\r\n-- An image that is used only as transfer source and destination, but it should stay on the device,\r\n- as it is used to temporarily store a copy of some texture, e.g. from the current to the next frame,\r\n- for temporal antialiasing or other temporal effects.\r\n- - Use `VkImageCreateInfo::usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT`\r\n- - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO\r\n-- An image that is used only as transfer source and destination, but it should be placed\r\n- in the system RAM despite it doesn't need to be mapped, because it serves as a \"swap\" copy to evict\r\n- least recently used textures from VRAM.\r\n- - Use `VkImageCreateInfo::usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT`\r\n- - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO_PREFER_HOST,\r\n- as VMA needs a hint here to differentiate from the previous case.\r\n-- A buffer that you want to map and write from the CPU, directly read from the GPU\r\n- (e.g. as a uniform or vertex buffer), but you have a clear preference to place it in device or\r\n- host memory due to its large size.\r\n- - Use `VkBufferCreateInfo::usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT`\r\n- - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE or #VMA_MEMORY_USAGE_AUTO_PREFER_HOST\r\n- - Use VmaAllocationCreateInfo::flags = #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT\r\n-\r\n-\r\n-\\page configuration Configuration\r\n-\r\n-Please check \"CONFIGURATION SECTION\" in the code to find macros that you can define\r\n-before each include of this file or change directly in this file to provide\r\n-your own implementation of basic facilities like assert, `min()` and `max()` functions,\r\n-mutex, atomic etc.\r\n-The library uses its own implementation of containers by default, but you can switch to using\r\n-STL containers instead.\r\n-\r\n-For example, define `VMA_ASSERT(expr)` before including the library to provide\r\n-custom implementation of the assertion, compatible with your project.\r\n-By default it is defined to standard C `assert(expr)` in `_DEBUG` configuration\r\n-and empty otherwise.\r\n-\r\n-\\section config_Vulkan_functions Pointers to Vulkan functions\r\n-\r\n-There are multiple ways to import pointers to Vulkan functions in the library.\r\n-In the simplest case you don't need to do anything.\r\n-If the compilation or linking of your program or the initialization of the #VmaAllocator\r\n-doesn't work for you, you can try to reconfigure it.\r\n-\r\n-First, the allocator tries to fetch pointers to Vulkan functions linked statically,\r\n-like this:\r\n-\r\n-\\code\r\n-m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;\r\n-\\endcode\r\n-\r\n-If you want to disable this feature, set configuration macro: `#define VMA_STATIC_VULKAN_FUNCTIONS 0`.\r\n-\r\n-Second, you can provide the pointers yourself by setting member VmaAllocatorCreateInfo::pVulkanFunctions.\r\n-You can fetch them e.g. using functions `vkGetInstanceProcAddr` and `vkGetDeviceProcAddr` or\r\n-by using a helper library like [volk](https:\/\/github.com\/zeux\/volk).\r\n-\r\n-Third, VMA tries to fetch remaining pointers that are still null by calling\r\n-`vkGetInstanceProcAddr` and `vkGetDeviceProcAddr` on its own.\r\n-You need to only fill in VmaVulkanFunctions::vkGetInstanceProcAddr and VmaVulkanFunctions::vkGetDeviceProcAddr.\r\n-Other pointers will be fetched automatically.\r\n-If you want to disable this feature, set configuration macro: `#define VMA_DYNAMIC_VULKAN_FUNCTIONS 0`.\r\n-\r\n-Finally, all the function pointers required by the library (considering selected\r\n-Vulkan version and enabled extensions) are checked with `VMA_ASSERT` if they are not null.\r\n-\r\n-\r\n-\\section custom_memory_allocator Custom host memory allocator\r\n-\r\n-If you use custom allocator for CPU memory rather than default operator `new`\r\n-and `delete` from C++, you can make this library using your allocator as well\r\n-by filling optional member VmaAllocatorCreateInfo::pAllocationCallbacks. These\r\n-functions will be passed to Vulkan, as well as used by the library itself to\r\n-make any CPU-side allocations.\r\n-\r\n-\\section allocation_callbacks Device memory allocation callbacks\r\n-\r\n-The library makes calls to `vkAllocateMemory()` and `vkFreeMemory()` internally.\r\n-You can setup callbacks to be informed about these calls, e.g. for the purpose\r\n-of gathering some statistics. To do it, fill optional member\r\n-VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.\r\n-\r\n-\\section heap_memory_limit Device heap memory limit\r\n-\r\n-When device memory of certain heap runs out of free space, new allocations may\r\n-fail (returning error code) or they may succeed, silently pushing some existing_\r\n-memory blocks from GPU VRAM to system RAM (which degrades performance). This\r\n-behavior is implementation-dependent - it depends on GPU vendor and graphics\r\n-driver.\r\n-\r\n-On AMD cards it can be controlled while creating Vulkan device object by using\r\n-VK_AMD_memory_overallocation_behavior extension, if available.\r\n-\r\n-Alternatively, if you want to test how your program behaves with limited amount of Vulkan device\r\n-memory available without switching your graphics card to one that really has\r\n-smaller VRAM, you can use a feature of this library intended for this purpose.\r\n-To do it, fill optional member VmaAllocatorCreateInfo::pHeapSizeLimit.\r\n-\r\n-\r\n-\r\n-\\page vk_khr_dedicated_allocation VK_KHR_dedicated_allocation\r\n-\r\n-VK_KHR_dedicated_allocation is a Vulkan extension which can be used to improve\r\n-performance on some GPUs. It augments Vulkan API with possibility to query\r\n-driver whether it prefers particular buffer or image to have its own, dedicated\r\n-allocation (separate `VkDeviceMemory` block) for better efficiency - to be able\r\n-to do some internal optimizations. The extension is supported by this library.\r\n-It will be used automatically when enabled.\r\n-\r\n-It has been promoted to core Vulkan 1.1, so if you use eligible Vulkan version\r\n-and inform VMA about it by setting VmaAllocatorCreateInfo::vulkanApiVersion,\r\n-you are all set.\r\n-\r\n-Otherwise, if you want to use it as an extension:\r\n-\r\n-1 . When creating Vulkan device, check if following 2 device extensions are\r\n-supported (call `vkEnumerateDeviceExtensionProperties()`).\r\n-If yes, enable them (fill `VkDeviceCreateInfo::ppEnabledExtensionNames`).\r\n-\r\n-- VK_KHR_get_memory_requirements2\r\n-- VK_KHR_dedicated_allocation\r\n-\r\n-If you enabled these extensions:\r\n-\r\n-2 . Use #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag when creating\r\n-your #VmaAllocator to inform the library that you enabled required extensions\r\n-and you want the library to use them.\r\n-\r\n-\\code\r\n-allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;\r\n-\r\n-vmaCreateAllocator(&allocatorInfo, &allocator);\r\n-\\endcode\r\n-\r\n-That is all. The extension will be automatically used whenever you create a\r\n-buffer using vmaCreateBuffer() or image using vmaCreateImage().\r\n-\r\n-When using the extension together with Vulkan Validation Layer, you will receive\r\n-warnings like this:\r\n-\r\n-_vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequirements() has not been called on that buffer._\r\n-\r\n-It is OK, you should just ignore it. It happens because you use function\r\n-`vkGetBufferMemoryRequirements2KHR()` instead of standard\r\n-`vkGetBufferMemoryRequirements()`, while the validation layer seems to be\r\n-unaware of it.\r\n-\r\n-To learn more about this extension, see:\r\n-\r\n-- [VK_KHR_dedicated_allocation in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/html\/chap50.html#VK_KHR_dedicated_allocation)\r\n-- [VK_KHR_dedicated_allocation unofficial manual](http:\/\/asawicki.info\/articles\/VK_KHR_dedicated_allocation.php5)\r\n-\r\n-\r\n-\r\n-\\page vk_ext_memory_priority VK_EXT_memory_priority\r\n-\r\n-VK_EXT_memory_priority is a device extension that allows to pass additional \"priority\"\r\n-value to Vulkan memory allocations that the implementation may use prefer certain\r\n-buffers and images that are critical for performance to stay in device-local memory\r\n-in cases when the memory is over-subscribed, while some others may be moved to the system memory.\r\n-\r\n-VMA offers convenient usage of this extension.\r\n-If you enable it, you can pass \"priority\" parameter when creating allocations or custom pools\r\n-and the library automatically passes the value to Vulkan using this extension.\r\n-\r\n-If you want to use this extension in connection with VMA, follow these steps:\r\n-\r\n-\\section vk_ext_memory_priority_initialization Initialization\r\n-\r\n-1) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\r\n-Check if the extension is supported - if returned array of `VkExtensionProperties` contains \"VK_EXT_memory_priority\".\r\n-\r\n-2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\r\n-Attach additional structure `VkPhysicalDeviceMemoryPriorityFeaturesEXT` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\r\n-Check if the device feature is really supported - check if `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority` is true.\r\n-\r\n-3) While creating device with `vkCreateDevice`, enable this extension - add \"VK_EXT_memory_priority\"\r\n-to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\r\n-\r\n-4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\r\n-Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\r\n-Enable this device feature - attach additional structure `VkPhysicalDeviceMemoryPriorityFeaturesEXT` to\r\n-`VkPhysicalDeviceFeatures2::pNext` chain and set its member `memoryPriority` to `VK_TRUE`.\r\n-\r\n-5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\r\n-have enabled this extension and feature - add #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT\r\n-to VmaAllocatorCreateInfo::flags.\r\n-\r\n-\\section vk_ext_memory_priority_usage Usage\r\n-\r\n-When using this extension, you should initialize following member:\r\n-\r\n-- VmaAllocationCreateInfo::priority when creating a dedicated allocation with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n-- VmaPoolCreateInfo::priority when creating a custom pool.\r\n-\r\n-It should be a floating-point value between `0.0f` and `1.0f`, where recommended default is `0.5f`.\r\n-Memory allocated with higher value can be treated by the Vulkan implementation as higher priority\r\n-and so it can have lower chances of being pushed out to system memory, experiencing degraded performance.\r\n-\r\n-It might be a good idea to create performance-critical resources like color-attachment or depth-stencil images\r\n-as dedicated and set high priority to them. For example:\r\n-\r\n-\\code\r\n-VkImageCreateInfo imgCreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\r\n-imgCreateInfo.imageType = VK_IMAGE_TYPE_2D;\r\n-imgCreateInfo.extent.width = 3840;\r\n-imgCreateInfo.extent.height = 2160;\r\n-imgCreateInfo.extent.depth = 1;\r\n-imgCreateInfo.mipLevels = 1;\r\n-imgCreateInfo.arrayLayers = 1;\r\n-imgCreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\r\n-imgCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\r\n-imgCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\r\n-imgCreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\r\n-imgCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\r\n-\r\n-VmaAllocationCreateInfo allocCreateInfo = {};\r\n-allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\r\n-allocCreateInfo.flags = VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\r\n-allocCreateInfo.priority = 1.0f;\r\n-\r\n-VkImage img;\r\n-VmaAllocation alloc;\r\n-vmaCreateImage(allocator, &imgCreateInfo, &allocCreateInfo, &img, &alloc, nullptr);\r\n-\\endcode\r\n-\r\n-`priority` member is ignored in the following situations:\r\n-\r\n-- Allocations created in custom pools: They inherit the priority, along with all other allocation parameters\r\n- from the parametrs passed in #VmaPoolCreateInfo when the pool was created.\r\n-- Allocations created in default pools: They inherit the priority from the parameters\r\n- VMA used when creating default pools, which means `priority == 0.5f`.\r\n-\r\n-\r\n-\\page vk_amd_device_coherent_memory VK_AMD_device_coherent_memory\r\n-\r\n-VK_AMD_device_coherent_memory is a device extension that enables access to\r\n-additional memory types with `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and\r\n-`VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flag. It is useful mostly for\r\n-allocation of buffers intended for writing \"breadcrumb markers\" in between passes\r\n-or draw calls, which in turn are useful for debugging GPU crash\/hang\/TDR cases.\r\n-\r\n-When the extension is available but has not been enabled, Vulkan physical device\r\n-still exposes those memory types, but their usage is forbidden. VMA automatically\r\n-takes care of that - it returns `VK_ERROR_FEATURE_NOT_PRESENT` when an attempt\r\n-to allocate memory of such type is made.\r\n-\r\n-If you want to use this extension in connection with VMA, follow these steps:\r\n-\r\n-\\section vk_amd_device_coherent_memory_initialization Initialization\r\n-\r\n-1) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\r\n-Check if the extension is supported - if returned array of `VkExtensionProperties` contains \"VK_AMD_device_coherent_memory\".\r\n-\r\n-2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\r\n-Attach additional structure `VkPhysicalDeviceCoherentMemoryFeaturesAMD` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\r\n-Check if the device feature is really supported - check if `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true.\r\n-\r\n-3) While creating device with `vkCreateDevice`, enable this extension - add \"VK_AMD_device_coherent_memory\"\r\n-to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\r\n-\r\n-4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\r\n-Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\r\n-Enable this device feature - attach additional structure `VkPhysicalDeviceCoherentMemoryFeaturesAMD` to\r\n-`VkPhysicalDeviceFeatures2::pNext` and set its member `deviceCoherentMemory` to `VK_TRUE`.\r\n-\r\n-5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\r\n-have enabled this extension and feature - add #VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT\r\n-to VmaAllocatorCreateInfo::flags.\r\n-\r\n-\\section vk_amd_device_coherent_memory_usage Usage\r\n-\r\n-After following steps described above, you can create VMA allocations and custom pools\r\n-out of the special `DEVICE_COHERENT` and `DEVICE_UNCACHED` memory types on eligible\r\n-devices. There are multiple ways to do it, for example:\r\n-\r\n-- You can request or prefer to allocate out of such memory types by adding\r\n- `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` to VmaAllocationCreateInfo::requiredFlags\r\n- or VmaAllocationCreateInfo::preferredFlags. Those flags can be freely mixed with\r\n- other ways of \\ref choosing_memory_type, like setting VmaAllocationCreateInfo::usage.\r\n-- If you manually found memory type index to use for this purpose, force allocation\r\n- from this specific index by setting VmaAllocationCreateInfo::memoryTypeBits `= 1u << index`.\r\n-\r\n-\\section vk_amd_device_coherent_memory_more_information More information\r\n-\r\n-To learn more about this extension, see [VK_AMD_device_coherent_memory in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/man\/html\/VK_AMD_device_coherent_memory.html)\r\n-\r\n-Example use of this extension can be found in the code of the sample and test suite\r\n-accompanying this library.\r\n-\r\n-\r\n-\\page enabling_buffer_device_address Enabling buffer device address\r\n-\r\n-Device extension VK_KHR_buffer_device_address\r\n-allow to fetch raw GPU pointer to a buffer and pass it for usage in a shader code.\r\n-It has been promoted to core Vulkan 1.2.\r\n-\r\n-If you want to use this feature in connection with VMA, follow these steps:\r\n-\r\n-\\section enabling_buffer_device_address_initialization Initialization\r\n-\r\n-1) (For Vulkan version < 1.2) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\r\n-Check if the extension is supported - if returned array of `VkExtensionProperties` contains\r\n-\"VK_KHR_buffer_device_address\".\r\n-\r\n-2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\r\n-Attach additional structure `VkPhysicalDeviceBufferDeviceAddressFeatures*` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\r\n-Check if the device feature is really supported - check if `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress` is true.\r\n-\r\n-3) (For Vulkan version < 1.2) While creating device with `vkCreateDevice`, enable this extension - add\r\n-\"VK_KHR_buffer_device_address\" to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\r\n-\r\n-4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\r\n-Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\r\n-Enable this device feature - attach additional structure `VkPhysicalDeviceBufferDeviceAddressFeatures*` to\r\n-`VkPhysicalDeviceFeatures2::pNext` and set its member `bufferDeviceAddress` to `VK_TRUE`.\r\n-\r\n-5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\r\n-have enabled this feature - add #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT\r\n-to VmaAllocatorCreateInfo::flags.\r\n-\r\n-\\section enabling_buffer_device_address_usage Usage\r\n-\r\n-After following steps described above, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT*` using VMA.\r\n-The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT*` to\r\n-allocated memory blocks wherever it might be needed.\r\n-\r\n-Please note that the library supports only `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT*`.\r\n-The second part of this functionality related to \"capture and replay\" is not supported,\r\n-as it is intended for usage in debugging tools like RenderDoc, not in everyday Vulkan usage.\r\n-\r\n-\\section enabling_buffer_device_address_more_information More information\r\n-\r\n-To learn more about this extension, see [VK_KHR_buffer_device_address in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/html\/chap46.html#VK_KHR_buffer_device_address)\r\n-\r\n-Example use of this extension can be found in the code of the sample and test suite\r\n-accompanying this library.\r\n-\r\n-\\page general_considerations General considerations\r\n-\r\n-\\section general_considerations_thread_safety Thread safety\r\n-\r\n-- The library has no global state, so separate #VmaAllocator objects can be used\r\n- independently.\r\n- There should be no need to create multiple such objects though - one per `VkDevice` is enough.\r\n-- By default, all calls to functions that take #VmaAllocator as first parameter\r\n- are safe to call from multiple threads simultaneously because they are\r\n- synchronized internally when needed.\r\n- This includes allocation and deallocation from default memory pool, as well as custom #VmaPool.\r\n-- When the allocator is created with #VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT\r\n- flag, calls to functions that take such #VmaAllocator object must be\r\n- synchronized externally.\r\n-- Access to a #VmaAllocation object must be externally synchronized. For example,\r\n- you must not call vmaGetAllocationInfo() and vmaMapMemory() from different\r\n- threads at the same time if you pass the same #VmaAllocation object to these\r\n- functions.\r\n-- #VmaVirtualBlock is not safe to be used from multiple threads simultaneously.\r\n-\r\n-\\section general_considerations_versioning_and_compatibility Versioning and compatibility\r\n-\r\n-The library uses [**Semantic Versioning**](https:\/\/semver.org\/),\r\n-which means version numbers follow convention: Major.Minor.Patch (e.g. 2.3.0), where:\r\n-\r\n-- Incremented Patch version means a release is backward- and forward-compatible,\r\n- introducing only some internal improvements, bug fixes, optimizations etc.\r\n- or changes that are out of scope of the official API described in this documentation.\r\n-- Incremented Minor version means a release is backward-compatible,\r\n- so existing code that uses the library should continue to work, while some new\r\n- symbols could have been added: new structures, functions, new values in existing\r\n- enums and bit flags, new structure members, but not new function parameters.\r\n-- Incrementing Major version means a release could break some backward compatibility.\r\n-\r\n-All changes between official releases are documented in file \"CHANGELOG.md\".\r\n-\r\n-\\warning Backward compatiblity is considered on the level of C++ source code, not binary linkage.\r\n-Adding new members to existing structures is treated as backward compatible if initializing\r\n-the new members to binary zero results in the old behavior.\r\n-You should always fully initialize all library structures to zeros and not rely on their\r\n-exact binary size.\r\n-\r\n-\\section general_considerations_validation_layer_warnings Validation layer warnings\r\n-\r\n-When using this library, you can meet following types of warnings issued by\r\n-Vulkan validation layer. They don't necessarily indicate a bug, so you may need\r\n-to just ignore them.\r\n-\r\n-- *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.*\r\n- - It happens when VK_KHR_dedicated_allocation extension is enabled.\r\n- `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it.\r\n-- *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.*\r\n- - It happens when you map a buffer or image, because the library maps entire\r\n- `VkDeviceMemory` block, where different types of images and buffers may end\r\n- up together, especially on GPUs with unified memory like Intel.\r\n-- *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.*\r\n- - It may happen when you use [defragmentation](@ref defragmentation).\r\n-\r\n-\\section general_considerations_allocation_algorithm Allocation algorithm\r\n-\r\n-The library uses following algorithm for allocation, in order:\r\n-\r\n--# Try to find free range of memory in existing blocks.\r\n--# If failed, try to create a new block of `VkDeviceMemory`, with preferred block size.\r\n--# If failed, try to create such block with size \/ 2, size \/ 4, size \/ 8.\r\n--# If failed, try to allocate separate `VkDeviceMemory` for this allocation,\r\n- just like when you use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\r\n--# If failed, choose other memory type that meets the requirements specified in\r\n- VmaAllocationCreateInfo and go to point 1.\r\n--# If failed, return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\r\n-\r\n-\\section general_considerations_features_not_supported Features not supported\r\n-\r\n-Features deliberately excluded from the scope of this library:\r\n-\r\n--# **Data transfer.** Uploading (streaming) and downloading data of buffers and images\r\n- between CPU and GPU memory and related synchronization is responsibility of the user.\r\n- Defining some \"texture\" object that would automatically stream its data from a\r\n- staging copy in CPU memory to GPU memory would rather be a feature of another,\r\n- higher-level library implemented on top of VMA.\r\n- VMA doesn't record any commands to a `VkCommandBuffer`. It just allocates memory.\r\n--# **Recreation of buffers and images.** Although the library has functions for\r\n- buffer and image creation: vmaCreateBuffer(), vmaCreateImage(), you need to\r\n- recreate these objects yourself after defragmentation. That is because the big\r\n- structures `VkBufferCreateInfo`, `VkImageCreateInfo` are not stored in\r\n- #VmaAllocation object.\r\n--# **Handling CPU memory allocation failures.** When dynamically creating small C++\r\n- objects in CPU memory (not Vulkan memory), allocation failures are not checked\r\n- and handled gracefully, because that would complicate code significantly and\r\n- is usually not needed in desktop PC applications anyway.\r\n- Success of an allocation is just checked with an assert.\r\n--# **Code free of any compiler warnings.** Maintaining the library to compile and\r\n- work correctly on so many different platforms is hard enough. Being free of\r\n- any warnings, on any version of any compiler, is simply not feasible.\r\n- There are many preprocessor macros that make some variables unused, function parameters unreferenced,\r\n- or conditional expressions constant in some configurations.\r\n- The code of this library should not be bigger or more complicated just to silence these warnings.\r\n- It is recommended to disable such warnings instead.\r\n--# This is a C++ library with C interface. **Bindings or ports to any other programming languages** are welcome as external projects but\r\n- are not going to be included into this repository.\r\n-*\/\r\n+\/\/\n+\/\/ Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved.\n+\/\/\n+\/\/ Permission is hereby granted, free of charge, to any person obtaining a copy\n+\/\/ of this software and associated documentation files (the \"Software\"), to deal\n+\/\/ in the Software without restriction, including without limitation the rights\n+\/\/ to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\n+\/\/ copies of the Software, and to permit persons to whom the Software is\n+\/\/ furnished to do so, subject to the following conditions:\n+\/\/\n+\/\/ The above copyright notice and this permission notice shall be included in\n+\/\/ all copies or substantial portions of the Software.\n+\/\/\n+\/\/ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+\/\/ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+\/\/ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+\/\/ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+\/\/ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+\/\/ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+\/\/ THE SOFTWARE.\n+\/\/\n+\n+#ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H\n+#define AMD_VULKAN_MEMORY_ALLOCATOR_H\n+\n+\/** \\mainpage Vulkan Memory Allocator\n+\n+<b>Version 3.0.0-development<\/b>\n+\n+Copyright (c) 2017-2022 Advanced Micro Devices, Inc. All rights reserved. \\n\n+License: MIT\n+\n+<b>API documentation divided into groups:<\/b> [Modules](modules.html)\n+\n+\\section main_table_of_contents Table of contents\n+\n+- <b>User guide<\/b>\n+ - \\subpage quick_start\n+ - [Project setup](@ref quick_start_project_setup)\n+ - [Initialization](@ref quick_start_initialization)\n+ - [Resource allocation](@ref quick_start_resource_allocation)\n+ - \\subpage choosing_memory_type\n+ - [Usage](@ref choosing_memory_type_usage)\n+ - [Required and preferred flags](@ref choosing_memory_type_required_preferred_flags)\n+ - [Explicit memory types](@ref choosing_memory_type_explicit_memory_types)\n+ - [Custom memory pools](@ref choosing_memory_type_custom_memory_pools)\n+ - [Dedicated allocations](@ref choosing_memory_type_dedicated_allocations)\n+ - \\subpage memory_mapping\n+ - [Mapping functions](@ref memory_mapping_mapping_functions)\n+ - [Persistently mapped memory](@ref memory_mapping_persistently_mapped_memory)\n+ - [Cache flush and invalidate](@ref memory_mapping_cache_control)\n+ - \\subpage staying_within_budget\n+ - [Querying for budget](@ref staying_within_budget_querying_for_budget)\n+ - [Controlling memory usage](@ref staying_within_budget_controlling_memory_usage)\n+ - \\subpage resource_aliasing\n+ - \\subpage custom_memory_pools\n+ - [Choosing memory type index](@ref custom_memory_pools_MemTypeIndex)\n+ - [Linear allocation algorithm](@ref linear_algorithm)\n+ - [Free-at-once](@ref linear_algorithm_free_at_once)\n+ - [Stack](@ref linear_algorithm_stack)\n+ - [Double stack](@ref linear_algorithm_double_stack)\n+ - [Ring buffer](@ref linear_algorithm_ring_buffer)\n+ - \\subpage defragmentation\n+ - \\subpage statistics\n+ - [Numeric statistics](@ref statistics_numeric_statistics)\n+ - [JSON dump](@ref statistics_json_dump)\n+ - \\subpage allocation_annotation\n+ - [Allocation user data](@ref allocation_user_data)\n+ - [Allocation names](@ref allocation_names)\n+ - \\subpage virtual_allocator\n+ - \\subpage debugging_memory_usage\n+ - [Memory initialization](@ref debugging_memory_usage_initialization)\n+ - [Margins](@ref debugging_memory_usage_margins)\n+ - [Corruption detection](@ref debugging_memory_usage_corruption_detection)\n+ - \\subpage opengl_interop\n+- \\subpage usage_patterns\n+ - [GPU-only resource](@ref usage_patterns_gpu_only)\n+ - [Staging copy for upload](@ref usage_patterns_staging_copy_upload)\n+ - [Readback](@ref usage_patterns_readback)\n+ - [Advanced data uploading](@ref usage_patterns_advanced_data_uploading)\n+ - [Other use cases](@ref usage_patterns_other_use_cases)\n+- \\subpage configuration\n+ - [Pointers to Vulkan functions](@ref config_Vulkan_functions)\n+ - [Custom host memory allocator](@ref custom_memory_allocator)\n+ - [Device memory allocation callbacks](@ref allocation_callbacks)\n+ - [Device heap memory limit](@ref heap_memory_limit)\n+- <b>Extension support<\/b>\n+ - \\subpage vk_khr_dedicated_allocation\n+ - \\subpage enabling_buffer_device_address\n+ - \\subpage vk_ext_memory_priority\n+ - \\subpage vk_amd_device_coherent_memory\n+- \\subpage general_considerations\n+ - [Thread safety](@ref general_considerations_thread_safety)\n+ - [Versioning and compatibility](@ref general_considerations_versioning_and_compatibility)\n+ - [Validation layer warnings](@ref general_considerations_validation_layer_warnings)\n+ - [Allocation algorithm](@ref general_considerations_allocation_algorithm)\n+ - [Features not supported](@ref general_considerations_features_not_supported)\n+\n+\\section main_see_also See also\n+\n+- [**Product page on GPUOpen**](https:\/\/gpuopen.com\/gaming-product\/vulkan-memory-allocator\/)\n+- [**Source repository on GitHub**](https:\/\/github.com\/GPUOpen-LibrariesAndSDKs\/VulkanMemoryAllocator)\n+\n+\\defgroup group_init Library initialization\n+\n+\\brief API elements related to the initialization and management of the entire library, especially #VmaAllocator object.\n+\n+\\defgroup group_alloc Memory allocation\n+\n+\\brief API elements related to the allocation, deallocation, and management of Vulkan memory, buffers, images.\n+Most basic ones being: vmaCreateBuffer(), vmaCreateImage().\n+\n+\\defgroup group_virtual Virtual allocator\n+\n+\\brief API elements related to the mechanism of \\ref virtual_allocator - using the core allocation algorithm\n+for user-defined purpose without allocating any real GPU memory.\n+\n+\\defgroup group_stats Statistics\n+\n+\\brief API elements that query current status of the allocator, from memory usage, budget, to full dump of the internal state in JSON format.\n+See documentation chapter: \\ref statistics.\n+*\/\n+\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+#ifndef VULKAN_H_\n+ #include <vulkan\/vulkan.h>\n+#endif\n+\n+\/\/ Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,\n+\/\/ where AAA = major, BBB = minor, CCC = patch.\n+\/\/ If you want to use version > 1.0, it still needs to be enabled via VmaAllocatorCreateInfo::vulkanApiVersion.\n+#if !defined(VMA_VULKAN_VERSION)\n+ #if defined(VK_VERSION_1_3)\n+ #define VMA_VULKAN_VERSION 1003000\n+ #elif defined(VK_VERSION_1_2)\n+ #define VMA_VULKAN_VERSION 1002000\n+ #elif defined(VK_VERSION_1_1)\n+ #define VMA_VULKAN_VERSION 1001000\n+ #else\n+ #define VMA_VULKAN_VERSION 1000000\n+ #endif\n+#endif\n+\n+#if defined(__ANDROID__) && defined(VK_NO_PROTOTYPES) && VMA_STATIC_VULKAN_FUNCTIONS\n+ extern PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;\n+ extern PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr;\n+ extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;\n+ extern PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;\n+ extern PFN_vkAllocateMemory vkAllocateMemory;\n+ extern PFN_vkFreeMemory vkFreeMemory;\n+ extern PFN_vkMapMemory vkMapMemory;\n+ extern PFN_vkUnmapMemory vkUnmapMemory;\n+ extern PFN_vkFlushMappedMemoryRanges vkFlushMappedMemoryRanges;\n+ extern PFN_vkInvalidateMappedMemoryRanges vkInvalidateMappedMemoryRanges;\n+ extern PFN_vkBindBufferMemory vkBindBufferMemory;\n+ extern PFN_vkBindImageMemory vkBindImageMemory;\n+ extern PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements;\n+ extern PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements;\n+ extern PFN_vkCreateBuffer vkCreateBuffer;\n+ extern PFN_vkDestroyBuffer vkDestroyBuffer;\n+ extern PFN_vkCreateImage vkCreateImage;\n+ extern PFN_vkDestroyImage vkDestroyImage;\n+ extern PFN_vkCmdCopyBuffer vkCmdCopyBuffer;\n+ #if VMA_VULKAN_VERSION >= 1001000\n+ extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2;\n+ extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2;\n+ extern PFN_vkBindBufferMemory2 vkBindBufferMemory2;\n+ extern PFN_vkBindImageMemory2 vkBindImageMemory2;\n+ extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;\n+ #endif \/\/ #if VMA_VULKAN_VERSION >= 1001000\n+#endif \/\/ #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES\n+\n+#if !defined(VMA_DEDICATED_ALLOCATION)\n+ #if VK_KHR_get_memory_requirements2 && VK_KHR_dedicated_allocation\n+ #define VMA_DEDICATED_ALLOCATION 1\n+ #else\n+ #define VMA_DEDICATED_ALLOCATION 0\n+ #endif\n+#endif\n+\n+#if !defined(VMA_BIND_MEMORY2)\n+ #if VK_KHR_bind_memory2\n+ #define VMA_BIND_MEMORY2 1\n+ #else\n+ #define VMA_BIND_MEMORY2 0\n+ #endif\n+#endif\n+\n+#if !defined(VMA_MEMORY_BUDGET)\n+ #if VK_EXT_memory_budget && (VK_KHR_get_physical_device_properties2 || VMA_VULKAN_VERSION >= 1001000)\n+ #define VMA_MEMORY_BUDGET 1\n+ #else\n+ #define VMA_MEMORY_BUDGET 0\n+ #endif\n+#endif\n+\n+\/\/ Defined to 1 when VK_KHR_buffer_device_address device extension or equivalent core Vulkan 1.2 feature is defined in its headers.\n+#if !defined(VMA_BUFFER_DEVICE_ADDRESS)\n+ #if VK_KHR_buffer_device_address || VMA_VULKAN_VERSION >= 1002000\n+ #define VMA_BUFFER_DEVICE_ADDRESS 1\n+ #else\n+ #define VMA_BUFFER_DEVICE_ADDRESS 0\n+ #endif\n+#endif\n+\n+\/\/ Defined to 1 when VK_EXT_memory_priority device extension is defined in Vulkan headers.\n+#if !defined(VMA_MEMORY_PRIORITY)\n+ #if VK_EXT_memory_priority\n+ #define VMA_MEMORY_PRIORITY 1\n+ #else\n+ #define VMA_MEMORY_PRIORITY 0\n+ #endif\n+#endif\n+\n+\/\/ Defined to 1 when VK_KHR_external_memory device extension is defined in Vulkan headers.\n+#if !defined(VMA_EXTERNAL_MEMORY)\n+ #if VK_KHR_external_memory\n+ #define VMA_EXTERNAL_MEMORY 1\n+ #else\n+ #define VMA_EXTERNAL_MEMORY 0\n+ #endif\n+#endif\n+\n+\/\/ Define these macros to decorate all public functions with additional code,\n+\/\/ before and after returned type, appropriately. This may be useful for\n+\/\/ exporting the functions when compiling VMA as a separate library. Example:\n+\/\/ #define VMA_CALL_PRE __declspec(dllexport)\n+\/\/ #define VMA_CALL_POST __cdecl\n+#ifndef VMA_CALL_PRE\n+ #define VMA_CALL_PRE\n+#endif\n+#ifndef VMA_CALL_POST\n+ #define VMA_CALL_POST\n+#endif\n+\n+\/\/ Define this macro to decorate pointers with an attribute specifying the\n+\/\/ length of the array they point to if they are not null.\n+\/\/\n+\/\/ The length may be one of\n+\/\/ - The name of another parameter in the argument list where the pointer is declared\n+\/\/ - The name of another member in the struct where the pointer is declared\n+\/\/ - The name of a member of a struct type, meaning the value of that member in\n+\/\/ the context of the call. For example\n+\/\/ VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\"),\n+\/\/ this means the number of memory heaps available in the device associated\n+\/\/ with the VmaAllocator being dealt with.\n+#ifndef VMA_LEN_IF_NOT_NULL\n+ #define VMA_LEN_IF_NOT_NULL(len)\n+#endif\n+\n+\/\/ The VMA_NULLABLE macro is defined to be _Nullable when compiling with Clang.\n+\/\/ see: https:\/\/clang.llvm.org\/docs\/AttributeReference.html#nullable\n+#ifndef VMA_NULLABLE\n+ #ifdef __clang__\n+ #define VMA_NULLABLE _Nullable\n+ #else\n+ #define VMA_NULLABLE\n+ #endif\n+#endif\n+\n+\/\/ The VMA_NOT_NULL macro is defined to be _Nonnull when compiling with Clang.\n+\/\/ see: https:\/\/clang.llvm.org\/docs\/AttributeReference.html#nonnull\n+#ifndef VMA_NOT_NULL\n+ #ifdef __clang__\n+ #define VMA_NOT_NULL _Nonnull\n+ #else\n+ #define VMA_NOT_NULL\n+ #endif\n+#endif\n+\n+\/\/ If non-dispatchable handles are represented as pointers then we can give\n+\/\/ then nullability annotations\n+#ifndef VMA_NOT_NULL_NON_DISPATCHABLE\n+ #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)\n+ #define VMA_NOT_NULL_NON_DISPATCHABLE VMA_NOT_NULL\n+ #else\n+ #define VMA_NOT_NULL_NON_DISPATCHABLE\n+ #endif\n+#endif\n+\n+#ifndef VMA_NULLABLE_NON_DISPATCHABLE\n+ #if defined(__LP64__) || defined(_WIN64) || (defined(__x86_64__) && !defined(__ILP32__) ) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)\n+ #define VMA_NULLABLE_NON_DISPATCHABLE VMA_NULLABLE\n+ #else\n+ #define VMA_NULLABLE_NON_DISPATCHABLE\n+ #endif\n+#endif\n+\n+#ifndef VMA_STATS_STRING_ENABLED\n+ #define VMA_STATS_STRING_ENABLED 1\n+#endif\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ \n+\/\/ INTERFACE\n+\/\/ \n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+\/\/ Sections for managing code placement in file, only for development purposes e.g. for convenient folding inside an IDE.\n+#ifndef _VMA_ENUM_DECLARATIONS\n+\n+\/**\n+\\addtogroup group_init\n+@{\n+*\/\n+\n+\/\/\/ Flags for created #VmaAllocator.\n+typedef enum VmaAllocatorCreateFlagBits\n+{\n+ \/** \\brief Allocator and all objects created from it will not be synchronized internally, so you must guarantee they are used from only one thread at a time or synchronized externally by you.\n+\n+ Using this flag may increase performance because internal mutexes are not used.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT = 0x00000001,\n+ \/** \\brief Enables usage of VK_KHR_dedicated_allocation extension.\n+\n+ The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.\n+ When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.\n+\n+ Using this extension will automatically allocate dedicated blocks of memory for\n+ some buffers and images instead of suballocating place for them out of bigger\n+ memory blocks (as if you explicitly used #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT\n+ flag) when it is recommended by the driver. It may improve performance on some\n+ GPUs.\n+\n+ You may set this flag only if you found out that following device extensions are\n+ supported, you enabled them while creating Vulkan device passed as\n+ VmaAllocatorCreateInfo::device, and you want them to be used internally by this\n+ library:\n+\n+ - VK_KHR_get_memory_requirements2 (device extension)\n+ - VK_KHR_dedicated_allocation (device extension)\n+\n+ When this flag is set, you can experience following warnings reported by Vulkan\n+ validation layer. You can ignore them.\n+\n+ > vkBindBufferMemory(): Binding memory to buffer 0x2d but vkGetBufferMemoryRequirements() has not been called on that buffer.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT = 0x00000002,\n+ \/**\n+ Enables usage of VK_KHR_bind_memory2 extension.\n+\n+ The flag works only if VmaAllocatorCreateInfo::vulkanApiVersion `== VK_API_VERSION_1_0`.\n+ When it is `VK_API_VERSION_1_1`, the flag is ignored because the extension has been promoted to Vulkan 1.1.\n+\n+ You may set this flag only if you found out that this device extension is supported,\n+ you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\n+ and you want it to be used internally by this library.\n+\n+ The extension provides functions `vkBindBufferMemory2KHR` and `vkBindImageMemory2KHR`,\n+ which allow to pass a chain of `pNext` structures while binding.\n+ This flag is required if you use `pNext` parameter in vmaBindBufferMemory2() or vmaBindImageMemory2().\n+ *\/\n+ VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT = 0x00000004,\n+ \/**\n+ Enables usage of VK_EXT_memory_budget extension.\n+\n+ You may set this flag only if you found out that this device extension is supported,\n+ you enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\n+ and you want it to be used internally by this library, along with another instance extension\n+ VK_KHR_get_physical_device_properties2, which is required by it (or Vulkan 1.1, where this extension is promoted).\n+\n+ The extension provides query for current memory usage and budget, which will probably\n+ be more accurate than an estimation used by the library otherwise.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT = 0x00000008,\n+ \/**\n+ Enables usage of VK_AMD_device_coherent_memory extension.\n+\n+ You may set this flag only if you:\n+\n+ - found out that this device extension is supported and enabled it while creating Vulkan device passed as VmaAllocatorCreateInfo::device,\n+ - checked that `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true and set it while creating the Vulkan device,\n+ - want it to be used internally by this library.\n+\n+ The extension and accompanying device feature provide access to memory types with\n+ `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flags.\n+ They are useful mostly for writing breadcrumb markers - a common method for debugging GPU crash\/hang\/TDR.\n+\n+ When the extension is not enabled, such memory types are still enumerated, but their usage is illegal.\n+ To protect from this error, if you don't create the allocator with this flag, it will refuse to allocate any memory or create a custom pool in such memory type,\n+ returning `VK_ERROR_FEATURE_NOT_PRESENT`.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT = 0x00000010,\n+ \/**\n+ Enables usage of \"buffer device address\" feature, which allows you to use function\n+ `vkGetBufferDeviceAddress*` to get raw GPU pointer to a buffer and pass it for usage inside a shader.\n+\n+ You may set this flag only if you:\n+\n+ 1. (For Vulkan version < 1.2) Found as available and enabled device extension\n+ VK_KHR_buffer_device_address.\n+ This extension is promoted to core Vulkan 1.2.\n+ 2. Found as available and enabled device feature `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress`.\n+\n+ When this flag is set, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT` using VMA.\n+ The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT` to\n+ allocated memory blocks wherever it might be needed.\n+\n+ For more information, see documentation chapter \\ref enabling_buffer_device_address.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT = 0x00000020,\n+ \/**\n+ Enables usage of VK_EXT_memory_priority extension in the library.\n+\n+ You may set this flag only if you found available and enabled this device extension,\n+ along with `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority == VK_TRUE`,\n+ while creating Vulkan device passed as VmaAllocatorCreateInfo::device.\n+\n+ When this flag is used, VmaAllocationCreateInfo::priority and VmaPoolCreateInfo::priority\n+ are used to set priorities of allocated Vulkan memory. Without it, these variables are ignored.\n+\n+ A priority must be a floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.\n+ Larger values are higher priority. The granularity of the priorities is implementation-dependent.\n+ It is automatically passed to every call to `vkAllocateMemory` done by the library using structure `VkMemoryPriorityAllocateInfoEXT`.\n+ The value to be used for default priority is 0.5.\n+ For more details, see the documentation of the VK_EXT_memory_priority extension.\n+ *\/\n+ VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT = 0x00000040,\n+\n+ VMA_ALLOCATOR_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaAllocatorCreateFlagBits;\n+\/\/\/ See #VmaAllocatorCreateFlagBits.\n+typedef VkFlags VmaAllocatorCreateFlags;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/\/\/ \\brief Intended usage of the allocated memory.\n+typedef enum VmaMemoryUsage\n+{\n+ \/** No intended memory usage specified.\n+ Use other members of VmaAllocationCreateInfo to specify your requirements.\n+ *\/\n+ VMA_MEMORY_USAGE_UNKNOWN = 0,\n+ \/**\n+ \\deprecated Obsolete, preserved for backward compatibility.\n+ Prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\n+ *\/\n+ VMA_MEMORY_USAGE_GPU_ONLY = 1,\n+ \/**\n+ \\deprecated Obsolete, preserved for backward compatibility.\n+ Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` and `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT`.\n+ *\/\n+ VMA_MEMORY_USAGE_CPU_ONLY = 2,\n+ \/**\n+ \\deprecated Obsolete, preserved for backward compatibility.\n+ Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\n+ *\/\n+ VMA_MEMORY_USAGE_CPU_TO_GPU = 3,\n+ \/**\n+ \\deprecated Obsolete, preserved for backward compatibility.\n+ Guarantees `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`, prefers `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`.\n+ *\/\n+ VMA_MEMORY_USAGE_GPU_TO_CPU = 4,\n+ \/**\n+ \\deprecated Obsolete, preserved for backward compatibility.\n+ Prefers not `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\n+ *\/\n+ VMA_MEMORY_USAGE_CPU_COPY = 5,\n+ \/**\n+ Lazily allocated GPU memory having `VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT`.\n+ Exists mostly on mobile platforms. Using it on desktop PC or other GPUs with no such memory type present will fail the allocation.\n+\n+ Usage: Memory for transient attachment images (color attachments, depth attachments etc.), created with `VK_IMAGE_USAGE_TRANSIENT_ATTACHMENT_BIT`.\n+\n+ Allocations with this usage are always created as dedicated - it implies #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+ *\/\n+ VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED = 6,\n+ \/**\n+ Selects best memory type automatically.\n+ This flag is recommended for most common use cases.\n+\n+ When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\n+ you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\n+ in VmaAllocationCreateInfo::flags.\n+ \n+ It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\n+ vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\n+ and not with generic memory allocation functions.\n+ *\/\n+ VMA_MEMORY_USAGE_AUTO = 7,\n+ \/**\n+ Selects best memory type automatically with preference for GPU (device) memory.\n+\n+ When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\n+ you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\n+ in VmaAllocationCreateInfo::flags.\n+\n+ It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\n+ vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\n+ and not with generic memory allocation functions.\n+ *\/\n+ VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE = 8,\n+ \/**\n+ Selects best memory type automatically with preference for CPU (host) memory.\n+\n+ When using this flag, if you want to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT),\n+ you must pass one of the flags: #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\n+ in VmaAllocationCreateInfo::flags.\n+\n+ It can be used only with functions that let the library know `VkBufferCreateInfo` or `VkImageCreateInfo`, e.g.\n+ vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo()\n+ and not with generic memory allocation functions.\n+ *\/\n+ VMA_MEMORY_USAGE_AUTO_PREFER_HOST = 9,\n+\n+ VMA_MEMORY_USAGE_MAX_ENUM = 0x7FFFFFFF\n+} VmaMemoryUsage;\n+\n+\/\/\/ Flags to be passed as VmaAllocationCreateInfo::flags.\n+typedef enum VmaAllocationCreateFlagBits\n+{\n+ \/** \\brief Set this flag if the allocation should have its own memory block.\n+\n+ Use it for special, big resources, like fullscreen images used as attachments.\n+ *\/\n+ VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT = 0x00000001,\n+\n+ \/** \\brief Set this flag to only try to allocate from existing `VkDeviceMemory` blocks and never create new such block.\n+\n+ If new allocation cannot be placed in any of the existing blocks, allocation\n+ fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` error.\n+\n+ You should not use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT and\n+ #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT at the same time. It makes no sense.\n+ *\/\n+ VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT = 0x00000002,\n+ \/** \\brief Set this flag to use a memory that will be persistently mapped and retrieve pointer to it.\n+\n+ Pointer to mapped memory will be returned through VmaAllocationInfo::pMappedData.\n+\n+ It is valid to use this flag for allocation made from memory type that is not\n+ `HOST_VISIBLE`. This flag is then ignored and memory is not mapped. This is\n+ useful if you need an allocation that is efficient to use on GPU\n+ (`DEVICE_LOCAL`) and still want to map it directly if possible on platforms that\n+ support it (e.g. Intel GPU).\n+ *\/\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT = 0x00000004,\n+ \/** \\deprecated Preserved for backward compatibility. Consider using vmaSetAllocationName() instead.\n+ \n+ Set this flag to treat VmaAllocationCreateInfo::pUserData as pointer to a\n+ null-terminated string. Instead of copying pointer value, a local copy of the\n+ string is made and stored in allocation's `pName`. The string is automatically\n+ freed together with the allocation. It is also used in vmaBuildStatsString().\n+ *\/\n+ VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT = 0x00000020,\n+ \/** Allocation will be created from upper stack in a double stack pool.\n+\n+ This flag is only allowed for custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT flag.\n+ *\/\n+ VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = 0x00000040,\n+ \/** Create both buffer\/image and allocation, but don't bind them together.\n+ It is useful when you want to bind yourself to do some more advanced binding, e.g. using some extensions.\n+ The flag is meaningful only with functions that bind by default: vmaCreateBuffer(), vmaCreateImage().\n+ Otherwise it is ignored.\n+\n+ If you want to make sure the new buffer\/image is not tied to the new memory allocation\n+ through `VkMemoryDedicatedAllocateInfoKHR` structure in case the allocation ends up in its own memory block,\n+ use also flag #VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT.\n+ *\/\n+ VMA_ALLOCATION_CREATE_DONT_BIND_BIT = 0x00000080,\n+ \/** Create allocation only if additional device memory required for it, if any, won't exceed\n+ memory budget. Otherwise return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+ *\/\n+ VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT = 0x00000100,\n+ \/** \\brief Set this flag if the allocated memory will have aliasing resources.\n+ \n+ Usage of this flag prevents supplying `VkMemoryDedicatedAllocateInfoKHR` when #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT is specified.\n+ Otherwise created dedicated memory will not be suitable for aliasing resources, resulting in Vulkan Validation Layer errors.\n+ *\/\n+ VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT = 0x00000200,\n+ \/**\n+ Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT).\n+ \n+ - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value,\n+ you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect.\n+ - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`.\n+ This includes allocations created in \\ref custom_memory_pools.\n+\n+ Declares that mapped memory will only be written sequentially, e.g. using `memcpy()` or a loop writing number-by-number,\n+ never read or accessed randomly, so a memory type can be selected that is uncached and write-combined.\n+\n+ \\warning Violating this declaration may work correctly, but will likely be very slow.\n+ Watch out for implicit reads introduced by doing e.g. `pMappedData[i] += x;`\n+ Better prepare your data in a local variable and `memcpy()` it to the mapped pointer all at once.\n+ *\/\n+ VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT = 0x00000400,\n+ \/**\n+ Requests possibility to map the allocation (using vmaMapMemory() or #VMA_ALLOCATION_CREATE_MAPPED_BIT).\n+ \n+ - If you use #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` value,\n+ you must use this flag to be able to map the allocation. Otherwise, mapping is incorrect.\n+ - If you use other value of #VmaMemoryUsage, this flag is ignored and mapping is always possible in memory types that are `HOST_VISIBLE`.\n+ This includes allocations created in \\ref custom_memory_pools.\n+\n+ Declares that mapped memory can be read, written, and accessed in random order,\n+ so a `HOST_CACHED` memory type is required.\n+ *\/\n+ VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT = 0x00000800,\n+ \/**\n+ Together with #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT,\n+ it says that despite request for host access, a not-`HOST_VISIBLE` memory type can be selected\n+ if it may improve performance.\n+\n+ By using this flag, you declare that you will check if the allocation ended up in a `HOST_VISIBLE` memory type\n+ (e.g. using vmaGetAllocationMemoryProperties()) and if not, you will create some \"staging\" buffer and\n+ issue an explicit transfer to write\/read your data.\n+ To prepare for this possibility, don't forget to add appropriate flags like\n+ `VK_BUFFER_USAGE_TRANSFER_DST_BIT`, `VK_BUFFER_USAGE_TRANSFER_SRC_BIT` to the parameters of created buffer or image.\n+ *\/\n+ VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT = 0x00001000,\n+ \/** Allocation strategy that chooses smallest possible free range for the allocation\n+ to minimize memory usage and fragmentation, possibly at the expense of allocation time.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = 0x00010000,\n+ \/** Allocation strategy that chooses first suitable free range for the allocation -\n+ not necessarily in terms of the smallest offset but the one that is easiest and fastest to find\n+ to minimize allocation time, possibly at the expense of allocation quality.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = 0x00020000,\n+ \/** Allocation strategy that chooses always the lowest offset in available space.\n+ This is not the most efficient strategy but achieves highly packed data.\n+ Used internally by defragmentation, not recomended in typical usage.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = 0x00040000,\n+ \/** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,\n+ \/** Alias to #VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,\n+ \/** A bit mask to extract only `STRATEGY` bits from entire set of flags.\n+ *\/\n+ VMA_ALLOCATION_CREATE_STRATEGY_MASK =\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT |\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT |\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\n+\n+ VMA_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaAllocationCreateFlagBits;\n+\/\/\/ See #VmaAllocationCreateFlagBits.\n+typedef VkFlags VmaAllocationCreateFlags;\n+\n+\/\/\/ Flags to be passed as VmaPoolCreateInfo::flags.\n+typedef enum VmaPoolCreateFlagBits\n+{\n+ \/** \\brief Use this flag if you always allocate only buffers and linear images or only optimal images out of this pool and so Buffer-Image Granularity can be ignored.\n+\n+ This is an optional optimization flag.\n+\n+ If you always allocate using vmaCreateBuffer(), vmaCreateImage(),\n+ vmaAllocateMemoryForBuffer(), then you don't need to use it because allocator\n+ knows exact type of your allocations so it can handle Buffer-Image Granularity\n+ in the optimal way.\n+\n+ If you also allocate using vmaAllocateMemoryForImage() or vmaAllocateMemory(),\n+ exact type of such allocations is not known, so allocator must be conservative\n+ in handling Buffer-Image Granularity, which can lead to suboptimal allocation\n+ (wasted memory). In that case, if you can make sure you always allocate only\n+ buffers and linear images or only optimal images out of this pool, use this flag\n+ to make allocator disregard Buffer-Image Granularity and so make allocations\n+ faster and more optimal.\n+ *\/\n+ VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT = 0x00000002,\n+\n+ \/** \\brief Enables alternative, linear allocation algorithm in this pool.\n+\n+ Specify this flag to enable linear allocation algorithm, which always creates\n+ new allocations after last one and doesn't reuse space from allocations freed in\n+ between. It trades memory consumption for simplified algorithm and data\n+ structure, which has better performance and uses less memory for metadata.\n+\n+ By using this flag, you can achieve behavior of free-at-once, stack,\n+ ring buffer, and double stack.\n+ For details, see documentation chapter \\ref linear_algorithm.\n+ *\/\n+ VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT = 0x00000004,\n+\n+ \/** Bit mask to extract only `ALGORITHM` bits from entire set of flags.\n+ *\/\n+ VMA_POOL_CREATE_ALGORITHM_MASK =\n+ VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT,\n+\n+ VMA_POOL_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaPoolCreateFlagBits;\n+\/\/\/ Flags to be passed as VmaPoolCreateInfo::flags. See #VmaPoolCreateFlagBits.\n+typedef VkFlags VmaPoolCreateFlags;\n+\n+\/\/\/ Flags to be passed as VmaDefragmentationInfo::flags.\n+typedef enum VmaDefragmentationFlagBits\n+{\n+ \/* \\brief Use simple but fast algorithm for defragmentation.\n+ May not achieve best results but will require least time to compute and least allocations to copy.\n+ *\/\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT = 0x1,\n+ \/* \\brief Default defragmentation algorithm, applied also when no `ALGORITHM` flag is specified.\n+ Offers a balance between defragmentation quality and the amount of allocations and bytes that need to be moved.\n+ *\/\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT = 0x2,\n+ \/* \\brief Perform full defragmentation of memory.\n+ Can result in notably more time to compute and allocations to copy, but will achieve best memory packing.\n+ *\/\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT = 0x4,\n+ \/** \\brief Use the most roboust algorithm at the cost of time to compute and number of copies to make.\n+ Only available when bufferImageGranularity is greater than 1, since it aims to reduce\n+ alignment issues between different types of resources.\n+ Otherwise falls back to same behavior as #VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT.\n+ *\/\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT = 0x8,\n+\n+ \/\/\/ A bit mask to extract only `ALGORITHM` bits from entire set of flags.\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK = \n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT |\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT |\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT |\n+ VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT,\n+\n+ VMA_DEFRAGMENTATION_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaDefragmentationFlagBits;\n+\/\/\/ See #VmaDefragmentationFlagBits.\n+typedef VkFlags VmaDefragmentationFlags;\n+\n+\/\/\/ Operation performed on single defragmentation move. See structure #VmaDefragmentationMove.\n+typedef enum VmaDefragmentationMoveOperation\n+{\n+ \/\/\/ Buffer\/image has been recreated at `dstTmpAllocation`, data has been copied, old buffer\/image has been destroyed. `srcAllocation` should be changed to point to the new place. This is the default value set by vmaBeginDefragmentationPass().\n+ VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY = 0,\n+ \/\/\/ Set this value if you cannot move the allocation. New place reserved at `dstTmpAllocation` will be freed. `srcAllocation` will remain unchanged.\n+ VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE = 1,\n+ \/\/\/ Set this value if you decide to abandon the allocation and you destroyed the buffer\/image. New place reserved at `dstTmpAllocation` will be freed, along with `srcAllocation`, which will be destroyed.\n+ VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY = 2,\n+} VmaDefragmentationMoveOperation;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_virtual\n+@{\n+*\/\n+\n+\/\/\/ Flags to be passed as VmaVirtualBlockCreateInfo::flags.\n+typedef enum VmaVirtualBlockCreateFlagBits\n+{\n+ \/** \\brief Enables alternative, linear allocation algorithm in this virtual block.\n+\n+ Specify this flag to enable linear allocation algorithm, which always creates\n+ new allocations after last one and doesn't reuse space from allocations freed in\n+ between. It trades memory consumption for simplified algorithm and data\n+ structure, which has better performance and uses less memory for metadata.\n+\n+ By using this flag, you can achieve behavior of free-at-once, stack,\n+ ring buffer, and double stack.\n+ For details, see documentation chapter \\ref linear_algorithm.\n+ *\/\n+ VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT = 0x00000001,\n+\n+ \/** \\brief Bit mask to extract only `ALGORITHM` bits from entire set of flags.\n+ *\/\n+ VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK =\n+ VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT,\n+\n+ VMA_VIRTUAL_BLOCK_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaVirtualBlockCreateFlagBits;\n+\/\/\/ Flags to be passed as VmaVirtualBlockCreateInfo::flags. See #VmaVirtualBlockCreateFlagBits.\n+typedef VkFlags VmaVirtualBlockCreateFlags;\n+\n+\/\/\/ Flags to be passed as VmaVirtualAllocationCreateInfo::flags.\n+typedef enum VmaVirtualAllocationCreateFlagBits\n+{\n+ \/** \\brief Allocation will be created from upper stack in a double stack pool.\n+\n+ This flag is only allowed for virtual blocks created with #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT flag.\n+ *\/\n+ VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT = VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT,\n+ \/** \\brief Allocation strategy that tries to minimize memory usage.\n+ *\/\n+ VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT,\n+ \/** \\brief Allocation strategy that tries to minimize allocation time.\n+ *\/\n+ VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT,\n+ \/** Allocation strategy that chooses always the lowest offset in available space.\n+ This is not the most efficient strategy but achieves highly packed data.\n+ *\/\n+ VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT = VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\n+ \/** \\brief A bit mask to extract only `STRATEGY` bits from entire set of flags.\n+\n+ These strategy flags are binary compatible with equivalent flags in #VmaAllocationCreateFlagBits.\n+ *\/\n+ VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK = VMA_ALLOCATION_CREATE_STRATEGY_MASK,\n+\n+ VMA_VIRTUAL_ALLOCATION_CREATE_FLAG_BITS_MAX_ENUM = 0x7FFFFFFF\n+} VmaVirtualAllocationCreateFlagBits;\n+\/\/\/ Flags to be passed as VmaVirtualAllocationCreateInfo::flags. See #VmaVirtualAllocationCreateFlagBits.\n+typedef VkFlags VmaVirtualAllocationCreateFlags;\n+\n+\/** @} *\/\n+\n+#endif \/\/ _VMA_ENUM_DECLARATIONS\n+\n+#ifndef _VMA_DATA_TYPES_DECLARATIONS\n+\n+\/**\n+\\addtogroup group_init\n+@{ *\/\n+\n+\/** \\struct VmaAllocator\n+\\brief Represents main object of this library initialized.\n+\n+Fill structure #VmaAllocatorCreateInfo and call function vmaCreateAllocator() to create it.\n+Call function vmaDestroyAllocator() to destroy it.\n+\n+It is recommended to create just one object of this type per `VkDevice` object,\n+right after Vulkan is initialized and keep it alive until before Vulkan device is destroyed.\n+*\/\n+VK_DEFINE_HANDLE(VmaAllocator)\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/** \\struct VmaPool\n+\\brief Represents custom memory pool\n+\n+Fill structure VmaPoolCreateInfo and call function vmaCreatePool() to create it.\n+Call function vmaDestroyPool() to destroy it.\n+\n+For more information see [Custom memory pools](@ref choosing_memory_type_custom_memory_pools).\n+*\/\n+VK_DEFINE_HANDLE(VmaPool)\n+\n+\/** \\struct VmaAllocation\n+\\brief Represents single memory allocation.\n+\n+It may be either dedicated block of `VkDeviceMemory` or a specific region of a bigger block of this type\n+plus unique offset.\n+\n+There are multiple ways to create such object.\n+You need to fill structure VmaAllocationCreateInfo.\n+For more information see [Choosing memory type](@ref choosing_memory_type).\n+\n+Although the library provides convenience functions that create Vulkan buffer or image,\n+allocate memory for it and bind them together,\n+binding of the allocation to a buffer or an image is out of scope of the allocation itself.\n+Allocation object can exist without buffer\/image bound,\n+binding can be done manually by the user, and destruction of it can be done\n+independently of destruction of the allocation.\n+\n+The object also remembers its size and some other information.\n+To retrieve this information, use function vmaGetAllocationInfo() and inspect\n+returned structure VmaAllocationInfo.\n+*\/\n+VK_DEFINE_HANDLE(VmaAllocation)\n+\n+\/** \\struct VmaDefragmentationContext\n+\\brief An opaque object that represents started defragmentation process.\n+\n+Fill structure #VmaDefragmentationInfo and call function vmaBeginDefragmentation() to create it.\n+Call function vmaEndDefragmentation() to destroy it.\n+*\/\n+VK_DEFINE_HANDLE(VmaDefragmentationContext)\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_virtual\n+@{\n+*\/\n+\n+\/** \\struct VmaVirtualAllocation\n+\\brief Represents single memory allocation done inside VmaVirtualBlock.\n+\n+Use it as a unique identifier to virtual allocation within the single block.\n+\n+Use value `VK_NULL_HANDLE` to represent a null\/invalid allocation.\n+*\/\n+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaVirtualAllocation);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_virtual\n+@{\n+*\/\n+\n+\/** \\struct VmaVirtualBlock\n+\\brief Handle to a virtual block object that allows to use core allocation algorithm without allocating any real GPU memory.\n+\n+Fill in #VmaVirtualBlockCreateInfo structure and use vmaCreateVirtualBlock() to create it. Use vmaDestroyVirtualBlock() to destroy it.\n+For more information, see documentation chapter \\ref virtual_allocator.\n+\n+This object is not thread-safe - should not be used from multiple threads simultaneously, must be synchronized externally.\n+*\/\n+VK_DEFINE_HANDLE(VmaVirtualBlock)\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_init\n+@{\n+*\/\n+\n+\/\/\/ Callback function called after successful vkAllocateMemory.\n+typedef void (VKAPI_PTR* PFN_vmaAllocateDeviceMemoryFunction)(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t memoryType,\n+ VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory,\n+ VkDeviceSize size,\n+ void* VMA_NULLABLE pUserData);\n+\n+\/\/\/ Callback function called before vkFreeMemory.\n+typedef void (VKAPI_PTR* PFN_vmaFreeDeviceMemoryFunction)(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t memoryType,\n+ VkDeviceMemory VMA_NOT_NULL_NON_DISPATCHABLE memory,\n+ VkDeviceSize size,\n+ void* VMA_NULLABLE pUserData);\n+\n+\/** \\brief Set of callbacks that the library will call for `vkAllocateMemory` and `vkFreeMemory`.\n+\n+Provided for informative purpose, e.g. to gather statistics about number of\n+allocations or total amount of memory allocated in Vulkan.\n+\n+Used in VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.\n+*\/\n+typedef struct VmaDeviceMemoryCallbacks\n+{\n+ \/\/\/ Optional, can be null.\n+ PFN_vmaAllocateDeviceMemoryFunction VMA_NULLABLE pfnAllocate;\n+ \/\/\/ Optional, can be null.\n+ PFN_vmaFreeDeviceMemoryFunction VMA_NULLABLE pfnFree;\n+ \/\/\/ Optional, can be null.\n+ void* VMA_NULLABLE pUserData;\n+} VmaDeviceMemoryCallbacks;\n+\n+\/** \\brief Pointers to some Vulkan functions - a subset used by the library.\n+\n+Used in VmaAllocatorCreateInfo::pVulkanFunctions.\n+*\/\n+typedef struct VmaVulkanFunctions\n+{\n+ \/\/\/ Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS.\n+ PFN_vkGetInstanceProcAddr VMA_NULLABLE vkGetInstanceProcAddr;\n+ \/\/\/ Required when using VMA_DYNAMIC_VULKAN_FUNCTIONS.\n+ PFN_vkGetDeviceProcAddr VMA_NULLABLE vkGetDeviceProcAddr;\n+ PFN_vkGetPhysicalDeviceProperties VMA_NULLABLE vkGetPhysicalDeviceProperties;\n+ PFN_vkGetPhysicalDeviceMemoryProperties VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties;\n+ PFN_vkAllocateMemory VMA_NULLABLE vkAllocateMemory;\n+ PFN_vkFreeMemory VMA_NULLABLE vkFreeMemory;\n+ PFN_vkMapMemory VMA_NULLABLE vkMapMemory;\n+ PFN_vkUnmapMemory VMA_NULLABLE vkUnmapMemory;\n+ PFN_vkFlushMappedMemoryRanges VMA_NULLABLE vkFlushMappedMemoryRanges;\n+ PFN_vkInvalidateMappedMemoryRanges VMA_NULLABLE vkInvalidateMappedMemoryRanges;\n+ PFN_vkBindBufferMemory VMA_NULLABLE vkBindBufferMemory;\n+ PFN_vkBindImageMemory VMA_NULLABLE vkBindImageMemory;\n+ PFN_vkGetBufferMemoryRequirements VMA_NULLABLE vkGetBufferMemoryRequirements;\n+ PFN_vkGetImageMemoryRequirements VMA_NULLABLE vkGetImageMemoryRequirements;\n+ PFN_vkCreateBuffer VMA_NULLABLE vkCreateBuffer;\n+ PFN_vkDestroyBuffer VMA_NULLABLE vkDestroyBuffer;\n+ PFN_vkCreateImage VMA_NULLABLE vkCreateImage;\n+ PFN_vkDestroyImage VMA_NULLABLE vkDestroyImage;\n+ PFN_vkCmdCopyBuffer VMA_NULLABLE vkCmdCopyBuffer;\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ \/\/\/ Fetch \"vkGetBufferMemoryRequirements2\" on Vulkan >= 1.1, fetch \"vkGetBufferMemoryRequirements2KHR\" when using VK_KHR_dedicated_allocation extension.\n+ PFN_vkGetBufferMemoryRequirements2KHR VMA_NULLABLE vkGetBufferMemoryRequirements2KHR;\n+ \/\/\/ Fetch \"vkGetImageMemoryRequirements 2\" on Vulkan >= 1.1, fetch \"vkGetImageMemoryRequirements2KHR\" when using VK_KHR_dedicated_allocation extension.\n+ PFN_vkGetImageMemoryRequirements2KHR VMA_NULLABLE vkGetImageMemoryRequirements2KHR;\n+#endif\n+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\n+ \/\/\/ Fetch \"vkBindBufferMemory2\" on Vulkan >= 1.1, fetch \"vkBindBufferMemory2KHR\" when using VK_KHR_bind_memory2 extension.\n+ PFN_vkBindBufferMemory2KHR VMA_NULLABLE vkBindBufferMemory2KHR;\n+ \/\/\/ Fetch \"vkBindImageMemory2\" on Vulkan >= 1.1, fetch \"vkBindImageMemory2KHR\" when using VK_KHR_bind_memory2 extension.\n+ PFN_vkBindImageMemory2KHR VMA_NULLABLE vkBindImageMemory2KHR;\n+#endif\n+#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000\n+ PFN_vkGetPhysicalDeviceMemoryProperties2KHR VMA_NULLABLE vkGetPhysicalDeviceMemoryProperties2KHR;\n+#endif\n+#if VMA_VULKAN_VERSION >= 1003000\n+ \/\/\/ Fetch from \"vkGetDeviceBufferMemoryRequirements\" on Vulkan >= 1.3, but you can also fetch it from \"vkGetDeviceBufferMemoryRequirementsKHR\" if you enabled extension VK_KHR_maintenance4.\n+ PFN_vkGetDeviceBufferMemoryRequirements VMA_NULLABLE vkGetDeviceBufferMemoryRequirements;\n+ \/\/\/ Fetch from \"vkGetDeviceImageMemoryRequirements\" on Vulkan >= 1.3, but you can also fetch it from \"vkGetDeviceImageMemoryRequirementsKHR\" if you enabled extension VK_KHR_maintenance4.\n+ PFN_vkGetDeviceImageMemoryRequirements VMA_NULLABLE vkGetDeviceImageMemoryRequirements;\n+#endif\n+} VmaVulkanFunctions;\n+\n+\/\/\/ Description of a Allocator to be created.\n+typedef struct VmaAllocatorCreateInfo\n+{\n+ \/\/\/ Flags for created allocator. Use #VmaAllocatorCreateFlagBits enum.\n+ VmaAllocatorCreateFlags flags;\n+ \/\/\/ Vulkan physical device.\n+ \/** It must be valid throughout whole lifetime of created allocator. *\/\n+ VkPhysicalDevice VMA_NOT_NULL physicalDevice;\n+ \/\/\/ Vulkan device.\n+ \/** It must be valid throughout whole lifetime of created allocator. *\/\n+ VkDevice VMA_NOT_NULL device;\n+ \/\/\/ Preferred size of a single `VkDeviceMemory` block to be allocated from large heaps > 1 GiB. Optional.\n+ \/** Set to 0 to use default, which is currently 256 MiB. *\/\n+ VkDeviceSize preferredLargeHeapBlockSize;\n+ \/\/\/ Custom CPU memory allocation callbacks. Optional.\n+ \/** Optional, can be null. When specified, will also be used for all CPU-side memory allocations. *\/\n+ const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks;\n+ \/\/\/ Informative callbacks for `vkAllocateMemory`, `vkFreeMemory`. Optional.\n+ \/** Optional, can be null. *\/\n+ const VmaDeviceMemoryCallbacks* VMA_NULLABLE pDeviceMemoryCallbacks;\n+ \/** \\brief Either null or a pointer to an array of limits on maximum number of bytes that can be allocated out of particular Vulkan memory heap.\n+\n+ If not NULL, it must be a pointer to an array of\n+ `VkPhysicalDeviceMemoryProperties::memoryHeapCount` elements, defining limit on\n+ maximum number of bytes that can be allocated out of particular Vulkan memory\n+ heap.\n+\n+ Any of the elements may be equal to `VK_WHOLE_SIZE`, which means no limit on that\n+ heap. This is also the default in case of `pHeapSizeLimit` = NULL.\n+\n+ If there is a limit defined for a heap:\n+\n+ - If user tries to allocate more memory from that heap using this allocator,\n+ the allocation fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+ - If the limit is smaller than heap size reported in `VkMemoryHeap::size`, the\n+ value of this limit will be reported instead when using vmaGetMemoryProperties().\n+\n+ Warning! Using this feature may not be equivalent to installing a GPU with\n+ smaller amount of memory, because graphics driver doesn't necessary fail new\n+ allocations with `VK_ERROR_OUT_OF_DEVICE_MEMORY` result when memory capacity is\n+ exceeded. It may return success and just silently migrate some device memory\n+ blocks to system RAM. This driver behavior can also be controlled using\n+ VK_AMD_memory_overallocation_behavior extension.\n+ *\/\n+ const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\") pHeapSizeLimit;\n+\n+ \/** \\brief Pointers to Vulkan functions. Can be null.\n+\n+ For details see [Pointers to Vulkan functions](@ref config_Vulkan_functions).\n+ *\/\n+ const VmaVulkanFunctions* VMA_NULLABLE pVulkanFunctions;\n+ \/** \\brief Handle to Vulkan instance object.\n+\n+ Starting from version 3.0.0 this member is no longer optional, it must be set!\n+ *\/\n+ VkInstance VMA_NOT_NULL instance;\n+ \/** \\brief Optional. The highest version of Vulkan that the application is designed to use.\n+\n+ It must be a value in the format as created by macro `VK_MAKE_VERSION` or a constant like: `VK_API_VERSION_1_1`, `VK_API_VERSION_1_0`.\n+ The patch version number specified is ignored. Only the major and minor versions are considered.\n+ It must be less or equal (preferably equal) to value as passed to `vkCreateInstance` as `VkApplicationInfo::apiVersion`.\n+ Only versions 1.0, 1.1, 1.2, 1.3 are supported by the current implementation.\n+ Leaving it initialized to zero is equivalent to `VK_API_VERSION_1_0`.\n+ *\/\n+ uint32_t vulkanApiVersion;\n+#if VMA_EXTERNAL_MEMORY\n+ \/** \\brief Either null or a pointer to an array of external memory handle types for each Vulkan memory type.\n+\n+ If not NULL, it must be a pointer to an array of `VkPhysicalDeviceMemoryProperties::memoryTypeCount`\n+ elements, defining external memory handle types of particular Vulkan memory type,\n+ to be passed using `VkExportMemoryAllocateInfoKHR`.\n+\n+ Any of the elements may be equal to 0, which means not to use `VkExportMemoryAllocateInfoKHR` on this memory type.\n+ This is also the default in case of `pTypeExternalMemoryHandleTypes` = NULL.\n+ *\/\n+ const VkExternalMemoryHandleTypeFlagsKHR* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryTypeCount\") pTypeExternalMemoryHandleTypes;\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+} VmaAllocatorCreateInfo;\n+\n+\/\/\/ Information about existing #VmaAllocator object.\n+typedef struct VmaAllocatorInfo\n+{\n+ \/** \\brief Handle to Vulkan instance object.\n+\n+ This is the same value as has been passed through VmaAllocatorCreateInfo::instance.\n+ *\/\n+ VkInstance VMA_NOT_NULL instance;\n+ \/** \\brief Handle to Vulkan physical device object.\n+\n+ This is the same value as has been passed through VmaAllocatorCreateInfo::physicalDevice.\n+ *\/\n+ VkPhysicalDevice VMA_NOT_NULL physicalDevice;\n+ \/** \\brief Handle to Vulkan device object.\n+\n+ This is the same value as has been passed through VmaAllocatorCreateInfo::device.\n+ *\/\n+ VkDevice VMA_NOT_NULL device;\n+} VmaAllocatorInfo;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_stats\n+@{\n+*\/\n+\n+\/** \\brief Calculated statistics of memory usage e.g. in a specific memory type, heap, custom pool, or total.\n+\n+These are fast to calculate.\n+See functions: vmaGetHeapBudgets(), vmaGetPoolStatistics().\n+*\/\n+typedef struct VmaStatistics\n+{\n+ \/** \\brief Number of `VkDeviceMemory` objects - Vulkan memory blocks allocated.\n+ *\/\n+ uint32_t blockCount;\n+ \/** \\brief Number of #VmaAllocation objects allocated.\n+ \n+ Dedicated allocations have their own blocks, so each one adds 1 to `allocationCount` as well as `blockCount`.\n+ *\/\n+ uint32_t allocationCount;\n+ \/** \\brief Number of bytes allocated in `VkDeviceMemory` blocks.\n+ \n+ \\note To avoid confusion, please be aware that what Vulkan calls an \"allocation\" - a whole `VkDeviceMemory` object\n+ (e.g. as in `VkPhysicalDeviceLimits::maxMemoryAllocationCount`) is called a \"block\" in VMA, while VMA calls\n+ \"allocation\" a #VmaAllocation object that represents a memory region sub-allocated from such block, usually for a single buffer or image.\n+ *\/\n+ VkDeviceSize blockBytes;\n+ \/** \\brief Total number of bytes occupied by all #VmaAllocation objects.\n+ \n+ Always less or equal than `blockBytes`.\n+ Difference `(blockBytes - allocationBytes)` is the amount of memory allocated from Vulkan\n+ but unused by any #VmaAllocation.\n+ *\/\n+ VkDeviceSize allocationBytes;\n+} VmaStatistics;\n+\n+\/** \\brief More detailed statistics than #VmaStatistics.\n+\n+These are slower to calculate. Use for debugging purposes.\n+See functions: vmaCalculateStatistics(), vmaCalculatePoolStatistics().\n+\n+Previous version of the statistics API provided averages, but they have been removed\n+because they can be easily calculated as:\n+\n+\\code\n+VkDeviceSize allocationSizeAvg = detailedStats.statistics.allocationBytes \/ detailedStats.statistics.allocationCount;\n+VkDeviceSize unusedBytes = detailedStats.statistics.blockBytes - detailedStats.statistics.allocationBytes;\n+VkDeviceSize unusedRangeSizeAvg = unusedBytes \/ detailedStats.unusedRangeCount;\n+\\endcode\n+*\/\n+typedef struct VmaDetailedStatistics\n+{\n+ \/\/\/ Basic statistics.\n+ VmaStatistics statistics;\n+ \/\/\/ Number of free ranges of memory between allocations.\n+ uint32_t unusedRangeCount;\n+ \/\/\/ Smallest allocation size. `VK_WHOLE_SIZE` if there are 0 allocations.\n+ VkDeviceSize allocationSizeMin;\n+ \/\/\/ Largest allocation size. 0 if there are 0 allocations.\n+ VkDeviceSize allocationSizeMax;\n+ \/\/\/ Smallest empty range size. `VK_WHOLE_SIZE` if there are 0 empty ranges.\n+ VkDeviceSize unusedRangeSizeMin;\n+ \/\/\/ Largest empty range size. 0 if there are 0 empty ranges.\n+ VkDeviceSize unusedRangeSizeMax;\n+} VmaDetailedStatistics;\n+\n+\/** \\brief General statistics from current state of the Allocator -\n+total memory usage across all memory heaps and types.\n+\n+These are slower to calculate. Use for debugging purposes.\n+See function vmaCalculateStatistics().\n+*\/\n+typedef struct VmaTotalStatistics\n+{\n+ VmaDetailedStatistics memoryType[VK_MAX_MEMORY_TYPES];\n+ VmaDetailedStatistics memoryHeap[VK_MAX_MEMORY_HEAPS];\n+ VmaDetailedStatistics total;\n+} VmaTotalStatistics;\n+\n+\/** \\brief Statistics of current memory usage and available budget for a specific memory heap.\n+\n+These are fast to calculate.\n+See function vmaGetHeapBudgets().\n+*\/\n+typedef struct VmaBudget\n+{\n+ \/** \\brief Statistics fetched from the library.\n+ *\/\n+ VmaStatistics statistics;\n+ \/** \\brief Estimated current memory usage of the program, in bytes.\n+\n+ Fetched from system using VK_EXT_memory_budget extension if enabled.\n+\n+ It might be different than `statistics.blockBytes` (usually higher) due to additional implicit objects\n+ also occupying the memory, like swapchain, pipelines, descriptor heaps, command buffers, or\n+ `VkDeviceMemory` blocks allocated outside of this library, if any.\n+ *\/\n+ VkDeviceSize usage;\n+ \/** \\brief Estimated amount of memory available to the program, in bytes.\n+\n+ Fetched from system using VK_EXT_memory_budget extension if enabled.\n+\n+ It might be different (most probably smaller) than `VkMemoryHeap::size[heapIndex]` due to factors\n+ external to the program, decided by the operating system.\n+ Difference `budget - usage` is the amount of additional memory that can probably\n+ be allocated without problems. Exceeding the budget may result in various problems.\n+ *\/\n+ VkDeviceSize budget;\n+} VmaBudget;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/** \\brief Parameters of new #VmaAllocation.\n+\n+To be used with functions like vmaCreateBuffer(), vmaCreateImage(), and many others.\n+*\/\n+typedef struct VmaAllocationCreateInfo\n+{\n+ \/\/\/ Use #VmaAllocationCreateFlagBits enum.\n+ VmaAllocationCreateFlags flags;\n+ \/** \\brief Intended usage of memory.\n+\n+ You can leave #VMA_MEMORY_USAGE_UNKNOWN if you specify memory requirements in other way. \\n\n+ If `pool` is not null, this member is ignored.\n+ *\/\n+ VmaMemoryUsage usage;\n+ \/** \\brief Flags that must be set in a Memory Type chosen for an allocation.\n+\n+ Leave 0 if you specify memory requirements in other way. \\n\n+ If `pool` is not null, this member is ignored.*\/\n+ VkMemoryPropertyFlags requiredFlags;\n+ \/** \\brief Flags that preferably should be set in a memory type chosen for an allocation.\n+\n+ Set to 0 if no additional flags are preferred. \\n\n+ If `pool` is not null, this member is ignored. *\/\n+ VkMemoryPropertyFlags preferredFlags;\n+ \/** \\brief Bitmask containing one bit set for every memory type acceptable for this allocation.\n+\n+ Value 0 is equivalent to `UINT32_MAX` - it means any memory type is accepted if\n+ it meets other requirements specified by this structure, with no further\n+ restrictions on memory type index. \\n\n+ If `pool` is not null, this member is ignored.\n+ *\/\n+ uint32_t memoryTypeBits;\n+ \/** \\brief Pool that this allocation should be created in.\n+\n+ Leave `VK_NULL_HANDLE` to allocate from default pool. If not null, members:\n+ `usage`, `requiredFlags`, `preferredFlags`, `memoryTypeBits` are ignored.\n+ *\/\n+ VmaPool VMA_NULLABLE pool;\n+ \/** \\brief Custom general-purpose pointer that will be stored in #VmaAllocation, can be read as VmaAllocationInfo::pUserData and changed using vmaSetAllocationUserData().\n+\n+ If #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT is used, it must be either\n+ null or pointer to a null-terminated string. The string will be then copied to\n+ internal buffer, so it doesn't need to be valid after allocation call.\n+ *\/\n+ void* VMA_NULLABLE pUserData;\n+ \/** \\brief A floating-point value between 0 and 1, indicating the priority of the allocation relative to other memory allocations.\n+\n+ It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object\n+ and this allocation ends up as dedicated or is explicitly forced as dedicated using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+ Otherwise, it has the priority of a memory block where it is placed and this variable is ignored.\n+ *\/\n+ float priority;\n+} VmaAllocationCreateInfo;\n+\n+\/\/\/ Describes parameter of created #VmaPool.\n+typedef struct VmaPoolCreateInfo\n+{\n+ \/** \\brief Vulkan memory type index to allocate this pool from.\n+ *\/\n+ uint32_t memoryTypeIndex;\n+ \/** \\brief Use combination of #VmaPoolCreateFlagBits.\n+ *\/\n+ VmaPoolCreateFlags flags;\n+ \/** \\brief Size of a single `VkDeviceMemory` block to be allocated as part of this pool, in bytes. Optional.\n+\n+ Specify nonzero to set explicit, constant size of memory blocks used by this\n+ pool.\n+\n+ Leave 0 to use default and let the library manage block sizes automatically.\n+ Sizes of particular blocks may vary.\n+ In this case, the pool will also support dedicated allocations.\n+ *\/\n+ VkDeviceSize blockSize;\n+ \/** \\brief Minimum number of blocks to be always allocated in this pool, even if they stay empty.\n+\n+ Set to 0 to have no preallocated blocks and allow the pool be completely empty.\n+ *\/\n+ size_t minBlockCount;\n+ \/** \\brief Maximum number of blocks that can be allocated in this pool. Optional.\n+\n+ Set to 0 to use default, which is `SIZE_MAX`, which means no limit.\n+\n+ Set to same value as VmaPoolCreateInfo::minBlockCount to have fixed amount of memory allocated\n+ throughout whole lifetime of this pool.\n+ *\/\n+ size_t maxBlockCount;\n+ \/** \\brief A floating-point value between 0 and 1, indicating the priority of the allocations in this pool relative to other memory allocations.\n+\n+ It is used only when #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT flag was used during creation of the #VmaAllocator object.\n+ Otherwise, this variable is ignored.\n+ *\/\n+ float priority;\n+ \/** \\brief Additional minimum alignment to be used for all allocations created from this pool. Can be 0.\n+\n+ Leave 0 (default) not to impose any additional alignment. If not 0, it must be a power of two.\n+ It can be useful in cases where alignment returned by Vulkan by functions like `vkGetBufferMemoryRequirements` is not enough,\n+ e.g. when doing interop with OpenGL.\n+ *\/\n+ VkDeviceSize minAllocationAlignment;\n+ \/** \\brief Additional `pNext` chain to be attached to `VkMemoryAllocateInfo` used for every allocation made by this pool. Optional.\n+\n+ Optional, can be null. If not null, it must point to a `pNext` chain of structures that can be attached to `VkMemoryAllocateInfo`.\n+ It can be useful for special needs such as adding `VkExportMemoryAllocateInfoKHR`.\n+ Structures pointed by this member must remain alive and unchanged for the whole lifetime of the custom pool.\n+\n+ Please note that some structures, e.g. `VkMemoryPriorityAllocateInfoEXT`, `VkMemoryDedicatedAllocateInfoKHR`,\n+ can be attached automatically by this library when using other, more convenient of its features.\n+ *\/\n+ void* VMA_NULLABLE pMemoryAllocateNext;\n+} VmaPoolCreateInfo;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/\/\/ Parameters of #VmaAllocation objects, that can be retrieved using function vmaGetAllocationInfo().\n+typedef struct VmaAllocationInfo\n+{\n+ \/** \\brief Memory type index that this allocation was allocated from.\n+\n+ It never changes.\n+ *\/\n+ uint32_t memoryType;\n+ \/** \\brief Handle to Vulkan memory object.\n+\n+ Same memory object can be shared by multiple allocations.\n+\n+ It can change after the allocation is moved during \\ref defragmentation.\n+ *\/\n+ VkDeviceMemory VMA_NULLABLE_NON_DISPATCHABLE deviceMemory;\n+ \/** \\brief Offset in `VkDeviceMemory` object to the beginning of this allocation, in bytes. `(deviceMemory, offset)` pair is unique to this allocation.\n+\n+ You usually don't need to use this offset. If you create a buffer or an image together with the allocation using e.g. function\n+ vmaCreateBuffer(), vmaCreateImage(), functions that operate on these resources refer to the beginning of the buffer or image,\n+ not entire device memory block. Functions like vmaMapMemory(), vmaBindBufferMemory() also refer to the beginning of the allocation\n+ and apply this offset automatically.\n+\n+ It can change after the allocation is moved during \\ref defragmentation.\n+ *\/\n+ VkDeviceSize offset;\n+ \/** \\brief Size of this allocation, in bytes.\n+\n+ It never changes.\n+\n+ \\note Allocation size returned in this variable may be greater than the size\n+ requested for the resource e.g. as `VkBufferCreateInfo::size`. Whole size of the\n+ allocation is accessible for operations on memory e.g. using a pointer after\n+ mapping with vmaMapMemory(), but operations on the resource e.g. using\n+ `vkCmdCopyBuffer` must be limited to the size of the resource.\n+ *\/\n+ VkDeviceSize size;\n+ \/** \\brief Pointer to the beginning of this allocation as mapped data.\n+\n+ If the allocation hasn't been mapped using vmaMapMemory() and hasn't been\n+ created with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag, this value is null.\n+\n+ It can change after call to vmaMapMemory(), vmaUnmapMemory().\n+ It can also change after the allocation is moved during \\ref defragmentation.\n+ *\/\n+ void* VMA_NULLABLE pMappedData;\n+ \/** \\brief Custom general-purpose pointer that was passed as VmaAllocationCreateInfo::pUserData or set using vmaSetAllocationUserData().\n+\n+ It can change after call to vmaSetAllocationUserData() for this allocation.\n+ *\/\n+ void* VMA_NULLABLE pUserData;\n+ \/** \\brief Custom allocation name that was set with vmaSetAllocationName().\n+ \n+ It can change after call to vmaSetAllocationName() for this allocation.\n+ \n+ Another way to set custom name is to pass it in VmaAllocationCreateInfo::pUserData with\n+ additional flag #VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT set [DEPRECATED].\n+ *\/\n+ const char* VMA_NULLABLE pName;\n+} VmaAllocationInfo;\n+\n+\/** \\brief Parameters for defragmentation.\n+\n+To be used with function vmaBeginDefragmentation().\n+*\/\n+typedef struct VmaDefragmentationInfo\n+{\n+ \/\/\/ \\brief Use combination of #VmaDefragmentationFlagBits.\n+ VmaDefragmentationFlags flags;\n+ \/** \\brief Custom pool to be defragmented.\n+\n+ If null then default pools will undergo defragmentation process.\n+ *\/\n+ VmaPool VMA_NULLABLE pool;\n+ \/** \\brief Maximum numbers of bytes that can be copied during single pass, while moving allocations to different places.\n+\n+ `0` means no limit.\n+ *\/\n+ VkDeviceSize maxBytesPerPass;\n+ \/** \\brief Maximum number of allocations that can be moved during single pass to a different place.\n+\n+ `0` means no limit.\n+ *\/\n+ uint32_t maxAllocationsPerPass;\n+} VmaDefragmentationInfo;\n+\n+\/\/\/ Single move of an allocation to be done for defragmentation.\n+typedef struct VmaDefragmentationMove\n+{\n+ \/\/\/ Operation to be performed on the allocation by vmaEndDefragmentationPass(). Default value is #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY. You can modify it.\n+ VmaDefragmentationMoveOperation operation;\n+ \/\/\/ Allocation that should be moved.\n+ VmaAllocation VMA_NOT_NULL srcAllocation;\n+ \/** \\brief Temporary allocation pointing to destination memory that will replace `srcAllocation`.\n+ \n+ \\warning Do not store this allocation in your data structures! It exists only temporarily, for the duration of the defragmentation pass,\n+ to be used for binding new buffer\/image to the destination memory using e.g. vmaBindBufferMemory().\n+ vmaEndDefragmentationPass() will destroy it and make `srcAllocation` point to this memory.\n+ *\/\n+ VmaAllocation VMA_NOT_NULL dstTmpAllocation;\n+} VmaDefragmentationMove;\n+\n+\/** \\brief Parameters for incremental defragmentation steps.\n+\n+To be used with function vmaBeginDefragmentationPass().\n+*\/\n+typedef struct VmaDefragmentationPassMoveInfo\n+{\n+ \/\/\/ Number of elements in the `pMoves` array.\n+ uint32_t moveCount;\n+ \/** \\brief Array of moves to be performed by the user in the current defragmentation pass.\n+ \n+ Pointer to an array of `moveCount` elements, owned by VMA, created in vmaBeginDefragmentationPass(), destroyed in vmaEndDefragmentationPass().\n+\n+ For each element, you should:\n+ \n+ 1. Create a new buffer\/image in the place pointed by VmaDefragmentationMove::dstMemory + VmaDefragmentationMove::dstOffset.\n+ 2. Copy data from the VmaDefragmentationMove::srcAllocation e.g. using `vkCmdCopyBuffer`, `vkCmdCopyImage`.\n+ 3. Make sure these commands finished executing on the GPU.\n+ 4. Destroy the old buffer\/image.\n+ \n+ Only then you can finish defragmentation pass by calling vmaEndDefragmentationPass().\n+ After this call, the allocation will point to the new place in memory.\n+\n+ Alternatively, if you cannot move specific allocation, you can set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\n+\n+ Alternatively, if you decide you want to completely remove the allocation:\n+\n+ 1. Destroy its buffer\/image.\n+ 2. Set VmaDefragmentationMove::operation to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY.\n+\n+ Then, after vmaEndDefragmentationPass() the allocation will be freed.\n+ *\/\n+ VmaDefragmentationMove* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(moveCount) pMoves;\n+} VmaDefragmentationPassMoveInfo;\n+\n+\/\/\/ Statistics returned for defragmentation process in function vmaEndDefragmentation().\n+typedef struct VmaDefragmentationStats\n+{\n+ \/\/\/ Total number of bytes that have been copied while moving allocations to different places.\n+ VkDeviceSize bytesMoved;\n+ \/\/\/ Total number of bytes that have been released to the system by freeing empty `VkDeviceMemory` objects.\n+ VkDeviceSize bytesFreed;\n+ \/\/\/ Number of allocations that have been moved to different places.\n+ uint32_t allocationsMoved;\n+ \/\/\/ Number of empty `VkDeviceMemory` objects that have been released to the system.\n+ uint32_t deviceMemoryBlocksFreed;\n+} VmaDefragmentationStats;\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_virtual\n+@{\n+*\/\n+\n+\/\/\/ Parameters of created #VmaVirtualBlock object to be passed to vmaCreateVirtualBlock().\n+typedef struct VmaVirtualBlockCreateInfo\n+{\n+ \/** \\brief Total size of the virtual block.\n+\n+ Sizes can be expressed in bytes or any units you want as long as you are consistent in using them.\n+ For example, if you allocate from some array of structures, 1 can mean single instance of entire structure.\n+ *\/\n+ VkDeviceSize size;\n+\n+ \/** \\brief Use combination of #VmaVirtualBlockCreateFlagBits.\n+ *\/\n+ VmaVirtualBlockCreateFlags flags;\n+\n+ \/** \\brief Custom CPU memory allocation callbacks. Optional.\n+\n+ Optional, can be null. When specified, they will be used for all CPU-side memory allocations.\n+ *\/\n+ const VkAllocationCallbacks* VMA_NULLABLE pAllocationCallbacks;\n+} VmaVirtualBlockCreateInfo;\n+\n+\/\/\/ Parameters of created virtual allocation to be passed to vmaVirtualAllocate().\n+typedef struct VmaVirtualAllocationCreateInfo\n+{\n+ \/** \\brief Size of the allocation.\n+\n+ Cannot be zero.\n+ *\/\n+ VkDeviceSize size;\n+ \/** \\brief Required alignment of the allocation. Optional.\n+\n+ Must be power of two. Special value 0 has the same meaning as 1 - means no special alignment is required, so allocation can start at any offset.\n+ *\/\n+ VkDeviceSize alignment;\n+ \/** \\brief Use combination of #VmaVirtualAllocationCreateFlagBits.\n+ *\/\n+ VmaVirtualAllocationCreateFlags flags;\n+ \/** \\brief Custom pointer to be associated with the allocation. Optional.\n+\n+ It can be any value and can be used for user-defined purposes. It can be fetched or changed later.\n+ *\/\n+ void* VMA_NULLABLE pUserData;\n+} VmaVirtualAllocationCreateInfo;\n+\n+\/\/\/ Parameters of an existing virtual allocation, returned by vmaGetVirtualAllocationInfo().\n+typedef struct VmaVirtualAllocationInfo\n+{\n+ \/** \\brief Offset of the allocation.\n+ \n+ Offset at which the allocation was made.\n+ *\/\n+ VkDeviceSize offset;\n+ \/** \\brief Size of the allocation.\n+\n+ Same value as passed in VmaVirtualAllocationCreateInfo::size.\n+ *\/\n+ VkDeviceSize size;\n+ \/** \\brief Custom pointer associated with the allocation.\n+\n+ Same value as passed in VmaVirtualAllocationCreateInfo::pUserData or to vmaSetVirtualAllocationUserData().\n+ *\/\n+ void* VMA_NULLABLE pUserData;\n+} VmaVirtualAllocationInfo;\n+\n+\/** @} *\/\n+\n+#endif \/\/ _VMA_DATA_TYPES_DECLARATIONS\n+\n+#ifndef _VMA_FUNCTION_HEADERS\n+\n+\/**\n+\\addtogroup group_init\n+@{\n+*\/\n+\n+\/\/\/ Creates #VmaAllocator object.\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(\n+ const VmaAllocatorCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaAllocator VMA_NULLABLE* VMA_NOT_NULL pAllocator);\n+\n+\/\/\/ Destroys allocator object.\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(\n+ VmaAllocator VMA_NULLABLE allocator);\n+\n+\/** \\brief Returns information about existing #VmaAllocator object - handle to Vulkan device etc.\n+\n+It might be useful if you want to keep just the #VmaAllocator handle and fetch other required handles to\n+`VkPhysicalDevice`, `VkDevice` etc. every time using this function.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocatorInfo* VMA_NOT_NULL pAllocatorInfo);\n+\n+\/**\n+PhysicalDeviceProperties are fetched from physicalDevice by the allocator.\n+You can access it here, without fetching it again on your own.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkPhysicalDeviceProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceProperties);\n+\n+\/**\n+PhysicalDeviceMemoryProperties are fetched from physicalDevice by the allocator.\n+You can access it here, without fetching it again on your own.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkPhysicalDeviceMemoryProperties* VMA_NULLABLE* VMA_NOT_NULL ppPhysicalDeviceMemoryProperties);\n+\n+\/**\n+\\brief Given Memory Type Index, returns Property Flags of this memory type.\n+\n+This is just a convenience function. Same information can be obtained using\n+vmaGetMemoryProperties().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t memoryTypeIndex,\n+ VkMemoryPropertyFlags* VMA_NOT_NULL pFlags);\n+\n+\/** \\brief Sets index of the current frame.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t frameIndex);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_stats\n+@{\n+*\/\n+\n+\/** \\brief Retrieves statistics from current state of the Allocator.\n+\n+This function is called \"calculate\" not \"get\" because it has to traverse all\n+internal data structures, so it may be quite slow. Use it for debugging purposes.\n+For faster but more brief statistics suitable to be called every frame or every allocation,\n+use vmaGetHeapBudgets().\n+\n+Note that when using allocator from multiple threads, returned information may immediately\n+become outdated.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaTotalStatistics* VMA_NOT_NULL pStats);\n+\n+\/** \\brief Retrieves information about current memory usage and budget for all memory heaps.\n+\n+\\param allocator\n+\\param[out] pBudgets Must point to array with number of elements at least equal to number of memory heaps in physical device used.\n+\n+This function is called \"get\" not \"calculate\" because it is very fast, suitable to be called\n+every frame or every allocation. For more detailed statistics use vmaCalculateStatistics().\n+\n+Note that when using allocator from multiple threads, returned information may immediately\n+become outdated.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaBudget* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(\"VkPhysicalDeviceMemoryProperties::memoryHeapCount\") pBudgets);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/**\n+\\brief Helps to find memoryTypeIndex, given memoryTypeBits and VmaAllocationCreateInfo.\n+\n+This algorithm tries to find a memory type that:\n+\n+- Is allowed by memoryTypeBits.\n+- Contains all the flags from pAllocationCreateInfo->requiredFlags.\n+- Matches intended usage.\n+- Has as many flags from pAllocationCreateInfo->preferredFlags as possible.\n+\n+\\return Returns VK_ERROR_FEATURE_NOT_PRESENT if not found. Receiving such result\n+from this function or any other allocating function probably means that your\n+device doesn't support any memory type with requested features for the specific\n+type of resource you want to use it for. Please check parameters of your\n+resource, like image layout (OPTIMAL versus LINEAR) or mip level count.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t memoryTypeBits,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\n+\n+\/**\n+\\brief Helps to find memoryTypeIndex, given VkBufferCreateInfo and VmaAllocationCreateInfo.\n+\n+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.\n+It internally creates a temporary, dummy buffer that never has memory bound.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\n+\n+\/**\n+\\brief Helps to find memoryTypeIndex, given VkImageCreateInfo and VmaAllocationCreateInfo.\n+\n+It can be useful e.g. to determine value to be used as VmaPoolCreateInfo::memoryTypeIndex.\n+It internally creates a temporary, dummy image that never has memory bound.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ uint32_t* VMA_NOT_NULL pMemoryTypeIndex);\n+\n+\/** \\brief Allocates Vulkan device memory and creates #VmaPool object.\n+\n+\\param allocator Allocator object.\n+\\param pCreateInfo Parameters of pool to create.\n+\\param[out] pPool Handle to created pool.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VmaPoolCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaPool VMA_NULLABLE* VMA_NOT_NULL pPool);\n+\n+\/** \\brief Destroys #VmaPool object and frees Vulkan device memory.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NULLABLE pool);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_stats\n+@{\n+*\/\n+\n+\/** \\brief Retrieves statistics of existing #VmaPool object.\n+\n+\\param allocator Allocator object.\n+\\param pool Pool object.\n+\\param[out] pPoolStats Statistics of specified pool.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NOT_NULL pool,\n+ VmaStatistics* VMA_NOT_NULL pPoolStats);\n+\n+\/** \\brief Retrieves detailed statistics of existing #VmaPool object.\n+\n+\\param allocator Allocator object.\n+\\param pool Pool object.\n+\\param[out] pPoolStats Statistics of specified pool.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NOT_NULL pool,\n+ VmaDetailedStatistics* VMA_NOT_NULL pPoolStats);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_alloc\n+@{\n+*\/\n+\n+\/** \\brief Checks magic number in margins around all allocations in given memory pool in search for corruptions.\n+\n+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,\n+`VMA_DEBUG_MARGIN` is defined to nonzero and the pool is created in memory type that is\n+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).\n+\n+Possible return values:\n+\n+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for specified pool.\n+- `VK_SUCCESS` - corruption detection has been performed and succeeded.\n+- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations.\n+ `VMA_ASSERT` is also fired in that case.\n+- Other value: Error returned by Vulkan, e.g. memory mapping failure.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NOT_NULL pool);\n+\n+\/** \\brief Retrieves name of a custom pool.\n+\n+After the call `ppName` is either null or points to an internally-owned null-terminated string\n+containing name of the pool that was previously set. The pointer becomes invalid when the pool is\n+destroyed or its name is changed using vmaSetPoolName().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NOT_NULL pool,\n+ const char* VMA_NULLABLE* VMA_NOT_NULL ppName);\n+\n+\/** \\brief Sets name of a custom pool.\n+\n+`pName` can be either null or pointer to a null-terminated string with new name for the pool.\n+Function makes internal copy of the string, so it can be changed or freed immediately after this call.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaPool VMA_NOT_NULL pool,\n+ const char* VMA_NULLABLE pName);\n+\n+\/** \\brief General purpose memory allocation.\n+\n+\\param allocator\n+\\param pVkMemoryRequirements\n+\\param pCreateInfo\n+\\param[out] pAllocation Handle to allocated memory.\n+\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\n+\n+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().\n+\n+It is recommended to use vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage(),\n+vmaCreateBuffer(), vmaCreateImage() instead whenever possible.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkMemoryRequirements* VMA_NOT_NULL pVkMemoryRequirements,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief General purpose memory allocation for multiple allocation objects at once.\n+\n+\\param allocator Allocator object.\n+\\param pVkMemoryRequirements Memory requirements for each allocation.\n+\\param pCreateInfo Creation parameters for each allocation.\n+\\param allocationCount Number of allocations to make.\n+\\param[out] pAllocations Pointer to array that will be filled with handles to created allocations.\n+\\param[out] pAllocationInfo Optional. Pointer to array that will be filled with parameters of created allocations.\n+\n+You should free the memory using vmaFreeMemory() or vmaFreeMemoryPages().\n+\n+Word \"pages\" is just a suggestion to use this function to allocate pieces of memory needed for sparse binding.\n+It is just a general purpose allocation function able to make multiple allocations at once.\n+It may be internally optimized to be more efficient than calling vmaAllocateMemory() `allocationCount` times.\n+\n+All allocations are made using same parameters. All of them are created out of the same memory pool and type.\n+If any allocation fails, all allocations already made within this function call are also freed, so that when\n+returned result is not `VK_SUCCESS`, `pAllocation` array is always entirely filled with `VK_NULL_HANDLE`.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkMemoryRequirements* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pVkMemoryRequirements,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pCreateInfo,\n+ size_t allocationCount,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations,\n+ VmaAllocationInfo* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) pAllocationInfo);\n+\n+\/** \\brief Allocates memory suitable for given `VkBuffer`.\n+\n+\\param allocator\n+\\param buffer\n+\\param pCreateInfo\n+\\param[out] pAllocation Handle to allocated memory.\n+\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\n+\n+It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindBufferMemory().\n+\n+This is a special-purpose function. In most cases you should use vmaCreateBuffer().\n+\n+You must free the allocation using vmaFreeMemory() when no longer needed.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief Allocates memory suitable for given `VkImage`.\n+\n+\\param allocator\n+\\param image\n+\\param pCreateInfo\n+\\param[out] pAllocation Handle to allocated memory.\n+\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\n+\n+It only creates #VmaAllocation. To bind the memory to the buffer, use vmaBindImageMemory().\n+\n+This is a special-purpose function. In most cases you should use vmaCreateImage().\n+\n+You must free the allocation using vmaFreeMemory() when no longer needed.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VkImage VMA_NOT_NULL_NON_DISPATCHABLE image,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief Frees memory previously allocated using vmaAllocateMemory(), vmaAllocateMemoryForBuffer(), or vmaAllocateMemoryForImage().\n+\n+Passing `VK_NULL_HANDLE` as `allocation` is valid. Such function call is just skipped.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VmaAllocation VMA_NULLABLE allocation);\n+\n+\/** \\brief Frees memory and destroys multiple allocations.\n+\n+Word \"pages\" is just a suggestion to use this function to free pieces of memory used for sparse binding.\n+It is just a general purpose function to free memory and destroy allocations made using e.g. vmaAllocateMemory(),\n+vmaAllocateMemoryPages() and other functions.\n+It may be internally optimized to be more efficient than calling vmaFreeMemory() `allocationCount` times.\n+\n+Allocations in `pAllocations` array can come from any memory pools and types.\n+Passing `VK_NULL_HANDLE` as elements of `pAllocations` array is valid. Such entries are just skipped.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ size_t allocationCount,\n+ const VmaAllocation VMA_NULLABLE* VMA_NOT_NULL VMA_LEN_IF_NOT_NULL(allocationCount) pAllocations);\n+\n+\/** \\brief Returns current information about specified allocation.\n+\n+Current paramteres of given allocation are returned in `pAllocationInfo`.\n+\n+Although this function doesn't lock any mutex, so it should be quite efficient,\n+you should avoid calling it too often.\n+You can retrieve same VmaAllocationInfo structure while creating your resource, from function\n+vmaCreateBuffer(), vmaCreateImage(). You can remember it if you are sure parameters don't change\n+(e.g. due to defragmentation).\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VmaAllocationInfo* VMA_NOT_NULL pAllocationInfo);\n+\n+\/** \\brief Sets pUserData in given allocation to new value.\n+\n+The value of pointer `pUserData` is copied to allocation's `pUserData`.\n+It is opaque, so you can use it however you want - e.g.\n+as a pointer, ordinal number or some handle to you own data.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ void* VMA_NULLABLE pUserData);\n+\n+\/** \\brief Sets pName in given allocation to new value.\n+\n+`pName` must be either null, or pointer to a null-terminated string. The function\n+makes local copy of the string and sets it as allocation's `pName`. String\n+passed as pName doesn't need to be valid for whole lifetime of the allocation -\n+you can free it after this call. String previously pointed by allocation's\n+`pName` is freed from memory.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ const char* VMA_NULLABLE pName);\n+\n+\/**\n+\\brief Given an allocation, returns Property Flags of its memory type.\n+\n+This is just a convenience function. Same information can be obtained using\n+vmaGetAllocationInfo() + vmaGetMemoryProperties().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkMemoryPropertyFlags* VMA_NOT_NULL pFlags);\n+\n+\/** \\brief Maps memory represented by given allocation and returns pointer to it.\n+\n+Maps memory represented by given allocation to make it accessible to CPU code.\n+When succeeded, `*ppData` contains pointer to first byte of this memory.\n+\n+\\warning\n+If the allocation is part of a bigger `VkDeviceMemory` block, returned pointer is\n+correctly offsetted to the beginning of region assigned to this particular allocation.\n+Unlike the result of `vkMapMemory`, it points to the allocation, not to the beginning of the whole block.\n+You should not add VmaAllocationInfo::offset to it!\n+\n+Mapping is internally reference-counted and synchronized, so despite raw Vulkan\n+function `vkMapMemory()` cannot be used to map same block of `VkDeviceMemory`\n+multiple times simultaneously, it is safe to call this function on allocations\n+assigned to the same memory block. Actual Vulkan memory will be mapped on first\n+mapping and unmapped on last unmapping.\n+\n+If the function succeeded, you must call vmaUnmapMemory() to unmap the\n+allocation when mapping is no longer needed or before freeing the allocation, at\n+the latest.\n+\n+It also safe to call this function multiple times on the same allocation. You\n+must call vmaUnmapMemory() same number of times as you called vmaMapMemory().\n+\n+It is also safe to call this function on allocation created with\n+#VMA_ALLOCATION_CREATE_MAPPED_BIT flag. Its memory stays mapped all the time.\n+You must still call vmaUnmapMemory() same number of times as you called\n+vmaMapMemory(). You must not call vmaUnmapMemory() additional time to free the\n+\"0-th\" mapping made automatically due to #VMA_ALLOCATION_CREATE_MAPPED_BIT flag.\n+\n+This function fails when used on allocation made in memory type that is not\n+`HOST_VISIBLE`.\n+\n+This function doesn't automatically flush or invalidate caches.\n+If the allocation is made from a memory types that is not `HOST_COHERENT`,\n+you also need to use vmaInvalidateAllocation() \/ vmaFlushAllocation(), as required by Vulkan specification.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ void* VMA_NULLABLE* VMA_NOT_NULL ppData);\n+\n+\/** \\brief Unmaps memory represented by given allocation, mapped previously using vmaMapMemory().\n+\n+For details, see description of vmaMapMemory().\n+\n+This function doesn't automatically flush or invalidate caches.\n+If the allocation is made from a memory types that is not `HOST_COHERENT`,\n+you also need to use vmaInvalidateAllocation() \/ vmaFlushAllocation(), as required by Vulkan specification.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation);\n+\n+\/** \\brief Flushes memory of given allocation.\n+\n+Calls `vkFlushMappedMemoryRanges()` for memory associated with given range of given allocation.\n+It needs to be called after writing to a mapped memory for memory types that are not `HOST_COHERENT`.\n+Unmap operation doesn't do that automatically.\n+\n+- `offset` must be relative to the beginning of allocation.\n+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.\n+- `offset` and `size` don't have to be aligned.\n+ They are internally rounded down\/up to multiply of `nonCoherentAtomSize`.\n+- If `size` is 0, this call is ignored.\n+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,\n+ this call is ignored.\n+\n+Warning! `offset` and `size` are relative to the contents of given `allocation`.\n+If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.\n+Do not pass allocation's offset as `offset`!!!\n+\n+This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is\n+called, otherwise `VK_SUCCESS`.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkDeviceSize offset,\n+ VkDeviceSize size);\n+\n+\/** \\brief Invalidates memory of given allocation.\n+\n+Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given range of given allocation.\n+It needs to be called before reading from a mapped memory for memory types that are not `HOST_COHERENT`.\n+Map operation doesn't do that automatically.\n+\n+- `offset` must be relative to the beginning of allocation.\n+- `size` can be `VK_WHOLE_SIZE`. It means all memory from `offset` the the end of given allocation.\n+- `offset` and `size` don't have to be aligned.\n+ They are internally rounded down\/up to multiply of `nonCoherentAtomSize`.\n+- If `size` is 0, this call is ignored.\n+- If memory type that the `allocation` belongs to is not `HOST_VISIBLE` or it is `HOST_COHERENT`,\n+ this call is ignored.\n+\n+Warning! `offset` and `size` are relative to the contents of given `allocation`.\n+If you mean whole allocation, you can pass 0 and `VK_WHOLE_SIZE`, respectively.\n+Do not pass allocation's offset as `offset`!!!\n+\n+This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if\n+it is called, otherwise `VK_SUCCESS`.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkDeviceSize offset,\n+ VkDeviceSize size);\n+\n+\/** \\brief Flushes memory of given set of allocations.\n+\n+Calls `vkFlushMappedMemoryRanges()` for memory associated with given ranges of given allocations.\n+For more information, see documentation of vmaFlushAllocation().\n+\n+\\param allocator\n+\\param allocationCount\n+\\param allocations\n+\\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero.\n+\\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations.\n+\n+This function returns the `VkResult` from `vkFlushMappedMemoryRanges` if it is\n+called, otherwise `VK_SUCCESS`.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t allocationCount,\n+ const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations,\n+ const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets,\n+ const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes);\n+\n+\/** \\brief Invalidates memory of given set of allocations.\n+\n+Calls `vkInvalidateMappedMemoryRanges()` for memory associated with given ranges of given allocations.\n+For more information, see documentation of vmaInvalidateAllocation().\n+\n+\\param allocator\n+\\param allocationCount\n+\\param allocations\n+\\param offsets If not null, it must point to an array of offsets of regions to flush, relative to the beginning of respective allocations. Null means all ofsets are zero.\n+\\param sizes If not null, it must point to an array of sizes of regions to flush in respective allocations. Null means `VK_WHOLE_SIZE` for all allocations.\n+\n+This function returns the `VkResult` from `vkInvalidateMappedMemoryRanges` if it is\n+called, otherwise `VK_SUCCESS`.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t allocationCount,\n+ const VmaAllocation VMA_NOT_NULL* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) allocations,\n+ const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) offsets,\n+ const VkDeviceSize* VMA_NULLABLE VMA_LEN_IF_NOT_NULL(allocationCount) sizes);\n+\n+\/** \\brief Checks magic number in margins around all allocations in given memory types (in both default and custom pools) in search for corruptions.\n+\n+\\param allocator\n+\\param memoryTypeBits Bit mask, where each bit set means that a memory type with that index should be checked.\n+\n+Corruption detection is enabled only when `VMA_DEBUG_DETECT_CORRUPTION` macro is defined to nonzero,\n+`VMA_DEBUG_MARGIN` is defined to nonzero and only for memory types that are\n+`HOST_VISIBLE` and `HOST_COHERENT`. For more information, see [Corruption detection](@ref debugging_memory_usage_corruption_detection).\n+\n+Possible return values:\n+\n+- `VK_ERROR_FEATURE_NOT_PRESENT` - corruption detection is not enabled for any of specified memory types.\n+- `VK_SUCCESS` - corruption detection has been performed and succeeded.\n+- `VK_ERROR_UNKNOWN` - corruption detection has been performed and found memory corruptions around one of the allocations.\n+ `VMA_ASSERT` is also fired in that case.\n+- Other value: Error returned by Vulkan, e.g. memory mapping failure.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ uint32_t memoryTypeBits);\n+\n+\/** \\brief Begins defragmentation process.\n+\n+\\param allocator Allocator object.\n+\\param pInfo Structure filled with parameters of defragmentation.\n+\\param[out] pContext Context object that must be passed to vmaEndDefragmentation() to finish defragmentation.\n+\\returns\n+- `VK_SUCCESS` if defragmentation can begin.\n+- `VK_ERROR_FEATURE_NOT_PRESENT` if defragmentation is not supported.\n+\n+For more information about defragmentation, see documentation chapter:\n+[Defragmentation](@ref defragmentation).\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VmaDefragmentationInfo* VMA_NOT_NULL pInfo,\n+ VmaDefragmentationContext VMA_NULLABLE* VMA_NOT_NULL pContext);\n+\n+\/** \\brief Ends defragmentation process.\n+\n+\\param allocator Allocator object.\n+\\param context Context object that has been created by vmaBeginDefragmentation().\n+\\param[out] pStats Optional stats for the defragmentation. Can be null.\n+\n+Use this function to finish defragmentation started by vmaBeginDefragmentation().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaDefragmentationContext VMA_NOT_NULL context,\n+ VmaDefragmentationStats* VMA_NULLABLE pStats);\n+\n+\/** \\brief Starts single defragmentation pass.\n+\n+\\param allocator Allocator object.\n+\\param context Context object that has been created by vmaBeginDefragmentation().\n+\\param[out] pPassInfo Computed informations for current pass.\n+\\returns\n+- `VK_SUCCESS` if no more moves are possible. Then you can omit call to vmaEndDefragmentationPass() and simply end whole defragmentation.\n+- `VK_INCOMPLETE` if there are pending moves returned in `pPassInfo`. You need to perform them, call vmaEndDefragmentationPass(),\n+ and then preferably try another pass with vmaBeginDefragmentationPass().\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaDefragmentationContext VMA_NOT_NULL context,\n+ VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo);\n+\n+\/** \\brief Ends single defragmentation pass.\n+\n+\\param allocator Allocator object.\n+\\param context Context object that has been created by vmaBeginDefragmentation().\n+\\param pPassInfo Computed informations for current pass filled by vmaBeginDefragmentationPass() and possibly modified by you.\n+\n+Returns `VK_SUCCESS` if no more moves are possible or `VK_INCOMPLETE` if more defragmentations are possible.\n+\n+Ends incremental defragmentation pass and commits all defragmentation moves from `pPassInfo`.\n+After this call:\n+\n+- Allocations at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY\n+ (which is the default) will be pointing to the new destination place.\n+- Allocation at `pPassInfo[i].srcAllocation` that had `pPassInfo[i].operation ==` #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY\n+ will be freed.\n+\n+If no more moves are possible you can end whole defragmentation.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaDefragmentationContext VMA_NOT_NULL context,\n+ VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo);\n+\n+\/** \\brief Binds buffer to allocation.\n+\n+Binds specified buffer to region of memory represented by specified allocation.\n+Gets `VkDeviceMemory` handle and offset from the allocation.\n+If you want to create a buffer, allocate memory for it and bind them together separately,\n+you should use this function for binding instead of standard `vkBindBufferMemory()`,\n+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple\n+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously\n+(which is illegal in Vulkan).\n+\n+It is recommended to use function vmaCreateBuffer() instead of this one.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer);\n+\n+\/** \\brief Binds buffer to allocation with additional parameters.\n+\n+\\param allocator\n+\\param allocation\n+\\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0.\n+\\param buffer\n+\\param pNext A chain of structures to be attached to `VkBindBufferMemoryInfoKHR` structure used internally. Normally it should be null.\n+\n+This function is similar to vmaBindBufferMemory(), but it provides additional parameters.\n+\n+If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag\n+or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer VMA_NOT_NULL_NON_DISPATCHABLE buffer,\n+ const void* VMA_NULLABLE pNext);\n+\n+\/** \\brief Binds image to allocation.\n+\n+Binds specified image to region of memory represented by specified allocation.\n+Gets `VkDeviceMemory` handle and offset from the allocation.\n+If you want to create an image, allocate memory for it and bind them together separately,\n+you should use this function for binding instead of standard `vkBindImageMemory()`,\n+because it ensures proper synchronization so that when a `VkDeviceMemory` object is used by multiple\n+allocations, calls to `vkBind*Memory()` or `vkMapMemory()` won't happen from multiple threads simultaneously\n+(which is illegal in Vulkan).\n+\n+It is recommended to use function vmaCreateImage() instead of this one.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkImage VMA_NOT_NULL_NON_DISPATCHABLE image);\n+\n+\/** \\brief Binds image to allocation with additional parameters.\n+\n+\\param allocator\n+\\param allocation\n+\\param allocationLocalOffset Additional offset to be added while binding, relative to the beginning of the `allocation`. Normally it should be 0.\n+\\param image\n+\\param pNext A chain of structures to be attached to `VkBindImageMemoryInfoKHR` structure used internally. Normally it should be null.\n+\n+This function is similar to vmaBindImageMemory(), but it provides additional parameters.\n+\n+If `pNext` is not null, #VmaAllocator object must have been created with #VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT flag\n+or with VmaAllocatorCreateInfo::vulkanApiVersion `>= VK_API_VERSION_1_1`. Otherwise the call fails.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage VMA_NOT_NULL_NON_DISPATCHABLE image,\n+ const void* VMA_NULLABLE pNext);\n+\n+\/** \\brief Creates a new `VkBuffer`, allocates and binds memory for it.\n+\n+\\param allocator\n+\\param pBufferCreateInfo\n+\\param pAllocationCreateInfo\n+\\param[out] pBuffer Buffer that was created.\n+\\param[out] pAllocation Allocation that was created.\n+\\param[out] pAllocationInfo Optional. Information about allocated memory. It can be later fetched using function vmaGetAllocationInfo().\n+\n+This function automatically:\n+\n+-# Creates buffer.\n+-# Allocates appropriate memory for it.\n+-# Binds the buffer with the memory.\n+\n+If any of these operations fail, buffer and allocation are not created,\n+returned value is negative error code, *pBuffer and *pAllocation are null.\n+\n+If the function succeeded, you must destroy both buffer and allocation when you\n+no longer need them using either convenience function vmaDestroyBuffer() or\n+separately, using `vkDestroyBuffer()` and vmaFreeMemory().\n+\n+If #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag was used,\n+VK_KHR_dedicated_allocation extension is used internally to query driver whether\n+it requires or prefers the new buffer to have dedicated allocation. If yes,\n+and if dedicated allocation is possible\n+(#VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT is not used), it creates dedicated\n+allocation for this buffer, just like when using\n+#VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+\n+\\note This function creates a new `VkBuffer`. Sub-allocation of parts of one large buffer,\n+although recommended as a good practice, is out of scope of this library and could be implemented\n+by the user as a higher-level logic on top of VMA.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief Creates a buffer with additional minimum alignment.\n+\n+Similar to vmaCreateBuffer() but provides additional parameter `minAlignment` which allows to specify custom,\n+minimum alignment to be used when placing the buffer inside a larger memory block, which may be needed e.g.\n+for interop with OpenGL.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkBufferCreateInfo* VMA_NOT_NULL pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ VkDeviceSize minAlignment,\n+ VkBuffer VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pBuffer,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief Destroys Vulkan buffer and frees allocated memory.\n+\n+This is just a convenience function equivalent to:\n+\n+\\code\n+vkDestroyBuffer(device, buffer, allocationCallbacks);\n+vmaFreeMemory(allocator, allocation);\n+\\endcode\n+\n+It it safe to pass null as buffer and\/or allocation.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VkBuffer VMA_NULLABLE_NON_DISPATCHABLE buffer,\n+ VmaAllocation VMA_NULLABLE allocation);\n+\n+\/\/\/ Function similar to vmaCreateBuffer().\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ const VkImageCreateInfo* VMA_NOT_NULL pImageCreateInfo,\n+ const VmaAllocationCreateInfo* VMA_NOT_NULL pAllocationCreateInfo,\n+ VkImage VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pImage,\n+ VmaAllocation VMA_NULLABLE* VMA_NOT_NULL pAllocation,\n+ VmaAllocationInfo* VMA_NULLABLE pAllocationInfo);\n+\n+\/** \\brief Destroys Vulkan image and frees allocated memory.\n+\n+This is just a convenience function equivalent to:\n+\n+\\code\n+vkDestroyImage(device, image, allocationCallbacks);\n+vmaFreeMemory(allocator, allocation);\n+\\endcode\n+\n+It it safe to pass null as image and\/or allocation.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VkImage VMA_NULLABLE_NON_DISPATCHABLE image,\n+ VmaAllocation VMA_NULLABLE allocation);\n+\n+\/** @} *\/\n+\n+\/**\n+\\addtogroup group_virtual\n+@{\n+*\/\n+\n+\/** \\brief Creates new #VmaVirtualBlock object.\n+\n+\\param pCreateInfo Parameters for creation.\n+\\param[out] pVirtualBlock Returned virtual block object or `VMA_NULL` if creation failed.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(\n+ const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaVirtualBlock VMA_NULLABLE* VMA_NOT_NULL pVirtualBlock);\n+\n+\/** \\brief Destroys #VmaVirtualBlock object.\n+\n+Please note that you should consciously handle virtual allocations that could remain unfreed in the block.\n+You should either free them individually using vmaVirtualFree() or call vmaClearVirtualBlock()\n+if you are sure this is what you want. If you do neither, an assert is called.\n+\n+If you keep pointers to some additional metadata associated with your virtual allocations in their `pUserData`,\n+don't forget to free them.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(\n+ VmaVirtualBlock VMA_NULLABLE virtualBlock);\n+\n+\/** \\brief Returns true of the #VmaVirtualBlock is empty - contains 0 virtual allocations and has all its space available for new allocations.\n+*\/\n+VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock);\n+\n+\/** \\brief Returns information about a specific virtual allocation within a virtual block, like its size and `pUserData` pointer.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo);\n+\n+\/** \\brief Allocates new virtual allocation inside given #VmaVirtualBlock.\n+\n+If the allocation fails due to not enough free space available, `VK_ERROR_OUT_OF_DEVICE_MEMORY` is returned\n+(despite the function doesn't ever allocate actual GPU memory).\n+`pAllocation` is then set to `VK_NULL_HANDLE` and `pOffset`, if not null, it set to `UINT64_MAX`.\n+\n+\\param virtualBlock Virtual block\n+\\param pCreateInfo Parameters for the allocation\n+\\param[out] pAllocation Returned handle of the new allocation\n+\\param[out] pOffset Returned offset of the new allocation. Optional, can be null.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation,\n+ VkDeviceSize* VMA_NULLABLE pOffset);\n+\n+\/** \\brief Frees virtual allocation inside given #VmaVirtualBlock.\n+\n+It is correct to call this function with `allocation == VK_NULL_HANDLE` - it does nothing.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation);\n+\n+\/** \\brief Frees all virtual allocations inside given #VmaVirtualBlock.\n+\n+You must either call this function or free each virtual allocation individually with vmaVirtualFree()\n+before destroying a virtual block. Otherwise, an assert is called.\n+\n+If you keep pointer to some additional metadata associated with your virtual allocation in its `pUserData`,\n+don't forget to free it as well.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock);\n+\n+\/** \\brief Changes custom pointer associated with given virtual allocation.\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation,\n+ void* VMA_NULLABLE pUserData);\n+\n+\/** \\brief Calculates and returns statistics about virtual allocations and memory usage in given #VmaVirtualBlock.\n+\n+This function is fast to call. For more detailed statistics, see vmaCalculateVirtualBlockStatistics().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaStatistics* VMA_NOT_NULL pStats);\n+\n+\/** \\brief Calculates and returns detailed statistics about virtual allocations and memory usage in given #VmaVirtualBlock.\n+\n+This function is slow to call. Use for debugging purposes.\n+For less detailed statistics, see vmaGetVirtualBlockStatistics().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaDetailedStatistics* VMA_NOT_NULL pStats);\n+\n+\/** @} *\/\n+\n+#if VMA_STATS_STRING_ENABLED\n+\/**\n+\\addtogroup group_stats\n+@{\n+*\/\n+\n+\/** \\brief Builds and returns a null-terminated string in JSON format with information about given #VmaVirtualBlock.\n+\\param virtualBlock Virtual block.\n+\\param[out] ppStatsString Returned string.\n+\\param detailedMap Pass `VK_FALSE` to only obtain statistics as returned by vmaCalculateVirtualBlockStatistics(). Pass `VK_TRUE` to also obtain full list of allocations and free spaces.\n+\n+Returned string must be freed using vmaFreeVirtualBlockStatsString().\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString,\n+ VkBool32 detailedMap);\n+\n+\/\/\/ Frees a string returned by vmaBuildVirtualBlockStatsString().\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(\n+ VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ char* VMA_NULLABLE pStatsString);\n+\n+\/** \\brief Builds and returns statistics as a null-terminated string in JSON format.\n+\\param allocator\n+\\param[out] ppStatsString Must be freed using vmaFreeStatsString() function.\n+\\param detailedMap\n+*\/\n+VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ char* VMA_NULLABLE* VMA_NOT_NULL ppStatsString,\n+ VkBool32 detailedMap);\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ char* VMA_NULLABLE pStatsString);\n+\n+\/** @} *\/\n+\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+#endif \/\/ _VMA_FUNCTION_HEADERS\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif \/\/ AMD_VULKAN_MEMORY_ALLOCATOR_H\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ \n+\/\/ IMPLEMENTATION\n+\/\/ \n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+\/\/ For Visual Studio IntelliSense.\n+#if defined(__cplusplus) && defined(__INTELLISENSE__)\n+#define VMA_IMPLEMENTATION\n+#endif\n+\n+#ifdef VMA_IMPLEMENTATION\n+#undef VMA_IMPLEMENTATION\n+\n+#include <cstdint>\n+#include <cstdlib>\n+#include <cstring>\n+#include <utility>\n+\n+#ifdef _MSC_VER\n+ #include <intrin.h> \/\/ For functions like __popcnt, _BitScanForward etc.\n+#endif\n+\n+\/*******************************************************************************\n+CONFIGURATION SECTION\n+\n+Define some of these macros before each #include of this header or change them\n+here if you need other then default behavior depending on your environment.\n+*\/\n+#ifndef _VMA_CONFIGURATION\n+\n+\/*\n+Define this macro to 1 to make the library fetch pointers to Vulkan functions\n+internally, like:\n+\n+ vulkanFunctions.vkAllocateMemory = &vkAllocateMemory;\n+*\/\n+#if !defined(VMA_STATIC_VULKAN_FUNCTIONS) && !defined(VK_NO_PROTOTYPES)\n+ #define VMA_STATIC_VULKAN_FUNCTIONS 1\n+#endif\n+\n+\/*\n+Define this macro to 1 to make the library fetch pointers to Vulkan functions\n+internally, like:\n+\n+ vulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkGetDeviceProcAddr(device, \"vkAllocateMemory\");\n+\n+To use this feature in new versions of VMA you now have to pass\n+VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as\n+VmaAllocatorCreateInfo::pVulkanFunctions. Other members can be null.\n+*\/\n+#if !defined(VMA_DYNAMIC_VULKAN_FUNCTIONS)\n+ #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1\n+#endif\n+\n+#ifndef VMA_USE_STL_SHARED_MUTEX\n+ \/\/ Compiler conforms to C++17.\n+ #if __cplusplus >= 201703L\n+ #define VMA_USE_STL_SHARED_MUTEX 1\n+ \/\/ Visual studio defines __cplusplus properly only when passed additional parameter: \/Zc:__cplusplus\n+ \/\/ Otherwise it is always 199711L, despite shared_mutex works since Visual Studio 2015 Update 2.\n+ #elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && __cplusplus == 199711L && _MSVC_LANG >= 201703L\n+ #define VMA_USE_STL_SHARED_MUTEX 1\n+ #else\n+ #define VMA_USE_STL_SHARED_MUTEX 0\n+ #endif\n+#endif\n+\n+\/*\n+Define this macro to include custom header files without having to edit this file directly, e.g.:\n+\n+ \/\/ Inside of \"my_vma_configuration_user_includes.h\":\n+\n+ #include \"my_custom_assert.h\" \/\/ for MY_CUSTOM_ASSERT\n+ #include \"my_custom_min.h\" \/\/ for my_custom_min\n+ #include <algorithm>\n+ #include <mutex>\n+\n+ \/\/ Inside a different file, which includes \"vk_mem_alloc.h\":\n+\n+ #define VMA_CONFIGURATION_USER_INCLUDES_H \"my_vma_configuration_user_includes.h\"\n+ #define VMA_ASSERT(expr) MY_CUSTOM_ASSERT(expr)\n+ #define VMA_MIN(v1, v2) (my_custom_min(v1, v2))\n+ #include \"vk_mem_alloc.h\"\n+ ...\n+\n+The following headers are used in this CONFIGURATION section only, so feel free to\n+remove them if not needed.\n+*\/\n+#if !defined(VMA_CONFIGURATION_USER_INCLUDES_H)\n+ #include <cassert> \/\/ for assert\n+ #include <algorithm> \/\/ for min, max\n+ #include <mutex>\n+#else\n+ #include VMA_CONFIGURATION_USER_INCLUDES_H\n+#endif\n+\n+#ifndef VMA_NULL\n+ \/\/ Value used as null pointer. Define it to e.g.: nullptr, NULL, 0, (void*)0.\n+ #define VMA_NULL nullptr\n+#endif\n+\n+#if defined(__ANDROID_API__) && (__ANDROID_API__ < 16)\n+#include <cstdlib>\n+static void* vma_aligned_alloc(size_t alignment, size_t size)\n+{\n+ \/\/ alignment must be >= sizeof(void*)\n+ if(alignment < sizeof(void*))\n+ {\n+ alignment = sizeof(void*);\n+ }\n+\n+ return memalign(alignment, size);\n+}\n+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))\n+#include <cstdlib>\n+\n+#if defined(__APPLE__)\n+#include <AvailabilityMacros.h>\n+#endif\n+\n+static void* vma_aligned_alloc(size_t alignment, size_t size)\n+{\n+ \/\/ Unfortunately, aligned_alloc causes VMA to crash due to it returning null pointers. (At least under 11.4)\n+ \/\/ Therefore, for now disable this specific exception until a proper solution is found.\n+ \/\/#if defined(__APPLE__) && (defined(MAC_OS_X_VERSION_10_16) || defined(__IPHONE_14_0))\n+ \/\/#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0\n+ \/\/ \/\/ For C++14, usr\/include\/malloc\/_malloc.h declares aligned_alloc()) only\n+ \/\/ \/\/ with the MacOSX11.0 SDK in Xcode 12 (which is what adds\n+ \/\/ \/\/ MAC_OS_X_VERSION_10_16), even though the function is marked\n+ \/\/ \/\/ availabe for 10.15. That is why the preprocessor checks for 10.16 but\n+ \/\/ \/\/ the __builtin_available checks for 10.15.\n+ \/\/ \/\/ People who use C++17 could call aligned_alloc with the 10.15 SDK already.\n+ \/\/ if (__builtin_available(macOS 10.15, iOS 13, *))\n+ \/\/ return aligned_alloc(alignment, size);\n+ \/\/#endif\n+ \/\/#endif\n+\n+ \/\/ alignment must be >= sizeof(void*)\n+ if(alignment < sizeof(void*))\n+ {\n+ alignment = sizeof(void*);\n+ }\n+\n+ void *pointer;\n+ if(posix_memalign(&pointer, alignment, size) == 0)\n+ return pointer;\n+ return VMA_NULL;\n+}\n+#elif defined(_WIN32)\n+static void* vma_aligned_alloc(size_t alignment, size_t size)\n+{\n+ return _aligned_malloc(size, alignment);\n+}\n+#else\n+static void* vma_aligned_alloc(size_t alignment, size_t size)\n+{\n+ return aligned_alloc(alignment, size);\n+}\n+#endif\n+\n+#if defined(_WIN32)\n+static void vma_aligned_free(void* ptr)\n+{\n+ _aligned_free(ptr);\n+}\n+#else\n+static void vma_aligned_free(void* VMA_NULLABLE ptr)\n+{\n+ free(ptr);\n+}\n+#endif\n+\n+\/\/ If your compiler is not compatible with C++11 and definition of\n+\/\/ aligned_alloc() function is missing, uncommeting following line may help:\n+\n+\/\/#include <malloc.h>\n+\n+\/\/ Normal assert to check for programmer's errors, especially in Debug configuration.\n+#ifndef VMA_ASSERT\n+ #ifdef NDEBUG\n+ #define VMA_ASSERT(expr)\n+ #else\n+ #define VMA_ASSERT(expr) assert(expr)\n+ #endif\n+#endif\n+\n+\/\/ Assert that will be called very often, like inside data structures e.g. operator[].\n+\/\/ Making it non-empty can make program slow.\n+#ifndef VMA_HEAVY_ASSERT\n+ #ifdef NDEBUG\n+ #define VMA_HEAVY_ASSERT(expr)\n+ #else\n+ #define VMA_HEAVY_ASSERT(expr) \/\/VMA_ASSERT(expr)\n+ #endif\n+#endif\n+\n+#ifndef VMA_ALIGN_OF\n+ #define VMA_ALIGN_OF(type) (__alignof(type))\n+#endif\n+\n+#ifndef VMA_SYSTEM_ALIGNED_MALLOC\n+ #define VMA_SYSTEM_ALIGNED_MALLOC(size, alignment) vma_aligned_alloc((alignment), (size))\n+#endif\n+\n+#ifndef VMA_SYSTEM_ALIGNED_FREE\n+ \/\/ VMA_SYSTEM_FREE is the old name, but might have been defined by the user\n+ #if defined(VMA_SYSTEM_FREE)\n+ #define VMA_SYSTEM_ALIGNED_FREE(ptr) VMA_SYSTEM_FREE(ptr)\n+ #else\n+ #define VMA_SYSTEM_ALIGNED_FREE(ptr) vma_aligned_free(ptr)\n+ #endif\n+#endif\n+\n+#ifndef VMA_COUNT_BITS_SET\n+ \/\/ Returns number of bits set to 1 in (v)\n+ #define VMA_COUNT_BITS_SET(v) VmaCountBitsSet(v)\n+#endif\n+\n+#ifndef VMA_BITSCAN_LSB\n+ \/\/ Scans integer for index of first nonzero value from the Least Significant Bit (LSB). If mask is 0 then returns UINT8_MAX\n+ #define VMA_BITSCAN_LSB(mask) VmaBitScanLSB(mask)\n+#endif\n+\n+#ifndef VMA_BITSCAN_MSB\n+ \/\/ Scans integer for index of first nonzero value from the Most Significant Bit (MSB). If mask is 0 then returns UINT8_MAX\n+ #define VMA_BITSCAN_MSB(mask) VmaBitScanMSB(mask)\n+#endif\n+\n+#ifndef VMA_MIN\n+ #define VMA_MIN(v1, v2) ((std::min)((v1), (v2)))\n+#endif\n+\n+#ifndef VMA_MAX\n+ #define VMA_MAX(v1, v2) ((std::max)((v1), (v2)))\n+#endif\n+\n+#ifndef VMA_SWAP\n+ #define VMA_SWAP(v1, v2) std::swap((v1), (v2))\n+#endif\n+\n+#ifndef VMA_SORT\n+ #define VMA_SORT(beg, end, cmp) std::sort(beg, end, cmp)\n+#endif\n+\n+#ifndef VMA_DEBUG_LOG\n+ #define VMA_DEBUG_LOG(format, ...)\n+ \/*\n+ #define VMA_DEBUG_LOG(format, ...) do { \\\n+ printf(format, __VA_ARGS__); \\\n+ printf(\"\\n\"); \\\n+ } while(false)\n+ *\/\n+#endif\n+\n+\/\/ Define this macro to 1 to enable functions: vmaBuildStatsString, vmaFreeStatsString.\n+#if VMA_STATS_STRING_ENABLED\n+ static inline void VmaUint32ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint32_t num)\n+ {\n+ snprintf(outStr, strLen, \"%u\", static_cast<unsigned int>(num));\n+ }\n+ static inline void VmaUint64ToStr(char* VMA_NOT_NULL outStr, size_t strLen, uint64_t num)\n+ {\n+ snprintf(outStr, strLen, \"%llu\", static_cast<unsigned long long>(num));\n+ }\n+ static inline void VmaPtrToStr(char* VMA_NOT_NULL outStr, size_t strLen, const void* ptr)\n+ {\n+ snprintf(outStr, strLen, \"%p\", ptr);\n+ }\n+#endif\n+\n+#ifndef VMA_MUTEX\n+ class VmaMutex\n+ {\n+ public:\n+ void Lock() { m_Mutex.lock(); }\n+ void Unlock() { m_Mutex.unlock(); }\n+ bool TryLock() { return m_Mutex.try_lock(); }\n+ private:\n+ std::mutex m_Mutex;\n+ };\n+ #define VMA_MUTEX VmaMutex\n+#endif\n+\n+\/\/ Read-write mutex, where \"read\" is shared access, \"write\" is exclusive access.\n+#ifndef VMA_RW_MUTEX\n+ #if VMA_USE_STL_SHARED_MUTEX\n+ \/\/ Use std::shared_mutex from C++17.\n+ #include <shared_mutex>\n+ class VmaRWMutex\n+ {\n+ public:\n+ void LockRead() { m_Mutex.lock_shared(); }\n+ void UnlockRead() { m_Mutex.unlock_shared(); }\n+ bool TryLockRead() { return m_Mutex.try_lock_shared(); }\n+ void LockWrite() { m_Mutex.lock(); }\n+ void UnlockWrite() { m_Mutex.unlock(); }\n+ bool TryLockWrite() { return m_Mutex.try_lock(); }\n+ private:\n+ std::shared_mutex m_Mutex;\n+ };\n+ #define VMA_RW_MUTEX VmaRWMutex\n+ #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600\n+ \/\/ Use SRWLOCK from WinAPI.\n+ \/\/ Minimum supported client = Windows Vista, server = Windows Server 2008.\n+ class VmaRWMutex\n+ {\n+ public:\n+ VmaRWMutex() { InitializeSRWLock(&m_Lock); }\n+ void LockRead() { AcquireSRWLockShared(&m_Lock); }\n+ void UnlockRead() { ReleaseSRWLockShared(&m_Lock); }\n+ bool TryLockRead() { return TryAcquireSRWLockShared(&m_Lock) != FALSE; }\n+ void LockWrite() { AcquireSRWLockExclusive(&m_Lock); }\n+ void UnlockWrite() { ReleaseSRWLockExclusive(&m_Lock); }\n+ bool TryLockWrite() { return TryAcquireSRWLockExclusive(&m_Lock) != FALSE; }\n+ private:\n+ SRWLOCK m_Lock;\n+ };\n+ #define VMA_RW_MUTEX VmaRWMutex\n+ #else\n+ \/\/ Less efficient fallback: Use normal mutex.\n+ class VmaRWMutex\n+ {\n+ public:\n+ void LockRead() { m_Mutex.Lock(); }\n+ void UnlockRead() { m_Mutex.Unlock(); }\n+ bool TryLockRead() { return m_Mutex.TryLock(); }\n+ void LockWrite() { m_Mutex.Lock(); }\n+ void UnlockWrite() { m_Mutex.Unlock(); }\n+ bool TryLockWrite() { return m_Mutex.TryLock(); }\n+ private:\n+ VMA_MUTEX m_Mutex;\n+ };\n+ #define VMA_RW_MUTEX VmaRWMutex\n+ #endif \/\/ #if VMA_USE_STL_SHARED_MUTEX\n+#endif \/\/ #ifndef VMA_RW_MUTEX\n+\n+\/*\n+If providing your own implementation, you need to implement a subset of std::atomic.\n+*\/\n+#ifndef VMA_ATOMIC_UINT32\n+ #include <atomic>\n+ #define VMA_ATOMIC_UINT32 std::atomic<uint32_t>\n+#endif\n+\n+#ifndef VMA_ATOMIC_UINT64\n+ #include <atomic>\n+ #define VMA_ATOMIC_UINT64 std::atomic<uint64_t>\n+#endif\n+\n+#ifndef VMA_DEBUG_ALWAYS_DEDICATED_MEMORY\n+ \/**\n+ Every allocation will have its own memory block.\n+ Define to 1 for debugging purposes only.\n+ *\/\n+ #define VMA_DEBUG_ALWAYS_DEDICATED_MEMORY (0)\n+#endif\n+\n+#ifndef VMA_MIN_ALIGNMENT\n+ \/**\n+ Minimum alignment of all allocations, in bytes.\n+ Set to more than 1 for debugging purposes. Must be power of two.\n+ *\/\n+ #ifdef VMA_DEBUG_ALIGNMENT \/\/ Old name\n+ #define VMA_MIN_ALIGNMENT VMA_DEBUG_ALIGNMENT\n+ #else\n+ #define VMA_MIN_ALIGNMENT (1)\n+ #endif\n+#endif\n+\n+#ifndef VMA_DEBUG_MARGIN\n+ \/**\n+ Minimum margin after every allocation, in bytes.\n+ Set nonzero for debugging purposes only.\n+ *\/\n+ #define VMA_DEBUG_MARGIN (0)\n+#endif\n+\n+#ifndef VMA_DEBUG_INITIALIZE_ALLOCATIONS\n+ \/**\n+ Define this macro to 1 to automatically fill new allocations and destroyed\n+ allocations with some bit pattern.\n+ *\/\n+ #define VMA_DEBUG_INITIALIZE_ALLOCATIONS (0)\n+#endif\n+\n+#ifndef VMA_DEBUG_DETECT_CORRUPTION\n+ \/**\n+ Define this macro to 1 together with non-zero value of VMA_DEBUG_MARGIN to\n+ enable writing magic value to the margin after every allocation and\n+ validating it, so that memory corruptions (out-of-bounds writes) are detected.\n+ *\/\n+ #define VMA_DEBUG_DETECT_CORRUPTION (0)\n+#endif\n+\n+#ifndef VMA_DEBUG_GLOBAL_MUTEX\n+ \/**\n+ Set this to 1 for debugging purposes only, to enable single mutex protecting all\n+ entry calls to the library. Can be useful for debugging multithreading issues.\n+ *\/\n+ #define VMA_DEBUG_GLOBAL_MUTEX (0)\n+#endif\n+\n+#ifndef VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY\n+ \/**\n+ Minimum value for VkPhysicalDeviceLimits::bufferImageGranularity.\n+ Set to more than 1 for debugging purposes only. Must be power of two.\n+ *\/\n+ #define VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY (1)\n+#endif\n+\n+#ifndef VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT\n+ \/*\n+ Set this to 1 to make VMA never exceed VkPhysicalDeviceLimits::maxMemoryAllocationCount\n+ and return error instead of leaving up to Vulkan implementation what to do in such cases.\n+ *\/\n+ #define VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT (0)\n+#endif\n+\n+#ifndef VMA_SMALL_HEAP_MAX_SIZE\n+ \/\/\/ Maximum size of a memory heap in Vulkan to consider it \"small\".\n+ #define VMA_SMALL_HEAP_MAX_SIZE (1024ull * 1024 * 1024)\n+#endif\n+\n+#ifndef VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE\n+ \/\/\/ Default size of a block allocated as single VkDeviceMemory from a \"large\" heap.\n+ #define VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE (256ull * 1024 * 1024)\n+#endif\n+\n+\/*\n+Mapping hysteresis is a logic that launches when vmaMapMemory\/vmaUnmapMemory is called\n+or a persistently mapped allocation is created and destroyed several times in a row.\n+It keeps additional +1 mapping of a device memory block to prevent calling actual\n+vkMapMemory\/vkUnmapMemory too many times, which may improve performance and help\n+tools like RenderDOc.\n+*\/\n+#ifndef VMA_MAPPING_HYSTERESIS_ENABLED\n+ #define VMA_MAPPING_HYSTERESIS_ENABLED 1\n+#endif\n+\n+#ifndef VMA_CLASS_NO_COPY\n+ #define VMA_CLASS_NO_COPY(className) \\\n+ private: \\\n+ className(const className&) = delete; \\\n+ className& operator=(const className&) = delete;\n+#endif\n+\n+#define VMA_VALIDATE(cond) do { if(!(cond)) { \\\n+ VMA_ASSERT(0 && \"Validation failed: \" #cond); \\\n+ return false; \\\n+ } } while(false)\n+\n+\/*******************************************************************************\n+END OF CONFIGURATION\n+*\/\n+#endif \/\/ _VMA_CONFIGURATION\n+\n+\n+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_CREATED = 0xDC;\n+static const uint8_t VMA_ALLOCATION_FILL_PATTERN_DESTROYED = 0xEF;\n+\/\/ Decimal 2139416166, float NaN, little-endian binary 66 E6 84 7F.\n+static const uint32_t VMA_CORRUPTION_DETECTION_MAGIC_VALUE = 0x7F84E666;\n+\n+\/\/ Copy of some Vulkan definitions so we don't need to check their existence just to handle few constants.\n+static const uint32_t VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY = 0x00000040;\n+static const uint32_t VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY = 0x00000080;\n+static const uint32_t VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY = 0x00020000;\n+static const uint32_t VK_IMAGE_CREATE_DISJOINT_BIT_COPY = 0x00000200;\n+static const int32_t VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY = 1000158000;\n+static const uint32_t VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET = 0x10000000u;\n+static const uint32_t VMA_ALLOCATION_TRY_COUNT = 32;\n+static const uint32_t VMA_VENDOR_ID_AMD = 4098;\n+\n+\/\/ This one is tricky. Vulkan specification defines this code as available since\n+\/\/ Vulkan 1.0, but doesn't actually define it in Vulkan SDK earlier than 1.2.131.\n+\/\/ See pull request #207.\n+#define VK_ERROR_UNKNOWN_COPY ((VkResult)-13)\n+\n+\n+#if VMA_STATS_STRING_ENABLED\n+\/\/ Correspond to values of enum VmaSuballocationType.\n+static const char* VMA_SUBALLOCATION_TYPE_NAMES[] =\n+{\n+ \"FREE\",\n+ \"UNKNOWN\",\n+ \"BUFFER\",\n+ \"IMAGE_UNKNOWN\",\n+ \"IMAGE_LINEAR\",\n+ \"IMAGE_OPTIMAL\",\n+};\n+#endif\n+\n+static VkAllocationCallbacks VmaEmptyAllocationCallbacks =\n+ { VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL, VMA_NULL };\n+\n+\n+#ifndef _VMA_ENUM_DECLARATIONS\n+\n+enum VmaSuballocationType\n+{\n+ VMA_SUBALLOCATION_TYPE_FREE = 0,\n+ VMA_SUBALLOCATION_TYPE_UNKNOWN = 1,\n+ VMA_SUBALLOCATION_TYPE_BUFFER = 2,\n+ VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN = 3,\n+ VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR = 4,\n+ VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL = 5,\n+ VMA_SUBALLOCATION_TYPE_MAX_ENUM = 0x7FFFFFFF\n+};\n+\n+enum VMA_CACHE_OPERATION\n+{\n+ VMA_CACHE_FLUSH,\n+ VMA_CACHE_INVALIDATE\n+};\n+\n+enum class VmaAllocationRequestType\n+{\n+ Normal,\n+ TLSF,\n+ \/\/ Used by \"Linear\" algorithm.\n+ UpperAddress,\n+ EndOf1st,\n+ EndOf2nd,\n+};\n+\n+#endif \/\/ _VMA_ENUM_DECLARATIONS\n+\n+#ifndef _VMA_FORWARD_DECLARATIONS\n+\/\/ Opaque handle used by allocation algorithms to identify single allocation in any conforming way.\n+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VmaAllocHandle);\n+\n+struct VmaMutexLock;\n+struct VmaMutexLockRead;\n+struct VmaMutexLockWrite;\n+\n+template<typename T>\n+struct AtomicTransactionalIncrement;\n+\n+template<typename T>\n+struct VmaStlAllocator;\n+\n+template<typename T, typename AllocatorT>\n+class VmaVector;\n+\n+template<typename T, typename AllocatorT, size_t N>\n+class VmaSmallVector;\n+\n+template<typename T>\n+class VmaPoolAllocator;\n+\n+template<typename T>\n+struct VmaListItem;\n+\n+template<typename T>\n+class VmaRawList;\n+\n+template<typename T, typename AllocatorT>\n+class VmaList;\n+\n+template<typename ItemTypeTraits>\n+class VmaIntrusiveLinkedList;\n+\n+\/\/ Unused in this version\n+#if 0\n+template<typename T1, typename T2>\n+struct VmaPair;\n+template<typename FirstT, typename SecondT>\n+struct VmaPairFirstLess;\n+\n+template<typename KeyT, typename ValueT>\n+class VmaMap;\n+#endif\n+\n+#if VMA_STATS_STRING_ENABLED\n+class VmaStringBuilder;\n+class VmaJsonWriter;\n+#endif\n+\n+class VmaDeviceMemoryBlock;\n+\n+struct VmaDedicatedAllocationListItemTraits;\n+class VmaDedicatedAllocationList;\n+\n+struct VmaSuballocation;\n+struct VmaSuballocationOffsetLess;\n+struct VmaSuballocationOffsetGreater;\n+struct VmaSuballocationItemSizeLess;\n+\n+typedef VmaList<VmaSuballocation, VmaStlAllocator<VmaSuballocation>> VmaSuballocationList;\n+\n+struct VmaAllocationRequest;\n+\n+class VmaBlockMetadata;\n+class VmaBlockMetadata_Linear;\n+class VmaBlockMetadata_TLSF;\n+\n+class VmaBlockVector;\n+\n+struct VmaPoolListItemTraits;\n+\n+struct VmaCurrentBudgetData;\n+\n+class VmaAllocationObjectAllocator;\n+\n+#endif \/\/ _VMA_FORWARD_DECLARATIONS\n+\n+\n+#ifndef _VMA_FUNCTIONS\n+\n+\/*\n+Returns number of bits set to 1 in (v).\n+\n+On specific platforms and compilers you can use instrinsics like:\n+\n+Visual Studio:\n+ return __popcnt(v);\n+GCC, Clang:\n+ return static_cast<uint32_t>(__builtin_popcount(v));\n+\n+Define macro VMA_COUNT_BITS_SET to provide your optimized implementation.\n+But you need to check in runtime whether user's CPU supports these, as some old processors don't.\n+*\/\n+static inline uint32_t VmaCountBitsSet(uint32_t v)\n+{\n+ uint32_t c = v - ((v >> 1) & 0x55555555);\n+ c = ((c >> 2) & 0x33333333) + (c & 0x33333333);\n+ c = ((c >> 4) + c) & 0x0F0F0F0F;\n+ c = ((c >> 8) + c) & 0x00FF00FF;\n+ c = ((c >> 16) + c) & 0x0000FFFF;\n+ return c;\n+}\n+\n+static inline uint8_t VmaBitScanLSB(uint64_t mask)\n+{\n+#if defined(_MSC_VER) && defined(_WIN64)\n+ unsigned long pos;\n+ if (_BitScanForward64(&pos, mask))\n+ return static_cast<uint8_t>(pos);\n+ return UINT8_MAX;\n+#elif defined __GNUC__ || defined __clang__\n+ return static_cast<uint8_t>(__builtin_ffsll(mask)) - 1U;\n+#else\n+ uint8_t pos = 0;\n+ uint64_t bit = 1;\n+ do\n+ {\n+ if (mask & bit)\n+ return pos;\n+ bit <<= 1;\n+ } while (pos++ < 63);\n+ return UINT8_MAX;\n+#endif\n+}\n+\n+static inline uint8_t VmaBitScanLSB(uint32_t mask)\n+{\n+#ifdef _MSC_VER\n+ unsigned long pos;\n+ if (_BitScanForward(&pos, mask))\n+ return static_cast<uint8_t>(pos);\n+ return UINT8_MAX;\n+#elif defined __GNUC__ || defined __clang__\n+ return static_cast<uint8_t>(__builtin_ffs(mask)) - 1U;\n+#else\n+ uint8_t pos = 0;\n+ uint32_t bit = 1;\n+ do\n+ {\n+ if (mask & bit)\n+ return pos;\n+ bit <<= 1;\n+ } while (pos++ < 31);\n+ return UINT8_MAX;\n+#endif\n+}\n+\n+static inline uint8_t VmaBitScanMSB(uint64_t mask)\n+{\n+#if defined(_MSC_VER) && defined(_WIN64)\n+ unsigned long pos;\n+ if (_BitScanReverse64(&pos, mask))\n+ return static_cast<uint8_t>(pos);\n+#elif defined __GNUC__ || defined __clang__\n+ if (mask)\n+ return 63 - static_cast<uint8_t>(__builtin_clzll(mask));\n+#else\n+ uint8_t pos = 63;\n+ uint64_t bit = 1ULL << 63;\n+ do\n+ {\n+ if (mask & bit)\n+ return pos;\n+ bit >>= 1;\n+ } while (pos-- > 0);\n+#endif\n+ return UINT8_MAX;\n+}\n+\n+static inline uint8_t VmaBitScanMSB(uint32_t mask)\n+{\n+#ifdef _MSC_VER\n+ unsigned long pos;\n+ if (_BitScanReverse(&pos, mask))\n+ return static_cast<uint8_t>(pos);\n+#elif defined __GNUC__ || defined __clang__\n+ if (mask)\n+ return 31 - static_cast<uint8_t>(__builtin_clz(mask));\n+#else\n+ uint8_t pos = 31;\n+ uint32_t bit = 1UL << 31;\n+ do\n+ {\n+ if (mask & bit)\n+ return pos;\n+ bit >>= 1;\n+ } while (pos-- > 0);\n+#endif\n+ return UINT8_MAX;\n+}\n+\n+\/*\n+Returns true if given number is a power of two.\n+T must be unsigned integer number or signed integer but always nonnegative.\n+For 0 returns true.\n+*\/\n+template <typename T>\n+inline bool VmaIsPow2(T x)\n+{\n+ return (x & (x - 1)) == 0;\n+}\n+\n+\/\/ Aligns given value up to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 16.\n+\/\/ Use types like uint32_t, uint64_t as T.\n+template <typename T>\n+static inline T VmaAlignUp(T val, T alignment)\n+{\n+ VMA_HEAVY_ASSERT(VmaIsPow2(alignment));\n+ return (val + alignment - 1) & ~(alignment - 1);\n+}\n+\n+\/\/ Aligns given value down to nearest multiply of align value. For example: VmaAlignUp(11, 8) = 8.\n+\/\/ Use types like uint32_t, uint64_t as T.\n+template <typename T>\n+static inline T VmaAlignDown(T val, T alignment)\n+{\n+ VMA_HEAVY_ASSERT(VmaIsPow2(alignment));\n+ return val & ~(alignment - 1);\n+}\n+\n+\/\/ Division with mathematical rounding to nearest number.\n+template <typename T>\n+static inline T VmaRoundDiv(T x, T y)\n+{\n+ return (x + (y \/ (T)2)) \/ y;\n+}\n+\n+\/\/ Divide by 'y' and round up to nearest integer.\n+template <typename T>\n+static inline T VmaDivideRoundingUp(T x, T y)\n+{\n+ return (x + y - (T)1) \/ y;\n+}\n+\n+\/\/ Returns smallest power of 2 greater or equal to v.\n+static inline uint32_t VmaNextPow2(uint32_t v)\n+{\n+ v--;\n+ v |= v >> 1;\n+ v |= v >> 2;\n+ v |= v >> 4;\n+ v |= v >> 8;\n+ v |= v >> 16;\n+ v++;\n+ return v;\n+}\n+\n+static inline uint64_t VmaNextPow2(uint64_t v)\n+{\n+ v--;\n+ v |= v >> 1;\n+ v |= v >> 2;\n+ v |= v >> 4;\n+ v |= v >> 8;\n+ v |= v >> 16;\n+ v |= v >> 32;\n+ v++;\n+ return v;\n+}\n+\n+\/\/ Returns largest power of 2 less or equal to v.\n+static inline uint32_t VmaPrevPow2(uint32_t v)\n+{\n+ v |= v >> 1;\n+ v |= v >> 2;\n+ v |= v >> 4;\n+ v |= v >> 8;\n+ v |= v >> 16;\n+ v = v ^ (v >> 1);\n+ return v;\n+}\n+\n+static inline uint64_t VmaPrevPow2(uint64_t v)\n+{\n+ v |= v >> 1;\n+ v |= v >> 2;\n+ v |= v >> 4;\n+ v |= v >> 8;\n+ v |= v >> 16;\n+ v |= v >> 32;\n+ v = v ^ (v >> 1);\n+ return v;\n+}\n+\n+static inline bool VmaStrIsEmpty(const char* pStr)\n+{\n+ return pStr == VMA_NULL || *pStr == '\\0';\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+static const char* VmaAlgorithmToStr(uint32_t algorithm)\n+{\n+ switch (algorithm)\n+ {\n+ case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:\n+ return \"Linear\";\n+ case 0:\n+ return \"TLSF\";\n+ default:\n+ VMA_ASSERT(0);\n+ return \"\";\n+ }\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+#ifndef VMA_SORT\n+template<typename Iterator, typename Compare>\n+Iterator VmaQuickSortPartition(Iterator beg, Iterator end, Compare cmp)\n+{\n+ Iterator centerValue = end; --centerValue;\n+ Iterator insertIndex = beg;\n+ for (Iterator memTypeIndex = beg; memTypeIndex < centerValue; ++memTypeIndex)\n+ {\n+ if (cmp(*memTypeIndex, *centerValue))\n+ {\n+ if (insertIndex != memTypeIndex)\n+ {\n+ VMA_SWAP(*memTypeIndex, *insertIndex);\n+ }\n+ ++insertIndex;\n+ }\n+ }\n+ if (insertIndex != centerValue)\n+ {\n+ VMA_SWAP(*insertIndex, *centerValue);\n+ }\n+ return insertIndex;\n+}\n+\n+template<typename Iterator, typename Compare>\n+void VmaQuickSort(Iterator beg, Iterator end, Compare cmp)\n+{\n+ if (beg < end)\n+ {\n+ Iterator it = VmaQuickSortPartition<Iterator, Compare>(beg, end, cmp);\n+ VmaQuickSort<Iterator, Compare>(beg, it, cmp);\n+ VmaQuickSort<Iterator, Compare>(it + 1, end, cmp);\n+ }\n+}\n+\n+#define VMA_SORT(beg, end, cmp) VmaQuickSort(beg, end, cmp)\n+#endif \/\/ VMA_SORT\n+\n+\/*\n+Returns true if two memory blocks occupy overlapping pages.\n+ResourceA must be in less memory offset than ResourceB.\n+\n+Algorithm is based on \"Vulkan 1.0.39 - A Specification (with all registered Vulkan extensions)\"\n+chapter 11.6 \"Resource Memory Association\", paragraph \"Buffer-Image Granularity\".\n+*\/\n+static inline bool VmaBlocksOnSamePage(\n+ VkDeviceSize resourceAOffset,\n+ VkDeviceSize resourceASize,\n+ VkDeviceSize resourceBOffset,\n+ VkDeviceSize pageSize)\n+{\n+ VMA_ASSERT(resourceAOffset + resourceASize <= resourceBOffset && resourceASize > 0 && pageSize > 0);\n+ VkDeviceSize resourceAEnd = resourceAOffset + resourceASize - 1;\n+ VkDeviceSize resourceAEndPage = resourceAEnd & ~(pageSize - 1);\n+ VkDeviceSize resourceBStart = resourceBOffset;\n+ VkDeviceSize resourceBStartPage = resourceBStart & ~(pageSize - 1);\n+ return resourceAEndPage == resourceBStartPage;\n+}\n+\n+\/*\n+Returns true if given suballocation types could conflict and must respect\n+VkPhysicalDeviceLimits::bufferImageGranularity. They conflict if one is buffer\n+or linear image and another one is optimal image. If type is unknown, behave\n+conservatively.\n+*\/\n+static inline bool VmaIsBufferImageGranularityConflict(\n+ VmaSuballocationType suballocType1,\n+ VmaSuballocationType suballocType2)\n+{\n+ if (suballocType1 > suballocType2)\n+ {\n+ VMA_SWAP(suballocType1, suballocType2);\n+ }\n+\n+ switch (suballocType1)\n+ {\n+ case VMA_SUBALLOCATION_TYPE_FREE:\n+ return false;\n+ case VMA_SUBALLOCATION_TYPE_UNKNOWN:\n+ return true;\n+ case VMA_SUBALLOCATION_TYPE_BUFFER:\n+ return\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\n+ case VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN:\n+ return\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR ||\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\n+ case VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR:\n+ return\n+ suballocType2 == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL;\n+ case VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL:\n+ return false;\n+ default:\n+ VMA_ASSERT(0);\n+ return true;\n+ }\n+}\n+\n+static void VmaWriteMagicValue(void* pData, VkDeviceSize offset)\n+{\n+#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION\n+ uint32_t* pDst = (uint32_t*)((char*)pData + offset);\n+ const size_t numberCount = VMA_DEBUG_MARGIN \/ sizeof(uint32_t);\n+ for (size_t i = 0; i < numberCount; ++i, ++pDst)\n+ {\n+ *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE;\n+ }\n+#else\n+ \/\/ no-op\n+#endif\n+}\n+\n+static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset)\n+{\n+#if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION\n+ const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset);\n+ const size_t numberCount = VMA_DEBUG_MARGIN \/ sizeof(uint32_t);\n+ for (size_t i = 0; i < numberCount; ++i, ++pSrc)\n+ {\n+ if (*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE)\n+ {\n+ return false;\n+ }\n+ }\n+#endif\n+ return true;\n+}\n+\n+\/*\n+Fills structure with parameters of an example buffer to be used for transfers\n+during GPU memory defragmentation.\n+*\/\n+static void VmaFillGpuDefragmentationBufferCreateInfo(VkBufferCreateInfo& outBufCreateInfo)\n+{\n+ memset(&outBufCreateInfo, 0, sizeof(outBufCreateInfo));\n+ outBufCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;\n+ outBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+ outBufCreateInfo.size = (VkDeviceSize)VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE; \/\/ Example size.\n+}\n+\n+\n+\/*\n+Performs binary search and returns iterator to first element that is greater or\n+equal to (key), according to comparison (cmp).\n+\n+Cmp should return true if first argument is less than second argument.\n+\n+Returned value is the found element, if present in the collection or place where\n+new element with value (key) should be inserted.\n+*\/\n+template <typename CmpLess, typename IterT, typename KeyT>\n+static IterT VmaBinaryFindFirstNotLess(IterT beg, IterT end, const KeyT& key, const CmpLess& cmp)\n+{\n+ size_t down = 0, up = (end - beg);\n+ while (down < up)\n+ {\n+ const size_t mid = down + (up - down) \/ 2; \/\/ Overflow-safe midpoint calculation\n+ if (cmp(*(beg + mid), key))\n+ {\n+ down = mid + 1;\n+ }\n+ else\n+ {\n+ up = mid;\n+ }\n+ }\n+ return beg + down;\n+}\n+\n+template<typename CmpLess, typename IterT, typename KeyT>\n+IterT VmaBinaryFindSorted(const IterT& beg, const IterT& end, const KeyT& value, const CmpLess& cmp)\n+{\n+ IterT it = VmaBinaryFindFirstNotLess<CmpLess, IterT, KeyT>(\n+ beg, end, value, cmp);\n+ if (it == end ||\n+ (!cmp(*it, value) && !cmp(value, *it)))\n+ {\n+ return it;\n+ }\n+ return end;\n+}\n+\n+\/*\n+Returns true if all pointers in the array are not-null and unique.\n+Warning! O(n^2) complexity. Use only inside VMA_HEAVY_ASSERT.\n+T must be pointer type, e.g. VmaAllocation, VmaPool.\n+*\/\n+template<typename T>\n+static bool VmaValidatePointerArray(uint32_t count, const T* arr)\n+{\n+ for (uint32_t i = 0; i < count; ++i)\n+ {\n+ const T iPtr = arr[i];\n+ if (iPtr == VMA_NULL)\n+ {\n+ return false;\n+ }\n+ for (uint32_t j = i + 1; j < count; ++j)\n+ {\n+ if (iPtr == arr[j])\n+ {\n+ return false;\n+ }\n+ }\n+ }\n+ return true;\n+}\n+\n+template<typename MainT, typename NewT>\n+static inline void VmaPnextChainPushFront(MainT* mainStruct, NewT* newStruct)\n+{\n+ newStruct->pNext = mainStruct->pNext;\n+ mainStruct->pNext = newStruct;\n+}\n+\n+\/\/ This is the main algorithm that guides the selection of a memory type best for an allocation -\n+\/\/ converts usage to required\/preferred\/not preferred flags.\n+static bool FindMemoryPreferences(\n+ bool isIntegratedGPU,\n+ const VmaAllocationCreateInfo& allocCreateInfo,\n+ VkFlags bufImgUsage, \/\/ VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown.\n+ VkMemoryPropertyFlags& outRequiredFlags,\n+ VkMemoryPropertyFlags& outPreferredFlags,\n+ VkMemoryPropertyFlags& outNotPreferredFlags)\n+{\n+ outRequiredFlags = allocCreateInfo.requiredFlags;\n+ outPreferredFlags = allocCreateInfo.preferredFlags;\n+ outNotPreferredFlags = 0;\n+\n+ switch(allocCreateInfo.usage)\n+ {\n+ case VMA_MEMORY_USAGE_UNKNOWN:\n+ break;\n+ case VMA_MEMORY_USAGE_GPU_ONLY:\n+ if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\n+ {\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ break;\n+ case VMA_MEMORY_USAGE_CPU_ONLY:\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;\n+ break;\n+ case VMA_MEMORY_USAGE_CPU_TO_GPU:\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+ if(!isIntegratedGPU || (outPreferredFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\n+ {\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ break;\n+ case VMA_MEMORY_USAGE_GPU_TO_CPU:\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\n+ break;\n+ case VMA_MEMORY_USAGE_CPU_COPY:\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ break;\n+ case VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED:\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;\n+ break;\n+ case VMA_MEMORY_USAGE_AUTO:\n+ case VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE:\n+ case VMA_MEMORY_USAGE_AUTO_PREFER_HOST:\n+ {\n+ if(bufImgUsage == UINT32_MAX)\n+ {\n+ VMA_ASSERT(0 && \"VMA_MEMORY_USAGE_AUTO* values can only be used with functions like vmaCreateBuffer, vmaCreateImage so that the details of the created resource are known.\");\n+ return false;\n+ }\n+ \/\/ This relies on values of VK_IMAGE_USAGE_TRANSFER* being the same VK_BUFFER_IMAGE_TRANSFER*.\n+ const bool deviceAccess = (bufImgUsage & ~(VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT)) != 0;\n+ const bool hostAccessSequentialWrite = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT) != 0;\n+ const bool hostAccessRandom = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) != 0;\n+ const bool hostAccessAllowTransferInstead = (allocCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) != 0;\n+ const bool preferDevice = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;\n+ const bool preferHost = allocCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST;\n+\n+ \/\/ CPU random access - e.g. a buffer written to or transferred from GPU to read back on CPU.\n+ if(hostAccessRandom)\n+ {\n+ if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost)\n+ {\n+ \/\/ Nice if it will end up in HOST_VISIBLE, but more importantly prefer DEVICE_LOCAL.\n+ \/\/ Omitting HOST_VISIBLE here is intentional.\n+ \/\/ In case there is DEVICE_LOCAL | HOST_VISIBLE | HOST_CACHED, it will pick that one.\n+ \/\/ Otherwise, this will give same weight to DEVICE_LOCAL as HOST_VISIBLE | HOST_CACHED and select the former if occurs first on the list.\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\n+ }\n+ else\n+ {\n+ \/\/ Always CPU memory, cached.\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\n+ }\n+ }\n+ \/\/ CPU sequential write - may be CPU or host-visible GPU memory, uncached and write-combined.\n+ else if(hostAccessSequentialWrite)\n+ {\n+ \/\/ Want uncached and write-combined.\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\n+\n+ if(!isIntegratedGPU && deviceAccess && hostAccessAllowTransferInstead && !preferHost)\n+ {\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+ }\n+ else\n+ {\n+ outRequiredFlags |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+ \/\/ Direct GPU access, CPU sequential write (e.g. a dynamic uniform buffer updated every frame)\n+ if(deviceAccess)\n+ {\n+ \/\/ Could go to CPU memory or GPU BAR\/unified. Up to the user to decide. If no preference, choose GPU memory.\n+ if(preferHost)\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ else\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ \/\/ GPU no direct access, CPU sequential write (e.g. an upload buffer to be transferred to the GPU)\n+ else\n+ {\n+ \/\/ Could go to CPU memory or GPU BAR\/unified. Up to the user to decide. If no preference, choose CPU memory.\n+ if(preferDevice)\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ else\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ }\n+ }\n+ \/\/ No CPU access\n+ else\n+ {\n+ \/\/ GPU access, no CPU access (e.g. a color attachment image) - prefer GPU memory\n+ if(deviceAccess)\n+ {\n+ \/\/ ...unless there is a clear preference from the user not to do so.\n+ if(preferHost)\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ else\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ \/\/ No direct GPU access, no CPU access, just transfers.\n+ \/\/ It may be staging copy intended for e.g. preserving image for next frame (then better GPU memory) or\n+ \/\/ a \"swap file\" copy to free some GPU memory (then better CPU memory).\n+ \/\/ Up to the user to decide. If no preferece, assume the former and choose GPU memory.\n+ if(preferHost)\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ else\n+ outPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+ }\n+ break;\n+ }\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+\n+ \/\/ Avoid DEVICE_COHERENT unless explicitly requested.\n+ if(((allocCreateInfo.requiredFlags | allocCreateInfo.preferredFlags) &\n+ (VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY | VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY)) == 0)\n+ {\n+ outNotPreferredFlags |= VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY;\n+ }\n+\n+ return true;\n+}\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ Memory allocation\n+\n+static void* VmaMalloc(const VkAllocationCallbacks* pAllocationCallbacks, size_t size, size_t alignment)\n+{\n+ void* result = VMA_NULL;\n+ if ((pAllocationCallbacks != VMA_NULL) &&\n+ (pAllocationCallbacks->pfnAllocation != VMA_NULL))\n+ {\n+ result = (*pAllocationCallbacks->pfnAllocation)(\n+ pAllocationCallbacks->pUserData,\n+ size,\n+ alignment,\n+ VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);\n+ }\n+ else\n+ {\n+ result = VMA_SYSTEM_ALIGNED_MALLOC(size, alignment);\n+ }\n+ VMA_ASSERT(result != VMA_NULL && \"CPU memory allocation failed.\");\n+ return result;\n+}\n+\n+static void VmaFree(const VkAllocationCallbacks* pAllocationCallbacks, void* ptr)\n+{\n+ if ((pAllocationCallbacks != VMA_NULL) &&\n+ (pAllocationCallbacks->pfnFree != VMA_NULL))\n+ {\n+ (*pAllocationCallbacks->pfnFree)(pAllocationCallbacks->pUserData, ptr);\n+ }\n+ else\n+ {\n+ VMA_SYSTEM_ALIGNED_FREE(ptr);\n+ }\n+}\n+\n+template<typename T>\n+static T* VmaAllocate(const VkAllocationCallbacks* pAllocationCallbacks)\n+{\n+ return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T), VMA_ALIGN_OF(T));\n+}\n+\n+template<typename T>\n+static T* VmaAllocateArray(const VkAllocationCallbacks* pAllocationCallbacks, size_t count)\n+{\n+ return (T*)VmaMalloc(pAllocationCallbacks, sizeof(T) * count, VMA_ALIGN_OF(T));\n+}\n+\n+#define vma_new(allocator, type) new(VmaAllocate<type>(allocator))(type)\n+\n+#define vma_new_array(allocator, type, count) new(VmaAllocateArray<type>((allocator), (count)))(type)\n+\n+template<typename T>\n+static void vma_delete(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr)\n+{\n+ ptr->~T();\n+ VmaFree(pAllocationCallbacks, ptr);\n+}\n+\n+template<typename T>\n+static void vma_delete_array(const VkAllocationCallbacks* pAllocationCallbacks, T* ptr, size_t count)\n+{\n+ if (ptr != VMA_NULL)\n+ {\n+ for (size_t i = count; i--; )\n+ {\n+ ptr[i].~T();\n+ }\n+ VmaFree(pAllocationCallbacks, ptr);\n+ }\n+}\n+\n+static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr)\n+{\n+ if (srcStr != VMA_NULL)\n+ {\n+ const size_t len = strlen(srcStr);\n+ char* const result = vma_new_array(allocs, char, len + 1);\n+ memcpy(result, srcStr, len + 1);\n+ return result;\n+ }\n+ return VMA_NULL;\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+static char* VmaCreateStringCopy(const VkAllocationCallbacks* allocs, const char* srcStr, size_t strLen)\n+{\n+ if (srcStr != VMA_NULL)\n+ {\n+ char* const result = vma_new_array(allocs, char, strLen + 1);\n+ memcpy(result, srcStr, strLen);\n+ result[strLen] = '\\0';\n+ return result;\n+ }\n+ return VMA_NULL;\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+static void VmaFreeString(const VkAllocationCallbacks* allocs, char* str)\n+{\n+ if (str != VMA_NULL)\n+ {\n+ const size_t len = strlen(str);\n+ vma_delete_array(allocs, str, len + 1);\n+ }\n+}\n+\n+template<typename CmpLess, typename VectorT>\n+size_t VmaVectorInsertSorted(VectorT& vector, const typename VectorT::value_type& value)\n+{\n+ const size_t indexToInsert = VmaBinaryFindFirstNotLess(\n+ vector.data(),\n+ vector.data() + vector.size(),\n+ value,\n+ CmpLess()) - vector.data();\n+ VmaVectorInsert(vector, indexToInsert, value);\n+ return indexToInsert;\n+}\n+\n+template<typename CmpLess, typename VectorT>\n+bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value)\n+{\n+ CmpLess comparator;\n+ typename VectorT::iterator it = VmaBinaryFindFirstNotLess(\n+ vector.begin(),\n+ vector.end(),\n+ value,\n+ comparator);\n+ if ((it != vector.end()) && !comparator(*it, value) && !comparator(value, *it))\n+ {\n+ size_t indexToRemove = it - vector.begin();\n+ VmaVectorRemove(vector, indexToRemove);\n+ return true;\n+ }\n+ return false;\n+}\n+#endif \/\/ _VMA_FUNCTIONS\n+\n+#ifndef _VMA_STATISTICS_FUNCTIONS\n+\n+static void VmaClearStatistics(VmaStatistics& outStats)\n+{\n+ outStats.blockCount = 0;\n+ outStats.allocationCount = 0;\n+ outStats.blockBytes = 0;\n+ outStats.allocationBytes = 0;\n+}\n+\n+static void VmaAddStatistics(VmaStatistics& inoutStats, const VmaStatistics& src)\n+{\n+ inoutStats.blockCount += src.blockCount;\n+ inoutStats.allocationCount += src.allocationCount;\n+ inoutStats.blockBytes += src.blockBytes;\n+ inoutStats.allocationBytes += src.allocationBytes;\n+}\n+\n+static void VmaClearDetailedStatistics(VmaDetailedStatistics& outStats)\n+{\n+ VmaClearStatistics(outStats.statistics);\n+ outStats.unusedRangeCount = 0;\n+ outStats.allocationSizeMin = VK_WHOLE_SIZE;\n+ outStats.allocationSizeMax = 0;\n+ outStats.unusedRangeSizeMin = VK_WHOLE_SIZE;\n+ outStats.unusedRangeSizeMax = 0;\n+}\n+\n+static void VmaAddDetailedStatisticsAllocation(VmaDetailedStatistics& inoutStats, VkDeviceSize size)\n+{\n+ inoutStats.statistics.allocationCount++;\n+ inoutStats.statistics.allocationBytes += size;\n+ inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, size);\n+ inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, size);\n+}\n+\n+static void VmaAddDetailedStatisticsUnusedRange(VmaDetailedStatistics& inoutStats, VkDeviceSize size)\n+{\n+ inoutStats.unusedRangeCount++;\n+ inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, size);\n+ inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, size);\n+}\n+\n+static void VmaAddDetailedStatistics(VmaDetailedStatistics& inoutStats, const VmaDetailedStatistics& src)\n+{\n+ VmaAddStatistics(inoutStats.statistics, src.statistics);\n+ inoutStats.unusedRangeCount += src.unusedRangeCount;\n+ inoutStats.allocationSizeMin = VMA_MIN(inoutStats.allocationSizeMin, src.allocationSizeMin);\n+ inoutStats.allocationSizeMax = VMA_MAX(inoutStats.allocationSizeMax, src.allocationSizeMax);\n+ inoutStats.unusedRangeSizeMin = VMA_MIN(inoutStats.unusedRangeSizeMin, src.unusedRangeSizeMin);\n+ inoutStats.unusedRangeSizeMax = VMA_MAX(inoutStats.unusedRangeSizeMax, src.unusedRangeSizeMax);\n+}\n+\n+#endif \/\/ _VMA_STATISTICS_FUNCTIONS\n+\n+#ifndef _VMA_MUTEX_LOCK\n+\/\/ Helper RAII class to lock a mutex in constructor and unlock it in destructor (at the end of scope).\n+struct VmaMutexLock\n+{\n+ VMA_CLASS_NO_COPY(VmaMutexLock)\n+public:\n+ VmaMutexLock(VMA_MUTEX& mutex, bool useMutex = true) :\n+ m_pMutex(useMutex ? &mutex : VMA_NULL)\n+ {\n+ if (m_pMutex) { m_pMutex->Lock(); }\n+ }\n+ ~VmaMutexLock() { if (m_pMutex) { m_pMutex->Unlock(); } }\n+\n+private:\n+ VMA_MUTEX* m_pMutex;\n+};\n+\n+\/\/ Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for reading.\n+struct VmaMutexLockRead\n+{\n+ VMA_CLASS_NO_COPY(VmaMutexLockRead)\n+public:\n+ VmaMutexLockRead(VMA_RW_MUTEX& mutex, bool useMutex) :\n+ m_pMutex(useMutex ? &mutex : VMA_NULL)\n+ {\n+ if (m_pMutex) { m_pMutex->LockRead(); }\n+ }\n+ ~VmaMutexLockRead() { if (m_pMutex) { m_pMutex->UnlockRead(); } }\n+\n+private:\n+ VMA_RW_MUTEX* m_pMutex;\n+};\n+\n+\/\/ Helper RAII class to lock a RW mutex in constructor and unlock it in destructor (at the end of scope), for writing.\n+struct VmaMutexLockWrite\n+{\n+ VMA_CLASS_NO_COPY(VmaMutexLockWrite)\n+public:\n+ VmaMutexLockWrite(VMA_RW_MUTEX& mutex, bool useMutex)\n+ : m_pMutex(useMutex ? &mutex : VMA_NULL)\n+ {\n+ if (m_pMutex) { m_pMutex->LockWrite(); }\n+ }\n+ ~VmaMutexLockWrite() { if (m_pMutex) { m_pMutex->UnlockWrite(); } }\n+\n+private:\n+ VMA_RW_MUTEX* m_pMutex;\n+};\n+\n+#if VMA_DEBUG_GLOBAL_MUTEX\n+ static VMA_MUTEX gDebugGlobalMutex;\n+ #define VMA_DEBUG_GLOBAL_MUTEX_LOCK VmaMutexLock debugGlobalMutexLock(gDebugGlobalMutex, true);\n+#else\n+ #define VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+#endif\n+#endif \/\/ _VMA_MUTEX_LOCK\n+\n+#ifndef _VMA_ATOMIC_TRANSACTIONAL_INCREMENT\n+\/\/ An object that increments given atomic but decrements it back in the destructor unless Commit() is called.\n+template<typename T>\n+struct AtomicTransactionalIncrement\n+{\n+public:\n+ typedef std::atomic<T> AtomicT;\n+\n+ ~AtomicTransactionalIncrement()\n+ {\n+ if(m_Atomic)\n+ --(*m_Atomic);\n+ }\n+\n+ void Commit() { m_Atomic = nullptr; }\n+ T Increment(AtomicT* atomic)\n+ {\n+ m_Atomic = atomic;\n+ return m_Atomic->fetch_add(1);\n+ }\n+\n+private:\n+ AtomicT* m_Atomic = nullptr;\n+};\n+#endif \/\/ _VMA_ATOMIC_TRANSACTIONAL_INCREMENT\n+\n+#ifndef _VMA_STL_ALLOCATOR\n+\/\/ STL-compatible allocator.\n+template<typename T>\n+struct VmaStlAllocator\n+{\n+ const VkAllocationCallbacks* const m_pCallbacks;\n+ typedef T value_type;\n+\n+ VmaStlAllocator(const VkAllocationCallbacks* pCallbacks) : m_pCallbacks(pCallbacks) {}\n+ template<typename U>\n+ VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) {}\n+ VmaStlAllocator(const VmaStlAllocator&) = default;\n+ VmaStlAllocator& operator=(const VmaStlAllocator&) = delete;\n+\n+ T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); }\n+ void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); }\n+\n+ template<typename U>\n+ bool operator==(const VmaStlAllocator<U>& rhs) const\n+ {\n+ return m_pCallbacks == rhs.m_pCallbacks;\n+ }\n+ template<typename U>\n+ bool operator!=(const VmaStlAllocator<U>& rhs) const\n+ {\n+ return m_pCallbacks != rhs.m_pCallbacks;\n+ }\n+};\n+#endif \/\/ _VMA_STL_ALLOCATOR\n+\n+#ifndef _VMA_VECTOR\n+\/* Class with interface compatible with subset of std::vector.\n+T must be POD because constructors and destructors are not called and memcpy is\n+used for these objects. *\/\n+template<typename T, typename AllocatorT>\n+class VmaVector\n+{\n+public:\n+ typedef T value_type;\n+ typedef T* iterator;\n+ typedef const T* const_iterator;\n+\n+ VmaVector(const AllocatorT& allocator);\n+ VmaVector(size_t count, const AllocatorT& allocator);\n+ \/\/ This version of the constructor is here for compatibility with pre-C++14 std::vector.\n+ \/\/ value is unused.\n+ VmaVector(size_t count, const T& value, const AllocatorT& allocator) : VmaVector(count, allocator) {}\n+ VmaVector(const VmaVector<T, AllocatorT>& src);\n+ VmaVector& operator=(const VmaVector& rhs);\n+ ~VmaVector() { VmaFree(m_Allocator.m_pCallbacks, m_pArray); }\n+\n+ bool empty() const { return m_Count == 0; }\n+ size_t size() const { return m_Count; }\n+ T* data() { return m_pArray; }\n+ T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; }\n+ T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; }\n+ const T* data() const { return m_pArray; }\n+ const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[0]; }\n+ const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return m_pArray[m_Count - 1]; }\n+\n+ iterator begin() { return m_pArray; }\n+ iterator end() { return m_pArray + m_Count; }\n+ const_iterator cbegin() const { return m_pArray; }\n+ const_iterator cend() const { return m_pArray + m_Count; }\n+ const_iterator begin() const { return cbegin(); }\n+ const_iterator end() const { return cend(); }\n+\n+ void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); }\n+ void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); }\n+ void push_front(const T& src) { insert(0, src); }\n+\n+ void push_back(const T& src);\n+ void reserve(size_t newCapacity, bool freeMemory = false);\n+ void resize(size_t newCount);\n+ void clear() { resize(0); }\n+ void shrink_to_fit();\n+ void insert(size_t index, const T& src);\n+ void remove(size_t index);\n+\n+ T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; }\n+ const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return m_pArray[index]; }\n+\n+private:\n+ AllocatorT m_Allocator;\n+ T* m_pArray;\n+ size_t m_Count;\n+ size_t m_Capacity;\n+};\n+\n+#ifndef _VMA_VECTOR_FUNCTIONS\n+template<typename T, typename AllocatorT>\n+VmaVector<T, AllocatorT>::VmaVector(const AllocatorT& allocator)\n+ : m_Allocator(allocator),\n+ m_pArray(VMA_NULL),\n+ m_Count(0),\n+ m_Capacity(0) {}\n+\n+template<typename T, typename AllocatorT>\n+VmaVector<T, AllocatorT>::VmaVector(size_t count, const AllocatorT& allocator)\n+ : m_Allocator(allocator),\n+ m_pArray(count ? (T*)VmaAllocateArray<T>(allocator.m_pCallbacks, count) : VMA_NULL),\n+ m_Count(count),\n+ m_Capacity(count) {}\n+\n+template<typename T, typename AllocatorT>\n+VmaVector<T, AllocatorT>::VmaVector(const VmaVector& src)\n+ : m_Allocator(src.m_Allocator),\n+ m_pArray(src.m_Count ? (T*)VmaAllocateArray<T>(src.m_Allocator.m_pCallbacks, src.m_Count) : VMA_NULL),\n+ m_Count(src.m_Count),\n+ m_Capacity(src.m_Count)\n+{\n+ if (m_Count != 0)\n+ {\n+ memcpy(m_pArray, src.m_pArray, m_Count * sizeof(T));\n+ }\n+}\n+\n+template<typename T, typename AllocatorT>\n+VmaVector<T, AllocatorT>& VmaVector<T, AllocatorT>::operator=(const VmaVector& rhs)\n+{\n+ if (&rhs != this)\n+ {\n+ resize(rhs.m_Count);\n+ if (m_Count != 0)\n+ {\n+ memcpy(m_pArray, rhs.m_pArray, m_Count * sizeof(T));\n+ }\n+ }\n+ return *this;\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::push_back(const T& src)\n+{\n+ const size_t newIndex = size();\n+ resize(newIndex + 1);\n+ m_pArray[newIndex] = src;\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::reserve(size_t newCapacity, bool freeMemory)\n+{\n+ newCapacity = VMA_MAX(newCapacity, m_Count);\n+\n+ if ((newCapacity < m_Capacity) && !freeMemory)\n+ {\n+ newCapacity = m_Capacity;\n+ }\n+\n+ if (newCapacity != m_Capacity)\n+ {\n+ T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator, newCapacity) : VMA_NULL;\n+ if (m_Count != 0)\n+ {\n+ memcpy(newArray, m_pArray, m_Count * sizeof(T));\n+ }\n+ VmaFree(m_Allocator.m_pCallbacks, m_pArray);\n+ m_Capacity = newCapacity;\n+ m_pArray = newArray;\n+ }\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::resize(size_t newCount)\n+{\n+ size_t newCapacity = m_Capacity;\n+ if (newCount > m_Capacity)\n+ {\n+ newCapacity = VMA_MAX(newCount, VMA_MAX(m_Capacity * 3 \/ 2, (size_t)8));\n+ }\n+\n+ if (newCapacity != m_Capacity)\n+ {\n+ T* const newArray = newCapacity ? VmaAllocateArray<T>(m_Allocator.m_pCallbacks, newCapacity) : VMA_NULL;\n+ const size_t elementsToCopy = VMA_MIN(m_Count, newCount);\n+ if (elementsToCopy != 0)\n+ {\n+ memcpy(newArray, m_pArray, elementsToCopy * sizeof(T));\n+ }\n+ VmaFree(m_Allocator.m_pCallbacks, m_pArray);\n+ m_Capacity = newCapacity;\n+ m_pArray = newArray;\n+ }\n+\n+ m_Count = newCount;\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::shrink_to_fit()\n+{\n+ if (m_Capacity > m_Count)\n+ {\n+ T* newArray = VMA_NULL;\n+ if (m_Count > 0)\n+ {\n+ newArray = VmaAllocateArray<T>(m_Allocator.m_pCallbacks, m_Count);\n+ memcpy(newArray, m_pArray, m_Count * sizeof(T));\n+ }\n+ VmaFree(m_Allocator.m_pCallbacks, m_pArray);\n+ m_Capacity = m_Count;\n+ m_pArray = newArray;\n+ }\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::insert(size_t index, const T& src)\n+{\n+ VMA_HEAVY_ASSERT(index <= m_Count);\n+ const size_t oldCount = size();\n+ resize(oldCount + 1);\n+ if (index < oldCount)\n+ {\n+ memmove(m_pArray + (index + 1), m_pArray + index, (oldCount - index) * sizeof(T));\n+ }\n+ m_pArray[index] = src;\n+}\n+\n+template<typename T, typename AllocatorT>\n+void VmaVector<T, AllocatorT>::remove(size_t index)\n+{\n+ VMA_HEAVY_ASSERT(index < m_Count);\n+ const size_t oldCount = size();\n+ if (index < oldCount - 1)\n+ {\n+ memmove(m_pArray + index, m_pArray + (index + 1), (oldCount - index - 1) * sizeof(T));\n+ }\n+ resize(oldCount - 1);\n+}\n+#endif \/\/ _VMA_VECTOR_FUNCTIONS\n+\n+template<typename T, typename allocatorT>\n+static void VmaVectorInsert(VmaVector<T, allocatorT>& vec, size_t index, const T& item)\n+{\n+ vec.insert(index, item);\n+}\n+\n+template<typename T, typename allocatorT>\n+static void VmaVectorRemove(VmaVector<T, allocatorT>& vec, size_t index)\n+{\n+ vec.remove(index);\n+}\n+#endif \/\/ _VMA_VECTOR\n+\n+#ifndef _VMA_SMALL_VECTOR\n+\/*\n+This is a vector (a variable-sized array), optimized for the case when the array is small.\n+\n+It contains some number of elements in-place, which allows it to avoid heap allocation\n+when the actual number of elements is below that threshold. This allows normal \"small\"\n+cases to be fast without losing generality for large inputs.\n+*\/\n+template<typename T, typename AllocatorT, size_t N>\n+class VmaSmallVector\n+{\n+public:\n+ typedef T value_type;\n+ typedef T* iterator;\n+\n+ VmaSmallVector(const AllocatorT& allocator);\n+ VmaSmallVector(size_t count, const AllocatorT& allocator);\n+ template<typename SrcT, typename SrcAllocatorT, size_t SrcN>\n+ VmaSmallVector(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;\n+ template<typename SrcT, typename SrcAllocatorT, size_t SrcN>\n+ VmaSmallVector<T, AllocatorT, N>& operator=(const VmaSmallVector<SrcT, SrcAllocatorT, SrcN>&) = delete;\n+ ~VmaSmallVector() = default;\n+\n+ bool empty() const { return m_Count == 0; }\n+ size_t size() const { return m_Count; }\n+ T* data() { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; }\n+ T& front() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; }\n+ T& back() { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; }\n+ const T* data() const { return m_Count > N ? m_DynamicArray.data() : m_StaticArray; }\n+ const T& front() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[0]; }\n+ const T& back() const { VMA_HEAVY_ASSERT(m_Count > 0); return data()[m_Count - 1]; }\n+\n+ iterator begin() { return data(); }\n+ iterator end() { return data() + m_Count; }\n+\n+ void pop_front() { VMA_HEAVY_ASSERT(m_Count > 0); remove(0); }\n+ void pop_back() { VMA_HEAVY_ASSERT(m_Count > 0); resize(size() - 1); }\n+ void push_front(const T& src) { insert(0, src); }\n+\n+ void push_back(const T& src);\n+ void resize(size_t newCount, bool freeMemory = false);\n+ void clear(bool freeMemory = false);\n+ void insert(size_t index, const T& src);\n+ void remove(size_t index);\n+\n+ T& operator[](size_t index) { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; }\n+ const T& operator[](size_t index) const { VMA_HEAVY_ASSERT(index < m_Count); return data()[index]; }\n+\n+private:\n+ size_t m_Count;\n+ T m_StaticArray[N]; \/\/ Used when m_Size <= N\n+ VmaVector<T, AllocatorT> m_DynamicArray; \/\/ Used when m_Size > N\n+};\n+\n+#ifndef _VMA_SMALL_VECTOR_FUNCTIONS\n+template<typename T, typename AllocatorT, size_t N>\n+VmaSmallVector<T, AllocatorT, N>::VmaSmallVector(const AllocatorT& allocator)\n+ : m_Count(0),\n+ m_DynamicArray(allocator) {}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+VmaSmallVector<T, AllocatorT, N>::VmaSmallVector(size_t count, const AllocatorT& allocator)\n+ : m_Count(count),\n+ m_DynamicArray(count > N ? count : 0, allocator) {}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+void VmaSmallVector<T, AllocatorT, N>::push_back(const T& src)\n+{\n+ const size_t newIndex = size();\n+ resize(newIndex + 1);\n+ data()[newIndex] = src;\n+}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+void VmaSmallVector<T, AllocatorT, N>::resize(size_t newCount, bool freeMemory)\n+{\n+ if (newCount > N && m_Count > N)\n+ {\n+ \/\/ Any direction, staying in m_DynamicArray\n+ m_DynamicArray.resize(newCount);\n+ if (freeMemory)\n+ {\n+ m_DynamicArray.shrink_to_fit();\n+ }\n+ }\n+ else if (newCount > N && m_Count <= N)\n+ {\n+ \/\/ Growing, moving from m_StaticArray to m_DynamicArray\n+ m_DynamicArray.resize(newCount);\n+ if (m_Count > 0)\n+ {\n+ memcpy(m_DynamicArray.data(), m_StaticArray, m_Count * sizeof(T));\n+ }\n+ }\n+ else if (newCount <= N && m_Count > N)\n+ {\n+ \/\/ Shrinking, moving from m_DynamicArray to m_StaticArray\n+ if (newCount > 0)\n+ {\n+ memcpy(m_StaticArray, m_DynamicArray.data(), newCount * sizeof(T));\n+ }\n+ m_DynamicArray.resize(0);\n+ if (freeMemory)\n+ {\n+ m_DynamicArray.shrink_to_fit();\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Any direction, staying in m_StaticArray - nothing to do here\n+ }\n+ m_Count = newCount;\n+}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+void VmaSmallVector<T, AllocatorT, N>::clear(bool freeMemory)\n+{\n+ m_DynamicArray.clear();\n+ if (freeMemory)\n+ {\n+ m_DynamicArray.shrink_to_fit();\n+ }\n+ m_Count = 0;\n+}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+void VmaSmallVector<T, AllocatorT, N>::insert(size_t index, const T& src)\n+{\n+ VMA_HEAVY_ASSERT(index <= m_Count);\n+ const size_t oldCount = size();\n+ resize(oldCount + 1);\n+ T* const dataPtr = data();\n+ if (index < oldCount)\n+ {\n+ \/\/ I know, this could be more optimal for case where memmove can be memcpy directly from m_StaticArray to m_DynamicArray.\n+ memmove(dataPtr + (index + 1), dataPtr + index, (oldCount - index) * sizeof(T));\n+ }\n+ dataPtr[index] = src;\n+}\n+\n+template<typename T, typename AllocatorT, size_t N>\n+void VmaSmallVector<T, AllocatorT, N>::remove(size_t index)\n+{\n+ VMA_HEAVY_ASSERT(index < m_Count);\n+ const size_t oldCount = size();\n+ if (index < oldCount - 1)\n+ {\n+ \/\/ I know, this could be more optimal for case where memmove can be memcpy directly from m_DynamicArray to m_StaticArray.\n+ T* const dataPtr = data();\n+ memmove(dataPtr + index, dataPtr + (index + 1), (oldCount - index - 1) * sizeof(T));\n+ }\n+ resize(oldCount - 1);\n+}\n+#endif \/\/ _VMA_SMALL_VECTOR_FUNCTIONS\n+#endif \/\/ _VMA_SMALL_VECTOR\n+\n+#ifndef _VMA_POOL_ALLOCATOR\n+\/*\n+Allocator for objects of type T using a list of arrays (pools) to speed up\n+allocation. Number of elements that can be allocated is not bounded because\n+allocator can create multiple blocks.\n+*\/\n+template<typename T>\n+class VmaPoolAllocator\n+{\n+ VMA_CLASS_NO_COPY(VmaPoolAllocator)\n+public:\n+ VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity);\n+ ~VmaPoolAllocator();\n+ template<typename... Types> T* Alloc(Types&&... args);\n+ void Free(T* ptr);\n+\n+private:\n+ union Item\n+ {\n+ uint32_t NextFreeIndex;\n+ alignas(T) char Value[sizeof(T)];\n+ };\n+ struct ItemBlock\n+ {\n+ Item* pItems;\n+ uint32_t Capacity;\n+ uint32_t FirstFreeIndex;\n+ };\n+\n+ const VkAllocationCallbacks* m_pAllocationCallbacks;\n+ const uint32_t m_FirstBlockCapacity;\n+ VmaVector<ItemBlock, VmaStlAllocator<ItemBlock>> m_ItemBlocks;\n+\n+ ItemBlock& CreateNewBlock();\n+};\n+\n+#ifndef _VMA_POOL_ALLOCATOR_FUNCTIONS\n+template<typename T>\n+VmaPoolAllocator<T>::VmaPoolAllocator(const VkAllocationCallbacks* pAllocationCallbacks, uint32_t firstBlockCapacity)\n+ : m_pAllocationCallbacks(pAllocationCallbacks),\n+ m_FirstBlockCapacity(firstBlockCapacity),\n+ m_ItemBlocks(VmaStlAllocator<ItemBlock>(pAllocationCallbacks))\n+{\n+ VMA_ASSERT(m_FirstBlockCapacity > 1);\n+}\n+\n+template<typename T>\n+VmaPoolAllocator<T>::~VmaPoolAllocator()\n+{\n+ for (size_t i = m_ItemBlocks.size(); i--;)\n+ vma_delete_array(m_pAllocationCallbacks, m_ItemBlocks[i].pItems, m_ItemBlocks[i].Capacity);\n+ m_ItemBlocks.clear();\n+}\n+\n+template<typename T>\n+template<typename... Types> T* VmaPoolAllocator<T>::Alloc(Types&&... args)\n+{\n+ for (size_t i = m_ItemBlocks.size(); i--; )\n+ {\n+ ItemBlock& block = m_ItemBlocks[i];\n+ \/\/ This block has some free items: Use first one.\n+ if (block.FirstFreeIndex != UINT32_MAX)\n+ {\n+ Item* const pItem = &block.pItems[block.FirstFreeIndex];\n+ block.FirstFreeIndex = pItem->NextFreeIndex;\n+ T* result = (T*)&pItem->Value;\n+ new(result)T(std::forward<Types>(args)...); \/\/ Explicit constructor call.\n+ return result;\n+ }\n+ }\n+\n+ \/\/ No block has free item: Create new one and use it.\n+ ItemBlock& newBlock = CreateNewBlock();\n+ Item* const pItem = &newBlock.pItems[0];\n+ newBlock.FirstFreeIndex = pItem->NextFreeIndex;\n+ T* result = (T*)&pItem->Value;\n+ new(result) T(std::forward<Types>(args)...); \/\/ Explicit constructor call.\n+ return result;\n+}\n+\n+template<typename T>\n+void VmaPoolAllocator<T>::Free(T* ptr)\n+{\n+ \/\/ Search all memory blocks to find ptr.\n+ for (size_t i = m_ItemBlocks.size(); i--; )\n+ {\n+ ItemBlock& block = m_ItemBlocks[i];\n+\n+ \/\/ Casting to union.\n+ Item* pItemPtr;\n+ memcpy(&pItemPtr, &ptr, sizeof(pItemPtr));\n+\n+ \/\/ Check if pItemPtr is in address range of this block.\n+ if ((pItemPtr >= block.pItems) && (pItemPtr < block.pItems + block.Capacity))\n+ {\n+ ptr->~T(); \/\/ Explicit destructor call.\n+ const uint32_t index = static_cast<uint32_t>(pItemPtr - block.pItems);\n+ pItemPtr->NextFreeIndex = block.FirstFreeIndex;\n+ block.FirstFreeIndex = index;\n+ return;\n+ }\n+ }\n+ VMA_ASSERT(0 && \"Pointer doesn't belong to this memory pool.\");\n+}\n+\n+template<typename T>\n+typename VmaPoolAllocator<T>::ItemBlock& VmaPoolAllocator<T>::CreateNewBlock()\n+{\n+ const uint32_t newBlockCapacity = m_ItemBlocks.empty() ?\n+ m_FirstBlockCapacity : m_ItemBlocks.back().Capacity * 3 \/ 2;\n+\n+ const ItemBlock newBlock =\n+ {\n+ vma_new_array(m_pAllocationCallbacks, Item, newBlockCapacity),\n+ newBlockCapacity,\n+ 0\n+ };\n+\n+ m_ItemBlocks.push_back(newBlock);\n+\n+ \/\/ Setup singly-linked list of all free items in this block.\n+ for (uint32_t i = 0; i < newBlockCapacity - 1; ++i)\n+ newBlock.pItems[i].NextFreeIndex = i + 1;\n+ newBlock.pItems[newBlockCapacity - 1].NextFreeIndex = UINT32_MAX;\n+ return m_ItemBlocks.back();\n+}\n+#endif \/\/ _VMA_POOL_ALLOCATOR_FUNCTIONS\n+#endif \/\/ _VMA_POOL_ALLOCATOR\n+\n+#ifndef _VMA_RAW_LIST\n+template<typename T>\n+struct VmaListItem\n+{\n+ VmaListItem* pPrev;\n+ VmaListItem* pNext;\n+ T Value;\n+};\n+\n+\/\/ Doubly linked list.\n+template<typename T>\n+class VmaRawList\n+{\n+ VMA_CLASS_NO_COPY(VmaRawList)\n+public:\n+ typedef VmaListItem<T> ItemType;\n+\n+ VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks);\n+ \/\/ Intentionally not calling Clear, because that would be unnecessary\n+ \/\/ computations to return all items to m_ItemAllocator as free.\n+ ~VmaRawList() = default;\n+\n+ size_t GetCount() const { return m_Count; }\n+ bool IsEmpty() const { return m_Count == 0; }\n+\n+ ItemType* Front() { return m_pFront; }\n+ ItemType* Back() { return m_pBack; }\n+ const ItemType* Front() const { return m_pFront; }\n+ const ItemType* Back() const { return m_pBack; }\n+\n+ ItemType* PushFront();\n+ ItemType* PushBack();\n+ ItemType* PushFront(const T& value);\n+ ItemType* PushBack(const T& value);\n+ void PopFront();\n+ void PopBack();\n+\n+ \/\/ Item can be null - it means PushBack.\n+ ItemType* InsertBefore(ItemType* pItem);\n+ \/\/ Item can be null - it means PushFront.\n+ ItemType* InsertAfter(ItemType* pItem);\n+ ItemType* InsertBefore(ItemType* pItem, const T& value);\n+ ItemType* InsertAfter(ItemType* pItem, const T& value);\n+\n+ void Clear();\n+ void Remove(ItemType* pItem);\n+\n+private:\n+ const VkAllocationCallbacks* const m_pAllocationCallbacks;\n+ VmaPoolAllocator<ItemType> m_ItemAllocator;\n+ ItemType* m_pFront;\n+ ItemType* m_pBack;\n+ size_t m_Count;\n+};\n+\n+#ifndef _VMA_RAW_LIST_FUNCTIONS\n+template<typename T>\n+VmaRawList<T>::VmaRawList(const VkAllocationCallbacks* pAllocationCallbacks)\n+ : m_pAllocationCallbacks(pAllocationCallbacks),\n+ m_ItemAllocator(pAllocationCallbacks, 128),\n+ m_pFront(VMA_NULL),\n+ m_pBack(VMA_NULL),\n+ m_Count(0) {}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::PushFront()\n+{\n+ ItemType* const pNewItem = m_ItemAllocator.Alloc();\n+ pNewItem->pPrev = VMA_NULL;\n+ if (IsEmpty())\n+ {\n+ pNewItem->pNext = VMA_NULL;\n+ m_pFront = pNewItem;\n+ m_pBack = pNewItem;\n+ m_Count = 1;\n+ }\n+ else\n+ {\n+ pNewItem->pNext = m_pFront;\n+ m_pFront->pPrev = pNewItem;\n+ m_pFront = pNewItem;\n+ ++m_Count;\n+ }\n+ return pNewItem;\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::PushBack()\n+{\n+ ItemType* const pNewItem = m_ItemAllocator.Alloc();\n+ pNewItem->pNext = VMA_NULL;\n+ if(IsEmpty())\n+ {\n+ pNewItem->pPrev = VMA_NULL;\n+ m_pFront = pNewItem;\n+ m_pBack = pNewItem;\n+ m_Count = 1;\n+ }\n+ else\n+ {\n+ pNewItem->pPrev = m_pBack;\n+ m_pBack->pNext = pNewItem;\n+ m_pBack = pNewItem;\n+ ++m_Count;\n+ }\n+ return pNewItem;\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::PushFront(const T& value)\n+{\n+ ItemType* const pNewItem = PushFront();\n+ pNewItem->Value = value;\n+ return pNewItem;\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::PushBack(const T& value)\n+{\n+ ItemType* const pNewItem = PushBack();\n+ pNewItem->Value = value;\n+ return pNewItem;\n+}\n+\n+template<typename T>\n+void VmaRawList<T>::PopFront()\n+{\n+ VMA_HEAVY_ASSERT(m_Count > 0);\n+ ItemType* const pFrontItem = m_pFront;\n+ ItemType* const pNextItem = pFrontItem->pNext;\n+ if (pNextItem != VMA_NULL)\n+ {\n+ pNextItem->pPrev = VMA_NULL;\n+ }\n+ m_pFront = pNextItem;\n+ m_ItemAllocator.Free(pFrontItem);\n+ --m_Count;\n+}\n+\n+template<typename T>\n+void VmaRawList<T>::PopBack()\n+{\n+ VMA_HEAVY_ASSERT(m_Count > 0);\n+ ItemType* const pBackItem = m_pBack;\n+ ItemType* const pPrevItem = pBackItem->pPrev;\n+ if(pPrevItem != VMA_NULL)\n+ {\n+ pPrevItem->pNext = VMA_NULL;\n+ }\n+ m_pBack = pPrevItem;\n+ m_ItemAllocator.Free(pBackItem);\n+ --m_Count;\n+}\n+\n+template<typename T>\n+void VmaRawList<T>::Clear()\n+{\n+ if (IsEmpty() == false)\n+ {\n+ ItemType* pItem = m_pBack;\n+ while (pItem != VMA_NULL)\n+ {\n+ ItemType* const pPrevItem = pItem->pPrev;\n+ m_ItemAllocator.Free(pItem);\n+ pItem = pPrevItem;\n+ }\n+ m_pFront = VMA_NULL;\n+ m_pBack = VMA_NULL;\n+ m_Count = 0;\n+ }\n+}\n+\n+template<typename T>\n+void VmaRawList<T>::Remove(ItemType* pItem)\n+{\n+ VMA_HEAVY_ASSERT(pItem != VMA_NULL);\n+ VMA_HEAVY_ASSERT(m_Count > 0);\n+\n+ if(pItem->pPrev != VMA_NULL)\n+ {\n+ pItem->pPrev->pNext = pItem->pNext;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_pFront == pItem);\n+ m_pFront = pItem->pNext;\n+ }\n+\n+ if(pItem->pNext != VMA_NULL)\n+ {\n+ pItem->pNext->pPrev = pItem->pPrev;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_pBack == pItem);\n+ m_pBack = pItem->pPrev;\n+ }\n+\n+ m_ItemAllocator.Free(pItem);\n+ --m_Count;\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem)\n+{\n+ if(pItem != VMA_NULL)\n+ {\n+ ItemType* const prevItem = pItem->pPrev;\n+ ItemType* const newItem = m_ItemAllocator.Alloc();\n+ newItem->pPrev = prevItem;\n+ newItem->pNext = pItem;\n+ pItem->pPrev = newItem;\n+ if(prevItem != VMA_NULL)\n+ {\n+ prevItem->pNext = newItem;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_pFront == pItem);\n+ m_pFront = newItem;\n+ }\n+ ++m_Count;\n+ return newItem;\n+ }\n+ else\n+ return PushBack();\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem)\n+{\n+ if(pItem != VMA_NULL)\n+ {\n+ ItemType* const nextItem = pItem->pNext;\n+ ItemType* const newItem = m_ItemAllocator.Alloc();\n+ newItem->pNext = nextItem;\n+ newItem->pPrev = pItem;\n+ pItem->pNext = newItem;\n+ if(nextItem != VMA_NULL)\n+ {\n+ nextItem->pPrev = newItem;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_pBack == pItem);\n+ m_pBack = newItem;\n+ }\n+ ++m_Count;\n+ return newItem;\n+ }\n+ else\n+ return PushFront();\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::InsertBefore(ItemType* pItem, const T& value)\n+{\n+ ItemType* const newItem = InsertBefore(pItem);\n+ newItem->Value = value;\n+ return newItem;\n+}\n+\n+template<typename T>\n+VmaListItem<T>* VmaRawList<T>::InsertAfter(ItemType* pItem, const T& value)\n+{\n+ ItemType* const newItem = InsertAfter(pItem);\n+ newItem->Value = value;\n+ return newItem;\n+}\n+#endif \/\/ _VMA_RAW_LIST_FUNCTIONS\n+#endif \/\/ _VMA_RAW_LIST\n+\n+#ifndef _VMA_LIST\n+template<typename T, typename AllocatorT>\n+class VmaList\n+{\n+ VMA_CLASS_NO_COPY(VmaList)\n+public:\n+ class reverse_iterator;\n+ class const_iterator;\n+ class const_reverse_iterator;\n+\n+ class iterator\n+ {\n+ friend class const_iterator;\n+ friend class VmaList<T, AllocatorT>;\n+ public:\n+ iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\n+ iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+\n+ T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\n+ T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\n+\n+ bool operator==(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\n+ bool operator!=(const iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\n+\n+ iterator operator++(int) { iterator result = *this; ++*this; return result; }\n+ iterator operator--(int) { iterator result = *this; --*this; return result; }\n+\n+ iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }\n+ iterator& operator--();\n+\n+ private:\n+ VmaRawList<T>* m_pList;\n+ VmaListItem<T>* m_pItem;\n+\n+ iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\n+ };\n+ class reverse_iterator\n+ {\n+ friend class const_reverse_iterator;\n+ friend class VmaList<T, AllocatorT>;\n+ public:\n+ reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\n+ reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+\n+ T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\n+ T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\n+\n+ bool operator==(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\n+ bool operator!=(const reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\n+\n+ reverse_iterator operator++(int) { reverse_iterator result = *this; ++* this; return result; }\n+ reverse_iterator operator--(int) { reverse_iterator result = *this; --* this; return result; }\n+\n+ reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }\n+ reverse_iterator& operator--();\n+\n+ private:\n+ VmaRawList<T>* m_pList;\n+ VmaListItem<T>* m_pItem;\n+\n+ reverse_iterator(VmaRawList<T>* pList, VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\n+ };\n+ class const_iterator\n+ {\n+ friend class VmaList<T, AllocatorT>;\n+ public:\n+ const_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\n+ const_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+ const_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+\n+ iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }\n+\n+ const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\n+ const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\n+\n+ bool operator==(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\n+ bool operator!=(const const_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\n+\n+ const_iterator operator++(int) { const_iterator result = *this; ++* this; return result; }\n+ const_iterator operator--(int) { const_iterator result = *this; --* this; return result; }\n+\n+ const_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pNext; return *this; }\n+ const_iterator& operator--();\n+\n+ private:\n+ const VmaRawList<T>* m_pList;\n+ const VmaListItem<T>* m_pItem;\n+\n+ const_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\n+ };\n+ class const_reverse_iterator\n+ {\n+ friend class VmaList<T, AllocatorT>;\n+ public:\n+ const_reverse_iterator() : m_pList(VMA_NULL), m_pItem(VMA_NULL) {}\n+ const_reverse_iterator(const reverse_iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+ const_reverse_iterator(const iterator& src) : m_pList(src.m_pList), m_pItem(src.m_pItem) {}\n+\n+ reverse_iterator drop_const() { return { const_cast<VmaRawList<T>*>(m_pList), const_cast<VmaListItem<T>*>(m_pItem) }; }\n+\n+ const T& operator*() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return m_pItem->Value; }\n+ const T* operator->() const { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); return &m_pItem->Value; }\n+\n+ bool operator==(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem == rhs.m_pItem; }\n+ bool operator!=(const const_reverse_iterator& rhs) const { VMA_HEAVY_ASSERT(m_pList == rhs.m_pList); return m_pItem != rhs.m_pItem; }\n+\n+ const_reverse_iterator operator++(int) { const_reverse_iterator result = *this; ++* this; return result; }\n+ const_reverse_iterator operator--(int) { const_reverse_iterator result = *this; --* this; return result; }\n+\n+ const_reverse_iterator& operator++() { VMA_HEAVY_ASSERT(m_pItem != VMA_NULL); m_pItem = m_pItem->pPrev; return *this; }\n+ const_reverse_iterator& operator--();\n+\n+ private:\n+ const VmaRawList<T>* m_pList;\n+ const VmaListItem<T>* m_pItem;\n+\n+ const_reverse_iterator(const VmaRawList<T>* pList, const VmaListItem<T>* pItem) : m_pList(pList), m_pItem(pItem) {}\n+ };\n+\n+ VmaList(const AllocatorT& allocator) : m_RawList(allocator.m_pCallbacks) {}\n+\n+ bool empty() const { return m_RawList.IsEmpty(); }\n+ size_t size() const { return m_RawList.GetCount(); }\n+\n+ iterator begin() { return iterator(&m_RawList, m_RawList.Front()); }\n+ iterator end() { return iterator(&m_RawList, VMA_NULL); }\n+\n+ const_iterator cbegin() const { return const_iterator(&m_RawList, m_RawList.Front()); }\n+ const_iterator cend() const { return const_iterator(&m_RawList, VMA_NULL); }\n+\n+ const_iterator begin() const { return cbegin(); }\n+ const_iterator end() const { return cend(); }\n+\n+ reverse_iterator rbegin() { return reverse_iterator(&m_RawList, m_RawList.Back()); }\n+ reverse_iterator rend() { return reverse_iterator(&m_RawList, VMA_NULL); }\n+\n+ const_reverse_iterator crbegin() const { return const_reverse_iterator(&m_RawList, m_RawList.Back()); }\n+ const_reverse_iterator crend() const { return const_reverse_iterator(&m_RawList, VMA_NULL); }\n+\n+ const_reverse_iterator rbegin() const { return crbegin(); }\n+ const_reverse_iterator rend() const { return crend(); }\n+\n+ void push_back(const T& value) { m_RawList.PushBack(value); }\n+ iterator insert(iterator it, const T& value) { return iterator(&m_RawList, m_RawList.InsertBefore(it.m_pItem, value)); }\n+\n+ void clear() { m_RawList.Clear(); }\n+ void erase(iterator it) { m_RawList.Remove(it.m_pItem); }\n+\n+private:\n+ VmaRawList<T> m_RawList;\n+};\n+\n+#ifndef _VMA_LIST_FUNCTIONS\n+template<typename T, typename AllocatorT>\n+typename VmaList<T, AllocatorT>::iterator& VmaList<T, AllocatorT>::iterator::operator--()\n+{\n+ if (m_pItem != VMA_NULL)\n+ {\n+ m_pItem = m_pItem->pPrev;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\n+ m_pItem = m_pList->Back();\n+ }\n+ return *this;\n+}\n+\n+template<typename T, typename AllocatorT>\n+typename VmaList<T, AllocatorT>::reverse_iterator& VmaList<T, AllocatorT>::reverse_iterator::operator--()\n+{\n+ if (m_pItem != VMA_NULL)\n+ {\n+ m_pItem = m_pItem->pNext;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\n+ m_pItem = m_pList->Front();\n+ }\n+ return *this;\n+}\n+\n+template<typename T, typename AllocatorT>\n+typename VmaList<T, AllocatorT>::const_iterator& VmaList<T, AllocatorT>::const_iterator::operator--()\n+{\n+ if (m_pItem != VMA_NULL)\n+ {\n+ m_pItem = m_pItem->pPrev;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\n+ m_pItem = m_pList->Back();\n+ }\n+ return *this;\n+}\n+\n+template<typename T, typename AllocatorT>\n+typename VmaList<T, AllocatorT>::const_reverse_iterator& VmaList<T, AllocatorT>::const_reverse_iterator::operator--()\n+{\n+ if (m_pItem != VMA_NULL)\n+ {\n+ m_pItem = m_pItem->pNext;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(!m_pList->IsEmpty());\n+ m_pItem = m_pList->Back();\n+ }\n+ return *this;\n+}\n+#endif \/\/ _VMA_LIST_FUNCTIONS\n+#endif \/\/ _VMA_LIST\n+\n+#ifndef _VMA_INTRUSIVE_LINKED_LIST\n+\/*\n+Expected interface of ItemTypeTraits:\n+struct MyItemTypeTraits\n+{\n+ typedef MyItem ItemType;\n+ static ItemType* GetPrev(const ItemType* item) { return item->myPrevPtr; }\n+ static ItemType* GetNext(const ItemType* item) { return item->myNextPtr; }\n+ static ItemType*& AccessPrev(ItemType* item) { return item->myPrevPtr; }\n+ static ItemType*& AccessNext(ItemType* item) { return item->myNextPtr; }\n+};\n+*\/\n+template<typename ItemTypeTraits>\n+class VmaIntrusiveLinkedList\n+{\n+public:\n+ typedef typename ItemTypeTraits::ItemType ItemType;\n+ static ItemType* GetPrev(const ItemType* item) { return ItemTypeTraits::GetPrev(item); }\n+ static ItemType* GetNext(const ItemType* item) { return ItemTypeTraits::GetNext(item); }\n+\n+ \/\/ Movable, not copyable.\n+ VmaIntrusiveLinkedList() = default;\n+ VmaIntrusiveLinkedList(VmaIntrusiveLinkedList && src);\n+ VmaIntrusiveLinkedList(const VmaIntrusiveLinkedList&) = delete;\n+ VmaIntrusiveLinkedList& operator=(VmaIntrusiveLinkedList&& src);\n+ VmaIntrusiveLinkedList& operator=(const VmaIntrusiveLinkedList&) = delete;\n+ ~VmaIntrusiveLinkedList() { VMA_HEAVY_ASSERT(IsEmpty()); }\n+ \n+ size_t GetCount() const { return m_Count; }\n+ bool IsEmpty() const { return m_Count == 0; }\n+ ItemType* Front() { return m_Front; }\n+ ItemType* Back() { return m_Back; }\n+ const ItemType* Front() const { return m_Front; }\n+ const ItemType* Back() const { return m_Back; }\n+\n+ void PushBack(ItemType* item);\n+ void PushFront(ItemType* item);\n+ ItemType* PopBack();\n+ ItemType* PopFront();\n+\n+ \/\/ MyItem can be null - it means PushBack.\n+ void InsertBefore(ItemType* existingItem, ItemType* newItem);\n+ \/\/ MyItem can be null - it means PushFront.\n+ void InsertAfter(ItemType* existingItem, ItemType* newItem);\n+ void Remove(ItemType* item);\n+ void RemoveAll();\n+\n+private:\n+ ItemType* m_Front = VMA_NULL;\n+ ItemType* m_Back = VMA_NULL;\n+ size_t m_Count = 0;\n+};\n+\n+#ifndef _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS\n+template<typename ItemTypeTraits>\n+VmaIntrusiveLinkedList<ItemTypeTraits>::VmaIntrusiveLinkedList(VmaIntrusiveLinkedList&& src)\n+ : m_Front(src.m_Front), m_Back(src.m_Back), m_Count(src.m_Count)\n+{\n+ src.m_Front = src.m_Back = VMA_NULL;\n+ src.m_Count = 0;\n+}\n+\n+template<typename ItemTypeTraits>\n+VmaIntrusiveLinkedList<ItemTypeTraits>& VmaIntrusiveLinkedList<ItemTypeTraits>::operator=(VmaIntrusiveLinkedList&& src)\n+{\n+ if (&src != this)\n+ {\n+ VMA_HEAVY_ASSERT(IsEmpty());\n+ m_Front = src.m_Front;\n+ m_Back = src.m_Back;\n+ m_Count = src.m_Count;\n+ src.m_Front = src.m_Back = VMA_NULL;\n+ src.m_Count = 0;\n+ }\n+ return *this;\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::PushBack(ItemType* item)\n+{\n+ VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL);\n+ if (IsEmpty())\n+ {\n+ m_Front = item;\n+ m_Back = item;\n+ m_Count = 1;\n+ }\n+ else\n+ {\n+ ItemTypeTraits::AccessPrev(item) = m_Back;\n+ ItemTypeTraits::AccessNext(m_Back) = item;\n+ m_Back = item;\n+ ++m_Count;\n+ }\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::PushFront(ItemType* item)\n+{\n+ VMA_HEAVY_ASSERT(ItemTypeTraits::GetPrev(item) == VMA_NULL && ItemTypeTraits::GetNext(item) == VMA_NULL);\n+ if (IsEmpty())\n+ {\n+ m_Front = item;\n+ m_Back = item;\n+ m_Count = 1;\n+ }\n+ else\n+ {\n+ ItemTypeTraits::AccessNext(item) = m_Front;\n+ ItemTypeTraits::AccessPrev(m_Front) = item;\n+ m_Front = item;\n+ ++m_Count;\n+ }\n+}\n+\n+template<typename ItemTypeTraits>\n+typename VmaIntrusiveLinkedList<ItemTypeTraits>::ItemType* VmaIntrusiveLinkedList<ItemTypeTraits>::PopBack()\n+{\n+ VMA_HEAVY_ASSERT(m_Count > 0);\n+ ItemType* const backItem = m_Back;\n+ ItemType* const prevItem = ItemTypeTraits::GetPrev(backItem);\n+ if (prevItem != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessNext(prevItem) = VMA_NULL;\n+ }\n+ m_Back = prevItem;\n+ --m_Count;\n+ ItemTypeTraits::AccessPrev(backItem) = VMA_NULL;\n+ ItemTypeTraits::AccessNext(backItem) = VMA_NULL;\n+ return backItem;\n+}\n+\n+template<typename ItemTypeTraits>\n+typename VmaIntrusiveLinkedList<ItemTypeTraits>::ItemType* VmaIntrusiveLinkedList<ItemTypeTraits>::PopFront()\n+{\n+ VMA_HEAVY_ASSERT(m_Count > 0);\n+ ItemType* const frontItem = m_Front;\n+ ItemType* const nextItem = ItemTypeTraits::GetNext(frontItem);\n+ if (nextItem != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessPrev(nextItem) = VMA_NULL;\n+ }\n+ m_Front = nextItem;\n+ --m_Count;\n+ ItemTypeTraits::AccessPrev(frontItem) = VMA_NULL;\n+ ItemTypeTraits::AccessNext(frontItem) = VMA_NULL;\n+ return frontItem;\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::InsertBefore(ItemType* existingItem, ItemType* newItem)\n+{\n+ VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL);\n+ if (existingItem != VMA_NULL)\n+ {\n+ ItemType* const prevItem = ItemTypeTraits::GetPrev(existingItem);\n+ ItemTypeTraits::AccessPrev(newItem) = prevItem;\n+ ItemTypeTraits::AccessNext(newItem) = existingItem;\n+ ItemTypeTraits::AccessPrev(existingItem) = newItem;\n+ if (prevItem != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessNext(prevItem) = newItem;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_Front == existingItem);\n+ m_Front = newItem;\n+ }\n+ ++m_Count;\n+ }\n+ else\n+ PushBack(newItem);\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::InsertAfter(ItemType* existingItem, ItemType* newItem)\n+{\n+ VMA_HEAVY_ASSERT(newItem != VMA_NULL && ItemTypeTraits::GetPrev(newItem) == VMA_NULL && ItemTypeTraits::GetNext(newItem) == VMA_NULL);\n+ if (existingItem != VMA_NULL)\n+ {\n+ ItemType* const nextItem = ItemTypeTraits::GetNext(existingItem);\n+ ItemTypeTraits::AccessNext(newItem) = nextItem;\n+ ItemTypeTraits::AccessPrev(newItem) = existingItem;\n+ ItemTypeTraits::AccessNext(existingItem) = newItem;\n+ if (nextItem != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessPrev(nextItem) = newItem;\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_Back == existingItem);\n+ m_Back = newItem;\n+ }\n+ ++m_Count;\n+ }\n+ else\n+ return PushFront(newItem);\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::Remove(ItemType* item)\n+{\n+ VMA_HEAVY_ASSERT(item != VMA_NULL && m_Count > 0);\n+ if (ItemTypeTraits::GetPrev(item) != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessNext(ItemTypeTraits::AccessPrev(item)) = ItemTypeTraits::GetNext(item);\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_Front == item);\n+ m_Front = ItemTypeTraits::GetNext(item);\n+ }\n+\n+ if (ItemTypeTraits::GetNext(item) != VMA_NULL)\n+ {\n+ ItemTypeTraits::AccessPrev(ItemTypeTraits::AccessNext(item)) = ItemTypeTraits::GetPrev(item);\n+ }\n+ else\n+ {\n+ VMA_HEAVY_ASSERT(m_Back == item);\n+ m_Back = ItemTypeTraits::GetPrev(item);\n+ }\n+ ItemTypeTraits::AccessPrev(item) = VMA_NULL;\n+ ItemTypeTraits::AccessNext(item) = VMA_NULL;\n+ --m_Count;\n+}\n+\n+template<typename ItemTypeTraits>\n+void VmaIntrusiveLinkedList<ItemTypeTraits>::RemoveAll()\n+{\n+ if (!IsEmpty())\n+ {\n+ ItemType* item = m_Back;\n+ while (item != VMA_NULL)\n+ {\n+ ItemType* const prevItem = ItemTypeTraits::AccessPrev(item);\n+ ItemTypeTraits::AccessPrev(item) = VMA_NULL;\n+ ItemTypeTraits::AccessNext(item) = VMA_NULL;\n+ item = prevItem;\n+ }\n+ m_Front = VMA_NULL;\n+ m_Back = VMA_NULL;\n+ m_Count = 0;\n+ }\n+}\n+#endif \/\/ _VMA_INTRUSIVE_LINKED_LIST_FUNCTIONS\n+#endif \/\/ _VMA_INTRUSIVE_LINKED_LIST\n+\n+\/\/ Unused in this version.\n+#if 0\n+\n+#ifndef _VMA_PAIR\n+template<typename T1, typename T2>\n+struct VmaPair\n+{\n+ T1 first;\n+ T2 second;\n+\n+ VmaPair() : first(), second() {}\n+ VmaPair(const T1& firstSrc, const T2& secondSrc) : first(firstSrc), second(secondSrc) {}\n+};\n+\n+template<typename FirstT, typename SecondT>\n+struct VmaPairFirstLess\n+{\n+ bool operator()(const VmaPair<FirstT, SecondT>& lhs, const VmaPair<FirstT, SecondT>& rhs) const\n+ {\n+ return lhs.first < rhs.first;\n+ }\n+ bool operator()(const VmaPair<FirstT, SecondT>& lhs, const FirstT& rhsFirst) const\n+ {\n+ return lhs.first < rhsFirst;\n+ }\n+};\n+#endif \/\/ _VMA_PAIR\n+\n+#ifndef _VMA_MAP\n+\/* Class compatible with subset of interface of std::unordered_map.\n+KeyT, ValueT must be POD because they will be stored in VmaVector.\n+*\/\n+template<typename KeyT, typename ValueT>\n+class VmaMap\n+{\n+public:\n+ typedef VmaPair<KeyT, ValueT> PairType;\n+ typedef PairType* iterator;\n+\n+ VmaMap(const VmaStlAllocator<PairType>& allocator) : m_Vector(allocator) {}\n+\n+ iterator begin() { return m_Vector.begin(); }\n+ iterator end() { return m_Vector.end(); }\n+ size_t size() { return m_Vector.size(); }\n+\n+ void insert(const PairType& pair);\n+ iterator find(const KeyT& key);\n+ void erase(iterator it);\n+\n+private:\n+ VmaVector< PairType, VmaStlAllocator<PairType>> m_Vector;\n+};\n+\n+#ifndef _VMA_MAP_FUNCTIONS\n+template<typename KeyT, typename ValueT>\n+void VmaMap<KeyT, ValueT>::insert(const PairType& pair)\n+{\n+ const size_t indexToInsert = VmaBinaryFindFirstNotLess(\n+ m_Vector.data(),\n+ m_Vector.data() + m_Vector.size(),\n+ pair,\n+ VmaPairFirstLess<KeyT, ValueT>()) - m_Vector.data();\n+ VmaVectorInsert(m_Vector, indexToInsert, pair);\n+}\n+\n+template<typename KeyT, typename ValueT>\n+VmaPair<KeyT, ValueT>* VmaMap<KeyT, ValueT>::find(const KeyT& key)\n+{\n+ PairType* it = VmaBinaryFindFirstNotLess(\n+ m_Vector.data(),\n+ m_Vector.data() + m_Vector.size(),\n+ key,\n+ VmaPairFirstLess<KeyT, ValueT>());\n+ if ((it != m_Vector.end()) && (it->first == key))\n+ {\n+ return it;\n+ }\n+ else\n+ {\n+ return m_Vector.end();\n+ }\n+}\n+\n+template<typename KeyT, typename ValueT>\n+void VmaMap<KeyT, ValueT>::erase(iterator it)\n+{\n+ VmaVectorRemove(m_Vector, it - m_Vector.begin());\n+}\n+#endif \/\/ _VMA_MAP_FUNCTIONS\n+#endif \/\/ _VMA_MAP\n+\n+#endif \/\/ #if 0\n+\n+#if !defined(_VMA_STRING_BUILDER) && VMA_STATS_STRING_ENABLED\n+class VmaStringBuilder\n+{\n+public:\n+ VmaStringBuilder(const VkAllocationCallbacks* allocationCallbacks) : m_Data(VmaStlAllocator<char>(allocationCallbacks)) {}\n+ ~VmaStringBuilder() = default;\n+\n+ size_t GetLength() const { return m_Data.size(); }\n+ const char* GetData() const { return m_Data.data(); }\n+ void AddNewLine() { Add('\\n'); }\n+ void Add(char ch) { m_Data.push_back(ch); }\n+\n+ void Add(const char* pStr);\n+ void AddNumber(uint32_t num);\n+ void AddNumber(uint64_t num);\n+ void AddPointer(const void* ptr);\n+\n+private:\n+ VmaVector<char, VmaStlAllocator<char>> m_Data;\n+};\n+\n+#ifndef _VMA_STRING_BUILDER_FUNCTIONS\n+void VmaStringBuilder::Add(const char* pStr)\n+{\n+ const size_t strLen = strlen(pStr);\n+ if (strLen > 0)\n+ {\n+ const size_t oldCount = m_Data.size();\n+ m_Data.resize(oldCount + strLen);\n+ memcpy(m_Data.data() + oldCount, pStr, strLen);\n+ }\n+}\n+\n+void VmaStringBuilder::AddNumber(uint32_t num)\n+{\n+ char buf[11];\n+ buf[10] = '\\0';\n+ char* p = &buf[10];\n+ do\n+ {\n+ *--p = '0' + (num % 10);\n+ num \/= 10;\n+ } while (num);\n+ Add(p);\n+}\n+\n+void VmaStringBuilder::AddNumber(uint64_t num)\n+{\n+ char buf[21];\n+ buf[20] = '\\0';\n+ char* p = &buf[20];\n+ do\n+ {\n+ *--p = '0' + (num % 10);\n+ num \/= 10;\n+ } while (num);\n+ Add(p);\n+}\n+\n+void VmaStringBuilder::AddPointer(const void* ptr)\n+{\n+ char buf[21];\n+ VmaPtrToStr(buf, sizeof(buf), ptr);\n+ Add(buf);\n+}\n+#endif \/\/_VMA_STRING_BUILDER_FUNCTIONS\n+#endif \/\/ _VMA_STRING_BUILDER\n+\n+#if !defined(_VMA_JSON_WRITER) && VMA_STATS_STRING_ENABLED\n+\/*\n+Allows to conveniently build a correct JSON document to be written to the\n+VmaStringBuilder passed to the constructor.\n+*\/\n+class VmaJsonWriter\n+{\n+ VMA_CLASS_NO_COPY(VmaJsonWriter)\n+public:\n+ \/\/ sb - string builder to write the document to. Must remain alive for the whole lifetime of this object.\n+ VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb);\n+ ~VmaJsonWriter();\n+\n+ \/\/ Begins object by writing \"{\".\n+ \/\/ Inside an object, you must call pairs of WriteString and a value, e.g.:\n+ \/\/ j.BeginObject(true); j.WriteString(\"A\"); j.WriteNumber(1); j.WriteString(\"B\"); j.WriteNumber(2); j.EndObject();\n+ \/\/ Will write: { \"A\": 1, \"B\": 2 }\n+ void BeginObject(bool singleLine = false);\n+ \/\/ Ends object by writing \"}\".\n+ void EndObject();\n+\n+ \/\/ Begins array by writing \"[\".\n+ \/\/ Inside an array, you can write a sequence of any values.\n+ void BeginArray(bool singleLine = false);\n+ \/\/ Ends array by writing \"[\".\n+ void EndArray();\n+\n+ \/\/ Writes a string value inside \"\".\n+ \/\/ pStr can contain any ANSI characters, including '\"', new line etc. - they will be properly escaped.\n+ void WriteString(const char* pStr);\n+ \n+ \/\/ Begins writing a string value.\n+ \/\/ Call BeginString, ContinueString, ContinueString, ..., EndString instead of\n+ \/\/ WriteString to conveniently build the string content incrementally, made of\n+ \/\/ parts including numbers.\n+ void BeginString(const char* pStr = VMA_NULL);\n+ \/\/ Posts next part of an open string.\n+ void ContinueString(const char* pStr);\n+ \/\/ Posts next part of an open string. The number is converted to decimal characters.\n+ void ContinueString(uint32_t n);\n+ void ContinueString(uint64_t n);\n+ \/\/ Posts next part of an open string. Pointer value is converted to characters\n+ \/\/ using \"%p\" formatting - shown as hexadecimal number, e.g.: 000000081276Ad00\n+ void ContinueString_Pointer(const void* ptr);\n+ \/\/ Ends writing a string value by writing '\"'.\n+ void EndString(const char* pStr = VMA_NULL);\n+\n+ \/\/ Writes a number value.\n+ void WriteNumber(uint32_t n);\n+ void WriteNumber(uint64_t n);\n+ \/\/ Writes a boolean value - false or true.\n+ void WriteBool(bool b);\n+ \/\/ Writes a null value.\n+ void WriteNull();\n+\n+private:\n+ enum COLLECTION_TYPE\n+ {\n+ COLLECTION_TYPE_OBJECT,\n+ COLLECTION_TYPE_ARRAY,\n+ };\n+ struct StackItem\n+ {\n+ COLLECTION_TYPE type;\n+ uint32_t valueCount;\n+ bool singleLineMode;\n+ };\n+\n+ static const char* const INDENT;\n+\n+ VmaStringBuilder& m_SB;\n+ VmaVector< StackItem, VmaStlAllocator<StackItem> > m_Stack;\n+ bool m_InsideString;\n+\n+ void BeginValue(bool isString);\n+ void WriteIndent(bool oneLess = false);\n+};\n+const char* const VmaJsonWriter::INDENT = \" \";\n+\n+#ifndef _VMA_JSON_WRITER_FUNCTIONS\n+VmaJsonWriter::VmaJsonWriter(const VkAllocationCallbacks* pAllocationCallbacks, VmaStringBuilder& sb)\n+ : m_SB(sb),\n+ m_Stack(VmaStlAllocator<StackItem>(pAllocationCallbacks)),\n+ m_InsideString(false) {}\n+\n+VmaJsonWriter::~VmaJsonWriter()\n+{\n+ VMA_ASSERT(!m_InsideString);\n+ VMA_ASSERT(m_Stack.empty());\n+}\n+\n+void VmaJsonWriter::BeginObject(bool singleLine)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+\n+ BeginValue(false);\n+ m_SB.Add('{');\n+\n+ StackItem item;\n+ item.type = COLLECTION_TYPE_OBJECT;\n+ item.valueCount = 0;\n+ item.singleLineMode = singleLine;\n+ m_Stack.push_back(item);\n+}\n+\n+void VmaJsonWriter::EndObject()\n+{\n+ VMA_ASSERT(!m_InsideString);\n+\n+ WriteIndent(true);\n+ m_SB.Add('}');\n+\n+ VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_OBJECT);\n+ m_Stack.pop_back();\n+}\n+\n+void VmaJsonWriter::BeginArray(bool singleLine)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+\n+ BeginValue(false);\n+ m_SB.Add('[');\n+\n+ StackItem item;\n+ item.type = COLLECTION_TYPE_ARRAY;\n+ item.valueCount = 0;\n+ item.singleLineMode = singleLine;\n+ m_Stack.push_back(item);\n+}\n+\n+void VmaJsonWriter::EndArray()\n+{\n+ VMA_ASSERT(!m_InsideString);\n+\n+ WriteIndent(true);\n+ m_SB.Add(']');\n+\n+ VMA_ASSERT(!m_Stack.empty() && m_Stack.back().type == COLLECTION_TYPE_ARRAY);\n+ m_Stack.pop_back();\n+}\n+\n+void VmaJsonWriter::WriteString(const char* pStr)\n+{\n+ BeginString(pStr);\n+ EndString();\n+}\n+\n+void VmaJsonWriter::BeginString(const char* pStr)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+\n+ BeginValue(true);\n+ m_SB.Add('\"');\n+ m_InsideString = true;\n+ if (pStr != VMA_NULL && pStr[0] != '\\0')\n+ {\n+ ContinueString(pStr);\n+ }\n+}\n+\n+void VmaJsonWriter::ContinueString(const char* pStr)\n+{\n+ VMA_ASSERT(m_InsideString);\n+\n+ const size_t strLen = strlen(pStr);\n+ for (size_t i = 0; i < strLen; ++i)\n+ {\n+ char ch = pStr[i];\n+ if (ch == '\\\\')\n+ {\n+ m_SB.Add(\"\\\\\\\\\");\n+ }\n+ else if (ch == '\"')\n+ {\n+ m_SB.Add(\"\\\\\\\"\");\n+ }\n+ else if (ch >= 32)\n+ {\n+ m_SB.Add(ch);\n+ }\n+ else switch (ch)\n+ {\n+ case '\\b':\n+ m_SB.Add(\"\\\\b\");\n+ break;\n+ case '\\f':\n+ m_SB.Add(\"\\\\f\");\n+ break;\n+ case '\\n':\n+ m_SB.Add(\"\\\\n\");\n+ break;\n+ case '\\r':\n+ m_SB.Add(\"\\\\r\");\n+ break;\n+ case '\\t':\n+ m_SB.Add(\"\\\\t\");\n+ break;\n+ default:\n+ VMA_ASSERT(0 && \"Character not currently supported.\");\n+ break;\n+ }\n+ }\n+}\n+\n+void VmaJsonWriter::ContinueString(uint32_t n)\n+{\n+ VMA_ASSERT(m_InsideString);\n+ m_SB.AddNumber(n);\n+}\n+\n+void VmaJsonWriter::ContinueString(uint64_t n)\n+{\n+ VMA_ASSERT(m_InsideString);\n+ m_SB.AddNumber(n);\n+}\n+\n+void VmaJsonWriter::ContinueString_Pointer(const void* ptr)\n+{\n+ VMA_ASSERT(m_InsideString);\n+ m_SB.AddPointer(ptr);\n+}\n+\n+void VmaJsonWriter::EndString(const char* pStr)\n+{\n+ VMA_ASSERT(m_InsideString);\n+ if (pStr != VMA_NULL && pStr[0] != '\\0')\n+ {\n+ ContinueString(pStr);\n+ }\n+ m_SB.Add('\"');\n+ m_InsideString = false;\n+}\n+\n+void VmaJsonWriter::WriteNumber(uint32_t n)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+ BeginValue(false);\n+ m_SB.AddNumber(n);\n+}\n+\n+void VmaJsonWriter::WriteNumber(uint64_t n)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+ BeginValue(false);\n+ m_SB.AddNumber(n);\n+}\n+\n+void VmaJsonWriter::WriteBool(bool b)\n+{\n+ VMA_ASSERT(!m_InsideString);\n+ BeginValue(false);\n+ m_SB.Add(b ? \"true\" : \"false\");\n+}\n+\n+void VmaJsonWriter::WriteNull()\n+{\n+ VMA_ASSERT(!m_InsideString);\n+ BeginValue(false);\n+ m_SB.Add(\"null\");\n+}\n+\n+void VmaJsonWriter::BeginValue(bool isString)\n+{\n+ if (!m_Stack.empty())\n+ {\n+ StackItem& currItem = m_Stack.back();\n+ if (currItem.type == COLLECTION_TYPE_OBJECT &&\n+ currItem.valueCount % 2 == 0)\n+ {\n+ VMA_ASSERT(isString);\n+ }\n+\n+ if (currItem.type == COLLECTION_TYPE_OBJECT &&\n+ currItem.valueCount % 2 != 0)\n+ {\n+ m_SB.Add(\": \");\n+ }\n+ else if (currItem.valueCount > 0)\n+ {\n+ m_SB.Add(\", \");\n+ WriteIndent();\n+ }\n+ else\n+ {\n+ WriteIndent();\n+ }\n+ ++currItem.valueCount;\n+ }\n+}\n+\n+void VmaJsonWriter::WriteIndent(bool oneLess)\n+{\n+ if (!m_Stack.empty() && !m_Stack.back().singleLineMode)\n+ {\n+ m_SB.AddNewLine();\n+\n+ size_t count = m_Stack.size();\n+ if (count > 0 && oneLess)\n+ {\n+ --count;\n+ }\n+ for (size_t i = 0; i < count; ++i)\n+ {\n+ m_SB.Add(INDENT);\n+ }\n+ }\n+}\n+#endif \/\/ _VMA_JSON_WRITER_FUNCTIONS\n+\n+static void VmaPrintDetailedStatistics(VmaJsonWriter& json, const VmaDetailedStatistics& stat)\n+{\n+ json.BeginObject();\n+\n+ json.WriteString(\"BlockCount\");\n+ json.WriteNumber(stat.statistics.blockCount);\n+\n+ json.WriteString(\"AllocationCount\");\n+ json.WriteNumber(stat.statistics.allocationCount);\n+\n+ json.WriteString(\"UnusedRangeCount\");\n+ json.WriteNumber(stat.unusedRangeCount);\n+\n+ json.WriteString(\"BlockBytes\");\n+ json.WriteNumber(stat.statistics.blockBytes);\n+\n+ json.WriteString(\"AllocationBytes\");\n+ json.WriteNumber(stat.statistics.allocationBytes);\n+\n+ if (stat.statistics.allocationCount > 1)\n+ {\n+ json.WriteString(\"AllocationSize\");\n+ json.BeginObject(true);\n+ json.WriteString(\"Min\");\n+ json.WriteNumber(stat.allocationSizeMin);\n+ json.WriteString(\"Max\");\n+ json.WriteNumber(stat.allocationSizeMax);\n+ json.EndObject();\n+ }\n+\n+ if (stat.unusedRangeCount > 1)\n+ {\n+ json.WriteString(\"UnusedRangeSize\");\n+ json.BeginObject(true);\n+ json.WriteString(\"Min\");\n+ json.WriteNumber(stat.unusedRangeSizeMin);\n+ json.WriteString(\"Max\");\n+ json.WriteNumber(stat.unusedRangeSizeMax);\n+ json.EndObject();\n+ }\n+\n+ json.EndObject();\n+}\n+#endif \/\/ _VMA_JSON_WRITER\n+\n+#ifndef _VMA_MAPPING_HYSTERESIS\n+\n+class VmaMappingHysteresis\n+{\n+ VMA_CLASS_NO_COPY(VmaMappingHysteresis)\n+public:\n+ VmaMappingHysteresis() = default;\n+\n+ uint32_t GetExtraMapping() const { return m_ExtraMapping; }\n+\n+ \/\/ Call when Map was called.\n+ \/\/ Returns true if switched to extra +1 mapping reference count.\n+ bool PostMap()\n+ {\n+#if VMA_MAPPING_HYSTERESIS_ENABLED\n+ if(m_ExtraMapping == 0)\n+ {\n+ ++m_MajorCounter;\n+ if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING)\n+ {\n+ m_ExtraMapping = 1;\n+ m_MajorCounter = 0;\n+ m_MinorCounter = 0;\n+ return true;\n+ }\n+ }\n+ else \/\/ m_ExtraMapping == 1\n+ PostMinorCounter();\n+#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\n+ return false;\n+ }\n+\n+ \/\/ Call when Unmap was called.\n+ void PostUnmap()\n+ {\n+#if VMA_MAPPING_HYSTERESIS_ENABLED\n+ if(m_ExtraMapping == 0)\n+ ++m_MajorCounter;\n+ else \/\/ m_ExtraMapping == 1\n+ PostMinorCounter();\n+#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\n+ }\n+\n+ \/\/ Call when allocation was made from the memory block.\n+ void PostAlloc()\n+ {\n+#if VMA_MAPPING_HYSTERESIS_ENABLED\n+ if(m_ExtraMapping == 1)\n+ ++m_MajorCounter;\n+ else \/\/ m_ExtraMapping == 0\n+ PostMinorCounter();\n+#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\n+ }\n+\n+ \/\/ Call when allocation was freed from the memory block.\n+ \/\/ Returns true if switched to extra -1 mapping reference count.\n+ bool PostFree()\n+ {\n+#if VMA_MAPPING_HYSTERESIS_ENABLED\n+ if(m_ExtraMapping == 1)\n+ {\n+ ++m_MajorCounter;\n+ if(m_MajorCounter >= COUNTER_MIN_EXTRA_MAPPING &&\n+ m_MajorCounter > m_MinorCounter + 1)\n+ {\n+ m_ExtraMapping = 0;\n+ m_MajorCounter = 0;\n+ m_MinorCounter = 0;\n+ return true;\n+ }\n+ }\n+ else \/\/ m_ExtraMapping == 0\n+ PostMinorCounter();\n+#endif \/\/ #if VMA_MAPPING_HYSTERESIS_ENABLED\n+ return false;\n+ }\n+\n+private:\n+ static const int32_t COUNTER_MIN_EXTRA_MAPPING = 7;\n+\n+ uint32_t m_MinorCounter = 0;\n+ uint32_t m_MajorCounter = 0;\n+ uint32_t m_ExtraMapping = 0; \/\/ 0 or 1.\n+\n+ void PostMinorCounter()\n+ {\n+ if(m_MinorCounter < m_MajorCounter)\n+ ++m_MinorCounter;\n+ else if(m_MajorCounter > 0)\n+ --m_MajorCounter, --m_MinorCounter;\n+ }\n+};\n+\n+#endif \/\/ _VMA_MAPPING_HYSTERESIS\n+\n+#ifndef _VMA_DEVICE_MEMORY_BLOCK\n+\/*\n+Represents a single block of device memory (`VkDeviceMemory`) with all the\n+data about its regions (aka suballocations, #VmaAllocation), assigned and free.\n+\n+Thread-safety:\n+- Access to m_pMetadata must be externally synchronized.\n+- Map, Unmap, Bind* are synchronized internally.\n+*\/\n+class VmaDeviceMemoryBlock\n+{\n+ VMA_CLASS_NO_COPY(VmaDeviceMemoryBlock)\n+public:\n+ VmaBlockMetadata* m_pMetadata;\n+\n+ VmaDeviceMemoryBlock(VmaAllocator hAllocator);\n+ ~VmaDeviceMemoryBlock();\n+\n+ \/\/ Always call after construction.\n+ void Init(\n+ VmaAllocator hAllocator,\n+ VmaPool hParentPool,\n+ uint32_t newMemoryTypeIndex,\n+ VkDeviceMemory newMemory,\n+ VkDeviceSize newSize,\n+ uint32_t id,\n+ uint32_t algorithm,\n+ VkDeviceSize bufferImageGranularity);\n+ \/\/ Always call before destruction.\n+ void Destroy(VmaAllocator allocator);\n+\n+ VmaPool GetParentPool() const { return m_hParentPool; }\n+ VkDeviceMemory GetDeviceMemory() const { return m_hMemory; }\n+ uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\n+ uint32_t GetId() const { return m_Id; }\n+ void* GetMappedData() const { return m_pMappedData; }\n+ uint32_t GetMapRefCount() const { return m_MapCount; }\n+\n+ \/\/ Call when allocation\/free was made from m_pMetadata.\n+ \/\/ Used for m_MappingHysteresis.\n+ void PostAlloc() { m_MappingHysteresis.PostAlloc(); }\n+ void PostFree(VmaAllocator hAllocator);\n+\n+ \/\/ Validates all data structures inside this object. If not valid, returns false.\n+ bool Validate() const;\n+ VkResult CheckCorruption(VmaAllocator hAllocator);\n+\n+ \/\/ ppData can be null.\n+ VkResult Map(VmaAllocator hAllocator, uint32_t count, void** ppData);\n+ void Unmap(VmaAllocator hAllocator, uint32_t count);\n+\n+ VkResult WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);\n+ VkResult ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize);\n+\n+ VkResult BindBufferMemory(\n+ const VmaAllocator hAllocator,\n+ const VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer hBuffer,\n+ const void* pNext);\n+ VkResult BindImageMemory(\n+ const VmaAllocator hAllocator,\n+ const VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage hImage,\n+ const void* pNext);\n+\n+private:\n+ VmaPool m_hParentPool; \/\/ VK_NULL_HANDLE if not belongs to custom pool.\n+ uint32_t m_MemoryTypeIndex;\n+ uint32_t m_Id;\n+ VkDeviceMemory m_hMemory;\n+\n+ \/*\n+ Protects access to m_hMemory so it is not used by multiple threads simultaneously, e.g. vkMapMemory, vkBindBufferMemory.\n+ Also protects m_MapCount, m_pMappedData.\n+ Allocations, deallocations, any change in m_pMetadata is protected by parent's VmaBlockVector::m_Mutex.\n+ *\/\n+ VMA_MUTEX m_MapAndBindMutex;\n+ VmaMappingHysteresis m_MappingHysteresis;\n+ uint32_t m_MapCount;\n+ void* m_pMappedData;\n+};\n+#endif \/\/ _VMA_DEVICE_MEMORY_BLOCK\n+\n+#ifndef _VMA_ALLOCATION_T\n+struct VmaAllocation_T\n+{\n+ friend struct VmaDedicatedAllocationListItemTraits;\n+\n+ enum FLAGS\n+ {\n+ FLAG_PERSISTENT_MAP = 0x01,\n+ FLAG_MAPPING_ALLOWED = 0x02,\n+ };\n+\n+public:\n+ enum ALLOCATION_TYPE\n+ {\n+ ALLOCATION_TYPE_NONE,\n+ ALLOCATION_TYPE_BLOCK,\n+ ALLOCATION_TYPE_DEDICATED,\n+ };\n+\n+ \/\/ This struct is allocated using VmaPoolAllocator.\n+ VmaAllocation_T(bool mappingAllowed);\n+ ~VmaAllocation_T();\n+\n+ void InitBlockAllocation(\n+ VmaDeviceMemoryBlock* block,\n+ VmaAllocHandle allocHandle,\n+ VkDeviceSize alignment,\n+ VkDeviceSize size,\n+ uint32_t memoryTypeIndex,\n+ VmaSuballocationType suballocationType,\n+ bool mapped);\n+ \/\/ pMappedData not null means allocation is created with MAPPED flag.\n+ void InitDedicatedAllocation(\n+ VmaPool hParentPool,\n+ uint32_t memoryTypeIndex,\n+ VkDeviceMemory hMemory,\n+ VmaSuballocationType suballocationType,\n+ void* pMappedData,\n+ VkDeviceSize size);\n+\n+ ALLOCATION_TYPE GetType() const { return (ALLOCATION_TYPE)m_Type; }\n+ VkDeviceSize GetAlignment() const { return m_Alignment; }\n+ VkDeviceSize GetSize() const { return m_Size; }\n+ void* GetUserData() const { return m_pUserData; }\n+ const char* GetName() const { return m_pName; }\n+ VmaSuballocationType GetSuballocationType() const { return (VmaSuballocationType)m_SuballocationType; }\n+\n+ VmaDeviceMemoryBlock* GetBlock() const { VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK); return m_BlockAllocation.m_Block; }\n+ uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\n+ bool IsPersistentMap() const { return (m_Flags & FLAG_PERSISTENT_MAP) != 0; }\n+ bool IsMappingAllowed() const { return (m_Flags & FLAG_MAPPING_ALLOWED) != 0; }\n+\n+ void SetUserData(VmaAllocator hAllocator, void* pUserData) { m_pUserData = pUserData; }\n+ void SetName(VmaAllocator hAllocator, const char* pName);\n+ void FreeName(VmaAllocator hAllocator);\n+ uint8_t SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation);\n+ VmaAllocHandle GetAllocHandle() const;\n+ VkDeviceSize GetOffset() const;\n+ VmaPool GetParentPool() const;\n+ VkDeviceMemory GetMemory() const;\n+ void* GetMappedData() const;\n+\n+ void BlockAllocMap();\n+ void BlockAllocUnmap();\n+ VkResult DedicatedAllocMap(VmaAllocator hAllocator, void** ppData);\n+ void DedicatedAllocUnmap(VmaAllocator hAllocator);\n+\n+#if VMA_STATS_STRING_ENABLED\n+ uint32_t GetBufferImageUsage() const { return m_BufferImageUsage; }\n+\n+ void InitBufferImageUsage(uint32_t bufferImageUsage);\n+ void PrintParameters(class VmaJsonWriter& json) const;\n+#endif\n+\n+private:\n+ \/\/ Allocation out of VmaDeviceMemoryBlock.\n+ struct BlockAllocation\n+ {\n+ VmaDeviceMemoryBlock* m_Block;\n+ VmaAllocHandle m_AllocHandle;\n+ };\n+ \/\/ Allocation for an object that has its own private VkDeviceMemory.\n+ struct DedicatedAllocation\n+ {\n+ VmaPool m_hParentPool; \/\/ VK_NULL_HANDLE if not belongs to custom pool.\n+ VkDeviceMemory m_hMemory;\n+ void* m_pMappedData; \/\/ Not null means memory is mapped.\n+ VmaAllocation_T* m_Prev;\n+ VmaAllocation_T* m_Next;\n+ };\n+ union\n+ {\n+ \/\/ Allocation out of VmaDeviceMemoryBlock.\n+ BlockAllocation m_BlockAllocation;\n+ \/\/ Allocation for an object that has its own private VkDeviceMemory.\n+ DedicatedAllocation m_DedicatedAllocation;\n+ };\n+\n+ VkDeviceSize m_Alignment;\n+ VkDeviceSize m_Size;\n+ void* m_pUserData;\n+ char* m_pName;\n+ uint32_t m_MemoryTypeIndex;\n+ uint8_t m_Type; \/\/ ALLOCATION_TYPE\n+ uint8_t m_SuballocationType; \/\/ VmaSuballocationType\n+ \/\/ Reference counter for vmaMapMemory()\/vmaUnmapMemory().\n+ uint8_t m_MapCount;\n+ uint8_t m_Flags; \/\/ enum FLAGS\n+#if VMA_STATS_STRING_ENABLED\n+ uint32_t m_BufferImageUsage; \/\/ 0 if unknown.\n+#endif\n+};\n+#endif \/\/ _VMA_ALLOCATION_T\n+\n+#ifndef _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS\n+struct VmaDedicatedAllocationListItemTraits\n+{\n+ typedef VmaAllocation_T ItemType;\n+\n+ static ItemType* GetPrev(const ItemType* item)\n+ {\n+ VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\n+ return item->m_DedicatedAllocation.m_Prev;\n+ }\n+ static ItemType* GetNext(const ItemType* item)\n+ {\n+ VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\n+ return item->m_DedicatedAllocation.m_Next;\n+ }\n+ static ItemType*& AccessPrev(ItemType* item)\n+ {\n+ VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\n+ return item->m_DedicatedAllocation.m_Prev;\n+ }\n+ static ItemType*& AccessNext(ItemType* item)\n+ {\n+ VMA_HEAVY_ASSERT(item->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\n+ return item->m_DedicatedAllocation.m_Next;\n+ }\n+};\n+#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST_ITEM_TRAITS\n+\n+#ifndef _VMA_DEDICATED_ALLOCATION_LIST\n+\/*\n+Stores linked list of VmaAllocation_T objects.\n+Thread-safe, synchronized internally.\n+*\/\n+class VmaDedicatedAllocationList\n+{\n+public:\n+ VmaDedicatedAllocationList() {}\n+ ~VmaDedicatedAllocationList();\n+\n+ void Init(bool useMutex) { m_UseMutex = useMutex; }\n+ bool Validate();\n+\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats);\n+ void AddStatistics(VmaStatistics& inoutStats);\n+#if VMA_STATS_STRING_ENABLED\n+ \/\/ Writes JSON array with the list of allocations.\n+ void BuildStatsString(VmaJsonWriter& json);\n+#endif\n+\n+ bool IsEmpty();\n+ void Register(VmaAllocation alloc);\n+ void Unregister(VmaAllocation alloc);\n+\n+private:\n+ typedef VmaIntrusiveLinkedList<VmaDedicatedAllocationListItemTraits> DedicatedAllocationLinkedList;\n+\n+ bool m_UseMutex = true;\n+ VMA_RW_MUTEX m_Mutex;\n+ DedicatedAllocationLinkedList m_AllocationList;\n+};\n+\n+#ifndef _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS\n+\n+VmaDedicatedAllocationList::~VmaDedicatedAllocationList()\n+{\n+ VMA_HEAVY_ASSERT(Validate());\n+\n+ if (!m_AllocationList.IsEmpty())\n+ {\n+ VMA_ASSERT(false && \"Unfreed dedicated allocations found!\");\n+ }\n+}\n+\n+bool VmaDedicatedAllocationList::Validate()\n+{\n+ const size_t declaredCount = m_AllocationList.GetCount();\n+ size_t actualCount = 0;\n+ VmaMutexLockRead lock(m_Mutex, m_UseMutex);\n+ for (VmaAllocation alloc = m_AllocationList.Front();\n+ alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc))\n+ {\n+ ++actualCount;\n+ }\n+ VMA_VALIDATE(actualCount == declaredCount);\n+\n+ return true;\n+}\n+\n+void VmaDedicatedAllocationList::AddDetailedStatistics(VmaDetailedStatistics& inoutStats)\n+{\n+ for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item))\n+ {\n+ const VkDeviceSize size = item->GetSize();\n+ inoutStats.statistics.blockCount++;\n+ inoutStats.statistics.blockBytes += size;\n+ VmaAddDetailedStatisticsAllocation(inoutStats, item->GetSize());\n+ }\n+}\n+\n+void VmaDedicatedAllocationList::AddStatistics(VmaStatistics& inoutStats)\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_UseMutex);\n+\n+ const uint32_t allocCount = (uint32_t)m_AllocationList.GetCount();\n+ inoutStats.blockCount += allocCount;\n+ inoutStats.allocationCount += allocCount;\n+\n+ for(auto* item = m_AllocationList.Front(); item != nullptr; item = DedicatedAllocationLinkedList::GetNext(item))\n+ {\n+ const VkDeviceSize size = item->GetSize();\n+ inoutStats.blockBytes += size;\n+ inoutStats.allocationBytes += size;\n+ }\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaDedicatedAllocationList::BuildStatsString(VmaJsonWriter& json)\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_UseMutex);\n+ json.BeginArray();\n+ for (VmaAllocation alloc = m_AllocationList.Front();\n+ alloc != VMA_NULL; alloc = m_AllocationList.GetNext(alloc))\n+ {\n+ json.BeginObject(true);\n+ alloc->PrintParameters(json);\n+ json.EndObject();\n+ }\n+ json.EndArray();\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+bool VmaDedicatedAllocationList::IsEmpty()\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_UseMutex);\n+ return m_AllocationList.IsEmpty();\n+}\n+\n+void VmaDedicatedAllocationList::Register(VmaAllocation alloc)\n+{\n+ VmaMutexLockWrite lock(m_Mutex, m_UseMutex);\n+ m_AllocationList.PushBack(alloc);\n+}\n+\n+void VmaDedicatedAllocationList::Unregister(VmaAllocation alloc)\n+{\n+ VmaMutexLockWrite lock(m_Mutex, m_UseMutex);\n+ m_AllocationList.Remove(alloc);\n+}\n+#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST_FUNCTIONS\n+#endif \/\/ _VMA_DEDICATED_ALLOCATION_LIST\n+\n+#ifndef _VMA_SUBALLOCATION\n+\/*\n+Represents a region of VmaDeviceMemoryBlock that is either assigned and returned as\n+allocated memory block or free.\n+*\/\n+struct VmaSuballocation\n+{\n+ VkDeviceSize offset;\n+ VkDeviceSize size;\n+ void* userData;\n+ VmaSuballocationType type;\n+};\n+\n+\/\/ Comparator for offsets.\n+struct VmaSuballocationOffsetLess\n+{\n+ bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const\n+ {\n+ return lhs.offset < rhs.offset;\n+ }\n+};\n+\n+struct VmaSuballocationOffsetGreater\n+{\n+ bool operator()(const VmaSuballocation& lhs, const VmaSuballocation& rhs) const\n+ {\n+ return lhs.offset > rhs.offset;\n+ }\n+};\n+\n+struct VmaSuballocationItemSizeLess\n+{\n+ bool operator()(const VmaSuballocationList::iterator lhs,\n+ const VmaSuballocationList::iterator rhs) const\n+ {\n+ return lhs->size < rhs->size;\n+ }\n+\n+ bool operator()(const VmaSuballocationList::iterator lhs,\n+ VkDeviceSize rhsSize) const\n+ {\n+ return lhs->size < rhsSize;\n+ }\n+};\n+#endif \/\/ _VMA_SUBALLOCATION\n+\n+#ifndef _VMA_ALLOCATION_REQUEST\n+\/*\n+Parameters of planned allocation inside a VmaDeviceMemoryBlock.\n+item points to a FREE suballocation.\n+*\/\n+struct VmaAllocationRequest\n+{\n+ VmaAllocHandle allocHandle;\n+ VkDeviceSize size;\n+ VmaSuballocationList::iterator item;\n+ void* customData;\n+ uint64_t algorithmData;\n+ VmaAllocationRequestType type;\n+};\n+#endif \/\/ _VMA_ALLOCATION_REQUEST\n+\n+#ifndef _VMA_BLOCK_METADATA\n+\/*\n+Data structure used for bookkeeping of allocations and unused ranges of memory\n+in a single VkDeviceMemory block.\n+*\/\n+class VmaBlockMetadata\n+{\n+public:\n+ \/\/ pAllocationCallbacks, if not null, must be owned externally - alive and unchanged for the whole lifetime of this object.\n+ VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual);\n+ virtual ~VmaBlockMetadata() = default;\n+\n+ virtual void Init(VkDeviceSize size) { m_Size = size; }\n+ bool IsVirtual() const { return m_IsVirtual; }\n+ VkDeviceSize GetSize() const { return m_Size; }\n+\n+ \/\/ Validates all data structures inside this object. If not valid, returns false.\n+ virtual bool Validate() const = 0;\n+ virtual size_t GetAllocationCount() const = 0;\n+ virtual size_t GetFreeRegionsCount() const = 0;\n+ virtual VkDeviceSize GetSumFreeSize() const = 0;\n+ \/\/ Returns true if this block is empty - contains only single free suballocation.\n+ virtual bool IsEmpty() const = 0;\n+ virtual void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) = 0;\n+ virtual VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const = 0;\n+ virtual void* GetAllocationUserData(VmaAllocHandle allocHandle) const = 0;\n+\n+ virtual VmaAllocHandle GetAllocationListBegin() const = 0;\n+ virtual VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const = 0;\n+ virtual VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const = 0;\n+\n+ \/\/ Shouldn't modify blockCount.\n+ virtual void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const = 0;\n+ virtual void AddStatistics(VmaStatistics& inoutStats) const = 0;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ \/\/ mapRefCount == UINT32_MAX means unspecified.\n+ virtual void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const = 0;\n+#endif\n+\n+ \/\/ Tries to find a place for suballocation with given parameters inside this block.\n+ \/\/ If succeeded, fills pAllocationRequest and returns true.\n+ \/\/ If failed, returns false.\n+ virtual bool CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ \/\/ Always one of VMA_ALLOCATION_CREATE_STRATEGY_* or VMA_ALLOCATION_INTERNAL_STRATEGY_* flags.\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest) = 0;\n+\n+ virtual VkResult CheckCorruption(const void* pBlockData) = 0;\n+\n+ \/\/ Makes actual allocation based on request. Request must already be checked and valid.\n+ virtual void Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData) = 0;\n+\n+ \/\/ Frees suballocation assigned to given memory region.\n+ virtual void Free(VmaAllocHandle allocHandle) = 0;\n+\n+ \/\/ Frees all allocations.\n+ \/\/ Careful! Don't call it if there are VmaAllocation objects owned by userData of cleared allocations!\n+ virtual void Clear() = 0;\n+\n+ virtual void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) = 0;\n+ virtual void DebugLogAllAllocations() const = 0;\n+\n+protected:\n+ const VkAllocationCallbacks* GetAllocationCallbacks() const { return m_pAllocationCallbacks; }\n+ VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }\n+ VkDeviceSize GetDebugMargin() const { return IsVirtual() ? 0 : VMA_DEBUG_MARGIN; }\n+\n+ void DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const;\n+#if VMA_STATS_STRING_ENABLED\n+ \/\/ mapRefCount == UINT32_MAX means unspecified.\n+ void PrintDetailedMap_Begin(class VmaJsonWriter& json,\n+ VkDeviceSize unusedBytes,\n+ size_t allocationCount,\n+ size_t unusedRangeCount,\n+ uint32_t mapRefCount) const;\n+ void PrintDetailedMap_Allocation(class VmaJsonWriter& json,\n+ VkDeviceSize offset, VkDeviceSize size, void* userData) const;\n+ void PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,\n+ VkDeviceSize offset,\n+ VkDeviceSize size) const;\n+ void PrintDetailedMap_End(class VmaJsonWriter& json) const;\n+#endif\n+\n+private:\n+ VkDeviceSize m_Size;\n+ const VkAllocationCallbacks* m_pAllocationCallbacks;\n+ const VkDeviceSize m_BufferImageGranularity;\n+ const bool m_IsVirtual;\n+};\n+\n+#ifndef _VMA_BLOCK_METADATA_FUNCTIONS\n+VmaBlockMetadata::VmaBlockMetadata(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual)\n+ : m_Size(0),\n+ m_pAllocationCallbacks(pAllocationCallbacks),\n+ m_BufferImageGranularity(bufferImageGranularity),\n+ m_IsVirtual(isVirtual) {}\n+\n+void VmaBlockMetadata::DebugLogAllocation(VkDeviceSize offset, VkDeviceSize size, void* userData) const\n+{\n+ if (IsVirtual())\n+ {\n+ VMA_DEBUG_LOG(\"UNFREED VIRTUAL ALLOCATION; Offset: %llu; Size: %llu; UserData: %p\", offset, size, userData);\n+ }\n+ else\n+ {\n+ VMA_ASSERT(userData != VMA_NULL);\n+ VmaAllocation allocation = reinterpret_cast<VmaAllocation>(userData);\n+\n+ userData = allocation->GetUserData();\n+ const char* name = allocation->GetName();\n+\n+#if VMA_STATS_STRING_ENABLED\n+ VMA_DEBUG_LOG(\"UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %s; Usage: %u\",\n+ offset, size, userData, name ? name : \"vma_empty\",\n+ VMA_SUBALLOCATION_TYPE_NAMES[allocation->GetSuballocationType()],\n+ allocation->GetBufferImageUsage());\n+#else\n+ VMA_DEBUG_LOG(\"UNFREED ALLOCATION; Offset: %llu; Size: %llu; UserData: %p; Name: %s; Type: %u\",\n+ offset, size, userData, name ? name : \"vma_empty\",\n+ (uint32_t)allocation->GetSuballocationType());\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+ }\n+ \n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata::PrintDetailedMap_Begin(class VmaJsonWriter& json,\n+ VkDeviceSize unusedBytes, size_t allocationCount, size_t unusedRangeCount, uint32_t mapRefCount) const\n+{\n+ json.BeginObject();\n+\n+ json.WriteString(\"TotalBytes\");\n+ json.WriteNumber(GetSize());\n+\n+ json.WriteString(\"UnusedBytes\");\n+ json.WriteNumber(unusedBytes);\n+\n+ json.WriteString(\"Allocations\");\n+ json.WriteNumber((uint64_t)allocationCount);\n+\n+ json.WriteString(\"UnusedRanges\");\n+ json.WriteNumber((uint64_t)unusedRangeCount);\n+\n+ if(mapRefCount != UINT32_MAX)\n+ {\n+ json.WriteString(\"MapRefCount\");\n+ json.WriteNumber(mapRefCount);\n+ }\n+\n+ json.WriteString(\"Suballocations\");\n+ json.BeginArray();\n+}\n+\n+void VmaBlockMetadata::PrintDetailedMap_Allocation(class VmaJsonWriter& json,\n+ VkDeviceSize offset, VkDeviceSize size, void* userData) const\n+{\n+ json.BeginObject(true);\n+\n+ json.WriteString(\"Offset\");\n+ json.WriteNumber(offset);\n+\n+ if (IsVirtual())\n+ {\n+ json.WriteString(\"Type\");\n+ json.WriteString(\"VirtualAllocation\");\n+\n+ json.WriteString(\"Size\");\n+ json.WriteNumber(size);\n+\n+ if (userData != VMA_NULL)\n+ {\n+ json.WriteString(\"UserData\");\n+ json.BeginString();\n+ json.ContinueString_Pointer(userData);\n+ json.EndString();\n+ }\n+ }\n+ else\n+ {\n+ ((VmaAllocation)userData)->PrintParameters(json);\n+ }\n+\n+ json.EndObject();\n+}\n+\n+void VmaBlockMetadata::PrintDetailedMap_UnusedRange(class VmaJsonWriter& json,\n+ VkDeviceSize offset, VkDeviceSize size) const\n+{\n+ json.BeginObject(true);\n+\n+ json.WriteString(\"Offset\");\n+ json.WriteNumber(offset);\n+\n+ json.WriteString(\"Type\");\n+ json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[VMA_SUBALLOCATION_TYPE_FREE]);\n+\n+ json.WriteString(\"Size\");\n+ json.WriteNumber(size);\n+\n+ json.EndObject();\n+}\n+\n+void VmaBlockMetadata::PrintDetailedMap_End(class VmaJsonWriter& json) const\n+{\n+ json.EndArray();\n+ json.EndObject();\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+#endif \/\/ _VMA_BLOCK_METADATA_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_METADATA\n+\n+#ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY\n+\/\/ Before deleting object of this class remember to call 'Destroy()'\n+class VmaBlockBufferImageGranularity final\n+{\n+public:\n+ struct ValidationContext\n+ {\n+ const VkAllocationCallbacks* allocCallbacks;\n+ uint16_t* pageAllocs;\n+ };\n+\n+ VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity);\n+ ~VmaBlockBufferImageGranularity();\n+\n+ bool IsEnabled() const { return m_BufferImageGranularity > MAX_LOW_BUFFER_IMAGE_GRANULARITY; }\n+\n+ void Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size);\n+ \/\/ Before destroying object you must call free it's memory\n+ void Destroy(const VkAllocationCallbacks* pAllocationCallbacks);\n+\n+ void RoundupAllocRequest(VmaSuballocationType allocType,\n+ VkDeviceSize& inOutAllocSize,\n+ VkDeviceSize& inOutAllocAlignment) const;\n+\n+ bool CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset,\n+ VkDeviceSize allocSize,\n+ VkDeviceSize blockOffset,\n+ VkDeviceSize blockSize,\n+ VmaSuballocationType allocType) const;\n+\n+ void AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size);\n+ void FreePages(VkDeviceSize offset, VkDeviceSize size);\n+ void Clear();\n+\n+ ValidationContext StartValidation(const VkAllocationCallbacks* pAllocationCallbacks,\n+ bool isVirutal) const;\n+ bool Validate(ValidationContext& ctx, VkDeviceSize offset, VkDeviceSize size) const;\n+ bool FinishValidation(ValidationContext& ctx) const;\n+\n+private:\n+ static const uint16_t MAX_LOW_BUFFER_IMAGE_GRANULARITY = 256;\n+\n+ struct RegionInfo\n+ {\n+ uint8_t allocType;\n+ uint16_t allocCount;\n+ };\n+\n+ VkDeviceSize m_BufferImageGranularity;\n+ uint32_t m_RegionCount;\n+ RegionInfo* m_RegionInfo;\n+\n+ uint32_t GetStartPage(VkDeviceSize offset) const { return OffsetToPageIndex(offset & ~(m_BufferImageGranularity - 1)); }\n+ uint32_t GetEndPage(VkDeviceSize offset, VkDeviceSize size) const { return OffsetToPageIndex((offset + size - 1) & ~(m_BufferImageGranularity - 1)); }\n+\n+ uint32_t OffsetToPageIndex(VkDeviceSize offset) const;\n+ void AllocPage(RegionInfo& page, uint8_t allocType);\n+};\n+\n+#ifndef _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS\n+VmaBlockBufferImageGranularity::VmaBlockBufferImageGranularity(VkDeviceSize bufferImageGranularity)\n+ : m_BufferImageGranularity(bufferImageGranularity),\n+ m_RegionCount(0),\n+ m_RegionInfo(VMA_NULL) {}\n+\n+VmaBlockBufferImageGranularity::~VmaBlockBufferImageGranularity()\n+{\n+ VMA_ASSERT(m_RegionInfo == VMA_NULL && \"Free not called before destroying object!\");\n+}\n+\n+void VmaBlockBufferImageGranularity::Init(const VkAllocationCallbacks* pAllocationCallbacks, VkDeviceSize size)\n+{\n+ if (IsEnabled())\n+ {\n+ m_RegionCount = static_cast<uint32_t>(VmaDivideRoundingUp(size, m_BufferImageGranularity));\n+ m_RegionInfo = vma_new_array(pAllocationCallbacks, RegionInfo, m_RegionCount);\n+ memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo));\n+ }\n+}\n+\n+void VmaBlockBufferImageGranularity::Destroy(const VkAllocationCallbacks* pAllocationCallbacks)\n+{\n+ if (m_RegionInfo)\n+ {\n+ vma_delete_array(pAllocationCallbacks, m_RegionInfo, m_RegionCount);\n+ m_RegionInfo = VMA_NULL;\n+ }\n+}\n+\n+void VmaBlockBufferImageGranularity::RoundupAllocRequest(VmaSuballocationType allocType,\n+ VkDeviceSize& inOutAllocSize,\n+ VkDeviceSize& inOutAllocAlignment) const\n+{\n+ if (m_BufferImageGranularity > 1 &&\n+ m_BufferImageGranularity <= MAX_LOW_BUFFER_IMAGE_GRANULARITY)\n+ {\n+ if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||\n+ allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\n+ allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)\n+ {\n+ inOutAllocAlignment = VMA_MAX(inOutAllocAlignment, m_BufferImageGranularity);\n+ inOutAllocSize = VmaAlignUp(inOutAllocSize, m_BufferImageGranularity);\n+ }\n+ }\n+}\n+\n+bool VmaBlockBufferImageGranularity::CheckConflictAndAlignUp(VkDeviceSize& inOutAllocOffset,\n+ VkDeviceSize allocSize,\n+ VkDeviceSize blockOffset,\n+ VkDeviceSize blockSize,\n+ VmaSuballocationType allocType) const\n+{\n+ if (IsEnabled())\n+ {\n+ uint32_t startPage = GetStartPage(inOutAllocOffset);\n+ if (m_RegionInfo[startPage].allocCount > 0 &&\n+ VmaIsBufferImageGranularityConflict(static_cast<VmaSuballocationType>(m_RegionInfo[startPage].allocType), allocType))\n+ {\n+ inOutAllocOffset = VmaAlignUp(inOutAllocOffset, m_BufferImageGranularity);\n+ if (blockSize < allocSize + inOutAllocOffset - blockOffset)\n+ return true;\n+ ++startPage;\n+ }\n+ uint32_t endPage = GetEndPage(inOutAllocOffset, allocSize);\n+ if (endPage != startPage &&\n+ m_RegionInfo[endPage].allocCount > 0 &&\n+ VmaIsBufferImageGranularityConflict(static_cast<VmaSuballocationType>(m_RegionInfo[endPage].allocType), allocType))\n+ {\n+ return true;\n+ }\n+ }\n+ return false;\n+}\n+\n+void VmaBlockBufferImageGranularity::AllocPages(uint8_t allocType, VkDeviceSize offset, VkDeviceSize size)\n+{\n+ if (IsEnabled())\n+ {\n+ uint32_t startPage = GetStartPage(offset);\n+ AllocPage(m_RegionInfo[startPage], allocType);\n+\n+ uint32_t endPage = GetEndPage(offset, size);\n+ if (startPage != endPage)\n+ AllocPage(m_RegionInfo[endPage], allocType);\n+ }\n+}\n+\n+void VmaBlockBufferImageGranularity::FreePages(VkDeviceSize offset, VkDeviceSize size)\n+{\n+ if (IsEnabled())\n+ {\n+ uint32_t startPage = GetStartPage(offset);\n+ --m_RegionInfo[startPage].allocCount;\n+ if (m_RegionInfo[startPage].allocCount == 0)\n+ m_RegionInfo[startPage].allocType = VMA_SUBALLOCATION_TYPE_FREE;\n+ uint32_t endPage = GetEndPage(offset, size);\n+ if (startPage != endPage)\n+ {\n+ --m_RegionInfo[endPage].allocCount;\n+ if (m_RegionInfo[endPage].allocCount == 0)\n+ m_RegionInfo[endPage].allocType = VMA_SUBALLOCATION_TYPE_FREE;\n+ }\n+ }\n+}\n+\n+void VmaBlockBufferImageGranularity::Clear()\n+{\n+ if (m_RegionInfo)\n+ memset(m_RegionInfo, 0, m_RegionCount * sizeof(RegionInfo));\n+}\n+\n+VmaBlockBufferImageGranularity::ValidationContext VmaBlockBufferImageGranularity::StartValidation(\n+ const VkAllocationCallbacks* pAllocationCallbacks, bool isVirutal) const\n+{\n+ ValidationContext ctx{ pAllocationCallbacks, VMA_NULL };\n+ if (!isVirutal && IsEnabled())\n+ {\n+ ctx.pageAllocs = vma_new_array(pAllocationCallbacks, uint16_t, m_RegionCount);\n+ memset(ctx.pageAllocs, 0, m_RegionCount * sizeof(uint16_t));\n+ }\n+ return ctx;\n+}\n+\n+bool VmaBlockBufferImageGranularity::Validate(ValidationContext& ctx,\n+ VkDeviceSize offset, VkDeviceSize size) const\n+{\n+ if (IsEnabled())\n+ {\n+ uint32_t start = GetStartPage(offset);\n+ ++ctx.pageAllocs[start];\n+ VMA_VALIDATE(m_RegionInfo[start].allocCount > 0);\n+\n+ uint32_t end = GetEndPage(offset, size);\n+ if (start != end)\n+ {\n+ ++ctx.pageAllocs[end];\n+ VMA_VALIDATE(m_RegionInfo[end].allocCount > 0);\n+ }\n+ }\n+ return true;\n+}\n+\n+bool VmaBlockBufferImageGranularity::FinishValidation(ValidationContext& ctx) const\n+{\n+ \/\/ Check proper page structure\n+ if (IsEnabled())\n+ {\n+ VMA_ASSERT(ctx.pageAllocs != VMA_NULL && \"Validation context not initialized!\");\n+\n+ for (uint32_t page = 0; page < m_RegionCount; ++page)\n+ {\n+ VMA_VALIDATE(ctx.pageAllocs[page] == m_RegionInfo[page].allocCount);\n+ }\n+ vma_delete_array(ctx.allocCallbacks, ctx.pageAllocs, m_RegionCount);\n+ ctx.pageAllocs = VMA_NULL;\n+ }\n+ return true;\n+}\n+\n+uint32_t VmaBlockBufferImageGranularity::OffsetToPageIndex(VkDeviceSize offset) const\n+{\n+ return static_cast<uint32_t>(offset >> VMA_BITSCAN_MSB(m_BufferImageGranularity));\n+}\n+\n+void VmaBlockBufferImageGranularity::AllocPage(RegionInfo& page, uint8_t allocType)\n+{\n+ \/\/ When current alloc type is free then it can be overriden by new type\n+ if (page.allocCount == 0 || (page.allocCount > 0 && page.allocType == VMA_SUBALLOCATION_TYPE_FREE))\n+ page.allocType = allocType;\n+\n+ ++page.allocCount;\n+}\n+#endif \/\/ _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_BUFFER_IMAGE_GRANULARITY\n+\n+#if 0\n+#ifndef _VMA_BLOCK_METADATA_GENERIC\n+class VmaBlockMetadata_Generic : public VmaBlockMetadata\n+{\n+ friend class VmaDefragmentationAlgorithm_Generic;\n+ friend class VmaDefragmentationAlgorithm_Fast;\n+ VMA_CLASS_NO_COPY(VmaBlockMetadata_Generic)\n+public:\n+ VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual);\n+ virtual ~VmaBlockMetadata_Generic() = default;\n+\n+ size_t GetAllocationCount() const override { return m_Suballocations.size() - m_FreeCount; }\n+ VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }\n+ bool IsEmpty() const override { return (m_Suballocations.size() == 1) && (m_FreeCount == 1); }\n+ void Free(VmaAllocHandle allocHandle) override { FreeSuballocation(FindAtOffset((VkDeviceSize)allocHandle - 1)); }\n+ VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\n+\n+ void Init(VkDeviceSize size) override;\n+ bool Validate() const override;\n+\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\n+ void AddStatistics(VmaStatistics& inoutStats) const override;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\n+#endif\n+\n+ bool CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest) override;\n+\n+ VkResult CheckCorruption(const void* pBlockData) override;\n+\n+ void Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData) override;\n+\n+ void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\n+ void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\n+ VmaAllocHandle GetAllocationListBegin() const override;\n+ VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\n+ void Clear() override;\n+ void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\n+ void DebugLogAllAllocations() const override;\n+\n+private:\n+ uint32_t m_FreeCount;\n+ VkDeviceSize m_SumFreeSize;\n+ VmaSuballocationList m_Suballocations;\n+ \/\/ Suballocations that are free. Sorted by size, ascending.\n+ VmaVector<VmaSuballocationList::iterator, VmaStlAllocator<VmaSuballocationList::iterator>> m_FreeSuballocationsBySize;\n+\n+ VkDeviceSize AlignAllocationSize(VkDeviceSize size) const { return IsVirtual() ? size : VmaAlignUp(size, (VkDeviceSize)16); }\n+\n+ VmaSuballocationList::iterator FindAtOffset(VkDeviceSize offset) const;\n+ bool ValidateFreeSuballocationList() const;\n+\n+ \/\/ Checks if requested suballocation with given parameters can be placed in given pFreeSuballocItem.\n+ \/\/ If yes, fills pOffset and returns true. If no, returns false.\n+ bool CheckAllocation(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ VmaSuballocationList::const_iterator suballocItem,\n+ VmaAllocHandle* pAllocHandle) const;\n+\n+ \/\/ Given free suballocation, it merges it with following one, which must also be free.\n+ void MergeFreeWithNext(VmaSuballocationList::iterator item);\n+ \/\/ Releases given suballocation, making it free.\n+ \/\/ Merges it with adjacent free suballocations if applicable.\n+ \/\/ Returns iterator to new free suballocation at this place.\n+ VmaSuballocationList::iterator FreeSuballocation(VmaSuballocationList::iterator suballocItem);\n+ \/\/ Given free suballocation, it inserts it into sorted list of\n+ \/\/ m_FreeSuballocationsBySize if it is suitable.\n+ void RegisterFreeSuballocation(VmaSuballocationList::iterator item);\n+ \/\/ Given free suballocation, it removes it from sorted list of\n+ \/\/ m_FreeSuballocationsBySize if it is suitable.\n+ void UnregisterFreeSuballocation(VmaSuballocationList::iterator item);\n+};\n+\n+#ifndef _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS\n+VmaBlockMetadata_Generic::VmaBlockMetadata_Generic(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual)\n+ : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\n+ m_FreeCount(0),\n+ m_SumFreeSize(0),\n+ m_Suballocations(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\n+ m_FreeSuballocationsBySize(VmaStlAllocator<VmaSuballocationList::iterator>(pAllocationCallbacks)) {}\n+\n+void VmaBlockMetadata_Generic::Init(VkDeviceSize size)\n+{\n+ VmaBlockMetadata::Init(size);\n+\n+ m_FreeCount = 1;\n+ m_SumFreeSize = size;\n+\n+ VmaSuballocation suballoc = {};\n+ suballoc.offset = 0;\n+ suballoc.size = size;\n+ suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+\n+ m_Suballocations.push_back(suballoc);\n+ m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());\n+}\n+\n+bool VmaBlockMetadata_Generic::Validate() const\n+{\n+ VMA_VALIDATE(!m_Suballocations.empty());\n+\n+ \/\/ Expected offset of new suballocation as calculated from previous ones.\n+ VkDeviceSize calculatedOffset = 0;\n+ \/\/ Expected number of free suballocations as calculated from traversing their list.\n+ uint32_t calculatedFreeCount = 0;\n+ \/\/ Expected sum size of free suballocations as calculated from traversing their list.\n+ VkDeviceSize calculatedSumFreeSize = 0;\n+ \/\/ Expected number of free suballocations that should be registered in\n+ \/\/ m_FreeSuballocationsBySize calculated from traversing their list.\n+ size_t freeSuballocationsToRegister = 0;\n+ \/\/ True if previous visited suballocation was free.\n+ bool prevFree = false;\n+\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+\n+ for (const auto& subAlloc : m_Suballocations)\n+ {\n+ \/\/ Actual offset of this suballocation doesn't match expected one.\n+ VMA_VALIDATE(subAlloc.offset == calculatedOffset);\n+\n+ const bool currFree = (subAlloc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+ \/\/ Two adjacent free suballocations are invalid. They should be merged.\n+ VMA_VALIDATE(!prevFree || !currFree);\n+\n+ VmaAllocation alloc = (VmaAllocation)subAlloc.userData;\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\n+ }\n+\n+ if (currFree)\n+ {\n+ calculatedSumFreeSize += subAlloc.size;\n+ ++calculatedFreeCount;\n+ ++freeSuballocationsToRegister;\n+\n+ \/\/ Margin required between allocations - every free space must be at least that large.\n+ VMA_VALIDATE(subAlloc.size >= debugMargin);\n+ }\n+ else\n+ {\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == subAlloc.offset + 1);\n+ VMA_VALIDATE(alloc->GetSize() == subAlloc.size);\n+ }\n+\n+ \/\/ Margin required between allocations - previous allocation must be free.\n+ VMA_VALIDATE(debugMargin == 0 || prevFree);\n+ }\n+\n+ calculatedOffset += subAlloc.size;\n+ prevFree = currFree;\n+ }\n+\n+ \/\/ Number of free suballocations registered in m_FreeSuballocationsBySize doesn't\n+ \/\/ match expected one.\n+ VMA_VALIDATE(m_FreeSuballocationsBySize.size() == freeSuballocationsToRegister);\n+\n+ VkDeviceSize lastSize = 0;\n+ for (size_t i = 0; i < m_FreeSuballocationsBySize.size(); ++i)\n+ {\n+ VmaSuballocationList::iterator suballocItem = m_FreeSuballocationsBySize[i];\n+\n+ \/\/ Only free suballocations can be registered in m_FreeSuballocationsBySize.\n+ VMA_VALIDATE(suballocItem->type == VMA_SUBALLOCATION_TYPE_FREE);\n+ \/\/ They must be sorted by size ascending.\n+ VMA_VALIDATE(suballocItem->size >= lastSize);\n+\n+ lastSize = suballocItem->size;\n+ }\n+\n+ \/\/ Check if totals match calculated values.\n+ VMA_VALIDATE(ValidateFreeSuballocationList());\n+ VMA_VALIDATE(calculatedOffset == GetSize());\n+ VMA_VALIDATE(calculatedSumFreeSize == m_SumFreeSize);\n+ VMA_VALIDATE(calculatedFreeCount == m_FreeCount);\n+\n+ return true;\n+}\n+\n+void VmaBlockMetadata_Generic::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\n+{\n+ const uint32_t rangeCount = (uint32_t)m_Suballocations.size();\n+ inoutStats.statistics.blockCount++;\n+ inoutStats.statistics.blockBytes += GetSize();\n+\n+ for (const auto& suballoc : m_Suballocations)\n+ {\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\n+ else\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, suballoc.size);\n+ }\n+}\n+\n+void VmaBlockMetadata_Generic::AddStatistics(VmaStatistics& inoutStats) const\n+{\n+ inoutStats.blockCount++;\n+ inoutStats.allocationCount += (uint32_t)m_Suballocations.size() - m_FreeCount;\n+ inoutStats.blockBytes += GetSize();\n+ inoutStats.allocationBytes += GetSize() - m_SumFreeSize;\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata_Generic::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\n+{\n+ PrintDetailedMap_Begin(json,\n+ m_SumFreeSize, \/\/ unusedBytes\n+ m_Suballocations.size() - (size_t)m_FreeCount, \/\/ allocationCount\n+ m_FreeCount, \/\/ unusedRangeCount\n+ mapRefCount);\n+\n+ for (const auto& suballoc : m_Suballocations)\n+ {\n+ if (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ PrintDetailedMap_UnusedRange(json, suballoc.offset, suballoc.size);\n+ }\n+ else\n+ {\n+ PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\n+ }\n+ }\n+\n+ PrintDetailedMap_End(json);\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+bool VmaBlockMetadata_Generic::CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ VMA_ASSERT(allocSize > 0);\n+ VMA_ASSERT(!upperAddress);\n+ VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_ASSERT(pAllocationRequest != VMA_NULL);\n+ VMA_HEAVY_ASSERT(Validate());\n+\n+ allocSize = AlignAllocationSize(allocSize);\n+\n+ pAllocationRequest->type = VmaAllocationRequestType::Normal;\n+ pAllocationRequest->size = allocSize;\n+\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+\n+ \/\/ There is not enough total free space in this block to fulfill the request: Early return.\n+ if (m_SumFreeSize < allocSize + debugMargin)\n+ {\n+ return false;\n+ }\n+\n+ \/\/ New algorithm, efficiently searching freeSuballocationsBySize.\n+ const size_t freeSuballocCount = m_FreeSuballocationsBySize.size();\n+ if (freeSuballocCount > 0)\n+ {\n+ if (strategy == 0 ||\n+ strategy == VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT)\n+ {\n+ \/\/ Find first free suballocation with size not less than allocSize + debugMargin.\n+ VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(\n+ m_FreeSuballocationsBySize.data(),\n+ m_FreeSuballocationsBySize.data() + freeSuballocCount,\n+ allocSize + debugMargin,\n+ VmaSuballocationItemSizeLess());\n+ size_t index = it - m_FreeSuballocationsBySize.data();\n+ for (; index < freeSuballocCount; ++index)\n+ {\n+ if (CheckAllocation(\n+ allocSize,\n+ allocAlignment,\n+ allocType,\n+ m_FreeSuballocationsBySize[index],\n+ &pAllocationRequest->allocHandle))\n+ {\n+ pAllocationRequest->item = m_FreeSuballocationsBySize[index];\n+ return true;\n+ }\n+ }\n+ }\n+ else if (strategy == VMA_ALLOCATION_INTERNAL_STRATEGY_MIN_OFFSET)\n+ {\n+ for (VmaSuballocationList::iterator it = m_Suballocations.begin();\n+ it != m_Suballocations.end();\n+ ++it)\n+ {\n+ if (it->type == VMA_SUBALLOCATION_TYPE_FREE && CheckAllocation(\n+ allocSize,\n+ allocAlignment,\n+ allocType,\n+ it,\n+ &pAllocationRequest->allocHandle))\n+ {\n+ pAllocationRequest->item = it;\n+ return true;\n+ }\n+ }\n+ }\n+ else\n+ {\n+ VMA_ASSERT(strategy & (VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT | VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT ));\n+ \/\/ Search staring from biggest suballocations.\n+ for (size_t index = freeSuballocCount; index--; )\n+ {\n+ if (CheckAllocation(\n+ allocSize,\n+ allocAlignment,\n+ allocType,\n+ m_FreeSuballocationsBySize[index],\n+ &pAllocationRequest->allocHandle))\n+ {\n+ pAllocationRequest->item = m_FreeSuballocationsBySize[index];\n+ return true;\n+ }\n+ }\n+ }\n+ }\n+\n+ return false;\n+}\n+\n+VkResult VmaBlockMetadata_Generic::CheckCorruption(const void* pBlockData)\n+{\n+ for (auto& suballoc : m_Suballocations)\n+ {\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\n+ {\n+ VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\n+ return VK_ERROR_UNKNOWN_COPY;\n+ }\n+ }\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+void VmaBlockMetadata_Generic::Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData)\n+{\n+ VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);\n+ VMA_ASSERT(request.item != m_Suballocations.end());\n+ VmaSuballocation& suballoc = *request.item;\n+ \/\/ Given suballocation is a free block.\n+ VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ \/\/ Given offset is inside this suballocation.\n+ VMA_ASSERT((VkDeviceSize)request.allocHandle - 1 >= suballoc.offset);\n+ const VkDeviceSize paddingBegin = (VkDeviceSize)request.allocHandle - suballoc.offset - 1;\n+ VMA_ASSERT(suballoc.size >= paddingBegin + request.size);\n+ const VkDeviceSize paddingEnd = suballoc.size - paddingBegin - request.size;\n+\n+ \/\/ Unregister this free suballocation from m_FreeSuballocationsBySize and update\n+ \/\/ it to become used.\n+ UnregisterFreeSuballocation(request.item);\n+\n+ suballoc.offset = (VkDeviceSize)request.allocHandle - 1;\n+ suballoc.size = request.size;\n+ suballoc.type = type;\n+ suballoc.userData = userData;\n+\n+ \/\/ If there are any free bytes remaining at the end, insert new free suballocation after current one.\n+ if (paddingEnd)\n+ {\n+ VmaSuballocation paddingSuballoc = {};\n+ paddingSuballoc.offset = suballoc.offset + suballoc.size;\n+ paddingSuballoc.size = paddingEnd;\n+ paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+ VmaSuballocationList::iterator next = request.item;\n+ ++next;\n+ const VmaSuballocationList::iterator paddingEndItem =\n+ m_Suballocations.insert(next, paddingSuballoc);\n+ RegisterFreeSuballocation(paddingEndItem);\n+ }\n+\n+ \/\/ If there are any free bytes remaining at the beginning, insert new free suballocation before current one.\n+ if (paddingBegin)\n+ {\n+ VmaSuballocation paddingSuballoc = {};\n+ paddingSuballoc.offset = suballoc.offset - paddingBegin;\n+ paddingSuballoc.size = paddingBegin;\n+ paddingSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+ const VmaSuballocationList::iterator paddingBeginItem =\n+ m_Suballocations.insert(request.item, paddingSuballoc);\n+ RegisterFreeSuballocation(paddingBeginItem);\n+ }\n+\n+ \/\/ Update totals.\n+ m_FreeCount = m_FreeCount - 1;\n+ if (paddingBegin > 0)\n+ {\n+ ++m_FreeCount;\n+ }\n+ if (paddingEnd > 0)\n+ {\n+ ++m_FreeCount;\n+ }\n+ m_SumFreeSize -= request.size;\n+}\n+\n+void VmaBlockMetadata_Generic::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\n+{\n+ outInfo.offset = (VkDeviceSize)allocHandle - 1;\n+ const VmaSuballocation& suballoc = *FindAtOffset(outInfo.offset);\n+ outInfo.size = suballoc.size;\n+ outInfo.pUserData = suballoc.userData;\n+}\n+\n+void* VmaBlockMetadata_Generic::GetAllocationUserData(VmaAllocHandle allocHandle) const\n+{\n+ return FindAtOffset((VkDeviceSize)allocHandle - 1)->userData;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Generic::GetAllocationListBegin() const\n+{\n+ if (IsEmpty())\n+ return VK_NULL_HANDLE;\n+\n+ for (const auto& suballoc : m_Suballocations)\n+ {\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ return (VmaAllocHandle)(suballoc.offset + 1);\n+ }\n+ VMA_ASSERT(false && \"Should contain at least 1 allocation!\");\n+ return VK_NULL_HANDLE;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Generic::GetNextAllocation(VmaAllocHandle prevAlloc) const\n+{\n+ VmaSuballocationList::const_iterator prev = FindAtOffset((VkDeviceSize)prevAlloc - 1);\n+\n+ for (VmaSuballocationList::const_iterator it = ++prev; it != m_Suballocations.end(); ++it)\n+ {\n+ if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\n+ return (VmaAllocHandle)(it->offset + 1);\n+ }\n+ return VK_NULL_HANDLE;\n+}\n+\n+void VmaBlockMetadata_Generic::Clear()\n+{\n+ const VkDeviceSize size = GetSize();\n+\n+ VMA_ASSERT(IsVirtual());\n+ m_FreeCount = 1;\n+ m_SumFreeSize = size;\n+ m_Suballocations.clear();\n+ m_FreeSuballocationsBySize.clear();\n+\n+ VmaSuballocation suballoc = {};\n+ suballoc.offset = 0;\n+ suballoc.size = size;\n+ suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+ m_Suballocations.push_back(suballoc);\n+\n+ m_FreeSuballocationsBySize.push_back(m_Suballocations.begin());\n+}\n+\n+void VmaBlockMetadata_Generic::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\n+{\n+ VmaSuballocation& suballoc = *FindAtOffset((VkDeviceSize)allocHandle - 1);\n+ suballoc.userData = userData;\n+}\n+\n+void VmaBlockMetadata_Generic::DebugLogAllAllocations() const\n+{\n+ for (const auto& suballoc : m_Suballocations)\n+ {\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ DebugLogAllocation(suballoc.offset, suballoc.size, suballoc.userData);\n+ }\n+}\n+\n+VmaSuballocationList::iterator VmaBlockMetadata_Generic::FindAtOffset(VkDeviceSize offset) const\n+{\n+ VMA_HEAVY_ASSERT(!m_Suballocations.empty());\n+ const VkDeviceSize last = m_Suballocations.rbegin()->offset;\n+ if (last == offset)\n+ return m_Suballocations.rbegin().drop_const();\n+ const VkDeviceSize first = m_Suballocations.begin()->offset;\n+ if (first == offset)\n+ return m_Suballocations.begin().drop_const();\n+\n+ const size_t suballocCount = m_Suballocations.size();\n+ const VkDeviceSize step = (last - first + m_Suballocations.begin()->size) \/ suballocCount;\n+ auto findSuballocation = [&](auto begin, auto end) -> VmaSuballocationList::iterator\n+ {\n+ for (auto suballocItem = begin;\n+ suballocItem != end;\n+ ++suballocItem)\n+ {\n+ if (suballocItem->offset == offset)\n+ return suballocItem.drop_const();\n+ }\n+ VMA_ASSERT(false && \"Not found!\");\n+ return m_Suballocations.end().drop_const();\n+ };\n+ \/\/ If requested offset is closer to the end of range, search from the end\n+ if (offset - first > suballocCount * step \/ 2)\n+ {\n+ return findSuballocation(m_Suballocations.rbegin(), m_Suballocations.rend());\n+ }\n+ return findSuballocation(m_Suballocations.begin(), m_Suballocations.end());\n+}\n+\n+bool VmaBlockMetadata_Generic::ValidateFreeSuballocationList() const\n+{\n+ VkDeviceSize lastSize = 0;\n+ for (size_t i = 0, count = m_FreeSuballocationsBySize.size(); i < count; ++i)\n+ {\n+ const VmaSuballocationList::iterator it = m_FreeSuballocationsBySize[i];\n+\n+ VMA_VALIDATE(it->type == VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_VALIDATE(it->size >= lastSize);\n+ lastSize = it->size;\n+ }\n+ return true;\n+}\n+\n+bool VmaBlockMetadata_Generic::CheckAllocation(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ VmaSuballocationList::const_iterator suballocItem,\n+ VmaAllocHandle* pAllocHandle) const\n+{\n+ VMA_ASSERT(allocSize > 0);\n+ VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_ASSERT(suballocItem != m_Suballocations.cend());\n+ VMA_ASSERT(pAllocHandle != VMA_NULL);\n+\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+ const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\n+\n+ const VmaSuballocation& suballoc = *suballocItem;\n+ VMA_ASSERT(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ \/\/ Size of this suballocation is too small for this request: Early return.\n+ if (suballoc.size < allocSize)\n+ {\n+ return false;\n+ }\n+\n+ \/\/ Start from offset equal to beginning of this suballocation.\n+ VkDeviceSize offset = suballoc.offset + (suballocItem == m_Suballocations.cbegin() ? 0 : GetDebugMargin());\n+\n+ \/\/ Apply debugMargin from the end of previous alloc.\n+ if (debugMargin > 0)\n+ {\n+ offset += debugMargin;\n+ }\n+\n+ \/\/ Apply alignment.\n+ offset = VmaAlignUp(offset, allocAlignment);\n+\n+ \/\/ Check previous suballocations for BufferImageGranularity conflicts.\n+ \/\/ Make bigger alignment if necessary.\n+ if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment)\n+ {\n+ bool bufferImageGranularityConflict = false;\n+ VmaSuballocationList::const_iterator prevSuballocItem = suballocItem;\n+ while (prevSuballocItem != m_Suballocations.cbegin())\n+ {\n+ --prevSuballocItem;\n+ const VmaSuballocation& prevSuballoc = *prevSuballocItem;\n+ if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, offset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\n+ {\n+ bufferImageGranularityConflict = true;\n+ break;\n+ }\n+ }\n+ else\n+ \/\/ Already on previous page.\n+ break;\n+ }\n+ if (bufferImageGranularityConflict)\n+ {\n+ offset = VmaAlignUp(offset, bufferImageGranularity);\n+ }\n+ }\n+\n+ \/\/ Calculate padding at the beginning based on current offset.\n+ const VkDeviceSize paddingBegin = offset - suballoc.offset;\n+\n+ \/\/ Fail if requested size plus margin after is bigger than size of this suballocation.\n+ if (paddingBegin + allocSize + debugMargin > suballoc.size)\n+ {\n+ return false;\n+ }\n+\n+ \/\/ Check next suballocations for BufferImageGranularity conflicts.\n+ \/\/ If conflict exists, allocation cannot be made here.\n+ if (allocSize % bufferImageGranularity || offset % bufferImageGranularity)\n+ {\n+ VmaSuballocationList::const_iterator nextSuballocItem = suballocItem;\n+ ++nextSuballocItem;\n+ while (nextSuballocItem != m_Suballocations.cend())\n+ {\n+ const VmaSuballocation& nextSuballoc = *nextSuballocItem;\n+ if (VmaBlocksOnSamePage(offset, allocSize, nextSuballoc.offset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\n+ {\n+ return false;\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Already on next page.\n+ break;\n+ }\n+ ++nextSuballocItem;\n+ }\n+ }\n+\n+ *pAllocHandle = (VmaAllocHandle)(offset + 1);\n+ \/\/ All tests passed: Success. pAllocHandle is already filled.\n+ return true;\n+}\n+\n+void VmaBlockMetadata_Generic::MergeFreeWithNext(VmaSuballocationList::iterator item)\n+{\n+ VMA_ASSERT(item != m_Suballocations.end());\n+ VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ VmaSuballocationList::iterator nextItem = item;\n+ ++nextItem;\n+ VMA_ASSERT(nextItem != m_Suballocations.end());\n+ VMA_ASSERT(nextItem->type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ item->size += nextItem->size;\n+ --m_FreeCount;\n+ m_Suballocations.erase(nextItem);\n+}\n+\n+VmaSuballocationList::iterator VmaBlockMetadata_Generic::FreeSuballocation(VmaSuballocationList::iterator suballocItem)\n+{\n+ \/\/ Change this suballocation to be marked as free.\n+ VmaSuballocation& suballoc = *suballocItem;\n+ suballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+ suballoc.userData = VMA_NULL;\n+\n+ \/\/ Update totals.\n+ ++m_FreeCount;\n+ m_SumFreeSize += suballoc.size;\n+\n+ \/\/ Merge with previous and\/or next suballocation if it's also free.\n+ bool mergeWithNext = false;\n+ bool mergeWithPrev = false;\n+\n+ VmaSuballocationList::iterator nextItem = suballocItem;\n+ ++nextItem;\n+ if ((nextItem != m_Suballocations.end()) && (nextItem->type == VMA_SUBALLOCATION_TYPE_FREE))\n+ {\n+ mergeWithNext = true;\n+ }\n+\n+ VmaSuballocationList::iterator prevItem = suballocItem;\n+ if (suballocItem != m_Suballocations.begin())\n+ {\n+ --prevItem;\n+ if (prevItem->type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ mergeWithPrev = true;\n+ }\n+ }\n+\n+ if (mergeWithNext)\n+ {\n+ UnregisterFreeSuballocation(nextItem);\n+ MergeFreeWithNext(suballocItem);\n+ }\n+\n+ if (mergeWithPrev)\n+ {\n+ UnregisterFreeSuballocation(prevItem);\n+ MergeFreeWithNext(prevItem);\n+ RegisterFreeSuballocation(prevItem);\n+ return prevItem;\n+ }\n+ else\n+ {\n+ RegisterFreeSuballocation(suballocItem);\n+ return suballocItem;\n+ }\n+}\n+\n+void VmaBlockMetadata_Generic::RegisterFreeSuballocation(VmaSuballocationList::iterator item)\n+{\n+ VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_ASSERT(item->size > 0);\n+\n+ \/\/ You may want to enable this validation at the beginning or at the end of\n+ \/\/ this function, depending on what do you want to check.\n+ VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\n+\n+ if (m_FreeSuballocationsBySize.empty())\n+ {\n+ m_FreeSuballocationsBySize.push_back(item);\n+ }\n+ else\n+ {\n+ VmaVectorInsertSorted<VmaSuballocationItemSizeLess>(m_FreeSuballocationsBySize, item);\n+ }\n+\n+ \/\/VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\n+}\n+\n+void VmaBlockMetadata_Generic::UnregisterFreeSuballocation(VmaSuballocationList::iterator item)\n+{\n+ VMA_ASSERT(item->type == VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_ASSERT(item->size > 0);\n+\n+ \/\/ You may want to enable this validation at the beginning or at the end of\n+ \/\/ this function, depending on what do you want to check.\n+ VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\n+\n+ VmaSuballocationList::iterator* const it = VmaBinaryFindFirstNotLess(\n+ m_FreeSuballocationsBySize.data(),\n+ m_FreeSuballocationsBySize.data() + m_FreeSuballocationsBySize.size(),\n+ item,\n+ VmaSuballocationItemSizeLess());\n+ for (size_t index = it - m_FreeSuballocationsBySize.data();\n+ index < m_FreeSuballocationsBySize.size();\n+ ++index)\n+ {\n+ if (m_FreeSuballocationsBySize[index] == item)\n+ {\n+ VmaVectorRemove(m_FreeSuballocationsBySize, index);\n+ return;\n+ }\n+ VMA_ASSERT((m_FreeSuballocationsBySize[index]->size == item->size) && \"Not found.\");\n+ }\n+ VMA_ASSERT(0 && \"Not found.\");\n+\n+ \/\/VMA_HEAVY_ASSERT(ValidateFreeSuballocationList());\n+}\n+#endif \/\/ _VMA_BLOCK_METADATA_GENERIC_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_METADATA_GENERIC\n+#endif \/\/ #if 0\n+\n+#ifndef _VMA_BLOCK_METADATA_LINEAR\n+\/*\n+Allocations and their references in internal data structure look like this:\n+\n+if(m_2ndVectorMode == SECOND_VECTOR_EMPTY):\n+\n+ 0 +-------+\n+ | |\n+ | |\n+ | |\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount]\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount + 1]\n+ +-------+\n+ | ... |\n+ +-------+\n+ | Alloc | 1st[1st.size() - 1]\n+ +-------+\n+ | |\n+ | |\n+ | |\n+GetSize() +-------+\n+\n+if(m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER):\n+\n+ 0 +-------+\n+ | Alloc | 2nd[0]\n+ +-------+\n+ | Alloc | 2nd[1]\n+ +-------+\n+ | ... |\n+ +-------+\n+ | Alloc | 2nd[2nd.size() - 1]\n+ +-------+\n+ | |\n+ | |\n+ | |\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount]\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount + 1]\n+ +-------+\n+ | ... |\n+ +-------+\n+ | Alloc | 1st[1st.size() - 1]\n+ +-------+\n+ | |\n+GetSize() +-------+\n+\n+if(m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK):\n+\n+ 0 +-------+\n+ | |\n+ | |\n+ | |\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount]\n+ +-------+\n+ | Alloc | 1st[m_1stNullItemsBeginCount + 1]\n+ +-------+\n+ | ... |\n+ +-------+\n+ | Alloc | 1st[1st.size() - 1]\n+ +-------+\n+ | |\n+ | |\n+ | |\n+ +-------+\n+ | Alloc | 2nd[2nd.size() - 1]\n+ +-------+\n+ | ... |\n+ +-------+\n+ | Alloc | 2nd[1]\n+ +-------+\n+ | Alloc | 2nd[0]\n+GetSize() +-------+\n+\n+*\/\n+class VmaBlockMetadata_Linear : public VmaBlockMetadata\n+{\n+ VMA_CLASS_NO_COPY(VmaBlockMetadata_Linear)\n+public:\n+ VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual);\n+ virtual ~VmaBlockMetadata_Linear() = default;\n+\n+ VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }\n+ bool IsEmpty() const override { return GetAllocationCount() == 0; }\n+ VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\n+\n+ void Init(VkDeviceSize size) override;\n+ bool Validate() const override;\n+ size_t GetAllocationCount() const override;\n+ size_t GetFreeRegionsCount() const override;\n+\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\n+ void AddStatistics(VmaStatistics& inoutStats) const override;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\n+#endif\n+\n+ bool CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest) override;\n+\n+ VkResult CheckCorruption(const void* pBlockData) override;\n+\n+ void Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData) override;\n+\n+ void Free(VmaAllocHandle allocHandle) override;\n+ void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\n+ void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\n+ VmaAllocHandle GetAllocationListBegin() const override;\n+ VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\n+ VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override;\n+ void Clear() override;\n+ void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\n+ void DebugLogAllAllocations() const override;\n+\n+private:\n+ \/*\n+ There are two suballocation vectors, used in ping-pong way.\n+ The one with index m_1stVectorIndex is called 1st.\n+ The one with index (m_1stVectorIndex ^ 1) is called 2nd.\n+ 2nd can be non-empty only when 1st is not empty.\n+ When 2nd is not empty, m_2ndVectorMode indicates its mode of operation.\n+ *\/\n+ typedef VmaVector<VmaSuballocation, VmaStlAllocator<VmaSuballocation>> SuballocationVectorType;\n+\n+ enum SECOND_VECTOR_MODE\n+ {\n+ SECOND_VECTOR_EMPTY,\n+ \/*\n+ Suballocations in 2nd vector are created later than the ones in 1st, but they\n+ all have smaller offset.\n+ *\/\n+ SECOND_VECTOR_RING_BUFFER,\n+ \/*\n+ Suballocations in 2nd vector are upper side of double stack.\n+ They all have offsets higher than those in 1st vector.\n+ Top of this stack means smaller offsets, but higher indices in this vector.\n+ *\/\n+ SECOND_VECTOR_DOUBLE_STACK,\n+ };\n+\n+ VkDeviceSize m_SumFreeSize;\n+ SuballocationVectorType m_Suballocations0, m_Suballocations1;\n+ uint32_t m_1stVectorIndex;\n+ SECOND_VECTOR_MODE m_2ndVectorMode;\n+ \/\/ Number of items in 1st vector with hAllocation = null at the beginning.\n+ size_t m_1stNullItemsBeginCount;\n+ \/\/ Number of other items in 1st vector with hAllocation = null somewhere in the middle.\n+ size_t m_1stNullItemsMiddleCount;\n+ \/\/ Number of items in 2nd vector with hAllocation = null.\n+ size_t m_2ndNullItemsCount;\n+\n+ SuballocationVectorType& AccessSuballocations1st() { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }\n+ SuballocationVectorType& AccessSuballocations2nd() { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }\n+ const SuballocationVectorType& AccessSuballocations1st() const { return m_1stVectorIndex ? m_Suballocations1 : m_Suballocations0; }\n+ const SuballocationVectorType& AccessSuballocations2nd() const { return m_1stVectorIndex ? m_Suballocations0 : m_Suballocations1; }\n+\n+ VmaSuballocation& FindSuballocation(VkDeviceSize offset) const;\n+ bool ShouldCompact1st() const;\n+ void CleanupAfterFree();\n+\n+ bool CreateAllocationRequest_LowerAddress(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest);\n+ bool CreateAllocationRequest_UpperAddress(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest);\n+};\n+\n+#ifndef _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS\n+VmaBlockMetadata_Linear::VmaBlockMetadata_Linear(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual)\n+ : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\n+ m_SumFreeSize(0),\n+ m_Suballocations0(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\n+ m_Suballocations1(VmaStlAllocator<VmaSuballocation>(pAllocationCallbacks)),\n+ m_1stVectorIndex(0),\n+ m_2ndVectorMode(SECOND_VECTOR_EMPTY),\n+ m_1stNullItemsBeginCount(0),\n+ m_1stNullItemsMiddleCount(0),\n+ m_2ndNullItemsCount(0) {}\n+\n+void VmaBlockMetadata_Linear::Init(VkDeviceSize size)\n+{\n+ VmaBlockMetadata::Init(size);\n+ m_SumFreeSize = size;\n+}\n+\n+bool VmaBlockMetadata_Linear::Validate() const\n+{\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ VMA_VALIDATE(suballocations2nd.empty() == (m_2ndVectorMode == SECOND_VECTOR_EMPTY));\n+ VMA_VALIDATE(!suballocations1st.empty() ||\n+ suballocations2nd.empty() ||\n+ m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER);\n+\n+ if (!suballocations1st.empty())\n+ {\n+ \/\/ Null item at the beginning should be accounted into m_1stNullItemsBeginCount.\n+ VMA_VALIDATE(suballocations1st[m_1stNullItemsBeginCount].type != VMA_SUBALLOCATION_TYPE_FREE);\n+ \/\/ Null item at the end should be just pop_back().\n+ VMA_VALIDATE(suballocations1st.back().type != VMA_SUBALLOCATION_TYPE_FREE);\n+ }\n+ if (!suballocations2nd.empty())\n+ {\n+ \/\/ Null item at the end should be just pop_back().\n+ VMA_VALIDATE(suballocations2nd.back().type != VMA_SUBALLOCATION_TYPE_FREE);\n+ }\n+\n+ VMA_VALIDATE(m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount <= suballocations1st.size());\n+ VMA_VALIDATE(m_2ndNullItemsCount <= suballocations2nd.size());\n+\n+ VkDeviceSize sumUsedSize = 0;\n+ const size_t suballoc1stCount = suballocations1st.size();\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+ VkDeviceSize offset = 0;\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ const size_t suballoc2ndCount = suballocations2nd.size();\n+ size_t nullItem2ndCount = 0;\n+ for (size_t i = 0; i < suballoc2ndCount; ++i)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[i];\n+ const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\n+ }\n+ VMA_VALIDATE(suballoc.offset >= offset);\n+\n+ if (!currFree)\n+ {\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\n+ VMA_VALIDATE(alloc->GetSize() == suballoc.size);\n+ }\n+ sumUsedSize += suballoc.size;\n+ }\n+ else\n+ {\n+ ++nullItem2ndCount;\n+ }\n+\n+ offset = suballoc.offset + suballoc.size + debugMargin;\n+ }\n+\n+ VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);\n+ }\n+\n+ for (size_t i = 0; i < m_1stNullItemsBeginCount; ++i)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[i];\n+ VMA_VALIDATE(suballoc.type == VMA_SUBALLOCATION_TYPE_FREE &&\n+ suballoc.userData == VMA_NULL);\n+ }\n+\n+ size_t nullItem1stCount = m_1stNullItemsBeginCount;\n+\n+ for (size_t i = m_1stNullItemsBeginCount; i < suballoc1stCount; ++i)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[i];\n+ const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\n+ }\n+ VMA_VALIDATE(suballoc.offset >= offset);\n+ VMA_VALIDATE(i >= m_1stNullItemsBeginCount || currFree);\n+\n+ if (!currFree)\n+ {\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\n+ VMA_VALIDATE(alloc->GetSize() == suballoc.size);\n+ }\n+ sumUsedSize += suballoc.size;\n+ }\n+ else\n+ {\n+ ++nullItem1stCount;\n+ }\n+\n+ offset = suballoc.offset + suballoc.size + debugMargin;\n+ }\n+ VMA_VALIDATE(nullItem1stCount == m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount);\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ const size_t suballoc2ndCount = suballocations2nd.size();\n+ size_t nullItem2ndCount = 0;\n+ for (size_t i = suballoc2ndCount; i--; )\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[i];\n+ const bool currFree = (suballoc.type == VMA_SUBALLOCATION_TYPE_FREE);\n+\n+ VmaAllocation const alloc = (VmaAllocation)suballoc.userData;\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(currFree == (alloc == VK_NULL_HANDLE));\n+ }\n+ VMA_VALIDATE(suballoc.offset >= offset);\n+\n+ if (!currFree)\n+ {\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE((VkDeviceSize)alloc->GetAllocHandle() == suballoc.offset + 1);\n+ VMA_VALIDATE(alloc->GetSize() == suballoc.size);\n+ }\n+ sumUsedSize += suballoc.size;\n+ }\n+ else\n+ {\n+ ++nullItem2ndCount;\n+ }\n+\n+ offset = suballoc.offset + suballoc.size + debugMargin;\n+ }\n+\n+ VMA_VALIDATE(nullItem2ndCount == m_2ndNullItemsCount);\n+ }\n+\n+ VMA_VALIDATE(offset <= GetSize());\n+ VMA_VALIDATE(m_SumFreeSize == GetSize() - sumUsedSize);\n+\n+ return true;\n+}\n+\n+size_t VmaBlockMetadata_Linear::GetAllocationCount() const\n+{\n+ return AccessSuballocations1st().size() - m_1stNullItemsBeginCount - m_1stNullItemsMiddleCount +\n+ AccessSuballocations2nd().size() - m_2ndNullItemsCount;\n+}\n+\n+size_t VmaBlockMetadata_Linear::GetFreeRegionsCount() const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ VMA_ASSERT(0);\n+ return SIZE_MAX;\n+}\n+\n+void VmaBlockMetadata_Linear::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\n+{\n+ const VkDeviceSize size = GetSize();\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ const size_t suballoc1stCount = suballocations1st.size();\n+ const size_t suballoc2ndCount = suballocations2nd.size();\n+\n+ inoutStats.statistics.blockCount++;\n+ inoutStats.statistics.blockBytes += size;\n+\n+ VkDeviceSize lastOffset = 0;\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\n+ size_t nextAlloc2ndIndex = 0;\n+ while (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc2ndIndex < suballoc2ndCount &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex < suballoc2ndCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\n+ if (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace2ndTo1stEnd;\n+ }\n+ }\n+ }\n+\n+ size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\n+ const VkDeviceSize freeSpace1stTo2ndEnd =\n+ m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\n+ while (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc1stIndex < suballoc1stCount &&\n+ suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc1stIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc1stIndex < suballoc1stCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc1stIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\n+ if (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace1stTo2ndEnd;\n+ }\n+ }\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\n+ while (lastOffset < size)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc2ndIndex != SIZE_MAX &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ --nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex != SIZE_MAX)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ VmaAddDetailedStatisticsAllocation(inoutStats, suballoc.size);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ --nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ \/\/ There is free space from lastOffset to size.\n+ if (lastOffset < size)\n+ {\n+ const VkDeviceSize unusedRangeSize = size - lastOffset;\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = size;\n+ }\n+ }\n+ }\n+}\n+\n+void VmaBlockMetadata_Linear::AddStatistics(VmaStatistics& inoutStats) const\n+{\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ const VkDeviceSize size = GetSize();\n+ const size_t suballoc1stCount = suballocations1st.size();\n+ const size_t suballoc2ndCount = suballocations2nd.size();\n+\n+ inoutStats.blockCount++;\n+ inoutStats.blockBytes += size;\n+ inoutStats.allocationBytes += size - m_SumFreeSize;\n+\n+ VkDeviceSize lastOffset = 0;\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\n+ size_t nextAlloc2ndIndex = m_1stNullItemsBeginCount;\n+ while (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex < suballoc2ndCount &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex < suballoc2ndCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++inoutStats.allocationCount;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\n+ const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace2ndTo1stEnd;\n+ }\n+ }\n+ }\n+\n+ size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\n+ const VkDeviceSize freeSpace1stTo2ndEnd =\n+ m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\n+ while (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc1stIndex < suballoc1stCount &&\n+ suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc1stIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc1stIndex < suballoc1stCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++inoutStats.allocationCount;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc1stIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\n+ const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace1stTo2ndEnd;\n+ }\n+ }\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\n+ while (lastOffset < size)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex != SIZE_MAX &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ --nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex != SIZE_MAX)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++inoutStats.allocationCount;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ --nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < size)\n+ {\n+ \/\/ There is free space from lastOffset to size.\n+ const VkDeviceSize unusedRangeSize = size - lastOffset;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = size;\n+ }\n+ }\n+ }\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata_Linear::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\n+{\n+ const VkDeviceSize size = GetSize();\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ const size_t suballoc1stCount = suballocations1st.size();\n+ const size_t suballoc2ndCount = suballocations2nd.size();\n+\n+ \/\/ FIRST PASS\n+\n+ size_t unusedRangeCount = 0;\n+ VkDeviceSize usedBytes = 0;\n+\n+ VkDeviceSize lastOffset = 0;\n+\n+ size_t alloc2ndCount = 0;\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\n+ size_t nextAlloc2ndIndex = 0;\n+ while (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex < suballoc2ndCount &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex < suballoc2ndCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++alloc2ndCount;\n+ usedBytes += suballoc.size;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace2ndTo1stEnd;\n+ }\n+ }\n+ }\n+\n+ size_t nextAlloc1stIndex = m_1stNullItemsBeginCount;\n+ size_t alloc1stCount = 0;\n+ const VkDeviceSize freeSpace1stTo2ndEnd =\n+ m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ? suballocations2nd.back().offset : size;\n+ while (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc1stIndex < suballoc1stCount &&\n+ suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc1stIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc1stIndex < suballoc1stCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++alloc1stCount;\n+ usedBytes += suballoc.size;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc1stIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < size)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace1stTo2ndEnd;\n+ }\n+ }\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\n+ while (lastOffset < size)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex != SIZE_MAX &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ --nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex != SIZE_MAX)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ ++alloc2ndCount;\n+ usedBytes += suballoc.size;\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ --nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < size)\n+ {\n+ \/\/ There is free space from lastOffset to size.\n+ ++unusedRangeCount;\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = size;\n+ }\n+ }\n+ }\n+\n+ const VkDeviceSize unusedBytes = size - usedBytes;\n+ PrintDetailedMap_Begin(json, unusedBytes, alloc1stCount + alloc2ndCount, unusedRangeCount, mapRefCount);\n+\n+ \/\/ SECOND PASS\n+ lastOffset = 0;\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ const VkDeviceSize freeSpace2ndTo1stEnd = suballocations1st[m_1stNullItemsBeginCount].offset;\n+ size_t nextAlloc2ndIndex = 0;\n+ while (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex < suballoc2ndCount &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex < suballoc2ndCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < freeSpace2ndTo1stEnd)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace2ndTo1stEnd.\n+ const VkDeviceSize unusedRangeSize = freeSpace2ndTo1stEnd - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace2ndTo1stEnd;\n+ }\n+ }\n+ }\n+\n+ nextAlloc1stIndex = m_1stNullItemsBeginCount;\n+ while (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ Find next non-null allocation or move nextAllocIndex to the end.\n+ while (nextAlloc1stIndex < suballoc1stCount &&\n+ suballocations1st[nextAlloc1stIndex].userData == VMA_NULL)\n+ {\n+ ++nextAlloc1stIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc1stIndex < suballoc1stCount)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[nextAlloc1stIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ ++nextAlloc1stIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < freeSpace1stTo2ndEnd)\n+ {\n+ \/\/ There is free space from lastOffset to freeSpace1stTo2ndEnd.\n+ const VkDeviceSize unusedRangeSize = freeSpace1stTo2ndEnd - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = freeSpace1stTo2ndEnd;\n+ }\n+ }\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ size_t nextAlloc2ndIndex = suballocations2nd.size() - 1;\n+ while (lastOffset < size)\n+ {\n+ \/\/ Find next non-null allocation or move nextAlloc2ndIndex to the end.\n+ while (nextAlloc2ndIndex != SIZE_MAX &&\n+ suballocations2nd[nextAlloc2ndIndex].userData == VMA_NULL)\n+ {\n+ --nextAlloc2ndIndex;\n+ }\n+\n+ \/\/ Found non-null allocation.\n+ if (nextAlloc2ndIndex != SIZE_MAX)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[nextAlloc2ndIndex];\n+\n+ \/\/ 1. Process free space before this allocation.\n+ if (lastOffset < suballoc.offset)\n+ {\n+ \/\/ There is free space from lastOffset to suballoc.offset.\n+ const VkDeviceSize unusedRangeSize = suballoc.offset - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ 2. Process this allocation.\n+ \/\/ There is allocation with suballoc.offset, suballoc.size.\n+ PrintDetailedMap_Allocation(json, suballoc.offset, suballoc.size, suballoc.userData);\n+\n+ \/\/ 3. Prepare for next iteration.\n+ lastOffset = suballoc.offset + suballoc.size;\n+ --nextAlloc2ndIndex;\n+ }\n+ \/\/ We are at the end.\n+ else\n+ {\n+ if (lastOffset < size)\n+ {\n+ \/\/ There is free space from lastOffset to size.\n+ const VkDeviceSize unusedRangeSize = size - lastOffset;\n+ PrintDetailedMap_UnusedRange(json, lastOffset, unusedRangeSize);\n+ }\n+\n+ \/\/ End of loop.\n+ lastOffset = size;\n+ }\n+ }\n+ }\n+\n+ PrintDetailedMap_End(json);\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+bool VmaBlockMetadata_Linear::CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ VMA_ASSERT(allocSize > 0);\n+ VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE);\n+ VMA_ASSERT(pAllocationRequest != VMA_NULL);\n+ VMA_HEAVY_ASSERT(Validate());\n+ pAllocationRequest->size = allocSize;\n+ return upperAddress ?\n+ CreateAllocationRequest_UpperAddress(\n+ allocSize, allocAlignment, allocType, strategy, pAllocationRequest) :\n+ CreateAllocationRequest_LowerAddress(\n+ allocSize, allocAlignment, allocType, strategy, pAllocationRequest);\n+}\n+\n+VkResult VmaBlockMetadata_Linear::CheckCorruption(const void* pBlockData)\n+{\n+ VMA_ASSERT(!IsVirtual());\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ for (size_t i = m_1stNullItemsBeginCount, count = suballocations1st.size(); i < count; ++i)\n+ {\n+ const VmaSuballocation& suballoc = suballocations1st[i];\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\n+ {\n+ VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\n+ return VK_ERROR_UNKNOWN_COPY;\n+ }\n+ }\n+ }\n+\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ for (size_t i = 0, count = suballocations2nd.size(); i < count; ++i)\n+ {\n+ const VmaSuballocation& suballoc = suballocations2nd[i];\n+ if (suballoc.type != VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ if (!VmaValidateMagicValue(pBlockData, suballoc.offset + suballoc.size))\n+ {\n+ VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\n+ return VK_ERROR_UNKNOWN_COPY;\n+ }\n+ }\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+void VmaBlockMetadata_Linear::Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData)\n+{\n+ const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1;\n+ const VmaSuballocation newSuballoc = { offset, request.size, userData, type };\n+\n+ switch (request.type)\n+ {\n+ case VmaAllocationRequestType::UpperAddress:\n+ {\n+ VMA_ASSERT(m_2ndVectorMode != SECOND_VECTOR_RING_BUFFER &&\n+ \"CRITICAL ERROR: Trying to use linear allocator as double stack while it was already used as ring buffer.\");\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ suballocations2nd.push_back(newSuballoc);\n+ m_2ndVectorMode = SECOND_VECTOR_DOUBLE_STACK;\n+ }\n+ break;\n+ case VmaAllocationRequestType::EndOf1st:\n+ {\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+\n+ VMA_ASSERT(suballocations1st.empty() ||\n+ offset >= suballocations1st.back().offset + suballocations1st.back().size);\n+ \/\/ Check if it fits before the end of the block.\n+ VMA_ASSERT(offset + request.size <= GetSize());\n+\n+ suballocations1st.push_back(newSuballoc);\n+ }\n+ break;\n+ case VmaAllocationRequestType::EndOf2nd:\n+ {\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ \/\/ New allocation at the end of 2-part ring buffer, so before first allocation from 1st vector.\n+ VMA_ASSERT(!suballocations1st.empty() &&\n+ offset + request.size <= suballocations1st[m_1stNullItemsBeginCount].offset);\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ switch (m_2ndVectorMode)\n+ {\n+ case SECOND_VECTOR_EMPTY:\n+ \/\/ First allocation from second part ring buffer.\n+ VMA_ASSERT(suballocations2nd.empty());\n+ m_2ndVectorMode = SECOND_VECTOR_RING_BUFFER;\n+ break;\n+ case SECOND_VECTOR_RING_BUFFER:\n+ \/\/ 2-part ring buffer is already started.\n+ VMA_ASSERT(!suballocations2nd.empty());\n+ break;\n+ case SECOND_VECTOR_DOUBLE_STACK:\n+ VMA_ASSERT(0 && \"CRITICAL ERROR: Trying to use linear allocator as ring buffer while it was already used as double stack.\");\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+\n+ suballocations2nd.push_back(newSuballoc);\n+ }\n+ break;\n+ default:\n+ VMA_ASSERT(0 && \"CRITICAL INTERNAL ERROR.\");\n+ }\n+\n+ m_SumFreeSize -= newSuballoc.size;\n+}\n+\n+void VmaBlockMetadata_Linear::Free(VmaAllocHandle allocHandle)\n+{\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ VkDeviceSize offset = (VkDeviceSize)allocHandle - 1;\n+\n+ if (!suballocations1st.empty())\n+ {\n+ \/\/ First allocation: Mark it as next empty at the beginning.\n+ VmaSuballocation& firstSuballoc = suballocations1st[m_1stNullItemsBeginCount];\n+ if (firstSuballoc.offset == offset)\n+ {\n+ firstSuballoc.type = VMA_SUBALLOCATION_TYPE_FREE;\n+ firstSuballoc.userData = VMA_NULL;\n+ m_SumFreeSize += firstSuballoc.size;\n+ ++m_1stNullItemsBeginCount;\n+ CleanupAfterFree();\n+ return;\n+ }\n+ }\n+\n+ \/\/ Last allocation in 2-part ring buffer or top of upper stack (same logic).\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ||\n+ m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ VmaSuballocation& lastSuballoc = suballocations2nd.back();\n+ if (lastSuballoc.offset == offset)\n+ {\n+ m_SumFreeSize += lastSuballoc.size;\n+ suballocations2nd.pop_back();\n+ CleanupAfterFree();\n+ return;\n+ }\n+ }\n+ \/\/ Last allocation in 1st vector.\n+ else if (m_2ndVectorMode == SECOND_VECTOR_EMPTY)\n+ {\n+ VmaSuballocation& lastSuballoc = suballocations1st.back();\n+ if (lastSuballoc.offset == offset)\n+ {\n+ m_SumFreeSize += lastSuballoc.size;\n+ suballocations1st.pop_back();\n+ CleanupAfterFree();\n+ return;\n+ }\n+ }\n+\n+ VmaSuballocation refSuballoc;\n+ refSuballoc.offset = offset;\n+ \/\/ Rest of members stays uninitialized intentionally for better performance.\n+\n+ \/\/ Item from the middle of 1st vector.\n+ {\n+ const SuballocationVectorType::iterator it = VmaBinaryFindSorted(\n+ suballocations1st.begin() + m_1stNullItemsBeginCount,\n+ suballocations1st.end(),\n+ refSuballoc,\n+ VmaSuballocationOffsetLess());\n+ if (it != suballocations1st.end())\n+ {\n+ it->type = VMA_SUBALLOCATION_TYPE_FREE;\n+ it->userData = VMA_NULL;\n+ ++m_1stNullItemsMiddleCount;\n+ m_SumFreeSize += it->size;\n+ CleanupAfterFree();\n+ return;\n+ }\n+ }\n+\n+ if (m_2ndVectorMode != SECOND_VECTOR_EMPTY)\n+ {\n+ \/\/ Item from the middle of 2nd vector.\n+ const SuballocationVectorType::iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?\n+ VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) :\n+ VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater());\n+ if (it != suballocations2nd.end())\n+ {\n+ it->type = VMA_SUBALLOCATION_TYPE_FREE;\n+ it->userData = VMA_NULL;\n+ ++m_2ndNullItemsCount;\n+ m_SumFreeSize += it->size;\n+ CleanupAfterFree();\n+ return;\n+ }\n+ }\n+\n+ VMA_ASSERT(0 && \"Allocation to free not found in linear allocator!\");\n+}\n+\n+void VmaBlockMetadata_Linear::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\n+{\n+ outInfo.offset = (VkDeviceSize)allocHandle - 1;\n+ VmaSuballocation& suballoc = FindSuballocation(outInfo.offset);\n+ outInfo.size = suballoc.size;\n+ outInfo.pUserData = suballoc.userData;\n+}\n+\n+void* VmaBlockMetadata_Linear::GetAllocationUserData(VmaAllocHandle allocHandle) const\n+{\n+ return FindSuballocation((VkDeviceSize)allocHandle - 1).userData;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Linear::GetAllocationListBegin() const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ VMA_ASSERT(0);\n+ return VK_NULL_HANDLE;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Linear::GetNextAllocation(VmaAllocHandle prevAlloc) const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ VMA_ASSERT(0);\n+ return VK_NULL_HANDLE;\n+}\n+\n+VkDeviceSize VmaBlockMetadata_Linear::GetNextFreeRegionSize(VmaAllocHandle alloc) const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ VMA_ASSERT(0);\n+ return 0;\n+}\n+\n+void VmaBlockMetadata_Linear::Clear()\n+{\n+ m_SumFreeSize = GetSize();\n+ m_Suballocations0.clear();\n+ m_Suballocations1.clear();\n+ \/\/ Leaving m_1stVectorIndex unchanged - it doesn't matter.\n+ m_2ndVectorMode = SECOND_VECTOR_EMPTY;\n+ m_1stNullItemsBeginCount = 0;\n+ m_1stNullItemsMiddleCount = 0;\n+ m_2ndNullItemsCount = 0;\n+}\n+\n+void VmaBlockMetadata_Linear::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\n+{\n+ VmaSuballocation& suballoc = FindSuballocation((VkDeviceSize)allocHandle - 1);\n+ suballoc.userData = userData;\n+}\n+\n+void VmaBlockMetadata_Linear::DebugLogAllAllocations() const\n+{\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ for (auto it = suballocations1st.begin() + m_1stNullItemsBeginCount; it != suballocations1st.end(); ++it)\n+ if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\n+ DebugLogAllocation(it->offset, it->size, it->userData);\n+\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+ for (auto it = suballocations2nd.begin(); it != suballocations2nd.end(); ++it)\n+ if (it->type != VMA_SUBALLOCATION_TYPE_FREE)\n+ DebugLogAllocation(it->offset, it->size, it->userData);\n+}\n+\n+VmaSuballocation& VmaBlockMetadata_Linear::FindSuballocation(VkDeviceSize offset) const\n+{\n+ const SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ const SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ VmaSuballocation refSuballoc;\n+ refSuballoc.offset = offset;\n+ \/\/ Rest of members stays uninitialized intentionally for better performance.\n+\n+ \/\/ Item from the 1st vector.\n+ {\n+ SuballocationVectorType::const_iterator it = VmaBinaryFindSorted(\n+ suballocations1st.begin() + m_1stNullItemsBeginCount,\n+ suballocations1st.end(),\n+ refSuballoc,\n+ VmaSuballocationOffsetLess());\n+ if (it != suballocations1st.end())\n+ {\n+ return const_cast<VmaSuballocation&>(*it);\n+ }\n+ }\n+\n+ if (m_2ndVectorMode != SECOND_VECTOR_EMPTY)\n+ {\n+ \/\/ Rest of members stays uninitialized intentionally for better performance.\n+ SuballocationVectorType::const_iterator it = m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER ?\n+ VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetLess()) :\n+ VmaBinaryFindSorted(suballocations2nd.begin(), suballocations2nd.end(), refSuballoc, VmaSuballocationOffsetGreater());\n+ if (it != suballocations2nd.end())\n+ {\n+ return const_cast<VmaSuballocation&>(*it);\n+ }\n+ }\n+\n+ VMA_ASSERT(0 && \"Allocation not found in linear allocator!\");\n+ return const_cast<VmaSuballocation&>(suballocations1st.back()); \/\/ Should never occur.\n+}\n+\n+bool VmaBlockMetadata_Linear::ShouldCompact1st() const\n+{\n+ const size_t nullItemCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;\n+ const size_t suballocCount = AccessSuballocations1st().size();\n+ return suballocCount > 32 && nullItemCount * 2 >= (suballocCount - nullItemCount) * 3;\n+}\n+\n+void VmaBlockMetadata_Linear::CleanupAfterFree()\n+{\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ if (IsEmpty())\n+ {\n+ suballocations1st.clear();\n+ suballocations2nd.clear();\n+ m_1stNullItemsBeginCount = 0;\n+ m_1stNullItemsMiddleCount = 0;\n+ m_2ndNullItemsCount = 0;\n+ m_2ndVectorMode = SECOND_VECTOR_EMPTY;\n+ }\n+ else\n+ {\n+ const size_t suballoc1stCount = suballocations1st.size();\n+ const size_t nullItem1stCount = m_1stNullItemsBeginCount + m_1stNullItemsMiddleCount;\n+ VMA_ASSERT(nullItem1stCount <= suballoc1stCount);\n+\n+ \/\/ Find more null items at the beginning of 1st vector.\n+ while (m_1stNullItemsBeginCount < suballoc1stCount &&\n+ suballocations1st[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ ++m_1stNullItemsBeginCount;\n+ --m_1stNullItemsMiddleCount;\n+ }\n+\n+ \/\/ Find more null items at the end of 1st vector.\n+ while (m_1stNullItemsMiddleCount > 0 &&\n+ suballocations1st.back().type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ --m_1stNullItemsMiddleCount;\n+ suballocations1st.pop_back();\n+ }\n+\n+ \/\/ Find more null items at the end of 2nd vector.\n+ while (m_2ndNullItemsCount > 0 &&\n+ suballocations2nd.back().type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ --m_2ndNullItemsCount;\n+ suballocations2nd.pop_back();\n+ }\n+\n+ \/\/ Find more null items at the beginning of 2nd vector.\n+ while (m_2ndNullItemsCount > 0 &&\n+ suballocations2nd[0].type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ --m_2ndNullItemsCount;\n+ VmaVectorRemove(suballocations2nd, 0);\n+ }\n+\n+ if (ShouldCompact1st())\n+ {\n+ const size_t nonNullItemCount = suballoc1stCount - nullItem1stCount;\n+ size_t srcIndex = m_1stNullItemsBeginCount;\n+ for (size_t dstIndex = 0; dstIndex < nonNullItemCount; ++dstIndex)\n+ {\n+ while (suballocations1st[srcIndex].type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ ++srcIndex;\n+ }\n+ if (dstIndex != srcIndex)\n+ {\n+ suballocations1st[dstIndex] = suballocations1st[srcIndex];\n+ }\n+ ++srcIndex;\n+ }\n+ suballocations1st.resize(nonNullItemCount);\n+ m_1stNullItemsBeginCount = 0;\n+ m_1stNullItemsMiddleCount = 0;\n+ }\n+\n+ \/\/ 2nd vector became empty.\n+ if (suballocations2nd.empty())\n+ {\n+ m_2ndVectorMode = SECOND_VECTOR_EMPTY;\n+ }\n+\n+ \/\/ 1st vector became empty.\n+ if (suballocations1st.size() - m_1stNullItemsBeginCount == 0)\n+ {\n+ suballocations1st.clear();\n+ m_1stNullItemsBeginCount = 0;\n+\n+ if (!suballocations2nd.empty() && m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ \/\/ Swap 1st with 2nd. Now 2nd is empty.\n+ m_2ndVectorMode = SECOND_VECTOR_EMPTY;\n+ m_1stNullItemsMiddleCount = m_2ndNullItemsCount;\n+ while (m_1stNullItemsBeginCount < suballocations2nd.size() &&\n+ suballocations2nd[m_1stNullItemsBeginCount].type == VMA_SUBALLOCATION_TYPE_FREE)\n+ {\n+ ++m_1stNullItemsBeginCount;\n+ --m_1stNullItemsMiddleCount;\n+ }\n+ m_2ndNullItemsCount = 0;\n+ m_1stVectorIndex ^= 1;\n+ }\n+ }\n+ }\n+\n+ VMA_HEAVY_ASSERT(Validate());\n+}\n+\n+bool VmaBlockMetadata_Linear::CreateAllocationRequest_LowerAddress(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ const VkDeviceSize blockSize = GetSize();\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+ const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ \/\/ Try to allocate at the end of 1st vector.\n+\n+ VkDeviceSize resultBaseOffset = 0;\n+ if (!suballocations1st.empty())\n+ {\n+ const VmaSuballocation& lastSuballoc = suballocations1st.back();\n+ resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin;\n+ }\n+\n+ \/\/ Start from offset equal to beginning of free space.\n+ VkDeviceSize resultOffset = resultBaseOffset;\n+\n+ \/\/ Apply alignment.\n+ resultOffset = VmaAlignUp(resultOffset, allocAlignment);\n+\n+ \/\/ Check previous suballocations for BufferImageGranularity conflicts.\n+ \/\/ Make bigger alignment if necessary.\n+ if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations1st.empty())\n+ {\n+ bool bufferImageGranularityConflict = false;\n+ for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )\n+ {\n+ const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];\n+ if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\n+ {\n+ bufferImageGranularityConflict = true;\n+ break;\n+ }\n+ }\n+ else\n+ \/\/ Already on previous page.\n+ break;\n+ }\n+ if (bufferImageGranularityConflict)\n+ {\n+ resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);\n+ }\n+ }\n+\n+ const VkDeviceSize freeSpaceEnd = m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK ?\n+ suballocations2nd.back().offset : blockSize;\n+\n+ \/\/ There is enough free space at the end after alignment.\n+ if (resultOffset + allocSize + debugMargin <= freeSpaceEnd)\n+ {\n+ \/\/ Check next suballocations for BufferImageGranularity conflicts.\n+ \/\/ If conflict exists, allocation cannot be made here.\n+ if ((allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity) && m_2ndVectorMode == SECOND_VECTOR_DOUBLE_STACK)\n+ {\n+ for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )\n+ {\n+ const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];\n+ if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\n+ {\n+ return false;\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Already on previous page.\n+ break;\n+ }\n+ }\n+ }\n+\n+ \/\/ All tests passed: Success.\n+ pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\n+ \/\/ pAllocationRequest->item, customData unused.\n+ pAllocationRequest->type = VmaAllocationRequestType::EndOf1st;\n+ return true;\n+ }\n+ }\n+\n+ \/\/ Wrap-around to end of 2nd vector. Try to allocate there, watching for the\n+ \/\/ beginning of 1st vector as the end of free space.\n+ if (m_2ndVectorMode == SECOND_VECTOR_EMPTY || m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ VMA_ASSERT(!suballocations1st.empty());\n+\n+ VkDeviceSize resultBaseOffset = 0;\n+ if (!suballocations2nd.empty())\n+ {\n+ const VmaSuballocation& lastSuballoc = suballocations2nd.back();\n+ resultBaseOffset = lastSuballoc.offset + lastSuballoc.size + debugMargin;\n+ }\n+\n+ \/\/ Start from offset equal to beginning of free space.\n+ VkDeviceSize resultOffset = resultBaseOffset;\n+\n+ \/\/ Apply alignment.\n+ resultOffset = VmaAlignUp(resultOffset, allocAlignment);\n+\n+ \/\/ Check previous suballocations for BufferImageGranularity conflicts.\n+ \/\/ Make bigger alignment if necessary.\n+ if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())\n+ {\n+ bool bufferImageGranularityConflict = false;\n+ for (size_t prevSuballocIndex = suballocations2nd.size(); prevSuballocIndex--; )\n+ {\n+ const VmaSuballocation& prevSuballoc = suballocations2nd[prevSuballocIndex];\n+ if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(prevSuballoc.type, allocType))\n+ {\n+ bufferImageGranularityConflict = true;\n+ break;\n+ }\n+ }\n+ else\n+ \/\/ Already on previous page.\n+ break;\n+ }\n+ if (bufferImageGranularityConflict)\n+ {\n+ resultOffset = VmaAlignUp(resultOffset, bufferImageGranularity);\n+ }\n+ }\n+\n+ size_t index1st = m_1stNullItemsBeginCount;\n+\n+ \/\/ There is enough free space at the end after alignment.\n+ if ((index1st == suballocations1st.size() && resultOffset + allocSize + debugMargin <= blockSize) ||\n+ (index1st < suballocations1st.size() && resultOffset + allocSize + debugMargin <= suballocations1st[index1st].offset))\n+ {\n+ \/\/ Check next suballocations for BufferImageGranularity conflicts.\n+ \/\/ If conflict exists, allocation cannot be made here.\n+ if (allocSize % bufferImageGranularity || resultOffset % bufferImageGranularity)\n+ {\n+ for (size_t nextSuballocIndex = index1st;\n+ nextSuballocIndex < suballocations1st.size();\n+ nextSuballocIndex++)\n+ {\n+ const VmaSuballocation& nextSuballoc = suballocations1st[nextSuballocIndex];\n+ if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(allocType, nextSuballoc.type))\n+ {\n+ return false;\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Already on next page.\n+ break;\n+ }\n+ }\n+ }\n+\n+ \/\/ All tests passed: Success.\n+ pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\n+ pAllocationRequest->type = VmaAllocationRequestType::EndOf2nd;\n+ \/\/ pAllocationRequest->item, customData unused.\n+ return true;\n+ }\n+ }\n+\n+ return false;\n+}\n+\n+bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ const VkDeviceSize blockSize = GetSize();\n+ const VkDeviceSize bufferImageGranularity = GetBufferImageGranularity();\n+ SuballocationVectorType& suballocations1st = AccessSuballocations1st();\n+ SuballocationVectorType& suballocations2nd = AccessSuballocations2nd();\n+\n+ if (m_2ndVectorMode == SECOND_VECTOR_RING_BUFFER)\n+ {\n+ VMA_ASSERT(0 && \"Trying to use pool with linear algorithm as double stack, while it is already being used as ring buffer.\");\n+ return false;\n+ }\n+\n+ \/\/ Try to allocate before 2nd.back(), or end of block if 2nd.empty().\n+ if (allocSize > blockSize)\n+ {\n+ return false;\n+ }\n+ VkDeviceSize resultBaseOffset = blockSize - allocSize;\n+ if (!suballocations2nd.empty())\n+ {\n+ const VmaSuballocation& lastSuballoc = suballocations2nd.back();\n+ resultBaseOffset = lastSuballoc.offset - allocSize;\n+ if (allocSize > lastSuballoc.offset)\n+ {\n+ return false;\n+ }\n+ }\n+\n+ \/\/ Start from offset equal to end of free space.\n+ VkDeviceSize resultOffset = resultBaseOffset;\n+\n+ const VkDeviceSize debugMargin = GetDebugMargin();\n+\n+ \/\/ Apply debugMargin at the end.\n+ if (debugMargin > 0)\n+ {\n+ if (resultOffset < debugMargin)\n+ {\n+ return false;\n+ }\n+ resultOffset -= debugMargin;\n+ }\n+\n+ \/\/ Apply alignment.\n+ resultOffset = VmaAlignDown(resultOffset, allocAlignment);\n+\n+ \/\/ Check next suballocations from 2nd for BufferImageGranularity conflicts.\n+ \/\/ Make bigger alignment if necessary.\n+ if (bufferImageGranularity > 1 && bufferImageGranularity != allocAlignment && !suballocations2nd.empty())\n+ {\n+ bool bufferImageGranularityConflict = false;\n+ for (size_t nextSuballocIndex = suballocations2nd.size(); nextSuballocIndex--; )\n+ {\n+ const VmaSuballocation& nextSuballoc = suballocations2nd[nextSuballocIndex];\n+ if (VmaBlocksOnSamePage(resultOffset, allocSize, nextSuballoc.offset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(nextSuballoc.type, allocType))\n+ {\n+ bufferImageGranularityConflict = true;\n+ break;\n+ }\n+ }\n+ else\n+ \/\/ Already on previous page.\n+ break;\n+ }\n+ if (bufferImageGranularityConflict)\n+ {\n+ resultOffset = VmaAlignDown(resultOffset, bufferImageGranularity);\n+ }\n+ }\n+\n+ \/\/ There is enough free space.\n+ const VkDeviceSize endOf1st = !suballocations1st.empty() ?\n+ suballocations1st.back().offset + suballocations1st.back().size :\n+ 0;\n+ if (endOf1st + debugMargin <= resultOffset)\n+ {\n+ \/\/ Check previous suballocations for BufferImageGranularity conflicts.\n+ \/\/ If conflict exists, allocation cannot be made here.\n+ if (bufferImageGranularity > 1)\n+ {\n+ for (size_t prevSuballocIndex = suballocations1st.size(); prevSuballocIndex--; )\n+ {\n+ const VmaSuballocation& prevSuballoc = suballocations1st[prevSuballocIndex];\n+ if (VmaBlocksOnSamePage(prevSuballoc.offset, prevSuballoc.size, resultOffset, bufferImageGranularity))\n+ {\n+ if (VmaIsBufferImageGranularityConflict(allocType, prevSuballoc.type))\n+ {\n+ return false;\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Already on next page.\n+ break;\n+ }\n+ }\n+ }\n+\n+ \/\/ All tests passed: Success.\n+ pAllocationRequest->allocHandle = (VmaAllocHandle)(resultOffset + 1);\n+ \/\/ pAllocationRequest->item unused.\n+ pAllocationRequest->type = VmaAllocationRequestType::UpperAddress;\n+ return true;\n+ }\n+\n+ return false;\n+}\n+#endif \/\/ _VMA_BLOCK_METADATA_LINEAR_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_METADATA_LINEAR\n+\n+#if 0\n+#ifndef _VMA_BLOCK_METADATA_BUDDY\n+\/*\n+- GetSize() is the original size of allocated memory block.\n+- m_UsableSize is this size aligned down to a power of two.\n+ All allocations and calculations happen relative to m_UsableSize.\n+- GetUnusableSize() is the difference between them.\n+ It is reported as separate, unused range, not available for allocations.\n+\n+Node at level 0 has size = m_UsableSize.\n+Each next level contains nodes with size 2 times smaller than current level.\n+m_LevelCount is the maximum number of levels to use in the current object.\n+*\/\n+class VmaBlockMetadata_Buddy : public VmaBlockMetadata\n+{\n+ VMA_CLASS_NO_COPY(VmaBlockMetadata_Buddy)\n+public:\n+ VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual);\n+ virtual ~VmaBlockMetadata_Buddy();\n+\n+ size_t GetAllocationCount() const override { return m_AllocationCount; }\n+ VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize + GetUnusableSize(); }\n+ bool IsEmpty() const override { return m_Root->type == Node::TYPE_FREE; }\n+ VkResult CheckCorruption(const void* pBlockData) override { return VK_ERROR_FEATURE_NOT_PRESENT; }\n+ VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return (VkDeviceSize)allocHandle - 1; };\n+ void DebugLogAllAllocations() const override { DebugLogAllAllocationNode(m_Root, 0); }\n+\n+ void Init(VkDeviceSize size) override;\n+ bool Validate() const override;\n+\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\n+ void AddStatistics(VmaStatistics& inoutStats) const override;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\n+#endif\n+\n+ bool CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest) override;\n+\n+ void Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData) override;\n+\n+ void Free(VmaAllocHandle allocHandle) override;\n+ void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\n+ void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\n+ VmaAllocHandle GetAllocationListBegin() const override;\n+ VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\n+ void Clear() override;\n+ void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\n+\n+private:\n+ static const size_t MAX_LEVELS = 48;\n+\n+ struct ValidationContext\n+ {\n+ size_t calculatedAllocationCount = 0;\n+ size_t calculatedFreeCount = 0;\n+ VkDeviceSize calculatedSumFreeSize = 0;\n+ };\n+ struct Node\n+ {\n+ VkDeviceSize offset;\n+ enum TYPE\n+ {\n+ TYPE_FREE,\n+ TYPE_ALLOCATION,\n+ TYPE_SPLIT,\n+ TYPE_COUNT\n+ } type;\n+ Node* parent;\n+ Node* buddy;\n+\n+ union\n+ {\n+ struct\n+ {\n+ Node* prev;\n+ Node* next;\n+ } free;\n+ struct\n+ {\n+ void* userData;\n+ } allocation;\n+ struct\n+ {\n+ Node* leftChild;\n+ } split;\n+ };\n+ };\n+\n+ \/\/ Size of the memory block aligned down to a power of two.\n+ VkDeviceSize m_UsableSize;\n+ uint32_t m_LevelCount;\n+ VmaPoolAllocator<Node> m_NodeAllocator;\n+ Node* m_Root;\n+ struct\n+ {\n+ Node* front;\n+ Node* back;\n+ } m_FreeList[MAX_LEVELS];\n+\n+ \/\/ Number of nodes in the tree with type == TYPE_ALLOCATION.\n+ size_t m_AllocationCount;\n+ \/\/ Number of nodes in the tree with type == TYPE_FREE.\n+ size_t m_FreeCount;\n+ \/\/ Doesn't include space wasted due to internal fragmentation - allocation sizes are just aligned up to node sizes.\n+ \/\/ Doesn't include unusable size.\n+ VkDeviceSize m_SumFreeSize;\n+\n+ VkDeviceSize GetUnusableSize() const { return GetSize() - m_UsableSize; }\n+ VkDeviceSize LevelToNodeSize(uint32_t level) const { return m_UsableSize >> level; }\n+\n+ VkDeviceSize AlignAllocationSize(VkDeviceSize size) const\n+ {\n+ if (!IsVirtual())\n+ {\n+ size = VmaAlignUp(size, (VkDeviceSize)16);\n+ }\n+ return VmaNextPow2(size);\n+ }\n+ Node* FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const;\n+ void DeleteNodeChildren(Node* node);\n+ bool ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const;\n+ uint32_t AllocSizeToLevel(VkDeviceSize allocSize) const;\n+ void AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const;\n+ \/\/ Adds node to the front of FreeList at given level.\n+ \/\/ node->type must be FREE.\n+ \/\/ node->free.prev, next can be undefined.\n+ void AddToFreeListFront(uint32_t level, Node* node);\n+ \/\/ Removes node from FreeList at given level.\n+ \/\/ node->type must be FREE.\n+ \/\/ node->free.prev, next stay untouched.\n+ void RemoveFromFreeList(uint32_t level, Node* node);\n+ void DebugLogAllAllocationNode(Node* node, uint32_t level) const;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const;\n+#endif\n+};\n+\n+#ifndef _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS\n+VmaBlockMetadata_Buddy::VmaBlockMetadata_Buddy(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual)\n+ : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\n+ m_NodeAllocator(pAllocationCallbacks, 32), \/\/ firstBlockCapacity\n+ m_Root(VMA_NULL),\n+ m_AllocationCount(0),\n+ m_FreeCount(1),\n+ m_SumFreeSize(0)\n+{\n+ memset(m_FreeList, 0, sizeof(m_FreeList));\n+}\n+\n+VmaBlockMetadata_Buddy::~VmaBlockMetadata_Buddy()\n+{\n+ DeleteNodeChildren(m_Root);\n+ m_NodeAllocator.Free(m_Root);\n+}\n+\n+void VmaBlockMetadata_Buddy::Init(VkDeviceSize size)\n+{\n+ VmaBlockMetadata::Init(size);\n+\n+ m_UsableSize = VmaPrevPow2(size);\n+ m_SumFreeSize = m_UsableSize;\n+\n+ \/\/ Calculate m_LevelCount.\n+ const VkDeviceSize minNodeSize = IsVirtual() ? 1 : 16;\n+ m_LevelCount = 1;\n+ while (m_LevelCount < MAX_LEVELS &&\n+ LevelToNodeSize(m_LevelCount) >= minNodeSize)\n+ {\n+ ++m_LevelCount;\n+ }\n+\n+ Node* rootNode = m_NodeAllocator.Alloc();\n+ rootNode->offset = 0;\n+ rootNode->type = Node::TYPE_FREE;\n+ rootNode->parent = VMA_NULL;\n+ rootNode->buddy = VMA_NULL;\n+\n+ m_Root = rootNode;\n+ AddToFreeListFront(0, rootNode);\n+}\n+\n+bool VmaBlockMetadata_Buddy::Validate() const\n+{\n+ \/\/ Validate tree.\n+ ValidationContext ctx;\n+ if (!ValidateNode(ctx, VMA_NULL, m_Root, 0, LevelToNodeSize(0)))\n+ {\n+ VMA_VALIDATE(false && \"ValidateNode failed.\");\n+ }\n+ VMA_VALIDATE(m_AllocationCount == ctx.calculatedAllocationCount);\n+ VMA_VALIDATE(m_SumFreeSize == ctx.calculatedSumFreeSize);\n+\n+ \/\/ Validate free node lists.\n+ for (uint32_t level = 0; level < m_LevelCount; ++level)\n+ {\n+ VMA_VALIDATE(m_FreeList[level].front == VMA_NULL ||\n+ m_FreeList[level].front->free.prev == VMA_NULL);\n+\n+ for (Node* node = m_FreeList[level].front;\n+ node != VMA_NULL;\n+ node = node->free.next)\n+ {\n+ VMA_VALIDATE(node->type == Node::TYPE_FREE);\n+\n+ if (node->free.next == VMA_NULL)\n+ {\n+ VMA_VALIDATE(m_FreeList[level].back == node);\n+ }\n+ else\n+ {\n+ VMA_VALIDATE(node->free.next->free.prev == node);\n+ }\n+ }\n+ }\n+\n+ \/\/ Validate that free lists ar higher levels are empty.\n+ for (uint32_t level = m_LevelCount; level < MAX_LEVELS; ++level)\n+ {\n+ VMA_VALIDATE(m_FreeList[level].front == VMA_NULL && m_FreeList[level].back == VMA_NULL);\n+ }\n+\n+ return true;\n+}\n+\n+void VmaBlockMetadata_Buddy::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\n+{\n+ inoutStats.statistics.blockCount++;\n+ inoutStats.statistics.blockBytes += GetSize();\n+\n+ AddNodeToDetailedStatistics(inoutStats, m_Root, LevelToNodeSize(0));\n+\n+ const VkDeviceSize unusableSize = GetUnusableSize();\n+ if (unusableSize > 0)\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, unusableSize);\n+}\n+\n+void VmaBlockMetadata_Buddy::AddStatistics(VmaStatistics& inoutStats) const\n+{\n+ inoutStats.blockCount++;\n+ inoutStats.allocationCount += (uint32_t)m_AllocationCount;\n+ inoutStats.blockBytes += GetSize();\n+ inoutStats.allocationBytes += GetSize() - m_SumFreeSize;\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\n+{\n+ VmaDetailedStatistics stats;\n+ VmaClearDetailedStatistics(stats);\n+ AddDetailedStatistics(stats);\n+\n+ PrintDetailedMap_Begin(\n+ json,\n+ stats.statistics.blockBytes - stats.statistics.allocationBytes,\n+ stats.statistics.allocationCount,\n+ stats.unusedRangeCount,\n+ mapRefCount);\n+\n+ PrintDetailedMapNode(json, m_Root, LevelToNodeSize(0));\n+\n+ const VkDeviceSize unusableSize = GetUnusableSize();\n+ if (unusableSize > 0)\n+ {\n+ PrintDetailedMap_UnusedRange(json,\n+ m_UsableSize, \/\/ offset\n+ unusableSize); \/\/ size\n+ }\n+\n+ PrintDetailedMap_End(json);\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+bool VmaBlockMetadata_Buddy::CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ VMA_ASSERT(!upperAddress && \"VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.\");\n+\n+ allocSize = AlignAllocationSize(allocSize);\n+\n+ \/\/ Simple way to respect bufferImageGranularity. May be optimized some day.\n+ \/\/ Whenever it might be an OPTIMAL image...\n+ if (allocType == VMA_SUBALLOCATION_TYPE_UNKNOWN ||\n+ allocType == VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN ||\n+ allocType == VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL)\n+ {\n+ allocAlignment = VMA_MAX(allocAlignment, GetBufferImageGranularity());\n+ allocSize = VmaAlignUp(allocSize, GetBufferImageGranularity());\n+ }\n+\n+ if (allocSize > m_UsableSize)\n+ {\n+ return false;\n+ }\n+\n+ const uint32_t targetLevel = AllocSizeToLevel(allocSize);\n+ for (uint32_t level = targetLevel; level--; )\n+ {\n+ for (Node* freeNode = m_FreeList[level].front;\n+ freeNode != VMA_NULL;\n+ freeNode = freeNode->free.next)\n+ {\n+ if (freeNode->offset % allocAlignment == 0)\n+ {\n+ pAllocationRequest->type = VmaAllocationRequestType::Normal;\n+ pAllocationRequest->allocHandle = (VmaAllocHandle)(freeNode->offset + 1);\n+ pAllocationRequest->size = allocSize;\n+ pAllocationRequest->customData = (void*)(uintptr_t)level;\n+ return true;\n+ }\n+ }\n+ }\n+\n+ return false;\n+}\n+\n+void VmaBlockMetadata_Buddy::Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData)\n+{\n+ VMA_ASSERT(request.type == VmaAllocationRequestType::Normal);\n+\n+ const uint32_t targetLevel = AllocSizeToLevel(request.size);\n+ uint32_t currLevel = (uint32_t)(uintptr_t)request.customData;\n+\n+ Node* currNode = m_FreeList[currLevel].front;\n+ VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);\n+ const VkDeviceSize offset = (VkDeviceSize)request.allocHandle - 1;\n+ while (currNode->offset != offset)\n+ {\n+ currNode = currNode->free.next;\n+ VMA_ASSERT(currNode != VMA_NULL && currNode->type == Node::TYPE_FREE);\n+ }\n+\n+ \/\/ Go down, splitting free nodes.\n+ while (currLevel < targetLevel)\n+ {\n+ \/\/ currNode is already first free node at currLevel.\n+ \/\/ Remove it from list of free nodes at this currLevel.\n+ RemoveFromFreeList(currLevel, currNode);\n+\n+ const uint32_t childrenLevel = currLevel + 1;\n+\n+ \/\/ Create two free sub-nodes.\n+ Node* leftChild = m_NodeAllocator.Alloc();\n+ Node* rightChild = m_NodeAllocator.Alloc();\n+\n+ leftChild->offset = currNode->offset;\n+ leftChild->type = Node::TYPE_FREE;\n+ leftChild->parent = currNode;\n+ leftChild->buddy = rightChild;\n+\n+ rightChild->offset = currNode->offset + LevelToNodeSize(childrenLevel);\n+ rightChild->type = Node::TYPE_FREE;\n+ rightChild->parent = currNode;\n+ rightChild->buddy = leftChild;\n+\n+ \/\/ Convert current currNode to split type.\n+ currNode->type = Node::TYPE_SPLIT;\n+ currNode->split.leftChild = leftChild;\n+\n+ \/\/ Add child nodes to free list. Order is important!\n+ AddToFreeListFront(childrenLevel, rightChild);\n+ AddToFreeListFront(childrenLevel, leftChild);\n+\n+ ++m_FreeCount;\n+ ++currLevel;\n+ currNode = m_FreeList[currLevel].front;\n+\n+ \/*\n+ We can be sure that currNode, as left child of node previously split,\n+ also fulfills the alignment requirement.\n+ *\/\n+ }\n+\n+ \/\/ Remove from free list.\n+ VMA_ASSERT(currLevel == targetLevel &&\n+ currNode != VMA_NULL &&\n+ currNode->type == Node::TYPE_FREE);\n+ RemoveFromFreeList(currLevel, currNode);\n+\n+ \/\/ Convert to allocation node.\n+ currNode->type = Node::TYPE_ALLOCATION;\n+ currNode->allocation.userData = userData;\n+\n+ ++m_AllocationCount;\n+ --m_FreeCount;\n+ m_SumFreeSize -= request.size;\n+}\n+\n+void VmaBlockMetadata_Buddy::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\n+{\n+ uint32_t level = 0;\n+ outInfo.offset = (VkDeviceSize)allocHandle - 1;\n+ const Node* const node = FindAllocationNode(outInfo.offset, level);\n+ outInfo.size = LevelToNodeSize(level);\n+ outInfo.pUserData = node->allocation.userData;\n+}\n+\n+void* VmaBlockMetadata_Buddy::GetAllocationUserData(VmaAllocHandle allocHandle) const\n+{\n+ uint32_t level = 0;\n+ const Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\n+ return node->allocation.userData;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Buddy::GetAllocationListBegin() const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ return VK_NULL_HANDLE;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_Buddy::GetNextAllocation(VmaAllocHandle prevAlloc) const\n+{\n+ \/\/ Function only used for defragmentation, which is disabled for this algorithm\n+ return VK_NULL_HANDLE;\n+}\n+\n+void VmaBlockMetadata_Buddy::DeleteNodeChildren(Node* node)\n+{\n+ if (node->type == Node::TYPE_SPLIT)\n+ {\n+ DeleteNodeChildren(node->split.leftChild->buddy);\n+ DeleteNodeChildren(node->split.leftChild);\n+ const VkAllocationCallbacks* allocationCallbacks = GetAllocationCallbacks();\n+ m_NodeAllocator.Free(node->split.leftChild->buddy);\n+ m_NodeAllocator.Free(node->split.leftChild);\n+ }\n+}\n+\n+void VmaBlockMetadata_Buddy::Clear()\n+{\n+ DeleteNodeChildren(m_Root);\n+ m_Root->type = Node::TYPE_FREE;\n+ m_AllocationCount = 0;\n+ m_FreeCount = 1;\n+ m_SumFreeSize = m_UsableSize;\n+}\n+\n+void VmaBlockMetadata_Buddy::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\n+{\n+ uint32_t level = 0;\n+ Node* const node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\n+ node->allocation.userData = userData;\n+}\n+\n+VmaBlockMetadata_Buddy::Node* VmaBlockMetadata_Buddy::FindAllocationNode(VkDeviceSize offset, uint32_t& outLevel) const\n+{\n+ Node* node = m_Root;\n+ VkDeviceSize nodeOffset = 0;\n+ outLevel = 0;\n+ VkDeviceSize levelNodeSize = LevelToNodeSize(0);\n+ while (node->type == Node::TYPE_SPLIT)\n+ {\n+ const VkDeviceSize nextLevelNodeSize = levelNodeSize >> 1;\n+ if (offset < nodeOffset + nextLevelNodeSize)\n+ {\n+ node = node->split.leftChild;\n+ }\n+ else\n+ {\n+ node = node->split.leftChild->buddy;\n+ nodeOffset += nextLevelNodeSize;\n+ }\n+ ++outLevel;\n+ levelNodeSize = nextLevelNodeSize;\n+ }\n+\n+ VMA_ASSERT(node != VMA_NULL && node->type == Node::TYPE_ALLOCATION);\n+ return node;\n+}\n+\n+bool VmaBlockMetadata_Buddy::ValidateNode(ValidationContext& ctx, const Node* parent, const Node* curr, uint32_t level, VkDeviceSize levelNodeSize) const\n+{\n+ VMA_VALIDATE(level < m_LevelCount);\n+ VMA_VALIDATE(curr->parent == parent);\n+ VMA_VALIDATE((curr->buddy == VMA_NULL) == (parent == VMA_NULL));\n+ VMA_VALIDATE(curr->buddy == VMA_NULL || curr->buddy->buddy == curr);\n+ switch (curr->type)\n+ {\n+ case Node::TYPE_FREE:\n+ \/\/ curr->free.prev, next are validated separately.\n+ ctx.calculatedSumFreeSize += levelNodeSize;\n+ ++ctx.calculatedFreeCount;\n+ break;\n+ case Node::TYPE_ALLOCATION:\n+ ++ctx.calculatedAllocationCount;\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(curr->allocation.userData != VMA_NULL);\n+ }\n+ break;\n+ case Node::TYPE_SPLIT:\n+ {\n+ const uint32_t childrenLevel = level + 1;\n+ const VkDeviceSize childrenLevelNodeSize = levelNodeSize >> 1;\n+ const Node* const leftChild = curr->split.leftChild;\n+ VMA_VALIDATE(leftChild != VMA_NULL);\n+ VMA_VALIDATE(leftChild->offset == curr->offset);\n+ if (!ValidateNode(ctx, curr, leftChild, childrenLevel, childrenLevelNodeSize))\n+ {\n+ VMA_VALIDATE(false && \"ValidateNode for left child failed.\");\n+ }\n+ const Node* const rightChild = leftChild->buddy;\n+ VMA_VALIDATE(rightChild->offset == curr->offset + childrenLevelNodeSize);\n+ if (!ValidateNode(ctx, curr, rightChild, childrenLevel, childrenLevelNodeSize))\n+ {\n+ VMA_VALIDATE(false && \"ValidateNode for right child failed.\");\n+ }\n+ }\n+ break;\n+ default:\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\n+uint32_t VmaBlockMetadata_Buddy::AllocSizeToLevel(VkDeviceSize allocSize) const\n+{\n+ \/\/ I know this could be optimized somehow e.g. by using std::log2p1 from C++20.\n+ uint32_t level = 0;\n+ VkDeviceSize currLevelNodeSize = m_UsableSize;\n+ VkDeviceSize nextLevelNodeSize = currLevelNodeSize >> 1;\n+ while (allocSize <= nextLevelNodeSize && level + 1 < m_LevelCount)\n+ {\n+ ++level;\n+ currLevelNodeSize >>= 1;\n+ nextLevelNodeSize >>= 1;\n+ }\n+ return level;\n+}\n+\n+void VmaBlockMetadata_Buddy::Free(VmaAllocHandle allocHandle)\n+{\n+ uint32_t level = 0;\n+ Node* node = FindAllocationNode((VkDeviceSize)allocHandle - 1, level);\n+\n+ ++m_FreeCount;\n+ --m_AllocationCount;\n+ m_SumFreeSize += LevelToNodeSize(level);\n+\n+ node->type = Node::TYPE_FREE;\n+\n+ \/\/ Join free nodes if possible.\n+ while (level > 0 && node->buddy->type == Node::TYPE_FREE)\n+ {\n+ RemoveFromFreeList(level, node->buddy);\n+ Node* const parent = node->parent;\n+\n+ m_NodeAllocator.Free(node->buddy);\n+ m_NodeAllocator.Free(node);\n+ parent->type = Node::TYPE_FREE;\n+\n+ node = parent;\n+ --level;\n+ --m_FreeCount;\n+ }\n+\n+ AddToFreeListFront(level, node);\n+}\n+\n+void VmaBlockMetadata_Buddy::AddNodeToDetailedStatistics(VmaDetailedStatistics& inoutStats, const Node* node, VkDeviceSize levelNodeSize) const\n+{\n+ switch (node->type)\n+ {\n+ case Node::TYPE_FREE:\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, levelNodeSize);\n+ break;\n+ case Node::TYPE_ALLOCATION:\n+ VmaAddDetailedStatisticsAllocation(inoutStats, levelNodeSize);\n+ break;\n+ case Node::TYPE_SPLIT:\n+ {\n+ const VkDeviceSize childrenNodeSize = levelNodeSize \/ 2;\n+ const Node* const leftChild = node->split.leftChild;\n+ AddNodeToDetailedStatistics(inoutStats, leftChild, childrenNodeSize);\n+ const Node* const rightChild = leftChild->buddy;\n+ AddNodeToDetailedStatistics(inoutStats, rightChild, childrenNodeSize);\n+ }\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+}\n+\n+void VmaBlockMetadata_Buddy::AddToFreeListFront(uint32_t level, Node* node)\n+{\n+ VMA_ASSERT(node->type == Node::TYPE_FREE);\n+\n+ \/\/ List is empty.\n+ Node* const frontNode = m_FreeList[level].front;\n+ if (frontNode == VMA_NULL)\n+ {\n+ VMA_ASSERT(m_FreeList[level].back == VMA_NULL);\n+ node->free.prev = node->free.next = VMA_NULL;\n+ m_FreeList[level].front = m_FreeList[level].back = node;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(frontNode->free.prev == VMA_NULL);\n+ node->free.prev = VMA_NULL;\n+ node->free.next = frontNode;\n+ frontNode->free.prev = node;\n+ m_FreeList[level].front = node;\n+ }\n+}\n+\n+void VmaBlockMetadata_Buddy::RemoveFromFreeList(uint32_t level, Node* node)\n+{\n+ VMA_ASSERT(m_FreeList[level].front != VMA_NULL);\n+\n+ \/\/ It is at the front.\n+ if (node->free.prev == VMA_NULL)\n+ {\n+ VMA_ASSERT(m_FreeList[level].front == node);\n+ m_FreeList[level].front = node->free.next;\n+ }\n+ else\n+ {\n+ Node* const prevFreeNode = node->free.prev;\n+ VMA_ASSERT(prevFreeNode->free.next == node);\n+ prevFreeNode->free.next = node->free.next;\n+ }\n+\n+ \/\/ It is at the back.\n+ if (node->free.next == VMA_NULL)\n+ {\n+ VMA_ASSERT(m_FreeList[level].back == node);\n+ m_FreeList[level].back = node->free.prev;\n+ }\n+ else\n+ {\n+ Node* const nextFreeNode = node->free.next;\n+ VMA_ASSERT(nextFreeNode->free.prev == node);\n+ nextFreeNode->free.prev = node->free.prev;\n+ }\n+}\n+\n+void VmaBlockMetadata_Buddy::DebugLogAllAllocationNode(Node* node, uint32_t level) const\n+{\n+ switch (node->type)\n+ {\n+ case Node::TYPE_FREE:\n+ break;\n+ case Node::TYPE_ALLOCATION:\n+ DebugLogAllocation(node->offset, LevelToNodeSize(level), node->allocation.userData);\n+ break;\n+ case Node::TYPE_SPLIT:\n+ {\n+ ++level;\n+ DebugLogAllAllocationNode(node->split.leftChild, level);\n+ DebugLogAllAllocationNode(node->split.leftChild->buddy, level);\n+ }\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, const Node* node, VkDeviceSize levelNodeSize) const\n+{\n+ switch (node->type)\n+ {\n+ case Node::TYPE_FREE:\n+ PrintDetailedMap_UnusedRange(json, node->offset, levelNodeSize);\n+ break;\n+ case Node::TYPE_ALLOCATION:\n+ PrintDetailedMap_Allocation(json, node->offset, levelNodeSize, node->allocation.userData);\n+ break;\n+ case Node::TYPE_SPLIT:\n+ {\n+ const VkDeviceSize childrenNodeSize = levelNodeSize \/ 2;\n+ const Node* const leftChild = node->split.leftChild;\n+ PrintDetailedMapNode(json, leftChild, childrenNodeSize);\n+ const Node* const rightChild = leftChild->buddy;\n+ PrintDetailedMapNode(json, rightChild, childrenNodeSize);\n+ }\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+#endif \/\/ _VMA_BLOCK_METADATA_BUDDY_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_METADATA_BUDDY\n+#endif \/\/ #if 0\n+\n+#ifndef _VMA_BLOCK_METADATA_TLSF\n+\/\/ To not search current larger region if first allocation won't succeed and skip to smaller range\n+\/\/ use with VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT as strategy in CreateAllocationRequest().\n+\/\/ When fragmentation and reusal of previous blocks doesn't matter then use with\n+\/\/ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT for fastest alloc time possible.\n+class VmaBlockMetadata_TLSF : public VmaBlockMetadata\n+{\n+ VMA_CLASS_NO_COPY(VmaBlockMetadata_TLSF)\n+public:\n+ VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual);\n+ virtual ~VmaBlockMetadata_TLSF();\n+\n+ size_t GetAllocationCount() const override { return m_AllocCount; }\n+ size_t GetFreeRegionsCount() const override { return m_BlocksFreeCount + 1; }\n+ VkDeviceSize GetSumFreeSize() const override { return m_BlocksFreeSize + m_NullBlock->size; }\n+ bool IsEmpty() const override { return m_NullBlock->offset == 0; }\n+ VkDeviceSize GetAllocationOffset(VmaAllocHandle allocHandle) const override { return ((Block*)allocHandle)->offset; };\n+\n+ void Init(VkDeviceSize size) override;\n+ bool Validate() const override;\n+\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const override;\n+ void AddStatistics(VmaStatistics& inoutStats) const override;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const override;\n+#endif\n+\n+ bool CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest) override;\n+\n+ VkResult CheckCorruption(const void* pBlockData) override;\n+ void Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData) override;\n+\n+ void Free(VmaAllocHandle allocHandle) override;\n+ void GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo) override;\n+ void* GetAllocationUserData(VmaAllocHandle allocHandle) const override;\n+ VmaAllocHandle GetAllocationListBegin() const override;\n+ VmaAllocHandle GetNextAllocation(VmaAllocHandle prevAlloc) const override;\n+ VkDeviceSize GetNextFreeRegionSize(VmaAllocHandle alloc) const override;\n+ void Clear() override;\n+ void SetAllocationUserData(VmaAllocHandle allocHandle, void* userData) override;\n+ void DebugLogAllAllocations() const override;\n+\n+private:\n+ \/\/ According to original paper it should be preferable 4 or 5:\n+ \/\/ M. Masmano, I. Ripoll, A. Crespo, and J. Real \"TLSF: a New Dynamic Memory Allocator for Real-Time Systems\"\n+ \/\/ http:\/\/www.gii.upv.es\/tlsf\/files\/ecrts04_tlsf.pdf\n+ static const uint8_t SECOND_LEVEL_INDEX = 5;\n+ static const uint16_t SMALL_BUFFER_SIZE = 256;\n+ static const uint32_t INITIAL_BLOCK_ALLOC_COUNT = 16;\n+ static const uint8_t MEMORY_CLASS_SHIFT = 7;\n+ static const uint8_t MAX_MEMORY_CLASSES = 65 - MEMORY_CLASS_SHIFT;\n+\n+ class Block\n+ {\n+ public:\n+ VkDeviceSize offset;\n+ VkDeviceSize size;\n+ Block* prevPhysical;\n+ Block* nextPhysical;\n+\n+ void MarkFree() { prevFree = VMA_NULL; }\n+ void MarkTaken() { prevFree = this; }\n+ bool IsFree() const { return prevFree != this; }\n+ void*& UserData() { VMA_HEAVY_ASSERT(!IsFree()); return userData; }\n+ Block*& PrevFree() { return prevFree; }\n+ Block*& NextFree() { VMA_HEAVY_ASSERT(IsFree()); return nextFree; }\n+\n+ private:\n+ Block* prevFree; \/\/ Address of the same block here indicates that block is taken\n+ union\n+ {\n+ Block* nextFree;\n+ void* userData;\n+ };\n+ };\n+\n+ size_t m_AllocCount;\n+ \/\/ Total number of free blocks besides null block\n+ size_t m_BlocksFreeCount;\n+ \/\/ Total size of free blocks excluding null block\n+ VkDeviceSize m_BlocksFreeSize;\n+ uint32_t m_IsFreeBitmap;\n+ uint8_t m_MemoryClasses;\n+ uint32_t m_InnerIsFreeBitmap[MAX_MEMORY_CLASSES];\n+ uint32_t m_ListsCount;\n+ \/*\n+ * 0: 0-3 lists for small buffers\n+ * 1+: 0-(2^SLI-1) lists for normal buffers\n+ *\/\n+ Block** m_FreeList;\n+ VmaPoolAllocator<Block> m_BlockAllocator;\n+ Block* m_NullBlock;\n+ VmaBlockBufferImageGranularity m_GranularityHandler;\n+\n+ uint8_t SizeToMemoryClass(VkDeviceSize size) const;\n+ uint16_t SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const;\n+ uint32_t GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const;\n+ uint32_t GetListIndex(VkDeviceSize size) const;\n+\n+ void RemoveFreeBlock(Block* block);\n+ void InsertFreeBlock(Block* block);\n+ void MergeBlock(Block* block, Block* prev);\n+\n+ Block* FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const;\n+ bool CheckBlock(\n+ Block& block,\n+ uint32_t listIndex,\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ VmaAllocationRequest* pAllocationRequest);\n+};\n+\n+#ifndef _VMA_BLOCK_METADATA_TLSF_FUNCTIONS\n+VmaBlockMetadata_TLSF::VmaBlockMetadata_TLSF(const VkAllocationCallbacks* pAllocationCallbacks,\n+ VkDeviceSize bufferImageGranularity, bool isVirtual)\n+ : VmaBlockMetadata(pAllocationCallbacks, bufferImageGranularity, isVirtual),\n+ m_AllocCount(0),\n+ m_BlocksFreeCount(0),\n+ m_BlocksFreeSize(0),\n+ m_IsFreeBitmap(0),\n+ m_MemoryClasses(0),\n+ m_ListsCount(0),\n+ m_FreeList(VMA_NULL),\n+ m_BlockAllocator(pAllocationCallbacks, INITIAL_BLOCK_ALLOC_COUNT),\n+ m_NullBlock(VMA_NULL),\n+ m_GranularityHandler(bufferImageGranularity) {}\n+\n+VmaBlockMetadata_TLSF::~VmaBlockMetadata_TLSF()\n+{\n+ if (m_FreeList)\n+ vma_delete_array(GetAllocationCallbacks(), m_FreeList, m_ListsCount);\n+ m_GranularityHandler.Destroy(GetAllocationCallbacks());\n+}\n+\n+void VmaBlockMetadata_TLSF::Init(VkDeviceSize size)\n+{\n+ VmaBlockMetadata::Init(size);\n+\n+ if (!IsVirtual())\n+ m_GranularityHandler.Init(GetAllocationCallbacks(), size);\n+\n+ m_NullBlock = m_BlockAllocator.Alloc();\n+ m_NullBlock->size = size;\n+ m_NullBlock->offset = 0;\n+ m_NullBlock->prevPhysical = VMA_NULL;\n+ m_NullBlock->nextPhysical = VMA_NULL;\n+ m_NullBlock->MarkFree();\n+ m_NullBlock->NextFree() = VMA_NULL;\n+ m_NullBlock->PrevFree() = VMA_NULL;\n+ uint8_t memoryClass = SizeToMemoryClass(size);\n+ uint16_t sli = SizeToSecondIndex(size, memoryClass);\n+ m_ListsCount = (memoryClass == 0 ? 0 : (memoryClass - 1) * (1UL << SECOND_LEVEL_INDEX) + sli) + 1;\n+ if (IsVirtual())\n+ m_ListsCount += 1UL << SECOND_LEVEL_INDEX;\n+ else\n+ m_ListsCount += 4;\n+\n+ m_MemoryClasses = memoryClass + 2;\n+ memset(m_InnerIsFreeBitmap, 0, MAX_MEMORY_CLASSES * sizeof(uint32_t));\n+\n+ m_FreeList = vma_new_array(GetAllocationCallbacks(), Block*, m_ListsCount);\n+ memset(m_FreeList, 0, m_ListsCount * sizeof(Block*));\n+}\n+\n+bool VmaBlockMetadata_TLSF::Validate() const\n+{\n+ VMA_VALIDATE(GetSumFreeSize() <= GetSize());\n+\n+ VkDeviceSize calculatedSize = m_NullBlock->size;\n+ VkDeviceSize calculatedFreeSize = m_NullBlock->size;\n+ size_t allocCount = 0;\n+ size_t freeCount = 0;\n+\n+ \/\/ Check integrity of free lists\n+ for (uint32_t list = 0; list < m_ListsCount; ++list)\n+ {\n+ Block* block = m_FreeList[list];\n+ if (block != VMA_NULL)\n+ {\n+ VMA_VALIDATE(block->IsFree());\n+ VMA_VALIDATE(block->PrevFree() == VMA_NULL);\n+ while (block->NextFree())\n+ {\n+ VMA_VALIDATE(block->NextFree()->IsFree());\n+ VMA_VALIDATE(block->NextFree()->PrevFree() == block);\n+ block = block->NextFree();\n+ }\n+ }\n+ }\n+\n+ VkDeviceSize nextOffset = m_NullBlock->offset;\n+ auto validateCtx = m_GranularityHandler.StartValidation(GetAllocationCallbacks(), IsVirtual());\n+\n+ VMA_VALIDATE(m_NullBlock->nextPhysical == VMA_NULL);\n+ if (m_NullBlock->prevPhysical)\n+ {\n+ VMA_VALIDATE(m_NullBlock->prevPhysical->nextPhysical == m_NullBlock);\n+ }\n+ \/\/ Check all blocks\n+ for (Block* prev = m_NullBlock->prevPhysical; prev != VMA_NULL; prev = prev->prevPhysical)\n+ {\n+ VMA_VALIDATE(prev->offset + prev->size == nextOffset);\n+ nextOffset = prev->offset;\n+ calculatedSize += prev->size;\n+\n+ uint32_t listIndex = GetListIndex(prev->size);\n+ if (prev->IsFree())\n+ {\n+ ++freeCount;\n+ \/\/ Check if free block belongs to free list\n+ Block* freeBlock = m_FreeList[listIndex];\n+ VMA_VALIDATE(freeBlock != VMA_NULL);\n+\n+ bool found = false;\n+ do\n+ {\n+ if (freeBlock == prev)\n+ found = true;\n+\n+ freeBlock = freeBlock->NextFree();\n+ } while (!found && freeBlock != VMA_NULL);\n+\n+ VMA_VALIDATE(found);\n+ calculatedFreeSize += prev->size;\n+ }\n+ else\n+ {\n+ ++allocCount;\n+ \/\/ Check if taken block is not on a free list\n+ Block* freeBlock = m_FreeList[listIndex];\n+ while (freeBlock)\n+ {\n+ VMA_VALIDATE(freeBlock != prev);\n+ freeBlock = freeBlock->NextFree();\n+ }\n+\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(m_GranularityHandler.Validate(validateCtx, prev->offset, prev->size));\n+ }\n+ }\n+\n+ if (prev->prevPhysical)\n+ {\n+ VMA_VALIDATE(prev->prevPhysical->nextPhysical == prev);\n+ }\n+ }\n+\n+ if (!IsVirtual())\n+ {\n+ VMA_VALIDATE(m_GranularityHandler.FinishValidation(validateCtx));\n+ }\n+\n+ VMA_VALIDATE(nextOffset == 0);\n+ VMA_VALIDATE(calculatedSize == GetSize());\n+ VMA_VALIDATE(calculatedFreeSize == GetSumFreeSize());\n+ VMA_VALIDATE(allocCount == m_AllocCount);\n+ VMA_VALIDATE(freeCount == m_BlocksFreeCount);\n+\n+ return true;\n+}\n+\n+void VmaBlockMetadata_TLSF::AddDetailedStatistics(VmaDetailedStatistics& inoutStats) const\n+{\n+ inoutStats.statistics.blockCount++;\n+ inoutStats.statistics.blockBytes += GetSize();\n+ if (m_NullBlock->size > 0)\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, m_NullBlock->size);\n+\n+ for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\n+ {\n+ if (block->IsFree())\n+ VmaAddDetailedStatisticsUnusedRange(inoutStats, block->size);\n+ else\n+ VmaAddDetailedStatisticsAllocation(inoutStats, block->size);\n+ }\n+}\n+\n+void VmaBlockMetadata_TLSF::AddStatistics(VmaStatistics& inoutStats) const\n+{\n+ inoutStats.blockCount++;\n+ inoutStats.allocationCount += (uint32_t)m_AllocCount;\n+ inoutStats.blockBytes += GetSize();\n+ inoutStats.allocationBytes += GetSize() - GetSumFreeSize();\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockMetadata_TLSF::PrintDetailedMap(class VmaJsonWriter& json, uint32_t mapRefCount) const\n+{\n+ size_t blockCount = m_AllocCount + m_BlocksFreeCount;\n+ VmaStlAllocator<Block*> allocator(GetAllocationCallbacks());\n+ VmaVector<Block*, VmaStlAllocator<Block*>> blockList(blockCount, allocator);\n+\n+ size_t i = blockCount;\n+ for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\n+ {\n+ blockList[--i] = block;\n+ }\n+ VMA_ASSERT(i == 0);\n+\n+ VmaDetailedStatistics stats;\n+ VmaClearDetailedStatistics(stats);\n+ AddDetailedStatistics(stats);\n+\n+ PrintDetailedMap_Begin(\n+ json,\n+ stats.statistics.blockBytes - stats.statistics.allocationBytes,\n+ stats.statistics.allocationCount,\n+ stats.unusedRangeCount,\n+ mapRefCount);\n+\n+ for (; i < blockCount; ++i)\n+ {\n+ Block* block = blockList[i];\n+ if (block->IsFree())\n+ PrintDetailedMap_UnusedRange(json, block->offset, block->size);\n+ else\n+ PrintDetailedMap_Allocation(json, block->offset, block->size, block->UserData());\n+ }\n+ if (m_NullBlock->size > 0)\n+ PrintDetailedMap_UnusedRange(json, m_NullBlock->offset, m_NullBlock->size);\n+\n+ PrintDetailedMap_End(json);\n+}\n+#endif\n+\n+bool VmaBlockMetadata_TLSF::CreateAllocationRequest(\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ bool upperAddress,\n+ VmaSuballocationType allocType,\n+ uint32_t strategy,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ VMA_ASSERT(allocSize > 0 && \"Cannot allocate empty block!\");\n+ VMA_ASSERT(!upperAddress && \"VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm.\");\n+\n+ \/\/ For small granularity round up\n+ if (!IsVirtual())\n+ m_GranularityHandler.RoundupAllocRequest(allocType, allocSize, allocAlignment);\n+\n+ allocSize += GetDebugMargin();\n+ \/\/ Quick check for too small pool\n+ if (allocSize > GetSumFreeSize())\n+ return false;\n+\n+ \/\/ If no free blocks in pool then check only null block\n+ if (m_BlocksFreeCount == 0)\n+ return CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest);\n+\n+ \/\/ Round up to the next block\n+ VkDeviceSize sizeForNextList = allocSize;\n+ VkDeviceSize smallSizeStep = SMALL_BUFFER_SIZE \/ (IsVirtual() ? 1 << SECOND_LEVEL_INDEX : 4);\n+ if (allocSize > SMALL_BUFFER_SIZE)\n+ {\n+ sizeForNextList += (1ULL << (VMA_BITSCAN_MSB(allocSize) - SECOND_LEVEL_INDEX));\n+ }\n+ else if (allocSize > SMALL_BUFFER_SIZE - smallSizeStep)\n+ sizeForNextList = SMALL_BUFFER_SIZE + 1;\n+ else\n+ sizeForNextList += smallSizeStep;\n+\n+ uint32_t nextListIndex = 0;\n+ uint32_t prevListIndex = 0;\n+ Block* nextListBlock = VMA_NULL;\n+ Block* prevListBlock = VMA_NULL;\n+\n+ \/\/ Check blocks according to strategies\n+ if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT)\n+ {\n+ \/\/ Quick check for larger block first\n+ nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\n+ if (nextListBlock != VMA_NULL && CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+\n+ \/\/ If not fitted then null block\n+ if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+\n+ \/\/ Null block failed, search larger bucket\n+ while (nextListBlock)\n+ {\n+ if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ nextListBlock = nextListBlock->NextFree();\n+ }\n+\n+ \/\/ Failed again, check best fit bucket\n+ prevListBlock = FindFreeBlock(allocSize, prevListIndex);\n+ while (prevListBlock)\n+ {\n+ if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ prevListBlock = prevListBlock->NextFree();\n+ }\n+ }\n+ else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_MEMORY_BIT)\n+ {\n+ \/\/ Check best fit bucket\n+ prevListBlock = FindFreeBlock(allocSize, prevListIndex);\n+ while (prevListBlock)\n+ {\n+ if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ prevListBlock = prevListBlock->NextFree();\n+ }\n+\n+ \/\/ If failed check null block\n+ if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+\n+ \/\/ Check larger bucket\n+ nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\n+ while (nextListBlock)\n+ {\n+ if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ nextListBlock = nextListBlock->NextFree();\n+ }\n+ }\n+ else if (strategy & VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT )\n+ {\n+ \/\/ Perform search from the start\n+ VmaStlAllocator<Block*> allocator(GetAllocationCallbacks());\n+ VmaVector<Block*, VmaStlAllocator<Block*>> blockList(m_BlocksFreeCount, allocator);\n+\n+ size_t i = m_BlocksFreeCount;\n+ for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\n+ {\n+ if (block->IsFree() && block->size >= allocSize)\n+ blockList[--i] = block;\n+ }\n+\n+ for (; i < m_BlocksFreeCount; ++i)\n+ {\n+ Block& block = *blockList[i];\n+ if (CheckBlock(block, GetListIndex(block.size), allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ }\n+\n+ \/\/ If failed check null block\n+ if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+\n+ \/\/ Whole range searched, no more memory\n+ return false;\n+ }\n+ else\n+ {\n+ \/\/ Check larger bucket\n+ nextListBlock = FindFreeBlock(sizeForNextList, nextListIndex);\n+ while (nextListBlock)\n+ {\n+ if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ nextListBlock = nextListBlock->NextFree();\n+ }\n+\n+ \/\/ If failed check null block\n+ if (CheckBlock(*m_NullBlock, m_ListsCount, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+\n+ \/\/ Check best fit bucket\n+ prevListBlock = FindFreeBlock(allocSize, prevListIndex);\n+ while (prevListBlock)\n+ {\n+ if (CheckBlock(*prevListBlock, prevListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ prevListBlock = prevListBlock->NextFree();\n+ }\n+ }\n+\n+ \/\/ Worst case, full search has to be done\n+ while (++nextListIndex < m_ListsCount)\n+ {\n+ nextListBlock = m_FreeList[nextListIndex];\n+ while (nextListBlock)\n+ {\n+ if (CheckBlock(*nextListBlock, nextListIndex, allocSize, allocAlignment, allocType, pAllocationRequest))\n+ return true;\n+ nextListBlock = nextListBlock->NextFree();\n+ }\n+ }\n+\n+ \/\/ No more memory sadly\n+ return false;\n+}\n+\n+VkResult VmaBlockMetadata_TLSF::CheckCorruption(const void* pBlockData)\n+{\n+ for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\n+ {\n+ if (!block->IsFree())\n+ {\n+ if (!VmaValidateMagicValue(pBlockData, block->offset + block->size))\n+ {\n+ VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER VALIDATED ALLOCATION!\");\n+ return VK_ERROR_UNKNOWN_COPY;\n+ }\n+ }\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+void VmaBlockMetadata_TLSF::Alloc(\n+ const VmaAllocationRequest& request,\n+ VmaSuballocationType type,\n+ void* userData)\n+{\n+ VMA_ASSERT(request.type == VmaAllocationRequestType::TLSF);\n+\n+ \/\/ Get block and pop it from the free list\n+ Block* currentBlock = (Block*)request.allocHandle;\n+ VkDeviceSize offset = request.algorithmData;\n+ VMA_ASSERT(currentBlock != VMA_NULL);\n+ VMA_ASSERT(currentBlock->offset <= offset);\n+\n+ if (currentBlock != m_NullBlock)\n+ RemoveFreeBlock(currentBlock);\n+\n+ VkDeviceSize debugMargin = GetDebugMargin();\n+ VkDeviceSize misssingAlignment = offset - currentBlock->offset;\n+\n+ \/\/ Append missing alignment to prev block or create new one\n+ if (misssingAlignment)\n+ {\n+ Block* prevBlock = currentBlock->prevPhysical;\n+ VMA_ASSERT(prevBlock != VMA_NULL && \"There should be no missing alignment at offset 0!\");\n+\n+ if (prevBlock->IsFree() && prevBlock->size != debugMargin)\n+ {\n+ uint32_t oldList = GetListIndex(prevBlock->size);\n+ prevBlock->size += misssingAlignment;\n+ \/\/ Check if new size crosses list bucket\n+ if (oldList != GetListIndex(prevBlock->size))\n+ {\n+ prevBlock->size -= misssingAlignment;\n+ RemoveFreeBlock(prevBlock);\n+ prevBlock->size += misssingAlignment;\n+ InsertFreeBlock(prevBlock);\n+ }\n+ else\n+ m_BlocksFreeSize += misssingAlignment;\n+ }\n+ else\n+ {\n+ Block* newBlock = m_BlockAllocator.Alloc();\n+ currentBlock->prevPhysical = newBlock;\n+ prevBlock->nextPhysical = newBlock;\n+ newBlock->prevPhysical = prevBlock;\n+ newBlock->nextPhysical = currentBlock;\n+ newBlock->size = misssingAlignment;\n+ newBlock->offset = currentBlock->offset;\n+ newBlock->MarkTaken();\n+\n+ InsertFreeBlock(newBlock);\n+ }\n+\n+ currentBlock->size -= misssingAlignment;\n+ currentBlock->offset += misssingAlignment;\n+ }\n+\n+ VkDeviceSize size = request.size + debugMargin;\n+ if (currentBlock->size == size)\n+ {\n+ if (currentBlock == m_NullBlock)\n+ {\n+ \/\/ Setup new null block\n+ m_NullBlock = m_BlockAllocator.Alloc();\n+ m_NullBlock->size = 0;\n+ m_NullBlock->offset = currentBlock->offset + size;\n+ m_NullBlock->prevPhysical = currentBlock;\n+ m_NullBlock->nextPhysical = VMA_NULL;\n+ m_NullBlock->MarkFree();\n+ m_NullBlock->PrevFree() = VMA_NULL;\n+ m_NullBlock->NextFree() = VMA_NULL;\n+ currentBlock->nextPhysical = m_NullBlock;\n+ currentBlock->MarkTaken();\n+ }\n+ }\n+ else\n+ {\n+ VMA_ASSERT(currentBlock->size > size && \"Proper block already found, shouldn't find smaller one!\");\n+\n+ \/\/ Create new free block\n+ Block* newBlock = m_BlockAllocator.Alloc();\n+ newBlock->size = currentBlock->size - size;\n+ newBlock->offset = currentBlock->offset + size;\n+ newBlock->prevPhysical = currentBlock;\n+ newBlock->nextPhysical = currentBlock->nextPhysical;\n+ currentBlock->nextPhysical = newBlock;\n+ currentBlock->size = size;\n+\n+ if (currentBlock == m_NullBlock)\n+ {\n+ m_NullBlock = newBlock;\n+ m_NullBlock->MarkFree();\n+ m_NullBlock->NextFree() = VMA_NULL;\n+ m_NullBlock->PrevFree() = VMA_NULL;\n+ currentBlock->MarkTaken();\n+ }\n+ else\n+ {\n+ newBlock->nextPhysical->prevPhysical = newBlock;\n+ newBlock->MarkTaken();\n+ InsertFreeBlock(newBlock);\n+ }\n+ }\n+ currentBlock->UserData() = userData;\n+\n+ if (debugMargin > 0)\n+ {\n+ currentBlock->size -= debugMargin;\n+ Block* newBlock = m_BlockAllocator.Alloc();\n+ newBlock->size = debugMargin;\n+ newBlock->offset = currentBlock->offset + currentBlock->size;\n+ newBlock->prevPhysical = currentBlock;\n+ newBlock->nextPhysical = currentBlock->nextPhysical;\n+ newBlock->MarkTaken();\n+ currentBlock->nextPhysical->prevPhysical = newBlock;\n+ currentBlock->nextPhysical = newBlock;\n+ InsertFreeBlock(newBlock);\n+ }\n+\n+ if (!IsVirtual())\n+ m_GranularityHandler.AllocPages((uint8_t)(uintptr_t)request.customData,\n+ currentBlock->offset, currentBlock->size);\n+ ++m_AllocCount;\n+}\n+\n+void VmaBlockMetadata_TLSF::Free(VmaAllocHandle allocHandle)\n+{\n+ Block* block = (Block*)allocHandle;\n+ Block* next = block->nextPhysical;\n+ VMA_ASSERT(!block->IsFree() && \"Block is already free!\");\n+\n+ if (!IsVirtual())\n+ m_GranularityHandler.FreePages(block->offset, block->size);\n+ --m_AllocCount;\n+\n+ VkDeviceSize debugMargin = GetDebugMargin();\n+ if (debugMargin > 0)\n+ {\n+ RemoveFreeBlock(next);\n+ MergeBlock(next, block);\n+ block = next;\n+ next = next->nextPhysical;\n+ }\n+\n+ \/\/ Try merging\n+ Block* prev = block->prevPhysical;\n+ if (prev != VMA_NULL && prev->IsFree() && prev->size != debugMargin)\n+ {\n+ RemoveFreeBlock(prev);\n+ MergeBlock(block, prev);\n+ }\n+\n+ if (!next->IsFree())\n+ InsertFreeBlock(block);\n+ else if (next == m_NullBlock)\n+ MergeBlock(m_NullBlock, block);\n+ else\n+ {\n+ RemoveFreeBlock(next);\n+ MergeBlock(next, block);\n+ InsertFreeBlock(next);\n+ }\n+}\n+\n+void VmaBlockMetadata_TLSF::GetAllocationInfo(VmaAllocHandle allocHandle, VmaVirtualAllocationInfo& outInfo)\n+{\n+ Block* block = (Block*)allocHandle;\n+ VMA_ASSERT(!block->IsFree() && \"Cannot get allocation info for free block!\");\n+ outInfo.offset = block->offset;\n+ outInfo.size = block->size;\n+ outInfo.pUserData = block->UserData();\n+}\n+\n+void* VmaBlockMetadata_TLSF::GetAllocationUserData(VmaAllocHandle allocHandle) const\n+{\n+ Block* block = (Block*)allocHandle;\n+ VMA_ASSERT(!block->IsFree() && \"Cannot get user data for free block!\");\n+ return block->UserData();\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_TLSF::GetAllocationListBegin() const\n+{\n+ if (m_AllocCount == 0)\n+ return VK_NULL_HANDLE;\n+\n+ for (Block* block = m_NullBlock->prevPhysical; block; block = block->prevPhysical)\n+ {\n+ if (!block->IsFree())\n+ return (VmaAllocHandle)block;\n+ }\n+ VMA_ASSERT(false && \"If m_AllocCount > 0 then should find any allocation!\");\n+ return VK_NULL_HANDLE;\n+}\n+\n+VmaAllocHandle VmaBlockMetadata_TLSF::GetNextAllocation(VmaAllocHandle prevAlloc) const\n+{\n+ Block* startBlock = (Block*)prevAlloc;\n+ VMA_ASSERT(!startBlock->IsFree() && \"Incorrect block!\");\n+\n+ for (Block* block = startBlock->prevPhysical; block; block = block->prevPhysical)\n+ {\n+ if (!block->IsFree())\n+ return (VmaAllocHandle)block;\n+ }\n+ return VK_NULL_HANDLE;\n+}\n+\n+VkDeviceSize VmaBlockMetadata_TLSF::GetNextFreeRegionSize(VmaAllocHandle alloc) const\n+{\n+ Block* block = (Block*)alloc;\n+ VMA_ASSERT(!block->IsFree() && \"Incorrect block!\");\n+\n+ if (block->prevPhysical)\n+ return block->prevPhysical->IsFree() ? block->prevPhysical->size : 0;\n+ return 0;\n+}\n+\n+void VmaBlockMetadata_TLSF::Clear()\n+{\n+ m_AllocCount = 0;\n+ m_BlocksFreeCount = 0;\n+ m_BlocksFreeSize = 0;\n+ m_IsFreeBitmap = 0;\n+ m_NullBlock->offset = 0;\n+ m_NullBlock->size = GetSize();\n+ Block* block = m_NullBlock->prevPhysical;\n+ m_NullBlock->prevPhysical = VMA_NULL;\n+ while (block)\n+ {\n+ Block* prev = block->prevPhysical;\n+ m_BlockAllocator.Free(block);\n+ block = prev;\n+ }\n+ memset(m_FreeList, 0, m_ListsCount * sizeof(Block*));\n+ memset(m_InnerIsFreeBitmap, 0, m_MemoryClasses * sizeof(uint32_t));\n+ m_GranularityHandler.Clear();\n+}\n+\n+void VmaBlockMetadata_TLSF::SetAllocationUserData(VmaAllocHandle allocHandle, void* userData)\n+{\n+ Block* block = (Block*)allocHandle;\n+ VMA_ASSERT(!block->IsFree() && \"Trying to set user data for not allocated block!\");\n+ block->UserData() = userData;\n+}\n+\n+void VmaBlockMetadata_TLSF::DebugLogAllAllocations() const\n+{\n+ for (Block* block = m_NullBlock->prevPhysical; block != VMA_NULL; block = block->prevPhysical)\n+ if (!block->IsFree())\n+ DebugLogAllocation(block->offset, block->size, block->UserData());\n+}\n+\n+uint8_t VmaBlockMetadata_TLSF::SizeToMemoryClass(VkDeviceSize size) const\n+{\n+ if (size > SMALL_BUFFER_SIZE)\n+ return VMA_BITSCAN_MSB(size) - MEMORY_CLASS_SHIFT;\n+ return 0;\n+}\n+\n+uint16_t VmaBlockMetadata_TLSF::SizeToSecondIndex(VkDeviceSize size, uint8_t memoryClass) const\n+{\n+ if (memoryClass == 0)\n+ {\n+ if (IsVirtual())\n+ return static_cast<uint16_t>((size - 1) \/ 8);\n+ else\n+ return static_cast<uint16_t>((size - 1) \/ 64);\n+ }\n+ return static_cast<uint16_t>((size >> (memoryClass + MEMORY_CLASS_SHIFT - SECOND_LEVEL_INDEX)) ^ (1U << SECOND_LEVEL_INDEX));\n+}\n+\n+uint32_t VmaBlockMetadata_TLSF::GetListIndex(uint8_t memoryClass, uint16_t secondIndex) const\n+{\n+ if (memoryClass == 0)\n+ return secondIndex;\n+\n+ const uint32_t index = static_cast<uint32_t>(memoryClass - 1) * (1 << SECOND_LEVEL_INDEX) + secondIndex;\n+ if (IsVirtual())\n+ return index + (1 << SECOND_LEVEL_INDEX);\n+ else\n+ return index + 4;\n+}\n+\n+uint32_t VmaBlockMetadata_TLSF::GetListIndex(VkDeviceSize size) const\n+{\n+ uint8_t memoryClass = SizeToMemoryClass(size);\n+ return GetListIndex(memoryClass, SizeToSecondIndex(size, memoryClass));\n+}\n+\n+void VmaBlockMetadata_TLSF::RemoveFreeBlock(Block* block)\n+{\n+ VMA_ASSERT(block != m_NullBlock);\n+ VMA_ASSERT(block->IsFree());\n+\n+ if (block->NextFree() != VMA_NULL)\n+ block->NextFree()->PrevFree() = block->PrevFree();\n+ if (block->PrevFree() != VMA_NULL)\n+ block->PrevFree()->NextFree() = block->NextFree();\n+ else\n+ {\n+ uint8_t memClass = SizeToMemoryClass(block->size);\n+ uint16_t secondIndex = SizeToSecondIndex(block->size, memClass);\n+ uint32_t index = GetListIndex(memClass, secondIndex);\n+ VMA_ASSERT(m_FreeList[index] == block);\n+ m_FreeList[index] = block->NextFree();\n+ if (block->NextFree() == VMA_NULL)\n+ {\n+ m_InnerIsFreeBitmap[memClass] &= ~(1U << secondIndex);\n+ if (m_InnerIsFreeBitmap[memClass] == 0)\n+ m_IsFreeBitmap &= ~(1UL << memClass);\n+ }\n+ }\n+ block->MarkTaken();\n+ block->UserData() = VMA_NULL;\n+ --m_BlocksFreeCount;\n+ m_BlocksFreeSize -= block->size;\n+}\n+\n+void VmaBlockMetadata_TLSF::InsertFreeBlock(Block* block)\n+{\n+ VMA_ASSERT(block != m_NullBlock);\n+ VMA_ASSERT(!block->IsFree() && \"Cannot insert block twice!\");\n+\n+ uint8_t memClass = SizeToMemoryClass(block->size);\n+ uint16_t secondIndex = SizeToSecondIndex(block->size, memClass);\n+ uint32_t index = GetListIndex(memClass, secondIndex);\n+ VMA_ASSERT(index < m_ListsCount);\n+ block->PrevFree() = VMA_NULL;\n+ block->NextFree() = m_FreeList[index];\n+ m_FreeList[index] = block;\n+ if (block->NextFree() != VMA_NULL)\n+ block->NextFree()->PrevFree() = block;\n+ else\n+ {\n+ m_InnerIsFreeBitmap[memClass] |= 1U << secondIndex;\n+ m_IsFreeBitmap |= 1UL << memClass;\n+ }\n+ ++m_BlocksFreeCount;\n+ m_BlocksFreeSize += block->size;\n+}\n+\n+void VmaBlockMetadata_TLSF::MergeBlock(Block* block, Block* prev)\n+{\n+ VMA_ASSERT(block->prevPhysical == prev && \"Cannot merge seperate physical regions!\");\n+ VMA_ASSERT(!prev->IsFree() && \"Cannot merge block that belongs to free list!\");\n+\n+ block->offset = prev->offset;\n+ block->size += prev->size;\n+ block->prevPhysical = prev->prevPhysical;\n+ if (block->prevPhysical)\n+ block->prevPhysical->nextPhysical = block;\n+ m_BlockAllocator.Free(prev);\n+}\n+\n+VmaBlockMetadata_TLSF::Block* VmaBlockMetadata_TLSF::FindFreeBlock(VkDeviceSize size, uint32_t& listIndex) const\n+{\n+ uint8_t memoryClass = SizeToMemoryClass(size);\n+ uint32_t innerFreeMap = m_InnerIsFreeBitmap[memoryClass] & (~0U << SizeToSecondIndex(size, memoryClass));\n+ if (!innerFreeMap)\n+ {\n+ \/\/ Check higher levels for avaiable blocks\n+ uint32_t freeMap = m_IsFreeBitmap & (~0UL << (memoryClass + 1));\n+ if (!freeMap)\n+ return VMA_NULL; \/\/ No more memory avaible\n+\n+ \/\/ Find lowest free region\n+ memoryClass = VMA_BITSCAN_LSB(freeMap);\n+ innerFreeMap = m_InnerIsFreeBitmap[memoryClass];\n+ VMA_ASSERT(innerFreeMap != 0);\n+ }\n+ \/\/ Find lowest free subregion\n+ listIndex = GetListIndex(memoryClass, VMA_BITSCAN_LSB(innerFreeMap));\n+ VMA_ASSERT(m_FreeList[listIndex]);\n+ return m_FreeList[listIndex];\n+}\n+\n+bool VmaBlockMetadata_TLSF::CheckBlock(\n+ Block& block,\n+ uint32_t listIndex,\n+ VkDeviceSize allocSize,\n+ VkDeviceSize allocAlignment,\n+ VmaSuballocationType allocType,\n+ VmaAllocationRequest* pAllocationRequest)\n+{\n+ VMA_ASSERT(block.IsFree() && \"Block is already taken!\");\n+\n+ VkDeviceSize alignedOffset = VmaAlignUp(block.offset, allocAlignment);\n+ if (block.size < allocSize + alignedOffset - block.offset)\n+ return false;\n+\n+ \/\/ Check for granularity conflicts\n+ if (!IsVirtual() &&\n+ m_GranularityHandler.CheckConflictAndAlignUp(alignedOffset, allocSize, block.offset, block.size, allocType))\n+ return false;\n+\n+ \/\/ Alloc successful\n+ pAllocationRequest->type = VmaAllocationRequestType::TLSF;\n+ pAllocationRequest->allocHandle = (VmaAllocHandle)█\n+ pAllocationRequest->size = allocSize - GetDebugMargin();\n+ pAllocationRequest->customData = (void*)allocType;\n+ pAllocationRequest->algorithmData = alignedOffset;\n+\n+ \/\/ Place block at the start of list if it's normal block\n+ if (listIndex != m_ListsCount && block.PrevFree())\n+ {\n+ block.PrevFree()->NextFree() = block.NextFree();\n+ if (block.NextFree())\n+ block.NextFree()->PrevFree() = block.PrevFree();\n+ block.PrevFree() = VMA_NULL;\n+ block.NextFree() = m_FreeList[listIndex];\n+ m_FreeList[listIndex] = █\n+ if (block.NextFree())\n+ block.NextFree()->PrevFree() = █\n+ }\n+\n+ return true;\n+}\n+#endif \/\/ _VMA_BLOCK_METADATA_TLSF_FUNCTIONS\n+#endif \/\/ _VMA_BLOCK_METADATA_TLSF\n+\n+#ifndef _VMA_BLOCK_VECTOR\n+\/*\n+Sequence of VmaDeviceMemoryBlock. Represents memory blocks allocated for a specific\n+Vulkan memory type.\n+\n+Synchronized internally with a mutex.\n+*\/\n+class VmaBlockVector\n+{\n+ friend struct VmaDefragmentationContext_T;\n+ VMA_CLASS_NO_COPY(VmaBlockVector)\n+public:\n+ VmaBlockVector(\n+ VmaAllocator hAllocator,\n+ VmaPool hParentPool,\n+ uint32_t memoryTypeIndex,\n+ VkDeviceSize preferredBlockSize,\n+ size_t minBlockCount,\n+ size_t maxBlockCount,\n+ VkDeviceSize bufferImageGranularity,\n+ bool explicitBlockSize,\n+ uint32_t algorithm,\n+ float priority,\n+ VkDeviceSize minAllocationAlignment,\n+ void* pMemoryAllocateNext);\n+ ~VmaBlockVector();\n+\n+ VmaAllocator GetAllocator() const { return m_hAllocator; }\n+ VmaPool GetParentPool() const { return m_hParentPool; }\n+ bool IsCustomPool() const { return m_hParentPool != VMA_NULL; }\n+ uint32_t GetMemoryTypeIndex() const { return m_MemoryTypeIndex; }\n+ VkDeviceSize GetPreferredBlockSize() const { return m_PreferredBlockSize; }\n+ VkDeviceSize GetBufferImageGranularity() const { return m_BufferImageGranularity; }\n+ uint32_t GetAlgorithm() const { return m_Algorithm; }\n+ bool HasExplicitBlockSize() const { return m_ExplicitBlockSize; }\n+ float GetPriority() const { return m_Priority; }\n+ void* const GetAllocationNextPtr() const { return m_pMemoryAllocateNext; }\n+ \/\/ To be used only while the m_Mutex is locked. Used during defragmentation.\n+ size_t GetBlockCount() const { return m_Blocks.size(); }\n+ \/\/ To be used only while the m_Mutex is locked. Used during defragmentation.\n+ VmaDeviceMemoryBlock* GetBlock(size_t index) const { return m_Blocks[index]; }\n+ VMA_RW_MUTEX &GetMutex() { return m_Mutex; }\n+\n+ VkResult CreateMinBlocks();\n+ void AddStatistics(VmaStatistics& inoutStats);\n+ void AddDetailedStatistics(VmaDetailedStatistics& inoutStats);\n+ bool IsEmpty();\n+ bool IsCorruptionDetectionEnabled() const;\n+\n+ VkResult Allocate(\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations);\n+\n+ void Free(const VmaAllocation hAllocation, bool incrementalSort = true);\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json);\n+#endif\n+\n+ VkResult CheckCorruption();\n+\n+private:\n+ const VmaAllocator m_hAllocator;\n+ const VmaPool m_hParentPool;\n+ const uint32_t m_MemoryTypeIndex;\n+ const VkDeviceSize m_PreferredBlockSize;\n+ const size_t m_MinBlockCount;\n+ const size_t m_MaxBlockCount;\n+ const VkDeviceSize m_BufferImageGranularity;\n+ const bool m_ExplicitBlockSize;\n+ const uint32_t m_Algorithm;\n+ const float m_Priority;\n+ const VkDeviceSize m_MinAllocationAlignment;\n+\n+ void* const m_pMemoryAllocateNext;\n+ VMA_RW_MUTEX m_Mutex;\n+ \/\/ Incrementally sorted by sumFreeSize, ascending.\n+ VmaVector<VmaDeviceMemoryBlock*, VmaStlAllocator<VmaDeviceMemoryBlock*>> m_Blocks;\n+ uint32_t m_NextBlockId;\n+\n+ VkDeviceSize CalcMaxBlockSize() const;\n+ \/\/ Finds and removes given block from vector.\n+ void Remove(VmaDeviceMemoryBlock* pBlock);\n+ \/\/ Performs single step in sorting m_Blocks. They may not be fully sorted\n+ \/\/ after this call.\n+ void IncrementallySortBlocks();\n+ void SortByFreeSize();\n+\n+ VkResult AllocatePage(\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ VmaAllocation* pAllocation);\n+\n+ VkResult AllocateFromBlock(\n+ VmaDeviceMemoryBlock* pBlock,\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ VmaAllocationCreateFlags allocFlags,\n+ void* pUserData,\n+ VmaSuballocationType suballocType,\n+ uint32_t strategy,\n+ VmaAllocation* pAllocation);\n+\n+ VkResult CommitAllocationRequest(\n+ VmaAllocationRequest& allocRequest,\n+ VmaDeviceMemoryBlock* pBlock,\n+ VkDeviceSize alignment,\n+ VmaAllocationCreateFlags allocFlags,\n+ void* pUserData,\n+ VmaSuballocationType suballocType,\n+ VmaAllocation* pAllocation);\n+\n+ VkResult CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex);\n+ bool HasEmptyBlock();\n+};\n+#endif \/\/ _VMA_BLOCK_VECTOR\n+\n+#ifndef _VMA_DEFRAGMENTATION_CONTEXT\n+struct VmaDefragmentationContext_T\n+{\n+ VMA_CLASS_NO_COPY(VmaDefragmentationContext_T)\n+public:\n+ VmaDefragmentationContext_T(\n+ VmaAllocator hAllocator,\n+ const VmaDefragmentationInfo& info);\n+ ~VmaDefragmentationContext_T();\n+\n+ void GetStats(VmaDefragmentationStats& outStats) { outStats = m_GlobalStats; }\n+\n+ VkResult DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo);\n+ VkResult DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo);\n+\n+private:\n+ \/\/ Max number of allocations to ignore due to size constraints before ending single pass\n+ static const uint8_t MAX_ALLOCS_TO_IGNORE = 16;\n+ enum class CounterStatus { Pass, Ignore, End };\n+\n+ struct FragmentedBlock\n+ {\n+ uint32_t data;\n+ VmaDeviceMemoryBlock* block;\n+ };\n+ struct StateBalanced\n+ {\n+ VkDeviceSize avgFreeSize = 0;\n+ VkDeviceSize avgAllocSize = UINT64_MAX;\n+ };\n+ struct StateExtensive\n+ {\n+ enum class Operation : uint8_t\n+ {\n+ FindFreeBlockBuffer, FindFreeBlockTexture, FindFreeBlockAll,\n+ MoveBuffers, MoveTextures, MoveAll,\n+ Cleanup, Done\n+ };\n+\n+ Operation operation = Operation::FindFreeBlockTexture;\n+ size_t firstFreeBlock = SIZE_MAX;\n+ };\n+ struct MoveAllocationData\n+ {\n+ VkDeviceSize size;\n+ VkDeviceSize alignment;\n+ VmaSuballocationType type;\n+ VmaAllocationCreateFlags flags;\n+ VmaDefragmentationMove move = {};\n+ };\n+\n+ const VkDeviceSize m_MaxPassBytes;\n+ const uint32_t m_MaxPassAllocations;\n+\n+ VmaStlAllocator<VmaDefragmentationMove> m_MoveAllocator;\n+ VmaVector<VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove>> m_Moves;\n+\n+ uint8_t m_IgnoredAllocs = 0;\n+ uint32_t m_Algorithm;\n+ uint32_t m_BlockVectorCount;\n+ VmaBlockVector* m_PoolBlockVector;\n+ VmaBlockVector** m_pBlockVectors;\n+ size_t m_ImmovableBlockCount = 0;\n+ VmaDefragmentationStats m_GlobalStats = { 0 };\n+ VmaDefragmentationStats m_PassStats = { 0 };\n+ void* m_AlgorithmState = VMA_NULL;\n+\n+ static MoveAllocationData GetMoveData(VmaAllocHandle handle, VmaBlockMetadata* metadata);\n+ CounterStatus CheckCounters(VkDeviceSize bytes);\n+ bool IncrementCounters(VkDeviceSize bytes);\n+ bool ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block);\n+ bool AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector);\n+\n+ bool ComputeDefragmentation(VmaBlockVector& vector, size_t index);\n+ bool ComputeDefragmentation_Fast(VmaBlockVector& vector);\n+ bool ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update);\n+ bool ComputeDefragmentation_Full(VmaBlockVector& vector);\n+ bool ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index);\n+\n+ void UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state);\n+ bool MoveDataToFreeBlocks(VmaSuballocationType currentType,\n+ VmaBlockVector& vector, size_t firstFreeBlock,\n+ bool& texturePresent, bool& bufferPresent, bool& otherPresent);\n+};\n+#endif \/\/ _VMA_DEFRAGMENTATION_CONTEXT\n+\n+#ifndef _VMA_POOL_T\n+struct VmaPool_T\n+{\n+ friend struct VmaPoolListItemTraits;\n+ VMA_CLASS_NO_COPY(VmaPool_T)\n+public:\n+ VmaBlockVector m_BlockVector;\n+ VmaDedicatedAllocationList m_DedicatedAllocations;\n+\n+ VmaPool_T(\n+ VmaAllocator hAllocator,\n+ const VmaPoolCreateInfo& createInfo,\n+ VkDeviceSize preferredBlockSize);\n+ ~VmaPool_T();\n+\n+ uint32_t GetId() const { return m_Id; }\n+ void SetId(uint32_t id) { VMA_ASSERT(m_Id == 0); m_Id = id; }\n+\n+ const char* GetName() const { return m_Name; }\n+ void SetName(const char* pName);\n+\n+#if VMA_STATS_STRING_ENABLED\n+ \/\/void PrintDetailedMap(class VmaStringBuilder& sb);\n+#endif\n+\n+private:\n+ uint32_t m_Id;\n+ char* m_Name;\n+ VmaPool_T* m_PrevPool = VMA_NULL;\n+ VmaPool_T* m_NextPool = VMA_NULL;\n+};\n+\n+struct VmaPoolListItemTraits\n+{\n+ typedef VmaPool_T ItemType;\n+\n+ static ItemType* GetPrev(const ItemType* item) { return item->m_PrevPool; }\n+ static ItemType* GetNext(const ItemType* item) { return item->m_NextPool; }\n+ static ItemType*& AccessPrev(ItemType* item) { return item->m_PrevPool; }\n+ static ItemType*& AccessNext(ItemType* item) { return item->m_NextPool; }\n+};\n+#endif \/\/ _VMA_POOL_T\n+\n+#ifndef _VMA_CURRENT_BUDGET_DATA\n+struct VmaCurrentBudgetData\n+{\n+ VMA_ATOMIC_UINT32 m_BlockCount[VK_MAX_MEMORY_HEAPS];\n+ VMA_ATOMIC_UINT32 m_AllocationCount[VK_MAX_MEMORY_HEAPS];\n+ VMA_ATOMIC_UINT64 m_BlockBytes[VK_MAX_MEMORY_HEAPS];\n+ VMA_ATOMIC_UINT64 m_AllocationBytes[VK_MAX_MEMORY_HEAPS];\n+\n+#if VMA_MEMORY_BUDGET\n+ VMA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch;\n+ VMA_RW_MUTEX m_BudgetMutex;\n+ uint64_t m_VulkanUsage[VK_MAX_MEMORY_HEAPS];\n+ uint64_t m_VulkanBudget[VK_MAX_MEMORY_HEAPS];\n+ uint64_t m_BlockBytesAtBudgetFetch[VK_MAX_MEMORY_HEAPS];\n+#endif \/\/ VMA_MEMORY_BUDGET\n+\n+ VmaCurrentBudgetData();\n+\n+ void AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize);\n+ void RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize);\n+};\n+\n+#ifndef _VMA_CURRENT_BUDGET_DATA_FUNCTIONS\n+VmaCurrentBudgetData::VmaCurrentBudgetData()\n+{\n+ for (uint32_t heapIndex = 0; heapIndex < VK_MAX_MEMORY_HEAPS; ++heapIndex)\n+ {\n+ m_BlockCount[heapIndex] = 0;\n+ m_AllocationCount[heapIndex] = 0;\n+ m_BlockBytes[heapIndex] = 0;\n+ m_AllocationBytes[heapIndex] = 0;\n+#if VMA_MEMORY_BUDGET\n+ m_VulkanUsage[heapIndex] = 0;\n+ m_VulkanBudget[heapIndex] = 0;\n+ m_BlockBytesAtBudgetFetch[heapIndex] = 0;\n+#endif\n+ }\n+\n+#if VMA_MEMORY_BUDGET\n+ m_OperationsSinceBudgetFetch = 0;\n+#endif\n+}\n+\n+void VmaCurrentBudgetData::AddAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)\n+{\n+ m_AllocationBytes[heapIndex] += allocationSize;\n+ ++m_AllocationCount[heapIndex];\n+#if VMA_MEMORY_BUDGET\n+ ++m_OperationsSinceBudgetFetch;\n+#endif\n+}\n+\n+void VmaCurrentBudgetData::RemoveAllocation(uint32_t heapIndex, VkDeviceSize allocationSize)\n+{\n+ VMA_ASSERT(m_AllocationBytes[heapIndex] >= allocationSize);\n+ m_AllocationBytes[heapIndex] -= allocationSize;\n+ VMA_ASSERT(m_AllocationCount[heapIndex] > 0);\n+ --m_AllocationCount[heapIndex];\n+#if VMA_MEMORY_BUDGET\n+ ++m_OperationsSinceBudgetFetch;\n+#endif\n+}\n+#endif \/\/ _VMA_CURRENT_BUDGET_DATA_FUNCTIONS\n+#endif \/\/ _VMA_CURRENT_BUDGET_DATA\n+\n+#ifndef _VMA_ALLOCATION_OBJECT_ALLOCATOR\n+\/*\n+Thread-safe wrapper over VmaPoolAllocator free list, for allocation of VmaAllocation_T objects.\n+*\/\n+class VmaAllocationObjectAllocator\n+{\n+ VMA_CLASS_NO_COPY(VmaAllocationObjectAllocator)\n+public:\n+ VmaAllocationObjectAllocator(const VkAllocationCallbacks* pAllocationCallbacks)\n+ : m_Allocator(pAllocationCallbacks, 1024) {}\n+\n+ template<typename... Types> VmaAllocation Allocate(Types&&... args);\n+ void Free(VmaAllocation hAlloc);\n+\n+private:\n+ VMA_MUTEX m_Mutex;\n+ VmaPoolAllocator<VmaAllocation_T> m_Allocator;\n+};\n+\n+template<typename... Types>\n+VmaAllocation VmaAllocationObjectAllocator::Allocate(Types&&... args)\n+{\n+ VmaMutexLock mutexLock(m_Mutex);\n+ return m_Allocator.Alloc<Types...>(std::forward<Types>(args)...);\n+}\n+\n+void VmaAllocationObjectAllocator::Free(VmaAllocation hAlloc)\n+{\n+ VmaMutexLock mutexLock(m_Mutex);\n+ m_Allocator.Free(hAlloc);\n+}\n+#endif \/\/ _VMA_ALLOCATION_OBJECT_ALLOCATOR\n+\n+#ifndef _VMA_VIRTUAL_BLOCK_T\n+struct VmaVirtualBlock_T\n+{\n+ VMA_CLASS_NO_COPY(VmaVirtualBlock_T)\n+public:\n+ const bool m_AllocationCallbacksSpecified;\n+ const VkAllocationCallbacks m_AllocationCallbacks;\n+\n+ VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo);\n+ ~VmaVirtualBlock_T();\n+\n+ VkResult Init() { return VK_SUCCESS; }\n+ bool IsEmpty() const { return m_Metadata->IsEmpty(); }\n+ void Free(VmaVirtualAllocation allocation) { m_Metadata->Free((VmaAllocHandle)allocation); }\n+ void SetAllocationUserData(VmaVirtualAllocation allocation, void* userData) { m_Metadata->SetAllocationUserData((VmaAllocHandle)allocation, userData); }\n+ void Clear() { m_Metadata->Clear(); }\n+\n+ const VkAllocationCallbacks* GetAllocationCallbacks() const;\n+ void GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo);\n+ VkResult Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation,\n+ VkDeviceSize* outOffset);\n+ void GetStatistics(VmaStatistics& outStats) const;\n+ void CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const;\n+#if VMA_STATS_STRING_ENABLED\n+ void BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const;\n+#endif\n+\n+private:\n+ VmaBlockMetadata* m_Metadata;\n+};\n+\n+#ifndef _VMA_VIRTUAL_BLOCK_T_FUNCTIONS\n+VmaVirtualBlock_T::VmaVirtualBlock_T(const VmaVirtualBlockCreateInfo& createInfo)\n+ : m_AllocationCallbacksSpecified(createInfo.pAllocationCallbacks != VMA_NULL),\n+ m_AllocationCallbacks(createInfo.pAllocationCallbacks != VMA_NULL ? *createInfo.pAllocationCallbacks : VmaEmptyAllocationCallbacks)\n+{\n+ const uint32_t algorithm = createInfo.flags & VMA_VIRTUAL_BLOCK_CREATE_ALGORITHM_MASK;\n+ switch (algorithm)\n+ {\n+ default:\n+ VMA_ASSERT(0);\n+ case 0:\n+ m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_TLSF)(VK_NULL_HANDLE, 1, true);\n+ break;\n+ case VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT:\n+ m_Metadata = vma_new(GetAllocationCallbacks(), VmaBlockMetadata_Linear)(VK_NULL_HANDLE, 1, true);\n+ break;\n+ }\n+\n+ m_Metadata->Init(createInfo.size);\n+}\n+\n+VmaVirtualBlock_T::~VmaVirtualBlock_T()\n+{\n+ \/\/ Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations\n+ if (!m_Metadata->IsEmpty())\n+ m_Metadata->DebugLogAllAllocations();\n+ \/\/ This is the most important assert in the entire library.\n+ \/\/ Hitting it means you have some memory leak - unreleased virtual allocations.\n+ VMA_ASSERT(m_Metadata->IsEmpty() && \"Some virtual allocations were not freed before destruction of this virtual block!\");\n+\n+ vma_delete(GetAllocationCallbacks(), m_Metadata);\n+}\n+\n+const VkAllocationCallbacks* VmaVirtualBlock_T::GetAllocationCallbacks() const\n+{\n+ return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL;\n+}\n+\n+void VmaVirtualBlock_T::GetAllocationInfo(VmaVirtualAllocation allocation, VmaVirtualAllocationInfo& outInfo)\n+{\n+ m_Metadata->GetAllocationInfo((VmaAllocHandle)allocation, outInfo);\n+}\n+\n+VkResult VmaVirtualBlock_T::Allocate(const VmaVirtualAllocationCreateInfo& createInfo, VmaVirtualAllocation& outAllocation,\n+ VkDeviceSize* outOffset)\n+{\n+ VmaAllocationRequest request = {};\n+ if (m_Metadata->CreateAllocationRequest(\n+ createInfo.size, \/\/ allocSize\n+ VMA_MAX(createInfo.alignment, (VkDeviceSize)1), \/\/ allocAlignment\n+ (createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0, \/\/ upperAddress\n+ VMA_SUBALLOCATION_TYPE_UNKNOWN, \/\/ allocType - unimportant\n+ createInfo.flags & VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MASK, \/\/ strategy\n+ &request))\n+ {\n+ m_Metadata->Alloc(request,\n+ VMA_SUBALLOCATION_TYPE_UNKNOWN, \/\/ type - unimportant\n+ createInfo.pUserData);\n+ outAllocation = (VmaVirtualAllocation)request.allocHandle;\n+ if(outOffset)\n+ *outOffset = m_Metadata->GetAllocationOffset(request.allocHandle);\n+ return VK_SUCCESS;\n+ }\n+ outAllocation = (VmaVirtualAllocation)VK_NULL_HANDLE;\n+ if (outOffset)\n+ *outOffset = UINT64_MAX;\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+}\n+\n+void VmaVirtualBlock_T::GetStatistics(VmaStatistics& outStats) const\n+{\n+ VmaClearStatistics(outStats);\n+ m_Metadata->AddStatistics(outStats);\n+}\n+\n+void VmaVirtualBlock_T::CalculateDetailedStatistics(VmaDetailedStatistics& outStats) const\n+{\n+ VmaClearDetailedStatistics(outStats);\n+ m_Metadata->AddDetailedStatistics(outStats);\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaVirtualBlock_T::BuildStatsString(bool detailedMap, VmaStringBuilder& sb) const\n+{\n+ VmaJsonWriter json(GetAllocationCallbacks(), sb);\n+ json.BeginObject();\n+\n+ VmaDetailedStatistics stats;\n+ CalculateDetailedStatistics(stats);\n+\n+ json.WriteString(\"Stats\");\n+ VmaPrintDetailedStatistics(json, stats);\n+\n+ if (detailedMap)\n+ {\n+ json.WriteString(\"Details\");\n+ m_Metadata->PrintDetailedMap(json,\n+ UINT32_MAX); \/\/ mapRefCount\n+ }\n+\n+ json.EndObject();\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+#endif \/\/ _VMA_VIRTUAL_BLOCK_T_FUNCTIONS\n+#endif \/\/ _VMA_VIRTUAL_BLOCK_T\n+\n+\n+\/\/ Main allocator object.\n+struct VmaAllocator_T\n+{\n+ VMA_CLASS_NO_COPY(VmaAllocator_T)\n+public:\n+ bool m_UseMutex;\n+ uint32_t m_VulkanApiVersion;\n+ bool m_UseKhrDedicatedAllocation; \/\/ Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).\n+ bool m_UseKhrBindMemory2; \/\/ Can be set only if m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0).\n+ bool m_UseExtMemoryBudget;\n+ bool m_UseAmdDeviceCoherentMemory;\n+ bool m_UseKhrBufferDeviceAddress;\n+ bool m_UseExtMemoryPriority;\n+ VkDevice m_hDevice;\n+ VkInstance m_hInstance;\n+ bool m_AllocationCallbacksSpecified;\n+ VkAllocationCallbacks m_AllocationCallbacks;\n+ VmaDeviceMemoryCallbacks m_DeviceMemoryCallbacks;\n+ VmaAllocationObjectAllocator m_AllocationObjectAllocator;\n+\n+ \/\/ Each bit (1 << i) is set if HeapSizeLimit is enabled for that heap, so cannot allocate more than the heap size.\n+ uint32_t m_HeapSizeLimitMask;\n+\n+ VkPhysicalDeviceProperties m_PhysicalDeviceProperties;\n+ VkPhysicalDeviceMemoryProperties m_MemProps;\n+\n+ \/\/ Default pools.\n+ VmaBlockVector* m_pBlockVectors[VK_MAX_MEMORY_TYPES];\n+ VmaDedicatedAllocationList m_DedicatedAllocations[VK_MAX_MEMORY_TYPES];\n+\n+ VmaCurrentBudgetData m_Budget;\n+ VMA_ATOMIC_UINT32 m_DeviceMemoryCount; \/\/ Total number of VkDeviceMemory objects.\n+\n+ VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo);\n+ VkResult Init(const VmaAllocatorCreateInfo* pCreateInfo);\n+ ~VmaAllocator_T();\n+\n+ const VkAllocationCallbacks* GetAllocationCallbacks() const\n+ {\n+ return m_AllocationCallbacksSpecified ? &m_AllocationCallbacks : VMA_NULL;\n+ }\n+ const VmaVulkanFunctions& GetVulkanFunctions() const\n+ {\n+ return m_VulkanFunctions;\n+ }\n+\n+ VkPhysicalDevice GetPhysicalDevice() const { return m_PhysicalDevice; }\n+\n+ VkDeviceSize GetBufferImageGranularity() const\n+ {\n+ return VMA_MAX(\n+ static_cast<VkDeviceSize>(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY),\n+ m_PhysicalDeviceProperties.limits.bufferImageGranularity);\n+ }\n+\n+ uint32_t GetMemoryHeapCount() const { return m_MemProps.memoryHeapCount; }\n+ uint32_t GetMemoryTypeCount() const { return m_MemProps.memoryTypeCount; }\n+\n+ uint32_t MemoryTypeIndexToHeapIndex(uint32_t memTypeIndex) const\n+ {\n+ VMA_ASSERT(memTypeIndex < m_MemProps.memoryTypeCount);\n+ return m_MemProps.memoryTypes[memTypeIndex].heapIndex;\n+ }\n+ \/\/ True when specific memory type is HOST_VISIBLE but not HOST_COHERENT.\n+ bool IsMemoryTypeNonCoherent(uint32_t memTypeIndex) const\n+ {\n+ return (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) ==\n+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+ }\n+ \/\/ Minimum alignment for all allocations in specific memory type.\n+ VkDeviceSize GetMemoryTypeMinAlignment(uint32_t memTypeIndex) const\n+ {\n+ return IsMemoryTypeNonCoherent(memTypeIndex) ?\n+ VMA_MAX((VkDeviceSize)VMA_MIN_ALIGNMENT, m_PhysicalDeviceProperties.limits.nonCoherentAtomSize) :\n+ (VkDeviceSize)VMA_MIN_ALIGNMENT;\n+ }\n+\n+ bool IsIntegratedGpu() const\n+ {\n+ return m_PhysicalDeviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;\n+ }\n+\n+ uint32_t GetGlobalMemoryTypeBits() const { return m_GlobalMemoryTypeBits; }\n+\n+ void GetBufferMemoryRequirements(\n+ VkBuffer hBuffer,\n+ VkMemoryRequirements& memReq,\n+ bool& requiresDedicatedAllocation,\n+ bool& prefersDedicatedAllocation) const;\n+ void GetImageMemoryRequirements(\n+ VkImage hImage,\n+ VkMemoryRequirements& memReq,\n+ bool& requiresDedicatedAllocation,\n+ bool& prefersDedicatedAllocation) const;\n+ VkResult FindMemoryTypeIndex(\n+ uint32_t memoryTypeBits,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ VkFlags bufImgUsage, \/\/ VkBufferCreateInfo::usage or VkImageCreateInfo::usage. UINT32_MAX if unknown.\n+ uint32_t* pMemoryTypeIndex) const;\n+\n+ \/\/ Main allocation function.\n+ VkResult AllocateMemory(\n+ const VkMemoryRequirements& vkMemReq,\n+ bool requiresDedicatedAllocation,\n+ bool prefersDedicatedAllocation,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage, \/\/ UINT32_MAX if unknown.\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations);\n+\n+ \/\/ Main deallocation function.\n+ void FreeMemory(\n+ size_t allocationCount,\n+ const VmaAllocation* pAllocations);\n+\n+ void CalculateStatistics(VmaTotalStatistics* pStats);\n+\n+ void GetHeapBudgets(\n+ VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount);\n+\n+#if VMA_STATS_STRING_ENABLED\n+ void PrintDetailedMap(class VmaJsonWriter& json);\n+#endif\n+\n+ void GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo);\n+\n+ VkResult CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool);\n+ void DestroyPool(VmaPool pool);\n+ void GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats);\n+ void CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats);\n+\n+ void SetCurrentFrameIndex(uint32_t frameIndex);\n+ uint32_t GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }\n+\n+ VkResult CheckPoolCorruption(VmaPool hPool);\n+ VkResult CheckCorruption(uint32_t memoryTypeBits);\n+\n+ \/\/ Call to Vulkan function vkAllocateMemory with accompanying bookkeeping.\n+ VkResult AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory);\n+ \/\/ Call to Vulkan function vkFreeMemory with accompanying bookkeeping.\n+ void FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory);\n+ \/\/ Call to Vulkan function vkBindBufferMemory or vkBindBufferMemory2KHR.\n+ VkResult BindVulkanBuffer(\n+ VkDeviceMemory memory,\n+ VkDeviceSize memoryOffset,\n+ VkBuffer buffer,\n+ const void* pNext);\n+ \/\/ Call to Vulkan function vkBindImageMemory or vkBindImageMemory2KHR.\n+ VkResult BindVulkanImage(\n+ VkDeviceMemory memory,\n+ VkDeviceSize memoryOffset,\n+ VkImage image,\n+ const void* pNext);\n+\n+ VkResult Map(VmaAllocation hAllocation, void** ppData);\n+ void Unmap(VmaAllocation hAllocation);\n+\n+ VkResult BindBufferMemory(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer hBuffer,\n+ const void* pNext);\n+ VkResult BindImageMemory(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage hImage,\n+ const void* pNext);\n+\n+ VkResult FlushOrInvalidateAllocation(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize offset, VkDeviceSize size,\n+ VMA_CACHE_OPERATION op);\n+ VkResult FlushOrInvalidateAllocations(\n+ uint32_t allocationCount,\n+ const VmaAllocation* allocations,\n+ const VkDeviceSize* offsets, const VkDeviceSize* sizes,\n+ VMA_CACHE_OPERATION op);\n+\n+ void FillAllocation(const VmaAllocation hAllocation, uint8_t pattern);\n+\n+ \/*\n+ Returns bit mask of memory types that can support defragmentation on GPU as\n+ they support creation of required buffer for copy operations.\n+ *\/\n+ uint32_t GetGpuDefragmentationMemoryTypeBits();\n+\n+#if VMA_EXTERNAL_MEMORY\n+ VkExternalMemoryHandleTypeFlagsKHR GetExternalMemoryHandleTypeFlags(uint32_t memTypeIndex) const\n+ {\n+ return m_TypeExternalMemoryHandleTypes[memTypeIndex];\n+ }\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+\n+private:\n+ VkDeviceSize m_PreferredLargeHeapBlockSize;\n+\n+ VkPhysicalDevice m_PhysicalDevice;\n+ VMA_ATOMIC_UINT32 m_CurrentFrameIndex;\n+ VMA_ATOMIC_UINT32 m_GpuDefragmentationMemoryTypeBits; \/\/ UINT32_MAX means uninitialized.\n+#if VMA_EXTERNAL_MEMORY\n+ VkExternalMemoryHandleTypeFlagsKHR m_TypeExternalMemoryHandleTypes[VK_MAX_MEMORY_TYPES];\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+\n+ VMA_RW_MUTEX m_PoolsMutex;\n+ typedef VmaIntrusiveLinkedList<VmaPoolListItemTraits> PoolList;\n+ \/\/ Protected by m_PoolsMutex.\n+ PoolList m_Pools;\n+ uint32_t m_NextPoolId;\n+\n+ VmaVulkanFunctions m_VulkanFunctions;\n+\n+ \/\/ Global bit mask AND-ed with any memoryTypeBits to disallow certain memory types.\n+ uint32_t m_GlobalMemoryTypeBits;\n+\n+ void ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions);\n+\n+#if VMA_STATIC_VULKAN_FUNCTIONS == 1\n+ void ImportVulkanFunctions_Static();\n+#endif\n+\n+ void ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions);\n+\n+#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\n+ void ImportVulkanFunctions_Dynamic();\n+#endif\n+\n+ void ValidateVulkanFunctions();\n+\n+ VkDeviceSize CalcPreferredBlockSize(uint32_t memTypeIndex);\n+\n+ VkResult AllocateMemoryOfType(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ bool dedicatedPreferred,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage,\n+ const VmaAllocationCreateInfo& createInfo,\n+ uint32_t memTypeIndex,\n+ VmaSuballocationType suballocType,\n+ VmaDedicatedAllocationList& dedicatedAllocations,\n+ VmaBlockVector& blockVector,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations);\n+\n+ \/\/ Helper function only to be used inside AllocateDedicatedMemory.\n+ VkResult AllocateDedicatedMemoryPage(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VmaSuballocationType suballocType,\n+ uint32_t memTypeIndex,\n+ const VkMemoryAllocateInfo& allocInfo,\n+ bool map,\n+ bool isUserDataString,\n+ bool isMappingAllowed,\n+ void* pUserData,\n+ VmaAllocation* pAllocation);\n+\n+ \/\/ Allocates and registers new VkDeviceMemory specifically for dedicated allocations.\n+ VkResult AllocateDedicatedMemory(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VmaSuballocationType suballocType,\n+ VmaDedicatedAllocationList& dedicatedAllocations,\n+ uint32_t memTypeIndex,\n+ bool map,\n+ bool isUserDataString,\n+ bool isMappingAllowed,\n+ bool canAliasMemory,\n+ void* pUserData,\n+ float priority,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations,\n+ const void* pNextChain = nullptr);\n+\n+ void FreeDedicatedMemory(const VmaAllocation allocation);\n+\n+ VkResult CalcMemTypeParams(\n+ VmaAllocationCreateInfo& outCreateInfo,\n+ uint32_t memTypeIndex,\n+ VkDeviceSize size,\n+ size_t allocationCount);\n+ VkResult CalcAllocationParams(\n+ VmaAllocationCreateInfo& outCreateInfo,\n+ bool dedicatedRequired,\n+ bool dedicatedPreferred);\n+\n+ \/*\n+ Calculates and returns bit mask of memory types that can support defragmentation\n+ on GPU as they support creation of required buffer for copy operations.\n+ *\/\n+ uint32_t CalculateGpuDefragmentationMemoryTypeBits() const;\n+ uint32_t CalculateGlobalMemoryTypeBits() const;\n+\n+ bool GetFlushOrInvalidateRange(\n+ VmaAllocation allocation,\n+ VkDeviceSize offset, VkDeviceSize size,\n+ VkMappedMemoryRange& outRange) const;\n+\n+#if VMA_MEMORY_BUDGET\n+ void UpdateVulkanBudget();\n+#endif \/\/ #if VMA_MEMORY_BUDGET\n+};\n+\n+\n+#ifndef _VMA_MEMORY_FUNCTIONS\n+static void* VmaMalloc(VmaAllocator hAllocator, size_t size, size_t alignment)\n+{\n+ return VmaMalloc(&hAllocator->m_AllocationCallbacks, size, alignment);\n+}\n+\n+static void VmaFree(VmaAllocator hAllocator, void* ptr)\n+{\n+ VmaFree(&hAllocator->m_AllocationCallbacks, ptr);\n+}\n+\n+template<typename T>\n+static T* VmaAllocate(VmaAllocator hAllocator)\n+{\n+ return (T*)VmaMalloc(hAllocator, sizeof(T), VMA_ALIGN_OF(T));\n+}\n+\n+template<typename T>\n+static T* VmaAllocateArray(VmaAllocator hAllocator, size_t count)\n+{\n+ return (T*)VmaMalloc(hAllocator, sizeof(T) * count, VMA_ALIGN_OF(T));\n+}\n+\n+template<typename T>\n+static void vma_delete(VmaAllocator hAllocator, T* ptr)\n+{\n+ if(ptr != VMA_NULL)\n+ {\n+ ptr->~T();\n+ VmaFree(hAllocator, ptr);\n+ }\n+}\n+\n+template<typename T>\n+static void vma_delete_array(VmaAllocator hAllocator, T* ptr, size_t count)\n+{\n+ if(ptr != VMA_NULL)\n+ {\n+ for(size_t i = count; i--; )\n+ ptr[i].~T();\n+ VmaFree(hAllocator, ptr);\n+ }\n+}\n+#endif \/\/ _VMA_MEMORY_FUNCTIONS\n+\n+#ifndef _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS\n+VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)\n+ : m_pMetadata(VMA_NULL),\n+ m_MemoryTypeIndex(UINT32_MAX),\n+ m_Id(0),\n+ m_hMemory(VK_NULL_HANDLE),\n+ m_MapCount(0),\n+ m_pMappedData(VMA_NULL) {}\n+\n+VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()\n+{\n+ VMA_ASSERT(m_MapCount == 0 && \"VkDeviceMemory block is being destroyed while it is still mapped.\");\n+ VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);\n+}\n+\n+void VmaDeviceMemoryBlock::Init(\n+ VmaAllocator hAllocator,\n+ VmaPool hParentPool,\n+ uint32_t newMemoryTypeIndex,\n+ VkDeviceMemory newMemory,\n+ VkDeviceSize newSize,\n+ uint32_t id,\n+ uint32_t algorithm,\n+ VkDeviceSize bufferImageGranularity)\n+{\n+ VMA_ASSERT(m_hMemory == VK_NULL_HANDLE);\n+\n+ m_hParentPool = hParentPool;\n+ m_MemoryTypeIndex = newMemoryTypeIndex;\n+ m_Id = id;\n+ m_hMemory = newMemory;\n+\n+ switch (algorithm)\n+ {\n+ case VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT:\n+ m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_Linear)(hAllocator->GetAllocationCallbacks(),\n+ bufferImageGranularity, false); \/\/ isVirtual\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ \/\/ Fall-through.\n+ case 0:\n+ m_pMetadata = vma_new(hAllocator, VmaBlockMetadata_TLSF)(hAllocator->GetAllocationCallbacks(),\n+ bufferImageGranularity, false); \/\/ isVirtual\n+ }\n+ m_pMetadata->Init(newSize);\n+}\n+\n+void VmaDeviceMemoryBlock::Destroy(VmaAllocator allocator)\n+{\n+ \/\/ Define macro VMA_DEBUG_LOG to receive the list of the unfreed allocations\n+ if (!m_pMetadata->IsEmpty())\n+ m_pMetadata->DebugLogAllAllocations();\n+ \/\/ This is the most important assert in the entire library.\n+ \/\/ Hitting it means you have some memory leak - unreleased VmaAllocation objects.\n+ VMA_ASSERT(m_pMetadata->IsEmpty() && \"Some allocations were not freed before destruction of this memory block!\");\n+\n+ VMA_ASSERT(m_hMemory != VK_NULL_HANDLE);\n+ allocator->FreeVulkanMemory(m_MemoryTypeIndex, m_pMetadata->GetSize(), m_hMemory);\n+ m_hMemory = VK_NULL_HANDLE;\n+\n+ vma_delete(allocator, m_pMetadata);\n+ m_pMetadata = VMA_NULL;\n+}\n+\n+void VmaDeviceMemoryBlock::PostFree(VmaAllocator hAllocator)\n+{\n+ if(m_MappingHysteresis.PostFree())\n+ {\n+ VMA_ASSERT(m_MappingHysteresis.GetExtraMapping() == 0);\n+ if (m_MapCount == 0)\n+ {\n+ m_pMappedData = VMA_NULL;\n+ (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);\n+ }\n+ }\n+}\n+\n+bool VmaDeviceMemoryBlock::Validate() const\n+{\n+ VMA_VALIDATE((m_hMemory != VK_NULL_HANDLE) &&\n+ (m_pMetadata->GetSize() != 0));\n+\n+ return m_pMetadata->Validate();\n+}\n+\n+VkResult VmaDeviceMemoryBlock::CheckCorruption(VmaAllocator hAllocator)\n+{\n+ void* pData = nullptr;\n+ VkResult res = Map(hAllocator, 1, &pData);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+\n+ res = m_pMetadata->CheckCorruption(pData);\n+\n+ Unmap(hAllocator, 1);\n+\n+ return res;\n+}\n+\n+VkResult VmaDeviceMemoryBlock::Map(VmaAllocator hAllocator, uint32_t count, void** ppData)\n+{\n+ if (count == 0)\n+ {\n+ return VK_SUCCESS;\n+ }\n+\n+ VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\n+ const uint32_t oldTotalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping();\n+ m_MappingHysteresis.PostMap();\n+ if (oldTotalMapCount != 0)\n+ {\n+ m_MapCount += count;\n+ VMA_ASSERT(m_pMappedData != VMA_NULL);\n+ if (ppData != VMA_NULL)\n+ {\n+ *ppData = m_pMappedData;\n+ }\n+ return VK_SUCCESS;\n+ }\n+ else\n+ {\n+ VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(\n+ hAllocator->m_hDevice,\n+ m_hMemory,\n+ 0, \/\/ offset\n+ VK_WHOLE_SIZE,\n+ 0, \/\/ flags\n+ &m_pMappedData);\n+ if (result == VK_SUCCESS)\n+ {\n+ if (ppData != VMA_NULL)\n+ {\n+ *ppData = m_pMappedData;\n+ }\n+ m_MapCount = count;\n+ }\n+ return result;\n+ }\n+}\n+\n+void VmaDeviceMemoryBlock::Unmap(VmaAllocator hAllocator, uint32_t count)\n+{\n+ if (count == 0)\n+ {\n+ return;\n+ }\n+\n+ VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\n+ if (m_MapCount >= count)\n+ {\n+ m_MapCount -= count;\n+ const uint32_t totalMapCount = m_MapCount + m_MappingHysteresis.GetExtraMapping();\n+ if (totalMapCount == 0)\n+ {\n+ m_pMappedData = VMA_NULL;\n+ (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(hAllocator->m_hDevice, m_hMemory);\n+ }\n+ m_MappingHysteresis.PostUnmap();\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"VkDeviceMemory block is being unmapped while it was not previously mapped.\");\n+ }\n+}\n+\n+VkResult VmaDeviceMemoryBlock::WriteMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)\n+{\n+ VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);\n+\n+ void* pData;\n+ VkResult res = Map(hAllocator, 1, &pData);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+\n+ VmaWriteMagicValue(pData, allocOffset + allocSize);\n+\n+ Unmap(hAllocator, 1);\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaDeviceMemoryBlock::ValidateMagicValueAfterAllocation(VmaAllocator hAllocator, VkDeviceSize allocOffset, VkDeviceSize allocSize)\n+{\n+ VMA_ASSERT(VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_MARGIN % 4 == 0 && VMA_DEBUG_DETECT_CORRUPTION);\n+\n+ void* pData;\n+ VkResult res = Map(hAllocator, 1, &pData);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+\n+ if (!VmaValidateMagicValue(pData, allocOffset + allocSize))\n+ {\n+ VMA_ASSERT(0 && \"MEMORY CORRUPTION DETECTED AFTER FREED ALLOCATION!\");\n+ }\n+\n+ Unmap(hAllocator, 1);\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaDeviceMemoryBlock::BindBufferMemory(\n+ const VmaAllocator hAllocator,\n+ const VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer hBuffer,\n+ const void* pNext)\n+{\n+ VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&\n+ hAllocation->GetBlock() == this);\n+ VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&\n+ \"Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?\");\n+ const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;\n+ \/\/ This lock is important so that we don't call vkBind... and\/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.\n+ VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\n+ return hAllocator->BindVulkanBuffer(m_hMemory, memoryOffset, hBuffer, pNext);\n+}\n+\n+VkResult VmaDeviceMemoryBlock::BindImageMemory(\n+ const VmaAllocator hAllocator,\n+ const VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage hImage,\n+ const void* pNext)\n+{\n+ VMA_ASSERT(hAllocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_BLOCK &&\n+ hAllocation->GetBlock() == this);\n+ VMA_ASSERT(allocationLocalOffset < hAllocation->GetSize() &&\n+ \"Invalid allocationLocalOffset. Did you forget that this offset is relative to the beginning of the allocation, not the whole memory block?\");\n+ const VkDeviceSize memoryOffset = hAllocation->GetOffset() + allocationLocalOffset;\n+ \/\/ This lock is important so that we don't call vkBind... and\/or vkMap... simultaneously on the same VkDeviceMemory from multiple threads.\n+ VmaMutexLock lock(m_MapAndBindMutex, hAllocator->m_UseMutex);\n+ return hAllocator->BindVulkanImage(m_hMemory, memoryOffset, hImage, pNext);\n+}\n+#endif \/\/ _VMA_DEVICE_MEMORY_BLOCK_FUNCTIONS\n+\n+#ifndef _VMA_ALLOCATION_T_FUNCTIONS\n+VmaAllocation_T::VmaAllocation_T(bool mappingAllowed)\n+ : m_Alignment{ 1 },\n+ m_Size{ 0 },\n+ m_pUserData{ VMA_NULL },\n+ m_pName{ VMA_NULL },\n+ m_MemoryTypeIndex{ 0 },\n+ m_Type{ (uint8_t)ALLOCATION_TYPE_NONE },\n+ m_SuballocationType{ (uint8_t)VMA_SUBALLOCATION_TYPE_UNKNOWN },\n+ m_MapCount{ 0 },\n+ m_Flags{ 0 }\n+{\n+ if(mappingAllowed)\n+ m_Flags |= (uint8_t)FLAG_MAPPING_ALLOWED;\n+\n+#if VMA_STATS_STRING_ENABLED\n+ m_BufferImageUsage = 0;\n+#endif\n+}\n+\n+VmaAllocation_T::~VmaAllocation_T()\n+{\n+ VMA_ASSERT(m_MapCount == 0 && \"Allocation was not unmapped before destruction.\");\n+\n+ \/\/ Check if owned string was freed.\n+ VMA_ASSERT(m_pName == VMA_NULL);\n+}\n+\n+void VmaAllocation_T::InitBlockAllocation(\n+ VmaDeviceMemoryBlock* block,\n+ VmaAllocHandle allocHandle,\n+ VkDeviceSize alignment,\n+ VkDeviceSize size,\n+ uint32_t memoryTypeIndex,\n+ VmaSuballocationType suballocationType,\n+ bool mapped)\n+{\n+ VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);\n+ VMA_ASSERT(block != VMA_NULL);\n+ m_Type = (uint8_t)ALLOCATION_TYPE_BLOCK;\n+ m_Alignment = alignment;\n+ m_Size = size;\n+ m_MemoryTypeIndex = memoryTypeIndex;\n+ if(mapped)\n+ {\n+ VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\n+ m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP;\n+ }\n+ m_SuballocationType = (uint8_t)suballocationType;\n+ m_BlockAllocation.m_Block = block;\n+ m_BlockAllocation.m_AllocHandle = allocHandle;\n+}\n+\n+void VmaAllocation_T::InitDedicatedAllocation(\n+ VmaPool hParentPool,\n+ uint32_t memoryTypeIndex,\n+ VkDeviceMemory hMemory,\n+ VmaSuballocationType suballocationType,\n+ void* pMappedData,\n+ VkDeviceSize size)\n+{\n+ VMA_ASSERT(m_Type == ALLOCATION_TYPE_NONE);\n+ VMA_ASSERT(hMemory != VK_NULL_HANDLE);\n+ m_Type = (uint8_t)ALLOCATION_TYPE_DEDICATED;\n+ m_Alignment = 0;\n+ m_Size = size;\n+ m_MemoryTypeIndex = memoryTypeIndex;\n+ m_SuballocationType = (uint8_t)suballocationType;\n+ if(pMappedData != VMA_NULL)\n+ {\n+ VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\n+ m_Flags |= (uint8_t)FLAG_PERSISTENT_MAP;\n+ }\n+ m_DedicatedAllocation.m_hParentPool = hParentPool;\n+ m_DedicatedAllocation.m_hMemory = hMemory;\n+ m_DedicatedAllocation.m_pMappedData = pMappedData;\n+ m_DedicatedAllocation.m_Prev = VMA_NULL;\n+ m_DedicatedAllocation.m_Next = VMA_NULL;\n+}\n+\n+void VmaAllocation_T::SetName(VmaAllocator hAllocator, const char* pName)\n+{\n+ VMA_ASSERT(pName == VMA_NULL || pName != m_pName);\n+\n+ FreeName(hAllocator);\n+\n+ if (pName != VMA_NULL)\n+ m_pName = VmaCreateStringCopy(hAllocator->GetAllocationCallbacks(), pName);\n+}\n+\n+uint8_t VmaAllocation_T::SwapBlockAllocation(VmaAllocator hAllocator, VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocation != VMA_NULL);\n+ VMA_ASSERT(m_Type == ALLOCATION_TYPE_BLOCK);\n+ VMA_ASSERT(allocation->m_Type == ALLOCATION_TYPE_BLOCK);\n+\n+ m_MapCount = allocation->m_MapCount;\n+ if (m_MapCount != 0)\n+ m_BlockAllocation.m_Block->Unmap(hAllocator, m_MapCount);\n+ allocation->m_MapCount = 0;\n+\n+ m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, allocation);\n+ VMA_SWAP(m_BlockAllocation, allocation->m_BlockAllocation);\n+ m_BlockAllocation.m_Block->m_pMetadata->SetAllocationUserData(m_BlockAllocation.m_AllocHandle, this);\n+\n+#if VMA_STATS_STRING_ENABLED\n+ VMA_SWAP(m_BufferImageUsage, allocation->m_BufferImageUsage);\n+#endif\n+ return m_MapCount;\n+}\n+\n+VmaAllocHandle VmaAllocation_T::GetAllocHandle() const\n+{\n+ switch (m_Type)\n+ {\n+ case ALLOCATION_TYPE_BLOCK:\n+ return m_BlockAllocation.m_AllocHandle;\n+ case ALLOCATION_TYPE_DEDICATED:\n+ return VK_NULL_HANDLE;\n+ default:\n+ VMA_ASSERT(0);\n+ return VK_NULL_HANDLE;\n+ }\n+}\n+\n+VkDeviceSize VmaAllocation_T::GetOffset() const\n+{\n+ switch (m_Type)\n+ {\n+ case ALLOCATION_TYPE_BLOCK:\n+ return m_BlockAllocation.m_Block->m_pMetadata->GetAllocationOffset(m_BlockAllocation.m_AllocHandle);\n+ case ALLOCATION_TYPE_DEDICATED:\n+ return 0;\n+ default:\n+ VMA_ASSERT(0);\n+ return 0;\n+ }\n+}\n+\n+VmaPool VmaAllocation_T::GetParentPool() const\n+{\n+ switch (m_Type)\n+ {\n+ case ALLOCATION_TYPE_BLOCK:\n+ return m_BlockAllocation.m_Block->GetParentPool();\n+ case ALLOCATION_TYPE_DEDICATED:\n+ return m_DedicatedAllocation.m_hParentPool;\n+ default:\n+ VMA_ASSERT(0);\n+ return VK_NULL_HANDLE;\n+ }\n+}\n+\n+VkDeviceMemory VmaAllocation_T::GetMemory() const\n+{\n+ switch (m_Type)\n+ {\n+ case ALLOCATION_TYPE_BLOCK:\n+ return m_BlockAllocation.m_Block->GetDeviceMemory();\n+ case ALLOCATION_TYPE_DEDICATED:\n+ return m_DedicatedAllocation.m_hMemory;\n+ default:\n+ VMA_ASSERT(0);\n+ return VK_NULL_HANDLE;\n+ }\n+}\n+\n+void* VmaAllocation_T::GetMappedData() const\n+{\n+ switch (m_Type)\n+ {\n+ case ALLOCATION_TYPE_BLOCK:\n+ if (m_MapCount != 0 || IsPersistentMap())\n+ {\n+ void* pBlockData = m_BlockAllocation.m_Block->GetMappedData();\n+ VMA_ASSERT(pBlockData != VMA_NULL);\n+ return (char*)pBlockData + GetOffset();\n+ }\n+ else\n+ {\n+ return VMA_NULL;\n+ }\n+ break;\n+ case ALLOCATION_TYPE_DEDICATED:\n+ VMA_ASSERT((m_DedicatedAllocation.m_pMappedData != VMA_NULL) == (m_MapCount != 0 || IsPersistentMap()));\n+ return m_DedicatedAllocation.m_pMappedData;\n+ default:\n+ VMA_ASSERT(0);\n+ return VMA_NULL;\n+ }\n+}\n+\n+void VmaAllocation_T::BlockAllocMap()\n+{\n+ VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);\n+ VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\n+\n+ if (m_MapCount < 0xFF)\n+ {\n+ ++m_MapCount;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"Allocation mapped too many times simultaneously.\");\n+ }\n+}\n+\n+void VmaAllocation_T::BlockAllocUnmap()\n+{\n+ VMA_ASSERT(GetType() == ALLOCATION_TYPE_BLOCK);\n+\n+ if (m_MapCount > 0)\n+ {\n+ --m_MapCount;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"Unmapping allocation not previously mapped.\");\n+ }\n+}\n+\n+VkResult VmaAllocation_T::DedicatedAllocMap(VmaAllocator hAllocator, void** ppData)\n+{\n+ VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);\n+ VMA_ASSERT(IsMappingAllowed() && \"Mapping is not allowed on this allocation! Please use one of the new VMA_ALLOCATION_CREATE_HOST_ACCESS_* flags when creating it.\");\n+\n+ if (m_MapCount != 0 || IsPersistentMap())\n+ {\n+ if (m_MapCount < 0xFF)\n+ {\n+ VMA_ASSERT(m_DedicatedAllocation.m_pMappedData != VMA_NULL);\n+ *ppData = m_DedicatedAllocation.m_pMappedData;\n+ ++m_MapCount;\n+ return VK_SUCCESS;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"Dedicated allocation mapped too many times simultaneously.\");\n+ return VK_ERROR_MEMORY_MAP_FAILED;\n+ }\n+ }\n+ else\n+ {\n+ VkResult result = (*hAllocator->GetVulkanFunctions().vkMapMemory)(\n+ hAllocator->m_hDevice,\n+ m_DedicatedAllocation.m_hMemory,\n+ 0, \/\/ offset\n+ VK_WHOLE_SIZE,\n+ 0, \/\/ flags\n+ ppData);\n+ if (result == VK_SUCCESS)\n+ {\n+ m_DedicatedAllocation.m_pMappedData = *ppData;\n+ m_MapCount = 1;\n+ }\n+ return result;\n+ }\n+}\n+\n+void VmaAllocation_T::DedicatedAllocUnmap(VmaAllocator hAllocator)\n+{\n+ VMA_ASSERT(GetType() == ALLOCATION_TYPE_DEDICATED);\n+\n+ if (m_MapCount > 0)\n+ {\n+ --m_MapCount;\n+ if (m_MapCount == 0 && !IsPersistentMap())\n+ {\n+ m_DedicatedAllocation.m_pMappedData = VMA_NULL;\n+ (*hAllocator->GetVulkanFunctions().vkUnmapMemory)(\n+ hAllocator->m_hDevice,\n+ m_DedicatedAllocation.m_hMemory);\n+ }\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"Unmapping dedicated allocation not previously mapped.\");\n+ }\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaAllocation_T::InitBufferImageUsage(uint32_t bufferImageUsage)\n+{\n+ VMA_ASSERT(m_BufferImageUsage == 0);\n+ m_BufferImageUsage = bufferImageUsage;\n+}\n+\n+void VmaAllocation_T::PrintParameters(class VmaJsonWriter& json) const\n+{\n+ json.WriteString(\"Type\");\n+ json.WriteString(VMA_SUBALLOCATION_TYPE_NAMES[m_SuballocationType]);\n+\n+ json.WriteString(\"Size\");\n+ json.WriteNumber(m_Size);\n+\n+ if (m_pUserData != VMA_NULL)\n+ {\n+ json.WriteString(\"UserData\");\n+ json.BeginString();\n+ json.ContinueString_Pointer(m_pUserData);\n+ json.EndString();\n+ }\n+ if (m_pName != VMA_NULL)\n+ {\n+ json.WriteString(\"Name\");\n+ json.WriteString(m_pName);\n+ }\n+\n+ if (m_BufferImageUsage != 0)\n+ {\n+ json.WriteString(\"Usage\");\n+ json.WriteNumber(m_BufferImageUsage);\n+ }\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+void VmaAllocation_T::FreeName(VmaAllocator hAllocator)\n+{\n+ if(m_pName)\n+ {\n+ VmaFreeString(hAllocator->GetAllocationCallbacks(), m_pName);\n+ m_pName = VMA_NULL;\n+ }\n+}\n+#endif \/\/ _VMA_ALLOCATION_T_FUNCTIONS\n+\n+#ifndef _VMA_BLOCK_VECTOR_FUNCTIONS\n+VmaBlockVector::VmaBlockVector(\n+ VmaAllocator hAllocator,\n+ VmaPool hParentPool,\n+ uint32_t memoryTypeIndex,\n+ VkDeviceSize preferredBlockSize,\n+ size_t minBlockCount,\n+ size_t maxBlockCount,\n+ VkDeviceSize bufferImageGranularity,\n+ bool explicitBlockSize,\n+ uint32_t algorithm,\n+ float priority,\n+ VkDeviceSize minAllocationAlignment,\n+ void* pMemoryAllocateNext)\n+ : m_hAllocator(hAllocator),\n+ m_hParentPool(hParentPool),\n+ m_MemoryTypeIndex(memoryTypeIndex),\n+ m_PreferredBlockSize(preferredBlockSize),\n+ m_MinBlockCount(minBlockCount),\n+ m_MaxBlockCount(maxBlockCount),\n+ m_BufferImageGranularity(bufferImageGranularity),\n+ m_ExplicitBlockSize(explicitBlockSize),\n+ m_Algorithm(algorithm),\n+ m_Priority(priority),\n+ m_MinAllocationAlignment(minAllocationAlignment),\n+ m_pMemoryAllocateNext(pMemoryAllocateNext),\n+ m_Blocks(VmaStlAllocator<VmaDeviceMemoryBlock*>(hAllocator->GetAllocationCallbacks())),\n+ m_NextBlockId(0) {}\n+\n+VmaBlockVector::~VmaBlockVector()\n+{\n+ for (size_t i = m_Blocks.size(); i--; )\n+ {\n+ m_Blocks[i]->Destroy(m_hAllocator);\n+ vma_delete(m_hAllocator, m_Blocks[i]);\n+ }\n+}\n+\n+VkResult VmaBlockVector::CreateMinBlocks()\n+{\n+ for (size_t i = 0; i < m_MinBlockCount; ++i)\n+ {\n+ VkResult res = CreateBlock(m_PreferredBlockSize, VMA_NULL);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+ }\n+ return VK_SUCCESS;\n+}\n+\n+void VmaBlockVector::AddStatistics(VmaStatistics& inoutStats)\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\n+\n+ const size_t blockCount = m_Blocks.size();\n+ for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)\n+ {\n+ const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pBlock);\n+ VMA_HEAVY_ASSERT(pBlock->Validate());\n+ pBlock->m_pMetadata->AddStatistics(inoutStats);\n+ }\n+}\n+\n+void VmaBlockVector::AddDetailedStatistics(VmaDetailedStatistics& inoutStats)\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\n+\n+ const size_t blockCount = m_Blocks.size();\n+ for (uint32_t blockIndex = 0; blockIndex < blockCount; ++blockIndex)\n+ {\n+ const VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pBlock);\n+ VMA_HEAVY_ASSERT(pBlock->Validate());\n+ pBlock->m_pMetadata->AddDetailedStatistics(inoutStats);\n+ }\n+}\n+\n+bool VmaBlockVector::IsEmpty()\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\n+ return m_Blocks.empty();\n+}\n+\n+bool VmaBlockVector::IsCorruptionDetectionEnabled() const\n+{\n+ const uint32_t requiredMemFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;\n+ return (VMA_DEBUG_DETECT_CORRUPTION != 0) &&\n+ (VMA_DEBUG_MARGIN > 0) &&\n+ (m_Algorithm == 0 || m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT) &&\n+ (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & requiredMemFlags) == requiredMemFlags;\n+}\n+\n+VkResult VmaBlockVector::Allocate(\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations)\n+{\n+ size_t allocIndex;\n+ VkResult res = VK_SUCCESS;\n+\n+ alignment = VMA_MAX(alignment, m_MinAllocationAlignment);\n+\n+ if (IsCorruptionDetectionEnabled())\n+ {\n+ size = VmaAlignUp<VkDeviceSize>(size, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));\n+ alignment = VmaAlignUp<VkDeviceSize>(alignment, sizeof(VMA_CORRUPTION_DETECTION_MAGIC_VALUE));\n+ }\n+\n+ {\n+ VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);\n+ for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\n+ {\n+ res = AllocatePage(\n+ size,\n+ alignment,\n+ createInfo,\n+ suballocType,\n+ pAllocations + allocIndex);\n+ if (res != VK_SUCCESS)\n+ {\n+ break;\n+ }\n+ }\n+ }\n+\n+ if (res != VK_SUCCESS)\n+ {\n+ \/\/ Free all already created allocations.\n+ while (allocIndex--)\n+ Free(pAllocations[allocIndex]);\n+ memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\n+ }\n+\n+ return res;\n+}\n+\n+VkResult VmaBlockVector::AllocatePage(\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ VmaAllocation* pAllocation)\n+{\n+ const bool isUpperAddress = (createInfo.flags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;\n+\n+ VkDeviceSize freeMemory;\n+ {\n+ const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);\n+ VmaBudget heapBudget = {};\n+ m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1);\n+ freeMemory = (heapBudget.usage < heapBudget.budget) ? (heapBudget.budget - heapBudget.usage) : 0;\n+ }\n+\n+ const bool canFallbackToDedicated = !HasExplicitBlockSize() &&\n+ (createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0;\n+ const bool canCreateNewBlock =\n+ ((createInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0) &&\n+ (m_Blocks.size() < m_MaxBlockCount) &&\n+ (freeMemory >= size || !canFallbackToDedicated);\n+ uint32_t strategy = createInfo.flags & VMA_ALLOCATION_CREATE_STRATEGY_MASK;\n+\n+ \/\/ Upper address can only be used with linear allocator and within single memory block.\n+ if (isUpperAddress &&\n+ (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT || m_MaxBlockCount > 1))\n+ {\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+\n+ \/\/ Early reject: requested allocation size is larger that maximum block size for this block vector.\n+ if (size + VMA_DEBUG_MARGIN > m_PreferredBlockSize)\n+ {\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+\n+ \/\/ 1. Search existing allocations. Try to allocate.\n+ if (m_Algorithm == VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\n+ {\n+ \/\/ Use only last block.\n+ if (!m_Blocks.empty())\n+ {\n+ VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks.back();\n+ VMA_ASSERT(pCurrBlock);\n+ VkResult res = AllocateFromBlock(\n+ pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\n+ if (res == VK_SUCCESS)\n+ {\n+ VMA_DEBUG_LOG(\" Returned from last block #%u\", pCurrBlock->GetId());\n+ IncrementallySortBlocks();\n+ return VK_SUCCESS;\n+ }\n+ }\n+ }\n+ else\n+ {\n+ if (strategy != VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT) \/\/ MIN_MEMORY or default\n+ {\n+ const bool isHostVisible =\n+ (m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;\n+ if(isHostVisible)\n+ {\n+ const bool isMappingAllowed = (createInfo.flags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0;\n+ \/*\n+ For non-mappable allocations, check blocks that are not mapped first.\n+ For mappable allocations, check blocks that are already mapped first.\n+ This way, having many blocks, we will separate mappable and non-mappable allocations,\n+ hopefully limiting the number of blocks that are mapped, which will help tools like RenderDoc.\n+ *\/\n+ for(size_t mappingI = 0; mappingI < 2; ++mappingI)\n+ {\n+ \/\/ Forward order in m_Blocks - prefer blocks with smallest amount of free space.\n+ for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\n+ {\n+ VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pCurrBlock);\n+ const bool isBlockMapped = pCurrBlock->GetMappedData() != VMA_NULL;\n+ if((mappingI == 0) == (isMappingAllowed == isBlockMapped))\n+ {\n+ VkResult res = AllocateFromBlock(\n+ pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\n+ if (res == VK_SUCCESS)\n+ {\n+ VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\n+ IncrementallySortBlocks();\n+ return VK_SUCCESS;\n+ }\n+ }\n+ }\n+ }\n+ }\n+ else\n+ {\n+ \/\/ Forward order in m_Blocks - prefer blocks with smallest amount of free space.\n+ for (size_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\n+ {\n+ VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pCurrBlock);\n+ VkResult res = AllocateFromBlock(\n+ pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\n+ if (res == VK_SUCCESS)\n+ {\n+ VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\n+ IncrementallySortBlocks();\n+ return VK_SUCCESS;\n+ }\n+ }\n+ }\n+ }\n+ else \/\/ VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT\n+ {\n+ \/\/ Backward order in m_Blocks - prefer blocks with largest amount of free space.\n+ for (size_t blockIndex = m_Blocks.size(); blockIndex--; )\n+ {\n+ VmaDeviceMemoryBlock* const pCurrBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pCurrBlock);\n+ VkResult res = AllocateFromBlock(pCurrBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\n+ if (res == VK_SUCCESS)\n+ {\n+ VMA_DEBUG_LOG(\" Returned from existing block #%u\", pCurrBlock->GetId());\n+ IncrementallySortBlocks();\n+ return VK_SUCCESS;\n+ }\n+ }\n+ }\n+ }\n+\n+ \/\/ 2. Try to create new block.\n+ if (canCreateNewBlock)\n+ {\n+ \/\/ Calculate optimal size for new block.\n+ VkDeviceSize newBlockSize = m_PreferredBlockSize;\n+ uint32_t newBlockSizeShift = 0;\n+ const uint32_t NEW_BLOCK_SIZE_SHIFT_MAX = 3;\n+\n+ if (!m_ExplicitBlockSize)\n+ {\n+ \/\/ Allocate 1\/8, 1\/4, 1\/2 as first blocks.\n+ const VkDeviceSize maxExistingBlockSize = CalcMaxBlockSize();\n+ for (uint32_t i = 0; i < NEW_BLOCK_SIZE_SHIFT_MAX; ++i)\n+ {\n+ const VkDeviceSize smallerNewBlockSize = newBlockSize \/ 2;\n+ if (smallerNewBlockSize > maxExistingBlockSize && smallerNewBlockSize >= size * 2)\n+ {\n+ newBlockSize = smallerNewBlockSize;\n+ ++newBlockSizeShift;\n+ }\n+ else\n+ {\n+ break;\n+ }\n+ }\n+ }\n+\n+ size_t newBlockIndex = 0;\n+ VkResult res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?\n+ CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ \/\/ Allocation of this size failed? Try 1\/2, 1\/4, 1\/8 of m_PreferredBlockSize.\n+ if (!m_ExplicitBlockSize)\n+ {\n+ while (res < 0 && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)\n+ {\n+ const VkDeviceSize smallerNewBlockSize = newBlockSize \/ 2;\n+ if (smallerNewBlockSize >= size)\n+ {\n+ newBlockSize = smallerNewBlockSize;\n+ ++newBlockSizeShift;\n+ res = (newBlockSize <= freeMemory || !canFallbackToDedicated) ?\n+ CreateBlock(newBlockSize, &newBlockIndex) : VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+ else\n+ {\n+ break;\n+ }\n+ }\n+ }\n+\n+ if (res == VK_SUCCESS)\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = m_Blocks[newBlockIndex];\n+ VMA_ASSERT(pBlock->m_pMetadata->GetSize() >= size);\n+\n+ res = AllocateFromBlock(\n+ pBlock, size, alignment, createInfo.flags, createInfo.pUserData, suballocType, strategy, pAllocation);\n+ if (res == VK_SUCCESS)\n+ {\n+ VMA_DEBUG_LOG(\" Created new block #%u Size=%llu\", pBlock->GetId(), newBlockSize);\n+ IncrementallySortBlocks();\n+ return VK_SUCCESS;\n+ }\n+ else\n+ {\n+ \/\/ Allocation from new block failed, possibly due to VMA_DEBUG_MARGIN or alignment.\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+ }\n+ }\n+\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+}\n+\n+void VmaBlockVector::Free(\n+ const VmaAllocation hAllocation,\n+ bool incrementalSort)\n+{\n+ VmaDeviceMemoryBlock* pBlockToDelete = VMA_NULL;\n+\n+ bool budgetExceeded = false;\n+ {\n+ const uint32_t heapIndex = m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex);\n+ VmaBudget heapBudget = {};\n+ m_hAllocator->GetHeapBudgets(&heapBudget, heapIndex, 1);\n+ budgetExceeded = heapBudget.usage >= heapBudget.budget;\n+ }\n+\n+ \/\/ Scope for lock.\n+ {\n+ VmaMutexLockWrite lock(m_Mutex, m_hAllocator->m_UseMutex);\n+\n+ VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();\n+\n+ if (IsCorruptionDetectionEnabled())\n+ {\n+ VkResult res = pBlock->ValidateMagicValueAfterAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize());\n+ VMA_ASSERT(res == VK_SUCCESS && \"Couldn't map block memory to validate magic value.\");\n+ }\n+\n+ if (hAllocation->IsPersistentMap())\n+ {\n+ pBlock->Unmap(m_hAllocator, 1);\n+ }\n+\n+ const bool hadEmptyBlockBeforeFree = HasEmptyBlock();\n+ pBlock->m_pMetadata->Free(hAllocation->GetAllocHandle());\n+ pBlock->PostFree(m_hAllocator);\n+ VMA_HEAVY_ASSERT(pBlock->Validate());\n+\n+ VMA_DEBUG_LOG(\" Freed from MemoryTypeIndex=%u\", m_MemoryTypeIndex);\n+\n+ const bool canDeleteBlock = m_Blocks.size() > m_MinBlockCount;\n+ \/\/ pBlock became empty after this deallocation.\n+ if (pBlock->m_pMetadata->IsEmpty())\n+ {\n+ \/\/ Already had empty block. We don't want to have two, so delete this one.\n+ if ((hadEmptyBlockBeforeFree || budgetExceeded) && canDeleteBlock)\n+ {\n+ pBlockToDelete = pBlock;\n+ Remove(pBlock);\n+ }\n+ \/\/ else: We now have one empty block - leave it. A hysteresis to avoid allocating whole block back and forth.\n+ }\n+ \/\/ pBlock didn't become empty, but we have another empty block - find and free that one.\n+ \/\/ (This is optional, heuristics.)\n+ else if (hadEmptyBlockBeforeFree && canDeleteBlock)\n+ {\n+ VmaDeviceMemoryBlock* pLastBlock = m_Blocks.back();\n+ if (pLastBlock->m_pMetadata->IsEmpty())\n+ {\n+ pBlockToDelete = pLastBlock;\n+ m_Blocks.pop_back();\n+ }\n+ }\n+\n+ if (incrementalSort)\n+ IncrementallySortBlocks();\n+ }\n+\n+ \/\/ Destruction of a free block. Deferred until this point, outside of mutex\n+ \/\/ lock, for performance reason.\n+ if (pBlockToDelete != VMA_NULL)\n+ {\n+ VMA_DEBUG_LOG(\" Deleted empty block #%u\", pBlockToDelete->GetId());\n+ pBlockToDelete->Destroy(m_hAllocator);\n+ vma_delete(m_hAllocator, pBlockToDelete);\n+ }\n+\n+ m_hAllocator->m_Budget.RemoveAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), hAllocation->GetSize());\n+ m_hAllocator->m_AllocationObjectAllocator.Free(hAllocation);\n+}\n+\n+VkDeviceSize VmaBlockVector::CalcMaxBlockSize() const\n+{\n+ VkDeviceSize result = 0;\n+ for (size_t i = m_Blocks.size(); i--; )\n+ {\n+ result = VMA_MAX(result, m_Blocks[i]->m_pMetadata->GetSize());\n+ if (result >= m_PreferredBlockSize)\n+ {\n+ break;\n+ }\n+ }\n+ return result;\n+}\n+\n+void VmaBlockVector::Remove(VmaDeviceMemoryBlock* pBlock)\n+{\n+ for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\n+ {\n+ if (m_Blocks[blockIndex] == pBlock)\n+ {\n+ VmaVectorRemove(m_Blocks, blockIndex);\n+ return;\n+ }\n+ }\n+ VMA_ASSERT(0);\n+}\n+\n+void VmaBlockVector::IncrementallySortBlocks()\n+{\n+ if (m_Algorithm != VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\n+ {\n+ \/\/ Bubble sort only until first swap.\n+ for (size_t i = 1; i < m_Blocks.size(); ++i)\n+ {\n+ if (m_Blocks[i - 1]->m_pMetadata->GetSumFreeSize() > m_Blocks[i]->m_pMetadata->GetSumFreeSize())\n+ {\n+ VMA_SWAP(m_Blocks[i - 1], m_Blocks[i]);\n+ return;\n+ }\n+ }\n+ }\n+}\n+\n+void VmaBlockVector::SortByFreeSize()\n+{\n+ VMA_SORT(m_Blocks.begin(), m_Blocks.end(),\n+ [](auto* b1, auto* b2)\n+ {\n+ return b1->m_pMetadata->GetSumFreeSize() < b2->m_pMetadata->GetSumFreeSize();\n+ });\n+}\n+\n+VkResult VmaBlockVector::AllocateFromBlock(\n+ VmaDeviceMemoryBlock* pBlock,\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ VmaAllocationCreateFlags allocFlags,\n+ void* pUserData,\n+ VmaSuballocationType suballocType,\n+ uint32_t strategy,\n+ VmaAllocation* pAllocation)\n+{\n+ const bool isUpperAddress = (allocFlags & VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT) != 0;\n+\n+ VmaAllocationRequest currRequest = {};\n+ if (pBlock->m_pMetadata->CreateAllocationRequest(\n+ size,\n+ alignment,\n+ isUpperAddress,\n+ suballocType,\n+ strategy,\n+ &currRequest))\n+ {\n+ return CommitAllocationRequest(currRequest, pBlock, alignment, allocFlags, pUserData, suballocType, pAllocation);\n+ }\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+}\n+\n+VkResult VmaBlockVector::CommitAllocationRequest(\n+ VmaAllocationRequest& allocRequest,\n+ VmaDeviceMemoryBlock* pBlock,\n+ VkDeviceSize alignment,\n+ VmaAllocationCreateFlags allocFlags,\n+ void* pUserData,\n+ VmaSuballocationType suballocType,\n+ VmaAllocation* pAllocation)\n+{\n+ const bool mapped = (allocFlags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0;\n+ const bool isUserDataString = (allocFlags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0;\n+ const bool isMappingAllowed = (allocFlags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0;\n+\n+ pBlock->PostAlloc();\n+ \/\/ Allocate from pCurrBlock.\n+ if (mapped)\n+ {\n+ VkResult res = pBlock->Map(m_hAllocator, 1, VMA_NULL);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+ }\n+\n+ *pAllocation = m_hAllocator->m_AllocationObjectAllocator.Allocate(isMappingAllowed);\n+ pBlock->m_pMetadata->Alloc(allocRequest, suballocType, *pAllocation);\n+ (*pAllocation)->InitBlockAllocation(\n+ pBlock,\n+ allocRequest.allocHandle,\n+ alignment,\n+ allocRequest.size, \/\/ Not size, as actual allocation size may be larger than requested!\n+ m_MemoryTypeIndex,\n+ suballocType,\n+ mapped);\n+ VMA_HEAVY_ASSERT(pBlock->Validate());\n+ if (isUserDataString)\n+ (*pAllocation)->SetName(m_hAllocator, (const char*)pUserData);\n+ else\n+ (*pAllocation)->SetUserData(m_hAllocator, pUserData);\n+ m_hAllocator->m_Budget.AddAllocation(m_hAllocator->MemoryTypeIndexToHeapIndex(m_MemoryTypeIndex), allocRequest.size);\n+ if (VMA_DEBUG_INITIALIZE_ALLOCATIONS)\n+ {\n+ m_hAllocator->FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);\n+ }\n+ if (IsCorruptionDetectionEnabled())\n+ {\n+ VkResult res = pBlock->WriteMagicValueAfterAllocation(m_hAllocator, (*pAllocation)->GetOffset(), allocRequest.size);\n+ VMA_ASSERT(res == VK_SUCCESS && \"Couldn't map block memory to write magic value.\");\n+ }\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex)\n+{\n+ VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };\n+ allocInfo.pNext = m_pMemoryAllocateNext;\n+ allocInfo.memoryTypeIndex = m_MemoryTypeIndex;\n+ allocInfo.allocationSize = blockSize;\n+\n+#if VMA_BUFFER_DEVICE_ADDRESS\n+ \/\/ Every standalone block can potentially contain a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT - always enable the feature.\n+ VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR };\n+ if (m_hAllocator->m_UseKhrBufferDeviceAddress)\n+ {\n+ allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR;\n+ VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo);\n+ }\n+#endif \/\/ VMA_BUFFER_DEVICE_ADDRESS\n+\n+#if VMA_MEMORY_PRIORITY\n+ VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };\n+ if (m_hAllocator->m_UseExtMemoryPriority)\n+ {\n+ VMA_ASSERT(m_Priority >= 0.f && m_Priority <= 1.f);\n+ priorityInfo.priority = m_Priority;\n+ VmaPnextChainPushFront(&allocInfo, &priorityInfo);\n+ }\n+#endif \/\/ VMA_MEMORY_PRIORITY\n+\n+#if VMA_EXTERNAL_MEMORY\n+ \/\/ Attach VkExportMemoryAllocateInfoKHR if necessary.\n+ VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR };\n+ exportMemoryAllocInfo.handleTypes = m_hAllocator->GetExternalMemoryHandleTypeFlags(m_MemoryTypeIndex);\n+ if (exportMemoryAllocInfo.handleTypes != 0)\n+ {\n+ VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo);\n+ }\n+#endif \/\/ VMA_EXTERNAL_MEMORY\n+\n+ VkDeviceMemory mem = VK_NULL_HANDLE;\n+ VkResult res = m_hAllocator->AllocateVulkanMemory(&allocInfo, &mem);\n+ if (res < 0)\n+ {\n+ return res;\n+ }\n+\n+ \/\/ New VkDeviceMemory successfully created.\n+\n+ \/\/ Create new Allocation for it.\n+ VmaDeviceMemoryBlock* const pBlock = vma_new(m_hAllocator, VmaDeviceMemoryBlock)(m_hAllocator);\n+ pBlock->Init(\n+ m_hAllocator,\n+ m_hParentPool,\n+ m_MemoryTypeIndex,\n+ mem,\n+ allocInfo.allocationSize,\n+ m_NextBlockId++,\n+ m_Algorithm,\n+ m_BufferImageGranularity);\n+\n+ m_Blocks.push_back(pBlock);\n+ if (pNewBlockIndex != VMA_NULL)\n+ {\n+ *pNewBlockIndex = m_Blocks.size() - 1;\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+bool VmaBlockVector::HasEmptyBlock()\n+{\n+ for (size_t index = 0, count = m_Blocks.size(); index < count; ++index)\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = m_Blocks[index];\n+ if (pBlock->m_pMetadata->IsEmpty())\n+ {\n+ return true;\n+ }\n+ }\n+ return false;\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaBlockVector::PrintDetailedMap(class VmaJsonWriter& json)\n+{\n+ VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\n+\n+ if (IsCustomPool())\n+ {\n+ const char* poolName = m_hParentPool->GetName();\n+ if (poolName != VMA_NULL && poolName[0] != '\\0')\n+ {\n+ json.WriteString(\"Name\");\n+ json.WriteString(poolName);\n+ }\n+\n+ json.WriteString(\"MemoryTypeIndex\");\n+ json.WriteNumber(m_MemoryTypeIndex);\n+\n+ json.WriteString(\"BlockSize\");\n+ json.WriteNumber(m_PreferredBlockSize);\n+\n+ json.WriteString(\"BlockCount\");\n+ json.BeginObject(true);\n+ if (m_MinBlockCount > 0)\n+ {\n+ json.WriteString(\"Min\");\n+ json.WriteNumber((uint64_t)m_MinBlockCount);\n+ }\n+ if (m_MaxBlockCount < SIZE_MAX)\n+ {\n+ json.WriteString(\"Max\");\n+ json.WriteNumber((uint64_t)m_MaxBlockCount);\n+ }\n+ json.WriteString(\"Cur\");\n+ json.WriteNumber((uint64_t)m_Blocks.size());\n+ json.EndObject();\n+\n+ if (m_Algorithm != 0)\n+ {\n+ json.WriteString(\"Algorithm\");\n+ json.WriteString(VmaAlgorithmToStr(m_Algorithm));\n+ }\n+ }\n+ else\n+ {\n+ json.WriteString(\"PreferredBlockSize\");\n+ json.WriteNumber(m_PreferredBlockSize);\n+ }\n+\n+ json.WriteString(\"Blocks\");\n+ json.BeginObject();\n+ for (size_t i = 0; i < m_Blocks.size(); ++i)\n+ {\n+ json.BeginString();\n+ json.ContinueString(m_Blocks[i]->GetId());\n+ json.EndString();\n+\n+ m_Blocks[i]->m_pMetadata->PrintDetailedMap(json, m_Blocks[i]->GetMapRefCount());\n+ }\n+ json.EndObject();\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+VkResult VmaBlockVector::CheckCorruption()\n+{\n+ if (!IsCorruptionDetectionEnabled())\n+ {\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+\n+ VmaMutexLockRead lock(m_Mutex, m_hAllocator->m_UseMutex);\n+ for (uint32_t blockIndex = 0; blockIndex < m_Blocks.size(); ++blockIndex)\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = m_Blocks[blockIndex];\n+ VMA_ASSERT(pBlock);\n+ VkResult res = pBlock->CheckCorruption(m_hAllocator);\n+ if (res != VK_SUCCESS)\n+ {\n+ return res;\n+ }\n+ }\n+ return VK_SUCCESS;\n+}\n+\n+#endif \/\/ _VMA_BLOCK_VECTOR_FUNCTIONS\n+\n+#ifndef _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS\n+VmaDefragmentationContext_T::VmaDefragmentationContext_T(\n+ VmaAllocator hAllocator,\n+ const VmaDefragmentationInfo& info)\n+ : m_MaxPassBytes(info.maxBytesPerPass == 0 ? VK_WHOLE_SIZE : info.maxBytesPerPass),\n+ m_MaxPassAllocations(info.maxAllocationsPerPass == 0 ? UINT32_MAX : info.maxAllocationsPerPass),\n+ m_MoveAllocator(hAllocator->GetAllocationCallbacks()),\n+ m_Moves(m_MoveAllocator)\n+{\n+ m_Algorithm = info.flags & VMA_DEFRAGMENTATION_FLAG_ALGORITHM_MASK;\n+\n+ if (info.pool != VMA_NULL)\n+ {\n+ m_BlockVectorCount = 1;\n+ m_PoolBlockVector = &info.pool->m_BlockVector;\n+ m_pBlockVectors = &m_PoolBlockVector;\n+ m_PoolBlockVector->SortByFreeSize();\n+ }\n+ else\n+ {\n+ m_BlockVectorCount = hAllocator->GetMemoryTypeCount();\n+ m_PoolBlockVector = VMA_NULL;\n+ m_pBlockVectors = hAllocator->m_pBlockVectors;\n+ for (uint32_t i = 0; i < m_BlockVectorCount; ++i)\n+ {\n+ VmaBlockVector* vector = m_pBlockVectors[i];\n+ if (vector != VMA_NULL)\n+ vector->SortByFreeSize();\n+ }\n+ }\n+ \n+ switch (m_Algorithm)\n+ {\n+ case 0: \/\/ Default algorithm\n+ m_Algorithm = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT;\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\n+ {\n+ m_AlgorithmState = vma_new_array(hAllocator, StateBalanced, m_BlockVectorCount);\n+ break;\n+ }\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\n+ {\n+ if (hAllocator->GetBufferImageGranularity() > 1)\n+ {\n+ m_AlgorithmState = vma_new_array(hAllocator, StateExtensive, m_BlockVectorCount);\n+ }\n+ break;\n+ }\n+ }\n+}\n+\n+VmaDefragmentationContext_T::~VmaDefragmentationContext_T()\n+{\n+ if (m_AlgorithmState)\n+ {\n+ switch (m_Algorithm)\n+ {\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\n+ vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast<StateBalanced*>(m_AlgorithmState), m_BlockVectorCount);\n+ break;\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\n+ vma_delete_array(m_MoveAllocator.m_pCallbacks, reinterpret_cast<StateExtensive*>(m_AlgorithmState), m_BlockVectorCount);\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ }\n+}\n+\n+VkResult VmaDefragmentationContext_T::DefragmentPassBegin(VmaDefragmentationPassMoveInfo& moveInfo)\n+{\n+ if (m_PoolBlockVector != VMA_NULL)\n+ {\n+ VmaMutexLockWrite lock(m_PoolBlockVector->GetMutex(), m_PoolBlockVector->GetAllocator()->m_UseMutex);\n+\n+ if (m_PoolBlockVector->GetBlockCount() > 1)\n+ ComputeDefragmentation(*m_PoolBlockVector, 0);\n+ else if (m_PoolBlockVector->GetBlockCount() == 1)\n+ ReallocWithinBlock(*m_PoolBlockVector, m_PoolBlockVector->GetBlock(0));\n+ }\n+ else\n+ {\n+ for (uint32_t i = 0; i < m_BlockVectorCount; ++i)\n+ {\n+ if (m_pBlockVectors[i] != VMA_NULL)\n+ {\n+ VmaMutexLockWrite lock(m_pBlockVectors[i]->GetMutex(), m_pBlockVectors[i]->GetAllocator()->m_UseMutex);\n+\n+ if (m_pBlockVectors[i]->GetBlockCount() > 1)\n+ {\n+ if (ComputeDefragmentation(*m_pBlockVectors[i], i))\n+ break;\n+ }\n+ else if (m_pBlockVectors[i]->GetBlockCount() == 1)\n+ {\n+ if (ReallocWithinBlock(*m_pBlockVectors[i], m_pBlockVectors[i]->GetBlock(0)))\n+ break;\n+ }\n+ }\n+ }\n+ }\n+\n+ moveInfo.moveCount = static_cast<uint32_t>(m_Moves.size());\n+ if (moveInfo.moveCount > 0)\n+ {\n+ moveInfo.pMoves = m_Moves.data();\n+ return VK_INCOMPLETE;\n+ }\n+\n+ moveInfo.pMoves = VMA_NULL;\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaDefragmentationContext_T::DefragmentPassEnd(VmaDefragmentationPassMoveInfo& moveInfo)\n+{\n+ VMA_ASSERT(moveInfo.moveCount > 0 ? moveInfo.pMoves != VMA_NULL : true);\n+\n+ VkResult result = VK_SUCCESS;\n+ VmaStlAllocator<FragmentedBlock> blockAllocator(m_MoveAllocator.m_pCallbacks);\n+ VmaVector<FragmentedBlock, VmaStlAllocator<FragmentedBlock>> immovableBlocks(blockAllocator);\n+ VmaVector<FragmentedBlock, VmaStlAllocator<FragmentedBlock>> mappedBlocks(blockAllocator);\n+\n+ VmaAllocator allocator = VMA_NULL;\n+ for (uint32_t i = 0; i < moveInfo.moveCount; ++i)\n+ {\n+ VmaDefragmentationMove& move = moveInfo.pMoves[i];\n+ size_t prevCount = 0, currentCount = 0;\n+ VkDeviceSize freedBlockSize = 0;\n+\n+ uint32_t vectorIndex;\n+ VmaBlockVector* vector;\n+ if (m_PoolBlockVector != VMA_NULL)\n+ {\n+ vectorIndex = 0;\n+ vector = m_PoolBlockVector;\n+ }\n+ else\n+ {\n+ vectorIndex = move.srcAllocation->GetMemoryTypeIndex();\n+ vector = m_pBlockVectors[vectorIndex];\n+ VMA_ASSERT(vector != VMA_NULL);\n+ }\n+ \n+ switch (move.operation)\n+ {\n+ case VMA_DEFRAGMENTATION_MOVE_OPERATION_COPY:\n+ {\n+ uint8_t mapCount = move.srcAllocation->SwapBlockAllocation(vector->m_hAllocator, move.dstTmpAllocation);\n+ if (mapCount > 0)\n+ {\n+ allocator = vector->m_hAllocator;\n+ VmaDeviceMemoryBlock* newMapBlock = move.srcAllocation->GetBlock();\n+ bool notPresent = true;\n+ for (FragmentedBlock& block : mappedBlocks)\n+ {\n+ if (block.block == newMapBlock)\n+ {\n+ notPresent = false;\n+ block.data += mapCount;\n+ break;\n+ }\n+ }\n+ if (notPresent)\n+ mappedBlocks.push_back({ mapCount, newMapBlock });\n+ }\n+\n+ \/\/ Scope for locks, Free have it's own lock\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ prevCount = vector->GetBlockCount();\n+ freedBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize();\n+ }\n+ vector->Free(move.dstTmpAllocation, false);\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ currentCount = vector->GetBlockCount();\n+ }\n+\n+ result = VK_INCOMPLETE;\n+ break;\n+ }\n+ case VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE:\n+ {\n+ m_PassStats.bytesMoved -= move.srcAllocation->GetSize();\n+ --m_PassStats.allocationsMoved;\n+ vector->Free(move.dstTmpAllocation, false);\n+\n+ VmaDeviceMemoryBlock* newBlock = move.srcAllocation->GetBlock();\n+ bool notPresent = true;\n+ for (const FragmentedBlock& block : immovableBlocks)\n+ {\n+ if (block.block == newBlock)\n+ {\n+ notPresent = false;\n+ break;\n+ }\n+ }\n+ if (notPresent)\n+ immovableBlocks.push_back({ vectorIndex, newBlock });\n+ break;\n+ }\n+ case VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY:\n+ {\n+ m_PassStats.bytesMoved -= move.srcAllocation->GetSize();\n+ --m_PassStats.allocationsMoved;\n+ \/\/ Scope for locks, Free have it's own lock\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ prevCount = vector->GetBlockCount();\n+ freedBlockSize = move.srcAllocation->GetBlock()->m_pMetadata->GetSize();\n+ }\n+ vector->Free(move.srcAllocation, false);\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ currentCount = vector->GetBlockCount();\n+ }\n+ freedBlockSize *= prevCount - currentCount;\n+\n+ VkDeviceSize dstBlockSize;\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ dstBlockSize = move.dstTmpAllocation->GetBlock()->m_pMetadata->GetSize();\n+ }\n+ vector->Free(move.dstTmpAllocation, false);\n+ {\n+ VmaMutexLockRead lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+ freedBlockSize += dstBlockSize * (currentCount - vector->GetBlockCount());\n+ currentCount = vector->GetBlockCount();\n+ }\n+\n+ result = VK_INCOMPLETE;\n+ break;\n+ }\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+\n+ if (prevCount > currentCount)\n+ {\n+ size_t freedBlocks = prevCount - currentCount;\n+ m_PassStats.deviceMemoryBlocksFreed += static_cast<uint32_t>(freedBlocks);\n+ m_PassStats.bytesFreed += freedBlockSize;\n+ }\n+\n+ switch (m_Algorithm)\n+ {\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\n+ {\n+ if (m_AlgorithmState != VMA_NULL)\n+ {\n+ \/\/ Avoid unnecessary tries to allocate when new free block is avaiable\n+ StateExtensive& state = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[vectorIndex];\n+ if (state.firstFreeBlock != SIZE_MAX)\n+ {\n+ state.firstFreeBlock -= prevCount - currentCount;\n+ if (state.firstFreeBlock != 0)\n+ state.firstFreeBlock -= vector->GetBlock(state.firstFreeBlock - 1)->m_pMetadata->IsEmpty();\n+ }\n+ }\n+ }\n+ }\n+ }\n+ moveInfo.moveCount = 0;\n+ moveInfo.pMoves = VMA_NULL;\n+ m_Moves.clear();\n+\n+ \/\/ Update stats\n+ m_GlobalStats.allocationsMoved += m_PassStats.allocationsMoved;\n+ m_GlobalStats.bytesFreed += m_PassStats.bytesFreed;\n+ m_GlobalStats.bytesMoved += m_PassStats.bytesMoved;\n+ m_GlobalStats.deviceMemoryBlocksFreed += m_PassStats.deviceMemoryBlocksFreed;\n+ m_PassStats = { 0 };\n+\n+ \/\/ Move blocks with immovable allocations according to algorithm\n+ if (immovableBlocks.size() > 0)\n+ {\n+ switch (m_Algorithm)\n+ {\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\n+ {\n+ if (m_AlgorithmState != VMA_NULL)\n+ {\n+ bool swapped = false;\n+ \/\/ Move to the start of free blocks range\n+ for (const FragmentedBlock& block : immovableBlocks)\n+ {\n+ StateExtensive& state = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[block.data];\n+ if (state.operation != StateExtensive::Operation::Cleanup)\n+ {\n+ VmaBlockVector* vector = m_pBlockVectors[block.data];\n+ VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+\n+ for (size_t i = 0, count = vector->GetBlockCount() - m_ImmovableBlockCount; i < count; ++i)\n+ {\n+ if (vector->GetBlock(i) == block.block)\n+ {\n+ VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[vector->GetBlockCount() - ++m_ImmovableBlockCount]);\n+ if (state.firstFreeBlock != SIZE_MAX)\n+ {\n+ if (i < state.firstFreeBlock - 1)\n+ {\n+ VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[--state.firstFreeBlock]);\n+ }\n+ }\n+ swapped = true;\n+ break;\n+ }\n+ }\n+ }\n+ }\n+ if (swapped)\n+ result = VK_INCOMPLETE;\n+ break;\n+ }\n+ }\n+ default:\n+ {\n+ \/\/ Move to the begining\n+ for (const FragmentedBlock& block : immovableBlocks)\n+ {\n+ VmaBlockVector* vector = m_pBlockVectors[block.data];\n+ VmaMutexLockWrite lock(vector->GetMutex(), vector->GetAllocator()->m_UseMutex);\n+\n+ for (size_t i = m_ImmovableBlockCount; i < vector->GetBlockCount(); ++i)\n+ {\n+ if (vector->GetBlock(i) == block.block)\n+ {\n+ VMA_SWAP(vector->m_Blocks[i], vector->m_Blocks[m_ImmovableBlockCount++]);\n+ break;\n+ }\n+ }\n+ }\n+ break;\n+ }\n+ }\n+ }\n+\n+ \/\/ Bulk-map destination blocks\n+ for (const FragmentedBlock& block : mappedBlocks)\n+ {\n+ VkResult res = block.block->Map(allocator, block.data, VMA_NULL);\n+ VMA_ASSERT(res == VK_SUCCESS);\n+ }\n+ return result;\n+}\n+\n+bool VmaDefragmentationContext_T::ComputeDefragmentation(VmaBlockVector& vector, size_t index)\n+{\n+ switch (m_Algorithm)\n+ {\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT:\n+ return ComputeDefragmentation_Fast(vector);\n+ default:\n+ VMA_ASSERT(0);\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_BALANCED_BIT:\n+ return ComputeDefragmentation_Balanced(vector, index, true);\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FULL_BIT:\n+ return ComputeDefragmentation_Full(vector);\n+ case VMA_DEFRAGMENTATION_FLAG_ALGORITHM_EXTENSIVE_BIT:\n+ return ComputeDefragmentation_Extensive(vector, index);\n+ }\n+}\n+\n+VmaDefragmentationContext_T::MoveAllocationData VmaDefragmentationContext_T::GetMoveData(\n+ VmaAllocHandle handle, VmaBlockMetadata* metadata)\n+{\n+ MoveAllocationData moveData;\n+ moveData.move.srcAllocation = (VmaAllocation)metadata->GetAllocationUserData(handle);\n+ moveData.size = moveData.move.srcAllocation->GetSize();\n+ moveData.alignment = moveData.move.srcAllocation->GetAlignment();\n+ moveData.type = moveData.move.srcAllocation->GetSuballocationType();\n+ moveData.flags = 0;\n+\n+ if (moveData.move.srcAllocation->IsPersistentMap())\n+ moveData.flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+ if (moveData.move.srcAllocation->IsMappingAllowed())\n+ moveData.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;\n+\n+ return moveData;\n+}\n+\n+VmaDefragmentationContext_T::CounterStatus VmaDefragmentationContext_T::CheckCounters(VkDeviceSize bytes)\n+{\n+ \/\/ Ignore allocation if will exceed max size for copy\n+ if (m_PassStats.bytesMoved + bytes > m_MaxPassBytes)\n+ {\n+ if (++m_IgnoredAllocs < MAX_ALLOCS_TO_IGNORE)\n+ return CounterStatus::Ignore;\n+ else\n+ return CounterStatus::End;\n+ }\n+ return CounterStatus::Pass;\n+}\n+\n+bool VmaDefragmentationContext_T::IncrementCounters(VkDeviceSize bytes)\n+{\n+ m_PassStats.bytesMoved += bytes;\n+ \/\/ Early return when max found\n+ if (++m_PassStats.allocationsMoved >= m_MaxPassAllocations || m_PassStats.bytesMoved >= m_MaxPassBytes)\n+ {\n+ VMA_ASSERT(m_PassStats.allocationsMoved == m_MaxPassAllocations ||\n+ m_PassStats.bytesMoved == m_MaxPassBytes && \"Exceeded maximal pass threshold!\");\n+ return true;\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::ReallocWithinBlock(VmaBlockVector& vector, VmaDeviceMemoryBlock* block)\n+{\n+ VmaBlockMetadata* metadata = block->m_pMetadata;\n+\n+ for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = metadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, metadata);\n+ \/\/ Ignore newly created allocations by defragmentation algorithm\n+ if (moveData.move.srcAllocation->GetUserData() == this)\n+ continue;\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+ \n+ VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\n+ if (offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\n+ {\n+ VmaAllocationRequest request = {};\n+ if (metadata->CreateAllocationRequest(\n+ moveData.size,\n+ moveData.alignment,\n+ false,\n+ moveData.type,\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\n+ &request))\n+ {\n+ if (metadata->GetAllocationOffset(request.allocHandle) < offset)\n+ {\n+ if (vector.CommitAllocationRequest(\n+ request,\n+ block,\n+ moveData.alignment,\n+ moveData.flags,\n+ this,\n+ moveData.type,\n+ &moveData.move.dstTmpAllocation) == VK_SUCCESS)\n+ {\n+ m_Moves.push_back(moveData.move);\n+ if (IncrementCounters(moveData.size))\n+ return true;\n+ }\n+ }\n+ }\n+ }\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::AllocInOtherBlock(size_t start, size_t end, MoveAllocationData& data, VmaBlockVector& vector)\n+{\n+ for (; start < end; ++start)\n+ {\n+ VmaDeviceMemoryBlock* dstBlock = vector.GetBlock(start);\n+ if (dstBlock->m_pMetadata->GetSumFreeSize() >= data.size)\n+ {\n+ if (vector.AllocateFromBlock(dstBlock,\n+ data.size,\n+ data.alignment,\n+ data.flags,\n+ this,\n+ data.type,\n+ 0,\n+ &data.move.dstTmpAllocation) == VK_SUCCESS)\n+ {\n+ m_Moves.push_back(data.move);\n+ if (IncrementCounters(data.size))\n+ return true;\n+ break;\n+ }\n+ }\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::ComputeDefragmentation_Fast(VmaBlockVector& vector)\n+{\n+ \/\/ Move only between blocks\n+\n+ \/\/ Go through allocations in last blocks and try to fit them inside first ones\n+ for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\n+ {\n+ VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata;\n+\n+ for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = metadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, metadata);\n+ \/\/ Ignore newly created allocations by defragmentation algorithm\n+ if (moveData.move.srcAllocation->GetUserData() == this)\n+ continue;\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+\n+ \/\/ Check all previous blocks for free space\n+ if (AllocInOtherBlock(0, i, moveData, vector))\n+ return true;\n+ }\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::ComputeDefragmentation_Balanced(VmaBlockVector& vector, size_t index, bool update)\n+{\n+ \/\/ Go over every allocation and try to fit it in previous blocks at lowest offsets,\n+ \/\/ if not possible: realloc within single block to minimize offset (exclude offset == 0),\n+ \/\/ but only if there are noticable gaps between them (some heuristic, ex. average size of allocation in block)\n+ VMA_ASSERT(m_AlgorithmState != VMA_NULL);\n+\n+ StateBalanced& vectorState = reinterpret_cast<StateBalanced*>(m_AlgorithmState)[index];\n+ if (update && vectorState.avgAllocSize == UINT64_MAX)\n+ UpdateVectorStatistics(vector, vectorState);\n+\n+ const size_t startMoveCount = m_Moves.size();\n+ VkDeviceSize minimalFreeRegion = vectorState.avgFreeSize \/ 2;\n+ for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\n+ {\n+ VmaDeviceMemoryBlock* block = vector.GetBlock(i);\n+ VmaBlockMetadata* metadata = block->m_pMetadata;\n+ VkDeviceSize prevFreeRegionSize = 0;\n+\n+ for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = metadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, metadata);\n+ \/\/ Ignore newly created allocations by defragmentation algorithm\n+ if (moveData.move.srcAllocation->GetUserData() == this)\n+ continue;\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+\n+ \/\/ Check all previous blocks for free space\n+ const size_t prevMoveCount = m_Moves.size();\n+ if (AllocInOtherBlock(0, i, moveData, vector))\n+ return true;\n+\n+ VkDeviceSize nextFreeRegionSize = metadata->GetNextFreeRegionSize(handle);\n+ \/\/ If no room found then realloc within block for lower offset\n+ VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\n+ if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\n+ {\n+ \/\/ Check if realloc will make sense\n+ if (prevFreeRegionSize >= minimalFreeRegion ||\n+ nextFreeRegionSize >= minimalFreeRegion ||\n+ moveData.size <= vectorState.avgFreeSize ||\n+ moveData.size <= vectorState.avgAllocSize)\n+ {\n+ VmaAllocationRequest request = {};\n+ if (metadata->CreateAllocationRequest(\n+ moveData.size,\n+ moveData.alignment,\n+ false,\n+ moveData.type,\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\n+ &request))\n+ {\n+ if (metadata->GetAllocationOffset(request.allocHandle) < offset)\n+ {\n+ if (vector.CommitAllocationRequest(\n+ request,\n+ block,\n+ moveData.alignment,\n+ moveData.flags,\n+ this,\n+ moveData.type,\n+ &moveData.move.dstTmpAllocation) == VK_SUCCESS)\n+ {\n+ m_Moves.push_back(moveData.move);\n+ if (IncrementCounters(moveData.size))\n+ return true;\n+ }\n+ }\n+ }\n+ }\n+ }\n+ prevFreeRegionSize = nextFreeRegionSize;\n+ }\n+ }\n+ \n+ \/\/ No moves perfomed, update statistics to current vector state\n+ if (startMoveCount == m_Moves.size() && !update)\n+ {\n+ vectorState.avgAllocSize = UINT64_MAX;\n+ return ComputeDefragmentation_Balanced(vector, index, false);\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::ComputeDefragmentation_Full(VmaBlockVector& vector)\n+{\n+ \/\/ Go over every allocation and try to fit it in previous blocks at lowest offsets,\n+ \/\/ if not possible: realloc within single block to minimize offset (exclude offset == 0)\n+\n+ for (size_t i = vector.GetBlockCount() - 1; i > m_ImmovableBlockCount; --i)\n+ {\n+ VmaDeviceMemoryBlock* block = vector.GetBlock(i);\n+ VmaBlockMetadata* metadata = block->m_pMetadata;\n+\n+ for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = metadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, metadata);\n+ \/\/ Ignore newly created allocations by defragmentation algorithm\n+ if (moveData.move.srcAllocation->GetUserData() == this)\n+ continue;\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+\n+ \/\/ Check all previous blocks for free space\n+ const size_t prevMoveCount = m_Moves.size();\n+ if (AllocInOtherBlock(0, i, moveData, vector))\n+ return true;\n+\n+ \/\/ If no room found then realloc within block for lower offset\n+ VkDeviceSize offset = moveData.move.srcAllocation->GetOffset();\n+ if (prevMoveCount == m_Moves.size() && offset != 0 && metadata->GetSumFreeSize() >= moveData.size)\n+ {\n+ VmaAllocationRequest request = {};\n+ if (metadata->CreateAllocationRequest(\n+ moveData.size,\n+ moveData.alignment,\n+ false,\n+ moveData.type,\n+ VMA_ALLOCATION_CREATE_STRATEGY_MIN_OFFSET_BIT,\n+ &request))\n+ {\n+ if (metadata->GetAllocationOffset(request.allocHandle) < offset)\n+ {\n+ if (vector.CommitAllocationRequest(\n+ request,\n+ block,\n+ moveData.alignment,\n+ moveData.flags,\n+ this,\n+ moveData.type,\n+ &moveData.move.dstTmpAllocation) == VK_SUCCESS)\n+ {\n+ m_Moves.push_back(moveData.move);\n+ if (IncrementCounters(moveData.size))\n+ return true;\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ return false;\n+}\n+\n+bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVector& vector, size_t index)\n+{\n+ \/\/ First free single block, then populate it to the brim, then free another block, and so on\n+\n+ \/\/ Fallback to previous algorithm since without granularity conflicts it can achieve max packing\n+ if (vector.m_BufferImageGranularity == 1)\n+ return ComputeDefragmentation_Full(vector);\n+\n+ VMA_ASSERT(m_AlgorithmState != VMA_NULL);\n+\n+ StateExtensive& vectorState = reinterpret_cast<StateExtensive*>(m_AlgorithmState)[index];\n+\n+ bool texturePresent = false, bufferPresent = false, otherPresent = false;\n+ switch (vectorState.operation)\n+ {\n+ case StateExtensive::Operation::Done: \/\/ Vector defragmented\n+ return false;\n+ case StateExtensive::Operation::FindFreeBlockBuffer:\n+ case StateExtensive::Operation::FindFreeBlockTexture:\n+ case StateExtensive::Operation::FindFreeBlockAll:\n+ {\n+ \/\/ No free blocks, have to clear last one\n+ size_t last = (vectorState.firstFreeBlock == SIZE_MAX ? vector.GetBlockCount() : vectorState.firstFreeBlock) - 1;\n+ VmaBlockMetadata* freeMetadata = vector.GetBlock(last)->m_pMetadata;\n+\n+ const size_t prevMoveCount = m_Moves.size();\n+ for (VmaAllocHandle handle = freeMetadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = freeMetadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, freeMetadata);\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+\n+ \/\/ Check all previous blocks for free space\n+ if (AllocInOtherBlock(0, last, moveData, vector))\n+ {\n+ \/\/ Full clear performed already\n+ if (prevMoveCount != m_Moves.size() && freeMetadata->GetNextAllocation(handle) == VK_NULL_HANDLE)\n+ reinterpret_cast<size_t*>(m_AlgorithmState)[index] = last;\n+ return true;\n+ }\n+ }\n+\n+ if (prevMoveCount == m_Moves.size())\n+ {\n+ \/\/ Cannot perform full clear, have to move data in other blocks around\n+ if (last != 0)\n+ {\n+ for (size_t i = last - 1; i; --i)\n+ {\n+ if (ReallocWithinBlock(vector, vector.GetBlock(i)))\n+ return true;\n+ }\n+ }\n+\n+ if (prevMoveCount == m_Moves.size())\n+ {\n+ \/\/ No possible reallocs within blocks, try to move them around fast\n+ return ComputeDefragmentation_Fast(vector);\n+ }\n+ }\n+ else\n+ {\n+ switch (vectorState.operation)\n+ {\n+ case StateExtensive::Operation::FindFreeBlockBuffer:\n+ vectorState.operation = StateExtensive::Operation::MoveBuffers;\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ case StateExtensive::Operation::FindFreeBlockTexture:\n+ vectorState.operation = StateExtensive::Operation::MoveTextures;\n+ break;\n+ case StateExtensive::Operation::FindFreeBlockAll:\n+ vectorState.operation = StateExtensive::Operation::MoveAll;\n+ break;\n+ }\n+ vectorState.firstFreeBlock = last;\n+ \/\/ Nothing done, block found without reallocations, can perform another reallocs in same pass\n+ if (prevMoveCount == m_Moves.size())\n+ return ComputeDefragmentation_Extensive(vector, index);\n+ }\n+ break;\n+ }\n+ case StateExtensive::Operation::MoveTextures:\n+ {\n+ if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL, vector,\n+ vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\n+ {\n+ if (texturePresent)\n+ {\n+ vectorState.operation = StateExtensive::Operation::FindFreeBlockTexture;\n+ return ComputeDefragmentation_Extensive(vector, index);\n+ }\n+\n+ if (!bufferPresent && !otherPresent)\n+ {\n+ vectorState.operation = StateExtensive::Operation::Cleanup;\n+ break;\n+ }\n+\n+ \/\/ No more textures to move, check buffers\n+ vectorState.operation = StateExtensive::Operation::MoveBuffers;\n+ bufferPresent = false;\n+ otherPresent = false;\n+ }\n+ else\n+ break;\n+ }\n+ case StateExtensive::Operation::MoveBuffers:\n+ {\n+ if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_BUFFER, vector,\n+ vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\n+ {\n+ if (bufferPresent)\n+ {\n+ vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer;\n+ return ComputeDefragmentation_Extensive(vector, index);\n+ }\n+\n+ if (!otherPresent)\n+ {\n+ vectorState.operation = StateExtensive::Operation::Cleanup;\n+ break;\n+ }\n+\n+ \/\/ No more buffers to move, check all others\n+ vectorState.operation = StateExtensive::Operation::MoveAll;\n+ otherPresent = false;\n+ }\n+ else\n+ break;\n+ }\n+ case StateExtensive::Operation::MoveAll:\n+ {\n+ if (MoveDataToFreeBlocks(VMA_SUBALLOCATION_TYPE_FREE, vector,\n+ vectorState.firstFreeBlock, texturePresent, bufferPresent, otherPresent))\n+ {\n+ if (otherPresent)\n+ {\n+ vectorState.operation = StateExtensive::Operation::FindFreeBlockBuffer;\n+ return ComputeDefragmentation_Extensive(vector, index);\n+ }\n+ \/\/ Everything moved\n+ vectorState.operation = StateExtensive::Operation::Cleanup;\n+ }\n+ break;\n+ }\n+ }\n+\n+ if (vectorState.operation == StateExtensive::Operation::Cleanup)\n+ {\n+ \/\/ All other work done, pack data in blocks even tighter if possible\n+ const size_t prevMoveCount = m_Moves.size();\n+ for (size_t i = 0; i < vector.GetBlockCount(); ++i)\n+ {\n+ if (ReallocWithinBlock(vector, vector.GetBlock(i)))\n+ return true;\n+ }\n+\n+ if (prevMoveCount == m_Moves.size())\n+ vectorState.operation = StateExtensive::Operation::Done;\n+ }\n+ return false;\n+}\n+\n+void VmaDefragmentationContext_T::UpdateVectorStatistics(VmaBlockVector& vector, StateBalanced& state)\n+{\n+ size_t allocCount = 0;\n+ size_t freeCount = 0;\n+ state.avgFreeSize = 0;\n+ state.avgAllocSize = 0;\n+\n+ for (size_t i = 0; i < vector.GetBlockCount(); ++i)\n+ {\n+ VmaBlockMetadata* metadata = vector.GetBlock(i)->m_pMetadata;\n+\n+ allocCount += metadata->GetAllocationCount();\n+ freeCount += metadata->GetFreeRegionsCount();\n+ state.avgFreeSize += metadata->GetSumFreeSize();\n+ state.avgAllocSize += metadata->GetSize();\n+ }\n+\n+ state.avgAllocSize = (state.avgAllocSize - state.avgFreeSize) \/ allocCount;\n+ state.avgFreeSize \/= freeCount;\n+}\n+\n+bool VmaDefragmentationContext_T::MoveDataToFreeBlocks(VmaSuballocationType currentType, \n+ VmaBlockVector& vector, size_t firstFreeBlock,\n+ bool& texturePresent, bool& bufferPresent, bool& otherPresent)\n+{\n+ const size_t prevMoveCount = m_Moves.size();\n+ for (size_t i = firstFreeBlock ; i;)\n+ {\n+ VmaDeviceMemoryBlock* block = vector.GetBlock(--i);\n+ VmaBlockMetadata* metadata = block->m_pMetadata;\n+\n+ for (VmaAllocHandle handle = metadata->GetAllocationListBegin();\n+ handle != VK_NULL_HANDLE;\n+ handle = metadata->GetNextAllocation(handle))\n+ {\n+ MoveAllocationData moveData = GetMoveData(handle, metadata);\n+ \/\/ Ignore newly created allocations by defragmentation algorithm\n+ if (moveData.move.srcAllocation->GetUserData() == this)\n+ continue;\n+ switch (CheckCounters(moveData.move.srcAllocation->GetSize()))\n+ {\n+ case CounterStatus::Ignore:\n+ continue;\n+ case CounterStatus::End:\n+ return true;\n+ default:\n+ VMA_ASSERT(0);\n+ case CounterStatus::Pass:\n+ break;\n+ }\n+\n+ \/\/ Move only single type of resources at once\n+ if (!VmaIsBufferImageGranularityConflict(moveData.type, currentType))\n+ {\n+ \/\/ Try to fit allocation into free blocks\n+ if (AllocInOtherBlock(firstFreeBlock, vector.GetBlockCount(), moveData, vector))\n+ return false;\n+ }\n+\n+ if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL))\n+ texturePresent = true;\n+ else if (!VmaIsBufferImageGranularityConflict(moveData.type, VMA_SUBALLOCATION_TYPE_BUFFER))\n+ bufferPresent = true;\n+ else\n+ otherPresent = true;\n+ }\n+ }\n+ return prevMoveCount == m_Moves.size();\n+}\n+#endif \/\/ _VMA_DEFRAGMENTATION_CONTEXT_FUNCTIONS\n+\n+#ifndef _VMA_POOL_T_FUNCTIONS\n+VmaPool_T::VmaPool_T(\n+ VmaAllocator hAllocator,\n+ const VmaPoolCreateInfo& createInfo,\n+ VkDeviceSize preferredBlockSize)\n+ : m_BlockVector(\n+ hAllocator,\n+ this, \/\/ hParentPool\n+ createInfo.memoryTypeIndex,\n+ createInfo.blockSize != 0 ? createInfo.blockSize : preferredBlockSize,\n+ createInfo.minBlockCount,\n+ createInfo.maxBlockCount,\n+ (createInfo.flags& VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT) != 0 ? 1 : hAllocator->GetBufferImageGranularity(),\n+ createInfo.blockSize != 0, \/\/ explicitBlockSize\n+ createInfo.flags & VMA_POOL_CREATE_ALGORITHM_MASK, \/\/ algorithm\n+ createInfo.priority,\n+ VMA_MAX(hAllocator->GetMemoryTypeMinAlignment(createInfo.memoryTypeIndex), createInfo.minAllocationAlignment),\n+ createInfo.pMemoryAllocateNext),\n+ m_Id(0),\n+ m_Name(VMA_NULL) {}\n+\n+VmaPool_T::~VmaPool_T()\n+{\n+ VMA_ASSERT(m_PrevPool == VMA_NULL && m_NextPool == VMA_NULL);\n+}\n+\n+void VmaPool_T::SetName(const char* pName)\n+{\n+ const VkAllocationCallbacks* allocs = m_BlockVector.GetAllocator()->GetAllocationCallbacks();\n+ VmaFreeString(allocs, m_Name);\n+\n+ if (pName != VMA_NULL)\n+ {\n+ m_Name = VmaCreateStringCopy(allocs, pName);\n+ }\n+ else\n+ {\n+ m_Name = VMA_NULL;\n+ }\n+}\n+#endif \/\/ _VMA_POOL_T_FUNCTIONS\n+\n+#ifndef _VMA_ALLOCATOR_T_FUNCTIONS\n+VmaAllocator_T::VmaAllocator_T(const VmaAllocatorCreateInfo* pCreateInfo) :\n+ m_UseMutex((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) == 0),\n+ m_VulkanApiVersion(pCreateInfo->vulkanApiVersion != 0 ? pCreateInfo->vulkanApiVersion : VK_API_VERSION_1_0),\n+ m_UseKhrDedicatedAllocation((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0),\n+ m_UseKhrBindMemory2((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0),\n+ m_UseExtMemoryBudget((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0),\n+ m_UseAmdDeviceCoherentMemory((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT) != 0),\n+ m_UseKhrBufferDeviceAddress((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT) != 0),\n+ m_UseExtMemoryPriority((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT) != 0),\n+ m_hDevice(pCreateInfo->device),\n+ m_hInstance(pCreateInfo->instance),\n+ m_AllocationCallbacksSpecified(pCreateInfo->pAllocationCallbacks != VMA_NULL),\n+ m_AllocationCallbacks(pCreateInfo->pAllocationCallbacks ?\n+ *pCreateInfo->pAllocationCallbacks : VmaEmptyAllocationCallbacks),\n+ m_AllocationObjectAllocator(&m_AllocationCallbacks),\n+ m_HeapSizeLimitMask(0),\n+ m_DeviceMemoryCount(0),\n+ m_PreferredLargeHeapBlockSize(0),\n+ m_PhysicalDevice(pCreateInfo->physicalDevice),\n+ m_GpuDefragmentationMemoryTypeBits(UINT32_MAX),\n+ m_NextPoolId(0),\n+ m_GlobalMemoryTypeBits(UINT32_MAX)\n+{\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ m_UseKhrDedicatedAllocation = false;\n+ m_UseKhrBindMemory2 = false;\n+ }\n+\n+ if(VMA_DEBUG_DETECT_CORRUPTION)\n+ {\n+ \/\/ Needs to be multiply of uint32_t size because we are going to write VMA_CORRUPTION_DETECTION_MAGIC_VALUE to it.\n+ VMA_ASSERT(VMA_DEBUG_MARGIN % sizeof(uint32_t) == 0);\n+ }\n+\n+ VMA_ASSERT(pCreateInfo->physicalDevice && pCreateInfo->device && pCreateInfo->instance);\n+\n+ if(m_VulkanApiVersion < VK_MAKE_VERSION(1, 1, 0))\n+ {\n+#if !(VMA_DEDICATED_ALLOCATION)\n+ if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT) != 0)\n+ {\n+ VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT set but required extensions are disabled by preprocessor macros.\");\n+ }\n+#endif\n+#if !(VMA_BIND_MEMORY2)\n+ if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT) != 0)\n+ {\n+ VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_KHR_BIND_MEMORY2_BIT set but required extension is disabled by preprocessor macros.\");\n+ }\n+#endif\n+ }\n+#if !(VMA_MEMORY_BUDGET)\n+ if((pCreateInfo->flags & VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT) != 0)\n+ {\n+ VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT set but required extension is disabled by preprocessor macros.\");\n+ }\n+#endif\n+#if !(VMA_BUFFER_DEVICE_ADDRESS)\n+ if(m_UseKhrBufferDeviceAddress)\n+ {\n+ VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT is set but required extension or Vulkan 1.2 is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.\");\n+ }\n+#endif\n+#if VMA_VULKAN_VERSION < 1002000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 2, 0))\n+ {\n+ VMA_ASSERT(0 && \"vulkanApiVersion >= VK_API_VERSION_1_2 but required Vulkan version is disabled by preprocessor macros.\");\n+ }\n+#endif\n+#if VMA_VULKAN_VERSION < 1001000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ VMA_ASSERT(0 && \"vulkanApiVersion >= VK_API_VERSION_1_1 but required Vulkan version is disabled by preprocessor macros.\");\n+ }\n+#endif\n+#if !(VMA_MEMORY_PRIORITY)\n+ if(m_UseExtMemoryPriority)\n+ {\n+ VMA_ASSERT(0 && \"VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT is set but required extension is not available in your Vulkan header or its support in VMA has been disabled by a preprocessor macro.\");\n+ }\n+#endif\n+\n+ memset(&m_DeviceMemoryCallbacks, 0 ,sizeof(m_DeviceMemoryCallbacks));\n+ memset(&m_PhysicalDeviceProperties, 0, sizeof(m_PhysicalDeviceProperties));\n+ memset(&m_MemProps, 0, sizeof(m_MemProps));\n+\n+ memset(&m_pBlockVectors, 0, sizeof(m_pBlockVectors));\n+ memset(&m_VulkanFunctions, 0, sizeof(m_VulkanFunctions));\n+\n+#if VMA_EXTERNAL_MEMORY\n+ memset(&m_TypeExternalMemoryHandleTypes, 0, sizeof(m_TypeExternalMemoryHandleTypes));\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+\n+ if(pCreateInfo->pDeviceMemoryCallbacks != VMA_NULL)\n+ {\n+ m_DeviceMemoryCallbacks.pUserData = pCreateInfo->pDeviceMemoryCallbacks->pUserData;\n+ m_DeviceMemoryCallbacks.pfnAllocate = pCreateInfo->pDeviceMemoryCallbacks->pfnAllocate;\n+ m_DeviceMemoryCallbacks.pfnFree = pCreateInfo->pDeviceMemoryCallbacks->pfnFree;\n+ }\n+\n+ ImportVulkanFunctions(pCreateInfo->pVulkanFunctions);\n+\n+ (*m_VulkanFunctions.vkGetPhysicalDeviceProperties)(m_PhysicalDevice, &m_PhysicalDeviceProperties);\n+ (*m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties)(m_PhysicalDevice, &m_MemProps);\n+\n+ VMA_ASSERT(VmaIsPow2(VMA_MIN_ALIGNMENT));\n+ VMA_ASSERT(VmaIsPow2(VMA_DEBUG_MIN_BUFFER_IMAGE_GRANULARITY));\n+ VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.bufferImageGranularity));\n+ VMA_ASSERT(VmaIsPow2(m_PhysicalDeviceProperties.limits.nonCoherentAtomSize));\n+\n+ m_PreferredLargeHeapBlockSize = (pCreateInfo->preferredLargeHeapBlockSize != 0) ?\n+ pCreateInfo->preferredLargeHeapBlockSize : static_cast<VkDeviceSize>(VMA_DEFAULT_LARGE_HEAP_BLOCK_SIZE);\n+\n+ m_GlobalMemoryTypeBits = CalculateGlobalMemoryTypeBits();\n+\n+#if VMA_EXTERNAL_MEMORY\n+ if(pCreateInfo->pTypeExternalMemoryHandleTypes != VMA_NULL)\n+ {\n+ memcpy(m_TypeExternalMemoryHandleTypes, pCreateInfo->pTypeExternalMemoryHandleTypes,\n+ sizeof(VkExternalMemoryHandleTypeFlagsKHR) * GetMemoryTypeCount());\n+ }\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+\n+ if(pCreateInfo->pHeapSizeLimit != VMA_NULL)\n+ {\n+ for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)\n+ {\n+ const VkDeviceSize limit = pCreateInfo->pHeapSizeLimit[heapIndex];\n+ if(limit != VK_WHOLE_SIZE)\n+ {\n+ m_HeapSizeLimitMask |= 1u << heapIndex;\n+ if(limit < m_MemProps.memoryHeaps[heapIndex].size)\n+ {\n+ m_MemProps.memoryHeaps[heapIndex].size = limit;\n+ }\n+ }\n+ }\n+ }\n+\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ \/\/ Create only supported types\n+ if((m_GlobalMemoryTypeBits & (1u << memTypeIndex)) != 0)\n+ {\n+ const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(memTypeIndex);\n+ m_pBlockVectors[memTypeIndex] = vma_new(this, VmaBlockVector)(\n+ this,\n+ VK_NULL_HANDLE, \/\/ hParentPool\n+ memTypeIndex,\n+ preferredBlockSize,\n+ 0,\n+ SIZE_MAX,\n+ GetBufferImageGranularity(),\n+ false, \/\/ explicitBlockSize\n+ 0, \/\/ algorithm\n+ 0.5f, \/\/ priority (0.5 is the default per Vulkan spec)\n+ GetMemoryTypeMinAlignment(memTypeIndex), \/\/ minAllocationAlignment\n+ VMA_NULL); \/\/ \/\/ pMemoryAllocateNext\n+ \/\/ No need to call m_pBlockVectors[memTypeIndex][blockVectorTypeIndex]->CreateMinBlocks here,\n+ \/\/ becase minBlockCount is 0.\n+ }\n+ }\n+}\n+\n+VkResult VmaAllocator_T::Init(const VmaAllocatorCreateInfo* pCreateInfo)\n+{\n+ VkResult res = VK_SUCCESS;\n+\n+#if VMA_MEMORY_BUDGET\n+ if(m_UseExtMemoryBudget)\n+ {\n+ UpdateVulkanBudget();\n+ }\n+#endif \/\/ #if VMA_MEMORY_BUDGET\n+\n+ return res;\n+}\n+\n+VmaAllocator_T::~VmaAllocator_T()\n+{\n+ VMA_ASSERT(m_Pools.IsEmpty());\n+\n+ for(size_t memTypeIndex = GetMemoryTypeCount(); memTypeIndex--; )\n+ {\n+ vma_delete(this, m_pBlockVectors[memTypeIndex]);\n+ }\n+}\n+\n+void VmaAllocator_T::ImportVulkanFunctions(const VmaVulkanFunctions* pVulkanFunctions)\n+{\n+#if VMA_STATIC_VULKAN_FUNCTIONS == 1\n+ ImportVulkanFunctions_Static();\n+#endif\n+\n+ if(pVulkanFunctions != VMA_NULL)\n+ {\n+ ImportVulkanFunctions_Custom(pVulkanFunctions);\n+ }\n+\n+#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\n+ ImportVulkanFunctions_Dynamic();\n+#endif\n+\n+ ValidateVulkanFunctions();\n+}\n+\n+#if VMA_STATIC_VULKAN_FUNCTIONS == 1\n+\n+void VmaAllocator_T::ImportVulkanFunctions_Static()\n+{\n+ \/\/ Vulkan 1.0\n+ m_VulkanFunctions.vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vkGetInstanceProcAddr;\n+ m_VulkanFunctions.vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vkGetDeviceProcAddr;\n+ m_VulkanFunctions.vkGetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties)vkGetPhysicalDeviceProperties;\n+ m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties)vkGetPhysicalDeviceMemoryProperties;\n+ m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;\n+ m_VulkanFunctions.vkFreeMemory = (PFN_vkFreeMemory)vkFreeMemory;\n+ m_VulkanFunctions.vkMapMemory = (PFN_vkMapMemory)vkMapMemory;\n+ m_VulkanFunctions.vkUnmapMemory = (PFN_vkUnmapMemory)vkUnmapMemory;\n+ m_VulkanFunctions.vkFlushMappedMemoryRanges = (PFN_vkFlushMappedMemoryRanges)vkFlushMappedMemoryRanges;\n+ m_VulkanFunctions.vkInvalidateMappedMemoryRanges = (PFN_vkInvalidateMappedMemoryRanges)vkInvalidateMappedMemoryRanges;\n+ m_VulkanFunctions.vkBindBufferMemory = (PFN_vkBindBufferMemory)vkBindBufferMemory;\n+ m_VulkanFunctions.vkBindImageMemory = (PFN_vkBindImageMemory)vkBindImageMemory;\n+ m_VulkanFunctions.vkGetBufferMemoryRequirements = (PFN_vkGetBufferMemoryRequirements)vkGetBufferMemoryRequirements;\n+ m_VulkanFunctions.vkGetImageMemoryRequirements = (PFN_vkGetImageMemoryRequirements)vkGetImageMemoryRequirements;\n+ m_VulkanFunctions.vkCreateBuffer = (PFN_vkCreateBuffer)vkCreateBuffer;\n+ m_VulkanFunctions.vkDestroyBuffer = (PFN_vkDestroyBuffer)vkDestroyBuffer;\n+ m_VulkanFunctions.vkCreateImage = (PFN_vkCreateImage)vkCreateImage;\n+ m_VulkanFunctions.vkDestroyImage = (PFN_vkDestroyImage)vkDestroyImage;\n+ m_VulkanFunctions.vkCmdCopyBuffer = (PFN_vkCmdCopyBuffer)vkCmdCopyBuffer;\n+\n+ \/\/ Vulkan 1.1\n+#if VMA_VULKAN_VERSION >= 1001000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR = (PFN_vkGetBufferMemoryRequirements2)vkGetBufferMemoryRequirements2;\n+ m_VulkanFunctions.vkGetImageMemoryRequirements2KHR = (PFN_vkGetImageMemoryRequirements2)vkGetImageMemoryRequirements2;\n+ m_VulkanFunctions.vkBindBufferMemory2KHR = (PFN_vkBindBufferMemory2)vkBindBufferMemory2;\n+ m_VulkanFunctions.vkBindImageMemory2KHR = (PFN_vkBindImageMemory2)vkBindImageMemory2;\n+ m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR = (PFN_vkGetPhysicalDeviceMemoryProperties2)vkGetPhysicalDeviceMemoryProperties2;\n+ }\n+#endif\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\n+ {\n+ m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements = (PFN_vkGetDeviceBufferMemoryRequirements)vkGetDeviceBufferMemoryRequirements;\n+ m_VulkanFunctions.vkGetDeviceImageMemoryRequirements = (PFN_vkGetDeviceImageMemoryRequirements)vkGetDeviceImageMemoryRequirements;\n+ }\n+#endif\n+}\n+\n+#endif \/\/ VMA_STATIC_VULKAN_FUNCTIONS == 1\n+\n+void VmaAllocator_T::ImportVulkanFunctions_Custom(const VmaVulkanFunctions* pVulkanFunctions)\n+{\n+ VMA_ASSERT(pVulkanFunctions != VMA_NULL);\n+\n+#define VMA_COPY_IF_NOT_NULL(funcName) \\\n+ if(pVulkanFunctions->funcName != VMA_NULL) m_VulkanFunctions.funcName = pVulkanFunctions->funcName;\n+\n+ VMA_COPY_IF_NOT_NULL(vkGetInstanceProcAddr);\n+ VMA_COPY_IF_NOT_NULL(vkGetDeviceProcAddr);\n+ VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceProperties);\n+ VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties);\n+ VMA_COPY_IF_NOT_NULL(vkAllocateMemory);\n+ VMA_COPY_IF_NOT_NULL(vkFreeMemory);\n+ VMA_COPY_IF_NOT_NULL(vkMapMemory);\n+ VMA_COPY_IF_NOT_NULL(vkUnmapMemory);\n+ VMA_COPY_IF_NOT_NULL(vkFlushMappedMemoryRanges);\n+ VMA_COPY_IF_NOT_NULL(vkInvalidateMappedMemoryRanges);\n+ VMA_COPY_IF_NOT_NULL(vkBindBufferMemory);\n+ VMA_COPY_IF_NOT_NULL(vkBindImageMemory);\n+ VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements);\n+ VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements);\n+ VMA_COPY_IF_NOT_NULL(vkCreateBuffer);\n+ VMA_COPY_IF_NOT_NULL(vkDestroyBuffer);\n+ VMA_COPY_IF_NOT_NULL(vkCreateImage);\n+ VMA_COPY_IF_NOT_NULL(vkDestroyImage);\n+ VMA_COPY_IF_NOT_NULL(vkCmdCopyBuffer);\n+\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ VMA_COPY_IF_NOT_NULL(vkGetBufferMemoryRequirements2KHR);\n+ VMA_COPY_IF_NOT_NULL(vkGetImageMemoryRequirements2KHR);\n+#endif\n+\n+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\n+ VMA_COPY_IF_NOT_NULL(vkBindBufferMemory2KHR);\n+ VMA_COPY_IF_NOT_NULL(vkBindImageMemory2KHR);\n+#endif\n+\n+#if VMA_MEMORY_BUDGET\n+ VMA_COPY_IF_NOT_NULL(vkGetPhysicalDeviceMemoryProperties2KHR);\n+#endif\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ VMA_COPY_IF_NOT_NULL(vkGetDeviceBufferMemoryRequirements);\n+ VMA_COPY_IF_NOT_NULL(vkGetDeviceImageMemoryRequirements);\n+#endif\n+\n+#undef VMA_COPY_IF_NOT_NULL\n+}\n+\n+#if VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\n+\n+void VmaAllocator_T::ImportVulkanFunctions_Dynamic()\n+{\n+ VMA_ASSERT(m_VulkanFunctions.vkGetInstanceProcAddr && m_VulkanFunctions.vkGetDeviceProcAddr &&\n+ \"To use VMA_DYNAMIC_VULKAN_FUNCTIONS in new versions of VMA you now have to pass \"\n+ \"VmaVulkanFunctions::vkGetInstanceProcAddr and vkGetDeviceProcAddr as VmaAllocatorCreateInfo::pVulkanFunctions. \"\n+ \"Other members can be null.\");\n+\n+#define VMA_FETCH_INSTANCE_FUNC(memberName, functionPointerType, functionNameString) \\\n+ if(m_VulkanFunctions.memberName == VMA_NULL) \\\n+ m_VulkanFunctions.memberName = \\\n+ (functionPointerType)m_VulkanFunctions.vkGetInstanceProcAddr(m_hInstance, functionNameString);\n+#define VMA_FETCH_DEVICE_FUNC(memberName, functionPointerType, functionNameString) \\\n+ if(m_VulkanFunctions.memberName == VMA_NULL) \\\n+ m_VulkanFunctions.memberName = \\\n+ (functionPointerType)m_VulkanFunctions.vkGetDeviceProcAddr(m_hDevice, functionNameString);\n+\n+ VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceProperties, PFN_vkGetPhysicalDeviceProperties, \"vkGetPhysicalDeviceProperties\");\n+ VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties, PFN_vkGetPhysicalDeviceMemoryProperties, \"vkGetPhysicalDeviceMemoryProperties\");\n+ VMA_FETCH_DEVICE_FUNC(vkAllocateMemory, PFN_vkAllocateMemory, \"vkAllocateMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkFreeMemory, PFN_vkFreeMemory, \"vkFreeMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkMapMemory, PFN_vkMapMemory, \"vkMapMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkUnmapMemory, PFN_vkUnmapMemory, \"vkUnmapMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkFlushMappedMemoryRanges, PFN_vkFlushMappedMemoryRanges, \"vkFlushMappedMemoryRanges\");\n+ VMA_FETCH_DEVICE_FUNC(vkInvalidateMappedMemoryRanges, PFN_vkInvalidateMappedMemoryRanges, \"vkInvalidateMappedMemoryRanges\");\n+ VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory, PFN_vkBindBufferMemory, \"vkBindBufferMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkBindImageMemory, PFN_vkBindImageMemory, \"vkBindImageMemory\");\n+ VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements, PFN_vkGetBufferMemoryRequirements, \"vkGetBufferMemoryRequirements\");\n+ VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements, PFN_vkGetImageMemoryRequirements, \"vkGetImageMemoryRequirements\");\n+ VMA_FETCH_DEVICE_FUNC(vkCreateBuffer, PFN_vkCreateBuffer, \"vkCreateBuffer\");\n+ VMA_FETCH_DEVICE_FUNC(vkDestroyBuffer, PFN_vkDestroyBuffer, \"vkDestroyBuffer\");\n+ VMA_FETCH_DEVICE_FUNC(vkCreateImage, PFN_vkCreateImage, \"vkCreateImage\");\n+ VMA_FETCH_DEVICE_FUNC(vkDestroyImage, PFN_vkDestroyImage, \"vkDestroyImage\");\n+ VMA_FETCH_DEVICE_FUNC(vkCmdCopyBuffer, PFN_vkCmdCopyBuffer, \"vkCmdCopyBuffer\");\n+\n+#if VMA_VULKAN_VERSION >= 1001000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2, \"vkGetBufferMemoryRequirements2\");\n+ VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2, \"vkGetImageMemoryRequirements2\");\n+ VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2, \"vkBindBufferMemory2\");\n+ VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2, \"vkBindImageMemory2\");\n+ VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2, \"vkGetPhysicalDeviceMemoryProperties2\");\n+ }\n+#endif\n+\n+#if VMA_DEDICATED_ALLOCATION\n+ if(m_UseKhrDedicatedAllocation)\n+ {\n+ VMA_FETCH_DEVICE_FUNC(vkGetBufferMemoryRequirements2KHR, PFN_vkGetBufferMemoryRequirements2KHR, \"vkGetBufferMemoryRequirements2KHR\");\n+ VMA_FETCH_DEVICE_FUNC(vkGetImageMemoryRequirements2KHR, PFN_vkGetImageMemoryRequirements2KHR, \"vkGetImageMemoryRequirements2KHR\");\n+ }\n+#endif\n+\n+#if VMA_BIND_MEMORY2\n+ if(m_UseKhrBindMemory2)\n+ {\n+ VMA_FETCH_DEVICE_FUNC(vkBindBufferMemory2KHR, PFN_vkBindBufferMemory2KHR, \"vkBindBufferMemory2KHR\");\n+ VMA_FETCH_DEVICE_FUNC(vkBindImageMemory2KHR, PFN_vkBindImageMemory2KHR, \"vkBindImageMemory2KHR\");\n+ }\n+#endif \/\/ #if VMA_BIND_MEMORY2\n+\n+#if VMA_MEMORY_BUDGET\n+ if(m_UseExtMemoryBudget)\n+ {\n+ VMA_FETCH_INSTANCE_FUNC(vkGetPhysicalDeviceMemoryProperties2KHR, PFN_vkGetPhysicalDeviceMemoryProperties2KHR, \"vkGetPhysicalDeviceMemoryProperties2KHR\");\n+ }\n+#endif \/\/ #if VMA_MEMORY_BUDGET\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\n+ {\n+ VMA_FETCH_DEVICE_FUNC(vkGetDeviceBufferMemoryRequirements, PFN_vkGetDeviceBufferMemoryRequirements, \"vkGetDeviceBufferMemoryRequirements\");\n+ VMA_FETCH_DEVICE_FUNC(vkGetDeviceImageMemoryRequirements, PFN_vkGetDeviceImageMemoryRequirements, \"vkGetDeviceImageMemoryRequirements\");\n+ }\n+#endif\n+\n+#undef VMA_FETCH_DEVICE_FUNC\n+#undef VMA_FETCH_INSTANCE_FUNC\n+}\n+\n+#endif \/\/ VMA_DYNAMIC_VULKAN_FUNCTIONS == 1\n+\n+void VmaAllocator_T::ValidateVulkanFunctions()\n+{\n+ VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceProperties != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkAllocateMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkFreeMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkMapMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkUnmapMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkFlushMappedMemoryRanges != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkInvalidateMappedMemoryRanges != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkCreateBuffer != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkDestroyBuffer != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkCreateImage != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkDestroyImage != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkCmdCopyBuffer != VMA_NULL);\n+\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrDedicatedAllocation)\n+ {\n+ VMA_ASSERT(m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkGetImageMemoryRequirements2KHR != VMA_NULL);\n+ }\n+#endif\n+\n+#if VMA_BIND_MEMORY2 || VMA_VULKAN_VERSION >= 1001000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0) || m_UseKhrBindMemory2)\n+ {\n+ VMA_ASSERT(m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL);\n+ }\n+#endif\n+\n+#if VMA_MEMORY_BUDGET || VMA_VULKAN_VERSION >= 1001000\n+ if(m_UseExtMemoryBudget || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ VMA_ASSERT(m_VulkanFunctions.vkGetPhysicalDeviceMemoryProperties2KHR != VMA_NULL);\n+ }\n+#endif\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ if(m_VulkanApiVersion >= VK_MAKE_VERSION(1, 3, 0))\n+ {\n+ VMA_ASSERT(m_VulkanFunctions.vkGetDeviceBufferMemoryRequirements != VMA_NULL);\n+ VMA_ASSERT(m_VulkanFunctions.vkGetDeviceImageMemoryRequirements != VMA_NULL);\n+ }\n+#endif\n+}\n+\n+VkDeviceSize VmaAllocator_T::CalcPreferredBlockSize(uint32_t memTypeIndex)\n+{\n+ const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);\n+ const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;\n+ const bool isSmallHeap = heapSize <= VMA_SMALL_HEAP_MAX_SIZE;\n+ return VmaAlignUp(isSmallHeap ? (heapSize \/ 8) : m_PreferredLargeHeapBlockSize, (VkDeviceSize)32);\n+}\n+\n+VkResult VmaAllocator_T::AllocateMemoryOfType(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VkDeviceSize alignment,\n+ bool dedicatedPreferred,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage,\n+ const VmaAllocationCreateInfo& createInfo,\n+ uint32_t memTypeIndex,\n+ VmaSuballocationType suballocType,\n+ VmaDedicatedAllocationList& dedicatedAllocations,\n+ VmaBlockVector& blockVector,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations)\n+{\n+ VMA_ASSERT(pAllocations != VMA_NULL);\n+ VMA_DEBUG_LOG(\" AllocateMemory: MemoryTypeIndex=%u, AllocationCount=%zu, Size=%llu\", memTypeIndex, allocationCount, size);\n+\n+ VmaAllocationCreateInfo finalCreateInfo = createInfo;\n+ VkResult res = CalcMemTypeParams(\n+ finalCreateInfo,\n+ memTypeIndex,\n+ size,\n+ allocationCount);\n+ if(res != VK_SUCCESS)\n+ return res;\n+\n+ if((finalCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)\n+ {\n+ return AllocateDedicatedMemory(\n+ pool,\n+ size,\n+ suballocType,\n+ dedicatedAllocations,\n+ memTypeIndex,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\n+ (finalCreateInfo.flags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\n+ finalCreateInfo.pUserData,\n+ finalCreateInfo.priority,\n+ dedicatedBuffer,\n+ dedicatedImage,\n+ dedicatedBufferImageUsage,\n+ allocationCount,\n+ pAllocations,\n+ blockVector.GetAllocationNextPtr());\n+ }\n+ else\n+ {\n+ const bool canAllocateDedicated =\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) == 0 &&\n+ (pool == VK_NULL_HANDLE || !blockVector.HasExplicitBlockSize());\n+\n+ if(canAllocateDedicated)\n+ {\n+ \/\/ Heuristics: Allocate dedicated memory if requested size if greater than half of preferred block size.\n+ if(size > blockVector.GetPreferredBlockSize() \/ 2)\n+ {\n+ dedicatedPreferred = true;\n+ }\n+ \/\/ Protection against creating each allocation as dedicated when we reach or exceed heap size\/budget,\n+ \/\/ which can quickly deplete maxMemoryAllocationCount: Don't prefer dedicated allocations when above\n+ \/\/ 3\/4 of the maximum allocation count.\n+ if(m_DeviceMemoryCount.load() > m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount * 3 \/ 4)\n+ {\n+ dedicatedPreferred = false;\n+ }\n+\n+ if(dedicatedPreferred)\n+ {\n+ res = AllocateDedicatedMemory(\n+ pool,\n+ size,\n+ suballocType,\n+ dedicatedAllocations,\n+ memTypeIndex,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\n+ (finalCreateInfo.flags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\n+ finalCreateInfo.pUserData,\n+ finalCreateInfo.priority,\n+ dedicatedBuffer,\n+ dedicatedImage,\n+ dedicatedBufferImageUsage,\n+ allocationCount,\n+ pAllocations,\n+ blockVector.GetAllocationNextPtr());\n+ if(res == VK_SUCCESS)\n+ {\n+ \/\/ Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.\n+ VMA_DEBUG_LOG(\" Allocated as DedicatedMemory\");\n+ return VK_SUCCESS;\n+ }\n+ }\n+ }\n+\n+ res = blockVector.Allocate(\n+ size,\n+ alignment,\n+ finalCreateInfo,\n+ suballocType,\n+ allocationCount,\n+ pAllocations);\n+ if(res == VK_SUCCESS)\n+ return VK_SUCCESS;\n+\n+ \/\/ Try dedicated memory.\n+ if(canAllocateDedicated && !dedicatedPreferred)\n+ {\n+ res = AllocateDedicatedMemory(\n+ pool,\n+ size,\n+ suballocType,\n+ dedicatedAllocations,\n+ memTypeIndex,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_USER_DATA_COPY_STRING_BIT) != 0,\n+ (finalCreateInfo.flags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0,\n+ (finalCreateInfo.flags & VMA_ALLOCATION_CREATE_CAN_ALIAS_BIT) != 0,\n+ finalCreateInfo.pUserData,\n+ finalCreateInfo.priority,\n+ dedicatedBuffer,\n+ dedicatedImage,\n+ dedicatedBufferImageUsage,\n+ allocationCount,\n+ pAllocations,\n+ blockVector.GetAllocationNextPtr());\n+ if(res == VK_SUCCESS)\n+ {\n+ \/\/ Succeeded: AllocateDedicatedMemory function already filld pMemory, nothing more to do here.\n+ VMA_DEBUG_LOG(\" Allocated as DedicatedMemory\");\n+ return VK_SUCCESS;\n+ }\n+ }\n+ \/\/ Everything failed: Return error code.\n+ VMA_DEBUG_LOG(\" vkAllocateMemory FAILED\");\n+ return res;\n+ }\n+}\n+\n+VkResult VmaAllocator_T::AllocateDedicatedMemory(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VmaSuballocationType suballocType,\n+ VmaDedicatedAllocationList& dedicatedAllocations,\n+ uint32_t memTypeIndex,\n+ bool map,\n+ bool isUserDataString,\n+ bool isMappingAllowed,\n+ bool canAliasMemory,\n+ void* pUserData,\n+ float priority,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations,\n+ const void* pNextChain)\n+{\n+ VMA_ASSERT(allocationCount > 0 && pAllocations);\n+\n+ VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };\n+ allocInfo.memoryTypeIndex = memTypeIndex;\n+ allocInfo.allocationSize = size;\n+ allocInfo.pNext = pNextChain;\n+\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR };\n+ if(!canAliasMemory)\n+ {\n+ if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ if(dedicatedBuffer != VK_NULL_HANDLE)\n+ {\n+ VMA_ASSERT(dedicatedImage == VK_NULL_HANDLE);\n+ dedicatedAllocInfo.buffer = dedicatedBuffer;\n+ VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo);\n+ }\n+ else if(dedicatedImage != VK_NULL_HANDLE)\n+ {\n+ dedicatedAllocInfo.image = dedicatedImage;\n+ VmaPnextChainPushFront(&allocInfo, &dedicatedAllocInfo);\n+ }\n+ }\n+ }\n+#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+\n+#if VMA_BUFFER_DEVICE_ADDRESS\n+ VkMemoryAllocateFlagsInfoKHR allocFlagsInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHR };\n+ if(m_UseKhrBufferDeviceAddress)\n+ {\n+ bool canContainBufferWithDeviceAddress = true;\n+ if(dedicatedBuffer != VK_NULL_HANDLE)\n+ {\n+ canContainBufferWithDeviceAddress = dedicatedBufferImageUsage == UINT32_MAX || \/\/ Usage flags unknown\n+ (dedicatedBufferImageUsage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT) != 0;\n+ }\n+ else if(dedicatedImage != VK_NULL_HANDLE)\n+ {\n+ canContainBufferWithDeviceAddress = false;\n+ }\n+ if(canContainBufferWithDeviceAddress)\n+ {\n+ allocFlagsInfo.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR;\n+ VmaPnextChainPushFront(&allocInfo, &allocFlagsInfo);\n+ }\n+ }\n+#endif \/\/ #if VMA_BUFFER_DEVICE_ADDRESS\n+\n+#if VMA_MEMORY_PRIORITY\n+ VkMemoryPriorityAllocateInfoEXT priorityInfo = { VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT };\n+ if(m_UseExtMemoryPriority)\n+ {\n+ VMA_ASSERT(priority >= 0.f && priority <= 1.f);\n+ priorityInfo.priority = priority;\n+ VmaPnextChainPushFront(&allocInfo, &priorityInfo);\n+ }\n+#endif \/\/ #if VMA_MEMORY_PRIORITY\n+\n+#if VMA_EXTERNAL_MEMORY\n+ \/\/ Attach VkExportMemoryAllocateInfoKHR if necessary.\n+ VkExportMemoryAllocateInfoKHR exportMemoryAllocInfo = { VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR };\n+ exportMemoryAllocInfo.handleTypes = GetExternalMemoryHandleTypeFlags(memTypeIndex);\n+ if(exportMemoryAllocInfo.handleTypes != 0)\n+ {\n+ VmaPnextChainPushFront(&allocInfo, &exportMemoryAllocInfo);\n+ }\n+#endif \/\/ #if VMA_EXTERNAL_MEMORY\n+\n+ size_t allocIndex;\n+ VkResult res = VK_SUCCESS;\n+ for(allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\n+ {\n+ res = AllocateDedicatedMemoryPage(\n+ pool,\n+ size,\n+ suballocType,\n+ memTypeIndex,\n+ allocInfo,\n+ map,\n+ isUserDataString,\n+ isMappingAllowed,\n+ pUserData,\n+ pAllocations + allocIndex);\n+ if(res != VK_SUCCESS)\n+ {\n+ break;\n+ }\n+ }\n+\n+ if(res == VK_SUCCESS)\n+ {\n+ for (allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\n+ {\n+ dedicatedAllocations.Register(pAllocations[allocIndex]);\n+ }\n+ VMA_DEBUG_LOG(\" Allocated DedicatedMemory Count=%zu, MemoryTypeIndex=#%u\", allocationCount, memTypeIndex);\n+ }\n+ else\n+ {\n+ \/\/ Free all already created allocations.\n+ while(allocIndex--)\n+ {\n+ VmaAllocation currAlloc = pAllocations[allocIndex];\n+ VkDeviceMemory hMemory = currAlloc->GetMemory();\n+\n+ \/*\n+ There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory\n+ before vkFreeMemory.\n+\n+ if(currAlloc->GetMappedData() != VMA_NULL)\n+ {\n+ (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);\n+ }\n+ *\/\n+\n+ FreeVulkanMemory(memTypeIndex, currAlloc->GetSize(), hMemory);\n+ m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), currAlloc->GetSize());\n+ m_AllocationObjectAllocator.Free(currAlloc);\n+ }\n+\n+ memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\n+ }\n+\n+ return res;\n+}\n+\n+VkResult VmaAllocator_T::AllocateDedicatedMemoryPage(\n+ VmaPool pool,\n+ VkDeviceSize size,\n+ VmaSuballocationType suballocType,\n+ uint32_t memTypeIndex,\n+ const VkMemoryAllocateInfo& allocInfo,\n+ bool map,\n+ bool isUserDataString,\n+ bool isMappingAllowed,\n+ void* pUserData,\n+ VmaAllocation* pAllocation)\n+{\n+ VkDeviceMemory hMemory = VK_NULL_HANDLE;\n+ VkResult res = AllocateVulkanMemory(&allocInfo, &hMemory);\n+ if(res < 0)\n+ {\n+ VMA_DEBUG_LOG(\" vkAllocateMemory FAILED\");\n+ return res;\n+ }\n+\n+ void* pMappedData = VMA_NULL;\n+ if(map)\n+ {\n+ res = (*m_VulkanFunctions.vkMapMemory)(\n+ m_hDevice,\n+ hMemory,\n+ 0,\n+ VK_WHOLE_SIZE,\n+ 0,\n+ &pMappedData);\n+ if(res < 0)\n+ {\n+ VMA_DEBUG_LOG(\" vkMapMemory FAILED\");\n+ FreeVulkanMemory(memTypeIndex, size, hMemory);\n+ return res;\n+ }\n+ }\n+\n+ *pAllocation = m_AllocationObjectAllocator.Allocate(isMappingAllowed);\n+ (*pAllocation)->InitDedicatedAllocation(pool, memTypeIndex, hMemory, suballocType, pMappedData, size);\n+ if (isUserDataString)\n+ (*pAllocation)->SetName(this, (const char*)pUserData);\n+ else\n+ (*pAllocation)->SetUserData(this, pUserData);\n+ m_Budget.AddAllocation(MemoryTypeIndexToHeapIndex(memTypeIndex), size);\n+ if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)\n+ {\n+ FillAllocation(*pAllocation, VMA_ALLOCATION_FILL_PATTERN_CREATED);\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+void VmaAllocator_T::GetBufferMemoryRequirements(\n+ VkBuffer hBuffer,\n+ VkMemoryRequirements& memReq,\n+ bool& requiresDedicatedAllocation,\n+ bool& prefersDedicatedAllocation) const\n+{\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR };\n+ memReqInfo.buffer = hBuffer;\n+\n+ VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };\n+\n+ VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };\n+ VmaPnextChainPushFront(&memReq2, &memDedicatedReq);\n+\n+ (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);\n+\n+ memReq = memReq2.memoryRequirements;\n+ requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);\n+ prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE);\n+ }\n+ else\n+#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ {\n+ (*m_VulkanFunctions.vkGetBufferMemoryRequirements)(m_hDevice, hBuffer, &memReq);\n+ requiresDedicatedAllocation = false;\n+ prefersDedicatedAllocation = false;\n+ }\n+}\n+\n+void VmaAllocator_T::GetImageMemoryRequirements(\n+ VkImage hImage,\n+ VkMemoryRequirements& memReq,\n+ bool& requiresDedicatedAllocation,\n+ bool& prefersDedicatedAllocation) const\n+{\n+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0))\n+ {\n+ VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR };\n+ memReqInfo.image = hImage;\n+\n+ VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR };\n+\n+ VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR };\n+ VmaPnextChainPushFront(&memReq2, &memDedicatedReq);\n+\n+ (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2);\n+\n+ memReq = memReq2.memoryRequirements;\n+ requiresDedicatedAllocation = (memDedicatedReq.requiresDedicatedAllocation != VK_FALSE);\n+ prefersDedicatedAllocation = (memDedicatedReq.prefersDedicatedAllocation != VK_FALSE);\n+ }\n+ else\n+#endif \/\/ #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000\n+ {\n+ (*m_VulkanFunctions.vkGetImageMemoryRequirements)(m_hDevice, hImage, &memReq);\n+ requiresDedicatedAllocation = false;\n+ prefersDedicatedAllocation = false;\n+ }\n+}\n+\n+VkResult VmaAllocator_T::FindMemoryTypeIndex(\n+ uint32_t memoryTypeBits,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ VkFlags bufImgUsage,\n+ uint32_t* pMemoryTypeIndex) const\n+{\n+ memoryTypeBits &= GetGlobalMemoryTypeBits();\n+\n+ if(pAllocationCreateInfo->memoryTypeBits != 0)\n+ {\n+ memoryTypeBits &= pAllocationCreateInfo->memoryTypeBits;\n+ }\n+\n+ VkMemoryPropertyFlags requiredFlags = 0, preferredFlags = 0, notPreferredFlags = 0;\n+ if(!FindMemoryPreferences(\n+ IsIntegratedGpu(),\n+ *pAllocationCreateInfo,\n+ bufImgUsage,\n+ requiredFlags, preferredFlags, notPreferredFlags))\n+ {\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+\n+ *pMemoryTypeIndex = UINT32_MAX;\n+ uint32_t minCost = UINT32_MAX;\n+ for(uint32_t memTypeIndex = 0, memTypeBit = 1;\n+ memTypeIndex < GetMemoryTypeCount();\n+ ++memTypeIndex, memTypeBit <<= 1)\n+ {\n+ \/\/ This memory type is acceptable according to memoryTypeBits bitmask.\n+ if((memTypeBit & memoryTypeBits) != 0)\n+ {\n+ const VkMemoryPropertyFlags currFlags =\n+ m_MemProps.memoryTypes[memTypeIndex].propertyFlags;\n+ \/\/ This memory type contains requiredFlags.\n+ if((requiredFlags & ~currFlags) == 0)\n+ {\n+ \/\/ Calculate cost as number of bits from preferredFlags not present in this memory type.\n+ uint32_t currCost = VMA_COUNT_BITS_SET(preferredFlags & ~currFlags) +\n+ VMA_COUNT_BITS_SET(currFlags & notPreferredFlags);\n+ \/\/ Remember memory type with lowest cost.\n+ if(currCost < minCost)\n+ {\n+ *pMemoryTypeIndex = memTypeIndex;\n+ if(currCost == 0)\n+ {\n+ return VK_SUCCESS;\n+ }\n+ minCost = currCost;\n+ }\n+ }\n+ }\n+ }\n+ return (*pMemoryTypeIndex != UINT32_MAX) ? VK_SUCCESS : VK_ERROR_FEATURE_NOT_PRESENT;\n+}\n+\n+VkResult VmaAllocator_T::CalcMemTypeParams(\n+ VmaAllocationCreateInfo& inoutCreateInfo,\n+ uint32_t memTypeIndex,\n+ VkDeviceSize size,\n+ size_t allocationCount)\n+{\n+ \/\/ If memory type is not HOST_VISIBLE, disable MAPPED.\n+ if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0 &&\n+ (m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)\n+ {\n+ inoutCreateInfo.flags &= ~VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+ }\n+\n+ if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&\n+ (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT) != 0)\n+ {\n+ const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memTypeIndex);\n+ VmaBudget heapBudget = {};\n+ GetHeapBudgets(&heapBudget, heapIndex, 1);\n+ if(heapBudget.usage + size * allocationCount > heapBudget.budget)\n+ {\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+ }\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaAllocator_T::CalcAllocationParams(\n+ VmaAllocationCreateInfo& inoutCreateInfo,\n+ bool dedicatedRequired,\n+ bool dedicatedPreferred)\n+{\n+ VMA_ASSERT((inoutCreateInfo.flags &\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) !=\n+ (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT) &&\n+ \"Specifying both flags VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT and VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT is incorrect.\");\n+ VMA_ASSERT((((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT) == 0 ||\n+ (inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0)) &&\n+ \"Specifying VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT requires also VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\");\n+ if(inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE || inoutCreateInfo.usage == VMA_MEMORY_USAGE_AUTO_PREFER_HOST)\n+ {\n+ if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_MAPPED_BIT) != 0)\n+ {\n+ VMA_ASSERT((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) != 0 &&\n+ \"When using VMA_ALLOCATION_CREATE_MAPPED_BIT and usage = VMA_MEMORY_USAGE_AUTO*, you must also specify VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\");\n+ }\n+ }\n+\n+ \/\/ If memory is lazily allocated, it should be always dedicated.\n+ if(dedicatedRequired ||\n+ inoutCreateInfo.usage == VMA_MEMORY_USAGE_GPU_LAZILY_ALLOCATED)\n+ {\n+ inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\n+ }\n+\n+ if(inoutCreateInfo.pool != VK_NULL_HANDLE)\n+ {\n+ if(inoutCreateInfo.pool->m_BlockVector.HasExplicitBlockSize() &&\n+ (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0)\n+ {\n+ VMA_ASSERT(0 && \"Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT while current custom pool doesn't support dedicated allocations.\");\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+ inoutCreateInfo.priority = inoutCreateInfo.pool->m_BlockVector.GetPriority();\n+ }\n+\n+ if((inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT) != 0 &&\n+ (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)\n+ {\n+ VMA_ASSERT(0 && \"Specifying VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT together with VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT makes no sense.\");\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+\n+ if(VMA_DEBUG_ALWAYS_DEDICATED_MEMORY &&\n+ (inoutCreateInfo.flags & VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT) != 0)\n+ {\n+ inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\n+ }\n+\n+ \/\/ Non-auto USAGE values imply HOST_ACCESS flags.\n+ \/\/ And so does VMA_MEMORY_USAGE_UNKNOWN because it is used with custom pools.\n+ \/\/ Which specific flag is used doesn't matter. They change things only when used with VMA_MEMORY_USAGE_AUTO*.\n+ \/\/ Otherwise they just protect from assert on mapping.\n+ if(inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO &&\n+ inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE &&\n+ inoutCreateInfo.usage != VMA_MEMORY_USAGE_AUTO_PREFER_HOST)\n+ {\n+ if((inoutCreateInfo.flags & (VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT)) == 0)\n+ {\n+ inoutCreateInfo.flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;\n+ }\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+VkResult VmaAllocator_T::AllocateMemory(\n+ const VkMemoryRequirements& vkMemReq,\n+ bool requiresDedicatedAllocation,\n+ bool prefersDedicatedAllocation,\n+ VkBuffer dedicatedBuffer,\n+ VkImage dedicatedImage,\n+ VkFlags dedicatedBufferImageUsage,\n+ const VmaAllocationCreateInfo& createInfo,\n+ VmaSuballocationType suballocType,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations)\n+{\n+ memset(pAllocations, 0, sizeof(VmaAllocation) * allocationCount);\n+\n+ VMA_ASSERT(VmaIsPow2(vkMemReq.alignment));\n+\n+ if(vkMemReq.size == 0)\n+ {\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+\n+ VmaAllocationCreateInfo createInfoFinal = createInfo;\n+ VkResult res = CalcAllocationParams(createInfoFinal, requiresDedicatedAllocation, prefersDedicatedAllocation);\n+ if(res != VK_SUCCESS)\n+ return res;\n+\n+ if(createInfoFinal.pool != VK_NULL_HANDLE)\n+ {\n+ VmaBlockVector& blockVector = createInfoFinal.pool->m_BlockVector;\n+ return AllocateMemoryOfType(\n+ createInfoFinal.pool,\n+ vkMemReq.size,\n+ vkMemReq.alignment,\n+ prefersDedicatedAllocation,\n+ dedicatedBuffer,\n+ dedicatedImage,\n+ dedicatedBufferImageUsage,\n+ createInfoFinal,\n+ blockVector.GetMemoryTypeIndex(),\n+ suballocType,\n+ createInfoFinal.pool->m_DedicatedAllocations,\n+ blockVector,\n+ allocationCount,\n+ pAllocations);\n+ }\n+ else\n+ {\n+ \/\/ Bit mask of memory Vulkan types acceptable for this allocation.\n+ uint32_t memoryTypeBits = vkMemReq.memoryTypeBits;\n+ uint32_t memTypeIndex = UINT32_MAX;\n+ res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);\n+ \/\/ Can't find any single memory type matching requirements. res is VK_ERROR_FEATURE_NOT_PRESENT.\n+ if(res != VK_SUCCESS)\n+ return res;\n+ do\n+ {\n+ VmaBlockVector* blockVector = m_pBlockVectors[memTypeIndex];\n+ VMA_ASSERT(blockVector && \"Trying to use unsupported memory type!\");\n+ res = AllocateMemoryOfType(\n+ VK_NULL_HANDLE,\n+ vkMemReq.size,\n+ vkMemReq.alignment,\n+ requiresDedicatedAllocation || prefersDedicatedAllocation,\n+ dedicatedBuffer,\n+ dedicatedImage,\n+ dedicatedBufferImageUsage,\n+ createInfoFinal,\n+ memTypeIndex,\n+ suballocType,\n+ m_DedicatedAllocations[memTypeIndex],\n+ *blockVector,\n+ allocationCount,\n+ pAllocations);\n+ \/\/ Allocation succeeded\n+ if(res == VK_SUCCESS)\n+ return VK_SUCCESS;\n+\n+ \/\/ Remove old memTypeIndex from list of possibilities.\n+ memoryTypeBits &= ~(1u << memTypeIndex);\n+ \/\/ Find alternative memTypeIndex.\n+ res = FindMemoryTypeIndex(memoryTypeBits, &createInfoFinal, dedicatedBufferImageUsage, &memTypeIndex);\n+ } while(res == VK_SUCCESS);\n+\n+ \/\/ No other matching memory type index could be found.\n+ \/\/ Not returning res, which is VK_ERROR_FEATURE_NOT_PRESENT, because we already failed to allocate once.\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+}\n+\n+void VmaAllocator_T::FreeMemory(\n+ size_t allocationCount,\n+ const VmaAllocation* pAllocations)\n+{\n+ VMA_ASSERT(pAllocations);\n+\n+ for(size_t allocIndex = allocationCount; allocIndex--; )\n+ {\n+ VmaAllocation allocation = pAllocations[allocIndex];\n+\n+ if(allocation != VK_NULL_HANDLE)\n+ {\n+ if(VMA_DEBUG_INITIALIZE_ALLOCATIONS)\n+ {\n+ FillAllocation(allocation, VMA_ALLOCATION_FILL_PATTERN_DESTROYED);\n+ }\n+\n+ allocation->FreeName(this);\n+\n+ switch(allocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ VmaBlockVector* pBlockVector = VMA_NULL;\n+ VmaPool hPool = allocation->GetParentPool();\n+ if(hPool != VK_NULL_HANDLE)\n+ {\n+ pBlockVector = &hPool->m_BlockVector;\n+ }\n+ else\n+ {\n+ const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\n+ pBlockVector = m_pBlockVectors[memTypeIndex];\n+ VMA_ASSERT(pBlockVector && \"Trying to free memory of unsupported type!\");\n+ }\n+ pBlockVector->Free(allocation);\n+ }\n+ break;\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ FreeDedicatedMemory(allocation);\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ }\n+ }\n+}\n+\n+void VmaAllocator_T::CalculateStatistics(VmaTotalStatistics* pStats)\n+{\n+ \/\/ Initialize.\n+ VmaClearDetailedStatistics(pStats->total);\n+ for(uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i)\n+ VmaClearDetailedStatistics(pStats->memoryType[i]);\n+ for(uint32_t i = 0; i < VK_MAX_MEMORY_HEAPS; ++i)\n+ VmaClearDetailedStatistics(pStats->memoryHeap[i]);\n+\n+ \/\/ Process default pools.\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];\n+ if (pBlockVector != VMA_NULL)\n+ pBlockVector->AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\n+ }\n+\n+ \/\/ Process custom pools.\n+ {\n+ VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\n+ for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\n+ {\n+ VmaBlockVector& blockVector = pool->m_BlockVector;\n+ const uint32_t memTypeIndex = blockVector.GetMemoryTypeIndex();\n+ blockVector.AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\n+ pool->m_DedicatedAllocations.AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\n+ }\n+ }\n+\n+ \/\/ Process dedicated allocations.\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ m_DedicatedAllocations[memTypeIndex].AddDetailedStatistics(pStats->memoryType[memTypeIndex]);\n+ }\n+\n+ \/\/ Sum from memory types to memory heaps.\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ const uint32_t memHeapIndex = m_MemProps.memoryTypes[memTypeIndex].heapIndex;\n+ VmaAddDetailedStatistics(pStats->memoryHeap[memHeapIndex], pStats->memoryType[memTypeIndex]);\n+ }\n+\n+ \/\/ Sum from memory heaps to total.\n+ for(uint32_t memHeapIndex = 0; memHeapIndex < GetMemoryHeapCount(); ++memHeapIndex)\n+ VmaAddDetailedStatistics(pStats->total, pStats->memoryHeap[memHeapIndex]);\n+\n+ VMA_ASSERT(pStats->total.statistics.allocationCount == 0 ||\n+ pStats->total.allocationSizeMax >= pStats->total.allocationSizeMin);\n+ VMA_ASSERT(pStats->total.unusedRangeCount == 0 ||\n+ pStats->total.unusedRangeSizeMax >= pStats->total.unusedRangeSizeMin);\n+}\n+\n+void VmaAllocator_T::GetHeapBudgets(VmaBudget* outBudgets, uint32_t firstHeap, uint32_t heapCount)\n+{\n+#if VMA_MEMORY_BUDGET\n+ if(m_UseExtMemoryBudget)\n+ {\n+ if(m_Budget.m_OperationsSinceBudgetFetch < 30)\n+ {\n+ VmaMutexLockRead lockRead(m_Budget.m_BudgetMutex, m_UseMutex);\n+ for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets)\n+ {\n+ const uint32_t heapIndex = firstHeap + i;\n+\n+ outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex];\n+ outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex];\n+ outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex];\n+ outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex];\n+\n+ if(m_Budget.m_VulkanUsage[heapIndex] + outBudgets->statistics.blockBytes > m_Budget.m_BlockBytesAtBudgetFetch[heapIndex])\n+ {\n+ outBudgets->usage = m_Budget.m_VulkanUsage[heapIndex] +\n+ outBudgets->statistics.blockBytes - m_Budget.m_BlockBytesAtBudgetFetch[heapIndex];\n+ }\n+ else\n+ {\n+ outBudgets->usage = 0;\n+ }\n+\n+ \/\/ Have to take MIN with heap size because explicit HeapSizeLimit is included in it.\n+ outBudgets->budget = VMA_MIN(\n+ m_Budget.m_VulkanBudget[heapIndex], m_MemProps.memoryHeaps[heapIndex].size);\n+ }\n+ }\n+ else\n+ {\n+ UpdateVulkanBudget(); \/\/ Outside of mutex lock\n+ GetHeapBudgets(outBudgets, firstHeap, heapCount); \/\/ Recursion\n+ }\n+ }\n+ else\n+#endif\n+ {\n+ for(uint32_t i = 0; i < heapCount; ++i, ++outBudgets)\n+ {\n+ const uint32_t heapIndex = firstHeap + i;\n+\n+ outBudgets->statistics.blockCount = m_Budget.m_BlockCount[heapIndex];\n+ outBudgets->statistics.allocationCount = m_Budget.m_AllocationCount[heapIndex];\n+ outBudgets->statistics.blockBytes = m_Budget.m_BlockBytes[heapIndex];\n+ outBudgets->statistics.allocationBytes = m_Budget.m_AllocationBytes[heapIndex];\n+\n+ outBudgets->usage = outBudgets->statistics.blockBytes;\n+ outBudgets->budget = m_MemProps.memoryHeaps[heapIndex].size * 8 \/ 10; \/\/ 80% heuristics.\n+ }\n+ }\n+}\n+\n+void VmaAllocator_T::GetAllocationInfo(VmaAllocation hAllocation, VmaAllocationInfo* pAllocationInfo)\n+{\n+ pAllocationInfo->memoryType = hAllocation->GetMemoryTypeIndex();\n+ pAllocationInfo->deviceMemory = hAllocation->GetMemory();\n+ pAllocationInfo->offset = hAllocation->GetOffset();\n+ pAllocationInfo->size = hAllocation->GetSize();\n+ pAllocationInfo->pMappedData = hAllocation->GetMappedData();\n+ pAllocationInfo->pUserData = hAllocation->GetUserData();\n+ pAllocationInfo->pName = hAllocation->GetName();\n+}\n+\n+VkResult VmaAllocator_T::CreatePool(const VmaPoolCreateInfo* pCreateInfo, VmaPool* pPool)\n+{\n+ VMA_DEBUG_LOG(\" CreatePool: MemoryTypeIndex=%u, flags=%u\", pCreateInfo->memoryTypeIndex, pCreateInfo->flags);\n+\n+ VmaPoolCreateInfo newCreateInfo = *pCreateInfo;\n+\n+ \/\/ Protection against uninitialized new structure member. If garbage data are left there, this pointer dereference would crash.\n+ if(pCreateInfo->pMemoryAllocateNext)\n+ {\n+ VMA_ASSERT(((const VkBaseInStructure*)pCreateInfo->pMemoryAllocateNext)->sType != 0);\n+ }\n+\n+ if(newCreateInfo.maxBlockCount == 0)\n+ {\n+ newCreateInfo.maxBlockCount = SIZE_MAX;\n+ }\n+ if(newCreateInfo.minBlockCount > newCreateInfo.maxBlockCount)\n+ {\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+ \/\/ Memory type index out of range or forbidden.\n+ if(pCreateInfo->memoryTypeIndex >= GetMemoryTypeCount() ||\n+ ((1u << pCreateInfo->memoryTypeIndex) & m_GlobalMemoryTypeBits) == 0)\n+ {\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+ if(newCreateInfo.minAllocationAlignment > 0)\n+ {\n+ VMA_ASSERT(VmaIsPow2(newCreateInfo.minAllocationAlignment));\n+ }\n+\n+ const VkDeviceSize preferredBlockSize = CalcPreferredBlockSize(newCreateInfo.memoryTypeIndex);\n+\n+ *pPool = vma_new(this, VmaPool_T)(this, newCreateInfo, preferredBlockSize);\n+\n+ VkResult res = (*pPool)->m_BlockVector.CreateMinBlocks();\n+ if(res != VK_SUCCESS)\n+ {\n+ vma_delete(this, *pPool);\n+ *pPool = VMA_NULL;\n+ return res;\n+ }\n+\n+ \/\/ Add to m_Pools.\n+ {\n+ VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);\n+ (*pPool)->SetId(m_NextPoolId++);\n+ m_Pools.PushBack(*pPool);\n+ }\n+\n+ return VK_SUCCESS;\n+}\n+\n+void VmaAllocator_T::DestroyPool(VmaPool pool)\n+{\n+ \/\/ Remove from m_Pools.\n+ {\n+ VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex);\n+ m_Pools.Remove(pool);\n+ }\n+\n+ vma_delete(this, pool);\n+}\n+\n+void VmaAllocator_T::GetPoolStatistics(VmaPool pool, VmaStatistics* pPoolStats)\n+{\n+ VmaClearStatistics(*pPoolStats);\n+ pool->m_BlockVector.AddStatistics(*pPoolStats);\n+ pool->m_DedicatedAllocations.AddStatistics(*pPoolStats);\n+}\n+\n+void VmaAllocator_T::CalculatePoolStatistics(VmaPool pool, VmaDetailedStatistics* pPoolStats)\n+{\n+ VmaClearDetailedStatistics(*pPoolStats);\n+ pool->m_BlockVector.AddDetailedStatistics(*pPoolStats);\n+ pool->m_DedicatedAllocations.AddDetailedStatistics(*pPoolStats);\n+}\n+\n+void VmaAllocator_T::SetCurrentFrameIndex(uint32_t frameIndex)\n+{\n+ m_CurrentFrameIndex.store(frameIndex);\n+\n+#if VMA_MEMORY_BUDGET\n+ if(m_UseExtMemoryBudget)\n+ {\n+ UpdateVulkanBudget();\n+ }\n+#endif \/\/ #if VMA_MEMORY_BUDGET\n+}\n+\n+VkResult VmaAllocator_T::CheckPoolCorruption(VmaPool hPool)\n+{\n+ return hPool->m_BlockVector.CheckCorruption();\n+}\n+\n+VkResult VmaAllocator_T::CheckCorruption(uint32_t memoryTypeBits)\n+{\n+ VkResult finalRes = VK_ERROR_FEATURE_NOT_PRESENT;\n+\n+ \/\/ Process default pools.\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ VmaBlockVector* const pBlockVector = m_pBlockVectors[memTypeIndex];\n+ if(pBlockVector != VMA_NULL)\n+ {\n+ VkResult localRes = pBlockVector->CheckCorruption();\n+ switch(localRes)\n+ {\n+ case VK_ERROR_FEATURE_NOT_PRESENT:\n+ break;\n+ case VK_SUCCESS:\n+ finalRes = VK_SUCCESS;\n+ break;\n+ default:\n+ return localRes;\n+ }\n+ }\n+ }\n+\n+ \/\/ Process custom pools.\n+ {\n+ VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\n+ for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\n+ {\n+ if(((1u << pool->m_BlockVector.GetMemoryTypeIndex()) & memoryTypeBits) != 0)\n+ {\n+ VkResult localRes = pool->m_BlockVector.CheckCorruption();\n+ switch(localRes)\n+ {\n+ case VK_ERROR_FEATURE_NOT_PRESENT:\n+ break;\n+ case VK_SUCCESS:\n+ finalRes = VK_SUCCESS;\n+ break;\n+ default:\n+ return localRes;\n+ }\n+ }\n+ }\n+ }\n+\n+ return finalRes;\n+}\n+\n+VkResult VmaAllocator_T::AllocateVulkanMemory(const VkMemoryAllocateInfo* pAllocateInfo, VkDeviceMemory* pMemory)\n+{\n+ AtomicTransactionalIncrement<uint32_t> deviceMemoryCountIncrement;\n+ const uint64_t prevDeviceMemoryCount = deviceMemoryCountIncrement.Increment(&m_DeviceMemoryCount);\n+#if VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT\n+ if(prevDeviceMemoryCount >= m_PhysicalDeviceProperties.limits.maxMemoryAllocationCount)\n+ {\n+ return VK_ERROR_TOO_MANY_OBJECTS;\n+ }\n+#endif\n+\n+ const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(pAllocateInfo->memoryTypeIndex);\n+\n+ \/\/ HeapSizeLimit is in effect for this heap.\n+ if((m_HeapSizeLimitMask & (1u << heapIndex)) != 0)\n+ {\n+ const VkDeviceSize heapSize = m_MemProps.memoryHeaps[heapIndex].size;\n+ VkDeviceSize blockBytes = m_Budget.m_BlockBytes[heapIndex];\n+ for(;;)\n+ {\n+ const VkDeviceSize blockBytesAfterAllocation = blockBytes + pAllocateInfo->allocationSize;\n+ if(blockBytesAfterAllocation > heapSize)\n+ {\n+ return VK_ERROR_OUT_OF_DEVICE_MEMORY;\n+ }\n+ if(m_Budget.m_BlockBytes[heapIndex].compare_exchange_strong(blockBytes, blockBytesAfterAllocation))\n+ {\n+ break;\n+ }\n+ }\n+ }\n+ else\n+ {\n+ m_Budget.m_BlockBytes[heapIndex] += pAllocateInfo->allocationSize;\n+ }\n+ ++m_Budget.m_BlockCount[heapIndex];\n+\n+ \/\/ VULKAN CALL vkAllocateMemory.\n+ VkResult res = (*m_VulkanFunctions.vkAllocateMemory)(m_hDevice, pAllocateInfo, GetAllocationCallbacks(), pMemory);\n+\n+ if(res == VK_SUCCESS)\n+ {\n+#if VMA_MEMORY_BUDGET\n+ ++m_Budget.m_OperationsSinceBudgetFetch;\n+#endif\n+\n+ \/\/ Informative callback.\n+ if(m_DeviceMemoryCallbacks.pfnAllocate != VMA_NULL)\n+ {\n+ (*m_DeviceMemoryCallbacks.pfnAllocate)(this, pAllocateInfo->memoryTypeIndex, *pMemory, pAllocateInfo->allocationSize, m_DeviceMemoryCallbacks.pUserData);\n+ }\n+\n+ deviceMemoryCountIncrement.Commit();\n+ }\n+ else\n+ {\n+ --m_Budget.m_BlockCount[heapIndex];\n+ m_Budget.m_BlockBytes[heapIndex] -= pAllocateInfo->allocationSize;\n+ }\n+\n+ return res;\n+}\n+\n+void VmaAllocator_T::FreeVulkanMemory(uint32_t memoryType, VkDeviceSize size, VkDeviceMemory hMemory)\n+{\n+ \/\/ Informative callback.\n+ if(m_DeviceMemoryCallbacks.pfnFree != VMA_NULL)\n+ {\n+ (*m_DeviceMemoryCallbacks.pfnFree)(this, memoryType, hMemory, size, m_DeviceMemoryCallbacks.pUserData);\n+ }\n+\n+ \/\/ VULKAN CALL vkFreeMemory.\n+ (*m_VulkanFunctions.vkFreeMemory)(m_hDevice, hMemory, GetAllocationCallbacks());\n+\n+ const uint32_t heapIndex = MemoryTypeIndexToHeapIndex(memoryType);\n+ --m_Budget.m_BlockCount[heapIndex];\n+ m_Budget.m_BlockBytes[heapIndex] -= size;\n+\n+ --m_DeviceMemoryCount;\n+}\n+\n+VkResult VmaAllocator_T::BindVulkanBuffer(\n+ VkDeviceMemory memory,\n+ VkDeviceSize memoryOffset,\n+ VkBuffer buffer,\n+ const void* pNext)\n+{\n+ if(pNext != VMA_NULL)\n+ {\n+#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\n+ if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&\n+ m_VulkanFunctions.vkBindBufferMemory2KHR != VMA_NULL)\n+ {\n+ VkBindBufferMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR };\n+ bindBufferMemoryInfo.pNext = pNext;\n+ bindBufferMemoryInfo.buffer = buffer;\n+ bindBufferMemoryInfo.memory = memory;\n+ bindBufferMemoryInfo.memoryOffset = memoryOffset;\n+ return (*m_VulkanFunctions.vkBindBufferMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);\n+ }\n+ else\n+#endif \/\/ #if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\n+ {\n+ return VK_ERROR_EXTENSION_NOT_PRESENT;\n+ }\n+ }\n+ else\n+ {\n+ return (*m_VulkanFunctions.vkBindBufferMemory)(m_hDevice, buffer, memory, memoryOffset);\n+ }\n+}\n+\n+VkResult VmaAllocator_T::BindVulkanImage(\n+ VkDeviceMemory memory,\n+ VkDeviceSize memoryOffset,\n+ VkImage image,\n+ const void* pNext)\n+{\n+ if(pNext != VMA_NULL)\n+ {\n+#if VMA_VULKAN_VERSION >= 1001000 || VMA_BIND_MEMORY2\n+ if((m_UseKhrBindMemory2 || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) &&\n+ m_VulkanFunctions.vkBindImageMemory2KHR != VMA_NULL)\n+ {\n+ VkBindImageMemoryInfoKHR bindBufferMemoryInfo = { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR };\n+ bindBufferMemoryInfo.pNext = pNext;\n+ bindBufferMemoryInfo.image = image;\n+ bindBufferMemoryInfo.memory = memory;\n+ bindBufferMemoryInfo.memoryOffset = memoryOffset;\n+ return (*m_VulkanFunctions.vkBindImageMemory2KHR)(m_hDevice, 1, &bindBufferMemoryInfo);\n+ }\n+ else\n+#endif \/\/ #if VMA_BIND_MEMORY2\n+ {\n+ return VK_ERROR_EXTENSION_NOT_PRESENT;\n+ }\n+ }\n+ else\n+ {\n+ return (*m_VulkanFunctions.vkBindImageMemory)(m_hDevice, image, memory, memoryOffset);\n+ }\n+}\n+\n+VkResult VmaAllocator_T::Map(VmaAllocation hAllocation, void** ppData)\n+{\n+ switch(hAllocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\n+ char *pBytes = VMA_NULL;\n+ VkResult res = pBlock->Map(this, 1, (void**)&pBytes);\n+ if(res == VK_SUCCESS)\n+ {\n+ *ppData = pBytes + (ptrdiff_t)hAllocation->GetOffset();\n+ hAllocation->BlockAllocMap();\n+ }\n+ return res;\n+ }\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ return hAllocation->DedicatedAllocMap(this, ppData);\n+ default:\n+ VMA_ASSERT(0);\n+ return VK_ERROR_MEMORY_MAP_FAILED;\n+ }\n+}\n+\n+void VmaAllocator_T::Unmap(VmaAllocation hAllocation)\n+{\n+ switch(hAllocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\n+ hAllocation->BlockAllocUnmap();\n+ pBlock->Unmap(this, 1);\n+ }\n+ break;\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ hAllocation->DedicatedAllocUnmap(this);\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+}\n+\n+VkResult VmaAllocator_T::BindBufferMemory(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer hBuffer,\n+ const void* pNext)\n+{\n+ VkResult res = VK_SUCCESS;\n+ switch(hAllocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ res = BindVulkanBuffer(hAllocation->GetMemory(), allocationLocalOffset, hBuffer, pNext);\n+ break;\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ VmaDeviceMemoryBlock* const pBlock = hAllocation->GetBlock();\n+ VMA_ASSERT(pBlock && \"Binding buffer to allocation that doesn't belong to any block.\");\n+ res = pBlock->BindBufferMemory(this, hAllocation, allocationLocalOffset, hBuffer, pNext);\n+ break;\n+ }\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ return res;\n+}\n+\n+VkResult VmaAllocator_T::BindImageMemory(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage hImage,\n+ const void* pNext)\n+{\n+ VkResult res = VK_SUCCESS;\n+ switch(hAllocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ res = BindVulkanImage(hAllocation->GetMemory(), allocationLocalOffset, hImage, pNext);\n+ break;\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ VmaDeviceMemoryBlock* pBlock = hAllocation->GetBlock();\n+ VMA_ASSERT(pBlock && \"Binding image to allocation that doesn't belong to any block.\");\n+ res = pBlock->BindImageMemory(this, hAllocation, allocationLocalOffset, hImage, pNext);\n+ break;\n+ }\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ return res;\n+}\n+\n+VkResult VmaAllocator_T::FlushOrInvalidateAllocation(\n+ VmaAllocation hAllocation,\n+ VkDeviceSize offset, VkDeviceSize size,\n+ VMA_CACHE_OPERATION op)\n+{\n+ VkResult res = VK_SUCCESS;\n+\n+ VkMappedMemoryRange memRange = {};\n+ if(GetFlushOrInvalidateRange(hAllocation, offset, size, memRange))\n+ {\n+ switch(op)\n+ {\n+ case VMA_CACHE_FLUSH:\n+ res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, 1, &memRange);\n+ break;\n+ case VMA_CACHE_INVALIDATE:\n+ res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, 1, &memRange);\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ }\n+ \/\/ else: Just ignore this call.\n+ return res;\n+}\n+\n+VkResult VmaAllocator_T::FlushOrInvalidateAllocations(\n+ uint32_t allocationCount,\n+ const VmaAllocation* allocations,\n+ const VkDeviceSize* offsets, const VkDeviceSize* sizes,\n+ VMA_CACHE_OPERATION op)\n+{\n+ typedef VmaStlAllocator<VkMappedMemoryRange> RangeAllocator;\n+ typedef VmaSmallVector<VkMappedMemoryRange, RangeAllocator, 16> RangeVector;\n+ RangeVector ranges = RangeVector(RangeAllocator(GetAllocationCallbacks()));\n+\n+ for(uint32_t allocIndex = 0; allocIndex < allocationCount; ++allocIndex)\n+ {\n+ const VmaAllocation alloc = allocations[allocIndex];\n+ const VkDeviceSize offset = offsets != VMA_NULL ? offsets[allocIndex] : 0;\n+ const VkDeviceSize size = sizes != VMA_NULL ? sizes[allocIndex] : VK_WHOLE_SIZE;\n+ VkMappedMemoryRange newRange;\n+ if(GetFlushOrInvalidateRange(alloc, offset, size, newRange))\n+ {\n+ ranges.push_back(newRange);\n+ }\n+ }\n+\n+ VkResult res = VK_SUCCESS;\n+ if(!ranges.empty())\n+ {\n+ switch(op)\n+ {\n+ case VMA_CACHE_FLUSH:\n+ res = (*GetVulkanFunctions().vkFlushMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data());\n+ break;\n+ case VMA_CACHE_INVALIDATE:\n+ res = (*GetVulkanFunctions().vkInvalidateMappedMemoryRanges)(m_hDevice, (uint32_t)ranges.size(), ranges.data());\n+ break;\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ }\n+ \/\/ else: Just ignore this call.\n+ return res;\n+}\n+\n+void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocation && allocation->GetType() == VmaAllocation_T::ALLOCATION_TYPE_DEDICATED);\n+\n+ const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\n+ VmaPool parentPool = allocation->GetParentPool();\n+ if(parentPool == VK_NULL_HANDLE)\n+ {\n+ \/\/ Default pool\n+ m_DedicatedAllocations[memTypeIndex].Unregister(allocation);\n+ }\n+ else\n+ {\n+ \/\/ Custom pool\n+ parentPool->m_DedicatedAllocations.Unregister(allocation);\n+ }\n+\n+ VkDeviceMemory hMemory = allocation->GetMemory();\n+\n+ \/*\n+ There is no need to call this, because Vulkan spec allows to skip vkUnmapMemory\n+ before vkFreeMemory.\n+\n+ if(allocation->GetMappedData() != VMA_NULL)\n+ {\n+ (*m_VulkanFunctions.vkUnmapMemory)(m_hDevice, hMemory);\n+ }\n+ *\/\n+\n+ FreeVulkanMemory(memTypeIndex, allocation->GetSize(), hMemory);\n+\n+ m_Budget.RemoveAllocation(MemoryTypeIndexToHeapIndex(allocation->GetMemoryTypeIndex()), allocation->GetSize());\n+ m_AllocationObjectAllocator.Free(allocation);\n+\n+ VMA_DEBUG_LOG(\" Freed DedicatedMemory MemoryTypeIndex=%u\", memTypeIndex);\n+}\n+\n+uint32_t VmaAllocator_T::CalculateGpuDefragmentationMemoryTypeBits() const\n+{\n+ VkBufferCreateInfo dummyBufCreateInfo;\n+ VmaFillGpuDefragmentationBufferCreateInfo(dummyBufCreateInfo);\n+\n+ uint32_t memoryTypeBits = 0;\n+\n+ \/\/ Create buffer.\n+ VkBuffer buf = VK_NULL_HANDLE;\n+ VkResult res = (*GetVulkanFunctions().vkCreateBuffer)(\n+ m_hDevice, &dummyBufCreateInfo, GetAllocationCallbacks(), &buf);\n+ if(res == VK_SUCCESS)\n+ {\n+ \/\/ Query for supported memory types.\n+ VkMemoryRequirements memReq;\n+ (*GetVulkanFunctions().vkGetBufferMemoryRequirements)(m_hDevice, buf, &memReq);\n+ memoryTypeBits = memReq.memoryTypeBits;\n+\n+ \/\/ Destroy buffer.\n+ (*GetVulkanFunctions().vkDestroyBuffer)(m_hDevice, buf, GetAllocationCallbacks());\n+ }\n+\n+ return memoryTypeBits;\n+}\n+\n+uint32_t VmaAllocator_T::CalculateGlobalMemoryTypeBits() const\n+{\n+ \/\/ Make sure memory information is already fetched.\n+ VMA_ASSERT(GetMemoryTypeCount() > 0);\n+\n+ uint32_t memoryTypeBits = UINT32_MAX;\n+\n+ if(!m_UseAmdDeviceCoherentMemory)\n+ {\n+ \/\/ Exclude memory types that have VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD.\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ if((m_MemProps.memoryTypes[memTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0)\n+ {\n+ memoryTypeBits &= ~(1u << memTypeIndex);\n+ }\n+ }\n+ }\n+\n+ return memoryTypeBits;\n+}\n+\n+bool VmaAllocator_T::GetFlushOrInvalidateRange(\n+ VmaAllocation allocation,\n+ VkDeviceSize offset, VkDeviceSize size,\n+ VkMappedMemoryRange& outRange) const\n+{\n+ const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\n+ if(size > 0 && IsMemoryTypeNonCoherent(memTypeIndex))\n+ {\n+ const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize;\n+ const VkDeviceSize allocationSize = allocation->GetSize();\n+ VMA_ASSERT(offset <= allocationSize);\n+\n+ outRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;\n+ outRange.pNext = VMA_NULL;\n+ outRange.memory = allocation->GetMemory();\n+\n+ switch(allocation->GetType())\n+ {\n+ case VmaAllocation_T::ALLOCATION_TYPE_DEDICATED:\n+ outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);\n+ if(size == VK_WHOLE_SIZE)\n+ {\n+ outRange.size = allocationSize - outRange.offset;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(offset + size <= allocationSize);\n+ outRange.size = VMA_MIN(\n+ VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize),\n+ allocationSize - outRange.offset);\n+ }\n+ break;\n+ case VmaAllocation_T::ALLOCATION_TYPE_BLOCK:\n+ {\n+ \/\/ 1. Still within this allocation.\n+ outRange.offset = VmaAlignDown(offset, nonCoherentAtomSize);\n+ if(size == VK_WHOLE_SIZE)\n+ {\n+ size = allocationSize - offset;\n+ }\n+ else\n+ {\n+ VMA_ASSERT(offset + size <= allocationSize);\n+ }\n+ outRange.size = VmaAlignUp(size + (offset - outRange.offset), nonCoherentAtomSize);\n+\n+ \/\/ 2. Adjust to whole block.\n+ const VkDeviceSize allocationOffset = allocation->GetOffset();\n+ VMA_ASSERT(allocationOffset % nonCoherentAtomSize == 0);\n+ const VkDeviceSize blockSize = allocation->GetBlock()->m_pMetadata->GetSize();\n+ outRange.offset += allocationOffset;\n+ outRange.size = VMA_MIN(outRange.size, blockSize - outRange.offset);\n+\n+ break;\n+ }\n+ default:\n+ VMA_ASSERT(0);\n+ }\n+ return true;\n+ }\n+ return false;\n+}\n+\n+#if VMA_MEMORY_BUDGET\n+void VmaAllocator_T::UpdateVulkanBudget()\n+{\n+ VMA_ASSERT(m_UseExtMemoryBudget);\n+\n+ VkPhysicalDeviceMemoryProperties2KHR memProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR };\n+\n+ VkPhysicalDeviceMemoryBudgetPropertiesEXT budgetProps = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT };\n+ VmaPnextChainPushFront(&memProps, &budgetProps);\n+\n+ GetVulkanFunctions().vkGetPhysicalDeviceMemoryProperties2KHR(m_PhysicalDevice, &memProps);\n+\n+ {\n+ VmaMutexLockWrite lockWrite(m_Budget.m_BudgetMutex, m_UseMutex);\n+\n+ for(uint32_t heapIndex = 0; heapIndex < GetMemoryHeapCount(); ++heapIndex)\n+ {\n+ m_Budget.m_VulkanUsage[heapIndex] = budgetProps.heapUsage[heapIndex];\n+ m_Budget.m_VulkanBudget[heapIndex] = budgetProps.heapBudget[heapIndex];\n+ m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] = m_Budget.m_BlockBytes[heapIndex].load();\n+\n+ \/\/ Some bugged drivers return the budget incorrectly, e.g. 0 or much bigger than heap size.\n+ if(m_Budget.m_VulkanBudget[heapIndex] == 0)\n+ {\n+ m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size * 8 \/ 10; \/\/ 80% heuristics.\n+ }\n+ else if(m_Budget.m_VulkanBudget[heapIndex] > m_MemProps.memoryHeaps[heapIndex].size)\n+ {\n+ m_Budget.m_VulkanBudget[heapIndex] = m_MemProps.memoryHeaps[heapIndex].size;\n+ }\n+ if(m_Budget.m_VulkanUsage[heapIndex] == 0 && m_Budget.m_BlockBytesAtBudgetFetch[heapIndex] > 0)\n+ {\n+ m_Budget.m_VulkanUsage[heapIndex] = m_Budget.m_BlockBytesAtBudgetFetch[heapIndex];\n+ }\n+ }\n+ m_Budget.m_OperationsSinceBudgetFetch = 0;\n+ }\n+}\n+#endif \/\/ VMA_MEMORY_BUDGET\n+\n+void VmaAllocator_T::FillAllocation(const VmaAllocation hAllocation, uint8_t pattern)\n+{\n+ if(VMA_DEBUG_INITIALIZE_ALLOCATIONS &&\n+ (m_MemProps.memoryTypes[hAllocation->GetMemoryTypeIndex()].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)\n+ {\n+ void* pData = VMA_NULL;\n+ VkResult res = Map(hAllocation, &pData);\n+ if(res == VK_SUCCESS)\n+ {\n+ memset(pData, (int)pattern, (size_t)hAllocation->GetSize());\n+ FlushOrInvalidateAllocation(hAllocation, 0, VK_WHOLE_SIZE, VMA_CACHE_FLUSH);\n+ Unmap(hAllocation);\n+ }\n+ else\n+ {\n+ VMA_ASSERT(0 && \"VMA_DEBUG_INITIALIZE_ALLOCATIONS is enabled, but couldn't map memory to fill allocation.\");\n+ }\n+ }\n+}\n+\n+uint32_t VmaAllocator_T::GetGpuDefragmentationMemoryTypeBits()\n+{\n+ uint32_t memoryTypeBits = m_GpuDefragmentationMemoryTypeBits.load();\n+ if(memoryTypeBits == UINT32_MAX)\n+ {\n+ memoryTypeBits = CalculateGpuDefragmentationMemoryTypeBits();\n+ m_GpuDefragmentationMemoryTypeBits.store(memoryTypeBits);\n+ }\n+ return memoryTypeBits;\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+void VmaAllocator_T::PrintDetailedMap(VmaJsonWriter& json)\n+{\n+ bool dedicatedAllocationsStarted = false;\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ VmaDedicatedAllocationList& dedicatedAllocList = m_DedicatedAllocations[memTypeIndex];\n+ if(!dedicatedAllocList.IsEmpty())\n+ {\n+ if(dedicatedAllocationsStarted == false)\n+ {\n+ dedicatedAllocationsStarted = true;\n+ json.WriteString(\"DedicatedAllocations\");\n+ json.BeginObject();\n+ }\n+\n+ json.BeginString(\"Type \");\n+ json.ContinueString(memTypeIndex);\n+ json.EndString();\n+\n+ dedicatedAllocList.BuildStatsString(json);\n+ }\n+ }\n+ if(dedicatedAllocationsStarted)\n+ {\n+ json.EndObject();\n+ }\n+\n+ {\n+ bool allocationsStarted = false;\n+ for(uint32_t memTypeIndex = 0; memTypeIndex < GetMemoryTypeCount(); ++memTypeIndex)\n+ {\n+ VmaBlockVector* pBlockVector = m_pBlockVectors[memTypeIndex];\n+ if(pBlockVector != VMA_NULL)\n+ {\n+ if (pBlockVector->IsEmpty() == false)\n+ {\n+ if (allocationsStarted == false)\n+ {\n+ allocationsStarted = true;\n+ json.WriteString(\"DefaultPools\");\n+ json.BeginObject();\n+ }\n+\n+ json.BeginString(\"Type \");\n+ json.ContinueString(memTypeIndex);\n+ json.EndString();\n+\n+ json.BeginObject();\n+ pBlockVector->PrintDetailedMap(json);\n+ json.EndObject();\n+ }\n+ }\n+ }\n+ if(allocationsStarted)\n+ {\n+ json.EndObject();\n+ }\n+ }\n+\n+ \/\/ Custom pools\n+ {\n+ VmaMutexLockRead lock(m_PoolsMutex, m_UseMutex);\n+ if(!m_Pools.IsEmpty())\n+ {\n+ json.WriteString(\"Pools\");\n+ json.BeginObject();\n+ for(VmaPool pool = m_Pools.Front(); pool != VMA_NULL; pool = m_Pools.GetNext(pool))\n+ {\n+ json.BeginString();\n+ json.ContinueString(pool->GetId());\n+ json.EndString();\n+\n+ json.BeginObject();\n+ pool->m_BlockVector.PrintDetailedMap(json);\n+\n+ if (!pool->m_DedicatedAllocations.IsEmpty())\n+ {\n+ json.WriteString(\"DedicatedAllocations\");\n+ pool->m_DedicatedAllocations.BuildStatsString(json);\n+ }\n+ json.EndObject();\n+ }\n+ json.EndObject();\n+ }\n+ }\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+#endif \/\/ _VMA_ALLOCATOR_T_FUNCTIONS\n+\n+\n+#ifndef _VMA_PUBLIC_INTERFACE\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateAllocator(\n+ const VmaAllocatorCreateInfo* pCreateInfo,\n+ VmaAllocator* pAllocator)\n+{\n+ VMA_ASSERT(pCreateInfo && pAllocator);\n+ VMA_ASSERT(pCreateInfo->vulkanApiVersion == 0 ||\n+ (VK_VERSION_MAJOR(pCreateInfo->vulkanApiVersion) == 1 && VK_VERSION_MINOR(pCreateInfo->vulkanApiVersion) <= 3));\n+ VMA_DEBUG_LOG(\"vmaCreateAllocator\");\n+ *pAllocator = vma_new(pCreateInfo->pAllocationCallbacks, VmaAllocator_T)(pCreateInfo);\n+ VkResult result = (*pAllocator)->Init(pCreateInfo);\n+ if(result < 0)\n+ {\n+ vma_delete(pCreateInfo->pAllocationCallbacks, *pAllocator);\n+ *pAllocator = VK_NULL_HANDLE;\n+ }\n+ return result;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyAllocator(\n+ VmaAllocator allocator)\n+{\n+ if(allocator != VK_NULL_HANDLE)\n+ {\n+ VMA_DEBUG_LOG(\"vmaDestroyAllocator\");\n+ VkAllocationCallbacks allocationCallbacks = allocator->m_AllocationCallbacks; \/\/ Have to copy the callbacks when destroying.\n+ vma_delete(&allocationCallbacks, allocator);\n+ }\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocatorInfo(VmaAllocator allocator, VmaAllocatorInfo* pAllocatorInfo)\n+{\n+ VMA_ASSERT(allocator && pAllocatorInfo);\n+ pAllocatorInfo->instance = allocator->m_hInstance;\n+ pAllocatorInfo->physicalDevice = allocator->GetPhysicalDevice();\n+ pAllocatorInfo->device = allocator->m_hDevice;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPhysicalDeviceProperties(\n+ VmaAllocator allocator,\n+ const VkPhysicalDeviceProperties **ppPhysicalDeviceProperties)\n+{\n+ VMA_ASSERT(allocator && ppPhysicalDeviceProperties);\n+ *ppPhysicalDeviceProperties = &allocator->m_PhysicalDeviceProperties;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryProperties(\n+ VmaAllocator allocator,\n+ const VkPhysicalDeviceMemoryProperties** ppPhysicalDeviceMemoryProperties)\n+{\n+ VMA_ASSERT(allocator && ppPhysicalDeviceMemoryProperties);\n+ *ppPhysicalDeviceMemoryProperties = &allocator->m_MemProps;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetMemoryTypeProperties(\n+ VmaAllocator allocator,\n+ uint32_t memoryTypeIndex,\n+ VkMemoryPropertyFlags* pFlags)\n+{\n+ VMA_ASSERT(allocator && pFlags);\n+ VMA_ASSERT(memoryTypeIndex < allocator->GetMemoryTypeCount());\n+ *pFlags = allocator->m_MemProps.memoryTypes[memoryTypeIndex].propertyFlags;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetCurrentFrameIndex(\n+ VmaAllocator allocator,\n+ uint32_t frameIndex)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->SetCurrentFrameIndex(frameIndex);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateStatistics(\n+ VmaAllocator allocator,\n+ VmaTotalStatistics* pStats)\n+{\n+ VMA_ASSERT(allocator && pStats);\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+ allocator->CalculateStatistics(pStats);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetHeapBudgets(\n+ VmaAllocator allocator,\n+ VmaBudget* pBudgets)\n+{\n+ VMA_ASSERT(allocator && pBudgets);\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+ allocator->GetHeapBudgets(pBudgets, 0, allocator->GetMemoryHeapCount());\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaBuildStatsString(\n+ VmaAllocator allocator,\n+ char** ppStatsString,\n+ VkBool32 detailedMap)\n+{\n+ VMA_ASSERT(allocator && ppStatsString);\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VmaStringBuilder sb(allocator->GetAllocationCallbacks());\n+ {\n+ VmaJsonWriter json(allocator->GetAllocationCallbacks(), sb);\n+ json.BeginObject();\n+\n+ VmaBudget budgets[VK_MAX_MEMORY_HEAPS];\n+ allocator->GetHeapBudgets(budgets, 0, allocator->GetMemoryHeapCount());\n+\n+ VmaTotalStatistics stats;\n+ allocator->CalculateStatistics(&stats);\n+\n+ json.WriteString(\"Total\");\n+ VmaPrintDetailedStatistics(json, stats.total);\n+\n+ for(uint32_t heapIndex = 0; heapIndex < allocator->GetMemoryHeapCount(); ++heapIndex)\n+ {\n+ json.BeginString(\"Heap \");\n+ json.ContinueString(heapIndex);\n+ json.EndString();\n+ json.BeginObject();\n+\n+ json.WriteString(\"Size\");\n+ json.WriteNumber(allocator->m_MemProps.memoryHeaps[heapIndex].size);\n+\n+ json.WriteString(\"Flags\");\n+ json.BeginArray(true);\n+ if((allocator->m_MemProps.memoryHeaps[heapIndex].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) != 0)\n+ {\n+ json.WriteString(\"DEVICE_LOCAL\");\n+ }\n+ json.EndArray();\n+\n+ json.WriteString(\"Budget\");\n+ json.BeginObject();\n+ {\n+ json.WriteString(\"BlockBytes\");\n+ json.WriteNumber(budgets[heapIndex].statistics.blockBytes);\n+ json.WriteString(\"AllocationBytes\");\n+ json.WriteNumber(budgets[heapIndex].statistics.allocationBytes);\n+ json.WriteString(\"BlockCount\");\n+ json.WriteNumber(budgets[heapIndex].statistics.blockCount);\n+ json.WriteString(\"AllocationCount\");\n+ json.WriteNumber(budgets[heapIndex].statistics.allocationCount);\n+ json.WriteString(\"Usage\");\n+ json.WriteNumber(budgets[heapIndex].usage);\n+ json.WriteString(\"Budget\");\n+ json.WriteNumber(budgets[heapIndex].budget);\n+ }\n+ json.EndObject();\n+\n+ if(stats.memoryHeap[heapIndex].statistics.blockCount > 0)\n+ {\n+ json.WriteString(\"Stats\");\n+ VmaPrintDetailedStatistics(json, stats.memoryHeap[heapIndex]);\n+ }\n+\n+ for(uint32_t typeIndex = 0; typeIndex < allocator->GetMemoryTypeCount(); ++typeIndex)\n+ {\n+ if(allocator->MemoryTypeIndexToHeapIndex(typeIndex) == heapIndex)\n+ {\n+ json.BeginString(\"Type \");\n+ json.ContinueString(typeIndex);\n+ json.EndString();\n+\n+ json.BeginObject();\n+\n+ json.WriteString(\"Flags\");\n+ json.BeginArray(true);\n+ VkMemoryPropertyFlags flags = allocator->m_MemProps.memoryTypes[typeIndex].propertyFlags;\n+ if((flags & VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT) != 0)\n+ {\n+ json.WriteString(\"DEVICE_LOCAL\");\n+ }\n+ if((flags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0)\n+ {\n+ json.WriteString(\"HOST_VISIBLE\");\n+ }\n+ if((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0)\n+ {\n+ json.WriteString(\"HOST_COHERENT\");\n+ }\n+ if((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) != 0)\n+ {\n+ json.WriteString(\"HOST_CACHED\");\n+ }\n+ if((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0)\n+ {\n+ json.WriteString(\"LAZILY_ALLOCATED\");\n+ }\n+#if VMA_VULKAN_VERSION >= 1001000\n+ if((flags & VK_MEMORY_PROPERTY_PROTECTED_BIT) != 0)\n+ {\n+ json.WriteString(\"PROTECTED\");\n+ }\n+#endif \/\/ #if VMA_VULKAN_VERSION >= 1001000\n+#if VK_AMD_device_coherent_memory\n+ if((flags & VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD_COPY) != 0)\n+ {\n+ json.WriteString(\"DEVICE_COHERENT\");\n+ }\n+ if((flags & VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD_COPY) != 0)\n+ {\n+ json.WriteString(\"DEVICE_UNCACHED\");\n+ }\n+#endif \/\/ #if VK_AMD_device_coherent_memory\n+ json.EndArray();\n+\n+ if(stats.memoryType[typeIndex].statistics.blockCount > 0)\n+ {\n+ json.WriteString(\"Stats\");\n+ VmaPrintDetailedStatistics(json, stats.memoryType[typeIndex]);\n+ }\n+\n+ json.EndObject();\n+ }\n+ }\n+\n+ json.EndObject();\n+ }\n+ if(detailedMap == VK_TRUE)\n+ {\n+ allocator->PrintDetailedMap(json);\n+ }\n+\n+ json.EndObject();\n+ }\n+\n+ *ppStatsString = VmaCreateStringCopy(allocator->GetAllocationCallbacks(), sb.GetData(), sb.GetLength());\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(\n+ VmaAllocator allocator,\n+ char* pStatsString)\n+{\n+ if(pStatsString != VMA_NULL)\n+ {\n+ VMA_ASSERT(allocator);\n+ VmaFreeString(allocator->GetAllocationCallbacks(), pStatsString);\n+ }\n+}\n+\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+\n+\/*\n+This function is not protected by any mutex because it just reads immutable data.\n+*\/\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndex(\n+ VmaAllocator allocator,\n+ uint32_t memoryTypeBits,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ uint32_t* pMemoryTypeIndex)\n+{\n+ VMA_ASSERT(allocator != VK_NULL_HANDLE);\n+ VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\n+ VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\n+\n+ return allocator->FindMemoryTypeIndex(memoryTypeBits, pAllocationCreateInfo, UINT32_MAX, pMemoryTypeIndex);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForBufferInfo(\n+ VmaAllocator allocator,\n+ const VkBufferCreateInfo* pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ uint32_t* pMemoryTypeIndex)\n+{\n+ VMA_ASSERT(allocator != VK_NULL_HANDLE);\n+ VMA_ASSERT(pBufferCreateInfo != VMA_NULL);\n+ VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\n+ VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\n+\n+ const VkDevice hDev = allocator->m_hDevice;\n+ const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();\n+ VkResult res;\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ if(funcs->vkGetDeviceBufferMemoryRequirements)\n+ {\n+ \/\/ Can query straight from VkBufferCreateInfo :)\n+ VkDeviceBufferMemoryRequirements devBufMemReq = {VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS};\n+ devBufMemReq.pCreateInfo = pBufferCreateInfo;\n+\n+ VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2};\n+ (*funcs->vkGetDeviceBufferMemoryRequirements)(hDev, &devBufMemReq, &memReq);\n+\n+ res = allocator->FindMemoryTypeIndex(\n+ memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex);\n+ }\n+ else\n+#endif \/\/ #if VMA_VULKAN_VERSION >= 1003000\n+ {\n+ \/\/ Must create a dummy buffer to query :(\n+ VkBuffer hBuffer = VK_NULL_HANDLE;\n+ res = funcs->vkCreateBuffer(\n+ hDev, pBufferCreateInfo, allocator->GetAllocationCallbacks(), &hBuffer);\n+ if(res == VK_SUCCESS)\n+ {\n+ VkMemoryRequirements memReq = {};\n+ funcs->vkGetBufferMemoryRequirements(hDev, hBuffer, &memReq);\n+\n+ res = allocator->FindMemoryTypeIndex(\n+ memReq.memoryTypeBits, pAllocationCreateInfo, pBufferCreateInfo->usage, pMemoryTypeIndex);\n+\n+ funcs->vkDestroyBuffer(\n+ hDev, hBuffer, allocator->GetAllocationCallbacks());\n+ }\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFindMemoryTypeIndexForImageInfo(\n+ VmaAllocator allocator,\n+ const VkImageCreateInfo* pImageCreateInfo,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ uint32_t* pMemoryTypeIndex)\n+{\n+ VMA_ASSERT(allocator != VK_NULL_HANDLE);\n+ VMA_ASSERT(pImageCreateInfo != VMA_NULL);\n+ VMA_ASSERT(pAllocationCreateInfo != VMA_NULL);\n+ VMA_ASSERT(pMemoryTypeIndex != VMA_NULL);\n+\n+ const VkDevice hDev = allocator->m_hDevice;\n+ const VmaVulkanFunctions* funcs = &allocator->GetVulkanFunctions();\n+ VkResult res;\n+\n+#if VMA_VULKAN_VERSION >= 1003000\n+ if(funcs->vkGetDeviceImageMemoryRequirements)\n+ {\n+ \/\/ Can query straight from VkImageCreateInfo :)\n+ VkDeviceImageMemoryRequirements devImgMemReq = {VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS};\n+ devImgMemReq.pCreateInfo = pImageCreateInfo;\n+ VMA_ASSERT(pImageCreateInfo->tiling != VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT_COPY && (pImageCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT_COPY) == 0 &&\n+ \"Cannot use this VkImageCreateInfo with vmaFindMemoryTypeIndexForImageInfo as I don't know what to pass as VkDeviceImageMemoryRequirements::planeAspect.\");\n+\n+ VkMemoryRequirements2 memReq = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2};\n+ (*funcs->vkGetDeviceImageMemoryRequirements)(hDev, &devImgMemReq, &memReq);\n+\n+ res = allocator->FindMemoryTypeIndex(\n+ memReq.memoryRequirements.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex);\n+ }\n+ else\n+#endif \/\/ #if VMA_VULKAN_VERSION >= 1003000\n+ {\n+ \/\/ Must create a dummy image to query :(\n+ VkImage hImage = VK_NULL_HANDLE;\n+ res = funcs->vkCreateImage(\n+ hDev, pImageCreateInfo, allocator->GetAllocationCallbacks(), &hImage);\n+ if(res == VK_SUCCESS)\n+ {\n+ VkMemoryRequirements memReq = {};\n+ funcs->vkGetImageMemoryRequirements(hDev, hImage, &memReq);\n+\n+ res = allocator->FindMemoryTypeIndex(\n+ memReq.memoryTypeBits, pAllocationCreateInfo, pImageCreateInfo->usage, pMemoryTypeIndex);\n+\n+ funcs->vkDestroyImage(\n+ hDev, hImage, allocator->GetAllocationCallbacks());\n+ }\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreatePool(\n+ VmaAllocator allocator,\n+ const VmaPoolCreateInfo* pCreateInfo,\n+ VmaPool* pPool)\n+{\n+ VMA_ASSERT(allocator && pCreateInfo && pPool);\n+\n+ VMA_DEBUG_LOG(\"vmaCreatePool\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->CreatePool(pCreateInfo, pPool);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyPool(\n+ VmaAllocator allocator,\n+ VmaPool pool)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(pool == VK_NULL_HANDLE)\n+ {\n+ return;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaDestroyPool\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->DestroyPool(pool);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolStatistics(\n+ VmaAllocator allocator,\n+ VmaPool pool,\n+ VmaStatistics* pPoolStats)\n+{\n+ VMA_ASSERT(allocator && pool && pPoolStats);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->GetPoolStatistics(pool, pPoolStats);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculatePoolStatistics(\n+ VmaAllocator allocator,\n+ VmaPool pool,\n+ VmaDetailedStatistics* pPoolStats)\n+{\n+ VMA_ASSERT(allocator && pool && pPoolStats);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->CalculatePoolStatistics(pool, pPoolStats);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckPoolCorruption(VmaAllocator allocator, VmaPool pool)\n+{\n+ VMA_ASSERT(allocator && pool);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VMA_DEBUG_LOG(\"vmaCheckPoolCorruption\");\n+\n+ return allocator->CheckPoolCorruption(pool);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetPoolName(\n+ VmaAllocator allocator,\n+ VmaPool pool,\n+ const char** ppName)\n+{\n+ VMA_ASSERT(allocator && pool && ppName);\n+\n+ VMA_DEBUG_LOG(\"vmaGetPoolName\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ *ppName = pool->GetName();\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetPoolName(\n+ VmaAllocator allocator,\n+ VmaPool pool,\n+ const char* pName)\n+{\n+ VMA_ASSERT(allocator && pool);\n+\n+ VMA_DEBUG_LOG(\"vmaSetPoolName\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ pool->SetName(pName);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemory(\n+ VmaAllocator allocator,\n+ const VkMemoryRequirements* pVkMemoryRequirements,\n+ const VmaAllocationCreateInfo* pCreateInfo,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocation);\n+\n+ VMA_DEBUG_LOG(\"vmaAllocateMemory\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VkResult result = allocator->AllocateMemory(\n+ *pVkMemoryRequirements,\n+ false, \/\/ requiresDedicatedAllocation\n+ false, \/\/ prefersDedicatedAllocation\n+ VK_NULL_HANDLE, \/\/ dedicatedBuffer\n+ VK_NULL_HANDLE, \/\/ dedicatedImage\n+ UINT32_MAX, \/\/ dedicatedBufferImageUsage\n+ *pCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_UNKNOWN,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return result;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryPages(\n+ VmaAllocator allocator,\n+ const VkMemoryRequirements* pVkMemoryRequirements,\n+ const VmaAllocationCreateInfo* pCreateInfo,\n+ size_t allocationCount,\n+ VmaAllocation* pAllocations,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ if(allocationCount == 0)\n+ {\n+ return VK_SUCCESS;\n+ }\n+\n+ VMA_ASSERT(allocator && pVkMemoryRequirements && pCreateInfo && pAllocations);\n+\n+ VMA_DEBUG_LOG(\"vmaAllocateMemoryPages\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VkResult result = allocator->AllocateMemory(\n+ *pVkMemoryRequirements,\n+ false, \/\/ requiresDedicatedAllocation\n+ false, \/\/ prefersDedicatedAllocation\n+ VK_NULL_HANDLE, \/\/ dedicatedBuffer\n+ VK_NULL_HANDLE, \/\/ dedicatedImage\n+ UINT32_MAX, \/\/ dedicatedBufferImageUsage\n+ *pCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_UNKNOWN,\n+ allocationCount,\n+ pAllocations);\n+\n+ if(pAllocationInfo != VMA_NULL && result == VK_SUCCESS)\n+ {\n+ for(size_t i = 0; i < allocationCount; ++i)\n+ {\n+ allocator->GetAllocationInfo(pAllocations[i], pAllocationInfo + i);\n+ }\n+ }\n+\n+ return result;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForBuffer(\n+ VmaAllocator allocator,\n+ VkBuffer buffer,\n+ const VmaAllocationCreateInfo* pCreateInfo,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && buffer != VK_NULL_HANDLE && pCreateInfo && pAllocation);\n+\n+ VMA_DEBUG_LOG(\"vmaAllocateMemoryForBuffer\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VkMemoryRequirements vkMemReq = {};\n+ bool requiresDedicatedAllocation = false;\n+ bool prefersDedicatedAllocation = false;\n+ allocator->GetBufferMemoryRequirements(buffer, vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation);\n+\n+ VkResult result = allocator->AllocateMemory(\n+ vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation,\n+ buffer, \/\/ dedicatedBuffer\n+ VK_NULL_HANDLE, \/\/ dedicatedImage\n+ UINT32_MAX, \/\/ dedicatedBufferImageUsage\n+ *pCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_BUFFER,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(pAllocationInfo && result == VK_SUCCESS)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return result;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaAllocateMemoryForImage(\n+ VmaAllocator allocator,\n+ VkImage image,\n+ const VmaAllocationCreateInfo* pCreateInfo,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && image != VK_NULL_HANDLE && pCreateInfo && pAllocation);\n+\n+ VMA_DEBUG_LOG(\"vmaAllocateMemoryForImage\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ VkMemoryRequirements vkMemReq = {};\n+ bool requiresDedicatedAllocation = false;\n+ bool prefersDedicatedAllocation = false;\n+ allocator->GetImageMemoryRequirements(image, vkMemReq,\n+ requiresDedicatedAllocation, prefersDedicatedAllocation);\n+\n+ VkResult result = allocator->AllocateMemory(\n+ vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation,\n+ VK_NULL_HANDLE, \/\/ dedicatedBuffer\n+ image, \/\/ dedicatedImage\n+ UINT32_MAX, \/\/ dedicatedBufferImageUsage\n+ *pCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_IMAGE_UNKNOWN,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(pAllocationInfo && result == VK_SUCCESS)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return result;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemory(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(allocation == VK_NULL_HANDLE)\n+ {\n+ return;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaFreeMemory\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ &allocation);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeMemoryPages(\n+ VmaAllocator allocator,\n+ size_t allocationCount,\n+ const VmaAllocation* pAllocations)\n+{\n+ if(allocationCount == 0)\n+ {\n+ return;\n+ }\n+\n+ VMA_ASSERT(allocator);\n+\n+ VMA_DEBUG_LOG(\"vmaFreeMemoryPages\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->FreeMemory(allocationCount, pAllocations);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationInfo(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && allocation && pAllocationInfo);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->GetAllocationInfo(allocation, pAllocationInfo);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationUserData(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ void* pUserData)\n+{\n+ VMA_ASSERT(allocator && allocation);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocation->SetUserData(allocator, pUserData);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetAllocationName(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ const char* VMA_NULLABLE pName)\n+{\n+ allocation->SetName(allocator, pName);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetAllocationMemoryProperties(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaAllocation VMA_NOT_NULL allocation,\n+ VkMemoryPropertyFlags* VMA_NOT_NULL pFlags)\n+{\n+ VMA_ASSERT(allocator && allocation && pFlags);\n+ const uint32_t memTypeIndex = allocation->GetMemoryTypeIndex();\n+ *pFlags = allocator->m_MemProps.memoryTypes[memTypeIndex].propertyFlags;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaMapMemory(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ void** ppData)\n+{\n+ VMA_ASSERT(allocator && allocation && ppData);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->Map(allocation, ppData);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaUnmapMemory(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocator && allocation);\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ allocator->Unmap(allocation);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocation(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkDeviceSize offset,\n+ VkDeviceSize size)\n+{\n+ VMA_ASSERT(allocator && allocation);\n+\n+ VMA_DEBUG_LOG(\"vmaFlushAllocation\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_FLUSH);\n+\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocation(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkDeviceSize offset,\n+ VkDeviceSize size)\n+{\n+ VMA_ASSERT(allocator && allocation);\n+\n+ VMA_DEBUG_LOG(\"vmaInvalidateAllocation\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ const VkResult res = allocator->FlushOrInvalidateAllocation(allocation, offset, size, VMA_CACHE_INVALIDATE);\n+\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaFlushAllocations(\n+ VmaAllocator allocator,\n+ uint32_t allocationCount,\n+ const VmaAllocation* allocations,\n+ const VkDeviceSize* offsets,\n+ const VkDeviceSize* sizes)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(allocationCount == 0)\n+ {\n+ return VK_SUCCESS;\n+ }\n+\n+ VMA_ASSERT(allocations);\n+\n+ VMA_DEBUG_LOG(\"vmaFlushAllocations\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_FLUSH);\n+\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaInvalidateAllocations(\n+ VmaAllocator allocator,\n+ uint32_t allocationCount,\n+ const VmaAllocation* allocations,\n+ const VkDeviceSize* offsets,\n+ const VkDeviceSize* sizes)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(allocationCount == 0)\n+ {\n+ return VK_SUCCESS;\n+ }\n+\n+ VMA_ASSERT(allocations);\n+\n+ VMA_DEBUG_LOG(\"vmaInvalidateAllocations\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ const VkResult res = allocator->FlushOrInvalidateAllocations(allocationCount, allocations, offsets, sizes, VMA_CACHE_INVALIDATE);\n+\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCheckCorruption(\n+ VmaAllocator allocator,\n+ uint32_t memoryTypeBits)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ VMA_DEBUG_LOG(\"vmaCheckCorruption\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->CheckCorruption(memoryTypeBits);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentation(\n+ VmaAllocator allocator,\n+ const VmaDefragmentationInfo* pInfo,\n+ VmaDefragmentationContext* pContext)\n+{\n+ VMA_ASSERT(allocator && pInfo && pContext);\n+\n+ VMA_DEBUG_LOG(\"vmaBeginDefragmentation\");\n+\n+ if (pInfo->pool != VMA_NULL)\n+ {\n+ \/\/ Check if run on supported algorithms\n+ if (pInfo->pool->m_BlockVector.GetAlgorithm() & VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT)\n+ return VK_ERROR_FEATURE_NOT_PRESENT;\n+ }\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ *pContext = vma_new(allocator, VmaDefragmentationContext_T)(allocator, *pInfo);\n+ return VK_SUCCESS;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaEndDefragmentation(\n+ VmaAllocator allocator,\n+ VmaDefragmentationContext context,\n+ VmaDefragmentationStats* pStats)\n+{\n+ VMA_ASSERT(allocator && context);\n+\n+ VMA_DEBUG_LOG(\"vmaEndDefragmentation\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ if (pStats)\n+ context->GetStats(*pStats);\n+ vma_delete(allocator, context);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBeginDefragmentationPass(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaDefragmentationContext VMA_NOT_NULL context,\n+ VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo)\n+{\n+ VMA_ASSERT(context && pPassInfo);\n+\n+ VMA_DEBUG_LOG(\"vmaBeginDefragmentationPass\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return context->DefragmentPassBegin(*pPassInfo);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaEndDefragmentationPass(\n+ VmaAllocator VMA_NOT_NULL allocator,\n+ VmaDefragmentationContext VMA_NOT_NULL context,\n+ VmaDefragmentationPassMoveInfo* VMA_NOT_NULL pPassInfo)\n+{\n+ VMA_ASSERT(context && pPassInfo);\n+\n+ VMA_DEBUG_LOG(\"vmaEndDefragmentationPass\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return context->DefragmentPassEnd(*pPassInfo);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkBuffer buffer)\n+{\n+ VMA_ASSERT(allocator && allocation && buffer);\n+\n+ VMA_DEBUG_LOG(\"vmaBindBufferMemory\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->BindBufferMemory(allocation, 0, buffer, VMA_NULL);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindBufferMemory2(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkBuffer buffer,\n+ const void* pNext)\n+{\n+ VMA_ASSERT(allocator && allocation && buffer);\n+\n+ VMA_DEBUG_LOG(\"vmaBindBufferMemory2\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->BindBufferMemory(allocation, allocationLocalOffset, buffer, pNext);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkImage image)\n+{\n+ VMA_ASSERT(allocator && allocation && image);\n+\n+ VMA_DEBUG_LOG(\"vmaBindImageMemory\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->BindImageMemory(allocation, 0, image, VMA_NULL);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaBindImageMemory2(\n+ VmaAllocator allocator,\n+ VmaAllocation allocation,\n+ VkDeviceSize allocationLocalOffset,\n+ VkImage image,\n+ const void* pNext)\n+{\n+ VMA_ASSERT(allocator && allocation && image);\n+\n+ VMA_DEBUG_LOG(\"vmaBindImageMemory2\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ return allocator->BindImageMemory(allocation, allocationLocalOffset, image, pNext);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBuffer(\n+ VmaAllocator allocator,\n+ const VkBufferCreateInfo* pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ VkBuffer* pBuffer,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && pBuffer && pAllocation);\n+\n+ if(pBufferCreateInfo->size == 0)\n+ {\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+ if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 &&\n+ !allocator->m_UseKhrBufferDeviceAddress)\n+ {\n+ VMA_ASSERT(0 && \"Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used.\");\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaCreateBuffer\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ *pBuffer = VK_NULL_HANDLE;\n+ *pAllocation = VK_NULL_HANDLE;\n+\n+ \/\/ 1. Create VkBuffer.\n+ VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(\n+ allocator->m_hDevice,\n+ pBufferCreateInfo,\n+ allocator->GetAllocationCallbacks(),\n+ pBuffer);\n+ if(res >= 0)\n+ {\n+ \/\/ 2. vkGetBufferMemoryRequirements.\n+ VkMemoryRequirements vkMemReq = {};\n+ bool requiresDedicatedAllocation = false;\n+ bool prefersDedicatedAllocation = false;\n+ allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,\n+ requiresDedicatedAllocation, prefersDedicatedAllocation);\n+\n+ \/\/ 3. Allocate memory using allocator.\n+ res = allocator->AllocateMemory(\n+ vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation,\n+ *pBuffer, \/\/ dedicatedBuffer\n+ VK_NULL_HANDLE, \/\/ dedicatedImage\n+ pBufferCreateInfo->usage, \/\/ dedicatedBufferImageUsage\n+ *pAllocationCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_BUFFER,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(res >= 0)\n+ {\n+ \/\/ 3. Bind buffer with memory.\n+ if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\n+ {\n+ res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL);\n+ }\n+ if(res >= 0)\n+ {\n+ \/\/ All steps succeeded.\n+ #if VMA_STATS_STRING_ENABLED\n+ (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);\n+ #endif\n+ if(pAllocationInfo != VMA_NULL)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return VK_SUCCESS;\n+ }\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+ *pAllocation = VK_NULL_HANDLE;\n+ (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\n+ *pBuffer = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\n+ *pBuffer = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateBufferWithAlignment(\n+ VmaAllocator allocator,\n+ const VkBufferCreateInfo* pBufferCreateInfo,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ VkDeviceSize minAlignment,\n+ VkBuffer* pBuffer,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && pBufferCreateInfo && pAllocationCreateInfo && VmaIsPow2(minAlignment) && pBuffer && pAllocation);\n+\n+ if(pBufferCreateInfo->size == 0)\n+ {\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+ if((pBufferCreateInfo->usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_COPY) != 0 &&\n+ !allocator->m_UseKhrBufferDeviceAddress)\n+ {\n+ VMA_ASSERT(0 && \"Creating a buffer with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT is not valid if VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT was not used.\");\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaCreateBufferWithAlignment\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ *pBuffer = VK_NULL_HANDLE;\n+ *pAllocation = VK_NULL_HANDLE;\n+\n+ \/\/ 1. Create VkBuffer.\n+ VkResult res = (*allocator->GetVulkanFunctions().vkCreateBuffer)(\n+ allocator->m_hDevice,\n+ pBufferCreateInfo,\n+ allocator->GetAllocationCallbacks(),\n+ pBuffer);\n+ if(res >= 0)\n+ {\n+ \/\/ 2. vkGetBufferMemoryRequirements.\n+ VkMemoryRequirements vkMemReq = {};\n+ bool requiresDedicatedAllocation = false;\n+ bool prefersDedicatedAllocation = false;\n+ allocator->GetBufferMemoryRequirements(*pBuffer, vkMemReq,\n+ requiresDedicatedAllocation, prefersDedicatedAllocation);\n+\n+ \/\/ 2a. Include minAlignment\n+ vkMemReq.alignment = VMA_MAX(vkMemReq.alignment, minAlignment);\n+\n+ \/\/ 3. Allocate memory using allocator.\n+ res = allocator->AllocateMemory(\n+ vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation,\n+ *pBuffer, \/\/ dedicatedBuffer\n+ VK_NULL_HANDLE, \/\/ dedicatedImage\n+ pBufferCreateInfo->usage, \/\/ dedicatedBufferImageUsage\n+ *pAllocationCreateInfo,\n+ VMA_SUBALLOCATION_TYPE_BUFFER,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(res >= 0)\n+ {\n+ \/\/ 3. Bind buffer with memory.\n+ if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\n+ {\n+ res = allocator->BindBufferMemory(*pAllocation, 0, *pBuffer, VMA_NULL);\n+ }\n+ if(res >= 0)\n+ {\n+ \/\/ All steps succeeded.\n+ #if VMA_STATS_STRING_ENABLED\n+ (*pAllocation)->InitBufferImageUsage(pBufferCreateInfo->usage);\n+ #endif\n+ if(pAllocationInfo != VMA_NULL)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return VK_SUCCESS;\n+ }\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+ *pAllocation = VK_NULL_HANDLE;\n+ (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\n+ *pBuffer = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, *pBuffer, allocator->GetAllocationCallbacks());\n+ *pBuffer = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyBuffer(\n+ VmaAllocator allocator,\n+ VkBuffer buffer,\n+ VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(buffer == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)\n+ {\n+ return;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaDestroyBuffer\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ if(buffer != VK_NULL_HANDLE)\n+ {\n+ (*allocator->GetVulkanFunctions().vkDestroyBuffer)(allocator->m_hDevice, buffer, allocator->GetAllocationCallbacks());\n+ }\n+\n+ if(allocation != VK_NULL_HANDLE)\n+ {\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ &allocation);\n+ }\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateImage(\n+ VmaAllocator allocator,\n+ const VkImageCreateInfo* pImageCreateInfo,\n+ const VmaAllocationCreateInfo* pAllocationCreateInfo,\n+ VkImage* pImage,\n+ VmaAllocation* pAllocation,\n+ VmaAllocationInfo* pAllocationInfo)\n+{\n+ VMA_ASSERT(allocator && pImageCreateInfo && pAllocationCreateInfo && pImage && pAllocation);\n+\n+ if(pImageCreateInfo->extent.width == 0 ||\n+ pImageCreateInfo->extent.height == 0 ||\n+ pImageCreateInfo->extent.depth == 0 ||\n+ pImageCreateInfo->mipLevels == 0 ||\n+ pImageCreateInfo->arrayLayers == 0)\n+ {\n+ return VK_ERROR_INITIALIZATION_FAILED;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaCreateImage\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ *pImage = VK_NULL_HANDLE;\n+ *pAllocation = VK_NULL_HANDLE;\n+\n+ \/\/ 1. Create VkImage.\n+ VkResult res = (*allocator->GetVulkanFunctions().vkCreateImage)(\n+ allocator->m_hDevice,\n+ pImageCreateInfo,\n+ allocator->GetAllocationCallbacks(),\n+ pImage);\n+ if(res >= 0)\n+ {\n+ VmaSuballocationType suballocType = pImageCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL ?\n+ VMA_SUBALLOCATION_TYPE_IMAGE_OPTIMAL :\n+ VMA_SUBALLOCATION_TYPE_IMAGE_LINEAR;\n+\n+ \/\/ 2. Allocate memory using allocator.\n+ VkMemoryRequirements vkMemReq = {};\n+ bool requiresDedicatedAllocation = false;\n+ bool prefersDedicatedAllocation = false;\n+ allocator->GetImageMemoryRequirements(*pImage, vkMemReq,\n+ requiresDedicatedAllocation, prefersDedicatedAllocation);\n+\n+ res = allocator->AllocateMemory(\n+ vkMemReq,\n+ requiresDedicatedAllocation,\n+ prefersDedicatedAllocation,\n+ VK_NULL_HANDLE, \/\/ dedicatedBuffer\n+ *pImage, \/\/ dedicatedImage\n+ pImageCreateInfo->usage, \/\/ dedicatedBufferImageUsage\n+ *pAllocationCreateInfo,\n+ suballocType,\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+\n+ if(res >= 0)\n+ {\n+ \/\/ 3. Bind image with memory.\n+ if((pAllocationCreateInfo->flags & VMA_ALLOCATION_CREATE_DONT_BIND_BIT) == 0)\n+ {\n+ res = allocator->BindImageMemory(*pAllocation, 0, *pImage, VMA_NULL);\n+ }\n+ if(res >= 0)\n+ {\n+ \/\/ All steps succeeded.\n+ #if VMA_STATS_STRING_ENABLED\n+ (*pAllocation)->InitBufferImageUsage(pImageCreateInfo->usage);\n+ #endif\n+ if(pAllocationInfo != VMA_NULL)\n+ {\n+ allocator->GetAllocationInfo(*pAllocation, pAllocationInfo);\n+ }\n+\n+ return VK_SUCCESS;\n+ }\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ pAllocation);\n+ *pAllocation = VK_NULL_HANDLE;\n+ (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());\n+ *pImage = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, *pImage, allocator->GetAllocationCallbacks());\n+ *pImage = VK_NULL_HANDLE;\n+ return res;\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyImage(\n+ VmaAllocator allocator,\n+ VkImage image,\n+ VmaAllocation allocation)\n+{\n+ VMA_ASSERT(allocator);\n+\n+ if(image == VK_NULL_HANDLE && allocation == VK_NULL_HANDLE)\n+ {\n+ return;\n+ }\n+\n+ VMA_DEBUG_LOG(\"vmaDestroyImage\");\n+\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK\n+\n+ if(image != VK_NULL_HANDLE)\n+ {\n+ (*allocator->GetVulkanFunctions().vkDestroyImage)(allocator->m_hDevice, image, allocator->GetAllocationCallbacks());\n+ }\n+ if(allocation != VK_NULL_HANDLE)\n+ {\n+ allocator->FreeMemory(\n+ 1, \/\/ allocationCount\n+ &allocation);\n+ }\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaCreateVirtualBlock(\n+ const VmaVirtualBlockCreateInfo* VMA_NOT_NULL pCreateInfo,\n+ VmaVirtualBlock VMA_NULLABLE * VMA_NOT_NULL pVirtualBlock)\n+{\n+ VMA_ASSERT(pCreateInfo && pVirtualBlock);\n+ VMA_ASSERT(pCreateInfo->size > 0);\n+ VMA_DEBUG_LOG(\"vmaCreateVirtualBlock\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ *pVirtualBlock = vma_new(pCreateInfo->pAllocationCallbacks, VmaVirtualBlock_T)(*pCreateInfo);\n+ VkResult res = (*pVirtualBlock)->Init();\n+ if(res < 0)\n+ {\n+ vma_delete(pCreateInfo->pAllocationCallbacks, *pVirtualBlock);\n+ *pVirtualBlock = VK_NULL_HANDLE;\n+ }\n+ return res;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaDestroyVirtualBlock(VmaVirtualBlock VMA_NULLABLE virtualBlock)\n+{\n+ if(virtualBlock != VK_NULL_HANDLE)\n+ {\n+ VMA_DEBUG_LOG(\"vmaDestroyVirtualBlock\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ VkAllocationCallbacks allocationCallbacks = virtualBlock->m_AllocationCallbacks; \/\/ Have to copy the callbacks when destroying.\n+ vma_delete(&allocationCallbacks, virtualBlock);\n+ }\n+}\n+\n+VMA_CALL_PRE VkBool32 VMA_CALL_POST vmaIsVirtualBlockEmpty(VmaVirtualBlock VMA_NOT_NULL virtualBlock)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\n+ VMA_DEBUG_LOG(\"vmaIsVirtualBlockEmpty\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ return virtualBlock->IsEmpty() ? VK_TRUE : VK_FALSE;\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualAllocationInfo(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, VmaVirtualAllocationInfo* VMA_NOT_NULL pVirtualAllocInfo)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pVirtualAllocInfo != VMA_NULL);\n+ VMA_DEBUG_LOG(\"vmaGetVirtualAllocationInfo\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->GetAllocationInfo(allocation, *pVirtualAllocInfo);\n+}\n+\n+VMA_CALL_PRE VkResult VMA_CALL_POST vmaVirtualAllocate(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ const VmaVirtualAllocationCreateInfo* VMA_NOT_NULL pCreateInfo, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE* VMA_NOT_NULL pAllocation,\n+ VkDeviceSize* VMA_NULLABLE pOffset)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pCreateInfo != VMA_NULL && pAllocation != VMA_NULL);\n+ VMA_DEBUG_LOG(\"vmaVirtualAllocate\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ return virtualBlock->Allocate(*pCreateInfo, *pAllocation, pOffset);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaVirtualFree(VmaVirtualBlock VMA_NOT_NULL virtualBlock, VmaVirtualAllocation VMA_NULLABLE_NON_DISPATCHABLE allocation)\n+{\n+ if(allocation != VK_NULL_HANDLE)\n+ {\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\n+ VMA_DEBUG_LOG(\"vmaVirtualFree\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->Free(allocation);\n+ }\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaClearVirtualBlock(VmaVirtualBlock VMA_NOT_NULL virtualBlock)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\n+ VMA_DEBUG_LOG(\"vmaClearVirtualBlock\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->Clear();\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaSetVirtualAllocationUserData(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaVirtualAllocation VMA_NOT_NULL_NON_DISPATCHABLE allocation, void* VMA_NULLABLE pUserData)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\n+ VMA_DEBUG_LOG(\"vmaSetVirtualAllocationUserData\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->SetAllocationUserData(allocation, pUserData);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaGetVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaStatistics* VMA_NOT_NULL pStats)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL);\n+ VMA_DEBUG_LOG(\"vmaGetVirtualBlockStatistics\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->GetStatistics(*pStats);\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaCalculateVirtualBlockStatistics(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ VmaDetailedStatistics* VMA_NOT_NULL pStats)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && pStats != VMA_NULL);\n+ VMA_DEBUG_LOG(\"vmaCalculateVirtualBlockStatistics\");\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ virtualBlock->CalculateDetailedStatistics(*pStats);\n+}\n+\n+#if VMA_STATS_STRING_ENABLED\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaBuildVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ char* VMA_NULLABLE * VMA_NOT_NULL ppStatsString, VkBool32 detailedMap)\n+{\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE && ppStatsString != VMA_NULL);\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ const VkAllocationCallbacks* allocationCallbacks = virtualBlock->GetAllocationCallbacks();\n+ VmaStringBuilder sb(allocationCallbacks);\n+ virtualBlock->BuildStatsString(detailedMap != VK_FALSE, sb);\n+ *ppStatsString = VmaCreateStringCopy(allocationCallbacks, sb.GetData(), sb.GetLength());\n+}\n+\n+VMA_CALL_PRE void VMA_CALL_POST vmaFreeVirtualBlockStatsString(VmaVirtualBlock VMA_NOT_NULL virtualBlock,\n+ char* VMA_NULLABLE pStatsString)\n+{\n+ if(pStatsString != VMA_NULL)\n+ {\n+ VMA_ASSERT(virtualBlock != VK_NULL_HANDLE);\n+ VMA_DEBUG_GLOBAL_MUTEX_LOCK;\n+ VmaFreeString(virtualBlock->GetAllocationCallbacks(), pStatsString);\n+ }\n+}\n+#endif \/\/ VMA_STATS_STRING_ENABLED\n+#endif \/\/ _VMA_PUBLIC_INTERFACE\n+#endif \/\/ VMA_IMPLEMENTATION\n+\n+\/**\n+\\page quick_start Quick start\n+\n+\\section quick_start_project_setup Project setup\n+\n+Vulkan Memory Allocator comes in form of a \"stb-style\" single header file.\n+You don't need to build it as a separate library project.\n+You can add this file directly to your project and submit it to code repository next to your other source files.\n+\n+\"Single header\" doesn't mean that everything is contained in C\/C++ declarations,\n+like it tends to be in case of inline functions or C++ templates.\n+It means that implementation is bundled with interface in a single file and needs to be extracted using preprocessor macro.\n+If you don't do it properly, you will get linker errors.\n+\n+To do it properly:\n+\n+-# Include \"vk_mem_alloc.h\" file in each CPP file where you want to use the library.\n+ This includes declarations of all members of the library.\n+-# In exactly one CPP file define following macro before this include.\n+ It enables also internal definitions.\n+\n+\\code\n+#define VMA_IMPLEMENTATION\n+#include \"vk_mem_alloc.h\"\n+\\endcode\n+\n+It may be a good idea to create dedicated CPP file just for this purpose.\n+\n+This library includes header `<vulkan\/vulkan.h>`, which in turn\n+includes `<windows.h>` on Windows. If you need some specific macros defined\n+before including these headers (like `WIN32_LEAN_AND_MEAN` or\n+`WINVER` for Windows, `VK_USE_PLATFORM_WIN32_KHR` for Vulkan), you must define\n+them before every `#include` of this library.\n+\n+\\note This library is written in C++, but has C-compatible interface.\n+Thus you can include and use vk_mem_alloc.h in C or C++ code, but full\n+implementation with `VMA_IMPLEMENTATION` macro must be compiled as C++, NOT as C.\n+\n+\n+\\section quick_start_initialization Initialization\n+\n+At program startup:\n+\n+-# Initialize Vulkan to have `VkPhysicalDevice`, `VkDevice` and `VkInstance` object.\n+-# Fill VmaAllocatorCreateInfo structure and create #VmaAllocator object by\n+ calling vmaCreateAllocator().\n+\n+Only members `physicalDevice`, `device`, `instance` are required.\n+However, you should inform the library which Vulkan version do you use by setting\n+VmaAllocatorCreateInfo::vulkanApiVersion and which extensions did you enable\n+by setting VmaAllocatorCreateInfo::flags (like #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT for VK_KHR_buffer_device_address).\n+Otherwise, VMA would use only features of Vulkan 1.0 core with no extensions.\n+\n+You may need to configure importing Vulkan functions. There are 3 ways to do this:\n+\n+-# **If you link with Vulkan static library** (e.g. \"vulkan-1.lib\" on Windows):\n+ - You don't need to do anything.\n+ - VMA will use these, as macro `VMA_STATIC_VULKAN_FUNCTIONS` is defined to 1 by default.\n+-# **If you want VMA to fetch pointers to Vulkan functions dynamically** using `vkGetInstanceProcAddr`,\n+ `vkGetDeviceProcAddr` (this is the option presented in the example below):\n+ - Define `VMA_STATIC_VULKAN_FUNCTIONS` to 0, `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 1.\n+ - Provide pointers to these two functions via VmaVulkanFunctions::vkGetInstanceProcAddr,\n+ VmaVulkanFunctions::vkGetDeviceProcAddr.\n+ - The library will fetch pointers to all other functions it needs internally.\n+-# **If you fetch pointers to all Vulkan functions in a custom way**, e.g. using some loader like\n+ [Volk](https:\/\/github.com\/zeux\/volk):\n+ - Define `VMA_STATIC_VULKAN_FUNCTIONS` and `VMA_DYNAMIC_VULKAN_FUNCTIONS` to 0.\n+ - Pass these pointers via structure #VmaVulkanFunctions.\n+\n+\\code\n+VmaVulkanFunctions vulkanFunctions = {};\n+vulkanFunctions.vkGetInstanceProcAddr = &vkGetInstanceProcAddr;\n+vulkanFunctions.vkGetDeviceProcAddr = &vkGetDeviceProcAddr;\n+\n+VmaAllocatorCreateInfo allocatorCreateInfo = {};\n+allocatorCreateInfo.vulkanApiVersion = VK_API_VERSION_1_2;\n+allocatorCreateInfo.physicalDevice = physicalDevice;\n+allocatorCreateInfo.device = device;\n+allocatorCreateInfo.instance = instance;\n+allocatorCreateInfo.pVulkanFunctions = &vulkanFunctions;\n+\n+VmaAllocator allocator;\n+vmaCreateAllocator(&allocatorCreateInfo, &allocator);\n+\\endcode\n+\n+\n+\\section quick_start_resource_allocation Resource allocation\n+\n+When you want to create a buffer or image:\n+\n+-# Fill `VkBufferCreateInfo` \/ `VkImageCreateInfo` structure.\n+-# Fill VmaAllocationCreateInfo structure.\n+-# Call vmaCreateBuffer() \/ vmaCreateImage() to get `VkBuffer`\/`VkImage` with memory\n+ already allocated and bound to it, plus #VmaAllocation objects that represents its underlying memory.\n+\n+\\code\n+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufferInfo.size = 65536;\n+bufferInfo.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo allocInfo = {};\n+allocInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+\n+VkBuffer buffer;\n+VmaAllocation allocation;\n+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\n+\\endcode\n+\n+Don't forget to destroy your objects when no longer needed:\n+\n+\\code\n+vmaDestroyBuffer(allocator, buffer, allocation);\n+vmaDestroyAllocator(allocator);\n+\\endcode\n+\n+\n+\\page choosing_memory_type Choosing memory type\n+\n+Physical devices in Vulkan support various combinations of memory heaps and\n+types. Help with choosing correct and optimal memory type for your specific\n+resource is one of the key features of this library. You can use it by filling\n+appropriate members of VmaAllocationCreateInfo structure, as described below.\n+You can also combine multiple methods.\n+\n+-# If you just want to find memory type index that meets your requirements, you\n+ can use function: vmaFindMemoryTypeIndexForBufferInfo(),\n+ vmaFindMemoryTypeIndexForImageInfo(), vmaFindMemoryTypeIndex().\n+-# If you want to allocate a region of device memory without association with any\n+ specific image or buffer, you can use function vmaAllocateMemory(). Usage of\n+ this function is not recommended and usually not needed.\n+ vmaAllocateMemoryPages() function is also provided for creating multiple allocations at once,\n+ which may be useful for sparse binding.\n+-# If you already have a buffer or an image created, you want to allocate memory\n+ for it and then you will bind it yourself, you can use function\n+ vmaAllocateMemoryForBuffer(), vmaAllocateMemoryForImage().\n+ For binding you should use functions: vmaBindBufferMemory(), vmaBindImageMemory()\n+ or their extended versions: vmaBindBufferMemory2(), vmaBindImageMemory2().\n+-# **This is the easiest and recommended way to use this library:**\n+ If you want to create a buffer or an image, allocate memory for it and bind\n+ them together, all in one call, you can use function vmaCreateBuffer(),\n+ vmaCreateImage().\n+\n+When using 3. or 4., the library internally queries Vulkan for memory types\n+supported for that buffer or image (function `vkGetBufferMemoryRequirements()`)\n+and uses only one of these types.\n+\n+If no memory type can be found that meets all the requirements, these functions\n+return `VK_ERROR_FEATURE_NOT_PRESENT`.\n+\n+You can leave VmaAllocationCreateInfo structure completely filled with zeros.\n+It means no requirements are specified for memory type.\n+It is valid, although not very useful.\n+\n+\\section choosing_memory_type_usage Usage\n+\n+The easiest way to specify memory requirements is to fill member\n+VmaAllocationCreateInfo::usage using one of the values of enum #VmaMemoryUsage.\n+It defines high level, common usage types.\n+Since version 3 of the library, it is recommended to use #VMA_MEMORY_USAGE_AUTO to let it select best memory type for your resource automatically.\n+\n+For example, if you want to create a uniform buffer that will be filled using\n+transfer only once or infrequently and then used for rendering every frame as a uniform buffer, you can\n+do it using following code. The buffer will most likely end up in a memory type with\n+`VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT` to be fast to access by the GPU device.\n+\n+\\code\n+VkBufferCreateInfo bufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufferInfo.size = 65536;\n+bufferInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo allocInfo = {};\n+allocInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+\n+VkBuffer buffer;\n+VmaAllocation allocation;\n+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\n+\\endcode\n+\n+If you have a preference for putting the resource in GPU (device) memory or CPU (host) memory\n+on systems with discrete graphics card that have the memories separate, you can use\n+#VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE or #VMA_MEMORY_USAGE_AUTO_PREFER_HOST.\n+\n+When using `VMA_MEMORY_USAGE_AUTO*` while you want to map the allocated memory,\n+you also need to specify one of the host access flags:\n+#VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\n+This will help the library decide about preferred memory type to ensure it has `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`\n+so you can map it.\n+\n+For example, a staging buffer that will be filled via mapped pointer and then\n+used as a source of transfer to the buffer decribed previously can be created like this.\n+It will likely and up in a memory type that is `HOST_VISIBLE` and `HOST_COHERENT`\n+but not `HOST_CACHED` (meaning uncached, write-combined) and not `DEVICE_LOCAL` (meaning system RAM).\n+\n+\\code\n+VkBufferCreateInfo stagingBufferInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+stagingBufferInfo.size = 65536;\n+stagingBufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\n+\n+VmaAllocationCreateInfo stagingAllocInfo = {};\n+stagingAllocInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+stagingAllocInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;\n+\n+VkBuffer stagingBuffer;\n+VmaAllocation stagingAllocation;\n+vmaCreateBuffer(allocator, &stagingBufferInfo, &stagingAllocInfo, &stagingBuffer, &stagingAllocation, nullptr);\n+\\endcode\n+\n+For more examples of creating different kinds of resources, see chapter \\ref usage_patterns.\n+\n+Usage values `VMA_MEMORY_USAGE_AUTO*` are legal to use only when the library knows\n+about the resource being created by having `VkBufferCreateInfo` \/ `VkImageCreateInfo` passed,\n+so they work with functions like: vmaCreateBuffer(), vmaCreateImage(), vmaFindMemoryTypeIndexForBufferInfo() etc.\n+If you allocate raw memory using function vmaAllocateMemory(), you have to use other means of selecting\n+memory type, as decribed below.\n+\n+\\note\n+Old usage values (`VMA_MEMORY_USAGE_GPU_ONLY`, `VMA_MEMORY_USAGE_CPU_ONLY`,\n+`VMA_MEMORY_USAGE_CPU_TO_GPU`, `VMA_MEMORY_USAGE_GPU_TO_CPU`, `VMA_MEMORY_USAGE_CPU_COPY`)\n+are still available and work same way as in previous versions of the library\n+for backward compatibility, but they are not recommended.\n+\n+\\section choosing_memory_type_required_preferred_flags Required and preferred flags\n+\n+You can specify more detailed requirements by filling members\n+VmaAllocationCreateInfo::requiredFlags and VmaAllocationCreateInfo::preferredFlags\n+with a combination of bits from enum `VkMemoryPropertyFlags`. For example,\n+if you want to create a buffer that will be persistently mapped on host (so it\n+must be `HOST_VISIBLE`) and preferably will also be `HOST_COHERENT` and `HOST_CACHED`,\n+use following code:\n+\n+\\code\n+VmaAllocationCreateInfo allocInfo = {};\n+allocInfo.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;\n+allocInfo.preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;\n+allocInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+\n+VkBuffer buffer;\n+VmaAllocation allocation;\n+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\n+\\endcode\n+\n+A memory type is chosen that has all the required flags and as many preferred\n+flags set as possible.\n+\n+Value passed in VmaAllocationCreateInfo::usage is internally converted to a set of required and preferred flags,\n+plus some extra \"magic\" (heuristics).\n+\n+\\section choosing_memory_type_explicit_memory_types Explicit memory types\n+\n+If you inspected memory types available on the physical device and you have\n+a preference for memory types that you want to use, you can fill member\n+VmaAllocationCreateInfo::memoryTypeBits. It is a bit mask, where each bit set\n+means that a memory type with that index is allowed to be used for the\n+allocation. Special value 0, just like `UINT32_MAX`, means there are no\n+restrictions to memory type index.\n+\n+Please note that this member is NOT just a memory type index.\n+Still you can use it to choose just one, specific memory type.\n+For example, if you already determined that your buffer should be created in\n+memory type 2, use following code:\n+\n+\\code\n+uint32_t memoryTypeIndex = 2;\n+\n+VmaAllocationCreateInfo allocInfo = {};\n+allocInfo.memoryTypeBits = 1u << memoryTypeIndex;\n+\n+VkBuffer buffer;\n+VmaAllocation allocation;\n+vmaCreateBuffer(allocator, &bufferInfo, &allocInfo, &buffer, &allocation, nullptr);\n+\\endcode\n+\n+\n+\\section choosing_memory_type_custom_memory_pools Custom memory pools\n+\n+If you allocate from custom memory pool, all the ways of specifying memory\n+requirements described above are not applicable and the aforementioned members\n+of VmaAllocationCreateInfo structure are ignored. Memory type is selected\n+explicitly when creating the pool and then used to make all the allocations from\n+that pool. For further details, see \\ref custom_memory_pools.\n+\n+\\section choosing_memory_type_dedicated_allocations Dedicated allocations\n+\n+Memory for allocations is reserved out of larger block of `VkDeviceMemory`\n+allocated from Vulkan internally. That is the main feature of this whole library.\n+You can still request a separate memory block to be created for an allocation,\n+just like you would do in a trivial solution without using any allocator.\n+In that case, a buffer or image is always bound to that memory at offset 0.\n+This is called a \"dedicated allocation\".\n+You can explicitly request it by using flag #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+The library can also internally decide to use dedicated allocation in some cases, e.g.:\n+\n+- When the size of the allocation is large.\n+- When [VK_KHR_dedicated_allocation](@ref vk_khr_dedicated_allocation) extension is enabled\n+ and it reports that dedicated allocation is required or recommended for the resource.\n+- When allocation of next big memory block fails due to not enough device memory,\n+ but allocation with the exact requested size succeeds.\n+\n+\n+\\page memory_mapping Memory mapping\n+\n+To \"map memory\" in Vulkan means to obtain a CPU pointer to `VkDeviceMemory`,\n+to be able to read from it or write to it in CPU code.\n+Mapping is possible only of memory allocated from a memory type that has\n+`VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT` flag.\n+Functions `vkMapMemory()`, `vkUnmapMemory()` are designed for this purpose.\n+You can use them directly with memory allocated by this library,\n+but it is not recommended because of following issue:\n+Mapping the same `VkDeviceMemory` block multiple times is illegal - only one mapping at a time is allowed.\n+This includes mapping disjoint regions. Mapping is not reference-counted internally by Vulkan.\n+Because of this, Vulkan Memory Allocator provides following facilities:\n+\n+\\note If you want to be able to map an allocation, you need to specify one of the flags\n+#VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT\n+in VmaAllocationCreateInfo::flags. These flags are required for an allocation to be mappable\n+when using #VMA_MEMORY_USAGE_AUTO or other `VMA_MEMORY_USAGE_AUTO*` enum values.\n+For other usage values they are ignored and every such allocation made in `HOST_VISIBLE` memory type is mappable,\n+but they can still be used for consistency.\n+\n+\\section memory_mapping_mapping_functions Mapping functions\n+\n+The library provides following functions for mapping of a specific #VmaAllocation: vmaMapMemory(), vmaUnmapMemory().\n+They are safer and more convenient to use than standard Vulkan functions.\n+You can map an allocation multiple times simultaneously - mapping is reference-counted internally.\n+You can also map different allocations simultaneously regardless of whether they use the same `VkDeviceMemory` block.\n+The way it is implemented is that the library always maps entire memory block, not just region of the allocation.\n+For further details, see description of vmaMapMemory() function.\n+Example:\n+\n+\\code\n+\/\/ Having these objects initialized:\n+struct ConstantBuffer\n+{\n+ ...\n+};\n+ConstantBuffer constantBufferData = ...\n+\n+VmaAllocator allocator = ...\n+VkBuffer constantBuffer = ...\n+VmaAllocation constantBufferAllocation = ...\n+\n+\/\/ You can map and fill your buffer using following code:\n+\n+void* mappedData;\n+vmaMapMemory(allocator, constantBufferAllocation, &mappedData);\n+memcpy(mappedData, &constantBufferData, sizeof(constantBufferData));\n+vmaUnmapMemory(allocator, constantBufferAllocation);\n+\\endcode\n+\n+When mapping, you may see a warning from Vulkan validation layer similar to this one:\n+\n+<i>Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.<\/i>\n+\n+It happens because the library maps entire `VkDeviceMemory` block, where different\n+types of images and buffers may end up together, especially on GPUs with unified memory like Intel.\n+You can safely ignore it if you are sure you access only memory of the intended\n+object that you wanted to map.\n+\n+\n+\\section memory_mapping_persistently_mapped_memory Persistently mapped memory\n+\n+Kepping your memory persistently mapped is generally OK in Vulkan.\n+You don't need to unmap it before using its data on the GPU.\n+The library provides a special feature designed for that:\n+Allocations made with #VMA_ALLOCATION_CREATE_MAPPED_BIT flag set in\n+VmaAllocationCreateInfo::flags stay mapped all the time,\n+so you can just access CPU pointer to it any time\n+without a need to call any \"map\" or \"unmap\" function.\n+Example:\n+\n+\\code\n+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufCreateInfo.size = sizeof(ConstantBuffer);\n+bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+\n+VkBuffer buf;\n+VmaAllocation alloc;\n+VmaAllocationInfo allocInfo;\n+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\n+\n+\/\/ Buffer is already mapped. You can access its memory.\n+memcpy(allocInfo.pMappedData, &constantBufferData, sizeof(constantBufferData));\n+\\endcode\n+\n+\\note #VMA_ALLOCATION_CREATE_MAPPED_BIT by itself doesn't guarantee that the allocation will end up\n+in a mappable memory type.\n+For this, you need to also specify #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT or\n+#VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\n+#VMA_ALLOCATION_CREATE_MAPPED_BIT only guarantees that if the memory is `HOST_VISIBLE`, the allocation will be mapped on creation.\n+For an example of how to make use of this fact, see section \\ref usage_patterns_advanced_data_uploading.\n+\n+\\section memory_mapping_cache_control Cache flush and invalidate\n+\n+Memory in Vulkan doesn't need to be unmapped before using it on GPU,\n+but unless a memory types has `VK_MEMORY_PROPERTY_HOST_COHERENT_BIT` flag set,\n+you need to manually **invalidate** cache before reading of mapped pointer\n+and **flush** cache after writing to mapped pointer.\n+Map\/unmap operations don't do that automatically.\n+Vulkan provides following functions for this purpose `vkFlushMappedMemoryRanges()`,\n+`vkInvalidateMappedMemoryRanges()`, but this library provides more convenient\n+functions that refer to given allocation object: vmaFlushAllocation(),\n+vmaInvalidateAllocation(),\n+or multiple objects at once: vmaFlushAllocations(), vmaInvalidateAllocations().\n+\n+Regions of memory specified for flush\/invalidate must be aligned to\n+`VkPhysicalDeviceLimits::nonCoherentAtomSize`. This is automatically ensured by the library.\n+In any memory type that is `HOST_VISIBLE` but not `HOST_COHERENT`, all allocations\n+within blocks are aligned to this value, so their offsets are always multiply of\n+`nonCoherentAtomSize` and two different allocations never share same \"line\" of this size.\n+\n+Also, Windows drivers from all 3 PC GPU vendors (AMD, Intel, NVIDIA)\n+currently provide `HOST_COHERENT` flag on all memory types that are\n+`HOST_VISIBLE`, so on PC you may not need to bother.\n+\n+\n+\\page staying_within_budget Staying within budget\n+\n+When developing a graphics-intensive game or program, it is important to avoid allocating\n+more GPU memory than it is physically available. When the memory is over-committed,\n+various bad things can happen, depending on the specific GPU, graphics driver, and\n+operating system:\n+\n+- It may just work without any problems.\n+- The application may slow down because some memory blocks are moved to system RAM\n+ and the GPU has to access them through PCI Express bus.\n+- A new allocation may take very long time to complete, even few seconds, and possibly\n+ freeze entire system.\n+- The new allocation may fail with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+- It may even result in GPU crash (TDR), observed as `VK_ERROR_DEVICE_LOST`\n+ returned somewhere later.\n+\n+\\section staying_within_budget_querying_for_budget Querying for budget\n+\n+To query for current memory usage and available budget, use function vmaGetHeapBudgets().\n+Returned structure #VmaBudget contains quantities expressed in bytes, per Vulkan memory heap.\n+\n+Please note that this function returns different information and works faster than\n+vmaCalculateStatistics(). vmaGetHeapBudgets() can be called every frame or even before every\n+allocation, while vmaCalculateStatistics() is intended to be used rarely,\n+only to obtain statistical information, e.g. for debugging purposes.\n+\n+It is recommended to use <b>VK_EXT_memory_budget<\/b> device extension to obtain information\n+about the budget from Vulkan device. VMA is able to use this extension automatically.\n+When not enabled, the allocator behaves same way, but then it estimates current usage\n+and available budget based on its internal information and Vulkan memory heap sizes,\n+which may be less precise. In order to use this extension:\n+\n+1. Make sure extensions VK_EXT_memory_budget and VK_KHR_get_physical_device_properties2\n+ required by it are available and enable them. Please note that the first is a device\n+ extension and the second is instance extension!\n+2. Use flag #VMA_ALLOCATOR_CREATE_EXT_MEMORY_BUDGET_BIT when creating #VmaAllocator object.\n+3. Make sure to call vmaSetCurrentFrameIndex() every frame. Budget is queried from\n+ Vulkan inside of it to avoid overhead of querying it with every allocation.\n+\n+\\section staying_within_budget_controlling_memory_usage Controlling memory usage\n+\n+There are many ways in which you can try to stay within the budget.\n+\n+First, when making new allocation requires allocating a new memory block, the library\n+tries not to exceed the budget automatically. If a block with default recommended size\n+(e.g. 256 MB) would go over budget, a smaller block is allocated, possibly even\n+dedicated memory for just this resource.\n+\n+If the size of the requested resource plus current memory usage is more than the\n+budget, by default the library still tries to create it, leaving it to the Vulkan\n+implementation whether the allocation succeeds or fails. You can change this behavior\n+by using #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag. With it, the allocation is\n+not made if it would exceed the budget or if the budget is already exceeded.\n+VMA then tries to make the allocation from the next eligible Vulkan memory type.\n+The all of them fail, the call then fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+Example usage pattern may be to pass the #VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT flag\n+when creating resources that are not essential for the application (e.g. the texture\n+of a specific object) and not to pass it when creating critically important resources\n+(e.g. render targets).\n+\n+On AMD graphics cards there is a custom vendor extension available: <b>VK_AMD_memory_overallocation_behavior<\/b>\n+that allows to control the behavior of the Vulkan implementation in out-of-memory cases -\n+whether it should fail with an error code or still allow the allocation.\n+Usage of this extension involves only passing extra structure on Vulkan device creation,\n+so it is out of scope of this library.\n+\n+Finally, you can also use #VMA_ALLOCATION_CREATE_NEVER_ALLOCATE_BIT flag to make sure\n+a new allocation is created only when it fits inside one of the existing memory blocks.\n+If it would require to allocate a new block, if fails instead with `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+This also ensures that the function call is very fast because it never goes to Vulkan\n+to obtain a new block.\n+\n+\\note Creating \\ref custom_memory_pools with VmaPoolCreateInfo::minBlockCount\n+set to more than 0 will currently try to allocate memory blocks without checking whether they\n+fit within budget.\n+\n+\n+\\page resource_aliasing Resource aliasing (overlap)\n+\n+New explicit graphics APIs (Vulkan and Direct3D 12), thanks to manual memory\n+management, give an opportunity to alias (overlap) multiple resources in the\n+same region of memory - a feature not available in the old APIs (Direct3D 11, OpenGL).\n+It can be useful to save video memory, but it must be used with caution.\n+\n+For example, if you know the flow of your whole render frame in advance, you\n+are going to use some intermediate textures or buffers only during a small range of render passes,\n+and you know these ranges don't overlap in time, you can bind these resources to\n+the same place in memory, even if they have completely different parameters (width, height, format etc.).\n+\n+![Resource aliasing (overlap)](..\/gfx\/Aliasing.png)\n+\n+Such scenario is possible using VMA, but you need to create your images manually.\n+Then you need to calculate parameters of an allocation to be made using formula:\n+\n+- allocation size = max(size of each image)\n+- allocation alignment = max(alignment of each image)\n+- allocation memoryTypeBits = bitwise AND(memoryTypeBits of each image)\n+\n+Following example shows two different images bound to the same place in memory,\n+allocated to fit largest of them.\n+\n+\\code\n+\/\/ A 512x512 texture to be sampled.\n+VkImageCreateInfo img1CreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\n+img1CreateInfo.imageType = VK_IMAGE_TYPE_2D;\n+img1CreateInfo.extent.width = 512;\n+img1CreateInfo.extent.height = 512;\n+img1CreateInfo.extent.depth = 1;\n+img1CreateInfo.mipLevels = 10;\n+img1CreateInfo.arrayLayers = 1;\n+img1CreateInfo.format = VK_FORMAT_R8G8B8A8_SRGB;\n+img1CreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\n+img1CreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\n+img1CreateInfo.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;\n+img1CreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\n+\n+\/\/ A full screen texture to be used as color attachment.\n+VkImageCreateInfo img2CreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\n+img2CreateInfo.imageType = VK_IMAGE_TYPE_2D;\n+img2CreateInfo.extent.width = 1920;\n+img2CreateInfo.extent.height = 1080;\n+img2CreateInfo.extent.depth = 1;\n+img2CreateInfo.mipLevels = 1;\n+img2CreateInfo.arrayLayers = 1;\n+img2CreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\n+img2CreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\n+img2CreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\n+img2CreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\n+img2CreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\n+\n+VkImage img1;\n+res = vkCreateImage(device, &img1CreateInfo, nullptr, &img1);\n+VkImage img2;\n+res = vkCreateImage(device, &img2CreateInfo, nullptr, &img2);\n+\n+VkMemoryRequirements img1MemReq;\n+vkGetImageMemoryRequirements(device, img1, &img1MemReq);\n+VkMemoryRequirements img2MemReq;\n+vkGetImageMemoryRequirements(device, img2, &img2MemReq);\n+\n+VkMemoryRequirements finalMemReq = {};\n+finalMemReq.size = std::max(img1MemReq.size, img2MemReq.size);\n+finalMemReq.alignment = std::max(img1MemReq.alignment, img2MemReq.alignment);\n+finalMemReq.memoryTypeBits = img1MemReq.memoryTypeBits & img2MemReq.memoryTypeBits;\n+\/\/ Validate if(finalMemReq.memoryTypeBits != 0)\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;\n+\n+VmaAllocation alloc;\n+res = vmaAllocateMemory(allocator, &finalMemReq, &allocCreateInfo, &alloc, nullptr);\n+\n+res = vmaBindImageMemory(allocator, alloc, img1);\n+res = vmaBindImageMemory(allocator, alloc, img2);\n+\n+\/\/ You can use img1, img2 here, but not at the same time!\n+\n+vmaFreeMemory(allocator, alloc);\n+vkDestroyImage(allocator, img2, nullptr);\n+vkDestroyImage(allocator, img1, nullptr);\n+\\endcode\n+\n+Remember that using resources that alias in memory requires proper synchronization.\n+You need to issue a memory barrier to make sure commands that use `img1` and `img2`\n+don't overlap on GPU timeline.\n+You also need to treat a resource after aliasing as uninitialized - containing garbage data.\n+For example, if you use `img1` and then want to use `img2`, you need to issue\n+an image memory barrier for `img2` with `oldLayout` = `VK_IMAGE_LAYOUT_UNDEFINED`.\n+\n+Additional considerations:\n+\n+- Vulkan also allows to interpret contents of memory between aliasing resources consistently in some cases.\n+See chapter 11.8. \"Memory Aliasing\" of Vulkan specification or `VK_IMAGE_CREATE_ALIAS_BIT` flag.\n+- You can create more complex layout where different images and buffers are bound\n+at different offsets inside one large allocation. For example, one can imagine\n+a big texture used in some render passes, aliasing with a set of many small buffers\n+used between in some further passes. To bind a resource at non-zero offset in an allocation,\n+use vmaBindBufferMemory2() \/ vmaBindImageMemory2().\n+- Before allocating memory for the resources you want to alias, check `memoryTypeBits`\n+returned in memory requirements of each resource to make sure the bits overlap.\n+Some GPUs may expose multiple memory types suitable e.g. only for buffers or\n+images with `COLOR_ATTACHMENT` usage, so the sets of memory types supported by your\n+resources may be disjoint. Aliasing them is not possible in that case.\n+\n+\n+\\page custom_memory_pools Custom memory pools\n+\n+A memory pool contains a number of `VkDeviceMemory` blocks.\n+The library automatically creates and manages default pool for each memory type available on the device.\n+Default memory pool automatically grows in size.\n+Size of allocated blocks is also variable and managed automatically.\n+\n+You can create custom pool and allocate memory out of it.\n+It can be useful if you want to:\n+\n+- Keep certain kind of allocations separate from others.\n+- Enforce particular, fixed size of Vulkan memory blocks.\n+- Limit maximum amount of Vulkan memory allocated for that pool.\n+- Reserve minimum or fixed amount of Vulkan memory always preallocated for that pool.\n+- Use extra parameters for a set of your allocations that are available in #VmaPoolCreateInfo but not in\n+ #VmaAllocationCreateInfo - e.g., custom minimum alignment, custom `pNext` chain.\n+- Perform defragmentation on a specific subset of your allocations.\n+\n+To use custom memory pools:\n+\n+-# Fill VmaPoolCreateInfo structure.\n+-# Call vmaCreatePool() to obtain #VmaPool handle.\n+-# When making an allocation, set VmaAllocationCreateInfo::pool to this handle.\n+ You don't need to specify any other parameters of this structure, like `usage`.\n+\n+Example:\n+\n+\\code\n+\/\/ Find memoryTypeIndex for the pool.\n+VkBufferCreateInfo sampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+sampleBufCreateInfo.size = 0x10000; \/\/ Doesn't matter.\n+sampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo sampleAllocCreateInfo = {};\n+sampleAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+\n+uint32_t memTypeIndex;\n+VkResult res = vmaFindMemoryTypeIndexForBufferInfo(allocator,\n+ &sampleBufCreateInfo, &sampleAllocCreateInfo, &memTypeIndex);\n+\/\/ Check res...\n+\n+\/\/ Create a pool that can have at most 2 blocks, 128 MiB each.\n+VmaPoolCreateInfo poolCreateInfo = {};\n+poolCreateInfo.memoryTypeIndex = memTypeIndex;\n+poolCreateInfo.blockSize = 128ull * 1024 * 1024;\n+poolCreateInfo.maxBlockCount = 2;\n+\n+VmaPool pool;\n+res = vmaCreatePool(allocator, &poolCreateInfo, &pool);\n+\/\/ Check res...\n+\n+\/\/ Allocate a buffer out of it.\n+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufCreateInfo.size = 1024;\n+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.pool = pool;\n+\n+VkBuffer buf;\n+VmaAllocation alloc;\n+res = vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, nullptr);\n+\/\/ Check res...\n+\\endcode\n+\n+You have to free all allocations made from this pool before destroying it.\n+\n+\\code\n+vmaDestroyBuffer(allocator, buf, alloc);\n+vmaDestroyPool(allocator, pool);\n+\\endcode\n+\n+New versions of this library support creating dedicated allocations in custom pools.\n+It is supported only when VmaPoolCreateInfo::blockSize = 0.\n+To use this feature, set VmaAllocationCreateInfo::pool to the pointer to your custom pool and\n+VmaAllocationCreateInfo::flags to #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+\n+\\note Excessive use of custom pools is a common mistake when using this library.\n+Custom pools may be useful for special purposes - when you want to\n+keep certain type of resources separate e.g. to reserve minimum amount of memory\n+for them or limit maximum amount of memory they can occupy. For most\n+resources this is not needed and so it is not recommended to create #VmaPool\n+objects and allocations out of them. Allocating from the default pool is sufficient.\n+\n+\n+\\section custom_memory_pools_MemTypeIndex Choosing memory type index\n+\n+When creating a pool, you must explicitly specify memory type index.\n+To find the one suitable for your buffers or images, you can use helper functions\n+vmaFindMemoryTypeIndexForBufferInfo(), vmaFindMemoryTypeIndexForImageInfo().\n+You need to provide structures with example parameters of buffers or images\n+that you are going to create in that pool.\n+\n+\\code\n+VkBufferCreateInfo exampleBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+exampleBufCreateInfo.size = 1024; \/\/ Doesn't matter\n+exampleBufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+\n+uint32_t memTypeIndex;\n+vmaFindMemoryTypeIndexForBufferInfo(allocator, &exampleBufCreateInfo, &allocCreateInfo, &memTypeIndex);\n+\n+VmaPoolCreateInfo poolCreateInfo = {};\n+poolCreateInfo.memoryTypeIndex = memTypeIndex;\n+\/\/ ...\n+\\endcode\n+\n+When creating buffers\/images allocated in that pool, provide following parameters:\n+\n+- `VkBufferCreateInfo`: Prefer to pass same parameters as above.\n+ Otherwise you risk creating resources in a memory type that is not suitable for them, which may result in undefined behavior.\n+ Using different `VK_BUFFER_USAGE_` flags may work, but you shouldn't create images in a pool intended for buffers\n+ or the other way around.\n+- VmaAllocationCreateInfo: You don't need to pass same parameters. Fill only `pool` member.\n+ Other members are ignored anyway.\n+\n+\\section linear_algorithm Linear allocation algorithm\n+\n+Each Vulkan memory block managed by this library has accompanying metadata that\n+keeps track of used and unused regions. By default, the metadata structure and\n+algorithm tries to find best place for new allocations among free regions to\n+optimize memory usage. This way you can allocate and free objects in any order.\n+\n+![Default allocation algorithm](..\/gfx\/Linear_allocator_1_algo_default.png)\n+\n+Sometimes there is a need to use simpler, linear allocation algorithm. You can\n+create custom pool that uses such algorithm by adding flag\n+#VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT to VmaPoolCreateInfo::flags while creating\n+#VmaPool object. Then an alternative metadata management is used. It always\n+creates new allocations after last one and doesn't reuse free regions after\n+allocations freed in the middle. It results in better allocation performance and\n+less memory consumed by metadata.\n+\n+![Linear allocation algorithm](..\/gfx\/Linear_allocator_2_algo_linear.png)\n+\n+With this one flag, you can create a custom pool that can be used in many ways:\n+free-at-once, stack, double stack, and ring buffer. See below for details.\n+You don't need to specify explicitly which of these options you are going to use - it is detected automatically.\n+\n+\\subsection linear_algorithm_free_at_once Free-at-once\n+\n+In a pool that uses linear algorithm, you still need to free all the allocations\n+individually, e.g. by using vmaFreeMemory() or vmaDestroyBuffer(). You can free\n+them in any order. New allocations are always made after last one - free space\n+in the middle is not reused. However, when you release all the allocation and\n+the pool becomes empty, allocation starts from the beginning again. This way you\n+can use linear algorithm to speed up creation of allocations that you are going\n+to release all at once.\n+\n+![Free-at-once](..\/gfx\/Linear_allocator_3_free_at_once.png)\n+\n+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount\n+value that allows multiple memory blocks.\n+\n+\\subsection linear_algorithm_stack Stack\n+\n+When you free an allocation that was created last, its space can be reused.\n+Thanks to this, if you always release allocations in the order opposite to their\n+creation (LIFO - Last In First Out), you can achieve behavior of a stack.\n+\n+![Stack](..\/gfx\/Linear_allocator_4_stack.png)\n+\n+This mode is also available for pools created with VmaPoolCreateInfo::maxBlockCount\n+value that allows multiple memory blocks.\n+\n+\\subsection linear_algorithm_double_stack Double stack\n+\n+The space reserved by a custom pool with linear algorithm may be used by two\n+stacks:\n+\n+- First, default one, growing up from offset 0.\n+- Second, \"upper\" one, growing down from the end towards lower offsets.\n+\n+To make allocation from the upper stack, add flag #VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT\n+to VmaAllocationCreateInfo::flags.\n+\n+![Double stack](..\/gfx\/Linear_allocator_7_double_stack.png)\n+\n+Double stack is available only in pools with one memory block -\n+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.\n+\n+When the two stacks' ends meet so there is not enough space between them for a\n+new allocation, such allocation fails with usual\n+`VK_ERROR_OUT_OF_DEVICE_MEMORY` error.\n+\n+\\subsection linear_algorithm_ring_buffer Ring buffer\n+\n+When you free some allocations from the beginning and there is not enough free space\n+for a new one at the end of a pool, allocator's \"cursor\" wraps around to the\n+beginning and starts allocation there. Thanks to this, if you always release\n+allocations in the same order as you created them (FIFO - First In First Out),\n+you can achieve behavior of a ring buffer \/ queue.\n+\n+![Ring buffer](..\/gfx\/Linear_allocator_5_ring_buffer.png)\n+\n+Ring buffer is available only in pools with one memory block -\n+VmaPoolCreateInfo::maxBlockCount must be 1. Otherwise behavior is undefined.\n+\n+\\note \\ref defragmentation is not supported in custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT.\n+\n+\n+\\page defragmentation Defragmentation\n+\n+Interleaved allocations and deallocations of many objects of varying size can\n+cause fragmentation over time, which can lead to a situation where the library is unable\n+to find a continuous range of free memory for a new allocation despite there is\n+enough free space, just scattered across many small free ranges between existing\n+allocations.\n+\n+To mitigate this problem, you can use defragmentation feature.\n+It doesn't happen automatically though and needs your cooperation,\n+because VMA is a low level library that only allocates memory.\n+It cannot recreate buffers and images in a new place as it doesn't remember the contents of `VkBufferCreateInfo` \/ `VkImageCreateInfo` structures.\n+It cannot copy their contents as it doesn't record any commands to a command buffer.\n+\n+Example:\n+\n+\\code\n+VmaDefragmentationInfo defragInfo = {};\n+defragInfo.pool = myPool;\n+defragInfo.flags = VMA_DEFRAGMENTATION_FLAG_ALGORITHM_FAST_BIT;\n+\n+VmaDefragmentationContext defragCtx;\n+VkResult res = vmaBeginDefragmentation(allocator, &defragInfo, &defragCtx);\n+\/\/ Check res...\n+\n+for(;;)\n+{\n+ VmaDefragmentationPassMoveInfo pass;\n+ res = vmaBeginDefragmentationPass(allocator, defragCtx, &pass);\n+ if(res == VK_SUCCESS)\n+ break;\n+ else if(res != VK_INCOMPLETE)\n+ \/\/ Handle error...\n+\n+ for(uint32_t i = 0; i < pass.moveCount; ++i)\n+ {\n+ \/\/ Inspect pass.pMoves[i].srcAllocation, identify what buffer\/image it represents.\n+ VmaAllocationInfo allocInfo;\n+ vmaGetAllocationInfo(allocator, pMoves[i].srcAllocation, &allocInfo);\n+ MyEngineResourceData* resData = (MyEngineResourceData*)allocInfo.pUserData;\n+ \n+ \/\/ Recreate and bind this buffer\/image at: pass.pMoves[i].dstMemory, pass.pMoves[i].dstOffset.\n+ VkImageCreateInfo imgCreateInfo = ...\n+ VkImage newImg;\n+ res = vkCreateImage(device, &imgCreateInfo, nullptr, &newImg);\n+ \/\/ Check res...\n+ res = vmaBindImageMemory(allocator, pMoves[i].dstTmpAllocation, newImg);\n+ \/\/ Check res...\n+\n+ \/\/ Issue a vkCmdCopyBuffer\/vkCmdCopyImage to copy its content to the new place.\n+ vkCmdCopyImage(cmdBuf, resData->img, ..., newImg, ...);\n+ }\n+ \n+ \/\/ Make sure the copy commands finished executing.\n+ vkWaitForFences(...);\n+\n+ \/\/ Destroy old buffers\/images bound with pass.pMoves[i].srcAllocation.\n+ for(uint32_t i = 0; i < pass.moveCount; ++i)\n+ {\n+ \/\/ ...\n+ vkDestroyImage(device, resData->img, nullptr);\n+ }\n+\n+ \/\/ Update appropriate descriptors to point to the new places...\n+ \n+ res = vmaEndDefragmentationPass(allocator, defragCtx, &pass);\n+ if(res == VK_SUCCESS)\n+ break;\n+ else if(res != VK_INCOMPLETE)\n+ \/\/ Handle error...\n+}\n+\n+vmaEndDefragmentation(allocator, defragCtx, nullptr);\n+\\endcode\n+\n+Although functions like vmaCreateBuffer(), vmaCreateImage(), vmaDestroyBuffer(), vmaDestroyImage()\n+create\/destroy an allocation and a buffer\/image at once, these are just a shortcut for\n+creating the resource, allocating memory, and binding them together.\n+Defragmentation works on memory allocations only. You must handle the rest manually.\n+Defragmentation is an iterative process that should repreat \"passes\" as long as related functions\n+return `VK_INCOMPLETE` not `VK_SUCCESS`.\n+In each pass:\n+\n+1. vmaBeginDefragmentationPass() function call:\n+ - Calculates and returns the list of allocations to be moved in this pass.\n+ Note this can be a time-consuming process.\n+ - Reserves destination memory for them by creating temporary destination allocations\n+ that you can query for their `VkDeviceMemory` + offset using vmaGetAllocationInfo().\n+2. Inside the pass, **you should**:\n+ - Inspect the returned list of allocations to be moved.\n+ - Create new buffers\/images and bind them at the returned destination temporary allocations.\n+ - Copy data from source to destination resources if necessary.\n+ - Destroy the source buffers\/images, but NOT their allocations.\n+3. vmaEndDefragmentationPass() function call:\n+ - Frees the source memory reserved for the allocations that are moved.\n+ - Modifies source #VmaAllocation objects that are moved to point to the destination reserved memory.\n+ - Frees `VkDeviceMemory` blocks that became empty.\n+\n+Unlike in previous iterations of the defragmentation API, there is no list of \"movable\" allocations passed as a parameter.\n+Defragmentation algorithm tries to move all suitable allocations.\n+You can, however, refuse to move some of them inside a defragmentation pass, by setting\n+`pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\n+This is not recommended and may result in suboptimal packing of the allocations after defragmentation.\n+If you cannot ensure any allocation can be moved, it is better to keep movable allocations separate in a custom pool.\n+\n+Inside a pass, for each allocation that should be moved:\n+\n+- You should copy its data from the source to the destination place by calling e.g. `vkCmdCopyBuffer()`, `vkCmdCopyImage()`.\n+ - You need to make sure these commands finished executing before destroying the source buffers\/images and before calling vmaEndDefragmentationPass().\n+- If a resource doesn't contain any meaningful data, e.g. it is a transient color attachment image to be cleared,\n+ filled, and used temporarily in each rendering frame, you can just recreate this image\n+ without copying its data.\n+- If the resource is in `HOST_VISIBLE` and `HOST_COHERENT` memory, you can copy its data on the CPU\n+ using `memcpy()`.\n+- If you cannot move the allocation, you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_IGNORE.\n+ This will cancel the move.\n+ - vmaEndDefragmentationPass() will then free the destination memory\n+ not the source memory of the allocation, leaving it unchanged.\n+- If you decide the allocation is unimportant and can be destroyed instead of moved (e.g. it wasn't used for long time),\n+ you can set `pass.pMoves[i].operation` to #VMA_DEFRAGMENTATION_MOVE_OPERATION_DESTROY.\n+ - vmaEndDefragmentationPass() will then free both source and destination memory, and will destroy the source #VmaAllocation object.\n+\n+You can defragment a specific custom pool by setting VmaDefragmentationInfo::pool\n+(like in the example above) or all the default pools by setting this member to null.\n+\n+Defragmentation is always performed in each pool separately.\n+Allocations are never moved between different Vulkan memory types.\n+The size of the destination memory reserved for a moved allocation is the same as the original one.\n+Alignment of an allocation as it was determined using `vkGetBufferMemoryRequirements()` etc. is also respected after defragmentation.\n+Buffers\/images should be recreated with the same `VkBufferCreateInfo` \/ `VkImageCreateInfo` parameters as the original ones.\n+\n+You can perform the defragmentation incrementally to limit the number of allocations and bytes to be moved\n+in each pass, e.g. to call it in sync with render frames and not to experience too big hitches.\n+See members: VmaDefragmentationInfo::maxBytesPerPass, VmaDefragmentationInfo::maxAllocationsPerPass.\n+\n+It is also safe to perform the defragmentation asynchronously to render frames and other Vulkan and VMA\n+usage, possibly from multiple threads, with the exception that allocations\n+returned in VmaDefragmentationPassMoveInfo::pMoves shouldn't be destroyed until the defragmentation pass is ended.\n+\n+<b>Mapping<\/b> is preserved on allocations that are moved during defragmentation.\n+Whether through #VMA_ALLOCATION_CREATE_MAPPED_BIT or vmaMapMemory(), the allocations\n+are mapped at their new place. Of course, pointer to the mapped data changes, so it needs to be queried\n+using VmaAllocationInfo::pMappedData.\n+\n+\\note Defragmentation is not supported in custom pools created with #VMA_POOL_CREATE_LINEAR_ALGORITHM_BIT.\n+\n+\n+\\page statistics Statistics\n+\n+This library contains several functions that return information about its internal state,\n+especially the amount of memory allocated from Vulkan.\n+\n+\\section statistics_numeric_statistics Numeric statistics\n+\n+If you need to obtain basic statistics about memory usage per heap, together with current budget,\n+you can call function vmaGetHeapBudgets() and inspect structure #VmaBudget.\n+This is useful to keep track of memory usage and stay withing budget\n+(see also \\ref staying_within_budget).\n+Example:\n+\n+\\code\n+uint32_t heapIndex = ...\n+\n+VmaBudget budgets[VK_MAX_MEMORY_HEAPS];\n+vmaGetHeapBudgets(allocator, budgets);\n+\n+printf(\"My heap currently has %u allocations taking %llu B,\\n\",\n+ budgets[heapIndex].statistics.allocationCount,\n+ budgets[heapIndex].statistics.allocationBytes);\n+printf(\"allocated out of %u Vulkan device memory blocks taking %llu B,\\n\",\n+ budgets[heapIndex].statistics.blockCount,\n+ budgets[heapIndex].statistics.blockBytes);\n+printf(\"Vulkan reports total usage %llu B with budget %llu B.\\n\",\n+ budgets[heapIndex].usage,\n+ budgets[heapIndex].budget);\n+\\endcode\n+\n+You can query for more detailed statistics per memory heap, type, and totals,\n+including minimum and maximum allocation size and unused range size,\n+by calling function vmaCalculateStatistics() and inspecting structure #VmaTotalStatistics.\n+This function is slower though, as it has to traverse all the internal data structures,\n+so it should be used only for debugging purposes.\n+\n+You can query for statistics of a custom pool using function vmaGetPoolStatistics()\n+or vmaCalculatePoolStatistics().\n+\n+You can query for information about a specific allocation using function vmaGetAllocationInfo().\n+It fill structure #VmaAllocationInfo.\n+\n+\\section statistics_json_dump JSON dump\n+\n+You can dump internal state of the allocator to a string in JSON format using function vmaBuildStatsString().\n+The result is guaranteed to be correct JSON.\n+It uses ANSI encoding.\n+Any strings provided by user (see [Allocation names](@ref allocation_names))\n+are copied as-is and properly escaped for JSON, so if they use UTF-8, ISO-8859-2 or any other encoding,\n+this JSON string can be treated as using this encoding.\n+It must be freed using function vmaFreeStatsString().\n+\n+The format of this JSON string is not part of official documentation of the library,\n+but it will not change in backward-incompatible way without increasing library major version number\n+and appropriate mention in changelog.\n+\n+The JSON string contains all the data that can be obtained using vmaCalculateStatistics().\n+It can also contain detailed map of allocated memory blocks and their regions -\n+free and occupied by allocations.\n+This allows e.g. to visualize the memory or assess fragmentation.\n+\n+\n+\\page allocation_annotation Allocation names and user data\n+\n+\\section allocation_user_data Allocation user data\n+\n+You can annotate allocations with your own information, e.g. for debugging purposes.\n+To do that, fill VmaAllocationCreateInfo::pUserData field when creating\n+an allocation. It is an opaque `void*` pointer. You can use it e.g. as a pointer,\n+some handle, index, key, ordinal number or any other value that would associate\n+the allocation with your custom metadata.\n+It it useful to identify appropriate data structures in your engine given #VmaAllocation,\n+e.g. when doing \\ref defragmentation.\n+\n+\\code\n+VkBufferCreateInfo bufCreateInfo = ...\n+\n+MyBufferMetadata* pMetadata = CreateBufferMetadata();\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.pUserData = pMetadata;\n+\n+VkBuffer buffer;\n+VmaAllocation allocation;\n+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buffer, &allocation, nullptr);\n+\\endcode\n+\n+The pointer may be later retrieved as VmaAllocationInfo::pUserData:\n+\n+\\code\n+VmaAllocationInfo allocInfo;\n+vmaGetAllocationInfo(allocator, allocation, &allocInfo);\n+MyBufferMetadata* pMetadata = (MyBufferMetadata*)allocInfo.pUserData;\n+\\endcode\n+\n+It can also be changed using function vmaSetAllocationUserData().\n+\n+Values of (non-zero) allocations' `pUserData` are printed in JSON report created by\n+vmaBuildStatsString() in hexadecimal form.\n+\n+\\section allocation_names Allocation names\n+\n+An allocation can also carry a null-terminated string, giving a name to the allocation.\n+To set it, call vmaSetAllocationName().\n+The library creates internal copy of the string, so the pointer you pass doesn't need\n+to be valid for whole lifetime of the allocation. You can free it after the call.\n+\n+\\code\n+std::string imageName = \"Texture: \";\n+imageName += fileName;\n+vmaSetAllocationName(allocator, allocation, imageName.c_str());\n+\\endcode\n+\n+The string can be later retrieved by inspecting VmaAllocationInfo::pName.\n+It is also printed in JSON report created by vmaBuildStatsString().\n+\n+\\note Setting string name to VMA allocation doesn't automatically set it to the Vulkan buffer or image created with it.\n+You must do it manually using an extension like VK_EXT_debug_utils, which is independent of this library.\n+\n+\n+\\page virtual_allocator Virtual allocator\n+\n+As an extra feature, the core allocation algorithm of the library is exposed through a simple and convenient API of \"virtual allocator\".\n+It doesn't allocate any real GPU memory. It just keeps track of used and free regions of a \"virtual block\".\n+You can use it to allocate your own memory or other objects, even completely unrelated to Vulkan.\n+A common use case is sub-allocation of pieces of one large GPU buffer.\n+\n+\\section virtual_allocator_creating_virtual_block Creating virtual block\n+\n+To use this functionality, there is no main \"allocator\" object.\n+You don't need to have #VmaAllocator object created.\n+All you need to do is to create a separate #VmaVirtualBlock object for each block of memory you want to be managed by the allocator:\n+\n+-# Fill in #VmaVirtualBlockCreateInfo structure.\n+-# Call vmaCreateVirtualBlock(). Get new #VmaVirtualBlock object.\n+\n+Example:\n+\n+\\code\n+VmaVirtualBlockCreateInfo blockCreateInfo = {};\n+blockCreateInfo.size = 1048576; \/\/ 1 MB\n+\n+VmaVirtualBlock block;\n+VkResult res = vmaCreateVirtualBlock(&blockCreateInfo, &block);\n+\\endcode\n+\n+\\section virtual_allocator_making_virtual_allocations Making virtual allocations\n+\n+#VmaVirtualBlock object contains internal data structure that keeps track of free and occupied regions\n+using the same code as the main Vulkan memory allocator.\n+Similarly to #VmaAllocation for standard GPU allocations, there is #VmaVirtualAllocation type\n+that represents an opaque handle to an allocation withing the virtual block.\n+\n+In order to make such allocation:\n+\n+-# Fill in #VmaVirtualAllocationCreateInfo structure.\n+-# Call vmaVirtualAllocate(). Get new #VmaVirtualAllocation object that represents the allocation.\n+ You can also receive `VkDeviceSize offset` that was assigned to the allocation.\n+\n+Example:\n+\n+\\code\n+VmaVirtualAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.size = 4096; \/\/ 4 KB\n+\n+VmaVirtualAllocation alloc;\n+VkDeviceSize offset;\n+res = vmaVirtualAllocate(block, &allocCreateInfo, &alloc, &offset);\n+if(res == VK_SUCCESS)\n+{\n+ \/\/ Use the 4 KB of your memory starting at offset.\n+}\n+else\n+{\n+ \/\/ Allocation failed - no space for it could be found. Handle this error!\n+}\n+\\endcode\n+\n+\\section virtual_allocator_deallocation Deallocation\n+\n+When no longer needed, an allocation can be freed by calling vmaVirtualFree().\n+You can only pass to this function an allocation that was previously returned by vmaVirtualAllocate()\n+called for the same #VmaVirtualBlock.\n+\n+When whole block is no longer needed, the block object can be released by calling vmaDestroyVirtualBlock().\n+All allocations must be freed before the block is destroyed, which is checked internally by an assert.\n+However, if you don't want to call vmaVirtualFree() for each allocation, you can use vmaClearVirtualBlock() to free them all at once -\n+a feature not available in normal Vulkan memory allocator. Example:\n+\n+\\code\n+vmaVirtualFree(block, alloc);\n+vmaDestroyVirtualBlock(block);\n+\\endcode\n+\n+\\section virtual_allocator_allocation_parameters Allocation parameters\n+\n+You can attach a custom pointer to each allocation by using vmaSetVirtualAllocationUserData().\n+Its default value is null.\n+It can be used to store any data that needs to be associated with that allocation - e.g. an index, a handle, or a pointer to some\n+larger data structure containing more information. Example:\n+\n+\\code\n+struct CustomAllocData\n+{\n+ std::string m_AllocName;\n+};\n+CustomAllocData* allocData = new CustomAllocData();\n+allocData->m_AllocName = \"My allocation 1\";\n+vmaSetVirtualAllocationUserData(block, alloc, allocData);\n+\\endcode\n+\n+The pointer can later be fetched, along with allocation offset and size, by passing the allocation handle to function\n+vmaGetVirtualAllocationInfo() and inspecting returned structure #VmaVirtualAllocationInfo.\n+If you allocated a new object to be used as the custom pointer, don't forget to delete that object before freeing the allocation!\n+Example:\n+\n+\\code\n+VmaVirtualAllocationInfo allocInfo;\n+vmaGetVirtualAllocationInfo(block, alloc, &allocInfo);\n+delete (CustomAllocData*)allocInfo.pUserData;\n+\n+vmaVirtualFree(block, alloc);\n+\\endcode\n+\n+\\section virtual_allocator_alignment_and_units Alignment and units\n+\n+It feels natural to express sizes and offsets in bytes.\n+If an offset of an allocation needs to be aligned to a multiply of some number (e.g. 4 bytes), you can fill optional member\n+VmaVirtualAllocationCreateInfo::alignment to request it. Example:\n+\n+\\code\n+VmaVirtualAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.size = 4096; \/\/ 4 KB\n+allocCreateInfo.alignment = 4; \/\/ Returned offset must be a multiply of 4 B\n+\n+VmaVirtualAllocation alloc;\n+res = vmaVirtualAllocate(block, &allocCreateInfo, &alloc, nullptr);\n+\\endcode\n+\n+Alignments of different allocations made from one block may vary.\n+However, if all alignments and sizes are always multiply of some size e.g. 4 B or `sizeof(MyDataStruct)`,\n+you can express all sizes, alignments, and offsets in multiples of that size instead of individual bytes.\n+It might be more convenient, but you need to make sure to use this new unit consistently in all the places:\n+\n+- VmaVirtualBlockCreateInfo::size\n+- VmaVirtualAllocationCreateInfo::size and VmaVirtualAllocationCreateInfo::alignment\n+- Using offset returned by vmaVirtualAllocate() or in VmaVirtualAllocationInfo::offset\n+\n+\\section virtual_allocator_statistics Statistics\n+\n+You can obtain statistics of a virtual block using vmaGetVirtualBlockStatistics()\n+(to get brief statistics that are fast to calculate)\n+or vmaCalculateVirtualBlockStatistics() (to get more detailed statistics, slower to calculate).\n+The functions fill structures #VmaStatistics, #VmaDetailedStatistics respectively - same as used by the normal Vulkan memory allocator.\n+Example:\n+\n+\\code\n+VmaStatistics stats;\n+vmaGetVirtualBlockStatistics(block, &stats);\n+printf(\"My virtual block has %llu bytes used by %u virtual allocations\\n\",\n+ stats.allocationBytes, stats.allocationCount);\n+\\endcode\n+\n+You can also request a full list of allocations and free regions as a string in JSON format by calling\n+vmaBuildVirtualBlockStatsString().\n+Returned string must be later freed using vmaFreeVirtualBlockStatsString().\n+The format of this string differs from the one returned by the main Vulkan allocator, but it is similar.\n+\n+\\section virtual_allocator_additional_considerations Additional considerations\n+\n+The \"virtual allocator\" functionality is implemented on a level of individual memory blocks.\n+Keeping track of a whole collection of blocks, allocating new ones when out of free space,\n+deleting empty ones, and deciding which one to try first for a new allocation must be implemented by the user.\n+\n+Alternative allocation algorithms are supported, just like in custom pools of the real GPU memory.\n+See enum #VmaVirtualBlockCreateFlagBits to learn how to specify them (e.g. #VMA_VIRTUAL_BLOCK_CREATE_LINEAR_ALGORITHM_BIT).\n+You can find their description in chapter \\ref custom_memory_pools.\n+Allocation strategies are also supported.\n+See enum #VmaVirtualAllocationCreateFlagBits to learn how to specify them (e.g. #VMA_VIRTUAL_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT).\n+\n+Following features are supported only by the allocator of the real GPU memory and not by virtual allocations:\n+buffer-image granularity, `VMA_DEBUG_MARGIN`, `VMA_MIN_ALIGNMENT`.\n+\n+\n+\\page debugging_memory_usage Debugging incorrect memory usage\n+\n+If you suspect a bug with memory usage, like usage of uninitialized memory or\n+memory being overwritten out of bounds of an allocation,\n+you can use debug features of this library to verify this.\n+\n+\\section debugging_memory_usage_initialization Memory initialization\n+\n+If you experience a bug with incorrect and nondeterministic data in your program and you suspect uninitialized memory to be used,\n+you can enable automatic memory initialization to verify this.\n+To do it, define macro `VMA_DEBUG_INITIALIZE_ALLOCATIONS` to 1.\n+\n+\\code\n+#define VMA_DEBUG_INITIALIZE_ALLOCATIONS 1\n+#include \"vk_mem_alloc.h\"\n+\\endcode\n+\n+It makes memory of all new allocations initialized to bit pattern `0xDCDCDCDC`.\n+Before an allocation is destroyed, its memory is filled with bit pattern `0xEFEFEFEF`.\n+Memory is automatically mapped and unmapped if necessary.\n+\n+If you find these values while debugging your program, good chances are that you incorrectly\n+read Vulkan memory that is allocated but not initialized, or already freed, respectively.\n+\n+Memory initialization works only with memory types that are `HOST_VISIBLE`.\n+It works also with dedicated allocations.\n+\n+\\section debugging_memory_usage_margins Margins\n+\n+By default, allocations are laid out in memory blocks next to each other if possible\n+(considering required alignment, `bufferImageGranularity`, and `nonCoherentAtomSize`).\n+\n+![Allocations without margin](..\/gfx\/Margins_1.png)\n+\n+Define macro `VMA_DEBUG_MARGIN` to some non-zero value (e.g. 16) to enforce specified\n+number of bytes as a margin after every allocation.\n+\n+\\code\n+#define VMA_DEBUG_MARGIN 16\n+#include \"vk_mem_alloc.h\"\n+\\endcode\n+\n+![Allocations with margin](..\/gfx\/Margins_2.png)\n+\n+If your bug goes away after enabling margins, it means it may be caused by memory\n+being overwritten outside of allocation boundaries. It is not 100% certain though.\n+Change in application behavior may also be caused by different order and distribution\n+of allocations across memory blocks after margins are applied.\n+\n+Margins work with all types of memory.\n+\n+Margin is applied only to allocations made out of memory blocks and not to dedicated\n+allocations, which have their own memory block of specific size.\n+It is thus not applied to allocations made using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT flag\n+or those automatically decided to put into dedicated allocations, e.g. due to its\n+large size or recommended by VK_KHR_dedicated_allocation extension.\n+\n+Margins appear in [JSON dump](@ref statistics_json_dump) as part of free space.\n+\n+Note that enabling margins increases memory usage and fragmentation.\n+\n+Margins do not apply to \\ref virtual_allocator.\n+\n+\\section debugging_memory_usage_corruption_detection Corruption detection\n+\n+You can additionally define macro `VMA_DEBUG_DETECT_CORRUPTION` to 1 to enable validation\n+of contents of the margins.\n+\n+\\code\n+#define VMA_DEBUG_MARGIN 16\n+#define VMA_DEBUG_DETECT_CORRUPTION 1\n+#include \"vk_mem_alloc.h\"\n+\\endcode\n+\n+When this feature is enabled, number of bytes specified as `VMA_DEBUG_MARGIN`\n+(it must be multiply of 4) after every allocation is filled with a magic number.\n+This idea is also know as \"canary\".\n+Memory is automatically mapped and unmapped if necessary.\n+\n+This number is validated automatically when the allocation is destroyed.\n+If it is not equal to the expected value, `VMA_ASSERT()` is executed.\n+It clearly means that either CPU or GPU overwritten the memory outside of boundaries of the allocation,\n+which indicates a serious bug.\n+\n+You can also explicitly request checking margins of all allocations in all memory blocks\n+that belong to specified memory types by using function vmaCheckCorruption(),\n+or in memory blocks that belong to specified custom pool, by using function\n+vmaCheckPoolCorruption().\n+\n+Margin validation (corruption detection) works only for memory types that are\n+`HOST_VISIBLE` and `HOST_COHERENT`.\n+\n+\n+\\page opengl_interop OpenGL Interop\n+\n+VMA provides some features that help with interoperability with OpenGL.\n+\n+\\section opengl_interop_exporting_memory Exporting memory\n+\n+If you want to attach `VkExportMemoryAllocateInfoKHR` structure to `pNext` chain of memory allocations made by the library:\n+\n+It is recommended to create \\ref custom_memory_pools for such allocations.\n+Define and fill in your `VkExportMemoryAllocateInfoKHR` structure and attach it to VmaPoolCreateInfo::pMemoryAllocateNext\n+while creating the custom pool.\n+Please note that the structure must remain alive and unchanged for the whole lifetime of the #VmaPool,\n+not only while creating it, as no copy of the structure is made,\n+but its original pointer is used for each allocation instead.\n+\n+If you want to export all memory allocated by the library from certain memory types,\n+also dedicated allocations or other allocations made from default pools,\n+an alternative solution is to fill in VmaAllocatorCreateInfo::pTypeExternalMemoryHandleTypes.\n+It should point to an array with `VkExternalMemoryHandleTypeFlagsKHR` to be automatically passed by the library\n+through `VkExportMemoryAllocateInfoKHR` on each allocation made from a specific memory type.\n+Please note that new versions of the library also support dedicated allocations created in custom pools.\n+\n+You should not mix these two methods in a way that allows to apply both to the same memory type.\n+Otherwise, `VkExportMemoryAllocateInfoKHR` structure would be attached twice to the `pNext` chain of `VkMemoryAllocateInfo`.\n+\n+\n+\\section opengl_interop_custom_alignment Custom alignment\n+\n+Buffers or images exported to a different API like OpenGL may require a different alignment,\n+higher than the one used by the library automatically, queried from functions like `vkGetBufferMemoryRequirements`.\n+To impose such alignment:\n+\n+It is recommended to create \\ref custom_memory_pools for such allocations.\n+Set VmaPoolCreateInfo::minAllocationAlignment member to the minimum alignment required for each allocation\n+to be made out of this pool.\n+The alignment actually used will be the maximum of this member and the alignment returned for the specific buffer or image\n+from a function like `vkGetBufferMemoryRequirements`, which is called by VMA automatically.\n+\n+If you want to create a buffer with a specific minimum alignment out of default pools,\n+use special function vmaCreateBufferWithAlignment(), which takes additional parameter `minAlignment`.\n+\n+Note the problem of alignment affects only resources placed inside bigger `VkDeviceMemory` blocks and not dedicated\n+allocations, as these, by definition, always have alignment = 0 because the resource is bound to the beginning of its dedicated block.\n+Contrary to Direct3D 12, Vulkan doesn't have a concept of alignment of the entire memory block passed on its allocation.\n+\n+\n+\\page usage_patterns Recommended usage patterns\n+\n+Vulkan gives great flexibility in memory allocation.\n+This chapter shows the most common patterns.\n+\n+See also slides from talk:\n+[Sawicki, Adam. Advanced Graphics Techniques Tutorial: Memory management in Vulkan and DX12. Game Developers Conference, 2018](https:\/\/www.gdcvault.com\/play\/1025458\/Advanced-Graphics-Techniques-Tutorial-New)\n+\n+\n+\\section usage_patterns_gpu_only GPU-only resource\n+\n+<b>When:<\/b>\n+Any resources that you frequently write and read on GPU,\n+e.g. images used as color attachments (aka \"render targets\"), depth-stencil attachments,\n+images\/buffers used as storage image\/buffer (aka \"Unordered Access View (UAV)\").\n+\n+<b>What to do:<\/b>\n+Let the library select the optimal memory type, which will likely have `VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT`.\n+\n+\\code\n+VkImageCreateInfo imgCreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\n+imgCreateInfo.imageType = VK_IMAGE_TYPE_2D;\n+imgCreateInfo.extent.width = 3840;\n+imgCreateInfo.extent.height = 2160;\n+imgCreateInfo.extent.depth = 1;\n+imgCreateInfo.mipLevels = 1;\n+imgCreateInfo.arrayLayers = 1;\n+imgCreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\n+imgCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\n+imgCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\n+imgCreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\n+imgCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\n+allocCreateInfo.priority = 1.0f;\n+\n+VkImage img;\n+VmaAllocation alloc;\n+vmaCreateImage(allocator, &imgCreateInfo, &allocCreateInfo, &img, &alloc, nullptr);\n+\\endcode\n+\n+<b>Also consider:<\/b>\n+Consider creating them as dedicated allocations using #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT,\n+especially if they are large or if you plan to destroy and recreate them with different sizes\n+e.g. when display resolution changes.\n+Prefer to create such resources first and all other GPU resources (like textures and vertex buffers) later.\n+When VK_EXT_memory_priority extension is enabled, it is also worth setting high priority to such allocation\n+to decrease chances to be evicted to system memory by the operating system.\n+\n+\\section usage_patterns_staging_copy_upload Staging copy for upload\n+\n+<b>When:<\/b>\n+A \"staging\" buffer than you want to map and fill from CPU code, then use as a source od transfer\n+to some GPU resource.\n+\n+<b>What to do:<\/b>\n+Use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT.\n+Let the library select the optimal memory type, which will always have `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`.\n+\n+\\code\n+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufCreateInfo.size = 65536;\n+bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+\n+VkBuffer buf;\n+VmaAllocation alloc;\n+VmaAllocationInfo allocInfo;\n+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\n+\n+...\n+\n+memcpy(allocInfo.pMappedData, myData, myDataSize);\n+\\endcode\n+\n+<b>Also consider:<\/b>\n+You can map the allocation using vmaMapMemory() or you can create it as persistenly mapped\n+using #VMA_ALLOCATION_CREATE_MAPPED_BIT, as in the example above.\n+\n+\n+\\section usage_patterns_readback Readback\n+\n+<b>When:<\/b>\n+Buffers for data written by or transferred from the GPU that you want to read back on the CPU,\n+e.g. results of some computations.\n+\n+<b>What to do:<\/b>\n+Use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT.\n+Let the library select the optimal memory type, which will always have `VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT`\n+and `VK_MEMORY_PROPERTY_HOST_CACHED_BIT`.\n+\n+\\code\n+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufCreateInfo.size = 65536;\n+bufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT |\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+\n+VkBuffer buf;\n+VmaAllocation alloc;\n+VmaAllocationInfo allocInfo;\n+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\n+\n+...\n+\n+const float* downloadedData = (const float*)allocInfo.pMappedData;\n+\\endcode\n+\n+\n+\\section usage_patterns_advanced_data_uploading Advanced data uploading\n+\n+For resources that you frequently write on CPU via mapped pointer and\n+freqnently read on GPU e.g. as a uniform buffer (also called \"dynamic\"), multiple options are possible:\n+\n+-# Easiest solution is to have one copy of the resource in `HOST_VISIBLE` memory,\n+ even if it means system RAM (not `DEVICE_LOCAL`) on systems with a discrete graphics card,\n+ and make the device reach out to that resource directly.\n+ - Reads performed by the device will then go through PCI Express bus.\n+ The performace of this access may be limited, but it may be fine depending on the size\n+ of this resource (whether it is small enough to quickly end up in GPU cache) and the sparsity\n+ of access.\n+-# On systems with unified memory (e.g. AMD APU or Intel integrated graphics, mobile chips),\n+ a memory type may be available that is both `HOST_VISIBLE` (available for mapping) and `DEVICE_LOCAL`\n+ (fast to access from the GPU). Then, it is likely the best choice for such type of resource.\n+-# Systems with a discrete graphics card and separate video memory may or may not expose\n+ a memory type that is both `HOST_VISIBLE` and `DEVICE_LOCAL`, also known as Base Address Register (BAR).\n+ If they do, it represents a piece of VRAM (or entire VRAM, if ReBAR is enabled in the motherboard BIOS)\n+ that is available to CPU for mapping.\n+ - Writes performed by the host to that memory go through PCI Express bus.\n+ The performance of these writes may be limited, but it may be fine, especially on PCIe 4.0,\n+ as long as rules of using uncached and write-combined memory are followed - only sequential writes and no reads.\n+-# Finally, you may need or prefer to create a separate copy of the resource in `DEVICE_LOCAL` memory,\n+ a separate \"staging\" copy in `HOST_VISIBLE` memory and perform an explicit transfer command between them.\n+\n+Thankfully, VMA offers an aid to create and use such resources in the the way optimal\n+for the current Vulkan device. To help the library make the best choice,\n+use flag #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT together with\n+#VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT.\n+It will then prefer a memory type that is both `DEVICE_LOCAL` and `HOST_VISIBLE` (integrated memory or BAR),\n+but if no such memory type is available or allocation from it fails\n+(PC graphics cards have only 256 MB of BAR by default, unless ReBAR is supported and enabled in BIOS),\n+it will fall back to `DEVICE_LOCAL` memory for fast GPU access.\n+It is then up to you to detect that the allocation ended up in a memory type that is not `HOST_VISIBLE`,\n+so you need to create another \"staging\" allocation and perform explicit transfers.\n+\n+\\code\n+VkBufferCreateInfo bufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+bufCreateInfo.size = 65536;\n+bufCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;\n+ \n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\n+ VMA_ALLOCATION_CREATE_HOST_ACCESS_ALLOW_TRANSFER_INSTEAD_BIT |\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+ \n+VkBuffer buf;\n+VmaAllocation alloc;\n+VmaAllocationInfo allocInfo;\n+vmaCreateBuffer(allocator, &bufCreateInfo, &allocCreateInfo, &buf, &alloc, &allocInfo);\n+\n+VkMemoryPropertyFlags memPropFlags;\n+vmaGetAllocationMemoryProperties(allocator, alloc, &memPropFlags);\n+\n+if(memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)\n+{\n+ \/\/ Allocation ended up in a mappable memory and is already mapped - write to it directly.\n+\n+ \/\/ [Executed in runtime]:\n+ memcpy(allocInfo.pMappedData, myData, myDataSize);\n+}\n+else\n+{\n+ \/\/ Allocation ended up in a non-mappable memory - need to transfer.\n+ VkBufferCreateInfo stagingBufCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };\n+ stagingBufCreateInfo.size = 65536;\n+ stagingBufCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;\n+\n+ VmaAllocationCreateInfo stagingAllocCreateInfo = {};\n+ stagingAllocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+ stagingAllocCreateInfo.flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT |\n+ VMA_ALLOCATION_CREATE_MAPPED_BIT;\n+\n+ VkBuffer stagingBuf;\n+ VmaAllocation stagingAlloc;\n+ VmaAllocationInfo stagingAllocInfo;\n+ vmaCreateBuffer(allocator, &stagingBufCreateInfo, &stagingAllocCreateInfo,\n+ &stagingBuf, &stagingAlloc, stagingAllocInfo);\n+\n+ \/\/ [Executed in runtime]:\n+ memcpy(stagingAllocInfo.pMappedData, myData, myDataSize);\n+ \/\/vkCmdPipelineBarrier: VK_ACCESS_HOST_WRITE_BIT --> VK_ACCESS_TRANSFER_READ_BIT\n+ VkBufferCopy bufCopy = {\n+ 0, \/\/ srcOffset\n+ 0, \/\/ dstOffset,\n+ myDataSize); \/\/ size\n+ vkCmdCopyBuffer(cmdBuf, stagingBuf, buf, 1, &bufCopy);\n+}\n+\\endcode\n+\n+\\section usage_patterns_other_use_cases Other use cases\n+\n+Here are some other, less obvious use cases and their recommended settings:\n+\n+- An image that is used only as transfer source and destination, but it should stay on the device,\n+ as it is used to temporarily store a copy of some texture, e.g. from the current to the next frame,\n+ for temporal antialiasing or other temporal effects.\n+ - Use `VkImageCreateInfo::usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT`\n+ - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO\n+- An image that is used only as transfer source and destination, but it should be placed\n+ in the system RAM despite it doesn't need to be mapped, because it serves as a \"swap\" copy to evict\n+ least recently used textures from VRAM.\n+ - Use `VkImageCreateInfo::usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT`\n+ - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO_PREFER_HOST,\n+ as VMA needs a hint here to differentiate from the previous case.\n+- A buffer that you want to map and write from the CPU, directly read from the GPU\n+ (e.g. as a uniform or vertex buffer), but you have a clear preference to place it in device or\n+ host memory due to its large size.\n+ - Use `VkBufferCreateInfo::usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT`\n+ - Use VmaAllocationCreateInfo::usage = #VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE or #VMA_MEMORY_USAGE_AUTO_PREFER_HOST\n+ - Use VmaAllocationCreateInfo::flags = #VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT\n+\n+\n+\\page configuration Configuration\n+\n+Please check \"CONFIGURATION SECTION\" in the code to find macros that you can define\n+before each include of this file or change directly in this file to provide\n+your own implementation of basic facilities like assert, `min()` and `max()` functions,\n+mutex, atomic etc.\n+The library uses its own implementation of containers by default, but you can switch to using\n+STL containers instead.\n+\n+For example, define `VMA_ASSERT(expr)` before including the library to provide\n+custom implementation of the assertion, compatible with your project.\n+By default it is defined to standard C `assert(expr)` in `_DEBUG` configuration\n+and empty otherwise.\n+\n+\\section config_Vulkan_functions Pointers to Vulkan functions\n+\n+There are multiple ways to import pointers to Vulkan functions in the library.\n+In the simplest case you don't need to do anything.\n+If the compilation or linking of your program or the initialization of the #VmaAllocator\n+doesn't work for you, you can try to reconfigure it.\n+\n+First, the allocator tries to fetch pointers to Vulkan functions linked statically,\n+like this:\n+\n+\\code\n+m_VulkanFunctions.vkAllocateMemory = (PFN_vkAllocateMemory)vkAllocateMemory;\n+\\endcode\n+\n+If you want to disable this feature, set configuration macro: `#define VMA_STATIC_VULKAN_FUNCTIONS 0`.\n+\n+Second, you can provide the pointers yourself by setting member VmaAllocatorCreateInfo::pVulkanFunctions.\n+You can fetch them e.g. using functions `vkGetInstanceProcAddr` and `vkGetDeviceProcAddr` or\n+by using a helper library like [volk](https:\/\/github.com\/zeux\/volk).\n+\n+Third, VMA tries to fetch remaining pointers that are still null by calling\n+`vkGetInstanceProcAddr` and `vkGetDeviceProcAddr` on its own.\n+You need to only fill in VmaVulkanFunctions::vkGetInstanceProcAddr and VmaVulkanFunctions::vkGetDeviceProcAddr.\n+Other pointers will be fetched automatically.\n+If you want to disable this feature, set configuration macro: `#define VMA_DYNAMIC_VULKAN_FUNCTIONS 0`.\n+\n+Finally, all the function pointers required by the library (considering selected\n+Vulkan version and enabled extensions) are checked with `VMA_ASSERT` if they are not null.\n+\n+\n+\\section custom_memory_allocator Custom host memory allocator\n+\n+If you use custom allocator for CPU memory rather than default operator `new`\n+and `delete` from C++, you can make this library using your allocator as well\n+by filling optional member VmaAllocatorCreateInfo::pAllocationCallbacks. These\n+functions will be passed to Vulkan, as well as used by the library itself to\n+make any CPU-side allocations.\n+\n+\\section allocation_callbacks Device memory allocation callbacks\n+\n+The library makes calls to `vkAllocateMemory()` and `vkFreeMemory()` internally.\n+You can setup callbacks to be informed about these calls, e.g. for the purpose\n+of gathering some statistics. To do it, fill optional member\n+VmaAllocatorCreateInfo::pDeviceMemoryCallbacks.\n+\n+\\section heap_memory_limit Device heap memory limit\n+\n+When device memory of certain heap runs out of free space, new allocations may\n+fail (returning error code) or they may succeed, silently pushing some existing_\n+memory blocks from GPU VRAM to system RAM (which degrades performance). This\n+behavior is implementation-dependent - it depends on GPU vendor and graphics\n+driver.\n+\n+On AMD cards it can be controlled while creating Vulkan device object by using\n+VK_AMD_memory_overallocation_behavior extension, if available.\n+\n+Alternatively, if you want to test how your program behaves with limited amount of Vulkan device\n+memory available without switching your graphics card to one that really has\n+smaller VRAM, you can use a feature of this library intended for this purpose.\n+To do it, fill optional member VmaAllocatorCreateInfo::pHeapSizeLimit.\n+\n+\n+\n+\\page vk_khr_dedicated_allocation VK_KHR_dedicated_allocation\n+\n+VK_KHR_dedicated_allocation is a Vulkan extension which can be used to improve\n+performance on some GPUs. It augments Vulkan API with possibility to query\n+driver whether it prefers particular buffer or image to have its own, dedicated\n+allocation (separate `VkDeviceMemory` block) for better efficiency - to be able\n+to do some internal optimizations. The extension is supported by this library.\n+It will be used automatically when enabled.\n+\n+It has been promoted to core Vulkan 1.1, so if you use eligible Vulkan version\n+and inform VMA about it by setting VmaAllocatorCreateInfo::vulkanApiVersion,\n+you are all set.\n+\n+Otherwise, if you want to use it as an extension:\n+\n+1 . When creating Vulkan device, check if following 2 device extensions are\n+supported (call `vkEnumerateDeviceExtensionProperties()`).\n+If yes, enable them (fill `VkDeviceCreateInfo::ppEnabledExtensionNames`).\n+\n+- VK_KHR_get_memory_requirements2\n+- VK_KHR_dedicated_allocation\n+\n+If you enabled these extensions:\n+\n+2 . Use #VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT flag when creating\n+your #VmaAllocator to inform the library that you enabled required extensions\n+and you want the library to use them.\n+\n+\\code\n+allocatorInfo.flags |= VMA_ALLOCATOR_CREATE_KHR_DEDICATED_ALLOCATION_BIT;\n+\n+vmaCreateAllocator(&allocatorInfo, &allocator);\n+\\endcode\n+\n+That is all. The extension will be automatically used whenever you create a\n+buffer using vmaCreateBuffer() or image using vmaCreateImage().\n+\n+When using the extension together with Vulkan Validation Layer, you will receive\n+warnings like this:\n+\n+_vkBindBufferMemory(): Binding memory to buffer 0x33 but vkGetBufferMemoryRequirements() has not been called on that buffer._\n+\n+It is OK, you should just ignore it. It happens because you use function\n+`vkGetBufferMemoryRequirements2KHR()` instead of standard\n+`vkGetBufferMemoryRequirements()`, while the validation layer seems to be\n+unaware of it.\n+\n+To learn more about this extension, see:\n+\n+- [VK_KHR_dedicated_allocation in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/html\/chap50.html#VK_KHR_dedicated_allocation)\n+- [VK_KHR_dedicated_allocation unofficial manual](http:\/\/asawicki.info\/articles\/VK_KHR_dedicated_allocation.php5)\n+\n+\n+\n+\\page vk_ext_memory_priority VK_EXT_memory_priority\n+\n+VK_EXT_memory_priority is a device extension that allows to pass additional \"priority\"\n+value to Vulkan memory allocations that the implementation may use prefer certain\n+buffers and images that are critical for performance to stay in device-local memory\n+in cases when the memory is over-subscribed, while some others may be moved to the system memory.\n+\n+VMA offers convenient usage of this extension.\n+If you enable it, you can pass \"priority\" parameter when creating allocations or custom pools\n+and the library automatically passes the value to Vulkan using this extension.\n+\n+If you want to use this extension in connection with VMA, follow these steps:\n+\n+\\section vk_ext_memory_priority_initialization Initialization\n+\n+1) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\n+Check if the extension is supported - if returned array of `VkExtensionProperties` contains \"VK_EXT_memory_priority\".\n+\n+2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\n+Attach additional structure `VkPhysicalDeviceMemoryPriorityFeaturesEXT` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\n+Check if the device feature is really supported - check if `VkPhysicalDeviceMemoryPriorityFeaturesEXT::memoryPriority` is true.\n+\n+3) While creating device with `vkCreateDevice`, enable this extension - add \"VK_EXT_memory_priority\"\n+to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\n+\n+4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\n+Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\n+Enable this device feature - attach additional structure `VkPhysicalDeviceMemoryPriorityFeaturesEXT` to\n+`VkPhysicalDeviceFeatures2::pNext` chain and set its member `memoryPriority` to `VK_TRUE`.\n+\n+5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\n+have enabled this extension and feature - add #VMA_ALLOCATOR_CREATE_EXT_MEMORY_PRIORITY_BIT\n+to VmaAllocatorCreateInfo::flags.\n+\n+\\section vk_ext_memory_priority_usage Usage\n+\n+When using this extension, you should initialize following member:\n+\n+- VmaAllocationCreateInfo::priority when creating a dedicated allocation with #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+- VmaPoolCreateInfo::priority when creating a custom pool.\n+\n+It should be a floating-point value between `0.0f` and `1.0f`, where recommended default is `0.5f`.\n+Memory allocated with higher value can be treated by the Vulkan implementation as higher priority\n+and so it can have lower chances of being pushed out to system memory, experiencing degraded performance.\n+\n+It might be a good idea to create performance-critical resources like color-attachment or depth-stencil images\n+as dedicated and set high priority to them. For example:\n+\n+\\code\n+VkImageCreateInfo imgCreateInfo = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO };\n+imgCreateInfo.imageType = VK_IMAGE_TYPE_2D;\n+imgCreateInfo.extent.width = 3840;\n+imgCreateInfo.extent.height = 2160;\n+imgCreateInfo.extent.depth = 1;\n+imgCreateInfo.mipLevels = 1;\n+imgCreateInfo.arrayLayers = 1;\n+imgCreateInfo.format = VK_FORMAT_R8G8B8A8_UNORM;\n+imgCreateInfo.tiling = VK_IMAGE_TILING_OPTIMAL;\n+imgCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;\n+imgCreateInfo.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;\n+imgCreateInfo.samples = VK_SAMPLE_COUNT_1_BIT;\n+\n+VmaAllocationCreateInfo allocCreateInfo = {};\n+allocCreateInfo.usage = VMA_MEMORY_USAGE_AUTO;\n+allocCreateInfo.flags = VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;\n+allocCreateInfo.priority = 1.0f;\n+\n+VkImage img;\n+VmaAllocation alloc;\n+vmaCreateImage(allocator, &imgCreateInfo, &allocCreateInfo, &img, &alloc, nullptr);\n+\\endcode\n+\n+`priority` member is ignored in the following situations:\n+\n+- Allocations created in custom pools: They inherit the priority, along with all other allocation parameters\n+ from the parametrs passed in #VmaPoolCreateInfo when the pool was created.\n+- Allocations created in default pools: They inherit the priority from the parameters\n+ VMA used when creating default pools, which means `priority == 0.5f`.\n+\n+\n+\\page vk_amd_device_coherent_memory VK_AMD_device_coherent_memory\n+\n+VK_AMD_device_coherent_memory is a device extension that enables access to\n+additional memory types with `VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD` and\n+`VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` flag. It is useful mostly for\n+allocation of buffers intended for writing \"breadcrumb markers\" in between passes\n+or draw calls, which in turn are useful for debugging GPU crash\/hang\/TDR cases.\n+\n+When the extension is available but has not been enabled, Vulkan physical device\n+still exposes those memory types, but their usage is forbidden. VMA automatically\n+takes care of that - it returns `VK_ERROR_FEATURE_NOT_PRESENT` when an attempt\n+to allocate memory of such type is made.\n+\n+If you want to use this extension in connection with VMA, follow these steps:\n+\n+\\section vk_amd_device_coherent_memory_initialization Initialization\n+\n+1) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\n+Check if the extension is supported - if returned array of `VkExtensionProperties` contains \"VK_AMD_device_coherent_memory\".\n+\n+2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\n+Attach additional structure `VkPhysicalDeviceCoherentMemoryFeaturesAMD` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\n+Check if the device feature is really supported - check if `VkPhysicalDeviceCoherentMemoryFeaturesAMD::deviceCoherentMemory` is true.\n+\n+3) While creating device with `vkCreateDevice`, enable this extension - add \"VK_AMD_device_coherent_memory\"\n+to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\n+\n+4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\n+Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\n+Enable this device feature - attach additional structure `VkPhysicalDeviceCoherentMemoryFeaturesAMD` to\n+`VkPhysicalDeviceFeatures2::pNext` and set its member `deviceCoherentMemory` to `VK_TRUE`.\n+\n+5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\n+have enabled this extension and feature - add #VMA_ALLOCATOR_CREATE_AMD_DEVICE_COHERENT_MEMORY_BIT\n+to VmaAllocatorCreateInfo::flags.\n+\n+\\section vk_amd_device_coherent_memory_usage Usage\n+\n+After following steps described above, you can create VMA allocations and custom pools\n+out of the special `DEVICE_COHERENT` and `DEVICE_UNCACHED` memory types on eligible\n+devices. There are multiple ways to do it, for example:\n+\n+- You can request or prefer to allocate out of such memory types by adding\n+ `VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD` to VmaAllocationCreateInfo::requiredFlags\n+ or VmaAllocationCreateInfo::preferredFlags. Those flags can be freely mixed with\n+ other ways of \\ref choosing_memory_type, like setting VmaAllocationCreateInfo::usage.\n+- If you manually found memory type index to use for this purpose, force allocation\n+ from this specific index by setting VmaAllocationCreateInfo::memoryTypeBits `= 1u << index`.\n+\n+\\section vk_amd_device_coherent_memory_more_information More information\n+\n+To learn more about this extension, see [VK_AMD_device_coherent_memory in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/man\/html\/VK_AMD_device_coherent_memory.html)\n+\n+Example use of this extension can be found in the code of the sample and test suite\n+accompanying this library.\n+\n+\n+\\page enabling_buffer_device_address Enabling buffer device address\n+\n+Device extension VK_KHR_buffer_device_address\n+allow to fetch raw GPU pointer to a buffer and pass it for usage in a shader code.\n+It has been promoted to core Vulkan 1.2.\n+\n+If you want to use this feature in connection with VMA, follow these steps:\n+\n+\\section enabling_buffer_device_address_initialization Initialization\n+\n+1) (For Vulkan version < 1.2) Call `vkEnumerateDeviceExtensionProperties` for the physical device.\n+Check if the extension is supported - if returned array of `VkExtensionProperties` contains\n+\"VK_KHR_buffer_device_address\".\n+\n+2) Call `vkGetPhysicalDeviceFeatures2` for the physical device instead of old `vkGetPhysicalDeviceFeatures`.\n+Attach additional structure `VkPhysicalDeviceBufferDeviceAddressFeatures*` to `VkPhysicalDeviceFeatures2::pNext` to be returned.\n+Check if the device feature is really supported - check if `VkPhysicalDeviceBufferDeviceAddressFeatures::bufferDeviceAddress` is true.\n+\n+3) (For Vulkan version < 1.2) While creating device with `vkCreateDevice`, enable this extension - add\n+\"VK_KHR_buffer_device_address\" to the list passed as `VkDeviceCreateInfo::ppEnabledExtensionNames`.\n+\n+4) While creating the device, also don't set `VkDeviceCreateInfo::pEnabledFeatures`.\n+Fill in `VkPhysicalDeviceFeatures2` structure instead and pass it as `VkDeviceCreateInfo::pNext`.\n+Enable this device feature - attach additional structure `VkPhysicalDeviceBufferDeviceAddressFeatures*` to\n+`VkPhysicalDeviceFeatures2::pNext` and set its member `bufferDeviceAddress` to `VK_TRUE`.\n+\n+5) While creating #VmaAllocator with vmaCreateAllocator() inform VMA that you\n+have enabled this feature - add #VMA_ALLOCATOR_CREATE_BUFFER_DEVICE_ADDRESS_BIT\n+to VmaAllocatorCreateInfo::flags.\n+\n+\\section enabling_buffer_device_address_usage Usage\n+\n+After following steps described above, you can create buffers with `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT*` using VMA.\n+The library automatically adds `VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT*` to\n+allocated memory blocks wherever it might be needed.\n+\n+Please note that the library supports only `VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT*`.\n+The second part of this functionality related to \"capture and replay\" is not supported,\n+as it is intended for usage in debugging tools like RenderDoc, not in everyday Vulkan usage.\n+\n+\\section enabling_buffer_device_address_more_information More information\n+\n+To learn more about this extension, see [VK_KHR_buffer_device_address in Vulkan specification](https:\/\/www.khronos.org\/registry\/vulkan\/specs\/1.2-extensions\/html\/chap46.html#VK_KHR_buffer_device_address)\n+\n+Example use of this extension can be found in the code of the sample and test suite\n+accompanying this library.\n+\n+\\page general_considerations General considerations\n+\n+\\section general_considerations_thread_safety Thread safety\n+\n+- The library has no global state, so separate #VmaAllocator objects can be used\n+ independently.\n+ There should be no need to create multiple such objects though - one per `VkDevice` is enough.\n+- By default, all calls to functions that take #VmaAllocator as first parameter\n+ are safe to call from multiple threads simultaneously because they are\n+ synchronized internally when needed.\n+ This includes allocation and deallocation from default memory pool, as well as custom #VmaPool.\n+- When the allocator is created with #VMA_ALLOCATOR_CREATE_EXTERNALLY_SYNCHRONIZED_BIT\n+ flag, calls to functions that take such #VmaAllocator object must be\n+ synchronized externally.\n+- Access to a #VmaAllocation object must be externally synchronized. For example,\n+ you must not call vmaGetAllocationInfo() and vmaMapMemory() from different\n+ threads at the same time if you pass the same #VmaAllocation object to these\n+ functions.\n+- #VmaVirtualBlock is not safe to be used from multiple threads simultaneously.\n+\n+\\section general_considerations_versioning_and_compatibility Versioning and compatibility\n+\n+The library uses [**Semantic Versioning**](https:\/\/semver.org\/),\n+which means version numbers follow convention: Major.Minor.Patch (e.g. 2.3.0), where:\n+\n+- Incremented Patch version means a release is backward- and forward-compatible,\n+ introducing only some internal improvements, bug fixes, optimizations etc.\n+ or changes that are out of scope of the official API described in this documentation.\n+- Incremented Minor version means a release is backward-compatible,\n+ so existing code that uses the library should continue to work, while some new\n+ symbols could have been added: new structures, functions, new values in existing\n+ enums and bit flags, new structure members, but not new function parameters.\n+- Incrementing Major version means a release could break some backward compatibility.\n+\n+All changes between official releases are documented in file \"CHANGELOG.md\".\n+\n+\\warning Backward compatiblity is considered on the level of C++ source code, not binary linkage.\n+Adding new members to existing structures is treated as backward compatible if initializing\n+the new members to binary zero results in the old behavior.\n+You should always fully initialize all library structures to zeros and not rely on their\n+exact binary size.\n+\n+\\section general_considerations_validation_layer_warnings Validation layer warnings\n+\n+When using this library, you can meet following types of warnings issued by\n+Vulkan validation layer. They don't necessarily indicate a bug, so you may need\n+to just ignore them.\n+\n+- *vkBindBufferMemory(): Binding memory to buffer 0xeb8e4 but vkGetBufferMemoryRequirements() has not been called on that buffer.*\n+ - It happens when VK_KHR_dedicated_allocation extension is enabled.\n+ `vkGetBufferMemoryRequirements2KHR` function is used instead, while validation layer seems to be unaware of it.\n+- *Mapping an image with layout VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL can result in undefined behavior if this memory is used by the device. Only GENERAL or PREINITIALIZED should be used.*\n+ - It happens when you map a buffer or image, because the library maps entire\n+ `VkDeviceMemory` block, where different types of images and buffers may end\n+ up together, especially on GPUs with unified memory like Intel.\n+- *Non-linear image 0xebc91 is aliased with linear buffer 0xeb8e4 which may indicate a bug.*\n+ - It may happen when you use [defragmentation](@ref defragmentation).\n+\n+\\section general_considerations_allocation_algorithm Allocation algorithm\n+\n+The library uses following algorithm for allocation, in order:\n+\n+-# Try to find free range of memory in existing blocks.\n+-# If failed, try to create a new block of `VkDeviceMemory`, with preferred block size.\n+-# If failed, try to create such block with size \/ 2, size \/ 4, size \/ 8.\n+-# If failed, try to allocate separate `VkDeviceMemory` for this allocation,\n+ just like when you use #VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT.\n+-# If failed, choose other memory type that meets the requirements specified in\n+ VmaAllocationCreateInfo and go to point 1.\n+-# If failed, return `VK_ERROR_OUT_OF_DEVICE_MEMORY`.\n+\n+\\section general_considerations_features_not_supported Features not supported\n+\n+Features deliberately excluded from the scope of this library:\n+\n+-# **Data transfer.** Uploading (streaming) and downloading data of buffers and images\n+ between CPU and GPU memory and related synchronization is responsibility of the user.\n+ Defining some \"texture\" object that would automatically stream its data from a\n+ staging copy in CPU memory to GPU memory would rather be a feature of another,\n+ higher-level library implemented on top of VMA.\n+ VMA doesn't record any commands to a `VkCommandBuffer`. It just allocates memory.\n+-# **Recreation of buffers and images.** Although the library has functions for\n+ buffer and image creation: vmaCreateBuffer(), vmaCreateImage(), you need to\n+ recreate these objects yourself after defragmentation. That is because the big\n+ structures `VkBufferCreateInfo`, `VkImageCreateInfo` are not stored in\n+ #VmaAllocation object.\n+-# **Handling CPU memory allocation failures.** When dynamically creating small C++\n+ objects in CPU memory (not Vulkan memory), allocation failures are not checked\n+ and handled gracefully, because that would complicate code significantly and\n+ is usually not needed in desktop PC applications anyway.\n+ Success of an allocation is just checked with an assert.\n+-# **Code free of any compiler warnings.** Maintaining the library to compile and\n+ work correctly on so many different platforms is hard enough. Being free of\n+ any warnings, on any version of any compiler, is simply not feasible.\n+ There are many preprocessor macros that make some variables unused, function parameters unreferenced,\n+ or conditional expressions constant in some configurations.\n+ The code of this library should not be bigger or more complicated just to silence these warnings.\n+ It is recommended to disable such warnings instead.\n+-# This is a C++ library with C interface. **Bindings or ports to any other programming languages** are welcome as external projects but\n+ are not going to be included into this repository.\n+*\/\n"} {"commit":"fc0761f24f55c59363ffa11ff5aeb059ea3daadc","subject":"tests\/test_tls.c: Use coap_startup() instead of coap_dtls_startup()","message":"tests\/test_tls.c: Use coap_startup() instead of coap_dtls_startup()\n\nThis is done so we do not need to expose coap_dtls_startup()\npublically\n","repos":"authmillenon\/libcoap,authmillenon\/libcoap,authmillenon\/libcoap","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- tests\/test_tls.c\n+++ tests\/test_tls.c\n@@ -68,7 +68,7 @@\n \n static int\n t_tls_tests_create(void) {\n- coap_dtls_startup();\n+ coap_startup();\n return 0;\n }\n \n"} {"commit":"754fb9d3fe2c96793bf50f348cb753d3adc028df","subject":"compile","message":"compile\n","repos":"ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit,ess-dmsc\/event-formation-unit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/common\/PoolAllocator.h\n+++ src\/common\/PoolAllocator.h\n@@ -3,6 +3,8 @@\n #include <common\/Assert.h>\n #include <common\/FixedSizePool.h>\n #include <common\/Trace.h>\n+\n+#include <cstdint>\n \n template <typename FixedPoolConfigT> struct PoolAllocator {\n using T = typename FixedPoolConfigT::T;\n"} {"commit":"8244dc28f07f208212e58dc36a53f62d2ce16447","subject":"Bug Fix: readdir now detects and offset greater than i_isize and returns immediately, so an EOF can be returned to the caller. (For some reason this was not needed in 10.3?)","message":"Bug Fix: readdir now detects and offset greater than i_isize and returns immediately, so an EOF can be returned to the caller. (For some reason this was not needed in 10.3?)\n","repos":"georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx,georghe-crihan\/ext2fsx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/gnu\/ext2fs\/ext2_lookup.c\n+++ src\/gnu\/ext2fs\/ext2_lookup.c\n@@ -180,6 +180,8 @@\n DIRBLKSIZ = ip->i_e2fs->s_blocksize;\n \n count = uio_resid(uio);\n+ startoffset = uio_offset(uio);\n+ startresid = uio_resid(uio);\n \/*\n * Avoid complications for partial directory entries by adjusting\n * the i\/o to end at a block boundary. Don't give up (like ufs\n@@ -188,7 +190,7 @@\n * size is a little larger than DIRBLKSIZ to allow for expansion\n * of directory entries, but some callers just use 512.\n *\/\n- count -= (uio_offset(uio) + count) & (DIRBLKSIZ -1);\n+ count -= (startoffset + count) & (DIRBLKSIZ -1);\n if (count <= 0)\n \t\tcount += DIRBLKSIZ;\n \n@@ -200,10 +202,16 @@\n if (eof)\n *eof = 0;\n \n- startoffset = uio_offset(uio);\n- startresid = uio_resid(uio);\n+ IXLOCK(ip);\n+ \n+ if (startoffset >= ip->i_size) {\n+ IULOCK(ip);\n+ if (eof)\n+ *eof = 1;\n+ return (0);\n+ }\n+ \n \/* Check for an indexed dir *\/\n- IXLOCK(ip);\n if (EXT3_HAS_COMPAT_FEATURE(ip->i_e2fs, EXT3_FEATURE_COMPAT_DIR_INDEX) &&\n ((ip->i_e2flags & EXT3_INDEX_FL) \/*||\n ((ip->i_size >> ip->i_e2fs->s_blocksize_bits) == 1)*\/)) {\n"} {"commit":"3fd5062f9aeebfd32310d76635c11a2f334cc779","subject":"The EC GPE is always edge. edge interrupts have their STS bit reset at interrupt reception; level interrupts have STS cleared when processing is complete. Since the STS has already been reset at interrupt reception we should not reset late.. Found by marco","message":"The EC GPE is always edge. edge interrupts have their STS bit reset\nat interrupt reception; level interrupts have STS cleared when processing\nis complete. Since the STS has already been reset at interrupt reception\nwe should not reset late..\nFound by marco\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/acpi\/acpiec.c\n+++ dev\/acpi\/acpiec.c\n@@ -1,4 +1,4 @@\n-\/* $OpenBSD: acpiec.c,v 1.40 2010\/07\/29 18:32:26 kettenis Exp $ *\/\n+\/* $OpenBSD: acpiec.c,v 1.41 2010\/08\/02 17:13:57 deraadt Exp $ *\/\n \/*\n * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>\n *\n@@ -331,7 +331,6 @@\n \t\/* Unmask the GPE which was blocked at interrupt time *\/\n \ts = spltty();\n \tmask = (1L << (gpe & 7));\n-\tacpi_write_pmreg(acpi_sc, ACPIREG_GPE_STS, gpe>>3, mask);\n \ten = acpi_read_pmreg(acpi_sc, ACPIREG_GPE_EN, gpe>>3);\n \tacpi_write_pmreg(acpi_sc, ACPIREG_GPE_EN, gpe>>3, en | mask);\n \tsplx(s);\n"} {"commit":"7d45e74d47e2ed457f374af149441498e99cb4bf","subject":"Fix issuance serialization to disk","message":"Fix issuance serialization to disk\n","repos":"tdudz\/elements,kallewoof\/elements,kallewoof\/elements,tdudz\/elements,kallewoof\/elements,tdudz\/elements,kallewoof\/elements,tdudz\/elements,kallewoof\/elements,tdudz\/elements,kallewoof\/elements,tdudz\/elements","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/primitives\/transaction.h\n+++ src\/primitives\/transaction.h\n@@ -446,6 +446,9 @@\n \/\/ make this as simple as a bitwise-OR.\n outpoint.hash = prevout.hash;\n outpoint.n = prevout.n & COutPoint::OUTPOINT_INDEX_MASK;\n+ if (fHasAssetIssuance) {\n+ outpoint.n |= COutPoint::OUTPOINT_ISSUANCE_FLAG;\n+ }\n }\n }\n \n"} {"commit":"6964e18a97c1313f6b1cb2adfd60260b97512ed6","subject":"Tell the user exactly where the problem was.","message":"Tell the user exactly where the problem was.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- usr.bin\/mkuzip\/mkuzip.c\n+++ usr.bin\/mkuzip\/mkuzip.c\n@@ -123,7 +123,7 @@\n \tatexit(cleanup);\n \n \tif (stat(iname, &sb) != 0) {\n-\t\terr(1, \"%s\", iname);\n+\t\terr(1, \"stat(%s)\", iname);\n \t\t\/* Not reached *\/\n \t}\n \thdr.nblocks = sb.st_size \/ hdr.blksz;\n@@ -137,13 +137,13 @@\n \n \tfdr = open(iname, O_RDONLY);\n \tif (fdr < 0) {\n-\t\terr(1, \"%s\", iname);\n+\t\terr(1, \"open(%s)\", iname);\n \t\t\/* Not reached *\/\n \t}\n \tfdw = open(oname, O_WRONLY | O_TRUNC | O_CREAT,\n \t\t S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);\n \tif (fdw < 0) {\n-\t\terr(1, \"%s\", oname);\n+\t\terr(1, \"open(%s)\", oname);\n \t\t\/* Not reached *\/\n \t}\n \tcleanfile = oname;\n@@ -185,7 +185,7 @@\n \t\t\t\t DEV_BSIZE);\n \t\t}\n \t\tif (write(fdw, obuf, destlen) < 0) {\n-\t\t\terr(1, \"%s\", oname);\n+\t\t\terr(1, \"write(%s)\", oname);\n \t\t\t\/* Not reached *\/\n \t\t}\n \t\ttoc[i] = htobe64(offset);\n@@ -204,7 +204,7 @@\n \t\/* Write headers into pre-allocated space *\/\n \tlseek(fdw, 0, SEEK_SET);\n \tif (writev(fdw, iov, 2) < 0) {\n-\t\terr(1, \"%s\", oname);\n+\t\terr(1, \"writev(%s)\", oname);\n \t\t\/* Not reached *\/\n \t}\n \tcleanfile = NULL;\n"} {"commit":"d408087318546358d1cb097e3d513da2ac878eeb","subject":"Avoids reports of the valgrind sgcheck tool.","message":"Avoids reports of the valgrind sgcheck tool.\n","repos":"jmesmon\/tommyds,amadvance\/tommyds,jmesmon\/tommyds,amadvance\/tommyds,jmesmon\/tommyds,amadvance\/tommyds,amadvance\/tommyds","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- tommychain.h\n+++ tommychain.h\n@@ -158,8 +158,10 @@\n \t\/*\n \t * Bit buckets of chains.\n \t * Each bucket contains 2^i nodes or it's empty.\n+\t * The chain at address TOMMY_CHAIN_BIT_MAX is an independet variable operating as \"carry\".\n+\t * We keep it in the same \"bit\" vector to avoid reports from the valgrind tool sgcheck.\n \t *\/\n-\ttommy_chain bit[TOMMY_CHAIN_BIT_MAX];\n+\ttommy_chain bit[TOMMY_CHAIN_BIT_MAX + 1];\n \n \t\/**\n \t * Value stored inside the bit bucket.\n@@ -174,13 +176,12 @@\n \tcounter = 0;\n \twhile (1) {\n \t\ttommy_node* next;\n-\t\ttommy_chain carry;\n \t\ttommy_chain* last;\n \n \t\t\/* carry bit to add *\/\n-\t\tlast = &carry;\n-\t\tcarry.head = node;\n-\t\tcarry.tail = node;\n+\t\tlast = &bit[TOMMY_CHAIN_BIT_MAX];\n+\t\tbit[TOMMY_CHAIN_BIT_MAX].head = node;\n+\t\tbit[TOMMY_CHAIN_BIT_MAX].tail = node;\n \t\tnext = node->next;\n \n \t\t\/* add the bit, propagating the carry *\/\n"} {"commit":"047c336b2414f83583dde08881ace35e3062d42c","subject":"Fix uninitialized name and x variables in setfan","message":"Fix uninitialized name and x variables in setfan\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/acpi\/acpitz.c\n+++ dev\/acpi\/acpitz.c\n@@ -1,4 +1,4 @@\n-\/* $OpenBSD: acpitz.c,v 1.41 2011\/04\/07 20:14:38 marco Exp $ *\/\n+\/* $OpenBSD: acpitz.c,v 1.42 2011\/04\/07 20:16:19 jordan Exp $ *\/\n \/*\n * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>\n * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>\n@@ -248,18 +248,22 @@\n \n \tdnprintf(20, \"%s: acpitz_setfan(%d, %s)\\n\", DEVNAME(sc), i, method);\n \n+\tx = 0;\n+\tsnprintf(name, sizeof(name), \"_AL%d\", i);\n \tTAILQ_FOREACH(dl, &sc->sc_alx[i], dev_link) {\n \t\tif (aml_evalname(sc->sc_acpi, dl->dev_node, \"_PR0\",0 , NULL,\n \t\t &res1)) {\n \t\t\tprintf(\"%s: %s[%d] _PR0 failed\\n\", DEVNAME(sc),\n \t\t\t name, x);\n \t\t\taml_freevalue(&res1);\n+\t\t\tx++;\n \t\t\tcontinue;\n \t\t}\n \t\tif (res1.type != AML_OBJTYPE_PACKAGE) {\n \t\t\tprintf(\"%s: %s[%d] _PR0 not a package\\n\", DEVNAME(sc),\n \t\t\t name, x);\n \t\t\taml_freevalue(&res1);\n+\t\t\tx++;\n \t\t\tcontinue;\n \t\t}\n \t\tfor (y = 0; y < res1.length; y++) {\n@@ -299,6 +303,7 @@\n \t\t\t}\n \t\t}\n \t\taml_freevalue(&res1);\n+\t\tx++;\n \t}\n \trv = 0;\n \treturn (rv);\n"} {"commit":"e9995aee384bdbac6c6afc0f4548a080eb4241bc","subject":"base64: use strtok_r instead of strtok to make sure we're thread safe","message":"base64: use strtok_r instead of strtok to make sure we're thread safe\n","repos":"Tatsh\/libplist,libimobiledevice\/libplist,Tatsh\/libplist,Tatsh\/libplist,Tatsh\/libplist,libimobiledevice-win32\/libplist,libimobiledevice\/libplist,libimobiledevice-win32\/libplist,libimobiledevice-win32\/libplist,libimobiledevice-win32\/libplist,libimobiledevice\/libplist","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/base64.c\n+++ src\/base64.c\n@@ -111,13 +111,14 @@\n \n \tunsigned char *line;\n \tint p = 0;\n+\tchar* saveptr = NULL;\n \n-\tline = (unsigned char*)strtok((char*)buf, \"\\r\\n\\t \");\n+\tline = (unsigned char*)strtok_r((char*)buf, \"\\r\\n\\t \", &saveptr);\n \twhile (line) {\n \t\tp+=base64decode_block(outbuf+p, (const char*)line, strlen((char*)line));\n \n \t\t\/\/ get next line of base64 encoded block\n-\t\tline = (unsigned char*)strtok(NULL, \"\\r\\n\\t \");\n+\t\tline = (unsigned char*)strtok_r(NULL, \"\\r\\n\\t \", &saveptr);\n \t}\n \toutbuf[p] = 0;\n \t*size = p;\n"} {"commit":"13f8dbfe4a1b46c5f16c8e690e023003fe0f1961","subject":"Clarifiy some code in base64.c","message":"Clarifiy some code in base64.c\n","repos":"pombredanne\/sdb,Maijin\/sdb,pombredanne\/sdb,radare\/sdb,pombredanne\/sdb,alvarofe\/sdb,pombredanne\/sdb,alvarofe\/sdb,radare\/sdb,Maijin\/sdb,Maijin\/sdb,Maijin\/sdb,radare\/sdb,Maijin\/sdb,pombredanne\/sdb,alvarofe\/sdb,pombredanne\/sdb,Maijin\/sdb,pombredanne\/sdb,alvarofe\/sdb,pombredanne\/sdb,alvarofe\/sdb,Maijin\/sdb,radare\/sdb,alvarofe\/sdb,alvarofe\/sdb,alvarofe\/sdb,alvarofe\/sdb,pombredanne\/sdb,radare\/sdb,radare\/sdb,pombredanne\/sdb,alvarofe\/sdb,pombredanne\/sdb,Maijin\/sdb,radare\/sdb,radare\/sdb,Maijin\/sdb,alvarofe\/sdb,radare\/sdb,Maijin\/sdb,radare\/sdb,Maijin\/sdb,radare\/sdb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/base64.c\n+++ src\/base64.c\n@@ -21,9 +21,9 @@\n static int b64_decode(const char in[4], ut8 out[3]) {\n \tut8 len = 3, i, v[4] = {0};\n \tfor (i=0; i<4; i++) {\n-\t\tif (in[i]<43 || in[i]>122)\n+\t\tif (in[i]<'+' || in[i]>'z')\n \t\t\treturn -1;\n-\t\tv[i] = cd64[in[i]-43];\n+\t\tv[i] = cd64[in[i]-'+'];\n \t\tif (v[i]=='$') {\n \t\t\tlen = i-1;\n \t\t\tbreak;\n@@ -46,7 +46,8 @@\n SDB_API int sdb_decode_raw(ut8 *bout, const char *bin, int len) {\n \tint in, out, ret;\n \tfor (in=out=0; in<len; in+=4) {\n-\t\tif ((ret = b64_decode (bin+in, bout+out))<1)\n+\t\tret = b64_decode (bin+in, bout+out);\n+\t\tif (ret < 1)\n \t\t\tbreak;\n \t\tout += ret;\n \t}\n@@ -57,10 +58,9 @@\n \tchar *out;\n \tif (!bin) return NULL;\n \tif (len<0) len = strlen ((const char *)bin);\n-\tif (len==0) return strdup (\"\");\n-\tout = malloc (8+(len*2));\n+\tif (!len) return strdup (\"\");\n+\tout = calloc (8 + (len*2), sizeof(char));\n \tif (!out) return NULL;\n-\tmemset (out, 0, (len*2)+8);\n \tsdb_encode_raw (out, bin, len);\n \treturn out;\n }\n@@ -70,7 +70,7 @@\n \tint olen, ilen;\n \tif (!in) return NULL;\n \tilen = strlen (in);\n-\tif (ilen<1) return NULL;\n+\tif (!ilen) return NULL;\n \tout = malloc (16+(ilen*2));\n \tif (!out) return NULL;\n \tmemset (out, 0, ilen+8);\n"} {"commit":"9f3845acd225534a5054ecfda698ce81070a73df","subject":"","message":"\n\nMake this build on architectures that define __NO_ISA_INTR_CHECK.\nThis is a hack, but so is __NO_ISA_INTR_CHECK.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/isa\/lpt_isa.c\n+++ dev\/isa\/lpt_isa.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: lpt_isa.c,v 1.9 1999\/01\/07 15:57:43 niklas Exp $\t*\/\n+\/*\t$OpenBSD: lpt_isa.c,v 1.10 1999\/01\/30 01:41:48 imp Exp $\t*\/\n \n \/*\n * Copyright (c) 1993, 1994 Charles Hannum.\n@@ -97,7 +97,9 @@\n \tstruct device *parent;\n \tvoid *match, *aux;\n {\n+#if !defined(__NO_ISA_INTR_CHECK)\n \tstruct isa_softc *sc = (struct isa_softc *)parent;\n+#endif\n \tstruct isa_attach_args *ia = aux;\n \tbus_space_tag_t iot;\n \tbus_space_handle_t ioh;\n@@ -152,10 +154,11 @@\n \t * Check if the specified IRQ is available. If not revert to\n \t * polled mode.\n \t *\/\n+#if !defined(__NO_ISA_INTR_CHECK)\n \tif (ia->ia_irq != IRQUNK &&\n \t !isa_intr_check(sc->sc_ic, ia->ia_irq, IST_EDGE))\n \t\tia->ia_irq = IRQUNK;\n-\n+#endif\n \tia->ia_msize = 0;\n \tia->ia_iosize = iosz;\n \n"} {"commit":"35472d74811e93840b8c504d043b32a01c09d2e1","subject":"Limit pci register map size to 256k ok deraadt, art, mickey","message":"Limit pci register map size to 256k\nok deraadt, art, mickey\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/iop_pci.c\n+++ dev\/pci\/iop_pci.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: iop_pci.c,v 1.3 2001\/08\/25 10:13:29 art Exp $\t*\/\n+\/*\t$OpenBSD: iop_pci.c,v 1.4 2002\/03\/31 05:25:10 nate Exp $\t*\/\n \/*\t$NetBSD: iop_pci.c,v 1.4 2001\/03\/20 13:21:00 ad Exp $\t*\/\n \n \/*-\n@@ -124,7 +124,7 @@\n \n \t\/* Map the register window. *\/\n \tif (pci_mapreg_map(pa, i, PCI_MAPREG_TYPE_MEM, 0, &sc->sc_iot,\n-\t &sc->sc_ioh, NULL, NULL, 0)) {\n+\t &sc->sc_ioh, NULL, NULL, 0x40000)) {\n \t\tprintf(\"%s: can't map register window\\n\", sc->sc_dv.dv_xname);\n \t\treturn;\n \t}\n"} {"commit":"a11dba25dfff7551d8f37fb9e51ea5a2f7acabbf","subject":"speeling fix","message":"speeling fix\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/mpt_pci.c\n+++ dev\/pci\/mpt_pci.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: mpt_pci.c,v 1.8 2005\/08\/09 04:10:13 mickey Exp $\t*\/\n+\/*\t$OpenBSD: mpt_pci.c,v 1.9 2005\/11\/05 08:17:08 dlg Exp $\t*\/\n \/*\t$NetBSD: mpt_pci.c,v 1.2 2003\/07\/14 15:47:26 lukem Exp $\t*\/\n \n \/*\n@@ -248,7 +248,7 @@\n \t * Hard resets are known to screw up the BAR for diagnostic\n \t * memory accesses (Mem1).\n \t *\n-\t * Using Mem1 is know to make the chip stop responding to\n+\t * Using Mem1 is known to make the chip stop responding to\n \t * configuration cycles, so we need to save it now.\n \t *\/\n \tmpt_pci_read_config_regs(mpt);\n"} {"commit":"e4f8a0a255b8009486be201967134bd2fff5abb5","subject":"oxford 16pci954\/siig 2050 has a 10x clock (why?!)","message":"oxford 16pci954\/siig 2050 has a 10x clock (why?!)\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/pucdata.c\n+++ dev\/pci\/pucdata.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: pucdata.c,v 1.42 2005\/11\/02 17:08:22 deraadt Exp $\t*\/\n+\/*\t$OpenBSD: pucdata.c,v 1.43 2006\/06\/15 15:29:25 jason Exp $\t*\/\n \/*\t$NetBSD: pucdata.c,v 1.6 1999\/07\/03 05:55:23 cgd Exp $\t*\/\n \n \/*\n@@ -792,6 +792,19 @@\n \t },\n \t},\n \n+\t\/* SIIG 2050 (uses Oxford 16PCI954 and a 10x clock) *\/\n+\t{ \/* \"Oxford Semiconductor OX16PCI954 UARTs\", *\/\n+\t { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OX16PCI954,\n+\t\tPCI_VENDOR_SIIG, PCI_PRODUCT_SIIG_2050 },\n+\t { 0xffff, 0xffff, 0xffff, 0xffff },\n+\t {\n+\t\t{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },\n+\t\t{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },\n+\t\t{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10 },\n+\t\t{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10 },\n+\t },\n+\t},\n+\n \t\/* Oxford Semiconductor OX16PCI954 PCI UARTs *\/\n \t{ \/* \"Oxford Semiconductor OX16PCI954 UARTs\", *\/\n \t { PCI_VENDOR_OXFORD2, PCI_PRODUCT_OXFORD2_OX16PCI954,\t0, 0 },\n"} {"commit":"d85c896e5d5971f4b32537ffbe6937c50e755809","subject":"Adds missing port routing rules field, fixes an incorrect offset for EHCI_QH_GET_CTL and adds a macro for setting the data toggle on a qtd token; from netbsd; via loki@animata.net","message":"Adds missing port routing rules field, fixes an incorrect offset for\nEHCI_QH_GET_CTL and adds a macro for setting the data toggle on a qtd\ntoken; from netbsd; via loki@animata.net\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/usb\/ehcireg.h\n+++ dev\/usb\/ehcireg.h\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ehcireg.h,v 1.5 2004\/07\/05 03:07:45 deraadt Exp $ *\/\n+\/*\t$OpenBSD: ehcireg.h,v 1.6 2004\/07\/05 03:08:56 deraadt Exp $ *\/\n \/*\t$NetBSD: ehcireg.h,v 1.14 2003\/10\/13 00:05:10 enami Exp $\t*\/\n \n \/*\n@@ -79,6 +79,7 @@\n #define EHCI_HCS_P_INDICATOR(x) ((x) & 0x10000)\n #define EHCI_HCS_N_CC(x)\t(((x) >> 12) & 0xf) \/* # of companion ctlrs *\/\n #define EHCI_HCS_N_PCC(x)\t(((x) >> 8) & 0xf) \/* # of ports per comp. *\/\n+#define EHCI_HCS_PRR(x)\t((x) & 0x80) \/* port routing rules *\/\n #define EHCI_HCS_PPC(x)\t((x) & 0x10) \/* port power control *\/\n #define EHCI_HCS_N_PORTS(x)\t((x) & 0xf) \/* # of ports *\/\n \n@@ -230,6 +231,7 @@\n #define EHCI_QTD_GET_BYTES(x)\t(((x) >> 16) & 0x7fff)\n #define EHCI_QTD_SET_BYTES(x)\t((x) << 16)\n #define EHCI_QTD_GET_TOGGLE(x)\t(((x) >> 31) & 0x1)\n+#define EHCI_QTD_SET_TOGGLE(x)\t((x) << 31)\n #define EHCI_QTD_TOGGLE\t\t0x80000000\n \tehci_physaddr_t\tqtd_buffer[EHCI_QTD_NBUFFERS];\n \tehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];\n@@ -259,7 +261,7 @@\n #define EHCI_QH_GET_MPL(x)\t(((x) >> 16) & 0x7ff) \/* max packet len *\/\n #define EHCI_QH_SET_MPL(x)\t((x) << 16)\n #define EHCI_QH_MPLMASK\t\t0x07ff0000\n-#define EHCI_QH_GET_CTL(x)\t(((x) >> 26) & 0x01) \/* control endpoint *\/\n+#define EHCI_QH_GET_CTL(x)\t(((x) >> 27) & 0x01) \/* control endpoint *\/\n #define EHCI_QH_CTL\t\t0x08000000\n #define EHCI_QH_GET_NRL(x)\t(((x) >> 28) & 0x0f) \/* NAK reload *\/\n #define EHCI_QH_SET_NRL(x)\t((x) << 28)\n"} {"commit":"33cefa9511540ed77638e35c787acb93c6a0fde1","subject":"sitecom needs comma","message":"sitecom needs comma\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/usb\/if_urtw.c\n+++ dev\/usb\/if_urtw.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: if_urtw.c,v 1.24 2009\/07\/29 18:01:31 martynas Exp $\t*\/\n+\/*\t$OpenBSD: if_urtw.c,v 1.25 2009\/07\/29 18:08:44 martynas Exp $\t*\/\n \n \/*-\n * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>\n@@ -89,7 +89,7 @@\n \tURTW_DEV_RTL8187(LOGITEC,\tRTL8187),\n \tURTW_DEV_RTL8187(NETGEAR,\tWG111V2),\n \tURTW_DEV_RTL8187(REALTEK,\tRTL8187),\n-\tURTW_DEV_RTL8187(SITECOMEU,\tWL168V1)\n+\tURTW_DEV_RTL8187(SITECOMEU,\tWL168V1),\n \tURTW_DEV_RTL8187(SPHAIRON,\tRTL8187),\n \tURTW_DEV_RTL8187(SURECOM,\tEP9001G2A),\n \t\/* Realtek RTL8187B devices. *\/\n"} {"commit":"71c15d8630a4a87de5c1d904e55ca81a3d6c5d8e","subject":"make sure that the last coupling band stops at the end of the coupling range","message":"make sure that the last coupling band stops at the end of the coupling range\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@11438 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"0f023862ab7c97ea2bd6358e8a982c1ac564f922","subject":"Simplify iv_free_func().","message":"Simplify iv_free_func().\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@15479 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"6d95af118632a079a9b22015854f95464e51c5ef","subject":"optional non spec compliant optimizations for mpeg1","message":"optional non spec compliant optimizations for mpeg1\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@3430 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/mpeg12.c\n+++ libavcodec\/mpeg12.c\n@@ -64,6 +64,7 @@\n static inline int mpeg1_decode_block_intra(MpegEncContext *s, \n DCTELEM *block, \n int n);\n+static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);\n static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, \n DCTELEM *block, \n int n);\n@@ -1382,14 +1383,25 @@\n }\n }\n } else {\n- for(i=0;i<6;i++) {\n- if (cbp & 32) {\n- if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0)\n- return -1;\n- } else {\n- s->block_last_index[i] = -1;\n+ if(s->flags2 & CODEC_FLAG2_FAST){\n+ for(i=0;i<6;i++) {\n+ if (cbp & 32) {\n+ mpeg1_fast_decode_block_inter(s, s->pblocks[i], i);\n+ } else {\n+ s->block_last_index[i] = -1;\n+ }\n+ cbp+=cbp;\n }\n- cbp+=cbp;\n+ }else{\n+ for(i=0;i<6;i++) {\n+ if (cbp & 32) {\n+ if (mpeg1_decode_block_inter(s, s->pblocks[i], i) < 0)\n+ return -1;\n+ } else {\n+ s->block_last_index[i] = -1;\n+ }\n+ cbp+=cbp;\n+ }\n }\n }\n }else{\n@@ -1603,6 +1615,76 @@\n s->block_last_index[n] = i;\n return 0;\n }\n+\n+static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)\n+{\n+ int level, i, j, run;\n+ RLTable *rl = &rl_mpeg1;\n+ uint8_t * const scantable= s->intra_scantable.permutated;\n+ const int qscale= s->qscale;\n+\n+ {\n+ int v;\n+ OPEN_READER(re, &s->gb);\n+ i = -1;\n+ \/* special case for the first coef. no need to add a second vlc table *\/\n+ UPDATE_CACHE(re, &s->gb);\n+ v= SHOW_UBITS(re, &s->gb, 2);\n+ if (v & 2) {\n+ LAST_SKIP_BITS(re, &s->gb, 2);\n+ level= (3*qscale)>>4;\n+ level= (level-1)|1;\n+ if(v&1)\n+ level= -level;\n+ block[0] = level;\n+ i++;\n+ }\n+\n+ \/* now quantify & encode AC coefs *\/\n+ for(;;) {\n+ UPDATE_CACHE(re, &s->gb);\n+ GET_RL_VLC(level, run, re, &s->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2);\n+ \n+ if(level == 127){\n+ break;\n+ } else if(level != 0) {\n+ i += run;\n+ j = scantable[i];\n+ level= ((level*2+1)*qscale)>>1;\n+ level= (level-1)|1;\n+ level = (level ^ SHOW_SBITS(re, &s->gb, 1)) - SHOW_SBITS(re, &s->gb, 1);\n+ LAST_SKIP_BITS(re, &s->gb, 1);\n+ } else {\n+ \/* escape *\/\n+ run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);\n+ UPDATE_CACHE(re, &s->gb);\n+ level = SHOW_SBITS(re, &s->gb, 8); SKIP_BITS(re, &s->gb, 8);\n+ if (level == -128) {\n+ level = SHOW_UBITS(re, &s->gb, 8) - 256; LAST_SKIP_BITS(re, &s->gb, 8);\n+ } else if (level == 0) {\n+ level = SHOW_UBITS(re, &s->gb, 8) ; LAST_SKIP_BITS(re, &s->gb, 8);\n+ }\n+ i += run;\n+ j = scantable[i];\n+ if(level<0){\n+ level= -level;\n+ level= ((level*2+1)*qscale)>>1;\n+ level= (level-1)|1;\n+ level= -level;\n+ }else{\n+ level= ((level*2+1)*qscale)>>1;\n+ level= (level-1)|1;\n+ }\n+ }\n+\n+ block[j] = level;\n+ }\n+ CLOSE_READER(re, &s->gb);\n+ }\n+ s->block_last_index[n] = i;\n+ return 0;\n+}\n+\n \n static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, \n DCTELEM *block, \n"} {"commit":"fc72fefcf4051333c0d18b7ae7a49cc9a72a9774","subject":"OTHER: Whitespace fix in src\/clients\/mdns\/avahi\/mdns-avahi.c.","message":"OTHER: Whitespace fix in src\/clients\/mdns\/avahi\/mdns-avahi.c.\n","repos":"dreamerc\/xmms2,six600110\/xmms2,theefer\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,xmms2\/xmms2-stable,dreamerc\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,chrippa\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,dreamerc\/xmms2,chrippa\/xmms2,dreamerc\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,six600110\/xmms2,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,six600110\/xmms2,theefer\/xmms2,theefer\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,theefer\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,six600110\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,chrippa\/xmms2,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/mdns\/avahi\/mdns-avahi.c\n+++ src\/clients\/mdns\/avahi\/mdns-avahi.c\n@@ -60,8 +60,8 @@\n \n static void\n group_callback (AvahiEntryGroup *g,\n-\t\t\t\tAvahiEntryGroupState state,\n-\t\t\t\tvoid *userdata)\n+ AvahiEntryGroupState state,\n+ void *userdata)\n {\n \tg_return_if_fail (g == group);\n \n"} {"commit":"54b049e159078a18fcdd1097f74b349a3b3770b3","subject":"fix bug","message":"fix bug\n","repos":"viticm\/web-pap,viticm\/web-pap,viticm\/web-pap,viticm\/web-pap,viticm\/web-pap,viticm\/web-pap","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- server\/Common\/Combat\/DataRecords.h\n+++ server\/Common\/Combat\/DataRecords.h\n@@ -219,51 +219,51 @@\n CHAR const* Description(VOID) const {return m_szDescription;};\n protected:\n private:\n- BOOL m_bInited; \/\/\u8be5\u8bb0\u5f55\u662f\u5426\u5df2\u7ecf\u521d\u59cb\u5316\n- SkillID_t m_nSkillID; \/\/\u6280\u80fd\u7f16\u53f7\n- MenPaiID_t m_nMenPai;\/\/\u95e8\u6d3e\u7f16\u53f7\n- CHAR const* m_szName;\/\/\u6280\u80fd\u7684\u540d\u79f0\n- INT m_nSkillMaxLevel;\/\/\u6280\u80fd\u7684\u6700\u5927\u7b49\u7ea7\n- INT m_nClientOnly1; \/\/\u5ba2\u6237\u7aef\u4e13\u7528\u6570\u636e\n- BOOL m_bMustUseWeapon; \/\/\u6b64\u6280\u80fd\u5fc5\u987b\u4f7f\u7528\u6b66\u5668\n- INT m_nDisableByFlag1; \/\/\u53d7\u9650\u4e8e\u6807\u8bb01\n- INT m_nDisableByFlag2; \/\/\u53d7\u9650\u4e8e\u6807\u8bb01\n- INT m_nDisableByFlag3; \/\/\u53d7\u9650\u4e8e\u6807\u8bb01\n- ID_t m_nSkillClass;\/\/\u6280\u80fd\u7cfb\n- INT m_nXinFaParam_Nouse;\/\/\u5fc3\u6cd5\u4fee\u6b63\u53c2\u6570\n- INT m_nRangedSkillFlag;\/\/\u662f\u5426\u662f\u8fdc\u7a0b\u6280\u80fd\n- BOOL m_bForceBreakPreSkill;\/\/\u662f\u5426\u5f3a\u5236\u4e2d\u65ad\u4e0a\u4e00\u4e2a\u6b63\u5728\u6267\u884c\u7684\u6280\u80fd\n- ID_t m_nSkillType; \/\/ Charge, channel or instant shot skill\n- CooldownID_t m_nCooldownID; \/\/\u51b7\u5374\u65f6\u95f4\u7684ID\n- BOOL m_nTargetMustInSpecialState;\/\/ \u76ee\u6807\u5fc5\u987b\u662f: 0:\u6d3b\u7684\uff1b1:\u6b7b\u7684; -1: \u65e0\u6548\n- ID_t m_nClassByUser;\/\/ \u6309\u4f7f\u7528\u8005\u7c7b\u578b\u5206\u7c7b\uff0c0:\u73a9\u5bb6, 1:\u602a\u7269, 2:\u5ba0\u7269, 3:\u7269\u54c1,\n- ID_t m_nPassiveFlag;\/\/ \u4e3b\u52a8\u8fd8\u662f\u88ab\u52a8\u6280\u80fd\uff0c0:\u4e3b\u52a8\u6280\u80fd,1:\u88ab\u52a8\u6280\u80fd;\n- ID_t m_nSelectType;\/\/\u9f20\u6807\u70b9\u9009\u7c7b\u578b\n- ID_t m_nOperateModeForPetSkill;\/\/\u5ba0\u7269\u6280\u80fd\u53d1\u52a8\u7c7b\u578b 0:\u4e3b\u4eba\u624b\u52a8\u70b9\u9009,1:AI\u81ea\u52a8\u6267\u884c,2:\u589e\u5f3a\u81ea\u8eab\u5c5e\u6027\u7684\u88ab\u52a8\u6280\u80fd\n- ID_t m_nPetRateOfSkill; \/\/\u6280\u80fd\u53d1\u52a8\u51e0\u7387,\u53ea\u5bf9\u5ba0\u7269\u6280\u80fd\u6709\u6548\n- ID_t m_nTypeOfPetSkill; \/\/\u5ba0\u7269\u6280\u80fd\u7c7b\u578b,0:\u7269\u529f,1:\u6cd5\u529f,2:\u62a4\u4e3b,3:\u9632\u5fa1,4:\u590d\u4ec7;\n- ID_t m_nImpactIDOfSkill; \/\/\u5ba0\u7269\u6280\u80fd\u4ea7\u751f\u7684\u6548\u679cID\n- ID_t m_nTargetingLogic; \/\/\u76ee\u6807\u9009\u53d6\u903b\u8f91\n- Time_t m_nPlayActionTime;\/\/\u6280\u80fd\u52a8\u4f5c\u64ad\u653e\u7684\u65f6\u95f4\n- FLOAT m_fOptimalRangeMin;\/\/\u6280\u80fd\u4f7f\u7528\u8303\u56f4\u4e0b\u754c\n- FLOAT m_fOptimalRangeMax;\/\/\u6280\u80fd\u4f7f\u7528\u8303\u56f4\u4e0a\u754c\n- INT m_nStandFlag; \/\/\u8fd9\u4e2a\u662f\u6280\u80fd\u7684\u7acb\u573a\u6807\u8bb0\uff0c-1\u4ee3\u8868\u6280\u80fd\u6d88\u5f31\u76ee\u6807\uff0c0\u662f\u4e2d\u6027\uff0c1\u662f\u6280\u80fd\u589e\u5f3a\u76ee\u6807\n- ID_t m_nTargetLogicByStand; \/\/\u6280\u80fd\u4f5c\u7528\u4e8e\u4ec0\u4e48\u9635\u8425\u7684\u76ee\u6807\uff0c\u654c\u5bf9\uff0c\u53cb\u597d\uff0c\u4e2d\u7acb\uff0c\u5168\u90e8\u3002\u3002\u3002\n- ID_t m_nTargetCheckByObjType; \/\/\u6280\u80fd\u7684\u6d88\u8017\u53ca\u76f8\u5173\u68c0\u67e5\n- BOOL m_bPartyOnly;\/\/\u6280\u80fd\u53ea\u80fd\u4f5c\u7528\u4e8e\u961f\u53cb\n- INT m_nChargesOrInterval;\/\/\u8fde\u7eed\u751f\u6548\u6b21\u6570\u548c\u5f15\u5bfc\u4e2d\u7684\u751f\u6548\u6b21\u6570\n- BOOL m_bAutoShot;\/\/\u81ea\u52a8\u8fde\u7eed\u91ca\u653e\u6280\u80fd\n- INT m_nAccuracy;\/\/\u547d\u4e2d\u7387\n- INT m_nCriticalRate;\/\/\u4f1a\u5fc3\u7387,\u6216\u8005\u53eb\u66b4\u51fb\u7387\n- BOOL m_bUseNormalAttackRate;\/\/\u6280\u80fd\u7684\u51b7\u5374\u662f\u5426\u53d7\u4eba\u7269\u653b\u51fb\u901f\u5ea6\u5f71\u54cd\n- Time_t m_nActiveTime;\/\/\u6fc0\u6d3b\u65f6\u95f4\n- FLOAT m_fRadius;\/\/\u4f5c\u7528\u534a\u5f84\n- FLOAT m_fAngle;\/\/\u4f5c\u7528\u89d2\u5ea6\n- INT m_nMaxTargetNumber;\/\/\u6700\u5927\u4f5c\u7528\u76ee\u6807\u6570\n- BOOL m_bCanInterruptAutoShot; \/\/\u672c\u6280\u80fd\u4f1a\u4e2d\u65ad\u81ea\u52a8\u5c04\u51fb\u6280\u80fd\u5f97\u8fde\u7eed\u91ca\u653e\n- Time_t m_nDelayTime; \/\/\u5ef6\u8fdf\u65f6\u95f4\n- ID_t m_aSkillInstance[MAX_CHAR_SKILL_LEVEL];\/\/\u6280\u80fd\u53d7\u5fc3\u6cd5\u5f71\u54cd\u7684\u6570\u636e\u7d22\u5f15\n- CHAR const* m_szDescription;\/\/\u6280\u80fd\u7684\u63cf\u8ff0\n+ BOOL m_bInited; \/\/ \u8be5\u8bb0\u5f55\u662f\u5426\u5df2\u7ecf\u521d\u59cb\u5316\n+ SkillID_t m_nSkillID; \/\/ \u6280\u80fd\u7f16\u53f7\n+ MenPaiID_t m_nMenPai; \/\/ \u95e8\u6d3e\u7f16\u53f7\n+ CHAR const* m_szName; \/\/ \u6280\u80fd\u7684\u540d\u79f0\n+ INT m_nSkillMaxLevel; \/\/ \u6280\u80fd\u7684\u6700\u5927\u7b49\u7ea7\n+ INT m_nClientOnly1; \/\/ \u5ba2\u6237\u7aef\u4e13\u7528\u6570\u636e\n+ BOOL m_bMustUseWeapon; \/\/ \u6b64\u6280\u80fd\u5fc5\u987b\u4f7f\u7528\u6b66\u5668\n+ INT m_nDisableByFlag1; \/\/ \u53d7\u9650\u4e8e\u6807\u8bb01\n+ INT m_nDisableByFlag2; \/\/ \u53d7\u9650\u4e8e\u6807\u8bb01\n+ INT m_nDisableByFlag3; \/\/ \u53d7\u9650\u4e8e\u6807\u8bb01\n+ ID_t m_nSkillClass; \/\/ \u6280\u80fd\u7cfb\n+ INT m_nXinFaParam_Nouse; \/\/ \u5fc3\u6cd5\u4fee\u6b63\u53c2\u6570\n+ INT m_nRangedSkillFlag; \/\/ \u662f\u5426\u662f\u8fdc\u7a0b\u6280\u80fd\n+ BOOL m_bForceBreakPreSkill; \/\/ \u662f\u5426\u5f3a\u5236\u4e2d\u65ad\u4e0a\u4e00\u4e2a\u6b63\u5728\u6267\u884c\u7684\u6280\u80fd\n+ ID_t m_nSkillType; \/\/ Charge, channel or instant shot skill\n+ CooldownID_t m_nCooldownID; \/\/ \u51b7\u5374\u65f6\u95f4\u7684ID\n+ BOOL m_nTargetMustInSpecialState; \/\/ \u76ee\u6807\u5fc5\u987b\u662f: 0:\u6d3b\u7684\uff1b1:\u6b7b\u7684; -1: \u65e0\u6548\n+ ID_t m_nClassByUser; \/\/ \u6309\u4f7f\u7528\u8005\u7c7b\u578b\u5206\u7c7b\uff0c0:\u73a9\u5bb6, 1:\u602a\u7269, 2:\u5ba0\u7269, 3:\u7269\u54c1,\n+ ID_t m_nPassiveFlag; \/\/ \u4e3b\u52a8\u8fd8\u662f\u88ab\u52a8\u6280\u80fd\uff0c0:\u4e3b\u52a8\u6280\u80fd,1:\u88ab\u52a8\u6280\u80fd;\n+ ID_t m_nSelectType; \/\/ \u9f20\u6807\u70b9\u9009\u7c7b\u578b\n+ ID_t m_nOperateModeForPetSkill; \/\/ \u5ba0\u7269\u6280\u80fd\u53d1\u52a8\u7c7b\u578b 0:\u4e3b\u4eba\u624b\u52a8\u70b9\u9009,1:AI\u81ea\u52a8\u6267\u884c,2:\u589e\u5f3a\u81ea\u8eab\u5c5e\u6027\u7684\u88ab\u52a8\u6280\u80fd\n+ ID_t m_nPetRateOfSkill; \/\/ \u6280\u80fd\u53d1\u52a8\u51e0\u7387,\u53ea\u5bf9\u5ba0\u7269\u6280\u80fd\u6709\u6548\n+ ID_t m_nTypeOfPetSkill; \/\/ \u5ba0\u7269\u6280\u80fd\u7c7b\u578b,0:\u7269\u529f,1:\u6cd5\u529f,2:\u62a4\u4e3b,3:\u9632\u5fa1,4:\u590d\u4ec7;\n+ ID_t m_nImpactIDOfSkill; \/\/ \u5ba0\u7269\u6280\u80fd\u4ea7\u751f\u7684\u6548\u679cID\n+ ID_t m_nTargetingLogic; \/\/ \u76ee\u6807\u9009\u53d6\u903b\u8f91\n+ Time_t m_nPlayActionTime; \/\/ \u6280\u80fd\u52a8\u4f5c\u64ad\u653e\u7684\u65f6\u95f4\n+ FLOAT m_fOptimalRangeMin; \/\/ \u6280\u80fd\u4f7f\u7528\u8303\u56f4\u4e0b\u754c\n+ FLOAT m_fOptimalRangeMax; \/\/ \u6280\u80fd\u4f7f\u7528\u8303\u56f4\u4e0a\u754c\n+ INT m_nStandFlag; \/\/ \u8fd9\u4e2a\u662f\u6280\u80fd\u7684\u7acb\u573a\u6807\u8bb0\uff0c-1\u4ee3\u8868\u6280\u80fd\u6d88\u5f31\u76ee\u6807\uff0c0\u662f\u4e2d\u6027\uff0c1\u662f\u6280\u80fd\u589e\u5f3a\u76ee\u6807\n+ ID_t m_nTargetLogicByStand; \/\/ \u6280\u80fd\u4f5c\u7528\u4e8e\u4ec0\u4e48\u9635\u8425\u7684\u76ee\u6807\uff0c\u654c\u5bf9\uff0c\u53cb\u597d\uff0c\u4e2d\u7acb\uff0c\u5168\u90e8\u3002\u3002\u3002\n+ ID_t m_nTargetCheckByObjType; \/\/ \u6280\u80fd\u7684\u6d88\u8017\u53ca\u76f8\u5173\u68c0\u67e5\n+ BOOL m_bPartyOnly; \/\/ \u6280\u80fd\u53ea\u80fd\u4f5c\u7528\u4e8e\u961f\u53cb\n+ INT m_nChargesOrInterval; \/\/ \u8fde\u7eed\u751f\u6548\u6b21\u6570\u548c\u5f15\u5bfc\u4e2d\u7684\u751f\u6548\u6b21\u6570\n+ BOOL m_bAutoShot; \/\/ \u81ea\u52a8\u8fde\u7eed\u91ca\u653e\u6280\u80fd\n+ INT m_nAccuracy; \/\/ \u547d\u4e2d\u7387\n+ INT m_nCriticalRate; \/\/ \u4f1a\u5fc3\u7387,\u6216\u8005\u53eb\u66b4\u51fb\u7387\n+ BOOL m_bUseNormalAttackRate; \/\/ \u6280\u80fd\u7684\u51b7\u5374\u662f\u5426\u53d7\u4eba\u7269\u653b\u51fb\u901f\u5ea6\u5f71\u54cd\n+ Time_t m_nActiveTime; \/\/ \u6fc0\u6d3b\u65f6\u95f4\n+ FLOAT m_fRadius; \/\/ \u4f5c\u7528\u534a\u5f84\n+ FLOAT m_fAngle; \/\/ \u4f5c\u7528\u89d2\u5ea6\n+ INT m_nMaxTargetNumber; \/\/ \u6700\u5927\u4f5c\u7528\u76ee\u6807\u6570\n+ BOOL m_bCanInterruptAutoShot; \/\/ \u672c\u6280\u80fd\u4f1a\u4e2d\u65ad\u81ea\u52a8\u5c04\u51fb\u6280\u80fd\u5f97\u8fde\u7eed\u91ca\u653e\n+ Time_t m_nDelayTime; \/\/ \u5ef6\u8fdf\u65f6\u95f4\n+ ID_t m_aSkillInstance[ MAX_CHAR_SKILL_LEVEL ]; \/\/ \u6280\u80fd\u53d7\u5fc3\u6cd5\u5f71\u54cd\u7684\u6570\u636e\u7d22\u5f15\n+ CHAR const* m_szDescription; \/\/ \u6280\u80fd\u7684\u63cf\u8ff0\n };\n \/\/SkillInstance\n class SkillInstanceData_T\n"} {"commit":"511499d950d0fc85742ed18b0988e57c07918fa8","subject":"Reorder preprocessor conditions in libi2pd\/I2PEndian.h","message":"Reorder preprocessor conditions in libi2pd\/I2PEndian.h\n\nThe problem is that __FreeBSD_kernel__ may be defined on FreeBSD as\nwell, while it always needs <sys\/endian.h>\n","repos":"majestrate\/i2pd,brain5lug\/i2pd,hypnosis-i2p\/i2pd,majestrate\/i2pd,brain5lug\/i2pd,majestrate\/i2pd,PurpleI2P\/i2pd,brain5lug\/i2pd,hypnosis-i2p\/i2pd,hypnosis-i2p\/i2pd,PurpleI2P\/i2pd,PurpleI2P\/i2pd,majestrate\/i2pd,hypnosis-i2p\/i2pd,hypnosis-i2p\/i2pd,majestrate\/i2pd,PurpleI2P\/i2pd,brain5lug\/i2pd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libi2pd\/I2PEndian.h\n+++ libi2pd\/I2PEndian.h\n@@ -3,10 +3,10 @@\n #include <inttypes.h>\n #include <string.h>\n \n-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)\n+#if defined(__FreeBSD__)\n+#include <sys\/endian.h>\n+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)\n #include <endian.h>\n-#elif __FreeBSD__\n-#include <sys\/endian.h>\n #elif defined(__APPLE__) && defined(__MACH__)\n \n #include <libkern\/OSByteOrder.h>\n"} {"commit":"c900d70a60e9f79c23d4db9e128ca93ffb427353","subject":"Add some more commentary to daemondo's source","message":"Add some more commentary to daemondo's source\n\nalso Xcode automatically changed the whitespace\n","repos":"cooljeanius\/MacPorts-fork,cooljeanius\/MacPorts-fork,cooljeanius\/MacPorts-fork,cooljeanius\/MacPorts-fork,cooljeanius\/MacPorts-fork","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/programs\/daemondo\/main.c\n+++ src\/programs\/daemondo\/main.c\n@@ -1,7 +1,7 @@\n \/* -*- mode: cc-mode; coding: utf-8; tab-width: 4; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=c:et:sw=4:ts=4:sts=4\n \n daemondo - main.c\n- \n+\n Copyright (c) 2005-2007 James Berry <jberry@macports.org>\n All rights reserved.\n \n@@ -16,7 +16,7 @@\n 3. Neither the name of The MacPorts Project nor the names of its contributors\n may be used to endorse or promote products derived from this software\n without specific prior written permission.\n- \n+\n THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n@@ -33,23 +33,27 @@\n *\/\n \n \/*\n+\tThis main.c is compiled into daemondo, which is a program that MacPorts\n+\tuses to help programs run under launchd.\n+\n Potentially useful System Configuration regex patterns:\n \n (backslash quoting below is only to protect the C comment)\n- State:\/Network\/Interface\/.*\\\/Link \n+ State:\/Network\/Interface\/.*\\\/Link\n State:\/Network\/Interface\/.*\\\/IPv4\n State:\/Network\/Interface\/.*\\\/IPv6\n- \n+\n State:\/Network\/Global\/DNS\n State:\/Network\/Global\/IPv4\n- \n+\n Potentially useful notifications from Darwin Notify Center:\n- \n+\n com.apple.system.config.network_change\n *\/\n \n-#if HAVE_CONFIG_H\n-#include <config.h>\n+\/\/ Includes\n+#ifdef HAVE_CONFIG_H\n+\t#include <config.h>\n #endif\n \n #include <stdio.h>\n@@ -71,6 +75,9 @@\n #include <IOKit\/pwr_mgt\/IOPMLib.h>\n #include <IOKit\/IOMessage.h>\n \n+\/\/ Defines\n+#define DAEMONDO_VERSION 1.1\n+\n \/\/ Constants\n const CFTimeInterval kChildDeathTimeout = 20.0;\n const CFTimeInterval kChildStartPidTimeout = 30.0;\n@@ -116,23 +123,27 @@\n int\t\t\t\t restartWait\t\t \t= 3; \t\/\/ Default wait during restart is 3 seconds\n \n \n+\/* LogMessage: A function to write a message to the system log.\n+ * Arguments: basically the same as printf's arguments\n+ * Return value: ???\n+ *\/\n void\n LogMessage(const char* fmt, ...)\n {\n struct tm tm;\n time_t timestamp;\n char datestring[32];\n- \n+\n \/\/ Format the date-time stamp\n time(×tamp);\n strftime(datestring, sizeof(datestring), \"%F %T\", localtime_r(×tamp, &tm));\n- \n+\n \/\/ Output the log header\n if (label != NULL)\n printf(\"%s %s: \", datestring, label);\n else\n printf(\"%s \", datestring);\n- \n+\n \/\/ Output the message\n va_list ap;\n va_start(ap, fmt);\n@@ -140,7 +151,11 @@\n va_end(ap);\n }\n \n-\n+\/* CatArray: Not really sure what this function does, but judging by the\n+ * name of it, I guess it concatenates an array?\n+ * Arguments: uh...\n+ * Return value: \"buf\"\n+ *\/\n const char*\n CatArray(const char* const* strarray, char* buf, size_t size)\n {\n@@ -158,18 +173,25 @@\n }\n \n \n+\/* DoVersion: Prints the version of daemondo.\n+ * Arguments: None\n+ * Return value: None\n+ *\/\n void\n DoVersion(void)\n {\n printf(\"daemondo, version 1.1\\n\\n\");\n }\n \n-\n+\/* DoHelp: Prints the help message for daemondo.\n+ * Arguments: None\n+ * Return value: None\n+ *\/\n void\n DoHelp(void)\n {\n DoVersion();\n- \n+\n const char* helpText =\n \"usage: daemondo [-hv] [--version]\\n\"\n \" --start-cmd prog args... ;\\n\"\n@@ -252,11 +274,15 @@\n \"monitored has exited.\\n\"\n \"\\n\"\n ;\n- \n+\n printf(\"%s\", helpText);\n }\n \n \n+\/* CreatePidFile: The pidfile created is needed for the process we use daemondo to run\n+ * Arguments: none\n+ * Return value: none\n+ *\/\n void\n CreatePidFile(void)\n {\n@@ -283,6 +309,10 @@\n }\n }\n \n+\/* DestroyPidFile: Cleans up after CreatePidFile (above)\n+ * Arguments: None\n+ * Return Value: None\n+ *\/\n void\n DestroyPidFile(void)\n {\n@@ -300,7 +330,7 @@\n \t\t\tif (verbosity >= 5)\n \t\t\t\tLogMessage(\"Attempting to delete pidfile %s\\n\", pidFile);\n if (unlink(pidFile) && verbosity >= 3)\n-\t\t\t\tLogMessage(\"Failed attempt to delete pidfile %s (%d)\\n\", pidFile, errno); \n+\t\t\t\tLogMessage(\"Failed attempt to delete pidfile %s (%d)\\n\", pidFile, errno);\n break;\n }\n } else {\n@@ -310,6 +340,10 @@\n }\n \n \n+\/* CheckForValidPidFile: Makes sure pid is good\n+ * Arguments: None\n+ * Return value: The valid pid file found.\n+ *\/\n pid_t\n CheckForValidPidFile(void)\n {\n@@ -324,15 +358,18 @@\n pid = -1;\n fclose(f);\n }\n- \n+\n \/\/ Check whether the pid represents a valid process\n if (pid != -1 && 0 != kill(pid, 0))\n pid = -1;\n- \n+\n return pid;\n }\n \n-\n+\/* DeletePreexistingPidFile: If there already is a pidfile, it might need to be deleted\n+ * Arguments: none\n+ * Return value: The preexisting pidfile that was deleted.\n+ *\/\n pid_t\n DeletePreexistingPidFile(void)\n {\n@@ -347,16 +384,16 @@\n pid = -1;\n fclose(f);\n }\n- \n+\n \/\/ Check whether the pid represents a valid process\n int valid = (pid != -1 && 0 != kill(pid, 0));\n- \n+\n \/\/ Log information about the discovered pid file\n if (verbosity >= 3 && pid != -1) {\n- \tLogMessage(\"Discovered preexisting pidfile %s containing pid %d which is a %s process\\n\", pidFile, pid, \n+ \tLogMessage(\"Discovered preexisting pidfile %s containing pid %d which is a %s process\\n\", pidFile, pid,\n \t\t(valid) ? \"valid\" : \"invalid\");\n }\n- \n+\n \/\/ Try to delete the pidfile if it's present\n if (pid != -1) {\n \t if (unlink(pidFile)) {\n@@ -367,21 +404,26 @@\n \t\t \t\tLogMessage(\"Deleted preexisting pidfile %s\\n\", pidFile);\n \t\t}\n \t}\n- \n+\n return pid;\n }\n \n-\n+\/* WaitForValidPidFile: Sometimes a valid pidfile will need to be generated first before anything can be done.\n+ * Arguments: None.\n+ * Return value: The valid pidfile that was found after waiting for it.\n+ * Notes: Requires CoreFoundation.\n+ *\/\n pid_t\n WaitForValidPidFile(void)\n {\n CFAbsoluteTime patience = CFAbsoluteTimeGetCurrent() + kChildStartPidTimeout;\n- \n- \/\/ Poll for a child process and pidfile to be generated, until we lose patience.\n+\n+ \/\/ Poll for a child process and pidfile to be generated, until we lose patience (literally: \"patience\" is a variable name).\n+\t\/\/ TODO: polling is generally considered bad; could there be a better way to do this?\n pid_t pid = -1;\n while ((pid = CheckForValidPidFile()) == -1 && (patience - CFAbsoluteTimeGetCurrent() > 0))\n sleep(1);\n- \n+\n if (verbosity >= 3)\n LogMessage(\"Discovered pid %d from pidfile %s\\n\", pid, pidFile);\n \n@@ -389,16 +431,20 @@\n }\n \n \n-\n+\/* MonitorChild: Watches a pidfile of a child process\n+ * Arguments: The pidfile of the child process to be monitored\n+ * Return value: none\n+ * Notes: uses kevent\n+ *\/\n void\n MonitorChild(pid_t childPid)\n {\n runningPid = childPid;\n- \n+\n if (runningPid != 0 && runningPid != -1) {\n if (verbosity >=3 )\n LogMessage(\"Start monitoring of pid %d via kevent\\n\", runningPid);\n- \n+\n \/\/ Monitor the process deaths for that pid\n struct kevent ke;\n EV_SET(&ke, childPid, EVFILT_PROC, EV_ADD | EV_ONESHOT, NOTE_EXIT, 0, NULL);\n@@ -407,14 +453,20 @@\n }\n }\n \n-\n+\/* UnmonitorChild: stops the MonitorChild function set up above\n+ * Arguments: None\n+ * Return value: None\n+ *\/\n void\n UnmonitorChild()\n {\n runningPid = 0;\n }\n \n-\n+\/* MonitoringChild: <description>\n+ * Arguments: None\n+ * Return value: int value of runningPid\n+ *\/\n int\n MonitoringChild()\n {\n@@ -430,10 +482,10 @@\n {\n if (verbosity >= 1)\n LogMessage(\"Target process %d has died\\n\", childPid);\n- \n+\n UnmonitorChild();\n DestroyPidFile();\n- \n+\n CFRunLoopStop(CFRunLoopGetCurrent());\n }\n }\n@@ -445,11 +497,11 @@\n \/\/ Wait for the death of a particular child\n int wait_result = 0;\n int wait_stat = 0;\n- \n+\n \/\/ Set up a timer for how long we'll wait for child death before we\n \/\/ kill the child outright with SIGKILL (infanticide)\n CFAbsoluteTime patience = CFAbsoluteTimeGetCurrent() + kChildDeathTimeout;\n- \n+\n \/\/ Wait for the death of child, calling into our run loop if it's not dead yet.\n \/\/ Note that the wait may actually be processed by our runloop callback, in which\n \/\/ case the wait here will simply return -1.\n@@ -463,7 +515,7 @@\n \/\/ We've run out of patience; kill the child with SIGKILL\n if (verbosity >= 3)\n LogMessage(\"Child %d didn't die; Killing with SIGKILL.\\n\", childPid);\n- \n+\n if (0 != kill(childPid, SIGKILL))\n {\n if (verbosity >= 3)\n@@ -471,7 +523,7 @@\n }\n }\n }\n- \n+\n \/\/ The child should be dead and gone by now.\n ProcessChildDeath(childPid);\n }\n@@ -493,13 +545,13 @@\n {\n if (!argv || !argv[0] || !*argv[0])\n return -1;\n- \n+\n pid_t pid = fork();\n switch (pid)\n {\n case 0:\n \/\/ In the child process\n- { \n+ {\n \/\/ Child process has no stdin, but shares stdout and stderr with us\n \/\/ Is that the right behavior?\n int nullfd = 0;\n@@ -509,18 +561,18 @@\n \n \/\/ Launch the child\n execvp(argv[0], (char* const*)argv);\n- \n+\n \/\/ We get here only if the exec fails.\n LogMessage(\"Unable to launch process %s.\\n\", argv[0]);\n _exit(1);\n }\n break;\n- \n+\n case -1:\n \/\/ error starting child process\n LogMessage(\"Unable to fork child process %s.\\n\", argv[0]);\n break;\n- \n+\n default:\n \/\/ In the original process\n if (sync)\n@@ -531,32 +583,32 @@\n }\n break;\n }\n- \n+\n return pid;\n }\n \n \n int\n Start(void)\n-{ \n+{\n char buf[1024];\n- \n+\n if (!startArgs || !startArgs[0])\n {\n LogMessage(\"There is nothing to start. No start-cmd was specified\\n\");\n return 2;\n }\n- \n+\n if (verbosity >= 1)\n LogMessage(\"Starting process\\n\");\n \tif (pidFile != NULL)\n \t\tDeletePreexistingPidFile();\n if (verbosity >= 2)\n LogMessage(\"Running start-cmd %s\\n\", CatArray(startArgs, buf, sizeof(buf)));\n- \n+\n \/\/ Exec the start-cmd\n pid_t pid = Exec(startArgs, pidStyle == kPidStyleNone);\n- \n+\n \/\/ Process error during Exec\n if (pid == -1)\n {\n@@ -566,17 +618,17 @@\n LogMessage(\"error while starting\\n\");\n return 2;\n }\n- \n+\n \/\/ Try to discover the pid of the running process\n switch (pidStyle)\n {\n case kPidStyleNone: \/\/ The command should have completed: we have no pid (should be zero)\n pid = -1;\n break;\n- \n+\n case kPidStyleExec: \/\/ The pid comes from the Exec\n break;\n- \n+\n case kPidStyleFileAuto: \/\/ Poll pid from the pidfile\n case kPidStyleFileClean:\n pid = WaitForValidPidFile();\n@@ -589,11 +641,11 @@\n return 2;\n }\n break;\n- \n+\n default:\n break;\n }\n- \n+\n \/\/ If we have a pid, then begin tracking it\n MonitorChild(pid);\n if (pid != 0 && pid != -1)\n@@ -601,10 +653,10 @@\n if (verbosity >= 1)\n LogMessage(\"Target process id is %d\\n\", pid);\n \n- \/\/ Create a pid file if we need to \n+ \/\/ Create a pid file if we need to\n CreatePidFile();\n }\n- \n+\n return 0;\n }\n \n@@ -623,10 +675,10 @@\n {\n if (verbosity >= 1)\n LogMessage(\"Stopping process %d\\n\", pid);\n- \n+\n \/\/ Send the process a SIGTERM to ask it to quit\n kill(pid, SIGTERM);\n- \n+\n \/\/ Wait for process to quit, killing it after a timeout\n WaitChildDeath(pid);\n }\n@@ -658,7 +710,7 @@\n UnmonitorChild();\n DestroyPidFile();\n }\n- \n+\n return 0;\n }\n \n@@ -673,28 +725,28 @@\n \/\/ We weren't given a restart command, so just use stop\/start\n if (verbosity >= 1)\n LogMessage(\"Restarting process\\n\");\n- \n+\n \/\/ Stop the process\n Stop();\n- \n+\n \/\/ Delay for a restartWait seconds to allow other process support to stabilize\n \/\/ (This gives a chance for other processes that might be monitoring the process,\n \/\/ for instance, to detect its death and cleanup).\n sleep(restartWait);\n- \n+\n \/\/ Start it again\n Start();\n }\n else\n {\n \t\/\/ Bug: we should recapture the target process id from the pidfile in this case\n- \t\n+\n \/\/ Execute the restart-cmd and trust it to do the job\n if (verbosity >= 1)\n LogMessage(\"Restarting process\\n\");\n if (verbosity >= 2)\n LogMessage(\"Running restart-cmd %s\\n\", CatArray(restartArgs, buf, sizeof(buf)));\n- \n+\n pid_t pid = Exec(restartArgs, TRUE);\n if (pid == -1)\n {\n@@ -705,7 +757,7 @@\n return 2;\n }\n }\n- \n+\n return 0;\n }\n \n@@ -715,7 +767,7 @@\n {\n if (verbosity >= 3)\n LogMessage(\"Scheduled restart time has arrived.\\n\");\n- \n+\n \/\/ Our scheduled restart fired, so restart now\n Restart();\n }\n@@ -740,7 +792,7 @@\n {\n \/\/ Cancel any currently scheduled restart\n CancelScheduledRestart();\n- \n+\n \/\/ Schedule a new restart\n restartTimer = CFRunLoopTimerCreate(NULL, absoluteTime, 0, 0, 0, ScheduledRestartCallback, NULL);\n if (restartTimer)\n@@ -772,7 +824,7 @@\n {\n char bigBuf[1024];\n *bigBuf = '\\0';\n- \n+\n CFIndex cnt = CFArrayGetCount(changedKeys);\n CFIndex i;\n for (i = 0; i < cnt; ++i)\n@@ -787,7 +839,7 @@\n \n LogMessage(\"Restarting daemon because of the following changes in the dynamic store: %s\\n\", bigBuf);\n }\n- \n+\n ScheduleDelayedRestart();\n }\n \n@@ -830,7 +882,7 @@\n CFStringGetCString(name, buf, sizeof(buf), kCFStringEncodingUTF8);\n LogMessage(\"Restarting daemon due to receipt of the notification %s\\n\", buf);\n }\n- \n+\n ScheduleDelayedRestart();\n }\n \n@@ -841,7 +893,7 @@\n mach_msg_header_t* hdr = (mach_msg_header_t*)msg;\n switch (hdr->msgh_id)\n {\n- case SIGTERM: \n+ case SIGTERM:\n \/\/ On receipt of SIGTERM we set our terminate flag and stop the process\n if (!terminating)\n {\n@@ -851,18 +903,18 @@\n Stop();\n }\n break;\n- \n+\n case SIGHUP:\n if (verbosity >= 1)\n LogMessage(\"SIGHUP received\\n\");\n if (!terminating)\n Restart();\n break;\n- \n+\n case SIGCHLD:\n CheckChildren();\n break;\n- \n+\n default:\n break;\n }\n@@ -873,20 +925,20 @@\n CFDataRef address UNUSED, const void *data UNUSED, void *context UNUSED)\n {\n int fd = CFSocketGetNative(socketRef);\n- \n+\n struct kevent event;\n memset(&event, 0x00, sizeof(struct kevent));\n- \n+\n if (kevent(fd, NULL, 0, &event, 1, NULL) == -1) {\n LogMessage(\"Couldn't get kevent. Error %d\/%s\\n\", errno, strerror(errno));\n } else {\n if (event.fflags & NOTE_EXIT) {\n- \n+\n pid_t pid = event.ident;\n- \n+\n if (verbosity >= 3)\n LogMessage(\"Received kevent: pid %d has exited\\n\", pid);\n- \n+\n ProcessChildDeath(pid);\n } else\n LogMessage(\"Unexpected kevent received: %d\\n\", event.fflags);\n@@ -919,7 +971,7 @@\n header.msgh_local_port = MACH_PORT_NULL;\n header.msgh_reserved = 0;\n header.msgh_id = sig;\n- \n+\n mach_msg_return_t status = mach_msg_send(&header);\n if (status != 0) {\n LogMessage(\"mach_msg_send failed in handle_child_signal!\\n\");\n@@ -939,7 +991,7 @@\n header.msgh_local_port = MACH_PORT_NULL;\n header.msgh_reserved = 0;\n header.msgh_id = sig;\n- \n+\n mach_msg_return_t status = mach_msg_send(&header);\n if (status != 0) {\n LogMessage(\"mach_msg_send failed in handle_generic_signal!\\n\");\n@@ -951,23 +1003,23 @@\n MainLoop(void)\n {\n \/\/ *** TODO: This routine needs more error checking\n- \n+\n int status = 0;\n- \n+\n if (verbosity >= 3)\n LogMessage(\"Initializing; daemondo pid is %d\\n\", getpid());\n- \n+\n \/\/ === Setup Notifications of Changes to System Configuration ===\n \/\/ Create a new SCDynamicStore session and an associated runloop source, adding it default mode\n SCDynamicStoreRef dsRef = SCDynamicStoreCreate(NULL, kProgramName, DynamicStoreChanged, NULL);\n CFRunLoopSourceRef dsSrc = SCDynamicStoreCreateRunLoopSource(NULL, dsRef, 0);\n CFRunLoopAddSource(CFRunLoopGetCurrent(), dsSrc, kCFRunLoopDefaultMode);\n- \n+\n \/\/ Tell the DynamicStore which keys to notify us on: this is the set of keys on which the\n \/\/ daemon will be restarted, at least for now--we may want to give more flexibility at some point.\n (void) SCDynamicStoreSetNotificationKeys(dsRef, NULL, scRestartPatterns);\n- \n- \n+\n+\n \/\/ === Setup Notifications from Notification Centers ===\n CFArrayApplyFunction(distNotifyNames, CFRangeMake(0, CFArrayGetCount(distNotifyNames)),\n AddNotificationToCenter, CFNotificationCenterGetDistributedCenter());\n@@ -982,33 +1034,33 @@\n pwrRootPort = IORegisterForSystemPower(0, &powerRef, PowerCallBack, &pwrNotifier);\n if (pwrRootPort != 0)\n CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(powerRef), kCFRunLoopDefaultMode);\n- \n- \n+\n+\n \/\/ === Setup Notifications of Signals ===\n \/\/ Add a mach port source to our runloop for handling of the signals\n CFMachPortRef sigChildPort = CFMachPortCreate(NULL, SignalCallback, NULL, NULL);\n CFMachPortRef sigGenericPort = CFMachPortCreate(NULL, SignalCallback, NULL, NULL);\n- \n+\n CFRunLoopSourceRef sigChildSrc = CFMachPortCreateRunLoopSource(NULL, sigChildPort, 0);\n CFRunLoopSourceRef sigGenericSrc = CFMachPortCreateRunLoopSource(NULL, sigGenericPort, 0);\n- \n- \n+\n+\n \/\/ === Setup kevent notifications of process death\n kqfd = kqueue();\n CFSocketRef kqSocket = CFSocketCreateWithNative(NULL, kqfd,\n kCFSocketReadCallBack, KQueueCallBack, NULL);\n- CFRunLoopSourceRef kqueueSrc = CFSocketCreateRunLoopSource(NULL, kqSocket, 0); \n- \n- \n+ CFRunLoopSourceRef kqueueSrc = CFSocketCreateRunLoopSource(NULL, kqSocket, 0);\n+\n+\n \/\/ Add only the child signal sources to the childwatch mode\n CFRunLoopAddSource(CFRunLoopGetCurrent(), sigChildSrc, kChildWatchMode);\n CFRunLoopAddSource(CFRunLoopGetCurrent(), kqueueSrc, kChildWatchMode);\n- \n+\n \/\/ Add both child and generic signal sources to the default mode\n CFRunLoopAddSource(CFRunLoopGetCurrent(), sigChildSrc, kCFRunLoopDefaultMode);\n CFRunLoopAddSource(CFRunLoopGetCurrent(), kqueueSrc, kCFRunLoopDefaultMode);\n CFRunLoopAddSource(CFRunLoopGetCurrent(), sigGenericSrc, kCFRunLoopDefaultMode);\n- \n+\n \/\/ Install signal handlers\n sigChild_m_port = CFMachPortGetPort(sigChildPort);\n sigGeneric_m_port = CFMachPortGetPort(sigGenericPort);\n@@ -1016,49 +1068,49 @@\n signal(SIGCHLD, handle_child_signal);\n signal(SIGTERM, handle_generic_signal);\n signal(SIGHUP, handle_generic_signal);\n- \n- \n+\n+\n \/\/ === Core Loop ===\n \/\/ Start the daemon\n status = Start();\n- \n+\n if (verbosity >= 3)\n LogMessage(\"Start event loop\\n\");\n- \n+\n \/\/ Run the run loop until we stop it, or until the process we're tracking stops\n while (status == 0 && !terminating && MonitoringChild())\n CFRunLoopRunInMode(kCFRunLoopDefaultMode, 99999999.0, true);\n- \n+\n if (verbosity >= 3)\n LogMessage(\"End event loop\\n\");\n- \n- \n+\n+\n \/\/ === Tear Down (we don't really need to do all of this) ===\n \/\/ The daemon should by now have either been stopped, or stopped of its own accord\n- \n+\n \/\/ Remove signal handlers\n signal(SIGTERM, SIG_DFL);\n signal(SIGHUP, SIG_DFL);\n signal(SIGCHLD, SIG_DFL);\n- \n+\n sigChild_m_port = 0;\n sigGeneric_m_port = 0;\n- \n+\n \/\/ Remove run loop sources\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), sigChildSrc, kChildWatchMode);\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), kqueueSrc, kChildWatchMode);\n- \n+\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), sigChildSrc, kCFRunLoopDefaultMode);\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), kqueueSrc, kCFRunLoopDefaultMode);\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), sigGenericSrc, kCFRunLoopDefaultMode);\n- \n+\n \/\/ Tear down signal handling infrastructure\n CFRelease(sigChildSrc);\n CFRelease(sigGenericSrc);\n- \n+\n CFRelease(sigChildPort);\n CFRelease(sigGenericPort);\n- \n+\n \/\/ Tear down kqueue infrastructure\n CFRelease(kqueueSrc);\n CFRelease(kqSocket);\n@@ -1066,10 +1118,10 @@\n \n \/\/ Tear down DynamicStore stuff\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), dsSrc, kCFRunLoopDefaultMode);\n- \n+\n CFRelease(dsSrc);\n CFRelease(dsRef);\n- \n+\n \/\/ Tear down notifications from Notification Center\n CFNotificationCenterRemoveEveryObserver(CFNotificationCenterGetDistributedCenter(), kProgramName);\n CFNotificationCenterRemoveEveryObserver(CFNotificationCenterGetDarwinNotifyCenter(), kProgramName);\n@@ -1077,11 +1129,11 @@\n \/\/ Tear down power management stuff\n CFRunLoopRemoveSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(powerRef), kCFRunLoopDefaultMode);\n IODeregisterForSystemPower(&pwrNotifier);\n- \n+\n if (verbosity >= 3)\n LogMessage(\"Terminating\\n\");\n- \n- return status; \n+\n+ return status;\n }\n \n \n@@ -1092,25 +1144,25 @@\n int moreArgs = 0;\n for (; moreArgs < argc && 0 != strcmp(\";\", argv[moreArgs]); ++moreArgs)\n ;\n- \n+\n \/\/ We were given one argument for free\n int nargs = moreArgs + 1;\n- \n+\n \/\/ Allocate an array for the arguments\n *args = calloc(sizeof(char**), nargs+1);\n if (!*args)\n return 0;\n- \n+\n \/\/ Copy the arguments into our new array\n (*(char***)args)[0] = arg1;\n- \n+\n int i;\n for (i = 0; i < moreArgs; ++i)\n (*(char***)args)[i+1] = argv[i];\n- \n+\n \/\/ NULL-terminate the argument array\n (*(char***)args)[nargs] = NULL;\n- \n+\n \/\/ Return number of args we consumed, accounting for potential trailing \";\"\n return (moreArgs == argc) ? moreArgs : moreArgs + 1;\n }\n@@ -1131,7 +1183,7 @@\n \/\/ Let CollectCmdArgs do the grunt work\n const char* const* args = NULL;\n int argsUsed = CollectCmdArgs(arg1, argc, argv, &args);\n- \n+\n \/\/ Add arguments to the mutable array\n if (args != NULL)\n {\n@@ -1140,7 +1192,7 @@\n AddSingleArrayArg(*argp, array);\n free((void*)args);\n }\n- \n+\n return argsUsed;\n }\n \n@@ -1163,45 +1215,45 @@\n main(int argc, char* argv[])\n {\n int status = 0;\n- \n+\n \/\/ Initialization\n kProgramName = CFSTR(\"daemondo\");\n kChildWatchMode = CFSTR(\"ChildWatch\"); \/\/ A runloop mode\n- \n+\n scRestartPatterns = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);\n distNotifyNames = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);\n darwinNotifyNames = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);\n- \n+\n \/\/ Make stdout flush after every line\n setvbuf(stdout, (char *)NULL, _IOLBF, 0);\n- \n+\n \/\/ Process arguments\n static struct option longopts[] = {\n \/\/ Start\/Stop\/Restart the process\n { \"start-cmd\", required_argument, 0, 's' },\n { \"stop-cmd\", required_argument, 0, 'k' },\n { \"restart-cmd\", required_argument, 0, 'r' },\n- \n+\n \/\/ Dynamic Store Keys to monitor\n { \"restart-config\", required_argument, 0, kRestartConfigOpt },\n- \n+\n \/\/ Notifications to monitor\n { \"restart-dist-notify\",\n required_argument, 0, kRestartDistNotifyOpt },\n { \"restart-darwin-notify\",\n required_argument, 0, kRestartDarwinNotifyOpt },\n- \n+\n \/\/ Control over behavior on power state\n { \"restart-wakeup\", no_argument, 0, kRestartWakeupOpt },\n \n \/\/ Short-cuts\n { \"restart-netchange\",\n no_argument, 0, kRestartNetChangeOpt },\n- \n+\n \/\/ Pid-files\n { \"pid\", required_argument, 0, kPidOpt },\n { \"pidfile\", required_argument, 0, kPidFileOpt },\n- \n+\n \/\/ other\n { \"help\", no_argument, 0, 'h' },\n { \"v\", no_argument, 0, 'v' },\n@@ -1212,7 +1264,7 @@\n required_argument, 0, kRestartHysteresisOpt },\n { \"restart-wait\",\n required_argument, 0, kRestartWaitOpt },\n- \n+\n { 0, 0, 0, 0 }\n };\n \n@@ -1227,7 +1279,7 @@\n printf(\"Option error: missing argument for option %s\\n\", longopts[optindex].name);\n exit(1);\n break;\n- \n+\n case 's':\n if (startArgs)\n {\n@@ -1240,7 +1292,7 @@\n optreset = 1;\n }\n break;\n- \n+\n case 'k':\n if (stopArgs)\n {\n@@ -1266,42 +1318,42 @@\n optreset = 1;\n }\n break;\n- \n+\n case kRestartConfigOpt:\n optind += CollectArrayArgs(optarg, argc - optind, argv + optind, scRestartPatterns);\n optreset = 1;\n break;\n- \n+\n case kRestartDistNotifyOpt:\n optind += CollectArrayArgs(optarg, argc - optind, argv + optind, distNotifyNames);\n optreset = 1;\n break;\n- \n+\n case kRestartDarwinNotifyOpt:\n optind += CollectArrayArgs(optarg, argc - optind, argv + optind, darwinNotifyNames);\n optreset = 1;\n break;\n- \n+\n case kRestartWakeupOpt:\n restartOnWakeup = TRUE;\n break;\n- \n+\n case kRestartNetChangeOpt:\n AddSingleArrayArg(\"com.apple.system.config.network_change\", darwinNotifyNames);\n break;\n- \n+\n case kRestartHysteresisOpt:\n restartHysteresis = strtof(optarg, NULL);\n if (restartHysteresis < 0)\n restartHysteresis = 0;\n break;\n- \n+\n case kRestartWaitOpt:\n restartWait = strtol(optarg, NULL, 10);\n if (restartWait < 0)\n restartWait = 0;\n break;\n- \n+\n case kPidOpt:\n if (0 == strcasecmp(optarg, \"none\"))\n pidStyle = kPidStyleNone;\n@@ -1316,46 +1368,46 @@\n LogMessage(\"Unexpected pid style %s\\n\", optarg);\n }\n break;\n- \n+\n case kPidFileOpt:\n if (pidFile != NULL)\n free((char*)pidFile);\n pidFile = strdup(optarg);\n break;\n- \n+\n case 'h':\n DoHelp();\n exit(0);\n break;\n- \n+\n case 'l':\n if (label != NULL)\n free((char*)label);\n label = strdup(optarg);\n break;\n- \n+\n case 'v':\n ++verbosity;\n break;\n- \n+\n case kVerbosityOpt:\n if (optarg)\n verbosity = strtol(optarg, NULL, 10);\n else\n ++verbosity;\n break;\n- \n+\n case 'V':\n DoVersion();\n break;\n- \n+\n default:\n LogMessage(\"unexpected parameter: %s\\n\", argv[optind]);\n status = 1;\n break;\n }\n }\n- \n+\n \/\/ Default the pid style if it wasn't given\n if (pidStyle == kPidStyleUnknown)\n {\n@@ -1364,12 +1416,12 @@\n else\n pidStyle = kPidStyleNone;\n }\n- \n+\n \/\/ Go into our main loop\n if (status == 0 && startArgs)\n status = MainLoop();\n else\n printf(\"use option --help for help\\n\");\n- \n+\n return status;\n }\n"} {"commit":"56235a931962bd752b4160888946d2be699fb516","subject":"BUG(2371): Only import top path.","message":"BUG(2371): Only import top path.\n","repos":"theefer\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,chrippa\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,six600110\/xmms2,chrippa\/xmms2,theefer\/xmms2,six600110\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,theefer\/xmms2,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,chrippa\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,theefer\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,six600110\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman,oneman\/xmms2-oneman,six600110\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/medialib-updater\/main.c\n+++ src\/clients\/medialib-updater\/main.c\n@@ -204,9 +204,8 @@\n updater_add_watcher (updater_t *updater, GFile *file)\n {\n \tGFileMonitor *monitor;\n-\txmmsc_result_t *res;\n \tGError *err = NULL;\n-\tgchar *path, *url;\n+\tgchar *path;\n \n \tg_return_val_if_fail (updater, FALSE);\n \tg_return_val_if_fail (file, FALSE);\n@@ -231,14 +230,32 @@\n \t\/* path ownership transfered to the hash *\/\n \tg_hash_table_insert (updater->watchers, path, monitor);\n \n+\tupdater_find_sub_directories (updater, file);\n+\n+\treturn TRUE;\n+}\n+\n+static gboolean\n+updater_add_watcher_and_import (updater_t *updater, GFile *file)\n+{\n+\txmmsc_result_t *res;\n+\tgchar *url, *path;\n+\n+\tg_return_val_if_fail (updater, FALSE);\n+\tg_return_val_if_fail (file, FALSE);\n+\n+\tif (!updater_add_watcher (updater, file)) {\n+\t\treturn FALSE;\n+\t}\n+\n+\tpath = g_file_get_path (file);\n \turl = g_strdup_printf (\"file:\/\/%s\", path);\n+\tg_free (path);\n \n \tres = xmmsc_medialib_import_path (updater->conn, url);\n \txmmsc_result_unref (res);\n \n \tg_free (url);\n-\n-\tupdater_find_sub_directories (updater, file);\n \n \treturn TRUE;\n }\n@@ -265,10 +282,6 @@\n \n \/**\n * TODO: Maybe this should support colon separated dirs in the future\n- * TODO: Maybe add directories to a queue that resolves in the background\n- * and post switch_directory we clear that queue\/list and only emit\n- * the top path? Perhaps always a good idea to always minimize the\n- * queue on each timeout_poll?\n *\/\n static gboolean\n updater_switch_directory (updater_t *updater, const gchar *path)\n@@ -289,7 +302,7 @@\n \t}\n \n \tupdater_clear_watchers (updater);\n-\tupdater_add_watcher (updater, file);\n+\tupdater_add_watcher_and_import (updater, file);\n \tg_object_unref (file);\n \n \treturn TRUE;\n@@ -563,7 +576,7 @@\n \tswitch (type) {\n \tcase G_FILE_TYPE_DIRECTORY:\n \t\tg_debug (\"directory created\");\n-\t\tupdater_add_watcher (updater, entity);\n+\t\tupdater_add_watcher_and_import (updater, entity);\n \t\tbreak;\n \tcase G_FILE_TYPE_REGULAR:\n \t\tg_debug (\"file created\");\n"} {"commit":"3152b04bb4d4962ee611a885be76d2443f478688","subject":"Update.","message":"Update.\n\n2004\/01\/27 21:49:09-08:00 hp.com!davidm\nRename: src\/_UPT_access_mem.c -> src\/ptrace\/_UPT_access_mem.c\n\n(Logical change 1.162)\n","repos":"dropbox\/libunwind,maltek\/platform_external_libunwind,wdv4758h\/libunwind,vtjnash\/libunwind,igprof\/libunwind,olibc\/libunwind,geekboxzone\/lollipop_external_libunwind,project-zerus\/libunwind,0xlab\/0xdroid-external_libunwind,0xlab\/0xdroid-external_libunwind,djwatson\/libunwind,Keno\/libunwind,krytarowski\/libunwind,DroidSim\/platform_external_libunwind,atanasyan\/libunwind-android,android-ia\/platform_external_libunwind,adsharma\/libunwind,Keno\/libunwind,tronical\/libunwind,yuyichao\/libunwind,CyanogenMod\/android_external_libunwind,zeldin\/platform_external_libunwind,fillexen\/libunwind,olibc\/libunwind,jrmuizel\/libunwind,dreal-deps\/libunwind,DroidSim\/platform_external_libunwind,joyent\/libunwind,cms-externals\/libunwind,mpercy\/libunwind,SyndicateRogue\/libunwind,atanasyan\/libunwind,project-zerus\/libunwind,android-ia\/platform_external_libunwind,vtjnash\/libunwind,vegard\/libunwind,djwatson\/libunwind,libunwind\/libunwind,zliu2014\/libunwind-tilegx,geekboxzone\/mmallow_external_libunwind,tkelman\/libunwind,zeldin\/platform_external_libunwind,wdv4758h\/libunwind,lat\/libunwind,fillexen\/libunwind,CyanogenMod\/android_external_libunwind,atanasyan\/libunwind,tony\/libunwind,androidarmv6\/android_external_libunwind,atanasyan\/libunwind-android,Keno\/libunwind,maltek\/platform_external_libunwind,rntz\/libunwind,jrmuizel\/libunwind,Chilledheart\/libunwind,evaautomation\/libunwind,rogwfu\/libunwind,igprof\/libunwind,frida\/libunwind,frida\/libunwind,joyent\/libunwind,DroidSim\/platform_external_libunwind,zliu2014\/libunwind-tilegx,dreal-deps\/libunwind,atanasyan\/libunwind,project-zerus\/libunwind,bo-on-software\/libunwind,atanasyan\/libunwind-android,igprof\/libunwind,martyone\/libunwind,vegard\/libunwind,bo-on-software\/libunwind,fdoray\/libunwind,fdoray\/libunwind,adsharma\/libunwind,Chilledheart\/libunwind,martyone\/libunwind,rogwfu\/libunwind,joyent\/libunwind,libunwind\/libunwind,unkadoug\/libunwind,vtjnash\/libunwind,pathscale\/libunwind,tony\/libunwind,rntz\/libunwind,krytarowski\/libunwind,jrmuizel\/libunwind,zliu2014\/libunwind-tilegx,lat\/libunwind,dagar\/libunwind,mpercy\/libunwind,0xlab\/0xdroid-external_libunwind,ehsan\/libunwind,lat\/libunwind,tronical\/libunwind,dagar\/libunwind,dropbox\/libunwind,dreal-deps\/libunwind,tkelman\/libunwind,evaautomation\/libunwind,rantala\/libunwind,djwatson\/libunwind,geekboxzone\/lollipop_external_libunwind,wdv4758h\/libunwind,adsharma\/libunwind,mpercy\/libunwind,androidarmv6\/android_external_libunwind,ehsan\/libunwind,androidarmv6\/android_external_libunwind,tronical\/libunwind,vegard\/libunwind,maltek\/platform_external_libunwind,dropbox\/libunwind,bo-on-software\/libunwind,evaautomation\/libunwind,ehsan\/libunwind,rntz\/libunwind,yuyichao\/libunwind,Chilledheart\/libunwind,rantala\/libunwind,geekboxzone\/lollipop_external_libunwind,martyone\/libunwind,krytarowski\/libunwind,zeldin\/platform_external_libunwind,cloudius-systems\/libunwind,unkadoug\/libunwind,geekboxzone\/mmallow_external_libunwind,cms-externals\/libunwind,SyndicateRogue\/libunwind,geekboxzone\/mmallow_external_libunwind,pathscale\/libunwind,CyanogenMod\/android_external_libunwind,tony\/libunwind,tkelman\/libunwind,pathscale\/libunwind,cloudius-systems\/libunwind,libunwind\/libunwind,olibc\/libunwind,cms-externals\/libunwind,android-ia\/platform_external_libunwind,unkadoug\/libunwind,yuyichao\/libunwind,frida\/libunwind,rantala\/libunwind,dagar\/libunwind,rogwfu\/libunwind,cloudius-systems\/libunwind,fdoray\/libunwind,SyndicateRogue\/libunwind,fillexen\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ptrace\/_UPT_access_mem.c\n+++ src\/ptrace\/_UPT_access_mem.c\n@@ -0,0 +1,59 @@\n+\/* libunwind - a platform-independent unwind library\n+ Copyright (C) 2003-2004 Hewlett-Packard Co\n+\tContributed by David Mosberger-Tang <davidm@hpl.hp.com>\n+\n+This file is part of libunwind.\n+\n+Permission is hereby granted, free of charge, to any person obtaining\n+a copy of this software and associated documentation files (the\n+\"Software\"), to deal in the Software without restriction, including\n+without limitation the rights to use, copy, modify, merge, publish,\n+distribute, sublicense, and\/or sell copies of the Software, and to\n+permit persons to whom the Software is furnished to do so, subject to\n+the following conditions:\n+\n+The above copyright notice and this permission notice shall be\n+included in all copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\n+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\n+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *\/\n+\n+#include \"_UPT_internal.h\"\n+\n+int\n+_UPT_access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val,\n+\t\t int write, void *arg)\n+{\n+ struct UPT_info *ui = arg;\n+ pid_t pid = ui->pid;\n+\n+ errno = 0;\n+ if (write)\n+ {\n+ Debug (16, \"%s: mem[%lx] <- %lx\\n\", (long) addr, (long) *val);\n+#ifdef HAVE_TTRACE\n+#\twarning No support for ttrace() yet.\n+#else\n+ ptrace (PTRACE_POKEDATA, pid, addr, *val);\n+ if (errno)\n+\treturn -UNW_EINVAL;\n+#endif\n+ }\n+ else\n+ {\n+#ifdef HAVE_TTRACE\n+#\twarning No support for ttrace() yet.\n+#else\n+ *val = ptrace (PTRACE_PEEKDATA, pid, addr, 0);\n+ if (errno)\n+\treturn -UNW_EINVAL;\n+#endif\n+ Debug (16, \"%s: mem[%lx] -> %lx\\n\", (long) addr, (long) *val);\n+ }\n+ return 0;\n+}\n"} {"commit":"01f16797c79bd7bdbd9f2675d7f29f8ba70f4436","subject":"Fixed build without tinystl.","message":"Fixed build without tinystl.\n","repos":"attilaz\/bgfx,MikePopoloski\/bgfx,jpcy\/bgfx,bkaradzic\/bgfx,Synxis\/bgfx,emoon\/bgfx,LWJGL-CI\/bgfx,LWJGL-CI\/bgfx,mmicko\/bgfx,Synxis\/bgfx,emoon\/bgfx,bkaradzic\/bgfx,jpcy\/bgfx,jpcy\/bgfx,LWJGL-CI\/bgfx,septag\/bgfx,attilaz\/bgfx,fluffyfreak\/bgfx,jdryg\/bgfx,jpcy\/bgfx,jdryg\/bgfx,jdryg\/bgfx,bkaradzic\/bgfx,mmicko\/bgfx,fluffyfreak\/bgfx,mendsley\/bgfx,mendsley\/bgfx,septag\/bgfx,jdryg\/bgfx,emoon\/bgfx,MikePopoloski\/bgfx,septag\/bgfx,mmicko\/bgfx,LWJGL-CI\/bgfx,Synxis\/bgfx,bkaradzic\/bgfx,mendsley\/bgfx,attilaz\/bgfx,fluffyfreak\/bgfx,fluffyfreak\/bgfx,MikePopoloski\/bgfx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bgfx_p.h\n+++ src\/bgfx_p.h\n@@ -178,6 +178,7 @@\n #\tinclude <unordered_map>\n #\tinclude <unordered_set>\n #\tinclude <vector>\n+namespace stl = std;\n #endif \/\/ BGFX_CONFIG_USE_TINYSTL\n \n #if BX_PLATFORM_ANDROID\n"} {"commit":"0dbf53372fd8f31925901eb735d5f0cd73c16f32","subject":"virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks","message":"virQEMUCapsInitQMPVersionCaps: Remove unneeded version checks\n\nNow that minimum supported qemu version is 2.11, we can remove the\nconditions.\n\nNote that the check enabling QEMU_CAPS_TCG was for < 2.10.\n\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: Pavel Hrdina <d4772d05997b8abf035041e3b4f4996380ea7e7a@redhat.com>\nReviewed-by: Neal Gompa <8135daa3762340227c0c67f1c47ad07a127bd3a3@gmail.com>\nReviewed-by: Pavel Hrdina <d4772d05997b8abf035041e3b4f4996380ea7e7a@redhat.com>\n","repos":"zippy2\/libvirt,zippy2\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,olafhering\/libvirt,libvirt\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,olafhering\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,olafhering\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_capabilities.c\n+++ src\/qemu\/qemu_capabilities.c\n@@ -5115,65 +5115,30 @@\n static void\n virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)\n {\n- if (qemuCaps->version >= 1006000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);\n-\n- \/* vmport option is supported v2.2.0 onwards *\/\n- if (qemuCaps->version >= 2002000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);\n+ \/* Following caps were asserted by a version check for pre 2.11 qemus *\/\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);\n+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);\n \n \/* -cpu ...,aarch64=off supported in v2.3.0 and onwards. But it\n isn't detectable via qmp at this point *\/\n- if (qemuCaps->arch == VIR_ARCH_AARCH64 &&\n- qemuCaps->version >= 2003000)\n+ if (qemuCaps->arch == VIR_ARCH_AARCH64)\n virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);\n \n- \/* vhost-user supports multi-queue from v2.4.0 onwards,\n- * but there is no way to query for that capability *\/\n- if (qemuCaps->version >= 2004000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);\n-\n- \/* smm option is supported from v2.4.0 *\/\n- if (qemuCaps->version >= 2004000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);\n-\n- \/* sdl -gl option is supported from v2.4.0 (qemu commit id 0b71a5d5) *\/\n- if (qemuCaps->version >= 2004000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL_GL);\n-\n- \/* Since 2.4.50 ARM virt machine supports gic-version option *\/\n- if (qemuCaps->version >= 2004050)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);\n-\n- \/* no way to query if -machine kernel_irqchip supports split *\/\n- if (qemuCaps->version >= 2006000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);\n-\n- \/* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately\n- * there's no sane way to probe for it *\/\n- if (qemuCaps->version >= 2010000 &&\n- ARCH_IS_PPC64(qemuCaps->arch)) {\n+ if (ARCH_IS_PPC64(qemuCaps->arch)) {\n+ \/* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately\n+ * there's no sane way to probe for it *\/\n virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);\n- }\n-\n- \/* '-display egl-headless' cmdline option is supported since QEMU 2.10, but\n- * there's no way to probe it *\/\n- if (qemuCaps->version >= 2010000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);\n-\n- \/* no way to query for -numa dist *\/\n- if (qemuCaps->version >= 2010000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);\n-\n- \/* no way to query max-cpu-compat *\/\n- if (qemuCaps->version >= 2010000 &&\n- ARCH_IS_PPC64(qemuCaps->arch)) {\n+\n+ \/* no way to query max-cpu-compat *\/\n virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);\n }\n-\n- \/* TCG couldn't be disabled nor queried until QEMU 2.10 *\/\n- if (qemuCaps->version < 2010000)\n- virQEMUCapsSet(qemuCaps, QEMU_CAPS_TCG);\n \n \/* -enable-fips is deprecated in QEMU 5.2.0, and QEMU\n * should be built with gcrypt to achieve FIPS compliance\n"} {"commit":"6df29d0816895b2bf55d6d438afeca7bc71646d2","subject":"qemu: capabilities: Tolerate missing @qemuCaps in virQEMUCapsSupportsGICVersion","message":"qemu: capabilities: Tolerate missing @qemuCaps in virQEMUCapsSupportsGICVersion\n\nReport the given GIC version as unsupported if @qemuCapsi is NULL. This\nwill be helpful to run post parse callbacks even if qemu is not\ncurrently installed.\n","repos":"crobinso\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,zippy2\/libvirt,crobinso\/libvirt,fabianfreyer\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,zippy2\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,eskultety\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/qemu\/qemu_capabilities.c\n+++ src\/qemu\/qemu_capabilities.c\n@@ -5676,7 +5676,8 @@\n * @version: GIC version\n *\n * Checks the QEMU binary with capabilities @qemuCaps supports a specific\n- * GIC version for a domain of type @virtType.\n+ * GIC version for a domain of type @virtType. If @qemuCaps is NULL, the GIC\n+ * @version is considered unsupported.\n *\n * Returns: true if the binary supports the requested GIC version, false\n * otherwise\n@@ -5687,6 +5688,9 @@\n virGICVersion version)\n {\n size_t i;\n+\n+ if (!qemuCaps)\n+ return false;\n \n for (i = 0; i < qemuCaps->ngicCapabilities; i++) {\n virGICCapabilityPtr cap = &(qemuCaps->gicCapabilities[i]);\n"} {"commit":"7c7028480713a4b7a5c1994633fce09e77795f28","subject":"Add licence.","message":"Add licence.\n","repos":"alnsn\/bpfjit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/bpfjit.c\n+++ src\/bpfjit.c\n@@ -1,3 +1,32 @@\n+\/*-\n+ * Copyright (c) 2011 Alexander Nasonov.\n+ * All rights reserved.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * 1. Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * 2. Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and\/or other materials provided with the\n+ * distribution.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,\n+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED\n+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\n+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT\n+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n+ * SUCH DAMAGE.\n+ *\/\n+\n #include \"bpfjit.h\"\n \n #include <assert.h>\n"} {"commit":"230655ba06e3105200b8ab0a82d4f9f3a0802f2a","subject":"virDomainCheckpointAlignDisks: Unbreak error message","message":"virDomainCheckpointAlignDisks: Unbreak error message\n\nSigned-off-by: Peter Krempa <2cf5c04c61aa466e4a47bfedc747d17279c72ffc@redhat.com>\nReviewed-by: J\u00e1n Tomko <4cab11cfb98d3c937327354a78eb07dbb6ee2bc6@redhat.com>\n","repos":"olafhering\/libvirt,libvirt\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,zippy2\/libvirt,olafhering\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,crobinso\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,crobinso\/libvirt,zippy2\/libvirt,libvirt\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/checkpoint_conf.c\n+++ src\/conf\/checkpoint_conf.c\n@@ -312,8 +312,7 @@\n \/* Unlikely to have a guest without disks but technically possible. *\/\n if (!def->parent.dom->ndisks) {\n virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n- _(\"domain must have at least one disk to perform \"\n- \"checkpoints\"));\n+ _(\"domain must have at least one disk to perform checkpoints\"));\n return -1;\n }\n \n"} {"commit":"96ced4ea51df8d2816b5e0e97203be38949aa2b0","subject":"bplist: Improve writing of offset table","message":"bplist: Improve writing of offset table\n","repos":"libimobiledevice\/libplist,libimobiledevice\/libplist,libimobiledevice\/libplist,libimobiledevice-win32\/libplist,Tatsh\/libplist,libimobiledevice-win32\/libplist,Tatsh\/libplist,libimobiledevice-win32\/libplist,libimobiledevice-win32\/libplist,Tatsh\/libplist,Tatsh\/libplist","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/bplist.c\n+++ src\/bplist.c\n@@ -1163,18 +1163,9 @@\n buff_len = bplist_buff->len;\n offset_size = get_needed_bytes(buff_len);\n offset_table_index = bplist_buff->len;\n- for (i = 0; i < num_objects; i++)\n- {\n- uint8_t *offsetbuff = (uint8_t *) malloc(offset_size);\n-\n-#ifdef __BIG_ENDIAN__\n-\toffsets[i] = offsets[i] << ((sizeof(uint64_t) - offset_size) * 8);\n-#endif\n-\n- memcpy(offsetbuff, &offsets[i], offset_size);\n- byte_convert(offsetbuff, offset_size);\n- byte_array_append(bplist_buff, offsetbuff, offset_size);\n- free(offsetbuff);\n+ for (i = 0; i < num_objects; i++) {\n+ uint64_t offset = be64toh(offsets[i]);\n+ byte_array_append(bplist_buff, (uint8_t*)&offset + (sizeof(uint64_t) - offset_size), offset_size);\n }\n \n \/\/setup trailer\n"} {"commit":"c0fa7713b8b62090a835c26b7067c0187280f3b3","subject":"conf: report an error if nic needs filtering by no driver is present","message":"conf: report an error if nic needs filtering by no driver is present\n\nIf a <interface> includes a filter name but the nwfilter driver is not\npresent we silently do nothing. This is very bad, because an application\nthat thinks it is protected by malicious guest traffic will in fact be\nvulnerable. Reporting an error gives the administrator the ability to\nknow there is a problem and fix it.\n\nReviewed-by: John Ferlan <87558058f6f829e5ec976c8ef960720af4ff9c7d@redhat.com>\nSigned-off-by: Daniel P. Berrang\u00e9 <bb938cf255e055ff3507f2627d214e8e62118fcf@redhat.com>\n","repos":"fabianfreyer\/libvirt,eskultety\/libvirt,zippy2\/libvirt,libvirt\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,libvirt\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,eskultety\/libvirt,olafhering\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,eskultety\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,crobinso\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,fabianfreyer\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,andreabolognani\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,crobinso\/libvirt,crobinso\/libvirt,zippy2\/libvirt,jardasgit\/libvirt,eskultety\/libvirt,zippy2\/libvirt,olafhering\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/conf\/domain_nwfilter.c\n+++ src\/conf\/domain_nwfilter.c\n@@ -28,6 +28,9 @@\n #include \"datatypes.h\"\n #include \"domain_conf.h\"\n #include \"domain_nwfilter.h\"\n+#include \"virerror.h\"\n+\n+#define VIR_FROM_THIS VIR_FROM_NWFILTER\n \n static virDomainConfNWFilterDriverPtr nwfilterDriver;\n \n@@ -44,8 +47,10 @@\n {\n if (nwfilterDriver != NULL)\n return nwfilterDriver->instantiateFilter(vmname, vmuuid, net);\n- \/* driver module not available -- don't indicate failure *\/\n- return 0;\n+\n+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \"%s\",\n+ _(\"No network filter driver available\"));\n+ return -1;\n }\n \n void\n"} {"commit":"c18ffeaa7539f9da74b37a5be8c2cedfbdc34bce","subject":"Forward decl Session and SessionRegistry.","message":"Forward decl Session and SessionRegistry.\n","repos":"espenak\/sevent,espenak\/sevent,espenak\/sevent","returncode":1,"stderr":"error: pathspec 'sevent\/socket\/SessionForwardDecl.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- sevent\/socket\/SessionForwardDecl.h\n+++ sevent\/socket\/SessionForwardDecl.h\n@@ -0,0 +1,14 @@\n+#pragma once\n+#include <boost\/shared_ptr.hpp>\n+\n+namespace sevent\n+{\n+ namespace socket\n+ {\n+ class Session;\n+ typedef boost::shared_ptr<Session> Session_ptr;\n+\n+ class SessionRegistry;\n+ typedef boost::shared_ptr<SessionRegistry> SessionRegistry_ptr;\n+ } \/\/ namespace socket\n+} \/\/ namespace sevent\n"} {"commit":"2ce9454975e048ea2eca47eeae86d34dd2922628","subject":"Removed a useless #include.","message":"Removed a useless #include.\n","repos":"KumaranKamalanathan\/minhook,KumaranKamalanathan\/minhook,AmesianX\/minhook,Maximus5\/minhook-yxl,AmesianX\/minhook,Maximus5\/minhook-yxl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/buffer.c\n+++ src\/buffer.c\n@@ -27,7 +27,6 @@\n *\/\n \n #include <Windows.h>\n-#include <assert.h>\n #include \"buffer.h\"\n \n \/\/ Size of each memory block. (= page size of VirtualAlloc)\n"} {"commit":"121791c9210958d291f5151d1c10eafdf94d8aaf","subject":"Adding constructor for class BwTreeBase","message":"Adding constructor for class BwTreeBase\n","repos":"wangziqi2013\/BwTree,wangziqi2013\/BwTree,wangziqi2013\/BwTree","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bwtree.h\n+++ src\/bwtree.h\n@@ -209,9 +209,9 @@\n };\n \n \/*\n- * class Data - Actual cache line data\n- *\/\n- class Data {\n+ * class GCMetaData - Metadata for performing GC on per-thread basis\n+ *\/\n+ class GCMetaData {\n public: \n uint64_t counter;\n \n@@ -221,25 +221,27 @@\n };\n \n \/\/ Make sure class Data does not exceed one cache line\n- static_assert(sizeof(Data) < CACHE_LINE_SIZE,\n+ static_assert(sizeof(GCMetaData) < CACHE_LINE_SIZE,\n \"class Data size exceeds cache line length!\");\n \n \/*\n * class PaddedData - Padded data to the length of a cache line \n *\/\n+ template<typename DataType, size_t Alignment> \n class PaddedData {\n public: \n \/\/ This is the alignment of padded data - we adjust its alignment\n \/\/ after malloc() a chunk of memory\n- static constexpr size_t ALIGNMENT = 64UL;\n+ static constexpr size_t ALIGNMENT = Alignment;\n \n \/\/ This is where real data goes\n- Data data;\n+ DataType data;\n private:\n- char padding[ALIGNMENT - sizeof(Data)]; \n+ char padding[ALIGNMENT - sizeof(DataType)]; \n };\n \n- static_assert(sizeof(PaddedData) == PaddedData::ALIGNMENT, \n+ static_assert(sizeof(PaddedData<GCMetaData, CACHE_LINE_SIZE>) == \\\n+ PaddedData::ALIGNMENT, \n \"class PaddedData size does not conform to the alignment!\");\n \n private: \n@@ -253,8 +255,22 @@\n \/\/ We use this number to initialize GC data structure\n static std::atomic<size_t> total_thread_num;\n \n+ \/\/ This is the array being allocated for performing GC\n+ \/\/ The allocation aligns its address to cache line boundary\n+ PaddedData<GCMetaData, CACHE_LINE_SIZE> *gc_metadata_p;\n+ \n public: \n- \n+\n+ \/*\n+ * Constructor - Initialize GC data structure\n+ *\/\n+ BwTreeBase() {\n+ gc_metadata_p = \\\n+ aligned_alloc(CACHE_LINE_SIZE, CACHE_LINE_SIZE * total_thread_num.load());\n+ assert(gc_metadata_p != nullptr);\n+ \n+ return;\n+ }\n };\n \n \/*\n"} {"commit":"6a7eece2de63c84c4aa747a4d60af1dc6334ad00","subject":"fix docstrings","message":"fix docstrings\n","repos":"fedora-conary\/conary,fedora-conary\/conary,fedora-conary\/conary,fedora-conary\/conary,fedora-conary\/conary","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"C","diff":""} {"commit":"a0d543595db9d8da5cd2c226cd47e94c463a9163","subject":"Style.","message":"Style.\n\nNoted by Ruslan Ermilov.\n","repos":"hy0kl\/nginx,hy0kl\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/ngx_http_upstream.c\n+++ src\/http\/ngx_http_upstream.c\n@@ -3426,8 +3426,8 @@\n ngx_http_upstream_process_request(ngx_http_request_t *r,\n ngx_http_upstream_t *u)\n {\n- ngx_temp_file_t *tf;\n- ngx_event_pipe_t *p;\n+ ngx_temp_file_t *tf;\n+ ngx_event_pipe_t *p;\n \n p = u->pipe;\n \n"} {"commit":"8379403eb74dc54c846f71f0cabc6b8ff9861737","subject":"Initial commit of utils","message":"Initial commit of utils\n","repos":"dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella,dalek7\/umbrella","returncode":1,"stderr":"error: pathspec 'ttRoutines.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- ttRoutines.h\n+++ ttRoutines.h\n@@ -0,0 +1,41 @@\n+\r\n+#ifndef TT_ROUTINES_H\r\n+#define TT_ROUTINES_H\r\n+\r\n+#ifdef __cplusplus\r\n+\r\n+\/\/ category based on http:\/\/docs.scipy.org\/doc\/numpy-1.10.0\/reference\/routines.html\r\n+\r\n+template <class T>\r\n+inline void ShuffleArray(T* src, int sz)\r\n+{\r\n+\tfor(int i=0; i<sz; i++)\r\n+\t{\r\n+\t\tint nPos = i + (rand() % (sz-i)); \/\/Random remaining position\r\n+\t\tT temp\t\t= src[i]; \r\n+\t\tsrc[i] = src[nPos]; \r\n+\t\tsrc[nPos] = temp;\r\n+\t}\r\n+}\r\n+\r\n+\r\n+template <class T>\r\n+inline void ShiftWithNew(T* arr, const T &n_val, int szarr)\r\n+{\r\n+\tint i;\r\n+\tfor(i=0; i< sz-1; i++)\r\n+\t{\r\n+\t\tarr[sz-1-i] = arr[sz-2-i];\r\n+\t\t\r\n+\t}\r\n+\tarr[0] = n_val;\r\n+\r\n+}\r\n+\r\n+\r\n+\r\n+\r\n+\r\n+#endif \/* __cplusplus *\/\r\n+\r\n+#endif"} {"commit":"db9ebc46d2158a63e8e1be023e4ceb76f07c3243","subject":"adding some documentation for the three structure ","message":"adding some documentation for the three structure \n\n\n","repos":"hoangt\/goblin-core,hoangt\/goblin-core,hoangt\/goblin-core,tangyibin\/goblin-core,hoangt\/goblin-core,hoangt\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,hoangt\/goblin-core,hoangt\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,hoangt\/goblin-core,tangyibin\/goblin-core,hoangt\/goblin-core,hoangt\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,tangyibin\/goblin-core,hoangt\/goblin-core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sim\/mem_sim\/src\/memsim_clock_exp.c\n+++ sim\/mem_sim\/src\/memsim_clock_exp.c\n@@ -13,6 +13,36 @@\n #include <stdio.h>\n #include <stdlib.h>\n #include \"mem_sim.h\"\n+\n+\n+\/* ========== EXPERIMENTAL BACKEND ================\n+ * \n+ * The experimental backend uses basic task group\n+ * queue inputs and transforms them into\n+ * trees based upon the target memory \n+ * destination. \n+ * \n+ * The trees are constructed where the LHS\n+ * are read operations and the RHS are write\n+ * operations. There is a single root \n+ * node for each of {local,global,amo} trees\n+ * that does not contain an entry.\n+ * \n+ * [ROOT]\n+ * \t\t\t |\n+ * \t\t\t\/ \\\n+ * \/ \\\n+ * READS WRITES\n+ * | |\n+ * \/ \\ \/ \\\n+ * \/ \\ \/ \\\n+ * \/ \\ \/ \\ \n+ * -addr +addr -addr +addr\n+ * \n+ *\/\n+\n+\n+\n \n \n \/* ------------------------------------------------ FUNCTION PROTOTYPES *\/\n"} {"commit":"d1df2271501fa2f2740581081e3734b6953d9a8f","subject":"Fix step count display calculation","message":"Fix step count display calculation\n","repos":"Spitemare\/case-face,Spitemare\/case-face,Spitemare\/case-face,Spitemare\/case-face","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/c\/main.c\n+++ src\/c\/main.c\n@@ -262,7 +262,7 @@\n HealthValue steps = health_service_sum_today(HealthMetricStepCount);\n char *s = s_widget_buffers[WidgetTypeSteps];\n if (steps < 1000) snprintf(s, WIDGET_BUF_SIZEOF(s), \"ST: %ld\", steps);\n- else snprintf(s, WIDGET_BUF_SIZEOF(s), \"ST: %ld.%ldK\", steps \/ 1000, steps \/ 1000 % 10);\n+ else snprintf(s, WIDGET_BUF_SIZEOF(s), \"ST: %ld.%ldK\", steps \/ 1000, steps \/ 100 % 10);\n }\n \n mask = health_service_metric_accessible(HealthMetricWalkedDistanceMeters, start, end);\n"} {"commit":"d93509920f37bccd5d8b7ad091c1c0b70c858722","subject":"Make create*Shader methods private","message":"Make create*Shader methods private\n","repos":"turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo,turol\/smaaDemo","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"eafe44ff7995ab32c7935495ce0905530a104ec9","subject":"Upstream: replaced u->pipe->temp_file with p->temp_file.","message":"Upstream: replaced u->pipe->temp_file with p->temp_file.\n\nWhile here, redundant parentheses removed. No functional changes.\n","repos":"hy0kl\/nginx,firebase\/nginx,firebase\/nginx,firebase\/nginx,hy0kl\/nginx,firebase\/nginx,hy0kl\/nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/http\/ngx_http_upstream.c\n+++ src\/http\/ngx_http_upstream.c\n@@ -2982,11 +2982,11 @@\n \n if (p->upstream_eof || p->upstream_done) {\n \n- tf = u->pipe->temp_file;\n+ tf = p->temp_file;\n \n if (u->headers_in.status_n == NGX_HTTP_OK\n && (u->headers_in.content_length_n == -1\n- || (u->headers_in.content_length_n == tf->offset)))\n+ || u->headers_in.content_length_n == tf->offset))\n {\n ngx_http_upstream_store(r, u);\n u->store = 0;\n@@ -2999,11 +2999,11 @@\n if (u->cacheable) {\n \n if (p->upstream_done) {\n- ngx_http_file_cache_update(r, u->pipe->temp_file);\n+ ngx_http_file_cache_update(r, p->temp_file);\n \n } else if (p->upstream_eof) {\n \n- tf = u->pipe->temp_file;\n+ tf = p->temp_file;\n \n if (u->headers_in.content_length_n == -1\n || u->headers_in.content_length_n\n@@ -3016,7 +3016,7 @@\n }\n \n } else if (p->upstream_error) {\n- ngx_http_file_cache_free(r->cache, u->pipe->temp_file);\n+ ngx_http_file_cache_free(r->cache, p->temp_file);\n }\n }\n \n"} {"commit":"8de909e532b477284b086709fe215a3a4ebf4fa8","subject":"Updated layout","message":"Updated layout","repos":"0merlin\/pebble_watch,0merlin\/pebble_watch,0merlin\/pebble_watch","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/c\/nixi.c\n+++ src\/c\/nixi.c\n@@ -21,7 +21,7 @@\n \n static TextLayer *battery_text_layer, *location_text_layer;\n \n-static TextLayer *steps_text_layer, *steps_perc_text_layer, *steps_now_average_text_layer, *steps_average_text_layer;\n+static TextLayer *steps_text_layer, *steps_now_average_text_layer, *steps_average_text_layer;\n \n static TextLayer *time_hour_text_layer, *time_minute_text_layer, *date_text_layer, *day_text_layer;\n \n@@ -248,12 +248,7 @@\n \/\/ Create the steps display\n steps_text_layer = text_layer_create(GRect(0, bounds.size.h - SUB_TEXT_HEIGHT, bounds.size.w, SUB_TEXT_HEIGHT));\n text_layer_set_font(steps_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_24_BOLD));\n- add_text_layer(window_layer, steps_text_layer, GTextAlignmentLeft);\n-\n- \/\/ Create the steps percentage display\n- steps_perc_text_layer = text_layer_create(GRect(0, bounds.size.h - SUB_TEXT_HEIGHT, bounds.size.w, SUB_TEXT_HEIGHT));\n- text_layer_set_font(steps_perc_text_layer, fonts_get_system_font(FONT_KEY_GOTHIC_24_BOLD));\n- add_text_layer(window_layer, steps_perc_text_layer, GTextAlignmentRight);\n+ add_text_layer(window_layer, steps_text_layer, GTextAlignmentCenter);\n \n \/\/ Create the current average steps display\n steps_now_average_text_layer = text_layer_create(GRect(0, bounds.size.h - SUB_TEXT_HEIGHT - 13, bounds.size.w, SUB_TEXT_HEIGHT));\n@@ -292,7 +287,6 @@\n fonts_unload_custom_font(s_time_font);\n \n text_layer_destroy(steps_text_layer);\n- text_layer_destroy(steps_perc_text_layer);\n text_layer_destroy(steps_now_average_text_layer);\n text_layer_destroy(steps_average_text_layer);\n layer_destroy(steps_layer);\n@@ -513,7 +507,6 @@\n text_layer_set_text_color(day_text_layer, dayTime ? GColorBlack : GColorWhite);\n text_layer_set_text_color(location_text_layer, dayTime ? GColorBlack : GColorWhite);\n text_layer_set_text_color(steps_text_layer, dayTime ? GColorBlack : GColorWhite);\n- text_layer_set_text_color(steps_perc_text_layer, dayTime ? GColorBlack : GColorWhite);\n text_layer_set_text_color(steps_now_average_text_layer, dayTime ? GColorBlack : GColorWhite);\n text_layer_set_text_color(steps_average_text_layer, dayTime ? GColorBlack : GColorWhite);\n text_layer_set_text_color(battery_text_layer, dayTime ? GColorBlack : GColorWhite);\n@@ -522,18 +515,21 @@\n \n static void show_text()\n {\n-\n+ static char steps[25];\n+ \n format_number(steps_buffer, sizeof(steps_buffer), current_steps);\n format_number(steps_average_buffer, sizeof(steps_average_buffer), steps_day_average);\n format_number(steps_now_buffer, sizeof(steps_now_buffer), steps_average_now);\n+ snprintf(steps, sizeof(steps), \"%s \/ %s\", steps_buffer, steps_average_buffer);\n snprintf(steps_perc_buffer, sizeof(steps_perc_buffer), \"%d%%\", (int)(100.0f * current_steps \/ steps_day_average));\n \n- text_layer_set_text(steps_text_layer, steps_buffer);\n- text_layer_set_text(steps_perc_text_layer, steps_perc_buffer);\n+ text_layer_set_text(steps_text_layer, steps);\n text_layer_set_text(steps_now_average_text_layer, steps_now_buffer);\n- text_layer_set_text(steps_average_text_layer, steps_average_buffer);\n+ text_layer_set_text(steps_average_text_layer, steps_perc_buffer); \/\/steps_average_buffer\n+ \n text_layer_set_text(date_text_layer, date_buffer);\n text_layer_set_text(day_text_layer, day_buffer);\n+ \n text_layer_set_text(location_text_layer, phone_battery_buffer);\n text_layer_set_text(battery_text_layer, battery_buffer);\n app_timer_register(10000, hide_text, NULL);\n@@ -542,7 +538,6 @@\n static void hide_text()\n {\n text_layer_set_text(steps_text_layer, NULL);\n- text_layer_set_text(steps_perc_text_layer, NULL);\n text_layer_set_text(steps_now_average_text_layer, NULL);\n text_layer_set_text(steps_average_text_layer, NULL);\n text_layer_set_text(date_text_layer, NULL);\n"} {"commit":"45169132c995e8cd0c3afb12b789b3d7ee52b54b","subject":"more structured testing","message":"more structured testing\n\n","repos":"simo5\/asn1c,Yodpong\/asn1c,hongyunnchen\/asn1c,open-io\/asn1c,xxkkk\/asn1c,hongyunnchen\/asn1c,xxkkk\/asn1c,khmseu\/asn1c,open-io\/asn1c,mouse07410\/asn1c,simo5\/asn1c,mouse07410\/asn1c,mojmir-svoboda\/asn1c,hugewave\/asn1c,xxkkk\/asn1c,open-io\/asn1c,fbx\/asn1c,fbx\/asn1c,mojmir-svoboda\/asn1c,Yodpong\/asn1c,fbx\/asn1c,hongyunnchen\/asn1c,fbx\/asn1c,Yodpong\/asn1c,hugewave\/asn1c,mojmir-svoboda\/asn1c,khmseu\/asn1c,hugewave\/asn1c,mouse07410\/asn1c,mojmir-svoboda\/asn1c,Yodpong\/asn1c,simo5\/asn1c,xxkkk\/asn1c,khmseu\/asn1c,open-io\/asn1c,mouse07410\/asn1c,hugewave\/asn1c,simo5\/asn1c,khmseu\/asn1c,hongyunnchen\/asn1c","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- skeletons\/tests\/check-UTF8String.c\n+++ skeletons\/tests\/check-UTF8String.c\n@@ -6,11 +6,6 @@\n #include <der_encoder.c>\n #include <constraints.c>\n #include <sys\/time.h>\n-\n-static int errlog(const void *buf, size_t size, void *key) {\n-\tfwrite(buf, 1, size, stdout);\n-\treturn 0;\n-}\n \n static void\n check(int expect_length, char *buf, int buflen) {\n@@ -25,7 +20,7 @@\n \n \tfor(ret = 0; ret < buflen; ret++)\n \t\tprintf(\"%c\", buf[ret]);\n-\tret = UTF8String_length(&st, 0, errlog, 0);\n+\tret = UTF8String_length(&st);\n \tprintf(\"]: size=%d, expect=%d, got=%d\\n\",\n \t\tbuflen, expect_length, ret);\n \tassert(ret == expect_length);\n@@ -49,14 +44,14 @@\n \tst.buf = long_test;\n \tst.size = sizeof(long_test) - 1;\n \n-\tret = UTF8String_length(&st, 0, errlog, 0);\n+\tret = UTF8String_length(&st);\n \tassert(ret == 40);\n \tprintf(\"Now wait a bit...\\n\");\n \n \tgettimeofday(&tv, 0);\n \tstart = tv.tv_sec + tv.tv_usec \/ 1000000.0;\n \tfor(i = 0; i < cycles; i++) {\n-\t\tret += UTF8String_length(&st, 0, errlog, 0);\n+\t\tret += UTF8String_length(&st);\n \t}\n \tgettimeofday(&tv, 0);\n \tstop = tv.tv_sec + tv.tv_usec \/ 1000000.0;\n@@ -71,16 +66,23 @@\n \n \tcheck(0, \"\", 0);\n \tcheck(1, \"\\0\", 1);\n-\tcheck(-1, \"\\377\", 1);\n \tcheck(1, \"a\", 1);\n \tcheck(2, \"ab\", 2);\n \tcheck(3, \"abc\", 3);\n \tassert(sizeof(\"a\\303\\237cd\") == 6);\n \tcheck(4, \"a\\303\\237cd\", 5);\n-\tcheck(-1, \"a\\303\", 2);\n-\tcheck(-1, \"a\\370\\200\\200\\200c\", 5);\n-\tcheck(3, \"a\\370\\201\\200\\201\\257c\", 7);\n-\t\/* not yet check(-1, \"a\\370\\200\\200\\200\\257c\", 7); *\/\n+\tcheck(3, \"a\\370\\211\\200\\201\\257c\", 7);\n+\tcheck(3, \"\\320\\273\\320\\265\\320\\262\", 6);\n+\n+\tcheck(-1, \"a\\303\", 2);\t\/* Truncated *\/\n+\tcheck(-2, \"\\377\", 1);\t\/* Invalid UTF-8 sequence start *\/\n+\tcheck(-2, \"\\200\", 1);\n+\tcheck(-2, \"\\320\\273\\265\\320\\262\", 5);\n+\tcheck(-3, \"\\320c\", 2);\t\/* Not continuation *\/\n+\tcheck(-3, \"a\\370\\200\\200\\200c\", 6);\n+\tcheck(-4, \"a\\370\\200\\200\\200\\257c\", 7);\n+\tcheck(-4, \"\\320\\273\\320\\265\\340\\200\\262\", 7);\n+\tcheck(-5, 0, 0);\n \n \tcheck_speed();\n \n"} {"commit":"949f0cd44b6c1334590331d71000677cee363c6c","subject":"- Drop comment","message":"- Drop comment\n","repos":"clever-lang\/clever,clever-lang\/clever,clever-lang\/clever,clever-lang\/clever,felipensp\/clever,felipensp\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,felipensp\/clever","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- types\/bool.h\n+++ types\/bool.h\n@@ -54,7 +54,6 @@\n \t\tif (newvalue->getTypePtr() == this) value->copy(newvalue);\n \t\telse value->setBoolean((int64_t)newvalue->getDouble()); \n \t}\n-\t\/\/CLEVER_TYPE_MOD_HANDLER_D { value->setInteger(op1->getBoolean() % op2->getBoolean()); }\n private:\n \tDISALLOW_COPY_AND_ASSIGN(Bool);\n };\n"} {"commit":"ce3d45e11ebb8b8f6e785020b837436a3560336e","subject":"Add inheritance note for image_buffer type","message":"Add inheritance note for image_buffer type\n","repos":"waysome\/waysome,waysome\/waysome","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/compositor\/background_surface.h\n+++ src\/compositor\/background_surface.h\n@@ -30,6 +30,10 @@\n \n #include \"compositor\/buffer.h\"\n \n+\/**\n+ *\n+ * @extends ws_buffer\n+ *\/\n struct ws_image_buffer {\n struct ws_buffer obj;\n char* path;\n"} {"commit":"e323d78fdcc4aeb2a81347b65577b791d4dedee0","subject":"Fix compiling --with-libstdc++","message":"Fix compiling --with-libstdc++\n","repos":"dgruss\/ustl,msharov\/ustl,msharov\/ustl,dgruss\/ustl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- uexception.h\n+++ uexception.h\n@@ -123,5 +123,7 @@\n \n #if WITHOUT_LIBSTDCPP\n } \/\/ namespace std\n-namespace ustl { typedef std::bad_alloc bad_alloc; }\n+namespace ustl {\n+ typedef std::bad_alloc bad_alloc;\n #endif\n+} \/\/ namespace ustl\n"} {"commit":"ed77b31d307523825be6938775020caffce05922","subject":"fix mutex always lock bug","message":"fix mutex always lock bug\n","repos":"mashx\/libpomelo,NetEase\/libpomelo,NetEase\/libpomelo,mashx\/libpomelo,mashx\/libpomelo","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -307,6 +307,7 @@\n if(head == NULL) {\n fprintf(stderr, \"Fail to create listener queue.\\n\");\n pc_listener_destroy(listener);\n+ uv_mutex_unlock(&client->listener_mutex);\n return -1;\n }\n \n@@ -325,6 +326,7 @@\n uv_mutex_lock(&client->listener_mutex);\n ngx_queue_t *head = (ngx_queue_t *)pc_map_get(client->listeners, event);\n if(head == NULL) {\n+ uv_mutex_unlock(&client->listener_mutex);\n return;\n }\n \n@@ -351,6 +353,7 @@\n uv_mutex_lock(&client->listener_mutex);\n ngx_queue_t *head = (ngx_queue_t *)pc_map_get(client->listeners, event);\n if(head == NULL) {\n+ uv_mutex_unlock(&client->listener_mutex);\n return;\n }\n \n"} {"commit":"a329c434dc6fb87ef9b949665102a53b2f94c7e2","subject":"update log","message":"update log\n","repos":"lparam\/socksd,lparam\/socksd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -282,7 +282,7 @@\n } else {\n char addrbuf[INET6_ADDRSTRLEN + 1] = {0};\n uint16_t port = ip_name(&client->addr, addrbuf, sizeof addrbuf);\n- logger_log(LOG_ERR, \"%s -> %s:%d failed: %s\", client->target_addr, addrbuf, port, uv_strerror(status));\n+ logger_log(LOG_ERR, \"%s:%d <- %s failed: %s\", addrbuf, port, client->target_addr, uv_strerror(status));\n }\n \n free(req);\n"} {"commit":"8d9a49f19c858f8f94238832d49a7564fe178e9d","subject":"disabled waiting for commands to finish in client_read","message":"disabled waiting for commands to finish in client_read\n","repos":"eleme\/corvus,doyoubi\/corvus,jasonjoo2010\/corvus,eleme\/corvus,doyoubi\/corvus,doyoubi\/corvus,jasonjoo2010\/corvus,jasonjoo2010\/corvus,eleme\/corvus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -87,10 +87,11 @@\n }\n }\n \n- cmd = STAILQ_FIRST(&client->info->cmd_queue);\n- if (cmd != NULL && cmd->parse_done) {\n- return CORVUS_OK;\n- }\n+ \/\/ TODO wait for commands in cmd_queue to finish\n+ \/\/ cmd = STAILQ_FIRST(&client->info->cmd_queue);\n+ \/\/ if (cmd != NULL && cmd->parse_done) {\n+ \/\/ return CORVUS_OK;\n+ \/\/ }\n \n \/\/ calculate limit\n long long free_cmds = client->ctx->mstats.free_cmds;\n"} {"commit":"e4e9857eb8907ab5560199dddc38f17436a1f887","subject":"token never returns negative","message":"token never returns negative\n\nCheck to make sure it is valid. If it is not, the rest of the\nline should be thrown out, right now this isn't happening.\n","repos":"brunk23\/sturdy-bassoon,brunk23\/sturdy-bassoon,brunk23\/sturdy-bassoon","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a153abf85a736f35e2e4672da259f9e7933649c2","subject":"fixed windows network event","message":"fixed windows network event\n","repos":"unbit\/vpn-ws,XHidamariSketchX\/vpn-ws,faint32\/vpn-ws,faint32\/vpn-ws,XHidamariSketchX\/vpn-ws,nsdown\/vpn-ws,XHidamariSketchX\/vpn-ws,don-johnny\/vpn-ws,don-johnny\/vpn-ws,unbit\/vpn-ws,faint32\/vpn-ws,nsdown\/vpn-ws,don-johnny\/vpn-ws,unbit\/vpn-ws,nsdown\/vpn-ws","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -77,7 +77,6 @@\n }\n \n \tvpn_ws_recv(peer->fd, peer->buf + peer->pos, amount, rlen);\n-\n if (rlen < 0) {\n \t\tif (rlen < 0 && (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINPROGRESS)) return 0;\n \t\tvpn_ws_error(\"vpn_ws_client_read()\/read()\");\n@@ -506,6 +505,8 @@\n \t\t\t\tvpn_ws_client_destroy(peer);\n \t\tgoto reconnect;\n \t\t\t}\n+\t\t\t\n+\t\t\tWSAResetEvent(ev);\n \t\t\t\/\/ start getting websocket packets\n \t\t\tfor(;;) {\n \t\t\t\tuint16_t ws_header = 0;\n"} {"commit":"19d7879f2bf61660ec3925b69dde994d5c103330","subject":"Send the file contents to the server, not the GFile*","message":"Send the file contents to the server, not the GFile*\n","repos":"cmende\/etherpush","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -101,7 +101,7 @@\n \tg_message(\"[client] File transfer accepted\");\n \n \t\/* send file *\/\n-\tif (g_output_stream_write(ostream, file, length, NULL, &error) < 0) {\n+\tif (g_output_stream_write(ostream, content, length, NULL, &error) < 0) {\n \t\tg_critical(\"Failed to write file: %s\", error->message);\n \t\tg_error_free(error);\n \t\treturn;\n"} {"commit":"0b0e44d415fcf3c675fff2b266026c6d344d965a","subject":"Move variable declaration to avoid segfault when client exits before initialization.","message":"Move variable declaration to avoid segfault when client exits before initialization.\n","repos":"opentechinstitute\/commotiond,opentechinstitute\/commotiond,opentechinstitute\/commotiond","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -153,6 +153,7 @@\n int opt = 0;\n int opt_index = 0;\n char *socket_uri = COMMOTION_MANAGESOCK;\n+ co_obj_t *rlist = NULL, *rtree = NULL;\n \n static const char *opt_string = \"b:h\";\n \n@@ -187,7 +188,6 @@\n char response[RESPONSE_MAX];\n memset(response, '\\0', sizeof(response));\n size_t resplen = 0;\n- co_obj_t *rlist = NULL, *rtree = NULL;\n if(optind < argc) \n {\n reqlen = cli_parse_argv(request, REQUEST_MAX, argv + optind, argc - optind);\n"} {"commit":"24e66aabd778feeca2e5b10f96e30e2358c8bda0","subject":"Fix client header reading bug","message":"Fix client header reading bug\n","repos":"dragonly\/client,konstructs\/client,konstructs\/client,konstructs\/client,Henningstone\/client,dragonly\/client,dragonly\/client,Henningstone\/client,Henningstone\/client","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -15,6 +15,7 @@\n #include \"tinycthread.h\"\n \n #define RECV_SIZE 256*256*256\n+#define HEADER_SIZE 4\n \n static int client_enabled = 0;\n static int running = 0;\n@@ -204,15 +205,19 @@\n char *data = malloc(sizeof(char) * RECV_SIZE);\n int size;\n while (1) {\n-\n+ int t = 0;\n+ int length = 0;\n \/\/ get package length\n- if (recv(sd, &size, 4, 0) <= 0) {\n- if (running) {\n- perror(\"recv\");\n- exit(1);\n- } else {\n- break;\n+ while(t < HEADER_SIZE) {\n+ if ((length = recv(sd, ((char *)&size) + t, HEADER_SIZE - t, 0)) <= 0) {\n+ if (running) {\n+ perror(\"recv\");\n+ exit(1);\n+ } else {\n+ break;\n+ }\n }\n+ t += length;\n }\n size = ntohl(size);\n \n@@ -222,8 +227,8 @@\n }\n \n \/\/ read 'size' bytes from the network\n- int t=0;\n- int length = 0;\n+ t=0;\n+ length = 0;\n while(t < size) {\n if ((length = recv(sd, data+t, size-t, 0)) <= 0) {\n if (running) {\n"} {"commit":"a42348afd096e7a9121a39ff392eadfda9673368","subject":"Now actually improve few disconnect messages.","message":"Now actually improve few disconnect messages.\n","repos":"digoal\/pgbouncer-x2,jaiminpan\/pgbouncer,kvap\/pgbouncer,jaiminpan\/pgbouncer,jaiminpan\/pgbouncer,dbaxa\/pgbouncer,dbaxa\/pgbouncer,digoal\/pgbouncer-x2,jaiminpan\/pgbouncer,wurenny\/pgbouncer-x2,dbaxa\/pgbouncer,wurenny\/pgbouncer-x2,digoal\/pgbouncer-x2,digoal\/pgbouncer-x2,kvap\/pgbouncer,kvap\/pgbouncer,kvap\/pgbouncer,wurenny\/pgbouncer-x2,dbaxa\/pgbouncer,wurenny\/pgbouncer-x2","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/client.c\n+++ src\/client.c\n@@ -59,7 +59,7 @@\n \tif (!db) {\n \t\tdb = register_auto_database(dbname);\n \t\tif (!db) {\n-\t\t\tdisconnect_client(client, true, \"No such database\");\n+\t\t\tdisconnect_client(client, true, \"No such database: %s\", dbname);\n \t\t\treturn false;\n \t\t}\n \t\telse {\n@@ -82,7 +82,7 @@\n \t\t\/* the user clients wants to log in as *\/\n \t\tuser = find_user(username);\n \t\tif (!user) {\n-\t\t\tdisconnect_client(client, true, \"No such user\");\n+\t\t\tdisconnect_client(client, true, \"No such user: %s\", username);\n \t\t\treturn false;\n \t\t}\n \t\tclient->auth_user = user;\n@@ -123,7 +123,7 @@\n \t\t\tslog_debug(client, \"ignoring startup parameter: %s=%s\", key, val);\n \t\t} else {\n \t\t\tslog_warning(client, \"unsupported startup parameter: %s=%s\", key, val);\n-\t\t\tdisconnect_client(client, true, \"Unknown startup parameter\");\n+\t\t\tdisconnect_client(client, true, \"Unsupported startup parameter: %s\", key);\n \t\t\treturn false;\n \t\t}\n \t}\n"} {"commit":"a71740da3758cc1dd9157501b115802c03702dbf","subject":"Made settling silent and a fixed (fairly short time)","message":"Made settling silent and a fixed (fairly short time)\n\n\ngit-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@1818 3c1deb5b-d424-0410-962d-aba41a686d42\n","repos":"OpenCMISS\/zinc,hsorby\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc,hsorby\/zinc,OpenCMISS\/zinc,hsorby\/zinc,hsorby\/zinc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/unemap\/utilities\/register.c\n+++ source\/unemap\/utilities\/register.c\n@@ -1,7 +1,7 @@\n \/*******************************************************************************\n FILE : register.c\n \n-LAST MODIFIED : 10 February 2002\n+LAST MODIFIED : 24 April 2002\n \n DESCRIPTION :\n For setting and checking registers on second version of the signal conditioning\n@@ -459,7 +459,7 @@\n \tint phase_flag,FILE *report,int *number_of_settled_channels,\n \tint sampling_delay,short int *samples,float *mean,\n \tunsigned long number_of_samples,unsigned long number_of_channels,\n-\tfloat tol_settling,int max_settling)\n+\tfloat tol_settling,int max_settling,int silent)\n {\n \tfloat maximum,\n \t\tprevious_mean[MAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD],\n@@ -470,8 +470,11 @@\n \n \treturn_code=1;\n \t\/* wait for the high-pass (DC removal) to settle *\/\n-\tprintf(\"Settling\\n\");\n-\tfprintf(report,\"Settling\\n\");\n+\tif (!silent)\n+\t{\n+\t\tprintf(\"Settling\\n\");\n+\t\tfprintf(report,\"Settling\\n\");\n+\t}\n \t*number_of_settled_channels=0;\n \tchannel_number=0;\n \tfor (j=0;j<MAXIMUM_NUMBER_OF_NI_CARDS;j++)\n@@ -576,26 +579,32 @@\n \t\t\t\t\tchannel_number += NUMBER_OF_CHANNELS_ON_NI_CARD;\n \t\t\t\t}\n \t\t\t}\n-\t\t\tprintf(\" %g\\n\",maximum);\n-\t\t\tfprintf(report,\" %g\\n\",maximum);\n+\t\t\tif (!silent)\n+\t\t\t{\n+\t\t\t\tprintf(\" %g\\n\",maximum);\n+\t\t\t\tfprintf(report,\" %g\\n\",maximum);\n+\t\t\t}\n \t\t}\n \t\tk++;\n \t} while ((*number_of_settled_channels<\n \t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)&&\n \t\t(k<max_settling));\n-\tif (*number_of_settled_channels<MAXIMUM_NUMBER_OF_NI_CARDS*\n-\t\tNUMBER_OF_CHANNELS_ON_NI_CARD)\n+\tif (!silent)\n \t{\n-\t\tprintf(\"Failed to settle for:\");\n-\t\tfor (i=0;i<MAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD;i++)\n+\t\tif (*number_of_settled_channels<MAXIMUM_NUMBER_OF_NI_CARDS*\n+\t\t\tNUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t{\n-\t\t\tif (channel_check[i]&phase_flag)\n+\t\t\tprintf(\"Failed to settle for:\");\n+\t\t\tfor (i=0;i<MAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD;i++)\n \t\t\t{\n-\t\t\t\tprintf(\" %d\",i+1);\n+\t\t\t\tif (channel_check[i]&phase_flag)\n+\t\t\t\t{\n+\t\t\t\t\tprintf(\" %d\",i+1);\n+\t\t\t\t}\n \t\t\t}\n+\t\t\tprintf(\"\\n\");\n+\t\t\tpause_for_error();\n \t\t}\n-\t\tprintf(\"\\n\");\n-\t\tpause_for_error();\n \t}\n \n \treturn (return_code);\n@@ -1459,7 +1468,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -1994,7 +2003,7 @@\n \t\t\t\t\t\t\t\t\t\t\t\tallow_to_settle(0,tested_cards,temp_channel_check,\n \t\t\t\t\t\t\t\t\t\t\t\t\tphase_flag,report,&number_of_settled_channels,\n \t\t\t\t\t\t\t\t\t\t\t\t\tsampling_delay,samples,mean,number_of_samples,\n-\t\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling);\n+\t\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling,0);\n \t\t\t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*\n \t\t\t\t\t\t\t\t\t\t\t\t\tNUMBER_OF_CHANNELS_ON_NI_CARD)\n@@ -2579,7 +2588,7 @@\n \t\t\t\t\t\t\t\t\t\t\t\t\tallow_to_settle(0,tested_cards,temp_channel_check,\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tphase_flag,report,&number_of_settled_channels,\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tsampling_delay,samples,mean,number_of_samples,\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling);\n+\t\t\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling,0);\n \t\t\t\t\t\t\t\t\t\t\t\t\ttested_cards[k]=1;\n \t\t\t\t\t\t\t\t\t\t\t\t\ttested_cards[tester_card_2-1]=0;\n \t\t\t\t\t\t\t\t\t\t\t\t\tfirst=0;\n@@ -3137,7 +3146,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -3580,7 +3589,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -3632,7 +3641,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -3775,7 +3784,7 @@\n \t\t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*\n \t\t\t\t\t\t\t\t\t\t\t\tNUMBER_OF_CHANNELS_ON_NI_CARD)\n@@ -3888,7 +3897,7 @@\n \t\t\t\t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tmean,number_of_samples,number_of_channels,\n-\t\t\t\t\t\t\t\t\t\t\t\t\t\ttol_settling,max_settling);\n+\t\t\t\t\t\t\t\t\t\t\t\t\t\ttol_settling,max_settling,0);\n \t\t\t\t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*\n \t\t\t\t\t\t\t\t\t\t\t\t\t\tNUMBER_OF_CHANNELS_ON_NI_CARD)\n@@ -4301,7 +4310,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -4379,7 +4388,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -4488,7 +4497,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -4596,7 +4605,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -4919,7 +4928,7 @@\n \t\t\t\t\t\t\t\t\t\t\ttemp_channel_check,phase_flag,report,\n \t\t\t\t\t\t\t\t\t\t\t&number_of_settled_channels,sampling_delay,samples,mean,\n \t\t\t\t\t\t\t\t\t\t\tnumber_of_samples,number_of_channels,tol_settling,\n-\t\t\t\t\t\t\t\t\t\t\tmax_settling);\n+\t\t\t\t\t\t\t\t\t\t\tmax_settling,0);\n \t\t\t\t\t\t\t\t\t\tif (number_of_settled_channels<\n \t\t\t\t\t\t\t\t\t\t\tMAXIMUM_NUMBER_OF_NI_CARDS*NUMBER_OF_CHANNELS_ON_NI_CARD)\n \t\t\t\t\t\t\t\t\t\t{\n@@ -5673,6 +5682,12 @@\n \t\t\t\t\t\t\tfprintf(report,\"number_of_samples = %lu\\n\",number_of_samples);\n \t\t\t\t\t\t\tfprintf(report,\"sampling_frequency = %g\\n\",sampling_frequency);\n \t\t\t\t\t\t\tfprintf(report,\"\\n\");\n+\t\t\t\t\t\t\tmax_settling=5;\n+\t\t\t\t\t\t\ttol_settling=(float)0;\n+\t\t\t\t\t\t\tfprintf(report,\"max_settling=%d\\n\",max_settling);\n+\t\t\t\t\t\t\tfprintf(report,\"tol_settling=%g\\n\",tol_settling);\n+\t\t\t\t\t\t\tfprintf(report,\"\\n\");\n+#if defined (OLD_CODE)\n \/*\t\t\t\t\t\t\tmax_settling=20;*\/\n \t\t\t\t\t\t\tmax_settling=5;\n \t\t\t\t\t\t\ttol_settling=(float)1;\n@@ -5784,6 +5799,7 @@\n \t\t\t\t\t\t\tfprintf(report,\"tol_calibrate_gain=%g\\n\",tol_calibrate_gain);\n \t\t\t\t\t\t\tfprintf(report,\"tol_isolation=%g\\n\",tol_isolation);\n \t\t\t\t\t\t\tfprintf(report,\"\\n\");\n+#endif \/* defined (OLD_CODE) *\/\n \t\t\t\t\t\t\ttotal_checks=0;\n \t\t\t\t\t\t\tunemap_set_power(1);\n \t\t\t\t\t\t\tunemap_set_isolate_record_mode(0,0);\n@@ -5904,7 +5920,7 @@\n \t\t\t\t\t\t\t\t\t\t\tallow_to_settle(0,tested_cards,temp_channel_check,\n \t\t\t\t\t\t\t\t\t\t\t\tphase_flag,report,&number_of_settled_channels,\n \t\t\t\t\t\t\t\t\t\t\t\tsampling_delay,samples,mean,number_of_samples,\n-\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling);\n+\t\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling,1);\n \t\t\t\t\t\t\t\t\t\t\tunemap_stop_stimulating(0);\n \t\t\t\t\t\t\t\t\t\t\t\/* work out correlations *\/\n \t\t\t\t\t\t\t\t\t\t\ttwo_pi=(double)8*atan((double)1);\n@@ -6051,7 +6067,7 @@\n \t\t\t\t\t\t\t\t\t\tallow_to_settle(0,tested_cards,temp_channel_check,\n \t\t\t\t\t\t\t\t\t\t\tphase_flag,report,&number_of_settled_channels,\n \t\t\t\t\t\t\t\t\t\t\tsampling_delay,samples,mean,number_of_samples,\n-\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling);\n+\t\t\t\t\t\t\t\t\t\t\tnumber_of_channels,tol_settling,max_settling,1);\n \t\t\t\t\t\t\t\t\t\tunemap_stop_stimulating(0);\n \t\t\t\t\t\t\t\t\t\t\/* work out correlations *\/\n \t\t\t\t\t\t\t\t\t\ttwo_pi=(double)8*atan((double)1);\n"} {"commit":"2c46e7dedeebac10444636356f79161a60e796e6","subject":"cmocka: Fix length calculation.","message":"cmocka: Fix length calculation.\n\nCID: #1268624\n\nSigned-off-by: Andreas Schneider <asn@cryptomilk.org>\n\nSQ\n","repos":"dsch\/cmocka,VladimirTyrin\/cmocka,JonathonReinhart\/cmocka,jamesmunns\/CMocka,clibs\/cmocka,tyc\/cmocka,tyc\/cmocka,clibs\/cmocka,tyc\/cmocka,VladimirTyrin\/cmocka,wingyplus\/cmocka,JonathonReinhart\/cmocka,jamesmunns\/CMocka,dsch\/cmocka,wingyplus\/cmocka","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/cmocka.c\n+++ src\/cmocka.c\n@@ -1578,11 +1578,12 @@\n cm_error_message = tmp;\n }\n \n- if (((size_t)len) <= sizeof(buffer)) {\n+ if (((size_t)len) < sizeof(buffer)) {\n+ \/* Use len + 1 to also copy '\\0' *\/\n memcpy(cm_error_message + msg_len, buffer, len + 1);\n } else {\n va_copy(ap, args);\n- vsnprintf(cm_error_message + msg_len, len + 1, format, ap);\n+ vsnprintf(cm_error_message + msg_len, len, format, ap);\n va_end(ap);\n }\n }\n"} {"commit":"11f980e2651f72e75b9c19187a90ed3494c12ea4","subject":"putcomp(): Use local to avoid repeating tautological ternary.","message":"putcomp(): Use local to avoid repeating tautological ternary.\n","repos":"mcr\/nmh,mcr\/nmh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- uip\/mhlsbr.c\n+++ uip\/mhlsbr.c\n@@ -1282,14 +1282,15 @@\n static void\n putcomp (struct mcomp *c1, struct mcomp *c2, int flag)\n {\n+ char *text; \/* c1's text, or the name as a fallback. *\/\n+ char *trimmed_prefix;\n int count, cchdr;\n char *cp;\n- \/*\n- * Create a copy of c1->c_text with trailing whitespace\n- * trimmed, for use with blank lines.\n- *\/\n- char *trimmed_prefix =\n-\trtrim (add (c1->c_text ? c1->c_text : c1->c_name, NULL));\n+\n+ text = c1->c_text ? c1->c_text : c1->c_name;\n+ \/* Create a copy with trailing whitespace trimmed, for use with\n+ * blank lines. *\/\n+ trimmed_prefix = rtrim(add(text, NULL));\n \n cchdr = 0;\n lm = 0;\n@@ -1318,7 +1319,7 @@\n \tcount = (c1->c_width ? c1->c_width : global.c_width)\n \t - c1->c_offset - strlen (c2->c_text);\n \tif (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))\n-\t count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;\n+\t count -= strlen(text) + 2;\n \tlm = c1->c_offset + (count \/ 2);\n } else {\n \tif (c1->c_offset)\n@@ -1327,17 +1328,16 @@\n \n if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {\n if (c1->c_flags & UPPERCASE)\t\t\/* uppercase component also *\/\n-\t for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)\n+\t for (cp = text; *cp; cp++)\n *cp = toupper ((unsigned char) *cp);\n-\tputstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);\n+\tputstr(text, c1->c_flags);\n \tif (flag != BODYCOMP) {\n \t putstr (\": \", c1->c_flags);\n \t if (!(c1->c_flags & SPLIT))\n \t\tc1->c_flags |= HDROUTPUT;\n \n \tcchdr++;\n-\tif ((count = c1->c_cwidth -\n-\t\tstrlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)\n+\tif ((count = c1->c_cwidth - strlen(text) - 2) > 0)\n \t while (count--)\n \t\tputstr (\" \", c1->c_flags);\n \t}\n@@ -1372,7 +1372,7 @@\n \t\t\t: (int) strlen (c2->c_name) + 2;\n \telse\n \t count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth\n-\t\t\t: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;\n+\t\t\t: strlen(text) + 2;\n }\n count += c1->c_offset;\n \n@@ -1388,7 +1388,7 @@\n \t \/* Output component, trimming trailing whitespace if there\n \t is no text on the line. *\/\n \t if (*cp) {\n-\t\tputstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);\n+\t\tputstr(text, c1->c_flags);\n \t } else {\n \t\tputstr (trimmed_prefix, c1->c_flags);\n \t }\n"} {"commit":"7a5f019bd3a086f4024724be936d6cd87b963daa","subject":"Removed leftover function declaration from channel args","message":"Removed leftover function declaration from channel args\n","repos":"7anner\/grpc,ejona86\/grpc,malexzx\/grpc,adelez\/grpc,msmania\/grpc,wcevans\/grpc,Crevil\/grpc,7anner\/grpc,thunderboltsid\/grpc,infinit\/grpc,msmania\/grpc,PeterFaiman\/ruby-grpc-minimal,sreecha\/grpc,royalharsh\/grpc,pszemus\/grpc,msmania\/grpc,muxi\/grpc,adelez\/grpc,hstefan\/grpc,chrisdunelm\/grpc,geffzhang\/grpc,adelez\/grpc,a11r\/grpc,a-veitch\/grpc,thinkerou\/grpc,royalharsh\/grpc,ncteisen\/grpc,greasypizza\/grpc,vsco\/grpc,leifurhauks\/grpc,nicolasnoble\/grpc,tengyifei\/grpc,vjpai\/grpc,donnadionne\/grpc,ncteisen\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,grpc\/grpc,mehrdada\/grpc,jcanizales\/grpc,andrewpollock\/grpc,sreecha\/grpc,jtattermusch\/grpc,andrewpollock\/grpc,daniel-j-born\/grpc,arkmaxim\/grpc,dgquintas\/grpc,baylabs\/grpc,jtattermusch\/grpc,grpc\/grpc,Crevil\/grpc,yugui\/grpc,vjpai\/grpc,thunderboltsid\/grpc,muxi\/grpc,baylabs\/grpc,leifurhauks\/grpc,hstefan\/grpc,rjshade\/grpc,y-zeng\/grpc,donnadionne\/grpc,muxi\/grpc,thinkerou\/grpc,daniel-j-born\/grpc,grpc\/grpc,mehrdada\/grpc,sreecha\/grpc,yongni\/grpc,kriswuollett\/grpc,nicolasnoble\/grpc,royalharsh\/grpc,stanley-cheung\/grpc,muxi\/grpc,ncteisen\/grpc,dklempner\/grpc,vsco\/grpc,yang-g\/grpc,quizlet\/grpc,yang-g\/grpc,tengyifei\/grpc,y-zeng\/grpc,Crevil\/grpc,MakMukhi\/grpc,arkmaxim\/grpc,firebase\/grpc,soltanmm\/grpc,pszemus\/grpc,quizlet\/grpc,leifurhauks\/grpc,arkmaxim\/grpc,thunderboltsid\/grpc,podsvirov\/grpc,goldenbull\/grpc,kumaralokgithub\/grpc,leifurhauks\/grpc,LuminateWireless\/grpc,vjpai\/grpc,murgatroid99\/grpc,greasypizza\/grpc,quizlet\/grpc,jboeuf\/grpc,grani\/grpc,quizlet\/grpc,dgquintas\/grpc,perumaalgoog\/grpc,Vizerai\/grpc,rjshade\/grpc,donnadionne\/grpc,vjpai\/grpc,firebase\/grpc,greasypizza\/grpc,vsco\/grpc,muxi\/grpc,a-veitch\/grpc,a11r\/grpc,kpayson64\/grpc,makdharma\/grpc,jcanizales\/grpc,jboeuf\/grpc,kumaralokgithub\/grpc,tengyifei\/grpc,pmarks-net\/grpc,kriswuollett\/grpc,leifurhauks\/grpc,kumaralokgithub\/grpc,tengyifei\/grpc,deepaklukose\/grpc,perumaalgoog\/grpc,goldenbull\/grpc,chrisdunelm\/grpc,kumaralokgithub\/grpc,quizlet\/grpc,goldenbull\/grpc,fuchsia-mirror\/third_party-grpc,apolcyn\/grpc,hstefan\/grpc,pszemus\/grpc,Vizerai\/grpc,deepaklukose\/grpc,ipylypiv\/grpc,Vizerai\/grpc,chrisdunelm\/grpc,matt-kwong\/grpc,ctiller\/grpc,leifurhauks\/grpc,grpc\/grpc,infinit\/grpc,simonkuang\/grpc,carl-mastrangelo\/grpc,ctiller\/grpc,grani\/grpc,zhimingxie\/grpc,murgatroid99\/grpc,greasypizza\/grpc,PeterFaiman\/ruby-grpc-minimal,MakMukhi\/grpc,arkmaxim\/grpc,a-veitch\/grpc,grpc\/grpc,jboeuf\/grpc,grpc\/grpc,LuminateWireless\/grpc,donnadionne\/grpc,grani\/grpc,murgatroid99\/grpc,baylabs\/grpc,simonkuang\/grpc,kskalski\/grpc,jcanizales\/grpc,pmarks-net\/grpc,ncteisen\/grpc,murgatroid99\/grpc,yang-g\/grpc,dklempner\/grpc,donnadionne\/grpc,leifurhauks\/grpc,yang-g\/grpc,yongni\/grpc,rjshade\/grpc,sreecha\/grpc,dgquintas\/grpc,murgatroid99\/grpc,kpayson64\/grpc,muxi\/grpc,kriswuollett\/grpc,jboeuf\/grpc,donnadionne\/grpc,msmania\/grpc,a-veitch\/grpc,perumaalgoog\/grpc,makdharma\/grpc,geffzhang\/grpc,kpayson64\/grpc,kriswuollett\/grpc,apolcyn\/grpc,stanley-cheung\/grpc,deepaklukose\/grpc,goldenbull\/grpc,nicolasnoble\/grpc,ctiller\/grpc,goldenbull\/grpc,carl-mastrangelo\/grpc,quizlet\/grpc,soltanmm\/grpc,yang-g\/grpc,donnadionne\/grpc,Crevil\/grpc,ppietrasa\/grpc,dklempner\/grpc,matt-kwong\/grpc,bogdandrutu\/grpc,murgatroid99\/grpc,royalharsh\/grpc,a-veitch\/grpc,apolcyn\/grpc,jcanizales\/grpc,bogdandrutu\/grpc,jtattermusch\/grpc,matt-kwong\/grpc,a11r\/grpc,stanley-cheung\/grpc,geffzhang\/grpc,jtattermusch\/grpc,ejona86\/grpc,nicolasnoble\/grpc,apolcyn\/grpc,PeterFaiman\/ruby-grpc-minimal,ipylypiv\/grpc,PeterFaiman\/ruby-grpc-minimal,arkmaxim\/grpc,carl-mastrangelo\/grpc,geffzhang\/grpc,kriswuollett\/grpc,kskalski\/grpc,geffzhang\/grpc,PeterFaiman\/ruby-grpc-minimal,greasypizza\/grpc,jboeuf\/grpc,kumaralokgithub\/grpc,perumaalgoog\/grpc,jtattermusch\/grpc,podsvirov\/grpc,goldenbull\/grpc,firebase\/grpc,tengyifei\/grpc,Vizerai\/grpc,soltanmm\/grpc,LuminateWireless\/grpc,fuchsia-mirror\/third_party-grpc,stanley-cheung\/grpc,wcevans\/grpc,adelez\/grpc,philcleveland\/grpc,y-zeng\/grpc,sreecha\/grpc,mehrdada\/grpc,matt-kwong\/grpc,leifurhauks\/grpc,hstefan\/grpc,grani\/grpc,carl-mastrangelo\/grpc,PeterFaiman\/ruby-grpc-minimal,ncteisen\/grpc,thinkerou\/grpc,msmania\/grpc,ejona86\/grpc,tengyifei\/grpc,LuminateWireless\/grpc,ncteisen\/grpc,zhimingxie\/grpc,stanley-cheung\/grpc,andrewpollock\/grpc,soltanmm-google\/grpc,Vizerai\/grpc,rjshade\/grpc,daniel-j-born\/grpc,LuminateWireless\/grpc,soltanmm-google\/grpc,baylabs\/grpc,pszemus\/grpc,firebase\/grpc,zhimingxie\/grpc,MakMukhi\/grpc,kpayson64\/grpc,muxi\/grpc,7anner\/grpc,sreecha\/grpc,y-zeng\/grpc,grpc\/grpc,MakMukhi\/grpc,fuchsia-mirror\/third_party-grpc,geffzhang\/grpc,ejona86\/grpc,philcleveland\/grpc,yongni\/grpc,greasypizza\/grpc,matt-kwong\/grpc,geffzhang\/grpc,jcanizales\/grpc,perumaalgoog\/grpc,soltanmm-google\/grpc,arkmaxim\/grpc,donnadionne\/grpc,bogdandrutu\/grpc,pszemus\/grpc,nicolasnoble\/grpc,nicolasnoble\/grpc,andrewpollock\/grpc,matt-kwong\/grpc,vsco\/grpc,MakMukhi\/grpc,grani\/grpc,wcevans\/grpc,adelez\/grpc,daniel-j-born\/grpc,pszemus\/grpc,LuminateWireless\/grpc,ppietrasa\/grpc,zhimingxie\/grpc,ppietrasa\/grpc,a11r\/grpc,philcleveland\/grpc,pszemus\/grpc,kriswuollett\/grpc,soltanmm\/grpc,muxi\/grpc,simonkuang\/grpc,tengyifei\/grpc,jcanizales\/grpc,podsvirov\/grpc,kriswuollett\/grpc,philcleveland\/grpc,jtattermusch\/grpc,makdharma\/grpc,bogdandrutu\/grpc,jboeuf\/grpc,chrisdunelm\/grpc,y-zeng\/grpc,greasypizza\/grpc,adelez\/grpc,fuchsia-mirror\/third_party-grpc,mehrdada\/grpc,PeterFaiman\/ruby-grpc-minimal,vsco\/grpc,muxi\/grpc,chrisdunelm\/grpc,sreecha\/grpc,perumaalgoog\/grpc,dklempner\/grpc,firebase\/grpc,simonkuang\/grpc,geffzhang\/grpc,dgquintas\/grpc,a11r\/grpc,ipylypiv\/grpc,a-veitch\/grpc,daniel-j-born\/grpc,jtattermusch\/grpc,podsvirov\/grpc,hstefan\/grpc,philcleveland\/grpc,yang-g\/grpc,andrewpollock\/grpc,podsvirov\/grpc,kpayson64\/grpc,ncteisen\/grpc,dgquintas\/grpc,7anner\/grpc,MakMukhi\/grpc,kpayson64\/grpc,deepaklukose\/grpc,kpayson64\/grpc,yongni\/grpc,ipylypiv\/grpc,vjpai\/grpc,baylabs\/grpc,kskalski\/grpc,chrisdunelm\/grpc,sreecha\/grpc,ctiller\/grpc,royalharsh\/grpc,fuchsia-mirror\/third_party-grpc,7anner\/grpc,tengyifei\/grpc,yongni\/grpc,pmarks-net\/grpc,pmarks-net\/grpc,a-veitch\/grpc,stanley-cheung\/grpc,kskalski\/grpc,malexzx\/grpc,donnadionne\/grpc,daniel-j-born\/grpc,yongni\/grpc,mehrdada\/grpc,adelez\/grpc,ppietrasa\/grpc,firebase\/grpc,grpc\/grpc,bogdandrutu\/grpc,kpayson64\/grpc,baylabs\/grpc,ctiller\/grpc,quizlet\/grpc,hstefan\/grpc,ipylypiv\/grpc,andrewpollock\/grpc,podsvirov\/grpc,pmarks-net\/grpc,carl-mastrangelo\/grpc,Vizerai\/grpc,malexzx\/grpc,nicolasnoble\/grpc,stanley-cheung\/grpc,deepaklukose\/grpc,y-zeng\/grpc,royalharsh\/grpc,ejona86\/grpc,Vizerai\/grpc,7anner\/grpc,firebase\/grpc,soltanmm-google\/grpc,mehrdada\/grpc,muxi\/grpc,deepaklukose\/grpc,sreecha\/grpc,kumaralokgithub\/grpc,LuminateWireless\/grpc,ejona86\/grpc,jboeuf\/grpc,perumaalgoog\/grpc,thinkerou\/grpc,carl-mastrangelo\/grpc,soltanmm-google\/grpc,ppietrasa\/grpc,pszemus\/grpc,kumaralokgithub\/grpc,bogdandrutu\/grpc,malexzx\/grpc,thinkerou\/grpc,nicolasnoble\/grpc,pszemus\/grpc,firebase\/grpc,pmarks-net\/grpc,mehrdada\/grpc,MakMukhi\/grpc,ipylypiv\/grpc,murgatroid99\/grpc,yugui\/grpc,kskalski\/grpc,kskalski\/grpc,ppietrasa\/grpc,tengyifei\/grpc,stanley-cheung\/grpc,yugui\/grpc,makdharma\/grpc,murgatroid99\/grpc,malexzx\/grpc,fuchsia-mirror\/third_party-grpc,andrewpollock\/grpc,stanley-cheung\/grpc,ppietrasa\/grpc,simonkuang\/grpc,soltanmm\/grpc,firebase\/grpc,makdharma\/grpc,apolcyn\/grpc,sreecha\/grpc,vjpai\/grpc,deepaklukose\/grpc,chrisdunelm\/grpc,jtattermusch\/grpc,daniel-j-born\/grpc,vjpai\/grpc,podsvirov\/grpc,ejona86\/grpc,apolcyn\/grpc,kpayson64\/grpc,ncteisen\/grpc,vjpai\/grpc,ppietrasa\/grpc,greasypizza\/grpc,jcanizales\/grpc,jtattermusch\/grpc,andrewpollock\/grpc,perumaalgoog\/grpc,yugui\/grpc,sreecha\/grpc,Crevil\/grpc,soltanmm-google\/grpc,7anner\/grpc,vsco\/grpc,yongni\/grpc,PeterFaiman\/ruby-grpc-minimal,bogdandrutu\/grpc,hstefan\/grpc,chrisdunelm\/grpc,bogdandrutu\/grpc,LuminateWireless\/grpc,chrisdunelm\/grpc,rjshade\/grpc,dgquintas\/grpc,thunderboltsid\/grpc,rjshade\/grpc,vjpai\/grpc,Vizerai\/grpc,yang-g\/grpc,apolcyn\/grpc,dklempner\/grpc,nicolasnoble\/grpc,zhimingxie\/grpc,kumaralokgithub\/grpc,msmania\/grpc,arkmaxim\/grpc,soltanmm\/grpc,ppietrasa\/grpc,chrisdunelm\/grpc,soltanmm-google\/grpc,donnadionne\/grpc,Crevil\/grpc,MakMukhi\/grpc,carl-mastrangelo\/grpc,kriswuollett\/grpc,philcleveland\/grpc,jtattermusch\/grpc,ejona86\/grpc,dklempner\/grpc,jboeuf\/grpc,a-veitch\/grpc,y-zeng\/grpc,zhimingxie\/grpc,ctiller\/grpc,perumaalgoog\/grpc,zhimingxie\/grpc,thinkerou\/grpc,matt-kwong\/grpc,quizlet\/grpc,jcanizales\/grpc,fuchsia-mirror\/third_party-grpc,rjshade\/grpc,yongni\/grpc,msmania\/grpc,jcanizales\/grpc,infinit\/grpc,deepaklukose\/grpc,MakMukhi\/grpc,grani\/grpc,wcevans\/grpc,royalharsh\/grpc,firebase\/grpc,ipylypiv\/grpc,nicolasnoble\/grpc,bogdandrutu\/grpc,soltanmm\/grpc,dgquintas\/grpc,Crevil\/grpc,simonkuang\/grpc,7anner\/grpc,rjshade\/grpc,Crevil\/grpc,7anner\/grpc,infinit\/grpc,vjpai\/grpc,geffzhang\/grpc,deepaklukose\/grpc,kskalski\/grpc,pmarks-net\/grpc,grpc\/grpc,daniel-j-born\/grpc,kpayson64\/grpc,y-zeng\/grpc,baylabs\/grpc,murgatroid99\/grpc,infinit\/grpc,makdharma\/grpc,thunderboltsid\/grpc,fuchsia-mirror\/third_party-grpc,thunderboltsid\/grpc,rjshade\/grpc,a-veitch\/grpc,PeterFaiman\/ruby-grpc-minimal,mehrdada\/grpc,matt-kwong\/grpc,Crevil\/grpc,wcevans\/grpc,ncteisen\/grpc,dgquintas\/grpc,yugui\/grpc,simonkuang\/grpc,wcevans\/grpc,pmarks-net\/grpc,andrewpollock\/grpc,mehrdada\/grpc,dgquintas\/grpc,zhimingxie\/grpc,grpc\/grpc,yang-g\/grpc,hstefan\/grpc,ejona86\/grpc,kriswuollett\/grpc,jtattermusch\/grpc,makdharma\/grpc,goldenbull\/grpc,wcevans\/grpc,goldenbull\/grpc,simonkuang\/grpc,ctiller\/grpc,infinit\/grpc,daniel-j-born\/grpc,Vizerai\/grpc,firebase\/grpc,LuminateWireless\/grpc,thunderboltsid\/grpc,grpc\/grpc,ctiller\/grpc,malexzx\/grpc,soltanmm-google\/grpc,royalharsh\/grpc,yang-g\/grpc,fuchsia-mirror\/third_party-grpc,grani\/grpc,yugui\/grpc,muxi\/grpc,stanley-cheung\/grpc,stanley-cheung\/grpc,infinit\/grpc,baylabs\/grpc,ctiller\/grpc,carl-mastrangelo\/grpc,infinit\/grpc,vsco\/grpc,soltanmm-google\/grpc,jboeuf\/grpc,stanley-cheung\/grpc,pszemus\/grpc,ejona86\/grpc,makdharma\/grpc,ncteisen\/grpc,muxi\/grpc,jtattermusch\/grpc,donnadionne\/grpc,mehrdada\/grpc,vsco\/grpc,kskalski\/grpc,firebase\/grpc,malexzx\/grpc,thunderboltsid\/grpc,ipylypiv\/grpc,leifurhauks\/grpc,mehrdada\/grpc,thinkerou\/grpc,carl-mastrangelo\/grpc,pszemus\/grpc,vjpai\/grpc,fuchsia-mirror\/third_party-grpc,adelez\/grpc,donnadionne\/grpc,thinkerou\/grpc,dklempner\/grpc,wcevans\/grpc,philcleveland\/grpc,adelez\/grpc,y-zeng\/grpc,jboeuf\/grpc,a11r\/grpc,PeterFaiman\/ruby-grpc-minimal,kumaralokgithub\/grpc,ctiller\/grpc,ejona86\/grpc,yugui\/grpc,yugui\/grpc,msmania\/grpc,murgatroid99\/grpc,apolcyn\/grpc,pszemus\/grpc,a11r\/grpc,zhimingxie\/grpc,nicolasnoble\/grpc,thinkerou\/grpc,chrisdunelm\/grpc,msmania\/grpc,Vizerai\/grpc,arkmaxim\/grpc,mehrdada\/grpc,podsvirov\/grpc,ncteisen\/grpc,baylabs\/grpc,yugui\/grpc,carl-mastrangelo\/grpc,carl-mastrangelo\/grpc,a11r\/grpc,kskalski\/grpc,Vizerai\/grpc,goldenbull\/grpc,sreecha\/grpc,ctiller\/grpc,vjpai\/grpc,quizlet\/grpc,jboeuf\/grpc,matt-kwong\/grpc,a11r\/grpc,malexzx\/grpc,ctiller\/grpc,carl-mastrangelo\/grpc,royalharsh\/grpc,philcleveland\/grpc,makdharma\/grpc,grpc\/grpc,pmarks-net\/grpc,dklempner\/grpc,thinkerou\/grpc,thunderboltsid\/grpc,grani\/grpc,dklempner\/grpc,arkmaxim\/grpc,simonkuang\/grpc,apolcyn\/grpc,soltanmm\/grpc,yongni\/grpc,grani\/grpc,podsvirov\/grpc,ncteisen\/grpc,philcleveland\/grpc,vsco\/grpc,wcevans\/grpc,soltanmm\/grpc,kpayson64\/grpc,greasypizza\/grpc,ejona86\/grpc,malexzx\/grpc,dgquintas\/grpc,thinkerou\/grpc,jboeuf\/grpc,infinit\/grpc,dgquintas\/grpc,hstefan\/grpc,thinkerou\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/lib\/channel\/channel_args.h\n+++ src\/core\/lib\/channel\/channel_args.h\n@@ -56,10 +56,6 @@\n \/** Destroy arguments created by \\a grpc_channel_args_copy *\/\n void grpc_channel_args_destroy(grpc_channel_args *a);\n \n-\/** Reads census_enabled settings from channel args. Returns 1 if census_enabled\n- * is specified in channel args, otherwise returns 0. *\/\n-int grpc_channel_args_is_census_enabled(const grpc_channel_args *a);\n-\n \/** Returns the compression algorithm set in \\a a. *\/\n grpc_compression_algorithm grpc_channel_args_get_compression_algorithm(\n const grpc_channel_args *a);\n"} {"commit":"14e7f92ac37c70e4267e8602a036aa4e08a09447","subject":"slocal.c: Alter trim() to return static array, not malloc(3).","message":"slocal.c: Alter trim() to return static array, not malloc(3).\n\nThe callers are immediately passing the return value to printf(3) for\n\"%s\". There's only one call per printf(). None of the callers are\nbothering to free(3) the existing return value. Return the address of\ntrim()'s char array, now static, instead. Leave trim() returning NULL\nwhen passed NULL, even though that gives NULL to print(3) for \"%s\". It,\nand slocal's other bugs, remain.\n","repos":"mcr\/nmh,mcr\/nmh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- uip\/slocal.c\n+++ uip\/slocal.c\n@@ -1293,7 +1293,7 @@\n static char *\n trim (char *cp)\n {\n- char buffer[BUFSIZ*4];\n+ static char buffer[BUFSIZ * 4];\n char *bp, *sp;\n \n if (cp == NULL)\n@@ -1320,8 +1320,7 @@\n \tif (isspace((unsigned char) *sp))\n \t *sp = ' ';\n \n- \/* now return a copy *\/\n- return mh_xstrdup(bp);\n+ return bp;\n }\n \n \/*\n"} {"commit":"c09d784591d75f64256232d441ae90f6525dc1f9","subject":"Fix resource quota","message":"Fix resource quota\n","repos":"thinkerou\/grpc,thinkerou\/grpc,jtattermusch\/grpc,nicolasnoble\/grpc,daniel-j-born\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,dklempner\/grpc,jboeuf\/grpc,jboeuf\/grpc,ipylypiv\/grpc,dklempner\/grpc,vjpai\/grpc,carl-mastrangelo\/grpc,quizlet\/grpc,ejona86\/grpc,fuchsia-mirror\/third_party-grpc,donnadionne\/grpc,makdharma\/grpc,kumaralokgithub\/grpc,a11r\/grpc,royalharsh\/grpc,ejona86\/grpc,7anner\/grpc,stanley-cheung\/grpc,firebase\/grpc,greasypizza\/grpc,firebase\/grpc,baylabs\/grpc,dgquintas\/grpc,rjshade\/grpc,donnadionne\/grpc,vjpai\/grpc,thinkerou\/grpc,grani\/grpc,jtattermusch\/grpc,infinit\/grpc,makdharma\/grpc,baylabs\/grpc,pmarks-net\/grpc,PeterFaiman\/ruby-grpc-minimal,dgquintas\/grpc,greasypizza\/grpc,jboeuf\/grpc,royalharsh\/grpc,muxi\/grpc,ncteisen\/grpc,ncteisen\/grpc,7anner\/grpc,Vizerai\/grpc,grpc\/grpc,stanley-cheung\/grpc,muxi\/grpc,royalharsh\/grpc,sreecha\/grpc,msmania\/grpc,nicolasnoble\/grpc,jboeuf\/grpc,vsco\/grpc,simonkuang\/grpc,muxi\/grpc,hstefan\/grpc,ncteisen\/grpc,ctiller\/grpc,makdharma\/grpc,ctiller\/grpc,pszemus\/grpc,yongni\/grpc,muxi\/grpc,matt-kwong\/grpc,philcleveland\/grpc,baylabs\/grpc,yang-g\/grpc,mehrdada\/grpc,matt-kwong\/grpc,Vizerai\/grpc,Vizerai\/grpc,pszemus\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,Vizerai\/grpc,infinit\/grpc,nicolasnoble\/grpc,carl-mastrangelo\/grpc,mehrdada\/grpc,carl-mastrangelo\/grpc,dgquintas\/grpc,Crevil\/grpc,grani\/grpc,chrisdunelm\/grpc,yugui\/grpc,ejona86\/grpc,yang-g\/grpc,fuchsia-mirror\/third_party-grpc,donnadionne\/grpc,baylabs\/grpc,quizlet\/grpc,wcevans\/grpc,yugui\/grpc,soltanmm-google\/grpc,geffzhang\/grpc,ctiller\/grpc,nicolasnoble\/grpc,LuminateWireless\/grpc,wcevans\/grpc,rjshade\/grpc,deepaklukose\/grpc,kriswuollett\/grpc,geffzhang\/grpc,adelez\/grpc,a11r\/grpc,apolcyn\/grpc,stanley-cheung\/grpc,jtattermusch\/grpc,deepaklukose\/grpc,fuchsia-mirror\/third_party-grpc,dklempner\/grpc,apolcyn\/grpc,infinit\/grpc,philcleveland\/grpc,geffzhang\/grpc,mehrdada\/grpc,makdharma\/grpc,apolcyn\/grpc,chrisdunelm\/grpc,matt-kwong\/grpc,a11r\/grpc,ipylypiv\/grpc,kskalski\/grpc,donnadionne\/grpc,matt-kwong\/grpc,Vizerai\/grpc,baylabs\/grpc,chrisdunelm\/grpc,philcleveland\/grpc,murgatroid99\/grpc,nicolasnoble\/grpc,geffzhang\/grpc,PeterFaiman\/ruby-grpc-minimal,grpc\/grpc,thinkerou\/grpc,kskalski\/grpc,kskalski\/grpc,7anner\/grpc,kumaralokgithub\/grpc,msmania\/grpc,jboeuf\/grpc,infinit\/grpc,PeterFaiman\/ruby-grpc-minimal,grpc\/grpc,greasypizza\/grpc,MakMukhi\/grpc,adelez\/grpc,chrisdunelm\/grpc,soltanmm-google\/grpc,jboeuf\/grpc,adelez\/grpc,pmarks-net\/grpc,adelez\/grpc,msmania\/grpc,simonkuang\/grpc,daniel-j-born\/grpc,infinit\/grpc,mehrdada\/grpc,kumaralokgithub\/grpc,MakMukhi\/grpc,stanley-cheung\/grpc,yugui\/grpc,dklempner\/grpc,baylabs\/grpc,muxi\/grpc,infinit\/grpc,makdharma\/grpc,deepaklukose\/grpc,grani\/grpc,hstefan\/grpc,simonkuang\/grpc,apolcyn\/grpc,ctiller\/grpc,yang-g\/grpc,greasypizza\/grpc,vsco\/grpc,geffzhang\/grpc,vjpai\/grpc,ejona86\/grpc,makdharma\/grpc,yongni\/grpc,wcevans\/grpc,pszemus\/grpc,greasypizza\/grpc,carl-mastrangelo\/grpc,mehrdada\/grpc,rjshade\/grpc,zhimingxie\/grpc,firebase\/grpc,rjshade\/grpc,mehrdada\/grpc,ipylypiv\/grpc,dgquintas\/grpc,makdharma\/grpc,quizlet\/grpc,carl-mastrangelo\/grpc,kumaralokgithub\/grpc,dgquintas\/grpc,7anner\/grpc,PeterFaiman\/ruby-grpc-minimal,jboeuf\/grpc,donnadionne\/grpc,thinkerou\/grpc,deepaklukose\/grpc,kumaralokgithub\/grpc,geffzhang\/grpc,ncteisen\/grpc,hstefan\/grpc,quizlet\/grpc,kpayson64\/grpc,dklempner\/grpc,philcleveland\/grpc,LuminateWireless\/grpc,thinkerou\/grpc,apolcyn\/grpc,zhimingxie\/grpc,sreecha\/grpc,daniel-j-born\/grpc,kriswuollett\/grpc,sreecha\/grpc,a11r\/grpc,zhimingxie\/grpc,baylabs\/grpc,PeterFaiman\/ruby-grpc-minimal,murgatroid99\/grpc,chrisdunelm\/grpc,dklempner\/grpc,geffzhang\/grpc,dgquintas\/grpc,deepaklukose\/grpc,grpc\/grpc,sreecha\/grpc,sreecha\/grpc,kriswuollett\/grpc,zhimingxie\/grpc,kskalski\/grpc,a11r\/grpc,ncteisen\/grpc,wcevans\/grpc,ipylypiv\/grpc,thinkerou\/grpc,ncteisen\/grpc,vjpai\/grpc,LuminateWireless\/grpc,grpc\/grpc,PeterFaiman\/ruby-grpc-minimal,a11r\/grpc,geffzhang\/grpc,fuchsia-mirror\/third_party-grpc,jboeuf\/grpc,yongni\/grpc,matt-kwong\/grpc,mehrdada\/grpc,quizlet\/grpc,kskalski\/grpc,murgatroid99\/grpc,vsco\/grpc,pmarks-net\/grpc,infinit\/grpc,a11r\/grpc,ejona86\/grpc,vsco\/grpc,jtattermusch\/grpc,murgatroid99\/grpc,deepaklukose\/grpc,adelez\/grpc,kumaralokgithub\/grpc,royalharsh\/grpc,ejona86\/grpc,ejona86\/grpc,adelez\/grpc,sreecha\/grpc,7anner\/grpc,kumaralokgithub\/grpc,msmania\/grpc,vsco\/grpc,Vizerai\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,murgatroid99\/grpc,soltanmm-google\/grpc,ctiller\/grpc,ncteisen\/grpc,vjpai\/grpc,greasypizza\/grpc,chrisdunelm\/grpc,donnadionne\/grpc,MakMukhi\/grpc,firebase\/grpc,ipylypiv\/grpc,matt-kwong\/grpc,hstefan\/grpc,pszemus\/grpc,donnadionne\/grpc,LuminateWireless\/grpc,donnadionne\/grpc,fuchsia-mirror\/third_party-grpc,vjpai\/grpc,stanley-cheung\/grpc,yugui\/grpc,firebase\/grpc,apolcyn\/grpc,wcevans\/grpc,donnadionne\/grpc,firebase\/grpc,vsco\/grpc,kpayson64\/grpc,baylabs\/grpc,pmarks-net\/grpc,grpc\/grpc,jtattermusch\/grpc,simonkuang\/grpc,carl-mastrangelo\/grpc,MakMukhi\/grpc,MakMukhi\/grpc,pmarks-net\/grpc,LuminateWireless\/grpc,carl-mastrangelo\/grpc,sreecha\/grpc,daniel-j-born\/grpc,apolcyn\/grpc,carl-mastrangelo\/grpc,kskalski\/grpc,jtattermusch\/grpc,ejona86\/grpc,vsco\/grpc,muxi\/grpc,simonkuang\/grpc,ejona86\/grpc,ipylypiv\/grpc,fuchsia-mirror\/third_party-grpc,nicolasnoble\/grpc,fuchsia-mirror\/third_party-grpc,grani\/grpc,msmania\/grpc,murgatroid99\/grpc,firebase\/grpc,kpayson64\/grpc,dgquintas\/grpc,MakMukhi\/grpc,LuminateWireless\/grpc,grpc\/grpc,dgquintas\/grpc,philcleveland\/grpc,muxi\/grpc,sreecha\/grpc,firebase\/grpc,7anner\/grpc,Vizerai\/grpc,PeterFaiman\/ruby-grpc-minimal,Crevil\/grpc,zhimingxie\/grpc,murgatroid99\/grpc,adelez\/grpc,adelez\/grpc,firebase\/grpc,pmarks-net\/grpc,philcleveland\/grpc,rjshade\/grpc,ipylypiv\/grpc,simonkuang\/grpc,sreecha\/grpc,zhimingxie\/grpc,mehrdada\/grpc,daniel-j-born\/grpc,deepaklukose\/grpc,a11r\/grpc,MakMukhi\/grpc,sreecha\/grpc,simonkuang\/grpc,Crevil\/grpc,ipylypiv\/grpc,ctiller\/grpc,rjshade\/grpc,chrisdunelm\/grpc,grani\/grpc,kpayson64\/grpc,zhimingxie\/grpc,hstefan\/grpc,PeterFaiman\/ruby-grpc-minimal,hstefan\/grpc,nicolasnoble\/grpc,grpc\/grpc,royalharsh\/grpc,yugui\/grpc,simonkuang\/grpc,pmarks-net\/grpc,muxi\/grpc,nicolasnoble\/grpc,nicolasnoble\/grpc,kpayson64\/grpc,ctiller\/grpc,kriswuollett\/grpc,stanley-cheung\/grpc,carl-mastrangelo\/grpc,yugui\/grpc,yang-g\/grpc,pszemus\/grpc,yongni\/grpc,wcevans\/grpc,rjshade\/grpc,muxi\/grpc,grani\/grpc,grpc\/grpc,dgquintas\/grpc,msmania\/grpc,jtattermusch\/grpc,msmania\/grpc,royalharsh\/grpc,a11r\/grpc,Crevil\/grpc,philcleveland\/grpc,vjpai\/grpc,Vizerai\/grpc,yugui\/grpc,ncteisen\/grpc,daniel-j-born\/grpc,carl-mastrangelo\/grpc,apolcyn\/grpc,kskalski\/grpc,ejona86\/grpc,quizlet\/grpc,hstefan\/grpc,jtattermusch\/grpc,7anner\/grpc,stanley-cheung\/grpc,apolcyn\/grpc,stanley-cheung\/grpc,chrisdunelm\/grpc,ncteisen\/grpc,fuchsia-mirror\/third_party-grpc,dgquintas\/grpc,dklempner\/grpc,hstefan\/grpc,muxi\/grpc,sreecha\/grpc,Vizerai\/grpc,vsco\/grpc,stanley-cheung\/grpc,Vizerai\/grpc,chrisdunelm\/grpc,Vizerai\/grpc,kriswuollett\/grpc,greasypizza\/grpc,Crevil\/grpc,pszemus\/grpc,murgatroid99\/grpc,thinkerou\/grpc,7anner\/grpc,nicolasnoble\/grpc,royalharsh\/grpc,kpayson64\/grpc,thinkerou\/grpc,grpc\/grpc,mehrdada\/grpc,kskalski\/grpc,philcleveland\/grpc,soltanmm-google\/grpc,makdharma\/grpc,msmania\/grpc,muxi\/grpc,Crevil\/grpc,carl-mastrangelo\/grpc,thinkerou\/grpc,nicolasnoble\/grpc,ipylypiv\/grpc,quizlet\/grpc,greasypizza\/grpc,murgatroid99\/grpc,kpayson64\/grpc,yongni\/grpc,jboeuf\/grpc,ncteisen\/grpc,vjpai\/grpc,kriswuollett\/grpc,jtattermusch\/grpc,jboeuf\/grpc,kumaralokgithub\/grpc,Crevil\/grpc,donnadionne\/grpc,dgquintas\/grpc,thinkerou\/grpc,greasypizza\/grpc,wcevans\/grpc,ctiller\/grpc,ejona86\/grpc,zhimingxie\/grpc,jboeuf\/grpc,grani\/grpc,pmarks-net\/grpc,yang-g\/grpc,yang-g\/grpc,grpc\/grpc,LuminateWireless\/grpc,grani\/grpc,adelez\/grpc,soltanmm-google\/grpc,soltanmm-google\/grpc,deepaklukose\/grpc,rjshade\/grpc,ctiller\/grpc,deepaklukose\/grpc,stanley-cheung\/grpc,pszemus\/grpc,kpayson64\/grpc,carl-mastrangelo\/grpc,kriswuollett\/grpc,Crevil\/grpc,rjshade\/grpc,murgatroid99\/grpc,ctiller\/grpc,geffzhang\/grpc,sreecha\/grpc,infinit\/grpc,yongni\/grpc,LuminateWireless\/grpc,hstefan\/grpc,wcevans\/grpc,quizlet\/grpc,jtattermusch\/grpc,baylabs\/grpc,firebase\/grpc,philcleveland\/grpc,pszemus\/grpc,quizlet\/grpc,yongni\/grpc,kumaralokgithub\/grpc,matt-kwong\/grpc,LuminateWireless\/grpc,ncteisen\/grpc,kriswuollett\/grpc,yang-g\/grpc,soltanmm-google\/grpc,firebase\/grpc,thinkerou\/grpc,MakMukhi\/grpc,daniel-j-born\/grpc,vsco\/grpc,royalharsh\/grpc,stanley-cheung\/grpc,kpayson64\/grpc,donnadionne\/grpc,stanley-cheung\/grpc,yugui\/grpc,soltanmm-google\/grpc,kpayson64\/grpc,kriswuollett\/grpc,matt-kwong\/grpc,nicolasnoble\/grpc,yugui\/grpc,pszemus\/grpc,pszemus\/grpc,yang-g\/grpc,wcevans\/grpc,kpayson64\/grpc,simonkuang\/grpc,pmarks-net\/grpc,Crevil\/grpc,dklempner\/grpc,ejona86\/grpc,pszemus\/grpc,dklempner\/grpc,7anner\/grpc,ctiller\/grpc,jboeuf\/grpc,ctiller\/grpc,ncteisen\/grpc,soltanmm-google\/grpc,mehrdada\/grpc,jtattermusch\/grpc,royalharsh\/grpc,grani\/grpc,jtattermusch\/grpc,daniel-j-born\/grpc,daniel-j-born\/grpc,chrisdunelm\/grpc,msmania\/grpc,PeterFaiman\/ruby-grpc-minimal,yongni\/grpc,makdharma\/grpc,kskalski\/grpc,firebase\/grpc,pszemus\/grpc,vjpai\/grpc,mehrdada\/grpc,grpc\/grpc,matt-kwong\/grpc,PeterFaiman\/ruby-grpc-minimal,yang-g\/grpc,infinit\/grpc,mehrdada\/grpc,MakMukhi\/grpc,zhimingxie\/grpc,vjpai\/grpc,muxi\/grpc,yongni\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/lib\/iomgr\/resource_quota.c\n+++ src\/core\/lib\/iomgr\/resource_quota.c\n@@ -374,6 +374,7 @@\n size_t size) {\n ru_slice_refcount *rc = gpr_malloc(sizeof(ru_slice_refcount) + size);\n rc->base.vtable = &ru_slice_vtable;\n+ rc->base.sub_refcount = &rc->base;\n gpr_ref_init(&rc->refs, 1);\n rc->resource_user = resource_user;\n rc->size = size;\n"} {"commit":"f42502b635327938578dc4c8a44855c7b7c4bcbc","subject":"symbolic types for FB (and proper selectors for subtypes)","message":"symbolic types for FB (and proper selectors for subtypes)\n","repos":"iem-projects\/pd-iemrtp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- unpackRTCP.c\n+++ unpackRTCP.c\n@@ -298,6 +298,10 @@\n case RTCP_SDES: SETSYMBOL(ap+0, SELECTOR_RTCP_SDES); break;\n case RTCP_BYE : SETSYMBOL(ap+0, SELECTOR_RTCP_BYE); break;\n case RTCP_APP : SETSYMBOL(ap+0, SELECTOR_RTCP_APP); break;\n+\n+ case RTCP_RTPFB:SETSYMBOL(ap+0, SELECTOR_RTCP_RTPFB); break;\n+ case RTCP_PSFB: SETSYMBOL(ap+0, SELECTOR_RTCP_PSFB); break;\n+\n default:\n SETFLOAT(ap+0, type);\n }\n@@ -310,7 +314,7 @@\n case RTCP_RTPFB_NACK: SETSYMBOL(ap+0, SELECTOR_RTCP_RTPFB_NACK); break;\n default : SETFLOAT (ap+0, rtcp->subtype);\n }\n- outlet_anything(out, SELECTOR_RTCP_HEADER_FORMAT, 1, ap);\n+ outlet_anything(out, SELECTOR_RTCP_HEADER_SUBTYPE, 1, ap);\n break;\n case RTCP_PSFB:\n switch(rtcp->subtype) {\n@@ -320,7 +324,7 @@\n case RTCP_PSFB_AFB : SETSYMBOL(ap+0, SELECTOR_RTCP_PSFB_AFB ); break;\n default : SETFLOAT (ap+0, rtcp->subtype);\n }\n- outlet_anything(out, SELECTOR_RTCP_HEADER_FORMAT, 1, ap);\n+ outlet_anything(out, SELECTOR_RTCP_HEADER_SUBTYPE, 1, ap);\n break;\n \n default:\n"} {"commit":"ea3c053b18550c9871798b744cdde25071e78a2c","subject":"Make declarations safe for inclusion in C++ source files by wrapping everything in a extern \"C\" { \/* ... *\/ } block.","message":"Make declarations safe for inclusion in C++ source files by wrapping everything in a extern \"C\" { \/* ... *\/ } block.\n","repos":"bnoordhuis\/uriparser2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- uriparser2.h\n+++ uriparser2.h\n@@ -1,5 +1,9 @@\n #ifndef URIPARSER2_H_\n #define URIPARSER2_H_\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n \n \/**\n * URI object. After the call to uri_parse() fields will be NULL (0 for the port) if their component was absent in the input string.\n@@ -41,4 +45,8 @@\n *\/\n int uri_compare(const URI *a, const URI *b);\n \n+#ifdef __cplusplus\n+}\n+#endif\n+\n #endif\t\/* uriparser2.h *\/\n"} {"commit":"d37f43b0cd3bc5553c6e24203f2fdf3dbdca93a4","subject":"Added include of string.h","message":"Added include of string.h\n","repos":"dcrossleyau\/yaz,nla\/yaz,dcrossleyau\/yaz,nla\/yaz,nla\/yaz,dcrossleyau\/yaz,nla\/yaz","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- util\/cclsh.c\n+++ util\/cclsh.c\n@@ -44,7 +44,7 @@\n \/* CCL shell.\n * Europagate 1995\n *\n- * $Id: cclsh.c,v 1.2 2005-06-25 15:46:07 adam Exp $\n+ * $Id: cclsh.c,v 1.3 2006-09-11 12:12:42 adam Exp $\n *\n * Old Europagate Log:\n *\n@@ -86,6 +86,7 @@\n \n #include <stdio.h>\n #include <stdlib.h>\n+#include <string.h>\n \n #include <yaz\/ccl.h>\n \n"} {"commit":"26bc14edd457efbe27afc5e6f439b4b0c90afeb1","subject":"debugserver: minor","message":"debugserver: minor\n","repos":"loganek\/gst-debugger,loganek\/gst-debugger","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/debugserver\/gstdebugserverlog.c\n+++ src\/debugserver\/gstdebugserverlog.c\n@@ -72,7 +72,7 @@\n info.log = &log;\n size = gstreamer_info__get_packed_size (&info);\n \n- if (max_size > size) {\n+ if (max_size < size) {\n goto finalize;\n }\n \n"} {"commit":"76c71382bab5eb218848a0b784019c7b203c9f4a","subject":"mpool: Fix bug in reports.","message":"mpool: Fix bug in reports.\n","repos":"b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee,ironbee\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,b1v1r\/ironbee,ironbee\/ironbee,ironbee\/ironbee","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- util\/mpool.c\n+++ util\/mpool.c\n@@ -884,10 +884,11 @@\n IB_FTRACE_RET_STR(\"\");\n }\n \n- char *page = (char *)malloc(report->total_size);\n+ char *page = (char *)malloc(report->total_size + 1);\n if (page == NULL) {\n IB_FTRACE_RET_STR(NULL);\n }\n+ *page = '\\0';\n \n IB_MPOOL_FOREACH(ib_mpool_report_line_t, line, report->first) {\n strcat(page, line->line);\n"} {"commit":"fd2fcc1ba58dcd385390b9cb0123868e4c59416e","subject":"get_default mapped_type","message":"get_default mapped_type\n\ngit-svn-id: 357248c53bdac2d7b36f7ee045286eb205fcf757@518 ec762483-ff6d-05da-a07a-a48fb63a330f\n","repos":"kho\/mr-cdec,pks\/cdec-dtrain-legacy,agesmundo\/FasterCubePruning,kho\/mr-cdec,pks\/cdec-dtrain-legacy,agesmundo\/FasterCubePruning,agesmundo\/FasterCubePruning,agesmundo\/FasterCubePruning,pks\/cdec-dtrain-legacy,pks\/cdec-dtrain-legacy,kho\/mr-cdec,kho\/mr-cdec,agesmundo\/FasterCubePruning,kho\/mr-cdec,kho\/mr-cdec,pks\/cdec-dtrain-legacy,pks\/cdec-dtrain-legacy,agesmundo\/FasterCubePruning","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- utils\/hash.h\n+++ utils\/hash.h\n@@ -51,10 +51,11 @@\n }\n };\n \n+\n \/\/ adds default val to table if key wasn't found, returns ref to val\n template <class H,class K>\n typename H::mapped_type & get_default(H &ht,K const& k,typename H::mapped_type const& v) {\n- return const_cast<typename H::data_type &>(ht.insert(typename H::value_type(k,v)).first->second);\n+ return const_cast<typename H::mapped_type &>(ht.insert(typename H::value_type(k,v)).first->second);\n }\n \n #endif\n"} {"commit":"824003eb1d85fd6ec0795a7b0997fe4b29afe1e1","subject":"port wayland compositor to use Ecore_Wl2","message":"port wayland compositor to use Ecore_Wl2\n\nSigned-off-by: Chris Michael <177aeddb9e34930a357ecd8dd2d21c80fe280c85@samsung.com>\n","repos":"rvandegrift\/e,rvandegrift\/e,rvandegrift\/e","returncode":0,"stderr":"unknown","license":"bsd-2-clause","lang":"C","diff":""} {"commit":"e88b0ebebca98615a4bdf08056a99d7de15d01be","subject":"Fix Bug: If we're not Warp While Selecting, then don't warp","message":"Fix Bug: If we're not Warp While Selecting, then don't warp\n\n\ngit-svn-id: 0f3f1c46c6da7ffd142db61e503a7ff63af3a195@20514 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/e17,jordemort\/e17,jordemort\/e17","returncode":0,"stderr":"unknown","license":"bsd-2-clause","lang":"C","diff":""} {"commit":"7b38939e1d845efeec0b0e11df07a8f7125f9571","subject":"revert r3239; remove noise, it->file already set","message":"revert r3239; remove noise, it->file already set\n","repos":"GeeXboX\/enna,GeeXboX\/enna","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"355228440b29fbca9b4e17414ed5912397d85c55","subject":"Trying to fix some kind of error","message":"Trying to fix some kind of error\n","repos":"Soinou\/BriocheBot,Soinou\/BriocheBot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/hiredis\/hiredis.h\n+++ lib\/hiredis\/hiredis.h\n@@ -36,8 +36,13 @@\n #include <sys\/time.h> \/* for struct timeval *\/\n \n \/\/ MinGW Compatibility\n+#ifndef EINPROGRESS\n #define EINPROGRESS 112\n+#endif\n+\n+#ifndef EHOSTUNREACH\n #define EHOSTUNREACH 110\n+#endif\n \n #define HIREDIS_MAJOR 0\n #define HIREDIS_MINOR 11\n"} {"commit":"25bdc4ffbb337d217e73178c831dec46316e225b","subject":"Fix memory handling of numeric values.","message":"Fix memory handling of numeric values.\n","repos":"pjungwir\/aggs_for_vecs,pjungwir\/aggs_for_vecs,pjungwir\/aggs_for_vecs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- vec_to_min.c\n+++ vec_to_min.c\n@@ -101,7 +101,7 @@\n if (DatumGetFloat8(currentVals[i]) < DatumGetFloat8(state->dvalues[i])) state->dvalues[i] = currentVals[i];\n break;\n case NUMERICOID:\n- if (DatumGetBool(DirectFunctionCall2(numeric_lt, currentVals[i], state->dvalues[i]))) state->dvalues[i] = currentVals[i];\n+ if (DatumGetBool(DirectFunctionCall2(numeric_lt, currentVals[i], state->dvalues[i]))) state->dvalues[i] = datumCopy(currentVals[i], elemTypeByValue, elemTypeWidth);\n break;\n default:\n elog(ERROR, \"Unknown elemTypeId!\");\n"} {"commit":"72b0326c20d353eb8d59a85f63bb5701e8c85bc7","subject":"check if IPV6_TCLASS is defined","message":"check if IPV6_TCLASS is defined\n","repos":"pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,pecharmin\/bind9,each\/bind9-collab,each\/bind9-collab,pecharmin\/bind9,each\/bind9-collab","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- lib\/isc\/unix\/socket.c\n+++ lib\/isc\/unix\/socket.c\n@@ -1526,7 +1526,7 @@\n \t\t\t}\n \t\t}\n #endif\n-#ifdef IPPROTO_IPV6\n+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)\n \t\tif (sock->pf == AF_INET6 &&\n \t\t ((isc_net_probedscp() & ISC_NET_DSCPPKTV6) != 0))\n \t\t{\n"} {"commit":"f769ab0fa63754de317bafe2a7baf8fe401b961c","subject":"util: Disable u_time.c implementation for embedded.","message":"util: Disable u_time.c implementation for embedded.\n\nThis needs to go into OS module.\n","repos":"bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/auxiliary\/util\/u_time.c\n+++ src\/gallium\/auxiliary\/util\/u_time.c\n@@ -34,6 +34,8 @@\n \n \n #include \"pipe\/p_config.h\"\n+\n+#if !defined(PIPE_OS_EMBEDDED)\n \n #if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU)\n #include <sys\/time.h>\n@@ -223,3 +225,5 @@\n Sleep((usecs + 999)\/ 1000);\n }\n #endif\n+\n+#endif \/* !PIPE_OS_EMBEDDED *\/\n"} {"commit":"d8a415425e7761a7bed03a0c383cb3839eaf1b4b","subject":"nv50: reimplement draw_elements_instance(), use for draw_elements() too","message":"nv50: reimplement draw_elements_instance(), use for draw_elements() too\n\nThis makes draw_elements()\/draw_elements_instanced() do the right thing\nfor the non-inline elements cases, and not require flush_notify().\n","repos":"zeux\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,zz85\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/nv50\/nv50_vbo.c\n+++ src\/gallium\/drivers\/nv50\/nv50_vbo.c\n@@ -332,104 +332,65 @@\n \treturn TRUE;\n }\n \n-static INLINE void\n-nv50_draw_elements_inline(struct nv50_context *nv50,\n-\t\t\t void *map, unsigned indexSize,\n-\t\t\t unsigned start, unsigned count)\n-{\n-\tswitch (indexSize) {\n-\tcase 1:\n-\t\tnv50_draw_elements_inline_u08(nv50, map, start, count);\n-\t\tbreak;\n-\tcase 2:\n-\t\tnv50_draw_elements_inline_u16(nv50, map, start, count);\n-\t\tbreak;\n-\tcase 4:\n-\t\tnv50_draw_elements_inline_u32(nv50, map, start, count);\n-\t\tbreak;\n-\t}\n-}\n-\n-static unsigned\n-init_per_instance_arrays(struct nv50_context *nv50,\n-\t\t\t unsigned startInstance,\n-\t\t\t unsigned pos[16], unsigned step[16])\n-{\n-\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n-\tstruct nouveau_channel *chan = tesla->channel;\n-\tstruct nouveau_bo *bo;\n-\tstruct nouveau_stateobj *so;\n-\tunsigned i, b, count = 0;\n-\tconst uint32_t rl = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;\n-\n-\tso = so_new(nv50->vtxelt_nr, nv50->vtxelt_nr * 2, nv50->vtxelt_nr * 2);\n-\n-\tfor (i = 0; i < nv50->vtxelt_nr; ++i) {\n-\t\tif (!nv50->vtxelt[i].instance_divisor)\n-\t\t\tcontinue;\n-\t\t++count;\n-\t\tb = nv50->vtxelt[i].vertex_buffer_index;\n-\n-\t\tpos[i] = nv50->vtxelt[i].src_offset +\n-\t\t\tnv50->vtxbuf[b].buffer_offset +\n-\t\t\tstartInstance * nv50->vtxbuf[b].stride;\n-\n-\t\tif (!startInstance) {\n-\t\t\tstep[i] = 0;\n-\t\t\tcontinue;\n-\t\t}\n-\t\tstep[i] = startInstance % nv50->vtxelt[i].instance_divisor;\n-\n-\t\tbo = nouveau_bo(nv50->vtxbuf[b].buffer);\n-\n-\t\tso_method(so, tesla, NV50TCL_VERTEX_ARRAY_START_HIGH(i), 2);\n-\t\tso_reloc (so, bo, pos[i], rl | NOUVEAU_BO_HIGH, 0, 0);\n-\t\tso_reloc (so, bo, pos[i], rl | NOUVEAU_BO_LOW, 0, 0);\n-\t}\n-\n-\tif (count && startInstance) {\n-\t\tso_ref (so, &nv50->state.instbuf); \/* for flush notify *\/\n-\t\tso_emit(chan, nv50->state.instbuf);\n-\t}\n-\tso_ref (NULL, &so);\n-\n-\treturn count;\n-}\n-\n static void\n-step_per_instance_arrays(struct nv50_context *nv50,\n-\t\t\t unsigned pos[16], unsigned step[16])\n-{\n-\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n-\tstruct nouveau_channel *chan = tesla->channel;\n-\tstruct nouveau_bo *bo;\n-\tstruct nouveau_stateobj *so;\n-\tunsigned i, b;\n-\tconst uint32_t rl = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;\n-\n-\tso = so_new(nv50->vtxelt_nr, nv50->vtxelt_nr * 2, nv50->vtxelt_nr * 2);\n-\n-\tfor (i = 0; i < nv50->vtxelt_nr; ++i) {\n-\t\tif (!nv50->vtxelt[i].instance_divisor)\n-\t\t\tcontinue;\n-\t\tb = nv50->vtxelt[i].vertex_buffer_index;\n-\n-\t\tif (++step[i] == nv50->vtxelt[i].instance_divisor) {\n-\t\t\tstep[i] = 0;\n-\t\t\tpos[i] += nv50->vtxbuf[b].stride;\n-\t\t}\n-\n-\t\tbo = nouveau_bo(nv50->vtxbuf[b].buffer);\n-\n-\t\tso_method(so, tesla, NV50TCL_VERTEX_ARRAY_START_HIGH(i), 2);\n-\t\tso_reloc (so, bo, pos[i], rl | NOUVEAU_BO_HIGH, 0, 0);\n-\t\tso_reloc (so, bo, pos[i], rl | NOUVEAU_BO_LOW, 0, 0);\n-\t}\n-\n-\tso_ref (so, &nv50->state.instbuf); \/* for flush notify *\/\n-\tso_ref (NULL, &so);\n-\n-\tso_emit(chan, nv50->state.instbuf);\n+nv50_draw_elements_inline(struct pipe_context *pipe,\n+\t\t\t struct pipe_buffer *indexBuffer, unsigned indexSize,\n+\t\t\t unsigned mode, unsigned start, unsigned count,\n+\t\t\t unsigned startInstance, unsigned instanceCount)\n+{\n+\tstruct pipe_screen *pscreen = pipe->screen;\n+\tstruct nv50_context *nv50 = nv50_context(pipe);\n+\tstruct nouveau_channel *chan = nv50->screen->tesla->channel;\n+\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n+\tstruct instance a[16];\n+\tunsigned prim = nv50_prim(mode);\n+\tvoid *map;\n+\n+\tmap = pipe_buffer_map(pscreen, indexBuffer, PIPE_BUFFER_USAGE_CPU_READ);\n+\tassert(map);\n+\tif (!map)\n+\t\treturn;\n+\n+\tinstance_init(nv50, a, startInstance);\n+\tif (!nv50_state_validate(nv50, 0))\n+\t\treturn;\n+\n+\tBEGIN_RING(chan, tesla, NV50TCL_CB_ADDR, 2);\n+\tOUT_RING (chan, NV50_CB_AUX | (24 << 8));\n+\tOUT_RING (chan, startInstance);\n+\twhile (instanceCount--) {\n+\t\tif (AVAIL_RING(chan) < (7 + 16*3)) {\n+\t\t\tFIRE_RING(chan);\n+\t\t\tif (!nv50_state_validate(nv50, 0)) {\n+\t\t\t\tassert(0);\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t}\n+\t\tinstance_step(nv50, a);\n+\n+\t\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);\n+\t\tOUT_RING (chan, prim);\n+\t\tswitch (indexSize) {\n+\t\tcase 1:\n+\t\t\tnv50_draw_elements_inline_u08(nv50, map, start, count);\n+\t\t\tbreak;\n+\t\tcase 2:\n+\t\t\tnv50_draw_elements_inline_u16(nv50, map, start, count);\n+\t\t\tbreak;\n+\t\tcase 4:\n+\t\t\tnv50_draw_elements_inline_u32(nv50, map, start, count);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tassert(0);\n+\t\t\tbreak;\n+\t\t}\n+\t\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);\n+\t\tOUT_RING (chan, 0);\n+\n+\t\tprim |= (1 << 28);\n+\t}\n+\n+\tpipe_buffer_unmap(pscreen, indexBuffer);\n }\n \n void\n@@ -440,49 +401,62 @@\n \t\t\t unsigned startInstance, unsigned instanceCount)\n {\n \tstruct nv50_context *nv50 = nv50_context(pipe);\n-\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n-\tstruct nouveau_channel *chan = tesla->channel;\n-\tstruct pipe_screen *pscreen = pipe->screen;\n-\tvoid *map;\n-\tunsigned i, nz_divisors;\n-\tunsigned step[16], pos[16];\n-\n-\tmap = pipe_buffer_map(pscreen, indexBuffer, PIPE_BUFFER_USAGE_CPU_READ);\n-\n-\tif (!nv50_state_validate(nv50, 0))\n+\tstruct nouveau_channel *chan = nv50->screen->tesla->channel;\n+\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n+\tstruct instance a[16];\n+\tunsigned prim = nv50_prim(mode);\n+\n+\tif (indexSize == 1) {\n+\t\tnv50_draw_elements_inline(pipe, indexBuffer, indexSize,\n+\t\t\t\t\t mode, start, count, startInstance,\n+\t\t\t\t\t instanceCount);\n \t\treturn;\n-\tchan->flush_notify = nv50_state_flush_notify;\n-\n-\tnz_divisors = init_per_instance_arrays(nv50, startInstance, pos, step);\n+\t}\n+\n+\tinstance_init(nv50, a, startInstance);\n+\tif (!nv50_state_validate(nv50, 13 + 16*3))\n+\t\treturn;\n \n \tBEGIN_RING(chan, tesla, NV50TCL_CB_ADDR, 2);\n \tOUT_RING (chan, NV50_CB_AUX | (24 << 8));\n \tOUT_RING (chan, startInstance);\n-\n-\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);\n-\tOUT_RING (chan, nv50_prim(mode));\n-\n-\tnv50_draw_elements_inline(nv50, map, indexSize, start, count);\n-\n-\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);\n-\tOUT_RING (chan, 0);\n-\n-\tfor (i = 1; i < instanceCount; ++i) {\n-\t\tif (nz_divisors) \/* any non-zero array divisors ? *\/\n-\t\t\tstep_per_instance_arrays(nv50, pos, step);\n+\twhile (instanceCount--) {\n+\t\tif (AVAIL_RING(chan) < (7 + 16*3)) {\n+\t\t\tFIRE_RING(chan);\n+\t\t\tif (!nv50_state_validate(nv50, 10 + 16*3)) {\n+\t\t\t\tassert(0);\n+\t\t\t\treturn;\n+\t\t\t}\n+\t\t}\n+\t\tinstance_step(nv50, a);\n \n \t\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);\n-\t\tOUT_RING (chan, nv50_prim(mode) | (1 << 28));\n-\n-\t\tnv50_draw_elements_inline(nv50, map, indexSize, start, count);\n-\n+\t\tOUT_RING (chan, prim);\n+\t\tif (indexSize == 4) {\n+\t\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U32 | 0x30000, 0);\n+\t\t\tOUT_RING (chan, count);\n+\t\t\tnouveau_pushbuf_submit(chan, nouveau_bo(indexBuffer),\n+\t\t\t\t\t start << 2, count << 2);\n+\t\t} else\n+\t\tif (indexSize == 2) {\n+\t\t\tunsigned vb_start = (start & ~1);\n+\t\t\tunsigned vb_end = (start + count + 1) & ~1;\n+\t\t\tunsigned dwords = (vb_end - vb_start) >> 1;\n+\n+\t\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16_SETUP, 1);\n+\t\t\tOUT_RING (chan, ((start & 1) << 31) | count);\n+\t\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16 | 0x30000, 0);\n+\t\t\tOUT_RING (chan, dwords);\n+\t\t\tnouveau_pushbuf_submit(chan, nouveau_bo(indexBuffer),\n+\t\t\t\t\t vb_start << 1, dwords << 2);\n+\t\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16_SETUP, 1);\n+\t\t\tOUT_RING (chan, 0);\n+\t\t}\n \t\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);\n \t\tOUT_RING (chan, 0);\n-\t}\n-\n-\tchan->flush_notify = NULL;\n-\n-\tso_ref(NULL, &nv50->state.instbuf);\n+\n+\t\tprim |= (1 << 28);\n+\t}\n }\n \n void\n@@ -490,48 +464,8 @@\n \t\t struct pipe_buffer *indexBuffer, unsigned indexSize,\n \t\t unsigned mode, unsigned start, unsigned count)\n {\n-\tstruct nv50_context *nv50 = nv50_context(pipe);\n-\tstruct nouveau_channel *chan = nv50->screen->tesla->channel;\n-\tstruct nouveau_grobj *tesla = nv50->screen->tesla;\n-\tstruct pipe_screen *pscreen = pipe->screen;\n-\tvoid *map;\n-\t\n-\tif (!nv50_state_validate(nv50, 14))\n-\t\treturn;\n-\tchan->flush_notify = nv50_state_flush_notify;\n-\n-\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_BEGIN, 1);\n-\tOUT_RING (chan, nv50_prim(mode));\n-\n-\tif (indexSize == 4) {\n-\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U32 | 0x30000, 0);\n-\t\tOUT_RING (chan, count);\n-\t\tnouveau_pushbuf_submit(chan, nouveau_bo(indexBuffer),\n-\t\t\t\t start << 2, count << 2);\n-\t} else\n-\tif (indexSize == 2) {\n-\t\tunsigned vb_start = (start & ~1);\n-\t\tunsigned vb_end = (start + count + 1) & ~1;\n-\t\tunsigned dwords = (vb_end - vb_start) >> 1;\n-\n-\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16_SETUP, 1);\n-\t\tOUT_RING (chan, ((start & 1) << 31) | count);\n-\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16 | 0x30000, 0);\n-\t\tOUT_RING (chan, dwords);\n-\t\tnouveau_pushbuf_submit(chan, nouveau_bo(indexBuffer),\n-\t\t\t\t vb_start << 1, dwords << 2);\n-\t\tBEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_U16_SETUP, 1);\n-\t\tOUT_RING (chan, 0);\n-\t} else {\n-\t\tmap = pipe_buffer_map(pscreen, indexBuffer,\n-\t\t\t\t PIPE_BUFFER_USAGE_CPU_READ);\n-\t\tnv50_draw_elements_inline(nv50, map, indexSize, start, count);\n-\t\tpipe_buffer_unmap(pscreen, indexBuffer);\n-\t}\n-\n-\tBEGIN_RING(chan, tesla, NV50TCL_VERTEX_END, 1);\n-\tOUT_RING (chan, 0);\n-\tchan->flush_notify = NULL;\n+\tnv50_draw_elements_instanced(pipe, indexBuffer, indexSize,\n+\t\t\t\t mode, start, count, 0, 1);\n }\n \n static INLINE boolean\n"} {"commit":"64f2a70b0c7189c0176dadac2832b99401860449","subject":"muxingpipeline: Do not try to link appsrc elements when there are no needed","message":"muxingpipeline: Do not try to link appsrc elements when there are no needed\n\nChange-Id: I5ea6beb3530c3b220a7769e6b709ac511d079132\n","repos":"Kurento\/kms-elements,Kurento\/kms-elements,Kurento\/kms-elements","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gst-plugins\/kmsmuxingpipeline.c\n+++ src\/gst-plugins\/kmsmuxingpipeline.c\n@@ -380,18 +380,24 @@\n self->priv->encodebin, self->priv->sink);\n }\n \n- if (!gst_element_link_pads (self->priv->videosrc, \"src\",\n- self->priv->encodebin, \"video_%u\")) {\n- GST_ERROR_OBJECT (self, \"Could not link elements: %\"\n- GST_PTR_FORMAT \", %\" GST_PTR_FORMAT,\n- self->priv->videosrc, self->priv->encodebin);\n- }\n-\n- if (!gst_element_link_pads (self->priv->audiosrc, \"src\",\n- self->priv->encodebin, \"audio_%u\")) {\n- GST_ERROR_OBJECT (self, \"Could not link elements: %\"\n- GST_PTR_FORMAT \", %\" GST_PTR_FORMAT,\n- self->priv->audiosrc, self->priv->encodebin);\n+ if (kms_recording_profile_supports_type (self->priv->profile,\n+ KMS_ELEMENT_PAD_TYPE_VIDEO)) {\n+ if (!gst_element_link_pads (self->priv->videosrc, \"src\",\n+ self->priv->encodebin, \"video_%u\")) {\n+ GST_ERROR_OBJECT (self,\n+ \"Could not link elements: %\" GST_PTR_FORMAT \", %\" GST_PTR_FORMAT,\n+ self->priv->videosrc, self->priv->encodebin);\n+ }\n+ }\n+\n+ if (kms_recording_profile_supports_type (self->priv->profile,\n+ KMS_ELEMENT_PAD_TYPE_AUDIO)) {\n+ if (!gst_element_link_pads (self->priv->audiosrc, \"src\",\n+ self->priv->encodebin, \"audio_%u\")) {\n+ GST_ERROR_OBJECT (self,\n+ \"Could not link elements: %\" GST_PTR_FORMAT \", %\" GST_PTR_FORMAT,\n+ self->priv->audiosrc, self->priv->encodebin);\n+ }\n }\n }\n \n"} {"commit":"09bad61c4ca4ebe784865f2aaec94c136397579e","subject":"Extract the login name when doing a ps on a dead kernel.","message":"Extract the login name when doing a ps on a dead kernel.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"acfb98ece652bb7de614edddadd567faf136b4f5","subject":"remove stdio.h include; I forgot Bruce's cardinal rule that header files shouldn't include other ones (which, unfortunately, is also a hellish rule since he broke interfaces like sysctl this way by requiring undocumented header files to be included just in order to be able to use them now - SIGH!).","message":"remove stdio.h include; I forgot Bruce's cardinal rule that header files\nshouldn't include other ones (which, unfortunately, is also a hellish\nrule since he broke interfaces like sysctl this way by requiring undocumented\nheader files to be included just in order to be able to use them now - SIGH!).\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"47028c70f9ffa99a1533cf1d3e1725442fda56ca","subject":"Alloc vmods to bail out of ->init, now that we have mechanism for doing the right thing during fini.","message":"Alloc vmods to bail out of ->init, now that we have mechanism for\ndoing the right thing during fini.\n\nPatch by: Martin\n","repos":"gauthier-delacroix\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,mrhmouse\/Varnish-Cache,varnish\/Varnish-Cache,zhoualbeart\/Varnish-Cache,franciscovg\/Varnish-Cache,feld\/Varnish-Cache,varnish\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,zhoualbeart\/Varnish-Cache,zhoualbeart\/Varnish-Cache,feld\/Varnish-Cache,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,chrismoulton\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,mrhmouse\/Varnish-Cache,gquintard\/Varnish-Cache,gquintard\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,varnish\/Varnish-Cache,zhoualbeart\/Varnish-Cache,mrhmouse\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,gquintard\/Varnish-Cache,varnish\/Varnish-Cache,chrismoulton\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,feld\/Varnish-Cache,ajasty-cavium\/Varnish-Cache,franciscovg\/Varnish-Cache,zhoualbeart\/Varnish-Cache,gauthier-delacroix\/Varnish-Cache,varnish\/Varnish-Cache,franciscovg\/Varnish-Cache,gquintard\/Varnish-Cache,chrismoulton\/Varnish-Cache,mrhmouse\/Varnish-Cache,feld\/Varnish-Cache,franciscovg\/Varnish-Cache,chrismoulton\/Varnish-Cache,chrismoulton\/Varnish-Cache","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- lib\/libvcc\/vcc_vmod.c\n+++ lib\/libvcc\/vcc_vmod.c\n@@ -199,7 +199,8 @@\n \t\t\tif (ifp == NULL)\n \t\t\t\tifp = New_IniFin(tl);\n \t\t\tVSB_printf(ifp->ini,\n-\t\t\t \"\\t%s(&vmod_priv_%.*s, &VCL_conf);\",\n+\t\t\t \"\\tif (%s(&vmod_priv_%.*s, &VCL_conf))\\n\"\n+\t\t\t \"\\t\\treturn(1);\",\n \t\t\t p, PF(mod));\n \t\t} else {\n \t\t\tsym = VCC_AddSymbolStr(tl, p, SYM_FUNC);\n"} {"commit":"8aa9198e71f8e9602cf194bf60562bdf0b9a5dad","subject":"typo again :'(","message":"typo again :'(\n","repos":"angavrilov\/iphone-neko,angavrilov\/iphone-neko","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- vm\/context.c\n+++ vm\/context.c\n@@ -55,7 +55,7 @@\n _context *context_new() {\n \t_context *ctx = malloc(sizeof(_context));\n \tpthread_key_create( &ctx->key, NULL );\t\n-\treturn c;\n+\treturn ctx;\n }\n \n void context_delete( _context *ctx ) {\n"} {"commit":"6092cd6ab67adeb069fd28da89ea5f84f2b2c8d8","subject":"minor : added jit memory size when alloc failure","message":"minor : added jit memory size when alloc failure\n\n","repos":"pperidont\/neko,DanielUranga\/neko,pperidont\/neko,danteinforno\/neko,danteinforno\/neko,danteinforno\/neko,DanielUranga\/neko,DanielUranga\/neko","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- vm\/jit_x86.c\n+++ vm\/jit_x86.c\n@@ -2531,8 +2531,12 @@\n \t\/\/ round to next page\n \tsize += (4096 - size%4096);\n \tp = (int*)mmap(NULL,size,PROT_READ|PROT_WRITE|PROT_EXEC,(MAP_PRIVATE|MAP_ANON),-1,0);\n-\tif( p == (int*)-1 )\n-\t\tval_throw(alloc_string(\"Failed to allocate JIT memory\"));\n+\tif( p == (int*)-1 ) {\n+\t\tbuffer b = alloc_buffer(\"Failed to allocate JIT memory \");\n+\t\tval_buffer(b,alloc_int(size>>10));\n+\t\tval_buffer(b,alloc_string(\"KB\"));\n+\t\tval_throw(alloc_string(buffer_to_string(b)));\n+\t}\n \t*p = size;\n \treturn (char*)(p + 1);\n }\n"} {"commit":"64f269c9076d007a0e72e7ea9b8a7145f10acaf9","subject":"Typo in variable name.","message":"Typo in variable name.\n\n\ngit-svn-id: 793bb72743a407948e3701719c462b6a765bc435@2676 35dc7657-300d-0410-a2e5-dc2837fedb53\n","repos":"Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123,Distrotech\/mpg123","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/common.c\n+++ src\/common.c\n@@ -18,7 +18,7 @@\n static const char *smodes[5] = { \"stereo\", \"joint-stereo\", \"dual-channel\", \"mono\", \"invalid\" };\n static const char *layers[4] = { \"Unknown\" , \"I\", \"II\", \"III\" };\n static const char *versions[4] = {\"1.0\", \"2.0\", \"2.5\", \"x.x\" };\n-static const int samples_pre_frame[4][4] =\n+static const int samples_per_frame[4][4] =\n {\n \t{ -1,384,1152,1152 },\t\/* MPEG 1 *\/\n \t{ -1,384,1152,576 },\t\/* MPEG 2 *\/\n@@ -91,7 +91,7 @@\n \t{\n \t\tcase MPG123_CBR:\n \t\t\tif(i.bitrate) fprintf(stderr, \"%d kbit\/s\", i.bitrate);\n-\t\t\telse fprintf(stderr, \"%d kbit\/s (free format)\", (int)((double)i.framesize*8*i.rate*0.001\/samples_pre_frame[i.version][i.layer]+0.5));\n+\t\t\telse fprintf(stderr, \"%d kbit\/s (free format)\", (int)((double)(i.framesize+4)*8*i.rate*0.001\/samples_per_frame[i.version][i.layer]+0.5));\n \t\t\tbreak;\n \t\tcase MPG123_VBR: fprintf(stderr, \"VBR\"); break;\n \t\tcase MPG123_ABR: fprintf(stderr, \"%d kbit\/s ABR\", i.abr_rate); break;\n@@ -113,7 +113,7 @@\n \t{\n \t\tcase MPG123_CBR:\n \t\t\tif(i.bitrate) fprintf(stderr, \"%d kbit\/s\", i.bitrate);\n-\t\t\telse fprintf(stderr, \"%d kbit\/s (free format)\", (int)((double)i.framesize*8*i.rate*0.001\/samples_pre_frame[i.version][i.layer]+0.5));\n+\t\t\telse fprintf(stderr, \"%d kbit\/s (free format)\", (int)((double)i.framesize*8*i.rate*0.001\/samples_per_frame[i.version][i.layer]+0.5));\n \t\t\tbreak;\n \t\tcase MPG123_VBR: fprintf(stderr, \"VBR\"); break;\n \t\tcase MPG123_ABR: fprintf(stderr, \"%d kbit\/s ABR\", i.abr_rate); break;\n"} {"commit":"edcd379bc6f9ac9d0e5a7319ebbe657a3bc04efd","subject":"update format","message":"update format\n","repos":"google\/kafel,google\/kafel,google\/kafel","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/common.h\n+++ src\/common.h\n@@ -51,7 +51,7 @@\n #define KAFEL_DEFAULT_TARGET_ARCH AUDIT_ARCH_MIPS\n #elif defined(__i386__)\n #define KAFEL_DEFAULT_TARGET_ARCH AUDIT_ARCH_I386\n-#elif defined(__riscv) && __riscv_len == 64\n+#elif defined(__riscv) && __riscv_len == 64\n #define KAFEL_DEFAULT_TARGET_ARCH AUDIT_ARCH_RISCV64\n #else\n #error \"Unsupported architecture\"\n"} {"commit":"6d2e8c7e82c0d610709d173b1b79055dfd3a1a1c","subject":"move formats to sndfile.h","message":"move formats to sndfile.h","repos":"RonNovy\/libsndfile,Distrotech\/libsndfile,RonNovy\/libsndfile,Icenowy\/libsndfile,libsndfile\/libsndfile,audiokit\/libsndfile,Icenowy\/libsndfile,syb0rg\/libsndfile,audiokit\/libsndfile,Icenowy\/libsndfile,Icenowy\/libsndfile,greearb\/libsndfile-ct,syb0rg\/libsndfile,greearb\/libsndfile-ct,erikd\/libsndfile,Distrotech\/libsndfile,syb0rg\/libsndfile,evpobr\/libsndfile,audiokit\/libsndfile,evpobr\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,audiokit\/libsndfile,greearb\/libsndfile-ct,evpobr\/libsndfile,Distrotech\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,greearb\/libsndfile-ct,libsndfile\/libsndfile,greearb\/libsndfile-ct,libsndfile\/libsndfile,erikd\/libsndfile,Distrotech\/libsndfile,libsndfile\/libsndfile,Distrotech\/libsndfile,RonNovy\/libsndfile,syb0rg\/libsndfile,erikd\/libsndfile,RonNovy\/libsndfile,Icenowy\/libsndfile,libsndfile\/libsndfile","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/common.h\n+++ src\/common.h\n@@ -137,7 +137,7 @@\n \tSF_FORMAT_DWD\t\t\t= 0x4040000,\t\t\/* DiamondWare Digirized *\/\n \n \t\/* Following are detected but not supported. *\/\n-\tSF_FORMAT_OGG\t\t\t= 0x4090000,\n+\/* \tSF_FORMAT_OGG\t\t\t= 0x4090000, *\/\n \n \tSF_FORMAT_REX\t\t\t= 0x40A0000,\t\t\/* Propellorheads Rex\/Rcy *\/\n \tSF_FORMAT_REX2\t\t\t= 0x40D0000,\t\t\/* Propellorheads Rex2 *\/\n@@ -146,7 +146,7 @@\n \tSF_FORMAT_SHN\t\t\t= 0x4110000,\t\t\/* Shorten. *\/\n \n \t\/* Unsupported encodings. *\/\n-\tSF_FORMAT_VORBIS\t\t= 0x1001,\n+\/* \tSF_FORMAT_VORBIS\t\t= 0x1001, *\/\n \n \tSF_FORMAT_SVX_FIB\t\t= 0x1020, \t\t\/* SVX Fibonacci Delta encoding. *\/\n \tSF_FORMAT_SVX_EXP\t\t= 0x1021, \t\t\/* SVX Exponential Delta encoding. *\/\n"} {"commit":"e78b35889fb0643e4dbf16bebf02e471353416ce","subject":"src\/common.h: Include inttypes.h first","message":"src\/common.h: Include inttypes.h first\n","repos":"erikd\/libsndfile,evpobr\/libsndfile,erikd\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,libsndfile\/libsndfile,libsndfile\/libsndfile,libsndfile\/libsndfile,evpobr\/libsndfile,libsndfile\/libsndfile,erikd\/libsndfile,evpobr\/libsndfile,libsndfile\/libsndfile","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/common.h\n+++ src\/common.h\n@@ -24,10 +24,10 @@\n #include <stdlib.h>\n #include <string.h>\n \n-#if HAVE_STDINT_H\n+#if HAVE_INTTYPES_H\n+#include <inttypes.h>\n+#elif HAVE_STDINT_H\n #include <stdint.h>\n-#elif HAVE_INTTYPES_H\n-#include <inttypes.h>\n #endif\n #if HAVE_SYS_TYPES_H\n #include <sys\/types.h>\n"} {"commit":"e9404f57be66a98e7a01038125909e454d4a95a0","subject":"bugfix: close file on config parse error","message":"bugfix: close file on config parse error\n","repos":"Zirias\/llad,Zirias\/llad","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -671,6 +671,7 @@\n {\n \tif (!loadConfigEntries(cfg))\n \t{\n+\t fclose(cfg);\n \t Config_done();\n \t return 0;\n \t}\n"} {"commit":"32d6c95a67f7ad6146ad1cbaf4ab61382971a709","subject":"Fix CONFIG REWRITE handling of unknown options.","message":"Fix CONFIG REWRITE handling of unknown options.\n\nThere were two problems with the implementation.\n\n1) \"save\" was not correctly processed when no save point was configured,\n as reported in issue #1416.\n2) The way the code checked if an option existed in the \"processed\"\n dictionary was wrong, as we add the element with as a key associated\n with a NULL value, so dictFetchValue() can't be used to check for\n existance, but dictFind() must be used, that returns NULL only if the\n entry does not exist at all.\n","repos":"JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis,JackieXie168\/redis","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -1440,6 +1440,8 @@\n server.saveparams[j].seconds, server.saveparams[j].changes);\n rewriteConfigRewriteLine(state,\"save\",line,1);\n }\n+ \/* Mark \"save\" as processed in case server.saveparamslen is zero. *\/\n+ rewriteConfigMarkAsProcessed(state,\"save\");\n }\n \n \/* Rewrite the dir option, always using absolute paths.*\/\n@@ -1578,7 +1580,7 @@\n \n \/* Don't blank lines about options the rewrite process\n * don't understand. *\/\n- if (dictFetchValue(state->rewritten,option) == NULL) {\n+ if (dictFind(state->rewritten,option) == NULL) {\n redisLog(REDIS_DEBUG,\"Not rewritten option: %s\", option);\n continue;\n }\n"} {"commit":"c3dbad9ee54fa5f8fd83eddf3dee04425fac2aea","subject":"remove unused sftp from joedb::ssh::Thread_Safe_Session","message":"remove unused sftp from joedb::ssh::Thread_Safe_Session\n","repos":"Remi-Coulom\/joedb,Remi-Coulom\/joedb,Remi-Coulom\/joedb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/joedb\/ssh\/Thread_Safe_Session.h\n+++ src\/joedb\/ssh\/Thread_Safe_Session.h\n@@ -25,7 +25,6 @@\n operator std::unique_lock<std::mutex> &() {return lock;}\n \n ssh_session get_ssh_session() const;\n- sftp_session get_sftp_session() const;\n };\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n@@ -37,7 +36,6 @@\n private:\n std::mutex mutex;\n ssh::Session session;\n- ssh::SFTP sftp;\n \n public:\n Thread_Safe_Session\n@@ -47,8 +45,7 @@\n int port,\n int ssh_log_level\n ):\n- session(user, host, port, ssh_log_level),\n- sftp(session)\n+ session(user, host, port, ssh_log_level)\n {\n }\n \n@@ -80,13 +77,6 @@\n {\n return thread_safe_session.session.get();\n }\n-\n- \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- inline sftp_session Session_Lock::get_sftp_session() const\n- \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n- {\n- return thread_safe_session.sftp.get();\n- }\n }\n }\n \n"} {"commit":"a42237aab762e21d5cad030618d9a3c6b1acb548","subject":"Correction of the #51 bug for default_tag value in tag defined in the wmfsrc without all options.","message":"Correction of the #51 bug for default_tag value in tag defined in the\nwmfsrc without all options.\n","repos":"krmnn\/wmfs-samoht,krmnn\/wmfs-samoht","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/config.c\n+++ src\/config.c\n@@ -499,7 +499,7 @@\n Tag default_tag = { fetch_opt_first(def_tag, \"new tag\", \"name\").str, NULL, 0, 1,\n fetch_opt_first(def_tag, \"0.5\", \"mwfact\").fnum,\n fetch_opt_first(def_tag, \"1\", \"nmaster\").num,\n- False, fetch_opt_first(def_tag, \"false\", \"resizehint\").bool,\n+ False, fetch_opt_first(def_tag, \"False\", \"resizehint\").bool,\n False, False, bar_pos,\n layout_name_to_struct(conf.layout, fetch_opt_first(def_tag, \"title_right\", \"layout\").str, conf.nlayout, layout_list),\n 0, NULL, 0, False };\n@@ -548,14 +548,14 @@\n ((j == -1) ? ++k : --l))\n {\n ++conf.ntag[k];\n- tags[k][conf.ntag[k]].name = fetch_opt_first(tag[i], \"\", \"name\").str;\n- tags[k][conf.ntag[k]].mwfact = fetch_opt_first(tag[i], \"0.65\", \"mwfact\").fnum;\n- tags[k][conf.ntag[k]].nmaster = fetch_opt_first(tag[i], \"1\", \"nmaster\").num;\n- tags[k][conf.ntag[k]].resizehint = fetch_opt_first(tag[i], \"false\", \"resizehint\").bool;\n+ tags[k][conf.ntag[k]].name = fetch_opt_first(tag[i], default_tag.name, \"name\").str;\n+ tags[k][conf.ntag[k]].mwfact = fetch_opt_first(tag[i], fetch_opt_first(def_tag, \"0.5\", \"mwfact\").str, \"mwfact\").fnum;\n+ tags[k][conf.ntag[k]].nmaster = fetch_opt_first(tag[i], fetch_opt_first(def_tag, \"1\", \"nmaster\").str, \"nmaster\").num;\n+ tags[k][conf.ntag[k]].resizehint = fetch_opt_first(tag[i], fetch_opt_first(def_tag, \"False\", \"resizehint\").str, \"resizehint\").bool;\n tags[k][conf.ntag[k]].abovefc = fetch_opt_first(tag[i], \"false\", \"abovefc\").bool;\n tags[k][conf.ntag[k]].layers = 1;\n \n- tmp = fetch_opt_first(tag[i], \"top\", \"infobar_position\").str;\n+ tmp = fetch_opt_first(tag[i], fetch_opt_first(def_tag, \"top\", \"infobar_position\").str, \"infobar_position\").str;\n \n if(!strcmp(tmp ,\"none\") || !strcmp(tmp, \"hide\") || !strcmp(tmp, \"hidden\"))\n tags[k][conf.ntag[k]].barpos = IB_Hide;\n@@ -565,7 +565,7 @@\n tags[k][conf.ntag[k]].barpos = IB_Top;\n \n tags[k][conf.ntag[k]].layout = layout_name_to_struct(conf.layout,\n- fetch_opt_first(tag[i], \"tile_right\", \"layout\").str,\n+ fetch_opt_first(tag[i], fetch_opt_first(def_tag, \"title_right\", \"layout\").str, \"layout\").str,\n conf.nlayout,\n layout_list);\n \n"} {"commit":"3788df6d78a42ff1c8b8bfac02dd67345d01a23b","subject":"Fix multiple, simultaneous periodic saves","message":"Fix multiple, simultaneous periodic saves\n\nA new save thread was started every time a positive periodic save value\nwas input in the general options configuration menu. And only one thread\ncan be stopped by entering 0, also when done repeatedly.\n\nAlways stop the old thread before (possibly) starting a new.\n\nSigned-off-by: Lukas Fleischer <c9ca73f8336dcfb037ec2c2abf52d80a6847a5cd@calcurse.org>\n","repos":"lfos\/calcurse,lfos\/calcurse,lfos\/calcurse","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/custom.c\n+++ src\/custom.c\n@@ -744,12 +744,12 @@\n \t\tstatus_mesg(periodic_save_str, \"\");\n \t\tif (updatestring(win[STA].p, &buf, 0, 1) == 0) {\n \t\t\tval = atoi(buf);\n-\t\t\tif (val >= 0)\n+\t\t\tif (val >= 0) {\n \t\t\t\tconf.periodic_save = val;\n-\t\t\tif (conf.periodic_save > 0)\n-\t\t\t\tio_start_psave_thread();\n-\t\t\telse if (conf.periodic_save == 0)\n \t\t\t\tio_stop_psave_thread();\n+\t\t\t\tif (conf.periodic_save > 0)\n+\t\t\t\t\tio_start_psave_thread();\n+\t\t\t}\n \t\t}\n \t\tbreak;\n \tcase CONFIRM_QUIT:\n"} {"commit":"1ae72ef1b85b71b1ad013bfbe591123bb3168dd6","subject":"Log DMARC policy","message":"Log DMARC policy\n\nIt can be useful to know what the policy was even when the DMARC result\nis 'pass'.\n","repos":"simta\/simta,simta\/simta,simta\/simta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- receive.c\n+++ receive.c\n@@ -2097,9 +2097,11 @@\n \n if ( simta_dmarc ) {\n \tr->r_dmarc_result = dmarc_result( r->r_dmarc );\n-\tsyslog( LOG_INFO, \"Receive [%s] %s: env <%s>: DMARC result: %s (%s)\",\n+\tsyslog( LOG_INFO, \"Receive [%s] %s: env <%s>: dmarc_result=%s \"\n+\t\t\"dmarc_domain=%s dmarc_policy=%s\",\n \t\tr->r_ip, r->r_remote_hostname, r->r_env->e_id,\n-\t\tdmarc_result_str( r->r_dmarc_result ), r->r_dmarc->domain );\n+\t\tdmarc_result_str( r->r_dmarc_result ), r->r_dmarc->domain,\n+\t\tdmarc_result_str( r->r_dmarc->policy ));\n \tif ( simta_auth_results ) {\n \t authresults = yaslcatprintf( authresults,\n \t\t \";\\n\\tdmarc=%s header.from=%s\",\n"} {"commit":"68b81546f4aeefc85d1dcb59b8874a3333cafbb3","subject":"Removed printing the configuration in the daemon","message":"Removed printing the configuration in the daemon\n","repos":"mariusor\/mpris-scrobbler,mariusor\/mpris-scrobbler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/daemon.c\n+++ src\/daemon.c\n@@ -59,7 +59,9 @@\n struct configuration *config = configuration_new();\n load_configuration(config, APPLICATION_NAME);\n if (config->credentials_length == 0) { _warn(\"main::load_credentials: no credentials were loaded\"); }\n+#if 0\n print_application_config(config);\n+#endif\n \n struct state *state = state_new();\n if (NULL == state) {\n"} {"commit":"a47c14d187bece5877d232641fe520eabd74e4ed","subject":"signal init result from child to parent process","message":"signal init result from child to parent process\n","repos":"morganzhh\/sysrepo,morganzhh\/sysrepo,lukasmacko\/sysrepo,fanchanghu\/sysrepo,rastislavszabo\/sysrepo,rastislavszabo\/sysrepo,fanchanghu\/sysrepo,lukasmacko\/sysrepo,morganzhh\/sysrepo,morganzhh\/sysrepo,rastislavszabo\/sysrepo,lukasmacko\/sysrepo,fanchanghu\/sysrepo,morganzhh\/sysrepo,fanchanghu\/sysrepo,lukasmacko\/sysrepo,rastislavszabo\/sysrepo,fanchanghu\/sysrepo,rastislavszabo\/sysrepo,morganzhh\/sysrepo,lukasmacko\/sysrepo,fanchanghu\/sysrepo,lukasmacko\/sysrepo,lukasmacko\/sysrepo,rastislavszabo\/sysrepo,fanchanghu\/sysrepo,morganzhh\/sysrepo,rastislavszabo\/sysrepo","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/daemon.c\n+++ src\/daemon.c\n@@ -26,16 +26,50 @@\n #include <sys\/stat.h>\n #include <fcntl.h>\n #include <limits.h>\n+#include <signal.h>\n \n #include \"sr_common.h\"\n #include \"connection_manager.h\"\n \n+#define SR_CHILD_INIT_TIMEOUT 2 \/** Timeout to initialize the child process (in seconds) *\/\n+\n+\/**\n+ * @brief Signal handler used to deliver initialization result from child to\n+ * parent process, so that parent can exit with appropriate exit code.\n+ *\/\n static void\n+child_status_handler(int signum)\n+{\n+ switch(signum) {\n+ case SIGUSR1:\n+ \/* child process has initialized successfully *\/\n+ exit(EXIT_SUCCESS);\n+ break;\n+ case SIGALRM:\n+ \/* child process has not initialized within SR_CHILD_INIT_TIMEOUT seconds *\/\n+ exit(EXIT_FAILURE);\n+ break;\n+ case SIGCHLD:\n+ \/* child process has terminated *\/\n+ exit(EXIT_FAILURE);\n+ break;\n+ }\n+}\n+\n+\/**\n+ * @brief Daemonize the process - fork() and instruct the child to behave as a proper daemon.\n+ *\/\n+static pid_t\n sr_daemonize(void)\n {\n pid_t pid, sid;\n- int fd;\n- char str[NAME_MAX];\n+ int fd = -1;\n+ char str[NAME_MAX] = { 0 };\n+\n+ \/* register handlers for signals that we expect to receive from child process *\/\n+ signal(SIGCHLD, child_status_handler);\n+ signal(SIGUSR1, child_status_handler);\n+ signal(SIGALRM, child_status_handler);\n \n \/* fork off the parent process. *\/\n pid = fork();\n@@ -44,11 +78,22 @@\n exit(EXIT_FAILURE);\n }\n if (pid > 0) {\n- \/* this is the parent process, exit with success *\/\n- exit(EXIT_SUCCESS);\n+ \/* this is the parent process, wait for a signal from child *\/\n+ alarm(SR_CHILD_INIT_TIMEOUT);\n+ pause();\n+ exit(EXIT_FAILURE); \/* this should not be executed *\/\n }\n \n \/* at this point we are executing as the child process *\/\n+\n+ \/* ignore certain signals *\/\n+ signal(SIGUSR1, SIG_IGN);\n+ signal(SIGALRM, SIG_IGN);\n+ signal(SIGCHLD, SIG_IGN);\n+ signal(SIGTSTP, SIG_IGN); \/* keyboard stop *\/\n+ signal(SIGTTIN, SIG_IGN); \/* background read from tty *\/\n+ signal(SIGTTOU, SIG_IGN); \/* background write to tty *\/\n+ signal(SIGHUP, SIG_IGN); \/* hangup *\/\n \n \/* create a new session containing a single (new) process group *\/\n sid = setsid();\n@@ -101,11 +146,14 @@\n write(fd, str, strlen(str));\n \n \/* do not close nor unlock the PID file, keep it open while the daemon is alive *\/\n+\n+ return getppid(); \/* return PID of the parent *\/\n }\n \n int\n main(int argc, char* argv[])\n {\n+ pid_t parent;\n int rc = SR_ERR_OK;\n cm_ctx_t *sr_cm_ctx = NULL;\n \n@@ -115,7 +163,7 @@\n SR_LOG_INF_MSG(\"Sysrepo daemon initialization started.\");\n \n \/* deamonize the process *\/\n- sr_daemonize();\n+ parent = sr_daemonize();\n \n \/* initialize local Connection Manager *\/\n rc = cm_init(CM_MODE_DAEMON, SR_DAEMON_SOCKET, &sr_cm_ctx);\n@@ -123,6 +171,9 @@\n SR_LOG_ERR(\"Unable to initialize Connection Manager: %s.\", sr_strerror(rc));\n exit(EXIT_FAILURE);\n }\n+\n+ \/* tell the parent process that we are okay *\/\n+ kill(parent, SIGUSR1);\n \n SR_LOG_INF_MSG(\"Sysrepo daemon initialized successfully.\");\n \n"} {"commit":"b15fbf05b6acb80bfb3ed30cc493b307cbcb9f8d","subject":"execute scripts in the process-adjacent modules\/","message":"execute scripts in the process-adjacent modules\/\n","repos":"pzl\/statbar,pzl\/statbar,pzl\/statbar","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/daemon.c\n+++ src\/daemon.c\n@@ -21,7 +21,7 @@\n static void notify_watchers(void);\n static void update_status(status *);\n static int launch_modules(struct pollfd[]);\n-static int spawn(const char *);\n+static int spawn(char * path, const char * program);\n \n static shmem * mem;\n static pid_t clients[MAX_CLIENTS];\n@@ -65,8 +65,6 @@\n \t\t\t\t\tswitch(fds[i].revents){\n \t\t\t\t\t\tcase POLLIN:\n \t\t\t\t\t\t\tread_data(&stats, fds[i].fd, i);\n-\t\t\t\t\t\t\tupdate_status(&stats);\n-\t\t\t\t\t\t\tnotify_watchers();\n \t\t\t\t\t\t\tbreak;\n \t\t\t\t\t\tcase POLLERR:\n \t\t\t\t\t\t\tfprintf(stderr,\"module # %d, error occurred trying to poll\\n\", i);\n@@ -84,6 +82,8 @@\n \t\t\t\t\tfds[i].revents = 0; \/\/clear events received\n \t\t\t\t}\n \t\t\t}\n+\t\t\tupdate_status(&stats);\n+\t\t\tnotify_watchers();\n \t\t} else {\n \t\t\tfprintf(stderr, \"poll exited, unknown reasons\\n\");\n \t\t}\n@@ -122,20 +122,36 @@\n }\n \n static int launch_modules(struct pollfd fds[]){\n-\tfds[0].fd = spawn(\"date\");\/*\n-\tfds[1].fd = spawn(\"network\");\n-\tfds[2].fd = spawn(\"net_tx\");\n-\tfds[3].fd = spawn(\"bluetooth\");\n-\tfds[4].fd = spawn(\"memory\");\n-\tfds[5].fd = spawn(\"cpu\");\n-\tfds[6].fd = spawn(\"gpu\");\n-\tfds[7].fd = spawn(\"packages\");\n-\tfds[8].fd = spawn(\"runtime\");\n-\tfds[9].fd = spawn(\"weather\");\n-\tfds[10].fd = spawn(\"linux\");*\/\n-\n-\tfds[0].events = POLLIN;\/*\n-\tfds[1].events = POLLIN;\n+\tchar buf[SMALL_BUF]; \/\/note that dirname() may\/will modify this! copy if it will be used afterwards\n+\tchar * dir;\n+\tssize_t len;\n+\n+\tlen = readlink(\"\/proc\/self\/exe\",buf,SMALL_BUF);\n+\tif (len < 0){\n+\t\tperror(\"readlink\");\n+\t\texit(1);\n+\t}\n+\tbuf[len] = 0;\n+\n+\t\/\/dirname() may modify it's given param, so make a copy\n+\t\/\/snprintf(bufcpy, SMALL_BUF, \"%s\", buf);\n+\n+\tdir = dirname(buf);\n+\n+\tfds[0].fd = spawn(dir,\"datetime\");\n+\tfds[1].fd = spawn(dir,\"network\");\/*\n+\tfds[2].fd = spawn(dir,\"net_tx\");\n+\tfds[3].fd = spawn(dir,\"bluetooth\");\n+\tfds[4].fd = spawn(dir,\"memory\");\n+\tfds[5].fd = spawn(dir,\"cpu\");\n+\tfds[6].fd = spawn(dir,\"gpu\");\n+\tfds[7].fd = spawn(dir,\"packages\");\n+\tfds[8].fd = spawn(dir,\"runtime\");\n+\tfds[9].fd = spawn(dir,\"weather\");\n+\tfds[10].fd = spawn(dir,\"linux\");*\/\n+\n+\tfds[0].events = POLLIN;\n+\tfds[1].events = POLLIN;\/*\n \tfds[2].events = POLLIN;\n \tfds[3].events = POLLIN;\n \tfds[4].events = POLLIN;\n@@ -146,12 +162,17 @@\n \tfds[9].events = POLLIN;\n \tfds[10].events = POLLIN;*\/\n \n-\treturn 1;\n-}\n-\n-static int spawn(const char *module) {\n+\treturn 2;\n+}\n+\n+static int spawn(char * dir, const char *module) {\n \tint fds[2];\n \tpid_t childpid;\n+\tchar path[SMALL_BUF];\n+\n+\tsnprintf(path, SMALL_BUF, \"%s\/modules\/%s\",dir,module);\n+\n+\tprintf(\"will be calling %s\\n\", path);\n \n \tpipe(fds);\n \n@@ -174,7 +195,7 @@\n \t\t}\n \t\tsignal(SIGUSR1,SIG_IGN);\n \n-\t\texeclp(module, module, NULL);\n+\t\texeclp(path, module, NULL);\n \t\texit(1); \/\/if script fails, die\n \t} else { \/\/parent\n \t\tif (close(fds[1]) < 0){ \/\/close write end of pipe\n@@ -207,7 +228,12 @@\n \tif (n_bytes < 0){\n \t\tperror(\"module data read\");\n \t}\n-\tbufp[n_bytes] = 0; \/\/ends in newline, overwrite \\n with termination\n+\tif (bufp[n_bytes-1] == '\\n'){\n+\t\t\/\/@todo what if output ends in multiple newlines? or has them in th middle?\n+\t\tbufp[n_bytes-1] = 0;\n+\t} else {\n+\t\tbufp[n_bytes] = 0;\n+\t}\n \tDEBUG_(printf(\"got data in: %s\\n\", bufp));\n }\n \n"} {"commit":"05217062cf1717725ed4983895dfc7aeb482418c","subject":"lib-http: Simplify http response status-line parsing code. Also by not using a temporary string buffer the istream can at least in theory limit the maximum status-line length (=max memory usage).","message":"lib-http: Simplify http response status-line parsing code.\nAlso by not using a temporary string buffer the istream can at least in\ntheory limit the maximum status-line length (=max memory usage).\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-http\/http-response-parser.c\n+++ src\/lib-http\/http-response-parser.c\n@@ -32,8 +32,6 @@\n \tconst unsigned char *begin, *cur, *end;\n \tconst char *error;\n \n-\tstring_t *strbuf;\n-\n \tenum http_response_parser_state state;\n \tstruct http_header_parser *header_parser;\n \n@@ -51,7 +49,6 @@\n \n \tparser = i_new(struct http_response_parser, 1);\n \tparser->input = input;\n-\tparser->strbuf = str_new(default_pool, 128);\n \treturn parser;\n }\n \n@@ -59,7 +56,6 @@\n {\n \tstruct http_response_parser *parser = *_parser;\n \n-\tstr_free(&parser->strbuf);\n \tif (parser->header_parser != NULL)\n \t\thttp_header_parser_deinit(&parser->header_parser);\n \tif (parser->response_pool != NULL)\n@@ -75,7 +71,6 @@\n \ti_assert(parser->payload == NULL);\n \tparser->content_length = 0;\n \tparser->transfer_encoding = NULL;\n-\tstr_truncate(parser->strbuf, 0);\n \tif (parser->response_pool != NULL)\n \t\tpool_unref(&parser->response_pool);\n \tparser->response_pool = pool_alloconly_create(\"http_response\", 4096);\n@@ -86,85 +81,54 @@\n \n static int http_response_parse_version(struct http_response_parser *parser)\n {\n-\tconst unsigned char *first = parser->cur;\n-\tconst char *p;\n+\tconst unsigned char *p = parser->cur;\n+\tconst size_t size = parser->end - parser->cur;\n \n \t\/* HTTP-version = HTTP-name \"\/\" DIGIT \".\" DIGIT\n \t HTTP-name = %x48.54.54.50 ; \"HTTP\", case-sensitive\n \t *\/\n-\twhile (parser->cur < parser->end && http_char_is_value(*parser->cur))\n-\t\tparser->cur++;\n-\n-\tif (str_len(parser->strbuf) + (parser->cur-first) > 8)\n+\tif (size < 8)\n+\t\treturn 0;\n+\tif (memcmp(p, \"HTTP\/\", 5) != 0 ||\n+\t !i_isdigit(p[5]) || p[6] != '.' || !i_isdigit(p[7]))\n \t\treturn -1;\n-\n-\tif ((parser->cur - first) > 0)\n-\t\tstr_append_n(parser->strbuf, first, parser->cur-first);\n-\tif (parser->cur == parser->end)\n+\tparser->response->version_major = p[5] - '0';\n+\tparser->response->version_minor = p[7] - '0';\n+\tparser->cur += 8;\n+\treturn 1;\n+}\n+\n+static int http_response_parse_status(struct http_response_parser *parser)\n+{\n+\tconst unsigned char *p = parser->cur;\n+\tconst size_t size = parser->end - parser->cur;\n+\n+\t\/* status-code = 3DIGIT\n+\t *\/\n+\tif (size < 3)\n \t\treturn 0;\n-\n-\tif (str_len(parser->strbuf) != 8)\n+\tif (!i_isdigit(p[0]) || !i_isdigit(p[1]) || !i_isdigit(p[2]))\n \t\treturn -1;\n-\tif (strncmp(str_c(parser->strbuf), \"HTTP\/\",5) != 0)\n-\t\treturn -1;\n-\tp = str_c(parser->strbuf) + 5;\n-\tif (!i_isdigit(*p))\n-\t\treturn -1;\n-\tparser->response->version_major = *p - '0';\n-\tp++;\n-\tif (*(p++) != '.')\n-\t\treturn -1;\n-\tif (!i_isdigit(*p))\n-\t\treturn -1;\n-\tparser->response->version_minor = *p - '0';\n-\tstr_truncate(parser->strbuf, 0);\n-\treturn 1;\n-}\n-\n-static int http_response_parse_status(struct http_response_parser *parser)\n-{\n-\tconst unsigned char *first = parser->cur;\n-\tconst unsigned char *p;\n-\n-\t\/* status-code = 3DIGIT\n-\t *\/\n-\twhile (parser->cur < parser->end && i_isdigit(*parser->cur)) {\n-\t\tparser->cur++;\n-\t\tif ((parser->cur - first) > 3)\n-\t\t\treturn -1;\n-\t}\n-\n-\tif (str_len(parser->strbuf) + (parser->cur - first) > 3)\n-\t\treturn -1;\n-\tif ((parser->cur - first) > 0)\n-\t\tstr_append_n(parser->strbuf, first, parser->cur-first);\n-\tif (parser->cur == parser->end)\n-\t\treturn 0;\n-\tif (str_len(parser->strbuf) != 3)\n-\t\treturn -1;\n-\tp = str_data(parser->strbuf);\n \tparser->response->status =\n \t\t(p[0] - '0')*100 + (p[1] - '0')*10 + (p[2] - '0');\n-\tstr_truncate(parser->strbuf, 0);\n+\tparser->cur += 3;\n \treturn 1;\n }\n \n static int http_response_parse_reason(struct http_response_parser *parser)\n {\n-\tconst unsigned char *first = parser->cur;\n+\tconst unsigned char *p = parser->cur;\n \n \t\/* reason-phrase = *( HTAB \/ SP \/ VCHAR \/ obs-text )\n \t *\/\n-\twhile (parser->cur < parser->end && http_char_is_text(*parser->cur))\n-\t\tparser->cur++;\n-\n-\tif ((parser->cur - first) > 0)\n-\t\tstr_append_n(parser->strbuf, first, parser->cur-first);\n-\tif (parser->cur == parser->end)\n+\twhile (p < parser->end && http_char_is_text(*p))\n+\t\tp++;\n+\n+\tif (p == parser->end)\n \t\treturn 0;\n \tparser->response->reason =\n-\t\tp_strdup(parser->response_pool, str_c(parser->strbuf));\n-\tstr_truncate(parser->strbuf, 0);\n+\t\tp_strdup_until(parser->response_pool, parser->cur, p);\n+\tparser->cur = p;\n \treturn 1;\n }\n \n@@ -270,11 +234,11 @@\n \n static int http_response_parse_status_line(struct http_response_parser *parser)\n {\n-\tsize_t size;\n+\tsize_t size, old_bytes = 0;\n \tint ret;\n \n \twhile ((ret = i_stream_read_data(parser->input,\n-\t\t\t\t\t &parser->begin, &size, 0)) > 0) {\n+\t\t\t\t\t &parser->begin, &size, old_bytes)) > 0) {\n \t\tparser->cur = parser->begin;\n \t\tparser->end = parser->cur + size;\n \n@@ -284,6 +248,7 @@\n \t\ti_stream_skip(parser->input, parser->cur - parser->begin);\n \t\tif (ret > 0)\n \t\t\treturn 1;\n+\t\told_bytes = i_stream_get_data_size(parser->input);\n \t}\n \n \ti_assert(ret != -2);\n"} {"commit":"3746b6e128324fff7468463aeac332279eb5d59c","subject":"memory allocation error checks","message":"memory allocation error checks\n","repos":"videolan\/dav1d","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/decode.c\n+++ src\/decode.c\n@@ -2637,6 +2637,7 @@\n dav1d_alloc_aligned(sizeof(int32_t) * 3 *\n f->sb128w * f->sb128h * 128 * 128, 32);\n if (!f->frame_thread.b || !f->frame_thread.pal_idx ||\n+ !f->frame_thread.pal || !f->frame_thread.cbi ||\n !f->frame_thread.cf)\n {\n goto error;\n@@ -3242,6 +3243,10 @@\n \/\/ put the new values. Allocate them here (the data\n \/\/ actually gets set elsewhere)\n f->cur_segmap_ref = dav1d_ref_create(f->b4_stride * 32 * f->sb128h);\n+ if (!f->cur_segmap_ref) {\n+ res = -ENOMEM;\n+ goto error;\n+ }\n f->cur_segmap = f->cur_segmap_ref->data;\n } else if (f->prev_segmap_ref) {\n \/\/ We're not updating an existing map, and we have a valid\n@@ -3252,6 +3257,10 @@\n } else {\n \/\/ We need to make a new map. Allocate one here and zero it out.\n f->cur_segmap_ref = dav1d_ref_create(f->b4_stride * 32 * f->sb128h);\n+ if (!f->cur_segmap_ref) {\n+ res = -ENOMEM;\n+ goto error;\n+ }\n f->cur_segmap = f->cur_segmap_ref->data;\n memset(f->cur_segmap_ref->data, 0, f->b4_stride * 32 * f->sb128h);\n }\n"} {"commit":"9aa26b2ab2762ccf53470c3b748f36732c6379c0","subject":"prevent creation of self-remotes","message":"prevent creation of self-remotes\n","repos":"ibaned\/tetknife,ibaned\/tetknife,ibaned\/tetknife","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- remotes.c\n+++ remotes.c\n@@ -176,7 +176,7 @@\n \n int ment_shared_with(mesh* m, ment e, int rank)\n {\n- return rent_ok(rent_by_rank(m, e, rank));\n+ return rank == comm_rank() || rent_ok(rent_by_rank(m, e, rank));\n }\n \n rent rent_new(mesh* m, ment me, rcopy rc)\n@@ -186,6 +186,7 @@\n struct peer* p;\n rent re;\n struct ent* e;\n+ ASSERT(rc.rank != comm_rank());\n rs = mesh_remotes(m);\n rp = rpeer_by_rank(m, rc.rank);\n if (!rpeer_ok(rp)) {\n"} {"commit":"3082577aec0170a0114f61f955fc9f82b3a02890","subject":"Added exec_realise function","message":"Added exec_realise function\n","repos":"svanderburg\/disnix,svanderburg\/disnix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libinterface\/client-interface.h\n+++ src\/libinterface\/client-interface.h\n@@ -127,4 +127,15 @@\n *\/ \n pid_t exec_copy_closure_to(gchar *interface, gchar *target, gchar *component);\n \n+\/**\n+ * Invokes the realise operation through a Disnix client interface\n+ *\n+ * @param interface Path to the interface executable\n+ * @param target Target Address of the remote interface\n+ * @param derivation Derivation to build\n+ * @param pipefd Pipe which can be used to capture the output of the process\n+ * @return PID of the client interface process performing the operation, or -1 in case of a failure\n+ *\/\n+pid_t exec_realise(gchar *interface, gchar *target, gchar *derivation, int pipefd[2]);\n+\n #endif\n"} {"commit":"940eee483a852ec54349ef36f19713bb2b895b57","subject":"Avoid adding offsets to NULL chroma pointers in 4:0:0","message":"Avoid adding offsets to NULL chroma pointers in 4:0:0\n\nDoing so is technically undefined behavior even though the pointers\nare never dereferenced.\n","repos":"videolan\/dav1d","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/decode.c\n+++ src\/decode.c\n@@ -2944,14 +2944,19 @@\n }\n }\n \n- \/\/ init loopfilter pointers\n+ \/* Init loopfilter pointers. Increasing NULL pointers is technically UB,\n+ * so just point the chroma pointers in 4:0:0 to the luma plane here to\n+ * avoid having additional in-loop branches in various places. We never\n+ * dereference those pointers so it doesn't really matter what they\n+ * point at, as long as the pointers are valid. *\/\n+ const int has_chroma = f->cur.p.layout != DAV1D_PIXEL_LAYOUT_I400;\n f->lf.mask_ptr = f->lf.mask;\n f->lf.p[0] = f->cur.data[0];\n- f->lf.p[1] = f->cur.data[1];\n- f->lf.p[2] = f->cur.data[2];\n+ f->lf.p[1] = f->cur.data[has_chroma ? 1 : 0];\n+ f->lf.p[2] = f->cur.data[has_chroma ? 2 : 0];\n f->lf.sr_p[0] = f->sr_cur.p.data[0];\n- f->lf.sr_p[1] = f->sr_cur.p.data[1];\n- f->lf.sr_p[2] = f->sr_cur.p.data[2];\n+ f->lf.sr_p[1] = f->sr_cur.p.data[has_chroma ? 1 : 0];\n+ f->lf.sr_p[2] = f->sr_cur.p.data[has_chroma ? 2 : 0];\n f->lf.tile_row = 1;\n \n dav1d_cdf_thread_wait(&f->in_cdf);\n"} {"commit":"4dd0399641f778bdc3b59e3da7214562e53d47ab","subject":"map of node events","message":"map of node events\n","repos":"votca\/ctp,votca\/ctp,votca\/ctp,votca\/ctp","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/libkmc\/algorithms\/vssm2_nodes.h\n+++ src\/libkmc\/algorithms\/vssm2_nodes.h\n@@ -40,9 +40,10 @@\n public:\n \n void Initialize ( State* _state, Graph* _graph ) {\n- \n- std::unordered_map< BNode*, vector<Event*> > mymap;\n- \n+\n+ \/\/ Map of charge transfer events associated with a particular node\n+ std::unordered_map< BNode*, std::vector<Event*> > charge_transfer_map;\n+ \n \/\/ For every node create an escape event and attach it to the head event)\n for (Graph::iterator it_node = _graph->nodes_begin(); it_node != _graph->nodes_end(); ++it_node) {\n \n@@ -56,6 +57,10 @@\n \/\/ Add new event to the head event\n head_event.AddSubordinate( event_escape );\n \n+ std::vector<Event*> charge_transfer_node_events;\n+ \n+ \n+ \n \/\/ Loop over all neighbours (edges) of the node \n for (BNode::EdgeIterator it_edge = node_from->EdgesBegin(); it_edge != node_from->EdgesEnd(); ++it_edge) {\n \n@@ -66,10 +71,12 @@\n \n \/\/ add a subordinate event\n event_escape->AddSubordinate( event_move );\n+ charge_transfer_node_events.push_back( event_move ); \n+\n+ \/\/ Add a list of charge transfer events to the map, indexed by a node pointer\n+ charge_transfer_map.at(node_from).push_back(event_move);\n \n }\n- \n- \n \n \/\/ evaluate the escape rate (sum of all enabled subordinate events)\n event_escape->CumulativeRate(); \n"} {"commit":"f2260212895cf731ea9d5c4aa691edbf1038f947","subject":"OBAMP: Reset TreeSequenceNumber counter when resetting tree links","message":"OBAMP: Reset TreeSequenceNumber counter when resetting tree links\n","repos":"tdz\/olsrd,duydb2\/olsr,acinonyx\/olsrd,diogomg\/olsrd,ninuxorg\/olsrd,acinonyx\/olsrd,sebkur\/olsrd,servalproject\/olsr,diogomg\/olsrd-binary-heap,ninuxorg\/olsrd,cholin\/olsrd,zioproto\/olsrd,tdz\/olsrd,duydb2\/olsr,servalproject\/olsr,diogomg\/olsrd-binary-heap,brabander\/olsr,diogomg\/olsrd,duydb2\/olsr,duydb2\/olsr,tdz\/olsrd,ninuxorg\/olsrd,sebkur\/olsrd,ninuxorg\/olsrd,servalproject\/olsr,diogomg\/olsrd,nolith\/olsrd,acinonyx\/olsrd,cholin\/olsrd,sebkur\/olsrd,tdz\/olsrd,diogomg\/olsrd-binary-heap,diogomg\/olsrd-binary-heap,zioproto\/olsrd,diogomg\/olsrd-binary-heap,duydb2\/olsr,servalproject\/olsr,tdz\/olsrd,sebkur\/olsrd,servalproject\/olsr,sebkur\/olsrd,duydb2\/olsr,cholin\/olsrd,nolith\/olsrd,diogomg\/olsrd,sebkur\/olsrd,diogomg\/olsrd-binary-heap,duydb2\/olsr,diogomg\/olsrd,brabander\/olsr,zioproto\/olsrd,cholin\/olsrd,diogomg\/olsrd,duydb2\/olsr,servalproject\/olsr,ninuxorg\/olsrd,acinonyx\/olsrd,nolith\/olsrd,zioproto\/olsrd,diogomg\/olsrd-binary-heap,diogomg\/olsrd,zioproto\/olsrd,brabander\/olsr,cholin\/olsrd,acinonyx\/olsrd,brabander\/olsr,nolith\/olsrd,nolith\/olsrd","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/obamp\/src\/obamp.c\n+++ lib\/obamp\/src\/obamp.c\n@@ -588,6 +588,8 @@\n \n memset(&myState->ParentId.v4, 0, sizeof(myState->ParentId.v4));\n memset(&myState->OldParentId.v4, 1, sizeof(myState->OldParentId.v4));\n+ myState->TreeCreateSequenceNumber=0;\n+\n \n };\n \n"} {"commit":"cfea4ccc6fc8e014bfbd5bb80de0a2b854fc373b","subject":"Fix SDP handling when the SDP record is modified on remote device.","message":"Fix SDP handling when the SDP record is modified on remote device.\n\nWe invalidate the in-memory SDP records list only when a profile\nis added or removed. So when a SDP record attribute like the rfcomm\nchannel number is modified on the remote device, we will miss the update.\n","repos":"pstglia\/external-bluetooth-bluez,mapfau\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,ComputeCycles\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,mapfau\/bluez,mapfau\/bluez,mapfau\/bluez,silent-snowman\/bluez,ComputeCycles\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/device.c\n+++ src\/device.c\n@@ -1313,16 +1313,16 @@\n \n \tupdate_services(req, recs);\n \n-\tif (!req->profiles_added && !req->profiles_removed) {\n-\t\tdebug(\"%s: No service update\", device->path);\n-\t\tgoto proceed;\n-\t}\n-\n \tif (device->tmp_records && req->records) {\n \t\tsdp_list_free(device->tmp_records,\n \t\t\t\t\t(sdp_free_func_t) sdp_record_free);\n \t\tdevice->tmp_records = req->records;\n \t\treq->records = NULL;\n+\t}\n+\n+\tif (!req->profiles_added && !req->profiles_removed) {\n+\t\tdebug(\"%s: No service update\", device->path);\n+\t\tgoto proceed;\n \t}\n \n \t\/* Probe matching drivers for services added *\/\n"} {"commit":"3fe2e7aa35a00fb67e642e76f9e0c0262b18fc3c","subject":"Add an interval between connection attempts","message":"Add an interval between connection attempts\n\nFor connection attempts to the same remote device, add 5 seconds\ninterval until the next connect attempt. At the moment, the behaviour\ndepends on if address is found in the advertising kernel cache only.\n\nPassive scanning kernel patches are not upstream yet. LE scanning will\nbe executed in background during a short period of time until it finds\nthe address or EHOSTDOWN is returned to the connection attempt.\n","repos":"pkarasev3\/bluez,ComputeCycles\/bluez,mapfau\/bluez,silent-snowman\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,silent-snowman\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pstglia\/external-bluetooth-bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,ComputeCycles\/bluez,pkarasev3\/bluez,silent-snowman\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/device.c\n+++ src\/device.c\n@@ -65,6 +65,8 @@\n \n #define DISCONNECT_TIMER\t2\n #define DISCOVERY_TIMER\t\t2\n+\n+#define AUTO_CONNECTION_INTERVAL\t5 \/* Next connection attempt *\/\n \n \/* When all services should trust a remote device *\/\n #define GLOBAL_TRUST \"[all]\"\n@@ -1791,8 +1793,9 @@\n \t\t\tdevice->browse = NULL;\n \t\t\tbrowse_request_free(req, TRUE);\n \t\t} else if (device->auto_connect)\n-\t\t\tdevice->auto_id = g_idle_add_full(\n+\t\t\tdevice->auto_id = g_timeout_add_seconds_full(\n \t\t\t\t\t\tG_PRIORITY_DEFAULT_IDLE,\n+\t\t\t\t\t\tAUTO_CONNECTION_INTERVAL,\n \t\t\t\t\t\tatt_connect, device,\n \t\t\t\t\t\tatt_connect_dispatched);\n \n"} {"commit":"197195483f44ab790b99f2c8ee8610e6e570ac3d","subject":"adding config.h","message":"adding config.h\n\ngit-svn-id: 0126ed97fe24b68ac16df8f15bac817fed1c5b9f@1228 66673985-dd14-0410-9433-caba4d15c716\n","repos":"cruppstahl\/upscaledb,cloudrain21\/hamsterdb,cruppstahl\/upscaledb,cruppstahl\/upscaledb,cloudrain21\/hamsterdb,cloudrain21\/hamsterdb,cloudrain21\/hamsterdb,cruppstahl\/upscaledb,cruppstahl\/upscaledb,cruppstahl\/upscaledb,cruppstahl\/upscaledb,cloudrain21\/hamsterdb,cloudrain21\/hamsterdb,cloudrain21\/hamsterdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/device.c\n+++ src\/device.c\n@@ -10,6 +10,8 @@\n *\n *\/\n \n+#include \"config.h\"\n+\n #include <string.h>\n #include \"device.h\"\n #include \"error.h\"\n@@ -148,7 +150,7 @@\n buffer=allocator_alloc(device_get_allocator(self), size);\n if (!buffer)\n return (HAM_OUT_OF_MEMORY);\n- page_set_pers(page, (union page_union_t *)buffer);\n+ page_set_pers(page, (ham_perm_page_union_t *)buffer);\n page_set_npers_flags(page, \n page_get_npers_flags(page)|PAGE_NPERS_MALLOC);\n }\n@@ -173,7 +175,7 @@\n * header page - the header page is not filtered)\n *\/\n if (!head || page_get_self(page)==0) {\n- page_set_pers(page, (union page_union_t *)buffer);\n+ page_set_pers(page, (ham_perm_page_union_t *)buffer);\n return (0);\n }\n \n@@ -189,7 +191,7 @@\n head=head->_next;\n }\n \n- page_set_pers(page, (union page_union_t *)buffer);\n+ page_set_pers(page, (ham_perm_page_union_t *)buffer);\n return (0);\n }\n \n@@ -400,7 +402,7 @@\n buffer=allocator_alloc(device_get_allocator(self), size);\n if (!buffer)\n return (HAM_OUT_OF_MEMORY);\n- page_set_pers(page, (union page_union_t *)buffer);\n+ page_set_pers(page, (ham_perm_page_union_t *)buffer);\n page_set_npers_flags(page, \n page_get_npers_flags(page)|PAGE_NPERS_MALLOC);\n page_set_self(page, (ham_offset_t)buffer);\n"} {"commit":"3d52be78216ef33224918775c348e947ae61494e","subject":"core: Update bearer timestamp also when connecting","message":"core: Update bearer timestamp also when connecting\n\nThis way we avoid a bit strange behavior when we've previously always\nbeen acceptors for a connection (in which case the last seen timestamp\nwould never have been touched).\n","repos":"ComputeCycles\/bluez,ComputeCycles\/bluez,silent-snowman\/bluez,pkarasev3\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,silent-snowman\/bluez,silent-snowman\/bluez,mapfau\/bluez,ComputeCycles\/bluez,mapfau\/bluez,pstglia\/external-bluetooth-bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,silent-snowman\/bluez,pstglia\/external-bluetooth-bluez,pkarasev3\/bluez,pkarasev3\/bluez,ComputeCycles\/bluez,mapfau\/bluez","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/device.c\n+++ src\/device.c\n@@ -1913,6 +1913,8 @@\n {\n \tstruct bearer_state *state = get_state(dev, bdaddr_type);\n \n+\tdevice_update_last_seen(dev, bdaddr_type);\n+\n \tif (state->connected) {\n \t\tchar addr[18];\n \t\tba2str(&dev->bdaddr, addr);\n"} {"commit":"0ef313fa18446ed48dd74508f8a628020f11d182","subject":"driver: convert a few more rbtree iterators","message":"driver: convert a few more rbtree iterators\n\nSigned-off-by: Tom Gundersen <7c8224529a7c718e876cb2496c973509fde1e50e@jklm.no>\n","repos":"bus1\/dbus-broker","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/driver.c\n+++ src\/driver.c\n@@ -1642,22 +1642,21 @@\n }\n \n int driver_goodbye(Peer *peer, bool silent) {\n- ReplySlot *reply, *safe_reply;\n- MatchRule *rule, *safe_rule;\n- CRBNode *node;\n+ ReplySlot *reply, *reply_safe;\n+ MatchRule *rule, *rule_safe;\n+ NameOwnership *ownership, *ownership_safe;\n int r;\n \n if (!peer_is_registered(peer))\n return 0;\n \n- c_list_for_each_entry_safe(reply, safe_reply, &peer->owned_replies.reply_list, owner_link)\n+ c_list_for_each_entry_safe(reply, reply_safe, &peer->owned_replies.reply_list, owner_link)\n reply_slot_free(reply);\n \n- c_list_for_each_entry_safe(rule, safe_rule, &peer->matches.rule_list, registry_link)\n+ c_list_for_each_entry_safe(rule, rule_safe, &peer->matches.rule_list, registry_link)\n match_rule_unlink(rule);\n \n- while ((node = peer->owned_names.ownership_tree.root)) {\n- NameOwnership *ownership = c_container_of(node, NameOwnership, owner_node);\n+ c_rbtree_for_each_entry_unlink(ownership, ownership_safe, &peer->owned_names.ownership_tree, owner_node) {\n NameChange change;\n int r = 0;\n \n@@ -1680,17 +1679,16 @@\n }\n peer_unregister(peer);\n \n- while ((node = peer->replies_outgoing.reply_tree.root)) {\n- ReplySlot *slot = c_container_of(node, ReplySlot, registry_node);\n- Peer *sender = c_container_of(slot->owner, Peer, owned_replies);\n+ c_list_for_each_entry_safe(reply, reply_safe, &peer->owned_replies.reply_list, owner_link) {\n+ Peer *sender = c_container_of(reply->owner, Peer, owned_replies);\n \n if (!silent) {\n- r = driver_send_error(sender, slot->serial, \"org.freedesktop.DBus.Error.NoReply\", \"Pending reply cancelled\");\n+ r = driver_send_error(sender, reply->serial, \"org.freedesktop.DBus.Error.NoReply\", \"Pending reply cancelled\");\n if (r)\n return error_trace(r);\n }\n \n- reply_slot_free(slot);\n+ reply_slot_free(reply);\n }\n \n return 0;\n"} {"commit":"0d9f90cb0eac236ea2e5cd1180e414cb70d17b37","subject":"driver\/name_owner_changed: fix typo","message":"driver\/name_owner_changed: fix typo\n\nThis caused a NULL pointer dereference.\n\nSigned-off-by: Tom Gundersen <7c8224529a7c718e876cb2496c973509fde1e50e@jklm.no>\n","repos":"bus1\/dbus-broker","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/driver.c\n+++ src\/driver.c\n@@ -499,7 +499,7 @@\n }\n \n static int driver_name_owner_changed(const char *name, Peer *old_owner, Peer *new_owner) {\n- Peer *peer = new_owner ? : new_owner;\n+ Peer *peer = new_owner ? : old_owner;\n char unique_name[UNIQUE_NAME_STRING_MAX + 1];\n int r;\n \n"} {"commit":"b09cfb70826b6f854a2904736e4162d859cefa11","subject":"Code cleanup","message":"Code cleanup\n","repos":"DeforaOS\/Editor,DeforaOS\/Editor,DeforaOS\/Editor","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/editor.c\n+++ src\/editor.c\n@@ -755,8 +755,8 @@\n \tsize_t wlen;\n \tGError * error = NULL;\n \n-\tif(gtk_text_buffer_get_modified(gtk_text_view_get_buffer(GTK_TEXT_VIEW(\n-\t\t\t\t\t\teditor->view))) == TRUE)\n+\ttbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));\n+\tif(gtk_text_buffer_get_modified(tbuf) == TRUE)\n \t{\n \t\tres = editor_confirm(editor, _(\"There are unsaved changes.\\n\"\n \t\t\t\t\t\"Discard or save them?\"),\n@@ -773,7 +773,6 @@\n \t\telse if(res != GTK_RESPONSE_REJECT)\n \t\t\treturn 1;\n \t}\n-\ttbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(editor->view));\n \tgtk_text_buffer_set_text(tbuf, \"\", 0);\n \teditor->search = 0;\n \tif(filename == NULL)\n@@ -816,8 +815,7 @@\n #endif\n \t}\n \tfclose(fp);\n-\tgtk_text_buffer_set_modified(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(\n-\t\t\t\t\tGTK_TEXT_VIEW(editor->view))), FALSE);\n+\tgtk_text_buffer_set_modified(tbuf, FALSE);\n \teditor->filename = g_strdup(filename); \/* XXX may fail *\/\n \t_new_set_title(editor); \/* XXX make it a generic private function *\/\n \treturn 0;\n"} {"commit":"2c63647d26f99c80355c6da8ccf8104737cb5916","subject":"clean up logging","message":"clean up logging\n","repos":"KyleSiefring\/daala,KyleSiefring\/daala,ekr\/daala,jmvalin\/daala,smarter\/daala,vr000m\/daala,felipebetancur\/daala,kodabb\/daala,mbebenita\/daala,tribouille\/daala,nvoron23\/daala,ascent12\/daala,tribouille\/daala,mbebenita\/daala,xiphmont\/daala,tdaede\/daala_awcy_runs,felipebetancur\/daala,xiph\/daala,tribouille\/daala,jmvalin\/daala,vr000m\/daala,metajack\/daala,iankronquist\/daala,tribouille\/daala,xiph\/daala,smarter\/daala,kustom666\/daala,KyleSiefring\/daala,ycho\/daala,mbebenita\/daala,metajack\/daala,kbara\/daala,mbebenita\/daala,vr000m\/daala,nvoron23\/daala,kbara\/daala,luctrudeau\/daala,kustom666\/daala,ascent12\/daala,nvoron23\/daala,xiphmont\/daala,xiphmont\/daala,xiph\/daala,tdaede\/daala,iankronquist\/daala,ascent12\/daala,kbara\/daala,tribouille\/daala,smarter\/daala,mbebenita\/daala,kustom666\/daala,fluffy\/daala,jmvalin\/daala,luctrudeau\/daala,tdaede\/daala,HeadhunterXamd\/daala,ycho\/daala,felipebetancur\/daala,felipebetancur\/daala,ycho\/daala,smarter\/daala,tdaede\/daala,felipebetancur\/daala,HeadhunterXamd\/daala,kodabb\/daala,kodabb\/daala,nvoron23\/daala,fluffy\/daala,luctrudeau\/daala,ycho\/daala,tdaede\/daala_awcy_runs,KyleSiefring\/daala,iankronquist\/daala,kodabb\/daala,tdaede\/daala_awcy_runs,tdaede\/daala,vr000m\/daala,jmvalin\/daala,xiph\/daala,ascent12\/daala,jmvalin\/daala,ycho\/daala,nvoron23\/daala,ekr\/daala,kbara\/daala,luctrudeau\/daala,metajack\/daala,tdaede\/daala_awcy_runs,xiphmont\/daala,kodabb\/daala,HeadhunterXamd\/daala,KyleSiefring\/daala,HeadhunterXamd\/daala,iankronquist\/daala,ekr\/daala,luctrudeau\/daala,iankronquist\/daala,ascent12\/daala,HeadhunterXamd\/daala,xiphmont\/daala,xiph\/daala,fluffy\/daala,kustom666\/daala,vr000m\/daala,kustom666\/daala","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/encode.c\n+++ src\/encode.c\n@@ -438,10 +438,9 @@\n int x;\n int is_keyframe; \/* true if doing an intra coded frame *\/\n \n- \/* CJ - TODO - need better way to set doIntra *\/\n is_keyframe = ( enc->state.cur_time % (enc->state.info.keyframe_rate) == 0) ? 1 : 0;\n- fprintf( stderr,\"FLUFFY is_keyframe = %d \\n\", is_keyframe );\n- \n+ OD_LOG((OD_LOG_ENCODER, OD_LOG_INFO,\"is_keyframe=%d\",is_keyframe ));\n+ \n nhmbs = enc->state.nhmbs;\n nvmbs = enc->state.nvmbs;\n \/*Initialize the data needed for each plane.*\/\n"} {"commit":"9d65ad3591c24f194d9e8ca484b01204ecd8bee4","subject":"remove suitesparse in header files","message":"remove suitesparse in header files\n","repos":"hydrays\/CellModel,hydrays\/CellModel","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/engine.h\n+++ src\/engine.h\n@@ -12,7 +12,7 @@\n #include <iomanip>\r\n #include \"ellipse.h\"\r\n #include \"geometry.h\"\r\n-#include \"SuiteSparseQR.hpp\"\r\n+\/\/#include \"SuiteSparseQR.hpp\"\r\n \r\n class Engine\r\n {\r\n"} {"commit":"90ae6f49b8106edbe606978c924c24dc69b6a140","subject":"adding cast for safety","message":"adding cast for safety\n","repos":"holmescn\/chibi-scheme,holmescn\/chibi-scheme,norton\/chibi-scheme,holmescn\/chibi-scheme,norton\/chibi-scheme,holmescn\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,norton\/chibi-scheme,holmescn\/chibi-scheme","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/srfi\/18\/threads.c\n+++ lib\/srfi\/18\/threads.c\n@@ -278,7 +278,7 @@\n \n \/* only works on powers of two *\/\n static sexp_uint_t sexp_log2_of_pow2 (sexp_uint_t n) {\n- return sexp_log2_lookup[(n * 0x077CB531U) >> 27];\n+ return sexp_log2_lookup[((unsigned)n * 0x077CB531U) >> 27];\n }\n \n static sexp sexp_pop_signal (sexp ctx sexp_api_params(self, n)) {\n"} {"commit":"bc5f74e97ff48b89028a5f3cd0064401b37c0951","subject":"efi_variable_import(): make sure var.data_size is set.","message":"efi_variable_import(): make sure var.data_size is set.\n\nCovscan noticed that var.data_size isn't set when we memcpy the\nstructure. It should be set.\n\nSigned-off-by: Peter Jones <2e0a021e603479ff81838c00c3b770daca4e0214@redhat.com>\n","repos":"rhboot\/efivar,rhboot\/efivar,rhinstaller\/efivar,vathpela\/efivar-devel,rhinstaller\/efivar","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/export.c\n+++ src\/export.c\n@@ -118,6 +118,7 @@\n \t\t\tvar.name[i] = wname[i] & 0xff;\n \t\tptr += name_len * 2;\n \n+\t\tvar.data_size = data_len;\n \t\tvar.data = malloc(data_len);\n \t\tif (!var.data) {\n \t\t\tint saved_errno = errno;\n"} {"commit":"82d76f34d88c68a0f3055e22aab534720fa8310c","subject":"[extend] Made append_result() use FixedIntegerArray to note return value instead of RIA; PCC expects a FIA for now.","message":"[extend] Made append_result() use FixedIntegerArray to note return value\ninstead of RIA; PCC expects a FIA for now.\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@42091 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot,ashgti\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/extend.c\n+++ src\/extend.c\n@@ -1048,24 +1048,25 @@\n \/* Update returns_flag *\/\n return_flags = VTABLE_get_attr_str(interp, sig_object, return_flags_name);\n if (PMC_IS_NULL(return_flags)) {\n- return_flags = pmc_new(interp, enum_class_ResizablePMCArray);\n+ return_flags = pmc_new(interp, enum_class_FixedIntegerArray);\n+ VTABLE_set_integer_native(interp, return_flags, 1);\n VTABLE_set_attr_str(interp, sig_object, return_flags_name, return_flags);\n }\n switch (Parrot_str_indexed(interp, type, 0)) {\n case 'I':\n- VTABLE_push_integer(interp, return_flags, PARROT_ARG_INTVAL);\n+ VTABLE_set_integer_keyed_int(interp, return_flags, 0, PARROT_ARG_INTVAL);\n VTABLE_push_integer(interp, returns, PARROT_ARG_INTVAL);\n break;\n case 'N':\n- VTABLE_push_integer(interp, return_flags, PARROT_ARG_FLOATVAL);\n+ VTABLE_set_integer_keyed_int(interp, return_flags, 0, PARROT_ARG_FLOATVAL);\n VTABLE_push_integer(interp, returns, PARROT_ARG_FLOATVAL);\n break;\n case 'S':\n- VTABLE_push_integer(interp, return_flags, PARROT_ARG_STRING);\n+ VTABLE_set_integer_keyed_int(interp, return_flags, 0, PARROT_ARG_STRING);\n VTABLE_push_integer(interp, returns, PARROT_ARG_STRING);\n break;\n case 'P':\n- VTABLE_push_integer(interp, return_flags, PARROT_ARG_PMC);\n+ VTABLE_set_integer_keyed_int(interp, return_flags, 0, PARROT_ARG_PMC);\n VTABLE_push_integer(interp, returns, PARROT_ARG_PMC);\n break;\n default:\n"} {"commit":"5cfd7519348fbe0ea2d2f906f7f2393b9b72c25a","subject":"[cage] Documentation patch for Extension subsystem, recovered from pdd30_install branch.","message":"[cage] Documentation patch for Extension subsystem, recovered from pdd30_install branch.\n\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@33466 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"parrot\/parrot,tkob\/parrot,youprofit\/parrot,youprofit\/parrot,gagern\/parrot,gagern\/parrot,tewk\/parrot-select,gagern\/parrot,gitster\/parrot,FROGGS\/parrot,tkob\/parrot,youprofit\/parrot,tewk\/parrot-select,gagern\/parrot,tewk\/parrot-select,FROGGS\/parrot,tewk\/parrot-select,FROGGS\/parrot,FROGGS\/parrot,fernandobrito\/parrot,parrot\/parrot,fernandobrito\/parrot,fernandobrito\/parrot,gitster\/parrot,youprofit\/parrot,parrot\/parrot,youprofit\/parrot,gagern\/parrot,youprofit\/parrot,fernandobrito\/parrot,FROGGS\/parrot,fernandobrito\/parrot,gitster\/parrot,tewk\/parrot-select,fernandobrito\/parrot,tkob\/parrot,gitster\/parrot,youprofit\/parrot,tkob\/parrot,parrot\/parrot,tkob\/parrot,FROGGS\/parrot,tewk\/parrot-select,tkob\/parrot,tewk\/parrot-select,tkob\/parrot,gagern\/parrot,gitster\/parrot,FROGGS\/parrot,gagern\/parrot,tkob\/parrot,fernandobrito\/parrot,parrot\/parrot,FROGGS\/parrot,gitster\/parrot,youprofit\/parrot,gitster\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/extend.c\n+++ src\/extend.c\n@@ -999,7 +999,10 @@\n \n =item C<Parrot_Int Parrot_call_method_ret_int>\n \n-Call a parrot method for the given object.\n+Call the parrot subroutine C<sub> as a method on PMC object C<obj>. The method\n+should have the name C<method> as a Parrot_string, and should have a function\n+signature C<signature>. Any arguments to the method can be passed at the end\n+as a variadic argument list.\n \n =cut\n \n"} {"commit":"ab6ecaa3342f60796afe90bc9a38fc5505edec48","subject":"Refactored profiling code to eliminate redundancies between 16, 32, and 64 bit versions. Created two inline subroutines to compute size dependent array index and increment values. Eliminated subroutine call to size dependent profiling routine. This should be easier to maintain, and (hopefully) easier to debug.","message":"Refactored profiling code to eliminate redundancies between 16, 32, and 64 bit versions.\nCreated two inline subroutines to compute size dependent array index and increment values.\nEliminated subroutine call to size dependent profiling routine.\nThis should be easier to maintain, and (hopefully) easier to debug.\n","repos":"arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,arm-hpc\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,pyrovski\/papi,arm-hpc\/papi,pyrovski\/papi","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/extras.c\n+++ src\/extras.c\n@@ -59,43 +59,37 @@\n return (unsigned short) (rnum = 1664525 * rnum + 1013904223);\n }\n \n-static void posix_profil_16(caddr_t address, PAPI_sprofil_t * prof,\n- unsigned short *outside_bin, int flags, long_long excess,\n- long_long threshold)\n-{\n- int increment = 1;\n- unsigned short *buf = prof->pr_base;\n+inline_static unsigned long profil_addr(caddr_t address, PAPI_sprofil_t * prof, unsigned long size)\n+{\n unsigned long addr;\n u_long_long laddr;\n \n addr = (unsigned long) (address - prof->pr_off);\n-\n- if (addr >= prof->pr_size) {\n- *outside_bin = *outside_bin + 1;\n- DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n- return;\n- }\n- addr = addr \/ sizeof(unsigned short); \/* get the index *\/\n+ addr = addr \/ size; \/* get the index *\/\n laddr = ((u_long_long)addr) * prof->pr_scale;\n addr = (unsigned long) (laddr >> 16);\n-\n+ return(addr);\n+}\n+\n+inline_static int profil_increment(u_long_long value,\n+ int flags, long_long excess,\n+ long_long threshold)\n+{\n+ int increment = 1;\n \n if (flags == PAPI_PROFIL_POSIX) {\n- buf[addr]++;\n- DBG((stderr, \"bucket %lu = %u\\n\", addr, buf[addr]));\n- return;\n+ return(1);\n }\n \n if (flags & PAPI_PROFIL_RANDOM) {\n if (random_ushort() <= (USHRT_MAX \/ 4))\n- return;\n+ return(0);\n }\n \n if (flags & PAPI_PROFIL_COMPRESS) {\n \/* We're likely to ignore the sample if buf[address] gets big. *\/\n-\n- if (random_ushort() < buf[addr]) {\n- return;\n+ if (random_ushort() < value) {\n+ return(0);\n }\n }\n \n@@ -109,128 +103,243 @@\n increment = (int) (excess \/ threshold);\n }\n }\n-\n- buf[addr] += increment;\n- DBG((stderr, \"posix_profile() bucket %lu = %u\\n\", addr, buf[addr]));\n-}\n-\n-static void posix_profil_32(caddr_t address, PAPI_sprofil_t * prof,\n- unsigned short *outside_bin, int flags, long_long excess,\n- long_long threshold)\n-{\n- int increment = 1;\n- unsigned int *buf = prof->pr_base;\n+ return(increment);\n+}\n+\n+\/\/static void n_posix_profil_16(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ unsigned short *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/\n+\/\/ addr = profil_addr(address, prof, sizeof(unsigned short);\n+\/\/ buf[addr] += profil_increment(buf[addr], flags, excess, threshold);\n+\/\/ DBG((stderr, \"posix_profil_16() bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/}\n+\/\/\n+\/\/static void n_posix_profil_32(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ unsigned int *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/\n+\/\/ addr = profil_addr(address, prof, sizeof(unsigned int);\n+\/\/ buf[addr] += profil_increment(buf[addr], flags, excess, threshold);\n+\/\/ DBG((stderr, \"posix_profil_32() bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/}\n+\/\/\n+\/\/static void n_posix_profil_64(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ u_long_long *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/\n+\/\/ addr = profil_addr(address, prof, sizeof(u_long_long);\n+\/\/ buf[addr] += profil_increment(buf[addr], flags, excess, threshold);\n+\/\/ DBG((stderr, \"posix_profil_64() bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/}\n+\/\/\n+\/\/static void posix_profil_16(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ unsigned short *outside_bin, int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ int increment = 1;\n+\/\/ unsigned short *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/ u_long_long laddr;\n+\/\/\n+\/\/ addr = (unsigned long) (address - prof->pr_off);\n+\/\/\n+\/\/ if (addr >= prof->pr_size) {\n+\/\/ *outside_bin = *outside_bin + 1;\n+\/\/ DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n+\/\/ return;\n+\/\/ }\n+\/\/ addr = addr \/ sizeof(unsigned short); \/* get the index *\/\n+\/\/ laddr = ((u_long_long)addr) * prof->pr_scale;\n+\/\/ addr = (unsigned long) (laddr >> 16);\n+\/\/\n+\/\/\n+\/\/ if (flags == PAPI_PROFIL_POSIX) {\n+\/\/ buf[addr]++;\n+\/\/ DBG((stderr, \"bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_RANDOM) {\n+\/\/ if (random_ushort() <= (USHRT_MAX \/ 4))\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_COMPRESS) {\n+\/\/ \/* We're likely to ignore the sample if buf[address] gets big. *\/\n+\/\/\n+\/\/ if (random_ushort() < buf[addr]) {\n+\/\/ return;\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_WEIGHTED) { \/* Increment is between 1 and 255 *\/\n+\/\/ if (excess <= (long_long) 1)\n+\/\/ increment = 1;\n+\/\/ else if (excess > threshold)\n+\/\/ increment = 255;\n+\/\/ else {\n+\/\/ threshold = threshold \/ (long_long) 255;\n+\/\/ increment = (int) (excess \/ threshold);\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ buf[addr] += increment;\n+\/\/ DBG((stderr, \"posix_profile() bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/}\n+\/\/\n+\/\/static void posix_profil_32(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ unsigned short *outside_bin, int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ int increment = 1;\n+\/\/ unsigned int *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/ u_long_long laddr;\n+\/\/\n+\/\/ addr = (unsigned long) (address - prof->pr_off);\n+\/\/\n+\/\/ if (addr >= prof->pr_size) {\n+\/\/ *outside_bin = *outside_bin + 1;\n+\/\/ DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n+\/\/ return;\n+\/\/ }\n+\/\/ addr = addr \/ sizeof(unsigned int); \/* get the index *\/\n+\/\/ laddr = ((u_long_long)addr) * prof->pr_scale;\n+\/\/ addr = (unsigned long) (laddr >> 16);\n+\/\/ if (flags == PAPI_PROFIL_POSIX) {\n+\/\/ buf[addr]++;\n+\/\/ DBG((stderr, \"bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_RANDOM) {\n+\/\/ if (random_ushort() <= (USHRT_MAX \/ 4))\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_COMPRESS) {\n+\/\/ \/* We're likely to ignore the sample if buf[address] gets big. *\/\n+\/\/\n+\/\/ if (random_ushort() < buf[addr]) {\n+\/\/ return;\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_WEIGHTED) { \/* Increment is between 1 and 255 *\/\n+\/\/ if (excess <= (long_long) 1)\n+\/\/ increment = 1;\n+\/\/ else if (excess > threshold)\n+\/\/ increment = 255;\n+\/\/ else {\n+\/\/ threshold = threshold \/ (long_long) 255;\n+\/\/ increment = (int) (excess \/ threshold);\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ buf[addr] += increment;\n+\/\/ DBG((stderr, \"posix_profile() bucket %lu = %u\\n\", addr, buf[addr]));\n+\/\/}\n+\/\/\n+\/\/static void posix_profil_64(caddr_t address, PAPI_sprofil_t * prof,\n+\/\/ unsigned short *outside_bin, int flags, long_long excess,\n+\/\/ long_long threshold)\n+\/\/{\n+\/\/ int increment = 1;\n+\/\/ u_long_long *buf = prof->pr_base;\n+\/\/ unsigned long addr;\n+\/\/ u_long_long laddr;\n+\/\/\n+\/\/ addr = (unsigned long) (address - prof->pr_off);\n+\/\/\n+\/\/ if (addr >= prof->pr_size) {\n+\/\/ *outside_bin = *outside_bin + 1;\n+\/\/ DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n+\/\/ return;\n+\/\/ }\n+\/\/ addr = addr \/ sizeof(long_long); \/* get the index *\/\n+\/\/ laddr = ((u_long_long)addr) * prof->pr_scale;\n+\/\/ addr = (unsigned long) (laddr >> 16);\n+\/\/ if (flags == PAPI_PROFIL_POSIX) {\n+\/\/ buf[addr]++;\n+\/\/ DBG((stderr, \"bucket %lu = %lld\\n\", addr, buf[addr]));\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_RANDOM) {\n+\/\/ if (random_ushort() <= (USHRT_MAX \/ 4))\n+\/\/ return;\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_COMPRESS) {\n+\/\/ \/* We're likely to ignore the sample if buf[address] gets big. *\/\n+\/\/\n+\/\/ if (random_ushort() < buf[addr]) {\n+\/\/ return;\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ if (flags & PAPI_PROFIL_WEIGHTED) { \/* Increment is between 1 and 255 *\/\n+\/\/ if (excess <= (long_long) 1)\n+\/\/ increment = 1;\n+\/\/ else if (excess > threshold)\n+\/\/ increment = 255;\n+\/\/ else {\n+\/\/ threshold = threshold \/ (long_long) 255;\n+\/\/ increment = (int) (excess \/ threshold);\n+\/\/ }\n+\/\/ }\n+\/\/\n+\/\/ buf[addr] += increment;\n+\/\/ DBG((stderr, \"posix_profile() bucket %lu = %lld\\n\", addr, buf[addr]));\n+\/\/}\n+\n+static void posix_profil(caddr_t address, PAPI_sprofil_t * prof,\n+ unsigned short *outside_bin, int flags, long_long excess,\n+ long_long threshold)\n+{\n unsigned long addr;\n- u_long_long laddr;\n-\n- addr = (unsigned long) (address - prof->pr_off);\n-\n- if (addr >= prof->pr_size) {\n+ unsigned short *buf16;\n+ unsigned int *buf32;\n+ u_long_long *buf64;\n+\n+ \/* check for addresses outside specified range *\/\n+ if ((address - prof->pr_off) >= prof->pr_size) {\n *outside_bin = *outside_bin + 1;\n DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n return;\n }\n- addr = addr \/ sizeof(unsigned int); \/* get the index *\/\n- laddr = ((u_long_long)addr) * prof->pr_scale;\n- addr = (unsigned long) (laddr >> 16);\n- if (flags == PAPI_PROFIL_POSIX) {\n- buf[addr]++;\n- DBG((stderr, \"bucket %lu = %u\\n\", addr, buf[addr]));\n- return;\n- }\n-\n- if (flags & PAPI_PROFIL_RANDOM) {\n- if (random_ushort() <= (USHRT_MAX \/ 4))\n- return;\n- }\n-\n- if (flags & PAPI_PROFIL_COMPRESS) {\n- \/* We're likely to ignore the sample if buf[address] gets big. *\/\n-\n- if (random_ushort() < buf[addr]) {\n- return;\n- }\n- }\n-\n- if (flags & PAPI_PROFIL_WEIGHTED) { \/* Increment is between 1 and 255 *\/\n- if (excess <= (long_long) 1)\n- increment = 1;\n- else if (excess > threshold)\n- increment = 255;\n- else {\n- threshold = threshold \/ (long_long) 255;\n- increment = (int) (excess \/ threshold);\n- }\n- }\n-\n- buf[addr] += increment;\n- DBG((stderr, \"posix_profile() bucket %lu = %u\\n\", addr, buf[addr]));\n-}\n-\n-static void posix_profil_64(caddr_t address, PAPI_sprofil_t * prof,\n- unsigned short *outside_bin, int flags, long_long excess,\n- long_long threshold)\n-{\n- int increment = 1;\n- u_long_long *buf = prof->pr_base;\n- unsigned long addr;\n- u_long_long laddr;\n-\n- addr = (unsigned long) (address - prof->pr_off);\n-\n- if (addr >= prof->pr_size) {\n- *outside_bin = *outside_bin + 1;\n- DBG((stderr, \"outside bucket at %p = %u\\n\", outside_bin, *outside_bin));\n- return;\n- }\n- addr = addr \/ sizeof(long_long); \/* get the index *\/\n- laddr = ((u_long_long)addr) * prof->pr_scale;\n- addr = (unsigned long) (laddr >> 16);\n- if (flags == PAPI_PROFIL_POSIX) {\n- buf[addr]++;\n- DBG((stderr, \"bucket %lu = %lld\\n\", addr, buf[addr]));\n- return;\n- }\n-\n- if (flags & PAPI_PROFIL_RANDOM) {\n- if (random_ushort() <= (USHRT_MAX \/ 4))\n- return;\n- }\n-\n- if (flags & PAPI_PROFIL_COMPRESS) {\n- \/* We're likely to ignore the sample if buf[address] gets big. *\/\n-\n- if (random_ushort() < buf[addr]) {\n- return;\n- }\n- }\n-\n- if (flags & PAPI_PROFIL_WEIGHTED) { \/* Increment is between 1 and 255 *\/\n- if (excess <= (long_long) 1)\n- increment = 1;\n- else if (excess > threshold)\n- increment = 255;\n- else {\n- threshold = threshold \/ (long_long) 255;\n- increment = (int) (excess \/ threshold);\n- }\n- }\n-\n- buf[addr] += increment;\n- DBG((stderr, \"posix_profile() bucket %lu = %lld\\n\", addr, buf[addr]));\n-}\n-\n-static void posix_profil(caddr_t address, PAPI_sprofil_t * prof,\n- unsigned short *outside_bin, int flags, long_long excess,\n- long_long threshold)\n-{\n- if (flags & PAPI_PROFIL_BUCKET_32)\n- posix_profil_32(address, prof, outside_bin, flags, excess, threshold);\n- else if (flags & PAPI_PROFIL_BUCKET_64)\n- posix_profil_64(address, prof, outside_bin, flags, excess, threshold);\n- else\n- posix_profil_16(address, prof, outside_bin, flags, excess, threshold);\n-\n+ \n+ if (!(flags & (PAPI_PROFIL_BUCKET_32+PAPI_PROFIL_BUCKET_64))) {\n+\/\/ n_posix_profil_16(address, prof, flags, excess, threshold);\n+ buf16 = prof->pr_base;\n+ addr = profil_addr(address, prof, sizeof(short));\n+ buf16[addr] += profil_increment(buf16[addr], flags, excess, threshold);\n+ DBG((stderr, \"posix_profil_16() bucket %lu = %u\\n\", addr, buf16[addr]));\n+ }\n+ else if (flags & PAPI_PROFIL_BUCKET_32) {\n+\/\/ n_posix_profil_32(address, prof, flags, excess, threshold);\n+ buf32 = prof->pr_base;\n+ addr = profil_addr(address, prof, sizeof(int));\n+ buf32[addr] += profil_increment(buf32[addr], flags, excess, threshold);\n+ DBG((stderr, \"posix_profil_32() bucket %lu = %u\\n\", addr, buf32[addr]));\n+ }\n+ else {\n+\/\/ n_posix_profil_64(address, prof, flags, excess, threshold);\n+ buf64 = prof->pr_base;\n+ addr = profil_addr(address, prof, sizeof(long_long));\n+ buf64[addr] += profil_increment(buf64[addr], flags, excess, threshold);\n+ DBG((stderr, \"posix_profil_64() bucket %lu = %lld\\n\", addr, buf64[addr]));\n+ }\n }\n \n void dispatch_profile(EventSetInfo_t * ESI, void *context,\n"} {"commit":"90df7350f0f4c543ec9058be2efedd3c01696686","subject":"Make deblocking work with 4 pixel wide blocks.","message":"Make deblocking work with 4 pixel wide blocks.\n","repos":"ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar,ultravideo\/kvazaar","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/filter.c\n+++ src\/filter.c\n@@ -281,8 +281,6 @@\n {\n videoframe_t * const frame = state->tile->frame;\n const encoder_control_t * const encoder = state->encoder_control;\n- \n- cu_info_t *cu_q = kvz_cu_array_at(frame->cu_array, x, y);\n \n {\n int32_t stride = frame->rec->stride;\n@@ -291,7 +289,6 @@\n \/\/ TODO: support 10+bits\n kvz_pixel *orig_src = &frame->rec->y[x + y*stride];\n kvz_pixel *src = orig_src;\n- cu_info_t *cu_p = NULL;\n \n int8_t strength = 0;\n int32_t qp = state->global->QP;\n@@ -315,11 +312,18 @@\n int32_t dp0, dq0, dp3, dq3, d0, d3, dp, dq, d;\n \n {\n- \/\/ CU in the side we are filtering, update every 8-pixels\n+ \/\/ CUs on both sides of the edge\n+ cu_info_t *cu_p;\n+ cu_info_t *cu_q;\n if (dir == EDGE_VER) {\n- cu_p = kvz_cu_array_at(frame->cu_array, x - 1, y + 4 * block_idx);\n+ int32_t y_coord = y + 4 * block_idx;\n+ cu_p = kvz_cu_array_at(frame->cu_array, x - 1, y_coord);\n+ cu_q = kvz_cu_array_at(frame->cu_array, x, y_coord);\n+\n } else {\n- cu_p = kvz_cu_array_at(frame->cu_array, x + 4 * block_idx, y - 1);\n+ int32_t x_coord = x + 4 * block_idx;\n+ cu_p = kvz_cu_array_at(frame->cu_array, x_coord, y - 1);\n+ cu_q = kvz_cu_array_at(frame->cu_array, x_coord, y );\n }\n \n bool nonzero_coeffs = cbf_is_set(cu_q->cbf.y, cu_q->tr_depth)\n@@ -474,7 +478,6 @@\n {\n const encoder_control_t * const encoder = state->encoder_control;\n const videoframe_t * const frame = state->tile->frame;\n- const cu_info_t *cu_q = kvz_cu_array_at_const(frame->cu_array, x << 1, y << 1);\n \n \/\/ For each subpart\n {\n@@ -485,7 +488,6 @@\n &frame->rec->u[x + y*stride],\n &frame->rec->v[x + y*stride],\n };\n- const cu_info_t *cu_p = NULL;\n int8_t strength = 2;\n \n int32_t QP = kvz_g_chroma_scale[state->global->QP];\n@@ -500,10 +502,18 @@\n \n for (uint32_t blk_idx = 0; blk_idx < num_4px_parts; ++blk_idx)\n {\n+ \/\/ CUs on both sides of the edge\n+ cu_info_t *cu_p;\n+ cu_info_t *cu_q;\n if (dir == EDGE_VER) {\n- cu_p = kvz_cu_array_at(frame->cu_array, 2 * (x - 1), 2 * (y + 4 * blk_idx));\n+ int32_t y_coord = (y + 4 * blk_idx) << 1;\n+ cu_p = kvz_cu_array_at(frame->cu_array, (x - 1) << 1, y_coord);\n+ cu_q = kvz_cu_array_at(frame->cu_array, x << 1, y_coord);\n+\n } else {\n- cu_p = kvz_cu_array_at(frame->cu_array, 2 * (x + 4 * blk_idx), 2 * (y - 1));\n+ int32_t x_coord = (x + 4 * blk_idx) << 1;\n+ cu_p = kvz_cu_array_at(frame->cu_array, x_coord, (y - 1) << 1);\n+ cu_q = kvz_cu_array_at(frame->cu_array, x_coord, (y ) << 1);\n }\n \n \/\/ Only filter when strenght == 2 (one of the blocks is intra coded)\n"} {"commit":"3234a0d9773a23fce17d3e9e6a8ccad6a89f7d39","subject":"format empty array\/objects in a more compact way","message":"format empty array\/objects in a more compact way\n","repos":"galdor\/libjson","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/format.c\n+++ src\/format.c\n@@ -149,6 +149,13 @@\n return -1;\n \n if (ctx->opts & JSON_FORMAT_INDENT) {\n+ if (object->nb_members == 0) {\n+ if (c_buffer_add_string(buf, \"}\") == -1)\n+ return -1;\n+\n+ return 0;\n+ }\n+\n if (c_buffer_add_string(buf, \"\\n\") == -1)\n return -1;\n \n@@ -208,6 +215,13 @@\n return -1;\n \n if (ctx->opts & JSON_FORMAT_INDENT) {\n+ if (array->nb_elements == 0) {\n+ if (c_buffer_add_string(buf, \"]\") == -1)\n+ return -1;\n+\n+ return 0;\n+ }\n+\n if (c_buffer_add_string(buf, \"\\n\") == -1)\n return -1;\n \n"} {"commit":"d748a3f31b1685f1e54a399f0016533f815d0b48","subject":"grn_ts: use grn_ja_reader_ref\/unref()","message":"grn_ts: use grn_ja_reader_ref\/unref()\n\nGitHub: #446\n","repos":"cosmo0920\/groonga,cosmo0920\/groonga,kenhys\/groonga,kenhys\/groonga,groonga\/groonga,komainu8\/groonga,komainu8\/groonga,kenhys\/groonga,groonga\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,groonga\/groonga,naoa\/groonga,kenhys\/groonga,kenhys\/groonga,cosmo0920\/groonga,naoa\/groonga,komainu8\/groonga,naoa\/groonga,naoa\/groonga,groonga\/groonga,naoa\/groonga,groonga\/groonga,komainu8\/groonga,cosmo0920\/groonga,kenhys\/groonga,groonga\/groonga,cosmo0920\/groonga,kenhys\/groonga,cosmo0920\/groonga,komainu8\/groonga,naoa\/groonga,groonga\/groonga,komainu8\/groonga,komainu8\/groonga,kenhys\/groonga,naoa\/groonga,cosmo0920\/groonga,naoa\/groonga","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- lib\/ts\/ts_expr_node.c\n+++ lib\/ts\/ts_expr_node.c\n@@ -2320,6 +2320,7 @@\n grn_obj *column;\n grn_ts_buf buf;\n grn_ts_buf body_buf;\n+ grn_ja_reader *reader;\n } grn_ts_expr_column_node;\n \n \/* grn_ts_expr_column_node_init() initializes a node. *\/\n@@ -2331,12 +2332,16 @@\n node->column = NULL;\n grn_ts_buf_init(ctx, &node->buf);\n grn_ts_buf_init(ctx, &node->body_buf);\n+ node->reader = NULL;\n }\n \n \/* grn_ts_expr_column_node_fin() finalizes a node. *\/\n static void\n grn_ts_expr_column_node_fin(grn_ctx *ctx, grn_ts_expr_column_node *node)\n {\n+ if (node->reader) {\n+ grn_ja_reader_close(ctx, node->reader);\n+ }\n grn_ts_buf_fin(ctx, &node->body_buf);\n grn_ts_buf_fin(ctx, &node->buf);\n if (node->column) {\n@@ -2456,33 +2461,51 @@\n char *buf_ptr;\n grn_rc rc;\n grn_ts_text *out_ptr = (grn_ts_text *)out;\n- grn_ja_reader reader;\n- rc = grn_ja_reader_init(ctx, &reader, (grn_ja *)node->column);\n- if (rc != GRN_SUCCESS) {\n- GRN_TS_ERR_RETURN(rc, \"grn_ja_reader_init failed\");\n+ if (!node->reader) {\n+ rc = grn_ja_reader_open(ctx, (grn_ja *)node->column, &node->reader);\n+ if (rc != GRN_SUCCESS) {\n+ GRN_TS_ERR_RETURN(rc, \"grn_ja_reader_open failed\");\n+ }\n+ } else {\n+ grn_ja_reader_unref(ctx, node->reader);\n }\n node->buf.pos = 0;\n for (i = 0; i < n_in; i++) {\n- rc = grn_ja_reader_seek(ctx, &reader, in[i].id);\n+ rc = grn_ja_reader_seek(ctx, node->reader, in[i].id);\n if (rc == GRN_SUCCESS) {\n- rc = grn_ts_buf_reserve(ctx, &node->buf,\n- node->buf.pos + reader.value_size);\n- if (rc == GRN_SUCCESS) {\n- rc = grn_ja_reader_read(ctx, &reader,\n- (char *)node->buf.ptr + node->buf.pos);\n+ if (node->reader->ref_avail) {\n+ void *addr;\n+ rc = grn_ja_reader_ref(ctx, node->reader, &addr);\n if (rc == GRN_SUCCESS) {\n- node->buf.pos += reader.value_size;\n+ out_ptr[i].ptr = (char *)addr;\n+ }\n+ } else {\n+ rc = grn_ts_buf_reserve(ctx, &node->buf,\n+ node->buf.pos + node->reader->value_size);\n+ if (rc == GRN_SUCCESS) {\n+ rc = grn_ja_reader_read(ctx, node->reader,\n+ (char *)node->buf.ptr + node->buf.pos);\n+ if (rc == GRN_SUCCESS) {\n+ out_ptr[i].ptr = NULL;\n+ node->buf.pos += node->reader->value_size;\n+ }\n }\n }\n }\n- out_ptr[i].size = (rc == GRN_SUCCESS) ? reader.value_size : 0;\n+ if (rc == GRN_SUCCESS) {\n+ out_ptr[i].size = node->reader->value_size;\n+ } else {\n+ out_ptr[i].ptr = NULL;\n+ out_ptr[i].size = 0;\n+ }\n }\n buf_ptr = (char *)node->buf.ptr;\n for (i = 0; i < n_in; i++) {\n- out_ptr[i].ptr = buf_ptr;\n- buf_ptr += out_ptr[i].size;\n+ if (!out_ptr[i].ptr) {\n+ out_ptr[i].ptr = buf_ptr;\n+ buf_ptr += out_ptr[i].size;\n+ }\n }\n- grn_ja_reader_fin(ctx, &reader);\n return GRN_SUCCESS;\n }\n GRN_TS_EXPR_COLUMN_NODE_EVALUATE_SCALAR_CASE(GEO, geo)\n"} {"commit":"9fc13a713cf8bb0dab6ad7bd5e5f3695a5a5d7b7","subject":"-Wall, and account for bizarre IPF ioctl argument handling","message":"-Wall, and account for bizarre IPF ioctl argument handling\n","repos":"wtfbbqhax\/libdnet,wtfbbqhax\/libdnet,jncornett\/libdnet,kbandla\/libdnet,jncornett\/libdnet,jncornett\/libdnet,kbandla\/libdnet,wtfbbqhax\/libdnet,kbandla\/libdnet","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/fw-ipf.c\n+++ src\/fw-ipf.c\n@@ -31,6 +31,7 @@\n #include <stdio.h>\n #include <stdlib.h>\n #include <string.h>\n+#include <unistd.h>\n \n #define KMEM_NAME\t\"\/dev\/kmem\"\n \n@@ -49,8 +50,6 @@\n static void\n rule_to_ipf(struct fw_rule *rule, struct frentry *fr)\n {\n-\tint i;\n-\t\n \tmemset(fr, 0, sizeof(*fr));\n \n \tif (*rule->device != '\\0') {\n@@ -142,8 +141,6 @@\n static void\n ipf_to_rule(struct frentry *fr, struct fw_rule *rule)\n {\n-\tint i;\n-\t\n \tmemset(rule, 0, sizeof(*rule));\n \n \tstrlcpy(rule->device, fr->fr_ifname, sizeof(rule->device));\n@@ -249,24 +246,27 @@\n fw_loop(fw_t *fw, fw_handler callback, void *arg)\n {\n \tstruct friostat fio;\n-\tstruct friostat fiop = &fio;\n+\tstruct friostat *fiop = &fio;\n \tstruct frentry *frp, fr;\n \tstruct fw_rule rule;\n \tint ret;\n \t\n \tmemset(&fio, 0, sizeof(fio));\n-\t\n-\tif (ioctl(fw->fd, SIOCGETFS, &fiop) < 0)\n-\t\treturn (-1);\n-\n-\tfor (frp = fio.f_fout[fio.f_active]; frp != NULL; frp = fr.fr_next) {\n+#ifdef __OpenBSD__\n+\tif (ioctl(fw->fd, SIOCGETFS, fiop) < 0)\n+#else\n+\tif (ioctl(fw->fd, SIOCGETFS, &fiop) < 0)\t\/* XXX - darren! *\/\n+#endif\n+\t\treturn (-1);\n+\n+\tfor (frp = fio.f_fout[(int)fio.f_active]; frp != NULL; frp = fr.fr_next) {\n \t\tif (fw_kcopy(fw, (u_char *)&fr, (u_long)frp, sizeof(fr)) < 0)\n \t\t\treturn (-1);\n \t\tipf_to_rule(&fr, &rule);\n \t\tif ((ret = callback(&rule, arg)) != 0)\n \t\t\treturn (ret);\n \t}\n-\tfor (frp = fio.f_fin[fio.f_active]; frp != NULL; frp = fr.fr_next) {\n+\tfor (frp = fio.f_fin[(int)fio.f_active]; frp != NULL; frp = fr.fr_next) {\n \t\tif (fw_kcopy(fw, (u_char *)&fr, (u_long)frp, sizeof(fr)) < 0)\n \t\t\treturn (-1);\n \t\tipf_to_rule(&fr, &rule);\n"} {"commit":"0b4576b084332bd1220fc7505c22a70397fbed54","subject":"3-space indentation in one block fixed to 2-space","message":"3-space indentation in one block fixed to 2-space\n","repos":"vlulla\/data.table,vlulla\/data.table,jangorecki\/data.table,Rdatatable\/data.table,Rdatatable\/data.table,vlulla\/data.table,jangorecki\/data.table,jangorecki\/data.table,Rdatatable\/data.table,Rdatatable\/data.table,jangorecki\/data.table,vlulla\/data.table","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/fwrite.c\n+++ src\/fwrite.c\n@@ -252,19 +252,19 @@\n \/\/ 30460 => l=3046, sf=4, exp=4 dr=0; dl0=1; width=5\n \/\/ 0.0072 => l=72, sf=2, exp=-3 dr=4; dl0=1; width=6\n if (width <= sf + (sf>1) + 2 + (abs(exp)>99?3:2)) {\n- \/\/ ^^^^ to not include 1 char for dec in -7e-04 where sf==1\n- \/\/ ^ 2 for 'e+'\/'e-'\n- \/\/ decimal format ...\n- ch += width-1;\n- if (dr) {\n- while (dr && sf) { *ch--='0'+l%10; l\/=10; dr--; sf--; }\n- while (dr) { *ch--='0'; dr--; }\n- *ch-- = dec;\n- }\n- while (dl0) { *ch--='0'; dl0--; }\n- while (sf) { *ch--='0'+l%10; l\/=10; sf--; }\n- \/\/ ch is now 1 before the first char of the field so position it afterward again, and done\n- ch += width+1;\n+ \/\/ ^^^^ to not include 1 char for dec in -7e-04 where sf==1\n+ \/\/ ^ 2 for 'e+'\/'e-'\n+ \/\/ decimal format ...\n+ ch += width-1;\n+ if (dr) {\n+ while (dr && sf) { *ch--='0'+l%10; l\/=10; dr--; sf--; }\n+ while (dr) { *ch--='0'; dr--; }\n+ *ch-- = dec;\n+ }\n+ while (dl0) { *ch--='0'; dl0--; }\n+ while (sf) { *ch--='0'+l%10; l\/=10; sf--; }\n+ \/\/ ch is now 1 before the first char of the field so position it afterward again, and done\n+ ch += width+1;\n } else {\n \/\/ scientific ...\n ch += sf; \/\/ sf-1 + 1 for dec\n"} {"commit":"466800d3355afbd7418a45648ee3a3334594b244","subject":"Remove gc_finalize from mandatory GC subroutines.","message":"Remove gc_finalize from mandatory GC subroutines.\n\ngit-svn-id: 6e74a02f85675cec270f5d931b0f6998666294a3@45126 d31e2699-5ff4-0310-a27c-f18f2fbe73fe\n","repos":"tkob\/parrot,youprofit\/parrot,tewk\/parrot-select,tewk\/parrot-select,gitster\/parrot,parrot\/parrot,youprofit\/parrot,tkob\/parrot,FROGGS\/parrot,FROGGS\/parrot,tewk\/parrot-select,gagern\/parrot,gitster\/parrot,gitster\/parrot,fernandobrito\/parrot,gagern\/parrot,tkob\/parrot,parrot\/parrot,fernandobrito\/parrot,gitster\/parrot,fernandobrito\/parrot,gitster\/parrot,fernandobrito\/parrot,tkob\/parrot,parrot\/parrot,tewk\/parrot-select,gagern\/parrot,FROGGS\/parrot,tkob\/parrot,parrot\/parrot,gagern\/parrot,fernandobrito\/parrot,gagern\/parrot,gitster\/parrot,youprofit\/parrot,gitster\/parrot,youprofit\/parrot,tkob\/parrot,FROGGS\/parrot,parrot\/parrot,youprofit\/parrot,gagern\/parrot,tewk\/parrot-select,fernandobrito\/parrot,youprofit\/parrot,youprofit\/parrot,youprofit\/parrot,FROGGS\/parrot,FROGGS\/parrot,gagern\/parrot,tewk\/parrot-select,tkob\/parrot,tkob\/parrot,FROGGS\/parrot,tewk\/parrot-select,fernandobrito\/parrot,FROGGS\/parrot","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- src\/gc\/api.c\n+++ src\/gc\/api.c\n@@ -252,7 +252,6 @@\n };\n \n \/* Assertions that GC subsystem has complete API *\/\n- PARROT_ASSERT(interp->gc_sys->finalize_gc_system);\n PARROT_ASSERT(interp->gc_sys->destroy_child_interp);\n \n PARROT_ASSERT(interp->gc_sys->do_gc_mark);\n"} {"commit":"32c121eb2464872c3a5640999b367afa45ebca10","subject":"still fixing nobs_done,nobs_remain","message":"still fixing nobs_done,nobs_remain\n","repos":"desihub\/fiberassign,desihub\/fiberassign,desihub\/fiberassign,desihub\/fiberassign","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/global.h\n+++ src\/global.h\n@@ -30,7 +30,7 @@\n \n \/\/ Assignment functions ----------------------------------------------\n \/\/ First simple assignment plan, executing find_best on every plate on every fiber\n-void simple_assign(const MTL& M, const Plates& P, const PP& pp, const Feat& F, Assignment& A, int next=-1);\n+void simple_assign(MTL& M, const Plates& P, const PP& pp, const Feat& F, Assignment& A, int next=-1);\n \n \/\/ More fine first assignment plan, \n void new_assign_fibers(MTL& M, const Plates& P, const PP& pp, const Feat& F, Assignment& A, int next=-1);\n"} {"commit":"47525aae02a19cdc63a0db11f24de6d45319aae2","subject":"Fixed Warnings","message":"Fixed Warnings\n","repos":"mongodb\/mongo-c-driver-legacy,HeliumProject\/mongo-c,mongodb\/mongo-c-driver-legacy,HeliumProject\/mongo-c,HeliumProject\/mongo-c,HeliumProject\/mongo-c,Elastica\/mongo-c-driver-legacy,mongodb\/mongo-c-driver-legacy,mongodb\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gridfs.c\n+++ src\/gridfs.c\n@@ -526,7 +526,7 @@\n const char* data;\n const int num = gridfile_get_numchunks( gfile );\n \n- for ( int i=0; i<num; i++ ){\n+ for ( i = 0; i < num; i++ ){\n chunk = gridfile_get_chunk( gfile, i );\n bson_find( &it, &chunk, \"data\" );\n len = bson_iterator_bin_len( &it );\n@@ -543,23 +543,23 @@\n size_t gridfile_read(gridfile* gfile, size_t size, char* buf)\n \n {\n- int n; \n+ bson chunk;\n+ bson_iterator it;\n+ size_t n = 0; \n size_t i = 0;\n- size_t chunksize;\n- size_t contentlength;\n- size_t len;\n- bson chunk;\n- bson_iterator it;\n- const char * data;\n- \n+ size_t chunksize = 0;\n+ size_t contentlength = 0;\n+ size_t len = 0;\n+ const char * data = NULL;\n \n contentlength = gridfile_get_contentlength(gfile);\n chunksize = gridfile_get_chunksize(gfile);\n size = (contentlength - gfile->pos < size) \n ? contentlength - gfile->pos\n : size;\n+\n for (i = 0; i < size; i++) {\n- if ((gfile->pos+i)\/chunksize != n) {\n+ if (i == 0 || (gfile->pos+i)\/chunksize != n) {\n n = (gfile->pos+i)\/chunksize;\n chunk = gridfile_get_chunk(gfile, n);\n bson_find( &it, &chunk, \"data\" );\n"} {"commit":"e9ba14d431cb54973b394831ef5d0ffe991e4d2e","subject":"removed unneeded includes","message":"removed unneeded includes\n","repos":"Elastica\/mongo-c-driver-legacy,HeliumProject\/mongo-c,HeliumProject\/mongo-c,mongodb\/mongo-c-driver-legacy,HeliumProject\/mongo-c,mongodb\/mongo-c-driver-legacy,mongodb\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,HeliumProject\/mongo-c,mongodb\/mongo-c-driver-legacy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gridfs.c\n+++ src\/gridfs.c\n@@ -6,8 +6,6 @@\n #include \"gridfs.h\"\n #include \"mongo.h\"\n #include \"bson.h\"\n-#include <math.h>\n-#include <stdio.h>\n #include <stdlib.h>\n #include <string.h>\n #include <assert.h>\n@@ -494,12 +492,16 @@\n bson_iterator it;\n size_t length;\n size_t chunkSize;\n+ double numchunks;\n \n bson_find(&it, gfile->obj, \"length\");\n length = bson_iterator_int(&it); \n bson_find(&it, gfile->obj, \"chunkSize\");\n chunkSize = bson_iterator_int(&it);\n- return ceil((double)length\/(double)chunkSize);\n+ numchunks = ((double)length\/(double)chunkSize);\n+ return (numchunks - (int)numchunks > 0) \n+ ? (int)(numchunks+1)\n+ : (int)(numchunks);\n }\n \n \/*--------------------------------------------------------------------*\/\n"} {"commit":"5f7aad293fe00d2827edf69999a63f39f4de2dff","subject":"made filenames optional","message":"made filenames optional\n","repos":"mongodb\/mongo-c-driver-legacy,HeliumProject\/mongo-c,HeliumProject\/mongo-c,mongodb\/mongo-c-driver-legacy,HeliumProject\/mongo-c,HeliumProject\/mongo-c,Elastica\/mongo-c-driver-legacy,mongodb\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,Elastica\/mongo-c-driver-legacy,mongodb\/mongo-c-driver-legacy","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/gridfs.c\n+++ src\/gridfs.c\n@@ -134,7 +134,9 @@\n \/* Create and insert BSON for file metadata *\/\n bson_buffer_init(&buf);\n bson_append_oid(&buf, \"_id\", &id);\n- bson_append_string(&buf, \"filename\", name);\n+ if (name != NULL && strlen(name) != 0) {\n+ bson_append_string(&buf, \"filename\", name);\n+ }\n bson_append_int(&buf, \"length\", length);\n bson_append_int(&buf, \"chunkSize\", DEFAULT_CHUNK_SIZE);\n bson_append_date(&buf, \"uploadDate\", (bson_date_t)1000*time(NULL));\n@@ -177,10 +179,6 @@\n data += chunkLen;\n }\n \n- \/* Untitled files *\/\n- if (remotename == NULL || strlen(remotename)==0) \n- remotename = \"untitled\";\n-\n \/* Inserts file's metadata *\/\n return gridfs_insert_file(gfs, remotename, id, length, contenttype);\n }\n@@ -226,8 +224,7 @@\n remotename = filename; }\n \n \/* Inserts file's metadata *\/\n- return gridfs_insert_file(gfs, remotename, id, length, \n-\t\t\t contenttype);\n+ return gridfs_insert_file(gfs, remotename, id, length, contenttype);\n }\n \n \/*--------------------------------------------------------------------*\/\n"} {"commit":"2dd3bd25b0fcc169ca5a8ff8ba84a3ecc71bec7f","subject":"Fixes returning of send\/recv buffer size","message":"Fixes returning of send\/recv buffer size\n\n","repos":"zhaozg\/luv,luvit\/luv,luvit\/luv,zhaozg\/luv","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/handle.c\n+++ src\/handle.c\n@@ -151,34 +151,36 @@\n \n static int luv_send_buffer_size(lua_State* L) {\n uv_handle_t* handle = luv_check_handle(L, 1);\n- int value;\n+ int value = luaL_optinteger(L, 2, 0);\n int ret;\n- if (lua_isnoneornil(L, 2)) {\n- value = 0;\n+ if (value == 0) { \/\/ get\n+ ret = uv_send_buffer_size(handle, &value);\n+ if (ret < 0) return luv_error(L, ret);\n+ lua_pushinteger(L, value);\n+ return 1;\n+ } else { \/\/ set\n+ ret = uv_send_buffer_size(handle, &value);\n+ if (ret < 0) return luv_error(L, ret);\n+ lua_pushinteger(L, ret);\n+ return 1;\n }\n- else {\n- value = luaL_checkinteger(L, 2);\n- }\n- ret = uv_send_buffer_size(handle, &value);\n- if (ret < 0) return luv_error(L, ret);\n- lua_pushinteger(L, ret);\n- return 1;\n }\n \n static int luv_recv_buffer_size(lua_State* L) {\n uv_handle_t* handle = luv_check_handle(L, 1);\n- int value;\n+ int value = luaL_optinteger(L, 2, 0);\n int ret;\n- if (lua_isnoneornil(L, 2)) {\n- value = 0;\n+ if (value == 0) { \/\/ get\n+ ret = uv_recv_buffer_size(handle, &value);\n+ if (ret < 0) return luv_error(L, ret);\n+ lua_pushinteger(L, value);\n+ return 1;\n+ } else { \/\/ set\n+ ret = uv_recv_buffer_size(handle, &value);\n+ if (ret < 0) return luv_error(L, ret);\n+ lua_pushinteger(L, ret);\n+ return 1;\n }\n- else {\n- value = luaL_checkinteger(L, 2);\n- }\n- ret = uv_recv_buffer_size(handle, &value);\n- if (ret < 0) return luv_error(L, ret);\n- lua_pushinteger(L, ret);\n- return 1;\n }\n \n static int luv_fileno(lua_State* L) {\n"} {"commit":"96920225c096bb55b41b749e5763f44e68a2c549","subject":" Fix not handling PGHOST environment for Unix domain socket connections (cont.)","message":" Fix not handling PGHOST environment for Unix domain socket connections (cont.)\n\n The previous commit is not good against PostgreSQL 9.3, because UnixSocketDir\nis discarded and Unix_socket_directories comes to be used. In addition, parallel\nwriter processes uses both PGHOST and UnixSocketDir separately in the current\nimplementation. Thus, it seems to be better to use PGHOST only.\n","repos":"bwtakacy\/prev_pg_bulkload_repo,bwtakacy\/prev_pg_bulkload_repo,bwtakacy\/pg_bulkload,bwtakacy\/prev_pg_bulkload_repo,ooyamams\/pg_bulkload,ooyamams\/pg_bulkload,bwtakacy\/pg_bulkload,ooyamams\/pg_bulkload,bwtakacy\/pg_bulkload","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- lib\/writer_parallel.c\n+++ lib\/writer_parallel.c\n@@ -367,6 +367,15 @@\n \tsetenv(\"PGCLIENTENCODING\", GetDatabaseEncodingName(), 1);\n \n #ifdef HAVE_UNIX_SOCKETS\n+\n+#if PG_VERSION_NUM >= 90300\n+\t\/* UnixSocketDir exist only 9.2 and before. *\/\n+\tchar *UnixSocketDir;\n+\t\n+\t\/* use PGHOST value *\/\n+\tUnixSocketDir = getenv(\"PGHOST\");\n+#endif\n+\n \thost = (UnixSocketDir == NULL || UnixSocketDir[0] == '\\0') ?\n \t\t\t\tDEFAULT_PGSOCKET_DIR :\n \t\t\t\tUnixSocketDir;\n"} {"commit":"121b98005d3bbe67df1a8ef76a7aa6542fc8579c","subject":"Fix IGF result not being taken modulo N","message":"Fix IGF result not being taken modulo N\n","repos":"jl777\/libntru,iblumenfeld\/libntru,jl777\/libntru,jquesnelle\/libntru,iblumenfeld\/libntru,jquesnelle\/libntru,jl777\/libntru,jquesnelle\/libntru,iblumenfeld\/libntru","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/idxgen.c\n+++ src\/idxgen.c\n@@ -58,7 +58,9 @@\n *i = ntru_leading(&s->buf, c); \/* assume c<32 *\/\n ntru_truncate(&s->buf, c);\n s->rem_len -= c;\n- if (*i < (1<<c)-((1<<c)%N))\n+ if (*i < (1<<c)-((1<<c)%N)) {\n+ *i %= N;\n return;\n+ }\n }\n }\n"} {"commit":"b0a116d01ea5502959ae2b5d713c24b15aa7fcd1","subject":"Move ROUTER_FILTER assignments to variable declaration.","message":"Move ROUTER_FILTER assignments to variable declaration.\n","repos":"rsmarples\/dhcpcd,rsmarples\/dhcpcd,rsmarples\/dhcpcd","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/if-bsd.c\n+++ src\/if-bsd.c\n@@ -121,7 +121,18 @@\n {\n \tstruct priv *priv;\n #ifdef ROUTE_MSGFILTER\n-\tunsigned int msgfilter;\n+\tunsigned int msgfilter = ROUTE_FILTER(RTM_IFINFO)\n+#ifdef RTM_IFANNOUNCE\n+\t | ROUTE_FILTER(RTM_IFANNOUNCE)\n+#endif\n+\t | ROUTE_FILTER(RTM_ADD)\n+\t | ROUTE_FILTER(RTM_CHANGE)\n+\t | ROUTE_FILTER(RTM_DELETE)\n+#ifdef RTM_CHGADDR\n+\t | ROUTE_FILTER(RTM_CHGADDR)\n+#endif\n+\t | ROUTE_FILTER(RTM_DELADDR)\n+\t | ROUTE_FILTER(RTM_NEWADDR);\n #endif\n \n \tif ((priv = malloc(sizeof(*priv))) == NULL)\n@@ -142,18 +153,6 @@\n #undef SOCK_FLAGS\n \n #ifdef ROUTE_MSGFILTER\n-\tmsgfilter = ROUTE_FILTER(RTM_IFINFO)\n-#ifdef RTM_IFANNOUNCE\n-\t | ROUTE_FILTER(RTM_IFANNOUNCE)\n-#endif\n-\t | ROUTE_FILTER(RTM_ADD)\n-\t | ROUTE_FILTER(RTM_CHANGE)\n-\t | ROUTE_FILTER(RTM_DELETE)\n-#ifdef RTM_CHGADDR\n-\t | ROUTE_FILTER(RTM_CHGADDR)\n-#endif\n-\t | ROUTE_FILTER(RTM_DELADDR)\n-\t | ROUTE_FILTER(RTM_NEWADDR);\n \tif (setsockopt(ctx->link_fd, PF_ROUTE, ROUTE_MSGFILTER,\n \t &msgfilter, sizeof(msgfilter)) == -1)\n \t\tsyslog(LOG_ERR, \"ROUTE_MSGFILTER: %m\");\n"} {"commit":"e79b357290c7f12247e2f6e9bfcfecb4496ecf93","subject":"Replace table with its H.263 counterpart","message":"Replace table with its H.263 counterpart\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@11181 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/rv34data.h\n+++ libavcodec\/rv34data.h\n@@ -123,13 +123,15 @@\n \n \/**\n * table for obtaining the quantizer difference\n- * @todo Replace it with modified_quant_tab from h263data.h.\n+ * @todo Use with modified_quant_tab from h263data.h.\n *\/\n-static const int8_t rv34_dquant_tab[] = {\n- 0, 0, 2, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1,\n- -1, 1, -1, 1, -1, 1, -2, 2, -2, 2, -2, 2, -2, 2, -2, 2,\n- -2, 2, -2, 2, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3, -3, 3,\n- -3, 3, -3, 3, -3, 3, -3, 3, -3, 3, -3, 2, -3, 1, -3, -5\n+static const uint8_t rv34_dquant_tab[2][32]={\n+\/\/ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31\n+{\n+ 0, 3, 1, 2, 3, 4, 5, 6, 7, 8, 9, 9,10,11,12,13,14,15,16,17,18,18,19,20,21,22,23,24,25,26,27,28\n+},{\n+ 0, 2, 3, 4, 5, 6, 7, 8, 9,10,11,13,14,15,16,17,18,19,20,21,22,24,25,26,27,28,29,30,31,31,31,26\n+}\n };\n \n \/**\n"} {"commit":"1f71f3859903f113d67ed37c58c6a4807aaee456","subject":"const","message":"const\n\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@11789 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavcodec\/vqavideo.c\n+++ libavcodec\/vqavideo.c\n@@ -104,7 +104,7 @@\n DSPContext dsp;\n AVFrame frame;\n \n- unsigned char *buf;\n+ const unsigned char *buf;\n int size;\n \n uint32_t palette[PALETTE_COUNT];\n@@ -202,7 +202,7 @@\n return; \\\n }\n \n-static void decode_format80(unsigned char *src, int src_size,\n+static void decode_format80(const unsigned char *src, int src_size,\n unsigned char *dest, int dest_size, int check_size) {\n \n int src_index = 0;\n@@ -567,7 +567,7 @@\n \n static int vqa_decode_frame(AVCodecContext *avctx,\n void *data, int *data_size,\n- uint8_t *buf, int buf_size)\n+ const uint8_t *buf, int buf_size)\n {\n VqaContext *s = avctx->priv_data;\n \n"} {"commit":"2bee2c114612e50f9967061c1c12123d8afa4217","subject":"Give defaults to evil globals struct.","message":"Give defaults to evil globals struct.\n","repos":"eddieantonio\/imgcat,eddieantonio\/imgcat,eddieantonio\/imgcat,eddieantonio\/imgcat","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- src\/imgcat.c\n+++ src\/imgcat.c\n@@ -18,9 +18,12 @@\n \n \/* Global, bite me. *\/\n static struct {\n- Format format; \/* Default: 256 colors. *\/\n- bool should_resize; \/* Default: yes! *\/\n-} options;\n+ Format format;\n+ bool should_resize;\n+} options = {\n+ .format = F_256_COLOR, \/* Default: 256 colors. *\/\n+ .should_resize = true, \/* Default: yes! *\/\n+};\n \n static struct {\n int width;\n"} {"commit":"46e1600c0998652c0bda3bf8aaa0adfd592f2955","subject":"move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable","message":"move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable\n\ngit-svn-id: a4d7c1866f8397a4106e0b57fc4fbf792bbdaaaf@8278 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b\n","repos":"prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg,prajnashi\/ffmpeg","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libavformat\/asf-enc.c\n+++ libavformat\/asf-enc.c\n@@ -194,7 +194,7 @@\n { CODEC_ID_NONE, 0 },\n };\n \n-static int preroll_time = 3100;\n+#define PREROLL_TIME 3100\n \n static void put_guid(ByteIOContext *s, const GUID *g)\n {\n@@ -278,7 +278,7 @@\n int bit_rate;\n int64_t duration;\n \n- duration = asf->duration + preroll_time * 10000;\n+ duration = asf->duration + PREROLL_TIME * 10000;\n has_title = (s->title[0] || s->author[0] || s->copyright[0] || s->comment[0]);\n \n bit_rate = 0;\n@@ -310,7 +310,7 @@\n put_le64(pb, asf->nb_packets); \/* number of packets *\/\n put_le64(pb, duration); \/* end time stamp (in 100ns units) *\/\n put_le64(pb, asf->duration); \/* duration (in 100ns units) *\/\n- put_le64(pb, preroll_time); \/* start time stamp *\/\n+ put_le64(pb, PREROLL_TIME); \/* start time stamp *\/\n put_le32(pb, asf->is_streamed ? 3 : 2); \/* ??? *\/\n put_le32(pb, asf->packet_size); \/* packet size *\/\n put_le32(pb, asf->packet_size); \/* packet size *\/\n@@ -690,7 +690,7 @@\n else if (payload_len == (frag_len1 - 1))\n payload_len = frag_len1 - 2; \/\/additional byte need to put padding length\n \n- put_payload_header(s, stream, timestamp+preroll_time, m_obj_size, m_obj_offset, payload_len, flags);\n+ put_payload_header(s, stream, timestamp+PREROLL_TIME, m_obj_size, m_obj_offset, payload_len, flags);\n put_buffer(&asf->pb, buf, payload_len);\n \n if (asf->multi_payloads_present)\n"} {"commit":"02742037a3c013de3120c6398f295f6f59dc0d08","subject":"Sync w\/ dirent.h, s:HAVE_D_NAMLEN:_DIRENT_HAVE_D_NAMLEN:","message":"Sync w\/ dirent.h, s:HAVE_D_NAMLEN:_DIRENT_HAVE_D_NAMLEN:\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libc\/misc\/glob\/glob.c\n+++ libc\/misc\/glob\/glob.c\n@@ -426,7 +426,7 @@\n \t if (! (d->d_ino != 0))\n \t continue;\n \t name = d->d_name;\n-#ifdef\tHAVE_D_NAMLEN\n+#ifdef _DIRENT_HAVE_D_NAMLEN\n \t len = d->d_namlen;\n #else\n \t len = 0;\n"} {"commit":"917521de2096491c841edd295fd57b2713d6881c","subject":"gets() handles backspaces properly.","message":"gets() handles backspaces properly.\n\n","repos":"axalon900\/LambOS,axalon900\/LambOS,axalon900\/LambOS","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libc\/src\/stdio\/gets.c\n+++ libc\/src\/stdio\/gets.c\n@@ -15,7 +15,17 @@\n \n char *gets(char *str)\n {\n- for (; (*str = (char)getchar()) != '\\n'; ++str);\n+ char const *startstr = str;\n+ while ((*str = (char)getchar()) != '\\n') {\n+ if (*str == '\\b') {\n+ if (str != startstr) {\n+ --str;\n+ }\n+ } else {\n+ ++str;\n+ }\n+ }\n+\n *str = 0;\n \n return str;\n"} {"commit":"06311335b55b925b006bd31ac005878e656d76f4","subject":"More energy quantisation work","message":"More energy quantisation work\n","repos":"mumble-voip\/celt-0.11.0,mumble-voip\/celt-0.11.0,Distrotech\/celt,oneman\/opus-oneman,oneman\/opus-oneman,dezelin\/celt,Distrotech\/celt,mumble-voip\/celt-0.7.0,mumble-voip\/celt-0.7.0,dezelin\/celt,mumble-voip\/celt-0.7.0,Distrotech\/celt,mumble-voip\/celt-0.11.0,dezelin\/celt,oneman\/opus-oneman","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libcelt\/quant_bands.c\n+++ libcelt\/quant_bands.c\n@@ -43,17 +43,21 @@\n float q;\n float res;\n float x;\n- float pred = .8*oldEBands[i];\n+ float pred = .9*oldEBands[i];\n \n x = 20*log10(.3+eBands[i]);\n res = 1.0f;\n- qi = (int)floor(.5+res*(x-pred-prev)\/res);\n+ qi = (int)floor(.5+(x-pred-prev)\/res);\n q = qi*res;\n \n \/\/printf(\"%f %f \", pred+prev+q, x);\n+ \/\/printf(\"%d \", qi);\n \n oldEBands[i] = pred+prev+q;\n- prev = .7*q;\n+ eBands[i] = pow(10, .05*oldEBands[i])-.3;\n+ if (eBands[i] < 0)\n+ eBands[i] = 0;\n+ prev = .65*q;\n }\n \/\/printf (\"\\n\");\n }\n"} {"commit":"d961f7b76e5d3a970aa4fef49e5c03c26603a248","subject":"cleanup of documentation format in attributes write code","message":"cleanup of documentation format in attributes write code\n","repos":"Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c,Unidata\/netcdf-c","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- libdispatch\/dattput.c\n+++ libdispatch\/dattput.c\n@@ -1,51 +1,53 @@\n-\/** \\file\n-Functions to write attributes.\n-\n-These functions read and write attributes.\n-\n-Copyright 2018 University Corporation for Atmospheric\n-Research\/Unidata. See \\ref copyright file for more info. *\/\n-\n+\/* Copyright 2018 University Corporation for Atmospheric\n+ Research\/Unidata. See copyright file for more info. *\/\n+\/**\n+ * @file\n+ * Functions to write attributes.\n+ *\n+ * These functions write attributes.\n+ *\/\n #include \"ncdispatch.h\"\n \n-\/** \\name Writing Attributes\n-\n-Functions to write attributes. *\/\n-\/*! \\{ *\/\n-\n-\/*!\n-\\ingroup attributes\n-Write a string attribute.\n-\n-The function nc_put_att_string adds or changes a variable attribute or\n-global attribute of an open netCDF dataset. The string type is only\n-available in netCDF-4\/HDF5 files, when ::NC_CLASSIC_MODEL has not been\n-used in nc_create().\n-\n-\\param ncid NetCDF or group ID, from a previous call to nc_open(),\n-nc_create(), nc_def_grp(), or associated inquiry functions such as\n-nc_inq_ncid().\n-\n-\\param varid Variable ID of the variable to which the attribute will\n-be assigned or ::NC_GLOBAL for a global or group attribute.\n-\n-\\param name Attribute \\ref object_name. \\ref attribute_conventions may\n-apply.\n-\n-\\param len Number of values provided for the attribute.\n-\n-\\param value Pointer to one or more values.\n-\n-\\returns ::NC_NOERR No error.\n-\\returns ::NC_EINVAL More than one value for _FillValue or trying to set global _FillValue.\n-\\returns ::NC_ENOTVAR Couldn't find varid.\n-\\returns ::NC_EBADTYPE Fill value and var must be same type.\n-\\returns ::NC_ENOMEM Out of memory\n-\\returns ::NC_ELATEFILL Fill values must be written while the file\n-is still in initial define mode.\n+\/**\n+ * @name Writing Attributes\n+ *\n+ * Functions to write attributes. *\/\n+\/** \\{ *\/\n+\n+\/**\n+ * @ingroup attributes\n+ * Write a string attribute.\n+ *\n+ * The function nc_put_att_string adds or changes a variable attribute\n+ * or global attribute of an open netCDF dataset. The string type is\n+ * only available in netCDF-4\/HDF5 files, when ::NC_CLASSIC_MODEL has\n+ * not been used in nc_create().\n+ *\n+ * @param ncid NetCDF or group ID, from a previous call to nc_open(),\n+ * nc_create(), nc_def_grp(), or associated inquiry functions such as\n+ * nc_inq_ncid().\n+ *\n+ * @param varid Variable ID of the variable to which the attribute\n+ * will be assigned or ::NC_GLOBAL for a global or group attribute.\n+ *\n+ * @param name Attribute \\ref object_name. \\ref attribute_conventions\n+ * may apply.\n+ *\n+ * @param len Number of values provided for the attribute.\n+ *\n+ * @param value Pointer to one or more values.\n+ *\n+ * @return ::NC_NOERR No error.\n+ * @return ::NC_EINVAL More than one value for _FillValue or trying to\n+ * set global _FillValue.\n+ * @return ::NC_ENOTVAR Couldn't find varid.\n+ * @return ::NC_EBADTYPE Fill value and var must be same type.\n+ * @return ::NC_ENOMEM Out of memory\n+ * @return ::NC_ELATEFILL Fill values must be written while the file\n+ * is still in initial define mode.\n+ *\n+ * @author Ed Hartnett, Dennis Heimbigner\n *\/\n-\n-\n int\n nc_put_att_string(int ncid, int varid, const char *name,\n \t\t size_t len, const char** value)\n@@ -57,56 +59,56 @@\n \t\t\t\t len, (void*)value, NC_STRING);\n }\n \n-\/*!\n-\\ingroup attributes\n-Write a text attribute.\n-\n-Add or change a text attribute. If this attribute is new, or if the\n-space required to store the attribute is greater than before, the\n-netCDF dataset must be in define mode for classic formats (or\n-netCDF-4\/HDF5 with NC_CLASSIC_MODEL).\n-\n-Although it's possible to create attributes of all types, text and\n-double attributes are adequate for most purposes.\n-\n-Use the nc_put_att function to create attributes of any type,\n-including user-defined types. We recommend using the type safe\n-versions of this function whenever possible.\n-\n-\\param ncid NetCDF or group ID, from a previous call to nc_open(),\n-nc_create(), nc_def_grp(), or associated inquiry functions such as\n-nc_inq_ncid().\n-\n-\\param varid Variable ID of the variable to which the attribute will\n-be assigned or ::NC_GLOBAL for a global attribute.\n-\n-\\param name Attribute \\ref object_name. \\ref attribute_conventions may\n-apply.\n-\n-\\param len Number of values provided for the attribute.\n-\n-\\param value Pointer to one or more values.\n-\n-\\returns ::NC_NOERR No error.\n-\\returns ::NC_EINVAL More than one value for _FillValue or trying to set global _FillValue.\n-\\returns ::NC_ENOTVAR Couldn't find varid.\n-\\returns ::NC_EBADTYPE Fill value and var must be same type.\n-\\returns ::NC_ENOMEM Out of memory\n-\\returns ::NC_ELATEFILL Fill values must be written while the file\n-is still in initial define mode.\n-\n-\\note With netCDF-4 files, nc_put_att will notice if you are writing a\n-_Fill_Value_ attribute, and will tell the HDF5 layer to use the\n-specified fill value for that variable.\n-\n-\\section nc_put_att_text_example Example\n-\n-Here is an example using nc_put_att_double() to add a variable\n-attribute named valid_range for a netCDF variable named rh and\n-nc_put_att_text() to add a global attribute named title to an existing\n-netCDF dataset named foo.nc:\n-\n-\\code\n+\/**\n+ * @ingroup attributes\n+ * Write a text attribute.\n+ *\n+ * Add or change a text attribute. If this attribute is new, or if the\n+ * space required to store the attribute is greater than before, the\n+ * netCDF dataset must be in define mode for classic formats (or\n+ * netCDF-4\/HDF5 with NC_CLASSIC_MODEL).\n+ *\n+ * Although it's possible to create attributes of all types, text and\n+ * double attributes are adequate for most purposes.\n+ *\n+ * Use the nc_put_att function to create attributes of any type,\n+ * including user-defined types. We recommend using the type safe\n+ * versions of this function whenever possible.\n+ *\n+ * @param ncid NetCDF or group ID, from a previous call to nc_open(),\n+ * nc_create(), nc_def_grp(), or associated inquiry functions such as\n+ * nc_inq_ncid().\n+ *\n+ * @param varid Variable ID of the variable to which the attribute\n+ * will be assigned or ::NC_GLOBAL for a global attribute.\n+ *\n+ * @param name Attribute \\ref object_name. \\ref attribute_conventions\n+ * may apply.\n+ *\n+ * @param len Number of values provided for the attribute.\n+ *\n+ * @param value Pointer to one or more values.\n+ *\n+ * @return ::NC_NOERR No error.\n+ * @return ::NC_EINVAL More than one value for _FillValue or trying to set global _FillValue.\n+ * @return ::NC_ENOTVAR Couldn't find varid.\n+ * @return ::NC_EBADTYPE Fill value and var must be same type.\n+ * @return ::NC_ENOMEM Out of memory\n+ * @return ::NC_ELATEFILL Fill values must be written while the file\n+ * is still in initial define mode.\n+ *\n+ * @note With netCDF-4 files, nc_put_att will notice if you are\n+ * writing a _Fill_Value_ attribute, and will tell the HDF5 layer to\n+ * use the specified fill value for that variable.\n+ *\n+ * @section nc_put_att_text_example Example\n+ *\n+ * Here is an example using nc_put_att_double() to add a variable\n+ * attribute named valid_range for a netCDF variable named rh and\n+ * nc_put_att_text() to add a global attribute named title to an\n+ * existing netCDF dataset named foo.nc:\n+ *\n+@code\n #include <netcdf.h>\n ...\n int status;\n@@ -132,10 +134,8 @@\n ...\n status = nc_enddef(ncid);\n if (status != NC_NOERR) handle_error(status);\n-\\endcode\n+@endcode\n *\/\n-\n-\n int nc_put_att_text(int ncid, int varid, const char *name,\n \t\tsize_t len, const char *value)\n {\n@@ -145,60 +145,60 @@\n return ncp->dispatch->put_att(ncid, varid, name, NC_CHAR, len,\n \t\t\t\t (void *)value, NC_CHAR);\n }\n-\n-\/*! \\} *\/\n-\/*!\n-\\ingroup attributes\n-Write an attribute.\n-\n-The function nc_put_att_ type adds or changes a variable attribute or\n-global attribute of an open netCDF dataset. If this attribute is new,\n-or if the space required to store the attribute is greater than\n-before, the netCDF dataset must be in define mode for classic formats\n-(or netCDF-4\/HDF5 with NC_CLASSIC_MODEL).\n-\n-With netCDF-4 files, nc_put_att will notice if you are writing a\n-_FillValue attribute, and will tell the HDF5 layer to use the\n-specified fill value for that variable. With either classic or\n-netCDF-4 files, a _FillValue attribute will be checked for validity,\n-to make sure it has only one value and that its type matches the type\n-of the associated variable.\n-\n-Although it's possible to create attributes of all types, text and\n-double attributes are adequate for most purposes.\n-\n-\\param ncid NetCDF or group ID, from a previous call to nc_open(),\n-nc_create(), nc_def_grp(), or associated inquiry functions such as\n-nc_inq_ncid().\n-\n-\\param varid Variable ID of the variable to which the attribute will\n-be assigned or ::NC_GLOBAL for a global or group attribute.\n-\n-\\param name Attribute \\ref object_name. \\ref attribute_conventions may\n-apply.\n-\n-\\param xtype \\ref data_type of the attribute.\n-\n-\\param len Number of values provided for the attribute.\n-\n-\\param value Pointer to one or more values.\n-\n-\\returns ::NC_NOERR No error.\n-\\returns ::NC_EINVAL More than one value for _FillValue or trying to set global _FillValue.\n-\\returns ::NC_ENOTVAR Couldn't find varid.\n-\\returns ::NC_EBADTYPE Fill value and var must be same type.\n-\\returns ::NC_ENOMEM Out of memory\n-\\returns ::NC_ELATEFILL Fill values must be written while the file\n-is still in initial define mode.\n-\n-\\section nc_put_att_double_example Example\n-\n-Here is an example using nc_put_att_double() to add a variable\n-attribute named valid_range for a netCDF variable named rh and\n-nc_put_att_text() to add a global attribute named title to an existing\n-netCDF dataset named foo.nc:\n-\n-\\code\n+\/** \\} *\/\n+\/**\n+ * @ingroup attributes\n+ * Write an attribute.\n+ *\n+ * The function nc_put_att_ type adds or changes a variable attribute\n+ * or global attribute of an open netCDF dataset. If this attribute is\n+ * new, or if the space required to store the attribute is greater\n+ * than before, the netCDF dataset must be in define mode for classic\n+ * formats (or netCDF-4\/HDF5 with NC_CLASSIC_MODEL).\n+ *\n+ * With netCDF-4 files, nc_put_att will notice if you are writing a\n+ * _FillValue attribute, and will tell the HDF5 layer to use the\n+ * specified fill value for that variable. With either classic or\n+ * netCDF-4 files, a _FillValue attribute will be checked for\n+ * validity, to make sure it has only one value and that its type\n+ * matches the type of the associated variable.\n+ *\n+ * Although it's possible to create attributes of all types, text and\n+ * double attributes are adequate for most purposes.\n+ *\n+ * @param ncid NetCDF or group ID, from a previous call to nc_open(),\n+ * nc_create(), nc_def_grp(), or associated inquiry functions such as\n+ * nc_inq_ncid().\n+ *\n+ * @param varid Variable ID of the variable to which the attribute will\n+ * be assigned or ::NC_GLOBAL for a global or group attribute.\n+ *\n+ * @param name Attribute \\ref object_name. \\ref attribute_conventions\n+ * may apply.\n+ *\n+ * @param xtype \\ref data_type of the attribute.\n+ *\n+ * @param len Number of values provided for the attribute.\n+ *\n+ * @param value Pointer to one or more values.\n+ *\n+ * @return ::NC_NOERR No error.\n+ * @return ::NC_EINVAL More than one value for _FillValue or trying to\n+ * set global _FillValue.\n+ * @return ::NC_ENOTVAR Couldn't find varid.\n+ * @return ::NC_EBADTYPE Fill value and var must be same type.\n+ * @return ::NC_ENOMEM Out of memory\n+ * @return ::NC_ELATEFILL Fill values must be written while the file\n+ * is still in initial define mode.\n+ *\n+ * @section nc_put_att_double_example Example\n+ *\n+ * Here is an example using nc_put_att_double() to add a variable\n+ * attribute named valid_range for a netCDF variable named rh and\n+ * nc_put_att_text() to add a global attribute named title to an\n+ * existing netCDF dataset named foo.nc:\n+ *\n+@code\n #include <netcdf.h>\n ...\n int status;\n@@ -224,9 +224,9 @@\n ...\n status = nc_enddef(ncid);\n if (status != NC_NOERR) handle_error(status);\n-\\endcode\n+@endcode\n *\/\n-\/*! \\{*\/\n+\/** \\{*\/\n int\n nc_put_att(int ncid, int varid, const char *name, nc_type xtype,\n \t size_t len, const void *value)\n"} {"commit":"379287d15e27f03379ecbd7b1f30af194f4c4af2","subject":"adjusted setPatternPartitions description in beagle.h","message":"adjusted setPatternPartitions description in beagle.h\n","repos":"beagle-dev\/beagle-lib,beagle-dev\/beagle-lib,beagle-dev\/beagle-lib,beagle-dev\/beagle-lib,beagle-dev\/beagle-lib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- libhmsbeagle\/beagle.h\n+++ libhmsbeagle\/beagle.h\n@@ -477,7 +477,7 @@\n \/**\n * @brief Set pattern partition assignments\n *\n- * This function sets the vector of pattern eigen-decompositions indices for an instance.\n+ * This function sets the vector of pattern partition indices for an instance.\n *\n * @param instance Instance number (input)\n * @param partitionCount Number of partitions (input)\n"} {"commit":"4d15f992a5cd4871b0673d3d9479c2ff82c73f25","subject":"serialize: rename sctx to nlist","message":"serialize: rename sctx to nlist\n\nThis follows the new meaning after previous commit.\n","repos":"gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl,gopro\/gopro-lib-node.gl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- libnodegl\/serialize.c\n+++ libnodegl\/serialize.c\n@@ -57,7 +57,7 @@\n \n static const float zvec[4] = {0};\n \n-static void serialize_options(struct hmap *sctx,\n+static void serialize_options(struct hmap *nlist,\n struct bstr *b,\n const struct ngl_node *node,\n uint8_t *priv,\n@@ -140,7 +140,7 @@\n const struct ngl_node *node = *(struct ngl_node **)(priv + p->offset);\n if (!node)\n break;\n- const char *node_id = get_node_id(sctx, node);\n+ const char *node_id = get_node_id(nlist, node);\n if (constructor)\n ngli_bstr_print(b, \" %s\", node_id);\n else if (node)\n@@ -157,7 +157,7 @@\n else\n ngli_bstr_print(b, \" %s:\", p->key);\n for (int i = 0; i < nb_nodes; i++) {\n- const char *node_id = get_node_id(sctx, nodes[i]);\n+ const char *node_id = get_node_id(nlist, nodes[i]);\n ngli_bstr_print(b, \"%s%s\", i ? \",\" : \"\", node_id);\n }\n break;\n@@ -186,7 +186,7 @@\n ngli_bstr_print(b, \" %s:\", p->key);\n int i = 0;\n while ((entry = ngli_ndict_get(ndict, NULL, entry))) {\n- const char *node_id = get_node_id(sctx, entry->node);\n+ const char *node_id = get_node_id(nlist, entry->node);\n ngli_bstr_print(b, \"%s%s=%s\", i ? \",\" : \"\", entry->name, node_id);\n i++;\n }\n@@ -199,11 +199,11 @@\n }\n }\n \n-static void serialize(struct hmap *sctx,\n+static void serialize(struct hmap *nlist,\n struct bstr *b,\n const struct ngl_node *node);\n \n-static void serialize_children(struct hmap *sctx,\n+static void serialize_children(struct hmap *nlist,\n struct bstr *b,\n const struct ngl_node *node,\n uint8_t *priv,\n@@ -214,7 +214,7 @@\n case PARAM_TYPE_NODE: {\n const struct ngl_node *child = *(struct ngl_node **)(priv + p->offset);\n if (child)\n- serialize(sctx, b, child);\n+ serialize(nlist, b, child);\n break;\n }\n case PARAM_TYPE_NODELIST: {\n@@ -222,14 +222,14 @@\n const int nb_children = *(int *)(priv + p->offset + sizeof(struct ngl_node **));\n \n for (int i = 0; i < nb_children; i++)\n- serialize(sctx, b, children[i]);\n+ serialize(nlist, b, children[i]);\n break;\n }\n case PARAM_TYPE_NODEDICT: {\n struct ndict *ndict = *(struct ndict **)(priv + p->offset);\n struct ndict_entry *entry = NULL;\n while ((entry = ngli_ndict_get(ndict, NULL, entry)))\n- serialize(sctx, b, entry->node);\n+ serialize(nlist, b, entry->node);\n break;\n }\n }\n@@ -237,22 +237,22 @@\n }\n }\n \n-static void serialize(struct hmap *sctx,\n+static void serialize(struct hmap *nlist,\n struct bstr *b,\n const struct ngl_node *node)\n {\n- if (get_node_id(sctx, node))\n+ if (get_node_id(nlist, node))\n return;\n \n- serialize_children(sctx, b, node, (uint8_t *)node, ngli_base_node_params);\n- serialize_children(sctx, b, node, node->priv_data, node->class->params);\n+ serialize_children(nlist, b, node, (uint8_t *)node, ngli_base_node_params);\n+ serialize_children(nlist, b, node, node->priv_data, node->class->params);\n \n ngli_bstr_print(b, \"%x\", node->class->id);\n- serialize_options(sctx, b, node, node->priv_data, node->class->params);\n- serialize_options(sctx, b, node, (uint8_t *)node, ngli_base_node_params);\n+ serialize_options(nlist, b, node, node->priv_data, node->class->params);\n+ serialize_options(nlist, b, node, (uint8_t *)node, ngli_base_node_params);\n ngli_bstr_print(b, \"\\n\");\n \n- register_node(sctx, node);\n+ register_node(nlist, node);\n }\n \n char *ngl_node_serialize(const struct ngl_node *node)\n"} {"commit":"f20a8222fd7caf0318169bc6df7e31b4b8947df1","subject":"Fixes","message":"Fixes\n","repos":"endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox,endurox-dev\/endurox","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- libnstd\/sys_svapoll.c\n+++ libnstd\/sys_svapoll.c\n@@ -453,7 +453,7 @@\n int ret = EXSUCCEED;\n ndrx_epoll_set_t* set = NULL;\n ndrx_epoll_mqds_t * tmp = NULL;\n- static int first = EXFALSE;\n+ static int first = EXTRUE;\n static int use_excl = EXFALSE;\n EX_EPOLL_API_ENTRY;\n \n"} {"commit":"671453b98f53d0f023eacacc32444b5b1bb4193c","subject":"put pxfe_shared_ptr here for safe keeping","message":"put pxfe_shared_ptr here for safe keeping\n","repos":"flipk\/pfkutils,flipk\/pfkutils,flipk\/pfkutils,flipk\/pfkutils,flipk\/pfkutils,flipk\/pfkutils,flipk\/pfkutils","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- libpfkutil\/posix_fe.h\n+++ libpfkutil\/posix_fe.h\n@@ -75,6 +75,7 @@\n #include <string>\n #include <vector>\n #include <algorithm>\n+#include <atomic>\n \n \/** wrapper for struct timeval *\/\n struct pxfe_timeval : public timeval\n@@ -334,6 +335,141 @@\n return false;\n return lhs.tv_nsec < other.tv_nsec;\n }\n+\n+\n+\/** base type for use with pxfe_shared_ptr *\/\n+class pxfe_shared_ptr_base {\n+ template <typename T> friend class pxfe_shared_ptr;\n+ std::atomic_int __pxfe_sp_refcount;\n+public:\n+ pxfe_shared_ptr_base(void)\n+ : __pxfe_sp_refcount(0) { \/*nothing*\/ }\n+ virtual ~pxfe_shared_ptr_base(void) { \/* nothing*\/ }\n+ \/** returns the current usage counter;\n+ * note this is only advisory because if there's more\n+ * than one thread holding this object, this value can\n+ * change. you can only really trust it if it's 1. *\/\n+ int use_count(void) const {\n+ return std::atomic_load(&__pxfe_sp_refcount);\n+ }\n+};\n+\n+\/** a shared pointer object, like std::shared_ptr but different.\n+ * 1. the counter is in the object itself (must be derived from\n+ * pxfe_shared_ptr_base class) and so does not require a separate\n+ * administrative data structure like std::shared_ptr does.\n+ * 2. has \"give\" and \"take\" methods so you can put an object into a\n+ * shared_ptr and take an object out without destroying it.\n+ * 3. has casting methods so it's easy to manage heirarchicaly-derived\n+ * classes, just copy-construct or assign, and if it comes out\n+ * NULL, then it wasn't a polymorphic base type (dynamic_cast\n+ * failed). *\/\n+template <class T>\n+class pxfe_shared_ptr {\n+ T * ptr;\n+ void ref(void)\n+ {\n+ if (ptr)\n+ ptr->__pxfe_sp_refcount ++;\n+ }\n+ void deref(void)\n+ {\n+ if (ptr && ptr->__pxfe_sp_refcount-- <= 1)\n+ {\n+ delete ptr;\n+ ptr = NULL;\n+ }\n+ }\n+public:\n+ \/** normal constructor, adds a ref to the object *\/\n+ pxfe_shared_ptr<T>(T * _ptr = NULL)\n+ {\n+ ptr = _ptr;\n+ ref();\n+ }\n+ \/** casting constructor, if dynamic_cast to the new type\n+ * succeeds, takes a ref, otherwise sets to empty\/NULL *\/\n+ template <class BaseT>\n+ pxfe_shared_ptr<T>(const pxfe_shared_ptr<BaseT> &other)\n+ {\n+ ptr = dynamic_cast<T*>(*other);\n+ ref();\n+ }\n+ \/** move constructor, transfers ownership *\/\n+ pxfe_shared_ptr<T>(pxfe_shared_ptr<T> &&other)\n+ {\n+ ptr = other.ptr;\n+ other.ptr = NULL;\n+ }\n+ \/** destructor which derefs the object (deleting it if ref==0) *\/\n+ ~pxfe_shared_ptr<T>(void)\n+ {\n+ deref();\n+ }\n+ \/** point this object to something else,\n+ * deref the old and ref the new *\/\n+ void reset(T * _ptr = NULL)\n+ {\n+ deref();\n+ ptr = _ptr;\n+ ref();\n+ }\n+ \/** give an object to this class for safe keeping; assumes\n+ * the reference count is already set properly and does not\n+ * change it (but does deref anything this class previously held) *\/\n+ void _give(T * _ptr)\n+ {\n+ deref();\n+ ptr = _ptr;\n+ \/\/ the caller is passing ownership to us,\n+ \/\/ presumably they had a refcount,\n+ \/\/ which they are giving to us,\n+ \/\/ so don't modify the refcount here.\n+ }\n+ \/** takes an object away from this class (does not deref it) *\/\n+ T * _take(void)\n+ {\n+ T * ret = ptr;\n+ \/\/ we are letting the caller take ownership from us,\n+ \/\/ so the refcount we have is being given to them,\n+ \/\/ so don't modify the refcount here.\n+ ptr = NULL;\n+ return ret;\n+ }\n+ \/** casting assignment operator, attempts dynamic_cast. if\n+ * casting fails, this object is now empty (NULL) *\/\n+ template <class BaseT>\n+ pxfe_shared_ptr<T> &operator=(const pxfe_shared_ptr<BaseT> &other)\n+ {\n+ deref();\n+ ptr = dynamic_cast<T*>(other.ptr);\n+ ref();\n+ return *this;\n+ }\n+ \/** move assignment operator, takes over ownership *\/\n+ template <class BaseT>\n+ pxfe_shared_ptr<T> &operator=(pxfe_shared_ptr<T> &&other)\n+ {\n+ deref();\n+ ptr = other.ptr;\n+ other.ptr = NULL;\n+ return *this;\n+ }\n+ \/** if this is the only shared ptr referencing this object *\/\n+ bool unique(void) const {\n+ if (ptr)\n+ return (ptr->use_count() == 1);\n+ return false;\n+ }\n+ \/** return if this is managing something (true) or empty (false).\n+ * useful for null checking just like a regular ptr, using the\n+ * syntax \"if (sp)\" *\/\n+ operator bool() const { return (ptr != NULL); }\n+ \/** accessor that returns the pointer within *\/\n+ T * operator->(void) const { return ptr; }\n+ \/** accessor that returns the pointer within *\/\n+ T * operator*(void) const { return ptr; }\n+};\n \n \/** container for an 'errno' *\/\n class pxfe_errno {\n"} {"commit":"ed74b3d1c8df39beb0f645e7a7f1d14efd5b68ed","subject":"Finish support dependency with the same name","message":"Finish support dependency with the same name\n","repos":"Open343\/pkg,junovitch\/pkg,skoef\/pkg,khorben\/pkg,junovitch\/pkg,en90\/pkg,Open343\/pkg,khorben\/pkg,khorben\/pkg,skoef\/pkg,en90\/pkg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libpkg\/pkg_manifest.c\n+++ libpkg\/pkg_manifest.c\n@@ -378,7 +378,7 @@\n \t\tkey = ucl_object_key(cur);\n \t\tswitch (attr) {\n \t\tcase PKG_DEPS:\n-\t\t\tif (cur->type != UCL_OBJECT)\n+\t\t\tif (cur->type != UCL_OBJECT && cur->type != UCL_ARRAY)\n \t\t\t\tpkg_emit_error(\"Skipping malformed dependency %s\",\n \t\t\t\t key);\n \t\t\telse\n@@ -582,7 +582,7 @@\n \tchar vinteger[BUFSIZ];\n \n \tpkg_debug(2, \"Found %s\", ucl_object_key(obj));\n-\twhile ((self = ucl_iterate_object(obj, &it, false))) {\n+\twhile ((self = ucl_iterate_object(obj, &it, (obj->type == UCL_ARRAY)))) {\n \t\tit2 = NULL;\n \t\twhile ((cur = ucl_iterate_object(self, &it2, true))) {\n \t\t\tkey = ucl_object_key(cur);\n@@ -595,7 +595,7 @@\n \t\t\t\t}\n \n \t\t\t\tpkg_emit_error(\"Skipping malformed dependency entry \"\n-\t\t\t\t\t\t\"for %s\", ucl_object_key(self));\n+\t\t\t\t\t\t\"for %s\", ucl_object_key(obj));\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif (strcasecmp(key, \"origin\") == 0)\n@@ -604,9 +604,10 @@\n \t\t\t\tversion = ucl_object_tostring(cur);\n \t\t}\n \t\tif (origin != NULL && (version != NULL || vint > 0))\n-\t\t\tpkg_adddep(pkg, ucl_object_key(self), origin, vint > 0 ? vinteger : version, false);\n+\t\t\tpkg_adddep(pkg, ucl_object_key(obj), origin, vint > 0 ? vinteger : version, false);\n \t\telse {\n-\t\t\tpkg_emit_error(\"Skipping malformed dependency %s\", ucl_object_key(self));\n+\t\t\tpkg_emit_error(\"Skipping malformed dependency %s\", ucl_object_key(obj));\n+\t\t\tprintf(\"%s\\n\", ucl_object_emit(obj, UCL_EMIT_YAML));\n \t\t}\n \t}\n \n"} {"commit":"cfa340d7bc01180a8e91b1ad25ca31ec201aa6e9","subject":"Do not enforce a width limitation on the yaml lines","message":"Do not enforce a width limitation on the yaml lines\n","repos":"Open343\/pkg,junovitch\/pkg,en90\/pkg,skoef\/pkg,skoef\/pkg,khorben\/pkg,Open343\/pkg,junovitch\/pkg,khorben\/pkg,en90\/pkg,khorben\/pkg","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- libpkg\/pkg_manifest.c\n+++ libpkg\/pkg_manifest.c\n@@ -1735,6 +1735,7 @@\n \n \tyaml_emitter_initialize(&emitter);\n \tyaml_emitter_set_unicode(&emitter, 1);\n+\tyaml_emitter_set_width(&emitter, -1);\n \temitter_data.data.file = f;\n \tyaml_emitter_set_output(&emitter, yaml_write_file, &emitter_data);\n \n@@ -1769,6 +1770,7 @@\n \n \tyaml_emitter_initialize(&emitter);\n \tyaml_emitter_set_unicode(&emitter, 1);\n+\tyaml_emitter_set_width(&emitter, -1);\n \temitter_data.data.sbuf = b;\n \tyaml_emitter_set_output(&emitter, yaml_write_buf, &emitter_data);\n \n"} {"commit":"d0c2ed8a3a57fd3a740470c7bb51be463566469d","subject":"Implemented inplace encoding. Normal encoding is now a wrapper for inplace one (with `memcpy`).","message":"Implemented inplace encoding. Normal encoding is now a wrapper for inplace one (with `memcpy`).\n","repos":"mttbernardini\/mbc,mttbernardini\/mbc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/libmbc.c\n+++ src\/libmbc.c\n@@ -94,52 +94,39 @@\n \toct_key_size = 0;\n }\n \n-uint8_t* mbc_encode(const uint8_t* data, size_t data_size) {\n-\tuint8_t* edata;\n+void mbc_encode_inplace(uint8_t* data, size_t data_size) {\n \tregister size_t i, j;\n-\n-\tedata = malloc(data_size);\n-\tif (edata == NULL)\n-\t\treturn NULL;\n \n \t\/\/ XOR\n \tfor (i = 0; i < data_size; i++)\n-\t\tedata[i] = data[i] ^ user_key[i % user_key_size];\n+\t\tdata[i] ^= user_key[i % user_key_size];\n \tfor (; i < user_key_size; i++)\n-\t\tedata[i % data_size] ^= user_key[i];\n+\t\tdata[i % data_size] ^= user_key[i];\n \n \t\/\/ SWAP\n-\tfor (i = 0; i < data_size; i++)\n+\tfor (i = 0; i < data_size; i++) {\n \t\tfor (j = 0; j < oct_key_size; j++)\n-\t\t\tif (edata[i] >> oct_key[j][0] != edata[i] >> oct_key[j][1])\n-\t\t\t\tedata[i] ^= (0x01 << oct_key[j][0]) ^ (0x01 << oct_key[j][1]);\n-\n-\treturn edata;\n-}\n-\n-uint8_t* mbc_decode(const uint8_t* data, size_t data_size) {\n-\tuint8_t* ddata;\n+\t\t\tif (data[i] >> oct_key[j][0] != data[i] >> oct_key[j][1])\n+\t\t\t\tdata[i] ^= (0x01 << oct_key[j][0]) ^ (0x01 << oct_key[j][1]);\n+\t}\n+}\n+\n+void mbc_decode_inplace(uint8_t* data, size_t data_size) {\n \tregister size_t i;\n \tregister int8_t j;\n \n-\tddata = malloc(data_size);\n-\tif (ddata == NULL)\n-\t\treturn NULL;\n-\n \t\/\/ XOR\n \tfor (i = 0; i < data_size; i++)\n-\t\tddata[i] = data[i] ^ user_key[i % user_key_size];\n+\t\tdata[i] ^= user_key[i % user_key_size];\n \tfor (; i < user_key_size; i++)\n-\t\tddata[i % data_size] ^= user_key[i];\n+\t\tdata[i % data_size] ^= user_key[i];\n \n \t\/\/ SWAP\n \tfor (i = 0; i < data_size; i++) {\n \t\tfor (j = oct_key_size-1; j >= 0; j--)\n-\t\t\tif (ddata[i] >> oct_key[j][0] != ddata[i] >> oct_key[j][1])\n-\t\t\t\tddata[i] ^= (0x01 << oct_key[j][0]) ^ (0x01 << oct_key[j][1]);\n-\t}\n-\n-\treturn ddata;\n+\t\t\tif (data[i] >> oct_key[j][0] != data[i] >> oct_key[j][1])\n+\t\t\t\tdata[i] ^= (0x01 << oct_key[j][0]) ^ (0x01 << oct_key[j][1]);\n+\t}\n }\n \n char* mbc_raw_to_hex(const uint8_t* raw, size_t raw_size, bool uppercase) {\n@@ -186,12 +173,30 @@\n \treturn raw;\n }\n \n-void mbc_encode_inplace(uint8_t* data, size_t data_size) {\n-\t\/\/TODO\n-}\n-\n-void mbc_decode_inplace(uint8_t* data, size_t data_size) {\n-\t\/\/TODO\n+uint8_t* mbc_encode(const uint8_t* data, size_t data_size) {\n+\tuint8_t* edata;\n+\n+\tedata = malloc(data_size);\n+\tif (edata == NULL)\n+\t\treturn NULL;\n+\n+\tmemcpy(edata, data, data_size);\n+\tmbc_encode_inplace(edata, data_size);\n+\n+\treturn edata;\n+}\n+\n+uint8_t* mbc_decode(const uint8_t* data, size_t data_size) {\n+\tuint8_t* ddata;\n+\n+\tddata = malloc(data_size);\n+\tif (ddata == NULL)\n+\t\treturn NULL;\n+\n+\tmemcpy(ddata, data, data_size);\n+\tmbc_decode_inplace(ddata, data_size);\n+\n+\treturn ddata;\n }\n \n char* mbc_encode_to_hex(const uint8_t* raw_in, size_t raw_size, bool uppercase) {\n"} {"commit":"7be9e2346666be2b35733992ce95fa8b592f9e5a","subject":"Fixed Strip Helm from not allowing you to put on a different middle\/ lower headgear. bugreport:364","message":"Fixed Strip Helm from not allowing you to put on a different middle\/ lower headgear. bugreport:364\n\ngit-svn-id: c1e39603916b71782cde5facdf0b79eff05c1414@15228 54d463be-8e91-2dee-dedb-b68131a5f0ec\n","repos":"Nipol\/Siesta,Nipol\/Siesta,Nipol\/Siesta","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/map\/pc.c\n+++ src\/map\/pc.c\n@@ -743,7 +743,7 @@\n \t\t\treturn 0;\n \t\tif(item->equip & EQP_ARMOR && sd->sc.data[SC_STRIPARMOR])\n \t\t\treturn 0;\n-\t\tif(item->equip & EQP_HELM && sd->sc.data[SC_STRIPHELM])\n+\t\tif(item->equip & EQP_HEAD_TOP && sd->sc.data[SC_STRIPHELM])\n \t\t\treturn 0;\n \n \t\tif (sd->sc.data[SC_SPIRIT] && sd->sc.data[SC_SPIRIT]->val2 == SL_SUPERNOVICE) {\n"} {"commit":"b3015ee2a23899bd622fef8c2ce3a590c38fced9","subject":"Usage information should be ouput to stdout rather than stderr","message":"Usage information should be ouput to stdout rather than stderr\n","repos":"unascribed\/piepan,unascribed\/piepan,mathom\/piepan,mathom\/piepan,layeh\/piepan","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/piepan.c\n+++ src\/piepan.c\n@@ -160,7 +160,7 @@\n }\n \n static void\n-usage()\n+usage(FILE *stream)\n {\n const char *str =\n \"usage: %s [options] [scripts...]\\n\"\n@@ -182,7 +182,7 @@\n \" --<name>[=<value>] a key-value pair that will be accessible from the scripts\\n\"\n \" -h display this help\\n\"\n \" -v show version\\n\";\n- fprintf(stderr, str, PIEPAN_NAME);\n+ fprintf(stream, str, PIEPAN_NAME);\n }\n \n int\n@@ -298,7 +298,7 @@\n return 0;\n }\n if (show_help) {\n- usage();\n+ usage(stdout);\n return 0;\n }\n }\n"} {"commit":"44ad2157c1c41dfd30e6782d64ec4e7db4855b27","subject":"* Add GET_LD (multi-threaded version)","message":"* Add GET_LD (multi-threaded version)\n","repos":"koryonik\/swipl-devel,koryonik\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel,jn7163\/swipl-devel,mndrix\/swipl-devel,koryonik\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,edechter\/swipl-devel,edechter\/swipl-devel,edechter\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/pl-fli.c\n+++ src\/pl-fli.c\n@@ -2990,7 +2990,9 @@\n \n void\n PL_license(const char *license, const char *module)\n-{ if ( GD->initialised )\n+{ GET_LD\n+\n+ if ( GD->initialised )\n { fid_t fid = PL_open_foreign_frame();\n predicate_t pred = PL_predicate(\"license\", 2, \"system\");\n term_t av = PL_new_term_refs(2);\n"} {"commit":"d98f9bbfaf2e9e4a4fa3b88083636157f1413bcc","subject":"Modify plsnprintf so that plplot will abort if a buffer overrun occurs. This is only used if snprintf is not natively available, and instead it calls sprintf. We can detect when an overflow occurs, but not prevent it, so the safest thing is probably to abort.","message":"Modify plsnprintf so that plplot will abort if a buffer overrun occurs. \nThis is only used if snprintf is not natively available, and instead it \ncalls sprintf. We can detect when an overflow occurs, but not prevent \nit, so the safest thing is probably to abort.\n\n\nsvn path=\/trunk\/; revision=9479\n","repos":"FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot,FreeScienceCommunity\/PLPlot","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/plctrl.c\n+++ src\/plctrl.c\n@@ -2151,6 +2151,10 @@\n va_start(args, format);\n \tret=vsprintf(buffer, fmt, args);\n va_end( argptr );\n+ \n+ \/* Check if overrun occured *\/\n+ if (ret > n-1) \n+ plabort(\"plsnprintf: buffer overrun\");\n \n return ret;\n }\n"} {"commit":"bf260325613b215a79f527052a647f9bab86ec44","subject":"doveadm exec: Show help if binary name wasn't given.","message":"doveadm exec: Show help if binary name wasn't given.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/doveadm\/doveadm.c\n+++ src\/doveadm\/doveadm.c\n@@ -174,9 +174,17 @@\n \tcmd_config, \"config\", \"[doveconf parameters]\"\n };\n \n+static void cmd_exec(int argc ATTR_UNUSED, char *argv[]);\n+static struct doveadm_cmd doveadm_cmd_exec = {\n+\tcmd_exec, \"exec\", \"<binary> [binary parameters]\"\n+};\n+\n static void cmd_exec(int argc ATTR_UNUSED, char *argv[])\n {\n \tconst char *path, *binary = argv[1];\n+\n+\tif (binary == NULL)\n+\t\thelp(&doveadm_cmd_exec);\n \n \tpath = t_strdup_printf(\"%s\/%s\", doveadm_settings->libexec_dir, binary);\n \targv++;\n@@ -184,10 +192,6 @@\n \t(void)execv(argv[0], argv);\n \ti_fatal(\"execv(%s) failed: %m\", argv[0]);\n }\n-\n-static struct doveadm_cmd doveadm_cmd_exec = {\n-\tcmd_exec, \"exec\", \"<binary> [binary parameters]\"\n-};\n \n static bool\n doveadm_try_run_multi_word(const struct doveadm_cmd *cmd,\n"} {"commit":"19533377b3cea282ada278cf534b3b02f508ed6c","subject":"drv_hrt: Fix hrt_abstime literal argument names","message":"drv_hrt: Fix hrt_abstime literal argument names\n\nThe user-defined literals for milli- and microseconds\nshould have argument names matching their units. The\ncurrent argument names 'seconds' is probably an oversight.\n","repos":"acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware,acfloria\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/drivers\/drv_hrt.h\n+++ src\/drivers\/drv_hrt.h\n@@ -225,14 +225,14 @@\n \treturn hrt_abstime(seconds * 1000000ULL);\n }\n \n-constexpr hrt_abstime operator \"\" _ms(unsigned long long seconds)\n-{\n-\treturn hrt_abstime(seconds * 1000ULL);\n-}\n-\n-constexpr hrt_abstime operator \"\" _us(unsigned long long seconds)\n-{\n-\treturn hrt_abstime(seconds);\n+constexpr hrt_abstime operator \"\" _ms(unsigned long long milliseconds)\n+{\n+\treturn hrt_abstime(milliseconds * 1000ULL);\n+}\n+\n+constexpr hrt_abstime operator \"\" _us(unsigned long long microseconds)\n+{\n+\treturn hrt_abstime(microseconds);\n }\n \n } \/* namespace time_literals *\/\n"} {"commit":"1069ade69eda242b5c2083b4f9c6b2d3450df23b","subject":"drmmode_display.c :Exynos: Fix the flicker issue in HW cursor","message":"drmmode_display.c :Exynos: Fix the flicker issue in HW cursor\n\nTo enable the overlay for HW cursor layer a specific ioctl need to\nbe called. This Ioctl will set the postion of layer and thus calling\nchroma keying, which is required for overlay.\n\nBUG=Flicker in browser tab is being observed which I guess\n\tis in x86 too\nTEST=Tested on Daisy with xorg.conf having HWCursor \"true\"\n\nChange-Id: Ibf04777fa9da331e6b6d69713f324e7dbd862d1c\nSigned-off-by: Akshu <25d57d74499198329396e425bfe126a817333b52@samsung.com>\nReviewed-on: https:\/\/gerrit.chromium.org\/gerrit\/25276\nReviewed-by: Anush Elangovan <be3ea4b32dfea400cfb02e20cf45a400ef235334@google.com>\n","repos":"markyzq\/armsoc-rockchip,markyzq\/armsoc-rockchip","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/drmmode_display.c\n+++ src\/drmmode_display.c\n@@ -139,6 +139,14 @@\n \n static void drmmode_output_dpms(xf86OutputPtr output, int mode);\n \n+struct drm_exynos_plane_set_zpos {\n+\t __u32 plane_id;\n+\t __s32 zpos;\n+};\n+#define DRM_EXYNOS_PLANE_SET_ZPOS 0x06\n+#define DRM_IOCTL_EXYNOS_PLANE_SET_ZPOS DRM_IOWR(DRM_COMMAND_BASE + \\\n+\t\tDRM_EXYNOS_PLANE_SET_ZPOS, struct drm_exynos_plane_set_zpos)\n+\n static drmmode_ptr\n drmmode_from_scrn(ScrnInfoPtr pScrn)\n {\n@@ -366,6 +374,8 @@\n \tdrmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;\n \tdrmmode_ptr drmmode = drmmode_crtc->drmmode;\n \tdrmmode_cursor_ptr cursor = drmmode->cursor;\n+\n+\tstruct drm_exynos_plane_set_zpos data;\n \tint crtc_x, crtc_y, src_x, src_y, w, h;\n \n \tif (!cursor)\n@@ -399,6 +409,10 @@\n \tif ((crtc_y + h) > crtc->mode.VDisplay) {\n \t\th = crtc->mode.VDisplay - crtc_y;\n \t}\n+\n+\tdata.plane_id = cursor->ovr->plane_id;\n+\tdata.zpos = 1;\n+\tioctl(drmmode->fd, DRM_IOCTL_EXYNOS_PLANE_SET_ZPOS, &data);\n \n \t\/* note src coords (last 4 args) are in Q16 format *\/\n \tdrmModeSetPlane(drmmode->fd, cursor->ovr->plane_id,\n"} {"commit":"33cc49191fddf3ef14ccf2a0fd67ea3febae7c8d","subject":"Update func line range from non-opcode tokens","message":"Update func line range from non-opcode tokens\n\nLine range was updated only whenever bytecode opcodes were emitted. This\ncaused the line range to emit e.g. the opening brace of a function. Add\nspecific line number updates for e.g. function delimiting braces to ensure\nthe line range covers the function entirely.\n","repos":"harold-b\/duktape,haosu1987\/duktape,pombredanne\/duktape,eddieh\/duktape,jmptrader\/duktape,thurday\/duktape,svaarala\/duktape,nivertech\/duktape,kphillisjr\/duktape,haosu1987\/duktape,thurday\/duktape,zeropool\/duktape,svaarala\/duktape,markand\/duktape,chenyaqiuqiu\/duktape,markand\/duktape,zeropool\/duktape,tassmjau\/duktape,sloth4413\/duktape,markand\/duktape,thurday\/duktape,markand\/duktape,nivertech\/duktape,thurday\/duktape,harold-b\/duktape,harold-b\/duktape,skomski\/duktape,sloth4413\/duktape,markand\/duktape,thurday\/duktape,kphillisjr\/duktape,svaarala\/duktape,eddieh\/duktape,kphillisjr\/duktape,harold-b\/duktape,reqshark\/duktape,tassmjau\/duktape,tassmjau\/duktape,sloth4413\/duktape,haosu1987\/duktape,haosu1987\/duktape,nivertech\/duktape,eddieh\/duktape,reqshark\/duktape,svaarala\/duktape,harold-b\/duktape,harold-b\/duktape,pombredanne\/duktape,harold-b\/duktape,kphillisjr\/duktape,jmptrader\/duktape,zeropool\/duktape,thurday\/duktape,kphillisjr\/duktape,haosu1987\/duktape,chenyaqiuqiu\/duktape,kphillisjr\/duktape,zeropool\/duktape,svaarala\/duktape,eddieh\/duktape,skomski\/duktape,pombredanne\/duktape,pombredanne\/duktape,kphillisjr\/duktape,chenyaqiuqiu\/duktape,tassmjau\/duktape,markand\/duktape,chenyaqiuqiu\/duktape,skomski\/duktape,eddieh\/duktape,eddieh\/duktape,skomski\/duktape,svaarala\/duktape,jmptrader\/duktape,thurday\/duktape,skomski\/duktape,svaarala\/duktape,pombredanne\/duktape,thurday\/duktape,harold-b\/duktape,zeropool\/duktape,nivertech\/duktape,nivertech\/duktape,zeropool\/duktape,haosu1987\/duktape,reqshark\/duktape,sloth4413\/duktape,sloth4413\/duktape,reqshark\/duktape,kphillisjr\/duktape,harold-b\/duktape,eddieh\/duktape,reqshark\/duktape,haosu1987\/duktape,eddieh\/duktape,haosu1987\/duktape,kphillisjr\/duktape,jmptrader\/duktape,pombredanne\/duktape,pombredanne\/duktape,jmptrader\/duktape,tassmjau\/duktape,chenyaqiuqiu\/duktape,markand\/duktape,sloth4413\/duktape,reqshark\/duktape,markand\/duktape,sloth4413\/duktape,skomski\/duktape,reqshark\/duktape,markand\/duktape,zeropool\/duktape,zeropool\/duktape,nivertech\/duktape,nivertech\/duktape,chenyaqiuqiu\/duktape,zeropool\/duktape,thurday\/duktape,jmptrader\/duktape,skomski\/duktape,skomski\/duktape,nivertech\/duktape,jmptrader\/duktape,svaarala\/duktape,chenyaqiuqiu\/duktape,zeropool\/duktape,sloth4413\/duktape,tassmjau\/duktape,haosu1987\/duktape,reqshark\/duktape,harold-b\/duktape,tassmjau\/duktape,jmptrader\/duktape,sloth4413\/duktape,skomski\/duktape,svaarala\/duktape,markand\/duktape,sloth4413\/duktape,pombredanne\/duktape,tassmjau\/duktape,tassmjau\/duktape,skomski\/duktape,chenyaqiuqiu\/duktape,tassmjau\/duktape,reqshark\/duktape,haosu1987\/duktape,pombredanne\/duktape,eddieh\/duktape,eddieh\/duktape,chenyaqiuqiu\/duktape,jmptrader\/duktape,kphillisjr\/duktape,nivertech\/duktape,thurday\/duktape,reqshark\/duktape,jmptrader\/duktape,chenyaqiuqiu\/duktape,pombredanne\/duktape,nivertech\/duktape","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/duk_js_compiler.c\n+++ src\/duk_js_compiler.c\n@@ -1087,6 +1087,30 @@\n \tduk_hbuffer_append_bytes(comp_ctx->thr, h, (duk_uint8_t *) &instr, sizeof(instr));\n }\n \n+\/* Update function min\/max line from current token. Needed to improve\n+ * function line range information for debugging, so that e.g. opening\n+ * curly brace is covered by line range even when no opcodes are emitted\n+ * for the line containing the brace.\n+ *\/\n+DUK_LOCAL void duk__update_lineinfo_currtoken(duk_compiler_ctx *comp_ctx) {\n+#if defined(DUK_USE_DEBUGGER_SUPPORT)\n+\tduk_int_t line;\n+\n+\tline = comp_ctx->curr_token.start_line;\n+\tif (line == 0) {\n+\t\treturn;\n+\t}\n+\tif (line < comp_ctx->curr_func.min_line) {\n+\t\tcomp_ctx->curr_func.min_line = line;\n+\t}\n+\tif (line > comp_ctx->curr_func.max_line) {\n+\t\tcomp_ctx->curr_func.max_line = line;\n+\t}\n+#else\n+\tDUK_UNREF(comp_ctx);\n+#endif\n+}\n+\n #if 0 \/* unused *\/\n DUK_LOCAL void duk__emit_op_only(duk_compiler_ctx *comp_ctx, duk_small_uint_t op) {\n \tduk__emit(comp_ctx, DUK_ENC_OP_ABC(op, 0));\n@@ -6828,6 +6852,7 @@\n \t\t * based on duk__token_lbp[] automatically.\n \t\t *\/\n \t\tDUK_ASSERT(expect_token == DUK_TOK_LCURLY);\n+\t\tduk__update_lineinfo_currtoken(comp_ctx);\n \t\tduk__advance_expect(comp_ctx, expect_token);\n \t} else {\n \t\t\/* Need to set curr_token.t because lexing regexp mode depends on current\n@@ -6934,6 +6959,8 @@\n \t expect_eof); \/* expect EOF instead of } *\/\n \tDUK_DDD(DUK_DDDPRINT(\"end 2nd pass\"));\n \n+\tduk__update_lineinfo_currtoken(comp_ctx);\n+\n \t\/*\n \t * Emit a final RETURN.\n \t *\n@@ -7056,6 +7083,8 @@\n \tDUK_ASSERT(comp_ctx->curr_func.is_global == 0);\n \tDUK_ASSERT(comp_ctx->curr_func.is_setget == is_setget);\n \tDUK_ASSERT(comp_ctx->curr_func.is_decl == is_decl);\n+\n+\tduk__update_lineinfo_currtoken(comp_ctx);\n \n \t\/*\n \t * Function name (if any)\n"} {"commit":"c18109542f5bff580a763c520cfdeb220bddcecf","subject":"just a few comments and simple changes to matt_spi","message":"just a few comments and simple changes to matt_spi\n","repos":"camsoupa\/cc3000,camsoupa\/cc3000,camsoupa\/cc3000","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cc3000_web_client\/CC3000HostDriver\/matt_spi.c\n+++ cc3000_web_client\/CC3000HostDriver\/matt_spi.c\n@@ -128,7 +128,7 @@\n uint8_t *pTxPacket;\n uint8_t *pRxPacket;\n uint32_t ulRxBufferSize;\n- tSpiHwConfiguration sHwSettings;\n+ tSpiHwConfiguration sHwSettings; \/\/ do we need this TODO?\n }tSpiInformation;\n \n tSpiInformation sSpiInformation;\n@@ -180,7 +180,7 @@\n uint8_t wlan_rx_buffer[CC3000_RX_BUFFER_SIZE];\n uint8_t wlan_tx_buffer[CC3000_TX_BUFFER_SIZE];\n uint8_t chBuffer[CC3000_RX_BUFFER_SIZE];\n-static uint8_t ui8DMAChannelControlStructure[DMA_CHANNEL_CONTROL_STRUCTURE_SIZE] __attribute__ ((aligned(1024)));\n+\/\/static uint8_t ui8DMAChannelControlStructure[DMA_CHANNEL_CONTROL_STRUCTURE_SIZE] __attribute__ ((aligned(1024)));\n \/\/#endif\n \n \/\/*****************************************************************************\n@@ -220,6 +220,7 @@\n void\n SpiConfigureHwMapping(void)\n {\n+\t\/\/ Done elsewhere\n }\n \n \/\/*****************************************************************************\n@@ -233,6 +234,7 @@\n \t\/\/ called from CC3000 GPIO interrupt handler\n \/\/ unlike TI, there is no status, so we just return 0;\n MSS_GPIO_clear_irq(SPI_IRQ_PIN);\n+\n return 0;\n \n }\n@@ -310,6 +312,12 @@\n WlanInterruptDisable();\n \n NVIC_DisableIRQ(SPI1_IRQn);\n+\n+\t\/\/PDMA_disable_irq(SPI_UDMA_RX_CHANNEL); add these?\n+\t\/\/PDMA_disable_irq(SPI_UDMA_TX_CHANNEL);\n+\n+\n+\n }\n \n \/\/*****************************************************************************\n@@ -354,7 +362,7 @@\n \n \/\/ Enable the IRQ and SPI interrupts in the NVIC.\n NVIC_EnableIRQ(SPI1_IRQn);\n- MSS_GPIO_enable_irq(SPI_IRQ_PIN);\n+ WlanInterruptEnable();\n }\n \n \/\/*****************************************************************************\n@@ -385,6 +393,7 @@\n static uint32_t\n SpiCheckDMAStatus(uint32_t ui32Channel)\n {\n+\t\/\/ currently not called\n \t\/\/ experimental, since I don't know what UDMA_MODE_STOP|DMA_MODE_BASIC\n \t\/\/ are defined as...\n \treturn PDMA_status(ui32Channel);\n@@ -400,7 +409,7 @@\n \/\/*****************************************************************************\n static bool\n SpiIsDMAStopped(uint32_t ui32Channel)\n-{\n+{ \/\/ currently not called\n \t\/\/ experimental\n \tuint32_t BOTH_CHANNELS_COMPLETE = 0x0002;\n return(BOTH_CHANNELS_COMPLETE & PDMA_status(ui32Channel));\n@@ -455,7 +464,7 @@\n SpiWriteDataSynchronous(ui8Buf, 4);\n \n \/\/ Wait for the transmission to complete.\n- while(SpiBusy());\n+ while(SpiBusy()); \/\/ maybe take care of waiting in the lowest level spi call\n \n \/\/ Generate an 80 microsecond gap between the last byte sent and the\n \/\/ remainder of the packet.\n"} {"commit":"7d4b316da32520b72f81603d405f024c0be2e6c7","subject":"write_events mostly working","message":"write_events mostly working\n","repos":"gregoryyoung\/libesclient,gregoryyoung\/libesclient,gregoryyoung\/libesclient","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/es_proto_helper.c\n+++ src\/es_proto_helper.c\n@@ -33,7 +33,7 @@\n \tint32_t expected_version;\n \tint32_t num_events;\n \tbool require_master;\n-\tstruct NewEvent *events;\n+\tstruct NewEvent **events;\n };\n \n struct ReadStreamEvents {\n@@ -162,13 +162,17 @@\n \tmsg.event_stream_id = write->event_stream_id;\n \tmsg.expected_version = write->expected_version;\n \tmsg.require_master = write->require_master;\n+\tfflush (stdout);\n+\n \tmsg.events = malloc (sizeof (struct EventStore__Client__Messages__NewEvent *) * write->num_events);\n+\tmsg.n_events = write->num_events;\n \tfor(int i=0; i<write->num_events; i++) {\n-\t\tstruct NewEvent *cur = &write->events[i];\n+\t\tstruct NewEvent *cur = write->events[i];\n \t\tassert (cur->data.location);\n \t\tassert (cur->data.length > 0);\n \t\tEventStore__Client__Messages__NewEvent ev = EVENT_STORE__CLIENT__MESSAGES__NEW_EVENT__INIT;\n \t\tev.data_content_type = cur->data_content_type;\n+\t\tev.event_type = cur->event_type;\n \t\tev.metadata_content_type = cur->metadata_content_type;\n \t\tev.data.data = cur->data.location;\n \t\tev.data.len = cur->data.length;\n@@ -180,12 +184,40 @@\n \t}\n \tlen = event_store__client__messages__write_events__get_packed_size (&msg);\n \tif (len > buffer.length) {\n-\t\tfree (msg.events);\n \t\treturn 0;\n \t}\n \tevent_store__client__messages__write_events__pack (&msg, buffer.location);\n-\tfree (msg.events);\n-\treturn 0;\n+\treturn len;\n+}\n+\n+struct WriteEvents *es_unpack_write_events(struct Buffer buffer) {\n+\tEventStore__Client__Messages__WriteEvents *msg;\n+\tmsg = event_store__client__messages__write_events__unpack(NULL, buffer.length, buffer.location);\n+\tif(msg == NULL) return NULL;\n+\tstruct WriteEvents *ret = malloc (sizeof (struct WriteEvents));\n+\tret->event_stream_id = strdup (msg->event_stream_id);\n+\tret->expected_version = msg->expected_version;\n+\tret->require_master = msg->require_master;\n+\tret->events = malloc (sizeof (struct NewEvent*) * msg->n_events);\n+\tret->num_events = msg->n_events;\n+\tfflush (stdout);\n+\tfor(int i=0;i<msg->n_events;i++) {\n+\t\tfflush (stdout);\n+\t\tEventStore__Client__Messages__NewEvent *ev = msg->events[i];\n+\t\tstruct NewEvent *cur = malloc (sizeof(struct NewEvent));\n+\t\tcur->event_type = strdup (ev->event_type);\n+\t\tcur->data_content_type = ev->data_content_type;\n+\t\tcur->metadata_content_type = ev->metadata_content_type;\n+\t\tcur->data.location = ev->data.data;\n+\t\tcur->data.length = ev->data.len;\n+\t\tif(ev->has_metadata) {\n+\t\t\tcur->metadata.location = ev->metadata.data;\n+\t\t\tcur->metadata.length = ev->metadata.len;\n+\t\t}\n+\t\tret->events[i] = cur;\n+\t}\n+\tevent_store__client__messages__write_events__free_unpacked (msg, NULL);\n+\treturn ret;\n }\n \n \n@@ -420,6 +452,53 @@\n \tfree (buffer.location);\n }\n \n+void test_write_events (void) {\n+\tstruct WriteEvents r;\n+\tunsigned char data[16] = {0x46, 0x6c,0xbc, 0x3e, 0x72,0xe2, 0x26, 0x42, 0xbc,0xb5,0xaa,0x93,0xc4,0x11,0xed,0x0d };\n+\tstruct Buffer buffer = get_test_buffer(1024);\n+\tr.event_stream_id = \"test\";\n+\tr.expected_version = 19;\n+\tr.require_master = true;\n+\tr.num_events = 2;\n+\tr.events = malloc (sizeof (struct NewEvent*) * 2);\n+\tstruct NewEvent *item = malloc (sizeof (struct NewEvent));\n+\tuuid_generate(item->event_id);\n+\titem->event_type = \"ev1\";\n+\titem->data_content_type = 1;\n+\titem->metadata_content_type = 2;\n+\titem->data.location = &data;\n+\titem->data.length = 5;\n+\tr.events[0] = item;\n+\tstruct NewEvent *item2 = malloc (sizeof (struct NewEvent));\n+\titem2->event_type = \"ev2\";\n+\titem2->data_content_type = 2;\n+\titem2->metadata_content_type = 3;\n+\titem2->data.location = &data;\n+\titem2->data.length = 17;\n+\tr.events[1] = item2;\n+\tint len = es_pack_write_events (&r, buffer);\n+\tbuffer.length = len;\n+\tstruct WriteEvents *msg = es_unpack_write_events(buffer);\n+\tCU_ASSERT_PTR_NOT_NULL_FATAL (msg);\n+\tCU_ASSERT_STRING_EQUAL (\"test\", msg->event_stream_id);\n+\tCU_ASSERT_EQUAL (19, msg->expected_version);\n+\tCU_ASSERT (msg->require_master);\n+\tCU_ASSERT_EQUAL (2, msg->num_events);\n+\tCU_ASSERT_PTR_NOT_NULL_FATAL (msg->events);\n+\t\/*\n+\titem = msg->events[1];\n+\tprintf (\"dct is %d\", item->data_content_type);\n+\tprintf (\"mdct is %d\", item->metadata_content_type);\n+\tprintf (\"content type is %s\", item->event_type);\n+\titem = msg->events[0];\n+\tprintf (\"dct is %d\", item->data_content_type);\n+\tprintf (\"mdct is %d\", item->metadata_content_type);\n+\tprintf (\"content type is %s\", item->event_type);\n+\tCU_ASSERT_EQUAL (2, item->data_content_type);\n+\tCU_ASSERT_EQUAL (2, item->metadata_content_type);\n+\t*\/\n+}\n+\n void test_read_stream_events (void) {\n \tstruct ReadStreamEvents r;\n \tr.event_stream_id = \"testing\";\n@@ -522,10 +601,11 @@\n if ((NULL == CU_add_test(pSuite, \"test proto DeleteStream\", test_delete_stream)) ||\n (NULL == CU_add_test(pSuite, \"test proto SubscribeToStream\", test_subscribe_to_stream))||\n (NULL == CU_add_test(pSuite, \"test proto ReadStreamEvents\", test_read_stream_events))||\n- (NULL == CU_add_test(pSuite, \"test proto ReadAllEvents\", test_read_all_events))|| \n+ (NULL == CU_add_test(pSuite, \"test proto ReadAllEvents\", test_read_all_events))||\n (NULL == CU_add_test(pSuite, \"test proto ReadEvent\", test_read_event))||\n (NULL == CU_add_test(pSuite, \"test proto DeletePersistentSubscription\", test_delete_persistent_subscription))||\n (NULL == CU_add_test(pSuite, \"test proto TransactionCommit\", test_transaction_commit))||\n+ (NULL == CU_add_test(pSuite, \"test proto WriteEvents\", test_write_events))||\n 0)\n {\n CU_cleanup_registry();\n"} {"commit":"b6b4ac0384b1a0ff5d092231eeecffdbd6b69c2b","subject":"Fix a typo in a comment","message":"Fix a typo in a comment\n","repos":"StanciuMarius\/Libchamplain-map-wrapping,PabloCastellano\/libchamplain,Distrotech\/libchamplain,StanciuMarius\/Libchamplain-map-wrapping,PabloCastellano\/libchamplain,Distrotech\/libchamplain,Distrotech\/libchamplain,GNOME\/perl-Champlain,GNOME\/libchamplain,potyl\/champlain,potyl\/champlain,GNOME\/perl-Champlain,GNOME\/perl-Gtk2-Champlain,GNOME\/perl-Gtk2-Champlain,potyl\/champlain,Distrotech\/libchamplain,StanciuMarius\/Libchamplain-map-wrapping,StanciuMarius\/Libchamplain-map-wrapping,potyl\/champlain,GNOME\/libchamplain,PabloCastellano\/libchamplain,Distrotech\/libchamplain,StanciuMarius\/Libchamplain-map-wrapping,PabloCastellano\/libchamplain,PabloCastellano\/libchamplain","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- champlain\/champlain-network-map-data-source.c\n+++ champlain\/champlain-network-map-data-source.c\n@@ -212,7 +212,7 @@\n \n priv->map = NULL;\n priv->api_uri = g_strdup (\"http:\/\/www.informationfreeway.org\/api\/0.6\");\n- \/* informationfreeway.org is a load-balancer for different api server *\/\n+ \/* informationfreeway.org is a load-balancer for different api servers *\/\n priv->proxy_uri = g_strdup (\"\");\n }\n \n"} {"commit":"1e26ce34300493eb8809da7e442b57734843120a","subject":"more work on encrypted firmware updates","message":"more work on encrypted firmware updates\n","repos":"denisbohm\/firefly-ice-firmware,denisbohm\/firefly-ice-firmware,denisbohm\/firefly-ice-firmware","returncode":1,"stderr":"error: pathspec 'src\/fd_hal_aes_soft.c' did not match any file(s) known to git\n","license":"apache-2.0","lang":"C","diff":"--- src\/fd_hal_aes_soft.c\n+++ src\/fd_hal_aes_soft.c\n@@ -0,0 +1,605 @@\n+#include \"fd_hal_aes.h\"\n+\n+#define CBC 1\n+\n+\/*\n+This is an implementation of the AES128 algorithm, specifically ECB and CBC mode.\n+The implementation is verified against the test vectors in:\n+ National Institute of Standards and Technology Special Publication 800-38A 2001 ED\n+ECB-AES128\n+----------\n+ plain-text:\n+ 6bc1bee22e409f96e93d7e117393172a\n+ ae2d8a571e03ac9c9eb76fac45af8e51\n+ 30c81c46a35ce411e5fbc1191a0a52ef\n+ f69f2445df4f9b17ad2b417be66c3710\n+ key:\n+ 2b7e151628aed2a6abf7158809cf4f3c\n+ resulting cipher\n+ 3ad77bb40d7a3660a89ecaf32466ef97 \n+ f5d3d58503b9699de785895a96fdbaaf \n+ 43b1cd7f598ece23881b00e3ed030688 \n+ 7b0c785e27e8ad3f8223207104725dd4 \n+NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0)\n+ You should pad the end of the string with zeros if this is not the case.\n+*\/\n+\n+\n+\/*****************************************************************************\/\n+\/* Includes: *\/\n+\/*****************************************************************************\/\n+#include <stdint.h>\n+#include <string.h> \/\/ CBC mode, for memset\n+\n+\n+\/*****************************************************************************\/\n+\/* Defines: *\/\n+\/*****************************************************************************\/\n+\/\/ The number of columns comprising a state in AES. This is a constant in AES. Value=4\n+#define Nb 4\n+\/\/ The number of 32 bit words in a key.\n+#define Nk 4\n+\/\/ Key length in bytes [128 bit]\n+#define KEYLEN 16\n+\/\/ The number of rounds in AES Cipher.\n+#define Nr 10\n+\n+\/\/ jcallan@github points out that declaring Multiply as a function \n+\/\/ reduces code size considerably with the Keil ARM compiler.\n+\/\/ See this link for more information: https:\/\/github.com\/kokke\/tiny-AES128-C\/pull\/3\n+#ifndef MULTIPLY_AS_A_FUNCTION\n+ #define MULTIPLY_AS_A_FUNCTION 0\n+#endif\n+\n+\n+\/*****************************************************************************\/\n+\/* Private variables: *\/\n+\/*****************************************************************************\/\n+\/\/ state - array holding the intermediate results during decryption.\n+typedef uint8_t state_t[4][4];\n+static state_t* state;\n+\n+\/\/ The array that stores the round keys.\n+static uint8_t RoundKey[176];\n+\n+\/\/ The Key input to the AES Program\n+static const uint8_t* Key;\n+\n+#if defined(CBC) && CBC\n+ \/\/ Initial Vector used only for CBC mode\n+ static uint8_t* Iv;\n+#endif\n+\n+\/\/ The lookup-tables are marked const so they can be placed in read-only storage instead of RAM\n+\/\/ The numbers below can be computed dynamically trading ROM for RAM - \n+\/\/ This can be useful in (embedded) bootloader applications, where ROM is often limited.\n+static const uint8_t sbox[256] = {\n+ \/\/0 1 2 3 4 5 6 7 8 9 A B C D E F\n+ 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,\n+ 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,\n+ 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,\n+ 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,\n+ 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,\n+ 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,\n+ 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,\n+ 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,\n+ 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,\n+ 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,\n+ 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,\n+ 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,\n+ 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,\n+ 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,\n+ 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,\n+ 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 };\n+\n+static const uint8_t rsbox[256] =\n+{ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,\n+ 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,\n+ 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,\n+ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,\n+ 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,\n+ 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,\n+ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,\n+ 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,\n+ 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,\n+ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,\n+ 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,\n+ 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,\n+ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,\n+ 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,\n+ 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,\n+ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };\n+\n+\n+\/\/ The round constant word array, Rcon[i], contains the values given by \n+\/\/ x to th e power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8)\n+\/\/ Note that i starts at 1, not 0).\n+static const uint8_t Rcon[255] = {\n+ 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, \n+ 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, \n+ 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, \n+ 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, \n+ 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, \n+ 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, \n+ 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, \n+ 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, \n+ 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, \n+ 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, \n+ 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, \n+ 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, \n+ 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, \n+ 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, \n+ 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, \n+ 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb };\n+\n+\n+\/*****************************************************************************\/\n+\/* Private functions: *\/\n+\/*****************************************************************************\/\n+static uint8_t getSBoxValue(uint8_t num)\n+{\n+ return sbox[num];\n+}\n+\n+static uint8_t getSBoxInvert(uint8_t num)\n+{\n+ return rsbox[num];\n+}\n+\n+\/\/ This function produces Nb(Nr+1) round keys. The round keys are used in each round to decrypt the states. \n+static void KeyExpansion(void)\n+{\n+ uint32_t i, j, k;\n+ uint8_t tempa[4]; \/\/ Used for the column\/row operations\n+ \n+ \/\/ The first round key is the key itself.\n+ for(i = 0; i < Nk; ++i)\n+ {\n+ RoundKey[(i * 4) + 0] = Key[(i * 4) + 0];\n+ RoundKey[(i * 4) + 1] = Key[(i * 4) + 1];\n+ RoundKey[(i * 4) + 2] = Key[(i * 4) + 2];\n+ RoundKey[(i * 4) + 3] = Key[(i * 4) + 3];\n+ }\n+\n+ \/\/ All other round keys are found from the previous round keys.\n+ for(; (i < (Nb * (Nr + 1))); ++i)\n+ {\n+ for(j = 0; j < 4; ++j)\n+ {\n+ tempa[j]=RoundKey[(i-1) * 4 + j];\n+ }\n+ if (i % Nk == 0)\n+ {\n+ \/\/ This function rotates the 4 bytes in a word to the left once.\n+ \/\/ [a0,a1,a2,a3] becomes [a1,a2,a3,a0]\n+\n+ \/\/ Function RotWord()\n+ {\n+ k = tempa[0];\n+ tempa[0] = tempa[1];\n+ tempa[1] = tempa[2];\n+ tempa[2] = tempa[3];\n+ tempa[3] = k;\n+ }\n+\n+ \/\/ SubWord() is a function that takes a four-byte input word and \n+ \/\/ applies the S-box to each of the four bytes to produce an output word.\n+\n+ \/\/ Function Subword()\n+ {\n+ tempa[0] = getSBoxValue(tempa[0]);\n+ tempa[1] = getSBoxValue(tempa[1]);\n+ tempa[2] = getSBoxValue(tempa[2]);\n+ tempa[3] = getSBoxValue(tempa[3]);\n+ }\n+\n+ tempa[0] = tempa[0] ^ Rcon[i\/Nk];\n+ }\n+ else if (Nk > 6 && i % Nk == 4)\n+ {\n+ \/\/ Function Subword()\n+ {\n+ tempa[0] = getSBoxValue(tempa[0]);\n+ tempa[1] = getSBoxValue(tempa[1]);\n+ tempa[2] = getSBoxValue(tempa[2]);\n+ tempa[3] = getSBoxValue(tempa[3]);\n+ }\n+ }\n+ RoundKey[i * 4 + 0] = RoundKey[(i - Nk) * 4 + 0] ^ tempa[0];\n+ RoundKey[i * 4 + 1] = RoundKey[(i - Nk) * 4 + 1] ^ tempa[1];\n+ RoundKey[i * 4 + 2] = RoundKey[(i - Nk) * 4 + 2] ^ tempa[2];\n+ RoundKey[i * 4 + 3] = RoundKey[(i - Nk) * 4 + 3] ^ tempa[3];\n+ }\n+}\n+\n+\/\/ This function adds the round key to state.\n+\/\/ The round key is added to the state by an XOR function.\n+static void AddRoundKey(uint8_t round)\n+{\n+ uint8_t i,j;\n+ for(i=0;i<4;++i)\n+ {\n+ for(j = 0; j < 4; ++j)\n+ {\n+ (*state)[i][j] ^= RoundKey[round * Nb * 4 + i * Nb + j];\n+ }\n+ }\n+}\n+\n+\/\/ The SubBytes Function Substitutes the values in the\n+\/\/ state matrix with values in an S-box.\n+static void SubBytes(void)\n+{\n+ uint8_t i, j;\n+ for(i = 0; i < 4; ++i)\n+ {\n+ for(j = 0; j < 4; ++j)\n+ {\n+ (*state)[j][i] = getSBoxValue((*state)[j][i]);\n+ }\n+ }\n+}\n+\n+\/\/ The ShiftRows() function shifts the rows in the state to the left.\n+\/\/ Each row is shifted with different offset.\n+\/\/ Offset = Row number. So the first row is not shifted.\n+static void ShiftRows(void)\n+{\n+ uint8_t temp;\n+\n+ \/\/ Rotate first row 1 columns to left \n+ temp = (*state)[0][1];\n+ (*state)[0][1] = (*state)[1][1];\n+ (*state)[1][1] = (*state)[2][1];\n+ (*state)[2][1] = (*state)[3][1];\n+ (*state)[3][1] = temp;\n+\n+ \/\/ Rotate second row 2 columns to left \n+ temp = (*state)[0][2];\n+ (*state)[0][2] = (*state)[2][2];\n+ (*state)[2][2] = temp;\n+\n+ temp = (*state)[1][2];\n+ (*state)[1][2] = (*state)[3][2];\n+ (*state)[3][2] = temp;\n+\n+ \/\/ Rotate third row 3 columns to left\n+ temp = (*state)[0][3];\n+ (*state)[0][3] = (*state)[3][3];\n+ (*state)[3][3] = (*state)[2][3];\n+ (*state)[2][3] = (*state)[1][3];\n+ (*state)[1][3] = temp;\n+}\n+\n+static uint8_t xtime(uint8_t x)\n+{\n+ return ((x<<1) ^ (((x>>7) & 1) * 0x1b));\n+}\n+\n+\/\/ MixColumns function mixes the columns of the state matrix\n+static void MixColumns(void)\n+{\n+ uint8_t i;\n+ uint8_t Tmp,Tm,t;\n+ for(i = 0; i < 4; ++i)\n+ { \n+ t = (*state)[i][0];\n+ Tmp = (*state)[i][0] ^ (*state)[i][1] ^ (*state)[i][2] ^ (*state)[i][3] ;\n+ Tm = (*state)[i][0] ^ (*state)[i][1] ; Tm = xtime(Tm); (*state)[i][0] ^= Tm ^ Tmp ;\n+ Tm = (*state)[i][1] ^ (*state)[i][2] ; Tm = xtime(Tm); (*state)[i][1] ^= Tm ^ Tmp ;\n+ Tm = (*state)[i][2] ^ (*state)[i][3] ; Tm = xtime(Tm); (*state)[i][2] ^= Tm ^ Tmp ;\n+ Tm = (*state)[i][3] ^ t ; Tm = xtime(Tm); (*state)[i][3] ^= Tm ^ Tmp ;\n+ }\n+}\n+\n+\/\/ Multiply is used to multiply numbers in the field GF(2^8)\n+#if MULTIPLY_AS_A_FUNCTION\n+static uint8_t Multiply(uint8_t x, uint8_t y)\n+{\n+ return (((y & 1) * x) ^\n+ ((y>>1 & 1) * xtime(x)) ^\n+ ((y>>2 & 1) * xtime(xtime(x))) ^\n+ ((y>>3 & 1) * xtime(xtime(xtime(x)))) ^\n+ ((y>>4 & 1) * xtime(xtime(xtime(xtime(x))))));\n+ }\n+#else\n+#define Multiply(x, y) \\\n+ ( ((y & 1) * x) ^ \\\n+ ((y>>1 & 1) * xtime(x)) ^ \\\n+ ((y>>2 & 1) * xtime(xtime(x))) ^ \\\n+ ((y>>3 & 1) * xtime(xtime(xtime(x)))) ^ \\\n+ ((y>>4 & 1) * xtime(xtime(xtime(xtime(x)))))) \\\n+\n+#endif\n+\n+\/\/ MixColumns function mixes the columns of the state matrix.\n+\/\/ The method used to multiply may be difficult to understand for the inexperienced.\n+\/\/ Please use the references to gain more information.\n+static void InvMixColumns(void)\n+{\n+ int i;\n+ uint8_t a,b,c,d;\n+ for(i=0;i<4;++i)\n+ { \n+ a = (*state)[i][0];\n+ b = (*state)[i][1];\n+ c = (*state)[i][2];\n+ d = (*state)[i][3];\n+\n+ (*state)[i][0] = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^ Multiply(d, 0x09);\n+ (*state)[i][1] = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^ Multiply(d, 0x0d);\n+ (*state)[i][2] = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^ Multiply(d, 0x0b);\n+ (*state)[i][3] = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^ Multiply(d, 0x0e);\n+ }\n+}\n+\n+\n+\/\/ The SubBytes Function Substitutes the values in the\n+\/\/ state matrix with values in an S-box.\n+static void InvSubBytes(void)\n+{\n+ uint8_t i,j;\n+ for(i=0;i<4;++i)\n+ {\n+ for(j=0;j<4;++j)\n+ {\n+ (*state)[j][i] = getSBoxInvert((*state)[j][i]);\n+ }\n+ }\n+}\n+\n+static void InvShiftRows(void)\n+{\n+ uint8_t temp;\n+\n+ \/\/ Rotate first row 1 columns to right \n+ temp=(*state)[3][1];\n+ (*state)[3][1]=(*state)[2][1];\n+ (*state)[2][1]=(*state)[1][1];\n+ (*state)[1][1]=(*state)[0][1];\n+ (*state)[0][1]=temp;\n+\n+ \/\/ Rotate second row 2 columns to right \n+ temp=(*state)[0][2];\n+ (*state)[0][2]=(*state)[2][2];\n+ (*state)[2][2]=temp;\n+\n+ temp=(*state)[1][2];\n+ (*state)[1][2]=(*state)[3][2];\n+ (*state)[3][2]=temp;\n+\n+ \/\/ Rotate third row 3 columns to right\n+ temp=(*state)[0][3];\n+ (*state)[0][3]=(*state)[1][3];\n+ (*state)[1][3]=(*state)[2][3];\n+ (*state)[2][3]=(*state)[3][3];\n+ (*state)[3][3]=temp;\n+}\n+\n+\n+\/\/ Cipher is the main function that encrypts the PlainText.\n+static void Cipher(void)\n+{\n+ uint8_t round = 0;\n+\n+ \/\/ Add the First round key to the state before starting the rounds.\n+ AddRoundKey(0); \n+ \n+ \/\/ There will be Nr rounds.\n+ \/\/ The first Nr-1 rounds are identical.\n+ \/\/ These Nr-1 rounds are executed in the loop below.\n+ for(round = 1; round < Nr; ++round)\n+ {\n+ SubBytes();\n+ ShiftRows();\n+ MixColumns();\n+ AddRoundKey(round);\n+ }\n+ \n+ \/\/ The last round is given below.\n+ \/\/ The MixColumns function is not here in the last round.\n+ SubBytes();\n+ ShiftRows();\n+ AddRoundKey(Nr);\n+}\n+\n+static void InvCipher(void)\n+{\n+ uint8_t round=0;\n+\n+ \/\/ Add the First round key to the state before starting the rounds.\n+ AddRoundKey(Nr); \n+\n+ \/\/ There will be Nr rounds.\n+ \/\/ The first Nr-1 rounds are identical.\n+ \/\/ These Nr-1 rounds are executed in the loop below.\n+ for(round=Nr-1;round>0;round--)\n+ {\n+ InvShiftRows();\n+ InvSubBytes();\n+ AddRoundKey(round);\n+ InvMixColumns();\n+ }\n+ \n+ \/\/ The last round is given below.\n+ \/\/ The MixColumns function is not here in the last round.\n+ InvShiftRows();\n+ InvSubBytes();\n+ AddRoundKey(0);\n+}\n+\n+static void BlockCopy(uint8_t* output, uint8_t* input)\n+{\n+ uint8_t i;\n+ for (i=0;i<KEYLEN;++i)\n+ {\n+ output[i] = input[i];\n+ }\n+}\n+\n+\n+\n+\/*****************************************************************************\/\n+\/* Public functions: *\/\n+\/*****************************************************************************\/\n+#if defined(ECB) && ECB\n+\n+\n+void AES128_ECB_encrypt(uint8_t* input, const uint8_t* key, uint8_t* output)\n+{\n+ \/\/ Copy input to output, and work in-memory on output\n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+\n+ Key = key;\n+ KeyExpansion();\n+\n+ \/\/ The next function call encrypts the PlainText with the Key using AES algorithm.\n+ Cipher();\n+}\n+\n+void AES128_ECB_decrypt(uint8_t* input, const uint8_t* key, uint8_t *output)\n+{\n+ \/\/ Copy input to output, and work in-memory on output\n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+\n+ \/\/ The KeyExpansion routine must be called before encryption.\n+ Key = key;\n+ KeyExpansion();\n+\n+ InvCipher();\n+}\n+\n+\n+#endif \/\/ #if defined(ECB) && ECB\n+\n+\n+\n+\n+\n+#if defined(CBC) && CBC\n+\n+\n+static void XorWithIv(uint8_t* buf)\n+{\n+ uint8_t i;\n+ for(i = 0; i < KEYLEN; ++i)\n+ {\n+ buf[i] ^= Iv[i];\n+ }\n+}\n+\n+void AES128_CBC_encrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, const uint8_t* key, const uint8_t* iv)\n+{\n+ uint32_t i;\n+ uint8_t remainders = length % KEYLEN; \/* Remaining bytes in the last non-full block *\/\n+\n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+\n+ \/\/ Skip the key expansion if key is passed as 0\n+ if(0 != key)\n+ {\n+ Key = key;\n+ KeyExpansion();\n+ }\n+\n+ if(iv != 0)\n+ {\n+ Iv = (uint8_t*)iv;\n+ }\n+\n+ for(i = 0; i < length; i += KEYLEN)\n+ {\n+ XorWithIv(input);\n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+ Cipher();\n+ Iv = output;\n+ input += KEYLEN;\n+ output += KEYLEN;\n+ }\n+\n+ if(remainders)\n+ {\n+ BlockCopy(output, input);\n+ memset(output + remainders, 0, KEYLEN - remainders); \/* add 0-padding *\/\n+ state = (state_t*)output;\n+ Cipher();\n+ }\n+}\n+\n+void AES128_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, const uint8_t* key, const uint8_t* iv)\n+{\n+ uint32_t i;\n+ uint8_t remainders = length % KEYLEN; \/* Remaining bytes in the last non-full block *\/\n+ \n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+\n+ \/\/ Skip the key expansion if key is passed as 0\n+ if(0 != key)\n+ {\n+ Key = key;\n+ KeyExpansion();\n+ }\n+\n+ \/\/ If iv is passed as 0, we continue to encrypt without re-setting the Iv\n+ if(iv != 0)\n+ {\n+ Iv = (uint8_t*)iv;\n+ }\n+\n+ for(i = 0; i < length; i += KEYLEN)\n+ {\n+ BlockCopy(output, input);\n+ state = (state_t*)output;\n+ InvCipher();\n+ XorWithIv(output);\n+ Iv = input;\n+ input += KEYLEN;\n+ output += KEYLEN;\n+ }\n+\n+ if(remainders)\n+ {\n+ BlockCopy(output, input);\n+ memset(output+remainders, 0, KEYLEN - remainders); \/* add 0-padding *\/\n+ state = (state_t*)output;\n+ InvCipher();\n+ }\n+}\n+\n+\n+#endif \/\/ #if defined(CBC) && CBC\n+\n+void fd_hal_aes_decrypt_start(fd_hal_aes_decrypt_t *decrypt __attribute__((unused)), const uint8_t *key, const uint8_t *iv) {\n+ AES128_CBC_decrypt_buffer(0, 0, 0, key, iv);\n+}\n+\n+void fd_hal_aes_decrypt_blocks(fd_hal_aes_decrypt_t *decrypt __attribute__((unused)), uint8_t *in, uint8_t *out, uint32_t length) {\n+ for (uint32_t i = 0; i < length; i += 16) {\n+ AES128_CBC_decrypt_buffer(out, in, 16, 0, 0);\n+ in += 16;\n+ out += 16;\n+ }\n+}\n+\n+void fd_hal_aes_decrypt_stop(fd_hal_aes_decrypt_t *decrypt __attribute__((unused))) {\n+}\n+\n+void fd_hal_aes_hash_start(fd_hal_aes_hash_t *hash __attribute__((unused)), const uint8_t *key __attribute__((unused)), const uint8_t *iv __attribute__((unused))) {\n+}\n+\n+void fd_hal_aes_hash_blocks(fd_hal_aes_hash_t *hash __attribute__((unused)), uint8_t *in __attribute__((unused)), uint32_t length __attribute__((unused))) {\n+}\n+\n+void fd_hal_aes_hash_stop(fd_hal_aes_hash_t *hash __attribute__((unused)), uint8_t *result __attribute__((unused))) {\n+}\n+\n+void fd_hal_aes_hash_start_default(fd_hal_aes_hash_t *hash __attribute__((unused))) {\n+}\n+\n+void fd_hal_aes_hash_default(fd_hal_aes_source_t source __attribute__((unused)), uint32_t address __attribute__((unused)), uint32_t length __attribute__((unused)), uint8_t *result __attribute__((unused))) {\n+}"} {"commit":"4bf2a34e7a8fadeb4182fc2aa794c171d7125351","subject":"just to be safe","message":"just to be safe\n","repos":"tlively\/cs51-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physics.c\n+++ physics.c\n@@ -220,8 +220,8 @@\n }\n \n \/\/ update velocity, return success\n- obj->dx = dx;\n- obj->dy = dy;\n+ obj->vel.x = dx;\n+ obj->vel.y = dy;\n return 0;\n }\n \n@@ -614,8 +614,8 @@\n \n \/\/ we need to move delta\/2 distance in the direction of the directional_vector\n po_vector move_vector;\n- move_vector.x = delta\/2 * directional_vector.x ;\n- move_vector.y = delta\/2 * directional_vector.y ;\n+ move_vector.x = delta\/2 * directional_vector.x;\n+ move_vector.y = delta\/2 * directional_vector.y;\n \n \/\/ reverse velocities, set location, check for error\n if (set_velocity(circ1, circ1->vel.x * -1, circ1->vel.y * -1) ||\n@@ -640,21 +640,36 @@\n }\n } \n \n+\/* finds point of collision in global coords\n+ takes point and vector in global coords *\/\n+po_vector get_coll_pt(po_vector point, po_vector centroid, \n+\t\t po_vector side_origin, po_vector side_end) {\n+ \/\/ get the projection of the vector connecting the colliding vertex onto the line\n+ po_vector proj = vect_project(vect_from_points(side_origin, point), \n+\t\t\t\tvect_from_points(side_origin, side_end));\n+\n+ \/\/ get the point this hits on the side in global coords\n+ po_vector intersect_point;\n+ intersect_point.x = proj.x + side_origin.x;\n+ intersect_point.y = proj.y + side_origin.y;\n+ \n+ return intersect_point;\n+}\n+\n \/* takes point and vector in global coords\n * this vector will point in the direction of force on the point *\/\n-po_vector get_force_vector(po_vector point, po_vector* poly, int index, int max_index) {\n-\n- \/\/ get the projection of the vector connecting the colliding vertex onto the line\n- po_vector proj = vect_project(vect_from_points(poly[index], point), \n-\t\t\t\tvect_from_points(poly[index], poly[(index+1) % max_index]));\n-\n- \/\/ get the point this hits on the side in global coords\n- po_vector intersect_point;\n- intersect_point.x = proj.x + poly[index].x;\n- intersect_point.y = proj.y + poly[index].y;\n- \n+po_vector get_force_vector(po_vector point, po_vector intersect_point) {\n \/\/ get the force vector! (it's the vector from the vertice to the closest part of the side)\n return vect_from_points(point, intersect_point);\n+}\n+\n+\/* gets the torque on an object\n+ * accepts an object and the point of collision *\/\n+float get_torque(po_vector point, po_handle poly){\n+ \/\/ the cross prod of the vector from the center of the poly to the point \n+ \/\/ with the angular velocity \n+ return vect_cross_scalar(vect_from_points(get_centroid_global(poly->centroid), point), \n+\t\t\t vect_cross_prod(r, poly->vel));\n }\n \n \/* go through the sides of poly1 comparing with the verts of poly2 \n@@ -663,7 +678,7 @@\n * returns 1 on failure, 0 on success\n * if we don't find anything, we need to switch inputs and try again *\/\n int find_intersection (po_handle po_pts, po_handle po_sides, \n-\t\t int* index_pt, int* index_sides, po_vector* force_vect){\n+\t\t int* index_pt, int* i_s){\n \/\/ the polygon we're doing corner stuff with \n po_vector* vert_pts;\n get_global_coord(po_pts, &vert_pts);\n@@ -681,7 +696,7 @@\n for (int i = 0, max_j = NVERTS(po_sides); i < NVERTS(po_pts); i++){\n \/\/ these will keep track of our smallest magnitude dot prods; resets every new vert\n min_dot_prod = 0;\n- *index_sides = 0;\n+ *i_s = 0;\n \n \/\/ go through the vertices of po_pts\n for (int j = 0; j < NVERTS(po_sides); j++) { \n@@ -693,17 +708,24 @@\n \/\/ no intersection, skip the rest of the dot prods\n break;\n }\n- \/\/ if we've found a new min value...\n- if (-cur_dot_prod > min_dot_prod){\n-\t\/\/ update our maxes\n+ else if (-cur_dot_prod > min_dot_prod){\n+\t\/\/ we've found a new min value!\n \t*index_sides = j;\n \tmin_dot_prod = -cur_dot_prod;\n }\n- \/\/ we've made it to the end...\n+ \/\/ we've made it to the end without breaking...\n if (j == max_j) {\n-\t\/\/ we've made it through the whole loop without sadness! so we update.\n-\t*force_vect = get_force_vector(vert_pts[i], vert_sides, j, NVERTS(po_sides));\n-\t*index_pt = i;\n+\n+\t\/\/ get point on sides_poly where collision is happening\n+\tpo_vector side_point = get_coll_point(vert_pts[i], get_centroid_global(po_sides),\n+\t\t\t\t\t vert_sides[*i_s], vert_sides [*i_s % NVERTS(po_sides)]);\n+\n+\t\/\/ update force information\n+\tpo_pts->force = get_force_vector(vert_pts[i], side_point);;\n+\tpo_sides->force = vect_scaled(po_pts->force,-1);\n+\n+\t\/\/ update update torque\n+\t\/\/po_pts->torque = get_torque(\n \treturn 0;\n }\n } \n@@ -720,23 +742,16 @@\n \n \/\/ lets us know which shape is the intersector, which the intersectee\n int which_shape = 0;\n- if (find_intersection(poly1, poly2, &index1,&index2,&force)) {\n+ if (find_intersection(poly1, poly2, &index1,&index2)) {\n \/\/ then we have the polygon order wrong\n- if (poly2, poly1, &index2, &index1,&force) {\n+ if (poly2, poly1, &index2, &index1) {\n \/\/ then there's not a collision. Do we handle or just return or...?\n return 1;\n }\n \/\/ shape poly2 has a vertex inside of poly1\n which_shape = 1;\n }\n- if(which_shape){\n- poly2->force = force;\n- poly1->force = vect_scaled(force, -1);\n- }\n- else{\n- poly1->force = force;\n- poly2->force = vect_scaled(force, -1);\n- }\n+\n }\n \n \/\/TODO: make this a thing: takes a poly and a circ and resolves\n"} {"commit":"3c7b522b35a24cd01cba716fa80d048a8bea7a80","subject":"VFS-4681 Added file header","message":"VFS-4681 Added file header\n","repos":"onedata\/helpers,onedata\/helpers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/flatOpScheduler.h\n+++ src\/flatOpScheduler.h\n@@ -1,3 +1,10 @@\n+\/**\n+ * @file flatOpScheduler.h\n+ * @author Konrad Zemek\n+ * @copyright (C) 2018 ACK CYFRONET AGH\n+ * @copyright This software is released under the MIT license cited in\n+ * 'LICENSE.txt'\n+ *\/\n #pragma once\n \n #include <boost\/variant\/apply_visitor.hpp>\n"} {"commit":"73add666da11cf5b65851689561d1edabd234125","subject":"mkdir lost result code found","message":"mkdir lost result code found","repos":"mike2390\/embox,vrxfile\/embox-trik,Kakadu\/embox,Kefir0192\/embox,embox\/embox,Kakadu\/embox,embox\/embox,Kakadu\/embox,mike2390\/embox,mike2390\/embox,Kefir0192\/embox,vrxfile\/embox-trik,mike2390\/embox,vrxfile\/embox-trik,embox\/embox,gzoom13\/embox,gzoom13\/embox,Kefir0192\/embox,Kefir0192\/embox,gzoom13\/embox,mike2390\/embox,gzoom13\/embox,abusalimov\/embox,vrxfile\/embox-trik,abusalimov\/embox,mike2390\/embox,gzoom13\/embox,mike2390\/embox,Kefir0192\/embox,abusalimov\/embox,Kefir0192\/embox,vrxfile\/embox-trik,embox\/embox,Kakadu\/embox,abusalimov\/embox,abusalimov\/embox,vrxfile\/embox-trik,gzoom13\/embox,embox\/embox,Kakadu\/embox,Kakadu\/embox,vrxfile\/embox-trik,embox\/embox,abusalimov\/embox,Kakadu\/embox,Kefir0192\/embox,gzoom13\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/fs\/syslib\/kfsop.c\n+++ src\/fs\/syslib\/kfsop.c\n@@ -97,7 +97,7 @@\n \t\treturn -1;\n \t}\n \n-\tif (0 != create_new_node(&node, lastpath, S_IFDIR | mode)) {\n+\tif (0 != (res = create_new_node(&node, lastpath, S_IFDIR | mode))) {\n \t\terrno = -res;\n \t\treturn -1;\n \t}\n"} {"commit":"41314003ba44cce3628699258353ab988a6e27c8","subject":"presence: wrap long lines","message":"presence: wrap long lines\n\n\n20060929155208-b59df-47add35dd828b9b06e22d6b3036eccb1d503249d.gz\n","repos":"mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-presence.c\n+++ src\/gabble-presence.c\n@@ -146,7 +146,9 @@\n }\n \n void\n-gabble_presence_set_capabilities (GabblePresence *presence, const gchar *resource, GabblePresenceCapabilities caps)\n+gabble_presence_set_capabilities (GabblePresence *presence,\n+ const gchar *resource,\n+ GabblePresenceCapabilities caps)\n {\n GabblePresencePrivate *priv = GABBLE_PRESENCE_PRIV (presence);\n GSList *i;\n@@ -182,7 +184,11 @@\n }\n \n gboolean\n-gabble_presence_update (GabblePresence *presence, const gchar *resource, GabblePresenceId status, const gchar *status_message, gint8 priority)\n+gabble_presence_update (GabblePresence *presence,\n+ const gchar *resource,\n+ GabblePresenceId status,\n+ const gchar *status_message,\n+ gint8 priority)\n {\n GabblePresencePrivate *priv = GABBLE_PRESENCE_PRIV (presence);\n Resource *res;\n@@ -230,7 +236,8 @@\n res->priority = priority;\n }\n \n- \/* select the most preferable Resource and update presence->* based on our choice *\/\n+ \/* select the most preferable Resource and update presence->* based on our\n+ * choice *\/\n presence->caps = 0;\n presence->status = GABBLE_PRESENCE_OFFLINE;\n \n"} {"commit":"ed39498fa2b21129b9c6687bac484476f05e4d0a","subject":"1.4","message":"1.4\n\n\ngit-svn-id: 9e9401559e51101c165cdce4d49b411eb20436ed@529 3d70eeeb-363e-0410-a505-8a46323a89f2\n","repos":"Slicer\/teem,BRAINSia\/teem,BRAINSia\/teem,BRAINSia\/teem,BRAINSia\/teem,Slicer\/teem,BRAINSia\/teem,Slicer\/teem,Slicer\/teem,Slicer\/teem","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gage\/test\/qbert.c\n+++ src\/gage\/test\/qbert.c\n@@ -419,8 +419,8 @@\n nvgh = nrrdNuke(nvgh);\n npad = nrrdNuke(npad);\n ctx = gageSclContextNix(ctx);\n+ hparm = hestParmFree(hparm);\n hopt = hestOptFree(hopt);\n- hparm = hestParmFree(hparm);\n \n exit(0);\n }\n"} {"commit":"cd430d113f169f23d7069ab54378670c55664b99","subject":"s\/strcmp\/e_util_strcmp\/g","message":"s\/strcmp\/e_util_strcmp\/g\n\n\nSVN revision: 76801\n","repos":"FlorentRevest\/Enlightenment,tasn\/enlightenment,rvandegrift\/e,tasn\/enlightenment,rvandegrift\/e,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/conf_keybindings\/e_int_config_keybindings.c\n+++ src\/modules\/conf_keybindings\/e_int_config_keybindings.c\n@@ -813,7 +813,7 @@\n \n if (action)\n {\n- if (!strcmp(action, actd->act_cmd))\n+ if (!e_util_strcmp(action, actd->act_cmd))\n {\n if ((cfdata->locals.cur_act >= 0) && (cfdata->locals.cur_act != e_widget_ilist_selected_get(cfdata->gui.o_action_list)))\n KB_EXAMPLE_PARAMS;\n@@ -992,10 +992,10 @@\n printf(\"'%s' '%s'\\n\", ev->keyname, ev->key);\n else\n printf(\"unknown key!!!!\\n\");\n- if (!strcmp(ev->keyname, \"Control_L\") || !strcmp(ev->keyname, \"Control_R\") ||\n- !strcmp(ev->keyname, \"Shift_L\") || !strcmp(ev->keyname, \"Shift_R\") ||\n- !strcmp(ev->keyname, \"Alt_L\") || !strcmp(ev->keyname, \"Alt_R\") ||\n- !strcmp(ev->keyname, \"Super_L\") || !strcmp(ev->keyname, \"Super_R\"))\n+ if (!e_util_strcmp(ev->keyname, \"Control_L\") || !e_util_strcmp(ev->keyname, \"Control_R\") ||\n+ !e_util_strcmp(ev->keyname, \"Shift_L\") || !e_util_strcmp(ev->keyname, \"Shift_R\") ||\n+ !e_util_strcmp(ev->keyname, \"Alt_L\") || !e_util_strcmp(ev->keyname, \"Alt_R\") ||\n+ !e_util_strcmp(ev->keyname, \"Super_L\") || !e_util_strcmp(ev->keyname, \"Super_R\"))\n {\n \/* Do nothing *\/\n }\n@@ -1174,10 +1174,10 @@\n ok = 1;\n if (cfdata->locals.params)\n {\n- if (!strcmp(cfdata->locals.params, TEXT_NO_PARAMS))\n+ if (!e_util_strcmp(cfdata->locals.params, TEXT_NO_PARAMS))\n ok = 0;\n \n- if ((actd->param_example) && (!strcmp(cfdata->locals.params, actd->param_example)))\n+ if ((actd->param_example) && (!e_util_strcmp(cfdata->locals.params, actd->param_example)))\n ok = 0;\n }\n else\n@@ -1212,7 +1212,7 @@\n for (l2 = actg->acts, aa = 0; l2; l2 = l2->next, aa++)\n {\n actd = l2->data;\n- if (!strcmp((!action ? \"\" : action), (!actd->act_cmd ? \"\" : actd->act_cmd)))\n+ if (!e_util_strcmp((!action ? \"\" : action), (!actd->act_cmd ? \"\" : actd->act_cmd)))\n {\n if (!params || !params[0])\n {\n@@ -1237,7 +1237,7 @@\n }\n else\n {\n- if (!strcmp(params, actd->act_params))\n+ if (!e_util_strcmp(params, actd->act_params))\n {\n if (g) *g = gg;\n if (a) *a = aa;\n"} {"commit":"fb4ea553802e32809d79ac1bb4ae76adab0e1508","subject":"[spooler] improve error logging on thread creation failure","message":"[spooler] improve error logging on thread creation failure\n","repos":"cvmfs\/cvmfs,DrDaveD\/cvmfs,DrDaveD\/cvmfs,DrDaveD\/cvmfs,DrDaveD\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,DrDaveD\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,DrDaveD\/cvmfs,DrDaveD\/cvmfs,cvmfs\/cvmfs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cvmfs\/ingestion\/task.h\n+++ cvmfs\/ingestion\/task.h\n@@ -5,12 +5,15 @@\n #ifndef CVMFS_INGESTION_TASK_H_\n #define CVMFS_INGESTION_TASK_H_\n \n+#include <errno.h>\n #include <pthread.h>\n+#include <unistd.h>\n \n #include <cassert>\n #include <vector>\n \n #include \"ingestion\/tube.h\"\n+#include \"util\/exception.h\"\n #include \"util\/single_copy.h\"\n \n \/**\n@@ -80,7 +83,10 @@\n for (unsigned i = 0; i < N; ++i) {\n int retval = pthread_create(\n &threads_[i], NULL, TubeConsumer<ItemT>::MainConsumer, consumers_[i]);\n- assert(retval == 0);\n+ if (retval != 0) {\n+ PANIC(kLogStderr, \"failed to create new thread (error: %d, pid: %d)\",\n+ errno, getpid());\n+ }\n }\n is_active_ = true;\n }\n"} {"commit":"0bf00b2d4fd60e37ca5b2f52cfba62be41a23115","subject":"adapt ObjectFetcher<> usage of facade methods","message":"adapt ObjectFetcher<> usage of facade methods\n","repos":"reneme\/cvmfs,DrDaveD\/cvmfs,alhowaidi\/cvmfsNDN,Gangbiao\/cvmfs,Moliholy\/cvmfs,djw8605\/cvmfs,alhowaidi\/cvmfsNDN,DrDaveD\/cvmfs,trshaffer\/cvmfs,DrDaveD\/cvmfs,alhowaidi\/cvmfsNDN,trshaffer\/cvmfs,DrDaveD\/cvmfs,Gangbiao\/cvmfs,alhowaidi\/cvmfsNDN,MicBrain\/cvmfs,Moliholy\/cvmfs,cvmfs\/cvmfs,djw8605\/cvmfs,reneme\/cvmfs,trshaffer\/cvmfs,cvmfs\/cvmfs,MicBrain\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,MicBrain\/cvmfs,DrDaveD\/cvmfs,cvmfs-testing\/cvmfs,reneme\/cvmfs,Moliholy\/cvmfs,cvmfs-testing\/cvmfs,Gangbiao\/cvmfs,djw8605\/cvmfs,MicBrain\/cvmfs,alhowaidi\/cvmfsNDN,DrDaveD\/cvmfs,Moliholy\/cvmfs,cvmfs\/cvmfs,cvmfs-testing\/cvmfs,Gangbiao\/cvmfs,cvmfs-testing\/cvmfs,Gangbiao\/cvmfs,djw8605\/cvmfs,cvmfs\/cvmfs,trshaffer\/cvmfs,reneme\/cvmfs,reneme\/cvmfs,Moliholy\/cvmfs,cvmfs\/cvmfs,DrDaveD\/cvmfs,trshaffer\/cvmfs,MicBrain\/cvmfs,djw8605\/cvmfs,cvmfs-testing\/cvmfs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cvmfs\/object_fetcher.h\n+++ cvmfs\/object_fetcher.h\n@@ -64,7 +64,9 @@\n \n \/**\n * Downloads and opens (read-only) a history database. Note that the user is\n- * responsible to remove the history object after usage.\n+ * responsible to remove the history object after usage. The fetched SQLite\n+ * database file will be unlinked automatically during the destruction of the\n+ * HistoryTN object.\n *\n * @param history_hash (optional) the content hash of the history database\n * if left blank, the latest one is downloaded\n@@ -86,7 +88,7 @@\n \/\/ open the history file\n HistoryTN *history = HistoryTN::Open(path);\n if (NULL != history) {\n- history->TakeFileOwnership();\n+ history->TakeDatabaseFileOwnership();\n }\n \n return history;\n@@ -119,7 +121,7 @@\n parent,\n is_nested);\n if (NULL != catalog) {\n- catalog->TakeFileOwnership();\n+ catalog->TakeDatabaseFileOwnership();\n }\n \n return catalog;\n"} {"commit":"36f2c1cf3fc655bdde52f3b947e694ba8b054101","subject":"helpers: fix incorrect ifdef guard name","message":"helpers: fix incorrect ifdef guard name\n","repos":"paradajz\/avr-core,paradajz\/avr-core","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/general\/Helpers.h\n+++ src\/general\/Helpers.h\n@@ -19,8 +19,8 @@\n OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n *\/\n \n-#ifndef __CORE_GENERAL_MISC\n-#define __CORE_GENERAL_MISC\n+#ifndef __CORE_GENERAL_HELPERS\n+#define __CORE_GENERAL_HELPERS\n \n #include <stdlib.h>\n #include <inttypes.h>\n"} {"commit":"50fc4501aabe4830a5c5246c1886fa9edac89508","subject":"optimize LocalObjectFetcher<> temp handling","message":"optimize LocalObjectFetcher<> temp handling\n","repos":"cvmfs\/cvmfs,trshaffer\/cvmfs,cvmfs-testing\/cvmfs,alhowaidi\/cvmfsNDN,reneme\/cvmfs,Gangbiao\/cvmfs,alhowaidi\/cvmfsNDN,alhowaidi\/cvmfsNDN,DrDaveD\/cvmfs,cvmfs\/cvmfs,trshaffer\/cvmfs,MicBrain\/cvmfs,DrDaveD\/cvmfs,trshaffer\/cvmfs,cvmfs-testing\/cvmfs,cvmfs\/cvmfs,trshaffer\/cvmfs,reneme\/cvmfs,djw8605\/cvmfs,Moliholy\/cvmfs,reneme\/cvmfs,Gangbiao\/cvmfs,Moliholy\/cvmfs,djw8605\/cvmfs,MicBrain\/cvmfs,Gangbiao\/cvmfs,DrDaveD\/cvmfs,djw8605\/cvmfs,reneme\/cvmfs,djw8605\/cvmfs,trshaffer\/cvmfs,reneme\/cvmfs,cvmfs\/cvmfs,cvmfs\/cvmfs,Moliholy\/cvmfs,MicBrain\/cvmfs,DrDaveD\/cvmfs,cvmfs-testing\/cvmfs,Gangbiao\/cvmfs,MicBrain\/cvmfs,Moliholy\/cvmfs,alhowaidi\/cvmfsNDN,Moliholy\/cvmfs,MicBrain\/cvmfs,DrDaveD\/cvmfs,alhowaidi\/cvmfsNDN,cvmfs-testing\/cvmfs,cvmfs\/cvmfs,Gangbiao\/cvmfs,DrDaveD\/cvmfs,cvmfs-testing\/cvmfs,cvmfs\/cvmfs,djw8605\/cvmfs,DrDaveD\/cvmfs","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- cvmfs\/object_fetcher.h\n+++ cvmfs\/object_fetcher.h\n@@ -209,27 +209,35 @@\n assert (file_path != NULL);\n file_path->clear();\n \n+ \/\/ check if the requested file object is available locally\n const std::string source = BuildPath(object_hash, hash_suffix);\n- const std::string dest = CreateTempPath(temporary_directory_ + \"\/\" +\n- object_hash.ToStringWithSuffix(),\n- 0600);\n-\n if (! FileExists(source)) {\n- LogCvmfs(kLogDownload, kLogDebug, \"failed to locate object %s at '%s'\",\n- object_hash.ToString().c_str(), dest.c_str());\n+ LogCvmfs(kLogDownload, kLogDebug, \"failed to locate object %s\",\n+ object_hash.ToString().c_str());\n return false;\n }\n \n- if (! zlib::DecompressPath2Path(source, dest)) {\n+ \/\/ create a temporary file to store the decompressed object file\n+ const std::string tmp_path = temporary_directory_ + \"\/\" +\n+ object_hash.ToStringWithSuffix();\n+ FILE *f = CreateTempFile(tmp_path, 0600, \"w\", file_path);\n+ if (NULL == f) {\n+ LogCvmfs(kLogDownload, kLogStderr, \"failed to create temp file (errno: %d)\",\n+ errno);\n+ return false;\n+ }\n+\n+ \/\/ decompress the requested object file\n+ const bool success = zlib::DecompressPath2File(source, f);\n+ if (! success) {\n LogCvmfs(kLogDownload, kLogDebug, \"failed to extract object %s from '%s' \"\n \"to '%s' (errno: %d)\",\n- object_hash.ToString().c_str(), source.c_str(), dest.c_str(),\n- errno);\n- return false;\n- }\n-\n- *file_path = dest;\n- return true;\n+ object_hash.ToString().c_str(), source.c_str(),\n+ file_path->c_str(), errno);\n+ }\n+\n+ fclose(f);\n+ return success;\n }\n \n \n"} {"commit":"cab7d4224d215b5189dc064dc66766b2183e0f1f","subject":"File geospatialrange.h was added","message":"File geospatialrange.h was added\n","repos":"Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand","returncode":1,"stderr":"error: pathspec 'src\/geospatialrange.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- src\/geospatialrange.h\n+++ src\/geospatialrange.h\n@@ -0,0 +1,102 @@\n+\/*\n+ * Copyright (C) 2015 deipi.com LLC and contributors. All rights reserved.\n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining a copy\n+ * of this software and associated documentation files (the \"Software\"), to\n+ * deal in the Software without restriction, including without limitation the\n+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and\/or\n+ * sell copies of the Software, and to permit persons to whom the Software is\n+ * furnished to do so, subject to the following conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be included in\n+ * all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS\n+ * IN THE SOFTWARE.\n+ *\/\n+\n+#ifndef XAPIAND_INCLUDED_GEOSPATIALRANGE_H\n+#define XAPIAND_INCLUDED_GEOSPATIALRANGE_H\n+\n+#include <xapian.h>\n+\n+#include <string.h>\n+#include <vector>\n+\n+#include \"htm.h\"\n+\n+\n+\/*\n+ * This class serializes a Cartesian vector.\n+ * i.e\n+ * StringList = {a, ..., b}\n+ * serialise = serialise_cartesian(a) + ... + serialise_cartesian(b)\n+ * symbol '+' means concatenate.\n+ * It is not necessary to save the size because it's SIZE_SERIALISE_CARTESIAN for all.\n+ *\/\n+class CartesianList : public std::vector<Cartesian> {\n+public:\n+\tvoid unserialise(const std::string & serialised);\n+\tstd::string serialise() const;\n+};\n+\n+\n+\/*\n+ * This class serializes a uInt64 vector.\n+ * i.e\n+ * StringList = {a, ..., b}\n+ * serialise = serialise_geo(a) + ... + serialise_geo(b)\n+ * symbol '+' means concatenate.\n+ * It is not necessary to save the size because it's SIZE_BYTES_ID for all.\n+ *\/\n+class uInt64List : public std::vector<uInt64> {\n+public:\n+\tvoid unserialise(const std::string & serialised);\n+\tstd::string serialise() const;\n+};\n+\n+\n+\/\/ New Match Decider for GeoSpatial value range.\n+class GeoSpatialRange : public Xapian::ValuePostingSource {\n+\t\/\/ Ranges for the search.\n+\tstd::vector<range_t> ranges;\n+\tCartesianList centroids;\n+\tXapian::valueno slot;\n+\tdouble angle;\n+\n+\t\/\/ Calculates the smallest angle between its centroids and search centroids.\n+\tvoid calc_angle(const std::string &serialised);\n+\t\/\/ Calculates if some their values is inside ranges.\n+\tbool insideRanges();\n+\n+\tpublic:\n+\t\t\/* Construct a new match decider which returns only documents with a\n+\t\t * some of their values inside of ranges.\n+\t\t *\n+\t\t * @param slot_ The value slot to read values from.\n+\t\t * @param ranges\n+\t\t*\/\n+\t\tGeoSpatialRange(Xapian::valueno slot_, const std::vector<range_t> &ranges_, const CartesianList ¢roids_);\n+\n+\t\tvoid next(double min_wt);\n+\t\tvoid skip_to(Xapian::docid min_docid, double min_wt);\n+\t\tbool check(Xapian::docid min_docid, double min_wt);\n+\t\tdouble get_weight() const;\n+\t\tGeoSpatialRange* clone() const;\n+\t\tstd::string name() const;\n+\t\tstd::string serialise() const;\n+\t\tGeoSpatialRange* unserialise_with_registry(const std::string &serialised, const Xapian::Registry &) const;\n+\t\tvoid init(const Xapian::Database &db_);\n+\t\tstd::string get_description() const;\n+\n+\t\t\/\/ Call this function for create a new Query based in ranges.\n+\t\tstatic Xapian::Query getQuery(Xapian::valueno slot_, const std::vector<range_t> &ranges_, const CartesianList ¢roids_);\n+};\n+\n+\n+#endif \/* XAPIAND_INCLUDED_GEOSPATIALRANGE_H *\/"} {"commit":"0a9a0c569a344ee2e1cd3fd34b2ef842d339ae0f","subject":"Add a debug info in framebuffers","message":"Add a debug info in framebuffers\n","repos":"ptitSeb\/glshim,ptitSeb\/glshim,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/gl4es","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gl\/framebuffers.c\n+++ src\/gl\/framebuffers.c\n@@ -1411,6 +1411,7 @@\n \n \/\/ DrawBuffers functions are faked for now. Will be plugg'd when ES3.0 support is implemented\n void gl4es_glDrawBuffers(GLsizei n, const GLenum *bufs) {\n+ DBG(printf(\"glDrawBuffers(%d, %p) [0]=%s\\n\", n, bufs, n?PrintEnum(bufs[0]):\"nil\");)\n if(n<0 || n>1) { \/\/ TODO: use hardext to handle max draw buffers\n errorShim(GL_INVALID_VALUE);\n return;\n"} {"commit":"2350810f4e28820afaad0174c01254e281f27b85","subject":"[Base] Add typename to sat_add\/sub","message":"[Base] Add typename to sat_add\/sub\n","repos":"sephiroth99\/xenia,sephiroth99\/xenia,sephiroth99\/xenia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/xenia\/base\/math.h\n+++ src\/xenia\/base\/math.h\n@@ -303,13 +303,14 @@\n uint16_t float_to_half(float value);\n float half_to_float(uint16_t value);\n \n-\/\/ http:\/\/locklessinc.com\/articles\/sat_arithmetic\/\n+\/\/ https:\/\/locklessinc.com\/articles\/sat_arithmetic\/\n template <typename T>\n inline T sat_add(T a, T b) {\n- using TU = std::make_unsigned<T>::type;\n+ using TU = typename std::make_unsigned<T>::type;\n TU result = TU(a) + TU(b);\n if (std::is_unsigned<T>::value) {\n- result |= TU(-static_cast<std::make_signed<T>::type>(result < TU(a)));\n+ result |=\n+ TU(-static_cast<typename std::make_signed<T>::type>(result < TU(a)));\n } else {\n TU overflowed =\n (TU(a) >> (sizeof(T) * 8 - 1)) + std::numeric_limits<T>::max();\n@@ -321,10 +322,11 @@\n }\n template <typename T>\n inline T sat_sub(T a, T b) {\n- using TU = std::make_unsigned<T>::type;\n+ using TU = typename std::make_unsigned<T>::type;\n TU result = TU(a) - TU(b);\n if (std::is_unsigned<T>::value) {\n- result &= TU(-static_cast<std::make_signed<T>::type>(result <= TU(a)));\n+ result &=\n+ TU(-static_cast<typename std::make_signed<T>::type>(result <= TU(a)));\n } else {\n TU overflowed =\n (TU(a) >> (sizeof(T) * 8 - 1)) + std::numeric_limits<T>::max();\n"} {"commit":"ba5f3c0540b93350f4c6f21b2bd740301ab843e8","subject":"Allow a Renderbuffer to be unbinded from an FBO (was disabled for some reason)","message":"Allow a Renderbuffer to be unbinded from an FBO (was disabled for some reason)\n","repos":"ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/gl4es,ptitSeb\/glshim,ptitSeb\/glshim,ptitSeb\/glshim,ptitSeb\/glshim","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gl\/framebuffers.c\n+++ src\/gl\/framebuffers.c\n@@ -539,12 +539,12 @@\n \t\t}\n }\n \n- if ((glstate->fbo.current_fb!=0) && (renderbuffer==0)) {\n+ \/*if ((glstate->fbo.current_fb!=0) && (renderbuffer==0)) {\n \/\/Hack, avoid unbind a renderbuffer on a framebuffer...\n \/\/ TODO, avoid binding an already binded RB\n noerrorShim();\n return;\n- }\n+ }*\/ \/\/ Let it do it now\n \n GLenum ntarget = ReadDraw_Push(target);\n \n"} {"commit":"b06138b464480987ee52811e93ca8cd29e65a34a","subject":"[GPU] Disable faceness for rectangles temporarily","message":"[GPU] Disable faceness for rectangles temporarily\n","repos":"sephiroth99\/xenia,sephiroth99\/xenia,sephiroth99\/xenia","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/xenia\/gpu\/xenos.h\n+++ src\/xenia\/gpu\/xenos.h\n@@ -82,7 +82,6 @@\n case PrimitiveType::kTriangleFan:\n case PrimitiveType::kTriangleStrip:\n case PrimitiveType::kTriangleWithWFlags:\n- case PrimitiveType::kRectangleList:\n case PrimitiveType::kQuadList:\n case PrimitiveType::kQuadStrip:\n case PrimitiveType::kPolygon:\n@@ -90,6 +89,10 @@\n default:\n break;\n }\n+ \/\/ TODO(Triang3l): Investigate how kRectangleList should be treated - possibly\n+ \/\/ actually drawn as two polygons on the console, however, the current\n+ \/\/ geometry shader doesn't care about the winding order - allowing backface\n+ \/\/ culling for rectangles currently breaks Gears of War 2.\n return false;\n }\n \n"} {"commit":"622b57766d42b7335efae4302bdaa25f9784fe3f","subject":"Made friends more explicit in btree, hoping to please GCC...","message":"Made friends more explicit in btree, hoping to please GCC...\n","repos":"ErikNovak\/data-visualization,blazs\/qminer,ErikNovak\/QVisual,blazs\/qminer,ErikNovak\/QVisual,mkarlovc\/qminer,ErikNovak\/edsa-server,blazs\/qminer,ErikNovak\/data-visualization,ErikNovak\/edsa-server,mkarlovc\/qminer,blazs\/qminer,blazs\/qminer,blazs\/qminer,mkarlovc\/qminer,mkarlovc\/qminer,mkarlovc\/qminer,mkarlovc\/qminer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/glib\/mine\/btree.h\n+++ src\/glib\/mine\/btree.h\n@@ -898,7 +898,7 @@\n \t{\n \tprivate:\n \t\tTCRef CRef;\n-\t\tfriend PNodeWrapper;\n+\t\tfriend class TPt<TNodeWrapper>;\n \tpublic:\n \t\tTNode node;\n \t\tTNodeWrapper() { }\n@@ -986,7 +986,7 @@\n \t{\n \tprivate:\n \t\tTCRef CRef;\n-\t\tfriend PNodeWrapper;\n+\t\tfriend class TPt<TNodeWrapper>;\n \tpublic:\n \t\tTNodeId nodeId;\n \t\tint checkedOut;\n"} {"commit":"4297413656dd932a6bc2b56e16a2633ae8e712cd","subject":"glx: use ErrorMessageF","message":"glx: use ErrorMessageF\n","repos":"mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,benaadams\/glsl-optimizer,adobe\/glsl2agal,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/glx\/x11\/dri_glx.c\n+++ src\/glx\/x11\/dri_glx.c\n@@ -302,7 +302,7 @@\n framebuffer.dev_priv = NULL;\n \n if (!XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {\n-\tfprintf(stderr, \"libGL error: XF86DRIOpenConnection failed\\n\");\n+\tErrorMessageF(\"XF86DRIOpenConnection failed\\n\");\n \tgoto handle_error;\n }\n \n@@ -311,13 +311,12 @@\n Xfree(BusID); \/* No longer needed *\/\n \n if (fd < 0) {\n-\tfprintf(stderr, \"libGL error: drmOpenOnce failed (%s)\\n\",\n-\t\tstrerror(-fd));\n+\tErrorMessageF(\"drmOpenOnce failed (%s)\\n\", strerror(-fd));\n \tgoto handle_error;\n }\n \n if (drmGetMagic(fd, &magic)) {\n-\tfprintf(stderr, \"libGL error: drmGetMagic failed\\n\");\n+\tErrorMessageF(\"drmGetMagic failed\\n\");\n \tgoto handle_error;\n }\n \n@@ -335,7 +334,7 @@\n }\n \n if (newlyopened && !XF86DRIAuthConnection(dpy, scrn, magic)) {\n-\tfprintf(stderr, \"libGL error: XF86DRIAuthConnection failed\\n\");\n+\tErrorMessageF(\"XF86DRIAuthConnection failed\\n\");\n \tgoto handle_error;\n }\n \n@@ -347,7 +346,7 @@\n \t\t\t\t &ddx_version.minor,\n \t\t\t\t &ddx_version.patch,\n \t\t\t\t &driverName)) {\n-\tfprintf(stderr, \"libGL error: XF86DRIGetClientDriverName failed\\n\");\n+\tErrorMessageF(\"XF86DRIGetClientDriverName failed\\n\");\n \tgoto handle_error;\n }\n \n@@ -362,7 +361,7 @@\n if (!XF86DRIGetDeviceInfo(dpy, scrn, &hFB, &junk,\n \t\t\t &framebuffer.size, &framebuffer.stride,\n \t\t\t &framebuffer.dev_priv_size, &framebuffer.dev_priv)) {\n-\tfprintf(stderr, \"libGL error: XF86DRIGetDeviceInfo failed\");\n+\tErrorMessageF(\"XF86DRIGetDeviceInfo failed\");\n \tgoto handle_error;\n }\n \n@@ -373,8 +372,7 @@\n status = drmMap(fd, hFB, framebuffer.size, \n \t\t (drmAddressPtr)&framebuffer.base);\n if (status != 0) {\n-\tfprintf(stderr, \"libGL error: drmMap of framebuffer failed (%s)\",\n-\t\tstrerror(-status));\n+\tErrorMessageF(\"drmMap of framebuffer failed (%s)\", strerror(-status));\n \tgoto handle_error;\n }\n \n@@ -383,8 +381,7 @@\n *\/\n status = drmMap(fd, hSAREA, SAREA_MAX, &pSAREA);\n if (status != 0) {\n-\tfprintf(stderr, \"libGL error: drmMap of SAREA failed (%s)\",\n-\t\tstrerror(-status));\n+\tErrorMessageF(\"drmMap of SAREA failed (%s)\", strerror(-status));\n \tgoto handle_error;\n }\n \n@@ -400,7 +397,7 @@\n \t\t\t\t\t psc);\n \n if (psp == NULL) {\n-\tfprintf(stderr, \"libGL error: Calling driver entry point failed\");\n+\tErrorMessageF(\"Calling driver entry point failed\");\n \tgoto handle_error;\n }\n \n@@ -424,7 +421,7 @@\n \n XF86DRICloseConnection(dpy, scrn);\n \n- fprintf(stderr, \"libGL error: reverting to (slow) indirect rendering\\n\");\n+ ErrorMessageF(\"reverting to indirect rendering\\n\");\n \n return NULL;\n }\n"} {"commit":"1f99c3a5e651274cfd640c2304f065901a2f1be1","subject":"OTHER: Fixed a memory leak in prepend_key_string().","message":"OTHER: Fixed a memory leak in prepend_key_string().\n\nxmms_object_cmd_value_str_new() duplicates the string argument itself,\nso the caller doesn't have to.\n","repos":"krad-radio\/xmms2-krad,xmms2\/xmms2-stable,dreamerc\/xmms2,chrippa\/xmms2,dreamerc\/xmms2,oneman\/xmms2-oneman-old,theefer\/xmms2,dreamerc\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman-old,six600110\/xmms2,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,theefer\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2,theefer\/xmms2,chrippa\/xmms2,theefer\/xmms2,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman-old,xmms2\/xmms2-stable,oneman\/xmms2-oneman,krad-radio\/xmms2-krad,theeternalsw0rd\/xmms2,six600110\/xmms2,dreamerc\/xmms2,oneman\/xmms2-oneman,six600110\/xmms2,oneman\/xmms2-oneman,theefer\/xmms2,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,theeternalsw0rd\/xmms2,six600110\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,chrippa\/xmms2,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman,theeternalsw0rd\/xmms2,xmms2\/xmms2-stable,oneman\/xmms2-oneman,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,theefer\/xmms2,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,chrippa\/xmms2,dreamerc\/xmms2,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,xmms2\/xmms2-stable,xmms2\/xmms2-stable","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/xmms\/collection.c\n+++ src\/xmms\/collection.c\n@@ -1435,7 +1435,7 @@\n {\n \txmms_object_cmd_value_t *val;\n \tGList **list = (GList**)udata;\n-\tval = xmms_object_cmd_value_str_new (g_strdup (key));\n+\tval = xmms_object_cmd_value_str_new (key);\n \t*list = g_list_prepend (*list, val);\n }\n \n"} {"commit":"162de5e42c9f39fe4024ad5fe2d75ef5303da91b","subject":"Update Board_Defs.h","message":"Update Board_Defs.h\n\nTo satisfy our board variant, we broke out pins 11 and 12 for serial1! Thanks!","repos":"ricklon\/chipKIT-core,pontech\/chipKIT-core,EmbeddedMan\/chipKIT-core,adamwolf\/chipKIT-core,pontech\/chipKIT-core,pontech\/chipKIT-core,EmbeddedMan\/chipKIT-core,ricklon\/chipKIT-core,ricklon\/chipKIT-core,chipKIT32\/chipkit-core,ricklon\/chipKIT-core,adamwolf\/chipKIT-core,ricklon\/chipKIT-core,adamwolf\/chipKIT-core,pontech\/chipKIT-core,adamwolf\/chipKIT-core,majenkotech\/chipKIT-core,adamwolf\/chipKIT-core,adamwolf\/chipKIT-core,pontech\/chipKIT-core,majenkotech\/chipKIT-core,chipKIT32\/chipkit-core,ricklon\/chipKIT-core,EmbeddedMan\/chipKIT-core,pontech\/chipKIT-core,EmbeddedMan\/chipKIT-core,EmbeddedMan\/chipKIT-core,chipKIT32\/chipkit-core,chipKIT32\/chipkit-core,EmbeddedMan\/chipKIT-core,EmbeddedMan\/chipKIT-core,pontech\/chipKIT-core,majenkotech\/chipKIT-core,majenkotech\/chipKIT-core,majenkotech\/chipKIT-core,majenkotech\/chipKIT-core,chipKIT32\/chipkit-core,majenkotech\/chipKIT-core,adamwolf\/chipKIT-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- pic32\/variants\/openbci\/Board_Defs.h\n+++ pic32\/variants\/openbci\/Board_Defs.h\n@@ -287,7 +287,7 @@\n \/*\t\t\t\t\tSerial Port Declarations\t\t\t\t\t*\/\r\n \/* ------------------------------------------------------------ *\/\r\n \r\n-\/* Serial port 0 uses UART1 for the serial monitor\r\n+\/* Serial port 0 uses UART1 \u0096 for the serial monitor\r\n *\/\r\n #define _SER0_BASE _UART1_BASE_ADDRESS\r\n #define _SER0_IRQ _UART1_ERR_IRQ\r\n@@ -310,9 +310,9 @@\n #define _SER1_IPL _UART2_IPL_IPC\r\n #define _SER1_SPL _UART2_SPL_IPC\r\n #define _SER1_TX_OUT PPS_OUT_U2TX \/\/ RPB14R = U2TX = 2\r\n-#define _SER1_TX_PIN 7 \/\/ RB14 CVREF\/AN10\/C3INB\/RPB14\/VBUSON\/SCK1\/CTED5\/RB14\r\n+#define _SER1_TX_PIN 11 \/\/ RB14 CVREF\/AN10\/C3INB\/RPB14\/VBUSON\/SCK1\/CTED5\/RB14\r\n #define _SER1_RX_IN PPS_IN_U2RX \/\/ U2RXR = RPA1 = 0\r\n-#define _SER1_RX_PIN 10 \/\/ RA1 PGEC3\/VREF-\/CVREF-\/AN1\/RPA1\/CTED2\/PMD6\/RA1 \r\n+#define _SER1_RX_PIN 12 \/\/ RA1 PGEC3\/VREF-\/CVREF-\/AN1\/RPA1\/CTED2\/PMD6\/RA1 \r\n \r\n \r\n \/* ------------------------------------------------------------ *\/\r\n"} {"commit":"dcfec55182d7afa2e2634cb0852ad218b42ee446","subject":"GTDiffLine nullability","message":"GTDiffLine nullability\n","repos":"nerdishbynature\/objective-git,slavikus\/objective-git,0x4a616e\/objective-git,phatblat\/objective-git,nerdishbynature\/objective-git,pietbrauer\/objective-git,misterfifths\/objective-git,dleehr\/objective-git,misterfifths\/objective-git,pietbrauer\/objective-git,TOMalley104\/objective-git,0x4a616e\/objective-git,dleehr\/objective-git,tiennou\/objective-git,libgit2\/objective-git,javiertoledo\/objective-git,libgit2\/objective-git,javiertoledo\/objective-git,slavikus\/objective-git,TOMalley104\/objective-git,tiennou\/objective-git,0x4a616e\/objective-git,dleehr\/objective-git,libgit2\/objective-git,Acidburn0zzz\/objective-git,blackpixel\/objective-git,phatblat\/objective-git,misterfifths\/objective-git,javiertoledo\/objective-git,Acidburn0zzz\/objective-git,pietbrauer\/objective-git,nerdishbynature\/objective-git,blackpixel\/objective-git,libgit2\/objective-git,Acidburn0zzz\/objective-git,dleehr\/objective-git,pietbrauer\/objective-git,alehed\/objective-git,blackpixel\/objective-git,TOMalley104\/objective-git,tiennou\/objective-git,javiertoledo\/objective-git,TOMalley104\/objective-git,Acidburn0zzz\/objective-git,phatblat\/objective-git,alehed\/objective-git,misterfifths\/objective-git,blackpixel\/objective-git,slavikus\/objective-git,alehed\/objective-git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ObjectiveGit\/GTDiffLine.h\n+++ ObjectiveGit\/GTDiffLine.h\n@@ -20,6 +20,8 @@\n \tGTDiffLineOriginAddEOFNewLine = GIT_DIFF_LINE_ADD_EOFNL,\n \tGTDiffLineOriginDeleteEOFNewLine = GIT_DIFF_LINE_DEL_EOFNL,\n };\n+\n+NS_ASSUME_NONNULL_BEGIN\n \n \/\/\/ Represents an individual line in a diff hunk.\n @interface GTDiffLine : NSObject\n@@ -44,6 +46,12 @@\n @property (nonatomic, readonly) NSInteger lineCount;\n \n \/\/\/ Designated initialiser.\n-- (instancetype)initWithGitLine:(const git_diff_line *)line NS_DESIGNATED_INITIALIZER;\n+\/\/\/\n+\/\/\/ line - The diff line to wrap. May not be NULL.\n+\/\/\/\n+\/\/\/ Returns a diff line, or nil if an error occurs.\n+- (nullable instancetype)initWithGitLine:(const git_diff_line *)line NS_DESIGNATED_INITIALIZER;\n \n @end\n+\n+NS_ASSUME_NONNULL_END\n"} {"commit":"73ca3e3a6ce34a05aa68ed663967781a21f1cd84","subject":"Added possibility to customize indicator color","message":"Added possibility to customize indicator color","repos":"bronx\/RKCarbonKit,kosicki123\/RKCarbonKit,kosicki123\/RKNewCarbonKit","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- CarbonKit\/CarbonTabSwipeNavigation.h\n+++ CarbonKit\/CarbonTabSwipeNavigation.h\n@@ -92,6 +92,12 @@\n - (void)setNormalColor:(UIColor *)color;\n \n \/**\n+ *\tUIColor for indicator\n+ *\t@param color UIColor : color of indicator\n+ *\/\n+- (void)setIndicatorColor:(UIColor *)color;\n+\n+\/**\n *\tUIFont and UIColor for tab in normal state\n *\t@param color UIColor : color of normal state\n *\t@param font UIFont : font of normal state\n@@ -116,10 +122,4 @@\n *\/\n - (void)addShadow;\n \n-\/**\n- * Set extra space on the left and the right of tab title\n- * @param extra CGFloat : left and right extra space\n- *\/\n-- (void)setExtraSpace:(CGFloat)extra;\n-\n @end\n"} {"commit":"32d3bde261f461807d42d419ddba44b45798436b","subject":"Use inline functions to lookup and remove objects","message":"Use inline functions to lookup and remove objects\n","repos":"BeamNG\/openal-soft,aaronmjacobs\/openal-soft,aaronmjacobs\/openal-soft,Wemersive\/openal-soft,franklixuefei\/openal-soft,arkana-fts\/openal-soft,mmozeiko\/OpenAL-Soft,BeamNG\/openal-soft,mmozeiko\/OpenAL-Soft,alexxvk\/openal-soft,irungentoo\/openal-soft-tox,arkana-fts\/openal-soft,alexxvk\/openal-soft,irungentoo\/openal-soft-tox,franklixuefei\/openal-soft,Wemersive\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- OpenAL32\/Include\/alMain.h\n+++ OpenAL32\/Include\/alMain.h\n@@ -711,12 +711,19 @@\n #define INVALID_OFFSET (~0u)\n \n \n-#define LookupBuffer(m, k) ((struct ALbuffer*)LookupUIntMapKey(&(m)->BufferMap, (k)))\n-#define LookupEffect(m, k) ((struct ALeffect*)LookupUIntMapKey(&(m)->EffectMap, (k)))\n-#define LookupFilter(m, k) ((struct ALfilter*)LookupUIntMapKey(&(m)->FilterMap, (k)))\n-#define RemoveBuffer(m, k) ((struct ALbuffer*)RemoveUIntMapKey(&(m)->BufferMap, (k)))\n-#define RemoveEffect(m, k) ((struct ALeffect*)RemoveUIntMapKey(&(m)->EffectMap, (k)))\n-#define RemoveFilter(m, k) ((struct ALfilter*)RemoveUIntMapKey(&(m)->FilterMap, (k)))\n+static inline struct ALbuffer *LookupBuffer(ALCdevice *device, ALuint id)\n+{ return (struct ALbuffer*)LookupUIntMapKey(&device->BufferMap, id); }\n+static inline struct ALeffect *LookupEffect(ALCdevice *device, ALuint id)\n+{ return (struct ALeffect*)LookupUIntMapKey(&device->EffectMap, id); }\n+static inline struct ALfilter *LookupFilter(ALCdevice *device, ALuint id)\n+{ return (struct ALfilter*)LookupUIntMapKey(&device->FilterMap, id); }\n+\n+static inline struct ALbuffer *RemoveBuffer(ALCdevice *device, ALuint id)\n+{ return (struct ALbuffer*)RemoveUIntMapKey(&device->BufferMap, id); }\n+static inline struct ALeffect *RemoveEffect(ALCdevice *device, ALuint id)\n+{ return (struct ALeffect*)RemoveUIntMapKey(&device->EffectMap, id); }\n+static inline struct ALfilter *RemoveFilter(ALCdevice *device, ALuint id)\n+{ return (struct ALfilter*)RemoveUIntMapKey(&device->FilterMap, id); }\n \n \n struct ALCcontext_struct\n@@ -754,10 +761,15 @@\n ALCcontext *volatile next;\n };\n \n-#define LookupSource(m, k) ((struct ALsource*)LookupUIntMapKey(&(m)->SourceMap, (k)))\n-#define LookupEffectSlot(m, k) ((struct ALeffectslot*)LookupUIntMapKey(&(m)->EffectSlotMap, (k)))\n-#define RemoveSource(m, k) ((struct ALsource*)RemoveUIntMapKey(&(m)->SourceMap, (k)))\n-#define RemoveEffectSlot(m, k) ((struct ALeffectslot*)RemoveUIntMapKey(&(m)->EffectSlotMap, (k)))\n+static inline struct ALsource *LookupSource(ALCcontext *context, ALuint id)\n+{ return (struct ALsource*)LookupUIntMapKey(&context->SourceMap, id); }\n+static inline struct ALeffectslot *LookupEffectSlot(ALCcontext *context, ALuint id)\n+{ return (struct ALeffectslot*)LookupUIntMapKey(&context->EffectSlotMap, id); }\n+\n+static inline struct ALsource *RemoveSource(ALCcontext *context, ALuint id)\n+{ return (struct ALsource*)RemoveUIntMapKey(&context->SourceMap, id); }\n+static inline struct ALeffectslot *RemoveEffectSlot(ALCcontext *context, ALuint id)\n+{ return (struct ALeffectslot*)RemoveUIntMapKey(&context->EffectSlotMap, id); }\n \n \n ALCcontext *GetContextRef(void);\n"} {"commit":"f7d7afb7c13b1b99b932b776f127d2ff5048b7f6","subject":"Remove an unused macro","message":"Remove an unused macro\n","repos":"aaronmjacobs\/openal-soft,alexxvk\/openal-soft,irungentoo\/openal-soft-tox,arkana-fts\/openal-soft,Wemersive\/openal-soft,Wemersive\/openal-soft,BeamNG\/openal-soft,irungentoo\/openal-soft-tox,BeamNG\/openal-soft,aaronmjacobs\/openal-soft,arkana-fts\/openal-soft,alexxvk\/openal-soft","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- OpenAL32\/Include\/alMain.h\n+++ OpenAL32\/Include\/alMain.h\n@@ -744,9 +744,6 @@\n \/\/ Specifies if the device is currently running\n #define DEVICE_RUNNING (1<<31)\n \n-\/* Invalid channel offset *\/\n-#define INVALID_OFFSET (~0u)\n-\n \n \/* Nanosecond resolution for the device clock time. *\/\n #define DEVICE_CLOCK_RES U64(1000000000)\n"} {"commit":"37f6b9ab7a24ace68167b68bfc3bce746a8abf7a","subject":"fix build test=develop","message":"fix build test=develop\n","repos":"chengduoZH\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,luotao1\/Paddle,luotao1\/Paddle,baidu\/Paddle,tensor-tang\/Paddle,PaddlePaddle\/Paddle,tensor-tang\/Paddle,chengduoZH\/Paddle,baidu\/Paddle,chengduoZH\/Paddle,luotao1\/Paddle,tensor-tang\/Paddle,chengduoZH\/Paddle,tensor-tang\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,baidu\/Paddle,luotao1\/Paddle,baidu\/Paddle,PaddlePaddle\/Paddle,tensor-tang\/Paddle,baidu\/Paddle,chengduoZH\/Paddle,luotao1\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/fluid\/framework\/details\/multi_devices_graph_pass.h\n+++ paddle\/fluid\/framework\/details\/multi_devices_graph_pass.h\n@@ -54,8 +54,8 @@\n \n bool UseGPU() const;\n \n- bool NeedCollectiveForGrad(const std::string &grad_name,\n- std::vector<ir::Node *> ops) const;\n+ virtual bool NeedCollectiveForGrad(const std::string &grad_name,\n+ std::vector<ir::Node *> ops) const;\n \n bool IsScaleLossOp(ir::Node *node) const;\n \n@@ -117,7 +117,10 @@\n void InsertCollectiveOp(ir::Graph *result, const std::string &p_name,\n const std::string &g_name) const override {}\n \n- bool NeedCollectiveOps() const override { return false; }\n+ bool NeedCollectiveForGrad(const std::string &grad_name,\n+ std::vector<ir::Node *> ops) const {\n+ return false;\n+ }\n \n bool DealWithSpecialOp(ir::Graph *result, ir::Node *node) const override {\n if (node->Op()->Type() == \"recv\") {\n"} {"commit":"3f4583da21aa504b2dc5c7cef03cae8d0f97e92f","subject":"Pointer.","message":"Pointer.\n","repos":"princeofdarkness76\/sial.org-scripts,thrig\/scripts,princeofdarkness76\/sial.org-scripts,princeofdarkness76\/sial.org-scripts,thrig\/scripts,princeofdarkness76\/sial.org-scripts,thrig\/scripts,princeofdarkness76\/sial.org-scripts,thrig\/scripts,thrig\/scripts,thrig\/scripts","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- c\/fillerup\/fillerup.c\n+++ c\/fillerup\/fillerup.c\n@@ -5,7 +5,8 @@\n * partition was root or not) yet du(1) or find(1) only show much less\n * than available space consumed, or at least when one needs to recreate\n * and test such a condition, as opposed to learning it live in\n- * production like I did.\n+ * production like I did (in particular, via the rm(1) of the file that\n+ * is still being written to).\n *\n * fillerup [-h] [-q] filename\n *\n"} {"commit":"5ea608c79b8d14c65616d4e5e4b53f7b6ba1ada4","subject":"add vertical tab as separator","message":"add vertical tab as separator\n","repos":"dijkstracula\/libinjection,dijkstracula\/libinjection,fengjian\/libinjection,fengjian\/libinjection,ppliu1979\/libinjection,ppliu1979\/libinjection,ppliu1979\/libinjection,ppliu1979\/libinjection,dijkstracula\/libinjection,ppliu1979\/libinjection,dijkstracula\/libinjection,ppliu1979\/libinjection,dijkstracula\/libinjection,fengjian\/libinjection,dijkstracula\/libinjection,fengjian\/libinjection,fengjian\/libinjection,fengjian\/libinjection,fengjian\/libinjection","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- c\/libinjection_sqli.c\n+++ c\/libinjection_sqli.c\n@@ -702,7 +702,7 @@\n char ch;\n size_t slen =\n strlencspn(cs + pos, sf->slen - pos,\n- \" <>:\\\\?=@!#~+-*\/&|^%(),';\\r\\n\\t\\\"\\013\");\n+ \" <>:\\\\?=@!#~+-*\/&|^%(),';\\r\\n\\t\\\"\\013\\014\");\n \n st_assign(sf->current, 'n', cs + pos, slen);\n \n@@ -799,7 +799,7 @@\n }\n \n xlen = strlencspn(cs + pos1, slen - pos1,\n- \" <>:\\\\?=@!#~+-*\/&|^%(),';\\r\\n\\t\\\"\\013\");\n+ \" <>:\\\\?=@!#~+-*\/&|^%(),';\\r\\n\\t\\\"\\013\\014\");\n \/\/ \"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.$\");\n if (xlen == 0) {\n st_assign(sf->current, 'v', cs + pos, (pos1 - pos));\n"} {"commit":"03f932f365b8ed7f47866d72be74448de2fafc5f","subject":"remove dead code, improve comments, add sanity-checks and defensive programming","message":"remove dead code, improve comments, add sanity-checks and defensive programming\n","repos":"rambo\/nfc_lock,jautero\/nfc_lock,jautero\/nfc_lock,rambo\/nfc_lock,jautero\/nfc_lock,rambo\/nfc_lock,jautero\/nfc_lock,rambo\/nfc_lock","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- c\/read_personalized.c\n+++ c\/read_personalized.c\n@@ -279,10 +279,16 @@\n while(!s_interrupted)\n {\n tags = freefare_get_tags(device);\n- if ( !tags\n+ if ( !tags \/\/ allocation failed\n+ \/\/ The tag array ends with null element, if first one is null then array is empty\n || !tags[0])\n {\n- freefare_free_tags(tags);\n+ if (tags)\n+ {\n+ \/\/ Free the empty array so we don't leak memory\n+ freefare_free_tags(tags);\n+ tags = NULL;\n+ }\n \/\/ Limit polling speed to 10Hz\n usleep(100 * 1000);\n \/\/printf(\"Polling ...\\n\");\n@@ -306,7 +312,7 @@\n free (tag_uid_str);\n \n \n- \/\/ Initialize \n+ \/\/ pthreads initialization stuff\n struct timespec abs_time;\n pthread_t tid;\n pthread_mutex_lock(&tag_processing);\n@@ -315,6 +321,7 @@\n clock_gettime(CLOCK_REALTIME, &abs_time);\n abs_time.tv_sec += 1;\n \n+ \/\/ Use this struct to pass data between thread and main\n struct thread_data tagdata;\n tagdata.tag = tags[i];\n \n@@ -325,9 +332,6 @@\n continue;\n }\n \n- \/* pthread_cond_timedwait can return spuriously: this should\n- * be in a loop for production code\n- *\/\n err = pthread_cond_timedwait(&tag_done, &tag_processing, &abs_time);\n if (err == ETIMEDOUT)\n {\n@@ -354,23 +358,9 @@\n {\n valid_found = true;\n }\n-\n- \/*\n- bool tag_valid = false;\n- \/\/ TODO: Timeout this so the program does not hang if tag leaves at inopportune time, try http:\/\/stackoverflow.com\/questions\/7738546\/how-to-set-a-timeout-for-a-function-in-c\n- err = handle_tag(tags[i], &tag_valid);\n- if (err != 0)\n- {\n- tag_valid = false;\n- continue;\n- }\n- if (tag_valid)\n- {\n- valid_found = true;\n- }\n- *\/\n }\n freefare_free_tags(tags);\n+ tags = NULL;\n if (valid_found)\n {\n printf(\"OK: valid tag found\\n\");\n"} {"commit":"876abc3b4fe9c345b51b65e7450e4ae593cfba96","subject":"add queue stats functionality","message":"add queue stats functionality\n","repos":"floodlight\/ivs,floodlight\/ivs,vezril\/ivs,vezril\/ivs,floodlight\/ivs,vezril\/ivs","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- modules\/OVSDriver\/module\/src\/vport.c\n+++ modules\/OVSDriver\/module\/src\/vport.c\n@@ -26,6 +26,7 @@\n #include <errno.h>\n #include <netlink\/cache.h>\n #include <netlink\/route\/link.h>\n+#include <netlink\/route\/qdisc.h>\n \n #ifndef _LINUX_IF_H\n \/* Some versions of libnetlink include linux\/if.h, which conflicts with net\/if.h. *\/\n@@ -701,7 +702,92 @@\n return INDIGO_ERROR_NONE;\n }\n \n-\/* Currently returns an empty reply *\/\n+\/*\n+ * Return the minor version of parent class as the queue_id\n+ * For Root qdisc return TC_H_ROOT\n+ *\/\n+static uint32_t\n+qdisc_get_queue_id(struct nl_object *qdisc)\n+{\n+ uint32_t parent = rtnl_tc_get_parent(TC_CAST(qdisc));\n+ if (parent == TC_H_ROOT) {\n+ return TC_H_ROOT;\n+ }\n+\n+ uint32_t minor = TC_H_MIN(parent);\n+ if (minor > 0) {\n+ --minor;\n+ }\n+\n+ return minor;\n+}\n+\n+static void\n+queue_stats_fill(of_queue_stats_entry_t *list, struct nl_object *qdisc,\n+ of_port_no_t port_no, uint32_t queue_id)\n+{\n+ of_queue_stats_entry_t entry[1];\n+ of_queue_stats_entry_init(entry, list->version, -1, 1);\n+ if (of_list_queue_stats_entry_append_bind(list, entry) < 0) {\n+ AIM_DIE(\"unexpected error appending to queue_stats\");\n+ }\n+\n+ of_queue_stats_entry_port_no_set(entry, port_no);\n+ of_queue_stats_entry_queue_id_set(entry, queue_id);\n+\n+ of_queue_stats_entry_tx_packets_set(entry, rtnl_tc_get_stat(TC_CAST(qdisc), RTNL_TC_PACKETS));\n+ of_queue_stats_entry_tx_bytes_set(entry, rtnl_tc_get_stat(TC_CAST(qdisc), RTNL_TC_BYTES));\n+ of_queue_stats_entry_tx_errors_set(entry, rtnl_tc_get_stat(TC_CAST(qdisc), RTNL_TC_DROPS));\n+}\n+\n+static indigo_error_t\n+queue_stats_get(of_port_no_t port_no, uint32_t req_queue_id,\n+ struct nl_cache *all_qdiscs, of_queue_stats_entry_t *list)\n+{\n+ struct ind_ovs_port *port = ind_ovs_port_lookup(port_no);\n+ if (port == NULL) {\n+ return INDIGO_ERROR_NONE;\n+ }\n+\n+ \/* There are no queue's for local port *\/\n+ if (port_no == OVSP_LOCAL) {\n+ return INDIGO_ERROR_NONE;\n+ }\n+\n+ \/* Search qdisc cache by interface index *\/\n+ struct rtnl_link *link = rtnl_link_get_by_name(link_cache, port->ifname);\n+ if (link == NULL) {\n+ AIM_DIE(\"failed to retrieve link\");\n+ }\n+\n+ int ifindex = rtnl_link_get_ifindex(link);\n+ rtnl_link_put(link);\n+ if (ifindex == 0) {\n+ AIM_LOG_ERROR(\"failed to get ifindex for %s\", port->ifname);\n+ return INDIGO_ERROR_UNKNOWN;\n+ }\n+\n+ bool dump_all = req_queue_id == OF_QUEUE_ALL_BY_VERSION(queue_id);\n+\n+ struct nl_object *qdisc;\n+ for (qdisc = nl_cache_get_first(all_qdiscs); qdisc; qdisc = nl_cache_get_next(qdisc)) {\n+ if (rtnl_tc_get_ifindex(TC_CAST(qdisc)) == ifindex) {\n+ uint32_t queue_id = qdisc_get_queue_id(qdisc);\n+ \/* Skip the root qdisc *\/\n+ if (queue_id == TC_H_ROOT) continue;\n+\n+ if (dump_all) {\n+ queue_stats_fill(list, qdisc, port_no, queue_id);\n+ } else if (req_queue_id == queue_id) {\n+ queue_stats_fill(list, qdisc, port_no, queue_id);\n+ break;\n+ }\n+ }\n+ }\n+\n+ return INDIGO_ERROR_NONE;\n+}\n+\n indigo_error_t\n indigo_port_queue_stats_get(\n of_queue_stats_request_t *queue_stats_request,\n@@ -716,6 +802,56 @@\n of_queue_stats_request_xid_get(queue_stats_request, &xid);\n of_queue_stats_reply_xid_set(queue_stats_reply, xid);\n \n+ int rv;\n+ struct nl_sock *sk = nl_socket_alloc();\n+ if (sk == NULL) {\n+ AIM_DIE(\"failed to allocate netlink socket\");\n+ }\n+\n+ if ((rv = nl_connect(sk, NETLINK_ROUTE)) < 0) {\n+ AIM_DIE(\"failed to connect netlink socket: %s\", nl_geterror(rv));\n+ }\n+\n+ struct nl_cache *all_qdiscs;\n+ if (rtnl_qdisc_alloc_cache(sk, &all_qdiscs) < 0) {\n+ AIM_DIE(\"error while retrieving qdisc cfg\");\n+ }\n+\n+ \/* Check if the cache is empty *\/\n+ if (nl_cache_is_empty(all_qdiscs)) {\n+ goto done;\n+ }\n+\n+ of_queue_stats_entry_t list;\n+ of_queue_stats_reply_entries_bind(queue_stats_reply, &list);\n+\n+ of_port_no_t req_of_port_num;\n+ of_queue_stats_request_port_no_get(queue_stats_request, &req_of_port_num);\n+ bool dump_all = req_of_port_num == OF_PORT_DEST_ALL_BY_VERSION(queue_stats_request->version);\n+\n+ uint32_t req_queue_id;\n+ of_queue_stats_request_queue_id_get(queue_stats_request, &req_queue_id);\n+\n+ indigo_error_t err = INDIGO_ERROR_NONE;\n+ if (dump_all) {\n+ int i;\n+ for (i = 0; i < IND_OVS_MAX_PORTS; i++) {\n+ if (ind_ovs_ports[i]) {\n+ err = queue_stats_get(i, req_queue_id, all_qdiscs, &list);\n+ }\n+ }\n+ } else {\n+ err = queue_stats_get(req_of_port_num, req_queue_id, all_qdiscs, &list);\n+ }\n+\n+ if (err != INDIGO_ERROR_NONE) {\n+ of_queue_stats_reply_delete(queue_stats_reply);\n+ queue_stats_reply = NULL;\n+ }\n+\n+done:\n+ nl_cache_free(all_qdiscs);\n+ nl_socket_free(sk);\n *queue_stats_reply_ptr = queue_stats_reply;\n return INDIGO_ERROR_NONE;\n }\n"} {"commit":"caf6e9d2dd072299fa7779446f0dcc31e1f80c2d","subject":"Have configure --without-spinlocks actually not use spinlock code, even if supported by the cpu.","message":"Have configure --without-spinlocks actually not use spinlock code, even\nif supported by the cpu.\n","repos":"cjcjameson\/gpdb,snaga\/postgres-xl,yazun\/postgres-xl,rubikloud\/gpdb,zaksoup\/gpdb,zaksoup\/gpdb,techdragon\/Postgres-XL,foyzur\/gpdb,postmind-net\/postgres-xl,janebeckman\/gpdb,rvs\/gpdb,jmcatamney\/gpdb,Postgres-XL\/Postgres-XL,adam8157\/gpdb,yuanzhao\/gpdb,yazun\/postgres-xl,lisakowen\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,xuegang\/gpdb,tangp3\/gpdb,lintzc\/gpdb,Postgres-XL\/Postgres-XL,ovr\/postgres-xl,randomtask1155\/gpdb,foyzur\/gpdb,Chibin\/gpdb,greenplum-db\/gpdb,edespino\/gpdb,oberstet\/postgres-xl,cjcjameson\/gpdb,snaga\/postgres-xl,kaknikhil\/gpdb,royc1\/gpdb,rvs\/gpdb,edespino\/gpdb,0x0FFF\/gpdb,greenplum-db\/gpdb,ovr\/postgres-xl,arcivanov\/postgres-xl,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,kmjungersen\/PostgresXL,cjcjameson\/gpdb,tangp3\/gpdb,royc1\/gpdb,ahachete\/gpdb,atris\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,yuanzhao\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,atris\/gpdb,xinzweb\/gpdb,kaknikhil\/gpdb,Chibin\/gpdb,xuegang\/gpdb,50wu\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,ovr\/postgres-xl,50wu\/gpdb,ashwinstar\/gpdb,ahachete\/gpdb,ahachete\/gpdb,lpetrov-pivotal\/gpdb,rvs\/gpdb,lpetrov-pivotal\/gpdb,ahachete\/gpdb,Chibin\/gpdb,snaga\/postgres-xl,CraigHarris\/gpdb,foyzur\/gpdb,xuegang\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,zeroae\/postgres-xl,ashwinstar\/gpdb,xinzweb\/gpdb,lpetrov-pivotal\/gpdb,pavanvd\/postgres-xl,postmind-net\/postgres-xl,ashwinstar\/gpdb,chrishajas\/gpdb,randomtask1155\/gpdb,Postgres-XL\/Postgres-XL,zaksoup\/gpdb,atris\/gpdb,ahachete\/gpdb,kaknikhil\/gpdb,arcivanov\/postgres-xl,lintzc\/gpdb,xinzweb\/gpdb,randomtask1155\/gpdb,xuegang\/gpdb,atris\/gpdb,janebeckman\/gpdb,edespino\/gpdb,adam8157\/gpdb,tpostgres-projects\/tPostgres,cjcjameson\/gpdb,lintzc\/gpdb,0x0FFF\/gpdb,edespino\/gpdb,yuanzhao\/gpdb,jmcatamney\/gpdb,xinzweb\/gpdb,tangp3\/gpdb,yuanzhao\/gpdb,yazun\/postgres-xl,janebeckman\/gpdb,kmjungersen\/PostgresXL,jmcatamney\/gpdb,Quikling\/gpdb,arcivanov\/postgres-xl,CraigHarris\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,rvs\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,Postgres-XL\/Postgres-XL,techdragon\/Postgres-XL,adam8157\/gpdb,adam8157\/gpdb,lpetrov-pivotal\/gpdb,rubikloud\/gpdb,edespino\/gpdb,randomtask1155\/gpdb,zaksoup\/gpdb,ovr\/postgres-xl,pavanvd\/postgres-xl,yazun\/postgres-xl,oberstet\/postgres-xl,snaga\/postgres-xl,yuanzhao\/gpdb,ashwinstar\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,0x0FFF\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,randomtask1155\/gpdb,pavanvd\/postgres-xl,postmind-net\/postgres-xl,jmcatamney\/gpdb,atris\/gpdb,50wu\/gpdb,ahachete\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,atris\/gpdb,ahachete\/gpdb,janebeckman\/gpdb,tpostgres-projects\/tPostgres,lisakowen\/gpdb,rvs\/gpdb,tangp3\/gpdb,foyzur\/gpdb,xinzweb\/gpdb,0x0FFF\/gpdb,royc1\/gpdb,Chibin\/gpdb,royc1\/gpdb,oberstet\/postgres-xl,ovr\/postgres-xl,Quikling\/gpdb,tangp3\/gpdb,randomtask1155\/gpdb,xuegang\/gpdb,janebeckman\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,CraigHarris\/gpdb,edespino\/gpdb,randomtask1155\/gpdb,rvs\/gpdb,lisakowen\/gpdb,ahachete\/gpdb,zeroae\/postgres-xl,chrishajas\/gpdb,pavanvd\/postgres-xl,kaknikhil\/gpdb,rubikloud\/gpdb,kmjungersen\/PostgresXL,lpetrov-pivotal\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,50wu\/gpdb,CraigHarris\/gpdb,CraigHarris\/gpdb,Quikling\/gpdb,rubikloud\/gpdb,zeroae\/postgres-xl,xinzweb\/gpdb,atris\/gpdb,oberstet\/postgres-xl,cjcjameson\/gpdb,jmcatamney\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,royc1\/gpdb,lisakowen\/gpdb,xuegang\/gpdb,CraigHarris\/gpdb,greenplum-db\/gpdb,Chibin\/gpdb,Chibin\/gpdb,edespino\/gpdb,zaksoup\/gpdb,0x0FFF\/gpdb,adam8157\/gpdb,lintzc\/gpdb,foyzur\/gpdb,arcivanov\/postgres-xl,royc1\/gpdb,kaknikhil\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,arcivanov\/postgres-xl,techdragon\/Postgres-XL,lisakowen\/gpdb,zaksoup\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,chrishajas\/gpdb,greenplum-db\/gpdb,zaksoup\/gpdb,xuegang\/gpdb,rvs\/gpdb,0x0FFF\/gpdb,adam8157\/gpdb,tangp3\/gpdb,postmind-net\/postgres-xl,zeroae\/postgres-xl,cjcjameson\/gpdb,zeroae\/postgres-xl,edespino\/gpdb,Quikling\/gpdb,0x0FFF\/gpdb,tpostgres-projects\/tPostgres,Chibin\/gpdb,lpetrov-pivotal\/gpdb,50wu\/gpdb,yazun\/postgres-xl,chrishajas\/gpdb,edespino\/gpdb,lisakowen\/gpdb,lintzc\/gpdb,arcivanov\/postgres-xl,lpetrov-pivotal\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,foyzur\/gpdb,0x0FFF\/gpdb,rubikloud\/gpdb,ashwinstar\/gpdb,rubikloud\/gpdb,royc1\/gpdb,rvs\/gpdb,Quikling\/gpdb,foyzur\/gpdb,lintzc\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,foyzur\/gpdb,rvs\/gpdb,atris\/gpdb,tangp3\/gpdb,greenplum-db\/gpdb,lintzc\/gpdb,50wu\/gpdb,oberstet\/postgres-xl,xuegang\/gpdb,Quikling\/gpdb,tpostgres-projects\/tPostgres,tpostgres-projects\/tPostgres,royc1\/gpdb,janebeckman\/gpdb,kmjungersen\/PostgresXL,cjcjameson\/gpdb,kmjungersen\/PostgresXL,kaknikhil\/gpdb,lisakowen\/gpdb,Chibin\/gpdb,snaga\/postgres-xl,kaknikhil\/gpdb,CraigHarris\/gpdb,tangp3\/gpdb,Postgres-XL\/Postgres-XL,janebeckman\/gpdb,xuegang\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,postmind-net\/postgres-xl,chrishajas\/gpdb,lintzc\/gpdb,techdragon\/Postgres-XL,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/include\/storage\/s_lock.h\n+++ src\/include\/storage\/s_lock.h\n@@ -63,7 +63,7 @@\n * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group\n * Portions Copyright (c) 1994, Regents of the University of California\n *\n- *\t $PostgreSQL: pgsql\/src\/include\/storage\/s_lock.h,v 1.120 2003\/12\/23 03:31:30 momjian Exp $\n+ *\t $PostgreSQL: pgsql\/src\/include\/storage\/s_lock.h,v 1.121 2003\/12\/23 03:52:10 momjian Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -72,6 +72,7 @@\n \n #include \"storage\/pg_sema.h\"\n \n+#ifdef HAVE_SPINLOCKS\t\/* skip spinlocks if requested *\/\n \n #if defined(__GNUC__) || defined(__ICC)\n \/*************************************************************************\n@@ -438,7 +439,7 @@\n * Uses non-gcc inline assembly:\n *\/\n \n-#if !defined(HAS_TEST_AND_SET)\n+#if !defined(HAS_TEST_AND_SET)\t\/* We didn't trigger above, let's try here *\/\n \n #if defined(USE_UNIVEL_CC)\n typedef unsigned char slock_t;\n@@ -604,6 +605,7 @@\n \n #endif\t\/* !defined(HAS_TEST_AND_SET *\/\n \n+#endif\t\/* HAVE_SPINLOCKS *\/\n \n \n #ifndef HAS_TEST_AND_SET\n"} {"commit":"1625d911d7368a9a96411012c69512074a3ff506","subject":"anv\/blorp: Don't create linear ASTC surfaces for buffers","message":"anv\/blorp: Don't create linear ASTC surfaces for buffers\n\nSuch a surface is not possible on our hardware. Without this change, ISL\nsurface creation would fail with the next patch.\n\nSigned-off-by: Nanley Chery <d78cd5d33e98a5581566f188959f731bd0b1c0fd@intel.com>\nReviewed-by: Jason Ekstrand <68c46a606457643eab92053c1c05574abb26f861@jlekstrand.net>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/intel\/vulkan\/anv_blorp.c\n+++ src\/intel\/vulkan\/anv_blorp.c\n@@ -126,6 +126,22 @@\n struct blorp_surf *blorp_surf,\n struct isl_surf *isl_surf)\n {\n+ const struct isl_format_layout *fmtl =\n+ isl_format_get_layout(format);\n+\n+ \/* ASTC is the only format which doesn't support linear layouts.\n+ * Create an equivalently sized surface with ISL to get around this.\n+ *\/\n+ if (fmtl->txc == ISL_TXC_ASTC) {\n+ \/* Use an equivalently sized format *\/\n+ format = ISL_FORMAT_R32G32B32A32_UINT;\n+ assert(fmtl->bpb == isl_format_get_layout(format)->bpb);\n+\n+ \/* Shrink the dimensions for the new format *\/\n+ width = DIV_ROUND_UP(width, fmtl->bw);\n+ height = DIV_ROUND_UP(height, fmtl->bh);\n+ }\n+\n *blorp_surf = (struct blorp_surf) {\n .surf = isl_surf,\n .addr = {\n"} {"commit":"31d43308cc8cfcd910bbcf6991aceb492fd4949e","subject":"Adjust remaining_length correctly for PUBLISH with QoS>0.","message":"Adjust remaining_length correctly for PUBLISH with QoS>0.\n","repos":"zlargon\/mosquitto,zlargon\/mosquitto,zlargon\/mosquitto,zlargon\/mosquitto,zlargon\/mosquitto","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- library\/read_handle.c\n+++ library\/read_handle.c\n@@ -140,6 +140,7 @@\n \n \tif(qos > 0){\n \t\tif(mqtt3_read_uint16(context, &mid)) return 1;\n+\t\tremaining_length -= 2;\n \t}\n \n \tprintf(\"Remaining length: %d\\n\", remaining_length);\n"} {"commit":"15b7865e54aceb4fc8f9b04e38d606df1ca1461a","subject":"remove unused member","message":"remove unused member\n","repos":"kashefy\/elm,kashefy\/elm,kashefy\/elm,kashefy\/elm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/elm\/layers\/layergraph_impl.h\n+++ modules\/elm\/layers\/layergraph_impl.h\n@@ -182,7 +182,6 @@\n void Toposort(std::vector<VtxDescriptor > &q);\n \n GraphLayerType g_; \/\/\/< graph member\n- SetS inputs_;\n };\n \n } \/\/ namespace elm\n"} {"commit":"220974b38dfcd557f4a6bc723e4b5d15add39f84","subject":"anv\/blorp: Properly handle VK_ATTACHMENT_UNUSED","message":"anv\/blorp: Properly handle VK_ATTACHMENT_UNUSED\n\nThe Vulkan driver was originally written under the assumption that\nVK_ATTACHMENT_UNUSED was basically just for depth-stencil attachments.\nHowever, the way things fell together, VK_ATTACHMENT_UNUSED can be used\nanywhere in the subpass description. The blorp-based clear and resolve\ncode has a bunch of places where we walk lists of attachments and we\nweren't handling VK_ATTACHMENT_UNUSED everywhere. This commit should\nfix all of them.\n\nReviewed-by: Nanley Chery <d78cd5d33e98a5581566f188959f731bd0b1c0fd@intel.com>\nCc: <59f39c0db42d4479a46b02d4d2bc11120e37bb44@lists.freedesktop.org>\n","repos":"metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/intel\/vulkan\/anv_blorp.c\n+++ src\/intel\/vulkan\/anv_blorp.c\n@@ -1108,14 +1108,19 @@\n \n for (uint32_t i = 0; i < cmd_state->subpass->color_count; ++i) {\n uint32_t a = cmd_state->subpass->color_attachments[i].attachment;\n+ if (a == VK_ATTACHMENT_UNUSED)\n+ continue;\n+\n+ assert(a < cmd_state->pass->attachment_count);\n if (cmd_state->attachments[a].pending_clear_aspects) {\n return true;\n }\n }\n \n- if (ds != VK_ATTACHMENT_UNUSED &&\n- cmd_state->attachments[ds].pending_clear_aspects) {\n- return true;\n+ if (ds != VK_ATTACHMENT_UNUSED) {\n+ assert(ds < cmd_state->pass->attachment_count);\n+ if (cmd_state->attachments[ds].pending_clear_aspects)\n+ return true;\n }\n \n return false;\n@@ -1147,6 +1152,10 @@\n struct anv_framebuffer *fb = cmd_buffer->state.framebuffer;\n for (uint32_t i = 0; i < cmd_state->subpass->color_count; ++i) {\n const uint32_t a = cmd_state->subpass->color_attachments[i].attachment;\n+ if (a == VK_ATTACHMENT_UNUSED)\n+ continue;\n+\n+ assert(a < cmd_state->pass->attachment_count);\n struct anv_attachment_state *att_state = &cmd_state->attachments[a];\n \n if (!att_state->pending_clear_aspects)\n@@ -1206,6 +1215,7 @@\n }\n \n const uint32_t ds = cmd_state->subpass->depth_stencil_attachment.attachment;\n+ assert(ds == VK_ATTACHMENT_UNUSED || ds < cmd_state->pass->attachment_count);\n \n if (ds != VK_ATTACHMENT_UNUSED &&\n cmd_state->attachments[ds].pending_clear_aspects) {\n@@ -1520,8 +1530,12 @@\n blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);\n \n for (uint32_t i = 0; i < subpass->color_count; ++i) {\n- ccs_resolve_attachment(cmd_buffer, &batch,\n- subpass->color_attachments[i].attachment);\n+ const uint32_t att = subpass->color_attachments[i].attachment;\n+ if (att == VK_ATTACHMENT_UNUSED)\n+ continue;\n+\n+ assert(att < cmd_buffer->state.pass->attachment_count);\n+ ccs_resolve_attachment(cmd_buffer, &batch, att);\n }\n \n if (subpass->has_resolve) {\n@@ -1539,6 +1553,9 @@\n \n if (dst_att == VK_ATTACHMENT_UNUSED)\n continue;\n+\n+ assert(src_att < cmd_buffer->state.pass->attachment_count);\n+ assert(dst_att < cmd_buffer->state.pass->attachment_count);\n \n if (cmd_buffer->state.attachments[dst_att].pending_clear_aspects) {\n \/* From the Vulkan 1.0 spec:\n"} {"commit":"8a5c760aba30a3f86cad65f095ffce427a26e6cc","subject":" * Fixed memory leak in network driver","message":" * Fixed memory leak in network driver\n\n\ngit-svn-id: 3f9eced0add15b5a9fa491ea3f7f263c10f60fd6@559 92316355-f0b4-4df1-b90c-862c8a59935f\n","repos":"Distrotech\/libcaca,Distrotech\/libcaca,Distrotech\/libcaca,Distrotech\/libcaca,mcfiredrill\/libcaca-old,mcfiredrill\/libcaca-old,mcfiredrill\/libcaca-old,Distrotech\/libcaca,Distrotech\/libcaca,mcfiredrill\/libcaca-old,mcfiredrill\/libcaca-old,Distrotech\/libcaca,Distrotech\/libcaca,mcfiredrill\/libcaca-old,Distrotech\/libcaca,mcfiredrill\/libcaca-old,mcfiredrill\/libcaca-old,mcfiredrill\/libcaca-old","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- caca\/driver_network.c\n+++ caca\/driver_network.c\n@@ -179,6 +179,11 @@\n perror(\"send\");\n return;\n }\n+ \n+ if(to_send) {\n+ free(to_send);\n+ }\n+\n }\n static void network_handle_resize(caca_t *kk)\n {\n"} {"commit":"825b5fab42fda89db3b0df941b3f23e97b68e6d1","subject":"Add new Style: Question","message":"Add new Style: Question","repos":"dogo\/SCLAlertView,bfeher\/SCLAlertView,dogo\/SCLAlertView,dogo\/SCLAlertView","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- SCLAlertView\/SCLAlertViewStyleKit.h\n+++ SCLAlertView\/SCLAlertViewStyleKit.h\n@@ -58,6 +58,12 @@\n *\n * TODO\n *\/\n++ (UIImage*)imageOfQuestion;\n+\n+\/** TODO\n+ *\n+ * TODO\n+ *\/\n + (void)drawCheckmark;\n \n \/** TODO\n@@ -90,4 +96,10 @@\n *\/\n + (void)drawEdit;\n \n+\/** TODO\n+ *\n+ * TODO\n+ *\/\n++ (void)drawQuestion;\n+\n @end\n"} {"commit":"a9fad347ef103c5b0ca8c555e2d50bc099a76a74","subject":"net: Check if headers are NULL","message":"net: Check if headers are NULL\n","repos":"kyoushuu\/grilo,kyoushuu\/grilo,grilofw\/grilo,kyoushuu\/grilo,MathieuDuponchelle\/grilo,jasuarez\/grilo,grilofw\/grilo,GNOME\/grilo,GNOME\/grilo,MathieuDuponchelle\/grilo,grilofw\/grilo,jasuarez\/grilo,kyoushuu\/grilo,jasuarez\/grilo,MathieuDuponchelle\/grilo","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libs\/net\/grl-net-wc.c\n+++ libs\/net\/grl-net-wc.c\n@@ -298,7 +298,9 @@\n get_url_now (c->self, c->url, c->headers, c->result, c->cancellable);\n \n g_free (c->url);\n- g_hash_table_unref (c->headers);\n+ if (c->headers) {\n+ g_hash_table_unref (c->headers);\n+ }\n g_free (c);\n \n return FALSE;\n@@ -331,7 +333,7 @@\n c = g_new (struct request_clos, 1);\n c->self = self;\n c->url = g_strdup (url);\n- c->headers = g_hash_table_ref (headers);\n+ c->headers = headers? g_hash_table_ref (headers): NULL;\n c->result = result;\n c->cancellable = cancellable;\n \n"} {"commit":"7ff443ffda9dbb2a29198ba6f1ace2dccd65bfb8","subject":"Small string leak.","message":"Small string leak.\n\nsvn path=\/trunk\/; revision=359\n","repos":"danilocesar\/seed,danilocesar\/seed,danilocesar\/seed,danilocesar\/seed,danilocesar\/seed","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libseed\/seed-engine.c\n+++ libseed\/seed-engine.c\n@@ -1069,6 +1069,7 @@\n \tJSStringRelease(extension_script);\n \n \tg_free((gchar *) namespace);\n+\tg_free(jsextension);\n \n \treturn JSValueMakeNull(ctx);\n }\n"} {"commit":"25b6100c90ace0cb103205a33ebd30ec71ea471d","subject":"\u5c06\u6ca1\u6709\u52a0\u5165builder\u7684object\u52a0\u5165\u4e4b\uff0c\u907f\u514d\u4e86\u7f16\u8bd1\u65f6\u7684warning","message":"\u5c06\u6ca1\u6709\u52a0\u5165builder\u7684object\u52a0\u5165\u4e4b\uff0c\u907f\u514d\u4e86\u7f16\u8bd1\u65f6\u7684warning\n","repos":"kelvenxu\/libskin,kelvenxu\/libskin","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libskin\/skinbuilder.c\n+++ libskin\/skinbuilder.c\n@@ -235,14 +235,17 @@\n \tSkinCheckButton *enabled = skin_check_button_new(root, \n \t\t\teq->enabled.img,\n \t\t\teq->enabled.x1, eq->enabled.y1);\n+\tadd_object(builder, G_OBJECT(enabled), \"equalizer-enabled\");\n \n \tSkinCheckButton *profile = skin_check_button_new(root, \n \t\t\teq->profile.img,\n \t\t\teq->profile.x1, eq->profile.y1);\n+\tadd_object(builder, G_OBJECT(profile), \"equalizer-profile\");\n \n \tSkinCheckButton *reset = skin_check_button_new(root, \n \t\t\teq->reset.img,\n \t\t\teq->reset.x1, eq->reset.y1);\n+\tadd_object(builder, G_OBJECT(reset), \"equalizer-reset\");\n \n \tSkinHScale *balance = skin_hscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->balance.x1),\n@@ -255,6 +258,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(balance), \"equalizer-balance\");\n \n \tSkinHScale *surround = skin_hscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->surround.x1),\n@@ -267,6 +271,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(surround), \"equalizer-surround\");\n \n \tSkinVScale *preamp = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->preamp.x1),\n@@ -279,6 +284,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(preamp), \"equalizer-preamp\");\n \n \tSkinVScale *eqfactor0 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1),\n@@ -291,6 +297,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor0), \"equalizer-eqfactor0\");\n \n \tSkinVScale *eqfactor1 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval,\n@@ -303,6 +310,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor1), \"equalizer-eqfactor1\");\n \n \tSkinVScale *eqfactor2 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 2.0,\n@@ -315,6 +323,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor2), \"equalizer-eqfactor2\");\n \n \tSkinVScale *eqfactor3 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 3.0,\n@@ -327,6 +336,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor3), \"equalizer-eqfactor3\");\n \tSkinVScale *eqfactor4 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 4.0,\n \t\t\t\"y1\", (gdouble)(eq->eqfactor.y1),\n@@ -338,6 +348,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor4), \"equalizer-eqfactor4\");\n \tSkinVScale *eqfactor5 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 5.0,\n \t\t\t\"y1\", (gdouble)(eq->eqfactor.y1),\n@@ -349,6 +360,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor5), \"equalizer-eqfactor5\");\n \tSkinVScale *eqfactor6 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 6.0,\n \t\t\t\"y1\", (gdouble)(eq->eqfactor.y1),\n@@ -360,6 +372,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor6), \"equalizer-eqfactor6\");\n \tSkinVScale *eqfactor7 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 7.0,\n \t\t\t\"y1\", (gdouble)(eq->eqfactor.y1),\n@@ -371,6 +384,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor7), \"equalizer-eqfactor7\");\n \tSkinVScale *eqfactor8 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 8.0,\n \t\t\t\"y1\", (gdouble)(eq->eqfactor.y1),\n@@ -382,6 +396,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor8), \"equalizer-eqfactor8\");\n \n \tSkinVScale *eqfactor9 = skin_vscale_new(root,\n \t\t\t\"x1\", (gdouble)(eq->eqfactor.x1) + eq->window.eq_interval * 9.0,\n@@ -394,6 +409,7 @@\n \t\t\t\"max\", 100.0,\n \t\t\t\"value\", 50.0,\n \t\t\tNULL);\n+\tadd_object(builder, G_OBJECT(eqfactor9), \"equalizer-eqfactor9\");\n }\n \n static void\n"} {"commit":"29e51315dc446c3db3412d64233da51267b7619c","subject":"CallTraceType: do not use designated initializers anymore.","message":"CallTraceType: do not use designated initializers anymore.\n\nThey are not supported by Visual Studio 2008, which is the compiler used\nfor CPython 2.7 on Windows.\n","repos":"Bluehorn\/calltrace,Bluehorn\/calltrace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- calltrace\/calltrace.c\n+++ calltrace\/calltrace.c\n@@ -86,13 +86,44 @@\n };\n \n static PyTypeObject CallTraceType = {\n- .tp_name = \"calltrace.CallTrace\",\n- .tp_basicsize = offsetof(CallTraceObject, frames),\n- .tp_itemsize = sizeof(FrameData),\n- .tp_flags = Py_TPFLAGS_DEFAULT,\n- .tp_free = PyObject_Del,\n- .tp_new = CallTrace_new,\n- .tp_dealloc = (destructor) CallTrace_dealloc,\n- .tp_doc = \"Describes a call stack\",\n- .tp_as_sequence = &CallTrace_as_sequence,\n+ PyVarObject_HEAD_INIT(NULL, 0)\n+ \"calltrace.CallTrace\", \/* tp_name*\/\n+ offsetof(CallTraceObject, frames), \/* tp_basicsize *\/\n+ sizeof(FrameData), \/* tp_itemsize *\/\n+\n+ (destructor) CallTrace_dealloc, \/* tp_dealloc *\/\n+ 0, \/* tp_print *\/\n+ 0, \/* tp_getattr *\/\n+ 0, \/* tp_setattr *\/\n+ 0, \/* tp_compare *\/\n+ 0, \/* tp_repr *\/\n+ 0, \/* tp_as_number *\/\n+ &CallTrace_as_sequence, \/* tp_as_sequence *\/\n+ 0, \/* tp_as_mapping *\/\n+ 0, \/* tp_hash *\/\n+ 0, \/* tp_call *\/\n+ 0, \/* tp_str *\/\n+ 0, \/* tp_getattro *\/\n+ 0, \/* tp_setattro *\/\n+ 0, \/* tp_as_buffer *\/\n+ Py_TPFLAGS_DEFAULT, \/* tp_flags *\/\n+ \"Describes a call stack\", \/* tp_doc *\/\n+ 0, \/* tp_traverse *\/\n+ 0, \/* tp_clear *\/\n+ 0, \/* tp_richcompare *\/\n+ 0, \/* tp_weaklistoffset *\/\n+ 0, \/* tp_iter *\/\n+ 0, \/* tp_iternext *\/\n+ 0, \/* tp_methods *\/\n+ 0, \/* tp_members *\/\n+ 0, \/* tp_getset *\/\n+ 0, \/* tp_base *\/\n+ 0, \/* tp_dict *\/\n+ 0, \/* tp_descr_get *\/\n+ 0, \/* tp_descr_set *\/\n+ 0, \/* tp_dictoffset *\/\n+ 0, \/* tp_init *\/\n+ 0, \/* tp_alloc *\/\n+ CallTrace_new, \/* tp_new *\/\n+ PyObject_Del, \/* tp_free *\/\n };\n"} {"commit":"c50de75eca8d341ae1edb150e412203a03981843","subject":"recommented in some stuff for secondary image.","message":"recommented in some stuff for secondary image.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@10347 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"thusoy\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/canon.c\n+++ camlibs\/canon\/canon.c\n@@ -1138,12 +1138,10 @@\n int status;\n unsigned int return_length;\n \n- \/*\n unsigned int b_length_orig = 0;\n unsigned int *b_length = &b_length_orig;\n unsigned char *b_data_orig = NULL;\n unsigned char **b_data = &b_data_orig; \n- *\/\n \n int photo_status;\n \n"} {"commit":"3f74532797ecb8b4e693747cd8e42276e51d6d72","subject":"(pstreambuf::write()): Take pointer to const data.","message":"(pstreambuf::write()): Take pointer to const data.\n","repos":"zmij\/tip-http,zmij\/tip-http,zmij\/tip-http,zmij\/pg_async,zmij\/tip-http","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- pstream.h\n+++ pstream.h\n@@ -1,4 +1,4 @@\n-\/* $Id: pstream.h,v 1.88 2004\/10\/21 00:17:09 redi Exp $\n+\/* $Id: pstream.h,v 1.89 2005\/03\/16 02:12:16 redi Exp $\n PStreams - POSIX Process I\/O for C++\n Copyright (C) 2001,2002,2003,2004 Jonathan Wakely\n \n@@ -190,7 +190,7 @@\n \n \/\/\/ Insert a sequence of characters into the pipe.\n std::streamsize\n- write(char_type* s, std::streamsize n);\n+ write(const char_type* s, std::streamsize n);\n \n \/\/\/ Extract a sequence of characters from the pipe.\n std::streamsize\n@@ -1686,7 +1686,7 @@\n *\/\n template <typename C, typename T>\n inline std::streamsize\n- basic_pstreambuf<C,T>::write(char_type* s, std::streamsize n)\n+ basic_pstreambuf<C,T>::write(const char_type* s, std::streamsize n)\n {\n return wpipe() >= 0 ? ::write(wpipe(), s, n * sizeof(char_type)) : 0;\n }\n"} {"commit":"703919ef4bda4e6fb9e60a4df7bd149a056b42ed","subject":"[core] Fix wnck_application_get_icon_is_fallback()","message":"[core] Fix wnck_application_get_icon_is_fallback()\n\nWe can't simply call _wnck_icon_cache_get_is_fallback() since we're\npossibly using the icon from a window:\n\n + if we have an icon for the application, we know it's not a fallback\n icon (we use _wnck_icon_cache_set_want_fallback())\n + if we use the icon of a window, then we simply relay the result of\n wnck_window_get_icon_is_fallback()\n\nhttp:\/\/bugzilla.gnome.org\/show_bug.cgi?id=586571\n","repos":"lanoxx\/libwnck,lanoxx\/libwnck,Sidnioulz\/SandboxLibwnck,Sidnioulz\/SandboxLibwnck","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- libwnck\/application.c\n+++ libwnck\/application.c\n@@ -479,7 +479,16 @@\n {\n g_return_val_if_fail (WNCK_IS_APPLICATION (app), FALSE);\n \n- return _wnck_icon_cache_get_is_fallback (app->priv->icon_cache);\n+ if (app->priv->icon)\n+ return FALSE;\n+ else\n+ {\n+ WnckWindow *w = find_icon_window (app);\n+ if (w)\n+ return wnck_window_get_icon_is_fallback (w);\n+ else\n+ return TRUE;\n+ }\n }\n \n \/**\n"} {"commit":"1a8d833d88803d5ba219011f6a83077e3803861e","subject":"Updated and expanded list of models with USB ID's.","message":"Updated and expanded list of models with USB ID's.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@7675 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/canon.c\n+++ camlibs\/canon\/canon.c\n@@ -99,16 +99,12 @@\n \/* Models with unknown USB ID's:\n European name North American Japanese Intro date\n \n- EOS 350D Digital Rebel XT EOS Kiss Digital N February 2005\n IXUS 700 PowerShot SD500 IXY Digital 60 February 2005\n IXUS 50 PowerShot SD400 IXY Digital 55 February 2005\n PowerShot A520 January 2005\n- PowerShot A510 January 2005\n Digital IXUS 40 PowerShot SD300 IXY Digital 50 September 2004\n PowerShot G6 August 2004\n- Digital IXUS IIs PowerShot SD110 ??? February 2004\n PowerShot Pro1 February 2004\n- Digital IXUS i PowerShot SD10 Digital ELPH IXY Digital L September 2003\n *\/\n const struct canonCamModelData models[] = {\n \t\/* *INDENT-OFF* *\/\n@@ -142,6 +138,7 @@\n \t{\"Canon:PowerShot S30\",\t\tCANON_CLASS_1,\t0x04A9, 0x3057, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A40\",\t\tCANON_CLASS_1,\t0x04A9, 0x3058, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A30\",\t\tCANON_CLASS_1,\t0x04A9,\t0x3059, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\t\/* 305a is the ZR50 Digital Camcorder. *\/\n \t\/* 305b is the ZR45MC Digital Camcorder. *\/\n \t\/* 305c is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n \t{\"Canon:PowerShot unknown 2\",\tCANON_CLASS_1,\t0x04A9,\t0x305c, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n@@ -160,10 +157,9 @@\n \t\/*{\"Canon:PowerShot G3\",\tCANON_CLASS_1,\t0x04A9, 0x3069, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},*\/\n \t\/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n \t{\"Canon:Digital unknown 3\",\tCANON_CLASS_1,\t0x04A9, 0x306a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* Apparently the MVX2i is the same as Optura 200 MC (Philippe\n-\t * Gramoulle), so share the code. *\/\n+\t{\"Canon:Optura 200 MC\",\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:MVX2i\",\t\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Optura 200 MC\",\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:IXY DV M\",\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot S45 (normal mode)\",\tCANON_CLASS_4,\t0x04A9, 0x306C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t\/* 0x306D is S45 in PTP mode *\/\n \t{\"Canon:PowerShot G3 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x306E, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n@@ -192,11 +188,14 @@\n \t{\"Canon:PowerShot unknown 5\",\tCANON_CLASS_5,\t0x04A9, 0x307a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n \t\/* MV630i is a DV camcorder *\/\n \t{\"Canon:MV630i\",\t\tCANON_CLASS_5,\t0x04A9, 0x307b, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n \t{\"Canon:Optura 20\",\t\tCANON_CLASS_5,\t0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:MVX150i\",\t\tCANON_CLASS_5,\t0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t\/* 3080 is in MacOS Info.plist, but I don't know what it is\n \t * --swestin. *\/\n \t{\"Canon:Unknown 4\",\t\tCANON_CLASS_5,\t0x04A9, 0x3080, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:Optura 10\",\t\tCANON_CLASS_5,\t0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:MVX100i\",\t\tCANON_CLASS_5,\t0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \n \t{\"Canon:EOS 10D\",\t\tCANON_CLASS_4,\t0x04A9, 0x3083, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:EOS 300D (normal mode)\", CANON_CLASS_4,\t0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n@@ -205,13 +204,25 @@\n \t\/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n \t{\"Canon:PowerShot G5 (normal mode)\", CANON_CLASS_5,\t0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \n-\t\/* Canon MVX3i \/ Optura Xi uses 308d in PTP mode; 3089 in Canon mode? *\/\n-\t\/* Canon MVX10i \/ Optura 300 uses 3095 in PTP mode. *\/\n+\t\/* Optura Xi\/MVX 3i\/FV M1 uses 308d in PTP mode; 3089 in Canon mode? *\/\n+\n+\t\/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3093 in USB Mass Storage mode, *\/\n+\n+\t\/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3095 in PTP mode. *\/\n \n \t\/* 0x3099 is the EOS 300D\/Digital Rebel in PTP mode *\/\n \t{\"Canon:PowerShot A80 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 0x309b is the Digital IXUS in PTP mode *\/\n-\t{\"Canon:PowerShot S1 IS (normal mode)\", CANON_CLASS_5, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t\/* 0x309b is the SD10 Digital ELPH\/Digital IXUS i\/IXY Digital L\n+\t in PTP mode; will it work in Canon mode? *\/\n+\t{\"Canon:PowerShot SD10 Digital ELPH (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:Digital IXUS i (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot IXY Digital L (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot S1 IS (normal mode)\",\tCANON_CLASS_5, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+\t\/* 30a0 is ZR90\/MV750i camcorder *\/\n+\n+\t\/* 30a8 is Elura 60E\/MVX200i camcorder *\/\n+\t\/* 30a9 is Optura 40\/MVX25i camcorder *\/\n \n \t{\"Canon:PowerShot S70 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b1, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot S60 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n@@ -219,12 +230,14 @@\n \t{\"Canon:PowerShot S500 Digital ELPH (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:IXY Digital 500 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A75\",\t\t\tCANON_CLASS_5,\t0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot SD110 Digital ELPH\",\tCANON_CLASS_1,\t0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:Digital IXUS IIs\",\t\tCANON_CLASS_1,\t0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A400\",\t\tCANON_CLASS_5,\t0x04A9, 0x30b7,\tCAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A310\",\t\tCANON_CLASS_5,\t0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A85 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot S410 Digital ELPH (normal mode)\", CANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:Digital IXUS 430 (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY Digital 430 (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:IXY Digital 430 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A95 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \n \t\/* 0x30bf is PowerShot SD300\/Digital IXUS 40 in PTP mode *\/\n@@ -236,7 +249,7 @@\n \t{\"Canon:PowerShot A510 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x30c2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \n \t{\"Canon:PowerShot SD20 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS i5 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:Digital IXUS i5 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:IXY Digital L2 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n \n \t\/* Is 0x30e9 EOS 1D Mark II in Canon mode? *\/\n"} {"commit":"4302db60973d7d4ba59c57e166da21560847cba3","subject":"fix typo (Sigital) in Canon Digital IXUS v2 camera struct.","message":"fix typo (Sigital) in Canon Digital IXUS v2 camera struct.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@4986 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/canon.c\n+++ camlibs\/canon\/canon.c\n@@ -110,7 +110,7 @@\n \t{\"Canon PowerShot A100\",\tCANON_PS_A100,\t\t0x04A9, 0x3061, 0, S10M, S32K},\n \t{\"Canon PowerShot A200\",\tCANON_PS_A200,\t\t0x04A9, 0x3062, 0, S10M, S32K},\n \t{\"Canon PowerShot S200\",\tCANON_PS_S200,\t\t0x04A9, 0x3065, 0, S10M, S32K},\n-\t{\"Canon Sigital IXUS v2\",\tCANON_PS_S200,\t\t0x04A9, 0x3065, 0, S10M, S32K},\n+\t{\"Canon Digital IXUS v2\",\tCANON_PS_S200,\t\t0x04A9, 0x3065, 0, S10M, S32K},\n \t{\"Canon Digital IXUS 330\",\tCANON_PS_S330,\t\t0x04A9, 0x3066, 0, S10M, S32K},\n \t{NULL}\n \t\/* *INDENT-ON* *\/\n"} {"commit":"1bf2a22af8fac02a62465ed665da112cb9157f1d","subject":"EOS Digital Rebel XT\/EOS 350D\/EOS Digital Kiss N is now a Class 6 camera, and needs CFLAGS=-DCANON_EXPERIMENTAL_20D to be included in the code.","message":"EOS Digital Rebel XT\/EOS 350D\/EOS Digital Kiss N is now a Class 6 camera,\n and needs CFLAGS=-DCANON_EXPERIMENTAL_20D to be included in the code.\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@7729 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"thusoy\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/canon.c\n+++ camlibs\/canon\/canon.c\n@@ -118,154 +118,154 @@\n {\"Canon:EOS D30\", CANON_CLASS_4, 0x04A9, 0x3044, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n {\"Canon:PowerShot S100\", CANON_CLASS_0, 0x04A9, 0x3045, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n {\"Canon:IXY DIGITAL\", CANON_CLASS_0, 0x04A9, 0x3046, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS\",\t\tCANON_CLASS_0,\t0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot G1\",\t\tCANON_CLASS_0,\t0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, \"Canon PowerShot G1\"},\n-\t{\"Canon:PowerShot Pro90 IS\",\tCANON_CLASS_0,\t0x04A9, 0x3049, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, \"Canon PowerShot Pro90 IS\"},\n-\n-\t{\"Canon:IXY DIGITAL 300\",\tCANON_CLASS_1,\t0x04A9, 0x304B, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S300\",\tCANON_CLASS_1,\t0x04A9, 0x304C, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS 300\",\tCANON_CLASS_1,\t0x04A9, 0x304D, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A20\",\t\tCANON_CLASS_1,\t0x04A9, 0x304E, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A10\",\t\tCANON_CLASS_1,\t0x04A9, 0x304F, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* Mac OS includes this as a valid ID; don't know which camera model --swestin *\/\n-\t{\"Canon:PowerShot unknown 1\",\tCANON_CLASS_1,\t0x04A9, 0x3050, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* Canon IXY DIGITAL 200 here? *\/\n-\t{\"Canon:PowerShot S110\",\tCANON_CLASS_0,\t0x04A9, 0x3051, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS v\",\tCANON_CLASS_0,\t0x04A9, 0x3052, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:PowerShot G2\",\t\tCANON_CLASS_1,\t0x04A9, 0x3055, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S40\",\t\tCANON_CLASS_1,\t0x04A9, 0x3056, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S30\",\t\tCANON_CLASS_1,\t0x04A9, 0x3057, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A40\",\t\tCANON_CLASS_1,\t0x04A9, 0x3058, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A30\",\t\tCANON_CLASS_1,\t0x04A9,\t0x3059, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 305a is the ZR50 Digital Camcorder. *\/\n-\t\/* 305b is the ZR45MC Digital Camcorder. *\/\n-\t\/* 305c is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n-\t{\"Canon:PowerShot unknown 2\",\tCANON_CLASS_1,\t0x04A9,\t0x305c, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:EOS D60\",\t\tCANON_CLASS_4,\t0x04A9, 0x3060, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A100\",\tCANON_CLASS_1,\t0x04A9, 0x3061, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A200\",\tCANON_CLASS_1,\t0x04A9, 0x3062, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:PowerShot S200\",\tCANON_CLASS_1,\t0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS v2\",\tCANON_CLASS_1,\t0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S330\",\tCANON_CLASS_1,\t0x04A9, 0x3066, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS 330\",\tCANON_CLASS_1,\t0x04A9, 0x3066, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 3067 MV550i Digital Video Camera *\/\n-\n-\t\/* Reported at http:\/\/www.linux-usb.org\/usb.ids, we have 306E. *\/\n-\t\/*{\"Canon:PowerShot G3\",\tCANON_CLASS_1,\t0x04A9, 0x3069, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},*\/\n-\t\/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n-\t{\"Canon:Digital unknown 3\",\tCANON_CLASS_1,\t0x04A9, 0x306a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Optura 200 MC\",\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:MVX2i\",\t\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY DV M\",\t\tCANON_CLASS_1,\t0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S45 (normal mode)\",\tCANON_CLASS_4,\t0x04A9, 0x306C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 0x306D is S45 in PTP mode *\/\n-\t{\"Canon:PowerShot G3 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x306E, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 0x306F is G3 in PTP mode *\/\n-\t{\"Canon:PowerShot S230 (normal mode)\",\tCANON_CLASS_4,\t0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS v3 (normal mode)\",\tCANON_CLASS_4,\t0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 0x3071 is S230\/IXUS v3 in PTP mode *\/\n-\n-\t{\"Canon:PowerShot SD100 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS II (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* added from report on mailinglist. XXX: assuming capture works -Marcus *\/\n-\t\/* PS A70 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n-\t{\"Canon:PowerShot A70\",\t\tCANON_CLASS_1,\t0x04A9, 0x3073, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* PS A60 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n-\t{\"Canon:PowerShot A60\",\t\tCANON_CLASS_1,\t0x04A9, 0x3074, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* reported working on SourceForge patch tracker. *\/\n-\t\/* PS S400 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n-\t{\"Canon:Digital IXUS 400\",\tCANON_CLASS_1,\t0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S400\",\tCANON_CLASS_1,\t0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A300\",\tCANON_CLASS_1,\t0x04A9, 0x3076, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S50 (normal mode)\",\tCANON_CLASS_4,\t0x04A9, 0x3077, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:ZR70MC\",\t\tCANON_CLASS_5,\t0x04A9, 0x3078, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:MV650i\",\t\tCANON_CLASS_5,\t0x04A9, 0x3079, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 307a is in MacOS Info.plist, but I don't know what it is\n-\t * --swestin. *\/\n-\t{\"Canon:PowerShot unknown 5\",\tCANON_CLASS_5,\t0x04A9, 0x307a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* MV630i is a DV camcorder *\/\n-\t{\"Canon:MV630i\",\t\tCANON_CLASS_5,\t0x04A9, 0x307b, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:Optura 20\",\t\tCANON_CLASS_5,\t0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:MVX150i\",\t\tCANON_CLASS_5,\t0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 3080 is in MacOS Info.plist, but I don't know what it is\n-\t * --swestin. *\/\n-\t{\"Canon:PowerShot Unknown 4\",\tCANON_CLASS_1,\t0x04A9, 0x3080, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Optura 10\",\t\tCANON_CLASS_1,\t0x04A9, 0x3082, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:MVX100i\",\t\tCANON_CLASS_1,\t0x04A9, 0x3082, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:EOS 10D\",\t\tCANON_CLASS_4,\t0x04A9, 0x3083, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:EOS 300D (normal mode)\", CANON_CLASS_4,\t0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:EOS Digital Rebel (normal mode)\",CANON_CLASS_4,\t0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:EOS Kiss Digital (normal mode)\",CANON_CLASS_4,\t0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n-\t{\"Canon:PowerShot G5 (normal mode)\", CANON_CLASS_5,\t0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t\/* Optura Xi\/MVX 3i\/FV M1 uses 308d in PTP mode; 3089 in Canon mode? *\/\n-\n-\t\/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3093 in USB Mass Storage mode, *\/\n-\n-\t\/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3095 in PTP mode. *\/\n-\n-\t\/* 0x3099 is the EOS 300D\/Digital Rebel in PTP mode *\/\n-\t{\"Canon:PowerShot A80 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 0x309b is the SD10 Digital ELPH\/Digital IXUS i\/IXY Digital L\n-\t in PTP mode; will it work in Canon mode? *\/\n-\t{\"Canon:PowerShot SD10 Digital ELPH (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS i (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot IXY Digital L (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S1 IS (normal mode)\",\tCANON_CLASS_5, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t\/* 30a0 is ZR90\/MV750i camcorder *\/\n-\n-\t\/* 30a8 is Elura 60E\/MVX200i camcorder *\/\n-\t\/* 30a9 is Optura 40\/MVX25i camcorder *\/\n-\n-\t{\"Canon:PowerShot S70 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b1, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S60 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS 500 (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S500 Digital ELPH (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY Digital 500 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A75\",\t\t\tCANON_CLASS_1,\t0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot SD110 Digital ELPH\",\tCANON_CLASS_1,\t0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS IIs\",\t\tCANON_CLASS_1,\t0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A400\",\t\tCANON_CLASS_5,\t0x04A9, 0x30b7,\tCAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A310\",\t\tCANON_CLASS_5,\t0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A85 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot S410 Digital ELPH (normal mode)\", CANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS 430 (normal mode)\",CANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY Digital 430 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A95 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t\/* 0x30bf is PowerShot SD300\/Digital IXUS 40 in PTP mode *\/\n-\t\/* 0x30c0 is PowerShot SD200 in PTP mode *\/\n-\t{\"Canon:PowerShot SD200 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS 30 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY Digital 40 (normal mode)\",\tCANON_CLASS_5,\t0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:PowerShot A510 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x30c2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t{\"Canon:PowerShot SD20 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital IXUS i5 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:IXY Digital L2 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n-\n-\t\/* Is 0x30e9 EOS 1D Mark II in Canon mode? *\/\n-\t\/* 0x30ea is EOS 1D Mark II in PTP mode *\/\n+ {\"Canon:Digital IXUS\", CANON_CLASS_0, 0x04A9, 0x3047, CAP_NON, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot G1\", CANON_CLASS_0, 0x04A9, 0x3048, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, \"Canon PowerShot G1\"},\n+ {\"Canon:PowerShot Pro90 IS\", CANON_CLASS_0, 0x04A9, 0x3049, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, \"Canon PowerShot Pro90 IS\"},\n+\n+ {\"Canon:IXY DIGITAL 300\", CANON_CLASS_1, 0x04A9, 0x304B, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S300\", CANON_CLASS_1, 0x04A9, 0x304C, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS 300\", CANON_CLASS_1, 0x04A9, 0x304D, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A20\", CANON_CLASS_1, 0x04A9, 0x304E, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A10\", CANON_CLASS_1, 0x04A9, 0x304F, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* Mac OS includes this as a valid ID; don't know which camera model --swestin *\/\n+ {\"Canon:PowerShot unknown 1\", CANON_CLASS_1, 0x04A9, 0x3050, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* Canon IXY DIGITAL 200 here? *\/\n+ {\"Canon:PowerShot S110\", CANON_CLASS_0, 0x04A9, 0x3051, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS v\", CANON_CLASS_0, 0x04A9, 0x3052, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:PowerShot G2\", CANON_CLASS_1, 0x04A9, 0x3055, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S40\", CANON_CLASS_1, 0x04A9, 0x3056, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S30\", CANON_CLASS_1, 0x04A9, 0x3057, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A40\", CANON_CLASS_1, 0x04A9, 0x3058, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A30\", CANON_CLASS_1, 0x04A9, 0x3059, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 305a is the ZR50 Digital Camcorder. *\/\n+ \/* 305b is the ZR45MC Digital Camcorder. *\/\n+ \/* 305c is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n+ {\"Canon:PowerShot unknown 2\", CANON_CLASS_1, 0x04A9, 0x305c, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:EOS D60\", CANON_CLASS_4, 0x04A9, 0x3060, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A100\", CANON_CLASS_1, 0x04A9, 0x3061, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A200\", CANON_CLASS_1, 0x04A9, 0x3062, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:PowerShot S200\", CANON_CLASS_1, 0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS v2\", CANON_CLASS_1, 0x04A9, 0x3065, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S330\", CANON_CLASS_1, 0x04A9, 0x3066, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS 330\", CANON_CLASS_1, 0x04A9, 0x3066, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 3067 MV550i Digital Video Camera *\/\n+\n+ \/* Reported at http:\/\/www.linux-usb.org\/usb.ids, we have 306E. *\/\n+ \/*{\"Canon:PowerShot G3\", CANON_CLASS_1, 0x04A9, 0x3069, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},*\/\n+ \/* 306a is in MacOS Info.plist, but I don't know what it is --swestin. *\/\n+ {\"Canon:Digital unknown 3\", CANON_CLASS_1, 0x04A9, 0x306a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Optura 200 MC\", CANON_CLASS_1, 0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:MVX2i\", CANON_CLASS_1, 0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:IXY DV M\", CANON_CLASS_1, 0x04A9, 0x306B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S45 (normal mode)\", CANON_CLASS_4, 0x04A9, 0x306C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 0x306D is S45 in PTP mode *\/\n+ {\"Canon:PowerShot G3 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x306E, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 0x306F is G3 in PTP mode *\/\n+ {\"Canon:PowerShot S230 (normal mode)\", CANON_CLASS_4, 0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS v3 (normal mode)\", CANON_CLASS_4, 0x04A9, 0x3070, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 0x3071 is S230\/IXUS v3 in PTP mode *\/\n+\n+ {\"Canon:PowerShot SD100 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS II (normal mode)\", CANON_CLASS_5, 0x04A9, 0x3072, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* added from report on mailinglist. XXX: assuming capture works -Marcus *\/\n+ \/* PS A70 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n+ {\"Canon:PowerShot A70\", CANON_CLASS_1, 0x04A9, 0x3073, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* PS A60 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n+ {\"Canon:PowerShot A60\", CANON_CLASS_1, 0x04A9, 0x3074, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* reported working on SourceForge patch tracker. *\/\n+ \/* PS S400 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n+ {\"Canon:Digital IXUS 400\", CANON_CLASS_1, 0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S400\", CANON_CLASS_1, 0x04A9, 0x3075, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A300\", CANON_CLASS_1, 0x04A9, 0x3076, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S50 (normal mode)\", CANON_CLASS_4, 0x04A9, 0x3077, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:ZR70MC\", CANON_CLASS_5, 0x04A9, 0x3078, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:MV650i\", CANON_CLASS_5, 0x04A9, 0x3079, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 307a is in MacOS Info.plist, but I don't know what it is\n+ * --swestin. *\/\n+ {\"Canon:PowerShot unknown 5\", CANON_CLASS_5, 0x04A9, 0x307a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* MV630i is a DV camcorder *\/\n+ {\"Canon:MV630i\", CANON_CLASS_5, 0x04A9, 0x307b, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:Optura 20\", CANON_CLASS_5, 0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:MVX150i\", CANON_CLASS_5, 0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 3080 is in MacOS Info.plist, but I don't know what it is\n+ * --swestin. *\/\n+ {\"Canon:PowerShot Unknown 4\", CANON_CLASS_1, 0x04A9, 0x3080, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Optura 10\", CANON_CLASS_1, 0x04A9, 0x3082, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:MVX100i\", CANON_CLASS_1, 0x04A9, 0x3082, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:EOS 10D\", CANON_CLASS_4, 0x04A9, 0x3083, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:EOS 300D (normal mode)\", CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:EOS Digital Rebel (normal mode)\",CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:EOS Kiss Digital (normal mode)\",CANON_CLASS_4, 0x04A9, 0x3084, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ \/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection *\/\n+ {\"Canon:PowerShot G5 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ \/* Optura Xi\/MVX 3i\/FV M1 uses 308d in PTP mode; 3089 in Canon mode? *\/\n+\n+ \/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3093 in USB Mass Storage mode, *\/\n+\n+ \/* Optura 300\/MVX 10i\/IXY DV M2 video camera uses 3095 in PTP mode. *\/\n+\n+ \/* 0x3099 is the EOS 300D\/Digital Rebel in PTP mode *\/\n+ {\"Canon:PowerShot A80 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 0x309b is the SD10 Digital ELPH\/Digital IXUS i\/IXY Digital L\n+ in PTP mode; will it work in Canon mode? *\/\n+ {\"Canon:PowerShot SD10 Digital ELPH (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309B, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS i (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot IXY Digital L (normal mode)\", CANON_CLASS_1, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S1 IS (normal mode)\", CANON_CLASS_5, 0x04A9, 0x309C, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ \/* 30a0 is ZR90\/MV750i camcorder *\/\n+\n+ \/* 30a8 is Elura 60E\/MVX200i camcorder *\/\n+ \/* 30a9 is Optura 40\/MVX25i camcorder *\/\n+\n+ {\"Canon:PowerShot S70 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b1, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S60 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS 500 (normal mode)\",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S500 Digital ELPH (normal mode)\",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:IXY Digital 500 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A75\", CANON_CLASS_1, 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot SD110 Digital ELPH\", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS IIs\", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A400\", CANON_CLASS_5, 0x04A9, 0x30b7, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A310\", CANON_CLASS_5, 0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A85 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot S410 Digital ELPH (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS 430 (normal mode)\",CANON_CLASS_5, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:IXY Digital 430 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:PowerShot A95 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ \/* 0x30bf is PowerShot SD300\/Digital IXUS 40 in PTP mode *\/\n+ \/* 0x30c0 is PowerShot SD200 in PTP mode *\/\n+ {\"Canon:PowerShot SD200 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS 30 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:IXY Digital 40 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c0, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:PowerShot A510 (normal mode)\", CANON_CLASS_1, 0x04A9, 0x30c2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\n+ {\"Canon:PowerShot SD20 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital IXUS i5 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:IXY Digital L2 (normal mode)\", CANON_CLASS_5, 0x04A9, 0x30c4, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},\n+\n+ \/* Is 0x30e9 EOS 1D Mark II in Canon mode? *\/\n+ \/* 0x30ea is EOS 1D Mark II in PTP mode *\/\n \n #ifdef CANON_EXPERIMENTAL_20D\n-\t{\"Canon:EOS 20D (normal mode)\",\t\tCANON_CLASS_6,\t0x04A9, 0x30eb, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:EOS 20D (normal mode)\", CANON_CLASS_6, 0x04A9, 0x30eb, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 0x30ec is EOS 20D in PTP mode *\/\n+\n+ {\"Canon:EOS 350D (normal mode)\", CANON_CLASS_6, 0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:Digital Rebel XT (normal mode)\", CANON_CLASS_6, 0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ {\"Canon:EOS Kiss Digital N (normal mode)\", CANON_CLASS_6, 0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+ \/* 30ef is EOS 350D\/Digital Rebel XT\/EOS Kiss Digital N in PTP mode. *\/\n #endif\n-\t\/* 0x30ec is EOS 20D in PTP mode *\/\n-\n-\t{\"Canon:EOS 350D (normal mode)\",\t\tCANON_CLASS_4,\t0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:Digital Rebel XT (normal mode)\",\t\tCANON_CLASS_4,\t0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:EOS Kiss Digital N (normal mode)\",\t\tCANON_CLASS_4,\t0x04A9, 0x30ee, CAP_EXP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t\/* 30ef is EOS 350D\/Digital Rebel XT\/EOS Kiss Digital N in PTP mode. *\/\n-\t{NULL}\n-\t\/* *INDENT-ON* *\/\n+ {NULL}\n+ \/* *INDENT-ON* *\/\n };\n \n #undef NO_USB\n@@ -298,74 +298,74 @@\n static const char *\n replace_filename_extension(const char *filename, const char *newext)\n {\n-\tchar *p;\n-\tstatic char buf[1024];\n-\n-\t\/* We just replace file ending by .THM and assume this is the\n-\t * name of the thumbnail file.\n-\t *\/\n-\tif (strncpy (buf, filename, sizeof (buf)) < 0) {\n-\t\tGP_DEBUG (\"replace_filename_extension: Buffer too small in %s line %i.\",\n-\t\t\t __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n-\tif ((p = strrchr (buf, '.')) == NULL) {\n-\t\tGP_DEBUG (\"replace_filename_extension: No '.' found in filename '%s' \"\n-\t\t\t \"in %s line %i.\", filename, __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n-\tif (((p - buf) < sizeof (buf) - 4) && strncpy (p, \".THM\", 4)) {\n-\t\tGP_DEBUG (\"replace_filename_extension: New name for '%s' is '%s'\",\n-\t\t\t filename, buf);\n-\t\treturn buf;\n-\t} else {\n-\t\tGP_DEBUG (\"replace_filename_extension: \"\n-\t\t\t \"New name for filename '%s' doesnt fit in %s line %i.\",\n-\t\t\t filename, __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n+ char *p;\n+ static char buf[1024];\n+\n+ \/* We just replace file ending by .THM and assume this is the\n+ * name of the thumbnail file.\n+ *\/\n+ if (strncpy (buf, filename, sizeof (buf)) < 0) {\n+ GP_DEBUG (\"replace_filename_extension: Buffer too small in %s line %i.\",\n+ __FILE__, __LINE__);\n+ return NULL;\n+ }\n+ if ((p = strrchr (buf, '.')) == NULL) {\n+ GP_DEBUG (\"replace_filename_extension: No '.' found in filename '%s' \"\n+ \"in %s line %i.\", filename, __FILE__, __LINE__);\n+ return NULL;\n+ }\n+ if (((p - buf) < sizeof (buf) - 4) && strncpy (p, \".THM\", 4)) {\n+ GP_DEBUG (\"replace_filename_extension: New name for '%s' is '%s'\",\n+ filename, buf);\n+ return buf;\n+ } else {\n+ GP_DEBUG (\"replace_filename_extension: \"\n+ \"New name for filename '%s' doesnt fit in %s line %i.\",\n+ filename, __FILE__, __LINE__);\n+ return NULL;\n+ }\n }\n \n static char *\n filename_to_audio(const char *filename, const char *newext)\n {\n-\tchar *p;\n-\tstatic char buf[1024];\n-\n-\t\/* We just replace file ending by .WAV, the first three\n-\t * letters by SND and assume this is the name of the audio file.\n-\t *\/\n-\tif (strncpy (buf, filename, sizeof (buf)) < 0) {\n-\t\tGP_DEBUG (\"filename_to_audio: Buffer too small in %s line %i.\",\n-\t\t\t __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n-\tif ((p = strrchr (buf, '_')) == NULL) {\n-\t\tGP_DEBUG (\"filename_to_audio: No '.' found in filename '%s' \"\n-\t\t\t \"in %s line %i.\", filename, __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n-\tif ((p - buf) > 3) {\n-\t\tp -= 3;\n-\t\tp[0] = 'S';\n-\t\tp[1] = 'N';\n-\t\tp[2] = 'D';\n-\t}\n-\tif ((p = strrchr (buf, '.')) == NULL) {\n-\t\tGP_DEBUG (\"filename_to_audio: No '.' found in filename '%s' \"\n-\t\t\t \"in %s line %i.\", filename, __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n-\tif (((p - buf) < sizeof (buf) - 4) && strncpy (p, \".WAV\", 4)) {\n-\t\tGP_DEBUG (\"filename_to_audio: New name for '%s' is '%s'\",\n-\t\t\t filename, buf);\n-\t\treturn buf;\n-\t} else {\n-\t\tGP_DEBUG (\"filename_to_audio: \"\n-\t\t\t \"New name for filename '%s' doesnt fit in %s line %i.\",\n-\t\t\t filename, __FILE__, __LINE__);\n-\t\treturn NULL;\n-\t}\n+ char *p;\n+ static char buf[1024];\n+\n+ \/* We just replace file ending by .WAV, the first three\n+ * letters by SND and assume this is the name of the audio file.\n+ *\/\n+ if (strncpy (buf, filename, sizeof (buf)) < 0) {\n+ GP_DEBUG (\"filename_to_audio: Buffer too small in %s line %i.\",\n+ __FILE__, __LINE__);\n+ return NULL;\n+ }\n+ if ((p = strrchr (buf, '_')) == NULL) {\n+ GP_DEBUG (\"filename_to_audio: No '.' found in filename '%s' \"\n+ \"in %s line %i.\", filename, __FILE__, __LINE__);\n+ return NULL;\n+ }\n+ if ((p - buf) > 3) {\n+ p -= 3;\n+ p[0] = 'S';\n+ p[1] = 'N';\n+ p[2] = 'D';\n+ }\n+ if ((p = strrchr (buf, '.')) == NULL) {\n+ GP_DEBUG (\"filename_to_audio: No '.' found in filename '%s' \"\n+ \"in %s line %i.\", filename, __FILE__, __LINE__);\n+ return NULL;\n+ }\n+ if (((p - buf) < sizeof (buf) - 4) && strncpy (p, \".WAV\", 4)) {\n+ GP_DEBUG (\"filename_to_audio: New name for '%s' is '%s'\",\n+ filename, buf);\n+ return buf;\n+ } else {\n+ GP_DEBUG (\"filename_to_audio: \"\n+ \"New name for filename '%s' doesnt fit in %s line %i.\",\n+ filename, __FILE__, __LINE__);\n+ return NULL;\n+ }\n }\n \n \/**\n@@ -384,30 +384,30 @@\n const char *\n canon_int_filename2audioname (Camera *camera, const char *filename)\n {\n-\tchar *result;\n-\n-\t\/* We use the audio file itself as the audio file. In short:\n-\t * audiofile = audiofile(audiofile)\n-\t *\/\n-\tif (is_audio (filename)) {\n-\t\tGP_DEBUG (\"canon_int_filename2audioname: \\\"%s\\\" IS an audio file\",\n-\t\t\t filename);\n-\t\treturn filename;\n-\t}\n-\n-\t\/* There are only audio files for images and movies *\/\n-\tif (!(is_movie (filename) || is_image (filename))) {\n-\t\tGP_DEBUG (\"canon_int_filename2audioname: \"\n-\t\t\t \"\\\"%s\\\" is neither movie nor image -> no audio file\", filename);\n-\t\treturn NULL;\n-\t}\n-\n-\tresult = filename_to_audio (filename, \".WAV\");\n-\n-\tGP_DEBUG (\"canon_int_filename2audioname: audio for file \\\"%s\\\" is external: \\\"%s\\\"\",\n-\t\t filename, result);\n-\n-\treturn result;\n+ char *result;\n+\n+ \/* We use the audio file itself as the audio file. In short:\n+ * audiofile = audiofile(audiofile)\n+ *\/\n+ if (is_audio (filename)) {\n+ GP_DEBUG (\"canon_int_filename2audioname: \\\"%s\\\" IS an audio file\",\n+ filename);\n+ return filename;\n+ }\n+\n+ \/* There are only audio files for images and movies *\/\n+ if (!(is_movie (filename) || is_image (filename))) {\n+ GP_DEBUG (\"canon_int_filename2audioname: \"\n+ \"\\\"%s\\\" is neither movie nor image -> no audio file\", filename);\n+ return NULL;\n+ }\n+\n+ result = filename_to_audio (filename, \".WAV\");\n+\n+ GP_DEBUG (\"canon_int_filename2audioname: audio for file \\\"%s\\\" is external: \\\"%s\\\"\",\n+ filename, result);\n+\n+ return result;\n }\n \n \/**\n@@ -427,48 +427,48 @@\n const char *\n canon_int_filename2thumbname (Camera *camera, const char *filename)\n {\n-\tstatic char *nullstring = \"\";\n-\n-\t\/* First handle cases where we shouldn't try to get extra .THM\n-\t * file but use the special get_thumbnail_of_xxx function.\n-\t *\/\n-\tif (!extra_file_for_thumb_of_jpeg && is_jpeg (filename)) {\n-\t\tGP_DEBUG (\"canon_int_filename2thumbname: thumbnail for JPEG \\\"%s\\\" is internal\",\n-\t\t\t filename);\n-\t\treturn nullstring;\n-\t}\n-\tif (!extra_file_for_thumb_of_crw && is_crw (filename)) {\n-\t\tGP_DEBUG (\"canon_int_filename2thumbname: thumbnail for CRW \\\"%s\\\" is internal\",\n-\t\t\t filename);\n-\t\treturn nullstring;\n-\t}\n-\n-\t\/* We use the thumbnail file itself as the thumbnail of the\n-\t * thumbnail file. In short thumbfile = thumbnail(thumbfile)\n-\t *\/\n-\tif (is_thumbnail (filename)) {\n-\t\tGP_DEBUG (\"canon_int_filename2thumbname: \\\"%s\\\" IS a thumbnail file\",\n-\t\t\t filename);\n-\t\treturn filename;\n-\t}\n-\n-\t\/* There are only thumbnails for images and movies *\/\n-\tif (!is_movie (filename) && !is_image (filename)) {\n-\t\tGP_DEBUG (\"canon_int_filename2thumbname: \"\n-\t\t\t \"\\\"%s\\\" is neither movie nor image -> no thumbnail\", filename);\n-\t\treturn NULL;\n-\t}\n-\n-\tGP_DEBUG (\"canon_int_filename2thumbname: thumbnail for file \\\"%s\\\" is external\",\n-\t\t filename);\n-\n-\t\/* We just replace file ending by .THM and assume this is the\n-\t * name of the thumbnail file.\n-\t *\/\n-\treturn replace_filename_extension (filename, \".THM\");\n-\n-\t\/* never reached *\/\n-\treturn NULL;\n+ static char *nullstring = \"\";\n+\n+ \/* First handle cases where we shouldn't try to get extra .THM\n+ * file but use the special get_thumbnail_of_xxx function.\n+ *\/\n+ if (!extra_file_for_thumb_of_jpeg && is_jpeg (filename)) {\n+ GP_DEBUG (\"canon_int_filename2thumbname: thumbnail for JPEG \\\"%s\\\" is internal\",\n+ filename);\n+ return nullstring;\n+ }\n+ if (!extra_file_for_thumb_of_crw && is_crw (filename)) {\n+ GP_DEBUG (\"canon_int_filename2thumbname: thumbnail for CRW \\\"%s\\\" is internal\",\n+ filename);\n+ return nullstring;\n+ }\n+\n+ \/* We use the thumbnail file itself as the thumbnail of the\n+ * thumbnail file. In short thumbfile = thumbnail(thumbfile)\n+ *\/\n+ if (is_thumbnail (filename)) {\n+ GP_DEBUG (\"canon_int_filename2thumbname: \\\"%s\\\" IS a thumbnail file\",\n+ filename);\n+ return filename;\n+ }\n+\n+ \/* There are only thumbnails for images and movies *\/\n+ if (!is_movie (filename) && !is_image (filename)) {\n+ GP_DEBUG (\"canon_int_filename2thumbname: \"\n+ \"\\\"%s\\\" is neither movie nor image -> no thumbnail\", filename);\n+ return NULL;\n+ }\n+\n+ GP_DEBUG (\"canon_int_filename2thumbname: thumbnail for file \\\"%s\\\" is external\",\n+ filename);\n+\n+ \/* We just replace file ending by .THM and assume this is the\n+ * name of the thumbnail file.\n+ *\/\n+ return replace_filename_extension (filename, \".THM\");\n+\n+ \/* never reached *\/\n+ return NULL;\n }\n \n \/**\n@@ -489,66 +489,66 @@\n *\/\n int\n canon_int_directory_operations (Camera *camera, const char *path, canonDirFunctionCode action,\n-\t\t\t\tGPContext *context)\n-{\n-\tunsigned char *msg;\n-\tint len, canon_usb_funct;\n-\tchar type;\n-\n-\tswitch (action) {\n-\t\tcase DIR_CREATE:\n-\t\t\ttype = 0x5;\n-\t\t\tcanon_usb_funct = CANON_USB_FUNCTION_MKDIR;\n-\t\t\tbreak;\n-\t\tcase DIR_REMOVE:\n-\t\t\ttype = 0x6;\n-\t\t\tcanon_usb_funct = CANON_USB_FUNCTION_RMDIR;\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tGP_DEBUG (\"canon_int_directory_operations: \"\n-\t\t\t\t \"Bad operation specified : %i\", action);\n-\t\t\treturn GP_ERROR_BAD_PARAMETERS;\n-\t\t\tbreak;\n-\t}\n-\n-\tGP_DEBUG (\"canon_int_directory_operations() called to %s the directory '%s'\",\n-\t\t canon_usb_funct == CANON_USB_FUNCTION_MKDIR ? \"create\" : \"remove\", path);\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, canon_usb_funct, &len, path,\n-\t\t\t\t\t\t strlen (path) + 1);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, type, 0x11, &len, path,\n-\t\t\t\t\t\t strlen (path) + 1, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x4) {\n-\t\tGP_DEBUG (\"canon_int_directory_operations: Unexpected amount \"\n-\t\t\t \"of data returned (expected %i got %i)\", 0x4, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\tif (msg[0] != 0x00) {\n-\t\tif ( action == DIR_CREATE )\n-\t\t\tgp_context_error (context, _(\"Could not create directory %s.\"),\n-\t\t\t\t\t path );\n-\t\telse\n-\t\t\tgp_context_error (context, _(\"Could not remove directory %s.\"),\n-\t\t\t\t\t path);\n-\t\treturn GP_ERROR_CAMERA_ERROR;\n-\t}\n-\n-\treturn GP_OK;\n+ GPContext *context)\n+{\n+ unsigned char *msg;\n+ int len, canon_usb_funct;\n+ char type;\n+\n+ switch (action) {\n+ case DIR_CREATE:\n+ type = 0x5;\n+ canon_usb_funct = CANON_USB_FUNCTION_MKDIR;\n+ break;\n+ case DIR_REMOVE:\n+ type = 0x6;\n+ canon_usb_funct = CANON_USB_FUNCTION_RMDIR;\n+ break;\n+ default:\n+ GP_DEBUG (\"canon_int_directory_operations: \"\n+ \"Bad operation specified : %i\", action);\n+ return GP_ERROR_BAD_PARAMETERS;\n+ break;\n+ }\n+\n+ GP_DEBUG (\"canon_int_directory_operations() called to %s the directory '%s'\",\n+ canon_usb_funct == CANON_USB_FUNCTION_MKDIR ? \"create\" : \"remove\", path);\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, canon_usb_funct, &len, path,\n+ strlen (path) + 1);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, type, 0x11, &len, path,\n+ strlen (path) + 1, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x4) {\n+ GP_DEBUG (\"canon_int_directory_operations: Unexpected amount \"\n+ \"of data returned (expected %i got %i)\", 0x4, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ if (msg[0] != 0x00) {\n+ if ( action == DIR_CREATE )\n+ gp_context_error (context, _(\"Could not create directory %s.\"),\n+ path );\n+ else\n+ gp_context_error (context, _(\"Could not remove directory %s.\"),\n+ path);\n+ return GP_ERROR_CAMERA_ERROR;\n+ }\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -569,45 +569,45 @@\n int\n canon_int_identify_camera (Camera *camera, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\n-\tGP_DEBUG (\"canon_int_identify_camera() called\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_IDENTIFY_CAMERA,\n-\t\t\t\t\t\t &len, NULL, 0);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x01, 0x12, &len, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tGP_DEBUG (\"canon_int_identify_camera: msg error\");\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x4c) {\n-\t\tGP_DEBUG (\"canon_int_identify_camera: Unexpected length returned \"\n-\t\t\t \"(expected %i got %i); continuing.\", 0x4c, len);\n-\t}\n-\n-\t\/* Store these values in our \"camera\" structure: *\/\n-\tmemcpy (camera->pl->firmwrev, (char *) msg + 8, 4);\n-\tstrncpy (camera->pl->ident, (char *) msg + 12, 32);\n-\tstrncpy (camera->pl->owner, (char *) msg + 44, 32);\n-\n-\tGP_DEBUG (\"canon_int_identify_camera: ident '%s' owner '%s', firmware %d.%d.%d.%d\",\n-\t\t camera->pl->ident, camera->pl->owner,\n-\t\t camera->pl->firmwrev[3], camera->pl->firmwrev[2],\n-\t\t camera->pl->firmwrev[1], camera->pl->firmwrev[0] );\n-\n-\treturn GP_OK;\n+ unsigned char *msg;\n+ int len;\n+\n+ GP_DEBUG (\"canon_int_identify_camera() called\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_IDENTIFY_CAMERA,\n+ &len, NULL, 0);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x01, 0x12, &len, NULL);\n+ if ( msg == NULL ) {\n+ GP_DEBUG (\"canon_int_identify_camera: msg error\");\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x4c) {\n+ GP_DEBUG (\"canon_int_identify_camera: Unexpected length returned \"\n+ \"(expected %i got %i); continuing.\", 0x4c, len);\n+ }\n+\n+ \/* Store these values in our \"camera\" structure: *\/\n+ memcpy (camera->pl->firmwrev, (char *) msg + 8, 4);\n+ strncpy (camera->pl->ident, (char *) msg + 12, 32);\n+ strncpy (camera->pl->owner, (char *) msg + 44, 32);\n+\n+ GP_DEBUG (\"canon_int_identify_camera: ident '%s' owner '%s', firmware %d.%d.%d.%d\",\n+ camera->pl->ident, camera->pl->owner,\n+ camera->pl->firmwrev[3], camera->pl->firmwrev[2],\n+ camera->pl->firmwrev[1], camera->pl->firmwrev[0] );\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -625,50 +625,50 @@\n int\n canon_int_get_battery (Camera *camera, int *pwr_status, int *pwr_source, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\n-\tGP_DEBUG (\"canon_int_get_battery()\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tif ( camera->pl->md->model == CANON_CLASS_6 )\n-\t\t\t\t\/* Newer protocol uses a different code, but with same response. *\/\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_POWER_STATUS_2,\n-\t\t\t\t\t\t\t &len, NULL, 0);\n-\t\t\telse\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_POWER_STATUS,\n-\t\t\t\t\t\t\t &len, NULL, 0);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x0a, 0x12, &len, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x8) {\n-\t\tGP_DEBUG (\"canon_int_get_battery: Unexpected amount of data returned \"\n-\t\t\t \"(expected %i got %i)\", 0x8, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\tif (pwr_status)\n-\t\t*pwr_status = msg[4];\n-\tif (pwr_source)\n-\t\t*pwr_source = msg[7];\n-\n-\tGP_DEBUG (\"canon_int_get_battery: Status: %02x (%s) \/ Source: %02x (%s)\\n\",\n-\t\t msg[4], (msg[4]==CAMERA_POWER_OK?\"OK\":\"BAD\"),\n-\t\t msg[7], (msg[7]&CAMERA_MASK_BATTERY?\"BATTERY\":\"AC\") );\n-\n-\treturn GP_OK;\n+ unsigned char *msg;\n+ int len;\n+\n+ GP_DEBUG (\"canon_int_get_battery()\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ if ( camera->pl->md->model == CANON_CLASS_6 )\n+ \/* Newer protocol uses a different code, but with same response. *\/\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_POWER_STATUS_2,\n+ &len, NULL, 0);\n+ else\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_POWER_STATUS,\n+ &len, NULL, 0);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x0a, 0x12, &len, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x8) {\n+ GP_DEBUG (\"canon_int_get_battery: Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x8, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ if (pwr_status)\n+ *pwr_status = msg[4];\n+ if (pwr_source)\n+ *pwr_source = msg[7];\n+\n+ GP_DEBUG (\"canon_int_get_battery: Status: %02x (%s) \/ Source: %02x (%s)\\n\",\n+ msg[4], (msg[4]==CAMERA_POWER_OK?\"OK\":\"BAD\"),\n+ msg[7], (msg[7]&CAMERA_MASK_BATTERY?\"BATTERY\":\"AC\") );\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -695,36 +695,36 @@\n int\n canon_int_get_picture_abilities (Camera *camera, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\n-\tGP_DEBUG (\"canon_int_get_picture_abilities()\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_GET_PIC_ABILITIES,\n-\t\t\t\t\t\t &len, NULL, 0);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x1f, 0x12, &len, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x334) {\n-\t\tGP_DEBUG (\"canon_int_get_picture_abilities: Unexpected length returned \"\n-\t\t\t \"(expected %i got %i)\", 0x334, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\treturn GP_OK;\n+ unsigned char *msg;\n+ int len;\n+\n+ GP_DEBUG (\"canon_int_get_picture_abilities()\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_GET_PIC_ABILITIES,\n+ &len, NULL, 0);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x1f, 0x12, &len, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x334) {\n+ GP_DEBUG (\"canon_int_get_picture_abilities: Unexpected length returned \"\n+ \"(expected %i got %i)\", 0x334, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -747,31 +747,31 @@\n *\/\n int\n canon_int_pack_control_subcmd (unsigned char *payload, int subcmd,\n-\t\t\t int word0, int word1,\n-\t\t\t char *desc)\n-{\n-\tint i, paysize;\n-\n-\ti = 0;\n-\twhile (canon_usb_control_cmd[i].num != 0) {\n-\t\tif (canon_usb_control_cmd[i].num == subcmd)\n-\t\t\tbreak;\n-\t\ti++;\n-\t}\n-\tif (canon_usb_control_cmd[i].num == 0) {\n-\t\tGP_DEBUG (\"canon_int_pack_control_subcmd: unknown subcommand %d\", subcmd);\n-\t\tsprintf (desc, \"unknown subcommand\");\n-\t\treturn 0;\n-\t}\n-\n-\tsprintf (desc, \"%s\", canon_usb_control_cmd[i].description);\n-\tpaysize = canon_usb_control_cmd[i].cmd_length - 0x10;\n-\tmemset (payload, 0, paysize);\n-\tif (paysize >= 0x04) htole32a(payload, canon_usb_control_cmd[i].subcmd);\n-\tif (paysize >= 0x08) htole32a(payload+0x4, word0);\n-\tif (paysize >= 0x0c) htole32a(payload+0x8, word1);\n-\n-\treturn paysize;\n+ int word0, int word1,\n+ char *desc)\n+{\n+ int i, paysize;\n+\n+ i = 0;\n+ while (canon_usb_control_cmd[i].num != 0) {\n+ if (canon_usb_control_cmd[i].num == subcmd)\n+ break;\n+ i++;\n+ }\n+ if (canon_usb_control_cmd[i].num == 0) {\n+ GP_DEBUG (\"canon_int_pack_control_subcmd: unknown subcommand %d\", subcmd);\n+ sprintf (desc, \"unknown subcommand\");\n+ return 0;\n+ }\n+\n+ sprintf (desc, \"%s\", canon_usb_control_cmd[i].description);\n+ paysize = canon_usb_control_cmd[i].cmd_length - 0x10;\n+ memset (payload, 0, paysize);\n+ if (paysize >= 0x04) htole32a(payload, canon_usb_control_cmd[i].subcmd);\n+ if (paysize >= 0x08) htole32a(payload+0x4, word0);\n+ if (paysize >= 0x0c) htole32a(payload+0x8, word1);\n+\n+ return paysize;\n }\n \n \/**\n@@ -792,15 +792,15 @@\n int\n canon_int_do_control_command (Camera *camera, int subcmd, int a, int b)\n {\n-\tchar payload[0x4c];\n-\tchar desc[128];\n-\tint payloadlen;\n-\tint datalen = 0;\n-\tunsigned char *msg = NULL;\n-\n-\tpayloadlen = canon_int_pack_control_subcmd(payload, subcmd,\n-\t\t\t\t\t\t a, b, desc);\n-\tGP_DEBUG(\"%s++ with %x, %x\", desc, a, b);\n+ char payload[0x4c];\n+ char desc[128];\n+ int payloadlen;\n+ int datalen = 0;\n+ unsigned char *msg = NULL;\n+\n+ payloadlen = canon_int_pack_control_subcmd(payload, subcmd,\n+ a, b, desc);\n+ GP_DEBUG(\"%s++ with %x, %x\", desc, a, b);\n \n if ( camera->pl->md->model == CANON_CLASS_6 ) {\n \/* Newer protocol uses a different code, but with same\n@@ -815,17 +815,17 @@\n msg = canon_usb_dialogue(camera, \n CANON_USB_FUNCTION_CONTROL_CAMERA,\n &datalen, payload, payloadlen);\n-\tif ( msg == NULL && datalen != 0x1c) {\n-\t\t\/* ERROR *\/\n-\t\tGP_DEBUG(\"%s datalen=%x\",\n-\t\t\t desc, datalen);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\tmsg = NULL;\n-\tdatalen = 0;\n-\tGP_DEBUG(\"%s--\", desc);\n-\n-\treturn GP_OK;\n+ if ( msg == NULL && datalen != 0x1c) {\n+ \/* ERROR *\/\n+ GP_DEBUG(\"%s datalen=%x\",\n+ desc, datalen);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+ msg = NULL;\n+ datalen = 0;\n+ GP_DEBUG(\"%s--\", desc);\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -845,111 +845,111 @@\n *\/\n int\n canon_int_capture_preview (Camera *camera, unsigned char **data, int *length,\n-\t\t\t GPContext *context)\n-{\n-\tcanonTransferMode transfermode = REMOTE_CAPTURE_THUMB_TO_PC;\n-\n-\tint mstimeout = -1;\n-\tint status;\n-\n-\tswitch (camera->port->type) {\n-\tcase GP_PORT_USB:\n-\n-\t\tgp_port_get_timeout (camera->port, &mstimeout);\n-\t\tGP_DEBUG(\"canon_int_capture_preview: usb port timeout starts at %dms\", mstimeout);\n-\n-\t\t\/*\n-\t\t * Send a sequence of CONTROL_CAMERA commands.\n-\t\t *\/\n-\n-\t\tgp_port_set_timeout (camera->port, 15000);\n-\t\t\/* Init, extends camera lens, puts us in remote capture mode *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_INIT, 0, 0);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\t\/*\n-\t\t * Set the captured image transfer mode. We have four options\n-\t\t * that we can specify any combo of, captured thumb to PC,\n-\t\t * full to PC, thumb to disk, and full to disk.\n-\t\t *\n-\t\t * The to-PC option will return a length and integer\n-\t\t * key from canon_usb_capture_dialogue() to use in the\n-\t\t * \"Download Captured Image\" command.\n-\t\t *\n-\t\t *\/\n-\t\tGP_DEBUG ( \"canon_int_capture_preview: transfer mode is %x\\n\", transfermode );\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_SET_TRANSFER_MODE,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\tgp_port_set_timeout (camera->port, mstimeout);\n-\t\tGP_DEBUG(\"canon_int_capture_preview: set camera port timeout back to %d seconds...\", mstimeout \/ 1000 );\n-\n-\t\t\/* Get release parameters a couple of times, just to\n+ GPContext *context)\n+{\n+ canonTransferMode transfermode = REMOTE_CAPTURE_THUMB_TO_PC;\n+\n+ int mstimeout = -1;\n+ int status;\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+\n+ gp_port_get_timeout (camera->port, &mstimeout);\n+ GP_DEBUG(\"canon_int_capture_preview: usb port timeout starts at %dms\", mstimeout);\n+\n+ \/*\n+ * Send a sequence of CONTROL_CAMERA commands.\n+ *\/\n+\n+ gp_port_set_timeout (camera->port, 15000);\n+ \/* Init, extends camera lens, puts us in remote capture mode *\/\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_INIT, 0, 0);\n+ if ( status < 0 )\n+ return status;\n+\n+ \/*\n+ * Set the captured image transfer mode. We have four options\n+ * that we can specify any combo of, captured thumb to PC,\n+ * full to PC, thumb to disk, and full to disk.\n+ *\n+ * The to-PC option will return a length and integer\n+ * key from canon_usb_capture_dialogue() to use in the\n+ * \"Download Captured Image\" command.\n+ *\n+ *\/\n+ GP_DEBUG ( \"canon_int_capture_preview: transfer mode is %x\\n\", transfermode );\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_SET_TRANSFER_MODE,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ gp_port_set_timeout (camera->port, mstimeout);\n+ GP_DEBUG(\"canon_int_capture_preview: set camera port timeout back to %d seconds...\", mstimeout \/ 1000 );\n+\n+ \/* Get release parameters a couple of times, just to\n see if that helps. *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_GET_PARAMS,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_GET_PARAMS,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\t\/* Lock keys here for D30\/D60 *\/\n-\t\tif ( camera->pl->md->model == CANON_CLASS_4 ) {\n-\t\t\tstatus = canon_usb_lock_keys(camera,context);\n-\t\t\tif ( status < 0 ) {\n-\t\t\t\tgp_context_error (context, _(\"lock keys failed.\"));\n-\t\t\t\treturn status;\n-\t\t\t}\n-\t\t}\n-\n-\t\t\/* Shutter Release\n-\t\t Can't use normal \"canon_int_do_control_command\", as\n-\t\t we must read the interrupt pipe before the response\n-\t\t comes back for this commmand. *\/\n-\t\t*data = canon_usb_capture_dialogue ( camera, &status, context );\n-\t\tif ( *data == NULL ) {\n-\t\t\t\/* Try to leave camera in a usable state. *\/\n-\t\t\tcanon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_EXIT,\n-\t\t\t\t\t\t 0, 0);\n-\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t}\n-\n-\t\t\/* Download the thumbnail image. *\/\n-\t\tif ( camera->pl->thumb_length > 0 ) {\n-\t\t\tstatus = canon_usb_get_captured_thumbnail ( camera, camera->pl->image_key, data, length, context );\n-\t\t\tif ( status < 0 ) {\n-\t\t\t\tGP_DEBUG ( \"canon_int_capture_preview:\"\n-\t\t\t\t\t \" thumbnail download failed, status= %i\", status );\n-\t\t\t\treturn status;\n-\t\t\t}\n-\t\t}\n-\n-\t\t\/* End release mode *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_EXIT,\n-\t\t\t\t\t\t 0, 0);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\tbreak;\n-\tcase GP_PORT_SERIAL:\n-\t\treturn GP_ERROR_NOT_SUPPORTED;\n-\t\tbreak;\n-\tGP_PORT_DEFAULT\n-\t}\n-\n-\treturn GP_OK;\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_GET_PARAMS,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_GET_PARAMS,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ \/* Lock keys here for D30\/D60 *\/\n+ if ( camera->pl->md->model == CANON_CLASS_4 ) {\n+ status = canon_usb_lock_keys(camera,context);\n+ if ( status < 0 ) {\n+ gp_context_error (context, _(\"lock keys failed.\"));\n+ return status;\n+ }\n+ }\n+\n+ \/* Shutter Release\n+ Can't use normal \"canon_int_do_control_command\", as\n+ we must read the interrupt pipe before the response\n+ comes back for this commmand. *\/\n+ *data = canon_usb_capture_dialogue ( camera, &status, context );\n+ if ( *data == NULL ) {\n+ \/* Try to leave camera in a usable state. *\/\n+ canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_EXIT,\n+ 0, 0);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ \/* Download the thumbnail image. *\/\n+ if ( camera->pl->thumb_length > 0 ) {\n+ status = canon_usb_get_captured_thumbnail ( camera, camera->pl->image_key, data, length, context );\n+ if ( status < 0 ) {\n+ GP_DEBUG ( \"canon_int_capture_preview:\"\n+ \" thumbnail download failed, status= %i\", status );\n+ return status;\n+ }\n+ }\n+\n+ \/* End release mode *\/\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_EXIT,\n+ 0, 0);\n+ if ( status < 0 )\n+ return status;\n+\n+ break;\n+ case GP_PORT_SERIAL:\n+ return GP_ERROR_NOT_SUPPORTED;\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -966,124 +966,124 @@\n *\n *\/\n static void canon_int_find_new_image ( Camera *camera, unsigned char *initial_state, unsigned char *final_state,\n-\t\t\t CameraFilePath *path )\n-{\n-\tunsigned char *old_entry = initial_state, *new_entry = final_state;\n-\n-\t\/* Set default path name *\/\n-\tstrncpy ( path->name, _(\"*UNKNOWN*\"), sizeof(path->name) );\n-\tstrncpy ( path->folder, _(\"*UNKNOWN*\"), sizeof(path->folder) );\n-\n-\tpath->folder[0] = 0; \/* Start with null pathname string. *\/\n-\tGP_DEBUG ( \"canon_int_find_new_image: starting directory compare\" );\n-\twhile ( le16atoh ( old_entry+CANON_DIRENT_ATTRS ) != 0\n-\t\t|| le32atoh ( old_entry + CANON_DIRENT_SIZE ) != 0\n-\t\t|| le32atoh ( old_entry + CANON_DIRENT_TIME ) != 0 ) {\n-\t\tchar *old_name = old_entry + CANON_DIRENT_NAME,\n-\t\t\t*new_name = new_entry + CANON_DIRENT_NAME;\n-\t\tGP_DEBUG ( \" old entry \\\"%s\\\", attr = 0x%02x, size=%i\",\n-\t\t\t old_name,\n-\t\t\t old_entry[CANON_DIRENT_ATTRS],\n-\t\t\t le32atoh ( old_entry + CANON_DIRENT_SIZE ) );\n-\t\tGP_DEBUG ( \" new entry \\\"%s\\\", attr = 0x%02x, size=%i\",\n-\t\t\t new_name,\n-\t\t\t new_entry[CANON_DIRENT_ATTRS],\n-\t\t\t le32atoh ( new_entry + CANON_DIRENT_SIZE ) );\n-\t\tif ( *old_entry != *new_entry\n-\t\t || le32atoh ( old_entry + CANON_DIRENT_SIZE ) != le32atoh ( new_entry + CANON_DIRENT_SIZE )\n-\t\t || le32atoh ( old_entry + CANON_DIRENT_TIME ) != le32atoh ( new_entry + CANON_DIRENT_TIME )\n-\t\t || strcmp ( old_name, new_name ) ) {\n-\t\t\t\/* Mismatch. Presumably a\n-\t\t\t new file, but is it an\n-\t\t\t image file? *\/\n-\t\t\tGP_DEBUG ( \"Found mismatch\" );\n-\t\t\tif ( is_image ( new_name ) ) {\n-\t\t\t\t\/* Yup, we'll assume that this is the new image. *\/\n-\t\t\t\tGP_DEBUG ( \" Found our new image file\" );\n-\t\t\t\tstrncpy ( path->name, new_name,\n-\t\t\t\t\t strlen ( new_name ) );\n-\t\t\t\tstrcpy ( path->folder, canon2gphotopath ( camera, path->folder ) );\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\telse {\n-\t\t\t\t\/* The mismatch is not an image\n-\t\t\t\t file. There are three\n-\t\t\t\t possibilities:\n-\n-\t\t\t\t 1. This is a new directory with no\n-\t\t\t\t files. The next entry will be\n-\t\t\t\t another directory.\n-\n-\t\t\t\t 2. This is an auxiliary file\n-\t\t\t\t (sound, thumbnail, catalog).\n-\n-\t\t\t\t In either of these cases, the thing\n-\t\t\t\t to do is to skip this entry in the\n-\t\t\t\t new directory.\n-\n-\t\t\t\t 3. This is a new directory with new\n-\t\t\t\t files, and we will enter it.\n-\t\t\t\t The next entry in the new\n-\t\t\t\t directory will be a new file,\n-\t\t\t\t which may well be our new image\n-\t\t\t\t file.\n-\n-\t\t\t\t *\/\n-\t\t\t\tif ( le16atoh ( new_entry+CANON_DIRENT_ATTRS ) & CANON_ATTR_RECURS_ENT_DIR ) {\n-\t\t\t\t\tif ( !strcmp ( \"..\", new_name ) ) {\n-\t\t\t\t\t\t\/* Pop out of this directory *\/\n-\t\t\t\t\t\tunsigned char *local_dir = strrchr(path->folder,'\\\\') + 1;\n-\t\t\t\t\t\tGP_DEBUG ( \"Leaving directory \\\"%s\\\"\", local_dir );\n-\t\t\t\t\t\tlocal_dir[-1] = 0;\n-\t\t\t\t\t}\n-\t\t\t\t\telse {\n-\t\t\t\t\t\t\/\/ New directory, and we need to enter it.\n-\t\t\t\t\t\tGP_DEBUG ( \"Entering directory \\\"%s\\\"\", new_name );\n-\t\t\t\t\t\tif ( new_entry[CANON_DIRENT_NAME] == '.' )\n-\t\t\t\t\t\t\t\/* Ignore a leading dot *\/\n-\t\t\t\t\t\t\tstrncat ( path->folder,\n-\t\t\t\t\t\t\t\t new_name + 1,\n-\t\t\t\t\t\t\t\t sizeof(path->folder) - strlen(path->folder) - 1 );\n-\t\t\t\t\t\telse\n-\t\t\t\t\t\t\tstrncat ( path->folder,\n-\t\t\t\t\t\t\t\t new_name,\n-\t\t\t\t\t\t\t\t sizeof(path->folder) - strlen(path->folder) - 1 );\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\tnew_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( new_entry+CANON_DIRENT_NAME );\n-\t\t\t}\n-\t\t}\n-\t\telse {\n-\t\t\tif ( le16atoh ( old_entry+CANON_DIRENT_ATTRS ) & CANON_ATTR_RECURS_ENT_DIR ) {\n-\t\t\t\t\/* Entered a new directory; append its\n-\t\t\t\t name to the current folder path.\n-\t\t\t\t The end of a directory is signaled\n-\t\t\t\t by an entry with zero length and\n-\t\t\t\t time, and name \"..\". *\/\n-\t\t\t\tif ( !strcmp ( \"..\", old_name ) ) {\n-\t\t\t\t\t\/* Pop out of this directory *\/\n-\t\t\t\t\tunsigned char *local_dir = strrchr(path->folder,'\\\\') + 1;\n-\t\t\t\t\tGP_DEBUG ( \"Leaving directory \\\"%s\\\"\", local_dir );\n-\t\t\t\t\tlocal_dir[-1] = 0;\n-\t\t\t\t}\n-\t\t\t\telse {\n-\t\t\t\t\tGP_DEBUG ( \"Entering directory \\\"%s\\\"\", old_name );\n-\t\t\t\t\tif ( old_name[0] == '.' )\n-\t\t\t\t\t\t\/* Ignore a leading dot *\/\n-\t\t\t\t\t\tstrncat ( path->folder,\n-\t\t\t\t\t\t\t old_name + 1,\n-\t\t\t\t\t\t\t sizeof(path->folder) - strlen(path->folder) - 1 );\n-\t\t\t\t\telse\n-\t\t\t\t\t\tstrncat ( path->folder,\n-\t\t\t\t\t\t\t old_name,\n-\t\t\t\t\t\t\t sizeof(path->folder) - strlen(path->folder) - 1 );\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\t\/* Move to next entry *\/\n-\t\t\tnew_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( new_entry+CANON_DIRENT_NAME );\n-\t\t\told_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( old_entry+CANON_DIRENT_NAME );\n-\t\t}\n-\t}\n+ CameraFilePath *path )\n+{\n+ unsigned char *old_entry = initial_state, *new_entry = final_state;\n+\n+ \/* Set default path name *\/\n+ strncpy ( path->name, _(\"*UNKNOWN*\"), sizeof(path->name) );\n+ strncpy ( path->folder, _(\"*UNKNOWN*\"), sizeof(path->folder) );\n+\n+ path->folder[0] = 0; \/* Start with null pathname string. *\/\n+ GP_DEBUG ( \"canon_int_find_new_image: starting directory compare\" );\n+ while ( le16atoh ( old_entry+CANON_DIRENT_ATTRS ) != 0\n+ || le32atoh ( old_entry + CANON_DIRENT_SIZE ) != 0\n+ || le32atoh ( old_entry + CANON_DIRENT_TIME ) != 0 ) {\n+ char *old_name = old_entry + CANON_DIRENT_NAME,\n+ *new_name = new_entry + CANON_DIRENT_NAME;\n+ GP_DEBUG ( \" old entry \\\"%s\\\", attr = 0x%02x, size=%i\",\n+ old_name,\n+ old_entry[CANON_DIRENT_ATTRS],\n+ le32atoh ( old_entry + CANON_DIRENT_SIZE ) );\n+ GP_DEBUG ( \" new entry \\\"%s\\\", attr = 0x%02x, size=%i\",\n+ new_name,\n+ new_entry[CANON_DIRENT_ATTRS],\n+ le32atoh ( new_entry + CANON_DIRENT_SIZE ) );\n+ if ( *old_entry != *new_entry\n+ || le32atoh ( old_entry + CANON_DIRENT_SIZE ) != le32atoh ( new_entry + CANON_DIRENT_SIZE )\n+ || le32atoh ( old_entry + CANON_DIRENT_TIME ) != le32atoh ( new_entry + CANON_DIRENT_TIME )\n+ || strcmp ( old_name, new_name ) ) {\n+ \/* Mismatch. Presumably a\n+ new file, but is it an\n+ image file? *\/\n+ GP_DEBUG ( \"Found mismatch\" );\n+ if ( is_image ( new_name ) ) {\n+ \/* Yup, we'll assume that this is the new image. *\/\n+ GP_DEBUG ( \" Found our new image file\" );\n+ strncpy ( path->name, new_name,\n+ strlen ( new_name ) );\n+ strcpy ( path->folder, canon2gphotopath ( camera, path->folder ) );\n+ break;\n+ }\n+ else {\n+ \/* The mismatch is not an image\n+ file. There are three\n+ possibilities:\n+\n+ 1. This is a new directory with no\n+ files. The next entry will be\n+ another directory.\n+\n+ 2. This is an auxiliary file\n+ (sound, thumbnail, catalog).\n+\n+ In either of these cases, the thing\n+ to do is to skip this entry in the\n+ new directory.\n+\n+ 3. This is a new directory with new\n+ files, and we will enter it.\n+ The next entry in the new\n+ directory will be a new file,\n+ which may well be our new image\n+ file.\n+\n+ *\/\n+ if ( le16atoh ( new_entry+CANON_DIRENT_ATTRS ) & CANON_ATTR_RECURS_ENT_DIR ) {\n+ if ( !strcmp ( \"..\", new_name ) ) {\n+ \/* Pop out of this directory *\/\n+ unsigned char *local_dir = strrchr(path->folder,'\\\\') + 1;\n+ GP_DEBUG ( \"Leaving directory \\\"%s\\\"\", local_dir );\n+ local_dir[-1] = 0;\n+ }\n+ else {\n+ \/\/ New directory, and we need to enter it.\n+ GP_DEBUG ( \"Entering directory \\\"%s\\\"\", new_name );\n+ if ( new_entry[CANON_DIRENT_NAME] == '.' )\n+ \/* Ignore a leading dot *\/\n+ strncat ( path->folder,\n+ new_name + 1,\n+ sizeof(path->folder) - strlen(path->folder) - 1 );\n+ else\n+ strncat ( path->folder,\n+ new_name,\n+ sizeof(path->folder) - strlen(path->folder) - 1 );\n+ }\n+ }\n+ new_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( new_entry+CANON_DIRENT_NAME );\n+ }\n+ }\n+ else {\n+ if ( le16atoh ( old_entry+CANON_DIRENT_ATTRS ) & CANON_ATTR_RECURS_ENT_DIR ) {\n+ \/* Entered a new directory; append its\n+ name to the current folder path.\n+ The end of a directory is signaled\n+ by an entry with zero length and\n+ time, and name \"..\". *\/\n+ if ( !strcmp ( \"..\", old_name ) ) {\n+ \/* Pop out of this directory *\/\n+ unsigned char *local_dir = strrchr(path->folder,'\\\\') + 1;\n+ GP_DEBUG ( \"Leaving directory \\\"%s\\\"\", local_dir );\n+ local_dir[-1] = 0;\n+ }\n+ else {\n+ GP_DEBUG ( \"Entering directory \\\"%s\\\"\", old_name );\n+ if ( old_name[0] == '.' )\n+ \/* Ignore a leading dot *\/\n+ strncat ( path->folder,\n+ old_name + 1,\n+ sizeof(path->folder) - strlen(path->folder) - 1 );\n+ else\n+ strncat ( path->folder,\n+ old_name,\n+ sizeof(path->folder) - strlen(path->folder) - 1 );\n+ }\n+ }\n+ \/* Move to next entry *\/\n+ new_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( new_entry+CANON_DIRENT_NAME );\n+ old_entry += CANON_MINIMUM_DIRENT_SIZE + strlen ( old_entry+CANON_DIRENT_NAME );\n+ }\n+ }\n }\n \n \/**\n@@ -1102,131 +1102,131 @@\n *\/\n int\n canon_int_capture_image (Camera *camera, CameraFilePath *path,\n-\t\t\t GPContext *context)\n-{\n-\tcanonTransferMode transfermode = REMOTE_CAPTURE_FULL_TO_DRIVE;\n-\n-\tint mstimeout = -1;\n-\tint status;\n-\n-\tunsigned char *data = NULL;\n-\tunsigned char *initial_state, *final_state; \/* For comparing\n-\t\t\t\t\t\t * before\/after\n-\t\t\t\t\t\t * directories *\/\n-\tint initial_state_len, final_state_len;\n-\n-\tswitch (camera->port->type) {\n-\tcase GP_PORT_USB:\n-\t\t\/* List all directories on the camera to get a\n-\t\t baseline to find the new file. *\/\n-\t\tstatus = canon_usb_list_all_dirs ( camera, &initial_state, &initial_state_len, context );\n-\n-\t\tif ( status < 0 ) {\n-\t\t\tgp_context_error (context, _(\"canon_int_capture_image: initial canon_usb_list_all_dirs() failed with status %i\"), status );\n-\t\t\treturn status;\n-\t\t}\n-\n-\t\tgp_port_get_timeout (camera->port, &mstimeout);\n-\t\tGP_DEBUG(\"canon_int_capture_image: usb port timeout starts at %dms\", mstimeout);\n-\n-\t\t\/*\n-\t\t * Send a sequence of CONTROL_CAMERA commands.\n-\t\t *\/\n-\n-\t\tgp_port_set_timeout (camera->port, 15000);\n-\t\t\/* Init, extends camera lens, puts us in remote capture mode *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_INIT, 0, 0);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\t\/*\n-\t\t * Set the captured image transfer mode. We have four options\n-\t\t * that we can specify any combo of, captured thumb to PC,\n-\t\t * full to PC, thumb to disk, and full to disk.\n-\t\t *\n-\t\t * The to-PC option will return a length and integer\n-\t\t * key from canon_usb_capture_dialogue() to use in the\n-\t\t * \"Download Captured Image\" command.\n-\t\t *\n-\t\t *\/\n-\t\tGP_DEBUG ( \"canon_int_capture_image: transfer mode is %x\\n\", transfermode );\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_SET_TRANSFER_MODE,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\tgp_port_set_timeout (camera->port, mstimeout);\n-\t\tGP_DEBUG(\"canon_int_capture_image: set camera port timeout back to %d seconds...\", mstimeout \/ 1000 );\n-\n-\t\t\/* Get release parameters a couple of times, just to\n+ GPContext *context)\n+{\n+ canonTransferMode transfermode = REMOTE_CAPTURE_FULL_TO_DRIVE;\n+\n+ int mstimeout = -1;\n+ int status;\n+\n+ unsigned char *data = NULL;\n+ unsigned char *initial_state, *final_state; \/* For comparing\n+ * before\/after\n+ * directories *\/\n+ int initial_state_len, final_state_len;\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ \/* List all directories on the camera to get a\n+ baseline to find the new file. *\/\n+ status = canon_usb_list_all_dirs ( camera, &initial_state, &initial_state_len, context );\n+\n+ if ( status < 0 ) {\n+ gp_context_error (context, _(\"canon_int_capture_image: initial canon_usb_list_all_dirs() failed with status %i\"), status );\n+ return status;\n+ }\n+\n+ gp_port_get_timeout (camera->port, &mstimeout);\n+ GP_DEBUG(\"canon_int_capture_image: usb port timeout starts at %dms\", mstimeout);\n+\n+ \/*\n+ * Send a sequence of CONTROL_CAMERA commands.\n+ *\/\n+\n+ gp_port_set_timeout (camera->port, 15000);\n+ \/* Init, extends camera lens, puts us in remote capture mode *\/\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_INIT, 0, 0);\n+ if ( status < 0 )\n+ return status;\n+\n+ \/*\n+ * Set the captured image transfer mode. We have four options\n+ * that we can specify any combo of, captured thumb to PC,\n+ * full to PC, thumb to disk, and full to disk.\n+ *\n+ * The to-PC option will return a length and integer\n+ * key from canon_usb_capture_dialogue() to use in the\n+ * \"Download Captured Image\" command.\n+ *\n+ *\/\n+ GP_DEBUG ( \"canon_int_capture_image: transfer mode is %x\\n\", transfermode );\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_SET_TRANSFER_MODE,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ gp_port_set_timeout (camera->port, mstimeout);\n+ GP_DEBUG(\"canon_int_capture_image: set camera port timeout back to %d seconds...\", mstimeout \/ 1000 );\n+\n+ \/* Get release parameters a couple of times, just to\n see if that helps. *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_GET_PARAMS,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_GET_PARAMS,\n-\t\t\t\t\t\t 0x04, transfermode);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\t\/* Lock keys here for D30\/D60 *\/\n-\t\tif ( camera->pl->md->model == CANON_CLASS_4 ) {\n-\t\t\tstatus = canon_usb_lock_keys(camera,context);\n-\t\t\tif ( status < 0 ) {\n-\t\t\t\tgp_context_error (context, _(\"lock keys failed.\"));\n-\t\t\t\treturn status;\n-\t\t\t}\n-\t\t}\n-\n-\t\t\/* Shutter Release\n-\t\t Can't use normal \"canon_int_do_control_command\", as\n-\t\t we must read the interrupt pipe before the response\n-\t\t comes back for this commmand. *\/\n-\t\tdata = canon_usb_capture_dialogue ( camera, &status, context );\n-\t\tif ( data == NULL ) {\n-\t\t\t\/* Try to leave camera in a usable state. *\/\n-\t\t\tcanon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_EXIT,\n-\t\t\t\t\t\t 0, 0);\n-\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t}\n-\n-\t\t\/* End release mode *\/\n-\t\tstatus = canon_int_do_control_command (camera,\n-\t\t\t\t\t\t CANON_USB_CONTROL_EXIT,\n-\t\t\t\t\t\t 0, 0);\n-\t\tif ( status < 0 )\n-\t\t\treturn status;\n-\n-\t\t\/* Now list all directories on the camera; this has\n-\t\t presumably added an image file. Find the difference\n-\t\t and decode to return real path and file names. *\/\n-\t\tstatus = canon_usb_list_all_dirs ( camera, &final_state, &final_state_len, context );\n-\t\tif ( status < 0 ) {\n-\t\t\tgp_context_error ( context,\n-\t\t\t\t\t _(\"canon_int_capture_image:\"\n-\t\t\t\t\t \" final canon_usb_list_all_dirs() failed with status %i\"),\n-\t\t\t\t\t status );\n-\t\t\treturn status;\n-\t\t}\n-\n-\t\t\/* Find new file name in camera directory *\/\n-\t\tcanon_int_find_new_image ( camera, initial_state, final_state, path );\n-\t\tfree ( initial_state );\n-\t\tfree ( final_state );\n-\t\tbreak;\n-\tcase GP_PORT_SERIAL:\n-\t\treturn GP_ERROR_NOT_SUPPORTED;\n-\t\tbreak;\n-\tGP_PORT_DEFAULT\n-\t}\n-\n-\treturn GP_OK;\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_GET_PARAMS,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_GET_PARAMS,\n+ 0x04, transfermode);\n+ if ( status < 0 )\n+ return status;\n+\n+ \/* Lock keys here for D30\/D60 *\/\n+ if ( camera->pl->md->model == CANON_CLASS_4 ) {\n+ status = canon_usb_lock_keys(camera,context);\n+ if ( status < 0 ) {\n+ gp_context_error (context, _(\"lock keys failed.\"));\n+ return status;\n+ }\n+ }\n+\n+ \/* Shutter Release\n+ Can't use normal \"canon_int_do_control_command\", as\n+ we must read the interrupt pipe before the response\n+ comes back for this commmand. *\/\n+ data = canon_usb_capture_dialogue ( camera, &status, context );\n+ if ( data == NULL ) {\n+ \/* Try to leave camera in a usable state. *\/\n+ canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_EXIT,\n+ 0, 0);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ \/* End release mode *\/\n+ status = canon_int_do_control_command (camera,\n+ CANON_USB_CONTROL_EXIT,\n+ 0, 0);\n+ if ( status < 0 )\n+ return status;\n+\n+ \/* Now list all directories on the camera; this has\n+ presumably added an image file. Find the difference\n+ and decode to return real path and file names. *\/\n+ status = canon_usb_list_all_dirs ( camera, &final_state, &final_state_len, context );\n+ if ( status < 0 ) {\n+ gp_context_error ( context,\n+ _(\"canon_int_capture_image:\"\n+ \" final canon_usb_list_all_dirs() failed with status %i\"),\n+ status );\n+ return status;\n+ }\n+\n+ \/* Find new file name in camera directory *\/\n+ canon_int_find_new_image ( camera, initial_state, final_state, path );\n+ free ( initial_state );\n+ free ( final_state );\n+ break;\n+ case GP_PORT_SERIAL:\n+ return GP_ERROR_NOT_SUPPORTED;\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ return GP_OK;\n }\n \n \n@@ -1245,52 +1245,52 @@\n *\/\n int\n canon_int_set_file_attributes (Camera *camera, const char *file, const char *dir,\n-\t\t\t canonDirentAttributeBits attrs, GPContext *context)\n-{\n-\tunsigned char *payload;\n-\tunsigned char *msg;\n-\tunsigned char attr[4];\n-\tint len, payload_length;\n-\n-\tGP_DEBUG (\"canon_int_set_file_attributes() called for '%s' '%s', attributes 0x%x\",\n-\t\t dir, file, attrs);\n-\n-\tattr[0] = attr[1] = attr[2] = 0;\n-\tattr[3] = attrs;\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tpayload_length = 4 + strlen (dir) + 1 + strlen (file) + 2;\n-\t\t\tpayload = (unsigned char*) calloc ( payload_length, sizeof(unsigned char) );\n-\t\t\t\/* create payload (yes, path and filename are two different strings\n-\t\t\t * and not meant to be concatenated)\n-\t\t\t *\/\n-\t\t\treturn canon_usb_set_file_attributes ( camera, attrs, dir, file, context );\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0xe, 0x11, &len, attr, 4,\n-\t\t\t\t\t\t dir, strlen (dir) + 1, file,\n-\t\t\t\t\t\t strlen (file) + 1, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x4) {\n-\t\tGP_DEBUG (\"canon_int_set_file_attributes: Unexpected amount of data returned \"\n-\t\t\t \"(expected %i got %i)\", 0x4, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\tGP_LOG (GP_LOG_DATA,\n-\t\t\"canon_int_set_file_attributes: returned four bytes as expected, \"\n-\t\t\"we should check if they indicate error or not. Returned data :\");\n-\tgp_log_data (\"canon\", msg, 4);\n-\n-\treturn GP_OK;\n+ canonDirentAttributeBits attrs, GPContext *context)\n+{\n+ unsigned char *payload;\n+ unsigned char *msg;\n+ unsigned char attr[4];\n+ int len, payload_length;\n+\n+ GP_DEBUG (\"canon_int_set_file_attributes() called for '%s' '%s', attributes 0x%x\",\n+ dir, file, attrs);\n+\n+ attr[0] = attr[1] = attr[2] = 0;\n+ attr[3] = attrs;\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ payload_length = 4 + strlen (dir) + 1 + strlen (file) + 2;\n+ payload = (unsigned char*) calloc ( payload_length, sizeof(unsigned char) );\n+ \/* create payload (yes, path and filename are two different strings\n+ * and not meant to be concatenated)\n+ *\/\n+ return canon_usb_set_file_attributes ( camera, attrs, dir, file, context );\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0xe, 0x11, &len, attr, 4,\n+ dir, strlen (dir) + 1, file,\n+ strlen (file) + 1, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x4) {\n+ GP_DEBUG (\"canon_int_set_file_attributes: Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x4, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ GP_LOG (GP_LOG_DATA,\n+ \"canon_int_set_file_attributes: returned four bytes as expected, \"\n+ \"we should check if they indicate error or not. Returned data :\");\n+ gp_log_data (\"canon\", msg, 4);\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -1309,43 +1309,43 @@\n int\n canon_int_set_owner_name (Camera *camera, const char *name, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\n-\tGP_DEBUG (\"canon_int_set_owner_name() called, name = '%s'\", name);\n-\tif (strlen (name) > 30) {\n-\t\tgp_context_error (context,\n-\t\t\t\t _(\"Name '%s' (%i characters) \"\n-\t\t\t\t \"too long, maximum 30 characters are \"\n-\t\t\t\t \"allowed.\"), name, strlen (name));\n-\t\treturn GP_ERROR_BAD_PARAMETERS;\n-\t}\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_CAMERA_CHOWN,\n-\t\t\t\t\t\t &len, name, strlen (name) + 1);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x05, 0x12, &len, name,\n-\t\t\t\t\t\t strlen (name) + 1, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x04) {\n-\t\tGP_DEBUG (\"canon_int_set_owner_name: Unexpected amount of data returned \"\n-\t\t\t \"(expected %i got %i)\", 0x4, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\treturn canon_int_identify_camera (camera, context);\n+ unsigned char *msg;\n+ int len;\n+\n+ GP_DEBUG (\"canon_int_set_owner_name() called, name = '%s'\", name);\n+ if (strlen (name) > 30) {\n+ gp_context_error (context,\n+ _(\"Name '%s' (%i characters) \"\n+ \"too long, maximum 30 characters are \"\n+ \"allowed.\"), name, strlen (name));\n+ return GP_ERROR_BAD_PARAMETERS;\n+ }\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_CAMERA_CHOWN,\n+ &len, name, strlen (name) + 1);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x05, 0x12, &len, name,\n+ strlen (name) + 1, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x04) {\n+ GP_DEBUG (\"canon_int_set_owner_name: Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x4, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ return canon_int_identify_camera (camera, context);\n }\n \n \n@@ -1377,41 +1377,41 @@\n int\n canon_int_get_time (Camera *camera, time_t *camera_time, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\n-\tGP_DEBUG (\"canon_int_get_time()\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_GET_TIME, &len,\n-\t\t\t\t\t\t NULL, 0);\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x03, 0x12, &len, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x10) {\n-\t\tGP_DEBUG (\"canon_int_get_time: Unexpected amount of data returned \"\n-\t\t\t \"(expected %i got %i)\", 0x10, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\tif (camera_time != NULL)\n-\t\t*camera_time = (time_t) le32atoh (msg + 4);\n-\n-\t\/* XXX should strip \\n at the end of asctime() return data *\/\n-\tGP_DEBUG (\"Camera time: %s\", asctime (gmtime (camera_time)));\n-\n-\treturn GP_OK;\n+ unsigned char *msg;\n+ int len;\n+\n+ GP_DEBUG (\"canon_int_get_time()\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_GET_TIME, &len,\n+ NULL, 0);\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x03, 0x12, &len, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x10) {\n+ GP_DEBUG (\"canon_int_get_time: Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x10, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ if (camera_time != NULL)\n+ *camera_time = (time_t) le32atoh (msg + 4);\n+\n+ \/* XXX should strip \\n at the end of asctime() return data *\/\n+ GP_DEBUG (\"Camera time: %s\", asctime (gmtime (camera_time)));\n+\n+ return GP_OK;\n }\n \n \n@@ -1433,65 +1433,65 @@\n int\n canon_int_set_time (Camera *camera, time_t date, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len;\n-\tchar payload[12];\n-\ttime_t new_date;\n-\tstruct tm *tm;\n-\n-\tGP_DEBUG (\"canon_int_set_time: %i=0x%x %s\", (unsigned int) date, (unsigned int) date,\n-\t\t asctime (localtime (&date)));\n-\n-\t\/* call localtime() just to get 'extern long timezone' \/ tm->tm_gmtoff set.\n-\t *\n-\t * this handles DST too (at least if HAVE_TM_GMTOFF), if you are in UTC+1\n-\t * tm_gmtoff is 3600 and if you are in UTC+1+DST tm_gmtoff is 7200 (if your\n-\t * DST is one hour of course).\n-\t *\/\n-\ttm = localtime (&date);\n-\n-\t\/* convert to local UNIX time since canon cameras know nothing about timezones *\/\n+ unsigned char *msg;\n+ int len;\n+ char payload[12];\n+ time_t new_date;\n+ struct tm *tm;\n+\n+ GP_DEBUG (\"canon_int_set_time: %i=0x%x %s\", (unsigned int) date, (unsigned int) date,\n+ asctime (localtime (&date)));\n+\n+ \/* call localtime() just to get 'extern long timezone' \/ tm->tm_gmtoff set.\n+ *\n+ * this handles DST too (at least if HAVE_TM_GMTOFF), if you are in UTC+1\n+ * tm_gmtoff is 3600 and if you are in UTC+1+DST tm_gmtoff is 7200 (if your\n+ * DST is one hour of course).\n+ *\/\n+ tm = localtime (&date);\n+\n+ \/* convert to local UNIX time since canon cameras know nothing about timezones *\/\n \n #ifdef HAVE_TM_GMTOFF\n-\tnew_date = date + tm->tm_gmtoff;\n-\tGP_DEBUG (\"canon_int_set_time: converted %ld to localtime %ld (tm_gmtoff is %ld)\",\n-\t\t date, new_date, (long)tm->tm_gmtoff);\n+ new_date = date + tm->tm_gmtoff;\n+ GP_DEBUG (\"canon_int_set_time: converted %ld to localtime %ld (tm_gmtoff is %ld)\",\n+ date, new_date, (long)tm->tm_gmtoff);\n #else\n-\tnew_date = date - timezone;\n-\tGP_DEBUG (\"canon_int_set_time: converted %i to localtime %i (timezone is %i)\",\n-\t\t date, new_date, timezone);\n+ new_date = date - timezone;\n+ GP_DEBUG (\"canon_int_set_time: converted %i to localtime %i (timezone is %i)\",\n+ date, new_date, timezone);\n #endif\n \n-\tmemset (payload, 0, sizeof (payload));\n-\n-\thtole32a (payload, (unsigned int) new_date);\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_SET_TIME, &len,\n-\t\t\t\t\t\t payload, sizeof (payload));\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x04, 0x12, &len,\n-\t\t\t\t\t\t payload, sizeof (payload), NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 0x4) {\n-\t\tGP_DEBUG (\"canon_int_set_time: Unexpected amount of data returned \"\n-\t\t\t \"(expected %i got %i)\", 0x4, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\treturn GP_OK;\n+ memset (payload, 0, sizeof (payload));\n+\n+ htole32a (payload, (unsigned int) new_date);\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_SET_TIME, &len,\n+ payload, sizeof (payload));\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x04, 0x12, &len,\n+ payload, sizeof (payload), NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 0x4) {\n+ GP_DEBUG (\"canon_int_set_time: Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x4, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -1507,21 +1507,21 @@\n int\n canon_int_ready (Camera *camera, GPContext *context)\n {\n-\tint res;\n-\n-\tGP_DEBUG (\"canon_int_ready()\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tres = canon_usb_ready (camera);\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tres = canon_serial_ready (camera, context);\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\treturn (res);\n+ int res;\n+\n+ GP_DEBUG (\"canon_int_ready()\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ res = canon_usb_ready (camera);\n+ break;\n+ case GP_PORT_SERIAL:\n+ res = canon_serial_ready (camera, context);\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ return (res);\n }\n \n \/**\n@@ -1538,58 +1538,58 @@\n char *\n canon_int_get_disk_name (Camera *camera, GPContext *context)\n {\n-\tunsigned char *msg;\n-\tint len, res;\n-\n-\tGP_DEBUG (\"canon_int_get_disk_name()\");\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tif ( camera->pl->md->model == CANON_CLASS_6 )\n-\t\t\t\t\/* Newer protocol uses a different code, but with same response. *\/\n-\t\t\t\tres = canon_usb_long_dialogue (camera,\n-\t\t\t\t\t\t\t CANON_USB_FUNCTION_FLASH_DEVICE_IDENT_2,\n-\t\t\t\t\t\t\t &msg, &len, 1024, NULL, 0, 0, context);\n-\t\t\telse\n-\t\t\t\tres = canon_usb_long_dialogue (camera,\n-\t\t\t\t\t\t\t CANON_USB_FUNCTION_FLASH_DEVICE_IDENT,\n-\t\t\t\t\t\t\t &msg, &len, 1024, NULL, 0, 0, context);\n-\t\t\tif (res != GP_OK) {\n-\t\t\t\tGP_DEBUG (\"canon_int_get_disk_name: canon_usb_long_dialogue \"\n-\t\t\t\t\t \"failed! returned %i\", res);\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x0a, 0x11, &len, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\n-\t\t\tif (len < 5)\n-\t\t\t\treturn NULL;\t\/* should be GP_ERROR_CORRUPTED_DATA *\/\n-\n-\t\t\t\/* this is correct even though it looks a bit funny. canon_serial_dialogue()\n-\t\t\t * has a static buffer, strdup() part of that buffer and return to our caller.\n-\t\t\t *\/\n-\t\t\tmsg = strdup ((char *) msg + 4);\t\/* @@@ should check length *\/\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tGP_DEBUG (\"canon_int_get_disk_name: could not allocate %li \"\n-\t\t\t\t\t \"bytes of memory to hold response\",\n-\t\t\t\t\t (long)(strlen ((char *) msg + 4)));\n-\t\t\t\treturn NULL;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT_RETURN (NULL)\n-\t}\n-\n-\tif ( msg == NULL )\n-\t\treturn NULL;\n-\n-\tGP_DEBUG (\"canon_int_get_disk_name: disk '%s'\", msg);\n-\n-\treturn msg;\n+ unsigned char *msg;\n+ int len, res;\n+\n+ GP_DEBUG (\"canon_int_get_disk_name()\");\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ if ( camera->pl->md->model == CANON_CLASS_6 )\n+ \/* Newer protocol uses a different code, but with same response. *\/\n+ res = canon_usb_long_dialogue (camera,\n+ CANON_USB_FUNCTION_FLASH_DEVICE_IDENT_2,\n+ &msg, &len, 1024, NULL, 0, 0, context);\n+ else\n+ res = canon_usb_long_dialogue (camera,\n+ CANON_USB_FUNCTION_FLASH_DEVICE_IDENT,\n+ &msg, &len, 1024, NULL, 0, 0, context);\n+ if (res != GP_OK) {\n+ GP_DEBUG (\"canon_int_get_disk_name: canon_usb_long_dialogue \"\n+ \"failed! returned %i\", res);\n+ return NULL;\n+ }\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x0a, 0x11, &len, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return NULL;\n+ }\n+\n+ if (len < 5)\n+ return NULL; \/* should be GP_ERROR_CORRUPTED_DATA *\/\n+\n+ \/* this is correct even though it looks a bit funny. canon_serial_dialogue()\n+ * has a static buffer, strdup() part of that buffer and return to our caller.\n+ *\/\n+ msg = strdup ((char *) msg + 4); \/* @@@ should check length *\/\n+ if ( msg == NULL ) {\n+ GP_DEBUG (\"canon_int_get_disk_name: could not allocate %li \"\n+ \"bytes of memory to hold response\",\n+ (long)(strlen ((char *) msg + 4)));\n+ return NULL;\n+ }\n+ break;\n+ GP_PORT_DEFAULT_RETURN (NULL)\n+ }\n+\n+ if ( msg == NULL )\n+ return NULL;\n+\n+ GP_DEBUG (\"canon_int_get_disk_name: disk '%s'\", msg);\n+\n+ return msg;\n }\n \n \/**\n@@ -1607,78 +1607,78 @@\n *\/\n int\n canon_int_get_disk_name_info (Camera *camera, const char *name, int *capacity, int *available,\n-\t\t\t GPContext *context)\n-{\n-\tunsigned char *msg = NULL;\n-\tchar name_local[128];\n-\tint len;\t\t\/* is set in both USB and SERIAL cases *\/\n-\tint cap=0, ava=0;\t\/* only set in USB case *\/\n-\n-\tGP_DEBUG (\"canon_int_get_disk_name_info() name '%s'\", name);\n-\n-\tCON_CHECK_PARAM_NULL (name);\n-\tCON_CHECK_PARAM_NULL (capacity);\n-\tCON_CHECK_PARAM_NULL (available);\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tif ( camera->pl->md->model == CANON_CLASS_6 ) {\n-\t\t\t\t\/* Newer protocol uses a different code, but with same response. *\/\n-\t\t\t\tstrncpy ( name_local, name, sizeof(name_local) );\n-\t\t\t\tlen = strlen(name_local);\n-\t\t\t\tif ( name_local[len-1] == '\\\\' )\n-\t\t\t\t\tname_local[len-1] = 0;\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DISK_INFO_2, &len,\n-\t\t\t\t\t\t\t name_local, len );\n-\t\t\t\t\/* These newer cameras report sizes in\n-\t\t\t\t * K instead of bytes, so max capacity\n-\t\t\t\t * is 4TB rather than 4GB. *\/\n-\t\t\t\tcap = le32atoh (msg + 4) * 1024;\n-\t\t\t\tava = le32atoh (msg + 8) * 1024;\n-\t\t\t}\n-\t\t\telse {\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DISK_INFO, &len,\n-\t\t\t\t\t\t\t name, strlen (name) + 1);\n-\t\t\t\tcap = le32atoh (msg + 4);\n-\t\t\t\tava = le32atoh (msg + 8);\n-\t\t\t}\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0x09, 0x11, &len, name,\n-\t\t\t\t\t\t strlen (name) + 1, NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len < 0x0c) {\n-\t\tGP_DEBUG (\"canon_int_get_disk_name_info: \"\n-\t\t\t\"Unexpected amount of data returned \"\n-\t\t\t\"(expected %i got %i)\", 0x0c, len);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\t\n-\t\/* Capacity and available are not NULL as verified above.\n-\t* But cap and ava are only set for the USB case, so we have to check for that.\n-\t* If you know the logic better, feel free to improve it. *\/\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\t\t\t \n-\t\t\t*capacity = cap;\n-\t\t\t*available = ava;\n-\t\t\tGP_DEBUG (\"canon_int_get_disk_name_info: \"\n-\t\t\t\t\"capacity %i kb, available %i kb\",\n-\t\t \t\tcap > 0 ? (cap \/ 1024) : 0,\n-\t\t\t\tava > 0 ? (ava \/ 1024) : 0);\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\treturn GP_OK;\n+ GPContext *context)\n+{\n+ unsigned char *msg = NULL;\n+ char name_local[128];\n+ int len; \/* is set in both USB and SERIAL cases *\/\n+ int cap=0, ava=0; \/* only set in USB case *\/\n+\n+ GP_DEBUG (\"canon_int_get_disk_name_info() name '%s'\", name);\n+\n+ CON_CHECK_PARAM_NULL (name);\n+ CON_CHECK_PARAM_NULL (capacity);\n+ CON_CHECK_PARAM_NULL (available);\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ if ( camera->pl->md->model == CANON_CLASS_6 ) {\n+ \/* Newer protocol uses a different code, but with same response. *\/\n+ strncpy ( name_local, name, sizeof(name_local) );\n+ len = strlen(name_local);\n+ if ( name_local[len-1] == '\\\\' )\n+ name_local[len-1] = 0;\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DISK_INFO_2, &len,\n+ name_local, len );\n+ \/* These newer cameras report sizes in\n+ * K instead of bytes, so max capacity\n+ * is 4TB rather than 4GB. *\/\n+ cap = le32atoh (msg + 4) * 1024;\n+ ava = le32atoh (msg + 8) * 1024;\n+ }\n+ else {\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DISK_INFO, &len,\n+ name, strlen (name) + 1);\n+ cap = le32atoh (msg + 4);\n+ ava = le32atoh (msg + 8);\n+ }\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0x09, 0x11, &len, name,\n+ strlen (name) + 1, NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len < 0x0c) {\n+ GP_DEBUG (\"canon_int_get_disk_name_info: \"\n+ \"Unexpected amount of data returned \"\n+ \"(expected %i got %i)\", 0x0c, len);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+ \n+ \/* Capacity and available are not NULL as verified above.\n+ * But cap and ava are only set for the USB case, so we have to check for that.\n+ * If you know the logic better, feel free to improve it. *\/\n+ switch (camera->port->type) {\n+ case GP_PORT_USB: \n+ *capacity = cap;\n+ *available = ava;\n+ GP_DEBUG (\"canon_int_get_disk_name_info: \"\n+ \"capacity %i kb, available %i kb\",\n+ cap > 0 ? (cap \/ 1024) : 0,\n+ ava > 0 ? (ava \/ 1024) : 0);\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ return GP_OK;\n }\n \n \n@@ -1700,44 +1700,44 @@\n const char *\n gphoto2canonpath (Camera *camera, const char *path, GPContext *context)\n {\n-\tstatic char tmp[2000];\n-\tchar *p;\n-\n-\tif (path[0] != '\/') {\n-\t\tGP_DEBUG (\"Non-absolute gphoto2 path cannot be converted\");\n-\t\treturn NULL;\n-\t}\n-\n-\tif (camera->pl->cached_drive == NULL) {\n-\t\tGP_DEBUG (\"NULL camera->pl->cached_drive in gphoto2canonpath\");\n-\t\tcamera->pl->cached_drive = canon_int_get_disk_name (camera, context);\n-\t\tif (camera->pl->cached_drive == NULL) {\n-\t\t\tGP_DEBUG (\"2nd NULL camera->pl->cached_drive in gphoto2canonpath\");\n-\t\t\treturn NULL;\n-\t\t}\n-\t}\n-\n-\tsnprintf (tmp, sizeof (tmp), \"%s%s\", camera->pl->cached_drive, path);\n-\n-\t\/* Convert to upper case, since FAT file system on camera\n-\t doesn't do case, and replace all slashes by backslashes *\/\n-\tfor (p = tmp; *p != '\\0'; p++) {\n-\t\tif ( *p != (char)toupper ( *p ) )\n-\t\t\t\/* We don't allow lower-case in path names. *\/\n-\t\t\tgp_context_error (context, _(\"Lower case letters in %s not allowed.\"),\n-\t\t\t\t\t path );\n-\t\tif (*p == '\/')\n-\t\t\t*p = '\\\\';\n-\t\t*p = (char) toupper(*p);\n-\t}\n-\n-\t\/* remove trailing backslash, making sure buffer ends with \\0 *\/\n-\tif ((p > tmp) && (*(p - 1) == '\\\\'))\n-\t\t*(p - 1) = '\\0';\n-\n-\tGP_LOG (GP_LOG_DATA, \"gphoto2canonpath: converted '%s' to '%s'\", path, tmp);\n-\n-\treturn (tmp);\n+ static char tmp[2000];\n+ char *p;\n+\n+ if (path[0] != '\/') {\n+ GP_DEBUG (\"Non-absolute gphoto2 path cannot be converted\");\n+ return NULL;\n+ }\n+\n+ if (camera->pl->cached_drive == NULL) {\n+ GP_DEBUG (\"NULL camera->pl->cached_drive in gphoto2canonpath\");\n+ camera->pl->cached_drive = canon_int_get_disk_name (camera, context);\n+ if (camera->pl->cached_drive == NULL) {\n+ GP_DEBUG (\"2nd NULL camera->pl->cached_drive in gphoto2canonpath\");\n+ return NULL;\n+ }\n+ }\n+\n+ snprintf (tmp, sizeof (tmp), \"%s%s\", camera->pl->cached_drive, path);\n+\n+ \/* Convert to upper case, since FAT file system on camera\n+ doesn't do case, and replace all slashes by backslashes *\/\n+ for (p = tmp; *p != '\\0'; p++) {\n+ if ( *p != (char)toupper ( *p ) )\n+ \/* We don't allow lower-case in path names. *\/\n+ gp_context_error (context, _(\"Lower case letters in %s not allowed.\"),\n+ path );\n+ if (*p == '\/')\n+ *p = '\\\\';\n+ *p = (char) toupper(*p);\n+ }\n+\n+ \/* remove trailing backslash, making sure buffer ends with \\0 *\/\n+ if ((p > tmp) && (*(p - 1) == '\\\\'))\n+ *(p - 1) = '\\0';\n+\n+ GP_LOG (GP_LOG_DATA, \"gphoto2canonpath: converted '%s' to '%s'\", path, tmp);\n+\n+ return (tmp);\n }\n \n \/**\n@@ -1757,33 +1757,33 @@\n const char *\n canon2gphotopath (Camera *camera, const char *path)\n {\n-\tstatic char tmp[2000];\n-\tchar *p;\n-\n-\tif (!((path[1] == ':') && (path[2] == '\\\\'))) {\n-\t\tGP_DEBUG (\"canon2gphotopath called on invalid canon path '%s'\", path);\n-\t\treturn NULL;\n-\t}\n-\n-\t\/* 3 is D: plus NULL byte *\/\n-\tif (strlen (path) - 3 > sizeof (tmp)) {\n-\t\tGP_DEBUG (\"canon2gphotopath called on too long canon path (%li bytes): %s\",\n-\t\t\t (long)(strlen (path)), path);\n-\t\treturn NULL;\n-\t}\n-\n-\t\/* path is something like D:\\FOO, we want what is after the colon *\/\n-\tstrcpy (tmp, path + 2);\n-\n-\t\/* replace backslashes by slashes *\/\n-\tfor (p = tmp; *p != '\\0'; p++) {\n-\t\tif (*p == '\\\\')\n-\t\t\t*p = '\/';\n-\t}\n-\n-\tGP_LOG (GP_LOG_DATA, \"canon2gphotopath: converted '%s' to '%s'\", path, tmp);\n-\n-\treturn (tmp);\n+ static char tmp[2000];\n+ char *p;\n+\n+ if (!((path[1] == ':') && (path[2] == '\\\\'))) {\n+ GP_DEBUG (\"canon2gphotopath called on invalid canon path '%s'\", path);\n+ return NULL;\n+ }\n+\n+ \/* 3 is D: plus NULL byte *\/\n+ if (strlen (path) - 3 > sizeof (tmp)) {\n+ GP_DEBUG (\"canon2gphotopath called on too long canon path (%li bytes): %s\",\n+ (long)(strlen (path)), path);\n+ return NULL;\n+ }\n+\n+ \/* path is something like D:\\FOO, we want what is after the colon *\/\n+ strcpy (tmp, path + 2);\n+\n+ \/* replace backslashes by slashes *\/\n+ for (p = tmp; *p != '\\0'; p++) {\n+ if (*p == '\\\\')\n+ *p = '\/';\n+ }\n+\n+ GP_LOG (GP_LOG_DATA, \"canon2gphotopath: converted '%s' to '%s'\", path, tmp);\n+\n+ return (tmp);\n }\n \n \/**\n@@ -1796,33 +1796,33 @@\n static void\n debug_fileinfo (CameraFileInfo * info)\n {\n-\tGP_DEBUG (\"<CameraFileInfo>\");\n-\tGP_DEBUG (\" <CameraFileInfoFile>\");\n-\tif ((info->file.fields & GP_FILE_INFO_NAME) != 0)\n-\t\tGP_DEBUG (\" Name: %s\", info->file.name);\n-\tif ((info->file.fields & GP_FILE_INFO_TYPE) != 0)\n-\t\tGP_DEBUG (\" Type: %s\", info->file.type);\n-\tif ((info->file.fields & GP_FILE_INFO_SIZE) != 0)\n-\t\tGP_DEBUG (\" Size: %i\", (int)info->file.size);\n-\tif ((info->file.fields & GP_FILE_INFO_WIDTH) != 0)\n-\t\tGP_DEBUG (\" Width: %i\", info->file.width);\n-\tif ((info->file.fields & GP_FILE_INFO_HEIGHT) != 0)\n-\t\tGP_DEBUG (\" Height: %i\", info->file.height);\n-\tif ((info->file.fields & GP_FILE_INFO_PERMISSIONS) != 0)\n-\t\tGP_DEBUG (\" Perms: 0x%x\", info->file.permissions);\n-\tif ((info->file.fields & GP_FILE_INFO_STATUS) != 0)\n-\t\tGP_DEBUG (\" Status: %i\", info->file.status);\n-\tif ((info->file.fields & GP_FILE_INFO_MTIME) != 0) {\n-\t\tchar *p, *time = asctime (gmtime (&info->file.mtime));\n-\n-\t\t\/* remove trailing \\n *\/\n-\t\tfor (p = time; *p != 0; ++p)\n-\t\t\t\/* do nothing *\/ ;\n-\t\t*(p - 1) = '\\0';\n-\t\tGP_DEBUG (\" Time: %s (%ld)\", time, (long)info->file.mtime);\n-\t}\n-\tGP_DEBUG (\" <\/CameraFileInfoFile>\");\n-\tGP_DEBUG (\"<\/CameraFileInfo>\");\n+ GP_DEBUG (\"<CameraFileInfo>\");\n+ GP_DEBUG (\" <CameraFileInfoFile>\");\n+ if ((info->file.fields & GP_FILE_INFO_NAME) != 0)\n+ GP_DEBUG (\" Name: %s\", info->file.name);\n+ if ((info->file.fields & GP_FILE_INFO_TYPE) != 0)\n+ GP_DEBUG (\" Type: %s\", info->file.type);\n+ if ((info->file.fields & GP_FILE_INFO_SIZE) != 0)\n+ GP_DEBUG (\" Size: %i\", (int)info->file.size);\n+ if ((info->file.fields & GP_FILE_INFO_WIDTH) != 0)\n+ GP_DEBUG (\" Width: %i\", info->file.width);\n+ if ((info->file.fields & GP_FILE_INFO_HEIGHT) != 0)\n+ GP_DEBUG (\" Height: %i\", info->file.height);\n+ if ((info->file.fields & GP_FILE_INFO_PERMISSIONS) != 0)\n+ GP_DEBUG (\" Perms: 0x%x\", info->file.permissions);\n+ if ((info->file.fields & GP_FILE_INFO_STATUS) != 0)\n+ GP_DEBUG (\" Status: %i\", info->file.status);\n+ if ((info->file.fields & GP_FILE_INFO_MTIME) != 0) {\n+ char *p, *time = asctime (gmtime (&info->file.mtime));\n+\n+ \/* remove trailing \\n *\/\n+ for (p = time; *p != 0; ++p)\n+ \/* do nothing *\/ ;\n+ *(p - 1) = '\\0';\n+ GP_DEBUG (\" Time: %s (%ld)\", time, (long)info->file.mtime);\n+ }\n+ GP_DEBUG (\" <\/CameraFileInfoFile>\");\n+ GP_DEBUG (\"<\/CameraFileInfo>\");\n }\n \n \/**\n@@ -1847,328 +1847,328 @@\n *\/\n int\n canon_int_list_directory (Camera *camera, const char *folder, CameraList *list,\n-\t\t\t const canonDirlistFunctionBits flags, GPContext *context)\n-{\n-\tCameraFileInfo info;\n-\tint res;\n-\tunsigned int dirents_length;\n-\tunsigned char *dirent_data = NULL;\n-\tunsigned char *end_of_data, *temp_ch, *pos;\n-\tconst char *canonfolder = gphoto2canonpath (camera, folder, context);\n-\tint list_files = ((flags & CANON_LIST_FILES) != 0);\n-\tint list_folders = ((flags & CANON_LIST_FOLDERS) != 0);\n-\n-\tGP_DEBUG (\"BEGIN canon_int_list_dir() folder '%s' aka '%s' (%s, %s)\", folder,\n-\t\t canonfolder, list_files ? \"files\" : \"no files\",\n-\t\t list_folders ? \"folders\" : \"no folders\");\n-\n-\t\/* Fetch all directory entries from the camera *\/\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tres = canon_usb_get_dirents (camera, &dirent_data, &dirents_length,\n-\t\t\t\t\t\t canonfolder, context);\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tres = canon_serial_get_dirents (camera, &dirent_data, &dirents_length,\n-\t\t\t\t\t\t\tcanonfolder, context);\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\tif (res != GP_OK)\n-\t\treturn res;\n-\n-\tend_of_data = dirent_data + dirents_length;\n-\n-\tif (dirents_length < CANON_MINIMUM_DIRENT_SIZE) {\n-\t\tgp_context_error (context,\n-\t\t\t\t _(\"canon_int_list_dir: ERROR: \"\n-\t\t\t\t \"initial message too short (%i < minimum %i)\"),\n-\t\t\t\t dirents_length, CANON_MINIMUM_DIRENT_SIZE);\n-\t\tfree (dirent_data);\n-\t\tdirent_data = NULL;\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\t\/* The first data we have got here is the dirent for the\n-\t * directory we are reading. Skip over 10 bytes\n-\t * (2 for attributes, 4 date and 4 size) and then go find\n-\t * the end of the directory name so that we get to the next\n-\t * dirent which is actually the first one we are interested\n-\t * in\n-\t *\/\n-\tGP_DEBUG (\"canon_int_list_dir: Camera directory listing for directory '%s'\",\n-\t\t dirent_data + CANON_DIRENT_NAME);\n-\n-\tfor (pos = dirent_data + CANON_DIRENT_NAME; pos < end_of_data && *pos != 0; pos++)\n-\t\t\/* do nothing *\/ ;\n-\tif (pos == end_of_data || *pos != 0) {\n-\t\tgp_context_error (context,\n-\t\t\t\t _(\"canon_int_list_dir: Reached end of packet while \"\n-\t\t\t\t \"examining the first dirent\"));\n-\t\tfree (dirent_data);\n-\t\tdirent_data = NULL;\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\tpos++;\t\t\t\/* skip NULL byte terminating directory name *\/\n-\n-\t\/* we are now positioned at the first interesting dirent *\/\n-\n-\t\/* This is the main loop, for every directory entry returned *\/\n-\twhile (pos < end_of_data) {\n-\t\tint is_dir, is_file;\n-\t\tuint16_t dirent_attrs;\t\/* attributes of dirent *\/\n-\t\tuint32_t dirent_file_size;\t\/* size of dirent in octets *\/\n-\t\tuint32_t dirent_time;\t\/* time stamp of dirent (Unix Epoch) *\/\n-\t\tuint8_t *dirent_name;\t\/* name of dirent *\/\n-\t\tsize_t dirent_name_len;\t\/* length of dirent_name *\/\n-\t\tsize_t dirent_ent_size;\t\/* size of dirent in octets *\/\n-\t\tuint32_t tmp_time;\n-\t\ttime_t date;\n-\t\tstruct tm *tm;\n-\n-\t\tdirent_attrs = le16atoh (pos + CANON_DIRENT_ATTRS);\n-\t\tdirent_file_size = le32atoh (pos + CANON_DIRENT_SIZE);\n-\t\tdirent_name = pos + CANON_DIRENT_NAME;\n-\n-\t\t\/* see canon_int_set_time() for timezone handling *\/\n-\t\ttmp_time = le32atoh (pos + CANON_DIRENT_TIME);\n-\t\tif (tmp_time != 0) {\n-\t\t\t\/* FIXME: I just want the tm_gmtoff\/timezone info *\/\n-\t\t\tdate = time(NULL);\n-\t\t\ttm = localtime (&date);\n+ const canonDirlistFunctionBits flags, GPContext *context)\n+{\n+ CameraFileInfo info;\n+ int res;\n+ unsigned int dirents_length;\n+ unsigned char *dirent_data = NULL;\n+ unsigned char *end_of_data, *temp_ch, *pos;\n+ const char *canonfolder = gphoto2canonpath (camera, folder, context);\n+ int list_files = ((flags & CANON_LIST_FILES) != 0);\n+ int list_folders = ((flags & CANON_LIST_FOLDERS) != 0);\n+\n+ GP_DEBUG (\"BEGIN canon_int_list_dir() folder '%s' aka '%s' (%s, %s)\", folder,\n+ canonfolder, list_files ? \"files\" : \"no files\",\n+ list_folders ? \"folders\" : \"no folders\");\n+\n+ \/* Fetch all directory entries from the camera *\/\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ res = canon_usb_get_dirents (camera, &dirent_data, &dirents_length,\n+ canonfolder, context);\n+ break;\n+ case GP_PORT_SERIAL:\n+ res = canon_serial_get_dirents (camera, &dirent_data, &dirents_length,\n+ canonfolder, context);\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+ if (res != GP_OK)\n+ return res;\n+\n+ end_of_data = dirent_data + dirents_length;\n+\n+ if (dirents_length < CANON_MINIMUM_DIRENT_SIZE) {\n+ gp_context_error (context,\n+ _(\"canon_int_list_dir: ERROR: \"\n+ \"initial message too short (%i < minimum %i)\"),\n+ dirents_length, CANON_MINIMUM_DIRENT_SIZE);\n+ free (dirent_data);\n+ dirent_data = NULL;\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ \/* The first data we have got here is the dirent for the\n+ * directory we are reading. Skip over 10 bytes\n+ * (2 for attributes, 4 date and 4 size) and then go find\n+ * the end of the directory name so that we get to the next\n+ * dirent which is actually the first one we are interested\n+ * in\n+ *\/\n+ GP_DEBUG (\"canon_int_list_dir: Camera directory listing for directory '%s'\",\n+ dirent_data + CANON_DIRENT_NAME);\n+\n+ for (pos = dirent_data + CANON_DIRENT_NAME; pos < end_of_data && *pos != 0; pos++)\n+ \/* do nothing *\/ ;\n+ if (pos == end_of_data || *pos != 0) {\n+ gp_context_error (context,\n+ _(\"canon_int_list_dir: Reached end of packet while \"\n+ \"examining the first dirent\"));\n+ free (dirent_data);\n+ dirent_data = NULL;\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+ pos++; \/* skip NULL byte terminating directory name *\/\n+\n+ \/* we are now positioned at the first interesting dirent *\/\n+\n+ \/* This is the main loop, for every directory entry returned *\/\n+ while (pos < end_of_data) {\n+ int is_dir, is_file;\n+ uint16_t dirent_attrs; \/* attributes of dirent *\/\n+ uint32_t dirent_file_size; \/* size of dirent in octets *\/\n+ uint32_t dirent_time; \/* time stamp of dirent (Unix Epoch) *\/\n+ uint8_t *dirent_name; \/* name of dirent *\/\n+ size_t dirent_name_len; \/* length of dirent_name *\/\n+ size_t dirent_ent_size; \/* size of dirent in octets *\/\n+ uint32_t tmp_time;\n+ time_t date;\n+ struct tm *tm;\n+\n+ dirent_attrs = le16atoh (pos + CANON_DIRENT_ATTRS);\n+ dirent_file_size = le32atoh (pos + CANON_DIRENT_SIZE);\n+ dirent_name = pos + CANON_DIRENT_NAME;\n+\n+ \/* see canon_int_set_time() for timezone handling *\/\n+ tmp_time = le32atoh (pos + CANON_DIRENT_TIME);\n+ if (tmp_time != 0) {\n+ \/* FIXME: I just want the tm_gmtoff\/timezone info *\/\n+ date = time(NULL);\n+ tm = localtime (&date);\n #ifdef HAVE_TM_GMTOFF\n-\t\t\tdirent_time = tmp_time - tm->tm_gmtoff;\n-\t\t\tGP_DEBUG (\"canon_int_list_dir: converted %i to UTC %i (tm_gmtoff is %ld)\",\n-\t\t\t\ttmp_time, dirent_time, (long)tm->tm_gmtoff);\n+ dirent_time = tmp_time - tm->tm_gmtoff;\n+ GP_DEBUG (\"canon_int_list_dir: converted %i to UTC %i (tm_gmtoff is %ld)\",\n+ tmp_time, dirent_time, (long)tm->tm_gmtoff);\n #else\n-\t\t\tdirent_time = tmp_time + timezone;\n-\t\t\tGP_DEBUG (\"canon_int_list_dir: converted %i to UTC %i (timezone is %i)\",\n-\t\t\t\ttmp_time, dirent_time, timezone);\n+ dirent_time = tmp_time + timezone;\n+ GP_DEBUG (\"canon_int_list_dir: converted %i to UTC %i (timezone is %i)\",\n+ tmp_time, dirent_time, timezone);\n #endif\n-\t\t} else {\n-\t\t\tdirent_time = tmp_time;\n-\t\t}\n-\n-\t\tis_dir = ((dirent_attrs & CANON_ATTR_NON_RECURS_ENT_DIR) != 0)\n-\t\t\t|| ((dirent_attrs & CANON_ATTR_RECURS_ENT_DIR) != 0);\n-\t\tis_file = !is_dir;\n-\n-\t\tGP_LOG (GP_LOG_DATA,\n-\t\t\t\"canon_int_list_dir: \"\n-\t\t\t\"reading dirent at position %i of %i (0x%x of 0x%x)\",\n-\t\t\t(pos - dirent_data), (end_of_data - dirent_data), (pos - dirent_data),\n-\t\t\t(end_of_data - dirent_data)\n-\t\t\t);\n-\n-\t\tif (pos + CANON_MINIMUM_DIRENT_SIZE > end_of_data) {\n-\t\t\tif (camera->port->type == GP_PORT_SERIAL) {\n-\t\t\t\t\/* check to see if it is only NULL bytes left,\n-\t\t\t\t * that is not an error for serial cameras\n-\t\t\t\t * (at least the A50 adds five zero bytes at the end)\n-\t\t\t\t *\/\n-\t\t\t\tfor (temp_ch = pos; (temp_ch < end_of_data) && (!*temp_ch); temp_ch++) ;\t\/* do nothing *\/\n-\n-\t\t\t\tif (temp_ch == end_of_data) {\n-\t\t\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t\t\t \"the last %i bytes were all 0 - ignoring.\",\n-\t\t\t\t\t\t temp_ch - pos);\n-\t\t\t\t\tbreak;\n-\t\t\t\t} else {\n-\t\t\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t\t\t \"byte[%i=0x%x] == %i=0x%x\", temp_ch - pos,\n-\t\t\t\t\t\t temp_ch - pos, *temp_ch, *temp_ch);\n-\t\t\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t\t\t \"pos is %p, end_of_data is %p, temp_ch is %p - diff is 0x%x\",\n-\t\t\t\t\t\t pos, end_of_data, temp_ch, temp_ch - pos);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t \"dirent at position %i=0x%x of %i=0x%x is too small, \"\n-\t\t\t\t \"minimum dirent is %i bytes\", (pos - dirent_data),\n-\t\t\t\t (pos - dirent_data), (end_of_data - dirent_data),\n-\t\t\t\t (end_of_data - dirent_data), CANON_MINIMUM_DIRENT_SIZE);\n-\t\t\tgp_context_error (context,\n-\t\t\t\t\t _(\"canon_int_list_dir: \"\n-\t\t\t\t\t \"truncated directory entry encountered\"));\n-\t\t\tfree (dirent_data);\n-\t\t\tdirent_data = NULL;\n-\t\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t\t}\n-\n-\t\t\/* Check end of this dirent, 10 is to skip over\n-\t\t * 2 attributes + 0x00\n-\t\t * 4 file size\n-\t\t * 4 file date (UNIX localtime)\n-\t\t * to where the direntry name begins.\n-\t\t *\/\n-\t\tfor (temp_ch = dirent_name; temp_ch < end_of_data && *temp_ch != 0;\n-\t\t temp_ch++) ;\n-\n-\t\tif (temp_ch == end_of_data || *temp_ch != 0) {\n-\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t \"dirent at position %i of %i has invalid name in it.\"\n-\t\t\t\t \"bailing out with what we've got.\", (pos - dirent_data),\n-\t\t\t\t (end_of_data - dirent_data));\n-\t\t\tbreak;\n-\t\t}\n-\t\tdirent_name_len = strlen (dirent_name);\n-\t\tdirent_ent_size = CANON_MINIMUM_DIRENT_SIZE + dirent_name_len;\n-\n-\t\t\/* check that length of name in this dirent is not of unreasonable size.\n-\t\t * 256 was picked out of the blue\n-\t\t *\/\n-\t\tif (dirent_name_len > 256) {\n-\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t \"the name in dirent at position %i of %i is too long. (%li bytes).\"\n-\t\t\t\t \"bailing out with what we've got.\", (pos - dirent_data),\n-\t\t\t\t (end_of_data - dirent_data), (long)dirent_name_len);\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\t\/* 10 bytes of attributes, size and date, a name and a NULL terminating byte *\/\n-\t\t\/* don't use GP_DEBUG since we log this with GP_LOG_DATA *\/\n-\t\tGP_LOG (GP_LOG_DATA,\n-\t\t\t\"canon_int_list_dir: dirent determined to be %li=0x%lx bytes :\",\n-\t\t\t(long)dirent_ent_size, (long)dirent_ent_size);\n-\t\tgp_log_data (\"canon\", pos, dirent_ent_size);\n-\t\tif (dirent_name_len) {\n-\t\t\t\/* OK, this directory entry has a name in it. *\/\n-\n-\t\t\tif ((list_folders && is_dir) || (list_files && is_file)) {\n-\n-\t\t\t\t\/* we're going to fill out the info structure\n-\t\t\t\t in this block *\/\n-\t\t\t\tmemset (&info, 0, sizeof (info));\n-\n-\t\t\t\t\/* we start with nothing and continously add stuff *\/\n-\t\t\t\tinfo.file.fields = GP_FILE_INFO_NONE;\n-\n-\t\t\t\tstrncpy (info.file.name, dirent_name, sizeof (info.file.name));\n-\t\t\t\tinfo.file.fields |= GP_FILE_INFO_NAME;\n-\n-\t\t\t\tinfo.file.mtime = dirent_time;\n-\t\t\t\tif (info.file.mtime != 0)\n-\t\t\t\t\tinfo.file.fields |= GP_FILE_INFO_MTIME;\n-\n-\t\t\t\tif (is_file) {\n-\t\t\t\t\t\/* determine file type based on file name\n-\t\t\t\t\t * this stuff only makes sense for files, not for folders\n-\t\t\t\t\t *\/\n-\n-\t\t\t\t\tstrncpy (info.file.type,\n-\t\t\t\t\t\t filename2mimetype (info.file.name),\n-\t\t\t\t\t\t sizeof (info.file.type));\n-\t\t\t\t\tinfo.file.fields |= GP_FILE_INFO_TYPE;\n-\n-\t\t\t\t\tif ((dirent_attrs & CANON_ATTR_DOWNLOADED) == 0)\n-\t\t\t\t\t\tinfo.file.status = GP_FILE_STATUS_DOWNLOADED;\n-\t\t\t\t\telse\n-\t\t\t\t\t\tinfo.file.status =\n-\t\t\t\t\t\t\tGP_FILE_STATUS_NOT_DOWNLOADED;\n-\t\t\t\t\tinfo.file.fields |= GP_FILE_INFO_STATUS;\n-\n-\t\t\t\t\t\/* the size is located at offset 2 and is 4\n-\t\t\t\t\t * bytes long, re-order little\/big endian *\/\n-\t\t\t\t\tinfo.file.size = dirent_file_size;\n-\t\t\t\t\tinfo.file.fields |= GP_FILE_INFO_SIZE;\n-\n-\t\t\t\t\t\/* file access modes *\/\n-\t\t\t\t\tif ((dirent_attrs & CANON_ATTR_WRITE_PROTECTED) == 0)\n-\t\t\t\t\t\tinfo.file.permissions =\n-\t\t\t\t\t\t\tGP_FILE_PERM_READ |\n-\t\t\t\t\t\t\tGP_FILE_PERM_DELETE;\n-\t\t\t\t\telse\n-\t\t\t\t\t\tinfo.file.permissions = GP_FILE_PERM_READ;\n-\t\t\t\t\tinfo.file.fields |= GP_FILE_INFO_PERMISSIONS;\n-\t\t\t\t}\n-\n-\t\t\t\t\/* print dirent as text *\/\n-\t\t\t\tGP_DEBUG (\"Raw info: name=%s is_dir=%i, is_file=%i, attrs=0x%x\", dirent_name, is_dir, is_file, dirent_attrs);\n-\t\t\t\tdebug_fileinfo (&info);\n-\n-\t\t\t\tif (is_file) {\n-\t\t\t\t\t\/*\n-\t\t\t\t\t * Append directly to the filesystem instead of to the list,\n-\t\t\t\t\t * because we have additional information.\n-\t\t\t\t\t *\/\n-\t\t\t\t\tif (!camera->pl->list_all_files\n-\t\t\t\t\t && !is_image (info.file.name)\n-\t\t\t\t\t && !is_movie (info.file.name)\n-\t\t\t\t\t && !is_audio (info.file.name)) {\n+ } else {\n+ dirent_time = tmp_time;\n+ }\n+\n+ is_dir = ((dirent_attrs & CANON_ATTR_NON_RECURS_ENT_DIR) != 0)\n+ || ((dirent_attrs & CANON_ATTR_RECURS_ENT_DIR) != 0);\n+ is_file = !is_dir;\n+\n+ GP_LOG (GP_LOG_DATA,\n+ \"canon_int_list_dir: \"\n+ \"reading dirent at position %i of %i (0x%x of 0x%x)\",\n+ (pos - dirent_data), (end_of_data - dirent_data), (pos - dirent_data),\n+ (end_of_data - dirent_data)\n+ );\n+\n+ if (pos + CANON_MINIMUM_DIRENT_SIZE > end_of_data) {\n+ if (camera->port->type == GP_PORT_SERIAL) {\n+ \/* check to see if it is only NULL bytes left,\n+ * that is not an error for serial cameras\n+ * (at least the A50 adds five zero bytes at the end)\n+ *\/\n+ for (temp_ch = pos; (temp_ch < end_of_data) && (!*temp_ch); temp_ch++) ; \/* do nothing *\/\n+\n+ if (temp_ch == end_of_data) {\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"the last %i bytes were all 0 - ignoring.\",\n+ temp_ch - pos);\n+ break;\n+ } else {\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"byte[%i=0x%x] == %i=0x%x\", temp_ch - pos,\n+ temp_ch - pos, *temp_ch, *temp_ch);\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"pos is %p, end_of_data is %p, temp_ch is %p - diff is 0x%x\",\n+ pos, end_of_data, temp_ch, temp_ch - pos);\n+ }\n+ }\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"dirent at position %i=0x%x of %i=0x%x is too small, \"\n+ \"minimum dirent is %i bytes\", (pos - dirent_data),\n+ (pos - dirent_data), (end_of_data - dirent_data),\n+ (end_of_data - dirent_data), CANON_MINIMUM_DIRENT_SIZE);\n+ gp_context_error (context,\n+ _(\"canon_int_list_dir: \"\n+ \"truncated directory entry encountered\"));\n+ free (dirent_data);\n+ dirent_data = NULL;\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ \/* Check end of this dirent, 10 is to skip over\n+ * 2 attributes + 0x00\n+ * 4 file size\n+ * 4 file date (UNIX localtime)\n+ * to where the direntry name begins.\n+ *\/\n+ for (temp_ch = dirent_name; temp_ch < end_of_data && *temp_ch != 0;\n+ temp_ch++) ;\n+\n+ if (temp_ch == end_of_data || *temp_ch != 0) {\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"dirent at position %i of %i has invalid name in it.\"\n+ \"bailing out with what we've got.\", (pos - dirent_data),\n+ (end_of_data - dirent_data));\n+ break;\n+ }\n+ dirent_name_len = strlen (dirent_name);\n+ dirent_ent_size = CANON_MINIMUM_DIRENT_SIZE + dirent_name_len;\n+\n+ \/* check that length of name in this dirent is not of unreasonable size.\n+ * 256 was picked out of the blue\n+ *\/\n+ if (dirent_name_len > 256) {\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"the name in dirent at position %i of %i is too long. (%li bytes).\"\n+ \"bailing out with what we've got.\", (pos - dirent_data),\n+ (end_of_data - dirent_data), (long)dirent_name_len);\n+ break;\n+ }\n+\n+ \/* 10 bytes of attributes, size and date, a name and a NULL terminating byte *\/\n+ \/* don't use GP_DEBUG since we log this with GP_LOG_DATA *\/\n+ GP_LOG (GP_LOG_DATA,\n+ \"canon_int_list_dir: dirent determined to be %li=0x%lx bytes :\",\n+ (long)dirent_ent_size, (long)dirent_ent_size);\n+ gp_log_data (\"canon\", pos, dirent_ent_size);\n+ if (dirent_name_len) {\n+ \/* OK, this directory entry has a name in it. *\/\n+\n+ if ((list_folders && is_dir) || (list_files && is_file)) {\n+\n+ \/* we're going to fill out the info structure\n+ in this block *\/\n+ memset (&info, 0, sizeof (info));\n+\n+ \/* we start with nothing and continously add stuff *\/\n+ info.file.fields = GP_FILE_INFO_NONE;\n+\n+ strncpy (info.file.name, dirent_name, sizeof (info.file.name));\n+ info.file.fields |= GP_FILE_INFO_NAME;\n+\n+ info.file.mtime = dirent_time;\n+ if (info.file.mtime != 0)\n+ info.file.fields |= GP_FILE_INFO_MTIME;\n+\n+ if (is_file) {\n+ \/* determine file type based on file name\n+ * this stuff only makes sense for files, not for folders\n+ *\/\n+\n+ strncpy (info.file.type,\n+ filename2mimetype (info.file.name),\n+ sizeof (info.file.type));\n+ info.file.fields |= GP_FILE_INFO_TYPE;\n+\n+ if ((dirent_attrs & CANON_ATTR_DOWNLOADED) == 0)\n+ info.file.status = GP_FILE_STATUS_DOWNLOADED;\n+ else\n+ info.file.status =\n+ GP_FILE_STATUS_NOT_DOWNLOADED;\n+ info.file.fields |= GP_FILE_INFO_STATUS;\n+\n+ \/* the size is located at offset 2 and is 4\n+ * bytes long, re-order little\/big endian *\/\n+ info.file.size = dirent_file_size;\n+ info.file.fields |= GP_FILE_INFO_SIZE;\n+\n+ \/* file access modes *\/\n+ if ((dirent_attrs & CANON_ATTR_WRITE_PROTECTED) == 0)\n+ info.file.permissions =\n+ GP_FILE_PERM_READ |\n+ GP_FILE_PERM_DELETE;\n+ else\n+ info.file.permissions = GP_FILE_PERM_READ;\n+ info.file.fields |= GP_FILE_INFO_PERMISSIONS;\n+ }\n+\n+ \/* print dirent as text *\/\n+ GP_DEBUG (\"Raw info: name=%s is_dir=%i, is_file=%i, attrs=0x%x\", dirent_name, is_dir, is_file, dirent_attrs);\n+ debug_fileinfo (&info);\n+\n+ if (is_file) {\n+ \/*\n+ * Append directly to the filesystem instead of to the list,\n+ * because we have additional information.\n+ *\/\n+ if (!camera->pl->list_all_files\n+ && !is_image (info.file.name)\n+ && !is_movie (info.file.name)\n+ && !is_audio (info.file.name)) {\n \/* FIXME: Find associated main file and add it there *\/\n-\t\t\t\t\t\t\/* do nothing *\/\n-\t\t\t\t\t\tGP_DEBUG (\"Ignored %s\/%s\", folder,\n-\t\t\t\t\t\t\t info.file.name);\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\tconst char *thumbname;\n-\n-\t\t\t\t\t\tres = gp_filesystem_append (camera->fs, folder,\n-\t\t\t\t\t\t\t\t info.file.name, context);\n-\t\t\t\t\t\tif (res != GP_OK) {\n-\t\t\t\t\t\t\tGP_DEBUG (\"Could not gp_filesystem_append \"\n-\t\t\t\t\t\t\t\t \"%s in folder %s: %s\",\n-\t\t\t\t\t\t\t\t info.file.name, folder, gp_result_as_string (res));\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tGP_DEBUG (\"Added file %s\/%s\", folder,\n-\t\t\t\t\t\t\t\t info.file.name);\n-\n-\t\t\t\t\t\t\tthumbname =\n-\t\t\t\t\t\t\t\tcanon_int_filename2thumbname (camera,\n-\t\t\t\t\t\t\t\t\t\t\t info.file.name);\n-\t\t\t\t\t\t\tif (thumbname == NULL) {\n-\t\t\t\t\t\t\t\t\/* no thumbnail *\/\n-\t\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\t\t\/* all known Canon cams have JPEG thumbs *\/\n-\t\t\t\t\t\t\t\tinfo.preview.fields =\n-\t\t\t\t\t\t\t\t\tGP_FILE_INFO_TYPE;\n-\t\t\t\t\t\t\t\tstrncpy (info.preview.type,\n-\t\t\t\t\t\t\t\t\t GP_MIME_JPEG,\n-\t\t\t\t\t\t\t\t\t sizeof (info.preview.type));\n-\t\t\t\t\t\t\t}\n-\n-\t\t\t\t\t\t\tres = gp_filesystem_set_info_noop (camera->fs,\n-\t\t\t\t\t\t\t\t\t\t folder, info,\n-\t\t\t\t\t\t\t\t\t\t context);\n-\t\t\t\t\t\t\tif (res != GP_OK) {\n-\t\t\t\t\t\t\t\tGP_DEBUG (\"Could not gp_filesystem_set_info_noop() \"\n-\t\t\t\t\t\t\t\t\t \"%s in folder %s: %s\",\n-\t\t\t\t\t\t\t\t\t info.file.name, folder, gp_result_as_string (res));\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\tif (is_dir) {\n-\t\t\t\t\tres = gp_list_append (list, info.file.name, NULL);\n-\t\t\t\t\tif (res != GP_OK)\n-\t\t\t\t\t\tGP_DEBUG (\"Could not gp_list_append \"\n-\t\t\t\t\t\t\t \"folder %s: %s\",\n-\t\t\t\t\t\t\t folder, gp_result_as_string (res));\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\t\/* this case could mean that this was the last dirent *\/\n-\t\t\t\tGP_DEBUG (\"canon_int_list_dir: \"\n-\t\t\t\t\t \"dirent at position %i of %i has NULL name, skipping.\",\n-\t\t\t\t\t (pos - dirent_data), (end_of_data - dirent_data));\n-\t\t\t}\n-\t\t}\n-\n-\t\t\/* make 'pos' point to next dirent in packet.\n-\t\t * first we skip 10 bytes of attribute, size and date,\n-\t\t * then we skip the name plus 1 for the NULL\n-\t\t * termination bytes.\n-\t\t *\/\n-\t\tpos += dirent_ent_size;\n-\t}\n-\tfree (dirent_data);\n-\tdirent_data = NULL;\n-\n-\tGP_DEBUG (\"<FILESYSTEM-DUMP>\");\n-\tgp_filesystem_dump (camera->fs);\n-\tGP_DEBUG (\"<\/FILESYSTEM-DUMP>\");\n-\n-\tGP_DEBUG (\"END canon_int_list_dir() folder '%s' aka '%s'\", folder, canonfolder);\n-\n-\treturn GP_OK;\n+ \/* do nothing *\/\n+ GP_DEBUG (\"Ignored %s\/%s\", folder,\n+ info.file.name);\n+ } else {\n+ const char *thumbname;\n+\n+ res = gp_filesystem_append (camera->fs, folder,\n+ info.file.name, context);\n+ if (res != GP_OK) {\n+ GP_DEBUG (\"Could not gp_filesystem_append \"\n+ \"%s in folder %s: %s\",\n+ info.file.name, folder, gp_result_as_string (res));\n+ } else {\n+ GP_DEBUG (\"Added file %s\/%s\", folder,\n+ info.file.name);\n+\n+ thumbname =\n+ canon_int_filename2thumbname (camera,\n+ info.file.name);\n+ if (thumbname == NULL) {\n+ \/* no thumbnail *\/\n+ } else {\n+ \/* all known Canon cams have JPEG thumbs *\/\n+ info.preview.fields =\n+ GP_FILE_INFO_TYPE;\n+ strncpy (info.preview.type,\n+ GP_MIME_JPEG,\n+ sizeof (info.preview.type));\n+ }\n+\n+ res = gp_filesystem_set_info_noop (camera->fs,\n+ folder, info,\n+ context);\n+ if (res != GP_OK) {\n+ GP_DEBUG (\"Could not gp_filesystem_set_info_noop() \"\n+ \"%s in folder %s: %s\",\n+ info.file.name, folder, gp_result_as_string (res));\n+ }\n+ }\n+ }\n+ }\n+ if (is_dir) {\n+ res = gp_list_append (list, info.file.name, NULL);\n+ if (res != GP_OK)\n+ GP_DEBUG (\"Could not gp_list_append \"\n+ \"folder %s: %s\",\n+ folder, gp_result_as_string (res));\n+ }\n+ } else {\n+ \/* this case could mean that this was the last dirent *\/\n+ GP_DEBUG (\"canon_int_list_dir: \"\n+ \"dirent at position %i of %i has NULL name, skipping.\",\n+ (pos - dirent_data), (end_of_data - dirent_data));\n+ }\n+ }\n+\n+ \/* make 'pos' point to next dirent in packet.\n+ * first we skip 10 bytes of attribute, size and date,\n+ * then we skip the name plus 1 for the NULL\n+ * termination bytes.\n+ *\/\n+ pos += dirent_ent_size;\n+ }\n+ free (dirent_data);\n+ dirent_data = NULL;\n+\n+ GP_DEBUG (\"<FILESYSTEM-DUMP>\");\n+ gp_filesystem_dump (camera->fs);\n+ GP_DEBUG (\"<\/FILESYSTEM-DUMP>\");\n+\n+ GP_DEBUG (\"END canon_int_list_dir() folder '%s' aka '%s'\", folder, canonfolder);\n+\n+ return GP_OK;\n }\n \n \/**\n@@ -2187,20 +2187,20 @@\n *\/\n int\n canon_int_get_file (Camera *camera, const char *name, unsigned char **data, int *length,\n-\t\t GPContext *context)\n-{\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\treturn canon_usb_get_file (camera, name, data, length, context);\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\t*data = canon_serial_get_file (camera, name, length, context);\n-\t\t\tif (*data)\n-\t\t\t\treturn GP_OK;\n-\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n+ GPContext *context)\n+{\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ return canon_usb_get_file (camera, name, data, length, context);\n+ break;\n+ case GP_PORT_SERIAL:\n+ *data = canon_serial_get_file (camera, name, length, context);\n+ if (*data)\n+ return GP_OK;\n+ return GP_ERROR_OS_FAILURE;\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n }\n \n \/**\n@@ -2222,31 +2222,31 @@\n *\/\n int\n canon_int_get_thumbnail (Camera *camera, const char *name, unsigned char **retdata,\n-\t\t\t int *length, GPContext *context)\n-{\n-\tint res;\n-\n-\tGP_DEBUG (\"canon_int_get_thumbnail() called for file '%s'\", name);\n-\n-\tCON_CHECK_PARAM_NULL (retdata);\n-\tCON_CHECK_PARAM_NULL (length);\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tres = canon_usb_get_thumbnail (camera, name, retdata, length, context);\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tres = canon_serial_get_thumbnail (camera, name, retdata, length,\n-\t\t\t\t\t\t\t context);\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\tif (res != GP_OK) {\n-\t\tGP_DEBUG (\"canon_int_get_thumbnail() failed, returned %i\", res);\n-\t\treturn res;\n-\t}\n-\n-\treturn res;\n+ int *length, GPContext *context)\n+{\n+ int res;\n+\n+ GP_DEBUG (\"canon_int_get_thumbnail() called for file '%s'\", name);\n+\n+ CON_CHECK_PARAM_NULL (retdata);\n+ CON_CHECK_PARAM_NULL (length);\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ res = canon_usb_get_thumbnail (camera, name, retdata, length, context);\n+ break;\n+ case GP_PORT_SERIAL:\n+ res = canon_serial_get_thumbnail (camera, name, retdata, length,\n+ context);\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+ if (res != GP_OK) {\n+ GP_DEBUG (\"canon_int_get_thumbnail() failed, returned %i\", res);\n+ return res;\n+ }\n+\n+ return res;\n }\n \n \/**\n@@ -2264,75 +2264,75 @@\n int\n canon_int_delete_file (Camera *camera, const char *name, const char *dir, GPContext *context)\n {\n-\tunsigned char payload[300];\n-\tunsigned char *msg;\n-\tint len, payload_length;\n-\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\tmemcpy (payload, dir, strlen (dir) + 1);\n-\t\t\tif ( camera->pl->md->model == CANON_CLASS_6 ) {\n-\t\t\t\tchar *ptr = payload + strlen(dir);\n-\t\t\t\tchar last_byte = dir[strlen(dir)-1];\n-\t\t\t\t\/* Newer protocol uses a different\n-\t\t\t\t * code and has different parameters:\n-\t\t\t\t * - full path name together, rather than directory and file\n-\t\t\t\t * as separate strings\n-\t\t\t\t * - 8 bytes of other stuff, starting at 0x20 in\n-\t\t\t\t * payload\n-\t\t\t\t * - directory name (again)\n-\t\t\t\t * - 2 null bytes *\/\n-\t\t\t\tif ( last_byte != '\\\\' && last_byte != '\/' )\n-\t\t\t\t\t*ptr++ = '\\\\'; \/* Need path separator between *\/\n-\t\t\t\tmemcpy ( ptr, name, 0x30 - strlen(dir) - 1 );\n-\n-\t\t\t\tmemcpy ( payload + 0x30, dir, 0x30 );\n-\t\t\t\tpayload_length = 0x30 + strlen(dir);\n-\t\t\t\tif ( last_byte != '\\\\' && last_byte != '\/' )\n-\t\t\t\t\tpayload[payload_length++] = '\\\\'; \/* Need path separator at end of directory name *\/\n-\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DELETE_FILE_2, &len,\n-\t\t\t\t\t\t\t payload, payload_length);\n-\t\t\t}\n-\t\t\telse {\n-\t\t\t\tmemcpy (payload + strlen (dir) + 1, name, strlen (name) + 1);\n-\t\t\t\tpayload_length = strlen (dir) + strlen (name) + 2;\n-\t\t\t\tpayload[payload_length++] = 0; \/* Double NUL to end command *\/\n-\t\t\t\tmsg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DELETE_FILE, &len,\n-\t\t\t\t\t\t\t payload, payload_length);\n-\t\t\t}\n-\t\t\tif ( msg == NULL )\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\tmsg = canon_serial_dialogue (camera, context, 0xd, 0x11, &len, dir,\n-\t\t\t\t\t\t strlen (dir) + 1, name, strlen (name) + 1,\n-\t\t\t\t\t\t NULL);\n-\t\t\tif ( msg == NULL ) {\n-\t\t\t\tcanon_serial_error_type (camera);\n-\t\t\t\treturn GP_ERROR_OS_FAILURE;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\n-\tif (len != 4) {\n-\t\t\/* XXX should mark folder as dirty since we can't be sure if the file\n-\t\t * got deleted or not\n-\t\t *\/\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\tif (msg[0] == 0x29) {\n-\t\tgp_context_error (context, _(\"File protected.\"));\n-\t\treturn GP_ERROR_CAMERA_ERROR;\n-\t}\n-\n-\t\/* XXX we should mark folder as dirty, re-read it and check if the file\n-\t * is gone or not.\n-\t *\/\n-\treturn GP_OK;\n+ unsigned char payload[300];\n+ unsigned char *msg;\n+ int len, payload_length;\n+\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ memcpy (payload, dir, strlen (dir) + 1);\n+ if ( camera->pl->md->model == CANON_CLASS_6 ) {\n+ char *ptr = payload + strlen(dir);\n+ char last_byte = dir[strlen(dir)-1];\n+ \/* Newer protocol uses a different\n+ * code and has different parameters:\n+ * - full path name together, rather than directory and file\n+ * as separate strings\n+ * - 8 bytes of other stuff, starting at 0x20 in\n+ * payload\n+ * - directory name (again)\n+ * - 2 null bytes *\/\n+ if ( last_byte != '\\\\' && last_byte != '\/' )\n+ *ptr++ = '\\\\'; \/* Need path separator between *\/\n+ memcpy ( ptr, name, 0x30 - strlen(dir) - 1 );\n+\n+ memcpy ( payload + 0x30, dir, 0x30 );\n+ payload_length = 0x30 + strlen(dir);\n+ if ( last_byte != '\\\\' && last_byte != '\/' )\n+ payload[payload_length++] = '\\\\'; \/* Need path separator at end of directory name *\/\n+\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DELETE_FILE_2, &len,\n+ payload, payload_length);\n+ }\n+ else {\n+ memcpy (payload + strlen (dir) + 1, name, strlen (name) + 1);\n+ payload_length = strlen (dir) + strlen (name) + 2;\n+ payload[payload_length++] = 0; \/* Double NUL to end command *\/\n+ msg = canon_usb_dialogue (camera, CANON_USB_FUNCTION_DELETE_FILE, &len,\n+ payload, payload_length);\n+ }\n+ if ( msg == NULL )\n+ return GP_ERROR_OS_FAILURE;\n+\n+ break;\n+ case GP_PORT_SERIAL:\n+ msg = canon_serial_dialogue (camera, context, 0xd, 0x11, &len, dir,\n+ strlen (dir) + 1, name, strlen (name) + 1,\n+ NULL);\n+ if ( msg == NULL ) {\n+ canon_serial_error_type (camera);\n+ return GP_ERROR_OS_FAILURE;\n+ }\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+\n+ if (len != 4) {\n+ \/* XXX should mark folder as dirty since we can't be sure if the file\n+ * got deleted or not\n+ *\/\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ if (msg[0] == 0x29) {\n+ gp_context_error (context, _(\"File protected.\"));\n+ return GP_ERROR_CAMERA_ERROR;\n+ }\n+\n+ \/* XXX we should mark folder as dirty, re-read it and check if the file\n+ * is gone or not.\n+ *\/\n+ return GP_OK;\n }\n \n \/**\n@@ -2350,21 +2350,21 @@\n *\/\n int\n canon_int_put_file (Camera *camera, CameraFile *file, char *destname, char *destpath,\n-\t\t GPContext *context)\n-{\n-\tswitch (camera->port->type) {\n-\t\tcase GP_PORT_USB:\n-\t\t\treturn canon_usb_put_file (camera, file, destname, destpath,\n-\t\t\t\t\t\t context);\n-\t\t\tbreak;\n-\t\tcase GP_PORT_SERIAL:\n-\t\t\treturn canon_serial_put_file (camera, file, destname, destpath,\n-\t\t\t\t\t\t context);\n-\t\t\tbreak;\n-\t\tGP_PORT_DEFAULT\n-\t}\n-\t\/* Never reached *\/\n-\treturn GP_ERROR;\n+ GPContext *context)\n+{\n+ switch (camera->port->type) {\n+ case GP_PORT_USB:\n+ return canon_usb_put_file (camera, file, destname, destpath,\n+ context);\n+ break;\n+ case GP_PORT_SERIAL:\n+ return canon_serial_put_file (camera, file, destname, destpath,\n+ context);\n+ break;\n+ GP_PORT_DEFAULT\n+ }\n+ \/* Never reached *\/\n+ return GP_ERROR;\n }\n \n \/**\n@@ -2384,63 +2384,63 @@\n \n int\n canon_int_extract_jpeg_thumb (unsigned char *data, const unsigned int datalen,\n-\t\t\t unsigned char **retdata, unsigned int *retdatalen,\n-\t\t\t GPContext *context)\n-{\n-\tunsigned int i, thumbstart = 0, thumbsize = 0;\n-\n-\tCHECK_PARAM_NULL (data);\n-\tCHECK_PARAM_NULL (retdata);\n-\n-\t*retdata = NULL;\n-\t*retdatalen = 0;\n-\n-\tif (data[0] != JPEG_ESC || data[1] != JPEG_BEG) {\n-\t\tgp_context_error (context, _(\"Could not extract JPEG \"\n-\t\t\t\t\t \"thumbnail from data: Data is not JFIF\"));\n-\t\tGP_DEBUG (\"canon_int_extract_jpeg_thumb: data is not JFIF, cannot extract thumbnail\");\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\t\/* pictures are JFIF files, we skip the first 2 bytes (0xFF 0xD8)\n-\t * first go look for start of JPEG, when that is found we set thumbstart\n-\t * to the current position and never look for JPEG begin bytes again.\n-\t * when thumbstart is set look for JPEG end.\n-\t *\/\n-\tfor (i = 3; i < datalen; i++)\n-\t\tif (data[i] == JPEG_ESC) {\n-\t\t\tif (! thumbstart) {\n-\t\t\t\tif (i < (datalen - 3) &&\n-\t\t\t\t\tdata[i + 1] == JPEG_BEG &&\n-\t\t\t\t\t((data[i + 3] == JPEG_SOS) || (data[i + 3] == JPEG_A50_SOS)))\n-\t\t\t\t\tthumbstart = i;\n-\t\t\t} else if (i < (datalen - 1) && (data[i + 1] == JPEG_END)) {\n-\t\t\t\tthumbsize = i + 2 - thumbstart;\n-\t\t\t\tbreak;\n-\t\t\t}\n-\n-\t\t}\n-\tif (! thumbsize) {\n-\t\tgp_context_error (context, _(\"Could not extract JPEG \"\n-\t\t\t\t\t \"thumbnail from data: No beginning\/end\"));\n-\t\tGP_DEBUG (\"canon_int_extract_jpeg_thumb: could not find JPEG \"\n-\t\t\t \"beginning (offset %i) or end (size %i) in %i bytes of data\",\n-\t\t\t datalen, thumbstart, thumbsize);\n-\t\treturn GP_ERROR_CORRUPTED_DATA;\n-\t}\n-\n-\t\/* now that we know the size of the thumbnail embedded in the JFIF data, malloc() *\/\n-\t*retdata = malloc (thumbsize);\n-\tif (! *retdata) {\n-\t\tGP_DEBUG (\"canon_int_extract_jpeg_thumb: could not allocate %i bytes of memory\", thumbsize);\n-\t\treturn GP_ERROR_NO_MEMORY;\n-\t}\n-\n-\t\/* and copy *\/\n-\tmemcpy (*retdata, data + thumbstart, thumbsize);\n-\t*retdatalen = thumbsize;\n-\n-\treturn GP_OK;\n+ unsigned char **retdata, unsigned int *retdatalen,\n+ GPContext *context)\n+{\n+ unsigned int i, thumbstart = 0, thumbsize = 0;\n+\n+ CHECK_PARAM_NULL (data);\n+ CHECK_PARAM_NULL (retdata);\n+\n+ *retdata = NULL;\n+ *retdatalen = 0;\n+\n+ if (data[0] != JPEG_ESC || data[1] != JPEG_BEG) {\n+ gp_context_error (context, _(\"Could not extract JPEG \"\n+ \"thumbnail from data: Data is not JFIF\"));\n+ GP_DEBUG (\"canon_int_extract_jpeg_thumb: data is not JFIF, cannot extract thumbnail\");\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ \/* pictures are JFIF files, we skip the first 2 bytes (0xFF 0xD8)\n+ * first go look for start of JPEG, when that is found we set thumbstart\n+ * to the current position and never look for JPEG begin bytes again.\n+ * when thumbstart is set look for JPEG end.\n+ *\/\n+ for (i = 3; i < datalen; i++)\n+ if (data[i] == JPEG_ESC) {\n+ if (! thumbstart) {\n+ if (i < (datalen - 3) &&\n+ data[i + 1] == JPEG_BEG &&\n+ ((data[i + 3] == JPEG_SOS) || (data[i + 3] == JPEG_A50_SOS)))\n+ thumbstart = i;\n+ } else if (i < (datalen - 1) && (data[i + 1] == JPEG_END)) {\n+ thumbsize = i + 2 - thumbstart;\n+ break;\n+ }\n+\n+ }\n+ if (! thumbsize) {\n+ gp_context_error (context, _(\"Could not extract JPEG \"\n+ \"thumbnail from data: No beginning\/end\"));\n+ GP_DEBUG (\"canon_int_extract_jpeg_thumb: could not find JPEG \"\n+ \"beginning (offset %i) or end (size %i) in %i bytes of data\",\n+ datalen, thumbstart, thumbsize);\n+ return GP_ERROR_CORRUPTED_DATA;\n+ }\n+\n+ \/* now that we know the size of the thumbnail embedded in the JFIF data, malloc() *\/\n+ *retdata = malloc (thumbsize);\n+ if (! *retdata) {\n+ GP_DEBUG (\"canon_int_extract_jpeg_thumb: could not allocate %i bytes of memory\", thumbsize);\n+ return GP_ERROR_NO_MEMORY;\n+ }\n+\n+ \/* and copy *\/\n+ memcpy (*retdata, data + thumbstart, thumbsize);\n+ *retdatalen = thumbsize;\n+\n+ return GP_OK;\n }\n \n \/*\n"} {"commit":"aa2855818af60949f1192641050e108f8d05d7b1","subject":"\tfixed a85 id","message":"\tfixed a85 id\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@7357 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"msmeissn\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,msmeissn\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/canon\/canon.c\n+++ camlibs\/canon\/canon.c\n@@ -192,10 +192,10 @@\n \t {\"Canon:PowerShot A75\", CANON_PS_A75, \t 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t {\"Canon:PowerShot A400\",\tCANON_PS_A400,\t\t0x04A9, 0x30b7,\tCAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:PowerShot A310\", CANON_PS_A310, 0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, \n-\t{\"Canon:PowerShot S410 (normal mode)\",CANON_PS_S410, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot A85 (normal mode)\",CANON_PS_A85, 0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot S410 (normal mode)\",CANON_PS_S410, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \t{\"Canon:Digital IXUS 430 (normal mode)\",CANON_PS_S410, 0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A95 (normal mode)\",CANON_PS_A95, 0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n-\t{\"Canon:PowerShot A85 (normal mode)\",CANON_PS_A85, 0x04A9, 0x30be, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n+\t{\"Canon:PowerShot A95 (normal mode)\",CANON_PS_A95, 0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},\n \n \t{NULL}\n \t\/* *INDENT-ON* *\/\n"} {"commit":"23f1160080a98bbd0dc41706acf3ce9601e54d8e","subject":"focal >= aperture","message":"focal >= aperture\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/lumix\/lumix.c\n+++ camlibs\/lumix\/lumix.c\n@@ -438,7 +438,7 @@\n }\n \n static char*\n-Get_Focal(Camera *camera) {\n+Get_Aperture(Camera *camera) {\n \treturn loadCmd(camera,\"cam.cgi?mode=getsetting&type=focal\");\n }\n \n@@ -899,9 +899,9 @@\n \tgp_widget_set_value (widget, Get_ShutterSpeed(camera));\n \tgp_widget_append (section, widget);\n \n-\tgp_widget_new (GP_WIDGET_TEXT, _(\"Focal Length\"), &widget);\n-\tgp_widget_set_name (widget, \"focal\");\n-\tgp_widget_set_value (widget, Get_Focal(camera));\n+\tgp_widget_new (GP_WIDGET_TEXT, _(\"Aperture\"), &widget);\n+\tgp_widget_set_name (widget, \"aperture\");\n+\tgp_widget_set_value (widget, Get_Aperture(camera));\n \tgp_widget_append (section, widget);\n \n \tgp_widget_new (GP_WIDGET_TEXT, _(\"Autofocus Mode\"), &widget);\n"} {"commit":"84dd3301c4da18218a3f3731c84fd1ee9e5a5da9","subject":"https:\/\/imagemagick.org\/discourse-server\/viewtopic.php?f=3&t=36054","message":"https:\/\/imagemagick.org\/discourse-server\/viewtopic.php?f=3&t=36054\n","repos":"Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick,Danack\/ImageMagick","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MagickCore\/draw.c\n+++ MagickCore\/draw.c\n@@ -6880,12 +6880,6 @@\n register ssize_t\n i;\n \n- if ((fabs(start.x-end.x) < MagickEpsilon) ||\n- (fabs(start.y-end.y) < MagickEpsilon))\n- {\n- primitive_info->coordinates=0;\n- return(MagickTrue);\n- }\n p=primitive_info;\n if (TracePoint(p,start) == MagickFalse)\n return(MagickFalse);\n"} {"commit":"917f6ba8141406151e471c60693f462f02651b8a","subject":"Add new class\/subclass\/protocol matching support to the PTP driver","message":"Add new class\/subclass\/protocol matching support to the PTP driver\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@3621 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"msmeissn\/libgphoto2,msmeissn\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,msmeissn\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,msmeissn\/libgphoto2,jbreeden\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,jbreeden\/libgphoto2,thusoy\/libgphoto2,thusoy\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp\/library.c\n+++ camlibs\/ptp\/library.c\n@@ -318,6 +318,19 @@\n \t\tCR (gp_abilities_list_append (list, a));\n \t}\n \n+\tstrcpy(a.model, \"USB PTP Class Camera\");\n+\ta.status = GP_DRIVER_STATUS_EXPERIMENTAL;\n+\ta.port = GP_PORT_USB;\n+\ta.speed[0] = 0;\n+\ta.usb_class = 6;\n+\ta.usb_subclass = -1;\n+\ta.usb_protocol = -1;\n+\ta.operations = GP_OPERATION_NONE;\n+\ta.file_operations = GP_FILE_OPERATION_PREVIEW|\n+\t\t\t\tGP_FILE_OPERATION_DELETE;\n+\ta.folder_operations = GP_FOLDER_OPERATION_NONE;\n+\tCR (gp_abilities_list_append (list, a));\n+\n \treturn (GP_OK);\n }\n \n"} {"commit":"620d4f00cb994ebc229b35993df3668f67a9f4a3","subject":"reversed logic for FORWARD and REVERSE","message":"reversed logic for FORWARD and REVERSE\n","repos":"sikendershahid91\/Team-6-workspace","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Milestone6\/main.c\n+++ Milestone6\/main.c\n@@ -415,7 +415,7 @@\n void PWMInit(void)\n {\n \/\/ Port PE1 - MODE = 1\n- \/\/ Port PD3 - PHASE PIN - RIGHT MOTOR\n+ \/\/ Port PD3 - PHASE PIN - RIGHT MOTOR \/\/ changed to PD7\n \/\/ Port PD1 - PWM PIN - RIGHT MOTOR\n \/\/ Port PD2 - PHASE PIN - LEFT MOTOR\n \/\/ Port PD0 - PWM PIN - LEFT MOTOR\n@@ -427,8 +427,15 @@\n \tSysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOD);\n \tSysCtlPeripheralEnable(SYSCTL_PERIPH_GPIOE);\n \n+\t\/\/ hardware unlock for gpio pd7\n+\tHWREG(GPIO_PORTD_BASE + GPIO_O_LOCK) = GPIO_LOCK_KEY;\n+\tHWREG(GPIO_PORTD_BASE + GPIO_O_CR) |= 0x80;\n+ HWREG(GPIO_PORTD_BASE + GPIO_O_AFSEL) &= ~0x80;\n+ HWREG(GPIO_PORTD_BASE + GPIO_O_DEN) |= 0x80;\n+ HWREG(GPIO_PORTD_BASE + GPIO_O_LOCK) = 0;\n+\n \tGPIOPinTypePWM(GPIO_PORTD_BASE, GPIO_PIN_0 | GPIO_PIN_1);\n-\tGPIOPinTypeGPIOOutput(GPIO_PORTD_BASE,GPIO_PIN_2 | GPIO_PIN_3);\n+\tGPIOPinTypeGPIOOutput(GPIO_PORTD_BASE,GPIO_PIN_2 | GPIO_PIN_7);\n \tGPIOPinTypeGPIOOutput(GPIO_PORTE_BASE,GPIO_PIN_1);\n \tGPIOPinConfigure(GPIO_PD0_M1PWM0);\n \tGPIOPinConfigure(GPIO_PD1_M1PWM1);\n@@ -439,11 +446,19 @@\n \tPWMGenPeriodSet(PWM1_BASE, PWM_GEN_0, ui32Load);\n \n \t\/\/ enable mode = 1\n-\tGPIOPinWrite(GPIO_PORTE_BASE, GPIO_PIN_1, 1);\n+\tGPIOPinWrite(GPIO_PORTE_BASE, GPIO_PIN_1, GPIO_PIN_1);\n \n \tPWMPulseWidthSet(PWM1_BASE, PWM_OUT_0, 1);\n \tPWMPulseWidthSet(PWM1_BASE, PWM_OUT_1, 1);\n \tPWMGenEnable(PWM1_BASE, PWM_GEN_0);\n+\n+\t\/\/ to be erased\n+\tPWMOutputState(PWM1_BASE, (PWM_OUT_0_BIT|PWM_OUT_1_BIT), true);\n+\n+\tGPIOPinWrite(GPIO_PORTD_BASE, GPIO_PIN_2|GPIO_PIN_7, GPIO_PIN_7|0);\n+\t PWMPulseWidthSet(PWM1_BASE, PWM_OUT_0, ui32Load);\n+\t PWMPulseWidthSet(PWM1_BASE, PWM_OUT_1, ui32Load);\n+\n }\n \n void TimerInit(void) {\n"} {"commit":"7515765be2be38ae86288cc7362c51fe14710729","subject":"added image comment and device name for fuji","message":"added image comment and device name for fuji\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/config.c\n+++ camlibs\/ptp2\/config.c\n@@ -9154,6 +9154,8 @@\n \t{ N_(\"Camera Date and Time\"), \"datetime\", PTP_DPC_SONY_QX_DateTime, PTP_VENDOR_SONY, PTP_DTC_STR, _get_STR_as_time, _put_STR_as_time },\n \t{ N_(\"Beep Mode\"), \"beep\", PTP_DPC_CANON_BeepMode, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_BeepMode, _put_Canon_BeepMode },\n \t{ N_(\"Image Comment\"), \"imagecomment\", PTP_DPC_NIKON_ImageCommentString, PTP_VENDOR_NIKON, PTP_DTC_STR, _get_STR, _put_STR },\n+\t{ N_(\"Image Comment\"), \"imagecomment\", PTP_DPC_FUJI_Comment, PTP_VENDOR_FUJI, PTP_DTC_STR, _get_STR, _put_STR },\n+\t{ N_(\"Device Name\"), \"devicename\", PTP_DPC_FUJI_DeviceName, PTP_VENDOR_FUJI, PTP_DTC_STR, _get_STR, _put_STR },\n \t{ N_(\"WLAN GUID\"), \t\"guid\", \tPTP_DPC_NIKON_GUID, \t\t PTP_VENDOR_NIKON, PTP_DTC_STR, _get_STR, _put_STR },\n \t{ N_(\"Enable Image Comment\"), \"imagecommentenable\", PTP_DPC_NIKON_ImageCommentEnable, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 },\n \t{ N_(\"LCD Off Time\"), \"lcdofftime\", PTP_DPC_NIKON_MonitorOff, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_LCDOffTime, _put_Nikon_LCDOffTime },\n"} {"commit":"cb6e820165fadc5a6bb108f32da0b691ce2d9e3a","subject":"dont call command if not supported by Nikon. fixes protocol corruption on my D70s","message":"dont call command if not supported by Nikon.\nfixes protocol corruption on my D70s\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@9886 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/config.c\n+++ camlibs\/ptp2\/config.c\n@@ -1773,6 +1773,9 @@\n \tgp_widget_set_name (*widget, menu->name);\n \n \tif (params->deviceinfo.VendorExtensionID != PTP_VENDOR_NIKON)\n+\t\treturn (GP_ERROR_NOT_SUPPORTED);\n+\n+\tif (!ptp_operation_issupported(&camera->pl->params, PTP_OC_NIKON_GetProfileAllData)) \n \t\treturn (GP_ERROR_NOT_SUPPORTED);\n \n \tret = ptp_nikon_getwifiprofilelist(params);\n"} {"commit":"d3841dbcb62340b54591ebe1123cbd64dd171a30","subject":"some int -> unsigned int","message":"some int -> unsigned int\n\n","repos":"fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2,fape\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/config.c\n+++ camlibs\/ptp2\/config.c\n@@ -1047,7 +1047,8 @@\n static int\n _put_AUINT8_as_CHAR_ARRAY(CONFIG_PUT_ARGS) {\n \tchar\t*value;\n-\tint\ti, ret;\n+\tunsigned int i;\n+\tint\tret;\n \n \tret = gp_widget_get_value (widget, &value);\n \tif (ret != GP_OK)\n@@ -5901,8 +5902,9 @@\n int\n camera_get_config (Camera *camera, CameraWidget **window, GPContext *context)\n {\n-\tCameraWidget *section, *widget;\n-\tint menuno, submenuno, ret;\n+\tCameraWidget\t*section, *widget;\n+\tunsigned int\tmenuno, submenuno;\n+\tint \t\tret;\n \tuint16_t\t*setprops = NULL;\n \tint\t\ti, nrofsetprops = 0;\n \tPTPParams\t*params = &camera->pl->params;\n"} {"commit":"58fa716e44437297bd49c78cb764986043a1cd76","subject":"Add frame_type getter and setter to RtpDepacketizer::ParsedPayload","message":"Add frame_type getter and setter to RtpDepacketizer::ParsedPayload\n\nPreparation for landing\nhttps:\/\/webrtc-review.googlesource.com\/c\/src\/+\/133024\n\nBug: webrtc:10397\nChange-Id: I5edf13f9059cd066d2d9b7e52e35c13cc3c794d3\nReviewed-on: https:\/\/webrtc-review.googlesource.com\/c\/src\/+\/133567\nReviewed-by: Danil Chapovalov <55de8d9c2b5977da2dd48f967f21f9d606b172a5@webrtc.org>\nCommit-Queue: Niels Moller <0057859e47d61d90529d0f66d9ef692cefedb46a@webrtc.org>\nCr-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#27683}","repos":"ShiftMediaProject\/libilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc,ShiftMediaProject\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc,TimothyGu\/libilbc,TimothyGu\/libilbc,ShiftMediaProject\/libilbc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/rtp_rtcp\/source\/rtp_format.h\n+++ modules\/rtp_rtcp\/source\/rtp_format.h\n@@ -66,6 +66,13 @@\n struct ParsedPayload {\n RTPVideoHeader& video_header() { return video; }\n const RTPVideoHeader& video_header() const { return video; }\n+\n+ \/\/ TODO(bugs.webrtc.org\/10397): These are temporary accessors, to enable\n+ \/\/ move of the frame_type member to inside RTPVideoHeader, without breaking\n+ \/\/ downstream code.\n+ VideoFrameType FrameType() const { return frame_type; }\n+ void SetFrameType(VideoFrameType type) { frame_type = type; }\n+\n RTPVideoHeader video;\n \n const uint8_t* payload;\n"} {"commit":"74a7f736180868ab00ca03df61c7c48af6200157","subject":"Change email contact address","message":"Change email contact address\n","repos":"markpizz\/pthreads4w-code,vancegroup-mirrors\/pthreads-win32,nicolaichuk\/pthread-win32,markpizz\/pthreads4w-code,vancegroup-mirrors\/pthreads-win32,markpizz\/pthreads4w-code,markpizz\/pthreads4w-code,nicolaichuk\/pthread-win32,vancegroup-mirrors\/pthreads-win32,VFR-maniac\/pthreads-win32,nicolaichuk\/pthread-win32,membase\/pthreads-win,vancegroup-mirrors\/pthreads-win32,nicolaichuk\/pthread-win32,CaptTofu\/Pthreads-win32","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pthread.h\n+++ pthread.h\n@@ -112,7 +112,7 @@\n * The code base for this project is coordinated and\n * eventually pre-tested, packaged, and made available by\n *\n- * Ross Johnson <rpj@ise.canberra.edu.au>\n+ * Ross Johnson <rpj@callisto.canberra.edu.au>\n *\n * QA Testers:\n * Ultimately, the library is tested in the real world by\n"} {"commit":"3ea210bbad0442e55dcc31dcc8b805c326a1995a","subject":"shutterspeed setting code allowing multiple specifications of shutterspeed","message":"shutterspeed setting code allowing multiple specifications of\nshutterspeed\n\n\ngit-svn-id: 40dd595c6684d839db675001a64203a1457e7319@12722 67ed7778-7388-44ab-90cf-0a291f65f57c\n","repos":"gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION,gphoto\/libgphoto2.OLDMIGRATION","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/config.c\n+++ camlibs\/ptp2\/config.c\n@@ -2077,7 +2077,7 @@\n _put_ExpTime(CONFIG_PUT_ARGS)\n {\n \tint\tret;\n-\tunsigned int i,delta,xval;\n+\tunsigned int i, delta, xval, ival1, ival2, ival3;\n \tfloat\tval;\n \tchar\t*value;\n \n@@ -2085,22 +2085,17 @@\n \tif (ret != GP_OK)\n \t\treturn ret;\n \n-\tif (!sscanf(value,_(\"%fs\"),&val)) {\n-\t\tint ival1, ival2, ival3;\n-\n-\t\tif (sscanf(value,_(\"%d\/%d\"),&ival1,&ival2) == 2) {\n-\t\t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%d\/%d case\", ival1, ival2);\n-\t\t\tval = (float)ival1\/(float)ival2;\n-\t\t} else if (sscanf(value,_(\"%d %d\/%d\"),&ival1,&ival2,&ival3) == 3) {\n-\t\t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%d %d\/%d case\", ival1, ival2, ival3);\n-\t\t\tval = ((float)ival1) + ((float)ival2\/(float)ival3);\n-\t\t} else if (!sscanf(value,\"%f\",&val)) {\n-\t\t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%f case\", val);\n-\t\t\treturn (GP_ERROR);\n-\t\t}\n-\t} else {\n+\tif (sscanf(value,_(\"%d %d\/%d\"),&ival1,&ival2,&ival3) == 3) {\n+\t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%d %d\/%d case\", ival1, ival2, ival3);\n+\t\tval = ((float)ival1) + ((float)ival2\/(float)ival3);\n+\t} else if (sscanf(value,_(\"%d\/%d\"),&ival1,&ival2) == 2) {\n+\t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%d\/%d case\", ival1, ival2);\n+\t\tval = (float)ival1\/(float)ival2;\n+\t} else if (!sscanf(value,_(\"%f\"),&val)) {\n+\t\tgp_log (GP_LOG_ERROR, \"ptp2\/_put_ExpTime\", \"failed to parse: %s\", value);\n+\t\treturn (GP_ERROR);\n+\t} else\n \t\tgp_log (GP_LOG_DEBUG, \"ptp2\/_put_ExpTime\", \"%fs case\", val);\n-\t}\n \tval = val*10000.0;\n \tdelta = 1000000;\n \txval = val;\n"} {"commit":"0ad4e448d1d8b54a75415370c7e2b56764c2c92b","subject":"Fix [9589813471d0f5525789b7cf7165e48d177cbad6] by using var_Create (Pointed out by fenrir).","message":"Fix [9589813471d0f5525789b7cf7165e48d177cbad6] by using var_Create (Pointed out by fenrir).\n","repos":"jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/services_discovery\/podcast.c\n+++ modules\/services_discovery\/podcast.c\n@@ -156,8 +156,7 @@\n services_discovery_sys_t *p_sys = p_sd->p_sys;\n \n \/* Launch the callback associated with this variable *\/\n- char *psz_urls = var_CreateGetString( p_sd, \"podcast-urls\" );\n- free( psz_urls );\n+ var_Create( p_sd, \"podcast-urls\", VLC_VAR_STRING | VLC_VAR_DOINHERIT );\n var_AddCallback( p_sd, \"podcast-urls\", UrlsChange, p_sys );\n \n while( vlc_object_alive (p_sd) )\n@@ -166,7 +165,7 @@\n if( p_sys->b_update == true )\n {\n msg_Dbg( p_sd, \"Update required\" );\n- psz_urls = var_GetNonEmptyString( p_sd, \"podcast-urls\" );\n+ char* psz_urls = var_GetNonEmptyString( p_sd, \"podcast-urls\" );\n if( psz_urls != NULL )\n ParseUrls( p_sd, psz_urls );\n free( psz_urls );\n"} {"commit":"6732c554b4e9ff8adecca6e2820c20a1ae93dc0e","subject":"added nikon raw image size","message":"added nikon raw image size\n","repos":"gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2,gphoto\/libgphoto2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- camlibs\/ptp2\/config.c\n+++ camlibs\/ptp2\/config.c\n@@ -8384,6 +8384,7 @@\n \t{ N_(\"Image Format\"), \"imageformat\", 0,\t\t\t\t\tPTP_VENDOR_PANASONIC,PTP_DTC_UINT16, _get_Panasonic_ImageFormat, _put_Panasonic_ImageFormat },\n \t{ N_(\"Image Format Ext HD\"), \"imageformatexthd\", PTP_DPC_CANON_EOS_ImageFormatExtHD, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_ImageFormat, _put_Canon_EOS_ImageFormat },\n \t{ N_(\"Image Size\"), \"imagesize\", PTP_DPC_ImageSize, 0, PTP_DTC_STR, _get_STR_ENUMList, _put_STR },\n+\t{ N_(\"Raw Image Size\"), \"rawimagesize\", PTP_DPC_NIKON_RawImageSize, PTP_VENDOR_NIKON, PTP_DTC_STR, _get_STR_ENUMList, _put_STR },\n \t{ N_(\"Image Size\"), \"imagesize\", PTP_DPC_NIKON_1_ImageSize, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon1_ImageSize, _put_Nikon1_ImageSize },\n \t{ N_(\"Image Size\"), \"imagesize\", PTP_DPC_SONY_ImageSize, PTP_VENDOR_SONY, PTP_DTC_UINT8, _get_Sony_ImageSize, _put_Sony_ImageSize },\n \t{ N_(\"Image Size\"), \"imagesize\", PTP_DPC_CANON_ImageSize, PTP_VENDOR_CANON, PTP_DTC_UINT8, _get_Canon_Size, _put_Canon_Size },\n"} {"commit":"5fb00751a8bbfad83ee02e721e57f3833c63adbf","subject":"more style things, time to restart computer","message":"more style things, time to restart computer\n","repos":"tlively\/cs51-final","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- physics.c\n+++ physics.c\n@@ -445,10 +445,10 @@\n float min1, max1, min2, max2;\n \n \/\/ go through all the axis on our stuffs\n- for (int i = 0; i < NVERTS(obj1); i++) {\n+ for (int i = 0, j = 1; i < NVERTS(obj1); i++, j = (j+1) % NVERTS(obj1)) {\n \/\/ TODO: handle last case vertex[MAX] -> vertex[0]\n \/\/ get the normal to one of the sides on obj1 (% handles last case)\n- axis = vect_axis(VERTEX(obj1)[i],(VERTEX(obj1)[(i+1) % NVERTS(obj1)]));\n+ axis = vect_axis(VERTEX(obj1)[i],(VERTEX(obj1)[j]));\n \n \/\/ get the min and max projections\n vect_dot_extrema(obj1, axis, &min1, &max1); \n"} {"commit":"3ec46dc7aeb95809134a680bc4b4c9ccb090976b","subject":"transcode: fix audio format given to filters (fixes #8385)","message":"transcode: fix audio format given to filters (fixes #8385)\n","repos":"vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/stream_out\/transcode\/audio.c\n+++ modules\/stream_out\/transcode\/audio.c\n@@ -99,8 +99,7 @@\n }\n \/* decoders don't set audio.i_format, but audio filters use it *\/\n id->p_decoder->fmt_out.audio.i_format = id->p_decoder->fmt_out.i_codec;\n- id->p_decoder->fmt_out.audio.i_bitspersample =\n- aout_BitsPerSample( id->p_decoder->fmt_out.i_codec );\n+ aout_FormatPrepare( &id->p_decoder->fmt_out.audio );\n fmt_last = id->p_decoder->fmt_out.audio;\n \/* Fix AAC SBR changing number of channels and sampling rate *\/\n if( !(id->p_decoder->fmt_in.i_codec == VLC_CODEC_MP4A &&\n@@ -116,16 +115,12 @@\n es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,\n id->p_decoder->fmt_out.i_codec );\n id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;\n-\n id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;\n id->p_encoder->fmt_in.audio.i_physical_channels =\n id->p_encoder->fmt_out.audio.i_physical_channels;\n id->p_encoder->fmt_in.audio.i_original_channels =\n id->p_encoder->fmt_out.audio.i_original_channels;\n- id->p_encoder->fmt_in.audio.i_channels =\n- id->p_encoder->fmt_out.audio.i_channels;\n- id->p_encoder->fmt_in.audio.i_bitspersample =\n- aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );\n+ aout_FormatPrepare( &id->p_encoder->fmt_in.audio );\n \n id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;\n id->p_encoder->p_module =\n@@ -139,14 +134,12 @@\n id->p_decoder->p_module = NULL;\n return VLC_EGENERIC;\n }\n- id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;\n- id->p_encoder->fmt_in.audio.i_bitspersample =\n- aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );\n \n id->p_encoder->fmt_out.i_codec =\n vlc_fourcc_GetCodec( AUDIO_ES, id->p_encoder->fmt_out.i_codec );\n \n- \/* Fix channels *\/\n+ \/* Fix input format *\/\n+ id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;\n if( !id->p_encoder->fmt_in.audio.i_physical_channels\n || !id->p_encoder->fmt_in.audio.i_original_channels )\n {\n@@ -155,6 +148,7 @@\n id->p_encoder->fmt_in.audio.i_original_channels =\n pi_channels_maps[id->p_encoder->fmt_in.audio.i_channels];\n }\n+ aout_FormatPrepare( &id->p_encoder->fmt_in.audio );\n \n \/* Load user specified audio filters *\/\n \/* XXX: These variable names come kinda out of nowhere... *\/\n"} {"commit":"4f6bd8d19fda2a70782e135d717c0f44c383d51f","subject":"remove namespace from android log defines","message":"remove namespace from android log defines\n","repos":"IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense,IntelRealSense\/librealsense","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/easyloggingpp.h\n+++ src\/easyloggingpp.h\n@@ -5,18 +5,18 @@\n \r\n #if BUILD_EASYLOGGINGPP\r\n #include \"..\/third-party\/easyloggingpp\/src\/easylogging++.h\"\r\n-namespace librealsense {\r\n+\r\n \r\n #ifdef RS2_USE_ANDROID_BACKEND\r\n #include <android\/log.h>\r\n #include <sstream>\r\n \r\n-#define LOG_TAG \"librs\"\r\n+#define ANDROID_LOG_TAG \"librs\"\r\n \r\n-#define LOG_INFO(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write(librealsense::ANDROID_LOG_INFO, LOG_TAG, ss.str().c_str()); } while(false)\r\n-#define LOG_WARNING(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write(librealsense::ANDROID_LOG_WARN, LOG_TAG, ss.str().c_str()); } while(false)\r\n-#define LOG_ERROR(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write(librealsense::ANDROID_LOG_ERROR, LOG_TAG, ss.str().c_str()); } while(false)\r\n-#define LOG_FATAL(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write(librealsense::ANDROID_LOG_ERROR, LOG_TAG, ss.str().c_str()); } while(false)\r\n+#define LOG_INFO(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write( ANDROID_LOG_INFO, ANDROID_LOG_TAG, ss.str().c_str() ); } while(false)\r\n+#define LOG_WARNING(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write( ANDROID_LOG_WARN, ANDROID_LOG_TAG, ss.str().c_str() ); } while(false)\r\n+#define LOG_ERROR(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write( ANDROID_LOG_ERROR, ANDROID_LOG_TAG, ss.str().c_str() ); } while(false)\r\n+#define LOG_FATAL(...) do { std::ostringstream ss; ss << __VA_ARGS__; __android_log_write( ANDROID_LOG_ERROR, ANDROID_LOG_TAG, ss.str().c_str() ); } while(false)\r\n #ifdef NDEBUG\r\n #define LOG_DEBUG(...)\r\n #else\r\n@@ -45,4 +45,3 @@\n \r\n \r\n #endif \/\/ BUILD_EASYLOGGINGPP\r\n-}\r\n"} {"commit":"9706682c0a47eb77bfc56ed7c6fd311178df8f0b","subject":"Forgot to import the newer categories in ThunderCats.h...","message":"Forgot to import the newer categories in ThunderCats.h...\n","repos":"metova\/ThunderCats,metova\/ThunderCats,metova\/ThunderCats","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Categories\/ThunderCats.h\n+++ Categories\/ThunderCats.h\n@@ -39,5 +39,9 @@\n #import \"UITableViewCell+TCAdditions.h\"\n #import \"UIView+TCAdditions.h\"\n #import \"UIImageView+WebCacheBlur.h\"\n+#import \"UITextField+TCAdditions.h\"\n+#import \"NSDictionary+TCAdditions.h\"\n+#import \"NSURL+TCAdditions.h\"\n+#import \"UIControl+TCAdditions.h\"\n \n #endif\n"} {"commit":"af09d98f4fe2a43dad5446fe2ae09af25ba64b5d","subject":"merging.","message":"merging.\n","repos":"zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb,zyzyis\/monetdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- sql\/backends\/monet5\/sql_scenario.c\n+++ sql\/backends\/monet5\/sql_scenario.c\n@@ -413,6 +413,7 @@\n \tchar *buf = GDKmalloc(2048), *err = NULL;\n \tsize_t bufsize = 2048, pos = 0;\n \n+\t\/* sys.median and sys.corr functions *\/\n \tpos += snprintf(buf+pos, bufsize-pos, \"create aggregate median(val TINYINT) returns TINYINT external name \\\"aggr\\\".\\\"median\\\";\\n\");\n \tpos += snprintf(buf+pos, bufsize-pos, \"create aggregate median(val SMALLINT) returns SMALLINT external name \\\"aggr\\\".\\\"median\\\";\\n\");\n \tpos += snprintf(buf+pos, bufsize-pos, \"create aggregate median(val INTEGER) returns INTEGER external name \\\"aggr\\\".\\\"median\\\";\\n\");\n@@ -426,7 +427,18 @@\n \tpos += snprintf(buf+pos, bufsize-pos, \"create aggregate corr(e1 REAL, e2 REAL) returns REAL external name \\\"aggr\\\".\\\"corr\\\";\\n\");\n \tpos += snprintf(buf+pos, bufsize-pos, \"create aggregate corr(e1 DOUBLE, e2 DOUBLE) returns DOUBLE external name \\\"aggr\\\".\\\"corr\\\";\\n\");\n \n+\t\/* changes in createdb\/25_debug.sql *\/\n+\tpos += snprintf(buf+pos, bufsize-pos, \"drop function storage;\\n\");\n+\tpos += snprintf(buf+pos, bufsize-pos, \"create function storage() returns table (\\\"schema\\\" string, \\\"table\\\" string, \\\"column\\\" string, location string, \\\"count\\\" bigint, capacity bigint, width int, size bigint, hashsize bigint, sorted boolean) external name sql.storage;\\n\");\n+\tpos += snprintf(buf+pos, bufsize-pos, \"create function optimizers() returns table (name string, def string, status string) external name sql.optimizers;\\n\");\n+\tpos += snprintf(buf+pos, bufsize-pos, \"drop procedure ra;\\n\");\n+\tpos += snprintf(buf+pos, bufsize-pos, \"create procedure evalAlgebra( ra_stmt string, opt bool) external name sql.\\\"evalAlgebra\\\";\\n\");\n+\n \tpos += snprintf(buf + pos, bufsize-pos, \"insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas s where f.name in ('median', 'corr') and f.type = %d and f.schema_id = s.id and s.name = 'sys');\\n\", F_AGGR);\n+\tpos += snprintf(buf + pos, bufsize-pos, \"insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas s where f.name in ('storage', 'optimizers') and f.type = %d and f.schema_id = s.id and s.name = 'sys');\\n\", F_FUNC);\n+\tpos += snprintf(buf + pos, bufsize-pos, \"insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas s where f.name in ('evalalgebra') and f.type = %d and f.schema_id = s.id and s.name = 'sys');\\n\", F_PROC);\n+\n+\tassert(pos < 2048);\n \n \tprintf(\"Running database upgrade commands:\\n%s\\n\", buf);\n \terr = SQLstatementIntern(c, &buf, \"update\", 1, 0);\n"} {"commit":"b75e3b9c1f13b3757c75a9a9e9a88625959ed3c1","subject":"demo detail implemention","message":"demo detail implemention\n","repos":"chainx-org\/c-abci,chainx-org\/c-abci","returncode":1,"stderr":"error: pathspec 'demo\/util.h' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- demo\/util.h\n+++ demo\/util.h\n@@ -0,0 +1,24 @@\n+\n+#ifndef __UTIL_H__\n+#define __UTIL_H__\n+\n+#include \"dlist.h\"\n+#include \"message.h\"\n+\n+#define HASHLEN 10\n+\n+void init_dummy();\n+\n+void destory_dummy();\n+\n+int get_height();\n+\n+uint8_t *get_last_app_hash();\n+\n+Types__CodeType set_state(uint8_t *key, uint8_t *value, uint8_t *tx);\n+\n+Types__CodeType check_transation(uint8_t *tx);\n+\n+int getcols(uint8_t *value, uint8_t split, uint8_t word[][64]);\n+\n+#endif\n"} {"commit":"634c23a76bf903a42302f6dc2ae77bcfc7a9ede3","subject":"for testing matrix multiplication","message":"for testing matrix multiplication\n\n\ngit-svn-id: 9e9401559e51101c165cdce4d49b411eb20436ed@2724 3d70eeeb-363e-0410-a505-8a46323a89f2\n","repos":"BRAINSia\/teem,Slicer\/teem,Slicer\/teem,BRAINSia\/teem,BRAINSia\/teem,BRAINSia\/teem,Slicer\/teem,Slicer\/teem,BRAINSia\/teem,Slicer\/teem","returncode":1,"stderr":"error: pathspec 'src\/ell\/test\/mmul.c' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- src\/ell\/test\/mmul.c\n+++ src\/ell\/test\/mmul.c\n@@ -0,0 +1,75 @@\n+\/*\n+ teem: Gordon Kindlmann's research software\n+ Copyright (C) 2005 Gordon Kindlmann\n+ Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah\n+\n+ This library is free software; you can redistribute it and\/or\n+ modify it under the terms of the GNU Lesser General Public\n+ License as published by the Free Software Foundation; either\n+ version 2.1 of the License, or (at your option) any later version.\n+\n+ This library is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+ Lesser General Public License for more details.\n+\n+ You should have received a copy of the GNU Lesser General Public\n+ License along with this library; if not, write to the Free Software\n+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+*\/\n+\n+#include \"..\/ell.h\"\n+\n+char *mulInfo = (\"Tests ell_Nm_mul\");\n+\n+int\n+main(int argc, char *argv[]) {\n+ char *me, *outS, *err;\n+ hestOpt *hopt;\n+ hestParm *hparm;\n+ airArray *mop;\n+ Nrrd *_ninA, *_ninB, *ninA, *ninB, *nmul;\n+\n+ me = argv[0];\n+ mop = airMopNew();\n+ hparm = hestParmNew();\n+ hopt = NULL;\n+ airMopAdd(mop, hparm, (airMopper)hestParmFree, airMopAlways);\n+ hestOptAdd(&hopt, NULL, \"matrix\", airTypeOther, 1, 1, &_ninA, NULL,\n+ \"first matrix\",\n+ NULL, NULL, nrrdHestNrrd);\n+ hestOptAdd(&hopt, NULL, \"matrix\", airTypeOther, 1, 1, &_ninB, NULL,\n+ \"first matrix\",\n+ NULL, NULL, nrrdHestNrrd);\n+ hestOptAdd(&hopt, \"o\", \"filename\", airTypeString, 1, 1, &outS, \"-\",\n+ \"file to write output nrrd to\");\n+ hestParseOrDie(hopt, argc-1, argv+1, hparm,\n+ me, mulInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);\n+ airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);\n+ airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);\n+\n+ ninA = nrrdNew();\n+ airMopAdd(mop, ninA, (airMopper)nrrdNuke, airMopAlways);\n+ ninB = nrrdNew();\n+ airMopAdd(mop, ninB, (airMopper)nrrdNuke, airMopAlways);\n+ nmul = nrrdNew();\n+ airMopAdd(mop, nmul, (airMopper)nrrdNuke, airMopAlways);\n+ \n+ nrrdConvert(ninA, _ninA, nrrdTypeDouble);\n+ nrrdConvert(ninB, _ninB, nrrdTypeDouble);\n+ if (ell_Nm_mul(nmul, ninA, ninB)) {\n+ airMopAdd(mop, err = biffGetDone(ELL), airFree, airMopAlways);\n+ fprintf(stderr, \"%s: problem inverting:\\n%s\\n\", me, err);\n+ airMopError(mop); return 1;\n+ }\n+\n+ if (nrrdSave(outS, nmul, NULL)) {\n+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);\n+ fprintf(stderr, \"%s: problem saving output:\\n%s\\n\", me, err);\n+ airMopError(mop); return 1;\n+ }\n+\n+ airMopOkay(mop);\n+ exit(0);\n+}\n+\n"} {"commit":"16b359905f8c9cfb3707032ed5a2d1c7fb85ae04","subject":"demos: Fix shader assert in tri.c","message":"demos: Fix shader assert in tri.c\n\nUpdating tri demo's shader versions to 140 keeps them from asserting\n","repos":"KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools,KhronosGroup\/Vulkan-Tools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- demos\/tri.c\n+++ demos\/tri.c\n@@ -912,7 +912,7 @@\n static XGL_SHADER demo_prepare_vs(struct demo *demo)\n {\n static const char *vertShaderText =\n- \"#version 130\\n\"\n+ \"#version 140\\n\"\n \"#extension GL_ARB_explicit_attrib_location : require\\n\"\n \"layout(location = 0) in vec4 pos;\\n\"\n \"layout(location = 1) in vec2 attr;\\n\"\n@@ -930,7 +930,7 @@\n static XGL_SHADER demo_prepare_fs(struct demo *demo)\n {\n static const char *fragShaderText =\n- \"#version 130\\n\"\n+ \"#version 140\\n\"\n \"uniform sampler2D tex;\\n\"\n \"in vec2 texcoord;\\n\"\n \"void main() {\\n\"\n"} {"commit":"f18e0e808fda20ff83e738fba3f3ba857b33357a","subject":"fixed linux","message":"fixed linux\n","repos":"nem0\/LumixEngine,nem0\/LumixEngine,nem0\/LumixEngine","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"e16c6cf5f25809d86d6872c91f6eae0953add57d","subject":"wsi: Deal with drivers that don't allow query of swap-chain VkFormat.","message":"wsi: Deal with drivers that don't allow query of swap-chain VkFormat.\n","repos":"Radamanthe\/VulkanSamples,KhronosGroup\/Vulkan-LoaderAndValidationLayers,KhronosGroup\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,sashinde\/VulkanTools,sashinde\/VulkanTools,KhronosGroup\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,critsec\/Vulkan-LoaderAndValidationLayers,elongbug\/Vulkan-LoaderAndValidationLayers,sashinde\/VulkanTools,elongbug\/Vulkan-LoaderAndValidationLayers,elongbug\/Vulkan-LoaderAndValidationLayers,elongbug\/Vulkan-LoaderAndValidationLayers,critsec\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,KhronosGroup\/Vulkan-LoaderAndValidationLayers,critsec\/Vulkan-LoaderAndValidationLayers,critsec\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,Radamanthe\/VulkanSamples,sashinde\/VulkanTools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- demos\/tri.c\n+++ demos\/tri.c\n@@ -1469,7 +1469,14 @@\n VkDisplayWSI display;\n err = vkGetPhysicalDeviceInfo(demo->gpu, VK_PHYSICAL_DEVICE_INFO_TYPE_DISPLAY_PROPERTIES_WSI,\n &data_size, NULL);\n- assert(!err);\n+ if (err != VK_SUCCESS) {\n+ printf(\"The Vulkan installable client driver (ICD) does not support \"\n+ \"querying\\nfor the swap-chain image format. Therefore, am \"\n+ \"hardcoding this\\nformat to VK_FORMAT_B8G8R8A8_UNORM.\\n\");\n+ fflush(stdout);\n+ demo->format = VK_FORMAT_B8G8R8A8_UNORM;\n+ return;\n+ }\n demo->display_props = (VkDisplayPropertiesWSI *) malloc(data_size);\n err = vkGetPhysicalDeviceInfo(demo->gpu, VK_PHYSICAL_DEVICE_INFO_TYPE_DISPLAY_PROPERTIES_WSI,\n &data_size, demo->display_props);\n"} {"commit":"2261de2884b09cd78ca21cd015f67fa72bde84b2","subject":"Fix build without UNICODE","message":"Fix build without UNICODE\n\n(cherry picked from commit 4503678e2ccd036f7bdc035df06761d23e0e013a)\n","repos":"ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core,ONLYOFFICE\/core","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- Common\/DocxFormat\/Source\/XML\/Utils.h\n+++ Common\/DocxFormat\/Source\/XML\/Utils.h\n@@ -231,13 +231,11 @@\n \r\n double d = 0;\r\n #if defined (_WIN32) || defined (_WIN64)\r\n-\t\tswscanf_s(string.c_str(), L\"%lf\", &d);\r\n-#elif defined(_IOS) || defined(__ANDROID__)\r\n+ swscanf_s(string.c_str(), L\"%lf\", &d);\r\n+#else\r\n swscanf(string.c_str(), L\"%lf\", &d);\r\n-#else\r\n-\t\t_stscanf(string.c_str(), L\"%lf\", &d);\r\n #endif\r\n-\t\treturn d;\r\n+ return d;\r\n \t}\r\n AVSINLINE static float GetFloat (const std::wstring& string)\r\n \t{\r\n@@ -245,13 +243,11 @@\n \r\n float f = 0;\r\n #if defined (_WIN32) || defined (_WIN64)\r\n-\t\tswscanf_s(string.c_str(), L\"%f\", &f);\r\n-#elif defined(_IOS) || defined(__ANDROID__)\r\n+ swscanf_s(string.c_str(), L\"%f\", &f);\r\n+#else\r\n swscanf(string.c_str(), L\"%f\", &f);\r\n-#else\r\n- _stscanf(string.c_str(), L\"%f\", &f);\r\n #endif\r\n-\t\treturn f;\r\n+ return f;\r\n \t}\r\n AVSINLINE static std::wstring BoolToString (const bool & value)\r\n \t{\r\n"} {"commit":"47c8f20bdf76f38a03b507b52345653dea6dff6c","subject":"introduced ticket pooling","message":"introduced ticket pooling\n","repos":"pavel-paulau\/couchbase-python-client,pavel-paulau\/couchbase-python-client","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pylibcb.c\n+++ pylibcb.c\n@@ -20,8 +20,16 @@\n static PyObject *ConnectionFailure;\n static PyObject *Failure;\n \n+#define TICKET_POOL_SIZE 256\n+\n+typedef struct t_ticket { \n+ int ticket[2];\n+ struct t_ticket *next;\n+} ticket;\n+\n typedef struct t_pylibcb_instance {\n int callback_ticket;\n+ ticket *ticket_pool;\n int succeeded;\n int timed_out;\n char returned_value[16384];\n@@ -44,22 +52,33 @@\n static pylibcb_instance *context = 0;\n \n int *new_ticket() {\n- int *boxed = malloc(sizeof(int) *2);\n- boxed[0] = ++context->callback_ticket;\n- boxed[1] = 0;\n- return boxed;\n-}\n-\n-int *punch_ticket(int *t) {\n+ ticket *t;\n+\n+ if (context->ticket_pool) {\n+ t = context->ticket_pool;\n+ context->ticket_pool = t->next;\n+ } else\n+ t = malloc(sizeof(ticket)); \n+\n+ t->ticket[0] = ++context->callback_ticket;\n+ t->ticket[1] = 0;\n+ t->next = 0;\n+\n+ return (int *) t; \n+}\n+\n+int *hand_out_ticket(int *t) {\n ++t[1];\n return t;\n }\n \n int rip_ticket(int *t) {\n int r = t[0];\n- if (!--t[1])\n- free(t);\n- return r;\n+ if (!--t[1]) {\n+ ticket *_t = (ticket *) t;\n+ _t->next = context->ticket_pool;\n+ context->ticket_pool = _t;\n+ } return r;\n }\n \n void *get_callback(libcouchbase_t instance,\n@@ -145,6 +164,7 @@\n return 0;\n }\n z->callback_ticket = 0;\n+ z->ticket_pool = 0;\n \n z->base = event_base_new();\n if (!z) {\n@@ -217,7 +237,7 @@\n return 0;\n \n context = (pylibcb_instance *) PyCObject_AsVoidPtr(cb);\n- libcouchbase_store_by_key(context->cb, punch_ticket(new_ticket()), LIBCOUCHBASE_SET, 0, 0, key, nkey, val, nval, 0, 0, 0);\n+ libcouchbase_store_by_key(context->cb, hand_out_ticket(new_ticket()), LIBCOUCHBASE_SET, 0, 0, key, nkey, val, nval, 0, 0, 0);\n libcouchbase_wait(context->cb);\n \n Py_INCREF(Py_None);\n@@ -235,7 +255,7 @@\n return 0;\n \n context = (pylibcb_instance *) PyCObject_AsVoidPtr(cb);\n- libcouchbase_remove_by_key(context->cb, punch_ticket(new_ticket()), 0, 0, key, nkey, 0);\n+ libcouchbase_remove_by_key(context->cb, hand_out_ticket(new_ticket()), 0, 0, key, nkey, 0);\n libcouchbase_wait(context->cb);\n \n Py_INCREF(Py_None);\n@@ -245,10 +265,10 @@\n static PyObject *get(PyObject *self, PyObject *args) {\n PyObject *cb;\n void *key;\n- int nkey;\n+ int _nkey;\n int usec = 0;\n \n- if (!PyArg_ParseTuple(args, \"Os#|i\", &cb, &key, &nkey, &usec))\n+ if (!PyArg_ParseTuple(args, \"Os#|i\", &cb, &key, &_nkey, &usec))\n return 0;\n if (!pyobject_is_pylibcb_instance(cb))\n return 0;\n@@ -258,10 +278,11 @@\n context->timed_out = 0;\n \n int *ticket = new_ticket();\n+ libcouchbase_size_t nkey = _nkey;\n \n if (usec)\n- create_timeout(usec, punch_ticket(ticket));\n- libcouchbase_mget_by_key(context->cb, punch_ticket(ticket), 0, 0, 1, &key, &nkey, 0);\n+ create_timeout(usec, hand_out_ticket(ticket));\n+ libcouchbase_mget_by_key(context->cb, hand_out_ticket(ticket), 0, 0, 1, &key, &nkey, 0);\n \n while (!context->timed_out && !context->succeeded)\n libcouchbase_wait(context->cb);\n"} {"commit":"e14b555411a7202ff7f8bab8e520fc2dac5e6db5","subject":"Re-inserted MITK clone macro.","message":"Re-inserted MITK clone macro.\n","repos":"iwegner\/MITK,lsanzdiaz\/MITK-BiiG,lsanzdiaz\/MITK-BiiG,NifTK\/MITK,MITK\/MITK,nocnokneo\/MITK,danielknorr\/MITK,rfloca\/MITK,NifTK\/MITK,fmilano\/mitk,lsanzdiaz\/MITK-BiiG,RabadanLab\/MITKats,NifTK\/MITK,rfloca\/MITK,MITK\/MITK,rfloca\/MITK,NifTK\/MITK,fmilano\/mitk,iwegner\/MITK,lsanzdiaz\/MITK-BiiG,danielknorr\/MITK,nocnokneo\/MITK,danielknorr\/MITK,rfloca\/MITK,MITK\/MITK,RabadanLab\/MITKats,fmilano\/mitk,RabadanLab\/MITKats,fmilano\/mitk,lsanzdiaz\/MITK-BiiG,rfloca\/MITK,iwegner\/MITK,nocnokneo\/MITK,rfloca\/MITK,RabadanLab\/MITKats,nocnokneo\/MITK,RabadanLab\/MITKats,fmilano\/mitk,iwegner\/MITK,nocnokneo\/MITK,lsanzdiaz\/MITK-BiiG,NifTK\/MITK,danielknorr\/MITK,MITK\/MITK,fmilano\/mitk,danielknorr\/MITK,nocnokneo\/MITK,danielknorr\/MITK,lsanzdiaz\/MITK-BiiG,MITK\/MITK,lsanzdiaz\/MITK-BiiG,MITK\/MITK,iwegner\/MITK,danielknorr\/MITK,rfloca\/MITK,fmilano\/mitk,nocnokneo\/MITK,iwegner\/MITK,RabadanLab\/MITKats,NifTK\/MITK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Core\/Code\/DataManagement\/mitkSurface.h\n+++ Core\/Code\/DataManagement\/mitkSurface.h\n@@ -35,6 +35,7 @@\n \n mitkClassMacro(Surface, BaseData);\n itkNewMacro(Self);\n+ mitkCloneMacro(Surface);\n \n void CalculateBoundingBox();\n virtual void CopyInformation(const itk::DataObject *data);\n"} {"commit":"254aa0a221a7c95e1a6579757d4fccf91d9635ec","subject":"diff options for -O","message":"diff options for -O\n","repos":"deepak899\/sctp-refimpl,timsuchanek\/sctp-refimpl,deepak899\/sctp-refimpl,tosakanth\/sctp-refimpl,sctplab\/sctp-refimpl,gale320\/sctp-refimpl,sctplab\/sctp-refimpl,TopPano\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,sctplab\/sctp-refimpl,tosakanth\/sctp-refimpl,sdd330\/sctp-refimpl,TopPano\/sctp-refimpl,sctplab\/sctp-refimpl,gale320\/sctp-refimpl,xwhuang\/sctp-refimpl,tosakanth\/sctp-refimpl,TopPano\/sctp-refimpl,TopPano\/sctp-refimpl,tosakanth\/sctp-refimpl,tosakanth\/sctp-refimpl,deepak899\/sctp-refimpl,sdd330\/sctp-refimpl,timsuchanek\/sctp-refimpl,gale320\/sctp-refimpl,timsuchanek\/sctp-refimpl,TopPano\/sctp-refimpl,TopPano\/sctp-refimpl,gale320\/sctp-refimpl,gale320\/sctp-refimpl,sdd330\/sctp-refimpl,xwhuang\/sctp-refimpl,tosakanth\/sctp-refimpl,timsuchanek\/sctp-refimpl,deepak899\/sctp-refimpl,gale320\/sctp-refimpl,xwhuang\/sctp-refimpl,xwhuang\/sctp-refimpl,TopPano\/sctp-refimpl,TopPano\/sctp-refimpl,xwhuang\/sctp-refimpl,sctplab\/sctp-refimpl,tosakanth\/sctp-refimpl,gale320\/sctp-refimpl,sdd330\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,TopPano\/sctp-refimpl,gale320\/sctp-refimpl,timsuchanek\/sctp-refimpl,sdd330\/sctp-refimpl,gale320\/sctp-refimpl,xwhuang\/sctp-refimpl,sdd330\/sctp-refimpl,tosakanth\/sctp-refimpl,deepak899\/sctp-refimpl,sdd330\/sctp-refimpl,sdd330\/sctp-refimpl,sctplab\/sctp-refimpl,deepak899\/sctp-refimpl,sdd330\/sctp-refimpl,tosakanth\/sctp-refimpl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- APPS\/incast\/display_ele_client.c\n+++ APPS\/incast\/display_ele_client.c\n@@ -99,9 +99,12 @@\n \t\t\t(unsigned long)sink->number_bytes);\n \n \t} else if (one_print_per) {\n-\t\t\tfprintf(out, \"%ld %ld\\n\",\n-\t\t\t\t(unsigned long)((hdr->start.tv_sec - begin.tv_sec) + sink->mono_end.tv_sec),\n-\t\t\t\t(unsigned long)(bps\/1024.0));\n+\t\t\tfprintf(out, \"%ld %ld %ld\\n\",\n+\t\t\t\t(unsigned long)((sink->mono_end.tv_sec * 1000) +\n+\t\t\t\t\t\t(sink->mono_end.tv_nsec\/1000000)),\n+\t\t\t\t(unsigned long)sink->number_bytes,\n+\t\t\t\t(unsigned long)hdr->start.tv_sec\n+\t\t\t\t);\n \n \t} else {\n \t\tfor(i=0; i<sink->mono_end.tv_sec; i++) {\n"} {"commit":"8b7e4cc8781dfd63ae1af1c246b35d329902c07b","subject":"Fixed bogus uses of vrj::OsgApp.","message":"Fixed bogus uses of vrj::OsgApp.\n\n\ngit-svn-id: a341ccba1312b2efdbe34f40faf90581f48aa49f@20597 08b38cba-cd3b-11de-854e-f91c5b6e4272\n","repos":"LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,MichaelMcDonnell\/vrjuggler,vancegroup-mirrors\/vrjuggler,MichaelMcDonnell\/vrjuggler,godbyk\/vrjuggler-upstream-old,vrjuggler\/vrjuggler,MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,LiuKeHua\/vrjuggler,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,godbyk\/vrjuggler-upstream-old,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,vrjuggler\/vrjuggler,vancegroup-mirrors\/vrjuggler,LiuKeHua\/vrjuggler,MichaelMcDonnell\/vrjuggler,LiuKeHua\/vrjuggler,godbyk\/vrjuggler-upstream-old,LiuKeHua\/vrjuggler,LiuKeHua\/vrjuggler,godbyk\/vrjuggler-upstream-old,vrjuggler\/vrjuggler,vancegroup-mirrors\/vrjuggler,vancegroup-mirrors\/vrjuggler,vancegroup-mirrors\/vrjuggler,vrjuggler\/vrjuggler,vancegroup-mirrors\/vrjuggler,godbyk\/vrjuggler-upstream-old,MichaelMcDonnell\/vrjuggler,godbyk\/vrjuggler-upstream-old,vrjuggler\/vrjuggler,vrjuggler\/vrjuggler,vrjuggler\/vrjuggler","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/vrjuggler\/vrj\/Draw\/OSG\/App.h\n+++ modules\/vrjuggler\/vrj\/Draw\/OSG\/App.h\n@@ -56,7 +56,7 @@\n namespace osg\n {\n \n-\/** \\class vrj::osg:;App OsgApp.h vrj\/Draw\/OSG\/OsgApp.h\n+\/** \\class vrj::osg::App App.h vrj\/Draw\/OSG\/App.h\n *\n * Encapsulates an Open Scene Graph (OSG) application. This defines the base\n * class from which OSG-based application classes should be derived. It makes\n@@ -73,14 +73,14 @@\n class App : public vrj::opengl::App\n {\n public:\n- OsgApp(Kernel* kern = NULL)\n+ App(Kernel* kern = NULL)\n : vrj::opengl::App(kern)\n , mFrameNumber(0)\n {\n ;\n }\n \n- virtual ~OsgApp()\n+ virtual ~App()\n {\n ;\n }\n@@ -100,7 +100,7 @@\n \/**\n * Returns the options to be passed to osgUtil::SceneView::setDefaults()\n * for each scene view that is configured. This is called by the default\n- * implementation of vrj::OsgApp::configSceneView(). See\n+ * implementation of vrj::osg::App::configSceneView(). See\n * osgUtil::SceneView::Options for the available settings.\n *\n * @see configSceneView()\n@@ -141,7 +141,7 @@\n * several steps.\n *\n * \\code\n- * \/\/ First, declare two member variables in your subclass of vrj::OsgApp\n+ * \/\/ First, declare two member variables in your subclass of vrj::osg::App\n * such as the following:\n * osg::ref_ptr<osg::Light> mLight0;\n * osg::ref_ptr<osg::LightSource> mLightSource0;\n@@ -149,7 +149,7 @@\n * \/\/ Then, in init() do something such as the following:\n * void MyApp::init()\n * {\n- * vrj::OsgApp::init();\n+ * vrj::osg::App::init();\n *\n * mLight0 = new osg::Light();\n * mLight0->setLightNum(0);\n@@ -168,7 +168,7 @@\n * this->getScene()->addChild( mLightSource0.get() );\n * }\n *\n- * \/\/ Next, override vrj::OsgApp::getSceneViewDefaults() to change the\n+ * \/\/ Next, override vrj::osg::App::getSceneViewDefaults() to change the\n * \/\/ option passed to osgUtil::SceneView::setDefaults().\n * osgUtil::SceneView::Options MyApp::getSceneViewDefaults()\n * {\n@@ -178,7 +178,7 @@\n * \/\/ Finally, set up the osgUtil::SceneView instance to use this light.\n * void MyApp::configSceneView(osgUtil::SceneView* newSceneViewer)\n * {\n- * vrj::OsgApp::configSceneView(newSceneViewer);\n+ * vrj::osg::App::configSceneView(newSceneViewer);\n *\n * \/\/ add lights and turn on lighting\n * newSceneViewer->getGlobalStateSet()->setAssociatedModes(\n@@ -330,8 +330,8 @@\n * Performs the update stage on the scene graph. This function should be\n * called as the last thing that happens in latePreFrame(). If\n * latePreFrame() is not overridden, then this happens automatically.\n- * Otherwise be sure to call vrj::OsgApp::latePreFrame() as the last thing\n- * in application object's override of latePreFrame().\n+ * Otherwise be sure to call vrj::osg::App::latePreFrame() as the last\n+ * thing in application object's override of latePreFrame().\n *\n * @pre The library is preparing to switch from the serial preDraw stages\n * to the parallel draw stages.\n@@ -380,7 +380,7 @@\n vpr::Mutex mSceneViewLock;\n };\n \n-inline void OsgApp::contextInit()\n+inline void App::contextInit()\n {\n const unsigned int unique_context_id =\n vrj::opengl::DrawManager::instance()->getCurrentContext();\n@@ -398,7 +398,7 @@\n (*sceneViewer) = new_sv;\n }\n \n-inline void OsgApp::draw()\n+inline void App::draw()\n {\n glClear(GL_DEPTH_BUFFER_BIT);\n \n@@ -462,7 +462,7 @@\n \/\/Draw the scene\n \/\/ NOTE: It is not safe to call osgUtil::SceneView::update() here; it\n \/\/ should only be called by a single thread. The equivalent of calling\n- \/\/ osgUtil::SceneView::update() is in vrj::OsgApp::update().\n+ \/\/ osgUtil::SceneView::update() is in vrj::osg::App::update().\n sv->cull();\n sv->draw();\n \n"} {"commit":"64970772c7de733eb838e411c582042a9cfc93f7","subject":"optimization, and moving peak detection into own function","message":"optimization, and moving peak detection into own function\n\n- save 1K of RAM by optimizing out\n fftBin[].\n- moved several copies of the peak reset code into a single function\n- moved peak detection out of getSample().\n - call peak detection function as last step of FFTcode. More optimal, and we can be sure that fresh FFT result are available.\n\nPeak detection\/reset are now called from both tasks, so I had to move some peak-related vars out of AudioReactive class and make them global (static).\n","repos":"Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- usermods\/audioreactive\/audio_reactive.h\n+++ usermods\/audioreactive\/audio_reactive.h\n@@ -90,6 +90,15 @@\n static float multAgc = 1.0f; \/\/ sample * multAgc = sampleAgc. Our AGC multiplier\n static float sampleAvg = 0.0f; \/\/ Smoothed Average sample - sampleAvg < 1 means \"quiet\" (simple noise gate)\n \n+\/\/ peak detection\n+static bool samplePeak = false; \/\/ Boolean flag for peak - used in effects. Responding routine may reset this flag. Auto-reset after strip.getMinShowDelay()\n+static uint8_t maxVol = 10; \/\/ Reasonable value for constant volume for 'peak detector', as it won't always trigger (deprecated)\n+static uint8_t binNum = 8; \/\/ Used to select the bin for FFT based beat detection (deprecated)\n+static bool udpSamplePeak = false; \/\/ Boolean flag for peak. Set at the same tiem as samplePeak, but reset by transmitAudioData\n+static unsigned long timeOfPeak = 0; \/\/ time of last sample peak detection.\n+static void detectSamplePeak(void); \/\/ peak detection function (needs scaled FFT reasults in vReal[])\n+static void autoResetPeak(void); \/\/ peak auto-reset function\n+\n \n \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n \/\/ Begin FFT Code \/\/\n@@ -105,7 +114,7 @@\n \/\/ FFT Output variables shared with animations\n #define NUM_GEQ_CHANNELS 16 \/\/ number of frequency channels. Don't change !!\n static float FFT_MajorPeak = 1.0f; \/\/ FFT: strongest (peak) frequency\n-static float FFT_Magnitude = 0.0f; \/\/ FFT: magintude peak frequency\n+static float FFT_Magnitude = 0.0f; \/\/ FFT: volume (magnitude) of peak frequency\n static uint8_t fftResult[NUM_GEQ_CHANNELS]= {0};\/\/ Our calculated freq. channel result table to be used by effects\n \n \/\/ FFT Constants\n@@ -115,7 +124,6 @@\n \/\/ These are the input and output vectors. Input vectors receive computed results from FFT.\n static float vReal[samplesFFT] = {0.0f}; \/\/ FFT sample inputs \/ freq output - these are our raw result bins\n static float vImag[samplesFFT] = {0.0f}; \/\/ imaginary parts\n-static float fftBin[samplesFFT_2] = {0.0f};\n \n \/\/ the following are observed values, supported by a bit of \"educated guessing\"\n \/\/#define FFT_DOWNSCALE 0.65f \/\/ 20kHz - downscaling factor for FFT results - \"Flat-Top\" window @20Khz, old freq channels \n@@ -159,7 +167,7 @@\n static float fftAddAvg(int from, int to) {\n float result = 0.0f;\n for (int i = from; i <= to; i++) {\n- result += fftBin[i];\n+ result += vReal[i];\n }\n return result \/ float(to - from + 1);\n }\n@@ -235,9 +243,9 @@\n #endif\n FFT_MajorPeak = constrain(FFT_MajorPeak, 1.0f, 11025.0f); \/\/ restrict value to range expected by effects\n \n- for (int i = 0; i < samplesFFT_2; i++) { \/\/ Values for bins 0 and 1 are WAY too large. Might as well start at 3.\n+ for (int i = 0; i < samplesFFT; i++) {\n float t = fabsf(vReal[i]); \/\/ just to be sure - values in fft bins should be positive any way\n- fftBin[i] = t \/ 16.0f; \/\/ Reduce magnitude. Want end result to be linear and ~4096 max.\n+ vReal[i] = t \/ 16.0f; \/\/ Reduce magnitude. Want end result to be scaled linear and ~4096 max.\n } \/\/ for()\n \n \/\/ mapping of FFT result bins to frequency channels\n@@ -375,9 +383,38 @@\n unsigned long fftTimeInMillis = ((esp_timer_get_time() - start) +500ULL) \/ 1000ULL; \/\/ \"+500\" to ensure proper rounding\n fftTime = (fftTimeInMillis*3 + fftTime*7)\/10; \/\/ smooth\n }\n-#endif \n+#endif\n+ \/\/ run peak detection\n+ autoResetPeak();\n+ detectSamplePeak();\n+\n } \/\/ for(;;)ever\n } \/\/ FFTcode() task end\n+\n+\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\/\/ Peak detection \/\/\n+\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\n+\n+\/\/ peak detection is called from FFT task when vReal[] contains valid FFT results\n+static void detectSamplePeak(void) {\n+ \/\/ Poor man's beat detection by seeing if sample > Average + some value.\n+ if ((sampleAvg > 1) && (maxVol > 0) && (binNum > 1) && (vReal[binNum] > maxVol) && ((millis() - timeOfPeak) > 100)) {\n+ \/\/ This goes through ALL of the 255 bins - but ignores stupid settings\n+ \/\/ Then we got a peak, else we don't. The peak has to time out on its own in order to support UDP sound sync.\n+ samplePeak = true;\n+ timeOfPeak = millis();\n+ udpSamplePeak = true;\n+ }\n+}\n+\n+static void autoResetPeak(void) {\n+ uint16_t MinShowDelay = MAX(50, strip.getMinShowDelay()); \/\/ Fixes private class variable compiler error. Unsure if this is the correct way of fixing the root problem. -THATDONFC\n+ if (millis() - timeOfPeak > MinShowDelay) { \/\/ Auto-reset of samplePeak after a complete frame has passed.\n+ samplePeak = false;\n+ if (audioSyncEnabled == 0) udpSamplePeak = false; \/\/ this is normally reset by transmitAudioData\n+ }\n+}\n \n \n \/\/class name. Use something descriptive and leave the \": public Usermod\" part :)\n@@ -479,12 +516,6 @@\n float volumeSmth = 0.0f; \/\/ either sampleAvg or sampleAgc depending on soundAgc; smoothed sample\n int16_t volumeRaw = 0; \/\/ either sampleRaw or rawSampleAgc depending on soundAgc\n float my_magnitude =0.0f; \/\/ FFT_Magnitude, scaled by multAgc\n- \/\/ peak detection \n- uint8_t maxVol = 10; \/\/ Reasonable value for constant volume for 'peak detector', as it won't always trigger (deprecated)\n- uint8_t binNum = 8; \/\/ Used to select the bin for FFT based beat detection (deprecated)\n- bool samplePeak = false; \/\/ Boolean flag for peak. Responding routine may reset this flag. Auto-reset after strip.getMinShowDelay()\n- bool udpSamplePeak = false; \/\/ Boolean flag for peak. Set at the same tiem as samplePeak, but reset by transmitAudioData\n- unsigned long timeOfPeak = 0; \/\/ time of last sample peak detection\n \n \/\/ used to feed \"Info\" Page\n unsigned long last_UDPTime = 0; \/\/ time of last valid UDP sound sync datapacket\n@@ -728,24 +759,6 @@\n if (sampleMax < 0.5f) sampleMax = 0.0f;\n \n sampleAvg = ((sampleAvg * 15.0f) + sampleAdj) \/ 16.0f; \/\/ Smooth it out over the last 16 samples.\n-\n- \/\/ Fixes private class variable compiler error. Unsure if this is the correct way of fixing the root problem. -THATDONFC\n- uint16_t MinShowDelay = strip.getMinShowDelay();\n-\n- if (millis() - timeOfPeak > MinShowDelay) { \/\/ Auto-reset of samplePeak after a complete frame has passed.\n- samplePeak = false;\n- udpSamplePeak = false;\n- }\n- \/\/if (userVar1 == 0) samplePeak = 0;\n-\n- \/\/ Poor man's beat detection by seeing if sample > Average + some value.\n- if ((maxVol > 0) && (binNum > 1) && (fftBin[binNum] > maxVol) && (millis() > (timeOfPeak + 100))) {\n- \/\/ This goes through ALL of the 255 bins - but ignores stupid settings\n- \/\/ Then we got a peak, else we don't. The peak has to time out on its own in order to support UDP sound sync.\n- samplePeak = true;\n- timeOfPeak = millis();\n- udpSamplePeak = true;\n- }\n } \/\/ getSample()\n \n \n@@ -838,13 +851,7 @@\n sampleAgc = volumeSmth;\n multAgc = 1.0f;\n \n- \/\/ auto-reset sample peak. Need to do it here, because getSample() is not running\n- uint16_t MinShowDelay = strip.getMinShowDelay();\n- if (millis() - timeOfPeak > MinShowDelay) { \/\/ Auto-reset of samplePeak after a complete frame has passed.\n- samplePeak = false;\n- udpSamplePeak = false;\n- }\n- \/\/if (userVar1 == 0) samplePeak = 0;\n+ autoResetPeak();\n \/\/ Only change samplePeak IF it's currently false.\n \/\/ If it's true already, then the animation still needs to respond.\n if (!samplePeak) {\n@@ -1066,9 +1073,11 @@\n if (soundAgc) my_magnitude *= multAgc;\n if (volumeSmth < 1 ) my_magnitude = 0.001f; \/\/ noise gate closed - mute\n \n- limitSampleDynamics(); \/\/ optional - makes volumeSmth very smooth and fluent\n- }\n-\n+ limitSampleDynamics();\n+ } \/\/ if (!disableSoundProcessing)\n+\n+ autoResetPeak(); \/\/ auto-reset sample peak after strip minShowDelay\n+ if (!udpSyncConnected) udpSamplePeak = false; \/\/ reset UDP samplePeak while UDP is unconnected\n \n \/\/ UDP Microphone Sync - receive mode\n if ((audioSyncEnabled & 0x02) && udpSyncConnected) {\n@@ -1091,7 +1100,7 @@\n }\n #endif\n \n- \/\/ peak sample from last 5 seconds\n+ \/\/ Info Page: keep max sample from last 5 seconds\n if ((millis() - sampleMaxTimer) > CYCLE_SAMPLEMAX) {\n sampleMaxTimer = millis();\n maxSample5sec = (0.15 * maxSample5sec) + 0.85 *((soundAgc) ? sampleAgc : sampleAvg); \/\/ reset, and start with some smoothing\n@@ -1099,6 +1108,7 @@\n } else {\n if ((sampleAvg >= 1)) maxSample5sec = fmaxf(maxSample5sec, (soundAgc) ? rawSampleAgc : sampleRaw); \/\/ follow maximum volume\n }\n+\n \/\/UDP Microphone Sync - transmit mode\n if ((audioSyncEnabled & 0x01) && (millis() - lastTime > 20)) {\n \/\/ Only run the transmit code IF we're in Transmit mode\n@@ -1138,6 +1148,7 @@\n memset(fftResult, 0, sizeof(fftResult)); \n for(int i=(init?0:1); i<NUM_GEQ_CHANNELS; i+=2) fftResult[i] = 16; \/\/ make a tiny pattern\n inputLevel = 128; \/\/ resset level slider to default\n+ autoResetPeak();\n \n if (init && FFT_Task) {\n vTaskSuspend(FFT_Task); \/\/ update is about to begin, disable task to prevent crash\n"} {"commit":"40d91feb85518b30ce6f916e1ff31a4b8c5f2704","subject":"Check that out_data is not NULL and has been allocated in cca sha.","message":"Check that out_data is not NULL and has been allocated in cca sha.\n\nSigned-off-by: Joy Latten <d52cec510126fd47fd8d2fded238791e9e5bd0bf@linux.vnet.ibm.com>\n","repos":"fingunter\/OpenCryptoki,fingunter\/OpenCryptoki,fingunter\/OpenCryptoki,fingunter\/OpenCryptoki","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- usr\/lib\/pkcs11\/cca_stdll\/cca_specific.c\n+++ usr\/lib\/pkcs11\/cca_stdll\/cca_specific.c\n@@ -1675,7 +1675,7 @@\n \tif (!ctx)\n \t\treturn CKR_OPERATION_NOT_INITIALIZED;\n \n-\tif (!in_data || *out_data)\n+\tif (!in_data || !out_data)\n \t\treturn CKR_ARGUMENTS_BAD;\n \n \tcca_ctx = (struct cca_sha_ctx *)ctx->context;\n"} {"commit":"a35b321db45cd8cbdd9ddddb28f450bc0725e4e9","subject":"ERR: need ITKCommon_EXPORT for dlls.","message":"ERR: need ITKCommon_EXPORT for dlls.\n","repos":"cpatrick\/ITK-RemoteIO,fbudin69500\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,vfonov\/ITK,eile\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,spinicist\/ITK,LucHermitte\/ITK,ajjl\/ITK,msmolens\/ITK,itkvideo\/ITK,eile\/ITK,BRAINSia\/ITK,atsnyder\/ITK,fedral\/ITK,fbudin69500\/ITK,itkvideo\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,biotrump\/ITK,malaterre\/ITK,itkvideo\/ITK,spinicist\/ITK,jcfr\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,Kitware\/ITK,stnava\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,stnava\/ITK,heimdali\/ITK,LucHermitte\/ITK,Kitware\/ITK,biotrump\/ITK,LucHermitte\/ITK,malaterre\/ITK,hjmjohnson\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,jmerkow\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,jmerkow\/ITK,paulnovo\/ITK,vfonov\/ITK,hinerm\/ITK,thewtex\/ITK,jmerkow\/ITK,GEHC-Surgery\/ITK,hinerm\/ITK,CapeDrew\/DITK,malaterre\/ITK,spinicist\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,BlueBrain\/ITK,jcfr\/ITK,ajjl\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,blowekamp\/ITK,blowekamp\/ITK,fedral\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,daviddoria\/itkHoughTransform,malaterre\/ITK,CapeDrew\/DITK,itkvideo\/ITK,wkjeong\/ITK,blowekamp\/ITK,eile\/ITK,atsnyder\/ITK,itkvideo\/ITK,richardbeare\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,rhgong\/itk-with-dom,stnava\/ITK,hinerm\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,hendradarwin\/ITK,eile\/ITK,GEHC-Surgery\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,atsnyder\/ITK,jmerkow\/ITK,jmerkow\/ITK,BRAINSia\/ITK,CapeDrew\/DITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,fbudin69500\/ITK,atsnyder\/ITK,paulnovo\/ITK,ajjl\/ITK,BlueBrain\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,atsnyder\/ITK,eile\/ITK,spinicist\/ITK,CapeDrew\/DITK,fedral\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,eile\/ITK,itkvideo\/ITK,LucHermitte\/ITK,eile\/ITK,wkjeong\/ITK,heimdali\/ITK,fedral\/ITK,heimdali\/ITK,rhgong\/itk-with-dom,thewtex\/ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,hjmjohnson\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,eile\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,malaterre\/ITK,jcfr\/ITK,paulnovo\/ITK,BlueBrain\/ITK,spinicist\/ITK,itkvideo\/ITK,ajjl\/ITK,fuentesdt\/InsightToolkit-dev,wkjeong\/ITK,vfonov\/ITK,ajjl\/ITK,jmerkow\/ITK,richardbeare\/ITK,paulnovo\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,hinerm\/ITK,stnava\/ITK,biotrump\/ITK,CapeDrew\/DCMTK-ITK,jcfr\/ITK,hjmjohnson\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,hinerm\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,atsnyder\/ITK,richardbeare\/ITK,BRAINSia\/ITK,fedral\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,paulnovo\/ITK,CapeDrew\/DITK,spinicist\/ITK,PlutoniumHeart\/ITK,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,vfonov\/ITK,stnava\/ITK,PlutoniumHeart\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,BlueBrain\/ITK,ajjl\/ITK,itkvideo\/ITK,biotrump\/ITK,blowekamp\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,LucasGandel\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,LucHermitte\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,Kitware\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,hendradarwin\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,CapeDrew\/DCMTK-ITK,jcfr\/ITK,jcfr\/ITK,paulnovo\/ITK,msmolens\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,wkjeong\/ITK,richardbeare\/ITK,Kitware\/ITK,fedral\/ITK,thewtex\/ITK,thewtex\/ITK,InsightSoftwareConsortium\/ITK,fbudin69500\/ITK,richardbeare\/ITK,hendradarwin\/ITK,LucHermitte\/ITK,ajjl\/ITK,hinerm\/ITK,zachary-williamson\/ITK,fbudin69500\/ITK,blowekamp\/ITK,zachary-williamson\/ITK,paulnovo\/ITK,BRAINSia\/ITK,heimdali\/ITK,heimdali\/ITK,hjmjohnson\/ITK,msmolens\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,hjmjohnson\/ITK,hjmjohnson\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DITK,stnava\/ITK,BRAINSia\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,spinicist\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,msmolens\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DITK,heimdali\/ITK,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,hjmjohnson\/ITK,itkvideo\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,fbudin69500\/ITK,heimdali\/ITK,biotrump\/ITK,msmolens\/ITK,LucasGandel\/ITK,rhgong\/itk-with-dom,BlueBrain\/ITK,CapeDrew\/DITK,vfonov\/ITK,Kitware\/ITK,atsnyder\/ITK,zachary-williamson\/ITK,Kitware\/ITK,BRAINSia\/ITK,hendradarwin\/ITK,wkjeong\/ITK,richardbeare\/ITK,biotrump\/ITK,vfonov\/ITK,GEHC-Surgery\/ITK,LucasGandel\/ITK,hinerm\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkBarrier.h\n+++ Code\/Common\/itkBarrier.h\n@@ -31,7 +31,7 @@\n *\n * \n *\/\n-class ITK_EXPORT Barrier : public LightObject\n+class ITKCommon_EXPORT Barrier : public LightObject\n {\n public:\n \/** Standard class typedefs. *\/\n"} {"commit":"6834d86a4ddd8d688be7531b774508c07e40d9e6","subject":"Nightly version","message":"Nightly version\n","repos":"daviddoria\/itkHoughTransform,cpatrick\/ITK-RemoteIO,malaterre\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,hendradarwin\/ITK,fbudin69500\/ITK,hinerm\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,biotrump\/ITK,rhgong\/itk-with-dom,ajjl\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,zachary-williamson\/ITK,jmerkow\/ITK,itkvideo\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,heimdali\/ITK,stnava\/ITK,LucasGandel\/ITK,jcfr\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,hinerm\/ITK,msmolens\/ITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,biotrump\/ITK,jmerkow\/ITK,LucasGandel\/ITK,itkvideo\/ITK,biotrump\/ITK,BlueBrain\/ITK,vfonov\/ITK,eile\/ITK,jmerkow\/ITK,richardbeare\/ITK,ajjl\/ITK,fedral\/ITK,spinicist\/ITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,thewtex\/ITK,biotrump\/ITK,hinerm\/ITK,Kitware\/ITK,blowekamp\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,spinicist\/ITK,jcfr\/ITK,wkjeong\/ITK,blowekamp\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,paulnovo\/ITK,richardbeare\/ITK,BRAINSia\/ITK,richardbeare\/ITK,CapeDrew\/DITK,wkjeong\/ITK,fedral\/ITK,jmerkow\/ITK,LucHermitte\/ITK,ajjl\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,CapeDrew\/DITK,spinicist\/ITK,cpatrick\/ITK-RemoteIO,spinicist\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,jcfr\/ITK,blowekamp\/ITK,stnava\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,hinerm\/ITK,spinicist\/ITK,zachary-williamson\/ITK,Kitware\/ITK,wkjeong\/ITK,CapeDrew\/DITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,stnava\/ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,ajjl\/ITK,vfonov\/ITK,hinerm\/ITK,hendradarwin\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,fedral\/ITK,BRAINSia\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,BRAINSia\/ITK,hinerm\/ITK,Kitware\/ITK,msmolens\/ITK,atsnyder\/ITK,eile\/ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,rhgong\/itk-with-dom,stnava\/ITK,ajjl\/ITK,fbudin69500\/ITK,richardbeare\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,msmolens\/ITK,PlutoniumHeart\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,stnava\/ITK,LucHermitte\/ITK,wkjeong\/ITK,CapeDrew\/DITK,vfonov\/ITK,Kitware\/ITK,hinerm\/ITK,fedral\/ITK,LucHermitte\/ITK,daviddoria\/itkHoughTransform,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,vfonov\/ITK,blowekamp\/ITK,fbudin69500\/ITK,malaterre\/ITK,hjmjohnson\/ITK,eile\/ITK,eile\/ITK,hendradarwin\/ITK,jmerkow\/ITK,richardbeare\/ITK,itkvideo\/ITK,cpatrick\/ITK-RemoteIO,biotrump\/ITK,blowekamp\/ITK,paulnovo\/ITK,hendradarwin\/ITK,jmerkow\/ITK,thewtex\/ITK,thewtex\/ITK,hendradarwin\/ITK,hinerm\/ITK,eile\/ITK,GEHC-Surgery\/ITK,stnava\/ITK,BlueBrain\/ITK,blowekamp\/ITK,itkvideo\/ITK,fedral\/ITK,thewtex\/ITK,hjmjohnson\/ITK,malaterre\/ITK,richardbeare\/ITK,BlueBrain\/ITK,paulnovo\/ITK,jmerkow\/ITK,fbudin69500\/ITK,itkvideo\/ITK,BlueBrain\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,jcfr\/ITK,msmolens\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,atsnyder\/ITK,wkjeong\/ITK,eile\/ITK,GEHC-Surgery\/ITK,LucHermitte\/ITK,Kitware\/ITK,CapeDrew\/DCMTK-ITK,heimdali\/ITK,hjmjohnson\/ITK,heimdali\/ITK,atsnyder\/ITK,Kitware\/ITK,biotrump\/ITK,atsnyder\/ITK,rhgong\/itk-with-dom,vfonov\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,eile\/ITK,LucHermitte\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,biotrump\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,ajjl\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,spinicist\/ITK,spinicist\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,richardbeare\/ITK,msmolens\/ITK,wkjeong\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,stnava\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,fedral\/ITK,hjmjohnson\/ITK,eile\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,stnava\/ITK,CapeDrew\/DITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,jcfr\/ITK,rhgong\/itk-with-dom,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,spinicist\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,heimdali\/ITK,ajjl\/ITK,atsnyder\/ITK,ajjl\/ITK,thewtex\/ITK,BRAINSia\/ITK,itkvideo\/ITK,stnava\/ITK,heimdali\/ITK,biotrump\/ITK,zachary-williamson\/ITK,paulnovo\/ITK,msmolens\/ITK,zachary-williamson\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,CapeDrew\/DITK,blowekamp\/ITK,wkjeong\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,jcfr\/ITK,msmolens\/ITK,daviddoria\/itkHoughTransform,hjmjohnson\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,thewtex\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,GEHC-Surgery\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,hinerm\/ITK,fedral\/ITK,thewtex\/ITK,heimdali\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -48,7 +48,7 @@\n #define ITK_MAJOR_VERSION 0\n #define ITK_MINOR_VERSION 0\n #define ITK_BUILD_VERSION 2\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.422 $, $Date: 2001-11-26 04:53:29 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.423 $, $Date: 2001-11-28 04:53:35 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"9c66a27979b30966f97c00a3315c9ae929eed48a","subject":"Nightly version","message":"Nightly version\n","repos":"itkvideo\/ITK,fedral\/ITK,paulnovo\/ITK,malaterre\/ITK,spinicist\/ITK,Kitware\/ITK,hendradarwin\/ITK,jmerkow\/ITK,malaterre\/ITK,atsnyder\/ITK,richardbeare\/ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,atsnyder\/ITK,atsnyder\/ITK,LucHermitte\/ITK,heimdali\/ITK,BlueBrain\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,thewtex\/ITK,stnava\/ITK,BRAINSia\/ITK,GEHC-Surgery\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,BRAINSia\/ITK,malaterre\/ITK,spinicist\/ITK,hjmjohnson\/ITK,wkjeong\/ITK,fedral\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,msmolens\/ITK,biotrump\/ITK,CapeDrew\/DITK,LucHermitte\/ITK,jmerkow\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,hjmjohnson\/ITK,stnava\/ITK,jmerkow\/ITK,wkjeong\/ITK,atsnyder\/ITK,jcfr\/ITK,hinerm\/ITK,LucHermitte\/ITK,jmerkow\/ITK,CapeDrew\/DITK,malaterre\/ITK,biotrump\/ITK,blowekamp\/ITK,CapeDrew\/DITK,msmolens\/ITK,fedral\/ITK,ajjl\/ITK,stnava\/ITK,rhgong\/itk-with-dom,malaterre\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,eile\/ITK,GEHC-Surgery\/ITK,jcfr\/ITK,atsnyder\/ITK,heimdali\/ITK,rhgong\/itk-with-dom,heimdali\/ITK,vfonov\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,stnava\/ITK,itkvideo\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,jmerkow\/ITK,hendradarwin\/ITK,hinerm\/ITK,eile\/ITK,GEHC-Surgery\/ITK,msmolens\/ITK,cpatrick\/ITK-RemoteIO,hinerm\/ITK,jmerkow\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,rhgong\/itk-with-dom,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,eile\/ITK,eile\/ITK,heimdali\/ITK,Kitware\/ITK,heimdali\/ITK,CapeDrew\/DITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,jcfr\/ITK,heimdali\/ITK,paulnovo\/ITK,vfonov\/ITK,spinicist\/ITK,hendradarwin\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,thewtex\/ITK,fbudin69500\/ITK,LucasGandel\/ITK,vfonov\/ITK,spinicist\/ITK,itkvideo\/ITK,blowekamp\/ITK,eile\/ITK,vfonov\/ITK,spinicist\/ITK,jcfr\/ITK,blowekamp\/ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,hjmjohnson\/ITK,fbudin69500\/ITK,biotrump\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,eile\/ITK,paulnovo\/ITK,eile\/ITK,zachary-williamson\/ITK,hinerm\/ITK,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,itkvideo\/ITK,ajjl\/ITK,Kitware\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,fedral\/ITK,msmolens\/ITK,biotrump\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,zachary-williamson\/ITK,msmolens\/ITK,malaterre\/ITK,Kitware\/ITK,LucHermitte\/ITK,daviddoria\/itkHoughTransform,itkvideo\/ITK,fbudin69500\/ITK,blowekamp\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,BlueBrain\/ITK,malaterre\/ITK,hjmjohnson\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,richardbeare\/ITK,vfonov\/ITK,BRAINSia\/ITK,stnava\/ITK,paulnovo\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,wkjeong\/ITK,hendradarwin\/ITK,vfonov\/ITK,ajjl\/ITK,jmerkow\/ITK,thewtex\/ITK,paulnovo\/ITK,malaterre\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,vfonov\/ITK,BRAINSia\/ITK,richardbeare\/ITK,hjmjohnson\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,CapeDrew\/DITK,fedral\/ITK,rhgong\/itk-with-dom,heimdali\/ITK,CapeDrew\/DITK,msmolens\/ITK,ajjl\/ITK,vfonov\/ITK,biotrump\/ITK,thewtex\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,paulnovo\/ITK,thewtex\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,atsnyder\/ITK,blowekamp\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,hinerm\/ITK,LucasGandel\/ITK,zachary-williamson\/ITK,spinicist\/ITK,biotrump\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,fbudin69500\/ITK,fedral\/ITK,spinicist\/ITK,itkvideo\/ITK,Kitware\/ITK,jcfr\/ITK,stnava\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,hjmjohnson\/ITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,stnava\/ITK,wkjeong\/ITK,BRAINSia\/ITK,itkvideo\/ITK,paulnovo\/ITK,hinerm\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,daviddoria\/itkHoughTransform,biotrump\/ITK,Kitware\/ITK,hendradarwin\/ITK,thewtex\/ITK,ajjl\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,Kitware\/ITK,jmerkow\/ITK,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,jcfr\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,ajjl\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,ajjl\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,GEHC-Surgery\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,fbudin69500\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,richardbeare\/ITK,msmolens\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -27,7 +27,7 @@\n #define ITK_MAJOR_VERSION 0\n #define ITK_MINOR_VERSION 0\n #define ITK_BUILD_VERSION 2\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.765 $, $Date: 2002-11-28 06:10:10 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.766 $, $Date: 2002-11-29 06:10:08 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"c482b8d6318bc1b88129d842b4f89404f80e9f7a","subject":"","message":"\nuse au_get_gain()\/au_set_gain() and the new au_get_mute()\/au_set_mute()\nfunctions instead of doing things the hard way.\n\nalso add some bits to au_set_gain() so it sets a gain that is within\nlimits. its possible to pass in an out-of-range value through\naudioctl(1) as well.\n\nok ratchov\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/audio.c\n+++ dev\/audio.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: audio.c,v 1.76 2007\/09\/17 13:33:29 jakemsr Exp $\t*\/\n+\/*\t$OpenBSD: audio.c,v 1.77 2007\/09\/17 13:35:46 jakemsr Exp $\t*\/\n \/*\t$NetBSD: audio.c,v 1.119 1999\/11\/09 16:50:47 augustss Exp $\t*\/\n \n \/*\n@@ -214,7 +214,6 @@\n \n #if NWSKBD > 0\n \/* Mixer manipulation using keyboard *\/\n-int wskbd_get_mixerdev(struct audio_softc *, int, int *);\n int wskbd_set_mixervolume(long);\n #endif\n \n@@ -2314,6 +2313,12 @@\n \tint l, r;\n \tu_int mask;\n \tint nset;\n+\n+\t\/* XXX silently adjust to within limits or return EINVAL ? *\/\n+\tif (gain > AUDIO_MAX_GAIN)\n+\t\tgain = AUDIO_MAX_GAIN;\n+\telse if (gain < AUDIO_MIN_GAIN)\n+\t\tgain = AUDIO_MIN_GAIN;\n \n \tif (balance == AUDIO_MID_BALANCE) {\n \t\tl = r = gain;\n@@ -3097,106 +3102,46 @@\n \n #if NAUDIO > 0 && NWSKBD > 0\n int\n-wskbd_get_mixerdev(struct audio_softc *sc, int dir, int *index)\n-{\n-\tmixer_devinfo_t mi;\n-\tint mixer_class;\n-\tint error;\n-\n-\t\/* looking for ``outputs'' *\/\n-\tfor (mi.index = 0; ; mi.index++) {\n-\t\terror = sc->hw_if->query_devinfo(sc->hw_hdl, &mi);\n-\t\tif (error != 0)\n-\t\t\treturn (-1);\n-\n-\t\tif (mi.type == AUDIO_MIXER_CLASS &&\n-\t\t strcmp(mi.label.name, AudioCoutputs) == 0) {\n-\t\t\tmixer_class = mi.mixer_class;\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n-\t\/*\n-\t * looking for ``outputs.master''\n-\t * start mi.index from 0 because ''outputs.master'' can precede\n-\t * ''outputs''.\n-\t *\/\n-\tfor (mi.index = 0; ; mi.index++) {\n-\t\terror = sc->hw_if->query_devinfo(sc->hw_hdl, &mi);\n-\t\tif (error != 0)\n-\t\t\treturn (-1);\n-\n-\t\tif (mi.type == AUDIO_MIXER_VALUE &&\n-\t\t mi.mixer_class == mixer_class &&\n-\t\t strcmp(mi.label.name, AudioNmaster) == 0) {\n-\t\t\tif (dir == 0) {\n-\t\t\t\t\/* looking for ``outputs.master.mute'' *\/\n-\t\t\t\tif (mi.next < 0)\n-\t\t\t\t\treturn (-1);\n-\n-\t\t\t\tmi.index = mi.next;\n-\t\t\t\terror = sc->hw_if->query_devinfo(sc->hw_hdl,\n-\t\t\t\t &mi);\n-\t\t\t\tif (error != 0)\n-\t\t\t\t\treturn (-1);\n-\n-\t\t\t\tif (mi.type != AUDIO_MIXER_ENUM ||\n-\t\t\t\t strcmp(mi.label.name, AudioNmute) != 0)\n-\t\t\t\t\treturn (-1);\n-\t\t\t}\n-\n-\t\t\t*index = mi.index;\n-\t\t\treturn (0);\n-\t\t}\n-\t}\n-\n-\treturn (-1);\n-}\n-\n-int\n wskbd_set_mixervolume(long dir)\n {\n \tstruct audio_softc *sc;\n \tmixer_devinfo_t mi;\n-\tmixer_ctrl_t ct;\n-\tint l, r;\n \tint error;\n+\tu_int gain;\n+\tu_char balance, mute;\n \n \tif (audio_cd.cd_ndevs == 0 || (sc = audio_cd.cd_devs[0]) == NULL) {\n \t\tDPRINTF((\"wskbd_set_mixervolume: audio_cd\\n\"));\n \t\treturn (ENXIO);\n \t}\n \n-\terror = wskbd_get_mixerdev(sc, dir, &ct.dev);\n-\tif (error == -1) {\n-\t\tDPRINTF((\"wskbd_set_mixervolume: wskbd_get_mixerdev\\n\"));\n+\tif (sc->sc_outports.master == -1) {\n+\t\tDPRINTF((\"wskbd_set_mixervolume: master == -1\\n\"));\n \t\treturn (ENXIO);\n \t}\n \n \tif (dir == 0) {\n-\t\t\/*\n-\t\t * Mute.\n-\t\t * Use mixer_ioctl() for writing. It does many things for us.\n-\t\t *\/\n-\t\tct.type = AUDIO_MIXER_ENUM;\n-\t\terror = sc->hw_if->get_port(sc->hw_hdl, &ct);\n+\t\t\/* Mute *\/\n+\n+\t\terror = au_get_mute(sc, &sc->sc_outports, &mute);\n \t\tif (error != 0) {\n \t\t\tDPRINTF((\"wskbd_set_mixervolume:\"\n-\t\t\t \" get_port: %d\\n\", error));\n+\t\t\t \" au_get_mute: %d\\n\", error));\n \t\t\treturn (error);\n \t\t}\n \n-\t\tct.un.ord = !ct.un.ord;\t\/* toggle *\/\n-\n-\t\terror = mixer_ioctl(MIXER_DEVICE,\n-\t\t AUDIO_MIXER_WRITE, (caddr_t)&ct, FWRITE, curproc);\n+\t\tmute = !mute;\n+\n+\t\terror = au_set_mute(sc, &sc->sc_outports, mute);\n \t\tif (error != 0) {\n \t\t\tDPRINTF((\"wskbd_set_mixervolume:\"\n-\t\t\t \" mixer_ioctl: %d\\n\", error));\n+\t\t\t \" au_set_mute: %d\\n\", error));\n \t\t\treturn (error);\n \t\t}\n \t} else {\n-\t\tmi.index = ct.dev;\n+\t\t\/* Raise or lower volume *\/\n+\n+\t\tmi.index = sc->sc_outports.master;\n \t\terror = sc->hw_if->query_devinfo(sc->hw_hdl, &mi);\n \t\tif (error != 0) {\n \t\t\tDPRINTF((\"wskbd_set_mixervolume:\"\n@@ -3204,50 +3149,19 @@\n \t\t\treturn (error);\n \t\t}\n \n-\t\tct.type = AUDIO_MIXER_VALUE;\n-\n-\t\terror = au_get_lr_value(sc, &ct, &l, &r);\n+\t\tau_get_gain(sc, &sc->sc_outports, &gain, &balance);\n+\n+\t\tif (dir > 0)\n+\t\t\tgain += mi.un.v.delta;\n+\t\telse\n+\t\t\tgain -= mi.un.v.delta;\n+\n+\t\terror = au_set_gain(sc, &sc->sc_outports, gain, balance);\n \t\tif (error != 0) {\n \t\t\tDPRINTF((\"wskbd_set_mixervolume:\"\n-\t\t\t \" au_get_lr_value: %d\\n\", error));\n+\t\t\t \" au_set_gain: %d\\n\", error));\n \t\t\treturn (error);\n \t\t}\n-\n-\t\tif (dir > 0) {\n-\t\t\t\/*\n-\t\t\t * Raise volume\n-\t\t\t *\/\n-\t\t\tif (l > AUDIO_MAX_GAIN - mi.un.v.delta)\n-\t\t\t\tl = AUDIO_MAX_GAIN;\n-\t\t\telse\n-\t\t\t\tl += mi.un.v.delta;\n-\n-\t\t\tif (r > AUDIO_MAX_GAIN - mi.un.v.delta)\n-\t\t\t\tr = AUDIO_MAX_GAIN;\n-\t\t\telse\n-\t\t\t\tr += mi.un.v.delta;\n-\n-\t\t} else {\n-\t\t\t\/*\n-\t\t\t * Lower volume\n-\t\t\t *\/\n-\t\t\tif (l < AUDIO_MIN_GAIN + mi.un.v.delta)\n-\t\t\t\tl = AUDIO_MIN_GAIN;\n-\t\t\telse\n-\t\t\t\tl -= mi.un.v.delta;\n-\n-\t\t\tif (r < AUDIO_MIN_GAIN + mi.un.v.delta)\n-\t\t\t\tr = AUDIO_MIN_GAIN;\n-\t\t\telse\n-\t\t\t\tr -= mi.un.v.delta;\n-\t\t}\n-\n-\t\terror = au_set_lr_value(sc, &ct, l, r);\n-\t\tif (error != 0) {\n-\t\t\tDPRINTF((\"wskbd_set_mixervolume:\"\n-\t\t\t \" au_set_lr_value: %d\\n\", error));\n-\t\t\treturn (error);\n-\t\t}\n \t}\n \n \treturn (0);\n"} {"commit":"9cec728eaf748b635b65e85059beebf618f886de","subject":"Nightly version","message":"Nightly version\n","repos":"biotrump\/ITK,LucHermitte\/ITK,vfonov\/ITK,jmerkow\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,paulnovo\/ITK,CapeDrew\/DITK,thewtex\/ITK,jmerkow\/ITK,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,jcfr\/ITK,heimdali\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,malaterre\/ITK,biotrump\/ITK,atsnyder\/ITK,jcfr\/ITK,hjmjohnson\/ITK,PlutoniumHeart\/ITK,Kitware\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,jcfr\/ITK,paulnovo\/ITK,msmolens\/ITK,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,malaterre\/ITK,wkjeong\/ITK,spinicist\/ITK,atsnyder\/ITK,spinicist\/ITK,wkjeong\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,itkvideo\/ITK,GEHC-Surgery\/ITK,itkvideo\/ITK,hinerm\/ITK,fbudin69500\/ITK,paulnovo\/ITK,msmolens\/ITK,itkvideo\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,Kitware\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,LucHermitte\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,hinerm\/ITK,paulnovo\/ITK,blowekamp\/ITK,vfonov\/ITK,fbudin69500\/ITK,hinerm\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,BlueBrain\/ITK,CapeDrew\/DCMTK-ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,spinicist\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,thewtex\/ITK,ajjl\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,thewtex\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,jcfr\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,paulnovo\/ITK,fbudin69500\/ITK,richardbeare\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,malaterre\/ITK,jcfr\/ITK,BlueBrain\/ITK,ajjl\/ITK,stnava\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,eile\/ITK,vfonov\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,CapeDrew\/DITK,biotrump\/ITK,malaterre\/ITK,malaterre\/ITK,BlueBrain\/ITK,richardbeare\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,GEHC-Surgery\/ITK,stnava\/ITK,jcfr\/ITK,BlueBrain\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,fedral\/ITK,hjmjohnson\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,richardbeare\/ITK,BRAINSia\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,eile\/ITK,vfonov\/ITK,hinerm\/ITK,jmerkow\/ITK,blowekamp\/ITK,LucHermitte\/ITK,BlueBrain\/ITK,eile\/ITK,BRAINSia\/ITK,jmerkow\/ITK,LucHermitte\/ITK,atsnyder\/ITK,Kitware\/ITK,BRAINSia\/ITK,hendradarwin\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,vfonov\/ITK,itkvideo\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,biotrump\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,itkvideo\/ITK,hinerm\/ITK,zachary-williamson\/ITK,rhgong\/itk-with-dom,stnava\/ITK,stnava\/ITK,Kitware\/ITK,fbudin69500\/ITK,spinicist\/ITK,LucHermitte\/ITK,itkvideo\/ITK,jcfr\/ITK,LucHermitte\/ITK,BlueBrain\/ITK,ajjl\/ITK,wkjeong\/ITK,hjmjohnson\/ITK,msmolens\/ITK,thewtex\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,hinerm\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,itkvideo\/ITK,eile\/ITK,LucasGandel\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,msmolens\/ITK,blowekamp\/ITK,vfonov\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,PlutoniumHeart\/ITK,richardbeare\/ITK,stnava\/ITK,LucasGandel\/ITK,heimdali\/ITK,atsnyder\/ITK,ajjl\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,vfonov\/ITK,hendradarwin\/ITK,heimdali\/ITK,heimdali\/ITK,heimdali\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,eile\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,hendradarwin\/ITK,GEHC-Surgery\/ITK,fedral\/ITK,CapeDrew\/DITK,biotrump\/ITK,jcfr\/ITK,Kitware\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,eile\/ITK,malaterre\/ITK,blowekamp\/ITK,stnava\/ITK,vfonov\/ITK,hinerm\/ITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,paulnovo\/ITK,CapeDrew\/DITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,heimdali\/ITK,hinerm\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,fbudin69500\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,hjmjohnson\/ITK,LucasGandel\/ITK,blowekamp\/ITK,fedral\/ITK,zachary-williamson\/ITK,fedral\/ITK,spinicist\/ITK,fedral\/ITK,stnava\/ITK,BRAINSia\/ITK,hinerm\/ITK,malaterre\/ITK,eile\/ITK,hendradarwin\/ITK,rhgong\/itk-with-dom,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,Kitware\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,biotrump\/ITK,eile\/ITK,msmolens\/ITK,jmerkow\/ITK,hendradarwin\/ITK,spinicist\/ITK,eile\/ITK,PlutoniumHeart\/ITK,rhgong\/itk-with-dom,ajjl\/ITK,spinicist\/ITK,wkjeong\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,cpatrick\/ITK-RemoteIO,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,fedral\/ITK,hjmjohnson\/ITK,biotrump\/ITK,thewtex\/ITK,itkvideo\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,fedral\/ITK,Kitware\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1251 $, $Date: 2004-03-28 06:10:12 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1252 $, $Date: 2004-03-29 06:10:11 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"c30a6a66cd25cc91c463e0d4511f8d0db096476f","subject":"Disable MSP if told to do so by the client","message":"Disable MSP if told to do so by the client\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mud\/home\/Text\/obj\/filter\/mudclient.c\n+++ mud\/home\/Text\/obj\/filter\/mudclient.c\n@@ -65,6 +65,15 @@\n \n void telnet_dont(int code)\n {\n+\tswitch(code) {\n+\tcase 90:\n+\t\tif (msp_active) {\n+\t\t\tquery_conn()->send_wont(code);\n+\t\t\tmsp_active = 0;\n+\t\t}\n+\t\tmsp_pending = 0;\n+\t\tbreak;\n+\t}\n }\n \n void telnet_will(int code)\n"} {"commit":"4443fec965c67ec3db05ac7d453973d22d82f2e1","subject":"add missing space, from Donovan Watteau <tsoomi at gmail.com> thanks!","message":"add missing space, from Donovan Watteau <tsoomi at gmail.com>\nthanks!\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/audio.c\n+++ dev\/audio.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: audio.c,v 1.136 2015\/07\/28 20:57:35 ratchov Exp $\t*\/\n+\/*\t$OpenBSD: audio.c,v 1.137 2015\/07\/28 21:04:28 ratchov Exp $\t*\/\n \/*\n * Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org>\n *\n@@ -680,7 +680,7 @@\n \t\t p.bps != r.bps ||\n \t\t p.msb != r.msb ||\n \t\t p.sample_rate != r.sample_rate) {\n-\t\t\tprintf(\"%s: different play and record parameters\"\n+\t\t\tprintf(\"%s: different play and record parameters \"\n \t\t\t \"returned by hardware\\n\", DEVNAME(sc));\n \t\t\treturn ENODEV;\n \t\t}\n"} {"commit":"ecaf24b2fd31443fd52aa657e8bb2464199eb66c","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"rhgong\/itk-with-dom,CapeDrew\/DCMTK-ITK,eile\/ITK,hendradarwin\/ITK,heimdali\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,atsnyder\/ITK,BRAINSia\/ITK,vfonov\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,GEHC-Surgery\/ITK,hinerm\/ITK,jcfr\/ITK,Kitware\/ITK,thewtex\/ITK,eile\/ITK,rhgong\/itk-with-dom,eile\/ITK,hinerm\/ITK,atsnyder\/ITK,fedral\/ITK,daviddoria\/itkHoughTransform,eile\/ITK,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,hinerm\/ITK,LucHermitte\/ITK,spinicist\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,biotrump\/ITK,spinicist\/ITK,vfonov\/ITK,stnava\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,wkjeong\/ITK,stnava\/ITK,BRAINSia\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,hjmjohnson\/ITK,fedral\/ITK,thewtex\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,msmolens\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,jmerkow\/ITK,hinerm\/ITK,stnava\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,malaterre\/ITK,LucHermitte\/ITK,ajjl\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,vfonov\/ITK,paulnovo\/ITK,ajjl\/ITK,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,blowekamp\/ITK,atsnyder\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,stnava\/ITK,wkjeong\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,wkjeong\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,BlueBrain\/ITK,vfonov\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,CapeDrew\/DITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,CapeDrew\/DITK,heimdali\/ITK,hinerm\/ITK,eile\/ITK,daviddoria\/itkHoughTransform,rhgong\/itk-with-dom,biotrump\/ITK,atsnyder\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,eile\/ITK,jcfr\/ITK,Kitware\/ITK,malaterre\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,fbudin69500\/ITK,Kitware\/ITK,rhgong\/itk-with-dom,richardbeare\/ITK,rhgong\/itk-with-dom,itkvideo\/ITK,heimdali\/ITK,LucasGandel\/ITK,fuentesdt\/InsightToolkit-dev,jcfr\/ITK,jmerkow\/ITK,biotrump\/ITK,biotrump\/ITK,itkvideo\/ITK,hinerm\/ITK,blowekamp\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,stnava\/ITK,GEHC-Surgery\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,Kitware\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,ajjl\/ITK,msmolens\/ITK,LucHermitte\/ITK,blowekamp\/ITK,Kitware\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,jmerkow\/ITK,stnava\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,atsnyder\/ITK,spinicist\/ITK,fedral\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,malaterre\/ITK,BlueBrain\/ITK,atsnyder\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,paulnovo\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,malaterre\/ITK,richardbeare\/ITK,blowekamp\/ITK,hendradarwin\/ITK,hendradarwin\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,spinicist\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,heimdali\/ITK,eile\/ITK,LucasGandel\/ITK,blowekamp\/ITK,thewtex\/ITK,hendradarwin\/ITK,paulnovo\/ITK,itkvideo\/ITK,richardbeare\/ITK,CapeDrew\/DITK,itkvideo\/ITK,fedral\/ITK,jcfr\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,hjmjohnson\/ITK,hjmjohnson\/ITK,biotrump\/ITK,spinicist\/ITK,malaterre\/ITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,jcfr\/ITK,fedral\/ITK,thewtex\/ITK,hendradarwin\/ITK,msmolens\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,atsnyder\/ITK,biotrump\/ITK,eile\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DCMTK-ITK,spinicist\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,msmolens\/ITK,BlueBrain\/ITK,spinicist\/ITK,cpatrick\/ITK-RemoteIO,spinicist\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,zachary-williamson\/ITK,ajjl\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,LucHermitte\/ITK,ajjl\/ITK,heimdali\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,paulnovo\/ITK,hjmjohnson\/ITK,malaterre\/ITK,fbudin69500\/ITK,heimdali\/ITK,CapeDrew\/DITK,vfonov\/ITK,LucHermitte\/ITK,wkjeong\/ITK,paulnovo\/ITK,itkvideo\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,hendradarwin\/ITK,thewtex\/ITK,wkjeong\/ITK,hjmjohnson\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,richardbeare\/ITK,richardbeare\/ITK,stnava\/ITK,zachary-williamson\/ITK,vfonov\/ITK,vfonov\/ITK,stnava\/ITK,paulnovo\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,itkvideo\/ITK,LucasGandel\/ITK,jcfr\/ITK,Kitware\/ITK,msmolens\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,rhgong\/itk-with-dom,GEHC-Surgery\/ITK,BlueBrain\/ITK,hinerm\/ITK,fedral\/ITK,Kitware\/ITK,blowekamp\/ITK,paulnovo\/ITK,wkjeong\/ITK,LucHermitte\/ITK,CapeDrew\/DITK,hendradarwin\/ITK,LucHermitte\/ITK,hinerm\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,paulnovo\/ITK,zachary-williamson\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2018 $, $Date: 2006-06-20 00:09:16 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2019 $, $Date: 2006-06-21 00:09:19 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"6505e27ce03c49dcac5e1f33244b0c15da2b1a1e","subject":"Add shutdown hook","message":"Add shutdown hook\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/kerneld.c\n+++ mudlib\/mud\/home\/System\/sys\/kerneld.c\n@@ -224,3 +224,10 @@\n \n \t::dump_state();\n }\n+\n+void shutdown()\n+{\n+\tACCESS_CHECK(PRIVILEGED());\n+\n+\t::shutdown();\n+}\n"} {"commit":"4f85ae702513874704d3cd0bbc8cbf77e3c50b13","subject":"explicitly initialize a couple variables","message":"explicitly initialize a couple variables\n\nOK brad@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/audio.c\n+++ dev\/audio.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: audio.c,v 1.48 2006\/01\/02 05:21:37 brad Exp $\t*\/\n+\/*\t$OpenBSD: audio.c,v 1.49 2006\/03\/12 10:34:50 jakemsr Exp $\t*\/\n \/*\t$NetBSD: audio.c,v 1.119 1999\/11\/09 16:50:47 augustss Exp $\t*\/\n \n \/*\n@@ -849,7 +849,9 @@\n \trp->end = rp->start + nblks * blksize;\n \trp->inp = rp->outp = rp->start;\n \trp->stamp = 0;\n+\trp->stamp_last = 0;\n \trp->drops = 0;\n+\trp->pdrops = 0;\n \trp->pause = 0;\n \trp->copying = 0;\n \trp->needfill = 0;\n"} {"commit":"92085b4c8d07753b2c990e287a854f7daea82024","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"atsnyder\/ITK,blowekamp\/ITK,CapeDrew\/DITK,GEHC-Surgery\/ITK,biotrump\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,malaterre\/ITK,LucasGandel\/ITK,vfonov\/ITK,hjmjohnson\/ITK,atsnyder\/ITK,eile\/ITK,BRAINSia\/ITK,vfonov\/ITK,eile\/ITK,fbudin69500\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,paulnovo\/ITK,blowekamp\/ITK,eile\/ITK,biotrump\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,eile\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,biotrump\/ITK,paulnovo\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,hendradarwin\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,blowekamp\/ITK,fedral\/ITK,atsnyder\/ITK,Kitware\/ITK,jmerkow\/ITK,heimdali\/ITK,atsnyder\/ITK,eile\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,jcfr\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,rhgong\/itk-with-dom,eile\/ITK,wkjeong\/ITK,paulnovo\/ITK,atsnyder\/ITK,wkjeong\/ITK,ajjl\/ITK,CapeDrew\/DITK,hinerm\/ITK,zachary-williamson\/ITK,stnava\/ITK,jcfr\/ITK,paulnovo\/ITK,malaterre\/ITK,stnava\/ITK,hendradarwin\/ITK,wkjeong\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,LucasGandel\/ITK,stnava\/ITK,Kitware\/ITK,fbudin69500\/ITK,rhgong\/itk-with-dom,eile\/ITK,paulnovo\/ITK,LucasGandel\/ITK,BlueBrain\/ITK,thewtex\/ITK,paulnovo\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,hendradarwin\/ITK,heimdali\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,CapeDrew\/DCMTK-ITK,ajjl\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,hjmjohnson\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,GEHC-Surgery\/ITK,heimdali\/ITK,LucasGandel\/ITK,hinerm\/ITK,biotrump\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,ajjl\/ITK,jcfr\/ITK,hinerm\/ITK,ajjl\/ITK,paulnovo\/ITK,malaterre\/ITK,CapeDrew\/DITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,vfonov\/ITK,LucHermitte\/ITK,hendradarwin\/ITK,richardbeare\/ITK,BlueBrain\/ITK,hinerm\/ITK,jmerkow\/ITK,atsnyder\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,msmolens\/ITK,spinicist\/ITK,thewtex\/ITK,ajjl\/ITK,richardbeare\/ITK,atsnyder\/ITK,hendradarwin\/ITK,msmolens\/ITK,PlutoniumHeart\/ITK,vfonov\/ITK,hinerm\/ITK,hinerm\/ITK,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,itkvideo\/ITK,BRAINSia\/ITK,ajjl\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,PlutoniumHeart\/ITK,jmerkow\/ITK,thewtex\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,blowekamp\/ITK,malaterre\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,msmolens\/ITK,malaterre\/ITK,eile\/ITK,zachary-williamson\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,spinicist\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,BlueBrain\/ITK,BlueBrain\/ITK,wkjeong\/ITK,rhgong\/itk-with-dom,stnava\/ITK,Kitware\/ITK,jcfr\/ITK,LucasGandel\/ITK,wkjeong\/ITK,spinicist\/ITK,biotrump\/ITK,CapeDrew\/DITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,richardbeare\/ITK,BRAINSia\/ITK,heimdali\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,fedral\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,fuentesdt\/InsightToolkit-dev,BRAINSia\/ITK,itkvideo\/ITK,thewtex\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,blowekamp\/ITK,fedral\/ITK,biotrump\/ITK,stnava\/ITK,GEHC-Surgery\/ITK,fbudin69500\/ITK,richardbeare\/ITK,stnava\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,fbudin69500\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,GEHC-Surgery\/ITK,thewtex\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,LucasGandel\/ITK,malaterre\/ITK,spinicist\/ITK,LucasGandel\/ITK,msmolens\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,hendradarwin\/ITK,GEHC-Surgery\/ITK,malaterre\/ITK,spinicist\/ITK,fedral\/ITK,CapeDrew\/DITK,malaterre\/ITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,CapeDrew\/DITK,LucHermitte\/ITK,heimdali\/ITK,richardbeare\/ITK,stnava\/ITK,zachary-williamson\/ITK,spinicist\/ITK,richardbeare\/ITK,hinerm\/ITK,ajjl\/ITK,hinerm\/ITK,eile\/ITK,BlueBrain\/ITK,itkvideo\/ITK,spinicist\/ITK,hjmjohnson\/ITK,msmolens\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,thewtex\/ITK,jcfr\/ITK,stnava\/ITK,msmolens\/ITK,richardbeare\/ITK,heimdali\/ITK,jcfr\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,jmerkow\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,msmolens\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,atsnyder\/ITK,LucHermitte\/ITK,blowekamp\/ITK,hendradarwin\/ITK,wkjeong\/ITK,hinerm\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,hjmjohnson\/ITK,hendradarwin\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,itkvideo\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,atsnyder\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2186 $, $Date: 2006-12-06 01:07:44 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2187 $, $Date: 2006-12-07 01:07:42 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"8ae3ebcf710e5f5c3078f8c719302294c27a149c","subject":"Don't send klib signals to modules that are being shut down","message":"Don't send klib signals to modules that are being shut down\n","repos":"shentino\/kotaka,shentino\/kotaka,shentino\/kotaka","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mudlib\/mud\/home\/System\/sys\/moduled.c\n+++ mudlib\/mud\/home\/System\/sys\/moduled.c\n@@ -385,8 +385,16 @@\n \tscramble(list);\n \n \tfor (sz = sizeof(list) - 1; sz >= 0; --sz) {\n+\t\tstring module;\n+\n+\t\tmodule = list[sz];\n+\n+\t\tif (modules[module] == -1) {\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tcatch {\n-\t\t\t(USR_DIR + \"\/\" + list[sz] + \"\/initd\")->prepare_reboot();\n+\t\t\t(USR_DIR + \"\/\" + module + \"\/initd\")->prepare_reboot();\n \t\t}\n \t}\n }\n@@ -403,8 +411,16 @@\n \tscramble(list);\n \n \tfor (sz = sizeof(list) - 1; sz >= 0; --sz) {\n+\t\tstring module;\n+\n+\t\tmodule = list[sz];\n+\n+\t\tif (modules[module] == -1) {\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tcatch {\n-\t\t\t(USR_DIR + \"\/\" + list[sz] + \"\/initd\")->reboot();\n+\t\t\t(USR_DIR + \"\/\" + module + \"\/initd\")->reboot();\n \t\t}\n \t}\n }\n@@ -421,8 +437,16 @@\n \tscramble(list);\n \n \tfor (sz = sizeof(list) - 1; sz >= 0; --sz) {\n+\t\tstring module;\n+\n+\t\tmodule = list[sz];\n+\n+\t\tif (modules[module] == -1) {\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tcatch {\n-\t\t\t(USR_DIR + \"\/\" + list[sz] + \"\/initd\")->hotboot();\n-\t\t}\n-\t}\n-}\n+\t\t\t(USR_DIR + \"\/\" + module + \"\/initd\")->hotboot();\n+\t\t}\n+\t}\n+}\n"} {"commit":"a11a1dd8c700b9718d03c9669f0338f391db54c5","subject":"No need for NSWindowCollectionBehavior if we're compiling under the 10.5 SDK or later.","message":"No need for NSWindowCollectionBehavior if we're compiling under the 10.5 SDK or later.","repos":"ssp\/Pester,nriley\/Pester,ssp\/Pester,ssp\/Pester,nriley\/Pester,ssp\/Pester,ssp\/Pester","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- Source\/NSWindowCollectionBehavior.h\n+++ Source\/NSWindowCollectionBehavior.h\n@@ -5,6 +5,8 @@\n \/\/ Created by Nicholas Riley on 12\/8\/07.\n \/\/ Copyright 2007 Nicholas Riley. All rights reserved.\n \/\/\n+\n+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5\n \n #import <AppKit\/AppKit.h>\n \n@@ -18,3 +20,5 @@\n @interface NSWindow (NSWindowCollectionBehavior)\n - (void)setCollectionBehavior:(NSWindowCollectionBehavior)behavior;\n @end\n+\n+#endif"} {"commit":"b9771921fc27f1b08f79e74d3a01331e4cbf3228","subject":"[fix] Path joins in geodb_builder use new char_array methods","message":"[fix] Path joins in geodb_builder use new char_array methods\n","repos":"openvenues\/libpostal,openvenues\/libpostal,openvenues\/libpostal,openvenues\/libpostal","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"b38811f33e1e0fda7a65f3c2161da6901b6bf145","subject":"use ETHER_MAX_LEN.","message":"use ETHER_MAX_LEN.\n\nok mickey@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/an.c\n+++ dev\/ic\/an.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: an.c,v 1.37 2004\/08\/05 12:43:26 miod Exp $\t*\/\n+\/*\t$OpenBSD: an.c,v 1.38 2004\/08\/05 20:06:58 brad Exp $\t*\/\n \n \/*\n * Copyright (c) 1997, 1998, 1999\n@@ -1112,7 +1112,7 @@\n \t\treturn (0);\n \n \tfor (i = 0; i < AN_TX_RING_CNT; i++) {\n-\t\tif (an_alloc_nicmem(sc, 1518 + 0x44, &id))\n+\t\tif (an_alloc_nicmem(sc, ETHER_MAX_LEN + 0x44, &id))\n \t\t\treturn(ENOMEM);\n \t\tsc->an_rdata.an_tx_fids[i] = id;\n \t\tsc->an_rdata.an_tx_ring[i] = 0;\n"} {"commit":"5cc64455cce86652bcc3787368246498c3ee945c","subject":"Nightly version","message":"Nightly version\n","repos":"GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,blowekamp\/ITK,Kitware\/ITK,msmolens\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,spinicist\/ITK,paulnovo\/ITK,stnava\/ITK,fedral\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,vfonov\/ITK,thewtex\/ITK,stnava\/ITK,atsnyder\/ITK,malaterre\/ITK,blowekamp\/ITK,richardbeare\/ITK,msmolens\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,malaterre\/ITK,hinerm\/ITK,wkjeong\/ITK,malaterre\/ITK,CapeDrew\/DITK,GEHC-Surgery\/ITK,ajjl\/ITK,paulnovo\/ITK,ajjl\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,eile\/ITK,cpatrick\/ITK-RemoteIO,BlueBrain\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,richardbeare\/ITK,hinerm\/ITK,wkjeong\/ITK,vfonov\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,daviddoria\/itkHoughTransform,malaterre\/ITK,BRAINSia\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,paulnovo\/ITK,rhgong\/itk-with-dom,jcfr\/ITK,jmerkow\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,jmerkow\/ITK,daviddoria\/itkHoughTransform,jcfr\/ITK,heimdali\/ITK,biotrump\/ITK,LucHermitte\/ITK,eile\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,atsnyder\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,LucasGandel\/ITK,ajjl\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,rhgong\/itk-with-dom,blowekamp\/ITK,eile\/ITK,fedral\/ITK,blowekamp\/ITK,msmolens\/ITK,thewtex\/ITK,fedral\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,jmerkow\/ITK,biotrump\/ITK,heimdali\/ITK,BlueBrain\/ITK,heimdali\/ITK,jcfr\/ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,zachary-williamson\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,ajjl\/ITK,malaterre\/ITK,wkjeong\/ITK,wkjeong\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,ajjl\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,itkvideo\/ITK,itkvideo\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,vfonov\/ITK,jmerkow\/ITK,BlueBrain\/ITK,msmolens\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,richardbeare\/ITK,blowekamp\/ITK,jcfr\/ITK,hinerm\/ITK,hendradarwin\/ITK,eile\/ITK,richardbeare\/ITK,jmerkow\/ITK,spinicist\/ITK,CapeDrew\/DCMTK-ITK,atsnyder\/ITK,spinicist\/ITK,jmerkow\/ITK,jcfr\/ITK,vfonov\/ITK,ajjl\/ITK,hinerm\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,hendradarwin\/ITK,msmolens\/ITK,spinicist\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,rhgong\/itk-with-dom,hjmjohnson\/ITK,Kitware\/ITK,paulnovo\/ITK,hinerm\/ITK,thewtex\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,malaterre\/ITK,hinerm\/ITK,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,malaterre\/ITK,CapeDrew\/DITK,CapeDrew\/DITK,vfonov\/ITK,PlutoniumHeart\/ITK,wkjeong\/ITK,stnava\/ITK,paulnovo\/ITK,itkvideo\/ITK,spinicist\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,Kitware\/ITK,thewtex\/ITK,paulnovo\/ITK,stnava\/ITK,hjmjohnson\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,GEHC-Surgery\/ITK,BlueBrain\/ITK,eile\/ITK,LucasGandel\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,eile\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,LucHermitte\/ITK,eile\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,wkjeong\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,cpatrick\/ITK-RemoteIO,hinerm\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,Kitware\/ITK,heimdali\/ITK,stnava\/ITK,LucasGandel\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,LucHermitte\/ITK,vfonov\/ITK,eile\/ITK,heimdali\/ITK,jmerkow\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,rhgong\/itk-with-dom,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,itkvideo\/ITK,atsnyder\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,LucasGandel\/ITK,biotrump\/ITK,Kitware\/ITK,hjmjohnson\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,fbudin69500\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,blowekamp\/ITK,fedral\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,fedral\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,hinerm\/ITK,thewtex\/ITK,paulnovo\/ITK,itkvideo\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,jmerkow\/ITK,atsnyder\/ITK,richardbeare\/ITK,LucHermitte\/ITK,cpatrick\/ITK-RemoteIO,PlutoniumHeart\/ITK,thewtex\/ITK,ajjl\/ITK,jcfr\/ITK,zachary-williamson\/ITK,hendradarwin\/ITK,zachary-williamson\/ITK,GEHC-Surgery\/ITK,BRAINSia\/ITK,wkjeong\/ITK,stnava\/ITK,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,msmolens\/ITK,spinicist\/ITK,hjmjohnson\/ITK,hendradarwin\/ITK,fedral\/ITK,PlutoniumHeart\/ITK,zachary-williamson\/ITK,spinicist\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,vfonov\/ITK,biotrump\/ITK,itkvideo\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -27,7 +27,7 @@\n #define ITK_MAJOR_VERSION 0\n #define ITK_MINOR_VERSION 0\n #define ITK_BUILD_VERSION 2\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.603 $, $Date: 2002-06-13 03:50:06 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.604 $, $Date: 2002-06-14 03:50:06 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"5deb9d321a05696f4e9b81524e986612ec000e3d","subject":"ugly hack to make the 21145 work without manual media setting.","message":"ugly hack to make the 21145 work without manual media setting.\n\nmany many many thanks to nick@, who booted no less then 8 kernels for me today\nwhile hacking on that (and this includes going downstairs to the basement\nand up again 8 times...)\n\nok jason@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/ic\/dc.c\n+++ dev\/ic\/dc.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: dc.c,v 1.52 2002\/10\/20 16:46:27 henning Exp $\t*\/\n+\/*\t$OpenBSD: dc.c,v 1.53 2002\/10\/21 20:30:32 henning Exp $\t*\/\n \n \/*\n * Copyright (c) 1997, 1998, 1999\n@@ -1431,6 +1431,9 @@\n \t\tCSR_WRITE_4(sc, DC_10BTCTRL, 0);\n \t\tCSR_WRITE_4(sc, DC_WATCHDOG, 0);\n \t}\n+\n+\tif (sc->dc_type == DC_TYPE_21145)\n+\t\tdc_setcfg(sc, IFM_10_T);\n \n \treturn;\n }\n"} {"commit":"20ec95f93e5b6c5dcf76165b1dcc7005e50d0689","subject":"Nightly version","message":"Nightly version\n","repos":"jmerkow\/ITK,hendradarwin\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,rhgong\/itk-with-dom,jmerkow\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,ajjl\/ITK,wkjeong\/ITK,BRAINSia\/ITK,hinerm\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,stnava\/ITK,CapeDrew\/DITK,InsightSoftwareConsortium\/ITK,ajjl\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,jmerkow\/ITK,fbudin69500\/ITK,LucHermitte\/ITK,atsnyder\/ITK,CapeDrew\/DITK,cpatrick\/ITK-RemoteIO,thewtex\/ITK,CapeDrew\/DITK,hinerm\/ITK,hinerm\/ITK,hjmjohnson\/ITK,thewtex\/ITK,biotrump\/ITK,heimdali\/ITK,msmolens\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,Kitware\/ITK,CapeDrew\/DCMTK-ITK,PlutoniumHeart\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,blowekamp\/ITK,wkjeong\/ITK,malaterre\/ITK,spinicist\/ITK,BRAINSia\/ITK,Kitware\/ITK,wkjeong\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,paulnovo\/ITK,spinicist\/ITK,Kitware\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,rhgong\/itk-with-dom,LucasGandel\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,zachary-williamson\/ITK,stnava\/ITK,LucasGandel\/ITK,fedral\/ITK,itkvideo\/ITK,paulnovo\/ITK,eile\/ITK,richardbeare\/ITK,eile\/ITK,PlutoniumHeart\/ITK,eile\/ITK,blowekamp\/ITK,rhgong\/itk-with-dom,fedral\/ITK,heimdali\/ITK,wkjeong\/ITK,msmolens\/ITK,jcfr\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,itkvideo\/ITK,ajjl\/ITK,atsnyder\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,eile\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,BlueBrain\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DITK,malaterre\/ITK,ajjl\/ITK,paulnovo\/ITK,hendradarwin\/ITK,vfonov\/ITK,heimdali\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,BRAINSia\/ITK,thewtex\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,LucHermitte\/ITK,BlueBrain\/ITK,stnava\/ITK,biotrump\/ITK,BRAINSia\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,spinicist\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,spinicist\/ITK,atsnyder\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,thewtex\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,spinicist\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,fbudin69500\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,hjmjohnson\/ITK,heimdali\/ITK,richardbeare\/ITK,ajjl\/ITK,Kitware\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,biotrump\/ITK,jmerkow\/ITK,CapeDrew\/DCMTK-ITK,LucHermitte\/ITK,fbudin69500\/ITK,stnava\/ITK,LucasGandel\/ITK,wkjeong\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,hinerm\/ITK,stnava\/ITK,msmolens\/ITK,blowekamp\/ITK,Kitware\/ITK,thewtex\/ITK,jcfr\/ITK,paulnovo\/ITK,CapeDrew\/DITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,hjmjohnson\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,hinerm\/ITK,Kitware\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,fbudin69500\/ITK,heimdali\/ITK,msmolens\/ITK,zachary-williamson\/ITK,LucasGandel\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,stnava\/ITK,CapeDrew\/DCMTK-ITK,heimdali\/ITK,LucHermitte\/ITK,hinerm\/ITK,richardbeare\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,eile\/ITK,itkvideo\/ITK,hendradarwin\/ITK,richardbeare\/ITK,BRAINSia\/ITK,stnava\/ITK,fedral\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,itkvideo\/ITK,jmerkow\/ITK,atsnyder\/ITK,fbudin69500\/ITK,hinerm\/ITK,stnava\/ITK,vfonov\/ITK,jmerkow\/ITK,hinerm\/ITK,spinicist\/ITK,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,daviddoria\/itkHoughTransform,malaterre\/ITK,atsnyder\/ITK,vfonov\/ITK,zachary-williamson\/ITK,paulnovo\/ITK,vfonov\/ITK,Kitware\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,ajjl\/ITK,malaterre\/ITK,hendradarwin\/ITK,vfonov\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,malaterre\/ITK,ajjl\/ITK,hjmjohnson\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,fedral\/ITK,BRAINSia\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,blowekamp\/ITK,vfonov\/ITK,hendradarwin\/ITK,heimdali\/ITK,eile\/ITK,wkjeong\/ITK,rhgong\/itk-with-dom,thewtex\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,itkvideo\/ITK,stnava\/ITK,thewtex\/ITK,cpatrick\/ITK-RemoteIO,malaterre\/ITK,LucasGandel\/ITK,fedral\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,jcfr\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,itkvideo\/ITK,LucHermitte\/ITK,eile\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,jcfr\/ITK,malaterre\/ITK,itkvideo\/ITK,richardbeare\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,LucHermitte\/ITK,daviddoria\/itkHoughTransform,LucHermitte\/ITK,itkvideo\/ITK,msmolens\/ITK,jmerkow\/ITK,LucasGandel\/ITK,eile\/ITK,blowekamp\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -23,7 +23,7 @@\n #define ITK_MAJOR_VERSION 0\n #define ITK_MINOR_VERSION 0\n #define ITK_BUILD_VERSION 2\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.211 $, $Date: 2001-03-21 09:47:04 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.212 $, $Date: 2001-03-22 09:37:04 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"3230385f4af297d58b4b4e7c7ab7a25e597dce21","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"zachary-williamson\/ITK,paulnovo\/ITK,atsnyder\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,fbudin69500\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,paulnovo\/ITK,jmerkow\/ITK,eile\/ITK,PlutoniumHeart\/ITK,BRAINSia\/ITK,ajjl\/ITK,heimdali\/ITK,malaterre\/ITK,eile\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,itkvideo\/ITK,zachary-williamson\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,eile\/ITK,jcfr\/ITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,jmerkow\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,LucHermitte\/ITK,hjmjohnson\/ITK,paulnovo\/ITK,CapeDrew\/DITK,hjmjohnson\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,hinerm\/ITK,malaterre\/ITK,paulnovo\/ITK,jmerkow\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,eile\/ITK,thewtex\/ITK,fbudin69500\/ITK,richardbeare\/ITK,spinicist\/ITK,hjmjohnson\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,zachary-williamson\/ITK,stnava\/ITK,eile\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,BlueBrain\/ITK,paulnovo\/ITK,BRAINSia\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,LucasGandel\/ITK,ajjl\/ITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,malaterre\/ITK,CapeDrew\/DCMTK-ITK,Kitware\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,Kitware\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,heimdali\/ITK,GEHC-Surgery\/ITK,LucHermitte\/ITK,ajjl\/ITK,LucasGandel\/ITK,hendradarwin\/ITK,wkjeong\/ITK,CapeDrew\/DITK,itkvideo\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,LucasGandel\/ITK,spinicist\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,stnava\/ITK,CapeDrew\/DITK,Kitware\/ITK,hjmjohnson\/ITK,paulnovo\/ITK,fedral\/ITK,richardbeare\/ITK,itkvideo\/ITK,thewtex\/ITK,itkvideo\/ITK,hendradarwin\/ITK,spinicist\/ITK,vfonov\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,atsnyder\/ITK,richardbeare\/ITK,LucHermitte\/ITK,fbudin69500\/ITK,biotrump\/ITK,atsnyder\/ITK,stnava\/ITK,zachary-williamson\/ITK,BlueBrain\/ITK,hinerm\/ITK,eile\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,jcfr\/ITK,rhgong\/itk-with-dom,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,BRAINSia\/ITK,Kitware\/ITK,LucHermitte\/ITK,heimdali\/ITK,fedral\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,jcfr\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,atsnyder\/ITK,heimdali\/ITK,richardbeare\/ITK,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,fbudin69500\/ITK,fbudin69500\/ITK,fedral\/ITK,hjmjohnson\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,vfonov\/ITK,rhgong\/itk-with-dom,jcfr\/ITK,CapeDrew\/DITK,heimdali\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,blowekamp\/ITK,atsnyder\/ITK,ajjl\/ITK,heimdali\/ITK,fedral\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,richardbeare\/ITK,atsnyder\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,biotrump\/ITK,CapeDrew\/DITK,thewtex\/ITK,wkjeong\/ITK,malaterre\/ITK,BlueBrain\/ITK,msmolens\/ITK,hinerm\/ITK,LucasGandel\/ITK,ajjl\/ITK,BRAINSia\/ITK,vfonov\/ITK,fbudin69500\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,stnava\/ITK,hinerm\/ITK,blowekamp\/ITK,biotrump\/ITK,vfonov\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,msmolens\/ITK,stnava\/ITK,thewtex\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,ajjl\/ITK,msmolens\/ITK,msmolens\/ITK,heimdali\/ITK,hjmjohnson\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DCMTK-ITK,vfonov\/ITK,spinicist\/ITK,stnava\/ITK,hendradarwin\/ITK,daviddoria\/itkHoughTransform,hendradarwin\/ITK,rhgong\/itk-with-dom,fedral\/ITK,spinicist\/ITK,hinerm\/ITK,spinicist\/ITK,cpatrick\/ITK-RemoteIO,atsnyder\/ITK,eile\/ITK,fedral\/ITK,thewtex\/ITK,biotrump\/ITK,Kitware\/ITK,hjmjohnson\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DCMTK-ITK,biotrump\/ITK,fedral\/ITK,spinicist\/ITK,ajjl\/ITK,InsightSoftwareConsortium\/ITK,jmerkow\/ITK,biotrump\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,richardbeare\/ITK,hinerm\/ITK,LucHermitte\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,biotrump\/ITK,eile\/ITK,msmolens\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,LucHermitte\/ITK,LucasGandel\/ITK,stnava\/ITK,vfonov\/ITK,itkvideo\/ITK,jcfr\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,rhgong\/itk-with-dom,vfonov\/ITK,jmerkow\/ITK,BlueBrain\/ITK,jcfr\/ITK,CapeDrew\/DCMTK-ITK,fedral\/ITK,GEHC-Surgery\/ITK,BRAINSia\/ITK,malaterre\/ITK,blowekamp\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1901 $, $Date: 2006-02-07 01:10:07 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1902 $, $Date: 2006-02-08 01:10:09 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"f4df34dbca126a41325afcf65415fb7098974888","subject":"Nightly version","message":"Nightly version\n","repos":"InsightSoftwareConsortium\/ITK,vfonov\/ITK,jcfr\/ITK,jcfr\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,thewtex\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,biotrump\/ITK,LucHermitte\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,biotrump\/ITK,rhgong\/itk-with-dom,spinicist\/ITK,itkvideo\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,ajjl\/ITK,hjmjohnson\/ITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,atsnyder\/ITK,cpatrick\/ITK-RemoteIO,spinicist\/ITK,biotrump\/ITK,hjmjohnson\/ITK,paulnovo\/ITK,zachary-williamson\/ITK,LucHermitte\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,thewtex\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,thewtex\/ITK,rhgong\/itk-with-dom,CapeDrew\/DITK,msmolens\/ITK,rhgong\/itk-with-dom,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,eile\/ITK,fedral\/ITK,hendradarwin\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,wkjeong\/ITK,blowekamp\/ITK,CapeDrew\/DITK,jcfr\/ITK,fedral\/ITK,BlueBrain\/ITK,fedral\/ITK,malaterre\/ITK,hinerm\/ITK,cpatrick\/ITK-RemoteIO,biotrump\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,malaterre\/ITK,richardbeare\/ITK,eile\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,eile\/ITK,msmolens\/ITK,itkvideo\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,CapeDrew\/DITK,jcfr\/ITK,itkvideo\/ITK,cpatrick\/ITK-RemoteIO,richardbeare\/ITK,zachary-williamson\/ITK,malaterre\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,Kitware\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,malaterre\/ITK,ajjl\/ITK,fedral\/ITK,Kitware\/ITK,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,fbudin69500\/ITK,itkvideo\/ITK,BlueBrain\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,CapeDrew\/DITK,LucasGandel\/ITK,hendradarwin\/ITK,zachary-williamson\/ITK,BRAINSia\/ITK,itkvideo\/ITK,eile\/ITK,fbudin69500\/ITK,spinicist\/ITK,heimdali\/ITK,BlueBrain\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,PlutoniumHeart\/ITK,LucHermitte\/ITK,thewtex\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,ajjl\/ITK,zachary-williamson\/ITK,fbudin69500\/ITK,eile\/ITK,malaterre\/ITK,vfonov\/ITK,Kitware\/ITK,msmolens\/ITK,blowekamp\/ITK,stnava\/ITK,itkvideo\/ITK,eile\/ITK,jcfr\/ITK,hjmjohnson\/ITK,BRAINSia\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,Kitware\/ITK,fuentesdt\/InsightToolkit-dev,jmerkow\/ITK,blowekamp\/ITK,biotrump\/ITK,richardbeare\/ITK,zachary-williamson\/ITK,wkjeong\/ITK,jcfr\/ITK,richardbeare\/ITK,LucHermitte\/ITK,spinicist\/ITK,BRAINSia\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,LucasGandel\/ITK,zachary-williamson\/ITK,fedral\/ITK,GEHC-Surgery\/ITK,itkvideo\/ITK,wkjeong\/ITK,jmerkow\/ITK,fbudin69500\/ITK,blowekamp\/ITK,wkjeong\/ITK,atsnyder\/ITK,hendradarwin\/ITK,hinerm\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,BlueBrain\/ITK,hinerm\/ITK,stnava\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,Kitware\/ITK,heimdali\/ITK,stnava\/ITK,stnava\/ITK,richardbeare\/ITK,thewtex\/ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,heimdali\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,fbudin69500\/ITK,stnava\/ITK,blowekamp\/ITK,hinerm\/ITK,atsnyder\/ITK,CapeDrew\/DITK,atsnyder\/ITK,hendradarwin\/ITK,hinerm\/ITK,fedral\/ITK,LucHermitte\/ITK,spinicist\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,heimdali\/ITK,fedral\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,Kitware\/ITK,BRAINSia\/ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,blowekamp\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,rhgong\/itk-with-dom,jmerkow\/ITK,spinicist\/ITK,heimdali\/ITK,vfonov\/ITK,heimdali\/ITK,BRAINSia\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,LucasGandel\/ITK,stnava\/ITK,fbudin69500\/ITK,hinerm\/ITK,hinerm\/ITK,hinerm\/ITK,LucHermitte\/ITK,atsnyder\/ITK,eile\/ITK,heimdali\/ITK,Kitware\/ITK,jmerkow\/ITK,jcfr\/ITK,CapeDrew\/DITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,msmolens\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,malaterre\/ITK,paulnovo\/ITK,paulnovo\/ITK,hinerm\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,wkjeong\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,ajjl\/ITK,paulnovo\/ITK,jmerkow\/ITK,vfonov\/ITK,biotrump\/ITK,atsnyder\/ITK,LucasGandel\/ITK,jmerkow\/ITK,hendradarwin\/ITK,stnava\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,msmolens\/ITK,atsnyder\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,stnava\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,ajjl\/ITK,thewtex\/ITK,eile\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,BlueBrain\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,CapeDrew\/DCMTK-ITK,itkvideo\/ITK,thewtex\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,paulnovo\/ITK,eile\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -27,7 +27,7 @@\n #define ITK_MAJOR_VERSION 0\n #define ITK_MINOR_VERSION 0\n #define ITK_BUILD_VERSION 2\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.797 $, $Date: 2002-12-31 06:10:09 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.798 $, $Date: 2003-01-01 06:10:09 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"dd7de3baedb1d6086ce6c1ac17953cd60ef31b31","subject":"Nightly version","message":"Nightly version\n","repos":"blowekamp\/ITK,jmerkow\/ITK,LucHermitte\/ITK,vfonov\/ITK,BlueBrain\/ITK,stnava\/ITK,zachary-williamson\/ITK,spinicist\/ITK,wkjeong\/ITK,BRAINSia\/ITK,GEHC-Surgery\/ITK,fedral\/ITK,jmerkow\/ITK,jmerkow\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,jcfr\/ITK,zachary-williamson\/ITK,ajjl\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,eile\/ITK,InsightSoftwareConsortium\/ITK,thewtex\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,hjmjohnson\/ITK,heimdali\/ITK,hendradarwin\/ITK,fedral\/ITK,fbudin69500\/ITK,spinicist\/ITK,biotrump\/ITK,vfonov\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,hinerm\/ITK,BlueBrain\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,spinicist\/ITK,wkjeong\/ITK,msmolens\/ITK,atsnyder\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,wkjeong\/ITK,stnava\/ITK,richardbeare\/ITK,thewtex\/ITK,heimdali\/ITK,spinicist\/ITK,itkvideo\/ITK,CapeDrew\/DITK,jmerkow\/ITK,hjmjohnson\/ITK,rhgong\/itk-with-dom,richardbeare\/ITK,InsightSoftwareConsortium\/ITK,zachary-williamson\/ITK,hjmjohnson\/ITK,Kitware\/ITK,jcfr\/ITK,hendradarwin\/ITK,BRAINSia\/ITK,ajjl\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,InsightSoftwareConsortium\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,jcfr\/ITK,BlueBrain\/ITK,vfonov\/ITK,BRAINSia\/ITK,eile\/ITK,stnava\/ITK,paulnovo\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,fedral\/ITK,hinerm\/ITK,msmolens\/ITK,stnava\/ITK,PlutoniumHeart\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,blowekamp\/ITK,blowekamp\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,LucasGandel\/ITK,Kitware\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,CapeDrew\/DITK,LucasGandel\/ITK,paulnovo\/ITK,atsnyder\/ITK,eile\/ITK,atsnyder\/ITK,LucHermitte\/ITK,eile\/ITK,stnava\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,blowekamp\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,blowekamp\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,jcfr\/ITK,vfonov\/ITK,itkvideo\/ITK,fbudin69500\/ITK,blowekamp\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,heimdali\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,ajjl\/ITK,malaterre\/ITK,malaterre\/ITK,ajjl\/ITK,hinerm\/ITK,thewtex\/ITK,heimdali\/ITK,jcfr\/ITK,LucasGandel\/ITK,atsnyder\/ITK,hendradarwin\/ITK,eile\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,itkvideo\/ITK,hinerm\/ITK,paulnovo\/ITK,msmolens\/ITK,heimdali\/ITK,Kitware\/ITK,CapeDrew\/DITK,stnava\/ITK,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,LucHermitte\/ITK,malaterre\/ITK,jmerkow\/ITK,thewtex\/ITK,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,fedral\/ITK,richardbeare\/ITK,hinerm\/ITK,CapeDrew\/DCMTK-ITK,richardbeare\/ITK,paulnovo\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,hinerm\/ITK,hinerm\/ITK,itkvideo\/ITK,fedral\/ITK,jmerkow\/ITK,LucHermitte\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,richardbeare\/ITK,spinicist\/ITK,fedral\/ITK,paulnovo\/ITK,malaterre\/ITK,malaterre\/ITK,jmerkow\/ITK,wkjeong\/ITK,spinicist\/ITK,eile\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,ajjl\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,atsnyder\/ITK,hendradarwin\/ITK,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,zachary-williamson\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,CapeDrew\/DITK,PlutoniumHeart\/ITK,atsnyder\/ITK,vfonov\/ITK,paulnovo\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,biotrump\/ITK,wkjeong\/ITK,hendradarwin\/ITK,spinicist\/ITK,fedral\/ITK,itkvideo\/ITK,biotrump\/ITK,stnava\/ITK,jcfr\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DCMTK-ITK,thewtex\/ITK,heimdali\/ITK,malaterre\/ITK,paulnovo\/ITK,CapeDrew\/DITK,rhgong\/itk-with-dom,msmolens\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,biotrump\/ITK,heimdali\/ITK,richardbeare\/ITK,cpatrick\/ITK-RemoteIO,hjmjohnson\/ITK,msmolens\/ITK,fbudin69500\/ITK,LucasGandel\/ITK,Kitware\/ITK,heimdali\/ITK,LucasGandel\/ITK,msmolens\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,wkjeong\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,atsnyder\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,BRAINSia\/ITK,hjmjohnson\/ITK,Kitware\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,atsnyder\/ITK,paulnovo\/ITK,thewtex\/ITK,fbudin69500\/ITK,vfonov\/ITK,jmerkow\/ITK,LucasGandel\/ITK,LucHermitte\/ITK,eile\/ITK,rhgong\/itk-with-dom,BRAINSia\/ITK,biotrump\/ITK,thewtex\/ITK,richardbeare\/ITK,ajjl\/ITK,rhgong\/itk-with-dom,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,biotrump\/ITK,itkvideo\/ITK,BRAINSia\/ITK,itkvideo\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,LucasGandel\/ITK,jcfr\/ITK,LucasGandel\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1003 $, $Date: 2003-07-23 05:10:08 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1004 $, $Date: 2003-07-24 05:10:08 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"f6e3086076678cb4f6d5966024a8cd2a9fc7eee9","subject":"ENH: Version number update","message":"ENH: Version number update\n","repos":"hendradarwin\/ITK,wkjeong\/ITK,hinerm\/ITK,BRAINSia\/ITK,CapeDrew\/DITK,spinicist\/ITK,eile\/ITK,malaterre\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,Kitware\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,msmolens\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,richardbeare\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,hjmjohnson\/ITK,CapeDrew\/DITK,LucHermitte\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,fedral\/ITK,hinerm\/ITK,CapeDrew\/DITK,heimdali\/ITK,BRAINSia\/ITK,heimdali\/ITK,biotrump\/ITK,hinerm\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,atsnyder\/ITK,thewtex\/ITK,zachary-williamson\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,rhgong\/itk-with-dom,LucasGandel\/ITK,zachary-williamson\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,PlutoniumHeart\/ITK,hendradarwin\/ITK,jmerkow\/ITK,fedral\/ITK,blowekamp\/ITK,itkvideo\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,hinerm\/ITK,atsnyder\/ITK,atsnyder\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,ajjl\/ITK,hendradarwin\/ITK,fuentesdt\/InsightToolkit-dev,InsightSoftwareConsortium\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,malaterre\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,CapeDrew\/DITK,richardbeare\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,thewtex\/ITK,blowekamp\/ITK,jmerkow\/ITK,LucHermitte\/ITK,wkjeong\/ITK,BlueBrain\/ITK,richardbeare\/ITK,LucHermitte\/ITK,ajjl\/ITK,wkjeong\/ITK,hjmjohnson\/ITK,cpatrick\/ITK-RemoteIO,msmolens\/ITK,msmolens\/ITK,stnava\/ITK,stnava\/ITK,richardbeare\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,paulnovo\/ITK,spinicist\/ITK,msmolens\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,hjmjohnson\/ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,richardbeare\/ITK,biotrump\/ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,paulnovo\/ITK,rhgong\/itk-with-dom,blowekamp\/ITK,eile\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,GEHC-Surgery\/ITK,fbudin69500\/ITK,vfonov\/ITK,jcfr\/ITK,stnava\/ITK,Kitware\/ITK,wkjeong\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,GEHC-Surgery\/ITK,hinerm\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,jmerkow\/ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,spinicist\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,zachary-williamson\/ITK,Kitware\/ITK,CapeDrew\/DITK,blowekamp\/ITK,richardbeare\/ITK,stnava\/ITK,fbudin69500\/ITK,heimdali\/ITK,atsnyder\/ITK,CapeDrew\/DITK,eile\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,LucHermitte\/ITK,jcfr\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,paulnovo\/ITK,rhgong\/itk-with-dom,Kitware\/ITK,BlueBrain\/ITK,ajjl\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,ajjl\/ITK,hjmjohnson\/ITK,jcfr\/ITK,hendradarwin\/ITK,hinerm\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,CapeDrew\/DITK,hinerm\/ITK,atsnyder\/ITK,zachary-williamson\/ITK,wkjeong\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,fedral\/ITK,itkvideo\/ITK,vfonov\/ITK,LucasGandel\/ITK,ajjl\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,spinicist\/ITK,Kitware\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,fbudin69500\/ITK,vfonov\/ITK,itkvideo\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,malaterre\/ITK,BlueBrain\/ITK,stnava\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,cpatrick\/ITK-RemoteIO,stnava\/ITK,ajjl\/ITK,eile\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,stnava\/ITK,thewtex\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,fbudin69500\/ITK,rhgong\/itk-with-dom,Kitware\/ITK,BlueBrain\/ITK,spinicist\/ITK,spinicist\/ITK,paulnovo\/ITK,thewtex\/ITK,eile\/ITK,vfonov\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,paulnovo\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,stnava\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,PlutoniumHeart\/ITK,vfonov\/ITK,hendradarwin\/ITK,hendradarwin\/ITK,wkjeong\/ITK,thewtex\/ITK,BRAINSia\/ITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,fbudin69500\/ITK,thewtex\/ITK,jmerkow\/ITK,eile\/ITK,fedral\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,vfonov\/ITK,itkvideo\/ITK,eile\/ITK,ajjl\/ITK,vfonov\/ITK,zachary-williamson\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,jcfr\/ITK,msmolens\/ITK,thewtex\/ITK,BRAINSia\/ITK,malaterre\/ITK,malaterre\/ITK,fedral\/ITK,zachary-williamson\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,BlueBrain\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,fedral\/ITK,BRAINSia\/ITK,heimdali\/ITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,heimdali\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,fedral\/ITK,blowekamp\/ITK,blowekamp\/ITK,LucasGandel\/ITK,jmerkow\/ITK,Kitware\/ITK,eile\/ITK,LucasGandel\/ITK,eile\/ITK,malaterre\/ITK,hendradarwin\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,jmerkow\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,itkvideo\/ITK,jcfr\/ITK,blowekamp\/ITK,spinicist\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3335 $, $Date: 2010-03-18 02:00:12 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3336 $, $Date: 2010-03-19 02:00:06 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"17d7327e9bebb1589ca63d1aa6f0cdd32bb962e5","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"CapeDrew\/DCMTK-ITK,jmerkow\/ITK,BRAINSia\/ITK,heimdali\/ITK,atsnyder\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,GEHC-Surgery\/ITK,richardbeare\/ITK,stnava\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,hjmjohnson\/ITK,ajjl\/ITK,BlueBrain\/ITK,LucHermitte\/ITK,hinerm\/ITK,CapeDrew\/DITK,hinerm\/ITK,fbudin69500\/ITK,itkvideo\/ITK,blowekamp\/ITK,biotrump\/ITK,fedral\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,daviddoria\/itkHoughTransform,vfonov\/ITK,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,CapeDrew\/DCMTK-ITK,richardbeare\/ITK,hjmjohnson\/ITK,malaterre\/ITK,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,jcfr\/ITK,spinicist\/ITK,BRAINSia\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,PlutoniumHeart\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,zachary-williamson\/ITK,malaterre\/ITK,thewtex\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,heimdali\/ITK,jcfr\/ITK,atsnyder\/ITK,hinerm\/ITK,ajjl\/ITK,fedral\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,eile\/ITK,hinerm\/ITK,biotrump\/ITK,fedral\/ITK,hjmjohnson\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,cpatrick\/ITK-RemoteIO,vfonov\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,BlueBrain\/ITK,InsightSoftwareConsortium\/ITK,paulnovo\/ITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,eile\/ITK,blowekamp\/ITK,BRAINSia\/ITK,fuentesdt\/InsightToolkit-dev,wkjeong\/ITK,jcfr\/ITK,heimdali\/ITK,spinicist\/ITK,malaterre\/ITK,daviddoria\/itkHoughTransform,BlueBrain\/ITK,itkvideo\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,wkjeong\/ITK,malaterre\/ITK,CapeDrew\/DITK,atsnyder\/ITK,richardbeare\/ITK,eile\/ITK,vfonov\/ITK,hinerm\/ITK,malaterre\/ITK,jcfr\/ITK,vfonov\/ITK,wkjeong\/ITK,jcfr\/ITK,itkvideo\/ITK,hendradarwin\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,stnava\/ITK,eile\/ITK,itkvideo\/ITK,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,biotrump\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,richardbeare\/ITK,stnava\/ITK,jmerkow\/ITK,malaterre\/ITK,wkjeong\/ITK,jcfr\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,LucHermitte\/ITK,zachary-williamson\/ITK,cpatrick\/ITK-RemoteIO,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,jcfr\/ITK,hinerm\/ITK,blowekamp\/ITK,fbudin69500\/ITK,LucHermitte\/ITK,richardbeare\/ITK,fbudin69500\/ITK,atsnyder\/ITK,richardbeare\/ITK,jmerkow\/ITK,stnava\/ITK,spinicist\/ITK,vfonov\/ITK,eile\/ITK,paulnovo\/ITK,LucasGandel\/ITK,blowekamp\/ITK,Kitware\/ITK,CapeDrew\/DITK,hjmjohnson\/ITK,itkvideo\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,hendradarwin\/ITK,hjmjohnson\/ITK,jmerkow\/ITK,msmolens\/ITK,hendradarwin\/ITK,biotrump\/ITK,wkjeong\/ITK,stnava\/ITK,InsightSoftwareConsortium\/ITK,BlueBrain\/ITK,richardbeare\/ITK,thewtex\/ITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,thewtex\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,CapeDrew\/DITK,cpatrick\/ITK-RemoteIO,Kitware\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,fedral\/ITK,msmolens\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DCMTK-ITK,hjmjohnson\/ITK,LucasGandel\/ITK,Kitware\/ITK,atsnyder\/ITK,stnava\/ITK,biotrump\/ITK,CapeDrew\/DITK,atsnyder\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,malaterre\/ITK,rhgong\/itk-with-dom,rhgong\/itk-with-dom,spinicist\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,blowekamp\/ITK,blowekamp\/ITK,BlueBrain\/ITK,itkvideo\/ITK,atsnyder\/ITK,hendradarwin\/ITK,hendradarwin\/ITK,biotrump\/ITK,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,malaterre\/ITK,hendradarwin\/ITK,msmolens\/ITK,biotrump\/ITK,fedral\/ITK,jmerkow\/ITK,fbudin69500\/ITK,heimdali\/ITK,heimdali\/ITK,Kitware\/ITK,ajjl\/ITK,itkvideo\/ITK,CapeDrew\/DCMTK-ITK,thewtex\/ITK,spinicist\/ITK,blowekamp\/ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,msmolens\/ITK,blowekamp\/ITK,eile\/ITK,itkvideo\/ITK,BlueBrain\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,BRAINSia\/ITK,LucasGandel\/ITK,thewtex\/ITK,paulnovo\/ITK,BlueBrain\/ITK,rhgong\/itk-with-dom,InsightSoftwareConsortium\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,hinerm\/ITK,BRAINSia\/ITK,msmolens\/ITK,spinicist\/ITK,msmolens\/ITK,PlutoniumHeart\/ITK,jmerkow\/ITK,paulnovo\/ITK,jmerkow\/ITK,GEHC-Surgery\/ITK,eile\/ITK,jcfr\/ITK,Kitware\/ITK,ajjl\/ITK,paulnovo\/ITK,zachary-williamson\/ITK,rhgong\/itk-with-dom,LucasGandel\/ITK,Kitware\/ITK,hjmjohnson\/ITK,thewtex\/ITK,hinerm\/ITK,thewtex\/ITK,cpatrick\/ITK-RemoteIO,LucasGandel\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,BRAINSia\/ITK,fedral\/ITK,stnava\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,stnava\/ITK,fbudin69500\/ITK,ajjl\/ITK,atsnyder\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,hinerm\/ITK,eile\/ITK,GEHC-Surgery\/ITK,heimdali\/ITK,BlueBrain\/ITK,CapeDrew\/DITK,CapeDrew\/DCMTK-ITK,itkvideo\/ITK,hendradarwin\/ITK,eile\/ITK,zachary-williamson\/ITK,stnava\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1664 $, $Date: 2005-05-29 05:06:45 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1665 $, $Date: 2005-05-30 05:06:42 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"46d7e93816becd5a2745ce31bfb4737b01230f9a","subject":"ENH: Version number update","message":"ENH: Version number update\n","repos":"malaterre\/ITK,eile\/ITK,stnava\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,CapeDrew\/DCMTK-ITK,hendradarwin\/ITK,jmerkow\/ITK,stnava\/ITK,hjmjohnson\/ITK,itkvideo\/ITK,vfonov\/ITK,LucasGandel\/ITK,vfonov\/ITK,LucHermitte\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,LucHermitte\/ITK,eile\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,blowekamp\/ITK,fedral\/ITK,jmerkow\/ITK,CapeDrew\/DCMTK-ITK,hinerm\/ITK,hendradarwin\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,fedral\/ITK,vfonov\/ITK,CapeDrew\/DITK,hinerm\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DCMTK-ITK,biotrump\/ITK,wkjeong\/ITK,stnava\/ITK,biotrump\/ITK,fedral\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,stnava\/ITK,msmolens\/ITK,blowekamp\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,fedral\/ITK,fuentesdt\/InsightToolkit-dev,hendradarwin\/ITK,itkvideo\/ITK,msmolens\/ITK,biotrump\/ITK,heimdali\/ITK,spinicist\/ITK,biotrump\/ITK,cpatrick\/ITK-RemoteIO,msmolens\/ITK,msmolens\/ITK,LucHermitte\/ITK,BlueBrain\/ITK,hinerm\/ITK,hendradarwin\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,zachary-williamson\/ITK,blowekamp\/ITK,jcfr\/ITK,vfonov\/ITK,thewtex\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,richardbeare\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,PlutoniumHeart\/ITK,LucasGandel\/ITK,LucasGandel\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,hinerm\/ITK,richardbeare\/ITK,richardbeare\/ITK,BRAINSia\/ITK,BRAINSia\/ITK,GEHC-Surgery\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,fedral\/ITK,thewtex\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,blowekamp\/ITK,msmolens\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DITK,BRAINSia\/ITK,blowekamp\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,jcfr\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,Kitware\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,wkjeong\/ITK,Kitware\/ITK,spinicist\/ITK,hjmjohnson\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,GEHC-Surgery\/ITK,fbudin69500\/ITK,InsightSoftwareConsortium\/ITK,wkjeong\/ITK,atsnyder\/ITK,jcfr\/ITK,jmerkow\/ITK,rhgong\/itk-with-dom,eile\/ITK,biotrump\/ITK,rhgong\/itk-with-dom,PlutoniumHeart\/ITK,paulnovo\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,stnava\/ITK,ajjl\/ITK,fedral\/ITK,jmerkow\/ITK,eile\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,jcfr\/ITK,fbudin69500\/ITK,wkjeong\/ITK,LucasGandel\/ITK,jcfr\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,paulnovo\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,malaterre\/ITK,thewtex\/ITK,malaterre\/ITK,BRAINSia\/ITK,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,hjmjohnson\/ITK,CapeDrew\/DCMTK-ITK,msmolens\/ITK,heimdali\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,paulnovo\/ITK,zachary-williamson\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,stnava\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,itkvideo\/ITK,spinicist\/ITK,stnava\/ITK,Kitware\/ITK,hjmjohnson\/ITK,Kitware\/ITK,spinicist\/ITK,paulnovo\/ITK,malaterre\/ITK,atsnyder\/ITK,biotrump\/ITK,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,fedral\/ITK,itkvideo\/ITK,LucasGandel\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,Kitware\/ITK,atsnyder\/ITK,LucasGandel\/ITK,msmolens\/ITK,ajjl\/ITK,LucHermitte\/ITK,eile\/ITK,heimdali\/ITK,blowekamp\/ITK,richardbeare\/ITK,wkjeong\/ITK,paulnovo\/ITK,hendradarwin\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,ajjl\/ITK,fbudin69500\/ITK,heimdali\/ITK,heimdali\/ITK,BlueBrain\/ITK,hjmjohnson\/ITK,vfonov\/ITK,spinicist\/ITK,hinerm\/ITK,LucasGandel\/ITK,ajjl\/ITK,vfonov\/ITK,GEHC-Surgery\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,stnava\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,paulnovo\/ITK,heimdali\/ITK,itkvideo\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,atsnyder\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,richardbeare\/ITK,CapeDrew\/DITK,vfonov\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,CapeDrew\/DITK,eile\/ITK,atsnyder\/ITK,BlueBrain\/ITK,ajjl\/ITK,atsnyder\/ITK,fuentesdt\/InsightToolkit-dev,jcfr\/ITK,BRAINSia\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,spinicist\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,atsnyder\/ITK,vfonov\/ITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DITK,blowekamp\/ITK,BlueBrain\/ITK,jmerkow\/ITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,biotrump\/ITK,spinicist\/ITK,hinerm\/ITK,CapeDrew\/DITK,jmerkow\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,spinicist\/ITK,paulnovo\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,itkvideo\/ITK,jcfr\/ITK,Kitware\/ITK,heimdali\/ITK,jmerkow\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,wkjeong\/ITK,thewtex\/ITK,atsnyder\/ITK,heimdali\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,wkjeong\/ITK,malaterre\/ITK,eile\/ITK,itkvideo\/ITK,thewtex\/ITK,BlueBrain\/ITK,jcfr\/ITK,malaterre\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,hinerm\/ITK,BlueBrain\/ITK,LucasGandel\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3224 $, $Date: 2009-11-26 02:55:12 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3225 $, $Date: 2009-11-27 02:55:08 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"ca511299cd5152e5bda56db47f02fc5728c60a86","subject":"Change long to size_t for LLP64 platforms","message":"Change long to size_t for LLP64 platforms\n\nOn Windows, `long` is imported as `Int32` rather than `Int`. Use `size_t` to ensure that `tag` is imported as `Int`.","repos":"glessard\/swift-atomics,glessard\/swift-atomics,glessard\/swift-atomics","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Sources\/CAtomics\/include\/CAtomics.h\n+++ Sources\/CAtomics\/include\/CAtomics.h\n@@ -293,14 +293,14 @@\n unionType tag_ptr; \\\n struct { \\\n pointerType nullability ptr; \\\n- long tag; \\\n+ size_t tag; \\\n }; \\\n } swiftType;\n \n #define CLANG_ATOMICS_TAGGED_POINTER_CREATE(swiftType, pointerType, nullability) \\\n static __inline__ __attribute__((__always_inline__)) \\\n SWIFT_NAME(swiftType.init(_:tag:)) \\\n- swiftType swiftType##Create(pointerType nullability p, long tag) \\\n+ swiftType swiftType##Create(pointerType nullability p, size_t tag) \\\n { swiftType s; s.tag = tag; s.ptr = p; return s; }\n \n #define CLANG_ATOMICS_TAGGED_POINTER_INCREMENT(swiftType, pointerType, nullability) \\\n"} {"commit":"bac38c9e7720feb460b6020d25282905e5cf8fc0","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"BlueBrain\/ITK,LucHermitte\/ITK,jmerkow\/ITK,LucasGandel\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,hendradarwin\/ITK,vfonov\/ITK,jcfr\/ITK,stnava\/ITK,rhgong\/itk-with-dom,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,jcfr\/ITK,malaterre\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,paulnovo\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,jcfr\/ITK,BlueBrain\/ITK,paulnovo\/ITK,itkvideo\/ITK,richardbeare\/ITK,CapeDrew\/DITK,stnava\/ITK,GEHC-Surgery\/ITK,heimdali\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,zachary-williamson\/ITK,ajjl\/ITK,eile\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,InsightSoftwareConsortium\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,LucHermitte\/ITK,CapeDrew\/DCMTK-ITK,LucHermitte\/ITK,itkvideo\/ITK,jmerkow\/ITK,jmerkow\/ITK,jmerkow\/ITK,thewtex\/ITK,msmolens\/ITK,richardbeare\/ITK,LucHermitte\/ITK,BlueBrain\/ITK,hinerm\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,hinerm\/ITK,BRAINSia\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,fedral\/ITK,CapeDrew\/DCMTK-ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,blowekamp\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,hendradarwin\/ITK,stnava\/ITK,Kitware\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,richardbeare\/ITK,jmerkow\/ITK,Kitware\/ITK,atsnyder\/ITK,InsightSoftwareConsortium\/ITK,vfonov\/ITK,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,CapeDrew\/DITK,PlutoniumHeart\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,atsnyder\/ITK,daviddoria\/itkHoughTransform,wkjeong\/ITK,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,BRAINSia\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,atsnyder\/ITK,blowekamp\/ITK,LucasGandel\/ITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,cpatrick\/ITK-RemoteIO,eile\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,jcfr\/ITK,malaterre\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,stnava\/ITK,vfonov\/ITK,hjmjohnson\/ITK,spinicist\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,hinerm\/ITK,richardbeare\/ITK,eile\/ITK,spinicist\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,paulnovo\/ITK,thewtex\/ITK,biotrump\/ITK,msmolens\/ITK,CapeDrew\/DITK,GEHC-Surgery\/ITK,zachary-williamson\/ITK,jcfr\/ITK,hinerm\/ITK,malaterre\/ITK,stnava\/ITK,fbudin69500\/ITK,cpatrick\/ITK-RemoteIO,eile\/ITK,thewtex\/ITK,CapeDrew\/DCMTK-ITK,wkjeong\/ITK,fbudin69500\/ITK,malaterre\/ITK,msmolens\/ITK,zachary-williamson\/ITK,GEHC-Surgery\/ITK,daviddoria\/itkHoughTransform,cpatrick\/ITK-RemoteIO,thewtex\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,heimdali\/ITK,biotrump\/ITK,hinerm\/ITK,heimdali\/ITK,CapeDrew\/DITK,Kitware\/ITK,heimdali\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,LucasGandel\/ITK,thewtex\/ITK,stnava\/ITK,jmerkow\/ITK,blowekamp\/ITK,atsnyder\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,malaterre\/ITK,jcfr\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,LucHermitte\/ITK,rhgong\/itk-with-dom,hjmjohnson\/ITK,ajjl\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,LucasGandel\/ITK,heimdali\/ITK,wkjeong\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,spinicist\/ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,paulnovo\/ITK,paulnovo\/ITK,daviddoria\/itkHoughTransform,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,blowekamp\/ITK,biotrump\/ITK,LucasGandel\/ITK,paulnovo\/ITK,fedral\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,BlueBrain\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,Kitware\/ITK,malaterre\/ITK,hinerm\/ITK,richardbeare\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,atsnyder\/ITK,itkvideo\/ITK,richardbeare\/ITK,stnava\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,blowekamp\/ITK,wkjeong\/ITK,vfonov\/ITK,hinerm\/ITK,rhgong\/itk-with-dom,blowekamp\/ITK,LucHermitte\/ITK,fedral\/ITK,vfonov\/ITK,Kitware\/ITK,fedral\/ITK,heimdali\/ITK,fbudin69500\/ITK,fedral\/ITK,eile\/ITK,spinicist\/ITK,heimdali\/ITK,ajjl\/ITK,hendradarwin\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,Kitware\/ITK,PlutoniumHeart\/ITK,LucHermitte\/ITK,atsnyder\/ITK,CapeDrew\/DITK,itkvideo\/ITK,GEHC-Surgery\/ITK,msmolens\/ITK,eile\/ITK,LucasGandel\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,itkvideo\/ITK,jmerkow\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,ajjl\/ITK,CapeDrew\/DCMTK-ITK,thewtex\/ITK,Kitware\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,zachary-williamson\/ITK,PlutoniumHeart\/ITK,spinicist\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,biotrump\/ITK,hendradarwin\/ITK,eile\/ITK,fedral\/ITK,jcfr\/ITK,biotrump\/ITK,ajjl\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,wkjeong\/ITK,hendradarwin\/ITK,fbudin69500\/ITK,hinerm\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,itkvideo\/ITK,msmolens\/ITK,BRAINSia\/ITK,BRAINSia\/ITK,spinicist\/ITK,hjmjohnson\/ITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,itkvideo\/ITK,fedral\/ITK,zachary-williamson\/ITK,spinicist\/ITK,vfonov\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1899 $, $Date: 2006-02-05 01:10:11 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1900 $, $Date: 2006-02-06 01:10:06 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"d771e3d9b1c8e0c6f1edd2f52ba7c23deb3f3cf7","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"InsightSoftwareConsortium\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,BlueBrain\/ITK,Kitware\/ITK,heimdali\/ITK,blowekamp\/ITK,vfonov\/ITK,jcfr\/ITK,spinicist\/ITK,PlutoniumHeart\/ITK,InsightSoftwareConsortium\/ITK,stnava\/ITK,atsnyder\/ITK,spinicist\/ITK,Kitware\/ITK,richardbeare\/ITK,malaterre\/ITK,thewtex\/ITK,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,rhgong\/itk-with-dom,fuentesdt\/InsightToolkit-dev,richardbeare\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,paulnovo\/ITK,atsnyder\/ITK,PlutoniumHeart\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,malaterre\/ITK,fbudin69500\/ITK,hinerm\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,malaterre\/ITK,biotrump\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,eile\/ITK,BlueBrain\/ITK,Kitware\/ITK,zachary-williamson\/ITK,eile\/ITK,CapeDrew\/DCMTK-ITK,wkjeong\/ITK,rhgong\/itk-with-dom,richardbeare\/ITK,vfonov\/ITK,jcfr\/ITK,LucHermitte\/ITK,BRAINSia\/ITK,stnava\/ITK,spinicist\/ITK,thewtex\/ITK,Kitware\/ITK,hjmjohnson\/ITK,PlutoniumHeart\/ITK,wkjeong\/ITK,fbudin69500\/ITK,Kitware\/ITK,eile\/ITK,rhgong\/itk-with-dom,daviddoria\/itkHoughTransform,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,wkjeong\/ITK,thewtex\/ITK,LucHermitte\/ITK,vfonov\/ITK,paulnovo\/ITK,CapeDrew\/DITK,fbudin69500\/ITK,richardbeare\/ITK,itkvideo\/ITK,hinerm\/ITK,vfonov\/ITK,LucasGandel\/ITK,CapeDrew\/DITK,eile\/ITK,itkvideo\/ITK,BRAINSia\/ITK,atsnyder\/ITK,biotrump\/ITK,heimdali\/ITK,jcfr\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,malaterre\/ITK,atsnyder\/ITK,jmerkow\/ITK,malaterre\/ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,atsnyder\/ITK,biotrump\/ITK,biotrump\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,thewtex\/ITK,paulnovo\/ITK,hjmjohnson\/ITK,zachary-williamson\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,LucHermitte\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,paulnovo\/ITK,fedral\/ITK,BlueBrain\/ITK,PlutoniumHeart\/ITK,jmerkow\/ITK,CapeDrew\/DITK,malaterre\/ITK,fbudin69500\/ITK,LucHermitte\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,jmerkow\/ITK,malaterre\/ITK,jmerkow\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK,stnava\/ITK,msmolens\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,cpatrick\/ITK-RemoteIO,stnava\/ITK,BlueBrain\/ITK,jcfr\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,LucHermitte\/ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,GEHC-Surgery\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,biotrump\/ITK,GEHC-Surgery\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,BlueBrain\/ITK,fbudin69500\/ITK,itkvideo\/ITK,rhgong\/itk-with-dom,hendradarwin\/ITK,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,blowekamp\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,atsnyder\/ITK,ajjl\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,jcfr\/ITK,heimdali\/ITK,zachary-williamson\/ITK,ajjl\/ITK,heimdali\/ITK,itkvideo\/ITK,LucasGandel\/ITK,msmolens\/ITK,hinerm\/ITK,msmolens\/ITK,hendradarwin\/ITK,daviddoria\/itkHoughTransform,biotrump\/ITK,zachary-williamson\/ITK,thewtex\/ITK,richardbeare\/ITK,paulnovo\/ITK,stnava\/ITK,Kitware\/ITK,ajjl\/ITK,fuentesdt\/InsightToolkit-dev,Kitware\/ITK,eile\/ITK,wkjeong\/ITK,heimdali\/ITK,paulnovo\/ITK,LucHermitte\/ITK,heimdali\/ITK,ajjl\/ITK,zachary-williamson\/ITK,hinerm\/ITK,jcfr\/ITK,blowekamp\/ITK,CapeDrew\/DCMTK-ITK,vfonov\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,hendradarwin\/ITK,msmolens\/ITK,LucasGandel\/ITK,ajjl\/ITK,stnava\/ITK,jmerkow\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,paulnovo\/ITK,itkvideo\/ITK,wkjeong\/ITK,InsightSoftwareConsortium\/ITK,msmolens\/ITK,blowekamp\/ITK,jmerkow\/ITK,itkvideo\/ITK,spinicist\/ITK,jmerkow\/ITK,zachary-williamson\/ITK,wkjeong\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,fedral\/ITK,BlueBrain\/ITK,hinerm\/ITK,blowekamp\/ITK,hinerm\/ITK,richardbeare\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,hendradarwin\/ITK,hjmjohnson\/ITK,hjmjohnson\/ITK,vfonov\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,ajjl\/ITK,eile\/ITK,vfonov\/ITK,atsnyder\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,vfonov\/ITK,PlutoniumHeart\/ITK,GEHC-Surgery\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,CapeDrew\/DITK,fedral\/ITK,eile\/ITK,fedral\/ITK,blowekamp\/ITK,itkvideo\/ITK,LucasGandel\/ITK,eile\/ITK,malaterre\/ITK,vfonov\/ITK,LucasGandel\/ITK,jcfr\/ITK,CapeDrew\/DCMTK-ITK,BRAINSia\/ITK,msmolens\/ITK,BRAINSia\/ITK,fuentesdt\/InsightToolkit-dev,CapeDrew\/DITK,LucHermitte\/ITK,LucHermitte\/ITK,spinicist\/ITK,eile\/ITK,fedral\/ITK,spinicist\/ITK,LucasGandel\/ITK,BRAINSia\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,InsightSoftwareConsortium\/ITK,jmerkow\/ITK,CapeDrew\/DITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,malaterre\/ITK,zachary-williamson\/ITK,fedral\/ITK,fbudin69500\/ITK,stnava\/ITK,hendradarwin\/ITK,atsnyder\/ITK,thewtex\/ITK,hinerm\/ITK,atsnyder\/ITK,stnava\/ITK,ajjl\/ITK,msmolens\/ITK,stnava\/ITK,hinerm\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1754 $, $Date: 2005-09-02 05:05:53 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1755 $, $Date: 2005-09-03 05:05:49 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"2dacf505f009538f4b2236ca7b5248490b2ff7c5","subject":"ENH: Version number update","message":"ENH: Version number update\n","repos":"msmolens\/ITK,zachary-williamson\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,hinerm\/ITK,hjmjohnson\/ITK,jcfr\/ITK,wkjeong\/ITK,LucasGandel\/ITK,fbudin69500\/ITK,heimdali\/ITK,biotrump\/ITK,zachary-williamson\/ITK,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,biotrump\/ITK,msmolens\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,BlueBrain\/ITK,BlueBrain\/ITK,atsnyder\/ITK,LucasGandel\/ITK,ajjl\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,cpatrick\/ITK-RemoteIO,jmerkow\/ITK,msmolens\/ITK,ajjl\/ITK,BRAINSia\/ITK,fedral\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,fbudin69500\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,InsightSoftwareConsortium\/ITK,BRAINSia\/ITK,msmolens\/ITK,atsnyder\/ITK,BRAINSia\/ITK,spinicist\/ITK,LucHermitte\/ITK,Kitware\/ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,fbudin69500\/ITK,malaterre\/ITK,LucHermitte\/ITK,GEHC-Surgery\/ITK,paulnovo\/ITK,ajjl\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,daviddoria\/itkHoughTransform,vfonov\/ITK,hendradarwin\/ITK,richardbeare\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DITK,CapeDrew\/DITK,atsnyder\/ITK,hjmjohnson\/ITK,CapeDrew\/DCMTK-ITK,fbudin69500\/ITK,PlutoniumHeart\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,fbudin69500\/ITK,stnava\/ITK,hendradarwin\/ITK,CapeDrew\/DITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,blowekamp\/ITK,daviddoria\/itkHoughTransform,spinicist\/ITK,heimdali\/ITK,LucasGandel\/ITK,itkvideo\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DITK,biotrump\/ITK,paulnovo\/ITK,richardbeare\/ITK,stnava\/ITK,atsnyder\/ITK,paulnovo\/ITK,paulnovo\/ITK,spinicist\/ITK,GEHC-Surgery\/ITK,hendradarwin\/ITK,eile\/ITK,itkvideo\/ITK,vfonov\/ITK,itkvideo\/ITK,hinerm\/ITK,paulnovo\/ITK,cpatrick\/ITK-RemoteIO,BlueBrain\/ITK,BlueBrain\/ITK,malaterre\/ITK,vfonov\/ITK,fedral\/ITK,spinicist\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,wkjeong\/ITK,fuentesdt\/InsightToolkit-dev,heimdali\/ITK,wkjeong\/ITK,fuentesdt\/InsightToolkit-dev,atsnyder\/ITK,malaterre\/ITK,jcfr\/ITK,CapeDrew\/DCMTK-ITK,hjmjohnson\/ITK,heimdali\/ITK,jmerkow\/ITK,wkjeong\/ITK,CapeDrew\/DITK,Kitware\/ITK,jcfr\/ITK,zachary-williamson\/ITK,thewtex\/ITK,heimdali\/ITK,fuentesdt\/InsightToolkit-dev,itkvideo\/ITK,hinerm\/ITK,Kitware\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,BRAINSia\/ITK,fedral\/ITK,InsightSoftwareConsortium\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,hjmjohnson\/ITK,hinerm\/ITK,hendradarwin\/ITK,vfonov\/ITK,GEHC-Surgery\/ITK,spinicist\/ITK,atsnyder\/ITK,eile\/ITK,stnava\/ITK,spinicist\/ITK,BlueBrain\/ITK,Kitware\/ITK,richardbeare\/ITK,BRAINSia\/ITK,BRAINSia\/ITK,LucHermitte\/ITK,malaterre\/ITK,biotrump\/ITK,blowekamp\/ITK,thewtex\/ITK,vfonov\/ITK,eile\/ITK,hinerm\/ITK,ajjl\/ITK,hinerm\/ITK,zachary-williamson\/ITK,CapeDrew\/DITK,zachary-williamson\/ITK,jcfr\/ITK,msmolens\/ITK,InsightSoftwareConsortium\/ITK,jmerkow\/ITK,thewtex\/ITK,jmerkow\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,heimdali\/ITK,eile\/ITK,spinicist\/ITK,LucasGandel\/ITK,hendradarwin\/ITK,paulnovo\/ITK,fedral\/ITK,atsnyder\/ITK,itkvideo\/ITK,jcfr\/ITK,vfonov\/ITK,LucasGandel\/ITK,heimdali\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,eile\/ITK,rhgong\/itk-with-dom,BlueBrain\/ITK,blowekamp\/ITK,hjmjohnson\/ITK,LucasGandel\/ITK,spinicist\/ITK,msmolens\/ITK,vfonov\/ITK,fbudin69500\/ITK,blowekamp\/ITK,biotrump\/ITK,rhgong\/itk-with-dom,eile\/ITK,msmolens\/ITK,jmerkow\/ITK,malaterre\/ITK,wkjeong\/ITK,CapeDrew\/DCMTK-ITK,GEHC-Surgery\/ITK,fedral\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,malaterre\/ITK,ajjl\/ITK,richardbeare\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,wkjeong\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,malaterre\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,heimdali\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,malaterre\/ITK,msmolens\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,PlutoniumHeart\/ITK,itkvideo\/ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,rhgong\/itk-with-dom,CapeDrew\/DITK,Kitware\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,LucasGandel\/ITK,LucHermitte\/ITK,Kitware\/ITK,blowekamp\/ITK,LucasGandel\/ITK,hjmjohnson\/ITK,fedral\/ITK,stnava\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,jmerkow\/ITK,stnava\/ITK,spinicist\/ITK,Kitware\/ITK,LucHermitte\/ITK,jcfr\/ITK,CapeDrew\/DITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,biotrump\/ITK,LucHermitte\/ITK,hendradarwin\/ITK,biotrump\/ITK,fbudin69500\/ITK,fbudin69500\/ITK,jcfr\/ITK,blowekamp\/ITK,paulnovo\/ITK,fuentesdt\/InsightToolkit-dev,stnava\/ITK,itkvideo\/ITK,rhgong\/itk-with-dom,GEHC-Surgery\/ITK,eile\/ITK,rhgong\/itk-with-dom,fuentesdt\/InsightToolkit-dev,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,blowekamp\/ITK,atsnyder\/ITK,jmerkow\/ITK,blowekamp\/ITK,hjmjohnson\/ITK,hinerm\/ITK,PlutoniumHeart\/ITK,PlutoniumHeart\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,CapeDrew\/DITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3355 $, $Date: 2010-04-07 02:00:06 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.3356 $, $Date: 2010-04-08 02:00:11 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"9d7b80d62f99e645a587963a1891a097ed3bacd5","subject":"Nightly version","message":"Nightly version\n","repos":"GEHC-Surgery\/ITK,eile\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,LucasGandel\/ITK,cpatrick\/ITK-RemoteIO,BRAINSia\/ITK,fbudin69500\/ITK,fedral\/ITK,msmolens\/ITK,ajjl\/ITK,LucHermitte\/ITK,BRAINSia\/ITK,daviddoria\/itkHoughTransform,Kitware\/ITK,wkjeong\/ITK,jcfr\/ITK,LucHermitte\/ITK,daviddoria\/itkHoughTransform,CapeDrew\/DITK,BlueBrain\/ITK,fedral\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,Kitware\/ITK,hendradarwin\/ITK,BlueBrain\/ITK,daviddoria\/itkHoughTransform,msmolens\/ITK,CapeDrew\/DITK,jcfr\/ITK,PlutoniumHeart\/ITK,malaterre\/ITK,richardbeare\/ITK,vfonov\/ITK,thewtex\/ITK,zachary-williamson\/ITK,hendradarwin\/ITK,atsnyder\/ITK,fedral\/ITK,cpatrick\/ITK-RemoteIO,jmerkow\/ITK,BRAINSia\/ITK,paulnovo\/ITK,spinicist\/ITK,heimdali\/ITK,GEHC-Surgery\/ITK,BRAINSia\/ITK,itkvideo\/ITK,eile\/ITK,vfonov\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,wkjeong\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,heimdali\/ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,rhgong\/itk-with-dom,hinerm\/ITK,paulnovo\/ITK,hjmjohnson\/ITK,wkjeong\/ITK,Kitware\/ITK,LucHermitte\/ITK,richardbeare\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,PlutoniumHeart\/ITK,fedral\/ITK,itkvideo\/ITK,jcfr\/ITK,itkvideo\/ITK,LucHermitte\/ITK,paulnovo\/ITK,thewtex\/ITK,rhgong\/itk-with-dom,atsnyder\/ITK,jmerkow\/ITK,fedral\/ITK,biotrump\/ITK,BlueBrain\/ITK,biotrump\/ITK,PlutoniumHeart\/ITK,blowekamp\/ITK,spinicist\/ITK,blowekamp\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,BRAINSia\/ITK,blowekamp\/ITK,stnava\/ITK,hjmjohnson\/ITK,malaterre\/ITK,hjmjohnson\/ITK,paulnovo\/ITK,hinerm\/ITK,hinerm\/ITK,jcfr\/ITK,paulnovo\/ITK,fbudin69500\/ITK,wkjeong\/ITK,itkvideo\/ITK,cpatrick\/ITK-RemoteIO,Kitware\/ITK,heimdali\/ITK,jmerkow\/ITK,fuentesdt\/InsightToolkit-dev,fedral\/ITK,LucHermitte\/ITK,itkvideo\/ITK,jmerkow\/ITK,jmerkow\/ITK,hinerm\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,InsightSoftwareConsortium\/ITK,thewtex\/ITK,CapeDrew\/DCMTK-ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,GEHC-Surgery\/ITK,itkvideo\/ITK,LucasGandel\/ITK,malaterre\/ITK,biotrump\/ITK,eile\/ITK,heimdali\/ITK,PlutoniumHeart\/ITK,BlueBrain\/ITK,CapeDrew\/DCMTK-ITK,heimdali\/ITK,biotrump\/ITK,zachary-williamson\/ITK,eile\/ITK,atsnyder\/ITK,hjmjohnson\/ITK,fuentesdt\/InsightToolkit-dev,fbudin69500\/ITK,Kitware\/ITK,msmolens\/ITK,thewtex\/ITK,eile\/ITK,blowekamp\/ITK,fbudin69500\/ITK,LucHermitte\/ITK,atsnyder\/ITK,wkjeong\/ITK,vfonov\/ITK,hendradarwin\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,vfonov\/ITK,atsnyder\/ITK,stnava\/ITK,fbudin69500\/ITK,CapeDrew\/DITK,blowekamp\/ITK,CapeDrew\/DITK,ajjl\/ITK,spinicist\/ITK,heimdali\/ITK,BRAINSia\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,ajjl\/ITK,BlueBrain\/ITK,GEHC-Surgery\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,blowekamp\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,malaterre\/ITK,LucasGandel\/ITK,richardbeare\/ITK,atsnyder\/ITK,rhgong\/itk-with-dom,BlueBrain\/ITK,zachary-williamson\/ITK,stnava\/ITK,malaterre\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,hendradarwin\/ITK,vfonov\/ITK,InsightSoftwareConsortium\/ITK,biotrump\/ITK,jcfr\/ITK,fedral\/ITK,atsnyder\/ITK,CapeDrew\/DITK,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,fuentesdt\/InsightToolkit-dev,hendradarwin\/ITK,LucHermitte\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,malaterre\/ITK,stnava\/ITK,heimdali\/ITK,itkvideo\/ITK,fuentesdt\/InsightToolkit-dev,PlutoniumHeart\/ITK,wkjeong\/ITK,CapeDrew\/DITK,msmolens\/ITK,LucasGandel\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DCMTK-ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,ajjl\/ITK,zachary-williamson\/ITK,jcfr\/ITK,spinicist\/ITK,vfonov\/ITK,zachary-williamson\/ITK,malaterre\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,msmolens\/ITK,heimdali\/ITK,hinerm\/ITK,biotrump\/ITK,eile\/ITK,richardbeare\/ITK,jcfr\/ITK,atsnyder\/ITK,fbudin69500\/ITK,atsnyder\/ITK,richardbeare\/ITK,daviddoria\/itkHoughTransform,LucasGandel\/ITK,spinicist\/ITK,ajjl\/ITK,ajjl\/ITK,blowekamp\/ITK,stnava\/ITK,richardbeare\/ITK,hendradarwin\/ITK,cpatrick\/ITK-RemoteIO,rhgong\/itk-with-dom,itkvideo\/ITK,thewtex\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,hjmjohnson\/ITK,fbudin69500\/ITK,stnava\/ITK,hinerm\/ITK,daviddoria\/itkHoughTransform,InsightSoftwareConsortium\/ITK,wkjeong\/ITK,hjmjohnson\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,zachary-williamson\/ITK,msmolens\/ITK,CapeDrew\/DCMTK-ITK,stnava\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,CapeDrew\/DITK,stnava\/ITK,daviddoria\/itkHoughTransform,jmerkow\/ITK,jmerkow\/ITK,GEHC-Surgery\/ITK,spinicist\/ITK,rhgong\/itk-with-dom,eile\/ITK,ajjl\/ITK,BRAINSia\/ITK,zachary-williamson\/ITK,malaterre\/ITK,vfonov\/ITK,Kitware\/ITK,LucasGandel\/ITK,BlueBrain\/ITK,hinerm\/ITK,msmolens\/ITK,hendradarwin\/ITK,CapeDrew\/DCMTK-ITK,eile\/ITK,blowekamp\/ITK,biotrump\/ITK,CapeDrew\/DITK,paulnovo\/ITK,Kitware\/ITK,hendradarwin\/ITK,biotrump\/ITK,stnava\/ITK,CapeDrew\/DITK,paulnovo\/ITK,spinicist\/ITK,vfonov\/ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.933 $, $Date: 2003-05-14 05:10:10 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.934 $, $Date: 2003-05-15 05:10:08 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"ebdce5c9630e3c9c8ff56902adf0e7435dd3bed2","subject":"ENH: Nightly version","message":"ENH: Nightly version\n","repos":"itkvideo\/ITK,jcfr\/ITK,paulnovo\/ITK,biotrump\/ITK,thewtex\/ITK,biotrump\/ITK,wkjeong\/ITK,BRAINSia\/ITK,blowekamp\/ITK,PlutoniumHeart\/ITK,msmolens\/ITK,ajjl\/ITK,cpatrick\/ITK-RemoteIO,PlutoniumHeart\/ITK,blowekamp\/ITK,PlutoniumHeart\/ITK,Kitware\/ITK,msmolens\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,heimdali\/ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,hinerm\/ITK,heimdali\/ITK,jmerkow\/ITK,GEHC-Surgery\/ITK,wkjeong\/ITK,malaterre\/ITK,biotrump\/ITK,paulnovo\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,LucHermitte\/ITK,fedral\/ITK,jcfr\/ITK,ajjl\/ITK,stnava\/ITK,fedral\/ITK,Kitware\/ITK,LucasGandel\/ITK,paulnovo\/ITK,richardbeare\/ITK,rhgong\/itk-with-dom,hinerm\/ITK,hendradarwin\/ITK,stnava\/ITK,CapeDrew\/DITK,richardbeare\/ITK,jcfr\/ITK,fedral\/ITK,eile\/ITK,LucasGandel\/ITK,BlueBrain\/ITK,hinerm\/ITK,GEHC-Surgery\/ITK,atsnyder\/ITK,itkvideo\/ITK,daviddoria\/itkHoughTransform,vfonov\/ITK,malaterre\/ITK,rhgong\/itk-with-dom,PlutoniumHeart\/ITK,BRAINSia\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,zachary-williamson\/ITK,thewtex\/ITK,spinicist\/ITK,Kitware\/ITK,CapeDrew\/DCMTK-ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,malaterre\/ITK,PlutoniumHeart\/ITK,LucasGandel\/ITK,msmolens\/ITK,atsnyder\/ITK,fbudin69500\/ITK,fedral\/ITK,atsnyder\/ITK,hendradarwin\/ITK,itkvideo\/ITK,jcfr\/ITK,GEHC-Surgery\/ITK,jmerkow\/ITK,blowekamp\/ITK,fbudin69500\/ITK,hinerm\/ITK,blowekamp\/ITK,CapeDrew\/DITK,InsightSoftwareConsortium\/ITK,itkvideo\/ITK,eile\/ITK,hjmjohnson\/ITK,vfonov\/ITK,heimdali\/ITK,fbudin69500\/ITK,richardbeare\/ITK,PlutoniumHeart\/ITK,paulnovo\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DCMTK-ITK,vfonov\/ITK,atsnyder\/ITK,BRAINSia\/ITK,jcfr\/ITK,fuentesdt\/InsightToolkit-dev,biotrump\/ITK,itkvideo\/ITK,hjmjohnson\/ITK,stnava\/ITK,CapeDrew\/DITK,daviddoria\/itkHoughTransform,fedral\/ITK,ajjl\/ITK,PlutoniumHeart\/ITK,fbudin69500\/ITK,msmolens\/ITK,blowekamp\/ITK,spinicist\/ITK,zachary-williamson\/ITK,hendradarwin\/ITK,jmerkow\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,rhgong\/itk-with-dom,malaterre\/ITK,LucHermitte\/ITK,zachary-williamson\/ITK,eile\/ITK,stnava\/ITK,eile\/ITK,fuentesdt\/InsightToolkit-dev,hinerm\/ITK,jmerkow\/ITK,richardbeare\/ITK,fuentesdt\/InsightToolkit-dev,spinicist\/ITK,BlueBrain\/ITK,heimdali\/ITK,zachary-williamson\/ITK,jmerkow\/ITK,paulnovo\/ITK,fbudin69500\/ITK,msmolens\/ITK,hinerm\/ITK,BRAINSia\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,atsnyder\/ITK,thewtex\/ITK,PlutoniumHeart\/ITK,heimdali\/ITK,ajjl\/ITK,InsightSoftwareConsortium\/ITK,eile\/ITK,GEHC-Surgery\/ITK,GEHC-Surgery\/ITK,biotrump\/ITK,blowekamp\/ITK,thewtex\/ITK,stnava\/ITK,BlueBrain\/ITK,hendradarwin\/ITK,malaterre\/ITK,LucHermitte\/ITK,wkjeong\/ITK,richardbeare\/ITK,paulnovo\/ITK,hinerm\/ITK,vfonov\/ITK,daviddoria\/itkHoughTransform,thewtex\/ITK,vfonov\/ITK,spinicist\/ITK,BRAINSia\/ITK,rhgong\/itk-with-dom,richardbeare\/ITK,hjmjohnson\/ITK,fbudin69500\/ITK,wkjeong\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DCMTK-ITK,biotrump\/ITK,spinicist\/ITK,BRAINSia\/ITK,InsightSoftwareConsortium\/ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,stnava\/ITK,spinicist\/ITK,fbudin69500\/ITK,wkjeong\/ITK,wkjeong\/ITK,ajjl\/ITK,BlueBrain\/ITK,hjmjohnson\/ITK,eile\/ITK,jmerkow\/ITK,msmolens\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,biotrump\/ITK,daviddoria\/itkHoughTransform,GEHC-Surgery\/ITK,LucasGandel\/ITK,InsightSoftwareConsortium\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,fedral\/ITK,hinerm\/ITK,jmerkow\/ITK,rhgong\/itk-with-dom,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,LucHermitte\/ITK,LucasGandel\/ITK,ajjl\/ITK,itkvideo\/ITK,stnava\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,blowekamp\/ITK,atsnyder\/ITK,stnava\/ITK,InsightSoftwareConsortium\/ITK,richardbeare\/ITK,blowekamp\/ITK,cpatrick\/ITK-RemoteIO,hendradarwin\/ITK,zachary-williamson\/ITK,vfonov\/ITK,itkvideo\/ITK,InsightSoftwareConsortium\/ITK,jmerkow\/ITK,heimdali\/ITK,CapeDrew\/DCMTK-ITK,spinicist\/ITK,eile\/ITK,ajjl\/ITK,LucasGandel\/ITK,hinerm\/ITK,wkjeong\/ITK,paulnovo\/ITK,vfonov\/ITK,CapeDrew\/DITK,vfonov\/ITK,stnava\/ITK,Kitware\/ITK,zachary-williamson\/ITK,heimdali\/ITK,BlueBrain\/ITK,BlueBrain\/ITK,fedral\/ITK,CapeDrew\/DCMTK-ITK,LucasGandel\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,CapeDrew\/DITK,malaterre\/ITK,hjmjohnson\/ITK,heimdali\/ITK,vfonov\/ITK,jcfr\/ITK,fbudin69500\/ITK,hjmjohnson\/ITK,malaterre\/ITK,CapeDrew\/DITK,BRAINSia\/ITK,fedral\/ITK,itkvideo\/ITK,thewtex\/ITK,malaterre\/ITK,itkvideo\/ITK,msmolens\/ITK,zachary-williamson\/ITK,Kitware\/ITK,Kitware\/ITK,atsnyder\/ITK,CapeDrew\/DITK,spinicist\/ITK,daviddoria\/itkHoughTransform,hendradarwin\/ITK,cpatrick\/ITK-RemoteIO,atsnyder\/ITK,ajjl\/ITK,CapeDrew\/DCMTK-ITK,LucHermitte\/ITK,jcfr\/ITK,zachary-williamson\/ITK,rhgong\/itk-with-dom,biotrump\/ITK,msmolens\/ITK,paulnovo\/ITK,thewtex\/ITK,daviddoria\/itkHoughTransform,hendradarwin\/ITK,eile\/ITK,cpatrick\/ITK-RemoteIO,zachary-williamson\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,Kitware\/ITK,CapeDrew\/DITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,CapeDrew\/DITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1958 $, $Date: 2006-04-09 00:09:55 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.1959 $, $Date: 2006-04-10 00:09:55 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"5323e7773b94dd69f01fe5a263c7d1e6b7a9533c","subject":"ENH: Version number update","message":"ENH: Version number update\n","repos":"hendradarwin\/ITK,PlutoniumHeart\/ITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,PlutoniumHeart\/ITK,CapeDrew\/DITK,hendradarwin\/ITK,PlutoniumHeart\/ITK,Kitware\/ITK,BlueBrain\/ITK,BRAINSia\/ITK,BRAINSia\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DITK,LucHermitte\/ITK,vfonov\/ITK,GEHC-Surgery\/ITK,stnava\/ITK,blowekamp\/ITK,heimdali\/ITK,fbudin69500\/ITK,richardbeare\/ITK,CapeDrew\/DCMTK-ITK,BlueBrain\/ITK,rhgong\/itk-with-dom,zachary-williamson\/ITK,jcfr\/ITK,daviddoria\/itkHoughTransform,hendradarwin\/ITK,InsightSoftwareConsortium\/ITK,jcfr\/ITK,vfonov\/ITK,msmolens\/ITK,LucasGandel\/ITK,CapeDrew\/DCMTK-ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,rhgong\/itk-with-dom,LucHermitte\/ITK,wkjeong\/ITK,stnava\/ITK,paulnovo\/ITK,hinerm\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,itkvideo\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,cpatrick\/ITK-RemoteIO,daviddoria\/itkHoughTransform,ajjl\/ITK,fuentesdt\/InsightToolkit-dev,GEHC-Surgery\/ITK,Kitware\/ITK,jcfr\/ITK,paulnovo\/ITK,msmolens\/ITK,LucasGandel\/ITK,ajjl\/ITK,richardbeare\/ITK,hinerm\/ITK,eile\/ITK,jmerkow\/ITK,fbudin69500\/ITK,malaterre\/ITK,InsightSoftwareConsortium\/ITK,spinicist\/ITK,fbudin69500\/ITK,InsightSoftwareConsortium\/ITK,atsnyder\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,CapeDrew\/DITK,Kitware\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,jmerkow\/ITK,LucHermitte\/ITK,Kitware\/ITK,blowekamp\/ITK,spinicist\/ITK,stnava\/ITK,CapeDrew\/DITK,biotrump\/ITK,eile\/ITK,paulnovo\/ITK,richardbeare\/ITK,spinicist\/ITK,fuentesdt\/InsightToolkit-dev,BlueBrain\/ITK,fbudin69500\/ITK,eile\/ITK,LucasGandel\/ITK,hjmjohnson\/ITK,daviddoria\/itkHoughTransform,daviddoria\/itkHoughTransform,biotrump\/ITK,jmerkow\/ITK,LucasGandel\/ITK,msmolens\/ITK,fedral\/ITK,thewtex\/ITK,fedral\/ITK,blowekamp\/ITK,richardbeare\/ITK,atsnyder\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,ajjl\/ITK,spinicist\/ITK,daviddoria\/itkHoughTransform,zachary-williamson\/ITK,hinerm\/ITK,biotrump\/ITK,heimdali\/ITK,ajjl\/ITK,msmolens\/ITK,hendradarwin\/ITK,heimdali\/ITK,biotrump\/ITK,ajjl\/ITK,paulnovo\/ITK,GEHC-Surgery\/ITK,PlutoniumHeart\/ITK,atsnyder\/ITK,hendradarwin\/ITK,thewtex\/ITK,atsnyder\/ITK,richardbeare\/ITK,LucHermitte\/ITK,atsnyder\/ITK,BRAINSia\/ITK,thewtex\/ITK,paulnovo\/ITK,msmolens\/ITK,jcfr\/ITK,BlueBrain\/ITK,LucasGandel\/ITK,PlutoniumHeart\/ITK,hinerm\/ITK,itkvideo\/ITK,CapeDrew\/DITK,msmolens\/ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,itkvideo\/ITK,vfonov\/ITK,cpatrick\/ITK-RemoteIO,biotrump\/ITK,malaterre\/ITK,Kitware\/ITK,BlueBrain\/ITK,wkjeong\/ITK,jmerkow\/ITK,hjmjohnson\/ITK,BlueBrain\/ITK,blowekamp\/ITK,hendradarwin\/ITK,spinicist\/ITK,jcfr\/ITK,fbudin69500\/ITK,heimdali\/ITK,rhgong\/itk-with-dom,rhgong\/itk-with-dom,zachary-williamson\/ITK,atsnyder\/ITK,heimdali\/ITK,wkjeong\/ITK,jmerkow\/ITK,jmerkow\/ITK,hinerm\/ITK,fbudin69500\/ITK,CapeDrew\/DCMTK-ITK,fuentesdt\/InsightToolkit-dev,blowekamp\/ITK,LucasGandel\/ITK,vfonov\/ITK,rhgong\/itk-with-dom,eile\/ITK,spinicist\/ITK,hendradarwin\/ITK,LucasGandel\/ITK,itkvideo\/ITK,eile\/ITK,LucHermitte\/ITK,thewtex\/ITK,hjmjohnson\/ITK,LucHermitte\/ITK,cpatrick\/ITK-RemoteIO,eile\/ITK,paulnovo\/ITK,atsnyder\/ITK,zachary-williamson\/ITK,itkvideo\/ITK,stnava\/ITK,malaterre\/ITK,spinicist\/ITK,heimdali\/ITK,blowekamp\/ITK,hjmjohnson\/ITK,fedral\/ITK,jcfr\/ITK,Kitware\/ITK,PlutoniumHeart\/ITK,PlutoniumHeart\/ITK,biotrump\/ITK,InsightSoftwareConsortium\/ITK,heimdali\/ITK,paulnovo\/ITK,stnava\/ITK,cpatrick\/ITK-RemoteIO,fedral\/ITK,thewtex\/ITK,itkvideo\/ITK,msmolens\/ITK,LucasGandel\/ITK,rhgong\/itk-with-dom,itkvideo\/ITK,vfonov\/ITK,BlueBrain\/ITK,vfonov\/ITK,fbudin69500\/ITK,GEHC-Surgery\/ITK,CapeDrew\/DCMTK-ITK,paulnovo\/ITK,richardbeare\/ITK,stnava\/ITK,hinerm\/ITK,biotrump\/ITK,fuentesdt\/InsightToolkit-dev,thewtex\/ITK,PlutoniumHeart\/ITK,jmerkow\/ITK,InsightSoftwareConsortium\/ITK,wkjeong\/ITK,CapeDrew\/DITK,vfonov\/ITK,hinerm\/ITK,fedral\/ITK,hjmjohnson\/ITK,blowekamp\/ITK,fedral\/ITK,rhgong\/itk-with-dom,ajjl\/ITK,hendradarwin\/ITK,itkvideo\/ITK,wkjeong\/ITK,malaterre\/ITK,blowekamp\/ITK,hinerm\/ITK,heimdali\/ITK,eile\/ITK,stnava\/ITK,BRAINSia\/ITK,jcfr\/ITK,hjmjohnson\/ITK,richardbeare\/ITK,spinicist\/ITK,InsightSoftwareConsortium\/ITK,CapeDrew\/DITK,eile\/ITK,spinicist\/ITK,InsightSoftwareConsortium\/ITK,hinerm\/ITK,CapeDrew\/DITK,stnava\/ITK,zachary-williamson\/ITK,atsnyder\/ITK,eile\/ITK,daviddoria\/itkHoughTransform,ajjl\/ITK,atsnyder\/ITK,rhgong\/itk-with-dom,BRAINSia\/ITK,fuentesdt\/InsightToolkit-dev,daviddoria\/itkHoughTransform,BRAINSia\/ITK,Kitware\/ITK,biotrump\/ITK,malaterre\/ITK,LucHermitte\/ITK,ajjl\/ITK,GEHC-Surgery\/ITK,msmolens\/ITK,jcfr\/ITK,wkjeong\/ITK,thewtex\/ITK,GEHC-Surgery\/ITK,cpatrick\/ITK-RemoteIO,GEHC-Surgery\/ITK,vfonov\/ITK,fuentesdt\/InsightToolkit-dev,fuentesdt\/InsightToolkit-dev,zachary-williamson\/ITK,CapeDrew\/DCMTK-ITK,fedral\/ITK,LucHermitte\/ITK,malaterre\/ITK,itkvideo\/ITK,BRAINSia\/ITK,malaterre\/ITK,CapeDrew\/DCMTK-ITK,malaterre\/ITK,BlueBrain\/ITK,cpatrick\/ITK-RemoteIO,wkjeong\/ITK,CapeDrew\/DITK,CapeDrew\/DCMTK-ITK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/itkVersion.h\n+++ Code\/Common\/itkVersion.h\n@@ -28,7 +28,7 @@\n #define ITK_VERSION ITK_VERSION_TO_STRING(ITK_VERSION_MAJOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_MINOR) \".\" \\\n ITK_VERSION_TO_STRING(ITK_VERSION_PATCH)\n-#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2637 $, $Date: 2008-04-07 01:56:03 $ (GMT)\"\n+#define ITK_SOURCE_VERSION \"itk version \" ITK_VERSION \", itk source $Revision: 1.2638 $, $Date: 2008-04-08 01:55:56 $ (GMT)\"\n \n namespace itk\n {\n"} {"commit":"68f9585b96c6f79b55a3cb32c531f3cd241fd7e8","subject":"Fix jobqueue's return value handling in jerry-main's repl mode (#1807)","message":"Fix jobqueue's return value handling in jerry-main's repl mode (#1807)\n\nJerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu","repos":"zherczeg\/jerryscript,jerryscript-project\/jerryscript,glistening\/jerryscript,bsdelf\/jerryscript,yichoi\/jerryscript,jerryscript-project\/jerryscript,jack60504\/jerryscript,bsdelf\/jerryscript,jack60504\/jerryscript,zherczeg\/jerryscript,martijnthe\/jerryscript,gabrielschulhof\/jerryscript,grgustaf\/jerryscript,grgustaf\/jerryscript,robertsipka\/jerryscript,bsdelf\/jerryscript,jack60504\/jerryscript,jack60504\/jerryscript,zherczeg\/jerryscript,glistening\/jerryscript,glistening\/jerryscript,bzsolt\/jerryscript,bsdelf\/jerryscript,bzsolt\/jerryscript,bsdelf\/jerryscript,martijnthe\/jerryscript,yichoi\/jerryscript,gabrielschulhof\/jerryscript,martijnthe\/jerryscript,dbatyai\/jerryscript,grgustaf\/jerryscript,akosthekiss\/jerryscript,dbatyai\/jerryscript,zherczeg\/jerryscript,bzsolt\/jerryscript,robertsipka\/jerryscript,robertsipka\/jerryscript,jerryscript-project\/jerryscript,jack60504\/jerryscript,bsdelf\/jerryscript,jack60504\/jerryscript,LaszloLango\/jerryscript,bzsolt\/jerryscript,glistening\/jerryscript,akosthekiss\/jerryscript,jerryscript-project\/jerryscript,gabrielschulhof\/jerryscript,bzsolt\/jerryscript,akosthekiss\/jerryscript,jerryscript-project\/jerryscript,dbatyai\/jerryscript,zherczeg\/jerryscript,akosthekiss\/jerryscript,yichoi\/jerryscript,LaszloLango\/jerryscript,grgustaf\/jerryscript,grgustaf\/jerryscript,yichoi\/jerryscript,robertsipka\/jerryscript,glistening\/jerryscript,akosthekiss\/jerryscript,grgustaf\/jerryscript,robertsipka\/jerryscript,dbatyai\/jerryscript,martijnthe\/jerryscript,martijnthe\/jerryscript,gabrielschulhof\/jerryscript,yichoi\/jerryscript,LaszloLango\/jerryscript,gabrielschulhof\/jerryscript,martijnthe\/jerryscript,glistening\/jerryscript,LaszloLango\/jerryscript,robertsipka\/jerryscript,LaszloLango\/jerryscript,dbatyai\/jerryscript","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- jerry-main\/main-unix.c\n+++ jerry-main\/main-unix.c\n@@ -821,9 +821,9 @@\n jerry_release_value (ret_val_eval);\n ret_val_eval = jerry_port_default_jobqueue_run ();\n \n- if (jerry_value_has_error_flag (ret_value))\n- {\n- print_unhandled_exception (ret_value);\n+ if (jerry_value_has_error_flag (ret_val_eval))\n+ {\n+ print_unhandled_exception (ret_val_eval);\n }\n #endif \/* !CONFIG_DISABLE_ES2015_PROMISE_BUILTIN *\/\n }\n"} {"commit":"bafedc90576837e083ae4611cb0a93645e99588e","subject":"put in a test for search by nickname","message":"put in a test for search by nickname\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/pkiutil\/pkiutil.c\n+++ security\/nss\/cmd\/pkiutil\/pkiutil.c\n@@ -327,7 +327,20 @@\n NULL, NULL);\n \n printf(\"\\n\");\n- NSSTrustDomain_TraverseCertificates(root_cert_td, print_cert_callback, 0);\n+ if (pkiutil.opt[opt_Nickname].on) {\n+\tint i;\n+\tNSSCertificate **certs;\n+\tNSSCertificate *cert;\n+\tcerts = NSSTrustDomain_FindCertificatesByNickname(root_cert_td,\n+\t\t\tpkiutil.opt[opt_Nickname].arg, NULL, 0, NULL);\n+\ti = 0;\n+\twhile ((cert = certs[i++]) != NULL) {\n+\t printf(\"Found cert:\\n\");\n+\t print_cert_callback(cert, NULL);\n+\t}\n+ } else {\n+ NSSTrustDomain_TraverseCertificates(root_cert_td, print_cert_callback, 0);\n+ }\n \n NSSTrustDomain_Destroy(root_cert_td);\n \n"} {"commit":"4a38498903504e7c172ad532dc9090e2c5665bab","subject":"ENH:Documentation improvements","message":"ENH:Documentation improvements\n","repos":"demarle\/VTK,candy7393\/VTK,Wuteyan\/VTK,gram526\/VTK,collects\/VTK,sankhesh\/VTK,biddisco\/VTK,daviddoria\/PointGraphsPhase1,msmolens\/VTK,biddisco\/VTK,SimVascular\/VTK,aashish24\/VTK-old,Wuteyan\/VTK,sankhesh\/VTK,daviddoria\/PointGraphsPhase1,collects\/VTK,demarle\/VTK,johnkit\/vtk-dev,sumedhasingla\/VTK,SimVascular\/VTK,hendradarwin\/VTK,berendkleinhaneveld\/VTK,sgh\/vtk,SimVascular\/VTK,demarle\/VTK,candy7393\/VTK,sankhesh\/VTK,aashish24\/VTK-old,mspark93\/VTK,ashray\/VTK-EVM,naucoin\/VTKSlicerWidgets,ashray\/VTK-EVM,ashray\/VTK-EVM,sankhesh\/VTK,jeffbaumes\/jeffbaumes-vtk,sankhesh\/VTK,sumedhasingla\/VTK,SimVascular\/VTK,SimVascular\/VTK,candy7393\/VTK,berendkleinhaneveld\/VTK,spthaolt\/VTK,Wuteyan\/VTK,biddisco\/VTK,hendradarwin\/VTK,spthaolt\/VTK,candy7393\/VTK,sumedhasingla\/VTK,candy7393\/VTK,gram526\/VTK,candy7393\/VTK,mspark93\/VTK,jmerkow\/VTK,johnkit\/vtk-dev,naucoin\/VTKSlicerWidgets,collects\/VTK,demarle\/VTK,gram526\/VTK,cjh1\/VTK,gram526\/VTK,biddisco\/VTK,sumedhasingla\/VTK,Wuteyan\/VTK,arnaudgelas\/VTK,arnaudgelas\/VTK,candy7393\/VTK,arnaudgelas\/VTK,sgh\/vtk,keithroe\/vtkoptix,biddisco\/VTK,hendradarwin\/VTK,sankhesh\/VTK,keithroe\/vtkoptix,daviddoria\/PointGraphsPhase1,arnaudgelas\/VTK,daviddoria\/PointGraphsPhase1,keithroe\/vtkoptix,biddisco\/VTK,SimVascular\/VTK,Wuteyan\/VTK,hendradarwin\/VTK,collects\/VTK,demarle\/VTK,keithroe\/vtkoptix,arnaudgelas\/VTK,aashish24\/VTK-old,gram526\/VTK,msmolens\/VTK,demarle\/VTK,demarle\/VTK,aashish24\/VTK-old,berendkleinhaneveld\/VTK,cjh1\/VTK,SimVascular\/VTK,daviddoria\/PointGraphsPhase1,gram526\/VTK,Wuteyan\/VTK,naucoin\/VTKSlicerWidgets,ashray\/VTK-EVM,berendkleinhaneveld\/VTK,naucoin\/VTKSlicerWidgets,sumedhasingla\/VTK,sankhesh\/VTK,mspark93\/VTK,msmolens\/VTK,jmerkow\/VTK,jeffbaumes\/jeffbaumes-vtk,keithroe\/vtkoptix,johnkit\/vtk-dev,keithroe\/vtkoptix,ashray\/VTK-EVM,gram526\/VTK,sgh\/vtk,msmolens\/VTK,arnaudgelas\/VTK,mspark93\/VTK,sumedhasingla\/VTK,aashish24\/VTK-old,hendradarwin\/VTK,msmolens\/VTK,aashish24\/VTK-old,msmolens\/VTK,sgh\/vtk,jeffbaumes\/jeffbaumes-vtk,berendkleinhaneveld\/VTK,jmerkow\/VTK,jeffbaumes\/jeffbaumes-vtk,berendkleinhaneveld\/VTK,collects\/VTK,jeffbaumes\/jeffbaumes-vtk,mspark93\/VTK,sumedhasingla\/VTK,gram526\/VTK,msmolens\/VTK,hendradarwin\/VTK,naucoin\/VTKSlicerWidgets,cjh1\/VTK,mspark93\/VTK,jmerkow\/VTK,jmerkow\/VTK,jeffbaumes\/jeffbaumes-vtk,johnkit\/vtk-dev,jmerkow\/VTK,SimVascular\/VTK,spthaolt\/VTK,berendkleinhaneveld\/VTK,daviddoria\/PointGraphsPhase1,johnkit\/vtk-dev,johnkit\/vtk-dev,cjh1\/VTK,ashray\/VTK-EVM,keithroe\/vtkoptix,cjh1\/VTK,demarle\/VTK,biddisco\/VTK,Wuteyan\/VTK,spthaolt\/VTK,spthaolt\/VTK,johnkit\/vtk-dev,sumedhasingla\/VTK,sgh\/vtk,keithroe\/vtkoptix,naucoin\/VTKSlicerWidgets,jmerkow\/VTK,jmerkow\/VTK,sgh\/vtk,mspark93\/VTK,spthaolt\/VTK,ashray\/VTK-EVM,mspark93\/VTK,spthaolt\/VTK,hendradarwin\/VTK,msmolens\/VTK,sankhesh\/VTK,candy7393\/VTK,ashray\/VTK-EVM,collects\/VTK,cjh1\/VTK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Common\/vtkInstantiator.h\n+++ Common\/vtkInstantiator.h\n@@ -33,15 +33,16 @@\n \/\/ class from that kit will be linked into your executable whether or\n \/\/ not the class is used. The headers are:\n \/\/\n-\/\/ vtkCommon - vtkCommonInstantiator.h\n-\/\/ vtkFiltering - vtkFilteringInstantiator.h\n-\/\/ vtkIO - vtkIOInstantiator.h\n-\/\/ vtkImaging - vtkImagingInstantiator.h\n-\/\/ vtkGraphics - vtkGraphicsInstantiator.h\n-\/\/ vtkRendering - vtkRenderingInstantiator.h\n-\/\/ vtkHybrid - vtkHybridInstantiator.h\n-\/\/ vtkParallel - vtkParallelInstantiator.h\n-\/\/ vtkPatented - vtkPatentedInstantiator.h\n+\/\/ vtkCommon - vtkCommonInstantiator.h\n+\/\/ vtkFiltering - vtkFilteringInstantiator.h\n+\/\/ vtkIO - vtkIOInstantiator.h\n+\/\/ vtkImaging - vtkImagingInstantiator.h\n+\/\/ vtkGraphics - vtkGraphicsInstantiator.h\n+\/\/ vtkRendering - vtkRenderingInstantiator.h\n+\/\/ vtkVolumeRendering - vtkVolumeRenderingInstantiator.h\n+\/\/ vtkHybrid - vtkHybridInstantiator.h\n+\/\/ vtkParallel - vtkParallelInstantiator.h\n+\/\/ vtkPatented - vtkPatentedInstantiator.h\n \/\/\n \/\/ The VTK_MAKE_INSTANTIATOR() command in CMake is used to automatically\n \/\/ generate the creator registration for each VTK library. It can also\n"} {"commit":"186fcf97dff8407a6bd7e453c233695bd8d6ed4a","subject":"Convert from calling PR_GetIPNodeByName to calling PR_GetAddrInfoByName. Bug 324305. Patch by wtchang. r=nelson","message":"Convert from calling PR_GetIPNodeByName to calling PR_GetAddrInfoByName.\nBug 324305. Patch by wtchang. r=nelson\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/tstclnt\/tstclnt.c\n+++ security\/nss\/cmd\/tstclnt\/tstclnt.c\n@@ -515,7 +515,6 @@\n int useExportPolicy = 0;\n PRSocketOptionData opt;\n PRNetAddr addr;\n- PRHostEnt hp;\n PRPollDesc pollset[2];\n PRBool useCommandLinePassword = PR_FALSE;\n PRBool pingServerFirst = PR_FALSE;\n@@ -524,6 +523,7 @@\n PRBool skipProtoHeader = PR_FALSE;\n int headerSeparatorPtrnId = 0;\n int error = 0;\n+ PRUint16 portno;\n PLOptState *optstate;\n PLOptStatus optstatus;\n PRStatus prStatus;\n@@ -598,6 +598,7 @@\n \tUsage(progName);\n \n if (!host || !port) Usage(progName);\n+ portno = (PRUint16)atoi(port);\n \n if (!certDir) {\n \tcertDir = SECU_DefaultSSLDir();\t\/* Look in $SSL_DIR *\/\n@@ -640,28 +641,28 @@\n \n status = PR_StringToNetAddr(host, &addr);\n if (status == PR_SUCCESS) {\n-\tint portno = atoi(port);\n- \taddr.inet.port = PR_htons((PRUint16)portno);\n+ \taddr.inet.port = PR_htons(portno);\n } else {\n \t\/* Lookup host *\/\n-\tchar buf[PR_NETDB_BUF_SIZE];\n-\tstatus = PR_GetIPNodeByName(host, PR_AF_INET6, PR_AI_DEFAULT, \n-\t\t\t\t buf, sizeof buf, &hp);\n-\tif (status != PR_SUCCESS) {\n+\tPRAddrInfo *addrInfo;\n+\tvoid *enumPtr = NULL;\n+\n+\taddrInfo = PR_GetAddrInfoByName(host, PR_AF_UNSPEC, \n+\t PR_AI_ADDRCONFIG | PR_AI_NOCANONNAME);\n+\tif (!addrInfo) {\n \t SECU_PrintError(progName, \"error looking up host\");\n \t return 1;\n \t}\n-\tif (PR_EnumerateHostEnt(0, &hp, (PRUint16)atoi(port), &addr) == -1) {\n+\tdo {\n+\t enumPtr = PR_EnumerateAddrInfo(enumPtr, addrInfo, portno, &addr);\n+\t} while (enumPtr != NULL &&\n+\t\t addr.raw.family != PR_AF_INET &&\n+\t\t addr.raw.family != PR_AF_INET6);\n+\tPR_FreeAddrInfo(addrInfo);\n+\tif (enumPtr == NULL) {\n \t SECU_PrintError(progName, \"error looking up host address\");\n \t return 1;\n \t}\n- }\n-\n- if (PR_IsNetAddrType(&addr, PR_IpAddrV4Mapped)) {\n- \t\/* convert to IPv4. *\/\n-\taddr.inet.family = PR_AF_INET;\n-\tmemcpy(&addr.inet.ip, &addr.ipv6.ip.pr_s6_addr[12], 4);\n-\tmemset(&addr.inet.pad[0], 0, sizeof addr.inet.pad);\n }\n \n printHostNameAndAddr(host, &addr);\n@@ -670,7 +671,7 @@\n \tint iter = 0;\n \tPRErrorCode err;\n \tdo {\n-\t s = PR_NewTCPSocket();\n+\t s = PR_OpenTCPSocket(addr.raw.family);\n \t if (s == NULL) {\n \t\tSECU_PrintError(progName, \"Failed to create a TCP socket\");\n \t }\n@@ -708,7 +709,7 @@\n }\n \n \/* Create socket *\/\n- s = PR_NewTCPSocket();\n+ s = PR_OpenTCPSocket(addr.raw.family);\n if (s == NULL) {\n \tSECU_PrintError(progName, \"error creating socket\");\n \treturn 1;\n"} {"commit":"27a74a1d05cb8808e2b7928e49292699faceeb35","subject":"bug 165863, free token on error paths","message":"bug 165863, free token on error paths\n","repos":"nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/pki\/trustdomain.c\n+++ security\/nss\/lib\/pki\/trustdomain.c\n@@ -1248,11 +1248,15 @@\n \t\tif (!pkio) {\n \t\t pkio = nssPKIObject_Create(NULL, to, td, NULL);\n \t\t if (!pkio) {\n+\t\t\tnssToken_Destroy(token);\n+\t\t\tnssCryptokiObject_Destroy(to);\n \t\t\tgoto loser;\n \t\t }\n \t\t} else {\n \t\t status = nssPKIObject_AddInstance(pkio, to);\n \t\t if (status != PR_SUCCESS) {\n+\t\t\tnssToken_Destroy(token);\n+\t\t\tnssCryptokiObject_Destroy(to);\n \t\t\tgoto loser;\n \t\t }\n \t\t}\n@@ -1270,9 +1274,6 @@\n return rvt;\n loser:\n nssSlotArray_Destroy(slots);\n- if (to) {\n-\tnssCryptokiObject_Destroy(to);\n- }\n if (pkio) {\n \tnssPKIObject_Destroy(pkio);\n }\n"} {"commit":"3f4c4b2bfe5d6d76f4de86ce870f82c78f1a951b","subject":"Fix hash yield 0 for floating types when value is zero","message":"Fix hash yield 0 for floating types when value is zero\n\n","repos":"metopa\/murmurhash2functor,metopa\/murmurhash2functor","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- murmurhash2functor\/include\/murmurhash2functor.h\n+++ murmurhash2functor\/include\/murmurhash2functor.h\n@@ -73,7 +73,8 @@\n \ttemplate <>\n \tstruct MurmurHash2<float> {\n \t\tuint64_t operator ()(float x, uint64_t seed = 0) {\n- return x == 0.0f ? 0 :\n+ return x == 0.0f ?\n+\t\t\t\t\t detail::hash_impl()(&seed, sizeof(uint64_t), 0) :\n \t\t\t\t\t detail::hash_impl()(&x, sizeof(float), seed);\n \t\t}\n \t};\n@@ -81,7 +82,8 @@\n \ttemplate <>\n \tstruct MurmurHash2<double> {\n \t\tuint64_t operator ()(double x, uint64_t seed = 0) {\n-\t\t\treturn x == 0.0 ? 0 :\n+\t\t\treturn x == 0.0 ?\n+\t\t\t\t detail::hash_impl()(&seed, sizeof(uint64_t), 0) :\n \t\t\t\t detail::hash_impl()(&x, sizeof(double), seed);\n \t\t}\n \t};\n@@ -89,7 +91,8 @@\n \ttemplate <>\n \tstruct MurmurHash2<long double> {\n \t\tuint64_t operator ()(long double x, uint64_t seed = 0) {\n-\t\t\treturn x == 0.0l ? 0 :\n+\t\t\treturn x == 0.0l ?\n+\t\t\t\t detail::hash_impl()(&seed, sizeof(uint64_t), 0) :\n \t\t\t\t detail::hash_impl()(&x, sizeof(long double), seed);\n \t\t}\n \t};\n"} {"commit":"3c518fca652372d85c17d5a06202bad6304bb516","subject":"Bug 379625 ? Accept SMIME preferences even when they contain NULL parameters. r=rrelyea,etc","message":"Bug 379625 ? Accept SMIME preferences even when they contain NULL parameters.\nr=rrelyea,etc\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/smime\/smimeutil.c\n+++ security\/nss\/lib\/smime\/smimeutil.c\n@@ -351,10 +351,14 @@\n \t * 2 NULLs as equal and NULL and non-NULL as not equal), we could\n \t * use that here instead of all of the following comparison code.\n \t *\/\n-\tif (cap->parameters.data == NULL && smime_cipher_map[i].parms == NULL)\n-\t break;\t\/* both empty: bingo *\/\n-\n-\tif (cap->parameters.data != NULL && smime_cipher_map[i].parms != NULL &&\n+\tif (!smime_cipher_map[i].parms) { \n+\t if (!cap->parameters.data || !cap->parameters.len)\n+\t\tbreak;\t\/* both empty: bingo *\/\n+\t if (cap->parameters.len == 2 &&\n+\t cap->parameters.data[0] == SEC_ASN1_NULL &&\n+\t\tcap->parameters.data[1] == 0) \n+\t\tbreak; \/* DER NULL == NULL, bingo *\/\n+\t} else if (cap->parameters.data != NULL && \n \t cap->parameters.len == smime_cipher_map[i].parms->len &&\n \t PORT_Memcmp (cap->parameters.data, smime_cipher_map[i].parms->data,\n \t\t\t cap->parameters.len) == 0)\n@@ -365,8 +369,7 @@\n \n if (i == smime_cipher_map_count)\n \treturn 0;\t\t\t\t\/* no match found *\/\n- else\n-\treturn smime_cipher_map[i].cipher;\t\/* match found, point to cipher *\/\n+ return smime_cipher_map[i].cipher;\t\/* match found, point to cipher *\/\n }\n \n \/*\n"} {"commit":"02506ce5302402b9c77db26f6681de99f561dab7","subject":"remove ref to rtt.h","message":"remove ref to rtt.h\n","repos":"mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh,mrquincle\/nRF51-ble-bcast-mesh","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- nRF51\/rbc_mesh\/src\/version_handler.c\n+++ nRF51\/rbc_mesh\/src\/version_handler.c\n@@ -40,8 +40,6 @@\n #include \"rbc_mesh.h\"\n #include \"mesh_packet.h\"\n #include \"mesh_aci.h\"\n-\n-#include \"SEGGER_RTT.h\"\n \n #include \"nrf_error.h\"\n #include \"app_error.h\"\n"} {"commit":"13199fbbdd2a8e3b068dc7dda265a3b65f9ce44f","subject":"move comment","message":"move comment\n","repos":"Vaishal-shah\/Envision,Vaishal-shah\/Envision,lukedirtwalker\/Envision,lukedirtwalker\/Envision,mgalbier\/Envision,mgalbier\/Envision,dimitar-asenov\/Envision,lukedirtwalker\/Envision,lukedirtwalker\/Envision,Vaishal-shah\/Envision,mgalbier\/Envision,lukedirtwalker\/Envision,mgalbier\/Envision,dimitar-asenov\/Envision,Vaishal-shah\/Envision,dimitar-asenov\/Envision,dimitar-asenov\/Envision,lukedirtwalker\/Envision,Vaishal-shah\/Envision,mgalbier\/Envision,dimitar-asenov\/Envision,mgalbier\/Envision,Vaishal-shah\/Envision,dimitar-asenov\/Envision","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Core\/src\/PluginManager.h\n+++ Core\/src\/PluginManager.h\n@@ -83,7 +83,8 @@\n \t\tQList<QPluginLoader*> loadedPlugins;\n \t\tQMap<QString, PluginInfo*> idToMetaDataMap;\n \t\tQMap<QString, QPluginLoader*> idToPluginLoaderMap;\n-\t\tQMap<QString, QString> _allFoundSharedLibraryFiles; \/\/ lower to mixed case maps.\n+\t\t\/\/ lower to mixed case maps.\n+\t\tQMap<QString, QString> _allFoundSharedLibraryFiles;\n \n \t\tQString getLibraryFileName(const QString pluginId);\n \t\tvoid scanAllPluginsMetaData();\n"} {"commit":"6701385770552fd20dedd5b863d34bf2b535b414","subject":"bug 195 - fix this once and for all: just never use _mm_load_sd on gcc\/i386, it generates redundant x87 ops","message":"bug 195 - fix this once and for all: just never use _mm_load_sd on gcc\/i386, it generates redundant x87 ops\n","repos":"cjntaylor\/eigen,pthulhu\/eigen,pthulhu\/eigen,pthulhu\/eigen,cjntaylor\/eigen,cjntaylor\/eigen,cjntaylor\/eigen,pthulhu\/eigen,pthulhu\/eigen","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Eigen\/src\/Core\/arch\/SSE\/PacketMath.h\n+++ Eigen\/src\/Core\/arch\/SSE\/PacketMath.h\n@@ -237,6 +237,7 @@\n #endif\n }\n template<> EIGEN_STRONG_INLINE Packet2d ploadu<Packet2d>(const double* from) { EIGEN_DEBUG_UNALIGNED_LOAD return _mm_loadu_pd(from); }\n+ template<> EIGEN_STRONG_INLINE Packet4i ploadu<Packet4i>(const int* from) { EIGEN_DEBUG_UNALIGNED_LOAD return _mm_loadu_si128(reinterpret_cast<const Packet4i*>(from)); }\n #else\n \/\/ Fast unaligned loads. Note that here we cannot directly use intrinsics: this would\n \/\/ require pointer casting to incompatible pointer types and leads to invalid code\n@@ -247,25 +248,43 @@\n template<> EIGEN_STRONG_INLINE Packet4f ploadu<Packet4f>(const float* from)\n {\n EIGEN_DEBUG_UNALIGNED_LOAD\n+#if defined(__GNUC__) && defined(__i386__)\n+ \/\/ bug 195: gcc\/i386 emits weird x87 fldl\/fstpl instructions for _mm_load_sd\n+ return _mm_loadu_ps(from);\n+#else\n __m128d res;\n res = _mm_load_sd((const double*)(from)) ;\n res = _mm_loadh_pd(res, (const double*)(from+2)) ;\n return _mm_castpd_ps(res);\n+#endif\n }\n template<> EIGEN_STRONG_INLINE Packet2d ploadu<Packet2d>(const double* from)\n {\n EIGEN_DEBUG_UNALIGNED_LOAD\n+#if defined(__GNUC__) && defined(__i386__)\n+ \/\/ bug 195: gcc\/i386 emits weird x87 fldl\/fstpl instructions for _mm_load_sd\n+ return _mm_loadu_pd(from);\n+#else\n __m128d res;\n res = _mm_load_sd(from) ;\n res = _mm_loadh_pd(res,from+1);\n return res;\n-}\n-#endif\n-\n-\/\/ bug 195: we used to have an optimized ploadu using _mm_load_sd\/_mm_loadh_pd but that gave wrong results when some 64bit value,\n-\/\/ interpreted as double, was a NaN\n-template<> EIGEN_STRONG_INLINE Packet4i ploadu<Packet4i>(const int* from) { EIGEN_DEBUG_UNALIGNED_LOAD return _mm_loadu_si128(reinterpret_cast<const Packet4i*>(from)); }\n-\n+#endif\n+}\n+template<> EIGEN_STRONG_INLINE Packet4i ploadu<Packet4i>(const int* from)\n+{\n+ EIGEN_DEBUG_UNALIGNED_LOAD\n+#if defined(__GNUC__) && defined(__i386__)\n+ \/\/ bug 195: gcc\/i386 emits weird x87 fldl\/fstpl instructions for _mm_load_sd\n+ return _mm_loadu_si128(reinterpret_cast<const Packet4i*>(from));\n+#else\n+ __m128d res;\n+ res = _mm_load_sd((const double*)(from)) ;\n+ res = _mm_loadh_pd(res, (const double*)(from+2)) ;\n+ return _mm_castpd_si128(res);\n+#endif\n+}\n+#endif\n \n template<> EIGEN_STRONG_INLINE Packet4f ploaddup<Packet4f>(const float* from)\n {\n"} {"commit":"922c5d6b5ea65c4d8f59fbd03662be56de46731c","subject":"solved bug - assimp to glm matrix conversion","message":"solved bug - assimp to glm matrix conversion\n","repos":"ReDEnergy\/OpenGL4.5-GameEngine,ReDEnergy\/GameEngine,ReDEnergy\/OpenGL4.5-GameEngine,ReDEnergy\/GameEngine","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Engine\/Source\/include\/assimp_utils.h\n+++ Engine\/Source\/include\/assimp_utils.h\n@@ -19,10 +19,10 @@\n \r\n \tinline void CopyMatix(const aiMatrix4x4 &mat, glm::mat4 &dest)\r\n \t{\r\n-\t\tdest[0][0] = mat.a1; dest[0][1] = mat.a2; dest[0][2] = mat.a3; dest[0][3] = mat.a4;\r\n-\t\tdest[1][0] = mat.b1; dest[1][1] = mat.b2; dest[1][2] = mat.b3; dest[1][3] = mat.b4;\r\n-\t\tdest[2][0] = mat.c1; dest[2][1] = mat.c2; dest[2][2] = mat.c3; dest[2][3] = mat.c4;\r\n-\t\tdest[3][0] = mat.d1; dest[3][1] = mat.d2; dest[3][2] = mat.d3; dest[3][3] = mat.d4;\r\n+\t\tdest[0][0] = mat.a1; dest[0][1] = mat.b1; dest[0][2] = mat.c1; dest[0][3] = mat.d1;\r\n+\t\tdest[1][0] = mat.a2; dest[1][1] = mat.b2; dest[1][2] = mat.c2; dest[1][3] = mat.d2;\r\n+\t\tdest[2][0] = mat.a3; dest[2][1] = mat.b3; dest[2][2] = mat.c3; dest[2][3] = mat.d3;\r\n+\t\tdest[3][0] = mat.a4; dest[3][1] = mat.b4; dest[3][2] = mat.c4; dest[3][3] = mat.d4;\r\n \t}\r\n \r\n \r\n"} {"commit":"cde993e56a0c91aca385108b0f7a9cdd48182d47","subject":"Clean up heartbeat function","message":"Clean up heartbeat function\n","repos":"RealAlpha\/discord-c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- discord-c.c\n+++ discord-c.c\n@@ -175,14 +175,10 @@\n \t\tusleep(41250*1000);\n \n \t\tprintf(\"Sending heartbeat...\\n\");\n-\t\t\/\/ TODO figure out how to insert the correct d value\n-\n \t\t\/\/ Create an operation 1 (=heartbeat) packet and send it off\n-\t\t\/\/ 25 chars to be safe\n \t\tchar packet[128];\n \t\tsprintf(packet, \"{\\\"op\\\": 1, \\\"d\\\": %i}\", sequenceNumber);\n \t\twebsocket_send(myWebSocket, packet, strlen(packet), 0);\n-\t\t\/\/websocket_think(myWebSocket);\n \t}\n }\n \n"} {"commit":"5b0c727d49b6f925da71114d671c5cc1d20ea084","subject":"lib-mail: rfc822_parse_quoted_string() didn't remove '\\' from the strings.","message":"lib-mail: rfc822_parse_quoted_string() didn't remove '\\' from the strings.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-mail\/rfc822-parser.c\n+++ src\/lib-mail\/rfc822-parser.c\n@@ -231,7 +231,7 @@\n \t\t\tif (ctx->data == ctx->end)\n \t\t\t\treturn -1;\n \n-\t\t\tstr_append_n(str, start, ctx->data - start);\n+\t\t\tstr_append_n(str, start, ctx->data - start - 1);\n \t\t\tstart = ctx->data;\n \t\t\tbreak;\n \t\t}\n"} {"commit":"f30456d9d675478d5cd986840f9a505199556d1b","subject":"lib-master: Error logging fix for 64bit systems.","message":"lib-master: Error logging fix for 64bit systems.\n\n--HG--\nbranch : HEAD\n","repos":"jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jwm\/dovecot-notmuch,jkerihuel\/dovecot,jkerihuel\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib-master\/master-auth.c\n+++ src\/lib-master\/master-auth.c\n@@ -146,7 +146,8 @@\n static void master_auth_connection_timeout(struct master_auth_connection *conn)\n {\n \ti_error(\"master(%s): Auth request timed out (received %u\/%u bytes)\",\n-\t\tconn->auth->path, conn->buf_pos, sizeof(conn->buf));\n+\t\tconn->auth->path, conn->buf_pos,\n+\t\t(unsigned int)sizeof(conn->buf));\n \tmaster_auth_connection_deinit(&conn);\n }\n \n"} {"commit":"c26abeb014b492058c420c549499b0defe8dd14d","subject":"Open MPI: Update dlopen() hack","message":"Open MPI: Update dlopen() hack\n","repos":"mpi4py\/mpi4py,mpi4py\/mpi4py,mpi4py\/mpi4py","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib-mpi\/compat\/openmpi.h\n+++ src\/lib-mpi\/compat\/openmpi.h\n@@ -55,32 +55,27 @@\n int mode = RTLD_NOW | RTLD_GLOBAL;\n #if defined(__CYGWIN__)\n if (!handle) handle = dlopen(\"cygmpi.dll\", mode);\n- if (!handle) handle = dlopen(\"mpi.dll\", mode);\n+ if (!handle) handle = dlopen(\"mpi.dll\", mode);\n #elif defined(__APPLE__)\n \/* Mac OS X *\/\n- if (!handle) handle = dlopen(\"libmpi.15.dylib\", mode);\n- if (!handle) handle = dlopen(\"libmpi.14.dylib\", mode);\n- if (!handle) handle = dlopen(\"libmpi.13.dylib\", mode);\n+ #ifdef RTLD_NOLOAD\n+ mode |= RTLD_NOLOAD;\n+ #endif\n+ if (!handle) handle = dlopen(\"libmpi.20.dylib\", mode);\n if (!handle) handle = dlopen(\"libmpi.12.dylib\", mode);\n- if (!handle) handle = dlopen(\"libmpi.11.dylib\", mode);\n- if (!handle) handle = dlopen(\"libmpi.10.dylib\", mode);\n if (!handle) handle = dlopen(\"libmpi.1.dylib\", mode);\n if (!handle) handle = dlopen(\"libmpi.0.dylib\", mode);\n- if (!handle) handle = dlopen(\"libmpi.dylib\", mode);\n+ if (!handle) handle = dlopen(\"libmpi.dylib\", mode);\n #else\n \/* GNU\/Linux and others *\/\n #ifdef RTLD_NOLOAD\n mode |= RTLD_NOLOAD;\n #endif\n- if (!handle) handle = dlopen(\"libmpi.so.15\", mode);\n- if (!handle) handle = dlopen(\"libmpi.so.14\", mode);\n- if (!handle) handle = dlopen(\"libmpi.so.13\", mode);\n+ if (!handle) handle = dlopen(\"libmpi.so.20\", mode);\n if (!handle) handle = dlopen(\"libmpi.so.12\", mode);\n- if (!handle) handle = dlopen(\"libmpi.so.11\", mode);\n- if (!handle) handle = dlopen(\"libmpi.so.10\", mode);\n if (!handle) handle = dlopen(\"libmpi.so.1\", mode);\n if (!handle) handle = dlopen(\"libmpi.so.0\", mode);\n- if (!handle) handle = dlopen(\"libmpi.so\", mode);\n+ if (!handle) handle = dlopen(\"libmpi.so\", mode);\n #endif\n }\n \n"} {"commit":"360d1a747d21f5fc4421ecd4916b887121308ed4","subject":"INTEGRATION: CWS odkaddonexample (1.1.2); FILE ADDED 2006\/06\/16 09:53:26 cd 1.1.2.2: #65116# Fix problem with Solaris C++ compiler 2006\/05\/05 14:15:31 cd 1.1.2.1: #i65116# New demo add-on using the complex toolbar controls","message":"INTEGRATION: CWS odkaddonexample (1.1.2); FILE ADDED\n2006\/06\/16 09:53:26 cd 1.1.2.2: #65116# Fix problem with Solaris C++ compiler\n2006\/05\/05 14:15:31 cd 1.1.2.1: #i65116# New demo add-on using the complex toolbar controls\n","repos":"JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core,JurassicWordExcel\/core","returncode":1,"stderr":"error: pathspec 'odk\/examples\/cpp\/complextoolbarcontrols\/MyJob.h' did not match any file(s) known to git\n","license":"mpl-2.0","lang":"C","diff":"--- odk\/examples\/cpp\/complextoolbarcontrols\/MyJob.h\n+++ odk\/examples\/cpp\/complextoolbarcontrols\/MyJob.h\n@@ -0,0 +1,150 @@\n+#ifndef _MyJob_HXX\n+\n+#define _MyJob_HXX\n+\n+\n+\n+#ifndef _COM_SUN_STAR_TASK_XJOB_HPP_\n+\n+#include <com\/sun\/star\/task\/XJob.hpp>\n+\n+#endif\n+\n+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_\n+\n+#include <com\/sun\/star\/lang\/XServiceInfo.hpp>\n+\n+#endif\n+\n+#ifndef _CPPUHELPER_IMPLBASE2_HXX_\n+\n+#include <cppuhelper\/implbase2.hxx>\n+\n+#endif\n+\n+\n+\n+namespace com\n+\n+{\n+\n+ namespace sun\n+\n+ {\n+\n+ namespace star\n+\n+ {\n+\n+ namespace frame\n+\n+ {\n+\n+ class XModel;\n+\n+ class XFrame;\n+\n+ }\n+\n+\n+\n+ namespace beans\n+\n+ {\n+\n+ struct NamedValue;\n+\n+ }\n+\n+ }\n+\n+ }\n+\n+}\n+\n+\n+\n+class MyJob : public cppu::WeakImplHelper2\n+\n+<\n+\n+ com::sun::star::task::XJob,\n+\n+ com::sun::star::lang::XServiceInfo\n+\n+>\n+\n+{\n+\n+private:\n+\n+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;\n+\n+\n+\n+public:\n+\n+ MyJob( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &rxMSF)\n+\n+ : mxMSF( rxMSF ) {}\n+\n+ virtual ~MyJob() {}\n+\n+\n+\n+ \/\/ XJob\n+\n+ virtual ::com::sun::star::uno::Any SAL_CALL execute(\n+\n+ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )\n+\n+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);\n+\n+\n+\n+ \/\/ XServiceInfo\n+\n+ virtual ::rtl::OUString SAL_CALL getImplementationName( )\n+\n+ throw (::com::sun::star::uno::RuntimeException);\n+\n+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )\n+\n+ throw (::com::sun::star::uno::RuntimeException);\n+\n+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )\n+\n+ throw (::com::sun::star::uno::RuntimeException);\n+\n+};\n+\n+\n+\n+::rtl::OUString MyJob_getImplementationName()\n+\n+ throw ( ::com::sun::star::uno::RuntimeException );\n+\n+\n+\n+sal_Bool SAL_CALL MyJob_supportsService( const ::rtl::OUString& ServiceName )\n+\n+ throw ( ::com::sun::star::uno::RuntimeException );\n+\n+\n+\n+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyJob_getSupportedServiceNames( )\n+\n+ throw ( ::com::sun::star::uno::RuntimeException );\n+\n+\n+\n+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >\n+\n+SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr)\n+\n+ throw ( ::com::sun::star::uno::Exception );\n+\n+\n+\n+#endif\n+\n"} {"commit":"e578756c35859a459d78d8416195bc5f5ff897d0","subject":"netfilter: ctnetlink: fix expectation mask dump","message":"netfilter: ctnetlink: fix expectation mask dump\n\nThe protocol number is not initialized, so userspace can't interpret\nthe layer 4 data properly.\n\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/netfilter\/nf_conntrack_netlink.c\n+++ net\/netfilter\/nf_conntrack_netlink.c\n@@ -1437,8 +1437,9 @@\n \tstruct nlattr *nest_parms;\n \n \tmemset(&m, 0xFF, sizeof(m));\n+\tmemcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));\n \tm.src.u.all = mask->src.u.all;\n-\tmemcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));\n+\tm.dst.protonum = tuple->dst.protonum;\n \n \tnest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED);\n \tif (!nest_parms)\n"} {"commit":"c43087f4dec265a6f8effac816ed1e0dcb516f11","subject":"Evas evas_render.c: Fixed formatting.","message":"Evas evas_render.c: Fixed formatting.\n\nFixed indentation and removed trailing whitespaces.\n\n\ngit-svn-id: 6d771e449150288cc513807b7f4d2af31e9482bd@59560 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"TizenChameleon\/uifw-evas,TizenChameleon\/uifw-evas,TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/uifw-evas,TizenChameleon\/evas,TizenChameleon\/evas,TizenChameleon\/evas","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/canvas\/evas_render.c\n+++ src\/lib\/canvas\/evas_render.c\n@@ -15,9 +15,9 @@\n {\n #ifdef STDOUT_DBG\n dbf = stdout;\n-#else \n+#else\n dbf = fopen(\"EVAS-RENDER-DEBUG.log\", \"w\");\n-#endif \n+#endif\n if (!dbf) return;\n }\n fputs(txt, dbf);\n@@ -92,14 +92,14 @@\n {\n return ((!((obj->func->can_map) && (obj->func->can_map(obj)))) &&\n ((obj->cur.map) && (obj->cur.usemap)));\n-\/\/ return ((obj->cur.map) && (obj->cur.usemap));\n+ \/\/ return ((obj->cur.map) && (obj->cur.usemap));\n }\n \n static Eina_Bool\n _evas_render_had_map(Evas_Object *obj)\n {\n return ((obj->prev.map) && (obj->prev.usemap));\n-\/\/ return ((!obj->cur.map) && (obj->prev.usemap));\n+ \/\/ return ((!obj->cur.map) && (obj->prev.usemap));\n }\n \n static Eina_Bool\n@@ -154,27 +154,27 @@\n RD(\" [--- PHASE 1 DIRECT\\n\");\n for (i = 0; i < active_objects->count; i++)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(active_objects, i);\n-\tif (obj->changed)\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(active_objects, i);\n+ if (obj->changed)\n {\n \/* Flag need redraw on proxy too *\/\n evas_object_clip_recalc(obj);\n if (obj->proxy.proxies)\n {\n EINA_LIST_FOREACH(obj->proxy.proxies, l, proxy)\n- proxy->proxy.redraw = 1;\n+ proxy->proxy.redraw = 1;\n }\n }\n }\n for (i = 0; i < render_objects->count; i++)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(render_objects, i);\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(render_objects, i);\n RD(\" OBJ [%p] changed %i\\n\", obj, obj->changed);\n-\tif (obj->changed)\n+ if (obj->changed)\n {\n \/* Flag need redraw on proxy too *\/\n evas_object_clip_recalc(obj);\n@@ -195,13 +195,13 @@\n if (obj->pre_render_done)\n {\n RD(\" pre-render-done smart:%p|%p [%p, %i] | [%p, %i] has_map:%i had_map:%i\\n\",\n- obj->smart.smart, \n+ obj->smart.smart,\n evas_object_smart_members_get_direct(obj),\n obj->cur.map, obj->cur.usemap,\n obj->prev.map, obj->prev.usemap,\n _evas_render_has_map(obj),\n _evas_render_had_map(obj));\n- if ((obj->smart.smart) && \n+ if ((obj->smart.smart) &&\n (_evas_render_has_map(obj)))\n {\n RD(\" has map + smart\\n\");\n@@ -214,18 +214,18 @@\n _evas_render_prev_cur_clip_cache_add(e, obj);\n }\n }\n-\telse\n-\t {\n-\t if (obj->smart.smart)\n- {\n-\/\/ obj->func->render_pre(obj);\n- }\n-\t else if (obj->rect_del)\n+ else\n+ {\n+ if (obj->smart.smart)\n+ {\n+ \/\/ obj->func->render_pre(obj);\n+ }\n+ else if (obj->rect_del)\n {\n RD(\" rect del\\n\");\n _evas_render_cur_clip_cache_del(e, obj);\n }\n-\t }\n+ }\n }\n RD(\" ---]\\n\");\n }\n@@ -241,13 +241,13 @@\n #ifdef REND_DGB\n , int level\n #endif\n- )\n+ )\n {\n Eina_Bool clean_them = EINA_FALSE;\n Evas_Object *obj2;\n int is_active;\n Eina_Bool hmap;\n- \n+\n obj->rect_del = 0;\n obj->render_pre = 0;\n \n@@ -255,10 +255,10 @@\n \/* because of clip objects - delete 2 cycles later *\/\n if (obj->delete_me == 2)\n #else\n- if (obj->delete_me == evas_common_frameq_get_frameq_sz() + 2)\n-#endif\n- eina_array_push(delete_objects, obj);\n- else if (obj->delete_me != 0) obj->delete_me++;\n+ if (obj->delete_me == evas_common_frameq_get_frameq_sz() + 2)\n+#endif\n+ eina_array_push(delete_objects, obj);\n+ else if (obj->delete_me != 0) obj->delete_me++;\n \/* If the object will be removed, we should not cache anything during this run. *\/\n if (obj->delete_me != 0) clean_them = EINA_TRUE;\n \n@@ -285,13 +285,13 @@\n \n if ((restack) && (!map))\n {\n-\tif (!obj->changed)\n+ if (!obj->changed)\n {\n eina_array_push(&e->pending_objects, obj);\n obj->changed = 1;\n }\n-\tobj->restack = 1;\n-\tclean_them = EINA_TRUE;\n+ obj->restack = 1;\n+ clean_them = EINA_TRUE;\n }\n \n if (map)\n@@ -329,7 +329,7 @@\n {\n RDI(level);\n RD(\" had map - restack objs\\n\");\n-\/\/ eina_array_push(restack_objects, obj);\n+ \/\/ eina_array_push(restack_objects, obj);\n _evas_render_prev_cur_clip_cache_add(e, obj);\n if (obj->changed)\n {\n@@ -350,31 +350,31 @@\n \/* handle normal rendering. this object knows how to handle maps *\/\n if (obj->changed)\n {\n-\tif (obj->smart.smart)\n-\t {\n+ if (obj->smart.smart)\n+ {\n RDI(level);\n RD(\" changed + smart - render ok\\n\");\n-\t eina_array_push(render_objects, obj);\n-\t obj->render_pre = 1;\n-\t EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)\n-\t {\n-\t\t _evas_render_phase1_object_process(e, obj2,\n-\t\t\t\t\t\t active_objects,\n-\t\t\t\t\t\t restack_objects,\n-\t\t\t\t\t\t delete_objects,\n-\t\t\t\t\t\t render_objects,\n-\t\t\t\t\t\t obj->restack,\n+ eina_array_push(render_objects, obj);\n+ obj->render_pre = 1;\n+ EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)\n+ {\n+ _evas_render_phase1_object_process(e, obj2,\n+ active_objects,\n+ restack_objects,\n+ delete_objects,\n+ render_objects,\n+ obj->restack,\n map,\n redraw_all\n #ifdef REND_DGB\n , level + 1\n #endif\n- );\n-\t }\n-\t }\n-\telse\n-\t {\n-\t if ((is_active) && (!obj->clip.clipees) &&\n+ );\n+ }\n+ }\n+ else\n+ {\n+ if ((is_active) && (!obj->clip.clipees) &&\n _evas_render_is_relevant(obj))\n {\n RDI(level);\n@@ -392,7 +392,7 @@\n RDI(level);\n RD(\" skip - not smart, not active or clippees or not relevant\\n\");\n }\n-\t }\n+ }\n }\n else\n {\n@@ -400,42 +400,42 @@\n evas_object_is_visible(obj),\n obj->cur.visible, obj->cur.cache.clip.visible, obj->smart.smart, obj->cur.cache.clip.a,\n evas_object_was_visible(obj));\n-\tif ((!obj->clip.clipees) && (obj->delete_me == 0) &&\n-\t (_evas_render_can_render(obj) ||\n-\t (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))\n-\t {\n-\t if (obj->smart.smart)\n-\t {\n+ if ((!obj->clip.clipees) && (obj->delete_me == 0) &&\n+ (_evas_render_can_render(obj) ||\n+ (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))\n+ {\n+ if (obj->smart.smart)\n+ {\n RDI(level);\n RD(\" smart + visible\/was visible + not clip\\n\");\n-\t\t eina_array_push(render_objects, obj);\n-\t\t obj->render_pre = 1;\n-\t\t EINA_INLIST_FOREACH\n- (evas_object_smart_members_get_direct(obj), obj2)\n-\t\t {\n-\t\t _evas_render_phase1_object_process(e, obj2,\n-\t\t\t\t\t\t\t active_objects,\n-\t\t\t\t\t\t\t restack_objects,\n-\t\t\t\t\t\t\t delete_objects,\n-\t\t\t\t\t\t\t render_objects,\n-\t\t\t\t\t\t\t restack, map,\n- redraw_all\n+ eina_array_push(render_objects, obj);\n+ obj->render_pre = 1;\n+ EINA_INLIST_FOREACH\n+ (evas_object_smart_members_get_direct(obj), obj2)\n+ {\n+ _evas_render_phase1_object_process(e, obj2,\n+ active_objects,\n+ restack_objects,\n+ delete_objects,\n+ render_objects,\n+ restack, map,\n+ redraw_all\n #ifdef REND_DGB\n- , level + 1\n-#endif\n- );\n-\t\t }\n-\t }\n-\t else\n-\t {\n-\t\t if (evas_object_is_opaque(obj) &&\n+ , level + 1\n+#endif\n+ );\n+ }\n+ }\n+ else\n+ {\n+ if (evas_object_is_opaque(obj) &&\n evas_object_is_visible(obj))\n-\t\t {\n+ {\n RDI(level);\n RD(\" opaque + visible\\n\");\n-\t\t eina_array_push(render_objects, obj);\n-\t\t obj->rect_del = 1;\n-\t\t }\n+ eina_array_push(render_objects, obj);\n+ obj->rect_del = 1;\n+ }\n else if (evas_object_is_visible(obj))\n {\n RDI(level);\n@@ -448,37 +448,37 @@\n RDI(level);\n RD(\" skip\\n\");\n }\n-\t }\n-\t }\n-\/*\n- else if (obj->smart.smart)\n- {\n- RDI(level);\n- RD(\" smart + mot visible\/was visible\\n\");\n- eina_array_push(render_objects, obj);\n- obj->render_pre = 1;\n- EINA_INLIST_FOREACH\n- (evas_object_smart_members_get_direct(obj), obj2)\n- {\n- _evas_render_phase1_object_process(e, obj2,\n- active_objects,\n- restack_objects,\n- delete_objects,\n- render_objects,\n- restack, map,\n- redraw_all\n+ }\n+ }\n+ \/*\n+ else if (obj->smart.smart)\n+ {\n+ RDI(level);\n+ RD(\" smart + mot visible\/was visible\\n\");\n+ eina_array_push(render_objects, obj);\n+ obj->render_pre = 1;\n+ EINA_INLIST_FOREACH\n+ (evas_object_smart_members_get_direct(obj), obj2)\n+ {\n+ _evas_render_phase1_object_process(e, obj2,\n+ active_objects,\n+ restack_objects,\n+ delete_objects,\n+ render_objects,\n+ restack, map,\n+ redraw_all\n #ifdef REND_DGB\n- , level + 1\n-#endif\n- );\n- }\n- }\n- *\/\n- }\n- if (!is_active) obj->restack = 0;\n- RDI(level);\n- RD(\" ---]\\n\");\n- return clean_them;\n+, level + 1\n+#endif\n+);\n+}\n+}\n+ *\/\n+}\n+if (!is_active) obj->restack = 0;\n+RDI(level);\n+RD(\" ---]\\n\");\n+return clean_them;\n }\n \n static Eina_Bool\n@@ -495,18 +495,18 @@\n RD(\" [--- PHASE 1\\n\");\n EINA_INLIST_FOREACH(e->layers, lay)\n {\n-\tEvas_Object *obj;\n-\n-\tEINA_INLIST_FOREACH(lay->objects, obj)\n-\t {\n-\t clean_them |= _evas_render_phase1_object_process\n- (e, obj, active_objects, restack_objects, delete_objects,\n- render_objects, 0, 0, redraw_all\n+ Evas_Object *obj;\n+\n+ EINA_INLIST_FOREACH(lay->objects, obj)\n+ {\n+ clean_them |= _evas_render_phase1_object_process\n+ (e, obj, active_objects, restack_objects, delete_objects,\n+ render_objects, 0, 0, redraw_all\n #ifdef REND_DGB\n- , 1\n+ , 1\n #endif\n );\n-\t }\n+ }\n }\n RD(\" ---]\\n\");\n return clean_them;\n@@ -519,67 +519,67 @@\n \n for (i = 0; i < pending_objects->count; ++i)\n {\n-\tEvas_Object *obj;\n-\tint is_active, ok = 0;\n-\n-\tobj = eina_array_data_get(pending_objects, i);\n-\n-\tif (!obj->layer) goto clean_stuff;\n-\n-\tevas_object_clip_recalc(obj);\n-\tis_active = evas_object_is_active(obj);\n-\n-\tif ((!is_active) && (!obj->is_active) && (!obj->render_pre) &&\n+ Evas_Object *obj;\n+ int is_active, ok = 0;\n+\n+ obj = eina_array_data_get(pending_objects, i);\n+\n+ if (!obj->layer) goto clean_stuff;\n+\n+ evas_object_clip_recalc(obj);\n+ is_active = evas_object_is_active(obj);\n+\n+ if ((!is_active) && (!obj->is_active) && (!obj->render_pre) &&\n (!obj->rect_del))\n-\t {\n-\t ok = 1;\n-\t goto clean_stuff;\n-\t }\n-\n-\tif (obj->is_active == is_active)\n-\t {\n-\t if (obj->changed)\n-\t {\n-\t\t if (obj->smart.smart)\n-\t\t {\n-\t\t if (obj->render_pre || obj->rect_del) ok = 1;\n-\t\t }\n-\t\t else\n-\t\t if ((is_active) && (obj->restack) && (!obj->clip.clipees) &&\n-\t\t\t(_evas_render_can_render(obj) ||\n-\t\t\t (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))\n-\t\t {\n-\t\t\t if (!(obj->render_pre || obj->rect_del)) ok = 1;\n-\t\t }\n+ {\n+ ok = 1;\n+ goto clean_stuff;\n+ }\n+\n+ if (obj->is_active == is_active)\n+ {\n+ if (obj->changed)\n+ {\n+ if (obj->smart.smart)\n+ {\n+ if (obj->render_pre || obj->rect_del) ok = 1;\n+ }\n else\n- if (is_active && (!obj->clip.clipees) &&\n+ if ((is_active) && (obj->restack) && (!obj->clip.clipees) &&\n (_evas_render_can_render(obj) ||\n (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))\n {\n- if (obj->render_pre || obj->rect_del) ok = 1;\n+ if (!(obj->render_pre || obj->rect_del)) ok = 1;\n }\n-\t }\n-\t else\n-\t {\n-\t\t if ((!obj->clip.clipees) && (obj->delete_me == 0) &&\n-\t\t (!obj->cur.have_clipees || (evas_object_was_visible(obj) && (!obj->prev.have_clipees)))\n-\t\t && evas_object_is_opaque(obj) && evas_object_is_visible(obj))\n+ else\n+ if (is_active && (!obj->clip.clipees) &&\n+ (_evas_render_can_render(obj) ||\n+ (evas_object_was_visible(obj) && (!obj->prev.have_clipees))))\n+ {\n+ if (obj->render_pre || obj->rect_del) ok = 1;\n+ }\n+ }\n+ else\n+ {\n+ if ((!obj->clip.clipees) && (obj->delete_me == 0) &&\n+ (!obj->cur.have_clipees || (evas_object_was_visible(obj) && (!obj->prev.have_clipees)))\n+ && evas_object_is_opaque(obj) && evas_object_is_visible(obj))\n {\n if (obj->rect_del || obj->smart.smart) ok = 1;\n }\n-\t }\n-\t }\n-\n- clean_stuff:\n-\tif (!ok)\n-\t {\n-\t eina_array_clean(&e->active_objects);\n-\t eina_array_clean(&e->render_objects);\n-\t eina_array_clean(&e->restack_objects);\n-\t eina_array_clean(&e->delete_objects);\n-\t e->invalidate = 1;\n-\t return ;\n-\t }\n+ }\n+ }\n+\n+clean_stuff:\n+ if (!ok)\n+ {\n+ eina_array_clean(&e->active_objects);\n+ eina_array_clean(&e->render_objects);\n+ eina_array_clean(&e->restack_objects);\n+ eina_array_clean(&e->delete_objects);\n+ e->invalidate = 1;\n+ return ;\n+ }\n }\n }\n \n@@ -594,7 +594,7 @@\n {\n RD(\" OBJ [%p] pending change %i -> 0, pre %i\\n\", obj, obj->changed, obj->pre_render_done);\n obj->pre_render_done = 0;\n-\/\/\/\/ FIXME: this wipes out changes\n+ \/\/\/\/ FIXME: this wipes out changes\n obj->changed = 0;\n obj->changed_move_only = 0;\n obj->changed_nomove = 0;\n@@ -603,9 +603,9 @@\n return obj->changed ? EINA_TRUE : EINA_FALSE;\n }\n \/*\n-static void\n-unchange(Evas_Object *obj)\n-{\n+ static void\n+ unchange(Evas_Object *obj)\n+ {\n Evas_Object *obj2;\n \n if (!obj->changed) return;\n@@ -614,38 +614,38 @@\n obj->changed_nomove = 0;\n obj->changed_move = 0;\n EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)\n- {\n- unchange(obj2);\n- }\n-}\n-\n-static int\n-chlist(Evas_Object *obj, int i)\n-{\n+ {\n+ unchange(obj2);\n+ }\n+ }\n+\n+ static int\n+ chlist(Evas_Object *obj, int i)\n+ {\n Evas_Object *obj2;\n int j;\n int ret = 0;\n \n if (!obj->changed) return 0;\n for (j = 0; j < i; j++) printf(\" \");\n- printf(\"ch2 %p %s %i [%i %i %ix%i] v %i\/%i [r%i] %p\\n\", obj, \n- obj->type, \n- obj->changed_move_only,\n- obj->cur.geometry.x,\n- obj->cur.geometry.y,\n- obj->cur.geometry.w,\n- obj->cur.geometry.h,\n- obj->cur.visible,\n- obj->prev.visible,\n- obj->restack,\n- obj->clip.clipees);\n+ printf(\"ch2 %p %s %i [%i %i %ix%i] v %i\/%i [r%i] %p\\n\", obj,\n+ obj->type,\n+ obj->changed_move_only,\n+ obj->cur.geometry.x,\n+ obj->cur.geometry.y,\n+ obj->cur.geometry.w,\n+ obj->cur.geometry.h,\n+ obj->cur.visible,\n+ obj->prev.visible,\n+ obj->restack,\n+ obj->clip.clipees);\n EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)\n- {\n- if (obj2->changed)\n- ret |= chlist(obj2, i + 1);\n- }\n-}\n-*\/\n+ {\n+ if (obj2->changed)\n+ ret |= chlist(obj2, i + 1);\n+ }\n+ }\n+ *\/\n \n static Eina_Bool\n evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,\n@@ -654,7 +654,7 @@\n #ifdef REND_DGB\n , int level\n #endif\n- )\n+ )\n {\n void *ctx;\n Evas_Object *obj2;\n@@ -675,7 +675,7 @@\n }\n else if (!(((evas_object_is_active(obj) && (!obj->clip.clipees) &&\n (_evas_render_can_render(obj))))\n- ))\n+ ))\n {\n RDI(level);\n RD(\" }\\n\");\n@@ -685,9 +685,9 @@\n \/\/ set render_pre - for child objs that may not have gotten it.\n obj->pre_render_done = 1;\n RD(\" Hasmap: %p (%d) %p %d -> %d\\n\",obj->func->can_map,\n- obj->func->can_map ? obj->func->can_map(obj): -1,\n- obj->cur.map, obj->cur.usemap,\n- _evas_render_has_map(obj));\n+ obj->func->can_map ? obj->func->can_map(obj): -1,\n+ obj->cur.map, obj->cur.usemap,\n+ _evas_render_has_map(obj));\n if (_evas_render_has_map(obj))\n {\n const Evas_Map_Point *p, *p_end;\n@@ -695,7 +695,7 @@\n int sw, sh;\n int changed = 0, rendered = 0;\n \n-\tclean_them = EINA_TRUE;\n+ clean_them = EINA_TRUE;\n \n sw = obj->cur.geometry.w;\n sh = obj->cur.geometry.h;\n@@ -712,7 +712,7 @@\n pts[0].py = obj->cur.map->persp.py << FP;\n pts[0].foc = obj->cur.map->persp.foc << FP;\n pts[0].z0 = obj->cur.map->persp.z0 << FP;\n- \n+\n p = obj->cur.map->points;\n p_end = p + obj->cur.map->count;\n pt = pts;\n@@ -735,7 +735,7 @@\n \/* Copy last for software engine *\/\n if (obj->cur.map->count & 0x1)\n {\n- pts[obj->cur.map->count] = pts[obj->cur.map->count - 1];\n+ pts[obj->cur.map->count] = pts[obj->cur.map->count - 1];\n }\n \n \n@@ -747,7 +747,7 @@\n RDI(level);\n RD(\" new surf: %ix%i\\n\", sw, sh);\n obj->layer->evas->engine.func->image_map_surface_free\n- (e->engine.data.output, obj->cur.map->surface);\n+ (e->engine.data.output, obj->cur.map->surface);\n obj->cur.map->surface = NULL;\n }\n }\n@@ -757,10 +757,10 @@\n obj->cur.map->surface_h = sh;\n \n obj->cur.map->surface =\n- obj->layer->evas->engine.func->image_map_surface_new\n- (e->engine.data.output, obj->cur.map->surface_w,\n- obj->cur.map->surface_h,\n- obj->cur.map->alpha);\n+ obj->layer->evas->engine.func->image_map_surface_new\n+ (e->engine.data.output, obj->cur.map->surface_w,\n+ obj->cur.map->surface_h,\n+ obj->cur.map->alpha);\n RDI(level);\n RD(\" fisrt surf: %ix%i\\n\", sw, sh);\n changed = 1;\n@@ -768,7 +768,7 @@\n if (obj->smart.smart)\n {\n Evas_Object *o2;\n- \n+\n EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), o2)\n {\n if (!evas_object_is_visible(o2) &&\n@@ -782,7 +782,7 @@\n }\n if (o2->changed)\n {\n-\/\/ chlist(o2, 0);\n+ \/\/ chlist(o2, 0);\n changed = 1;\n o2->changed = 0;\n o2->changed_move_only = 0;\n@@ -791,7 +791,7 @@\n break;\n }\n }\n-\/\/ unchange(obj);\n+ \/\/ unchange(obj);\n obj->changed = 0;\n obj->changed_move_only = 0;\n obj->changed_nomove = 0;\n@@ -813,7 +813,7 @@\n if ((changed) && (obj->cur.map->surface))\n {\n int off_x2, off_y2;\n- \n+\n RDI(level);\n RD(\" children redraw\\n\");\n \/\/ FIXME: calculate \"changes\" within map surface and only clear\n@@ -822,9 +822,9 @@\n {\n ctx = e->engine.func->context_new(e->engine.data.output);\n e->engine.func->context_color_set\n- (e->engine.data.output, ctx, 0, 0, 0, 0);\n+ (e->engine.data.output, ctx, 0, 0, 0, 0);\n e->engine.func->context_render_op_set\n- (e->engine.data.output, ctx, EVAS_RENDER_COPY);\n+ (e->engine.data.output, ctx, EVAS_RENDER_COPY);\n e->engine.func->rectangle_draw(e->engine.data.output,\n ctx,\n obj->cur.map->surface,\n@@ -839,17 +839,17 @@\n if (obj->smart.smart)\n {\n EINA_INLIST_FOREACH\n- (evas_object_smart_members_get_direct(obj), obj2)\n- {\n- clean_them |= evas_render_mapped(e, obj2, ctx,\n-\t\t\t\t\t\t\tobj->cur.map->surface,\n-\t\t\t\t\t\t\toff_x2, off_y2, 1,\n- ecx, ecy, ecw, ech\n+ (evas_object_smart_members_get_direct(obj), obj2)\n+ {\n+ clean_them |= evas_render_mapped(e, obj2, ctx,\n+ obj->cur.map->surface,\n+ off_x2, off_y2, 1,\n+ ecx, ecy, ecw, ech\n #ifdef REND_DGB\n-\t\t\t\t\t\t\t, level + 1\n-#endif\n-\t\t\t\t\t\t\t);\n- }\n+ , level + 1\n+#endif\n+ );\n+ }\n }\n else\n {\n@@ -878,12 +878,12 @@\n if (rendered)\n {\n obj->cur.map->surface = e->engine.func->image_dirty_region\n- (e->engine.data.output, obj->cur.map->surface,\n- 0, 0, obj->cur.map->surface_w, obj->cur.map->surface_h);\n+ (e->engine.data.output, obj->cur.map->surface,\n+ 0, 0, obj->cur.map->surface_w, obj->cur.map->surface_h);\n }\n e->engine.func->context_clip_unset(e->engine.data.output,\n e->engine.data.context);\n- if (obj->cur.map->surface) \n+ if (obj->cur.map->surface)\n {\n if (obj->smart.smart)\n {\n@@ -891,7 +891,7 @@\n {\n int x, y, w, h;\n Evas_Object *tobj;\n- \n+\n obj->cur.cache.clip.dirty = 1;\n tobj = obj->cur.map_parent;\n obj->cur.map_parent = obj->cur.clipper->cur.map_parent;\n@@ -902,10 +902,10 @@\n w = obj->cur.cache.clip.w;\n h = obj->cur.cache.clip.h;\n RECTS_CLIP_TO_RECT(x, y, w, h,\n- obj->cur.clipper->cur.cache.clip.x,\n- obj->cur.clipper->cur.cache.clip.y,\n- obj->cur.clipper->cur.cache.clip.w,\n- obj->cur.clipper->cur.cache.clip.h);\n+ obj->cur.clipper->cur.cache.clip.x,\n+ obj->cur.clipper->cur.cache.clip.y,\n+ obj->cur.clipper->cur.cache.clip.w,\n+ obj->cur.clipper->cur.cache.clip.h);\n e->engine.func->context_clip_set(e->engine.data.output,\n e->engine.data.context,\n x + off_x, y + off_y, w, h);\n@@ -916,17 +916,17 @@\n if (obj->cur.clipper)\n {\n int x, y, w, h;\n- \n+\n evas_object_clip_recalc(obj);\n x = obj->cur.cache.clip.x;\n y = obj->cur.cache.clip.y;\n w = obj->cur.cache.clip.w;\n h = obj->cur.cache.clip.h;\n RECTS_CLIP_TO_RECT(x, y, w, h,\n- obj->cur.clipper->cur.cache.clip.x,\n- obj->cur.clipper->cur.cache.clip.y,\n- obj->cur.clipper->cur.cache.clip.w,\n- obj->cur.clipper->cur.cache.clip.h);\n+ obj->cur.clipper->cur.cache.clip.x,\n+ obj->cur.clipper->cur.cache.clip.y,\n+ obj->cur.clipper->cur.cache.clip.w,\n+ obj->cur.clipper->cur.cache.clip.h);\n e->engine.func->context_clip_set(e->engine.data.output,\n e->engine.data.context,\n x + off_x, y + off_y, w, h);\n@@ -934,19 +934,19 @@\n }\n }\n if (surface == e->engine.data.output)\n- e->engine.func->context_clip_clip(e->engine.data.output,\n- e->engine.data.context,\n- ecx, ecy, ecw, ech);\n+ e->engine.func->context_clip_clip(e->engine.data.output,\n+ e->engine.data.context,\n+ ecx, ecy, ecw, ech);\n if (obj->cur.cache.clip.visible)\n- obj->layer->evas->engine.func->image_map_draw\n- (e->engine.data.output, e->engine.data.context, surface,\n- obj->cur.map->surface, obj->cur.map->count, pts,\n- obj->cur.map->smooth, 0);\n+ obj->layer->evas->engine.func->image_map_draw\n+ (e->engine.data.output, e->engine.data.context, surface,\n+ obj->cur.map->surface, obj->cur.map->count, pts,\n+ obj->cur.map->smooth, 0);\n \/\/ FIXME: needs to cache these maps and\n \/\/ keep them only rendering updates\n-\/\/ obj->layer->evas->engine.func->image_map_surface_free\n-\/\/ (e->engine.data.output, obj->cur.map->surface);\n-\/\/ obj->cur.map->surface = NULL;\n+ \/\/ obj->layer->evas->engine.func->image_map_surface_free\n+ \/\/ (e->engine.data.output, obj->cur.map->surface);\n+ \/\/ obj->cur.map->surface = NULL;\n }\n else\n {\n@@ -958,17 +958,17 @@\n if (obj->smart.smart)\n {\n EINA_INLIST_FOREACH\n- (evas_object_smart_members_get_direct(obj), obj2)\n- {\n- clean_them |= evas_render_mapped(e, obj2, ctx,\n-\t\t\t\t\t\t\tsurface,\n-\t\t\t\t\t\t\toff_x, off_y, 1,\n- ecx, ecy, ecw, ech\n+ (evas_object_smart_members_get_direct(obj), obj2)\n+ {\n+ clean_them |= evas_render_mapped(e, obj2, ctx,\n+ surface,\n+ off_x, off_y, 1,\n+ ecx, ecy, ecw, ech\n #ifdef REND_DGB\n-\t\t\t\t\t\t\t, level + 1\n-#endif\n-\t\t\t\t\t\t\t);\n- }\n+ , level + 1\n+#endif\n+ );\n+ }\n }\n else\n {\n@@ -1003,7 +1003,7 @@\n \n RD(\" clip: %i %i %ix%i [%i %i %ix%i]\\n\",\n obj->cur.cache.clip.x + off_x,\n- obj->cur.cache.clip.y + off_y, \n+ obj->cur.cache.clip.y + off_y,\n obj->cur.cache.clip.w,\n obj->cur.cache.clip.h,\n obj->cur.geometry.x + off_x,\n@@ -1020,15 +1020,15 @@\n }\n obj->func->render(obj, e->engine.data.output, ctx,\n surface, off_x, off_y);\n-\/* \n- obj->layer->evas->engine.func->context_color_set(e->engine.data.output,\n- ctx,\n- 0, 30, 0, 30);\n- obj->layer->evas->engine.func->rectangle_draw(e->engine.data.output,\n- ctx,\n- surface,\n- 0, 0, 9999, 9999);\n- *\/\n+ \/*\n+ obj->layer->evas->engine.func->context_color_set(e->engine.data.output,\n+ ctx,\n+ 0, 30, 0, 30);\n+ obj->layer->evas->engine.func->rectangle_draw(e->engine.data.output,\n+ ctx,\n+ surface,\n+ 0, 0, 9999, 9999);\n+ *\/\n }\n e->engine.func->context_free(e->engine.data.output, ctx);\n }\n@@ -1114,10 +1114,10 @@\n \/* phase 2. force updates for restacks *\/\n for (i = 0; i < e->restack_objects.count; ++i)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(&e->restack_objects, i);\n-\tobj->func->render_pre(obj);\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(&e->restack_objects, i);\n+ obj->func->render_pre(obj);\n _evas_render_prev_cur_clip_cache_add(e, obj);\n }\n eina_array_clean(&e->restack_objects);\n@@ -1145,27 +1145,27 @@\n }\n if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))\n {\n-\tERR(\"viewport size != output size!\");\n+ ERR(\"viewport size != output size!\");\n }\n if (redraw_all)\n {\n e->engine.func->output_redraws_rect_add(e->engine.data.output,\n- 0, 0, \n+ 0, 0,\n e->output.w, e->output.h);\n }\n \/* phase 5. add obscures *\/\n EINA_LIST_FOREACH(e->obscures, ll, r)\n {\n e->engine.func->output_redraws_rect_del(e->engine.data.output,\n-\t\t\t\t\t r->x, r->y, r->w, r->h);\n+ r->x, r->y, r->w, r->h);\n }\n \/* build obscure objects list of active objects that obscure *\/\n for (i = 0; i < e->active_objects.count; ++i)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(&e->active_objects, i);\n-\tif (UNLIKELY((evas_object_is_opaque(obj) ||\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(&e->active_objects, i);\n+ if (UNLIKELY((evas_object_is_opaque(obj) ||\n ((obj->func->has_opaque_rect) &&\n (obj->func->has_opaque_rect(obj)))) &&\n evas_object_is_visible(obj) &&\n@@ -1174,140 +1174,140 @@\n (!obj->delete_me) &&\n (obj->cur.cache.clip.visible) &&\n (!obj->smart.smart)))\n-\/*\t obscuring_objects = eina_list_append(obscuring_objects, obj); *\/\n-\t eina_array_push(&e->obscuring_objects, obj);\n+ \/*\t obscuring_objects = eina_list_append(obscuring_objects, obj); *\/\n+ eina_array_push(&e->obscuring_objects, obj);\n }\n \/* save this list *\/\n-\/* obscuring_objects_orig = obscuring_objects; *\/\n-\/* obscuring_objects = NULL; *\/\n+ \/* obscuring_objects_orig = obscuring_objects; *\/\n+ \/* obscuring_objects = NULL; *\/\n \/* phase 6. go thru each update rect and render objects in it*\/\n if (do_draw)\n {\n-\tunsigned int offset = 0;\n-\n-\talpha = e->engine.func->canvas_alpha_get(e->engine.data.output, \n+ unsigned int offset = 0;\n+\n+ alpha = e->engine.func->canvas_alpha_get(e->engine.data.output,\n e->engine.data.context);\n \n-\twhile ((surface =\n-\t\te->engine.func->output_redraws_next_update_get\n+ while ((surface =\n+ e->engine.func->output_redraws_next_update_get\n (e->engine.data.output,\n- &ux, &uy, &uw, &uh,\n- &cx, &cy, &cw, &ch)))\n-\t {\n-\t int off_x, off_y;\n+ &ux, &uy, &uw, &uh,\n+ &cx, &cy, &cw, &ch)))\n+ {\n+ int off_x, off_y;\n \n RD(\" [--- UPDATE %i %i %ix%i\\n\", ux, uy, uw, uh);\n-\t if (make_updates)\n-\t {\n-\t\t Eina_Rectangle *rect;\n-\n-\t\t NEW_RECT(rect, ux, uy, uw, uh);\n-\t\t if (rect)\n-\t\t updates = eina_list_append(updates, rect);\n-\t }\n+ if (make_updates)\n+ {\n+ Eina_Rectangle *rect;\n+\n+ NEW_RECT(rect, ux, uy, uw, uh);\n+ if (rect)\n+ updates = eina_list_append(updates, rect);\n+ }\n haveup = 1;\n-\t off_x = cx - ux;\n-\t off_y = cy - uy;\n-\t \/* build obscuring objects list (in order from bottom to top) *\/\n-\t for (i = 0; i < e->obscuring_objects.count; ++i)\n-\t {\n-\t\t Evas_Object *obj;\n-\n-\t\t obj = (Evas_Object *)eina_array_data_get\n+ off_x = cx - ux;\n+ off_y = cy - uy;\n+ \/* build obscuring objects list (in order from bottom to top) *\/\n+ for (i = 0; i < e->obscuring_objects.count; ++i)\n+ {\n+ Evas_Object *obj;\n+\n+ obj = (Evas_Object *)eina_array_data_get\n (&e->obscuring_objects, i);\n-\t\t if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh))\n-\t\t {\n-\t\t eina_array_push(&e->temporary_objects, obj);\n- \n-\t\t \/* reset the background of the area if needed (using cutout and engine alpha flag to help) *\/\n+ if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh))\n+ {\n+ eina_array_push(&e->temporary_objects, obj);\n+\n+ \/* reset the background of the area if needed (using cutout and engine alpha flag to help) *\/\n if (alpha)\n {\n if (evas_object_is_opaque(obj))\n- e->engine.func->context_cutout_add\n- (e->engine.data.output,\n- e->engine.data.context,\n- obj->cur.cache.clip.x + off_x,\n- obj->cur.cache.clip.y + off_y,\n- obj->cur.cache.clip.w,\n- obj->cur.cache.clip.h);\n-\t\t\t else\n-\t\t\t {\n-\t\t\t\t if (obj->func->get_opaque_rect)\n-\t\t\t\t {\n-\t\t\t\t Evas_Coord obx, oby, obw, obh;\n-\n-\t\t\t\t obj->func->get_opaque_rect\n+ e->engine.func->context_cutout_add\n+ (e->engine.data.output,\n+ e->engine.data.context,\n+ obj->cur.cache.clip.x + off_x,\n+ obj->cur.cache.clip.y + off_y,\n+ obj->cur.cache.clip.w,\n+ obj->cur.cache.clip.h);\n+ else\n+ {\n+ if (obj->func->get_opaque_rect)\n+ {\n+ Evas_Coord obx, oby, obw, obh;\n+\n+ obj->func->get_opaque_rect\n (obj, &obx, &oby, &obw, &obh);\n-\t\t\t\t if ((obw > 0) && (obh > 0))\n-\t\t\t\t\t{\n-\t\t\t\t\t obx += off_x;\n-\t\t\t\t\t oby += off_y;\n-\t\t\t\t\t RECTS_CLIP_TO_RECT\n+ if ((obw > 0) && (obh > 0))\n+ {\n+ obx += off_x;\n+ oby += off_y;\n+ RECTS_CLIP_TO_RECT\n (obx, oby, obw, obh,\n- obj->cur.cache.clip.x + off_x,\n- obj->cur.cache.clip.y + off_y,\n- obj->cur.cache.clip.w,\n- obj->cur.cache.clip.h);\n-\t\t\t\t\t e->engine.func->context_cutout_add\n+ obj->cur.cache.clip.x + off_x,\n+ obj->cur.cache.clip.y + off_y,\n+ obj->cur.cache.clip.w,\n+ obj->cur.cache.clip.h);\n+ e->engine.func->context_cutout_add\n (e->engine.data.output,\n- e->engine.data.context,\n- obx, oby,\n- obw, obh);\n-\t\t\t\t\t}\n-\t\t\t\t }\n-\t\t\t }\n-\t\t\t }\n-\t\t }\n-\t }\n-\t if (alpha)\n-\t {\n-\t\t e->engine.func->context_clip_set(e->engine.data.output,\n-\t\t\t\t\t\t e->engine.data.context,\n-\t\t\t\t\t\t ux, uy, uw, uh);\n-\t\t e->engine.func->context_color_set(e->engine.data.output, \n- e->engine.data.context, \n+ e->engine.data.context,\n+ obx, oby,\n+ obw, obh);\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ if (alpha)\n+ {\n+ e->engine.func->context_clip_set(e->engine.data.output,\n+ e->engine.data.context,\n+ ux, uy, uw, uh);\n+ e->engine.func->context_color_set(e->engine.data.output,\n+ e->engine.data.context,\n 0, 0, 0, 0);\n-\t\t e->engine.func->context_multiplier_unset\n+ e->engine.func->context_multiplier_unset\n (e->engine.data.output, e->engine.data.context);\n-\t\t e->engine.func->context_render_op_set(e->engine.data.output, \n+ e->engine.func->context_render_op_set(e->engine.data.output,\n e->engine.data.context,\n EVAS_RENDER_COPY);\n-\t\t e->engine.func->rectangle_draw(e->engine.data.output,\n-\t\t\t\t\t\t e->engine.data.context,\n-\t\t\t\t\t\t surface,\n-\t\t\t\t\t\t cx, cy, cw, ch);\n-\t\t e->engine.func->context_cutout_clear(e->engine.data.output,\n-\t\t\t\t\t\t e->engine.data.context);\n-\t\t e->engine.func->context_clip_unset(e->engine.data.output,\n+ e->engine.func->rectangle_draw(e->engine.data.output,\n+ e->engine.data.context,\n+ surface,\n+ cx, cy, cw, ch);\n+ e->engine.func->context_cutout_clear(e->engine.data.output,\n+ e->engine.data.context);\n+ e->engine.func->context_clip_unset(e->engine.data.output,\n e->engine.data.context);\n-\t }\n-\t \/* render all object that intersect with rect *\/\n+ }\n+ \/* render all object that intersect with rect *\/\n for (i = 0; i < e->active_objects.count; ++i)\n-\t {\n-\t\t Evas_Object *obj;\n-\n-\t\t obj = eina_array_data_get(&e->active_objects, i);\n-\n-\t\t \/* if it's in our outpout rect and it doesn't clip anything *\/\n+ {\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(&e->active_objects, i);\n+\n+ \/* if it's in our outpout rect and it doesn't clip anything *\/\n RD(\" OBJ: [%p] '%s' %i %i %ix%i\\n\", obj, obj->type, obj->cur.geometry.x, obj->cur.geometry.y, obj->cur.geometry.w, obj->cur.geometry.h);\n-\t\t if ((evas_object_is_in_output_rect(obj, ux, uy, uw, uh) ||\n+ if ((evas_object_is_in_output_rect(obj, ux, uy, uw, uh) ||\n (obj->smart.smart)) &&\n-\t\t (!obj->clip.clipees) &&\n-\t\t (obj->cur.visible) &&\n-\t\t (!obj->delete_me) &&\n-\t\t (obj->cur.cache.clip.visible) &&\n-\/\/\t\t (!obj->smart.smart) &&\n-\t\t ((obj->cur.color.a > 0 || obj->cur.render_op != EVAS_RENDER_BLEND)))\n-\t\t {\n-\t\t int x, y, w, h;\n+ (!obj->clip.clipees) &&\n+ (obj->cur.visible) &&\n+ (!obj->delete_me) &&\n+ (obj->cur.cache.clip.visible) &&\n+ \/\/\t\t (!obj->smart.smart) &&\n+ ((obj->cur.color.a > 0 || obj->cur.render_op != EVAS_RENDER_BLEND)))\n+ {\n+ int x, y, w, h;\n \n RD(\" DRAW (vis: %i, a: %i, clipees: %p\\n\", obj->cur.visible, obj->cur.color.a, obj->clip.clipees);\n-\t\t if ((e->temporary_objects.count > offset) &&\n-\t\t\t (eina_array_data_get(&e->temporary_objects, offset) == obj))\n-\t\t\t offset++;\n-\t\t x = cx; y = cy; w = cw; h = ch;\n-\t\t if (((w > 0) && (h > 0)) || (obj->smart.smart))\n-\t\t\t {\n+ if ((e->temporary_objects.count > offset) &&\n+ (eina_array_data_get(&e->temporary_objects, offset) == obj))\n+ offset++;\n+ x = cx; y = cy; w = cw; h = ch;\n+ if (((w > 0) && (h > 0)) || (obj->smart.smart))\n+ {\n if (!obj->smart.smart)\n {\n RECTS_CLIP_TO_RECT(x, y, w, h,\n@@ -1317,29 +1317,29 @@\n obj->cur.cache.clip.h);\n }\n if (obj->cur.mask)\n- e->engine.func->context_mask_set(e->engine.data.output,\n- e->engine.data.context,\n- obj->cur.mask->func->engine_data_get(obj->cur.mask),\n- obj->cur.mask->cur.geometry.x + off_x,\n- obj->cur.mask->cur.geometry.y + off_y,\n- obj->cur.mask->cur.geometry.w,\n- obj->cur.mask->cur.geometry.h);\n+ e->engine.func->context_mask_set(e->engine.data.output,\n+ e->engine.data.context,\n+ obj->cur.mask->func->engine_data_get(obj->cur.mask),\n+ obj->cur.mask->cur.geometry.x + off_x,\n+ obj->cur.mask->cur.geometry.y + off_y,\n+ obj->cur.mask->cur.geometry.w,\n+ obj->cur.mask->cur.geometry.h);\n else\n- e->engine.func->context_mask_unset(e->engine.data.output,\n- e->engine.data.context);\n+ e->engine.func->context_mask_unset(e->engine.data.output,\n+ e->engine.data.context);\n if (obj->cur.clipper)\n- e->engine.func->context_clip_set(e->engine.data.output,\n- e->engine.data.context,\n- x, y, w, h);\n+ e->engine.func->context_clip_set(e->engine.data.output,\n+ e->engine.data.context,\n+ x, y, w, h);\n else\n- e->engine.func->context_clip_unset(e->engine.data.output,\n- e->engine.data.context);\n+ e->engine.func->context_clip_unset(e->engine.data.output,\n+ e->engine.data.context);\n #if 1 \/* FIXME: this can slow things down... figure out optimum... coverage *\/\n-\t\t\t for (j = offset; j < e->temporary_objects.count; ++j)\n-\t\t\t {\n-\t\t\t\t Evas_Object *obj2;\n-\n-\t\t\t\t obj2 = (Evas_Object *) eina_array_data_get(&e->temporary_objects, j);\n+ for (j = offset; j < e->temporary_objects.count; ++j)\n+ {\n+ Evas_Object *obj2;\n+\n+ obj2 = (Evas_Object *) eina_array_data_get(&e->temporary_objects, j);\n if (evas_object_is_opaque(obj2))\n e->engine.func->context_cutout_add(e->engine.data.output,\n e->engine.data.context,\n@@ -1354,7 +1354,7 @@\n Evas_Coord obx, oby, obw, obh;\n \n obj2->func->get_opaque_rect\n- (obj2, &obx, &oby, &obw, &obh);\n+ (obj2, &obx, &oby, &obw, &obh);\n if ((obw > 0) && (obh > 0))\n {\n obx += off_x;\n@@ -1371,32 +1371,32 @@\n }\n }\n }\n-\t\t\t }\n+ }\n #endif\n e->engine.func->context_clip_set(e->engine.data.output,\n e->engine.data.context,\n x, y, w, h);\n clean_them |= evas_render_mapped(e, obj, e->engine.data.context,\n-\t\t\t\t\t\t\t surface, off_x, off_y, 0,\n+ surface, off_x, off_y, 0,\n cx, cy, cw, ch\n #ifdef REND_DGB\n-\t\t\t\t\t\t\t , 1\n-#endif\n-\t\t\t\t\t\t\t );\n-\t\t\t e->engine.func->context_cutout_clear(e->engine.data.output,\n-\t\t\t\t\t\t\t\t e->engine.data.context);\n-\t\t\t }\n-\t\t }\n-\t }\n-\t \/* punch rect out *\/\n-\t e->engine.func->output_redraws_next_update_push(e->engine.data.output,\n-\t\t\t\t\t\t\t surface,\n-\t\t\t\t\t\t\t ux, uy, uw, uh);\n-\t \/* free obscuring objects list *\/\n-\t eina_array_clean(&e->temporary_objects);\n+ , 1\n+#endif\n+ );\n+ e->engine.func->context_cutout_clear(e->engine.data.output,\n+ e->engine.data.context);\n+ }\n+ }\n+ }\n+ \/* punch rect out *\/\n+ e->engine.func->output_redraws_next_update_push(e->engine.data.output,\n+ surface,\n+ ux, uy, uw, uh);\n+ \/* free obscuring objects list *\/\n+ eina_array_clean(&e->temporary_objects);\n RD(\" ---]\\n\");\n-\t }\n-\t\/* flush redraws *\/\n+ }\n+ \/* flush redraws *\/\n if (haveup)\n {\n evas_event_callback_call(e, EVAS_CALLBACK_RENDER_FLUSH_PRE, NULL);\n@@ -1409,39 +1409,39 @@\n \/* and do a post render pass *\/\n for (i = 0; i < e->active_objects.count; ++i)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(&e->active_objects, i);\n-\tobj->pre_render_done = 0;\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(&e->active_objects, i);\n+ obj->pre_render_done = 0;\n RD(\" OBJ [%p] post... %i %i\\n\", obj, obj->changed, do_draw);\n-\tif ((obj->changed) && (do_draw))\n-\t {\n+ if ((obj->changed) && (do_draw))\n+ {\n RD(\" OBJ [%p] post... func1\\n\", obj);\n-\t obj->func->render_post(obj);\n-\t obj->restack = 0;\n-\t obj->changed = 0;\n+ obj->func->render_post(obj);\n+ obj->restack = 0;\n+ obj->changed = 0;\n obj->changed_move_only = 0;\n obj->changed_nomove = 0;\n obj->changed_move = 0;\n-\t }\n+ }\n else if ((obj->cur.map != obj->prev.map) ||\n (obj->cur.usemap != obj->prev.usemap))\n {\n RD(\" OBJ [%p] post... func2\\n\", obj);\n-\t obj->func->render_post(obj);\n-\t obj->restack = 0;\n-\t obj->changed = 0;\n+ obj->func->render_post(obj);\n+ obj->restack = 0;\n+ obj->changed = 0;\n obj->changed_move_only = 0;\n obj->changed_nomove = 0;\n obj->changed_move = 0;\n }\n-\/* moved to other pre-process phase 1\n-\tif (obj->delete_me == 2)\n-\t {\n-\t delete_objects = eina_list_append(delete_objects, obj);\n-\t }\n-\telse if (obj->delete_me != 0) obj->delete_me++;\n- *\/\n+ \/* moved to other pre-process phase 1\n+ if (obj->delete_me == 2)\n+ {\n+ delete_objects = eina_list_append(delete_objects, obj);\n+ }\n+ else if (obj->delete_me != 0) obj->delete_me++;\n+ *\/\n }\n \/* free our obscuring object list *\/\n eina_array_clean(&e->obscuring_objects);\n@@ -1453,10 +1453,10 @@\n \/* delete all objects flagged for deletion now *\/\n for (i = 0; i < e->delete_objects.count; ++i)\n {\n-\tEvas_Object *obj;\n-\n-\tobj = eina_array_data_get(&e->delete_objects, i);\n-\tevas_object_free(obj, 1);\n+ Evas_Object *obj;\n+\n+ obj = eina_array_data_get(&e->delete_objects, i);\n+ evas_object_free(obj, 1);\n }\n eina_array_clean(&e->delete_objects);\n \n@@ -1477,12 +1477,12 @@\n * it's useless to keep the render object list around. *\/\n if (clean_them)\n {\n-\teina_array_clean(&e->active_objects);\n-\teina_array_clean(&e->render_objects);\n-\teina_array_clean(&e->restack_objects);\n-\teina_array_clean(&e->delete_objects);\n+ eina_array_clean(&e->active_objects);\n+ eina_array_clean(&e->render_objects);\n+ eina_array_clean(&e->restack_objects);\n+ eina_array_clean(&e->delete_objects);\n eina_array_clean(&e->obscuring_objects);\n-\te->invalidate = 1;\n+ e->invalidate = 1;\n }\n \n evas_module_clean();\n@@ -1498,7 +1498,7 @@\n Eina_Rectangle *r;\n \n EINA_LIST_FREE(updates, r)\n- eina_rectangle_free(r);\n+ eina_rectangle_free(r);\n }\n \n EAPI Eina_List *\n@@ -1538,7 +1538,7 @@\n return;\n MAGIC_CHECK_END();\n \n-\/\/ if (!e->changed) return;\n+ \/\/ if (!e->changed) return;\n evas_render_updates_internal(e, 0, 0);\n }\n \n@@ -1584,7 +1584,7 @@\n if ((obj->cur.map) && obj->cur.map->surface)\n {\n obj->layer->evas->engine.func->image_map_surface_free\n- (obj->layer->evas->engine.data.output, obj->cur.map->surface);\n+ (obj->layer->evas->engine.data.output, obj->cur.map->surface);\n obj->cur.map->surface = NULL;\n }\n \n@@ -1593,7 +1593,7 @@\n Evas_Object *obj2;\n \n EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(obj), obj2)\n- _evas_render_dump_map_surfaces(obj2);\n+ _evas_render_dump_map_surfaces(obj2);\n }\n }\n \n@@ -1613,7 +1613,7 @@\n EINA_INLIST_FOREACH(lay->objects, obj)\n {\n if ((obj->type) && (!strcmp(obj->type, \"image\")))\n- evas_object_inform_call_image_unloaded(obj);\n+ evas_object_inform_call_image_unloaded(obj);\n _evas_render_dump_map_surfaces(obj);\n }\n }\n@@ -1648,20 +1648,19 @@\n #ifndef EVAS_FRAME_QUEUING\n if ((!obj->changed) && (obj->delete_me < 2))\n #else\n- if ((!obj->changed))\n-#endif\n- {\n-\tEvas *e;\n-\n-\te = obj->layer->evas;\n-\tif ((!e) || (e->cleanup)) return;\n+ if ((!obj->changed))\n+#endif\n+ {\n+ Evas *e;\n+\n+ e = obj->layer->evas;\n+ if ((!e) || (e->cleanup)) return;\n #ifdef EVAS_FRAME_QUEUING\n- if (obj->delete_me >= evas_common_frameq_get_frameq_sz() + 2) return;\n-#endif\n- eina_array_push(&e->pending_objects, obj);\n-\tobj->changed = 1;\n- }\n-}\n-\n+ if (obj->delete_me >= evas_common_frameq_get_frameq_sz() + 2) return;\n+#endif\n+ eina_array_push(&e->pending_objects, obj);\n+ obj->changed = 1;\n+ }\n+}\n \n \/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*\/\n"} {"commit":"577bbc6984c7d58bf6972b84cd40cae316f36a40","subject":"mesh: Fix ignoring all messages in LPN mode","message":"mesh: Fix ignoring all messages in LPN mode\n\nEven though we have LPN enabled, we might still receive messages\nthrough other network interfaces than the advertising one (e.g. the\nlocal network interface).\n","repos":"IMGJulian\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,mlaz\/mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,andrzej-kaczmarek\/incubator-mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,mlaz\/mynewt-core,andrzej-kaczmarek\/apache-mynewt-core,IMGJulian\/incubator-mynewt-core,IMGJulian\/incubator-mynewt-core,mlaz\/mynewt-core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/nimble\/host\/mesh\/src\/transport.c\n+++ net\/nimble\/host\/mesh\/src\/transport.c\n@@ -1274,7 +1274,7 @@\n \t * be encrypted using the Friend Credentials.\n \t *\/\n \tif ((MYNEWT_VAL(BLE_MESH_LOW_POWER)) &&\n-\t bt_mesh_lpn_established() &&\n+\t bt_mesh_lpn_established() && rx->net_if == BT_MESH_NET_IF_ADV &&\n \t (!bt_mesh_lpn_waiting_update() || !rx->friend_cred)) {\n \t\tBT_WARN(\"Ignoring unexpected message in Low Power mode\");\n \t\treturn -EAGAIN;\n"} {"commit":"85675db0fc7fcc9151f47ab7a5ca8643569d2d1d","subject":"added a get_tile() func","message":"added a get_tile() func\n","repos":"zz85\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,adobe\/glsl2agal,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,zz85\/glsl-optimizer,mapbox\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,metora\/MesaGLSLCompiler,wolf96\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/pipe\/softpipe\/sp_surface.c\n+++ src\/mesa\/pipe\/softpipe\/sp_surface.c\n@@ -30,6 +30,7 @@\n #include \"sp_surface.h\"\n #include \"pipe\/p_defines.h\"\n #include \"main\/imports.h\"\n+#include \"main\/macros.h\"\n \n \n \/**\n@@ -312,6 +313,23 @@\n dst[0] = ssss[2];\n dst[1] = ssss[3];\n }\n+\n+\n+\n+static void\n+a8r8g8b8_get_tile(struct pipe_surface *ps,\n+ GLuint x, GLuint y, GLuint w, GLuint h, GLfloat *p)\n+{\n+ const GLuint *src\n+ = ((const GLuint *) ps->region->map) + y * ps->region->pitch + x;\n+ assert(w == 1);\n+ assert(h == 1);\n+ p[0] = UBYTE_TO_FLOAT((src[0] >> 16) & 0xff);\n+ p[1] = UBYTE_TO_FLOAT((src[0] >> 8) & 0xff);\n+ p[2] = UBYTE_TO_FLOAT((src[0] >> 0) & 0xff);\n+ p[3] = UBYTE_TO_FLOAT((src[0] >> 24) & 0xff);\n+}\n+\n \n \n \n@@ -337,8 +355,14 @@\n sps->read_quad_stencil = s8_read_quad_stencil;\n sps->write_quad_stencil = s8_write_quad_stencil;\n break;\n+ case PIPE_FORMAT_U_A8_R8_G8_B8:\n+ sps->surface.get_tile = a8r8g8b8_get_tile;\n+ break;\n default:\n+ \/*\n assert(0);\n+ *\/\n+ ;\n }\n }\n \n@@ -386,7 +410,7 @@\n assert(zslice == 0);\n }\n \n- ps = pipe->surface_alloc(pipe, mt->internal_format);\n+ ps = pipe->surface_alloc(pipe, mt->format);\n if (ps) {\n assert(ps->format);\n assert(ps->refcount);\n"} {"commit":"a5ff5de1578f7f5b72804c6aa7f6d6233a46b093","subject":"","message":"\n\nfix segv. the list frees already on removal. double free.\n\n\ngit-svn-id: e0f05042a98314c192889e6ebc20eeca840d58d3@34595 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"jordemort\/edbus,jordemort\/edbus","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/lib\/dbus\/e_dbus_signal.c\n+++ src\/lib\/dbus\/e_dbus_signal.c\n@@ -53,7 +53,6 @@\n void\n e_dbus_signal_shutdown(void)\n {\n- printf(\"SHUTDOWN\\n\");\n if (--init) return;\n ecore_list_destroy(signal_handlers);\n \n@@ -68,7 +67,6 @@\n void\n e_dbus_signal_handler_free(E_DBus_Signal_Handler *sh)\n {\n- printf(\"free: %p\\n\", sh);\n if (sh->sender) free(sh->sender);\n if (sh->path) free(sh->path);\n if (sh->interface) free(sh->interface);\n@@ -89,7 +87,6 @@\n {\n if (ecore_list_goto(signal_handlers, sh))\n ecore_list_remove(signal_handlers);\n- e_dbus_signal_handler_free(sh);\n dbus_error_free(err);\n return;\n }\n@@ -189,8 +186,6 @@\n e_dbus_handler_deletions = 1;\n return;\n }\n- if (!ecore_list_goto(signal_handlers, sh)) return;\n- ecore_list_remove(signal_handlers);\n \n strcpy(match, \"type='signal'\");\n len = 13;\n@@ -213,7 +208,8 @@\n \n dbus_bus_remove_match(conn->conn, match, NULL);\n \n- e_dbus_signal_handler_free(sh);\n+ if (!ecore_list_goto(signal_handlers, sh)) return;\n+ ecore_list_remove(signal_handlers);\n }\n \n static int\n"} {"commit":"7230e1a22822ce91f2d2555da53404f195fa9aaf","subject":"st\/mesa: fix shader deletion regression","message":"st\/mesa: fix shader deletion regression\n\nFixes a regression from commit 5cbff0932e498f49b57cbb71037b93416bfe30e0.\nThe problem is *some* glDrawPixels fragment programs need to be deleted,\nbut not all. Use an explicit flag to indicate whether or not the program\nneeds to be deleted.\n\nThis should fix http:\/\/bugs.freedesktop.org\/show_bug.cgi?id=34049\n","repos":"mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler,adobe\/glsl2agal,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,mapbox\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,adobe\/glsl2agal,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,dellis1972\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,dellis1972\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_program.c\n+++ src\/mesa\/state_tracker\/st_program.c\n@@ -406,6 +406,7 @@\n {\n struct pipe_context *pipe = st->pipe;\n struct st_fp_variant *variant = CALLOC_STRUCT(st_fp_variant);\n+ GLboolean deleteFP = GL_FALSE;\n \n if (!variant)\n return NULL;\n@@ -422,6 +423,7 @@\n \n variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);\n stfp = st_fragment_program(fp);\n+ deleteFP = GL_TRUE;\n }\n else if (key->drawpixels) {\n \/* glDrawPixels drawing *\/\n@@ -435,6 +437,7 @@\n \/* RGBA *\/\n st_make_drawpix_fragment_program(st, &stfp->Base, &fp);\n variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);\n+ deleteFP = GL_TRUE;\n }\n stfp = st_fragment_program(fp);\n }\n@@ -632,13 +635,11 @@\n debug_printf(\"\\n\");\n }\n \n-#if FEATURE_drawpix\n- if (key->bitmap || key->drawpixels) {\n+ if (deleteFP) {\n \/* Free the temporary program made above *\/\n struct gl_fragment_program *fp = &stfp->Base;\n _mesa_reference_fragprog(st->ctx, &fp, NULL);\n }\n-#endif\n \n return variant;\n }\n"} {"commit":"40a0d7e930017727d2e0e4307b21800396ca4ba8","subject":"Fix problem reported by clang.","message":"Fix problem reported by clang.\n\nBy: Luis Felipe Strano Moraes\n\n\n\ngit-svn-id: 02aad79badda6dfe9dc72877135550b4bc575585@39256 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore,OpenInkpot-archive\/ecore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/ecore\/ecore_getopt.c\n+++ src\/lib\/ecore\/ecore_getopt.c\n@@ -1103,12 +1103,11 @@\n \t *(double *)data = d;\n \t}\n \tbreak;\n- }\n-\n- if (!data)\n- {\n-\t_ecore_getopt_desc_print_error(desc, \"could not parse value.\\n\");\n-\treturn 0;\n+ default:\n+\t{\n+\t _ecore_getopt_desc_print_error(desc, \"could not parse value.\\n\");\n+\t return 0;\n+\t}\n }\n \n *val->listp = eina_list_append(*val->listp, data);\n"} {"commit":"ab7bd7093dfd18778ece4ed9098666c9ebc68d51","subject":"mesa\/st: fix color outputs in presence of sample mask output","message":"mesa\/st: fix color outputs in presence of sample mask output\n\nCommit c5d822dad90 added support for sample mask incorrectly. It became\ntreated as a color output, and messed up the color output indices.\nRevert the hunk that did that, and add explicit support just like for\ndepth\/stencil writes.\n\nSigned-off-by: Ilia Mirkin <bcbbb7aa705ec3a5fc5824c01a845186c3d62fca@alum.mit.edu>\nAcked-by: Marek Ol\u0161\u00e1k <8c7344a1abdb103e79ecfd488098373070c3c70e@amd.com>\n","repos":"dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,zeux\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/state_tracker\/st_program.c\n+++ src\/mesa\/state_tracker\/st_program.c\n@@ -679,31 +679,35 @@\n outputsWritten &= ~(1 << FRAG_RESULT_STENCIL);\n }\n \n+ if (outputsWritten & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) {\n+ fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_SAMPLEMASK;\n+ fs_output_semantic_index[fs_num_outputs] = 0;\n+ outputMapping[FRAG_RESULT_SAMPLE_MASK] = fs_num_outputs;\n+ fs_num_outputs++;\n+ outputsWritten &= ~(1 << FRAG_RESULT_SAMPLE_MASK);\n+ }\n+\n \/* handle remaining outputs (color) *\/\n for (attr = 0; attr < FRAG_RESULT_MAX; attr++) {\n if (outputsWritten & BITFIELD64_BIT(attr)) {\n- int semantic = TGSI_SEMANTIC_COLOR;\n switch (attr) {\n case FRAG_RESULT_DEPTH:\n case FRAG_RESULT_STENCIL:\n+ case FRAG_RESULT_SAMPLE_MASK:\n \/* handled above *\/\n assert(0);\n break;\n case FRAG_RESULT_COLOR:\n- write_all = GL_TRUE;\n- break;\n- case FRAG_RESULT_SAMPLE_MASK:\n- semantic = TGSI_SEMANTIC_SAMPLEMASK;\n+ write_all = GL_TRUE; \/* fallthrough *\/\n+ default:\n+ assert(attr == FRAG_RESULT_COLOR ||\n+ (FRAG_RESULT_DATA0 <= attr && attr < FRAG_RESULT_MAX));\n+ fs_output_semantic_name[fs_num_outputs] = TGSI_SEMANTIC_COLOR;\n+ fs_output_semantic_index[fs_num_outputs] = numColors;\n+ outputMapping[attr] = fs_num_outputs;\n+ numColors++;\n break;\n }\n-\n- assert(attr == FRAG_RESULT_COLOR ||\n- attr == FRAG_RESULT_SAMPLE_MASK ||\n- (FRAG_RESULT_DATA0 <= attr && attr < FRAG_RESULT_MAX));\n- fs_output_semantic_name[fs_num_outputs] = semantic;\n- fs_output_semantic_index[fs_num_outputs] = numColors;\n- outputMapping[attr] = fs_num_outputs;\n- numColors++;\n \n fs_num_outputs++;\n }\n"} {"commit":"9c053c4fda2d235f172afe3480328101a042b278","subject":"gpasted: port to new GPasteKeybinding","message":"gpasted: port to new GPasteKeybinding\n\nSigned-off-by: Marc-Antoine Perennou <07f76cf0511c79b361712839686f3cee8c75791c@Perennou.com>\n","repos":"Keruspe\/GPaste,Keruspe\/GPaste,Keruspe\/GPaste","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/gpasted\/gpasted.c\n+++ src\/gpasted\/gpasted.c\n@@ -17,9 +17,10 @@\n * along with GPaste. If not, see <http:\/\/www.gnu.org\/licenses\/>.\n *\/\n \n+#include \"gdbus-defines.h\"\n #include \"gpaste-clipboard-common.h\"\n #include \"gpaste-daemon.h\"\n-#include \"gdbus-defines.h\"\n+#include \"gpaste-settings-keys.h\"\n \n #include <glib\/gi18n-lib.h>\n #include <xcb\/xtest.h>\n@@ -28,6 +29,8 @@\n #include <stdio.h>\n #include <stdlib.h>\n \n+#define ELEMENTSOF(foo) sizeof(foo)\/sizeof(foo[0])\n+\n static GMainLoop *main_loop;\n \n static void\n@@ -35,24 +38,6 @@\n {\n g_print (_(\"Signal %d received, exiting\\n\"), signum);\n g_main_loop_quit (main_loop);\n-}\n-\n-typedef enum {\n- G_PASTE_KEYBINDINGS_SHOW_HISTORY,\n- G_PASTE_KEYBINDINGS_PASTE_AND_POP,\n-\n- G_PASTE_KEYBINDINGS_LAST_KEYBINDING\n-} GPasteKeybindings;\n-\n-static void\n-rebind (GPasteSettings *settings G_GNUC_UNUSED,\n- GPasteKeybindings keybinding,\n- gpointer user_data)\n-{\n- \/* Probably broken, but will be removed *\/\n- GPasteKeybinding **keybindings = (GPasteKeybinding **) user_data;\n-\n- g_paste_keybinding_rebind (keybindings[keybinding]);\n }\n \n static void\n@@ -205,28 +190,27 @@\n .history = history\n };\n \n- GPasteKeybinding **keybindings = alloca (G_PASTE_KEYBINDINGS_LAST_KEYBINDING * sizeof (GPasteKeybinding *));\n- keybindings[G_PASTE_KEYBINDINGS_SHOW_HISTORY] = g_paste_keybinding_new (xcb_wrapper,\n- settings,\n- g_paste_settings_get_show_history,\n- (GPasteKeybindingFunc) g_paste_daemon_show_history,\n- g_paste_daemon);\n- keybindings[G_PASTE_KEYBINDINGS_PASTE_AND_POP] = g_paste_keybinding_new (xcb_wrapper,\n- settings,\n- g_paste_settings_get_paste_and_pop,\n- (GPasteKeybindingFunc) paste_and_pop,\n- &data);\n-\n- g_signal_connect (G_OBJECT (settings),\n- \"rebind\",\n- G_CALLBACK (rebind),\n- keybindings);\n+ GPasteKeybinding *keybindings[] = {\n+ g_paste_keybinding_new (xcb_wrapper,\n+ settings,\n+ SHOW_HISTORY_KEY,\n+ g_paste_settings_get_show_history,\n+ (GPasteKeybindingFunc) g_paste_daemon_show_history,\n+ g_paste_daemon),\n+ g_paste_keybinding_new (xcb_wrapper,\n+ settings,\n+ PASTE_AND_POP_KEY,\n+ g_paste_settings_get_paste_and_pop,\n+ (GPasteKeybindingFunc) paste_and_pop,\n+ &data)\n+ };\n+\n g_signal_connect (G_OBJECT (g_paste_daemon),\n \"reexecute-self\",\n G_CALLBACK (reexec),\n NULL); \/* user_data *\/\n \n- for (GPasteKeybindings k = 0; k < G_PASTE_KEYBINDINGS_LAST_KEYBINDING; ++k)\n+ for (guint k = 0; k < ELEMENTSOF (keybindings); ++k)\n g_paste_keybinder_add_keybinding (keybinder, keybindings[k]);\n \n g_paste_history_load (history);\n@@ -242,7 +226,7 @@\n g_object_unref (clipboard);\n g_object_unref (primary);\n \n- for (GPasteKeybindings k = 0; k < G_PASTE_KEYBINDINGS_LAST_KEYBINDING; ++k)\n+ for (guint k = 0; k < ELEMENTSOF (keybindings); ++k)\n g_object_unref (keybindings[k]);\n \n signal (SIGTERM, &signal_handler);\n@@ -261,7 +245,6 @@\n \n g_main_loop_run (main_loop);\n \n- g_signal_handlers_disconnect_by_func (settings, (gpointer) rebind, keybindings);\n g_signal_handlers_disconnect_by_func (g_paste_daemon, (gpointer) reexec, NULL);\n g_object_unref (settings);\n g_object_unref (g_paste_daemon);\n"} {"commit":"9bd8dae655eef04482d679cada61a6c7b1e8eb65","subject":"Include completion_callback.h instead of client_socket_handle.h. This header doesn't use anything from client_socket_handle.h.","message":"Include completion_callback.h instead of client_socket_handle.h.\nThis header doesn't use anything from client_socket_handle.h.\n\nR=vandebo\nBUG=none\nTEST=No compilation errors.\nReview URL: http:\/\/codereview.chromium.org\/579015\n\ngit-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@38492 4ff67af0-8c30-449e-8e8b-ad334ec8d88c\n","repos":"wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser,wistoch\/meego-app-browser","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"35019539d71bacd98de318c34728c97b1b505b49","subject":"[NETFILTER]: netfilter: xt_u32 bug correction","message":"[NETFILTER]: netfilter: xt_u32 bug correction\n\nAn extraneous \";\" makes xt_u32 match useless\n\nSigned-off-by: Eric Dumazet <376627c3b2da88577629dab6f8516ef352eb3ff8@cosmosbay.com>\nSigned-off-by: Patrick McHardy <3a4d625ce225e891399f98db96a382ac4a84080b@trash.net>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/netfilter\/xt_u32.c\n+++ net\/netfilter\/xt_u32.c\n@@ -36,7 +36,7 @@\n \t\tat = 0;\n \t\tpos = ct->location[0].number;\n \n-\t\tif (skb->len < 4 || pos > skb->len - 4);\n+\t\tif (skb->len < 4 || pos > skb->len - 4)\n \t\t\treturn false;\n \n \t\tret = skb_copy_bits(skb, pos, &n, sizeof(n));\n"} {"commit":"5f39745960f4f30a7e4521cc64ece14594494922","subject":"Subtle tweaks.","message":"Subtle tweaks.\n","repos":"worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp,worldforge\/atlas-cpp","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Atlas\/Codec.h\n+++ Atlas\/Codec.h\n@@ -13,7 +13,6 @@\n \n \/** Atlas stream codec\n \n-FIXME update documentation to reflect reality\n This class presents an interface for sending and receiving Atlas messages.\n Each outgoing message is converted to a byte stream and piped through an\n optional chain of filters for compression or other transformations, then\n"} {"commit":"8bcdeaff5ed544704a9a691d4aef0adb3f9c5b8f","subject":"packet: restore packet statistics tp_packets to include drops","message":"packet: restore packet statistics tp_packets to include drops\n\ngetsockopt PACKET_STATISTICS returns tp_packets + tp_drops. Commit\nee80fbf301 (\"packet: account statistics only in tpacket_stats_u\")\ncleaned up the getsockopt PACKET_STATISTICS code.\nThis also changed semantics. Historically, tp_packets included\ntp_drops on return. The commit removed the line that adds tp_drops\ninto tp_packets.\n\nThis patch reinstates the old semantics.\n\nSigned-off-by: Willem de Bruijn <1ee125182537a91f90180f97fc3b3cb011bdf78a@google.com>\nAcked-by: Daniel Borkmann <9ff04a02a69f376b2b9aeec27187017cbf3cf5f9@redhat.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/packet\/af_packet.c\n+++ net\/packet\/af_packet.c\n@@ -3259,9 +3259,11 @@\n \n \t\tif (po->tp_version == TPACKET_V3) {\n \t\t\tlv = sizeof(struct tpacket_stats_v3);\n+\t\t\tst.stats3.tp_packets += st.stats3.tp_drops;\n \t\t\tdata = &st.stats3;\n \t\t} else {\n \t\t\tlv = sizeof(struct tpacket_stats);\n+\t\t\tst.stats1.tp_packets += st.stats1.tp_drops;\n \t\t\tdata = &st.stats1;\n \t\t}\n \n"} {"commit":"755f780112584eba7b0385e8e87a5b743300db63","subject":"shut up","message":"shut up\n\n\ngit-svn-id: 17d41c460f3ddabe6271dd210d2e0bf85f349cae@337 29311d96-e01e-0410-9327-a35deaab8ce9\n","repos":"ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph,ajnelson\/ceph","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ceph\/include\/buffer.h\n+++ ceph\/include\/buffer.h\n@@ -35,11 +35,11 @@\n \n int _ref;\n int _get() { \n-\tcout << \"buffer.get \" << *this << \" get \" << _ref+1 << endl;\n+\t\/\/cout << \"buffer.get \" << *this << \" get \" << _ref+1 << endl;\n \treturn ++_ref; \n }\n int _put() { \n-\tcout << \"buffer.put \" << *this << \" put \" << _ref-1 << endl;\n+\t\/\/cout << \"buffer.put \" << *this << \" put \" << _ref-1 << endl;\n \treturn --_ref; \n }\n \n@@ -48,17 +48,17 @@\n public:\n \/\/ constructors\n buffer() : _dataptr(0), _len(0), _alloc_len(0), _ref(0), _myptr(true) { \n-\tcout << \"buffer.cons \" << *this << endl;\n+\t\/\/cout << \"buffer.cons \" << *this << endl;\n }\n buffer(int a) : _dataptr(0), _len(0), _alloc_len(a), _ref(0), _myptr(true) {\n-\tcout << \"buffer.cons \" << *this << endl;\n+\t\/\/cout << \"buffer.cons \" << *this << endl;\n \t_dataptr = new char[a];\n-\tcout << \"buffer.malloc \" << (void*)_dataptr << endl;\n+\t\/\/cout << \"buffer.malloc \" << (void*)_dataptr << endl;\n }\n ~buffer() {\n-\tcout << \"buffer.des \" << *this << endl;\n+\t\/\/cout << \"buffer.des \" << *this << endl;\n \tif (_dataptr && _myptr) {\n-\t cout << \"buffer.free \" << (void*)_dataptr << endl;\n+\t \/\/cout << \"buffer.free \" << (void*)_dataptr << endl;\n \t delete[] _dataptr;\n \t}\n }\n@@ -70,10 +70,10 @@\n \t _ref(0),\n \t _myptr(0) {\n \t_myptr = mode & BUFFER_MODE_FREE ? true:false;\n-\tcout << \"buffer.cons \" << *this << \" mode = \" << mode << \", myptr=\" << _myptr << endl;\n+\t\/\/cout << \"buffer.cons \" << *this << \" mode = \" << mode << \", myptr=\" << _myptr << endl;\n \tif (mode & BUFFER_MODE_COPY) {\n \t _dataptr = new char[l];\n-\t cout << \"buffer.malloc \" << (void*)_dataptr << endl;\n+\t \/\/cout << \"buffer.malloc \" << (void*)_dataptr << endl;\n \t memcpy(_dataptr, p, l);\n \t \/\/cout << \"buffer(copy) \" << *this << endl;\n \t} else {\n@@ -84,7 +84,6 @@\n \n \/\/ operators\n buffer& operator=(buffer& other) {\n-\t\/\/cout << \"buffer =\" << endl;\n \tassert(0); \/\/ not implemented, no reasonable assignment semantics.\n }\n \n"} {"commit":"8a2222f36c7731966dc15662bf59ef08a0e6deb4","subject":"[sha256]format src\/lib\/libc\/crypto\/sha256.c","message":"[sha256]format src\/lib\/libc\/crypto\/sha256.c\n","repos":"xboot\/xboot,xboot\/xboot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/lib\/libc\/crypto\/sha256.c\n+++ src\/lib\/libc\/crypto\/sha256.c\n@@ -92,15 +92,15 @@\n \r\n void sha256_init(struct sha256_ctx_t * ctx)\r\n {\r\n- ctx->state[0] = 0x6a09e667;\r\n- ctx->state[1] = 0xbb67ae85;\r\n- ctx->state[2] = 0x3c6ef372;\r\n- ctx->state[3] = 0xa54ff53a;\r\n- ctx->state[4] = 0x510e527f;\r\n- ctx->state[5] = 0x9b05688c;\r\n- ctx->state[6] = 0x1f83d9ab;\r\n- ctx->state[7] = 0x5be0cd19;\r\n- ctx->count = 0;\r\n+\tctx->state[0] = 0x6a09e667;\r\n+\tctx->state[1] = 0xbb67ae85;\r\n+\tctx->state[2] = 0x3c6ef372;\r\n+\tctx->state[3] = 0xa54ff53a;\r\n+\tctx->state[4] = 0x510e527f;\r\n+\tctx->state[5] = 0x9b05688c;\r\n+\tctx->state[6] = 0x1f83d9ab;\r\n+\tctx->state[7] = 0x5be0cd19;\r\n+\tctx->count = 0;\r\n }\r\n \r\n void sha256_update(struct sha256_ctx_t * ctx, const void * data, int len)\r\n@@ -127,7 +127,7 @@\n \tint i;\r\n \r\n \tsha256_update(ctx, (uint8_t *)\"\\x80\", 1);\r\n-\twhile ((ctx->count & 63) != 56)\r\n+\twhile((ctx->count & 63) != 56)\r\n \t{\r\n \t\tsha256_update(ctx, (uint8_t *)\"\\0\", 1);\r\n \t}\r\n"} {"commit":"fc515039f895e1534c38b01cc470f2c7a44ecb96","subject":"disable auto-generated id","message":"disable auto-generated id\n","repos":"proudzhu\/MdCharm,zhangshine\/MdCharm,proudzhu\/MdCharm,proudzhu\/MdCharm,heefan\/MdCharm,heefan\/MdCharm,proudzhu\/MdCharm,zhangshine\/MdCharm,proudzhu\/MdCharm,zhangshine\/MdCharm,heefan\/MdCharm,heefan\/MdCharm,proudzhu\/MdCharm,zhangshine\/MdCharm,heefan\/MdCharm,zhangshine\/MdCharm,heefan\/MdCharm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib\/markdown\/html\/html.c\n+++ src\/lib\/markdown\/html\/html.c\n@@ -229,15 +229,15 @@\n \tif (ob->size)\n \t\tbufputc(ob, '\\n');\n \n-\tif (options->flags & HTML_TOC)\n-\t\tbufprintf(ob, \"<h%d id=\\\"toc_%d\\\">\", level, options->toc_data.header_count++);\n- else if (id){\n+ if (id) {\/\/User custom id first\n bufprintf(ob, \"<h%d id=\\\"\", level);\n bufput(ob, id->data, id->size);\n bufput(ob, \"\\\">\", 2);\n+ } else if (options->flags & HTML_TOC) {\n+ bufprintf(ob, \"<h%d id=\\\"toc_%d\\\">\", level, options->toc_data.header_count++);\n+ } else {\n+\t\tbufprintf(ob, \"<h%d>\", level);\n }\n-\telse\n-\t\tbufprintf(ob, \"<h%d>\", level);\n \n \tif (text) bufput(ob, text->data, text->size);\n \tbufprintf(ob, \"<\/h%d>\\n\", level);\n"} {"commit":"ff276691e9f13bc1619cc8f091fb887c2b4f98a1","subject":"cfg80211: unify station WME parsing","message":"cfg80211: unify station WME parsing\n\nInstead of copying the code, create a new function\nto parse the station's WME information.\n\nSigned-off-by: Johannes Berg <bff32994ff0f8d048f262a8388145a71b6071bfe@intel.com>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/wireless\/nl80211.c\n+++ net\/wireless\/nl80211.c\n@@ -3359,13 +3359,43 @@\n \t[NL80211_STA_WME_MAX_SP] = { .type = NLA_U8 },\n };\n \n-static int nl80211_set_station_tdls(struct genl_info *info,\n-\t\t\t\t struct station_parameters *params)\n+static int nl80211_parse_sta_wme(struct genl_info *info,\n+\t\t\t\t struct station_parameters *params)\n {\n \tstruct nlattr *tb[NL80211_STA_WME_MAX + 1];\n \tstruct nlattr *nla;\n \tint err;\n \n+\t\/* parse WME attributes if present *\/\n+\tif (!info->attrs[NL80211_ATTR_STA_WME])\n+\t\treturn 0;\n+\n+\tnla = info->attrs[NL80211_ATTR_STA_WME];\n+\terr = nla_parse_nested(tb, NL80211_STA_WME_MAX, nla,\n+\t\t\t nl80211_sta_wme_policy);\n+\tif (err)\n+\t\treturn err;\n+\n+\tif (tb[NL80211_STA_WME_UAPSD_QUEUES])\n+\t\tparams->uapsd_queues = nla_get_u8(\n+\t\t\ttb[NL80211_STA_WME_UAPSD_QUEUES]);\n+\tif (params->uapsd_queues & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)\n+\t\treturn -EINVAL;\n+\n+\tif (tb[NL80211_STA_WME_MAX_SP])\n+\t\tparams->max_sp = nla_get_u8(tb[NL80211_STA_WME_MAX_SP]);\n+\n+\tif (params->max_sp & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)\n+\t\treturn -EINVAL;\n+\n+\tparams->sta_modify_mask |= STATION_PARAM_APPLY_UAPSD;\n+\n+\treturn 0;\n+}\n+\n+static int nl80211_set_station_tdls(struct genl_info *info,\n+\t\t\t\t struct station_parameters *params)\n+{\n \t\/* Dummy STA entry gets updated once the peer capabilities are known *\/\n \tif (info->attrs[NL80211_ATTR_HT_CAPABILITY])\n \t\tparams->ht_capa =\n@@ -3374,31 +3404,7 @@\n \t\tparams->vht_capa =\n \t\t\tnla_data(info->attrs[NL80211_ATTR_VHT_CAPABILITY]);\n \n-\t\/* parse WME attributes if present *\/\n-\tif (!info->attrs[NL80211_ATTR_STA_WME])\n-\t\treturn 0;\n-\n-\tnla = info->attrs[NL80211_ATTR_STA_WME];\n-\terr = nla_parse_nested(tb, NL80211_STA_WME_MAX, nla,\n-\t\t\t nl80211_sta_wme_policy);\n-\tif (err)\n-\t\treturn err;\n-\n-\tif (tb[NL80211_STA_WME_UAPSD_QUEUES])\n-\t\tparams->uapsd_queues = nla_get_u8(\n-\t\t\ttb[NL80211_STA_WME_UAPSD_QUEUES]);\n-\tif (params->uapsd_queues & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)\n-\t\treturn -EINVAL;\n-\n-\tif (tb[NL80211_STA_WME_MAX_SP])\n-\t\tparams->max_sp = nla_get_u8(tb[NL80211_STA_WME_MAX_SP]);\n-\n-\tif (params->max_sp & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)\n-\t\treturn -EINVAL;\n-\n-\tparams->sta_modify_mask |= STATION_PARAM_APPLY_UAPSD;\n-\n-\treturn 0;\n+\treturn nl80211_parse_sta_wme(info, params);\n }\n \n static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)\n@@ -3674,30 +3680,9 @@\n \t\t\treturn -EINVAL;\n \t}\n \n-\tif (info->attrs[NL80211_ATTR_STA_WME]) {\n-\t\tstruct nlattr *tb[NL80211_STA_WME_MAX + 1];\n-\t\tstruct nlattr *nla;\n-\n-\t\tnla = info->attrs[NL80211_ATTR_STA_WME];\n-\t\terr = nla_parse_nested(tb, NL80211_STA_WME_MAX, nla,\n-\t\t\t\t nl80211_sta_wme_policy);\n-\t\tif (err)\n-\t\t\treturn err;\n-\n-\t\tif (tb[NL80211_STA_WME_UAPSD_QUEUES])\n-\t\t\tparams.uapsd_queues =\n-\t\t\t nla_get_u8(tb[NL80211_STA_WME_UAPSD_QUEUES]);\n-\t\tif (params.uapsd_queues & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)\n-\t\t\treturn -EINVAL;\n-\n-\t\tif (tb[NL80211_STA_WME_MAX_SP])\n-\t\t\tparams.max_sp = nla_get_u8(tb[NL80211_STA_WME_MAX_SP]);\n-\n-\t\tif (params.max_sp & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)\n-\t\t\treturn -EINVAL;\n-\n-\t\tparams.sta_modify_mask |= STATION_PARAM_APPLY_UAPSD;\n-\t}\n+\terr = nl80211_parse_sta_wme(info, ¶ms);\n+\tif (err)\n+\t\treturn err;\n \n \tif (parse_station_flags(info, dev->ieee80211_ptr->iftype, ¶ms))\n \t\treturn -EINVAL;\n"} {"commit":"ece421091c58512101c858e1ab474057fd931e5a","subject":"Update.","message":"Update.\n","repos":"fool2fish\/the-c-programming-language-exercise-answers,geographerwang\/the-c-programming-language-exercise-answers,geographerwang\/the-c-programming-language-exercise-answers,fool2fish\/the-c-programming-language-exercise-answers","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ch05\/5-18-dcl\/parse.c\n+++ ch05\/5-18-dcl\/parse.c\n@@ -16,7 +16,7 @@\n }\n \n void declaration_specifiers() {\n- while (gettoken(), 2 <= tokentype && tokentype <= 4) {\n+ while (gettoken(), STORAGE_CLASS_SPECIFIER <= tokentype && tokentype <= TYPE_QUALIFIER) {\n strcat(specifiers, tokenval);\n strcat(specifiers, \" \");\n }\n"} {"commit":"665f84f6e067555c5aa04474c9466dcc018f77ab","subject":"Style fixes. Not \"int* x;\", but \"int *x;\".","message":"Style fixes. Not \"int* x;\", but \"int *x;\".\n","repos":"HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit,HPCToolkit\/hpctoolkit","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/lib\/prof-lean\/mcs-lock.c\n+++ src\/lib\/prof-lean\/mcs-lock.c\n@@ -134,7 +134,7 @@\n \/\/ (2) acq: any accesses after the exchange can't begin until after\n \/\/ the exchange completes.\n \/\/--------------------------------------------------------------------\n- mcs_node_t* oldme = mcs_nil;\n+ mcs_node_t *oldme = mcs_nil;\n return\n atomic_compare_exchange_strong_explicit(&l->tail, &oldme, me,\n \t\t\t\t\t memory_order_acq_rel,\n@@ -145,7 +145,7 @@\n void\n mcs_unlock(mcs_lock_t *l, mcs_node_t *me)\n {\n- struct mcs_node_s* successor = atomic_load_explicit(&me->next, memory_order_acquire);\n+ mcs_node_t *successor = atomic_load_explicit(&me->next, memory_order_acquire);\n \n if (successor == mcs_nil) {\n \/\/--------------------------------------------------------------------\n@@ -158,7 +158,7 @@\n \/\/ above the exchange must complete before the exchange if the\n \/\/ exchange unlinks me from the tail of the queue\n \/\/--------------------------------------------------------------------\n- mcs_node_t* oldme = me;\n+ mcs_node_t *oldme = me;\n \n if (atomic_compare_exchange_strong_explicit(&l->tail, &oldme, mcs_nil,\n \t\t\t\t\t\tmemory_order_release,\n"} {"commit":"0f067ea2bd19a625e0c898e954748e6d17e74770","subject":"Do not use floating point values as booleans","message":"Do not use floating point values as booleans\n\nWhile GCC lets us get away with it even with -Wfloat-conversion, Clang\nis much more strict, and will error out if you try to use a floating\npoint value truthiness in a condition.\n","repos":"ebassi\/graphene,ebassi\/graphene","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphene-matrix.c\n+++ src\/graphene-matrix.c\n@@ -1792,7 +1792,7 @@\n \n angle = atan2 (row0y, row0x);\n \n- if (angle)\n+ if (angle != 0.f)\n {\n double sn = -row0y, cs = row0x;\n double m11 = row0x, m12 = row0y;\n@@ -1999,9 +1999,9 @@\n }\n \n \/* Do not rotate \"the long way around\" *\/\n- if (!rotate_a)\n+ if (rotate_a == 0.f)\n rotate_a = 360;\n- if (!rotate_b)\n+ if (rotate_b == 0.f)\n rotate_b = 360;\n \n if (fabs (rotate_a - rotate_b) > 180)\n"} {"commit":"a00d7d106aa333c4b4d0095f58e05c0c4621bbc2","subject":"[PATCH] Fix math thinko in similarity estimator.","message":"[PATCH] Fix math thinko in similarity estimator.\n\nThe math to reject delta that is too big was confused.\n\nSigned-off-by: Junio C Hamano <dc50d1021234060e53ec42a77d526afa2fe07479@cox.net>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@osdl.org>\n","repos":"destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git,destenson\/git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- diffcore-rename.c\n+++ diffcore-rename.c\n@@ -163,7 +163,7 @@\n \t\/* A delta that has a lot of literal additions would have\n \t * big delta_size no matter what else it does.\n \t *\/\n-\tif (minimum_score < MAX_SCORE * delta_size \/ base_size)\n+\tif (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)\n \t\treturn 0;\n \n \t\/* Estimate the edit size by interpreting delta. *\/\n"} {"commit":"6c95e2a2f0f0bf4c8880d5b74b2f7f359d352d03","subject":"nl80211: Memory leak fixed","message":"nl80211: Memory leak fixed\n\nPotential memory leak via msg pointer in nl80211_get_key() function.\n\nSigned-off-by: Niko Jokinen <e42d88cde9ee5457ec3e14e0e904a91c3040cf00@nokia.com>\nSigned-off-by: Luciano Coelho <48024ebf6407f04843f8b4062a045f41623c6d61@nokia.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/wireless\/nl80211.c\n+++ net\/wireless\/nl80211.c\n@@ -997,7 +997,7 @@\n \n \tif (IS_ERR(hdr)) {\n \t\terr = PTR_ERR(hdr);\n-\t\tgoto out;\n+\t\tgoto free_msg;\n \t}\n \n \tcookie.msg = msg;\n@@ -1011,7 +1011,7 @@\n \t\t\t\t&cookie, get_key_callback);\n \n \tif (err)\n-\t\tgoto out;\n+\t\tgoto free_msg;\n \n \tif (cookie.error)\n \t\tgoto nla_put_failure;\n@@ -1022,6 +1022,7 @@\n \n nla_put_failure:\n \terr = -ENOBUFS;\n+ free_msg:\n \tnlmsg_free(msg);\n out:\n \tcfg80211_put_dev(drv);\n"} {"commit":"fe4a49e3272c8916f7201427e4cfbb451740faa6","subject":"Update the environment header.","message":"Update the environment header.\n","repos":"edlund\/libpup","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- pup_env.h\n+++ pup_env.h\n@@ -52,6 +52,8 @@\n #include <boost\/algorithm\/string.hpp>\n #include <boost\/asio.hpp>\n #include <boost\/core\/noncopyable.hpp>\n+#include <boost\/crc.hpp>\n+#include <boost\/cstdint.hpp>\n #include <boost\/filesystem.hpp>\n #include <boost\/format.hpp>\n #include <boost\/foreach.hpp>\n"} {"commit":"11a463fd85f65712e035d282739c5675b11bd7c3","subject":"simd4f: Align masks for dot3 fallbacks","message":"simd4f: Align masks for dot3 fallbacks\n\nOn some platforms (mostly 32 bit architectures) we need to force the\nalignment of the unsigned integer masks we use to implement dot3() on\nnon-SSE 4.1 capable platforms.\n","repos":"ebassi\/graphene,ebassi\/graphene","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/graphene-simd4f.h\n+++ src\/graphene-simd4f.h\n@@ -322,7 +322,7 @@\n # else\n # define graphene_simd4f_dot3(a,b) \\\n (__extension__ ({ \\\n- const unsigned int __mask_bits[] = { 0xffffffff, 0xffffffff, 0xffffffff, 0 }; \\\n+ GRAPHENE_ALIGN16 const unsigned int __mask_bits[] = { 0xffffffff, 0xffffffff, 0xffffffff, 0 }; \\\n const graphene_simd4f_t __mask = _mm_load_ps ((const float *) __mask_bits); \\\n const graphene_simd4f_t __m = _mm_mul_ps ((a), (b)); \\\n const graphene_simd4f_t __s0 = _mm_and_ps (__m, __mask); \\\n@@ -599,7 +599,7 @@\n #if defined(GRAPHENE_USE_SSE4_1)\n return _mm_dp_ps (a, b, 0x7f);\n #else\n- const unsigned int __mask_bits[] = { 0xffffffff, 0xffffffff, 0xffffffff, 0 };\n+ GRAPHENE_ALIGN16 const unsigned int __mask_bits[] = { 0xffffffff, 0xffffffff, 0xffffffff, 0 };\n const graphene_simd4f_t __mask = _mm_load_ps ((const float *) __mask_bits);\n const graphene_simd4f_t __m = _mm_mul_ps ((a), (b));\n const graphene_simd4f_t __s0 = _mm_and_ps (__m, __mask);\n"} {"commit":"92527641630bc3739630d5465798f24c5dd93857","subject":"Create pytypes.h","message":"Create pytypes.h\n","repos":"bigdig\/vnpy,bigdig\/vnpy,vnpy\/vnpy,bigdig\/vnpy,vnpy\/vnpy,bigdig\/vnpy","returncode":1,"stderr":"error: pathspec 'vnpy\/api\/xtp\/include\/pybind11\/pytypes.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- vnpy\/api\/xtp\/include\/pybind11\/pytypes.h\n+++ vnpy\/api\/xtp\/include\/pybind11\/pytypes.h\n@@ -0,0 +1,1332 @@\n+\/*\n+ pybind11\/pytypes.h: Convenience wrapper classes for basic Python types\n+\n+ Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>\n+\n+ All rights reserved. Use of this source code is governed by a\n+ BSD-style license that can be found in the LICENSE file.\n+*\/\n+\n+#pragma once\n+\n+#include \"detail\/common.h\"\n+#include \"buffer_info.h\"\n+#include <utility>\n+#include <type_traits>\n+\n+NAMESPACE_BEGIN(PYBIND11_NAMESPACE)\n+\n+\/* A few forward declarations *\/\n+class handle; class object;\n+class str; class iterator;\n+struct arg; struct arg_v;\n+\n+NAMESPACE_BEGIN(detail)\n+class args_proxy;\n+inline bool isinstance_generic(handle obj, const std::type_info &tp);\n+\n+\/\/ Accessor forward declarations\n+template <typename Policy> class accessor;\n+namespace accessor_policies {\n+ struct obj_attr;\n+ struct str_attr;\n+ struct generic_item;\n+ struct sequence_item;\n+ struct list_item;\n+ struct tuple_item;\n+}\n+using obj_attr_accessor = accessor<accessor_policies::obj_attr>;\n+using str_attr_accessor = accessor<accessor_policies::str_attr>;\n+using item_accessor = accessor<accessor_policies::generic_item>;\n+using sequence_accessor = accessor<accessor_policies::sequence_item>;\n+using list_accessor = accessor<accessor_policies::list_item>;\n+using tuple_accessor = accessor<accessor_policies::tuple_item>;\n+\n+\/\/\/ Tag and check to identify a class which implements the Python object API\n+class pyobject_tag { };\n+template <typename T> using is_pyobject = std::is_base_of<pyobject_tag, remove_reference_t<T>>;\n+\n+\/** \\rst\n+ A mixin class which adds common functions to `handle`, `object` and various accessors.\n+ The only requirement for `Derived` is to implement ``PyObject *Derived::ptr() const``.\n+\\endrst *\/\n+template <typename Derived>\n+class object_api : public pyobject_tag {\n+ const Derived &derived() const { return static_cast<const Derived &>(*this); }\n+\n+public:\n+ \/** \\rst\n+ Return an iterator equivalent to calling ``iter()`` in Python. The object\n+ must be a collection which supports the iteration protocol.\n+ \\endrst *\/\n+ iterator begin() const;\n+ \/\/\/ Return a sentinel which ends iteration.\n+ iterator end() const;\n+\n+ \/** \\rst\n+ Return an internal functor to invoke the object's sequence protocol. Casting\n+ the returned ``detail::item_accessor`` instance to a `handle` or `object`\n+ subclass causes a corresponding call to ``__getitem__``. Assigning a `handle`\n+ or `object` subclass causes a call to ``__setitem__``.\n+ \\endrst *\/\n+ item_accessor operator[](handle key) const;\n+ \/\/\/ See above (the only difference is that they key is provided as a string literal)\n+ item_accessor operator[](const char *key) const;\n+\n+ \/** \\rst\n+ Return an internal functor to access the object's attributes. Casting the\n+ returned ``detail::obj_attr_accessor`` instance to a `handle` or `object`\n+ subclass causes a corresponding call to ``getattr``. Assigning a `handle`\n+ or `object` subclass causes a call to ``setattr``.\n+ \\endrst *\/\n+ obj_attr_accessor attr(handle key) const;\n+ \/\/\/ See above (the only difference is that they key is provided as a string literal)\n+ str_attr_accessor attr(const char *key) const;\n+\n+ \/** \\rst\n+ Matches * unpacking in Python, e.g. to unpack arguments out of a ``tuple``\n+ or ``list`` for a function call. Applying another * to the result yields\n+ ** unpacking, e.g. to unpack a dict as function keyword arguments.\n+ See :ref:`calling_python_functions`.\n+ \\endrst *\/\n+ args_proxy operator*() const;\n+\n+ \/\/\/ Check if the given item is contained within this object, i.e. ``item in obj``.\n+ template <typename T> bool contains(T &&item) const;\n+\n+ \/** \\rst\n+ Assuming the Python object is a function or implements the ``__call__``\n+ protocol, ``operator()`` invokes the underlying function, passing an\n+ arbitrary set of parameters. The result is returned as a `object` and\n+ may need to be converted back into a Python object using `handle::cast()`.\n+\n+ When some of the arguments cannot be converted to Python objects, the\n+ function will throw a `cast_error` exception. When the Python function\n+ call fails, a `error_already_set` exception is thrown.\n+ \\endrst *\/\n+ template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>\n+ object operator()(Args &&...args) const;\n+ template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>\n+ PYBIND11_DEPRECATED(\"call(...) was deprecated in favor of operator()(...)\")\n+ object call(Args&&... args) const;\n+\n+ \/\/\/ Equivalent to ``obj is other`` in Python.\n+ bool is(object_api const& other) const { return derived().ptr() == other.derived().ptr(); }\n+ \/\/\/ Equivalent to ``obj is None`` in Python.\n+ bool is_none() const { return derived().ptr() == Py_None; }\n+ PYBIND11_DEPRECATED(\"Use py::str(obj) instead\")\n+ pybind11::str str() const;\n+\n+ \/\/\/ Get or set the object's docstring, i.e. ``obj.__doc__``.\n+ str_attr_accessor doc() const;\n+\n+ \/\/\/ Return the object's current reference count\n+ int ref_count() const { return static_cast<int>(Py_REFCNT(derived().ptr())); }\n+ \/\/\/ Return a handle to the Python type object underlying the instance\n+ handle get_type() const;\n+};\n+\n+NAMESPACE_END(detail)\n+\n+\/** \\rst\n+ Holds a reference to a Python object (no reference counting)\n+\n+ The `handle` class is a thin wrapper around an arbitrary Python object (i.e. a\n+ ``PyObject *`` in Python's C API). It does not perform any automatic reference\n+ counting and merely provides a basic C++ interface to various Python API functions.\n+\n+ .. seealso::\n+ The `object` class inherits from `handle` and adds automatic reference\n+ counting features.\n+\\endrst *\/\n+class handle : public detail::object_api<handle> {\n+public:\n+ \/\/\/ The default constructor creates a handle with a ``nullptr``-valued pointer\n+ handle() = default;\n+ \/\/\/ Creates a ``handle`` from the given raw Python object pointer\n+ handle(PyObject *ptr) : m_ptr(ptr) { } \/\/ Allow implicit conversion from PyObject*\n+\n+ \/\/\/ Return the underlying ``PyObject *`` pointer\n+ PyObject *ptr() const { return m_ptr; }\n+ PyObject *&ptr() { return m_ptr; }\n+\n+ \/** \\rst\n+ Manually increase the reference count of the Python object. Usually, it is\n+ preferable to use the `object` class which derives from `handle` and calls\n+ this function automatically. Returns a reference to itself.\n+ \\endrst *\/\n+ const handle& inc_ref() const & { Py_XINCREF(m_ptr); return *this; }\n+\n+ \/** \\rst\n+ Manually decrease the reference count of the Python object. Usually, it is\n+ preferable to use the `object` class which derives from `handle` and calls\n+ this function automatically. Returns a reference to itself.\n+ \\endrst *\/\n+ const handle& dec_ref() const & { Py_XDECREF(m_ptr); return *this; }\n+\n+ \/** \\rst\n+ Attempt to cast the Python object into the given C++ type. A `cast_error`\n+ will be throw upon failure.\n+ \\endrst *\/\n+ template <typename T> T cast() const;\n+ \/\/\/ Return ``true`` when the `handle` wraps a valid Python object\n+ explicit operator bool() const { return m_ptr != nullptr; }\n+ \/** \\rst\n+ Deprecated: Check that the underlying pointers are the same.\n+ Equivalent to ``obj1 is obj2`` in Python.\n+ \\endrst *\/\n+ PYBIND11_DEPRECATED(\"Use obj1.is(obj2) instead\")\n+ bool operator==(const handle &h) const { return m_ptr == h.m_ptr; }\n+ PYBIND11_DEPRECATED(\"Use !obj1.is(obj2) instead\")\n+ bool operator!=(const handle &h) const { return m_ptr != h.m_ptr; }\n+ PYBIND11_DEPRECATED(\"Use handle::operator bool() instead\")\n+ bool check() const { return m_ptr != nullptr; }\n+protected:\n+ PyObject *m_ptr = nullptr;\n+};\n+\n+\/** \\rst\n+ Holds a reference to a Python object (with reference counting)\n+\n+ Like `handle`, the `object` class is a thin wrapper around an arbitrary Python\n+ object (i.e. a ``PyObject *`` in Python's C API). In contrast to `handle`, it\n+ optionally increases the object's reference count upon construction, and it\n+ *always* decreases the reference count when the `object` instance goes out of\n+ scope and is destructed. When using `object` instances consistently, it is much\n+ easier to get reference counting right at the first attempt.\n+\\endrst *\/\n+class object : public handle {\n+public:\n+ object() = default;\n+ PYBIND11_DEPRECATED(\"Use reinterpret_borrow<object>() or reinterpret_steal<object>()\")\n+ object(handle h, bool is_borrowed) : handle(h) { if (is_borrowed) inc_ref(); }\n+ \/\/\/ Copy constructor; always increases the reference count\n+ object(const object &o) : handle(o) { inc_ref(); }\n+ \/\/\/ Move constructor; steals the object from ``other`` and preserves its reference count\n+ object(object &&other) noexcept { m_ptr = other.m_ptr; other.m_ptr = nullptr; }\n+ \/\/\/ Destructor; automatically calls `handle::dec_ref()`\n+ ~object() { dec_ref(); }\n+\n+ \/** \\rst\n+ Resets the internal pointer to ``nullptr`` without without decreasing the\n+ object's reference count. The function returns a raw handle to the original\n+ Python object.\n+ \\endrst *\/\n+ handle release() {\n+ PyObject *tmp = m_ptr;\n+ m_ptr = nullptr;\n+ return handle(tmp);\n+ }\n+\n+ object& operator=(const object &other) {\n+ other.inc_ref();\n+ dec_ref();\n+ m_ptr = other.m_ptr;\n+ return *this;\n+ }\n+\n+ object& operator=(object &&other) noexcept {\n+ if (this != &other) {\n+ handle temp(m_ptr);\n+ m_ptr = other.m_ptr;\n+ other.m_ptr = nullptr;\n+ temp.dec_ref();\n+ }\n+ return *this;\n+ }\n+\n+ \/\/ Calling cast() on an object lvalue just copies (via handle::cast)\n+ template <typename T> T cast() const &;\n+ \/\/ Calling on an object rvalue does a move, if needed and\/or possible\n+ template <typename T> T cast() &&;\n+\n+protected:\n+ \/\/ Tags for choosing constructors from raw PyObject *\n+ struct borrowed_t { };\n+ struct stolen_t { };\n+\n+ template <typename T> friend T reinterpret_borrow(handle);\n+ template <typename T> friend T reinterpret_steal(handle);\n+\n+public:\n+ \/\/ Only accessible from derived classes and the reinterpret_* functions\n+ object(handle h, borrowed_t) : handle(h) { inc_ref(); }\n+ object(handle h, stolen_t) : handle(h) { }\n+};\n+\n+\/** \\rst\n+ Declare that a `handle` or ``PyObject *`` is a certain type and borrow the reference.\n+ The target type ``T`` must be `object` or one of its derived classes. The function\n+ doesn't do any conversions or checks. It's up to the user to make sure that the\n+ target type is correct.\n+\n+ .. code-block:: cpp\n+\n+ PyObject *p = PyList_GetItem(obj, index);\n+ py::object o = reinterpret_borrow<py::object>(p);\n+ \/\/ or\n+ py::tuple t = reinterpret_borrow<py::tuple>(p); \/\/ <-- `p` must be already be a `tuple`\n+\\endrst *\/\n+template <typename T> T reinterpret_borrow(handle h) { return {h, object::borrowed_t{}}; }\n+\n+\/** \\rst\n+ Like `reinterpret_borrow`, but steals the reference.\n+\n+ .. code-block:: cpp\n+\n+ PyObject *p = PyObject_Str(obj);\n+ py::str s = reinterpret_steal<py::str>(p); \/\/ <-- `p` must be already be a `str`\n+\\endrst *\/\n+template <typename T> T reinterpret_steal(handle h) { return {h, object::stolen_t{}}; }\n+\n+NAMESPACE_BEGIN(detail)\n+inline std::string error_string();\n+NAMESPACE_END(detail)\n+\n+\/\/\/ Fetch and hold an error which was already set in Python. An instance of this is typically\n+\/\/\/ thrown to propagate python-side errors back through C++ which can either be caught manually or\n+\/\/\/ else falls back to the function dispatcher (which then raises the captured error back to\n+\/\/\/ python).\n+class error_already_set : public std::runtime_error {\n+public:\n+ \/\/\/ Constructs a new exception from the current Python error indicator, if any. The current\n+ \/\/\/ Python error indicator will be cleared.\n+ error_already_set() : std::runtime_error(detail::error_string()) {\n+ PyErr_Fetch(&type.ptr(), &value.ptr(), &trace.ptr());\n+ }\n+\n+ inline ~error_already_set();\n+\n+ \/\/\/ Give the currently-held error back to Python, if any. If there is currently a Python error\n+ \/\/\/ already set it is cleared first. After this call, the current object no longer stores the\n+ \/\/\/ error variables (but the `.what()` string is still available).\n+ void restore() { PyErr_Restore(type.release().ptr(), value.release().ptr(), trace.release().ptr()); }\n+\n+ \/\/ Does nothing; provided for backwards compatibility.\n+ PYBIND11_DEPRECATED(\"Use of error_already_set.clear() is deprecated\")\n+ void clear() {}\n+\n+ \/\/\/ Check if the currently trapped error type matches the given Python exception class (or a\n+ \/\/\/ subclass thereof). May also be passed a tuple to search for any exception class matches in\n+ \/\/\/ the given tuple.\n+ bool matches(handle ex) const { return PyErr_GivenExceptionMatches(ex.ptr(), type.ptr()); }\n+\n+private:\n+ object type, value, trace;\n+};\n+\n+\/** \\defgroup python_builtins _\n+ Unless stated otherwise, the following C++ functions behave the same\n+ as their Python counterparts.\n+ *\/\n+\n+\/** \\ingroup python_builtins\n+ \\rst\n+ Return true if ``obj`` is an instance of ``T``. Type ``T`` must be a subclass of\n+ `object` or a class which was exposed to Python as ``py::class_<T>``.\n+\\endrst *\/\n+template <typename T, detail::enable_if_t<std::is_base_of<object, T>::value, int> = 0>\n+bool isinstance(handle obj) { return T::check_(obj); }\n+\n+template <typename T, detail::enable_if_t<!std::is_base_of<object, T>::value, int> = 0>\n+bool isinstance(handle obj) { return detail::isinstance_generic(obj, typeid(T)); }\n+\n+template <> inline bool isinstance<handle>(handle obj) = delete;\n+template <> inline bool isinstance<object>(handle obj) { return obj.ptr() != nullptr; }\n+\n+\/\/\/ \\ingroup python_builtins\n+\/\/\/ Return true if ``obj`` is an instance of the ``type``.\n+inline bool isinstance(handle obj, handle type) {\n+ const auto result = PyObject_IsInstance(obj.ptr(), type.ptr());\n+ if (result == -1)\n+ throw error_already_set();\n+ return result != 0;\n+}\n+\n+\/\/\/ \\addtogroup python_builtins\n+\/\/\/ @{\n+inline bool hasattr(handle obj, handle name) {\n+ return PyObject_HasAttr(obj.ptr(), name.ptr()) == 1;\n+}\n+\n+inline bool hasattr(handle obj, const char *name) {\n+ return PyObject_HasAttrString(obj.ptr(), name) == 1;\n+}\n+\n+inline object getattr(handle obj, handle name) {\n+ PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr());\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_steal<object>(result);\n+}\n+\n+inline object getattr(handle obj, const char *name) {\n+ PyObject *result = PyObject_GetAttrString(obj.ptr(), name);\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_steal<object>(result);\n+}\n+\n+inline object getattr(handle obj, handle name, handle default_) {\n+ if (PyObject *result = PyObject_GetAttr(obj.ptr(), name.ptr())) {\n+ return reinterpret_steal<object>(result);\n+ } else {\n+ PyErr_Clear();\n+ return reinterpret_borrow<object>(default_);\n+ }\n+}\n+\n+inline object getattr(handle obj, const char *name, handle default_) {\n+ if (PyObject *result = PyObject_GetAttrString(obj.ptr(), name)) {\n+ return reinterpret_steal<object>(result);\n+ } else {\n+ PyErr_Clear();\n+ return reinterpret_borrow<object>(default_);\n+ }\n+}\n+\n+inline void setattr(handle obj, handle name, handle value) {\n+ if (PyObject_SetAttr(obj.ptr(), name.ptr(), value.ptr()) != 0) { throw error_already_set(); }\n+}\n+\n+inline void setattr(handle obj, const char *name, handle value) {\n+ if (PyObject_SetAttrString(obj.ptr(), name, value.ptr()) != 0) { throw error_already_set(); }\n+}\n+\n+inline ssize_t hash(handle obj) {\n+ auto h = PyObject_Hash(obj.ptr());\n+ if (h == -1) { throw error_already_set(); }\n+ return h;\n+}\n+\n+\/\/\/ @} python_builtins\n+\n+NAMESPACE_BEGIN(detail)\n+inline handle get_function(handle value) {\n+ if (value) {\n+#if PY_MAJOR_VERSION >= 3\n+ if (PyInstanceMethod_Check(value.ptr()))\n+ value = PyInstanceMethod_GET_FUNCTION(value.ptr());\n+ else\n+#endif\n+ if (PyMethod_Check(value.ptr()))\n+ value = PyMethod_GET_FUNCTION(value.ptr());\n+ }\n+ return value;\n+}\n+\n+\/\/ Helper aliases\/functions to support implicit casting of values given to python accessors\/methods.\n+\/\/ When given a pyobject, this simply returns the pyobject as-is; for other C++ type, the value goes\n+\/\/ through pybind11::cast(obj) to convert it to an `object`.\n+template <typename T, enable_if_t<is_pyobject<T>::value, int> = 0>\n+auto object_or_cast(T &&o) -> decltype(std::forward<T>(o)) { return std::forward<T>(o); }\n+\/\/ The following casting version is implemented in cast.h:\n+template <typename T, enable_if_t<!is_pyobject<T>::value, int> = 0>\n+object object_or_cast(T &&o);\n+\/\/ Match a PyObject*, which we want to convert directly to handle via its converting constructor\n+inline handle object_or_cast(PyObject *ptr) { return ptr; }\n+\n+\n+template <typename Policy>\n+class accessor : public object_api<accessor<Policy>> {\n+ using key_type = typename Policy::key_type;\n+\n+public:\n+ accessor(handle obj, key_type key) : obj(obj), key(std::move(key)) { }\n+ accessor(const accessor &) = default;\n+ accessor(accessor &&) = default;\n+\n+ \/\/ accessor overload required to override default assignment operator (templates are not allowed\n+ \/\/ to replace default compiler-generated assignments).\n+ void operator=(const accessor &a) && { std::move(*this).operator=(handle(a)); }\n+ void operator=(const accessor &a) & { operator=(handle(a)); }\n+\n+ template <typename T> void operator=(T &&value) && {\n+ Policy::set(obj, key, object_or_cast(std::forward<T>(value)));\n+ }\n+ template <typename T> void operator=(T &&value) & {\n+ get_cache() = reinterpret_borrow<object>(object_or_cast(std::forward<T>(value)));\n+ }\n+\n+ template <typename T = Policy>\n+ PYBIND11_DEPRECATED(\"Use of obj.attr(...) as bool is deprecated in favor of pybind11::hasattr(obj, ...)\")\n+ explicit operator enable_if_t<std::is_same<T, accessor_policies::str_attr>::value ||\n+ std::is_same<T, accessor_policies::obj_attr>::value, bool>() const {\n+ return hasattr(obj, key);\n+ }\n+ template <typename T = Policy>\n+ PYBIND11_DEPRECATED(\"Use of obj[key] as bool is deprecated in favor of obj.contains(key)\")\n+ explicit operator enable_if_t<std::is_same<T, accessor_policies::generic_item>::value, bool>() const {\n+ return obj.contains(key);\n+ }\n+\n+ operator object() const { return get_cache(); }\n+ PyObject *ptr() const { return get_cache().ptr(); }\n+ template <typename T> T cast() const { return get_cache().template cast<T>(); }\n+\n+private:\n+ object &get_cache() const {\n+ if (!cache) { cache = Policy::get(obj, key); }\n+ return cache;\n+ }\n+\n+private:\n+ handle obj;\n+ key_type key;\n+ mutable object cache;\n+};\n+\n+NAMESPACE_BEGIN(accessor_policies)\n+struct obj_attr {\n+ using key_type = object;\n+ static object get(handle obj, handle key) { return getattr(obj, key); }\n+ static void set(handle obj, handle key, handle val) { setattr(obj, key, val); }\n+};\n+\n+struct str_attr {\n+ using key_type = const char *;\n+ static object get(handle obj, const char *key) { return getattr(obj, key); }\n+ static void set(handle obj, const char *key, handle val) { setattr(obj, key, val); }\n+};\n+\n+struct generic_item {\n+ using key_type = object;\n+\n+ static object get(handle obj, handle key) {\n+ PyObject *result = PyObject_GetItem(obj.ptr(), key.ptr());\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_steal<object>(result);\n+ }\n+\n+ static void set(handle obj, handle key, handle val) {\n+ if (PyObject_SetItem(obj.ptr(), key.ptr(), val.ptr()) != 0) { throw error_already_set(); }\n+ }\n+};\n+\n+struct sequence_item {\n+ using key_type = size_t;\n+\n+ static object get(handle obj, size_t index) {\n+ PyObject *result = PySequence_GetItem(obj.ptr(), static_cast<ssize_t>(index));\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_steal<object>(result);\n+ }\n+\n+ static void set(handle obj, size_t index, handle val) {\n+ \/\/ PySequence_SetItem does not steal a reference to 'val'\n+ if (PySequence_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.ptr()) != 0) {\n+ throw error_already_set();\n+ }\n+ }\n+};\n+\n+struct list_item {\n+ using key_type = size_t;\n+\n+ static object get(handle obj, size_t index) {\n+ PyObject *result = PyList_GetItem(obj.ptr(), static_cast<ssize_t>(index));\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_borrow<object>(result);\n+ }\n+\n+ static void set(handle obj, size_t index, handle val) {\n+ \/\/ PyList_SetItem steals a reference to 'val'\n+ if (PyList_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.inc_ref().ptr()) != 0) {\n+ throw error_already_set();\n+ }\n+ }\n+};\n+\n+struct tuple_item {\n+ using key_type = size_t;\n+\n+ static object get(handle obj, size_t index) {\n+ PyObject *result = PyTuple_GetItem(obj.ptr(), static_cast<ssize_t>(index));\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_borrow<object>(result);\n+ }\n+\n+ static void set(handle obj, size_t index, handle val) {\n+ \/\/ PyTuple_SetItem steals a reference to 'val'\n+ if (PyTuple_SetItem(obj.ptr(), static_cast<ssize_t>(index), val.inc_ref().ptr()) != 0) {\n+ throw error_already_set();\n+ }\n+ }\n+};\n+NAMESPACE_END(accessor_policies)\n+\n+\/\/\/ STL iterator template used for tuple, list, sequence and dict\n+template <typename Policy>\n+class generic_iterator : public Policy {\n+ using It = generic_iterator;\n+\n+public:\n+ using difference_type = ssize_t;\n+ using iterator_category = typename Policy::iterator_category;\n+ using value_type = typename Policy::value_type;\n+ using reference = typename Policy::reference;\n+ using pointer = typename Policy::pointer;\n+\n+ generic_iterator() = default;\n+ generic_iterator(handle seq, ssize_t index) : Policy(seq, index) { }\n+\n+ reference operator*() const { return Policy::dereference(); }\n+ reference operator[](difference_type n) const { return *(*this + n); }\n+ pointer operator->() const { return **this; }\n+\n+ It &operator++() { Policy::increment(); return *this; }\n+ It operator++(int) { auto copy = *this; Policy::increment(); return copy; }\n+ It &operator--() { Policy::decrement(); return *this; }\n+ It operator--(int) { auto copy = *this; Policy::decrement(); return copy; }\n+ It &operator+=(difference_type n) { Policy::advance(n); return *this; }\n+ It &operator-=(difference_type n) { Policy::advance(-n); return *this; }\n+\n+ friend It operator+(const It &a, difference_type n) { auto copy = a; return copy += n; }\n+ friend It operator+(difference_type n, const It &b) { return b + n; }\n+ friend It operator-(const It &a, difference_type n) { auto copy = a; return copy -= n; }\n+ friend difference_type operator-(const It &a, const It &b) { return a.distance_to(b); }\n+\n+ friend bool operator==(const It &a, const It &b) { return a.equal(b); }\n+ friend bool operator!=(const It &a, const It &b) { return !(a == b); }\n+ friend bool operator< (const It &a, const It &b) { return b - a > 0; }\n+ friend bool operator> (const It &a, const It &b) { return b < a; }\n+ friend bool operator>=(const It &a, const It &b) { return !(a < b); }\n+ friend bool operator<=(const It &a, const It &b) { return !(a > b); }\n+};\n+\n+NAMESPACE_BEGIN(iterator_policies)\n+\/\/\/ Quick proxy class needed to implement ``operator->`` for iterators which can't return pointers\n+template <typename T>\n+struct arrow_proxy {\n+ T value;\n+\n+ arrow_proxy(T &&value) : value(std::move(value)) { }\n+ T *operator->() const { return &value; }\n+};\n+\n+\/\/\/ Lightweight iterator policy using just a simple pointer: see ``PySequence_Fast_ITEMS``\n+class sequence_fast_readonly {\n+protected:\n+ using iterator_category = std::random_access_iterator_tag;\n+ using value_type = handle;\n+ using reference = const handle;\n+ using pointer = arrow_proxy<const handle>;\n+\n+ sequence_fast_readonly(handle obj, ssize_t n) : ptr(PySequence_Fast_ITEMS(obj.ptr()) + n) { }\n+\n+ reference dereference() const { return *ptr; }\n+ void increment() { ++ptr; }\n+ void decrement() { --ptr; }\n+ void advance(ssize_t n) { ptr += n; }\n+ bool equal(const sequence_fast_readonly &b) const { return ptr == b.ptr; }\n+ ssize_t distance_to(const sequence_fast_readonly &b) const { return ptr - b.ptr; }\n+\n+private:\n+ PyObject **ptr;\n+};\n+\n+\/\/\/ Full read and write access using the sequence protocol: see ``detail::sequence_accessor``\n+class sequence_slow_readwrite {\n+protected:\n+ using iterator_category = std::random_access_iterator_tag;\n+ using value_type = object;\n+ using reference = sequence_accessor;\n+ using pointer = arrow_proxy<const sequence_accessor>;\n+\n+ sequence_slow_readwrite(handle obj, ssize_t index) : obj(obj), index(index) { }\n+\n+ reference dereference() const { return {obj, static_cast<size_t>(index)}; }\n+ void increment() { ++index; }\n+ void decrement() { --index; }\n+ void advance(ssize_t n) { index += n; }\n+ bool equal(const sequence_slow_readwrite &b) const { return index == b.index; }\n+ ssize_t distance_to(const sequence_slow_readwrite &b) const { return index - b.index; }\n+\n+private:\n+ handle obj;\n+ ssize_t index;\n+};\n+\n+\/\/\/ Python's dictionary protocol permits this to be a forward iterator\n+class dict_readonly {\n+protected:\n+ using iterator_category = std::forward_iterator_tag;\n+ using value_type = std::pair<handle, handle>;\n+ using reference = const value_type;\n+ using pointer = arrow_proxy<const value_type>;\n+\n+ dict_readonly() = default;\n+ dict_readonly(handle obj, ssize_t pos) : obj(obj), pos(pos) { increment(); }\n+\n+ reference dereference() const { return {key, value}; }\n+ void increment() { if (!PyDict_Next(obj.ptr(), &pos, &key, &value)) { pos = -1; } }\n+ bool equal(const dict_readonly &b) const { return pos == b.pos; }\n+\n+private:\n+ handle obj;\n+ PyObject *key, *value;\n+ ssize_t pos = -1;\n+};\n+NAMESPACE_END(iterator_policies)\n+\n+#if !defined(PYPY_VERSION)\n+using tuple_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;\n+using list_iterator = generic_iterator<iterator_policies::sequence_fast_readonly>;\n+#else\n+using tuple_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;\n+using list_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;\n+#endif\n+\n+using sequence_iterator = generic_iterator<iterator_policies::sequence_slow_readwrite>;\n+using dict_iterator = generic_iterator<iterator_policies::dict_readonly>;\n+\n+inline bool PyIterable_Check(PyObject *obj) {\n+ PyObject *iter = PyObject_GetIter(obj);\n+ if (iter) {\n+ Py_DECREF(iter);\n+ return true;\n+ } else {\n+ PyErr_Clear();\n+ return false;\n+ }\n+}\n+\n+inline bool PyNone_Check(PyObject *o) { return o == Py_None; }\n+\n+inline bool PyUnicode_Check_Permissive(PyObject *o) { return PyUnicode_Check(o) || PYBIND11_BYTES_CHECK(o); }\n+\n+class kwargs_proxy : public handle {\n+public:\n+ explicit kwargs_proxy(handle h) : handle(h) { }\n+};\n+\n+class args_proxy : public handle {\n+public:\n+ explicit args_proxy(handle h) : handle(h) { }\n+ kwargs_proxy operator*() const { return kwargs_proxy(*this); }\n+};\n+\n+\/\/\/ Python argument categories (using PEP 448 terms)\n+template <typename T> using is_keyword = std::is_base_of<arg, T>;\n+template <typename T> using is_s_unpacking = std::is_same<args_proxy, T>; \/\/ * unpacking\n+template <typename T> using is_ds_unpacking = std::is_same<kwargs_proxy, T>; \/\/ ** unpacking\n+template <typename T> using is_positional = satisfies_none_of<T,\n+ is_keyword, is_s_unpacking, is_ds_unpacking\n+>;\n+template <typename T> using is_keyword_or_ds = satisfies_any_of<T, is_keyword, is_ds_unpacking>;\n+\n+\/\/ Call argument collector forward declarations\n+template <return_value_policy policy = return_value_policy::automatic_reference>\n+class simple_collector;\n+template <return_value_policy policy = return_value_policy::automatic_reference>\n+class unpacking_collector;\n+\n+NAMESPACE_END(detail)\n+\n+\/\/ TODO: After the deprecated constructors are removed, this macro can be simplified by\n+\/\/ inheriting ctors: `using Parent::Parent`. It's not an option right now because\n+\/\/ the `using` statement triggers the parent deprecation warning even if the ctor\n+\/\/ isn't even used.\n+#define PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \\\n+ public: \\\n+ PYBIND11_DEPRECATED(\"Use reinterpret_borrow<\"#Name\">() or reinterpret_steal<\"#Name\">()\") \\\n+ Name(handle h, bool is_borrowed) : Parent(is_borrowed ? Parent(h, borrowed_t{}) : Parent(h, stolen_t{})) { } \\\n+ Name(handle h, borrowed_t) : Parent(h, borrowed_t{}) { } \\\n+ Name(handle h, stolen_t) : Parent(h, stolen_t{}) { } \\\n+ PYBIND11_DEPRECATED(\"Use py::isinstance<py::python_type>(obj) instead\") \\\n+ bool check() const { return m_ptr != nullptr && (bool) CheckFun(m_ptr); } \\\n+ static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); }\n+\n+#define PYBIND11_OBJECT_CVT(Name, Parent, CheckFun, ConvertFun) \\\n+ PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \\\n+ \/* This is deliberately not 'explicit' to allow implicit conversion from object: *\/ \\\n+ Name(const object &o) \\\n+ : Parent(check_(o) ? o.inc_ref().ptr() : ConvertFun(o.ptr()), stolen_t{}) \\\n+ { if (!m_ptr) throw error_already_set(); } \\\n+ Name(object &&o) \\\n+ : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) \\\n+ { if (!m_ptr) throw error_already_set(); } \\\n+ template <typename Policy_> \\\n+ Name(const ::pybind11::detail::accessor<Policy_> &a) : Name(object(a)) { }\n+\n+#define PYBIND11_OBJECT(Name, Parent, CheckFun) \\\n+ PYBIND11_OBJECT_COMMON(Name, Parent, CheckFun) \\\n+ \/* This is deliberately not 'explicit' to allow implicit conversion from object: *\/ \\\n+ Name(const object &o) : Parent(o) { } \\\n+ Name(object &&o) : Parent(std::move(o)) { }\n+\n+#define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun) \\\n+ PYBIND11_OBJECT(Name, Parent, CheckFun) \\\n+ Name() : Parent() { }\n+\n+\/\/\/ \\addtogroup pytypes\n+\/\/\/ @{\n+\n+\/** \\rst\n+ Wraps a Python iterator so that it can also be used as a C++ input iterator\n+\n+ Caveat: copying an iterator does not (and cannot) clone the internal\n+ state of the Python iterable. This also applies to the post-increment\n+ operator. This iterator should only be used to retrieve the current\n+ value using ``operator*()``.\n+\\endrst *\/\n+class iterator : public object {\n+public:\n+ using iterator_category = std::input_iterator_tag;\n+ using difference_type = ssize_t;\n+ using value_type = handle;\n+ using reference = const handle;\n+ using pointer = const handle *;\n+\n+ PYBIND11_OBJECT_DEFAULT(iterator, object, PyIter_Check)\n+\n+ iterator& operator++() {\n+ advance();\n+ return *this;\n+ }\n+\n+ iterator operator++(int) {\n+ auto rv = *this;\n+ advance();\n+ return rv;\n+ }\n+\n+ reference operator*() const {\n+ if (m_ptr && !value.ptr()) {\n+ auto& self = const_cast<iterator &>(*this);\n+ self.advance();\n+ }\n+ return value;\n+ }\n+\n+ pointer operator->() const { operator*(); return &value; }\n+\n+ \/** \\rst\n+ The value which marks the end of the iteration. ``it == iterator::sentinel()``\n+ is equivalent to catching ``StopIteration`` in Python.\n+\n+ .. code-block:: cpp\n+\n+ void foo(py::iterator it) {\n+ while (it != py::iterator::sentinel()) {\n+ \/\/ use `*it`\n+ ++it;\n+ }\n+ }\n+ \\endrst *\/\n+ static iterator sentinel() { return {}; }\n+\n+ friend bool operator==(const iterator &a, const iterator &b) { return a->ptr() == b->ptr(); }\n+ friend bool operator!=(const iterator &a, const iterator &b) { return a->ptr() != b->ptr(); }\n+\n+private:\n+ void advance() {\n+ value = reinterpret_steal<object>(PyIter_Next(m_ptr));\n+ if (PyErr_Occurred()) { throw error_already_set(); }\n+ }\n+\n+private:\n+ object value = {};\n+};\n+\n+class iterable : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(iterable, object, detail::PyIterable_Check)\n+};\n+\n+class bytes;\n+\n+class str : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(str, object, detail::PyUnicode_Check_Permissive, raw_str)\n+\n+ str(const char *c, size_t n)\n+ : object(PyUnicode_FromStringAndSize(c, (ssize_t) n), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate string object!\");\n+ }\n+\n+ \/\/ 'explicit' is explicitly omitted from the following constructors to allow implicit conversion to py::str from C++ string-like objects\n+ str(const char *c = \"\")\n+ : object(PyUnicode_FromString(c), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate string object!\");\n+ }\n+\n+ str(const std::string &s) : str(s.data(), s.size()) { }\n+\n+ explicit str(const bytes &b);\n+\n+ \/** \\rst\n+ Return a string representation of the object. This is analogous to\n+ the ``str()`` function in Python.\n+ \\endrst *\/\n+ explicit str(handle h) : object(raw_str(h.ptr()), stolen_t{}) { }\n+\n+ operator std::string() const {\n+ object temp = *this;\n+ if (PyUnicode_Check(m_ptr)) {\n+ temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(m_ptr));\n+ if (!temp)\n+ pybind11_fail(\"Unable to extract string contents! (encoding issue)\");\n+ }\n+ char *buffer;\n+ ssize_t length;\n+ if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length))\n+ pybind11_fail(\"Unable to extract string contents! (invalid type)\");\n+ return std::string(buffer, (size_t) length);\n+ }\n+\n+ template <typename... Args>\n+ str format(Args &&...args) const {\n+ return attr(\"format\")(std::forward<Args>(args)...);\n+ }\n+\n+private:\n+ \/\/\/ Return string representation -- always returns a new reference, even if already a str\n+ static PyObject *raw_str(PyObject *op) {\n+ PyObject *str_value = PyObject_Str(op);\n+#if PY_MAJOR_VERSION < 3\n+ if (!str_value) throw error_already_set();\n+ PyObject *unicode = PyUnicode_FromEncodedObject(str_value, \"utf-8\", nullptr);\n+ Py_XDECREF(str_value); str_value = unicode;\n+#endif\n+ return str_value;\n+ }\n+};\n+\/\/\/ @} pytypes\n+\n+inline namespace literals {\n+\/** \\rst\n+ String literal version of `str`\n+ \\endrst *\/\n+inline str operator\"\" _s(const char *s, size_t size) { return {s, size}; }\n+}\n+\n+\/\/\/ \\addtogroup pytypes\n+\/\/\/ @{\n+class bytes : public object {\n+public:\n+ PYBIND11_OBJECT(bytes, object, PYBIND11_BYTES_CHECK)\n+\n+ \/\/ Allow implicit conversion:\n+ bytes(const char *c = \"\")\n+ : object(PYBIND11_BYTES_FROM_STRING(c), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate bytes object!\");\n+ }\n+\n+ bytes(const char *c, size_t n)\n+ : object(PYBIND11_BYTES_FROM_STRING_AND_SIZE(c, (ssize_t) n), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate bytes object!\");\n+ }\n+\n+ \/\/ Allow implicit conversion:\n+ bytes(const std::string &s) : bytes(s.data(), s.size()) { }\n+\n+ explicit bytes(const pybind11::str &s);\n+\n+ operator std::string() const {\n+ char *buffer;\n+ ssize_t length;\n+ if (PYBIND11_BYTES_AS_STRING_AND_SIZE(m_ptr, &buffer, &length))\n+ pybind11_fail(\"Unable to extract bytes contents!\");\n+ return std::string(buffer, (size_t) length);\n+ }\n+};\n+\n+inline bytes::bytes(const pybind11::str &s) {\n+ object temp = s;\n+ if (PyUnicode_Check(s.ptr())) {\n+ temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(s.ptr()));\n+ if (!temp)\n+ pybind11_fail(\"Unable to extract string contents! (encoding issue)\");\n+ }\n+ char *buffer;\n+ ssize_t length;\n+ if (PYBIND11_BYTES_AS_STRING_AND_SIZE(temp.ptr(), &buffer, &length))\n+ pybind11_fail(\"Unable to extract string contents! (invalid type)\");\n+ auto obj = reinterpret_steal<object>(PYBIND11_BYTES_FROM_STRING_AND_SIZE(buffer, length));\n+ if (!obj)\n+ pybind11_fail(\"Could not allocate bytes object!\");\n+ m_ptr = obj.release().ptr();\n+}\n+\n+inline str::str(const bytes& b) {\n+ char *buffer;\n+ ssize_t length;\n+ if (PYBIND11_BYTES_AS_STRING_AND_SIZE(b.ptr(), &buffer, &length))\n+ pybind11_fail(\"Unable to extract bytes contents!\");\n+ auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, (ssize_t) length));\n+ if (!obj)\n+ pybind11_fail(\"Could not allocate string object!\");\n+ m_ptr = obj.release().ptr();\n+}\n+\n+class none : public object {\n+public:\n+ PYBIND11_OBJECT(none, object, detail::PyNone_Check)\n+ none() : object(Py_None, borrowed_t{}) { }\n+};\n+\n+class bool_ : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(bool_, object, PyBool_Check, raw_bool)\n+ bool_() : object(Py_False, borrowed_t{}) { }\n+ \/\/ Allow implicit conversion from and to `bool`:\n+ bool_(bool value) : object(value ? Py_True : Py_False, borrowed_t{}) { }\n+ operator bool() const { return m_ptr && PyLong_AsLong(m_ptr) != 0; }\n+\n+private:\n+ \/\/\/ Return the truth value of an object -- always returns a new reference\n+ static PyObject *raw_bool(PyObject *op) {\n+ const auto value = PyObject_IsTrue(op);\n+ if (value == -1) return nullptr;\n+ return handle(value ? Py_True : Py_False).inc_ref().ptr();\n+ }\n+};\n+\n+NAMESPACE_BEGIN(detail)\n+\/\/ Converts a value to the given unsigned type. If an error occurs, you get back (Unsigned) -1;\n+\/\/ otherwise you get back the unsigned long or unsigned long long value cast to (Unsigned).\n+\/\/ (The distinction is critically important when casting a returned -1 error value to some other\n+\/\/ unsigned type: (A)-1 != (B)-1 when A and B are unsigned types of different sizes).\n+template <typename Unsigned>\n+Unsigned as_unsigned(PyObject *o) {\n+ if (sizeof(Unsigned) <= sizeof(unsigned long)\n+#if PY_VERSION_HEX < 0x03000000\n+ || PyInt_Check(o)\n+#endif\n+ ) {\n+ unsigned long v = PyLong_AsUnsignedLong(o);\n+ return v == (unsigned long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;\n+ }\n+ else {\n+ unsigned long long v = PyLong_AsUnsignedLongLong(o);\n+ return v == (unsigned long long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;\n+ }\n+}\n+NAMESPACE_END(detail)\n+\n+class int_ : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(int_, object, PYBIND11_LONG_CHECK, PyNumber_Long)\n+ int_() : object(PyLong_FromLong(0), stolen_t{}) { }\n+ \/\/ Allow implicit conversion from C++ integral types:\n+ template <typename T,\n+ detail::enable_if_t<std::is_integral<T>::value, int> = 0>\n+ int_(T value) {\n+ if (sizeof(T) <= sizeof(long)) {\n+ if (std::is_signed<T>::value)\n+ m_ptr = PyLong_FromLong((long) value);\n+ else\n+ m_ptr = PyLong_FromUnsignedLong((unsigned long) value);\n+ } else {\n+ if (std::is_signed<T>::value)\n+ m_ptr = PyLong_FromLongLong((long long) value);\n+ else\n+ m_ptr = PyLong_FromUnsignedLongLong((unsigned long long) value);\n+ }\n+ if (!m_ptr) pybind11_fail(\"Could not allocate int object!\");\n+ }\n+\n+ template <typename T,\n+ detail::enable_if_t<std::is_integral<T>::value, int> = 0>\n+ operator T() const {\n+ return std::is_unsigned<T>::value\n+ ? detail::as_unsigned<T>(m_ptr)\n+ : sizeof(T) <= sizeof(long)\n+ ? (T) PyLong_AsLong(m_ptr)\n+ : (T) PYBIND11_LONG_AS_LONGLONG(m_ptr);\n+ }\n+};\n+\n+class float_ : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(float_, object, PyFloat_Check, PyNumber_Float)\n+ \/\/ Allow implicit conversion from float\/double:\n+ float_(float value) : object(PyFloat_FromDouble((double) value), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate float object!\");\n+ }\n+ float_(double value = .0) : object(PyFloat_FromDouble((double) value), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate float object!\");\n+ }\n+ operator float() const { return (float) PyFloat_AsDouble(m_ptr); }\n+ operator double() const { return (double) PyFloat_AsDouble(m_ptr); }\n+};\n+\n+class weakref : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(weakref, object, PyWeakref_Check)\n+ explicit weakref(handle obj, handle callback = {})\n+ : object(PyWeakref_NewRef(obj.ptr(), callback.ptr()), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate weak reference!\");\n+ }\n+};\n+\n+class slice : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(slice, object, PySlice_Check)\n+ slice(ssize_t start_, ssize_t stop_, ssize_t step_) {\n+ int_ start(start_), stop(stop_), step(step_);\n+ m_ptr = PySlice_New(start.ptr(), stop.ptr(), step.ptr());\n+ if (!m_ptr) pybind11_fail(\"Could not allocate slice object!\");\n+ }\n+ bool compute(size_t length, size_t *start, size_t *stop, size_t *step,\n+ size_t *slicelength) const {\n+ return PySlice_GetIndicesEx((PYBIND11_SLICE_OBJECT *) m_ptr,\n+ (ssize_t) length, (ssize_t *) start,\n+ (ssize_t *) stop, (ssize_t *) step,\n+ (ssize_t *) slicelength) == 0;\n+ }\n+};\n+\n+class capsule : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(capsule, object, PyCapsule_CheckExact)\n+ PYBIND11_DEPRECATED(\"Use reinterpret_borrow<capsule>() or reinterpret_steal<capsule>()\")\n+ capsule(PyObject *ptr, bool is_borrowed) : object(is_borrowed ? object(ptr, borrowed_t{}) : object(ptr, stolen_t{})) { }\n+\n+ explicit capsule(const void *value, const char *name = nullptr, void (*destructor)(PyObject *) = nullptr)\n+ : object(PyCapsule_New(const_cast<void *>(value), name, destructor), stolen_t{}) {\n+ if (!m_ptr)\n+ pybind11_fail(\"Could not allocate capsule object!\");\n+ }\n+\n+ PYBIND11_DEPRECATED(\"Please pass a destructor that takes a void pointer as input\")\n+ capsule(const void *value, void (*destruct)(PyObject *))\n+ : object(PyCapsule_New(const_cast<void*>(value), nullptr, destruct), stolen_t{}) {\n+ if (!m_ptr)\n+ pybind11_fail(\"Could not allocate capsule object!\");\n+ }\n+\n+ capsule(const void *value, void (*destructor)(void *)) {\n+ m_ptr = PyCapsule_New(const_cast<void *>(value), nullptr, [](PyObject *o) {\n+ auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));\n+ void *ptr = PyCapsule_GetPointer(o, nullptr);\n+ destructor(ptr);\n+ });\n+\n+ if (!m_ptr)\n+ pybind11_fail(\"Could not allocate capsule object!\");\n+\n+ if (PyCapsule_SetContext(m_ptr, (void *) destructor) != 0)\n+ pybind11_fail(\"Could not set capsule context!\");\n+ }\n+\n+ capsule(void (*destructor)()) {\n+ m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {\n+ auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, nullptr));\n+ destructor();\n+ });\n+\n+ if (!m_ptr)\n+ pybind11_fail(\"Could not allocate capsule object!\");\n+ }\n+\n+ template <typename T> operator T *() const {\n+ auto name = this->name();\n+ T * result = static_cast<T *>(PyCapsule_GetPointer(m_ptr, name));\n+ if (!result) pybind11_fail(\"Unable to extract capsule contents!\");\n+ return result;\n+ }\n+\n+ const char *name() const { return PyCapsule_GetName(m_ptr); }\n+};\n+\n+class tuple : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(tuple, object, PyTuple_Check, PySequence_Tuple)\n+ explicit tuple(size_t size = 0) : object(PyTuple_New((ssize_t) size), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate tuple object!\");\n+ }\n+ size_t size() const { return (size_t) PyTuple_Size(m_ptr); }\n+ detail::tuple_accessor operator[](size_t index) const { return {*this, index}; }\n+ detail::tuple_iterator begin() const { return {*this, 0}; }\n+ detail::tuple_iterator end() const { return {*this, PyTuple_GET_SIZE(m_ptr)}; }\n+};\n+\n+class dict : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(dict, object, PyDict_Check, raw_dict)\n+ dict() : object(PyDict_New(), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate dict object!\");\n+ }\n+ template <typename... Args,\n+ typename = detail::enable_if_t<detail::all_of<detail::is_keyword_or_ds<Args>...>::value>,\n+ \/\/ MSVC workaround: it can't compile an out-of-line definition, so defer the collector\n+ typename collector = detail::deferred_t<detail::unpacking_collector<>, Args...>>\n+ explicit dict(Args &&...args) : dict(collector(std::forward<Args>(args)...).kwargs()) { }\n+\n+ size_t size() const { return (size_t) PyDict_Size(m_ptr); }\n+ detail::dict_iterator begin() const { return {*this, 0}; }\n+ detail::dict_iterator end() const { return {}; }\n+ void clear() const { PyDict_Clear(ptr()); }\n+ bool contains(handle key) const { return PyDict_Contains(ptr(), key.ptr()) == 1; }\n+ bool contains(const char *key) const { return PyDict_Contains(ptr(), pybind11::str(key).ptr()) == 1; }\n+\n+private:\n+ \/\/\/ Call the `dict` Python type -- always returns a new reference\n+ static PyObject *raw_dict(PyObject *op) {\n+ if (PyDict_Check(op))\n+ return handle(op).inc_ref().ptr();\n+ return PyObject_CallFunctionObjArgs((PyObject *) &PyDict_Type, op, nullptr);\n+ }\n+};\n+\n+class sequence : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(sequence, object, PySequence_Check)\n+ size_t size() const { return (size_t) PySequence_Size(m_ptr); }\n+ detail::sequence_accessor operator[](size_t index) const { return {*this, index}; }\n+ detail::sequence_iterator begin() const { return {*this, 0}; }\n+ detail::sequence_iterator end() const { return {*this, PySequence_Size(m_ptr)}; }\n+};\n+\n+class list : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(list, object, PyList_Check, PySequence_List)\n+ explicit list(size_t size = 0) : object(PyList_New((ssize_t) size), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate list object!\");\n+ }\n+ size_t size() const { return (size_t) PyList_Size(m_ptr); }\n+ detail::list_accessor operator[](size_t index) const { return {*this, index}; }\n+ detail::list_iterator begin() const { return {*this, 0}; }\n+ detail::list_iterator end() const { return {*this, PyList_GET_SIZE(m_ptr)}; }\n+ template <typename T> void append(T &&val) const {\n+ PyList_Append(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr());\n+ }\n+};\n+\n+class args : public tuple { PYBIND11_OBJECT_DEFAULT(args, tuple, PyTuple_Check) };\n+class kwargs : public dict { PYBIND11_OBJECT_DEFAULT(kwargs, dict, PyDict_Check) };\n+\n+class set : public object {\n+public:\n+ PYBIND11_OBJECT_CVT(set, object, PySet_Check, PySet_New)\n+ set() : object(PySet_New(nullptr), stolen_t{}) {\n+ if (!m_ptr) pybind11_fail(\"Could not allocate set object!\");\n+ }\n+ size_t size() const { return (size_t) PySet_Size(m_ptr); }\n+ template <typename T> bool add(T &&val) const {\n+ return PySet_Add(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 0;\n+ }\n+ void clear() const { PySet_Clear(m_ptr); }\n+};\n+\n+class function : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(function, object, PyCallable_Check)\n+ handle cpp_function() const {\n+ handle fun = detail::get_function(m_ptr);\n+ if (fun && PyCFunction_Check(fun.ptr()))\n+ return fun;\n+ return handle();\n+ }\n+ bool is_cpp_function() const { return (bool) cpp_function(); }\n+};\n+\n+class buffer : public object {\n+public:\n+ PYBIND11_OBJECT_DEFAULT(buffer, object, PyObject_CheckBuffer)\n+\n+ buffer_info request(bool writable = false) {\n+ int flags = PyBUF_STRIDES | PyBUF_FORMAT;\n+ if (writable) flags |= PyBUF_WRITABLE;\n+ Py_buffer *view = new Py_buffer();\n+ if (PyObject_GetBuffer(m_ptr, view, flags) != 0) {\n+ delete view;\n+ throw error_already_set();\n+ }\n+ return buffer_info(view);\n+ }\n+};\n+\n+class memoryview : public object {\n+public:\n+ explicit memoryview(const buffer_info& info) {\n+ static Py_buffer buf { };\n+ \/\/ Py_buffer uses signed sizes, strides and shape!..\n+ static std::vector<Py_ssize_t> py_strides { };\n+ static std::vector<Py_ssize_t> py_shape { };\n+ buf.buf = info.ptr;\n+ buf.itemsize = info.itemsize;\n+ buf.format = const_cast<char *>(info.format.c_str());\n+ buf.ndim = (int) info.ndim;\n+ buf.len = info.size;\n+ py_strides.clear();\n+ py_shape.clear();\n+ for (size_t i = 0; i < (size_t) info.ndim; ++i) {\n+ py_strides.push_back(info.strides[i]);\n+ py_shape.push_back(info.shape[i]);\n+ }\n+ buf.strides = py_strides.data();\n+ buf.shape = py_shape.data();\n+ buf.suboffsets = nullptr;\n+ buf.readonly = false;\n+ buf.internal = nullptr;\n+\n+ m_ptr = PyMemoryView_FromBuffer(&buf);\n+ if (!m_ptr)\n+ pybind11_fail(\"Unable to create memoryview from buffer descriptor\");\n+ }\n+\n+ PYBIND11_OBJECT_CVT(memoryview, object, PyMemoryView_Check, PyMemoryView_FromObject)\n+};\n+\/\/\/ @} pytypes\n+\n+\/\/\/ \\addtogroup python_builtins\n+\/\/\/ @{\n+inline size_t len(handle h) {\n+ ssize_t result = PyObject_Length(h.ptr());\n+ if (result < 0)\n+ pybind11_fail(\"Unable to compute length of object\");\n+ return (size_t) result;\n+}\n+\n+inline str repr(handle h) {\n+ PyObject *str_value = PyObject_Repr(h.ptr());\n+ if (!str_value) throw error_already_set();\n+#if PY_MAJOR_VERSION < 3\n+ PyObject *unicode = PyUnicode_FromEncodedObject(str_value, \"utf-8\", nullptr);\n+ Py_XDECREF(str_value); str_value = unicode;\n+ if (!str_value) throw error_already_set();\n+#endif\n+ return reinterpret_steal<str>(str_value);\n+}\n+\n+inline iterator iter(handle obj) {\n+ PyObject *result = PyObject_GetIter(obj.ptr());\n+ if (!result) { throw error_already_set(); }\n+ return reinterpret_steal<iterator>(result);\n+}\n+\/\/\/ @} python_builtins\n+\n+NAMESPACE_BEGIN(detail)\n+template <typename D> iterator object_api<D>::begin() const { return iter(derived()); }\n+template <typename D> iterator object_api<D>::end() const { return iterator::sentinel(); }\n+template <typename D> item_accessor object_api<D>::operator[](handle key) const {\n+ return {derived(), reinterpret_borrow<object>(key)};\n+}\n+template <typename D> item_accessor object_api<D>::operator[](const char *key) const {\n+ return {derived(), pybind11::str(key)};\n+}\n+template <typename D> obj_attr_accessor object_api<D>::attr(handle key) const {\n+ return {derived(), reinterpret_borrow<object>(key)};\n+}\n+template <typename D> str_attr_accessor object_api<D>::attr(const char *key) const {\n+ return {derived(), key};\n+}\n+template <typename D> args_proxy object_api<D>::operator*() const {\n+ return args_proxy(derived().ptr());\n+}\n+template <typename D> template <typename T> bool object_api<D>::contains(T &&item) const {\n+ return attr(\"__contains__\")(std::forward<T>(item)).template cast<bool>();\n+}\n+\n+template <typename D>\n+pybind11::str object_api<D>::str() const { return pybind11::str(derived()); }\n+\n+template <typename D>\n+str_attr_accessor object_api<D>::doc() const { return attr(\"__doc__\"); }\n+\n+template <typename D>\n+handle object_api<D>::get_type() const { return (PyObject *) Py_TYPE(derived().ptr()); }\n+\n+NAMESPACE_END(detail)\n+NAMESPACE_END(PYBIND11_NAMESPACE)\n"} {"commit":"0f6399c4c525b518644a9b09f8d6fb125a418c4d","subject":"nl80211: use GFP_ATOMIC for michael mic failure message","message":"nl80211: use GFP_ATOMIC for michael mic failure message\n\nnl80211_michael_mic_failure can be called in atomic context but\ndoes a GFP_KERNEL allocation. Fixes the error below:\n\n[ 126.793225] BUG: sleeping function called from invalid context at mm\/slab.c:3055\n[ 126.793234] in_atomic(): 1, irqs_disabled(): 0, pid: 0, name: swapper\n[ 126.793241] 2 locks held by swapper\/0:\n[ 126.793246] #0: (&sc->rxbuflock){+.-.+.}, at: [<f94e1b46>] ath5k_tasklet_rx+0x34\/0x55e [ath5k]\n[ 126.793294] #1: (rcu_read_lock){.+.+.+}, at: [<f92872f3>] __ieee80211_rx+0x7e\/0x563 [mac80211]\n[ 126.793342] Pid: 0, comm: swapper Not tainted 2.6.30-rc7-wl #124\n[ 126.793347] Call Trace:\n[ 126.793361] [<c014499d>] ? __debug_show_held_locks+0x1e\/0x20\n[ 126.793380] [<c011e9a3>] __might_sleep+0x100\/0x107\n[ 126.793386] [<c018ea99>] kmem_cache_alloc+0x35\/0x170\n[ 126.793393] [<c02e8bb1>] ? __alloc_skb+0x2e\/0x117\n[ 126.793397] [<c014517d>] ? mark_held_locks+0x43\/0x5b\n[ 126.793402] [<c02e8bb1>] __alloc_skb+0x2e\/0x117\n[ 126.793419] [<f851a836>] nl80211_michael_mic_failure+0x2a\/0x1fa [cfg80211]\n[ 126.793425] [<c01453b8>] ? trace_hardirqs_on_caller+0xf6\/0x130\n[ 126.793430] [<c01453fd>] ? trace_hardirqs_on+0xb\/0xd\n[ 126.793444] [<f851b2b8>] cfg80211_michael_mic_failure+0x30\/0x38 [cfg80211]\n[ 126.793463] [<f928bf69>] mac80211_ev_michael_mic_failure+0xfd\/0x108 [mac80211]\n[ 126.793480] [<f9279fbd>] ieee80211_rx_h_michael_mic_verify+0xd4\/0x117 [mac80211]\n[ 126.793499] [<f9285ef3>] ieee80211_invoke_rx_handlers+0xdde\/0x1963 [mac80211]\n[ 126.793505] [<c0107152>] ? sched_clock+0x3f\/0x64\n[ 126.793511] [<c0107152>] ? sched_clock+0x3f\/0x64\n[ 126.793516] [<c01445d7>] ? trace_hardirqs_off+0xb\/0xd\n[ 126.793521] [<c0107152>] ? sched_clock+0x3f\/0x64\n[ 126.793526] [<c0146454>] ? __lock_acquire+0x62c\/0x1271\n[ 126.793545] [<f9286fbb>] __ieee80211_rx_handle_packet+0x543\/0x564 [mac80211]\n[ 126.793564] [<f9287757>] __ieee80211_rx+0x4e2\/0x563 [mac80211]\n[ 126.793577] [<f94e1ff6>] ath5k_tasklet_rx+0x4e4\/0x55e [ath5k]\n[ 126.793583] [<c0102b54>] ? restore_nocheck_notrace+0x0\/0xe\n[ 126.793589] [<c0129aa2>] tasklet_action+0x92\/0xe5\n[ 126.793594] [<c0129f22>] __do_softirq+0xb1\/0x182\n[ 126.793599] [<c012a023>] do_softirq+0x30\/0x48\n[ 126.793603] [<c012a19b>] irq_exit+0x3d\/0x74\n[ 126.793609] [<c0358016>] do_IRQ+0x76\/0x8c\n[ 126.793613] [<c010312e>] common_interrupt+0x2e\/0x34\n[ 126.793618] [<c014007b>] ? timer_list_show+0x277\/0x939\n[ 126.793630] [<f88eb321>] ? acpi_idle_enter_bm+0x266\/0x291 [processor]\n[ 126.793636] [<c02d00f6>] cpuidle_idle_call+0x6a\/0x9c\n[ 126.793640] [<c0101cc8>] cpu_idle+0x53\/0x87\n[ 126.793645] [<c0344510>] rest_init+0x6c\/0x6e\n[ 126.793651] [<c04dd74d>] start_kernel+0x286\/0x28b\n[ 126.793656] [<c04dd037>] __init_begin+0x37\/0x3c\n\nSigned-off-by: Bob Copeland <b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@bobcopeland.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/wireless\/nl80211.c\n+++ net\/wireless\/nl80211.c\n@@ -3871,7 +3871,7 @@\n \tstruct sk_buff *msg;\n \tvoid *hdr;\n \n-\tmsg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);\n+\tmsg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);\n \tif (!msg)\n \t\treturn;\n \n@@ -3895,7 +3895,7 @@\n \t\treturn;\n \t}\n \n-\tgenlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, GFP_KERNEL);\n+\tgenlmsg_multicast(msg, 0, nl80211_mlme_mcgrp.id, GFP_ATOMIC);\n \treturn;\n \n nla_put_failure:\n"} {"commit":"dbfef83768956437de90051dd2e18b4e9c6d5823","subject":"no need for NSAnimationDelegate","message":"no need for NSAnimationDelegate\n\ngit-svn-id: 765db44a9620ed55f4f8addfd3c14fe8cd57f6bb@5760 0fceea05-a30d-0410-8a8b-80ef821fb0a1\n","repos":"nanoant\/Skim,nanoant\/Skim,nanoant\/Skim,nanoant\/Skim,nanoant\/Skim","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- SKCompatibility.h\n+++ SKCompatibility.h\n@@ -51,7 +51,6 @@\n @protocol NSMenuDelegate <NSObject> @end\n @protocol NSDrawerDelegate <NSObject> @end\n @protocol NSWindowDelegate <NSObject> @end\n-@protocol NSAnimationDelegate <NSObject> @end\n @protocol NSTextDelegate <NSObject> @end\n @protocol NSTextViewDelegate <NSTextDelegate> @end\n @protocol NSTextStorageDelegate <NSObject> @end\n"} {"commit":"2670a8c3e69469ff44a75f198c62941d1eab9203","subject":"slight optimization to conversion of M\/S->L\/R","message":"slight optimization to conversion of M\/S->L\/R\n","repos":"jeeb\/flac,jeeb\/flac,jeeb\/flac,jeeb\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libFLAC\/stream_decoder.c\n+++ src\/libFLAC\/stream_decoder.c\n@@ -1981,7 +1981,7 @@\n {\n \tunsigned channel;\n \tunsigned i;\n-\tFLAC__int32 mid, side, left, right;\n+\tFLAC__int32 mid, side;\n \tunsigned frame_crc; \/* the one we calculate from the input stream *\/\n \tFLAC__uint32 x;\n \n@@ -2063,15 +2063,19 @@\n \t\t\t\tcase FLAC__CHANNEL_ASSIGNMENT_MID_SIDE:\n \t\t\t\t\tFLAC__ASSERT(decoder->private_->frame.header.channels == 2);\n \t\t\t\t\tfor(i = 0; i < decoder->private_->frame.header.blocksize; i++) {\n+#if 1\n \t\t\t\t\t\tmid = decoder->private_->output[0][i];\n \t\t\t\t\t\tside = decoder->private_->output[1][i];\n \t\t\t\t\t\tmid <<= 1;\n-\t\t\t\t\t\tif(side & 1) \/* i.e. if 'side' is odd... *\/\n-\t\t\t\t\t\t\tmid++;\n-\t\t\t\t\t\tleft = mid + side;\n-\t\t\t\t\t\tright = mid - side;\n-\t\t\t\t\t\tdecoder->private_->output[0][i] = left >> 1;\n-\t\t\t\t\t\tdecoder->private_->output[1][i] = right >> 1;\n+\t\t\t\t\t\tmid |= (side & 1); \/* i.e. if 'side' is odd... *\/\n+\t\t\t\t\t\tdecoder->private_->output[0][i] = (mid + side) >> 1;\n+\t\t\t\t\t\tdecoder->private_->output[1][i] = (mid - side) >> 1;\n+#else\n+\t\t\t\t\t\t\/\/@@@@@@ OPT: try without 'side' temp variable\n+\t\t\t\t\t\tmid = (decoder->private_->output[0][i] << 1) | (decoder->private_->output[1][i] & 1); \/* i.e. if 'side' is odd... *\/\n+\t\t\t\t\t\tdecoder->private_->output[0][i] = (mid + decoder->private_->output[1][i]) >> 1;\n+\t\t\t\t\t\tdecoder->private_->output[1][i] = (mid - decoder->private_->output[1][i]) >> 1;\n+#endif\n \t\t\t\t\t}\n \t\t\t\t\tbreak;\n \t\t\t\tdefault:\n"} {"commit":"da7c224b1baaeb7543dc7663ae78716f9a6864c1","subject":"net: xfrm: xfrm_policy: silence compiler warning","message":"net: xfrm: xfrm_policy: silence compiler warning\n\nFix below compiler warning:\n\nnet\/xfrm\/xfrm_policy.c:1644:12: warning: \u2018xfrm_dst_alloc_copy\u2019 defined but not used [-Wunused-function]\n\nSigned-off-by: Ying Xue <c1cbb87de349443b90fa63f6d2cc5403843bc133@windriver.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/xfrm\/xfrm_policy.c\n+++ net\/xfrm\/xfrm_policy.c\n@@ -1641,6 +1641,7 @@\n \tgoto out;\n }\n \n+#ifdef CONFIG_XFRM_SUB_POLICY\n static int xfrm_dst_alloc_copy(void **target, const void *src, int size)\n {\n \tif (!*target) {\n@@ -1652,6 +1653,7 @@\n \tmemcpy(*target, src, size);\n \treturn 0;\n }\n+#endif\n \n static int xfrm_dst_update_parent(struct dst_entry *dst,\n \t\t\t\t const struct xfrm_selector *sel)\n"} {"commit":"f395ec43cfe9fbcb7380d1a91e8f6d5b57e69bbc","subject":"fix for FLAC__INTEGER_ONLY_LIBRARY","message":"fix for FLAC__INTEGER_ONLY_LIBRARY\n","repos":"LordJZ\/libflac,fredericgermain\/flac,waitman\/flac,kode54\/flac,waitman\/flac,Distrotech\/flac,fredericgermain\/flac,waitman\/flac,kode54\/flac,kode54\/flac,fredericgermain\/flac,LordJZ\/libflac,Distrotech\/flac,waitman\/flac,LordJZ\/libflac,fredericgermain\/flac,Distrotech\/flac,Distrotech\/flac,waitman\/flac,LordJZ\/libflac,kode54\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libFLAC\/stream_encoder.c\n+++ src\/libFLAC\/stream_encoder.c\n@@ -1473,6 +1473,7 @@\n \t\tvalue = sizeof(compression_levels_)\/sizeof(compression_levels_[0]) - 1;\n \tok &= FLAC__stream_encoder_set_do_mid_side_stereo (encoder, compression_levels_[value].do_mid_side_stereo);\n \tok &= FLAC__stream_encoder_set_loose_mid_side_stereo (encoder, compression_levels_[value].loose_mid_side_stereo);\n+#ifndef FLAC__INTEGER_ONLY_LIBRARY\n #if 0\n \t\/* was: *\/\n \tok &= FLAC__stream_encoder_set_apodization (encoder, compression_levels_[value].apodization);\n@@ -1481,6 +1482,7 @@\n \tencoder->protected_->num_apodizations = 1;\n \tencoder->protected_->apodizations[0].type = FLAC__APODIZATION_TUKEY;\n \tencoder->protected_->apodizations[0].parameters.tukey.p = 0.5;\n+#endif\n #endif\n \tok &= FLAC__stream_encoder_set_max_lpc_order (encoder, compression_levels_[value].max_lpc_order);\n \tok &= FLAC__stream_encoder_set_qlp_coeff_precision (encoder, compression_levels_[value].qlp_coeff_precision);\n"} {"commit":"0d9b3094689094f3e1adc5bbe0c7f9cde964d253","subject":"Adjust the autocalib beacons","message":"Adjust the autocalib beacons\n","repos":"godbyk\/OSVR-Core,OSVR\/OSVR-Core,leemichaelRazer\/OSVR-Core,leemichaelRazer\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,OSVR\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,leemichaelRazer\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,godbyk\/OSVR-Core,OSVR\/OSVR-Core,leemichaelRazer\/OSVR-Core,leemichaelRazer\/OSVR-Core","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/unifiedvideoinertialtracker\/MakeHDKTrackingSystem.h\n+++ plugins\/unifiedvideoinertialtracker\/MakeHDKTrackingSystem.h\n@@ -219,7 +219,8 @@\n data.markBeaconFixed(makeOneBased(ZeroBasedBeaconId(i)));\n }\n #else\n- for (auto idx : {16, 17, 34}) {\n+ \/\/ for (auto idx : {16, 17, 34}) {\n+ for (auto idx : {17, 33}) {\n data.markBeaconFixed(OneBasedBeaconId(idx));\n }\n #endif\n"} {"commit":"6461581365a3a999a93725ac4d9fde21791b59c1","subject":"fix bugs returning the wrong meaning from FLAC__stream_encoder_init()","message":"fix bugs returning the wrong meaning from FLAC__stream_encoder_init()\n","repos":"jeeb\/flac,jeeb\/flac,jeeb\/flac,jeeb\/flac","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/libFLAC\/stream_encoder.c\n+++ src\/libFLAC\/stream_encoder.c\n@@ -836,10 +836,8 @@\n \tencoder->private_->metadata.data.stream_info.total_samples = encoder->protected_->total_samples_estimate; \/* we will replace this later with the real total *\/\n \tmemset(encoder->private_->metadata.data.stream_info.md5sum, 0, 16); \/* we don't know this yet; have to fill it in later *\/\n \tMD5Init(&encoder->private_->md5context);\n-\tif(!FLAC__bitbuffer_clear(encoder->private_->frame)) {\n-\t\tencoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n-\t\treturn false;\n-\t}\n+\tif(!FLAC__bitbuffer_clear(encoder->private_->frame))\n+\t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n \tif(!FLAC__add_metadata_block(&encoder->private_->metadata, encoder->private_->frame))\n \t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_FRAMING_ERROR;\n \tif(!write_bitbuffer_(encoder, 0)) {\n@@ -869,10 +867,8 @@\n \t\tvorbis_comment.data.vorbis_comment.vendor_string.entry = 0;\n \t\tvorbis_comment.data.vorbis_comment.num_comments = 0;\n \t\tvorbis_comment.data.vorbis_comment.comments = 0;\n-\t\tif(!FLAC__bitbuffer_clear(encoder->private_->frame)) {\n-\t\t\tencoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n-\t\t\treturn false;\n-\t\t}\n+\t\tif(!FLAC__bitbuffer_clear(encoder->private_->frame))\n+\t\t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n \t\tif(!FLAC__add_metadata_block(&vorbis_comment, encoder->private_->frame))\n \t\t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_FRAMING_ERROR;\n \t\tif(!write_bitbuffer_(encoder, 0)) {\n@@ -886,10 +882,8 @@\n \t *\/\n \tfor(i = 0; i < encoder->protected_->num_metadata_blocks; i++) {\n \t\tencoder->protected_->metadata[i]->is_last = (i == encoder->protected_->num_metadata_blocks - 1);\n-\t\tif(!FLAC__bitbuffer_clear(encoder->private_->frame)) {\n-\t\t\tencoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n-\t\t\treturn false;\n-\t\t}\n+\t\tif(!FLAC__bitbuffer_clear(encoder->private_->frame))\n+\t\t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;\n \t\tif(!FLAC__add_metadata_block(encoder->protected_->metadata[i], encoder->private_->frame))\n \t\t\treturn encoder->protected_->state = FLAC__STREAM_ENCODER_FRAMING_ERROR;\n \t\tif(!write_bitbuffer_(encoder, 0)) {\n@@ -1831,7 +1825,7 @@\n \t\t\tbits[FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE ] = encoder->private_->best_subframe_bits [1] + encoder->private_->best_subframe_bits_mid_side[1];\n \t\t\tbits[FLAC__CHANNEL_ASSIGNMENT_MID_SIDE ] = encoder->private_->best_subframe_bits_mid_side[0] + encoder->private_->best_subframe_bits_mid_side[1];\n \n-\t\t\tfor(channel_assignment = 0, min_bits = bits[0], ca = 1; ca <= 3; ca++) {\n+\t\t\tfor(channel_assignment = (FLAC__ChannelAssignment)0, min_bits = bits[0], ca = (FLAC__ChannelAssignment)1; (int)ca <= 3; ca = (FLAC__ChannelAssignment)((int)ca + 1)) {\n \t\t\t\tif(bits[ca] < min_bits) {\n \t\t\t\t\tmin_bits = bits[ca];\n \t\t\t\t\tchannel_assignment = ca;\n"} {"commit":"ff426b5178afdd37a44d3467c7f421989f0ad83c","subject":"Patch from Robert Schroll to fix #378.","message":"Patch from Robert Schroll to fix #378.\n\ngit-svn-id: b62a74e6a85b74e782ead772f54cba8e909798b9@1165 6e728def-ac18-4b39-bad8-e7d984b3b6fa\n","repos":"pviotti\/Gummi,pviotti\/Gummi,pviotti\/Gummi,pviotti\/Gummi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gui\/gui-preview.c\n+++ src\/gui\/gui-preview.c\n@@ -961,10 +961,9 @@\n }\n g_signal_handler_unblock(pc->combo_sizes, pc->combo_sizes_changed_handler);\n \n- \/\/ Dion: I believe this line caused Bug #252 \n- \/\/ It was only for the case where the first page is not at the top left \n- \/\/ (it is not as wide as the others or we are in two paged layout).\n- \/\/previewgui_goto_page (pc, 0);\n+ gtk_widget_queue_draw (pc->drawarea);\n+ \n+ previewgui_goto_page (pc, 0);\n }\n \n void previewgui_refresh (GuPreviewGui* pc, GtkTextIter *sync_to,\n"} {"commit":"1ffab7ba6e255053c1e9ef5b4176ddf1b8bc3534","subject":"implementation toString","message":"implementation toString\n","repos":"UTBroM\/GeometricLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- polygon.c\n+++ polygon.c\n@@ -460,3 +460,36 @@\n \tprintPoint(inpoly.head->value);\n \tprintf(\"]\\n\");\n }\n+\n+\/**\n+ * This function is like printPolygon but it's a function\n+ * inpoly - Polygon\n+ * Return a char* (string)\n+ **\/\n+char* toString(Polygon inpoly)\n+{\n+\tchar* string;\n+\tstring = \"[\";\n+\n+\tfor (i=1; i<inpoly.size-1; i++)\n+\t{\n+\t\tx = inpoly.head->value.x\n+\t\ty = inpoly.head->value.y\n+\n+\t\tstring = strcat(string, \"[\");\n+\t\tstring = strcat(string, x);\n+\t\tstring = strcat(string, \",\");\n+\t\tstring = strcat(string, y);\n+\t\tstring = strcat(string, \"],\");\n+\n+\t\tinpoly.head = inpoly.head->next;\n+\t}\n+\n+\tstring = strcat(string, \"[\");\n+\tstring = strcat(string, x);\n+\tstring = strcat(string, \",\");\n+\tstring = strcat(string, y);\n+\tstring = strcat(string, \"]]\");\n+\n+\treturn string;\n+}\n"} {"commit":"12f71890657fb3150cc7fa75a4f8ee2dad54a6a8","subject":"Bugzilla Bug 345775: use SECITEM_FreeItem(..., PR_TRUE) to completely free the SECItem allocated in getECParams. r=alexei.volkov.","message":"Bugzilla Bug 345775: use SECITEM_FreeItem(..., PR_TRUE) to completely free\nthe SECItem allocated in getECParams. r=alexei.volkov.\n","repos":"nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/bltest\/blapitest.c\n+++ security\/nss\/cmd\/bltest\/blapitest.c\n@@ -543,7 +543,7 @@\n };\n \n static SECKEYECParams * \n-getECParams(char *curve)\n+getECParams(const char *curve)\n {\n SECKEYECParams *ecparams;\n SECOidData *oidData = NULL;\n@@ -1809,7 +1809,7 @@\n \t ecSerialize[2].data = ecdsap->eckey->privateValue.data;\n \t ecSerialize[2].len = ecdsap->eckey->privateValue.len;\n \t serialize_key(&(ecSerialize[0]), 3, file);\n-\t free(tmpECParamsDER);\n+\t SECITEM_FreeItem(tmpECParamsDER, PR_TRUE);\n \t PORT_FreeArena(tmpECParams->arena, PR_TRUE);\n \t rv = SECOID_Shutdown();\n \t CHECKERROR(rv, __LINE__);\n"} {"commit":"575f4c0275ca0e5372018ccde9a10de541bfa76f","subject":"Adds a space after a fieldname's colon when pretty-printing (#175)","message":"Adds a space after a fieldname's colon when pretty-printing (#175)\n\n","repos":"amzn\/ion-c,amznlabs\/ion-c,amzn\/ion-c,amznlabs\/ion-c,amzn\/ion-c,amzn\/ion-c,amznlabs\/ion-c,amznlabs\/ion-c","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ionc\/ion_writer_text.c\n+++ ionc\/ion_writer_text.c\n@@ -287,6 +287,9 @@\n IONCHECK(_ion_writer_get_field_name_as_string_helper(pwriter, &str, NULL));\n IONCHECK(_ion_writer_text_append_symbol_string(pwriter->output, &str, pwriter->options.escape_all_non_ascii, !ION_STRING_IS_NULL(&pwriter->field_name.value)));\n ION_TEXT_WRITER_APPEND_CHAR(':');\n+ if (ION_TEXT_WRITER_IS_PRETTY()) {\n+ ION_TEXT_WRITER_APPEND_CHAR(' ');\n+ }\n IONCHECK(_ion_writer_clear_field_name_helper(pwriter));\n }\n \n"} {"commit":"b8c5ffb890935a77cae3aa716519e1179eff0cf9","subject":"476979 - Add cert chain tests that will do cert validation for different ku\/eku. Patch 385144. r=nelson","message":"476979 - Add cert chain tests that will do cert validation for different ku\/eku. Patch 385144. r=nelson\n","repos":"nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/cmd\/certutil\/certext.c\n+++ security\/nss\/cmd\/certutil\/certext.c\n@@ -1730,7 +1730,7 @@\n }\n \n if (extList[ext_NSCertType].activated) {\n- rv = AddNscpCertType(extHandle, extList[ext_extKeyUsage].arg);\n+ rv = AddNscpCertType(extHandle, extList[ext_NSCertType].arg);\n if (rv) {\n \t\terrstring = \"NSCertType\";\n break;\n"} {"commit":"18e17c671991a815dc56123de27589a5cdca3fc3","subject":"fixes a segfault reported by Nicolas HENRY on Debian Lenny systems","message":"fixes a segfault reported by Nicolas HENRY on Debian Lenny systems\n","repos":"araisrobo\/machinekit,aschiffler\/linuxcnc,EqAfrica\/machinekit,ArcEye\/machinekit-testing,unseenlaser\/linuxcnc,EqAfrica\/machinekit,kinsamanka\/machinekit,cdsteinkuehler\/MachineKit,bmwiedemann\/linuxcnc-mirror,mhaberler\/machinekit,bobvanderlinden\/machinekit,Cid427\/machinekit,unseenlaser\/machinekit,kinsamanka\/machinekit,cnc-club\/linuxcnc,narogon\/linuxcnc,ianmcmahon\/linuxcnc-mirror,EqAfrica\/machinekit,bmwiedemann\/linuxcnc-mirror,Cid427\/machinekit,RunningLight\/machinekit,aschiffler\/linuxcnc,unseenlaser\/machinekit,ArcEye\/machinekit-testing,araisrobo\/machinekit,bobvanderlinden\/machinekit,cdsteinkuehler\/MachineKit,mhaberler\/machinekit,bmwiedemann\/linuxcnc-mirror,strahlex\/machinekit,strahlex\/machinekit,cnc-club\/linuxcnc,cdsteinkuehler\/MachineKit,unseenlaser\/machinekit,cnc-club\/linuxcnc,cnc-club\/linuxcnc,Cid427\/machinekit,araisrobo\/machinekit,unseenlaser\/linuxcnc,ArcEye\/machinekit-testing,RunningLight\/machinekit,yishinli\/emc2,mhaberler\/machinekit,ianmcmahon\/linuxcnc-mirror,ArcEye\/machinekit-testing,araisrobo\/machinekit,strahlex\/machinekit,bmwiedemann\/linuxcnc-mirror,Cid427\/machinekit,ArcEye\/MK-Qt5,ikcalB\/linuxcnc-mirror,cdsteinkuehler\/MachineKit,araisrobo\/machinekit,araisrobo\/machinekit,strahlex\/machinekit,Cid427\/machinekit,ArcEye\/MK-Qt5,strahlex\/machinekit,unseenlaser\/linuxcnc,mhaberler\/machinekit,RunningLight\/machinekit,kinsamanka\/machinekit,cnc-club\/linuxcnc,strahlex\/machinekit,EqAfrica\/machinekit,kinsamanka\/machinekit,jaguarcat79\/ILC-with-LinuxCNC,kinsamanka\/machinekit,RunningLight\/machinekit,ikcalB\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,mhaberler\/machinekit,cdsteinkuehler\/linuxcnc,araisrobo\/machinekit,ArcEye\/MK-Qt5,ikcalB\/linuxcnc-mirror,bobvanderlinden\/machinekit,unseenlaser\/linuxcnc,mhaberler\/machinekit,cnc-club\/linuxcnc,yishinli\/emc2,unseenlaser\/linuxcnc,ikcalB\/linuxcnc-mirror,unseenlaser\/machinekit,unseenlaser\/machinekit,Cid427\/machinekit,bobvanderlinden\/machinekit,strahlex\/machinekit,araisrobo\/machinekit,mhaberler\/machinekit,ArcEye\/machinekit-testing,EqAfrica\/machinekit,unseenlaser\/machinekit,bmwiedemann\/linuxcnc-mirror,mhaberler\/machinekit,Cid427\/machinekit,RunningLight\/machinekit,yishinli\/emc2,cnc-club\/linuxcnc,jaguarcat79\/ILC-with-LinuxCNC,jaguarcat79\/ILC-with-LinuxCNC,kinsamanka\/machinekit,cdsteinkuehler\/linuxcnc,Cid427\/machinekit,narogon\/linuxcnc,ArcEye\/machinekit-testing,RunningLight\/machinekit,araisrobo\/linuxcnc,narogon\/linuxcnc,ArcEye\/MK-Qt5,ikcalB\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,aschiffler\/linuxcnc,EqAfrica\/machinekit,cdsteinkuehler\/linuxcnc,araisrobo\/linuxcnc,RunningLight\/machinekit,araisrobo\/linuxcnc,yishinli\/emc2,ArcEye\/MK-Qt5,jaguarcat79\/ILC-with-LinuxCNC,ArcEye\/MK-Qt5,ArcEye\/MK-Qt5,cdsteinkuehler\/MachineKit,ArcEye\/MK-Qt5,araisrobo\/linuxcnc,bobvanderlinden\/machinekit,cdsteinkuehler\/MachineKit,cdsteinkuehler\/linuxcnc,narogon\/linuxcnc,EqAfrica\/machinekit,bobvanderlinden\/machinekit,ikcalB\/linuxcnc-mirror,aschiffler\/linuxcnc,bmwiedemann\/linuxcnc-mirror,ArcEye\/machinekit-testing,bobvanderlinden\/machinekit,EqAfrica\/machinekit,ikcalB\/linuxcnc-mirror,aschiffler\/linuxcnc,jaguarcat79\/ILC-with-LinuxCNC,unseenlaser\/machinekit,bobvanderlinden\/machinekit,ianmcmahon\/linuxcnc-mirror,ianmcmahon\/linuxcnc-mirror,cdsteinkuehler\/linuxcnc,cdsteinkuehler\/linuxcnc,RunningLight\/machinekit,araisrobo\/machinekit,ArcEye\/machinekit-testing,kinsamanka\/machinekit,kinsamanka\/machinekit,narogon\/linuxcnc,bmwiedemann\/linuxcnc-mirror,unseenlaser\/machinekit,araisrobo\/linuxcnc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libnml\/posemath\/sincos.c\n+++ src\/libnml\/posemath\/sincos.c\n@@ -19,6 +19,8 @@\n 21-Jan-2004 P.C. Moved across from the original EMC source tree.\n *\/\n \n+#include \"config.h\"\n+\n #ifndef HAVE_SINCOS\n \n #include \"rtapi_math.h\"\n"} {"commit":"64d7cb3fc2f36690b28ac679bfddab5bd7e7eef8","subject":"added error handling for image caching","message":"added error handling for image caching\n","repos":"emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython,emfcamp\/micropython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- stmhal\/ugfx_widgets.c\n+++ stmhal\/ugfx_widgets.c\n@@ -1047,8 +1047,10 @@\n \tgdispImageError er = gdispImageOpenFile(&(image->thisImage), img_str);\n \t\n \tif (er == 0){\n-\t\tif (cache)\n-\t\t\tgdispImageCache\t(&(image->thisImage));\n+\t\tif (cache){\n+\t\t\tint err = gdispImageCache(&(image->thisImage));\n+\t\t\tprint_image_error(err);\n+\t\t}\n \t\t\/\/gdispImageClose(&(image->thisImage)); \/\/TODO: delete this, currently for debugging reasons\n \t\t\/\/TODO: error handling and reporting\n \t\treturn image;\n"} {"commit":"2d09dab41d3e02c0e19c03eb24bd31ab4a332e53","subject":"Leveling","message":"Leveling","repos":"harry159821\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,Wallacoloo\/printipi,harry159821\/printipi,harry159821\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi,Igor-Rast\/printipi,Igor-Rast\/printipi,Wallacoloo\/printipi","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- code\/firmware\/src\/drivers\/machines\/kosselpi.h\n+++ code\/firmware\/src\/drivers\/machines\/kosselpi.h\n@@ -108,7 +108,7 @@\n \t\ttypedef rpi::RCThermistor<RPI_V2_GPIO_P1_07, THERM_RA, THERM_CAP_PICO, VCC_mV, THERM_IN_THRESH_mV, THERM_T0, THERM_R0, THERM_BETA> _Thermistor;\n \t\ttypedef Fan<rpi::OnePinIODriver<RPI_V2_GPIO_P1_08, 1> > _Fan;\n \t\ttypedef rpi::OnePinIODriver<RPI_V2_GPIO_P1_10, 0> _HotendOut;\n-\t\ttypedef matr::Identity3Static _BedLevelT;\n+\t\t\/\/typedef matr::Identity3Static _BedLevelT;\n \t\t\/*typedef matr::Matrix3Static<999991837, 1836, -4040369, \n 1836, 999999586, 909083, \n 4040369, -909083, 999991424, 1000000000> _BedLevelT;*\/\n@@ -118,6 +118,9 @@\n \t\t\/*typedef matr::Matrix3Static<999987246, 0, -5050440, \n 0, 1000000000, 0, \n 5050440, 0, 999987246, 1000000000> _BedLevelT;*\/\n+\t\ttypedef matr::Matrix3Static<999997959, 0, -2020197, \n+0, 1000000000, 0, \n+2020197, 0, 999997959, 1000000000> _BedLevelT;\n public:\n \/\/typedef ExponentialAcceleration<MAX_ACCEL1000> AccelerationProfileT;\n typedef ConstantAcceleration<MAX_ACCEL1000> AccelerationProfileT;\n"} {"commit":"f0203900d7d2040f835f3a15198330ee504ec2af","subject":"Fixed +auto-reconnect (#3650)","message":"Fixed +auto-reconnect (#3650)\n","repos":"DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,rjcorrig\/FreeRDP,ivan-83\/FreeRDP,nfedera\/FreeRDP,nfedera\/FreeRDP,cedrozor\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,xhaakon\/FreeRDP,mfleisz\/FreeRDP,ivan-83\/FreeRDP,mfleisz\/FreeRDP,nfedera\/FreeRDP,cedrozor\/FreeRDP,bjcollins\/FreeRDP,cloudbase\/FreeRDP-dev,ilammy\/FreeRDP,akallabeth\/FreeRDP,ilammy\/FreeRDP,eledoux\/FreeRDP,RangeeGmbH\/FreeRDP,yurashek\/FreeRDP,ondrejholy\/FreeRDP,yurashek\/FreeRDP,bmiklautz\/FreeRDP,FreeRDP\/FreeRDP,eledoux\/FreeRDP,oshogbo\/FreeRDP,yurashek\/FreeRDP,ilammy\/FreeRDP,mfleisz\/FreeRDP,yurashek\/FreeRDP,xproax\/FreeRDP,mfleisz\/FreeRDP,ilammy\/FreeRDP,chipitsine\/FreeRDP,akallabeth\/FreeRDP,erbth\/FreeRDP,bmiklautz\/FreeRDP,bmiklautz\/FreeRDP,ilammy\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,akallabeth\/FreeRDP,xhaakon\/FreeRDP,eledoux\/FreeRDP,xhaakon\/FreeRDP,chipitsine\/FreeRDP,ivan-83\/FreeRDP,Devolutions\/FreeRDP,mfleisz\/FreeRDP,DavBfr\/FreeRDP,chipitsine\/FreeRDP,DavBfr\/FreeRDP,cedrozor\/FreeRDP,rjcorrig\/FreeRDP,Devolutions\/FreeRDP,xproax\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,rjcorrig\/FreeRDP,eledoux\/FreeRDP,bjcollins\/FreeRDP,nanxiongchao\/FreeRDP,oshogbo\/FreeRDP,RangeeGmbH\/FreeRDP,xhaakon\/FreeRDP,ondrejholy\/FreeRDP,akallabeth\/FreeRDP,ondrejholy\/FreeRDP,RangeeGmbH\/FreeRDP,ivan-83\/FreeRDP,Devolutions\/FreeRDP,ilammy\/FreeRDP,awakecoding\/FreeRDP,rjcorrig\/FreeRDP,RangeeGmbH\/FreeRDP,nfedera\/FreeRDP,cloudbase\/FreeRDP-dev,ilammy\/FreeRDP,cloudbase\/FreeRDP-dev,nanxiongchao\/FreeRDP,mfleisz\/FreeRDP,bmiklautz\/FreeRDP,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,awakecoding\/FreeRDP,nanxiongchao\/FreeRDP,nanxiongchao\/FreeRDP,rjcorrig\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,nanxiongchao\/FreeRDP,chipitsine\/FreeRDP,yurashek\/FreeRDP,mfleisz\/FreeRDP,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,eledoux\/FreeRDP,ivan-83\/FreeRDP,akallabeth\/FreeRDP,cloudbase\/FreeRDP-dev,nanxiongchao\/FreeRDP,xproax\/FreeRDP,ilammy\/FreeRDP,nfedera\/FreeRDP,rjcorrig\/FreeRDP,eledoux\/FreeRDP,bmiklautz\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,cedrozor\/FreeRDP,nanxiongchao\/FreeRDP,cedrozor\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,xproax\/FreeRDP,oshogbo\/FreeRDP,ivan-83\/FreeRDP,nanxiongchao\/FreeRDP,chipitsine\/FreeRDP,oshogbo\/FreeRDP,cloudbase\/FreeRDP-dev,yurashek\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,xhaakon\/FreeRDP,awakecoding\/FreeRDP,ondrejholy\/FreeRDP,xhaakon\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,akallabeth\/FreeRDP,xproax\/FreeRDP,rjcorrig\/FreeRDP,bjcollins\/FreeRDP,erbth\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,ondrejholy\/FreeRDP,cedrozor\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,xproax\/FreeRDP,cloudbase\/FreeRDP-dev,akallabeth\/FreeRDP,eledoux\/FreeRDP,ondrejholy\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,bjcollins\/FreeRDP,cloudbase\/FreeRDP-dev,erbth\/FreeRDP,erbth\/FreeRDP,chipitsine\/FreeRDP,cedrozor\/FreeRDP,yurashek\/FreeRDP,yurashek\/FreeRDP,rjcorrig\/FreeRDP,bjcollins\/FreeRDP,xhaakon\/FreeRDP,DavBfr\/FreeRDP,ivan-83\/FreeRDP,xproax\/FreeRDP,FreeRDP\/FreeRDP,ondrejholy\/FreeRDP,bjcollins\/FreeRDP,Devolutions\/FreeRDP,bjcollins\/FreeRDP,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,bjcollins\/FreeRDP,eledoux\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,bmiklautz\/FreeRDP,erbth\/FreeRDP,xproax\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,FreeRDP\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- client\/X11\/xf_client.c\n+++ client\/X11\/xf_client.c\n@@ -1419,10 +1419,7 @@\n \t\tWLog_INFO(TAG, \"Attempting reconnect (%u of %u)\", numRetries, maxRetries);\n \n \t\tif (freerdp_reconnect(instance))\n-\t\t{\n-\t\t\tfreerdp_abort_connect(instance);\n \t\t\treturn TRUE;\n-\t\t}\n \n \t\tsleep(5);\n \t}\n@@ -1513,10 +1510,10 @@\n \twhile (!freerdp_shall_disconnect(instance))\n \t{\n \t\t\/*\n-\t\t * win8 and server 2k12 seem to have some timing issue\/race condition\n-\t\t * when a initial sync request is send to sync the keyboard indicators\n-\t\t * sending the sync event twice fixed this problem\n-\t\t *\/\n+\t\t\t * win8 and server 2k12 seem to have some timing issue\/race condition\n+\t\t\t * when a initial sync request is send to sync the keyboard indicators\n+\t\t\t * sending the sync event twice fixed this problem\n+\t\t\t *\/\n \t\tif (freerdp_focus_required(instance))\n \t\t{\n \t\t\txf_keyboard_focus_in(xfc);\n"} {"commit":"ae021296eccc5c112b918f469fa4676b22b7b070","subject":"missed as part of last checkin, hack needed when certs come out of crypto context or cache","message":"missed as part of last checkin, hack needed when certs come out of crypto context or cache\n","repos":"ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/certhigh\/certvfy.c\n+++ security\/nss\/lib\/certhigh\/certvfy.c\n@@ -421,8 +421,17 @@\n \t \/* need to dupe since caller expects new cert *\/\n \t return CERT_DupCertificate(cert);\n \t} else {\n-\t \/* this is the only instance *\/\n-\t return STAN_GetCERTCertificate(chain[1]);\n+\t CERTCertificate *rvc;\n+\t \/* XXX hack - if this is the only instance, return it, otherwise\n+\t * the cert came out of the cache or a crypto context, in \n+\t * which case it needs to be duped\n+\t *\/\n+\t if (!chain[1]->decoding) {\n+\t\treturn STAN_GetCERTCertificate(chain[1]);\n+\t } else {\n+\t\trvc = STAN_GetCERTCertificate(chain[1]);\n+\t\treturn CERT_DupCertificate(rvc);\n+\t }\n \t}\n }\n return NULL;\n"} {"commit":"d0c922b136449347b0a5f86be450104efeb76381","subject":"SAV reader: support string columns of length 0","message":"SAV reader: support string columns of length 0\n","repos":"WizardMac\/ReadStat,WizardMac\/ReadStat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/spss\/readstat_sav_read.c\n+++ src\/spss\/readstat_sav_read.c\n@@ -202,7 +202,6 @@\n variable.print = ctx->bswap ? byteswap4(variable.print) : variable.print;\n variable.write = ctx->bswap ? byteswap4(variable.write) : variable.write;\n \n- readstat_type_t dta_type = READSTAT_TYPE_DOUBLE;\n int32_t type = ctx->bswap ? byteswap4(variable.type) : variable.type;\n int i;\n if (type < 0) {\n@@ -213,10 +212,6 @@\n spss_varinfo_t *prev = &ctx->varinfo[ctx->var_index-1];\n prev->width++;\n return 0;\n- }\n- if (type > 0) {\n- dta_type = READSTAT_TYPE_STRING;\n- \/\/ len = type;\n }\n spss_varinfo_t *info = &ctx->varinfo[ctx->var_index];\n memset(info, 0, sizeof(spss_varinfo_t));\n@@ -224,7 +219,6 @@\n info->n_segments = 1;\n info->index = ctx->var_index;\n info->offset = ctx->var_offset;\n- info->type = dta_type;\n \n retval = readstat_convert(info->name, sizeof(info->name),\n variable.name, sizeof(variable.name), ctx->converter);\n@@ -243,6 +237,12 @@\n info->write_format.decimal_places = (variable.write & 0x000000FF);\n info->write_format.width = (variable.write & 0x0000FF00) >> 8;\n info->write_format.type = (variable.write & 0x00FF0000) >> 16;\n+\n+ if (type > 0 || info->print_format.type == SPSS_FORMAT_TYPE_A || info->write_format.type == SPSS_FORMAT_TYPE_A) {\n+ info->type = READSTAT_TYPE_STRING;\n+ } else {\n+ info->type = READSTAT_TYPE_DOUBLE;\n+ }\n \n if (variable.has_var_label) {\n int32_t label_len;\n"} {"commit":"e7cf4b2e513a900ad5790b65197dad82aae44357","subject":"OpenPGP: refactor error handling in pgp_gen_key()","message":"OpenPGP: refactor error handling in pgp_gen_key()\n\n* use LOG_TEST_*() macros instead of explicit coding\n","repos":"mouse07410\/OpenSC,mouse07410\/OpenSC,mouse07410\/OpenSC","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/libopensc\/card-openpgp.c\n+++ src\/libopensc\/card-openpgp.c\n@@ -2606,24 +2606,22 @@\n \tsc_log(card->ctx, \"Waiting for the card to generate key...\");\n \tr = sc_transmit_apdu(card, &apdu);\n \tsc_log(card->ctx, \"Card has done key generation.\");\n-\tif (r < 0) {\n-\t\tsc_log(card->ctx, \"APDU transmit failed. Error %s.\", sc_strerror(r));\n-\t\tgoto finish;\n-\t}\n+\tLOG_TEST_GOTO_ERR(card->ctx, r, \"APDU transmit failed\");\n \n \t\/* check response *\/\n \tr = sc_check_sw(card, apdu.sw1, apdu.sw2);\n \t\/* instruct more in case of error *\/\n \tif (r == SC_ERROR_SECURITY_STATUS_NOT_SATISFIED) {\n \t\tsc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, \"Please verify PIN first.\");\n-\t\tgoto finish;\n-\t}\n+\t\tgoto err;\n+\t}\n+\tLOG_TEST_GOTO_ERR(card->ctx, r, \"Card returned error\");\n \n \t\/* parse response data and set output *\/\n \tpgp_parse_and_set_pubkey_output(card, apdu.resp, apdu.resplen, key_info);\n \tpgp_update_card_algorithms(card, key_info);\n \n-finish:\n+err:\n \tfree(apdu.resp);\n \tLOG_FUNC_RETURN(card->ctx, r);\n }\n"} {"commit":"e5592772cee1be7bcbf22d23674768b3ca25c1b0","subject":"Check return of ainput mouse event","message":"Check return of ainput mouse event\n","repos":"FreeRDP\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,FreeRDP\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,DavBfr\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,FreeRDP\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,awakecoding\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,FreeRDP\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,Devolutions\/FreeRDP,DavBfr\/FreeRDP,erbth\/FreeRDP,awakecoding\/FreeRDP,erbth\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,erbth\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- client\/common\/client.c\n+++ client\/common\/client.c\n@@ -1145,8 +1145,7 @@\n \t\tif (mflags & PTR_XFLAGS_BUTTON2)\n \t\t\tflags |= AINPUT_XFLAGS_BUTTON2;\n \n-\t\tainput_send_diff_event(cctx, flags, x, y);\n-\t\thandled = TRUE;\n+\t\thandled = ainput_send_diff_event(cctx, flags, x, y);\n \t}\n #endif\n \n"} {"commit":"a97aa8407359b12cccc95313b00c654a0d444508","subject":"Bugfix in Span class (#749)","message":"Bugfix in Span class (#749)\n\n","repos":"robotology\/idyntree,robotology\/idyntree,robotology\/idyntree,robotology\/idyntree,robotology\/idyntree","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/core\/include\/iDynTree\/Core\/Span.h\n+++ src\/core\/include\/iDynTree\/Core\/Span.h\n@@ -345,6 +345,7 @@\n using index_type = std::ptrdiff_t;\n using pointer = element_type*;\n using reference = element_type&;\n+ using const_reference = const element_type&;\n \n using iterator = details::span_iterator<Span<ElementType, Extent>, false>;\n using const_iterator = details::span_iterator<Span<ElementType, Extent>, true>;\n@@ -495,8 +496,8 @@\n return data()[idx];\n }\n \n- IDYNTREE_CONSTEXPR double getVal(index_type idx) const { return this->operator[](idx);}\n- IDYNTREE_CONSTEXPR bool setVal(index_type idx, double val)\n+ IDYNTREE_CONSTEXPR const_reference getVal(index_type idx) const { return this->operator[](idx);}\n+ IDYNTREE_CONSTEXPR bool setVal(index_type idx, const_reference val)\n {\n assert(idx >= 0 && idx < storage_.size());\n data()[idx] = val;\n"} {"commit":"339dd32fe44e841b04efe10f27b4f31d5fc5987b","subject":"Add one more missing declaration of environ;","message":"Add one more missing declaration of environ;\n","repos":"nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/freebl\/unix_rand.c\n+++ security\/nss\/lib\/freebl\/unix_rand.c\n@@ -814,6 +814,7 @@\n size_t bytes;\n int extra;\n char **cp;\n+ extern char **environ;\n char *randfile;\n \n GiveSystemInfo();\n"} {"commit":"f3a8e80c130513c2b488df5a561c788133148685","subject":"storage: driver: Remove unavailable transient pools after restart","message":"storage: driver: Remove unavailable transient pools after restart\n\nIf a transient storage pool is deemed inactive after libvirtd restart it\nwould not be deleted from the list. Reuse virStoragePoolUpdateInactive\nalong with a refactor necessary to properly update the state.\n\nResolves: https:\/\/bugzilla.redhat.com\/show_bug.cgi?id=1242801\n","repos":"crobinso\/libvirt,andreabolognani\/libvirt,zippy2\/libvirt,eskultety\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,datto\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,VenkatDatta\/libvirt,datto\/libvirt,andreabolognani\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,zippy2\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,jfehlig\/libvirt,eskultety\/libvirt,crobinso\/libvirt,eskultety\/libvirt,crobinso\/libvirt,libvirt\/libvirt,jardasgit\/libvirt,olafhering\/libvirt,eskultety\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,VenkatDatta\/libvirt,datto\/libvirt,fabianfreyer\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,datto\/libvirt,olafhering\/libvirt,libvirt\/libvirt,libvirt\/libvirt,libvirt\/libvirt,crobinso\/libvirt,olafhering\/libvirt,jfehlig\/libvirt,VenkatDatta\/libvirt,fabianfreyer\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,zippy2\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/storage\/storage_driver.c\n+++ src\/storage\/storage_driver.c\n@@ -105,31 +105,28 @@\n static void\n storagePoolUpdateState(virStoragePoolObjPtr pool)\n {\n- bool active;\n+ bool active = false;\n virStorageBackendPtr backend;\n- int ret = -1;\n char *stateFile;\n \n if (!(stateFile = virFileBuildPath(driver->stateDir,\n pool->def->name, \".xml\")))\n- goto error;\n+ goto cleanup;\n \n if ((backend = virStorageBackendForType(pool->def->type)) == NULL) {\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"Missing backend %d\"), pool->def->type);\n- goto error;\n+ goto cleanup;\n }\n \n \/* Backends which do not support 'checkPool' are considered\n- * inactive by default.\n- *\/\n- active = false;\n+ * inactive by default. *\/\n if (backend->checkPool &&\n backend->checkPool(pool, &active) < 0) {\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"Failed to initialize storage pool '%s': %s\"),\n pool->def->name, virGetLastErrorMessage());\n- goto error;\n+ active = false;\n }\n \n \/* We can pass NULL as connection, most backends do not use\n@@ -144,17 +141,18 @@\n virReportError(VIR_ERR_INTERNAL_ERROR,\n _(\"Failed to restart storage pool '%s': %s\"),\n pool->def->name, virGetLastErrorMessage());\n- goto error;\n+ active = false;\n }\n }\n \n pool->active = active;\n- ret = 0;\n- error:\n- if (ret < 0) {\n- if (stateFile)\n- unlink(stateFile);\n- }\n+\n+ if (!pool->active)\n+ virStoragePoolUpdateInactive(&pool);\n+\n+ cleanup:\n+ if (!active && stateFile)\n+ ignore_value(unlink(stateFile));\n VIR_FREE(stateFile);\n \n return;\n"} {"commit":"a84d28a29ffd6a6c1a660d3fe1d0eb845d095d7b","subject":"Update parser comment to read recursive descent","message":"Update parser comment to read recursive descent\n\nFixes minor typo in parser description to read recursive descent instead\nof recursive decent. I do in fact believe the parser is also pretty\ndecent.\n\nSigned-off-by: hasheddan <fff88e83cd964a817f9e74a48f8df9cd0b6b9759@gmail.com>\n","repos":"ponylang\/ponyc,sgebbie\/ponyc,dipinhora\/ponyc,sgebbie\/ponyc,sgebbie\/ponyc,jemc\/ponyc,ponylang\/ponyc,ponylang\/ponyc,sgebbie\/ponyc,dipinhora\/ponyc,sgebbie\/ponyc,jemc\/ponyc,jemc\/ponyc,dipinhora\/ponyc","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/libponyc\/ast\/parserapi.h\n+++ src\/libponyc\/ast\/parserapi.h\n@@ -13,7 +13,7 @@\n \n PONY_EXTERN_C_BEGIN\n \n-\/** We use a simple recursive decent parser. Each grammar rule is specified\n+\/** We use a simple recursive descent parser. Each grammar rule is specified\n * using the macros defined below. Whilst it is perfectly possible to mix\n * normal C code in with the macros it should not be necessary. The underlying\n * functions that the macros use should not be called outside of the macros.\n"} {"commit":"8823b1499385bebe4543af47c80b641bf68d8051","subject":"More stream counting fixes","message":"More stream counting fixes\n","repos":"ofrobots\/grpc,sreecha\/grpc,jtattermusch\/grpc,PeterFaiman\/ruby-grpc-minimal,rjshade\/grpc,jboeuf\/grpc,tengyifei\/grpc,jcanizales\/grpc,chrisdunelm\/grpc,mehrdada\/grpc,royalharsh\/grpc,apolcyn\/grpc,ananthonline\/grpc,bjori\/grpc,deepaklukose\/grpc,gpndata\/grpc,pmarks-net\/grpc,mehrdada\/grpc,meisterpeeps\/grpc,JoeWoo\/grpc,larsonmpdx\/grpc,vjpai\/grpc,ejona86\/grpc,thunderboltsid\/grpc,bogdandrutu\/grpc,kriswuollett\/grpc,mehrdada\/grpc,grani\/grpc,zhimingxie\/grpc,LuminateWireless\/grpc,perumaalgoog\/grpc,grani\/grpc,sidrakesh93\/grpc,grani\/grpc,xtopsoft\/grpc,Vizerai\/grpc,carl-mastrangelo\/grpc,ipylypiv\/grpc,jboeuf\/grpc,baylabs\/grpc,VcamX\/grpc,kriswuollett\/grpc,hstefan\/grpc,w4-sjcho\/grpc,philcleveland\/grpc,msmania\/grpc,tempbottle\/grpc,doubi-workshop\/grpc,bogdandrutu\/grpc,miselin\/grpc,madongfly\/grpc,grpc\/grpc,wcevans\/grpc,vsco\/grpc,MakMukhi\/grpc,ipylypiv\/grpc,ncteisen\/grpc,ctiller\/grpc,murgatroid99\/grpc,ipylypiv\/grpc,maxwell-demon\/grpc,fichter\/grpc,thinkerou\/grpc,podsvirov\/grpc,Vizerai\/grpc,thinkerou\/grpc,malexzx\/grpc,vsco\/grpc,yinsu\/grpc,nicolasnoble\/grpc,ejona86\/grpc,tengyifei\/grpc,msiedlarek\/grpc,makdharma\/grpc,deepaklukose\/grpc,zhimingxie\/grpc,ananthonline\/grpc,thinkerou\/grpc,yinsu\/grpc,baylabs\/grpc,y-zeng\/grpc,meisterpeeps\/grpc,carl-mastrangelo\/grpc,perumaalgoog\/grpc,soltanmm\/grpc,meisterpeeps\/grpc,Crevil\/grpc,soltanmm\/grpc,soltanmm-google\/grpc,w4-sjcho\/grpc,baylabs\/grpc,crast\/grpc,w4-sjcho\/grpc,ppietrasa\/grpc,thunderboltsid\/grpc,leifurhauks\/grpc,bjori\/grpc,kpayson64\/grpc,ejona86\/grpc,bjori\/grpc,fichter\/grpc,PeterFaiman\/ruby-grpc-minimal,ppietrasa\/grpc,donnadionne\/grpc,firebase\/grpc,kriswuollett\/grpc,meisterpeeps\/grpc,nicolasnoble\/grpc,jtattermusch\/grpc,fuchsia-mirror\/third_party-grpc,yang-g\/grpc,grani\/grpc,ejona86\/grpc,ejona86\/grpc,JoeWoo\/grpc,dgquintas\/grpc,perumaalgoog\/grpc,yongni\/grpc,podsvirov\/grpc,carl-mastrangelo\/grpc,PeterFaiman\/ruby-grpc-minimal,fuchsia-mirror\/third_party-grpc,maxwell-demon\/grpc,muxi\/grpc,adelez\/grpc,zhimingxie\/grpc,muxi\/grpc,deepaklukose\/grpc,MakMukhi\/grpc,infinit\/grpc,malexzx\/grpc,wangyikai\/grpc,matt-kwong\/grpc,y-zeng\/grpc,wangyikai\/grpc,geffzhang\/grpc,yugui\/grpc,greasypizza\/grpc,vjpai\/grpc,mehrdada\/grpc,dgquintas\/grpc,donnadionne\/grpc,ctiller\/grpc,dgquintas\/grpc,kumaralokgithub\/grpc,daniel-j-born\/grpc,makdharma\/grpc,madongfly\/grpc,podsvirov\/grpc,kskalski\/grpc,cgvarela\/grpc,geffzhang\/grpc,jcanizales\/grpc,adelez\/grpc,murgatroid99\/grpc,gpndata\/grpc,adelez\/grpc,stanley-cheung\/grpc,zhimingxie\/grpc,madongfly\/grpc,thinkerou\/grpc,baylabs\/grpc,sreecha\/grpc,infinit\/grpc,xtopsoft\/grpc,ananthonline\/grpc,rjshade\/grpc,kumaralokgithub\/grpc,leifurhauks\/grpc,pszemus\/grpc,stanley-cheung\/grpc,yang-g\/grpc,surround-io\/grpc,Vizerai\/grpc,ksophocleous\/grpc,baylabs\/grpc,vsco\/grpc,zhimingxie\/grpc,nicolasnoble\/grpc,ncteisen\/grpc,soltanmm\/grpc,mehrdada\/grpc,surround-io\/grpc,malexzx\/grpc,carl-mastrangelo\/grpc,dgquintas\/grpc,goldenbull\/grpc,ofrobots\/grpc,vjpai\/grpc,daniel-j-born\/grpc,wcevans\/grpc,dklempner\/grpc,philcleveland\/grpc,VcamX\/grpc,gpndata\/grpc,jcanizales\/grpc,malexzx\/grpc,podsvirov\/grpc,sreecha\/grpc,stanley-cheung\/grpc,chrisdunelm\/grpc,yugui\/grpc,tengyifei\/grpc,crast\/grpc,jboeuf\/grpc,kpayson64\/grpc,wangyikai\/grpc,tamihiro\/grpc,rjshade\/grpc,andrewpollock\/grpc,fuchsia-mirror\/third_party-grpc,meisterpeeps\/grpc,tempbottle\/grpc,quizlet\/grpc,tamihiro\/grpc,ncteisen\/grpc,leifurhauks\/grpc,carl-mastrangelo\/grpc,msiedlarek\/grpc,pmarks-net\/grpc,yang-g\/grpc,kriswuollett\/grpc,deepaklukose\/grpc,podsvirov\/grpc,MakMukhi\/grpc,a11r\/grpc,yang-g\/grpc,a-veitch\/grpc,madongfly\/grpc,yugui\/grpc,Crevil\/grpc,tengyifei\/grpc,sidrakesh93\/grpc,royalharsh\/grpc,leifurhauks\/grpc,ncteisen\/grpc,jboeuf\/grpc,baylabs\/grpc,kumaralokgithub\/grpc,chrisdunelm\/grpc,podsvirov\/grpc,yinsu\/grpc,dklempner\/grpc,miselin\/grpc,a11r\/grpc,fuchsia-mirror\/third_party-grpc,greasypizza\/grpc,msmania\/grpc,meisterpeeps\/grpc,msmania\/grpc,meisterpeeps\/grpc,tempbottle\/grpc,dgquintas\/grpc,arkmaxim\/grpc,maxwell-demon\/grpc,doubi-workshop\/grpc,larsonmpdx\/grpc,ofrobots\/grpc,w4-sjcho\/grpc,a11r\/grpc,goldenbull\/grpc,pszemus\/grpc,tengyifei\/grpc,fichter\/grpc,daniel-j-born\/grpc,a-veitch\/grpc,vsco\/grpc,ctiller\/grpc,Crevil\/grpc,MakMukhi\/grpc,carl-mastrangelo\/grpc,dklempner\/grpc,sreecha\/grpc,apolcyn\/grpc,MakMukhi\/grpc,xtopsoft\/grpc,kumaralokgithub\/grpc,ananthonline\/grpc,7anner\/grpc,soltanmm\/grpc,apolcyn\/grpc,yongni\/grpc,firebase\/grpc,Crevil\/grpc,philcleveland\/grpc,kriswuollett\/grpc,ofrobots\/grpc,madongfly\/grpc,greasypizza\/grpc,stanley-cheung\/grpc,tengyifei\/grpc,msiedlarek\/grpc,goldenbull\/grpc,makdharma\/grpc,7anner\/grpc,nicolasnoble\/grpc,pmarks-net\/grpc,geffzhang\/grpc,grani\/grpc,greasypizza\/grpc,apolcyn\/grpc,pszemus\/grpc,bogdandrutu\/grpc,wcevans\/grpc,philcleveland\/grpc,vjpai\/grpc,jtattermusch\/grpc,donnadionne\/grpc,mehrdada\/grpc,infinit\/grpc,jtattermusch\/grpc,geffzhang\/grpc,hstefan\/grpc,LuminateWireless\/grpc,murgatroid99\/grpc,soltanmm\/grpc,dklempner\/grpc,ofrobots\/grpc,dklempner\/grpc,bogdandrutu\/grpc,kpayson64\/grpc,tempbottle\/grpc,nicolasnoble\/grpc,cgvarela\/grpc,crast\/grpc,firebase\/grpc,sidrakesh93\/grpc,firebase\/grpc,surround-io\/grpc,vsco\/grpc,VcamX\/grpc,chrisdunelm\/grpc,cgvarela\/grpc,kpayson64\/grpc,donnadionne\/grpc,zhimingxie\/grpc,geffzhang\/grpc,jcanizales\/grpc,wangyikai\/grpc,grpc\/grpc,a-veitch\/grpc,ppietrasa\/grpc,simonkuang\/grpc,apolcyn\/grpc,kpayson64\/grpc,LuminateWireless\/grpc,VcamX\/grpc,ctiller\/grpc,ksophocleous\/grpc,wangyikai\/grpc,yugui\/grpc,stanley-cheung\/grpc,andrewpollock\/grpc,ctiller\/grpc,soltanmm-google\/grpc,7anner\/grpc,ananthonline\/grpc,chrisdunelm\/grpc,msiedlarek\/grpc,y-zeng\/grpc,msmania\/grpc,pszemus\/grpc,7anner\/grpc,vjpai\/grpc,soltanmm-google\/grpc,muxi\/grpc,pszemus\/grpc,quizlet\/grpc,dgquintas\/grpc,dklempner\/grpc,grpc\/grpc,mehrdada\/grpc,makdharma\/grpc,nicolasnoble\/grpc,cgvarela\/grpc,bogdandrutu\/grpc,VcamX\/grpc,LuminateWireless\/grpc,jtattermusch\/grpc,Vizerai\/grpc,JoeWoo\/grpc,firebase\/grpc,adelez\/grpc,leifurhauks\/grpc,sidrakesh93\/grpc,cgvarela\/grpc,7anner\/grpc,Crevil\/grpc,kriswuollett\/grpc,fuchsia-mirror\/third_party-grpc,a11r\/grpc,PeterFaiman\/ruby-grpc-minimal,zhimingxie\/grpc,Vizerai\/grpc,pmarks-net\/grpc,soltanmm-google\/grpc,royalharsh\/grpc,VcamX\/grpc,deepaklukose\/grpc,stanley-cheung\/grpc,quizlet\/grpc,rjshade\/grpc,vjpai\/grpc,malexzx\/grpc,msiedlarek\/grpc,VcamX\/grpc,zhimingxie\/grpc,firebase\/grpc,ipylypiv\/grpc,fuchsia-mirror\/third_party-grpc,JoeWoo\/grpc,murgatroid99\/grpc,fichter\/grpc,ksophocleous\/grpc,bjori\/grpc,fuchsia-mirror\/third_party-grpc,geffzhang\/grpc,sreecha\/grpc,mehrdada\/grpc,deepaklukose\/grpc,muxi\/grpc,apolcyn\/grpc,quizlet\/grpc,infinit\/grpc,nicolasnoble\/grpc,tamihiro\/grpc,VcamX\/grpc,dgquintas\/grpc,firebase\/grpc,a-veitch\/grpc,cgvarela\/grpc,miselin\/grpc,ipylypiv\/grpc,tempbottle\/grpc,kumaralokgithub\/grpc,Crevil\/grpc,nicolasnoble\/grpc,y-zeng\/grpc,jcanizales\/grpc,deepaklukose\/grpc,soltanmm-google\/grpc,bjori\/grpc,zhimingxie\/grpc,madongfly\/grpc,greasypizza\/grpc,ejona86\/grpc,thinkerou\/grpc,ncteisen\/grpc,perumaalgoog\/grpc,thinkerou\/grpc,simonkuang\/grpc,grpc\/grpc,kumaralokgithub\/grpc,LuminateWireless\/grpc,infinit\/grpc,pszemus\/grpc,royalharsh\/grpc,PeterFaiman\/ruby-grpc-minimal,simonkuang\/grpc,podsvirov\/grpc,dgquintas\/grpc,goldenbull\/grpc,pszemus\/grpc,jboeuf\/grpc,arkmaxim\/grpc,soltanmm-google\/grpc,firebase\/grpc,daniel-j-born\/grpc,msmania\/grpc,donnadionne\/grpc,Crevil\/grpc,a-veitch\/grpc,dklempner\/grpc,7anner\/grpc,malexzx\/grpc,larsonmpdx\/grpc,stanley-cheung\/grpc,leifurhauks\/grpc,sreecha\/grpc,arkmaxim\/grpc,bogdandrutu\/grpc,crast\/grpc,miselin\/grpc,simonkuang\/grpc,kskalski\/grpc,andrewpollock\/grpc,ananthonline\/grpc,adelez\/grpc,Vizerai\/grpc,maxwell-demon\/grpc,dgquintas\/grpc,donnadionne\/grpc,arkmaxim\/grpc,baylabs\/grpc,ipylypiv\/grpc,rjshade\/grpc,infinit\/grpc,donnadionne\/grpc,yang-g\/grpc,bjori\/grpc,dklempner\/grpc,msiedlarek\/grpc,Crevil\/grpc,rjshade\/grpc,vsco\/grpc,jtattermusch\/grpc,ppietrasa\/grpc,jboeuf\/grpc,ejona86\/grpc,larsonmpdx\/grpc,madongfly\/grpc,ananthonline\/grpc,jboeuf\/grpc,muxi\/grpc,andrewpollock\/grpc,donnadionne\/grpc,malexzx\/grpc,baylabs\/grpc,jcanizales\/grpc,wangyikai\/grpc,sidrakesh93\/grpc,podsvirov\/grpc,quizlet\/grpc,goldenbull\/grpc,kskalski\/grpc,sreecha\/grpc,doubi-workshop\/grpc,w4-sjcho\/grpc,w4-sjcho\/grpc,msmania\/grpc,ksophocleous\/grpc,sreecha\/grpc,soltanmm\/grpc,nicolasnoble\/grpc,yongni\/grpc,MakMukhi\/grpc,deepaklukose\/grpc,leifurhauks\/grpc,arkmaxim\/grpc,greasypizza\/grpc,msiedlarek\/grpc,vjpai\/grpc,stanley-cheung\/grpc,vsco\/grpc,y-zeng\/grpc,grpc\/grpc,thunderboltsid\/grpc,greasypizza\/grpc,grani\/grpc,yang-g\/grpc,muxi\/grpc,pszemus\/grpc,thunderboltsid\/grpc,jtattermusch\/grpc,grpc\/grpc,soltanmm-google\/grpc,donnadionne\/grpc,mehrdada\/grpc,maxwell-demon\/grpc,yinsu\/grpc,ppietrasa\/grpc,larsonmpdx\/grpc,chrisdunelm\/grpc,chrisdunelm\/grpc,greasypizza\/grpc,pszemus\/grpc,ejona86\/grpc,infinit\/grpc,thunderboltsid\/grpc,PeterFaiman\/ruby-grpc-minimal,crast\/grpc,thunderboltsid\/grpc,tamihiro\/grpc,kpayson64\/grpc,leifurhauks\/grpc,a11r\/grpc,surround-io\/grpc,apolcyn\/grpc,cgvarela\/grpc,simonkuang\/grpc,matt-kwong\/grpc,carl-mastrangelo\/grpc,LuminateWireless\/grpc,ncteisen\/grpc,surround-io\/grpc,LuminateWireless\/grpc,grpc\/grpc,msmania\/grpc,thinkerou\/grpc,doubi-workshop\/grpc,ncteisen\/grpc,andrewpollock\/grpc,w4-sjcho\/grpc,apolcyn\/grpc,fichter\/grpc,perumaalgoog\/grpc,madongfly\/grpc,larsonmpdx\/grpc,yang-g\/grpc,tengyifei\/grpc,soltanmm\/grpc,makdharma\/grpc,miselin\/grpc,firebase\/grpc,royalharsh\/grpc,msmania\/grpc,xtopsoft\/grpc,thinkerou\/grpc,JoeWoo\/grpc,doubi-workshop\/grpc,fuchsia-mirror\/third_party-grpc,pszemus\/grpc,ipylypiv\/grpc,pszemus\/grpc,infinit\/grpc,doubi-workshop\/grpc,crast\/grpc,ananthonline\/grpc,tamihiro\/grpc,carl-mastrangelo\/grpc,ctiller\/grpc,murgatroid99\/grpc,yinsu\/grpc,ctiller\/grpc,cgvarela\/grpc,pmarks-net\/grpc,y-zeng\/grpc,dgquintas\/grpc,MakMukhi\/grpc,doubi-workshop\/grpc,w4-sjcho\/grpc,kpayson64\/grpc,7anner\/grpc,miselin\/grpc,simonkuang\/grpc,murgatroid99\/grpc,miselin\/grpc,pmarks-net\/grpc,firebase\/grpc,grpc\/grpc,sreecha\/grpc,dgquintas\/grpc,miselin\/grpc,donnadionne\/grpc,a11r\/grpc,7anner\/grpc,wcevans\/grpc,daniel-j-born\/grpc,yongni\/grpc,wcevans\/grpc,hstefan\/grpc,thinkerou\/grpc,yugui\/grpc,matt-kwong\/grpc,larsonmpdx\/grpc,ejona86\/grpc,LuminateWireless\/grpc,tengyifei\/grpc,royalharsh\/grpc,jboeuf\/grpc,muxi\/grpc,PeterFaiman\/ruby-grpc-minimal,kriswuollett\/grpc,greasypizza\/grpc,carl-mastrangelo\/grpc,kskalski\/grpc,carl-mastrangelo\/grpc,jcanizales\/grpc,bjori\/grpc,vjpai\/grpc,ctiller\/grpc,bogdandrutu\/grpc,grpc\/grpc,tamihiro\/grpc,wangyikai\/grpc,bogdandrutu\/grpc,hstefan\/grpc,goldenbull\/grpc,muxi\/grpc,ctiller\/grpc,jboeuf\/grpc,arkmaxim\/grpc,Vizerai\/grpc,a-veitch\/grpc,wcevans\/grpc,sidrakesh93\/grpc,makdharma\/grpc,JoeWoo\/grpc,JoeWoo\/grpc,vjpai\/grpc,ppietrasa\/grpc,maxwell-demon\/grpc,matt-kwong\/grpc,chrisdunelm\/grpc,crast\/grpc,kskalski\/grpc,fuchsia-mirror\/third_party-grpc,sidrakesh93\/grpc,kumaralokgithub\/grpc,stanley-cheung\/grpc,yinsu\/grpc,tempbottle\/grpc,malexzx\/grpc,LuminateWireless\/grpc,andrewpollock\/grpc,JoeWoo\/grpc,ncteisen\/grpc,larsonmpdx\/grpc,royalharsh\/grpc,philcleveland\/grpc,ppietrasa\/grpc,MakMukhi\/grpc,perumaalgoog\/grpc,kriswuollett\/grpc,ncteisen\/grpc,a-veitch\/grpc,bjori\/grpc,tamihiro\/grpc,leifurhauks\/grpc,PeterFaiman\/ruby-grpc-minimal,y-zeng\/grpc,surround-io\/grpc,thunderboltsid\/grpc,msiedlarek\/grpc,yugui\/grpc,jtattermusch\/grpc,matt-kwong\/grpc,grpc\/grpc,philcleveland\/grpc,kpayson64\/grpc,ncteisen\/grpc,ctiller\/grpc,gpndata\/grpc,wangyikai\/grpc,doubi-workshop\/grpc,wcevans\/grpc,muxi\/grpc,makdharma\/grpc,deepaklukose\/grpc,w4-sjcho\/grpc,andrewpollock\/grpc,ksophocleous\/grpc,stanley-cheung\/grpc,ofrobots\/grpc,xtopsoft\/grpc,JoeWoo\/grpc,wcevans\/grpc,Crevil\/grpc,jcanizales\/grpc,quizlet\/grpc,ejona86\/grpc,ofrobots\/grpc,philcleveland\/grpc,carl-mastrangelo\/grpc,tempbottle\/grpc,baylabs\/grpc,adelez\/grpc,tengyifei\/grpc,vjpai\/grpc,grani\/grpc,mehrdada\/grpc,geffzhang\/grpc,ctiller\/grpc,jtattermusch\/grpc,hstefan\/grpc,Vizerai\/grpc,fichter\/grpc,bogdandrutu\/grpc,muxi\/grpc,ksophocleous\/grpc,geffzhang\/grpc,kpayson64\/grpc,mehrdada\/grpc,royalharsh\/grpc,rjshade\/grpc,apolcyn\/grpc,kpayson64\/grpc,bjori\/grpc,thunderboltsid\/grpc,matt-kwong\/grpc,goldenbull\/grpc,perumaalgoog\/grpc,fuchsia-mirror\/third_party-grpc,kskalski\/grpc,PeterFaiman\/ruby-grpc-minimal,nicolasnoble\/grpc,wcevans\/grpc,grpc\/grpc,nicolasnoble\/grpc,rjshade\/grpc,murgatroid99\/grpc,kskalski\/grpc,maxwell-demon\/grpc,yinsu\/grpc,gpndata\/grpc,meisterpeeps\/grpc,mehrdada\/grpc,arkmaxim\/grpc,vsco\/grpc,ksophocleous\/grpc,kriswuollett\/grpc,daniel-j-born\/grpc,goldenbull\/grpc,yongni\/grpc,hstefan\/grpc,fichter\/grpc,simonkuang\/grpc,pmarks-net\/grpc,perumaalgoog\/grpc,perumaalgoog\/grpc,jboeuf\/grpc,firebase\/grpc,soltanmm\/grpc,msmania\/grpc,doubi-workshop\/grpc,surround-io\/grpc,goldenbull\/grpc,philcleveland\/grpc,kpayson64\/grpc,makdharma\/grpc,gpndata\/grpc,daniel-j-born\/grpc,ejona86\/grpc,madongfly\/grpc,ctiller\/grpc,donnadionne\/grpc,ppietrasa\/grpc,xtopsoft\/grpc,philcleveland\/grpc,jtattermusch\/grpc,andrewpollock\/grpc,yinsu\/grpc,ipylypiv\/grpc,ofrobots\/grpc,a11r\/grpc,xtopsoft\/grpc,grpc\/grpc,stanley-cheung\/grpc,jboeuf\/grpc,VcamX\/grpc,quizlet\/grpc,tamihiro\/grpc,PeterFaiman\/ruby-grpc-minimal,hstefan\/grpc,chrisdunelm\/grpc,yugui\/grpc,kumaralokgithub\/grpc,thinkerou\/grpc,sreecha\/grpc,soltanmm-google\/grpc,ncteisen\/grpc,daniel-j-born\/grpc,tamihiro\/grpc,gpndata\/grpc,hstefan\/grpc,arkmaxim\/grpc,simonkuang\/grpc,matt-kwong\/grpc,hstefan\/grpc,dklempner\/grpc,sidrakesh93\/grpc,carl-mastrangelo\/grpc,grani\/grpc,ppietrasa\/grpc,matt-kwong\/grpc,vjpai\/grpc,vsco\/grpc,matt-kwong\/grpc,daniel-j-born\/grpc,7anner\/grpc,sreecha\/grpc,sreecha\/grpc,jtattermusch\/grpc,andrewpollock\/grpc,ejona86\/grpc,ksophocleous\/grpc,ipylypiv\/grpc,thinkerou\/grpc,malexzx\/grpc,royalharsh\/grpc,adelez\/grpc,ofrobots\/grpc,adelez\/grpc,yang-g\/grpc,infinit\/grpc,nicolasnoble\/grpc,stanley-cheung\/grpc,a-veitch\/grpc,wangyikai\/grpc,y-zeng\/grpc,soltanmm-google\/grpc,yinsu\/grpc,larsonmpdx\/grpc,rjshade\/grpc,miselin\/grpc,pszemus\/grpc,quizlet\/grpc,adelez\/grpc,arkmaxim\/grpc,thunderboltsid\/grpc,grani\/grpc,yongni\/grpc,xtopsoft\/grpc,firebase\/grpc,jcanizales\/grpc,msiedlarek\/grpc,yugui\/grpc,soltanmm\/grpc,maxwell-demon\/grpc,ncteisen\/grpc,simonkuang\/grpc,Vizerai\/grpc,donnadionne\/grpc,fichter\/grpc,ananthonline\/grpc,yang-g\/grpc,kskalski\/grpc,a11r\/grpc,kskalski\/grpc,y-zeng\/grpc,murgatroid99\/grpc,yugui\/grpc,muxi\/grpc,vjpai\/grpc,makdharma\/grpc,MakMukhi\/grpc,kumaralokgithub\/grpc,jboeuf\/grpc,murgatroid99\/grpc,pmarks-net\/grpc,yongni\/grpc,maxwell-demon\/grpc,yongni\/grpc,jtattermusch\/grpc,Vizerai\/grpc,thinkerou\/grpc,pmarks-net\/grpc,tempbottle\/grpc,a11r\/grpc,gpndata\/grpc,a-veitch\/grpc,chrisdunelm\/grpc,geffzhang\/grpc,muxi\/grpc,murgatroid99\/grpc,surround-io\/grpc,podsvirov\/grpc,chrisdunelm\/grpc,quizlet\/grpc,Vizerai\/grpc,crast\/grpc,yongni\/grpc","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/core\/transport\/chttp2_transport.c\n+++ src\/core\/transport\/chttp2_transport.c\n@@ -423,8 +423,7 @@\n gpr_mu_unlock(&t->mu);\n \n for (i = 0; i < STREAM_LIST_COUNT; i++) {\n- GPR_ASSERT(s->links[i].next == NULL);\n- GPR_ASSERT(s->links[i].prev == NULL);\n+ GPR_ASSERT(!s->included[i]);\n }\n \n GPR_ASSERT(s->global.outgoing_sopb == NULL);\n@@ -483,25 +482,15 @@\n static void unlock(grpc_chttp2_transport *t) {\n grpc_iomgr_closure *run_closures;\n \n+ unlock_check_read_write_state(t);\n if (!t->writing_active && t->global.error_state == GRPC_CHTTP2_ERROR_STATE_NONE &&\n grpc_chttp2_unlocking_check_writes(&t->global, &t->writing)) {\n t->writing_active = 1;\n REF_TRANSPORT(t, \"writing\");\n grpc_chttp2_schedule_closure(&t->global, &t->writing_action, 1);\n }\n- unlock_check_read_write_state(t);\n \/* unlock_check_parser(t); *\/\n unlock_check_channel_callbacks(t);\n-\n- if (!t->parsing_active) {\n- size_t new_stream_count =\n- grpc_chttp2_stream_map_size(&t->parsing_stream_map) +\n- grpc_chttp2_stream_map_size(&t->new_stream_map);\n- if (new_stream_count != t->global.concurrent_stream_count) {\n- t->global.concurrent_stream_count = new_stream_count;\n- maybe_start_some_streams(&t->global);\n- }\n- }\n \n run_closures = t->global.pending_closures;\n t->global.pending_closures = NULL;\n@@ -734,6 +723,7 @@\n }\n \n static void remove_stream(grpc_chttp2_transport *t, gpr_uint32 id) {\n+ size_t new_stream_count;\n grpc_chttp2_stream *s =\n grpc_chttp2_stream_map_delete(&t->parsing_stream_map, id);\n if (!s) {\n@@ -745,6 +735,14 @@\n t->parsing.incoming_stream = NULL;\n grpc_chttp2_parsing_become_skip_parser(&t->parsing);\n }\n+\n+ new_stream_count =\n+ grpc_chttp2_stream_map_size(&t->parsing_stream_map) +\n+ grpc_chttp2_stream_map_size(&t->new_stream_map);\n+ if (new_stream_count != t->global.concurrent_stream_count) {\n+ t->global.concurrent_stream_count = new_stream_count;\n+ maybe_start_some_streams(&t->global);\n+ }\n }\n \n static void unlock_check_read_write_state(grpc_chttp2_transport *t) {\n@@ -752,10 +750,10 @@\n grpc_chttp2_stream_global *stream_global;\n grpc_stream_state state;\n \n- \/* if a stream is in the stream map, and gets cancelled, we need to ensure\n- we are not parsing before continuing the cancellation to keep things in\n- a sane state *\/\n if (!t->parsing_active) {\n+ \/* if a stream is in the stream map, and gets cancelled, we need to ensure\n+ we are not parsing before continuing the cancellation to keep things in\n+ a sane state *\/\n while (grpc_chttp2_list_pop_closed_waiting_for_parsing(transport_global,\n &stream_global)) {\n GPR_ASSERT(stream_global->in_stream_map);\n@@ -1017,6 +1015,7 @@\n \/* merge stream lists *\/\n grpc_chttp2_stream_map_move_into(&t->new_stream_map,\n &t->parsing_stream_map);\n+ t->global.concurrent_stream_count = grpc_chttp2_stream_map_size(&t->parsing_stream_map);\n \/* handle higher level things *\/\n grpc_chttp2_publish_reads(&t->global, &t->parsing);\n t->parsing_active = 0;\n"} {"commit":"3b07ddfecacd72868cd413df992d2a72c7bca526","subject":"Bugzilla bug #86981: fixed two uninitialized variables. Thanks to Matthew Barker of SGI and Kirk Erickson for the fix.","message":"Bugzilla bug #86981: fixed two uninitialized variables. Thanks to\nMatthew Barker of SGI and Kirk Erickson for the fix.\n","repos":"ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/smime\/cmsrecinfo.c\n+++ security\/nss\/lib\/smime\/cmsrecinfo.c\n@@ -59,7 +59,7 @@\n NSSCMSRecipientInfo *ri;\n void *mark;\n SECOidTag certalgtag;\n- SECStatus rv;\n+ SECStatus rv = SECSuccess;\n NSSCMSRecipientEncryptedKey *rek;\n NSSCMSOriginatorIdentifierOrKey *oiok;\n unsigned long version;\n@@ -274,7 +274,7 @@\n {\n CERTCertificate *cert;\n SECOidTag certalgtag;\n- SECStatus rv;\n+ SECStatus rv = SECSuccess;\n SECItem *params = NULL;\n NSSCMSRecipientEncryptedKey *rek;\n NSSCMSOriginatorIdentifierOrKey *oiok;\n"} {"commit":"2eb381aeab79d5b6b715d129439cd4decf7a3f1e","subject":"lalala","message":"lalala\n","repos":"eINIT\/core,eINIT\/core,eINIT\/core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/linux\/linux-alsasound.c\n+++ src\/modules\/linux\/linux-alsasound.c\n@@ -17,6 +17,7 @@\n #include <einit\/utility.h>\n #include <einit-modules\/exec.h>\n #include <errno.h>\n+#include <sched.h>\n \n #include <sys\/stat.h>\n #include <fcntl.h>\n@@ -73,11 +74,19 @@\n \tnotice(2,\"Restoring Mixer Levels\");\n \tchar *statefile = cfg_getstring (\"configuration-services-alsasound\/statefile\", NULL);\n \tif (statefile) {\n-\t\tchar buffer[BUFFERSIZE];\n-\t\tsnprintf(buffer,BUFFERSIZE,\"\/usr\/sbin\/alsactl -f %s restore\", statefile);\n-\t\tif (!qexec(buffer)) {\n-\t\t\tnotice(2,\"Errors while restoring defaults, ignoring.\");\n-\t\t\tret = status_failed;\n+\t\tchar *cmd[5];\n+\t\tcmd[0] = \"alsactl\";\n+\t\tcmd[1] = \"-f\";\n+\t\tcmd[2] = statefile;\n+\t\tcmd[3] = \"restore\";\n+\t\tcmd[4] = NULL;\n+\t\tpid_t pid;\n+\t\tpid = fork();\n+\t\tif (pid == 0) {\n+\t\t\tif (!execvp(cmd[0],cmd)) {\n+\t\t\t\tnotice(2,\"Errors while restoring defaults, ignoring.\");\n+\t\t\t\tret = status_failed;\n+\t\t\t}\n \t\t}\n \t}\n \treturn ret;\n@@ -85,14 +94,22 @@\n \n int linux_alsasound_save() {\n \tint ret = status_ok;\n-\tnotice(2,\"Storing ALSA Mixer Levels\");\n+\tnotice(2,\"Restoring Mixer Levels\");\n \tchar *statefile = cfg_getstring (\"configuration-services-alsasound\/statefile\", NULL);\n \tif (statefile) {\n-\t\tchar buffer[BUFFERSIZE];\n-\t\tsnprintf(buffer,BUFFERSIZE,\"\/usr\/sbin\/alsactl -f %s store\", statefile);\n-\t\tif (!qexec(buffer)) {\n-\t\t\tnotice(2,\"Error saving levels.\");\n-\t\t\tret = status_failed;\n+\t\tchar *cmd[5];\n+\t\tcmd[0] = \"alsactl\";\n+\t\tcmd[1] = \"-f\";\n+\t\tcmd[2] = statefile;\n+\t\tcmd[3] = \"store\";\n+\t\tcmd[4] = NULL;\n+\t\tpid_t pid;\n+\t\tpid = fork();\n+\t\tif (pid == 0) {\n+\t\t\tif (!execvp(cmd[0],cmd)) {\n+\t\t\t\tnotice(2,\"Errors while restoring defaults, ignoring.\");\n+\t\t\t\tret = status_failed;\n+\t\t\t}\n \t\t}\n \t}\n \treturn ret;\n@@ -118,10 +135,10 @@\n \tmodule_init (pa);\n \tpa->enable = linux_alsasound_enable;\n \tpa->disable = linux_alsasound_disable; \n-\tchar *alsastatedir = cfg_getstring (\"configuration-services-alsasound\/statefile\", NULL);\n-\tif (alsastatedir) {\n+\tchar *statefile = cfg_getstring (\"configuration-services-alsasound\/statefile\", NULL);\n+\tif (statefile) {\n \t\tchar *files[2];\n-\t\tfiles[0] = alsastatedir;\n+\t\tfiles[0] = statefile;\n \t\tfiles[1] = 0;\n \t\tchar *after = after_string_from_files (files);\n \t\tif (after) {\n"} {"commit":"a38fc196bde56139b52bb4ddf0c3347356adec87","subject":"* src\/stream_output\/announce.c: inet_pton() isn't supported on win32 so disabled ipv6 sap announces on win32.","message":"* src\/stream_output\/announce.c: inet_pton() isn't supported on win32 so disabled ipv6 sap announces on win32.\n\nWouldn't it be possible to use send() instead of sendto() ? That would simplify the code and get rid of this problem.\n\n","repos":"shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/stream_output\/announce.c\n+++ src\/stream_output\/announce.c\n@@ -141,7 +141,9 @@\n return NULL;\n }\n \n+#ifndef WIN32\n i_status = inet_pton(AF_INET6,sap_ipv6_addr,net_ipv6_addr);\n+#endif\n if(i_status < 0 )\n {\n msg_Warn(p_sout,\"Unable to convert address to network format\");\n"} {"commit":"d86ea96045269d5341b76d12a75306c0b5fbad98","subject":"Fixed the comment. The length of the secret may be larger than 64 bytes.","message":"Fixed the comment. The length of the secret may be larger than 64 bytes.\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/softoken\/alghmac.h\n+++ security\/nss\/lib\/softoken\/alghmac.h\n@@ -46,9 +46,9 @@\n * hash_alg\tthe algorithm with which the HMAC is performed. This \n *\t\tshould be, SEC_OID_MD5, SEC_OID_SHA1, or SEC_OID_MD2.\n * secret\tthe secret with which the HMAC is performed.\n- * secret_len\tthe length of the secret, limited to at most 64 bytes.\n+ * secret_len\tthe length of the secret.\n *\n- * NULL is returned if an error occurs or the secret is > 64 bytes.\n+ * NULL is returned if an error occurs.\n *\/\n extern HMACContext *\n HMAC_Create(const SECHashObject *hashObj, const unsigned char *secret, \n"} {"commit":"45d5e2600911682a9117b26603e3213c6b918fa4","subject":"Define float params properly: 0.0f instead of just 0","message":"Define float params properly: 0.0f instead of just 0\n","repos":"mje-nz\/PX4-Firmware,krbeverx\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,krbeverx\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,PX4\/Firmware,jlecoeur\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,Aerotenna\/Firmware,darknight-007\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,darknight-007\/Firmware,dagar\/Firmware,dagar\/Firmware,PX4\/Firmware,mcgill-robotics\/Firmware,dagar\/Firmware,Aerotenna\/Firmware,Aerotenna\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware,dagar\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,PX4\/Firmware,PX4\/Firmware,jlecoeur\/Firmware,acfloria\/Firmware,acfloria\/Firmware,PX4\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,PX4\/Firmware,Aerotenna\/Firmware,mcgill-robotics\/Firmware,dagar\/Firmware,mje-nz\/PX4-Firmware,darknight-007\/Firmware,jlecoeur\/Firmware,mcgill-robotics\/Firmware,krbeverx\/Firmware,mje-nz\/PX4-Firmware,krbeverx\/Firmware,darknight-007\/Firmware,mje-nz\/PX4-Firmware,Aerotenna\/Firmware,mcgill-robotics\/Firmware,darknight-007\/Firmware,mcgill-robotics\/Firmware,acfloria\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/modules\/sensors\/sensor_params.c\n+++ src\/modules\/sensors\/sensor_params.c\n@@ -248,7 +248,7 @@\n * This parameter defines a pitch offset from the board rotation. It allows the user\n * to fine tune the board offset in the event of misalignment.\n *\/\n- PARAM_DEFINE_FLOAT(SENS_BOARD_Y_OFF, 0);\n+ PARAM_DEFINE_FLOAT(SENS_BOARD_Y_OFF, 0.0f);\n \n \/**\n * Board rotation roll offset\n@@ -256,7 +256,7 @@\n * This parameter defines a roll offset from the board rotation. It allows the user\n * to fine tune the board offset in the event of misalignment.\n *\/\n-PARAM_DEFINE_FLOAT(SENS_BOARD_X_OFF, 0);\n+PARAM_DEFINE_FLOAT(SENS_BOARD_X_OFF, 0.0f);\n \n \/**\n * Board rotation YAW offset\n@@ -264,7 +264,7 @@\n * This parameter defines a yaw offset from the board rotation. It allows the user\n * to fine tune the board offset in the event of misalignment.\n *\/\n-PARAM_DEFINE_FLOAT(SENS_BOARD_Z_OFF, 0);\n+PARAM_DEFINE_FLOAT(SENS_BOARD_Z_OFF, 0.0f);\n \n \/**\n * External magnetometer rotation\n"} {"commit":"3de412df4f20ec064246f40bed8c1c8e9bf2e119","subject":"Bug 696807: the previous checkin requires including \"secerr.h\". TBR=rrelyea.","message":"Bug 696807: the previous checkin requires including \"secerr.h\".\nTBR=rrelyea.\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/softoken\/sftkmod.c\n+++ security\/nss\/lib\/softoken\/sftkmod.c\n@@ -54,6 +54,7 @@\n #include \"prprf.h\" \n #include \"prsystem.h\"\n #include \"lgglue.h\"\n+#include \"secerr.h\"\n #include \"secmodt.h\"\n #if defined (_WIN32)\n #include <io.h>\n"} {"commit":"89af708199a8d03f35f00866801a3808a16d3018","subject":"fixed filter chain bug","message":"fixed filter chain bug\n","repos":"yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ngx_http_lua_header_filter_by.c\n+++ src\/ngx_http_lua_header_filter_by.c\n@@ -339,7 +339,7 @@\n \n if (llcf->header_filter_handler == NULL) {\n dd(\"no header filter handler found\");\n- return NGX_DECLINED;\n+ return ngx_http_lua_next_filter_header_filter(r);\n }\n \n ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);\n"} {"commit":"9c76391abf028c6d95958eff4cb9714ade15d1c4","subject":"Add benchmark for inlist iterator.","message":"Add benchmark for inlist iterator.\n\n\ngit-svn-id: b99a075ee42e317ef7d0e499fd315684e5f6d838@35448 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33\n","repos":"OpenInkpot-archive\/iplinux-eina,jordemort\/eina,OpenInkpot-archive\/iplinux-eina,jordemort\/eina,OpenInkpot-archive\/iplinux-eina,jordemort\/eina","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/tests\/eina_bench_array.c\n+++ src\/tests\/eina_bench_array.c\n@@ -106,7 +106,7 @@\n }\n \n static Eina_Bool\n-eina_iterator_ebo_rand(__UNUSED__ const Eina_Array *array,\n+eina_iterator_ebo_rand(__UNUSED__ const void *container,\n \t\t Eina_Bench_Object *ebo, __UNUSED__ void *fdata)\n {\n ebo->keep = rand() < (RAND_MAX \/ 2) ? ebo->keep : EINA_FALSE;\n@@ -294,11 +294,75 @@\n }\n }\n \n+static void\n+eina_bench_inlist_4evas_render_iterator(int request)\n+{\n+ Eina_Inlist *head = NULL;\n+ Eina_Inlist *tmp;\n+ Eina_Bench_Object *ebo;\n+ Eina_Iterator *it;\n+ int i;\n+ int j;\n+\n+ for (i = 0; i < 1000; ++i)\n+ {\n+\tfor (j = 0; j < request; ++j)\n+\t {\n+\t ebo = malloc(sizeof (Eina_Bench_Object));\n+\t if (!ebo) continue ;\n+\n+\t ebo->keep = rand() < (RAND_MAX \/ 2) ? EINA_TRUE : EINA_FALSE;\n+\n+\t head = eina_inlist_prepend(head, ebo);\n+\t }\n+\n+\tif (i == 500)\n+\t {\n+\t while (head)\n+\t {\n+\t\t tmp = head;\n+\t\t head = head->next;\n+\t\t free(tmp);\n+\t }\n+\t }\n+\telse\n+\t {\n+\t if (i % 30 == 0)\n+\t {\n+\t\t tmp = head;\n+\t\t while(tmp)\n+\t\t {\n+\t\t ebo = (Eina_Bench_Object *) tmp;\n+\n+\t\t tmp = tmp->next;\n+\t\t if (ebo->keep == EINA_FALSE)\n+\t\t\t {\n+\t\t\t head = eina_inlist_remove(head, ebo);\n+\t\t\t free(ebo);\n+\t\t\t }\n+\t\t }\n+\t }\n+\t }\n+\n+\tit = eina_inlist_iterator_new(head);\n+\teina_iterator_foreach(it, EINA_EACH(eina_iterator_ebo_rand), NULL);\n+\teina_iterator_free(it);\n+ }\n+\n+ while (head)\n+ {\n+\ttmp = head;\n+\thead = head->next;\n+\tfree(tmp);\n+ }\n+}\n+\n void eina_bench_array(Eina_Bench *bench)\n {\n eina_bench_register(bench, \"array-inline\", EINA_BENCH(eina_bench_array_4evas_render_inline), 200, 4000, 100);\n eina_bench_register(bench, \"array-iterator\", EINA_BENCH(eina_bench_array_4evas_render_iterator), 200, 4000, 100);\n eina_bench_register(bench, \"list\", EINA_BENCH(eina_bench_list_4evas_render), 200, 4000, 100);\n eina_bench_register(bench, \"inlist\", EINA_BENCH(eina_bench_inlist_4evas_render), 200, 4000, 100);\n-}\n-\n+ eina_bench_register(bench, \"inlist-iterator\", EINA_BENCH(eina_bench_inlist_4evas_render_iterator), 200, 4000, 100);\n+}\n+\n"} {"commit":"1263f67022c7ab7ff386537d1cf65389421610de","subject":"daemon: Don't require cgroups in both memory\/cpuacct","message":"daemon: Don't require cgroups in both memory\/cpuacct\n\nDon't require a cgorup to be in both memory and cpuacct before we\nstart monitoring information in either of those places.\n\nOnce both cgroups disappear, then we consider the cgroup to be\ngone.\n\nReviewed-by: Marius Vollmer <bb11c6e942c5cc765df5f04da146b3198127a7a3@redhat.com>\n","repos":"vanloswang\/cockpit,xhad\/cockpit,mvollmer\/cockpit,andreasn\/cockpit,netzvieh\/cockpit,netzvieh\/cockpit,garrett\/cockpit,matobet\/cockpit,Armstrong1992\/cockpit,michalskrivanek\/cockpit,FireDrunk\/cockpit,evol262\/cockpit,zigitax\/cockpit,sgallagher\/cockpit,xhad\/cockpit,harishanand95\/cockpit,fridex\/cockpit,haiyangd\/cockpit_view,jscotka\/cockpit,Scribery\/cockpit,netzvieh\/cockpit,arilivigni\/cockpit,michalskrivanek\/cockpit,arilivigni\/cockpit,cockpit-project\/cockpit,fridex\/cockpit,petervo\/cockpit,mvollmer\/cockpit,nmav\/cockpit,haiyangd\/cockpit_view,firebitsbr\/cockpit,FireDrunk\/cockpit,moolitayer\/cockpit,larsu\/cockpit,FireDrunk\/cockpit,SotolitoLabs\/cockpit,cockpituous\/cockpit,martinpitt\/cockpit,petervo\/cockpit,Thermionix\/cockpit,larskarlitski\/cockpit,mvollmer\/cockpit,haiyangd\/cockpit_view,cockpit-project\/cockpit,martinpitt\/cockpit,firebitsbr\/cockpit,maxamillion\/cockpit,vbatts\/cockpit,Thermionix\/cockpit,moolitayer\/cockpit,Thermionix\/cockpit,dperpeet\/cockpit,deryni\/cockpit,mareklibra\/cockpit,vbatts\/cockpit,petervo\/cockpit,sub-mod\/cockpit,garrett\/cockpit,kkaempf\/cockpit,matobet\/cockpit,stefwalter\/cockpit,vanloswang\/cockpit,moolitayer\/cockpit,moraleslazaro\/cockpit,jscotka\/cockpit,firebitsbr\/cockpit,nmav\/cockpit,vbatts\/cockpit,arilivigni\/cockpit,nmav\/cockpit,larsu\/cockpit,moraleslazaro\/cockpit,fridex\/cockpit,vbatts\/cockpit,andreasn\/cockpit,dperpeet\/cockpit,evol262\/cockpit,cockpituous\/cockpit,maxamillion\/cockpit,sgallagher\/cockpit,vanloswang\/cockpit,kkaempf\/cockpit,dperpeet\/cockpit,michalskrivanek\/cockpit,zigitax\/cockpit,mvollmer\/cockpit,moraleslazaro\/cockpit,harishanand95\/cockpit,Armstrong1992\/cockpit,andreasn\/cockpit,jscotka\/cockpit,michalskrivanek\/cockpit,Scribery\/cockpit,evol262\/cockpit,Armstrong1992\/cockpit,darioajr\/cockpit,xhad\/cockpit,vanloswang\/cockpit,SotolitoLabs\/cockpit,firebitsbr\/cockpit,SotolitoLabs\/cockpit,fridex\/cockpit,mareklibra\/cockpit,haiyangd\/cockpit_view,vanloswang\/cockpit,sgallagher\/cockpit,larsu\/cockpit,sub-mod\/cockpit,stefwalter\/cockpit,darioajr\/cockpit,maxamillion\/cockpit,zigitax\/cockpit,denysvitali\/cockpit,evol262\/cockpit,zigitax\/cockpit,kkaempf\/cockpit,jscotka\/cockpit,moraleslazaro\/cockpit,jscotka\/cockpit,netzvieh\/cockpit,larsu\/cockpit,vbatts\/cockpit,Thermionix\/cockpit,stefwalter\/cockpit,maxamillion\/cockpit,andreasn\/cockpit,darioajr\/cockpit,Armstrong1992\/cockpit,jscotka\/cockpit,FireDrunk\/cockpit,moraleslazaro\/cockpit,vanloswang\/cockpit,dperpeet\/cockpit,Scribery\/cockpit,cockpituous\/cockpit,SotolitoLabs\/cockpit,martinpitt\/cockpit,mareklibra\/cockpit,sgallagher\/cockpit,dperpeet\/cockpit,Thermionix\/cockpit,harishanand95\/cockpit,cockpit-project\/cockpit,sub-mod\/cockpit,harishanand95\/cockpit,matobet\/cockpit,deryni\/cockpit,deryni\/cockpit,cockpituous\/cockpit,andreasn\/cockpit,arilivigni\/cockpit,cockpit-project\/cockpit,moolitayer\/cockpit,darioajr\/cockpit,moraleslazaro\/cockpit,arilivigni\/cockpit,garrett\/cockpit,cockpit-project\/cockpit,firebitsbr\/cockpit,harishanand95\/cockpit,garrett\/cockpit,sub-mod\/cockpit,martinpitt\/cockpit,netzvieh\/cockpit,kkaempf\/cockpit,petervo\/cockpit,nmav\/cockpit,darioajr\/cockpit,larskarlitski\/cockpit,dperpeet\/cockpit,matobet\/cockpit,maxamillion\/cockpit,netzvieh\/cockpit,mareklibra\/cockpit,Armstrong1992\/cockpit,denysvitali\/cockpit,xhad\/cockpit,deryni\/cockpit,petervo\/cockpit,Scribery\/cockpit,arilivigni\/cockpit,sgallagher\/cockpit,zigitax\/cockpit,matobet\/cockpit,michalskrivanek\/cockpit,larskarlitski\/cockpit,dperpeet\/cockpit,stefwalter\/cockpit,xhad\/cockpit,xhad\/cockpit,xhad\/cockpit,andreasn\/cockpit,Scribery\/cockpit,denysvitali\/cockpit,haiyangd\/cockpit_view,stefwalter\/cockpit,garrett\/cockpit,moraleslazaro\/cockpit,mareklibra\/cockpit,petervo\/cockpit,harishanand95\/cockpit,mareklibra\/cockpit,larsu\/cockpit,Thermionix\/cockpit,SotolitoLabs\/cockpit,vbatts\/cockpit,petervo\/cockpit,andreasn\/cockpit,fridex\/cockpit,deryni\/cockpit,michalskrivanek\/cockpit,harishanand95\/cockpit,michalskrivanek\/cockpit,deryni\/cockpit,mvollmer\/cockpit,larskarlitski\/cockpit,evol262\/cockpit,deryni\/cockpit,cockpituous\/cockpit,matobet\/cockpit,moolitayer\/cockpit,sgallagher\/cockpit,Scribery\/cockpit,cockpituous\/cockpit,larskarlitski\/cockpit,larsu\/cockpit,kkaempf\/cockpit,arilivigni\/cockpit,SotolitoLabs\/cockpit,stefwalter\/cockpit,evol262\/cockpit,stefwalter\/cockpit,Scribery\/cockpit,denysvitali\/cockpit,FireDrunk\/cockpit,fridex\/cockpit,denysvitali\/cockpit,larskarlitski\/cockpit,SotolitoLabs\/cockpit,vanloswang\/cockpit,larskarlitski\/cockpit,martinpitt\/cockpit,nmav\/cockpit,sub-mod\/cockpit,mareklibra\/cockpit,sgallagher\/cockpit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/daemon\/cgroupmonitor.c\n+++ src\/daemon\/cgroupmonitor.c\n@@ -386,45 +386,49 @@\n CGroupMonitor *monitor = data->monitor;\n const gchar *cgroup = key;\n Consumer *consumer = value;\n+ gboolean have_mem;\n+ gboolean have_cpu;\n \n Sample *sample = NULL, *prev_sample = NULL;\n \n sample = &(consumer->samples[monitor->samples_next]);\n+ zero_sample (sample);\n \n if (consumer->last_timestamp > 0)\n- {\n- zero_sample (sample);\n- return;\n- }\n+ return;\n \n gs_free gchar *mem_dir = g_build_filename (monitor->memory_root, cgroup, NULL);\n gs_free gchar *cpu_dir = g_build_filename (monitor->cpuacct_root, cgroup, NULL);\n \n- \/* TODO - don't insist that we are in both hierarchies\n- *\/\n- if (access (mem_dir, F_OK) != 0\n- || access (cpu_dir, F_OK) != 0)\n+ have_mem = access (mem_dir, F_OK) == 0;\n+ have_cpu = access (cpu_dir, F_OK) == 0;\n+ if (!have_mem && !have_cpu)\n {\n consumer->last_timestamp = data->now;\n- zero_sample (sample);\n return;\n }\n \n- sample->mem_usage_in_bytes = read_double (mem_dir, \"memory.usage_in_bytes\");\n- sample->mem_limit_in_bytes = read_double (mem_dir, \"memory.limit_in_bytes\");\n- sample->memsw_usage_in_bytes = read_double (mem_dir, \"memory.memsw.usage_in_bytes\");\n- sample->memsw_limit_in_bytes = read_double (mem_dir, \"memory.memsw.limit_in_bytes\");\n-\n- sample->cpuacct_usage = read_double (cpu_dir, \"cpuacct.usage\");\n- sample->cpu_shares = read_double (cpu_dir, \"cpu.shares\");\n-\n- \/* If at max for arch, then unlimited => zero *\/\n- if (sample->mem_limit_in_bytes == (double)G_MAXSIZE ||\n- sample->mem_limit_in_bytes == (double)G_MAXSSIZE)\n- sample->mem_limit_in_bytes = 0;\n- if (sample->memsw_limit_in_bytes == (double)G_MAXSIZE ||\n- sample->memsw_limit_in_bytes == (double)G_MAXSSIZE)\n- sample->memsw_limit_in_bytes = 0;\n+ if (have_mem)\n+ {\n+ sample->mem_usage_in_bytes = read_double (mem_dir, \"memory.usage_in_bytes\");\n+ sample->mem_limit_in_bytes = read_double (mem_dir, \"memory.limit_in_bytes\");\n+ sample->memsw_usage_in_bytes = read_double (mem_dir, \"memory.memsw.usage_in_bytes\");\n+ sample->memsw_limit_in_bytes = read_double (mem_dir, \"memory.memsw.limit_in_bytes\");\n+\n+ \/* If at max for arch, then unlimited => zero *\/\n+ if (sample->mem_limit_in_bytes == (double)G_MAXSIZE ||\n+ sample->mem_limit_in_bytes == (double)G_MAXSSIZE)\n+ sample->mem_limit_in_bytes = 0;\n+ if (sample->memsw_limit_in_bytes == (double)G_MAXSIZE ||\n+ sample->memsw_limit_in_bytes == (double)G_MAXSSIZE)\n+ sample->memsw_limit_in_bytes = 0;\n+ }\n+\n+ if (have_cpu)\n+ {\n+ sample->cpuacct_usage = read_double (cpu_dir, \"cpuacct.usage\");\n+ sample->cpu_shares = read_double (cpu_dir, \"cpu.shares\");\n+ }\n \n if (monitor->samples_prev >= 0)\n {\n"} {"commit":"0dce30109c9a136368fea69bfca897df5ea27161","subject":"daemon: Try and fix race unreferencing object in machines tests","message":"daemon: Try and fix race unreferencing object in machines tests\n\nCloses #678\nReviewed-by: Marius Vollmer <bb11c6e942c5cc765df5f04da146b3198127a7a3@redhat.com>\n","repos":"andreasn\/cockpit,arilivigni\/cockpit,vanloswang\/cockpit,sub-mod\/cockpit,FireDrunk\/cockpit,firebitsbr\/cockpit,vanloswang\/cockpit,larskarlitski\/cockpit,Scribery\/cockpit,harishanand95\/cockpit,cockpit-project\/cockpit,vanloswang\/cockpit,moraleslazaro\/cockpit,netzvieh\/cockpit,arilivigni\/cockpit,Armstrong1992\/cockpit,andreasn\/cockpit,maxamillion\/cockpit,vanloswang\/cockpit,denysvitali\/cockpit,sgallagher\/cockpit,vbatts\/cockpit,mareklibra\/cockpit,kkaempf\/cockpit,Scribery\/cockpit,SotolitoLabs\/cockpit,larsu\/cockpit,harishanand95\/cockpit,sgallagher\/cockpit,martinpitt\/cockpit,martinpitt\/cockpit,dperpeet\/cockpit,arilivigni\/cockpit,arilivigni\/cockpit,martinpitt\/cockpit,deryni\/cockpit,darioajr\/cockpit,michalskrivanek\/cockpit,haiyangd\/cockpit_view,Scribery\/cockpit,mvollmer\/cockpit,harishanand95\/cockpit,SotolitoLabs\/cockpit,netzvieh\/cockpit,netzvieh\/cockpit,cockpituous\/cockpit,firebitsbr\/cockpit,vbatts\/cockpit,moraleslazaro\/cockpit,firebitsbr\/cockpit,dperpeet\/cockpit,garrett\/cockpit,stefwalter\/cockpit,cockpituous\/cockpit,larsu\/cockpit,haiyangd\/cockpit_view,Scribery\/cockpit,darioajr\/cockpit,michalskrivanek\/cockpit,cockpituous\/cockpit,martinpitt\/cockpit,mvollmer\/cockpit,andreasn\/cockpit,cockpit-project\/cockpit,zigitax\/cockpit,larskarlitski\/cockpit,moraleslazaro\/cockpit,stefwalter\/cockpit,fridex\/cockpit,cockpituous\/cockpit,cockpit-project\/cockpit,nmav\/cockpit,larsu\/cockpit,SotolitoLabs\/cockpit,Thermionix\/cockpit,denysvitali\/cockpit,zigitax\/cockpit,evol262\/cockpit,harishanand95\/cockpit,sub-mod\/cockpit,FireDrunk\/cockpit,Thermionix\/cockpit,stefwalter\/cockpit,dperpeet\/cockpit,matobet\/cockpit,garrett\/cockpit,SotolitoLabs\/cockpit,evol262\/cockpit,jscotka\/cockpit,cockpituous\/cockpit,FireDrunk\/cockpit,nmav\/cockpit,sgallagher\/cockpit,petervo\/cockpit,sub-mod\/cockpit,matobet\/cockpit,SotolitoLabs\/cockpit,garrett\/cockpit,fridex\/cockpit,evol262\/cockpit,vbatts\/cockpit,maxamillion\/cockpit,maxamillion\/cockpit,nmav\/cockpit,moolitayer\/cockpit,harishanand95\/cockpit,stefwalter\/cockpit,haiyangd\/cockpit_view,denysvitali\/cockpit,matobet\/cockpit,zigitax\/cockpit,andreasn\/cockpit,dperpeet\/cockpit,Scribery\/cockpit,nmav\/cockpit,moolitayer\/cockpit,andreasn\/cockpit,jscotka\/cockpit,mvollmer\/cockpit,deryni\/cockpit,larsu\/cockpit,petervo\/cockpit,firebitsbr\/cockpit,deryni\/cockpit,dperpeet\/cockpit,fridex\/cockpit,petervo\/cockpit,matobet\/cockpit,evol262\/cockpit,moolitayer\/cockpit,sub-mod\/cockpit,sub-mod\/cockpit,martinpitt\/cockpit,xhad\/cockpit,Thermionix\/cockpit,arilivigni\/cockpit,zigitax\/cockpit,darioajr\/cockpit,petervo\/cockpit,deryni\/cockpit,andreasn\/cockpit,evol262\/cockpit,xhad\/cockpit,sgallagher\/cockpit,mareklibra\/cockpit,deryni\/cockpit,stefwalter\/cockpit,denysvitali\/cockpit,petervo\/cockpit,larsu\/cockpit,michalskrivanek\/cockpit,vbatts\/cockpit,netzvieh\/cockpit,moraleslazaro\/cockpit,Thermionix\/cockpit,kkaempf\/cockpit,moolitayer\/cockpit,maxamillion\/cockpit,mareklibra\/cockpit,netzvieh\/cockpit,petervo\/cockpit,vbatts\/cockpit,mareklibra\/cockpit,cockpit-project\/cockpit,mareklibra\/cockpit,dperpeet\/cockpit,moolitayer\/cockpit,sgallagher\/cockpit,matobet\/cockpit,Thermionix\/cockpit,larsu\/cockpit,xhad\/cockpit,netzvieh\/cockpit,Armstrong1992\/cockpit,harishanand95\/cockpit,Scribery\/cockpit,michalskrivanek\/cockpit,garrett\/cockpit,dperpeet\/cockpit,evol262\/cockpit,FireDrunk\/cockpit,SotolitoLabs\/cockpit,larskarlitski\/cockpit,xhad\/cockpit,harishanand95\/cockpit,vbatts\/cockpit,Armstrong1992\/cockpit,petervo\/cockpit,matobet\/cockpit,larskarlitski\/cockpit,jscotka\/cockpit,darioajr\/cockpit,vanloswang\/cockpit,mvollmer\/cockpit,mareklibra\/cockpit,Armstrong1992\/cockpit,SotolitoLabs\/cockpit,Scribery\/cockpit,sgallagher\/cockpit,maxamillion\/cockpit,zigitax\/cockpit,garrett\/cockpit,larskarlitski\/cockpit,arilivigni\/cockpit,larskarlitski\/cockpit,FireDrunk\/cockpit,fridex\/cockpit,denysvitali\/cockpit,cockpit-project\/cockpit,arilivigni\/cockpit,larskarlitski\/cockpit,fridex\/cockpit,moraleslazaro\/cockpit,mvollmer\/cockpit,darioajr\/cockpit,fridex\/cockpit,sgallagher\/cockpit,xhad\/cockpit,kkaempf\/cockpit,moraleslazaro\/cockpit,andreasn\/cockpit,kkaempf\/cockpit,nmav\/cockpit,jscotka\/cockpit,haiyangd\/cockpit_view,Thermionix\/cockpit,cockpituous\/cockpit,vanloswang\/cockpit,michalskrivanek\/cockpit,xhad\/cockpit,stefwalter\/cockpit,jscotka\/cockpit,michalskrivanek\/cockpit,jscotka\/cockpit,haiyangd\/cockpit_view,kkaempf\/cockpit,deryni\/cockpit,xhad\/cockpit,mareklibra\/cockpit,stefwalter\/cockpit,moraleslazaro\/cockpit,firebitsbr\/cockpit,Armstrong1992\/cockpit,vanloswang\/cockpit,deryni\/cockpit,michalskrivanek\/cockpit","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/daemon\/test-machines.c\n+++ src\/daemon\/test-machines.c\n@@ -116,11 +116,11 @@\n g_object_add_weak_pointer (G_OBJECT (tc->machines), (gpointer *)&tc->machines);\n g_object_unref (tc->machines);\n \n+ g_test_dbus_down (tc->bus);\n+ g_object_unref (tc->bus);\n+\n while (g_main_context_iteration (NULL, FALSE));\n g_assert (tc->machines == NULL);\n-\n- g_test_dbus_down (tc->bus);\n- g_object_unref (tc->bus);\n \n g_assert_cmpint (g_unlink (tc->machines_file), ==, 0);\n }\n"} {"commit":"2a5e668bfaaaf9c462b525c0f80c5c8bbdfc1244","subject":"Fixed a crashing bug when a connection fails to open","message":"Fixed a crashing bug when a connection fails to open\n\nWas sending message data as \u2018nocopy\u2019 even though it wasn\u2019t allocated by\nthe caller; then the caller\u2019s handler got called to free it\u2026\n","repos":"couchbasedeps\/libws,couchbasedeps\/libws,couchbasedeps\/libws","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/libws_private.c\n+++ src\/libws_private.c\n@@ -902,18 +902,18 @@\n \tif (!ws->received_close)\r\n \t{\r\n \t\tws->state = WS_STATE_CLOSED_UNCLEANLY;\r\n-\t\tstatus = WS_CLOSE_STATUS_ABNORMAL_1006;\r\n+ status = WS_CLOSE_STATUS_ABNORMAL_1006;\r\n \t}\r\n \r\n \tif (ws->close_cb)\r\n \t{\r\n \t\tLIBWS_LOG(LIBWS_DEBUG, \"Call close callback\");\r\n- ws->close_cb(ws,\r\n-\t\t\tstatus,\r\n- WS_ERRTYPE_PROTOCOL,\r\n-\t\t\tws->server_reason,\r\n-\t\t\tws->server_reason_len,\r\n-\t\t\tws->close_arg);\r\n+ ws->close_cb(ws,\r\n+ status,\r\n+ WS_ERRTYPE_PROTOCOL,\r\n+ ws->server_reason,\r\n+ ws->server_reason_len,\r\n+ ws->close_arg);\r\n \t}\r\n \telse\r\n \t{\r\n@@ -1170,7 +1170,8 @@\n \t{\r\n \t\tws_mask_payload(ws->send_header.mask, data, datalen);\r\n \r\n-\t\tif (_ws_send_data(ws, data, datalen, 1))\r\n+ int nocopy = (opcode == WS_OPCODE_TEXT_0X1 || opcode == WS_OPCODE_BINARY_0X2);\r\n+\t\tif (_ws_send_data(ws, data, datalen, nocopy))\r\n \t\t{\r\n \t\t\tLIBWS_LOG(LIBWS_ERR, \"Failed to send frame data\");\r\n \t\t\treturn -1;\r\n"} {"commit":"218c3d4fd845c5109d874650bc350de9721dfec9","subject":"Comment changes","message":"Comment changes\n","repos":"dsnet\/remote-keyless-system","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- mikroc\/receiver\/receiver.c\n+++ mikroc\/receiver\/receiver.c\n@@ -17,7 +17,7 @@\n Configuration:\n Microcontroller: PIC16F877A\n Oscillator: HS, 8.00 MHz\n- External Modules: RF 434 MHz transmitter, 4x20 character LCD\n+ External Modules: RF 434 MHz receiver, 4x20 character LCD\n Compiler: MikroC 8.0\n Notes:\n A variation of the BlowFish cipher is used in this project. The cipher's\n@@ -59,7 +59,7 @@\n \n \/\/ The rolling code maintains a moving window that protects against replay\n \/\/ attacks. However, there is the possibility that the transmitter and receiver\n-\/\/ can get out of sync if the transmitter increments its rolling code too often\n+\/\/ can get out of sync if the remote increments its rolling code too often\n \/\/ without the receiver ever getting any messages. Thus, there is a window where\n \/\/ future codes are acceptable by the receiver.\n const int ROLLING_WINDOW = 0x0400;\n"} {"commit":"b1084b80ce02c25f270ac24d5fbba8a73b62a288","subject":"backward compatibility for netbsd 6.x","message":"backward compatibility for netbsd 6.x\n","repos":"kemadz\/monit,kemadz\/monit,kemadz\/monit","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/device\/sysdep_NETBSD.c\n+++ src\/device\/sysdep_NETBSD.c\n@@ -194,13 +194,15 @@\n uint64_t flag;\n char *description;\n } t[]= {\n+#ifdef MNT_DISCARD\n+ {MNT_DISCARD, \"discard\"},\n+#endif\n {MNT_RDONLY, \"ro\"},\n {MNT_SYNCHRONOUS, \"synchronous\"},\n {MNT_NOEXEC, \"noexec\"},\n {MNT_NOSUID, \"nosuid\"},\n {MNT_NODEV, \"nodev\"},\n {MNT_NODEVMTIME, \"nodevmtime\"},\n- {MNT_DISCARD, \"discard\"},\n {MNT_EXTATTR, \"extattr\"},\n {MNT_IGNORE, \"hidden\"},\n {MNT_LOG, \"log\"},\n"} {"commit":"96c1cefde5bcb8ab54fd97145ae9f14458ef8915","subject":"fix(gui): layout should be updated after widget display role is changed","message":"fix(gui): layout should be updated after widget display role is changed\n","repos":"lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI,lc-soft\/LCUI","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gui\/widget_base.c\n+++ src\/gui\/widget_base.c\n@@ -723,8 +723,7 @@\n \tif (w->computed_style.display == display) {\r\n \t\treturn;\r\n \t}\r\n-\tif (w->parent && display == SV_NONE &&\r\n-\t w->computed_style.position != SV_ABSOLUTE) {\r\n+\tif (w->parent && w->computed_style.position != SV_ABSOLUTE) {\r\n \t\tWidget_UpdateLayout(w->parent);\r\n \t}\r\n \tWidget_UpdateVisibility(w);\r\n"} {"commit":"58b56b91c454f4e1c04ca1cf58e35809caf979de","subject":"py\/qstr: Reset mpstate.qstr_last_chunk before raising an error.","message":"py\/qstr: Reset mpstate.qstr_last_chunk before raising an error.\n\nThe qstr_last_chunk is not collected by the garbage collector. This relies\non the assertion that qstr_pool_t also references the qstr_last_chunk. If\nan exception is raised while allocating the qstr_pool_t, qstr_last_chunk\nhas to be invalidated not to become a dangling reference at the next\ngarbage collection.\n\nSigned-off-by: Emilie Feral <efc046a42a3ad491df48caacc3d29e07d5b47894@numworks.com>\n","repos":"adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- py\/qstr.c\n+++ py\/qstr.c\n@@ -153,6 +153,12 @@\n #endif\n qstr_pool_t *pool = m_new_obj_var_maybe(qstr_pool_t, const char *, new_alloc);\n if (pool == NULL) {\n+ \/\/ Keep qstr_last_chunk consistent with qstr_pool_t: qstr_last_chunk is not scanned\n+ \/\/ at garbage collection since it's reachable from a qstr_pool_t. And the caller of\n+ \/\/ this function expects q_ptr to be stored in a qstr_pool_t so it can be reached\n+ \/\/ by the collector. If qstr_pool_t allocation failed, qstr_last_chunk needs to be\n+ \/\/ NULL'd. Otherwise it may become a dangling pointer at the next garbage collection.\n+ MP_STATE_VM(qstr_last_chunk) = NULL;\n QSTR_EXIT();\n m_malloc_fail(new_alloc);\n }\n"} {"commit":"ee3a6ec345c917df7b019e74da96283a5c6e2c88","subject":"removed prefer_fastcall: backends can now decide how to handle mtp_property_private methods","message":"removed prefer_fastcall: backends can now decide how to handle mtp_property_private methods\n\n[r14624]\n","repos":"davidgiven\/libfirm,8l\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,8l\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/arm\/bearch_arm.c\n+++ ir\/be\/arm\/bearch_arm.c\n@@ -1143,7 +1143,6 @@\n \tstatic backend_params p = {\n \t\t1, \/* need dword lowering *\/\n \t\t0, \/* don't support inline assembler yet *\/\n-\t\t0, \/* no different calling conventions *\/\n \t\tNULL, \/* no additional opcodes *\/\n \t\tNULL, \/* will be set later *\/\n \t\tNULL, \/* but yet no creator function *\/\n"} {"commit":"6afa2fb88cba07632e30a5260f56d3b0a0bc5504","subject":"fixed segfault","message":"fixed segfault\n","repos":"8l\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,8l\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,8l\/libfirm,libfirm\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/be\/bechordal_main.c\n+++ ir\/be\/bechordal_main.c\n@@ -555,7 +555,6 @@\n \tchar time_str[32];\n \tchar irg_name[128];\n \tint j, m, line;\n-\tchar *filename;\n \tbe_chordal_env_t chordal_env;\n \tconst char *stat_tags[STAT_TAG_LAST];\n \n@@ -603,9 +602,10 @@\n \t\tchordal_env.ignore_colors = bitset_malloc(chordal_env.cls->n_regs);\n \n \t\tstat_tags[STAT_TAG_CLS] = chordal_env.cls->name;\n-\t\tbe_stat_ev_push(stat_tags, STAT_TAG_LAST, stat_file);\n \n \t\tif(stat_file) {\n+\t\t\tbe_stat_ev_push(stat_tags, STAT_TAG_LAST, stat_file);\n+\n \t\t\t\/* perform some node statistics. *\/\n \t\t\tnode_stats(&chordal_env, &node_stat);\n \t\t\tbe_stat_ev(\"phis_before_spill\", node_stat.n_phis);\n"} {"commit":"e89dbe1dbd7a9890cc109fb3f3a7aead910892d9","subject":"fix Regex#match evaluating block on non-match","message":"fix Regex#match evaluating block on non-match\n","repos":"cconklin\/iridium,cconklin\/iridium,cconklin\/iridium,cconklin\/iridium","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- iridium\/src\/ir_regex.c\n+++ iridium\/src\/ir_regex.c\n@@ -87,12 +87,11 @@\n ret = pcre_exec(code, extra, cstr, strlen(cstr), INT(pos), 0, ovector, ovector_size);\n \n if (ret >= 0) {\n- matchdata = create_matchdata(self, code, str, INT(pos), ovector, captures);\n+ matchdata = create_matchdata(self, code, str, INT(pos), ovector, captures);\n+ return calls(context, fun, array_push(array_new(), matchdata));\n } else {\n- matchdata = NIL;\n+ return NIL;\n }\n-\n- return calls(context, fun, array_push(array_new(), matchdata));\n }\n \n \/\/ new and initialize are NOT defined on MatchData since it needs to be passed non-iridiium objects\n"} {"commit":"d90693c79c6bef983063f291c286757dd084dd3e","subject":"preproc.c: Context-through single macros expansion is deprecated","message":"preproc.c: Context-through single macros expansion is deprecated\n\nFor now we inform users about their sources need to be\nupdated and also since _all_ context case are legit\nfor single macros only we split lookup into two phases:\n\n1) Lookup in active context, which is perfectly valid\n2) Lookup in external contexts, which will be deprecated soon.\n\nIf (2) happens we yield warning.\n\nA typical testcase is\n---\n %macro one 0\n %push\n %$a:\n %assign %$b 12\n %push\n mov eax, %$a\n mov eax, %$b ; hit -- context through\n %pop\n %pop\n %endmacro\n one\n---\n\nSigned-off-by: Cyrill Gorcunov <7a1ea01eee6961eb1e372e3508c2670446d086f4@gmail.com>\n","repos":"Distrotech\/nasm,Distrotech\/nasm,techkey\/nasm,turingstudio\/nasm,letolabs\/nasm,techkey\/nasm,letolabs\/nasm,projedi\/nasm,projedi\/nasm,turingstudio\/nasm,turingstudio\/nasm,turingstudio\/nasm,techkey\/nasm,techkey\/nasm,Distrotech\/nasm,projedi\/nasm,letolabs\/nasm,projedi\/nasm,Distrotech\/nasm,techkey\/nasm,projedi\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- preproc.c\n+++ preproc.c\n@@ -1462,24 +1462,42 @@\n if (!all_contexts)\n return ctx;\n \n- do {\n+ \/*\n+ * NOTE: In 2.10 we will not need lookup in extarnal\n+ * contexts, so this is a gentle way to inform users\n+ * about their source code need to be updated\n+ *\/\n+\n+ \/* first round -- check the current context *\/\n+ m = hash_findix(&ctx->localmac, name);\n+ while (m) {\n+ if (!mstrcmp(m->name, name, m->casesense))\n+ return ctx;\n+ m = m->next;\n+ }\n+\n+ \/* second round - external contexts *\/\n+ while ((ctx = ctx->next)) {\n \/* Search for this smacro in found context *\/\n m = hash_findix(&ctx->localmac, name);\n while (m) {\n if (!mstrcmp(m->name, name, m->casesense)) {\n-\t\t\t\tif ((i > 0) && (all_contexts == true)) {\n-\t\t\t\t\terror(ERR_WARNING, \"context-local label expansion\"\n-\t\t\t\t\t\t \" to outer contexts will be deprecated\"\n-\t\t\t\t\t\t \" starting in NASM 2.10, please update your\"\n-\t\t\t\t\t\t \" code accordingly\");\n-\t\t\t\t}\n+ \/* NOTE: obsolete since 2.10 *\/\n+ static int once = 0;\n+ if (!once) {\n+ error(ERR_WARNING, \"context-local macro expansion\"\n+ \" to outer contexts will be deprecated\"\n+ \" starting in NASM 2.10, please update your\"\n+ \" code accordingly\");\n+ once = 1;\n+ }\n+ error(ERR_WARNING, \"`%s': context through macro expansion\", name);\n return ctx;\n-\t\t\t}\n+ }\n m = m->next;\n }\n- ctx = ctx->next;\n- }\n- while (ctx);\n+ }\n+\n return NULL;\n }\n \n"} {"commit":"73491afaae1aeb6cd61f6f47ed13988b1b69b645","subject":"new files","message":"new files\n","repos":"colinw7\/CUtil,colinw7\/CUtil","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/CLineDash.h\n+++ include\/CLineDash.h\n@@ -164,7 +164,7 @@\n \n double getLength(int i) const { return lengths_[i]; }\n \n- void getLengths(std::vector<double> &lengths) {\n+ void getLengths(std::vector<double> &lengths) const {\n for (uint i = 0; i < getNumLengths(); ++i)\n lengths.push_back(getLength(i));\n }\n"} {"commit":"e2ae7484d1f3ffd88dfc66e27cd9725573aee4c8","subject":"test hook again","message":"test hook again\n","repos":"Hopsan\/hopsan,Hopsan\/hopsan,Hopsan\/hopsan,Hopsan\/hopsan,Hopsan\/hopsan,Hopsan\/hopsan","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- componentLibraries\/futureLibrary\/Components.h\n+++ componentLibraries\/futureLibrary\/Components.h\n@@ -31,3 +31,4 @@\n \n \n \n+\n"} {"commit":"6ed4d1d3da831481f2622f7ca347ee016286fae0","subject":"Add defaults for the new run time counter stats configuration constants.","message":"Add defaults for the new run time counter stats configuration constants.\n","repos":"FreeRTOS\/FreeRTOS-Kernel,FreeRTOS\/FreeRTOS-Kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Source\/include\/FreeRTOS.h\n+++ Source\/include\/FreeRTOS.h\n@@ -374,5 +374,25 @@\n \t#define traceTASK_INCREMENT_TICK( xTickCount )\r\n #endif\r\n \r\n+#ifndef configGENERATE_RUN_TIME_STATS\r\n+\t#define configGENERATE_RUN_TIME_STATS 0\r\n+#endif\r\n+\r\n+#if ( configGENERATE_RUN_TIME_STATS == 1 )\r\n+\r\n+\t#ifndef portCONFIGURE_TIMER_FOR_RUN_TIME_STATS\r\n+\t\t#error If configGENERATE_RUN_TIME_STATS is defined then portCONFIGURE_TIMER_FOR_RUN_TIME_STATS must also be defined. portCONFIGURE_TIMER_FOR_RUN_TIME_STATS should call a port layer function to setup a peripheral timer\/counter that can then be used as the run time counter time base.\r\n+\t#endif \/* portCONFIGURE_TIMER_FOR_RUN_TIME_STATS *\/\r\n+\r\n+\t#ifndef portGET_RUN_TIME_COUNTER_VALUE\r\n+\t\t#error If configGENERATE_RUN_TIME_STATS is defined then portGET_RUN_TIME_COUNTER_VALUE must also be defined. portGET_RUN_TIME_COUNTER_VALUE should evaluate to the counter value of the timer\/counter peripheral used as the run time counter time base.\r\n+\t#endif \/* portGET_RUN_TIME_COUNTER_VALUE *\/\r\n+\r\n+#endif \/* configGENERATE_RUN_TIME_STATS *\/\r\n+\r\n+#ifndef portCONFIGURE_TIMER_FOR_RUN_TIME_STATS\r\n+\t#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()\r\n+#endif\r\n+\r\n #endif \/* INC_FREERTOS_H *\/\r\n \r\n"} {"commit":"54c5b8fed951a7e8551dfa7bd475ef368094de23","subject":"Add Fujitsu FX definition to portable.h.","message":"Add Fujitsu FX definition to portable.h.\n\ngit-svn-id: 43aea61533866f88f23079d48f4f5dc2d5288937@172 1d2547de-c912-0410-9cb9-b8ca96c0e9e2\n","repos":"Psykar\/kubos,Psykar\/kubos,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,kubostech\/KubOS,Psykar\/kubos,Psykar\/kubos,Psykar\/kubos","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Source\/include\/portable.h\n+++ Source\/include\/portable.h\n@@ -223,8 +223,10 @@\n \r\n #ifdef __91467D\r\n \t#include \"portmacro.h\"\r\n-\t#include \"mb91467d.h\"\r\n-\t#include <stddef.h>\r\n+#endif\r\n+\r\n+#ifdef __96340\r\n+\t#include \"portmacro.h\"\r\n #endif\r\n \r\n #ifdef __cplusplus\r\n"} {"commit":"15b32349f926011197298696130298d01e407574","subject":"make a start overhauling this crap...","message":"make a start overhauling this crap...\n","repos":"Core-Development-Group\/PlatformLibrary,Core-Development-Group\/PlatformLibrary,Core-Development-Group\/OpenPL,Core-Development-Group\/OpenPL","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- platform\/graphics\/graphics_shader.c\n+++ platform\/graphics\/graphics_shader.c\n@@ -45,20 +45,16 @@\n \/**\n * Sets up some basic properties for the given\n * shader and deals with any macros such as 'include'\n- *\n- * todo: most of this can be rewritten into platform_parser : make it safe!\n- *\n- * @param buf\n- * @param length\n- *\/\n-static void GLPreProcessGLSLShader(char **buf, size_t *length, PLShaderStageType type) {\n- size_t n_len = 1000000; \/*(*length) * 2*\/;\n- char *n_buf = pl_calloc(n_len, sizeof(char));\n+ * todo: this is dumb... rewrite and move it\n+ *\/\n+static char *GLPreProcessGLSLShader( char **buf, size_t *length, PLShaderStageType type ) {\n+ size_t newLength = *length;\n+ char *n_buf = pl_calloc( newLength, sizeof( char ) );\n if(n_buf == NULL) {\n- return;\n- }\n-\n- memset(n_buf, 0, n_len);\n+ return NULL;\n+ }\n+\n+ memset( n_buf, 0, newLength );\n \n char *pos = &*buf[0];\n char *n_pos = &n_buf[0];\n@@ -117,14 +113,41 @@\n SkipSpaces();\n \n \/* pull the path out *\/\n- if(*pos++ == '\\\"') {\n- pos += 2;\n+ if(*pos++ == '\"') {\n char path[PL_SYSTEM_MAX_PATH];\n unsigned int i = 0;\n- while(*pos != '\\\"') {\n- path[i++] = *pos++;\n- } path[i] = '\\0';\n- pos += 2;\n+ while(*pos != '\"') {\n+\t\t\t\t\t\tif ( *pos == '\\n' || *pos == '\\r' ) {\n+\t\t\t\t\t\t\tGfxLog( \"Invalid include argument provided, parsing failed!\\n\" );\n+\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t}\n+\n+ path[ i++ ] = *pos++;\n+ }\n+\t\t\t\t\tpath[ i ] = '\\0';\n+\n+\t\t\t\t\tPLFile *filePtr = plOpenFile( path, true );\n+\t\t\t\t\tif ( filePtr != NULL ) {\n+\t\t\t\t\t\t\/\/ Copy the data across\n+\t\t\t\t\t\tsize_t incLength = plGetFileSize( filePtr );\n+\t\t\t\t\t\tchar *incBuf = pl_malloc( incLength );\n+\t\t\t\t\t\tmemcpy( incBuf, plGetFileData( filePtr ), incLength );\n+\n+\t\t\t\t\t\t\/\/ And we're now done with this!\n+\t\t\t\t\t\tplCloseFile( filePtr );\n+\n+\t\t\t\t\t\tif ( GLPreProcessGLSLShader( &incBuf, &incLength, type ) != NULL ) {\n+\n+\t\t\t\t\t\t}\n+\n+\t\t\t\t\t\t\/\/ Now resize our current dataset and copy it across\n+\n+\t\t\t\t\t\tfree( incBuf );\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tGfxLog( \"Failed to open include, \\\"%s\\\"!\\n\", path );\n+\t\t\t\t\t\treturn NULL;\n+\t\t\t\t\t}\n+\n #if 0\n FILE *s = fopen(path, \"r\");\n if(s == NULL) {\n@@ -134,13 +157,20 @@\n #else\n printf(\"%s\\n\", path);\n #endif\n- }\n+\t\t\t\t\tpos += 2;\n+\t\t\t\t\tcontinue;\n+ } else {\n+\t\t\t\t\tGfxLog( \"Expected \\\"\\\", got \\\"%s\\\"!\\n\", pos );\n+\t\t\t\t}\n } else if(pl_strncasecmp(pos, \"ifdef\", 5) == 0) {\n+\t\t\t\tpos += 5;\n \/* todo *\/\n } else if(pl_strncasecmp(pos, \"if\", 2) == 0) {\n+\t\t\t\tpos += 2;\n \/* todo\n * should be followed by 'defined' or whatever? *\/\n } else if(pl_strncasecmp(pos, \"define\", 6) == 0) {\n+\t\t\t\tpos += 6;\n \/* todo\n * save result to table and overwrite any results *\/\n }\n@@ -151,22 +181,24 @@\n *n_pos++ = *pos++;\n }\n \n- printf(\"%s\\n\", n_buf);\n+ \/\/printf(\"%s\\n\", n_buf);\n \n \/* resize and update buf to match *\/\n char *old_buf = *buf;\n- if(n_len > (*length)) {\n- if((old_buf = realloc(*buf, n_len)) != NULL) {\n+ if( newLength > (*length) ) {\n+ if( (old_buf = realloc( *buf, newLength ) ) != NULL) {\n *buf = old_buf;\n }\n }\n \n if(old_buf != NULL) {\n memcpy(*buf, n_buf, n_len);\n- *length = n_len;\n- }\n-\n- pl_free(n_buf);\n+ *length = newLength;\n+ }\n+\n+ pl_free( n_buf );\n+\n+\treturn *buf;\n }\n \n #endif\n@@ -229,7 +261,8 @@\n \n char *n_buf = pl_calloc(sizeof(char), length + 1);\n strncpy(n_buf, buf, length);\n- GLPreProcessGLSLShader(&n_buf, &length, stage->type);\n+\n+ n_buf = GLPreProcessGLSLShader(&n_buf, &length, stage->type);\n \n CallGfxFunction(CompileShaderStage, stage, n_buf, length);\n \n"} {"commit":"3c59fb1d8e2426f1a93337aa68c1d48dc14ee25e","subject":"","message":"\n\ngit-svn-id: http:\/\/monit.googlecode.com\/svn\/trunk@46 808b68a2-07de-11de-a1f0-819f45317607\n","repos":"renard\/monit,renard\/monit,renard\/monit","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- process.c\n+++ process.c\n@@ -298,7 +298,7 @@\n }\n \n \/* Linux's init process with pid 1 has parent pid 0, which is hidden however, so above search will fail *\/\n- if (! root && findprocess(1, pt, *size_r)) {\n+ if (! root && ! (root = findprocess(1, pt, *size_r))) {\n DEBUG(\"system statistic error -- cannot find root process id\\n\");\n return -1;\n }\n"} {"commit":"0bff01ce8b28cc3ce399988732e973f22c5fce36","subject":"fix typo","message":"fix typo\n","repos":"Sometrik\/graphlib,Sometrik\/graphlib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/NodeArray.h\n+++ include\/NodeArray.h\n@@ -302,7 +302,7 @@\n \n int createLanguage(short id) {\n int community_id = getLanguageById(id);\n- if (community_id != -1) return language_id;\n+ if (community_id != -1) return community_id;\n communities[id] = community_id = add(NODE_ATTRIBUTE);\n setRandomPosition(community_id);\n return community_id;\n"} {"commit":"c62a66cc893be0bbc93315ef310dd0678cd12a27","subject":"linux-generic: crypto: check 'result' pointer","message":"linux-generic: crypto: check 'result' pointer\n\nCheck 'result' pointer before dereferencing it in case of synchronous\noperation.\n\nSigned-off-by: Taras Kondratiuk <5ee69fef6c6e17fac3006c01919d9c9be0ce7197@linaro.org>\nReviewed-by: Robert King <5c6140a2ad4ad3cd71e27d474fcf55e83dbe567b@cisco.com>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"ravineet-singh\/odp,dkrot\/odp,mike-holmes-linaro\/odp,rsalveti\/odp,mike-holmes-linaro\/odp,rsalveti\/odp,nmorey\/odp,mike-holmes-linaro\/odp,ravineet-singh\/odp,dkrot\/odp,kalray\/odp-mppa,ravineet-singh\/odp,kalray\/odp-mppa,kalray\/odp-mppa,nmorey\/odp,erachmi\/odp,erachmi\/odp,nmorey\/odp,erachmi\/odp,kalray\/odp-mppa,mike-holmes-linaro\/odp,dkrot\/odp,nmorey\/odp,rsalveti\/odp,rsalveti\/odp,dkrot\/odp,erachmi\/odp,rsalveti\/odp,ravineet-singh\/odp,kalray\/odp-mppa,kalray\/odp-mppa,kalray\/odp-mppa","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/linux-generic\/odp_crypto.c\n+++ platform\/linux-generic\/odp_crypto.c\n@@ -435,6 +435,8 @@\n \t\t*posted = 1;\n \t} else {\n \t\t\/* Synchronous, simply return results *\/\n+\t\tif (!result)\n+\t\t\treturn -1;\n \t\t*result = local_result;\n \n \t\t\/* Indicate to caller operation was sync *\/\n"} {"commit":"7f72ee2c451a92ff0c50833ce51f8d9d7b7db593","subject":"Fix issue in SharedDataPointer causing memory leaks","message":"Fix issue in SharedDataPointer causing memory leaks\n","repos":"mmd-osm\/Overpass-API,mmd-osm\/Overpass-API,mmd-osm\/Overpass-API,mmd-osm\/Overpass-API","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/overpass_api\/core\/basic_types.h\n+++ src\/overpass_api\/core\/basic_types.h\n@@ -579,6 +579,10 @@\n inline SharedDataPointer() { d = nullptr; }\n inline ~SharedDataPointer() { if (d && !--d->ref) delete d; }\n \n+ SharedDataPointer(SharedDataPointer &&o) noexcept : d(o.d) { o.d = nullptr; }\n+ inline SharedDataPointer<T> &operator=(SharedDataPointer<T> &&other) noexcept\n+ { std::swap(d, other.d); return *this; }\n+\n explicit SharedDataPointer(T *data) noexcept;\n inline SharedDataPointer(const SharedDataPointer<T> &o) : d(o.d) { if (d) ++d->ref; }\n inline SharedDataPointer<T> & operator=(const SharedDataPointer<T> &o) {\n@@ -630,7 +634,7 @@\n {\n T *x = clone();\n ++x->ref;\n- if (!d->ref)\n+ if (!(--d->ref))\n delete d;\n d = x;\n }\n"} {"commit":"7e330032993854b0f691f890b2edf7173c2398e8","subject":"missed one","message":"missed one\n\n","repos":"kongr45gpen\/bzflag-import-1,kongr45gpen\/bzflag-import-1,kongr45gpen\/bzflag-import-1,kongr45gpen\/bzflag-import-1,kongr45gpen\/bzflag-import-1,kongr45gpen\/bzflag-import-1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/Singleton.h\n+++ include\/Singleton.h\n@@ -79,7 +79,11 @@\n inline static T* pInstance() {\n if (_instance == 0) {\n _instance = new T;\n+#ifdef _WIN32\n+ atexit(Singleton::destroy);\n+#else\n std::atexit(Singleton::destroy);\n+#endif\n }\n return Singleton::_instance;\n }\n"} {"commit":"d0aff4745fcc630e4a3e9c43032f1272f2a6cdb1","subject":"linux-generic: packet: implement parser extensions for broadcast and multicast","message":"linux-generic: packet: implement parser extensions for broadcast and multicast\n\nSigned-off-by: Bill Fischofer <52f3c909d51cc5d355a68a403df6906b3c1a8f83@linaro.org>\nReviewed-by: Petri Savolainen <d528fd253b9aaf78fa72edbcc6249e82047f6ce6@nokia.com>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"ravineet-singh\/odp,nmorey\/odp,erachmi\/odp,erachmi\/odp,dkrot\/odp,nmorey\/odp,erachmi\/odp,nmorey\/odp,dkrot\/odp,mike-holmes-linaro\/odp,mike-holmes-linaro\/odp,ravineet-singh\/odp,dkrot\/odp,mike-holmes-linaro\/odp,ravineet-singh\/odp,mike-holmes-linaro\/odp,ravineet-singh\/odp,erachmi\/odp,dkrot\/odp,nmorey\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/linux-generic\/odp_packet.c\n+++ platform\/linux-generic\/odp_packet.c\n@@ -784,6 +784,7 @@\n \tuint8_t ver = ODPH_IPV4HDR_VER(ipv4->ver_ihl);\n \tuint8_t ihl = ODPH_IPV4HDR_IHL(ipv4->ver_ihl);\n \tuint16_t frag_offset;\n+\tuint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr);\n \n \tpkt_hdr->l3_len = odp_be_to_cpu_16(ipv4->tot_len);\n \n@@ -809,6 +810,10 @@\n \tif (odp_unlikely(ODPH_IPV4HDR_IS_FRAGMENT(frag_offset)))\n \t\tpkt_hdr->input_flags.ipfrag = 1;\n \n+\t\/* Handle IPv4 broadcast \/ multicast *\/\n+\tpkt_hdr->input_flags.ip_bcast = (dstaddr == 0xffffffff);\n+\tpkt_hdr->input_flags.ip_mcast = (dstaddr >> 28) == 0xd;\n+\n \treturn ipv4->proto;\n }\n \n@@ -820,6 +825,7 @@\n {\n \tconst odph_ipv6hdr_t *ipv6 = (const odph_ipv6hdr_t *)*parseptr;\n \tconst odph_ipv6hdr_ext_t *ipv6ext;\n+\tuint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr[0]);\n \n \tpkt_hdr->l3_len = odp_be_to_cpu_16(ipv6->payload_len);\n \n@@ -830,10 +836,13 @@\n \t\treturn 0;\n \t}\n \n+\t\/* IPv6 broadcast \/ multicast flags *\/\n+\tpkt_hdr->input_flags.ip_mcast = (dstaddr0 & 0xff000000) == 0xff000000;\n+\tpkt_hdr->input_flags.ip_bcast = 0;\n+\n \t\/* Skip past IPv6 header *\/\n \t*offset += sizeof(odph_ipv6hdr_t);\n \t*parseptr += sizeof(odph_ipv6hdr_t);\n-\n \n \t\/* Skip past any IPv6 extension headers *\/\n \tif (ipv6->next_hdr == ODPH_IPPROTO_HOPOPTS ||\n@@ -850,7 +859,8 @@\n \t\t\t ipv6ext->next_hdr == ODPH_IPPROTO_ROUTE) &&\n \t\t\t*offset < pkt_hdr->frame_len);\n \n-\t\tif (*offset >= pkt_hdr->l3_offset + odp_be_to_cpu_16(ipv6->payload_len)) {\n+\t\tif (*offset >= pkt_hdr->l3_offset +\n+\t\t odp_be_to_cpu_16(ipv6->payload_len)) {\n \t\t\tpkt_hdr->error_flags.ip_err = 1;\n \t\t\treturn 0;\n \t\t}\n@@ -938,23 +948,36 @@\n \tuint32_t offset, seglen;\n \tuint8_t ip_proto = 0;\n \tconst uint8_t *parseptr;\n+\tuint16_t macaddr0, macaddr2, macaddr4;\n \n \toffset = sizeof(odph_ethhdr_t);\n \tif (packet_parse_l2_not_done(pkt_hdr))\n \t\tpacket_parse_l2(pkt_hdr);\n \n-\tif (ptr == NULL) {\n-\t\teth = (odph_ethhdr_t *)packet_map(pkt_hdr, 0, &seglen);\n-\t\tparseptr = (const uint8_t *)ð->type;\n-\t\tethtype = odp_be_to_cpu_16(*((const uint16_t *)\n-\t\t\t\t\t (const void *)parseptr));\n+\teth = ptr ? (const odph_ethhdr_t *)ptr :\n+\t\t(odph_ethhdr_t *)packet_map(pkt_hdr, 0, &seglen);\n+\n+\t\/* Handle Ethernet broadcast\/multicast addresses *\/\n+\tmacaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth));\n+\tpkt_hdr->input_flags.eth_mcast = (macaddr0 & 0x0100) == 0x0100;\n+\n+\tif (macaddr0 == 0xffff) {\n+\t\tmacaddr2 =\n+\t\t\todp_be_to_cpu_16(*((const uint16_t *)\n+\t\t\t\t\t (const void *)eth + 1));\n+\t\tmacaddr4 =\n+\t\t\todp_be_to_cpu_16(*((const uint16_t *)\n+\t\t\t\t\t (const void *)eth + 2));\n+\t\tpkt_hdr->input_flags.eth_bcast =\n+\t\t\t(macaddr2 == 0xffff) && (macaddr4 == 0xffff);\n \t} else {\n-\t\teth = (const odph_ethhdr_t *)ptr;\n-\t\tparseptr = (const uint8_t *)ð->type;\n-\t\tethtype = odp_be_to_cpu_16(*((const uint16_t *)\n-\t\t\t\t\t (const void *)parseptr));\n-\t}\n-\n+\t\tpkt_hdr->input_flags.eth_bcast = 0;\n+\t}\n+\n+\t\/* Get Ethertype *\/\n+\tparseptr = (const uint8_t *)ð->type;\n+\tethtype = odp_be_to_cpu_16(*((const uint16_t *)\n+\t\t\t\t (const void *)parseptr));\n \n \t\/* Parse the VLAN header(s), if present *\/\n \tif (ethtype == ODPH_ETHTYPE_VLAN_OUTER) {\n"} {"commit":"08546cb228307d2a2a08820b5f7f9bb5d82b8862","subject":"More placement fixes","message":"More placement fixes","repos":"Adam-\/bedrock,Adam-\/bedrock","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/packet\/packet_block_placement.c\n+++ src\/packet\/packet_block_placement.c\n@@ -100,8 +100,6 @@\n \n \t\t\/\/ At this point the client has already removed one\n \t\t*weilded_count -= 1;\n-\t\tif (*weilded_count == 0)\n-\t\t\tnbt_free(weilded_item);\n \n \t\tblock = block_find(*weilded_id);\n \t\tif (block == NULL)\n@@ -109,14 +107,21 @@\n \t\t\tbedrock_log(LEVEL_DEBUG, \"player building: %s is trying to place unknown block %d at %d,%d,%d, direction %d\", client->name, *weilded_id, x, y, z, d);\n \t\t\tclient_add_inventory_item(client, item_find_or_create(block->id));\n \t\t\tpacket_send_block_change(client, real_x, real_y, real_z, BLOCK_AIR, 0);\n+\n+\t\t\tif (*weilded_count == 0)\n+\t\t\t\tnbt_free(weilded_item);\n+\n \t\t\treturn offset;\n \t\t}\n \n \t\tbedrock_log(LEVEL_DEBUG, \"player building: %s is placing block of type %s at %d,%d,%d, direction %d\", client->name, block->name, x, y, z, d);\n \n-\t\t\/\/ The count is the count from the client after the block is placed down apparently?\n-\t\tif (id != *weilded_id || count != *weilded_count || metadata != *weilded_metadata)\n-\t\t\treturn ERROR_UNEXPECTED;\n+\t\tprintf(\"%d %d\\n\", count, *weilded_count);\n+\t\/\/\tif (id != *weilded_id || count != *weilded_count || metadata != *weilded_metadata)\n+\t\t\/\/\treturn ERROR_UNEXPECTED;\n+\n+\t\tif (*weilded_count == 0)\n+\t\t\tnbt_free(weilded_item);\n \t}\n \n \tif (abs(*client_get_pos_x(client) - x) > 6 || abs(*client_get_pos_y(client) - y) > 6 || abs(*client_get_pos_z(client) - z) > 6)\n@@ -165,7 +170,7 @@\n \n \t\tchunk_decompress(real_chunk);\n \n-\t\tbeing_placed = chunk_get_block(real_chunk, real_x, real_y, real_y);\n+\t\tbeing_placed = chunk_get_block(real_chunk, real_x, real_y, real_z);\n \n \t\tif (being_placed == NULL || *being_placed != BLOCK_AIR)\n \t\t{\n@@ -181,7 +186,7 @@\n \n \t\tchunk_decompress(real_chunk);\n \n-\t\tbeing_placed = chunk_get_block(real_chunk, real_x, real_y, real_y);\n+\t\tbeing_placed = chunk_get_block(real_chunk, real_x, real_y, real_z);\n \t\tbedrock_assert(being_placed != NULL, return offset);\n \n \t\t*being_placed = id;\n"} {"commit":"287974ed2d14fc3779efabcdd1d38afd83503cfc","subject":"MFC: rev 1.6 declare struct tftphdr and embedded union as beeing packed, which is required for arm.","message":"MFC: rev 1.6\ndeclare struct tftphdr and embedded union as beeing packed, which is\nrequired for arm.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- include\/arpa\/tftp.h\n+++ include\/arpa\/tftp.h\n@@ -58,9 +58,9 @@\n \t\tunsigned short\ttu_block;\t\/* block # *\/\n \t\tunsigned short\ttu_code;\t\/* error code *\/\n \t\tchar\ttu_stuff[1];\t\/* request packet stuff *\/\n-\t} th_u;\n+\t} __packed th_u;\n \tchar\tth_data[1];\t\t\/* data or error string *\/\n-};\n+} __packed;\n \n #define\tth_block\tth_u.tu_block\n #define\tth_code\t\tth_u.tu_code\n"} {"commit":"970f7a4ae91932c49d1b9dc00bfa861f7f2a0197","subject":"linux-gen: packet: improve packet print","message":"linux-gen: packet: improve packet print\n\nAdded segmentation and head-\/tailroom information to packet\nprint out.\n\nSigned-off-by: Petri Savolainen <d528fd253b9aaf78fa72edbcc6249e82047f6ce6@nokia.com>\nReviewed-and-tested-by: Bill Fischofer <52f3c909d51cc5d355a68a403df6906b3c1a8f83@linaro.org>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"nmorey\/odp,ravineet-singh\/odp,nmorey\/odp,dkrot\/odp,erachmi\/odp,erachmi\/odp,nmorey\/odp,ravineet-singh\/odp,mike-holmes-linaro\/odp,dkrot\/odp,erachmi\/odp,mike-holmes-linaro\/odp,dkrot\/odp,dkrot\/odp,mike-holmes-linaro\/odp,ravineet-singh\/odp,ravineet-singh\/odp,erachmi\/odp,nmorey\/odp,mike-holmes-linaro\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/linux-generic\/odp_packet.c\n+++ platform\/linux-generic\/odp_packet.c\n@@ -1395,6 +1395,7 @@\n \n void odp_packet_print(odp_packet_t pkt)\n {\n+\todp_packet_seg_t seg;\n \tint max_len = 512;\n \tchar str[max_len];\n \tint len = 0;\n@@ -1421,6 +1422,25 @@\n \tlen += snprintf(&str[len], n - len,\n \t\t\t\" input %\" PRIu64 \"\\n\",\n \t\t\todp_pktio_to_u64(hdr->input));\n+\tlen += snprintf(&str[len], n - len,\n+\t\t\t\" headroom %\" PRIu32 \"\\n\",\n+\t\t\todp_packet_headroom(pkt));\n+\tlen += snprintf(&str[len], n - len,\n+\t\t\t\" tailroom %\" PRIu32 \"\\n\",\n+\t\t\todp_packet_tailroom(pkt));\n+\tlen += snprintf(&str[len], n - len,\n+\t\t\t\" num_segs %i\\n\", odp_packet_num_segs(pkt));\n+\n+\tseg = odp_packet_first_seg(pkt);\n+\n+\twhile (seg != ODP_PACKET_SEG_INVALID) {\n+\t\tlen += snprintf(&str[len], n - len,\n+\t\t\t\t\" seg_len %\" PRIu32 \"\\n\",\n+\t\t\t\todp_packet_seg_data_len(pkt, seg));\n+\n+\t\tseg = odp_packet_next_seg(pkt, seg);\n+\t}\n+\n \tstr[len] = '\\0';\n \n \tODP_PRINT(\"\\n%s\\n\", str);\n"} {"commit":"5494df87a8578e8341b5e625a95017931f240d4f","subject":"drivers: Fix keyboard","message":"drivers: Fix keyboard\n","repos":"embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox,embox\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/drivers\/input\/keyboard\/keyboard.c\n+++ src\/drivers\/input\/keyboard\/keyboard.c\n@@ -175,7 +175,7 @@\n \tint ret;\n \n \tret = keyboard_get_input_event(dev, &ev);\n-\tif (!ret && dev->event_cb) {\n+\tif (!ret) {\n \t\tinput_dev_report_event(dev, &ev);\n \t}\n \n"} {"commit":"3d89e4be8ff3bee5945e85f40e1bb2ab79ec05b8","subject":"Fixed compile bug in ArrayWithPop","message":"Fixed compile bug in ArrayWithPop\n","repos":"septag\/termite,septag\/termite,septag\/termite,septag\/termite,septag\/termite,septag\/termite","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/bxx\/array.h\n+++ include\/bxx\/array.h\n@@ -142,7 +142,7 @@\n if (m_freeIndexIter == 0) {\n int newsz = m_numExpand + m_maxItems;\n m_buff = (Ty*)BX_REALLOC(m_alloc, m_buff, sizeof(Ty)*newsz);\n- m_freeIndexes = (Ty*)BX_REALLOC(m_alloc, m_freeIndexes, sizeof(int)*newsz);\n+ m_freeIndexes = (int*)BX_REALLOC(m_alloc, m_freeIndexes, sizeof(int)*newsz);\n if (!m_buff || !m_freeIndexes)\n return nullptr;\n \n"} {"commit":"c65cfd73c6103d02f33a62099391a98cf60d098f","subject":"linux-gen: packet: fix odp_packet_reset() implementation","message":"linux-gen: packet: fix odp_packet_reset() implementation\n\nFollow the API definition and use total buffer length instead of single\nsegment length when checking 'len' argument validity.\n\nReset also packet segment data pointers and lengths.\n\nSigned-off-by: Matias Elo <62402263e8617147f0e4dd5b7f6f8ec67f2b3d2c@nokia.com>\nReviewed-by: Bill Fischofer <52f3c909d51cc5d355a68a403df6906b3c1a8f83@linaro.org>\nSigned-off-by: Maxim Uvarov <db4d16e02ae2d7493db430203537da8b2e34f290@linaro.org>\n","repos":"dkrot\/odp,dkrot\/odp,dkrot\/odp,dkrot\/odp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- platform\/linux-generic\/odp_packet.c\n+++ platform\/linux-generic\/odp_packet.c\n@@ -308,6 +308,20 @@\n \t}\n }\n \n+static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num)\n+{\n+\todp_buffer_hdr_t *hdr;\n+\tvoid *base;\n+\tint i;\n+\n+\tfor (i = first; i < first + num; i++) {\n+\t\thdr = pkt_hdr->buf_hdr.seg[i].hdr;\n+\t\tbase = hdr->base_data;\n+\t\tpkt_hdr->buf_hdr.seg[i].len = BASE_LEN;\n+\t\tpkt_hdr->buf_hdr.seg[i].data = base;\n+\t}\n+}\n+\n \/* Calculate the number of segments *\/\n static inline int num_segments(uint32_t len)\n {\n@@ -627,9 +641,12 @@\n {\n \todp_packet_hdr_t *const pkt_hdr = packet_hdr(pkt);\n \tpool_t *pool = pkt_hdr->buf_hdr.pool_ptr;\n-\n-\tif (len > pool->headroom + pool->data_size + pool->tailroom)\n+\tint num = pkt_hdr->buf_hdr.segcount;\n+\n+\tif (odp_unlikely(len > (pool->max_seg_len * num)))\n \t\treturn -1;\n+\n+\treset_seg(pkt_hdr, 0, num);\n \n \tpacket_init(pkt_hdr, len);\n \n@@ -842,20 +859,6 @@\n \n \t\/* first segment which have data *\/\n \treturn dst_seg;\n-}\n-\n-static inline void reset_seg(odp_packet_hdr_t *pkt_hdr, int first, int num)\n-{\n-\todp_buffer_hdr_t *hdr;\n-\tvoid *base;\n-\tint i;\n-\n-\tfor (i = first; i < first + num; i++) {\n-\t\thdr = pkt_hdr->buf_hdr.seg[i].hdr;\n-\t\tbase = hdr->base_data;\n-\t\tpkt_hdr->buf_hdr.seg[i].len = BASE_LEN;\n-\t\tpkt_hdr->buf_hdr.seg[i].data = base;\n-\t}\n }\n \n int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len,\n"} {"commit":"527fe7d287764b14eae2af5ce5f9af4323f78cf7","subject":"(drivers) lan91c111: Fix CRC and control byte","message":"(drivers) lan91c111: Fix CRC and control byte\n","repos":"embox\/embox,embox\/embox,embox\/embox,embox\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,embox\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,Kakadu\/embox,embox\/embox","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/drivers\/net\/lan91c111\/lan91c111.c\n+++ src\/drivers\/net\/lan91c111\/lan91c111.c\n@@ -68,6 +68,12 @@\n #define REG16_STORE(addr, val) \\\n \tdo { *((volatile uint16_t *)(addr)) = (val); } while (0)\n \n+#define REG8_LOAD(addr) \\\n+\t*((volatile uint8_t *)(addr))\n+\n+#define REG8_STORE(addr, val) \\\n+\tdo { *((volatile uint8_t *)(addr)) = (val); } while (0)\n+\n \/* Commands *\/\n #define CMD_NOP 0\n #define CMD_TX_ALLOC 1\n@@ -92,7 +98,8 @@\n #define TX_MASK 0x0002\n #define RX_MASK 0x0001\n \n-#define CRC_EN 0x0010\n+#define CRC_CONTROL 0x10\n+#define ODD_CONTROL 0x20\n \n #define LAN91C111_FRAME_SIZE_MAX 2048\n #define LAN91C111_IRQ 27\n@@ -142,7 +149,7 @@\n static int lan91c111_xmit(struct net_device *dev, struct sk_buff *skb) {\n \tuint16_t packet_num;\n \tint i;\n-\tuint16_t *data;\n+\tuint8_t *data;\n \tuint16_t pointer;\n \n \t_set_cmd(CMD_TX_ALLOC);\n@@ -159,31 +166,47 @@\n \t\/* Write header *\/\n \tpointer = 2;\n \tREG16_STORE(BANK_POINTER, pointer);\n-\tREG16_STORE(BANK_DATA, (uint16_t) skb->len + 10);\n-\t\/* Those 10 bytes are 2 for status + 2 for counter + 4\n-\t * for crc + 1 for control + 1 for odd *\/\n+\tREG16_STORE(BANK_DATA, 2 * (1 + 1 + 1 + 2 + (uint16_t) skb->len \/ 2));\n+\t\/* Those 10 bytes are 2 for status + 2 for counter +\n+\t * 4 for crc + 2 for control *\/\n \n \tpointer = 4;\n \tREG16_STORE(BANK_POINTER, pointer);\n \n \t\/* BANK_DATA register works as FIFO, so we just push\n \t * data with 16-bit writes *\/\n-\tdata = (uint16_t*) skb_data_cast_in(skb->data);\n-\tfor (i = 0; i < skb->len; i += 2) {\n+\tdata = (uint8_t*) skb_data_cast_in(skb->data);\n+\tfor (i = 0; i < skb->len; i++) {\n \t\t\/* This could be done with 32-bit writes,\n \t\t * but here we just use the usual macro *\/\n-\t\tREG16_STORE(BANK_DATA, *data);\n+\t\tREG8_STORE(BANK_DATA, *data);\n \t\tdata++;\n \n \t\t\/* Auto-increment for pointer register seems to\n \t\t * be unsupported by qemu-linaro, so we increment\n \t\t * it by hand *\/\n-\t\tpointer += 2;\n+\t\tpointer++;\n \t\tREG16_STORE(BANK_POINTER, pointer);\n \t}\n \n+\tfor (int i = 0; i < 4; i++) {\n+\t\tpointer++;\n+\t\tREG16_STORE(BANK_POINTER, pointer);\n+\t\tREG8_STORE(BANK_DATA, 0);\n+\t}\n+\t\/* Miss CRC bytes *\/\n+\n \t\/* Write control byte *\/\n-\tREG16_STORE(BANK_DATA, CRC_EN);\n+\tif (skb->len % 2) {\n+\t\tpointer++;\n+\t\tREG8_STORE(BANK_DATA, CRC_CONTROL | ODD_CONTROL);\n+\t} else {\n+\t\tpointer++;\n+\t\tREG16_STORE(BANK_POINTER, pointer);\n+\t\tREG8_STORE(BANK_DATA, 0x0);\n+\t\tpointer++;\n+\t\tREG8_STORE(BANK_POINTER, CRC_CONTROL);\n+\t}\n \n \t_set_cmd(CMD_TX_ENQUEUE);\n \n"} {"commit":"40ab54f3e701e3612a9785db90ddec6c1b05ac4f","subject":"address commments","message":"address commments\n","repos":"marian-nmt\/marian-train,marian-nmt\/marian-train,emjotde\/amunmt,emjotde\/amunmt,marian-nmt\/marian-train,emjotde\/Marian,emjotde\/amunn,emjotde\/Marian,emjotde\/amunn,emjotde\/amunn,emjotde\/amunmt,marian-nmt\/marian-train,emjotde\/amunmt,emjotde\/amunn,marian-nmt\/marian-train","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/translator\/beam_search.h\n+++ src\/translator\/beam_search.h\n@@ -250,17 +250,17 @@\n const auto srcEosId = batch->front()->vocab()->getEosId();\n for(int batchIdx = 0; batchIdx < dimBatch; ++batchIdx) {\n auto& beam = beams[batchIdx];\n- histories[batchIdx]->add(beam, trgEosId); \/\/ add beams with start-hypotheses to histories\n+ histories[batchIdx]->add(beam, trgEosId); \/\/ add beams with start-hypotheses to traceback grid\n \n \/\/ Handle batch entries that consist only of source <EOS> i.e. these are empty lines\n- if(batch->front()->data()[batchIdx] == srcEosId) { \/\/ if input is empty, i.e. first word is source <EOS>\n+ if(batch->front()->data()[batchIdx] == srcEosId) {\n \/\/ create an target <EOS> hypothesis that extends the start-hypothesis\n auto eosHyp = New<Hypothesis>(\/*prevHyp=*\/ beam[0], \n \/*currWord=*\/ trgEosId, \n \/*prevHypIdx=*\/ 0, \n \/*pathScore=*\/ 0.f);\n auto eosBeam = Beam(beamSize_, eosHyp); \/\/ create a dummy beam filled with <EOS>-hyps\n- histories[batchIdx]->add(eosBeam, trgEosId); \/\/ push dummy <EOS>-beam to history\n+ histories[batchIdx]->add(eosBeam, trgEosId); \/\/ push dummy <EOS>-beam to traceback grid\n beam.clear(); \/\/ zero out current beam, so it does not get used for further symbols as empty beams get omitted\/dummy-filled everywhere\n }\n }\n"} {"commit":"e12c124e10683483d73b5a6a9591d91dd63f2761","subject":"msm: krait-regulator: fix race conditions in regulator enable\/disable","message":"msm: krait-regulator: fix race conditions in regulator enable\/disable\n\nThe driver suffers from the following race conditions:\n* when a core is being onlined and is in its PREPARE_UP stage regulator\nenable for that core is called. This call may cause a switch between\nldo-bhs but since the core if not online yet and ldo-bhs calls are\nstrictly executed on the target cpu - this leads to smp function calls\nto fail.\n* before the core in onlined and after the PREPARE_UP stage there could\nbe another frequency change that causes a gang voltage change that in turn\ncauses this core to switch states. This too leads to failed smp function\ncalls since they are targeted towards offline core\n* when a cpu is offlined but a DEAD notification is not sent a frequency\nchange on another core may cause a switch on this cpu. This also leads\nto failed smp function calls on offline core.\n\nFix the above by forcing the core to BHS when it is in its transitory\nphase and while it is offlined. In other words a core will switch to\nbhs\/ldo based on the voltage requests only between CPU_ONLINE and\nCPU_DOWN_PREPARE notifications. A core can run on BHS if it\ncan run on LDO since LDO just acts as a voltage step down, the core\ncan run when fed higher voltage from BHS.\n\nTo do this add hooks to get cpu hotplug notifications in the driver and\nappropriately force bhs or switch to ldo or bhs based on gang voltage.\n\nCRs-Fixed: 529593\nChange-Id: I7210f62072853ed6f807df2d78bc2144f67eaf31\nSigned-off-by: Abhijeet Dharmapurikar <98996d53ce579fa37f08d0061abc5355e223c79e@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-msm\/krait-regulator.c\n+++ arch\/arm\/mach-msm\/krait-regulator.c\n@@ -29,6 +29,7 @@\n #include <linux\/regulator\/krait-regulator.h>\n #include <linux\/debugfs.h>\n #include <linux\/syscore_ops.h>\n+#include <linux\/cpu.h>\n #include <mach\/msm_iomap.h>\n #include \"krait-regulator-pmic.h\"\n \n@@ -225,6 +226,7 @@\n \tint\t\t\t\tcoeff2;\n \tbool\t\t\t\treg_en;\n \tint\t\t\t\tonline_at_probe;\n+\tbool\t\t\t\tforce_bhs;\n };\n \n DEFINE_PER_CPU(struct krait_power_vreg *, krait_vregs);\n@@ -768,6 +770,41 @@\n \treturn rc;\n }\n \n+static int configure_ldo_or_hs_one(struct krait_power_vreg *kvreg, int vmax)\n+{\n+\tint rc;\n+\n+\tif (!kvreg->reg_en)\n+\t\treturn 0;\n+\n+\tif (kvreg->force_bhs)\n+\t\t\/*\n+\t\t * The cpu is in transitory phase where it is being\n+\t\t * prepared to be offlined or onlined and is being\n+\t\t * forced to run on BHS during that time\n+\t\t *\/\n+\t\treturn 0;\n+\n+\tif (kvreg->uV <= kvreg->ldo_threshold_uV\n+\t\t&& kvreg->uV - kvreg->ldo_delta_uV + kvreg->headroom_uV\n+\t\t\t<= vmax) {\n+\t\trc = switch_to_using_ldo(kvreg);\n+\t\tif (rc < 0) {\n+\t\t\tpr_err(\"could not switch %s to ldo rc = %d\\n\",\n+\t\t\t\t\t\tkvreg->name, rc);\n+\t\t\treturn rc;\n+\t\t}\n+\t} else {\n+\t\trc = switch_to_using_bhs(kvreg);\n+\t\tif (rc < 0) {\n+\t\t\tpr_err(\"could not switch %s to hs rc = %d\\n\",\n+\t\t\t\t\t\tkvreg->name, rc);\n+\t\t\treturn rc;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n static int configure_ldo_or_hs_all(struct krait_power_vreg *from, int vmax)\n {\n \tstruct pmic_gang_vreg *pvreg = from->pvreg;\n@@ -775,27 +812,12 @@\n \tint rc = 0;\n \n \tlist_for_each_entry(kvreg, &pvreg->krait_power_vregs, link) {\n-\t\tif (!kvreg->reg_en)\n-\t\t\tcontinue;\n-\t\tif (kvreg->uV <= kvreg->ldo_threshold_uV\n-\t\t\t&& kvreg->uV - kvreg->ldo_delta_uV + kvreg->headroom_uV\n-\t\t\t\t<= vmax) {\n-\t\t\trc = switch_to_using_ldo(kvreg);\n-\t\t\tif (rc < 0) {\n-\t\t\t\tpr_err(\"could not switch %s to ldo rc = %d\\n\",\n-\t\t\t\t\t\t\tkvreg->name, rc);\n-\t\t\t\treturn rc;\n-\t\t\t}\n-\t\t} else {\n-\t\t\trc = switch_to_using_bhs(kvreg);\n-\t\t\tif (rc < 0) {\n-\t\t\t\tpr_err(\"could not switch %s to hs rc = %d\\n\",\n-\t\t\t\t\t\t\tkvreg->name, rc);\n-\t\t\t\treturn rc;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n+\t\trc = configure_ldo_or_hs_one(kvreg, vmax);\n+\t\tif (rc) {\n+\t\t\tpr_err(\"could not switch %s\\n\", kvreg->name);\n+\t\t\tbreak;\n+\t\t}\n+\t}\n \treturn rc;\n }\n \n@@ -914,7 +936,7 @@\n \t\trc = krait_voltage_decrease(kvreg, vmax);\n \n \tif (rc < 0) {\n-\t\tdev_err(&rdev->dev, \"%s failed to set %duV from %duV rc = %d\\n\",\n+\t\tpr_err(\"%s failed to set %duV from %duV rc = %d\\n\",\n \t\t\t\tkvreg->name, requested_uV, orig_krait_uV, rc);\n \t}\n \n@@ -971,6 +993,7 @@\n \tint rc;\n \n \tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\tpr_debug(\"enable %s\\n\", kvreg->name);\n \t__krait_power_mdd_enable(kvreg, true);\n \tkvreg->reg_en = true;\n \trc = _get_optimum_mode(rdev, kvreg->uV, kvreg->uV, kvreg->load);\n@@ -993,6 +1016,7 @@\n \tint rc;\n \n \tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\tpr_debug(\"disable %s\\n\", kvreg->name);\n \tkvreg->reg_en = false;\n \n \trc = _get_optimum_mode(rdev, kvreg->uV, kvreg->uV, kvreg->load);\n@@ -1015,6 +1039,69 @@\n \t.enable\t\t\t= krait_power_enable,\n \t.disable\t\t= krait_power_disable,\n \t.is_enabled\t\t= krait_power_is_enabled,\n+};\n+\n+static int krait_regulator_cpu_callback(struct notifier_block *nfb,\n+\t\t\t\t\t unsigned long action, void *hcpu)\n+{\n+\tint cpu = (int)hcpu;\n+\tstruct krait_power_vreg *kvreg = per_cpu(krait_vregs, cpu);\n+\tstruct pmic_gang_vreg *pvreg = kvreg->pvreg;\n+\n+\tpr_debug(\"start state=0x%02x, cpu=%d is_online=%d\\n\",\n+\t\t\t(int)action, cpu, cpu_online(cpu));\n+\tswitch (action & ~CPU_TASKS_FROZEN) {\n+\tcase CPU_UP_PREPARE:\n+\t\tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\t\tkvreg->force_bhs = true;\n+\t\t\/*\n+\t\t * cpu is offline at this point, force bhs on which ever cpu\n+\t\t * this callback is running on\n+\t\t *\/\n+\t\tpr_debug(\"%s force BHS locally\\n\", kvreg->name);\n+\t\t__switch_to_using_bhs(kvreg);\n+\t\tmutex_unlock(&pvreg->krait_power_vregs_lock);\n+\t\tbreak;\n+\tcase CPU_UP_CANCELED:\n+\tcase CPU_ONLINE:\n+\t\tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\t\tkvreg->force_bhs = false;\n+\t\t\/*\n+\t\t * switch the cpu to proper bhs\/ldo, the cpu is online at this\n+\t\t * point. The gang voltage and mode votes for the cpu were\n+\t\t * submitted in CPU_UP_PREPARE phase\n+\t\t *\/\n+\t\tconfigure_ldo_or_hs_one(kvreg, pvreg->pmic_vmax_uV);\n+\t\tmutex_unlock(&pvreg->krait_power_vregs_lock);\n+\t\tbreak;\n+\tcase CPU_DOWN_PREPARE:\n+\t\tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\t\tkvreg->force_bhs = true;\n+\t\t\/*\n+\t\t * switch the cpu to run on bhs using smp function calls. Note\n+\t\t * that the cpu is online at this point.\n+\t\t *\/\n+\t\tpr_debug(\"%s force BHS remotely\\n\", kvreg->name);\n+\t\tswitch_to_using_bhs(kvreg);\n+\t\tmutex_unlock(&pvreg->krait_power_vregs_lock);\n+\t\tbreak;\n+\tcase CPU_DOWN_FAILED:\n+\t\tmutex_lock(&pvreg->krait_power_vregs_lock);\n+\t\tkvreg->force_bhs = false;\n+\t\tconfigure_ldo_or_hs_one(kvreg, pvreg->pmic_vmax_uV);\n+\t\tmutex_unlock(&pvreg->krait_power_vregs_lock);\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\tpr_debug(\"done state=0x%02x, cpu=%d is_online=%d\\n\",\n+\t\t\t(int)action, cpu, cpu_online(cpu));\n+\treturn NOTIFY_OK;\n+}\n+\n+static struct notifier_block krait_cpu_notifier = {\n+\t.notifier_call = krait_regulator_cpu_callback,\n };\n \n static struct dentry *dent;\n@@ -1503,11 +1590,14 @@\n \t\t\t\tKRAIT_REGULATOR_DRIVER_NAME, rc);\n \t\treturn rc;\n \t}\n+\n+\tregister_hotcpu_notifier(&krait_cpu_notifier);\n \treturn platform_driver_register(&krait_pdn_driver);\n }\n \n static void __exit krait_power_exit(void)\n {\n+\tunregister_hotcpu_notifier(&krait_cpu_notifier);\n \tplatform_driver_unregister(&krait_power_driver);\n \tplatform_driver_unregister(&krait_pdn_driver);\n }\n"} {"commit":"d56f0b1b148d9ea6bc87fb85ba9f3a196910ac05","subject":"Expunge explicit RestKit header references from our headers","message":"Expunge explicit RestKit header references from our headers\n","repos":"cityindex-attic\/CIAPI.ObjC,cityindex-attic\/CIAPI.ObjC,cityindex-attic\/CIAPI.ObjC","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- CIAPI\/CIAPI\/CIAPIObjectRequest.h\n+++ CIAPI\/CIAPI\/CIAPIObjectRequest.h\n@@ -9,9 +9,10 @@\n #import <Foundation\/Foundation.h>\n \n #import \"CIAPIRequestDelegate.h\"\n-#import \"RestKit\/RestKit.h\"\n \n-typedef void(^CIAPIRequestCallback)(id request, id response, NSError *error);\n+@class CIAPIRequestToken;\n+\n+typedef void(^CIAPIRequestCallback)(CIAPIRequestToken *request, id response, NSError *error);\n \n enum CIAPIRequestType\n {\n"} {"commit":"9b142ddf7e8d18a47991a81394419933fd702cd5","subject":"tckmap: Fix segfault with -dec -stat_vox mean combination","message":"tckmap: Fix segfault with -dec -stat_vox mean combination\n\nFixes issue introduced in 17e22166. The specific use case of combining -dec with -stat_vox mean was altered to no longer rely on keeping track of a voxel-wise track density, and so memory for this buffer is no longer allocated; yet the receiving functor would still attempt to write to this buffer.\nCloses #1285.\n","repos":"MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3,MRtrix3\/mrtrix3","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/dwi\/tractography\/mapping\/writer.h\n+++ src\/dwi\/tractography\/mapping\/writer.h\n@@ -102,8 +102,8 @@\n \n public:\n MapWriter (const Header& header, const std::string& name, const vox_stat_t voxel_statistic = V_SUM, const writer_dim type = GREYSCALE) :\n- MapWriterBase (header, name, voxel_statistic, type),\n- buffer (Image<value_type>::scratch (header, \"TWI \" + str(writer_dims[type]) + \" buffer\"))\n+ MapWriterBase (header, name, voxel_statistic, type),\n+ buffer (Image<value_type>::scratch (header, \"TWI \" + str(writer_dims[type]) + \" buffer\"))\n {\n auto loop = Loop (buffer);\n if (type == DEC || type == TOD) {\n@@ -125,7 +125,7 @@\n } else if (voxel_statistic == V_MAX) {\n for (auto l = loop (buffer); l; ++l )\n buffer.value() = std::numeric_limits<value_type>::lowest();\n- } \n+ }\n \/* shouldn't be needed: scratch IO class memset to zero already:\n else {\n buffer.zero();\n@@ -140,7 +140,7 @@\n (type == DEC && voxel_statistic == V_SUM))\n {\n Header H_counts (header);\n- if (type == DEC || type == TOD) \n+ if (type == DEC || type == TOD)\n H_counts.ndim() = 3;\n counts.reset (new Image<float> (Image<float>::scratch (H_counts, \"TWI streamline count buffer\")));\n }\n@@ -177,21 +177,22 @@\n break;\n \n case V_MEAN:\n- assert (counts);\n if (type == GREYSCALE) {\n+ assert (counts);\n for (auto l = loop (buffer, *counts); l; ++l) {\n if (counts->value())\n buffer.value() \/= value_type(counts->value());\n }\n- } \n+ }\n else if (type == DEC) {\n for (auto l = loop (buffer); l; ++l) {\n auto value = get_dec();\n- if (value.squaredNorm()) \n+ if (value.squaredNorm())\n set_dec (value.normalized());\n }\n- } \n+ }\n else if (type == TOD) {\n+ assert (counts);\n for (auto l = loop (buffer, *counts); l; ++l) {\n if (counts->value()) {\n VoxelTOD::vector_type value;\n@@ -201,6 +202,7 @@\n }\n }\n } else { \/\/ Dixel\n+ assert (counts);\n \/\/ TODO For dixels, should this be a voxel mean i.e. normalise each non-zero voxel to unit density,\n \/\/ rather than a per-dixel mean?\n for (auto l = Loop (buffer) (buffer, *counts); l; ++l) {\n@@ -293,7 +295,7 @@\n void MapWriter<value_type>::receive_greyscale (const Cont& in)\n {\n assert (MapWriterBase::type == GREYSCALE);\n- for (const auto& i : in) { \n+ for (const auto& i : in) {\n assign_pos_of (i).to (buffer);\n const default_type factor = get_factor (i, in);\n const default_type weight = in.weight * i.get_length();\n@@ -320,7 +322,7 @@\n void MapWriter<value_type>::receive_dec (const Cont& in)\n {\n assert (type == DEC);\n- for (const auto& i : in) { \n+ for (const auto& i : in) {\n assign_pos_of (i).to (buffer);\n const default_type factor = get_factor (i, in);\n const default_type weight = in.weight * i.get_length();\n@@ -340,9 +342,6 @@\n break;\n case V_MEAN:\n set_dec (current_value + (scaled_colour * weight));\n- assert (counts);\n- assign_pos_of (i).to (*counts);\n- counts->value() += weight;\n break;\n case V_MAX:\n if (scaled_colour.squaredNorm() > current_value.squaredNorm())\n@@ -361,7 +360,7 @@\n void MapWriter<value_type>::receive_dixel (const Cont& in)\n {\n assert (type == DIXEL);\n- for (const auto& i : in) { \n+ for (const auto& i : in) {\n assign_pos_of (i, 0, 3).to (buffer);\n buffer.index(3) = i.get_dir();\n const default_type factor = get_factor (i, in);\n@@ -391,7 +390,7 @@\n {\n assert (type == TOD);\n VoxelTOD::vector_type sh_coefs;\n- for (const auto& i : in) { \n+ for (const auto& i : in) {\n assign_pos_of (i, 0, 3).to (buffer);\n const default_type factor = get_factor (i, in);\n const default_type weight = in.weight * i.get_length();\n@@ -485,7 +484,7 @@\n {\n assert (type == TOD);\n sh_coefs.resize (buffer.size(3));\n- for (auto l = Loop (3) (buffer); l; ++l) \n+ for (auto l = Loop (3) (buffer); l; ++l)\n sh_coefs[buffer.index(3)] = buffer.value();\n }\n \n@@ -494,7 +493,7 @@\n {\n assert (type == TOD);\n assert (sh_coefs.size() == buffer.size(3));\n- for (auto l = Loop (3) (buffer); l; ++l) \n+ for (auto l = Loop (3) (buffer); l; ++l)\n buffer.value() = sh_coefs[buffer.index(3)];\n }\n \n"} {"commit":"773322b9a87611ebb83a8e2d1b98446717a93562","subject":"master: Require protocols=none to not have any protocols.","message":"master: Require protocols=none to not have any protocols.\n\n--HG--\nbranch : HEAD\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/master\/master-settings.c\n+++ src\/master\/master-settings.c\n@@ -397,7 +397,16 @@\n \t\texpand_user(&service->user, set);\n \t\tservice_set_login_dump_core(service);\n \t}\n-\tset->protocols_split = p_strsplit(pool, set->protocols, \" \");\n+\tset->protocols_split = p_strsplit_spaces(pool, set->protocols, \" \");\n+\tif (set->protocols_split[0] == NULL) {\n+\t\t*error_r = \"No protocols defined, \"\n+\t\t\t\"if you don't want any use protocols=none\";\n+\t\treturn FALSE;\n+\t}\n+\tif (strcmp(set->protocols_split[0], \"none\") == 0 &&\n+\t set->protocols_split[1] == NULL)\n+\t\tset->protocols_split[0] = NULL;\n+\n \tfor (i = 0; set->protocols_split[i] != NULL; i++) {\n \t\tif (!services_have_protocol(set, set->protocols_split[i])) {\n \t\t\t*error_r = t_strdup_printf(\"protocols: \"\n@@ -406,7 +415,6 @@\n \t\t\treturn FALSE;\n \t\t}\n \t}\n-\n \tt_array_init(&all_listeners, 64);\n \tauth_client_limit = max_auth_client_processes = 0;\n \tfor (i = 0; i < count; i++) {\n"} {"commit":"2369ab7ddaecf9f94c2a76da743b58ad494e7ea1","subject":"msm: msm_watchdog_v2: Initialize watchdog early to handle early failures","message":"msm: msm_watchdog_v2: Initialize watchdog early to handle early failures\n\nCurrently watchdog is initialized as late_initcall which is not\nhelping in handling early failures. Hence initialize watchdog as\npure_initcall to handle the aforementioned cases.\n\nChange-Id: Ia4ecee31b3557457905495a4870f527fb7e975aa\nSigned-off-by: Subbaraman Narayanamurthy <28f0d737c2aab29ec3fb2474afc7fc04c49efb45@codeaurora.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- arch\/arm\/mach-msm\/msm_watchdog_v2.c\n+++ arch\/arm\/mach-msm\/msm_watchdog_v2.c\n@@ -568,6 +568,6 @@\n \treturn platform_driver_register(&msm_watchdog_driver);\n }\n \n-late_initcall(init_watchdog);\n+pure_initcall(init_watchdog);\n MODULE_DESCRIPTION(\"MSM Watchdog Driver\");\n MODULE_LICENSE(\"GPL v2\");\n"} {"commit":"eea198e5e30f06dbfaef0eb4cb7047c6b33b12f6","subject":"Delete all auth-worker.* files from Dovecot's base_dir when starting.","message":"Delete all auth-worker.* files from Dovecot's base_dir when starting.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/master\/master-settings.c\n+++ src\/master\/master-settings.c\n@@ -466,12 +466,13 @@\n \treturn FALSE;\n }\n \n-static void unlink_auth_sockets(const char *path)\n+static void unlink_auth_sockets(const char *path, const char *prefix)\n {\n \tDIR *dirp;\n \tstruct dirent *dp;\n \tstruct stat st;\n \tstring_t *str;\n+\tunsigned int prefix_len;\n \n \tdirp = opendir(path);\n \tif (dirp == NULL) {\n@@ -479,9 +480,13 @@\n \t\treturn;\n \t}\n \n+\tprefix_len = strlen(prefix);\n \tstr = t_str_new(256);\n \twhile ((dp = readdir(dirp)) != NULL) {\n \t\tif (dp->d_name[0] == '.')\n+\t\t\tcontinue;\n+\n+\t\tif (strncmp(dp->d_name, prefix, prefix_len) != 0)\n \t\t\tcontinue;\n \n \t\tstr_truncate(str, 0);\n@@ -736,6 +741,9 @@\n \t\t\ti_error(\"chmod(%s) failed: %m\", set->base_dir);\n \t}\n \n+\t\/* remove auth worker sockets left by unclean exits *\/\n+\tunlink_auth_sockets(set->base_dir, \"auth-worker.\");\n+\n \t\/* Make sure our permanent state directory exists *\/\n \tif (mkdir_parents(PKG_STATEDIR, 0750) < 0 && errno != EEXIST) {\n \t\ti_error(\"mkdir(%s) failed: %m\", PKG_STATEDIR);\n@@ -754,7 +762,7 @@\n \t\t\t\t \"%s\", set->login_dir);\n \t\t}\n \n-\t\tunlink_auth_sockets(set->login_dir);\n+\t\tunlink_auth_sockets(set->login_dir, \"\");\n \t}\n \n #ifdef HAVE_MODULES\n"} {"commit":"d5de63f5f84d7def5e25a90e44234c58003876c1","subject":"ARM: omap: preemptively fix section mismatch in omap4_sdp4430_wifi_mux_init()","message":"ARM: omap: preemptively fix section mismatch in omap4_sdp4430_wifi_mux_init()\n\nFound by review.\n\nomap4_sdp4430_wifi_mux_init() is called by an __init marked function,\nand only calls omap_mux_init_gpio() and omap_mux_init_signal() which\nare both also an __init marked functions.\n\nThe only reason this doesn't issue a warning is because the compiler\ninlines omap4_sdp4430_wifi_mux_init() into omap4_sdp4430_wifi_init().\n\nSo, lets add the __init annotation to ensure this remains safe should\nthe compiler choose not to inline.\n\nAcked-by: Tony Lindgren <1001e8702733cced254345e193c88aaa47a4f5de@atomide.com>\nSigned-off-by: Russell King <f6aa0246ff943bfa8602cdf60d40c481b38ed232@arm.linux.org.uk>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/arm\/mach-omap2\/board-4430sdp.c\n+++ arch\/arm\/mach-omap2\/board-4430sdp.c\n@@ -851,7 +851,7 @@\n #define board_mux\tNULL\n #endif\n \n-static void omap4_sdp4430_wifi_mux_init(void)\n+static void __init omap4_sdp4430_wifi_mux_init(void)\n {\n \tomap_mux_init_gpio(GPIO_WIFI_IRQ, OMAP_PIN_INPUT |\n \t\t\t\tOMAP_PIN_OFF_WAKEUPENABLE);\n"} {"commit":"86d10eab5ae8d3f90eb9d2eecd0daeb8b4c116d5","subject":"m32r: Use generic posix_types.h","message":"m32r: Use generic posix_types.h\n\nChange the m32r architecture to use <asm-generic\/posix_types.h>.\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com>\nLink: http:\/\/lkml.kernel.org\/r\/1328677745-20121-11-git-send-email-8a453bad9912ffe59bc0f0b8abe03df9be19379e@zytor.com\nCc: Hirokazu Takata <cf11bbe1b6d3d076b415c503f9127c50075c83bd@linux-m32r.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/m32r\/include\/asm\/posix_types.h\n+++ arch\/m32r\/include\/asm\/posix_types.h\n@@ -7,112 +7,22 @@\n * assume GCC is being used.\n *\/\n \n-typedef unsigned long\t__kernel_ino_t;\n typedef unsigned short\t__kernel_mode_t;\n+#define __kernel_mode_t __kernel_mode_t\n+\n typedef unsigned short\t__kernel_nlink_t;\n-typedef long\t\t__kernel_off_t;\n-typedef int\t\t__kernel_pid_t;\n+#define __kernel_nlink_t __kernel_nlink_t\n+\n typedef unsigned short\t__kernel_ipc_pid_t;\n+#define __kernel_ipc_pid_t __kernel_ipc_pid_t\n+\n typedef unsigned short\t__kernel_uid_t;\n typedef unsigned short\t__kernel_gid_t;\n-typedef unsigned int\t__kernel_size_t;\n-typedef int\t\t__kernel_ssize_t;\n-typedef int\t\t__kernel_ptrdiff_t;\n-typedef long\t\t__kernel_time_t;\n-typedef long\t\t__kernel_suseconds_t;\n-typedef long\t\t__kernel_clock_t;\n-typedef int\t\t__kernel_timer_t;\n-typedef int\t\t__kernel_clockid_t;\n-typedef int\t\t__kernel_daddr_t;\n-typedef char *\t\t__kernel_caddr_t;\n-typedef unsigned short\t__kernel_uid16_t;\n-typedef unsigned short\t__kernel_gid16_t;\n-typedef unsigned int\t__kernel_uid32_t;\n-typedef unsigned int\t__kernel_gid32_t;\n+#define __kernel_uid_t __kernel_uid_t\n \n-typedef unsigned short\t__kernel_old_uid_t;\n-typedef unsigned short\t__kernel_old_gid_t;\n typedef unsigned short\t__kernel_old_dev_t;\n+#define __kernel_old_dev_t __kernel_old_dev_t\n \n-#ifdef __GNUC__\n-typedef long long\t__kernel_loff_t;\n-#endif\n-\n-typedef struct {\n-\tint\tval[2];\n-} __kernel_fsid_t;\n-\n-#if defined(__KERNEL__)\n-\n-#undef\t__FD_SET\n-static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)\n-{\n-\tunsigned long __tmp = __fd \/ __NFDBITS;\n-\tunsigned long __rem = __fd % __NFDBITS;\n-\t__fdsetp->fds_bits[__tmp] |= (1UL<<__rem);\n-}\n-\n-#undef\t__FD_CLR\n-static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)\n-{\n-\tunsigned long __tmp = __fd \/ __NFDBITS;\n-\tunsigned long __rem = __fd % __NFDBITS;\n-\t__fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);\n-}\n-\n-\n-#undef\t__FD_ISSET\n-static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)\n-{\n-\tunsigned long __tmp = __fd \/ __NFDBITS;\n-\tunsigned long __rem = __fd % __NFDBITS;\n-\treturn (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;\n-}\n-\n-\/*\n- * This will unroll the loop for the normal constant case (8 ints,\n- * for a 256-bit fd_set)\n- *\/\n-#undef\t__FD_ZERO\n-static __inline__ void __FD_ZERO(__kernel_fd_set *__p)\n-{\n-\tunsigned long *__tmp = __p->fds_bits;\n-\tint __i;\n-\n-\tif (__builtin_constant_p(__FDSET_LONGS)) {\n-\t\tswitch (__FDSET_LONGS) {\n-\t\tcase 16:\n-\t\t\t__tmp[ 0] = 0; __tmp[ 1] = 0;\n-\t\t\t__tmp[ 2] = 0; __tmp[ 3] = 0;\n-\t\t\t__tmp[ 4] = 0; __tmp[ 5] = 0;\n-\t\t\t__tmp[ 6] = 0; __tmp[ 7] = 0;\n-\t\t\t__tmp[ 8] = 0; __tmp[ 9] = 0;\n-\t\t\t__tmp[10] = 0; __tmp[11] = 0;\n-\t\t\t__tmp[12] = 0; __tmp[13] = 0;\n-\t\t\t__tmp[14] = 0; __tmp[15] = 0;\n-\t\t\treturn;\n-\n-\t\tcase 8:\n-\t\t\t__tmp[ 0] = 0; __tmp[ 1] = 0;\n-\t\t\t__tmp[ 2] = 0; __tmp[ 3] = 0;\n-\t\t\t__tmp[ 4] = 0; __tmp[ 5] = 0;\n-\t\t\t__tmp[ 6] = 0; __tmp[ 7] = 0;\n-\t\t\treturn;\n-\n-\t\tcase 4:\n-\t\t\t__tmp[ 0] = 0; __tmp[ 1] = 0;\n-\t\t\t__tmp[ 2] = 0; __tmp[ 3] = 0;\n-\t\t\treturn;\n-\t\t}\n-\t}\n-\t__i = __FDSET_LONGS;\n-\twhile (__i) {\n-\t\t__i--;\n-\t\t*__tmp = 0;\n-\t\t__tmp++;\n-\t}\n-}\n-\n-#endif \/* defined(__KERNEL__) *\/\n+#include <asm-generic\/posix_types.h>\n \n #endif \/* _ASM_M32R_POSIX_TYPES_H *\/\n"} {"commit":"692aec807da17beff4e99a3edeb72f4beda5458c","subject":"Remove leftover code in m197_machdep.c, back when I wanted to address the DCAM2 boards in a different way.","message":"Remove leftover code in m197_machdep.c, back when I wanted to address the\nDCAM2 boards in a different way.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- arch\/mvme88k\/mvme88k\/m197_machdep.c\n+++ arch\/mvme88k\/mvme88k\/m197_machdep.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: m197_machdep.c,v 1.25 2007\/12\/26 22:21:41 miod Exp $\t*\/\n+\/*\t$OpenBSD: m197_machdep.c,v 1.26 2007\/12\/27 23:20:31 miod Exp $\t*\/\n \/*\n * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.\n * Copyright (c) 1996 Nivas Madhur\n@@ -115,13 +115,6 @@\n \t\t\treturn (32 * 1024 * 1024);\n \t}\n \n-\t\/*\n-\t * If we had to constrain memory access on boards with\n-\t * bogus DCAM, don't look into the decoders.\n-\t *\/\n-\tif (physmem != 0)\n-\t\treturn (ptoa(physmem));\n-\n \tfor (i = 0; i < 4; i++) {\n \t\tsar = *(u_int8_t *)(BS_BASE + BS_SAR + i);\n \t\tif (!ISSET(sar, BS_SAR_DEN))\n"} {"commit":"e089ad46dbede9eed650f12d039d1addc05adf43","subject":"Revert \"[POWERPC] Autodetect serial console on efika\"","message":"Revert \"[POWERPC] Autodetect serial console on efika\"\n\nThis reverts commit 9414715a7bbb45450015e9bc2676d85d919d08d4,\nat Olaf Hering's request:\n\n> Paul, please discard this patch. The optional graphics card may have\n> also device_type 'serial' if it is in VGA mode.\n> I will send an updated patch later.\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- arch\/powerpc\/platforms\/52xx\/efika.c\n+++ arch\/powerpc\/platforms\/52xx\/efika.c\n@@ -21,7 +21,6 @@\n #include <linux\/initrd.h>\n #include <linux\/timer.h>\n #include <linux\/pci.h>\n-#include <linux\/console.h>\n \n #include <asm\/io.h>\n #include <asm\/irq.h>\n@@ -221,37 +220,12 @@\n \treturn 1;\n }\n \n-static void __init efika_init_early(void)\n-{\n-#ifdef CONFIG_SERIAL_MPC52xx\n-\tstruct device_node *stdout_node;\n-\tconst char *device_type;\n-\n-\tif (strstr(cmd_line, \"console=\"))\n-\t\treturn;\n-\t\/* find the boot console from \/chosen\/stdout *\/\n-\tif (!of_chosen)\n-\t\treturn;\n-\tdevice_type = of_get_property(of_chosen, \"linux,stdout-path\", NULL);\n-\tif (!device_type)\n-\t\treturn;\n-\tstdout_node = of_find_node_by_path(device_type);\n-\tif (stdout_node) {\n-\t\tdevice_type = of_get_property(stdout_node, \"device_type\", NULL);\n-\t\tif (device_type && strcmp(device_type, \"serial\") == 0)\n-\t\t\tadd_preferred_console(\"ttyPSC\", 0, NULL);\n-\t\tof_node_put(stdout_node);\n-\t}\n-#endif\n-}\n-\n define_machine(efika)\n {\n \t.name\t\t\t= EFIKA_PLATFORM_NAME,\n \t.probe\t\t\t= efika_probe,\n \t.setup_arch\t\t= efika_setup_arch,\n \t.init\t\t\t= mpc52xx_declare_of_platform_devices,\n-\t.init_early\t\t= efika_init_early,\n \t.show_cpuinfo\t\t= efika_show_cpuinfo,\n \t.init_IRQ\t\t= mpc52xx_init_irq,\n \t.get_irq\t\t= mpc52xx_get_irq,\n"} {"commit":"b148619ec5157ac035ee97123fa18617b1f56c0a","subject":"fixed adding nouns to room with parent","message":"fixed adding nouns to room with parent\n","repos":"thindil\/laeran-mud,thindil\/laeran-mud,thindil\/laeran-mud","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- mud\/usr\/common\/obj\/ustate\/makeroom.c\n+++ mud\/usr\/common\/obj\/ustate\/makeroom.c\n@@ -353,7 +353,7 @@\n tmp += \"\\n\";\n }\n \n- tmp += \"r\\nPodaj oddzielone spacj\u0105 nowe rzeczowniki odwo\u0142uj\u0105ce si\u0119 do tego obiektu oraz odmiana nazwy.\\n\"\n+ tmp += \"\\nPodaj oddzielone spacj\u0105 nowe rzeczowniki odwo\u0142uj\u0105ce si\u0119 do tego obiektu oraz odmiana nazwy.\\n\"\n + \"Przyk\u0142ad: miecz miecza mieczowi miecz mieczem mieczu miecza ostrze bron bro\u0144\\n\\n\";\n \n return tmp;\n@@ -980,18 +980,19 @@\n \n if(obj_type == OT_PORTABLE\n && (!input || STRINGD->is_whitespace(input))) {\n- send_string(\"Nie. Chcesz mie\u0107 przynajmmniej jeden przymiotnik. Spr\u00f3buj ponownie.\\n\");\n- send_string(blurb_for_substate(SS_PROMPT_NOUNS));\n+ send_string(\"Nie. Chcesz mie\u0107 przynajmmniej jeden rzeczownik. Spr\u00f3buj ponownie.\\n\");\n+ send_string(blurb_for_substate(substate));\n return RET_NORMAL;\n }\n \n nouns = STRINGD->trim_whitespace(input);\n- new_obj->add_noun(process_words(nouns));\n+ if (strlen(nouns))\n+ new_obj->add_noun(process_words(nouns));\n \n substate = SS_PROMPT_ADJECTIVES;\n \n send_string(\"Dobrze. Teraz to samo dla przymiotnik\u00f3w.\\n\");\n- send_string(blurb_for_substate(SS_PROMPT_ADJECTIVES));\n+ send_string(blurb_for_substate(substate));\n \n return RET_NORMAL;\n }\n"} {"commit":"658374261e61477dcde9a327be8da7939f7ab58e","subject":"fixed bug in AVC sei rewrite","message":"fixed bug in AVC sei rewrite\n","repos":"gpac\/gpac,rbouqueau\/gpac,porcelijn\/gpac,porcelijn\/gpac,rbouqueau\/gpac,porcelijn\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,gpac\/gpac,gpac\/gpac,RodolpheFouquet\/gpac,porcelijn\/gpac,RodolpheFouquet\/gpac,gpac\/gpac,rbouqueau\/gpac,rbouqueau\/gpac,RodolpheFouquet\/gpac,porcelijn\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/av_parsers.c\n+++ src\/media_tools\/av_parsers.c\n@@ -5865,6 +5865,9 @@\n \t\t\t\twritten = 0;\n \t\t\t}\n \t\t}\n+\t} else {\n+\t\t\/\/nothing modified, return original nal size\n+\t\twritten = nal_size;\n \t}\n \tgf_free(new_buffer);\n \n"} {"commit":"458aaa121364cc431a35ee8f396631cda996b4ee","subject":"Take in account @nfedera's remarks","message":"Take in account @nfedera's remarks\n","repos":"ivan-83\/FreeRDP,MartinHaimberger\/FreeRDP,RangeeGmbH\/FreeRDP,zavadovsky\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,awakecoding\/FreeRDP,Devolutions\/FreeRDP,xproax\/FreeRDP,ondrejholy\/FreeRDP,nanxiongchao\/FreeRDP,bjcollins\/FreeRDP,eledoux\/FreeRDP,Devolutions\/FreeRDP,ilammy\/FreeRDP,bjcollins\/FreeRDP,cedrozor\/FreeRDP,oshogbo\/FreeRDP,nfedera\/FreeRDP,daneshih1125\/FreeRDP,colemickens\/FreeRDP,nfedera\/FreeRDP,xhaakon\/FreeRDP,nfedera\/FreeRDP,ondrejholy\/FreeRDP,colemickens\/FreeRDP,realjiangms\/FreeRDP,eledoux\/FreeRDP,erbth\/FreeRDP,cedrozor\/FreeRDP,erbth\/FreeRDP,akallabeth\/FreeRDP,FreeRDP\/FreeRDP,colemickens\/FreeRDP,ondrejholy\/FreeRDP,RangeeGmbH\/FreeRDP,eledoux\/FreeRDP,cedrozor\/FreeRDP,nanxiongchao\/FreeRDP,bsagal\/FreeRDP,yurashek\/FreeRDP,realjiangms\/FreeRDP,erbth\/FreeRDP,ivan-83\/FreeRDP,awakecoding\/FreeRDP,DavBfr\/FreeRDP,eledoux\/FreeRDP,chipitsine\/FreeRDP,FreeRDP\/FreeRDP,zavadovsky\/FreeRDP,daneshih1125\/FreeRDP,mfleisz\/FreeRDP,colemickens\/FreeRDP,akallabeth\/FreeRDP,xproax\/FreeRDP,realjiangms\/FreeRDP,bjcollins\/FreeRDP,bjcollins\/FreeRDP,cloudbase\/FreeRDP-dev,bmiklautz\/FreeRDP,rjcorrig\/FreeRDP,awakecoding\/FreeRDP,bjcollins\/FreeRDP,bsagal\/FreeRDP,FreeRDP\/FreeRDP,oshogbo\/FreeRDP,DavBfr\/FreeRDP,eledoux\/FreeRDP,oshogbo\/FreeRDP,bsagal\/FreeRDP,ivan-83\/FreeRDP,xproax\/FreeRDP,ivan-83\/FreeRDP,bjcollins\/FreeRDP,yurashek\/FreeRDP,DavBfr\/FreeRDP,zavadovsky\/FreeRDP,xproax\/FreeRDP,rjcorrig\/FreeRDP,MartinHaimberger\/FreeRDP,mfleisz\/FreeRDP,FreeRDP\/FreeRDP,daneshih1125\/FreeRDP,xhaakon\/FreeRDP,RangeeGmbH\/FreeRDP,ivan-83\/FreeRDP,ivan-83\/FreeRDP,cedrozor\/FreeRDP,DavBfr\/FreeRDP,mfleisz\/FreeRDP,FreeRDP\/FreeRDP,yurashek\/FreeRDP,MartinHaimberger\/FreeRDP,bmiklautz\/FreeRDP,awakecoding\/FreeRDP,yurashek\/FreeRDP,xproax\/FreeRDP,rjcorrig\/FreeRDP,akallabeth\/FreeRDP,bmiklautz\/FreeRDP,Devolutions\/FreeRDP,yurashek\/FreeRDP,daneshih1125\/FreeRDP,xhaakon\/FreeRDP,cloudbase\/FreeRDP-dev,oshogbo\/FreeRDP,ilammy\/FreeRDP,bmiklautz\/FreeRDP,RangeeGmbH\/FreeRDP,chipitsine\/FreeRDP,zavadovsky\/FreeRDP,cloudbase\/FreeRDP-dev,eledoux\/FreeRDP,FreeRDP\/FreeRDP,nfedera\/FreeRDP,chipitsine\/FreeRDP,ilammy\/FreeRDP,xhaakon\/FreeRDP,xproax\/FreeRDP,bmiklautz\/FreeRDP,awakecoding\/FreeRDP,cedrozor\/FreeRDP,xproax\/FreeRDP,mfleisz\/FreeRDP,daneshih1125\/FreeRDP,MartinHaimberger\/FreeRDP,Devolutions\/FreeRDP,Devolutions\/FreeRDP,bsagal\/FreeRDP,eledoux\/FreeRDP,akallabeth\/FreeRDP,zavadovsky\/FreeRDP,FreeRDP\/FreeRDP,chipitsine\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,nanxiongchao\/FreeRDP,Devolutions\/FreeRDP,nanxiongchao\/FreeRDP,cedrozor\/FreeRDP,bsagal\/FreeRDP,ilammy\/FreeRDP,zavadovsky\/FreeRDP,chipitsine\/FreeRDP,ilammy\/FreeRDP,colemickens\/FreeRDP,cloudbase\/FreeRDP-dev,DavBfr\/FreeRDP,bsagal\/FreeRDP,ilammy\/FreeRDP,oshogbo\/FreeRDP,realjiangms\/FreeRDP,xproax\/FreeRDP,mfleisz\/FreeRDP,erbth\/FreeRDP,RangeeGmbH\/FreeRDP,erbth\/FreeRDP,daneshih1125\/FreeRDP,rjcorrig\/FreeRDP,nanxiongchao\/FreeRDP,ondrejholy\/FreeRDP,xhaakon\/FreeRDP,nfedera\/FreeRDP,colemickens\/FreeRDP,Devolutions\/FreeRDP,colemickens\/FreeRDP,realjiangms\/FreeRDP,DavBfr\/FreeRDP,xhaakon\/FreeRDP,rjcorrig\/FreeRDP,akallabeth\/FreeRDP,bmiklautz\/FreeRDP,nanxiongchao\/FreeRDP,cloudbase\/FreeRDP-dev,bjcollins\/FreeRDP,realjiangms\/FreeRDP,ondrejholy\/FreeRDP,MartinHaimberger\/FreeRDP,mfleisz\/FreeRDP,cloudbase\/FreeRDP-dev,oshogbo\/FreeRDP,Devolutions\/FreeRDP,chipitsine\/FreeRDP,colemickens\/FreeRDP,yurashek\/FreeRDP,ondrejholy\/FreeRDP,chipitsine\/FreeRDP,erbth\/FreeRDP,erbth\/FreeRDP,DavBfr\/FreeRDP,awakecoding\/FreeRDP,xhaakon\/FreeRDP,FreeRDP\/FreeRDP,nfedera\/FreeRDP,ivan-83\/FreeRDP,rjcorrig\/FreeRDP,RangeeGmbH\/FreeRDP,daneshih1125\/FreeRDP,MartinHaimberger\/FreeRDP,yurashek\/FreeRDP,zavadovsky\/FreeRDP,MartinHaimberger\/FreeRDP,bmiklautz\/FreeRDP,bjcollins\/FreeRDP,ivan-83\/FreeRDP,yurashek\/FreeRDP,nfedera\/FreeRDP,akallabeth\/FreeRDP,nfedera\/FreeRDP,chipitsine\/FreeRDP,ondrejholy\/FreeRDP,erbth\/FreeRDP,cloudbase\/FreeRDP-dev,bmiklautz\/FreeRDP,oshogbo\/FreeRDP,daneshih1125\/FreeRDP,eledoux\/FreeRDP,RangeeGmbH\/FreeRDP,RangeeGmbH\/FreeRDP,ilammy\/FreeRDP,bsagal\/FreeRDP,rjcorrig\/FreeRDP,xhaakon\/FreeRDP,ondrejholy\/FreeRDP,mfleisz\/FreeRDP,cedrozor\/FreeRDP,oshogbo\/FreeRDP,realjiangms\/FreeRDP,realjiangms\/FreeRDP,cedrozor\/FreeRDP,bsagal\/FreeRDP,nanxiongchao\/FreeRDP,DavBfr\/FreeRDP,akallabeth\/FreeRDP,rjcorrig\/FreeRDP,MartinHaimberger\/FreeRDP,mfleisz\/FreeRDP,akallabeth\/FreeRDP,nanxiongchao\/FreeRDP","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- winpr\/libwinpr\/utils\/wlog\/UdpAppender.c\n+++ winpr\/libwinpr\/utils\/wlog\/UdpAppender.c\n@@ -47,7 +47,7 @@\n \tchar *colonPos;\n \n \n-\tif (!log || !appender)\n+\tif (!appender)\n \t\treturn FALSE;\n \n \tif (appender->targetAddrLen) \/* already opened *\/\n@@ -169,7 +169,7 @@\n \t{\n \t\tappender->host = (LPSTR) malloc(nSize);\n \t\tif (!appender->host)\n-\t\t\tgoto error_env_malloc;\n+\t\t\tgoto error_host_alloc;\n \n \t\tGetEnvironmentVariableA(name, appender->host, nSize);\n \n@@ -180,14 +180,14 @@\n \t{\n \t\tappender->host = _strdup(\"127.0.0.1:20000\");\n \t\tif (!appender->host)\n-\t\t\tgoto error_env_malloc;\n+\t\t\tgoto error_host_alloc;\n \t}\n \n \treturn appender;\n \n error_open:\n \tfree(appender->host);\n-error_env_malloc:\n+error_host_alloc:\n \tclosesocket(appender->sock);\n error_sock:\n \tfree(appender);\n"} {"commit":"3d71806d5c5c2b395d6ea88b9765a19d813fdf67","subject":"\u30b3\u30de\u30f3\u30c9\u5f15\u6570\u3092\u89e3\u6790\u3059\u308b\u30af\u30e9\u30b9\u3092\u5b9f\u88c5\u3057\u305f\uff0e","message":"\u30b3\u30de\u30f3\u30c9\u5f15\u6570\u3092\u89e3\u6790\u3059\u308b\u30af\u30e9\u30b9\u3092\u5b9f\u88c5\u3057\u305f\uff0e\n\ngit-svn-id: 3507153f7f2a502978d43a270f21b34bb2e07470@1266 b31369ee-dac5-0310-8161-cccb92f82ee5\n","repos":"svagionitis\/MIST,svagionitis\/MIST,yuugata\/MIST,yuugata\/MIST,svagionitis\/MIST,yuugata\/MIST,yuugata\/MIST,svagionitis\/MIST","returncode":1,"stderr":"error: pathspec 'mist\/utility\/options.h' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"C","diff":"--- mist\/utility\/options.h\n+++ mist\/utility\/options.h\n@@ -0,0 +1,284 @@\n+#ifndef __INCLUDE_MIST_OPTIONS__\n+#define __INCLUDE_MIST_OPTIONS__\n+\n+\n+#ifndef __INCLUDE_MIST_CONF_H__\n+#include \"..\/config\/mist_conf.h\"\n+#endif\n+\n+#include <iostream>\n+#include <vector>\n+#include <map>\n+#include <string>\n+\n+\n+\/\/ mistO\u0502\u030en\u0702\n+_MIST_BEGIN\n+\n+\/\/\/ @brief R}hC\u0342NX\n+\/\/! \n+class options : public std::vector< std::string >\n+{\n+public:\n+\ttypedef std::vector< std::string > base;\t\/\/\/< @brief NX\n+\n+private:\n+\t\/\/\/ @brief IvVLNX\n+\tstruct arg\n+\t{\n+\t\tstd::string name;\t\t\/\/\/< @brief IvV\n+\t\tstd::string comment;\t\/\/\/< @brief IvV\u0310\n+\t\tstd::string value;\t\t\/\/\/< @brief IvV\u0312l\n+\t\tbool has_value;\t\t\t\/\/\/< @brief l\u018b\u024ew\u80b3IvV\u01c2tO\n+\t\tbool found;\t\t\t\t\/\/\/< @brief IvV\u024ew\u80b3\ua0bd\u01c2\n+\n+\t\t\/\/\/ @brief ftHgRXgN^\n+\t\targ( const std::string &aname = \"\", const std::string &text = \"\", const std::string &val = \"\", bool hasValue = false )\n+\t\t\t: name( aname ), comment( text ), value( val ), has_value( hasValue ), found( false )\n+\t\t{\n+\t\t}\n+\n+\t\t\/\/\/ @brief Rs[RXgN^\n+\t\targ( const arg &p ) : name( p.name ), comment( p.comment ), value( p.value ), has_value( p.has_value ), found( p.found )\n+\t\t{\n+\t\t}\n+\t};\n+\n+\tstd::string header_text;\t\t\/\/\/< @brief wv\u0310\u64ea\u0255\\\u9576\n+\tstd::string footer_text;\t\t\/\/\/< @brief wv\u0316\u0255\\\u9576\n+\tstd::string program_name;\t\t\/\/\/< @brief vO\u06ce\u9576\n+\tstd::vector< std::string > option_list;\t\t\/\/\/< @brief w\u80b3\u0094\\\u0302IvV\u0303Xg\n+\tstd::map< std::string, arg > args;\t\t\t\t\/\/\/< @brief w\u80b3\u0094\\\u0302IvV\u0303Xg\n+\n+public:\n+\t\/\/\/ @brief ftHgRXgN^\n+\toptions( const std::string header = \"\", const std::string footer = \"\" ) : header_text( header ), footer_text( footer )\n+\t{\n+\t}\n+\n+\t\/\/\/ @brief Rs[RXgN^\n+\toptions( const options &o ) : base( o ), program_name( o.program_name ), args( o.args )\n+\t{\n+\t}\n+\n+protected:\n+\t\/\/\/ @brief IvV\u024ew\u80b3\u0102l\u64fe\n+\tbool __isset__( const std::string &name, std::string &val ) const\n+\t{\n+\t\tstd::map< std::string, arg >::const_iterator ite = args.find( name );\n+\t\tif( ite != args.end( ) )\n+\t\t{\n+\t\t\tconst arg &a = ite->second;\n+\t\t\tval = a.value;\n+\t\t\treturn( true );\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\treturn( false );\n+\t\t}\n+\t}\n+\n+public:\n+\t\/\/\/ @brief l\u0303IvV\u01c9\n+\tvoid add( const std::string &name, const std::string &comment )\n+\t{\n+\t\toption_list.push_back( name );\n+\t\targs[ name ] = arg( name, comment, \"\", false );\n+\t}\n+\n+\t\/\/\/ @brief l\u0702\u0783IvV\u01c9iftHglw\u80b7\u0183IvVw\u80b3\u0202\ua347l\u64fe\u0094\\j\n+\tvoid add( const std::string &name, const std::string &comment, const std::string &default_value )\n+\t{\n+\t\toption_list.push_back( name );\n+\t\targs[ name ] = arg( name, comment, default_value, true );\n+\t}\n+\n+\t\/\/\/ @brief l\u0702\u0783IvV\u01c9iftHglw\u80b7\u0183IvVw\u80b3\u0202\ua347l\u64fe\u0094\\j\n+\tvoid add( const std::string &name, const std::string &comment, int default_value )\n+\t{\n+\t\tchar buff[ 50 ];\n+\t\tsprintf( buff, \"%d\", default_value );\n+\t\toption_list.push_back( name );\n+\t\targs[ name ] = arg( name, comment, buff, true );\n+\t}\n+\n+\t\/\/\/ @brief l\u0702\u0783IvV\u01c9iftHglw\u80b7\u0183IvVw\u80b3\u0202\ua347l\u64fe\u0094\\j\n+\tvoid add( const std::string &name, const std::string &comment, double default_value )\n+\t{\n+\t\tchar buff[ 50 ];\n+\t\tsprintf( buff, \"%lf\", default_value );\n+\t\toption_list.push_back( name );\n+\t\targs[ name ] = arg( name, comment, buff, true );\n+\t}\n+\n+\t\/\/\/ @brief IvVR}hC\u024ew\u80b3\ua0bd\u01c2\ud80b\udc82\u05c2\n+\tbool isset( const std::string &name ) const\n+\t{\n+\t\tstd::map< std::string, arg >::const_iterator ite = args.find( name );\n+\t\tif( ite != args.end( ) )\n+\t\t{\n+\t\t\tconst arg &a = ite->second;\n+\t\t\treturn( a.found );\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\treturn( false );\n+\t\t}\n+\t}\n+\n+\t\/\/\/ @brief IvV\u024ew\u80b3\ua0bd\u64fe\n+\tconst std::string get_string( const std::string &name ) const\n+\t{\n+\t\tstd::string val;\n+\t\tif( __isset__( name, val ) )\n+\t\t{\n+\t\t\treturn( val );\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\treturn( \"\" );\n+\t\t}\n+\t}\n+\n+\t\/\/\/ @brief IvV\u024ew\u80b3\ua0bdl\u64fe\n+\tint get_int( const std::string &name ) const\n+\t{\n+\t\tstd::string val;\n+\t\tif( __isset__( name, val ) )\n+\t\t{\n+\t\t\treturn( atoi( val.c_str( ) ) );\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\treturn( 0 );\n+\t\t}\n+\t}\n+\n+\t\/\/\/ @brief IvV\u024ew\u80b3\ua0bdl\u64fe\n+\tdouble get_double( const std::string &name ) const\n+\t{\n+\t\tstd::string val;\n+\t\tif( __isset__( name, val ) )\n+\t\t{\n+\t\t\treturn( atof( val.c_str( ) ) );\n+\t\t}\n+\t\telse\n+\t\t{\n+\t\t\treturn( 0.0 );\n+\t\t}\n+\t}\n+\n+public:\n+\t\/\/\/ @brief IvV\u0308\ua5d7Wo\u0342\u0255\\\n+\tvoid show_help( ) const\n+\t{\n+\t\t\/\/ wb_o\u0342\n+\t\tstd::cout << header_text << std::endl;\n+\n+\t\tsize_t max_len = 0;\n+\t\tfor( size_t i = 0 ; i < option_list.size( ) ; i++ )\n+\t\t{\n+\t\t\tif( max_len < option_list[ i ].size( ) )\n+\t\t\t{\n+\t\t\t\tmax_len = option_list[ i ].size( );\n+\t\t\t}\n+\t\t}\n+\n+\t\tfor( size_t i = 0 ; i < option_list.size( ) ; i++ )\n+\t\t{\n+\t\t\tstd::map< std::string, arg >::const_iterator ite = args.find( option_list[ i ] );\n+\t\t\tif( ite != args.end( ) )\n+\t\t\t{\n+\t\t\t\tconst arg &a = ite->second;\n+\n+\t\t\t\tstd::cout << \"-\";\n+\t\t\t\tstd::cout << a.name;\n+\n+\t\t\t\tfor( size_t i = a.name.size( ) ; i < max_len + 3 ; i++ )\n+\t\t\t\t{\n+\t\t\t\t\tstd::cout << ' ';\n+\t\t\t\t}\n+\n+\t\t\t\tstd::cout << a.comment;\n+\n+\t\t\t\tif( a.has_value )\n+\t\t\t\t{\n+\t\t\t\t\tstd::cout << \"[\" << a.value << \"]\";\n+\t\t\t\t}\n+\n+\t\t\t\tif( a.found )\n+\t\t\t\t{\n+\t\t\t\t\tstd::cout << \"*\";\n+\t\t\t\t}\n+\t\t\t\tstd::cout << std::endl;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t{\n+\t\t\t\tstd::cerr << \"IvV\u0309\u0342\u024es\u0702D\" << std::endl;\n+\t\t\t}\n+\t\t}\n+\n+\t\t\/\/ tb^o\u0342\n+\t\tstd::cout << footer_text << std::endl;\n+\t}\n+\n+\t\/\/\/ @brief vO\u0342\u0101CIvV\u0182\u0311\u0389\u058cW\u07c2\n+\tbool parse_args( int argc, char *argv[] )\n+\t{\n+\t\tprogram_name = argv[ 0 ];\n+\n+\t\tbool ret = true;\n+\n+\t\tfor( int i = 1 ; i < argc ; i++ )\n+\t\t{\n+\t\t\tstd::string option = argv[ i ];\n+\n+\t\t\tif( option[ 0 ] != '-' && option[ 0 ] != '\/' )\n+\t\t\t{\n+\t\t\t\tbase::push_back( option );\n+\t\t\t}\n+\t\t\telse\n+\t\t\t{\n+\t\t\t\toption = option.substr( 1 );\n+\n+\t\t\t\tstd::map< std::string, arg >::iterator ite = args.find( option );\n+\t\t\t\tif( ite != args.end( ) )\n+\t\t\t\t{\n+\t\t\t\t\targ &a = ite->second;\n+\t\t\t\t\ta.found = true;\n+\n+\t\t\t\t\tif( a.has_value )\n+\t\t\t\t\t{\n+\t\t\t\t\t\tif( i + 1 < argc && ( argv[ i + 1 ][ 0 ] != '-' && argv[ i + 1 ][ 0 ] != '\/' ) )\n+\t\t\t\t\t\t{\n+\t\t\t\t\t\t\ta.value = argv[ i + 1 ];\n+\t\t\t\t\t\t}\n+\t\t\t\t\t\telse\n+\t\t\t\t\t\t{\n+\t\t\t\t\t\t\tstd::cerr << \"IvV \\\"\" << option << \"\\\" \u0352lw\u80b7Kv\u0702D\" << std::endl;\n+\t\t\t\t\t\t\tret = false;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\telse\n+\t\t\t\t{\n+\t\t\t\t\tstd::cerr << \"\\\"\" << option << \"\\\" \u0355s\u0203IvV\u0142D\" << std::endl;\n+\t\t\t\t\tret = false;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\n+\t\tif( !ret )\n+\t\t{\n+\t\t\tstd::cerr << std::endl;\n+\t\t}\n+\n+\t\treturn( ret );\n+\t}\n+};\n+\n+\/\/ mistO\u0502\u030fI\n+_MIST_END\n+\n+\n+#endif\t\/\/ __INCLUDE_MIST_OPTIONS__\n"} {"commit":"8a6185cfd834a5efb04e6e38e91ce3321b51f388","subject":"Add funtions \"VU124_ToU4()\"","message":"Add funtions \"VU124_ToU4()\"\n","repos":"elf0\/elf.c","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- include\/elf\/VU124.h\n+++ include\/elf\/VU124.h\n@@ -15,6 +15,14 @@\n inline\n static U8 VU124_Bytes(const Byte *pVU124){\n return 1 + VU124_TailBytes(pVU124);\n+}\n+\n+\/\/VU124 range: [0, 0xF]. Check it youself!\n+inline\n+static const Byte *VU124_ToU4(const Byte *pVU124, U8 *pU4){\n+ const U8 *p = pVU124;\n+ *pU4 = *p++;\n+ return p;\n }\n \n \/\/VU124 range: [0, 0xFF]. Check it youself!\n"} {"commit":"623d56efd550f2c1a6a85a35b3fb2e0ccfd91783","subject":"ansify and deregister, no binary change, okay mickey@ bluhm@","message":"ansify and deregister, no binary change, okay mickey@ bluhm@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- miscfs\/deadfs\/dead_vnops.c\n+++ miscfs\/deadfs\/dead_vnops.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: dead_vnops.c,v 1.16 2007\/03\/21 17:29:32 thib Exp $\t*\/\n+\/*\t$OpenBSD: dead_vnops.c,v 1.17 2007\/04\/08 16:37:10 pedro Exp $\t*\/\n \/*\t$NetBSD: dead_vnops.c,v 1.16 1996\/02\/13 13:12:48 mycroft Exp $\t*\/\n \n \/*\n@@ -131,8 +131,7 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_lookup(v)\n-\tvoid *v;\n+dead_lookup(void *v)\n {\n \tstruct vop_lookup_args \/* {\n \t\tstruct vnode * a_dvp;\n@@ -149,10 +148,8 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_open(v)\n-\tvoid *v;\n-{\n-\n+dead_open(void *v)\n+{\n \treturn (ENXIO);\n }\n \n@@ -161,8 +158,7 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_read(v)\n-\tvoid *v;\n+dead_read(void *v)\n {\n \tstruct vop_read_args \/* {\n \t\tstruct vnode *a_vp;\n@@ -186,8 +182,7 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_write(v)\n-\tvoid *v;\n+dead_write(void *v)\n {\n \tstruct vop_write_args \/* {\n \t\tstruct vnode *a_vp;\n@@ -206,8 +201,7 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_ioctl(v)\n-\tvoid *v;\n+dead_ioctl(void *v)\n {\n \tstruct vop_ioctl_args \/* {\n \t\tstruct vnode *a_vp;\n@@ -225,8 +219,7 @@\n \n \/* ARGSUSED *\/\n int\n-dead_poll(v)\n-\tvoid *v;\n+dead_poll(void *v)\n {\n #if 0\n \tstruct vop_poll_args \/* {\n@@ -246,10 +239,8 @@\n * Just call the device strategy routine\n *\/\n int\n-dead_strategy(v)\n-\tvoid *v;\n-{\n-\n+dead_strategy(void *v)\n+{\n \tstruct vop_strategy_args \/* {\n \t\tstruct buf *a_bp;\n \t} *\/ *ap = v;\n@@ -269,8 +260,7 @@\n * Wait until the vnode has finished changing state.\n *\/\n int\n-dead_lock(v)\n-\tvoid *v;\n+dead_lock(void *v)\n {\n \tstruct vop_lock_args \/* {\n \t\tstruct vnode *a_vp;\n@@ -289,8 +279,7 @@\n * Wait until the vnode has finished changing state.\n *\/\n int\n-dead_bmap(v)\n-\tvoid *v;\n+dead_bmap(void *v)\n {\n \tstruct vop_bmap_args \/* {\n \t\tstruct vnode *a_vp;\n@@ -310,8 +299,7 @@\n *\/\n \/* ARGSUSED *\/\n int\n-dead_print(v)\n-\tvoid *v;\n+dead_print(void *v)\n {\n \tprintf(\"tag VT_NON, dead vnode\\n\");\n \treturn 0;\n@@ -322,10 +310,8 @@\n *\/\n \/*ARGSUSED*\/\n int\n-dead_ebadf(v)\n-\tvoid *v;\n-{\n-\n+dead_ebadf(void *v)\n+{\n \treturn (EBADF);\n }\n \n@@ -334,10 +320,8 @@\n *\/\n \/*ARGSUSED*\/\n int\n-dead_badop(v)\n-\tvoid *v;\n-{\n-\n+dead_badop(void *v)\n+{\n \tpanic(\"dead_badop called\");\n \t\/* NOTREACHED *\/\n }\n@@ -347,8 +331,7 @@\n * in a state of change.\n *\/\n int\n-chkvnlock(vp)\n-\tregister struct vnode *vp;\n+chkvnlock(struct vnode *vp)\n {\n \tint locked = 0;\n \n"} {"commit":"00226e389ca9d08deb0cff8733b78977095b1684","subject":"Add rate limited log stat","message":"Add rate limited log stat\n\nSummary:\ntitle\n\nTest Plan:\n\nReviewed By: alikhtarov@fb.com\n\nSubscribers: alikhtarov\n\nFB internal diff: D1533177\n\nTasks: 4667701\n","repos":"facebook\/mcrouter,nvaller\/mcrouter,leitao\/mcrouter,facebook\/mcrouter,zhlong73\/mcrouter,reddit\/mcrouter,is00hcw\/mcrouter,glensc\/mcrouter,evertrue\/mcrouter,apinski-cavium\/mcrouter,leitao\/mcrouter,seem-sky\/mcrouter,facebook\/mcrouter,leitao\/mcrouter,is00hcw\/mcrouter,zhlong73\/mcrouter,yqzhang\/mcrouter,is00hcw\/mcrouter,yqzhang\/mcrouter,synecdoche\/mcrouter,seem-sky\/mcrouter,evertrue\/mcrouter,evertrue\/mcrouter,glensc\/mcrouter,easyfmxu\/mcrouter,synecdoche\/mcrouter,apinski-cavium\/mcrouter,tempbottle\/mcrouter,nvaller\/mcrouter,seem-sky\/mcrouter,apinski-cavium\/mcrouter,reddit\/mcrouter,reddit\/mcrouter,glensc\/mcrouter,tempbottle\/mcrouter,facebook\/mcrouter,nvaller\/mcrouter,apinski-cavium\/mcrouter,zhlong73\/mcrouter,easyfmxu\/mcrouter,synecdoche\/mcrouter,seem-sky\/mcrouter,reddit\/mcrouter,nvaller\/mcrouter,zhlong73\/mcrouter,tempbottle\/mcrouter,tempbottle\/mcrouter,easyfmxu\/mcrouter,glensc\/mcrouter,leitao\/mcrouter,is00hcw\/mcrouter,evertrue\/mcrouter,yqzhang\/mcrouter,yqzhang\/mcrouter,synecdoche\/mcrouter,easyfmxu\/mcrouter","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mcrouter\/stat_list.h\n+++ mcrouter\/stat_list.h\n@@ -54,6 +54,9 @@\n \/\/ STUI(failed_client_connections, 0)\n STUI(successful_client_connections, 0, 1)\n STAT(duration_us, stat_double, 0, .dbl = 0.0)\n+#undef GROUP\n+#define GROUP ods_stats | detailed_stats | count_stats\n+ STUI(rate_limited_log_count, 0, 1)\n #undef GROUP\n #define GROUP ods_stats | mcproxy_stats | cmd_all_stats | \\\n cmd_in_stats | count_stats\n"} {"commit":"f66aa6379a8980bb4f806266b4c51254831b4cd6","subject":"Correction in comments.","message":"Correction in comments.\n","repos":"AveRapina\/visionworkbench,DougFirErickson\/visionworkbench,AveRapina\/visionworkbench,AveRapina\/visionworkbench,fengzhyuan\/visionworkbench,fengzhyuan\/visionworkbench,AveRapina\/visionworkbench,AveRapina\/visionworkbench,DougFirErickson\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench,fengzhyuan\/visionworkbench,AveRapina\/visionworkbench,fengzhyuan\/visionworkbench,fengzhyuan\/visionworkbench,DougFirErickson\/visionworkbench","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/vw\/Image\/PixelTypeInfo.h\n+++ src\/vw\/Image\/PixelTypeInfo.h\n@@ -120,12 +120,12 @@\n \/\/ Pixel channel casting and rescaling logic.\n \/\/\n \/\/ Here we defined channel_cast and channel_cast_rescale to operate\n- \/\/ on pixels. We've included ImageViewBase.h so that we can disable\n- \/\/ these functions for images, allowing other whole-image overloads\n- \/\/ to work in that case. The simple channel_cast could be put into\n- \/\/ Core\/CompoundTypes.h instead, but it's only used in the context\n- \/\/ of pixel casting and mirrors channel_cast_rescale nicely, so we\n- \/\/ leave it here.\n+ \/\/ on pixels. We've forward-declared ImageViewBase so that we can\n+ \/\/ disable these functions for images, allowing other whole-image\n+ \/\/ overloads to work in that case. The simple channel_cast could be\n+ \/\/ put into Core\/CompoundTypes.h instead, but it's only used in the\n+ \/\/ context of pixel casting and mirrors channel_cast_rescale nicely,\n+ \/\/ so we leave it here.\n \/\/\n \/\/ FIXME The _clamp version clamps to the min\/max integer values of \n \/\/ the destination. This function does not work at all for floating-\n"} {"commit":"e2f9ea11255c3fe2b394509c69f15a1fc5a2138c","subject":"Fixed bug with tile spliting when N tiles in 1 slice is used","message":"Fixed bug with tile spliting when N tiles in 1 slice is used\n","repos":"canatella\/gpac,canatella\/gpac,canatella\/gpac,canatella\/gpac,canatella\/gpac,canatella\/gpac,canatella\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/media_tools\/isom_tools.c\n+++ src\/media_tools\/isom_tools.c\n@@ -2407,7 +2407,7 @@\n \n typedef struct\n {\n-\tu32 track, track_id;\n+\tu32 track, track_id, sample_count;\n \tu32 tx, ty, tw, th;\n \tu32 data_offset;\n \tGF_BitStream *sample_data;\n@@ -2472,6 +2472,8 @@\n \tif (! hevc.pps[pps_idx].tiles_enabled_flag) return GF_OK;\n \tnb_tracks = hevc.pps[pps_idx].num_tile_columns * hevc.pps[pps_idx].num_tile_rows;\n \ttiles = gf_malloc(sizeof(HEVCTileImport) * nb_tracks);\n+\tif (!tiles) return GF_OUT_OF_MEM;\n+ \tmemset(tiles, 0, sizeof(HEVCTileImport) * nb_tracks);\n \n \t\/\/first clone tracks\n \tfor (i=0; i<nb_tracks; i++) {\n@@ -2601,8 +2603,13 @@\n \t\tfor (j=0; j<nb_tracks; j++) {\n \t\t\tsample->dataLength = 0;\n \t\t\tgf_bs_get_content(tiles[j].sample_data, &sample->data, &sample->dataLength);\n+\t\t\tif (!sample->data)\n+\t\t\t\tcontinue;\n+\t\t\t\n \t\t\te = gf_isom_add_sample(file, tiles[j].track, 1, sample);\n \t\t\tif (e) goto err_exit;\n+\t\t\ttiles[j].sample_count ++;\n+\t\t\t\n \t\t\tgf_bs_del(tiles[j].sample_data);\n \t\t\ttiles[j].sample_data = NULL;\n \t\t\tgf_free(sample->data);\n@@ -2622,7 +2629,15 @@\n \t\tu32 width, height;\n \t\ts32 translation_x, translation_y;\n \t\ts16 layer;\n-\t\tGF_BitStream *bs = gf_bs_new(data, 11, GF_BITSTREAM_WRITE);\n+\t\tGF_BitStream *bs;\n+\t\t\n+\t\ttiles[i].track = gf_isom_get_track_by_id(file, tiles[i].track_id);\n+\t\tif (!tiles[i].sample_count) {\n+\t\t\tgf_isom_remove_track(file, tiles[i].track);\n+\t\t\tcontinue;\n+\t\t}\n+\t\t\n+\t\tbs = gf_bs_new(data, 11, GF_BITSTREAM_WRITE);\n \t\tgf_bs_write_u16(bs, tiles[i].track);\n \t\tgf_bs_write_int(bs, 1, 2);\n \t\tgf_bs_write_int(bs, 0, 1);\/\/not full frame\n"} {"commit":"2e81a9bc597425584babb46e031ac60a47d2c410","subject":"comment fix","message":"comment fix\n","repos":"csm\/enet","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/enet\/enet.h\n+++ include\/enet\/enet.h\n@@ -89,8 +89,9 @@\n * of the allocated data. The flags field is either 0 (specifying no flags), \n * or a bitwise-or of any combination of the following flags:\n *\n- * ENET_PACKET_FLAG_RELIABLE - packet must be received by the ta\n-\n+ * ENET_PACKET_FLAG_RELIABLE - packet must be received by the target peer\n+ * and resend attempts should be made until the packet is delivered\n+ \n @sa ENetPacketFlag\n *\/\n typedef struct _ENetPacket\n"} {"commit":"a5607f2a04e6a85bec6bc9f016313713289fc8c6","subject":"remove some unfinished code accidently checked in","message":"remove some unfinished code accidently checked in\n","repos":"bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal,djreep81\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,KTXSoftware\/glsl2agal,KTXSoftware\/glsl2agal,bkaradzic\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,KTXSoftware\/glsl2agal,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zz85\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,wolf96\/glsl-optimizer,mapbox\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,adobe\/glsl2agal,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/drivers\/x11\/xm_dd.c\n+++ src\/mesa\/drivers\/x11\/xm_dd.c\n@@ -1,4 +1,4 @@\n-\/* $Id: xm_dd.c,v 1.43 2003\/03\/25 02:26:30 brianp Exp $ *\/\n+\/* $Id: xm_dd.c,v 1.44 2003\/03\/25 02:29:46 brianp Exp $ *\/\n \n \/*\n * Mesa 3-D graphics library\n@@ -964,9 +964,6 @@\n ctx->Driver.CopyTexSubImage2D = _swrast_copy_texsubimage2d;\n ctx->Driver.CopyTexSubImage3D = _swrast_copy_texsubimage3d;\n \n- ctx->Driver.NewTextureObject = _mesa_alloc_texture_object;\n- ctx->Driver.DeleteTexture = _mesa_free_texture_object;\n-\n ctx->Driver.CompressedTexImage1D = _mesa_store_compressed_teximage1d;\n ctx->Driver.CompressedTexImage2D = _mesa_store_compressed_teximage2d;\n ctx->Driver.CompressedTexImage3D = _mesa_store_compressed_teximage3d;\n"} {"commit":"1141bdeec9843776cf6b40ed879bb8fdf850b658","subject":"Oops.","message":"Oops.\n","repos":"midendian\/libnbio,midendian\/libnbio","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/errcompat.h\n+++ include\/errcompat.h\n@@ -1,9 +1,8 @@\n \n-#ifdef NBIO_USE_WINSOCK2\n-#define NBIO_USE_WINSOCK2\n+#ifdef __ERRCOMPAT_H__\n+#define __ERRCOMPAT_H__ \n \n \/* Just for sanity's sake, we define these with the \"standard\" UNIX meanings *\/\n-\n #define EINTR 4\n #define EAGAIN 11\n #define EFAULT 14\n@@ -20,5 +19,5 @@\n #define ETIMEDOUT 110\n #define EINPROGRESS 115\n \n-#endif \/* def NBIO_USE_WINSOCK2 *\/\n+#endif \/* def __ERRCOMPAT_H__ *\/\n \n"} {"commit":"bf059ebd33b4654334c1d96b6022fd6eef278782","subject":"swrast: update texfetch_funcs table for new int\/uint formats","message":"swrast: update texfetch_funcs table for new int\/uint formats\n\nThis only adds dummy entries to the table to fix failed assertions.\nFixes https:\/\/bugs.freedesktop.org\/show_bug.cgi?id=41491\n","repos":"bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,wolf96\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,metora\/MesaGLSLCompiler,metora\/MesaGLSLCompiler,bkaradzic\/glsl-optimizer,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,benaadams\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,jbarczak\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,mapbox\/glsl-optimizer,wolf96\/glsl-optimizer,djreep81\/glsl-optimizer,jbarczak\/glsl-optimizer,zz85\/glsl-optimizer","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/mesa\/swrast\/s_texfetch.c\n+++ src\/mesa\/swrast\/s_texfetch.c\n@@ -656,6 +656,226 @@\n store_texel_rg_f16\n },\n \n+ {\n+ MESA_FORMAT_ALPHA_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_ALPHA_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_ALPHA_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_ALPHA_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_ALPHA_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_ALPHA_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+\n+ {\n+ MESA_FORMAT_INTENSITY_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_INTENSITY_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_INTENSITY_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_INTENSITY_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_INTENSITY_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_INTENSITY_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_LUMINANCE_ALPHA_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+\n+ {\n+ MESA_FORMAT_R_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_RG_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n+ {\n+ MESA_FORMAT_RGB_INT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+\n \/* non-normalized, signed int *\/\n {\n MESA_FORMAT_RGBA_INT8,\n@@ -665,6 +885,27 @@\n store_texel_rgba_int8\n },\n {\n+ MESA_FORMAT_R_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RG_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RGB_INT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n MESA_FORMAT_RGBA_INT16,\n fetch_texel_1d_rgba_int16,\n fetch_texel_2d_rgba_int16,\n@@ -672,6 +913,27 @@\n store_texel_rgba_int16\n },\n {\n+ MESA_FORMAT_R_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RG_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RGB_INT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n MESA_FORMAT_RGBA_INT32,\n fetch_texel_1d_rgba_int32,\n fetch_texel_2d_rgba_int32,\n@@ -681,6 +943,27 @@\n \n \/* non-normalized, unsigned int *\/\n {\n+ MESA_FORMAT_R_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RG_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RGB_UINT8,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n MESA_FORMAT_RGBA_UINT8,\n fetch_texel_1d_rgba_uint8,\n fetch_texel_2d_rgba_uint8,\n@@ -688,11 +971,53 @@\n store_texel_rgba_uint8\n },\n {\n+ MESA_FORMAT_R_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RG_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RGB_UINT16,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n MESA_FORMAT_RGBA_UINT16,\n fetch_texel_1d_rgba_uint16,\n fetch_texel_2d_rgba_uint16,\n fetch_texel_3d_rgba_uint16,\n store_texel_rgba_uint16\n+ },\n+ {\n+ MESA_FORMAT_R_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RG_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n+ },\n+ {\n+ MESA_FORMAT_RGB_UINT32,\n+ NULL,\n+ NULL,\n+ NULL,\n+ NULL\n },\n {\n MESA_FORMAT_RGBA_UINT32,\n"} {"commit":"203020166d2315c14cc0a7601cb10571b93e57bf","subject":"Typo fix for new initializer","message":"Typo fix for new initializer\n","repos":"Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh,Mbewu\/libmesh","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/geom\/node.h\n+++ include\/geom\/node.h\n@@ -245,7 +245,7 @@\n Point(p)\n #ifdef LIBMESH_ENABLE_NODE_VALENCE\n ,\n- _valence\n+ _valence(0)\n #endif\n {\n \/\/ optionally assign the id. We have\n"} {"commit":"3454c96ce7600fedb8aa31aefaab8cf1740b89fd","subject":"Added new user flags for threading","message":"Added new user flags for threading\n\n\ngit-svn-id: 33bf1455041ebe448dbaea643fd5b4b7ce02239d@2525 63c20433-aa62-49bd-875c-5a186b69a8fb\n","repos":"wipple\/GPAC-old,wipple\/GPAC-old,wipple\/GPAC-old,felixge\/gpac,wipple\/GPAC-old,wipple\/GPAC-old,golgol7777\/gpac,golgol7777\/gpac,wipple\/GPAC-old,wipple\/GPAC-old,golgol7777\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac,felixge\/gpac,golgol7777\/gpac","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/gpac\/user.h\n+++ include\/gpac\/user.h\n@@ -57,12 +57,14 @@\n \tGF_TERM_DRAW_FRAME = 1<<3,\n \t\/*disables frame-rate regulation (used when dumping content)*\/\n \tGF_TERM_NO_REGULATION = 1<<4,\n-\t\/*lets the main user handle window events (neede for browser plugins)*\/\n-\tGF_TERM_NO_WINDOWPROC_OVERRIDE = 1<<5,\n \t\/*works without title bar*\/\n-\tGF_TERM_WINDOW_NO_DECORATION = 1<<6,\n+\tGF_TERM_WINDOW_NO_THREAD = 1<<5,\n+\t\/*lets the main user handle window events (needed for browser plugins)*\/\n+\tGF_TERM_NO_WINDOWPROC_OVERRIDE = 1<<6,\n+\t\/*works without title bar*\/\n+\tGF_TERM_WINDOW_NO_DECORATION = 1<<7,\n \t\/*works in windowless mode - experimental, only supported on Win32*\/\n-\tGF_TERM_WINDOWLESS = 1<<7,\n+\tGF_TERM_WINDOWLESS = 1<<8,\n };\n \n \/*user object for all callbacks*\/\n"} {"commit":"7861846255e7972a39832fb293026ab4b5507e31","subject":"Updated usage output","message":"Updated usage output\n","repos":"unispeech\/unimrcp,unispeech\/unimrcp,AaronZhangL\/unimrcp-1,unispeech\/unimrcp,AaronZhangL\/unimrcp-1,AaronZhangL\/unimrcp-1","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- platforms\/unimrcp-client\/src\/main.c\n+++ platforms\/unimrcp-client\/src\/main.c\n@@ -56,8 +56,8 @@\n \telse if(strcasecmp(name,\"help\") == 0) {\n \t\tprintf(\"usage:\\n\"\n \t\t \"\\n- run [app_name] [profile_name] (run demo application)\\n\"\n-\t\t\t \" app_name is one of 'synth', 'recog', 'bypass'\\n\"\n-\t\t\t \" profile_name is one of 'MRCPv2-Default', 'MRCPv1-Default, ...\\n\"\n+\t\t\t \" app_name is one of 'synth', 'recog', 'bypass', 'discover'\\n\"\n+\t\t\t \" profile_name is one of 'MRCPv2-Default', 'MRCPv1-Default', ...\\n\"\n \t\t\t \"\\n examples: \\n\"\n \t\t\t \" run synth\\n\"\n \t\t\t \" run recog\\n\"\n"} {"commit":"1ca0d611b7e02314234c025bae5036018f9e507e","subject":"mhd_sockets.h: silent compiler warning","message":"mhd_sockets.h: silent compiler warning\n\ngit-svn-id: d3d46767b8f15aa15dc28b4413db96165ce057f7@37768 140774ce-b5e7-0310-ab8b-a85725594a96\n","repos":"svn2github\/libmicrohttpd,svn2github\/libmicrohttpd,svn2github\/libmicrohttpd,svn2github\/libmicrohttpd","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/microhttpd\/mhd_sockets.h\n+++ src\/microhttpd\/mhd_sockets.h\n@@ -209,11 +209,12 @@\n # define MHD_SYS_select_(n,r,w,e,t) select((n),(r),(w),(e),(t))\n #else\n # define MHD_SYS_select_(n,r,w,e,t) \\\n-( (!(r) || ((fd_set*)(r))->fd_count == 0) && \\\n- (!(w) || ((fd_set*)(w))->fd_count == 0) && \\\n- (!(e) || ((fd_set*)(e))->fd_count == 0) ) ? \\\n-( (t) ? (Sleep((t)->tv_sec * 1000 + (t)->tv_usec \/ 1000), 0) : 0 ) : \\\n- (select((int)0,(r),(w),(e),(t)))\n+( ( (((void*)(r) == (void*)0) || ((fd_set*)(r))->fd_count == 0) && \\\n+ (((void*)(w) == (void*)0) || ((fd_set*)(w))->fd_count == 0) && \\\n+ (((void*)(e) == (void*)0) || ((fd_set*)(e))->fd_count == 0) ) ? \\\n+ ( ((void*)(t) == (void*)0) ? \\\n+ (Sleep((t)->tv_sec * 1000 + (t)->tv_usec \/ 1000), 0) : 0 ) : \\\n+ (select((int)0,(r),(w),(e),(t))) )\n #endif\n \n #if defined(HAVE_POLL)\n"} {"commit":"2a4dac3952468157297b81ae0a29815c02ead179","subject":"KVM: Remove minor wart from KVM_CREATE_VCPU ioctl","message":"KVM: Remove minor wart from KVM_CREATE_VCPU ioctl\n\nThat ioctl does not transfer any data, so it should be an _IO rather than an\n_IOW.\n\nSigned-off-by: Avi Kivity <8f920f22884d6fea9df883843c4a8095a2e5ac6f@qumranet.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/kvm.h\n+++ include\/linux\/kvm.h\n@@ -241,7 +241,7 @@\n * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns\n * a vcpu fd.\n *\/\n-#define KVM_CREATE_VCPU _IOW(KVMIO, 11, int)\n+#define KVM_CREATE_VCPU _IO(KVMIO, 11)\n #define KVM_GET_DIRTY_LOG _IOW(KVMIO, 12, struct kvm_dirty_log)\n \n \/*\n"} {"commit":"491424c0f46c282a854b88830212bdb0763e93dc","subject":"PCI: Global variable decls must match the defs in section attributes","message":"PCI: Global variable decls must match the defs in section attributes\n\nGlobal variable declarations must match the definitions in section attributes\nas the compiler is at liberty to vary the method it uses to access a variable,\ndepending on the section it is in.\n\nWhen building the FRV arch, I now see:\n\n drivers\/built-in.o: In function `pci_apply_final_quirks':\n drivers\/pci\/quirks.c:2606: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers\/built-in.o\n drivers\/pci\/quirks.c:2623: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers\/built-in.o\n drivers\/pci\/quirks.c:2630: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers\/built-in.o\n\nbecause the declaration of pci_dfl_cache_line_size in linux\/pci.h does not\nmatch the definition in drivers\/pci\/pci.c.\n\nSigned-off-by: David Howells <ebac1d06c1688626821bb0e574a037a7a5354e49@redhat.com>\nSigned-off-by: Linus Torvalds <69652caca27c8b940640ad396ab71f93cacec34f@linux-foundation.org>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/linux\/pci.h\n+++ include\/linux\/pci.h\n@@ -1255,7 +1255,7 @@\n \n extern unsigned long pci_cardbus_io_size;\n extern unsigned long pci_cardbus_mem_size;\n-extern u8 pci_dfl_cache_line_size;\n+extern u8 __devinitdata pci_dfl_cache_line_size;\n extern u8 pci_cache_line_size;\n \n extern unsigned long pci_hotplug_io_size;\n"} {"commit":"f6f3d0bdbd6df454e35a9d24951ab8328f27aeee","subject":"Update to app template.","message":"Update to app template.\n\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@10221 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- seqan\/util\/skel\/app_template\/app.h\n+++ seqan\/util\/skel\/app_template\/app.h\n@@ -60,7 +60,8 @@\n Options()\n {\n \/\/ Set defaults.\n- showHelp = true;\n+ showHelp = false;\n+ showVersion = false;\n i = 0;\n }\n };\n"} {"commit":"f2eb3172546c9edc7eef83152ff08ce80ea81186","subject":"start to use set\/get and a global variable","message":"start to use set\/get and a global variable\n","repos":"nadgerz\/c-lang-fundamentals","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- program.c\n+++ program.c\n@@ -1,11 +1,35 @@\n #include <stdio.h>\n+\n+int data;\n+\n+void apples_set(int value)\n+{\n+ data = value;\n+}\n+\n+int apples_get()\n+{\n+ return data;\n+}\n+\n+void oranges_set(int value)\n+{\n+ data = value;\n+}\n \n int main()\n {\n- int apples = 5;\n- int oranges = apples;\n+ int apples;\n+ int oranges;\n \n- apples = 4;\n+ apples_set(5);\n+ apples = data;\n+\n+ oranges_set(apples);\n+ oranges = data;\n+\n+ apples_set(4);\n+ apples = data;\n \n printf(\"apples=%d oranges=%d\\n\", apples, oranges);\n \n"} {"commit":"f88ed90d8627d0d3d93b330d6d2012c2934fb54e","subject":"usb.h: fix kernel-doc warning","message":"usb.h: fix kernel-doc warning\n\nFix kernel-doc warning in usb.h:\nWarning(linux-2.6.24-rc3-git7\/\/include\/linux\/usb.h:166): No description found for parameter 'sysfs_files_created'\n\nSigned-off-by: Randy Dunlap <e1d10faa7e2a0c027bf1ff1d20e7fd10154be7ea@oracle.com>\nSigned-off-by: Greg Kroah-Hartman <4645f7897fd33786a2ee1264d590b3c400559d85@suse.de>\n\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/linux\/usb.h\n+++ include\/linux\/usb.h\n@@ -107,6 +107,7 @@\n * @condition: binding state of the interface: not bound, binding\n *\t(in probe()), bound to a driver, or unbinding (in disconnect())\n * @is_active: flag set when the interface is bound and not suspended.\n+ * @sysfs_files_created: sysfs attributes exist\n * @needs_remote_wakeup: flag set when the driver requires remote-wakeup\n *\tcapability during autosuspend.\n * @dev: driver model's view of this device\n"} {"commit":"8173349a406b9a2f992554442db410ba43815b11","subject":"Better saturated colors in the demos","message":"Better saturated colors in the demos\n","repos":"xuanloctn\/chipmunk-physics,ewmailing\/Chipmunk2D,xuanloctn\/chipmunk-physics,spacelan\/Chipmunk2D,dipankar-das\/Chipmunk2D,ycaihua\/Chipmunk2D,dipankar-das\/Chipmunk2D,viblo\/Chipmunk2D,DNESS\/Chipmunk2D,fasterthanlime\/Chipmunk-Physics,ycaihua\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,DNESS\/Chipmunk2D,xuanloctn\/chipmunk-physics,viblo\/Chipmunk2D,fasterthanlime\/Chipmunk-Physics,kennethdmiller3\/Chipmunk-Physics,lqefn\/Chipmunk2D,AntonioModer\/Chipmunk2D,ycaihua\/Chipmunk2D,xuanloctn\/chipmunk-physics,TukekeSoft\/Chipmunk2D,TheCodez\/Chipmunk2D,TheCodez\/Chipmunk2D,dipankar-das\/Chipmunk2D,dipankar-das\/Chipmunk2D,ewmailing\/Chipmunk2D,dipankar-das\/Chipmunk2D,TheCodez\/Chipmunk2D,slembcke\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,spacelan\/Chipmunk2D,DNESS\/Chipmunk2D,fasterthanlime\/Chipmunk-Physics,AntonioModer\/Chipmunk2D,AntonioModer\/Chipmunk2D,TukekeSoft\/Chipmunk2D,viblo\/Chipmunk2D,slembcke\/Chipmunk2D,TheCodez\/Chipmunk2D,TukekeSoft\/Chipmunk2D,fasterthanlime\/Chipmunk-Physics,ewmailing\/Chipmunk2D,kennethdmiller3\/Chipmunk-Physics,lqefn\/Chipmunk2D,ycaihua\/Chipmunk2D,ewmailing\/Chipmunk2D,spacelan\/Chipmunk2D,AntonioModer\/Chipmunk2D,TukekeSoft\/Chipmunk2D,lqefn\/Chipmunk2D,slembcke\/Chipmunk2D,xuanloctn\/chipmunk-physics,ycaihua\/Chipmunk2D,spacelan\/Chipmunk2D,lqefn\/Chipmunk2D,viblo\/Chipmunk2D,AntonioModer\/Chipmunk2D,DNESS\/Chipmunk2D,DNESS\/Chipmunk2D,spacelan\/Chipmunk2D","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Demo\/ChipmunkDebugDraw.c\n+++ Demo\/ChipmunkDebugDraw.c\n@@ -78,17 +78,21 @@\n \tGLfloat b = (val>>16) & 0xFF;\n \t\n \tfloat max = cpfmax(cpfmax(r, g), b);\n-\t\n-\t\/\/ saturate and scale the colors\n-\tconst GLfloat mult = 1.0;\n-\tconst GLfloat add = 0.0;\n-\t\n-\treturn RGBAColor(\n-\t\tr = (r*mult)\/max + add,\n-\t\tg = (g*mult)\/max + add,\n-\t\tb = (b*mult)\/max + add,\n-\t\talpha\n-\t);\n+\tfloat min = cpfmin(cpfmin(r, g), b);\n+\t\n+\tif(min == max){\n+\t\treturn RGBAColor(1.0, 0.0, 0.0, alpha);\n+\t} else {\n+\t\t\/\/ saturate and scale the colors\n+\t\tconst GLfloat mult = 1.0\/(max - min);\n+\t\t\n+\t\treturn RGBAColor(\n+\t\t\t(r - min)*mult,\n+\t\t\t(g - min)*mult,\n+\t\t\t(b - min)*mult,\n+\t\t\talpha\n+\t\t);\n+\t}\n }\n \n static inline void\n"} {"commit":"d9f34e23d4a774ec74dcd67fa39c0a1f61ec0be3","subject":"Revert \"always use Python memory manager\"","message":"Revert \"always use Python memory manager\"\n\nThis reverts commit 20c7e5c3edde6cab66db0bb32ea4a98add45c0d9.\n\nWe cannot use the Python memory allocators while we also release\nthe GIL.\n\nIt may be possible to release the GIL until the allocators are\ncalled though instead, but I do not know of any reason not to\nuse the standard libc allocators (which are thread-safe).\n","repos":"ContinuumIO\/pycosat,ContinuumIO\/pycosat","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pycosat.c\n+++ pycosat.c\n@@ -19,6 +19,16 @@\n #include \"picosat.c\"\n #endif\n \n+\/* When defined, picosat uses the Python memory manager\n+ We cannot do this while we:\n+ \"release GIL during main picosat computation\"\n+ https:\/\/github.com\/ContinuumIO\/pycosat\/commit\/f50c89a10db2e87c3e6b896c43ce0549f92039d0\n+ I am assuming here that we would rather release the GIL than use the Python mem allocation\n+ though there is no comments to explain the trade-offs between the Python vs libc allocators\n+*\/\n+\/* #define WITH_PYMEM *\/\n+\n+\n #if PY_MAJOR_VERSION >= 3\n #define IS_PY3K\n #endif\n@@ -34,6 +44,7 @@\n #define PyUnicode_FromString PyString_FromString\n #endif\n \n+#if defined(WITH_PYMEM)\n \/* the following three adapter functions are used as arguments to\n picosat_minit, such that picosat used the Python memory manager *\/\n inline static void *py_malloc(void *mmgr, size_t bytes)\n@@ -50,6 +61,7 @@\n {\n PyMem_Free(ptr);\n }\n+#endif\n \n \/* Add the inverse of the (current) solution to the clauses.\n This function is essentially the same as the function blocksol in app.c\n@@ -146,7 +158,11 @@\n &vars, &verbose, &prop_limit))\n return NULL;\n \n+#if defined(WITH_PYMEM)\n picosat = picosat_minit(NULL, py_malloc, py_realloc, py_free);\n+#else\n+ picosat = picosat_init();\n+#endif\n picosat_set_verbosity(picosat, verbose);\n if (vars != -1)\n picosat_adjust(picosat, vars);\n"} {"commit":"62281a132f11e742a96ff9caeaaaa17900020acd","subject":"Be consistent in using class vs struct to make VC++ happy. And as it contains methods, virtual method even, class wins.","message":"Be consistent in using class vs struct to make VC++ happy. And as it contains\nmethods, virtual method even, class wins.\n\n\ngit-svn-id: 0ff597fd157e6f4fc38580e8d64ab130330d2411@25098 91177308-0d34-0410-b5e6-96231b3b80d8\n","repos":"GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,chubbymaggie\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,apple\/swift-llvm,apple\/swift-llvm,chubbymaggie\/asap,apple\/swift-llvm,GPUOpen-Drivers\/llvm,GPUOpen-Drivers\/llvm,apple\/swift-llvm,llvm-mirror\/llvm,dslab-epfl\/asap,chubbymaggie\/asap,chubbymaggie\/asap,GPUOpen-Drivers\/llvm,dslab-epfl\/asap,llvm-mirror\/llvm,GPUOpen-Drivers\/llvm,llvm-mirror\/llvm,dslab-epfl\/asap,apple\/swift-llvm,dslab-epfl\/asap,apple\/swift-llvm,chubbymaggie\/asap,dslab-epfl\/asap","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/llvm\/Pass.h\n+++ include\/llvm\/Pass.h\n@@ -311,7 +311,8 @@\n \/\/\/ other basic block in the function.\n \/\/\/ 3. Optimizations conform to all of the constraints of FunctionPasses.\n \/\/\/\n-struct BasicBlockPass : public FunctionPass {\n+class BasicBlockPass : public FunctionPass {\n+public:\n \/\/\/ doInitialization - Virtual method overridden by subclasses to do\n \/\/\/ any necessary per-module initialization.\n \/\/\/\n"} {"commit":"a14a8db6d103b2f0ae5539f15a3da300aa9a8b60","subject":"ToFTintinCamera: rename filt_coef_* to filt_coeff_*","message":"ToFTintinCamera: rename filt_coef_* to filt_coeff_*\n","repos":"3dtof\/voxelsdk,3dtof\/voxelsdk,3dtof\/voxelsdk,Metrilus\/voxelsdk,Metrilus\/voxelsdk,Metrilus\/voxelsdk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- TI3DToF\/ToFTintinCamera.h\n+++ TI3DToF\/ToFTintinCamera.h\n@@ -51,14 +51,14 @@\n #define X_CROSS_TALK_COEFF_F2 \"x_cross_talk_coeff_f2\"\n #define Y_CROSS_TALK_COEFF_F2 \"y_cross_talk_coeff_f2\"\n \n-#define CROSS_TALK_FILT_COEFF_X_RE_F1 \"filt_coef_x_re_f1\"\n-#define CROSS_TALK_FILT_COEFF_X_IM_F1 \"filt_coef_x_im_f1\"\n-#define CROSS_TALK_FILT_COEFF_Y_RE_F1 \"filt_coef_y_re_f1\"\n-#define CROSS_TALK_FILT_COEFF_Y_IM_F1 \"filt_coef_y_im_f1\"\n-#define CROSS_TALK_FILT_COEFF_X_RE_F2 \"filt_coef_x_re_f2\"\n-#define CROSS_TALK_FILT_COEFF_X_IM_F2 \"filt_coef_x_im_f2\"\n-#define CROSS_TALK_FILT_COEFF_Y_RE_F2 \"filt_coef_y_re_f2\"\n-#define CROSS_TALK_FILT_COEFF_Y_IM_F2 \"filt_coef_y_im_f2\"\n+#define CROSS_TALK_FILT_COEFF_X_RE_F1 \"filt_coeff_x_re_f1\"\n+#define CROSS_TALK_FILT_COEFF_X_IM_F1 \"filt_coeff_x_im_f1\"\n+#define CROSS_TALK_FILT_COEFF_Y_RE_F1 \"filt_coeff_y_re_f1\"\n+#define CROSS_TALK_FILT_COEFF_Y_IM_F1 \"filt_coeff_y_im_f1\"\n+#define CROSS_TALK_FILT_COEFF_X_RE_F2 \"filt_coeff_x_re_f2\"\n+#define CROSS_TALK_FILT_COEFF_X_IM_F2 \"filt_coeff_x_im_f2\"\n+#define CROSS_TALK_FILT_COEFF_Y_RE_F2 \"filt_coeff_y_re_f2\"\n+#define CROSS_TALK_FILT_COEFF_Y_IM_F2 \"filt_coeff_y_im_f2\"\n #define CROSS_TALK_EN \"filt_en\"\n #define CROSS_TALK_SCALE \"filt_scale\"\n \n"} {"commit":"60fe7ea27ef27182987d2830a8d0b485b7b98162","subject":"doveadm: -u parameter now allows wildcards for usernames.","message":"doveadm: -u parameter now allows wildcards for usernames.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/doveadm\/doveadm-mail.c\n+++ src\/doveadm\/doveadm-mail.c\n@@ -5,6 +5,7 @@\n #include \"lib-signals.h\"\n #include \"ioloop.h\"\n #include \"module-dir.h\"\n+#include \"wildcard-match.h\"\n #include \"master-service.h\"\n #include \"mail-user.h\"\n #include \"mail-namespace.h\"\n@@ -235,6 +236,7 @@\n \n static void\n doveadm_mail_all_users(struct doveadm_mail_cmd_context *ctx,\n+\t\t const char *wildcard_user,\n \t\t enum mail_storage_service_flags service_flags)\n {\n \tstruct mail_storage_service_input input;\n@@ -262,6 +264,10 @@\n \t\n \tuser_idx = 0;\n \twhile ((ret = ctx->v.get_next_user(ctx, &user)) > 0) {\n+\t\tif (wildcard_user != NULL) {\n+\t\t\tif (!wildcard_match_icase(user, wildcard_user))\n+\t\t\t\tcontinue;\n+\t\t}\n \t\tinput.username = user;\n \t\tT_BEGIN {\n \t\t\tret = doveadm_mail_next_user(ctx, &input, &error);\n@@ -316,7 +322,7 @@\n \tenum mail_storage_service_flags service_flags =\n \t\tMAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT;\n \tstruct doveadm_mail_cmd_context *ctx;\n-\tconst char *getopt_args, *username;\n+\tconst char *getopt_args, *username, *wildcard_user;\n \tbool all_users = FALSE;\n \tint c;\n \n@@ -335,6 +341,7 @@\n \n \tgetopt_args = t_strconcat(\"Au:\", ctx->getopt_args, NULL);\n \tusername = getenv(\"USER\");\n+\twildcard_user = NULL;\n \twhile ((c = getopt(argc, argv, getopt_args)) > 0) {\n \t\tswitch (c) {\n \t\tcase 'A':\n@@ -344,6 +351,8 @@\n \t\t\tservice_flags |=\n \t\t\t\tMAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;\n \t\t\tusername = optarg;\n+\t\t\tif (strchr(username, '*') != NULL)\n+\t\t\t\twildcard_user = username;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tif (ctx->v.parse_arg == NULL ||\n@@ -360,11 +369,11 @@\n \n \tctx->v.init(ctx, (const void *)argv);\n \n-\tif (!all_users) {\n+\tif (!all_users && wildcard_user == NULL) {\n \t\tdoveadm_mail_single_user(ctx, username, service_flags);\n \t} else {\n \t\tservice_flags |= MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP;\n-\t\tdoveadm_mail_all_users(ctx, service_flags);\n+\t\tdoveadm_mail_all_users(ctx, wildcard_user, service_flags);\n \t}\n \tctx->v.deinit(ctx);\n }\n"} {"commit":"4763ca0266179baa289c64e4c83a209807562c35","subject":"doveadm force-resync: Get mailbox name as UTF-8.","message":"doveadm force-resync: Get mailbox name as UTF-8.\n","repos":"damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/doveadm\/doveadm-mail.c\n+++ src\/doveadm\/doveadm-mail.c\n@@ -4,9 +4,11 @@\n #include \"array.h\"\n #include \"lib-signals.h\"\n #include \"ioloop.h\"\n+#include \"str.h\"\n #include \"module-dir.h\"\n #include \"wildcard-match.h\"\n #include \"master-service.h\"\n+#include \"imap-utf7.h\"\n #include \"mail-user.h\"\n #include \"mail-namespace.h\"\n #include \"mail-storage.h\"\n@@ -73,7 +75,12 @@\n {\n \tstruct mail_namespace *ns;\n \tstruct mailbox *box;\n+\tstring_t *str;\n \tconst char *orig_mailbox = mailbox;\n+\n+\tstr = t_str_new(128);\n+\tif (imap_utf8_to_utf7(mailbox, str) == 0)\n+\t\tmailbox = str_c(str);\n \n \tns = mail_namespace_find(user->namespaces, &mailbox);\n \tif (ns == NULL)\n"} {"commit":"61f57730a8bb64e607e42d74fac76f6cd8b3b021","subject":"Excluded verbose and bad change to Mac OS X universal binaries handling","message":"Excluded verbose and bad change to Mac OS X universal binaries handling\n\n\n\n","repos":"ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,slanterns\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/my_global.h\n+++ include\/my_global.h\n@@ -95,9 +95,9 @@\n # undef SIZEOF_LONG_LONG \n # undef SIZEOF_OFF_T \n # undef SIZEOF_SHORT \n+\n+#if defined(__i386__)\n # undef WORDS_BIGENDIAN\n-\n-#if defined(__i386__)\n # define SIZEOF_CHARP 4\n # define SIZEOF_INT 4\n # define SIZEOF_LONG 4\n@@ -110,23 +110,6 @@\n # define SIZEOF_CHARP 4\n # define SIZEOF_INT 4\n # define SIZEOF_LONG 4\n-# define SIZEOF_LONG_LONG 8\n-# define SIZEOF_OFF_T 8\n-# define SIZEOF_SHORT 2\n-\n-#if defined(__x86_64__)\n-# define SIZEOF_CHARP 8\n-# define SIZEOF_INT 4\n-# define SIZEOF_LONG 8\n-# define SIZEOF_LONG_LONG 8\n-# define SIZEOF_OFF_T 8\n-# define SIZEOF_SHORT 2\n-\n-#elif defined(__ppc64__)\n-# define WORDS_BIGENDIAN\n-# define SIZEOF_CHARP 8\n-# define SIZEOF_INT 4\n-# define SIZEOF_LONG 8\n # define SIZEOF_LONG_LONG 8\n # define SIZEOF_OFF_T 8\n # define SIZEOF_SHORT 2\n"} {"commit":"186b7542a764c996d9a76547d4252c016e873bbe","subject":"In many cases we don't really have a fallback. If it's null it's null.","message":"In many cases we don't really have a fallback. If it's null it's null.\n\nReflecting that in the API.\n\nsvn path=\/trunk\/kdepim\/; revision=222346\n","repos":"lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi,lefou\/kdepim-noakonadi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ktnef\/ktnef\/ktnefpropertyset.h\n+++ ktnef\/ktnef\/ktnefpropertyset.h\n@@ -31,8 +31,8 @@\n \n \t\/* MAPI properties interface *\/\n \tvoid addProperty( int key, int type, const QVariant& value, const QVariant& name = QVariant(), bool overwrite = false );\n-\tQString findProp( int key, const QString& fallback, bool convertToUpper=false);\n-\tQString findNamedProp(const QString& name, const QString& fallback, bool convertToUpper=false);\n+\tQString findProp( int key, const QString& fallback=QString::null, bool convertToUpper=false);\n+\tQString findNamedProp(const QString& name, const QString& fallback=QString::null, bool convertToUpper=false);\n \tQMap<int,KTNEFProperty*>& properties();\n \tconst QMap<int,KTNEFProperty*>& properties() const;\n \tQVariant property( int key ) const;\n"} {"commit":"9e328b96dfbf18984ee0959342b8ebcd5f291752","subject":"payload token","message":"payload token\n","repos":"khorost\/phreeber-lib,khorost\/phreeber-lib,khorost\/khorost-lib,khorost\/khorost-lib","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- include\/net\/token.h\n+++ include\/net\/token.h\n@@ -51,8 +51,8 @@\n const boost::posix_time::ptime& get_access_expire() const { return m_access_expire_; }\n const boost::posix_time::ptime& get_refresh_expire() const { return m_refresh_expire_; }\n \n- int get_access_duration() const ;\n- int get_refresh_duration() const ;\n+ int get_access_duration() const;\n+ int get_refresh_duration() const;\n \n void set_access_duration(const int seconds) {\n m_payload_[khl_json_param_delta_access_time] = seconds;\n@@ -66,6 +66,7 @@\n m_access_token_ = access_token;\n m_payload_[khl_json_param_access_token] = access_token;\n }\n+\n void set_refresh_token(const std::string& refresh_token) {\n m_refresh_token_ = refresh_token;\n m_payload_[khl_json_param_refresh_token] = refresh_token;\n@@ -75,9 +76,14 @@\n m_access_expire_ = access_expire;\n m_payload_[khl_json_param_access_expire] = to_iso_extended_string(access_expire);\n }\n+\n void set_refresh_expire(const boost::posix_time::ptime& refresh_expire) {\n m_refresh_expire_ = refresh_expire;\n m_payload_[khl_json_param_refresh_expire] = to_iso_extended_string(refresh_expire);\n+ }\n+\n+ void set_payload(const std::string& key, const Json::Value& value) {\n+ m_payload_[key] = value;\n }\n };\n \n"} {"commit":"e56d11d0b062ea96c8356513add39511b7cb4043","subject":"Fix compilation warnings: \"function declaration isn\u2019t a prototype\".","message":"Fix compilation warnings: \"function declaration isn\u2019t a prototype\".\n","repos":"Linphone-sync\/oRTP,Distrotech\/oRTP,carpikes\/ortp,videomedicine\/oRTP,Distrotech\/oRTP,carpikes\/ortp,wugh7125\/ortp,wugh7125\/ortp,VTCSecureLLC\/ortp,carpikes\/ortp,caizw\/ortp,VTCSecureLLC\/ortp,wugh7125\/ortp,caizw\/ortp,jiangjianping\/ortp,caizw\/ortp,videomedicine\/oRTP,Linphone-sync\/oRTP,videomedicine\/oRTP,VTCSecureLLC\/ortp,jiangjianping\/ortp,jiangjianping\/ortp,Linphone-sync\/oRTP,Distrotech\/oRTP","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/ortp\/zrtp.h\n+++ include\/ortp\/zrtp.h\n@@ -33,7 +33,7 @@\n \n typedef struct _OrtpZrtpContext OrtpZrtpContext ;\n \n-ORTP_PUBLIC bool_t ortp_zrtp_available();\n+ORTP_PUBLIC bool_t ortp_zrtp_available(void);\n \n ORTP_PUBLIC OrtpZrtpContext* ortp_zrtp_context_new(RtpSession *s, OrtpZrtpParams *params);\n \/**\n"} {"commit":"44946f3153123a04e2fa5cd585ba82d4ac90d4dc","subject":"Remove unuesed include","message":"Remove unuesed include\n","repos":"Rookfighter\/small-args,Rookfighter\/small-args,Rookfighter\/small-args","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/smallargs.h\n+++ include\/smallargs.h\n@@ -36,7 +36,6 @@\n #include <stddef.h>\n #include <string.h>\n #include <stdlib.h>\n-#include <stdio.h>\n \n #define SARG_VERSION \"0.1\"\n \n"} {"commit":"f3fc38d830c216f0384f0567af414aa246775b88","subject":"branches\/zip: sync0sync.h: Define mutex_free as mutex0_free, because symbols defined in innodb_redefine.h must not be undefined. After this change, innodb_redefine.h will define mutex0_free instead of mutex_free, and everything is fine.","message":"branches\/zip: sync0sync.h: Define mutex_free as mutex0_free, because symbols\ndefined in innodb_redefine.h must not be undefined. After this change,\ninnodb_redefine.h will define mutex0_free instead of mutex_free, and\neverything is fine.\n","repos":"flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,slanterns\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/sync0sync.h\n+++ include\/sync0sync.h\n@@ -76,6 +76,10 @@\n is checked to be in the reset state. *\/\n \n #undef mutex_free\t\t\t\/* Fix for MacOS X *\/\n+#define mutex_free mutex0_free\t\t\/* Fix for innodb_redefine.h;\n+\t\t\t\t\twe must not undefine symbols\n+\t\t\t\t\tdefined there; thus, that file\n+\t\t\t\t\twill use mutex0_free. *\/\n void\n mutex_free(\n \/*=======*\/\n"} {"commit":"76c8fe6cc6096e7fa09d6369a1dc7b2e3e9bca49","subject":"mount.h: update","message":"mount.h: update\n\nSigned-off-by: Bernhard Reutner-Fischer <ce1ac9e9ad16abccd7821f371ad381197b4768ac@gmail.com>\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/sys\/mount.h\n+++ include\/sys\/mount.h\n@@ -1,5 +1,5 @@\n \/* Header file for mounting\/unmount Linux filesystems.\n- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.\n+ Copyright (C) 1996-2000, 2004, 2010, 2012 Free Software Foundation, Inc.\n This file is part of the GNU C Library.\n \n The GNU C Library is free software; you can redistribute it and\/or\n@@ -46,23 +46,46 @@\n #define MS_REMOUNT\tMS_REMOUNT\n MS_MANDLOCK = 64,\t\t\/* Allow mandatory locks on an FS. *\/\n #define MS_MANDLOCK\tMS_MANDLOCK\n- S_WRITE = 128,\t\t\/* Write on file\/directory\/symlink. *\/\n-#define S_WRITE\t\tS_WRITE\n- S_APPEND = 256,\t\t\/* Append-only file. *\/\n-#define S_APPEND\tS_APPEND\n- S_IMMUTABLE = 512,\t\t\/* Immutable file. *\/\n-#define S_IMMUTABLE\tS_IMMUTABLE\n+ MS_DIRSYNC = 128,\t\t\/* Directory modifications are synchronous. *\/\n+#define MS_DIRSYNC\tMS_DIRSYNC\n MS_NOATIME = 1024,\t\t\/* Do not update access times. *\/\n #define MS_NOATIME\tMS_NOATIME\n MS_NODIRATIME = 2048,\t\t\/* Do not update directory access times. *\/\n #define MS_NODIRATIME\tMS_NODIRATIME\n MS_BIND = 4096,\t\t\/* Bind directory at different place. *\/\n #define MS_BIND\t\tMS_BIND\n+ MS_MOVE = 8192,\n+#define MS_MOVE\t\tMS_MOVE\n+ MS_REC = 16384,\n+#define MS_REC\t\tMS_REC\n+ MS_SILENT = 32768,\n+#define MS_SILENT\tMS_SILENT\n+ MS_POSIXACL = 1 << 16,\t\/* VFS does not apply the umask. *\/\n+#define MS_POSIXACL\tMS_POSIXACL\n+ MS_UNBINDABLE = 1 << 17,\t\/* Change to unbindable. *\/\n+#define MS_UNBINDABLE\tMS_UNBINDABLE\n+ MS_PRIVATE = 1 << 18,\t\t\/* Change to private. *\/\n+#define MS_PRIVATE\tMS_PRIVATE\n+ MS_SLAVE = 1 << 19,\t\t\/* Change to slave. *\/\n+#define MS_SLAVE\tMS_SLAVE\n+ MS_SHARED = 1 << 20,\t\t\/* Change to shared. *\/\n+#define MS_SHARED\tMS_SHARED\n+ MS_RELATIME = 1 << 21,\t\/* Update atime relative to mtime\/ctime. *\/\n+#define MS_RELATIME\tMS_RELATIME\n+ MS_KERNMOUNT = 1 << 22,\t\/* This is a kern_mount call. *\/\n+#define MS_KERNMOUNT\tMS_KERNMOUNT\n+ MS_I_VERSION = 1 << 23,\t\/* Update inode I_version field. *\/\n+#define MS_I_VERSION\tMS_I_VERSION\n+ MS_STRICTATIME = 1 << 24,\t\/* Always perform atime updates. *\/\n+#define MS_STRICTATIME\tMS_STRICTATIME\n+ MS_ACTIVE = 1 << 30,\n+#define MS_ACTIVE\tMS_ACTIVE\n+ MS_NOUSER = 1 << 31\n+#define MS_NOUSER\tMS_NOUSER\n };\n \n \/* Flags that can be altered by MS_REMOUNT *\/\n-#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \\\n-\t\t |MS_NODIRATIME)\n+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)\n \n \n \/* Magic mount flag number. Has to be or-ed to the flag values. *\/\n@@ -99,8 +122,10 @@\n #define MNT_FORCE MNT_FORCE\n MNT_DETACH = 2,\t\t\/* Just detach from the tree. *\/\n #define MNT_DETACH MNT_DETACH\n- MNT_EXPIRE = 4\t\t\/* Mark for expiry. *\/\n+ MNT_EXPIRE = 4,\t\t\/* Mark for expiry. *\/\n #define MNT_EXPIRE MNT_EXPIRE\n+ UMOUNT_NOFOLLOW = 8\t\t\/* Don't follow symlink on umount. *\/\n+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW\n };\n \n \n"} {"commit":"bb25a5ed3b7b23290d2e2b74b48f9b4707e950bc","subject":"(tdep_search_unwind_table): Explicitly call _Uia64_search_unwind_table(). \tRemove declaration of same name; this is now done in libunwind-ia64.h.","message":"(tdep_search_unwind_table): Explicitly call _Uia64_search_unwind_table().\n\tRemove declaration of same name; this is now done in libunwind-ia64.h.\n\n(Logical change 1.43)\n","repos":"CyanogenMod\/android_external_libunwind,tronical\/libunwind,fillexen\/libunwind,evaautomation\/libunwind,SyndicateRogue\/libunwind,tkelman\/libunwind,pathscale\/libunwind,Keno\/libunwind,tronical\/libunwind,zliu2014\/libunwind-tilegx,SyndicateRogue\/libunwind,atanasyan\/libunwind-android,cloudius-systems\/libunwind,krytarowski\/libunwind,DroidSim\/platform_external_libunwind,rntz\/libunwind,maltek\/platform_external_libunwind,cms-externals\/libunwind,CyanogenMod\/android_external_libunwind,unkadoug\/libunwind,project-zerus\/libunwind,mpercy\/libunwind,android-ia\/platform_external_libunwind,rogwfu\/libunwind,wdv4758h\/libunwind,atanasyan\/libunwind,olibc\/libunwind,fillexen\/libunwind,dropbox\/libunwind,dagar\/libunwind,geekboxzone\/mmallow_external_libunwind,Keno\/libunwind,tkelman\/libunwind,ehsan\/libunwind,androidarmv6\/android_external_libunwind,atanasyan\/libunwind-android,libunwind\/libunwind,tkelman\/libunwind,rogwfu\/libunwind,android-ia\/platform_external_libunwind,evaautomation\/libunwind,yuyichao\/libunwind,maltek\/platform_external_libunwind,zliu2014\/libunwind-tilegx,cloudius-systems\/libunwind,wdv4758h\/libunwind,pathscale\/libunwind,Chilledheart\/libunwind,DroidSim\/platform_external_libunwind,djwatson\/libunwind,project-zerus\/libunwind,cms-externals\/libunwind,rntz\/libunwind,zliu2014\/libunwind-tilegx,project-zerus\/libunwind,dreal-deps\/libunwind,0xlab\/0xdroid-external_libunwind,olibc\/libunwind,dreal-deps\/libunwind,rogwfu\/libunwind,SyndicateRogue\/libunwind,igprof\/libunwind,jrmuizel\/libunwind,unkadoug\/libunwind,cms-externals\/libunwind,lat\/libunwind,vegard\/libunwind,fillexen\/libunwind,dagar\/libunwind,Chilledheart\/libunwind,rntz\/libunwind,ehsan\/libunwind,libunwind\/libunwind,wdv4758h\/libunwind,olibc\/libunwind,djwatson\/libunwind,frida\/libunwind,geekboxzone\/mmallow_external_libunwind,atanasyan\/libunwind-android,zeldin\/platform_external_libunwind,dropbox\/libunwind,vtjnash\/libunwind,adsharma\/libunwind,krytarowski\/libunwind,geekboxzone\/lollipop_external_libunwind,geekboxzone\/lollipop_external_libunwind,martyone\/libunwind,lat\/libunwind,frida\/libunwind,0xlab\/0xdroid-external_libunwind,tony\/libunwind,vtjnash\/libunwind,vegard\/libunwind,dreal-deps\/libunwind,lat\/libunwind,frida\/libunwind,adsharma\/libunwind,ehsan\/libunwind,rantala\/libunwind,fdoray\/libunwind,maltek\/platform_external_libunwind,evaautomation\/libunwind,libunwind\/libunwind,zeldin\/platform_external_libunwind,vtjnash\/libunwind,tronical\/libunwind,Chilledheart\/libunwind,djwatson\/libunwind,mpercy\/libunwind,androidarmv6\/android_external_libunwind,unkadoug\/libunwind,cloudius-systems\/libunwind,mpercy\/libunwind,vegard\/libunwind,CyanogenMod\/android_external_libunwind,atanasyan\/libunwind,martyone\/libunwind,atanasyan\/libunwind,fdoray\/libunwind,bo-on-software\/libunwind,martyone\/libunwind,adsharma\/libunwind,geekboxzone\/lollipop_external_libunwind,Keno\/libunwind,jrmuizel\/libunwind,rantala\/libunwind,krytarowski\/libunwind,tony\/libunwind,jrmuizel\/libunwind,androidarmv6\/android_external_libunwind,bo-on-software\/libunwind,dropbox\/libunwind,geekboxzone\/mmallow_external_libunwind,tony\/libunwind,joyent\/libunwind,igprof\/libunwind,pathscale\/libunwind,fdoray\/libunwind,0xlab\/0xdroid-external_libunwind,bo-on-software\/libunwind,DroidSim\/platform_external_libunwind,zeldin\/platform_external_libunwind,dagar\/libunwind,yuyichao\/libunwind,igprof\/libunwind,joyent\/libunwind,rantala\/libunwind,joyent\/libunwind,android-ia\/platform_external_libunwind,yuyichao\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- include\/tdep-ia64.h\n+++ include\/tdep-ia64.h\n@@ -173,7 +173,7 @@\n \/* Platforms that support UNW_INFO_FORMAT_TABLE need to define\n tdep_search_unwind_table. *\/\n #define tdep_search_unwind_table(a,b,c,d,e,f)\t\t\t\\\n-\t\tUNW_ARCH_OBJ(search_unwind_table) (a,b,c,d,e,f)\n+\t\t_Uia64_search_unwind_table (a, b, c, d, e, f)\n #define tdep_find_proc_info(as,ip,pi,n,a)\t\t\t\\\n \t\tUNW_ARCH_OBJ(find_proc_info) (as,ip,pi,n,a)\n #define tdep_put_unwind_info(a,b,c) \tUNW_ARCH_OBJ(put_unwind_info)(a,b,c)\n@@ -182,9 +182,6 @@\n \n #define unw\t\tUNW_ARCH_OBJ(data)\n \n-extern int tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip,\n-\t\t\t\t unw_dyn_info_t *di, unw_proc_info_t *pi,\n-\t\t\t\t int need_unwind_info, void *arg);\n extern int tdep_find_proc_info (unw_addr_space_t as, unw_word_t ip,\n \t\t\t\tunw_proc_info_t *pi, int need_unwind_info,\n \t\t\t\tvoid *arg);\n"} {"commit":"7662a65e999a1515ad0991bca2d89d5d11565ae7","subject":"Remove #define AS.","message":"Remove #define AS.\n","repos":"mayah\/tinytoml","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/toml\/toml.h\n+++ include\/toml\/toml.h\n@@ -912,25 +912,54 @@\n template<> inline bool Value::is<Array>() const { return type_ == ARRAY_TYPE; }\n template<> inline bool Value::is<Table>() const { return type_ == TABLE_TYPE; }\n \n-#define AS(type, var) \\\n-template<> inline typename call_traits<type>::return_type Value::as<type>() const \\\n-{ \\\n- if (!is<type>()) { \\\n- failwith(\"type error: this value is %s but %s was requested\", \\\n- typeToString(type_), #type); \\\n- } \\\n- return var; \\\n-}\n-\n-AS(bool, bool_)\n-AS(int64_t, int_)\n-AS(int, static_cast<int>(int_))\n-AS(double, double_)\n-AS(std::string, *string_)\n-AS(Time, *time_)\n-AS(Array, *array_)\n-AS(Table, *table_)\n-#undef AS\n+template<> inline typename call_traits<bool>::return_type Value::as<bool>() const\n+{\n+ if (!is<bool>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"bool\");\n+ return bool_;\n+}\n+template<> inline typename call_traits<int64_t>::return_type Value::as<int64_t>() const\n+{\n+ if (!is<int64_t>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"int64_t\");\n+ return int_;\n+}\n+template<> inline typename call_traits<int>::return_type Value::as<int>() const\n+{\n+ if (!is<int>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"int\");\n+ return static_cast<int>(int_);\n+}\n+template<> inline typename call_traits<double>::return_type Value::as<double>() const\n+{\n+ if (!is<double>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"double\");\n+ return double_;\n+}\n+template<> inline typename call_traits<std::string>::return_type Value::as<std::string>() const\n+{\n+ if (!is<std::string>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"string\");\n+ return *string_;\n+}\n+template<> inline typename call_traits<Time>::return_type Value::as<Time>() const\n+{\n+ if (!is<Time>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"time\");\n+ return *time_;\n+}\n+template<> inline typename call_traits<Array>::return_type Value::as<Array>() const\n+{\n+ if (!is<Array>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"array\");\n+ return *array_;\n+}\n+template<> inline typename call_traits<Table>::return_type Value::as<Table>() const\n+{\n+ if (!is<Table>())\n+ failwith(\"type error: this value is %s but %s was requested\", typeToString(type_), \"table\");\n+ return *table_;\n+}\n \n inline bool Value::isNumber() const\n {\n"} {"commit":"8d073b5afd75754d60314f8c64a7446b3b441848","subject":"vec: `const`-qualify `other` in `VEC_APPEND()`","message":"vec: `const`-qualify `other` in `VEC_APPEND()`\n\nWhen `VEC_CFG_COPIABLE_DATA_TYPE` is defined, `other` can be const\n","repos":"SiIky\/c-utils","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- include\/utils\/vec.h\n+++ include\/utils\/vec.h\n@@ -1,4 +1,4 @@\n-\/* vec - v2020.05.30-0\n+\/* vec - v2020.05.30-1\n *\n * A vector type inspired by\n * * Rust's `Vec` type\n@@ -236,7 +236,6 @@\n VEC_CFG_DATA_TYPE VEC_REMOVE (struct VEC_CFG_VEC * self, size_t index);\n VEC_CFG_DATA_TYPE VEC_SWAP_REMOVE (struct VEC_CFG_VEC * self, size_t index);\n VEC_CFG_DATA_TYPE * VEC_AS_MUT_SLICE (struct VEC_CFG_VEC * self);\n-bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, struct VEC_CFG_VEC * restrict other);\n bool VEC_ELEM (const struct VEC_CFG_VEC * self, VEC_CFG_DATA_TYPE element);\n bool VEC_ELEM_SORTED (const struct VEC_CFG_VEC * self, VEC_CFG_DATA_TYPE element);\n bool VEC_FILTER (struct VEC_CFG_VEC * self, bool pred (const VEC_CFG_DATA_TYPE *));\n@@ -271,6 +270,12 @@\n size_t VEC_SEARCH (const struct VEC_CFG_VEC * self, VEC_CFG_DATA_TYPE element);\n struct VEC_CFG_VEC VEC_FREE (struct VEC_CFG_VEC self);\n \n+# ifdef VEC_CFG_COPIABLE_DATA_TYPE\n+bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, const struct VEC_CFG_VEC * restrict other);\n+# else \/* VEC_CFG_COPIABLE_DATA_TYPE *\/\n+bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, struct VEC_CFG_VEC * restrict other);\n+# endif \/* VEC_CFG_COPIABLE_DATA_TYPE *\/\n+\n #ifdef VEC_CFG_IMPLEMENTATION\n \n \/*\n@@ -759,7 +764,11 @@\n *\n * @see VEC_CFG_COPIABLE_DATA_TYPE\n *\/\n-VEC_CFG_STATIC bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, struct VEC_CFG_VEC * restrict other)\n+# ifdef VEC_CFG_COPIABLE_DATA_TYPE\n+bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, const struct VEC_CFG_VEC * restrict other);\n+# else \/* VEC_CFG_COPIABLE_DATA_TYPE *\/\n+bool VEC_APPEND (struct VEC_CFG_VEC * restrict self, struct VEC_CFG_VEC * restrict other);\n+# endif \/* VEC_CFG_COPIABLE_DATA_TYPE *\/\n {\n if (self == NULL\n || other == NULL\n"} {"commit":"0fed7d1982123ba97caab4c4714806950d017e87","subject":"Fixed Enttec Playback Wing input line connection (thanks to offtools for reporting)","message":"Fixed Enttec Playback Wing input line connection (thanks to offtools for reporting)\n","repos":"bjlupo\/rcva_qlcplus,mcallegari\/qlcplus,kripton\/qlcplus,sbenejam\/qlcplus,hveld\/qlcplus,interzona\/qlcplus,joepadmiraal\/qlcplus,nedmech\/qlcplus,kripton\/qlcplus,joepadmiraal\/qlcplus,interzona\/qlcplus,interzona\/qlcplus,peternewman\/qlcplus,nedmech\/qlcplus,hveld\/qlcplus,mcallegari\/qlcplus,hveld\/qlcplus,bjlupo\/rcva_qlcplus,interzona\/qlcplus,plugz\/qlcplus,peternewman\/qlcplus,sbenejam\/qlcplus,kripton\/qlcplus,mcallegari\/qlcplus,kripton\/qlcplus,mcallegari\/qlcplus,plugz\/qlcplus,plugz\/qlcplus,hveld\/qlcplus,joepadmiraal\/qlcplus,joepadmiraal\/qlcplus,nedmech\/qlcplus,kripton\/qlcplus,mcallegari\/qlcplus,kripton\/qlcplus,bjlupo\/rcva_qlcplus,sbenejam\/qlcplus,plugz\/qlcplus,plugz\/qlcplus,kripton\/qlcplus,nedmech\/qlcplus,peternewman\/qlcplus,sbenejam\/qlcplus,sbenejam\/qlcplus,plugz\/qlcplus,peternewman\/qlcplus,mcallegari\/qlcplus,hveld\/qlcplus,bjlupo\/rcva_qlcplus,bjlupo\/rcva_qlcplus,mcallegari\/qlcplus,plugz\/qlcplus,joepadmiraal\/qlcplus,sbenejam\/qlcplus,nedmech\/qlcplus,peternewman\/qlcplus,hveld\/qlcplus,bjlupo\/rcva_qlcplus,joepadmiraal\/qlcplus,peternewman\/qlcplus,interzona\/qlcplus,interzona\/qlcplus,sbenejam\/qlcplus,nedmech\/qlcplus","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- plugins\/enttecwing\/src\/enttecwing.h\n+++ plugins\/enttecwing\/src\/enttecwing.h\n@@ -101,10 +101,6 @@\n \/** @reimp *\/\n void sendFeedBack(quint32 input, quint32 channel, uchar value);\n \n-signals:\n- \/** @reimp *\/\n- void valueChanged(quint32 input, quint32 channel, uchar value);\n-\n \/*************************************************************************\n * Configuration\n *************************************************************************\/\n"} {"commit":"88bf48a2a5def0bb40c999dd098500f8cfc6a2b3","subject":"Change ifdef around dump_fdt() to shut up static analysis","message":"Change ifdef around dump_fdt() to shut up static analysis\n\nThis is a dumb warning from a certain static analysis tool that a\nfunction has no effect when the ifdef that would make it have an effect\nisn't defined and we replace it with a no-op impl.\n\nPutting the #ifdef around the call just so I don't have to discount this\ndamn static analysis false positive every time I go and look at the\nresults.\n\nSigned-off-by: Stewart Smith <ec31ab75ddf977353c8f660f92ea8b23f64aef25@linux.ibm.com>\n","repos":"open-power\/skiboot,legoater\/skiboot,open-power\/skiboot,shenki\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,stewart-ibm\/skiboot,qemu\/skiboot,legoater\/skiboot,legoater\/skiboot,stewart-ibm\/skiboot,shenki\/skiboot,legoater\/skiboot,open-power\/skiboot,qemu\/skiboot,shenki\/skiboot,qemu\/skiboot,legoater\/skiboot,shenki\/skiboot,shenki\/skiboot,open-power\/skiboot,open-power\/skiboot","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- core\/fdt.c\n+++ core\/fdt.c\n@@ -108,8 +108,6 @@\n \t\tprlog(PR_INFO, \"name: %s [%u]\\n\", name, off);\n \t}\n }\n-#else\n-static inline void dump_fdt(void *fdt __unused) { }\n #endif\n \n static void flatten_dt_properties(void *fdt, const struct dt_node *dn)\n@@ -183,7 +181,9 @@\n \t\treturn fdt_error;\n \t}\n \n+#ifdef DEBUG_FDT\n \tdump_fdt(fdt);\n+#endif\n \treturn 0;\n }\n \n"} {"commit":"a30010bee275b6996f5bbfe3b4dbb8ab0792236a","subject":"core: make Info printfs blue","message":"core: make Info printfs blue\n\nIn order to distinguish Info and Debug, Info is now made blue.\n\nAlso, the color is now properly set at the beginning of the line instead\nof after the time.\n","repos":"dronecore\/DroneCore,dronecore\/DroneCore,dronecore\/DroneCore,dronecore\/DroneCore","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- core\/log.h\n+++ core\/log.h\n@@ -12,6 +12,7 @@\n \n #define ANSI_COLOR_RED \"\\x1b[31m\"\n #define ANSI_COLOR_YELLOW \"\\x1b[33m\"\n+#define ANSI_COLOR_BLUE \"\\x1b[34m\"\n #define ANSI_COLOR_GRAY \"\\x1b[37m\"\n #define ANSI_COLOR_RESET \"\\x1b[0m\"\n \n@@ -85,10 +86,22 @@\n UNUSED(_caller_filenumber);\n #else\n \n+ switch (_log_level) {\n+ case LogLevel::Debug:\n+ break;\n+ case LogLevel::Info:\n+ std::cout << ANSI_COLOR_BLUE;\n+ break;\n+ case LogLevel::Warn:\n+ std::cout << ANSI_COLOR_YELLOW;\n+ break;\n+ case LogLevel::Err:\n+ std::cout << ANSI_COLOR_RED;\n+ break;\n+ }\n+\n \/\/ Time output taken from:\n \/\/ https:\/\/stackoverflow.com\/questions\/16357999#answer-16358264\n-\n-\n time_t rawtime;\n time(&rawtime);\n struct tm *timeinfo = localtime(&rawtime);\n@@ -104,11 +117,9 @@\n std::cout << \"|Info ] \";\n break;\n case LogLevel::Warn:\n- std::cout << ANSI_COLOR_YELLOW;\n std::cout << \"|Warn ] \";\n break;\n case LogLevel::Err:\n- std::cout << ANSI_COLOR_RED;\n std::cout << \"|Error] \";\n break;\n }\n@@ -117,9 +128,9 @@\n std::cout << \" (\" << _caller_filename << \":\" << _caller_filenumber << \")\";\n \n switch (_log_level) {\n- case LogLevel::Info:\n- break;\n- case LogLevel::Debug:\n+ case LogLevel::Debug:\n+ break;\n+ case LogLevel::Info:\n \/\/ FALLTHROUGH\n case LogLevel::Warn:\n \/\/ FALLTHROUGH\n"} {"commit":"69c3ba62674ab61887b8b1676b2f1213c09de0eb","subject":"resizing buffer for results returned from libcouchbase","message":"resizing buffer for results returned from libcouchbase\n","repos":"pavel-paulau\/couchbase-python-client,pavel-paulau\/couchbase-python-client","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pylibcb.c\n+++ pylibcb.c\n@@ -20,20 +20,51 @@\n static PyObject *ConnectionFailure;\n static PyObject *Failure;\n \n-#define TICKET_POOL_SIZE 256\n-\n typedef struct t_ticket { \n int ticket[2];\n struct t_ticket *next;\n } ticket;\n+\n+typedef struct t_buffer {\n+ size_t size;\n+ int filled;\n+ void *contents;\n+} buffer;\n+\n+int guarantee_buffer(buffer *b, size_t size) {\n+ if (b->size < size) {\n+ size_t i = 1;\n+ --size;\n+ do {\n+ size |= size >> i++;\n+ i <<= 1;\n+ } while (i != sizeof(size_t) >> 1);\n+ ++size;\n+ \n+ if (b->contents)\n+ free(b->contents);\n+ b->contents = malloc(sizeof(char *) * size);\n+ if (!b->contents) {\n+ b->size = 0;\n+ return 0;\n+ }\n+\n+ b->size = size;\n+ } return 1; \n+}\n+\n+void destroy_buffer(buffer *b) {\n+ if (b->contents)\n+ free(b->contents);\n+}\n \n typedef struct t_pylibcb_instance {\n int callback_ticket;\n ticket *ticket_pool;\n int succeeded;\n int timed_out;\n- char returned_value[16384];\n- int returned_value_nbytes;\n+ int exception;\n+ buffer returned_value;\n libcouchbase_cas_t returned_cas;\n struct event_base *base;\n libcouchbase_t cb;\n@@ -44,6 +75,7 @@\n void pylibcb_instance_dest(void *obj, void *desc) {\n pylibcb_instance *z = (pylibcb_instance *) obj;\n \n+ destroy_buffer(&z->returned_value);\n libcouchbase_destroy(z->cb);\n event_base_free(z->base); \/* will libcouchbase do this for us? *\/\n free(z);\n@@ -95,8 +127,14 @@\n \n \/* flag the operation as a success *\/\n context->succeeded = 1;\n- memcpy(context->returned_value, bytes, nbytes);\n- context->returned_value_nbytes = nbytes;\n+\n+ if (!guarantee_buffer(&context->returned_value, nbytes)) {\n+ PyErr_SetString(OutOfMemory, \"not enough memory for results of get\");\n+ return 0;\n+ }\n+\n+ memcpy(context->returned_value.contents, bytes, nbytes);\n+ context->returned_value.filled = nbytes;\n context->returned_cas = cas;\n \n return 0;\n@@ -158,13 +196,11 @@\n if (!PyArg_ParseTuple(args, \"|ssss\", &host, &user, &passwd, &bucket))\n return 0;\n \n- pylibcb_instance *z = malloc(sizeof(pylibcb_instance));\n+ pylibcb_instance *z = calloc(1, sizeof(pylibcb_instance));\n if (!z) {\n PyErr_SetString(OutOfMemory, \"ran out of memory while allocating pylibcb instance\");\n return 0;\n }\n- z->callback_ticket = 0;\n- z->ticket_pool = 0;\n \n z->base = event_base_new();\n if (!z) {\n@@ -226,6 +262,13 @@\n } return 1;\n }\n \n+void set_context(PyObject *x) {\n+ context = PyCObject_AsVoidPtr(x);\n+ context->succeeded = 0;\n+ context->timed_out = 0;\n+ context->exception = 0;\n+}\n+\n static PyObject *set(PyObject *self, PyObject *args) {\n PyObject *cb;\n void *key, *val;\n@@ -235,8 +278,8 @@\n return 0;\n if (!pyobject_is_pylibcb_instance(cb))\n return 0;\n-\n- context = (pylibcb_instance *) PyCObject_AsVoidPtr(cb);\n+ set_context(cb);\n+\n libcouchbase_store_by_key(context->cb, hand_out_ticket(new_ticket()), LIBCOUCHBASE_SET, 0, 0, key, nkey, val, nval, 0, 0, 0);\n libcouchbase_wait(context->cb);\n \n@@ -253,8 +296,8 @@\n return 0;\n if (!pyobject_is_pylibcb_instance(cb))\n return 0;\n-\n- context = (pylibcb_instance *) PyCObject_AsVoidPtr(cb);\n+ set_context(cb);\n+\n libcouchbase_remove_by_key(context->cb, hand_out_ticket(new_ticket()), 0, 0, key, nkey, 0);\n libcouchbase_wait(context->cb);\n \n@@ -271,11 +314,8 @@\n if (!PyArg_ParseTuple(args, \"Os#|i\", &cb, &key, &_nkey, &usec))\n return 0;\n if (!pyobject_is_pylibcb_instance(cb))\n- return 0;\n- \n- context = (pylibcb_instance *) PyCObject_AsVoidPtr(cb);\n- context->succeeded = 0;\n- context->timed_out = 0;\n+ return 0; \n+ set_context(cb);\n \n int *ticket = new_ticket();\n libcouchbase_size_t nkey = _nkey;\n@@ -284,11 +324,14 @@\n create_timeout(usec, hand_out_ticket(ticket));\n libcouchbase_mget_by_key(context->cb, hand_out_ticket(ticket), 0, 0, 1, &key, &nkey, 0);\n \n- while (!context->timed_out && !context->succeeded)\n+ while (!context->timed_out && !context->succeeded && !context->exception)\n libcouchbase_wait(context->cb);\n \n if (context->succeeded)\n- return Py_BuildValue(\"s#\", context->returned_value, context->returned_value_nbytes);\n+ return Py_BuildValue(\"s#\", context->returned_value.contents, context->returned_value.filled);\n+\n+ if (context->exception) \/* exception set by callback handler *\/\n+ return 0;\n \n if (context->timed_out) \n PyErr_SetString(Timeout, \"timeout in get\");\n"} {"commit":"4a85b7e0da32932bac84c779890ed0874e538e7b","subject":"Fix __Pyx_RefNannyFinishContextNogil() macro in threadless Pythons.","message":"Fix __Pyx_RefNannyFinishContextNogil() macro in threadless Pythons.\n","repos":"da-woods\/cython,da-woods\/cython,scoder\/cython,da-woods\/cython,scoder\/cython,cython\/cython,scoder\/cython,da-woods\/cython,cython\/cython,cython\/cython,cython\/cython,scoder\/cython","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Cython\/Utility\/ModuleSetupCode.c\n+++ Cython\/Utility\/ModuleSetupCode.c\n@@ -1407,15 +1407,16 @@\n } else { \\\n __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__); \\\n }\n-#else\n- #define __Pyx_RefNannySetupContext(name, acquire_gil) \\\n- __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)\n-#endif\n #define __Pyx_RefNannyFinishContextNogil() { \\\n PyGILState_STATE __pyx_gilstate_save = PyGILState_Ensure(); \\\n __Pyx_RefNannyFinishContext(); \\\n PyGILState_Release(__pyx_gilstate_save); \\\n }\n+#else\n+ #define __Pyx_RefNannySetupContext(name, acquire_gil) \\\n+ __pyx_refnanny = __Pyx_RefNanny->SetupContext((name), __LINE__, __FILE__)\n+ #define __Pyx_RefNannyFinishContextNogil() __Pyx_RefNannyFinishContext()\n+#endif\n #define __Pyx_RefNannyFinishContext() \\\n __Pyx_RefNanny->FinishContext(&__pyx_refnanny)\n #define __Pyx_INCREF(r) __Pyx_RefNanny->INCREF(__pyx_refnanny, (PyObject *)(r), __LINE__)\n"} {"commit":"c1a7b1bed3f11e5db6c05867bf3d64403bfaf535","subject":"Another net.inclem -> org.kivy replacement","message":"Another net.inclem -> org.kivy replacement\n","repos":"inclement\/python-for-android-revamp,inclement\/python-for-android-revamp,inclement\/python-for-android-revamp,inclement\/python-for-android-revamp,inclement\/python-for-android-revamp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- pythonforandroid\/bootstrap_templates\/sdl2\/jni\/src\/start.c\n+++ pythonforandroid\/bootstrap_templates\/sdl2\/jni\/src\/start.c\n@@ -64,7 +64,7 @@\n configurable *\/\n \/* AND: P4A uses env vars...not sure what's best *\/\n LOG(\"Initialize Python for Android\");\n- env_argument = \"\/data\/data\/net.inclem.android\/files\";\n+ env_argument = \"\/data\/data\/org.kivy.android\/files\";\n LOG(env_argument);\n \/* env_argument = getenv(\"ANDROID_ARGUMENT\"); *\/\n \/* setenv(\"ANDROID_APP_PATH\", env_argument, 1); *\/\n"} {"commit":"c86619bf0ecb6d04e27a0472b559c5b447d8da07","subject":"slide-show: focus the clicked thumbnail","message":"slide-show: focus the clicked thumbnail\n\nSet the current photo when the user clicks on a thumbnail.\n","repos":"media-explorer\/media-explorer,media-explorer\/media-explorer,media-explorer\/media-explorer,media-explorer\/media-explorer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- mex\/mex-slide-show.c\n+++ mex\/mex-slide-show.c\n@@ -968,6 +968,16 @@\n return FALSE;\n }\n \n+static gboolean\n+tile_button_press_event_cb (ClutterActor *actor,\n+ ClutterEvent *event,\n+ gpointer user_data)\n+{\n+ mex_push_focus (MX_FOCUSABLE (actor));\n+\n+ return TRUE;\n+}\n+\n static void\n notify_pseudo_class (MxBin *actor)\n {\n@@ -1016,6 +1026,9 @@\n \n g_signal_connect (object, \"focus-in\", G_CALLBACK (tile_focus_in_cb),\n slideshow);\n+ clutter_actor_set_reactive (object, TRUE);\n+ g_signal_connect (object, \"button-release-event\",\n+ G_CALLBACK (tile_button_press_event_cb), slideshow);\n \n shadow = g_object_new (MEX_TYPE_SHADOW,\n \"radius-x\", 15,\n"} {"commit":"b9035b1fd7933c11e68dbbf49b530cc43bf1da65","subject":"IMA: set entry->action to UNKNOWN rather than hard coding","message":"IMA: set entry->action to UNKNOWN rather than hard coding\n\nima_parse_rule currently sets entry->action = -1 and then later tests\nif (entry->action == UNKNOWN). It is true that UNKNOWN == -1 but actually\nsetting it to UNKNOWN makes a lot more sense in case things change in the\nfuture.\n\nSigned-off-by: Eric Paris <b0b36e3cd9ea4e5739ff430a3056fabf2fdb0376@redhat.com>\nAcked-by: Mimi Zohar <f02992f7c171053741caa6b515d9896745b37477@us.ibm.com>\nSigned-off-by: James Morris <10d11de3abc355eabe955bb734f0f8e71da56e16@namei.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- security\/integrity\/ima\/ima_policy.c\n+++ security\/integrity\/ima\/ima_policy.c\n@@ -264,7 +264,7 @@\n \tab = audit_log_start(NULL, GFP_KERNEL, AUDIT_INTEGRITY_RULE);\n \n \tentry->uid = -1;\n-\tentry->action = -1;\n+\tentry->action = UNKNOWN;\n \twhile ((p = strsep(&rule, \" \")) != NULL) {\n \t\tsubstring_t args[MAX_OPT_ARGS];\n \t\tint token;\n"} {"commit":"f69693378eb3ffb8a7835e5c334d455f02c2a134","subject":"Added std_oversights.h","message":"Added std_oversights.h\n","repos":"markisaa\/mex","returncode":1,"stderr":"error: pathspec 'mex\/std_oversights.h' did not match any file(s) known to git\n","license":"isc","lang":"C","diff":"--- mex\/std_oversights.h\n+++ mex\/std_oversights.h\n@@ -0,0 +1,24 @@\n+\r\n+\/*\r\n+ *********************************OVERVIEW*************************************\r\n+ * This class provides several utility functions that Herb Sutter listed as being\r\n+ * 'oversights' in the C++11 standard. The source code is taken directly from\r\n+ * his slides.\r\n+ * http:\/\/channel9.msdn.com\/Events\/GoingNative\/GoingNative-2012\/C-11-VC-11-and-Beyond\r\n+ *\/\r\n+\r\n+namespace mex {\r\n+\r\n+template<class T>\r\n+auto cbegin(const T& t)->decltype(t.cbegin()) { return t.cbegin(); }\r\n+template<class T>\r\n+auto cend(const T& t)->decltype(t.cend()) { return t.cend(); }\r\n+\r\n+\r\n+template<typename T, typename ...Args>\r\n+std::unique_ptr<T> make_unique(Args&& ...args)\r\n+{\r\n+ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));\r\n+}\r\n+\r\n+} \/\/namespace mex\r\n"} {"commit":"da30a73abc32f4885d0a4d642ceb4c0395581d0c","subject":"Move the header include guard after the license header.","message":"Move the header include guard after the license header.\n","repos":"ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/cryptohi\/sechash.h\n+++ security\/nss\/lib\/cryptohi\/sechash.h\n@@ -1,9 +1,10 @@\n-#ifndef _HASH_H_\n-#define _HASH_H_\n \/* This Source Code Form is subject to the terms of the Mozilla Public\n * License, v. 2.0. If a copy of the MPL was not distributed with this\n * file, You can obtain one at http:\/\/mozilla.org\/MPL\/2.0\/. *\/\n \/* $Id$ *\/\n+\n+#ifndef _HASH_H_\n+#define _HASH_H_\n \n #include \"seccomon.h\"\n #include \"hasht.h\"\n"} {"commit":"25605b72a4819be878e1820d68fd00929c99cdd2","subject":"Fix for bug 222300. r=nelson,wtchang","message":"Fix for bug 222300. r=nelson,wtchang\n","repos":"ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,ekr\/nss-old,nmav\/nss,nmav\/nss,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/pk11wrap\/pk11cxt.c\n+++ security\/nss\/lib\/pk11wrap\/pk11cxt.c\n@@ -325,15 +325,15 @@\n PK11Origin origin, CK_ATTRIBUTE_TYPE operation, SECItem *key, \n \t\t\t\t\t\tSECItem *param, void *wincx)\n {\n- PK11SymKey *symKey;\n- PK11Context *context;\n+ PK11SymKey *symKey = NULL;\n+ PK11Context *context = NULL;\n \n \/* first get a slot *\/\n if (slot == NULL) {\n \tslot = PK11_GetBestSlot(type,wincx);\n \tif (slot == NULL) {\n \t PORT_SetError( SEC_ERROR_NO_MODULE );\n-\t return NULL;\n+\t goto loser;\n \t}\n } else {\n \tPK11_ReferenceSlot(slot);\n@@ -341,12 +341,17 @@\n \n \/* now import the key *\/\n symKey = PK11_ImportSymKey(slot, type, origin, operation, key, wincx);\n- if (symKey == NULL) return NULL;\n+ if (symKey == NULL) goto loser;\n \n context = PK11_CreateContextBySymKey(type, operation, symKey, param);\n \n- PK11_FreeSymKey(symKey);\n- PK11_FreeSlot(slot);\n+loser:\n+ if (symKey) {\n+ PK11_FreeSymKey(symKey);\n+ }\n+ if (slot) {\n+ PK11_FreeSlot(slot);\n+ }\n \n return context;\n }\n"} {"commit":"625d5367d4ed41512635807bd373e93b4c7ef486","subject":"353777: Klocwork Null ptr dereferences in pk11obj.c. r=nelson","message":"353777: Klocwork Null ptr dereferences in pk11obj.c. r=nelson\n","repos":"ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/pk11wrap\/pk11obj.c\n+++ security\/nss\/lib\/pk11wrap\/pk11obj.c\n@@ -1187,7 +1187,9 @@\n for (i=0; i < count; i++) {\n \tobj = PORT_New(PK11GenericObject);\n \tif ( !obj ) {\n-\t PK11_DestroyGenericObjects(firstObj);\n+\t if (firstObj) {\n+\t\tPK11_DestroyGenericObjects(firstObj);\n+\t }\n \t PORT_Free(objectIDs);\n \t return NULL;\n \t}\n@@ -1289,7 +1291,7 @@\n PK11_DestroyGenericObjects(PK11GenericObject *objects)\n {\n PK11GenericObject *nextObject;\n- PK11GenericObject *prevObject = objects->prev;\n+ PK11GenericObject *prevObject;\n \n if (objects == NULL) {\n \treturn SECSuccess;\n"} {"commit":"253e25b20433fb5f4c86205150bc2b46df36b1f1","subject":"(pstreambuf::open): Use close-on-exec pipe to detect execvp() failure.","message":"(pstreambuf::open): Use close-on-exec pipe to detect execvp() failure.\n","repos":"zmij\/pg_async,zmij\/tip-http,zmij\/tip-http,zmij\/tip-http,zmij\/tip-http","returncode":0,"stderr":"","license":"artistic-2.0","lang":"C","diff":"--- pstream.h\n+++ pstream.h\n@@ -1,4 +1,4 @@\n-\/* $Id: pstream.h,v 1.86 2004\/10\/20 14:36:35 redi Exp $\n+\/* $Id: pstream.h,v 1.87 2004\/10\/20 23:36:01 redi Exp $\n PStreams - POSIX Process I\/O for C++\n Copyright (C) 2001,2002,2003,2004 Jonathan Wakely\n \n@@ -46,13 +46,14 @@\n #include <sys\/wait.h> \/\/ for waitpid()\n #include <unistd.h> \/\/ for pipe() fork() exec() and filedes functions\n #include <signal.h> \/\/ for kill()\n+#include <fcntl.h> \/\/ for fcntl()\n #if REDI_EVISCERATE_PSTREAMS\n-#include <stdio.h> \/\/ for FILE, fdopen()\n+# include <stdio.h> \/\/ for FILE, fdopen()\n #endif\n \n \n \/\/\/ The library version.\n-#define PSTREAMS_VERSION 0x0050 \/\/ 0.5.0\n+#define PSTREAMS_VERSION 0x0051 \/\/ 0.5.1\n \n \/**\n * @namespace redi\n@@ -103,7 +104,7 @@\n typedef typename traits_type::int_type int_type;\n typedef typename traits_type::off_type off_type;\n typedef typename traits_type::pos_type pos_type;\n- \/** @deprecated use fd_type instead. *\/\n+ \/** @deprecated use pstreams::fd_type instead. *\/\n typedef fd_type fd_t;\n \n \/\/\/ Default constructor.\n@@ -942,9 +943,15 @@\n * Starts a new process by passing @a command to the shell\n * and opens pipes to the process with the specified @a mode.\n *\n+ * Will duplicate the actions of the shell in searching for an\n+ * executable file if the specified file name does not contain a slash (\/)\n+ * character.\n+ *\n * There is no way to tell whether the shell command succeeded, this\n * function will always succeed unless resource limits (such as\n * memory usage, or number of processes or open files) are exceeded.\n+ * This means is_open() will return true even if @a command cannot\n+ * be executed.\n *\n * @param command a string containing a shell command.\n * @param mode a bitwise OR of one or more of @c out, @c in, @c err.\n@@ -956,38 +963,72 @@\n basic_pstreambuf<C,T>*\n basic_pstreambuf<C,T>::open(const std::string& command, pmode mode)\n {\n+#if 0\n+ const std::string argv[] = { \"sh\", \"-c\", command };\n+ return this->open(\"sh\", std::vector<std::string>(argv, argv+3), mode);\n+#else\n basic_pstreambuf<C,T>* ret = NULL;\n \n if (!is_open())\n {\n switch(fork(mode))\n {\n- case 0 :\n- {\n- \/\/ this is the new process, exec command\n- ::execlp(\"sh\", \"sh\", \"-c\", command.c_str(), (void*)NULL);\n-\n- \/\/ can only reach this point if exec() failed\n-\n- \/\/ parent can get exit code from waitpid()\n- ::_exit(errno);\n- \/\/ using std::exit() would make static dtors run twice\n- }\n- case -1 :\n- {\n- \/\/ couldn't fork, error already handled in pstreambuf::fork()\n- break;\n- }\n- default :\n- {\n- \/\/ this is the parent process\n- \/\/ activate buffers\n- create_buffers(mode);\n- ret = this;\n- }\n+ case 0 :\n+ \/\/ this is the new process, exec command\n+ ::execlp(\"sh\", \"sh\", \"-c\", command.c_str(), (void*)NULL);\n+\n+ \/\/ can only reach this point if exec() failed\n+\n+ \/\/ parent can get exit code from waitpid()\n+ ::_exit(errno);\n+ \/\/ using std::exit() would make static dtors run twice\n+\n+ case -1 :\n+ \/\/ couldn't fork, error already handled in pstreambuf::fork()\n+ break;\n+\n+ default :\n+ \/\/ this is the parent process\n+ \/\/ activate buffers\n+ create_buffers(mode);\n+ ret = this;\n }\n }\n return ret;\n+#endif\n+ }\n+\n+ \/**\n+ * @brief Helper function to close a file descriptor.\n+ *\n+ * Inspects @a filedes and calls @b close(3) if it has a non-negative value.\n+ *\n+ * @param fd a file descriptor.\n+ * @relates basic_pstreambuf\n+ *\/\n+ inline void\n+ close_fd(pstreams::fd_type& fd)\n+ {\n+ if (fd >= 0 && ::close(fd) == 0)\n+ fd = -1;\n+ }\n+\n+ \/**\n+ * @brief Helper function to close an array of file descriptors.\n+ *\n+ * Calls @c close_fd() on each member of the array.\n+ * The length of the array is determined automatically by\n+ * template argument deduction to avoid errors.\n+ *\n+ * @param fds an array of file descriptors.\n+ * @relates basic_pstreambuf\n+ *\/\n+ template <int N>\n+ inline void\n+ close_fd_array(pstreams::fd_type (&fds)[N])\n+ {\n+ for (std::size_t i = 0; i < N; ++i)\n+ close_fd(fds[i]);\n }\n \n \/**\n@@ -998,6 +1039,10 @@\n * Will duplicate the actions of the shell in searching for an\n * executable file if the specified file name does not contain a slash (\/)\n * character.\n+ *\n+ * Iff @a file is successfully executed then is_open() will return true.\n+ * Note that exited() will return true if file cannot be executed, since\n+ * the child process will have exited.\n *\n * @param file a string containing the pathname of a program to execute.\n * @param argv a vector of argument strings passed to the new program.\n@@ -1016,78 +1061,81 @@\n \n if (!is_open())\n {\n- switch(fork(mode))\n+ \/\/ constants for read\/write ends of pipe\n+ enum { RD, WR };\n+\n+ \/\/ open another pipe and set close-on-exec\n+ fd_type ck_exec[] = { -1, -1 };\n+ if (-1 == ::pipe(ck_exec)\n+ || -1 == ::fcntl(ck_exec[RD], F_SETFD, FD_CLOEXEC)\n+ || -1 == ::fcntl(ck_exec[WR], F_SETFD, FD_CLOEXEC))\n {\n+ error_ = errno;\n+ close_fd_array(ck_exec);\n+ }\n+ else\n+ {\n+ switch(fork(mode))\n+ {\n case 0 :\n- {\n \/\/ this is the new process, exec command\n-\n- char** arg_v = new char*[argv.size()+1];\n- for (std::size_t i = 0; i < argv.size(); ++i)\n {\n- const std::string& src = argv[i];\n- char*& dest = arg_v[i];\n- dest = new char[src.size()+1];\n- dest[ src.copy(dest, src.size()) ] = '\\0';\n+ char** arg_v = new char*[argv.size()+1];\n+ for (std::size_t i = 0; i < argv.size(); ++i)\n+ {\n+ const std::string& src = argv[i];\n+ char*& dest = arg_v[i];\n+ dest = new char[src.size()+1];\n+ dest[ src.copy(dest, src.size()) ] = '\\0';\n+ }\n+ arg_v[argv.size()] = NULL;\n+\n+ ::execvp(file.c_str(), arg_v);\n+\n+ \/\/ can only reach this point if exec() failed\n+\n+ \/\/ parent can get error code from ck_exec pipe\n+ error_ = errno;\n+\n+ ::write(ck_exec[WR], &error_, sizeof(error_));\n+ ::close(ck_exec[WR]);\n+ ::close(ck_exec[RD]);\n+\n+ ::_exit(error_);\n+ \/\/ using std::exit() would make static dtors run twice\n }\n- arg_v[argv.size()] = NULL;\n-\n- ::execvp(file.c_str(), arg_v);\n-\n- \/\/ can only reach this point if exec() failed\n-\n- \/\/ parent can get exit code from waitpid()\n- ::_exit(errno);\n- \/\/ using std::exit() would make static dtors run twice\n- }\n+\n case -1 :\n- {\n \/\/ couldn't fork, error already handled in pstreambuf::fork()\n+ close_fd_array(ck_exec);\n break;\n- }\n+\n default :\n- {\n \/\/ this is the parent process\n- \/\/ activate buffers\n- create_buffers(mode);\n- ret = this;\n+\n+ \/\/ check child called exec() successfully\n+ ::close(ck_exec[WR]);\n+ switch (::read(ck_exec[RD], &error_, sizeof(error_)))\n+ {\n+ case 0:\n+ \/\/ activate buffers\n+ create_buffers(mode);\n+ ret = this;\n+ break;\n+ case -1:\n+ error_ = errno;\n+ break;\n+ default:\n+ \/\/ error_ contains error code from child\n+ \/\/ call wait() to clean up and set ppid_ to 0\n+ this->wait();\n+ break;\n+ }\n+ ::close(ck_exec[RD]);\n }\n }\n }\n return ret;\n- }\n-\n- \/**\n- * @brief Helper function to close a file descriptor.\n- *\n- * Inspects @a filedes and calls @c ::close() if it has a non-negative value.\n- *\n- * @param fd a file descriptor.\n- * @relates basic_pstreambuf\n- *\/\n- inline void\n- close_fd(pstreams::fd_type& fd)\n- {\n- if (fd >= 0 && ::close(fd) == 0)\n- fd = -1;\n- }\n-\n- \/**\n- * @brief Helper function to close an array of file descriptors.\n- *\n- * Calls @c close_fd() on each member of the array.\n- * The length of the array is determined automatically by\n- * template argument deduction to avoid errors.\n- *\n- * @param fds an array of file descriptors.\n- * @relates basic_pstreambuf\n- *\/\n- template <int N>\n- inline void\n- close_fd_array(pstreams::fd_type (&fds)[N])\n- {\n- for (std::size_t i = 0; i < N; ++i)\n- close_fd(fds[i]);\n }\n \n \/**\n"} {"commit":"7aeecb40128d8acb90178829c26dc2f4a8ef2aec","subject":"Bug 183612: fixed the bug that 'extra' may be used uninitialized. r=javi.","message":"Bug 183612: fixed the bug that 'extra' may be used uninitialized. r=javi.\n","repos":"nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,ekr\/nss-old,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old,nmav\/nss,nmav\/nss,ekr\/nss-old","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/smime\/cmsrecinfo.c\n+++ security\/nss\/lib\/smime\/cmsrecinfo.c\n@@ -437,15 +437,16 @@\n switch (certalgtag) {\n case SEC_OID_PKCS1_RSA_ENCRYPTION:\n \t\/* wrap the symkey *\/\n-\tif (usesSubjKeyID) {\n+\tif (cert) {\n+\t rv = NSS_CMSUtil_EncryptSymKey_RSA(poolp, cert, bulkkey, \n+\t &ri->ri.keyTransRecipientInfo.encKey);\n+ \t if (rv != SECSuccess)\n+\t\tbreak;\n+\t} else if (usesSubjKeyID) {\n \t rv = NSS_CMSUtil_EncryptSymKey_RSAPubKey(poolp, extra->pubKey,\n \t bulkkey, &ri->ri.keyTransRecipientInfo.encKey);\n \t if (rv != SECSuccess)\n \t\tbreak;\n-\t} else if (NSS_CMSUtil_EncryptSymKey_RSA(poolp, cert, bulkkey, \n-\t &ri->ri.keyTransRecipientInfo.encKey) != SECSuccess) {\n-\t rv = SECFailure;\n-\t break;\n \t}\n \n \trv = SECOID_SetAlgorithmID(poolp, &(ri->ri.keyTransRecipientInfo.keyEncAlg), certalgtag, NULL);\n"} {"commit":"0c8abac360c4fde2bc32077c5bb8097d9d484993","subject":"1998-07-20 Ben Elliston <bje@cygnus.com>","message":"1998-07-20 Ben Elliston <bje@cygnus.com>\n\n\t* pthread.h (_pthread_once_flag): Remove.\n\t(_pthread_once_lock): Remove.\n\t(pthread_once): Add function prototype.\n\t(pthread_once_t): Define this type.\n","repos":"nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32,nicolaichuk\/pthread-win32","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pthread.h\n+++ pthread.h\n@@ -25,7 +25,6 @@\n typedef HANDLE pthread_t;\n typedef CRITICAL_SECTION pthread_mutex_t;\n typedef DWORD pthread_key_t;\n-typedef unsigned short pthread_once_t;\n \n typedef struct {\n enum { SIGNAL, BROADCAST, NUM_EVENTS };\n@@ -43,8 +42,10 @@\n typedef struct { void * ptr; } pthread_condattr_t;\n typedef struct { void * ptr; } pthread_mutexattr_t;\n \n-\/* Initialisers. *\/\n-#define PTHREAD_ONCE_INIT 0\n+typedef struct {\n+ unsigned short flag;\n+ pthread_mutex_t lock;\n+} pthread_once_t;\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -62,6 +63,8 @@\n int pthread_equal(pthread_t t1, pthread_t t2);\n \n int pthread_join(pthread_t thread, void ** valueptr);\n+\n+int pthread_once(pthread_once_t *once_control, void (*init_routine)(void));\n \n \/* Functions for manipulating thread attribute objects. *\/\n \n"} {"commit":"dffe38d24676a4b6c5070833651f548e30e103d7","subject":"Don't delete the nickname entry until we go to delete the subject entry as well.","message":"Don't delete the nickname entry until we go to delete the subject entry as well.\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/softoken\/pcertdb.c\n+++ security\/nss\/lib\/softoken\/pcertdb.c\n@@ -2894,6 +2894,9 @@\n \t \/* if the subject had an email record, then delete it too *\/\n \t DeleteDBSMimeEntry(cert->dbhandle, entry->emailAddr);\n \t}\n+\tif ( entry->nickname ) {\n+\t DeleteDBNicknameEntry(cert->dbhandle, entry->nickname);\n+\t}\n \t\n \tDeleteDBSubjectEntry(cert->dbhandle, &cert->derSubject);\n }\n@@ -3225,7 +3228,7 @@\n \n subjectEntry = ReadDBSubjectEntry(handle, &cert->derSubject);\n \t\n- if ( subjectEntry ) {\n+ if ( subjectEntry && subjectEntry->nickname ) {\n \tdonnentry = PR_FALSE;\n \tnickname = subjectEntry->nickname;\n }\n@@ -3907,13 +3910,6 @@\n \tret = SECFailure;\n }\n \n- if ( cert->nickname ) {\n-\trv = DeleteDBNicknameEntry(cert->dbhandle, cert->nickname);\n-\tif ( rv != SECSuccess ) {\n-\t ret = SECFailure;\n-\t}\n- }\n- \n rv = RemovePermSubjectNode(cert);\n \n \n"} {"commit":"edc7faaed1db660cdbecd1473ee54041ab08af16","subject":"Swift naming StorageVersionString (#560)","message":"Swift naming StorageVersionString (#560)\n\n","repos":"firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Firebase\/Storage\/Public\/FIRStorage.h\n+++ Firebase\/Storage\/Public\/FIRStorage.h\n@@ -24,7 +24,8 @@\n NS_ASSUME_NONNULL_BEGIN\n \n \/** Project version string for FirebaseStorage. *\/\n-FOUNDATION_EXPORT const unsigned char *const FIRStorageVersionString;\n+FOUNDATION_EXPORT const unsigned char *const FIRStorageVersionString\n+ NS_SWIFT_NAME(StorageVersionString);\n \n \/**\n * FirebaseStorage is a service that supports uploading and downloading binary objects,\n"} {"commit":"bac0be47a6821c2e9fde1e051a1a529153b44175","subject":"1998-07-18 Ben Elliston <bje@cygnus.com>","message":"1998-07-18 Ben Elliston <bje@cygnus.com>\n\n\t* pthread.h (pthread_cond_t): Fix for u_int. Do not assume that\n\tthe mutex contained withing the pthread_cond_t structure will be a\n\tcritical section. Use our new POSIX type!\n","repos":"vancegroup-mirrors\/pthreads-win32,nicolaichuk\/pthread-win32,CaptTofu\/Pthreads-win32,vancegroup-mirrors\/pthreads-win32,nicolaichuk\/pthread-win32,membase\/pthreads-win,grumpycoders\/pthreads-win32,markpizz\/pthreads4w-code,grumpycoders\/pthreads-win32,VFR-maniac\/pthreads-win32,vancegroup-mirrors\/pthreads-win32,grumpycoders\/pthreads-win32,nicolaichuk\/pthread-win32,markpizz\/pthreads4w-code,vancegroup-mirrors\/pthreads-win32,markpizz\/pthreads4w-code,markpizz\/pthreads4w-code,nicolaichuk\/pthread-win32,grumpycoders\/pthreads-win32","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- pthread.h\n+++ pthread.h\n@@ -32,10 +32,10 @@\n HANDLE events[NUM_EVENTS];\n \n \/* Count of the number of waiters. *\/\n- u_int waiters_count;\n+ unsigned waiters_count;\n \n \/* Serialize access to waiters_count_. *\/\n- CRITICAL_SECTION waiters_count_lock;\n+ pthread_mutex_t waiters_count_lock;\n } pthread_cond_t;\n \n typedef struct { void * ptr; } pthread_condattr_t;\n"} {"commit":"860ba4ca7910350e11fff00c1c4033bd4afb14a2","subject":"[Bug 334277] double free in [@ sftk_FreeAttribute - sftk_DeleteAttributeType]. r=relyea","message":"[Bug 334277] double free in [@ sftk_FreeAttribute - sftk_DeleteAttributeType]. r=relyea\n","repos":"thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss,thespooler\/nss","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- security\/nss\/lib\/softoken\/pkcs11u.c\n+++ security\/nss\/lib\/softoken\/pkcs11u.c\n@@ -1517,7 +1517,6 @@\n \t\t\t\tsessObject->head, sessObject->hashSize);\n }\n PZ_Unlock(sessObject->attributeLock);\n- sftk_FreeAttribute(attribute);\n }\n \n \/*\n"} {"commit":"a19582653abc51574a7c0705d323d6630399e63c","subject":"nginx.c","message":"nginx.c\n","repos":"chronolaw\/annotated_nginx,chronolaw\/annotated_nginx,chronolaw\/annotated_nginx,chronolaw\/annotated_nginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- nginx\/src\/core\/nginx.c\n+++ nginx\/src\/core\/nginx.c\n@@ -193,13 +193,13 @@\n \/\/ \u6a21\u5757\u8ba1\u6570\u5668\uff0c\u58f0\u660e\u5728ngx_conf_file.h\n ngx_uint_t ngx_max_module;\n \n-\/\/ \u89e3\u6790\u547d\u4ee4\u884c\u7684\u6807\u5fd7\u53d8\u91cf\n+\/\/ \u89e3\u6790\u547d\u4ee4\u884c\u7684\u6807\u5fd7\u53d8\u91cf,ngx_get_options()\u8bbe\u7f6e\n \n static ngx_uint_t ngx_show_help; \/\/ \u663e\u793a\u5e2e\u52a9\u4fe1\u606f\n static ngx_uint_t ngx_show_version; \/\/ \u663e\u793a\u7248\u672c\u4fe1\u606f\n static ngx_uint_t ngx_show_configure; \/\/ \u663e\u793a\u7f16\u8bd1\u914d\u7f6e\u4fe1\u606f\n \n-\/\/ \u542f\u52a8\u65f6\u7684\u53c2\u6570\n+\/\/ \u542f\u52a8\u65f6\u7684\u53c2\u6570,ngx_get_options()\u8bbe\u7f6e\n \n static u_char *ngx_prefix; \/\/ -p\u53c2\u6570\uff0c\u5de5\u4f5c\u8def\u5f84\n static u_char *ngx_conf_file; \/\/ -c\u53c2\u6570\uff0c\u914d\u7f6e\u6587\u4ef6\n@@ -225,7 +225,7 @@\n return 1;\n }\n \n- \/\/ \u89e3\u6790\u547d\u4ee4\u884c\u53c2\u6570\n+ \/\/ \u89e3\u6790\u547d\u4ee4\u884c\u53c2\u6570, \u672c\u6587\u4ef6\u5185\u67e5\u627engx_get_options\n if (ngx_get_options(argc, argv) != NGX_OK) {\n return 1;\n }\n"} {"commit":"e660bcd78ea8b813d6bf1b54efd4dc0dbff0d8c4","subject":"Verify result of ngx_array_push","message":"Verify result of ngx_array_push\n","repos":"yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,guanhui07\/nginx-eval-module,guanhui07\/nginx-eval-module,yeahdongcn\/SEnginx,guanhui07\/nginx-eval-module,vkholodkov\/nginx-eval-module,openresty\/nginx-eval-module,yeahdongcn\/SEnginx,openresty\/nginx-eval-module,openresty\/nginx-eval-module,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx,yeahdongcn\/SEnginx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ngx_http_eval_module.c\n+++ ngx_http_eval_module.c\n@@ -479,6 +479,9 @@\n }\n \n variable = ngx_array_push(ecf->variables);\n+ if(variable == NULL) {\n+ return NGX_CONF_ERROR;\n+ }\n \n value[i].len--;\n value[i].data++;\n"} {"commit":"fa9550d690b26016e7786468a0611f253a7220cf","subject":"modify","message":"modify\n","repos":"luoxiaojun1992\/nginx_http_gray_module,luoxiaojun1992\/nginx_http_gray_module,luoxiaojun1992\/nginx_http_gray_module","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ngx_http_gray_module.c\n+++ ngx_http_gray_module.c\n@@ -206,6 +206,8 @@\n isGray = 1;\n }\n freeReplyObject(reply);\n+ } else {\n+ isGray = 1;\n }\n \t\t\t}\n \n@@ -225,6 +227,11 @@\n freeReplyObject(reply);\n }\n \t\t\t}\n+\n+ \/\/Check If H5\n+ if (!isApp) {\n+ isGray = 1;\n+ }\n }\n part = part->next;\n } while ( part != NULL );\n"} {"commit":"0f093fb75313dd3b95f784515fa27b0b12cf64f6","subject":"Undeprecate +[FIRFirestore enableLogging:] (#2773)","message":"Undeprecate +[FIRFirestore enableLogging:] (#2773)\n\n","repos":"firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk,firebase\/firebase-ios-sdk","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Firestore\/Source\/Public\/FIRFirestore.h\n+++ Firestore\/Source\/Public\/FIRFirestore.h\n@@ -137,9 +137,7 @@\n #pragma mark - Logging\n \n \/** Enables or disables logging from the Firestore client. *\/\n-+ (void)enableLogging:(BOOL)logging\n- DEPRECATED_MSG_ATTRIBUTE(\"Use FirebaseConfiguration.shared.setLoggerLevel(.debug) to enable \"\n- \"logging.\");\n++ (void)enableLogging:(BOOL)logging;\n \n #pragma mark - Network\n \n"} {"commit":"acac38afb2c97e21bf1b0aa3262081d027ea3668","subject":"Add C99 compiliant iso646.h header","message":"Add C99 compiliant iso646.h header\n","repos":"mirror\/tinycc,mirror\/tinycc,mingodad\/tinycc,mingodad\/tinycc,mingodad\/tinycc,mirror\/tinycc,mingodad\/tinycc,mirror\/tinycc","returncode":1,"stderr":"error: pathspec 'win32\/include\/iso646.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- win32\/include\/iso646.h\n+++ win32\/include\/iso646.h\n@@ -0,0 +1,36 @@\n+\/**\n+ * This file has no copyright assigned and is placed in the Public Domain.\n+ * This file is part of the TinyCC package.\n+ * No warranty is given; refer to the file DISCLAIMER within this package.\n+ *\/\n+\n+\/*\n+ * ISO C Standard: 7.9 Alternative spellings <iso646.h>\n+ *\/\n+\n+#ifndef _ISO646_H_\n+#define _ISO646_H_\n+\n+#define and &&\n+#define and_eq &=\n+#define bitand &\n+#define bitor |\n+#define compl ~\n+#define not !\n+#define not_eq !=\n+#define or ||\n+#define or_eq |=\n+#define xor ^\n+#define xor_eq ^=\n+\n+#endif \/* _ISO646_H_ *\/\n+\n+\n+\n+\n+\n+\n+\n+\n+\n+\n"} {"commit":"b2599f146293a8bc7b052f93346d85a953ee0edc","subject":"fts: Don't crash if application\/octet-stream attachment doesn't have filename.","message":"fts: Don't crash if application\/octet-stream attachment doesn't have filename.\n","repos":"LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/plugins\/fts\/fts-parser-script.c\n+++ src\/plugins\/fts\/fts-parser-script.c\n@@ -123,7 +123,10 @@\n \t\t\treturn FALSE;\n \t}\n \n-\tif (strcmp(*content_type, \"application\/octet-stream\") == 0) {\n+\tif (strcmp(*content_type, \"application\/octet-stream\") != 0) {\n+\t\tif (extension == NULL)\n+\t\t\treturn FALSE;\n+\n \t\tarray_foreach(&suser->content, content) {\n \t\t\tif (content->extensions != NULL &&\n \t\t\t str_array_icase_find(content->extensions, extension)) {\n"} {"commit":"17220ee082d47eca50011dc8cd2813acfc362dbd","subject":"testmod_length.c print result after test execution correction","message":"testmod_length.c print result after test execution correction\n","repos":"mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra,ElektraInitiative\/libelektra,ElektraInitiative\/libelektra,mpranj\/libelektra","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/plugins\/length\/testmod_length.c\n+++ src\/plugins\/length\/testmod_length.c\n@@ -20,10 +20,9 @@\n \n \tinit (argc, argv);\n \n+\ttest_length ();\n \n \tprint_result (\"testmod_length\");\n \n-\ttest_length ();\n-\n \treturn nbError;\n }\n"} {"commit":"56c32a4a3afd6336f59eb63db561f13dc95de329","subject":"* subversion\/svn\/main.c (main): Future-proofing: add an explicit break in a case statement, even though it currently just fall through to the default 'break'.","message":"* subversion\/svn\/main.c\n (main): Future-proofing: add an explicit break in a case statement, even\n though it currently just fall through to the default 'break'.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@984212 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/svn\/main.c\n+++ subversion\/svn\/main.c\n@@ -1787,6 +1787,7 @@\n break;\n case opt_use_git_diff_format:\n opt_state.use_git_diff_format = TRUE;\n+ break;\n default:\n \/* Hmmm. Perhaps this would be a good place to squirrel away\n opts that commands like svn diff might need. Hmmm indeed. *\/\n"} {"commit":"0ee56fa58ec6819c603eef0fdc114e1e9e1494b9","subject":"Fehler","message":"Fehler\n\ngit-svn-id: a7f2a8f7432d210e972fb03898013d213e2b549b@817 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- seqan\/projects\/library\/seqan\/vlmm.h\n+++ seqan\/projects\/library\/seqan\/vlmm.h\n@@ -929,7 +929,8 @@\n \t\t\r\n \t\tchild = addIncompleteVertex(target);\r\n \t\t\/\/ check if iterator\r\n-\t\tstd::cout << \"Node:\"<<child<<\" \"<<value(it) << \" = \" << repLength(it)<< \" \" << representative(it) << \" toFather:\"<<parentEdgeLabel(it)<<\" hits: \"<<length(getOccurences(it))<<std::endl;\r\n+\t\t\/\/cout << \"Node:\"<<child<<\" \"<<value(it) << \" = \" << repLength(it)<< \" \" << representative(it) << \" toFather:\"<<parentEdgeLabel(it)<<\" hits: \"<<length(getOccurences(it))<<std::endl;\r\n+\t\t\/\/DAVIDDEBUGcout << \" \" << representative(it) <<endl; \r\n \t\t\r\n \t\tsetFather(target,father,child);\r\n \t\tunsigned diff = 1;\r\n@@ -1432,6 +1433,9 @@\n return false;\r\n }\r\n \r\n+\r\n+\r\n+\r\n template<typename TCargo,typename TAlphabet ,typename TVertexDescriptor>\r\n inline bool\r\n pruneNode(Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < PST > > > > &vlmm,\r\n@@ -2084,6 +2088,12 @@\n \tstd::cout << \"READY!\" <<std::endl;\r\n }\r\n \r\n+\/*******\r\n+\r\n+Training\r\n+\r\n+********\/\r\n+\r\n \/**\r\n * Likelihood Estimation : works such that the reverse suffix links are walked starting from the root\r\n * whenever a node is not marked(or a leaf) is reached the walking down is finished and the deepest possible \r\n@@ -2129,10 +2139,12 @@\n \t\t\tresult += log(getProbabilityForLongestContext(vlmm,windowEnd));\r\n \tgoNext(windowEnd);\r\n \tbest = result;\r\n+\tcout <<\"window score:\" <<result<<endl;\r\n \tfor(;!atEnd(windowEnd);goNext(windowEnd),goNext(windowStart))\r\n \t{\r\n \t\tresult += -log(getProbabilityForLongestContext(vlmm,windowStart));\r\n \t\tresult += log(getProbabilityForLongestContext(vlmm,windowEnd));\r\n+\t\tcout <<\"window score:\" <<result<<endl;\r\n \t\t\/\/cout <<\" prob for letter: \"<<value(it)<< \" is: \"<<getProbabilityForLongestContext(vlmm,it)<<endl;\r\n \t\tif(result > best)\r\n \t\t\tbest = result;\r\n@@ -2177,16 +2189,42 @@\n save the graph\r\n **************\/\r\n \r\n-template<typename TFile, typename TAlphabet, typename TCargo >\r\n+template<typename TFile, typename TCargo >\r\n inline void\r\n-writeHead(Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < ContextTree > > > > &vlmm,\r\n+writeHead(Graph<Automaton<AminoAcid, TCargo , WordGraph < VLMM < ContextTree > > > > &vlmm,\r\n \t TFile & target)\r\n {\t\r\n-\t\t_streamWrite(target,\"VLMM\\tContextTree\\tDna\\t6\");\r\n-\t\t\r\n-}\r\n-\r\n-\r\n+\t\t_streamWrite(target,\"VLMM\\tContextTree\\tAminoAcid\\t\");\r\n+\t\t_streamPutInt(target,numVertices(vlmm));\r\n+}\r\n+\r\n+template<typename TFile, typename TCargo >\r\n+inline void\r\n+writeHead(Graph<Automaton<Dna, TCargo , WordGraph < VLMM < ContextTree > > > > &vlmm,\r\n+\t TFile & target)\r\n+{\t\r\n+\t\t_streamWrite(target,\"VLMM\\tContextTree\\tDna\\t\");\r\n+\t\t_streamPutInt(target,numVertices(vlmm));\r\n+}\r\n+\r\n+template<typename TFile, typename TCargo >\r\n+inline void\r\n+writeHead(Graph<Automaton<AminoAcid, TCargo , WordGraph < VLMM < BioPST > > > > &vlmm,\r\n+\t TFile & target)\r\n+{\t\r\n+\t_streamWrite(target,\"VLMM\\tBio-PST\\tAminoAcid\\t\");\r\n+\t_streamPutInt(target,numVertices(vlmm));\r\n+}\r\n+\r\n+template<typename TFile, typename TCargo >\r\n+inline void\r\n+writeHead(Graph<Automaton<Dna, TCargo , WordGraph < VLMM < BioPST > > > > &vlmm,\r\n+\t TFile & target)\r\n+{\t\r\n+\t_streamWrite(target,\"VLMM\\tBio-PST\\tDna\\t\");\r\n+\t_streamPutInt(target,numVertices(vlmm));\r\n+\t\t\r\n+}\r\n \r\n template <typename TStream>\r\n inline void\r\n@@ -2279,7 +2317,7 @@\n *\/\r\n \r\n \r\n-\r\n+\/\/ save function where a filehandle has to be created before \r\n template<typename TFile, typename TAlphabet, typename TCargo, typename TVLMMSpec>\r\n inline void\r\n save(Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm,\r\n@@ -2301,6 +2339,34 @@\n \t}\r\n \r\n \r\n+\r\n+}\r\n+\/\/ save function where a filehandle is created for the filename\r\n+template<typename TFile, typename TAlphabet, typename TCargo, typename TVLMMSpec>\r\n+inline void\r\n+save(Graph<Automaton<TAlphabet, TCargo , WordGraph < VLMM < TVLMMSpec > > > > &vlmm,\r\n+\t String<char> & filename)\r\n+{\r\n+\r\n+SEQAN_CHECKPOINT\r\n+\ttypedef Graph<Automaton<TAlphabet, TCargo, WordGraph<VLMM<TVLMMSpec> > > > TGraph;\r\n+\ttypedef typename VertexDescriptor<TGraph>::Type TVertexDescriptor;\r\n+\ttypedef typename EdgeDescriptor<TGraph>::Type TEdgeDescriptor;\r\n+\ttypedef typename EdgeType<TGraph>::Type TEdge;\r\n+\ttypedef typename Iterator<String<AutomatonEdgeArray<TEdge, TAlphabet> > >::Type TIterConst;\r\n+\tfstream target;\r\n+\ttarget.open(toCString(filename), ios_base::out | ios_base::trunc);\r\n+\tif (!target.is_open()) {\r\n+\t\t\tcerr << \"Import of sequence \" << filename << \" failed.\" << endl;\r\n+\t\t\texit(1);\r\n+\t}\r\n+\twriteHead(vlmm,target);\r\n+\tfor(TIterConst it = begin(vlmm.data_vertex);!atEnd(it);goNext(it)) {\r\n+\t\tif (!idInUse(vlmm.data_id_managerV, position(it))) continue;\r\n+\t\tTVertexDescriptor dummy = position(it); \r\n+\t\tsaveNode(vlmm,dummy,target);\r\n+\t}\r\n+\ttarget.close();\r\n \r\n }\r\n \/*************\r\n"} {"commit":"433f9e69562b5a17bbb6bc045da27fb620e52027","subject":"Followup to r25017: change '--make-parents' to '--parents' in help string for 'mkdir'.","message":"Followup to r25017: change '--make-parents' to '--parents'\nin help string for 'mkdir'.\n\n* subversion\/svn\/main.c\n (svn_cl__cmd_table): Replace --make-parents with --parents\n in help string for 'mkdir'.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/svn\/main.c\n+++ subversion\/svn\/main.c\n@@ -562,7 +562,7 @@\n \" an immediate commit.\\n\"\n \"\\n\"\n \" In both cases, all the intermediate directories must already exist,\\n\"\n- \" unless the --make-parents option is given.\\n\"),\n+ \" unless the --parents option is given.\\n\"),\n {'q', svn_cl__parents_opt,\n SVN_CL__LOG_MSG_OPTIONS, SVN_CL__AUTH_OPTIONS, svn_cl__config_dir_opt} },\n \n"} {"commit":"64b81fd4d316ff8e0390c843bdff236ed4151147","subject":"Close all EPs upon reset","message":"Close all EPs upon reset\n","repos":"hathach\/tinyusb,hathach\/tinyusb,hathach\/tinyusb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/portable\/sunxi\/dcd_sunxi_musb.c\n+++ src\/portable\/sunxi\/dcd_sunxi_musb.c\n@@ -839,6 +839,7 @@\n USBC_ForceIdToHigh(); \/\/ Force device mode\n USBC_ForceVbusValidToHigh();\n USBC_SelectBus(USBC_IO_TYPE_PIO, 0, 0);\n+ dcd_edpt_close_all(rhport);\n \n #if TUD_OPT_HIGH_SPEED\n USBC_REG_set_bit_b(USBC_BP_POWER_D_HIGH_SPEED_EN, USBC_REG_PCTL(USBC0_BASE));\n"} {"commit":"df6e852ed4bb6197886b7952206d233b5fa68e03","subject":"Follow-up to r34967:","message":"Follow-up to r34967:\n\n* subversion\/svn\/main.c\n (main): Delete unneeded lines.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/svn\/main.c\n+++ subversion\/svn\/main.c\n@@ -1453,8 +1453,6 @@\n return svn_cmdline_handle_exit_error(err, pool, \"svn: \");\n }\n config_option = apr_pcalloc(pool, sizeof(config_option_t));\n- config_option->option = apr_pcalloc(pool, len);\n- config_option->value = apr_pcalloc(pool, len);\n e = 0;\n for (i = 0; i < len; i++)\n {\n"} {"commit":"ce9f802b4017824856a33e93757c5ee3c176fba5","subject":"grt: remove class var inits from the class definition","message":"grt: remove class var inits from the class definition\n","repos":"The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD,QuantamHD\/OpenROAD,QuantamHD\/OpenROAD,The-OpenROAD-Project\/OpenROAD","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/FastRoute\/include\/fastroute\/GlobalRouter.h\n+++ src\/FastRoute\/include\/fastroute\/GlobalRouter.h\n@@ -303,15 +303,15 @@\n ord::OpenRoad* _openroad;\n utl::Logger *_logger;\n \/\/ Objects variables\n- FastRouteCore* _fastRoute = nullptr;\n- odb::Point* _gridOrigin = nullptr;\n+ FastRouteCore* _fastRoute;\n+ odb::Point* _gridOrigin;\n NetRouteMap _routes;\n \n std::vector<Net>* _nets;\n std::map<odb::dbNet*, Net*> _db_net_map;\n- Grid* _grid = nullptr;\n- std::vector<RoutingLayer>* _routingLayers = nullptr;\n- std::vector<RoutingTracks>* _allRoutingTracks = nullptr;\n+ Grid* _grid;\n+ std::vector<RoutingLayer>* _routingLayers;\n+ std::vector<RoutingTracks>* _allRoutingTracks;\n \n \/\/ Flow variables\n std::string _congestFile;\n@@ -362,7 +362,7 @@\n \/\/ db variables\n sta::dbSta* _sta;\n int selectedMetal = 3;\n- odb::dbDatabase* _db = nullptr;\n+ odb::dbDatabase* _db;\n odb::dbBlock* _block;\n \n std::set<odb::dbNet*> _dirtyNets;\n"} {"commit":"0262f89bb04431a3842f3f82c19cd0fc7e6a51e7","subject":"Allow overriding CLKPIN\/DATAPIN","message":"Allow overriding CLKPIN\/DATAPIN\n","repos":"Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED,Aircoookie\/WLED","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- wled00\/NpbWrapper.h\n+++ wled00\/NpbWrapper.h\n@@ -40,8 +40,12 @@\n \/\/END CONFIGURATION\n \n #if defined(USE_APA102) || defined(USE_WS2801) || defined(USE_LPD8806) || defined(USE_P9813)\n- #define CLKPIN 0\n- #define DATAPIN 2\n+ #ifndef CLKPIN\n+ #define CLKPIN 0\n+ #endif\n+ #ifndef DATAPIN\n+ #define DATAPIN 2\n+ #endif\n #if BTNPIN == CLKPIN || BTNPIN == DATAPIN\n #undef BTNPIN \/\/ Deactivate button pin if it conflicts with one of the APA102 pins.\n #endif\n"} {"commit":"3336938418dee10e3cd83e53e6dc72875253ebce","subject":"Always toggle source mode except for source code views","message":"Always toggle source mode except for source code views\n","repos":"OoberMick\/Midori,OoberMick\/Midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -2661,7 +2661,10 @@\n if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type))\n {\n #if WEBKIT_CHECK_VERSION (1, 1, 14)\n- gboolean view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view));\n+ gboolean view_source = FALSE;\n+ \/* Dedicated source code views are always pseudo-blank pages *\/\n+ if (midori_view_is_blank (view))\n+ view_source = webkit_web_view_get_view_source_mode (WEBKIT_WEB_VIEW (web_view));\n \n \/* Render raw XML, including news feeds, as source *\/\n if (!view_source && (!strcmp (mime_type, \"application\/xml\")\n"} {"commit":"fde2833ebba0ad678c9109a16dd3e58789c1008f","subject":"Adjusting indentation of the long string added in the last commit.","message":"Adjusting indentation of the long string added in the last commit.\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -623,10 +623,10 @@\n gchar* slots = g_strjoinv (\" , \", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());\n gchar* title = g_strdup_printf (\"Error granting trust: %s\", error->message);\n midori_tab_stop_loading (MIDORI_TAB (view));\n- midori_view_display_error (view, NULL, NULL, NULL, title, slots, _(\"Please look at our \\\n-<a href=\\\"http:\/\/midori-browser.org\/faqs\/\\\" target=\\\"_blank\\\">FAQ<\/a>, \\\n-section \\\"<a href=\\\"http:\/\/midori-browser.org\/faqs\/#security_features\\\" target=\\\"_blank\\\">Security Features<\/a>\\\", \\\n-to understand how you can solve this problem.\"),\n+ midori_view_display_error (view, NULL, NULL, NULL, title, slots, _(\"Please look at our \"\n+ \"<a href=\\\"http:\/\/midori-browser.org\/faqs\/\\\" target=\\\"_blank\\\">FAQ<\/a>, section \"\n+ \"\\\"<a href=\\\"http:\/\/midori-browser.org\/faqs\/#security_features\\\" target=\\\"_blank\\\">\"\n+ \"Security Features<\/a>\\\", to understand how you can solve this problem.\"),\n _(\"Trust this website\"), NULL);\n g_free (title);\n g_free (slots);\n"} {"commit":"6b38ed85cfb6cb1e4681e0400741e074cc88d732","subject":"Check if typed link number exists and check result","message":"Check if typed link number exists and check result\n","repos":"OoberMick\/Midori,OoberMick\/Midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -1861,10 +1861,11 @@\n \"if (return_key || typeof links[i * 10] == 'undefined') {\"\n \" for (var j = 0; j < links.length; j++)\"\n \" links[j].style.display = 'none !important';\"\n- \" links[i].parentNode.href; }\",\n+ \" if (typeof links[i] != 'undefined')\"\n+ \" links[i].parentNode.href; }\",\n view->find_links, event->keyval == GDK_Return);\n result = sokoke_js_script_eval (js_context, script, NULL);\n- if (strcmp (result, \"undefined\"))\n+ if (result && strstr (result, \":\/\/\"))\n {\n view->find_links = -1;\n if (MIDORI_MOD_NEW_TAB (event->state))\n"} {"commit":"07c9be03b2c31136548d1a90ffbe1a243f2dbe07","subject":"Implemented a menu when selecting a row to copy message to clipboard.","message":"Implemented a menu when selecting a row to copy message to clipboard.\n\nSigned-off-by: Jonny Lamb <3d1fb3642aaab2ff70e3392a5ab916bf99eed6a3@collabora.co.uk>\n","repos":"GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets,Distrotech\/telepathy-account-widgets,GNOME\/telepathy-account-widgets","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/empathy-debug-dialog.c\n+++ src\/empathy-debug-dialog.c\n@@ -406,6 +406,98 @@\n gtk_list_store_clear (priv->store);\n }\n \n+static void\n+debug_dialog_menu_copy_activate_cb (GtkMenuItem *menu_item,\n+ EmpathyDebugDialog *debug_dialog)\n+{\n+ EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);\n+ GtkTreePath *path;\n+ GtkTreeViewColumn *focus_column;\n+ GtkTreeIter iter;\n+ gchar *message;\n+ GtkClipboard *clipboard;\n+\n+ gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->view),\n+ &path, &focus_column);\n+\n+ if (path == NULL)\n+ {\n+ DEBUG (\"No row is in focus\");\n+ return;\n+ }\n+\n+ gtk_tree_model_get_iter (priv->store_filter, &iter, path);\n+\n+ gtk_tree_model_get (priv->store_filter, &iter,\n+ COL_DEBUG_MESSAGE, &message,\n+ -1);\n+\n+ if (EMP_STR_EMPTY (message))\n+ {\n+ DEBUG (\"Log message is empty\");\n+ return;\n+ }\n+\n+ clipboard = gtk_clipboard_get_for_display (\n+ gtk_widget_get_display (GTK_WIDGET (menu_item)),\n+ GDK_SELECTION_CLIPBOARD);\n+\n+ gtk_clipboard_set_text (clipboard, message, -1);\n+\n+ g_free (message);\n+}\n+\n+typedef struct\n+{\n+ EmpathyDebugDialog *debug_dialog;\n+ guint button;\n+ guint32 time;\n+} MenuPopupData;\n+\n+static gboolean\n+debug_dialog_show_menu (gpointer user_data)\n+{\n+ MenuPopupData *data = (MenuPopupData *) user_data;\n+ GtkWidget *menu, *item;\n+ GtkMenuShell *shell;\n+\n+ menu = gtk_menu_new ();\n+ shell = GTK_MENU_SHELL (menu);\n+\n+ item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL);\n+\n+ g_signal_connect (item, \"activate\",\n+ G_CALLBACK (debug_dialog_menu_copy_activate_cb), data->debug_dialog);\n+\n+ gtk_menu_shell_append (shell, item);\n+ gtk_widget_show (item);\n+\n+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,\n+ data->button, data->time);\n+\n+ g_slice_free (MenuPopupData, user_data);\n+\n+ return FALSE;\n+}\n+\n+static gboolean\n+debug_dialog_button_press_event_cb (GtkTreeView *view,\n+ GdkEventButton *event,\n+ gpointer user_data)\n+{\n+ if (event->button == 3)\n+ {\n+ MenuPopupData *data;\n+ data = g_slice_new0 (MenuPopupData);\n+ data->debug_dialog = user_data;\n+ data->button = event->button;\n+ data->time = event->time;\n+ g_idle_add (debug_dialog_show_menu, data);\n+ }\n+\n+ return FALSE;\n+}\n+\n static GObject *\n debug_dialog_constructor (GType type,\n guint n_construct_params,\n@@ -562,6 +654,9 @@\n priv->view = gtk_tree_view_new ();\n gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (priv->view), TRUE);\n \n+ g_signal_connect (priv->view, \"button-press-event\",\n+ G_CALLBACK (debug_dialog_button_press_event_cb), object);\n+\n renderer = gtk_cell_renderer_text_new ();\n g_object_set (renderer, \"yalign\", 0, NULL);\n \n"} {"commit":"be32c5c2ad6458ffcdcd07123531daca0983848b","subject":"Disable thumbnails in tab label tooltips","message":"Disable thumbnails in tab label tooltips\n\nFor now they aren't acceptable because they effectively slow\nswitching tabs with the mouse wheel down significantly.\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -80,7 +80,7 @@\n \n GtkWidget* menu_item;\n GtkWidget* tab_label;\n- GtkWidget* tooltip_image;\n+ \/* GtkWidget* tooltip_image; *\/\n GtkWidget* tab_icon;\n GtkWidget* tab_title;\n GtkWidget* tab_close;\n@@ -554,7 +554,7 @@\n soup_uri_free (uri);\n }\n gtk_label_set_text (GTK_LABEL (view->tab_title), title);\n- #if !GTK_CHECK_VERSION (2, 12, 0)\n+ #if 1\n gtk_widget_set_tooltip_text (view->tab_title, title);\n #endif\n }\n@@ -2557,7 +2557,7 @@\n }\n }\n \n-#if GTK_CHECK_VERSION (2, 12, 0)\n+#if 0\n static gboolean\n midori_view_tab_label_query_tooltip_cb (GtkWidget* tab_label,\n gint x,\n@@ -2650,7 +2650,7 @@\n G_CALLBACK (midori_view_tab_close_clicked), view);\n \n view->tab_label = event_box;\n- #if GTK_CHECK_VERSION (2, 12, 0)\n+ #if 0\n gtk_widget_set_has_tooltip (view->tab_label, TRUE);\n g_signal_connect (view->tab_label, \"query-tooltip\",\n G_CALLBACK (midori_view_tab_label_query_tooltip_cb), view);\n"} {"commit":"d40a2bae7cb866c0e76c55423de7e8ee85d2f264","subject":"Mouse button handling with WebKit2 except URL paste","message":"Mouse button handling with WebKit2 except URL paste\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -1713,7 +1713,10 @@\n {\n #ifdef HAVE_WEBKIT2\n if (!webkit_hit_test_result_context_is_link (hit_test_result))\n+ {\n+ katze_assign (view->link_uri, NULL);\n return;\n+ }\n const gchar* link_uri = webkit_hit_test_result_get_link_uri (hit_test_result);\n #endif\n \n@@ -1783,7 +1786,6 @@\n GdkEventButton* event,\n MidoriView* view)\n {\n-#ifndef HAVE_WEBKIT2\n GtkClipboard* clipboard;\n gchar* uri;\n gchar* new_uri;\n@@ -1842,13 +1844,10 @@\n if (midori_settings_get_middle_click_opens_selection (MIDORI_SETTINGS (view->settings)))\n #endif\n {\n- gboolean is_editable;\n- WebKitHitTestResult* result;\n- WebKitHitTestResultContext context;\n-\n- result = webkit_web_view_get_hit_test_result (web_view, event);\n- context = katze_object_get_int (result, \"context\");\n- is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;\n+ #ifndef HAVE_WEBKIT2\n+ WebKitHitTestResult* result = webkit_web_view_get_hit_test_result (web_view, event);\n+ WebKitHitTestResultContext context = katze_object_get_int (result, \"context\");\n+ gboolean is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;\n g_object_unref (result);\n if (!is_editable)\n {\n@@ -1900,6 +1899,7 @@\n }\n }\n }\n+ #endif\n }\n if (MIDORI_MOD_SCROLL (event->state))\n {\n@@ -1943,7 +1943,6 @@\n \n \/* We propagate the event, since it may otherwise be stuck in WebKit *\/\n g_signal_emit_by_name (view, \"event\", event, &background);\n-#endif\n return FALSE;\n }\n \n"} {"commit":"7ab02dc8423723cdac1da172e108c1e2e599c845","subject":"Show access keys distinct from numbers in link search","message":"Show access keys distinct from numbers in link search\n\nKeys are invoked with Alt+key.\n\nNumeric access keys don't work and are not shown as such.\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- midori\/midori-view.c\n+++ midori\/midori-view.c\n@@ -985,6 +985,14 @@\n js_context = webkit_web_frame_get_global_context (web_frame);\n result = sokoke_js_script_eval (js_context,\n \"var links = document.getElementsByClassName ('midoriHKD87346');\"\n+ \"if (links != undefined && links.length > 0) {\"\n+ \" for (var i = links.length - 1; i >= 0; i--) {\"\n+ \" var parent = links[i].parentNode;\"\n+ \" parent.removeChild(links[i]); } }\",\n+ NULL);\n+ g_free (result);\n+ result = sokoke_js_script_eval (js_context,\n+ \"var links = document.getElementsByClassName ('midori_access_key_fc04de');\"\n \"if (links != undefined && links.length > 0) {\"\n \" for (var i = links.length - 1; i >= 0; i--) {\"\n \" var parent = links[i].parentNode;\"\n@@ -1886,28 +1894,38 @@\n if (view->find_links == -1)\n {\n result = sokoke_js_script_eval (js_context,\n- \"(function (selector, rule) { \"\n+ \" var style_func = (function (selector, rule) { \"\n \" var style = document.createElement ('style');\"\n \" style.setAttribute ('type', 'text\/css');\"\n \" var heads = document.getElementsByTagName ('head');\"\n \" heads[0].appendChild (style);\"\n \" document.styleSheets[0].insertRule (selector + ' ' + rule);\"\n- \" } )\"\n- \" ('.midoriHKD87346', '{ \"\n+ \" } );\"\n+ \" style_func ('.midoriHKD87346', '{ \"\n \" font-size:small !important; font-weight:bold !important;\"\n \" z-index:500; border-radius:0.3em; line-height:1 !important;\"\n \" background: white !important; color: black !important;\"\n \" border:1px solid gray; padding:0 0.1em !important;\"\n \" position:absolute; display:inline !important; }');\"\n- \"var links = document.getElementsByTagName ('a');\"\n- \"var label_count = 0;\"\n- \"for (i in links) {\"\n- \" if (links[i].insertBefore && links[i].href) { \"\n- \" var child = document.createElement ('span');\"\n- \" child.setAttribute ('class', 'midoriHKD87346');\"\n- \" child.appendChild (document.createTextNode (label_count));\"\n- \" links[i].insertBefore (child);\"\n- \" label_count++; } }\",\n+ \" style_func ('.midori_access_key_fc04de', '{ \"\n+ \" font-size:small !important; font-weight:bold !important;\"\n+ \" z-index:500; border-radius:0.3em; line-height:1 !important;\"\n+ \" background: black !important; color: white !important;\"\n+ \" border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;\"\n+ \" position:absolute; display:inline !important; }');\"\n+ \" var label_count = 0;\"\n+ \" for (i in document.links) {\"\n+ \" if (document.links[i].href && document.links[i].insertBefore) {\"\n+ \" var child = document.createElement ('span');\"\n+ \" if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {\"\n+ \" child.setAttribute ('class', 'midori_access_key_fc04de');\"\n+ \" child.appendChild (document.createTextNode (document.links[i].accessKey));\"\n+ \" } else {\"\n+ \" child.setAttribute ('class', 'midoriHKD87346');\"\n+ \" child.appendChild (document.createTextNode (label_count));\"\n+ \" label_count++;\"\n+ \" }\"\n+ \" document.links[i].insertBefore (child); } }\",\n NULL);\n view->find_links = 0;\n }\n@@ -1955,6 +1973,14 @@\n \"for (var i = links.length - 1; i >= 0; i--) {\"\n \" var parent = links[i].parentNode;\"\n \" parent.removeChild(links[i]); }\",\n+ NULL);\n+ g_free (result);\n+ result = sokoke_js_script_eval (js_context,\n+ \"var links = document.getElementsByClassName ('midori_access_key_fc04de');\"\n+ \"if (links != undefined && links.length > 0) {\"\n+ \" for (var i = links.length - 1; i >= 0; i--) {\"\n+ \" var parent = links[i].parentNode;\"\n+ \" parent.removeChild(links[i]); } }\",\n NULL);\n g_free (result);\n view->find_links = -1;\n"} {"commit":"f9524e792df8ddf72ad4261779a2ebc66f53c1db","subject":"[FIX] Mokka: Missing semicolon.","message":"[FIX] Mokka: Missing semicolon.\n\ngit-svn-id: ed06c97986a68fa016311908f99ed1538fbb9b5d@986 93be6e1e-6fcc-11de-baec-69240fdc299a\n","repos":"letaureau\/b-tk.core,Biomechanical-ToolKit\/BTKCore,xyproto\/b-tk.core,Biomechanical-ToolKit\/BTKCore,xyproto\/b-tk.core,letaureau\/b-tk.core,xyproto\/b-tk.core,letaureau\/b-tk.core,Biomechanical-ToolKit\/BTKCore,Biomechanical-ToolKit\/BTKCore,letaureau\/b-tk.core,xyproto\/b-tk.core,Biomechanical-ToolKit\/BTKCore,xyproto\/b-tk.core,letaureau\/b-tk.core,Biomechanical-ToolKit\/BTKCore,Biomechanical-ToolKit\/BTKCore,letaureau\/b-tk.core,xyproto\/b-tk.core,xyproto\/b-tk.core,Biomechanical-ToolKit\/BTKCore,letaureau\/b-tk.core,letaureau\/b-tk.core,xyproto\/b-tk.core","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Tools\/Mokka\/Preferences.h\n+++ Tools\/Mokka\/Preferences.h\n@@ -93,7 +93,7 @@\n void defaultForceVectorColorChanged(const QColor& color);\n void automaticCheckUpdateStateChanged(bool isChecked);\n void userLayoutsChanged(const QList<QVariant>& layouts, int index);\n- void defaultGRFButterflyActivationChanged(int index)\n+ void defaultGRFButterflyActivationChanged(int index);\n \n private slots:\n void removeUserLayout(int index);\n"} {"commit":"ba8d3b0bf5900b9ee5354e7d73358867763a6766","subject":"netfilter: nfnetlink_queue: fix maximum packet length to userspace","message":"netfilter: nfnetlink_queue: fix maximum packet length to userspace\n\nThe packets that we send via NFQUEUE are encapsulated in the NFQA_PAYLOAD\nattribute. The length of the packet in userspace is obtained via\nattr->nla_len field. This field contains the size of the Netlink\nattribute header plus the packet length.\n\nIf the maximum packet length is specified, ie. 65535 bytes, and\npackets in the range of (65531,65535] are sent to userspace, the\nattr->nla_len overflows and it reports bogus lengths to the\napplication.\n\nTo fix this, this patch limits the maximum packet length to 65531\nbytes. If larger packet length is specified, the packet that we\nsend to user-space is truncated to 65531 bytes.\n\nTo support 65535 bytes packets, we have to revisit the idea of\nthe 32-bits Netlink attribute length.\n\nReported-by: Florian Westphal <cef439e78636cdab99cd2923826c5065a0743e5b@strlen.de>\nSigned-off-by: Pablo Neira Ayuso <707d14912bb250caf67dfe0ea4035681fbfc4f56@netfilter.org>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/netfilter\/nfnetlink_queue_core.c\n+++ net\/netfilter\/nfnetlink_queue_core.c\n@@ -526,9 +526,13 @@\n \n \tcase NFQNL_COPY_PACKET:\n \t\tqueue->copy_mode = mode;\n-\t\t\/* we're using struct nlattr which has 16bit nla_len *\/\n-\t\tif (range > 0xffff)\n-\t\t\tqueue->copy_range = 0xffff;\n+\t\t\/* We're using struct nlattr which has 16bit nla_len. Note that\n+\t\t * nla_len includes the header length. Thus, the maximum packet\n+\t\t * length that we support is 65531 bytes. We send truncated\n+\t\t * packets if the specified length is larger than that.\n+\t\t *\/\n+\t\tif (range > 0xffff - NLA_HDRLEN)\n+\t\t\tqueue->copy_range = 0xffff - NLA_HDRLEN;\n \t\telse\n \t\t\tqueue->copy_range = range;\n \t\tbreak;\n"} {"commit":"48e96a4aeae97d6cbb9c4c5ff367475c88a184d8","subject":"Update g_sys.h","message":"Update g_sys.h","repos":"SquareBrain\/Gunhoop,SquareBrain\/Gunhoop,SquareBrain\/Gunhoop,SquareBrain\/Gunhoop","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- module\/gsystem\/inc\/g_sys.h\n+++ module\/gsystem\/inc\/g_sys.h\n@@ -105,6 +105,6 @@\n \t * ms:millisecond\n \t * us:microsecond\n \t *\/\t\t\n-\tstatic GResult getSysTime(const GInt8* format, GInt8* buffer, const GUint32 size); \t\n+\tstatic GResult getSysTime(const GInt8* format, GInt8* buffer, const GUint32 size);\n };\n }\n"} {"commit":"f715a40fdb234726bdbf7b3d23ac462ae353ceec","subject":"fix #748","message":"fix #748\n","repos":"bSr43\/capstone,bSr43\/capstone,AmesianX\/capstone,bSr43\/capstone,AmesianX\/capstone,bigendiansmalls\/capstone,AmesianX\/capstone,AmesianX\/capstone,pranith\/capstone,pranith\/capstone,bigendiansmalls\/capstone,bSr43\/capstone,pranith\/capstone,bigendiansmalls\/capstone,bSr43\/capstone,bigendiansmalls\/capstone,bSr43\/capstone,AmesianX\/capstone,bigendiansmalls\/capstone,pranith\/capstone,pranith\/capstone,AmesianX\/capstone,AmesianX\/capstone,pranith\/capstone,bSr43\/capstone,bigendiansmalls\/capstone,pranith\/capstone,bigendiansmalls\/capstone","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- windows\/winkernel_mm.c\n+++ windows\/winkernel_mm.c\n@@ -31,7 +31,7 @@\n \tNT_ASSERT(size);\n \n \tCS_WINKERNEL_MEMBLOCK *block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag(\n-\t\t\tNonPagedPoolNx, size + sizeof(CS_WINKERNEL_MEMBLOCK), CS_WINKERNEL_POOL_TAG);\n+\t\t\tNonPagedPool, size + sizeof(CS_WINKERNEL_MEMBLOCK), CS_WINKERNEL_POOL_TAG);\n \tif (!block) {\n \t\treturn NULL;\n \t}\n"} {"commit":"558724a5b2a73ad0c7638e21e8dffc419d267b6c","subject":"netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()","message":"netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init()\n\nFix to return a negative error code from the error handling\ncase instead of 0, as returned elsewhere in this function.\n\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: Pablo Neira Ayuso <707d14912bb250caf67dfe0ea4035681fbfc4f56@netfilter.org>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/netfilter\/nfnetlink_queue_core.c\n+++ net\/netfilter\/nfnetlink_queue_core.c\n@@ -1062,8 +1062,10 @@\n \n #ifdef CONFIG_PROC_FS\n \tif (!proc_create(\"nfnetlink_queue\", 0440,\n-\t\t\t proc_net_netfilter, &nfqnl_file_ops))\n+\t\t\t proc_net_netfilter, &nfqnl_file_ops)) {\n+\t\tstatus = -ENOMEM;\n \t\tgoto cleanup_subsys;\n+\t}\n #endif\n \n \tregister_netdevice_notifier(&nfqnl_dev_notifier);\n"} {"commit":"538daf36af5357c1e922fb50e05e8449c201ae39","subject":"added VectorFromSignalCollector","message":"added VectorFromSignalCollector\n","repos":"GSGroup\/stingraykit,GSGroup\/stingraykit","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- ValueFromSignalObtainer.h\n+++ ValueFromSignalObtainer.h\n@@ -1,6 +1,8 @@\n-#ifndef __GS_DVRLIB_TOOLKIT_VALUEFROMSIGNALOBTAINER_H__\n-#define __GS_DVRLIB_TOOLKIT_VALUEFROMSIGNALOBTAINER_H__\n+#ifndef STINGRAY_TOOLKIT_VALUEFROMSIGNALOBTAINER_H\n+#define STINGRAY_TOOLKIT_VALUEFROMSIGNALOBTAINER_H\n \n+\n+#include <vector>\n \n #include <stingray\/toolkit\/shared_ptr.h>\n #include <stingray\/toolkit\/unique_ptr.h>\n@@ -30,6 +32,12 @@\n \t\tconst CollectionType* operator -> () const\t{ return &GetValues(); }\n \t\tconst CollectionType& GetValues() const { return *_val; }\n \t};\n+\n+\n+\ttemplate < typename T >\n+\tclass VectorFromSignalCollector : public ValuesFromSignalCollector< std::vector<T> >\n+\t{ };\n+\n \n \ttemplate < typename T >\n \tclass ValueFromSignalObtainer : public function_info<void(const T&)>\n"} {"commit":"a538bab0659c3bd5ed1da068c11b211cf65d6610","subject":"vc4: Fix viewport handling in the uniforms upload.","message":"vc4: Fix viewport handling in the uniforms upload.\n\nI had the right viewports in vc4_emit.c, but grabbed the wrong values in\nthe uniform setup, so primitives would claim to be in the wrong parts of\nthe screen. (The vc4_emit.c state looks like it just decides how big the\nclipping guardband is).\n\nThis gets fbo-viewport closer to working (which still has the problem that\nthe HW is always guard-band clipping), and fixes inverted FBO rendering in\ngeneral.\n","repos":"benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,mcanthony\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,djreep81\/glsl-optimizer,bkaradzic\/glsl-optimizer,jbarczak\/glsl-optimizer,wolf96\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,dellis1972\/glsl-optimizer,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,bkaradzic\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,zz85\/glsl-optimizer,zz85\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,jbarczak\/glsl-optimizer,tokyovigilante\/glsl-optimizer,zeux\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,zeux\/glsl-optimizer,mcanthony\/glsl-optimizer,bkaradzic\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,dellis1972\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,zz85\/glsl-optimizer,mcanthony\/glsl-optimizer,wolf96\/glsl-optimizer,mcanthony\/glsl-optimizer,metora\/MesaGLSLCompiler","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/drivers\/vc4\/vc4_program.c\n+++ src\/gallium\/drivers\/vc4\/vc4_program.c\n@@ -1474,12 +1474,10 @@\n gallium_uniforms[uinfo->data[i]]);\n break;\n case QUNIFORM_VIEWPORT_X_SCALE:\n- cl_f(&vc4->uniforms,\n- vc4->framebuffer.width * 16.0f \/ 2.0f);\n+ cl_f(&vc4->uniforms, vc4->viewport.scale[0] * 16.0f);\n break;\n case QUNIFORM_VIEWPORT_Y_SCALE:\n- cl_f(&vc4->uniforms,\n- vc4->framebuffer.height * -16.0f \/ 2.0f);\n+ cl_f(&vc4->uniforms, vc4->viewport.scale[1] * 16.0f);\n break;\n \n case QUNIFORM_VIEWPORT_Z_OFFSET:\n"} {"commit":"da925116834693024519e323aa197abf49955191","subject":"handle connection close from a HTTP\/1.0 backend","message":"handle connection close from a HTTP\/1.0 backend\n\n\ngit-svn-id: e98c317c6679dcf055eb388f05b44c3a6d6b38c6@1450 152afb58-edef-0310-8abb-c4023f1b3aa9\n","repos":"ctdk\/lighttpd-1.5-ct,ctdk\/lighttpd-1.5-ct,pinkflozd\/lighttpd,pinkflozd\/lighttpd,Fumon\/lighttpd-Basic-auth-hack,Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct,Fumon\/lighttpd-Basic-auth-hack,pinkflozd\/lighttpd,pinkflozd\/lighttpd,Fumon\/lighttpd-Basic-auth-hack,ctdk\/lighttpd-1.5-ct","returncode":128,"stderr":"fatal: invalid reference: FETCH_HEAD^\n","license":"bsd-3-clause","lang":"C","diff":"--- src\/mod_proxy_backend_http.c\n+++ src\/mod_proxy_backend_http.c\n@@ -0,0 +1,452 @@\n+#include <stdlib.h>\n+#include <string.h>\n+\n+#include \"mod_proxy_core.h\"\n+#include \"configfile.h\"\n+#include \"buffer.h\"\n+#include \"log.h\"\n+#include \"sys-strings.h\"\n+\n+void chunkqueue_skip(chunkqueue *cq, off_t skip) {\n+\tchunk *c;\n+\n+\tfor (c = cq->first; c && skip; c = c->next) {\n+\t\tif (skip > c->mem->used - c->offset - 1) {\n+\t\t\tskip -= c->mem->used - c->offset - 1;\n+\t\t} else {\n+\t\t\tc->offset += skip;\n+\t\t\tskip = 0;\n+\t\t}\n+\t}\n+\n+\treturn;\n+}\n+\n+int proxy_http_stream_decoder(server *srv, proxy_session *sess, chunkqueue *raw, chunkqueue *decoded) {\n+\tchunk *c;\n+\n+\tif (raw->first == NULL) {\n+\t\tif (raw->is_closed) return 1;\n+\n+\t\treturn 0;\n+\t}\n+\n+\tif (sess->is_chunked) {\n+\t\tdo {\n+\t\t\t\/* the start should always be a chunk-length *\/\n+\t\t\toff_t chunk_len = 0;\n+\t\t\tchar *err = NULL;\n+\t\t\tint chunklen_strlen = 0;\n+\t\t\tchar ch;\n+\t\t\toff_t we_have = 0, we_need = 0;\n+\n+\t\t\tc = raw->first;\n+\n+\t\t\tif (c == 0 || c->mem->used == 0) return 0;\n+\n+\t\t\tchunk_len = strtol(BUF_STR(c->mem) + c->offset, &err, 16);\n+\t\t\tif (!(*err == ' ' || *err == '\\r' || *err == ';')) {\n+\t\t\t\tif (*err == '\\0') {\n+\t\t\t\t\t\/* we just need more data *\/\n+\t\t\t\t\treturn 0;\n+\t\t\t\t}\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\n+\t\t\tif (chunk_len < 0) {\n+\t\t\t\tERROR(\"chunk_len is negative: %Ld\", chunk_len);\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\n+\t\t\tchunklen_strlen = err - (BUF_STR(c->mem) + c->offset);\n+\t\t\tchunklen_strlen++; \/* skip the err-char *\/ \n+\t\t\t\n+\t\t\tdo {\n+\t\t\t\tch = BUF_STR(c->mem)[c->offset + chunklen_strlen];\n+\t\n+\t\t\t\tswitch (ch) {\n+\t\t\t\tcase '\\n':\n+\t\t\t\tcase '\\0':\n+\t\t\t\t\t\/* bingo, chunk-header is finished *\/\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t\tchunklen_strlen++;\n+\t\t\t} while (ch != '\\n' && c != '\\0');\n+\n+\t\t\tif (ch != '\\n') {\n+\t\t\t\tERROR(\"%s\", \"missing the CRLF\");\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\n+\t\t\twe_need = chunk_len + chunklen_strlen + 2;\n+\t\t\t\/* do we have the full chunk ? *\/\n+\t\t\tfor (c = raw->first; c; c = c->next) {\n+\t\t\t\twe_have += c->mem->used - 1 - c->offset;\n+\n+\t\t\t\t\/* we have enough, jump out *\/\n+\t\t\t\tif (we_have > we_need) break;\n+\t\t\t}\n+\n+\t\t\t\/* get more data *\/\n+\t\t\tif (we_have < we_need) {\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\n+\t\t\t\/* skip the chunk-header *\/\n+\t\t\tchunkqueue_skip(raw, chunklen_strlen);\n+\n+\t\t\t\/* final chunk *\/\n+\t\t\tif (chunk_len == 0) {\n+\t\t\t\tchunkqueue_skip(raw, 2);\n+\n+\t\t\t\treturn 1;\n+\t\t\t}\n+\n+\t\t\t\/* we have enough, copy the data *\/\t\n+\t\t\tfor (c = raw->first; c && chunk_len; c = c->next) {\n+\t\t\t\toff_t we_want = 0;\n+\t\t\t\tbuffer *b = chunkqueue_get_append_buffer(decoded);\n+\n+\t\t\t\twe_want = chunk_len > (c->mem->used - c->offset - 1) ? c->mem->used - c->offset - 1: chunk_len;\n+\n+\t\t\t\tbuffer_copy_string_len(b, c->mem->ptr + c->offset, we_want);\n+\n+\t\t\t\tc->offset += we_want;\n+\t\t\t\tchunk_len -= we_want;\n+\t\t\t}\n+\n+\t\t\t\/* skip the \\r\\n *\/\n+\t\t\tchunkqueue_skip(raw, 2);\n+\n+\t\t\t\/* we are done, give the connection to someone else *\/\n+\t\t\tchunkqueue_remove_finished_chunks(raw);\n+\t\t} while (1);\n+\t} else {\n+\t\t\/* no chunked encoding, ok, perhaps a content-length ? *\/\n+\n+\t\tchunkqueue_remove_finished_chunks(raw);\n+\t\tfor (c = raw->first; c; c = c->next) {\n+\t\t\tbuffer *b;\n+\n+\t\t\tif (c->mem->used == 0) continue;\n+\t\t \n+\t\t\tdecoded->bytes_in += c->mem->used - c->offset - 1;\n+\t\t\traw->bytes_out += c->mem->used - c->offset - 1;\n+\n+\t\t\tsess->bytes_read += c->mem->used - c->offset - 1;\n+\n+\t\t\tif (c->offset == 0) {\n+\t\t\t\t\/* we are copying the whole buffer, just steal it *\/\n+\n+\t\t\t\tchunkqueue_steal_chunk(decoded, c);\n+\t\t\t} else {\n+\t\t\t\tb = chunkqueue_get_append_buffer(decoded);\n+\t\t\t\tbuffer_copy_string_len(b, c->mem->ptr + c->offset, c->mem->used - c->offset - 1);\n+\t\t\t\tc->offset = c->mem->used - 1; \/* marks is read *\/\n+\t\t\t}\n+\n+\n+\t\t\tif (sess->bytes_read == sess->content_length) {\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t}\n+\n+\t \tif (raw->is_closed || sess->bytes_read == sess->content_length) {\n+\t\t\treturn 1; \/* finished *\/\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+\/**\n+ * transform the content-stream into a valid HTTP-content-stream\n+ *\n+ * as we don't apply chunked-encoding here, pass it on AS IS\n+ *\/\n+int proxy_http_stream_encoder(server *srv, proxy_session *sess, chunkqueue *in, chunkqueue *out) {\n+\tchunk *c;\n+\n+\t\/* there is nothing that we have to send out anymore *\/\n+\tif (in->bytes_in == in->bytes_out && \n+\t in->is_closed) return 0;\n+\n+\tfor (c = in->first; in->bytes_out < in->bytes_in; c = c->next) {\n+\t\tbuffer *b;\n+\t\toff_t weWant = in->bytes_in - in->bytes_out;\n+\t\toff_t weHave = 0;\n+\n+\t\t\/* we announce toWrite octects\n+\t\t * now take all the request_content chunk that we need to fill this request\n+\t\t *\/\n+\n+\t\tswitch (c->type) {\n+\t\tcase FILE_CHUNK:\n+\t\t\tweHave = c->file.length - c->offset;\n+\n+\t\t\tif (weHave > weWant) weHave = weWant;\n+\n+\t\t\t\/** steal the chunk from the incoming chunkqueue *\/\t\n+\t\t\tchunkqueue_steal_tempfile(out, c);\n+\n+\t\t\tc->offset += weHave;\n+\t\t\tin->bytes_out += weHave;\n+\n+\t\t\tout->bytes_in += weHave;\n+\n+\t\t\tbreak;\n+\t\tcase MEM_CHUNK:\n+\t\t\t\/* append to the buffer *\/\n+\t\t\tweHave = c->mem->used - 1 - c->offset;\n+\n+\t\t\tif (weHave > weWant) weHave = weWant;\n+\n+\t\t\tb = chunkqueue_get_append_buffer(out);\n+\t\t\tbuffer_append_memory(b, c->mem->ptr + c->offset, weHave);\n+\t\t\tb->used++; \/* add virtual \\0 *\/\n+\n+\t\t\tc->offset += weHave;\n+\t\t\tin->bytes_out += weHave;\n+\n+\t\t\tout->bytes_in += weHave;\n+\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+\n+}\n+\/**\n+ * generate a HTTP\/1.1 proxy request from the set of request-headers\n+ *\n+ * TODO: this is HTTP-proxy specific and will be moved moved into a separate backed\n+ *\n+ *\/\n+int proxy_http_get_request_chunk(server *srv, connection *con, plugin_data *p, proxy_session *sess, chunkqueue *cq) {\n+\tbuffer *b;\n+\tsize_t i;\n+\t\n+\tb = chunkqueue_get_append_buffer(cq);\n+\n+\t\/* request line *\/\n+\tbuffer_copy_string(b, get_http_method_name(con->request.http_method));\n+\tBUFFER_APPEND_STRING_CONST(b, \" \");\n+\n+\t\/* check if we want to rewrite the uri *\/\n+\n+\tfor (i = 0; i < p->conf.request_rewrites->used; i++) {\n+\t\tproxy_rewrite *rw = p->conf.request_rewrites->ptr[i];\n+\n+\t\tif (buffer_is_equal_string(rw->header, CONST_STR_LEN(\"_uri\"))) {\n+\t\t\tint ret;\n+\n+\t\t\tif ((ret = pcre_replace(rw->regex, rw->replace, con->request.uri, p->replace_buf)) < 0) {\n+\t\t\t\tswitch (ret) {\n+\t\t\t\tcase PCRE_ERROR_NOMATCH:\n+\t\t\t\t\t\/* hmm, ok. no problem *\/\n+\t\t\t\t\tbuffer_append_string_buffer(b, con->request.uri);\n+\t\t\t\t\tbreak;\n+\t\t\t\tdefault:\n+\t\t\t\t\tTRACE(\"oops, pcre_replace failed with: %d\", ret);\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t} else {\n+\t\t\t\tbuffer_append_string_buffer(b, p->replace_buf);\n+\t\t\t}\n+\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (i == p->conf.request_rewrites->used) {\n+\t\t\/* not found *\/\n+\t\tbuffer_append_string_buffer(b, con->request.uri);\n+\t}\n+\n+\tif (con->request.http_version == HTTP_VERSION_1_1) {\n+\t\tBUFFER_APPEND_STRING_CONST(b, \" HTTP\/1.1\\r\\n\");\n+\t} else {\n+\t\tBUFFER_APPEND_STRING_CONST(b, \" HTTP\/1.0\\r\\n\");\n+\t}\n+\n+\tfor (i = 0; i < sess->request_headers->used; i++) {\n+\t\tdata_string *ds;\n+\n+\t\tds = (data_string *)sess->request_headers->data[i];\n+\n+\t\tbuffer_append_string_buffer(b, ds->key);\n+\t\tBUFFER_APPEND_STRING_CONST(b, \": \");\n+\t\tbuffer_append_string_buffer(b, ds->value);\n+\t\tBUFFER_APPEND_STRING_CONST(b, \"\\r\\n\");\n+\t}\n+\n+\tBUFFER_APPEND_STRING_CONST(b, \"\\r\\n\");\n+\n+\tcq->bytes_in += b->used - 1;\n+\t\n+\treturn 0;\n+}\n+\n+\/**\n+ * parse the response header\n+ *\n+ * NOTE: this can be used by all backends as they all send a HTTP-Response a clean block\n+ * - fastcgi needs some decoding for the protocol\n+ *\/\n+parse_status_t proxy_http_parse_response_header(server *srv, connection *con, plugin_data *p, proxy_session *sess, chunkqueue *cq) {\n+\tint have_content_length = 0;\n+\tsize_t i;\n+\n+\thttp_response_reset(p->resp);\n+\t\n+\tswitch (http_response_parse_cq(cq, p->resp)) {\n+\tcase PARSE_ERROR:\n+\t\t\/* parsing failed *\/\n+\n+\t\treturn PARSE_ERROR;\n+\tcase PARSE_NEED_MORE:\n+\t\treturn PARSE_NEED_MORE;\n+\tcase PARSE_SUCCESS:\n+\t\tcon->http_status = p->resp->status;\n+\n+\t\tchunkqueue_remove_finished_chunks(cq);\n+\n+\t\tsess->content_length = -1;\n+\n+\t\t\/* copy the http-headers *\/\n+\t\tfor (i = 0; i < p->resp->headers->used; i++) {\n+\t\t\tconst char *ign[] = { \"Status\", NULL };\n+\t\t\tsize_t j, k;\n+\t\t\tdata_string *ds;\n+\n+\t\t\tdata_string *header = (data_string *)p->resp->headers->data[i];\n+\n+\t\t\t\/* some headers are ignored by default *\/\n+\t\t\tfor (j = 0; ign[j]; j++) {\n+\t\t\t\tif (0 == strcasecmp(ign[j], header->key->ptr)) break;\n+\t\t\t}\n+\t\t\tif (ign[j]) continue;\n+\n+\t\t\tif (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"Location\"))) {\n+\t\t\t\t\/* CGI\/1.1 rev 03 - 7.2.1.2 *\/\n+\t\t\t\tif (con->http_status == 0) con->http_status = 302;\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"Content-Length\"))) {\n+\t\t\t\thave_content_length = 1;\n+\n+\t\t\t\tsess->content_length = strtol(header->value->ptr, NULL, 10);\n+\n+\t\t\t\tif (sess->content_length < 0) {\n+\t\t\t\t\treturn PARSE_ERROR;\n+\t\t\t\t}\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"X-Sendfile\")) ||\n+\t\t\t\t 0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"X-LIGHTTPD-Sendfile\"))) {\n+\t\t\t\tif (p->conf.allow_x_sendfile) {\n+\t\t\t\t\tsess->send_response_content = 0;\n+\t\t\t\t\tsess->do_internal_redirect = 1;\n+\t\t\t\t\t\n+\t\t\t\t\t\/* don't try to rewrite this request through mod_proxy_core again *\/\n+\t\t\t\t\tsess->internal_redirect_count = MAX_INTERNAL_REDIRECTS; \n+\n+\t\t\t\t\tbuffer_copy_string_buffer(con->physical.path, header->value);\n+\n+\t\t\t\t\t\/* as we want to support ETag and friends we set the physical path for the file\n+\t\t\t\t\t * and hope mod_staticfile catches up *\/\n+\t\t\t\t}\n+\n+\t\t\t\tcontinue;\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"X-Rewrite-URI\"))) { \n+\t\t\t\tif (p->conf.allow_x_rewrite) {\n+\t\t\t\t\tsess->send_response_content = 0;\n+\t\t\t\t\tsess->do_internal_redirect = 1;\n+\n+\t\t\t\t\tbuffer_copy_string_buffer(con->request.uri, header->value);\n+\t\t\t\t\tbuffer_reset(con->physical.path);\n+\n+\t\t\t\t\tconfig_cond_cache_reset(srv, con);\n+\t\t\t\t}\n+\n+\t\t\t\tcontinue;\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"X-Rewrite-Host\"))) { \n+\t\t\t\tif (p->conf.allow_x_rewrite) {\n+\t\t\t\t\tsess->send_response_content = 0;\n+\t\t\t\t\tsess->do_internal_redirect = 1;\n+\n+\t\t\t\t\tbuffer_copy_string_buffer(con->request.http_host, header->value);\n+\t\t\t\t\tbuffer_reset(con->physical.path);\n+\n+\t\t\t\t\tconfig_cond_cache_reset(srv, con);\n+\t\t\t\t}\n+\n+\t\t\t\tcontinue;\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"Transfer-Encoding\"))) {\n+\t\t\t\tif (strstr(header->value->ptr, \"chunked\")) {\n+\t\t\t\t\tsess->is_chunked = 1;\n+\t\t\t\t}\n+\t\t\t\t\/* ignore the header *\/\n+\t\t\t\tcontinue;\n+\t\t\t} else if (0 == buffer_caseless_compare(CONST_BUF_LEN(header->key), CONST_STR_LEN(\"Connection\"))) {\n+\t\t\t\tif (strstr(header->value->ptr, \"close\")) {\n+\t\t\t\t\tsess->is_closing = 1;\n+\t\t\t\t}\n+\t\t\t\t\/* ignore the header *\/\n+\t\t\t\tcontinue;\n+\n+\t\t\t}\n+\t\t\t\n+\t\t\tif (NULL == (ds = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) {\n+\t\t\t\tds = data_response_init();\n+\t\t\t}\n+\n+\n+\t\t\tbuffer_copy_string_buffer(ds->key, header->key);\n+\n+\t\t\tfor (k = 0; k < p->conf.response_rewrites->used; k++) {\n+\t\t\t\tproxy_rewrite *rw = p->conf.response_rewrites->ptr[k];\n+\n+\t\t\t\tif (buffer_is_equal(rw->header, header->key)) {\n+\t\t\t\t\tint ret;\n+\t\n+\t\t\t\t\tif ((ret = pcre_replace(rw->regex, rw->replace, header->value, p->replace_buf)) < 0) {\n+\t\t\t\t\t\tswitch (ret) {\n+\t\t\t\t\t\tcase PCRE_ERROR_NOMATCH:\n+\t\t\t\t\t\t\t\/* hmm, ok. no problem *\/\n+\t\t\t\t\t\t\tbuffer_append_string_buffer(ds->value, header->value);\n+\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\tdefault:\n+\t\t\t\t\t\t\tTRACE(\"oops, pcre_replace failed with: %d\", ret);\n+\t\t\t\t\t\t\tbreak;\n+\t\t\t\t\t\t}\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tbuffer_append_string_buffer(ds->value, p->replace_buf);\n+\t\t\t\t\t}\n+\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tif (k == p->conf.response_rewrites->used) {\n+\t\t\t\tbuffer_copy_string_buffer(ds->value, header->value);\n+\t\t\t}\n+\n+\t\t\tarray_insert_unique(con->response.headers, (data_unset *)ds);\n+\t\t}\n+\n+\t\t\/* does the client allow us to send chunked encoding ? *\/\n+\t\tif (con->request.http_version == HTTP_VERSION_1_1 &&\n+\t\t !have_content_length) {\n+\t\t\tcon->response.transfer_encoding = HTTP_TRANSFER_ENCODING_CHUNKED;\n+ \t\t}\n+\n+\t\tbreak;\n+\t}\n+\n+\treturn PARSE_SUCCESS; \/* we have a full header *\/\n+}\n+\n+\n"} {"commit":"92827cd4511fabcaeb8abfdd11122e04502d5944","subject":"st\/dri: fix bug in allocate_textures","message":"st\/dri: fix bug in allocate_textures\n","repos":"tokyovigilante\/glsl-optimizer,KTXSoftware\/glsl2agal,zeux\/glsl-optimizer,tokyovigilante\/glsl-optimizer,bkaradzic\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,bkaradzic\/glsl-optimizer,benaadams\/glsl-optimizer,KTXSoftware\/glsl2agal,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,mapbox\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,benaadams\/glsl-optimizer,zz85\/glsl-optimizer,KTXSoftware\/glsl2agal,djreep81\/glsl-optimizer,tokyovigilante\/glsl-optimizer,metora\/MesaGLSLCompiler,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,mapbox\/glsl-optimizer,benaadams\/glsl-optimizer,jbarczak\/glsl-optimizer,adobe\/glsl2agal,tokyovigilante\/glsl-optimizer,mcanthony\/glsl-optimizer,mapbox\/glsl-optimizer,zz85\/glsl-optimizer,dellis1972\/glsl-optimizer,benaadams\/glsl-optimizer,dellis1972\/glsl-optimizer,mcanthony\/glsl-optimizer,djreep81\/glsl-optimizer,wolf96\/glsl-optimizer,dellis1972\/glsl-optimizer,jbarczak\/glsl-optimizer,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,zz85\/glsl-optimizer,metora\/MesaGLSLCompiler,jbarczak\/glsl-optimizer,bkaradzic\/glsl-optimizer,wolf96\/glsl-optimizer,KTXSoftware\/glsl2agal,mcanthony\/glsl-optimizer,adobe\/glsl2agal,zz85\/glsl-optimizer,benaadams\/glsl-optimizer,zeux\/glsl-optimizer,mapbox\/glsl-optimizer,djreep81\/glsl-optimizer,mcanthony\/glsl-optimizer,zeux\/glsl-optimizer,wolf96\/glsl-optimizer,zeux\/glsl-optimizer,jbarczak\/glsl-optimizer,KTXSoftware\/glsl2agal,dellis1972\/glsl-optimizer,wolf96\/glsl-optimizer,bkaradzic\/glsl-optimizer,metora\/MesaGLSLCompiler,zeux\/glsl-optimizer,djreep81\/glsl-optimizer,adobe\/glsl2agal,adobe\/glsl2agal","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/gallium\/state_trackers\/dri\/dri1.c\n+++ src\/gallium\/state_trackers\/dri\/dri1.c\n@@ -451,7 +451,7 @@\n break;\n }\n \n- if (templ.format != PIPE_FORMAT_NONE) {\n+ if (format != PIPE_FORMAT_NONE) {\n templ.format = format;\n templ.tex_usage = tex_usage;\n \n"} {"commit":"96021f532303379b461d8e2afaddfb4145bc169f","subject":"fix function signature in catcpadapter.c","message":"fix function signature in catcpadapter.c\n\nThe uint32_t and size_t type were mixed up in this file, this could\nmake the compiler generate code which would prepare the stack in a\ndifferent way the function expects it to be prepared and this will\ncause some strange runtime problems.\n\nChange-Id: I7665ce9e1bacc25bc367f2d64ff1775253db0454\nSigned-off-by: Hauke Mehrtens <435ddd46dc66c007a1fa20144c823d37e0d23436@hauke-m.de>\nReviewed-on: https:\/\/gerrit.iotivity.org\/gerrit\/3451\nTested-by: jenkins-iotivity <09cb29e8a2b473a2c978382eec13ee06fa017bda@opendaylight.org>\nReviewed-by: Patrick Lankswert <97f91fabd828c4bf3dd3b3638f2b6a4d81d5fd96@intel.com>\n","repos":"santais\/iotivity_1.1.0,rzr\/iotivity,santais\/iotivity_1.1,iotivity\/iotivity,santais\/iotivity_1.1,santais\/iotivity_1.1,iotivity\/iotivity,santais\/iotivity_1.1.0,tienfuc\/iotivity-democlient-snap,tienfuc\/iotivity-democlient-snap,iotivity\/iotivity,rzr\/iotivity,santais\/iotivity_1.1,santais\/iotivity_1.1,iotivity\/iotivity,santais\/iotivity_1.1.0,tienfuc\/iotivity-democlient-snap,santais\/iotivity,santais\/iotivity_1.1.0,rzr\/iotivity,rzr\/iotivity,tienfuc\/iotivity-democlient-snap,santais\/iotivity,santais\/iotivity_1.1,santais\/iotivity_1.1.0,iotivity\/iotivity,tienfuc\/iotivity-democlient-snap,rzr\/iotivity,tienfuc\/iotivity-democlient-snap,tienfuc\/iotivity-democlient-snap,iotivity\/iotivity,tienfuc\/iotivity-democlient-snap,tienfuc\/iotivity-democlient-snap,santais\/iotivity,rzr\/iotivity,santais\/iotivity,rzr\/iotivity,santais\/iotivity_1.1.0,santais\/iotivity_1.1,santais\/iotivity_1.1.0,iotivity\/iotivity,santais\/iotivity_1.1,tienfuc\/iotivity-democlient-snap,santais\/iotivity,iotivity\/iotivity,santais\/iotivity,santais\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- resource\/csdk\/connectivity\/src\/tcp_adapter\/catcpadapter.c\n+++ resource\/csdk\/connectivity\/src\/tcp_adapter\/catcpadapter.c\n@@ -22,6 +22,9 @@\n #include <stdlib.h>\n #include <string.h>\n #include <stdint.h>\n+\n+#define __STDC_FORMAT_MACROS\n+#include <inttypes.h>\n \n #include \"catcpadapter.h\"\n #include \"catcpinterface.h\"\n@@ -75,7 +78,7 @@\n static CAErrorHandleCallback g_errorCallback = NULL;\n \n static void CATCPPacketReceivedCB(const CAEndpoint_t *endpoint,\n- const void *data, size_t dataLength);\n+ const void *data, uint32_t dataLength);\n \n static CAResult_t CATCPInitializeQueueHandles();\n \n@@ -88,7 +91,7 @@\n bool isMulticast);\n void CAFreeTCPData(CATCPData *ipData);\n \n-static void CADataDestroyer(void *data, size_t size);\n+static void CADataDestroyer(void *data, uint32_t size);\n \n CAResult_t CATCPInitializeQueueHandles()\n {\n@@ -142,7 +145,7 @@\n }\n \n void CATCPPacketReceivedCB(const CAEndpoint_t *endpoint, const void *data,\n- size_t dataLength)\n+ uint32_t dataLength)\n {\n OIC_LOG(DEBUG, TAG, \"IN\");\n \n@@ -159,7 +162,7 @@\n }\n \n void CATCPErrorHandler(const CAEndpoint_t *endpoint, const void *data,\n- size_t dataLength, CAResult_t result)\n+ uint32_t dataLength, CAResult_t result)\n {\n OIC_LOG(DEBUG, TAG, \"IN\");\n \n@@ -428,11 +431,11 @@\n OICFree(TCPData);\n }\n \n-void CADataDestroyer(void *data, size_t size)\n+void CADataDestroyer(void *data, uint32_t size)\n {\n if (size < sizeof(CATCPData))\n {\n- OIC_LOG_V(ERROR, TAG, \"Destroy data too small %p %d\", data, size);\n+ OIC_LOG_V(ERROR, TAG, \"Destroy data too small %p %\" PRIu32, data, size);\n }\n CATCPData *TCPData = (CATCPData *) data;\n \n"} {"commit":"f098d21a60eccb3598c43832d582d2dfd1c1b0fc","subject":"\u7dda\u5f62\u30d5\u30a3\u30eb\u30bf\u304cG++\u3067\u30b3\u30f3\u30d1\u30a4\u30eb\u3067\u304d\u308b\u3088\u3046\u306b\u4fee\u6b63","message":"\u7dda\u5f62\u30d5\u30a3\u30eb\u30bf\u304cG++\u3067\u30b3\u30f3\u30d1\u30a4\u30eb\u3067\u304d\u308b\u3088\u3046\u306b\u4fee\u6b63\n\ngit-svn-id: 3507153f7f2a502978d43a270f21b34bb2e07470@585 b31369ee-dac5-0310-8161-cccb92f82ee5\n","repos":"svagionitis\/MIST,svagionitis\/MIST,svagionitis\/MIST,yuugata\/MIST,yuugata\/MIST,yuugata\/MIST,yuugata\/MIST,svagionitis\/MIST","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- mist\/filter\/linear.h\n+++ mist\/filter\/linear.h\n@@ -80,12 +80,12 @@\n \t\ttypedef typename array< T_in, Allocator_in >::size_type\t\t\tsize_type;\n \t\ttypedef typename array< T_in, Allocator_in >::difference_type\tdifference_type;\n \t\ttypedef typename array< T_out, Allocator_out >::value_type\t\tout_type;\n-\t\ttypedef typename Calc_type\t\t\t\t\t\t\t\t\t\tcalc_type;\n+\t\ttypedef Calc_type\t\t\t\t\t\t\t\t\t\t\t\tcalc_type;\n \n \t\tconst size_type s_i = kernel_center;\n \t\tconst size_type e_i = in.size( ) - ( kernel.size( ) - kernel_center ) + 1; \n \n-\t\ttypedef array< T_in, Allocator_in >::const_pointer const_pointer;\n+\t\ttypedef typename array< T_in, Allocator_in >::const_pointer const_pointer;\n \t\tdifference_type *pindex = new difference_type[ kernel.size( ) ];\n \n \t\tsize_type\t\ti, count = 0;\n@@ -126,12 +126,12 @@\n \t\ttypedef typename array1< T_in, Allocator_in >::size_type\t\tsize_type;\n \t\ttypedef typename array1< T_in, Allocator_in >::difference_type\tdifference_type;\n \t\ttypedef typename array1< T_out, Allocator_out >::value_type\t\tout_type;\n-\t\ttypedef typename Calc_type\t\t\t\t\t\t\t\t\t\tcalc_type;\n+\t\ttypedef Calc_type\t\t\t\t\t\t\t\t\t\t\t\tcalc_type;\n \n \t\tconst size_type s_i = kernel_center_i;\n \t\tconst size_type e_i = in.size1( ) - ( kernel.size1( ) - kernel_center_i ) + 1;\n \n-\t\ttypedef array1< T_in, Allocator_in >::const_pointer const_pointer;\n+\t\ttypedef typename array1< T_in, Allocator_in >::const_pointer const_pointer;\n \t\tdifference_type *pindex = new difference_type[ kernel.size( ) ];\n \n \t\tsize_type\t\ti, count = 0;\n@@ -174,14 +174,14 @@\n \t\ttypedef typename array2< T_in, Allocator_in >::size_type\t\t\tsize_type;\n \t\ttypedef typename array2< T_in, Allocator_in >::difference_type\t\tdifference_type;\n \t\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\tout_type;\n-\t\ttypedef typename Calc_type\t\t\t\t\t\t\t\t\t\t\tcalc_type;\n+\t\ttypedef Calc_type\t\t\t\t\t\t\t\t\t\t\t\t\tcalc_type;\n \n \t\tconst size_type s_i = kernel_center_i;\n \t\tconst size_type e_i = in.size1( ) - ( kernel.size1( ) - kernel_center_i ) + 1;\n \t\tconst size_type s_j = kernel_center_j;\n \t\tconst size_type e_j = in.size2( ) - ( kernel.size2( ) - kernel_center_j ) + 1;\n \n-\t\ttypedef array2< T_in, Allocator_in >::const_pointer const_pointer;\n+\t\ttypedef typename array2< T_in, Allocator_in >::const_pointer const_pointer;\n \t\tdifference_type *pindex = new difference_type[ kernel.size( ) ];\n \n \t\tsize_type\t i, j, count = 0;\n@@ -251,7 +251,7 @@\n \t\ttypedef typename array3< T_in, Allocator_in >::size_type\t\tsize_type;\n \t\ttypedef typename array3< T_in, Allocator_in >::difference_type\tdifference_type;\n \t\ttypedef typename array3< T_out, Allocator_out >::value_type\t\tout_type;\n-\t\ttypedef typename Calc_type\t\t\t\t\t\t\t\t\t\tcalc_type;\n+\t\ttypedef Calc_type\t\t\t\t\t\t\t\t\t\t\t\tcalc_type;\n \t\t\n \t\tconst size_type s_i = kernel_center_i;\n \t\tconst size_type e_i = in.size1( ) - ( kernel.size1( ) - kernel_center_i ) + 1;\n@@ -260,7 +260,7 @@\n \t\tconst size_type s_k = kernel_center_k;\n \t\tconst size_type e_k = in.size3( ) - ( kernel.size3( ) - kernel_center_k ) + 1;\n \n-\t\ttypedef array3< T_in, Allocator_in >::const_pointer const_pointer;\n+\t\ttypedef typename array3< T_in, Allocator_in >::const_pointer const_pointer;\n \t\tdifference_type *pindex = new difference_type[ kernel.size( ) ];\n \n \t\tsize_type\t\ti, j, k, count = 0;\n@@ -373,8 +373,12 @@\n \t\/\/\/\/\/\/ ftHg\u33c8\u0590IuWFNg\ud803\udd90\n \t\/\/\/\/\/\/\n \ttemplate < class Calc_type, class Out_type >\n-\tstruct default_func : public std::unary_function< Calc_type, Out_type > \n-\t{\n+\tstruct default_func : public std::unary_function< Calc_type, Out_type >\n+\t{\n+\t\ttypedef std::unary_function< Calc_type, Out_type > base;\n+\t\ttypedef typename base::result_type result_type;\n+\t\ttypedef typename base::argument_type argument_type;\n+\n \t\tresult_type operator( )( argument_type v )\n \t\t{\n \t\t\treturn ( static_cast< result_type >( v ) );\n@@ -390,7 +394,11 @@\n \ttemplate < class Calc_type, class Out_type, class Unary_func >\n \tstruct post_func1 : public std::unary_function< Calc_type, Out_type >\n \t{\n-\t\ttypedef typename Unary_func\t\t\t\t\tunary_func;\n+\t\ttypedef std::unary_function< Calc_type, Out_type > base;\n+\t\ttypedef typename base::result_type result_type;\n+\t\ttypedef typename base::argument_type argument_type;\n+\n+\t\ttypedef Unary_func\t\t\t\t\t\t\tunary_func;\n \t\ttypedef typename unary_func::argument_type\tunary_arg;\n \t\t\n \t\tunary_func u_func_;\n@@ -409,8 +417,12 @@\n \ttemplate < class Calc_type, class Out_type, class Unary_arg, class Unary_res >\n \tstruct post_func2 : public std::unary_function< Calc_type, Out_type >\n \t{\n-\t\ttypedef typename Unary_res\tunary_func( Unary_arg );\n-\t\ttypedef typename Unary_arg\tunary_arg;\n+\t\ttypedef std::unary_function< Calc_type, Out_type > base;\n+\t\ttypedef typename base::result_type result_type;\n+\t\ttypedef typename base::argument_type argument_type;\n+\n+\t\ttypedef Unary_res\tunary_func( Unary_arg );\n+\t\ttypedef Unary_arg\tunary_arg;\n \t\t\n \t\tunary_func *u_func_;\n \n@@ -823,10 +835,10 @@\n \t\t\t\t\t\t\tUnary_res\t\t\t\t\t\t\t\t\tu_func( Unary_arg ),\n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tconst unsigned int\tkernel_center = kernel.size( ) \/ 2;\n \n@@ -841,9 +853,9 @@\n \t\t\t\t\t\t\tUnary_func\t\t\t\t\t\t\t\t\tu_func,\n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tconst unsigned int\tkernel_center = kernel.size( ) \/ 2;\n \n@@ -857,8 +869,8 @@\n \t\t\t\t\t\t\tarray< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tconst unsigned int\tkernel_center = kernel.size( ) \/ 2;\n \n@@ -883,10 +895,10 @@\n \t\t\t\t\t\t\tUnary_res\t\t\t\t\t\t\t\t\tu_func( Unary_arg ),\n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \n@@ -900,9 +912,9 @@\n \t\t\t\t\t\t\tUnary_func\t\t\t\t\t\t\t\t\tu_func,\n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \n@@ -915,8 +927,8 @@\n \t\t\t\t\t\t\tarray1< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \n@@ -941,10 +953,10 @@\n \t\t\t\t\t\t\tUnary_res\t\t\t\t\t\t\t\t\tu_func( Unary_arg ),\n \t\t\t\t\t\t\tconst array2< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -959,9 +971,9 @@\n \t\t\t\t\t\t\tUnary_func\t\t\t\t\t\t\t\t\tu_func,\n \t\t\t\t\t\t\tconst array2< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -975,8 +987,8 @@\n \t\t\t\t\t\t\tarray2< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tconst array2< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -1002,10 +1014,10 @@\n \t\t\t\t\t\t\tUnary_res\t\t\t\t\t\t\t\t\tu_func( Unary_arg ),\n \t\t\t\t\t\t\tconst array3< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -1021,9 +1033,9 @@\n \t\t\t\t\t\t\tUnary_func\t\t\t\t\t\t\t\t\tu_func,\n \t\t\t\t\t\t\tconst array3< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -1038,8 +1050,8 @@\n \t\t\t\t\t\t\tarray3< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tconst array3< T_kernel, Allocator_kernel >\t&kernel )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tconst unsigned int\tkernel_center_i = kernel.width( ) \/ 2;\n \tconst unsigned int\tkernel_center_j = kernel.height( ) \/ 2;\n@@ -1066,10 +1078,10 @@\n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tkernel_center = ( kernel_center < kernel.size( ) ) ? kernel_center : ( kernel.size( ) - 1 );\n \n@@ -1085,9 +1097,9 @@\n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tkernel_center = ( kernel_center < kernel.size( ) ) ? kernel_center : ( kernel.size( ) - 1 );\n \n@@ -1102,8 +1114,8 @@\n \t\t\t\t\t\t\tconst array< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tkernel_center = ( kernel_center < kernel.size( ) ) ? kernel_center : ( kernel.size( ) - 1 );\n \n@@ -1127,10 +1139,10 @@\n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \n@@ -1145,9 +1157,9 @@\n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \n@@ -1161,8 +1173,8 @@\n \t\t\t\t\t\t\tconst array1< T_kernel, Allocator_kernel >\t&kernel, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i )\n {\n-\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array1< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \n@@ -1188,10 +1200,10 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i,\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_j )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \tkernel_center_j = ( kernel_center_j < kernel.height( ) ) ? kernel_center_j : ( kernel.height( ) - 1 );\n@@ -1208,9 +1220,9 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i,\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_j )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \tkernel_center_j = ( kernel_center_j < kernel.height( ) ) ? kernel_center_j : ( kernel.height( ) - 1 );\n@@ -1226,8 +1238,8 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_i,\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_j )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \tkernel_center_j = ( kernel_center_j < kernel.height( ) ) ? kernel_center_j : ( kernel.height( ) - 1 );\n@@ -1256,10 +1268,10 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\tkernel_center_j, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\tkernel_center_k )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \tkernel_center_j = ( kernel_center_j < kernel.height( ) ) ? kernel_center_j : ( kernel.height( ) - 1 );\n@@ -1278,9 +1290,9 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\tkernel_center_j, \n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\tkernel_center_k )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \tkernel_center_i = ( kernel_center_i < kernel.width( ) ) ? kernel_center_i : ( kernel.width( ) - 1 );\n \tkernel_center_j = ( kernel_center_j < kernel.height( ) ) ? kernel_center_j : ( kernel.height( ) - 1 );\n@@ -1298,8 +1310,8 @@\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_j,\n \t\t\t\t\t\t\tunsigned int\t\t\t\t\t\t\t\tkernel_center_k )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \t__linear_filter__::apply< calc_type >( in, out, kernel, kernel_center_i, kernel_center_j, kernel_center_k, __linear_filter__::default_func< calc_type, out_type >( ) );\n }\n@@ -1320,11 +1332,11 @@\n \t\t\t\t\t\tArray_out\t\t\t\t\t\t\t\t\t&out,\n \t\t\t\t\t\tUnary_res\t\t\t\t\t\t\t\t\tu_func( Unary_arg ) )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::gaus, calc_type >( in, out, __linear_filter__::post_func2< calc_type, out_type, unary_arg, unary_res >( u_func ) );\n }\n@@ -1336,10 +1348,10 @@\n \t\t\t\t\t\tArray_out\t\t\t\t\t\t\t\t\t&out,\n \t\t\t\t\t\tUnary_func\t\t\t\t\t\t\t\t\tu_func )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::gaus, calc_type >( in, out, __linear_filter__::post_func1< calc_type, out_type, unary_func >( u_func ) );\n }\n@@ -1350,9 +1362,9 @@\n \t\t\t\t\t\t\tconst Array_in\t\t&in,\n \t\t\t\t\t\t\tArray_out\t\t\t&out )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::gaus, calc_type >( in, out, __linear_filter__::default_func< calc_type, out_type >( ) );\n }\n@@ -1363,10 +1375,10 @@\n \t\t\t\t\t\t\tarray< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tdouble\t\t\t\t\t\t\t\t\t\tsigma )\n {\n-\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename array< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n-\ttypedef typename array< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename array< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n+\ttypedef typename array< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tdouble _2sigma = 2.0 * sigma * sigma;\n \n@@ -1383,7 +1395,7 @@\n \t\tsum += e;\n \t}\n \n-\tfor( slze_type l = 0 ; l < kernel.slze( ) ; l++ )\n+\tfor( size_type l = 0 ; l < kernel.size( ) ; l++ )\n \t{\n \t\tkernel[ l ] \/= sum;\n \t}\n@@ -1397,10 +1409,10 @@\n \t\t\t\t\t\t\tarray2< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tdouble\t\t\t\t\t\t\t\t\t\tsigma )\n {\n-\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename array2< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n-\ttypedef typename array2< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array2< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename array2< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n+\ttypedef typename array2< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tdifference_type r = sigma - static_cast< int >( sigma ) == 0.0 ? static_cast< int >( sigma ) : static_cast< int >( sigma ) + 1;\n \tarray2< double > kernel( 2 * r + 1, 2 * r + 1 );\n@@ -1432,10 +1444,10 @@\n \t\t\t\t\t\t\tarray3< T_out, Allocator_out >\t\t\t\t&out, \n \t\t\t\t\t\t\tdouble\t\t\t\t\t\t\t\t\t\tsigma )\n {\n-\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename array3< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n-\ttypedef typename array3< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef typename array3< T_out, Allocator_out >::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename array3< T_out, Allocator_out >::size_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tsize_type;\n+\ttypedef typename array3< T_out, Allocator_out >::difference_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tdifference_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \tdifference_type r = sigma - static_cast< int >( sigma ) == 0.0 ? static_cast< int >( sigma ) : static_cast< int >( sigma ) + 1;\n \tarray3< double > kernel( 2 * r + 1, 2 * r + 1, 2 * r + 1 );\n@@ -1484,11 +1496,11 @@\n \t\t\t\t\t\tArray_out\t\t\t&out,\n \t\t\t\t\t\tUnary_res\t\t\tu_func( Unary_arg ) )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n-\ttypedef typename Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_arg\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_arg;\n+\ttypedef Unary_res\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_res;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::lapl, calc_type >( in, out, __linear_filter__::post_func2< calc_type, out_type, unary_arg, unary_res >( u_func ) );\n }\n@@ -1500,10 +1512,10 @@\n \t\t\t\t\t\tArray_out\t\t\t&out,\n \t\t\t\t\t\tUnary_func\t\t\tu_func )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n-\ttypedef typename Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n+\ttypedef Unary_func\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tunary_func;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::lapl, calc_type >( in, out, __linear_filter__::post_func1< calc_type, out_type, unary_func >( u_func ) );\n }\n@@ -1514,9 +1526,9 @@\n \t\t\t\t\t\t\tconst Array_in\t\t&in,\n \t\t\t\t\t\t\tArray_out\t\t\t&out )\n {\n-\ttypedef typename __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n-\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n-\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::_type< out_type >::calc_type\tcalc_type;\n+\ttypedef __linear_filter__::filter_style\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tfilter_style;\n+\ttypedef typename Array_out::value_type\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tout_type;\n+\ttypedef typename __linear_filter__::_is_arithm< is_arithmetic< out_type >::value >::template _type< out_type >::calc_type\tcalc_type;\n \n \t__linear_filter__::apply_pre_defined_kernel< filter_style::lapl, calc_type >( in, out, __linear_filter__::default_func< calc_type, out_type >( ) );\n }\n"} {"commit":"8d9a0c446d7f9eed42527e90eecf5e58f6a5f1ec","subject":"[IOT-2883] SVR DB editor is broken in 1.3-rel","message":"[IOT-2883] SVR DB editor is broken in 1.3-rel\n\nAdding InitPstatResourceToDefault() to svrdbeditor,\nfor initialize gPstat and correctly get dos.state\n\nChange-Id: I5eefd50d6dcfcc35fd20ffd3e6e147acbf924e45\nSigned-off-by: Vadym Riznyk <17834c1f27fdaf8ea28ff10835a57e2bbdc5d31c@samsung.com>\n","repos":"iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,rzr\/iotivity,rzr\/iotivity,iotivity\/iotivity,iotivity\/iotivity","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- resource\/csdk\/security\/tool\/svrdbeditor_src\/svrdbeditor.c\n+++ resource\/csdk\/security\/tool\/svrdbeditor_src\/svrdbeditor.c\n@@ -31,6 +31,7 @@\n #include \"svrdbeditorcred.h\"\n #include \"svrdbeditordoxm.h\"\n #include \"svrdbeditorpstat.h\"\n+#include \"pstatresource.h\"\n \n static bool g_allowedEditMenu[SVR_EDIT_IDX_SIZE] = {false\/*unused*\/, false, false, false, false};\n static char g_svrDbPath[SVR_DB_PATH_LENGTH];\n@@ -98,6 +99,9 @@\n PRINT_ERR(\"OCRegisterPersistentStorageHandler : %d\", ocResult);\n return -1;\n }\n+\n+ InitPstatResourceToDefault();\n+\n RefreshACL();\n RefreshCred();\n RefreshDoxm();\n"} {"commit":"8b35eac873d9aad4f610d240b32f5f81f588a5c1","subject":"fix enum importing for swift","message":"fix enum importing for swift\n","repos":"Will-tm\/WMGaugeView","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- WMGaugeView\/WMGaugeView.h\n+++ WMGaugeView\/WMGaugeView.h\n@@ -13,13 +13,11 @@\n \/**\n * Styling enumerations\n *\/\n-typedef enum\n-{\n+typedef NS_ENUM(NSUInteger, WMGaugeViewSubdivisionsAlignment) {\n WMGaugeViewSubdivisionsAlignmentTop,\n WMGaugeViewSubdivisionsAlignmentCenter,\n WMGaugeViewSubdivisionsAlignmentBottom\n-}\n-WMGaugeViewSubdivisionsAlignment;\n+};\n \n \/**\n * WMGaugeView class\n"} {"commit":"126b42c6d281841acc541735e845d94c54298f46","subject":"Support auto-detection of animated pictures","message":"Support auto-detection of animated pictures\n","repos":"patrikrm13\/tgl,tplgy\/tgl,mentor81\/tgl,majn\/tgl,ioiasff\/tgl,BenWiederhake\/tgl,patrikrm13\/tgl,tplgy\/tgl,appendhc\/tgl,vysheng\/tgl,BenWiederhake\/tgl,majn\/tgl,hedayat\/tgl,mentor81\/tgl,tplgy\/tgl,tplgy\/tgl,vysheng\/tgl,vk496\/tgl,appendhc\/tgl,vk496\/tgl,ioiasff\/tgl","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- queries.c\n+++ queries.c\n@@ -1717,7 +1717,9 @@\n void tgl_do_send_document (struct tgl_state *TLS, tgl_peer_id_t to_id, const char *file_name, const char *caption, int caption_len, unsigned long long flags, void (*callback)(struct tgl_state *TLS, void *callback_extra, int success, struct tgl_message *M), void *callback_extra) {\n if (flags & TGL_SEND_MSG_FLAG_DOCUMENT_AUTO) {\n char *mime_type = tg_mime_by_filename (file_name);\n- if (!memcmp (mime_type, \"image\/\", 6)) {\n+ if (strcmp (mime_type, \"image\/gif\") == 0) {\n+ flags |= TGL_SEND_MSG_FLAG_DOCUMENT_ANIMATED;\n+ } else if (!memcmp (mime_type, \"image\/\", 6)) {\n flags |= TGL_SEND_MSG_FLAG_DOCUMENT_PHOTO;\n } else if (!memcmp (mime_type, \"video\/\", 6)) {\n flags |= TGLDF_VIDEO;\n"} {"commit":"15f6be5d84ab788c38313811de76b8a963db78bc","subject":"Use ifndef for V4L2 hacks","message":"Use ifndef for V4L2 hacks\n\nThis should make life easier for *BSD support, and less error-prone on\nLinux. Unfortunately, this does not work for enumerations.\n","repos":"xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/access\/v4l2\/v4l2.h\n+++ modules\/access\/v4l2\/v4l2.h\n@@ -29,23 +29,28 @@\n #endif\n \n \/* Hacks to compile with old headers *\/\n+#ifndef V4L2_CTRL_FLAG_VOLATILE \/* 3.2 *\/\n+# warning Please update Video4Linux2 headers!\n+# define V4L2_CTRL_FLAG_VOLATILE 0x0080\n+#endif\n #ifdef __linux__\n # include <linux\/version.h>\n-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)\n-# warning Please update Video4Linux2 headers!\n-# define V4L2_CTRL_FLAG_VOLATILE 0x0080\n-# endif\n # if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)\n # define V4L2_CTRL_TYPE_BITMASK 8\n # endif\n-# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)\n-# define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36)\n-# endif\n-# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)\n-# define V4L2_CID_ROTATE (V4L2_CID_BASE+34)\n-# define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35)\n-# endif\n #endif\n+#ifndef V4L2_CID_ILLUMINATORS_1 \/* 2.6.37 *\/\n+# define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+38)\n+# define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+37)\n+#endif\n+#ifndef V4L2_CID_CHROMA_GAIN \/* 2.6.35 *\/\n+# define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36)\n+#endif\n+#ifndef V4L2_CID_ROTATE \/* 2.6.33 *\/\n+# define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35)\n+# define V4L2_CID_ROTATE (V4L2_CID_BASE+34)\n+#endif\n+\n \n #ifdef HAVE_LIBV4L2\n # include <libv4l2.h>\n"} {"commit":"63f94156fd5db7838cfeec1d30e00b7052408ac4","subject":"server: vhost: made the initialization mutex instance safe","message":"server: vhost: made the initialization mutex instance safe\n\nSigned-off-by: Leonardo Alminana <7610bae85f2b530654cc716772f1fe653373e892@calyptia.com>\n","repos":"monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mk_server\/mk_vhost.c\n+++ mk_server\/mk_vhost.c\n@@ -28,13 +28,9 @@\n \n #include <mk_core\/mk_dirent.h>\n \n-\/\/#include <regex.h>\n #include <re.h>\n #include <sys\/stat.h>\n #include <fcntl.h>\n-\n-\/* Initialize Virtual Host FDT mutex *\/\n-pthread_mutex_t mk_vhost_fdt_mutex = PTHREAD_MUTEX_INITIALIZER;\n \n static int str_to_regex(char *str, regex_t *reg)\n {\n@@ -84,7 +80,7 @@\n * Under an initialization context we need to protect this critical\n * section\n *\/\n- pthread_mutex_lock(&mk_vhost_fdt_mutex);\n+ pthread_mutex_lock(&server->vhost_fdt_mutex);\n \n \/*\n * Initialize the thread FDT\/Hosts list and create an entry per\n@@ -116,7 +112,7 @@\n }\n \n MK_TLS_SET(mk_tls_vhost_fdt, list);\n- pthread_mutex_unlock(&mk_vhost_fdt_mutex);\n+ pthread_mutex_unlock(&server->vhost_fdt_mutex);\n \n return 0;\n }\n"} {"commit":"90e3a296a118d0f76959cb9c7256ee04379094f7","subject":"Add missing header","message":"Add missing header\n\n","repos":"jomanmuk\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/access\/vcd\/cdrom.c\n+++ modules\/access\/vcd\/cdrom.c\n@@ -65,8 +65,11 @@\n #elif defined( WIN32 )\n # include <windows.h>\n # include <winioctl.h>\n+#elif defined (__linux__)\n+# include <sys\/ioctl.h>\n+# include <linux\/cdrom.h>\n #else\n-# include <linux\/cdrom.h>\n+# error FIXME\n #endif\n \n #include \"cdrom_internals.h\"\n"} {"commit":"49b5e03de046e4105932d43be026b81d5cdbbcca","subject":"server: vhost: do not leak file descriptor (CID 1245664)","message":"server: vhost: do not leak file descriptor (CID 1245664)\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@monkey.io>\n","repos":"sujayraaj\/monkey_rtems,dreamsxin\/monkey,WilliamRen\/monkey-1,WilliamRen\/monkey-1,sujayraaj\/monkeyTest,sujayraaj\/monkeyTest,sbagmeijer\/monkey,dougsko\/monkey,sbagmeijer\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey,dreamsxin\/monkey,sujayraaj\/monkey,sbagmeijer\/monkey,WilliamRen\/monkey-1,monkey\/monkey,monkey\/monkey,sbagmeijer\/monkey,sujayraaj\/monkey,sujayraaj\/monkey,dougsko\/monkey,WilliamRen\/monkey-1,monkey\/monkey,dougsko\/monkey,sujayraaj\/monkey_rtems,sujayraaj\/monkey_rtems,sujayraaj\/monkeyTest,dougsko\/monkey,sujayraaj\/monkey_rtems,sujayraaj\/monkey_rtems,dreamsxin\/monkey,dreamsxin\/monkey,sbagmeijer\/monkey,sujayraaj\/monkey,dougsko\/monkey,WilliamRen\/monkey-1,sujayraaj\/monkeyTest,dreamsxin\/monkey,sujayraaj\/monkey","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mk_server\/mk_vhost.c\n+++ mk_server\/mk_vhost.c\n@@ -185,7 +185,7 @@\n struct mk_http_request *sr)\n {\n int i;\n- int fd;\n+ int fd = -1;\n struct vhost_fdt_hash_table *ht = NULL;\n struct vhost_fdt_hash_chain *hc;\n \n@@ -241,7 +241,7 @@\n }\n }\n \n- return -1;\n+ return fd;\n }\n \n static inline int mk_vhost_fdt_close(struct mk_http_request *sr)\n"} {"commit":"690f02751f75fa508052b98e7de385916dbdefba","subject":"remote: get rid of bogus ATTRIBUTE_UNUSED annotation client param","message":"remote: get rid of bogus ATTRIBUTE_UNUSED annotation client param\n\nThe client parameter is always used to get access to the private data\nstruct.\n\nReviewed-by: Andrea Bolognani <3ada0bee826c753786fdbba72243dfba997094cf@redhat.com>\nSigned-off-by: Daniel P. Berrang\u00e9 <bb938cf255e055ff3507f2627d214e8e62118fcf@redhat.com>\n","repos":"libvirt\/libvirt,fabianfreyer\/libvirt,libvirt\/libvirt,olafhering\/libvirt,jardasgit\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,nertpinx\/libvirt,nertpinx\/libvirt,jardasgit\/libvirt,zippy2\/libvirt,olafhering\/libvirt,fabianfreyer\/libvirt,fabianfreyer\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt,jfehlig\/libvirt,andreabolognani\/libvirt,olafhering\/libvirt,nertpinx\/libvirt,jfehlig\/libvirt,libvirt\/libvirt,zippy2\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,nertpinx\/libvirt,fabianfreyer\/libvirt,crobinso\/libvirt,zippy2\/libvirt,libvirt\/libvirt,olafhering\/libvirt,zippy2\/libvirt,andreabolognani\/libvirt,crobinso\/libvirt,jardasgit\/libvirt,jardasgit\/libvirt,andreabolognani\/libvirt,jfehlig\/libvirt","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/remote\/remote_daemon_dispatch.c\n+++ src\/remote\/remote_daemon_dispatch.c\n@@ -2006,7 +2006,7 @@\n \n static int\n remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)\n {\n@@ -2017,7 +2017,7 @@\n \n static int\n remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_scheduler_type_args *args,\n@@ -2054,7 +2054,7 @@\n \n static int\n remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_scheduler_parameters_args *args,\n@@ -2104,7 +2104,7 @@\n \n static int\n remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_scheduler_parameters_flags_args *args,\n@@ -2155,7 +2155,7 @@\n \n static int\n remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_memory_stats_args *args,\n@@ -2213,7 +2213,7 @@\n \n static int\n remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_block_peek_args *args,\n@@ -2267,7 +2267,7 @@\n \n static int\n remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_block_stats_flags_args *args,\n@@ -2330,7 +2330,7 @@\n \n static int\n remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_memory_peek_args *args,\n@@ -2382,7 +2382,7 @@\n \n static int\n remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_security_label_args *args,\n@@ -2426,7 +2426,7 @@\n \n static int\n remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_security_label_list_args *args,\n@@ -2483,7 +2483,7 @@\n \n static int\n remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_security_model_ret *ret)\n@@ -2522,7 +2522,7 @@\n \n static int\n remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_vcpu_pin_info_args *args,\n@@ -2623,7 +2623,7 @@\n \n static int\n remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_emulator_pin_info_args *args,\n@@ -2672,7 +2672,7 @@\n \n static int\n remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_vcpus_args *args,\n@@ -2825,7 +2825,7 @@\n \n static int\n remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_prepare_args *args,\n@@ -2880,7 +2880,7 @@\n \n static int\n remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_prepare2_args *args,\n@@ -2932,7 +2932,7 @@\n \n static int\n remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_memory_parameters_args *args,\n@@ -2994,7 +2994,7 @@\n \n static int\n remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_numa_parameters_args *args,\n@@ -3056,7 +3056,7 @@\n \n static int\n remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_blkio_parameters_args *args,\n@@ -3118,7 +3118,7 @@\n \n static int\n remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_cpu_stats_args *args,\n@@ -3190,7 +3190,7 @@\n \n static int\n remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_memory_stats_args *args,\n@@ -3262,7 +3262,7 @@\n \n static int\n remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_launch_security_info_args *args,\n@@ -3309,7 +3309,7 @@\n \n static int\n remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_perf_events_args *args,\n@@ -3356,7 +3356,7 @@\n \n static int\n remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_block_job_info_args *args,\n@@ -3396,7 +3396,7 @@\n \n static int\n remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr hdr ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_block_io_tune_args *args,\n@@ -3974,7 +3974,7 @@\n \n static int\n remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_device_get_parent_args *args,\n@@ -4230,7 +4230,7 @@\n \n static int\n remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_secret_get_value_args *args,\n@@ -4268,7 +4268,7 @@\n \n static int\n remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_state_args *args,\n@@ -4562,7 +4562,7 @@\n \n static int\n qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n qemu_domain_monitor_command_args *args,\n@@ -4597,7 +4597,7 @@\n \n static int\n remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_begin3_args *args,\n@@ -4648,7 +4648,7 @@\n \n static int\n remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_prepare3_args *args,\n@@ -4704,7 +4704,7 @@\n \n static int\n remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_perform3_args *args,\n@@ -4759,7 +4759,7 @@\n \n static int\n remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_finish3_args *args,\n@@ -4813,7 +4813,7 @@\n \n static int\n remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_confirm3_args *args)\n@@ -4913,7 +4913,7 @@\n \n static int\n remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg,\n virNetMessageErrorPtr rerr,\n remote_domain_open_graphics_args *args)\n@@ -4954,7 +4954,7 @@\n \n static int\n remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg,\n virNetMessageErrorPtr rerr,\n remote_domain_open_graphics_fd_args *args)\n@@ -4997,7 +4997,7 @@\n \n static int\n remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_interface_parameters_args *args,\n@@ -5060,7 +5060,7 @@\n \n static int\n remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr hdr ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_get_cpu_stats_args *args,\n@@ -5192,7 +5192,7 @@\n \n static int\n remoteDispatchNodeGetSevInfo(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_sev_info_args *args,\n@@ -5236,7 +5236,7 @@\n \n static int\n remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_memory_parameters_args *args,\n@@ -5293,7 +5293,7 @@\n \n static int\n remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_node_get_cpu_map_args *args,\n@@ -5340,7 +5340,7 @@\n \n static int\n lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n lxc_domain_open_namespace_args *args)\n@@ -5440,7 +5440,7 @@\n \n static int\n remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_begin3_params_args *args,\n@@ -5497,7 +5497,7 @@\n \n static int\n remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_prepare3_params_args *args,\n@@ -5627,7 +5627,7 @@\n \n static int\n remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_perform3_params_args *args,\n@@ -5688,7 +5688,7 @@\n \n static int\n remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_finish3_params_args *args,\n@@ -5749,7 +5749,7 @@\n \n static int\n remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_domain_migrate_confirm3_params_args *args)\n@@ -5800,7 +5800,7 @@\n \n static int\n remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_connect_get_cpu_model_names_args *args,\n@@ -7181,7 +7181,7 @@\n \n static int\n remoteDispatchNetworkPortGetParameters(virNetServerPtr server ATTRIBUTE_UNUSED,\n- virNetServerClientPtr client ATTRIBUTE_UNUSED,\n+ virNetServerClientPtr client,\n virNetMessagePtr msg ATTRIBUTE_UNUSED,\n virNetMessageErrorPtr rerr,\n remote_network_port_get_parameters_args *args,\n"} {"commit":"8db16d848da1eda4529a93e96ee0ae0be4e583d7","subject":"Fix typos in documentation.","message":"Fix typos in documentation.\n\nAddressing:\nsrc\/XCCDF\/public\/xccdf_benchmark.h:785: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2478: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2480: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2482: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2484: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2486: warning: Found unknown command `\\memeberof'\nsrc\/XCCDF\/public\/xccdf_benchmark.h:2909: warning: Found unknown command `\\memeberof'\n","repos":"ybznek\/openscap,ybznek\/openscap,mpreisler\/openscap,OpenSCAP\/openscap,redhatrises\/openscap,OpenSCAP\/openscap,isimluk\/openscap,openprivacy\/openscap,postfix\/openscap,postfix\/openscap,redhatrises\/openscap,mpreisler\/openscap,redhatrises\/openscap,redhatrises\/openscap,openprivacy\/openscap,ybznek\/openscap,OpenSCAP\/openscap,Hexadorsimal\/openscap,openprivacy\/openscap,redhatrises\/openscap,jan-cerny\/openscap,OpenSCAP\/openscap,ybznek\/openscap,mpreisler\/openscap,redhatrises\/openscap,postfix\/openscap,Hexadorsimal\/openscap,mpreisler\/openscap,Hexadorsimal\/openscap,postfix\/openscap,jan-cerny\/openscap,openprivacy\/openscap,isimluk\/openscap,isimluk\/openscap,openprivacy\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,jan-cerny\/openscap,isimluk\/openscap,jan-cerny\/openscap,Hexadorsimal\/openscap,OpenSCAP\/openscap,ybznek\/openscap,postfix\/openscap,Hexadorsimal\/openscap,isimluk\/openscap,OpenSCAP\/openscap,isimluk\/openscap,Hexadorsimal\/openscap,mpreisler\/openscap,mpreisler\/openscap,ybznek\/openscap,openprivacy\/openscap,postfix\/openscap","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/XCCDF\/public\/xccdf_benchmark.h\n+++ src\/XCCDF\/public\/xccdf_benchmark.h\n@@ -782,7 +782,7 @@\n struct xccdf_status *xccdf_status_new(void);\n \/\/\/ @memberof xccdf_status\n struct xccdf_status * xccdf_status_clone(const struct xccdf_status * old_status);\n-\/\/\/ @memeberof xccdf_status\n+\/\/\/ @memberof xccdf_status\n struct xccdf_status *xccdf_status_new_fill(const char *status, const char *date);\n \/\/\/ @memberof xccdf_status\n void xccdf_status_free(struct xccdf_status *status);\n@@ -2475,15 +2475,15 @@\n xccdf_warning_category_t xccdf_warning_get_category(const struct xccdf_warning *warning);\n \/\/\/ @memberof xccdf_warning\n struct oscap_text *xccdf_warning_get_text(const struct xccdf_warning *warning);\n-\/\/\/ @memeberof xccdf_refine_rule\n+\/\/\/ @memberof xccdf_refine_rule\n const char * xccdf_refine_rule_get_item(const struct xccdf_refine_rule* rr);\n-\/\/\/ @memeberof xccdf_refine_rule\n+\/\/\/ @memberof xccdf_refine_rule\n const char * xccdf_refine_rule_get_selector(const struct xccdf_refine_rule* rr);\n-\/\/\/ @memeberof xccdf_refine_rule\n+\/\/\/ @memberof xccdf_refine_rule\n xccdf_role_t xccdf_refine_rule_get_role(const struct xccdf_refine_rule* rr);\n-\/\/\/ @memeberof xccdf_refine_rule\n+\/\/\/ @memberof xccdf_refine_rule\n xccdf_level_t xccdf_refine_rule_get_severity(const struct xccdf_refine_rule* rr);\n-\/\/\/ @memeberof xccdf_refine_rule\n+\/\/\/ @memberof xccdf_refine_rule\n struct oscap_text_iterator* xccdf_refine_rule_get_remarks(const struct xccdf_refine_rule *rr);\n \/\/\/ @memberof xccdf_refine_rule\n xccdf_numeric xccdf_refine_rule_get_weight(const struct xccdf_refine_rule *item);\n@@ -2906,7 +2906,7 @@\n \n \/\/\/ @memberof xccdf_set_value\n struct xccdf_setvalue *xccdf_setvalue_new(void);\n-\/\/\/ @memeberof xccdf_set_value\n+\/\/\/ @memberof xccdf_set_value\n struct xccdf_setvalue * xccdf_setvalue_clone(const struct xccdf_setvalue * old_value);\n \/\/\/ @memberof xccdf_set_value\n bool xccdf_setvalue_set_item(struct xccdf_setvalue *obj, const char *newval);\n"} {"commit":"c57ba11db7cd6316a6ea44aa4605fc0d08e5b8fe","subject":"utility function for extracting vector of objects from property tree","message":"utility function for extracting vector of objects from property tree\n","repos":"kashefy\/elm,kashefy\/elm,kashefy\/elm,kashefy\/elm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- modules\/core\/ptree_utils.h\n+++ modules\/core\/ptree_utils.h\n@@ -4,6 +4,8 @@\n #define SEM_CORE_PTREE_UTILS_H_\n \n #include <iostream>\n+\n+#include <boost\/foreach.hpp>\n #include <boost\/property_tree\/ptree.hpp>\n \n namespace sem\n@@ -20,6 +22,15 @@\n typename PTree::key_type::value_type\n > &stream=std::cout);\n \n+template <class T>\n+void push_back_child(const PTree &p, const std::string &key, std::vector<T> &v)\n+{\n+ BOOST_FOREACH(const PTree::value_type &node, p.get_child(key)) {\n+\n+ v.push_back(node.second.get_value<T>());\n+ }\n+}\n+\n }\n \n #endif \/\/ SEM_CORE_PTREE_UTILS_H_\n"} {"commit":"722dcbf6f20b03040f7b2fbe2c6fb44747c634f4","subject":"[Matrix]: handle min\/max in the same way as R.","message":"[Matrix]: handle min\/max in the same way as R.\n","repos":"icoming\/FlashGraph,icoming\/FlashX,icoming\/FlashGraph,icoming\/FlashGraph,flashxio\/FlashX,icoming\/FlashGraph,flashxio\/FlashX,flashxio\/FlashX,flashxio\/FlashX,icoming\/FlashX,icoming\/FlashGraph,flashxio\/FlashX,icoming\/FlashX,icoming\/FlashX,icoming\/FlashX,flashxio\/FlashX","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- matrix\/bulk_operate.h\n+++ matrix\/bulk_operate.h\n@@ -459,6 +459,60 @@\n \t}\n };\n \n+template<class LeftType, class RightType, class ResType>\n+struct min\n+{\n+\tstatic std::string get_name() {\n+\t\treturn \"min\";\n+\t}\n+\tResType operator()(const LeftType &e1, const RightType &e2) const {\n+\t\treturn std::min(e1, e2);\n+\t}\n+};\n+\n+template<>\n+struct min<double, double, double>\n+{\n+\tstatic std::string get_name() {\n+\t\treturn \"min\";\n+\t}\n+\tdouble operator()(const double &e1, const double &e2) const {\n+\t\tif (std::isnan(e1))\n+\t\t\treturn e1;\n+\t\telse if (std::isnan(e2))\n+\t\t\treturn e2;\n+\t\telse\n+\t\t\treturn std::min(e1, e2);\n+\t}\n+};\n+\n+template<class LeftType, class RightType, class ResType>\n+struct max\n+{\n+\tstatic std::string get_name() {\n+\t\treturn \"max\";\n+\t}\n+\tResType operator()(const LeftType &e1, const RightType &e2) const {\n+\t\treturn std::max(e1, e2);\n+\t}\n+};\n+\n+template<>\n+struct max<double, double, double>\n+{\n+\tstatic std::string get_name() {\n+\t\treturn \"max\";\n+\t}\n+\tdouble operator()(const double &e1, const double &e2) const {\n+\t\tif (std::isnan(e1))\n+\t\t\treturn e1;\n+\t\telse if (std::isnan(e2))\n+\t\t\treturn e2;\n+\t\telse\n+\t\t\treturn std::max(e1, e2);\n+\t}\n+};\n+\n \/*\n * This template implements all basic binary operators for different types.\n *\/\n@@ -501,24 +555,6 @@\n \t\t}\n \t\tfloat operator()(const float &e1, const float &e2) const {\n \t\t\treturn e1 \/ e2;\n-\t\t}\n-\t};\n-\n-\tstruct min {\n-\t\tstatic std::string get_name() {\n-\t\t\treturn \"min\";\n-\t\t}\n-\t\tResType operator()(const LeftType &e1, const RightType &e2) const {\n-\t\t\treturn std::min(e1, e2);\n-\t\t}\n-\t};\n-\n-\tstruct max {\n-\t\tstatic std::string get_name() {\n-\t\t\treturn \"max\";\n-\t\t}\n-\t\tResType operator()(const LeftType &e1, const RightType &e2) const {\n-\t\t\treturn std::max(e1, e2);\n \t\t}\n \t};\n \n@@ -609,8 +645,10 @@\n \t\tLeftType, RightType, ResType> mul_op;\n \tbulk_operate_impl<divide, LeftType, RightType, double> div_op;\n \tbulk_operate_impl<divide_float, float, float, float> div_float_op;\n-\tbulk_operate_impl<min, LeftType, RightType, ResType> min_op;\n-\tbulk_operate_impl<max, LeftType, RightType, ResType> max_op;\n+\tbulk_operate_impl<min<LeftType, RightType, ResType>,\n+\t\tLeftType, RightType, ResType> min_op;\n+\tbulk_operate_impl<max<LeftType, RightType, ResType>,\n+\t\tLeftType, RightType, ResType> max_op;\n \tbulk_operate_impl<pow, LeftType, RightType, ResType> pow_op;\n \tbulk_operate_impl<eq, LeftType, RightType, bool> eq_op;\n \tbulk_operate_impl<neq, LeftType, RightType, bool> neq_op;\n"} {"commit":"63b057cfde9cfcab94280c33eb0699aaef700fe1","subject":"Make sure content_filter() continues waiting after EINTR","message":"Make sure content_filter() continues waiting after EINTR\n","repos":"simta\/simta,simta\/simta,simta\/simta","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- receive.c\n+++ receive.c\n@@ -4528,6 +4528,7 @@\n \t}\n \n \tfor ( ; ; ) {\n+\t errno = 0;\n \t if (( line = snet_getline( snet, NULL )) != NULL ) {\n \t\tsyslog( LOG_INFO, \"Filter [%s] %s: %s: %s\",\n \t\t\tr->r_ip, r->r_remote_hostname, r->r_env->e_id, line );\n@@ -4539,7 +4540,9 @@\n \n \t if ( errno == EINTR ) {\n \t\tif ( simta_child_signal != 0 ) {\n-\t\t if ( simta_waitpid( pid, &status, WNOHANG ) != 0 ) {\n+\t\t errno = 0;\n+\t\t if (( simta_waitpid( pid, &status, WNOHANG ) != 0 ) &&\n+\t\t\t ( errno != EINTR )) {\n \t\t\tsyslog( LOG_ERR,\n \t\t\t\t\"Syserror: content_filter simta_waitpid: %m\" );\n \t\t\tclose( fd[ 0 ] );\n@@ -4556,8 +4559,9 @@\n \t return( MESSAGE_TEMPFAIL );\n \t}\n \n+\terrno = 0;\n \twhile (( rc = simta_waitpid( pid, &status, 0 )) != pid ) {\n-\t if ( rc < 0 ) {\n+\t if (( rc < 0 ) && ( errno != EINTR )) {\n \t\tsyslog( LOG_ERR, \"Syserror: content_filter simta_waitpid: %m\" );\n \t\treturn( MESSAGE_TEMPFAIL );\n \t }\n"} {"commit":"d83eeb5ed22fed8845bd8ace75f9709a73ca4f17","subject":"demux\/mp4: be less picky wrt VC-1 profiles we accept","message":"demux\/mp4: be less picky wrt VC-1 profiles we accept\n\nSigned-off-by: Jean-Baptiste Kempf <7b85a41a628204b76aba4326273a3ccc74bd009a@videolan.org>\n","repos":"vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/demux\/mp4\/libmp4.c\n+++ modules\/demux\/mp4\/libmp4.c\n@@ -1448,9 +1448,10 @@\n p_dvc1 = p_box->data.p_dvc1;\n \n MP4_GET1BYTE( p_dvc1->i_profile_level ); \/* profile is on 4bits, level 3bits *\/\n- if( (p_dvc1->i_profile_level & 0xf0) >> 4 != 0x06 )\n- {\n- msg_Warn( p_stream, \"unsupported VC-1 profile, please report\" );\n+ uint8_t i_profile = (p_dvc1->i_profile_level & 0xf0) >> 4;\n+ if( i_profile != 0x06 && i_profile != 0x0c )\n+ {\n+ msg_Warn( p_stream, \"unsupported VC-1 profile (%\"PRIu8\"), please report\", i_profile );\n MP4_READBOX_EXIT( 0 );\n }\n \n@@ -1466,8 +1467,8 @@\n \n #ifdef MP4_VERBOSE\n msg_Dbg( p_stream,\n- \"read box: \\\"dvc1\\\" profile=%i level=%i\",\n- p_dvc1->i_profile_level & 0xf0 >> 4, p_dvc1->i_profile_level & 0x0e >> 1 );\n+ \"read box: \\\"dvc1\\\" profile=%\"PRIu8\" level=%i\",\n+ i_profile, p_dvc1->i_profile_level & 0x0e >> 1 );\n #endif\n \n MP4_READBOX_EXIT( 1 );\n"} {"commit":"633378b774650607034efccfcd27ef0219cae88e","subject":"Fix permissions check to act the same as the others.","message":"Fix permissions check to act the same as the others.\n","repos":"Sylverant\/login_server,Sylverant\/login_server","returncode":0,"stderr":"unknown","license":"agpl-3.0","lang":"C","diff":""} {"commit":"abfab625be0934a1b638974d55d01f5c6af8f5c9","subject":"remuxer: Set the movie timescale in order to match the media timescale if only one track is there.","message":"remuxer: Set the movie timescale in order to match the media timescale if only one track is there.\n","repos":"silverfilain\/L-SMASH,silverfilain\/L-SMASH,l-smash\/l-smash,canbal\/l-smash,maki-rxrz\/L-SMASH,l-smash\/l-smash,silverfilain\/L-SMASH,canbal\/l-smash,maki-rxrz\/L-SMASH,dwbuiten\/l-smash,dwbuiten\/l-smash,mstorsjo\/l-smash,l-smash\/l-smash,mstorsjo\/l-smash","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- remuxer.c\n+++ remuxer.c\n@@ -647,6 +647,15 @@\n remuxer->ref_chap_available = 1;\n break;\n }\n+ \/* Set the movie timescale in order to match the media timescale if only one track is there. *\/\n+ if( output->num_tracks == 1 )\n+ for( int i = 0; i < remuxer->num_input; i++ )\n+ for( uint32_t j = 0; j < input[i].num_tracks; j++ )\n+ if( input[i].track[j].active )\n+ {\n+ output->movie_param.timescale = input[i].track[j].media_param.timescale;\n+ break;\n+ }\n return lsmash_set_movie_parameters( output->root, &output->movie_param );\n }\n \n@@ -729,14 +738,24 @@\n \n static int prepare_output( remuxer_t *remuxer )\n {\n+ output_movie_t *output = remuxer->output;\n+ input_movie_t *input = remuxer->input;\n+ \/* Count the number of output tracks. *\/\n+ for( int i = 0; i < remuxer->num_input; i++ )\n+ output->num_tracks += input[i].num_tracks;\n+ for( int i = 0; i < remuxer->num_input; i++ )\n+ for( uint32_t j = 0; j < input[i].num_tracks; j++ )\n+ {\n+ \/* Don't remux tracks specified as 'remove' by a user. *\/\n+ if( remuxer->track_option[i][j].remove )\n+ input[i].track[j].active = 0;\n+ if( !input[i].track[j].active )\n+ -- output->num_tracks;\n+ }\n if( set_movie_parameters( remuxer ) )\n return ERROR_MSG( \"failed to set output movie parameters.\\n\" );\n- output_movie_t *output = remuxer->output;\n- input_movie_t *input = remuxer->input;\n set_itunes_metadata( output, input, remuxer->num_input );\n \/* Allocate output tracks. *\/\n- for( int i = 0; i < remuxer->num_input; i++ )\n- output->num_tracks += input[i].num_tracks;\n output->track = lsmash_malloc( output->num_tracks * sizeof(output_track_t) );\n if( !output->track )\n return ERROR_MSG( \"failed to alloc output tracks.\\n\" );\n@@ -746,13 +765,8 @@\n {\n track_media_option *current_track_opt = &remuxer->track_option[i][j];\n input_track_t *in_track = &input[i].track[j];\n- if( current_track_opt->remove )\n- in_track->active = 0;\n if( !in_track->active )\n- {\n- -- output->num_tracks;\n continue;\n- }\n output_track_t *out_track = &output->track[output->current_track_number - 1];\n out_track->summary_remap = lsmash_malloc( in_track->num_summaries * sizeof(uint32_t) );\n if( !out_track->summary_remap )\n"} {"commit":"98c78b8b61012914b53175f58aca97965e664db2","subject":"Lua SD: fix obvious leaks","message":"Lua SD: fix obvious leaks\n\n+ Add missing include\n","repos":"jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/misc\/lua\/libs\/sd.c\n+++ modules\/misc\/lua\/libs\/sd.c\n@@ -36,6 +36,7 @@\n #include <vlc_common.h>\n #include <vlc_services_discovery.h>\n #include <vlc_playlist.h>\n+#include <vlc_charset.h>\n \n #include <lua.h> \/* Low level lua C API *\/\n #include <lauxlib.h> \/* Higher level C API *\/\n@@ -117,8 +118,9 @@\n lua_getfield( L, -1, \"title\" );\n if( lua_isstring( L, -1 ) )\n {\n- input_item_t *p_input = input_item_New( p_sd, \"vlc:\/\/nop\",\n- strdup( lua_tostring( L, -1 ) ) );\n+ input_item_t *p_input = input_item_New( p_sd,\n+ \"vlc:\/\/nop\",\n+ lua_tostring( L, -1 ) );\n lua_pop( L, 1 );\n lua_getfield( L, -1, \"arturl\" );\n if( lua_isstring( L, -1 ) )\n@@ -126,6 +128,7 @@\n char *psz_value = strdup( lua_tostring( L, -1 ) );\n EnsureUTF8( psz_value );\n msg_Dbg( p_sd, \"ArtURL: %s\", psz_value );\n+ \/** @todo Ask for art download if not local file *\/\n input_item_SetArtURL( p_input, psz_value );\n free( psz_value );\n }\n@@ -157,13 +160,14 @@\n lua_getfield( L, -1, \"url\" );\n if( lua_isstring( L, -1 ) )\n {\n- input_item_t *p_input = input_item_New( p_sd,\n- strdup( lua_tostring( L, -1 ) ),\n- strdup( lua_tostring( L, -1 ) ) );\n+ char *psz_url = strdup( lua_tostring( L, -1 ) );\n lua_pop( L, 1 );\n+ input_item_t *p_input = input_item_New( p_sd, psz_url, psz_url );\n+ free( psz_url );\n vlclua_read_meta_data( p_sd, L, p_input );\n \/* This one is to be tested... *\/\n vlclua_read_custom_meta_data( p_sd, L, p_input );\n+ \/* The duration is given in seconds, convert to microseconds *\/\n lua_getfield( L, -1, \"duration\" );\n if( lua_isnumber( L, -1 ) )\n input_item_SetDuration( p_input, (lua_tonumber( L, -1 )*1e6) );\n@@ -197,6 +201,8 @@\n input_item_t **pp_input = luaL_checkudata( L, -1, \"input_item_t\" );\n if( *pp_input )\n services_discovery_RemoveItem( p_sd, *pp_input );\n+ \/* Make sure we won't try to remove it again *\/\n+ *pp_input = NULL;\n }\n return 1;\n }\n@@ -212,11 +218,11 @@\n lua_getfield( L, -1, \"url\" );\n if( lua_isstring( L, -1 ) )\n {\n+ char *url = strdup( lua_tostring( L, -1 ) );\n+ lua_pop( L, 1 );\n input_item_node_t *p_input_node = input_item_node_Create( *pp_node );\n- input_item_t *p_input = input_item_New( p_sd,\n- strdup( lua_tostring( L, -1 ) ),\n- strdup( lua_tostring( L, -1 ) ) );\n- lua_pop( L, 1 );\n+ input_item_t *p_input = input_item_New( p_sd, url, url );\n+ free( url );\n vlclua_read_meta_data( p_sd, L, p_input );\n \/* This one is to be tested... *\/\n vlclua_read_custom_meta_data( p_sd, L, p_input );\n@@ -258,11 +264,12 @@\n lua_getfield( L, -1, \"title\" );\n if( lua_isstring( L, -1 ) )\n {\n+ char *name = strdup( lua_tostring( L, -1 ) );\n+ lua_pop( L, 1 );\n input_item_node_t *p_input_node = input_item_node_Create( *pp_node );\n- input_item_t *p_input = input_item_New( p_sd,\n- \"vlc:\/\/nop\",\n- strdup( lua_tostring( L, -1 ) ) );\n- lua_pop( L, 1 );\n+ input_item_t *p_input = input_item_New( p_sd, \"vlc:\/\/nop\",\n+ name );\n+ free( name );\n lua_getfield( L, -1, \"arturl\" );\n if( lua_isstring( L, -1 ) )\n {\n"} {"commit":"ed9a9256cb1fe0449d0f96a670242c4dcad151d1","subject":"Added rpcclass","message":"Added rpcclass\n","repos":"clever-lang\/clever,clever-lang\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,felipensp\/clever,clever-lang\/clever,clever-lang\/clever,felipensp\/clever,felipensp\/clever,felipensp\/clever,felipensp\/clever","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- modules\/std\/rpc\/rpcvalue.h\n+++ modules\/std\/rpc\/rpcvalue.h\n@@ -31,13 +31,22 @@\n #include <pthread.h>\n #include \"compiler\/datavalue.h\"\n \n+#include \"modules\/std\/net\/csocket.h\"\n+\n namespace clever { namespace packages { namespace std { namespace rpc {\n \n class RPCValue : public DataValue {\n public:\n-\tRPCValue() {}\n+\tRPCValue() {\n+\t\tsocket = new CSocket;\n+\t}\n \n-\tvirtual ~RPCValue() { }\n+\tCSocket* getSocket() { return this->socket; }\n+\n+\tvirtual ~RPCValue() { delete socket; }\n+\n+private:\n+\tCSocket* socket;\n \n };\n \n"} {"commit":"2d0a086e83c6aace5dbe1800c45fe054c3e83cd3","subject":"Add TypesSupported[] to VirtualSystemManagementCapabilities","message":"Add TypesSupported[] to VirtualSystemManagementCapabilities\n\nSigned-off-by: Dan Smith <787803eb1755f35291827d0f0268aa9bc7a57464@us.ibm.com>\n","repos":"libvirt\/libvirt-cim,libvirt\/libvirt-cim,libvirt\/libvirt-cim","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/Virt_VirtualSystemManagementCapabilities.c\n+++ src\/Virt_VirtualSystemManagementCapabilities.c\n@@ -46,11 +46,14 @@\n \n \n static CMPIStatus set_inst_properties(const CMPIBroker *broker,\n+ const CMPIObjectPath *ref,\n CMPIInstance *inst)\n {\n CMPIStatus s = {CMPI_RC_OK, NULL};\n CMPIArray *array;\n uint16_t element;\n+ char *prefix = NULL;\n+ CMPIString *str;\n \n CMSetProperty(inst, \"InstanceID\",\n (CMPIValue *)\"ManagementCapabilities\", CMPI_chars);\n@@ -73,7 +76,29 @@\n \n CMSetProperty(inst, \"SynchronousMethodsSupported\",\n (CMPIValue *)&array, CMPI_uint16A);\n+\n+ prefix = class_prefix_name(CLASSNAME(ref));\n+ if (prefix == NULL) {\n+ CU_DEBUG(\"Prefix of %s was NULL\", CLASSNAME(ref));\n+ goto out;\n+ }\n+\n+ str = CMNewString(broker, prefix, &s);\n+ if ((str == NULL) || (s.rc != CMPI_RC_OK))\n+ goto out;\n+\n+ array = CMNewArray(broker, 1, CMPI_string, &s);\n+ if ((s.rc != CMPI_RC_OK) || (CMIsNullObject(array)))\n+ goto out;\n+\n+ CMSetArrayElementAt(array, 0, (CMPIValue *)&str, CMPI_string);\n+\n+ CMSetProperty(inst, \"TypesSupported\",\n+ (CMPIValue *)&array, CMPI_stringA);\n+\n out:\n+ free(prefix);\n+\n return s;\n }\n \n@@ -106,7 +131,7 @@\n goto out;\n }\n \n- s = set_inst_properties(broker, inst);\n+ s = set_inst_properties(broker, ref, inst);\n \n if (is_get_inst) {\n s = cu_validate_ref(broker, ref, inst);\n"} {"commit":"e30bf11e2c854f190b863aaa7152d71323c2a6b4","subject":"(ia64_access_reg): Handle \"cfm\" cache.","message":"(ia64_access_reg): Handle \"cfm\" cache.\n\n(Logical change 1.42)\n","repos":"0xlab\/0xdroid-external_libunwind,evaautomation\/libunwind,frida\/libunwind,rntz\/libunwind,lat\/libunwind,maltek\/platform_external_libunwind,cloudius-systems\/libunwind,bo-on-software\/libunwind,vtjnash\/libunwind,fdoray\/libunwind,atanasyan\/libunwind,zeldin\/platform_external_libunwind,dreal-deps\/libunwind,tronical\/libunwind,SyndicateRogue\/libunwind,tkelman\/libunwind,adsharma\/libunwind,joyent\/libunwind,fillexen\/libunwind,Keno\/libunwind,vegard\/libunwind,joyent\/libunwind,rntz\/libunwind,tronical\/libunwind,libunwind\/libunwind,geekboxzone\/mmallow_external_libunwind,fillexen\/libunwind,vtjnash\/libunwind,yuyichao\/libunwind,zeldin\/platform_external_libunwind,dropbox\/libunwind,DroidSim\/platform_external_libunwind,wdv4758h\/libunwind,yuyichao\/libunwind,CyanogenMod\/android_external_libunwind,tony\/libunwind,Chilledheart\/libunwind,ehsan\/libunwind,0xlab\/0xdroid-external_libunwind,krytarowski\/libunwind,maltek\/platform_external_libunwind,yuyichao\/libunwind,libunwind\/libunwind,cloudius-systems\/libunwind,tkelman\/libunwind,jrmuizel\/libunwind,CyanogenMod\/android_external_libunwind,evaautomation\/libunwind,olibc\/libunwind,0xlab\/0xdroid-external_libunwind,krytarowski\/libunwind,Chilledheart\/libunwind,mpercy\/libunwind,djwatson\/libunwind,unkadoug\/libunwind,cloudius-systems\/libunwind,olibc\/libunwind,fdoray\/libunwind,jrmuizel\/libunwind,rantala\/libunwind,adsharma\/libunwind,android-ia\/platform_external_libunwind,android-ia\/platform_external_libunwind,joyent\/libunwind,atanasyan\/libunwind-android,geekboxzone\/mmallow_external_libunwind,dagar\/libunwind,mpercy\/libunwind,CyanogenMod\/android_external_libunwind,martyone\/libunwind,tkelman\/libunwind,rantala\/libunwind,DroidSim\/platform_external_libunwind,pathscale\/libunwind,dropbox\/libunwind,wdv4758h\/libunwind,lat\/libunwind,android-ia\/platform_external_libunwind,unkadoug\/libunwind,zliu2014\/libunwind-tilegx,martyone\/libunwind,project-zerus\/libunwind,dagar\/libunwind,Chilledheart\/libunwind,Keno\/libunwind,atanasyan\/libunwind,fillexen\/libunwind,ehsan\/libunwind,androidarmv6\/android_external_libunwind,dagar\/libunwind,zliu2014\/libunwind-tilegx,dreal-deps\/libunwind,igprof\/libunwind,geekboxzone\/lollipop_external_libunwind,tony\/libunwind,atanasyan\/libunwind,bo-on-software\/libunwind,evaautomation\/libunwind,djwatson\/libunwind,ehsan\/libunwind,wdv4758h\/libunwind,DroidSim\/platform_external_libunwind,rntz\/libunwind,cms-externals\/libunwind,androidarmv6\/android_external_libunwind,project-zerus\/libunwind,lat\/libunwind,rantala\/libunwind,SyndicateRogue\/libunwind,olibc\/libunwind,vtjnash\/libunwind,adsharma\/libunwind,geekboxzone\/mmallow_external_libunwind,cms-externals\/libunwind,zliu2014\/libunwind-tilegx,rogwfu\/libunwind,geekboxzone\/lollipop_external_libunwind,pathscale\/libunwind,mpercy\/libunwind,igprof\/libunwind,djwatson\/libunwind,tony\/libunwind,project-zerus\/libunwind,cms-externals\/libunwind,dropbox\/libunwind,rogwfu\/libunwind,bo-on-software\/libunwind,frida\/libunwind,igprof\/libunwind,dreal-deps\/libunwind,pathscale\/libunwind,Keno\/libunwind,frida\/libunwind,atanasyan\/libunwind-android,krytarowski\/libunwind,zeldin\/platform_external_libunwind,jrmuizel\/libunwind,vegard\/libunwind,fdoray\/libunwind,maltek\/platform_external_libunwind,martyone\/libunwind,SyndicateRogue\/libunwind,atanasyan\/libunwind-android,vegard\/libunwind,geekboxzone\/lollipop_external_libunwind,libunwind\/libunwind,rogwfu\/libunwind,androidarmv6\/android_external_libunwind,unkadoug\/libunwind,tronical\/libunwind","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ia64\/Gregs-ia64.c\n+++ src\/ia64\/Gregs-ia64.c\n@@ -226,7 +226,7 @@\n ia64_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,\n \t\t int write)\n {\n- unw_word_t loc = -8, reg_loc, nat, nat_loc, cfm, mask, pr;\n+ unw_word_t loc = -8, reg_loc, nat, nat_loc, mask, pr;\n int ret, readonly = 0;\n \n switch (reg)\n@@ -274,7 +274,12 @@\n case UNW_IA64_BR + 3:\tloc = c->b3_loc; break;\n case UNW_IA64_BR + 4:\tloc = c->b4_loc; break;\n case UNW_IA64_BR + 5:\tloc = c->b5_loc; break;\n- case UNW_IA64_CFM:\t\tloc = c->cfm_loc; break;\n+\n+ case UNW_IA64_CFM:\n+ if (write)\n+\tc->cfm = *valp;\t\/* also update the CFM cache *\/\n+ loc = c->cfm_loc;\n+ break;\n \n case UNW_IA64_PR:\n if (write)\n@@ -307,21 +312,21 @@\n \treturn -UNW_EBADREG;\n ret = ia64_get_stacked (c, reg, &loc, &nat_loc);\n if (ret < 0)\n-\treturn 0;\n+\treturn ret;\n mask = (unw_word_t) 1 << ia64_rse_slot_num (loc);\n return update_nat (c, nat_loc, mask, valp, write);\n \n case UNW_IA64_AR_EC:\n- ret = ia64_get (c, c->cfm_loc, &cfm);\n- if (ret < 0)\n-\treturn ret;\n- if (write)\n-\tret = ia64_put (c, c->cfm_loc, ((cfm & ~((unw_word_t) 0x3f << 52))\n-\t\t\t\t\t| (*valp & 0x3f) << 52));\n- else\n-\t*valp = (cfm >> 52) & 0x3f;\n- return ret;\n-\n+ if (write)\n+\t{\n+\t c->cfm = (c->cfm & ~((unw_word_t) 0x3f << 52)) | ((*valp & 0x3f) << 52);\n+\t return ia64_put (c, c->cfm_loc, c->cfm);\n+\t}\n+ else\n+\t{\n+\t *valp = (c->cfm >> 52) & 0x3f;\n+\t return 0;\n+\t}\n \n \/* scratch & special registers: *\/\n \n"} {"commit":"744c51c0cc3ca75b594f0fcec1587e7fcddc4cf7","subject":"Add handler for IDLE_PARSER_NUMERIC_WELCOME","message":"Add handler for IDLE_PARSER_NUMERIC_WELCOME\n\n\n20070401002712-9db4d-e24230c986374bd2e0ec53e03f5fa405c73c80ba.gz\n","repos":"freedesktop-unofficial-mirror\/telepathy__telepathy-idle,freedesktop-unofficial-mirror\/telepathy__telepathy-idle,freedesktop-unofficial-mirror\/telepathy__telepathy-idle","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/idle-connection.c\n+++ src\/idle-connection.c\n@@ -828,6 +828,7 @@\n static IdleParserHandlerResult _ping_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data);\n static IdleParserHandlerResult _erroneous_nickname_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data);\n static IdleParserHandlerResult _nickname_in_use_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data);\n+static IdleParserHandlerResult _welcome_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data);\n \n static void irc_handshakes(IdleConnection *conn);\n static IdleIMChannel *new_im_channel(IdleConnection *conn, TpHandle handle, gboolean suppress_handler);\n@@ -1098,6 +1099,7 @@\n \t\tidle_parser_add_handler(priv->parser, IDLE_PARSER_CMD_PING, _ping_handler, conn);\n \t\tidle_parser_add_handler(priv->parser, IDLE_PARSER_NUMERIC_ERRONEOUSNICKNAME, _erroneous_nickname_handler, conn);\n \t\tidle_parser_add_handler(priv->parser, IDLE_PARSER_NUMERIC_NICKNAMEINUSE, _nickname_in_use_handler, conn);\n+\t\tidle_parser_add_handler(priv->parser, IDLE_PARSER_NUMERIC_WELCOME, _welcome_handler, conn);\n \n \t\tirc_handshakes(conn);\n \t}\n@@ -1319,6 +1321,23 @@\n \tIdleConnection *conn = IDLE_CONNECTION(user_data);\n \n \tconnection_disconnect_cb(conn, TP_CONNECTION_STATUS_REASON_NAME_IN_USE);\n+\n+\treturn IDLE_PARSER_HANDLER_RESULT_HANDLED;\n+}\n+\n+static IdleParserHandlerResult _welcome_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data) {\n+\tIdleConnection *conn = IDLE_CONNECTION(user_data);\n+\tIdleConnectionPrivate *priv = IDLE_CONNECTION_GET_PRIVATE(conn);\n+\tTpHandle handle = g_value_get_uint(g_value_array_get_nth(args, 0));\n+\n+\tif (handle != priv->self_handle) {\n+\t\ttp_handle_unref(conn->handles[TP_HANDLE_TYPE_CONTACT], priv->self_handle);\n+\t\tpriv->self_handle = handle;\n+\t\ttp_handle_ref(conn->handles[TP_HANDLE_TYPE_CONTACT], priv->self_handle);\n+\t}\n+\n+\tconnection_connect_cb(conn, TRUE);\n+\tupdate_presence(conn, priv->self_handle, IDLE_PRESENCE_AVAILABLE, NULL);\n \n \treturn IDLE_PARSER_HANDLER_RESULT_HANDLED;\n }\n@@ -2046,30 +2065,6 @@\n \t\t_idle_muc_channel_badchannelkey(chan);\n \n \t\tg_debug(\"%s: got ERR_BADCHANNELKEY for channel %s (handle %u)\", G_STRFUNC, channel, handle);\n-\t}\n-\telse if (numeric == IRC_RPL_WELCOME)\n-\t{\n-\t\tchar *nick = recipient;\n-\t\tg_debug(\"%s: got RPL_WELCOME with nick %s\", G_STRFUNC, nick);\n-\n-\t\tif (strcmp(priv->nickname, nick))\n-\t\t{\n-\t\t\tg_debug(\"%s: nick different from original (%s -> %s), renaming\", G_STRFUNC, priv->nickname, nick);\n-\t\t\tg_free(priv->nickname);\n-\t\t\tpriv->nickname = g_strdup(nick);\n-\n-\t\t\tif (priv->self_handle)\n-\t\t\t{\n-\t\t\t\ttp_handle_unref(conn->handles[TP_HANDLE_TYPE_CONTACT], priv->self_handle);\n-\t\t\t}\n-\n-\t\t\tpriv->self_handle = idle_handle_for_contact(conn->handles[TP_HANDLE_TYPE_CONTACT], nick);\n-\t\t\ttp_handle_ref(conn->handles[TP_HANDLE_TYPE_CONTACT], priv->self_handle);\n-\t\t}\n-\n-\t\tconnection_connect_cb(conn, TRUE);\n-\n-\t\tupdate_presence(conn, priv->self_handle, IDLE_PRESENCE_AVAILABLE, NULL);\n \t}\n \telse if (numeric == IRC_RPL_TOPIC)\n \t{\n"} {"commit":"8143e89419cd7a22bb24693fc84426e2153d5be6","subject":"imap: Fixed MULTIAPPEND CATENATE that contained only URLs","message":"imap: Fixed MULTIAPPEND CATENATE that contained only URLs\n","repos":"dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot,dscho\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -416,7 +416,7 @@\n \n static int\n cmd_append_handle_args(struct client_command_context *cmd,\n-\t\t const struct imap_arg **args, bool *nonsync_r)\n+\t\t const struct imap_arg *args, bool *nonsync_r)\n {\n \tstruct client *client = cmd->client;\n \tstruct cmd_append_context *ctx = cmd->context;\n@@ -432,26 +432,26 @@\n \tbool valid;\n \n \t\/* [<flags>] *\/\n-\tif (!imap_arg_get_list(*args, &flags_list))\n+\tif (!imap_arg_get_list(args, &flags_list))\n \t\tflags_list = NULL;\n \telse\n-\t\t(*args)++;\n+\t\targs++;\n \n \t\/* [<internal date>] *\/\n-\tif ((*args)->type != IMAP_ARG_STRING)\n+\tif (args->type != IMAP_ARG_STRING)\n \t\tinternal_date_str = NULL;\n \telse {\n-\t\tinternal_date_str = imap_arg_as_astring(*args);\n-\t\t(*args)++;\n+\t\tinternal_date_str = imap_arg_as_astring(args);\n+\t\targs++;\n \t}\n \n \t\/* <message literal> | CATENATE (..) *\/\n \tvalid = FALSE;\n \t*nonsync_r = FALSE;\n \tctx->catenate = FALSE;\n-\tif (imap_arg_atom_equals(*args, \"CATENATE\")) {\n-\t\t(*args)++;\n-\t\tif (imap_arg_get_list(*args, &cat_list)) {\n+\tif (imap_arg_atom_equals(args, \"CATENATE\")) {\n+\t\targs++;\n+\t\tif (imap_arg_get_list(args, &cat_list)) {\n \t\t\tvalid = TRUE;\n \t\t\tctx->catenate = TRUE;\n \t\t}\n@@ -461,11 +461,13 @@\n \t\tctx->binary_input = imap_arg_atom_equals(&cat_list[0], \"TEXT\") &&\n \t\t\tcat_list[1].literal8;\n \n-\t} else if (imap_arg_get_literal_size(*args, &ctx->literal_size)) {\n-\t\t*nonsync_r = (*args)->type == IMAP_ARG_LITERAL_SIZE_NONSYNC;\n-\t\tctx->binary_input = (*args)->literal8;\n+\t} else if (imap_arg_get_literal_size(args, &ctx->literal_size)) {\n+\t\t*nonsync_r = args->type == IMAP_ARG_LITERAL_SIZE_NONSYNC;\n+\t\tctx->binary_input = args->literal8;\n \t\tvalid = TRUE;\n \t}\n+\t\/* we parsed the args only up to here. *\/\n+\ti_assert(IMAP_ARG_IS_EOL(&args[1]));\n \n \tif (!valid) {\n \t\tclient->input_skip_line = TRUE;\n@@ -691,22 +693,18 @@\n \t\treturn cmd_append_finish_parsing(cmd);\n \t}\n \n-\t\/* Handle one or more messages (MULTIAPPEND) while they only contain\n-\t CATENATE URLs (i.e. no TEXT input from client) *\/\n-\twhile ((ret = cmd_append_handle_args(cmd, &args, &nonsync)) == 0) {\n-\t\tcmd_append_finish_catenate(cmd);\n-\n-\t\targs++;\n-\t\tif (IMAP_ARG_IS_EOL(args)) {\n-\t\t\t\/* last message *\/\n-\t\t\treturn cmd_append_finish_parsing(cmd);\n-\t\t}\n-\t}\n-\n+\tret = cmd_append_handle_args(cmd, args, &nonsync);\n \tif (ret < 0) {\n \t\t\/* invalid parameters, abort immediately *\/\n \t\tcmd_append_finish(ctx);\n \t\treturn TRUE;\n+\t}\n+\tif (ret == 0) {\n+\t\t\/* CATENATE contained only URLs. Finish it and see if there\n+\t\t are more messsages. *\/\n+\t\tcmd_append_finish_catenate(cmd);\n+\t\timap_parser_reset(ctx->save_parser);\n+\t\treturn cmd_append_parse_new_msg(cmd);\n \t}\n \n \tif (!ctx->catenate) {\n"} {"commit":"abcfc9713200c756b981f42917186856fcc80832","subject":"imap: Various fixes to APPEND error handling.","message":"imap: Various fixes to APPEND error handling.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -50,7 +50,7 @@\n \n static void cmd_append_finish(struct cmd_append_context *ctx);\n static bool cmd_append_continue_message(struct client_command_context *cmd);\n-static bool cmd_append_continue_parsing(struct client_command_context *cmd);\n+static bool cmd_append_parse_new_msg(struct client_command_context *cmd);\n \n static const char *get_disconnect_reason(struct cmd_append_context *ctx)\n {\n@@ -147,56 +147,6 @@\n \t\tmailbox_free(&ctx->box);\n }\n \n-static bool cmd_append_continue_cancel(struct client_command_context *cmd)\n-{\n-\tstruct cmd_append_context *ctx = cmd->context;\n-\n-\tif (cmd->cancel) {\n-\t\tcmd_append_finish(ctx);\n-\t\treturn TRUE;\n-\t}\n-\n-\t(void)i_stream_read(ctx->litinput);\n-\ti_stream_skip(ctx->litinput, i_stream_get_data_size(ctx->litinput));\n-\n-\tif (cmd->client->input->closed) {\n-\t\tcmd_append_finish(ctx);\n-\t\treturn TRUE;\n-\t}\n-\n-\tif (ctx->litinput->v_offset == ctx->literal_size) {\n-\t\t\/* finished, but with MULTIAPPEND and LITERAL+ we may get\n-\t\t more messages. *\/\n-\t\ti_stream_unref(&ctx->litinput);\n-\n-\t\tctx->message_input = FALSE;\n-\t\timap_parser_reset(ctx->save_parser);\n-\t\tcmd->func = cmd_append_continue_parsing;\n-\t\treturn cmd_append_continue_parsing(cmd);\n-\t}\n-\n-\treturn FALSE;\n-}\n-\n-static bool cmd_append_cancel(struct cmd_append_context *ctx, bool nonsync)\n-{\n-\tctx->failed = TRUE;\n-\n-\tif (!nonsync) {\n-\t\tcmd_append_finish(ctx);\n-\t\treturn TRUE;\n-\t}\n-\n-\t\/* we have to read the nonsynced literal so we don't treat the message\n-\t data as commands. *\/\n-\tctx->litinput = i_stream_create_limit(ctx->client->input, ctx->literal_size);\n-\n-\tctx->message_input = TRUE;\n-\tctx->cmd->func = cmd_append_continue_cancel;\n-\tctx->cmd->context = ctx;\n-\treturn cmd_append_continue_cancel(ctx->cmd);\n-}\n-\n static int\n cmd_append_catenate_url(struct client_command_context *cmd, const char *caturl)\n {\n@@ -206,6 +156,9 @@\n \tuoff_t size, newsize;\n \tconst char *error;\n \tint ret;\n+\n+\tif (ctx->failed)\n+\t\treturn -1;\n \n \tret = imap_msgpart_url_parse(cmd->client->user, cmd->client->mailbox,\n \t\t\t\t caturl, &mpurl, &error);\n@@ -275,24 +228,22 @@\n \treturn ret;\n }\n \n-static int cmd_append_catenate_text(struct client_command_context *cmd)\n-{\n-\tstruct cmd_append_context *ctx = cmd->context;\n-\tuoff_t newsize;\n-\n-\tnewsize = ctx->cat_msg_size + ctx->literal_size;\n-\tif (newsize < ctx->cat_msg_size) {\n+static void cmd_append_catenate_text(struct client_command_context *cmd)\n+{\n+\tstruct cmd_append_context *ctx = cmd->context;\n+\n+\tif (ctx->literal_size > (uoff_t)-1 - ctx->cat_msg_size &&\n+\t !ctx->failed) {\n \t\tclient_send_tagline(cmd,\n \t\t\t\"NO [TOOBIG] Composed message grows too big.\");\n-\t\treturn -1;\n+\t\tctx->failed = TRUE;\n \t}\n \n \t\/* save the mail *\/\n-\tctx->cat_msg_size = newsize;\n+\tctx->cat_msg_size += ctx->literal_size;\n \tctx->litinput = i_stream_create_limit(cmd->client->input,\n \t\t\t\t\t ctx->literal_size);\n \ti_stream_chain_append(ctx->catchain, ctx->litinput);\n-\treturn 0;\n }\n \n static int\n@@ -303,9 +254,6 @@\n \tconst char *catpart;\n \n \t*nonsync_r = FALSE;\n-\n-\tif (ctx->failed)\n-\t\treturn -1;\n \n \t\/* Handle URLs until a TEXT literal is encountered *\/\n \twhile (imap_arg_get_atom(args, &catpart)) {\n@@ -316,21 +264,26 @@\n \t\t\targs++;\n \t\t\tif (!imap_arg_get_astring(args, &caturl))\n \t\t\t\tbreak;\n-\t\t\tif (cmd_append_catenate_url(cmd, caturl) < 0)\n-\t\t\t\treturn -1;\n+\t\t\tif (cmd_append_catenate_url(cmd, caturl) < 0) {\n+\t\t\t\t\/* delay failure until we can stop\n+\t\t\t\t parsing input *\/\n+\t\t\t\tctx->failed = TRUE;\n+\t\t\t}\n \t\t} else if (strcasecmp(catpart, \"TEXT\") == 0) {\n \t\t\t\/* TEXT <literal> *\/\n \t\t\targs++;\n \t\t\tif (!imap_arg_get_literal_size(args, &ctx->literal_size))\n \t\t\t\tbreak;\n-\t\t\tif (args->literal8 && !ctx->binary_input) {\n+\t\t\tif (args->literal8 && !ctx->binary_input &&\n+\t\t\t !ctx->failed) {\n \t\t\t\tclient_send_tagline(cmd,\n \t\t\t\t\t\"NO [\"IMAP_RESP_CODE_UNKNOWN_CTE\"] \"\n \t\t\t\t\t\"Binary input allowed only when the first part is binary.\");\n-\t\t\t\treturn -1;\n+\t\t\t\tctx->failed = TRUE;\n \t\t\t}\n \t\t\t*nonsync_r = args->type == IMAP_ARG_LITERAL_SIZE_NONSYNC;\n-\t\t\treturn cmd_append_catenate_text(cmd) < 0 ? -1 : 1;\n+\t\t\tcmd_append_catenate_text(cmd);\n+\t\t\treturn 1;\n \t\t} else {\n \t\t\tbreak;\n \t\t}\n@@ -342,6 +295,7 @@\n \t\treturn 0;\n \t}\n \tclient_send_command_error(cmd, \"Invalid arguments.\");\n+\tcmd->client->input_skip_line = TRUE;\n \treturn -1;\n }\n \n@@ -352,15 +306,19 @@\n \ti_stream_chain_append_eof(ctx->catchain);\n \ti_stream_unref(&ctx->input);\n \tctx->catenate = FALSE;\n-\n-\t\/* do mailbox_save_continue() once more after appending EOF,\n-\t to finish any pending reads *\/\n-\tif (mailbox_save_continue(ctx->save_ctx) < 0) {\n-\t\tmailbox_save_cancel(&ctx->save_ctx);\n-\t\tctx->failed = TRUE;\n-\t} else if (mailbox_save_finish(&ctx->save_ctx) < 0) {\n-\t\tctx->failed = TRUE;\n-\t\tclient_send_storage_error(cmd, ctx->storage);\n+\tctx->catchain = NULL;\n+\n+\tif (ctx->save_ctx == NULL) {\n+\t\t\/* APPEND has already failed *\/\n+\t\ti_assert(ctx->failed);\n+\t} else {\n+\t\t\/* do mailbox_save_continue() once more after appending EOF,\n+\t\t to finish any pending reads *\/\n+\t\t(void)mailbox_save_continue(ctx->save_ctx);\n+\t\tif (mailbox_save_finish(&ctx->save_ctx) < 0) {\n+\t\t\tclient_send_storage_error(cmd, ctx->storage);\n+\t\t\tctx->failed = TRUE;\n+\t\t}\n \t}\n }\n \n@@ -374,22 +332,22 @@\n \tint ret;\n \n \tif (cmd->cancel) {\n-\t\tcmd_append_finish(ctx);\n-\t\treturn TRUE;\n-\t}\n-\n+\t\t\/* cancel the command immediately (disconnection) *\/\n+\t\tcmd_append_finish(ctx);\n+\t\treturn TRUE;\n+\t}\n+\n+\t\/* we're parsing inside CATENATE (..) list after handling a TEXT part *\/\n \tret = imap_parser_read_args(ctx->save_parser, 0,\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL_SIZE |\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL8 |\n \t\t\t\t IMAP_PARSE_FLAG_INSIDE_LIST, &args);\n \tif (ret == -1) {\n-\t\tif (!ctx->failed) {\n-\t\t\tmsg = imap_parser_get_error(ctx->save_parser, &fatal);\n-\t\t\tif (fatal)\n-\t\t\t\tclient_disconnect_with_error(client, msg);\n-\t\t\telse\n-\t\t\t\tclient_send_command_error(cmd, msg);\n-\t\t}\n+\t\tmsg = imap_parser_get_error(ctx->save_parser, &fatal);\n+\t\tif (fatal)\n+\t\t\tclient_disconnect_with_error(client, msg);\n+\t\telse if (!ctx->failed)\n+\t\t\tclient_send_command_error(cmd, msg);\n \t\tclient->input_skip_line = TRUE;\n \t\tcmd_append_finish(ctx);\n \t\treturn TRUE;\n@@ -400,8 +358,9 @@\n \t}\n \n \tif ((ret = cmd_append_catenate(cmd, args, &nonsync)) < 0) {\n-\t\tclient->input_skip_line = TRUE;\n-\t\treturn cmd_append_cancel(ctx, nonsync);\n+\t\t\/* invalid parameters, abort immediately *\/\n+\t\tcmd_append_finish(ctx);\n+\t\treturn TRUE;\n \t}\n \n \tif (ret == 0) {\n@@ -410,8 +369,8 @@\n \n \t\t\/* last catenate part *\/\n \t\timap_parser_reset(ctx->save_parser);\n-\t\tcmd->func = cmd_append_continue_parsing;\n-\t\treturn cmd_append_continue_parsing(cmd);\n+\t\tcmd->func = cmd_append_parse_new_msg;\n+\t\treturn cmd_append_parse_new_msg(cmd);\n \t}\n \n \t\/* TEXT <literal> *\/\n@@ -420,12 +379,18 @@\n \tclient->input_skip_line = TRUE;\n \n \tif (!nonsync) {\n+\t\tif (ctx->failed) {\n+\t\t\t\/* tagline was already sent, we can abort here *\/\n+\t\t\tcmd_append_finish(ctx);\n+\t\t\treturn TRUE;\n+\t\t}\n \t\to_stream_nsend(client->output, \"+ OK\\r\\n\", 6);\n \t\to_stream_nflush(client->output);\n \t\to_stream_uncork(client->output);\n \t\to_stream_cork(client->output);\n \t}\n \n+\ti_assert(ctx->litinput != NULL);\n \tctx->message_input = TRUE;\n \tcmd->func = cmd_append_continue_message;\n \treturn cmd_append_continue_message(cmd);\n@@ -462,6 +427,7 @@\n \t\t(*args)++;\n \t}\n \n+\t\/* <message literal> | CATENATE (..) *\/\n \tvalid = FALSE;\n \t*nonsync_r = FALSE;\n \tctx->catenate = FALSE;\n@@ -485,17 +451,15 @@\n \n \tif (!valid) {\n \t\tclient->input_skip_line = TRUE;\n-\t\tclient_send_command_error(cmd, \"Invalid arguments.\");\n+\t\tif (!ctx->failed)\n+\t\t\tclient_send_command_error(cmd, \"Invalid arguments.\");\n \t\treturn -1;\n \t}\n \n-\tif (ctx->failed) {\n-\t\t\/* we failed earlier, make sure we just eat nonsync-literal\n-\t\t if it's given. *\/\n-\t\treturn -1;\n-\t}\n-\n-\tif (flags_list != NULL) {\n+\tif (flags_list == NULL || ctx->failed) {\n+\t\tflags = 0;\n+\t\tkeywords = NULL;\n+\t} else {\n \t\tif (!client_parse_mail_flags(cmd, flags_list,\n \t\t\t\t\t &flags, &keywords_list))\n \t\t\treturn -1;\n@@ -503,21 +467,19 @@\n \t\t\tkeywords = NULL;\n \t\telse if (mailbox_keywords_create(ctx->box, keywords_list,\n \t\t\t\t\t\t &keywords) < 0) {\n+\t\t\t\/* invalid keywords - delay failure *\/\n \t\t\tclient_send_storage_error(cmd, ctx->storage);\n-\t\t\treturn -1;\n-\t\t}\n-\t} else {\n-\t\tflags = 0;\n-\t\tkeywords = NULL;\n-\t}\n-\n-\tif (internal_date_str == NULL) {\n+\t\t\tctx->failed = TRUE;\n+\t\t}\n+\t}\n+\n+\tif (internal_date_str == NULL || ctx->failed) {\n \t\t\/* no time given, default to now. *\/\n \t\tinternal_date = (time_t)-1;\n \t\ttimezone_offset = 0;\n \t} else if (!imap_parse_datetime(internal_date_str,\n \t\t\t\t\t&internal_date, &timezone_offset)) {\n-\t\tclient_send_tagline(cmd, \"BAD Invalid internal date.\");\n+\t\tclient_send_command_error(cmd, \"Invalid internal date.\");\n \t\treturn -1;\n \t}\n \n@@ -534,7 +496,10 @@\n \t} else {\n \t\tif (ctx->literal_size == 0) {\n \t\t\t\/* no message data, abort *\/\n-\t\t\tclient_send_tagline(cmd, \"NO Can't save a zero byte message.\");\n+\t\t\tif (!ctx->failed) {\n+\t\t\t\tclient_send_tagline(cmd,\n+\t\t\t\t\t\"NO Can't save a zero byte message.\");\n+\t\t\t}\n \t\t\treturn -1;\n \t\t}\n \t\tctx->litinput = i_stream_create_limit(client->input, ctx->literal_size);\n@@ -547,17 +512,19 @@\n \t\tctx->input = input;\n \t}\n \n-\t\/* save the mail *\/\n-\tctx->save_ctx = mailbox_save_alloc(ctx->t);\n-\tmailbox_save_set_flags(ctx->save_ctx, flags, keywords);\n-\tif (keywords != NULL)\n-\t\tmailbox_keywords_unref(&keywords);\n-\tmailbox_save_set_received_date(ctx->save_ctx,\n-\t\t\t\t internal_date, timezone_offset);\n-\tif (mailbox_save_begin(&ctx->save_ctx, ctx->input) < 0) {\n-\t\t\/* save initialization failed *\/\n-\t\tclient_send_storage_error(cmd, ctx->storage);\n-\t\treturn -1;\n+\tif (!ctx->failed) {\n+\t\t\/* save the mail *\/\n+\t\tctx->save_ctx = mailbox_save_alloc(ctx->t);\n+\t\tmailbox_save_set_flags(ctx->save_ctx, flags, keywords);\n+\t\tif (keywords != NULL)\n+\t\t\tmailbox_keywords_unref(&keywords);\n+\t\tmailbox_save_set_received_date(ctx->save_ctx,\n+\t\t\t\t\t internal_date, timezone_offset);\n+\t\tif (mailbox_save_begin(&ctx->save_ctx, ctx->input) < 0) {\n+\t\t\t\/* save initialization failed *\/\n+\t\t\tclient_send_storage_error(cmd, ctx->storage);\n+\t\t\tctx->failed = TRUE;\n+\t\t}\n \t}\n \tctx->count++;\n \n@@ -565,7 +532,7 @@\n \t\t\/* normal APPEND *\/\n \t\treturn 1;\n \t} else if ((ret = cmd_append_catenate(cmd, cat_list, nonsync_r)) < 0) {\n-\t\tclient->input_skip_line = TRUE;\n+\t\t\/* invalid parameters, abort immediately *\/\n \t\treturn -1;\n \t} else if (ret == 0) {\n \t\t\/* CATENATE consisted only of URLs *\/\n@@ -596,7 +563,7 @@\n \t\treturn TRUE;\n \t}\n \tif (ctx->count == 0) {\n-\t\tclient_send_tagline(cmd, \"BAD Missing message size.\");\n+\t\tclient_send_command_error(cmd, \"Missing message size.\");\n \t\tcmd_append_finish(ctx);\n \t\treturn TRUE;\n \t}\n@@ -634,7 +601,7 @@\n \treturn cmd_sync(cmd, sync_flags, imap_flags, str_c(msg));\n }\n \n-static bool cmd_append_continue_parsing(struct client_command_context *cmd)\n+static bool cmd_append_parse_new_msg(struct client_command_context *cmd)\n {\n \tstruct client *client = cmd->client;\n \tstruct cmd_append_context *ctx = cmd->context;\n@@ -643,7 +610,11 @@\n \tbool fatal, nonsync;\n \tint ret;\n \n+\t\/* this function gets called 1) after parsing APPEND <mailbox> and\n+\t 2) with MULTIAPPEND extension after already saving one or more\n+\t mails. *\/\n \tif (cmd->cancel) {\n+\t\t\/* cancel the command immediately (disconnection) *\/\n \t\tcmd_append_finish(ctx);\n \t\treturn TRUE;\n \t}\n@@ -651,7 +622,8 @@\n \t\/* if error occurs, the CRLF is already read. *\/\n \tclient->input_skip_line = FALSE;\n \n-\t\/* [<flags>] [<internal date>] <message literal> *\/\n+\t\/* parse the entire line up to the first message literal\n+\t FIXME: we could do with less with CATENATE.. *\/\n \tret = imap_parser_read_args(ctx->save_parser, 0,\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL_SIZE |\n \t\t\t\t IMAP_PARSE_FLAG_LITERAL8, &args);\n@@ -676,12 +648,11 @@\n \t\treturn cmd_append_finish_parsing(cmd);\n \t}\n \n-\t\/* Handle MULTIAPPEND messages while CATENATE contains only URLs *\/\n+\t\/* Handle one or more messages (MULTIAPPEND) while they only contain\n+\t CATENATE URLs (i.e. no TEXT input from client) *\/\n \twhile ((ret = cmd_append_handle_args(cmd, &args, &nonsync)) == 0) {\n \t\tcmd_append_finish_catenate(cmd);\n \n-\t\t\/* Check for EOL, e.g.:\n-\t\t APPEND <box> ( URL <url> URL <url> URL <url> ) *\/\n \t\targs++;\n \t\tif (IMAP_ARG_IS_EOL(args)) {\n \t\t\t\/* last message *\/\n@@ -689,23 +660,32 @@\n \t\t}\n \t}\n \n-\tif (ret < 0)\n-\t\treturn cmd_append_cancel(ctx, nonsync);\n+\tif (ret < 0) {\n+\t\t\/* invalid parameters, abort immediately *\/\n+\t\tcmd_append_finish(ctx);\n+\t\treturn TRUE;\n+\t}\n \n \tif (!ctx->catenate) {\n \t\t\/* after literal comes CRLF, if we fail make sure\n \t\t we eat it away *\/\n \t\tclient->input_skip_line = TRUE;\n-\t\tctx->message_input = TRUE;\n \t}\n \n \tif (!nonsync) {\n+\t\tif (ctx->failed) {\n+\t\t\t\/* tagline was already sent, we can abort here *\/\n+\t\t\tcmd_append_finish(ctx);\n+\t\t\treturn TRUE;\n+\t\t}\n \t\to_stream_nsend(client->output, \"+ OK\\r\\n\", 6);\n \t\to_stream_nflush(client->output);\n \t\to_stream_uncork(client->output);\n \t\to_stream_cork(client->output);\n \t}\n \n+\ti_assert(ctx->litinput != NULL);\n+\tctx->message_input = TRUE;\n \tcmd->func = cmd_append_continue_message;\n \treturn cmd_append_continue_message(cmd);\n }\n@@ -717,6 +697,7 @@\n \tint ret = 0;\n \n \tif (cmd->cancel) {\n+\t\t\/* cancel the command immediately (disconnection) *\/\n \t\tcmd_append_finish(ctx);\n \t\treturn TRUE;\n \t}\n@@ -736,8 +717,11 @@\n \t}\n \n \tif (ctx->save_ctx == NULL) {\n+\t\t\/* saving has already failed, we're just eating away the\n+\t\t literal *\/\n \t\t(void)i_stream_read(ctx->litinput);\n-\t\ti_stream_skip(ctx->litinput, i_stream_get_data_size(ctx->litinput));\n+\t\ti_stream_skip(ctx->litinput,\n+\t\t\t i_stream_get_data_size(ctx->litinput));\n \t}\n \n \tif (ctx->litinput->eof || client->input->closed) {\n@@ -759,8 +743,8 @@\n \t\t} else if (ctx->catenate) {\n \t\t\t\/* CATENATE isn't finished yet *\/\n \t\t} else if (mailbox_save_finish(&ctx->save_ctx) < 0) {\n+\t\t\tclient_send_storage_error(cmd, ctx->storage);\n \t\t\tctx->failed = TRUE;\n-\t\t\tclient_send_storage_error(cmd, ctx->storage);\n \t\t}\n \n \t\tif (client->input->closed) {\n@@ -768,7 +752,7 @@\n \t\t\treturn TRUE;\n \t\t}\n \n-\t\t\/* prepare for next message (part) *\/\n+\t\t\/* prepare for the next message (or its part with catenate) *\/\n \t\tctx->message_input = FALSE;\n \t\timap_parser_reset(ctx->save_parser);\n \n@@ -778,8 +762,8 @@\n \t\t}\n \n \t\ti_stream_unref(&ctx->input);\n-\t\tcmd->func = cmd_append_continue_parsing;\n-\t\treturn cmd_append_continue_parsing(cmd);\n+\t\tcmd->func = cmd_append_parse_new_msg;\n+\t\treturn cmd_append_parse_new_msg(cmd);\n \t}\n \treturn FALSE;\n }\n@@ -829,7 +813,7 @@\n \tctx->save_parser = imap_parser_create(client->input, client->output,\n \t\t\t\t\t client->set->imap_max_line_length);\n \n-\tcmd->func = cmd_append_continue_parsing;\n+\tcmd->func = cmd_append_parse_new_msg;\n \tcmd->context = ctx;\n-\treturn cmd_append_continue_parsing(cmd);\n-}\n+\treturn cmd_append_parse_new_msg(cmd);\n+}\n"} {"commit":"66b2b74ad5e47f8c4c922bdfc1dafa186a8dd16e","subject":"IMAP: Don't allow APPEND to specify INTERNALDATE more than 2 hours into future.","message":"IMAP: Don't allow APPEND to specify INTERNALDATE more than 2 hours into future.\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-append.c\n+++ src\/imap\/cmd-append.c\n@@ -11,6 +11,12 @@\n #include \"mail-storage.h\"\n \n #include <sys\/time.h>\n+\n+\/* Don't allow internaldates to be too far in the future. At least with Maildir\n+ they can cause problems with incremental backups since internaldate is\n+ stored in file's mtime. But perhaps there are also some other reasons why\n+ it might not be wanted. *\/\n+#define INTERNALDATE_MAX_FUTURE_SECS (2*3600)\n \n struct cmd_append_context {\n \tstruct client *client;\n@@ -321,6 +327,13 @@\n \t\treturn cmd_append_cancel(ctx, nonsync);\n \t}\n \n+\tif (internal_date != (time_t)-1 &&\n+\t internal_date > ioloop_time + INTERNALDATE_MAX_FUTURE_SECS) {\n+\t\t\/* the client specified a time in the future, set it to now. *\/\n+\t\tinternal_date = (time_t)-1;\n+\t\ttimezone_offset = 0;\n+\t}\n+\n \tif (ctx->msg_size == 0) {\n \t\t\/* no message data, abort *\/\n \t\tclient_send_tagline(cmd, \"NO Can't save a zero byte message.\");\n"} {"commit":"b82169d208103046a6ce6d744867ac95face41a5","subject":"Send search result in one write()","message":"Send search result in one write()\n","repos":"Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,damoxc\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/cmd-search.c\n+++ src\/imap\/cmd-search.c\n@@ -106,8 +106,13 @@\n static void cmd_search_more_callback(struct client_command_context *cmd)\n {\n \tstruct client *client = cmd->client;\n+\tbool finished;\n \n-\tif (cmd_search_more(cmd)) {\n+\to_stream_cork(client->output);\n+\tfinished = cmd_search_more(cmd);\n+\to_stream_uncork(client->output);\n+\n+\tif (finished) {\n \t\tclient_command_free(cmd);\n \t\tclient_continue_pending_input(client);\n \t} else {\n"} {"commit":"cfd806577b9ba6049cc3dec3cd78168bfb7ca4db","subject":"fix sending window new event","message":"fix sending window new event\n","repos":"taiyu-len\/sway,ascent12\/sway,taiyu-len\/sway,taiyu-len\/sway,1ace\/sway,1ace\/sway,SirCmpwn\/sway,ascent12\/sway,ascent12\/sway,1ace\/sway","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- sway\/tree\/container.c\n+++ sway\/tree\/container.c\n@@ -51,12 +51,12 @@\n }\n \n void container_create_notify(struct sway_container *container) {\n-\tif (container->type != C_VIEW || container->type != C_CONTAINER) {\n-\t\treturn;\n-\t}\n \t\/\/ TODO send ipc event type based on the container type\n \twl_signal_emit(&root_container.sway_root->events.new_container, container);\n-\tipc_event_window(container, \"new\");\n+\n+\tif (container->type == C_VIEW || container->type == C_CONTAINER) {\n+\t\tipc_event_window(container, \"new\");\n+\t}\n }\n \n static void container_close_notify(struct sway_container *container) {\n"} {"commit":"59c3a68dc05285fd34233f4ae23882082d53fd81","subject":"If FETCH failed immediately, we sent back extra \")\" line.","message":"If FETCH failed immediately, we sent back extra \")\" line.\n","repos":"damoxc\/dovecot,LTD-Beget\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,Distrotech\/dovecot,damoxc\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot,damoxc\/dovecot,damoxc\/dovecot,LTD-Beget\/dovecot,Distrotech\/dovecot,LTD-Beget\/dovecot","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/imap\/imap-fetch.c\n+++ src\/imap\/imap-fetch.c\n@@ -152,6 +152,7 @@\n \tctx->search_ctx =\n \t\tmailbox_search_init(ctx->trans, NULL, search_arg, NULL,\n \t\t\t\t ctx->fetch_data, ctx->all_headers_ctx);\n+\tctx->line_finished = TRUE;\n }\n \n int imap_fetch(struct imap_fetch_context *ctx)\n"} {"commit":"cea4227c1502f1abda9125b1793dc997dec5e4bc","subject":"fix memleak when loading lossless images","message":"fix memleak when loading lossless images\n","repos":"freedesktop-unofficial-mirror\/swfdec__swfdec,mltframework\/swfdec,mltframework\/swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec,freedesktop-unofficial-mirror\/swfdec__swfdec","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- swfdec\/swfdec_image.c\n+++ swfdec\/swfdec_image.c\n@@ -469,6 +469,7 @@\n }\n }\n data = g_memdup (buffer->data, buffer->length);\n+ swfdec_buffer_unref (buffer);\n } else {\n SWFDEC_ERROR (\"unknown lossless image format %u\", format);\n return NULL;\n"} {"commit":"4c450809439f1212270f975d4f0ff062ee1bde7a","subject":"modify the comment","message":"modify the comment\n","repos":"jiwanqiang\/Pony","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Foundation\/NSString\/NSString+Regular.h\n+++ Foundation\/NSString\/NSString+Regular.h\n@@ -27,13 +27,16 @@\n @interface NSString (Regular)\n \n \/**\n- * Match the mobile number which belonged to China.Return the match result.\n+ * Match the mobile number which belonged to China.Return the match result.\n+ *\n+ * @return Yes is mobile number\n *\/\n - (BOOL)isMobileNumber;\n \n \/**\n- * Match the E-mail address,return the match result.But it should be update,because the top-level\n- * domain has been updated.\n+ * Match the E-mail address,return the match result.But it should be update,because the top-level domain has been updated.\n+ *\n+ * @return Yes is E-mail address\n *\/\n - (BOOL)isEmailAddress;\n \n"} {"commit":"3104c85457ae72c452c898254ef7ffd3964b1efc","subject":"Symbol and Opcode changes to support batched analysis (#1313)","message":"Symbol and Opcode changes to support batched analysis (#1313)\n\nDuring batched analysis we will be figuring out which symbols need to be varying and which can be uniform during batched execution, we will also be figuring out the minimum number of operations which require masking as well as storing\/caching some other operation specific flags used later in batched code generation. We choose to store these analysis results inside Symbol and Opcode directly so that they are efficiently accessible and stable under optimization passes than might invidate OpcodeVec.\r\n","repos":"imageworks\/OpenShadingLanguage,aconty\/OpenShadingLanguage,imageworks\/OpenShadingLanguage,aconty\/OpenShadingLanguage,lgritz\/OpenShadingLanguage,lgritz\/OpenShadingLanguage,lgritz\/OpenShadingLanguage,imageworks\/OpenShadingLanguage,brechtvl\/OpenShadingLanguage,brechtvl\/OpenShadingLanguage,aconty\/OpenShadingLanguage,brechtvl\/OpenShadingLanguage,lgritz\/OpenShadingLanguage,imageworks\/OpenShadingLanguage,brechtvl\/OpenShadingLanguage,aconty\/OpenShadingLanguage,lgritz\/OpenShadingLanguage,imageworks\/OpenShadingLanguage,aconty\/OpenShadingLanguage,brechtvl\/OpenShadingLanguage","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/include\/osl_pvt.h\n+++ src\/include\/osl_pvt.h\n@@ -481,6 +481,7 @@\n , m_allowconnect(true)\n , m_renderer_output(false)\n , m_readonly(false)\n+ , m_is_uniform(true)\n , m_valuesource(DefaultVal)\n , m_free_data(false)\n , m_fieldid(-1)\n@@ -744,6 +745,13 @@\n bool renderer_output() const { return m_renderer_output; }\n void renderer_output(bool v) { m_renderer_output = v; }\n \n+ \/\/ When not uniform a symbol will have a varying value under batched\n+ \/\/ execution and must use a Wide data type to hold different values\n+ \/\/ for each data lane executing\n+ bool is_uniform() const { return m_is_uniform; }\n+ bool is_varying() const { return (m_is_uniform == 0); }\n+ void make_varying() { m_is_uniform = false; }\n+\n bool readonly() const { return m_readonly; }\n void readonly(bool v) { m_readonly = v; }\n \n@@ -826,9 +834,10 @@\n unsigned m_allowconnect : 1; \/\/\/< Is the param not overridden by geom?\n unsigned m_renderer_output : 1; \/\/\/< Is this sym a renderer output?\n unsigned m_readonly : 1; \/\/\/< read-only symbol\n- char m_valuesource; \/\/\/< Where did the value come from?\n- bool m_free_data; \/\/\/< Free m_data upon destruction?\n- short m_fieldid; \/\/\/< Struct field of this var (or -1)\n+ unsigned m_is_uniform : 1; \/\/\/< symbol is uniform under batched execution\n+ char m_valuesource; \/\/\/< Where did the value come from?\n+ bool m_free_data; \/\/\/< Free m_data upon destruction?\n+ short m_fieldid; \/\/\/< Struct field of this var (or -1)\n short m_layer; \/\/\/< Layer (within the group) this belongs to\n int m_scope; \/\/\/< Scope where this symbol was declared\n int m_dataoffset; \/\/\/< Offset of the data (-1 for unknown)\n@@ -867,6 +876,8 @@\n m_argread = ~1; \/\/ Default - all args are read except the first\n m_argwrite = 1; \/\/ Default - first arg only is written by the op\n m_argtakesderivs = 0; \/\/ Default - doesn't take derivs\n+ m_requires_masking = 0; \/\/ Default - doesn't require masking\n+ m_analysis_flag = 0; \/\/ Default - optional analysis flag is not set\n }\n \n ustring opname() const { return m_op; }\n@@ -1027,6 +1038,18 @@\n \/\/\/ Runtime optimizer may have case to transmute an op to a\n \/\/\/ different form. Only opname is changed.\n void transmute_opname(ustring opname) { m_op = opname; }\n+\n+ \/\/\/ Op would require masking under batched execution\n+ \/\/\/ when its arguments are not uniform (varying)\n+ bool requires_masking() const { return m_requires_masking; }\n+ void requires_masking(bool v) { m_requires_masking = v; }\n+\n+ \/\/\/ Analysis might need to tag specific operations with flags that\n+ \/\/\/ are later used in code generation. The meaning of these flags\n+ \/\/\/ are dependent on the type of operation. Choose to embed a flag\n+ \/\/\/ here so that it is stable when a OpcodeVec is modified.\n+ bool analysis_flag() const { return m_analysis_flag; }\n+ void analysis_flag(bool v) { m_analysis_flag = v; }\n \n private:\n ustring m_op; \/\/\/< Name of opcode\n@@ -1044,6 +1067,11 @@\n \/\/ more than 32 args, and those that do are read-only that far out.\n \/\/ Seems silly to add complexity here to deal with arbitrary param\n \/\/ counts and read\/write-ability for cases that never come up.\n+\n+ \/\/\/< Op requires masking under batched execution when its arguments are not uniform\n+ unsigned m_requires_masking : 1;\n+ \/\/\/< Op specific analysis flag, meaning depends on type of op\n+ unsigned m_analysis_flag : 1;\n };\n \n \n"} {"commit":"1e0febe53ad9251933ad8113ee32c29bdfa43344","subject":"Shocker as pandocs once again has incorrect information","message":"Shocker as pandocs once again has incorrect information\n","repos":"supergameherm\/supergameherm,foxkit-us\/supergameherm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/instr_alu_logic.c\n+++ src\/instr_alu_logic.c\n@@ -50,10 +50,6 @@\n \t{\n \t\tFLAG_SET(state, FLAG_C);\n \t}\n-\telse if(!REG_A(state))\n-\t{\n-\t\tFLAG_SET(state, FLAG_Z);\n-\t}\n \n \tREG_A(state) <<= 1;\n \tREG_A(state) |= carry;\n@@ -75,10 +71,6 @@\n \tif(REG_A(state) & 0x01)\n \t{\n \t\tFLAG_SET(state, FLAG_C);\n-\t}\n-\telse if(!REG_A(state))\n-\t{\n-\t\tFLAG_SET(state, FLAG_Z);\n \t}\n \n \tREG_A(state) >>= 1;\n"} {"commit":"d7bd2bade039e0eb322b681e16c4f76e69f51b46","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"kmx\/mirror-cd,kmx\/mirror-cd,kmx\/mirror-cd","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/intcgm\/cgm_play.c\n+++ src\/intcgm\/cgm_play.c\n@@ -343,6 +343,9 @@\n else\n height = h\/100;\n }\n+\n+ if (!font)\n+ font = \"TIMES_ROMAN\";\n \n cgm->dof.TextAttrib(hor, ver, font, height*cgm->text_att.exp_fact, cgm_getcolor(cgm, cgm->text_att.color), cgm->text_att.char_base, cgm->userdata);\n }\n"} {"commit":"65d8df42085c022f1d708a54e2323efba0773559","subject":"Fixed the header of the KatzeThrobber","message":"Fixed the header of the KatzeThrobber\n\n","repos":"dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori,dokidokivisual\/midori","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- katze\/katze-throbber.h\n+++ katze\/katze-throbber.h\n@@ -38,14 +38,8 @@\n \n struct _KatzeThrobber\n {\n+ GtkMisc parent_object;\n KatzeThrobberPrivate* priv;\n- GtkWidget parent_object;\n-\n- \/* Padding for future expansion *\/\n- void (*_katze_reserved1) (void);\n- void (*_katze_reserved2) (void);\n- void (*_katze_reserved3) (void);\n- void (*_katze_reserved4) (void);\n };\n \n struct _KatzeThrobberClass\n@@ -60,7 +54,7 @@\n };\n \n GType\n-katze_throbber_get_type (void) G_GNUC_CONST;\n+katze_throbber_get_type (void);\n \n GtkWidget*\n katze_throbber_new (void);\n"} {"commit":"d071334d6418a013044a443c2e9301878ac046d6","subject":"Set ISP_CFG_NOVRAM for Sun-branded ISP2200's that don't have an NVRAM fitted. Avoids the \"invalid NVRAM\" message on the Blade 1000 and other machines with onboard isp(4).","message":"Set ISP_CFG_NOVRAM for Sun-branded ISP2200's that don't have an NVRAM fitted.\nAvoids the \"invalid NVRAM\" message on the Blade 1000 and other machines with\nonboard isp(4).\n\nok deraadt@\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/isp_pci.c\n+++ dev\/pci\/isp_pci.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: isp_pci.c,v 1.38 2005\/09\/11 18:17:08 mickey Exp $\t*\/\n+\/*\t$OpenBSD: isp_pci.c,v 1.39 2007\/02\/28 19:40:38 kettenis Exp $\t*\/\n \/*\n * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.\n *\n@@ -40,6 +40,10 @@\n #include <dev\/pci\/pcivar.h>\n #include <dev\/pci\/pcidevs.h>\n \n+#ifdef __sparc64__\n+#include <dev\/ofw\/openfirm.h>\n+#endif\n+\n static u_int16_t isp_pci_rd_reg(struct ispsoftc *, int);\n static void isp_pci_wr_reg(struct ispsoftc *, int, u_int16_t);\n #if !(defined(ISP_DISABLE_1080_SUPPORT) && defined(ISP_DISABLE_12160_SUPPORT))\n@@ -399,6 +403,7 @@\n \tconst char *intrstr;\n \tint ioh_valid, memh_valid;\n \tbus_size_t iosize, msize;\n+\tu_int32_t confopts = 0;\n \n \tioh_valid = memh_valid = 0;\n \n@@ -573,6 +578,17 @@\n \t\tpcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =\n \t\t PCI_MBOX_REGS2100_OFF;\n \t\tdata = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CLASS_REG);\n+#ifdef __sparc64__\n+\t\t{\n+\t\t\tchar name[32];\n+\n+\t\t\tbzero(name, sizeof(name));\n+\t\t\tOF_getprop(PCITAG_NODE(pa->pa_tag),\n+\t\t\t \"name\", name, sizeof(name));\n+\t\t\tif (strcmp(name, \"SUNW,qlc\") == 0)\n+\t\t\t\tconfopts |= ISP_CFG_NONVRAM;\n+\t\t}\n+#endif\n \t}\n #endif\n #ifndef\tISP_DISABLE_2300_SUPPORT\n@@ -682,7 +698,7 @@\n \t\tDEFAULT_PORTWWN(isp) = 0x400000007F000003ULL;\n \t}\n \n-\tisp->isp_confopts = self->dv_cfdata->cf_flags;\n+\tisp->isp_confopts = confopts | self->dv_cfdata->cf_flags;\n \tisp->isp_role = ISP_DEFAULT_ROLES;\n \tISP_LOCK(isp);\n \tisp->isp_osinfo.no_mbox_ints = 1;\n"} {"commit":"e6a9d8cb7fee66400c5d1ed4a251f75e328c11fd","subject":"Fix #31247: cycles crash after recent bugfix.","message":"Fix #31247: cycles crash after recent bugfix.\n\n","repos":"tangent-opensource\/coreBlackbird,tangent-opensource\/coreBlackbird,pyrochlore\/cycles,tangent-opensource\/coreBlackbird,pyrochlore\/cycles,pyrochlore\/cycles","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/kernel_shader.h\n+++ kernel\/kernel_shader.h\n@@ -180,7 +180,8 @@\n \t}\n \n \tsd->flag = kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2);\n-\tsd->flag |= kernel_tex_fetch(__object_flag, sd->object);\n+\tif(sd->object != -1)\n+\t\tsd->flag |= kernel_tex_fetch(__object_flag, sd->object);\n \n #ifdef __DPDU__\n \t\/* dPdu\/dPdv *\/\n"} {"commit":"a97d19466c534e803004767c3aeaccfb95c35494","subject":"MFC r175120","message":"MFC r175120\n\n Add a missing \\n.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/arm\/at91\/if_ate.c\n+++ sys\/arm\/at91\/if_ate.c\n@@ -191,7 +191,7 @@\n \tcallout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0);\n \n \tif ((err = ate_get_mac(sc, eaddr)) != 0) {\n-\t\tdevice_printf(dev, \"No MAC address set\");\n+\t\tdevice_printf(dev, \"No MAC address set\\n\");\n \t\tgoto out;\n \t}\n \tate_set_mac(sc, eaddr);\n"} {"commit":"fa4d66e6bceec8e60d191b293d870da40db1e3b3","subject":"Fix cycles error for heterogenous volumes, causing double step size to be used.","message":"Fix cycles error for heterogenous volumes, causing double step size to be used.\n\nThis gives longer render times due to smaller step size, double it to get\nsomething more like the previous behavior.\n","repos":"pyrochlore\/cycles,tangent-opensource\/coreBlackbird,tangent-opensource\/coreBlackbird,pyrochlore\/cycles,tangent-opensource\/coreBlackbird,pyrochlore\/cycles","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- kernel\/kernel_volume.h\n+++ kernel\/kernel_volume.h\n@@ -151,7 +151,7 @@\n \n \tfor(int i = 0; i < max_steps; i++) {\n \t\t\/* advance to new position *\/\n-\t\tfloat new_t = min(ray->t, t + random_jitter_offset + i * step);\n+\t\tfloat new_t = min(ray->t, random_jitter_offset + i * step);\n \t\tfloat3 new_P = ray->P + ray->D * new_t;\n \t\tfloat3 new_sigma_t;\n \n@@ -398,7 +398,7 @@\n \n \tfor(int i = 0; i < max_steps; i++) {\n \t\t\/* advance to new position *\/\n-\t\tfloat new_t = min(ray->t, t + random_jitter_offset + i * step);\n+\t\tfloat new_t = min(ray->t, random_jitter_offset + i * step);\n \t\tfloat3 new_P = ray->P + ray->D * new_t;\n \t\tVolumeShaderCoefficients new_coeff;\n \n"} {"commit":"647b8ba4782b1b4b819f4e8961baa2171d3c1b6f","subject":"Fix typo; CTLFLAG_RO -> CTLFLAG_RD.","message":"Fix typo; CTLFLAG_RO -> CTLFLAG_RD.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/acpica\/acpi.c\n+++ sys\/dev\/acpica\/acpi.c\n@@ -168,7 +168,7 @@\n SYSCTL_INT(_debug, OID_AUTO, acpi_debug_layer, CTLFLAG_RW, &AcpiDbgLayer, 0, \"\");\n SYSCTL_INT(_debug, OID_AUTO, acpi_debug_level, CTLFLAG_RW, &AcpiDbgLevel, 0, \"\");\n static int acpi_ca_version = ACPI_CA_VERSION;\n-SYSCTL_INT(_debug, OID_AUTO, acpi_ca_version, CTLFLAG_RO, &acpi_ca_version, 0, \"\");\n+SYSCTL_INT(_debug, OID_AUTO, acpi_ca_version, CTLFLAG_RD, &acpi_ca_version, 0, \"\");\n \n \/*\n * ACPI can only be loaded as a module by the loader; activating it after\n"} {"commit":"d21f35beced468a892ca9244c1289db7b702b0db","subject":"initpt.c: Fix data\/BSS section MMU setup","message":"initpt.c: Fix data\/BSS section MMU setup\n","repos":"fincs\/FeOS-v2,fincs\/FeOS-v2,fincs\/FeOS-v2,fincs\/FeOS-v2","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- kernel\/source\/initpt.c\n+++ kernel\/source\/initpt.c\n@@ -69,7 +69,7 @@\n \t\t*tab++ = MMU_L2_PAGE4K | (pos += 0x1000) | MMU_L2_RONA | MMU_L2_XN_4K | MMU_L2_4K_CACHED;\n \n \t\/\/ DATA section - Read\/write, non-executable, cacheable\n-\tsize = (u32)__lma_data_size >> 12;\n+\tsize = ((u32)__lma_data_size + 0xFFF) >> 12;\n \tfor (i = 0; i < size; i ++)\n \t\t*tab++ = MMU_L2_PAGE4K | (pos += 0x1000) | MMU_L2_RWNA | MMU_L2_XN_4K | MMU_L2_4K_CACHED;\n \n"} {"commit":"35f751a3601f0f0c3c353c4ffcc120de697c6266","subject":"MFC: Fix sign bug in acpi_release_resource().","message":"MFC: Fix sign bug in acpi_release_resource().\n\nApproved by:\tre (mux)\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/dev\/acpica\/acpi.c\n+++ sys\/dev\/acpica\/acpi.c\n@@ -1083,7 +1083,7 @@\n * If we know about this address, deactivate it and release it to the\n * local pool. If we don't, pass this request up to the parent.\n *\/\n- if (acpi_sysres_find(bus, type, rman_get_start(r)) == NULL) {\n+ if (acpi_sysres_find(bus, type, rman_get_start(r)) != NULL) {\n \tif (rman_get_flags(r) & RF_ACTIVE) {\n \t ret = bus_deactivate_resource(child, type, rid, r);\n \t if (ret != 0)\n"} {"commit":"b5beaffa5b16459227a851941a48ba19610004e5","subject":"minor nit in comment about what kind of flags these are","message":"minor nit in comment about what kind of flags these are\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"e0acfd53c9660c7f11e697f5c53f7e73de01e078","subject":"Add an explanatory comment about what operational modes in xfwopt are.","message":"Add an explanatory comment about what operational modes in xfwopt are.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"2de47a2397f3311ff48bfb688c4c17e696ed33a9","subject":"Regenerate.","message":"Regenerate.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"316017b3ba07fee2bd29459284b7ec0d61120af2","subject":"FDT changes for 64 bit kernel","message":"FDT changes for 64 bit kernel\n\nUse the offset into the device tree from fdtp as the phandle instead\nof using pointer into the device tree. This will make sure that the\nphandle fits into a uint32_t type, even when compiled for 64bit.\n\nReviewed by:\traj, nathanw, marcel\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"84aa1aeb3500f5779deb9d1b2f7a68ce800ffe7c","subject":"3rdparty: update to use LICENSE.header.","message":"3rdparty: update to use LICENSE.header.\n","repos":"SuperNascher\/mumble,LuAPi\/mumble,Lartza\/mumble,SuperNascher\/mumble,SuperNascher\/mumble,Lartza\/mumble,Lartza\/mumble,Lartza\/mumble,Lartza\/mumble,LuAPi\/mumble,LuAPi\/mumble,SuperNascher\/mumble,SuperNascher\/mumble,Lartza\/mumble,SuperNascher\/mumble,LuAPi\/mumble,SuperNascher\/mumble,LuAPi\/mumble,Lartza\/mumble,LuAPi\/mumble,LuAPi\/mumble,LuAPi\/mumble,SuperNascher\/mumble,LuAPi\/mumble,SuperNascher\/mumble,Lartza\/mumble","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- 3rdparty\/speex-build\/mumble_speex_init.c\n+++ 3rdparty\/speex-build\/mumble_speex_init.c\n@@ -1,32 +1,7 @@\n-\/* Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>\n-\n- All rights reserved.\n-\n- Redistribution and use in source and binary forms, with or without\n- modification, are permitted provided that the following conditions\n- are met:\n-\n- - Redistributions of source code must retain the above copyright notice,\n- this list of conditions and the following disclaimer.\n- - Redistributions in binary form must reproduce the above copyright notice,\n- this list of conditions and the following disclaimer in the documentation\n- and\/or other materials provided with the distribution.\n- - Neither the name of the Mumble Developers nor the names of its\n- contributors may be used to endorse or promote products derived from this\n- software without specific prior written permission.\n-\n- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR\n- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n-*\/\n+\/\/ Copyright 2005-2016 The Mumble Developers. All rights reserved.\n+\/\/ Use of this source code is governed by a BSD-style license\n+\/\/ that can be found in the LICENSE file at the root of the\n+\/\/ Mumble source tree or at <https:\/\/www.mumble.info\/LICENSE>.\n \n #ifdef HAVE_CONFIG_H\n #include \"config.h\"\n"} {"commit":"0102e5bf8ddfb99d801056095f47f3e7da8d4e12","subject":"vioinput: fix problem with high resolution mouse","message":"vioinput: fix problem with high resolution mouse\n\nhttps:\/\/github.com\/virtio-win\/kvm-guest-drivers-windows\/issues\/385\n\nHigh resultion mouse often provides values out of range (-127,+127).\nUnfortunately the interface of vioinput does not provide any\ninformation about logical limits of relative pointer.\nSo, let's keep the value inside the range.\n\nSigned-off-by: Yuri Benditovich <9668326cb042de5d91fd7679dac7ca5ea402812c@daynix.com>\n","repos":"virtio-win\/kvm-guest-drivers-windows,vrozenfe\/kvm-guest-drivers-windows,vrozenfe\/kvm-guest-drivers-windows,YanVugenfirer\/kvm-guest-drivers-windows,YanVugenfirer\/kvm-guest-drivers-windows,daynix\/kvm-guest-drivers-windows,vrozenfe\/kvm-guest-drivers-windows,YanVugenfirer\/kvm-guest-drivers-windows,YanVugenfirer\/kvm-guest-drivers-windows,vrozenfe\/kvm-guest-drivers-windows,virtio-win\/kvm-guest-drivers-windows,virtio-win\/kvm-guest-drivers-windows,daynix\/kvm-guest-drivers-windows,virtio-win\/kvm-guest-drivers-windows,YanVugenfirer\/kvm-guest-drivers-windows,daynix\/kvm-guest-drivers-windows,daynix\/kvm-guest-drivers-windows,daynix\/kvm-guest-drivers-windows,vrozenfe\/kvm-guest-drivers-windows,virtio-win\/kvm-guest-drivers-windows","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vioinput\/sys\/HidMouse.c\n+++ vioinput\/sys\/HidMouse.c\n@@ -73,6 +73,16 @@\n ULONG uFlags;\n } INPUT_CLASS_MOUSE, *PINPUT_CLASS_MOUSE;\n \n+static UCHAR FORCEINLINE TrimRelative(long val)\n+{\n+ if (val < -127) {\n+ return (UCHAR)(-127);\n+ } else if (val > 127) {\n+ return 127;\n+ }\n+ return (UCHAR)val;\n+}\n+\n static NTSTATUS\n HIDMouseEventToReport(\n PINPUT_CLASS_COMMON pClass,\n@@ -108,7 +118,7 @@\n else\n #endif \/\/ EXPOSE_ABS_AXES_WITH_BUTTONS_AS_MOUSE\n {\n- pReport[pMouseDesc->cbAxisOffset + pMap[1]] = (UCHAR)pEvent->value;\n+ pReport[pMouseDesc->cbAxisOffset + pMap[1]] = TrimRelative((long)pEvent->value);\n }\n pClass->bDirty = TRUE;\n break;\n"} {"commit":"cfec163b6f7ce1a6d5ac2d2d87e321285dc06579","subject":"Fix typo in ENE CB710 description. It isn't a 720.","message":"Fix typo in ENE CB710 description. It isn't a 720.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"423433a5d70cff819e78878338a17388f3542e0c","subject":"Allow child devices of vgapci(4) to query VPD strings and use MSI\/MSI-X interrupts. For the MSI\/MSI-X case, we only allow 1 child device to use MSI or MSI-X at a time.","message":"Allow child devices of vgapci(4) to query VPD strings and use MSI\/MSI-X\ninterrupts. For the MSI\/MSI-X case, we only allow 1 child device to use\nMSI or MSI-X at a time.\n\nTested by:\trnoland\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"d633983d6c998c542faecf7da23b15e641232cf3","subject":"Properly unref ng_hub nodes on shutdown, so that we don't leak them.","message":"Properly unref ng_hub nodes on shutdown, so that we don't leak them.\n\nMFC after:\t3 days\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"69c6892433fe5c910813ec7b09d34aa38b42a4a7","subject":"MFC rev. 1.35 Fix shutdown bug made by previous commit.","message":"MFC rev. 1.35\nFix shutdown bug made by previous commit.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"49e1d1c09019a25649d139cdfae9b1e0b317cf74","subject":"comment and restricting the flag usage","message":"comment and restricting the flag usage\n","repos":"emeryberger\/Heap-Layers,emeryberger\/Heap-Layers,emeryberger\/Heap-Layers","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- wrappers\/mmapwrapper.h\n+++ wrappers\/mmapwrapper.h\n@@ -146,8 +146,13 @@\n mapFlag |= MAP_PRIVATE | MAP_ALIGN | MAP_ANON;\n #elif defined(MAP_ALIGNED)\n int fd = -1;\n- size_t alignment = (sizeof(size_t) * sizeof(void *)) - 1ul - (size_t)__builtin_clzl(sz);\n- mapFlag |= MAP_PRIVATE | MAP_ANON | MAP_ALIGNED(alignment);\n+ \/\/ On allocations equal or larger than page size, we align it to the log2 boundary\n+ \/\/ in those contexts, sometimes (on NetBSD notably) large mappings tends to fail\n+ \/\/ without this flag.\n+ size_t alignment = ilog2(sz);\n+ mapFlag |= MAP_PRIVATE | MAP_ANON;\n+ if (alignment >= 12ul)\n+ mapFlag |= MAP_ALIGNED(alignment);\n #elif !defined(MAP_ANONYMOUS)\n static int fd = ::open (\"\/dev\/zero\", O_RDWR);\n mapFlag |= MAP_PRIVATE;\n"} {"commit":"ef99a9576fc6beeae0c584a05e1f90d37b9bf18f","subject":"Don't use curthread to resolve file descriptor. Request may be queued, so thread will be different. Instead require sender to send process ID together with file descriptor.","message":"Don't use curthread to resolve file descriptor. Request may be queued, so\nthread will be different. Instead require sender to send process ID\ntogether with file descriptor.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"25376bdec2982fcbd67be959c32e378c18b7fbc1","subject":"Fix build after in6_joingroup change. It remains unclear if DAD breaks CARP or not.","message":"Fix build after in6_joingroup change. It remains unclear if DAD breaks CARP\nor not.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"9aba394fc7e749ff5cb87deb0798c66bfc5a6f86","subject":"Staticize local functions.","message":"Staticize local functions.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"5acdb2c2378212a31d9294fc4a06383d18a5b970","subject":"Sort IP addresses before hashing them for the signature. Otherwise carp is sensitive to address configuration order.","message":"Sort IP addresses before hashing them for the signature. Otherwise carp is\nsensitive to address configuration order.\n\nPR:\t\tkern\/121574\nReported by:\tDouglas K. Rand, Wouter de Jong\nObtained from:\tOpenBSD (rev 1.114 + fixes)\nMFC after:\t2 weeks\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"70a49d0c9c37654ee7f49ee6257b38fcb27f927e","subject":"Get rid of a nagging call to sleep() which crept back in.","message":"Get rid of a nagging call to sleep() which crept back in.\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- sys\/scsi\/scsi_ioctl.c\n+++ sys\/scsi\/scsi_ioctl.c\n@@ -199,7 +199,7 @@\n \ts = splbio();\n \twhile(!(bp->b_flags & B_DONE))\n \t{\n-\t\tsleep(bp,PRIBIO);\n+\t\ttsleep((caddr_t)bp, PRIBIO, \"scsistrat\", 0);\n \t}\n \tsplx(s);\n \tSC_DEBUG(sc_link,SDEV_DB3,(\"back from sleep\\n\"));\n"} {"commit":"0383f8d8bb3463abea138f4b625095c2d7eb8074","subject":"Return proper error code.","message":"Return proper error code.\n\nFound with:\tclang\n","repos":"jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase,jrobhoward\/SCADAbase","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"c3112fccef3d14f18520be0b32abe1c3aa6606a1","subject":"mpg123: lower the verbosity for MPG123_NEED_MORE","message":"mpg123: lower the verbosity for MPG123_NEED_MORE\n","repos":"xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/codec\/mpg123.c\n+++ modules\/codec\/mpg123.c\n@@ -188,7 +188,9 @@\n i_err = mpg123_decode_frame( p_sys->p_handle, NULL, NULL, NULL );\n if( i_err != MPG123_OK )\n {\n- if( i_err != MPG123_NEW_FORMAT )\n+ if( i_err == MPG123_NEED_MORE )\n+ msg_Dbg( p_dec, \"mpg123_decode_frame: %s\", mpg123_plain_strerror( i_err ) );\n+ else if( i_err != MPG123_NEW_FORMAT )\n msg_Err( p_dec, \"mpg123_decode_frame error: %s\", mpg123_plain_strerror( i_err ) );\n block_Release( p_out );\n goto error;\n"} {"commit":"378e50c1182b55168701d822cb2e102c1adab7d3","subject":"Add an include.","message":"Add an include.\n","repos":"ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl,ossy-szeged\/sctp-refimpl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- KERN\/usrsctp\/programs\/daytime_server.c\n+++ KERN\/usrsctp\/programs\/daytime_server.c\n@@ -39,9 +39,9 @@\n #include <stdlib.h>\n #include <string.h>\n #include <sys\/types.h>\n+#include <time.h>\n #ifndef _WIN32\n #include <unistd.h>\n-#include <time.h>\n #include <sys\/socket.h>\n #include <netinet\/in.h>\n #include <arpa\/inet.h>\n"} {"commit":"117282a690dc629de3dd36b1de5b08b8008d9b12","subject":"Remove unused define.","message":"Remove unused define.\n\nChange-Id: Ic6555128206d61f47a46c550cb3dcaf3b4ec6374\n","repos":"stewnorriss\/libvpx,kleopatra999\/webm.libvpx,Suvarna1488\/webm.libvpx,running770\/libvpx,ShiftMediaProject\/libvpx,liqianggao\/libvpx,n4t\/libvpx,thdav\/aom,hsueceumd\/test_hui,liqianggao\/libvpx,WebRTC-Labs\/libvpx,felipebetancur\/libvpx,Suvarna1488\/webm.libvpx,shyamalschandra\/libvpx,matanbs\/vp982,ittiamvpx\/libvpx-1,goodleixiao\/vpx,goodleixiao\/vpx,running770\/libvpx,Distrotech\/libvpx,pcwalton\/libvpx,altogother\/webm.libvpx,matanbs\/vp982,luctrudeau\/aom,sanyaade-teachings\/libvpx,turbulenz\/libvpx,openpeer\/libvpx_new,shyamalschandra\/libvpx,lyx2014\/libvpx_c,Maria1099\/webm.libvpx,ShiftMediaProject\/libvpx,GrokImageCompression\/aom,ittiamvpx\/libvpx,smarter\/aom,altogother\/webm.libvpx,Maria1099\/webm.libvpx,thdav\/aom,GrokImageCompression\/aom,ittiamvpx\/libvpx,Acidburn0zzz\/webm.libvpx,n4t\/libvpx,GrokImageCompression\/aom,stewnorriss\/libvpx,Laknot\/libvpx,turbulenz\/libvpx,turbulenz\/libvpx,abwiz0086\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,stewnorriss\/libvpx,webmproject\/libvpx,ittiamvpx\/libvpx-1,jmvalin\/aom,luctrudeau\/aom,gshORTON\/webm.libvpx,goodleixiao\/vpx,ittiamvpx\/libvpx-1,reimaginemedia\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,jmvalin\/aom,Distrotech\/libvpx,Topopiccione\/libvpx,zofuthan\/libvpx,kim42083\/webm.libvpx,mbebenita\/aom,abwiz0086\/webm.libvpx,VTCSecureLLC\/libvpx,smarter\/aom,ittiamvpx\/libvpx-1,shacklettbp\/aom,Topopiccione\/libvpx,charup\/https---github.com-webmproject-libvpx-,charup\/https---github.com-webmproject-libvpx-,Laknot\/libvpx,cinema6\/libvpx,ittiamvpx\/libvpx,shacklettbp\/aom,VTCSecureLLC\/libvpx,thdav\/aom,jmvalin\/aom,thdav\/aom,Laknot\/libvpx,n4t\/libvpx,matanbs\/webm.libvpx,matanbs\/vp982,sanyaade-teachings\/libvpx,kleopatra999\/webm.libvpx,shareefalis\/libvpx,kim42083\/webm.libvpx,matanbs\/webm.libvpx,running770\/libvpx,kim42083\/webm.libvpx,smarter\/aom,Laknot\/libvpx,iniwf\/webm.libvpx,mbebenita\/aom,iniwf\/webm.libvpx,running770\/libvpx,webmproject\/libvpx,altogother\/webm.libvpx,kleopatra999\/webm.libvpx,shacklettbp\/aom,iniwf\/webm.libvpx,thdav\/aom,ShiftMediaProject\/libvpx,smarter\/aom,lyx2014\/libvpx_c,luctrudeau\/aom,shacklettbp\/aom,stewnorriss\/libvpx,ittiamvpx\/libvpx-1,gshORTON\/webm.libvpx,hsueceumd\/test_hui,running770\/libvpx,smarter\/aom,Suvarna1488\/webm.libvpx,cinema6\/libvpx,jacklicn\/webm.libvpx,VTCSecureLLC\/libvpx,kim42083\/webm.libvpx,Distrotech\/libvpx,matanbs\/webm.libvpx,kalli123\/webm.libvpx,Maria1099\/webm.libvpx,openpeer\/libvpx_new,openpeer\/libvpx_new,jacklicn\/webm.libvpx,jdm\/libvpx,charup\/https---github.com-webmproject-libvpx-,hsueceumd\/test_hui,shareefalis\/libvpx,Distrotech\/libvpx,felipebetancur\/libvpx,mwgoldsmith\/vpx,turbulenz\/libvpx,WebRTC-Labs\/libvpx,sanyaade-teachings\/libvpx,jdm\/libvpx,smarter\/aom,kim42083\/webm.libvpx,mwgoldsmith\/vpx,liqianggao\/libvpx,reimaginemedia\/webm.libvpx,mbebenita\/aom,VTCSecureLLC\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/vpx,Distrotech\/libvpx,shyamalschandra\/libvpx,mwgoldsmith\/libvpx,VTCSecureLLC\/libvpx,mwgoldsmith\/libvpx,abwiz0086\/webm.libvpx,ittiamvpx\/libvpx,kleopatra999\/webm.libvpx,shareefalis\/libvpx,matanbs\/vp982,cinema6\/libvpx,altogother\/webm.libvpx,matanbs\/vp982,Suvarna1488\/webm.libvpx,n4t\/libvpx,hsueceumd\/test_hui,mbebenita\/aom,luctrudeau\/aom,turbulenz\/libvpx,Maria1099\/webm.libvpx,Acidburn0zzz\/webm.libvpx,Laknot\/libvpx,lyx2014\/libvpx_c,jdm\/libvpx,pcwalton\/libvpx,jdm\/libvpx,lyx2014\/libvpx_c,pcwalton\/libvpx,GrokImageCompression\/aom,zofuthan\/libvpx,gshORTON\/webm.libvpx,turbulenz\/libvpx,Topopiccione\/libvpx,reimaginemedia\/webm.libvpx,thdav\/aom,pcwalton\/libvpx,matanbs\/webm.libvpx,gshORTON\/webm.libvpx,sanyaade-teachings\/libvpx,turbulenz\/libvpx,goodleixiao\/vpx,luctrudeau\/aom,GrokImageCompression\/aom,gshORTON\/webm.libvpx,goodleixiao\/vpx,mbebenita\/aom,GrokImageCompression\/aom,liqianggao\/libvpx,mbebenita\/aom,ittiamvpx\/libvpx,mbebenita\/aom,VTCSecureLLC\/libvpx,jacklicn\/webm.libvpx,ittiamvpx\/libvpx-1,cinema6\/libvpx,Acidburn0zzz\/webm.libvpx,felipebetancur\/libvpx,jmvalin\/aom,Acidburn0zzz\/webm.libvpx,reimaginemedia\/webm.libvpx,jmvalin\/aom,zofuthan\/libvpx,kalli123\/webm.libvpx,Suvarna1488\/webm.libvpx,kleopatra999\/webm.libvpx,reimaginemedia\/webm.libvpx,webmproject\/libvpx,kalli123\/webm.libvpx,jdm\/libvpx,charup\/https---github.com-webmproject-libvpx-,zofuthan\/libvpx,Suvarna1488\/webm.libvpx,zofuthan\/libvpx,lyx2014\/libvpx_c,cinema6\/libvpx,liqianggao\/libvpx,felipebetancur\/libvpx,abwiz0086\/webm.libvpx,abwiz0086\/webm.libvpx,shacklettbp\/aom,hsueceumd\/test_hui,ShiftMediaProject\/libvpx,mwgoldsmith\/libvpx,altogother\/webm.libvpx,ittiamvpx\/libvpx,stewnorriss\/libvpx,shyamalschandra\/libvpx,felipebetancur\/libvpx,luctrudeau\/aom,zofuthan\/libvpx,mbebenita\/aom,jmvalin\/aom,openpeer\/libvpx_new,cinema6\/libvpx,liqianggao\/libvpx,shareefalis\/libvpx,abwiz0086\/webm.libvpx,shareefalis\/libvpx,Maria1099\/webm.libvpx,webmproject\/libvpx,turbulenz\/libvpx,lyx2014\/libvpx_c,openpeer\/libvpx_new,hsueceumd\/test_hui,mwgoldsmith\/vpx,webmproject\/libvpx,mwgoldsmith\/libvpx,Acidburn0zzz\/webm.libvpx,iniwf\/webm.libvpx,jacklicn\/webm.libvpx,mwgoldsmith\/libvpx,felipebetancur\/libvpx,WebRTC-Labs\/libvpx,kalli123\/webm.libvpx,mbebenita\/aom,running770\/libvpx,kalli123\/webm.libvpx,mwgoldsmith\/vpx,jacklicn\/webm.libvpx,matanbs\/vp982,n4t\/libvpx,Topopiccione\/libvpx,matanbs\/webm.libvpx,goodleixiao\/vpx,kleopatra999\/webm.libvpx,WebRTC-Labs\/libvpx,openpeer\/libvpx_new,shyamalschandra\/libvpx,cinema6\/libvpx,Topopiccione\/libvpx,ShiftMediaProject\/libvpx,stewnorriss\/libvpx,matanbs\/webm.libvpx,shareefalis\/libvpx,iniwf\/webm.libvpx,mwgoldsmith\/vpx,kim42083\/webm.libvpx,Acidburn0zzz\/webm.libvpx,altogother\/webm.libvpx,kalli123\/webm.libvpx,shacklettbp\/aom,jacklicn\/webm.libvpx,pcwalton\/libvpx,iniwf\/webm.libvpx,shyamalschandra\/libvpx,WebRTC-Labs\/libvpx,webmproject\/libvpx,Distrotech\/libvpx,jdm\/libvpx,matanbs\/vp982,reimaginemedia\/webm.libvpx,gshORTON\/webm.libvpx,pcwalton\/libvpx,turbulenz\/libvpx,sanyaade-teachings\/libvpx,Maria1099\/webm.libvpx,Laknot\/libvpx,Topopiccione\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/common\/vp9_blockd.h\n+++ vp9\/common\/vp9_blockd.h\n@@ -37,7 +37,6 @@\n \/* Segment Feature Masks *\/\n #define SEGMENT_DELTADATA 0\n #define SEGMENT_ABSDATA 1\n-#define MAX_MV_REFS 9\n #define MAX_MV_REF_CANDIDATES 2\n \n typedef enum {\n"} {"commit":"0102f1d5ecda28a23d14bf9cdfdd49792e70b27b","subject":"avoid crash when using --best on cpus with SSE3 (but not SSE4) support","message":"avoid crash when using --best on cpus with SSE3 (but not SSE4) support\n\nChange-Id: Ie100114a01b8b4da7248603c40676792cd06b32a\n","repos":"pcwalton\/libvpx,liqianggao\/libvpx,hsueceumd\/test_hui,mwgoldsmith\/libvpx,goodleixiao\/vpx,kleopatra999\/webm.libvpx,Acidburn0zzz\/webm.libvpx,jmvalin\/aom,matanbs\/webm.libvpx,thdav\/aom,liqianggao\/libvpx,thdav\/aom,Laknot\/libvpx,VTCSecureLLC\/libvpx,charup\/https---github.com-webmproject-libvpx-,webmproject\/libvpx,lyx2014\/libvpx_c,luctrudeau\/aom,ShiftMediaProject\/libvpx,Suvarna1488\/webm.libvpx,kim42083\/webm.libvpx,n4t\/libvpx,felipebetancur\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,WebRTC-Labs\/libvpx,mbebenita\/aom,iniwf\/webm.libvpx,kim42083\/webm.libvpx,kalli123\/webm.libvpx,kim42083\/webm.libvpx,openpeer\/libvpx_new,n4t\/libvpx,shareefalis\/libvpx,GrokImageCompression\/aom,liqianggao\/libvpx,Topopiccione\/libvpx,Distrotech\/libvpx,reimaginemedia\/webm.libvpx,lyx2014\/libvpx_c,Topopiccione\/libvpx,WebRTC-Labs\/libvpx,ittiamvpx\/libvpx-1,running770\/libvpx,kleopatra999\/webm.libvpx,altogother\/webm.libvpx,kalli123\/webm.libvpx,Suvarna1488\/webm.libvpx,Laknot\/libvpx,running770\/libvpx,abwiz0086\/webm.libvpx,shacklettbp\/aom,Laknot\/libvpx,Topopiccione\/libvpx,iniwf\/webm.libvpx,mbebenita\/aom,altogother\/webm.libvpx,mbebenita\/aom,hsueceumd\/test_hui,jacklicn\/webm.libvpx,pcwalton\/libvpx,Acidburn0zzz\/webm.libvpx,shareefalis\/libvpx,jdm\/libvpx,thdav\/aom,jdm\/libvpx,running770\/libvpx,mwgoldsmith\/vpx,luctrudeau\/aom,jmvalin\/aom,ittiamvpx\/libvpx,abwiz0086\/webm.libvpx,matanbs\/webm.libvpx,shacklettbp\/aom,jmvalin\/aom,webmproject\/libvpx,Acidburn0zzz\/webm.libvpx,shareefalis\/libvpx,running770\/libvpx,Maria1099\/webm.libvpx,kalli123\/webm.libvpx,hsueceumd\/test_hui,shacklettbp\/aom,thdav\/aom,Distrotech\/libvpx,GrokImageCompression\/aom,Topopiccione\/libvpx,mwgoldsmith\/libvpx,openpeer\/libvpx_new,goodleixiao\/vpx,mwgoldsmith\/libvpx,Distrotech\/libvpx,n4t\/libvpx,shyamalschandra\/libvpx,jacklicn\/webm.libvpx,mwgoldsmith\/vpx,matanbs\/vp982,mwgoldsmith\/libvpx,mbebenita\/aom,zofuthan\/libvpx,jacklicn\/webm.libvpx,running770\/libvpx,Laknot\/libvpx,shareefalis\/libvpx,matanbs\/vp982,charup\/https---github.com-webmproject-libvpx-,smarter\/aom,GrokImageCompression\/aom,Suvarna1488\/webm.libvpx,Maria1099\/webm.libvpx,stewnorriss\/libvpx,matanbs\/webm.libvpx,lyx2014\/libvpx_c,iniwf\/webm.libvpx,goodleixiao\/vpx,kalli123\/webm.libvpx,iniwf\/webm.libvpx,matanbs\/vp982,Acidburn0zzz\/webm.libvpx,ittiamvpx\/libvpx-1,liqianggao\/libvpx,matanbs\/vp982,luctrudeau\/aom,shareefalis\/libvpx,jdm\/libvpx,jdm\/libvpx,zofuthan\/libvpx,kim42083\/webm.libvpx,lyx2014\/libvpx_c,smarter\/aom,goodleixiao\/vpx,altogother\/webm.libvpx,stewnorriss\/libvpx,luctrudeau\/aom,shacklettbp\/aom,webmproject\/libvpx,abwiz0086\/webm.libvpx,stewnorriss\/libvpx,ittiamvpx\/libvpx,shyamalschandra\/libvpx,Distrotech\/libvpx,mwgoldsmith\/vpx,reimaginemedia\/webm.libvpx,felipebetancur\/libvpx,smarter\/aom,jmvalin\/aom,Laknot\/libvpx,shyamalschandra\/libvpx,ittiamvpx\/libvpx-1,mwgoldsmith\/vpx,abwiz0086\/webm.libvpx,gshORTON\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,felipebetancur\/libvpx,VTCSecureLLC\/libvpx,reimaginemedia\/webm.libvpx,ittiamvpx\/libvpx,matanbs\/webm.libvpx,kim42083\/webm.libvpx,jacklicn\/webm.libvpx,kim42083\/webm.libvpx,webmproject\/libvpx,liqianggao\/libvpx,mbebenita\/aom,smarter\/aom,WebRTC-Labs\/libvpx,abwiz0086\/webm.libvpx,luctrudeau\/aom,stewnorriss\/libvpx,openpeer\/libvpx_new,hsueceumd\/test_hui,Suvarna1488\/webm.libvpx,Acidburn0zzz\/webm.libvpx,matanbs\/webm.libvpx,felipebetancur\/libvpx,charup\/https---github.com-webmproject-libvpx-,kalli123\/webm.libvpx,kleopatra999\/webm.libvpx,altogother\/webm.libvpx,lyx2014\/libvpx_c,pcwalton\/libvpx,lyx2014\/libvpx_c,kleopatra999\/webm.libvpx,mwgoldsmith\/vpx,kalli123\/webm.libvpx,jdm\/libvpx,shyamalschandra\/libvpx,luctrudeau\/aom,matanbs\/vp982,shareefalis\/libvpx,stewnorriss\/libvpx,jmvalin\/aom,GrokImageCompression\/aom,pcwalton\/libvpx,mwgoldsmith\/vpx,Suvarna1488\/webm.libvpx,jacklicn\/webm.libvpx,altogother\/webm.libvpx,shacklettbp\/aom,mbebenita\/aom,goodleixiao\/vpx,liqianggao\/libvpx,goodleixiao\/vpx,ittiamvpx\/libvpx,openpeer\/libvpx_new,VTCSecureLLC\/libvpx,Distrotech\/libvpx,GrokImageCompression\/aom,n4t\/libvpx,webmproject\/libvpx,WebRTC-Labs\/libvpx,charup\/https---github.com-webmproject-libvpx-,matanbs\/vp982,iniwf\/webm.libvpx,gshORTON\/webm.libvpx,shyamalschandra\/libvpx,ittiamvpx\/libvpx-1,pcwalton\/libvpx,WebRTC-Labs\/libvpx,jacklicn\/webm.libvpx,Suvarna1488\/webm.libvpx,felipebetancur\/libvpx,mwgoldsmith\/libvpx,Topopiccione\/libvpx,thdav\/aom,zofuthan\/libvpx,jmvalin\/aom,gshORTON\/webm.libvpx,felipebetancur\/libvpx,iniwf\/webm.libvpx,kleopatra999\/webm.libvpx,stewnorriss\/libvpx,ittiamvpx\/libvpx,VTCSecureLLC\/libvpx,matanbs\/webm.libvpx,ShiftMediaProject\/libvpx,mbebenita\/aom,webmproject\/libvpx,reimaginemedia\/webm.libvpx,hsueceumd\/test_hui,smarter\/aom,mbebenita\/aom,matanbs\/vp982,reimaginemedia\/webm.libvpx,Distrotech\/libvpx,openpeer\/libvpx_new,Maria1099\/webm.libvpx,gshORTON\/webm.libvpx,jdm\/libvpx,ittiamvpx\/libvpx-1,abwiz0086\/webm.libvpx,VTCSecureLLC\/libvpx,VTCSecureLLC\/libvpx,charup\/https---github.com-webmproject-libvpx-,GrokImageCompression\/aom,altogother\/webm.libvpx,zofuthan\/libvpx,smarter\/aom,Maria1099\/webm.libvpx,reimaginemedia\/webm.libvpx,ShiftMediaProject\/libvpx,hsueceumd\/test_hui,openpeer\/libvpx_new,kleopatra999\/webm.libvpx,Laknot\/libvpx,Maria1099\/webm.libvpx,mwgoldsmith\/libvpx,pcwalton\/libvpx,gshORTON\/webm.libvpx,ittiamvpx\/libvpx-1,ittiamvpx\/libvpx,zofuthan\/libvpx,Maria1099\/webm.libvpx,n4t\/libvpx,mbebenita\/aom,Topopiccione\/libvpx,Acidburn0zzz\/webm.libvpx,gshORTON\/webm.libvpx,shacklettbp\/aom,zofuthan\/libvpx,running770\/libvpx,thdav\/aom,shyamalschandra\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_mcomp.c\n+++ vp9\/encoder\/vp9_mcomp.c\n@@ -1726,7 +1726,7 @@\n check_here = r * mv_stride + in_what + col_min;\n c = col_min;\n \n- while ((c + 2) < col_max) {\n+ while ((c + 2) < col_max && fn_ptr->sdx3f != NULL) {\n int i;\n \n fn_ptr->sdx3f(what, what_stride, check_here, in_what_stride, sad_array);\n"} {"commit":"9ee9918dad0f4bd9d6b7ae1f89f936b2b89a064f","subject":"fix clang warning in rdopt","message":"fix clang warning in rdopt\n\neither missed this or it crept back in\n\nChange-Id: I6cc1519d09e558be7250254c25bde2ae720555ea\n","repos":"thdav\/aom,mwgoldsmith\/vpx,shareefalis\/libvpx,Distrotech\/libvpx,charup\/https---github.com-webmproject-libvpx-,pcwalton\/libvpx,hsueceumd\/test_hui,stewnorriss\/libvpx,mwgoldsmith\/vpx,Suvarna1488\/webm.libvpx,cinema6\/libvpx,gshORTON\/webm.libvpx,Topopiccione\/libvpx,ittiamvpx\/libvpx-1,openpeer\/libvpx_new,charup\/https---github.com-webmproject-libvpx-,stewnorriss\/libvpx,luctrudeau\/aom,VTCSecureLLC\/libvpx,mwgoldsmith\/vpx,liqianggao\/libvpx,mwgoldsmith\/libvpx,shacklettbp\/aom,iniwf\/webm.libvpx,sanyaade-teachings\/libvpx,shyamalschandra\/libvpx,felipebetancur\/libvpx,zofuthan\/libvpx,Topopiccione\/libvpx,openpeer\/libvpx_new,Acidburn0zzz\/webm.libvpx,WebRTC-Labs\/libvpx,luctrudeau\/aom,n4t\/libvpx,turbulenz\/libvpx,altogother\/webm.libvpx,running770\/libvpx,GrokImageCompression\/aom,cinema6\/libvpx,kleopatra999\/webm.libvpx,matanbs\/vp982,thdav\/aom,jmvalin\/aom,abwiz0086\/webm.libvpx,luctrudeau\/aom,n4t\/libvpx,webmproject\/libvpx,kim42083\/webm.libvpx,running770\/libvpx,n4t\/libvpx,webmproject\/libvpx,Suvarna1488\/webm.libvpx,running770\/libvpx,WebRTC-Labs\/libvpx,liqianggao\/libvpx,mbebenita\/aom,kim42083\/webm.libvpx,Suvarna1488\/webm.libvpx,goodleixiao\/vpx,goodleixiao\/vpx,smarter\/aom,thdav\/aom,Acidburn0zzz\/webm.libvpx,ittiamvpx\/libvpx-1,Topopiccione\/libvpx,charup\/https---github.com-webmproject-libvpx-,kleopatra999\/webm.libvpx,kalli123\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,liqianggao\/libvpx,ShiftMediaProject\/libvpx,ShiftMediaProject\/libvpx,reimaginemedia\/webm.libvpx,zofuthan\/libvpx,kalli123\/webm.libvpx,kleopatra999\/webm.libvpx,turbulenz\/libvpx,turbulenz\/libvpx,Laknot\/libvpx,kalli123\/webm.libvpx,jacklicn\/webm.libvpx,jacklicn\/webm.libvpx,kleopatra999\/webm.libvpx,matanbs\/vp982,Topopiccione\/libvpx,gshORTON\/webm.libvpx,mwgoldsmith\/libvpx,matanbs\/vp982,mbebenita\/aom,cinema6\/libvpx,felipebetancur\/libvpx,gshORTON\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,lyx2014\/libvpx_c,lyx2014\/libvpx_c,iniwf\/webm.libvpx,openpeer\/libvpx_new,gshORTON\/webm.libvpx,matanbs\/webm.libvpx,smarter\/aom,shacklettbp\/aom,VTCSecureLLC\/libvpx,mwgoldsmith\/libvpx,stewnorriss\/libvpx,zofuthan\/libvpx,kleopatra999\/webm.libvpx,Topopiccione\/libvpx,mwgoldsmith\/vpx,jdm\/libvpx,ShiftMediaProject\/libvpx,pcwalton\/libvpx,felipebetancur\/libvpx,gshORTON\/webm.libvpx,ittiamvpx\/libvpx-1,Suvarna1488\/webm.libvpx,openpeer\/libvpx_new,hsueceumd\/test_hui,zofuthan\/libvpx,ShiftMediaProject\/libvpx,iniwf\/webm.libvpx,goodleixiao\/vpx,lyx2014\/libvpx_c,shareefalis\/libvpx,Laknot\/libvpx,VTCSecureLLC\/libvpx,Laknot\/libvpx,mwgoldsmith\/vpx,mwgoldsmith\/libvpx,luctrudeau\/aom,jacklicn\/webm.libvpx,GrokImageCompression\/aom,shacklettbp\/aom,ittiamvpx\/libvpx-1,shyamalschandra\/libvpx,jdm\/libvpx,lyx2014\/libvpx_c,mwgoldsmith\/libvpx,Maria1099\/webm.libvpx,shareefalis\/libvpx,smarter\/aom,liqianggao\/libvpx,abwiz0086\/webm.libvpx,shareefalis\/libvpx,ittiamvpx\/libvpx,Maria1099\/webm.libvpx,running770\/libvpx,mbebenita\/aom,goodleixiao\/vpx,shyamalschandra\/libvpx,sanyaade-teachings\/libvpx,mwgoldsmith\/libvpx,ittiamvpx\/libvpx,abwiz0086\/webm.libvpx,mbebenita\/aom,VTCSecureLLC\/libvpx,pcwalton\/libvpx,cinema6\/libvpx,ittiamvpx\/libvpx-1,mwgoldsmith\/vpx,jmvalin\/aom,reimaginemedia\/webm.libvpx,jdm\/libvpx,turbulenz\/libvpx,GrokImageCompression\/aom,altogother\/webm.libvpx,mbebenita\/aom,jacklicn\/webm.libvpx,hsueceumd\/test_hui,matanbs\/webm.libvpx,smarter\/aom,altogother\/webm.libvpx,lyx2014\/libvpx_c,Acidburn0zzz\/webm.libvpx,running770\/libvpx,matanbs\/webm.libvpx,shareefalis\/libvpx,turbulenz\/libvpx,thdav\/aom,jmvalin\/aom,felipebetancur\/libvpx,Distrotech\/libvpx,goodleixiao\/vpx,Distrotech\/libvpx,altogother\/webm.libvpx,kim42083\/webm.libvpx,liqianggao\/libvpx,Laknot\/libvpx,ittiamvpx\/libvpx,smarter\/aom,Acidburn0zzz\/webm.libvpx,Maria1099\/webm.libvpx,turbulenz\/libvpx,turbulenz\/libvpx,hsueceumd\/test_hui,Acidburn0zzz\/webm.libvpx,iniwf\/webm.libvpx,shacklettbp\/aom,thdav\/aom,Laknot\/libvpx,mbebenita\/aom,abwiz0086\/webm.libvpx,abwiz0086\/webm.libvpx,sanyaade-teachings\/libvpx,liqianggao\/libvpx,kalli123\/webm.libvpx,WebRTC-Labs\/libvpx,n4t\/libvpx,charup\/https---github.com-webmproject-libvpx-,ittiamvpx\/libvpx,openpeer\/libvpx_new,shyamalschandra\/libvpx,shacklettbp\/aom,cinema6\/libvpx,matanbs\/vp982,stewnorriss\/libvpx,kim42083\/webm.libvpx,webmproject\/libvpx,sanyaade-teachings\/libvpx,ittiamvpx\/libvpx-1,mbebenita\/aom,kalli123\/webm.libvpx,jdm\/libvpx,jmvalin\/aom,n4t\/libvpx,cinema6\/libvpx,reimaginemedia\/webm.libvpx,openpeer\/libvpx_new,jdm\/libvpx,mbebenita\/aom,reimaginemedia\/webm.libvpx,matanbs\/vp982,felipebetancur\/libvpx,webmproject\/libvpx,ittiamvpx\/libvpx,kleopatra999\/webm.libvpx,running770\/libvpx,GrokImageCompression\/aom,webmproject\/libvpx,jdm\/libvpx,reimaginemedia\/webm.libvpx,thdav\/aom,iniwf\/webm.libvpx,pcwalton\/libvpx,matanbs\/vp982,pcwalton\/libvpx,shyamalschandra\/libvpx,jacklicn\/webm.libvpx,goodleixiao\/vpx,VTCSecureLLC\/libvpx,gshORTON\/webm.libvpx,Distrotech\/libvpx,luctrudeau\/aom,GrokImageCompression\/aom,altogother\/webm.libvpx,matanbs\/webm.libvpx,smarter\/aom,ittiamvpx\/libvpx,sanyaade-teachings\/libvpx,Suvarna1488\/webm.libvpx,Laknot\/libvpx,Acidburn0zzz\/webm.libvpx,iniwf\/webm.libvpx,felipebetancur\/libvpx,stewnorriss\/libvpx,abwiz0086\/webm.libvpx,Maria1099\/webm.libvpx,jacklicn\/webm.libvpx,Distrotech\/libvpx,stewnorriss\/libvpx,jmvalin\/aom,webmproject\/libvpx,cinema6\/libvpx,Maria1099\/webm.libvpx,altogother\/webm.libvpx,zofuthan\/libvpx,mbebenita\/aom,matanbs\/webm.libvpx,kalli123\/webm.libvpx,turbulenz\/libvpx,hsueceumd\/test_hui,turbulenz\/libvpx,matanbs\/vp982,Maria1099\/webm.libvpx,jmvalin\/aom,hsueceumd\/test_hui,ShiftMediaProject\/libvpx,WebRTC-Labs\/libvpx,kim42083\/webm.libvpx,WebRTC-Labs\/libvpx,kim42083\/webm.libvpx,luctrudeau\/aom,Suvarna1488\/webm.libvpx,pcwalton\/libvpx,shareefalis\/libvpx,lyx2014\/libvpx_c,shyamalschandra\/libvpx,GrokImageCompression\/aom,Topopiccione\/libvpx,Distrotech\/libvpx,matanbs\/webm.libvpx,reimaginemedia\/webm.libvpx,shacklettbp\/aom,VTCSecureLLC\/libvpx,zofuthan\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_rdopt.c\n+++ vp9\/encoder\/vp9_rdopt.c\n@@ -59,7 +59,7 @@\n \n {RD_DC_PRED, INTRA_FRAME, NONE},\n \n- {NEWMV, LAST_FRAME, NONE},\n+ {RD_NEWMV, LAST_FRAME, NONE},\n {RD_NEWMV, GOLDEN_FRAME, NONE},\n \n {RD_NEARMV, LAST_FRAME, NONE},\n@@ -3434,11 +3434,11 @@\n if (vp9_mode_order[best_mode_index].ref_frame > INTRA_FRAME)\n continue;\n }\n+ mbmi->mode = rd_mode_to_mode(this_mode);\n if (cpi->sf.mode_search_skip_flags & FLAG_SKIP_INTRA_DIRMISMATCH) {\n- if (conditional_skipintra(this_mode, best_intra_mode))\n+ if (conditional_skipintra(mbmi->mode, best_intra_mode))\n continue;\n }\n- mbmi->mode = rd_mode_to_mode(this_mode);\n \n super_block_yrd(cpi, x, &rate_y, &distortion_y, &skippable, NULL,\n bsize, tx_cache, best_rd);\n"} {"commit":"e3ce2b2ab30c5ec7d92e099b507ddc2f2bb0434a","subject":"Minor change to prevent one level of dereference in cost_coeffs().","message":"Minor change to prevent one level of dereference in cost_coeffs().\n\n4x4: 234 -> 236 cycles\n8x8: 878 -> 888 cycles\n16x16: 3664 -> 3550 cycles\n32x32: 18134 -> 17392 cycles\n\nChange-Id: I37a51bfbb0060a3a54f09c6045c14a989811ed78\n","repos":"GrokImageCompression\/aom,stewnorriss\/libvpx,stewnorriss\/libvpx,ittiamvpx\/libvpx-1,shacklettbp\/aom,Acidburn0zzz\/webm.libvpx,jdm\/libvpx,shareefalis\/libvpx,running770\/libvpx,smarter\/aom,hsueceumd\/test_hui,WebRTC-Labs\/libvpx,lyx2014\/libvpx_c,Topopiccione\/libvpx,thdav\/aom,turbulenz\/libvpx,smarter\/aom,shyamalschandra\/libvpx,Maria1099\/webm.libvpx,lyx2014\/libvpx_c,kleopatra999\/webm.libvpx,iniwf\/webm.libvpx,felipebetancur\/libvpx,hsueceumd\/test_hui,matanbs\/vp982,webmproject\/libvpx,kim42083\/webm.libvpx,kalli123\/webm.libvpx,openpeer\/libvpx_new,jmvalin\/aom,matanbs\/vp982,mwgoldsmith\/vpx,luctrudeau\/aom,Acidburn0zzz\/webm.libvpx,sanyaade-teachings\/libvpx,reimaginemedia\/webm.libvpx,n4t\/libvpx,Distrotech\/libvpx,sanyaade-teachings\/libvpx,liqianggao\/libvpx,shyamalschandra\/libvpx,Acidburn0zzz\/webm.libvpx,kim42083\/webm.libvpx,stewnorriss\/libvpx,ittiamvpx\/libvpx-1,hsueceumd\/test_hui,liqianggao\/libvpx,shacklettbp\/aom,iniwf\/webm.libvpx,turbulenz\/libvpx,turbulenz\/libvpx,thdav\/aom,pcwalton\/libvpx,felipebetancur\/libvpx,charup\/https---github.com-webmproject-libvpx-,charup\/https---github.com-webmproject-libvpx-,Distrotech\/libvpx,lyx2014\/libvpx_c,jacklicn\/webm.libvpx,Acidburn0zzz\/webm.libvpx,ittiamvpx\/libvpx,Suvarna1488\/webm.libvpx,mbebenita\/aom,mbebenita\/aom,cinema6\/libvpx,jacklicn\/webm.libvpx,ShiftMediaProject\/libvpx,Laknot\/libvpx,running770\/libvpx,matanbs\/vp982,thdav\/aom,felipebetancur\/libvpx,mwgoldsmith\/vpx,abwiz0086\/webm.libvpx,Maria1099\/webm.libvpx,goodleixiao\/vpx,felipebetancur\/libvpx,felipebetancur\/libvpx,GrokImageCompression\/aom,ShiftMediaProject\/libvpx,kalli123\/webm.libvpx,goodleixiao\/vpx,matanbs\/webm.libvpx,cinema6\/libvpx,matanbs\/webm.libvpx,mbebenita\/aom,charup\/https---github.com-webmproject-libvpx-,ittiamvpx\/libvpx,kim42083\/webm.libvpx,thdav\/aom,reimaginemedia\/webm.libvpx,altogother\/webm.libvpx,openpeer\/libvpx_new,kalli123\/webm.libvpx,jdm\/libvpx,shyamalschandra\/libvpx,altogother\/webm.libvpx,Topopiccione\/libvpx,Distrotech\/libvpx,pcwalton\/libvpx,stewnorriss\/libvpx,liqianggao\/libvpx,n4t\/libvpx,kalli123\/webm.libvpx,zofuthan\/libvpx,openpeer\/libvpx_new,Laknot\/libvpx,openpeer\/libvpx_new,Acidburn0zzz\/webm.libvpx,zofuthan\/libvpx,running770\/libvpx,gshORTON\/webm.libvpx,gshORTON\/webm.libvpx,VTCSecureLLC\/libvpx,n4t\/libvpx,VTCSecureLLC\/libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,kim42083\/webm.libvpx,mbebenita\/aom,matanbs\/webm.libvpx,ittiamvpx\/libvpx-1,jmvalin\/aom,matanbs\/vp982,liqianggao\/libvpx,Distrotech\/libvpx,shacklettbp\/aom,ShiftMediaProject\/libvpx,shareefalis\/libvpx,cinema6\/libvpx,mwgoldsmith\/vpx,shacklettbp\/aom,n4t\/libvpx,shyamalschandra\/libvpx,charup\/https---github.com-webmproject-libvpx-,pcwalton\/libvpx,matanbs\/vp982,VTCSecureLLC\/libvpx,WebRTC-Labs\/libvpx,matanbs\/webm.libvpx,goodleixiao\/vpx,Maria1099\/webm.libvpx,ittiamvpx\/libvpx,kalli123\/webm.libvpx,matanbs\/vp982,reimaginemedia\/webm.libvpx,thdav\/aom,running770\/libvpx,Suvarna1488\/webm.libvpx,turbulenz\/libvpx,hsueceumd\/test_hui,altogother\/webm.libvpx,jdm\/libvpx,mbebenita\/aom,pcwalton\/libvpx,Suvarna1488\/webm.libvpx,n4t\/libvpx,cinema6\/libvpx,Distrotech\/libvpx,ShiftMediaProject\/libvpx,mwgoldsmith\/vpx,smarter\/aom,running770\/libvpx,Laknot\/libvpx,webmproject\/libvpx,kleopatra999\/webm.libvpx,gshORTON\/webm.libvpx,cinema6\/libvpx,Acidburn0zzz\/webm.libvpx,jmvalin\/aom,jdm\/libvpx,zofuthan\/libvpx,zofuthan\/libvpx,Distrotech\/libvpx,turbulenz\/libvpx,sanyaade-teachings\/libvpx,GrokImageCompression\/aom,reimaginemedia\/webm.libvpx,GrokImageCompression\/aom,lyx2014\/libvpx_c,abwiz0086\/webm.libvpx,jdm\/libvpx,webmproject\/libvpx,Topopiccione\/libvpx,shyamalschandra\/libvpx,shareefalis\/libvpx,openpeer\/libvpx_new,VTCSecureLLC\/libvpx,gshORTON\/webm.libvpx,shareefalis\/libvpx,GrokImageCompression\/aom,WebRTC-Labs\/libvpx,Topopiccione\/libvpx,gshORTON\/webm.libvpx,stewnorriss\/libvpx,reimaginemedia\/webm.libvpx,lyx2014\/libvpx_c,jacklicn\/webm.libvpx,ShiftMediaProject\/libvpx,altogother\/webm.libvpx,Laknot\/libvpx,iniwf\/webm.libvpx,kleopatra999\/webm.libvpx,luctrudeau\/aom,kalli123\/webm.libvpx,lyx2014\/libvpx_c,Maria1099\/webm.libvpx,abwiz0086\/webm.libvpx,stewnorriss\/libvpx,jdm\/libvpx,Maria1099\/webm.libvpx,abwiz0086\/webm.libvpx,turbulenz\/libvpx,goodleixiao\/vpx,kleopatra999\/webm.libvpx,shacklettbp\/aom,goodleixiao\/vpx,turbulenz\/libvpx,ittiamvpx\/libvpx-1,matanbs\/webm.libvpx,jmvalin\/aom,kleopatra999\/webm.libvpx,thdav\/aom,cinema6\/libvpx,mbebenita\/aom,altogother\/webm.libvpx,openpeer\/libvpx_new,luctrudeau\/aom,hsueceumd\/test_hui,gshORTON\/webm.libvpx,Suvarna1488\/webm.libvpx,Laknot\/libvpx,ittiamvpx\/libvpx,altogother\/webm.libvpx,hsueceumd\/test_hui,VTCSecureLLC\/libvpx,pcwalton\/libvpx,turbulenz\/libvpx,luctrudeau\/aom,pcwalton\/libvpx,abwiz0086\/webm.libvpx,kim42083\/webm.libvpx,ittiamvpx\/libvpx-1,webmproject\/libvpx,turbulenz\/libvpx,mwgoldsmith\/libvpx,ittiamvpx\/libvpx,WebRTC-Labs\/libvpx,Suvarna1488\/webm.libvpx,zofuthan\/libvpx,jacklicn\/webm.libvpx,jacklicn\/webm.libvpx,matanbs\/webm.libvpx,reimaginemedia\/webm.libvpx,mbebenita\/aom,Topopiccione\/libvpx,smarter\/aom,shyamalschandra\/libvpx,sanyaade-teachings\/libvpx,webmproject\/libvpx,shareefalis\/libvpx,jacklicn\/webm.libvpx,Suvarna1488\/webm.libvpx,felipebetancur\/libvpx,jmvalin\/aom,zofuthan\/libvpx,Maria1099\/webm.libvpx,VTCSecureLLC\/libvpx,mbebenita\/aom,iniwf\/webm.libvpx,mwgoldsmith\/libvpx,charup\/https---github.com-webmproject-libvpx-,matanbs\/vp982,cinema6\/libvpx,jmvalin\/aom,mwgoldsmith\/vpx,sanyaade-teachings\/libvpx,shacklettbp\/aom,smarter\/aom,smarter\/aom,shareefalis\/libvpx,kleopatra999\/webm.libvpx,liqianggao\/libvpx,WebRTC-Labs\/libvpx,goodleixiao\/vpx,abwiz0086\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,ittiamvpx\/libvpx,GrokImageCompression\/aom,kim42083\/webm.libvpx,running770\/libvpx,mwgoldsmith\/libvpx,liqianggao\/libvpx,mwgoldsmith\/libvpx,mwgoldsmith\/libvpx,Laknot\/libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,mwgoldsmith\/vpx,mbebenita\/aom,webmproject\/libvpx,ittiamvpx\/libvpx-1,Topopiccione\/libvpx,mwgoldsmith\/libvpx","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_rdopt.c\n+++ vp9\/encoder\/vp9_rdopt.c\n@@ -386,27 +386,26 @@\n \/\/ single eob token\n cost += token_costs[0][0][pt][DCT_EOB_TOKEN];\n } else {\n- int t, v, prev_rc = 0;\n+ int v, prev_t;\n \n \/\/ dc token\n v = qcoeff_ptr[0];\n- t = vp9_dct_value_tokens_ptr[v].token;\n- cost += token_costs[0][0][pt][t] + vp9_dct_value_cost_ptr[v];\n- token_cache[0] = vp9_pt_energy_class[t];\n+ prev_t = vp9_dct_value_tokens_ptr[v].token;\n+ cost += token_costs[0][0][pt][prev_t] + vp9_dct_value_cost_ptr[v];\n+ token_cache[0] = vp9_pt_energy_class[prev_t];\n \n \/\/ ac tokens\n for (c = 1; c < eob; c++) {\n const int rc = scan[c];\n- int band = get_coef_band(band_translate, c);\n+ const int band = get_coef_band(band_translate, c);\n+ int t;\n \n v = qcoeff_ptr[rc];\n t = vp9_dct_value_tokens_ptr[v].token;\n pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob);\n- \/\/ as an index at some level\n- cost += token_costs[!token_cache[prev_rc]][band][pt][t] +\n- vp9_dct_value_cost_ptr[v];\n+ cost += token_costs[!prev_t][band][pt][t] + vp9_dct_value_cost_ptr[v];\n token_cache[rc] = vp9_pt_energy_class[t];\n- prev_rc = rc;\n+ prev_t = t;\n }\n \n \/\/ eob token\n"} {"commit":"5fcbcf1b22a92a2c13381b91c216200f073e0b74","subject":"Move the high freq coeff check outside store_coding_context","message":"Move the high freq coeff check outside store_coding_context\n\nThis fixes valgrind message issue 870.\n\nChange-Id: Ibbc2481923a2995029ab05de30c9e8a6e9f0f9a8\n","repos":"liqianggao\/libvpx,goodleixiao\/vpx,felipebetancur\/libvpx,zofuthan\/libvpx,Suvarna1488\/webm.libvpx,pcwalton\/libvpx,kim42083\/webm.libvpx,ShiftMediaProject\/libvpx,matanbs\/vp982,mwgoldsmith\/vpx,VTCSecureLLC\/libvpx,Distrotech\/libvpx,smarter\/aom,Suvarna1488\/webm.libvpx,kleopatra999\/webm.libvpx,altogother\/webm.libvpx,ittiamvpx\/libvpx-1,shacklettbp\/aom,shareefalis\/libvpx,webmproject\/libvpx,charup\/https---github.com-webmproject-libvpx-,kleopatra999\/webm.libvpx,lyx2014\/libvpx_c,zofuthan\/libvpx,GrokImageCompression\/aom,stewnorriss\/libvpx,hsueceumd\/test_hui,kalli123\/webm.libvpx,ShiftMediaProject\/libvpx,pcwalton\/libvpx,liqianggao\/libvpx,abwiz0086\/webm.libvpx,jmvalin\/aom,pcwalton\/libvpx,Acidburn0zzz\/webm.libvpx,shyamalschandra\/libvpx,kim42083\/webm.libvpx,Suvarna1488\/webm.libvpx,smarter\/aom,openpeer\/libvpx_new,matanbs\/webm.libvpx,altogother\/webm.libvpx,matanbs\/webm.libvpx,jdm\/libvpx,mwgoldsmith\/vpx,abwiz0086\/webm.libvpx,GrokImageCompression\/aom,openpeer\/libvpx_new,kalli123\/webm.libvpx,felipebetancur\/libvpx,gshORTON\/webm.libvpx,abwiz0086\/webm.libvpx,Distrotech\/libvpx,VTCSecureLLC\/libvpx,lyx2014\/libvpx_c,mbebenita\/aom,thdav\/aom,Acidburn0zzz\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,VTCSecureLLC\/libvpx,mwgoldsmith\/vpx,shyamalschandra\/libvpx,kalli123\/webm.libvpx,openpeer\/libvpx_new,shareefalis\/libvpx,lyx2014\/libvpx_c,luctrudeau\/aom,kleopatra999\/webm.libvpx,kim42083\/webm.libvpx,thdav\/aom,goodleixiao\/vpx,mwgoldsmith\/vpx,liqianggao\/libvpx,GrokImageCompression\/aom,shareefalis\/libvpx,running770\/libvpx,matanbs\/webm.libvpx,shacklettbp\/aom,VTCSecureLLC\/libvpx,reimaginemedia\/webm.libvpx,Topopiccione\/libvpx,charup\/https---github.com-webmproject-libvpx-,zofuthan\/libvpx,matanbs\/vp982,Maria1099\/webm.libvpx,Laknot\/libvpx,Suvarna1488\/webm.libvpx,mwgoldsmith\/libvpx,ShiftMediaProject\/libvpx,ittiamvpx\/libvpx-1,hsueceumd\/test_hui,jdm\/libvpx,jacklicn\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,luctrudeau\/aom,zofuthan\/libvpx,liqianggao\/libvpx,gshORTON\/webm.libvpx,kalli123\/webm.libvpx,Maria1099\/webm.libvpx,jacklicn\/webm.libvpx,shyamalschandra\/libvpx,jmvalin\/aom,iniwf\/webm.libvpx,abwiz0086\/webm.libvpx,iniwf\/webm.libvpx,goodleixiao\/vpx,running770\/libvpx,mwgoldsmith\/libvpx,matanbs\/vp982,Maria1099\/webm.libvpx,shyamalschandra\/libvpx,charup\/https---github.com-webmproject-libvpx-,jdm\/libvpx,iniwf\/webm.libvpx,mwgoldsmith\/libvpx,reimaginemedia\/webm.libvpx,charup\/https---github.com-webmproject-libvpx-,ittiamvpx\/libvpx-1,shacklettbp\/aom,Suvarna1488\/webm.libvpx,stewnorriss\/libvpx,matanbs\/vp982,Distrotech\/libvpx,thdav\/aom,pcwalton\/libvpx,shyamalschandra\/libvpx,zofuthan\/libvpx,altogother\/webm.libvpx,thdav\/aom,reimaginemedia\/webm.libvpx,Laknot\/libvpx,GrokImageCompression\/aom,goodleixiao\/vpx,ShiftMediaProject\/libvpx,VTCSecureLLC\/libvpx,iniwf\/webm.libvpx,luctrudeau\/aom,stewnorriss\/libvpx,jmvalin\/aom,Distrotech\/libvpx,luctrudeau\/aom,ittiamvpx\/libvpx-1,hsueceumd\/test_hui,gshORTON\/webm.libvpx,mbebenita\/aom,kalli123\/webm.libvpx,gshORTON\/webm.libvpx,Acidburn0zzz\/webm.libvpx,Topopiccione\/libvpx,shyamalschandra\/libvpx,felipebetancur\/libvpx,shacklettbp\/aom,mwgoldsmith\/vpx,mwgoldsmith\/libvpx,smarter\/aom,Acidburn0zzz\/webm.libvpx,matanbs\/webm.libvpx,gshORTON\/webm.libvpx,ittiamvpx\/libvpx-1,mbebenita\/aom,smarter\/aom,webmproject\/libvpx,liqianggao\/libvpx,Laknot\/libvpx,gshORTON\/webm.libvpx,mbebenita\/aom,Topopiccione\/libvpx,felipebetancur\/libvpx,Topopiccione\/libvpx,smarter\/aom,openpeer\/libvpx_new,Maria1099\/webm.libvpx,jmvalin\/aom,Distrotech\/libvpx,jacklicn\/webm.libvpx,altogother\/webm.libvpx,matanbs\/vp982,jmvalin\/aom,luctrudeau\/aom,jacklicn\/webm.libvpx,running770\/libvpx,Maria1099\/webm.libvpx,GrokImageCompression\/aom,webmproject\/libvpx,hsueceumd\/test_hui,webmproject\/libvpx,jdm\/libvpx,stewnorriss\/libvpx,felipebetancur\/libvpx,VTCSecureLLC\/libvpx,Suvarna1488\/webm.libvpx,openpeer\/libvpx_new,mbebenita\/aom,Acidburn0zzz\/webm.libvpx,jdm\/libvpx,jdm\/libvpx,reimaginemedia\/webm.libvpx,jmvalin\/aom,Laknot\/libvpx,running770\/libvpx,ittiamvpx\/libvpx-1,shareefalis\/libvpx,shareefalis\/libvpx,mbebenita\/aom,pcwalton\/libvpx,kleopatra999\/webm.libvpx,Topopiccione\/libvpx,Distrotech\/libvpx,thdav\/aom,felipebetancur\/libvpx,smarter\/aom,kim42083\/webm.libvpx,reimaginemedia\/webm.libvpx,reimaginemedia\/webm.libvpx,mbebenita\/aom,webmproject\/libvpx,kalli123\/webm.libvpx,mbebenita\/aom,mbebenita\/aom,Topopiccione\/libvpx,mwgoldsmith\/libvpx,running770\/libvpx,shareefalis\/libvpx,openpeer\/libvpx_new,thdav\/aom,Laknot\/libvpx,Maria1099\/webm.libvpx,luctrudeau\/aom,hsueceumd\/test_hui,liqianggao\/libvpx,altogother\/webm.libvpx,goodleixiao\/vpx,lyx2014\/libvpx_c,kim42083\/webm.libvpx,GrokImageCompression\/aom,lyx2014\/libvpx_c,Laknot\/libvpx,matanbs\/webm.libvpx,mwgoldsmith\/vpx,matanbs\/vp982,matanbs\/vp982,jacklicn\/webm.libvpx,running770\/libvpx,stewnorriss\/libvpx,lyx2014\/libvpx_c,shacklettbp\/aom,goodleixiao\/vpx,jacklicn\/webm.libvpx,abwiz0086\/webm.libvpx,iniwf\/webm.libvpx,ShiftMediaProject\/libvpx,zofuthan\/libvpx,kleopatra999\/webm.libvpx,stewnorriss\/libvpx,kim42083\/webm.libvpx,Acidburn0zzz\/webm.libvpx,altogother\/webm.libvpx,kleopatra999\/webm.libvpx,abwiz0086\/webm.libvpx,pcwalton\/libvpx,shacklettbp\/aom,iniwf\/webm.libvpx,hsueceumd\/test_hui,matanbs\/webm.libvpx,webmproject\/libvpx,mwgoldsmith\/libvpx","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- vp9\/encoder\/vp9_rdopt.c\n+++ vp9\/encoder\/vp9_rdopt.c\n@@ -1952,27 +1952,11 @@\n int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS],\n int skippable) {\n MACROBLOCKD *const xd = &x->e_mbd;\n- int plane, has_high_freq_coeff = 0;\n- BLOCK_SIZE bsize = xd->mi[0].src_mi->mbmi.sb_type;\n-\n- if (bsize >= BLOCK_8X8) {\n- int max_plane = is_inter_block(&xd->mi[0].src_mi->mbmi)\n- ? MAX_MB_PLANE : 1;\n- for (plane = 0; plane < max_plane; ++plane) {\n- x->plane[plane].eobs = ctx->eobs_pbuf[plane][1];\n- has_high_freq_coeff |= vp9_has_high_freq_in_plane(x, bsize, plane);\n- }\n-\n- for (plane = max_plane; plane < MAX_MB_PLANE; ++plane) {\n- x->plane[plane].eobs = ctx->eobs_pbuf[plane][2];\n- has_high_freq_coeff |= vp9_has_high_freq_in_plane(x, bsize, plane);\n- }\n- }\n \n \/\/ Take a snapshot of the coding context so it can be\n \/\/ restored if we decide to encode this way\n ctx->skip = x->skip;\n- ctx->skippable = skippable || !has_high_freq_coeff;\n+ ctx->skippable = skippable;\n ctx->best_mode_index = mode_index;\n ctx->mic = *xd->mi[0].src_mi;\n ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_REFERENCE];\n@@ -3526,6 +3510,24 @@\n \/\/ updating code causes PSNR loss. Need to figure out the confliction.\n x->skip |= best_mode_skippable;\n \n+ if (!best_mode_skippable && !x->select_tx_size) {\n+ int has_high_freq_coeff = 0;\n+ int plane;\n+ int max_plane = is_inter_block(&xd->mi[0].src_mi->mbmi)\n+ ? MAX_MB_PLANE : 1;\n+ for (plane = 0; plane < max_plane; ++plane) {\n+ x->plane[plane].eobs = ctx->eobs_pbuf[plane][1];\n+ has_high_freq_coeff |= vp9_has_high_freq_in_plane(x, bsize, plane);\n+ }\n+\n+ for (plane = max_plane; plane < MAX_MB_PLANE; ++plane) {\n+ x->plane[plane].eobs = ctx->eobs_pbuf[plane][2];\n+ has_high_freq_coeff |= vp9_has_high_freq_in_plane(x, bsize, plane);\n+ }\n+\n+ best_mode_skippable |= !has_high_freq_coeff;\n+ }\n+\n store_coding_context(x, ctx, best_mode_index, best_pred_diff,\n best_tx_diff, best_filter_diff, best_mode_skippable);\n \n"} {"commit":"b68aac1b8a2088f4ba1f4a13eb357d1e5a3b33f8","subject":"Use conn_rec->client_ip instead of conn_rec->remote_ip","message":"Use conn_rec->client_ip instead of conn_rec->remote_ip\n\nApache 2.4 API Changes\n","repos":"tsbatista\/apache2-mod_auth_memcookie","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- mod_auth_memcookie.c\n+++ mod_auth_memcookie.c\n@@ -340,7 +340,7 @@\n else if (conf->nAuth_memCookie_MatchIP_Mode==1&&apr_table_get(r->headers_in,\"X-Forwarded-For\")!=NULL)\n szRemoteIP=apr_pstrdup(r->pool,apr_table_get(r->headers_in,\"X-Forwarded-For\"));\n else\n- szRemoteIP=apr_pstrdup(r->pool,r->connection->remote_ip);\n+ szRemoteIP=apr_pstrdup(r->pool,r->connection->client_ip);\n \n \n unless(conf->nAuth_memCookie_Authoritative)\n"} {"commit":"de86aad77af572d6d56772c9d3761fcc64d6ccf0","subject":"Configurable hostname and port","message":"Configurable hostname and port\n\nIt's no longer using hardcoded localhost:4730.\nIntroduced options are:\n\n * GearmanHostname: hostname of server running gearmand\n * GearmanPort: Gearmand port\n\nOne can set options in httpd.conf at top level or in a VirtualHost\ncontext.\n","repos":"amir\/mod_gearman_status","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- mod_gearman_status.c\n+++ mod_gearman_status.c\n@@ -39,6 +39,13 @@\n #include <unistd.h>\n #include <errno.h>\n #include <string.h>\n+\n+module AP_MODULE_DECLARE_DATA gearman_status_module;\n+\n+typedef struct {\n+ const char *hostname;\n+ int port;\n+} mod_gearman_status_config;\n \n enum task {\n TASK_STATUS = 0,\n@@ -135,9 +142,11 @@\n struct hostent* hostinfo;\n const char *hostname;\n int port, status = 1;\n-\n- hostname = strdup(\"localhost\");\n- port = 4730;\n+ mod_gearman_status_config *cfg =\n+ ap_get_module_config(r->server->module_config, &gearman_status_module);\n+\n+ hostname = strdup(cfg->hostname);\n+ port = cfg->port;\n \n if (strcmp(r->handler, \"gearman_status\")) {\n return DECLINED;\n@@ -170,7 +179,6 @@\n } else {\n ap_rputs(\"Error connecting to Gearman server\", r);\n }\n- ap_rputs(ap_psignature(\"<hr \/>\\n\",r), r);\n ap_rputs(\"<\/body><\/html>\", r);\n }\n shutdown(socket_fd, 2);\n@@ -181,16 +189,68 @@\n static void gearman_status_register_hooks(apr_pool_t *p)\n {\n ap_hook_handler(gearman_status_handler, NULL, NULL, APR_HOOK_MIDDLE);\n+}\n+\n+static const char *set_mod_gearman_status_hostname(\n+ cmd_parms *params, void *mconfig, const char *arg\n+) {\n+ mod_gearman_status_config *cfg =\n+ ap_get_module_config(params->server->module_config, &gearman_status_module);\n+\n+ cfg->hostname = (char *)arg;\n+\n+ return NULL;\n+}\n+\n+static const char *set_mod_gearman_status_port(\n+ cmd_parms *params, void *mconfig, const char *arg\n+) {\n+ mod_gearman_status_config *cfg =\n+ ap_get_module_config(params->server->module_config, &gearman_status_module);\n+\n+ cfg->port = atoi((char *)arg);\n+\n+ return NULL;\n+}\n+\n+static const command_rec gearman_status_commands[] =\n+{\n+ AP_INIT_TAKE1(\n+ \"GearmanHostname\",\n+ set_mod_gearman_status_hostname,\n+ NULL,\n+ RSRC_CONF,\n+ \"GearmanHostname <string> -- Gearman hostname.\"\n+ ),\n+ AP_INIT_TAKE1(\n+ \"GearmanPort\",\n+ set_mod_gearman_status_port,\n+ NULL,\n+ RSRC_CONF,\n+ \"GearmanPort <integer> -- Gearman port.\"\n+ ),\n+ {NULL}\n+};\n+\n+static void *create_mod_gearman_status_config(apr_pool_t *p, server_rec *s)\n+{\n+ mod_gearman_status_config *cfg;\n+\n+ cfg = (mod_gearman_status_config *) apr_pcalloc(p, sizeof(mod_gearman_status_config));\n+\n+ cfg->hostname = strdup(\"localhost\");\n+ cfg->port = 4730;\n+\n+ return (void *) cfg;\n }\n \n \/* Dispatch list for API hooks *\/\n module AP_MODULE_DECLARE_DATA gearman_status_module = {\n STANDARD20_MODULE_STUFF,\n- NULL, \/* create per-dir config structures *\/\n- NULL, \/* merge per-dir config structures *\/\n- NULL, \/* create per-server config structures *\/\n- NULL, \/* merge per-server config structures *\/\n- NULL, \/* table of config file commands *\/\n- gearman_status_register_hooks \/* register hooks *\/\n+ NULL, \/* create per-dir config structures *\/\n+ NULL, \/* merge per-dir config structures *\/\n+ create_mod_gearman_status_config, \/* create per-server config structures *\/\n+ NULL, \/* merge per-server config structures *\/\n+ gearman_status_commands, \/* table of config file commands *\/\n+ gearman_status_register_hooks \/* register hooks *\/\n };\n-\n"} {"commit":"5808db5c84fbaa9927dd2a3b52f84b8b07a43f90","subject":"api fixup","message":"api fixup\n","repos":"joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib,joncampbell123\/doslib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- media\/dosamp\/dosamp.c\n+++ media\/dosamp\/dosamp.c\n@@ -1968,9 +1968,12 @@\n return 0;\n }\n \n-int negotiate_play_format(struct wav_cbr_t * const d,const struct wav_cbr_t * const s) {\n+int set_play_format(struct wav_cbr_t * const d,const struct wav_cbr_t * const s) {\n uint32_t osz,oph;\n int r;\n+\n+ \/* API check: d != s *\/\n+ if (d == s) return -1;\n \n \/* by default, use source format *\/\n *d = *s;\n@@ -2206,7 +2209,7 @@\n wav_rebase_position_event();\n \n \/* choose output vs input *\/\n- if (negotiate_play_format(&play_codec,&file_codec) < 0) {\n+ if (set_play_format(&play_codec,&file_codec) < 0) {\n unprepare_play();\n return -1;\n }\n"} {"commit":"f57bbb336dcc6eabcfe09034be5aac32cd02073c","subject":"restore optimization lost when moving code around","message":"restore optimization lost when moving code around\n","repos":"vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa,vespa-engine\/vespa","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- searchlib\/src\/vespa\/searchlib\/tensor\/euclidean_distance.h\n+++ searchlib\/src\/vespa\/searchlib\/tensor\/euclidean_distance.h\n@@ -43,6 +43,7 @@\n {\n assert(expected_cell_type() == vespalib::eval::get_cell_type<FloatType>());\n }\n+\n double calc(const vespalib::eval::TypedCells& lhs, const vespalib::eval::TypedCells& rhs) const override {\n constexpr vespalib::eval::CellType expected = vespalib::eval::get_cell_type<FloatType>();\n assert(lhs.type == expected && rhs.type == expected);\n@@ -52,6 +53,24 @@\n assert(sz == rhs_vector.size());\n return _computer.squaredEuclideanDistance(&lhs_vector[0], &rhs_vector[0], sz);\n }\n+\n+ double calc_with_limit(const vespalib::eval::TypedCells& lhs,\n+ const vespalib::eval::TypedCells& rhs,\n+ double limit) const override\n+ {\n+ constexpr vespalib::eval::CellType expected = vespalib::eval::get_cell_type<FloatType>();\n+ assert(lhs.type == expected && rhs.type == expected);\n+ auto lhs_vector = lhs.typify<FloatType>();\n+ auto rhs_vector = rhs.typify<FloatType>();\n+ double sum = 0.0;\n+ size_t sz = lhs_vector.size();\n+ assert(sz == rhs_vector.size());\n+ for (size_t i = 0; i < sz && sum <= limit; ++i) {\n+ double diff = lhs_vector[i] - rhs_vector[i];\n+ sum += diff*diff;\n+ }\n+ return sum;\n+ }\n private:\n const vespalib::hwaccelrated::IAccelrated & _computer;\n };\n"} {"commit":"3b0f31b51de3f55492b55a9ca14fde4f987f51cb","subject":"","message":"\n\ngit-svn-id: http:\/\/svn.seqan.de\/seqan\/trunk@4773 e6417c60-b987-48fd-844e-b20f0fcc1017\n","repos":"gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan,gkno\/seqan","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- seqan\/projects\/library\/seqan\/sequence\/sequence_multiple.h\n+++ seqan\/projects\/library\/seqan\/sequence\/sequence_multiple.h\n@@ -2045,6 +2045,10 @@\n \r\n inline operator obj_iterator() {\r\n return _cur;\r\n+ }\n+\n+ inline operator void * () {\n+ \treturn _cur; \n }\r\n \/\/____________________________________________________________________________\r\n \r\n"} {"commit":"e83d95e7a92f4a441c4df8e512d1cddf299e0fec","subject":"removed the crosshair","message":"removed the crosshair\n","repos":"tac4ttack\/rtv1,tac4ttack\/rtv1","returncode":0,"stderr":"unknown","license":"unlicense","lang":"C","diff":""} {"commit":"dd199efe7a9e6f8d0da998d262464ed40d043041","subject":"fix value data address in VODE solver report","message":"fix value data address in VODE solver report\n\nmodules\n reset value pointer address to valid\/expected value\n","repos":"becm\/mpt-solver,becm\/mpt-solver,becm\/mpt-solver","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- modules\/vode\/vode_report.c\n+++ modules\/vode\/vode_report.c\n@@ -40,6 +40,7 @@\n \tpr.name = \"jacobian\";\n \tpr.desc = MPT_tr(\"type of jacobian\");\n \tpr.val.fmt = fmt_ss;\n+\tpr.val.ptr = val;\n \t\n \tval[0] = \"Full\";\n \tval[1] = \"user\";\n"} {"commit":"e59ae69f9251d9dac46e92d7bfc8637cb5100ed3","subject":"shard-file: Also report errors from load_file","message":"shard-file: Also report errors from load_file\n","repos":"endlessm\/eos-shard,endlessm\/eos-shard,endlessm\/eos-shard","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/eos-shard-shard-file.c\n+++ src\/eos-shard-shard-file.c\n@@ -326,7 +326,14 @@\n {\n uint8_t *buf = g_malloc (blob->size);\n \n- _eos_shard_shard_file_read_data (self, buf, blob->size, blob->offs);\n+ size_t size_read = _eos_shard_shard_file_read_data (self, buf, blob->size, blob->offs);\n+ int read_error = errno;\n+ if (size_read == -1) {\n+ g_set_error (error, EOS_SHARD_ERROR, EOS_SHARD_ERROR_BLOB_STREAM_READ,\n+ \"Read failed: %s\", strerror (read_error));\n+ return NULL;\n+ }\n+\n GBytes *bytes = g_bytes_new_take (buf, blob->size);\n \n g_autoptr(GChecksum) checksum = g_checksum_new (G_CHECKSUM_SHA256);\n"} {"commit":"59389529f51d019ea17373899affd1fa14fec4b0","subject":"cosmetics","message":"cosmetics\n\n","repos":"zwensoft\/coturn,lulufei\/coturn,volkanh\/coturn,lulufei\/coturn,lyx2014\/ICE,lulufei\/coturn,volkanh\/coturn,wolf9s\/coturn,TribeMedia\/coturn,zwensoft\/coturn,shaohung001\/coturn,volkanh\/coturn,TribeMedia\/coturn,lyx2014\/ICE,wolf9s\/coturn,zwensoft\/coturn,lyx2014\/ICE,wolf9s\/coturn,RaeW\/coturn,RaeW\/coturn,shaohung001\/coturn,zwensoft\/coturn,TribeMedia\/coturn,RaeW\/coturn,shaohung001\/coturn","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/apps\/relay\/turn_admin_server.c\n+++ src\/apps\/relay\/turn_admin_server.c\n@@ -1808,7 +1808,7 @@\n \t\t\tstr_buffer_append(sb,\"<br>\\r\\n\");\n \t\t\tstr_buffer_append(sb,home_link);\n \t\t\tstr_buffer_append(sb,\"<br>\\r\\n\");\n-\t\t\tstr_buffer_append(sb,\"Configuration Parameters:<br><table style=\\\"width:100%\\\">\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"<b>Configuration Parameters:<\/b><br><br><table style=\\\"width:100%\\\">\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<tr><th>Parameter<\/th><th>Value<\/th><\/tr>\\r\\n\");\n \n \t\t\t{\n@@ -2266,7 +2266,7 @@\n \t\t\tstr_buffer_append(sb,\"<\/fieldset>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<\/form>\\r\\n\");\n \n-\t\t\tstr_buffer_append(sb,\"TURN Sessions:<br><table>\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"<br><b>TURN Sessions:<\/b><br><br><table>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<tr><th>N<\/th><th>Session ID<\/th><th>User<\/th><th>Realm<\/th><th>Origin<\/th><th>Age, secs<\/th><th>Expires, secs<\/th><th>Client protocol<\/th><th>Relay protocol<\/th><th>Client addr<\/th><th>Server addr<\/th><th>Relay addr (IPv4)<\/th><th>Relay addr (IPv6)<\/th><th>Fingerprints<\/th><th>Mobile<\/th><th>TLS method<\/th><th>TLS cipher<\/th><th>BPS (allocated)<\/th><th>Packets<\/th><th>Rate<\/th><th>Peers<\/th><\/tr>\\r\\n\");\n \n \t\t\tsize_t total_sz = https_print_sessions(sb,client_protocol,user_pattern,max_sessions,cs);\n@@ -2420,14 +2420,19 @@\n \t\t\tstr_buffer_append(sb,\"\\\" value=\\\"\");\n \t\t\tstr_buffer_append(sb,\"\");\n \t\t\tstr_buffer_append(sb,\"\\\"\");\n-\t\t\tstr_buffer_append(sb,\"><br>\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"><br><br>\\r\\n\");\n+\n+\t\t\tif(turn_params.shatype == SHATYPE_SHA256)\n+\t\t\t\tstr_buffer_append(sb,\"SHA type: SHA256<br>\\r\\n\");\n+\t\t\telse\n+\t\t\t\tstr_buffer_append(sb,\"SHA type: SHA1<br>\\r\\n\");\n \n \t\t\tstr_buffer_append(sb,\"<br><input type=\\\"submit\\\" value=\\\"Add user\\\">\");\n \n \t\t\tstr_buffer_append(sb,\"<\/fieldset>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<\/form>\\r\\n\");\n \n-\t\t\tstr_buffer_append(sb,\"Users:<br>\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"<br><b>Users:<\/b><br><br>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<table>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<tr><th>N<\/th><th>Name<\/th>\");\n \t\t\tif(!current_socket->as_eff_realm[0]) {\n@@ -2580,7 +2585,7 @@\n \t\t\tstr_buffer_append(sb,\"<\/fieldset>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<\/form>\\r\\n\");\n \n-\t\t\tstr_buffer_append(sb,\"Secrets:<br>\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"<br><b>Shared secrets:<\/b><br><br>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<table>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<tr><th>N<\/th><th>Value<\/th>\");\n \t\t\tif(!current_socket->as_eff_realm[0]) {\n@@ -2730,7 +2735,7 @@\n \t\t\t\tstr_buffer_append(sb,\"<\/form>\\r\\n\");\n \t\t\t}\n \n-\t\t\tstr_buffer_append(sb,\"Origins:<br>\\r\\n\");\n+\t\t\tstr_buffer_append(sb,\"<br><b>Origins:<\/b><br><br>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<table>\\r\\n\");\n \t\t\tstr_buffer_append(sb,\"<tr><th>N<\/th><th>Value<\/th>\");\n \t\t\tif(!current_socket->as_eff_realm[0]) {\n@@ -3019,9 +3024,9 @@\n \t\t\t\t\t\t\t\t\t\tSTRCPY(u,add_user);\n \t\t\t\t\t\t\t\t\t\tSTRCPY(r,add_realm);\n \t\t\t\t\t\t\t\t\t\tSTRCPY(p,pwd);\n-\t\t\t\t\t\t\t\t\t\tstun_produce_integrity_key_str(u, r, p, key, SHATYPE_DEFAULT);\n+\t\t\t\t\t\t\t\t\t\tstun_produce_integrity_key_str(u, r, p, key, turn_params.shatype);\n \t\t\t\t\t\t\t\t\t\tsize_t i = 0;\n-\t\t\t\t\t\t\t\t\t\tsize_t sz = get_hmackey_size(SHATYPE_DEFAULT);\n+\t\t\t\t\t\t\t\t\t\tsize_t sz = get_hmackey_size(turn_params.shatype);\n \t\t\t\t\t\t\t\t\t\tint maxsz = (int) (sz * 2) + 1;\n \t\t\t\t\t\t\t\t\t\tchar *s = skey;\n \t\t\t\t\t\t\t\t\t\tfor (i = 0; (i < sz) && (maxsz > 2); i++) {\n"} {"commit":"3e6c3f0429c9f9f08a9a0ba374809821217cfb4f","subject":"Change test query points-parameter for autotuning from pointer to reference","message":"Change test query points-parameter for autotuning from pointer to reference\n","repos":"teemupitkanen\/mrpt,teemupitkanen\/mrpt,teemupitkanen\/mrpt","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cpp\/Mrpt.h\n+++ cpp\/Mrpt.h\n@@ -101,7 +101,7 @@\n }\r\n }\r\n \r\n- void grow(Eigen::Map<Eigen::MatrixXf> *Q_, int k_, int trees_max = -1, int depth_max = -1,\r\n+ void grow(const Eigen::Map<const Eigen::MatrixXf> &Q, int k_, int trees_max = -1, int depth_max = -1,\r\n int depth_min_ = -1, int votes_max_ = -1, float density_ = -1.0, int seed_mrpt = 0) {\r\n \r\n if(k_ <= 0 || k_ > n_samples) {\r\n@@ -128,7 +128,7 @@\n throw std::out_of_range(\"The density must be on the interval (0,1].\");\r\n }\r\n \r\n- if(Q_->rows() != dim) {\r\n+ if(Q.rows() != dim) {\r\n throw std::invalid_argument(\"Dimensions of the data and the validation set do not match.\");\r\n }\r\n \r\n@@ -154,13 +154,12 @@\n density = density_;\r\n }\r\n \r\n- Q = Q_;\r\n k = k_;\r\n- n_test = Q->cols();\r\n+ int n_test = Q.cols();\r\n \r\n grow(trees_max, depth_max, density, seed_mrpt);\r\n Eigen::MatrixXi exact(k, n_test);\r\n- compute_exact(exact);\r\n+ compute_exact(Q, exact);\r\n \r\n recalls = std::vector<Eigen::MatrixXd>(depth_max - depth_min + 1);\r\n cs_sizes = std::vector<Eigen::MatrixXd>(depth_max - depth_min + 1);\r\n@@ -174,7 +173,7 @@\n std::vector<Eigen::MatrixXd> recall_tmp(depth_max - depth_min + 1);\r\n std::vector<Eigen::MatrixXd> cs_size_tmp(depth_max - depth_min + 1);\r\n \r\n- count_elected(Q->col(i), Eigen::Map<Eigen::VectorXi>(exact.data() + i * k, k),\r\n+ count_elected(Q.col(i), Eigen::Map<Eigen::VectorXi>(exact.data() + i * k, k),\r\n votes_max, recall_tmp, cs_size_tmp);\r\n \r\n for(int d = depth_min; d <= depth_max; ++d) {\r\n@@ -188,18 +187,18 @@\n cs_sizes[d - depth_min] \/= n_test;\r\n }\r\n \r\n- fit_times();\r\n+ fit_times(Q);\r\n index_type = autotuned_unpruned;\r\n params.k = k_;\r\n }\r\n \r\n- void grow(double target_recall, Eigen::Map<Eigen::MatrixXf> *Q_, int k_, int trees_max = -1,\r\n+ void grow(double target_recall, const Eigen::Map<const Eigen::MatrixXf> &Q, int k_, int trees_max = -1,\r\n int depth_min_ = -1, int depth_max = -1, int votes_max_ = -1,\r\n float density = -1.0, int seed_mrpt = 0) {\r\n if(target_recall < 0.0 - epsilon || target_recall > 1.0 + epsilon) {\r\n throw std::out_of_range(\"Target recall must be on the interval [0,1].\");\r\n }\r\n- grow(Q_, k_, trees_max, depth_min_, depth_max, votes_max_, density, seed_mrpt);\r\n+ grow(Q, k_, trees_max, depth_min_, depth_max, votes_max_, density, seed_mrpt);\r\n prune(target_recall);\r\n }\r\n \r\n@@ -741,12 +740,13 @@\n }\r\n \r\n \r\n- void compute_exact(Eigen::MatrixXi &out_exact) const {\r\n+ void compute_exact(const Eigen::Map<const Eigen::MatrixXf> &Q, Eigen::MatrixXi &out_exact) const {\r\n+ int n_test = Q.cols();\r\n for(int i = 0; i < n_test; ++i) {\r\n Eigen::VectorXi idx(n_samples);\r\n std::iota(idx.data(), idx.data() + n_samples, 0);\r\n \r\n- exact_knn(Q->col(i), k, idx, n_samples, out_exact.data() + i * k);\r\n+ exact_knn(Q.col(i), k, idx, n_samples, out_exact.data() + i * k);\r\n std::sort(out_exact.data() + i * k, out_exact.data() + i * k + k);\r\n }\r\n }\r\n@@ -796,8 +796,8 @@\n }\r\n \r\n \r\n- void fit_times() {\r\n- int n_test = Q->cols();\r\n+ void fit_times(const Eigen::Map<const Eigen::MatrixXf> &Q) {\r\n+ int n_test = Q.cols();\r\n std::vector<double> projection_times, projection_x;\r\n std::vector<double> exact_times;\r\n std::vector<int> exact_x;\r\n@@ -840,9 +840,9 @@\n double start_proj = omp_get_wtime();\r\n Eigen::VectorXf projected_query(n_random_vectors);\r\n if(density < 1) {\r\n- projected_query.noalias() = sparse_mat * Q->col(0);\r\n+ projected_query.noalias() = sparse_mat * Q.col(0);\r\n } else {\r\n- projected_query.noalias() = dense_mat * Q->col(0);\r\n+ projected_query.noalias() = dense_mat * Q.col(0);\r\n }\r\n double end_proj = omp_get_wtime();\r\n projection_times.push_back(end_proj - start_proj);\r\n@@ -902,9 +902,9 @@\n \r\n Eigen::VectorXf projected_query(n_trees * depth);\r\n if(density < 1) {\r\n- projected_query.noalias() = sparse_random_matrix * Q->col(ri);\r\n+ projected_query.noalias() = sparse_random_matrix * Q.col(ri);\r\n } else {\r\n- projected_query.noalias() = dense_random_matrix * Q->col(ri);\r\n+ projected_query.noalias() = dense_random_matrix * Q.col(ri);\r\n }\r\n \r\n double start_voting = omp_get_wtime();\r\n@@ -935,7 +935,7 @@\n \r\n double start_exact = omp_get_wtime();\r\n std::vector<int> res(k);\r\n- exact_knn(Q->col(ri), k, elected, s_size, &res[0]);\r\n+ exact_knn(Q.col(ri), k, elected, s_size, &res[0]);\r\n double end_exact = omp_get_wtime();\r\n mean_exact_time += (end_exact - start_exact);\r\n \r\n@@ -1173,7 +1173,6 @@\n int depth_min = 0;\r\n int votes_max = 0;\r\n int k = 0;\r\n- int n_test = 0; \/\/ test set size (for autotuned index)\r\n enum itype {normal, autotuned, autotuned_unpruned};\r\n itype index_type = normal;\r\n const double epsilon = 0.0001; \/\/ error bound for comparisons of recall levels\r\n"} {"commit":"34c336b2056a82fec86fecbc4a7c0e48b59a5e9a","subject":"pwrite: Temporarily solve mutex race at process termination.","message":"pwrite: Temporarily solve mutex race at process termination.\n\nSee #7 for more info.\n","repos":"bitwiseworks\/libcx,bitwiseworks\/libcx","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"C","diff":""} {"commit":"23bf4faa0dc3dcc1eb2b016ead1e4b42ffb242f3","subject":"check: Set error log level before checking","message":"check: Set error log level before checking\n\nNot to spoil screen with false warnings.\n\nSigned-off-by: Pavel Emelyanov <c9a32589e048e044184536f7ac71ef92fe82df3e@parallels.com>\n","repos":"svloyso\/criu,wtf42\/criu,fbocharov\/criu,fbocharov\/criu,LK4D4\/criu,ldu4\/criu,marcosnils\/criu,kawamuray\/criu,AuthenticEshkinKot\/criu,biddyweb\/criu,efiop\/criu,ldu4\/criu,gonkulator\/criu,biddyweb\/criu,sdgdsffdsfff\/criu,tych0\/criu,biddyweb\/criu,gonkulator\/criu,LK4D4\/criu,kawamuray\/criu,kawamuray\/criu,gonkulator\/criu,efiop\/criu,gonkulator\/criu,tych0\/criu,svloyso\/criu,svloyso\/criu,tych0\/criu,efiop\/criu,KKoukiou\/criu-remote,marcosnils\/criu,AuthenticEshkinKot\/criu,gonkulator\/criu,marcosnils\/criu,LK4D4\/criu,kawamuray\/criu,fbocharov\/criu,gablg1\/criu,efiop\/criu,kawamuray\/criu,AuthenticEshkinKot\/criu,LK4D4\/criu,svloyso\/criu,gablg1\/criu,rentzsch\/criu,wtf42\/criu,tych0\/criu,eabatalov\/criu,eabatalov\/criu,KKoukiou\/criu-remote,gablg1\/criu,marcosnils\/criu,KKoukiou\/criu-remote,sdgdsffdsfff\/criu,fbocharov\/criu,KKoukiou\/criu-remote,wtf42\/criu,marcosnils\/criu,KKoukiou\/criu-remote,rentzsch\/criu,AuthenticEshkinKot\/criu,ldu4\/criu,ldu4\/criu,sdgdsffdsfff\/criu,biddyweb\/criu,LK4D4\/criu,wtf42\/criu,LK4D4\/criu,fbocharov\/criu,eabatalov\/criu,eabatalov\/criu,marcosnils\/criu,efiop\/criu,eabatalov\/criu,rentzsch\/criu,gablg1\/criu,tych0\/criu,efiop\/criu,tych0\/criu,sdgdsffdsfff\/criu,ldu4\/criu,KKoukiou\/criu-remote,eabatalov\/criu,biddyweb\/criu,ldu4\/criu,wtf42\/criu,gablg1\/criu,gablg1\/criu,biddyweb\/criu,wtf42\/criu,rentzsch\/criu,AuthenticEshkinKot\/criu,sdgdsffdsfff\/criu,sdgdsffdsfff\/criu,rentzsch\/criu,kawamuray\/criu,fbocharov\/criu,svloyso\/criu,rentzsch\/criu,gonkulator\/criu,AuthenticEshkinKot\/criu,svloyso\/criu","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- cr-check.c\n+++ cr-check.c\n@@ -408,6 +408,8 @@\n int cr_check(void)\n {\n \tint ret = 0;\n+\n+\tlog_set_loglevel(LOG_ERROR);\n \n \tif (mntns_collect_root(getpid())) {\n \t\tpr_err(\"Can't collect root mount point\\n\");\n"} {"commit":"5ff5a90519b7f1e53a0232afdacd69ce7cdaa4af","subject":"revert last commit. bullshit.","message":"revert last commit. bullshit.\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/istream-chunked.c\n+++ src\/istream-chunked.c\n@@ -44,7 +44,7 @@\n assert(chunked->buffer != NULL);\n \n rest = istream_buffer_consume(&chunked->output, chunked->buffer);\n- if (rest == 0 && chunked->buffer != NULL && chunked->input == NULL)\n+ if (rest == 0 && chunked->input == NULL)\n chunked_eof_detected(chunked);\n }\n \n"} {"commit":"c89b5c5f760e1e49a210acb638bb6b8b9ecbddae","subject":"free substitution struct","message":"free substitution struct\n\n","repos":"CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy,CM4all\/beng-proxy","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/istream-replace.c\n+++ src\/istream-replace.c\n@@ -113,6 +113,8 @@\n assert(replace->append_substitution_p == &s->next);\n replace->append_substitution_p = &replace->first_substitution;\n }\n+\n+ p_free(replace->output.pool, s);\n \n assert(replace->buffer == NULL ||\n replace->first_substitution == NULL ||\n"} {"commit":"70906f465863fe49e3deeacc94f37c1dab48bf07","subject":"[jnc_app] fix: command line should use something else for output dir (-O is used for optimizations)","message":"[jnc_app] fix: command line should use something else for output dir (-O is used for optimizations)\n","repos":"vovkos\/jancy,vovkos\/jancy,vovkos\/jancy,vovkos\/jancy,vovkos\/jancy","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/jnc_app\/CmdLine.h\n+++ src\/jnc_app\/CmdLine.h\n@@ -115,18 +115,18 @@\n \t\t)\n \tAXL_SL_CMD_LINE_SWITCH_2(\n \t\tCmdLineSwitch_OutputDir,\n-\t\t\"O\", \"output-dir\", \"<dir>\",\n-\t\t\"Specify output directory\"\n+\t\t\"X\", \"xml-dir\", \"<dir>\",\n+\t\t\"Specify the output XML directory (for documentation)\"\n \t\t)\n \tAXL_SL_CMD_LINE_SWITCH_3(\n \t\tCmdLineSwitch_SourceDir,\n \t\t\"S\", \"src-dir\", \"source-dir\", \"<dir>\",\n-\t\t\"Add the directory with source files\"\n+\t\t\"Add a directory with source files\"\n \t\t)\n \tAXL_SL_CMD_LINE_SWITCH_2(\n \t\tCmdLineSwitch_ImportDir,\n \t\t\"I\", \"import-dir\", \"<dir>\",\n-\t\t\"Add import directory\"\n+\t\t\"Add an import directory\"\n \t\t)\n \tAXL_SL_CMD_LINE_SWITCH(\n \t\tCmdLineSwitch_IgnoreImport,\n"} {"commit":"4b8cc9fa79783668a31aee56338fe13b50af4b11","subject":"LRU engine","message":"LRU engine\n","repos":"gnomex\/C-Syllabus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- FAA\/buffer-lru\/src\/lru.c\n+++ FAA\/buffer-lru\/src\/lru.c\n@@ -85,13 +85,58 @@\n printf(\"# Hits:%d\\n# Miss: %d \\n -> %d shots\\n\", stats->hits, stats->miss, stats->shots);\n }\n \n-void\n-engine_yard(const char *phrase, list_t *list, stats_t *stats) {\n+lru_engine(\n+ list_node_t *content,\n+ list_t *buffer,\n+ list_t *list,\n+ stats_t *stats\n+ )\n+{\n+ list_node_t *element = list_find(buffer, content->val);\n+ \/\/ int exists = include(buffer, content);\n+\n+ ++stats->shots;\n+\n+ if ( element != NULL ) {\n+\n+ ++stats->hits;\n+\n+ list_remove(buffer, element);\n+ list_rpush(buffer, content);\n+\n+ } else {\n+ ++stats->miss;\n+\n+ list_node_t *another = list_find(list, content->val);\n+\n+ if (another != NULL) {\n+\n+ if ( buffer->len >= buffer->max_size ){\n+ list_lpop(buffer);\n+ }\n+\n+ list_rpush(buffer, content);\n+\n+ } else {\n+ printf(\"Adding new symbol to ascii list [%s]\\n\", content->val );\n+ list_rpush(list, list_node_new( content->val ));\n+ }\n+ }\n+}\n+\n+void\n+engine_yard(const char *phrase, list_t *buffer, list_t *list, stats_t *stats) {\n int i = 0;\n const int size = strlen(phrase);\n for (; i < size; ++i) {\n unsigned int ch = phrase[i];\n- add_to_buffer(list, list_node_new( ch ), stats);\n+ \/\/ add_to_buffer(list, list_node_new( ch ), stats);\n+ lru_engine(\n+ list_node_new( ch ),\n+ buffer,\n+ list,\n+ stats\n+ );\n }\n }\n \n@@ -134,9 +179,9 @@\n engine_yard(\n reader( \"Hey Dude, type a phrase: \" ),\n buffer,\n+ list,\n buffer_stats\n );\n-\n show_stats(buffer_stats);\n \n wait_a_time();\n@@ -144,7 +189,8 @@\n }\n case 2:\n {\n- printf(\"buffer [now] len: %d, buffer size: %d \\n\", buffer->len, buffer->max_size);\n+ printf(\"Allowed ASCII List - len: %d, list size: %d \\n\", list->len, list->max_size);\n+ printf(\"Buffer [now] len: %d, buffer size: %d \\n\", buffer->len, buffer->max_size);\n show_list(buffer);\n wait_a_time();\n break;\n"} {"commit":"2d9f8c1b5021882654ce573a70328371615790f1","subject":"STYLE: Marked virtual methods as such. It was hard to sub-class without knowing which methods are virtual","message":"STYLE: Marked virtual methods as such. It was hard to sub-class without knowing which methods are virtual\n","repos":"ashray\/VTK-EVM,demarle\/VTK,sankhesh\/VTK,sankhesh\/VTK,berendkleinhaneveld\/VTK,ashray\/VTK-EVM,msmolens\/VTK,daviddoria\/PointGraphsPhase1,cjh1\/VTK,ashray\/VTK-EVM,Wuteyan\/VTK,msmolens\/VTK,sumedhasingla\/VTK,biddisco\/VTK,msmolens\/VTK,johnkit\/vtk-dev,hendradarwin\/VTK,spthaolt\/VTK,jmerkow\/VTK,candy7393\/VTK,biddisco\/VTK,berendkleinhaneveld\/VTK,msmolens\/VTK,Wuteyan\/VTK,sankhesh\/VTK,jeffbaumes\/jeffbaumes-vtk,demarle\/VTK,msmolens\/VTK,naucoin\/VTKSlicerWidgets,candy7393\/VTK,jmerkow\/VTK,keithroe\/vtkoptix,gram526\/VTK,gram526\/VTK,hendradarwin\/VTK,sumedhasingla\/VTK,johnkit\/vtk-dev,daviddoria\/PointGraphsPhase1,naucoin\/VTKSlicerWidgets,collects\/VTK,jeffbaumes\/jeffbaumes-vtk,jmerkow\/VTK,candy7393\/VTK,berendkleinhaneveld\/VTK,sumedhasingla\/VTK,sumedhasingla\/VTK,hendradarwin\/VTK,johnkit\/vtk-dev,sankhesh\/VTK,cjh1\/VTK,SimVascular\/VTK,aashish24\/VTK-old,gram526\/VTK,jeffbaumes\/jeffbaumes-vtk,sgh\/vtk,demarle\/VTK,demarle\/VTK,sgh\/vtk,naucoin\/VTKSlicerWidgets,Wuteyan\/VTK,arnaudgelas\/VTK,mspark93\/VTK,jmerkow\/VTK,jmerkow\/VTK,johnkit\/vtk-dev,mspark93\/VTK,msmolens\/VTK,ashray\/VTK-EVM,hendradarwin\/VTK,hendradarwin\/VTK,spthaolt\/VTK,arnaudgelas\/VTK,demarle\/VTK,aashish24\/VTK-old,sankhesh\/VTK,berendkleinhaneveld\/VTK,johnkit\/vtk-dev,sgh\/vtk,spthaolt\/VTK,mspark93\/VTK,sankhesh\/VTK,naucoin\/VTKSlicerWidgets,biddisco\/VTK,cjh1\/VTK,keithroe\/vtkoptix,jmerkow\/VTK,demarle\/VTK,jmerkow\/VTK,collects\/VTK,spthaolt\/VTK,spthaolt\/VTK,sankhesh\/VTK,SimVascular\/VTK,collects\/VTK,berendkleinhaneveld\/VTK,johnkit\/vtk-dev,cjh1\/VTK,cjh1\/VTK,Wuteyan\/VTK,sgh\/vtk,SimVascular\/VTK,jeffbaumes\/jeffbaumes-vtk,arnaudgelas\/VTK,aashish24\/VTK-old,demarle\/VTK,collects\/VTK,aashish24\/VTK-old,daviddoria\/PointGraphsPhase1,SimVascular\/VTK,sumedhasingla\/VTK,naucoin\/VTKSlicerWidgets,spthaolt\/VTK,collects\/VTK,sumedhasingla\/VTK,arnaudgelas\/VTK,SimVascular\/VTK,keithroe\/vtkoptix,gram526\/VTK,gram526\/VTK,naucoin\/VTKSlicerWidgets,ashray\/VTK-EVM,candy7393\/VTK,aashish24\/VTK-old,arnaudgelas\/VTK,biddisco\/VTK,mspark93\/VTK,SimVascular\/VTK,demarle\/VTK,sgh\/vtk,daviddoria\/PointGraphsPhase1,gram526\/VTK,ashray\/VTK-EVM,biddisco\/VTK,gram526\/VTK,collects\/VTK,mspark93\/VTK,sgh\/vtk,SimVascular\/VTK,keithroe\/vtkoptix,aashish24\/VTK-old,daviddoria\/PointGraphsPhase1,spthaolt\/VTK,keithroe\/vtkoptix,candy7393\/VTK,candy7393\/VTK,ashray\/VTK-EVM,jeffbaumes\/jeffbaumes-vtk,mspark93\/VTK,candy7393\/VTK,berendkleinhaneveld\/VTK,hendradarwin\/VTK,jmerkow\/VTK,msmolens\/VTK,Wuteyan\/VTK,biddisco\/VTK,jeffbaumes\/jeffbaumes-vtk,arnaudgelas\/VTK,gram526\/VTK,candy7393\/VTK,keithroe\/vtkoptix,sankhesh\/VTK,ashray\/VTK-EVM,keithroe\/vtkoptix,biddisco\/VTK,daviddoria\/PointGraphsPhase1,hendradarwin\/VTK,Wuteyan\/VTK,cjh1\/VTK,mspark93\/VTK,sumedhasingla\/VTK,sumedhasingla\/VTK,Wuteyan\/VTK,berendkleinhaneveld\/VTK,keithroe\/vtkoptix,mspark93\/VTK,johnkit\/vtk-dev,msmolens\/VTK,SimVascular\/VTK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Filtering\/vtkImageData.h\n+++ Filtering\/vtkImageData.h\n@@ -43,65 +43,71 @@\n \/\/ Description:\n \/\/ Copy the geometric and topological structure of an input image data\n \/\/ object.\n- void CopyStructure(vtkDataSet *ds);\n+ virtual void CopyStructure(vtkDataSet *ds);\n \n \/\/ Description:\n \/\/ Return what type of dataset this is.\n- int GetDataObjectType() {return VTK_IMAGE_DATA;};\n+ virtual int GetDataObjectType() {return VTK_IMAGE_DATA;};\n \n \/\/ Description:\n \/\/ Standard vtkDataSet API methods. See vtkDataSet for more information.\n- vtkIdType GetNumberOfCells();\n- vtkIdType GetNumberOfPoints();\n- double *GetPoint(vtkIdType ptId);\n- void GetPoint(vtkIdType id, double x[3]);\n- vtkCell *GetCell(vtkIdType cellId);\n- void GetCell(vtkIdType cellId, vtkGenericCell *cell);\n- void GetCellBounds(vtkIdType cellId, double bounds[6]);\n- vtkIdType FindPoint(double x, double y, double z) { return this->vtkDataSet::FindPoint(x, y, z);};\n- vtkIdType FindPoint(double x[3]);\n- vtkIdType FindCell(double x[3], vtkCell *cell, vtkIdType cellId, double tol2, \n- int& subId, double pcoords[3], double *weights);\n- vtkIdType FindCell(double x[3], vtkCell *cell, vtkGenericCell *gencell,\n- vtkIdType cellId, double tol2, int& subId, \n- double pcoords[3], double *weights);\n- vtkCell *FindAndGetCell(double x[3], vtkCell *cell, vtkIdType cellId, \n- double tol2, int& subId, double pcoords[3],\n- double *weights);\n- int GetCellType(vtkIdType cellId);\n- void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds)\n+ virtual vtkIdType GetNumberOfCells();\n+ virtual vtkIdType GetNumberOfPoints();\n+ virtual double *GetPoint(vtkIdType ptId);\n+ virtual void GetPoint(vtkIdType id, double x[3]);\n+ virtual vtkCell *GetCell(vtkIdType cellId);\n+ virtual void GetCell(vtkIdType cellId, vtkGenericCell *cell);\n+ virtual void GetCellBounds(vtkIdType cellId, double bounds[6]);\n+ virtual vtkIdType FindPoint(double x, double y, double z) \n+ { \n+ return this->vtkDataSet::FindPoint(x, y, z);\n+ };\n+ virtual vtkIdType FindPoint(double x[3]);\n+ virtual vtkIdType FindCell(\n+ double x[3], vtkCell *cell, vtkIdType cellId, double tol2, \n+ int& subId, double pcoords[3], double *weights);\n+ virtual vtkIdType FindCell(\n+ double x[3], vtkCell *cell, vtkGenericCell *gencell,\n+ vtkIdType cellId, double tol2, int& subId, \n+ double pcoords[3], double *weights);\n+ virtual vtkCell *FindAndGetCell(double x[3], vtkCell *cell, vtkIdType cellId, \n+ double tol2, int& subId, double pcoords[3],\n+ double *weights);\n+ virtual int GetCellType(vtkIdType cellId);\n+ virtual void GetCellPoints(vtkIdType cellId, vtkIdList *ptIds)\n {vtkStructuredData::GetCellPoints(cellId,ptIds,this->DataDescription,\n this->GetDimensions());}\n- void GetPointCells(vtkIdType ptId, vtkIdList *cellIds)\n+ virtual void GetPointCells(vtkIdType ptId, vtkIdList *cellIds)\n {vtkStructuredData::GetPointCells(ptId,cellIds,this->GetDimensions());}\n- void ComputeBounds();\n- int GetMaxCellSize() {return 8;}; \/\/voxel is the largest\n+ virtual void ComputeBounds();\n+ virtual int GetMaxCellSize() {return 8;}; \/\/voxel is the largest\n \n \/\/ Description:\n \/\/ Restore data object to initial state,\n- void Initialize();\n+ virtual void Initialize();\n \n \/\/ Description:\n \/\/ Set dimensions of structured points dataset.\n- void SetDimensions(int i, int j, int k);\n+ virtual void SetDimensions(int i, int j, int k);\n \n \/\/ Description:\n \/\/ Set dimensions of structured points dataset.\n- void SetDimensions(int dims[3]);\n+ virtual void SetDimensions(int dims[3]);\n \n \/\/ Description:\n \/\/ Get dimensions of this structured points dataset.\n \/\/ It is the number of points on each axis.\n \/\/ Dimensions are computed from Extents during this call.\n- int *GetDimensions();\n- void GetDimensions(int dims[3]);\n+ virtual int *GetDimensions();\n+ virtual void GetDimensions(int dims[3]);\n \n \/\/ Description:\n \/\/ Convenience function computes the structured coordinates for a point x[3].\n \/\/ The voxel is specified by the array ijk[3], and the parametric coordinates\n \/\/ in the cell are specified with pcoords[3]. The function returns a 0 if the\n \/\/ point x is outside of the volume, and a 1 if inside the volume.\n- int ComputeStructuredCoordinates(double x[3], int ijk[3], double pcoords[3]);\n+ virtual int ComputeStructuredCoordinates(\n+ GUI\/Demos\/Demo1.pvsdouble x[3], int ijk[3], double pcoords[3]);\n \n \/\/ Description:\n \/\/ Given structured coordinates (i,j,k) for a voxel cell, compute the eight \n@@ -111,33 +117,35 @@\n \/\/ volume where forward difference is used). The scalars s are the scalars\n \/\/ from which the gradient is to be computed. This method will treat \n \/\/ only 3D structured point datasets (i.e., volumes).\n- void GetVoxelGradient(int i,int j,int k, vtkDataArray *s, vtkDataArray *g);\n+ virtual void GetVoxelGradient(\n+ int i,int j,int k, vtkDataArray *s, vtkDataArray *g);\n \n \/\/ Description:\n \/\/ Given structured coordinates (i,j,k) for a point in a structured point \n \/\/ dataset, compute the gradient vector from the scalar data at that point. \n \/\/ The scalars s are the scalars from which the gradient is to be computed.\n \/\/ This method will treat structured point datasets of any dimension.\n- void GetPointGradient(int i, int j, int k, vtkDataArray *s, double g[3]);\n+ virtual void GetPointGradient(\n+ int i, int j, int k, vtkDataArray *s, double g[3]);\n \n \/\/ Description:\n \/\/ Return the dimensionality of the data.\n- int GetDataDimension();\n+ virtual int GetDataDimension();\n \n \/\/ Description:\n \/\/ Given a location in structured coordinates (i-j-k), return the point id.\n- vtkIdType ComputePointId(int ijk[3]) {\n+ virtual vtkIdType ComputePointId(int ijk[3]) {\n return vtkStructuredData::ComputePointId(this->GetDimensions(),ijk);};\n \n \/\/ Description:\n \/\/ Given a location in structured coordinates (i-j-k), return the cell id.\n- vtkIdType ComputeCellId(int ijk[3]) {\n+ virtual vtkIdType ComputeCellId(int ijk[3]) {\n return vtkStructuredData::ComputeCellId(this->GetDimensions(),ijk);};\n \n \/\/ Description:\n \/\/ Set \/ Get the extent on just one axis\n- void SetAxisUpdateExtent(int axis, int min, int max);\n- void GetAxisUpdateExtent(int axis, int &min, int &max);\n+ virtual void SetAxisUpdateExtent(int axis, int min, int max);\n+ virtual void GetAxisUpdateExtent(int axis, int &min, int &max);\n \n \/\/ Description:\n \/\/ Override to copy information from pipeline information to data\n@@ -150,8 +158,8 @@\n \/\/ of the first point and the index of the last point. The extent should\n \/\/ be set before the \"Scalars\" are set or allocated. The Extent is\n \/\/ stored in the order (X, Y, Z).\n- void SetExtent(int extent[6]);\n- void SetExtent(int x1, int x2, int y1, int y2, int z1, int z2);\n+ virtual void SetExtent(int extent[6]);\n+ virtual void SetExtent(int x1, int x2, int y1, int y2, int z1, int z2);\n vtkGetVector6Macro(Extent, int);\n \n \/\/ Description:\n@@ -164,20 +172,20 @@\n \/\/ Description:\n \/\/ These returns the minimum and maximum values the ScalarType can hold\n \/\/ without overflowing.\n- double GetScalarTypeMin();\n- double GetScalarTypeMax();\n+ virtual double GetScalarTypeMin();\n+ virtual double GetScalarTypeMax();\n \n \/\/ Description:\n \/\/ Set the size of the scalar type in bytes.\n- int GetScalarSize();\n+ virtual int GetScalarSize();\n \n \/\/ Description:\n \/\/ Different ways to get the increments for moving around the data.\n \/\/ GetIncrements() calls ComputeIncrements() to ensure the increments are\n \/\/ up to date.\n- vtkIdType *GetIncrements();\n- void GetIncrements(vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ);\n- void GetIncrements(vtkIdType inc[3]);\n+ virtual vtkIdType *GetIncrements();\n+ virtual void GetIncrements(vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ);\n+ virtual void GetIncrements(vtkIdType inc[3]);\n \n \/\/ Description:\n \/\/ Different ways to get the increments for moving around the data.\n@@ -189,33 +197,36 @@\n \/\/ over Z, Y, X, C, incrementing the pointer by 1 after each\n \/\/ component. When the end of the component is reached, the pointer\n \/\/ is set to the beginning of the next pixel, thus incX is properly set to 0.\n- void GetContinuousIncrements(int extent[6], vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ);\n+ virtual void GetContinuousIncrements(\n+ int extent[6], vtkIdType &incX, vtkIdType &incY, vtkIdType &incZ);\n \n \/\/ Description:\n \/\/ Access the native pointer for the scalar data\n- void *GetScalarPointerForExtent(int extent[6]);\n- void *GetScalarPointer(int coordinates[3]);\n- void *GetScalarPointer(int x, int y, int z);\n- void *GetScalarPointer();\n+ virtual void *GetScalarPointerForExtent(int extent[6]);\n+ virtual void *GetScalarPointer(int coordinates[3]);\n+ virtual void *GetScalarPointer(int x, int y, int z);\n+ virtual void *GetScalarPointer();\n \n \/\/ Description:\n \/\/ For access to data from tcl\n- float GetScalarComponentAsFloat(int x, int y, int z, int component);\n- void SetScalarComponentFromFloat(int x, int y, int z, int component, float v);\n- double GetScalarComponentAsDouble(int x, int y, int z, int component);\n- void SetScalarComponentFromDouble(int x, int y, int z, int component, double v);\n+ virtual float GetScalarComponentAsFloat(int x, int y, int z, int component);\n+ virtual void SetScalarComponentFromFloat(\n+ int x, int y, int z, int component, float v);\n+ virtual double GetScalarComponentAsDouble(int x, int y, int z, int component);\n+ virtual void SetScalarComponentFromDouble(\n+ int x, int y, int z, int component, double v);\n \n \/\/ Description:\n \/\/ Allocate the vtkScalars object associated with this object.\n- void AllocateScalars();\n+ virtual void AllocateScalars();\n \n \/\/ Description:\n \/\/ This method is passed a input and output region, and executes the filter\n \/\/ algorithm to fill the output from the input.\n \/\/ It just executes a switch statement to call the correct function for\n \/\/ the regions data types.\n- void CopyAndCastFrom(vtkImageData *inData, int extent[6]);\n- void CopyAndCastFrom(vtkImageData *inData, int x0, int x1,\n+ virtual void CopyAndCastFrom(vtkImageData *inData, int extent[6]);\n+ virtual void CopyAndCastFrom(vtkImageData *inData, int x0, int x1,\n int y0, int y1, int z0, int z1)\n {int e[6]; e[0]=x0; e[1]=x1; e[2]=y0; e[3]=y1; e[4]=z0; e[5]=z1; \n this->CopyAndCastFrom(inData, e);}\n@@ -233,7 +244,7 @@\n \/\/ memory required to represent the data (e.g., extra space in\n \/\/ arrays, etc. are not included in the return value). THIS METHOD\n \/\/ IS THREAD SAFE.\n- unsigned long GetActualMemorySize();\n+ virtual unsigned long GetActualMemorySize();\n \n \/\/ Description:\n \/\/ Set the spacing (width,height,length) of the cubical cells that\n@@ -270,7 +281,8 @@\n {this->SetScalarType(VTK_CHAR);};\n void SetScalarType(int);\n int GetScalarType();\n- const char* GetScalarTypeAsString() { return vtkImageScalarTypeNameMacro ( this->GetScalarType() ); };\n+ const char* GetScalarTypeAsString() \n+ { return vtkImageScalarTypeNameMacro ( this->GetScalarType() ); };\n \n \/\/ Description:\n \/\/ Set\/Get the number of scalar components for points. As with the\n@@ -279,7 +291,7 @@\n int GetNumberOfScalarComponents();\n \n \/\/ Must only be called with vtkImageData (or subclass) as input\n- void CopyTypeSpecificInformation( vtkDataObject *image );\n+ virtual void CopyTypeSpecificInformation( vtkDataObject *image );\n \n \/\/ Description:\n \/\/ Override these to handle origin, spacing, scalar type, and scalar\n@@ -296,8 +308,8 @@\n \n \/\/ Description:\n \/\/ Shallow and Deep copy.\n- void ShallowCopy(vtkDataObject *src); \n- void DeepCopy(vtkDataObject *src);\n+ virtual void ShallowCopy(vtkDataObject *src); \n+ virtual void DeepCopy(vtkDataObject *src);\n \n \/\/--------------------------------------------------------------------------\n \/\/ Methods that apply to any array (not just scalars).\n@@ -325,7 +337,7 @@\n \n \/\/ Description:\n \/\/ The extent type is a 3D extent\n- int GetExtentType() { return VTK_3D_EXTENT; };\n+ virtual int GetExtentType() { return VTK_3D_EXTENT; };\n \n protected:\n vtkImageData();\n"} {"commit":"f66f6dc62bb3caf266dde499894334193c8445b9","subject":"*** empty log message ***","message":"*** empty log message ***\n","repos":"guptashail\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,guptashail\/SYMPHONY,tkralphs\/SYMPHONY,tkralphs\/SYMPHONY","returncode":0,"stderr":"","license":"epl-1.0","lang":"C","diff":"--- Applications\/SPP\/src\/Master\/spp_master.c\n+++ Applications\/SPP\/src\/Master\/spp_master.c\n@@ -377,7 +377,6 @@\n int *colnames = spp->cmatrix->colnames;\n int i;\n \n- printf(\"########################################################\\n\");\n printf(\"\\nBest Solution Found:\\n\");\n for (i = 0; i < length; i++)\n printf(\"%i \\n\", colnames[xind[i]]);\n"} {"commit":"0e121517e60aa8fee314e02f8f600c3eab52f9d3","subject":"layers: Set helpers as static inline","message":"layers: Set helpers as static inline\n\nstatic inline allows the code to be unused\n","repos":"Radamanthe\/VulkanSamples,KhronosGroup\/Vulkan-LoaderAndValidationLayers,KhronosGroup\/Vulkan-LoaderAndValidationLayers,critsec\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,critsec\/Vulkan-LoaderAndValidationLayers,sashinde\/VulkanTools,critsec\/Vulkan-LoaderAndValidationLayers,critsec\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,elongbug\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,sashinde\/VulkanTools,sashinde\/VulkanTools,elongbug\/Vulkan-LoaderAndValidationLayers,sashinde\/VulkanTools,KhronosGroup\/Vulkan-LoaderAndValidationLayers,elongbug\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples,elongbug\/Vulkan-LoaderAndValidationLayers,KhronosGroup\/Vulkan-LoaderAndValidationLayers,Radamanthe\/VulkanSamples","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- layers\/layer_logging.h\n+++ layers\/layer_logging.h\n@@ -47,7 +47,7 @@\n std::unordered_map<void *, debug_report_data *> &data_map);\n \n \/\/ Utility function to handle reporting\n-static void debug_report_log_msg(\n+static inline void debug_report_log_msg(\n debug_report_data *debug_data,\n VkFlags msgFlags,\n VkObjectType objectType,\n@@ -162,7 +162,7 @@\n return VK_SUCCESS;\n }\n \n-static void layer_destroy_msg_callback(\n+static inline void layer_destroy_msg_callback(\n debug_report_data *debug_data,\n VkDbgMsgCallback msg_callback)\n {\n@@ -190,7 +190,7 @@\n }\n }\n \n-static void* debug_report_get_instance_proc_addr(\n+static inline void* debug_report_get_instance_proc_addr(\n debug_report_data *debug_data,\n const char *funcName)\n {\n@@ -213,7 +213,7 @@\n * Takes format and variable arg list so that output string\n * is only computed if a message needs to be logged\n *\/\n-static void log_msg(\n+static inline void log_msg(\n debug_report_data *debug_data,\n VkFlags msgFlags,\n VkObjectType objectType,\n"} {"commit":"a5275d202850163ac989c4e3d6276fca3e4350e2","subject":"Only set TcpSocket send and receive timeout if not default -1","message":"Only set TcpSocket send and receive timeout if not default -1\n\nChange-Id: I6dc7d48ef282352414f93e7b9bd2fe4914817bdc\n","repos":"bmwcarit\/capu,bmwcarit\/capu","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Capu\/include\/capu\/os\/Windows\/TcpSocket.h\n+++ Capu\/include\/capu\/os\/Windows\/TcpSocket.h\n@@ -163,7 +163,7 @@\n \n struct sockaddr_in serverAddress;\n status = getSocketAddr(dest_addr, port, serverAddress);\n- if (status != CAPU_OK) \n+ if (status != CAPU_OK)\n {\n return status;\n }\n@@ -216,7 +216,7 @@\n \/\/ When getting a timeout on send on Windows Socket,s the MSDN documentation http:\/\/msdn.microsoft.com\/en-us\/library\/ms740476\n \/\/ says that the \"socket state is indeterminate, and should not be used\" anymore. Therefore we report an error here.\n \/\/ This timeout on send is especially seen in case the TCP receive window gets zero. In this case some Windows implementations\n- \/\/ return this timeout error and send a TCP package with the RST flag to the remote peer. This causes a connection reset on the \n+ \/\/ return this timeout error and send a TCP package with the RST flag to the remote peer. This causes a connection reset on the\n \/\/ remote site, so the connection cannot be used anymore.\n close();\n return CAPU_ERROR;\n@@ -308,13 +308,16 @@\n return CAPU_SOCKET_ESOCKET;\n }\n \n- if (setsockopt(mSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&mTimeout, sizeof(mTimeout)) <= CAPU_SOCKET_ERROR)\n- {\n- return CAPU_ERROR;\n- }\n- if (setsockopt(mSocket, SOL_SOCKET, SO_SNDTIMEO, (char*)&mTimeout, sizeof(mTimeout)) <= CAPU_SOCKET_ERROR)\n- {\n- return CAPU_ERROR;\n+ if (mTimeout >= 0)\n+ {\n+ if (setsockopt(mSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&mTimeout, sizeof(mTimeout)) <= CAPU_SOCKET_ERROR)\n+ {\n+ return CAPU_ERROR;\n+ }\n+ if (setsockopt(mSocket, SOL_SOCKET, SO_SNDTIMEO, (char*)&mTimeout, sizeof(mTimeout)) <= CAPU_SOCKET_ERROR)\n+ {\n+ return CAPU_ERROR;\n+ }\n }\n \n return CAPU_OK;\n"} {"commit":"533964105e09a331910a98c703d9cc187da60aef","subject":"Group public and private methods together. Make some methods private that were previously public Remove Overload for `Reload` - not required Rename `isKeyDown` to `IsKeyDown`","message":"Group public and private methods together.\nMake some methods private that were previously public\nRemove Overload for `Reload` - not required\nRename `isKeyDown` to `IsKeyDown`\n","repos":"wangzheng888520\/CefSharp,illfang\/CefSharp,battewr\/CefSharp,AJDev77\/CefSharp,jamespearce2006\/CefSharp,battewr\/CefSharp,Haraguroicha\/CefSharp,NumbersInternational\/CefSharp,wangzheng888520\/CefSharp,jamespearce2006\/CefSharp,Livit\/CefSharp,wangzheng888520\/CefSharp,battewr\/CefSharp,haozhouxu\/CefSharp,rlmcneary2\/CefSharp,zhangjingpu\/CefSharp,rlmcneary2\/CefSharp,gregmartinhtc\/CefSharp,windygu\/CefSharp,ITGlobal\/CefSharp,twxstar\/CefSharp,ITGlobal\/CefSharp,Livit\/CefSharp,joshvera\/CefSharp,AJDev77\/CefSharp,gregmartinhtc\/CefSharp,dga711\/CefSharp,twxstar\/CefSharp,yoder\/CefSharp,haozhouxu\/CefSharp,ITGlobal\/CefSharp,NumbersInternational\/CefSharp,twxstar\/CefSharp,zhangjingpu\/CefSharp,yoder\/CefSharp,Haraguroicha\/CefSharp,jamespearce2006\/CefSharp,ruisebastiao\/CefSharp,ruisebastiao\/CefSharp,dga711\/CefSharp,joshvera\/CefSharp,haozhouxu\/CefSharp,haozhouxu\/CefSharp,Haraguroicha\/CefSharp,VioletLife\/CefSharp,ruisebastiao\/CefSharp,rlmcneary2\/CefSharp,joshvera\/CefSharp,joshvera\/CefSharp,NumbersInternational\/CefSharp,ITGlobal\/CefSharp,zhangjingpu\/CefSharp,yoder\/CefSharp,illfang\/CefSharp,rlmcneary2\/CefSharp,windygu\/CefSharp,jamespearce2006\/CefSharp,gregmartinhtc\/CefSharp,dga711\/CefSharp,battewr\/CefSharp,windygu\/CefSharp,zhangjingpu\/CefSharp,Livit\/CefSharp,AJDev77\/CefSharp,Livit\/CefSharp,NumbersInternational\/CefSharp,ruisebastiao\/CefSharp,Haraguroicha\/CefSharp,windygu\/CefSharp,illfang\/CefSharp,wangzheng888520\/CefSharp,Haraguroicha\/CefSharp,jamespearce2006\/CefSharp,illfang\/CefSharp,dga711\/CefSharp,twxstar\/CefSharp,gregmartinhtc\/CefSharp,VioletLife\/CefSharp,AJDev77\/CefSharp,VioletLife\/CefSharp,VioletLife\/CefSharp,yoder\/CefSharp","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- CefSharp.Core\/ManagedCefBrowserAdapter.h\n+++ CefSharp.Core\/ManagedCefBrowserAdapter.h\n@@ -30,6 +30,18 @@\n BrowserProcessServiceHost^ _browserProcessServiceHost;\n IWebBrowserInternal^ _webBrowserInternal;\n JavascriptObjectRepository^ _javaScriptObjectRepository;\n+\n+ \/\/ Private keyboard functions:\n+ private:\n+ bool IsKeyDown(WPARAM wparam)\n+ {\n+ return (GetKeyState(wparam) & 0x8000) != 0;\n+ }\n+\n+ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam);\n+ void OnAfterBrowserCreated(int browserId);\n+ double GetZoomLevelOnUI();\n+ CefMouseEvent GetCefMouseEvent(MouseEvent^ mouseEvent);\n \n protected:\n virtual void DoDispose(bool isDisposing) override\n@@ -72,60 +84,29 @@\n \n void CreateOffscreenBrowser(IntPtr windowHandle, BrowserSettings^ browserSettings, String^ address);\n void CreateBrowser(BrowserSettings^ browserSettings, IntPtr sourceHandle, String^ address);\n-\n void Close(bool forceClose);\n void CloseAllPopups(bool forceClose);\n-\n- void OnAfterBrowserCreated(int browserId);\n-\n void LoadUrl(String^ address);\n void LoadHtml(String^ html, String^ url);\n-\n void WasResized();\n void WasHidden(bool hidden);\n-\n void Invalidate(PaintElementType type);\n-\n- \/\/ Private keyboard functions:\n- private:\n- bool isKeyDown(WPARAM wparam)\n- {\n- return (GetKeyState(wparam) & 0x8000) != 0;\n- }\n-\n- int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam);\n-\n- public:\n void SendFocusEvent(bool isFocused);\n void SetFocus(bool isFocused);\n bool SendKeyEvent(int message, int wParam, int lParam);\n-\n void OnMouseMove(int x, int y, bool mouseLeave, CefEventFlags modifiers);\n void OnMouseButton(int x, int y, int mouseButtonType, bool mouseUp, int clickCount, CefEventFlags modifiers);\n void OnMouseWheel(int x, int y, int deltaX, int deltaY);\n-\n void Stop();\n-\n void GoBack();\n void GoForward();\n-\n void Print();\n-\n void Find(int identifier, String^ searchText, bool forward, bool matchCase, bool findNext);\n void StopFinding(bool clearSelection);\n-\n- void Reload()\n- {\n- Reload(false);\n- }\n-\n void Reload(bool ignoreCache);\n-\n void ViewSource();\n-\n void GetSource(IStringVisitor^ visitor);\n void GetText(IStringVisitor^ visitor);\n-\n void Cut();\n void Copy();\n void Paste();\n@@ -133,32 +114,18 @@\n void SelectAll();\n void Undo();\n void Redo();\n-\n void ExecuteScriptAsync(String^ script);\n Task<JavascriptResponse^>^ EvaluateScriptAsync(String^ script, Nullable<TimeSpan> timeout);\n-\n- private:\n- double GetZoomLevelOnUI();\n-\n- public:\n Task<double>^ GetZoomLevelAsync();\n-\n void SetZoomLevel(double zoomLevel);\n-\n void ShowDevTools();\n void CloseDevTools();\n-\n void Resize(int width, int height);\n void NotifyMoveOrResizeStarted();\n void NotifyScreenInfoChanged();\n-\n void RegisterJsObject(String^ name, Object^ object, bool lowerCaseJavascriptNames);\n-\n void ReplaceMisspelling(String^ word);\n void AddWordToDictionary(String^ word);\n-\n- CefMouseEvent GetCefMouseEvent(MouseEvent^ mouseEvent);\n-\n void OnDragTargetDragEnter(CefDragDataWrapper^ dragData, MouseEvent^ mouseEvent, DragOperationsMask allowedOperations);\n void OnDragTargetDragOver(MouseEvent^ mouseEvent, DragOperationsMask allowedOperations);\n void OnDragTargetDragLeave();\n"} {"commit":"3752914d48a1d919cbc724df169687fdf486be6b","subject":"Document NSArray_StringArray","message":"Document NSArray_StringArray\n","repos":"TOMalley104\/objective-git,pietbrauer\/objective-git,javiertoledo\/objective-git,dleehr\/objective-git,libgit2\/objective-git,libgit2\/objective-git,javiertoledo\/objective-git,dleehr\/objective-git,c9s\/objective-git,Acidburn0zzz\/objective-git,phatblat\/objective-git,0x4a616e\/objective-git,TOMalley104\/objective-git,pietbrauer\/objective-git,blackpixel\/objective-git,misterfifths\/objective-git,c9s\/objective-git,c9s\/objective-git,alehed\/objective-git,javiertoledo\/objective-git,alehed\/objective-git,pietbrauer\/objective-git,phatblat\/objective-git,nerdishbynature\/objective-git,tiennou\/objective-git,slavikus\/objective-git,misterfifths\/objective-git,tiennou\/objective-git,Acidburn0zzz\/objective-git,blackpixel\/objective-git,alehed\/objective-git,libgit2\/objective-git,slavikus\/objective-git,nerdishbynature\/objective-git,TOMalley104\/objective-git,blackpixel\/objective-git,tiennou\/objective-git,libgit2\/objective-git,javiertoledo\/objective-git,slavikus\/objective-git,phatblat\/objective-git,dleehr\/objective-git,Acidburn0zzz\/objective-git,misterfifths\/objective-git,TOMalley104\/objective-git,blackpixel\/objective-git,Acidburn0zzz\/objective-git,nerdishbynature\/objective-git,misterfifths\/objective-git,dleehr\/objective-git,pietbrauer\/objective-git,0x4a616e\/objective-git,0x4a616e\/objective-git,c9s\/objective-git","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Classes\/Categories\/NSArray+StringArray.h\n+++ Classes\/Categories\/NSArray+StringArray.h\n@@ -12,6 +12,9 @@\n \n @interface NSArray (StringArray)\n \n+\/\/ Creates and returns a `git_strarray` given an `NSArray` of `NSString`s.\n+\/\/\n+\/\/ If any object in the array is not an `NSString` it is skipped over.\n - (git_strarray *)git_StringArray;\n \n @end\n"} {"commit":"196f518d589d2970ccc560301eb02d3fbb57bbcf","subject":"BUG: MANTIS-785 (itk exception raised when rendering: requested region partially outside of largest region).","message":"BUG: MANTIS-785 (itk exception raised when rendering: requested region partially outside of largest region).\n","repos":"orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/Core\/mvdAbstractImageModel.h\n+++ Code\/Common\/Core\/mvdAbstractImageModel.h\n@@ -467,8 +467,8 @@\n *\/\n virtual_SetCurrentLod( lod );\n \n+ m_CurrentLod = lod;\n \/*\n- m_CurrentLod = lod;\n }\n catch( std::exception& exc )\n {\n"} {"commit":"3c5c5a9b7b69eb2ebdd6ce2a4b7189ccd2d1ab8a","subject":"ENH: cleaning","message":"ENH: cleaning\n","repos":"orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB,orfeotoolbox\/OTB","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Code\/Common\/mvdAbstractViewManipulator.h\n+++ Code\/Common\/mvdAbstractViewManipulator.h\n@@ -86,7 +86,6 @@\n virtual void keyPressEvent( QKeyEvent * event ) = 0;\n \n virtual bool HasZoomChanged() const = 0;\n- virtual void SetImageLargestRegion(const ImageRegionType & largestRegion) = 0;\n \n \/** *\/\n inline\n@@ -109,8 +108,7 @@\n \/\/\n \/\/ Public SLOTS.\n public slots:\n- \/\/virtual void InitializeContext(int width, int height) = 0;\n-\n+ \n \/\/\n \/\/ Protected methods.\n protected:\n"} {"commit":"be033d9a95aec4c78aa6884b4a3e7a9c67dc3f24","subject":"COMP: fixed wrong variable-name in itkMacro","message":"COMP: fixed wrong variable-name in itkMacro\n\n","repos":"lsanzdiaz\/MITK-BiiG,RabadanLab\/MITKats,RabadanLab\/MITKats,rfloca\/MITK,fmilano\/mitk,lsanzdiaz\/MITK-BiiG,nocnokneo\/MITK,nocnokneo\/MITK,NifTK\/MITK,fmilano\/mitk,lsanzdiaz\/MITK-BiiG,NifTK\/MITK,iwegner\/MITK,lsanzdiaz\/MITK-BiiG,NifTK\/MITK,rfloca\/MITK,NifTK\/MITK,RabadanLab\/MITKats,danielknorr\/MITK,lsanzdiaz\/MITK-BiiG,nocnokneo\/MITK,fmilano\/mitk,nocnokneo\/MITK,danielknorr\/MITK,iwegner\/MITK,NifTK\/MITK,rfloca\/MITK,MITK\/MITK,danielknorr\/MITK,fmilano\/mitk,lsanzdiaz\/MITK-BiiG,lsanzdiaz\/MITK-BiiG,NifTK\/MITK,nocnokneo\/MITK,danielknorr\/MITK,nocnokneo\/MITK,iwegner\/MITK,MITK\/MITK,nocnokneo\/MITK,MITK\/MITK,fmilano\/mitk,fmilano\/mitk,RabadanLab\/MITKats,lsanzdiaz\/MITK-BiiG,iwegner\/MITK,rfloca\/MITK,rfloca\/MITK,iwegner\/MITK,rfloca\/MITK,danielknorr\/MITK,RabadanLab\/MITKats,RabadanLab\/MITKats,danielknorr\/MITK,MITK\/MITK,rfloca\/MITK,fmilano\/mitk,iwegner\/MITK,MITK\/MITK,danielknorr\/MITK,MITK\/MITK","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Core\/IGT\/IGTFilters\/mitkNavigationData.h\n+++ Core\/IGT\/IGTFilters\/mitkNavigationData.h\n@@ -61,8 +61,8 @@\n itkSetMacro(Error, ErrorType); \/\/\/< sets the overall error estimation of the NavigationData object\n itkGetConstMacro(Error, ErrorType); \/\/\/< return one value that corresponds to the overall tracking error.\n \/\/itkGetMacro(TimeStamp, const mitk::TimeStamp*); \/\/\/< returns the time when the position and orientation were received from the tracking device\n- itkSetMacro(m_TimeStamp, TimeStampType);\n- itkGetMacro(m_TimeStamp, TimeStampType);\n+ itkSetMacro(TimeStamp, TimeStampType);\n+ itkGetMacro(TimeStamp, TimeStampType);\n \n \/** Graft the data and information from one NavigationData to another. This\n * is a convenience method to setup a second NavigationData object with all the meta\n"} {"commit":"3b6707e4aa5949c9ec55384e686fc739c9e7f787","subject":"Bernd Schmidt writes: too many semicolons!","message":"Bernd Schmidt writes: too many semicolons!\n","repos":"joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc,joel-porquet\/tsar-uclibc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ldso\/ldso\/dl-startup.c\n+++ ldso\/ldso\/dl-startup.c\n@@ -256,7 +256,7 @@\n \t\t\tif (!indx && relative_count) {\n \t\t\t\trel_size -= relative_count * sizeof(ELF_RELOC);\n \t\t\t\telf_machine_relative(load_addr, rel_addr, relative_count);\n-\t\t\t\trel_addr += relative_count * sizeof(ELF_RELOC);;\n+\t\t\t\trel_addr += relative_count * sizeof(ELF_RELOC);\n \t\t\t}\n \n \t\t\trpnt = (ELF_RELOC *) (rel_addr + load_addr);\n"} {"commit":"ef443a2d5b45b5451b53edf94ada9525ae93d824","subject":"Readded setpgid(0,0) also in system_join().","message":"Readded setpgid(0,0) also in system_join().\n","repos":"djbclark\/directfb-core-DirectFB,lancebaiyouview\/DirectFB,DirectFB\/directfb,djbclark\/directfb-core-DirectFB,kevleyski\/directfb,kevleyski\/DirectFB-1,sklnet\/DirectFB,jcdubois\/DirectFB,kaostao\/directfb,dfbdok\/DirectFB1,lancebaiyouview\/DirectFB,jcdubois\/DirectFB,kevleyski\/DirectFB-1,kevleyski\/DirectFB-1,Distrotech\/DirectFB,kevleyski\/directfb,kaostao\/directfb,kevleyski\/DirectFB-1,sklnet\/DirectFB,dfbdok\/DirectFB1,sklnet\/DirectFB,deniskropp\/DirectFB,dfbdok\/DirectFB1,lancebaiyouview\/DirectFB,kevleyski\/directfb,Distrotech\/DirectFB,lancebaiyouview\/DirectFB,deniskropp\/DirectFB,Distrotech\/DirectFB,sklnet\/DirectFB,kevleyski\/directfb,DirectFB\/directfb,djbclark\/directfb-core-DirectFB,mtsekm\/test,deniskropp\/DirectFB,kaostao\/directfb,deniskropp\/DirectFB,mtsekm\/test,djbclark\/directfb-core-DirectFB,jcdubois\/DirectFB,DirectFB\/directfb,mtsekm\/test","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- systems\/fbdev\/fbdev.c\n+++ systems\/fbdev\/fbdev.c\n@@ -613,6 +613,8 @@\n dfb_fbdev->core = core;\n dfb_fbdev->shared = shared;\n \n+ setpgid( 0, 0 );\n+\n \/* Open framebuffer device *\/\n ret = dfb_fbdev_open();\n if (ret) {\n"} {"commit":"7d33518661cfc95c5901a8eacf067f82c294466c","subject":"X11: Fixup last but one commit.","message":"X11: Fixup last but one commit.\n","repos":"kevleyski\/directfb,sklnet\/DirectFB,sklnet\/DirectFB,mtsekm\/test,kaostao\/directfb,kaostao\/directfb,djbclark\/directfb-core-DirectFB,deniskropp\/DirectFB,kevleyski\/directfb,Distrotech\/DirectFB,kevleyski\/DirectFB-1,DirectFB\/directfb,deniskropp\/DirectFB,kevleyski\/directfb,dfbdok\/DirectFB1,deniskropp\/DirectFB,Distrotech\/DirectFB,mtsekm\/test,kaostao\/directfb,djbclark\/directfb-core-DirectFB,kevleyski\/DirectFB-1,dfbdok\/DirectFB1,jcdubois\/DirectFB,djbclark\/directfb-core-DirectFB,sklnet\/DirectFB,mtsekm\/test,jcdubois\/DirectFB,dfbdok\/DirectFB1,Distrotech\/DirectFB,kevleyski\/directfb,djbclark\/directfb-core-DirectFB,jcdubois\/DirectFB,kevleyski\/DirectFB-1,lancebaiyouview\/DirectFB,kevleyski\/DirectFB-1,sklnet\/DirectFB,lancebaiyouview\/DirectFB,deniskropp\/DirectFB,lancebaiyouview\/DirectFB,lancebaiyouview\/DirectFB,DirectFB\/directfb,DirectFB\/directfb","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- systems\/x11\/primary.c\n+++ systems\/x11\/primary.c\n@@ -564,7 +564,8 @@\n if (ret)\n return ret;\n \n- x11->shared->stereo = !!(lds->config.options & DLOP_STEREO);\n+ x11->shared->stereo = !!(lds->config.options & DLOP_STEREO);\n+ x11->shared->stereo_width = lds->config.width \/ 2;\n \n if (palette)\n dfb_x11_set_palette( x11, lds, palette );\n"} {"commit":"b38fbbc788af6a9ab434d06cc5f307d5a26770c5","subject":"Fixes crash loading bundled resources when build as a framework","message":"Fixes crash loading bundled resources when build as a framework\n","repos":"ashqal\/MD360Player4iOS","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- MDVRLibrary\/MDVRLibrary\/MDVRHeader.h\n+++ MDVRLibrary\/MDVRLibrary\/MDVRHeader.h\n@@ -11,7 +11,7 @@\n \n \n #define MDVR_RAW_NAME @ \"vrlibraw.bundle\"\n-#define MDVR_RAW_PATH [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: MDVR_RAW_NAME]\n+#define MDVR_RAW_PATH [[[NSBundle bundleForClass: [self class]] resourcePath] stringByAppendingPathComponent: MDVR_RAW_NAME]\n #define MDVR_RAW [NSBundle bundleWithPath: MDVR_RAW_PATH]\n #define MULTI_SCREEN_SIZE 2\n \n"} {"commit":"5e9bc7a640aa2891c5eb2187cc2b8c6d6f02995d","subject":"Set release\/1.11 to RELEASE mode.","message":"Set release\/1.11 to RELEASE mode.\n","repos":"Microsoft\/ChakraCore,Microsoft\/ChakraCore,Microsoft\/ChakraCore,Microsoft\/ChakraCore,Microsoft\/ChakraCore,Microsoft\/ChakraCore","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- lib\/Common\/ChakraCoreVersion.h\n+++ lib\/Common\/ChakraCoreVersion.h\n@@ -55,7 +55,7 @@\n \n \/\/ ChakraCore RELEASE and PRERELEASE flags\n #define CHAKRA_CORE_VERSION_RELEASE 1\n-#define CHAKRA_CORE_VERSION_PRERELEASE 1\n+#define CHAKRA_CORE_VERSION_PRERELEASE 0\n \n \/\/ Chakra RELEASE flag\n \/\/ Mostly redundant with CHAKRA_CORE_VERSION_RELEASE,\n"} {"commit":"92d5212261d1da24561702130b8e47b82ab89550","subject":"Document originDevice parameter","message":"Document originDevice parameter\n","repos":"isis-ammo\/ammo-gateway,isis-ammo\/ammo-gateway,isis-ammo\/ammo-gateway,isis-ammo\/ammo-gateway,isis-ammo\/ammo-gateway,isis-ammo\/ammo-gateway","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- LibGatewayConnector\/GatewayConnector.h\n+++ LibGatewayConnector\/GatewayConnector.h\n@@ -39,6 +39,22 @@\n class PullResponse;\n };\n \n+ \/**\n+ * Identifies an instance of a plugin, by plugin name and instance ID.\n+ *\/\n+ struct PluginInstanceId {\n+ public:\n+ PluginInstanceId(std::string newPluginName, std::string newInstanceId) : pluginName(newPluginName), instanceId(newInstanceId) {\n+ \/\/don't need to do anything\n+ };\n+ PluginInstanceId() : pluginName(\"\"), instanceId(\"\") {\n+ \n+ };\n+ \n+ std::string pluginName;\n+ std::string instanceId;\n+ };\n+ \n struct LibGatewayConnector_Export AcknowledgementThresholds {\n public:\n AcknowledgementThresholds() : deviceDelivered(false), pluginDelivered(false) {\n@@ -55,9 +71,9 @@\n class LibGatewayConnector_Export PushData {\n public:\n PushData();\n- std::string uri; \/\/\/< The URI of this piece of data. This URI should be a universally\n+ std::string uid; \/\/\/< The UID of this piece of data. This UID should be a universally\n \/\/\/ unique identifier for the object being pushed (no two pieces of\n- \/\/\/ data should have the same URI).\n+ \/\/\/ data should have the same UID).\n std::string mimeType; \/\/\/< The MIME type of this piece of data. This MIME type is used to\n \/\/\/ determine which other gateway plugins will receive this pushed\n \/\/\/ data.\n@@ -69,7 +85,8 @@\n \/\/\/ nulls).\n std::string originUsername; \/\/\/< The username of the user who generated this data. May be\n \/\/\/ overwritten by the gateway in some cases. Optional.\n- std::string originDevice;\n+ std::string originDevice; \/\/\/< A unique identifier for this plugin. Used for acknowledgement\n+ \/\/\/ routing; must be unique or acknowledgements will be misrouted.\n ammo::gateway::MessageScope scope;\/\/\/< The scope of this object (determines how many gateways to send\n \/\/\/ this object to in a multiple gateway configuration). Optional,\n \/\/\/ will default to SCOPE_GLOBAL.\n@@ -79,7 +96,7 @@\n ammo::gateway::AcknowledgementThresholds ackThresholds;\n \n friend std::ostream& operator<<(std::ostream &os, const ammo::gateway::PushData &pushData) {\n- os << \"URI: \" << pushData.uri << \" type: \" << pushData.mimeType;\n+ os << \"UID: \" << pushData.uid << \" type: \" << pushData.mimeType;\n return os;\n }\n };\n@@ -145,7 +162,7 @@\n \/\/\/ Must match the identifier from the initial request or data\n \/\/\/ will not be routed correctly.\n std::string mimeType; \/\/\/< The data type of the data in this response.\n- std::string uri; \/\/\/< The URI of the data in this response.\n+ std::string uid; \/\/\/< The UID of the data in this response.\n std::string encoding; \/\/\/< The encoding of the data in this response (optional; defaults\n \/\/\/ to \"json\" if not specified).\n std::string data; \/\/\/< The data to be sent to the requestor.\n@@ -173,6 +190,29 @@\n }\n };\n \n+ class LibGatewayConnector_Export PointToPointMessage {\n+ public:\n+ PointToPointMessage();\n+ std::string uid; \/\/\/< The unique identifier for this message.\n+ std::string destinationGateway; \/\/\/< The gateway that the plugin which will receive this message\n+ \/\/\/ is connected to. Should be blank if the receiving plugin\n+ \/\/\/ is connected to the local gateway.\n+ PluginInstanceId destinationPluginId; \/\/\/< The identifier (plugin name and instance ID) of the plugin\n+ \/\/\/ which will receive this message.\n+ std::string sourceGateway; \/\/\/< The ID of the gateway which this message was sent from. Plugins\n+ \/\/\/ sending point-to-point messages do not need to specify this\n+ \/\/\/ ID themselves; it will be set automatically by the gateway.\n+ PluginInstanceId sourcePluginId; \/\/\/< The identifier (plugin name and instance ID) of the plugin\n+ \/\/\/ which sent this message. Plugins sending point-to-point\n+ \/\/\/ messages do not need to specify this ID themselves; it will be\n+ \/\/\/ set automatically by the gateway.\n+ std::string mimeType; \/\/\/< The data type of the data in this message.\n+ std::string encoding; \/\/\/< The encoding of the data in this message.\n+ std::string data; \/\/\/< The data to be sent.\n+ char priority; \/\/\/< Priority of this message. Messages with higher priority\n+\t \/\/\/ values will be sent first if multiple messages are queued.\n+ };\n+ \n \/**\n * This class is used to connect a gateway plugin to the core gateway. Each \n * plugin should use at least one instance of this class; a plugin may create\n@@ -190,8 +230,19 @@\n * @param delegate A GatewayConnectorDelegate object to be used by this\n * GatewayConnector instance. May be NULL (no delegate methods\n * will be called).\n- *\/\n- GatewayConnector(GatewayConnectorDelegate *delegate);\n+ * @param pluginName The name of this plugin (must be unique to the plugin,\n+ * but multiple instances of the plugin may share the\n+ * same name if differentiated by the instanceId\n+ * parameter.\n+ * @param instanceId A unique identifier identifying this instance of the\n+ * plugin; should be globally unique across all instances\n+ * of this plugin across the whole network. If set to an\n+ * empty string (\"\"), an instance ID will be randomly\n+ * generated for this instance (most plugins will\n+ * probably do this, although a custom human-readable ID \n+ * can be nice for debugging and logging).\n+ *\/\n+ GatewayConnector(GatewayConnectorDelegate *delegate, std::string pluginName, std::string instanceId);\n \n \/**\n * Creates a new GatewayConnector with the given GatewayConnectorDelegate and\n@@ -200,9 +251,20 @@\n * @param delegate A GatewayConnectorDelegate object to be used by this\n * GatewayConnector instance. May be NULL (no delegate methods\n * will be called).\n+ * @param pluginName The name of this plugin (must be unique to the plugin,\n+ * but multiple instances of the plugin may share the\n+ * same name if differentiated by the instanceId\n+ * parameter.\n+ * @param instanceId A unique identifier identifying this instance of the\n+ * plugin; should be globally unique across all instances\n+ * of this plugin across the whole network. If set to an\n+ * empty string (\"\"), an instance ID will be randomly\n+ * generated for this instance (most plugins will\n+ * probably do this, although a custom human-readable ID \n+ * can be nice for debugging and logging).\n * @param configfile A path to the gateway config file.\n *\/\n- GatewayConnector(GatewayConnectorDelegate *delegate, std::string configfile);\n+ GatewayConnector(GatewayConnectorDelegate *delegate, std::string pluginName, std::string instanceId, std::string configfile);\n \n \/**\n * Destroys a GatewayConnector.\n@@ -219,7 +281,7 @@\n * will send an authentication request, but the gateway will always\n * will always return 'success' (and this method will always return\n * true). We should actually perform authentication here (pending more\n- * information from the security people).\n+ * information from the secuidty people).\n * \n * @param device The unique ID of the device connecting to the gateway\n * @param user The unique ID of the user associated with the device connecting\n@@ -236,13 +298,13 @@\n \n \/\/Sender-side\n \/**\n- * Pushes a piece of data (with a particular URI and type) to the gateway.\n+ * Pushes a piece of data (with a particular UID and type) to the gateway.\n * \n * Data pushed with this method can be received by listeners registered with\n * registerDataInterest. All listeners registered for the type specified by\n * mimeType will receive this piece of data.\n * \n- * @param pushData The data to be pushed to the gateway. uri and mimeType\n+ * @param pushData The data to be pushed to the gateway. uid and mimeType\n * must be set, or this call must fail (other parameters\n * are optional, and will use sane defaults).\n * \n@@ -276,6 +338,8 @@\n * @return true if the operation succeeded; false if the operation failed.\n *\/\n bool pullResponse(PullResponse &response);\n+ \n+ bool pointToPointMessage(PointToPointMessage &message);\n \n \n \/\/Receiver-side\n@@ -366,8 +430,17 @@\n void onPushAcknowledgementReceived(const ammo::gateway::protocol::PushAcknowledgement &msg);\n void onPullRequestReceived(const ammo::gateway::protocol::PullRequest &msg, char messagePriority);\n void onPullResponseReceived(const ammo::gateway::protocol::PullResponse &msg, char messagePriority);\n+ void onPointToPointMessageReceived(const ammo::gateway::protocol::PointToPointMessage &msg, char messagePriority);\n+ void onRemoteGatewayConnectedNotification(const ammo::gateway::protocol::RemoteGatewayConnectedNotification &msg);\n+ void onPluginConnectedNotification(const ammo::gateway::protocol::PluginConnectedNotification &msg);\n+ \n+ bool associatePlugin();\n \n GatewayConnectorDelegate *delegate;\n+ \n+ std::string pluginName;\n+ std::string instanceId;\n+ \n std::map<std::string, DataPushReceiverListener *> receiverListeners;\n std::map<std::string, PullRequestReceiverListener *> pullRequestListeners;\n std::map<std::string, PullResponseReceiverListener *> pullResponseListeners;\n@@ -387,6 +460,8 @@\n *\/\n class LibGatewayConnector_Export GatewayConnectorDelegate {\n public:\n+ typedef std::vector<PluginInstanceId> PluginList;\n+ \n \/**\n * Called when the GatewayConnector connects to the gateway core.\n * \n@@ -412,7 +487,36 @@\n * failed.\n *\/\n virtual void onAuthenticationResponse(GatewayConnector *sender, bool result);\n-\n+ \n+ \/**\n+ * Called when a remote gateway connects to this gateway.\n+ *\n+ * @param sender The GatewayConnector instance which received the notification.\n+ * @param gatewayId The name of the remote gateway which connected.\n+ * @param connectedPlugins The list of connected plugins.\n+ *\/\n+ virtual void onRemoteGatewayConnected(GatewayConnector *sender,\n+ const std::string &gatewayId,\n+ const PluginList &connectedPlugins);\n+ \n+ \/**\n+ * Called when a plugin connects to the gateway.\n+ * \n+ * @param sender The GatewayConnector instance which received the notification.\n+ * @param pluginId The name and instance ID of the plugin which connected.\n+ * @param remotePlugin True if the plugin is connected to a remote gateway;\n+ * false if the plugin is connected to the local gateway.\n+ * @param gatewayId If the plugin is connected to a remote gateway, is the\n+ * name of that remote gateway. Undefined if the plugin\n+ * is connected to a local gateway (remotePlugin is false).\n+ *\/\n+ virtual void onPluginConnected(GatewayConnector *sender,\n+ const PluginInstanceId &pluginId,\n+ const bool remotePlugin,\n+ const std::string &gatewayId);\n+ \n+ virtual void onPointToPointMessageReceived(GatewayConnector *sender, const ammo::gateway::PointToPointMessage &message);\n+ \n virtual void onPushAcknowledgementReceived(GatewayConnector *sender, const ammo::gateway::PushAcknowledgement &ack);\n };\n \n"} {"commit":"3ca07034e17165d3536e2291923e0050e778ef37","subject":"Move definition int sval into branch of ifdef where it is used.","message":"Move definition int sval into branch of ifdef where it is used.\n\nOtherwise, you get a warning about an undefined variable.\n","repos":"sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator,sk-\/python2.7-type-annotator","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Modules\/_multiprocessing\/semaphore.c\n+++ Modules\/_multiprocessing\/semaphore.c\n@@ -512,7 +512,6 @@\n static PyObject *\n semlock_iszero(SemLockObject *self)\n {\n-\tint sval;\n #if HAVE_BROKEN_SEM_GETVALUE\n \tif (sem_trywait(self->handle) < 0) {\n \t\tif (errno == EAGAIN)\n@@ -524,6 +523,7 @@\n \t\tPy_RETURN_FALSE;\n \t}\n #else\n+\tint sval;\n \tif (SEM_GETVALUE(self->handle, &sval) < 0)\n \t\treturn mp_SetError(NULL, MP_STANDARD_ERROR);\n \treturn PyBool_FromLong((long)sval == 0);\n"} {"commit":"1003bbffa12d65afa5c5899bc7451cdf8db9e647","subject":"use queue in windows platform, use callback in linux platform","message":"use queue in windows platform, use callback in linux platform\n","repos":"ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- NFComm\/NFPluginModule\/NFINetModule.h\n+++ NFComm\/NFPluginModule\/NFINetModule.h\n@@ -97,21 +97,29 @@\n \ttemplate<typename BaseType>\r\n \tvoid Initialization(NFIMsgHead::NF_Head nHeadLength, BaseType* pBaseType, int (BaseType::*handleRecieve)(const NFIPacket&), int (BaseType::*handleEvent)(const int, const NF_NET_EVENT, NFINet*), const char* strIP, const unsigned short nPort)\r\n \t{\r\n+#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \t\tmRecvCB = std::bind(handleRecieve, pBaseType, std::placeholders::_1);\r\n \t\tmEventCB = std::bind(handleEvent, pBaseType, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);\r\n \r\n \t\tm_pNet = new NFCNet(nHeadLength, this, &NFINetModule::OnRecivePack, &NFINetModule::OnSocketEvent);\r\n-\r\n+#else\r\n+\t\tm_pNet = new NFCNet(nHeadLength, this, handleRecieve, handleEvent);\r\n+#endif\r\n \t\tm_pNet->Initialization(strIP, nPort);\r\n \t}\r\n \r\n \ttemplate<typename BaseType>\r\n \tint Initialization(NFIMsgHead::NF_Head nHeadLength, BaseType* pBaseType, int (BaseType::*handleRecieve)(const NFIPacket&), int (BaseType::*handleEvent)(const int, const NF_NET_EVENT, NFINet*), const unsigned int nMaxClient, const unsigned short nPort, const int nCpuCount = 4)\r\n \t{\r\n+#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \t\tmRecvCB = std::bind(handleRecieve, pBaseType, std::placeholders::_1);\r\n \t\tmEventCB = std::bind(handleEvent, pBaseType, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3);\r\n \r\n \t\tm_pNet = new NFCNet(nHeadLength, this, &NFINetModule::OnRecivePack, &NFINetModule::OnSocketEvent);\r\n+#else\r\n+\t\tm_pNet = new NFCNet(nHeadLength, this, handleRecieve, handleEvent);\r\n+#endif\r\n+\r\n \t\treturn m_pNet->Initialization(nMaxClient, nPort, nCpuCount);\r\n \t}\r\n \r\n@@ -177,6 +185,7 @@\n \t\tKeepAlive(fLasFrametime);\r\n \r\n \t\t\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n+\t\t#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \t\tQueueEventPack xEventPack;\r\n \t\twhile (mxQueue.Pop(xEventPack))\r\n \t\t{\r\n@@ -215,7 +224,7 @@\n \t\t\t\tbreak;\r\n \t\t\t}\r\n \t\t}\r\n-\r\n+#endif\r\n \t\t\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\r\n \t\treturn m_pNet->Execute(fLasFrametime, fStartedTime);\r\n \t}\r\n@@ -263,16 +272,7 @@\n \t\t\treturn false;\r\n \t\t}\r\n \r\n-\t\t\/\/ \t\tNFCPacket xPacket(m_pNet->GetHeadLen());\r\n-\t\t\/\/ \t\tif(!xPacket.EnCode(nMsgID, strMsg.c_str(), strMsg.length()))\r\n-\t\t\/\/ \t\t{\r\n-\t\t\/\/ \t\t\tchar szData[MAX_PATH] = { 0 };\r\n-\t\t\/\/ \t\t\tsprintf(szData, \"Send Message to %d Failed For Encode of MsgData, MessageID: %d, MessageLen: %d\\n\", nSockIndex, nMsgID, strMsg.length());\r\n-\t\t\/\/ \t\t\tLogSend(szData);\r\n-\t\t\/\/\r\n-\t\t\/\/ \t\t\treturn false;\r\n-\t\t\/\/ \t\t}\r\n-\r\n+#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \t\tQueueEventPack xNetEventPack;\r\n \t\txNetEventPack.eMsgType = QueueEventPack::ON_NET_SEND;\r\n \t\txNetEventPack.nMsgID = nMsgID;\r\n@@ -280,8 +280,19 @@\n \t\txNetEventPack.strData = strMsg;\/\/\u0534\u017b,SerializeToString\u05b1\u04fd\r\n \r\n \t\treturn mxQueue.Push(xNetEventPack);\r\n-\r\n-\t\t\/\/return m_pNet->SendMsg(xPacket, nSockIndex, bBroadcast);\r\n+#else\r\n+\t\tNFCPacket xPacket(m_pNet->GetHeadLen());\r\n+\t\tif(!xPacket.EnCode(nMsgID, strMsg.c_str(), strMsg.length()))\r\n+\t\t{\r\n+\t\t\tchar szData[MAX_PATH] = { 0 };\r\n+\t\t\tsprintf(szData, \"Send Message to %d Failed For Encode of MsgData, MessageID: %d, MessageLen: %d\\n\", nSockIndex, nMsgID, strMsg.length());\r\n+\t\t\tLogSend(szData);\r\n+\r\n+\t\t\treturn false;\r\n+\t\t}\r\n+\r\n+\t\treturn m_pNet->SendMsg(xPacket, nSockIndex, bBroadcast);\r\n+#endif\r\n \r\n \t}\r\n \r\n@@ -318,6 +329,7 @@\n \t\tSendMsgPB(NFMsg::EGameMsgID::EGMI_STS_HEART_BEAT, xMsg, 0);\r\n \t}\r\n \r\n+#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \tint OnRecivePack(const NFIPacket& msg)\r\n \t{\r\n \t\tQueueEventPack xNetEventPack;\r\n@@ -342,15 +354,19 @@\n \r\n \t\treturn 0;\r\n \t}\r\n+#endif\r\n \r\n private:\r\n \r\n \tNFINet* m_pNet;\r\n \tfloat mfLastHBTime;\r\n+\r\n+#if NF_PLATFORM == NF_PLATFORM_WIN\r\n \tRECIEVE_FUNCTOR mRecvCB;\r\n \tEVENT_FUNCTOR mEventCB;\r\n \r\n \tNFQueue<QueueEventPack> mxQueue;\r\n+#endif\r\n \r\n };\r\n \r\n"} {"commit":"30910a41e02130ba247a79cb32093bdd56acd533","subject":"remove client servertype","message":"remove client servertype\n","repos":"zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,ketoo\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame,zh423328\/NoahGameFrame","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- NFComm\/NFPluginModule\/NFINetModule.h\n+++ NFComm\/NFPluginModule\/NFINetModule.h\n@@ -23,14 +23,13 @@\n enum NF_SERVER_TYPES\r\n {\r\n \tNF_ST_NONE\t\t\t= 0, \/\/ NONE\r\n-\tNF_ST_CLIENT\t\t= 1, \/\/ client\r\n-\tNF_ST_REDIS\t\t\t= 2, \/\/\r\n-\tNF_ST_MYSQL\t\t\t= 3, \/\/\r\n-\tNF_ST_MASTER\t\t= 4, \/\/\r\n-\tNF_ST_LOGIN\t\t\t= 5, \/\/\r\n-\tNF_ST_PROXY\t\t\t= 6, \/\/\r\n-\tNF_ST_GAME\t\t\t= 7, \/\/\r\n-\tNF_ST_WORLD\t\t\t= 8, \/\/\r\n+\tNF_ST_REDIS\t\t\t= 1, \/\/\r\n+\tNF_ST_MYSQL\t\t\t= 2, \/\/\r\n+\tNF_ST_MASTER\t\t= 3, \/\/\r\n+\tNF_ST_LOGIN\t\t\t= 4, \/\/\r\n+\tNF_ST_PROXY\t\t\t= 5, \/\/\r\n+\tNF_ST_GAME\t\t\t= 6, \/\/\r\n+\tNF_ST_WORLD\t\t\t= 7, \/\/\r\n \r\n };\r\n \r\n"} {"commit":"61047329990eb414657ab85c38d028b37eb576c4","subject":"NetworkPkg: Fix the issue EfiPxeBcDhcp() may return wrong status.","message":"NetworkPkg: Fix the issue EfiPxeBcDhcp() may return wrong status.\n\nif the instance of the EFI DHCP4 protocol driver is in the Dhcp4Bound status\nthat is DHCP configuration has completed, so the Dhcp4->Start FUNC in\nthe PxeBcDhcpDora() will return EFI_ALREADY_STARTED status which lead to\nEfiPxeBcDhcp FUNC not in correspondence with UEFI spec.\n\nContributed-under: TianoCore Contribution Agreement 1.0\nSigned-off-by: Zhang Lubo <lubo.zhang@intel.com>\nReviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>\nReviewed-by: Fu Siyuan <siyuan.fu@intel.com>\nReviewed-by: Ye Ting <ting.ye@intel.com>\n[lersek@redhat.com: updated copyright year as requested by Siyuan]\nSigned-off-by: Laszlo Ersek <lersek@redhat.com>\n\ngit-svn-id: 3158a46dfd52e07d1fda3e32e1ab2e353a00b20f@18049 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- NetworkPkg\/UefiPxeBcDxe\/PxeBcDhcp4.c\n+++ NetworkPkg\/UefiPxeBcDxe\/PxeBcDhcp4.c\n@@ -1,7 +1,7 @@\n \/** @file\r\n Functions implementation related with DHCPv4 for UefiPxeBc Driver.\r\n \r\n- Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r\n+ Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r\n \r\n This program and the accompanying materials\r\n are licensed and made available under the terms and conditions of the BSD License\r\n@@ -1569,10 +1569,12 @@\n ZeroMem (Private->OfferIndex, sizeof (Private->OfferIndex));\r\n \r\n \/\/\r\n- \/\/ Start DHCPv4 D.O.R.A. process to acquire IPv4 address.\r\n+ \/\/ Start DHCPv4 D.O.R.A. process to acquire IPv4 address. This may \r\n+ \/\/ have already been done, thus do not leave in error if the return\r\n+ \/\/ code is EFI_ALREADY_STARTED.\r\n \/\/\r\n Status = Dhcp4->Start (Dhcp4, NULL);\r\n- if (EFI_ERROR (Status)) {\r\n+ if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r\n if (Status == EFI_ICMP_ERROR) {\r\n PxeMode->IcmpErrorReceived = TRUE;\r\n }\r\n"} {"commit":"1c8d914aea800f5920848a0c0fdd3b33123fb720","subject":"The definitions of the Iris left and down arrow keys were reversed. (dm)","message":"The definitions of the Iris left and down arrow keys were reversed. (dm)\n\n\ngit-svn-id: 30a5f035a20f1bc647618dbad7eea2a951b61b7c@6020 91a5dbb7-01b9-0310-9b5f-b28072856b6e\n","repos":"brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty,brltty\/brltty","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- Drivers\/Braille\/EuroBraille\/brldefs-eu.h\n+++ Drivers\/Braille\/EuroBraille\/brldefs-eu.h\n@@ -29,9 +29,9 @@\n EU_CMD_L7 = 6,\n EU_CMD_L8 = 7,\n EU_CMD_Up = 8,\n- EU_CMD_Left = 9,\n+ EU_CMD_Down = 9,\n EU_CMD_Right = 10,\n- EU_CMD_Down = 11,\n+ EU_CMD_Left = 11,\n \n \/* Esytime function keys *\/\n EU_CMD_F1 = 0,\n"} {"commit":"d469d94ff958a00bf2f01959d76f504286d3b1da","subject":"Fix universal forwarding in CreateAction","message":"Fix universal forwarding in CreateAction\n","repos":"google\/orbit,google\/orbit,google\/orbit,google\/orbit","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- OrbitBase\/include\/OrbitBase\/Action.h\n+++ OrbitBase\/include\/OrbitBase\/Action.h\n@@ -34,7 +34,8 @@\n \n template <typename F>\n std::unique_ptr<Action> CreateAction(F&& functor) {\n- return std::make_unique<NullaryFunctorAction<F>>(std::forward<F>(functor));\n+ return std::make_unique<NullaryFunctorAction<std::remove_reference_t<F>>>(\n+ std::forward<F>(functor));\n }\n \n #endif \/\/ ORBIT_BASE_ACTION_H_\n"} {"commit":"a7a4b67d8fd20f1e70dbebd88226bc35dc449ab5","subject":"Delete exiForJsonEXIEncoder.c","message":"Delete exiForJsonEXIEncoder.c","repos":"EXIficient\/exificient-for-json.c,EXIficient\/exificient-for-json.c,EXIficient\/exificient-for-json.c","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/exiForJsonEXIEncoder.c\n+++ src\/exiForJsonEXIEncoder.c\n@@ -1,2284 +0,0 @@\n-\/*\n- * Copyright (C) 2007-2016 Siemens AG\n- *\n- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and\n- * associated documentation files (the \"Software\"), to deal in the Software without restriction, \n- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, \n- * and\/or sell copies of the Software, and to permit persons to whom the Software is furnished to do\n- * so, subject to the following conditions:\n- * \n- * The above copyright notice and this permission notice shall be included in all copies or \n- * substantial portions of the Software.\n- * \n- * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, \n- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A \n- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR \n- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\n- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION \n- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n- *\/\n-\n-\/*******************************************************************\n- *\n- * @author Daniel.Peintner.EXT@siemens.com\n- * @version 2016-02-03 \n- * @contact Joerg.Heuer@siemens.com\n- *\n- * <p>Code generated by EXIdizer<\/p>\n- * <p>Schema: schema-for-json.xsd<\/p>\n- *\n- *\n- ********************************************************************\/\n-\n-\n-\n-#ifndef EXI_EXIforJSON_ENCODER_C\n-#define EXI_EXIforJSON_ENCODER_C\n-\n-#include \"EXITypes.h\"\n-#include \"EXIOptions.h\"\n-#include \"BitOutputStream.h\"\n-#include \"EncoderChannel.h\"\n-\n-#include \"StringNameTable.h\"\n-#include \"EXIforJSONNameTableEntries.h\"\n-#include \"MethodsBag.h\"\n-\n-#include \"EXIOptions.h\"\n-\n-#include \"EXIforJSONEXICoder.h\"\n-#include \"EXIHeaderEncoder.h\"\n-#include \"ErrorCodes.h\"\n-#include \"EXIforJSONQNames.h\"\n-#include \"EXIforJSONQNameDefines.h\"\n-\n-\n-\n-\n-\/* local variables *\/\n-static uint32_t bits;\n-static int errn;\n-\n-\/* ==================================== *\/\n-\n-static int _encodeNBitIntegerValue(bitstream_t* stream, exi_integer_t* iv, uint16_t nbits, int32_t lowerBound) {\n-\tuint32_t val;\n-\terrn = 0;\n-\tswitch(iv->type) {\n-\t\/* Unsigned Integer *\/\n-\tcase EXI_UNSIGNED_INTEGER_8:\n-\t\tval = (uint32_t)(iv->val.int8 - lowerBound);\n-\t\tbreak;\n-\tcase EXI_UNSIGNED_INTEGER_16:\n-\t\tval = (uint32_t)(iv->val.int16 - lowerBound);\n-\t\tbreak;\n-\tcase EXI_UNSIGNED_INTEGER_32:\n-\t\tval = (uint32_t)(iv->val.int32 - lowerBound);\n-\t\tbreak;\n-\tcase EXI_UNSIGNED_INTEGER_64:\n-\t\tval = (uint32_t)(iv->val.int64 - lowerBound);\n-\t\tbreak;\n-\t\/* (Signed) Integer *\/\n-\tcase EXI_INTEGER_8:\n-\t\tval = (uint32_t)(iv->val.uint8 - lowerBound);\n-\t\tbreak;\n-\tcase EXI_INTEGER_16:\n-\t\tval = (uint32_t)(iv->val.uint16 - lowerBound);\n-\t\tbreak;\n-\tcase EXI_INTEGER_32:\n-\t\tval = (uint32_t)(iv->val.uint32 - (int64_t)lowerBound);\n-\t\tbreak;\n-\tcase EXI_INTEGER_64:\n-\t\tval = (uint32_t)((int64_t)iv->val.uint64 - (int64_t)lowerBound);\n-\t\tbreak;\n-\tdefault:\n-\t\terrn = (EXI_UNSUPPORTED_INTEGER_VALUE_TYPE);\n-\t\tbreak;\n-\t}\n-\n-\tif(errn == 0) {\n-\t\terrn = encodeNBitUnsignedInteger(stream, nbits, val);\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-static int _exiValueToString(exi_value_t* val) {\n-\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\terrn = (0);\n-\t} else {\n-\t\t\/* TODO convert typed value to string *\/\n-\t\terrn = (EXI_ERROR_CONVERSION_TYPE_TO_STRING);\n-\t}\n-\treturn errn;\n-}\n-\n-\n-\n-static int _exiEncodeEventCode2(bitstream_t* stream, exi_state_t* state, exi_event_t event2) {\n-\t\n-\tint16_t ruleID = state->grammarStack[state->stackIndex];\n-\tuint16_t codingLength1;\n-\tuint16_t characteristics;\n-\terrn = EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC_UNDECLARED;\n-\n-\tswitch (ruleID) {\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 5, 18);\n-\t\tif(errn == 0) {\n-\t\t\tswitch(event2) {\n-\t\t\tcase EXI_EVENT_ATTRIBUTE_XSI_TYPE:\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\tbreak;\n-\t\t\tcase EXI_EVENT_ATTRIBUTE_XSI_NIL:\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\t\tbreak;\n-\n-\tdefault:\n-\t\tif (ruleID < 0) {\n-\t\t\t\/* built-in element grammar *\/\n-\t\t\tcharacteristics = (uint16_t)(state->runtimeGrammars[(ruleID + 1)*(-1)].numberOfProductions + 1);\n-\n-\t\t\terrn = exiGetCodingLength(characteristics, &codingLength1);\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* 1st level *\/\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, codingLength1, (uint32_t)(characteristics-1));\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\tif ( exi_EXIforJSON_IsStartContent(ruleID) ) {\n-\t\t\t\t\t\t\/* TODO generate 2nd level productions *\/\n-\n-\t\t\t\t\t\t\/* StartTagContent grammar *\/\n-\t\t\t\t\t\tswitch(event2) {\n-\t\t\t\t\t\tcase EXI_EVENT_END_ELEMENT_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 0: EE *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 0);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tcase EXI_EVENT_ATTRIBUTE_GENERIC_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 1: AT(*) *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 1);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tcase EXI_EVENT_START_ELEMENT_GENERIC_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 2: SE(*) *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 2);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tcase EXI_EVENT_CHARACTERS_GENERIC_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 3: CH *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 3);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tdefault:\n-\t\t\t\t\t\t\terrn = (EXI_ERROR_UNEXPECTED_EVENT_LEVEL2);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t}\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\t\/* TODO generate 2nd level productions *\/\n-\n-\t\t\t\t\t\t\/* ElementContent grammar *\/\n-\t\t\t\t\t\tswitch(event2) {\n-\t\t\t\t\t\tcase EXI_EVENT_START_ELEMENT_GENERIC_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 0: SE(*) *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tcase EXI_EVENT_CHARACTERS_GENERIC_UNDECLARED:\n-\t\t\t\t\t\t\t\/* 1: CH *\/\n-\t\t\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\tdefault:\n-\t\t\t\t\t\t\terrn = (EXI_ERROR_UNEXPECTED_EVENT_LEVEL2);\n-\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} else {\n-\t\t\terrn = EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC_UNDECLARED;\n-\t\t}\n-\t\tbreak;\n-\t}\n-\t\n-\treturn (errn);\n-}\n-\n-\n-static int _exiEncodeNamespaceUriHit(bitstream_t* stream, exi_state_t* state, uint16_t uriID) {\n-\tuint16_t uriCodingLength;\n-\tuint16_t uriSize;\n-\n-\terrn = exiGetUriSize(&state->nameTablePrepopulated, &state->nameTableRuntime, &uriSize);\n-\tif (errn == 0) {\n-\t\t\/* URI Entries + 1 *\/\n-\t\terrn = exiGetCodingLength( (uint16_t)(uriSize + 1), &uriCodingLength);\n-\t\tif (errn == 0) {\n-\t\t\t\/* uri string value found *\/\n-\t\t\t\/* ==> value(i+1) is encoded as n-bit unsigned integer *\/\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, uriCodingLength, (uint32_t)(uriID+1));\n-\t\t}\n-\t}\n-\n-\treturn errn;\n-}\n-\n-\n-static int _exiEncodeNamespaceMiss(bitstream_t* stream, exi_state_t* state,\n-\t\texi_string_t* uri, uint16_t* uriID) {\n-\t\n-\tuint16_t uriCodingLength;\n-\tuint16_t uriSize;\n-\n-\terrn = exiGetUriSize(&state->nameTablePrepopulated, &state->nameTableRuntime, &uriSize);\n-\tif (errn == 0) {\n-\t\t\/* URI Entries + 1 *\/\n-\t\terrn = exiGetCodingLength( (uint16_t)(uriSize + 1), &uriCodingLength);\n-\t\tif (errn == 0) {\n-\t\t\t\/* uri string value was not found\n-\t\t\t * ==> zero (0) as an n-nit unsigned integer\n-\t\t\t * followed by uri encoded as string *\/\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, uriCodingLength, 0);\n-\t\t\tif (errn == 0) {\n-\t\t\t\t\/* String *\/\n-\t\t\t\terrn = encodeString(stream, uri);\n-\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\/* after encoding string value is added to table *\/\n-\t\t\t\t\terrn = exiAddUri(&state->nameTablePrepopulated, &state->nameTableRuntime); \/*, namespaceURI->chars); *\/\n-\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\t*uriID = uriSize;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\t\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-static int _exiEncodeLocalNameHit(bitstream_t* stream, exi_state_t* state,\n-\t\tuint16_t uriID, uint16_t localNameID) {\n-\tuint16_t localNameSize;\n-\tuint16_t localNameCodingLength;\n-\n-\t\/* string value found in local partition *\/\n-\t\/* ==> string value is represented as zero (0) encoded as an *\/\n-\terrn = encodeUnsignedInteger32(stream, 0 );\n-\tif (errn == 0) {\n-\t\t\/* Unsigned Integer followed by an the compact identifier of the *\/\n-\t\t\/* string value as an n-bit unsigned integer n is log2 m and m is *\/\n-\t\t\/* the number of entries in the string table partition *\/\n-\t\terrn = exiGetLocalNameSize(&state->nameTablePrepopulated, &state->nameTableRuntime, uriID, &localNameSize);\n-\t\tif (errn == 0) {\n-\t\t\terrn = exiGetCodingLength(localNameSize, &localNameCodingLength);\n-\t\t\tif (errn == 0) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, localNameCodingLength, localNameID);\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-static int _exiEncodeLocalNameMiss(bitstream_t* stream, exi_state_t* state,\n-\t\texi_string_t* localName, uint16_t uriID, uint16_t* localNameID) {\n-\t\n-\n-\t\/* string value not found in local partition\n-\t * ==> string literal is encoded as a String\n-\t * with the length of the string incremented by one *\/\n-\n-\terrn = encodeUnsignedInteger32(stream, (uint32_t)(localName->len + 1));\n-\tif(errn == 0) {\n-\t\terrn = encodeCharacters(stream, localName->characters, localName->len);\n-\t\tif(errn == 0) {\n-\t\t\t\/* After encoding the string value, it is added to the string table *\/\n-\t\t\t\/* partition and assigned the next available compact identifier *\/\n-\t\t\terrn = exiAddLocalName(&state->nameTablePrepopulated, &state->nameTableRuntime, uriID, localNameID);\n-\t\t}\n-\t}\n-\t\n-\n-\treturn (errn);\n-}\n-\n-\n-\/* encode qname as hits *\/\n-static int _exiEncodeQNameHit(bitstream_t* stream, exi_state_t* state, uint16_t qnameID) {\n-\tuint16_t namespaceUriID, localNameID;\n-\n-\terrn = exiEXIforJSONGetEQName(state, qnameID, &namespaceUriID, &localNameID);\n-\tif(errn == 0) {\n-\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceUriID);\n-\t\tif(errn == 0) {\n-\t\t\terrn = _exiEncodeLocalNameHit(stream, state, namespaceUriID, localNameID);\n-\t\t}\n-\t}\n-\n-\treturn errn;\n-}\n-\n-static int _encodeAttributeXsiTypeContent(bitstream_t* stream, exi_state_t* state,\n-\t\texi_value_t* val) {\n-\n-\t\/* encode qname *\/\n-\terrn = _exiEncodeNamespaceUriHit(stream, state, val->eqname.namespaceURI);\n-\tif (errn == 0) {\n-\t\terrn = _exiEncodeLocalNameHit(stream, state, val->eqname.namespaceURI, val->eqname.localPart);\n-\t\tif (errn == 0) {\n-\t\t\t\/* handle xsi type cast *\/\n-\t\t\terrn = exi_EXIforJSON_HandleXsiType(state, &val->eqname);\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\/* SE(qname), qname known from event *\/\n-static int _exiEncodeStartElement(bitstream_t* stream, uint16_t nbits,\n-\t\tuint32_t val, exi_state_t* state, uint16_t qnameID, int16_t stackId,\n-\t\tint16_t newState) {\n-\t\/* event-code *\/\n-\terrn = encodeNBitUnsignedInteger(stream, nbits, val);\n-\tif (errn == 0) {\n-\t\t\/* move on *\/\n-\t\tstate->grammarStack[state->stackIndex] = stackId;\n-\t\t\/* push element on stack *\/\n-\t\terrn = (exi_EXIforJSON_PushStack(state, newState, qnameID));\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\/* SE(*), qname NOT known from event *\/\n-static int _exiEncodeStartElement2(bitstream_t* stream, uint16_t nbits,\n-\t\tuint32_t val, exi_state_t* state, uint16_t qnameID) {\n-\t\/* event-code *\/\n-\terrn = encodeNBitUnsignedInteger(stream, nbits, val);\n-\tif (errn == 0) {\n-\t\t\/* write qname *\/\n-\t\terrn = _exiEncodeQNameHit(stream, state, qnameID);\n-\t\tif(errn == 0) {\n-\t\t\t\/* move on if necessary *\/\n-\t\t\terrn = exi_EXIforJSON_MoveToElementContentRule(state);\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* push element on stack *\/\n-\t\t\t\terrn = exi_EXIforJSON_RetrieveAndPushGlobalGrammar(state, qnameID);\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* state) {\n-\t\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\tint16_t runtimeID;\n-\terrn = (EXI_ERROR_UNEXPECTED_END_ELEMENT);\n-\n-\tswitch (currentID) {\n-\n-\tdefault:\n-\t\tif (currentID < 0) {\n-\t\t\t\/* runtime grammars *\/\n-\t\t\truntimeID = (int16_t)((currentID+1)*(-1));\n-\n-\t\t\tif( exi_EXIforJSON_IsStartContent(currentID) ) {\n-\t\t\t\tif( state->runtimeGrammars[runtimeID].numberOfProductions == 0 ) {\n-\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 0);\n-\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\terrn = exi_EXIforJSON_LearnEndElement(state);\n-\t\t\t\t\t}\n-\t\t\t\t} else {\n-\t\t\t\t\t\/* no support for growing yet *\/\n-\t\t\t\t\terrn = (EXI_ERROR_UNEXPECTED_END_ELEMENT);\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\t\/* EndElement contains EE in any case *\/\n-\t\t\t\tif( state->runtimeGrammars[runtimeID].numberOfProductions == 1 ) {\n-\t\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\t} else {\n-\t\t\t\t\t\/* no support for growing yet *\/\n-\t\t\t\t\terrn = (EXI_ERROR_UNEXPECTED_END_ELEMENT);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tbreak;\n-\t}\n-\treturn errn;\n-\t\n-}\n-\n-static int _encode2ndLevelAttribute(bitstream_t* stream, exi_state_t* state, uint16_t qnameID,\n-\t\texi_value_t* val) {\n-\t\n-\tuint16_t namespaceURI;\n-\tuint16_t localPart;\n-\tint16_t currentID;\n-\n-\terrn = exiEXIforJSONGetEQName(state, qnameID, &namespaceURI, &localPart);\n-\tif (errn == 0) {\n-\t\tif (localPart == 1 && namespaceURI == 2) {\n-\t\t\t\/* xsi:type: profile on 2nd level *\/\n-\t\t\t\/* event code(s) *\/\n-\t\t\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_ATTRIBUTE_GENERIC_UNDECLARED);\n-\t\t\tif (errn == 0) {\n-\t\t\t\t\/* learn attribute ? *\/\n-\t\t\t\terrn = exi_EXIforJSON_LearnAttribute(state, namespaceURI, localPart);\n-\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\/* xsi:type as qname *\/\n-\t\t\t\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceURI);\n-\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\terrn = _exiEncodeLocalNameHit(stream, state, namespaceURI, localPart);\n-\t\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\t\t\/* content as qname *\/\n-\t\t\t\t\t\t\terrn = _encodeAttributeXsiTypeContent(stream, state, val);\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} else {\n-\t\t\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_ATTRIBUTE_GENERIC_UNDECLARED);\n-\t\t\tif (errn == 0) {\n-\t\t\t\t\/* learn attribute ? *\/\n-\t\t\t\terrn = exi_EXIforJSON_LearnAttribute(state, namespaceURI, localPart);\n-\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\/* qname *\/\n-\t\t\t\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceURI);\n-\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\terrn = _exiEncodeLocalNameHit(stream, state, namespaceURI, localPart);\n-\t\t\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\t\t\/* attribute value *\/\n-\t\t\t\t\t\t\tcurrentID = state->grammarStack[state->stackIndex];\n-\t\t\t\t\t\t\tif (currentID >= 0) {\n-\t\t\t\t\t\t\t\t\/* if schema-informed value type according global attribute *\/\n-\t\t\t\t\t\t\t\terrn = EXI_UNSUPPORTED_GLOBAL_ATTRIBUTE_VALUE_TYPE;\n-\t\t\t\t\t\t\t\tswitch(qnameID) {\n-\n-\t\t\t\t\t\t\t\tdefault:\n-\t\t\t\t\t\t\t\t\terrn = _exiValueToString(val);\n-\t\t\t\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\t\terrn = _exiValueToString(val);\n-\t\t\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-\t\n-}\n-\n-\n-int exiEXIforJSONEncodeListValue(bitstream_t* stream, exi_state_t* state, uint16_t qnameID, exi_value_t* val, exi_list_t lt) {\n-\n-\tswitch(lt.type) {\n-\tcase EXI_DATATYPE_BINARY_BASE64:\n-\tcase EXI_DATATYPE_BINARY_HEX:\n-\t\terrn = encodeBinary(stream, &val->binary);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_BOOLEAN:\n-\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_BOOLEAN_FACET:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, val->boolean ? 2 : 0);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_DECIMAL:\n-\t\terrn = encodeDecimal(stream, &val->decimal);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_FLOAT:\n-\t\terrn = encodeFloat(stream, &val->float_me);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_NBIT_UNSIGNED_INTEGER:\n-\t\terrn = EXI_UNSUPPORTED_LIST_VALUE_TYPE;\n-\t\tbreak;\n-\tcase EXI_DATATYPE_UNSIGNED_INTEGER:\n-\t\terrn = encodeUnsignedInteger(stream, &val->integer);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_INTEGER:\n-\t\terrn = encodeInteger(stream, &val->integer);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_DATETIME:\n-\t\terrn = encodeDateTime(stream, &val->datetime);\n-\t\tbreak;\n-\tcase EXI_DATATYPE_STRING:\n-\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\tbreak;\n-\tdefault:\n-\t\terrn = EXI_UNSUPPORTED_LIST_VALUE_TYPE;\n-\t\tbreak;\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-#ifndef __GNUC__\n-#pragma warning( disable : 4100 ) \/* warning unreferenced parameter 'stream' *\/\n-#endif \/* __GNUC__ *\/\n-int exiEXIforJSONEncodeStartDocument(bitstream_t* stream, exi_state_t* state) {\n-\terrn = 0;\n-\tswitch(state->grammarStack[state->stackIndex]) {\n-\tcase 0:\n-\t\t\/* move on *\/\n-\t\tstate->grammarStack[state->stackIndex] = 1;\n-\t\tbreak;\n-\tcase 44:\n-\t\t\/* move on *\/\n-\t\tstate->grammarStack[state->stackIndex] = 45;\n-\t\tbreak;\n-\n-\tdefault:\n-\t\terrn =(EXI_ERROR_UNEXPECTED_START_DOCUMENT);\n-\t\tbreak;\n-\t}\n-\treturn errn;\n-}\n-#ifndef __GNUC__\n-#pragma warning( default : 4100 ) \/* warning unreferenced parameter 'stream' *\/\n-#endif \/* __GNUC__ *\/\n-\n-\n-#ifndef __GNUC__\n-#pragma warning( disable : 4100 ) \/* warning unreferenced parameter 'stream' *\/\n-#endif \/* __GNUC__ *\/\n-int exiEXIforJSONEncodeEndDocument(bitstream_t* stream, exi_state_t* state) {\n-\tswitch(state->grammarStack[state->stackIndex]) {\n-\tcase 43:\n-\t\terrn = encodeFinish(stream);\n-\t\tbreak;\n-\tcase 45:\n-\t\terrn = encodeFinish(stream);\n-\t\tbreak;\n-\n-\tdefault:\n-\t\terrn =(EXI_ERROR_UNEXPECTED_END_DOCUMENT);\n-\t\tbreak;\n-\t}\n-\treturn errn;\n-}\n-#ifndef __GNUC__\n-#pragma warning( default : 4100 ) \/* warning unreferenced parameter 'stream' *\/\n-#endif \/* __GNUC__ *\/\n-\n-\n-int exiEXIforJSONInitEncoder(bitstream_t* stream, exi_state_t* state,\n-\t\texi_name_table_runtime_t runtimeTable, exi_value_table_t stringTable) {\n-#if EXI_OPTION_VALUE_PARTITION_CAPACITY != 0\n-#if EXI_OPTION_VALUE_MAX_LENGTH != 0\n-\tint i;\n-#endif \/* EXI_OPTION_VALUE_MAX_LENGTH != 0 *\/\n-#endif \/* EXI_OPTION_VALUE_PARTITION_CAPACITY != 0 *\/\n-\t\/* init grammar state *\/\n-\tstate->stackIndex = 0;\n-\tstate->grammarStack[0] = DOCUMENT;\n-\t\/* name tables *\/\n-\tstate->nameTablePrepopulated = exiEXIforJSONNameTablePrepopulated;\n-\tstate->nameTableRuntime = runtimeTable;\n-\t\/* next qname ID *\/\n-\tstate->nextQNameID = EXI_EXIforJSONNUMBER_OF_PREPOPULATED_QNAMES;\n-\t\/* string tables *\/\n-\tstate->stringTable = stringTable;\n-\tstate->stringTable.numberOfGlobalStrings = 0;\n-#if EXI_OPTION_VALUE_PARTITION_CAPACITY != 0\n-#if EXI_OPTION_VALUE_MAX_LENGTH != 0\n-\tfor(i=0; i<(state->stringTable.sizeLocalStrings); i++) {\n-\t\tstate->stringTable.numberOfLocalStrings[i] = 0;\n-\t}\n-#endif \/* EXI_OPTION_VALUE_MAX_LENGTH != 0 *\/\n-#endif \/* EXI_OPTION_VALUE_PARTITION_CAPACITY != 0 *\/\n-\n-\t\/* runtime grammars *\/\n-\tstate->numberOfRuntimeGrammars = 0;\n-\n-\t\/* Avoid warning: Unused declaration of variable 'name' *\/\n-\tbits = 0;\n-\n-\t\/* encode header *\/\n-\treturn (writeEXIHeader(stream));\n-}\n-\n-\n-\n-static int _encodeStartElementNS(bitstream_t* stream,\n-\t\texi_state_t* state, int* success) {\n-\t\/* int16_t currentID = state->grammarStack[state->stackIndex];*\/\n-\t\/* TODO NS *\/\n-\t*success = 0;\n-\treturn 0;\n-}\n-\n-\n-static int _encodeStartElementGeneric(bitstream_t* stream,\n-\t\texi_state_t* state, int* success) {\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\terrn = 0; \/* EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC; *\/\n-\t*success = 1;\n-\n-\tswitch (currentID) {\n-\tcase 1:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 7);\n-\t\tstate->grammarStack[state->stackIndex] = 43;\n-\t\tbreak;\n-\tcase 45:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 13);\n-\t\tstate->grammarStack[state->stackIndex] = 45;\n-\t\tbreak;\n-\tcase 46:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 5, 15);\n-\t\tstate->grammarStack[state->stackIndex] = 47;\n-\t\tbreak;\n-\tcase 47:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 13);\n-\t\tstate->grammarStack[state->stackIndex] = 47;\n-\t\tbreak;\n-\tcase 51:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 1);\n-\t\tstate->grammarStack[state->stackIndex] = 52;\n-\t\tbreak;\n-\tcase 52:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 0);\n-\t\tstate->grammarStack[state->stackIndex] = 52;\n-\t\tbreak;\n-\n-\tdefault:\n-\t\t\/* errn = EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC;*\/\n-\t\t*success = 0;\n-\t\tbreak;\n-\t}\n-\n-\treturn errn;\n-}\n-\n-\n-\n-int exiEXIforJSONEncodeStartElement(bitstream_t* stream, exi_state_t* state, uint16_t qnameID) {\n-\tuint16_t namespaceUriID, localNameID;\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\tint successSE1st;\n-\terrn = EXI_ERROR_UNEXPECTED_START_ELEMENT;\n-\n-\tswitch (currentID) {\n-\tcase 1:\n-\t\t\/* DocContent[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT_GENERIC] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 43, 2);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 43, 16);\n-\t\t\tbreak;\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 43, 3);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 43, 18);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 43, 14);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 43, 19);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 43, 10);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\t\/* DocContent[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT_GENERIC] *\/ \n-\t\t\terrn = _exiEncodeStartElement2(stream, 3, 7, state, qnameID);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 2:\n-\t\t\/* FirstStartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 9, 3);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 9, 2);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 9, 10);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 9, 14);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 9, 16);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 9, 18);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 9, 19);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 3:\n-\t\t\/* FirstStartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 6, 4);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 6, 7);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 6, 33);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 6, 35);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 6, 37);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 6, 39);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 6, 41);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 4:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 1, state, qnameID, 6, 4);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 2, state, qnameID, 6, 7);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 3, state, qnameID, 6, 33);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 4, state, qnameID, 6, 35);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 5, state, qnameID, 6, 37);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 6, state, qnameID, 6, 39);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 7, state, qnameID, 6, 41);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 5:\n-\t\t\/* StartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 6, 4);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 6, 7);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 6, 33);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 6, 35);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 6, 37);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 6, 39);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 6, 41);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 6:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 6, 4);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 6, 7);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 6, 33);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 6, 35);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 6, 37);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 6, 39);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 6, 41);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 7:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 1, state, qnameID, 9, 3);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 2, state, qnameID, 9, 2);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 3, state, qnameID, 9, 10);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 4, state, qnameID, 9, 14);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 5, state, qnameID, 9, 16);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 6, state, qnameID, 9, 18);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 7, state, qnameID, 9, 19);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 8:\n-\t\t\/* StartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 9, 3);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 9, 2);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 9, 10);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 9, 14);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 9, 16);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 9, 18);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 9, 19);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 9:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 9, 3);\n-\t\t\tbreak;\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 9, 2);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 9, 10);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 9, 14);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 9, 16);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 9, 18);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 9, 19);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 19:\n-\t\t\/* FirstStartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal)] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 11, 20);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 11, 22);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 11, 24);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 11, 26);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 11, 28);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 11, 30);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 32:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal)] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 11, 20);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 11, 22);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 11, 24);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 11, 26);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 11, 28);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 11, 30);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 41:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal)] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 11, 20);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 11, 22);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 11, 24);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 11, 26);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 11, 28);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 6, state, qnameID, 11, 30);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 42:\n-\t\t\/* StartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal)] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 0, state, qnameID, 11, 20);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 1, state, qnameID, 11, 22);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 2, state, qnameID, 11, 24);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 3, state, qnameID, 11, 26);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 4, state, qnameID, 11, 28);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 3, 5, state, qnameID, 11, 30);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 45:\n-\t\t\/* FragmentContent[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_DOCUMENT] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 0, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 1, state, qnameID, 45, 20);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 2, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 3, state, qnameID, 45, 26);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 4, state, qnameID, 45, 22);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 5, state, qnameID, 45, 30);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 6, state, qnameID, 45, 28);\n-\t\t\tbreak;\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 7, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 8, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 9, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 10, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 11, state, qnameID, 45, 46);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 12, state, qnameID, 45, 24);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\t\/* FragmentContent[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_DOCUMENT] *\/ \n-\t\t\terrn = _exiEncodeStartElement2(stream, 4, 13, state, qnameID);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 2, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 3, state, qnameID, 47, 20);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 4, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 5, state, qnameID, 47, 26);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 6, state, qnameID, 47, 22);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 7, state, qnameID, 47, 30);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 8, state, qnameID, 47, 28);\n-\t\t\tbreak;\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 9, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 10, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 11, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 12, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 13, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 5, 14, state, qnameID, 47, 24);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/ \n-\t\t\terrn = _exiEncodeStartElement2(stream, 5, 15, state, qnameID);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 47:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/ \n-\t\tswitch(qnameID) {\n-\t\tcase 53:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}array ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 0, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 55:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 1, state, qnameID, 47, 20);\n-\t\t\tbreak;\n-\t\tcase 56:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}boolean ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 2, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 58:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}date ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 3, state, qnameID, 47, 26);\n-\t\t\tbreak;\n-\t\tcase 59:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}dateTime ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 4, state, qnameID, 47, 22);\n-\t\t\tbreak;\n-\t\tcase 60:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}decimal ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 5, state, qnameID, 47, 30);\n-\t\t\tbreak;\n-\t\tcase 61:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}integer ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 6, state, qnameID, 47, 28);\n-\t\t\tbreak;\n-\t\tcase 62:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}map ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 7, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 64:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}null ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 8, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 66:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}number ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 9, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 68:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}other ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 10, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 70:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}string ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 11, state, qnameID, 47, 46);\n-\t\t\tbreak;\n-\t\tcase 72:\n-\t\t\t\/* SE( {http:\/\/www.w3.org\/2015\/EXI\/json}time ) *\/\n-\t\t\terrn = _exiEncodeStartElement(stream, 4, 12, state, qnameID, 47, 24);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/ \n-\t\t\terrn = _exiEncodeStartElement2(stream, 4, 13, state, qnameID);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\n-\tdefault:\n-\t\t\/* element qname not expected *\/\n-\t\t\n-\n-\t\t\/* TODO: try to find matching StartElement(NS:*) *\/\n-\n-\t\t\/* try SE(*) on first level *\/\n-\t\terrn = _encodeStartElementGeneric(stream, state, &successSE1st);\n-\t\tif(errn == 0) {\n-\t\t\tif(successSE1st) {\n-\t\t\t\t\/* Successful *\/\n-\t\t\t} else {\n-\t\t\t\t\/* For now: find 2nd level StartElement event *\/\n-\t\t\t\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_START_ELEMENT_GENERIC_UNDECLARED);\n-\t\t\t}\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* encode qname as hits *\/\n-\t\t\t\terrn = exiEXIforJSONGetEQName(state, qnameID, &namespaceUriID, &localNameID);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceUriID);\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\terrn = _exiEncodeLocalNameHit(stream, state, namespaceUriID, localNameID);\n-\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\/* if(!successSE1st) { *\/\n-\t\t\t\t\t\t\t\/* move on if necessary *\/\n-\t\t\t\t\t\t\terrn = exi_EXIforJSON_MoveToElementContentRule(state);\n-\t\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\t\/* push element on stack *\/\n-\t\t\t\t\t\t\t\terrn = exi_EXIforJSON_RetrieveAndPushGlobalGrammar(state, qnameID);\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t\t\/* } *\/\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\n-\t\tbreak;\n-\t\t\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-int exiEXIforJSONEncodeStartElementNS(bitstream_t* stream,\n-\t\texi_state_t* state, uint16_t namespaceUriID,\n-\t\texi_string_t* localName) {\n-\t\n-\tuint16_t qnameID;\n-\tuint16_t localNameID;\n-\tint successSeNS;\n-\tint successSe1stLevel;\n-\n-\terrn = _encodeStartElementNS(stream, state, &successSeNS);\n-\n-\tif(errn == 0) {\n-\t\tif(successSeNS) {\n-\t\t\t\/* TODO NS encoding *\/\n-\t\t\terrn = EXI_ERROR_UNEXPECTED_START_ELEMENT_NS;\n-\t\t} else {\n-\t\t\t\/* try SE(*) on first level *\/\n-\t\t\terrn = _encodeStartElementGeneric(stream, state, &successSe1stLevel);\n-\n-\t\t\tif(errn == 0) {\n-\t\t\t\tif(successSe1stLevel) {\n-\t\t\t\t\t\/* Note: grammar moved forward already *\/\n-\t\t\t\t} else {\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\/* try SE(*) on second level *\/\n-\t\t\t\t\t\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_START_ELEMENT_GENERIC_UNDECLARED);\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\/* encode qname *\/\n-\t\t\t\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceUriID);\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\terrn = _exiEncodeLocalNameMiss(stream, state, localName, namespaceUriID, &localNameID);\n-\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\tif(!successSe1stLevel) {\n-\t\t\t\t\t\t\t\t\/* update current rule --> element content rule (if not already) *\/\n-\t\t\t\t\t\t\t\terrn = exi_EXIforJSON_MoveToElementContentRule(state);\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\n-\t\tif(errn == 0) {\n-\t\t\t\/* increment qname ID *\/\n-\t\t\terrn = exiEXIforJSONAddEQName(state, &qnameID, namespaceUriID, localNameID);\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* retrieve global grammar(existing OR runtime) and push it stack *\/\n-\t\t\t\terrn = exi_EXIforJSON_RetrieveAndPushGlobalGrammar(state, qnameID);\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-\t\n-}\n-\n-\n-int exiEXIforJSONEncodeStartElementGeneric(bitstream_t* stream,\n-\t\texi_state_t* state, exi_string_t* namespaceUri,\n-\t\texi_string_t* localName) {\n-\n-\t\n-\tuint16_t namespaceUriID;\n-\tuint16_t localNameID;\n-\tuint16_t qnameID;\n-\tint successSE1st;\n-\t\n-\n-\terrn = EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC;\n-\n-\t\n-\t\/* try SE(*) on first level *\/\n-\terrn = _encodeStartElementGeneric(stream, state, &successSE1st);\n-\n-\tif(errn == 0) {\n-\t\tif(successSE1st) {\n-\t\t\t\/* Successful *\/\n-\t\t} else {\n-\t\t\t\/* For now: find 2nd level StartElement event *\/\n-\t\t\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_START_ELEMENT_GENERIC_UNDECLARED);\n-\t\t}\n-\n-\t\tif(errn == 0) {\n-\t\t\t\/* encode qname *\/\n-\t\t\terrn = _exiEncodeNamespaceMiss(stream, state, namespaceUri, &namespaceUriID);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = _exiEncodeLocalNameMiss(stream, state, localName, namespaceUriID, &localNameID);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\/* increment qname ID *\/\n-\t\t\t\t\terrn = exiEXIforJSONAddEQName(state, &qnameID, namespaceUriID, localNameID);\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\tif(!successSE1st) {\n-\t\t\t\t\t\t\t\/* update current rule --> element content rule (if not already) *\/\n-\t\t\t\t\t\t\terrn = exi_EXIforJSON_MoveToElementContentRule(state);\n-\t\t\t\t\t\t}\n-\n-\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\/* retrieve global grammar(existing OR runtime) and push it stack *\/\n-\t\t\t\t\t\t\terrn = exi_EXIforJSON_RetrieveAndPushGlobalGrammar(state, qnameID);\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t\n-\treturn (errn);\n-}\n-\n-\n-\n-int exiEXIforJSONEncodeEndElement(bitstream_t* stream, exi_state_t* state) {\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\tswitch (currentID) {\n-\tcase 39:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), END_ELEMENT] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\tbreak;\n-\tcase 47:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 14);\n-\t\tbreak;\n-\tcase 11:\n-\t\t\/* Element[END_ELEMENT] *\/\n-\tcase 18:\n-\t\t\/* FirstStartTag[END_ELEMENT] *\/\n-\tcase 40:\n-\t\t\/* StartTag[END_ELEMENT] *\/\n-\t\tbreak;\n-\tcase 2:\n-\t\t\/* FirstStartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 3:\n-\t\t\/* FirstStartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 5:\n-\t\t\/* StartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 6:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 8:\n-\t\t\/* StartTag[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 9:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 7);\n-\t\tbreak;\n-\tcase 48:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, END_ELEMENT] *\/\n-\tcase 51:\n-\t\t\/* FirstStartTag[ATTRIBUTE_GENERIC, START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 2);\n-\t\tbreak;\n-\tcase 4:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\tcase 7:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 8);\n-\t\tbreak;\n-\tcase 52:\n-\t\t\/* Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 1);\n-\t\tbreak;\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\terrn = encodeNBitUnsignedInteger(stream, 5, 16);\n-\t\tbreak;\n-\n-\tdefault:\n-\t\t\n-\t\terrn = _exiEncodeEndElementUndeclared(stream, state);\n-\t\tbreak;\n-\t\t\n-\t}\n-\n-\tif (errn == 0) {\n-\t\t\/* pop item *\/\n-\t\terrn = exi_EXIforJSON_PopStack(state);\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-int exiEXIforJSONEncodeCharacters(bitstream_t* stream, exi_state_t* state,\n-\t\texi_value_t* val) {\n-\tint16_t moveOnID = 0;\n-\tint deviantChars = 0;\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\n-\terrn = EXI_ERROR_UNEXPECTED_CHARACTERS;\n-\n-\tswitch (currentID) {\n-\tcase 37:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[BOOLEAN]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BOOLEAN) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\t\t}\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 47:\n-\t\t\/* Element[START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 4, 15);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t}\n-\t\t\tmoveOnID = 47;\n-\t\t}\n-\t\tbreak;\n-\tcase 31:\n-\t\t\/* Element[CHARACTERS[DECIMAL]] *\/\n-\t\tif (val->type == EXI_DATATYPE_DECIMAL) {\n-\t\t\terrn = encodeDecimal(stream, &val->decimal);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 20:\n-\t\t\/* FirstStartTag[CHARACTERS[BINARY_BASE64]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BINARY_BASE64) {\n-\t\t\terrn = encodeBinary(stream, &val->binary);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 16:\n-\t\t\/* FirstStartTag[CHARACTERS[BOOLEAN]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BOOLEAN) {\n-\t\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 53:\n-\t\t\/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_NBIT_UNSIGNED_INTEGER) {\n-\t\t\terrn = _encodeNBitIntegerValue(stream, &val->integer, 8, -128);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 54:\n-\t\t\/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_NBIT_UNSIGNED_INTEGER) {\n-\t\t\terrn = _encodeNBitIntegerValue(stream, &val->integer, 8, -128);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 23:\n-\tcase 25:\n-\tcase 27:\n-\tcase 56:\n-\tcase 58:\n-\tcase 60:\n-\tcase 62:\n-\tcase 64:\n-\t\t\/* Element[CHARACTERS[DATETIME]] *\/\n-\t\tif (val->type == EXI_DATATYPE_DATETIME) {\n-\t\t\terrn = encodeDateTime(stream, &val->datetime);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 36:\n-\t\t\/* StartTag[CHARACTERS[FLOAT]] *\/\n-\t\tif (val->type == EXI_DATATYPE_FLOAT) {\n-\t\t\terrn = encodeFloat(stream, &val->float_me);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 69:\n-\t\t\/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_NBIT_UNSIGNED_INTEGER) {\n-\t\t\terrn = _encodeNBitIntegerValue(stream, &val->integer, 8, 0);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 33:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t}\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 49:\n-\t\t\/* FirstStartTag[CHARACTERS[LIST]] *\/\n-\t\tif (val->type == EXI_DATATYPE_LIST) {\n-\t\t\terrn = encodeUnsignedInteger32(stream, val->list.len);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 13:\n-\t\t\/* Element[CHARACTERS[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 67:\n-\t\t\/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_UNSIGNED_INTEGER) {\n-\t\t\terrn = encodeUnsignedInteger(stream, &val->integer);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 68:\n-\t\t\/* Element[CHARACTERS[UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_UNSIGNED_INTEGER) {\n-\t\t\terrn = encodeUnsignedInteger(stream, &val->integer);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 50:\n-\t\t\/* Element[CHARACTERS[LIST]] *\/\n-\t\tif (val->type == EXI_DATATYPE_LIST) {\n-\t\t\terrn = encodeUnsignedInteger32(stream, val->list.len);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 66:\n-\t\t\/* Element[CHARACTERS[BINARY_HEX]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BINARY_HEX) {\n-\t\t\terrn = encodeBinary(stream, &val->binary);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 17:\n-\t\t\/* Element[CHARACTERS[BOOLEAN]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BOOLEAN) {\n-\t\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 30:\n-\t\t\/* FirstStartTag[CHARACTERS[DECIMAL]] *\/\n-\t\tif (val->type == EXI_DATATYPE_DECIMAL) {\n-\t\t\terrn = encodeDecimal(stream, &val->decimal);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 52:\n-\t\t\/* Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 2);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t}\n-\t\t\tmoveOnID = 52;\n-\t\t}\n-\t\tbreak;\n-\tcase 70:\n-\t\t\/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_NBIT_UNSIGNED_INTEGER) {\n-\t\t\terrn = _encodeNBitIntegerValue(stream, &val->integer, 8, 0);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 21:\n-\t\t\/* Element[CHARACTERS[BINARY_BASE64]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BINARY_BASE64) {\n-\t\t\terrn = encodeBinary(stream, &val->binary);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 65:\n-\t\t\/* FirstStartTag[CHARACTERS[BINARY_HEX]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BINARY_HEX) {\n-\t\t\terrn = encodeBinary(stream, &val->binary);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 15:\n-\t\t\/* Element[CHARACTERS[FLOAT]] *\/\n-\t\tif (val->type == EXI_DATATYPE_FLOAT) {\n-\t\t\terrn = encodeFloat(stream, &val->float_me);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 51:\n-\t\t\/* FirstStartTag[ATTRIBUTE_GENERIC, START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 3);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t}\n-\t\t\tmoveOnID = 52;\n-\t\t}\n-\t\tbreak;\n-\tcase 34:\n-\t\t\/* StartTag[CHARACTERS[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 22:\n-\tcase 24:\n-\tcase 26:\n-\tcase 55:\n-\tcase 57:\n-\tcase 59:\n-\tcase 61:\n-\tcase 63:\n-\t\t\/* FirstStartTag[CHARACTERS[DATETIME]] *\/\n-\t\tif (val->type == EXI_DATATYPE_DATETIME) {\n-\t\t\terrn = encodeDateTime(stream, &val->datetime);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 28:\n-\t\t\/* FirstStartTag[CHARACTERS[INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_INTEGER) {\n-\t\t\terrn = encodeInteger(stream, &val->integer);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 5, 17);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t}\n-\t\t\tmoveOnID = 47;\n-\t\t}\n-\t\tbreak;\n-\tcase 14:\n-\t\t\/* FirstStartTag[CHARACTERS[FLOAT]] *\/\n-\t\tif (val->type == EXI_DATATYPE_FLOAT) {\n-\t\t\terrn = encodeFloat(stream, &val->float_me);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 35:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[FLOAT]] *\/\n-\t\tif (val->type == EXI_DATATYPE_FLOAT) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t\tif(errn == 0) {\n-\t\t\t\terrn = encodeFloat(stream, &val->float_me);\n-\t\t\t}\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 38:\n-\t\t\/* StartTag[CHARACTERS[BOOLEAN]] *\/\n-\t\tif (val->type == EXI_DATATYPE_BOOLEAN) {\n-\t\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 10:\n-\t\t\/* FirstStartTag[CHARACTERS[STRING]] *\/\n-\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\tcase 29:\n-\t\t\/* Element[CHARACTERS[INTEGER]] *\/\n-\t\tif (val->type == EXI_DATATYPE_INTEGER) {\n-\t\t\terrn = encodeInteger(stream, &val->integer);\n-\t\t\tmoveOnID = 11;\n-\t\t}\n-\t\tbreak;\n-\n-\tdefault:\n-\t\terrn = (EXI_ERROR_UNEXPECTED_CHARACTERS);\n-\t\tbreak;\n-\t}\n-\n-\tif(errn == 0) {\n-\t\tif (currentID < 0) {\n-\t\t\t\/* TODO runtime rules *\/\n-\t\t\terrn = EXI_ERROR_UNEXPECTED_CHARACTERS;\n-\t\t} else if (deviantChars) {\n-\t\t\t\n-\t\t\t\/* convert typed value to string for EXI encoding *\/\n-\t\t\terrn = _exiValueToString(val);\n-\t\t\tif (errn == 0) {\n-\t\t\t\t\/* undeclared CH event code already written *\/\n-\t\t\t\t\/* encode deviant value *\/\n-\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), state->elementStack[state->stackIndex], &val->str);\n-\t\t\t\tif (errn == 0) {\n-\t\t\t\t\t\/* move to element content rule if not already *\/\n-\t\t\t\t\terrn = exi_EXIforJSON_MoveToElementContentRule(state);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\t\n-\t\t} else {\n-\t\t\t\/* move on *\/\n-\t\t\tstate->grammarStack[state->stackIndex] = moveOnID;\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-static int _encodeAttributeGeneric(bitstream_t* stream,\n-\t\texi_state_t* state, int* success) {\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\terrn = 0; \/* EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC; *\/\n-\t*success = 1;\n-\n-\tswitch (currentID) {\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tencodeNBitUnsignedInteger(stream, 5, 1);\n-\t\tbreak;\n-\tcase 48:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, END_ELEMENT] *\/\n-\t\tencodeNBitUnsignedInteger(stream, 2, 1);\n-\t\tbreak;\n-\tcase 51:\n-\t\t\/* FirstStartTag[ATTRIBUTE_GENERIC, START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tencodeNBitUnsignedInteger(stream, 2, 0);\n-\t\tbreak;\n-\n-\tdefault:\n-\t\t*success = 0;\n-\t\tbreak;\n-\t}\n-\n-\treturn errn;\n-}\n-\n-\n-int exiEXIforJSONEncodeAttribute(bitstream_t* stream, exi_state_t* state, uint16_t qnameID,\n-\t\texi_value_t* val) {\n-\tint16_t moveOnID = 0;\n-\tint16_t currentID = state->grammarStack[state->stackIndex];\n-\tint successAT1st;\n-\terrn = EXI_ERROR_UNEXPECTED_ATTRIBUTE;\n-\n-\tswitch (currentID) {\n-\tcase 4:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 5;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 4, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 7:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), END_ELEMENT] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 8;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 4, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 33:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[STRING]] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 34;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 35:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[FLOAT]] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 36;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 37:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), CHARACTERS[BOOLEAN]] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 38;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 39:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), END_ELEMENT] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 40;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 41:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal)] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 42;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 3, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 46:\n-\t\t\/* First(xsi:type)(xsi:nil)StartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}array), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}base64Binary), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}boolean), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}date), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}dateTime), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}decimal), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}integer), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}map), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}null), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}number), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}other), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}string), START_ELEMENT({http:\/\/www.w3.org\/2015\/EXI\/json}time), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 46;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 5, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase 48:\n-\t\t\/* FirstStartTag[ATTRIBUTE[STRING](key), ATTRIBUTE_GENERIC, END_ELEMENT] *\/\n-\t\tswitch(qnameID) {\n-\t\tcase 0:\n-\t\t\tmoveOnID = 48;\n-\t\t\tif (val->type == EXI_DATATYPE_STRING) {\n-\t\t\t\terrn = encodeNBitUnsignedInteger(stream, 2, 0);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\n-\t}\n-\n-\t\/* no expected attribute *\/\n-\tif (currentID < 0) {\n-\t\t\/* runtime element *\/\n-\t\terrn = _encode2ndLevelAttribute(stream, state, qnameID, val);\n-\t} else {\n-\n-\n-\t\tif(moveOnID == 0) {\n-\t\t\t\/* no action yet *\/\n-\n-\t\t\t\/* try AT(*) on first level *\/\n-\t\t\terrn = _encodeAttributeGeneric(stream, state, &successAT1st);\n-\t\t\tif(errn == 0) {\n-\t\t\t\tif(successAT1st) {\n-\t\t\t\t\t\/* Successful *\/\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\/* encode qname as hits *\/\n-\t\t\t\t\t\t_exiEncodeQNameHit(stream, state, qnameID);\n-\t\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\t\t\/* TODO global attribute datatype *\/\n-\t\t\t\t\t\t\tswitch(val->type) {\n-\t\t\t\t\t\t\tcase EXI_DATATYPE_STRING:\n-\t\t\t\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\tcase EXI_DATATYPE_INTEGER:\n-\t\t\t\t\t\t\t\terrn = encodeInteger(stream, &val->integer);\n-\t\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\tcase EXI_DATATYPE_UNSIGNED_INTEGER:\n-\t\t\t\t\t\t\t\terrn = encodeUnsignedInteger(stream, &val->integer);\n-\t\t\t\t\t\t\t\tbreak;\n-\t\t\t\t\t\t\tdefault:\n-\t\t\t\t\t\t\t\terrn = EXI_UNSUPPORTED_DATATYPE;\n-\t\t\t\t\t\t\t}\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t} else {\n-#if EXI_OPTION_STRICT != 0\n-\t\t\t\t\t\/* no 2nd level events in strict mode for schema-informed grammars *\/\n-\t\t\t\t\terrn = EXI_ERROR_UNEXPECTED_ATTRIBUTE;\n-#else \/* EXI_EXIforJSONSTRICT != 0 *\/\n-\t\t\t\t\terrn = _encode2ndLevelAttribute(stream, state, qnameID, val);\n-#endif \/* EXI_EXIforJSONSTRICT != 0 *\/\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} else {\n-\t\t\tstate->grammarStack[state->stackIndex] = moveOnID;\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-int exiEXIforJSONEncodeAttributeNS(bitstream_t* stream,\n-\t\texi_state_t* state, uint16_t namespaceUriID,\n-\t\texi_string_t* localName, exi_value_t* val) {\n-\t\n-\tuint16_t qnameID;\n-\tuint16_t localNameID;\n-\t\n-\n-\terrn = EXI_ERROR_UNEXPECTED_ATTRIBUTE_NS;\n-\n-\t\n-\t\/* TODO: try to find matching Attribute(NS:*) or Attribute(*) *\/\n-\n-\t\/* For now: find 2nd level StartElement event *\/\n-\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_ATTRIBUTE_GENERIC_UNDECLARED);\n-\tif(errn == 0) {\n-\t\t\/* encode qname *\/\n-\t\terrn = _exiEncodeNamespaceUriHit(stream, state, namespaceUriID);\n-\t\tif(errn == 0) {\n-\t\t\terrn = _exiEncodeLocalNameMiss(stream, state, localName, namespaceUriID, &localNameID);\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* increment qname ID *\/\n-\t\t\t\terrn = exiEXIforJSONAddEQName(state, &qnameID, namespaceUriID, localNameID);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\/* Note: we do not need to move forward in grammars *\/\n-\n-\t\t\t\t\t\/* TODO global attribute and its type *\/\n-\t\t\t\t\t\/* content as string *\/\n-\t\t\t\t\t\/* TODO xsi:type and xsi:boolean ?*\/\n-\t\t\t\t\terrn = _exiValueToString(val);\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t\n-\n-\treturn (errn);\n-}\n-\n-int exiEXIforJSONEncodeAttributeGeneric(bitstream_t* stream,\n-\t\texi_state_t* state, exi_string_t* namespaceUri,\n-\t\texi_string_t* localName, exi_value_t* val) {\n-\t\n-\tuint16_t namespaceUriID;\n-\tuint16_t localNameID;\n-\tuint16_t qnameID;\n-\t\n-\n-\terrn = EXI_ERROR_UNEXPECTED_ATTRIBUTE_GENERIC_UNDECLARED;\n-\n-\t\n-\t\/* TODO: try to find matching Attribute(*) *\/\n-\n-\t\/* For now: find 2nd level StartElement event *\/\n-\terrn = _exiEncodeEventCode2(stream, state, EXI_EVENT_ATTRIBUTE_GENERIC_UNDECLARED);\n-\tif(errn == 0) {\n-\t\t\/* encode qname *\/\n-\t\terrn = _exiEncodeNamespaceMiss(stream, state, namespaceUri, &namespaceUriID);\n-\t\tif(errn == 0) {\n-\t\t\terrn= _exiEncodeLocalNameMiss(stream, state, localName, namespaceUriID, &localNameID);\n-\t\t\tif(errn == 0) {\n-\t\t\t\t\/* increment qname ID *\/\n-\t\t\t\terrn = exiEXIforJSONAddEQName(state, &qnameID, namespaceUriID, localNameID);\n-\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\/* Note: we do not need to move forward in grammars *\/\n-\n-\t\t\t\t\t\/* TODO global attribute and its type *\/\n-\t\t\t\t\t\/* content as string *\/\n-\t\t\t\t\t\/* TODO xsi:type and xsi:boolean ?*\/\n-\t\t\t\t\terrn = _exiValueToString(val);\n-\t\t\t\t\tif(errn == 0) {\n-\t\t\t\t\t\terrn = encodeStringValue(stream, &(state->stringTable), qnameID, &val->str);\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\n-\t\n-\n-\treturn (errn);\n-}\n-\n-\n-int exiEXIforJSONEncodeAttributeXsiNil(bitstream_t* stream, exi_state_t* state,\n-\t\texi_value_t* val) {\n-\n-\tswitch (state->grammarStack[state->stackIndex]) {\n-\tcase 46:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 5, 18);\n-\t\tif(errn == 0) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 1);\n-\t\t}\n-\t\tbreak;\n-\n-\t}\n-\n-\tif (errn == 0) {\n-\t\terrn = encodeBoolean(stream, val->boolean);\n-\t\tif (errn == 0 && val->boolean) {\n-\t\t\t\/* handle xsi:nil == true *\/\n-\t\t\t errn = exi_EXIforJSON_HandleXsiNilTrue(state);\n-\t\t}\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-int exiEXIforJSONEncodeAttributeXsiType(bitstream_t* stream, exi_state_t* state,\n-\t\texi_value_t* val) {\n-\t\/* encode xsi:type event code *\/\n-\tswitch (state->grammarStack[state->stackIndex]) {\n-\tcase 2:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 8);\n-\t\tbreak;\n-\tcase 3:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 8);\n-\t\tbreak;\n-\tcase 4:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 9);\n-\t\tbreak;\n-\tcase 7:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 4, 9);\n-\t\tbreak;\n-\tcase 10:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 14:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 16:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 18:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 19:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 6);\n-\t\tbreak;\n-\tcase 20:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 22:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 24:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 26:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 28:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 30:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 33:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 1, 2);\n-\t\tbreak;\n-\tcase 35:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 1, 2);\n-\t\tbreak;\n-\tcase 37:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 1, 2);\n-\t\tbreak;\n-\tcase 39:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 1, 2);\n-\t\tbreak;\n-\tcase 41:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 3, 7);\n-\t\tbreak;\n-\tcase 46:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 5, 18);\n-\t\tif(errn == 0) {\n-\t\t\terrn = encodeNBitUnsignedInteger(stream, 1, 0);\n-\t\t}\n-\t\tbreak;\n-\tcase 48:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 3);\n-\t\tbreak;\n-\tcase 49:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 51:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 2, 4);\n-\t\tbreak;\n-\tcase 53:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 55:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 57:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 59:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 61:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 63:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 65:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 67:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\tcase 69:\n-\t\terrn = encodeNBitUnsignedInteger(stream, 0, 1);\n-\t\tbreak;\n-\n-\tdefault:\n-\t\terrn = (EXI_ERROR_UNEXPECTED_ATTRIBUTE_XSI_TYPE);\n-\t\tbreak;\n-\t}\n-\tif (errn == 0) {\n-\t\t\/* encode qname *\/\n-\t\terrn = _encodeAttributeXsiTypeContent(stream, state, val);\n-\t}\n-\n-\treturn (errn);\n-}\n-\n-\n-\n-\n-#endif\n-\n"} {"commit":"e6a80b345c94bec503467bc8917064421bd29e96","subject":"target: msm8992: Fix restart reason address","message":"target: msm8992: Fix restart reason address\n\nUse correct restart reason address when issuing reboot on 8992.\n\nChange-Id: Ib54d3ae64bab34e1082bb78165b8ad64892e9346\n","repos":"Foxda-Tech\/polaris-bootable-bootloader-lk,Foxda-Tech\/polaris-bootable-bootloader-lk,efidroid\/lk,efidroid\/lk,Foxda-Tech\/polaris-bootable-bootloader-lk,Foxda-Tech\/polaris-bootable-bootloader-lk,efidroid\/lk,efidroid\/lk,Foxda-Tech\/polaris-bootable-bootloader-lk,efidroid\/lk","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- target\/msm8994\/init.c\n+++ target\/msm8994\/init.c\n@@ -446,9 +446,15 @@\n void reboot_device(unsigned reboot_reason)\n {\n \tuint8_t reset_type = 0;\n+\tuint32_t restart_reason_addr;\n+\n+\tif (platform_is_msm8994())\n+\t\trestart_reason_addr = RESTART_REASON_ADDR;\n+\telse\n+\t\trestart_reason_addr = RESTART_REASON_ADDR2;\n \n \t\/* Write the reboot reason *\/\n-\twritel(reboot_reason, RESTART_REASON_ADDR);\n+\twritel(reboot_reason, restart_reason_addr);\n \n \tif(reboot_reason == FASTBOOT_MODE)\n \t\treset_type = PON_PSHOLD_WARM_RESET;\n"} {"commit":"51c47769f8a3a451e1d54852280046472fb65757","subject":"Restore the correct handling of the ACK flag at read completion.","message":"Restore the correct handling of the ACK flag at read completion.\n","repos":"PX4\/Firmware,dagar\/Firmware,darknight-007\/Firmware,mje-nz\/PX4-Firmware,dagar\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,dagar\/Firmware,acfloria\/Firmware,PX4\/Firmware,krbeverx\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,darknight-007\/Firmware,Aerotenna\/Firmware,krbeverx\/Firmware,PX4\/Firmware,mje-nz\/PX4-Firmware,krbeverx\/Firmware,mcgill-robotics\/Firmware,dagar\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,mcgill-robotics\/Firmware,PX4\/Firmware,acfloria\/Firmware,mcgill-robotics\/Firmware,jlecoeur\/Firmware,jlecoeur\/Firmware,mcgill-robotics\/Firmware,mje-nz\/PX4-Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,krbeverx\/Firmware,acfloria\/Firmware,dagar\/Firmware,mcgill-robotics\/Firmware,krbeverx\/Firmware,jlecoeur\/Firmware,dagar\/Firmware,darknight-007\/Firmware,mcgill-robotics\/Firmware,darknight-007\/Firmware,Aerotenna\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,mje-nz\/PX4-Firmware,mcgill-robotics\/Firmware,PX4\/Firmware,dagar\/Firmware,jlecoeur\/Firmware,Aerotenna\/Firmware,Aerotenna\/Firmware,acfloria\/Firmware,mje-nz\/PX4-Firmware,jlecoeur\/Firmware,darknight-007\/Firmware,acfloria\/Firmware,krbeverx\/Firmware,Aerotenna\/Firmware,PX4\/Firmware,acfloria\/Firmware","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- nuttx\/arch\/arm\/src\/stm32\/stm32_i2c.c\n+++ nuttx\/arch\/arm\/src\/stm32\/stm32_i2c.c\n@@ -1225,11 +1225,11 @@\n \n \/* Disable acknowledge when last byte is to be received *\/\n \n+ priv->dcnt--;\n if (priv->dcnt == 1)\n {\n stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, 0); \n }\n- priv->dcnt--;\n \n #ifdef CONFIG_I2C_POLLED\n irqrestore(state);\n"} {"commit":"3762630f27d6cba9d3a3f498213ee4c46bf17c8d","subject":"RL78\/IAR port - Allow the end user to define their own tick interrupt configuration by defining configSETUP_TIMER_INTERRUPT().","message":"RL78\/IAR port - Allow the end user to define their own tick interrupt configuration by defining configSETUP_TIMER_INTERRUPT().\n","repos":"FreeRTOS\/FreeRTOS-Kernel,FreeRTOS\/FreeRTOS-Kernel","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- FreeRTOS\/Source\/portable\/IAR\/RL78\/port.c\n+++ FreeRTOS\/Source\/portable\/IAR\/RL78\/port.c\n@@ -111,9 +111,17 @@\n \/*-----------------------------------------------------------*\/\r\n \r\n \/*\r\n- * Sets up the periodic ISR used for the RTOS tick.\r\n+ * Sets up the periodic ISR used for the RTOS tick using the interval timer.\r\n+ * The application writer can define configSETUP_TIMER_INTERRUPT() (in\r\n+ * FreeRTOSConfig.h) such that their own tick interrupt configuration is used\r\n+ * in place of prvSetupTimerInterrupt().\r\n *\/\r\n static void prvSetupTimerInterrupt( void );\r\n+#ifndef configSETUP_TIMER_INTERRUPT\r\n+\t\/* The user has not provided their own tick interrupt configuration so use\r\n+ the definition in this file (which uses the interval timer). *\/\r\n+\t#define configSETUP_TIMER_INTERRUPT() prvSetupTimerInterrupt()\r\n+#endif \/* configSETUP_TIMER_INTERRUPT *\/\r\n \r\n \/*\r\n * Defined in portasm.s87, this function starts the scheduler by loading the\r\n@@ -200,7 +208,7 @@\n \tfirst starts. *\/\r\n \t*pxTopOfStack = ( portSTACK_TYPE ) portNO_CRITICAL_SECTION_NESTING;\r\n \r\n-\t\/* Return a pointer to the top of the stack that has beene generated so it\r\n+\t\/* Return a pointer to the top of the stack that has been generated so it\r\n \tcan\tbe stored in the task control block for the task. *\/\r\n \treturn pxTopOfStack;\r\n }\r\n@@ -210,20 +218,25 @@\n {\r\n \t\/* Setup the hardware to generate the tick. Interrupts are disabled when\r\n \tthis function is called. *\/\r\n-\tprvSetupTimerInterrupt();\r\n+\tconfigSETUP_TIMER_INTERRUPT();\r\n \r\n \t\/* Restore the context of the first task that is going to run. *\/\r\n \tvPortStartFirstTask();\r\n \r\n-\t\/* Execution should not reach here as the tasks are now running! *\/\r\n+\t\/* Execution should not reach here as the tasks are now running!\r\n+\tprvSetupTimerInterrupt() is called here to prevent the compiler outputting\r\n+\ta warning about a statically declared function not being referenced in the\r\n+\tcase that the application writer has provided their own tick interrupt\r\n+\tconfiguration routine (and defined configSETUP_TIMER_INTERRUPT() such that\r\n+\ttheir own routine will be called in place of prvSetupTimerInterrupt()). *\/\r\n+\tprvSetupTimerInterrupt();\r\n \treturn pdTRUE;\r\n }\r\n \/*-----------------------------------------------------------*\/\r\n \r\n void vPortEndScheduler( void )\r\n {\r\n-\t\/* It is unlikely that the RL78\/G13 port will get stopped. If required simply\r\n-\tdisable the tick interrupt here. *\/\r\n+\t\/* It is unlikely that the RL78 port will get stopped. *\/\r\n }\r\n \/*-----------------------------------------------------------*\/\r\n \r\n"} {"commit":"f56f80482a223e1ef0f039f25a609f3965c8fad3","subject":"feat: add assignment to optional","message":"feat: add assignment to optional\n","repos":"undisbeliever\/untech-editor,undisbeliever\/untech-editor","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/models\/common\/optional.h\n+++ src\/models\/common\/optional.h\n@@ -46,6 +46,13 @@\n }\n }\n \n+ inline constexpr optional& operator=(const T& v)\n+ {\n+ _value = v;\n+ _exists = true;\n+ return *this;\n+ }\n+\n private:\n T _value;\n bool _exists;\n"} {"commit":"177344128b19c946b5661e4f7bbe5b29053fd6c4","subject":"data\/range_ptr: error check policy","message":"data\/range_ptr: error check policy\n","repos":"cbiffle\/etl,cbiffle\/etl,cbiffle\/etl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- data\/range_ptr.h\n+++ data\/range_ptr.h\n@@ -8,6 +8,9 @@\n \n namespace etl {\n namespace data {\n+\n+struct LaxRangeCheckPolicy;\n+\n \n \/*\n * A pointer to a bounded, contiguous range of values.\n@@ -36,7 +39,7 @@\n * range can be *shrunk* using pop_front or slice, but never *grown* (except by\n * assignment from a larger RangePtr).\n *\/\n-template <typename E>\n+template <typename E, typename Policy = LaxRangeCheckPolicy>\n class RangePtr {\n public:\n \/*\n@@ -109,24 +112,28 @@\n ETL_INLINE constexpr E *base() { return _base; }\n \n \/*\n- * UNSAFE array accessor.\n+ * Array accessor.\n *\/\n ETL_INLINE constexpr E &operator[](etl::common::Size index) const {\n- return _base[index];\n+ return _base[Policy::check_index(index, _count)];\n }\n \n- ETL_INLINE RangePtr slice(etl::common::Size start, etl::common::Size end) {\n- \/\/ TODO(cbiffle): handling policy\n- if (start > _count) return RangePtr();\n- return RangePtr(&_base[start], ::etl::common::min(_count, end) - start);\n+ ETL_INLINE constexpr RangePtr slice(etl::common::Size start,\n+ etl::common::Size end) {\n+ return RangePtr(&_base[Policy::check_slice_start(start, end, _count)],\n+ Policy::check_slice_end(start, end, _count));\n }\n \n- ETL_INLINE RangePtr tail_from(etl::common::Size start) {\n+ ETL_INLINE constexpr RangePtr tail_from(etl::common::Size start) {\n return slice(start, _count - start);\n }\n \n- ETL_INLINE RangePtr tail() {\n+ ETL_INLINE constexpr RangePtr tail() {\n return tail_from(1);\n+ }\n+\n+ ETL_INLINE constexpr RangePtr first(etl::common::Size count) {\n+ return slice(0, count);\n }\n \n bool contents_equal(RangePtr other) {\n@@ -155,6 +162,29 @@\n etl::common::Size _count;\n };\n \n+\/*\n+ * This RangePtr checking policy will tolerate *anything.* It is dangerous,\n+ * but efficient.\n+ *\/\n+struct LaxRangeCheckPolicy {\n+ static constexpr etl::common::Size check_index(etl::common::Size index,\n+ etl::common::Size) {\n+ return index;\n+ }\n+\n+ static constexpr etl::common::Size check_slice_start(etl::common::Size start,\n+ etl::common::Size,\n+ etl::common::Size) {\n+ return start;\n+ }\n+\n+ static constexpr etl::common::Size check_slice_end(etl::common::Size start,\n+ etl::common::Size end,\n+ etl::common::Size) {\n+ return end - start;\n+ }\n+};\n+\n } \/\/ namespace data\n } \/\/ namespace etl\n \n"} {"commit":"ff9cfce7ec2ae06df4ac413cfde3bfd7ae503677","subject":"Add some fixes to the Linux version of criticalsection.h Review URL: http:\/\/codereview.chromium.org\/243095","message":"Add some fixes to the Linux version of criticalsection.h\nReview URL: http:\/\/codereview.chromium.org\/243095\n\ngit-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@28122 0039d316-1c4b-4281-b951-d872f2087c98\n","repos":"keishi\/chromium,M4sse\/chromium.src,Pluto-tv\/chromium-crosswalk,Chilledheart\/chromium,axinging\/chromium-crosswalk,ChromiumWebApps\/chromium,hgl888\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,Just-D\/chromium-1,mogoweb\/chromium-crosswalk,markYoungH\/chromium.src,M4sse\/chromium.src,timopulkkinen\/BubbleFish,bright-sparks\/chromium-spacewalk,junmin-zhu\/chromium-rivertrail,TheTypoMaster\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,crosswalk-project\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,Just-D\/chromium-1,pozdnyakov\/chromium-crosswalk,hgl888\/chromium-crosswalk,Chilledheart\/chromium,M4sse\/chromium.src,ltilve\/chromium,crosswalk-project\/chromium-crosswalk-efl,hujiajie\/pa-chromium,jaruba\/chromium.src,timopulkkinen\/BubbleFish,krieger-od\/nwjs_chromium.src,hgl888\/chromium-crosswalk-efl,rogerwang\/chromium,dushu1203\/chromium.src,PeterWangIntel\/chromium-crosswalk,markYoungH\/chromium.src,krieger-od\/nwjs_chromium.src,mohamed--abdel-maksoud\/chromium.src,axinging\/chromium-crosswalk,rogerwang\/chromium,patrickm\/chromium.src,Just-D\/chromium-1,Jonekee\/chromium.src,dednal\/chromium.src,ltilve\/chromium,pozdnyakov\/chromium-crosswalk,littlstar\/chromium.src,Pluto-tv\/chromium-crosswalk,dednal\/chromium.src,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,fujunwei\/chromium-crosswalk,hujiajie\/pa-chromium,anirudhSK\/chromium,robclark\/chromium,axinging\/chromium-crosswalk,hujiajie\/pa-chromium,axinging\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,zcbenz\/cefode-chromium,rogerwang\/chromium,Jonekee\/chromium.src,chuan9\/chromium-crosswalk,Jonekee\/chromium.src,littlstar\/chromium.src,mogoweb\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,ChromiumWebApps\/chromium,dushu1203\/chromium.src,junmin-zhu\/chromium-rivertrail,ltilve\/chromium,ondra-novak\/chromium.src,jaruba\/chromium.src,jaruba\/chromium.src,keishi\/chromium,jaruba\/chromium.src,jaruba\/chromium.src,bright-sparks\/chromium-spacewalk,krieger-od\/nwjs_chromium.src,zcbenz\/cefode-chromium,hgl888\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,TheTypoMaster\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,littlstar\/chromium.src,crosswalk-project\/chromium-crosswalk-efl,Fireblend\/chromium-crosswalk,patrickm\/chromium.src,nacl-webkit\/chrome_deps,hgl888\/chromium-crosswalk-efl,mohamed--abdel-maksoud\/chromium.src,rogerwang\/chromium,bright-sparks\/chromium-spacewalk,anirudhSK\/chromium,zcbenz\/cefode-chromium,littlstar\/chromium.src,hgl888\/chromium-crosswalk,ChromiumWebApps\/chromium,jaruba\/chromium.src,dednal\/chromium.src,nacl-webkit\/chrome_deps,ondra-novak\/chromium.src,mogoweb\/chromium-crosswalk,Fireblend\/chromium-crosswalk,hujiajie\/pa-chromium,ondra-novak\/chromium.src,bright-sparks\/chromium-spacewalk,keishi\/chromium,mogoweb\/chromium-crosswalk,chuan9\/chromium-crosswalk,timopulkkinen\/BubbleFish,Pluto-tv\/chromium-crosswalk,chuan9\/chromium-crosswalk,Just-D\/chromium-1,junmin-zhu\/chromium-rivertrail,littlstar\/chromium.src,dednal\/chromium.src,rogerwang\/chromium,Jonekee\/chromium.src,anirudhSK\/chromium,timopulkkinen\/BubbleFish,Fireblend\/chromium-crosswalk,axinging\/chromium-crosswalk,Chilledheart\/chromium,rogerwang\/chromium,Chilledheart\/chromium,hgl888\/chromium-crosswalk-efl,dushu1203\/chromium.src,robclark\/chromium,patrickm\/chromium.src,nacl-webkit\/chrome_deps,bright-sparks\/chromium-spacewalk,ltilve\/chromium,pozdnyakov\/chromium-crosswalk,anirudhSK\/chromium,junmin-zhu\/chromium-rivertrail,hujiajie\/pa-chromium,hgl888\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,crosswalk-project\/chromium-crosswalk-efl,zcbenz\/cefode-chromium,krieger-od\/nwjs_chromium.src,Just-D\/chromium-1,krieger-od\/nwjs_chromium.src,anirudhSK\/chromium,fujunwei\/chromium-crosswalk,ondra-novak\/chromium.src,nacl-webkit\/chrome_deps,patrickm\/chromium.src,junmin-zhu\/chromium-rivertrail,mohamed--abdel-maksoud\/chromium.src,hgl888\/chromium-crosswalk,dednal\/chromium.src,hgl888\/chromium-crosswalk,axinging\/chromium-crosswalk,Fireblend\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,ondra-novak\/chromium.src,anirudhSK\/chromium,keishi\/chromium,mogoweb\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,keishi\/chromium,littlstar\/chromium.src,Chilledheart\/chromium,M4sse\/chromium.src,hgl888\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,hgl888\/chromium-crosswalk-efl,timopulkkinen\/BubbleFish,anirudhSK\/chromium,nacl-webkit\/chrome_deps,dushu1203\/chromium.src,keishi\/chromium,M4sse\/chromium.src,ltilve\/chromium,zcbenz\/cefode-chromium,mogoweb\/chromium-crosswalk,ChromiumWebApps\/chromium,M4sse\/chromium.src,zcbenz\/cefode-chromium,timopulkkinen\/BubbleFish,M4sse\/chromium.src,dushu1203\/chromium.src,Jonekee\/chromium.src,pozdnyakov\/chromium-crosswalk,dushu1203\/chromium.src,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,keishi\/chromium,Chilledheart\/chromium,dushu1203\/chromium.src,junmin-zhu\/chromium-rivertrail,Just-D\/chromium-1,PeterWangIntel\/chromium-crosswalk,fujunwei\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,zcbenz\/cefode-chromium,anirudhSK\/chromium,Jonekee\/chromium.src,Just-D\/chromium-1,dednal\/chromium.src,Pluto-tv\/chromium-crosswalk,nacl-webkit\/chrome_deps,crosswalk-project\/chromium-crosswalk-efl,robclark\/chromium,timopulkkinen\/BubbleFish,anirudhSK\/chromium,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk,nacl-webkit\/chrome_deps,robclark\/chromium,mogoweb\/chromium-crosswalk,hgl888\/chromium-crosswalk-efl,bright-sparks\/chromium-spacewalk,Pluto-tv\/chromium-crosswalk,markYoungH\/chromium.src,dushu1203\/chromium.src,TheTypoMaster\/chromium-crosswalk,keishi\/chromium,Just-D\/chromium-1,nacl-webkit\/chrome_deps,anirudhSK\/chromium,patrickm\/chromium.src,robclark\/chromium,axinging\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,rogerwang\/chromium,M4sse\/chromium.src,hujiajie\/pa-chromium,junmin-zhu\/chromium-rivertrail,hgl888\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,rogerwang\/chromium,hgl888\/chromium-crosswalk-efl,markYoungH\/chromium.src,axinging\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,mohamed--abdel-maksoud\/chromium.src,robclark\/chromium,junmin-zhu\/chromium-rivertrail,Fireblend\/chromium-crosswalk,krieger-od\/nwjs_chromium.src,ondra-novak\/chromium.src,ChromiumWebApps\/chromium,littlstar\/chromium.src,Chilledheart\/chromium,dednal\/chromium.src,pozdnyakov\/chromium-crosswalk,bright-sparks\/chromium-spacewalk,rogerwang\/chromium,jaruba\/chromium.src,timopulkkinen\/BubbleFish,keishi\/chromium,PeterWangIntel\/chromium-crosswalk,jaruba\/chromium.src,dednal\/chromium.src,TheTypoMaster\/chromium-crosswalk,M4sse\/chromium.src,ChromiumWebApps\/chromium,ondra-novak\/chromium.src,krieger-od\/nwjs_chromium.src,Just-D\/chromium-1,TheTypoMaster\/chromium-crosswalk,chuan9\/chromium-crosswalk,crosswalk-project\/chromium-crosswalk-efl,axinging\/chromium-crosswalk,fujunwei\/chromium-crosswalk,TheTypoMaster\/chromium-crosswalk,dednal\/chromium.src,axinging\/chromium-crosswalk,Jonekee\/chromium.src,Jonekee\/chromium.src,Chilledheart\/chromium,markYoungH\/chromium.src,mogoweb\/chromium-crosswalk,zcbenz\/cefode-chromium,PeterWangIntel\/chromium-crosswalk,anirudhSK\/chromium,ChromiumWebApps\/chromium,dednal\/chromium.src,ChromiumWebApps\/chromium,Fireblend\/chromium-crosswalk,fujunwei\/chromium-crosswalk,hujiajie\/pa-chromium,mohamed--abdel-maksoud\/chromium.src,robclark\/chromium,timopulkkinen\/BubbleFish,TheTypoMaster\/chromium-crosswalk,Jonekee\/chromium.src,patrickm\/chromium.src,markYoungH\/chromium.src,Pluto-tv\/chromium-crosswalk,Pluto-tv\/chromium-crosswalk,jaruba\/chromium.src,dednal\/chromium.src,ChromiumWebApps\/chromium,PeterWangIntel\/chromium-crosswalk,chuan9\/chromium-crosswalk,markYoungH\/chromium.src,timopulkkinen\/BubbleFish,PeterWangIntel\/chromium-crosswalk,ltilve\/chromium,hujiajie\/pa-chromium,krieger-od\/nwjs_chromium.src,mogoweb\/chromium-crosswalk,patrickm\/chromium.src,Jonekee\/chromium.src,dushu1203\/chromium.src,axinging\/chromium-crosswalk,markYoungH\/chromium.src,chuan9\/chromium-crosswalk,anirudhSK\/chromium,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,patrickm\/chromium.src,mohamed--abdel-maksoud\/chromium.src,Jonekee\/chromium.src,krieger-od\/nwjs_chromium.src,ondra-novak\/chromium.src,littlstar\/chromium.src,M4sse\/chromium.src,robclark\/chromium,hgl888\/chromium-crosswalk-efl,junmin-zhu\/chromium-rivertrail,ChromiumWebApps\/chromium,mogoweb\/chromium-crosswalk,keishi\/chromium,zcbenz\/cefode-chromium,nacl-webkit\/chrome_deps,TheTypoMaster\/chromium-crosswalk,ltilve\/chromium,Chilledheart\/chromium,pozdnyakov\/chromium-crosswalk,nacl-webkit\/chrome_deps,junmin-zhu\/chromium-rivertrail,markYoungH\/chromium.src,chuan9\/chromium-crosswalk,hujiajie\/pa-chromium,ltilve\/chromium,robclark\/chromium,robclark\/chromium,markYoungH\/chromium.src,fujunwei\/chromium-crosswalk,jaruba\/chromium.src,hujiajie\/pa-chromium,patrickm\/chromium.src,pozdnyakov\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,Fireblend\/chromium-crosswalk,zcbenz\/cefode-chromium,dushu1203\/chromium.src,Fireblend\/chromium-crosswalk,PeterWangIntel\/chromium-crosswalk,pozdnyakov\/chromium-crosswalk,chuan9\/chromium-crosswalk,ChromiumWebApps\/chromium,ondra-novak\/chromium.src,fujunwei\/chromium-crosswalk,keishi\/chromium,dushu1203\/chromium.src,rogerwang\/chromium,ltilve\/chromium,hujiajie\/pa-chromium,krieger-od\/nwjs_chromium.src,zcbenz\/cefode-chromium,fujunwei\/chromium-crosswalk,M4sse\/chromium.src,jaruba\/chromium.src,timopulkkinen\/BubbleFish,nacl-webkit\/chrome_deps,Fireblend\/chromium-crosswalk","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- third_party\/libjingle\/files\/talk\/base\/criticalsection.h\n+++ third_party\/libjingle\/files\/talk\/base\/criticalsection.h\n@@ -80,23 +80,36 @@\n \n #ifdef POSIX\n class CriticalSection {\n-public:\n+ public:\n CriticalSection() {\n pthread_mutexattr_t mutex_attribute;\n+ pthread_mutexattr_init(&mutex_attribute);\n pthread_mutexattr_settype(&mutex_attribute, PTHREAD_MUTEX_RECURSIVE);\n pthread_mutex_init(&mutex_, &mutex_attribute);\n+ pthread_mutexattr_destroy(&mutex_attribute);\n+ TRACK_OWNER(thread_ = 0);\n }\n ~CriticalSection() {\n pthread_mutex_destroy(&mutex_);\n }\n void Enter() {\n pthread_mutex_lock(&mutex_);\n+ TRACK_OWNER(thread_ = pthread_self());\n }\n void Leave() {\n+ TRACK_OWNER(thread_ = 0);\n pthread_mutex_unlock(&mutex_);\n }\n-private:\n+\n+#if CS_TRACK_OWNER\n+ bool CurrentThreadIsOwner() const {\n+ return pthread_equal(thread_, pthread_self());\n+ }\n+#endif \/\/ CS_TRACK_OWNER\n+\n+ private:\n pthread_mutex_t mutex_;\n+ TRACK_OWNER(pthread_t thread_);\n };\n #endif \/\/ POSIX\n \n"} {"commit":"b54b16a368163e1f39732124563424bf3a7462ff","subject":"Fix msvQTimePlayerWidget documentation.","message":"Fix msvQTimePlayerWidget documentation.\n\nIssue #43\n","repos":"MSV-Project\/MSVTK,MSV-Project\/MSVTK,MSV-Project\/MSVTK","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- Libs\/Qt\/Widgets\/msvQTimePlayerWidget.h\n+++ Libs\/Qt\/Widgets\/msvQTimePlayerWidget.h\n@@ -128,7 +128,7 @@\n \/\/\/ \\sa previousFrameIcon\n void setPreviousFrameIcon(const QIcon&);\n \/\/\/ Return the previous frame icon.\n- \/\/\/ \\s previousFrameIcon\n+ \/\/\/ \\sa previousFrameIcon\n QIcon previousFrameIcon() const;\n \/\/\/ Set the play icon.\n \/\/\/ \\sa playIcon\n"} {"commit":"cfe56c934f4dfc504c5031efc6a6bc6658e8166c","subject":"Translation of missed file.","message":"Translation of missed file.\n","repos":"Gluttton\/PslRK,Gluttton\/PslRK,Gluttton\/PslRK","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- LowPslCodeDetector\/include\/generator.h\n+++ LowPslCodeDetector\/include\/generator.h\n@@ -31,8 +31,8 @@\n \n \n int CalculateMaxCode (const __s32 requestedLength, CodeContainer & returnedMaxCode) {\n- \/\/ \u0412\u0441\u043f\u043e\u043c\u043e\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0435.\n- __s32 x = 1 + (requestedLength >> 3); \/\/ \u0421\u0434\u0432\u0438\u0433 \u043f\u043e\u0434\u0440\u0430\u0437\u0443\u043c\u0435\u0432\u0430\u0435\u0442 \u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u043d\u0430 8.\n+ \/\/ Utility variables.\n+ __s32 x = 1 + (requestedLength >> 3); \/\/ Shift means dividing by 8.\n \n memset (&returnedMaxCode.u8 [x], 0x00U, codeU8Count - 1 - x);\n memset (&returnedMaxCode.u8 [0], 0xFFU, x);\n"} {"commit":"8d1d67d9e5f00565a16b350fe5f5533d98c63c7b","subject":"Fix memleak with unique_ptr","message":"Fix memleak with unique_ptr\n","repos":"abaditsegay\/arangodb,kkdd\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,mujiansu\/arangodb,nekulin\/arangodb,nvoron23\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,abaditsegay\/arangodb,aurelijusb\/arangodb,kkdd\/arangodb,kkdd\/arangodb,nekulin\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,kkdd\/arangodb,mujiansu\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,aurelijusb\/arangodb,nekulin\/arangodb,pekeler\/arangodb,kkdd\/arangodb,mujiansu\/arangodb,pekeler\/arangodb,nekulin\/arangodb,abaditsegay\/arangodb,kkdd\/arangodb,nvoron23\/arangodb,nvoron23\/arangodb,pekeler\/arangodb,aurelijusb\/arangodb,aurelijusb\/arangodb,nvoron23\/arangodb,nekulin\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,nekulin\/arangodb,abaditsegay\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,abaditsegay\/arangodb,nekulin\/arangodb,pekeler\/arangodb,nvoron23\/arangodb,mujiansu\/arangodb,nvoron23\/arangodb,pekeler\/arangodb,kkdd\/arangodb,aurelijusb\/arangodb,mujiansu\/arangodb,aurelijusb\/arangodb,pekeler\/arangodb,abaditsegay\/arangodb,mujiansu\/arangodb,abaditsegay\/arangodb,kkdd\/arangodb,kkdd\/arangodb,mujiansu\/arangodb,nekulin\/arangodb,aurelijusb\/arangodb,nvoron23\/arangodb,aurelijusb\/arangodb,aurelijusb\/arangodb,mujiansu\/arangodb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Basics\/Traverser.h\n+++ lib\/Basics\/Traverser.h\n@@ -1305,11 +1305,11 @@\n }\n \n Path* search (VertexId& start, VertexId& end) {\n- Path* res = new Path();\n+ std::unique_ptr<Path> res(new Path());\n \/\/ Init\n if (start == end) {\n res->vertices.emplace_back(start);\n- return res;\n+ return res.release();\n }\n _leftFound.emplace(start, nullptr);\n _rightFound.emplace(end, nullptr);\n@@ -1347,7 +1347,7 @@\n it = _rightFound.find(next);\n }\n res->weight = res->edges.size();\n- return res;\n+ return res.release();\n }\n _nextClosure.emplace_back(n);\n }\n@@ -1381,7 +1381,7 @@\n it = _rightFound.find(next);\n }\n res->weight = res->edges.size();\n- return res;\n+ return res.release();\n }\n _nextClosure.emplace_back(n);\n }\n"} {"commit":"cdfdbb970a8b7311391a28e046f39d4cc3b7d610","subject":"add macro function comments","message":"add macro function comments\n\ngit-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@7242 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- MdeModulePkg\/Include\/Library\/IpIoLib.h\n+++ MdeModulePkg\/Include\/Library\/IpIoLib.h\n@@ -1,7 +1,7 @@\n \/** @file\r\n This library provides IpIo layer upon EFI IP4 Protocol.\r\n \r\n-Copyright (c) 2005 - 2008, Intel Corporation\r\n+Copyright (c) 2005 - 2008, Intel Corporation.<BR>\r\n All rights reserved. This program and the accompanying materials\r\n are licensed and made available under the terms and conditions of the BSD License\r\n which accompanies this distribution. The full text of the license may be found at\r\n@@ -16,7 +16,7 @@\n #define _IP_IO_H_\r\n \r\n #include <Protocol\/Ip4.h>\r\n-#include <Library\/IpIoLib.h>\r\n+\r\n #include <Library\/NetLib.h>\r\n \r\n \/\/\r\n@@ -24,7 +24,7 @@\n \/\/ from IP\r\n \/\/\r\n #define ICMP_TYPE_UNREACH 3\r\n-#define ICMP_TYPE_TIMXCEED 11\r\n+#define ICMP_TYPE_TIMXCEED 11\r\n #define ICMP_TYPE_PARAMPROB 12\r\n #define ICMP_TYPE_SOURCEQUENCH 4\r\n \r\n@@ -42,6 +42,42 @@\n #define ICMP_CODE_UNREACH_TOSNET 11\r\n #define ICMP_CODE_UNREACH_TOSHOST 12\r\n \r\n+\/**\r\n+ Get the IP header length from EFI_IP4_HEADER struct. HeaderLength is\r\n+ Internet header length in 32-bit words, so HeaderLength<<2 is the real\r\n+ length of IP header.\r\n+ \r\n+ @param[out] HdrPtr A pointer to EFI_IP4_HEADER\r\n+ \r\n+ @return The IP header length\r\n+**\/\r\n+#define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)\r\n+\r\n+\/**\r\n+ To types of ICMP error which consist of ICMP header, IP header and original \r\n+ datagram's data, get length from sum of ICMP header length, IP header length \r\n+ and first 64 bits of datagram's data length.\r\n+ \r\n+ @param[in] IpHdr A pointer to EFI_IP4_HEADER\r\n+ \r\n+ @return The ICMP error length\r\n+**\/\r\n+#define ICMP_ERRLEN(IpHdr) \\\r\n+ (sizeof(IP4_ICMP_HEAD) + EFI_IP4_HEADER_LEN(IpHdr) + 8)\r\n+\r\n+\/**\r\n+ Get the packet header from NET_BUF.\r\n+ \r\n+ @param[out] Buf A pointer to NET_BUF\r\n+ @param[in] Type Header type\r\n+ \r\n+ @return The pointer to packet header\r\n+**\/\r\n+#define NET_PROTO_HDR(Buf, Type) ((Type *) ((Buf)->BlockOp[0].Head))\r\n+\r\n+ \r\n+extern EFI_IP4_CONFIG_DATA mIpIoDefaultIpConfigData;\r\n+\r\n \/\/\/\r\n \/\/\/ This error will be delivered to the\r\n \/\/\/ listening transportation layer protocol\r\n@@ -63,21 +99,10 @@\n \/\/\/\r\n \/\/\/ The helper struct for IpIoGetIcmpErrStatus(). It is internal-use only.\r\n \/\/\/\r\n-typedef struct _ICMP_ERROR_INFO {\r\n+typedef struct {\r\n BOOLEAN IsHard;\r\n BOOLEAN Notify;\r\n } ICMP_ERROR_INFO;\r\n-\r\n-\/**\r\n- Get the IP header length from EFI_IP4_HEADER struct.\r\n- \r\n- @param HdrPtr A pointer to EFI_IP4_HEADER\r\n- \r\n- @return The IP header length\r\n-**\/\r\n-#define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)\r\n-\r\n-extern EFI_IP4_CONFIG_DATA mIpIoDefaultIpConfigData;\r\n \r\n \/\/\/\r\n \/\/\/ The IP session for an IP receive packet.\r\n@@ -91,12 +116,12 @@\n \/**\r\n The prototype is called back when an IP packet is received.\r\n \r\n- @param Status Result of the receive request\r\n- @param IcmpErr Valid when Status is EFI_ICMP_ERROR\r\n- @param NetSession The IP session for the received packet\r\n- @param Pkt Packet received\r\n- @param Context The data provided by user for the received packet when\r\n- the callback is registered in IP_IO_OPEN_DATA::RcvdContext.\r\n+ @param[in] Status Result of the receive request\r\n+ @param[in] IcmpErr Valid when Status is EFI_ICMP_ERROR\r\n+ @param[in] NetSession The IP session for the received packet\r\n+ @param[in] Pkt Packet received\r\n+ @param[in] Context The data provided by user for the received packet when\r\n+ the callback is registered in IP_IO_OPEN_DATA::RcvdContext.\r\n \r\n **\/\r\n typedef\r\n@@ -112,11 +137,11 @@\n \/**\r\n The prototype is called back when an IP packet is sent.\r\n \r\n- @param Status Result of the sending\r\n- @param Context The data provided by user for the received packet when\r\n- the callback is registered in IP_IO_OPEN_DATA::SndContext.\r\n- @param Sender A pointer to EFI_IP4_PROTOCOL for sender\r\n- @param NotifyData Context data specified when calling IpIoSend()\r\n+ @param[in] Status Result of the sending\r\n+ @param[in] Context The data provided by user for the received packet when\r\n+ the callback is registered in IP_IO_OPEN_DATA::SndContext.\r\n+ @param[in] Sender A pointer to EFI_IP4_PROTOCOL for sender\r\n+ @param[in] NotifyData Context data specified when calling IpIoSend()\r\n \r\n **\/\r\n typedef\r\n@@ -153,7 +178,7 @@\n BOOLEAN IsConfigured;\r\n \r\n \/\/\/\r\n- \/\/\/ some ip config data can be changed\r\n+ \/\/\/ Some ip config data can be changed\r\n \/\/\/\r\n UINT8 Protocol;\r\n \r\n@@ -226,9 +251,9 @@\n This function uses IP4 service binding protocol in Controller to create an IP4\r\n child (aka IP4 instance).\r\n \r\n- @param Image The image handle of the driver or application that\r\n+ @param[in] Image The image handle of the driver or application that\r\n consumes IP_IO.\r\n- @param Controller The controller handle that has IP4 service binding\r\n+ @param[in] Controller The controller handle that has IP4 service binding\r\n protocol installed.\r\n \r\n @return Pointer to a newly created IP_IO instance, or NULL if failed.\r\n@@ -247,17 +272,17 @@\n This function is paired with IpIoCreate(). The IP_IO will be closed first.\r\n Resource will be freed afterwards. See IpIoClose().\r\n \r\n- @param IpIo Pointer to the IP_IO instance that needs to be\r\n+ @param[in, out] IpIo Pointer to the IP_IO instance that needs to be\r\n destroyed.\r\n \r\n- @retval EFI_SUCCESS The IP_IO instance destroyed successfully.\r\n- @retval Other Error condition occurred.\r\n+ @retval EFI_SUCCESS The IP_IO instance destroyed successfully.\r\n+ @retval Others Error condition occurred.\r\n \r\n **\/\r\n EFI_STATUS\r\n EFIAPI\r\n IpIoDestroy (\r\n- IN IP_IO *IpIo\r\n+ IN OUT IP_IO *IpIo\r\n );\r\n \r\n \/**\r\n@@ -266,16 +291,16 @@\n This function is paired with IpIoOpen(). The IP_IO will be unconfigured and all\r\n the pending send\/receive tokens will be canceled.\r\n \r\n- @param IpIo Pointer to the IP_IO instance that needs to stop.\r\n-\r\n- @retval EFI_SUCCESS The IP_IO instance stopped successfully.\r\n- @retval Other Error condition occurred.\r\n+ @param[in, out] IpIo Pointer to the IP_IO instance that needs to stop.\r\n+\r\n+ @retval EFI_SUCCESS The IP_IO instance stopped successfully.\r\n+ @retval Others Error condition occurred.\r\n \r\n **\/\r\n EFI_STATUS\r\n EFIAPI\r\n IpIoStop (\r\n- IN IP_IO *IpIo\r\n+ IN OUT IP_IO *IpIo\r\n );\r\n \r\n \/**\r\n@@ -285,20 +310,23 @@\n instance and register the callbacks and their context data for sending and\r\n receiving IP packets.\r\n \r\n- @param IpIo Pointer to an IP_IO instance that needs to open.\r\n- @param OpenData The configuration data and callbacks for the IP_IO\r\n- instance.\r\n-\r\n- @retval EFI_SUCCESS The IP_IO instance opened with OpenData\r\n- successfully.\r\n- @retval Other Error condition occurred.\r\n+ @param[in, out] IpIo Pointer to an IP_IO instance that needs\r\n+ to open.\r\n+ @param[in] OpenData The configuration data and callbacks for\r\n+ the IP_IO instance.\r\n+\r\n+ @retval EFI_SUCCESS The IP_IO instance opened with OpenData\r\n+ successfully.\r\n+ @retval EFI_ACCESS_DENIED The IP_IO instance is configured, avoid to \r\n+ reopen it.\r\n+ @retval Others Error condition occurred.\r\n \r\n **\/\r\n EFI_STATUS\r\n EFIAPI\r\n IpIoOpen (\r\n- IN IP_IO *IpIo,\r\n- IN IP_IO_OPEN_DATA *OpenData\r\n+ IN OUT IP_IO *IpIo,\r\n+ IN IP_IO_OPEN_DATA *OpenData\r\n );\r\n \r\n \/**\r\n@@ -309,38 +337,38 @@\n overriden by Sender. Other sending configs, like source address and gateway\r\n address etc., are specified in OverrideData.\r\n \r\n- @param IpIo Pointer to an IP_IO instance used for sending IP\r\n- packet.\r\n- @param Pkt Pointer to the IP packet to be sent.\r\n- @param Sender The IP protocol instance used for sending.\r\n- @param Context Optional context data\r\n- @param NotifyData Optional notify data\r\n- @param Dest The destination IP address to send this packet to.\r\n- @param OverrideData The data to override some configuration of the IP\r\n- instance used for sending.\r\n-\r\n- @retval EFI_SUCCESS The operation is completed successfully.\r\n- @retval EFI_NOT_STARTED The IpIo is not configured.\r\n- @retval EFI_OUT_OF_RESOURCES Failed due to resource limit.\r\n+ @param[in, out] IpIo Pointer to an IP_IO instance used for sending IP\r\n+ packet.\r\n+ @param[in, out] Pkt Pointer to the IP packet to be sent.\r\n+ @param[in] Sender The IP protocol instance used for sending.\r\n+ @param[in] Context Optional context data\r\n+ @param[in] NotifyData Optional notify data\r\n+ @param[in] Dest The destination IP address to send this packet to.\r\n+ @param[in] OverrideData The data to override some configuration of the IP\r\n+ instance used for sending.\r\n+\r\n+ @retval EFI_SUCCESS The operation is completed successfully.\r\n+ @retval EFI_NOT_STARTED The IpIo is not configured.\r\n+ @retval EFI_OUT_OF_RESOURCES Failed due to resource limit.\r\n \r\n **\/\r\n EFI_STATUS\r\n EFIAPI\r\n IpIoSend (\r\n- IN IP_IO *IpIo,\r\n- IN NET_BUF *Pkt,\r\n- IN IP_IO_IP_INFO *Sender OPTIONAL,\r\n- IN VOID *Context OPTIONAL,\r\n- IN VOID *NotifyData OPTIONAL,\r\n- IN IP4_ADDR Dest,\r\n- IN IP_IO_OVERRIDE *OverrideData OPTIONAL\r\n+ IN OUT IP_IO *IpIo,\r\n+ IN OUT NET_BUF *Pkt,\r\n+ IN IP_IO_IP_INFO *Sender OPTIONAL,\r\n+ IN VOID *Context OPTIONAL,\r\n+ IN VOID *NotifyData OPTIONAL,\r\n+ IN IP4_ADDR Dest,\r\n+ IN IP_IO_OVERRIDE *OverrideData OPTIONAL\r\n );\r\n \r\n \/**\r\n Cancel the IP transmit token which wraps this Packet.\r\n \r\n- @param IpIo Pointer to the IP_IO instance.\r\n- @param Packet Pointer to the packet of NET_BUF to cancel.\r\n+ @param[in] IpIo Pointer to the IP_IO instance.\r\n+ @param[in] Packet Pointer to the packet of NET_BUF to cancel.\r\n \r\n **\/\r\n VOID\r\n@@ -357,8 +385,8 @@\n can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send\r\n data.\r\n \r\n- @param IpIo Pointer to a IP_IO instance to add a new IP\r\n- instance for sending purpose.\r\n+ @param[in, out] IpIo Pointer to a IP_IO instance to add a new IP\r\n+ instance for sending purpose.\r\n \r\n @return Pointer to the created IP_IO_IP_INFO structure, NULL if failed.\r\n \r\n@@ -366,29 +394,29 @@\n IP_IO_IP_INFO *\r\n EFIAPI\r\n IpIoAddIp (\r\n- IN IP_IO *IpIo\r\n+ IN OUT IP_IO *IpIo\r\n );\r\n \r\n \/**\r\n Configure the IP instance of this IpInfo and start the receiving if Ip4ConfigData\r\n is not NULL.\r\n \r\n- @param IpInfo Pointer to the IP_IO_IP_INFO instance.\r\n- @param Ip4ConfigData The IP4 configure data used to configure the IP\r\n- instance, if NULL the IP instance is reset. If\r\n- UseDefaultAddress is set to TRUE, and the configure\r\n- operation succeeds, the default address information\r\n- is written back in this Ip4ConfigData.\r\n-\r\n- @retval EFI_STATUS The status returned by IP4->Configure or\r\n- IP4->Receive.\r\n- @retval Other Configuration fails.\r\n+ @param[in, out] IpInfo Pointer to the IP_IO_IP_INFO instance.\r\n+ @param[in, out] Ip4ConfigData The IP4 configure data used to configure the IP\r\n+ instance, if NULL the IP instance is reset. If\r\n+ UseDefaultAddress is set to TRUE, and the configure\r\n+ operation succeeds, the default address information\r\n+ is written back in this Ip4ConfigData.\r\n+\r\n+ @retval EFI_SUCCESS The IP instance of this IpInfo is configured successfully\r\n+ or no need to reconfigure it.\r\n+ @retval Others Configuration fails.\r\n \r\n **\/\r\n EFI_STATUS\r\n EFIAPI\r\n IpIoConfigIp (\r\n- IN IP_IO_IP_INFO *IpInfo,\r\n+ IN OUT IP_IO_IP_INFO *IpInfo,\r\n IN OUT EFI_IP4_CONFIG_DATA *Ip4ConfigData OPTIONAL\r\n );\r\n \r\n@@ -400,8 +428,8 @@\n IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance\r\n will be dstroyed if the RefCnt is zero.\r\n \r\n- @param IpIo Pointer to the IP_IO instance.\r\n- @param IpInfo Pointer to the IpInfo to be removed.\r\n+ @param[in] IpIo Pointer to the IP_IO instance.\r\n+ @param[in] IpInfo Pointer to the IpInfo to be removed.\r\n \r\n **\/\r\n VOID\r\n@@ -418,8 +446,8 @@\n This function is called when the caller needs the IpIo to send data to the\r\n specified Src. The IpIo was added previously by IpIoAddIp().\r\n \r\n- @param IpIo Pointer to the pointer of the IP_IO instance.\r\n- @param Src The local IP address.\r\n+ @param[in, out] IpIo Pointer to the pointer of the IP_IO instance.\r\n+ @param[in] Src The local IP address.\r\n \r\n @return Pointer to the IP protocol can be used for sending purpose and its local\r\n address is the same with Src.\r\n@@ -438,11 +466,11 @@\n The ErrorStatus will be returned. The IsHard and Notify are optional. If they\r\n are not NULL, this routine will fill them.\r\n \r\n- @param IcmpError IcmpError Type\r\n- @param IsHard Whether it is a hard error\r\n- @param Notify Whether it need to notify SockError\r\n-\r\n- @return ICMP Error Status\r\n+ @param[in] IcmpError IcmpError Type\r\n+ @param[out] IsHard Whether it is a hard error\r\n+ @param[out] Notify Whether it need to notify SockError\r\n+\r\n+ @return ICMP Error Status, such as EFI_NETWORK_UNREACHABLE.\r\n \r\n **\/\r\n EFI_STATUS\r\n"} {"commit":"111ab220a72919a16dc0d6b9fbe22fb14f6007ca","subject":"2017.10.28-19:24","message":"2017.10.28-19:24\n","repos":"susanow\/libdpdk_cpp,susanow\/libdpdk_cpp","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- dpdk\/wrap.h\n+++ dpdk\/wrap.h\n@@ -513,6 +513,31 @@\n \t}\n }\n \n+size_t eth_dev_attach(const char* devargs)\n+{\n+ uint8_t new_pid;\n+ int ret = rte_eth_dev_attach(devargs, &new_pid);\n+ if (ret < 0) {\n+ std::string err = dpdk::format(\"dpdk::eth_dev_attach (ret=%d)\", ret);\n+ throw dpdk::exception(err.c_str());\n+ }\n+ return new_pid;\n+}\n+\n+void eth_dev_detach(size_t port_id)\n+{\n+ rte_eth_dev_stop(port_id);\n+ rte_eth_dev_close(port_id);\n+ char devname[1000];\n+ int ret = rte_eth_dev_detach(port_id, devname);\n+ if (ret < 0) {\n+ std::string err = dpdk::format(\"dpdk::eth_dev_detach (ret=%d)\", ret);\n+ throw dpdk::exception(err.c_str());\n+ }\n+ RTE_LOG(INFO, USER1, \"Ethernet device \\'%s\\' was detached by ssn_nfvi\\n\", devname);\n+}\n+\n+\n } \/* namespace dpdk *\/\n \n \n"} {"commit":"971bd7e9a6e38d7bae26872c1a055b45321179e0","subject":"atmel-samd: Improve MSC reliability.","message":"atmel-samd: Improve MSC reliability.\n\n* Be more liberal with critical sections to ensure ordering.\n* Correct usb_busy so that it is busy when no errors occur on\n transfer. I believe it worked before because it would be false\n momentarily until a second transfer was attempted and a busy\n error was returned, therefore setting usb_busy to true. That\n risks the first \"failed\" transfer completing before a second one\n is attempted.\n","repos":"adafruit\/micropython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/micropython,adafruit\/circuitpython,adafruit\/circuitpython,adafruit\/micropython,adafruit\/micropython,adafruit\/micropython,adafruit\/circuitpython","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- ports\/atmel-samd\/usb_mass_storage.c\n+++ ports\/atmel-samd\/usb_mass_storage.c\n@@ -256,6 +256,7 @@\n return ERR_DENIED;\n }\n \n+ CRITICAL_SECTION_ENTER();\n if (active_read) {\n active_addr += 1;\n active_nblocks--;\n@@ -268,6 +269,7 @@\n sector_loaded = true;\n }\n usb_busy = false;\n+ CRITICAL_SECTION_LEAVE();\n \n return ERR_NONE;\n }\n@@ -277,9 +279,10 @@\n if (active_read && !usb_busy) {\n fs_user_mount_t * vfs = get_vfs(active_lun);\n disk_read(vfs, sector_buffer, active_addr, 1);\n- \/\/ TODO(tannewt): Check the read result.\n- mscdf_xfer_blocks(true, sector_buffer, 1);\n- usb_busy = true;\n+ CRITICAL_SECTION_ENTER();\n+ int32_t result = mscdf_xfer_blocks(true, sector_buffer, 1);\n+ usb_busy = result == ERR_NONE;\n+ CRITICAL_SECTION_LEAVE();\n }\n if (active_write && !usb_busy) {\n if (sector_loaded) {\n@@ -306,8 +309,14 @@\n }\n \/\/ Load more blocks from USB if they are needed.\n if (active_nblocks > 0) {\n+ \/\/ Turn off interrupts because with them on,\n+ \/\/ usb_msc_xfer_done could be called before we update\n+ \/\/ usb_busy. If that happened, we'd overwrite the fact that\n+ \/\/ the transfer actually already finished.\n+ CRITICAL_SECTION_ENTER();\n int32_t result = mscdf_xfer_blocks(false, sector_buffer, 1);\n- usb_busy = result != ERR_NONE;\n+ usb_busy = result == ERR_NONE;\n+ CRITICAL_SECTION_LEAVE();\n } else {\n mscdf_xfer_blocks(false, NULL, 0);\n active_write = false;\n"} {"commit":"71d88b75e21f6be7fc75fd2ad5aef662867acb8f","subject":"future-proof the flood module","message":"future-proof the flood module\n","repos":"PonyChat\/ponychat-atheme-modules","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cs_flood.c\n+++ cs_flood.c\n@@ -269,7 +269,7 @@\n \n static void on_channel_message(hook_cmessage_data_t *data)\n {\n-\tmychan_t *mc = MYCHAN_FROM(data->c);\n+\tmychan_t *mc = mychan_from(data->c);\n \tstruct floodparams *fp;\n \tstruct floodscore *fs;\n \tstruct timeval tv, now;\n@@ -325,7 +325,7 @@\n \n static void on_channel_part(hook_channel_joinpart_t *data)\n {\n-\tmychan_t *mc = MYCHAN_FROM(data->cu->chan);\n+\tmychan_t *mc = mychan_from(data->cu->chan);\n \tuser_t *u = data->cu->user;\n \tmowgli_patricia_t *scores;\n \tstruct floodscore *fs;\n@@ -484,7 +484,7 @@\n \n \t\/* move to another function? *\/\n \tMOWGLI_PATRICIA_FOREACH(c, &iter, chanlist) {\n-\t\tmc = MYCHAN_FROM(c);\n+\t\tmc = mychan_from(c);\n \t\tif (mc != NULL)\n \t\t\tflood_clear(mc, false);\n \t}\n"} {"commit":"95cdab75a463a1399ad2c9263d75c12092635294","subject":"Add wattage","message":"Add wattage\n","repos":"ehegnes\/dwmstatus","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- dwmstatus.c\n+++ dwmstatus.c\n@@ -115,6 +115,7 @@\n \tchar *co;\n \tint capacity;\n \tchar status;\n+\tint wattage;\n \n \tif ((co = readfile(base, \"capacity\")) == NULL) {\n \t\treturn smprintf(\"\");\n@@ -128,7 +129,13 @@\n \tsscanf(co, \"%c\", &status);\n \tfree(co);\n \n-\treturn smprintf(\"%c %d%%\", status, capacity);\n+\tif ((co = readfile(base, \"power_now\")) == NULL) {\n+\t\treturn smprintf(\"\");\n+\t}\n+\tsscanf(co, \"%d\", &wattage);\n+\tfree(co);\n+\n+\treturn smprintf(\"%c %d%% (%.1fW)\", status, capacity, (double)wattage\/1000000.0);\n }\n \n char *\n"} {"commit":"4d9bedcaa8c89bd4d31b9a2be0b6e58bf3f757dc","subject":"Exception handling in C","message":"Exception handling in C\n","repos":"bhagatyj\/algorithms,bhagatyj\/algorithms,bhagatyj\/algorithms,bhagatyj\/algorithms","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- problems\/C\/edge\/exceptionHandling.c\n+++ problems\/C\/edge\/exceptionHandling.c\n@@ -42,7 +42,10 @@\n struct sigaction mySigAction;\n \n \/\/ sigaction() system call is used to change the action taken by a\n- \/\/ process on receipt of a specific signal\n+ \/\/ process on receipt of a specific signal.\n+ \/\/ We use it for handling SIGFPE. The handler returns 1,\n+ \/\/ thereby printing an Encountered SIGFPE message and continuing\n+ \/\/ with the loop.\n mySigAction.sa_handler = handler;\n sigaction(SIGFPE, &mySigAction, NULL);\n \n"} {"commit":"ed97d22f0c9ea1e7602064055fd693929130d148","subject":"Correct signedness of AddWithCarry internals","message":"Correct signedness of AddWithCarry internals\n\nFixes #6.\n","repos":"lab11\/M-ulator,lab11\/M-ulator,lab11\/M-ulator,lab11\/M-ulator,lab11\/M-ulator,lab11\/M-ulator,lab11\/M-ulator","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- simulator\/core\/operations\/helpers.c\n+++ simulator\/core\/operations\/helpers.c\n@@ -67,11 +67,11 @@\n \t\tuint32_t *result, bool *carry_out, bool *overflow_out) {\n \tuint64_t ux64 = x;\n \tuint64_t uy64 = y;\n-\tint64_t sx64 = x;\n-\tint64_t sy64 = y;\n-\n-\tuint64_t usum = ux64 + uy64 + carry_in;\n-\tint64_t ssum = sx64 + sy64 + carry_in;\n+\tint64_t sx64 = (int32_t) x;\n+\tint64_t sy64 = (int32_t) y;\n+\n+\tuint64_t usum = ux64 + uy64 + ((uint64_t) carry_in);\n+\tint64_t ssum = sx64 + sy64 + (( int64_t) carry_in);\n \n \t*result = usum;\n \n"} {"commit":"ddaf605d5e517c4a96f7628ebf2a6a5894c40acf","subject":"add rvalue designators to workaround a stupid problem with vim","message":"add rvalue designators to workaround a stupid problem with vim\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@15127 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/include\/pfl\/cdefs.h\n+++ psc_fsutil_libs\/include\/pfl\/cdefs.h\n@@ -114,4 +114,8 @@\n \/* arthimetic on a generic pointer *\/\n #define PSC_AGP(p, off)\t\t((void *)((char *)(p) + (off)))\n \n+\/* forced rvalue designators *\/\n+#define _PFL_RVSTART\t\t(\n+#define _PFL_RVEND\t\t)\n+\n #endif \/* _PFL_CDEFS_H_ *\/\n"} {"commit":"ee02ae58f9f045e0fd8b30ea98202f0999dc4368","subject":"english","message":"english\n\ngit-svn-id: f2acecaac6fbd5a03f3d4799db58dda434111981@16256 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/pfl,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/pfl","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- psc_fsutil_libs\/psc_rpc\/rpcclient.c\n+++ psc_fsutil_libs\/psc_rpc\/rpcclient.c\n@@ -563,7 +563,7 @@\n {\n \tspinlock(&req->rq_lock);\n \tif (req->rq_phase == PSCRPC_RQ_PHASE_NEW)\n-\t\t\/* pscrpc_send_new_req_locked() free's the lock.\n+\t\t\/* pscrpc_send_new_req_locked() frees the lock.\n \t\t *\/\n \t\treturn (pscrpc_send_new_req_locked(req));\n \telse {\n"} {"commit":"193a067c3de1aad03cd69b50a9315d249707cb68","subject":"turn on DEBUG_TRACE() when compiling in debug mode in MSVC20xx - off the shelf it defines _DEBUG instead of DEBUG.","message":"turn on DEBUG_TRACE() when compiling in debug mode in MSVC20xx - off the shelf it defines _DEBUG instead of DEBUG.\n","repos":"GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,commshare\/civet-webserver,GerHobbelt\/civet-webserver,GerHobbelt\/civet-webserver,commshare\/civet-webserver,commshare\/civet-webserver,commshare\/civet-webserver,commshare\/civet-webserver,commshare\/civet-webserver,GerHobbelt\/civet-webserver,commshare\/civet-webserver,GerHobbelt\/civet-webserver","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mongoose_sys_porting.h\n+++ mongoose_sys_porting.h\n@@ -325,7 +325,7 @@\n #endif\n \n \n-#if defined(DEBUG)\n+#if defined(DEBUG) || defined(_DEBUG)\n #define DEBUG_TRACE(x) do { \\\n flockfile(stdout); \\\n printf(\"*** %lu.%p.%s.%d: \", \\\n"} {"commit":"8273fdeb8ef2704b52c533e7b5c68e38204ac152","subject":"add ADD HL,foo insrs","message":"add ADD HL,foo insrs\n","repos":"supergameherm\/supergameherm,foxkit-us\/supergameherm","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- ctl_unit.c\n+++ ctl_unit.c\n@@ -138,6 +138,30 @@\n \tstate->pc++;\n }\n \n+static inline void add_to_hl(emulator_state *state, uint16_t to_add)\n+{\n+\tif((uint32_t)(state->hl + to_add) > 0xFFFF) state->flag_reg |= FLAG_C;\n+\telse state->flag_reg &= ~FLAG_C;\n+\n+\tif((state->hl & 0xF) + (to_add & 0xF) > 0xF) state->flag_reg |= FLAG_H;\n+\telse state->flag_reg &= ~FLAG_H;\n+\n+\tstate->flag_reg &= ~FLAG_N;\n+\n+\tstate->hl += to_add;\n+\n+\tstate->pc++;\n+}\n+\n+\/*!\n+ * @brief ADD HL,BC (0x09)\n+ * @result HL += BC; N flag reset, H if carry from bit 11, C if overflow\n+ *\/\n+void add_hl_bc(emulator_state *state)\n+{\n+\tadd_to_hl(state, state->bc);\n+}\n+\n \/*!\n * @brief DEC BC (0x0B)\n * @result 1 is subtracted from BC (possibly wrapping)\n@@ -237,6 +261,15 @@\n \tint8_t to_add = mem_read8(state, ++state->pc);\n \n \tstate->pc += to_add + 1;\n+}\n+\n+\/*!\n+ * @brief ADD HL,DE (0x19)\n+ * @result HL += DE; N flag reset, H if carry from bit 11, C if overflow\n+ *\/\n+void add_hl_de(emulator_state *state)\n+{\n+\tadd_to_hl(state, state->de);\n }\n \n \/*!\n@@ -362,6 +395,15 @@\n }\n \n \/*!\n+ * @brief ADD HL,HL (0x29)\n+ * @result HL += HL; N flag reset, H if carry from bit 11, C if overflow\n+ *\/\n+void add_hl_hl(emulator_state *state)\n+{\n+\tadd_to_hl(state, state->hl);\n+}\n+\n+\/*!\n * @brief LD A,(HL+) (0x2A)\n * @result A = contents of memory at HL; HL incremented 1\n *\/\n@@ -455,7 +497,16 @@\n }\n \n \/*!\n- * @brief LD A,(HL-) (0x2A)\n+ * @brief ADD HL,SP (0x39)\n+ * @result HL += SP; N flag reset, H if carry from bit 11, C if overflow\n+ *\/\n+void add_hl_sp(emulator_state *state)\n+{\n+\tadd_to_hl(state, state->sp);\n+}\n+\n+\/*!\n+ * @brief LD A,(HL-) (0x3A)\n * @result A = contents of memory at HL; HL decremented 1\n *\/\n void ldd_a_hl(emulator_state *state)\n@@ -1779,13 +1830,13 @@\n \n opcode_t handlers[0x100] = {\n \t\/* 0x00 *\/ nop, ld_bc_imm16, NULL, inc_bc, inc_b, dec_b, ld_b_imm8, NULL,\n-\t\/* 0x08 *\/ NULL, NULL, NULL, dec_bc, inc_c, dec_c, ld_c_imm8, NULL,\n+\t\/* 0x08 *\/ NULL, add_hl_bc, NULL, dec_bc, inc_c, dec_c, ld_c_imm8, NULL,\n \t\/* 0x10 *\/ NULL, ld_de_imm16, NULL, inc_de, inc_d, dec_d, ld_d_imm8, NULL,\n-\t\/* 0x18 *\/ jr_imm8, NULL, NULL, dec_de, inc_e, dec_e, ld_e_imm8, NULL,\n+\t\/* 0x18 *\/ jr_imm8, add_hl_de, NULL, dec_de, inc_e, dec_e, ld_e_imm8, NULL,\n \t\/* 0x20 *\/ jr_nz_imm8, ld_hl_imm16, ldi_hl_a, inc_hl, inc_h, dec_h, ld_h_imm8, NULL,\n-\t\/* 0x28 *\/ jr_z_imm8, NULL, ldi_a_hl, dec_hl, inc_l, dec_l, ld_l_imm8, NULL,\n+\t\/* 0x28 *\/ jr_z_imm8, add_hl_hl, ldi_a_hl, dec_hl, inc_l, dec_l, ld_l_imm8, NULL,\n \t\/* 0x30 *\/ NULL, ld_sp_imm16, ldd_hl_a, inc_sp, inc_hl, dec_hl, ld_hl_imm8, NULL,\n-\t\/* 0x38 *\/ NULL, NULL, ldd_a_hl, dec_sp, inc_a, dec_a, ld_a_imm8, NULL,\n+\t\/* 0x38 *\/ NULL, add_hl_sp, ldd_a_hl, dec_sp, inc_a, dec_a, ld_a_imm8, NULL,\n \t\/* 0x40 *\/ ld_b_b, ld_b_c, ld_b_d, ld_b_e, ld_b_h, ld_b_l, ld_b_hl, ld_b_a,\n \t\/* 0x48 *\/ ld_c_b, ld_c_c, ld_c_d, ld_c_e, ld_c_h, ld_c_l, ld_c_hl, ld_c_a,\n \t\/* 0x50 *\/ ld_d_b, ld_d_c, ld_d_d, ld_d_e, ld_d_h, ld_d_l, ld_d_hl, ld_d_a,\n"} {"commit":"6480b45fa3d510334a406c5e0ebb6f4b27003896","subject":"Use SPLAY_FOREACH(), self build works","message":"Use SPLAY_FOREACH(), self build works\n\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@24082 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mount_slash\/bmap_cli.c\n+++ mount_slash\/bmap_cli.c\n@@ -636,12 +636,10 @@\n \tstruct bmap_pagecache *bmpc = bmap_2_bmpc(b);\n \n \tBMAP_LOCK(b);\n-\/\/\tSPLAY_FOREACH()\n-\tfor (e = SPLAY_MIN(bmap_pagecachetree, &bmpc->bmpc_tree); e; ) {\n+\tSPLAY_FOREACH(e, bmap_pagecachetree, &bmpc->bmpc_tree) {\n \t\tBMPCE_LOCK(e);\n \t\te->bmpce_flags |= BMPCE_DISCARD;\n \t\tBMPCE_ULOCK(e);\n-\t\te = SPLAY_NEXT(bmap_pagecachetree, &bmpc->bmpc_tree, e);\n \t}\n \tBMAP_ULOCK(b);\n }\n"} {"commit":"847ad327d873f11c808a2a4be6d6ea0ecf4d2112","subject":"demacro","message":"demacro\n\ngit-svn-id: ae92b08b608af1c8cefa3e10d2325ea527204e07@17886 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda\n","repos":"pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable,pscedu\/slash2-stable","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- mount_slash\/bmap_cli.h\n+++ mount_slash\/bmap_cli.h\n@@ -55,8 +55,14 @@\n #define BMAP_CLI_TIMEO_INC\t1\n #define BMAP_CLI_DIOWAIT_SECS\t1\n \n-#define bmap_2_bci(b)\t\t((struct bmap_cli_info *)bmap_get_pri(b))\n+static __inline struct bmap_cli_info *\n+bmap_2_bci(struct bmapc_memb *b)\n+{\n+\treturn (bmap_get_pri(b));\n+}\n+\n #define bmap_2_bci_const(b)\t((const struct bmap_cli_info *)bmap_get_pri_const(b))\n+\n #define bmap_2_bmpc(b)\t\t(&bmap_2_bci(b)->bci_bmpc)\n #define bmap_2_sbd(b)\t\t(&bmap_2_bci(b)->bci_sbd)\n #define bmap_2_ion(b)\t\tbmap_2_sbd(b)->sbd_ion_nid\n"} {"commit":"b5d92bfbcdd81e2942400bc8f5eddf9e20272328","subject":"Improve string finding grep","message":"Improve string finding grep\n","repos":"BenWheatley\/KitsuneStandardLibrary","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- KitsuneStandardLibrary.h\n+++ KitsuneStandardLibrary.h\n@@ -7,7 +7,7 @@\n \/\/\n \n \/* Grep to find all reasonably localisable strings, with the aim of zero false negatives and minimal false positives:\n- (?<!setDateFormat:)(?<!NSClassFromString\\()(?<!reuseIdentifier:)(?<!dequeueReusableCellWithIdentifier:)(?<!requestForGraphPath:)(?<!NSLog\\()(?<!componentsJoinedByString:)(?<!imageNamed:)(?<!initWithNibName:)(?<!LocalizedString\\()(?<!predicateWithFormat:)(?<!DLog\\()@\".+\"\n+ (?<!LocalizedHTMLForKey\\()(?<!setDateFormat:)(?<!NSClassFromString\\()(?<!reuseIdentifier:)(?<!dequeueReusableCellWithIdentifier:)(?<!requestForGraphPath:)(?<!NSLog\\()(?<!componentsJoinedByString:)(?<!imageNamed:)(?<!initWithNibName:)(?<!LocalizedString\\()(?<!predicateWithFormat:)(?<!DLog\\()@\".+\"\n *\/\n \n #define LocalizedString(_key_) NSLocalizedString((_key_), @\"\")\n"} {"commit":"de0d6a6342b37f9a652876eb87834619060c5a02","subject":"srg: do not add uses from current block to phi","message":"srg: do not add uses from current block to phi\n\nSigned-off-by: Tomas Jasek <a36b4b6684030202c63b2f0239a51fa8d4eaac8c@gmail.com>\n","repos":"mchalupa\/dg,mchalupa\/dg,mchalupa\/dg,mchalupa\/dg","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/analysis\/ReachingDefinitions\/Ssa\/SparseRDGraphBuilder.h\n+++ src\/analysis\/ReachingDefinitions\/Ssa\/SparseRDGraphBuilder.h\n@@ -51,6 +51,8 @@\n {\n \/\/ restart state\n stacks.clear();\n+ oldLHS.clear();\n+ phi_nodes.clear();\n \n search(root_block);\n }\n@@ -74,19 +76,20 @@\n \n void search(BlockT *X)\n {\n-\n \/\/ find assignments in block\n for (NodeT *A : X->getNodes())\n {\n+ if (A->getType() != RDNodeType::PHI) {\n+ for (const DefSite& use : A->uses)\n+ {\n+ VarT var = const_cast<VarT>(&use);\n+ addUse(A, var);\n+ }\n+ }\n for (const DefSite& cds : A->defs)\n {\n VarT var = const_cast<VarT>(&cds);\n addAssignment(A, var);\n- }\n- for (const DefSite& use : A->uses)\n- {\n- VarT var = const_cast<VarT>(&use);\n- addUse(A, var);\n }\n }\n \n@@ -96,6 +99,9 @@\n BlockT *Y = edge.target;\n for (NodeT *F : Y->getNodes())\n {\n+ if (F->getType() != RDNodeType::PHI)\n+ continue;\n+\n for (const DefSite& use : F->getUses()) {\n VarT var = const_cast<VarT>(&use);\n addUse(F, var);\n"} {"commit":"5db3ec4011f7b6d616044eabc4aaea858c73d886","subject":"fix adding titles to the database","message":"fix adding titles to the database","repos":"foxbow\/mixplay,foxbow\/mixplay,foxbow\/mixplay,foxbow\/mixplay","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- database.c\n+++ database.c\n@@ -271,6 +271,25 @@\n \treturn num;\n }\n \n+static int dbAddTitle( int db, mptitle *title ) {\n+ struct dbentry_t dbentry;\n+\n+ if( 0 == db ) {\n+ fail( F_FAIL, \"%s - Database not open\", __func__ );\n+ }\n+\n+ lseek( db, 0, SEEK_END );\n+\n+ entry2db( title, &dbentry );\n+\n+ if( write( db, &dbentry, DBESIZE ) != DBESIZE ) {\n+ fail( errno, \"Could not write entry %s!\", title->path );\n+ }\n+\n+ return 0;\n+}\n+\n+\n \/**\n * adds new titles to the database\n * the new titles will have a playcount set to blend into the mix\n@@ -281,7 +300,7 @@\n \tmptitle *dbrunner;\n \tunsigned int count=0, mean=0;\n \n-\tint num=0;\n+\tint num=0, db=-1;\n \n \tdbroot=dbGetMusic( dbname );\n \n@@ -315,6 +334,7 @@\n \n \taddMessage( 1, \"Adding titles...\" );\n \n+\tdb=dbOpen( dbname );\n \twhile( NULL != fsroot ) {\n \t\tactivity( \"Adding\" );\n \t\tdbrunner = findTitle( dbroot, fsroot->path );\n@@ -322,12 +342,13 @@\n \t\tif( NULL == dbrunner ) {\n \t\t\tfillTagInfo( basedir, fsroot );\n \t\t\tfsroot->playcount=mean;\n-\t\t\tdbMarkDirty();\n+\t\t\tdbAddTitle( db, fsroot );\n \t\t\tnum++;\n \t\t}\n \n \t\tfsroot=removeTitle( fsroot );\n \t}\n+\tdbClose( db );\n \n \taddMessage( 1, \"Added %i titles with playcount %i to %s\", num, mean, dbname );\n \treturn num;\n"} {"commit":"af35ca9ec476348fdae884a365ff646ef8ac85ed","subject":"Override on_drop() method instead of old persistent() method","message":"Override on_drop() method instead of old persistent() method\n","repos":"Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand,Kronuz\/Xapiand","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- database.h\n+++ database.h\n@@ -172,8 +172,8 @@\n \n class DatabasesLRU : public lru_map<size_t, DatabaseQueue> {\n private:\n-\tbool persistent(DatabaseQueue & val) {\n-\t\treturn (val.persistent || val.size() < val.count);\n+\tdropping_action on_drop(DatabaseQueue & val) {\n+\t\treturn (val.persistent || val.size() < val.count) ? renew : drop;\n \t}\n \n public:\n"} {"commit":"b69a8cd67ba3e168f7abde5d370ad7870ab26b2f","subject":"check for $GT_PROXY_MODE=old ourselves and pass -old to grid-proxy-init if it's set, since grid-proxy-init in gt-3.9.5 and later doesn't recognize $GT_PROXY_MODE.","message":"check for $GT_PROXY_MODE=old ourselves and pass -old to\ngrid-proxy-init if it's set, since grid-proxy-init in gt-3.9.5 and\nlater doesn't recognize $GT_PROXY_MODE.\n","repos":"ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,gridcf\/gct,globus\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,globus\/globus-toolkit,gridcf\/gct,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,globus\/globus-toolkit,ellert\/globus-toolkit,gridcf\/gct","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- myproxy\/myproxy_init.c\n+++ myproxy\/myproxy_init.c\n@@ -471,14 +471,21 @@\n int rc;\n char command[128];\n int hours;\n+ char *proxy_mode;\n+ int old=0;\n \n assert(proxyfile != NULL);\n \n hours = seconds \/ SECONDS_PER_HOUR;\n- \n- sprintf(command, \"grid-proxy-init -verify -valid %d:0 -out %s%s%s\", hours,\n-\t proxyfile, read_passwd_from_stdin ? \" -pwstdin\" : \"\",\n-\t verbose ? \" -debug\" : \"\");\n+\n+ proxy_mode = getenv(\"GT_PROXY_MODE\");\n+ if (proxy_mode && strcmp(proxy_mode, \"old\") == 0) {\n+\told=1;\n+ }\n+ \n+ sprintf(command, \"grid-proxy-init -verify -valid %d:0 -out %s%s%s%s\",\n+\t hours, proxyfile, read_passwd_from_stdin ? \" -pwstdin\" : \"\",\n+\t verbose ? \" -debug\" : \"\", old ? \" -old\" : \"\");\n rc = system(command);\n \n return rc;\n"} {"commit":"9880e838507d692edf0a77c68786b5c39b5fb5be","subject":"commit via push.cmd","message":"commit via push.cmd\n","repos":"ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes,ice1000\/OI-codes","returncode":1,"stderr":"error: pathspec 'openjudge\/ch0202\/666.c' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"C","diff":"--- openjudge\/ch0202\/666.c\n+++ openjudge\/ch0202\/666.c\n@@ -0,0 +1,16 @@\n+#include <stdio.h>\n+\n+int f(int a, int b) {\n+\tif (b > a) return f(a, a);\n+\tif (!a || b == 1) return 1;\n+\treturn f(a, b - 1) + f(a - b, b);\n+}\n+\n+int main(int argc, char *argv[]) {\n+\tint t, a, b;\n+\tscanf(\"%i\", &t);\n+\twhile (t--) {\n+\t\tscanf(\"%i %i\", &a, &b);\n+\t\tprintf(\"%i\\n\", f(a, b));\n+\t}\n+}"} {"commit":"13184601d473569860a42f2a78cb13670914ae2b","subject":"Addresses #596 An informal .h file to describe functionality provided by the order maintenance structure.","message":"Addresses #596\nAn informal .h file to describe functionality provided by\nthe order maintenance structure.\n\ngit-svn-id: 4b2652e19d8125fd9d24eff55f31fd1beb5a42e7@3498 c7de825b-a66e-492c-adef-691d508d4ae1\n\n","repos":"ollie314\/server,natsys\/mariadb_10.2,davidl-zend\/zenddbi,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2,ollie314\/server,davidl-zend\/zenddbi,ollie314\/server,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,natsys\/mariadb_10.2,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,slanterns\/server,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix","returncode":1,"stderr":"error: pathspec 'order-maintenance\/om.h' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"C","diff":"--- order-maintenance\/om.h\n+++ order-maintenance\/om.h\n@@ -0,0 +1,81 @@\n+#if !defined(OM_H)\n+#define OM_H\n+\n+#ident \"Copyright (c) 2007 Tokutek Inc. All rights reserved.\"\n+\n+\/* Each of these C++ templated items can be wrapped with a simple header that uses pure C. *\/\n+template <typename ITEM_TYPE, typename EXTRA_RENUMBER>\n+struct OMS {\n+ \/* Stuff *\/\n+ OMSITEM* foo; \n+};\n+\n+\/* The actual header would be written entirely in C, using wrapper functions, this is just a starting example. *\/\n+\n+\/* The templated functions are static and inline so the wrapper C functions don't add any overhead. *\/\n+\n+\n+\/*\n+ Questions:\n+ 1- Do we really need to wrap items in an OMITEM<ITEM_TYPE> container?\n+ I assume yes.. for example, the ITEM_TYPE could be a DBT,\n+ and the OMITEM<DBT*> would also hold the index (plus maybe additional stuff).\n+ 2- For a single OMS, do we need to support CHANGING the renumberf function?\n+ i.e. won't it be the same function for every insert for a given OMS?\n+ I'm assuming the renumberf function stays the same, so I provide it just\n+ once in the constructor.\n+ Actually, if the function is constant, and only the 'extra' can differ,\n+ it can be a template parameter and be even faster.\n+ 3- Similarly to #2, will the 'extra info' to the renumberf function ever change?\n+ I'm assuming it stays the same for the duration of an OMS,\n+ and am passing it to the constructor.\n+ 4- For 'insert_in_appropriate place', I know the comparison function is not always available\n+ So I'm giving it as a parameter to that function.\n+ 5- Extra info to the comparison function. This can change (for the lock tree),\n+ so its a parameter to the functoins that use comparisons.\n+ 6- Do we need some way of 'loading' an order maintenance structure?\n+ i.e. use these tags for the following items instead of 'inserting' over and over.\n+*\/\n+\n+template <typename ITEM_TYPE, typename EXTRA_RENUMBER, typename EXTRA_CMP>\n+static inline int toku_oms_create(OMS<ITEM_TYPE, EXTRA_RENUMBER, EXTRA_CMP>** poms,\n+ void (*renumberf)(OMITEM<ITEM_TYPE>*, u_int64_t old_index, u_int64_t new_index, EXTRA_RENUMBER* extra_for_renumberf),\n+ \/* Additional parameters to pass to the callback function. *\/\n+ EXTRA_RENUMBER* extra_for_renumberf);\n+\n+template <typename ITEM_TYPE, typename EXTRA_RENUMBER, typename EXTRA_CMP>\n+static inline int toku_oms_close(OMS<ITEM_TYPE, EXTRA_RENUMBER, EXTRA_CMP>* oms);\n+\n+static inline int toku_oms_insert(OMS* oms, \/* The order maintenance structure. *\/\n+\n+template <typename ITEM_TYPE, typename EXTRA_RENUMBER, typename EXTRA_CMP>\n+static inline int toku_oms_insert(OMS<ITEM_TYPE, EXTRA_RENUMBER, EXTRA_CMP>* oms, \/* The order maintenance structure. *\/\n+ OMITEM<ITEM_TYPE>* prev_omi, \/* Pass in NULL if the new item is at the head, otherwise pass in the predecessor. *\/\n+ DATA_ITEM* item); \/* The user-provided data item. *\/\n+\n+\n+template <typename ITEM_TYPE, typename EXTRA_RENUMBER, typename EXTRA_CMP>\n+static inline int toku_oms_delete(OMS<ITEM_TYPE, EXTRA_RENUMBER, EXTRA_CMP>* oms, \/* The order maintenance structure. *\/\n+ OMSITEM<ITEM_TYPE>* to_remove); \/* The user-provided data item. *\/\n+\n+\n+\/* This will use the comparison function to find the appropriate location,\n+ and then call toku_oms_insert with the appropriate predecessor. *\/\n+static inline int toku_oms_insert_appropriately(OMS<ITEM_TYPE, EXTRA_RENUMBER, EXTRA_CMP>* oms, \/* The order maintenance structure. *\/\n+ DATA_ITEM* item,\n+ void (*cmp)(EXTRA_CMP* extra_for_cmp, ITEM_TYPE*, ITEM_TYPE*),\n+ \/* Additional parameters to pass to the comparison function. *\/\n+ EXTRA_CMP* extra_for_cmp);\n+\n+\n+\/* Example wrapper *\/\n+extern \"C\" {\n+ int toku_node_node_oms_insert(toku_node_oms* oms,\n+ toku_node_omsitem* prev_omi,\n+ DBT* item) {\n+ return toku_oms_insert<toku_node_omsitem, DBT, int, DB>(oms, prev_omi, item);\n+ }\n+}\n+\n+\n+#endif \/* #ifndef OM_H *\/\n"} {"commit":"f36a29200c67f1ee7d5589315b073d54972a3349","subject":"Component: remove return from get_extents","message":"Component: remove return from get_extents\n\nBug: https:\/\/bugzilla.gnome.org\/show_bug.cgi?id=740650\n","repos":"GNOME\/java-atk-wrapper,GNOME\/java-atk-wrapper,thisMagpie\/java-atk-wrapper,thisMagpie\/java-atk-wrapper,GNOME\/java-atk-wrapper,thisMagpie\/java-atk-wrapper","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- jni\/src\/jawcomponent.c\n+++ jni\/src\/jawcomponent.c\n@@ -294,7 +294,6 @@\n (*y) = 0;\n return;\n }\n- return jaw_component_get_extents(component, x, y, width, height, coord_type);\n }\n \n static gboolean\n"} {"commit":"6a4fe1127c5a0ea1515589e416aa29e088170c0e","subject":"Fix more hash index bugs around marking buffers dirty.","message":"Fix more hash index bugs around marking buffers dirty.\n\nIn _hash_freeovflpage(), if we're freeing the overflow page that\nimmediate follows the page to which tuples are being moved (the\nconfusingly-named \"write buffer\"), don't forget to mark that\npage dirty after updating its hasho_nextblkno.\n\nIn _hash_squeezebucket(), it's not necessary to mark the primary\nbucket page dirty if there are no overflow pages, because there's\nnothing to squeeze in that case.\n\nAmit Kapila, with help from Kuntal Ghosh and Dilip Kumar, after\nan initial trouble report by Jeff Janes.\n","repos":"adam8157\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,50wu\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,adam8157\/gpdb,50wu\/gpdb,50wu\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,50wu\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/access\/hash\/hashovfl.c\n+++ src\/backend\/access\/hash\/hashovfl.c\n@@ -452,6 +452,11 @@\n \t\t\tMarkBufferDirty(prevbuf);\n \t\t\t_hash_relbuf(rel, prevbuf);\n \t\t}\n+\t\telse\n+\t\t{\n+\t\t\t\/* ensure to mark prevbuf as dirty *\/\n+\t\t\twbuf_dirty = true;\n+\t\t}\n \t}\n \n \t\/* write and unlock the write buffer *\/\n@@ -643,7 +648,7 @@\n \t *\/\n \tif (!BlockNumberIsValid(wopaque->hasho_nextblkno))\n \t{\n-\t\t_hash_chgbufaccess(rel, wbuf, HASH_WRITE, HASH_NOLOCK);\n+\t\t_hash_chgbufaccess(rel, wbuf, HASH_READ, HASH_NOLOCK);\n \t\treturn;\n \t}\n \n"} {"commit":"b7bb54389c8a2a3f408be63aabc7ea236c8688ed","subject":"Dispatcher should use DISPATCH_WAIT_FINISH mode to wait QEs for init plans","message":"Dispatcher should use DISPATCH_WAIT_FINISH mode to wait QEs for init plans\n\nGPDB always set the REWIND flag for subplans include init plans, in 6195b96780,\nwe enhanced the restriction that if a node is not eager free, we cannot squelch\na node earlier include init plans, this exposes a few hidden bugs: if init plan\ncontains a motion node that needs to be squelched earlier, the whole query will\nget stuck in cdbdisp_checkDispatchResult() because some QEs are still keep\nsending tuples.\n\nTo resolve this, we use DISPATCH_WAIT_FINISH mode for dispatcher to wait the\ndispatch results of init plan, init plan with motion is always executed on\nQD and should always be a SELECT-like plan, init plan must already fetched\nall the tuples it needed before dispatcher waiting for the QEs,\nDISPATCH_WAIT_FINISH is the right mode for init plan.\n","repos":"lisakowen\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,greenplum-db\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,50wu\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,50wu\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/executor\/nodeSubplan.c\n+++ src\/backend\/executor\/nodeSubplan.c\n@@ -1187,7 +1187,7 @@\n \t}\n \n \t\/*\n-\t * If we dispatched to QEs, wait for completion and check for errors.\n+\t * If we dispatched to QEs, wait for completion.\n \t *\/\n \tif (shouldDispatch && \n \t\tqueryDesc && queryDesc->estate &&\n@@ -1196,8 +1196,15 @@\n \t{\n \t\tCdbDispatcherState *ds = queryDesc->estate->dispatcherState;\n \n-\t\t\/* Wait for all gangs to finish. *\/\n-\t\tcdbdisp_checkDispatchResult(ds, DISPATCH_WAIT_NONE);\n+\t\t\/*\n+\t\t * We are in a subplan, the eflags always contains EXEC_FLAG_REWIND which\n+\t\t * means we cannot squelch the motion node earlier and some QEs still keep\n+\t\t * sending tuples.\n+\t\t *\n+\t\t * we get all the tuples we needed, DISPATCH_WAIT_FINISH tell QEs stopping\n+\t\t * sending tuples and wait them to complete.\n+\t\t *\/\n+\t\tcdbdisp_checkDispatchResult(ds, DISPATCH_WAIT_FINISH);\n \n \t\t\/* If EXPLAIN ANALYZE, collect execution stats from qExecs. *\/\n \t\tif (planstate->instrument && planstate->instrument->need_cdb)\n"} {"commit":"7d781c62b1dfe9cabbc57156581799b3150ab317","subject":"[ backpatched to 8.0.X.]","message":"[ backpatched to 8.0.X.]\n\n> >> 3) I restarted the postmaster both times. I got this error\n> both times.\n> >> :25: ERROR: could not load library \"C:\/Program\n> >> Files\/PostgreSQL\/8.0\/lib\/testtrigfuncs.dll\": dynamic load error\n>\n> > Yes. We really need to look at fixing that error message. I had\n> > forgotten it completely :-(\n>\n> > Bruce, you think we can sneak that in after feature freeze? I would\n> > call it a bugfix :-)\n>\n> Me too. That's been on the radar for awhile --- please do\n> send in a patch.\n\nHere we go, that wasn't too hard :-)\n\nApart from adding the error handling, it does one more thing: it changes\nthe errormode when loading the DLLs. Previously if a DLL was broken, or\nreferenced other DLLs that couldn't be found, a popup dialog box would\nappear on the screen. Which had to be clicked before the backend could\ncontinue. This patch also disables the popup error message for DLL\nloads.\n\nI think this is something we should consider doing for the entire\nbackend - disable those popups, and say we deal with it ourselves. What\ndo you other win32 hackers thinnk about this?\n\nIn the meantime, this patch fixes the error msgs. Please apply for 8.1\nand please consider a backpatch to 8.0.\n\n\nMagnus Hagander\n","repos":"0x0FFF\/gpdb,janebeckman\/gpdb,tangp3\/gpdb,0x0FFF\/gpdb,foyzur\/gpdb,foyzur\/gpdb,ashwinstar\/gpdb,zaksoup\/gpdb,Chibin\/gpdb,lpetrov-pivotal\/gpdb,yuanzhao\/gpdb,xuegang\/gpdb,atris\/gpdb,Chibin\/gpdb,arcivanov\/postgres-xl,postmind-net\/postgres-xl,jmcatamney\/gpdb,foyzur\/gpdb,atris\/gpdb,techdragon\/Postgres-XL,tangp3\/gpdb,rubikloud\/gpdb,royc1\/gpdb,janebeckman\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,cjcjameson\/gpdb,jmcatamney\/gpdb,lpetrov-pivotal\/gpdb,greenplum-db\/gpdb,CraigHarris\/gpdb,royc1\/gpdb,lintzc\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,kmjungersen\/PostgresXL,kaknikhil\/gpdb,lisakowen\/gpdb,kaknikhil\/gpdb,pavanvd\/postgres-xl,royc1\/gpdb,zaksoup\/gpdb,CraigHarris\/gpdb,ahachete\/gpdb,edespino\/gpdb,cjcjameson\/gpdb,arcivanov\/postgres-xl,rvs\/gpdb,ovr\/postgres-xl,ashwinstar\/gpdb,adam8157\/gpdb,snaga\/postgres-xl,rubikloud\/gpdb,xinzweb\/gpdb,yuanzhao\/gpdb,kmjungersen\/PostgresXL,50wu\/gpdb,rubikloud\/gpdb,yazun\/postgres-xl,rvs\/gpdb,zeroae\/postgres-xl,janebeckman\/gpdb,xuegang\/gpdb,lpetrov-pivotal\/gpdb,Postgres-XL\/Postgres-XL,tpostgres-projects\/tPostgres,pavanvd\/postgres-xl,randomtask1155\/gpdb,greenplum-db\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,tangp3\/gpdb,foyzur\/gpdb,lisakowen\/gpdb,cjcjameson\/gpdb,oberstet\/postgres-xl,oberstet\/postgres-xl,xinzweb\/gpdb,xuegang\/gpdb,edespino\/gpdb,lintzc\/gpdb,Chibin\/gpdb,greenplum-db\/gpdb,tpostgres-projects\/tPostgres,snaga\/postgres-xl,Postgres-XL\/Postgres-XL,greenplum-db\/gpdb,snaga\/postgres-xl,Chibin\/gpdb,lintzc\/gpdb,ahachete\/gpdb,xinzweb\/gpdb,rvs\/gpdb,adam8157\/gpdb,kaknikhil\/gpdb,tangp3\/gpdb,50wu\/gpdb,yazun\/postgres-xl,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,techdragon\/Postgres-XL,zaksoup\/gpdb,yazun\/postgres-xl,chrishajas\/gpdb,zeroae\/postgres-xl,yazun\/postgres-xl,cjcjameson\/gpdb,Quikling\/gpdb,atris\/gpdb,lisakowen\/gpdb,zaksoup\/gpdb,Chibin\/gpdb,0x0FFF\/gpdb,atris\/gpdb,rvs\/gpdb,xinzweb\/gpdb,rvs\/gpdb,kmjungersen\/PostgresXL,arcivanov\/postgres-xl,tangp3\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,techdragon\/Postgres-XL,janebeckman\/gpdb,techdragon\/Postgres-XL,rubikloud\/gpdb,foyzur\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,CraigHarris\/gpdb,50wu\/gpdb,chrishajas\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,xinzweb\/gpdb,snaga\/postgres-xl,pavanvd\/postgres-xl,chrishajas\/gpdb,Quikling\/gpdb,lintzc\/gpdb,ahachete\/gpdb,arcivanov\/postgres-xl,pavanvd\/postgres-xl,50wu\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,Postgres-XL\/Postgres-XL,rvs\/gpdb,chrishajas\/gpdb,xuegang\/gpdb,cjcjameson\/gpdb,ahachete\/gpdb,techdragon\/Postgres-XL,CraigHarris\/gpdb,randomtask1155\/gpdb,Quikling\/gpdb,xuegang\/gpdb,tangp3\/gpdb,edespino\/gpdb,zaksoup\/gpdb,ahachete\/gpdb,tpostgres-projects\/tPostgres,royc1\/gpdb,lisakowen\/gpdb,royc1\/gpdb,tangp3\/gpdb,edespino\/gpdb,Chibin\/gpdb,zeroae\/postgres-xl,zeroae\/postgres-xl,arcivanov\/postgres-xl,0x0FFF\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,ahachete\/gpdb,0x0FFF\/gpdb,janebeckman\/gpdb,randomtask1155\/gpdb,tpostgres-projects\/tPostgres,edespino\/gpdb,edespino\/gpdb,postmind-net\/postgres-xl,snaga\/postgres-xl,kaknikhil\/gpdb,CraigHarris\/gpdb,postmind-net\/postgres-xl,lisakowen\/gpdb,rvs\/gpdb,tpostgres-projects\/tPostgres,lpetrov-pivotal\/gpdb,50wu\/gpdb,kaknikhil\/gpdb,xinzweb\/gpdb,randomtask1155\/gpdb,lpetrov-pivotal\/gpdb,yuanzhao\/gpdb,zeroae\/postgres-xl,chrishajas\/gpdb,atris\/gpdb,randomtask1155\/gpdb,oberstet\/postgres-xl,xinzweb\/gpdb,chrishajas\/gpdb,postmind-net\/postgres-xl,janebeckman\/gpdb,Chibin\/gpdb,lpetrov-pivotal\/gpdb,cjcjameson\/gpdb,edespino\/gpdb,oberstet\/postgres-xl,ovr\/postgres-xl,Quikling\/gpdb,adam8157\/gpdb,foyzur\/gpdb,xuegang\/gpdb,CraigHarris\/gpdb,lintzc\/gpdb,Quikling\/gpdb,cjcjameson\/gpdb,xuegang\/gpdb,zaksoup\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,lintzc\/gpdb,ashwinstar\/gpdb,atris\/gpdb,rvs\/gpdb,kaknikhil\/gpdb,kmjungersen\/PostgresXL,zaksoup\/gpdb,kaknikhil\/gpdb,Chibin\/gpdb,zaksoup\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,kaknikhil\/gpdb,royc1\/gpdb,ovr\/postgres-xl,Postgres-XL\/Postgres-XL,kmjungersen\/PostgresXL,edespino\/gpdb,lisakowen\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,atris\/gpdb,rvs\/gpdb,atris\/gpdb,Chibin\/gpdb,ovr\/postgres-xl,50wu\/gpdb,oberstet\/postgres-xl,ashwinstar\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,arcivanov\/postgres-xl,adam8157\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,greenplum-db\/gpdb,yuanzhao\/gpdb,rubikloud\/gpdb,rubikloud\/gpdb,lintzc\/gpdb,xuegang\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,tangp3\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,yazun\/postgres-xl,yuanzhao\/gpdb,edespino\/gpdb,ahachete\/gpdb,Postgres-XL\/Postgres-XL,greenplum-db\/gpdb,edespino\/gpdb,pavanvd\/postgres-xl,yuanzhao\/gpdb,randomtask1155\/gpdb,CraigHarris\/gpdb,lpetrov-pivotal\/gpdb,CraigHarris\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,randomtask1155\/gpdb,lisakowen\/gpdb,ovr\/postgres-xl,chrishajas\/gpdb,adam8157\/gpdb,royc1\/gpdb,xuegang\/gpdb,0x0FFF\/gpdb,kaknikhil\/gpdb,jmcatamney\/gpdb,yuanzhao\/gpdb,cjcjameson\/gpdb,greenplum-db\/gpdb,randomtask1155\/gpdb,foyzur\/gpdb,jmcatamney\/gpdb,CraigHarris\/gpdb,janebeckman\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,ahachete\/gpdb,adam8157\/gpdb,foyzur\/gpdb,jmcatamney\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/port\/dynloader\/win32.c\n+++ src\/backend\/port\/dynloader\/win32.c\n@@ -1,32 +1,84 @@\n-\/* $PostgreSQL: pgsql\/src\/backend\/port\/dynloader\/win32.c,v 1.5 2004\/12\/02 19:38:50 momjian Exp $ *\/\n+\/* $PostgreSQL: pgsql\/src\/backend\/port\/dynloader\/win32.c,v 1.6 2005\/08\/12 21:23:10 momjian Exp $ *\/\n \n #include <windows.h>\n+#include <stdio.h>\n \n char *dlerror(void);\n int dlclose(void *handle);\n void *dlsym(void *handle, const char *symbol);\n void *dlopen(const char *path, int mode);\n \n+static char last_dyn_error[512];\n+\n+static void set_dl_error(void)\n+{\n+\tDWORD err = GetLastError();\n+\n+\tif (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |\n+\t\t\t\tFORMAT_MESSAGE_FROM_SYSTEM,\n+\t\t\t\tNULL,\n+\t\t\t\terr,\n+\t\t\t\tMAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\n+\t\t\t\tlast_dyn_error,\n+\t\t\t\tsizeof(last_dyn_error)-1,\n+\t\t\t\tNULL) == 0)\n+\t{\n+\t\tsnprintf(last_dyn_error, sizeof(last_dyn_error)-1,\n+\t\t\t\t\"unknown error %lu\", err);\n+\t}\t\n+}\n+\n char *\n dlerror(void)\n {\n-\treturn \"dynamic load error\";\n+\tif (last_dyn_error[0])\n+\t\treturn last_dyn_error;\n+\telse\n+\t\treturn NULL;\n }\n \n int\n dlclose(void *handle)\n {\n-\treturn FreeLibrary((HMODULE) handle) ? 0 : 1;\n+\tif (!FreeLibrary((HMODULE) handle))\n+\t{\n+\t\tset_dl_error();\n+\t\treturn 1;\n+\t}\n+\tlast_dyn_error[0] = 0;\n+\treturn 0;\n }\n \n void *\n dlsym(void *handle, const char *symbol)\n {\n-\treturn (void *) GetProcAddress((HMODULE) handle, symbol);\n+\tvoid *ptr;\n+\tptr = GetProcAddress((HMODULE) handle, symbol);\n+\tif (!ptr) \n+\t{\n+\t\tset_dl_error();\n+\t\treturn NULL;\n+\t}\n+\tlast_dyn_error[0] = 0;\n+\treturn ptr;\n }\n \n void *\n dlopen(const char *path, int mode)\n {\n-\treturn (void *) LoadLibrary(path);\n+\tHMODULE h;\n+\tint prevmode;\n+\n+\t\/* Disable popup error messages when loading DLLs *\/\n+\tprevmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);\n+\th = LoadLibrary(path);\n+\tSetErrorMode(prevmode);\n+\t\n+\tif (!h) \n+\t{\n+\t\tset_dl_error();\n+\t\treturn NULL;\n+\t}\n+\tlast_dyn_error[0] = 0;\n+\treturn (void *) h;\n }\n"} {"commit":"80b8d486d7f040345206873739a214fe679233c1","subject":"we get an inte so no need to look for a string an atoi() it afterwards","message":"we get an inte so no need to look for a string an atoi() it afterwards\n","repos":"GeeXboX\/enna,GeeXboX\/enna","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/modules\/activity\/tv\/tv.c\n+++ src\/modules\/activity\/tv\/tv.c\n@@ -185,6 +185,7 @@\n cfg_tv_section_load (const char *section)\n {\n const char *value = NULL;\n+ int v;\n \n enna_log(ENNA_MSG_INFO, ENNA_MODULE_NAME, \"parameters:\");\n \n@@ -197,13 +198,13 @@\n }\n \n #ifdef BUILD_LIBSVDRP\n- value = enna_config_string_get(section, \"svdrp_port\");\n- if (value)\n- tv_cfg.svdrp_port = atoi(value);\n-\n- value = enna_config_string_get(section, \"svdrp_timeout\");\n- if (value)\n- tv_cfg.svdrp_timeout = atoi(value);\n+ v = enna_config_int_get(section, \"svdrp_port\");\n+ if (v)\n+ tv_cfg.svdrp_port = v;\n+\n+ v = enna_config_int_get(section, \"svdrp_timeout\");\n+ if (v)\n+ tv_cfg.svdrp_timeout = v;\n \n value = enna_config_string_get(section, \"svdrp_verbosity\");\n if (value)\n@@ -218,9 +219,9 @@\n }\n }\n \n- value = enna_config_string_get(section, \"timer_quit_threshold\");\n- if (value)\n- tv_cfg.timer_threshold = atoi(value);\n+ v = enna_config_int_get(section, \"timer_quit_threshold\");\n+ if (v)\n+ tv_cfg.timer_threshold = v;\n #endif \/* BUILD_LIBSVDRP *\/\n \n if (!value)\n"} {"commit":"851f7661154f6de6dd0cfef5fec5aa7cce0a7ae8","subject":"array_ref() should set isNull to false explicitly if it's not going to return NULL.","message":"array_ref() should set isNull to false explicitly if it's not going to\nreturn NULL.\n","repos":"50wu\/gpdb,royc1\/gpdb,atris\/gpdb,janebeckman\/gpdb,lintzc\/gpdb,jmcatamney\/gpdb,postmind-net\/postgres-xl,xinzweb\/gpdb,janebeckman\/gpdb,lpetrov-pivotal\/gpdb,ahachete\/gpdb,chrishajas\/gpdb,ovr\/postgres-xl,ashwinstar\/gpdb,xinzweb\/gpdb,kmjungersen\/PostgresXL,xuegang\/gpdb,snaga\/postgres-xl,zaksoup\/gpdb,lisakowen\/gpdb,kaknikhil\/gpdb,greenplum-db\/gpdb,ovr\/postgres-xl,chrishajas\/gpdb,Chibin\/gpdb,50wu\/gpdb,ovr\/postgres-xl,50wu\/gpdb,oberstet\/postgres-xl,janebeckman\/gpdb,atris\/gpdb,techdragon\/Postgres-XL,pavanvd\/postgres-xl,Quikling\/gpdb,rubikloud\/gpdb,Quikling\/gpdb,zaksoup\/gpdb,arcivanov\/postgres-xl,randomtask1155\/gpdb,randomtask1155\/gpdb,zeroae\/postgres-xl,atris\/gpdb,0x0FFF\/gpdb,ashwinstar\/gpdb,xuegang\/gpdb,foyzur\/gpdb,arcivanov\/postgres-xl,Postgres-XL\/Postgres-XL,chrishajas\/gpdb,lintzc\/gpdb,CraigHarris\/gpdb,kaknikhil\/gpdb,atris\/gpdb,cjcjameson\/gpdb,adam8157\/gpdb,rubikloud\/gpdb,edespino\/gpdb,zaksoup\/gpdb,0x0FFF\/gpdb,lpetrov-pivotal\/gpdb,xuegang\/gpdb,chrishajas\/gpdb,yazun\/postgres-xl,cjcjameson\/gpdb,janebeckman\/gpdb,ovr\/postgres-xl,oberstet\/postgres-xl,janebeckman\/gpdb,rvs\/gpdb,Quikling\/gpdb,zaksoup\/gpdb,lintzc\/gpdb,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,Quikling\/gpdb,techdragon\/Postgres-XL,adam8157\/gpdb,kmjungersen\/PostgresXL,rvs\/gpdb,Chibin\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,ashwinstar\/gpdb,50wu\/gpdb,lpetrov-pivotal\/gpdb,greenplum-db\/gpdb,tangp3\/gpdb,rvs\/gpdb,Postgres-XL\/Postgres-XL,snaga\/postgres-xl,cjcjameson\/gpdb,kaknikhil\/gpdb,ashwinstar\/gpdb,tangp3\/gpdb,xinzweb\/gpdb,Quikling\/gpdb,xuegang\/gpdb,tangp3\/gpdb,greenplum-db\/gpdb,pavanvd\/postgres-xl,postmind-net\/postgres-xl,greenplum-db\/gpdb,cjcjameson\/gpdb,rvs\/gpdb,techdragon\/Postgres-XL,Chibin\/gpdb,lintzc\/gpdb,foyzur\/gpdb,kaknikhil\/gpdb,royc1\/gpdb,greenplum-db\/gpdb,rvs\/gpdb,CraigHarris\/gpdb,Quikling\/gpdb,xuegang\/gpdb,jmcatamney\/gpdb,yazun\/postgres-xl,50wu\/gpdb,zaksoup\/gpdb,yuanzhao\/gpdb,rvs\/gpdb,rvs\/gpdb,janebeckman\/gpdb,Chibin\/gpdb,oberstet\/postgres-xl,zeroae\/postgres-xl,randomtask1155\/gpdb,cjcjameson\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,Chibin\/gpdb,rubikloud\/gpdb,edespino\/gpdb,tangp3\/gpdb,janebeckman\/gpdb,kaknikhil\/gpdb,kaknikhil\/gpdb,randomtask1155\/gpdb,zeroae\/postgres-xl,greenplum-db\/gpdb,CraigHarris\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,yuanzhao\/gpdb,zaksoup\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,lisakowen\/gpdb,arcivanov\/postgres-xl,tangp3\/gpdb,foyzur\/gpdb,ahachete\/gpdb,0x0FFF\/gpdb,ahachete\/gpdb,yazun\/postgres-xl,atris\/gpdb,ahachete\/gpdb,edespino\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,postmind-net\/postgres-xl,ovr\/postgres-xl,postmind-net\/postgres-xl,yazun\/postgres-xl,Chibin\/gpdb,snaga\/postgres-xl,adam8157\/gpdb,kaknikhil\/gpdb,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,rubikloud\/gpdb,zaksoup\/gpdb,xinzweb\/gpdb,tangp3\/gpdb,pavanvd\/postgres-xl,oberstet\/postgres-xl,greenplum-db\/gpdb,arcivanov\/postgres-xl,kmjungersen\/PostgresXL,Quikling\/gpdb,janebeckman\/gpdb,tangp3\/gpdb,randomtask1155\/gpdb,oberstet\/postgres-xl,ashwinstar\/gpdb,royc1\/gpdb,rvs\/gpdb,foyzur\/gpdb,adam8157\/gpdb,CraigHarris\/gpdb,rubikloud\/gpdb,chrishajas\/gpdb,snaga\/postgres-xl,xinzweb\/gpdb,adam8157\/gpdb,janebeckman\/gpdb,atris\/gpdb,lpetrov-pivotal\/gpdb,chrishajas\/gpdb,foyzur\/gpdb,xuegang\/gpdb,pavanvd\/postgres-xl,Quikling\/gpdb,ahachete\/gpdb,royc1\/gpdb,xuegang\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,yazun\/postgres-xl,zaksoup\/gpdb,xuegang\/gpdb,tangp3\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,kmjungersen\/PostgresXL,rubikloud\/gpdb,lpetrov-pivotal\/gpdb,kaknikhil\/gpdb,chrishajas\/gpdb,Chibin\/gpdb,zeroae\/postgres-xl,cjcjameson\/gpdb,yuanzhao\/gpdb,0x0FFF\/gpdb,Chibin\/gpdb,CraigHarris\/gpdb,techdragon\/Postgres-XL,edespino\/gpdb,CraigHarris\/gpdb,50wu\/gpdb,kaknikhil\/gpdb,techdragon\/Postgres-XL,lintzc\/gpdb,edespino\/gpdb,foyzur\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,50wu\/gpdb,edespino\/gpdb,rubikloud\/gpdb,rvs\/gpdb,snaga\/postgres-xl,royc1\/gpdb,lintzc\/gpdb,kaknikhil\/gpdb,ahachete\/gpdb,edespino\/gpdb,foyzur\/gpdb,edespino\/gpdb,edespino\/gpdb,xinzweb\/gpdb,postmind-net\/postgres-xl,jmcatamney\/gpdb,Chibin\/gpdb,50wu\/gpdb,lintzc\/gpdb,randomtask1155\/gpdb,0x0FFF\/gpdb,pavanvd\/postgres-xl,lpetrov-pivotal\/gpdb,cjcjameson\/gpdb,arcivanov\/postgres-xl,0x0FFF\/gpdb,xuegang\/gpdb,adam8157\/gpdb,CraigHarris\/gpdb,jmcatamney\/gpdb,cjcjameson\/gpdb,randomtask1155\/gpdb,kmjungersen\/PostgresXL,yuanzhao\/gpdb,adam8157\/gpdb,ashwinstar\/gpdb,rubikloud\/gpdb,jmcatamney\/gpdb,randomtask1155\/gpdb,royc1\/gpdb,Postgres-XL\/Postgres-XL,CraigHarris\/gpdb,ahachete\/gpdb,cjcjameson\/gpdb,jmcatamney\/gpdb,lpetrov-pivotal\/gpdb,0x0FFF\/gpdb,0x0FFF\/gpdb,jmcatamney\/gpdb,ahachete\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,CraigHarris\/gpdb,tpostgres-projects\/tPostgres,Quikling\/gpdb,Postgres-XL\/Postgres-XL,lpetrov-pivotal\/gpdb,janebeckman\/gpdb,yuanzhao\/gpdb,royc1\/gpdb,tpostgres-projects\/tPostgres,yuanzhao\/gpdb,zeroae\/postgres-xl,atris\/gpdb,jmcatamney\/gpdb,Quikling\/gpdb,edespino\/gpdb,lintzc\/gpdb,atris\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/adt\/arrayfuncs.c\n+++ src\/backend\/utils\/adt\/arrayfuncs.c\n@@ -8,7 +8,7 @@\n *\n *\n * IDENTIFICATION\n- *\t $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/arrayfuncs.c,v 1.73 2002\/02\/18 14:24:34 momjian Exp $\n+ *\t $Header: \/cvsroot\/pgsql\/src\/backend\/utils\/adt\/arrayfuncs.c,v 1.74 2002\/03\/01 22:17:10 petere Exp $\n *\n *-------------------------------------------------------------------------\n *\/\n@@ -812,6 +812,7 @@\n \n \tretptr = array_seek(arraydataptr, elmlen, offset);\n \n+\t*isNull = false;\n \treturn ArrayCast(retptr, elmbyval, elmlen);\n }\n \n"} {"commit":"1171dbde2daef8f0dcd1dc1e54531a0d8dd34d88","subject":"Fix incorrect return value in JSON equality function for scalars","message":"Fix incorrect return value in JSON equality function for scalars\n\nequalsJsonbScalarValue() uses a boolean as return type, however for one\ncode path -1 gets returned, which is confusing. The origin of the\nconfusion is visibly that this code got copy-pasted from\ncompareJsonbScalarValue() since it has been introduced in d1d50bf.\n\nNo backpatch, as this is only cosmetic.\n\nAuthor: Rikard Falkeborn\nDiscussion: c0e326de9edfbfabbd19ed5f0a3e13fd55f5bdc5@mail.gmail.com\n","repos":"lisakowen\/gpdb,50wu\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,50wu\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,xinzweb\/gpdb,50wu\/gpdb,lisakowen\/gpdb,50wu\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/adt\/jsonb_util.c\n+++ src\/backend\/utils\/adt\/jsonb_util.c\n@@ -1318,7 +1318,7 @@\n \t\t}\n \t}\n \telog(ERROR, \"jsonb scalar type mismatch\");\n-\treturn -1;\n+\treturn false;\n }\n \n \/*\n"} {"commit":"d4fca5e6c7363ba6ee4de7b8d72d68064fa864ca","subject":"Fix another outdated comment.","message":"Fix another outdated comment.\n\nPreloading is done by logtape.c now.\n","repos":"greenplum-db\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,50wu\/gpdb,50wu\/gpdb,50wu\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,50wu\/gpdb,50wu\/gpdb,adam8157\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,greenplum-db\/gpdb,50wu\/gpdb,xinzweb\/gpdb,greenplum-db\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,xinzweb\/gpdb","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/backend\/utils\/sort\/tuplesort.c\n+++ src\/backend\/utils\/sort\/tuplesort.c\n@@ -2882,9 +2882,8 @@\n * beginmerge - initialize for a merge pass\n *\n * We decrease the counts of real and dummy runs for each tape, and mark\n- * which tapes contain active input runs in mergeactive[]. Then, load\n- * as many tuples as we can from each active input tape, and finally\n- * fill the merge heap with the first tuple from each active tape.\n+ * which tapes contain active input runs in mergeactive[]. Then, fill the\n+ * merge heap with the first tuple from each active tape.\n *\/\n static void\n beginmerge(Tuplesortstate *state)\n"} {"commit":"884584546a4c3a0c1e29fa750755dbfdf1c040f8","subject":"clang format","message":"clang format\n","repos":"CodaFi\/swift,tkremenek\/swift,apple\/swift,parkera\/swift,airspeedswift\/swift,xwu\/swift,jckarter\/swift,parkera\/swift,aschwaighofer\/swift,jckarter\/swift,rudkx\/swift,nathawes\/swift,stephentyrone\/swift,ahoppen\/swift,glessard\/swift,tkremenek\/swift,tkremenek\/swift,allevato\/swift,JGiola\/swift,aschwaighofer\/swift,CodaFi\/swift,allevato\/swift,roambotics\/swift,ahoppen\/swift,roambotics\/swift,harlanhaskins\/swift,hooman\/swift,JGiola\/swift,rudkx\/swift,parkera\/swift,stephentyrone\/swift,benlangmuir\/swift,airspeedswift\/swift,glessard\/swift,jckarter\/swift,apple\/swift,xwu\/swift,parkera\/swift,benlangmuir\/swift,allevato\/swift,airspeedswift\/swift,jmgc\/swift,CodaFi\/swift,stephentyrone\/swift,hooman\/swift,tkremenek\/swift,gregomni\/swift,xwu\/swift,nathawes\/swift,nathawes\/swift,xwu\/swift,parkera\/swift,apple\/swift,ahoppen\/swift,jmgc\/swift,glessard\/swift,ahoppen\/swift,atrick\/swift,rudkx\/swift,tkremenek\/swift,jmgc\/swift,xwu\/swift,hooman\/swift,aschwaighofer\/swift,glessard\/swift,nathawes\/swift,allevato\/swift,atrick\/swift,aschwaighofer\/swift,xwu\/swift,aschwaighofer\/swift,hooman\/swift,gregomni\/swift,hooman\/swift,tkremenek\/swift,benlangmuir\/swift,airspeedswift\/swift,gregomni\/swift,jmgc\/swift,gregomni\/swift,apple\/swift,atrick\/swift,apple\/swift,nathawes\/swift,JGiola\/swift,airspeedswift\/swift,benlangmuir\/swift,CodaFi\/swift,glessard\/swift,aschwaighofer\/swift,jmgc\/swift,glessard\/swift,atrick\/swift,jckarter\/swift,rudkx\/swift,rudkx\/swift,roambotics\/swift,aschwaighofer\/swift,jmgc\/swift,JGiola\/swift,jckarter\/swift,apple\/swift,parkera\/swift,harlanhaskins\/swift,jmgc\/swift,CodaFi\/swift,roambotics\/swift,gregomni\/swift,stephentyrone\/swift,parkera\/swift,airspeedswift\/swift,hooman\/swift,stephentyrone\/swift,ahoppen\/swift,gregomni\/swift,stephentyrone\/swift,parkera\/swift,allevato\/swift,nathawes\/swift,roambotics\/swift,jckarter\/swift,rudkx\/swift,nathawes\/swift,airspeedswift\/swift,harlanhaskins\/swift,ahoppen\/swift,xwu\/swift,benlangmuir\/swift,CodaFi\/swift,roambotics\/swift,JGiola\/swift,harlanhaskins\/swift,atrick\/swift,atrick\/swift,stephentyrone\/swift,harlanhaskins\/swift,benlangmuir\/swift,harlanhaskins\/swift,harlanhaskins\/swift,hooman\/swift,JGiola\/swift,jckarter\/swift,allevato\/swift,CodaFi\/swift,tkremenek\/swift,allevato\/swift","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- lib\/Sema\/DerivedConformances.h\n+++ lib\/Sema\/DerivedConformances.h\n@@ -133,14 +133,14 @@\n \/\/\/\n \/\/\/ \\returns True if the requirement can be derived.\n static bool canDeriveComparable(DeclContext *DC, EnumDecl *enumeration);\n- \n+\n \/\/\/ Derive an Equatable requirement for a type.\n \/\/\/\n \/\/\/ This is implemented for enums without associated or raw values.\n \/\/\/\n \/\/\/ \\returns the derived member, which will also be added to the type.\n ValueDecl *deriveComparable(ValueDecl *requirement);\n- \n+\n \/\/\/ Determine if an Equatable requirement can be derived for a type.\n \/\/\/\n \/\/\/ This is implemented for enums without associated values or all-Equatable\n@@ -232,42 +232,42 @@\n \/\/\/\n \/\/\/ \\param synthesizing The decl that is being synthesized.\n bool checkAndDiagnoseDisallowedContext(ValueDecl *synthesizing) const;\n- \n+\n \/\/\/ Returns a generated guard statement that checks whether the given lhs and\n \/\/\/ rhs expressions are equal. If not equal, the else block for the guard\n \/\/\/ returns `guardReturnValue`.\n \/\/\/ \\p C The AST context.\n \/\/\/ \\p lhsExpr The first expression to compare for equality.\n \/\/\/ \\p rhsExpr The second expression to compare for equality.\n- \/\/\/ \\p guardReturnValue The expression to return if the two sides are not equal\n- static \n- GuardStmt *returnIfNotEqualGuard(ASTContext &C, Expr *lhsExpr, Expr *rhsExpr, \n- Expr *guardReturnValue);\n- \/\/ return false \n- static \n- GuardStmt *returnFalseIfNotEqualGuard(ASTContext &C, Expr *lhsExpr, Expr *rhsExpr);\n+ \/\/\/ \\p guardReturnValue The expression to return if the two sides are not\n+ \/\/\/ equal\n+ static GuardStmt *returnIfNotEqualGuard(ASTContext &C, Expr *lhsExpr,\n+ Expr *rhsExpr,\n+ Expr *guardReturnValue);\n+ \/\/ return false\n+ static GuardStmt *returnFalseIfNotEqualGuard(ASTContext &C, Expr *lhsExpr,\n+ Expr *rhsExpr);\n \/\/ return lhs < rhs\n- static \n- GuardStmt *returnComparisonIfNotEqualGuard(ASTContext &C, Expr *lhsExpr, Expr *rhsExpr);\n- \n- \/\/\/ Returns the ParamDecl for each associated value of the given enum whose type\n- \/\/\/ does not conform to a protocol\n- \/\/\/ \\p theEnum The enum whose elements and associated values should be checked.\n- \/\/\/ \\p protocol The protocol being requested.\n- \/\/\/ \\return The ParamDecl of each associated value whose type does not conform.\n+ static GuardStmt *\n+ returnComparisonIfNotEqualGuard(ASTContext &C, Expr *lhsExpr, Expr *rhsExpr);\n+\n+ \/\/\/ Returns the ParamDecl for each associated value of the given enum whose\n+ \/\/\/ type does not conform to a protocol \\p theEnum The enum whose elements and\n+ \/\/\/ associated values should be checked. \\p protocol The protocol being\n+ \/\/\/ requested. \\return The ParamDecl of each associated value whose type does\n+ \/\/\/ not conform.\n static SmallVector<ParamDecl *, 3>\n associatedValuesNotConformingToProtocol(DeclContext *DC, EnumDecl *theEnum,\n- ProtocolDecl *protocol);\n+ ProtocolDecl *protocol);\n \n \/\/\/ Returns true if, for every element of the given enum, it either has no\n \/\/\/ associated values or all of them conform to a protocol.\n- \/\/\/ \\p theEnum The enum whose elements and associated values should be checked.\n- \/\/\/ \\p protocol The protocol being requested.\n- \/\/\/ \\return True if all associated values of all elements of the enum conform.\n- static bool \n- allAssociatedValuesConformToProtocol(DeclContext *DC,\n- EnumDecl *theEnum,\n- ProtocolDecl *protocol);\n+ \/\/\/ \\p theEnum The enum whose elements and associated values should be\n+ \/\/\/ checked. \\p protocol The protocol being requested. \\return True if all\n+ \/\/\/ associated values of all elements of the enum conform.\n+ static bool allAssociatedValuesConformToProtocol(DeclContext *DC,\n+ EnumDecl *theEnum,\n+ ProtocolDecl *protocol);\n \/\/\/ Create AST statements which convert from an enum to an Int with a switch.\n \/\/\/ \\p stmts The generated statements are appended to this vector.\n \/\/\/ \\p parentDC Either an extension or the enum itself.\n@@ -277,22 +277,18 @@\n \/\/\/ \\p indexName The name of the output variable.\n \/\/\/ \\return A DeclRefExpr of the output variable (of type Int).\n static DeclRefExpr *\n- convertEnumToIndex( SmallVectorImpl<ASTNode> &stmts,\n- DeclContext *parentDC,\n- EnumDecl *enumDecl,\n- VarDecl *enumVarDecl,\n- AbstractFunctionDecl *funcDecl,\n- const char *indexName);\n-\n- static Pattern*\n- enumElementPayloadSubpattern(EnumElementDecl *enumElementDecl,\n- char varPrefix, DeclContext *varContext,\n- SmallVectorImpl<VarDecl*> &boundVars);\n- \n- static VarDecl *\n- indexedVarDecl(char prefixChar, int index, Type type,\n- DeclContext *varContext);\n+ convertEnumToIndex(SmallVectorImpl<ASTNode> &stmts, DeclContext *parentDC,\n+ EnumDecl *enumDecl, VarDecl *enumVarDecl,\n+ AbstractFunctionDecl *funcDecl, const char *indexName);\n+\n+ static Pattern *\n+ enumElementPayloadSubpattern(EnumElementDecl *enumElementDecl, char varPrefix,\n+ DeclContext *varContext,\n+ SmallVectorImpl<VarDecl *> &boundVars);\n+\n+ static VarDecl *indexedVarDecl(char prefixChar, int index, Type type,\n+ DeclContext *varContext);\n };\n-}\n+} \/\/ namespace swift\n \n #endif\n"} {"commit":"9a740a7f6d277b0224852d29c1eda285c5c5476f","subject":"more cirrus work","message":"more cirrus work\n","repos":"jezze\/fudge,jezze\/fudge,jezze\/fudge","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- modules\/arch\/x86\/cirrus\/driver.c\n+++ modules\/arch\/x86\/cirrus\/driver.c\n@@ -10,7 +10,7 @@\n #define CIRRUS_PCI_VENDOR 0x1013\n #define CIRRUS_PCI_DEVICE 0x00B8\n \n-#define NU_FIXED_CLOCKS 21\n+#define CLOCKS 21\n #define min(x, y) (((x) < (y)) ? (x) : (y))\n #define max(x, y) (((x) > (y)) ? (x) : (y))\n \n@@ -32,39 +32,32 @@\n \n };\n \n-static int cirrus_fixed_clocks[NU_FIXED_CLOCKS] = {\n- 12599, 18000, 19600,\n- 25227, 28325, 31500, 36025, 37747, 39992, 41164,\n- 45076, 49867, 64983, 72163, 75000, 80013, 85226, 89998,\n- 95019, 100226, 108035\n+static int clocks[CLOCKS] = {\n+ 12599, 18000, 19600, 25227, 28325, 31500, 36025, 37747,\n+ 39992, 41164, 45076, 49867, 64983, 72163, 75000, 80013,\n+ 85226, 89998, 95019, 100226, 108035\n };\n \n-static int cirrus_memory;\n-static int cirrus_chiptype;\n-static int cirrus_chiprev;\n-static int DRAMbandwidth, DRAMbandwidthLimit;\n-\n-static int cirrus_map_clock(int bpp, int pixelclock)\n-{\n-\n- if (bpp == 24 && cirrus_chiptype < CLGD5436)\n+static int chiptype;\n+static int chiprev;\n+\n+static int map_clock(int bpp, int pixelclock)\n+{\n+\n+ if (bpp == VGA_BPP24 && chiptype < CLGD5436)\n return pixelclock * 3;\n \n- if (bpp == 16 && cirrus_chiptype <= CLGD5424)\n+ if (bpp == VGA_BPP16 && chiptype <= CLGD5424)\n return pixelclock * 2;\n \n return pixelclock;\n \n }\n \n-static int cirrus_map_horizontal_crtc(int bpp, int pixelclock, int htiming)\n-{\n-\n-#ifdef ALWAYS_USE_5434_PALETTE_CLOCK_DOUBLING\n- if (bpp == 8 && cirrus_chiptype >= CLGD5434)\n-#else\n- if (bpp == 8 && cirrus_chiptype >= CLGD5434 && pixelclock > 86000)\n-#endif\n+static int map_horizontal_crtc(int bpp, int pixelclock, int htiming)\n+{\n+\n+ if (bpp == VGA_BPP8 && chiptype >= CLGD5434)\n return htiming \/ 2;\n \n return htiming;\n@@ -78,31 +71,36 @@\n struct vga_modetiming modetiming;\n struct vga_modeinfo modeinfo;\n struct vga_cardspecs cardspecs;\n- int mclk = 0x22;\n-\n- cirrus_chiptype = CLGD5436;\n- cirrus_chiprev = 0;\n+ int mclk;\n+ int DRAMbandwidth;\n+ int DRAMbandwidthLimit;\n+\n+ \/* Identify real values *\/\n+ chiptype = CLGD5436;\n+ chiprev = 0;\n cardspecs.videoMemory = 2048;\n+ mclk = 0x22;\n+\n+ DRAMbandwidth = 14318 * mclk \/ 16;\n+\n+ if (cardspecs.videoMemory >= 512)\n+ DRAMbandwidth *= 2;\n+\n+ if (cardspecs.videoMemory >= 1024)\n+ DRAMbandwidth *= 2;\n+\n+ if (cardspecs.videoMemory >= 2048)\n+ DRAMbandwidth *= 2;\n+\n+ DRAMbandwidthLimit = (DRAMbandwidth * 10) \/ 11;\n+\n cardspecs.maxPixelClock4bpp = 75000;\n cardspecs.maxPixelClock8bpp = 45000;\n cardspecs.maxPixelClock16bpp = 0;\n cardspecs.maxPixelClock24bpp = 0; \n cardspecs.maxPixelClock32bpp = 0;\n \n- DRAMbandwidth = 14318 * mclk \/ 16;\n-\n- if (cirrus_memory >= 512)\n- DRAMbandwidth *= 2;\n-\n- if (cirrus_memory >= 1024)\n- DRAMbandwidth *= 2;\n-\n- if (cirrus_memory >= 2048)\n- DRAMbandwidth *= 2;\n-\n- DRAMbandwidthLimit = (DRAMbandwidth * 10) \/ 11;\n-\n- if (cirrus_chiptype == CLGD5420B)\n+ if (chiptype == CLGD5420B)\n {\n \n cardspecs.maxPixelClock16bpp = 75000 \/ 2;\n@@ -110,57 +108,53 @@\n \n }\n \n- if (cirrus_chiptype >= CLGD5422)\n+ if (chiptype >= CLGD5422)\n {\n \n cardspecs.maxPixelClock4bpp = 80000;\n cardspecs.maxPixelClock8bpp = 80000;\n \n- if (cirrus_chiptype >= CLGD5426)\n+ if (chiptype >= CLGD5426)\n cardspecs.maxPixelClock16bpp = 80000;\n- else if (cirrus_memory >= 1024)\n+ else if (cardspecs.videoMemory >= 1024)\n cardspecs.maxPixelClock16bpp = 80000 \/ 2;\n \n- if (cirrus_memory >= 1024)\n+ if (cardspecs.videoMemory >= 1024)\n cardspecs.maxPixelClock24bpp = 80000 \/ 3;\n \n }\n \n- if (cirrus_chiptype >= CLGD5429)\n+ if (chiptype >= CLGD5429)\n {\n \n cardspecs.maxPixelClock4bpp = 86000;\n cardspecs.maxPixelClock8bpp = 86000;\n- cardspecs.maxPixelClock16bpp = 86000;\n-\n- if (cirrus_memory >= 1024)\n+ cardspecs.maxPixelClock16bpp = 60000;\n+\n+ if (cardspecs.videoMemory >= 1024)\n cardspecs.maxPixelClock24bpp = 86000 \/ 3;\n \n }\n \n- if (cirrus_chiptype == CLGD5434)\n- {\n-\n-#ifdef SUPPORT_5434_PALETTE_CLOCK_DOUBLING\n+ if (chiptype == CLGD5434)\n+ {\n+\n cardspecs.maxPixelClock8bpp = 108300;\n \n- if (cirrus_chiprev > 0)\n+ if (chiprev > 0)\n cardspecs.maxPixelClock8bpp = 135300;\n-#endif\n-\n- if (cirrus_memory >= 2048)\n+\n+ if (cardspecs.videoMemory >= 2048)\n cardspecs.maxPixelClock32bpp = 86000;\n \n }\n \n- if (cirrus_chiptype >= CLGD5436)\n- {\n-\n-#ifdef SUPPORT_5434_PALETTE_CLOCK_DOUBLING\n+ if (chiptype >= CLGD5436)\n+ {\n+\n cardspecs.maxPixelClock8bpp = 135300;\n-#endif\n-\n- if (cirrus_memory >= 2048)\n+\n+ if (cardspecs.videoMemory >= 2048)\n cardspecs.maxPixelClock32bpp = 86000;\n \n }\n@@ -170,10 +164,10 @@\n cardspecs.maxPixelClock24bpp = min(cardspecs.maxPixelClock24bpp, DRAMbandwidthLimit \/ 3);\n cardspecs.maxPixelClock32bpp = min(cardspecs.maxPixelClock32bpp, DRAMbandwidthLimit \/ 4);\n cardspecs.flags = INTERLACE_DIVIDE_VERT | GREATER_1024_DIVIDE_VERT;\n- cardspecs.nClocks = NU_FIXED_CLOCKS;\n- cardspecs.clocks = cirrus_fixed_clocks;\n- cardspecs.mapClock = cirrus_map_clock;\n- cardspecs.mapHorizontalCrtc = cirrus_map_horizontal_crtc;\n+ cardspecs.nClocks = CLOCKS;\n+ cardspecs.clocks = clocks;\n+ cardspecs.mapClock = map_clock;\n+ cardspecs.mapHorizontalCrtc = map_horizontal_crtc;\n cardspecs.maxHorizontalCrtc = 2040;\n cardspecs.maxPixelClock4bpp = 0;\n \n"} {"commit":"d18751ac7f959d95d0981afeb33ab9fcc998299d","subject":"set fwin border info before changing path to avoid race condition where icon info may be freed","message":"set fwin border info before changing path to avoid race condition where icon info may be freed\n\n\nSVN revision: 76791\n","repos":"rvandegrift\/e,tasn\/enlightenment,tasn\/enlightenment,tizenorg\/platform.upstream.enlightenment,tizenorg\/platform.upstream.enlightenment,FlorentRevest\/Enlightenment,FlorentRevest\/Enlightenment,rvandegrift\/e,tizenorg\/platform.upstream.enlightenment,rvandegrift\/e,tasn\/enlightenment,FlorentRevest\/Enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/fileman\/e_fwin.c\n+++ src\/modules\/fileman\/e_fwin.c\n@@ -2273,9 +2273,9 @@\n }\n else\n {\n+ _e_fwin_border_set(page, page->fwin, ici);\n e_fm2_path_set(page->fm_obj, ici->link, \"\/\");\n- _e_fwin_window_title_set(page);\n- fwin = page->fwin;\n+ return page->fwin;\n }\n }\n else if ((ici->link) && (ici->removable))\n@@ -2290,9 +2290,9 @@\n }\n else\n {\n+ _e_fwin_border_set(page, page->fwin, ici);\n e_fm2_path_set(page->fm_obj, buf, \"\/\");\n- _e_fwin_window_title_set(page);\n- fwin = page->fwin;\n+ return page->fwin;\n }\n }\n else if (ici->real_link)\n@@ -2308,9 +2308,9 @@\n }\n else\n {\n+ _e_fwin_border_set(page, page->fwin, ici);\n e_fm2_path_set(page->fm_obj, NULL, ici->real_link);\n- _e_fwin_window_title_set(page);\n- fwin = page->fwin;\n+ return page->fwin;\n }\n }\n else\n@@ -2332,9 +2332,9 @@\n }\n else\n {\n+ _e_fwin_border_set(page, page->fwin, ici);\n e_fm2_path_set(page->fm_obj, NULL, ici->link ?: buf);\n- _e_fwin_window_title_set(page);\n- fwin = page->fwin;\n+ return page->fwin;\n }\n }\n else\n"} {"commit":"ac6c85142d34f555ad2087ac2f869a2132134654","subject":"api: test: fix test case formatter type","message":"api: test: fix test case formatter type\n\nSigned-off-by: Eduardo Silva <81f705dc2ce1a61a2621e0e4b442a9474e1d0c70@monkey.io>\n","repos":"monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey,monkey\/monkey","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- api\/test.c\n+++ api\/test.c\n@@ -90,7 +90,7 @@\n (void) queue;\n \n printf(\"=== cb queue message === \\n\");\n- printf(\" => %lu bytes\\n\", size);\n+ printf(\" => %zu bytes\\n\", size);\n printf(\" => \");\n \n buf = data;\n"} {"commit":"044d187a4d6caf6c2062d2232805338a62011c59","subject":"runtime: fix throwsplit check Newstack runs on g0, g0->throwsplit is never set.","message":"runtime: fix throwsplit check\nNewstack runs on g0, g0->throwsplit is never set.\n\nLGTM=rsc\nR=rsc\nCC=golang-codereviews, khr\nhttps:\/\/codereview.appspot.com\/147370043\n","repos":"tv42\/old-go,tv42\/old-go,tv42\/old-go,tv42\/old-go,tv42\/old-go,tv42\/old-go,tv42\/old-go","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"382fe306889385638470cc88c7df37c9cd79fdc5","subject":"fwin: prevent segv when the vaarg abi messup with unused parameter.","message":"fwin: prevent segv when the vaarg abi messup with unused parameter.\n\nQuite a hack overall, but if you don't need those parameter, just put\nnothing and it will work.\n\n@fix T4112\n\nSigned-off-by: Cedric Bail <240633aa59d25638de9800ef43a88ad2e208d24d@osg.samsung.com>\n","repos":"tasn\/enlightenment,tasn\/enlightenment,tasn\/enlightenment","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/modules\/fileman\/e_fwin.c\n+++ src\/modules\/fileman\/e_fwin.c\n@@ -747,7 +747,7 @@\n }\n \n static Eina_Bool\n-_e_fwin_icon_popup_handler(void *data, ...)\n+_e_fwin_icon_popup_handler(void *data)\n {\n E_Fwin *fwin = data;\n \n"} {"commit":"fd2fe5f92dda1b70193980b467701296e4c88b02","subject":"PGS subtitles: use origial frame size (fix #6324)","message":"PGS subtitles: use origial frame size (fix #6324)\n\nWith CODEC_ID_HDMV_PGS_SUBTITLE use codec_{width,height} for\ni_original_picture_{width,height} to correctly display\nsubtitles with a frame size that is different from the\nvideo stream\n\nSigned-off-by: Jean-Baptiste Kempf <7b85a41a628204b76aba4326273a3ccc74bd009a@videolan.org>\n(cherry picked from commit 328a034c115dfa9b4ff7b636b8ab90436af6464b)\nSigned-off-by: Jean-Baptiste Kempf <7b85a41a628204b76aba4326273a3ccc74bd009a@videolan.org>\n","repos":"vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/codec\/avcodec\/subtitle.c\n+++ modules\/codec\/avcodec\/subtitle.c\n@@ -42,7 +42,8 @@\n AVCODEC_COMMON_MEMBERS\n };\n \n-static subpicture_t *ConvertSubtitle(decoder_t *, AVSubtitle *, mtime_t pts);\n+static subpicture_t *ConvertSubtitle(decoder_t *, AVSubtitle *, mtime_t pts,\n+ AVCodecContext *avctx);\n \n \/**\n * Initialize subtitle decoder\n@@ -174,7 +175,8 @@\n subpicture_t *spu = NULL;\n if (has_subtitle)\n spu = ConvertSubtitle(dec, &subtitle,\n- block->i_pts > 0 ? block->i_pts : block->i_dts);\n+ block->i_pts > 0 ? block->i_pts : block->i_dts,\n+ sys->p_context);\n \n \/* *\/\n if (!spu)\n@@ -232,7 +234,8 @@\n \/**\n * Convert a libavcodec subtitle to our format.\n *\/\n-static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t pts)\n+static subpicture_t *ConvertSubtitle(decoder_t *dec, AVSubtitle *ffsub, mtime_t pts,\n+ AVCodecContext *avctx)\n {\n subpicture_t *spu = decoder_NewSubpicture(dec, NULL);\n if (!spu)\n@@ -244,10 +247,16 @@\n spu->i_stop = pts + ffsub->end_display_time * INT64_C(1000);\n spu->b_absolute = true; \/* FIXME How to set it right ? *\/\n spu->b_ephemer = true; \/* FIXME How to set it right ? *\/\n- spu->i_original_picture_width =\n- dec->fmt_in.subs.spu.i_original_frame_width;\n- spu->i_original_picture_height =\n- dec->fmt_in.subs.spu.i_original_frame_height;\n+\n+ if (avctx->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) {\n+ spu->i_original_picture_width = avctx->coded_width;\n+ spu->i_original_picture_height = avctx->coded_height;\n+ } else {\n+ spu->i_original_picture_width =\n+ dec->fmt_in.subs.spu.i_original_frame_width;\n+ spu->i_original_picture_height =\n+ dec->fmt_in.subs.spu.i_original_frame_height;\n+ }\n \n subpicture_region_t **region_next = &spu->p_region;\n \n"} {"commit":"1c5abb6c77a2e79537373143d2c1708e40b9f6ca","subject":"bridge: Add 802.1ad tx vlan acceleration","message":"bridge: Add 802.1ad tx vlan acceleration\n\nBridge device doesn't need to embed S-tag into skb->data.\n\nSigned-off-by: Toshiaki Makita <4ba010dc37de3a0b3ddffe053cf94f200b4ff575@lab.ntt.co.jp>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/bridge\/br_device.c\n+++ net\/bridge\/br_device.c\n@@ -361,8 +361,9 @@\n \tdev->priv_flags = IFF_EBRIDGE;\n \n \tdev->features = COMMON_FEATURES | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL |\n-\t\t\tNETIF_F_HW_VLAN_CTAG_TX;\n-\tdev->hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX;\n+\t\t\tNETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;\n+\tdev->hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX |\n+\t\t\t NETIF_F_HW_VLAN_STAG_TX;\n \tdev->vlan_features = COMMON_FEATURES;\n \n \tbr->dev = dev;\n"} {"commit":"9972f134a273d6dc52d912a3513fa06b426de9b4","subject":"net: frags: Add VRF device index to cache and lookup","message":"net: frags: Add VRF device index to cache and lookup\n\nFragmentation cache uses information from the IP header to reassemble\npackets. That information can be duplicated across VRFs -- same source\nand destination addresses, protocol and id. Handle fragmentation with\nVRFs by adding the VRF device index to entries in the cache and the\nlookup arg.\n\nSigned-off-by: David Ahern <e908389d4bbf30e8dc72dc47cdf6b45d89e8b2a0@cumulusnetworks.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"unknown","license":"mit","lang":"C","diff":""} {"commit":"a7eea416cb08a514f94c0ca5ff30c18783fab054","subject":"tcp: reserve tcp_skb_mss() to tcp stack","message":"tcp: reserve tcp_skb_mss() to tcp stack\n\ntcp_gso_segment() and tcp_gro_receive() are not strictly\npart of TCP stack. They should not assume tcp_skb_mss(skb)\nis in fact skb_shinfo(skb)->gso_size.\n\nThis will allow us to change tcp_skb_mss() in following patches.\n\nSigned-off-by: Eric Dumazet <312c7d941f03386814be517ffdb3e0eb6624e275@google.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/ipv4\/tcp_offload.c\n+++ net\/ipv4\/tcp_offload.c\n@@ -77,7 +77,7 @@\n \toldlen = (u16)~skb->len;\n \t__skb_pull(skb, thlen);\n \n-\tmss = tcp_skb_mss(skb);\n+\tmss = skb_shinfo(skb)->gso_size;\n \tif (unlikely(skb->len <= mss))\n \t\tgoto out;\n \n@@ -242,7 +242,7 @@\n \t\tflush |= *(u32 *)((u8 *)th + i) ^\n \t\t\t *(u32 *)((u8 *)th2 + i);\n \n-\tmss = tcp_skb_mss(p);\n+\tmss = skb_shinfo(p)->gso_size;\n \n \tflush |= (len - 1) >= mss;\n \tflush |= (ntohl(th2->seq) + skb_gro_len(p)) ^ ntohl(th->seq);\n"} {"commit":"77f93cb32d8711926b07030c1c73a57a7bc66911","subject":"Add missing PQfinish() calls","message":"Add missing PQfinish() calls\n\nFujii Masao\n","repos":"greenplum-db\/gpdb,postmind-net\/postgres-xl,snaga\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,postmind-net\/postgres-xl,kmjungersen\/PostgresXL,greenplum-db\/gpdb,Postgres-XL\/Postgres-XL,ovr\/postgres-xl,xinzweb\/gpdb,adam8157\/gpdb,tpostgres-projects\/tPostgres,Postgres-XL\/Postgres-XL,snaga\/postgres-xl,oberstet\/postgres-xl,greenplum-db\/gpdb,ashwinstar\/gpdb,Postgres-XL\/Postgres-XL,lisakowen\/gpdb,kmjungersen\/PostgresXL,yazun\/postgres-xl,zeroae\/postgres-xl,oberstet\/postgres-xl,arcivanov\/postgres-xl,jmcatamney\/gpdb,ashwinstar\/gpdb,ashwinstar\/gpdb,ovr\/postgres-xl,xinzweb\/gpdb,50wu\/gpdb,50wu\/gpdb,zeroae\/postgres-xl,techdragon\/Postgres-XL,xinzweb\/gpdb,snaga\/postgres-xl,ashwinstar\/gpdb,lisakowen\/gpdb,oberstet\/postgres-xl,jmcatamney\/gpdb,ashwinstar\/gpdb,xinzweb\/gpdb,jmcatamney\/gpdb,lisakowen\/gpdb,xinzweb\/gpdb,adam8157\/gpdb,kmjungersen\/PostgresXL,jmcatamney\/gpdb,arcivanov\/postgres-xl,jmcatamney\/gpdb,ovr\/postgres-xl,arcivanov\/postgres-xl,techdragon\/Postgres-XL,ashwinstar\/gpdb,kmjungersen\/PostgresXL,arcivanov\/postgres-xl,lisakowen\/gpdb,snaga\/postgres-xl,adam8157\/gpdb,jmcatamney\/gpdb,adam8157\/gpdb,zeroae\/postgres-xl,techdragon\/Postgres-XL,Postgres-XL\/Postgres-XL,pavanvd\/postgres-xl,lisakowen\/gpdb,lisakowen\/gpdb,lisakowen\/gpdb,zeroae\/postgres-xl,greenplum-db\/gpdb,greenplum-db\/gpdb,adam8157\/gpdb,tpostgres-projects\/tPostgres,50wu\/gpdb,greenplum-db\/gpdb,xinzweb\/gpdb,Postgres-XL\/Postgres-XL,adam8157\/gpdb,50wu\/gpdb,ashwinstar\/gpdb,pavanvd\/postgres-xl,xinzweb\/gpdb,arcivanov\/postgres-xl,kmjungersen\/PostgresXL,yazun\/postgres-xl,pavanvd\/postgres-xl,postmind-net\/postgres-xl,50wu\/gpdb,adam8157\/gpdb,yazun\/postgres-xl,ashwinstar\/gpdb,50wu\/gpdb,lisakowen\/gpdb,pavanvd\/postgres-xl,tpostgres-projects\/tPostgres,oberstet\/postgres-xl,postmind-net\/postgres-xl,yazun\/postgres-xl,zeroae\/postgres-xl,50wu\/gpdb,ovr\/postgres-xl,adam8157\/gpdb,jmcatamney\/gpdb,pavanvd\/postgres-xl,tpostgres-projects\/tPostgres,greenplum-db\/gpdb,techdragon\/Postgres-XL,jmcatamney\/gpdb,greenplum-db\/gpdb,tpostgres-projects\/tPostgres,ovr\/postgres-xl,techdragon\/Postgres-XL,arcivanov\/postgres-xl,oberstet\/postgres-xl,yazun\/postgres-xl,snaga\/postgres-xl,postmind-net\/postgres-xl","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/bin\/pg_basebackup\/streamutil.c\n+++ src\/bin\/pg_basebackup\/streamutil.c\n@@ -167,6 +167,7 @@\n \t\t{\n \t\t\tfprintf(stderr, _(\"%s: could not determine server setting for integer_datetimes\\n\"),\n \t\t\t\t\tprogname);\n+\t\t\tPQfinish(tmpconn);\n \t\t\texit(1);\n \t\t}\n \n@@ -178,6 +179,7 @@\n \t\t{\n \t\t\tfprintf(stderr, _(\"%s: integer_datetimes compile flag does not match server\\n\"),\n \t\t\t\t\tprogname);\n+\t\t\tPQfinish(tmpconn);\n \t\t\texit(1);\n \t\t}\n \n"} {"commit":"aef950b4ba3196622a5bd5e21ab1d63f30658285","subject":"packet: fix possible dev refcnt leak when bind fail","message":"packet: fix possible dev refcnt leak when bind fail\n\nIf bind is fail when bind is called after set PACKET_FANOUT\nsock option, the dev refcnt will leak.\n\nSigned-off-by: Wei Yongjun <b8f9cab8be13de37b9588aedad10a20fc3a68783@trendmicro.com.cn>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/packet\/af_packet.c\n+++ net\/packet\/af_packet.c\n@@ -2448,8 +2448,12 @@\n {\n \tstruct packet_sock *po = pkt_sk(sk);\n \n-\tif (po->fanout)\n+\tif (po->fanout) {\n+\t\tif (dev)\n+\t\t\tdev_put(dev);\n+\n \t\treturn -EINVAL;\n+\t}\n \n \tlock_sock(sk);\n \n"} {"commit":"a5fe4e9378ec4f7787a989e3b31ed1729a631905","subject":"Add OTGHSULPI clock gate definition.","message":"Add OTGHSULPI clock gate definition.","repos":"zyp\/laks,zyp\/laks,zyp\/laks","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- rcc\/rcc.h\n+++ rcc\/rcc.h\n@@ -111,20 +111,21 @@\n \t};\n \t#elif defined(STM32F4)\n \tenum AHB1_dev {\n-\t\tGPIOA = 1 << 0,\n-\t\tGPIOB = 1 << 1,\n-\t\tGPIOC = 1 << 2,\n-\t\tGPIOD = 1 << 3,\n-\t\tGPIOE = 1 << 4,\n-\t\tGPIOF = 1 << 5,\n-\t\tGPIOG = 1 << 6,\n-\t\tGPIOH = 1 << 7,\n-\t\tGPIOI = 1 << 8,\n-\t\tCRC = 1 << 12,\n-\t\tDMA1 = 1 << 21,\n-\t\tDMA2 = 1 << 22,\n-\t\tETHMAC = 1 << 25,\n-\t\tOTGHS = 1 << 29,\n+\t\tGPIOA = 1 << 0,\n+\t\tGPIOB = 1 << 1,\n+\t\tGPIOC = 1 << 2,\n+\t\tGPIOD = 1 << 3,\n+\t\tGPIOE = 1 << 4,\n+\t\tGPIOF = 1 << 5,\n+\t\tGPIOG = 1 << 6,\n+\t\tGPIOH = 1 << 7,\n+\t\tGPIOI = 1 << 8,\n+\t\tCRC = 1 << 12,\n+\t\tDMA1 = 1 << 21,\n+\t\tDMA2 = 1 << 22,\n+\t\tETHMAC = 1 << 25,\n+\t\tOTGHS = 1 << 29,\n+\t\tOTGHSULPI = 1 << 30,\n \t};\n \t\n \tenum AHB2_dev {\n"} {"commit":"47fdce12321823ff77e7b68ac9d54725a1031840","subject":"+inotify","message":"+inotify\n","repos":"kristopolous\/apophnia,kristopolous\/apophnia,kristopolous\/apophnia,kristopolous\/apophnia,kristopolous\/apophnia,kristopolous\/apophnia","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- apophnia.c\n+++ apophnia.c\n@@ -14,7 +14,13 @@\n \t#include <sys\/inotify.h>\n \t#include <linux\/limits.h>\n \t#include <linux\/types.h>\n-#endif\t\/\/ __linux__ }\n+\t#define NOTIFY_INIT\tinotify_init()\n+\t#define EVENT_SIZE (sizeof (struct inotify_event))\n+\t#define BUF_LEN (1024 * (EVENT_SIZE + 16))\n+#elif defined (__OpenBSD__ || __FreeBSD__ || __NetBSD__ || __APPLE__) \/\/ {\n+\t#include <sys\/event.h>\n+\t#define NOTIFY_INIT\tkqueue()\n+#endif\n \n #include <wand\/MagickWand.h>\n #include \"mongoose\/mongoose.h\"\n@@ -25,6 +31,9 @@\n \n cJSON *g_config;\n MagickWand *g_magick;\n+\n+int g_notify_handle, \n+ g_notify;\n \n struct {\n \tchar img_root[PATH_MAX],\n@@ -133,61 +142,69 @@\n \texit(0);\n }\n \n-unsigned char* convert_image(int fd, int height, int width, size_t*sz){\n+int image_start(int fd) {\n \tMagickBooleanType stat;\n \tFILE *fdesc = fdopen(fd, \"rb\");\n \n \tstat = MagickReadImageFile(g_magick, fdesc);\n-\n \tif (stat == MagickFalse) {\n \t\treturn 0;\n \t}\n \n \tMagickResetIterator(g_magick);\n \n-\tplog3(\"Converting ...\\n\");\n-\twhile (MagickNextImage(g_magick) != MagickFalse) {\n-\t\tMagickResizeImage(\n-\t\t\t\tg_magick,\n-\t\t\t\theight,\n-\t\t\t\twidth,\n-\t\t\t\tLanczosFilter,\n-\t\t\t\t1.0);\n-\t}\n-\n+\tMagickNextImage(g_magick);\n+\n+\treturn 1;\n+}\n+\n+unsigned char* image_end(size_t *sz) {\n \treturn MagickGetImageBlob(g_magick, sz);\n }\n \n int image_offset(char*ptr){\n \treturn 1;\n }\n-int image_quality() {\n+\n+int image_quality(char*ptr) {\n+\tint quality = atoi(ptr);\n+\n+\tprintf(\"[%d : %s]\\n\", quality, ptr);\n+\n \treturn 1;\n }\n-int image_resize(char*ptr, int*height, int*width) {\n+int image_resize(char*ptr) {\n \tchar * last;\n-\t*height = -1;\n-\t*width = -1;\n+\n+\tint height = -1, \n+\t width = -1;\n+\n \tfor(last = ptr;;ptr++) {\n \t\tif(ptr[0] >= '0' && ptr[0] <= '9') {\n \t\t\tcontinue;\n \t\t}\n \t\tif(ptr[0] == 'x') {\n \t\t\tptr[0] = 0;\n-\t\t\t*height = atoi(last);\n+\t\t\theight = atoi(last);\n \t\t\tptr[0] = 'x';\n \t\t\tlast = ptr + 1;\n \t\t\tcontinue;\n \t\t}\n \t\tif(ptr[0] <= 32) {\n-\t\t\t*width = atoi(last);\n-\t\t\tif(*height == -1) {\n-\t\t\t\t*height = *width;\n+\t\t\twidth = atoi(last);\n+\t\t\tif(height == -1) {\n+\t\t\t\theight = width;\n \t\t\t}\n \t\t\tptr++;\n \t\t\tbreak;\n \t\t}\n \t}\n+\tMagickResizeImage(\n+\t\tg_magick,\n+\t\theight,\n+\t\twidth,\n+\t\tLanczosFilter,\n+\t\t1.0);\n \treturn 1;\n }\n \n@@ -283,19 +300,21 @@\n \t\t\t\/\/ now null out the extension pointer from above\n \t\t\t\/\/ we won't need it any more\n \t\t\text[0] = 0;\n+\t\t\timage_start(fd);\n \t\t\tfor(pTmp = commandList; pTmp != pCommand; pTmp++) {\n \t\t\t\tplog3(\"Command: [%s]\\n\", *pTmp);\n+\n \t\t\t\tswitch(*pTmp[0]) {\n \t\t\t\t\tcase D_RESIZE:\n-\t\t\t\t\t\timage_resize(*(pTmp + 1), &height, &width);\n+\t\t\t\t\t\timage_resize(*pTmp + 1);\n \t\t\t\t\t\tbreak;\n \n \t\t\t\t\tcase D_OFFSET:\n-\t\t\t\t\t\timage_offset(*(pTmp + 1));\n+\t\t\t\t\t\timage_offset(*pTmp + 1);\n \t\t\t\t\t\tbreak;\n \n \t\t\t\t\tcase D_QUALITY:\n-\t\t\t\t\t\timage_quality();\n+\t\t\t\t\t\timage_quality(*pTmp + 1);\n \t\t\t\t\t\tbreak;\n \n \t\t\t\t\tdefault:\n@@ -305,8 +324,8 @@\n \n \t\t\t\tplog3(\"height: %d\\nwidth: %d\\n\", height, width);\n \n-\t\t\t\timage = convert_image(fd, height, width, &sz);\n-\t\t\t}\n+\t\t\t}\n+\t\t\timage = image_end(&sz);\n \t\t\tmg_printf(conn, \"Content-Length: %d\\r\\n\\r\\n\", sz);\n \t\t\tmg_write(conn, image, sz);\n \t\t\tMagickWriteImage(g_magick, fname);\n@@ -432,6 +451,48 @@\n \treturn ptr;\n }\n \n+void main_loop(){\n+#if !defined __linux__\n+\t#error KQUEUE needs to be written. Exiting.\n+#else\n+\tfd_set rfds;\n+\tint ret,\n+\t i,\n+\t len;\n+\n+\tchar buf[BUF_LEN];\n+\n+\tg_notify = inotify_add_watch (g_notify_handle,\n+\t\tg_opts.img_root,\n+\t IN_MODIFY | IN_CREATE | IN_DELETE);\n+\n+\tfor(;;) {\n+\t\tFD_ZERO (&rfds);\n+\t\tFD_SET (g_notify_handle, &rfds);\n+\t\tret = select (g_notify_handle + 1, &rfds, NULL, NULL, NULL);\n+\t\tif (FD_ISSET (g_notify_handle, &rfds)) {\n+\t\t\tlen = read(g_notify_handle, buf, BUF_LEN);\n+\t\t\tprintf(\"%d\\n\", len);\n+\t\t\twhile (i < len) {\n+\t\t\t\tstruct inotify_event *event;\n+\n+\t\t\t\tevent = (struct inotify_event *) &buf[i];\n+\n+\t\t\t\tprintf (\"wd=%d mask=%u cookie=%u len=%u\\n\",\n+\t\t\t\t\tevent->wd, event->mask,\n+\t\t\t\t\tevent->cookie, event->len);\n+\n+\t\t\t\tif (event->len)\n+\t\t\t\t\tprintf (\"name=%s\\n\", event->name);\n+\n+\t\t\t\ti += EVENT_SIZE + event->len;\n+\t\t\t}\n+\t\t\tprintf(\"here\");\n+\t\t}\n+\t}\n+#endif\n+}\n+\n int main() {\n \tstruct mg_context *ctx;\n \n@@ -441,6 +502,7 @@\n \t\tplog0(\"Unable to read the config\");\n \t}\n \n+\tg_notify_handle = NOTIFY_INIT;\n \tctx = mg_start();\n \n \tMagickWandGenesis();\n@@ -449,6 +511,6 @@\n \tmg_set_option(ctx, \"ports\", itoa(g_opts.port));\n \tmg_set_uri_callback(ctx, \"\/*\", &show_image, NULL);\n \n-\tgetchar();\n+\tmain_loop();\n \treturn 0;\n }\n"} {"commit":"81ce0dbc119fa31af21d02febde1cf923022d4d6","subject":"sctp: use the passed in gfp flags instead GFP_KERNEL","message":"sctp: use the passed in gfp flags instead GFP_KERNEL\n\nThis patch doesn't change how the code works because in the current\nkernel gfp is always GFP_KERNEL. But gfp was obviously intended\ninstead of GFP_KERNEL.\n\nSigned-off-by: Dan Carpenter <ff341aa343d564f9e53e9dcb6996be8c04859a66@oracle.com>\nAcked-by: Neil Horman <3316dc2d77df57653443c0391a5296176d6ca9c3@tuxdriver.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/sctp\/endpointola.c\n+++ net\/sctp\/endpointola.c\n@@ -155,7 +155,7 @@\n \n \t\/* SCTP-AUTH extensions*\/\n \tINIT_LIST_HEAD(&ep->endpoint_shared_keys);\n-\tnull_key = sctp_auth_shkey_create(0, GFP_KERNEL);\n+\tnull_key = sctp_auth_shkey_create(0, gfp);\n \tif (!null_key)\n \t\tgoto nomem;\n \n"} {"commit":"9720bb3ab0b80659c63ed337eab66104a4156db0","subject":"nl80211: use netlink consistent dump feature for BSS dumps","message":"nl80211: use netlink consistent dump feature for BSS dumps\n\nUse the new consistent dump feature from (generic) netlink\nto advertise when dumps are incomplete.\n\nReaders may note that this does not initialize the\nrdev->bss_generation counter to a non-zero value. This is\nstill OK since the value is modified only under spinlock\nwhen the list is modified. Since the dump code holds the\nspinlock, the value will either be > 0 already, or the\nlist will still be empty in which case a consistent dump\nwill actually be made (and be empty).\n\nSigned-off-by: Johannes Berg <bff32994ff0f8d048f262a8388145a71b6071bfe@intel.com>\nSigned-off-by: John W. Linville <2a53bac7a5d324865ef46ec4c38b2c0fba1456b4@tuxdriver.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/wireless\/nl80211.c\n+++ net\/wireless\/nl80211.c\n@@ -3620,7 +3620,8 @@\n \treturn __cfg80211_stop_sched_scan(rdev, false);\n }\n \n-static int nl80211_send_bss(struct sk_buff *msg, u32 pid, u32 seq, int flags,\n+static int nl80211_send_bss(struct sk_buff *msg, struct netlink_callback *cb,\n+\t\t\t u32 seq, int flags,\n \t\t\t struct cfg80211_registered_device *rdev,\n \t\t\t struct wireless_dev *wdev,\n \t\t\t struct cfg80211_internal_bss *intbss)\n@@ -3632,10 +3633,12 @@\n \n \tASSERT_WDEV_LOCK(wdev);\n \n-\thdr = nl80211hdr_put(msg, pid, seq, flags,\n+\thdr = nl80211hdr_put(msg, NETLINK_CB(cb->skb).pid, seq, flags,\n \t\t\t NL80211_CMD_NEW_SCAN_RESULTS);\n \tif (!hdr)\n \t\treturn -1;\n+\n+\tgenl_dump_check_consistent(cb, hdr, &nl80211_fam);\n \n \tNLA_PUT_U32(msg, NL80211_ATTR_GENERATION, rdev->bss_generation);\n \tNLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, wdev->netdev->ifindex);\n@@ -3725,11 +3728,12 @@\n \tspin_lock_bh(&rdev->bss_lock);\n \tcfg80211_bss_expire(rdev);\n \n+\tcb->seq = rdev->bss_generation;\n+\n \tlist_for_each_entry(scan, &rdev->bss_list, list) {\n \t\tif (++idx <= start)\n \t\t\tcontinue;\n-\t\tif (nl80211_send_bss(skb,\n-\t\t\t\tNETLINK_CB(cb->skb).pid,\n+\t\tif (nl80211_send_bss(skb, cb,\n \t\t\t\tcb->nlh->nlmsg_seq, NLM_F_MULTI,\n \t\t\t\trdev, wdev, scan) < 0) {\n \t\t\tidx--;\n"} {"commit":"e92303f872600978796ff323bc229d911f905849","subject":"netns xfrm: propagate netns into policy byidx hash","message":"netns xfrm: propagate netns into policy byidx hash\n\nSigned-off-by: Alexey Dobriyan <b99bff5923d24d2fb8e844db9dac7cd59203da1d@gmail.com>\nSigned-off-by: David S. Miller <fe08d3c717adf2ae63592e4c9aec6e3e404d8e3e@davemloft.net>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/xfrm\/xfrm_policy.c\n+++ net\/xfrm\/xfrm_policy.c\n@@ -321,9 +321,9 @@\n \n static unsigned int xfrm_policy_hashmax __read_mostly = 1 * 1024 * 1024;\n \n-static inline unsigned int idx_hash(u32 index)\n-{\n-\treturn __idx_hash(index, init_net.xfrm.policy_idx_hmask);\n+static inline unsigned int idx_hash(struct net *net, u32 index)\n+{\n+\treturn __idx_hash(index, net->xfrm.policy_idx_hmask);\n }\n \n static struct hlist_head *policy_hash_bysel(struct xfrm_selector *sel, unsigned short family, int dir)\n@@ -523,7 +523,7 @@\n \t\tidx_generator += 8;\n \t\tif (idx == 0)\n \t\t\tidx = 8;\n-\t\tlist = init_net.xfrm.policy_byidx + idx_hash(idx);\n+\t\tlist = init_net.xfrm.policy_byidx + idx_hash(&init_net, idx);\n \t\tfound = 0;\n \t\thlist_for_each_entry(p, entry, list, byidx) {\n \t\t\tif (p->index == idx) {\n@@ -596,7 +596,7 @@\n \t\tinit_net.xfrm.policy_count[dir]--;\n \t}\n \tpolicy->index = delpol ? delpol->index : xfrm_gen_index(dir);\n-\thlist_add_head(&policy->byidx, init_net.xfrm.policy_byidx+idx_hash(policy->index));\n+\thlist_add_head(&policy->byidx, init_net.xfrm.policy_byidx+idx_hash(&init_net, policy->index));\n \tpolicy->curlft.add_time = get_seconds();\n \tpolicy->curlft.use_time = 0;\n \tif (!mod_timer(&policy->timer, jiffies + HZ))\n@@ -698,7 +698,7 @@\n \n \t*err = 0;\n \twrite_lock_bh(&xfrm_policy_lock);\n-\tchain = init_net.xfrm.policy_byidx + idx_hash(id);\n+\tchain = init_net.xfrm.policy_byidx + idx_hash(&init_net, id);\n \tret = NULL;\n \thlist_for_each_entry(pol, entry, chain, byidx) {\n \t\tif (pol->type == type && pol->index == id) {\n@@ -1075,7 +1075,7 @@\n \n \tlist_add(&pol->walk.all, &net->xfrm.policy_all);\n \thlist_add_head(&pol->bydst, chain);\n-\thlist_add_head(&pol->byidx, net->xfrm.policy_byidx+idx_hash(pol->index));\n+\thlist_add_head(&pol->byidx, net->xfrm.policy_byidx+idx_hash(net, pol->index));\n \tnet->xfrm.policy_count[dir]++;\n \txfrm_pol_hold(pol);\n \n"} {"commit":"2ba78855c63798f1ac4521c291376cd1414fcb00","subject":"define CPP-flag SEAICE_OLD_AND_BAD_DISCRETIZATION to keep old results","message":"define CPP-flag SEAICE_OLD_AND_BAD_DISCRETIZATION to keep old results\n","repos":"altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h,altMITgcm\/MITgcm66h","returncode":1,"stderr":"error: pathspec 'verification\/global_ocean.cs32x15\/code\/SEAICE_OPTIONS.h' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- verification\/global_ocean.cs32x15\/code\/SEAICE_OPTIONS.h\n+++ verification\/global_ocean.cs32x15\/code\/SEAICE_OPTIONS.h\n@@ -0,0 +1,95 @@\n+C $Header$\n+C $Name$\n+\n+C \/==========================================================\\\n+C | SEAICE_OPTIONS.h |\n+C | o CPP options file for sea ice package. |\n+C |==========================================================|\n+C | Use this file for selecting options within the sea ice |\n+C | package. |\n+C \\==========================================================\/\n+\n+#ifndef SEAICE_OPTIONS_H\n+#define SEAICE_OPTIONS_H\n+#include \"PACKAGES_CONFIG.h\"\n+#include \"CPP_OPTIONS.h\"\n+\n+\n+C-- for backward compatibility we return to old code with this flag.\n+C Will be removed as soon as we have confidence in the code.\n+#define SEAICE_OLD_AND_BAD_DISCRETIZATION\n+\n+C-- Write \"text-plots\" of certain fields in STDOUT for debugging.\n+#undef SEAICE_DEBUG\n+\n+C-- Allow sea-ice dynamic code.\n+C This option is provided to allow use of TAMC\n+C on the thermodynamics component of the code only.\n+C Sea-ice dynamics can also be turned off at runtime\n+C using variable SEAICEuseDYNAMICS.\n+#define SEAICE_ALLOW_DYNAMICS\n+\n+C-- By default, the sea-ice package uses its own integrated bulk\n+C formulae to compute fluxes (fu, fv, EmPmR, Qnet, and Qsw) over\n+C open-ocean. When this flag is set, these variables are computed\n+C in a separate external package, for example, pkg\/exf, and then\n+C modified for sea-ice effects by pkg\/seaice.\n+#define SEAICE_EXTERNAL_FLUXES\n+\n+C-- By default, the sea-ice package uses 2-category thermodynamics.\n+C When this flag is set, an 8-category calculation of ice\n+C thermodynamics is carried out in groatb.F\n+C Note the pickup_seaice.* generated by this option differ\n+C from those generated with the default 2-category model.\n+C Therefore it is not possible to switch between the two\n+C in the middle of an integration.\n+#undef SEAICE_MULTICATEGORY\n+\n+C-- By default for B-grid dynamics solver wind stress under sea-ice is\n+C set to the same value as it would be if there was no sea-ice.\n+C Define following CPP flag for B-grid ice-ocean stress coupling.\n+#undef SEAICE_TEST_ICE_STRESS_1\n+\n+C-- By default for B-grid dynamics solver surface tilt is obtained\n+C indirectly via geostrophic velocities. Define following CPP\n+C in order to ues ETAN instead.\n+#undef EXPLICIT_SSH_SLOPE\n+\n+C-- By default the freezing point of water is set to the value of \n+C the parameter SEAICE_freeze (=-1.96 by default). To use a\n+C simple linear dependence of the freezing point on salinity, \n+C set the following flag (pressure is assumed to have no effect,\n+C which is a good assumption for the top 20 meters). With this\n+C option defined the parameter SEAICE_freeze has no effect.\n+#undef SEAICE_VARIABLE_FREEZING_POINT\n+\n+C-- Allow SEAICEuseFlooding, which converts snow to ice if submerged.\n+#undef ALLOW_SEAICE_FLOODING\n+\n+C-- By default sea ice is fresh. Set following flag for salty ice.\n+#undef SEAICE_SALINITY\n+\n+C-- Track sea ice age.\n+#undef SEAICE_AGE\n+\n+C-- By default the seaice model is discretized on a B-Grid (for \n+C historical reasons). Define the following flag to use a new\n+C (not thoroughly) test version on a C-grid\n+#define SEAICE_CGRID\n+\n+C-- Only for the C-grid version it is possible to \n+#ifdef SEAICE_CGRID\n+C enable EVP code by defining the following flag\n+#define SEAICE_ALLOW_EVP\n+C allow the truncated ellipse rheology (runtime flag SEAICEuseTEM)\n+#undef SEAICE_ALLOW_TEM\n+#endif \/* SEAICE_CGRID *\/\n+\n+C-- When set use MAX_HEFF to cap sea ice thickness in seaice_growth\n+#undef SEAICE_CAP_HEFF\n+\n+#endif \/* SEAICE_OPTIONS_H *\/\n+\n+CEH3 ;;; Local Variables: ***\n+CEH3 ;;; mode:fortran ***\n+CEH3 ;;; End: ***\n"} {"commit":"5e96fa95442e260d9d61908c244dcd31420d36e4","subject":"net: ethernet: Drop the packet early when relevant","message":"net: ethernet: Drop the packet early when relevant\n\nIf PTYPE is unknown, let's drop the packet.\n\nChange-Id: I2fcdd99b01a875e21b2a1952d556f09e40829d2b\nSigned-off-by: Tomasz Bursztyka <ba81a3a719836727e6857ae83462b9f52ec41006@linux.intel.com>\n","repos":"runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,holtmann\/zephyr,runchip\/zephyr-cc3220,runchip\/zephyr-cc3220,finikorg\/zephyr,fbsder\/zephyr,rsalveti\/zephyr,galak\/zephyr,tidyjiang8\/zephyr-doc,GiulianoFranchetto\/zephyr,pklazy\/zephyr,bboozzoo\/zephyr,explora26\/zephyr,GiulianoFranchetto\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,finikorg\/zephyr,sharronliu\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,finikorg\/zephyr,kraj\/zephyr,fractalclone\/zephyr-riscv,tidyjiang8\/zephyr-doc,bigdinotech\/zephyr,kraj\/zephyr,bboozzoo\/zephyr,pklazy\/zephyr,holtmann\/zephyr,GiulianoFranchetto\/zephyr,rsalveti\/zephyr,sharronliu\/zephyr,ldts\/zephyr,fbsder\/zephyr,tidyjiang8\/zephyr-doc,erwango\/zephyr,erwango\/zephyr,bboozzoo\/zephyr,fractalclone\/zephyr-riscv,ldts\/zephyr,zephyrproject-rtos\/zephyr,galak\/zephyr,explora26\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,kraj\/zephyr,punitvara\/zephyr,Vudentz\/zephyr,fractalclone\/zephyr-riscv,pklazy\/zephyr,tidyjiang8\/zephyr-doc,kraj\/zephyr,aceofall\/zephyr-iotos,mbolivar\/zephyr,fbsder\/zephyr,galak\/zephyr,erwango\/zephyr,punitvara\/zephyr,galak\/zephyr,finikorg\/zephyr,fractalclone\/zephyr-riscv,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,runchip\/zephyr-cc3200,ldts\/zephyr,runchip\/zephyr-cc3200,punitvara\/zephyr,holtmann\/zephyr,bigdinotech\/zephyr,bigdinotech\/zephyr,zephyriot\/zephyr,mbolivar\/zephyr,sharronliu\/zephyr,holtmann\/zephyr,pklazy\/zephyr,finikorg\/zephyr,aceofall\/zephyr-iotos,mbolivar\/zephyr,explora26\/zephyr,bboozzoo\/zephyr,bboozzoo\/zephyr,rsalveti\/zephyr,zephyriot\/zephyr,nashif\/zephyr,sharronliu\/zephyr,rsalveti\/zephyr,nashif\/zephyr,runchip\/zephyr-cc3200,bigdinotech\/zephyr,punitvara\/zephyr,runchip\/zephyr-cc3220,sharronliu\/zephyr,zephyriot\/zephyr,Vudentz\/zephyr,fbsder\/zephyr,tidyjiang8\/zephyr-doc,ldts\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,nashif\/zephyr,erwango\/zephyr,explora26\/zephyr,rsalveti\/zephyr,explora26\/zephyr,ldts\/zephyr,pklazy\/zephyr,aceofall\/zephyr-iotos,holtmann\/zephyr,punitvara\/zephyr,galak\/zephyr,fbsder\/zephyr,fractalclone\/zephyr-riscv,mbolivar\/zephyr,zephyrproject-rtos\/zephyr,bigdinotech\/zephyr,mbolivar\/zephyr,kraj\/zephyr,runchip\/zephyr-cc3200,nashif\/zephyr,aceofall\/zephyr-iotos,Vudentz\/zephyr,erwango\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/yaip\/l2\/ethernet.c\n+++ net\/yaip\/l2\/ethernet.c\n@@ -71,6 +71,8 @@\n \tcase NET_ETH_PTYPE_IPV6:\n \t\tnet_nbuf_set_family(buf, AF_INET6);\n \t\tbreak;\n+\tdefault:\n+\t\treturn NET_DROP;\n \t}\n \n \tnet_nbuf_set_ll_reserve(buf, sizeof(struct net_eth_hdr));\n"} {"commit":"daf403677ec7d4da3a9bce9fbc05cd4073533b8e","subject":"Updated for working at Spark","message":"Updated for working at Spark\n","repos":"rodrigofaccioli\/drugdesign,rodrigofaccioli\/drugdesign,rodrigofaccioli\/drugdesign,rodrigofaccioli\/drugdesign","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- virtualscreening\/vina\/detect_hbonds\/src\/detect_hbonds.c\n+++ virtualscreening\/vina\/detect_hbonds\/src\/detect_hbonds.c\n@@ -2,6 +2,8 @@\n #include <stdlib.h>\n #include <math.h>\n #include <string.h>\n+\n+#define MAX_PATH_FILE_NAME 500\n \n int main(int argc, char *argv[]){\n \t\n@@ -20,25 +22,45 @@\n \tfloat distance, distance_cutoff, angle_cutoff;\n \tfloat dist_prev_donor, dist_donor_h, dist_h_acceptor, dist_prev_h, dist_prev_acceptor, dist_donor_acceptor;\n \tfloat angle_prev_donor_h, angle_prev_donor_acceptor, angle_h_donor_acceptor;\n-\tchar lig_filename[100], rec_filename[100];\n+\t\/\/char lig_filename[100], rec_filename[100];\n \tint total_atm_lig, total_atm_rec, atm_rec, atm_lig, atm;\n \tint total_lig_h_donor, total_lig_h_acceptor, total_rec_h_donor, total_rec_h_acceptor;\n \tint bonded_h, h_index ;\n-\tFILE *input_lig, *input_rec;\n+\n+\tchar *lig_filename, *rec_filename, *output_filename, *f_path_temporary_rec_no,\t\n+\t *f_path_temporary_lig_no, *f_path_temporary_rec_h, *f_path_temporary_lig_h;\n+\n+\tFILE *input_lig, *input_rec, *f_output_filename;\n \n \tatom *lig, *rec;\n \tatom *lig_h_donor, *lig_h_acceptor, *rec_h_donor, *rec_h_acceptor;\n \n+\t\/\/Allocating file names\n+\tlig_filename = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\trec_filename = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\toutput_filename = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\tf_path_temporary_rec_no = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\tf_path_temporary_lig_no = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\tf_path_temporary_rec_h = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\tf_path_temporary_lig_h = (char*) malloc( MAX_PATH_FILE_NAME * sizeof(char) );\n+\n \t\t\n-\t\/\/ reading parameters from input command line\n-\tsscanf( argv[1] , \"%s\", &rec_filename[0] );\n-\tsscanf( argv[2] , \"%d\", &total_atm_rec );\n-\tsscanf( argv[3] , \"%s\", &lig_filename[0] );\n-\tsscanf( argv[4] , \"%d\", &total_atm_lig );\n-\tsscanf( argv[5] , \"%f\", &distance_cutoff );\n-\tsscanf( argv[6] , \"%f\", &angle_cutoff );\n-\t\n-\t\n+\t\/\/ reading parameters from input command line\t\n+\tstrcpy(rec_filename, argv[1]);\t\n+\ttotal_atm_rec = atoi(argv[2]);\t\n+\tstrcpy(lig_filename, argv[3]);\n+\ttotal_atm_lig = atoi(argv[4]);\t\n+\tdistance_cutoff = atof(argv[5]);\n+\tangle_cutoff = atof(argv[6]);\n+\tstrcpy(output_filename, argv[7]);\n+\tstrcpy(f_path_temporary_rec_no, argv[8] );\n+\tstrcpy(f_path_temporary_lig_no, argv[9] );\n+\tstrcpy(f_path_temporary_rec_h, argv[10] );\n+\tstrcpy(f_path_temporary_lig_h, argv[11] );\t\n+\t\n+\t\/\/ Setting output filename\n+\tf_output_filename = fopen(output_filename,\"w\");\n+\n \t\/\/ dynamic allocation\n \tlig = (atom*) malloc( (total_atm_lig+1) * sizeof(atom) );\n \t\n@@ -51,9 +73,8 @@\n \trec_h_donor = (atom*) malloc( (total_atm_rec+1) * sizeof(atom) );\n \t\n \t\n-\t\n \t\/\/ reading input files\n-\tinput_rec = fopen( \"temporary_rec\" , \"r\" );\n+\tinput_rec = fopen( f_path_temporary_rec_no , \"r\" );\n \tatm_rec = 1;\n \twhile( fscanf( input_rec, \"%s %d %s %f %f %f %s\",\n \t\t&rec[atm_rec].res_name[0], \n@@ -66,7 +87,7 @@\n \t)!=EOF ) atm_rec++ ;\n \tfclose(input_rec);\n \t\n-\tinput_lig = fopen( \"temporary_lig\" , \"r\" );\n+\tinput_lig = fopen( f_path_temporary_lig_no , \"r\" );\n \tatm_lig = 1;\n \twhile( fscanf( input_lig , \"%s %f %f %f %s\", \n \t\t&lig[atm_lig].atm_name[0], \n@@ -339,7 +360,7 @@\n \t\t\t\n \t\t\t\n \t\t\tif( (dist_donor_acceptor <= distance_cutoff) && (angle_h_donor_acceptor <= angle_cutoff) ){\n-\t\t\t\tprintf(\"LIG-%s\\tdonates_to\\t%s-%d %s\\t%.1f\\t%.1f\\t%s %s\\n\", \n+\t\t\t\tfprintf(f_output_filename,\"LIG-%s\\tdonates_to\\t%s-%d %s\\t%.1f\\t%.1f\\t%s %s\\n\", \n \t\t\t\t\tlig_h_donor[atm_lig].atm_name, \n \t\t\t\t\trec_h_acceptor[atm_rec].res_name, \n \t\t\t\t\trec_h_acceptor[atm_rec].res_number,\n@@ -429,7 +450,7 @@\n \t\t\t\n \t\t\t\n \t\t\tif( (dist_donor_acceptor <= distance_cutoff) && (angle_h_donor_acceptor <= angle_cutoff) ){\n-\t\t\t\tprintf(\"LIG-%s\\taccepts_from\\t%s-%d %s\\t%.1f\\t%.1f\\t%s %s\\n\", \n+\t\t\t\tfprintf(f_output_filename, \"LIG-%s\\taccepts_from\\t%s-%d %s\\t%.1f\\t%.1f\\t%s %s\\n\", \n \t\t\t\t\tlig_h_acceptor[atm_lig].atm_name, \n \t\t\t\t\trec_h_donor[atm_rec].res_name, \n \t\t\t\t\trec_h_donor[atm_rec].res_number,\n@@ -443,7 +464,15 @@\n \t\t}\t\t\n \t}\n \t\n-\t\n-\t\n-return 0;\n+\tfclose(f_output_filename);\n+\t\n+\tfree(lig_filename);\n+\tfree(rec_filename);\n+\tfree(output_filename);\n+\tfree(f_path_temporary_rec_no);\n+\tfree(f_path_temporary_lig_no);\n+\tfree(f_path_temporary_rec_h);\n+\tfree(f_path_temporary_lig_h);\n+\n+\treturn 0;\n }"} {"commit":"bdfbb08ebe5b642b61afa9dd61fcadb5e36e60ec","subject":"Added more support for the legacy parser","message":"Added more support for the legacy parser\n","repos":"seojungmin\/peloton,apavlo\/peloton,PauloAmora\/peloton,vittvolt\/15721-peloton,ShuxinLin\/peloton,vittvolt\/15721-peloton,prashasthip\/peloton,phisiart\/peloton-p3,ShuxinLin\/peloton,vittvolt\/peloton,vittvolt\/15721-peloton,prashasthip\/peloton,cmu-db\/peloton,vittvolt\/peloton,cmu-db\/peloton,AngLi-Leon\/peloton,vittvolt\/peloton,seojungmin\/peloton,malin1993ml\/peloton,vittvolt\/peloton,PauloAmora\/peloton,vittvolt\/peloton,cmu-db\/peloton,prashasthip\/peloton,yingjunwu\/peloton,PauloAmora\/peloton,vittvolt\/15721-peloton,vittvolt\/peloton,haojin2\/peloton,haojin2\/peloton,yingjunwu\/peloton,seojungmin\/peloton,AllisonWang\/peloton,seojungmin\/peloton,phisiart\/peloton-p3,cmu-db\/peloton,AllisonWang\/peloton,prashasthip\/peloton,apavlo\/peloton,haojin2\/peloton,AngLi-Leon\/peloton,PauloAmora\/peloton,AllisonWang\/peloton,ShuxinLin\/peloton,haojin2\/peloton,AllisonWang\/peloton,yingjunwu\/peloton,AllisonWang\/peloton,seojungmin\/peloton,AngLi-Leon\/peloton,phisiart\/peloton-p3,phisiart\/peloton-p3,ShuxinLin\/peloton,seojungmin\/peloton,AngLi-Leon\/peloton,malin1993ml\/peloton,haojin2\/peloton,apavlo\/peloton,prashasthip\/peloton,phisiart\/peloton-p3,apavlo\/peloton,ShuxinLin\/peloton,phisiart\/peloton-p3,PauloAmora\/peloton,malin1993ml\/peloton,malin1993ml\/peloton,PauloAmora\/peloton,malin1993ml\/peloton,vittvolt\/15721-peloton,malin1993ml\/peloton,ShuxinLin\/peloton,cmu-db\/peloton,cmu-db\/peloton,haojin2\/peloton,vittvolt\/15721-peloton,AngLi-Leon\/peloton,AngLi-Leon\/peloton,yingjunwu\/peloton,yingjunwu\/peloton,apavlo\/peloton,AllisonWang\/peloton,prashasthip\/peloton,apavlo\/peloton,yingjunwu\/peloton","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/include\/parser\/delete_statement.h\n+++ src\/include\/parser\/delete_statement.h\n@@ -2,11 +2,11 @@\n \/\/\n \/\/ Peloton\n \/\/\n-\/\/ statement_delete.h\n+\/\/ delete_statement.h\n \/\/\n-\/\/ Identification: src\/include\/parser\/statement_delete.h\n+\/\/ Identification: src\/include\/parser\/delete_statement.h\n \/\/\n-\/\/ Copyright (c) 2015-16, Carnegie Mellon University Database Group\n+\/\/ Copyright (c) 2015-17, Carnegie Mellon University Database Group\n \/\/\n \/\/===----------------------------------------------------------------------===\/\/\n \n@@ -31,14 +31,32 @@\n table_ref(nullptr), expr(nullptr) {};\n \n virtual ~DeleteStatement() {\n+ \/\/ FIXME The following line should be removed\n+ \/\/ when the old parser gets obsolete\n+ delete table_info_;\n+\n delete table_ref;\n- delete table_info_;\n delete expr;\n }\n \n- std::string GetTableName() const { return table_ref->GetTableName(); }\n+ std::string GetTableName() const {\n+ \/\/ FIXME The following two lines should be removed\n+ \/\/ when the old parser gets obsolete\n+ if (table_info_ != nullptr)\n+ return table_info_->table_name;\n+\n+ return table_ref->GetTableName();\n+ }\n \n std::string GetDatabaseName() const {\n+ \/\/ FIXME The following four lines should be removed\n+ \/\/ when the old parser gets obsolete\n+ if (table_info_ != nullptr) {\n+ if (table_info_->database_name == nullptr)\n+ return DEFAULT_DB_NAME;\n+ return table_info_->database_name;\n+ }\n+\n return table_ref->GetDatabaseName();\n }\n \n@@ -46,8 +64,11 @@\n v->Visit(this);\n }\n \n+ \/\/ FIXME The following line should be removed\n+ \/\/ when the old parser gets obsolete\n+ parser::TableInfo* table_info_ = nullptr;\n+\n parser::TableRef* table_ref;\n- parser::TableInfo* table_info_ = nullptr;\n expression::AbstractExpression* expr;\n };\n \n"} {"commit":"3e77c8c6c60b398b0ae18fd9704752f79a2d7551","subject":"Removed superfluous ECPGfree() call.","message":"Removed superfluous ECPGfree() call.\n","repos":"postmind-net\/postgres-xl,xinzweb\/gpdb,Quikling\/gpdb,ashwinstar\/gpdb,yazun\/postgres-xl,kaknikhil\/gpdb,Chibin\/gpdb,kmjungersen\/PostgresXL,xinzweb\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,techdragon\/Postgres-XL,jmcatamney\/gpdb,cjcjameson\/gpdb,ashwinstar\/gpdb,edespino\/gpdb,adam8157\/gpdb,Chibin\/gpdb,edespino\/gpdb,royc1\/gpdb,ashwinstar\/gpdb,yazun\/postgres-xl,rvs\/gpdb,edespino\/gpdb,50wu\/gpdb,kaknikhil\/gpdb,tpostgres-projects\/tPostgres,arcivanov\/postgres-xl,Quikling\/gpdb,chrishajas\/gpdb,zaksoup\/gpdb,lisakowen\/gpdb,yuanzhao\/gpdb,CraigHarris\/gpdb,Chibin\/gpdb,cjcjameson\/gpdb,ahachete\/gpdb,edespino\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,lintzc\/gpdb,lisakowen\/gpdb,cjcjameson\/gpdb,janebeckman\/gpdb,adam8157\/gpdb,jmcatamney\/gpdb,50wu\/gpdb,edespino\/gpdb,Quikling\/gpdb,kaknikhil\/gpdb,zaksoup\/gpdb,postmind-net\/postgres-xl,50wu\/gpdb,ovr\/postgres-xl,ahachete\/gpdb,lintzc\/gpdb,cjcjameson\/gpdb,lisakowen\/gpdb,snaga\/postgres-xl,royc1\/gpdb,50wu\/gpdb,CraigHarris\/gpdb,adam8157\/gpdb,chrishajas\/gpdb,CraigHarris\/gpdb,cjcjameson\/gpdb,zaksoup\/gpdb,greenplum-db\/gpdb,oberstet\/postgres-xl,chrishajas\/gpdb,xinzweb\/gpdb,lisakowen\/gpdb,edespino\/gpdb,xuegang\/gpdb,ovr\/postgres-xl,rvs\/gpdb,ashwinstar\/gpdb,xuegang\/gpdb,royc1\/gpdb,edespino\/gpdb,yuanzhao\/gpdb,lintzc\/gpdb,ashwinstar\/gpdb,arcivanov\/postgres-xl,Postgres-XL\/Postgres-XL,pavanvd\/postgres-xl,ahachete\/gpdb,edespino\/gpdb,Chibin\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,greenplum-db\/gpdb,Quikling\/gpdb,yuanzhao\/gpdb,kaknikhil\/gpdb,cjcjameson\/gpdb,Quikling\/gpdb,snaga\/postgres-xl,arcivanov\/postgres-xl,Chibin\/gpdb,zaksoup\/gpdb,lintzc\/gpdb,zaksoup\/gpdb,yuanzhao\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,lisakowen\/gpdb,adam8157\/gpdb,yazun\/postgres-xl,greenplum-db\/gpdb,jmcatamney\/gpdb,kaknikhil\/gpdb,chrishajas\/gpdb,adam8157\/gpdb,xinzweb\/gpdb,edespino\/gpdb,ahachete\/gpdb,xinzweb\/gpdb,pavanvd\/postgres-xl,lintzc\/gpdb,jmcatamney\/gpdb,ashwinstar\/gpdb,zaksoup\/gpdb,royc1\/gpdb,snaga\/postgres-xl,janebeckman\/gpdb,greenplum-db\/gpdb,xuegang\/gpdb,oberstet\/postgres-xl,kmjungersen\/PostgresXL,Postgres-XL\/Postgres-XL,postmind-net\/postgres-xl,lisakowen\/gpdb,Chibin\/gpdb,cjcjameson\/gpdb,kaknikhil\/gpdb,ovr\/postgres-xl,techdragon\/Postgres-XL,50wu\/gpdb,xinzweb\/gpdb,yazun\/postgres-xl,xinzweb\/gpdb,adam8157\/gpdb,yuanzhao\/gpdb,pavanvd\/postgres-xl,ahachete\/gpdb,0x0FFF\/gpdb,snaga\/postgres-xl,zaksoup\/gpdb,techdragon\/Postgres-XL,jmcatamney\/gpdb,kaknikhil\/gpdb,edespino\/gpdb,ahachete\/gpdb,arcivanov\/postgres-xl,snaga\/postgres-xl,lisakowen\/gpdb,cjcjameson\/gpdb,chrishajas\/gpdb,Postgres-XL\/Postgres-XL,adam8157\/gpdb,zeroae\/postgres-xl,yazun\/postgres-xl,rvs\/gpdb,lintzc\/gpdb,oberstet\/postgres-xl,ahachete\/gpdb,greenplum-db\/gpdb,chrishajas\/gpdb,rvs\/gpdb,yuanzhao\/gpdb,janebeckman\/gpdb,0x0FFF\/gpdb,greenplum-db\/gpdb,janebeckman\/gpdb,zeroae\/postgres-xl,tpostgres-projects\/tPostgres,Quikling\/gpdb,50wu\/gpdb,cjcjameson\/gpdb,royc1\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,kaknikhil\/gpdb,chrishajas\/gpdb,tpostgres-projects\/tPostgres,Postgres-XL\/Postgres-XL,kmjungersen\/PostgresXL,zeroae\/postgres-xl,pavanvd\/postgres-xl,yuanzhao\/gpdb,arcivanov\/postgres-xl,CraigHarris\/gpdb,oberstet\/postgres-xl,xuegang\/gpdb,janebeckman\/gpdb,Quikling\/gpdb,rvs\/gpdb,0x0FFF\/gpdb,CraigHarris\/gpdb,xinzweb\/gpdb,zeroae\/postgres-xl,pavanvd\/postgres-xl,xuegang\/gpdb,CraigHarris\/gpdb,xuegang\/gpdb,royc1\/gpdb,rvs\/gpdb,arcivanov\/postgres-xl,tpostgres-projects\/tPostgres,0x0FFF\/gpdb,ovr\/postgres-xl,Quikling\/gpdb,postmind-net\/postgres-xl,greenplum-db\/gpdb,janebeckman\/gpdb,kaknikhil\/gpdb,techdragon\/Postgres-XL,ovr\/postgres-xl,lintzc\/gpdb,0x0FFF\/gpdb,kmjungersen\/PostgresXL,janebeckman\/gpdb,ashwinstar\/gpdb,jmcatamney\/gpdb,xuegang\/gpdb,Chibin\/gpdb,yuanzhao\/gpdb,ahachete\/gpdb,xuegang\/gpdb,janebeckman\/gpdb,Postgres-XL\/Postgres-XL,rvs\/gpdb,yuanzhao\/gpdb,50wu\/gpdb,jmcatamney\/gpdb,lintzc\/gpdb,janebeckman\/gpdb,zaksoup\/gpdb,rvs\/gpdb,Chibin\/gpdb,zeroae\/postgres-xl,0x0FFF\/gpdb,royc1\/gpdb,techdragon\/Postgres-XL,ashwinstar\/gpdb,tpostgres-projects\/tPostgres,yuanzhao\/gpdb,CraigHarris\/gpdb,Quikling\/gpdb,chrishajas\/gpdb,postmind-net\/postgres-xl,rvs\/gpdb,Chibin\/gpdb,oberstet\/postgres-xl,Chibin\/gpdb,kmjungersen\/PostgresXL,xuegang\/gpdb,adam8157\/gpdb,lisakowen\/gpdb,CraigHarris\/gpdb,rvs\/gpdb,greenplum-db\/gpdb","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- src\/interfaces\/ecpg\/ecpglib\/execute.c\n+++ src\/interfaces\/ecpg\/ecpglib\/execute.c\n@@ -1,4 +1,4 @@\n-\/* $PostgreSQL: pgsql\/src\/interfaces\/ecpg\/ecpglib\/execute.c,v 1.68 2007\/08\/14 10:01:52 meskes Exp $ *\/\n+\/* $PostgreSQL: pgsql\/src\/interfaces\/ecpg\/ecpglib\/execute.c,v 1.69 2007\/09\/21 10:59:27 meskes Exp $ *\/\n \n \/*\n * The aim is to get a simpler inteface to the database routines.\n@@ -1492,7 +1492,6 @@\n \t{\n \t\tsetlocale(LC_NUMERIC, oldlocale);\n \t\tECPGfree(oldlocale);\n-\t\tECPGfree(prepname);\n \t\tva_end(args);\n \t\treturn false;\n \t}\n"} {"commit":"c06bdacfab7dc9d15f54216097d12aa88de22e31","subject":"Translated some error codes to OperationalError as requested by Matthew Harriger; translated if\/elseif\/else logic to switch statement to make it more readable and to allow for additional translation if desired.","message":"Translated some error codes to OperationalError as requested by Matthew\nHarriger; translated if\/elseif\/else logic to switch statement to make it more\nreadable and to allow for additional translation if desired.\n\n\ngit-svn-id: b746c3c07d6b14fe725b72f068c7252a81557b48@91 0cf6dada-cf32-0410-b4fe-d86b42e8394d\n","repos":"Bluehorn\/cx_Oracle,Bluehorn\/cx_Oracle,Bluehorn\/cx_Oracle","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- Environment.c\n+++ Environment.c\n@@ -166,10 +166,28 @@\n \n error = Error_New(environment, context);\n if (error) {\n- if (error->errorNumber == 1 ||\n- (error->errorNumber >= 2290 && error->errorNumber <= 2292))\n- exceptionType = g_IntegrityErrorException;\n- else exceptionType = g_DatabaseErrorException;\n+ switch (error->errorNumber) {\n+ case 1:\n+ case 2290:\n+ case 2291:\n+ case 2292:\n+ exceptionType = g_IntegrityErrorException;\n+ break;\n+ case 1012:\n+ case 1033:\n+ case 1034:\n+ case 1089:\n+ case 3113:\n+ case 3114:\n+ case 12203:\n+ case 12500:\n+ case 12571:\n+ exceptionType = g_OperationalErrorException;\n+ break;\n+ default:\n+ exceptionType = g_DatabaseErrorException;\n+ break;\n+ }\n PyErr_SetObject(exceptionType, (PyObject*) error);\n Py_DECREF(error);\n }\n"} {"commit":"57f2821f8ed183036e61f76a8b2fefcc1a1f1cbd","subject":"Fix backslash warning from missing blank line at end of file","message":"Fix backslash warning from missing blank line at end of file\n","repos":"ITKTools\/ITKTools,ITKTools\/ITKTools,ITKTools\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,sderaedt\/ITKTools,ITKTools\/ITKTools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/morphology\/mainhelper2.h\n+++ src\/morphology\/mainhelper2.h\n@@ -44,4 +44,4 @@\n function< ImageType >( inputFileName, outputFileName, radius, algorithm, useCompression ); \\\n supported = true; \\\n } \\\n-}+}\n"} {"commit":"de4cda9861f6a26289adffb01cac384031e559eb","subject":"- win32 doesn't have unit32_t, declaration order matters","message":"- win32 doesn't have unit32_t, declaration order matters\n","repos":"run4flat\/Primo,run4flat\/Primo","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- include\/apricot.h\n+++ include\/apricot.h\n@@ -342,7 +342,6 @@\n #error \"Cannot find adequate integer type\"\n #endif\n typedef Handle ApiHandle;\n-typedef uint32_t Color;\n \n #include \"Types.h\"\n \n@@ -386,6 +385,7 @@\n #endif\n #endif\n \n+typedef uint32_t Color;\n \n typedef uint8_t Byte;\n typedef int16_t Short;\n"} {"commit":"5b370d452462efdb35fc5a28bc08429fb1c75e45","subject":"TCP flags","message":"TCP flags\n","repos":"maxymania\/pentan-net,maxymania\/pentan-net","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- include\/ppe\/tcp.h\n+++ include\/ppe\/tcp.h\n@@ -24,6 +24,18 @@\n \tuint8_t options[40];\n } TCP_SegmentInfo;\n \n+enum {\n+\tTCPF_FIN = 0x001,\n+\tTCPF_SYN = 0x002,\n+\tTCPF_RST = 0x004,\n+\tTCPF_PSH = 0x008,\n+\tTCPF_ACK = 0x010,\n+\tTCPF_URG = 0x020,\n+\tTCPF_ECE = 0x040,\n+\tTCPF_CWR = 0x080,\n+\tTCPF_NS = 0x100,\n+};\n+\n \/*\n * @brief creates an TCP segment\n * @param packet The Packet Buffer.\n"} {"commit":"544aac9bb3f6b030658656dcfe674fae0f9290c6","subject":"branches\/zip: Update the comments and fix the whitespace issues. See rb:\/\/255 Approved by: Marko","message":"branches\/zip: Update the comments and fix the whitespace issues.\nSee rb:\/\/255 Approved by: Marko\n","repos":"davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,natsys\/mariadb_10.2,natsys\/mariadb_10.2,ollie314\/server,ollie314\/server,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,slanterns\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,ollie314\/server,davidl-zend\/zenddbi,flynn1973\/mariadb-aix,davidl-zend\/zenddbi,davidl-zend\/zenddbi,natsys\/mariadb_10.2,natsys\/mariadb_10.2,flynn1973\/mariadb-aix,flynn1973\/mariadb-aix,natsys\/mariadb_10.2,davidl-zend\/zenddbi,ollie314\/server,ollie314\/server,natsys\/mariadb_10.2","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- include\/trx0trx.h\n+++ include\/trx0trx.h\n@@ -464,9 +464,16 @@\n struct trx_struct{\n \tulint\t\tmagic_n;\n \n-\t\/* These fields are not protected by any mute. *\/\n+\t\/* These fields are not protected by any mutex. *\/\n+\tconst char*\top_info;\t\/*!< English text describing the\n+\t\t\t\t\tcurrent operation, or an empty\n+\t\t\t\t\tstring *\/\n+\tulint\t\tconc_state;\t\/*!< state of the trx from the point\n+\t\t\t\t\tof view of concurrency control:\n+\t\t\t\t\tTRX_ACTIVE, TRX_COMMITTED_IN_MEMORY,\n+\t\t\t\t\t... *\/\n \tulint\t\tisolation_level;\/* TRX_ISO_REPEATABLE_READ, ... *\/\n-\tulint\t\tcheck_foreigns;\/* normally TRUE, but if the user\n+\tulint\t\tcheck_foreigns;\t\/* normally TRUE, but if the user\n \t\t\t\t\twants to suppress foreign key checks,\n \t\t\t\t\t(in table imports, for example) we\n \t\t\t\t\tset this FALSE *\/\n@@ -503,6 +510,7 @@\n \t\t\t\t\tsearch system latch in S-mode *\/\n \tulint\t\tdeadlock_mark;\t\/*!< a mark field used in deadlock\n \t\t\t\t\tchecking algorithm. *\/\n+\ttrx_dict_op_t\tdict_operation;\t\/**< @see enum trx_dict_op *\/\n \n \t\/* Fields protected by the srv_conc_mutex. *\/\n \tulint\t\tdeclared_to_be_inside_innodb;\n@@ -511,11 +519,8 @@\n \t\t\t\t\tsrv_conc_enter_innodb to be inside the\n \t\t\t\t\tInnoDB engine *\/\n \n-\t\/* Fields set when we are holding the kernel mutex, undo log mutex\n-\tand when not holding the mutex. *\/\n-\ttrx_dict_op_t\tdict_operation;\t\/**< @see enum trx_dict_op *\/\n-\n-\t\/* Fields covered by the dictionary mutex. *\/\n+\t\/* Fields protected by dict_operation_loco(). The very latch\n+\tit is used to track. *\/\n \tulint\t\tdict_operation_lock_mode;\n \t\t\t\t\t\/* 0, RW_S_LATCH, or RW_X_LATCH:\n \t\t\t\t\tthe latch mode trx currently holds\n@@ -523,19 +528,12 @@\n \n \t\/* All the next fields are protected by the kernel mutex, except the\n \tundo logs which are protected by undo_mutex *\/\n-\tconst char*\top_info;\t\/*!< English text describing the\n-\t\t\t\t\tcurrent operation, or an empty\n-\t\t\t\t\tstring *\/\n \tulint\t\tis_purge;\t\/*!< 0=user transaction, 1=purge *\/\n \tulint\t\tis_recovered;\t\/*!< 0=normal transaction,\n \t\t\t\t\t1=recovered, must be rolled back *\/\n-\tulint\t\tconc_state;\t\/*!< state of the trx from the point\n-\t\t\t\t\tof view of concurrency control:\n-\t\t\t\t\tTRX_ACTIVE, TRX_COMMITTED_IN_MEMORY,\n-\t\t\t\t\t... *\/\n \tulint\t\tque_state;\t\/*!< valid when conc_state\n \t\t\t\t\t== TRX_ACTIVE: TRX_QUE_RUNNING,\n-\t\t\t\t \tTRX_QUE_LOCK_WAIT, ... *\/\n+\t\t\t\t\tTRX_QUE_LOCK_WAIT, ... *\/\n \tulint\t\thandling_signals;\/* this is TRUE as long as the trx\n \t\t\t\t\tis handling signals *\/\n \ttime_t\t\tstart_time;\t\/*!< time the trx object was created\n"} {"commit":"e64d7aa3ea238aef0308d7defef6767a06e4d0e6","subject":"Delete FastestHash.h","message":"Delete FastestHash.h","repos":"wangyi-fudan\/wyhash,wangyi-fudan\/wyhash","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- FastestHash.h\n+++ FastestHash.h\n@@ -1,15 +0,0 @@\n-\/\/ Author: Wang Yi <godspeed_china@yeah.net>\n-#include <stdint.h>\n-#include <string.h>\n-static inline uint64_t FastestHash(const void *key, size_t len) {\n- const uint8_t *p = (const uint8_t *)key;\n- if(len>=4) {\n- unsigned first, middle, last;\n- memcpy(&first,p,4);\n- memcpy(&middle,p+(len>>1)-2,4);\n- memcpy(&last,p+len-4,4);\n- return (uint64_t)(first+last)*middle;\n- }\n- if(len) return ((((unsigned)p[0])<<16) | (((unsigned)p[len>>1])<<8) | p[len-1])*0xa0761d6478bd642full;\n- return 0;\n-}\n"} {"commit":"1a7184072109d65f24c9f891039cc1fdbbf730f8","subject":"gabble-media-channel: use mixin->members directly","message":"gabble-media-channel: use mixin->members directly\n\n\n20080512112938-7fe3f-192bd65bbe37a152303bb9493d1bd05ad5bfa988.gz\n","repos":"community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,jku\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,mlundblad\/telepathy-gabble","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-media-channel.c\n+++ src\/gabble-media-channel.c\n@@ -1299,9 +1299,6 @@\n JingleSessionState state;\n TpHandle peer;\n TpIntSet *set;\n- GArray *members;\n- gboolean peer_in_members = FALSE;\n- guint i;\n \n g_object_get (session,\n \"state\", &state,\n@@ -1312,18 +1309,9 @@\n \n tp_intset_add (set, peer);\n \n- \/* Is the peer already in members ? *\/\n- tp_group_mixin_get_members ((GObject *) channel, &members, NULL);\n-\n- for (i = 0; i < members->len && !peer_in_members; i++)\n- {\n- peer_in_members = (g_array_index (members, TpHandle, i) == peer);\n- }\n-\n- g_array_free (members, TRUE);\n-\n if (state >= JS_STATE_PENDING_INITIATE_SENT &&\n- state < JS_STATE_ACTIVE && !peer_in_members)\n+ state < JS_STATE_ACTIVE &&\n+ !tp_handle_set_is_member (mixin->members, peer))\n {\n \/* The first time we send anything to the other user, they materialise\n * in remote-pending if necessary *\/\n"} {"commit":"bab7d887f2e910deeb5933a7e57027273b4d544e","subject":"GabbleMediaSession: fix hypothetical memory leak in code path that can't happen currently (but may in future)","message":"GabbleMediaSession: fix hypothetical memory leak in code path that can't happen currently (but may in future)\n\n\n20060921163925-418b8-8fee1b86c4c8c75272d3a926c69164c854291ec5.gz\n","repos":"community-ssu\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,jku\/telepathy-gabble,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,Distrotech\/telepathy-glib,jku\/telepathy-gabble,jku\/telepathy-gabble,Ziemin\/telepathy-gabble,community-ssu\/telepathy-gabble,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib,mlundblad\/telepathy-gabble,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/gabble-media-session.c\n+++ src\/gabble-media-session.c\n@@ -598,7 +598,10 @@\n GabbleMediaStream *stream = g_ptr_array_index (streams, i);\n \n if (!gabble_media_stream_error (stream, errno, message, error))\n- return FALSE;\n+ {\n+ g_ptr_array_free (streams, TRUE);\n+ return FALSE;\n+ }\n }\n \n g_ptr_array_free (streams, TRUE);\n"} {"commit":"90240770b2246283834b12d7cdf664ec633751e8","subject":"Do not read request status during successfull upload tracking","message":"Do not read request status during successfull upload tracking\n\nSigned-off-by: Micha\u0142 Pokrywka <32496b2fd36e63f498912effa368e8117e585ca9@gmail.com>\n","repos":"drogus\/apache-upload-progress-module","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- mod_upload_progress.c\n+++ mod_upload_progress.c\n@@ -342,8 +342,9 @@\n if (upload_time > 0) {\n node->speed = (apr_size_t)(node->received \/ upload_time);\n }\n- }\n- node->err_status = read_request_status(f->r);\n+ } else {\n+ node->err_status = read_request_status(f->r);\n+ }\n }\n CACHE_UNLOCK();\n \n"} {"commit":"f9c35694825e05d1f1da6f44d40d2554cb593aa4","subject":"sap: call recv() directly","message":"sap: call recv() directly\n\nnet_Read() is identical to recv() outside the input thread and if\nwaitall is false.\n","repos":"vlc-mirror\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,krichter722\/vlc,vlc-mirror\/vlc,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc,krichter722\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/services_discovery\/sap.c\n+++ modules\/services_discovery\/sap.c\n@@ -554,8 +554,7 @@\n uint8_t p_buffer[MAX_SAP_BUFFER+1];\n ssize_t i_read;\n \n- i_read = net_Read (p_sd, ufd[i].fd, NULL, p_buffer,\n- MAX_SAP_BUFFER, false);\n+ i_read = recv (ufd[i].fd, p_buffer, MAX_SAP_BUFFER, 0);\n if (i_read < 0)\n msg_Warn (p_sd, \"receive error: %s\",\n vlc_strerror_c(errno));\n"} {"commit":"5f57cf5aa73df85845f7a53a3d775de50e72fcdb","subject":"sap.c: don't free the inputs internal buffers! shame on you!","message":"sap.c: don't free the inputs internal buffers! shame on you!\n\n","repos":"jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,krichter722\/vlc,krichter722\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,krichter722\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,krichter722\/vlc,xkfz007\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/services_discovery\/sap.c\n+++ modules\/services_discovery\/sap.c\n@@ -327,8 +327,6 @@\n }\n }\n \n- free( p_peek );\n-\n p_demux->pf_control = Control;\n p_demux->pf_demux = Demux;\n \n"} {"commit":"84471603bc16659989db3fd5223b33772653b704","subject":"Add support for macros with arguments","message":"Add support for macros with arguments\n\nThis patch builds an special string with all the information needed\nto expand a macro.\n","repos":"8l\/scc,k0gaMSX\/kcc,k0gaMSX\/scc,k0gaMSX\/kcc,k0gaMSX\/scc,k0gaMSX\/scc,8l\/scc,8l\/scc","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- cc1\/cpp.c\n+++ cc1\/cpp.c\n@@ -10,6 +10,133 @@\n #include \"cc1.h\"\n \n \/* TODO: preprocessor error must not rise recover *\/\n+\n+\/*\n+ * Parse an argument list (par0, par1, ...) and creates\n+ * an array with pointers to all the arguments in the\n+ * list\n+ *\/\n+static char *\n+parseargs(char *s, char *args[NR_MACROARG], int *nargs)\n+{\n+\tunsigned n ;\n+\tsize_t len;\n+\tchar **bp, *endp, c;\n+\n+\tif (*s != '(') {\n+\t\t*nargs = -1;\n+\t\treturn s;\n+\t}\n+\tif (*++s == ')') {\n+\t\t*nargs = 0;\n+\t\treturn s+1;\n+\t}\n+\n+\n+\tfor (bp = args, n = 1; n <= NR_MACROARG; ++bp, ++n) {\n+\t\twhile (isspace(*s))\n+\t\t\t++s;\n+\t\tif (!isalnum(*s) && *s != '_')\n+\t\t\terror(\"macro arguments must be identifiers\");\n+\t\tfor (endp = s; isalnum(*endp) || *endp == '_'; ++endp)\n+\t\t\t\/* nothing *\/;\n+\t\tif ((len = endp - s) > IDENTSIZ)\n+\t\t\terror(\"macro argument too long\");\n+\t\t*bp = s;\n+\t\tfor (s = endp; isspace(*s); ++s)\n+\t\t\t*s = '\\0';\n+\t\tc = *s;\n+\t\t*s++ = '\\0';\n+\t\tif (c == ')')\n+\t\t\tbreak;\n+\t\tif (c == ',')\n+\t\t\tcontinue;\n+\t\telse\n+\t\t\terror(\"macro parameters must be comma-separated\");\n+\t}\n+\tif (n > NR_MACROARG)\n+\t\terror(\"too much parameters in macro\");\n+\t*nargs = n;\n+\treturn s;\n+}\n+\/*\n+ * Copy a define string, and substitute formal arguments of the\n+ * macro into strings in the form @XX, where XX is the position\n+ * of the argument in the argument list.\n+ *\/\n+static char *\n+copydefine(char *s, char *args[], char *buff, int bufsiz, int nargs)\n+{\n+\tunsigned ncopy, n;\n+\tsize_t len;\n+\tchar arroba[5], *par, *endp, **bp;\n+\n+\twhile (*s && bufsiz > 0) {\n+\t\tif (!isalnum(*s) && *s != '_') {\n+\t\t\t--bufsiz;\n+\t\t\t*buff++ = *s++;\n+\t\t\tcontinue;\n+\t\t}\n+\t\t\/*\n+\t\t * found an identifier, is it one of the macro arguments?\n+\t\t *\/\n+\t\tfor (endp = s+1; isalnum(*endp) || *endp == '_'; ++endp)\n+\t\t\t\/* nothing *\/;\n+\t\tlen = endp - s;\n+\t\tfor (bp =args, n = 0; n < nargs; ++bp, n++) {\n+\t\t\tif (strncmp(s, *bp, len))\n+\t\t\t\tcontinue;\n+\t\t\tsprintf(arroba, \"@%02d\", n);\n+\t\t\tbreak;\n+\t\t}\n+\t\tif (n == nargs)\n+\t\t\tpar = s, ncopy = len;\n+\t\telse\n+\t\t\tpar = arroba, ncopy = 3;\n+\n+\t\tif ((bufsiz -= ncopy) < 0)\n+\t\t\tgoto too_long;\n+\t\tmemcpy(buff, par, ncopy);\n+\t\tbuff += ncopy;\n+\t\ts = endp;\n+\t}\n+\n+\tif (*s == '\\0') {\n+\t\t*buff = '\\0';\n+\t\treturn s;\n+\t}\n+\n+too_long:\n+\terror(\"macro definition too long\");\n+}\n+\n+static char *\n+mkdefine(char *s, Symbol *sym)\n+{\n+\tint nargs;\n+\tchar *args[NR_MACROARG], buff[LINESIZ+1];\n+\tchar type;\n+\n+\ts = parseargs(s, args, &nargs);\n+\tif (nargs == -1) {\n+\t\ttype = 'N';\n+\t\t++nargs;\n+\t} else {\n+\t\ttype = 'P';\n+\t}\n+\n+\tsprintf(buff, \"%c%02d\", type, nargs);\n+\n+\twhile (isspace(*s))\n+\t\t++s;\n+\n+\tif (*s != '\\0')\n+\t\ts = copydefine(s, args, buff+3, LINESIZ-3, nargs);\n+\tsym->u.s = xstrdup(buff);\n+\n+\treturn s;\n+}\n+\n static char *\n define(char *s)\n {\n@@ -27,12 +154,11 @@\n \tname[len] = '\\0';\n \tsym = install(name, NS_CPP);\n \n-\twhile (isspace(*t))\n-\t\t++t;\n-\tfor (s = t + strlen(t); isspace(*--s); *s = '\\0')\n-\t\t\/* nothing *\/;\n-\tsym->u.s = xstrdup(t);\n-\treturn s+1;\n+\tfor (s = t; isspace(*s); ++s)\n+\t\t\/* nothing *\/;\n+\tfor (t = s + strlen(s); isspace(*--t); *t = '\\0')\n+\t\t\/* nothing *\/;\n+\treturn mkdefine(s, sym);\n \n too_long:\n \terror(\"macro identifier too long\");\n"} {"commit":"22332ba1e9aa9dd8c80a16e9d541c8085c3e0d1e","subject":"Fixing PID file behavior","message":"Fixing PID file behavior\n","repos":"ucc\/OpenDispense2,ucc\/OpenDispense2","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"1458a009d4c57eddd22f4ad62bc4e31a6409aa01","subject":"Don't bother to be robust if we can't get a handle to kernel32.dll -- something would be seriously wrong.","message":"Don't bother to be robust if we can't get a handle to kernel32.dll -- something would be seriously wrong.\n","repos":"Alexpux\/Coin3D,Alexpux\/Coin3D,Alexpux\/Coin3D,Alexpux\/Coin3D","returncode":0,"stderr":"unknown","license":"bsd-3-clause","lang":"C","diff":""} {"commit":"1ae02881e5512698910e4d5198342585113da121","subject":"header","message":"header\n","repos":"luoxiaojun1992\/nginx_http_gray_module,luoxiaojun1992\/nginx_http_gray_module,luoxiaojun1992\/nginx_http_gray_module","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- ngx_http_gray_module.c\n+++ ngx_http_gray_module.c\n@@ -192,6 +192,9 @@\n \n ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, \"%s\", reply->str);\n \n+ ngx_table_elt_t *h;\n+\tngx_list_part_t *part;\n+\tngx_uint_t i;\n part = &r->headers_in.headers.part;\n \tdo {\n \t h = part->elts;\n"} {"commit":"607a53842a5d88e78e2c8e636fffef81909a0a7c","subject":"fixed debug logging","message":"fixed debug logging\n","repos":"noname007\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,WTF001\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,WTF001\/nginx-rtmp-module,cine-io\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,junaidnasir\/nginx-rtmp-HLS-rabbitmq,cine-io\/nginx-rtmp-module,chrisp22\/nginx-rtmp-module,oceanho\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,copystudy\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,copystudy\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,chrisp22\/nginx-rtmp-module,devaos\/nginx-rtmp-module,noname007\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,devaos\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,lu-zero\/nginx-rtmp-module,oceanho\/nginx-rtmp-module,dourgulf\/nginx-rtmp-module,devaos\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module,junaidnasir\/nginx-rtmp-HLS-rabbitmq,jiangbing9293\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,lu-zero\/nginx-rtmp-module,arut\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,UweM\/nginx-rtmp-module,nestle1998\/nginx-rtmp-module,Ivip\/nginx-rtmp-module,PROGrand\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module,UweM\/nginx-rtmp-module,jiangbing9293\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,stephenbasile\/nginx-rtmp-module,LinkBR\/nginx-rtmp-module,chrisp22\/nginx-rtmp-module,kmcfly\/nginx-rtmp-module,UweM\/nginx-rtmp-module,DavadDi\/nginx-rtmp-module,doogaille\/nginx-rtmp-module,litoupu\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,jiangbing9293\/nginx-rtmp-module,arut\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,duqiao\/nginx-rtmp-module,TrurlMcByte\/nginx-rtmp-module,craftyoyo\/nginx-rtmp-module,noname007\/nginx-rtmp-module,RainInFall\/nginx-rtmp-module,oceanho\/nginx-rtmp-module,xunen\/stream-rtmp-nginx-module,WTF001\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module,arut\/nginx-rtmp-module,lu-zero\/nginx-rtmp-module,copystudy\/nginx-rtmp-module,sergey-dryabzhinsky\/nginx-rtmp-module,arut\/nginx-rtmp-module,zweigraf\/nginx-rtmp-module","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ngx_rtmp_play_module.c\n+++ ngx_rtmp_play_module.c\n@@ -861,7 +861,7 @@\n NGX_FILE_DEFAULT_ACCESS);\n \n if (ctx->file.fd == NGX_INVALID_FILE) {\n- ngx_log_debug1(NGX_LOG_ERR, s->connection->log, ngx_errno,\n+ ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, ngx_errno,\n \"play: error opening file '%s'\", path);\n continue;\n }\n"} {"commit":"c25b3394399c7409d0dd3d7862a456932c77c648","subject":"Dump output to master.out by default","message":"Dump output to master.out by default\n\nErrors go to stderr. Simply tail -f master.out.\n","repos":"cmotc\/ratox,kytvi2p\/ratox,insanity54\/batox,cmotc\/ratox,pranomostro\/ratox,pranomostro\/ratox","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- ratatox.c\n+++ ratatox.c\n@@ -6,6 +6,7 @@\n #include <errno.h>\n #include <fcntl.h>\n #include <limits.h>\n+#include <stdarg.h>\n #include <stdint.h>\n #include <stdio.h>\n #include <stdlib.h>\n@@ -58,6 +59,23 @@\n static void friendcreate(int32_t);\n \n static void\n+masterout(const char *fmt, ...)\n+{\n+\tFILE *fp;\n+\tva_list ap;\n+\n+\tfp = fopen(\"master_out\", \"a\");\n+\tif (!fp) {\n+\t\tperror(\"fopen\");\n+\t\texit(1);\n+\t}\n+\tva_start(ap, fmt);\n+\tvfprintf(fp, fmt, ap);\n+\tva_end(ap);\n+\tfclose(fp);\n+}\n+\n+static void\n cb_conn_status(Tox *tox, int32_t fid, uint8_t status, void *udata)\n {\n \tstruct friend *f;\n@@ -74,14 +92,14 @@\n \n \tif (n == 0) {\n \t\tif (status == 0)\n-\t\t\tprintf(\"Anonymous went offline\\n\");\n+\t\t\tmasterout(\"Anonymous went offline\\n\");\n \t\telse\n-\t\t\tprintf(\"Anonymous came online\\n\");\n+\t\t\tmasterout(\"Anonymous came online\\n\");\n \t} else {\n \t\tif (status == 0)\n-\t\t\tprintf(\"%s went offline\\n\", name);\n+\t\t\tmasterout(\"%s went offline\\n\", name);\n \t\telse\n-\t\t\tprintf(\"%s came online\\n\", name);\n+\t\t\tmasterout(\"%s came online\\n\", name);\n \t}\n \n \tTAILQ_FOREACH(f, &friendhead, entry)\n@@ -127,9 +145,9 @@\n \tmsg[len] = '\\0';\n \ttox_add_friend_norequest(tox, id);\n \tif (len > 0)\n-\t\tprintf(\"Accepted friend request with msg: %s\\n\", msg);\n+\t\tmasterout(\"Accepted friend request with msg: %s\\n\", msg);\n \telse\n-\t\tprintf(\"Accepted friend request\\n\");\n+\t\tmasterout(\"Accepted friend request\\n\");\n \tdatasave();\n }\n \n@@ -158,9 +176,9 @@\n \t\t\tif (memcmp(f->namestr, name, len + 1) == 0)\n \t\t\t\tbreak;\n \t\t\tif (f->namestr[0] == '\\0') {\n-\t\t\t\tprintf(\"%s -> %s\\n\", \"Anonymous\", name);\n+\t\t\t\tmasterout(\"%s -> %s\\n\", \"Anonymous\", name);\n \t\t\t} else {\n-\t\t\t\tprintf(\"%s -> %s\\n\", f->namestr, name);\n+\t\t\t\tmasterout(\"%s -> %s\\n\", f->namestr, name);\n \t\t\t}\n \t\t\tmemcpy(f->namestr, name, len + 1);\n \t\t\tbreak;\n@@ -191,7 +209,7 @@\n \t\t\tfputs(status, fp);\n \t\t\tfputc('\\n', fp);\n \t\t\tfclose(fp);\n-\t\t\tprintf(\"%s current status to %s\\n\", f->namestr, status);\n+\t\t\tmasterout(\"%s current status to %s\\n\", f->namestr, status);\n \t\t\tbreak;\n \t\t}\n \t}\n@@ -300,11 +318,10 @@\n \ttox_set_user_status(tox, TOX_USERSTATUS_NONE);\n \n \ttox_get_address(tox, address);\n-\tprintf(\"ID: \");\n+\tmasterout(\"ID: \");\n \tfor (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; i++)\n-\t\tprintf(\"%02x\", address[i]);\n-\tputchar('\\n');\n-\n+\t\tmasterout(\"%02x\", address[i]);\n+\tmasterout(\"\\n\");\n \n \treturn 0;\n }\n@@ -422,14 +439,14 @@\n \twhile (1) {\n \t\tif (tox_isconnected(tox) == 1) {\n \t\t\tif (connected == 0) {\n-\t\t\t\tprintf(\"Connected to DHT\\n\");\n+\t\t\t\tmasterout(\"Connected to DHT\\n\");\n \t\t\t\tconnected = 1;\n \t\t\t}\n \t\t} else {\n \t\t\tt1 = time(NULL);\n \t\t\tif (t1 > t0 + 5) {\n \t\t\t\tt0 = time(NULL);\n-\t\t\t\tprintf(\"Connecting to DHT...\\n\");\n+\t\t\t\tmasterout(\"Connecting to DHT...\\n\");\n \t\t\t\ttoxconnect();\n \t\t\t}\n \t\t}\n"} {"commit":"d0d67d9454e434752e5aca42765c482d89110574","subject":"* Ongoing work","message":"* Ongoing work\n","repos":"koryonik\/swipl-devel,mndrix\/swipl-devel,koryonik\/swipl-devel,edechter\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel,edechter\/swipl-devel,jn7163\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel,jn7163\/swipl-devel,jn7163\/swipl-devel,mndrix\/swipl-devel,edechter\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel,mndrix\/swipl-devel,jn7163\/swipl-devel,koryonik\/swipl-devel,koryonik\/swipl-devel","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- packages\/clib\/sha4pl.c\n+++ packages\/clib\/sha4pl.c\n@@ -67,17 +67,17 @@\n if ( aname == ATOM_algorithm )\n { atom_t a_algorithm;\n \n-\tif ( !PL_get_atom(a, &algorithm) )\n+\tif ( !PL_get_atom(a, &a_algorithm) )\n \t return pl_error(\"sha_hash\", 1, NULL, ERR_TYPE, a, \"algorithm\");\n-\tif ( a == ATOM_sha1 )\n+\tif ( a_algorithm == ATOM_sha1 )\n \t algorithm = ALGORITHM_SHA1;\n-\telse if ( a == ATOM_sha224 )\n+\telse if ( a_algorithm == ATOM_sha224 )\n \t algorithm = ALGORITHM_SHA224;\n-\telse if ( a == ATOM_sha256 )\n+\telse if ( a_algorithm == ATOM_sha256 )\n \t algorithm = ALGORITHM_SHA256;\n-\telse if ( a == ATOM_sha384 )\n+\telse if ( a_algorithm == ATOM_sha384 )\n \t algorithm = ALGORITHM_SHA384;\n-\telse if ( a == ATOM_sha512 )\n+\telse if ( a_algorithm == ATOM_sha512 )\n \t algorithm = ALGORITHM_SHA512;\n \telse\n \t return pl_error(\"sha_hash\", 1, NULL, ERR_DOMAIN, a, \"algorithm\");\n@@ -99,7 +99,7 @@\n \n sha1(hval, (unsigned char*)data, (unsigned long)datalen);\n \n- return PL_unify_string_nchars(hash, SHA1_DIGEST_SIZE, (char*)hval);\n+ return PL_unify_list_ncodes(hash, SHA1_DIGEST_SIZE, (char*)hval);\n }\n default:\n assert(0);\n"} {"commit":"442aa0fd2d4dbf166fc7aea16f93ea6f6278e53e","subject":"abstract layer for debug prints","message":"abstract layer for debug prints\n","repos":"jakelongo\/sca-bbb,jakelongo\/sca-bbb","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- neon\/fvr-data\/socketNeon.c\n+++ neon\/fvr-data\/socketNeon.c\n@@ -30,7 +30,7 @@\n \r\n #define DATABUFFSIZE 4096*16*sizeof(uint8_t)\r\n \r\n-#define BANK_SIZE 4\r\n+#define BANK_SIZE 8\r\n #define BANK_WIDTH 8\r\n \/\/ #define DEBUG\r\n \r\n@@ -197,13 +197,9 @@\n scratchVariable = getData(sessionfd, memBank[memBankIndex], (BANK_WIDTH*BANK_SIZE)-(BANK_WIDTH*memBankIndex));\r\n \r\n #ifdef DEBUG\r\n- for (int wordCntr = 0; wordCntr < (scratchVariable\/BANK_WIDTH); ++wordCntr) {\r\n- printf(\"Write membank[%d] = \", memBankIndex+wordCntr);\r\n- for (cntr = 0 ; cntr < BANK_WIDTH; ++cntr) {\r\n- printf(\"%02X\", memBank[memBankIndex+wordCntr][cntr]);\r\n- }\r\n- printf(\"\\n\");\r\n- }\r\n+ printf(\"Write membank[%d] = \", memBankIndex);\r\n+ printMemory(scratchVariable, memBank[memBankIndex]);\r\n+ printf(\"\\n\");\r\n #endif \/* DEBUG *\/\r\n \r\n break;\r\n"} {"commit":"8e86f077eb0301e9ecc18faa7f513b0098f09f29","subject":"Wrong location...","message":"Wrong location...\n","repos":"TopPano\/sctp-refimpl,timsuchanek\/sctp-refimpl,xwhuang\/sctp-refimpl,timsuchanek\/sctp-refimpl,sdd330\/sctp-refimpl,xwhuang\/sctp-refimpl,tosakanth\/sctp-refimpl,sctplab\/sctp-refimpl,TopPano\/sctp-refimpl,deepak899\/sctp-refimpl,TopPano\/sctp-refimpl,sctplab\/sctp-refimpl,sctplab\/sctp-refimpl,sdd330\/sctp-refimpl,timsuchanek\/sctp-refimpl,timsuchanek\/sctp-refimpl,deepak899\/sctp-refimpl,gale320\/sctp-refimpl,timsuchanek\/sctp-refimpl,tosakanth\/sctp-refimpl,TopPano\/sctp-refimpl,gale320\/sctp-refimpl,gale320\/sctp-refimpl,deepak899\/sctp-refimpl,gale320\/sctp-refimpl,TopPano\/sctp-refimpl,xwhuang\/sctp-refimpl,timsuchanek\/sctp-refimpl,sctplab\/sctp-refimpl,tosakanth\/sctp-refimpl,sdd330\/sctp-refimpl,xwhuang\/sctp-refimpl,tosakanth\/sctp-refimpl,timsuchanek\/sctp-refimpl,tosakanth\/sctp-refimpl,sdd330\/sctp-refimpl,sctplab\/sctp-refimpl,sdd330\/sctp-refimpl,gale320\/sctp-refimpl,deepak899\/sctp-refimpl,tosakanth\/sctp-refimpl,sdd330\/sctp-refimpl,TopPano\/sctp-refimpl,tosakanth\/sctp-refimpl,sdd330\/sctp-refimpl,deepak899\/sctp-refimpl,xwhuang\/sctp-refimpl,sdd330\/sctp-refimpl,sdd330\/sctp-refimpl,gale320\/sctp-refimpl,timsuchanek\/sctp-refimpl,TopPano\/sctp-refimpl,tosakanth\/sctp-refimpl,TopPano\/sctp-refimpl,gale320\/sctp-refimpl,TopPano\/sctp-refimpl,sctplab\/sctp-refimpl,xwhuang\/sctp-refimpl,timsuchanek\/sctp-refimpl,gale320\/sctp-refimpl,deepak899\/sctp-refimpl,tosakanth\/sctp-refimpl,gale320\/sctp-refimpl","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- APPS\/rtcweb.c\n+++ APPS\/rtcweb.c\n@@ -1,1232 +0,0 @@\n-\/*-\n- * Copyright (C) 2012 Michael Tuexen\n- *\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- * 1. Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * 2. Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in the\n- * documentation and\/or other materials provided with the distribution.\n- * 3. Neither the name of the project nor the names of its contributors\n- * may be used to endorse or promote products derived from this software\n- * without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND\n- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n- * ARE DISCLAIMED.\tIN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE\n- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n- * SUCH DAMAGE.\n- *\/\n-\n-\/*\n- * gcc -Wall -std=c99 -pedantic -o rtcweb rtcweb.c -lsctp\n- *\/\n-\n-#include <sys\/types.h>\n-#include <sys\/socket.h>\n-#include <sys\/select.h>\n-#include <netinet\/in.h>\n-#include <netinet\/sctp.h>\n-#include <arpa\/inet.h>\n-#include <stdio.h>\n-#include <stdlib.h>\n-#include <string.h>\n-#include <unistd.h>\n-\n-#define LINE_LENGTH (1024)\n-#define BUFFER_SIZE (1<<16)\n-#define NUMBER_OF_CHANNELS (100)\n-#define NUMBER_OF_STREAMS (100)\n-\n-#define DATA_CHANNEL_PPID_CONTROL 50\n-#define DATA_CHANNEL_PPID_DOMSTRING 51\n-#define DATA_CHANNEL_PPID_BINARY 52\n-\n-#define DATA_CHANNEL_CLOSED 0\n-#define DATA_CHANNEL_CONNECTING 1\n-#define DATA_CHANNEL_OPEN 2\n-#define DATA_CHANNEL_CLOSING 3\n-\n-struct channel {\n-\tuint32_t id;\n-\tint fd;\n-\tuint32_t pr_value;\n-\tuint16_t pr_policy;\n-\tuint16_t i_stream;\n-\tuint16_t o_stream;\n-\tuint8_t unordered;\n-\tuint8_t state;\n-};\n-\n-struct channel channels[NUMBER_OF_CHANNELS];\n-struct channel *i_stream_channel[NUMBER_OF_STREAMS];\n-struct channel *o_stream_channel[NUMBER_OF_STREAMS];\n-uint16_t o_stream_buffer[NUMBER_OF_STREAMS];\n-uint32_t o_stream_buffer_counter;\n-\n-#define DATA_CHANNEL_OPEN_REQUEST 0\n-#define DATA_CHANNEL_OPEN_RESPONSE 1\n-#define DATA_CHANNEL_ACK 2\n-\n-#define DATA_CHANNEL_RELIABLE 0\n-#define DATA_CHANNEL_RELIABLE_STREAM 1\n-#define DATA_CHANNEL_UNRELIABLE 2\n-#define DATA_CHANNEL_PARTIAL_RELIABLE_REXMIT 3\n-#define DATA_CHANNEL_PARTIAL_RELIABLE_TIMED 4\n-\n-#define DATA_CHANNEL_FLAG_OUT_OF_ORDER_ALLOWED 0x0001\n-\n-struct rtcweb_datachannel_open_request {\n-\tuint8_t msg_type; \/* DATA_CHANNEL_OPEN_REQUEST *\/\n-\tuint8_t channel_type;\n-\tuint16_t flags;\n-\tuint16_t reliability_params;\n-\tint16_t priority;\n-\tchar label[];\n-}__attribute__((packed));\n-\n-struct rtcweb_datachannel_open_response {\n-\tuint8_t msg_type; \/* DATA_CHANNEL_OPEN_RESPONSE *\/\n-\tuint8_t error;\n-\tuint16_t flags;\n-\tuint16_t reverse_stream;\n-}__attribute__((packed));\n-\n-struct rtcweb_datachannel_ack {\n-\tuint8_t msg_type; \/* DATA_CHANNEL_ACK *\/\n-}__attribute__((packed));\n-\n-static void\n-init_channels(void)\n-{\n-\tuint32_t i;\n-\n-\tfor (i = 0; i < NUMBER_OF_CHANNELS; i++) {\n-\t\tchannels[i].id = i;\n-\t\tchannels[i].fd = -1;\n-\t\tchannels[i].state = DATA_CHANNEL_CLOSED;\n-\t\tchannels[i].pr_policy = SCTP_PR_SCTP_NONE;\n-\t\tchannels[i].pr_value = 0;\n-\t\tchannels[i].i_stream = 0;\n-\t\tchannels[i].o_stream = 0;\n-\t\tchannels[i].unordered = 0;\n-\t}\n-\tfor (i = 0; i < NUMBER_OF_STREAMS; i++) {\n-\t\ti_stream_channel[i] = NULL;\n-\t\to_stream_channel[i] = NULL;\n-\t\to_stream_buffer[i] = 0;\n-\t}\n-\to_stream_buffer_counter = 0;\n-}\n-\n-static struct channel *\n-find_channel_by_i_stream(uint16_t i_stream)\n-{\n-\tif (i_stream < NUMBER_OF_STREAMS) {\n-\t\treturn (i_stream_channel[i_stream]);\n-\t} else {\n-\t\treturn (NULL);\n-\t}\n-}\n-\n-static struct channel *\n-find_channel_by_o_stream(uint16_t o_stream)\n-{\n-\tif (o_stream < NUMBER_OF_STREAMS) {\n-\t\treturn (o_stream_channel[o_stream]);\n-\t} else {\n-\t\treturn (NULL);\n-\t}\n-}\n-\n-static struct channel *\n-find_free_channel(void)\n-{\n-\tuint32_t i;\n-\n-\tfor (i = 0; i < NUMBER_OF_CHANNELS; i++) {\n-\t\tif (channels[i].state == DATA_CHANNEL_CLOSED) {\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\tif (i == NUMBER_OF_CHANNELS) {\n-\t\treturn (NULL);\n-\t} else {\n-\t\treturn (&channels[i]);\n-\t}\n-}\n-\n-static uint16_t\n-find_free_o_stream(int fd)\n-{\n-\tstruct sctp_status status;\n-\tuint32_t i, limit;\n-\tsocklen_t len;\n-\n-\tlen = (socklen_t)sizeof(struct sctp_status);\n-\tif (getsockopt(fd, IPPROTO_SCTP, SCTP_STATUS, &status, &len) < 0) {\n-\t\tperror(\"getsockopt\");\n-\t\treturn (0);\n-\t}\n-\tif (status.sstat_outstrms < NUMBER_OF_STREAMS) {\n-\t\tlimit = status.sstat_outstrms;\n-\t} else {\n-\t\tlimit = NUMBER_OF_STREAMS;\n-\t}\n-\t\/* stream id 0 is reserved *\/\n-\tfor (i = 1; i < limit; i++) {\n-\t\tif (o_stream_channel[i] == NULL) {\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\tif (i == limit) {\n-\t\treturn (0);\n-\t} else {\n-\t\treturn ((uint16_t)i);\n-\t}\n-}\n-\n-static void\n-request_more_o_streams(int fd)\n-{\n-\tstruct sctp_status status;\n-\tstruct sctp_add_streams sas;\n-\tuint32_t i, o_streams_needed;\n-\tsocklen_t len;\n-\n-\to_streams_needed = 0;\n-\tfor (i = 0; i < NUMBER_OF_CHANNELS; i++) {\n-\t\tif ((channels[i].state == DATA_CHANNEL_CONNECTING) &&\n-\t\t (channels[i].o_stream == 0)) {\n-\t\t\to_streams_needed++;\n-\t\t}\n-\t}\n-\tlen = (socklen_t)sizeof(struct sctp_status);\n-\tif (getsockopt(fd, IPPROTO_SCTP, SCTP_STATUS, &status, &len) < 0) {\n-\t\tperror(\"getsockopt\");\n-\t\treturn;\n-\t}\n-\tif (status.sstat_outstrms + o_streams_needed > NUMBER_OF_STREAMS) {\n-\t\to_streams_needed = NUMBER_OF_STREAMS - status.sstat_outstrms;\n-\t}\n-\tif (o_streams_needed == 0) {\n-\t\treturn;\n-\t}\n-\tmemset(&sas, 0, sizeof(struct sctp_add_streams));\n-\tsas.sas_instrms = 0;\n-\tsas.sas_outstrms = (uint16_t)o_streams_needed; \/* XXX eror handling *\/\n-\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_ADD_STREAMS, &sas, (socklen_t)sizeof(struct sctp_add_streams)) < 0) {\n-\t\tperror(\"setsockopt\");\n-\t}\n-\treturn;\n-\n-}\n-\n-static int\n-send_open_request_message(int fd, uint16_t o_stream, uint8_t unordered, uint16_t pr_policy, uint32_t pr_value)\n-{\n-\t\/* XXX: This should be encoded in a better way *\/\n-\tstruct rtcweb_datachannel_open_request req;\n-\tstruct sctp_sndinfo sndinfo;\n-\tstruct iovec iov;\n-\n-\tmemset(&req, 0, sizeof(struct rtcweb_datachannel_open_request));\n-\treq.msg_type = DATA_CHANNEL_OPEN_REQUEST;\n-\tswitch (pr_policy) {\n-\tcase SCTP_PR_SCTP_NONE:\n-\t\t\/* XXX: What about DATA_CHANNEL_RELIABLE_STREAM *\/\n-\t\treq.channel_type = DATA_CHANNEL_RELIABLE;\n-\t\tbreak;\n-\tcase SCTP_PR_SCTP_TTL:\n-\t\t\/* XXX: What about DATA_CHANNEL_UNRELIABLE *\/\n-\t\treq.channel_type = DATA_CHANNEL_PARTIAL_RELIABLE_TIMED;\n-\t\tbreak;\n-\tcase SCTP_PR_SCTP_RTX:\n-\t\treq.channel_type = DATA_CHANNEL_PARTIAL_RELIABLE_REXMIT;\n-\t\tbreak;\n-\tdefault:\n-\t\treturn (0);\n-\t}\n-\treq.flags = htons(0);\n-\tif (unordered) {\n-\t\treq.flags |= htons(DATA_CHANNEL_FLAG_OUT_OF_ORDER_ALLOWED);\n-\t}\n-\treq.reliability_params = htons((uint16_t)pr_value); \/* XXX Why 16-bit *\/\n-\treq.priority = htons(0); \/* XXX: add support *\/\n-\tiov.iov_base = &req;\n-\tiov.iov_len = sizeof(struct rtcweb_datachannel_open_request);\n-\tmemset(&sndinfo, 0, sizeof(struct sctp_sndinfo));\n-\tsndinfo.snd_sid = o_stream;\n-\tsndinfo.snd_flags = SCTP_EOR;\n-\tsndinfo.snd_ppid = htonl(DATA_CHANNEL_PPID_CONTROL);\n-\tif (sctp_sendv(fd,\n-\t &iov, 1,\n-\t NULL, 0,\n-\t &sndinfo, (socklen_t)sizeof(struct sctp_sndinfo),\n-\t SCTP_SENDV_SNDINFO, 0) < 0) {\n-\t\tperror(\"sctp_sendv\");\n-\t\treturn (0);\n-\t} else {\n-\t\treturn (1);\n-\t}\n-}\n-\n-static int\n-send_open_response_message(int fd, uint16_t o_stream, uint16_t i_stream)\n-{\n-\t\/* XXX: This should be encoded in a better way *\/\n-\tstruct rtcweb_datachannel_open_response rsp;\n-\tstruct sctp_sndinfo sndinfo;\n-\tstruct iovec iov;\n-\n-\tmemset(&rsp, 0, sizeof(struct rtcweb_datachannel_open_response));\n-\trsp.msg_type = DATA_CHANNEL_OPEN_RESPONSE;\n-\trsp.error = 0;\n-\trsp.flags = htons(0);\n-\trsp.reverse_stream = htons(i_stream);\n-\tiov.iov_base = &rsp;\n-\tiov.iov_len = sizeof(struct rtcweb_datachannel_open_response);\n-\tmemset(&sndinfo, 0, sizeof(struct sctp_sndinfo));\n-\tsndinfo.snd_sid = o_stream;\n-\tsndinfo.snd_flags = SCTP_EOR;\n-\tsndinfo.snd_ppid = htonl(DATA_CHANNEL_PPID_CONTROL);\n-\tif (sctp_sendv(fd,\n-\t &iov, 1,\n-\t NULL, 0,\n-\t &sndinfo, (socklen_t)sizeof(struct sctp_sndinfo),\n-\t SCTP_SENDV_SNDINFO, 0) < 0) {\n-\t perror(\"sctp_sendv\");\n-\t\treturn (0);\n-\t} else {\n-\t\treturn (1);\n-\t}\n-}\n-\n-static int\n-send_open_ack_message(int fd, uint16_t o_stream)\n-{\n-\t\/* XXX: This should be encoded in a better way *\/\n-\tstruct rtcweb_datachannel_ack ack;\n-\tstruct sctp_sndinfo sndinfo;\n-\tstruct iovec iov;\n-\n-\tmemset(&ack, 0, sizeof(struct rtcweb_datachannel_ack));\n-\tack.msg_type = DATA_CHANNEL_ACK;\n-\tiov.iov_base = &ack;\n-\tiov.iov_len = sizeof(struct rtcweb_datachannel_ack);\n-\tmemset(&sndinfo, 0, sizeof(struct sctp_sndinfo));\n-\tsndinfo.snd_sid = o_stream;\n-\tsndinfo.snd_flags = SCTP_EOR;\n-\tsndinfo.snd_ppid = htonl(DATA_CHANNEL_PPID_CONTROL);\n-\tif (sctp_sendv(fd,\n-\t &iov, 1,\n-\t NULL, 0,\n-\t &sndinfo, (socklen_t)sizeof(struct sctp_sndinfo),\n-\t SCTP_SENDV_SNDINFO, 0) < 0) {\n-\t perror(\"sctp_sendv\");\n-\t\treturn (0);\n-\t} else {\n-\t\treturn (1);\n-\t}\n-}\n-\n-static struct channel *\n-open_channel(int fd, uint8_t unordered, uint16_t pr_policy, uint32_t pr_value)\n-{\n-\tstruct channel *channel;\n-\tuint16_t o_stream;\n-\n-\tif ((pr_policy != SCTP_PR_SCTP_NONE) &&\n-\t (pr_policy != SCTP_PR_SCTP_TTL) &&\n-\t (pr_policy != SCTP_PR_SCTP_RTX)) {\n-\t\treturn (NULL);\n-\t}\n-\tif ((unordered != 0) && (unordered != 1)) {\n-\t\treturn (NULL);\n-\t}\n-\tif ((pr_policy == SCTP_PR_SCTP_NONE) && (pr_value != 0)) {\n-\t\treturn (NULL);\n-\t}\n-\tif ((channel = find_free_channel()) == NULL) {\n-\t\treturn (NULL);\n-\t}\n-\to_stream = find_free_o_stream(fd);\n-\tif ((o_stream == 0) ||\n-\t (send_open_request_message(fd, o_stream, unordered, pr_policy, pr_value))) {\n-\t\tchannel->state = DATA_CHANNEL_CONNECTING;\n-\t\tchannel->unordered = unordered;\n-\t\tchannel->pr_policy = pr_policy;\n-\t\tchannel->pr_value = pr_value;\n-\t\tchannel->o_stream = o_stream;\n-\t\tchannel->fd = fd;\n-\t\tif (o_stream != 0) {\n-\t\t\to_stream_channel[o_stream] = channel;\n-\t\t} else {\n-\t\t\trequest_more_o_streams(fd);\n-\t\t}\n-\t\treturn (channel);\n-\t} else {\n-\t\treturn (NULL);\n-\t}\n-}\n-\n-static int\n-send_user_message(struct channel *channel, char *message, size_t length)\n-{\n-\tstruct sctp_sendv_spa spa;\n-\tstruct iovec iov;\n-\n-\tif (channel == NULL) {\n-\t\treturn (0);\n-\t}\n-\tif ((channel->state != DATA_CHANNEL_OPEN) &&\n-\t (channel->state != DATA_CHANNEL_CONNECTING)) {\n-\t\t\/* XXX: What to do in other states *\/\n-\t\treturn (0);\n-\t}\n-\n-\tiov.iov_base = message;\n-\tiov.iov_len = length;\n-\tmemset(&spa, 0, sizeof(struct sctp_sendv_spa));\n-\tspa.sendv_sndinfo.snd_sid = channel->o_stream;\n-\tif ((channel->state == DATA_CHANNEL_OPEN) &&\n-\t (channel->unordered)) {\n-\t\tspa.sendv_sndinfo.snd_flags = SCTP_UNORDERED;\n-\t} else {\n-\t\tspa.sendv_sndinfo.snd_flags = 0;\n-\t}\n-\tspa.sendv_sndinfo.snd_ppid = htonl(DATA_CHANNEL_PPID_DOMSTRING);\n-\tspa.sendv_flags = SCTP_SEND_SNDINFO_VALID;\n-\tif ((channel->pr_policy == SCTP_PR_SCTP_TTL) ||\n-\t (channel->pr_policy == SCTP_PR_SCTP_RTX)) {\n-\t\tspa.sendv_prinfo.pr_policy = channel->pr_policy;\n-\t\tspa.sendv_prinfo.pr_value = channel->pr_value;\n-\t\tspa.sendv_flags |= SCTP_SEND_PRINFO_VALID;\n-\t}\n-\tif (sctp_sendv(channel->fd,\n-\t &iov, 1,\n-\t NULL, 0,\n-\t &spa, (socklen_t)sizeof(struct sctp_sendv_spa),\n-\t SCTP_SENDV_SPA, 0) < 0) {\n-\t perror(\"sctp_sendv\");\n-\t\treturn (0);\n-\t} else {\n-\t\treturn (1);\n-\t}\n-}\n-\n-static void\n-reset_outgoing_stream(uint16_t o_stream)\n-{\n-\tuint32_t i;\n-\n-\tfor (i = 0; i < o_stream_buffer_counter; i++) {\n-\t\tif (o_stream_buffer[i] == o_stream) {\n-\t\t\treturn;\n-\t\t}\n-\t}\n-\to_stream_buffer[o_stream_buffer_counter++] = o_stream;\n-\treturn;\n-}\n-\n-static void\n-send_outgoing_stream_reset(int fd)\n-{\n-\tstruct sctp_reset_streams *srs;\n-\tuint32_t i;\n-\tsize_t len;\n-\n-\tif (o_stream_buffer_counter == 0) {\n-\t\treturn;\n-\t}\n-\tlen = sizeof(sctp_assoc_t) + (2 + o_stream_buffer_counter) * sizeof(uint16_t);\n-\tsrs = (struct sctp_reset_streams *)malloc(len);\n-\tif (srs == NULL) {\n-\t\treturn;\n-\t}\n-\tmemset(srs, 0, len);\n-\tsrs->srs_flags = SCTP_STREAM_RESET_OUTGOING;\n-\tsrs->srs_number_streams = o_stream_buffer_counter;\n-\tfor (i = 0; i < o_stream_buffer_counter; i++) {\n-\t\tsrs->srs_stream_list[i] = o_stream_buffer[i];\n-\t}\n-\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_RESET_STREAMS, srs, (socklen_t)len) < 0) {\n-\t\tperror(\"setsockopt\");\n-\t} else {\n-\t\tfor (i = 0; i < o_stream_buffer_counter; i++) {\n-\t\t\tsrs->srs_stream_list[i] = 0;\n-\t\t}\n-\t\to_stream_buffer_counter = 0;\n-\t}\n-\tfree(srs);\n-\treturn;\n-}\n-\n-static void\n-close_channel(struct channel *channel)\n-{\n-\tif (channel == NULL) {\n-\t\treturn;\n-\t}\n-\tif (channel->state != DATA_CHANNEL_OPEN) {\n-\t\treturn;\n-\t}\n-\treset_outgoing_stream(channel->o_stream);\n-\tsend_outgoing_stream_reset(channel->fd);\n-\tchannel->state = DATA_CHANNEL_CLOSING;\n-\treturn;\n-}\n-\n-static void\n-handle_open_request_message(int fd,\n- struct rtcweb_datachannel_open_request *req,\n- size_t length,\n- uint16_t i_stream)\n-{\n-\tstruct channel *channel;\n-\tuint32_t pr_value;\n-\tuint16_t pr_policy;\n-\tuint16_t o_stream;\n-\tuint8_t unordered;\n-\n-\tif ((channel = find_channel_by_i_stream(i_stream))) {\n-\t\tprintf(\"Hmm, channel %d is in state %d instead of CLOSED.\\n\",\n-\t\t channel->id, channel->state);\n-\t\treturn;\n-\t\t\/* XXX: some error handling *\/\n-\t}\n-\tif ((channel = find_free_channel()) == NULL) {\n-\t\t\/* XXX: some error handling *\/\n-\t\treturn;\n-\t}\n-\tswitch (req->channel_type) {\n-\tcase DATA_CHANNEL_RELIABLE:\n-\t\tpr_policy = SCTP_PR_SCTP_NONE;\n-\t\tbreak;\n-\t\/* XXX Doesn't make sense *\/\n-\tcase DATA_CHANNEL_RELIABLE_STREAM:\n-\t\tpr_policy = SCTP_PR_SCTP_NONE;\n-\t\tbreak;\n-\t\/* XXX Doesn't make sense *\/\n-\tcase DATA_CHANNEL_UNRELIABLE:\n-\t\tpr_policy = SCTP_PR_SCTP_TTL;\n-\t\tbreak;\n-\tcase DATA_CHANNEL_PARTIAL_RELIABLE_REXMIT:\n-\t\tpr_policy = SCTP_PR_SCTP_RTX;\n-\t\tbreak;\n-\tcase DATA_CHANNEL_PARTIAL_RELIABLE_TIMED:\n-\t\tpr_policy = SCTP_PR_SCTP_TTL;\n-\t\tbreak;\n-\tdefault:\n-\t\t\/* XXX error handling *\/\n-\t\tbreak;\n-\t}\n-\tpr_value = ntohs(req->reliability_params);\n-\tif (ntohs(req->flags) & DATA_CHANNEL_FLAG_OUT_OF_ORDER_ALLOWED) {\n-\t\tunordered = 1;\n-\t} else {\n-\t\tunordered = 0;\n-\t}\n-\to_stream = find_free_o_stream(fd);\n-\tif ((o_stream == 0) || send_open_response_message(fd, o_stream, i_stream)) {\n-\t\tchannel->state = DATA_CHANNEL_CONNECTING;\n-\t\tchannel->unordered = unordered;\n-\t\tchannel->pr_policy = pr_policy;\n-\t\tchannel->pr_value = pr_value;\n-\t\tchannel->i_stream = i_stream;\n-\t\tchannel->fd = fd;\n-\t\ti_stream_channel[i_stream] = channel;\n-\t\tif (o_stream != 0) {\n-\t\t\tchannel->o_stream = o_stream;\n-\t\t\to_stream_channel[o_stream] = channel;\n-\t\t} else {\n-\t\t\trequest_more_o_streams(fd);\n-\t\t}\n-\t} else {\n-\t\t\/* error handling *\/\n-\t}\n-\treturn;\n-}\n-\n-static void\n-handle_open_response_message(struct rtcweb_datachannel_open_response *rsp, size_t length, uint16_t i_stream)\n-{\n-\tuint16_t o_stream;\n-\tstruct channel *channel;\n-\n-\to_stream = ntohs(rsp->reverse_stream);\n-\tchannel = find_channel_by_o_stream(o_stream);\n-\tif (channel == NULL) {\n-\t\t\/* XXX: some error handling *\/\n-\t}\n-\tif (channel->state != DATA_CHANNEL_CONNECTING) {\n-\t\t\/* XXX: some error handling *\/\n-\t}\n-\tif (find_channel_by_i_stream(i_stream)) {\n-\t\t\/* XXX: some error handling *\/\n-\t}\n-\tchannel->i_stream = i_stream;\n-\tchannel->state = DATA_CHANNEL_OPEN;\n-\ti_stream_channel[i_stream] = channel;\n-\tsend_open_ack_message(channel->fd, o_stream);\n-\treturn;\n-}\n-\n-static void\n-handle_open_ack_message(struct rtcweb_datachannel_ack *ack, size_t length, uint16_t i_stream)\n-{\n-\tstruct channel *channel;\n-\n-\tchannel = find_channel_by_i_stream(i_stream);\n-\tif (channel == NULL) {\n-\t\t\/* XXX: some error handling *\/\n-\t}\n-\tif (channel->state == DATA_CHANNEL_OPEN) {\n-\t\treturn;\n-\t}\n-\tif (channel->state != DATA_CHANNEL_CONNECTING) {\n-\t\t\/* XXX: error handling *\/\n-\t\treturn;\n-\t}\n-\tchannel->state = DATA_CHANNEL_OPEN;\n-\treturn;\n-}\n-\n-static void\n-handle_unknown_message(char *msg, size_t length, uint16_t i_stream)\n-{\n-\t\/* XXX: Send an error message *\/\n-\treturn;\n-}\n-\n-static void\n-handle_data_message(char *buffer, size_t length, uint16_t i_stream)\n-{\n-\tstruct channel *channel;\n-\n-\tchannel = find_channel_by_i_stream(i_stream);\n-\tif (channel == NULL) {\n-\t\t\/* XXX: Some error handling *\/\n-\t\treturn;\n-\t}\n-\tif (channel->state == DATA_CHANNEL_CONNECTING) {\n-\t\t\/* Implicit ACK *\/\n-\t\tchannel->state = DATA_CHANNEL_OPEN;\n-\t}\n-\tif (channel->state != DATA_CHANNEL_OPEN) {\n-\t\t\/* XXX: What about other states? *\/\n-\t\t\/* XXX: Some error handling *\/\n-\t\treturn;\n-\t} else {\n-\t\t\/* Assuming DATA_CHANNEL_PPID_DOMSTRING *\/\n-\t\t\/* XXX: Protect for non 0 terminated buffer *\/\n-\t\tprintf(\"Message received of length %lu on channel with id %d: %.*s\\n\",\n-\t\t length, channel->id, (int)length, buffer);\n-\t}\n-\treturn;\n-}\n-\n-static void\n-handle_message(int fd, char *buffer, size_t length, uint32_t ppid, uint16_t i_stream)\n-{\n-\tstruct rtcweb_datachannel_open_request *req;\n-\tstruct rtcweb_datachannel_open_response *rsp;\n-\tstruct rtcweb_datachannel_ack *ack, *msg;\n-\n-\tswitch (ppid) {\n-\tcase DATA_CHANNEL_PPID_CONTROL:\n-\t\tif (length < sizeof(struct rtcweb_datachannel_ack)) {\n-\t\t\treturn;\n-\t\t}\n-\t\tmsg = (struct rtcweb_datachannel_ack *)buffer;\n-\t\tswitch (msg->msg_type) {\n-\t\tcase DATA_CHANNEL_OPEN_REQUEST:\n-\t\t\tif (length < sizeof(struct rtcweb_datachannel_open_request)) {\n-\t\t\t\t\/* XXX: error handling? *\/\n-\t\t\t\treturn;\n-\t\t\t}\n-\t\t\treq = (struct rtcweb_datachannel_open_request *)buffer;\n-\t\t\thandle_open_request_message(fd, req, length, i_stream);\n-\t\t\tbreak;\n-\t\tcase DATA_CHANNEL_OPEN_RESPONSE:\n-\t\t\tif (length < sizeof(struct rtcweb_datachannel_open_response)) {\n-\t\t\t\t\/* XXX: error handling? *\/\n-\t\t\t\treturn;\n-\t\t\t}\n-\t\t\trsp = (struct rtcweb_datachannel_open_response *)buffer;\n-\t\t\thandle_open_response_message(rsp, length, i_stream);\n-\t\t\tbreak;\n-\t\tcase DATA_CHANNEL_ACK:\n-\t\t\tif (length < sizeof(struct rtcweb_datachannel_ack)) {\n-\t\t\t\t\/* XXX: error handling? *\/\n-\t\t\t\treturn;\n-\t\t\t}\n-\t\t\tack = (struct rtcweb_datachannel_ack *)buffer;\n-\t\t\thandle_open_ack_message(ack, length, i_stream);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\thandle_unknown_message(buffer, length, i_stream);\n-\t\t\tbreak;\n-\t\t}\n-\t\tbreak;\n-\tcase DATA_CHANNEL_PPID_DOMSTRING:\n-\tcase DATA_CHANNEL_PPID_BINARY:\n-\t\thandle_data_message(buffer, length, i_stream);\n-\t\tbreak;\n-\tdefault:\n-\t\tprintf(\"Message of length %lu, PPID %u on stream %u received.\\n\",\n-\t\t length, ppid, i_stream);\n-\t\tbreak;\n-\t}\n-}\n-\n-static void\n-handle_association_change_event(struct sctp_assoc_change *sac)\n-{\n-\tunsigned int i, n;\n-\n-\tprintf(\"Association change \");\n-\tswitch (sac->sac_state) {\n-\tcase SCTP_COMM_UP:\n-\t\tprintf(\"SCTP_COMM_UP\");\n-\t\tbreak;\n-\tcase SCTP_COMM_LOST:\n-\t\tprintf(\"SCTP_COMM_LOST\");\n-\t\tbreak;\n-\tcase SCTP_RESTART:\n-\t\tprintf(\"SCTP_RESTART\");\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_COMP:\n-\t\tprintf(\"SCTP_SHUTDOWN_COMP\");\n-\t\tbreak;\n-\tcase SCTP_CANT_STR_ASSOC:\n-\t\tprintf(\"SCTP_CANT_STR_ASSOC\");\n-\t\tbreak;\n-\tdefault:\n-\t\tprintf(\"UNKNOWN\");\n-\t\tbreak;\n-\t}\n-\tprintf(\", streams (in\/out) = (%u\/%u), supports\",\n-\t sac->sac_inbound_streams, sac-> sac_outbound_streams);\n-\tn = sac->sac_length - sizeof(struct sctp_assoc_change);\n-\tfor (i = 0; i < n; i++) {\n-\t\tswitch (sac->sac_info[i]) {\n-\t\tcase SCTP_ASSOC_SUPPORTS_PR:\n-\t\t\tprintf(\" PR\");\n-\t\t\tbreak;\n-\t\tcase SCTP_ASSOC_SUPPORTS_AUTH:\n-\t\t\tprintf(\" AUTH\");\n-\t\t\tbreak;\n-\t\tcase SCTP_ASSOC_SUPPORTS_ASCONF:\n-\t\t\tprintf(\" ASCONF\");\n-\t\t\tbreak;\n-\t\tcase SCTP_ASSOC_SUPPORTS_MULTIBUF:\n-\t\t\tprintf(\" MULTIBUF\");\n-\t\t\tbreak;\n-\t\tcase SCTP_ASSOC_SUPPORTS_RE_CONFIG:\n-\t\t\tprintf(\" RE-CONFIG\");\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\tprintf(\".\\n\");\n-\treturn;\n-}\n-\n-static void\n-handle_peer_address_change_event(struct sctp_paddr_change *spc)\n-{\n-\tchar addr_buf[INET6_ADDRSTRLEN];\n-\tconst char *addr;\n-\tstruct sockaddr_in *sin;\n-\tstruct sockaddr_in6 *sin6;\n-\n-\tswitch (spc->spc_aaddr.ss_family) {\n-\tcase AF_INET:\n-\t\tsin = (struct sockaddr_in *)&spc->spc_aaddr;\n-\t\taddr = inet_ntop(AF_INET, &sin->sin_addr, addr_buf, INET6_ADDRSTRLEN);\n-\t\tbreak;\n-\tcase AF_INET6:\n-\t\tsin6 = (struct sockaddr_in6 *)&spc->spc_aaddr;\n-\t\taddr = inet_ntop(AF_INET6, &sin6->sin6_addr, addr_buf, INET6_ADDRSTRLEN);\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n-\tprintf(\"Peer address %s is now \", addr);\n-\tswitch (spc->spc_state) {\n-\tcase SCTP_ADDR_AVAILABLE:\n-\t\tprintf(\"SCTP_ADDR_AVAILABLE\");\n-\t\tbreak;\n-\tcase SCTP_ADDR_UNREACHABLE:\n-\t\tprintf(\"SCTP_ADDR_UNREACHABLE\");\n-\t\tbreak;\n-\tcase SCTP_ADDR_REMOVED:\n-\t\tprintf(\"SCTP_ADDR_REMOVED\");\n-\t\tbreak;\n-\tcase SCTP_ADDR_ADDED:\n-\t\tprintf(\"SCTP_ADDR_ADDED\");\n-\t\tbreak;\n-\tcase SCTP_ADDR_MADE_PRIM:\n-\t\tprintf(\"SCTP_ADDR_MADE_PRIM\");\n-\t\tbreak;\n-\tcase SCTP_ADDR_CONFIRMED:\n-\t\tprintf(\"SCTP_ADDR_CONFIRMED\");\n-\t\tbreak;\n-\tdefault:\n-\t\tprintf(\"UNKNOWN\");\n-\t\tbreak;\n-\t}\n-\tprintf(\".\\n\");\n-\treturn;\n-}\n-\n-static void\n-handle_adaptation_indication(struct sctp_adaptation_event *sai)\n-{\n-\tprintf(\"Adaptation indication: %x.\\n\", sai-> sai_adaptation_ind);\n-\treturn;\n-}\n-\n-static void\n-handle_shutdown_event(struct sctp_shutdown_event *sse)\n-{\n-\tprintf(\"Shutdown event.\\n\");\n-\t\/* XXX: notify all channels. *\/\n-\treturn;\n-}\n-\n-static void\n-handle_stream_reset_event(struct sctp_stream_reset_event *strrst)\n-{\n-\tuint32_t n, i;\n-\tstruct channel *channel;\n-\n-\tif (!(strrst->strreset_flags & SCTP_STREAM_RESET_DENIED) &&\n-\t !(strrst->strreset_flags & SCTP_STREAM_RESET_FAILED)) {\n-\t\tn = (strrst->strreset_length - sizeof(struct sctp_stream_reset_event)) \/ sizeof(uint16_t);\n-\t\tfor (i = 0; i < n; i++) {\n-\t\t\tif (strrst->strreset_flags & SCTP_STREAM_RESET_INCOMING_SSN) {\n-\t\t\t\tchannel = find_channel_by_i_stream(strrst->strreset_stream_list[i]);\n-\t\t\t\tif (channel != NULL) {\n-\t\t\t\t\ti_stream_channel[channel->i_stream] = NULL;\n-\t\t\t\t\tchannel->i_stream = 0;\n-\t\t\t\t\tif (channel->o_stream == 0) {\n-\t\t\t\t\t\tchannel->fd = -1;\n-\t\t\t\t\t\tchannel->pr_policy = SCTP_PR_SCTP_NONE;\n-\t\t\t\t\t\tchannel->pr_value = 0;\n-\t\t\t\t\t\tchannel->unordered = 0;\n-\t\t\t\t\t\tchannel->state = DATA_CHANNEL_CLOSED;\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\treset_outgoing_stream(channel->o_stream);\n-\t\t\t\t\t\tchannel->state = DATA_CHANNEL_CLOSING;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t\tif (strrst->strreset_flags & SCTP_STREAM_RESET_OUTGOING_SSN) {\n-\t\t\t\tchannel = find_channel_by_o_stream(strrst->strreset_stream_list[i]);\n-\t\t\t\tif (channel != NULL) {\n-\t\t\t\t\to_stream_channel[channel->o_stream] = NULL;\n-\t\t\t\t\tchannel->o_stream = 0;\n-\t\t\t\t\tif (channel->i_stream == 0) {\n-\t\t\t\t\t\tchannel->fd = -1;\n-\t\t\t\t\t\tchannel->pr_policy = SCTP_PR_SCTP_NONE;\n-\t\t\t\t\t\tchannel->pr_value = 0;\n-\t\t\t\t\t\tchannel->unordered = 0;\n-\t\t\t\t\t\tchannel->state = DATA_CHANNEL_CLOSED;\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\treturn;\n-}\n-\n-static void\n-handle_stream_change_event(struct sctp_stream_change_event *strchg)\n-{\n-\tuint16_t o_stream;\n-\tuint32_t i;\n-\n-\tfor (i = 0; i < NUMBER_OF_CHANNELS; i++) {\n-\t\tif ((channels[i].state == DATA_CHANNEL_CONNECTING) &&\n-\t\t (channels[i].o_stream == 0)) {\n-\t\t\tif ((strchg->strchange_flags & SCTP_STREAM_CHANGE_DENIED) ||\n-\t\t\t (strchg->strchange_flags & SCTP_STREAM_CHANGE_FAILED)) {\n-\t\t\t\tchannels[i].state = DATA_CHANNEL_CLOSED;\n-\t\t\t\tchannels[i].unordered = 0;\n-\t\t\t\tchannels[i].pr_policy = SCTP_PR_SCTP_NONE;\n-\t\t\t\tchannels[i].pr_value = 0;\n-\t\t\t\tchannels[i].o_stream = 0;\n-\t\t\t\tchannels[i].fd = -1;\n-\t\t\t} else {\n-\t\t\t\to_stream = find_free_o_stream(channels[i].fd);\n-\t\t\t\tif (o_stream != 0) {\n-\t\t\t\t\tif (channels[i].i_stream != 0) {\n-\t\t\t\t\t\tif (send_open_response_message(channels[i].fd, o_stream, channels[i].i_stream)) {\n-\t\t\t\t\t\t\tchannels[i].o_stream = o_stream;\n-\t\t\t\t\t\t\to_stream_channel[o_stream] = &channels[i];\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\t\/* XXX: error handling *\/\n-\t\t\t\t\t\t}\n-\t\t\t\t\t} else {\n-\t\t\t\t\t\tif (send_open_request_message(channels[i].fd, o_stream, channels[i].unordered, channels[i].pr_policy, channels[i].pr_value)) {\n-\t\t\t\t\t\t\tchannels[i].o_stream = o_stream;\n-\t\t\t\t\t\t\to_stream_channel[o_stream] = &channels[i];\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tchannels[i].state = DATA_CHANNEL_CLOSED;\n-\t\t\t\t\t\t\tchannels[i].unordered = 0;\n-\t\t\t\t\t\t\tchannels[i].pr_policy = SCTP_PR_SCTP_NONE;\n-\t\t\t\t\t\t\tchannels[i].pr_value = 0;\n-\t\t\t\t\t\t\tchannels[i].o_stream = 0;\n-\t\t\t\t\t\t\tchannels[i].fd = -1;\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t} else {\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\treturn;\n-}\n-\n-static void\n-handle_notification(int fd, union sctp_notification *notif, size_t n)\n-{\n-\tif (notif->sn_header.sn_length != (uint32_t)n) {\n-\t\treturn;\n-\t}\n-\tswitch (notif->sn_header.sn_type) {\n-\tcase SCTP_ASSOC_CHANGE:\n-\t\thandle_association_change_event(&(notif->sn_assoc_change));\n-\t\tbreak;\n-\tcase SCTP_PEER_ADDR_CHANGE:\n-\t\thandle_peer_address_change_event(&(notif->sn_paddr_change));\n-\t\tbreak;\n-\tcase SCTP_REMOTE_ERROR:\n-\t\tbreak;\n-\t\/* XXX: Deprecated *\/\n-\tcase SCTP_SEND_FAILED:\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_EVENT:\n-\t\thandle_shutdown_event(&(notif->sn_shutdown_event));\n-\t\tbreak;\n-\tcase SCTP_ADAPTATION_INDICATION:\n-\t\thandle_adaptation_indication(&(notif->sn_adaptation_event));\n-\t\tbreak;\n-\tcase SCTP_PARTIAL_DELIVERY_EVENT:\n-\t\tbreak;\n-\tcase SCTP_AUTHENTICATION_EVENT:\n-\t\tbreak;\n-\tcase SCTP_SENDER_DRY_EVENT:\n-\t\tbreak;\n-\tcase SCTP_NOTIFICATIONS_STOPPED_EVENT:\n-\t\tbreak;\n-\tcase SCTP_SEND_FAILED_EVENT:\n-\t\tbreak;\n-\tcase SCTP_STREAM_RESET_EVENT:\n-\t\thandle_stream_reset_event(&(notif->sn_strreset_event));\n-\t\tsend_outgoing_stream_reset(fd);\n-\t\trequest_more_o_streams(fd);\n-\t\tbreak;\n-\tcase SCTP_ASSOC_RESET_EVENT:\n-\t\tbreak;\n-\tcase SCTP_STREAM_CHANGE_EVENT:\n-\t\thandle_stream_change_event(&(notif->sn_strchange_event));\n-\t\tsend_outgoing_stream_reset(fd);\n-\t\trequest_more_o_streams(fd);\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n-}\n-\n-static void\n-print_status(int fd)\n-{\n-\tstruct sctp_status status;\n-\tsocklen_t len;\n-\tuint32_t i;\n-\n-\tlen = (socklen_t)sizeof(struct sctp_status);\n-\tif (getsockopt(fd, IPPROTO_SCTP, SCTP_STATUS, &status, &len) < 0) {\n-\t\tperror(\"getsockopt\");\n-\t\treturn;\n-\t}\n-\tprintf(\"Association state: \");\n-\tswitch (status.sstat_state) {\n-\tcase SCTP_CLOSED:\n-\t\tprintf(\"CLOSED\\n\");\n-\t\tbreak;\n-\tcase SCTP_BOUND:\n-\t\tprintf(\"BOUND\\n\");\n-\t\tbreak;\n-\tcase SCTP_LISTEN:\n-\t\tprintf(\"LISTEN\\n\");\n-\t\tbreak;\n-\tcase SCTP_COOKIE_WAIT:\n-\t\tprintf(\"COOKIE_WAIT\\n\");\n-\t\tbreak;\n-\tcase SCTP_COOKIE_ECHOED:\n-\t\tprintf(\"COOKIE_ECHOED\\n\");\n-\t\tbreak;\n-\tcase SCTP_ESTABLISHED:\n-\t\tprintf(\"ESTABLISHED\\n\");\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_PENDING:\n-\t\tprintf(\"SHUTDOWN_PENDING\\n\");\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_SENT:\n-\t\tprintf(\"SHUTDOWN_SENT\\n\");\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_RECEIVED:\n-\t\tprintf(\"SHUTDOWN_RECEIVED\\n\");\n-\t\tbreak;\n-\tcase SCTP_SHUTDOWN_ACK_SENT:\n-\t\tprintf(\"SHUTDOWN_ACK_SENT\\n\");\n-\t\tbreak;\n-\tdefault:\n-\t\tprintf(\"UNKNOWN\\n\");\n-\t\tbreak;\n-\t}\n-\tprintf(\"Number of streams (i\/o) = (%u\/%u)\\n\",\n-\t status.sstat_instrms, status.sstat_outstrms);\n-\tfor (i = 0; i < NUMBER_OF_CHANNELS; i++) {\n-\t\tif (channels[i].state == DATA_CHANNEL_CLOSED) {\n-\t\t\tcontinue;\n-\t\t}\n-\t\tprintf(\"Channel with id = %u: state \", channels[i].id);\n-\t\tswitch (channels[i].state) {\n-\t\tcase DATA_CHANNEL_CLOSED:\n-\t\t\tprintf(\"CLOSED\");\n-\t\t\tbreak;\n-\t\tcase DATA_CHANNEL_CONNECTING:\n-\t\t\tprintf(\"CONNECTING\");\n-\t\t\tbreak;\n-\t\tcase DATA_CHANNEL_OPEN:\n-\t\t\tprintf(\"OPEN\");\n-\t\t\tbreak;\n-\t\tcase DATA_CHANNEL_CLOSING:\n-\t\t\tprintf(\"CLOSING\");\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tprintf(\"UNKNOWN(%d)\", channels[i].state);\n-\t\t\tbreak;\n-\t\t}\n-\t\tprintf(\", stream id (in\/out): (%u\/%u), \",\n-\t\t channels[i].i_stream,\n-\t\t channels[i].o_stream);\n-\t\tif (channels[i].unordered) {\n-\t\t\tprintf(\"unordered, \");\n-\t\t} else {\n-\t\t\tprintf(\"ordered, \");\n-\t\t}\n-\t\tswitch (channels[i].pr_policy) {\n-\t\tcase SCTP_PR_SCTP_NONE:\n-\t\t\tprintf(\"reliable.\\n\");\n-\t\t\tbreak;\n-\t\tcase SCTP_PR_SCTP_TTL:\n-\t\t\tprintf(\"unreliable (timeout %ums).\\n\", channels[i].pr_value);\n-\t\t\tbreak;\n-\t\tcase SCTP_PR_SCTP_RTX:\n-\t\t\tprintf(\"unreliable (max. %u rtx).\\n\", channels[i].pr_value);\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tprintf(\"unkown policy %u.\\n\", channels[i].pr_policy);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-}\n-\n-int\n-main(int argc, char *argv[])\n-{\n-\tint fd, flags;\n-\tstruct sockaddr_in addr;\n-\tsocklen_t addr_len;\n-\tssize_t n;\n-\tchar line[LINE_LENGTH + 1];\n-\tchar buffer[BUFFER_SIZE];\n-\tfd_set fds;\n-\tunsigned int unordered, policy, value, id;\n-\tunsigned int i;\n-\tstruct sctp_rcvinfo rcvinfo;\n-\tstruct channel *channel;\n-\tsocklen_t infolen;\n-\tunsigned int infotype;\n-\tstruct iovec iov;\n-\tconst int on = 1;\n-\tstruct sctp_assoc_value av;\n-\tstruct sctp_event event;\n-\tuint16_t event_types[] = {SCTP_ASSOC_CHANGE,\n-\t SCTP_PEER_ADDR_CHANGE,\n-\t SCTP_SHUTDOWN_EVENT,\n-\t SCTP_ADAPTATION_INDICATION,\n-\t SCTP_STREAM_RESET_EVENT,\n-\t SCTP_STREAM_CHANGE_EVENT};\n-\n-\tinit_channels();\n-\tif ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP)) < 0) {\n-\t\tperror(\"socket\");\n-\t}\n-\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_RECVRCVINFO, &on, sizeof(int)) < 0) {\n-\t\tperror(\"setsockopt SCTP_RECVRCVINFO\");\n-\t}\n-\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_EXPLICIT_EOR, &on, sizeof(int)) < 0) {\n-\t\tperror(\"setsockopt SCTP_EXPLICIT_EOR\");\n-\t}\n-\t\/* Allow resetting streams. *\/\n-\tav.assoc_id = SCTP_ALL_ASSOC;\n-\tav.assoc_value = 0*SCTP_ENABLE_RESET_STREAM_REQ | SCTP_ENABLE_CHANGE_ASSOC_REQ;\n-\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_ENABLE_STREAM_RESET, &av, sizeof(struct sctp_assoc_value)) < 0) {\n-\t\tperror(\"setsockopt SCTP_ENABLE_STREAM_RESET\");\n-\t}\n-\t\/* Enable the events of interest. *\/\n-\tmemset(&event, 0, sizeof(event));\n-\tevent.se_assoc_id = SCTP_ALL_ASSOC;\n-\tevent.se_on = 1;\n-\tfor (i = 0; i < sizeof(event_types)\/sizeof(uint16_t); i++) {\n-\t\tevent.se_type = event_types[i];\n-\t\tif (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event, sizeof(event)) < 0) {\n-\t\t\tperror(\"setsockopt SCTP_EVENT\");\n-\t\t}\n-\t}\n-\n-\tif (argc > 2) {\n-\t\t\/* operating as client *\/\n-\t\tmemset(&addr, 0, sizeof(struct sockaddr_in));\n-\t\taddr.sin_family = AF_INET;\n-#ifdef HAVE_SIN_LEN\n-\t\taddr.sin_len = sizeof(struct sockaddr_in);\n-#endif\n-\t\taddr.sin_addr.s_addr = inet_addr(argv[1]);\n-\t\taddr.sin_port = htons(atoi(argv[2]));\n-\t\tif (connect(fd, (const struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) {\n-\t\t\tperror(\"connect\");\n-\t\t}\n-\t\tprintf(\"Connected to %s:%d.\\n\",\n-\t\t inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));\n-\t} else if (argc > 1) {\n-\t\tint afd;\n-\n-\t\t\/* operating as server *\/\n-\t\tmemset(&addr, 0, sizeof(struct sockaddr_in));\n-\t\taddr.sin_family = AF_INET;\n-#ifdef HAVE_SIN_LEN\n-\t\taddr.sin_len = sizeof(struct sockaddr_in);\n-#endif\n-\t\taddr.sin_addr.s_addr = INADDR_ANY;\n-\t\taddr.sin_port = htons(atoi(argv[1]));\n-\t\tif (bind(fd, (const struct sockaddr *)&addr, sizeof(struct sockaddr_in)) < 0) {\n-\t\t\tperror(\"bind\");\n-\t\t}\n-\t\tif (listen(fd, 1) < 0) {\n-\t\t\tperror(\"listen\");\n-\t\t}\n-\t\taddr_len = (socklen_t)sizeof(struct sockaddr_in);\n-\t\tmemset(&addr, 0, sizeof(struct sockaddr_in));\n-\t\tif ((afd = accept(fd, (struct sockaddr *)&addr, &addr_len)) < 0) {\n-\t\t\tperror(\"accept\");\n-\t\t}\n-\t\tif (close(fd) < 0) {\n-\t\t\tperror(\"close\");\n-\t\t}\n-\t\tfd = afd;\n-\t\tprintf(\"Connected to %s:%d.\\n\",\n-\t\t inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));\n-\t} else {\n-\t\tprintf(\"Usage: %s local_port when operating as server\\n\"\n-\t\t \" %s remote_addr remote_port when operating as client\\n\",\n-\t\t argv[0], argv[0]);\n-\t\treturn (0);\n-\t}\n-\n-\tfor (;;) {\n-\t\tFD_ZERO(&fds);\n-\t\tFD_SET(fileno(stdin), &fds);\n-\t\tFD_SET(fd, &fds);\n-\t\tif (select(fd + 1, &fds, NULL, NULL, NULL) < 0) {\n-\t\t\tperror(\"select\");\n-\t\t}\n-\t\tif (FD_ISSET(fileno(stdin), &fds)) {\n-\t\t\tif (fgets(line, LINE_LENGTH, stdin) == NULL) {\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif (strncasecmp(line, \"?\", strlen(\"?\")) == 0 ||\n-\t\t\t strncasecmp(line, \"help\", strlen(\"help\")) == 0) {\n-\t\t\t\tprintf(\"Commands:\\n\"\n-\t\t\t\t \"open unordered pr_policy pr_value - opens a channel\\n\"\n-\t\t\t\t \"close channel - closes the channel\\n\"\n-\t\t\t\t \"send channel:string - sends string using channel\\n\"\n-\t\t\t\t \"status - prints the status\\n\"\n-\t\t\t\t \"help - this message\\n\");\n-\t\t\t} else if (strncasecmp(line, \"status\", strlen(\"status\")) == 0) {\n-\t\t\t\tprint_status(fd);\n-\t\t\t} else if (sscanf(line, \"open %u %u %u\", &unordered, &policy, &value) == 3) {\n-\t\t\t\tchannel = open_channel(fd, (uint8_t)unordered, (uint16_t)policy, (uint32_t)value);\n-\t\t\t\tif (channel == NULL) {\n-\t\t\t\t\tprintf(\"Creating channel failed.\\n\");\n-\t\t\t\t} else {\n-\t\t\t\t\tprintf(\"Channel with id %u created.\\n\", channel->id);\n-\t\t\t\t}\n-\t\t\t} else if (sscanf(line, \"close %u\", &id) == 1) {\n-\t\t\t\tif (id < NUMBER_OF_CHANNELS) {\n-\t\t\t\t\tclose_channel(&channels[id]);\n-\t\t\t\t}\n-\t\t\t} else if (sscanf(line, \"send %u\", &id) == 1) {\n-\t\t\t\tif (id < NUMBER_OF_CHANNELS) {\n-\t\t\t\t\tchar *msg;\n-\n-\t\t\t\t\tmsg = strstr(line, \":\");\n-\t\t\t\t\tif (msg) {\n-\t\t\t\t\t\tmsg++;\n-\t\t\t\t\t\tif (send_user_message(&channels[id], msg, strlen(msg) - 1)) {\n-\t\t\t\t\t\t\tprintf(\"Message sent.\\n\");\n-\t\t\t\t\t\t} else {\n-\t\t\t\t\t\t\tprintf(\"Message sending failed.\\n\");\n-\t\t\t\t\t\t}\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\tprintf(\"Unknown command: %s\", line);\n-\t\t\t}\n-\t\t}\n-\t\tif (FD_ISSET(fd, &fds)) {\n-\t\t\tiov.iov_base = buffer;\n-\t\t\tiov.iov_len = BUFFER_SIZE;\n-\t\t\tmemset(&rcvinfo, 0, sizeof(struct sctp_rcvinfo));\n-\t\t\tinfolen = sizeof(struct sctp_rcvinfo);\n-\t\t\tinfotype = SCTP_RECVV_NOINFO;\n-\t\t\tflags = 0;\n-\t\t\tn = sctp_recvv(fd, &iov, 1, NULL, NULL, &rcvinfo, &infolen, &infotype, &flags);\n-\t\t\tif (n <= 0) {\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif (flags & MSG_NOTIFICATION) {\n-\t\t\t\thandle_notification(fd, (union sctp_notification *)buffer, n);\n-\t\t\t} else {\n-\t\t\t\tif (infotype == SCTP_RECVV_RCVINFO) {\n-\t\t\t\t\thandle_message(fd, buffer, n, ntohl(rcvinfo.rcv_ppid), rcvinfo.rcv_sid);\n-\t\t\t\t} else {\n-\t\t\t\t\tbreak;\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t}\n-\tif (close(fd) < 0) {\n-\t\tperror(\"close\");\n-\t}\n-\treturn (0);\n-}\n"} {"commit":"7a0ff5dbdd0b4cb7ea8764da9d78f4bb2eebaf31","subject":"RDS: use delayed work for the FMR flushes","message":"RDS: use delayed work for the FMR flushes\n\nUsing a delayed work queue helps us make sure a healthy number of FMRs\nhave queued up over the limit. It makes for a large improvement in RDMA\niops.\n\nSigned-off-by: Chris Mason <a169954b4cb1a46cee25f659d3bddfebe02b5fba@oracle.com>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/rds\/ib_rdma.c\n+++ net\/rds\/ib_rdma.c\n@@ -66,7 +66,7 @@\n *\/\n struct rds_ib_mr_pool {\n \tstruct mutex\t\tflush_lock;\t\t\/* serialize fmr invalidate *\/\n-\tstruct work_struct\tflush_worker;\t\t\/* flush worker *\/\n+\tstruct delayed_work\tflush_worker;\t\t\/* flush worker *\/\n \n \tatomic_t\t\titem_count;\t\t\/* total # of MRs *\/\n \tatomic_t\t\tdirty_count;\t\t\/* # dirty of MRs *\/\n@@ -226,7 +226,7 @@\n \tINIT_XLIST_HEAD(&pool->clean_list);\n \tmutex_init(&pool->flush_lock);\n \tinit_waitqueue_head(&pool->flush_wait);\n-\tINIT_WORK(&pool->flush_worker, rds_ib_mr_pool_flush_worker);\n+\tINIT_DELAYED_WORK(&pool->flush_worker, rds_ib_mr_pool_flush_worker);\n \n \tpool->fmr_attr.max_pages = fmr_message_size;\n \tpool->fmr_attr.max_maps = rds_ibdev->fmr_max_remaps;\n@@ -254,7 +254,7 @@\n \n void rds_ib_destroy_mr_pool(struct rds_ib_mr_pool *pool)\n {\n-\tcancel_work_sync(&pool->flush_worker);\n+\tcancel_delayed_work_sync(&pool->flush_worker);\n \trds_ib_flush_mr_pool(pool, 1, NULL);\n \tWARN_ON(atomic_read(&pool->item_count));\n \tWARN_ON(atomic_read(&pool->free_pinned));\n@@ -695,7 +695,7 @@\n \n static void rds_ib_mr_pool_flush_worker(struct work_struct *work)\n {\n-\tstruct rds_ib_mr_pool *pool = container_of(work, struct rds_ib_mr_pool, flush_worker);\n+\tstruct rds_ib_mr_pool *pool = container_of(work, struct rds_ib_mr_pool, flush_worker.work);\n \n \trds_ib_flush_mr_pool(pool, 0, NULL);\n }\n@@ -720,7 +720,7 @@\n \t\/* If we've pinned too many pages, request a flush *\/\n \tif (atomic_read(&pool->free_pinned) >= pool->max_free_pinned ||\n \t atomic_read(&pool->dirty_count) >= pool->max_items \/ 10)\n-\t\tqueue_work(rds_wq, &pool->flush_worker);\n+\t\tqueue_delayed_work(rds_wq, &pool->flush_worker, 10);\n \n \tif (invalidate) {\n \t\tif (likely(!in_interrupt())) {\n@@ -728,7 +728,7 @@\n \t\t} else {\n \t\t\t\/* We get here if the user created a MR marked\n \t\t\t * as use_once and invalidate at the same time. *\/\n-\t\t\tqueue_work(rds_wq, &pool->flush_worker);\n+\t\t\tqueue_delayed_work(rds_wq, &pool->flush_worker, 10);\n \t\t}\n \t}\n \n"} {"commit":"dd932521d916bab89a80f2a0d3d700d63b9b21be","subject":"decoding: fix a frame leak in a corner case","message":"decoding: fix a frame leak in a corner case\n","repos":"Stupeflix\/sxplayer,Stupeflix\/sxplayer,Stupeflix\/sxplayer","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- decoding.c\n+++ decoding.c\n@@ -168,6 +168,7 @@\n \n static int queue_cached_frame(struct decoding_ctx *ctx)\n {\n+ int ret;\n const int64_t cached_ts = av_rescale_q_rnd(get_best_effort_ts(ctx->tmp_frame),\n ctx->st_timebase, AV_TIME_BASE_Q,\n AV_ROUND_PASS_MINMAX);\n@@ -175,7 +176,12 @@\n AVFrame *prev_frame = ctx->tmp_frame;\n ctx->tmp_frame = NULL;\n prev_frame->pts = cached_ts;\n- return queue_frame(ctx, prev_frame);\n+ ret = queue_frame(ctx, prev_frame);\n+ if (ret < 0) {\n+ av_frame_free(&prev_frame);\n+ return ret;\n+ }\n+ return 0;\n }\n \n int decoding_queue_frame(struct decoding_ctx *ctx, AVFrame *frame)\n"} {"commit":"5254cf4691230cf7ed14484054af9876132eec4a","subject":"Port packuswb mm, mm\/m64","message":"Port packuswb mm, mm\/m64\n","repos":"copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86,copy\/v86","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/native\/instructions_0f.c\n+++ src\/native\/instructions_0f.c\n@@ -921,7 +921,33 @@\n static void instr_0F64() { unimplemented_sse(); }\n static void instr_0F65() { unimplemented_sse(); }\n static void instr_0F66() { unimplemented_sse(); }\n-static void instr_0F67() { unimplemented_sse(); }\n+\n+static void instr_0F67()\n+{\n+ \/\/ packuswb mm, mm\/m64\n+ task_switch_test_mmx();\n+ read_modrm_byte();\n+\n+ union reg64 source = read_mmx_mem64s();\n+ int32_t offset = (*modrm_byte >> 3 & 7) << 1;\n+ uint32_t destination_low = reg_mmx32s[offset];\n+ uint32_t destination_high = reg_mmx32s[offset + 1];\n+\n+ uint32_t low = 0;\n+ low |= (saturate_sw_to_ub((destination_low) & 0xFFFF));\n+ low |= (saturate_sw_to_ub(destination_low >> 16)) << 8;\n+ low |= (saturate_sw_to_ub((destination_high) & 0xFFFF)) << 16;\n+ low |= (saturate_sw_to_ub(destination_high >> 16)) << 24;\n+\n+ uint32_t high = 0;\n+ high |= (saturate_sw_to_ub((source.u32[0]) & 0xFFFF));\n+ high |= (saturate_sw_to_ub(source.u32[0] >> 16)) << 8;\n+ high |= (saturate_sw_to_ub((source.u32[1]) & 0xFFFF)) << 16;\n+ high |= (saturate_sw_to_ub(source.u32[1] >> 16)) << 24;\n+\n+ write_mmx64s(low, high);\n+}\n+\n static void instr_660F67() { unimplemented_sse(); }\n \n static void instr_0F68() { unimplemented_sse(); }\n"} {"commit":"e29e3a445b4c93c7cbcd3c6b9403bf3761c54796","subject":"Add constant for PAD parameter and some cleanup.","message":"Add constant for PAD parameter and some cleanup.\n","repos":"sctplab\/sctp-idata,sctplab\/sctp-idata","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/netinet\/sctp_constants.h\n+++ src\/netinet\/sctp_constants.h\n@@ -34,7 +34,7 @@\n \n #ifdef __FreeBSD__\n #include <sys\/cdefs.h>\n-__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_constants.h 324615 2017-10-14 10:02:59Z tuexen $\");\n+__FBSDID(\"$FreeBSD: head\/sys\/netinet\/sctp_constants.h 328478 2018-01-27 13:46:55Z tuexen $\");\n #endif\n \n #ifndef _NETINET_SCTP_CONSTANTS_H_\n@@ -398,7 +398,7 @@\n \/*************0x0000 series*************\/\n #define SCTP_HEARTBEAT_INFO\t\t0x0001\n #if defined(__Userspace__)\n-#define SCTP_CONN_ADDRESS 0x0004\n+#define SCTP_CONN_ADDRESS\t\t0x0004\n #endif\n #define SCTP_IPV4_ADDRESS\t\t0x0005\n #define SCTP_IPV6_ADDRESS\t\t0x0006\n@@ -408,43 +408,34 @@\n #define SCTP_HOSTNAME_ADDRESS\t\t0x000b\n #define SCTP_SUPPORTED_ADDRTYPE\t\t0x000c\n \n-\/* draft-ietf-stewart-tsvwg-strreset-xxx *\/\n+\/* RFC 6525 *\/\n #define SCTP_STR_RESET_OUT_REQUEST\t0x000d\n #define SCTP_STR_RESET_IN_REQUEST\t0x000e\n #define SCTP_STR_RESET_TSN_REQUEST\t0x000f\n #define SCTP_STR_RESET_RESPONSE\t\t0x0010\n #define SCTP_STR_RESET_ADD_OUT_STREAMS\t0x0011\n-#define SCTP_STR_RESET_ADD_IN_STREAMS 0x0012\n+#define SCTP_STR_RESET_ADD_IN_STREAMS\t0x0012\n \n #define SCTP_MAX_RESET_PARAMS 2\n-#define SCTP_STREAM_RESET_TSN_DELTA 0x1000\n+#define SCTP_STREAM_RESET_TSN_DELTA\t0x1000\n \n \/*************0x4000 series*************\/\n \n \/*************0x8000 series*************\/\n #define SCTP_ECN_CAPABLE\t\t0x8000\n \n-\/* draft-ietf-tsvwg-auth-xxx *\/\n+\/* RFC 4895 *\/\n #define SCTP_RANDOM\t\t\t0x8002\n #define SCTP_CHUNK_LIST\t\t\t0x8003\n #define SCTP_HMAC_LIST\t\t\t0x8004\n-\/*\n- * draft-ietf-tsvwg-addip-sctp-xx param=0x8008 len=0xNNNN Byte | Byte | Byte\n- * | Byte Byte | Byte ...\n- *\n- * Where each byte is a chunk type extension supported. For example, to support\n- * all chunks one would have (in hex):\n- *\n- * 80 01 00 09 C0 C1 80 81 82 00 00 00\n- *\n- * Has the parameter. C0 = PR-SCTP (RFC3758) C1, 80 = ASCONF (addip draft) 81\n- * = Packet Drop 82 = Stream Reset 83 = Authentication\n- *\/\n-#define SCTP_SUPPORTED_CHUNK_EXT 0x8008\n+\/* RFC 4820 *\/\n+#define SCTP_PAD\t\t\t0x8005\n+\/* RFC 5061 *\/\n+#define SCTP_SUPPORTED_CHUNK_EXT\t0x8008\n \n \/*************0xC000 series*************\/\n #define SCTP_PRSCTP_SUPPORTED\t\t0xc000\n-\/* draft-ietf-tsvwg-addip-sctp *\/\n+\/* RFC 5061 *\/\n #define SCTP_ADD_IP_ADDRESS\t\t0xc001\n #define SCTP_DEL_IP_ADDRESS\t\t0xc002\n #define SCTP_ERROR_CAUSE_IND\t\t0xc003\n@@ -452,8 +443,8 @@\n #define SCTP_SUCCESS_REPORT\t\t0xc005\n #define SCTP_ULP_ADAPTATION\t\t0xc006\n \/* behave-nat-draft *\/\n-#define SCTP_HAS_NAT_SUPPORT 0xc007\n-#define SCTP_NAT_VTAGS 0xc008\n+#define SCTP_HAS_NAT_SUPPORT\t\t0xc007\n+#define SCTP_NAT_VTAGS\t\t\t0xc008\n \n \/* bits for TOS field *\/\n #define SCTP_ECT0_BIT\t\t0x02\n"} {"commit":"d1726b6dc95b5ed0914e969f6765a9e2cf7baf04","subject":"Bluetooth: Refactor loop in l2cap_retransmit_one_frame","message":"Bluetooth: Refactor loop in l2cap_retransmit_one_frame\n\nThis make it easier to see what is the real reason for loop to exit.\nskb_queue_next return valid skb or garbage, not NULL.\n\nSigned-off-by: Szymon Janc <db186c297188f7acbbdc9bbd6aff2f45665bb42d@tieto.com>\nSigned-off-by: Gustavo F. Padovan <8463bae6aa74c6c37654a5ac7ce3bbb9fe6ffff8@profusion.mobi>\n","repos":"TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,TeamVee-Kanas\/android_kernel_samsung_kanas,TeamVee-Kanas\/android_kernel_samsung_kanas,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- net\/bluetooth\/l2cap_core.c\n+++ net\/bluetooth\/l2cap_core.c\n@@ -1318,14 +1318,12 @@\n \tif (!skb)\n \t\treturn;\n \n-\tdo {\n-\t\tif (bt_cb(skb)->tx_seq == tx_seq)\n-\t\t\tbreak;\n-\n+\twhile (bt_cb(skb)->tx_seq != tx_seq) {\n \t\tif (skb_queue_is_last(&chan->tx_q, skb))\n \t\t\treturn;\n \n-\t} while ((skb = skb_queue_next(&chan->tx_q, skb)));\n+\t\tskb = skb_queue_next(&chan->tx_q, skb);\n+\t}\n \n \tif (chan->remote_max_tx &&\n \t\t\tbt_cb(skb)->retries == chan->remote_max_tx) {\n"} {"commit":"79b257915a8ba7fc54aa8dbf6826cc96fa9c30c9","subject":"Create Source.c","message":"Create Source.c\n\n[ref.] p. 192 ex. 1 \"Programming in C\" by Stephen Kochan","repos":"CptDemocracy\/The-C-Blues,CptDemocracy\/The-C-Blues","returncode":1,"stderr":"error: pathspec 'March-23rd-2016\/CalculatingDays\/Source.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- March-23rd-2016\/CalculatingDays\/Source.c\n+++ March-23rd-2016\/CalculatingDays\/Source.c\n@@ -0,0 +1,56 @@\n+#include <stdlib.h>\n+#include <string.h>\n+#include <stdio.h>\n+#include <errno.h>\n+#include <time.h>\n+#include \"Utilities.h\"\n+\n+#define DEFAULT_SHORT_DATE_STRING_COUNT 32\n+#define DEFAULT_SHORT_DATE_STRING_FORMAT \"%d\/%m\/%y\"\n+\n+int main(void) {\n+\n+\tstruct tm dateinfo1 = { \n+\t\t0, .tm_mday = 2, .tm_mon = JUL, .tm_year = 2005 \n+\t};\n+\tstruct tm dateinfo2 = { \n+\t\t0, .tm_mday = 16, .tm_mon = JUL, .tm_year = 2005 \n+\t};\n+\n+\tint days = CalculateDaysBetween(&dateinfo1, &dateinfo2);\n+\n+#ifdef DEBUG\n+\t\/\/ CalculateDaysBetween(const struct tm*, const struct tm*) \n+\t\/\/ sets errno to EINVAL if passed dates earlier than March 1900\n+\tif (errno == EINVAL) {\n+\t\tperror(NULL);\n+\t}\n+#endif\n+\n+\t\/\/ zero out for safety\n+\tchar dateinfo1_cstr[DEFAULT_SHORT_DATE_STRING_COUNT] = { 0 };\n+\n+\t\/\/ strftime's _SizeInBytes argument already provides for the null-\n+\t\/\/ terminating character\n+\tstrftime(dateinfo1_cstr, \n+\t\tDEFAULT_SHORT_DATE_STRING_COUNT, \n+\t\tDEFAULT_SHORT_DATE_STRING_FORMAT, \n+\t\t&dateinfo1);\n+\t\n+\t\/\/ zero out for safety\n+\tchar dateinfo2_cstr[DEFAULT_SHORT_DATE_STRING_COUNT] = { 0 };\n+\n+\t\/\/ stftime's _SizeInBytes argument already provides for the null-\n+\t\/\/ termianting character\n+\tstrftime(dateinfo2_cstr,\n+\t\tDEFAULT_SHORT_DATE_STRING_COUNT,\n+\t\tDEFAULT_SHORT_DATE_STRING_FORMAT,\n+\t\t&dateinfo2);\n+\n+\tprintf(\"%d days have passed between %s and %s.\\n\", \n+\t\tdays, dateinfo1_cstr, dateinfo2_cstr);\n+\n+\tgetchar();\n+\t\n+\treturn 0;\n+}\n"} {"commit":"7bd4e72429fa6ebce97a29ebbf045d369cb79044","subject":"Add adepter GoF code","message":"Add adepter GoF code\n","repos":"zebmason\/GoFRefactored","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- Adapter\/GoF.h\n+++ Adapter\/GoF.h\n@@ -2,4 +2,74 @@\n \n namespace AdapterPattern::GoF\n {\n+\tclass Coord {\n+\tpublic:\n+\t\tCoord& operator+ (Coord&) { return *this; }\n+\t};\n+\n+\tclass Point {\n+\tpublic:\n+\t\tPoint(Coord&, Coord&) {};\n+\t};\n+\tclass Manipulator {};\n+\n+\tclass TextShape;\n+\tclass TextManipulator : public Manipulator {\n+\tpublic:\n+\t\tTextManipulator(const TextShape*) {}\n+\t};\n+\n+\tclass Shape {\n+\tpublic:\n+\t\tShape() {}\n+\t\tvirtual void BoundingBox(\n+\t\t\tPoint& bottomLeft, Point& topRight\n+\t\t) const {}\n+\t\tvirtual Manipulator* CreateManipulator() const { return nullptr; }\n+\t};\n+\n+\tclass TextView {\n+\tpublic:\n+\t\tTextView() {}\n+\t\tvoid GetOrigin(Coord& x, Coord& y) const {}\n+\t\tvoid GetExtent(Coord& width, Coord& height) const {}\n+\t\tvirtual bool IsEmpty() const {}\n+\t};\n+\n+\tclass TextShape : public Shape {\n+\tpublic:\n+\t\tTextShape(TextView*);\n+\n+\t\tvirtual void BoundingBox(\n+\t\t\tPoint& bottomLeft, Point& topRight\n+\t\t) const;\n+\t\tvirtual bool IsEmpty() const;\n+\t\tvirtual Manipulator* CreateManipulator() const;\n+\tprivate:\n+\t\tTextView* _text;\n+\t};\n+\n+\tTextShape::TextShape(TextView* t) {\n+\t\t_text = t;\n+\t}\n+\n+\tvoid TextShape::BoundingBox(\n+\t\tPoint& bottomLeft, Point& topRight\n+\t) const {\n+\t\tCoord bottom, left, width, height;\n+\n+\t\t_text->GetOrigin(bottom, left);\n+\t\t_text->GetExtent(width, height);\n+\n+\t\tbottomLeft = Point(bottom, left);\n+\t\ttopRight = Point(bottom + height, left + width);\n+\t}\n+\n+\tbool TextShape::IsEmpty() const {\n+\t\treturn _text->IsEmpty();\n+\t}\n+\n+\tManipulator* TextShape::CreateManipulator() const {\n+\t\treturn new TextManipulator(this);\n+\t}\n }\n"} {"commit":"45fb9c35b27c9982e9a55d04ed0a5230a2d0b306","subject":"openvswitch: Fix ovs_dp_cmd_msg_size()","message":"openvswitch: Fix ovs_dp_cmd_msg_size()\n\ncommit 43d4be9cb55f3bac5253e9289996fd9d735531db (openvswitch: Allow user space\nto announce ability to accept unaligned Netlink messages) introduced\nOVS_DP_ATTR_USER_FEATURES netlink attribute in datapath responses,\nbut the attribute size was not taken into account in ovs_dp_cmd_msg_size().\n\nSigned-off-by: Daniele Di Proietto <2ad9d102be2328674a490df5f6ac795c45f53d46@gmail.com>\nSigned-off-by: Jesse Gross <a5c95b3d7cb4d0ae05a15c79c79ab458dc2c8f9e@nicira.com>\n","repos":"KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs,KristFoundation\/Programs","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- net\/openvswitch\/datapath.c\n+++ net\/openvswitch\/datapath.c\n@@ -1087,6 +1087,7 @@\n \tmsgsize += nla_total_size(IFNAMSIZ);\n \tmsgsize += nla_total_size(sizeof(struct ovs_dp_stats));\n \tmsgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));\n+\tmsgsize += nla_total_size(sizeof(u32)); \/* OVS_DP_ATTR_USER_FEATURES *\/\n \n \treturn msgsize;\n }\n"} {"commit":"e811b22f0638f963cb067f484df5996890fc2b70","subject":"Add UefiDriverModel.c for Installation of driver model protocols .","message":"Add UefiDriverModel.c for Installation of driver model protocols .\n\ngit-svn-id: 5648d1bec6962b0a6d1d1b40eba8cf5cdb62da3d@2725 6f19259b-4bc3-4df7-8a09-765794883524\n","repos":"MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2,MattDevo\/edk2","returncode":1,"stderr":"error: pathspec 'MdePkg\/Library\/UefiLib\/UefiDriverModel.c' did not match any file(s) known to git\n","license":"bsd-2-clause","lang":"C","diff":"--- MdePkg\/Library\/UefiLib\/UefiDriverModel.c\n+++ MdePkg\/Library\/UefiLib\/UefiDriverModel.c\n@@ -0,0 +1,581 @@\n+\/** @file\r\n+ Library functions that abstract driver model protocols\r\n+ installation.\r\n+\r\n+ Copyright (c) 2006 - 2007, Intel Corporation<BR> All rights\r\n+ reserved. This program and the accompanying materials are\r\n+ licensed and made available under the terms and conditions of the BSD License\r\n+ which accompanies this distribution. The full text of the license may be found at\r\n+ http:\/\/opensource.org\/licenses\/bsd-license.php\r\n+ \r\n+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS,\r\n+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r\n+\r\n+**\/ \r\n+\r\n+\/\/\r\n+\/\/ Include common header file for this module.\r\n+\/\/\r\n+#include \"CommonHeader.h\"\r\n+\r\n+\/**\r\n+ Intialize a driver by installing the Driver Binding Protocol onto the\r\n+ driver's DriverBindingHandle. This is typically the same as the driver's\r\n+ ImageHandle, but it can be different if the driver produces multiple\r\n+ DriverBinding Protocols. This function also initializes the EFI Driver\r\n+ Library that initializes the global variables gST, gBS, gRT.\r\n+\r\n+ @param ImageHandle The image handle of the driver\r\n+ @param SystemTable The EFI System Table that was passed to the driver's entry point\r\n+ @param DriverBinding A Driver Binding Protocol instance that this driver is producing\r\n+ @param DriverBindingHandle The handle that DriverBinding is to be installe onto. If this\r\n+ parameter is NULL, then a new handle is created.\r\n+\r\n+ @retval EFI_SUCCESS DriverBinding is installed onto DriverBindingHandle\r\n+ @retval Other Status from gBS->InstallProtocolInterface()\r\n+\r\n+**\/\r\n+EFI_STATUS\r\n+EFIAPI\r\n+EfiLibInstallDriverBinding (\r\n+ IN const EFI_HANDLE ImageHandle,\r\n+ IN const EFI_SYSTEM_TABLE *SystemTable,\r\n+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,\r\n+ IN EFI_HANDLE DriverBindingHandle\r\n+ )\r\n+{\r\n+ EFI_STATUS Status;\r\n+\r\n+ ASSERT (NULL != DriverBinding);\r\n+\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ NULL\r\n+ );\r\n+ \/\/\r\n+ \/\/ ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r\n+ \/\/\r\n+ ASSERT_EFI_ERROR (Status);\r\n+\r\n+ \/\/\r\n+ \/\/ Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r\n+ \/\/\r\n+ DriverBinding->ImageHandle = ImageHandle;\r\n+ DriverBinding->DriverBindingHandle = DriverBindingHandle;\r\n+\r\n+ return Status;\r\n+}\r\n+\r\n+\/**\r\n+ Intialize a driver by installing the Driver Binding Protocol onto the\r\n+ driver's DriverBindingHandle. This is typically the same as the driver's\r\n+ ImageHandle, but it can be different if the driver produces multiple\r\n+ DriverBinding Protocols. This function also initializes the EFI Driver\r\n+ Library that initializes the global variables gST, gBS, gRT.\r\n+\r\n+ @ImageHandle The image handle of the driver\r\n+ @SystemTable The EFI System Table that was passed to the driver's entry point\r\n+ @DriverBinding A Driver Binding Protocol instance that this driver is producing\r\n+ @DriverBindingHandle The handle that DriverBinding is to be installe onto. If this\r\n+ parameter is NULL, then a new handle is created.\r\n+ @ComponentName A Component Name Protocol instance that this driver is producing\r\n+ @DriverConfiguration A Driver Configuration Protocol instance that this driver is producing\r\n+ @DriverDiagnostics A Driver Diagnostics Protocol instance that this driver is producing\r\n+\r\n+ @retval EFI_SUCCESS DriverBinding is installed onto DriverBindingHandle\r\n+ @retval Other Status from gBS->InstallProtocolInterface()\r\n+\r\n+**\/\r\n+EFI_STATUS\r\n+EFIAPI\r\n+EfiLibInstallAllDriverProtocols (\r\n+ IN const EFI_HANDLE ImageHandle,\r\n+ IN const EFI_SYSTEM_TABLE *SystemTable,\r\n+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,\r\n+ IN EFI_HANDLE DriverBindingHandle,\r\n+ IN const EFI_COMPONENT_NAME_PROTOCOL *ComponentName, OPTIONAL\r\n+ IN const EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration, OPTIONAL\r\n+ IN const EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics OPTIONAL\r\n+ )\r\n+{\r\n+ EFI_STATUS Status;\r\n+\r\n+ ASSERT (NULL != DriverBinding);\r\n+\r\n+ if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r\n+ if (DriverConfiguration == NULL) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (DriverConfiguration == NULL) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ }\r\n+\r\n+ \/\/\r\n+ \/\/ ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r\n+ \/\/\r\n+ ASSERT_EFI_ERROR (Status);\r\n+\r\n+ \/\/\r\n+ \/\/ Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r\n+ \/\/\r\n+ DriverBinding->ImageHandle = ImageHandle;\r\n+ DriverBinding->DriverBindingHandle = DriverBindingHandle;\r\n+\r\n+ return Status;\r\n+}\r\n+\r\n+\r\n+\/**\r\n+ Intialize a driver by installing the Driver Binding Protocol onto the\r\n+ driver's DriverBindingHandle. This is typically the same as the driver's\r\n+ ImageHandle, but it can be different if the driver produces multiple\r\n+ DriverBinding Protocols. This function also initializes the EFI Driver\r\n+ Library that initializes the global variables gST, gBS, gRT.\r\n+\r\n+ @ImageHandle The image handle of the driver\r\n+ @SystemTable The EFI System Table that was passed to the driver's entry point\r\n+ @DriverBinding A Driver Binding Protocol instance that this driver is producing\r\n+ @DriverBindingHandle The handle that DriverBinding is to be installe onto. If this\r\n+ parameter is NULL, then a new handle is created.\r\n+ @ComponentName A Component Name Protocol instance that this driver is producing\r\n+ @DriverConfiguration A Driver Configuration Protocol instance that this driver is producing\r\n+ @DriverDiagnostics A Driver Diagnostics Protocol instance that this driver is producing\r\n+\r\n+ @retval EFI_SUCCESS DriverBinding is installed onto DriverBindingHandle\r\n+ @retval Other Status from gBS->InstallProtocolInterface()\r\n+\r\n+**\/\r\n+EFI_STATUS\r\n+EFIAPI\r\n+EfiLibInstallAllDriverProtocols2 (\r\n+ IN const EFI_HANDLE ImageHandle,\r\n+ IN const EFI_SYSTEM_TABLE *SystemTable,\r\n+ IN EFI_DRIVER_BINDING_PROTOCOL *DriverBinding,\r\n+ IN EFI_HANDLE DriverBindingHandle,\r\n+ IN const EFI_COMPONENT_NAME_PROTOCOL *ComponentName, OPTIONAL\r\n+ IN const EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2, OPTIONAL\r\n+ IN const EFI_DRIVER_CONFIGURATION_PROTOCOL *DriverConfiguration, OPTIONAL\r\n+ IN const EFI_DRIVER_DIAGNOSTICS_PROTOCOL *DriverDiagnostics, OPTIONAL\r\n+ IN const EFI_DRIVER_DIAGNOSTICS2_PROTOCOL *DriverDiagnostics2 OPTIONAL\r\n+ )\r\n+{\r\n+ EFI_STATUS Status;\r\n+\r\n+ ASSERT (NULL != DriverBinding);\r\n+\r\n+ if (DriverConfiguration == NULL) {\r\n+ if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r\n+ if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (DriverDiagnostics == NULL || FeaturePcdGet(PcdDriverDiagnosticsDisable)) {\r\n+ if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (DriverDiagnostics2 == NULL || FeaturePcdGet(PcdDriverDiagnostics2Disable)) {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ } else {\r\n+ if (ComponentName == NULL || FeaturePcdGet(PcdComponentNameDisable)) {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ } else {\r\n+ if (ComponentName2 == NULL || FeaturePcdGet(PcdComponentName2Disable)) {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ } else {\r\n+ Status = gBS->InstallMultipleProtocolInterfaces (\r\n+ &DriverBindingHandle,\r\n+ &gEfiDriverBindingProtocolGuid, DriverBinding,\r\n+ &gEfiComponentNameProtocolGuid, ComponentName,\r\n+ &gEfiComponentName2ProtocolGuid, ComponentName2,\r\n+ &gEfiDriverConfigurationProtocolGuid, DriverConfiguration,\r\n+ &gEfiDriverDiagnosticsProtocolGuid, DriverDiagnostics,\r\n+ &gEfiDriverDiagnostics2ProtocolGuid, DriverDiagnostics2,\r\n+ NULL\r\n+ );\r\n+ }\r\n+ }\r\n+ }\r\n+ }\r\n+ }\r\n+\r\n+ \/\/\r\n+ \/\/ ASSERT if the call to InstallMultipleProtocolInterfaces() failed\r\n+ \/\/\r\n+ ASSERT_EFI_ERROR (Status);\r\n+\r\n+ \/\/\r\n+ \/\/ Update the ImageHandle and DriverBindingHandle fields of the Driver Binding Protocol\r\n+ \/\/\r\n+ DriverBinding->ImageHandle = ImageHandle;\r\n+ DriverBinding->DriverBindingHandle = DriverBindingHandle;\r\n+\r\n+ return Status;\r\n+}\r\n+\r\n+\r\n"} {"commit":"43fab04a2ea073d8ebd0435787458543443dc3ee","subject":"tweak ieee80211_decap(): instead of copying the 802.11 header on the stack and building the ethernet header directly in the mbuf, build the ethernet header on the stack directly from the 802.11 header in the mbuf and copy the ethernet header to the mbuf after stripping the 802.11 header. makes the code easier to read\/understand, especially, it is now explicit what is being put in the ether_type field.","message":"tweak ieee80211_decap():\ninstead of copying the 802.11 header on the stack and building\nthe ethernet header directly in the mbuf, build the ethernet\nheader on the stack directly from the 802.11 header in the\nmbuf and copy the ethernet header to the mbuf after stripping\nthe 802.11 header.\nmakes the code easier to read\/understand, especially, it is\nnow explicit what is being put in the ether_type field.\n\ndiff from Matthew Dempsky (matthew at dempsky dot org)\n\nmoved ieee80211_align_mbuf() under #ifdef __STRICT_ALIGNMENT\nwhile i'm here.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net80211\/ieee80211_input.c\n+++ net80211\/ieee80211_input.c\n@@ -1,4 +1,4 @@\n-\/*\t$OpenBSD: ieee80211_input.c,v 1.114 2010\/06\/05 13:13:43 damien Exp $\t*\/\n+\/*\t$OpenBSD: ieee80211_input.c,v 1.115 2010\/06\/07 16:46:17 damien Exp $\t*\/\n \n \/*-\n * Copyright (c) 2001 Atsushi Onoe\n@@ -834,6 +834,7 @@\n \t}\n }\n \n+#ifdef __STRICT_ALIGNMENT\n \/*\n * Make sure protocol header (e.g. IP) is aligned on a 32-bit boundary.\n * This is achieved by copying mbufs so drivers should try to map their\n@@ -897,13 +898,14 @@\n \tm_freem(m);\n \treturn n0;\n }\n+#endif\t\/* __STRICT_ALIGNMENT *\/\n \n void\n ieee80211_decap(struct ieee80211com *ic, struct mbuf *m,\n struct ieee80211_node *ni, int hdrlen)\n {\n-\tstruct ieee80211_frame_addr4 wh;\n-\tstruct ether_header *eh;\n+\tstruct ether_header eh;\n+\tstruct ieee80211_frame *wh;\n \tstruct llc *llc;\n \n \tif (m->m_len < hdrlen + LLC_SNAPFRAMELEN &&\n@@ -911,48 +913,48 @@\n \t\tic->ic_stats.is_rx_decap++;\n \t\treturn;\n \t}\n-\tmemcpy(&wh, mtod(m, caddr_t), MIN(hdrlen, sizeof(wh)));\n-\tllc = (struct llc *)(mtod(m, caddr_t) + hdrlen);\n+\twh = mtod(m, struct ieee80211_frame *);\n+\tswitch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) {\n+\tcase IEEE80211_FC1_DIR_NODS:\n+\t\tIEEE80211_ADDR_COPY(eh.ether_dhost, wh->i_addr1);\n+\t\tIEEE80211_ADDR_COPY(eh.ether_shost, wh->i_addr2);\n+\t\tbreak;\n+\tcase IEEE80211_FC1_DIR_TODS:\n+\t\tIEEE80211_ADDR_COPY(eh.ether_dhost, wh->i_addr3);\n+\t\tIEEE80211_ADDR_COPY(eh.ether_shost, wh->i_addr2);\n+\t\tbreak;\n+\tcase IEEE80211_FC1_DIR_FROMDS:\n+\t\tIEEE80211_ADDR_COPY(eh.ether_dhost, wh->i_addr1);\n+\t\tIEEE80211_ADDR_COPY(eh.ether_shost, wh->i_addr3);\n+\t\tbreak;\n+\tcase IEEE80211_FC1_DIR_DSTODS:\n+\t\tIEEE80211_ADDR_COPY(eh.ether_dhost, wh->i_addr3);\n+\t\tIEEE80211_ADDR_COPY(eh.ether_shost,\n+\t\t ((struct ieee80211_frame_addr4 *)wh)->i_addr4);\n+\t\tbreak;\n+\t}\n+\tllc = (struct llc *)((caddr_t)wh + hdrlen);\n \tif (llc->llc_dsap == LLC_SNAP_LSAP &&\n \t llc->llc_ssap == LLC_SNAP_LSAP &&\n \t llc->llc_control == LLC_UI &&\n \t llc->llc_snap.org_code[0] == 0 &&\n \t llc->llc_snap.org_code[1] == 0 &&\n \t llc->llc_snap.org_code[2] == 0) {\n+\t\teh.ether_type = llc->llc_snap.ether_type;\n \t\tm_adj(m, hdrlen + LLC_SNAPFRAMELEN - ETHER_HDR_LEN);\n-\t\tllc = NULL;\n \t} else {\n+\t\teh.ether_type = htons(m->m_pkthdr.len - hdrlen);\n \t\tm_adj(m, hdrlen - ETHER_HDR_LEN);\n \t}\n-\teh = mtod(m, struct ether_header *);\n-\tswitch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) {\n-\tcase IEEE80211_FC1_DIR_NODS:\n-\t\tIEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1);\n-\t\tIEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2);\n-\t\tbreak;\n-\tcase IEEE80211_FC1_DIR_TODS:\n-\t\tIEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3);\n-\t\tIEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr2);\n-\t\tbreak;\n-\tcase IEEE80211_FC1_DIR_FROMDS:\n-\t\tIEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr1);\n-\t\tIEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr3);\n-\t\tbreak;\n-\tcase IEEE80211_FC1_DIR_DSTODS:\n-\t\tIEEE80211_ADDR_COPY(eh->ether_dhost, wh.i_addr3);\n-\t\tIEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4);\n-\t\tbreak;\n-\t}\n+\tmemcpy(mtod(m, caddr_t), &eh, ETHER_HDR_LEN);\n+#ifdef __STRICT_ALIGNMENT\n \tif (!ALIGNED_POINTER(mtod(m, caddr_t) + ETHER_HDR_LEN, u_int32_t)) {\n \t\tif ((m = ieee80211_align_mbuf(m)) == NULL) {\n \t\t\tic->ic_stats.is_rx_decap++;\n \t\t\treturn;\n \t\t}\n \t}\n-\tif (llc != NULL) {\n-\t\teh = mtod(m, struct ether_header *);\n-\t\teh->ether_type = htons(m->m_pkthdr.len - ETHER_HDR_LEN);\n-\t}\n+#endif\n \tieee80211_deliver_data(ic, m, ni);\n }\n \n"} {"commit":"8925754311ec3670fc4066ae90bcc06b02df1803","subject":"don't check the IEEE80211_CAPINFO_PRIVACY bit in (re)association requests. the spec says that \"APs ignore the Privacy subfield within received Association and Reassociation Request managements frames\". if the IEEE80211_CAPINFO_ESS bit is not set, reply with the correct status code (IEEE80211_STATUS_CAPINFO instead of IEEE80211_STATUS_BASIC_RATE). indent things a bit while i'm here.","message":"don't check the IEEE80211_CAPINFO_PRIVACY bit in (re)association requests.\nthe spec says that \"APs ignore the Privacy subfield within received\nAssociation and Reassociation Request managements frames\".\nif the IEEE80211_CAPINFO_ESS bit is not set, reply with the correct status\ncode (IEEE80211_STATUS_CAPINFO instead of IEEE80211_STATUS_BASIC_RATE).\nindent things a bit while i'm here.\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- net80211\/ieee80211_input.c\n+++ net80211\/ieee80211_input.c\n@@ -1,5 +1,5 @@\n \/*\t$NetBSD: ieee80211_input.c,v 1.24 2004\/05\/31 11:12:24 dyoung Exp $\t*\/\n-\/*\t$OpenBSD: ieee80211_input.c,v 1.36 2007\/07\/04 20:19:12 damien Exp $\t*\/\n+\/*\t$OpenBSD: ieee80211_input.c,v 1.37 2007\/07\/06 17:58:04 damien Exp $\t*\/\n \/*-\n * Copyright (c) 2001 Atsushi Onoe\n * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting\n@@ -1706,32 +1706,22 @@\n \t\tFREE(ni->ni_challenge, M_DEVBUF);\n \t\tni->ni_challenge = NULL;\n \t}\n-\t\/* XXX per-node cipher suite *\/\n-\t\/* XXX some stations use the privacy bit for handling APs\n-\t that suport both encrypted and unencrypted traffic *\/\n-\tif ((capinfo & IEEE80211_CAPINFO_ESS) == 0 ||\n-\t (capinfo & IEEE80211_CAPINFO_PRIVACY) !=\n-\t ((ic->ic_flags & IEEE80211_F_WEPON) ?\n-\t IEEE80211_CAPINFO_PRIVACY : 0)) {\n-\t\tIEEE80211_DPRINTF((\"%s: rate mismatch for %s\\n\",\n+\tif (!(capinfo & IEEE80211_CAPINFO_ESS)) {\n+\t\tIEEE80211_DPRINTF((\"%s: capinfo mismatch for %s\\n\",\n \t\t __func__, ether_sprintf((u_int8_t *)wh->i_addr2)));\n-\t\t\/* XXX what rate will we send this at? *\/\n-\t\tIEEE80211_SEND_MGMT(ic, ni, resp,\n-\t\t IEEE80211_STATUS_BASIC_RATE);\n+\t\tIEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_CAPINFO);\n \t\tieee80211_node_leave(ic, ni);\n \t\tic->ic_stats.is_rx_assoc_capmismatch++;\n \t\treturn;\n \t}\n-\tieee80211_setup_rates(ic, ni, rates, xrates,\n-\t\t\tIEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |\n-\t\t\t\tIEEE80211_F_DONEGO | IEEE80211_F_DODEL);\n+\tieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT |\n+\t IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL);\n \tif (ni->ni_rates.rs_nrates == 0) {\n \t\tIEEE80211_DPRINTF((\"%s: rate mismatch for %s\\n\",\n \t\t __func__, ether_sprintf((u_int8_t *)wh->i_addr2)));\n \t\tIEEE80211_AID_CLR(ni->ni_associd, ic->ic_aid_bitmap);\n \t\tni->ni_associd = 0;\n-\t\tIEEE80211_SEND_MGMT(ic, ni, resp,\n-\t\t\tIEEE80211_STATUS_BASIC_RATE);\n+\t\tIEEE80211_SEND_MGMT(ic, ni, resp, IEEE80211_STATUS_BASIC_RATE);\n \t\tic->ic_stats.is_rx_assoc_norate++;\n \t\treturn;\n \t}\n"} {"commit":"38a302960fc4dfd5f4f4a0aba29af6e3ce265839","subject":"All shape related structs are together (#20665)","message":"All shape related structs are together (#20665)\n\n","repos":"jason-simmons\/flutter_engine,rmacnak-google\/engine,aam\/engine,devoncarew\/engine,jason-simmons\/flutter_engine,jason-simmons\/sky_engine,rmacnak-google\/engine,chinmaygarde\/sky_engine,flutter\/engine,devoncarew\/sky_engine,jamesr\/flutter_engine,rmacnak-google\/engine,rmacnak-google\/engine,devoncarew\/sky_engine,jamesr\/flutter_engine,chinmaygarde\/sky_engine,devoncarew\/sky_engine,chinmaygarde\/flutter_engine,chinmaygarde\/flutter_engine,jason-simmons\/sky_engine,jamesr\/flutter_engine,Hixie\/sky_engine,devoncarew\/engine,rmacnak-google\/engine,chinmaygarde\/flutter_engine,chinmaygarde\/sky_engine,jamesr\/sky_engine,jamesr\/flutter_engine,rmacnak-google\/engine,aam\/engine,Hixie\/sky_engine,aam\/engine,aam\/engine,jason-simmons\/flutter_engine,Hixie\/sky_engine,jason-simmons\/sky_engine,jason-simmons\/flutter_engine,flutter\/engine,Hixie\/sky_engine,Hixie\/sky_engine,devoncarew\/engine,chinmaygarde\/flutter_engine,rmacnak-google\/engine,jason-simmons\/flutter_engine,devoncarew\/sky_engine,devoncarew\/sky_engine,chinmaygarde\/sky_engine,jamesr\/flutter_engine,jamesr\/sky_engine,flutter\/engine,chinmaygarde\/flutter_engine,chinmaygarde\/sky_engine,jason-simmons\/sky_engine,Hixie\/sky_engine,devoncarew\/engine,aam\/engine,Hixie\/sky_engine,flutter\/engine,jamesr\/sky_engine,aam\/engine,flutter\/engine,jason-simmons\/sky_engine,jamesr\/sky_engine,jamesr\/flutter_engine,jamesr\/sky_engine,jamesr\/sky_engine,chinmaygarde\/flutter_engine,jamesr\/flutter_engine,jamesr\/flutter_engine,devoncarew\/engine,jamesr\/sky_engine,jason-simmons\/sky_engine,aam\/engine,flutter\/engine,aam\/engine,flutter\/engine,jamesr\/flutter_engine,devoncarew\/engine,jason-simmons\/flutter_engine,chinmaygarde\/flutter_engine,jason-simmons\/flutter_engine,devoncarew\/sky_engine,chinmaygarde\/sky_engine,Hixie\/sky_engine,jason-simmons\/flutter_engine,devoncarew\/sky_engine,jason-simmons\/sky_engine,chinmaygarde\/sky_engine,flutter\/engine,devoncarew\/engine","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- shell\/platform\/embedder\/embedder.h\n+++ shell\/platform\/embedder\/embedder.h\n@@ -320,6 +320,29 @@\n uint32_t height;\n } FlutterUIntSize;\n \n+\/\/\/ A structure to represent a rectangle.\n+typedef struct {\n+ double left;\n+ double top;\n+ double right;\n+ double bottom;\n+} FlutterRect;\n+\n+\/\/\/ A structure to represent a 2D point.\n+typedef struct {\n+ double x;\n+ double y;\n+} FlutterPoint;\n+\n+\/\/\/ A structure to represent a rounded rectangle.\n+typedef struct {\n+ FlutterRect rect;\n+ FlutterSize upper_left_corner_radius;\n+ FlutterSize upper_right_corner_radius;\n+ FlutterSize lower_right_corner_radius;\n+ FlutterSize lower_left_corner_radius;\n+} FlutterRoundedRect;\n+\n \/\/\/ This information is passed to the embedder when requesting a frame buffer\n \/\/\/ object.\n \/\/\/\n@@ -531,26 +554,6 @@\n typedef void (*FlutterDataCallback)(const uint8_t* \/* data *\/,\n size_t \/* size *\/,\n void* \/* user data *\/);\n-\n-typedef struct {\n- double left;\n- double top;\n- double right;\n- double bottom;\n-} FlutterRect;\n-\n-typedef struct {\n- double x;\n- double y;\n-} FlutterPoint;\n-\n-typedef struct {\n- FlutterRect rect;\n- FlutterSize upper_left_corner_radius;\n- FlutterSize upper_right_corner_radius;\n- FlutterSize lower_right_corner_radius;\n- FlutterSize lower_left_corner_radius;\n-} FlutterRoundedRect;\n \n \/\/\/ The identifier of the platform view. This identifier is specified by the\n \/\/\/ application when a platform view is added to the scene via the\n"} {"commit":"c9de78fe34c42e96592bf093a5997fbe982086f7","subject":"fix issues #942","message":"fix issues #942\n","repos":"handsome-feng\/flatpak,handsome-feng\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,flatpak\/flatpak,handsome-feng\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak,flatpak\/flatpak,handsome-feng\/flatpak,handsome-feng\/flatpak","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- common\/flatpak-utils.c\n+++ common\/flatpak-utils.c\n@@ -2078,7 +2078,7 @@\n const char *path;\n static GQuark _file_path_quark = 0;\n \n- if (G_UNLIKELY (_file_path_quark) == 0)\n+ if (G_UNLIKELY (_file_path_quark == 0))\n _file_path_quark = g_quark_from_static_string (\"flatpak-file-path\");\n \n do\n"} {"commit":"81b2362d55425c893e9e1dc7fb3465e2d57a0c56","subject":"USART0: Automatically calculate the baud value","message":"USART0: Automatically calculate the baud value\n","repos":"DrMcCoy\/OpenM128-Lib,DrMcCoy\/OpenM128-Lib","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- openm128\/usart0.c\n+++ openm128\/usart0.c\n@@ -120,12 +120,20 @@\n \t\/\/ USART0 Receiver: On\n \t\/\/ USART0 Transmitter: On\n \t\/\/ USART0 Mode: Asynchronous\n-\t\/\/ USART0 Baud Rate: 9600\n \tUCSR0A = 0x00;\n \tUCSR0B = 0x98;\n \tUCSR0C = 0x06;\n-\tUBRR0H = 0x00;\n-\tUBRR0L = 0x2F;\n+\n+\t\/\/ USART0 Baud Rate: 9600\n+\t#define BAUD 9600\n+\t#include <util\/setbaud.h>\n+\t\tUBRR0H = UBRRH_VALUE;\n+\t\tUBRR0L = UBRRL_VALUE;\n+\t#if USE_2X\n+\t\tUCSR0A |= (1 << U2X0);\n+\t#else\n+\t\tUCSR0A &= ~(1 << U2X0);\n+\t#endif\n \n \tstdout = &uart0_stdout_stdin;\n \tstdin = &uart0_stdout_stdin;\n"} {"commit":"68f1ff3b4abed6056aa5591f4e28217db1e16588","subject":"stream_filter\/httplive.c: allow seeking for all segments.","message":"stream_filter\/httplive.c: allow seeking for all segments.\n\nSeeking was only implemented for segments already downloaded. Now seeking\nis also allowed for segments not downloaded.\n","repos":"krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,krichter722\/vlc,jomanmuk\/vlc-2.1,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/stream_filter\/httplive.c\n+++ modules\/stream_filter\/httplive.c\n@@ -92,6 +92,9 @@\n \/* *\/\n int current; \/* current hls_stream *\/\n int segment; \/* current segment for downloading *\/\n+ int seek; \/* segment requested by seek (default -1) *\/\n+ vlc_mutex_t lock_wait; \/* protect segment download counter *\/\n+ vlc_cond_t wait; \/* some condition to wait on *\/\n vlc_array_t *hls_stream;\/* bandwidth adaptation *\/\n \n stream_t *s;\n@@ -813,9 +816,6 @@\n vlc_mutex_unlock(&hls->lock);\n return VLC_EGENERIC;\n }\n-\n- \/* Determine next time to reload playlist *\/\n- p_sys->wakeup = p_sys->last + (hls->duration * 2 * (mtime_t)1000000);\n }\n \n \/* Stream size (approximate) *\/\n@@ -931,16 +931,32 @@\n \/* Is there a new segment to process? *\/\n if (segment == NULL)\n {\n+ if (!p_sys->b_live)\n+ {\n+ p_sys->last = mdate();\n+ p_sys->wakeup = p_sys->last + (2 * (mtime_t)1000000);\n+ }\n+ mwait(p_sys->wakeup);\n+\n+ \/* reset download segment to current playback segment *\/\n+ client->segment = p_sys->segment + 1;\n+ }\n+ else if (Download(client->s, hls, segment, &client->current) != VLC_SUCCESS)\n+ {\n if (!p_sys->b_live) break;\n- mwait(p_sys->wakeup);\n- }\n- else if (Download(client->s, hls, segment, &client->current) != VLC_SUCCESS)\n- {\n- if (!p_sys->b_live) break;\n }\n \n \/* download succeeded *\/\n- client->segment++;\n+ \/* determine next segment to download *\/\n+ vlc_mutex_lock(&client->lock_wait);\n+ if (client->seek >= 0)\n+ {\n+ client->segment = client->seek;\n+ client->seek = -1;\n+ }\n+ else client->segment++;\n+ vlc_cond_signal(&client->wait);\n+ vlc_mutex_unlock(&client->lock_wait);\n \n \/* FIXME: Reread the m3u8 index file *\/\n if (p_sys->b_live)\n@@ -1234,8 +1250,12 @@\n p_sys->thread->current = current;\n p_sys->current = current;\n p_sys->thread->segment = p_sys->segment;\n+ p_sys->thread->seek = -1;\n p_sys->segment = 0; \/* reset to first segment *\/\n p_sys->thread->s = s;\n+\n+ vlc_mutex_init(&p_sys->thread->lock_wait);\n+ vlc_cond_init(&p_sys->thread->wait);\n \n if (vlc_thread_create(p_sys->thread, \"HTTP Live Streaming client\",\n hls_Thread, VLC_THREAD_PRIORITY_INPUT))\n@@ -1265,8 +1285,15 @@\n \/* *\/\n if (p_sys->thread)\n {\n+ vlc_mutex_lock(&p_sys->thread->lock_wait);\n vlc_object_kill(p_sys->thread);\n+ vlc_cond_signal(&p_sys->thread->wait);\n+ vlc_mutex_unlock(&p_sys->thread->lock_wait);\n+\n+ \/* *\/\n vlc_thread_join(p_sys->thread);\n+ vlc_mutex_destroy(&p_sys->thread->lock_wait);\n+ vlc_cond_destroy(&p_sys->thread->wait);\n vlc_object_release(p_sys->thread);\n }\n \n@@ -1302,8 +1329,8 @@\n \/* This segment is ready? *\/\n if (segment->data != NULL)\n {\n- vlc_mutex_unlock(&hls->lock);\n- return segment;\n+ vlc_mutex_unlock(&hls->lock);\n+ return segment;\n }\n }\n vlc_mutex_unlock(&hls->lock);\n@@ -1327,9 +1354,13 @@\n break;\n }\n \n+ vlc_mutex_lock(&p_sys->thread->lock_wait);\n+ int i_segment = p_sys->thread->segment;\n+ vlc_mutex_unlock(&p_sys->thread->lock_wait);\n+\n \/* This segment is ready? *\/\n if ((segment->data != NULL) &&\n- (p_sys->segment < p_sys->thread->segment))\n+ (p_sys->segment < i_segment))\n {\n p_sys->current = i_stream;\n vlc_mutex_unlock(&hls->lock);\n@@ -1371,6 +1402,15 @@\n block_Release(segment->data);\n segment->data = NULL;\n }\n+ else\n+ { \/* reset playback pointer to start of buffer *\/\n+ uint64_t size = segment->size - segment->data->i_buffer;\n+ if (size > 0)\n+ {\n+ segment->data->i_buffer += size;\n+ segment->data->p_buffer -= size;\n+ }\n+ }\n p_sys->segment++;\n vlc_mutex_unlock(&segment->lock);\n continue;\n@@ -1470,7 +1510,8 @@\n {\n stream_sys_t *p_sys = s->p_sys;\n \n- if (p_sys->hls_stream == NULL)\n+ if ((p_sys->hls_stream == NULL) ||\n+ (p_sys->thread == NULL))\n return false;\n \n hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);\n@@ -1478,12 +1519,14 @@\n \n if (p_sys->b_live)\n {\n- vlc_mutex_lock(&hls->lock);\n- int count = vlc_array_count(hls->segments);\n- bool may_seek = (p_sys->thread == NULL) ? false :\n- (p_sys->thread->segment < count - 2);\n- vlc_mutex_unlock(&hls->lock);\n- return may_seek;\n+ vlc_mutex_lock(&hls->lock);\n+ int count = vlc_array_count(hls->segments);\n+ vlc_mutex_unlock(&hls->lock);\n+\n+ vlc_mutex_lock(&p_sys->thread->lock_wait);\n+ bool may_seek = (p_sys->thread->segment < (count - 2));\n+ vlc_mutex_unlock(&p_sys->thread->lock_wait);\n+ return may_seek;\n }\n return true;\n }\n@@ -1522,14 +1565,6 @@\n \n for (int n = 0; n < count; n++)\n {\n- \/* FIXME: Seeking in segments not dowloaded is not supported. *\/\n- if (n >= p_sys->thread->segment)\n- {\n- msg_Err(s, \"seeking in segment not downloaded yet.\");\n- vlc_mutex_unlock(&hls->lock);\n- return VLC_EGENERIC;\n- }\n-\n segment_t *segment = vlc_array_item_at_index(hls->segments, n);\n if (segment == NULL)\n {\n@@ -1578,6 +1613,27 @@\n }\n }\n vlc_mutex_unlock(&segment->lock);\n+\n+ \/* start download at current playback segment *\/\n+ if (p_sys->thread)\n+ {\n+ vlc_mutex_unlock(&hls->lock);\n+\n+ \/* Wait for download to be finished *\/\n+ vlc_mutex_lock(&p_sys->thread->lock_wait);\n+ p_sys->thread->seek = p_sys->segment;\n+ msg_Info(s, \"seek to segment %d\", p_sys->segment);\n+ while ((p_sys->thread->seek != -1) ||\n+ (p_sys->thread->segment - p_sys->segment < 3))\n+ {\n+ vlc_cond_wait(&p_sys->thread->wait, &p_sys->thread->lock_wait);\n+ if (!vlc_object_alive (s) ||\n+ s->b_error) break;\n+ }\n+ vlc_mutex_unlock(&p_sys->thread->lock_wait);\n+\n+ return VLC_SUCCESS;\n+ }\n }\n vlc_mutex_unlock(&hls->lock);\n \n"} {"commit":"811aa9246b831c183434a90a22a24c485eb3d1af","subject":"MSVC: help MSVC to get overload resolution right","message":"MSVC: help MSVC to get overload resolution right\n\nSigned-off-by: Matthias Kretz <372ea4eca737a13cd010ee806d4ce7b98ee71550@kde.org>\n","repos":"VcDevel\/Vc,chr-engwer\/Vc,VcDevel\/Vc,VcDevel\/Vc,chr-engwer\/Vc,chr-engwer\/Vc,VcDevel\/Vc","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- common\/loadinterface.h\n+++ common\/loadinterface.h\n@@ -52,13 +52,13 @@\n }\n \n template <typename U, typename Flags = DefaultLoadTag,\n- typename = enable_if<\n+ typename Enabled = enable_if<\n (!std::is_integral<U>::value || !std::is_integral<EntryType>::value ||\n sizeof(EntryType) >= sizeof(U)) &&\n std::is_arithmetic<U>::value &&Traits::is_load_store_flag<Flags>::value>>\n explicit Vc_INTRINSIC Vector(const U *x, Flags flags = Flags())\n {\n- load(x, flags);\n+ load<U, Flags, Enabled>(x, flags);\n }\n \n \/\/ load member functions{{{1\n@@ -83,10 +83,11 @@\n * A (combination of) flag object(s), such as Vc::Aligned, Vc::Streaming, Vc::Unaligned,\n * and\/or Vc::PrefetchDefault.\n *\/\n-template <typename Flags, typename = enable_if<Traits::is_load_store_flag<Flags>::value>>\n-Vc_INTRINSIC void load(const EntryType *mem, Flags flags)\n+template <typename Flags>\n+Vc_INTRINSIC enable_if<Traits::is_load_store_flag<Flags>::value, void>\n+load(const EntryType *mem, Flags flags)\n {\n- load<EntryType, Flags>(mem, flags);\n+ load<EntryType, Flags, enable_if_default_type>(mem, flags);\n }\n template <typename U, typename Flags = DefaultLoadTag,\n typename = enable_if<\n"} {"commit":"10c42e7f27e574b20d82c2bee992b66a14301696","subject":"stream_filter\/httplive.c: restore seeking","message":"stream_filter\/httplive.c: restore seeking\n\nHTTP Live Streaming client does not support fast seeking, since that\nwould mean getting all data from the server. It would slowdown playback\nof the stream until the end of the movie has been reached.\n","repos":"vlc-mirror\/vlc-2.1,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.1,xkfz007\/vlc,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,krichter722\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,vlc-mirror\/vlc-2.1,jomanmuk\/vlc-2.2,shyamalschandra\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,jomanmuk\/vlc-2.1,krichter722\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.1,vlc-mirror\/vlc-2.1,xkfz007\/vlc,krichter722\/vlc,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,xkfz007\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,vlc-mirror\/vlc-2.1,vlc-mirror\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/stream_filter\/httplive.c\n+++ modules\/stream_filter\/httplive.c\n@@ -2117,7 +2117,6 @@\n switch (i_query)\n {\n case STREAM_CAN_SEEK:\n- case STREAM_CAN_FASTSEEK:\n *(va_arg (args, bool *)) = hls_MaySeek(s);\n break;\n case STREAM_GET_POSITION:\n"} {"commit":"9cc6af385502109b03f69c282e935cbde4081756","subject":"httplive: Adjust conditions for playlist reloading","message":"httplive: Adjust conditions for playlist reloading\n\nCommit 7655d6c889d2425c1fd4615f7e2692df1a47470c changes HLS http\nplaylist reloading policy. But leaving only one fragment in buffer is\nnot enough. This patch ensures that less than three fragments in buffer\nleads to playlist reloading. The overal result is more reliable http\nstreams.\n\nSigned-off-by: Ilkka Ollakka <88b345e2e0969920adc1eaa21d1a29b223865bcf@videolan.org>\n","repos":"vlc-mirror\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,krichter722\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,vlc-mirror\/vlc,jomanmuk\/vlc-2.2,xkfz007\/vlc,krichter722\/vlc,shyamalschandra\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,xkfz007\/vlc,vlc-mirror\/vlc,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,krichter722\/vlc,xkfz007\/vlc,xkfz007\/vlc,jomanmuk\/vlc-2.2,jomanmuk\/vlc-2.2,vlc-mirror\/vlc,krichter722\/vlc,xkfz007\/vlc,vlc-mirror\/vlc,shyamalschandra\/vlc,jomanmuk\/vlc-2.2,krichter722\/vlc","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- modules\/stream_filter\/httplive.c\n+++ modules\/stream_filter\/httplive.c\n@@ -1718,8 +1718,8 @@\n mtime_t now = mdate();\n if (now >= p_sys->playlist.wakeup)\n {\n- \/* reload the m3u8 if there are less than 2 segments what aren't downloaded *\/\n- if ( ( p_sys->download.segment - p_sys->playback.segment < 2 ) &&\n+ \/* reload the m3u8 if there are less than 3 segments what aren't downloaded *\/\n+ if ( ( p_sys->download.segment - p_sys->playback.segment < 3 ) &&\n ( hls_ReloadPlaylist(s) != VLC_SUCCESS) )\n {\n \/* No change in playlist, then backoff *\/\n"} {"commit":"a47928d4b89d786d85c3e214c827dda64a5f2e40","subject":"critical fixes, overdone, but who cares, a localhost crash is bad","message":"critical fixes, overdone, but who cares, a localhost crash is bad\n","repos":"orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars,orumin\/openbsd-efivars","returncode":0,"stderr":"","license":"isc","lang":"C","diff":"--- dev\/pci\/brooktree848.c\n+++ dev\/pci\/brooktree848.c\n@@ -1,4 +1,4 @@\n-\/* $OpenBSD: brooktree848.c,v 1.11 1999\/08\/05 21:18:42 niklas Exp $ *\/\n+\/* $OpenBSD: brooktree848.c,v 1.12 1999\/10\/31 20:50:04 deraadt Exp $ *\/\n \/* $Roger: brooktree848.c,v 1.85 1999\/06\/12 14:54:54 roger Exp $ *\/\n \n \/* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.\n@@ -8448,11 +8448,15 @@\n \tint\t\tunit;\n \n \tunit = UNIT( minor(dev) );\n-\tif (unit >= NBKTR)\t\t\t\/* unit out of range *\/\n+\tif (unit >= NBKTR || unit > bktr_cd.cd_ndevs)\t\/* unit out of range *\/\n \t\treturn( ENXIO );\n \n+\tif (bktr_cd.cd_devs == NULL)\n+\t\treturn( ENXIO );\n+\n \tbktr = bktr_cd.cd_devs[unit];\n-\n+\tif (bktr == NULL)\n+\t\treturn ( ENXIO );\n \tif (!(bktr->flags & METEOR_INITALIZED)) \/* device not found *\/\n \t\treturn( ENXIO );\t\n \n"} {"commit":"0f40bd477e0cf31f4081985303a9d7969040087a","subject":"Fixed a problem where the array list wouldn't expand its heap correctly","message":"Fixed a problem where the array list wouldn't expand its heap correctly\n","repos":"ksmandersen\/CCollections,ksmandersen\/CCollections,ksmandersen\/CCollections,ksmandersen\/CCollections","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- src\/ccollections\/cc_array_list\/cc_array_list.c\n+++ src\/ccollections\/cc_array_list\/cc_array_list.c\n@@ -54,7 +54,7 @@\n \n void cc_array_list_expand_heap(cc_array_list *list) {\n list->heap_size *= 2;\n- list->heap = GC_REALLOC(list->heap, list->heap_size);\n+ list->heap = GC_REALLOC(list->heap, sizeof(cc_object *) * list->heap_size);\n }\n \n int cc_array_list_length(cc_array_list *list) {\n"} {"commit":"88a5b9839ed0a87c62f26ec9d2c7b34ed0cb87cd","subject":"Fixed bug in checkForValidVariableName (need < instead of >)","message":"Fixed bug in checkForValidVariableName (need < instead of >)\n","repos":"StHante\/readLua-for-Matlab-and-Octave,StHante\/readLua-for-Matlab-and-Octave","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- readLua.c\n+++ readLua.c\n@@ -75,10 +75,10 @@\n void checkForValidVariableName(const char* name) {\n mwSize i = 0;\n while (name[i] != '\\0') {\n- if ( ( ( 0x30 <= name[i] && name[i] >= 0x39 && i>0) \/* Numbers *\/\n+ if ( ( ( 0x30 <= name[i] && name[i] <= 0x39 && i>0) \/* Numbers *\/\n || ( name[i] == 0x5F && i>0) \/* Underscore *\/\n- || ( 0x41 <= name[i] && name[i] >= 0x5A ) \/* Capital letters *\/\n- || ( 0x61 <= name[i] && name[i] >= 0x7A ) \/* Small letters *\/\n+ || ( 0x41 <= name[i] && name[i] <= 0x5A ) \/* Capital letters *\/\n+ || ( 0x61 <= name[i] && name[i] <= 0x7A ) \/* Small letters *\/\n ) && (i <= mxMAXNAM) ) {\n i++;\n } else {\n"} {"commit":"3ee71740d773c6fd29ba761124a2e34c7d4b7bae","subject":"Fixed cm->m scaling","message":"Fixed cm->m scaling\n","repos":"degenerated1123\/ZenLib,degenerated1123\/ZenLib","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- zenload\/zCBspTree.h\n+++ zenload\/zCBspTree.h\n@@ -112,6 +112,9 @@\n \n parser.readStructure(n.bbox3dMin);\n parser.readStructure(n.bbox3dMax);\n+\n+ n.bbox3dMin *= 0.01f; \/\/ Convert to meters\n+ n.bbox3dMax *= 0.01f;\n \n \/\/ Read indices to the polys this contains\n n.treePolyIndex = static_cast<size_t>(parser.readBinaryDWord());\n@@ -139,6 +142,7 @@\n uint8_t flags = parser.readBinaryByte();\n \n parser.readStructure(n.plane);\n+ n.plane.w *= 0.01f; \/\/ Convert to meters\n \n \/\/ G1 has an extra byte here\n if(fileInfo.version == Gothic_18k)\n"} {"commit":"bf76eee718cd6d31791a5ba0281d2f63e16d2c3e","subject":"Removed unused code","message":"Removed unused code\n","repos":"dr-who\/stutools,dr-who\/stutools","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- iotests\/positions.c\n+++ iotests\/positions.c\n@@ -194,10 +194,10 @@\n CALLOC(poss, possAlloc, sizeof(positionType));\n \n const int alignbits = (int)(log(alignment)\/log(2) + 0.01);\n- if (1<<alignbits != alignment) {\n- fprintf(stderr,\"*error* alignment of %zd not suitable, changing to %d\\n\", alignment, 1<<alignbits);\n- alignment = 1<< alignbits;\n- }\/\/assert((1<<alignbits) == alignment);\n+ \/\/ if (1<<alignbits != alignment) {\n+ \/\/ fprintf(stderr,\"*error* alignment of %zd not suitable, changing to %d\\n\", alignment, 1<<alignbits);\n+ \/\/ alignment = 1<< alignbits;\n+ \/\/ }\/\/assert((1<<alignbits) == alignment);\n \n \/\/ setup the start positions for the parallel files\n \/\/ with a random starting position, -z sets to 0\n@@ -264,10 +264,12 @@\n \/\/ make a complete copy and rotate by an offset\n \n int offset = 0;\n- if (startingBlock == -99999) {\n- offset = (lrand48() % count);\n- } else {\n- offset = startingBlock % count;\n+ if (count) {\n+ if (startingBlock == -99999) {\n+ offset = (lrand48() % count);\n+ } else {\n+ offset = startingBlock % count;\n+ }\n }\n \n \/\/ rotate\n@@ -313,23 +315,18 @@\n }\n }\n \n- \/\/ setup R\/W\n- \/\/ positionType *p = positions;\n- size_t cl = 0;\n- if (cigar) cl = cigar_len(cigar);\n-\n-\n- \/\/ p left, thepos right\n- \/\/ size_t thepos = 0; \/\/ position\n-\n- \/\/ rotate\n+ \/\/ rotate\n for (size_t i = 0; i < *num; i++) {\n assert(positions[i].len >= 0);\n }\n \n \n- if (0) for (size_t j = 0; j < *num; j++) { \/\/ do the right number\n-\n+ if (0)\n+ for (size_t j = 0; j < *num; j++) { \/\/ do the right number\n+ size_t cl = 0;\n+ if (cigar) cl = cigar_len(cigar);\n+ \n+ \n for (size_t i = 0; i < *num; i++) {\n assert(positions[i].len >= 0);\n }\n"} {"commit":"e5cd07a7b39436b9e150bcaff7b06306ac2aecf5","subject":"BugFix: bitset_flip was broken","message":"BugFix: bitset_flip was broken\n\n[r8642]\n","repos":"davidgiven\/libfirm,8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,8l\/libfirm,MatzeB\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,8l\/libfirm,8l\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/adt\/bitset_std.h\n+++ ir\/adt\/bitset_std.h\n@@ -62,7 +62,7 @@\n * @param unit A pointer to the unit.\n * @param bit which bit to set.\n *\/\n-#define _bitset_inside_flip(unit_ptr,bit) (*unit_ptr) ^= ~(1 << (bit))\n+#define _bitset_inside_flip(unit_ptr,bit) (*unit_ptr) ^= (1 << (bit))\n \n \/**\n * Flip a whole unit.\n"} {"commit":"cec4e902b6cd4079d136cad03c7c7315e6a56db8","subject":"Minus cannot be transformed into 2 Negs :-(","message":"Minus cannot be transformed into 2 Negs :-(\n\n[r15729]\n","repos":"MatzeB\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm,libfirm\/libfirm,8l\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,8l\/libfirm,libfirm\/libfirm,jonashaag\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,davidgiven\/libfirm,8l\/libfirm,killbug2004\/libfirm,jonashaag\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/lower\/lower_dw.c\n+++ ir\/lower\/lower_dw.c\n@@ -1177,42 +1177,6 @@\n } \/* lower_Not *\/\n \n \/**\n- * Translate a Minus.\n- *\n- * Create two Minus'.\n- *\/\n-static void lower_Minus(ir_node *node, ir_mode *mode, lower_env_t *env) {\n-\tir_node *block, *irn;\n-\tir_node *op_l, *op_h;\n-\tdbg_info *dbg;\n-\tint idx;\n-\tir_graph *irg;\n-\tnode_entry_t *entry;\n-\n-\tirn = get_Minus_op(node);\n-\tentry = env->entries[get_irn_idx(irn)];\n-\tassert(entry);\n-\n-\tif (! entry->low_word) {\n-\t\t\/* not ready yet, wait *\/\n-\t\tpdeq_putr(env->waitq, node);\n-\t\treturn;\n-\t} \/* if *\/\n-\n-\top_l = entry->low_word;\n-\top_h = entry->high_word;\n-\n-\tdbg = get_irn_dbg_info(node);\n-\tblock = get_nodes_block(node);\n-\tirg = current_ir_graph;\n-\n-\tidx = get_irn_idx(node);\n-\tassert(idx < env->n_entries);\n-\tenv->entries[idx]->low_word = new_rd_Minus(dbg, current_ir_graph, block, op_l, mode);\n-\tenv->entries[idx]->high_word = new_rd_Minus(dbg, current_ir_graph, block, op_h, mode);\n-} \/* lower_Minus *\/\n-\n-\/**\n * Translate a Cond.\n *\/\n static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {\n@@ -2442,11 +2406,11 @@\n \tLOWER(Shr);\n \tLOWER(Shrs);\n \tLOWER(Rot);\n-\tLOWER(Minus);\n \tLOWER(DivMod);\n \tLOWER(Div);\n \tLOWER(Mod);\n \tLOWER_UN(Abs);\n+\tLOWER_UN(Minus);\n \n \tLOWER(Conv);\n \n"} {"commit":"f1f8be984a8164827df0d3e864a8df7e205ff4a8","subject":"Fix warnings.","message":"Fix warnings.\n\n\ngit-svn-id: 4705079bc6b8aadf675e3696f5c015a6aa4916e3@1016 3c1deb5b-d424-0410-962d-aba41a686d42\n","repos":"OpenCMISS\/zinc,OpenCMISS\/zinc,OpenCMISS\/zinc,hsorby\/zinc,hsorby\/zinc,OpenCMISS\/zinc,hsorby\/zinc,hsorby\/zinc","returncode":0,"stderr":"","license":"mpl-2.0","lang":"C","diff":"--- source\/graphics\/spectrum_settings.c\n+++ source\/graphics\/spectrum_settings.c\n@@ -66,7 +66,7 @@\n \n #if defined (GL_EXT_texture_object)\n \t\/* Texture number for banded and step spectrums *\/\n-\tint texture_id;\n+\tunsigned int texture_id;\n #endif \/* defined (GL_EXT_texture_object) *\/\n \t \n \t\/* For accessing objects *\/\n"} {"commit":"4821be345a74faadac42e975ec21d2163f4b51ac","subject":"remove Cast node","message":"remove Cast node\n\n[r16148]\n","repos":"8l\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,8l\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,jonashaag\/libfirm,killbug2004\/libfirm,MatzeB\/libfirm,jonashaag\/libfirm,8l\/libfirm,davidgiven\/libfirm,8l\/libfirm,8l\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,libfirm\/libfirm,davidgiven\/libfirm,MatzeB\/libfirm,MatzeB\/libfirm,davidgiven\/libfirm,libfirm\/libfirm,killbug2004\/libfirm,killbug2004\/libfirm,8l\/libfirm,jonashaag\/libfirm,8l\/libfirm,libfirm\/libfirm,MatzeB\/libfirm,killbug2004\/libfirm,davidgiven\/libfirm,killbug2004\/libfirm","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- ir\/lower\/lower_hl.c\n+++ ir\/lower\/lower_hl.c\n@@ -540,6 +540,9 @@\n \t\tif (env != NULL && get_Store_align(irn) == align_non_aligned)\n \t\t\tlower_unaligned_Store(irn);\n \t\tbreak;\n+\tcase iro_Cast:\n+\t\texchange(irn, get_Cast_op(irn));\n+\t\tbreak;\n \tdefault:\n \t\tbreak;\n \t}\n@@ -585,7 +588,7 @@\n \t\t\/* First step: lower bitfield access: must be run as long as Sels still exists. *\/\n \t\tirg_walk_graph(irg, NULL, lower_bf_access, NULL);\n \n-\t\t\/* Finally: lower SymConst-Size and Sel nodes, unaligned Load\/Stores. *\/\n+\t\t\/* Finally: lower SymConst-Size and Sel nodes, Casts, unaligned Load\/Stores. *\/\n \t\tirg_walk_graph(irg, NULL, lower_irnode, NULL);\n \n \t\tset_irg_phase_low(irg);\n"} {"commit":"e22b67a93880b9df3eb988b96adc6d649a03c87c","subject":"fixed percision issue","message":"fixed percision issue\n\ngit-svn-id: 217dca3779fc929ba7247163697ec4b90342ea8d@66 2fb5fb43-31c4-4d57-82c2-18ac32159141\n","repos":"arnaudsj\/dbslayer,arnaudsj\/dbslayer,arnaudsj\/dbslayer,arnaudsj\/dbslayer,arnaudsj\/dbslayer","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- common\/serializejson.c\n+++ common\/serializejson.c\n@@ -75,7 +75,7 @@\n \t\treturn apr_brigade_printf(bbrigade,NULL,NULL,\"%ld\",json->value.lnumber);\n \t} else { \n \t\tchar *buf = apr_palloc(mpool,sizeof(char)*512);\n-\t\tsnprintf(buf,512,\"%g\",json->value.dnumber);\t\n+\t\tsnprintf(buf,512,\"%.16g\",json->value.dnumber);\t\n \t\t\/\/apr %g doesn't prepend leading 0 for values less than 1 - violates json parsers\n \t\treturn apr_brigade_printf(bbrigade,NULL,NULL,buf);\n \t}\n"} {"commit":"77ca30858f3e84384f26d4d61f95a2943eadcd07","subject":"isl_schedule_node_graft_before_or_after: improve error handling","message":"isl_schedule_node_graft_before_or_after: improve error handling\n\nSigned-off-by: Sven Verdoolaege <235c10dd23b819f81cdc9756a251746bc184cab6@gmail.com>\n","repos":"Meinersbur\/isl,PollyLabs\/isl,nicolasvasilache\/isl,Meinersbur\/isl,PollyLabs\/isl,Meinersbur\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,nicolasvasilache\/isl,nicolasvasilache\/isl,inducer\/isl-mirror,PollyLabs\/isl,inducer\/isl-mirror,PollyLabs\/isl,inducer\/isl-mirror,Meinersbur\/isl,inducer\/isl-mirror,PollyLabs\/isl,nicolasvasilache\/isl","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- isl_schedule_node.c\n+++ isl_schedule_node.c\n@@ -4288,6 +4288,8 @@\n \tif (isl_schedule_node_get_type(graft) == isl_schedule_node_domain)\n \t\tgraft = extension_from_domain(graft, node);\n \n+\tif (!graft)\n+\t\tgoto error;\n \tif (isl_schedule_node_get_type(graft) != isl_schedule_node_extension)\n \t\tisl_die(isl_schedule_node_get_ctx(node), isl_error_invalid,\n \t\t\t\"expecting domain or extension as root of graft\",\n"} {"commit":"ae14f57320520558dcd36947b7cfd5af3aa2c979","subject":"BUG(1443): Fixed a memory corruption bug.","message":"BUG(1443): Fixed a memory corruption bug.\n\nWe passed a Playlist object to TO_XMMS_CLIENT_RESULT(), which expects\na Client object. I pondered putting a rb_obj_is_kind_of() in there,\nbut that's probably too expensive.\n","repos":"theeternalsw0rd\/xmms2,six600110\/xmms2,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,oneman\/xmms2-oneman,six600110\/xmms2,oneman\/xmms2-oneman,xmms2\/xmms2-stable,krad-radio\/xmms2-krad,six600110\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,theefer\/xmms2,theefer\/xmms2,theefer\/xmms2,xmms2\/xmms2-stable,dreamerc\/xmms2,chrippa\/xmms2,oneman\/xmms2-oneman,oneman\/xmms2-oneman-old,oneman\/xmms2-oneman,dreamerc\/xmms2,krad-radio\/xmms2-krad,mantaraya36\/xmms2-mantaraya36,six600110\/xmms2,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,oneman\/xmms2-oneman,mantaraya36\/xmms2-mantaraya36,dreamerc\/xmms2,theeternalsw0rd\/xmms2,six600110\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,krad-radio\/xmms2-krad,oneman\/xmms2-oneman-old,theefer\/xmms2,six600110\/xmms2,theefer\/xmms2,mantaraya36\/xmms2-mantaraya36,krad-radio\/xmms2-krad,chrippa\/xmms2,theeternalsw0rd\/xmms2,theeternalsw0rd\/xmms2,oneman\/xmms2-oneman-old,chrippa\/xmms2,oneman\/xmms2-oneman-old,dreamerc\/xmms2,chrippa\/xmms2,dreamerc\/xmms2,chrippa\/xmms2,krad-radio\/xmms2-krad,chrippa\/xmms2,xmms2\/xmms2-stable,theeternalsw0rd\/xmms2,mantaraya36\/xmms2-mantaraya36,xmms2\/xmms2-stable,theefer\/xmms2,oneman\/xmms2-oneman","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- src\/clients\/lib\/ruby\/rb_playlist.c\n+++ src\/clients\/lib\/ruby\/rb_playlist.c\n@@ -37,7 +37,7 @@\n \tCHECK_DELETED (xmms);\n \n #define PLAYLIST_METHOD_HANDLER_FOOTER \\\n-\treturn TO_XMMS_CLIENT_RESULT (self, res);\n+\treturn TO_XMMS_CLIENT_RESULT (pl->xmms, res);\n \n #define PLAYLIST_METHOD_ADD_HANDLER(action) \\\n \tPLAYLIST_METHOD_HANDLER_HEADER \\\n"} {"commit":"035791beb93e13bd5f2f59b07ca7b18b0f7af2cc","subject":"namespace problem","message":"namespace problem\n","repos":"Qters\/QrChaos","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- source\/include\/qrchaosapplication.h\n+++ source\/include\/qrchaosapplication.h\n@@ -9,16 +9,17 @@\n \n #include \"qrchaosbase_global.h\"\n \n-#if defined(QrChaosApp)\n-#undef QrChaosApp\n-#endif\n-#define QrChaosApp (static_cast<QrChaosApplication *>(QCoreApplication::instance()))\n-\n NS_QRFRAME_BEGIN\n class QrFramerConfig;\n NS_QRFRAME_END\n \n NS_CHAOS_BASE_BEGIN\n+class QrChaosApplication;\n+\n+#if defined(QrChaosApp)\n+#undef QrChaosApp\n+#endif\n+#define QrChaosApp (static_cast<QrChaosApplication *>(QCoreApplication::instance()))\n \n class QrChaosApplicationPrivate;\n class CHAOSBASE_SHAREDEXPORT QrChaosApplication : public QApplication\n@@ -32,7 +33,7 @@\n virtual ~QrChaosApplication();\n \n Q_SIGNALS:\n- void sig_workspaceChange();\n+ void sig_workspaceChange(int index);\n \n public:\n virtual bool init(const QrFramerConfig& config);\n"} {"commit":"5c10a5ad555d834dac4785d8cd2feac18da9b67b","subject":"remove virtual","message":"remove virtual\n","repos":"Canpio\/Paddle,jacquesqiao\/Paddle,luotao1\/Paddle,lispc\/Paddle,Canpio\/Paddle,jacquesqiao\/Paddle,hedaoyuan\/Paddle,pkuyym\/Paddle,baidu\/Paddle,putcn\/Paddle,hedaoyuan\/Paddle,yu239\/Paddle,tensor-tang\/Paddle,lcy-seso\/Paddle,Canpio\/Paddle,Canpio\/Paddle,putcn\/Paddle,chengduoZH\/Paddle,baidu\/Paddle,Canpio\/Paddle,lispc\/Paddle,pkuyym\/Paddle,pengli09\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,luotao1\/Paddle,tensor-tang\/Paddle,tensor-tang\/Paddle,pengli09\/Paddle,lispc\/Paddle,reyoung\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,Canpio\/Paddle,tensor-tang\/Paddle,yu239\/Paddle,PaddlePaddle\/Paddle,pkuyym\/Paddle,pkuyym\/Paddle,PaddlePaddle\/Paddle,reyoung\/Paddle,jacquesqiao\/Paddle,QiJune\/Paddle,hedaoyuan\/Paddle,jacquesqiao\/Paddle,pengli09\/Paddle,yu239\/Paddle,baidu\/Paddle,yu239\/Paddle,putcn\/Paddle,chengduoZH\/Paddle,PaddlePaddle\/Paddle,luotao1\/Paddle,Canpio\/Paddle,chengduoZH\/Paddle,reyoung\/Paddle,pengli09\/Paddle,lispc\/Paddle,pkuyym\/Paddle,pkuyym\/Paddle,lcy-seso\/Paddle,reyoung\/Paddle,lcy-seso\/Paddle,lcy-seso\/Paddle,reyoung\/Paddle,hedaoyuan\/Paddle,yu239\/Paddle,QiJune\/Paddle,tensor-tang\/Paddle,pengli09\/Paddle,pengli09\/Paddle,chengduoZH\/Paddle,hedaoyuan\/Paddle,putcn\/Paddle,PaddlePaddle\/Paddle,yu239\/Paddle,PaddlePaddle\/Paddle,QiJune\/Paddle,pengli09\/Paddle,luotao1\/Paddle,hedaoyuan\/Paddle,lispc\/Paddle,pengli09\/Paddle,QiJune\/Paddle,putcn\/Paddle,yu239\/Paddle,chengduoZH\/Paddle,hedaoyuan\/Paddle,QiJune\/Paddle,lispc\/Paddle,jacquesqiao\/Paddle,baidu\/Paddle,lcy-seso\/Paddle,luotao1\/Paddle,jacquesqiao\/Paddle,putcn\/Paddle,lispc\/Paddle,hedaoyuan\/Paddle,baidu\/Paddle,reyoung\/Paddle,lispc\/Paddle,lcy-seso\/Paddle,Canpio\/Paddle,QiJune\/Paddle,yu239\/Paddle","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- paddle\/framework\/net.h\n+++ paddle\/framework\/net.h\n@@ -91,8 +91,6 @@\n * @brief Create a network.\n *\/\n static std::unique_ptr<Net> Create(const NetDesc &def = NetDesc());\n-\n- virtual ~Net() = 0;\n };\n \n \/**\n@@ -142,8 +140,6 @@\n *\/\n virtual void AddBackwardOps() override;\n \n- virtual ~PlainNet() override {}\n-\n protected:\n \/**\n * @brief Build the network.\n"} {"commit":"1f295f251adda24e594bd7ba19553e5f2aac5601","subject":"Coding style fixes","message":"Coding style fixes\n","repos":"Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-glib\/dbus.c\n+++ telepathy-glib\/dbus.c\n@@ -1367,7 +1367,7 @@\n * Returns: a newly created #GHashTable, free with g_hash_table_destroy().\n *\/\n GHashTable *\n-tp_asv_new (const char *first_key, ...)\n+tp_asv_new (const gchar *first_key, ...)\n {\n va_list var_args;\n char *key;\n@@ -1377,7 +1377,7 @@\n \n \/* create a GHashTable *\/\n GHashTable *asv = g_hash_table_new_full (g_str_hash, g_str_equal,\n- NULL, (GDestroyNotify) tp_g_value_slice_free);\n+ NULL, (GDestroyNotify) tp_g_value_slice_free);\n \n va_start (var_args, first_key);\n \n@@ -1388,7 +1388,7 @@\n value = tp_g_value_slice_new (type);\n G_VALUE_COLLECT (value, var_args, 0, &error);\n \n- if (error)\n+ if (error != NULL)\n {\n g_critical (\"key %s: %s\", key, error);\n g_free (error);\n"} {"commit":"7c3c2066999eb2741f2880fa5120365d95ddb956","subject":"Explicitly annotate asv helper functions' out parameters as such.","message":"Explicitly annotate asv helper functions' out parameters as such.\n\ngobject-introspection < 0.9.5 automatically detected these, but >= 0.9.5 is\nmore strict.\n","repos":"Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib,Distrotech\/telepathy-glib","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- telepathy-glib\/dbus.c\n+++ telepathy-glib\/dbus.c\n@@ -790,7 +790,7 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location to store %TRUE if the key actually\n+ * @valid: (out): Either %NULL, or a location to store %TRUE if the key actually\n * exists and has a boolean value\n *\n * If a value for @key in @asv is present and boolean, return it,\n@@ -1058,8 +1058,8 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location in which to store %TRUE on success or\n- * %FALSE on failure\n+ * @valid: (out): Either %NULL, or a location in which to store %TRUE on success\n+ * or %FALSE on failure\n *\n * If a value for @key in @asv is present, has an integer type used by\n * dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the\n@@ -1171,8 +1171,8 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location in which to store %TRUE on success or\n- * %FALSE on failure\n+ * @valid: (out): Either %NULL, or a location in which to store %TRUE on success\n+ * or %FALSE on failure\n *\n * If a value for @key in @asv is present, has an integer type used by\n * dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the\n@@ -1284,8 +1284,8 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location in which to store %TRUE on success or\n- * %FALSE on failure\n+ * @valid: (out): Either %NULL, or a location in which to store %TRUE on success\n+ * or %FALSE on failure\n *\n * If a value for @key in @asv is present, has an integer type used by\n * dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the\n@@ -1386,8 +1386,8 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location in which to store %TRUE on success or\n- * %FALSE on failure\n+ * @valid: (out): Either %NULL, or a location in which to store %TRUE on success\n+ * or %FALSE on failure\n *\n * If a value for @key in @asv is present, has an integer type used by\n * dbus-glib (guchar, gint, guint, gint64 or guint64) and is non-negative,\n@@ -1492,8 +1492,8 @@\n * @asv: (element-type utf8 GObject.Value): A GHashTable where the keys are\n * strings and the values are GValues\n * @key: The key to look up\n- * @valid: Either %NULL, or a location in which to store %TRUE on success or\n- * %FALSE on failure\n+ * @valid: (out): Either %NULL, or a location in which to store %TRUE on success\n+ * or %FALSE on failure\n *\n * If a value for @key in @asv is present and has any numeric type used by\n * dbus-glib (guchar, gint, guint, gint64, guint64 or gdouble),\n"} {"commit":"89b4c783db59ef89fc45c18cd87d334bce1d99ab","subject":"Remove the override","message":"Remove the override\n","repos":"elnormous\/ouzel,elnormous\/ouzel,Hotspotmar\/ouzel,elnormous\/ouzel,elvman\/ouzel,elvman\/ouzel,Hotspotmar\/ouzel,Hotspotmar\/ouzel","returncode":0,"stderr":"","license":"unlicense","lang":"C","diff":"--- ouzel\/audio\/opensl\/SoundResourceSL.h\n+++ ouzel\/audio\/opensl\/SoundResourceSL.h\n@@ -27,7 +27,7 @@\n void enqueue(SLAndroidSimpleBufferQueueItf bufferQueue);\n \n protected:\n- virtual bool update() override;\n+ virtual bool update();\n \n uint32_t channels = 0;\n SLObjectItf playerObject = nullptr;\n"} {"commit":"6780445a85a4d0fa6a6c118fb2d0b85db14afe85","subject":"framebuffer cache: make faster framebuffer access","message":"framebuffer cache: make faster framebuffer access\n","repos":"kurt-vd\/ppmtofb,kurt-vd\/ppmtofb","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- ppmtofb.c\n+++ ppmtofb.c\n@@ -206,6 +206,8 @@\n \tcolormap_data[3],\n };\n static uint8_t *video;\n+static uint8_t *videocache;\n+static size_t videolen;\n \/* cached framebuffer bytes per pixel *\/\n static int fbbypp;\n \n@@ -268,33 +270,47 @@\n \treturn 0;\n }\n \n-static uint8_t *getvideomemory(int fd, int wr)\n-{\n-\tsize_t len, offset;\n-\tuint8_t *mem;\n+static void getvideomemory(int fd, int wr)\n+{\n+\tsize_t offset;\n \t\n \n \toffset = fix_info.line_length * var_info.yoffset;\n-\tlen = fix_info.line_length * var_info.yres;\n+\tvideolen = fix_info.line_length * var_info.yres;\n \tif (verbose)\n-\t\terror(0, 0, \"mapping video memory +%uKB\", len\/1024); \n-\tmem = mmap(NULL, len, wr ? PROT_WRITE : PROT_READ, MAP_SHARED, fd, offset);\n-\n-\tif (mem == MAP_FAILED)\n+\t\terror(0, 0, \"mapping video memory +%uKB\", videolen\/1024); \n+\tvideo = mmap(NULL, videolen, wr ? PROT_WRITE : PROT_READ, MAP_SHARED, fd, offset);\n+\n+\tif (video == MAP_FAILED)\n \t\terror(1, errno, \"mmap failed\");\n-\tvideo = mem;\n-\treturn mem;\n-}\n-\n-static void putvideomemory(void)\n-{\n-\tmunmap(video, fix_info.line_length*var_info.yres);\n+\n+\t\/* malloc cache, for faster dump *\/\n+#ifdef NOCACHE\n+\tvideocache = video;\n+#else\n+\tvideocache = malloc(videolen);\n+\tif (wr)\n+\t\tmemset(videocache, 0, videolen);\n+\telse\n+\t\tmemcpy(videocache, video, videolen);\n+#endif\n+}\n+\n+static void putvideomemory(int wr)\n+{\n+#ifdef NOCACHE\n+#else\n+\tif (wr)\n+\t\tmemcpy(videocache, video, videolen);\n+\tfree(videocache);\n+#endif\n+\tmunmap(video, videolen);\n }\n \n \/* FRAMEBUFFER *\/\n static inline uint8_t *getfbpos(int x, int y)\n {\n-\treturn video + (y+var_info.yoffset)*fix_info.line_length + (x+var_info.xoffset)*fbbypp;\n+\treturn videocache + (y+var_info.yoffset)*fix_info.line_length + (x+var_info.xoffset)*fbbypp;\n }\n \n static inline uint8_t getfbcolor(uint32_t pixel, const struct fb_bitfield *bitfield, const uint16_t *colormap)\n@@ -462,7 +478,7 @@\n \t\t\tif (imgw > var_info.xres)\n \t\t\t\td8 += (imgw - var_info.xres)*ppmbypp;\n \t\t}\n-\t\tputvideomemory();\n+\t\tputvideomemory(1);\n \t\tfree(dat);\n \t} else if (getfbinfo(STDIN_FILENO) == 0) {\n \t\t\/* copy fb to ppm *\/\n@@ -482,7 +498,7 @@\n \t\t\tfor (c = 0; c < w; ++c)\n \t\t\t\tputppmpixel(getfbpixel(c, r));\n \t\t}\n-\t\tputvideomemory();\n+\t\tputvideomemory(0);\n \t} else {\n \t\terror(1, errno, \"no framebuffer on stdin or stdout?\");\n \t}\n"} {"commit":"ba83226c247f77d8d4ddc9b3685c138f40f1fae3","subject":"New feature in Irrlicht 3D view: press F8 and you get a file dump.json that contains the JSON serialization of the entire system","message":"New feature in Irrlicht 3D view: press F8 and you get a file dump.json that contains the JSON serialization of the entire system\n","repos":"amelmquist\/chrono,Bryan-Peterson\/chrono,Bryan-Peterson\/chrono,dariomangoni\/chrono,armanpazouki\/chrono,jcmadsen\/chrono,tjolsen\/chrono,andrewseidl\/chrono,andrewseidl\/chrono,jcmadsen\/chrono,jcmadsen\/chrono,PedroTrujilloV\/chrono,PedroTrujilloV\/chrono,Milad-Rakhsha\/chrono,amelmquist\/chrono,PedroTrujilloV\/chrono,projectchrono\/chrono,projectchrono\/chrono,projectchrono\/chrono,rserban\/chrono,tjolsen\/chrono,armanpazouki\/chrono,projectchrono\/chrono,hsu\/chrono,amelmquist\/chrono,PedroTrujilloV\/chrono,armanpazouki\/chrono,Bryan-Peterson\/chrono,amelmquist\/chrono,rserban\/chrono,Bryan-Peterson\/chrono,armanpazouki\/chrono,PedroTrujilloV\/chrono,tjolsen\/chrono,dariomangoni\/chrono,rserban\/chrono,Milad-Rakhsha\/chrono,tjolsen\/chrono,Milad-Rakhsha\/chrono,Milad-Rakhsha\/chrono,amelmquist\/chrono,hsu\/chrono,jcmadsen\/chrono,hsu\/chrono,projectchrono\/chrono,Milad-Rakhsha\/chrono,rserban\/chrono,andrewseidl\/chrono,amelmquist\/chrono,dariomangoni\/chrono,Bryan-Peterson\/chrono,andrewseidl\/chrono,armanpazouki\/chrono,hsu\/chrono,rserban\/chrono,hsu\/chrono,rserban\/chrono,dariomangoni\/chrono,projectchrono\/chrono,armanpazouki\/chrono,jcmadsen\/chrono,jcmadsen\/chrono,jcmadsen\/chrono,rserban\/chrono,dariomangoni\/chrono,Milad-Rakhsha\/chrono,andrewseidl\/chrono,tjolsen\/chrono,dariomangoni\/chrono","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"C","diff":"--- src\/collision\/ChCCollisionSystem.h\n+++ src\/collision\/ChCCollisionSystem.h\n@@ -84,6 +84,10 @@\n \/\/\/\n \n class ChApi ChCollisionSystem {\n+\n+ \/\/ Chrono RTTI, needed for serialization\n+ CH_RTTI_ROOT(ChCollisionSystem);\n+\n public:\n ChCollisionSystem(unsigned int max_objects = 16000, double scene_size = 500) {\n narrow_callback = 0;\n"} {"commit":"6c8b2be1ddd131c11b6617a1f8ce059c50dd5292","subject":"preproc: make \"StackPointer\" a const char *","message":"preproc: make \"StackPointer\" a const char *\n\nThe less non-const the better...\n\nSigned-off-by: H. Peter Anvin <8a453bad9912ffe59bc0f0b8abe03df9be19379e@linux.intel.com>\n","repos":"techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm,techkey\/nasm","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- preproc.c\n+++ preproc.c\n@@ -389,7 +389,7 @@\n };\n \n static int StackSize = 4;\n-static char *StackPointer = \"ebp\";\n+static const char *StackPointer = \"ebp\";\n static int ArgOffset = 8;\n static int LocalOffset = 0;\n \n"} {"commit":"b29187147c8beb15d118a9f3c252fe8699474f49","subject":"Immediately return in pop_numa. No functional changes.","message":"Immediately return in pop_numa. No functional changes.\n","repos":"anamud\/mir-dev,anamud\/mir-dev,anamud\/mir-dev,anamud\/mir-dev,anamud\/mir-dev","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- src\/scheduling\/mir_sched_pol_numa.c\n+++ src\/scheduling\/mir_sched_pol_numa.c\n@@ -209,14 +209,11 @@\n __sync_fetch_and_sub(&g_num_tasks_waiting, 1);\n T_DBG(\"Dq\", *task);\n \n- found = 1;\n+ return 1;\n }\n }\n \n \/\/MIR_RECORDER_STATE_END(NULL, 0);\n-\n- if (found)\n- return found;\n \n \/\/ Pop from own node queue\n \/\/MIR_RECORDER_STATE_BEGIN(MIR_STATE_TPOP);\n@@ -240,14 +237,11 @@\n __sync_fetch_and_sub(&g_num_tasks_waiting, 1);\n T_DBG(\"Dq\", *task);\n \n- found = 1;\n+ return 1;\n }\n }\n \n \/\/MIR_RECORDER_STATE_END(NULL, 0);\n-\n- if (found)\n- return found;\n \n \/\/ Next try to pop from other queues\n \/\/ First check in alt queues\n"} {"commit":"93127767187bcc125d3da15151b536593bf81eb9","subject":"EmailAddress: do not construct valid if there is no local part","message":"EmailAddress: do not construct valid if there is no local part\n","repos":"Buschtrommel\/Skaffari,Huessenbergnetz\/Skaffari,Huessenbergnetz\/Skaffari,Huessenbergnetz\/Skaffari,Buschtrommel\/Skaffari,Buschtrommel\/Skaffari,Huessenbergnetz\/Skaffari,Huessenbergnetz\/Skaffari,Buschtrommel\/Skaffari,Buschtrommel\/Skaffari,Huessenbergnetz\/Skaffari","returncode":0,"stderr":"","license":"agpl-3.0","lang":"C","diff":"--- src\/objects\/emailaddress_p.h\n+++ src\/objects\/emailaddress_p.h\n@@ -44,7 +44,7 @@\n aceId(_aceId)\n {\n const int atIdx = _name.lastIndexOf(QLatin1Char('@'));\n- if (atIdx > -1) {\n+ if (atIdx > 0) {\n local = _name.left(atIdx);\n domain = _name.mid(atIdx + 1);\n }\n"} {"commit":"a2a10336075fbba65b853fb7e656e87dc9289c40","subject":"XPL-126 Missing forward declaration added.","message":"XPL-126 Missing forward declaration added.\n\n\ngit-svn-id: f26ccc5efe72c2bd8e1c40f599fe313f2692e4de@4966 a612230a-c5fa-0310-af8b-88eea846685b\n","repos":"sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror,sipXtapi\/sipXtapi-svn-mirror","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- sipXportLib\/include\/os\/OsConfigDb.h\n+++ sipXportLib\/include\/os\/OsConfigDb.h\n@@ -27,6 +27,7 @@\n \/\/ TYPEDEFS\n \/\/ FORWARD DECLARATIONS\n class OsConfigEncryption;\n+class UtlSList;\n \n \/**\n * Class for holding a name\/value pair.\n"} {"commit":"679a0b395fc80959200eb82dbf4c7fedcd8b9b8f","subject":"Bluetooth: GATT: Allow Characterist to be used with bt_gatt_indicate","message":"Bluetooth: GATT: Allow Characterist to be used with bt_gatt_indicate\n\nSince BT_GATT_CHARACTERISTIC now expands to 2 attributes it may be\nconfusing to use bt_gatt_indicate as that expects the Value attribute to\nbe given which is no longer visible, so this enables the user to use\nthe Characteristic attribute in addition to its value.\n\nFixes #8231\n\nSigned-off-by: Luiz Augusto von Dentz <8530c5ea66a1bdbc08f98bfcf183c8be901b5990@intel.com>\n","repos":"Vudentz\/zephyr,finikorg\/zephyr,zephyrproject-rtos\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,zephyrproject-rtos\/zephyr,kraj\/zephyr,explora26\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,finikorg\/zephyr,ldts\/zephyr,finikorg\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,galak\/zephyr,kraj\/zephyr,mbolivar\/zephyr,explora26\/zephyr,punitvara\/zephyr,ldts\/zephyr,nashif\/zephyr,ldts\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,punitvara\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,explora26\/zephyr,ldts\/zephyr,galak\/zephyr,mbolivar\/zephyr,zephyriot\/zephyr,explora26\/zephyr,galak\/zephyr,nashif\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,kraj\/zephyr,Vudentz\/zephyr,mbolivar\/zephyr,zephyriot\/zephyr,nashif\/zephyr,nashif\/zephyr,galak\/zephyr,zephyriot\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,mbolivar\/zephyr,galak\/zephyr,Vudentz\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,zephyriot\/zephyr,finikorg\/zephyr,Vudentz\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,zephyriot\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/bluetooth\/host\/gatt.c\n+++ subsys\/bluetooth\/host\/gatt.c\n@@ -685,6 +685,18 @@\n {\n \tstruct net_buf *buf;\n \tstruct bt_att_indicate *ind;\n+\tu16_t value_handle = params->attr->handle;\n+\n+\t\/* Check if attribute is a characteristic then adjust the handle *\/\n+\tif (!bt_uuid_cmp(params->attr->uuid, BT_UUID_GATT_CHRC)) {\n+\t\tstruct bt_gatt_chrc *chrc = params->attr->user_data;\n+\n+\t\tif (!(chrc->properties & BT_GATT_CHRC_INDICATE)) {\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tvalue_handle += 1;\n+\t}\n \n \tbuf = bt_att_create_pdu(conn, BT_ATT_OP_INDICATE,\n \t\t\t\tsizeof(*ind) + params->len);\n@@ -693,10 +705,10 @@\n \t\treturn -ENOMEM;\n \t}\n \n-\tBT_DBG(\"conn %p handle 0x%04x\", conn, params->attr->handle);\n+\tBT_DBG(\"conn %p handle 0x%04x\", conn, value_handle);\n \n \tind = net_buf_add(buf, sizeof(*ind));\n-\tind->handle = sys_cpu_to_le16(params->attr->handle);\n+\tind->handle = sys_cpu_to_le16(value_handle);\n \n \tnet_buf_add(buf, params->len);\n \tmemcpy(ind->value, params->data, params->len);\n"} {"commit":"1789a9356b6486fa81d1af2a31ef7ffbac64e2da","subject":"net: app: Honor MTU when sending TLS\/DTLS data","message":"net: app: Honor MTU when sending TLS\/DTLS data\n\nMake sure we send all the data that is needed to be sent and in\nproper MTU size chunks.\n\nSigned-off-by: Jukka Rissanen <f9f077d1da4c7aa947f9864fa5a28c3588f6a45d@linux.intel.com>\n","repos":"aceofall\/zephyr-iotos,Vudentz\/zephyr,Vudentz\/zephyr,nashif\/zephyr,nashif\/zephyr,zephyrproject-rtos\/zephyr,punitvara\/zephyr,ldts\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,Vudentz\/zephyr,aceofall\/zephyr-iotos,nashif\/zephyr,galak\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,nashif\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,ldts\/zephyr,Vudentz\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,kraj\/zephyr,ldts\/zephyr,GiulianoFranchetto\/zephyr,punitvara\/zephyr,mbolivar\/zephyr,mbolivar\/zephyr,ldts\/zephyr,Vudentz\/zephyr,kraj\/zephyr,galak\/zephyr,finikorg\/zephyr,kraj\/zephyr,explora26\/zephyr,explora26\/zephyr,punitvara\/zephyr,zephyriot\/zephyr,explora26\/zephyr,zephyrproject-rtos\/zephyr,aceofall\/zephyr-iotos,mbolivar\/zephyr,galak\/zephyr,mbolivar\/zephyr,kraj\/zephyr,finikorg\/zephyr,aceofall\/zephyr-iotos,explora26\/zephyr,nashif\/zephyr,zephyriot\/zephyr,punitvara\/zephyr,zephyriot\/zephyr,zephyrproject-rtos\/zephyr,explora26\/zephyr,finikorg\/zephyr,zephyriot\/zephyr,Vudentz\/zephyr,galak\/zephyr,ldts\/zephyr,finikorg\/zephyr,aceofall\/zephyr-iotos,finikorg\/zephyr,kraj\/zephyr,GiulianoFranchetto\/zephyr,GiulianoFranchetto\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/net\/lib\/app\/net_app.c\n+++ subsys\/net\/lib\/app\/net_app.c\n@@ -1199,51 +1199,51 @@\n {\n \tstruct net_app_ctx *ctx = context;\n \tstruct net_pkt *send_buf;\n-\tint ret, len;\n-\n-\tsend_buf = net_app_get_net_pkt(ctx, AF_UNSPEC, BUF_ALLOC_TIMEOUT);\n-\tif (!send_buf) {\n-\t\treturn MBEDTLS_ERR_SSL_ALLOC_FAILED;\n-\t}\n-\n-\tret = net_pkt_append_all(send_buf, size, (u8_t *)buf,\n-\t\t\t\t BUF_ALLOC_TIMEOUT);\n-\tif (!ret) {\n-\t\t\/* Cannot append data *\/\n-\t\tnet_pkt_unref(send_buf);\n-\t\treturn 0;\n-\t}\n-\n-\tlen = size;\n-\n-\tif (ctx->proto == IPPROTO_UDP) {\n+\tsize_t sent = 0;\n+\tint ret, len = 0;\n+\n+\twhile (size) {\n+\t\tsend_buf = net_app_get_net_pkt(ctx, AF_UNSPEC,\n+\t\t\t\t\t BUF_ALLOC_TIMEOUT);\n+\t\tif (!send_buf) {\n+\t\t\treturn MBEDTLS_ERR_SSL_ALLOC_FAILED;\n+\t\t}\n+\n+\t\tsent = net_pkt_append(send_buf, size, (u8_t *)buf + len,\n+\t\t\t\t BUF_ALLOC_TIMEOUT);\n+\t\tsize -= sent;\n+\t\tlen += sent;\n+\n+\t\tif (ctx->proto == IPPROTO_UDP) {\n #if defined(CONFIG_NET_APP_DTLS)\n-\t\tif (!ctx->dtls.ctx) {\n+\t\t\tif (!ctx->dtls.ctx) {\n+\t\t\t\tnet_pkt_unref(send_buf);\n+\t\t\t\treturn MBEDTLS_ERR_SSL_INTERNAL_ERROR;\n+\t\t\t}\n+\n+\t\t\tret = net_context_sendto(send_buf,\n+\t\t\t\t\t\t &ctx->dtls.ctx->remote,\n+\t\t\t\t\t\t sizeof(ctx->dtls.ctx->remote),\n+\t\t\t\t\t\t ssl_sent, K_NO_WAIT, NULL,\n+\t\t\t\t\t\t ctx);\n+#else\n+\t\t\tret = -EPROTONOSUPPORT;\n+#endif\n+\t\t} else {\n+\t\t\tret = net_context_send(send_buf, ssl_sent, K_NO_WAIT,\n+\t\t\t\t\t NULL, ctx);\n+\t\t}\n+\n+\t\tif (ret < 0) {\n \t\t\tnet_pkt_unref(send_buf);\n \t\t\treturn MBEDTLS_ERR_SSL_INTERNAL_ERROR;\n \t\t}\n \n-\t\tret = net_context_sendto(send_buf,\n-\t\t\t\t\t &ctx->dtls.ctx->remote,\n-\t\t\t\t\t sizeof(ctx->dtls.ctx->remote),\n-\t\t\t\t\t ssl_sent, K_NO_WAIT, NULL, ctx);\n-#else\n-\t\tret = -EPROTONOSUPPORT;\n-#endif\n-\t} else {\n-\t\tret = net_context_send(send_buf, ssl_sent, K_NO_WAIT, NULL,\n-\t\t\t\t ctx);\n-\t}\n-\n-\tif (ret < 0) {\n-\t\tnet_pkt_unref(send_buf);\n-\t\treturn MBEDTLS_ERR_SSL_INTERNAL_ERROR;\n-\t}\n-\n-\tk_sem_take(&ctx->tls.mbedtls.ssl_ctx.tx_sem, K_FOREVER);\n-\n-\tif (ctx->tls.close_requested) {\n-\t\t_net_app_tls_trigger_close(ctx);\n+\t\tk_sem_take(&ctx->tls.mbedtls.ssl_ctx.tx_sem, K_FOREVER);\n+\n+\t\tif (ctx->tls.close_requested) {\n+\t\t\t_net_app_tls_trigger_close(ctx);\n+\t\t}\n \t}\n \n \treturn len;\n"} {"commit":"d31fa5b87cc2c64d2085b9643c9d4c8dbb74a632","subject":"net: dns: Set the address family and address length correctly","message":"net: dns: Set the address family and address length correctly\n\nWe need to set the resolved IP address family and length\nbefore calling the user callback so that callback does not\nneed to figure out these values itself.\n\nChange-Id: I724909fc1707608ab8728231a0311795b6a313f3\nSigned-off-by: Jukka Rissanen <f9f077d1da4c7aa947f9864fa5a28c3588f6a45d@linux.intel.com>\n","repos":"nashif\/zephyr,erwango\/zephyr,runchip\/zephyr-cc3220,sharronliu\/zephyr,sharronliu\/zephyr,bigdinotech\/zephyr,explora26\/zephyr,Vudentz\/zephyr,Vudentz\/zephyr,runchip\/zephyr-cc3200,galak\/zephyr,zephyriot\/zephyr,kraj\/zephyr,rsalveti\/zephyr,aceofall\/zephyr-iotos,explora26\/zephyr,punitvara\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3200,fbsder\/zephyr,punitvara\/zephyr,bboozzoo\/zephyr,erwango\/zephyr,erwango\/zephyr,finikorg\/zephyr,ldts\/zephyr,pklazy\/zephyr,punitvara\/zephyr,punitvara\/zephyr,nashif\/zephyr,ldts\/zephyr,bigdinotech\/zephyr,mbolivar\/zephyr,fractalclone\/zephyr-riscv,sharronliu\/zephyr,sharronliu\/zephyr,pklazy\/zephyr,fractalclone\/zephyr-riscv,zephyriot\/zephyr,bigdinotech\/zephyr,aceofall\/zephyr-iotos,pklazy\/zephyr,finikorg\/zephyr,GiulianoFranchetto\/zephyr,pklazy\/zephyr,finikorg\/zephyr,nashif\/zephyr,holtmann\/zephyr,rsalveti\/zephyr,bboozzoo\/zephyr,fbsder\/zephyr,pklazy\/zephyr,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,Vudentz\/zephyr,kraj\/zephyr,fbsder\/zephyr,holtmann\/zephyr,nashif\/zephyr,sharronliu\/zephyr,fbsder\/zephyr,kraj\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,zephyrproject-rtos\/zephyr,bigdinotech\/zephyr,zephyrproject-rtos\/zephyr,bboozzoo\/zephyr,runchip\/zephyr-cc3220,fractalclone\/zephyr-riscv,runchip\/zephyr-cc3220,rsalveti\/zephyr,zephyrproject-rtos\/zephyr,ldts\/zephyr,holtmann\/zephyr,fractalclone\/zephyr-riscv,erwango\/zephyr,erwango\/zephyr,mbolivar\/zephyr,mbolivar\/zephyr,zephyriot\/zephyr,galak\/zephyr,kraj\/zephyr,Vudentz\/zephyr,fbsder\/zephyr,zephyriot\/zephyr,explora26\/zephyr,bigdinotech\/zephyr,explora26\/zephyr,fractalclone\/zephyr-riscv,explora26\/zephyr,aceofall\/zephyr-iotos,runchip\/zephyr-cc3200,aceofall\/zephyr-iotos,galak\/zephyr,rsalveti\/zephyr,runchip\/zephyr-cc3220,aceofall\/zephyr-iotos,bboozzoo\/zephyr,galak\/zephyr,GiulianoFranchetto\/zephyr,finikorg\/zephyr,ldts\/zephyr,runchip\/zephyr-cc3220,zephyriot\/zephyr,Vudentz\/zephyr,galak\/zephyr,mbolivar\/zephyr,kraj\/zephyr,holtmann\/zephyr,zephyrproject-rtos\/zephyr,mbolivar\/zephyr,finikorg\/zephyr,runchip\/zephyr-cc3200,GiulianoFranchetto\/zephyr,rsalveti\/zephyr,punitvara\/zephyr,nashif\/zephyr,ldts\/zephyr,Vudentz\/zephyr,holtmann\/zephyr","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subsys\/net\/lib\/dns\/resolve.c\n+++ subsys\/net\/lib\/dns\/resolve.c\n@@ -415,10 +415,14 @@\n \t\taddress_size = DNS_IPV4_LEN;\n \t\taddr = (uint8_t *)&net_sin(&info->ai_addr)->sin_addr;\n \t\tinfo->ai_family = AF_INET;\n+\t\tinfo->ai_addr.family = AF_INET;\n+\t\tinfo->ai_addrlen = sizeof(struct sockaddr_in);\n \t} else if (ctx->queries[query_idx].query_type == DNS_QUERY_TYPE_AAAA) {\n \t\taddress_size = DNS_IPV6_LEN;\n \t\taddr = (uint8_t *)&net_sin6(&info->ai_addr)->sin6_addr;\n \t\tinfo->ai_family = AF_INET6;\n+\t\tinfo->ai_addr.family = AF_INET6;\n+\t\tinfo->ai_addrlen = sizeof(struct sockaddr_in6);\n \t} else {\n \t\tret = DNS_EAI_FAMILY;\n \t\tgoto quit;\n@@ -446,7 +450,6 @@\n \t\t\tsrc = dns_msg.msg + dns_msg.response_position;\n \n \t\t\tmemcpy(addr, src, address_size);\n-\t\t\tinfo->ai_addrlen = address_size;\n \n \t\t\tctx->queries[query_idx].cb(DNS_EAI_INPROGRESS, info,\n \t\t\t\t\tctx->queries[query_idx].user_data);\n"} {"commit":"f14a00afc8607aed9d3fd31797ca353e826ea4fa","subject":"Removed close argument for ofThread.stopThread()","message":"Removed close argument for ofThread.stopThread()\n\nofThread doesn't need the bool close argument anymore.\r\nhttps:\/\/github.com\/openframeworks\/openFrameworks\/commit\/c6a00e66e69ed6af630bac98108cd020cf3030d6","repos":"sufangqi\/ofxFaceTracker,javl\/ofxFaceTracker,javl\/ofxFaceTracker,preformIOstudios\/ofxFaceTracker,udayanga91\/ofxFaceTracker,sufangqi\/ofxFaceTracker,preformIOstudios\/ofxFaceTracker,udayanga91\/ofxFaceTracker,udayanga91\/ofxFaceTracker,preformIOstudios\/ofxFaceTracker,sufangqi\/ofxFaceTracker,javl\/ofxFaceTracker","returncode":0,"stderr":"","license":"mit","lang":"C","diff":"--- src\/ofxFaceTrackerThreaded.h\n+++ src\/ofxFaceTrackerThreaded.h\n@@ -12,7 +12,7 @@\n \t,meanObjectPointsReady(false) {\n \t}\n \t~ofxFaceTrackerThreaded() {\n-\t\tstopThread(false);\n+\t\tstopThread();\n \t\tofSleepMillis(500);\n \t}\n \tvoid setup() {\n"} {"commit":"5911340704641b8217ef257755aa7b06b95bafaa","subject":"* subversion\/libsvn_subr\/md5.c: Change type from char to unsigned char for svn_md5_empty_string_digest[].","message":"* subversion\/libsvn_subr\/md5.c: Change type from char to unsigned char for\n svn_md5_empty_string_digest[].\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@844555 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/md5.c\n+++ subversion\/libsvn_subr\/md5.c\n@@ -23,7 +23,7 @@\n \n \n \/* The MD5 digest for the empty string. *\/\n-const char svn_md5_empty_string_digest[] = {\n+const unsigned char svn_md5_empty_string_digest[] = {\n 212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126\n };\n \n"} {"commit":"ff3abe57f4aeaad1358b3b57a6ae1e65a0d3ea6b","subject":"doc fix","message":"doc fix\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@837376 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_subr\/xml.c\n+++ subversion\/libsvn_subr\/xml.c\n@@ -390,8 +390,9 @@\n \n \/*** XML output via a tree delta `editor'. ***\/\n \n-\/* FIXME: I'm not sure we'll need all of these structures... unless\n- we're doing postfix vdeltas, hmmm, then we probably do, yeah. *\/\n+\/* FIXME: below is a skeleton of a tree-editor to output xml. It can\n+ be completed right now, it doesn't depend on anything else that's\n+ incomplete. *\/\n \n struct edit_baton\n {\n"} {"commit":"eb520caca49b917cbe15783f72a509c29c1f981a","subject":"Another round of converting loggy_copy.","message":"Another round of converting loggy_copy.\n\n* subversion\/libsvn_wc\/merge.c:\n (merge_text_file): replace a loggy_copy with an OP_FILE_INSTALL\n (merge_binary_file): rejigger the switch logic to break out and install\n the working copy file from a particular source.\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/merge.c\n+++ subversion\/libsvn_wc\/merge.c\n@@ -979,9 +979,16 @@\n \n if (*merge_outcome != svn_wc_merge_unchanged && ! dry_run)\n {\n+ const svn_skel_t *work_item;\n+\n \/* replace TARGET_ABSPATH with the new merged file, expanding. *\/\n- SVN_ERR(svn_wc__loggy_copy(db, dir_abspath,\n- result_target, target_abspath, pool));\n+ SVN_ERR(svn_wc__wq_build_file_install(&work_item,\n+ db, target_abspath,\n+ result_target,\n+ FALSE \/* use_commit_times *\/,\n+ FALSE \/* record_fileinfo *\/,\n+ pool, pool));\n+ SVN_ERR(svn_wc__db_wq_add(db, dir_abspath, work_item, pool));\n }\n \n return SVN_NO_ERROR;\n@@ -1026,6 +1033,7 @@\n {\n svn_wc_conflict_result_t *result = NULL;\n const svn_wc_conflict_description_t *cdesc;\n+ const char *install_from = NULL;\n \n cdesc = setup_text_conflict_desc(left_abspath, right_abspath,\n target_abspath,\n@@ -1051,19 +1059,15 @@\n unless the conflict-callback did the merging itself. *\/\n case svn_wc_conflict_choose_base:\n {\n- SVN_ERR(svn_wc__loggy_copy(db, merge_dirpath,\n- left_abspath, target_abspath,\n- pool));\n+ install_from = left_abspath;\n *merge_outcome = svn_wc_merge_merged;\n- return SVN_NO_ERROR;\n+ break;\n }\n case svn_wc_conflict_choose_theirs_full:\n {\n- SVN_ERR(svn_wc__loggy_copy(db, merge_dirpath,\n- right_abspath, target_abspath,\n- pool));\n+ install_from = right_abspath;\n *merge_outcome = svn_wc_merge_merged;\n- return SVN_NO_ERROR;\n+ break;\n }\n \/* For a binary file, if the response is to use the\n user's file, we do nothing. We also do nothing if\n@@ -1087,12 +1091,9 @@\n }\n else\n {\n- SVN_ERR(svn_wc__loggy_copy(db, merge_dirpath,\n- result->merged_file,\n- target_abspath,\n- pool));\n+ install_from = result->merged_file;\n *merge_outcome = svn_wc_merge_merged;\n- return SVN_NO_ERROR;\n+ break;\n }\n }\n case svn_wc_conflict_choose_postpone:\n@@ -1100,6 +1101,22 @@\n {\n \/* Assume conflict remains, fall through to code below. *\/\n }\n+ }\n+\n+ if (install_from != NULL)\n+ {\n+ const svn_skel_t *work_item;\n+\n+ SVN_ERR(svn_wc__wq_build_file_install(&work_item,\n+ db, target_abspath,\n+ install_from,\n+ FALSE \/* use_commit_times *\/,\n+ FALSE \/* record_fileinfo *\/,\n+ pool, pool));\n+ SVN_ERR(svn_wc__db_wq_add(db, merge_dirpath, work_item, pool));\n+\n+ \/* A merge choice was made, so we're done here. *\/\n+ return SVN_NO_ERROR;\n }\n }\n \n"} {"commit":"4081662ef730b6742f814691ad6c812675f85364","subject":"* subversion\/libsvn_wc\/props.c","message":"* subversion\/libsvn_wc\/props.c\n\n (svn_wc_prop_set): Also set entry structure's text_time field to 0\n (so that normalize_entry won't later undo our work here).\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@840979 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/props.c\n+++ subversion\/libsvn_wc\/props.c\n@@ -1017,20 +1017,19 @@\n \/* If we changed the keywords or newlines, void the entry\n timestamp for this file, so svn_wc_text_modified_p() does\n a real (albeit slow) check later on. *\/\n-\n svn_stringbuf_t *pdir, *basename;\n \n svn_path_split (path, &pdir, &basename, svn_path_local_style, pool);\n SVN_ERR (svn_wc__entry_modify (pdir,\n basename,\n- 0,\n+ SVN_WC__ENTRY_MODIFY_TEXT_TIME,\n SVN_INVALID_REVNUM,\n svn_node_file,\n svn_wc_schedule_normal,\n FALSE,\n FALSE,\n- 0,\n- 0,\n+ 0, \/* text time *\/\n+ 0, \/* prop time ... ignore *\/\n NULL,\n NULL,\n pool,\n"} {"commit":"d524cb96e4e1ce6192ae9bb725249bfa3ff2ad7f","subject":"* subversion\/libsvn_wc\/wc_db.c (svn_wc__db_read_info): Only retrieve lock information when we are looking at op_depth 0 (aka BASE), as only in that specific case we are looking at a node that is in the repository. (The old value is still available via _base_get_info(), which explicitly looks at the overlayed node.)","message":"* subversion\/libsvn_wc\/wc_db.c\n (svn_wc__db_read_info): Only retrieve lock information when we are looking\n at op_depth 0 (aka BASE), as only in that specific case we are looking at\n a node that is in the repository. (The old value is still available via\n _base_get_info(), which explicitly looks at the overlayed node.)\n","repos":"jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion,jmckaskill\/subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/wc_db.c\n+++ subversion\/libsvn_wc\/wc_db.c\n@@ -4564,10 +4564,28 @@\n *conflicted = FALSE;\n }\n \n+ if (lock)\n+ {\n+ if (op_depth != 0 || svn_sqlite__column_is_null(stmt_info, 15))\n+ *lock = NULL;\n+ else\n+ {\n+ *lock = apr_pcalloc(result_pool, sizeof(svn_wc__db_lock_t));\n+ (*lock)->token = svn_sqlite__column_text(stmt_info, 15,\n+ result_pool);\n+ (*lock)->owner = svn_sqlite__column_text(stmt_info, 16,\n+ result_pool);\n+ (*lock)->comment = svn_sqlite__column_text(stmt_info, 17,\n+ result_pool);\n+ if (!svn_sqlite__column_is_null(stmt_info, 18))\n+ (*lock)->date = svn_sqlite__column_int64(stmt_info, 18);\n+ }\n+ }\n+\n if (have_work)\n *have_work = (op_depth != 0);\n \n- if (have_base || lock)\n+ if (have_base)\n {\n while (!err && op_depth != 0)\n {\n@@ -4581,27 +4599,6 @@\n \n if (have_base)\n *have_base = (op_depth == 0);\n-\n- \/* Lock should only be checked when the top op_depth is 0, but that\n- is a behavior change which has to be handled as a separate commit\n- *\/\n- if (lock)\n- {\n- if (op_depth != 0 || svn_sqlite__column_is_null(stmt_info, 15))\n- *lock = NULL;\n- else\n- {\n- *lock = apr_pcalloc(result_pool, sizeof(svn_wc__db_lock_t));\n- (*lock)->token = svn_sqlite__column_text(stmt_info, 15,\n- result_pool);\n- (*lock)->owner = svn_sqlite__column_text(stmt_info, 16,\n- result_pool);\n- (*lock)->comment = svn_sqlite__column_text(stmt_info, 17,\n- result_pool);\n- if (!svn_sqlite__column_is_null(stmt_info, 18))\n- (*lock)->date = svn_sqlite__column_int64(stmt_info, 18);\n- }\n- }\n }\n }\n else if (have_act)\n"} {"commit":"455d3a7b29791e673ecde52025881447462eae4f","subject":"build-update-repo: Update the appstream using a GMarkup parser on the app-info files","message":"build-update-repo: Update the appstream using a GMarkup parser on the app-info files\n","repos":"matthiasclasen\/xdg-app,amigadave\/flatpak,handsome-feng\/flatpak,handsome-feng\/flatpak,flatpak\/flatpak,handsome-feng\/flatpak,GeorgesStavracas\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/xdg-app,flatpak\/flatpak,alexlarsson\/xdg-app,amigadave\/flatpak,amigadave\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/xdg-app,matthiasclasen\/flatpak,flatpak\/flatpak,matthiasclasen\/xdg-app,alexlarsson\/xdg-app,flatpak\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/flatpak,GeorgesStavracas\/flatpak,matthiasclasen\/flatpak,amigadave\/flatpak,handsome-feng\/flatpak,alexlarsson\/xdg-app,GeorgesStavracas\/flatpak,alexlarsson\/xdg-app,handsome-feng\/flatpak,matthiasclasen\/flatpak","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- common\/xdg-app-utils.c\n+++ common\/xdg-app-utils.c\n@@ -8,7 +8,7 @@\n *\n * This library is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\t See the GNU\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n@@ -437,11 +437,11 @@\n \n char **\n xdg_app_list_deployed_refs (const char *type,\n-\t\t\t const char *name_prefix,\n-\t\t\t const char *branch,\n-\t\t\t const char *arch,\n-\t\t\t GCancellable *cancellable,\n-\t\t\t GError **error)\n+ const char *name_prefix,\n+ const char *branch,\n+ const char *arch,\n+ GCancellable *cancellable,\n+ GError **error)\n {\n gchar **ret = NULL;\n g_autoptr(GPtrArray) names = NULL;\n@@ -457,13 +457,13 @@\n system_dir = xdg_app_dir_get_system ();\n \n if (!xdg_app_dir_collect_deployed_refs (user_dir, type, name_prefix,\n-\t\t\t\t\t branch, arch, hash, cancellable,\n-\t\t\t\t\t error))\n+ branch, arch, hash, cancellable,\n+ error))\n goto out;\n \n if (!xdg_app_dir_collect_deployed_refs (system_dir, type, name_prefix,\n-\t\t\t\t\t branch, arch, hash, cancellable,\n-\t\t\t\t\t error))\n+ branch, arch, hash, cancellable,\n+ error))\n goto out;\n \n names = g_ptr_array_new ();\n@@ -1355,20 +1355,6 @@\n return TRUE;\n }\n \n-static gboolean\n-appstream_builder (GError **error,\n- ...)\n-{\n- gboolean res;\n- va_list ap;\n-\n- va_start (ap, error);\n- res = xdg_app_spawn (NULL, NULL, error, \"appstream-builder\", ap);\n- va_end (ap);\n-\n- return res;\n-}\n-\n static OstreeRepoCommitFilterResult\n commit_filter (OstreeRepo *repo,\n const char *path,\n@@ -1386,6 +1372,446 @@\n g_file_info_set_attribute_uint32 (file_info, \"unix::mode\", current_mode & ~07000);\n \n return OSTREE_REPO_COMMIT_FILTER_ALLOW;\n+}\n+\n+typedef struct XmlNode XmlNode;\n+\n+struct XmlNode {\n+ gchar *element_name; \/* NULL == text *\/\n+ char **attribute_names;\n+ char **attribute_values;\n+ char *text;\n+ XmlNode *parent;\n+ XmlNode *first_child;\n+ XmlNode *last_child;\n+ XmlNode *next_sibling;\n+};\n+\n+typedef struct {\n+ XmlNode *current;\n+} XmlData;\n+\n+static XmlNode *\n+xml_node_new (const gchar *element_name)\n+{\n+ XmlNode *node = g_new0 (XmlNode, 1);\n+ node->element_name = g_strdup (element_name);\n+ return node;\n+}\n+\n+static XmlNode *\n+xml_node_new_text (const gchar *text)\n+{\n+ XmlNode *node = g_new0 (XmlNode, 1);\n+ node->text = g_strdup (text);\n+ return node;\n+}\n+\n+\n+static void\n+xml_add_node (XmlNode *parent, XmlNode *node)\n+{\n+ node->parent = parent;\n+\n+ if (parent->first_child == NULL)\n+ parent->first_child = node;\n+ else\n+ parent->last_child->next_sibling = node;\n+ parent->last_child = node;\n+}\n+\n+static void\n+xml_start_element (GMarkupParseContext *context,\n+ const gchar *element_name,\n+ const gchar **attribute_names,\n+ const gchar **attribute_values,\n+ gpointer user_data,\n+ GError **error)\n+{\n+ XmlData *data = user_data;\n+ XmlNode *node;\n+\n+ node = xml_node_new (element_name);\n+ node->attribute_names = g_strdupv ((char **)attribute_names);\n+ node->attribute_values = g_strdupv ((char **)attribute_values);\n+\n+ xml_add_node (data->current, node);\n+ data->current = node;\n+}\n+\n+\/* Called for close tags <\/foo> *\/\n+static void\n+xml_end_element (GMarkupParseContext *context,\n+ const gchar *element_name,\n+ gpointer user_data,\n+ GError **error)\n+{\n+ XmlData *data = user_data;\n+ data->current = data->current->parent;\n+}\n+\n+static void\n+xml_text (GMarkupParseContext *context,\n+ const gchar *text,\n+ gsize text_len,\n+ gpointer user_data,\n+ GError **error)\n+{\n+ XmlData *data = user_data;\n+ XmlNode *node;\n+\n+ node = xml_node_new (NULL);\n+ node->text = g_strndup (text, text_len);\n+ xml_add_node (data->current, node);\n+}\n+\n+static void\n+xml_passthrough (GMarkupParseContext *context,\n+ const gchar *passthrough_text,\n+ gsize text_len,\n+ gpointer user_data,\n+ GError **error)\n+{\n+}\n+\n+static GMarkupParser xml_parser = {\n+ xml_start_element,\n+ xml_end_element,\n+ xml_text,\n+ xml_passthrough,\n+ NULL\n+};\n+\n+static void\n+xml_node_free (XmlNode *node)\n+{\n+ XmlNode *child;\n+\n+ if (node == NULL)\n+ return;\n+\n+ child = node->first_child;\n+ while (child != NULL)\n+ {\n+ XmlNode *next = child->next_sibling;\n+ xml_node_free (child);\n+ child = next;\n+ }\n+\n+ g_free (node->element_name);\n+ g_free (node->text);\n+ g_strfreev (node->attribute_names);\n+ g_strfreev (node->attribute_values);\n+ g_free (node);\n+}\n+\n+G_DEFINE_AUTOPTR_CLEANUP_FUNC(XmlNode, xml_node_free);\n+\n+static void\n+dump_xml (XmlNode *node, GString *res)\n+{\n+ int i;\n+ XmlNode *child;\n+\n+ if (node->parent == NULL)\n+ g_string_append (res, \"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?>\\n\");\n+\n+ if (node->element_name)\n+ {\n+ if (node->parent != NULL)\n+ {\n+ if (node->first_child == NULL)\n+ g_string_append (res, \"<\/\");\n+ else\n+ g_string_append (res, \"<\");\n+ g_string_append (res, node->element_name);\n+ if (node->attribute_names)\n+ {\n+ for (i = 0; node->attribute_names[i] != NULL; i++)\n+ {\n+ g_string_append_printf (res, \" %s=\\\"%s\\\"\",\n+ node->attribute_names[i],\n+ node->attribute_values[i]);\n+ }\n+ }\n+ g_string_append (res, \">\");\n+ }\n+\n+ child = node->first_child;\n+ while (child != NULL)\n+ {\n+ dump_xml (child, res);\n+ child = child->next_sibling;\n+ }\n+ if (node->parent != NULL)\n+ {\n+ if (node->first_child != NULL)\n+ g_string_append_printf (res, \"<\/%s>\", node->element_name);\n+ }\n+\n+ }\n+ else if (node->text)\n+ {\n+ g_string_append (res, node->text);\n+ }\n+}\n+\n+static XmlNode *\n+unlink_node (XmlNode *node,\n+ XmlNode *prev_sibling)\n+{\n+ XmlNode *parent = node->parent;\n+\n+ if (parent == NULL)\n+ return node;\n+\n+ if (parent->first_child == node)\n+ parent->first_child = node->next_sibling;\n+\n+ if (parent->last_child == node)\n+ parent->last_child = prev_sibling;\n+\n+ if (prev_sibling)\n+ prev_sibling->next_sibling = node->next_sibling;\n+\n+ node->parent = NULL;\n+ node->next_sibling = NULL;\n+\n+ return node;\n+}\n+\n+static XmlNode *\n+xml_find_child (XmlNode *node,\n+ const char *type,\n+ XmlNode **prev_child_out)\n+{\n+ XmlNode *child = NULL;\n+ XmlNode *prev_child = NULL;\n+\n+ child = node->first_child;\n+ prev_child = NULL;\n+ while (child != NULL)\n+ {\n+ XmlNode *next = child->next_sibling;\n+\n+ if (g_strcmp0 (child->element_name, type) == 0)\n+ {\n+ if (prev_child_out)\n+ *prev_child_out = prev_child;\n+ return child;\n+ }\n+\n+ prev_child = child;\n+ child = next;\n+ }\n+\n+ return NULL;\n+}\n+\n+static gboolean\n+validate_component (XmlNode *component,\n+ const char *ref,\n+ const char *id)\n+{\n+ XmlNode *bundle, *text, *prev, *id_node, *id_text_node;\n+ g_autofree char *id_text = NULL;\n+\n+ if (g_strcmp0 (component->element_name, \"component\") != 0)\n+ return FALSE;\n+\n+ id_node = xml_find_child (component, \"id\", NULL);\n+ if (id_node == NULL)\n+ return FALSE;\n+\n+ id_text_node = xml_find_child (id_node, NULL, NULL);\n+ if (id_text_node == NULL || id_text_node->text == NULL)\n+ return FALSE;\n+\n+ id_text = g_strstrip (g_strdup (id_text_node->text));\n+ if (!g_str_has_prefix (id_text, id) ||\n+ !g_str_has_suffix (id_text, \".desktop\"))\n+ {\n+ g_warning (\"Invalid id %s\", id_text);\n+ return FALSE;\n+ }\n+\n+ while ((bundle = xml_find_child (component, \"bundle\", &prev)) != NULL)\n+ xml_node_free (unlink_node (component, bundle));\n+\n+ bundle = xml_node_new (\"bundle\");\n+ bundle->attribute_names = g_new0 (char *, 2);\n+ bundle->attribute_values = g_new0 (char *, 2);\n+ bundle->attribute_names[0] = g_strdup (\"type\");\n+ bundle->attribute_values[0] = g_strdup (\"xdg-app\");\n+\n+ xml_add_node (component, xml_node_new_text (\" \"));\n+ xml_add_node (component, bundle);\n+ xml_add_node (component, xml_node_new_text (\"\\n \"));\n+\n+ text = xml_node_new (NULL);\n+ text->text = g_strdup (ref);\n+\n+ xml_add_node (bundle, text);\n+\n+ return TRUE;\n+}\n+\n+static gboolean\n+migrate_xml (XmlNode *root,\n+ XmlNode *appstream,\n+ const char *ref,\n+ const char *id)\n+{\n+ XmlNode *components;\n+ XmlNode *component;\n+ XmlNode *prev_component;\n+ gboolean migrated = FALSE;\n+\n+ if (root->first_child == NULL ||\n+ root->first_child->next_sibling != NULL ||\n+ g_strcmp0 (root->first_child->element_name, \"components\") != 0)\n+ return FALSE;\n+\n+ components = root->first_child;\n+\n+ component = components->first_child;\n+ prev_component = NULL;\n+ while (component != NULL)\n+ {\n+ XmlNode *next = component->next_sibling;\n+\n+ if (validate_component (component, ref, id))\n+ {\n+ xml_add_node (appstream, unlink_node (component, prev_component));\n+ migrated = TRUE;\n+ }\n+ else\n+ prev_component = component;\n+\n+ component = next;\n+ }\n+\n+ return migrated;\n+}\n+\n+static gboolean\n+copy_icon (const char *id,\n+ GFile *root,\n+ GFile *dest,\n+ const char *size,\n+ GError **error)\n+{\n+ g_autofree char *icon_name = g_strconcat (id, \".png\", NULL);\n+ g_autoptr(GFile) icons_dir =\n+ g_file_resolve_relative_path (root,\n+ \"export\/share\/app-info\/icons\/xdg-app\");\n+ g_autoptr(GFile) size_dir =g_file_get_child (icons_dir, size);\n+ g_autoptr(GFile) icon_file = g_file_get_child (size_dir, icon_name);\n+ g_autoptr(GFile) dest_dir = g_file_get_child (dest, \"icons\");\n+ g_autoptr(GFile) dest_size_dir = g_file_get_child (dest_dir, size);\n+ g_autoptr(GFile) dest_file = g_file_get_child (dest_size_dir, icon_name);\n+ g_autoptr(GInputStream) in = NULL;\n+ g_autoptr(GOutputStream) out = NULL;\n+ gssize n_bytes_written;\n+\n+ in = (GInputStream*)g_file_read (icon_file, NULL, error);\n+ if (!in)\n+ return FALSE;\n+\n+ if (!gs_file_ensure_directory (dest_size_dir, TRUE, NULL, error))\n+ return FALSE;\n+\n+ out = (GOutputStream*)g_file_replace (dest_file, NULL, FALSE,\n+ G_FILE_CREATE_REPLACE_DESTINATION,\n+ NULL, error);\n+ if (!out)\n+ return FALSE;\n+\n+ n_bytes_written = g_output_stream_splice (out, in,\n+ G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,\n+ NULL, error);\n+ if (n_bytes_written < 0)\n+ return FALSE;\n+\n+ return TRUE;\n+}\n+\n+static gboolean\n+extract_appstream (OstreeRepo *repo,\n+ XmlNode *appstream_components,\n+ const char *ref,\n+ const char *id,\n+ GFile *dest,\n+ GCancellable *cancellable,\n+ GError **error)\n+{\n+ g_autoptr(GFile) root = NULL;\n+ g_autoptr(GFile) xmls_dir = NULL;\n+ g_autoptr(GFile) appstream_file = NULL;\n+ g_autofree char *appstream_basename = NULL;\n+ g_autoptr(GInputStream) zin = NULL;\n+ g_autoptr(GInputStream) in = NULL;\n+ g_autoptr(GZlibDecompressor) decompressor = NULL;\n+ g_autoptr(GMarkupParseContext) ctx = NULL;\n+ g_autoptr(XmlNode) xml_root = NULL;\n+ g_autoptr(XmlNode) appstream_root = NULL;\n+ XmlData data = { 0 };\n+ char buffer[32*1024];\n+ gssize len;\n+\n+ if (!ostree_repo_read_commit (repo, ref, &root, NULL, NULL, error))\n+ return FALSE;\n+\n+ xmls_dir = g_file_resolve_relative_path (root, \"export\/share\/app-info\/xmls\");\n+ appstream_basename = g_strconcat (id, \".xml.gz\", NULL);\n+ appstream_file = g_file_get_child (xmls_dir, appstream_basename);\n+\n+ zin = (GInputStream*)g_file_read (appstream_file, cancellable, error);\n+ if (!zin)\n+ return FALSE;\n+\n+ decompressor = g_zlib_decompressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP);\n+\n+ in = g_converter_input_stream_new (zin, G_CONVERTER (decompressor));\n+\n+ xml_root = xml_node_new (\"root\");\n+ data.current = xml_root;\n+\n+ ctx = g_markup_parse_context_new (&xml_parser,\n+ G_MARKUP_PREFIX_ERROR_POSITION,\n+ &data,\n+ NULL);\n+\n+ while ((len = g_input_stream_read (in, buffer, sizeof (buffer),\n+ cancellable, error)) > 0)\n+ {\n+ if (!g_markup_parse_context_parse (ctx, buffer, len, error))\n+ {\n+ return FALSE;\n+ }\n+ }\n+\n+ if (len < 0)\n+ {\n+ return FALSE;\n+ }\n+\n+ if (migrate_xml (xml_root, appstream_components, ref, id))\n+ {\n+ g_autoptr(GError) my_error = NULL;\n+ if (!copy_icon (id, root, dest, \"64x64\", &my_error))\n+ {\n+ g_print (\"Error copying 64x64 icon: %s\\n\", my_error->message);\n+ g_clear_error (&my_error);\n+ }\n+ if (!copy_icon (id, root, dest, \"128x128\", NULL))\n+ {\n+ g_print (\"Error copying 128x12 icon: %s\\n\", my_error->message);\n+ g_clear_error (&my_error);\n+ }\n+ }\n+\n+ return TRUE;\n }\n \n gboolean\n@@ -1417,25 +1843,23 @@\n const char *arch;\n g_auto(GStrv) split = NULL;\n \n- if (!g_str_has_prefix (ref, \"app\/\") &&\n- !g_str_has_prefix (ref, \"runtime\/\"))\n+ split = xdg_app_decompose_ref (ref, NULL);\n+ if (!split)\n continue;\n \n- split = xdg_app_decompose_ref (ref, NULL);\n- if (split)\n- {\n- arch = split[2];\n- if (!g_hash_table_contains (arches, arch))\n- g_hash_table_insert (arches, g_strdup (arch), GINT_TO_POINTER(1));\n- }\n+ arch = split[2];\n+ if (!g_hash_table_contains (arches, arch))\n+ g_hash_table_insert (arches, g_strdup (arch), GINT_TO_POINTER(1));\n }\n \n g_hash_table_iter_init (&iter, arches);\n while (g_hash_table_iter_next (&iter, &key, &value))\n {\n+ GHashTableIter iter2;\n const char *arch = key;\n g_autofree char *tmpdir = g_strdup (\"\/tmp\/xdg-app-appstream-XXXXXX\");\n g_autoptr(XdgAppTempDir) tmpdir_file = NULL;\n+ g_autoptr(GFile) appstream_file = NULL;\n g_autofree char *repo_path = NULL;\n g_autofree char *repo_arg = NULL;\n g_autofree char *arch_arg = NULL;\n@@ -1448,28 +1872,76 @@\n g_autoptr(OstreeRepoCommitModifier) modifier = NULL;\n g_autofree char *parent = NULL;\n g_autofree char *branch = NULL;\n+ g_autoptr(XmlNode) appstream_root = NULL;\n+ XmlNode *appstream_components;\n+ g_autoptr(GString) xml = NULL;\n+ g_autoptr(GZlibCompressor) compressor = NULL;\n+ g_autoptr(GOutputStream) out2 = NULL;\n+ g_autoptr(GOutputStream) out = NULL;\n \n if (g_mkdtemp (tmpdir) == NULL)\n return xdg_app_fail (error, \"Can't create temporary directory\");\n \n tmpdir_file = g_file_new_for_path (tmpdir);\n \n- repo_path = g_file_get_path (ostree_repo_get_path (repo));\n- repo_arg = g_strdup_printf (\"--ostree-repo=%s\", repo_path);\n- arch_arg = g_strdup_printf (\"--ostree-arch=%s\", arch);\n- output_arg = g_strdup_printf (\"--output-dir=%s\", tmpdir);\n- icon_arg = g_strdup_printf (\"--icons-dir=%s\/icons\", tmpdir);\n-\n- if (!appstream_builder (error,\n- \"--basename=appstream\",\n- \"--origin=xdg-app\",\n- \"--uncompressed-icons\",\n- \"--enable-hidpi\",\n- repo_arg,\n- arch_arg,\n- output_arg,\n- icon_arg,\n- NULL))\n+ appstream_root = xml_node_new (\"root\");\n+ appstream_components = xml_node_new (\"components\");\n+ xml_add_node (appstream_root, appstream_components);\n+ xml_add_node (appstream_components, xml_node_new_text (\"\\n \"));\n+\n+ appstream_components->attribute_names = g_new0 (char *, 3);\n+ appstream_components->attribute_values = g_new0 (char *, 3);\n+ appstream_components->attribute_names[0] = g_strdup (\"version\");\n+ appstream_components->attribute_values[0] = g_strdup (\"0.8\");\n+ appstream_components->attribute_names[1] = g_strdup (\"origin\");\n+ appstream_components->attribute_values[1] = g_strdup (\"xdg-app\");\n+\n+ g_hash_table_iter_init (&iter2, all_refs);\n+ while (g_hash_table_iter_next (&iter2, &key, &value))\n+ {\n+ const char *ref = key;\n+ g_auto(GStrv) split = NULL;\n+ g_autoptr(GError) my_error = NULL;\n+\n+ split = xdg_app_decompose_ref (ref, NULL);\n+ if (!split)\n+ continue;\n+\n+ if (strcmp (split[2], arch) != 0)\n+ continue;\n+\n+ if (!extract_appstream (repo, appstream_components, ref, split[1], tmpdir_file, cancellable, &my_error))\n+ {\n+ g_print (\"No appstream data for %s\\n\", ref);\n+ continue;\n+ }\n+ }\n+\n+ xml_add_node (appstream_components, xml_node_new_text (\"\\n\"));\n+\n+ xml = g_string_new (\"\");\n+ dump_xml (appstream_root, xml);\n+\n+ compressor = g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, -1);\n+ out = g_memory_output_stream_new_resizable ();\n+ out2 = g_converter_output_stream_new (out, G_CONVERTER (compressor));\n+ if (!g_output_stream_write_all (out2, xml->str, xml->len,\n+ NULL, NULL, error))\n+ return FALSE;\n+ if (!g_output_stream_close (out2, NULL, error))\n+ return FALSE;\n+\n+ appstream_file = g_file_get_child (tmpdir_file, \"appstream.xml.gz\");\n+\n+ if (!g_file_replace_contents (appstream_file,\n+ g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (out)),\n+ g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (out)),\n+ NULL,\n+ FALSE,\n+ G_FILE_CREATE_NONE,\n+ NULL,\n+ cancellable,\n+ error))\n return FALSE;\n \n if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))\n"} {"commit":"3d4fccb5d40f147ba7453b6f3cb4a8dd0eb46ba6","subject":"HTTP: support for null as a second argument of r.subrequest().","message":"HTTP: support for null as a second argument of r.subrequest().\n\nThis closes #173 issue on Github.\n","repos":"nginx\/njs,nginx\/njs,nginx\/njs,nginx\/njs,nginx\/njs,nginx\/njs","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"C","diff":"--- nginx\/ngx_http_js_module.c\n+++ nginx\/ngx_http_js_module.c\n@@ -1808,7 +1808,7 @@\n } else if (njs_value_is_object(arg)) {\n options = arg;\n \n- } else if (!njs_value_is_undefined(arg)) {\n+ } else if (!njs_value_is_null_or_undefined(arg)) {\n njs_vm_error(vm, \"failed to convert args\");\n return NJS_ERROR;\n }\n"} {"commit":"85288750e6b4a81ce90b06725c2ac704f25a90d9","subject":"Prevent an error pileup","message":"Prevent an error pileup\n\nUnfortunately, g_key_file_get_string can set error and still\nreturn non-NULL (e.g if the value contains unsupported escape\nsequences).\n","repos":"matthiasclasen\/flatpak,amigadave\/flatpak,handsome-feng\/flatpak,flatpak\/flatpak,matthiasclasen\/xdg-app,matthiasclasen\/flatpak,handsome-feng\/flatpak,thiblahute\/xdg-app,GeorgesStavracas\/flatpak,thiblahute\/xdg-app,GeorgesStavracas\/flatpak,GeorgesStavracas\/flatpak,alexlarsson\/xdg-app,handsome-feng\/flatpak,flatpak\/flatpak,matthiasclasen\/xdg-app,chergert\/xdg-app,flatpak\/flatpak,thiblahute\/xdg-app,GeorgesStavracas\/flatpak,matthiasclasen\/flatpak,matthiasclasen\/xdg-app,matthiasclasen\/xdg-app,amigadave\/flatpak,alexlarsson\/xdg-app,GeorgesStavracas\/flatpak,alexlarsson\/xdg-app,amigadave\/flatpak,matthiasclasen\/flatpak,handsome-feng\/flatpak,alexlarsson\/xdg-app,handsome-feng\/flatpak,chergert\/xdg-app,chergert\/xdg-app,thiblahute\/xdg-app,chergert\/xdg-app,amigadave\/flatpak,flatpak\/flatpak,matthiasclasen\/flatpak,flatpak\/flatpak","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"C","diff":"--- xdg-app-builtins-run.c\n+++ xdg-app-builtins-run.c\n@@ -198,7 +198,7 @@\n goto out;\n \n runtime = g_key_file_get_string (metakey, \"Application\", opt_devel ? \"sdk\" : \"runtime\", error);\n- if (runtime == NULL)\n+ if (*error)\n goto out;\n \n runtime_ref = g_build_filename (\"runtime\", runtime, NULL);\n"} {"commit":"cab94f4a7cd5635828fdf7660c4c5a9326d73008","subject":"Make all WC test programs use svn_wc__db_util_open_db() instead of calling svn_sqlite__open() directly, to ensure that the SQLite user-defined function 'relpath_depth' gets installed in the DB connection. That function will be needed by the validation triggers in wc-checks.c as soon as we activate them.","message":"Make all WC test programs use svn_wc__db_util_open_db() instead of calling\nsvn_sqlite__open() directly, to ensure that the SQLite user-defined function\n'relpath_depth' gets installed in the DB connection. That function will be\nneeded by the validation triggers in wc-checks.c as soon as we activate\nthem.\n\n* subversion\/libsvn_wc\/wc_db_private.h,\n subversion\/libsvn_wc\/wc_db_util.c\n (svn_wc__db_util_open_db): Add an optional parameter to specify the list\n of statements to prepare instead of the default set. Write a doc string.\n\n* subversion\/libsvn_wc\/wc_db.c\n (create_db): Update the call to svn_wc__db_util_open_db().\n\n* subversion\/libsvn_wc\/wc_db_wcroot.c\n (svn_wc__db_wcroot_parse_local_abspath): Same.\n\n* subversion\/tests\/libsvn_wc\/db-test.c\n (create_fake_wc): Call svn_wc__db_wcroot_parse_local_abspath() instead of\n svn_sqlite__open().\n\n* subversion\/tests\/libsvn_wc\/entries-compat.c\n (make_one_db): Same.\n\n* subversion\/tests\/libsvn_wc\/op-depth-test.c\n (open_wc_db): Same.\n\n\ngit-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1127902 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,wbond\/subversion,wbond\/subversion,YueLinHo\/Subversion,YueLinHo\/Subversion,wbond\/subversion,YueLinHo\/Subversion","returncode":0,"stderr":"","license":"apache-2.0","lang":"C","diff":"--- subversion\/libsvn_wc\/wc_db.c\n+++ subversion\/libsvn_wc\/wc_db.c\n@@ -1372,8 +1372,9 @@\n svn_sqlite__stmt_t *stmt;\n \n SVN_ERR(svn_wc__db_util_open_db(sdb, dir_abspath, sdb_fname,\n- svn_sqlite__mode_rwcreate, result_pool,\n- scratch_pool));\n+ svn_sqlite__mode_rwcreate,\n+ NULL \/* my_statements *\/,\n+ result_pool, scratch_pool));\n \n \/* Create the database's schema. *\/\n SVN_ERR(svn_sqlite__exec_statements(*sdb, STMT_CREATE_SCHEMA));\n"} {"commit":"c9076d637c48bc83ef123f5abda6220d7d1916d7","subject":"algorithms: added the power math function that is using a divide and conquer.","message":"algorithms: added the power math function that is using a divide and conquer.\n","repos":"mssola\/programs,mssola\/programs,mssola\/programs,mssola\/programs,mssola\/programs,mssola\/programs,mssola\/programs","returncode":1,"stderr":"error: pathspec 'algorithms\/divide\/power.c' did not match any file(s) known to git\n","license":"mit","lang":"C","diff":"--- algorithms\/divide\/power.c\n+++ algorithms\/divide\/power.c\n@@ -0,0 +1,22 @@\n+\n+#include <stdio.h>\n+\n+\/*\n+ * Computing a**n with a divide and conquer algorithm.\n+ *\/\n+int power(unsigned int a, unsigned int n)\n+{\n+ if (n == 0)\n+ return 1;\n+\n+ if ((n % 2) == 0)\n+ return power(a*a, n\/2);\n+ return a * power(a*a, n\/2);\n+}\n+\n+int main()\n+{\n+ printf(\"%d\\n\", power(2, 4));\n+ printf(\"%d\\n\", power(3, 3));\n+}\n+\n"}